diff -Nru cargo-0.32.0/appveyor.yml cargo-0.33.0/appveyor.yml
--- cargo-0.32.0/appveyor.yml	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/appveyor.yml	2019-01-02 21:49:06.000000000 +0000
@@ -11,7 +11,7 @@
   - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
   - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - if defined MINIMAL_VERSIONS rustup toolchain install 1.28.0
+  - if defined MINIMAL_VERSIONS rustup toolchain install 1.31.0
   - if defined OTHER_TARGET rustup target add %OTHER_TARGET%
   - rustc -V
   - cargo -V
@@ -25,5 +25,5 @@
   # we don't have ci time to run the full `cargo test` with `minimal-versions` like
   # - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test
   # so we just run `cargo check --tests` like
-  - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.28.0 check --tests
+  - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.31.0 check --tests
   - if NOT defined MINIMAL_VERSIONS cargo test
diff -Nru cargo-0.32.0/Cargo.toml cargo-0.33.0/Cargo.toml
--- cargo-0.32.0/Cargo.toml	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/Cargo.toml	2019-01-02 21:49:06.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.32.0"
+version = "0.33.0"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
            "Alex Crichton <alex@alexcrichton.com>"]
@@ -19,15 +19,16 @@
 [dependencies]
 atty = "0.2"
 bytesize = "1.0"
-crates-io = { path = "src/crates-io", version = "0.20" }
-crossbeam-utils = "0.5"
+crates-io = { path = "src/crates-io", version = "0.21" }
+crossbeam-utils = "0.6"
 crypto-hash = "0.3.1"
-curl = { version = "0.4.17", features = ['http2'] }
-curl-sys = "0.4.12"
-env_logger = "0.5.11"
+curl = { version = "0.4.19", features = ['http2'] }
+curl-sys = "0.4.15"
+env_logger = "0.6.0"
+pretty_env_logger = { version = "0.2", optional = true }
 failure = "0.1.2"
 filetime = "0.2"
-flate2 = "1.0.3"
+flate2 = { version = "1.0.3", features = ['zlib'] }
 fs2 = "0.4"
 git2 = "0.7.5"
 git2-curl = "0.8.1"
@@ -51,7 +52,7 @@
 serde_ignored = "0.0.4"
 serde_json = { version = "1.0.30", features = ["raw_value"] }
 shell-escape = "0.1.4"
-tar = { version = "0.4.15", default-features = false }
+tar = { version = "0.4.18", default-features = false }
 tempfile = "3.0"
 termcolor = "1.0"
 toml = "0.4.2"
@@ -59,6 +60,7 @@
 clap = "2.31.2"
 unicode-width = "0.1.5"
 openssl = { version = '0.10.11', optional = true }
+im-rc = "12.1.0"
 
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
@@ -104,3 +106,4 @@
 
 [features]
 vendored-openssl = ['openssl/vendored']
+pretty-env-logger = ['pretty_env_logger']
diff -Nru cargo-0.32.0/debian/bin/cargo cargo-0.33.0/debian/bin/cargo
--- cargo-0.32.0/debian/bin/cargo	2019-01-23 20:59:16.000000000 +0000
+++ cargo-0.33.0/debian/bin/cargo	2019-02-27 08:08:29.000000000 +0000
@@ -3,16 +3,26 @@
 Wrapper around cargo to have it build using Debian settings.
 
 Usage:
+    export PATH=/path/to/dir/of/this/script:$PATH
     export CARGO_HOME=debian/cargo_home
-    cargo prepare-debian /path/to/local/registry
+    cargo prepare-debian /path/to/local/registry [--link-from-system]
     cargo build
     cargo test
     cargo install
+    cargo clean
+    [rm -rf /path/to/local/registry]
+
+The "prepare-debian" subcommand writes a config file to $CARGO_HOME that makes
+the subsequent invocations use our Debian flags. The "--link-from-system" flag
+is optional; if you use it we will create /path/to/local/registry and symlink
+the contents of /usr/share/cargo/registry into it. You are then responsible for
+cleaning it up afterwards (a simple `rm -rf` should do).
 
 See cargo:d/rules and dh-cargo:cargo.pm for more examples.
 
 Make sure you add "Build-Depends: python3:native" if you use this directly.
-OTOH, you only need "Build-Depends: dh-cargo" if you use that.
+If using this only indirectly via dh-cargo, then you only need "Build-Depends:
+dh-cargo"; this is a general principle when declaring dependencies.
 
 If CARGO_HOME doesn't end with debian/cargo_home, then this script does nothing
 and passes through directly to cargo.
@@ -25,15 +35,28 @@
 - DEB_CARGO_PACKAGE
   Debian binary package that the result is to be installed into.
 
-- DEB_CARGO_CRATE_IN_REGISTRY
-  Whether the crate is in the local-registry (1) or the cwd (0, empty).
-
-- CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-- DEB_HOST_GNU_TYPE DEB_HOST_RUST_TYPE
+- CFLAGS CXXFLAGS CPPFLAGS LDFLAGS [*]
+- DEB_HOST_GNU_TYPE DEB_HOST_RUST_TYPE [*]
 - (optional) DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
 
-Due to https://github.com/rust-lang/cargo/issues/6338 you should probably
-*unset* RUSTFLAGS.
+- (optional) DEB_CARGO_INSTALL_PREFIX
+  Prefix to install binaries under. Default: /usr. Sometimes you might want to
+  change this to /usr/lib/cargo if the binary clashes with something else, and
+  then symlink it into /usr under an alternative name - e.g. fd/fd-find.
+
+- (optional) DEB_CARGO_CRATE_IN_REGISTRY
+  Whether the crate is in the local-registry (1) or cwd (0, empty, default).
+
+For the envvars marked [*], it is easiest to set these in your d/rules via:
+
+    include /usr/share/dpkg/architecture.mk
+    include /usr/share/dpkg/buildflags.mk
+    include /usr/share/rustc/architecture.mk
+    export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+    export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE
+
+Due to https://github.com/rust-lang/cargo/issues/6338 you may want to *unset*
+RUSTFLAGS; if it's set (even to empty) it will break this script.
 """
 
 import os
@@ -44,9 +67,10 @@
 
 FLAGS = "CFLAGS CXXFLAGS CPPFLAGS LDFLAGS"
 ARCHES = "DEB_HOST_GNU_TYPE DEB_HOST_RUST_TYPE"
+SYSTEM_REGISTRY = "/usr/share/cargo/registry"
 
 def log(*args):
-    print("debian cargo wrapper:", *args, file=sys.stderr)
+    print("debian cargo wrapper:", *args, file=sys.stderr, flush=True)
 
 def logrun(*args, **kwargs):
     log("running subprocess", args, kwargs)
@@ -55,8 +79,17 @@
 def sourcepath(p=None):
     return os.path.join(os.getcwd(), p) if p else os.getcwd()
 
-def prepare_debian(cargo_home, registry, cratespec, host_gnu_type, ldflags):
-    if not os.path.exists(sourcepath(registry)):
+def prepare_debian(cargo_home, registry, cratespec, host_gnu_type, ldflags, link_from_system):
+    registry_path = sourcepath(registry)
+    if link_from_system:
+        log("linking %s/* into %s/" % (SYSTEM_REGISTRY, registry_path))
+        os.makedirs(registry_path, exist_ok=True)
+        crates = os.listdir(SYSTEM_REGISTRY) if os.path.isdir(SYSTEM_REGISTRY) else []
+        for c in crates:
+            target = os.path.join(registry_path, c)
+            if not os.path.islink(target):
+                os.symlink(os.path.join(SYSTEM_REGISTRY, c), target)
+    elif not os.path.exists(registry_path):
         raise ValueError("non-existent registry: %s" % registry)
 
     rustflags = "-C debuginfo=2 --cap-lints warn".split()
@@ -64,7 +97,7 @@
     for f in ldflags:
         rustflags.extend(["-C", "link-arg=%s" % f])
     rustflags.extend(["--remap-path-prefix",
-        "%s=/usr/share/cargo/registry/%s" % (sourcepath(), cratespec.replace("_", "-"))])
+        "%s=%s/%s" % (sourcepath(), SYSTEM_REGISTRY, cratespec.replace("_", "-"))])
 
     # TODO: we cannot enable this until dh_shlibdeps works correctly; atm we get:
     # dpkg-shlibdeps: warning: can't extract name and version from library name 'libstd-XXXXXXXX.so'
@@ -82,13 +115,13 @@
 
 [build]
 rustflags = {1}
-""".format(sourcepath(registry), repr(rustflags)))
+""".format(registry_path, repr(rustflags)))
 
     return 0
 
-def install(binpkg, cratespec, host_rust_type, crate_in_registry, *args):
+def install(binpkg, cratespec, host_rust_type, crate_in_registry, install_prefix, *args):
     crate, version = cratespec.rsplit("_", 1)
-    install_target = sourcepath("debian/%s/usr" % binpkg)
+    install_target = sourcepath("debian/%s/%s" % (binpkg, install_prefix))
     logrun(["env", "RUST_BACKTRACE=1",
         # set CARGO_TARGET_DIR so build products are saved in target/
         # normally `cargo install` deletes them when it exits
@@ -142,8 +175,12 @@
 
     if args[0] == "prepare-debian":
         registry = args[1]
+        link_from_system = False
+        if len(args) > 2 and args[2] == "--link-from-system":
+            link_from_system = True
         return prepare_debian(cargo_home, registry,
-            os.environ["DEB_CARGO_CRATE"], host_gnu_type, os.getenv("LDFLAGS", "").split())
+            os.environ["DEB_CARGO_CRATE"], host_gnu_type,
+            os.getenv("LDFLAGS", "").split(), link_from_system)
 
     newargs = []
     subcmd = None
@@ -178,6 +215,7 @@
             os.environ["DEB_CARGO_CRATE"],
             host_rust_type,
             os.getenv("DEB_CARGO_CRATE_IN_REGISTRY", "") == "1",
+            os.getenv("DEB_CARGO_INSTALL_PREFIX", "/usr"),
             *newargs)
     else:
         return logrun(["env", "RUST_BACKTRACE=1", "/usr/bin/cargo"] + list(newargs)).returncode
diff -Nru cargo-0.32.0/debian/cargo.bash-completion cargo-0.33.0/debian/cargo.bash-completion
--- cargo-0.32.0/debian/cargo.bash-completion	2018-10-17 09:53:53.000000000 +0000
+++ cargo-0.33.0/debian/cargo.bash-completion	2019-02-27 08:08:29.000000000 +0000
@@ -1 +1 @@
-src/etc/cargo.bashcomp.sh
+src/etc/cargo.bashcomp.sh cargo
diff -Nru cargo-0.32.0/debian/changelog cargo-0.33.0/debian/changelog
--- cargo-0.32.0/debian/changelog	2019-01-23 20:59:16.000000000 +0000
+++ cargo-0.33.0/debian/changelog	2019-02-27 08:08:29.000000000 +0000
@@ -1,4 +1,4 @@
-cargo (0.32.0-1~exp1ubuntu1~16.04.1) xenial; urgency=medium
+cargo (0.33.0-1ubuntu1~16.04.1) xenial; urgency=medium
 
   * Backport to xenial
   * Embed libgit2 0.27.0 to avoid a dependency on a version which is newer
@@ -18,10 +18,75 @@
     in the libgit2 build depending on a version of libssh2 that is too recent
     - add debian/patches/git2-no-ssh_key_from_memory.patch
     - update debian/patches/series
-  * Do not use the http2 feature of the curl crate, not supported by libcurl
-    in Xenial and older.
+  * Do not use the http2 feature of the curl crate, and warn rather than fail
+    on errors caused by a too-old curl.
+    - add debian/patches/ignore-libcurl-errors.patch
+    - update debian/patches/series
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 27 Feb 2019 21:08:29 +1300
+
+cargo (0.33.0-1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't use the bootstrap.py script for bootstrapping as it no longer
+      works.
+      - remove debian/bootstrap.py
+      - update debian/make_orig_multi.sh
+    - Disable fetch tests on non x86/x86-64 architectures, as those hit an
+      unreachable!() in test code. Disable the Debian patch that disables these
+      tests on every architecture
+      - add debian/patches/disable-fetch-tests-on-non-x86.patch
+      - update debian/patches/series
+    - Disable test tool_paths::custom_runner which fails every now and again
+      because of a libstd bug (https://github.com/rust-lang/rust/issues/55242)
+      - add debian/patches/disable-tool_paths-custom_runner.patch
+      - update debian/patches/series
+  * Dropped change:
+    - Ignore test failures on s390x. There's no Debian build yet on this
+      arch and there's nothing in the archive that requires cargo on s390x at
+      this time
+      - update debian/rules
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 14 Feb 2019 10:49:58 +1300
+
+cargo (0.33.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 05 Feb 2019 20:52:47 -0800
+
+cargo (0.32.0-2~exp1) experimental; urgency=medium
+
+  * Drop patch 2007, for disabling incremental build on sparc64.
+    Closes: bug#917048, Thanks to John Paul Adrian Glaubitz.
+
+ -- Vasudev Kamath <vasudev@copyninja.info>  Sat, 02 Feb 2019 13:16:13 +0530
+
+cargo (0.32.0-1) unstable; urgency=medium
+
+  * debian-cargo-wrapper: Support DEB_CARGO_INSTALL_PREFIX for installing into
+    somewhere other than /usr, e.g. / or /usr/lib/cargo.
+  * Move dev scripts from /usr/share/cargo into /usr/share/cargo/scripts.
+  * Increase yet another timeout duration for slower architectures.
+
+ -- Ximin Luo <infinity0@debian.org>  Thu, 24 Jan 2019 00:29:51 -0800
+
+cargo (0.32.0-1~exp3) experimental; urgency=medium
+
+  [ Matt Kraai ]
+  * Rename bash completion script so that it's used.
+
+  [ Ximin Luo ]
+  * Further increase a timeout duration for mips.
+  * debian-cargo-wrapper: add --link-to-system option
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 23 Jan 2019 19:44:05 -0800
+
+cargo (0.32.0-1~exp2) experimental; urgency=medium
+
+  * Try to deal with the various test failures as suggested by upstream.
 
- -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 24 Jan 2019 09:59:16 +1300
+ -- Ximin Luo <infinity0@debian.org>  Tue, 22 Jan 2019 20:08:29 -0800
 
 cargo (0.32.0-1~exp1ubuntu1) disco; urgency=medium
 
diff -Nru cargo-0.32.0/debian/copyright cargo-0.33.0/debian/copyright
--- cargo-0.32.0/debian/copyright	2019-01-23 20:59:16.000000000 +0000
+++ cargo-0.33.0/debian/copyright	2019-02-27 08:08:29.000000000 +0000
@@ -19,6 +19,7 @@
 Files: vendor/bitflags/*
        vendor/bufstream/*
        vendor/env_logger/*
+       vendor/env_logger-0*/*
        vendor/flate2/*
        vendor/fs2/*
        vendor/glob/*
@@ -37,10 +38,13 @@
        vendor/rand_chacha/*
        vendor/rand_hc/*
        vendor/rand_isaac/*
+       vendor/rand_jitter/*
+       vendor/rand_os/*
        vendor/rand_pcg/*
        vendor/rand_xorshift/*
+       vendor/num-integer/*
        vendor/num-traits/*
-Copyright: 2014-2018 The Rust Project Developers
+Copyright: 2010-2019 The Rust Project Developers
 License: MIT or Apache-2.0
 Comment:
  This is a collection of external crates embedded here to bootstrap cargo.
@@ -48,29 +52,37 @@
  same MIT/Apache-2.0 dual-license. See https://github.com/rust-lang.
  Exceptions are noted below.
 
-Files: vendor/backtrace/*
-       vendor/backtrace-sys/*
-       vendor/cfg-if/*
-       vendor/filetime/*
-       vendor/git2/*
-       vendor/git2-curl/*
-       vendor/jobserver/*
-       vendor/libz-sys/*
-       vendor/libgit2-sys/*
-       vendor/libssh2-sys/*
-       vendor/miow/*
-       vendor/openssl-probe/*
-       vendor/pkg-config/*
-       vendor/rustc-demangle/*
-       vendor/tar/*
-       vendor/toml/*
-       vendor/socket2/*
-       vendor/libnghttp2-sys/*
-       vendor/wait-timeout/*
+Files:
+ vendor/backtrace/*
+ vendor/backtrace-sys/*
+ vendor/cc/*
+ vendor/cfg-if/*
+ vendor/filetime/*
+ vendor/fnv/*
+ vendor/git2/*
+ vendor/git2-curl/*
+ vendor/jobserver/*
+ vendor/libz-sys/*
+ vendor/libgit2-sys/*
+ vendor/libssh2-sys/*
+ vendor/miow/*
+ vendor/openssl-probe/*
+ vendor/pkg-config/*
+ vendor/proc-macro2/*
+ vendor/rustc-workspace-hack/*
+ vendor/rustc-demangle/*
+ vendor/tar/*
+ vendor/time/*
+ vendor/toml/*
+ vendor/socket2/*
+ vendor/libnghttp2-sys/*
+ vendor/wait-timeout/*
 Copyright: 2014-2018 Alex Crichton <alex@alexcrichton.com>
            2014-2018 The Rust Project Developers
 License: MIT or Apache-2.0
-Comment: see https://github.com/alexcrichton/
+Comment:
+ see https://github.com/alexcrichton/
+ see https://github.com/servo/rust-fnv
 
 Files:
  vendor/aho-corasick/*
@@ -100,29 +112,76 @@
  * https://github.com/BurntSushi/walkdir
  * https://github.com/BurntSushi/winapi-util
 
-Files:
- vendor/crossbeam-channel/*
- vendor/crossbeam-epoch/*
- vendor/crossbeam-utils/*
-Copyright: 2017-2018 The Crossbeam Project Developers
-License: MIT or Apache-2.0
-Comment: see https://github.com/crossbeam-rs/crossbeam-deque
-
 Files: vendor/ucd-util/*
 Copyright: 2015 Andrew Gallant <jamslam@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/BurntSushi/rucd
 
-Files: vendor/winapi/*
-Copyright: 2014-2017 Peter Atashian <retep998@gmail.com>
-           2014-2017 winapi-rs developers
+Files: vendor/ansi_term/*
+Copyright: 2014, Benjamin Sago <ogham@bsago.me>
+           Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
+           Josh Triplett <josh@joshtriplett.org>
 License: MIT
-Comment: see https://github.com/retep998/winapi-rs
 
-Files: vendor/winapi-*-pc-windows-gnu/*
-Copyright: 2014-2018 Peter Atashian <retep998@gmail.com>
+Files: vendor/atty/*
+Copyright: 2015-2016, Doug Tangren
+License: MIT
+Comment: see https://github.com/softprops/atty
+
+Files: vendor/autocfg/*
+Copyright: 2018-2019 Josh Stone <cuviper@gmail.com>
+License: Apache-2.0 or MIT
+Comment: see https://github.com/cuviper/autocfg
+
+Files: vendor/bit-set/*
+ vendor/bit-vec/*
+Copyright: 2016 The Rust Project Developers
+           Alexis Beingessner <a.beingessner@gmail.com>
 License: MIT or Apache-2.0
-Comment: see https://github.com/retep998/winapi-rs
+
+Files: vendor/chrono/*
+Copyright: 2014-2018 Kang Seonghoon <public+rust@mearie.org>
+           2014-2018 Brandon W Maister <quodlibetor@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/chronotope/chrono
+
+Files: vendor/clap/*
+Copyright: 2015-2016, Kevin B. Knapp <kbknapp@gmail.com>
+License: MIT
+
+Files: vendor/cloudabi/*
+Copyright: Nuxi and contributors
+License: BSD-2-clause
+Comment: See https://github.com/nuxinl/cloudabi
+
+Files: vendor/core-foundation/*
+       vendor/core-foundation-sys/*
+Copyright: 2012-2013, The Servo Project Developers,
+ 2012-2013, Mozilla Foundation
+License: MIT or Apache-2.0
+Comment: see https://github.com/servo/core-foundation-rs
+
+Files: vendor/crc32fast/*
+Copyright: 2018, Sam Rijs <srijs@airpost.net>
+           2018, Alex Crichton <alex@alexcrichton.com>
+License: MIT or Apache-2.0
+
+Files:
+ vendor/crossbeam-channel/*
+ vendor/crossbeam-utils/*
+Copyright: 2017-2018 The Crossbeam Project Developers
+License: MIT or Apache-2.0
+Comment: see https://github.com/crossbeam-rs
+
+Files: vendor/commoncrypto/*
+       vendor/commoncrypto-sys/*
+       vendor/crypto-hash/*
+Copyright: 2016, Mark Lee
+ 2015-2016, Mark Lee
+License: MIT
+Comment:
+ * see https://github.com/malept/rust-commoncrypto
+ * see https://github.com/malept/crypto-hash
 
 Files: vendor/curl/*
        vendor/curl-sys/*
@@ -131,6 +190,45 @@
 License: MIT
 Comment: see https://github.com/sfackler/rust-openssl
 
+Files: vendor/failure/*
+       vendor/failure_derive/*
+Copyright: Without Boats <boats@mozilla.com>
+License: MIT or Apache-2.0
+Comment:
+ * see https://github.com/withoutboats/failure
+ * see https://github.com/withoutboats/failure_derive
+
+Files: vendor/fuchsia-cprng/*
+Copyright:
+ 2018 The Fuchsia Authors
+ 2018 Erick Tryzelaar <etryzelaar@google.com>
+License: BSD-3-Clause
+Comment: see https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng
+
+Files: vendor/hex/*
+Copyright: 2015, rust-hex Developers
+License: MIT or Apache-2.0
+Comment: see https://github.com/KokaKiwi/rust-hex
+
+Files: vendor/home/*
+Copyright: Brian Anderson <andersb@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/brson/home
+
+Files: vendor/humantime/*
+Copyright: 2016, The humantime Developers
+License: MIT or Apache-2.0
+Comment:
+ Includes parts of http date with copyright: 2016, Pyfisch and portions of musl
+ libc with copyright 2005-2013 Rich Felker.
+ .
+ See https://github.com/tailhook/humantime
+
+Files: vendor/im-rc/*
+Copyright: 2017-2019 Bodil Stokke <bodil@bodil.org>
+License: MPL-2.0+
+Comment: see https://github.com/bodil/im-rs
+
 Files: vendor/itoa/*
        vendor/quote/*
 Copyright: 2016-2017 David Tolnay <dtolnay@gmail.com>
@@ -160,7 +258,6 @@
 License: MIT or Apache-2.0
 
 Files: vendor/lazy_static/*
- vendor/owning_ref/*
  vendor/rustc_version/*
 Copyright: 2014-2016 Marvin Löbel <loebel.marvin@gmail.com>
 License: MIT or Apache-2.0
@@ -170,8 +267,8 @@
 License: MIT
 Comment: see https://github.com/SimonSapin/rust-std-candidates
 
-Files: vendor/smallvec/*
-Copyright: 2018 Simon Sapin <simon.sapin@exyr.org>
+Files: vendor/num_cpus/*
+Copyright: 2015, Sean McArthur <sean@seanmonstar.com>
 License: MIT or Apache-2.0
 
 Files: vendor/opener/*
@@ -191,6 +288,50 @@
 License: MIT
 Comment: see https://github.com/sfackler/rust-openssl
 
+Files: vendor/pretty_env_logger/*
+Copyright: 2016-2019 Sean McArthur <sean@seanmonstar>
+License: MIT or Apache-2.0
+Comment: see https://github.com/seanmonstar/pretty-env-logger
+
+Files: vendor/proptest/*
+ vendor/rusty-fork/*
+Copyright: Jason Lingle
+           2016 FullContact, Inc
+License: MIT or Apache-2.0
+
+Files: vendor/quick-error/*
+Copyright: 2015, The quick-error developers
+License: MIT or Apache-2.0
+
+Files: vendor/rdrand/*
+Copyright: 2014-2018 Simonas Kazlauskas <rdrand@kazlauskas.me>
+License: ISC
+Comment: see https://github.com/nagisa/rust_rdrand/
+
+Files: vendor/redox_syscall/*
+       vendor/redox_termios/*
+Copyright: 2017, Redox OS Developers
+License: MIT
+
+Files: vendor/remove_dir_all/*
+Copyright: 2017, Aaron Power <theaaronepower@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/Aaronepower/remove_dir_all
+
+Files: vendor/rustfix/*
+Copyright: 2016, Pascal Hertleif
+           2016, Oliver Schneider
+License: MIT or Apache-2.0
+
+Files: vendor/ryu/*
+Copyright: David Tolnay <dtolnay@gmail.com>
+License: BSL-1.0 or Apache-2.0
+
+Files: vendor/schannel/*
+Copyright: 2015, Steffen Butzer <steffen.butzer@outlook.com>
+License: MIT
+Comment: see https://github.com/steffengy/schannel-rs/
+
 Files: vendor/semver-parser/*
 Copyright: 2016-2018 Steve Klabnik <steve@steveklabnik.com>
 License: MIT or Apache-2.0
@@ -206,6 +347,16 @@
 Comment: see https://github.com/serde-rs
          see https://github.com/dtolnay/serde-ignored
 
+Files: vendor/scopeguard/*
+Copyright: 2015, The Rust Project Developers
+           bluss
+License: MIT or Apache-2.0
+Comment: see https://github.com/bluss/scopeguard
+
+Files: vendor/smallvec/*
+Copyright: 2018 Simon Sapin <simon.sapin@exyr.org>
+License: MIT or Apache-2.0
+
 Files: vendor/strsim/*
 Copyright: 2015 Danny Guo <dannyguo91@gmail.com>
 License: MIT
@@ -216,29 +367,43 @@
 License: MIT or Apache-2.0
 Comment: see https://github.com/dtolnay/syn
 
-Files: vendor/ryu/*
-Copyright: David Tolnay <dtolnay@gmail.com>
-License: BSL-1.0 or Apache-2.0
+Files: vendor/synstructure/*
+Copyright: Michael Layzell <michael@thelayzells.com>
+License: MIT
+Comment: see https://github.com/mystor/synstructure
+
+Files: vendor/termion/*
+Copyright: 2016, Ticki
+License: MIT
+Comment: see https://github.com/ticki/termion/
+
+Files: vendor/textwrap/*
+Copyright: 2016, Martin Geisler <martin@geisler.net>
+License: MIT
+
+Files: vendor/tempfile/*
+Copyright: 2015, Steven Allen
+License: MIT or Apache-2.0
 
 Files: vendor/thread_local/*
- vendor/lock_api/*
- vendor/parking_lot/*
- vendor/parking_lot_core/*
 Copyright: 2016 Amanieu d'Antras <amanieu@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/Amanieu/thread_local-rs
 
+Files: vendor/typenum/*
+Copyright: 2015-2018 Paho Lurie-Gregg <paho@paholg.com>
+           2015-2018 Andre Bogus <bogusandre@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/paholg/typenum
+
 Files: vendor/unicode-bidi/*
 Copyright: 2015 The Servo Project Developers
 License: MIT or Apache-2.0
 Comment: see https://github.com/servo/unicode-bidi
 
-Files: vendor/core-foundation/*
-       vendor/core-foundation-sys/*
-Copyright: 2012-2013, The Servo Project Developers,
- 2012-2013, Mozilla Foundation
+Files: vendor/unicode-normalization/*
+Copyright: 2016 kwantam <kwantam@gmail.com>
 License: MIT or Apache-2.0
-Comment: see https://github.com/servo/core-foundation-rs
 
 Files: vendor/unicode-xid/*
 Copyright: 2015-2017 erick.tryzelaar <erick.tryzelaar@gmail.com>
@@ -252,19 +417,6 @@
 License: MIT
 Comment: see https://github.com/reem/
 
-Files: vendor/crc32fast/*
-Copyright: 2018, Sam Rijs <srijs@airpost.net>
-           2018, Alex Crichton <alex@alexcrichton.com>
-License: MIT or Apache-2.0
-
-Files: vendor/crossbeam-utils-*
-Copyright: The Crossbeam Project Developers
-License: MIT or Apache-2.0
-
-Files: vendor/unicode-normalization/*
-Copyright: 2016 kwantam <kwantam@gmail.com>
-License: MIT or Apache-2.0
-
 Files: vendor/url/*
        vendor/percent-encoding/*
 Copyright: 2015-2016 Simon Sapin <simon.sapin@exyr.org>
@@ -273,173 +425,27 @@
 Comment: see https://github.com/servo/rust-url
          see https://github.com/servo/rust-url/tree/master/percent_encoding
 
-Files: vendor/hex/*
-Copyright: 2015, rust-hex Developers
-License: MIT or Apache-2.0
-Comment: see https://github.com/KokaKiwi/rust-hex
-
-Files: vendor/num_cpus/*
-Copyright: 2015, Sean McArthur <sean@seanmonstar.com>
-License: MIT or Apache-2.0
-
-Files: vendor/atty/*
-Copyright: 2015-2016, Doug Tangren
-License: MIT
-Comment: see https://github.com/softprops/atty
-
-Files: vendor/fnv/*
- vendor/cc/*
- vendor/proc-macro2/*
- vendor/rustc-workspace-hack/*
-Copyright: 2017-2018, Alex Crichton <alex@alexcrichton.com>
-License: MIT or Apache-2.0
-Comment:
- see https://github.com/servo/rust-fnv/
- see https://github.com/alexcrichton/proc-macro
-
-
-Files: vendor/home/*
-Copyright: Brian Anderson <andersb@gmail.com>
-License: MIT or Apache-2.0
-Comment: see https://github.com/brson/home
-
-Files: vendor/fuchsia-zircon/*
-       vendor/fuchsia-zircon-sys/*
-Copyright: Raph Levien <raph@google.com>
-           2016, The Fuchsia Authors
-License: BSD-3-Clause
-Comment:
- * see https://fuchsia.googlesource.com/magenta-rs/
- * see https://fuchsia.googlesource.com/garnet/
-
-Files: vendor/scopeguard/*
-Copyright: 2015, The Rust Project Developers
-           bluss
-License: MIT or Apache-2.0
-Comment: see https://github.com/bluss/scopeguard
-
 Files: vendor/vcpkg/*
 Copyright: 2017-2017 Jim McGrath <jimmc2@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/mcgoo/vcpkg-rs
 
-Files: vendor/commoncrypto/*
-       vendor/commoncrypto-sys/*
-       vendor/crypto-hash/*
-Copyright: 2016, Mark Lee
- 2015-2016, Mark Lee
-License: MIT
-Comment:
- * see https://github.com/malept/rust-commoncrypto
- * see https://github.com/malept/crypto-hash
-
-Files: vendor/redox_syscall/*
-       vendor/redox_termios/*
-Copyright: 2017, Redox OS Developers
-License: MIT
-
-Files: vendor/ansi_term/*
-Copyright: 2014, Benjamin Sago <ogham@bsago.me>
-           Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
-           Josh Triplett <josh@joshtriplett.org>
-License: MIT
-
-Files: vendor/quick-error/*
-Copyright: 2015, The quick-error developers
-License: MIT or Apache-2.0
-
-Files: vendor/termion/*
-Copyright: 2016, Ticki
-License: MIT
-Comment: see https://github.com/ticki/termion/
-
-Files: vendor/failure/*
-       vendor/failure_derive/*
-Copyright: Without Boats <boats@mozilla.com>
-License: MIT or Apache-2.0
-Comment:
- * see https://github.com/withoutboats/failure
- * see https://github.com/withoutboats/failure_derive
-
-Files: vendor/remove_dir_all/*
-Copyright: 2017, Aaron Power <theaaronepower@gmail.com>
-License: MIT or Apache-2.0
-Comment: see https://github.com/Aaronepower/remove_dir_all
-
-Files: vendor/synstructure/*
-Copyright: Michael Layzell <michael@thelayzells.com>
-License: MIT
-Comment: see https://github.com/mystor/synstructure
-
-Files: vendor/schannel/*
-Copyright: 2015, Steffen Butzer <steffen.butzer@outlook.com>
-License: MIT
-Comment: see https://github.com/steffengy/schannel-rs/
-
-Files: vendor/humantime/*
-Copyright: 2016, The humantime Developers
-License: MIT or Apache-2.0
-Comment:
- Includes parts of http date with copyright: 2016, Pyfisch and portions of musl
- libc with copyright 2005-2013 Rich Felker.
- .
- See https://github.com/tailhook/humantime
-
-Files: vendor/textwrap/*
-Copyright: 2016, Martin Geisler <martin@geisler.net>
-License: MIT
-
-Files: vendor/clap/*
-Copyright: 2015-2016, Kevin B. Knapp <kbknapp@gmail.com>
-License: MIT
-
-Files: vendor/tempfile/*
-Copyright: 2015, Steven Allen
-License: MIT or Apache-2.0
-
-Files: vendor/cloudabi/*
-Copyright: Nuxi and contributors
-License: BSD-2-clause
-Comment: See https://github.com/nuxinl/cloudabi
-
-Files: vendor/arrayvec/*
- vendor/nodrop/*
-Copyright: 2015-2017, Ulrik Sverdrup "bluss"
-License: MIT or Apache-2.0
-
-Files: vendor/memoffset/*
-Copyright: 2017, Gilad Naamn
+Files: vendor/winapi/*
+Copyright: 2014-2017 Peter Atashian <retep998@gmail.com>
+           2014-2017 winapi-rs developers
 License: MIT
+Comment: see https://github.com/retep998/winapi-rs
 
-Files: vendor/version_check/*
-Copyright: 2017-2018, Sergio Benitez
-License: MIT or Apache-2.0
-
-Files: vendor/stable_deref_trait/*
-Copyright: 2017, Robert Grosse
-License: MIT or Apache-2.0
-
-Files: vendor/rustfix/*
-Copyright: 2016, Pascal Hertleif
-           2016, Oliver Schneider
-License: MIT or Apache-2.0
-
-Files: vendor/bit-set/*
- vendor/bit-vec/*
-Copyright: 2016 The Rust Project Developers
-           Alexis Beingessner <a.beingessner@gmail.com>
-License: MIT or Apache-2.0
-
-Files: vendor/proptest/*
- vendor/rusty-fork/*
-Copyright: Jason Lingle
-           2016 FullContact, Inc
+Files: vendor/winapi-*-pc-windows-gnu/*
+Copyright: 2014-2018 Peter Atashian <retep998@gmail.com>
 License: MIT or Apache-2.0
+Comment: see https://github.com/retep998/winapi-rs
 
 Files: debian/*
-Copyright: 2017 Ximin Luo <infinity0@debian.org>
-           2015-2016 Luca Bruno <lucab@debian.org>
-           2017-2018 Vasudeva Kamath <vasudev@copyninja.info>
+Copyright:
+ 2016-2019 Ximin Luo <infinity0@debian.org>
+ 2017-2019 Vasudeva Kamath <vasudev@copyninja.info>
+ 2015-2016 Luca Bruno <lucab@debian.org>
 License: MIT or Apache-2.0
 
 Files: debian/bootstrap.py
@@ -447,6 +453,10 @@
 License: BSD-2-clause
 Comment: See LICENSE at https://github.com/dhuseby/cargo-bootstrap/
 
+License: Apache-2.0
+ On Debian systems, see /usr/share/common-licenses/Apache-2.0 for
+ the full text of the Apache License version 2.
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -496,6 +506,19 @@
  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 License: MIT
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -515,9 +538,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 
-License: Apache-2.0
- On Debian systems, see /usr/share/common-licenses/Apache-2.0 for
- the full text of the Apache License version 2.
+License: MPL-2.0
+ Debian systems provide the MPL 2.0 in /usr/share/common-licenses/MPL-2.0
 
 License: Unlicense
  This is free and unencumbered software released into the public domain.
diff -Nru cargo-0.32.0/debian/debcargo-conf.patch cargo-0.33.0/debian/debcargo-conf.patch
--- cargo-0.32.0/debian/debcargo-conf.patch	2019-01-23 02:26:59.000000000 +0000
+++ cargo-0.33.0/debian/debcargo-conf.patch	2019-02-27 08:08:29.000000000 +0000
@@ -144,55 +144,6 @@
 - [target."cfg(windows)".dependencies.rand]
 --version = "0.4"
 -+version = "< 0.6, >= 0.4"
-diff --git a/src/openssl-sys/debian/patches/disable-vendor.patch b/src/openssl-sys/debian/patches/disable-vendor.patch
-index a4e6d8f..b8e1051 100644
---- a/src/openssl-sys/debian/patches/disable-vendor.patch
-+++ b/src/openssl-sys/debian/patches/disable-vendor.patch
-@@ -1,11 +1,11 @@
----- a/Cargo.toml	2018-09-03 21:17:45.506177066 -0700
--+++ b/Cargo.toml	2018-09-03 21:18:00.573513575 -0700
-+--- a/Cargo.toml
-++++ b/Cargo.toml
- @@ -28,14 +28,11 @@
-  [build-dependencies.cc]
-  version = "1.0"
-  
- -[build-dependencies.openssl-src]
---version = "110.0.4"
-+-version = "111.0.1"
- -optional = true
- -
-  [build-dependencies.pkg-config]
-diff --git a/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff b/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff
-index d5c8ce5..449bed0 100644
---- a/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff
-+++ b/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff
-@@ -1,13 +1,17 @@
--Index: rand/Cargo.toml
--===================================================================
----- rand.orig/Cargo.toml
--+++ rand/Cargo.toml
--@@ -48,7 +48,7 @@ default = ["std"]
-- i128_support = []
-- nightly = ["i128_support"]
-- serde1 = ["serde", "serde_derive", "rand_core/serde1"]
-+--- a/Cargo.toml
-++++ b/Cargo.toml
-+@@ -65,13 +65,10 @@
-+ nightly = ["simd_support"]
-+ serde1 = ["rand_core/serde1", "rand_isaac/serde1", "rand_xorshift/serde1"]
-+ simd_support = ["packed_simd"]
- -std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-zircon"]
- +std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi"]
-  [target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
-  version = "0.0.3"
-  optional = true
-+-[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon]
-+-version = "0.3.2"
-+-optional = true
-+ [target."cfg(unix)".dependencies.libc]
-+ version = "0.2"
-+ optional = true
 diff --git a/src/unicode-bidi/debian/patches/no-flamegraphs.patch b/src/unicode-bidi/debian/patches/no-flamegraphs.patch
 index 6234d5d..9acab86 100644
 --- a/src/unicode-bidi/debian/patches/no-flamegraphs.patch
diff -Nru cargo-0.32.0/debian/install cargo-0.33.0/debian/install
--- cargo-0.32.0/debian/install	2018-11-18 20:55:25.000000000 +0000
+++ cargo-0.33.0/debian/install	2019-02-27 08:08:29.000000000 +0000
@@ -1,2 +1,2 @@
-debian/scripts/*                        usr/share/cargo
+debian/scripts/*                        usr/share/cargo/scripts
 debian/bin/cargo                        usr/share/cargo/bin
diff -Nru cargo-0.32.0/debian/make_orig_multi.sh cargo-0.33.0/debian/make_orig_multi.sh
--- cargo-0.32.0/debian/make_orig_multi.sh	2019-01-23 02:26:59.000000000 +0000
+++ cargo-0.33.0/debian/make_orig_multi.sh	2019-02-27 08:08:29.000000000 +0000
@@ -12,7 +12,7 @@
 all:
 	@echo $(DEB_VERSION_UPSTREAM)
 EOF
-WORKDIR=${PWD}
+SRCDIR="$PWD"
 
 if [ -z "$1" ]
   then
@@ -24,7 +24,6 @@
 fi;
 
 BOOTSTRAP_PY=$(find "${PWD}" -name bootstrap.py -type f)
-VENDOR_FILTER=$(find "${PWD}/debian" -name vendor-tarball-filter.txt -type f)
 VENDOR_SUS_WHITELIST=$(find "${PWD}/debian" -name vendor-tarball-unsuspicious.txt -type f)
 
 # Download cargo tarball
@@ -42,25 +41,16 @@
 export GIT_COMMITTER_NAME="${GIT_AUTHOR_NAME}"
 export GIT_COMMITTER_EMAIL="${GIT_AUTHOR_EMAIL}"
 
-# Make sure WORKDIR env is accessible to debian-cargo-vendor
-export WORKDIR
+SRCDIR="$SRCDIR" "$SRCDIR/debian/scripts/debian-cargo-vendor"
 
-${WORKDIR}/debian/scripts/debian-cargo-vendor
+cp -R vendor vendor-scan
 
-# Clean embedded libs and update checksums
-grep -v '^#' ${VENDOR_FILTER} | xargs  -I% sh -c 'rm -rf vendor/%'
+( cd vendor-scan
+"$SRCDIR/debian/scripts/audit-vendor-source" \
+  "$VENDOR_SUS_WHITELIST" \
+  "the 'excludes' key of the relevant debcargo.toml in debcargo-conf.git"
+)
 
-# Report any suspicious files
-cp -R vendor vendor-scan
-grep -v '^#' ${VENDOR_SUS_WHITELIST} | xargs  -I% sh -c 'rm -rf vendor-scan/%'
-echo "Checking for suspicious files..."
-# The following shell snippet is a bit more strict than suspicious-source(1)
-find vendor-scan -type f -and -not -name '.cargo-checksum.json' -exec file '{}' \; | \
-  sed -e 's/\btext\b\(.*\), with very long lines/verylongtext\1/g' | \
-  grep -v '\b\(text\|empty\)\b' || true
-echo "The above files (if any) seem suspicious, please audit them."
-echo "If good, add them to ${VENDOR_SUS_WHITELIST}."
-echo "If bad, add them to ${VENDOR_FILTER} and/or the relevant debcargo.toml in debcargo-conf.git"
 rm -rf vendor-scan
 
 # Pack it up, reproducibly
diff -Nru cargo-0.32.0/debian/patches/1001_fix_inc_exc_tests.patch cargo-0.33.0/debian/patches/1001_fix_inc_exc_tests.patch
--- cargo-0.32.0/debian/patches/1001_fix_inc_exc_tests.patch	2018-11-18 20:55:25.000000000 +0000
+++ cargo-0.33.0/debian/patches/1001_fix_inc_exc_tests.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-Author: Ximin Luo <infinity0@debian.org>
-Forwarded: https://github.com/rust-lang/cargo/pull/6260
-diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
-index f52b3cece..2d655f0a0 100644
---- a/tests/testsuite/package.rs
-+++ b/tests/testsuite/package.rs
-@@ -285,7 +285,8 @@ dependency `bar` does not specify a version.
- 
- #[test]
- fn exclude() {
--    let p = project()
-+    let root = paths::root().join("exclude");
-+    let repo = git::repo(&root)
-         .file("Cargo.toml", r#"
-             [project]
-             name = "foo"
-@@ -348,7 +349,8 @@ fn exclude() {
-         .file("some_dir/dir_deep_5/some_dir/file", "")
-         .build();
- 
--    p.cargo("package --no-verify -v")
-+    cargo_process("package --no-verify -v")
-+        .cwd(repo.root())
-         .with_stdout("")
-         .with_stderr(
-             "\
-@@ -366,7 +368,6 @@ See [..]
- See [..]
- [WARNING] [..] file `some_dir/file_deep_1` WILL be excluded [..]
- See [..]
--[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
- [PACKAGING] foo v0.0.1 ([..])
- [ARCHIVING] [..]
- [ARCHIVING] [..]
-@@ -386,14 +387,17 @@ See [..]
- [ARCHIVING] [..]
- [ARCHIVING] [..]
- [ARCHIVING] [..]
-+[ARCHIVING] .cargo_vcs_info.json
- ",
-         ).run();
- 
--    assert!(p.root().join("target/package/foo-0.0.1.crate").is_file());
-+    assert!(repo.root().join("target/package/foo-0.0.1.crate").is_file());
- 
--    p.cargo("package -l")
-+    cargo_process("package -l")
-+        .cwd(repo.root())
-         .with_stdout(
-             "\
-+.cargo_vcs_info.json
- Cargo.toml
- dir_root_1/some_dir/file
- dir_root_2/some_dir/file
-@@ -418,7 +422,8 @@ src/main.rs
- 
- #[test]
- fn include() {
--    let p = project()
-+    let root = paths::root().join("include");
-+    let repo = git::repo(&root)
-         .file("Cargo.toml", r#"
-             [project]
-             name = "foo"
-@@ -432,16 +437,17 @@ fn include() {
-         .file("src/bar.txt", "") // should be ignored when packaging
-         .build();
- 
--    p.cargo("package --no-verify -v")
-+    cargo_process("package --no-verify -v")
-+        .cwd(repo.root())
-         .with_stderr(
-             "\
- [WARNING] manifest has no description[..]
- See http://doc.crates.io/manifest.html#package-metadata for more info.
--[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
- [PACKAGING] foo v0.0.1 ([..])
- [ARCHIVING] [..]
- [ARCHIVING] [..]
- [ARCHIVING] [..]
-+[ARCHIVING] .cargo_vcs_info.json
- ",
-         ).run();
- }
diff -Nru cargo-0.32.0/debian/patches/1002_fix_doc_tests_order_hash.patch cargo-0.33.0/debian/patches/1002_fix_doc_tests_order_hash.patch
--- cargo-0.32.0/debian/patches/1002_fix_doc_tests_order_hash.patch	2018-11-18 20:55:25.000000000 +0000
+++ cargo-0.33.0/debian/patches/1002_fix_doc_tests_order_hash.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-From f075f9c6cbf11c6484330d24b8a49fbbdb465d66 Mon Sep 17 00:00:00 2001
-From: Eric Huss <eric@huss.org>
-Date: Sun, 4 Nov 2018 10:38:51 -0800
-Subject: [PATCH] Fix can_run_doc_tests order depends on hash.
-
-The deps are sorted, but the name is the same so the order depends on the metadata hash.
-Fix by sorting by the actual name, too.
----
- src/cargo/core/compiler/context/mod.rs | 2 ++
- tests/testsuite/rename_deps.rs         | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
-index 225e6ebd53..334a3876aa 100644
---- a/src/cargo/core/compiler/context/mod.rs
-+++ b/src/cargo/core/compiler/context/mod.rs
-@@ -234,6 +234,8 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
-                         }
-                     }
-                 }
-+                // Help with tests to get a stable order with renamed deps.
-+                doctest_deps.sort();
-                 self.compilation.to_doc_test.push(compilation::Doctest {
-                     package: unit.pkg.clone(),
-                     target: unit.target.clone(),
-diff --git a/tests/testsuite/rename_deps.rs b/tests/testsuite/rename_deps.rs
-index c444739b0f..209987b89c 100644
---- a/tests/testsuite/rename_deps.rs
-+++ b/tests/testsuite/rename_deps.rs
-@@ -334,8 +334,8 @@ fn can_run_doc_tests() {
- [DOCTEST] foo
- [RUNNING] `rustdoc --test [CWD]/src/lib.rs \
-         [..] \
--        --extern baz=[CWD]/target/debug/deps/libbar-[..].rlib \
-         --extern bar=[CWD]/target/debug/deps/libbar-[..].rlib \
-+        --extern baz=[CWD]/target/debug/deps/libbar-[..].rlib \
-         [..]`
- ",
-         ).run();
diff -Nru cargo-0.32.0/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch cargo-0.33.0/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch
--- cargo-0.32.0/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch	2019-02-27 08:08:29.000000000 +0000
@@ -0,0 +1,36 @@
+Description: Increase timeout for slow arches like mips
+Author: Ximin Luo <infinity0@debian.org>
+Bug: https://github.com/rust-lang/cargo/issues/6491
+--- a/tests/testsuite/support/resolver.rs
++++ b/tests/testsuite/support/resolver.rs
+@@ -118,7 +118,7 @@
+ 
+     // The largest test in our suite takes less then 30 sec.
+     // So lets fail the test if we have ben running for two long.
+-    assert!(start.elapsed() < Duration::from_secs(60));
++    assert!(start.elapsed() < Duration::from_secs(240));
+     resolve
+ }
+ 
+--- a/tests/testsuite/concurrent.rs
++++ b/tests/testsuite/concurrent.rs
+@@ -511,7 +511,7 @@
+     }
+ 
+     for _ in 0..n_concurrent_builds {
+-        let result = rx.recv_timeout(Duration::from_secs(30)).expect("Deadlock!");
++        let result = rx.recv_timeout(Duration::from_secs(120)).expect("Deadlock!");
+         execs().run_output(&result);
+     }
+ }
+--- a/src/cargo/core/resolver/types.rs
++++ b/src/cargo/core/resolver/types.rs
+@@ -57,7 +57,7 @@
+         // If any of them are removed then it takes more than I am willing to measure.
+         // So lets fail the test fast if we have ben running for two long.
+         if cfg!(debug_assertions) && (self.ticks % 1000 == 0) {
+-            assert!(self.start.elapsed() - self.deps_time < Duration::from_secs(90));
++            assert!(self.start.elapsed() - self.deps_time < Duration::from_secs(360));
+         }
+         Ok(())
+     }
diff -Nru cargo-0.32.0/debian/patches/2007_sparc64_disable_incremental_build.patch cargo-0.33.0/debian/patches/2007_sparc64_disable_incremental_build.patch
--- cargo-0.32.0/debian/patches/2007_sparc64_disable_incremental_build.patch	2018-11-18 20:55:25.000000000 +0000
+++ cargo-0.33.0/debian/patches/2007_sparc64_disable_incremental_build.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-Description: Disable incremental builds on sparc64
- Incremental builds are currently unreliable on sparc64,
- disable them by default for the time being.
-Last-Update: 2018-08-07
-
---- a/src/cargo/core/profiles.rs
-+++ b/src/cargo/core/profiles.rs
-@@ -458,6 +458,9 @@
-             debuginfo: Some(2),
-             debug_assertions: true,
-             overflow_checks: true,
-+            #[cfg(target_arch = "sparc64")]
-+            incremental: false,
-+            #[cfg(not(target_arch = "sparc64"))]
-             incremental: true,
-             ..Profile::default()
-         }
---- a/tests/testsuite/build.rs
-+++ b/tests/testsuite/build.rs
-@@ -38,6 +38,7 @@
- 
- /// Check that the `CARGO_INCREMENTAL` environment variable results in
- /// `rustc` getting `-Zincremental` passed to it.
-+#[cfg(not(target_arch = "sparc64"))]
- #[test]
- fn cargo_compile_incremental() {
-     let p = project()
-@@ -58,6 +59,7 @@
-         ).run();
- }
- 
-+#[cfg(not(target_arch = "sparc64"))]
- #[test]
- fn incremental_profile() {
-     let p = project()
-@@ -99,6 +101,7 @@
-         .run();
- }
- 
-+#[cfg(not(target_arch = "sparc64"))]
- #[test]
- fn incremental_config() {
-     let p = project()
diff -Nru cargo-0.32.0/debian/patches/disable-http2.patch cargo-0.33.0/debian/patches/disable-http2.patch
--- cargo-0.32.0/debian/patches/disable-http2.patch	2019-01-23 20:59:16.000000000 +0000
+++ cargo-0.33.0/debian/patches/disable-http2.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -22,7 +22,7 @@
- crates-io = { path = "src/crates-io", version = "0.20" }
- crossbeam-utils = "0.5"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.17", features = ['http2'] }
-+curl = { version = "0.4.17" }
- curl-sys = "0.4.12"
- env_logger = "0.5.11"
- failure = "0.1.2"
diff -Nru cargo-0.32.0/debian/patches/ignore-libcurl-errors.patch cargo-0.33.0/debian/patches/ignore-libcurl-errors.patch
--- cargo-0.32.0/debian/patches/ignore-libcurl-errors.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/debian/patches/ignore-libcurl-errors.patch	2019-02-27 08:08:29.000000000 +0000
@@ -0,0 +1,30 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -22,7 +22,7 @@
+ crates-io = { path = "src/crates-io", version = "0.21" }
+ crossbeam-utils = "0.6"
+ crypto-hash = "0.3.1"
+-curl = { version = "0.4.19", features = ['http2'] }
++curl = { version = "0.4.19" }
+ curl-sys = "0.4.15"
+ env_logger = "0.6.0"
+ pretty_env_logger = { version = "0.2", optional = true }
+--- a/src/cargo/core/package.rs
++++ b/src/cargo/core/package.rs
+@@ -421,14 +421,8 @@
+ macro_rules! try_old_curl {
+     ($e:expr, $msg:expr) => {
+         let result = $e;
+-        if cfg!(target_os = "macos") {
+-            if let Err(e) = result {
+-                warn!("ignoring libcurl {} error: {}", $msg, e);
+-            }
+-        } else {
+-            result.with_context(|_| {
+-                format_err!("failed to enable {}, is curl not built right?", $msg)
+-            })?;
++        if let Err(e) = result {
++            warn!("ignoring libcurl {} error: {}", $msg, e);
+         }
+     };
+ }
diff -Nru cargo-0.32.0/debian/patches/series cargo-0.33.0/debian/patches/series
--- cargo-0.32.0/debian/patches/series	2019-01-23 20:59:16.000000000 +0000
+++ cargo-0.33.0/debian/patches/series	2019-02-27 08:08:29.000000000 +0000
@@ -1,6 +1,4 @@
-1001_fix_inc_exc_tests.patch
-1002_fix_doc_tests_order_hash.patch
-2007_sparc64_disable_incremental_build.patch
+1003_increase_timeout_for_slow_arches_like_mips.patch
 2002_disable-net-tests.patch
 #2005_disable_fetch_cross_tests.patch
 disable-fetch-tests-on-non-x86.patch
@@ -8,4 +6,4 @@
 do-not-use-system-libgit2.patch
 use-system-libhttp-parser.patch
 git2-no-ssh_key_from_memory.patch
-disable-http2.patch
+ignore-libcurl-errors.patch
diff -Nru cargo-0.32.0/debian/rules cargo-0.33.0/debian/rules
--- cargo-0.32.0/debian/rules	2019-01-23 20:59:16.000000000 +0000
+++ cargo-0.33.0/debian/rules	2019-02-27 08:08:29.000000000 +0000
@@ -14,6 +14,10 @@
 export DEB_CARGO_CRATE=cargo_$(DEB_VERSION_UPSTREAM)
 export DEB_CARGO_PACKAGE=cargo
 
+# don't shrink, this can take ages
+# see https://github.com/rust-lang/cargo/issues/6490 for details
+export PROPTEST_MAX_SHRINK_ITERS = 0
+
 # To run a specific test, run something like:
 #   $ debian/rules override_dh_auto_test-arch \
 #     CARGO_TEST_FLAGS="package::include -- <args ...>"
@@ -33,19 +37,8 @@
 override_dh_auto_build-indep:
 	$(CARGO) doc
 
-RUN_TESTS = \
-	if $(1); then \
-	  : ; \
-	elif [ $(DEB_HOST_ARCH) != "s390x" ]; then \
-	  false; \
-	else \
-	  echo "======================================================"; \
-	  echo "WARNING: Ignoring test failures in the cargo testsuite"; \
-	  echo "======================================================"; \
-	fi
-
 override_dh_auto_test-arch:
-	$(call RUN_TESTS,CFG_DISABLE_CROSS_TESTS=1 $(CARGO) test $(CARGO_TEST_FLAGS))
+	CFG_DISABLE_CROSS_TESTS=1 $(CARGO) test $(CARGO_TEST_FLAGS)
 
 override_dh_auto_test-indep:
 	# no arch-indep tests
diff -Nru cargo-0.32.0/debian/scripts/audit-vendor-source cargo-0.33.0/debian/scripts/audit-vendor-source
--- cargo-0.32.0/debian/scripts/audit-vendor-source	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/debian/scripts/audit-vendor-source	2019-02-27 08:08:29.000000000 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Audit Rust crate source for suspicious files in the current directory, that
+# shouldn't or can't be part of a Debian source package.
+#
+# Usage: $0 <whitelist> <filter_description> [<extra args to suspicious-source>]
+
+set -e
+
+whitelist="$1"
+filter_description="$2"
+shift 2 # everything else is args to suspicious-source
+
+# Remove tiny files 4 bytes or less
+find . -size -4c -delete
+# Remove non-suspicious files, warning on patterns that match nothing
+echo "Excluding (i.e. removing) whitelisted files..."
+grep -v '^#' "$whitelist" | xargs  -I% sh -c 'rm -r ./% || true'
+echo "Checking for suspicious files..."
+# Remove cargo metadata files
+find . '(' -name '.cargo-checksum.json' -or -name '.cargo_vcs_info.json' ')' -delete
+
+# TODO: merge the -m stuff into suspicious-source(1).
+suspicious-source -v "$@"
+# The following shell snippet is a bit more strict than suspicious-source(1)
+find . -type f -exec file '{}' \; | \
+  sed -e 's/\btext\b\(.*\), with very long lines/verylongtext\1/g' | \
+  grep -v '\b\(text\|empty\)\b' || true
+
+# Most C and JS code should be in their own package
+find . -name '*.c' -o -name '*.js'
+
+echo "The above files (if any) seem suspicious, please audit them."
+echo "If good, add them to $whitelist."
+echo "If bad, add them to $filter_description."
diff -Nru cargo-0.32.0/debian/scripts/debian-cargo-vendor cargo-0.33.0/debian/scripts/debian-cargo-vendor
--- cargo-0.32.0/debian/scripts/debian-cargo-vendor	2019-01-23 02:26:59.000000000 +0000
+++ cargo-0.33.0/debian/scripts/debian-cargo-vendor	2019-02-27 08:08:29.000000000 +0000
@@ -54,12 +54,8 @@
 	# script to deal with - just use the upstream version. example: backtrace-sys
 	# TODO: deal with those better, especially backtrace-sys
 	if [ -e ../../debcargo-conf/src/$i/debian/rules ]; then
-		echo >&2 "$0: not patching $i because its debcargo-conf has a custom rules file"
+		echo >&2 "$0: the debcargo-conf for crate $i has a custom rules file, but applying patches anyway"
 		echo >&2 "$0: you may want to examine this situation more closely"
-    # Exit the directory or we will error out in next cd
-    # TODO: any better way to do this?
-    cd ..
-		continue
 	fi
 	if [ -d ../../debcargo-conf/src/$i/debian/patches ]; then
 		echo >&2 "$0: patching $i"
@@ -73,15 +69,22 @@
 		*) echo >&2 "$0: patching $i failed <<<<<<<<<<<<<<<<<<<<<<<<"; x=false;;
 		esac
 	fi
+	if [ -f ../../debcargo-conf/src/$i/debian/build.rs ]; then
+		echo >&2 "$0: overwriting build.rs with our custom one"
+		if [ ! -f build.rs.orig ]; then
+			cp -f build.rs build.rs.orig
+		fi
+		cp -f ../../debcargo-conf/src/$i/debian/build.rs build.rs
+	fi
 	cd ..
 done; $x ); do
 	echo >&2 "================================================================================"
 	echo >&2 "$0: You are now in a sub-shell!"
-	echo >&2 "$0: Fix the failed patches, then exit the sub-shell by pressing ctrl-D ONCE."
+	echo >&2 "$0: Fix the failed patches in debcargo-conf/, then exit the sub-shell by pressing ctrl-D ONCE."
 	echo >&2 "$0: If you need to abort this process, press ctrl-D then quickly ctrl-C."
-	if [ -f ${WORKDIR}/debian/debcargo-conf.patch ]; then
+	if [ -f "${SRCDIR:-$PWD}/debian/debcargo-conf.patch" ]; then
 		echo >&2 "$0: Previous patch changes exist, to apply them run:"
-		echo >&2 "  $ patch -d vendor -p2 < debian/debcargo-conf.patch"
+		echo >&2 "  $ patch -d vendor -p2 < '${SRCDIR:-$PWD}/debian/debcargo-conf.patch'"
 	fi
 	echo >&2 "================================================================================"
 	bash || true
@@ -94,15 +97,17 @@
 # remove excluded files
 ( cd vendor
 for i in *; do (
+	shopt -s globstar # needed for double-glob to work in excludes
 	cd $i
 	if [ -e ../../debcargo-conf/src/$i/debian/rules ]; then
-		continue
+		echo >&2 "$0: the debcargo-conf for crate $i has a custom rules file, but applying excludes anyway"
+		echo >&2 "$0: you may want to examine this situation more closely"
 	fi
 	if grep -q excludes ../../debcargo-conf/src/$i/debian/debcargo.toml 2>/dev/null; then
 		sed -nre 's/.*excludes\s*=\s*(\[[^]]*\]).*/\1/p' \
 		  ../../debcargo-conf/src/$i/debian/debcargo.toml \
 		  | python -c "import ast, sys; x=ast.literal_eval(sys.stdin.read()); print('\n'.join((i[:-3] if i.endswith('/**') else i) for i in x));" \
-		  | while read x; do echo >&2 "$0: removing, since it's excluded by debcargo-conf: vendor/$i/$x"; rm -rf "$x"; done
+		  | while read x; do echo >&2 "$0: removing, since it's excluded by debcargo-conf: vendor/$i/$x"; rm -rf $x; done
 	fi
 ); done; )
 
@@ -117,6 +122,7 @@
 for i in *; do (
 	cd $i
 	if [ -d debian/patches ]; then
+		rm -rf "../../debcargo-conf/src/$i/debian/patches"
 		cp -a debian/patches "../../debcargo-conf/src/$i/debian/"
 	fi
 ); done; )
@@ -125,7 +131,7 @@
 if ! git diff --cached --quiet; then
 	git commit -m "Manual changes from debian-cargo-vendor"
 	git diff @~ > ../../debcargo-conf.patch || true
-	(cd ../.. ; echo >&2 "$0: backed up patch changes to $(pwd)/debcargo-conf.patch")
+	(cd ../.. ; echo >&2 "$0: backed up patch changes to $PWD/debcargo-conf.patch")
 	echo >&2 "$0: you should backport/merge them back into debcargo-conf.git"
 fi
 )
diff -Nru cargo-0.32.0/debian/vendor-tarball-filter.txt cargo-0.33.0/debian/vendor-tarball-filter.txt
--- cargo-0.32.0/debian/vendor-tarball-filter.txt	2018-11-18 20:55:25.000000000 +0000
+++ cargo-0.33.0/debian/vendor-tarball-filter.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-
diff -Nru cargo-0.32.0/debian/vendor-tarball-unsuspicious.txt cargo-0.33.0/debian/vendor-tarball-unsuspicious.txt
--- cargo-0.32.0/debian/vendor-tarball-unsuspicious.txt	2019-01-23 02:26:59.000000000 +0000
+++ cargo-0.33.0/debian/vendor-tarball-unsuspicious.txt	2019-02-27 08:08:29.000000000 +0000
@@ -3,17 +3,14 @@
 
 # test data
 flate2/tests/
-tar/tests/archives/
-term/tests/data/
-toml/tests/
+idna/tests/punycode_tests.json
 num/ci/
 openssl/test/
 schannel/test/*
-libnghttp2-sys/nghttp2/fuzz/corpus/*/*
-libnghttp2-sys/nghttp2/tests/testdata/*
-libnghttp2-sys/nghttp2/integration-tests/*
-libnghttp2-sys/nghttp2/src/test.*
-libnghttp2-sys/nghttp2/src/ca.*
+tar/tests/archives/
+term/tests/data/
+toml/tests/
+url/tests/*.json
 
 # misc support data
 failure/CODE_OF_CONDUCT.md
@@ -24,8 +21,6 @@
 */README.md
 
 # individual files, manually audited:
-backtrace-sys/src/libbacktrace/config/libtool.m4
-backtrace-sys/src/libbacktrace/configure
 clap/CHANGELOG.md
 clap/CONTRIBUTORS.md
 clap/.github/CONTRIBUTING.md
@@ -42,6 +37,7 @@
 idna/tests/IdnaTest.txt
 itoa/performance.png
 lazy_static/src/lib.rs
+libz-sys/src/smoke.c
 miniz-sys/miniz.c
 num/doc/favicon.ico
 num/doc/rust-logo-128x128-blk-v2.png
@@ -59,15 +55,8 @@
 unicode-normalization/src/tables.rs
 url/github.png
 vec_map/Cargo.toml
+walkdir/compare/nftw.c
 winapi/README.md
 winapi/src/lib.rs
 winapi/src/winnt.rs
-libnghttp2-sys/nghttp2/doc/*.1
-libnghttp2-sys/nghttp2/m4/ax_boost_base.m4
-libnghttp2-sys/nghttp2/doc/bash_completion/*
-libnghttp2-sys/nghttp2/third-party/neverbleed/README.md
-libnghttp2-sys/nghttp2/third-party/mruby/*
 proptest/src/regex-contrib/crates_regex.rs
-
-# documentation themes
-libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/*
diff -Nru cargo-0.32.0/README.md cargo-0.33.0/README.md
--- cargo-0.32.0/README.md	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/README.md	2019-01-02 21:49:06.000000000 +0000
@@ -22,7 +22,6 @@
 
 * `python`
 * `curl` (on Unix)
-* `cmake`
 * OpenSSL headers (only for Unix, this is the `libssl-dev` package on ubuntu)
 * `cargo` and `rustc`
 
diff -Nru cargo-0.32.0/src/bin/cargo/cli.rs cargo-0.33.0/src/bin/cargo/cli.rs
--- cargo-0.32.0/src/bin/cargo/cli.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/cli.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,8 +4,8 @@
 
 use cargo::{self, CliResult, Config};
 
-use super::list_commands;
 use super::commands;
+use super::list_commands;
 use command_prelude::*;
 
 pub fn main(config: &mut Config) -> CliResult {
@@ -81,7 +81,7 @@
 
 pub fn get_version_string(is_verbose: bool) -> String {
     let version = cargo::version();
-    let mut version_string = String::from(version.to_string());
+    let mut version_string = version.to_string();
     version_string.push_str("\n");
     if is_verbose {
         version_string.push_str(&format!(
@@ -107,7 +107,14 @@
             commands::builtin_exec(cmd),
             super::aliased_command(config, cmd)?,
         ) {
-            (None, Some(mut alias)) => {
+            (Some(_), Some(_)) => {
+                // User alias conflicts with a built-in subcommand
+                config.shell().warn(format!(
+                    "user-defined alias `{}` is ignored, because it is shadowed by a built-in command",
+                    cmd,
+                ))?;
+            }
+            (_, Some(mut alias)) => {
                 alias.extend(
                     args.values_of("")
                         .unwrap_or_default()
@@ -118,15 +125,10 @@
                     .get_matches_from_safe(alias)?;
                 return expand_aliases(config, args);
             }
-            (Some(_), Some(_)) => {
-                config.shell().warn(format!(
-                    "alias `{}` is ignored, because it is shadowed by a built in command",
-                    cmd
-                ))?;
-            }
             (_, None) => {}
         }
     };
+
     Ok(args)
 }
 
@@ -152,7 +154,8 @@
         args.is_present("frozen"),
         args.is_present("locked"),
         arg_target_dir,
-        &args.values_of_lossy("unstable-features")
+        &args
+            .values_of_lossy("unstable-features")
             .unwrap_or_default(),
     )?;
 
@@ -197,7 +200,7 @@
     update      Update dependencies listed in Cargo.lock
     search      Search registry for crates
     publish     Package and upload this package to the registry
-    install     Install a Rust binary
+    install     Install a Rust binary. Default location is $HOME/.cargo/bin
     uninstall   Uninstall a Rust binary
 
 See 'cargo help <command>' for more information on a specific command.\n",
@@ -209,9 +212,10 @@
             opt(
                 "verbose",
                 "Use verbose output (-vv very verbose/build.rs output)",
-            ).short("v")
-                .multiple(true)
-                .global(true),
+            )
+            .short("v")
+            .multiple(true)
+            .global(true),
         )
         .arg(
             opt("quiet", "No output printed to stdout")
diff -Nru cargo-0.32.0/src/bin/cargo/command_prelude.rs cargo-0.33.0/src/bin/cargo/command_prelude.rs
--- cargo-0.32.0/src/bin/cargo/command_prelude.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/command_prelude.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,453 +0,0 @@
-use std::path::PathBuf;
-use std::fs;
-
-use clap::{self, SubCommand};
-use cargo::CargoResult;
-use cargo::core::Workspace;
-use cargo::core::compiler::{BuildConfig, MessageFormat};
-use cargo::ops::{CompileFilter, CompileOptions, NewOptions, Packages, VersionControl};
-use cargo::sources::CRATES_IO_REGISTRY;
-use cargo::util::paths;
-use cargo::util::important_paths::find_root_manifest_for_wd;
-
-pub use clap::{AppSettings, Arg, ArgMatches};
-pub use cargo::{CliError, CliResult, Config};
-pub use cargo::core::compiler::CompileMode;
-
-pub type App = clap::App<'static, 'static>;
-
-pub trait AppExt: Sized {
-    fn _arg(self, arg: Arg<'static, 'static>) -> Self;
-
-    fn arg_package_spec(
-        self,
-        package: &'static str,
-        all: &'static str,
-        exclude: &'static str,
-    ) -> Self {
-        self.arg_package_spec_simple(package)
-            ._arg(opt("all", all))
-            ._arg(multi_opt("exclude", "SPEC", exclude))
-    }
-
-    fn arg_package_spec_simple(self, package: &'static str) -> Self {
-        self._arg(multi_opt("package", "SPEC", package).short("p"))
-    }
-
-    fn arg_package(self, package: &'static str) -> Self {
-        self._arg(opt("package", package).short("p").value_name("SPEC"))
-    }
-
-    fn arg_jobs(self) -> Self {
-        self._arg(
-            opt("jobs", "Number of parallel jobs, defaults to # of CPUs")
-                .short("j")
-                .value_name("N"),
-        )
-    }
-
-    fn arg_targets_all(
-        self,
-        lib: &'static str,
-        bin: &'static str,
-        bins: &'static str,
-        example: &'static str,
-        examples: &'static str,
-        test: &'static str,
-        tests: &'static str,
-        bench: &'static str,
-        benches: &'static str,
-        all: &'static str,
-    ) -> Self {
-        self.arg_targets_lib_bin(lib, bin, bins)
-            ._arg(multi_opt("example", "NAME", example))
-            ._arg(opt("examples", examples))
-            ._arg(multi_opt("test", "NAME", test))
-            ._arg(opt("tests", tests))
-            ._arg(multi_opt("bench", "NAME", bench))
-            ._arg(opt("benches", benches))
-            ._arg(opt("all-targets", all))
-    }
-
-    fn arg_targets_lib_bin(self, lib: &'static str, bin: &'static str, bins: &'static str) -> Self {
-        self._arg(opt("lib", lib))
-            ._arg(multi_opt("bin", "NAME", bin))
-            ._arg(opt("bins", bins))
-    }
-
-    fn arg_targets_bins_examples(
-        self,
-        bin: &'static str,
-        bins: &'static str,
-        example: &'static str,
-        examples: &'static str,
-    ) -> Self {
-        self._arg(multi_opt("bin", "NAME", bin))
-            ._arg(opt("bins", bins))
-            ._arg(multi_opt("example", "NAME", example))
-            ._arg(opt("examples", examples))
-    }
-
-    fn arg_targets_bin_example(self, bin: &'static str, example: &'static str) -> Self {
-        self._arg(multi_opt("bin", "NAME", bin))
-            ._arg(multi_opt("example", "NAME", example))
-    }
-
-    fn arg_features(self) -> Self {
-        self._arg(
-            opt("features", "Space-separated list of features to activate").value_name("FEATURES"),
-        )._arg(opt("all-features", "Activate all available features"))
-            ._arg(opt(
-                "no-default-features",
-                "Do not activate the `default` feature",
-            ))
-    }
-
-    fn arg_release(self, release: &'static str) -> Self {
-        self._arg(opt("release", release))
-    }
-
-    fn arg_doc(self, doc: &'static str) -> Self {
-        self._arg(opt("doc", doc))
-    }
-
-    fn arg_target_triple(self, target: &'static str) -> Self {
-        self._arg(opt("target", target).value_name("TRIPLE"))
-    }
-
-    fn arg_target_dir(self) -> Self {
-        self._arg(opt("target-dir", "Directory for all generated artifacts").value_name("DIRECTORY"))
-    }
-
-    fn arg_manifest_path(self) -> Self {
-        self._arg(opt("manifest-path", "Path to Cargo.toml").value_name("PATH"))
-    }
-
-    fn arg_message_format(self) -> Self {
-        self._arg(
-            opt("message-format", "Error format")
-                .value_name("FMT")
-                .case_insensitive(true)
-                .possible_values(&["human", "json", "short"])
-                .default_value("human"),
-        )
-    }
-
-    fn arg_build_plan(self) -> Self {
-        self._arg(opt("build-plan", "Output the build plan in JSON"))
-    }
-
-    fn arg_new_opts(self) -> Self {
-        self._arg(
-            opt(
-                "vcs",
-                "\
-                 Initialize a new repository for the given version \
-                 control system (git, hg, pijul, or fossil) or do not \
-                 initialize any version control at all (none), overriding \
-                 a global configuration.",
-            ).value_name("VCS")
-                .possible_values(&["git", "hg", "pijul", "fossil", "none"]),
-        )
-            ._arg(opt("bin", "Use a binary (application) template [default]"))
-            ._arg(opt("lib", "Use a library template"))
-            ._arg(
-                opt("edition", "Edition to set for the crate generated")
-                    .possible_values(&["2015", "2018"])
-                    .value_name("YEAR")
-            )
-            ._arg(
-                opt(
-                    "name",
-                    "Set the resulting package name, defaults to the directory name",
-                ).value_name("NAME"),
-            )
-    }
-
-    fn arg_index(self) -> Self {
-        self._arg(opt("index", "Registry index to upload the package to").value_name("INDEX"))
-            ._arg(
-                opt("host", "DEPRECATED, renamed to '--index'")
-                    .value_name("HOST")
-                    .hidden(true),
-            )
-    }
-}
-
-impl AppExt for App {
-    fn _arg(self, arg: Arg<'static, 'static>) -> Self {
-        self.arg(arg)
-    }
-}
-
-pub fn opt(name: &'static str, help: &'static str) -> Arg<'static, 'static> {
-    Arg::with_name(name).long(name).help(help)
-}
-
-pub fn multi_opt(
-    name: &'static str,
-    value_name: &'static str,
-    help: &'static str,
-) -> Arg<'static, 'static> {
-    // Note that all `.multiple(true)` arguments in Cargo should specify
-    // `.number_of_values(1)` as well, so that `--foo val1 val2` is
-    // **not** parsed as `foo` with values ["val1", "val2"].
-    // `number_of_values` should become the default in clap 3.
-    opt(name, help)
-        .value_name(value_name)
-        .multiple(true)
-        .number_of_values(1)
-}
-
-pub fn subcommand(name: &'static str) -> App {
-    SubCommand::with_name(name).settings(&[
-        AppSettings::UnifiedHelpMessage,
-        AppSettings::DeriveDisplayOrder,
-        AppSettings::DontCollapseArgsInUsage,
-    ])
-}
-
-pub trait ArgMatchesExt {
-    fn value_of_u32(&self, name: &str) -> CargoResult<Option<u32>> {
-        let arg = match self._value_of(name) {
-            None => None,
-            Some(arg) => Some(arg.parse::<u32>().map_err(|_| {
-                clap::Error::value_validation_auto(format!("could not parse `{}` as a number", arg))
-            })?),
-        };
-        Ok(arg)
-    }
-
-    /// Returns value of the `name` command-line argument as an absolute path
-    fn value_of_path(&self, name: &str, config: &Config) -> Option<PathBuf> {
-        self._value_of(name).map(|path| config.cwd().join(path))
-    }
-
-    fn root_manifest(&self, config: &Config) -> CargoResult<PathBuf> {
-        if let Some(path) = self.value_of_path("manifest-path", config) {
-            // In general, we try to avoid normalizing paths in Cargo,
-            // but in this particular case we need it to fix #3586.
-            let path = paths::normalize_path(&path);
-            if !path.ends_with("Cargo.toml") {
-                bail!("the manifest-path must be a path to a Cargo.toml file")
-            }
-            if fs::metadata(&path).is_err() {
-                bail!(
-                    "manifest path `{}` does not exist",
-                    self._value_of("manifest-path").unwrap()
-                )
-            }
-            return Ok(path);
-        }
-        find_root_manifest_for_wd(config.cwd())
-    }
-
-    fn workspace<'a>(&self, config: &'a Config) -> CargoResult<Workspace<'a>> {
-        let root = self.root_manifest(config)?;
-        let mut ws = Workspace::new(&root, config)?;
-        if config.cli_unstable().avoid_dev_deps {
-            ws.set_require_optional_deps(false);
-        }
-        Ok(ws)
-    }
-
-    fn jobs(&self) -> CargoResult<Option<u32>> {
-        self.value_of_u32("jobs")
-    }
-
-    fn target(&self) -> Option<String> {
-        self._value_of("target").map(|s| s.to_string())
-    }
-
-    fn compile_options<'a>(
-        &self,
-        config: &'a Config,
-        mode: CompileMode,
-    ) -> CargoResult<CompileOptions<'a>> {
-        let spec = Packages::from_flags(
-            self._is_present("all"),
-            self._values_of("exclude"),
-            self._values_of("package"),
-        )?;
-
-        let message_format = match self._value_of("message-format") {
-            None => MessageFormat::Human,
-            Some(f) => {
-                if f.eq_ignore_ascii_case("json") {
-                    MessageFormat::Json
-                } else if f.eq_ignore_ascii_case("human") {
-                    MessageFormat::Human
-                } else if f.eq_ignore_ascii_case("short") {
-                    MessageFormat::Short
-                } else {
-                    panic!("Impossible message format: {:?}", f)
-                }
-            }
-        };
-
-        let mut build_config = BuildConfig::new(config, self.jobs()?, &self.target(), mode)?;
-        build_config.message_format = message_format;
-        build_config.release = self._is_present("release");
-        build_config.build_plan = self._is_present("build-plan");
-        if build_config.build_plan && !config.cli_unstable().unstable_options {
-            Err(format_err!(
-                "`--build-plan` flag is unstable, pass `-Z unstable-options` to enable it"
-            ))?;
-        };
-
-        let opts = CompileOptions {
-            config,
-            build_config,
-            features: self._values_of("features"),
-            all_features: self._is_present("all-features"),
-            no_default_features: self._is_present("no-default-features"),
-            spec,
-            filter: CompileFilter::new(
-                self._is_present("lib"),
-                self._values_of("bin"),
-                self._is_present("bins"),
-                self._values_of("test"),
-                self._is_present("tests"),
-                self._values_of("example"),
-                self._is_present("examples"),
-                self._values_of("bench"),
-                self._is_present("benches"),
-                self._is_present("all-targets"),
-            ),
-            target_rustdoc_args: None,
-            target_rustc_args: None,
-            local_rustdoc_args: None,
-            export_dir: None,
-        };
-        Ok(opts)
-    }
-
-    fn compile_options_for_single_package<'a>(
-        &self,
-        config: &'a Config,
-        mode: CompileMode,
-    ) -> CargoResult<CompileOptions<'a>> {
-        let mut compile_opts = self.compile_options(config, mode)?;
-        compile_opts.spec = Packages::Packages(self._values_of("package"));
-        Ok(compile_opts)
-    }
-
-    fn new_options(&self, config: &Config) -> CargoResult<NewOptions> {
-        let vcs = self._value_of("vcs").map(|vcs| match vcs {
-            "git" => VersionControl::Git,
-            "hg" => VersionControl::Hg,
-            "pijul" => VersionControl::Pijul,
-            "fossil" => VersionControl::Fossil,
-            "none" => VersionControl::NoVcs,
-            vcs => panic!("Impossible vcs: {:?}", vcs),
-        });
-        NewOptions::new(
-            vcs,
-            self._is_present("bin"),
-            self._is_present("lib"),
-            self.value_of_path("path", config).unwrap(),
-            self._value_of("name").map(|s| s.to_string()),
-            self._value_of("edition").map(|s| s.to_string()),
-            self.registry(config)?,
-        )
-    }
-
-    fn registry(&self, config: &Config) -> CargoResult<Option<String>> {
-        match self._value_of("registry") {
-            Some(registry) => {
-                if !config.cli_unstable().unstable_options {
-                    return Err(format_err!(
-                        "registry option is an unstable feature and \
-                         requires -Zunstable-options to use."
-                    ));
-                }
-
-                if registry == CRATES_IO_REGISTRY {
-                    // If "crates.io" is specified then we just need to return None
-                    // as that will cause cargo to use crates.io. This is required
-                    // for the case where a default alterative registry is used
-                    // but the user wants to switch back to crates.io for a single
-                    // command.
-                    Ok(None)
-                }
-                else {
-                    Ok(Some(registry.to_string()))                    
-                }
-            }
-            None => {
-                config.default_registry()
-            }
-        }
-    }
-
-    fn index(&self, config: &Config) -> CargoResult<Option<String>> {
-        // TODO: Deprecated
-        // remove once it has been decided --host can be removed
-        // We may instead want to repurpose the host flag, as
-        // mentioned in this issue
-        // https://github.com/rust-lang/cargo/issues/4208
-        let msg = "The flag '--host' is no longer valid.
-
-Previous versions of Cargo accepted this flag, but it is being
-deprecated. The flag is being renamed to 'index', as the flag
-wants the location of the index. Please use '--index' instead.
-
-This will soon become a hard error, so it's either recommended
-to update to a fixed version or contact the upstream maintainer
-about this warning.";
-
-        let index = match self._value_of("host") {
-            Some(host) => {
-                config.shell().warn(&msg)?;
-                Some(host.to_string())
-            }
-            None => self._value_of("index").map(|s| s.to_string()),
-        };
-        Ok(index)
-    }
-
-    fn _value_of(&self, name: &str) -> Option<&str>;
-
-    fn _values_of(&self, name: &str) -> Vec<String>;
-
-    fn _is_present(&self, name: &str) -> bool;
-}
-
-impl<'a> ArgMatchesExt for ArgMatches<'a> {
-    fn _value_of(&self, name: &str) -> Option<&str> {
-        self.value_of(name)
-    }
-
-    fn _values_of(&self, name: &str) -> Vec<String> {
-        self.values_of(name)
-            .unwrap_or_default()
-            .map(|s| s.to_string())
-            .collect()
-    }
-
-    fn _is_present(&self, name: &str) -> bool {
-        self.is_present(name)
-    }
-}
-
-pub fn values(args: &ArgMatches, name: &str) -> Vec<String> {
-    args.values_of(name)
-        .unwrap_or_default()
-        .map(|s| s.to_string())
-        .collect()
-}
-
-#[derive(PartialEq, PartialOrd, Eq, Ord)]
-pub enum CommandInfo {
-    BuiltIn { name: String, about: Option<String>, },
-    External { name: String, path: PathBuf },
-}
-
-impl CommandInfo {
-    pub fn name(&self) -> String {
-        match self {
-            CommandInfo::BuiltIn { name, .. } => name.to_string(),
-            CommandInfo::External { name, .. } => name.to_string(),
-        }
-    }
-}
diff -Nru cargo-0.32.0/src/bin/cargo/commands/build.rs cargo-0.33.0/src/bin/cargo/commands/build.rs
--- cargo-0.32.0/src/bin/cargo/commands/build.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/build.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,7 +4,8 @@
 
 pub fn cli() -> App {
     subcommand("build")
-        .alias("b")
+        // subcommand aliases are handled in aliased_command()
+        // .alias("b")
         .about("Compile a local package and all of its dependencies")
         .arg_package_spec(
             "Package to build (see `cargo help pkgid`)",
diff -Nru cargo-0.32.0/src/bin/cargo/commands/check.rs cargo-0.33.0/src/bin/cargo/commands/check.rs
--- cargo-0.32.0/src/bin/cargo/commands/check.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/check.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,6 +4,8 @@
 
 pub fn cli() -> App {
     subcommand("check")
+        // subcommand aliases are handled in aliased_command()
+        // .alias("c")
         .about("Check a local package and all of its dependencies for errors")
         .arg_package_spec(
             "Package(s) to check",
diff -Nru cargo-0.32.0/src/bin/cargo/commands/git_checkout.rs cargo-0.33.0/src/bin/cargo/commands/git_checkout.rs
--- cargo-0.32.0/src/bin/cargo/commands/git_checkout.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/git_checkout.rs	2019-01-02 21:49:06.000000000 +0000
@@ -28,7 +28,7 @@
     let reference = GitReference::Branch(reference.to_string());
     let source_id = SourceId::for_git(&url, reference)?;
 
-    let mut source = GitSource::new(&source_id, config)?;
+    let mut source = GitSource::new(source_id, config)?;
 
     source.update()?;
 
diff -Nru cargo-0.32.0/src/bin/cargo/commands/install.rs cargo-0.33.0/src/bin/cargo/commands/install.rs
--- cargo-0.32.0/src/bin/cargo/commands/install.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/install.rs	2019-01-02 21:49:06.000000000 +0000
@@ -6,7 +6,7 @@
 
 pub fn cli() -> App {
     subcommand("install")
-        .about("Install a Rust binary")
+        .about("Install a Rust binary. Default location is $HOME/.cargo/bin")
         .arg(Arg::with_name("crate").empty_values(false).multiple(true))
         .arg(
             opt("version", "Specify a version to install from crates.io")
@@ -82,7 +82,8 @@
 
     compile_opts.build_config.release = !args.is_present("debug");
 
-    let krates = args.values_of("crate")
+    let krates = args
+        .values_of("crate")
         .unwrap_or_default()
         .collect::<Vec<_>>();
 
@@ -120,7 +121,7 @@
         ops::install(
             root,
             krates,
-            &source,
+            source,
             from_cwd,
             version,
             &compile_opts,
diff -Nru cargo-0.32.0/src/bin/cargo/commands/login.rs cargo-0.33.0/src/bin/cargo/commands/login.rs
--- cargo-0.32.0/src/bin/cargo/commands/login.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/login.rs	2019-01-02 21:49:06.000000000 +0000
@@ -3,9 +3,9 @@
 use std::io::{self, BufRead};
 
 use cargo::core::{Source, SourceId};
+use cargo::ops;
 use cargo::sources::RegistrySource;
 use cargo::util::{CargoError, CargoResultExt};
-use cargo::ops;
 
 pub fn cli() -> App {
     subcommand("login")
@@ -29,11 +29,12 @@
                     return Err(format_err!(
                         "token must be provided when \
                          --registry is provided."
-                    ).into());
+                    )
+                    .into());
                 }
                 None => {
                     let src = SourceId::crates_io(config)?;
-                    let mut src = RegistrySource::remote(&src, config);
+                    let mut src = RegistrySource::remote(src, config);
                     src.update()?;
                     let config = src.config()?.unwrap();
                     args.value_of("host")
diff -Nru cargo-0.32.0/src/bin/cargo/commands/mod.rs cargo-0.33.0/src/bin/cargo/commands/mod.rs
--- cargo-0.32.0/src/bin/cargo/commands/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -35,8 +35,8 @@
     ]
 }
 
-pub fn builtin_exec(cmd: &str) -> Option<fn(&mut Config, &ArgMatches) -> CliResult> {
-    let f = match cmd {
+ pub fn builtin_exec(cmd: &str) -> Option<fn(&mut Config, &ArgMatches) -> CliResult> {
+     let f = match cmd {
         "bench" => bench::exec,
         "build" => build::exec,
         "check" => check::exec,
diff -Nru cargo-0.32.0/src/bin/cargo/commands/run.rs cargo-0.33.0/src/bin/cargo/commands/run.rs
--- cargo-0.32.0/src/bin/cargo/commands/run.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/run.rs	2019-01-02 21:49:06.000000000 +0000
@@ -5,7 +5,8 @@
 
 pub fn cli() -> App {
     subcommand("run")
-        .alias("r")
+        // subcommand aliases are handled in aliased_command()
+        // .alias("r")
         .setting(AppSettings::TrailingVarArg)
         .about("Run the main binary of the local package (src/main.rs)")
         .arg(Arg::with_name("args").multiple(true))
diff -Nru cargo-0.32.0/src/bin/cargo/commands/test.rs cargo-0.33.0/src/bin/cargo/commands/test.rs
--- cargo-0.32.0/src/bin/cargo/commands/test.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/test.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,7 +4,8 @@
 
 pub fn cli() -> App {
     subcommand("test")
-        .alias("t")
+        // subcommand aliases are handled in aliased_command()
+        // .alias("t")
         .setting(AppSettings::TrailingVarArg)
         .about("Execute all unit and integration tests of a local package")
         .arg(
diff -Nru cargo-0.32.0/src/bin/cargo/commands/verify_project.rs cargo-0.33.0/src/bin/cargo/commands/verify_project.rs
--- cargo-0.32.0/src/bin/cargo/commands/verify_project.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/commands/verify_project.rs	2019-01-02 21:49:06.000000000 +0000
@@ -2,10 +2,6 @@
 
 use std::collections::HashMap;
 use std::process;
-use std::fs::File;
-use std::io::Read;
-
-use toml;
 
 use cargo::print_json;
 
@@ -23,19 +19,8 @@
         process::exit(1)
     }
 
-    let mut contents = String::new();
-    let filename = match args.root_manifest(config) {
-        Ok(filename) => filename,
-        Err(e) => fail("invalid", &e.to_string()),
-    };
-
-    let file = File::open(&filename);
-    match file.and_then(|mut f| f.read_to_string(&mut contents)) {
-        Ok(_) => {}
-        Err(e) => fail("invalid", &format!("error reading file: {}", e)),
-    };
-    if contents.parse::<toml::Value>().is_err() {
-        fail("invalid", "invalid-format");
+    if let Err(e) = args.workspace(config) {
+        fail("invalid", &e.to_string())
     }
 
     let mut h = HashMap::new();
diff -Nru cargo-0.32.0/src/bin/cargo/main.rs cargo-0.33.0/src/bin/cargo/main.rs
--- cargo-0.32.0/src/bin/cargo/main.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/bin/cargo/main.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,8 +1,11 @@
-#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] // large project
-#![cfg_attr(feature = "cargo-clippy", allow(redundant_closure))]  // there's a false positive
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))] // large project
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::redundant_closure))]  // there's a false positive
 
 extern crate cargo;
 extern crate clap;
+#[cfg(feature = "pretty-env-logger")]
+extern crate pretty_env_logger;
+#[cfg(not(feature = "pretty-env-logger"))]
 extern crate env_logger;
 #[macro_use]
 extern crate failure;
@@ -13,22 +16,24 @@
 extern crate serde_json;
 extern crate toml;
 
+use std::collections::BTreeSet;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
-use std::collections::BTreeSet;
 
 use cargo::core::shell::Shell;
-use cargo::util::{self, lev_distance, CargoResult, CliResult, Config};
+use cargo::util::{self, command_prelude, lev_distance, CargoResult, CliResult, Config};
 use cargo::util::{CliError, ProcessError};
 
 mod cli;
-mod command_prelude;
 mod commands;
 
 use command_prelude::*;
 
 fn main() {
+    #[cfg(feature = "pretty-env-logger")]
+    pretty_env_logger::init();
+    #[cfg(not(feature = "pretty-env-logger"))]
     env_logger::init();
     cargo::core::maybe_allow_nightly_features();
 
@@ -58,28 +63,27 @@
 
 fn aliased_command(config: &Config, command: &str) -> CargoResult<Option<Vec<String>>> {
     let alias_name = format!("alias.{}", command);
-    let mut result = Ok(None);
-    match config.get_string(&alias_name) {
-        Ok(value) => {
-            if let Some(record) = value {
-                let alias_commands = record
-                    .val
-                    .split_whitespace()
-                    .map(|s| s.to_string())
-                    .collect();
-                result = Ok(Some(alias_commands));
-            }
-        }
-        Err(_) => {
-            let value = config.get_list(&alias_name)?;
-            if let Some(record) = value {
-                let alias_commands: Vec<String> =
-                    record.val.iter().map(|s| s.0.to_string()).collect();
-                result = Ok(Some(alias_commands));
-            }
-        }
-    }
-    result
+    let user_alias = match config.get_string(&alias_name) {
+        Ok(Some(record)) => Some(
+            record
+                .val
+                .split_whitespace()
+                .map(|s| s.to_string())
+                .collect(),
+        ),
+        Ok(None) => None,
+        Err(_) => config
+            .get_list(&alias_name)?
+            .map(|record| record.val.iter().map(|s| s.0.to_string()).collect()),
+    };
+    let result = user_alias.or_else(|| match command {
+        "b" => Some(vec!["build".to_string()]),
+        "c" => Some(vec!["check".to_string()]),
+        "r" => Some(vec!["run".to_string()]),
+        "t" => Some(vec!["test".to_string()]),
+        _ => None,
+    });
+    Ok(result)
 }
 
 /// List all runnable commands
diff -Nru cargo-0.32.0/src/cargo/core/compiler/build_config.rs cargo-0.33.0/src/cargo/core/compiler/build_config.rs
--- cargo-0.32.0/src/cargo/core/compiler/build_config.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/build_config.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,5 +1,7 @@
-use std::path::Path;
 use std::cell::RefCell;
+use std::path::Path;
+
+use serde::ser;
 
 use util::{CargoResult, CargoResultExt, Config, RustfixDiagnosticServer};
 
@@ -49,9 +51,11 @@
                 let path = Path::new(target)
                     .canonicalize()
                     .chain_err(|| format_err!("Target path {:?} is not a valid file", target))?;
-                Some(path.into_os_string()
-                    .into_string()
-                    .map_err(|_| format_err!("Target path is not valid unicode"))?)
+                Some(
+                    path.into_os_string()
+                        .into_string()
+                        .map_err(|_| format_err!("Target path is not valid unicode"))?,
+                )
             }
             other => other.clone(),
         };
@@ -111,7 +115,7 @@
 /// `compile_ws` to tell it the general execution strategy.  This influences
 /// the default targets selected.  The other use is in the `Unit` struct
 /// to indicate what is being done with a specific target.
-#[derive(Clone, Copy, PartialEq, Debug, Eq, Hash)]
+#[derive(Clone, Copy, PartialEq, Debug, Eq, Hash, PartialOrd, Ord)]
 pub enum CompileMode {
     /// A target being built for a test.
     Test,
@@ -136,6 +140,24 @@
     RunCustomBuild,
 }
 
+impl ser::Serialize for CompileMode {
+    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: ser::Serializer,
+    {
+        use self::CompileMode::*;
+        match *self {
+            Test => "test".serialize(s),
+            Build => "build".serialize(s),
+            Check { .. } => "check".serialize(s),
+            Bench => "bench".serialize(s),
+            Doc { .. } => "doc".serialize(s),
+            Doctest => "doctest".serialize(s),
+            RunCustomBuild => "run-custom-build".serialize(s),
+        }
+    }
+}
+
 impl CompileMode {
     /// Returns true if the unit is being checked.
     pub fn is_check(self) -> bool {
diff -Nru cargo-0.32.0/src/cargo/core/compiler/build_context/mod.rs cargo-0.33.0/src/cargo/core/compiler/build_context/mod.rs
--- cargo-0.32.0/src/cargo/core/compiler/build_context/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/build_context/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -88,7 +88,8 @@
     }
 
     pub fn extern_crate_name(&self, unit: &Unit<'a>, dep: &Unit<'a>) -> CargoResult<String> {
-        self.resolve.extern_crate_name(unit.pkg.package_id(), dep.pkg.package_id(), dep.target)
+        self.resolve
+            .extern_crate_name(unit.pkg.package_id(), dep.pkg.package_id(), dep.target)
     }
 
     /// Whether a dependency should be compiled for the host or target platform,
@@ -179,7 +180,7 @@
         )
     }
 
-    pub fn show_warnings(&self, pkg: &PackageId) -> bool {
+    pub fn show_warnings(&self, pkg: PackageId) -> bool {
         pkg.source_id().is_path() || self.config.extra_verbose()
     }
 
@@ -266,10 +267,12 @@
                         let list = value.list(k)?;
                         output.cfgs.extend(list.iter().map(|v| v.0.clone()));
                     }
-                    "rustc-env" => for (name, val) in value.table(k)?.0 {
-                        let val = val.string(name)?.0;
-                        output.env.push((name.clone(), val.to_string()));
-                    },
+                    "rustc-env" => {
+                        for (name, val) in value.table(k)?.0 {
+                            let val = val.string(name)?.0;
+                            output.env.push((name.clone(), val.to_string()));
+                        }
+                    }
                     "warning" | "rerun-if-changed" | "rerun-if-env-changed" => {
                         bail!("`{}` is not supported in build script overrides", k);
                     }
@@ -342,7 +345,8 @@
 
     // First try RUSTFLAGS from the environment
     if let Ok(a) = env::var(name) {
-        let args = a.split(' ')
+        let args = a
+            .split(' ')
             .map(str::trim)
             .filter(|s| !s.is_empty())
             .map(str::to_string);
@@ -351,7 +355,8 @@
 
     let mut rustflags = Vec::new();
 
-    let name = name.chars()
+    let name = name
+        .chars()
         .flat_map(|c| c.to_lowercase())
         .collect::<String>();
     // Then the target.*.rustflags value...
@@ -367,13 +372,10 @@
     // ...including target.'cfg(...)'.rustflags
     if let Some(target_cfg) = target_cfg {
         if let Some(table) = config.get_table("target")? {
-            let cfgs = table.val.keys().filter_map(|key| {
-                if CfgExpr::matches_key(key, target_cfg) {
-                    Some(key)
-                } else {
-                    None
-                }
-            });
+            let cfgs = table
+                .val
+                .keys()
+                .filter(|key| CfgExpr::matches_key(key, target_cfg));
 
             // Note that we may have multiple matching `[target]` sections and
             // because we're passing flags to the compiler this can affect
diff -Nru cargo-0.32.0/src/cargo/core/compiler/build_context/target_info.rs cargo-0.33.0/src/cargo/core/compiler/build_context/target_info.rs
--- cargo-0.32.0/src/cargo/core/compiler/build_context/target_info.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/build_context/target_info.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,9 +4,9 @@
 use std::str::{self, FromStr};
 
 use super::env_args;
-use util::{CargoResult, CargoResultExt, Cfg, Config, ProcessBuilder, Rustc};
-use core::TargetKind;
 use super::Kind;
+use core::TargetKind;
+use util::{CargoResult, CargoResultExt, Cfg, Config, ProcessBuilder, Rustc};
 
 #[derive(Clone)]
 pub struct TargetInfo {
@@ -173,17 +173,16 @@
             Some((ref prefix, ref suffix)) => (prefix, suffix),
             None => return Ok(None),
         };
-        let mut ret = vec![
-            FileType {
-                suffix: suffix.clone(),
-                prefix: prefix.clone(),
-                flavor,
-                should_replace_hyphens: false,
-            },
-        ];
+        let mut ret = vec![FileType {
+            suffix: suffix.clone(),
+            prefix: prefix.clone(),
+            flavor,
+            should_replace_hyphens: false,
+        }];
 
         // rust-lang/cargo#4500
-        if target_triple.ends_with("pc-windows-msvc") && crate_type.ends_with("dylib")
+        if target_triple.ends_with("pc-windows-msvc")
+            && crate_type.ends_with("dylib")
             && suffix == ".dll"
         {
             ret.push(FileType {
diff -Nru cargo-0.32.0/src/cargo/core/compiler/build_plan.rs cargo-0.33.0/src/cargo/core/compiler/build_plan.rs
--- cargo-0.32.0/src/cargo/core/compiler/build_plan.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/build_plan.rs	2019-01-02 21:49:06.000000000 +0000
@@ -8,13 +8,13 @@
 
 use std::collections::BTreeMap;
 
-use core::TargetKind;
-use super::{Context, Kind, Unit};
 use super::context::OutputFile;
-use util::{internal, CargoResult, ProcessBuilder};
-use std::path::PathBuf;
-use serde_json;
+use super::{CompileMode, Context, Kind, Unit};
+use core::TargetKind;
 use semver;
+use serde_json;
+use std::path::PathBuf;
+use util::{internal, CargoResult, ProcessBuilder};
 
 #[derive(Debug, Serialize)]
 struct Invocation {
@@ -22,6 +22,7 @@
     package_version: semver::Version,
     target_kind: TargetKind,
     kind: Kind,
+    compile_mode: CompileMode,
     deps: Vec<usize>,
     outputs: Vec<PathBuf>,
     links: BTreeMap<PathBuf, PathBuf>,
@@ -51,6 +52,7 @@
             package_version: id.version().clone(),
             kind: unit.kind,
             target_kind: unit.target.kind().clone(),
+            compile_mode: unit.mode,
             deps,
             outputs: Vec::new(),
             links: BTreeMap::new(),
@@ -69,7 +71,8 @@
     }
 
     pub fn update_cmd(&mut self, cmd: &ProcessBuilder) -> CargoResult<()> {
-        self.program = cmd.get_program()
+        self.program = cmd
+            .get_program()
             .to_str()
             .ok_or_else(|| format_err!("unicode program string required"))?
             .to_string();
@@ -109,7 +112,8 @@
     pub fn add(&mut self, cx: &Context, unit: &Unit) -> CargoResult<()> {
         let id = self.plan.invocations.len();
         self.invocation_map.insert(unit.buildkey(), id);
-        let deps = cx.dep_targets(&unit)
+        let deps = cx
+            .dep_targets(&unit)
             .iter()
             .map(|dep| self.invocation_map[&dep.buildkey()])
             .collect();
@@ -125,10 +129,10 @@
         outputs: &[OutputFile],
     ) -> CargoResult<()> {
         let id = self.invocation_map[invocation_name];
-        let invocation = self.plan
-            .invocations
-            .get_mut(id)
-            .ok_or_else(|| internal(format!("couldn't find invocation for {}", invocation_name)))?;
+        let invocation =
+            self.plan.invocations.get_mut(id).ok_or_else(|| {
+                internal(format!("couldn't find invocation for {}", invocation_name))
+            })?;
 
         invocation.update_cmd(cmd)?;
         for output in outputs.iter() {
diff -Nru cargo-0.32.0/src/cargo/core/compiler/compilation.rs cargo-0.33.0/src/cargo/core/compiler/compilation.rs
--- cargo-0.32.0/src/cargo/core/compiler/compilation.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/compilation.rs	2019-01-02 21:49:06.000000000 +0000
@@ -5,9 +5,9 @@
 
 use semver::Version;
 
+use super::BuildContext;
 use core::{Edition, Package, PackageId, Target, TargetKind};
 use util::{self, join_paths, process, CargoResult, CfgExpr, Config, ProcessBuilder};
-use super::BuildContext;
 
 pub struct Doctest {
     /// The package being doctested.
@@ -196,7 +196,7 @@
         let search_path = join_paths(&search_path, util::dylib_path_envvar())?;
 
         cmd.env(util::dylib_path_envvar(), &search_path);
-        if let Some(env) = self.extra_env.get(pkg.package_id()) {
+        if let Some(env) = self.extra_env.get(&pkg.package_id()) {
             for &(ref k, ref v) in env {
                 cmd.env(k, v);
             }
@@ -276,8 +276,10 @@
                     if let Some(runner) = bcx.config.get_path_and_args(&key)? {
                         // more than one match, error out
                         if matching_runner.is_some() {
-                            bail!("several matching instances of `target.'cfg(..)'.runner` \
-                                   in `.cargo/config`")
+                            bail!(
+                                "several matching instances of `target.'cfg(..)'.runner` \
+                                 in `.cargo/config`"
+                            )
                         }
 
                         matching_runner = Some(runner.val);
diff -Nru cargo-0.32.0/src/cargo/core/compiler/context/compilation_files.rs cargo-0.33.0/src/cargo/core/compiler/context/compilation_files.rs
--- cargo-0.32.0/src/cargo/core/compiler/context/compilation_files.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/context/compilation_files.rs	2019-01-02 21:49:06.000000000 +0000
@@ -38,11 +38,13 @@
 
 #[derive(Debug)]
 pub struct OutputFile {
-    /// File name that will be produced by the build process (in `deps`).
+    /// Absolute path to the file that will be produced by the build process.
     pub path: PathBuf,
     /// If it should be linked into `target`, and what it should be called
     /// (e.g. without metadata).
     pub hardlink: Option<PathBuf>,
+    /// If `--out-dir` is specified, the absolute path to the exported file.
+    pub export_path: Option<PathBuf>,
     /// Type of the file (library / debug symbol / else).
     pub flavor: FileFlavor,
 }
@@ -245,16 +247,13 @@
         let mut unsupported = Vec::new();
         {
             if unit.mode.is_check() {
-                // This is not quite correct for non-lib targets.  rustc
-                // currently does not emit rmeta files, so there is nothing to
-                // check for!  See #3624.
+                // This may be confusing. rustc outputs a file named `lib*.rmeta`
+                // for both libraries and binaries.
                 let path = out_dir.join(format!("lib{}.rmeta", file_stem));
-                let hardlink = link_stem
-                    .clone()
-                    .map(|(ld, ls)| ld.join(format!("lib{}.rmeta", ls)));
                 ret.push(OutputFile {
                     path,
-                    hardlink,
+                    hardlink: None,
+                    export_path: None,
                     flavor: FileFlavor::Linkable,
                 });
             } else {
@@ -272,17 +271,29 @@
                     )?;
 
                     match file_types {
-                        Some(types) => for file_type in types {
-                            let path = out_dir.join(file_type.filename(&file_stem));
-                            let hardlink = link_stem
-                                .as_ref()
-                                .map(|&(ref ld, ref ls)| ld.join(file_type.filename(ls)));
-                            ret.push(OutputFile {
-                                path,
-                                hardlink,
-                                flavor: file_type.flavor,
-                            });
-                        },
+                        Some(types) => {
+                            for file_type in types {
+                                let path = out_dir.join(file_type.filename(&file_stem));
+                                let hardlink = link_stem
+                                    .as_ref()
+                                    .map(|&(ref ld, ref ls)| ld.join(file_type.filename(ls)));
+                                let export_path = if unit.target.is_custom_build() {
+                                    None
+                                } else {
+                                    self.export_dir.as_ref().and_then(|export_dir| {
+                                        hardlink.as_ref().and_then(|hardlink| {
+                                            Some(export_dir.join(hardlink.file_name().unwrap()))
+                                        })
+                                    })
+                                };
+                                ret.push(OutputFile {
+                                    path,
+                                    hardlink,
+                                    export_path,
+                                    flavor: file_type.flavor,
+                                });
+                            }
+                        }
                         // not supported, don't worry about it
                         None => {
                             unsupported.push(crate_type.to_string());
@@ -383,7 +394,8 @@
     let bcx = &cx.bcx;
     let __cargo_default_lib_metadata = env::var("__CARGO_DEFAULT_LIB_METADATA");
     if !(unit.mode.is_any_test() || unit.mode.is_check())
-        && (unit.target.is_dylib() || unit.target.is_cdylib()
+        && (unit.target.is_dylib()
+            || unit.target.is_cdylib()
             || (unit.target.is_bin() && bcx.target_triple().starts_with("wasm32-")))
         && unit.pkg.package_id().source_id().is_path()
         && __cargo_default_lib_metadata.is_err()
@@ -393,6 +405,15 @@
 
     let mut hasher = SipHasher::new_with_keys(0, 0);
 
+    // This is a generic version number that can be changed to make
+    // backwards-incompatible changes to any file structures in the output
+    // directory. For example, the fingerprint files or the build-script
+    // output files. Normally cargo updates ship with rustc updates which will
+    // cause a new hash due to the rustc version changing, but this allows
+    // cargo to be extra careful to deal with different versions of cargo that
+    // use the same rustc version.
+    1.hash(&mut hasher);
+
     // Unique metadata per (name, source, version) triple. This'll allow us
     // to pull crates from anywhere w/o worrying about conflicts
     unit.pkg
@@ -415,7 +436,8 @@
 
     // Mix in the target-metadata of all the dependencies of this target
     {
-        let mut deps_metadata = cx.dep_targets(unit)
+        let mut deps_metadata = cx
+            .dep_targets(unit)
             .iter()
             .map(|dep| metadata_of(dep, cx, metas))
             .collect::<Vec<_>>();
diff -Nru cargo-0.32.0/src/cargo/core/compiler/context/mod.rs cargo-0.33.0/src/cargo/core/compiler/context/mod.rs
--- cargo-0.32.0/src/cargo/core/compiler/context/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/context/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,29 +4,28 @@
 use std::fmt::Write;
 use std::path::PathBuf;
 use std::sync::Arc;
-use std::cmp::Ordering;
 
 use jobserver::Client;
 
-use core::{Package, PackageId, Resolve, Target};
 use core::compiler::compilation;
 use core::profiles::Profile;
+use core::{Package, PackageId, Resolve, Target};
 use util::errors::{CargoResult, CargoResultExt};
-use util::{internal, profile, Config, short_hash};
+use util::{internal, profile, short_hash, Config};
 
+use super::build_plan::BuildPlan;
 use super::custom_build::{self, BuildDeps, BuildScripts, BuildState};
 use super::fingerprint::Fingerprint;
 use super::job_queue::JobQueue;
 use super::layout::Layout;
 use super::{BuildContext, Compilation, CompileMode, Executor, FileFlavor, Kind};
-use super::build_plan::BuildPlan;
 
 mod unit_dependencies;
 use self::unit_dependencies::build_unit_dependencies;
 
 mod compilation_files;
-pub use self::compilation_files::{Metadata, OutputFile};
 use self::compilation_files::CompilationFiles;
+pub use self::compilation_files::{Metadata, OutputFile};
 
 /// All information needed to define a Unit.
 ///
@@ -42,7 +41,7 @@
 /// example, it needs to know the target architecture (OS, chip arch etc.) and it needs to know
 /// whether you want a debug or release build. There is enough information in this struct to figure
 /// all that out.
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Debug, PartialOrd, Ord)]
 pub struct Unit<'a> {
     /// Information about available targets, which files to include/exclude, etc. Basically stuff in
     /// `Cargo.toml`.
@@ -69,18 +68,6 @@
 impl<'a> Unit<'a> {
     pub fn buildkey(&self) -> String {
         format!("{}-{}", self.pkg.name(), short_hash(self))
-	}
-}
-
-impl<'a> Ord for Unit<'a> {
-    fn cmp(&self, other: &Unit) -> Ordering {
-        self.buildkey().cmp(&other.buildkey())
-    }
-}
-
-impl<'a> PartialOrd for Unit<'a> {
-    fn partial_cmp(&self, other: &Unit) -> Option<Ordering> {
-        Some(self.cmp(other))
     }
 }
 
@@ -93,12 +80,12 @@
     pub fingerprints: HashMap<Unit<'a>, Arc<Fingerprint>>,
     pub compiled: HashSet<Unit<'a>>,
     pub build_scripts: HashMap<Unit<'a>, Arc<BuildScripts>>,
-    pub links: Links<'a>,
+    pub links: Links,
     pub jobserver: Client,
-    primary_packages: HashSet<&'a PackageId>,
+    primary_packages: HashSet<PackageId>,
     unit_dependencies: HashMap<Unit<'a>, Vec<Unit<'a>>>,
     files: Option<CompilationFiles<'a, 'cfg>>,
-    package_cache: HashMap<&'a PackageId, &'a Package>,
+    package_cache: HashMap<PackageId, &'a Package>,
 }
 
 impl<'a, 'cfg> Context<'a, 'cfg> {
@@ -150,6 +137,7 @@
         self.prepare_units(export_dir, units)?;
         self.prepare()?;
         custom_build::build_map(&mut self, units)?;
+        self.check_collistions()?;
 
         for unit in units.iter() {
             // Build up a list of pending jobs, each of which represent
@@ -201,7 +189,7 @@
                     let out_dir = self.files().build_script_out_dir(dep).display().to_string();
                     self.compilation
                         .extra_env
-                        .entry(dep.pkg.package_id().clone())
+                        .entry(dep.pkg.package_id())
                         .or_insert_with(Vec::new)
                         .push(("OUT_DIR".to_string(), out_dir));
                 }
@@ -234,6 +222,8 @@
                         }
                     }
                 }
+                // Help with tests to get a stable order with renamed deps.
+                doctest_deps.sort();
                 self.compilation.to_doc_test.push(compilation::Doctest {
                     package: unit.pkg.clone(),
                     target: unit.target.clone(),
@@ -245,7 +235,7 @@
             if !feats.is_empty() {
                 self.compilation
                     .cfgs
-                    .entry(unit.pkg.package_id().clone())
+                    .entry(unit.pkg.package_id())
                     .or_insert_with(|| {
                         feats
                             .iter()
@@ -257,7 +247,7 @@
             if !rustdocflags.is_empty() {
                 self.compilation
                     .rustdocflags
-                    .entry(unit.pkg.package_id().clone())
+                    .entry(unit.pkg.package_id())
                     .or_insert(rustdocflags);
             }
 
@@ -299,7 +289,8 @@
             Some(target) => Some(Layout::new(self.bcx.ws, Some(target), dest)?),
             None => None,
         };
-        self.primary_packages.extend(units.iter().map(|u| u.pkg.package_id()));
+        self.primary_packages
+            .extend(units.iter().map(|u| u.pkg.package_id()));
 
         build_unit_dependencies(
             units,
@@ -351,13 +342,8 @@
         self.files.as_mut().unwrap()
     }
 
-    /// Return the filenames that the given target for the given profile will
-    /// generate as a list of 3-tuples (filename, link_dst, linkable)
-    ///
-    ///  - filename: filename rustc compiles to. (Often has metadata suffix).
-    ///  - link_dst: Optional file to link/copy the result to (without metadata suffix)
-    ///  - linkable: Whether possible to link against file (eg it's a library)
-    pub fn outputs(&mut self, unit: &Unit<'a>) -> CargoResult<Arc<Vec<OutputFile>>> {
+    /// Return the filenames that the given unit will generate.
+    pub fn outputs(&self, unit: &Unit<'a>) -> CargoResult<Arc<Vec<OutputFile>>> {
         self.files.as_ref().unwrap().outputs(unit, self.bcx)
     }
 
@@ -376,7 +362,7 @@
         // gets a full pre-filtered set of dependencies. This is not super
         // obvious, and clear, but it does work at the moment.
         if unit.target.is_custom_build() {
-            let key = (unit.pkg.package_id().clone(), unit.kind);
+            let key = (unit.pkg.package_id(), unit.kind);
             if self.build_script_overridden.contains(&key) {
                 return Vec::new();
             }
@@ -408,7 +394,8 @@
         //   incremental compilation or not. Primarily development profiles
         //   have it enabled by default while release profiles have it disabled
         //   by default.
-        let global_cfg = self.bcx
+        let global_cfg = self
+            .bcx
             .config
             .get_bool("build.incremental")?
             .map(|c| c.val);
@@ -441,12 +428,13 @@
     }
 
     pub fn is_primary_package(&self, unit: &Unit<'a>) -> bool {
-        self.primary_packages.contains(unit.pkg.package_id())
+        self.primary_packages.contains(&unit.pkg.package_id())
     }
 
     /// Gets a package for the given package id.
-    pub fn get_package(&self, id: &PackageId) -> CargoResult<&'a Package> {
-        self.package_cache.get(id)
+    pub fn get_package(&self, id: PackageId) -> CargoResult<&'a Package> {
+        self.package_cache
+            .get(&id)
             .cloned()
             .ok_or_else(|| format_err!("failed to find {}", id))
     }
@@ -466,23 +454,106 @@
         inputs.sort();
         Ok(inputs)
     }
+
+    fn check_collistions(&self) -> CargoResult<()> {
+        let mut output_collisions = HashMap::new();
+        let describe_collision = |unit: &Unit, other_unit: &Unit, path: &PathBuf| -> String {
+            format!(
+                "The {} target `{}` in package `{}` has the same output \
+                 filename as the {} target `{}` in package `{}`.\n\
+                 Colliding filename is: {}\n",
+                unit.target.kind().description(),
+                unit.target.name(),
+                unit.pkg.package_id(),
+                other_unit.target.kind().description(),
+                other_unit.target.name(),
+                other_unit.pkg.package_id(),
+                path.display()
+            )
+        };
+        let suggestion = "Consider changing their names to be unique or compiling them separately.\n\
+            This may become a hard error in the future, see https://github.com/rust-lang/cargo/issues/6313";
+        let report_collision = |unit: &Unit,
+                                other_unit: &Unit,
+                                path: &PathBuf|
+         -> CargoResult<()> {
+            if unit.target.name() == other_unit.target.name() {
+                self.bcx.config.shell().warn(format!(
+                    "output filename collision.\n\
+                     {}\
+                     The targets should have unique names.\n\
+                     {}",
+                    describe_collision(unit, other_unit, path),
+                    suggestion
+                ))
+            } else {
+                self.bcx.config.shell().warn(format!(
+                    "output filename collision.\n\
+                    {}\
+                    The output filenames should be unique.\n\
+                    {}\n\
+                    If this looks unexpected, it may be a bug in Cargo. Please file a bug report at\n\
+                    https://github.com/rust-lang/cargo/issues/ with as much information as you\n\
+                    can provide.\n\
+                    {} running on `{}` target `{}`\n\
+                    First unit: {:?}\n\
+                    Second unit: {:?}",
+                    describe_collision(unit, other_unit, path),
+                    suggestion,
+                    ::version(), self.bcx.host_triple(), self.bcx.target_triple(),
+                    unit, other_unit))
+            }
+        };
+        let mut keys = self
+            .unit_dependencies
+            .keys()
+            .filter(|unit| !unit.mode.is_run_custom_build())
+            .collect::<Vec<_>>();
+        // Sort for consistent error messages.
+        keys.sort_unstable();
+        for unit in keys {
+            for output in self.outputs(unit)?.iter() {
+                if let Some(other_unit) = output_collisions.insert(output.path.clone(), unit) {
+                    report_collision(unit, &other_unit, &output.path)?;
+                }
+                if let Some(hardlink) = output.hardlink.as_ref() {
+                    if let Some(other_unit) = output_collisions.insert(hardlink.clone(), unit) {
+                        report_collision(unit, &other_unit, hardlink)?;
+                    }
+                }
+                if let Some(ref export_path) = output.export_path {
+                    if let Some(other_unit) = output_collisions.insert(export_path.clone(), unit) {
+                        self.bcx.config.shell().warn(format!(
+                            "`--out-dir` filename collision.\n\
+                             {}\
+                             The exported filenames should be unique.\n\
+                             {}",
+                            describe_collision(unit, &other_unit, &export_path),
+                            suggestion
+                        ))?;
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
 }
 
 #[derive(Default)]
-pub struct Links<'a> {
-    validated: HashSet<&'a PackageId>,
-    links: HashMap<String, &'a PackageId>,
+pub struct Links {
+    validated: HashSet<PackageId>,
+    links: HashMap<String, PackageId>,
 }
 
-impl<'a> Links<'a> {
-    pub fn new() -> Links<'a> {
+impl Links {
+    pub fn new() -> Links {
         Links {
             validated: HashSet::new(),
             links: HashMap::new(),
         }
     }
 
-    pub fn validate(&mut self, resolve: &Resolve, unit: &Unit<'a>) -> CargoResult<()> {
+    pub fn validate(&mut self, resolve: &Resolve, unit: &Unit) -> CargoResult<()> {
         if !self.validated.insert(unit.pkg.package_id()) {
             return Ok(());
         }
@@ -490,11 +561,11 @@
             Some(lib) => lib,
             None => return Ok(()),
         };
-        if let Some(prev) = self.links.get(lib) {
+        if let Some(&prev) = self.links.get(lib) {
             let pkg = unit.pkg.package_id();
 
-            let describe_path = |pkgid: &PackageId| -> String {
-                let dep_path = resolve.path_to_top(pkgid);
+            let describe_path = |pkgid: PackageId| -> String {
+                let dep_path = resolve.path_to_top(&pkgid);
                 let mut dep_path_desc = format!("package `{}`", dep_path[0]);
                 for dep in dep_path.iter().skip(1) {
                     write!(dep_path_desc, "\n    ... which is depended on by `{}`", dep).unwrap();
@@ -516,7 +587,8 @@
                 lib
             )
         }
-        if !unit.pkg
+        if !unit
+            .pkg
             .manifest()
             .targets()
             .iter()
diff -Nru cargo-0.32.0/src/cargo/core/compiler/context/unit_dependencies.rs cargo-0.33.0/src/cargo/core/compiler/context/unit_dependencies.rs
--- cargo-0.32.0/src/cargo/core/compiler/context/unit_dependencies.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/context/unit_dependencies.rs	2019-01-02 21:49:06.000000000 +0000
@@ -18,18 +18,18 @@
 use std::cell::RefCell;
 use std::collections::{HashMap, HashSet};
 
-use CargoResult;
+use super::{BuildContext, CompileMode, Kind, Unit};
 use core::dependency::Kind as DepKind;
-use core::profiles::UnitFor;
-use core::{Package, Target, PackageId};
 use core::package::Downloads;
-use super::{BuildContext, CompileMode, Kind, Unit};
+use core::profiles::UnitFor;
+use core::{Package, PackageId, Target};
+use CargoResult;
 
 struct State<'a: 'tmp, 'cfg: 'a, 'tmp> {
     bcx: &'tmp BuildContext<'a, 'cfg>,
     deps: &'tmp mut HashMap<Unit<'a>, Vec<Unit<'a>>>,
-    pkgs: RefCell<&'tmp mut HashMap<&'a PackageId, &'a Package>>,
-    waiting_on_download: HashSet<&'a PackageId>,
+    pkgs: RefCell<&'tmp mut HashMap<PackageId, &'a Package>>,
+    waiting_on_download: HashSet<PackageId>,
     downloads: Downloads<'a, 'cfg>,
 }
 
@@ -37,7 +37,7 @@
     roots: &[Unit<'a>],
     bcx: &BuildContext<'a, 'cfg>,
     deps: &mut HashMap<Unit<'a>, Vec<Unit<'a>>>,
-    pkgs: &mut HashMap<&'a PackageId, &'a Package>,
+    pkgs: &mut HashMap<PackageId, &'a Package>,
 ) -> CargoResult<()> {
     assert!(deps.is_empty(), "can only build unit deps once");
 
@@ -74,11 +74,11 @@
             deps_of(unit, &mut state, unit_for)?;
         }
 
-        if state.waiting_on_download.len() > 0 {
+        if !state.waiting_on_download.is_empty() {
             state.finish_some_downloads()?;
             state.deps.clear();
         } else {
-            break
+            break;
         }
     }
     trace!("ALL UNIT DEPENDENCIES {:#?}", state.deps);
@@ -128,46 +128,43 @@
 
     let bcx = state.bcx;
     let id = unit.pkg.package_id();
-    let deps = bcx.resolve.deps(id)
-        .filter(|&(_id, deps)| {
-            assert!(!deps.is_empty());
-            deps.iter().any(|dep| {
-                // If this target is a build command, then we only want build
-                // dependencies, otherwise we want everything *other than* build
-                // dependencies.
-                if unit.target.is_custom_build() != dep.is_build() {
-                    return false;
-                }
+    let deps = bcx.resolve.deps(id).filter(|&(_id, deps)| {
+        assert!(!deps.is_empty());
+        deps.iter().any(|dep| {
+            // If this target is a build command, then we only want build
+            // dependencies, otherwise we want everything *other than* build
+            // dependencies.
+            if unit.target.is_custom_build() != dep.is_build() {
+                return false;
+            }
 
-                // If this dependency is *not* a transitive dependency, then it
-                // only applies to test/example targets
-                if !dep.is_transitive() &&
-                    !unit.target.is_test() &&
-                    !unit.target.is_example() &&
-                    !unit.mode.is_any_test()
-                {
-                    return false;
-                }
+            // If this dependency is *not* a transitive dependency, then it
+            // only applies to test/example targets
+            if !dep.is_transitive()
+                && !unit.target.is_test()
+                && !unit.target.is_example()
+                && !unit.mode.is_any_test()
+            {
+                return false;
+            }
 
-                // If this dependency is only available for certain platforms,
-                // make sure we're only enabling it for that platform.
-                if !bcx.dep_platform_activated(dep, unit.kind) {
-                    return false;
-                }
+            // If this dependency is only available for certain platforms,
+            // make sure we're only enabling it for that platform.
+            if !bcx.dep_platform_activated(dep, unit.kind) {
+                return false;
+            }
 
-                // If the dependency is optional, then we're only activating it
-                // if the corresponding feature was activated
-                if dep.is_optional() &&
-                    !bcx.resolve.features(id).contains(&*dep.name_in_toml())
-                {
-                    return false;
-                }
+            // If the dependency is optional, then we're only activating it
+            // if the corresponding feature was activated
+            if dep.is_optional() && !bcx.resolve.features(id).contains(&*dep.name_in_toml()) {
+                return false;
+            }
 
-                // If we've gotten past all that, then this dependency is
-                // actually used!
-                true
-            })
-        });
+            // If we've gotten past all that, then this dependency is
+            // actually used!
+            true
+        })
+    });
 
     let mut ret = Vec::new();
     for (id, _) in deps {
@@ -181,14 +178,7 @@
         };
         let mode = check_or_build_mode(unit.mode, lib);
         let dep_unit_for = unit_for.with_for_host(lib.for_host());
-        let unit = new_unit(
-            bcx,
-            pkg,
-            lib,
-            dep_unit_for,
-            unit.kind.for_target(lib),
-            mode,
-        );
+        let unit = new_unit(bcx, pkg, lib, dep_unit_for, unit.kind.for_target(lib), mode);
         ret.push((unit, dep_unit_for));
     }
 
@@ -211,7 +201,8 @@
 
     // If any integration tests/benches are being run, make sure that
     // binaries are built as well.
-    if !unit.mode.is_check() && unit.mode.is_any_test()
+    if !unit.mode.is_check()
+        && unit.mode.is_any_test()
         && (unit.target.is_test() || unit.target.is_bench())
     {
         ret.extend(
@@ -282,7 +273,8 @@
     state: &mut State<'a, 'cfg, 'tmp>,
 ) -> CargoResult<Vec<(Unit<'a>, UnitFor)>> {
     let bcx = state.bcx;
-    let deps = bcx.resolve
+    let deps = bcx
+        .resolve
         .deps(unit.pkg.package_id())
         .filter(|&(_id, deps)| {
             deps.iter().any(|dep| match dep.kind() {
@@ -308,14 +300,7 @@
         // However, for plugins/proc-macros, deps should be built like normal.
         let mode = check_or_build_mode(unit.mode, lib);
         let dep_unit_for = UnitFor::new_normal().with_for_host(lib.for_host());
-        let lib_unit = new_unit(
-            bcx,
-            dep,
-            lib,
-            dep_unit_for,
-            unit.kind.for_target(lib),
-            mode,
-        );
+        let lib_unit = new_unit(bcx, dep, lib, dep_unit_for, unit.kind.for_target(lib), mode);
         ret.push((lib_unit, dep_unit_for));
         if let CompileMode::Doc { deps: true } = unit.mode {
             // Document this lib as well.
@@ -348,14 +333,7 @@
 ) -> Option<(Unit<'a>, UnitFor)> {
     unit.pkg.targets().iter().find(|t| t.linkable()).map(|t| {
         let mode = check_or_build_mode(unit.mode, t);
-        let unit = new_unit(
-            bcx,
-            unit.pkg,
-            t,
-            unit_for,
-            unit.kind.for_target(t),
-            mode,
-        );
+        let unit = new_unit(bcx, unit.pkg, t, unit_for, unit.kind.for_target(t), mode);
         (unit, unit_for)
     })
 }
@@ -415,7 +393,7 @@
     mode: CompileMode,
 ) -> Unit<'a> {
     let profile = bcx.profiles.get_profile(
-        &pkg.package_id(),
+        pkg.package_id(),
         bcx.ws.is_member(pkg),
         unit_for,
         mode,
@@ -453,7 +431,8 @@
         for (unit, deps) in state.deps.iter() {
             for dep in deps {
                 if dep.mode == CompileMode::RunCustomBuild {
-                    reverse_deps.entry(dep)
+                    reverse_deps
+                        .entry(dep)
                         .or_insert_with(HashSet::new)
                         .insert(unit);
                 }
@@ -469,7 +448,11 @@
         // `links`, then we depend on that package's build script! Here we use
         // `dep_build_script` to manufacture an appropriate build script unit to
         // depend on.
-        for unit in state.deps.keys().filter(|k| k.mode == CompileMode::RunCustomBuild) {
+        for unit in state
+            .deps
+            .keys()
+            .filter(|k| k.mode == CompileMode::RunCustomBuild)
+        {
             let reverse_deps = match reverse_deps.get(unit) {
                 Some(set) => set,
                 None => continue,
@@ -479,9 +462,9 @@
                 .iter()
                 .flat_map(|reverse_dep| state.deps[reverse_dep].iter())
                 .filter(|other| {
-                    other.pkg != unit.pkg &&
-                        other.target.linkable() &&
-                        other.pkg.manifest().links().is_some()
+                    other.pkg != unit.pkg
+                        && other.target.linkable()
+                        && other.pkg.manifest().links().is_some()
                 })
                 .filter_map(|other| dep_build_script(other, state.bcx).map(|p| p.0))
                 .collect::<HashSet<_>>();
@@ -499,18 +482,18 @@
 }
 
 impl<'a, 'cfg, 'tmp> State<'a, 'cfg, 'tmp> {
-    fn get(&mut self, id: &'a PackageId) -> CargoResult<Option<&'a Package>> {
+    fn get(&mut self, id: PackageId) -> CargoResult<Option<&'a Package>> {
         let mut pkgs = self.pkgs.borrow_mut();
-        if let Some(pkg) = pkgs.get(id) {
-            return Ok(Some(pkg))
+        if let Some(pkg) = pkgs.get(&id) {
+            return Ok(Some(pkg));
         }
         if !self.waiting_on_download.insert(id) {
-            return Ok(None)
+            return Ok(None);
         }
         if let Some(pkg) = self.downloads.start(id)? {
             pkgs.insert(id, pkg);
-            self.waiting_on_download.remove(id);
-            return Ok(Some(pkg))
+            self.waiting_on_download.remove(&id);
+            return Ok(Some(pkg));
         }
         Ok(None)
     }
@@ -527,7 +510,7 @@
         assert!(self.downloads.remaining() > 0);
         loop {
             let pkg = self.downloads.wait()?;
-            self.waiting_on_download.remove(pkg.package_id());
+            self.waiting_on_download.remove(&pkg.package_id());
             self.pkgs.borrow_mut().insert(pkg.package_id(), pkg);
 
             // Arbitrarily choose that 5 or more packages concurrently download
@@ -535,7 +518,7 @@
             // less than this let's recompute the whole unit dependency graph
             // again and try to find some more packages to download.
             if self.downloads.remaining() < 5 {
-                break
+                break;
             }
         }
         Ok(())
diff -Nru cargo-0.32.0/src/cargo/core/compiler/custom_build.rs cargo-0.33.0/src/cargo/core/compiler/custom_build.rs
--- cargo-0.32.0/src/cargo/core/compiler/custom_build.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/custom_build.rs	2019-01-02 21:49:06.000000000 +0000
@@ -28,6 +28,7 @@
     /// Metadata to pass to the immediate dependencies
     pub metadata: Vec<(String, String)>,
     /// Paths to trigger a rerun of this build script.
+    /// May be absolute or relative paths (relative to package root).
     pub rerun_if_changed: Vec<PathBuf>,
     /// Environment variables which, when changed, will cause a rebuild.
     pub rerun_if_env_changed: Vec<String>,
@@ -86,7 +87,7 @@
         unit.target.name()
     ));
 
-    let key = (unit.pkg.package_id().clone(), unit.kind);
+    let key = (unit.pkg.package_id(), unit.kind);
     let overridden = cx.build_script_overridden.contains(&key);
     let (work_dirty, work_fresh) = if overridden {
         (Work::noop(), Work::noop())
@@ -105,7 +106,7 @@
     }
 }
 
-fn emit_build_output(output: &BuildOutput, id: &PackageId) {
+fn emit_build_output(output: &BuildOutput, package_id: PackageId) {
     let library_paths = output
         .library_paths
         .iter()
@@ -113,7 +114,7 @@
         .collect::<Vec<_>>();
 
     machine_message::emit(&machine_message::BuildScript {
-        package_id: id,
+        package_id,
         linked_libs: &output.library_links,
         linked_paths: &library_paths,
         cfgs: &output.cfgs,
@@ -129,8 +130,8 @@
         .iter()
         .find(|d| !d.mode.is_run_custom_build() && d.target.is_custom_build())
         .expect("running a script not depending on an actual script");
-    let script_output = cx.files().build_script_dir(build_script_unit);
-    let build_output = cx.files().build_script_out_dir(unit);
+    let script_dir = cx.files().build_script_dir(build_script_unit);
+    let script_out_dir = cx.files().build_script_out_dir(unit);
     let build_plan = bcx.build_config.build_plan;
     let invocation_name = unit.buildkey();
 
@@ -139,7 +140,7 @@
     }
 
     // Building the command to execute
-    let to_exec = script_output.join(unit.target.name());
+    let to_exec = script_dir.join(unit.target.name());
 
     // Start preparing the process to execute, starting out with some
     // environment variables. Note that the profile-related environment
@@ -151,7 +152,7 @@
     let to_exec = to_exec.into_os_string();
     let mut cmd = cx.compilation.host_process(to_exec, unit.pkg)?;
     let debug = unit.profile.debuginfo.unwrap_or(0) != 0;
-    cmd.env("OUT_DIR", &build_output)
+    cmd.env("OUT_DIR", &script_out_dir)
         .env("CARGO_MANIFEST_DIR", unit.pkg.root())
         .env("NUM_JOBS", &bcx.jobs().to_string())
         .env(
@@ -229,7 +230,7 @@
                 if unit.mode.is_run_custom_build() {
                     Some((
                         unit.pkg.manifest().links().unwrap().to_string(),
-                        unit.pkg.package_id().clone(),
+                        unit.pkg.package_id(),
                     ))
                 } else {
                     None
@@ -239,21 +240,21 @@
     };
     let pkg_name = unit.pkg.to_string();
     let build_state = Arc::clone(&cx.build_state);
-    let id = unit.pkg.package_id().clone();
+    let id = unit.pkg.package_id();
     let (output_file, err_file, root_output_file) = {
-        let build_output_parent = build_output.parent().unwrap();
+        let build_output_parent = script_out_dir.parent().unwrap();
         let output_file = build_output_parent.join("output");
         let err_file = build_output_parent.join("stderr");
         let root_output_file = build_output_parent.join("root-output");
         (output_file, err_file, root_output_file)
     };
-    let root_output = cx.files().target_root().to_path_buf();
+    let host_target_root = cx.files().target_root().to_path_buf();
     let all = (
-        id.clone(),
+        id,
         pkg_name.clone(),
         Arc::clone(&build_state),
         output_file.clone(),
-        root_output.clone(),
+        script_out_dir.clone(),
     );
     let build_scripts = super::load_build_deps(cx, unit);
     let kind = unit.kind;
@@ -262,16 +263,22 @@
 
     // Check to see if the build script has already run, and if it has keep
     // track of whether it has told us about some explicit dependencies
-    let prev_root_output = paths::read_bytes(&root_output_file)
+    let prev_script_out_dir = paths::read_bytes(&root_output_file)
         .and_then(|bytes| util::bytes2path(&bytes))
-        .unwrap_or_else(|_| cmd.get_cwd().unwrap().to_path_buf());
-    let prev_output =
-        BuildOutput::parse_file(&output_file, &pkg_name, &prev_root_output, &root_output).ok();
+        .unwrap_or_else(|_| script_out_dir.clone());
+
+    let prev_output = BuildOutput::parse_file(
+        &output_file,
+        &pkg_name,
+        &prev_script_out_dir,
+        &script_out_dir,
+    )
+    .ok();
     let deps = BuildDeps::new(&output_file, prev_output.as_ref());
     cx.build_explicit_deps.insert(*unit, deps);
 
-    fs::create_dir_all(&script_output)?;
-    fs::create_dir_all(&build_output)?;
+    fs::create_dir_all(&script_dir)?;
+    fs::create_dir_all(&script_out_dir)?;
 
     // Prepare the unit of "dirty work" which will actually run the custom build
     // command.
@@ -283,8 +290,8 @@
         //
         // If we have an old build directory, then just move it into place,
         // otherwise create it!
-        if fs::metadata(&build_output).is_err() {
-            fs::create_dir(&build_output).chain_err(|| {
+        if fs::metadata(&script_out_dir).is_err() {
+            fs::create_dir(&script_out_dir).chain_err(|| {
                 internal(
                     "failed to create script output directory for \
                      build command",
@@ -299,7 +306,7 @@
         if !build_plan {
             let build_state = build_state.outputs.lock().unwrap();
             for (name, id) in lib_deps {
-                let key = (id.clone(), kind);
+                let key = (id, kind);
                 let state = build_state.get(&key).ok_or_else(|| {
                     internal(format!(
                         "failed to locate build state for env \
@@ -316,7 +323,7 @@
                 }
             }
             if let Some(build_scripts) = build_scripts {
-                super::add_plugin_deps(&mut cmd, &build_state, &build_scripts, &root_output)?;
+                super::add_plugin_deps(&mut cmd, &build_state, &build_scripts, &host_target_root)?;
             }
         }
 
@@ -348,12 +355,12 @@
             // well.
             paths::write(&output_file, &output.stdout)?;
             paths::write(&err_file, &output.stderr)?;
-            paths::write(&root_output_file, util::path2bytes(&root_output)?)?;
+            paths::write(&root_output_file, util::path2bytes(&script_out_dir)?)?;
             let parsed_output =
-                BuildOutput::parse(&output.stdout, &pkg_name, &root_output, &root_output)?;
+                BuildOutput::parse(&output.stdout, &pkg_name, &script_out_dir, &script_out_dir)?;
 
             if json_messages {
-                emit_build_output(&parsed_output, &id);
+                emit_build_output(&parsed_output, id);
             }
             build_state.insert(id, kind, parsed_output);
         }
@@ -364,16 +371,19 @@
     // itself to run when we actually end up just discarding what we calculated
     // above.
     let fresh = Work::new(move |_tx| {
-        let (id, pkg_name, build_state, output_file, root_output) = all;
+        let (id, pkg_name, build_state, output_file, script_out_dir) = all;
         let output = match prev_output {
             Some(output) => output,
-            None => {
-                BuildOutput::parse_file(&output_file, &pkg_name, &prev_root_output, &root_output)?
-            }
+            None => BuildOutput::parse_file(
+                &output_file,
+                &pkg_name,
+                &prev_script_out_dir,
+                &script_out_dir,
+            )?,
         };
 
         if json_messages {
-            emit_build_output(&output, &id);
+            emit_build_output(&output, id);
         }
 
         build_state.insert(id, kind, output);
@@ -406,11 +416,16 @@
     pub fn parse_file(
         path: &Path,
         pkg_name: &str,
-        root_output_when_generated: &Path,
-        root_output: &Path,
+        script_out_dir_when_generated: &Path,
+        script_out_dir: &Path,
     ) -> CargoResult<BuildOutput> {
         let contents = paths::read_bytes(path)?;
-        BuildOutput::parse(&contents, pkg_name, root_output_when_generated, root_output)
+        BuildOutput::parse(
+            &contents,
+            pkg_name,
+            script_out_dir_when_generated,
+            script_out_dir,
+        )
     }
 
     // Parses the output of a script.
@@ -418,8 +433,8 @@
     pub fn parse(
         input: &[u8],
         pkg_name: &str,
-        root_output_when_generated: &Path,
-        root_output: &Path,
+        script_out_dir_when_generated: &Path,
+        script_out_dir: &Path,
     ) -> CargoResult<BuildOutput> {
         let mut library_paths = Vec::new();
         let mut library_links = Vec::new();
@@ -451,28 +466,29 @@
             let key = iter.next();
             let value = iter.next();
             let (key, value) = match (key, value) {
-                (Some(a), Some(b)) => (a, b.trim_right()),
+                (Some(a), Some(b)) => (a, b.trim_end()),
                 // line started with `cargo:` but didn't match `key=value`
                 _ => bail!("Wrong output in {}: `{}`", whence, line),
             };
 
-            let path = |val: &str| match Path::new(val).strip_prefix(root_output_when_generated) {
-                Ok(path) => root_output.join(path),
-                Err(_) => PathBuf::from(val),
-            };
+            // This will rewrite paths if the target directory has been moved.
+            let value = value.replace(
+                script_out_dir_when_generated.to_str().unwrap(),
+                script_out_dir.to_str().unwrap(),
+            );
 
             match key {
                 "rustc-flags" => {
-                    let (paths, links) = BuildOutput::parse_rustc_flags(value, &whence)?;
+                    let (paths, links) = BuildOutput::parse_rustc_flags(&value, &whence)?;
                     library_links.extend(links.into_iter());
                     library_paths.extend(paths.into_iter());
                 }
                 "rustc-link-lib" => library_links.push(value.to_string()),
-                "rustc-link-search" => library_paths.push(path(value)),
+                "rustc-link-search" => library_paths.push(PathBuf::from(value)),
                 "rustc-cfg" => cfgs.push(value.to_string()),
-                "rustc-env" => env.push(BuildOutput::parse_rustc_env(value, &whence)?),
+                "rustc-env" => env.push(BuildOutput::parse_rustc_env(&value, &whence)?),
                 "warning" => warnings.push(value.to_string()),
-                "rerun-if-changed" => rerun_if_changed.push(path(value)),
+                "rerun-if-changed" => rerun_if_changed.push(PathBuf::from(value)),
                 "rerun-if-env-changed" => rerun_if_env_changed.push(value.to_string()),
                 _ => metadata.push((key.to_string(), value.to_string())),
             }
@@ -617,14 +633,15 @@
         }
 
         {
-            let key = unit.pkg
+            let key = unit
+                .pkg
                 .manifest()
                 .links()
                 .map(|l| (l.to_string(), unit.kind));
             let build_state = &cx.build_state;
             if let Some(output) = key.and_then(|k| build_state.overrides.get(&k)) {
-                let key = (unit.pkg.package_id().clone(), unit.kind);
-                cx.build_script_overridden.insert(key.clone());
+                let key = (unit.pkg.package_id(), unit.kind);
+                cx.build_script_overridden.insert(key);
                 build_state
                     .outputs
                     .lock()
@@ -653,7 +670,7 @@
                 ret.plugins
                     .extend(dep_scripts.to_link.iter().map(|p| &p.0).cloned());
             } else if unit.target.linkable() {
-                for &(ref pkg, kind) in dep_scripts.to_link.iter() {
+                for &(pkg, kind) in dep_scripts.to_link.iter() {
                     add_to_link(&mut ret, pkg, kind);
                 }
             }
@@ -667,9 +684,9 @@
 
     // When adding an entry to 'to_link' we only actually push it on if the
     // script hasn't seen it yet (e.g. we don't push on duplicates).
-    fn add_to_link(scripts: &mut BuildScripts, pkg: &PackageId, kind: Kind) {
-        if scripts.seen_to_link.insert((pkg.clone(), kind)) {
-            scripts.to_link.push((pkg.clone(), kind));
+    fn add_to_link(scripts: &mut BuildScripts, pkg: PackageId, kind: Kind) {
+        if scripts.seen_to_link.insert((pkg, kind)) {
+            scripts.to_link.push((pkg, kind));
         }
     }
 }
diff -Nru cargo-0.32.0/src/cargo/core/compiler/fingerprint.rs cargo-0.33.0/src/cargo/core/compiler/fingerprint.rs
--- cargo-0.32.0/src/cargo/core/compiler/fingerprint.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/fingerprint.rs	2019-01-02 21:49:06.000000000 +0000
@@ -9,15 +9,15 @@
 use serde::ser;
 use serde_json;
 
-use core::{Edition, Package, TargetKind};
+use core::{Edition, Package};
 use util;
 use util::errors::{CargoResult, CargoResultExt};
 use util::paths;
 use util::{internal, profile, Dirty, Fresh, Freshness};
 
-use super::{Context, BuildContext, FileFlavor, Unit};
 use super::custom_build::BuildDeps;
 use super::job::Work;
+use super::{BuildContext, Context, FileFlavor, Unit};
 
 /// A tuple result of the `prepare_foo` functions in this module.
 ///
@@ -88,11 +88,13 @@
     let root = cx.files().out_dir(unit);
     let missing_outputs = {
         if unit.mode.is_doc() {
-            !root.join(unit.target.crate_name())
+            !root
+                .join(unit.target.crate_name())
                 .join("index.html")
                 .exists()
         } else {
-            match cx.outputs(unit)?
+            match cx
+                .outputs(unit)?
                 .iter()
                 .filter(|output| output.flavor != FileFlavor::DebugInfo)
                 .find(|output| !output.path.exists())
@@ -159,7 +161,10 @@
     target: u64,
     profile: u64,
     path: u64,
-    #[serde(serialize_with = "serialize_deps", deserialize_with = "deserialize_deps")]
+    #[serde(
+        serialize_with = "serialize_deps",
+        deserialize_with = "deserialize_deps"
+    )]
     deps: Vec<DepFingerprint>,
     local: Vec<LocalFingerprint>,
     #[serde(skip_serializing, skip_deserializing)]
@@ -172,8 +177,7 @@
 where
     S: ser::Serializer,
 {
-    ser.collect_seq(deps.iter()
-       .map(|&(ref a, ref b, ref c)| (a, b, c.hash())))
+    ser.collect_seq(deps.iter().map(|&(ref a, ref b, ref c)| (a, b, c.hash())))
 }
 
 fn deserialize_deps<'de, D>(d: D) -> Result<Vec<DepFingerprint>, D::Error>
@@ -224,7 +228,6 @@
 
 impl Fingerprint {
     fn update_local(&self, root: &Path) -> CargoResult<()> {
-        let mut hash_busted = false;
         for local in self.local.iter() {
             match *local {
                 LocalFingerprint::MtimeBased(ref slot, ref path) => {
@@ -234,12 +237,9 @@
                 }
                 LocalFingerprint::EnvBased(..) | LocalFingerprint::Precalculated(..) => continue,
             }
-            hash_busted = true;
         }
 
-        if hash_busted {
-            *self.memoized_hash.lock().unwrap() = None;
-        }
+        *self.memoized_hash.lock().unwrap() = None;
         Ok(())
     }
 
@@ -363,7 +363,8 @@
         } = *self;
         (
             rustc, features, target, path, profile, local, edition, rustflags,
-        ).hash(h);
+        )
+            .hash(h);
 
         h.write_usize(deps.len());
         for &(ref pkg_id, ref name, ref fingerprint) in deps {
@@ -400,9 +401,9 @@
         D: de::Deserializer<'de>,
     {
         let kind: Option<(i64, u32)> = de::Deserialize::deserialize(d)?;
-        Ok(MtimeSlot(Mutex::new(kind.map(|(s, n)| {
-            FileTime::from_unix_time(s, n)
-        }))))
+        Ok(MtimeSlot(Mutex::new(
+            kind.map(|(s, n)| FileTime::from_unix_time(s, n)),
+        )))
     }
 }
 
@@ -435,7 +436,8 @@
     // induce a recompile, they're just dependencies in the sense that they need
     // to be built.
     let deps = cx.dep_targets(unit);
-    let deps = deps.iter()
+    let deps = deps
+        .iter()
         .filter(|u| !u.target.is_custom_build() && !u.target.is_bin())
         .map(|dep| {
             calculate(cx, dep).and_then(|fingerprint| {
@@ -548,7 +550,7 @@
     // the kind of fingerprint by reinterpreting the dependencies output by the
     // build script.
     let state = Arc::clone(&cx.build_state);
-    let key = (unit.pkg.package_id().clone(), unit.kind);
+    let key = (unit.pkg.package_id(), unit.kind);
     let pkg_root = unit.pkg.root().to_path_buf();
     let target_root = cx.files().target_root().to_path_buf();
     let write_fingerprint = Work::new(move |_| {
@@ -581,7 +583,7 @@
     //
     // Note that the `None` here means that we don't want to update the local
     // fingerprint afterwards because this is all just overridden.
-    if let Some(output) = state.get(&(unit.pkg.package_id().clone(), unit.kind)) {
+    if let Some(output) = state.get(&(unit.pkg.package_id(), unit.kind)) {
         debug!("override local fingerprints deps");
         let s = format!(
             "overridden build state with hash: {}",
@@ -695,7 +697,8 @@
         Ok(data) => data,
         Err(_) => return Ok(None),
     };
-    let paths = data.split(|&x| x == 0)
+    let paths = data
+        .split(|&x| x == 0)
         .filter(|x| !x.is_empty())
         .map(|p| util::bytes2path(p).map(|p| pkg.root().join(p)))
         .collect::<Result<Vec<_>, _>>()?;
@@ -780,14 +783,7 @@
     // fingerprint for every metadata hash version. This works because
     // even if the package is fresh, we'll still link the fresh target
     let file_stem = cx.files().file_stem(unit);
-    let kind = match *unit.target.kind() {
-        TargetKind::Lib(..) => "lib",
-        TargetKind::Bin => "bin",
-        TargetKind::Test => "integration-test",
-        TargetKind::ExampleBin | TargetKind::ExampleLib(..) => "example",
-        TargetKind::Bench => "bench",
-        TargetKind::CustomBuild => "build-script",
-    };
+    let kind = unit.target.kind().description();
     let flavor = if unit.mode.is_any_test() {
         "test-"
     } else if unit.mode.is_doc() {
diff -Nru cargo-0.32.0/src/cargo/core/compiler/job_queue.rs cargo-0.33.0/src/cargo/core/compiler/job_queue.rs
--- cargo-0.32.0/src/cargo/core/compiler/job_queue.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/job_queue.rs	2019-01-02 21:49:06.000000000 +0000
@@ -3,9 +3,9 @@
 use std::fmt;
 use std::io;
 use std::mem;
+use std::process::Output;
 use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
-use std::process::Output;
 
 use crossbeam_utils;
 use crossbeam_utils::thread::Scope;
@@ -15,14 +15,14 @@
 use core::{PackageId, Target, TargetKind};
 use handle_error;
 use util;
+use util::diagnostic_server::{self, DiagnosticPrinter};
 use util::{internal, profile, CargoResult, CargoResultExt, ProcessBuilder};
 use util::{Config, DependencyQueue, Dirty, Fresh, Freshness};
 use util::{Progress, ProgressStyle};
-use util::diagnostic_server::{self, DiagnosticPrinter};
 
+use super::context::OutputFile;
 use super::job::Job;
 use super::{BuildContext, BuildPlan, CompileMode, Context, Kind, Unit};
-use super::context::OutputFile;
 
 /// A management structure of the entire dependency graph to compile.
 ///
@@ -35,9 +35,9 @@
     rx: Receiver<Message<'a>>,
     active: Vec<Key<'a>>,
     pending: HashMap<Key<'a>, PendingBuild>,
-    compiled: HashSet<&'a PackageId>,
-    documented: HashSet<&'a PackageId>,
-    counts: HashMap<&'a PackageId, usize>,
+    compiled: HashSet<PackageId>,
+    documented: HashSet<PackageId>,
+    counts: HashMap<PackageId, usize>,
     is_release: bool,
 }
 
@@ -52,7 +52,7 @@
 
 #[derive(Clone, Copy, Eq, PartialEq, Hash)]
 struct Key<'a> {
-    pkg: &'a PackageId,
+    pkg: PackageId,
     target: &'a Target,
     profile: Profile,
     kind: Kind,
@@ -105,7 +105,8 @@
         cmd: ProcessBuilder,
         filenames: Arc<Vec<OutputFile>>,
     ) {
-        let _ = self.tx
+        let _ = self
+            .tx
             .send(Message::BuildPlanMsg(module_name, cmd, filenames));
     }
 
@@ -113,9 +114,9 @@
         &self,
         cmd: &ProcessBuilder,
         prefix: Option<String>,
-        print_output: bool,
+        capture_output: bool,
     ) -> CargoResult<Output> {
-        let prefix = prefix.unwrap_or_else(|| String::new());
+        let prefix = prefix.unwrap_or_else(String::new);
         cmd.exec_with_streaming(
             &mut |out| {
                 let _ = self.tx.send(Message::Stdout(format!("{}{}", prefix, out)));
@@ -125,7 +126,7 @@
                 let _ = self.tx.send(Message::Stderr(format!("{}{}", prefix, err)));
                 Ok(())
             },
-            print_output,
+            capture_output,
         )
     }
 }
@@ -187,21 +188,23 @@
         let tx = self.tx.clone();
         let tx = unsafe { mem::transmute::<Sender<Message<'a>>, Sender<Message<'static>>>(tx) };
         let tx2 = tx.clone();
-        let helper = cx.jobserver
+        let helper = cx
+            .jobserver
             .clone()
             .into_helper_thread(move |token| {
                 drop(tx.send(Message::Token(token)));
             })
             .chain_err(|| "failed to create helper thread for jobserver management")?;
-        let _diagnostic_server = cx.bcx.build_config
+        let _diagnostic_server = cx
+            .bcx
+            .build_config
             .rustfix_diagnostic_server
             .borrow_mut()
             .take()
-            .map(move |srv| {
-                srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg))))
-            });
+            .map(move |srv| srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg)))));
 
         crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
+            .expect("child threads should't panic")
     }
 
     fn drain_the_queue(
@@ -274,7 +277,9 @@
             tokens.truncate(self.active.len() - 1);
 
             let count = total - self.queue.len();
-            let active_names = self.active.iter()
+            let active_names = self
+                .active
+                .iter()
                 .map(Key::name_for_progress)
                 .collect::<Vec<_>>();
             drop(progress.tick_now(count, total, &format!(": {}", active_names.join(", "))));
@@ -297,7 +302,7 @@
                 Message::Stderr(err) => {
                     let mut shell = cx.bcx.config.shell();
                     shell.print_ansi(err.as_bytes())?;
-                    shell.err().write(b"\n")?;
+                    shell.err().write_all(b"\n")?;
                 }
                 Message::FixDiagnostic(msg) => {
                     print.print(&msg)?;
@@ -393,32 +398,33 @@
         info!("start: {:?}", key);
 
         self.active.push(key);
-        *self.counts.get_mut(key.pkg).unwrap() -= 1;
+        *self.counts.get_mut(&key.pkg).unwrap() -= 1;
 
         let my_tx = self.tx.clone();
         let doit = move || {
             let res = job.run(fresh, &JobState { tx: my_tx.clone() });
             my_tx.send(Message::Finish(key, res)).unwrap();
         };
-        match fresh {
-            Freshness::Fresh => doit(),
-            Freshness::Dirty => {
-                scope.spawn(doit);
-            }
-        }
 
         if !build_plan {
             // Print out some nice progress information
             self.note_working_on(config, &key, fresh)?;
         }
 
+        match fresh {
+            Freshness::Fresh => doit(),
+            Freshness::Dirty => {
+                scope.spawn(move |_| doit());
+            }
+        }
+
         Ok(())
     }
 
     fn emit_warnings(&self, msg: Option<&str>, key: &Key<'a>, cx: &mut Context) -> CargoResult<()> {
         let output = cx.build_state.outputs.lock().unwrap();
         let bcx = &mut cx.bcx;
-        if let Some(output) = output.get(&(key.pkg.clone(), key.kind)) {
+        if let Some(output) = output.get(&(key.pkg, key.kind)) {
             if let Some(msg) = msg {
                 if !output.warnings.is_empty() {
                     writeln!(bcx.config.shell().err(), "{}\n", msg)?;
@@ -466,8 +472,8 @@
         key: &Key<'a>,
         fresh: Freshness,
     ) -> CargoResult<()> {
-        if (self.compiled.contains(key.pkg) && !key.mode.is_doc())
-            || (self.documented.contains(key.pkg) && key.mode.is_doc())
+        if (self.compiled.contains(&key.pkg) && !key.mode.is_doc())
+            || (self.documented.contains(&key.pkg) && key.mode.is_doc())
         {
             return Ok(());
         }
@@ -493,8 +499,8 @@
             }
             Fresh => {
                 // If doctest is last, only print "Fresh" if nothing has been printed.
-                if self.counts[key.pkg] == 0
-                    && !(key.mode == CompileMode::Doctest && self.compiled.contains(key.pkg))
+                if self.counts[&key.pkg] == 0
+                    && !(key.mode == CompileMode::Doctest && self.compiled.contains(&key.pkg))
                 {
                     self.compiled.insert(key.pkg);
                     config.shell().verbose(|c| c.status("Fresh", key.pkg))?;
diff -Nru cargo-0.32.0/src/cargo/core/compiler/job.rs cargo-0.33.0/src/cargo/core/compiler/job.rs
--- cargo-0.32.0/src/cargo/core/compiler/job.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/job.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,7 +1,7 @@
 use std::fmt;
 
-use util::{CargoResult, Dirty, Fresh, Freshness};
 use super::job_queue::JobState;
+use util::{CargoResult, Dirty, Fresh, Freshness};
 
 pub struct Job {
     dirty: Work,
diff -Nru cargo-0.32.0/src/cargo/core/compiler/layout.rs cargo-0.33.0/src/cargo/core/compiler/layout.rs
--- cargo-0.32.0/src/cargo/core/compiler/layout.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/layout.rs	2019-01-02 21:49:06.000000000 +0000
@@ -86,13 +86,20 @@
     /// adding the target triple and the profile (debug, release, ...).
     pub fn new(ws: &Workspace, triple: Option<&str>, dest: &str) -> CargoResult<Layout> {
         let mut path = ws.target_dir();
-        // Flexible target specifications often point at filenames, so interpret
+        // Flexible target specifications often point at json files, so interpret
         // the target triple as a Path and then just use the file stem as the
-        // component for the directory name.
+        // component for the directory name in that case.
         if let Some(triple) = triple {
-            path.push(Path::new(triple)
-                .file_stem()
-                .ok_or_else(|| format_err!("invalid target"))?);
+            let triple = Path::new(triple);
+            if triple.extension().and_then(|s| s.to_str()) == Some("json") {
+                path.push(
+                    triple
+                        .file_stem()
+                        .ok_or_else(|| format_err!("invalid target"))?,
+                );
+            } else {
+                path.push(triple);
+            }
         }
         path.push(dest);
         Layout::at(ws.config(), path)
@@ -128,9 +135,9 @@
     ///
     /// This is recommended to prevent derived/temporary files from bloating backups.
     fn exclude_from_backups(&self, path: &Path) {
-        use std::ptr;
-        use core_foundation::{number, string, url};
         use core_foundation::base::TCFType;
+        use core_foundation::{number, string, url};
+        use std::ptr;
 
         // For compatibility with 10.7 a string is used instead of global kCFURLIsExcludedFromBackupKey
         let is_excluded_key: Result<string::CFString, _> = "NSURLIsExcludedFromBackupKey".parse();
diff -Nru cargo-0.32.0/src/cargo/core/compiler/mod.rs cargo-0.33.0/src/cargo/core/compiler/mod.rs
--- cargo-0.32.0/src/cargo/core/compiler/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -5,15 +5,16 @@
 use std::path::{self, Path, PathBuf};
 use std::sync::Arc;
 
+use failure::Error;
 use same_file::is_same_file;
 use serde_json;
 
 use core::manifest::TargetSourcePath;
 use core::profiles::{Lto, Profile};
 use core::{PackageId, Target};
-use util::errors::{CargoResult, CargoResultExt, Internal};
+use util::errors::{CargoResult, CargoResultExt, Internal, ProcessError};
 use util::paths;
-use util::{self, machine_message, Freshness, ProcessBuilder, process};
+use util::{self, machine_message, process, Freshness, ProcessBuilder};
 use util::{internal, join_paths, profile};
 
 use self::build_plan::BuildPlan;
@@ -22,8 +23,8 @@
 
 use self::output_depinfo::output_depinfo;
 
-pub use self::build_context::{BuildContext, FileFlavor, TargetConfig, TargetInfo};
 pub use self::build_config::{BuildConfig, CompileMode, MessageFormat};
+pub use self::build_context::{BuildContext, FileFlavor, TargetConfig, TargetInfo};
 pub use self::compilation::{Compilation, Doctest};
 pub use self::context::{Context, Unit};
 pub use self::custom_build::{BuildMap, BuildOutput, BuildScripts};
@@ -64,9 +65,9 @@
     fn exec(
         &self,
         cmd: ProcessBuilder,
-        _id: &PackageId,
+        _id: PackageId,
         _target: &Target,
-        _mode: CompileMode
+        _mode: CompileMode,
     ) -> CargoResult<()> {
         cmd.exec()?;
         Ok(())
@@ -75,7 +76,7 @@
     fn exec_and_capture_output(
         &self,
         cmd: ProcessBuilder,
-        id: &PackageId,
+        id: PackageId,
         target: &Target,
         mode: CompileMode,
         _state: &job_queue::JobState<'_>,
@@ -87,7 +88,7 @@
     fn exec_json(
         &self,
         cmd: ProcessBuilder,
-        _id: &PackageId,
+        _id: PackageId,
         _target: &Target,
         _mode: CompileMode,
         handle_stdout: &mut FnMut(&str) -> CargoResult<()>,
@@ -113,7 +114,7 @@
     fn exec_and_capture_output(
         &self,
         cmd: ProcessBuilder,
-        _id: &PackageId,
+        _id: PackageId,
         _target: &Target,
         _mode: CompileMode,
         state: &job_queue::JobState<'_>,
@@ -206,7 +207,7 @@
 
     // Prepare the native lib state (extra -L and -l flags)
     let build_state = cx.build_state.clone();
-    let current_id = unit.pkg.package_id().clone();
+    let current_id = unit.pkg.package_id();
     let build_deps = load_build_deps(cx, unit);
 
     // If we are a binary and the package also contains a library, then we
@@ -221,12 +222,13 @@
         root.join(&crate_name)
     } else {
         root.join(&cx.files().file_stem(unit))
-    }.with_extension("d");
+    }
+    .with_extension("d");
     let dep_info_loc = fingerprint::dep_info_loc(cx, unit);
 
     rustc.args(&cx.bcx.rustflags_args(unit)?);
     let json_messages = cx.bcx.build_config.json_messages();
-    let package_id = unit.pkg.package_id().clone();
+    let package_id = unit.pkg.package_id();
     let target = unit.target.clone();
     let mode = unit.mode;
 
@@ -256,11 +258,11 @@
                     &build_state,
                     &build_deps,
                     pass_l_flag,
-                    &current_id,
+                    current_id,
                 )?;
                 add_plugin_deps(&mut rustc, &build_state, &build_deps, &root_output)?;
             }
-            add_custom_env(&mut rustc, &build_state, &current_id, kind)?;
+            add_custom_env(&mut rustc, &build_state, current_id, kind)?;
         }
 
         for output in outputs.iter() {
@@ -275,22 +277,36 @@
             }
         }
 
+        fn internal_if_simple_exit_code(err: Error) -> Error {
+            // If a signal on unix (code == None) or an abnormal termination
+            // on Windows (codes like 0xC0000409), don't hide the error details.
+            match err
+                .downcast_ref::<ProcessError>()
+                .as_ref()
+                .and_then(|perr| perr.exit.and_then(|e| e.code()))
+            {
+                Some(n) if n < 128 => Internal::new(err).into(),
+                _ => err,
+            }
+        }
+
         state.running(&rustc);
         if json_messages {
             exec.exec_json(
                 rustc,
-                &package_id,
+                package_id,
                 &target,
                 mode,
                 &mut assert_is_empty,
-                &mut |line| json_stderr(line, &package_id, &target),
-            ).map_err(Internal::new)
+                &mut |line| json_stderr(line, package_id, &target),
+            )
+            .map_err(internal_if_simple_exit_code)
             .chain_err(|| format!("Could not compile `{}`.", name))?;
         } else if build_plan {
             state.build_plan(buildkey, rustc.clone(), outputs.clone());
         } else {
-            exec.exec_and_capture_output(rustc, &package_id, &target, mode, state)
-                .map_err(Internal::new)
+            exec.exec_and_capture_output(rustc, package_id, &target, mode, state)
+                .map_err(internal_if_simple_exit_code)
                 .chain_err(|| format!("Could not compile `{}`.", name))?;
         }
 
@@ -329,7 +345,7 @@
         build_state: &BuildMap,
         build_scripts: &BuildScripts,
         pass_l_flag: bool,
-        current_id: &PackageId,
+        current_id: PackageId,
     ) -> CargoResult<()> {
         for key in build_scripts.to_link.iter() {
             let output = build_state.get(key).ok_or_else(|| {
@@ -341,7 +357,7 @@
             for path in output.library_paths.iter() {
                 rustc.arg("-L").arg(path);
             }
-            if key.0 == *current_id {
+            if key.0 == current_id {
                 for cfg in &output.cfgs {
                     rustc.arg("--cfg").arg(cfg);
                 }
@@ -360,10 +376,10 @@
     fn add_custom_env(
         rustc: &mut ProcessBuilder,
         build_state: &BuildMap,
-        current_id: &PackageId,
+        current_id: PackageId,
         kind: Kind,
     ) -> CargoResult<()> {
-        let key = (current_id.clone(), kind);
+        let key = (current_id, kind);
         if let Some(output) = build_state.get(&key) {
             for &(ref name, ref value) in output.env.iter() {
                 rustc.env(name, value);
@@ -383,11 +399,12 @@
     let bcx = cx.bcx;
     let outputs = cx.outputs(unit)?;
     let export_dir = cx.files().export_dir();
-    let package_id = unit.pkg.package_id().clone();
+    let package_id = unit.pkg.package_id();
     let profile = unit.profile;
     let unit_mode = unit.mode;
-    let features = bcx.resolve
-        .features_sorted(&package_id)
+    let features = bcx
+        .resolve
+        .features_sorted(package_id)
         .into_iter()
         .map(|s| s.to_owned())
         .collect();
@@ -421,12 +438,13 @@
             };
             destinations.push(dst.display().to_string());
             hardlink_or_copy(src, dst)?;
-            if let Some(ref path) = export_dir {
-                if !path.exists() {
-                    fs::create_dir_all(path)?;
+            if let Some(ref path) = output.export_path {
+                let export_dir = export_dir.as_ref().unwrap();
+                if !export_dir.exists() {
+                    fs::create_dir_all(export_dir)?;
                 }
 
-                hardlink_or_copy(src, &path.join(dst.file_name().unwrap()))?;
+                hardlink_or_copy(src, path)?;
             }
         }
 
@@ -440,7 +458,7 @@
             };
 
             machine_message::emit(&machine_message::Artifact {
-                package_id: &package_id,
+                package_id,
                 target: &target,
                 profile: art_profile,
                 features,
@@ -510,10 +528,9 @@
     let var = util::dylib_path_envvar();
     let search_path = rustc.get_env(var).unwrap_or_default();
     let mut search_path = env::split_paths(&search_path).collect::<Vec<_>>();
-    for id in build_scripts.plugins.iter() {
-        let key = (id.clone(), Kind::Host);
+    for &id in build_scripts.plugins.iter() {
         let output = build_state
-            .get(&key)
+            .get(&(id, Kind::Host))
             .ok_or_else(|| internal(format!("couldn't find libs for plugin dep {}", id)))?;
         search_path.append(&mut filter_dynamic_search_path(
             output.library_paths.iter(),
@@ -621,9 +638,9 @@
 
     let name = unit.pkg.name().to_string();
     let build_state = cx.build_state.clone();
-    let key = (unit.pkg.package_id().clone(), unit.kind);
+    let key = (unit.pkg.package_id(), unit.kind);
     let json_messages = bcx.build_config.json_messages();
-    let package_id = unit.pkg.package_id().clone();
+    let package_id = unit.pkg.package_id();
     let target = unit.target.clone();
 
     Ok(Work::new(move |state| {
@@ -641,9 +658,10 @@
             rustdoc
                 .exec_with_streaming(
                     &mut assert_is_empty,
-                    &mut |line| json_stderr(line, &package_id, &target),
+                    &mut |line| json_stderr(line, package_id, &target),
                     false,
-                ).map(drop)
+                )
+                .map(drop)
         } else {
             state.capture_output(&rustdoc, None, false).map(drop)
         };
@@ -703,15 +721,23 @@
 
 fn add_color(bcx: &BuildContext, cmd: &mut ProcessBuilder) {
     let shell = bcx.config.shell();
-    let color = if shell.supports_color() { "always" } else { "never" };
+    let color = if shell.supports_color() {
+        "always"
+    } else {
+        "never"
+    };
     cmd.args(&["--color", color]);
 }
 
 fn add_error_format(bcx: &BuildContext, cmd: &mut ProcessBuilder) {
     match bcx.build_config.message_format {
         MessageFormat::Human => (),
-        MessageFormat::Json => { cmd.arg("--error-format").arg("json"); },
-        MessageFormat::Short => { cmd.arg("--error-format").arg("short"); },
+        MessageFormat::Json => {
+            cmd.arg("--error-format").arg("json");
+        }
+        MessageFormat::Short => {
+            cmd.arg("--error-format").arg("short");
+        }
     }
 }
 
@@ -993,7 +1019,7 @@
     }
 }
 
-fn json_stderr(line: &str, package_id: &PackageId, target: &Target) -> CargoResult<()> {
+fn json_stderr(line: &str, package_id: PackageId, target: &Target) -> CargoResult<()> {
     // stderr from rustc/rustdoc can have a mix of JSON and non-JSON output
     if line.starts_with('{') {
         // Handle JSON lines
diff -Nru cargo-0.32.0/src/cargo/core/compiler/output_depinfo.rs cargo-0.33.0/src/cargo/core/compiler/output_depinfo.rs
--- cargo-0.32.0/src/cargo/core/compiler/output_depinfo.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/compiler/output_depinfo.rs	2019-01-02 21:49:06.000000000 +0000
@@ -52,7 +52,7 @@
     }
 
     // Add rerun-if-changed dependencies
-    let key = (unit.pkg.package_id().clone(), unit.kind);
+    let key = (unit.pkg.package_id(), unit.kind);
     if let Some(output) = context.build_state.outputs.lock().unwrap().get(&key) {
         for path in &output.rerun_if_changed {
             deps.insert(path.into());
@@ -87,7 +87,8 @@
         }
         None => None,
     };
-    let deps = deps.iter()
+    let deps = deps
+        .iter()
         .map(|f| render_filename(f, basedir))
         .collect::<CargoResult<Vec<_>>>()?;
 
diff -Nru cargo-0.32.0/src/cargo/core/dependency.rs cargo-0.33.0/src/cargo/core/dependency.rs
--- cargo-0.32.0/src/cargo/core/dependency.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/dependency.rs	2019-01-02 21:49:06.000000000 +0000
@@ -2,14 +2,14 @@
 use std::rc::Rc;
 use std::str::FromStr;
 
-use semver::VersionReq;
 use semver::ReqParseError;
+use semver::VersionReq;
 use serde::ser;
 
-use core::{PackageId, SourceId, Summary};
 use core::interning::InternedString;
-use util::{Cfg, CfgExpr, Config};
+use core::{PackageId, SourceId, Summary};
 use util::errors::{CargoError, CargoResult, CargoResultExt};
+use util::{Cfg, CfgExpr, Config};
 
 /// Information about a dependency requested by a Cargo manifest.
 /// Cheap to copy.
@@ -48,7 +48,7 @@
 #[derive(Serialize)]
 struct SerializedDependency<'a> {
     name: &'a str,
-    source: &'a SourceId,
+    source: SourceId,
     req: String,
     kind: Kind,
     rename: Option<&'a str>,
@@ -74,7 +74,8 @@
             features: self.features(),
             target: self.platform(),
             rename: self.explicit_name_in_toml().map(|s| s.as_str()),
-        }.serialize(s)
+        }
+        .serialize(s)
     }
 }
 
@@ -88,7 +89,7 @@
 fn parse_req_with_deprecated(
     name: &str,
     req: &str,
-    extra: Option<(&PackageId, &Config)>,
+    extra: Option<(PackageId, &Config)>,
 ) -> CargoResult<VersionReq> {
     match VersionReq::parse(req) {
         Err(ReqParseError::DeprecatedVersionRequirement(requirement)) => {
@@ -116,7 +117,7 @@
             config.shell().warn(&msg)?;
 
             Ok(requirement)
-        },
+        }
         Err(e) => {
             let err: CargoResult<VersionReq> = Err(e.into());
             let v: VersionReq = err.chain_err(|| {
@@ -126,7 +127,7 @@
                 )
             })?;
             Ok(v)
-        },
+        }
         Ok(v) => Ok(v),
     }
 }
@@ -140,7 +141,8 @@
             Kind::Normal => None,
             Kind::Development => Some("dev"),
             Kind::Build => Some("build"),
-        }.serialize(s)
+        }
+        .serialize(s)
     }
 }
 
@@ -149,8 +151,8 @@
     pub fn parse(
         name: &str,
         version: Option<&str>,
-        source_id: &SourceId,
-        inside: &PackageId,
+        source_id: SourceId,
+        inside: PackageId,
         config: &Config,
     ) -> CargoResult<Dependency> {
         let arg = Some((inside, config));
@@ -173,7 +175,7 @@
     pub fn parse_no_deprecated(
         name: &str,
         version: Option<&str>,
-        source_id: &SourceId,
+        source_id: SourceId,
     ) -> CargoResult<Dependency> {
         let (specified_req, version_req) = match version {
             Some(v) => (true, parse_req_with_deprecated(name, v, None)?),
@@ -190,12 +192,12 @@
         Ok(ret)
     }
 
-    pub fn new_override(name: &str, source_id: &SourceId) -> Dependency {
+    pub fn new_override(name: &str, source_id: SourceId) -> Dependency {
         assert!(!name.is_empty());
         Dependency {
             inner: Rc::new(Inner {
                 name: InternedString::new(name),
-                source_id: source_id.clone(),
+                source_id,
                 registry_id: None,
                 req: VersionReq::any(),
                 kind: Kind::Normal,
@@ -260,16 +262,16 @@
         self.inner.name
     }
 
-    pub fn source_id(&self) -> &SourceId {
-        &self.inner.source_id
+    pub fn source_id(&self) -> SourceId {
+        self.inner.source_id
     }
 
-    pub fn registry_id(&self) -> Option<&SourceId> {
-        self.inner.registry_id.as_ref()
+    pub fn registry_id(&self) -> Option<SourceId> {
+        self.inner.registry_id
     }
 
-    pub fn set_registry_id(&mut self, registry_id: &SourceId) -> &mut Dependency {
-        Rc::make_mut(&mut self.inner).registry_id = Some(registry_id.clone());
+    pub fn set_registry_id(&mut self, registry_id: SourceId) -> &mut Dependency {
+        Rc::make_mut(&mut self.inner).registry_id = Some(registry_id);
         self
     }
 
@@ -301,9 +303,14 @@
     }
 
     /// Sets the list of features requested for the package.
-    pub fn set_features(&mut self, features: impl IntoIterator<Item=impl AsRef<str>>) -> &mut Dependency {
-        Rc::make_mut(&mut self.inner).features =
-            features.into_iter().map(|s| InternedString::new(s.as_ref())).collect();
+    pub fn set_features(
+        &mut self,
+        features: impl IntoIterator<Item = impl AsRef<str>>,
+    ) -> &mut Dependency {
+        Rc::make_mut(&mut self.inner).features = features
+            .into_iter()
+            .map(|s| InternedString::new(s.as_ref()))
+            .collect();
         self
     }
 
@@ -342,8 +349,8 @@
     }
 
     /// Lock this dependency to depending on the specified package id
-    pub fn lock_to(&mut self, id: &PackageId) -> &mut Dependency {
-        assert_eq!(self.inner.source_id, *id.source_id());
+    pub fn lock_to(&mut self, id: PackageId) -> &mut Dependency {
+        assert_eq!(self.inner.source_id, id.source_id());
         assert!(self.inner.req.matches(id.version()));
         trace!(
             "locking dep from `{}` with `{}` at {} to {}",
@@ -353,7 +360,7 @@
             id
         );
         self.set_version_req(VersionReq::exact(id.version()))
-            .set_source_id(id.source_id().clone())
+            .set_source_id(id.source_id())
     }
 
     /// Returns whether this is a "locked" dependency, basically whether it has
@@ -397,23 +404,22 @@
     }
 
     /// Returns true if the package (`sum`) can fulfill this dependency request.
-    pub fn matches_ignoring_source(&self, id: &PackageId) -> bool {
+    pub fn matches_ignoring_source(&self, id: PackageId) -> bool {
         self.package_name() == id.name() && self.version_req().matches(id.version())
     }
 
     /// Returns true if the package (`id`) can fulfill this dependency request.
-    pub fn matches_id(&self, id: &PackageId) -> bool {
+    pub fn matches_id(&self, id: PackageId) -> bool {
         self.inner.name == id.name()
             && (self.inner.only_match_name
-                || (self.inner.req.matches(id.version())
-                    && &self.inner.source_id == id.source_id()))
+                || (self.inner.req.matches(id.version()) && self.inner.source_id == id.source_id()))
     }
 
-    pub fn map_source(mut self, to_replace: &SourceId, replace_with: &SourceId) -> Dependency {
+    pub fn map_source(mut self, to_replace: SourceId, replace_with: SourceId) -> Dependency {
         if self.source_id() != to_replace {
             self
         } else {
-            self.set_source_id(replace_with.clone());
+            self.set_source_id(replace_with);
             self
         }
     }
@@ -446,7 +452,8 @@
     fn from_str(s: &str) -> CargoResult<Platform> {
         if s.starts_with("cfg(") && s.ends_with(')') {
             let s = &s[4..s.len() - 1];
-            let p = s.parse()
+            let p = s
+                .parse()
                 .map(Platform::Cfg)
                 .chain_err(|| format_err!("failed to parse `{}` as a cfg expression", s))?;
             Ok(p)
diff -Nru cargo-0.32.0/src/cargo/core/interning.rs cargo-0.33.0/src/cargo/core/interning.rs
--- cargo-0.32.0/src/cargo/core/interning.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/interning.rs	2019-01-02 21:49:06.000000000 +0000
@@ -34,7 +34,7 @@
 impl InternedString {
     pub fn new(str: &str) -> InternedString {
         let mut cache = STRING_CACHE.lock().unwrap();
-        let s = cache.get(str).map(|&s| s).unwrap_or_else(|| {
+        let s = cache.get(str).cloned().unwrap_or_else(|| {
             let s = leak(str.to_string());
             cache.insert(s);
             s
diff -Nru cargo-0.32.0/src/cargo/core/manifest.rs cargo-0.33.0/src/cargo/core/manifest.rs
--- cargo-0.32.0/src/cargo/core/manifest.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/manifest.rs	2019-01-02 21:49:06.000000000 +0000
@@ -15,7 +15,7 @@
 use core::{Edition, Feature, Features, WorkspaceConfig};
 use util::errors::*;
 use util::toml::TomlManifest;
-use util::{Config, Filesystem, short_hash};
+use util::{short_hash, Config, Filesystem};
 
 pub enum EitherManifest {
     Real(Manifest),
@@ -181,9 +181,22 @@
     }
 }
 
+impl TargetKind {
+    pub fn description(&self) -> &'static str {
+        match self {
+            TargetKind::Lib(..) => "lib",
+            TargetKind::Bin => "bin",
+            TargetKind::Test => "integration-test",
+            TargetKind::ExampleBin | TargetKind::ExampleLib(..) => "example",
+            TargetKind::Bench => "bench",
+            TargetKind::CustomBuild => "build-script",
+        }
+    }
+}
+
 /// Information about a binary, a library, an example, etc. that is part of the
 /// package.
-#[derive(Clone, Hash, PartialEq, Eq)]
+#[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Target {
     kind: TargetKind,
     name: String,
@@ -202,7 +215,7 @@
     edition: Edition,
 }
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TargetSourcePath {
     Path(PathBuf),
     Metabuild,
@@ -241,11 +254,7 @@
 
 impl From<PathBuf> for TargetSourcePath {
     fn from(path: PathBuf) -> Self {
-        assert!(
-            path.is_absolute(),
-            "`{}` is not absolute",
-            path.display()
-        );
+        assert!(path.is_absolute(), "`{}` is not absolute", path.display());
         TargetSourcePath::Path(path)
     }
 }
@@ -277,7 +286,8 @@
                 .required_features
                 .as_ref()
                 .map(|rf| rf.iter().map(|s| &**s).collect()),
-        }.serialize(s)
+        }
+        .serialize(s)
     }
 }
 
@@ -403,7 +413,7 @@
     pub fn name(&self) -> InternedString {
         self.package_id().name()
     }
-    pub fn package_id(&self) -> &PackageId {
+    pub fn package_id(&self) -> PackageId {
         self.summary.package_id()
     }
     pub fn summary(&self) -> &Summary {
@@ -455,7 +465,7 @@
         self.summary = summary;
     }
 
-    pub fn map_source(self, to_replace: &SourceId, replace_with: &SourceId) -> Manifest {
+    pub fn map_source(self, to_replace: SourceId, replace_with: SourceId) -> Manifest {
         Manifest {
             summary: self.summary.map_source(to_replace, replace_with),
             ..self
@@ -477,11 +487,7 @@
         if self.default_run.is_some() {
             self.features
                 .require(Feature::default_run())
-                .chain_err(|| {
-                    format_err!(
-                        "the `default-run` manifest key is unstable"
-                    )
-                })?;
+                .chain_err(|| format_err!("the `default-run` manifest key is unstable"))?;
         }
 
         Ok(())
@@ -513,7 +519,7 @@
     }
 
     pub fn metabuild_path(&self, target_dir: Filesystem) -> PathBuf {
-        let hash = short_hash(self.package_id());
+        let hash = short_hash(&self.package_id());
         target_dir
             .into_path_unlocked()
             .join(".metabuild")
@@ -614,11 +620,7 @@
     }
 
     /// Builds a `Target` corresponding to the `build = "build.rs"` entry.
-    pub fn custom_build_target(
-        name: &str,
-        src_path: PathBuf,
-        edition: Edition,
-    ) -> Target {
+    pub fn custom_build_target(name: &str, src_path: PathBuf, edition: Edition) -> Target {
         Target {
             kind: TargetKind::CustomBuild,
             name: name.to_string(),
@@ -647,7 +649,11 @@
         required_features: Option<Vec<String>>,
         edition: Edition,
     ) -> Target {
-        let kind = if crate_targets.is_empty() {
+        let kind = if crate_targets.is_empty()
+            || crate_targets
+                .iter()
+                .all(|t| *t == LibKind::Other("bin".into()))
+        {
             TargetKind::ExampleBin
         } else {
             TargetKind::ExampleLib(crate_targets)
@@ -723,7 +729,9 @@
     pub fn for_host(&self) -> bool {
         self.for_host
     }
-    pub fn edition(&self) -> Edition { self.edition }
+    pub fn edition(&self) -> Edition {
+        self.edition
+    }
     pub fn benched(&self) -> bool {
         self.benched
     }
@@ -822,7 +830,8 @@
     pub fn can_lto(&self) -> bool {
         match self.kind {
             TargetKind::Lib(ref v) => {
-                !v.contains(&LibKind::Rlib) && !v.contains(&LibKind::Dylib)
+                !v.contains(&LibKind::Rlib)
+                    && !v.contains(&LibKind::Dylib)
                     && !v.contains(&LibKind::Lib)
             }
             _ => true,
diff -Nru cargo-0.32.0/src/cargo/core/package_id.rs cargo-0.33.0/src/cargo/core/package_id.rs
--- cargo-0.32.0/src/cargo/core/package_id.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/package_id.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,31 +1,55 @@
-use std::cmp::Ordering;
+use std::collections::HashSet;
 use std::fmt::{self, Formatter};
-use std::hash::Hash;
 use std::hash;
+use std::hash::Hash;
 use std::path::Path;
-use std::sync::Arc;
+use std::ptr;
+use std::sync::Mutex;
 
 use semver;
 use serde::de;
 use serde::ser;
 
-use util::{CargoResult, ToSemver};
-use core::source::SourceId;
 use core::interning::InternedString;
+use core::source::SourceId;
+use util::{CargoResult, ToSemver};
+
+lazy_static! {
+    static ref PACKAGE_ID_CACHE: Mutex<HashSet<&'static PackageIdInner>> =
+        Mutex::new(HashSet::new());
+}
 
 /// Identifier for a specific version of a package in a specific source.
-#[derive(Clone)]
+#[derive(Clone, Copy, Eq, PartialOrd, Ord)]
 pub struct PackageId {
-    inner: Arc<PackageIdInner>,
+    inner: &'static PackageIdInner,
 }
 
-#[derive(PartialEq, PartialOrd, Eq, Ord)]
+#[derive(PartialOrd, Eq, Ord)]
 struct PackageIdInner {
     name: InternedString,
     version: semver::Version,
     source_id: SourceId,
 }
 
+// Custom equality that uses full equality of SourceId, rather than its custom equality.
+impl PartialEq for PackageIdInner {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+            && self.version == other.version
+            && self.source_id.full_eq(other.source_id)
+    }
+}
+
+// Custom hash that is coherent with the custom equality above.
+impl Hash for PackageIdInner {
+    fn hash<S: hash::Hasher>(&self, into: &mut S) {
+        self.name.hash(into);
+        self.version.hash(into);
+        self.source_id.full_hash(into);
+    }
+}
+
 impl ser::Serialize for PackageId {
     fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
     where
@@ -64,89 +88,86 @@
         };
         let source_id = SourceId::from_url(url).map_err(de::Error::custom)?;
 
-        Ok(PackageId {
-            inner: Arc::new(PackageIdInner {
-                name: InternedString::new(name),
-                version,
-                source_id,
-            }),
-        })
-    }
-}
-
-impl Hash for PackageId {
-    fn hash<S: hash::Hasher>(&self, state: &mut S) {
-        self.inner.name.hash(state);
-        self.inner.version.hash(state);
-        self.inner.source_id.hash(state);
+        Ok(PackageId::wrap(PackageIdInner {
+            name: InternedString::new(name),
+            version,
+            source_id,
+        }))
     }
 }
 
 impl PartialEq for PackageId {
     fn eq(&self, other: &PackageId) -> bool {
-        (*self.inner).eq(&*other.inner)
-    }
-}
-impl PartialOrd for PackageId {
-    fn partial_cmp(&self, other: &PackageId) -> Option<Ordering> {
-        (*self.inner).partial_cmp(&*other.inner)
+        if ptr::eq(self.inner, other.inner) {
+            return true;
+        }
+        self.inner.name == other.inner.name
+            && self.inner.version == other.inner.version
+            && self.inner.source_id == other.inner.source_id
     }
 }
-impl Eq for PackageId {}
-impl Ord for PackageId {
-    fn cmp(&self, other: &PackageId) -> Ordering {
-        (*self.inner).cmp(&*other.inner)
+
+impl<'a> Hash for PackageId {
+    fn hash<S: hash::Hasher>(&self, state: &mut S) {
+        self.inner.name.hash(state);
+        self.inner.version.hash(state);
+        self.inner.source_id.hash(state);
     }
 }
 
 impl PackageId {
-    pub fn new<T: ToSemver>(name: &str, version: T, sid: &SourceId) -> CargoResult<PackageId> {
+    pub fn new<T: ToSemver>(name: &str, version: T, sid: SourceId) -> CargoResult<PackageId> {
         let v = version.to_semver()?;
-        Ok(PackageId {
-            inner: Arc::new(PackageIdInner {
-                name: InternedString::new(name),
-                version: v,
-                source_id: sid.clone(),
-            }),
-        })
+
+        Ok(PackageId::wrap(PackageIdInner {
+            name: InternedString::new(name),
+            version: v,
+            source_id: sid,
+        }))
+    }
+
+    fn wrap(inner: PackageIdInner) -> PackageId {
+        let mut cache = PACKAGE_ID_CACHE.lock().unwrap();
+        let inner = cache.get(&inner).cloned().unwrap_or_else(|| {
+            let inner = Box::leak(Box::new(inner));
+            cache.insert(inner);
+            inner
+        });
+        PackageId { inner }
     }
 
-    pub fn name(&self) -> InternedString {
+    pub fn name(self) -> InternedString {
         self.inner.name
     }
-    pub fn version(&self) -> &semver::Version {
+    pub fn version(self) -> &'static semver::Version {
         &self.inner.version
     }
-    pub fn source_id(&self) -> &SourceId {
-        &self.inner.source_id
+    pub fn source_id(self) -> SourceId {
+        self.inner.source_id
     }
 
-    pub fn with_precise(&self, precise: Option<String>) -> PackageId {
-        PackageId {
-            inner: Arc::new(PackageIdInner {
-                name: self.inner.name,
-                version: self.inner.version.clone(),
-                source_id: self.inner.source_id.with_precise(precise),
-            }),
-        }
+    pub fn with_precise(self, precise: Option<String>) -> PackageId {
+        PackageId::wrap(PackageIdInner {
+            name: self.inner.name,
+            version: self.inner.version.clone(),
+            source_id: self.inner.source_id.with_precise(precise),
+        })
     }
 
-    pub fn with_source_id(&self, source: &SourceId) -> PackageId {
-        PackageId {
-            inner: Arc::new(PackageIdInner {
-                name: self.inner.name,
-                version: self.inner.version.clone(),
-                source_id: source.clone(),
-            }),
-        }
+    pub fn with_source_id(self, source: SourceId) -> PackageId {
+        PackageId::wrap(PackageIdInner {
+            name: self.inner.name,
+            version: self.inner.version.clone(),
+            source_id: source,
+        })
     }
 
-    pub fn stable_hash<'a>(&'a self, workspace: &'a Path) -> PackageIdStableHash<'a> {
+    pub fn stable_hash(self, workspace: &Path) -> PackageIdStableHash {
         PackageIdStableHash(self, workspace)
     }
 }
 
-pub struct PackageIdStableHash<'a>(&'a PackageId, &'a Path);
+pub struct PackageIdStableHash<'a>(PackageId, &'a Path);
 
 impl<'a> Hash for PackageIdStableHash<'a> {
     fn hash<S: hash::Hasher>(&self, state: &mut S) {
@@ -190,9 +211,33 @@
         let loc = CRATES_IO_INDEX.to_url().unwrap();
         let repo = SourceId::for_registry(&loc).unwrap();
 
-        assert!(PackageId::new("foo", "1.0", &repo).is_err());
-        assert!(PackageId::new("foo", "1", &repo).is_err());
-        assert!(PackageId::new("foo", "bar", &repo).is_err());
-        assert!(PackageId::new("foo", "", &repo).is_err());
+        assert!(PackageId::new("foo", "1.0", repo).is_err());
+        assert!(PackageId::new("foo", "1", repo).is_err());
+        assert!(PackageId::new("foo", "bar", repo).is_err());
+        assert!(PackageId::new("foo", "", repo).is_err());
+    }
+
+    #[test]
+    fn debug() {
+        let loc = CRATES_IO_INDEX.to_url().unwrap();
+        let pkg_id = PackageId::new("foo", "1.0.0", SourceId::for_registry(&loc).unwrap()).unwrap();
+        assert_eq!(r#"PackageId { name: "foo", version: "1.0.0", source: "registry `https://github.com/rust-lang/crates.io-index`" }"#, format!("{:?}", pkg_id));
+
+        let pretty = r#"
+PackageId {
+    name: "foo",
+    version: "1.0.0",
+    source: "registry `https://github.com/rust-lang/crates.io-index`"
+}
+"#
+        .trim();
+        assert_eq!(pretty, format!("{:#?}", pkg_id));
+    }
+
+    #[test]
+    fn display() {
+        let loc = CRATES_IO_INDEX.to_url().unwrap();
+        let pkg_id = PackageId::new("foo", "1.0.0", SourceId::for_registry(&loc).unwrap()).unwrap();
+        assert_eq!("foo v1.0.0", pkg_id.to_string());
     }
 }
diff -Nru cargo-0.32.0/src/cargo/core/package_id_spec.rs cargo-0.33.0/src/cargo/core/package_id_spec.rs
--- cargo-0.32.0/src/cargo/core/package_id_spec.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/package_id_spec.rs	2019-01-02 21:49:06.000000000 +0000
@@ -6,8 +6,8 @@
 use url::Url;
 
 use core::PackageId;
-use util::{ToSemver, ToUrl};
 use util::errors::{CargoResult, CargoResultExt};
+use util::{ToSemver, ToUrl};
 
 /// Some or all of the data required to identify a package:
 ///
@@ -77,9 +77,9 @@
     }
 
     /// Roughly equivalent to `PackageIdSpec::parse(spec)?.query(i)`
-    pub fn query_str<'a, I>(spec: &str, i: I) -> CargoResult<&'a PackageId>
+    pub fn query_str<I>(spec: &str, i: I) -> CargoResult<PackageId>
     where
-        I: IntoIterator<Item = &'a PackageId>,
+        I: IntoIterator<Item = PackageId>,
     {
         let spec = PackageIdSpec::parse(spec)
             .chain_err(|| format_err!("invalid package id specification: `{}`", spec))?;
@@ -88,7 +88,7 @@
 
     /// Convert a `PackageId` to a `PackageIdSpec`, which will have both the `Version` and `Url`
     /// fields filled in.
-    pub fn from_package_id(package_id: &PackageId) -> PackageIdSpec {
+    pub fn from_package_id(package_id: PackageId) -> PackageIdSpec {
         PackageIdSpec {
             name: package_id.name().to_string(),
             version: Some(package_id.version().clone()),
@@ -104,7 +104,8 @@
         let frag = url.fragment().map(|s| s.to_owned());
         url.set_fragment(None);
         let (name, version) = {
-            let mut path = url.path_segments()
+            let mut path = url
+                .path_segments()
                 .ok_or_else(|| format_err!("pkgid urls must have a path: {}", url))?;
             let path_name = path.next_back().ok_or_else(|| {
                 format_err!(
@@ -159,7 +160,7 @@
     }
 
     /// Checks whether the given `PackageId` matches the `PackageIdSpec`.
-    pub fn matches(&self, package_id: &PackageId) -> bool {
+    pub fn matches(&self, package_id: PackageId) -> bool {
         if self.name() != &*package_id.name() {
             return false;
         }
@@ -178,9 +179,9 @@
 
     /// Checks a list of `PackageId`s to find 1 that matches this `PackageIdSpec`. If 0, 2, or
     /// more are found, then this returns an error.
-    pub fn query<'a, I>(&self, i: I) -> CargoResult<&'a PackageId>
+    pub fn query<I>(&self, i: I) -> CargoResult<PackageId>
     where
-        I: IntoIterator<Item = &'a PackageId>,
+        I: IntoIterator<Item = PackageId>,
     {
         let mut ids = i.into_iter().filter(|p| self.matches(*p));
         let ret = match ids.next() {
@@ -211,7 +212,7 @@
             None => Ok(ret),
         };
 
-        fn minimize(msg: &mut String, ids: &[&PackageId], spec: &PackageIdSpec) {
+        fn minimize(msg: &mut String, ids: &[PackageId], spec: &PackageIdSpec) {
             let mut version_cnt = HashMap::new();
             for id in ids {
                 *version_cnt.entry(id.version()).or_insert(0) += 1;
@@ -275,10 +276,10 @@
 
 #[cfg(test)]
 mod tests {
-    use core::{PackageId, SourceId};
     use super::PackageIdSpec;
-    use url::Url;
+    use core::{PackageId, SourceId};
     use semver::Version;
+    use url::Url;
 
     #[test]
     fn good_parsing() {
@@ -367,12 +368,12 @@
     fn matching() {
         let url = Url::parse("http://example.com").unwrap();
         let sid = SourceId::for_registry(&url).unwrap();
-        let foo = PackageId::new("foo", "1.2.3", &sid).unwrap();
-        let bar = PackageId::new("bar", "1.2.3", &sid).unwrap();
+        let foo = PackageId::new("foo", "1.2.3", sid).unwrap();
+        let bar = PackageId::new("bar", "1.2.3", sid).unwrap();
 
-        assert!(PackageIdSpec::parse("foo").unwrap().matches(&foo));
-        assert!(!PackageIdSpec::parse("foo").unwrap().matches(&bar));
-        assert!(PackageIdSpec::parse("foo:1.2.3").unwrap().matches(&foo));
-        assert!(!PackageIdSpec::parse("foo:1.2.2").unwrap().matches(&foo));
+        assert!(PackageIdSpec::parse("foo").unwrap().matches(foo));
+        assert!(!PackageIdSpec::parse("foo").unwrap().matches(bar));
+        assert!(PackageIdSpec::parse("foo:1.2.3").unwrap().matches(foo));
+        assert!(!PackageIdSpec::parse("foo:1.2.2").unwrap().matches(foo));
     }
 }
diff -Nru cargo-0.32.0/src/cargo/core/package.rs cargo-0.33.0/src/cargo/core/package.rs
--- cargo-0.32.0/src/cargo/core/package.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/package.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,29 +1,31 @@
-use std::cell::{Ref, RefCell, Cell};
+use std::cell::{Cell, Ref, RefCell};
+use std::cmp::Ordering;
 use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::hash;
 use std::mem;
 use std::path::{Path, PathBuf};
-use std::time::{Instant, Duration};
+use std::time::{Duration, Instant};
 
 use bytesize::ByteSize;
 use curl;
-use curl_sys;
 use curl::easy::{Easy, HttpVersion};
-use curl::multi::{Multi, EasyHandle};
+use curl::multi::{EasyHandle, Multi};
+use curl_sys;
+use failure::ResultExt;
 use lazycell::LazyCell;
 use semver::Version;
 use serde::ser;
 use toml;
 
+use core::interning::InternedString;
+use core::source::MaybePackage;
 use core::{Dependency, Manifest, PackageId, SourceId, Target};
 use core::{FeatureMap, SourceMap, Summary};
-use core::source::MaybePackage;
-use core::interning::InternedString;
 use ops;
-use util::{self, internal, lev_distance, Config, Progress, ProgressStyle};
 use util::errors::{CargoResult, CargoResultExt, HttpNot200};
 use util::network::Retry;
+use util::{self, internal, lev_distance, Config, Progress, ProgressStyle};
 
 /// Information about a package that is available somewhere in the file system.
 ///
@@ -37,16 +39,28 @@
     manifest_path: PathBuf,
 }
 
+impl Ord for Package {
+    fn cmp(&self, other: &Package) -> Ordering {
+        self.package_id().cmp(&other.package_id())
+    }
+}
+
+impl PartialOrd for Package {
+    fn partial_cmp(&self, other: &Package) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 /// A Package in a form where `Serialize` can be derived.
 #[derive(Serialize)]
 struct SerializedPackage<'a> {
     name: &'a str,
     version: &'a str,
-    id: &'a PackageId,
+    id: PackageId,
     license: Option<&'a str>,
     license_file: Option<&'a str>,
     description: Option<&'a str>,
-    source: &'a SourceId,
+    source: SourceId,
     dependencies: &'a [Dependency],
     targets: Vec<&'a Target>,
     features: &'a FeatureMap,
@@ -108,7 +122,8 @@
             repository,
             edition: &self.manifest.edition().to_string(),
             metabuild: self.manifest.metabuild(),
-        }.serialize(s)
+        }
+        .serialize(s)
     }
 }
 
@@ -138,7 +153,7 @@
         self.package_id().name()
     }
     /// Get the PackageId object for the package (fully defines a package)
-    pub fn package_id(&self) -> &PackageId {
+    pub fn package_id(&self) -> PackageId {
         self.manifest.package_id()
     }
     /// Get the root folder of the package
@@ -186,7 +201,7 @@
         matches.min_by_key(|t| t.0).map(|t| t.1)
     }
 
-    pub fn map_source(self, to_replace: &SourceId, replace_with: &SourceId) -> Package {
+    pub fn map_source(self, to_replace: SourceId, replace_with: SourceId) -> Package {
         Package {
             manifest: self.manifest.map_source(to_replace, replace_with),
             manifest_path: self.manifest_path,
@@ -226,7 +241,7 @@
 impl fmt::Debug for Package {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_struct("Package")
-            .field("id", self.summary().package_id())
+            .field("id", &self.summary().package_id())
             .field("..", &"..")
             .finish()
     }
@@ -275,7 +290,7 @@
     /// because we want to apply timeouts to an entire batch of operations, not
     /// any one particular single operatino
     timeout: ops::HttpTimeout, // timeout configuration
-    updated_at: Cell<Instant>, // last time we received bytes
+    updated_at: Cell<Instant>,       // last time we received bytes
     next_speed_check: Cell<Instant>, // if threshold isn't 0 by this time, error
     next_speed_check_bytes_threshold: Cell<u64>, // decremented when we receive bytes
 }
@@ -326,9 +341,11 @@
         // that it's buggy, and we've empirically seen that it's buggy with HTTP
         // proxies.
         let mut multi = Multi::new();
-        let multiplexing = config.get::<Option<bool>>("http.multiplexing")?
-            .unwrap_or(false);
-        multi.pipelining(false, multiplexing)
+        let multiplexing = config
+            .get::<Option<bool>>("http.multiplexing")?
+            .unwrap_or(true);
+        multi
+            .pipelining(false, multiplexing)
             .chain_err(|| "failed to enable multiplexing/pipelining in curl")?;
 
         // let's not flood crates.io with connections
@@ -337,7 +354,7 @@
         Ok(PackageSet {
             packages: package_ids
                 .iter()
-                .map(|id| (id.clone(), LazyCell::new()))
+                .map(|&id| (id, LazyCell::new()))
                 .collect(),
             sources: RefCell::new(sources),
             config,
@@ -347,8 +364,8 @@
         })
     }
 
-    pub fn package_ids<'a>(&'a self) -> Box<Iterator<Item = &'a PackageId> + 'a> {
-        Box::new(self.packages.keys())
+    pub fn package_ids<'a>(&'a self) -> impl Iterator<Item = PackageId> + 'a {
+        self.packages.keys().cloned()
     }
 
     pub fn enable_download<'a>(&'a self) -> CargoResult<Downloads<'a, 'cfg>> {
@@ -377,13 +394,11 @@
         })
     }
 
-    pub fn get_one(&self, id: &PackageId) -> CargoResult<&Package> {
+    pub fn get_one(&self, id: PackageId) -> CargoResult<&Package> {
         Ok(self.get_many(Some(id))?.remove(0))
     }
 
-    pub fn get_many<'a>(&self, ids: impl IntoIterator<Item = &'a PackageId>)
-        -> CargoResult<Vec<&Package>>
-    {
+    pub fn get_many(&self, ids: impl IntoIterator<Item = PackageId>) -> CargoResult<Vec<&Package>> {
         let mut pkgs = Vec::new();
         let mut downloads = self.enable_download()?;
         for id in ids {
@@ -401,17 +416,36 @@
     }
 }
 
+// When dynamically linked against libcurl, we want to ignore some failures
+// when using old versions that don't support certain features.
+macro_rules! try_old_curl {
+    ($e:expr, $msg:expr) => {
+        let result = $e;
+        if cfg!(target_os = "macos") {
+            if let Err(e) = result {
+                warn!("ignoring libcurl {} error: {}", $msg, e);
+            }
+        } else {
+            result.with_context(|_| {
+                format_err!("failed to enable {}, is curl not built right?", $msg)
+            })?;
+        }
+    };
+}
+
 impl<'a, 'cfg> Downloads<'a, 'cfg> {
     /// Starts to download the package for the `id` specified.
     ///
     /// Returns `None` if the package is queued up for download and will
     /// eventually be returned from `wait_for_download`. Returns `Some(pkg)` if
     /// the package is ready and doesn't need to be downloaded.
-    pub fn start(&mut self, id: &PackageId) -> CargoResult<Option<&'a Package>> {
+    pub fn start(&mut self, id: PackageId) -> CargoResult<Option<&'a Package>> {
         // First up see if we've already cached this package, in which case
         // there's nothing to do.
-        let slot = self.set.packages
-            .get(id)
+        let slot = self
+            .set
+            .packages
+            .get(&id)
             .ok_or_else(|| internal(format!("couldn't find `{}` in package set", id)))?;
         if let Some(pkg) = slot.borrow() {
             return Ok(Some(pkg));
@@ -431,7 +465,7 @@
             MaybePackage::Ready(pkg) => {
                 debug!("{} doesn't need a download", id);
                 assert!(slot.fill(pkg).is_ok());
-                return Ok(Some(slot.borrow().unwrap()))
+                return Ok(Some(slot.borrow().unwrap()));
             }
             MaybePackage::Download { url, descriptor } => (url, descriptor),
         };
@@ -443,7 +477,7 @@
         let token = self.next;
         self.next += 1;
         debug!("downloading {} as {}", id, token);
-        assert!(self.pending_ids.insert(id.clone()));
+        assert!(self.pending_ids.insert(id));
 
         let (mut handle, _timeout) = ops::http_handle_and_timeout(self.set.config)?;
         handle.get(true)?;
@@ -451,12 +485,21 @@
         handle.follow_location(true)?; // follow redirects
 
         // Enable HTTP/2 to be used as it'll allow true multiplexing which makes
-        // downloads much faster. Currently Cargo requests the `http2` feature
-        // of the `curl` crate which means it should always be built in, so
-        // treat it as a fatal error of http/2 support isn't found.
+        // downloads much faster.
+        //
+        // Currently Cargo requests the `http2` feature of the `curl` crate
+        // which means it should always be built in. On OSX, however, we ship
+        // cargo still linked against the system libcurl. Building curl with
+        // ALPN support for HTTP/2 requires newer versions of OSX (the
+        // SecureTransport API) than we want to ship Cargo for. By linking Cargo
+        // against the system libcurl then older curl installations won't use
+        // HTTP/2 but newer ones will. All that to basically say we ignore
+        // errors here on OSX, but consider this a fatal error to not activate
+        // HTTP/2 on all other platforms.
         if self.set.multiplexing {
-            handle.http_version(HttpVersion::V2)
-                .chain_err(|| "failed to enable HTTP2, is curl not built right?")?;
+            try_old_curl!(handle.http_version(HttpVersion::V2), "HTTP2");
+        } else {
+            handle.http_version(HttpVersion::V11)?;
         }
 
         // This is an option to `libcurl` which indicates that if there's a
@@ -466,13 +509,15 @@
         // Once the main one is opened we realized that pipelining is possible
         // and multiplexing is possible with static.crates.io. All in all this
         // reduces the number of connections done to a more manageable state.
-        handle.pipewait(true)?;
+        try_old_curl!(handle.pipewait(true), "pipewait");
 
         handle.write_function(move |buf| {
             debug!("{} - {} bytes of data", token, buf.len());
             tls::with(|downloads| {
                 if let Some(downloads) = downloads {
-                    downloads.pending[&token].0.data
+                    downloads.pending[&token]
+                        .0
+                        .data
                         .borrow_mut()
                         .extend_from_slice(buf);
                 }
@@ -482,28 +527,29 @@
 
         handle.progress(true)?;
         handle.progress_function(move |dl_total, dl_cur, _, _| {
-            tls::with(|downloads| {
-                match downloads {
-                    Some(d) => d.progress(token, dl_total as u64, dl_cur as u64),
-                    None => false,
-                }
+            tls::with(|downloads| match downloads {
+                Some(d) => d.progress(token, dl_total as u64, dl_cur as u64),
+                None => false,
             })
         })?;
 
         // If the progress bar isn't enabled then it may be awhile before the
         // first crate finishes downloading so we inform immediately that we're
         // downloading crates here.
-        if self.downloads_finished == 0 &&
-            self.pending.len() == 0 &&
-            !self.progress.borrow().as_ref().unwrap().is_enabled()
+        if self.downloads_finished == 0
+            && self.pending.is_empty()
+            && !self.progress.borrow().as_ref().unwrap().is_enabled()
         {
-            self.set.config.shell().status("Downloading", "crates ...")?;
+            self.set
+                .config
+                .shell()
+                .status("Downloading", "crates ...")?;
         }
 
         let dl = Download {
             token,
             data: RefCell::new(Vec::new()),
-            id: id.clone(),
+            id,
             url,
             descriptor,
             total: Cell::new(0),
@@ -537,7 +583,9 @@
             let (token, result) = self.wait_for_curl()?;
             debug!("{} finished with {:?}", token, result);
 
-            let (mut dl, handle) = self.pending.remove(&token)
+            let (mut dl, handle) = self
+                .pending
+                .remove(&token)
                 .expect("got a token for a non-in-progress transfer");
             let data = mem::replace(&mut *dl.data.borrow_mut(), Vec::new());
             let mut handle = self.set.multi.remove(handle)?;
@@ -549,47 +597,49 @@
             let ret = {
                 let timed_out = &dl.timed_out;
                 let url = &dl.url;
-                dl.retry.try(|| {
-                    if let Err(e) = result {
-                        // If this error is "aborted by callback" then that's
-                        // probably because our progress callback aborted due to
-                        // a timeout. We'll find out by looking at the
-                        // `timed_out` field, looking for a descriptive message.
-                        // If one is found we switch the error code (to ensure
-                        // it's flagged as spurious) and then attach our extra
-                        // information to the error.
-                        if !e.is_aborted_by_callback() {
-                            return Err(e.into())
-                        }
+                dl.retry
+                    .try(|| {
+                        if let Err(e) = result {
+                            // If this error is "aborted by callback" then that's
+                            // probably because our progress callback aborted due to
+                            // a timeout. We'll find out by looking at the
+                            // `timed_out` field, looking for a descriptive message.
+                            // If one is found we switch the error code (to ensure
+                            // it's flagged as spurious) and then attach our extra
+                            // information to the error.
+                            if !e.is_aborted_by_callback() {
+                                return Err(e.into());
+                            }
 
-                        return Err(match timed_out.replace(None) {
-                            Some(msg) => {
-                                let code = curl_sys::CURLE_OPERATION_TIMEDOUT;
-                                let mut err = curl::Error::new(code);
-                                err.set_extra(msg);
-                                err
+                            return Err(match timed_out.replace(None) {
+                                Some(msg) => {
+                                    let code = curl_sys::CURLE_OPERATION_TIMEDOUT;
+                                    let mut err = curl::Error::new(code);
+                                    err.set_extra(msg);
+                                    err
+                                }
+                                None => e,
                             }
-                            None => e,
-                        }.into())
-                    }
+                            .into());
+                        }
 
-                    let code = handle.response_code()?;
-                    if code != 200 && code != 0 {
-                        let url = handle.effective_url()?.unwrap_or(url);
-                        return Err(HttpNot200 {
-                            code,
-                            url: url.to_string(),
-                        }.into())
-                    }
-                    Ok(())
-                }).chain_err(|| {
-                    format!("failed to download from `{}`", dl.url)
-                })?
+                        let code = handle.response_code()?;
+                        if code != 200 && code != 0 {
+                            let url = handle.effective_url()?.unwrap_or(url);
+                            return Err(HttpNot200 {
+                                code,
+                                url: url.to_string(),
+                            }
+                            .into());
+                        }
+                        Ok(())
+                    })
+                    .chain_err(|| format!("failed to download from `{}`", dl.url))?
             };
             match ret {
                 Some(()) => break (dl, data),
                 None => {
-                    self.pending_ids.insert(dl.id.clone());
+                    self.pending_ids.insert(dl.id);
                     self.enqueue(dl, handle)?
                 }
             }
@@ -599,7 +649,10 @@
         // semblance of progress of how we're downloading crates, and if the
         // progress bar is enabled this provides a good log of what's happening.
         self.progress.borrow_mut().as_mut().unwrap().clear();
-        self.set.config.shell().status("Downloaded", &dl.descriptor)?;
+        self.set
+            .config
+            .shell()
+            .status("Downloaded", &dl.descriptor)?;
 
         self.downloads_finished += 1;
         self.downloaded_bytes += dl.total.get();
@@ -625,7 +678,7 @@
             .get_mut(dl.id.source_id())
             .ok_or_else(|| internal(format!("couldn't find source for `{}`", dl.id)))?;
         let start = Instant::now();
-        let pkg = source.finish_download(&dl.id, data)?;
+        let pkg = source.finish_download(dl.id, data)?;
 
         // Assume that no time has passed while we were calling
         // `finish_download`, update all speed checks and timeout limits of all
@@ -633,7 +686,8 @@
         // extracted tarball.
         let finish_dur = start.elapsed();
         self.updated_at.set(self.updated_at.get() + finish_dur);
-        self.next_speed_check.set(self.next_speed_check.get() + finish_dur);
+        self.next_speed_check
+            .set(self.next_speed_check.get() + finish_dur);
 
         let slot = &self.set.packages[&dl.id];
         assert!(slot.fill(pkg).is_ok());
@@ -646,7 +700,8 @@
         handle.set_token(dl.token)?;
         self.updated_at.set(now);
         self.next_speed_check.set(now + self.timeout.dur);
-        self.next_speed_check_bytes_threshold.set(self.timeout.low_speed_limit as u64);
+        self.next_speed_check_bytes_threshold
+            .set(u64::from(self.timeout.low_speed_limit));
         dl.timed_out.set(None);
         dl.current.set(0);
         dl.total.set(0);
@@ -672,7 +727,9 @@
         // `wait` method on `multi`.
         loop {
             let n = tls::set(self, || {
-                self.set.multi.perform()
+                self.set
+                    .multi
+                    .perform()
                     .chain_err(|| "failed to perform http requests")
             })?;
             debug!("handles remaining: {}", n);
@@ -689,12 +746,17 @@
             });
 
             if let Some(pair) = results.pop() {
-                break Ok(pair)
+                break Ok(pair);
             }
-            assert!(self.pending.len() > 0);
-            let timeout = self.set.multi.get_timeout()?
-                .unwrap_or(Duration::new(5, 0));
-            self.set.multi.wait(&mut [], timeout)
+            assert!(!self.pending.is_empty());
+            let timeout = self
+                .set
+                .multi
+                .get_timeout()?
+                .unwrap_or_else(|| Duration::new(5, 0));
+            self.set
+                .multi
+                .wait(&mut [], timeout)
                 .chain_err(|| "failed to wait on curl `Multi`")?;
         }
     }
@@ -712,25 +774,26 @@
 
             if delta >= threshold {
                 self.next_speed_check.set(now + self.timeout.dur);
-                self.next_speed_check_bytes_threshold.set(
-                    self.timeout.low_speed_limit as u64,
-                );
+                self.next_speed_check_bytes_threshold
+                    .set(u64::from(self.timeout.low_speed_limit));
             } else {
                 self.next_speed_check_bytes_threshold.set(threshold - delta);
             }
         }
-        if !self.tick(WhyTick::DownloadUpdate).is_ok() {
-            return false
+        if self.tick(WhyTick::DownloadUpdate).is_err() {
+            return false;
         }
 
         // If we've spent too long not actually receiving any data we time out.
         if now - self.updated_at.get() > self.timeout.dur {
             self.updated_at.set(now);
-            let msg = format!("failed to download any data for `{}` within {}s",
-                              dl.id,
-                              self.timeout.dur.as_secs());
+            let msg = format!(
+                "failed to download any data for `{}` within {}s",
+                dl.id,
+                self.timeout.dur.as_secs()
+            );
             dl.timed_out.set(Some(msg));
-            return false
+            return false;
         }
 
         // If we reached the point in time that we need to check our speed
@@ -740,13 +803,15 @@
         if now >= self.next_speed_check.get() {
             self.next_speed_check.set(now + self.timeout.dur);
             assert!(self.next_speed_check_bytes_threshold.get() > 0);
-            let msg = format!("download of `{}` failed to transfer more \
-                               than {} bytes in {}s",
-                              dl.id,
-                              self.timeout.low_speed_limit,
-                              self.timeout.dur.as_secs());
+            let msg = format!(
+                "download of `{}` failed to transfer more \
+                 than {} bytes in {}s",
+                dl.id,
+                self.timeout.low_speed_limit,
+                self.timeout.dur.as_secs()
+            );
             dl.timed_out.set(Some(msg));
-            return false
+            return false;
         }
 
         true
@@ -758,10 +823,15 @@
 
         if let WhyTick::DownloadUpdate = why {
             if !progress.update_allowed() {
-                return Ok(())
+                return Ok(());
             }
         }
-        let mut msg = format!("{} crates", self.pending.len());
+        let pending = self.pending.len();
+        let mut msg = if pending == 1 {
+            format!("{} crate", pending)
+        } else {
+            format!("{} crates", pending)
+        };
         match why {
             WhyTick::Extracting(krate) => {
                 msg.push_str(&format!(", extracting {} ...", krate));
@@ -787,6 +857,7 @@
     }
 }
 
+#[derive(Copy, Clone)]
 enum WhyTick<'a> {
     DownloadStarted,
     DownloadUpdate,
@@ -801,20 +872,22 @@
         // Don't print a download summary if we're not using a progress bar,
         // we've already printed lots of `Downloading...` items.
         if !progress.is_enabled() {
-            return
+            return;
         }
         // If we didn't download anything, no need for a summary
         if self.downloads_finished == 0 {
-            return
+            return;
         }
         // If an error happened, let's not clutter up the output
         if !self.success {
-            return
+            return;
         }
-        let mut status = format!("{} crates ({}) in {}",
-                                 self.downloads_finished,
-                                 ByteSize(self.downloaded_bytes),
-                                 util::elapsed(self.start.elapsed()));
+        let mut status = format!(
+            "{} crates ({}) in {}",
+            self.downloads_finished,
+            ByteSize(self.downloaded_bytes),
+            util::elapsed(self.start.elapsed())
+        );
         if self.largest.0 > ByteSize::mb(1).0 {
             status.push_str(&format!(
                 " (largest was `{}` at {})",
@@ -840,9 +913,7 @@
         if ptr == 0 {
             f(None)
         } else {
-            unsafe {
-                f(Some(&*(ptr as *const Downloads)))
-            }
+            unsafe { f(Some(&*(ptr as *const Downloads))) }
         }
     }
 
diff -Nru cargo-0.32.0/src/cargo/core/profiles.rs cargo-0.33.0/src/cargo/core/profiles.rs
--- cargo-0.32.0/src/cargo/core/profiles.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/profiles.rs	2019-01-02 21:49:06.000000000 +0000
@@ -67,14 +67,14 @@
     /// workspace.
     pub fn get_profile(
         &self,
-        pkg_id: &PackageId,
+        pkg_id: PackageId,
         is_member: bool,
         unit_for: UnitFor,
         mode: CompileMode,
         release: bool,
     ) -> Profile {
         let maker = match mode {
-            CompileMode::Test => {
+            CompileMode::Test | CompileMode::Bench => {
                 if release {
                     &self.bench
                 } else {
@@ -95,7 +95,6 @@
                     &self.dev
                 }
             }
-            CompileMode::Bench => &self.bench,
             CompileMode::Doc { .. } => &self.doc,
         };
         let mut profile = maker.get_profile(Some(pkg_id), is_member, unit_for);
@@ -164,7 +163,7 @@
 impl ProfileMaker {
     fn get_profile(
         &self,
-        pkg_id: Option<&PackageId>,
+        pkg_id: Option<PackageId>,
         is_member: bool,
         unit_for: UnitFor,
     ) -> Profile {
@@ -206,11 +205,13 @@
                 .keys()
                 .filter_map(|key| match *key {
                     ProfilePackageSpec::All => None,
-                    ProfilePackageSpec::Spec(ref spec) => if spec.matches(pkg_id) {
-                        Some(spec)
-                    } else {
-                        None
-                    },
+                    ProfilePackageSpec::Spec(ref spec) => {
+                        if spec.matches(pkg_id) {
+                            Some(spec)
+                        } else {
+                            None
+                        }
+                    }
                 })
                 .collect();
             match matches.len() {
@@ -291,7 +292,7 @@
 }
 
 fn merge_toml(
-    pkg_id: Option<&PackageId>,
+    pkg_id: Option<PackageId>,
     is_member: bool,
     unit_for: UnitFor,
     profile: &mut Profile,
@@ -314,11 +315,13 @@
                 .iter()
                 .filter_map(|(key, spec_profile)| match *key {
                     ProfilePackageSpec::All => None,
-                    ProfilePackageSpec::Spec(ref s) => if s.matches(pkg_id) {
-                        Some(spec_profile)
-                    } else {
-                        None
-                    },
+                    ProfilePackageSpec::Spec(ref s) => {
+                        if s.matches(pkg_id) {
+                            Some(spec_profile)
+                        } else {
+                            None
+                        }
+                    }
                 });
             if let Some(spec_profile) = matches.next() {
                 merge_profile(profile, spec_profile);
@@ -371,7 +374,7 @@
 
 /// Profile settings used to determine which compiler flags to use for a
 /// target.
-#[derive(Clone, Copy, Eq)]
+#[derive(Clone, Copy, Eq, PartialOrd, Ord)]
 pub struct Profile {
     pub name: &'static str,
     pub opt_level: InternedString,
@@ -523,7 +526,7 @@
 }
 
 /// The link-time-optimization setting.
-#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
 pub enum Lto {
     /// False = no LTO
     /// True = "Fat" LTO
@@ -587,27 +590,36 @@
     pub fn with_for_host(self, for_host: bool) -> UnitFor {
         UnitFor {
             custom_build: self.custom_build,
-            panic_ok: self.panic_ok && !for_host
+            panic_ok: self.panic_ok && !for_host,
         }
     }
 
     /// Returns true if this unit is for a custom build script or one of its
     /// dependencies.
-    pub fn is_custom_build(&self) -> bool {
+    pub fn is_custom_build(self) -> bool {
         self.custom_build
     }
 
     /// Returns true if this unit is allowed to set the `panic` compiler flag.
-    pub fn is_panic_ok(&self) -> bool {
+    pub fn is_panic_ok(self) -> bool {
         self.panic_ok
     }
 
     /// All possible values, used by `clean`.
     pub fn all_values() -> &'static [UnitFor] {
         static ALL: [UnitFor; 3] = [
-            UnitFor { custom_build: false, panic_ok: true },
-            UnitFor { custom_build: true, panic_ok: false },
-            UnitFor { custom_build: false, panic_ok: false },
+            UnitFor {
+                custom_build: false,
+                panic_ok: true,
+            },
+            UnitFor {
+                custom_build: true,
+                panic_ok: false,
+            },
+            UnitFor {
+                custom_build: false,
+                panic_ok: false,
+            },
         ];
         &ALL
     }
diff -Nru cargo-0.32.0/src/cargo/core/registry.rs cargo-0.33.0/src/cargo/core/registry.rs
--- cargo-0.32.0/src/cargo/core/registry.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/registry.rs	2019-01-02 21:49:06.000000000 +0000
@@ -3,11 +3,11 @@
 use semver::VersionReq;
 use url::Url;
 
-use core::{Dependency, PackageId, Source, SourceId, SourceMap, Summary};
 use core::PackageSet;
-use util::{profile, Config};
-use util::errors::{CargoResult, CargoResultExt};
+use core::{Dependency, PackageId, Source, SourceId, SourceMap, Summary};
 use sources::config::SourceConfigMap;
+use util::errors::{CargoResult, CargoResultExt};
+use util::{profile, Config};
 
 /// Source of information about a group of packages.
 ///
@@ -22,8 +22,8 @@
         Ok(ret)
     }
 
-    fn describe_source(&self, source: &SourceId) -> String;
-    fn is_replaced(&self, source: &SourceId) -> bool;
+    fn describe_source(&self, source: SourceId) -> String;
+    fn is_replaced(&self, source: SourceId) -> bool;
 }
 
 /// This structure represents a registry of known packages. It internally
@@ -102,8 +102,8 @@
         PackageSet::new(package_ids, self.sources, self.config)
     }
 
-    fn ensure_loaded(&mut self, namespace: &SourceId, kind: Kind) -> CargoResult<()> {
-        match self.source_ids.get(namespace) {
+    fn ensure_loaded(&mut self, namespace: SourceId, kind: Kind) -> CargoResult<()> {
+        match self.source_ids.get(&namespace) {
             // We've previously loaded this source, and we've already locked it,
             // so we're not allowed to change it even if `namespace` has a
             // slightly different precise version listed.
@@ -138,8 +138,8 @@
         Ok(())
     }
 
-    pub fn add_sources(&mut self, ids: &[SourceId]) -> CargoResult<()> {
-        for id in ids.iter() {
+    pub fn add_sources(&mut self, ids: impl IntoIterator<Item = SourceId>) -> CargoResult<()> {
+        for id in ids {
             self.ensure_loaded(id, Kind::Locked)?;
         }
         Ok(())
@@ -150,13 +150,13 @@
     }
 
     fn add_source(&mut self, source: Box<Source + 'cfg>, kind: Kind) {
-        let id = source.source_id().clone();
+        let id = source.source_id();
         self.sources.insert(source);
-        self.source_ids.insert(id.clone(), (id, kind));
+        self.source_ids.insert(id, (id, kind));
     }
 
     pub fn add_override(&mut self, source: Box<Source + 'cfg>) {
-        self.overrides.push(source.source_id().clone());
+        self.overrides.push(source.source_id());
         self.add_source(source, Kind::Override);
     }
 
@@ -165,8 +165,9 @@
         for dep in deps.iter() {
             trace!("\t-> {}", dep);
         }
-        let sub_map = self.locked
-            .entry(id.source_id().clone())
+        let sub_map = self
+            .locked
+            .entry(id.source_id())
             .or_insert_with(HashMap::new);
         let sub_vec = sub_map
             .entry(id.name().to_string())
@@ -200,9 +201,14 @@
         // Remember that each dependency listed in `[patch]` has to resolve to
         // precisely one package, so that's why we're just creating a flat list
         // of summaries which should be the same length as `deps` above.
-        let unlocked_summaries = deps.iter()
+        let unlocked_summaries = deps
+            .iter()
             .map(|dep| {
-                debug!("registring a patch for `{}` with `{}`", url, dep.package_name());
+                debug!(
+                    "registring a patch for `{}` with `{}`",
+                    url,
+                    dep.package_name()
+                );
 
                 // Go straight to the source for resolving `dep`. Load it as we
                 // normally would and then ask it directly for the list of summaries
@@ -216,7 +222,8 @@
                         )
                     })?;
 
-                let mut summaries = self.sources
+                let mut summaries = self
+                    .sources
                     .get_mut(dep.source_id())
                     .expect("loaded source not present")
                     .query_vec(dep)?
@@ -257,11 +264,7 @@
         // we want to fill in the `patches_available` map (later used in the
         // `lock` method) and otherwise store the unlocked summaries in
         // `patches` to get locked in a future call to `lock_patches`.
-        let ids = unlocked_summaries
-            .iter()
-            .map(|s| s.package_id())
-            .cloned()
-            .collect();
+        let ids = unlocked_summaries.iter().map(|s| s.package_id()).collect();
         self.patches_available.insert(url.clone(), ids);
         self.patches.insert(url.clone(), unlocked_summaries);
 
@@ -289,14 +292,14 @@
         &self.patches
     }
 
-    fn load(&mut self, source_id: &SourceId, kind: Kind) -> CargoResult<()> {
+    fn load(&mut self, source_id: SourceId, kind: Kind) -> CargoResult<()> {
         (|| {
             debug!("loading source {}", source_id);
             let source = self.source_config.load(source_id)?;
             assert_eq!(source.source_id(), source_id);
 
             if kind == Kind::Override {
-                self.overrides.push(source_id.clone());
+                self.overrides.push(source_id);
             }
             self.add_source(source, kind);
 
@@ -304,12 +307,12 @@
             let _p = profile::start(format!("updating: {}", source_id));
             self.sources.get_mut(source_id).unwrap().update()
         })()
-            .chain_err(|| format_err!("Unable to update {}", source_id))?;
+        .chain_err(|| format_err!("Unable to update {}", source_id))?;
         Ok(())
     }
 
     fn query_overrides(&mut self, dep: &Dependency) -> CargoResult<Option<Summary>> {
-        for s in self.overrides.iter() {
+        for &s in self.overrides.iter() {
             let src = self.sources.get_mut(s).unwrap();
             let dep = Dependency::new_override(&*dep.package_name(), s);
             let mut results = src.query_vec(&dep)?;
@@ -532,14 +535,14 @@
         Ok(())
     }
 
-    fn describe_source(&self, id: &SourceId) -> String {
+    fn describe_source(&self, id: SourceId) -> String {
         match self.sources.get(id) {
             Some(src) => src.describe(),
             None => id.to_string(),
         }
     }
 
-    fn is_replaced(&self, id: &SourceId) -> bool {
+    fn is_replaced(&self, id: SourceId) -> bool {
         match self.sources.get(id) {
             Some(src) => src.is_replaced(),
             None => false,
@@ -549,9 +552,9 @@
 
 fn lock(locked: &LockedMap, patches: &HashMap<Url, Vec<PackageId>>, summary: Summary) -> Summary {
     let pair = locked
-        .get(summary.source_id())
+        .get(&summary.source_id())
         .and_then(|map| map.get(&*summary.name()))
-        .and_then(|vec| vec.iter().find(|&&(ref id, _)| id == summary.package_id()));
+        .and_then(|vec| vec.iter().find(|&&(id, _)| id == summary.package_id()));
 
     trace!("locking summary of {}", summary.package_id());
 
@@ -561,7 +564,12 @@
         None => summary,
     };
     summary.map_dependencies(|dep| {
-        trace!("\t{}/{}/{}", dep.package_name(), dep.version_req(), dep.source_id());
+        trace!(
+            "\t{}/{}/{}",
+            dep.package_name(),
+            dep.version_req(),
+            dep.source_id()
+        );
 
         // If we've got a known set of overrides for this summary, then
         // one of a few cases can arise:
@@ -583,8 +591,8 @@
         // Cases 1/2 are handled by `matches_id` and case 3 is handled by
         // falling through to the logic below.
         if let Some(&(_, ref locked_deps)) = pair {
-            let locked = locked_deps.iter().find(|id| dep.matches_id(id));
-            if let Some(locked) = locked {
+            let locked = locked_deps.iter().find(|&&id| dep.matches_id(id));
+            if let Some(&locked) = locked {
                 trace!("\tfirst hit on {}", locked);
                 let mut dep = dep.clone();
                 dep.lock_to(locked);
@@ -596,10 +604,10 @@
         // all known locked packages to see if they match this dependency.
         // If anything does then we lock it to that and move on.
         let v = locked
-            .get(dep.source_id())
+            .get(&dep.source_id())
             .and_then(|map| map.get(&*dep.package_name()))
-            .and_then(|vec| vec.iter().find(|&&(ref id, _)| dep.matches_id(id)));
-        if let Some(&(ref id, _)) = v {
+            .and_then(|vec| vec.iter().find(|&&(id, _)| dep.matches_id(id)));
+        if let Some(&(id, _)) = v {
             trace!("\tsecond hit on {}", id);
             let mut dep = dep.clone();
             dep.lock_to(id);
@@ -610,16 +618,16 @@
         // this dependency.
         let v = patches.get(dep.source_id().url()).map(|vec| {
             let dep2 = dep.clone();
-            let mut iter = vec.iter().filter(move |p| {
-                dep2.matches_ignoring_source(p)
-            });
+            let mut iter = vec
+                .iter()
+                .filter(move |&&p| dep2.matches_ignoring_source(p));
             (iter.next(), iter)
         });
         if let Some((Some(patch_id), mut remaining)) = v {
             assert!(remaining.next().is_none());
             let patch_source = patch_id.source_id();
             let patch_locked = locked
-                .get(patch_source)
+                .get(&patch_source)
                 .and_then(|m| m.get(&*patch_id.name()))
                 .map(|list| list.iter().any(|&(ref id, _)| id == patch_id))
                 .unwrap_or(false);
diff -Nru cargo-0.32.0/src/cargo/core/resolver/conflict_cache.rs cargo-0.33.0/src/cargo/core/resolver/conflict_cache.rs
--- cargo-0.32.0/src/cargo/core/resolver/conflict_cache.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/conflict_cache.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,43 +1,130 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap, HashSet};
 
 use super::types::ConflictReason;
 use core::resolver::Context;
 use core::{Dependency, PackageId};
 
+/// This is a Trie for storing a large number of Sets designed to
+/// efficiently see if any of the stored Sets are a subset of a search Set.
+enum ConflictStoreTrie {
+    /// a Leaf is one of the stored Sets.
+    Leaf(BTreeMap<PackageId, ConflictReason>),
+    /// a Node is a map from an element to a subTrie where
+    /// all the Sets in the subTrie contains that element.
+    Node(BTreeMap<PackageId, ConflictStoreTrie>),
+}
+
+impl ConflictStoreTrie {
+    /// Finds any known set of conflicts, if any,
+    /// which are activated in `cx` and pass the `filter` specified?
+    fn find_conflicting(
+        &self,
+        cx: &Context,
+        must_contain: Option<PackageId>,
+    ) -> Option<&BTreeMap<PackageId, ConflictReason>> {
+        match self {
+            ConflictStoreTrie::Leaf(c) => {
+                if must_contain.is_none() {
+                    // is_conflicting checks that all the elements are active,
+                    // but we have checked each one by the recursion of this function.
+                    debug_assert!(cx.is_conflicting(None, c));
+                    Some(c)
+                } else {
+                    // we did not find `must_contain` so we need to keep looking.
+                    None
+                }
+            }
+            ConflictStoreTrie::Node(m) => {
+                for (&pid, store) in must_contain
+                    .map(|f| m.range(..=f))
+                    .unwrap_or_else(|| m.range(..))
+                {
+                    // if the key is active then we need to check all of the corresponding subTrie.
+                    if cx.is_active(pid) {
+                        if let Some(o) =
+                            store.find_conflicting(cx, must_contain.filter(|&f| f != pid))
+                        {
+                            return Some(o);
+                        }
+                    } // else, if it is not active then there is no way any of the corresponding
+                      // subTrie will be conflicting.
+                }
+                None
+            }
+        }
+    }
+
+    fn insert(
+        &mut self,
+        mut iter: impl Iterator<Item = PackageId>,
+        con: BTreeMap<PackageId, ConflictReason>,
+    ) {
+        if let Some(pid) = iter.next() {
+            if let ConflictStoreTrie::Node(p) = self {
+                p.entry(pid)
+                    .or_insert_with(|| ConflictStoreTrie::Node(BTreeMap::new()))
+                    .insert(iter, con);
+            } // else, We already have a subset of this in the ConflictStore
+        } else {
+            // we are at the end of the set we are adding, there are 3 cases for what to do next:
+            // 1. self is a empty dummy Node inserted by `or_insert_with`
+            //      in witch case we should replace it with `Leaf(con)`.
+            // 2. self is a Node because we previously inserted a superset of
+            //      the thing we are working on (I don't know if this happens in practice)
+            //      but the subset that we are working on will
+            //      always match any time the larger set would have
+            //      in witch case we can replace it with `Leaf(con)`.
+            // 3. self is a Leaf that is in the same spot in the structure as
+            //      the thing we are working on. So it is equivalent.
+            //      We can replace it with `Leaf(con)`.
+            if cfg!(debug_assertions) {
+                if let ConflictStoreTrie::Leaf(c) = self {
+                    let a: Vec<_> = con.keys().collect();
+                    let b: Vec<_> = c.keys().collect();
+                    assert_eq!(a, b);
+                }
+            }
+            *self = ConflictStoreTrie::Leaf(con)
+        }
+    }
+}
+
 pub(super) struct ConflictCache {
     // `con_from_dep` is a cache of the reasons for each time we
     // backtrack. For example after several backtracks we may have:
     //
-    //  con_from_dep[`foo = "^1.0.2"`] = vec![
-    //      map!{`foo=1.0.1`: Semver},
-    //      map!{`foo=1.0.0`: Semver},
-    //  ];
+    //  con_from_dep[`foo = "^1.0.2"`] = map!{
+    //      `foo=1.0.1`: map!{`foo=1.0.1`: Semver},
+    //      `foo=1.0.0`: map!{`foo=1.0.0`: Semver},
+    //  };
     //
     // This can be read as "we cannot find a candidate for dep `foo = "^1.0.2"`
     // if either `foo=1.0.1` OR `foo=1.0.0` are activated".
     //
     // Another example after several backtracks we may have:
     //
-    //  con_from_dep[`foo = ">=0.8.2, <=0.9.3"`] = vec![
-    //      map!{`foo=0.8.1`: Semver, `foo=0.9.4`: Semver},
-    //  ];
+    //  con_from_dep[`foo = ">=0.8.2, <=0.9.3"`] = map!{
+    //      `foo=0.8.1`: map!{
+    //          `foo=0.9.4`: map!{`foo=0.8.1`: Semver, `foo=0.9.4`: Semver},
+    //      }
+    //  };
     //
     // This can be read as "we cannot find a candidate for dep `foo = ">=0.8.2,
     // <=0.9.3"` if both `foo=0.8.1` AND `foo=0.9.4` are activated".
     //
     // This is used to make sure we don't queue work we know will fail. See the
     // discussion in https://github.com/rust-lang/cargo/pull/5168 for why this
-    // is so important, and there can probably be a better data structure here
-    // but for now this works well enough!
+    // is so important. The nested HashMaps act as a kind of btree, that lets us
+    // look up which entries are still active without
+    // linearly scanning through the full list.
     //
     // Also, as a final note, this map is *not* ever removed from. This remains
     // as a global cache which we never delete from. Any entry in this map is
     // unconditionally true regardless of our resolution history of how we got
     // here.
-    con_from_dep: HashMap<Dependency, Vec<HashMap<PackageId, ConflictReason>>>,
-    // `past_conflict_triggers` is an
-    // of `past_conflicting_activations`.
-    // For every `PackageId` this lists the `Dependency`s that mention it in `past_conflicting_activations`.
+    con_from_dep: HashMap<Dependency, ConflictStoreTrie>,
+    // `dep_from_pid` is an inverse-index of `con_from_dep`.
+    // For every `PackageId` this lists the `Dependency`s that mention it in `dep_from_pid`.
     dep_from_pid: HashMap<PackageId, HashSet<Dependency>>,
 }
 
@@ -50,54 +137,57 @@
     }
     /// Finds any known set of conflicts, if any,
     /// which are activated in `cx` and pass the `filter` specified?
-    pub fn find_conflicting<F>(
+    pub fn find_conflicting(
         &self,
         cx: &Context,
         dep: &Dependency,
-        filter: F,
-    ) -> Option<&HashMap<PackageId, ConflictReason>>
-    where
-        for<'r> F: FnMut(&'r &HashMap<PackageId, ConflictReason>) -> bool,
-    {
-        self.con_from_dep
+        must_contain: Option<PackageId>,
+    ) -> Option<&BTreeMap<PackageId, ConflictReason>> {
+        let out = self
+            .con_from_dep
             .get(dep)?
-            .iter()
-            .filter(filter)
-            .find(|conflicting| cx.is_conflicting(None, conflicting))
+            .find_conflicting(cx, must_contain);
+        if cfg!(debug_assertions) {
+            if let Some(f) = must_contain {
+                if let Some(c) = &out {
+                    assert!(c.contains_key(&f));
+                }
+            }
+        }
+        out
     }
     pub fn conflicting(
         &self,
         cx: &Context,
         dep: &Dependency,
-    ) -> Option<&HashMap<PackageId, ConflictReason>> {
-        self.find_conflicting(cx, dep, |_| true)
+    ) -> Option<&BTreeMap<PackageId, ConflictReason>> {
+        self.find_conflicting(cx, dep, None)
     }
 
     /// Add to the cache a conflict of the form:
     /// `dep` is known to be unresolvable if
     /// all the `PackageId` entries are activated
-    pub fn insert(&mut self, dep: &Dependency, con: &HashMap<PackageId, ConflictReason>) {
-        let past = self
-            .con_from_dep
+    pub fn insert(&mut self, dep: &Dependency, con: &BTreeMap<PackageId, ConflictReason>) {
+        self.con_from_dep
             .entry(dep.clone())
-            .or_insert_with(Vec::new);
-        if !past.contains(con) {
-            trace!(
-                "{} = \"{}\" adding a skip {:?}",
-                dep.package_name(),
-                dep.version_req(),
-                con
-            );
-            past.push(con.clone());
-            for c in con.keys() {
-                self.dep_from_pid
-                    .entry(c.clone())
-                    .or_insert_with(HashSet::new)
-                    .insert(dep.clone());
-            }
+            .or_insert_with(|| ConflictStoreTrie::Node(BTreeMap::new()))
+            .insert(con.keys().cloned(), con.clone());
+
+        trace!(
+            "{} = \"{}\" adding a skip {:?}",
+            dep.package_name(),
+            dep.version_req(),
+            con
+        );
+
+        for c in con.keys() {
+            self.dep_from_pid
+                .entry(c.clone())
+                .or_insert_with(HashSet::new)
+                .insert(dep.clone());
         }
     }
-    pub fn dependencies_conflicting_with(&self, pid: &PackageId) -> Option<&HashSet<Dependency>> {
-        self.dep_from_pid.get(pid)
+    pub fn dependencies_conflicting_with(&self, pid: PackageId) -> Option<&HashSet<Dependency>> {
+        self.dep_from_pid.get(&pid)
     }
 }
diff -Nru cargo-0.32.0/src/cargo/core/resolver/context.rs cargo-0.33.0/src/cargo/core/resolver/context.rs
--- cargo-0.32.0/src/cargo/core/resolver/context.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/context.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,13 +1,14 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use std::rc::Rc;
 
 use core::interning::InternedString;
 use core::{Dependency, FeatureValue, PackageId, SourceId, Summary};
+use im_rc;
 use util::CargoResult;
 use util::Graph;
 
-use super::types::RegistryQueryer;
-use super::types::{ActivateResult, ConflictReason, DepInfo, GraphNode, Method, RcList};
+use super::errors::ActivateResult;
+use super::types::{ConflictReason, DepInfo, GraphNode, Method, RcList, RegistryQueryer};
 
 pub use super::encode::{EncodableDependency, EncodablePackageId, EncodableResolve};
 pub use super::encode::{Metadata, WorkspaceResolve};
@@ -19,12 +20,9 @@
 // possible.
 #[derive(Clone)]
 pub struct Context {
-    // TODO: Both this and the two maps below are super expensive to clone. We should
-    //       switch to persistent hash maps if we can at some point or otherwise
-    //       make these much cheaper to clone in general.
     pub activations: Activations,
-    pub resolve_features: HashMap<PackageId, Rc<HashSet<InternedString>>>,
-    pub links: HashMap<InternedString, PackageId>,
+    pub resolve_features: im_rc::HashMap<PackageId, Rc<HashSet<InternedString>>>,
+    pub links: im_rc::HashMap<InternedString, PackageId>,
 
     // These are two cheaply-cloneable lists (O(1) clone) which are effectively
     // hash maps but are built up as "construction lists". We'll iterate these
@@ -36,16 +34,16 @@
     pub warnings: RcList<String>,
 }
 
-pub type Activations = HashMap<(InternedString, SourceId), Rc<Vec<Summary>>>;
+pub type Activations = im_rc::HashMap<(InternedString, SourceId), Rc<Vec<Summary>>>;
 
 impl Context {
     pub fn new() -> Context {
         Context {
             resolve_graph: RcList::new(),
-            resolve_features: HashMap::new(),
-            links: HashMap::new(),
+            resolve_features: im_rc::HashMap::new(),
+            links: im_rc::HashMap::new(),
             resolve_replacements: RcList::new(),
-            activations: HashMap::new(),
+            activations: im_rc::HashMap::new(),
             warnings: RcList::new(),
         }
     }
@@ -57,13 +55,13 @@
         let id = summary.package_id();
         let prev = self
             .activations
-            .entry((id.name(), id.source_id().clone()))
+            .entry((id.name(), id.source_id()))
             .or_insert_with(|| Rc::new(Vec::new()));
         if !prev.iter().any(|c| c == summary) {
-            self.resolve_graph.push(GraphNode::Add(id.clone()));
+            self.resolve_graph.push(GraphNode::Add(id));
             if let Some(link) = summary.links() {
                 ensure!(
-                    self.links.insert(link, id.clone()).is_none(),
+                    self.links.insert(link, id).is_none(),
                     "Attempting to resolve a with more then one crate with the links={}. \n\
                      This will not build as is. Consider rebuilding the .lock file.",
                     &*link
@@ -86,7 +84,7 @@
         };
 
         let has_default_feature = summary.features().contains_key("default");
-        Ok(match self.resolve_features.get(id) {
+        Ok(match self.resolve_features.get(&id) {
             Some(prev) => {
                 features.iter().all(|f| prev.contains(f))
                     && (!use_default || prev.contains("default") || !has_default_feature)
@@ -128,14 +126,14 @@
 
     pub fn prev_active(&self, dep: &Dependency) -> &[Summary] {
         self.activations
-            .get(&(dep.package_name(), dep.source_id().clone()))
+            .get(&(dep.package_name(), dep.source_id()))
             .map(|v| &v[..])
             .unwrap_or(&[])
     }
 
-    fn is_active(&self, id: &PackageId) -> bool {
+    pub fn is_active(&self, id: PackageId) -> bool {
         self.activations
-            .get(&(id.name(), id.source_id().clone()))
+            .get(&(id.name(), id.source_id()))
             .map(|v| v.iter().any(|s| s.package_id() == id))
             .unwrap_or(false)
     }
@@ -144,13 +142,13 @@
     /// are still active
     pub fn is_conflicting(
         &self,
-        parent: Option<&PackageId>,
-        conflicting_activations: &HashMap<PackageId, ConflictReason>,
+        parent: Option<PackageId>,
+        conflicting_activations: &BTreeMap<PackageId, ConflictReason>,
     ) -> bool {
         conflicting_activations
             .keys()
-            .chain(parent)
-            .all(|id| self.is_active(id))
+            .chain(parent.as_ref())
+            .all(|&id| self.is_active(id))
     }
 
     /// Return all dependencies and the features we want from them.
@@ -230,11 +228,9 @@
                     "Package `{}` does not have these features: `{}`",
                     s.package_id(),
                     features
-                ).into(),
-                Some(p) => (
-                    p.package_id().clone(),
-                    ConflictReason::MissingFeatures(features),
-                ).into(),
+                )
+                .into(),
+                Some(p) => (p.package_id(), ConflictReason::MissingFeatures(features)).into(),
             });
         }
 
@@ -244,7 +240,7 @@
 
             let set = Rc::make_mut(
                 self.resolve_features
-                    .entry(pkgid.clone())
+                    .entry(pkgid)
                     .or_insert_with(|| Rc::new(HashSet::new())),
             );
 
@@ -260,7 +256,7 @@
         let mut replacements = HashMap::new();
         let mut cur = &self.resolve_replacements;
         while let Some(ref node) = cur.head {
-            let (k, v) = node.0.clone();
+            let (k, v) = node.0;
             replacements.insert(k, v);
             cur = &node.1;
         }
diff -Nru cargo-0.32.0/src/cargo/core/resolver/encode.rs cargo-0.33.0/src/cargo/core/resolver/encode.rs
--- cargo-0.32.0/src/cargo/core/resolver/encode.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/encode.rs	2019-01-02 21:49:06.000000000 +0000
@@ -50,7 +50,7 @@
                 let enc_id = EncodablePackageId {
                     name: pkg.name.clone(),
                     version: pkg.version.clone(),
-                    source: pkg.source.clone(),
+                    source: pkg.source,
                 };
 
                 if !all_pkgs.insert(enc_id.clone()) {
@@ -63,7 +63,7 @@
                         debug!("path dependency now missing {} v{}", pkg.name, pkg.version);
                         continue;
                     }
-                    Some(source) => PackageId::new(&pkg.name, &pkg.version, source)?,
+                    Some(&source) => PackageId::new(&pkg.name, &pkg.version, source)?,
                 };
 
                 assert!(live_pkgs.insert(enc_id, (id, pkg)).is_none())
@@ -72,7 +72,7 @@
         };
 
         let lookup_id = |enc_id: &EncodablePackageId| -> Option<PackageId> {
-            live_pkgs.get(enc_id).map(|&(ref id, _)| id.clone())
+            live_pkgs.get(enc_id).map(|&(id, _)| id)
         };
 
         let g = {
@@ -156,7 +156,7 @@
         let mut unused_patches = Vec::new();
         for pkg in self.patch.unused {
             let id = match pkg.source.as_ref().or_else(|| path_deps.get(&pkg.name)) {
-                Some(src) => PackageId::new(&pkg.name, &pkg.version, src)?,
+                Some(&src) => PackageId::new(&pkg.name, &pkg.version, src)?,
                 None => continue,
             };
             unused_patches.push(id);
@@ -188,9 +188,9 @@
     for member in members.iter() {
         ret.insert(
             member.package_id().name().to_string(),
-            member.package_id().source_id().clone(),
+            member.package_id().source_id(),
         );
-        visited.insert(member.package_id().source_id().clone());
+        visited.insert(member.package_id().source_id());
     }
     for member in members.iter() {
         build_pkg(member, ws, &mut ret, &mut visited);
@@ -224,7 +224,7 @@
         visited: &mut HashSet<SourceId>,
     ) {
         let id = dep.source_id();
-        if visited.contains(id) || !id.is_path() {
+        if visited.contains(&id) || !id.is_path() {
             return;
         }
         let path = match id.url().to_file_path() {
@@ -235,8 +235,8 @@
             Ok(p) => p,
             Err(_) => return,
         };
-        ret.insert(pkg.name().to_string(), pkg.package_id().source_id().clone());
-        visited.insert(pkg.package_id().source_id().clone());
+        ret.insert(pkg.name().to_string(), pkg.package_id().source_id());
+        visited.insert(pkg.package_id().source_id());
         build_pkg(&pkg, ws, ret, visited);
     }
 }
@@ -338,13 +338,13 @@
 
         let encodable = ids
             .iter()
-            .filter_map(|&id| Some(encodable_resolve_node(id, self.resolve)))
+            .map(|&id| encodable_resolve_node(id, self.resolve))
             .collect::<Vec<_>>();
 
         let mut metadata = self.resolve.metadata().clone();
 
-        for id in ids.iter().filter(|id| !id.source_id().is_path()) {
-            let checksum = match self.resolve.checksums()[*id] {
+        for &id in ids.iter().filter(|id| !id.source_id().is_path()) {
+            let checksum = match self.resolve.checksums()[&id] {
                 Some(ref s) => &s[..],
                 None => "<none>",
             };
@@ -377,11 +377,12 @@
             root: None,
             metadata,
             patch,
-        }.serialize(s)
+        }
+        .serialize(s)
     }
 }
 
-fn encodable_resolve_node(id: &PackageId, resolve: &Resolve) -> EncodableDependency {
+fn encodable_resolve_node(id: PackageId, resolve: &Resolve) -> EncodableDependency {
     let (replace, deps) = match resolve.replacement(id) {
         Some(id) => (Some(encodable_package_id(id)), None),
         None => {
@@ -403,7 +404,7 @@
     }
 }
 
-pub fn encodable_package_id(id: &PackageId) -> EncodablePackageId {
+pub fn encodable_package_id(id: PackageId) -> EncodablePackageId {
     EncodablePackageId {
         name: id.name().to_string(),
         version: id.version().to_string(),
@@ -411,10 +412,10 @@
     }
 }
 
-fn encode_source(id: &SourceId) -> Option<SourceId> {
+fn encode_source(id: SourceId) -> Option<SourceId> {
     if id.is_path() {
         None
     } else {
-        Some(id.clone())
+        Some(id)
     }
 }
diff -Nru cargo-0.32.0/src/cargo/core/resolver/errors.rs cargo-0.33.0/src/cargo/core/resolver/errors.rs
--- cargo-0.32.0/src/cargo/core/resolver/errors.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/errors.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,11 +1,11 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::fmt;
 
 use core::{Dependency, PackageId, Registry, Summary};
 use failure::{Error, Fail};
 use semver;
-use util::config::Config;
 use util::lev_distance::lev_distance;
+use util::{CargoError, Config};
 
 use super::context::Context;
 use super::types::{Candidate, ConflictReason};
@@ -49,12 +49,31 @@
     }
 }
 
+pub type ActivateResult<T> = Result<T, ActivateError>;
+
+pub enum ActivateError {
+    Fatal(CargoError),
+    Conflict(PackageId, ConflictReason),
+}
+
+impl From<::failure::Error> for ActivateError {
+    fn from(t: ::failure::Error) -> Self {
+        ActivateError::Fatal(t)
+    }
+}
+
+impl From<(PackageId, ConflictReason)> for ActivateError {
+    fn from(t: (PackageId, ConflictReason)) -> Self {
+        ActivateError::Conflict(t.0, t.1)
+    }
+}
+
 pub(super) fn activation_error(
     cx: &Context,
     registry: &mut Registry,
     parent: &Summary,
     dep: &Dependency,
-    conflicting_activations: &HashMap<PackageId, ConflictReason>,
+    conflicting_activations: &BTreeMap<PackageId, ConflictReason>,
     candidates: &[Candidate],
     config: Option<&Config>,
 ) -> ResolveError {
@@ -63,7 +82,7 @@
         ResolveError::new(
             err,
             graph
-                .path_to_top(parent.package_id())
+                .path_to_top(&parent.package_id())
                 .into_iter()
                 .cloned()
                 .collect(),
@@ -73,7 +92,7 @@
     if !candidates.is_empty() {
         let mut msg = format!("failed to select a version for `{}`.", dep.package_name());
         msg.push_str("\n    ... required by ");
-        msg.push_str(&describe_path(&graph.path_to_top(parent.package_id())));
+        msg.push_str(&describe_path(&graph.path_to_top(&parent.package_id())));
 
         msg.push_str("\nversions that meet the requirements `");
         msg.push_str(&dep.version_req().to_string());
@@ -185,7 +204,7 @@
             registry.describe_source(dep.source_id()),
         );
         msg.push_str("required by ");
-        msg.push_str(&describe_path(&graph.path_to_top(parent.package_id())));
+        msg.push_str(&describe_path(&graph.path_to_top(&parent.package_id())));
 
         // If we have a path dependency with a locked version, then this may
         // indicate that we updated a sub-package and forgot to run `cargo
@@ -239,7 +258,7 @@
             msg.push_str("\n");
         }
         msg.push_str("required by ");
-        msg.push_str(&describe_path(&graph.path_to_top(parent.package_id())));
+        msg.push_str(&describe_path(&graph.path_to_top(&parent.package_id())));
 
         msg
     };
diff -Nru cargo-0.32.0/src/cargo/core/resolver/mod.rs cargo-0.33.0/src/cargo/core/resolver/mod.rs
--- cargo-0.32.0/src/cargo/core/resolver/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -62,21 +62,21 @@
 use util::profile;
 
 use self::context::{Activations, Context};
-use self::types::{ActivateError, ActivateResult, Candidate, ConflictReason, DepsFrame, GraphNode};
+use self::types::{Candidate, ConflictReason, DepsFrame, GraphNode};
 use self::types::{RcVecIter, RegistryQueryer, RemainingDeps, ResolverProgress};
 
 pub use self::encode::{EncodableDependency, EncodablePackageId, EncodableResolve};
 pub use self::encode::{Metadata, WorkspaceResolve};
+pub use self::errors::{ActivateError, ActivateResult, ResolveError};
 pub use self::resolve::Resolve;
 pub use self::types::Method;
-pub use self::errors::ResolveError;
 
 mod conflict_cache;
 mod context;
 mod encode;
+mod errors;
 mod resolve;
 mod types;
-mod errors;
 
 /// Builds the list of all packages required to build the first argument.
 ///
@@ -111,7 +111,7 @@
     summaries: &[(Summary, Method)],
     replacements: &[(PackageIdSpec, Dependency)],
     registry: &mut Registry,
-    try_to_use: &HashSet<&PackageId>,
+    try_to_use: &HashSet<PackageId>,
     config: Option<&Config>,
     print_warnings: bool,
 ) -> CargoResult<Resolve> {
@@ -127,14 +127,14 @@
     let mut cksums = HashMap::new();
     for summary in cx.activations.values().flat_map(|v| v.iter()) {
         let cksum = summary.checksum().map(|s| s.to_string());
-        cksums.insert(summary.package_id().clone(), cksum);
+        cksums.insert(summary.package_id(), cksum);
     }
     let resolve = Resolve::new(
         cx.graph(),
         cx.resolve_replacements(),
         cx.resolve_features
             .iter()
-            .map(|(k, v)| (k.clone(), v.iter().map(|x| x.to_string()).collect()))
+            .map(|(k, v)| (*k, v.iter().map(|x| x.to_string()).collect()))
             .collect(),
         cksums,
         BTreeMap::new(),
@@ -247,7 +247,7 @@
         //
         // This is a map of package id to a reason why that packaged caused a
         // conflict for us.
-        let mut conflicting_activations = HashMap::new();
+        let mut conflicting_activations = BTreeMap::new();
 
         // When backtracking we don't fully update `conflicting_activations`
         // especially for the cases that we didn't make a backtrack frame in the
@@ -358,7 +358,7 @@
                 None
             };
 
-            let pid = candidate.summary.package_id().clone();
+            let pid = candidate.summary.package_id();
             let method = Method::Required {
                 dev_deps: false,
                 features: &features,
@@ -403,7 +403,8 @@
                             .clone()
                             .filter_map(|(_, (ref new_dep, _, _))| {
                                 past_conflicting_activations.conflicting(&cx, new_dep)
-                            }).next()
+                            })
+                            .next()
                         {
                             // If one of our deps is known unresolvable
                             // then we will not succeed.
@@ -416,7 +417,7 @@
                                 conflicting
                                     .iter()
                                     .filter(|&(p, _)| p != &pid)
-                                    .map(|(p, r)| (p.clone(), r.clone())),
+                                    .map(|(&p, r)| (p, r.clone())),
                             );
 
                             has_past_conflicting_dep = true;
@@ -431,19 +432,20 @@
                     // parent conflict with us.
                     if !has_past_conflicting_dep {
                         if let Some(known_related_bad_deps) =
-                            past_conflicting_activations.dependencies_conflicting_with(&pid)
+                            past_conflicting_activations.dependencies_conflicting_with(pid)
                         {
                             if let Some((other_parent, conflict)) = remaining_deps
                                 .iter()
                                 // for deps related to us
                                 .filter(|&(_, ref other_dep)| {
                                     known_related_bad_deps.contains(other_dep)
-                                }).filter_map(|(other_parent, other_dep)| {
+                                })
+                                .filter_map(|(other_parent, other_dep)| {
                                     past_conflicting_activations
-                                        .find_conflicting(&cx, &other_dep, |con| {
-                                            con.contains_key(&pid)
-                                        }).map(|con| (other_parent, con))
-                                }).next()
+                                        .find_conflicting(&cx, &other_dep, Some(pid))
+                                        .map(|con| (other_parent, con))
+                                })
+                                .next()
                             {
                                 let rel = conflict.get(&pid).unwrap().clone();
 
@@ -458,9 +460,9 @@
                                     conflict
                                         .iter()
                                         .filter(|&(p, _)| p != &pid)
-                                        .map(|(p, r)| (p.clone(), r.clone())),
+                                        .map(|(&p, r)| (p, r.clone())),
                                 );
-                                conflicting_activations.insert(other_parent.clone(), rel);
+                                conflicting_activations.insert(other_parent, rel);
                                 has_past_conflicting_dep = true;
                             }
                         }
@@ -485,7 +487,8 @@
                                 &parent,
                                 backtracked,
                                 &conflicting_activations,
-                            ).is_none()
+                            )
+                            .is_none()
                         }
                     };
 
@@ -584,8 +587,8 @@
 ) -> ActivateResult<Option<(DepsFrame, Duration)>> {
     if let Some((parent, dep)) = parent {
         cx.resolve_graph.push(GraphNode::Link(
-            parent.package_id().clone(),
-            candidate.summary.package_id().clone(),
+            parent.package_id(),
+            candidate.summary.package_id(),
             dep.clone(),
         ));
     }
@@ -594,10 +597,8 @@
 
     let candidate = match candidate.replace {
         Some(replace) => {
-            cx.resolve_replacements.push((
-                candidate.summary.package_id().clone(),
-                replace.package_id().clone(),
-            ));
+            cx.resolve_replacements
+                .push((candidate.summary.package_id(), replace.package_id()));
             if cx.flag_activated(&replace, method)? && activated {
                 return Ok(None);
             }
@@ -636,7 +637,7 @@
     parent: Summary,
     dep: Dependency,
     features: Rc<Vec<InternedString>>,
-    conflicting_activations: HashMap<PackageId, ConflictReason>,
+    conflicting_activations: BTreeMap<PackageId, ConflictReason>,
 }
 
 /// A helper "iterator" used to extract candidates within a current `Context` of
@@ -683,7 +684,7 @@
     /// original list for the reason listed.
     fn next(
         &mut self,
-        conflicting_prev_active: &mut HashMap<PackageId, ConflictReason>,
+        conflicting_prev_active: &mut BTreeMap<PackageId, ConflictReason>,
         cx: &Context,
         dep: &Dependency,
     ) -> Option<(Candidate, bool)> {
@@ -695,10 +696,10 @@
             // `links` key. If this candidate links to something that's already
             // linked to by a different package then we've gotta skip this.
             if let Some(link) = b.summary.links() {
-                if let Some(a) = cx.links.get(&link) {
+                if let Some(&a) = cx.links.get(&link) {
                     if a != b.summary.package_id() {
                         conflicting_prev_active
-                            .entry(a.clone())
+                            .entry(a)
                             .or_insert_with(|| ConflictReason::Links(link));
                         continue;
                     }
@@ -719,7 +720,7 @@
             {
                 if *a != b.summary {
                     conflicting_prev_active
-                        .entry(a.package_id().clone())
+                        .entry(a.package_id())
                         .or_insert(ConflictReason::Semver);
                     continue;
                 }
@@ -776,7 +777,7 @@
     backtrack_stack: &mut Vec<BacktrackFrame>,
     parent: &Summary,
     backtracked: bool,
-    conflicting_activations: &HashMap<PackageId, ConflictReason>,
+    conflicting_activations: &BTreeMap<PackageId, ConflictReason>,
 ) -> Option<(Candidate, bool, BacktrackFrame)> {
     while let Some(mut frame) = backtrack_stack.pop() {
         let next = frame.remaining_candidates.next(
@@ -797,20 +798,19 @@
         // active in this back up we know that we're guaranteed to not actually
         // make any progress. As a result if we hit this condition we can
         // completely skip this backtrack frame and move on to the next.
-        if !backtracked {
-            if frame
+        if !backtracked
+            && frame
                 .context
                 .is_conflicting(Some(parent.package_id()), conflicting_activations)
-            {
-                trace!(
-                    "{} = \"{}\" skip as not solving {}: {:?}",
-                    frame.dep.package_name(),
-                    frame.dep.version_req(),
-                    parent.package_id(),
-                    conflicting_activations
-                );
-                continue;
-            }
+        {
+            trace!(
+                "{} = \"{}\" skip as not solving {}: {:?}",
+                frame.dep.package_name(),
+                frame.dep.version_req(),
+                parent.package_id(),
+                conflicting_activations
+            );
+            continue;
         }
 
         return Some((candidate, has_another, frame));
@@ -819,7 +819,7 @@
 }
 
 fn check_cycles(resolve: &Resolve, activations: &Activations) -> CargoResult<()> {
-    let summaries: HashMap<&PackageId, &Summary> = activations
+    let summaries: HashMap<PackageId, &Summary> = activations
         .values()
         .flat_map(|v| v.iter())
         .map(|s| (s.package_id(), s))
@@ -830,25 +830,25 @@
     all_packages.sort_unstable();
     let mut checked = HashSet::new();
     for pkg in all_packages {
-        if !checked.contains(pkg) {
+        if !checked.contains(&pkg) {
             visit(resolve, pkg, &summaries, &mut HashSet::new(), &mut checked)?
         }
     }
     return Ok(());
 
-    fn visit<'a>(
-        resolve: &'a Resolve,
-        id: &'a PackageId,
-        summaries: &HashMap<&'a PackageId, &Summary>,
-        visited: &mut HashSet<&'a PackageId>,
-        checked: &mut HashSet<&'a PackageId>,
+    fn visit(
+        resolve: &Resolve,
+        id: PackageId,
+        summaries: &HashMap<PackageId, &Summary>,
+        visited: &mut HashSet<PackageId>,
+        checked: &mut HashSet<PackageId>,
     ) -> CargoResult<()> {
         // See if we visited ourselves
         if !visited.insert(id) {
             bail!(
                 "cyclic package dependency: package `{}` depends on itself. Cycle:\n{}",
                 id,
-                errors::describe_path(&resolve.path_to_top(id))
+                errors::describe_path(&resolve.path_to_top(&id))
             );
         }
 
@@ -860,7 +860,7 @@
         // visitation list as we can't induce a cycle through transitive
         // dependencies.
         if checked.insert(id) {
-            let summary = summaries[id];
+            let summary = summaries[&id];
             for dep in resolve.deps_not_replaced(id) {
                 let is_transitive = summary
                     .dependencies()
@@ -881,7 +881,7 @@
         }
 
         // Ok, we're done, no longer visiting our node any more
-        visited.remove(id);
+        visited.remove(&id);
         Ok(())
     }
 }
diff -Nru cargo-0.32.0/src/cargo/core/resolver/resolve.rs cargo-0.33.0/src/cargo/core/resolver/resolve.rs
--- cargo-0.32.0/src/cargo/core/resolver/resolve.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/resolve.rs	2019-01-02 21:49:06.000000000 +0000
@@ -41,10 +41,7 @@
         metadata: Metadata,
         unused_patches: Vec<PackageId>,
     ) -> Resolve {
-        let reverse_replacements = replacements
-            .iter()
-            .map(|p| (p.1.clone(), p.0.clone()))
-            .collect();
+        let reverse_replacements = replacements.iter().map(|(&p, &r)| (r, p)).collect();
         Resolve {
             graph,
             replacements,
@@ -68,7 +65,7 @@
             if self.iter().any(|id| id == summary.package_id()) {
                 continue;
             }
-            self.unused_patches.push(summary.package_id().clone());
+            self.unused_patches.push(summary.package_id());
         }
     }
 
@@ -171,39 +168,43 @@
         self.graph.contains(k)
     }
 
-    pub fn iter(&self) -> impl Iterator<Item = &PackageId> {
-        self.graph.iter()
+    pub fn sort(&self) -> Vec<PackageId> {
+        self.graph.sort()
     }
 
-    pub fn deps(&self, pkg: &PackageId) -> impl Iterator<Item = (&PackageId, &[Dependency])> {
+    pub fn iter<'a>(&'a self) -> impl Iterator<Item = PackageId> + 'a {
+        self.graph.iter().cloned()
+    }
+
+    pub fn deps(&self, pkg: PackageId) -> impl Iterator<Item = (PackageId, &[Dependency])> {
         self.graph
-            .edges(pkg)
-            .map(move |(id, deps)| (self.replacement(id).unwrap_or(id), deps.as_slice()))
+            .edges(&pkg)
+            .map(move |(&id, deps)| (self.replacement(id).unwrap_or(id), deps.as_slice()))
     }
 
-    pub fn deps_not_replaced(&self, pkg: &PackageId) -> impl Iterator<Item = &PackageId> {
-        self.graph.edges(pkg).map(|(id, _)| id)
+    pub fn deps_not_replaced<'a>(&'a self, pkg: PackageId) -> impl Iterator<Item = PackageId> + 'a {
+        self.graph.edges(&pkg).map(|(&id, _)| id)
     }
 
-    pub fn replacement(&self, pkg: &PackageId) -> Option<&PackageId> {
-        self.replacements.get(pkg)
+    pub fn replacement(&self, pkg: PackageId) -> Option<PackageId> {
+        self.replacements.get(&pkg).cloned()
     }
 
     pub fn replacements(&self) -> &HashMap<PackageId, PackageId> {
         &self.replacements
     }
 
-    pub fn features(&self, pkg: &PackageId) -> &HashSet<String> {
-        self.features.get(pkg).unwrap_or(&self.empty_features)
+    pub fn features(&self, pkg: PackageId) -> &HashSet<String> {
+        self.features.get(&pkg).unwrap_or(&self.empty_features)
     }
 
-    pub fn features_sorted(&self, pkg: &PackageId) -> Vec<&str> {
+    pub fn features_sorted(&self, pkg: PackageId) -> Vec<&str> {
         let mut v = Vec::from_iter(self.features(pkg).iter().map(|s| s.as_ref()));
         v.sort_unstable();
         v
     }
 
-    pub fn query(&self, spec: &str) -> CargoResult<&PackageId> {
+    pub fn query(&self, spec: &str) -> CargoResult<PackageId> {
         PackageIdSpec::query_str(spec, self.iter())
     }
 
@@ -221,8 +222,8 @@
 
     pub fn extern_crate_name(
         &self,
-        from: &PackageId,
-        to: &PackageId,
+        from: PackageId,
+        to: PackageId,
         to_target: &Target,
     ) -> CargoResult<String> {
         let deps = if from == to {
@@ -235,9 +236,9 @@
         let mut names = deps.iter().map(|d| {
             d.explicit_name_in_toml()
                 .map(|s| s.as_str().replace("-", "_"))
-                .unwrap_or(crate_name.clone())
+                .unwrap_or_else(|| crate_name.clone())
         });
-        let name = names.next().unwrap_or(crate_name.clone());
+        let name = names.next().unwrap_or_else(|| crate_name.clone());
         for n in names {
             if n == name {
                 continue;
@@ -252,7 +253,7 @@
         Ok(name.to_string())
     }
 
-    fn dependencies_listed(&self, from: &PackageId, to: &PackageId) -> &[Dependency] {
+    fn dependencies_listed(&self, from: PackageId, to: PackageId) -> &[Dependency] {
         // We've got a dependency on `from` to `to`, but this dependency edge
         // may be affected by [replace]. If the `to` package is listed as the
         // target of a replacement (aka the key of a reverse replacement map)
@@ -262,12 +263,12 @@
         // Note that we don't treat `from` as if it's been replaced because
         // that's where the dependency originates from, and we only replace
         // targets of dependencies not the originator.
-        if let Some(replace) = self.reverse_replacements.get(to) {
-            if let Some(deps) = self.graph.edge(from, replace) {
+        if let Some(replace) = self.reverse_replacements.get(&to) {
+            if let Some(deps) = self.graph.edge(&from, replace) {
                 return deps;
             }
         }
-        match self.graph.edge(from, to) {
+        match self.graph.edge(&from, &to) {
             Some(ret) => ret,
             None => panic!("no Dependency listed for `{}` => `{}`", from, to),
         }
diff -Nru cargo-0.32.0/src/cargo/core/resolver/types.rs cargo-0.33.0/src/cargo/core/resolver/types.rs
--- cargo-0.32.0/src/cargo/core/resolver/types.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/resolver/types.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,12 +1,15 @@
 use std::cmp::Ordering;
-use std::collections::{BinaryHeap, HashMap, HashSet};
+use std::collections::{HashMap, HashSet};
 use std::ops::Range;
 use std::rc::Rc;
 use std::time::{Duration, Instant};
 
 use core::interning::InternedString;
 use core::{Dependency, PackageId, PackageIdSpec, Registry, Summary};
-use util::{CargoError, CargoResult, Config};
+use util::errors::CargoResult;
+use util::Config;
+
+use im_rc;
 
 pub struct ResolverProgress {
     ticks: u16,
@@ -51,7 +54,11 @@
         // with all the algorithm improvements.
         // If any of them are removed then it takes more than I am willing to measure.
         // So lets fail the test fast if we have ben running for two long.
-        debug_assert!(self.ticks < 50_000);
+        debug_assert!(
+            self.ticks < 50_000,
+            "got to 50_000 ticks in {:?}",
+            self.start.elapsed()
+        );
         // The largest test in our suite takes less then 30 sec
         // with all the improvements to how fast a tick can go.
         // If any of them are removed then it takes more than I am willing to measure.
@@ -69,7 +76,7 @@
 pub struct RegistryQueryer<'a> {
     pub registry: &'a mut (Registry + 'a),
     replacements: &'a [(PackageIdSpec, Dependency)],
-    try_to_use: &'a HashSet<&'a PackageId>,
+    try_to_use: &'a HashSet<PackageId>,
     cache: HashMap<Dependency, Rc<Vec<Candidate>>>,
     // If set the list of dependency candidates will be sorted by minimal
     // versions first. That allows `cargo update -Z minimal-versions` which will
@@ -81,7 +88,7 @@
     pub fn new(
         registry: &'a mut Registry,
         replacements: &'a [(PackageIdSpec, Dependency)],
-        try_to_use: &'a HashSet<&'a PackageId>,
+        try_to_use: &'a HashSet<PackageId>,
         minimal_versions: bool,
     ) -> Self {
         RegistryQueryer {
@@ -196,8 +203,8 @@
         // prioritized summaries (those in `try_to_use`) and failing that we
         // list everything from the maximum version to the lowest version.
         ret.sort_unstable_by(|a, b| {
-            let a_in_previous = self.try_to_use.contains(a.summary.package_id());
-            let b_in_previous = self.try_to_use.contains(b.summary.package_id());
+            let a_in_previous = self.try_to_use.contains(&a.summary.package_id());
+            let b_in_previous = self.try_to_use.contains(&b.summary.package_id());
             let previous_cmp = a_in_previous.cmp(&b_in_previous).reverse();
             match previous_cmp {
                 Ordering::Equal => {
@@ -272,7 +279,7 @@
             .unwrap_or(0)
     }
 
-    pub fn flatten(&self) -> impl Iterator<Item = (&PackageId, Dependency)> {
+    pub fn flatten<'a>(&'a self) -> impl Iterator<Item = (PackageId, Dependency)> + 'a {
         self.remaining_siblings
             .clone()
             .map(move |(_, (d, _, _))| (self.parent.package_id(), d))
@@ -298,33 +305,41 @@
     fn cmp(&self, other: &DepsFrame) -> Ordering {
         self.just_for_error_messages
             .cmp(&other.just_for_error_messages)
-            .then_with(||
-            // the frame with the sibling that has the least number of candidates
-            // needs to get bubbled up to the top of the heap we use below, so
-            // reverse comparison here.
-            self.min_candidates().cmp(&other.min_candidates()).reverse())
+            .reverse()
+            .then_with(|| self.min_candidates().cmp(&other.min_candidates()))
     }
 }
 
-/// Note that a `BinaryHeap` is used for the remaining dependencies that need
-/// activation. This heap is sorted such that the "largest value" is the most
-/// constrained dependency, or the one with the least candidates.
+/// Note that a `OrdSet` is used for the remaining dependencies that need
+/// activation. This set is sorted by how many candidates each dependency has.
 ///
 /// This helps us get through super constrained portions of the dependency
 /// graph quickly and hopefully lock down what later larger dependencies can
 /// use (those with more candidates).
 #[derive(Clone)]
-pub struct RemainingDeps(BinaryHeap<DepsFrame>);
+pub struct RemainingDeps {
+    /// a monotonic counter, increased for each new insertion.
+    time: u32,
+    /// the data is augmented by the insertion time.
+    /// This insures that no two items will cmp eq.
+    /// Forcing the OrdSet into a multi set.
+    data: im_rc::OrdSet<(DepsFrame, u32)>,
+}
 
 impl RemainingDeps {
     pub fn new() -> RemainingDeps {
-        RemainingDeps(BinaryHeap::new())
+        RemainingDeps {
+            time: 0,
+            data: im_rc::OrdSet::new(),
+        }
     }
     pub fn push(&mut self, x: DepsFrame) {
-        self.0.push(x)
+        let insertion_time = self.time;
+        self.data.insert((x, insertion_time));
+        self.time += 1;
     }
     pub fn pop_most_constrained(&mut self) -> Option<(bool, (Summary, (usize, DepInfo)))> {
-        while let Some(mut deps_frame) = self.0.pop() {
+        while let Some((mut deps_frame, insertion_time)) = self.data.remove_min() {
             let just_here_for_the_error_messages = deps_frame.just_for_error_messages;
 
             // Figure out what our next dependency to activate is, and if nothing is
@@ -332,14 +347,14 @@
             // move on to the next frame.
             if let Some(sibling) = deps_frame.remaining_siblings.next() {
                 let parent = Summary::clone(&deps_frame.parent);
-                self.0.push(deps_frame);
+                self.data.insert((deps_frame, insertion_time));
                 return Some((just_here_for_the_error_messages, (parent, sibling)));
             }
         }
         None
     }
-    pub fn iter(&mut self) -> impl Iterator<Item = (&PackageId, Dependency)> {
-        self.0.iter().flat_map(|other| other.flatten())
+    pub fn iter<'a>(&'a mut self) -> impl Iterator<Item = (PackageId, Dependency)> + 'a {
+        self.data.iter().flat_map(|(other, _)| other.flatten())
     }
 }
 
@@ -348,25 +363,6 @@
 // (dependency info, candidates, features activated)
 pub type DepInfo = (Dependency, Rc<Vec<Candidate>>, Rc<Vec<InternedString>>);
 
-pub type ActivateResult<T> = Result<T, ActivateError>;
-
-pub enum ActivateError {
-    Fatal(CargoError),
-    Conflict(PackageId, ConflictReason),
-}
-
-impl From<::failure::Error> for ActivateError {
-    fn from(t: ::failure::Error) -> Self {
-        ActivateError::Fatal(t)
-    }
-}
-
-impl From<(PackageId, ConflictReason)> for ActivateError {
-    fn from(t: (PackageId, ConflictReason)) -> Self {
-        ActivateError::Conflict(t.0, t.1)
-    }
-}
-
 /// All possible reasons that a package might fail to activate.
 ///
 /// We maintain a list of conflicts for error reporting as well as backtracking
diff -Nru cargo-0.32.0/src/cargo/core/shell.rs cargo-0.33.0/src/cargo/core/shell.rs
--- cargo-0.32.0/src/cargo/core/shell.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/shell.rs	2019-01-02 21:49:06.000000000 +0000
@@ -28,10 +28,12 @@
 impl fmt::Debug for Shell {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.err {
-            ShellOut::Write(_) => f.debug_struct("Shell")
+            ShellOut::Write(_) => f
+                .debug_struct("Shell")
                 .field("verbosity", &self.verbosity)
                 .finish(),
-            ShellOut::Stream { color_choice, .. } => f.debug_struct("Shell")
+            ShellOut::Stream { color_choice, .. } => f
+                .debug_struct("Shell")
                 .field("verbosity", &self.verbosity)
                 .field("color_choice", &color_choice)
                 .finish(),
@@ -120,6 +122,13 @@
         self.err.as_write()
     }
 
+    /// Erase from cursor to end of line.
+    pub fn err_erase_line(&mut self) {
+        if let ShellOut::Stream { tty: true, .. } = self.err {
+            imp::err_erase_line(self);
+        }
+    }
+
     /// Shortcut to right-align and color green a status message.
     pub fn status<T, U>(&mut self, status: T, message: U) -> CargoResult<()>
     where
@@ -332,6 +341,8 @@
 
     use libc;
 
+    use super::Shell;
+
     pub fn stderr_width() -> Option<usize> {
         unsafe {
             let mut winsize: libc::winsize = mem::zeroed();
@@ -345,10 +356,19 @@
             }
         }
     }
+
+    pub fn err_erase_line(shell: &mut Shell) {
+        // This is the "EL - Erase in Line" sequence. It clears from the cursor
+        // to the end of line.
+        // https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_sequences
+        let _ = shell.err().write_all(b"\x1B[K");
+    }
 }
 
 #[cfg(all(unix, not(any(target_os = "linux", target_os = "macos"))))]
 mod imp {
+    pub(super) use super::default_err_erase_line as err_erase_line;
+
     pub fn stderr_width() -> Option<usize> {
         None
     }
@@ -358,32 +378,35 @@
 mod imp {
     extern crate winapi;
 
-    use std::{cmp, mem, ptr};
     use self::winapi::um::fileapi::*;
     use self::winapi::um::handleapi::*;
     use self::winapi::um::processenv::*;
     use self::winapi::um::winbase::*;
     use self::winapi::um::wincon::*;
     use self::winapi::um::winnt::*;
+    use std::{cmp, mem, ptr};
+
+    pub(super) use super::default_err_erase_line as err_erase_line;
 
     pub fn stderr_width() -> Option<usize> {
         unsafe {
             let stdout = GetStdHandle(STD_ERROR_HANDLE);
             let mut csbi: CONSOLE_SCREEN_BUFFER_INFO = mem::zeroed();
             if GetConsoleScreenBufferInfo(stdout, &mut csbi) != 0 {
-                return Some((csbi.srWindow.Right - csbi.srWindow.Left) as usize)
+                return Some((csbi.srWindow.Right - csbi.srWindow.Left) as usize);
             }
 
             // On mintty/msys/cygwin based terminals, the above fails with
             // INVALID_HANDLE_VALUE. Use an alternate method which works
             // in that case as well.
-            let h = CreateFileA("CONOUT$\0".as_ptr() as *const CHAR,
+            let h = CreateFileA(
+                "CONOUT$\0".as_ptr() as *const CHAR,
                 GENERIC_READ | GENERIC_WRITE,
                 FILE_SHARE_READ | FILE_SHARE_WRITE,
                 ptr::null_mut(),
                 OPEN_EXISTING,
                 0,
-                ptr::null_mut()
+                ptr::null_mut(),
             );
             if h == INVALID_HANDLE_VALUE {
                 return None;
@@ -404,7 +427,15 @@
                 // GetConsoleScreenBufferInfo returns accurate information.
                 return Some(cmp::min(60, width));
             }
-            return None;
+            None
         }
     }
 }
+
+#[cfg(any(all(unix, not(any(target_os = "linux", target_os = "macos"))), windows,))]
+fn default_err_erase_line(shell: &mut Shell) {
+    if let Some(max_width) = imp::stderr_width() {
+        let blank = " ".repeat(max_width);
+        drop(write!(shell.err(), "{}\r", blank));
+    }
+}
diff -Nru cargo-0.32.0/src/cargo/core/source/mod.rs cargo-0.33.0/src/cargo/core/source/mod.rs
--- cargo-0.32.0/src/cargo/core/source/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/source/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -12,10 +12,10 @@
 /// versions.
 pub trait Source {
     /// Returns the `SourceId` corresponding to this source
-    fn source_id(&self) -> &SourceId;
+    fn source_id(&self) -> SourceId;
 
     /// Returns the replaced `SourceId` corresponding to this source
-    fn replaced_source_id(&self) -> &SourceId {
+    fn replaced_source_id(&self) -> SourceId {
         self.source_id()
     }
 
@@ -49,9 +49,9 @@
 
     /// The download method fetches the full package for each name and
     /// version specified.
-    fn download(&mut self, package: &PackageId) -> CargoResult<MaybePackage>;
+    fn download(&mut self, package: PackageId) -> CargoResult<MaybePackage>;
 
-    fn finish_download(&mut self, package: &PackageId, contents: Vec<u8>) -> CargoResult<Package>;
+    fn finish_download(&mut self, package: PackageId, contents: Vec<u8>) -> CargoResult<Package>;
 
     /// Generates a unique string which represents the fingerprint of the
     /// current state of the source.
@@ -71,7 +71,7 @@
     /// verification during the `download` step, but this is intended to be run
     /// just before a crate is compiled so it may perform more expensive checks
     /// which may not be cacheable.
-    fn verify(&self, _pkg: &PackageId) -> CargoResult<()> {
+    fn verify(&self, _pkg: PackageId) -> CargoResult<()> {
         Ok(())
     }
 
@@ -92,12 +92,12 @@
 
 impl<'a, T: Source + ?Sized + 'a> Source for Box<T> {
     /// Forwards to `Source::source_id`
-    fn source_id(&self) -> &SourceId {
+    fn source_id(&self) -> SourceId {
         (**self).source_id()
     }
 
     /// Forwards to `Source::replaced_source_id`
-    fn replaced_source_id(&self) -> &SourceId {
+    fn replaced_source_id(&self) -> SourceId {
         (**self).replaced_source_id()
     }
 
@@ -127,11 +127,11 @@
     }
 
     /// Forwards to `Source::download`
-    fn download(&mut self, id: &PackageId) -> CargoResult<MaybePackage> {
+    fn download(&mut self, id: PackageId) -> CargoResult<MaybePackage> {
         (**self).download(id)
     }
 
-    fn finish_download(&mut self, id: &PackageId, data: Vec<u8>) -> CargoResult<Package> {
+    fn finish_download(&mut self, id: PackageId, data: Vec<u8>) -> CargoResult<Package> {
         (**self).finish_download(id, data)
     }
 
@@ -141,7 +141,7 @@
     }
 
     /// Forwards to `Source::verify`
-    fn verify(&self, pkg: &PackageId) -> CargoResult<()> {
+    fn verify(&self, pkg: PackageId) -> CargoResult<()> {
         (**self).verify(pkg)
     }
 
@@ -155,11 +155,11 @@
 }
 
 impl<'a, T: Source + ?Sized + 'a> Source for &'a mut T {
-    fn source_id(&self) -> &SourceId {
+    fn source_id(&self) -> SourceId {
         (**self).source_id()
     }
 
-    fn replaced_source_id(&self) -> &SourceId {
+    fn replaced_source_id(&self) -> SourceId {
         (**self).replaced_source_id()
     }
 
@@ -183,11 +183,11 @@
         (**self).update()
     }
 
-    fn download(&mut self, id: &PackageId) -> CargoResult<MaybePackage> {
+    fn download(&mut self, id: PackageId) -> CargoResult<MaybePackage> {
         (**self).download(id)
     }
 
-    fn finish_download(&mut self, id: &PackageId, data: Vec<u8>) -> CargoResult<Package> {
+    fn finish_download(&mut self, id: PackageId, data: Vec<u8>) -> CargoResult<Package> {
         (**self).finish_download(id, data)
     }
 
@@ -195,7 +195,7 @@
         (**self).fingerprint(pkg)
     }
 
-    fn verify(&self, pkg: &PackageId) -> CargoResult<()> {
+    fn verify(&self, pkg: PackageId) -> CargoResult<()> {
         (**self).verify(pkg)
     }
 
@@ -231,13 +231,13 @@
     }
 
     /// Like `HashMap::contains_key`
-    pub fn contains(&self, id: &SourceId) -> bool {
-        self.map.contains_key(id)
+    pub fn contains(&self, id: SourceId) -> bool {
+        self.map.contains_key(&id)
     }
 
     /// Like `HashMap::get`
-    pub fn get(&self, id: &SourceId) -> Option<&(Source + 'src)> {
-        let source = self.map.get(id);
+    pub fn get(&self, id: SourceId) -> Option<&(Source + 'src)> {
+        let source = self.map.get(&id);
 
         source.map(|s| {
             let s: &(Source + 'src) = &**s;
@@ -246,8 +246,8 @@
     }
 
     /// Like `HashMap::get_mut`
-    pub fn get_mut(&mut self, id: &SourceId) -> Option<&mut (Source + 'src)> {
-        self.map.get_mut(id).map(|s| {
+    pub fn get_mut(&mut self, id: SourceId) -> Option<&mut (Source + 'src)> {
+        self.map.get_mut(&id).map(|s| {
             let s: &mut (Source + 'src) = &mut **s;
             s
         })
@@ -255,13 +255,13 @@
 
     /// Like `HashMap::get`, but first calculates the `SourceId` from a
     /// `PackageId`
-    pub fn get_by_package_id(&self, pkg_id: &PackageId) -> Option<&(Source + 'src)> {
+    pub fn get_by_package_id(&self, pkg_id: PackageId) -> Option<&(Source + 'src)> {
         self.get(pkg_id.source_id())
     }
 
     /// Like `HashMap::insert`, but derives the SourceId key from the Source
     pub fn insert(&mut self, source: Box<Source + 'src>) {
-        let id = source.source_id().clone();
+        let id = source.source_id();
         self.map.insert(id, source);
     }
 
diff -Nru cargo-0.32.0/src/cargo/core/source/source_id.rs cargo-0.33.0/src/cargo/core/source/source_id.rs
--- cargo-0.32.0/src/cargo/core/source/source_id.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/source/source_id.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,28 +1,34 @@
 use std::cmp::{self, Ordering};
+use std::collections::HashSet;
 use std::fmt::{self, Formatter};
 use std::hash::{self, Hash};
 use std::path::Path;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT};
+use std::ptr;
 use std::sync::atomic::Ordering::SeqCst;
+use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT};
+use std::sync::Mutex;
 
-use serde::ser;
 use serde::de;
+use serde::ser;
 use url::Url;
 
 use ops;
 use sources::git;
-use sources::{GitSource, PathSource, RegistrySource, CRATES_IO_INDEX};
 use sources::DirectorySource;
+use sources::{GitSource, PathSource, RegistrySource, CRATES_IO_INDEX};
 use util::{CargoResult, Config, ToUrl};
 
+lazy_static! {
+    static ref SOURCE_ID_CACHE: Mutex<HashSet<&'static SourceIdInner>> = Mutex::new(HashSet::new());
+}
+
 /// Unique identifier for a source of packages.
-#[derive(Clone, Eq, Debug)]
+#[derive(Clone, Copy, Eq, Debug)]
 pub struct SourceId {
-    inner: Arc<SourceIdInner>,
+    inner: &'static SourceIdInner,
 }
 
-#[derive(Eq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug, Hash)]
 struct SourceIdInner {
     /// The source URL
     url: Url,
@@ -68,18 +74,26 @@
     ///
     /// The canonical url will be calculated, but the precise field will not
     fn new(kind: Kind, url: Url) -> CargoResult<SourceId> {
-        let source_id = SourceId {
-            inner: Arc::new(SourceIdInner {
-                kind,
-                canonical_url: git::canonicalize_url(&url)?,
-                url,
-                precise: None,
-                name: None,
-            }),
-        };
+        let source_id = SourceId::wrap(SourceIdInner {
+            kind,
+            canonical_url: git::canonicalize_url(&url)?,
+            url,
+            precise: None,
+            name: None,
+        });
         Ok(source_id)
     }
 
+    fn wrap(inner: SourceIdInner) -> SourceId {
+        let mut cache = SOURCE_ID_CACHE.lock().unwrap();
+        let inner = cache.get(&inner).cloned().unwrap_or_else(|| {
+            let inner = Box::leak(Box::new(inner));
+            cache.insert(inner);
+            inner
+        });
+        SourceId { inner }
+    }
+
     /// Parses a source URL and returns the corresponding ID.
     ///
     /// ## Example
@@ -193,15 +207,13 @@
 
     pub fn alt_registry(config: &Config, key: &str) -> CargoResult<SourceId> {
         let url = config.get_registry_index(key)?;
-        Ok(SourceId {
-            inner: Arc::new(SourceIdInner {
-                kind: Kind::Registry,
-                canonical_url: git::canonicalize_url(&url)?,
-                url,
-                precise: None,
-                name: Some(key.to_string()),
-            }),
-        })
+        Ok(SourceId::wrap(SourceIdInner {
+            kind: Kind::Registry,
+            canonical_url: git::canonicalize_url(&url)?,
+            url,
+            precise: None,
+            name: Some(key.to_string()),
+        }))
     }
 
     /// Get this source URL
@@ -209,7 +221,7 @@
         &self.inner.url
     }
 
-    pub fn display_registry(&self) -> String {
+    pub fn display_registry(self) -> String {
         if self.is_default_registry() {
             "crates.io index".to_string()
         } else {
@@ -218,12 +230,12 @@
     }
 
     /// Is this source from a filesystem path
-    pub fn is_path(&self) -> bool {
+    pub fn is_path(self) -> bool {
         self.inner.kind == Kind::Path
     }
 
     /// Is this source from a registry (either local or not)
-    pub fn is_registry(&self) -> bool {
+    pub fn is_registry(self) -> bool {
         match self.inner.kind {
             Kind::Registry | Kind::LocalRegistry => true,
             _ => false,
@@ -231,12 +243,12 @@
     }
 
     /// Is this source from an alternative registry
-    pub fn is_alt_registry(&self) -> bool {
+    pub fn is_alt_registry(self) -> bool {
         self.is_registry() && self.inner.name.is_some()
     }
 
     /// Is this source from a git repository
-    pub fn is_git(&self) -> bool {
+    pub fn is_git(self) -> bool {
         match self.inner.kind {
             Kind::Git(_) => true,
             _ => false,
@@ -244,7 +256,7 @@
     }
 
     /// Creates an implementation of `Source` corresponding to this ID.
-    pub fn load<'a>(&self, config: &'a Config) -> CargoResult<Box<super::Source + 'a>> {
+    pub fn load<'a>(self, config: &'a Config) -> CargoResult<Box<super::Source + 'a>> {
         trace!("loading SourceId; {}", self);
         match self.inner.kind {
             Kind::Git(..) => Ok(Box::new(GitSource::new(self, config)?)),
@@ -274,12 +286,12 @@
     }
 
     /// Get the value of the precise field
-    pub fn precise(&self) -> Option<&str> {
+    pub fn precise(self) -> Option<&'static str> {
         self.inner.precise.as_ref().map(|s| &s[..])
     }
 
     /// Get the git reference if this is a git source, otherwise None.
-    pub fn git_reference(&self) -> Option<&GitReference> {
+    pub fn git_reference(self) -> Option<&'static GitReference> {
         match self.inner.kind {
             Kind::Git(ref s) => Some(s),
             _ => None,
@@ -287,17 +299,15 @@
     }
 
     /// Create a new SourceId from this source with the given `precise`
-    pub fn with_precise(&self, v: Option<String>) -> SourceId {
-        SourceId {
-            inner: Arc::new(SourceIdInner {
-                precise: v,
-                ..(*self.inner).clone()
-            }),
-        }
+    pub fn with_precise(self, v: Option<String>) -> SourceId {
+        SourceId::wrap(SourceIdInner {
+            precise: v,
+            ..(*self.inner).clone()
+        })
     }
 
     /// Whether the remote registry is the standard https://crates.io
-    pub fn is_default_registry(&self) -> bool {
+    pub fn is_default_registry(self) -> bool {
         match self.inner.kind {
             Kind::Registry => {}
             _ => return false,
@@ -309,9 +319,10 @@
     ///
     /// For paths, remove the workspace prefix so the same source will give the
     /// same hash in different locations.
-    pub fn stable_hash<S: hash::Hasher>(&self, workspace: &Path, into: &mut S) {
+    pub fn stable_hash<S: hash::Hasher>(self, workspace: &Path, into: &mut S) {
         if self.is_path() {
-            if let Ok(p) = self.inner
+            if let Ok(p) = self
+                .inner
                 .url
                 .to_file_path()
                 .unwrap()
@@ -324,11 +335,13 @@
         }
         self.hash(into)
     }
-}
 
-impl PartialEq for SourceId {
-    fn eq(&self, other: &SourceId) -> bool {
-        (*self.inner).eq(&*other.inner)
+    pub fn full_eq(self, other: SourceId) -> bool {
+        ptr::eq(self.inner, other.inner)
+    }
+
+    pub fn full_hash<S: hash::Hasher>(self, into: &mut S) {
+        ptr::NonNull::from(self.inner).hash(into)
     }
 }
 
@@ -425,24 +438,23 @@
     }
 }
 
-// This custom implementation handles situations such as when two git sources
-// point at *almost* the same URL, but not quite, even when they actually point
-// to the same repository.
-/// This method tests for self and other values to be equal, and is used by ==.
-///
-/// For git repositories, the canonical url is checked.
-impl PartialEq for SourceIdInner {
-    fn eq(&self, other: &SourceIdInner) -> bool {
-        if self.kind != other.kind {
+// Custom equality defined as canonical URL equality for git sources and
+// URL equality for other sources, ignoring the `precise` and `name` fields.
+impl PartialEq for SourceId {
+    fn eq(&self, other: &SourceId) -> bool {
+        if ptr::eq(self.inner, other.inner) {
+            return true;
+        }
+        if self.inner.kind != other.inner.kind {
             return false;
         }
-        if self.url == other.url {
+        if self.inner.url == other.inner.url {
             return true;
         }
 
-        match (&self.kind, &other.kind) {
-            (&Kind::Git(ref ref1), &Kind::Git(ref ref2)) => {
-                ref1 == ref2 && self.canonical_url == other.canonical_url
+        match (&self.inner.kind, &other.inner.kind) {
+            (Kind::Git(ref1), Kind::Git(ref2)) => {
+                ref1 == ref2 && self.inner.canonical_url == other.inner.canonical_url
             }
             _ => false,
         }
diff -Nru cargo-0.32.0/src/cargo/core/summary.rs cargo-0.33.0/src/cargo/core/summary.rs
--- cargo-0.32.0/src/cargo/core/summary.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/summary.rs	2019-01-02 21:49:06.000000000 +0000
@@ -39,7 +39,9 @@
         links: Option<impl AsRef<str>>,
         namespaced_features: bool,
     ) -> CargoResult<Summary>
-    where K: Borrow<str> + Ord + Display {
+    where
+        K: Borrow<str> + Ord + Display,
+    {
         for dep in dependencies.iter() {
             let feature = dep.name_in_toml();
             if !namespaced_features && features.get(&*feature).is_some() {
@@ -69,8 +71,8 @@
         })
     }
 
-    pub fn package_id(&self) -> &PackageId {
-        &self.inner.package_id
+    pub fn package_id(&self) -> PackageId {
+        self.inner.package_id
     }
     pub fn name(&self) -> InternedString {
         self.package_id().name()
@@ -78,7 +80,7 @@
     pub fn version(&self) -> &Version {
         self.package_id().version()
     }
-    pub fn source_id(&self) -> &SourceId {
+    pub fn source_id(&self) -> SourceId {
         self.package_id().source_id()
     }
     pub fn dependencies(&self) -> &[Dependency] {
@@ -119,7 +121,7 @@
         self
     }
 
-    pub fn map_source(self, to_replace: &SourceId, replace_with: &SourceId) -> Summary {
+    pub fn map_source(self, to_replace: SourceId, replace_with: SourceId) -> Summary {
         let me = if self.package_id().source_id() == to_replace {
             let new_id = self.package_id().with_source_id(replace_with);
             self.override_id(new_id)
@@ -143,7 +145,9 @@
     dependencies: &[Dependency],
     namespaced: bool,
 ) -> CargoResult<FeatureMap>
-where K: Borrow<str> + Ord + Display {
+where
+    K: Borrow<str> + Ord + Display,
+{
     use self::FeatureValue::*;
     let mut dep_map = HashMap::new();
     for dep in dependencies.iter() {
@@ -258,42 +262,46 @@
                 // not recognized as a feature is pegged as a `Crate`. Here we handle the case
                 // where the dependency exists but is non-optional. It branches on namespaced
                 // just to provide the correct string for the crate dependency in the error.
-                (&Crate(ref dep), true, false) => if namespaced {
-                    bail!(
-                        "Feature `{}` includes `crate:{}` which is not an \
-                         optional dependency.\nConsider adding \
-                         `optional = true` to the dependency",
-                        feature,
-                        dep
-                    )
-                } else {
-                    bail!(
-                        "Feature `{}` depends on `{}` which is not an \
-                         optional dependency.\nConsider adding \
-                         `optional = true` to the dependency",
-                        feature,
-                        dep
-                    )
-                },
+                (&Crate(ref dep), true, false) => {
+                    if namespaced {
+                        bail!(
+                            "Feature `{}` includes `crate:{}` which is not an \
+                             optional dependency.\nConsider adding \
+                             `optional = true` to the dependency",
+                            feature,
+                            dep
+                        )
+                    } else {
+                        bail!(
+                            "Feature `{}` depends on `{}` which is not an \
+                             optional dependency.\nConsider adding \
+                             `optional = true` to the dependency",
+                            feature,
+                            dep
+                        )
+                    }
+                }
                 // If namespaced, the value was tagged as a dependency; if not namespaced,
                 // this could be anything not defined as a feature. This handles the case
                 // where no such dependency is actually defined; again, the branch on
                 // namespaced here is just to provide the correct string in the error.
-                (&Crate(ref dep), false, _) => if namespaced {
-                    bail!(
-                        "Feature `{}` includes `crate:{}` which is not a known \
-                         dependency",
-                        feature,
-                        dep
-                    )
-                } else {
-                    bail!(
-                        "Feature `{}` includes `{}` which is neither a dependency nor \
-                         another feature",
-                        feature,
-                        dep
-                    )
-                },
+                (&Crate(ref dep), false, _) => {
+                    if namespaced {
+                        bail!(
+                            "Feature `{}` includes `crate:{}` which is not a known \
+                             dependency",
+                            feature,
+                            dep
+                        )
+                    } else {
+                        bail!(
+                            "Feature `{}` includes `{}` which is neither a dependency nor \
+                             another feature",
+                            feature,
+                            dep
+                        )
+                    }
+                }
                 (&Crate(_), true, true) => {}
                 // If the value is a feature for one of the dependencies, bail out if no such
                 // dependency is actually defined in the manifest.
@@ -372,11 +380,13 @@
         use self::FeatureValue::*;
         match *self {
             Feature(ref f) => f.to_string(),
-            Crate(ref c) => if s.namespaced_features() {
-                format!("crate:{}", &c)
-            } else {
-                c.to_string()
-            },
+            Crate(ref c) => {
+                if s.namespaced_features() {
+                    format!("crate:{}", &c)
+                } else {
+                    c.to_string()
+                }
+            }
             CrateFeature(ref c, ref f) => [c.as_ref(), f.as_ref()].join("/"),
         }
     }
diff -Nru cargo-0.32.0/src/cargo/core/workspace.rs cargo-0.33.0/src/cargo/core/workspace.rs
--- cargo-0.32.0/src/cargo/core/workspace.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/core/workspace.rs	2019-01-02 21:49:06.000000000 +0000
@@ -236,7 +236,8 @@
     }
 
     pub fn profiles(&self) -> &Profiles {
-        let root = self.root_manifest
+        let root = self
+            .root_manifest
             .as_ref()
             .unwrap_or(&self.current_manifest);
         match *self.packages.get(root) {
@@ -253,8 +254,9 @@
         match self.root_manifest {
             Some(ref p) => p,
             None => &self.current_manifest,
-        }.parent()
-            .unwrap()
+        }
+        .parent()
+        .unwrap()
     }
 
     pub fn target_dir(&self) -> Filesystem {
@@ -425,8 +427,8 @@
             let root_package = self.packages.load(&root_manifest_path)?;
             match *root_package.workspace_config() {
                 WorkspaceConfig::Root(ref root_config) => {
-                    members_paths =
-                        root_config.members_paths(root_config.members.as_ref().unwrap_or(&vec![]))?;
+                    members_paths = root_config
+                        .members_paths(root_config.members.as_ref().unwrap_or(&vec![]))?;
                     default_members_paths = if let Some(ref default) = root_config.default_members {
                         Some(root_config.members_paths(default)?)
                     } else {
@@ -475,7 +477,8 @@
         if self.members.contains(&manifest_path) {
             return Ok(());
         }
-        if is_path_dep && !manifest_path.parent().unwrap().starts_with(self.root())
+        if is_path_dep
+            && !manifest_path.parent().unwrap().starts_with(self.root())
             && self.find_root(&manifest_path)? != self.root_manifest
         {
             // If `manifest_path` is a path dependency outside of the workspace,
@@ -655,21 +658,32 @@
         }
 
         if let Some(ref root_manifest) = self.root_manifest {
-            for pkg in self.members()
+            for pkg in self
+                .members()
                 .filter(|p| p.manifest_path() != root_manifest)
             {
-                if pkg.manifest().original().has_profiles() {
-                    let message = &format!(
-                        "profiles for the non root package will be ignored, \
-                         specify profiles at the workspace root:\n\
+                let manifest = pkg.manifest();
+                let emit_warning = |what| -> CargoResult<()> {
+                    let msg = format!(
+                        "{} for the non root package will be ignored, \
+                         specify {} at the workspace root:\n\
                          package:   {}\n\
                          workspace: {}",
+                        what,
+                        what,
                         pkg.manifest_path().display(),
-                        root_manifest.display()
+                        root_manifest.display(),
                     );
-
-                    //TODO: remove `Eq` bound from `Profiles` when the warning is removed.
-                    self.config.shell().warn(&message)?;
+                    self.config.shell().warn(&msg)
+                };
+                if manifest.original().has_profiles() {
+                    emit_warning("profiles")?;
+                }
+                if !manifest.replace().is_empty() {
+                    emit_warning("replace")?;
+                }
+                if !manifest.patch().is_empty() {
+                    emit_warning("patch")?;
                 }
             }
         }
@@ -689,7 +703,7 @@
             return Ok(p);
         }
         let source_id = SourceId::for_path(manifest_path.parent().unwrap())?;
-        let (package, _nested_paths) = ops::read_package(manifest_path, &source_id, self.config)?;
+        let (package, _nested_paths) = ops::read_package(manifest_path, source_id, self.config)?;
         loaded.insert(manifest_path.to_path_buf(), package.clone());
         Ok(package)
     }
@@ -731,16 +745,21 @@
                 MaybePackage::Package(pkg) => pkg.manifest().warnings().warnings(),
                 MaybePackage::Virtual(vm) => vm.warnings().warnings(),
             };
+            let path = path.join("Cargo.toml");
             for warning in warnings {
                 if warning.is_critical {
                     let err = format_err!("{}", warning.message);
-                    let cx = format_err!(
-                        "failed to parse manifest at `{}`",
-                        path.display()
-                    );
+                    let cx = format_err!("failed to parse manifest at `{}`", path.display());
                     return Err(err.context(cx).into());
                 } else {
-                    self.config.shell().warn(&warning.message)?
+                    let msg = if self.root_manifest.is_none() {
+                        warning.message.to_string()
+                    } else {
+                        // In a workspace, it can be confusing where a warning
+                        // originated, so include the path.
+                        format!("{}: {}", path.display(), warning.message)
+                    };
+                    self.config.shell().warn(msg)?
                 }
             }
         }
@@ -764,7 +783,7 @@
             Entry::Vacant(v) => {
                 let source_id = SourceId::for_path(key)?;
                 let (manifest, _nested_paths) =
-                    read_manifest(manifest_path, &source_id, self.config)?;
+                    read_manifest(manifest_path, source_id, self.config)?;
                 Ok(v.insert(match manifest {
                     EitherManifest::Real(manifest) => {
                         MaybePackage::Package(Package::new(manifest, manifest_path))
@@ -825,7 +844,8 @@
     ///
     /// This method does NOT consider the `members` list.
     fn is_excluded(&self, manifest_path: &Path) -> bool {
-        let excluded = self.exclude
+        let excluded = self
+            .exclude
             .iter()
             .any(|ex| manifest_path.starts_with(self.root_dir.join(ex)));
 
@@ -868,9 +888,9 @@
             None => return Ok(Vec::new()),
         };
         let res = glob(path).chain_err(|| format_err!("could not parse pattern `{}`", &path))?;
-        let res = res.map(|p| {
-            p.chain_err(|| format_err!("unable to match path to pattern `{}`", &path))
-        }).collect::<Result<Vec<_>, _>>()?;
+        let res = res
+            .map(|p| p.chain_err(|| format_err!("unable to match path to pattern `{}`", &path)))
+            .collect::<Result<Vec<_>, _>>()?;
         Ok(res)
     }
 }
diff -Nru cargo-0.32.0/src/cargo/lib.rs cargo-0.33.0/src/cargo/lib.rs
--- cargo-0.32.0/src/cargo/lib.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/lib.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,18 +1,17 @@
 #![cfg_attr(test, deny(warnings))]
-
 // Clippy isn't enforced by CI, and know that @alexcrichton isn't a fan :)
-#![cfg_attr(feature = "cargo-clippy", allow(boxed_local))]             // bug rust-lang-nursery/rust-clippy#1123
-#![cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]   // large project
-#![cfg_attr(feature = "cargo-clippy", allow(derive_hash_xor_eq))]      // there's an intentional incoherence
-#![cfg_attr(feature = "cargo-clippy", allow(explicit_into_iter_loop))] // explicit loops are clearer
-#![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))]      // explicit loops are clearer
-#![cfg_attr(feature = "cargo-clippy", allow(identity_op))]             // used for vertical alignment
-#![cfg_attr(feature = "cargo-clippy", allow(implicit_hasher))]         // large project
-#![cfg_attr(feature = "cargo-clippy", allow(large_enum_variant))]      // large project
-#![cfg_attr(feature = "cargo-clippy", allow(redundant_closure_call))]  // closures over try catch blocks
-#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]      // large project
-#![cfg_attr(feature = "cargo-clippy", allow(type_complexity))]         // there's an exceptionally complex type
-#![cfg_attr(feature = "cargo-clippy", allow(wrong_self_convention))]   // perhaps Rc should be special cased in Clippy?
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::boxed_local))]             // bug rust-lang-nursery/rust-clippy#1123
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::cyclomatic_complexity))]   // large project
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::derive_hash_xor_eq))]      // there's an intentional incoherence
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::explicit_into_iter_loop))] // explicit loops are clearer
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::explicit_iter_loop))]      // explicit loops are clearer
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::identity_op))]             // used for vertical alignment
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::implicit_hasher))]         // large project
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::large_enum_variant))]      // large project
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::redundant_closure_call))]  // closures over try catch blocks
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))]      // large project
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::type_complexity))]         // there's an exceptionally complex type
+#![cfg_attr(feature = "cargo-clippy", allow(clippy::wrong_self_convention))]   // perhaps Rc should be special cased in Clippy?
 
 extern crate atty;
 extern crate bytesize;
@@ -55,6 +54,7 @@
 extern crate serde_ignored;
 #[macro_use]
 extern crate serde_json;
+extern crate im_rc;
 extern crate shell_escape;
 extern crate tar;
 extern crate tempfile;
@@ -65,14 +65,14 @@
 
 use std::fmt;
 
-use serde::ser;
 use failure::Error;
+use serde::ser;
 
-use core::Shell;
 use core::shell::Verbosity::Verbose;
+use core::Shell;
 
-pub use util::{CargoError, CargoResult, CliError, CliResult, Config};
 pub use util::errors::Internal;
+pub use util::{CargoError, CargoResult, CliError, CliResult, Config};
 
 pub const CARGO_ENV: &str = "CARGO";
 
@@ -209,7 +209,9 @@
 
 pub fn version() -> VersionInfo {
     macro_rules! option_env_str {
-        ($name:expr) => { option_env!($name).map(|s| s.to_string()) }
+        ($name:expr) => {
+            option_env!($name).map(|s| s.to_string())
+        };
     }
 
     // So this is pretty horrible...
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_clean.rs cargo-0.33.0/src/cargo/ops/cargo_clean.rs
--- cargo-0.32.0/src/cargo/ops/cargo_clean.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_clean.rs	2019-01-02 21:49:06.000000000 +0000
@@ -24,14 +24,18 @@
 
 /// Cleans the package's build artifacts.
 pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
-    let target_dir = ws.target_dir();
+    let mut target_dir = ws.target_dir();
     let config = ws.config();
 
     // If the doc option is set, we just want to delete the doc directory.
     if opts.doc {
-        let target_dir = target_dir.join("doc");
-        let target_dir = target_dir.into_path_unlocked();
-        return rm_rf(&target_dir, config);
+        target_dir = target_dir.join("doc");
+        return rm_rf(&target_dir.into_path_unlocked(), config);
+    }
+
+    // If the release option is set, we set target to release directory
+    if opts.release {
+        target_dir = target_dir.join("release");
     }
 
     // If we have a spec, then we need to delete some packages, otherwise, just
@@ -40,8 +44,7 @@
     // Note that we don't bother grabbing a lock here as we're just going to
     // blow it all away anyway.
     if opts.spec.is_empty() {
-        let target_dir = target_dir.into_path_unlocked();
-        return rm_rf(&target_dir, config);
+        return rm_rf(&target_dir.into_path_unlocked(), config);
     }
 
     let (packages, resolve) = ops::resolve_ws(ws)?;
@@ -131,7 +134,8 @@
         config
             .shell()
             .verbose(|shell| shell.status("Removing", path.display()))?;
-        paths::remove_dir_all(path).chain_err(|| format_err!("could not remove build directory"))?;
+        paths::remove_dir_all(path)
+            .chain_err(|| format_err!("could not remove build directory"))?;
     } else if m.is_ok() {
         config
             .shell()
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_compile.rs cargo-0.33.0/src/cargo/ops/cargo_compile.rs
--- cargo-0.32.0/src/cargo/ops/cargo_compile.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_compile.rs	2019-01-02 21:49:06.000000000 +0000
@@ -28,7 +28,7 @@
 
 use core::compiler::{BuildConfig, BuildContext, Compilation, Context, DefaultExecutor, Executor};
 use core::compiler::{CompileMode, Kind, Unit};
-use core::profiles::{UnitFor, Profiles};
+use core::profiles::{Profiles, UnitFor};
 use core::resolver::{Method, Resolve};
 use core::{Package, Source, Target};
 use core::{PackageId, PackageIdSpec, TargetKind, Workspace};
@@ -109,11 +109,13 @@
 
     pub fn to_package_id_specs(&self, ws: &Workspace) -> CargoResult<Vec<PackageIdSpec>> {
         let specs = match *self {
-            Packages::All => ws.members()
+            Packages::All => ws
+                .members()
                 .map(Package::package_id)
                 .map(PackageIdSpec::from_package_id)
                 .collect(),
-            Packages::OptOut(ref opt_out) => ws.members()
+            Packages::OptOut(ref opt_out) => ws
+                .members()
                 .map(Package::package_id)
                 .map(PackageIdSpec::from_package_id)
                 .filter(|p| opt_out.iter().position(|x| *x == p.name()).is_none())
@@ -125,7 +127,8 @@
                 .iter()
                 .map(|p| PackageIdSpec::parse(p))
                 .collect::<CargoResult<Vec<_>>>()?,
-            Packages::Default => ws.default_members()
+            Packages::Default => ws
+                .default_members()
                 .map(Package::package_id)
                 .map(PackageIdSpec::from_package_id)
                 .collect(),
@@ -159,7 +162,8 @@
                         .ok_or_else(|| {
                             format_err!("package `{}` is not a member of the workspace", name)
                         })
-                }).collect::<CargoResult<Vec<_>>>()?,
+                })
+                .collect::<CargoResult<Vec<_>>>()?,
         };
         Ok(packages)
     }
@@ -243,7 +247,8 @@
     let resolve = ops::resolve_ws_with_method(ws, source, method, &specs)?;
     let (packages, resolve_with_overrides) = resolve;
 
-    let to_build_ids = specs.iter()
+    let to_build_ids = specs
+        .iter()
         .map(|s| s.query(resolve_with_overrides.iter()))
         .collect::<CargoResult<Vec<_>>>()?;
     let mut to_builds = packages.get_many(to_build_ids)?;
@@ -390,8 +395,11 @@
                 benches: FilterRule::All,
                 tests: FilterRule::All,
             }
-        } else if lib_only || rule_bins.is_specific() || rule_tsts.is_specific()
-            || rule_exms.is_specific() || rule_bens.is_specific()
+        } else if lib_only
+            || rule_bins.is_specific()
+            || rule_tsts.is_specific()
+            || rule_exms.is_specific()
+            || rule_bens.is_specific()
         {
             CompileFilter::Only {
                 all_targets: false,
@@ -532,6 +540,15 @@
                 TargetKind::Bench => CompileMode::Bench,
                 _ => CompileMode::Build,
             },
+            // CompileMode::Bench is only used to inform filter_default_targets
+            // which command is being used (`cargo bench`). Afterwards, tests
+            // and benches are treated identically. Switching the mode allows
+            // de-duplication of units that are essentially identical.  For
+            // example, `cargo build --all-targets --release` creates the units
+            // (lib profile:bench, mode:test) and (lib profile:bench, mode:bench)
+            // and since these are the same, we want them to be de-duped in
+            // `unit_dependencies`.
+            CompileMode::Bench => CompileMode::Test,
             _ => target_mode,
         };
         // Plugins or proc-macro should be built for the host.
@@ -547,17 +564,6 @@
             target_mode,
             build_config.release,
         );
-        // Once the profile has been selected for benchmarks, we don't need to
-        // distinguish between benches and tests. Switching the mode allows
-        // de-duplication of units that are essentially identical.  For
-        // example, `cargo build --all-targets --release` creates the units
-        // (lib profile:bench, mode:test) and (lib profile:bench, mode:bench)
-        // and since these are the same, we want them to be de-duped in
-        // `unit_dependencies`.
-        let target_mode = match target_mode {
-            CompileMode::Bench => CompileMode::Test,
-            _ => target_mode,
-        };
         Unit {
             pkg,
             target,
@@ -697,7 +703,13 @@
     // features available.
     let mut features_map = HashMap::new();
     let mut units = HashSet::new();
-    for Proposal { pkg, target, requires_features, mode} in proposals {
+    for Proposal {
+        pkg,
+        target,
+        requires_features,
+        mode,
+    } in proposals
+    {
         let unavailable_features = match target.required_features() {
             Some(rf) => {
                 let features = features_map
@@ -732,7 +744,7 @@
 
 fn resolve_all_features(
     resolve_with_overrides: &Resolve,
-    package_id: &PackageId,
+    package_id: PackageId,
 ) -> HashSet<String> {
     let mut features = resolve_with_overrides.features(package_id).clone();
 
@@ -845,7 +857,8 @@
                 pkg.targets()
                     .iter()
                     .filter(|target| is_expected_kind(target))
-            }).map(|target| (lev_distance(target_name, target.name()), target))
+            })
+            .map(|target| (lev_distance(target_name, target.name()), target))
             .filter(|&(d, _)| d < 4)
             .min_by_key(|t| t.0)
             .map(|t| t.1);
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_doc.rs cargo-0.33.0/src/cargo/ops/cargo_doc.rs
--- cargo-0.32.0/src/cargo/ops/cargo_doc.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_doc.rs	2019-01-02 21:49:06.000000000 +0000
@@ -31,7 +31,8 @@
     )?;
     let (packages, resolve_with_overrides) = resolve;
 
-    let ids = specs.iter()
+    let ids = specs
+        .iter()
         .map(|s| s.query(resolve_with_overrides.iter()))
         .collect::<CargoResult<Vec<_>>>()?;
     let pkgs = packages.get_many(ids)?;
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_fetch.rs cargo-0.33.0/src/cargo/ops/cargo_fetch.rs
--- cargo-0.32.0/src/cargo/ops/cargo_fetch.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_fetch.rs	2019-01-02 21:49:06.000000000 +0000
@@ -34,31 +34,31 @@
                 continue;
             }
 
-            to_download.push(id.clone());
-            let deps = resolve.deps(id)
+            to_download.push(id);
+            let deps = resolve
+                .deps(id)
                 .filter(|&(_id, deps)| {
-                    deps.iter()
-                        .any(|d| {
-                            // If no target was specified then all dependencies can
-                            // be fetched.
-                            let target = match options.target {
-                                Some(ref t) => t,
-                                None => return true,
-                            };
-                            // If this dependency is only available for certain
-                            // platforms, make sure we're only fetching it for that
-                            // platform.
-                            let platform = match d.platform() {
-                                Some(p) => p,
-                                None => return true,
-                            };
-                            platform.matches(target, target_info.cfg())
-                        })
+                    deps.iter().any(|d| {
+                        // If no target was specified then all dependencies can
+                        // be fetched.
+                        let target = match options.target {
+                            Some(ref t) => t,
+                            None => return true,
+                        };
+                        // If this dependency is only available for certain
+                        // platforms, make sure we're only fetching it for that
+                        // platform.
+                        let platform = match d.platform() {
+                            Some(p) => p,
+                            None => return true,
+                        };
+                        platform.matches(target, target_info.cfg())
+                    })
                 })
                 .map(|(id, _deps)| id);
             deps_to_fetch.extend(deps);
         }
-        packages.get_many(&to_download)?;
+        packages.get_many(to_download)?;
     }
 
     Ok((resolve, packages))
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_generate_lockfile.rs cargo-0.33.0/src/cargo/ops/cargo_generate_lockfile.rs
--- cargo-0.32.0/src/cargo/ops/cargo_generate_lockfile.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_generate_lockfile.rs	2019-01-02 21:49:06.000000000 +0000
@@ -73,13 +73,13 @@
                         } else {
                             precise.to_string()
                         };
-                        dep.source_id().clone().with_precise(Some(precise))
+                        dep.source_id().with_precise(Some(precise))
                     }
-                    None => dep.source_id().clone().with_precise(None),
+                    None => dep.source_id().with_precise(None),
                 });
             }
         }
-        registry.add_sources(&sources)?;
+        registry.add_sources(sources)?;
     }
 
     let resolve = ops::resolve_with_previous(
@@ -124,9 +124,9 @@
 
     fn fill_with_deps<'a>(
         resolve: &'a Resolve,
-        dep: &'a PackageId,
-        set: &mut HashSet<&'a PackageId>,
-        visited: &mut HashSet<&'a PackageId>,
+        dep: PackageId,
+        set: &mut HashSet<PackageId>,
+        visited: &mut HashSet<PackageId>,
     ) {
         if !visited.insert(dep) {
             return;
@@ -137,11 +137,11 @@
         }
     }
 
-    fn compare_dependency_graphs<'a>(
-        previous_resolve: &'a Resolve,
-        resolve: &'a Resolve,
-    ) -> Vec<(Vec<&'a PackageId>, Vec<&'a PackageId>)> {
-        fn key(dep: &PackageId) -> (&str, &SourceId) {
+    fn compare_dependency_graphs(
+        previous_resolve: &Resolve,
+        resolve: &Resolve,
+    ) -> Vec<(Vec<PackageId>, Vec<PackageId>)> {
+        fn key(dep: PackageId) -> (&'static str, SourceId) {
             (dep.name().as_str(), dep.source_id())
         }
 
@@ -149,7 +149,7 @@
         // more complicated because the equality for source ids does not take
         // precise versions into account (e.g. git shas), but we want to take
         // that into account here.
-        fn vec_subtract<'a>(a: &[&'a PackageId], b: &[&'a PackageId]) -> Vec<&'a PackageId> {
+        fn vec_subtract(a: &[PackageId], b: &[PackageId]) -> Vec<PackageId> {
             a.iter()
                 .filter(|a| {
                     // If this package id is not found in `b`, then it's definitely
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_install.rs cargo-0.33.0/src/cargo/ops/cargo_install.rs
--- cargo-0.32.0/src/cargo/ops/cargo_install.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_install.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,26 +1,26 @@
 use std::collections::btree_map::Entry;
 use std::collections::{BTreeMap, BTreeSet};
-use std::{env, fs};
 use std::io::prelude::*;
 use std::io::SeekFrom;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
+use std::{env, fs};
 
 use semver::{Version, VersionReq};
 use tempfile::Builder as TempFileBuilder;
 use toml;
 
+use core::compiler::{DefaultExecutor, Executor};
+use core::package::PackageSet;
+use core::source::SourceMap;
 use core::{Dependency, Edition, Package, PackageIdSpec, Source, SourceId};
 use core::{PackageId, Workspace};
-use core::source::SourceMap;
-use core::package::PackageSet;
-use core::compiler::{DefaultExecutor, Executor};
 use ops::{self, CompileFilter};
 use sources::{GitSource, PathSource, SourceConfigMap};
-use util::{internal, Config};
-use util::{FileLock, Filesystem};
 use util::errors::{CargoResult, CargoResultExt};
 use util::paths;
+use util::{internal, Config};
+use util::{FileLock, Filesystem};
 
 #[derive(Deserialize, Serialize)]
 #[serde(untagged)]
@@ -59,7 +59,7 @@
 pub fn install(
     root: Option<&str>,
     krates: Vec<&str>,
-    source_id: &SourceId,
+    source_id: SourceId,
     from_cwd: bool,
     vers: Option<&str>,
     opts: &ops::CompileOptions,
@@ -154,7 +154,7 @@
     root: &Filesystem,
     map: &SourceConfigMap,
     krate: Option<&str>,
-    source_id: &SourceId,
+    source_id: SourceId,
     from_cwd: bool,
     vers: Option<&str>,
     opts: &ops::CompileOptions,
@@ -182,7 +182,9 @@
                 src.path().display()
             )
         })?;
-        select_pkg(src, krate, vers, config, false, &mut |path| path.read_packages())?
+        select_pkg(src, krate, vers, config, false, &mut |path| {
+            path.read_packages()
+        })?
     } else {
         select_pkg(
             map.load(source_id)?,
@@ -255,20 +257,19 @@
     }
 
     let exec: Arc<Executor> = Arc::new(DefaultExecutor);
-    let compile =
-        ops::compile_ws(&ws, Some(source), opts, &exec).chain_err(|| {
-            if let Some(td) = td_opt.take() {
-                // preserve the temporary directory, so the user can inspect it
-                td.into_path();
-            }
+    let compile = ops::compile_ws(&ws, Some(source), opts, &exec).chain_err(|| {
+        if let Some(td) = td_opt.take() {
+            // preserve the temporary directory, so the user can inspect it
+            td.into_path();
+        }
 
-            format_err!(
-                "failed to compile `{}`, intermediate artifacts can be \
-                 found at `{}`",
-                pkg,
-                ws.target_dir().display()
-            )
-        })?;
+        format_err!(
+            "failed to compile `{}`, intermediate artifacts can be \
+             found at `{}`",
+            pkg,
+            ws.target_dir().display()
+        )
+    })?;
     let binaries: Vec<(&str, &Path)> = compile
         .binaries
         .iter()
@@ -358,25 +359,20 @@
         }
         // Failsafe to force replacing metadata for git packages
         // https://github.com/rust-lang/cargo/issues/4582
-        if let Some(set) = list.v1.remove(&pkg.package_id().clone()) {
-            list.v1.insert(pkg.package_id().clone(), set);
+        if let Some(set) = list.v1.remove(&pkg.package_id()) {
+            list.v1.insert(pkg.package_id(), set);
         }
         list.v1
-            .entry(pkg.package_id().clone())
+            .entry(pkg.package_id())
             .or_insert_with(BTreeSet::new)
             .insert(bin.to_string());
     }
 
     // Remove empty metadata lines.
-    let pkgs = list.v1
+    let pkgs = list
+        .v1
         .iter()
-        .filter_map(|(p, set)| {
-            if set.is_empty() {
-                Some(p.clone())
-            } else {
-                None
-            }
-        })
+        .filter_map(|(&p, set)| if set.is_empty() { Some(p) } else { None })
         .collect::<Vec<_>>();
     for p in pkgs.iter() {
         list.v1.remove(p);
@@ -385,7 +381,7 @@
     // If installation was successful record newly installed binaries.
     if result.is_ok() {
         list.v1
-            .entry(pkg.package_id().clone())
+            .entry(pkg.package_id())
             .or_insert_with(BTreeSet::new)
             .extend(to_install.iter().map(|s| s.to_string()));
     }
@@ -410,7 +406,7 @@
     Ok(())
 }
 
-fn path_source<'a>(source_id: &SourceId, config: &'a Config) -> CargoResult<PathSource<'a>> {
+fn path_source<'a>(source_id: SourceId, config: &'a Config) -> CargoResult<PathSource<'a>> {
     let path = source_id
         .url()
         .to_file_path()
@@ -439,7 +435,8 @@
                 Some(v) => {
                     // If the version begins with character <, >, =, ^, ~ parse it as a
                     // version range, otherwise parse it as a specific version
-                    let first = v.chars()
+                    let first = v
+                        .chars()
                         .nth(0)
                         .ok_or_else(|| format_err!("no version provided for the `--vers` flag"))?;
 
@@ -495,16 +492,13 @@
             } else {
                 vers
             };
-            let dep = Dependency::parse_no_deprecated(
-                name,
-                vers_spec,
-                source.source_id(),
-            )?;
+            let dep = Dependency::parse_no_deprecated(name, vers_spec, source.source_id())?;
             let deps = source.query_vec(&dep)?;
             let pkgid = match deps.iter().map(|p| p.package_id()).max() {
                 Some(pkgid) => pkgid,
                 None => {
-                    let vers_info = vers.map(|v| format!(" with version `{}`", v))
+                    let vers_info = vers
+                        .map(|v| format!(" with version `{}`", v))
                         .unwrap_or_default();
                     bail!(
                         "could not find `{}` in {}{}",
@@ -518,8 +512,8 @@
             let pkg = {
                 let mut map = SourceMap::new();
                 map.insert(Box::new(&mut source));
-                PackageSet::new(&[pkgid.clone()], map, config)?
-                    .get_one(&pkgid)?
+                PackageSet::new(&[pkgid], map, config)?
+                    .get_one(pkgid)?
                     .clone()
             };
             Ok((pkg, Box::new(source)))
@@ -617,14 +611,15 @@
         let name = format!("{}{}", name, env::consts::EXE_SUFFIX);
         if fs::metadata(dst.join(&name)).is_err() {
             None
-        } else if let Some((p, _)) = prev.v1.iter().find(|&(_, v)| v.contains(&name)) {
-            Some((name, Some(p.clone())))
+        } else if let Some((&p, _)) = prev.v1.iter().find(|&(_, v)| v.contains(&name)) {
+            Some((name, Some(p)))
         } else {
             Some((name, None))
         }
     };
     match *filter {
-        CompileFilter::Default { .. } => pkg.targets()
+        CompileFilter::Default { .. } => pkg
+            .targets()
             .iter()
             .filter(|t| t.is_bin())
             .filter_map(|t| check(t.name().to_string()))
@@ -671,7 +666,7 @@
             }),
         }
     })()
-        .chain_err(|| {
+    .chain_err(|| {
         format_err!(
             "failed to parse crate metadata at `{}`",
             file.path().to_string_lossy()
@@ -689,7 +684,7 @@
         file.write_all(data.as_bytes())?;
         Ok(())
     })()
-        .chain_err(|| {
+    .chain_err(|| {
         format_err!(
             "failed to write crate metadata at `{}`",
             file.path().to_string_lossy()
@@ -725,7 +720,7 @@
     let scheduled_error = if specs.len() == 1 {
         uninstall_one(&root, specs[0], bins, config)?;
         false
-    } else if specs.len() == 0 {
+    } else if specs.is_empty() {
         uninstall_cwd(&root, bins, config)?;
         false
     } else {
@@ -778,35 +773,32 @@
 ) -> CargoResult<()> {
     let crate_metadata = metadata(config, root)?;
     let metadata = read_crate_list(&crate_metadata)?;
-    let pkgid = PackageIdSpec::query_str(spec, metadata.v1.keys())?.clone();
-    uninstall_pkgid(crate_metadata, metadata, &pkgid, bins, config)
+    let pkgid = PackageIdSpec::query_str(spec, metadata.v1.keys().cloned())?;
+    uninstall_pkgid(&crate_metadata, metadata, pkgid, bins, config)
 }
 
-fn uninstall_cwd(
-    root: &Filesystem,
-    bins: &[String],
-    config: &Config,
-) -> CargoResult<()> {
+fn uninstall_cwd(root: &Filesystem, bins: &[String], config: &Config) -> CargoResult<()> {
     let crate_metadata = metadata(config, root)?;
     let metadata = read_crate_list(&crate_metadata)?;
     let source_id = SourceId::for_path(config.cwd())?;
-    let src = path_source(&source_id, config)?;
-    let (pkg, _source) =
-        select_pkg(src, None, None, config, true, &mut |path| path.read_packages())?;
+    let src = path_source(source_id, config)?;
+    let (pkg, _source) = select_pkg(src, None, None, config, true, &mut |path| {
+        path.read_packages()
+    })?;
     let pkgid = pkg.package_id();
-    uninstall_pkgid(crate_metadata, metadata, pkgid, bins, config)
+    uninstall_pkgid(&crate_metadata, metadata, pkgid, bins, config)
 }
 
 fn uninstall_pkgid(
-    crate_metadata: FileLock,
+    crate_metadata: &FileLock,
     mut metadata: CrateListingV1,
-    pkgid: &PackageId,
+    pkgid: PackageId,
     bins: &[String],
     config: &Config,
 ) -> CargoResult<()> {
     let mut to_remove = Vec::new();
     {
-        let mut installed = match metadata.v1.entry(pkgid.clone()) {
+        let mut installed = match metadata.v1.entry(pkgid) {
             Entry::Occupied(e) => e,
             Entry::Vacant(..) => bail!("package `{}` is not installed", pkgid),
         };
@@ -821,7 +813,8 @@
             }
         }
 
-        let bins = bins.iter()
+        let bins = bins
+            .iter()
             .map(|s| {
                 if s.ends_with(env::consts::EXE_SUFFIX) {
                     s.to_string()
@@ -865,7 +858,8 @@
 
 fn resolve_root(flag: Option<&str>, config: &Config) -> CargoResult<Filesystem> {
     let config_root = config.get_path("install.root")?;
-    Ok(flag.map(PathBuf::from)
+    Ok(flag
+        .map(PathBuf::from)
         .or_else(|| env::var_os("CARGO_INSTALL_ROOT").map(PathBuf::from))
         .or_else(move || config_root.map(|v| v.val))
         .map(Filesystem::new)
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_new.rs cargo-0.33.0/src/cargo/ops/cargo_new.rs
--- cargo-0.32.0/src/cargo/ops/cargo_new.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_new.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,16 +1,16 @@
 use std::collections::BTreeMap;
 use std::env;
-use std::fs;
 use std::fmt;
+use std::fs;
 use std::path::{Path, PathBuf};
 
 use git2::Config as GitConfig;
 use git2::Repository as GitRepository;
 
 use core::{compiler, Workspace};
-use util::{internal, FossilRepo, GitRepo, HgRepo, PijulRepo, existing_vcs_repo};
-use util::{paths, Config};
 use util::errors::{CargoResult, CargoResultExt};
+use util::{existing_vcs_repo, internal, FossilRepo, GitRepo, HgRepo, PijulRepo};
+use util::{paths, Config};
 
 use toml;
 
@@ -51,7 +51,8 @@
         match *self {
             NewProjectKind::Bin => "binary (application)",
             NewProjectKind::Lib => "library",
-        }.fmt(f)
+        }
+        .fmt(f)
     }
 }
 
@@ -430,7 +431,8 @@
         "/target\n",
         "**/*.rs.bk\n",
         if !opts.bin { "Cargo.lock\n" } else { "" },
-    ].concat();
+    ]
+    .concat();
     // Mercurial glob ignores can't be rooted, so just sticking a 'syntax: glob' at the top of the
     // file will exclude too much. Instead, use regexp-based ignores. See 'hg help ignore' for
     // more.
@@ -438,7 +440,8 @@
         "^target/\n",
         "glob:*.rs.bk\n",
         if !opts.bin { "glob:Cargo.lock\n" } else { "" },
-    ].concat();
+    ]
+    .concat();
 
     let vcs = opts.version_control.unwrap_or_else(|| {
         let in_existing_vcs = existing_vcs_repo(path.parent().unwrap_or(path), config.cwd());
@@ -553,15 +556,15 @@
                 None => toml::Value::String("2018".to_string()),
             },
             match opts.registry {
-                Some(registry) => {
-                    format!("publish = {}\n",
-                        toml::Value::Array(vec!(toml::Value::String(registry.to_string())))
-                    )
-                }
+                Some(registry) => format!(
+                    "publish = {}\n",
+                    toml::Value::Array(vec!(toml::Value::String(registry.to_string())))
+                ),
                 None => "".to_string(),
-            }, 
+            },
             cargotoml_path_specifier
-        ).as_bytes(),
+        )
+        .as_bytes(),
     )?;
 
     // Create all specified source files
@@ -660,7 +663,17 @@
         .or_else(|| get_environment_variable(&email_variables[3..]));
 
     let name = name.trim().to_string();
-    let email = email.map(|s| s.trim().to_string());
+    let email = email.map(|s| {
+        let mut s = s.trim();
+
+        // In some cases emails will already have <> remove them since they
+        // are already added when needed.
+        if s.starts_with('<') && s.ends_with('>') {
+            s = &s[1..s.len() - 1];
+        }
+
+        s.to_string()
+    });
 
     Ok((name, email))
 }
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_output_metadata.rs cargo-0.33.0/src/cargo/ops/cargo_output_metadata.rs
--- cargo-0.32.0/src/cargo/ops/cargo_output_metadata.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_output_metadata.rs	2019-01-02 21:49:06.000000000 +0000
@@ -38,7 +38,7 @@
 fn metadata_no_deps(ws: &Workspace, _opt: &OutputMetadataOptions) -> CargoResult<ExportInfo> {
     Ok(ExportInfo {
         packages: ws.members().cloned().collect(),
-        workspace_members: ws.members().map(|pkg| pkg.package_id().clone()).collect(),
+        workspace_members: ws.members().map(|pkg| pkg.package_id()).collect(),
         resolve: None,
         target_directory: ws.target_dir().display().to_string(),
         version: VERSION,
@@ -58,15 +58,15 @@
     )?;
     let mut packages = HashMap::new();
     for pkg in package_set.get_many(package_set.package_ids())? {
-        packages.insert(pkg.package_id().clone(), pkg.clone());
+        packages.insert(pkg.package_id(), pkg.clone());
     }
 
     Ok(ExportInfo {
         packages: packages.values().map(|p| (*p).clone()).collect(),
-        workspace_members: ws.members().map(|pkg| pkg.package_id().clone()).collect(),
+        workspace_members: ws.members().map(|pkg| pkg.package_id()).collect(),
         resolve: Some(MetadataResolve {
             resolve: (packages, resolve),
-            root: ws.current_opt().map(|pkg| pkg.package_id().clone()),
+            root: ws.current_opt().map(|pkg| pkg.package_id()),
         }),
         target_directory: ws.target_dir().display().to_string(),
         version: VERSION,
@@ -94,40 +94,43 @@
     root: Option<PackageId>,
 }
 
-fn serialize_resolve<S>((packages, resolve): &(HashMap<PackageId, Package>, Resolve), s: S) -> Result<S::Ok, S::Error>
+fn serialize_resolve<S>(
+    (packages, resolve): &(HashMap<PackageId, Package>, Resolve),
+    s: S,
+) -> Result<S::Ok, S::Error>
 where
     S: ser::Serializer,
 {
     #[derive(Serialize)]
-    struct Dep<'a> {
+    struct Dep {
         name: Option<String>,
-        pkg: &'a PackageId
+        pkg: PackageId,
     }
 
     #[derive(Serialize)]
     struct Node<'a> {
-        id: &'a PackageId,
-        dependencies: Vec<&'a PackageId>,
-        deps: Vec<Dep<'a>>,
+        id: PackageId,
+        dependencies: Vec<PackageId>,
+        deps: Vec<Dep>,
         features: Vec<&'a str>,
     }
 
-    s.collect_seq(resolve
-        .iter()
-        .map(|id| Node {
+    s.collect_seq(resolve.iter().map(|id| {
+        Node {
             id,
             dependencies: resolve.deps(id).map(|(pkg, _deps)| pkg).collect(),
-            deps: resolve.deps(id)
+            deps: resolve
+                .deps(id)
                 .map(|(pkg, _deps)| {
-                    let name = packages.get(pkg)
+                    let name = packages
+                        .get(&pkg)
                         .and_then(|pkg| pkg.targets().iter().find(|t| t.is_lib()))
-                        .and_then(|lib_target| {
-                            resolve.extern_crate_name(id, pkg, lib_target).ok()
-                        });
+                        .and_then(|lib_target| resolve.extern_crate_name(id, pkg, lib_target).ok());
 
                     Dep { name, pkg }
                 })
                 .collect(),
             features: resolve.features_sorted(id),
-        }))
+        }
+    }))
 }
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_package.rs cargo-0.33.0/src/cargo/ops/cargo_package.rs
--- cargo-0.32.0/src/cargo/ops/cargo_package.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_package.rs	2019-01-02 21:49:06.000000000 +0000
@@ -10,13 +10,13 @@
 use serde_json;
 use tar::{Archive, Builder, EntryType, Header};
 
-use core::{Package, Source, SourceId, Workspace};
 use core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor};
+use core::{Package, Source, SourceId, Workspace};
+use ops;
 use sources::PathSource;
-use util::{self, internal, Config, FileLock};
-use util::paths;
 use util::errors::{CargoResult, CargoResultExt};
-use ops;
+use util::paths;
+use util::{self, internal, Config, FileLock};
 
 pub struct PackageOpts<'cfg> {
     pub config: &'cfg Config,
@@ -55,12 +55,17 @@
     // Check (git) repository state, getting the current commit hash if not
     // dirty. This will `bail!` if dirty, unless allow_dirty. Produce json
     // info for any sha1 (HEAD revision) returned.
-    let vcs_info = check_repo_state(pkg, &src_files, &config, opts.allow_dirty)?
-        .map(|h| json!({"git":{"sha1": h}}));
+    let vcs_info = if !opts.allow_dirty {
+        check_repo_state(pkg, &src_files, &config, opts.allow_dirty)?
+            .map(|h| json!({"git":{"sha1": h}}))
+    } else {
+        None
+    };
 
     if opts.list {
         let root = pkg.root();
-        let mut list: Vec<_> = src.list_files(pkg)?
+        let mut list: Vec<_> = src
+            .list_files(pkg)?
             .iter()
             .map(|file| util::without_prefix(file, root).unwrap().to_path_buf())
             .collect();
@@ -175,7 +180,7 @@
     p: &Package,
     src_files: &[PathBuf],
     config: &Config,
-    allow_dirty: bool
+    allow_dirty: bool,
 ) -> CargoResult<Option<String>> {
     if let Ok(repo) = git2::Repository::discover(p.root()) {
         if let Some(workdir) = repo.workdir() {
@@ -194,7 +199,8 @@
             config.shell().verbose(|shell| {
                 shell.warn(format!(
                     "No (git) Cargo.toml found at `{}` in workdir `{}`",
-                    path.display(), workdir.display()
+                    path.display(),
+                    workdir.display()
                 ))
             })?;
         }
@@ -212,7 +218,7 @@
         p: &Package,
         src_files: &[PathBuf],
         repo: &git2::Repository,
-        allow_dirty: bool
+        allow_dirty: bool,
     ) -> CargoResult<Option<String>> {
         let workdir = repo.workdir().unwrap();
         let dirty = src_files
@@ -256,12 +262,15 @@
 fn check_vcs_file_collision(pkg: &Package, src_files: &[PathBuf]) -> CargoResult<()> {
     let root = pkg.root();
     let vcs_info_path = Path::new(VCS_INFO_FILE);
-    let collision = src_files.iter().find(|&p| {
-        util::without_prefix(&p, root).unwrap() == vcs_info_path
-    });
+    let collision = src_files
+        .iter()
+        .find(|&p| util::without_prefix(&p, root).unwrap() == vcs_info_path);
     if collision.is_some() {
-        bail!("Invalid inclusion of reserved file name \
-               {} in package source", VCS_INFO_FILE);
+        bail!(
+            "Invalid inclusion of reserved file name \
+             {} in package source",
+            VCS_INFO_FILE
+        );
     }
     Ok(())
 }
@@ -271,7 +280,7 @@
     src_files: &[PathBuf],
     vcs_info: Option<&serde_json::Value>,
     dst: &File,
-    filename: &str
+    filename: &str,
 ) -> CargoResult<()> {
     // Prepare the encoder and its header
     let filename = Path::new(filename);
@@ -325,7 +334,8 @@
             .chain_err(|| format!("failed to add to archive: `{}`", relative))?;
         let mut file = File::open(file)
             .chain_err(|| format!("failed to open for archiving: `{}`", file.display()))?;
-        let metadata = file.metadata()
+        let metadata = file
+            .metadata()
             .chain_err(|| format!("could not learn metadata for: `{}`", relative))?;
         header.set_metadata(&metadata);
 
@@ -367,9 +377,9 @@
             fnd
         );
         let mut header = Header::new_ustar();
-        header.set_path(&path).chain_err(|| {
-            format!("failed to add to archive: `{}`", fnd)
-        })?;
+        header
+            .set_path(&path)
+            .chain_err(|| format!("failed to add to archive: `{}`", fnd))?;
         let json = format!("{}\n", serde_json::to_string_pretty(json)?);
         let mut header = Header::new_ustar();
         header.set_path(&path)?;
@@ -377,9 +387,8 @@
         header.set_mode(0o644);
         header.set_size(json.len() as u64);
         header.set_cksum();
-        ar.append(&header, json.as_bytes()).chain_err(|| {
-            internal(format!("could not archive source file `{}`", fnd))
-        })?;
+        ar.append(&header, json.as_bytes())
+            .chain_err(|| internal(format!("could not archive source file `{}`", fnd)))?;
     }
 
     if include_lockfile(pkg) {
@@ -412,18 +421,22 @@
     config.shell().status("Verifying", pkg)?;
 
     let f = GzDecoder::new(tar.file());
-    let dst = tar.parent()
+    let dst = tar
+        .parent()
         .join(&format!("{}-{}", pkg.name(), pkg.version()));
     if dst.exists() {
         paths::remove_dir_all(&dst)?;
     }
     let mut archive = Archive::new(f);
+    // We don't need to set the Modified Time, as it's not relevant to verification
+    // and it errors on filesystems that don't support setting a modified timestamp
+    archive.set_preserve_mtime(false);
     archive.unpack(dst.parent().unwrap())?;
 
     // Manufacture an ephemeral workspace to ensure that even if the top-level
     // package has a workspace we can still build our new crate.
     let id = SourceId::for_path(&dst)?;
-    let mut src = PathSource::new(&dst, &id, ws.config());
+    let mut src = PathSource::new(&dst, id, ws.config());
     let new_pkg = src.root_package()?;
     let pkg_fingerprint = src.last_modified_file(&new_pkg)?;
     let ws = Workspace::ephemeral(new_pkg, config, None, true)?;
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_read_manifest.rs cargo-0.33.0/src/cargo/ops/cargo_read_manifest.rs
--- cargo-0.32.0/src/cargo/ops/cargo_read_manifest.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_read_manifest.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,14 +4,14 @@
 use std::path::{Path, PathBuf};
 
 use core::{EitherManifest, Package, PackageId, SourceId};
-use util::{self, Config};
 use util::errors::{CargoError, CargoResult};
 use util::important_paths::find_project_manifest_exact;
 use util::toml::read_manifest;
+use util::{self, Config};
 
 pub fn read_package(
     path: &Path,
-    source_id: &SourceId,
+    source_id: SourceId,
     config: &Config,
 ) -> CargoResult<(Package, Vec<PathBuf>)> {
     trace!(
@@ -34,7 +34,7 @@
 
 pub fn read_packages(
     path: &Path,
-    source_id: &SourceId,
+    source_id: SourceId,
     config: &Config,
 ) -> CargoResult<Vec<Package>> {
     let mut all_packages = HashMap::new();
@@ -129,7 +129,7 @@
 fn read_nested_packages(
     path: &Path,
     all_packages: &mut HashMap<PackageId, Package>,
-    source_id: &SourceId,
+    source_id: SourceId,
     config: &Config,
     visited: &mut HashSet<PathBuf>,
     errors: &mut Vec<CargoError>,
@@ -165,7 +165,7 @@
     };
     let pkg = Package::new(manifest, &manifest_path);
 
-    let pkg_id = pkg.package_id().clone();
+    let pkg_id = pkg.package_id();
     use std::collections::hash_map::Entry;
     match all_packages.entry(pkg_id) {
         Entry::Vacant(v) => {
diff -Nru cargo-0.32.0/src/cargo/ops/cargo_test.rs cargo-0.33.0/src/cargo/ops/cargo_test.rs
--- cargo-0.32.0/src/cargo/ops/cargo_test.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/cargo_test.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,10 +1,10 @@
 use std::ffi::OsString;
 
-use ops;
 use core::compiler::{Compilation, Doctest};
-use util::{self, CargoTestError, ProcessError, Test};
-use util::errors::CargoResult;
 use core::Workspace;
+use ops;
+use util::errors::CargoResult;
+use util::{self, CargoTestError, ProcessError, Test};
 
 pub struct TestOptions<'a> {
     pub compile_opts: ops::CompileOptions<'a>,
@@ -172,7 +172,7 @@
             p.arg("--test-args").arg(arg);
         }
 
-        if let Some(cfgs) = compilation.cfgs.get(package.package_id()) {
+        if let Some(cfgs) = compilation.cfgs.get(&package.package_id()) {
             for cfg in cfgs.iter() {
                 p.arg("--cfg").arg(cfg);
             }
@@ -185,7 +185,7 @@
             p.arg("--extern").arg(&arg);
         }
 
-        if let Some(flags) = compilation.rustdocflags.get(package.package_id()) {
+        if let Some(flags) = compilation.rustdocflags.get(&package.package_id()) {
             p.args(flags);
         }
 
diff -Nru cargo-0.32.0/src/cargo/ops/fix.rs cargo-0.33.0/src/cargo/ops/fix.rs
--- cargo-0.32.0/src/cargo/ops/fix.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/fix.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,4 +1,4 @@
-use std::collections::{HashMap, HashSet, BTreeSet};
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::env;
 use std::ffi::OsString;
 use std::fs;
@@ -14,10 +14,10 @@
 
 use core::Workspace;
 use ops::{self, CompileOptions};
-use util::errors::CargoResult;
-use util::{LockServer, LockServerClient, existing_vcs_repo};
 use util::diagnostic_server::{Message, RustfixDiagnosticServer};
+use util::errors::CargoResult;
 use util::paths;
+use util::{existing_vcs_repo, LockServer, LockServerClient};
 
 const FIX_ENV: &str = "__CARGO_FIX_PLZ";
 const BROKEN_CODE_ENV: &str = "__CARGO_FIX_BROKEN_CODE";
@@ -43,37 +43,46 @@
     // Spin up our lock server which our subprocesses will use to synchronize
     // fixes.
     let lock_server = LockServer::new()?;
-    opts.compile_opts.build_config.extra_rustc_env.push((
-        FIX_ENV.to_string(),
-        lock_server.addr().to_string(),
-    ));
+    opts.compile_opts
+        .build_config
+        .extra_rustc_env
+        .push((FIX_ENV.to_string(), lock_server.addr().to_string()));
     let _started = lock_server.start()?;
 
     opts.compile_opts.build_config.force_rebuild = true;
 
     if opts.broken_code {
         let key = BROKEN_CODE_ENV.to_string();
-        opts.compile_opts.build_config.extra_rustc_env.push((key, "1".to_string()));
+        opts.compile_opts
+            .build_config
+            .extra_rustc_env
+            .push((key, "1".to_string()));
     }
 
     if opts.edition {
         let key = EDITION_ENV.to_string();
-        opts.compile_opts.build_config.extra_rustc_env.push((key, "1".to_string()));
+        opts.compile_opts
+            .build_config
+            .extra_rustc_env
+            .push((key, "1".to_string()));
     } else if let Some(edition) = opts.prepare_for {
-        opts.compile_opts.build_config.extra_rustc_env.push((
-            PREPARE_FOR_ENV.to_string(),
-            edition.to_string(),
-        ));
+        opts.compile_opts
+            .build_config
+            .extra_rustc_env
+            .push((PREPARE_FOR_ENV.to_string(), edition.to_string()));
     }
     if opts.idioms {
-        opts.compile_opts.build_config.extra_rustc_env.push((
-            IDIOMS_ENV.to_string(),
-            "1".to_string(),
-        ));
+        opts.compile_opts
+            .build_config
+            .extra_rustc_env
+            .push((IDIOMS_ENV.to_string(), "1".to_string()));
     }
     opts.compile_opts.build_config.cargo_as_rustc_wrapper = true;
-    *opts.compile_opts.build_config.rustfix_diagnostic_server.borrow_mut() =
-        Some(RustfixDiagnosticServer::new()?);
+    *opts
+        .compile_opts
+        .build_config
+        .rustfix_diagnostic_server
+        .borrow_mut() = Some(RustfixDiagnosticServer::new()?);
 
     ops::compile(ws, &opts.compile_opts)?;
     Ok(())
@@ -81,17 +90,19 @@
 
 fn check_version_control(opts: &FixOptions) -> CargoResult<()> {
     if opts.allow_no_vcs {
-        return Ok(())
+        return Ok(());
     }
     let config = opts.compile_opts.config;
     if !existing_vcs_repo(config.cwd(), config.cwd()) {
-        bail!("no VCS found for this package and `cargo fix` can potentially \
-               perform destructive changes; if you'd like to suppress this \
-               error pass `--allow-no-vcs`")
+        bail!(
+            "no VCS found for this package and `cargo fix` can potentially \
+             perform destructive changes; if you'd like to suppress this \
+             error pass `--allow-no-vcs`"
+        )
     }
 
     if opts.allow_dirty && opts.allow_staged {
-        return Ok(())
+        return Ok(());
     }
 
     let mut dirty_files = Vec::new();
@@ -103,26 +114,27 @@
             if let Some(path) = status.path() {
                 match status.status() {
                     git2::Status::CURRENT => (),
-                    git2::Status::INDEX_NEW |
-                    git2::Status::INDEX_MODIFIED |
-                    git2::Status::INDEX_DELETED |
-                    git2::Status::INDEX_RENAMED |
-                    git2::Status::INDEX_TYPECHANGE =>
+                    git2::Status::INDEX_NEW
+                    | git2::Status::INDEX_MODIFIED
+                    | git2::Status::INDEX_DELETED
+                    | git2::Status::INDEX_RENAMED
+                    | git2::Status::INDEX_TYPECHANGE => {
                         if !opts.allow_staged {
                             staged_files.push(path.to_string())
-                        },
-                    _ =>
+                        }
+                    }
+                    _ => {
                         if !opts.allow_dirty {
                             dirty_files.push(path.to_string())
-                        },
+                        }
+                    }
                 };
             }
-
         }
     }
 
     if dirty_files.is_empty() && staged_files.is_empty() {
-        return Ok(())
+        return Ok(());
     }
 
     let mut files_list = String::new();
@@ -137,13 +149,16 @@
         files_list.push_str(" (staged)\n");
     }
 
-    bail!("the working directory of this package has uncommitted changes, and \
-           `cargo fix` can potentially perform destructive changes; if you'd \
-           like to suppress this error pass `--allow-dirty`, `--allow-staged`, \
-           or commit the changes to these files:\n\
-           \n\
-           {}\n\
-          ", files_list);
+    bail!(
+        "the working directory of this package has uncommitted changes, and \
+         `cargo fix` can potentially perform destructive changes; if you'd \
+         like to suppress this error pass `--allow-dirty`, `--allow-staged`, \
+         or commit the changes to these files:\n\
+         \n\
+         {}\n\
+         ",
+        files_list
+    );
 }
 
 pub fn fix_maybe_exec_rustc() -> CargoResult<bool> {
@@ -190,7 +205,8 @@
                 Message::Fixing {
                     file: path.clone(),
                     fixes: file.fixes_applied,
-                }.post()?;
+                }
+                .post()?;
             }
         }
 
@@ -231,9 +247,12 @@
     original_code: String,
 }
 
-fn rustfix_crate(lock_addr: &str, rustc: &Path, filename: &Path, args: &FixArgs)
-    -> Result<FixedCrate, Error>
-{
+fn rustfix_crate(
+    lock_addr: &str,
+    rustc: &Path,
+    filename: &Path,
+    args: &FixArgs,
+) -> Result<FixedCrate, Error> {
     args.verify_not_preparing_for_enabled_edition()?;
 
     // First up we want to make sure that each crate is only checked by one
@@ -293,7 +312,7 @@
         let mut progress_yet_to_be_made = false;
         for (path, file) in fixes.files.iter_mut() {
             if file.errors_applying_fixes.is_empty() {
-                continue
+                continue;
             }
             // If anything was successfully fixed *and* there's at least one
             // error, then assume the error was spurious and we'll try again on
@@ -303,7 +322,7 @@
             }
         }
         if !progress_yet_to_be_made {
-            break
+            break;
         }
     }
 
@@ -314,7 +333,8 @@
             Message::ReplaceFailed {
                 file: path.clone(),
                 message: error,
-            }.post()?;
+            }
+            .post()?;
         }
     }
 
@@ -325,9 +345,12 @@
 ///
 /// This will fill in the `fixes` map with original code, suggestions applied,
 /// and any errors encountered while fixing files.
-fn rustfix_and_fix(fixes: &mut FixedCrate, rustc: &Path, filename: &Path, args: &FixArgs)
-    -> Result<(), Error>
-{
+fn rustfix_and_fix(
+    fixes: &mut FixedCrate,
+    rustc: &Path,
+    filename: &Path,
+    args: &FixArgs,
+) -> Result<(), Error> {
     // If not empty, filter by these lints
     //
     // TODO: Implement a way to specify this
@@ -336,7 +359,8 @@
     let mut cmd = Command::new(rustc);
     cmd.arg("--error-format=json");
     args.apply(&mut cmd);
-    let output = cmd.output()
+    let output = cmd
+        .output()
         .with_context(|_| format!("failed to execute `{}`", rustc.display()))?;
 
     // If rustc didn't succeed for whatever reasons then we're very likely to be
@@ -361,13 +385,12 @@
     // indicating fixes that we can apply.
     let stderr = str::from_utf8(&output.stderr).context("failed to parse rustc stderr as utf-8")?;
 
-    let suggestions = stderr.lines()
+    let suggestions = stderr
+        .lines()
         .filter(|x| !x.is_empty())
         .inspect(|y| trace!("line: {}", y))
-
         // Parse each line of stderr ignoring errors as they may not all be json
         .filter_map(|line| serde_json::from_str::<Diagnostic>(line).ok())
-
         // From each diagnostic try to extract suggestions from rustc
         .filter_map(|diag| rustfix::collect_suggestions(&diag, &only, fix_mode));
 
@@ -426,13 +449,13 @@
         // code, so save it. If the file already exists then the original code
         // doesn't need to be updated as we've just read an interim state with
         // some fixes but perhaps not all.
-        let fixed_file = fixes.files.entry(file.clone())
-            .or_insert_with(|| {
-                FixedFile {
-                    errors_applying_fixes: Vec::new(),
-                    fixes_applied: 0,
-                    original_code: code.clone(),
-                }
+        let fixed_file = fixes
+            .files
+            .entry(file.clone())
+            .or_insert_with(|| FixedFile {
+                errors_applying_fixes: Vec::new(),
+                fixes_applied: 0,
+                original_code: code.clone(),
             });
         let mut fixed = CodeFix::new(&code);
 
@@ -446,8 +469,7 @@
             }
         }
         let new_code = fixed.finish()?;
-        fs::write(&file, new_code)
-            .with_context(|_| format!("failed to write file `{}`", file))?;
+        fs::write(&file, new_code).with_context(|_| format!("failed to write file `{}`", file))?;
     }
 
     Ok(())
@@ -525,17 +547,15 @@
         let mut ret = FixArgs::default();
         for arg in env::args_os().skip(1) {
             let path = PathBuf::from(arg);
-            if path.extension().and_then(|s| s.to_str()) == Some("rs") {
-                if path.exists() {
-                    ret.file = Some(path);
-                    continue
-                }
+            if path.extension().and_then(|s| s.to_str()) == Some("rs") && path.exists() {
+                ret.file = Some(path);
+                continue;
             }
             if let Some(s) = path.to_str() {
                 let prefix = "--edition=";
                 if s.starts_with(prefix) {
                     ret.enabled_edition = Some(s[prefix.len()..].to_string());
-                    continue
+                    continue;
                 }
             }
             ret.other.push(path.into());
@@ -554,12 +574,11 @@
         if let Some(path) = &self.file {
             cmd.arg(path);
         }
-        cmd.args(&self.other)
-            .arg("--cap-lints=warn");
+        cmd.args(&self.other).arg("--cap-lints=warn");
         if let Some(edition) = &self.enabled_edition {
             cmd.arg("--edition").arg(edition);
-            if self.idioms && self.primary_package {
-                if edition == "2018" { cmd.arg("-Wrust-2018-idioms"); }
+            if self.idioms && self.primary_package && edition == "2018" {
+                cmd.arg("-Wrust-2018-idioms");
             }
         }
         if self.primary_package {
@@ -586,7 +605,7 @@
             None => return Ok(()),
         };
         if edition != enabled {
-            return Ok(())
+            return Ok(());
         }
         let path = match &self.file {
             Some(s) => s,
@@ -596,7 +615,8 @@
         Message::EditionAlreadyEnabled {
             file: path.display().to_string(),
             edition: edition.to_string(),
-        }.post()?;
+        }
+        .post()?;
 
         process::exit(1);
     }
diff -Nru cargo-0.32.0/src/cargo/ops/lockfile.rs cargo-0.33.0/src/cargo/ops/lockfile.rs
--- cargo-0.32.0/src/cargo/ops/lockfile.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/lockfile.rs	2019-01-02 21:49:06.000000000 +0000
@@ -20,12 +20,12 @@
     f.read_to_string(&mut s)
         .chain_err(|| format!("failed to read file: {}", f.path().display()))?;
 
-    let resolve =
-        (|| -> CargoResult<Option<Resolve>> {
-            let resolve: toml::Value = cargo_toml::parse(&s, f.path(), ws.config())?;
-            let v: resolver::EncodableResolve = resolve.try_into()?;
-            Ok(Some(v.into_resolve(ws)?))
-        })().chain_err(|| format!("failed to parse lock file at: {}", f.path().display()))?;
+    let resolve = (|| -> CargoResult<Option<Resolve>> {
+        let resolve: toml::Value = cargo_toml::parse(&s, f.path(), ws.config())?;
+        let v: resolver::EncodableResolve = resolve.try_into()?;
+        Ok(Some(v.into_resolve(ws)?))
+    })()
+    .chain_err(|| format!("failed to parse lock file at: {}", f.path().display()))?;
     Ok(resolve)
 }
 
@@ -47,7 +47,7 @@
     // This is in preparation for marking it as generated
     // https://github.com/rust-lang/cargo/issues/6180
     if let Ok(orig) = &orig {
-        for line in orig.lines().take_while(|line| line.starts_with("#")) {
+        for line in orig.lines().take_while(|line| line.starts_with('#')) {
             out.push_str(line);
             out.push_str("\n");
         }
diff -Nru cargo-0.32.0/src/cargo/ops/registry.rs cargo-0.33.0/src/cargo/ops/registry.rs
--- cargo-0.32.0/src/cargo/ops/registry.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/registry.rs	2019-01-02 21:49:06.000000000 +0000
@@ -5,9 +5,9 @@
 use std::time::Duration;
 use std::{cmp, env};
 
-use log::Level;
-use curl::easy::{Easy, SslOpt, InfoType};
+use curl::easy::{Easy, InfoType, SslOpt};
 use git2;
+use log::Level;
 use registry::{NewCrate, NewCrateDependency, Registry};
 
 use url::percent_encoding::{percent_encode, QUERY_ENCODE_SET};
@@ -68,7 +68,7 @@
         opts.index.clone(),
         opts.registry.clone(),
     )?;
-    verify_dependencies(pkg, &reg_id)?;
+    verify_dependencies(pkg, reg_id)?;
 
     // Prepare a tarball, with a non-surpressable warning if metadata
     // is missing since this is being put online.
@@ -84,7 +84,8 @@
             jobs: opts.jobs,
             registry: opts.registry.clone(),
         },
-    )?.unwrap();
+    )?
+    .unwrap();
 
     // Upload said tarball to the specified destination
     opts.config
@@ -95,14 +96,14 @@
         pkg,
         tarball.file(),
         &mut registry,
-        &reg_id,
+        reg_id,
         opts.dry_run,
     )?;
 
     Ok(())
 }
 
-fn verify_dependencies(pkg: &Package, registry_src: &SourceId) -> CargoResult<()> {
+fn verify_dependencies(pkg: &Package, registry_src: SourceId) -> CargoResult<()> {
     for dep in pkg.dependencies().iter() {
         if dep.source_id().is_path() {
             if !dep.specified_req() {
@@ -148,10 +149,11 @@
     pkg: &Package,
     tarball: &File,
     registry: &mut Registry,
-    registry_id: &SourceId,
+    registry_id: SourceId,
     dry_run: bool,
 ) -> CargoResult<()> {
-    let deps = pkg.dependencies()
+    let deps = pkg
+        .dependencies()
         .iter()
         .map(|dep| {
             // If the dependency is from a different registry, then include the
@@ -177,7 +179,8 @@
                     Kind::Normal => "normal",
                     Kind::Build => "build",
                     Kind::Development => "dev",
-                }.to_string(),
+                }
+                .to_string(),
                 registry: dep_registry,
                 explicit_name_in_toml: dep.explicit_name_in_toml().map(|s| s.to_string()),
             })
@@ -276,6 +279,12 @@
                 config.shell().warn(&msg)?;
             }
 
+            if !warnings.other.is_empty() {
+                for msg in warnings.other {
+                    config.shell().warn(&msg)?;
+                }
+            }
+
             Ok(())
         }
         Err(e) => Err(e),
@@ -319,7 +328,7 @@
     let token = token.or(token_config);
     let sid = get_source_id(config, index_config.or(index), registry)?;
     let api_host = {
-        let mut src = RegistrySource::remote(&sid, config);
+        let mut src = RegistrySource::remote(sid, config);
         src.update()
             .chain_err(|| format!("failed to update {}", sid))?;
         (src.config()?).unwrap().api.unwrap()
@@ -395,8 +404,7 @@
                 InfoType::HeaderOut => (">", Level::Debug),
                 InfoType::DataIn => ("{", Level::Trace),
                 InfoType::DataOut => ("}", Level::Trace),
-                InfoType::SslDataIn |
-                InfoType::SslDataOut => return,
+                InfoType::SslDataIn | InfoType::SslDataOut => return,
                 _ => return,
             };
             match str::from_utf8(data) {
@@ -406,7 +414,12 @@
                     }
                 }
                 Err(_) => {
-                    log!(level, "http-debug: {} ({} bytes of data)", prefix, data.len());
+                    log!(
+                        level,
+                        "http-debug: {} ({} bytes of data)",
+                        prefix,
+                        data.len()
+                    );
                 }
             }
         })?;
@@ -423,9 +436,11 @@
 
 impl HttpTimeout {
     pub fn new(config: &Config) -> CargoResult<HttpTimeout> {
-        let low_speed_limit = config.get::<Option<u32>>("http.low-speed-limit")?
+        let low_speed_limit = config
+            .get::<Option<u32>>("http.low-speed-limit")?
             .unwrap_or(10);
-        let seconds = config.get::<Option<u64>>("http.timeout")?
+        let seconds = config
+            .get::<Option<u64>>("http.timeout")?
             .or_else(|| env::var("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok()))
             .unwrap_or(30);
         Ok(HttpTimeout {
@@ -617,8 +632,8 @@
         (_, Some(i)) => SourceId::for_registry(&i.to_url()?),
         _ => {
             let map = SourceConfigMap::new(config)?;
-            let src = map.load(&SourceId::crates_io(config)?)?;
-            Ok(src.replaced_source_id().clone())
+            let src = map.load(SourceId::crates_io(config)?)?;
+            Ok(src.replaced_source_id())
         }
     }
 }
@@ -644,7 +659,7 @@
 
     let sid = get_source_id(config, index, reg)?;
 
-    let mut regsrc = RegistrySource::remote(&sid, config);
+    let mut regsrc = RegistrySource::remote(sid, config);
     let cfg = match regsrc.config() {
         Ok(c) => c,
         Err(_) => {
diff -Nru cargo-0.32.0/src/cargo/ops/resolve.rs cargo-0.33.0/src/cargo/ops/resolve.rs
--- cargo-0.32.0/src/cargo/ops/resolve.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/ops/resolve.rs	2019-01-02 21:49:06.000000000 +0000
@@ -133,12 +133,12 @@
 ///
 /// The previous resolve normally comes from a lockfile. This function does not
 /// read or write lockfiles from the filesystem.
-pub fn resolve_with_previous<'a, 'cfg>(
+pub fn resolve_with_previous<'cfg>(
     registry: &mut PackageRegistry<'cfg>,
     ws: &Workspace<'cfg>,
     method: Method,
-    previous: Option<&'a Resolve>,
-    to_avoid: Option<&HashSet<&'a PackageId>>,
+    previous: Option<&Resolve>,
+    to_avoid: Option<&HashSet<PackageId>>,
     specs: &[PackageIdSpec],
     register_patches: bool,
     warn: bool,
@@ -150,7 +150,7 @@
     //
     // TODO: This seems like a hokey reason to single out the registry as being
     //       different
-    let mut to_avoid_sources = HashSet::new();
+    let mut to_avoid_sources: HashSet<SourceId> = HashSet::new();
     if let Some(to_avoid) = to_avoid {
         to_avoid_sources.extend(
             to_avoid
@@ -160,11 +160,12 @@
         );
     }
 
-    let keep = |p: &&'a PackageId| {
-        !to_avoid_sources.contains(&p.source_id()) && match to_avoid {
-            Some(set) => !set.contains(p),
-            None => true,
-        }
+    let keep = |p: &PackageId| {
+        !to_avoid_sources.contains(&p.source_id())
+            && match to_avoid {
+                Some(set) => !set.contains(p),
+                None => true,
+            }
     };
 
     // In the case where a previous instance of resolve is available, we
@@ -195,9 +196,9 @@
             let patches = patches
                 .iter()
                 .map(|dep| {
-                    let unused = previous.unused_patches();
+                    let unused = previous.unused_patches().iter().cloned();
                     let candidates = previous.iter().chain(unused);
-                    match candidates.filter(keep).find(|id| dep.matches_id(id)) {
+                    match candidates.filter(keep).find(|&id| dep.matches_id(id)) {
                         Some(id) => {
                             let mut dep = dep.clone();
                             dep.lock_to(id);
@@ -214,7 +215,7 @@
     }
 
     for member in ws.members() {
-        registry.add_sources(&[member.package_id().source_id().clone()])?;
+        registry.add_sources(Some(member.package_id().source_id()))?;
     }
 
     let mut summaries = Vec::new();
@@ -308,7 +309,7 @@
         Some(r) => root_replace
             .iter()
             .map(|&(ref spec, ref dep)| {
-                for (key, val) in r.replacements().iter() {
+                for (&key, &val) in r.replacements().iter() {
                     if spec.matches(key) && dep.matches_id(val) && keep(&val) {
                         let mut dep = dep.clone();
                         dep.lock_to(val);
@@ -357,7 +358,7 @@
 
     for (path, definition) in paths {
         let id = SourceId::for_path(&path)?;
-        let mut source = PathSource::new_recursive(&path, &id, ws.config());
+        let mut source = PathSource::new_recursive(&path, id, ws.config());
         source.update().chain_err(|| {
             format!(
                 "failed to update path override `{}` \
@@ -375,7 +376,7 @@
     resolve: &Resolve,
     registry: PackageRegistry<'a>,
 ) -> CargoResult<PackageSet<'a>> {
-    let ids: Vec<PackageId> = resolve.iter().cloned().collect();
+    let ids: Vec<PackageId> = resolve.iter().collect();
     registry.get(&ids)
 }
 
@@ -395,13 +396,13 @@
 ///
 /// Note that this function, at the time of this writing, is basically the
 /// entire fix for #4127
-fn register_previous_locks<'a>(
+fn register_previous_locks(
     ws: &Workspace,
     registry: &mut PackageRegistry,
-    resolve: &'a Resolve,
-    keep: &Fn(&&'a PackageId) -> bool,
+    resolve: &Resolve,
+    keep: &Fn(&PackageId) -> bool,
 ) {
-    let path_pkg = |id: &SourceId| {
+    let path_pkg = |id: SourceId| {
         if !id.is_path() {
             return None;
         }
@@ -488,7 +489,7 @@
     let mut path_deps = ws.members().cloned().collect::<Vec<_>>();
     let mut visited = HashSet::new();
     while let Some(member) = path_deps.pop() {
-        if !visited.insert(member.package_id().clone()) {
+        if !visited.insert(member.package_id()) {
             continue;
         }
         for dep in member.dependencies() {
@@ -546,19 +547,15 @@
     // function let's put it to action. Take a look at the previous lockfile,
     // filter everything by this callback, and then shove everything else into
     // the registry as a locked dependency.
-    let keep = |id: &&'a PackageId| keep(id) && !avoid_locking.contains(id);
+    let keep = |id: &PackageId| keep(id) && !avoid_locking.contains(id);
 
     for node in resolve.iter().filter(keep) {
-        let deps = resolve
-            .deps_not_replaced(node)
-            .filter(keep)
-            .cloned()
-            .collect();
-        registry.register_lock(node.clone(), deps);
+        let deps = resolve.deps_not_replaced(node).filter(keep).collect();
+        registry.register_lock(node, deps);
     }
 
     /// recursively add `node` and all its transitive dependencies to `set`
-    fn add_deps<'a>(resolve: &'a Resolve, node: &'a PackageId, set: &mut HashSet<&'a PackageId>) {
+    fn add_deps(resolve: &Resolve, node: PackageId, set: &mut HashSet<PackageId>) {
         if !set.insert(node) {
             return;
         }
diff -Nru cargo-0.32.0/src/cargo/sources/config.rs cargo-0.33.0/src/cargo/sources/config.rs
--- cargo-0.32.0/src/cargo/sources/config.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/config.rs	2019-01-02 21:49:06.000000000 +0000
@@ -11,9 +11,9 @@
 
 use core::{GitReference, Source, SourceId};
 use sources::{ReplacedSource, CRATES_IO_REGISTRY};
-use util::{Config, ToUrl};
 use util::config::ConfigValue;
 use util::errors::{CargoResult, CargoResultExt};
+use util::{Config, ToUrl};
 
 #[derive(Clone)]
 pub struct SourceConfigMap<'cfg> {
@@ -72,9 +72,9 @@
         self.config
     }
 
-    pub fn load(&self, id: &SourceId) -> CargoResult<Box<Source + 'cfg>> {
+    pub fn load(&self, id: SourceId) -> CargoResult<Box<Source + 'cfg>> {
         debug!("loading: {}", id);
-        let mut name = match self.id2name.get(id) {
+        let mut name = match self.id2name.get(&id) {
             Some(name) => name,
             None => return Ok(id.load(self.config)?),
         };
@@ -98,7 +98,7 @@
                     name = s;
                     path = p;
                 }
-                None if *id == cfg.id => return Ok(id.load(self.config)?),
+                None if id == cfg.id => return Ok(id.load(self.config)?),
                 None => {
                     new_id = cfg.id.with_precise(id.precise().map(|s| s.to_string()));
                     break;
@@ -143,11 +143,11 @@
             );
         }
 
-        Ok(Box::new(ReplacedSource::new(id, &new_id, new_src)))
+        Ok(Box::new(ReplacedSource::new(id, new_id, new_src)))
     }
 
     fn add(&mut self, name: &str, cfg: SourceConfig) {
-        self.id2name.insert(cfg.id.clone(), name.to_string());
+        self.id2name.insert(cfg.id, name.to_string());
         self.cfgs.insert(name.to_string(), cfg);
     }
 
diff -Nru cargo-0.32.0/src/cargo/sources/directory.rs cargo-0.33.0/src/cargo/sources/directory.rs
--- cargo-0.32.0/src/cargo/sources/directory.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/directory.rs	2019-01-02 21:49:06.000000000 +0000
@@ -8,12 +8,12 @@
 
 use serde_json;
 
-use core::{Dependency, Package, PackageId, Source, SourceId, Summary};
 use core::source::MaybePackage;
+use core::{Dependency, Package, PackageId, Source, SourceId, Summary};
 use sources::PathSource;
-use util::{Config, Sha256};
 use util::errors::{CargoResult, CargoResultExt};
 use util::paths;
+use util::{Config, Sha256};
 
 pub struct DirectorySource<'cfg> {
     source_id: SourceId,
@@ -29,9 +29,9 @@
 }
 
 impl<'cfg> DirectorySource<'cfg> {
-    pub fn new(path: &Path, id: &SourceId, config: &'cfg Config) -> DirectorySource<'cfg> {
+    pub fn new(path: &Path, id: SourceId, config: &'cfg Config) -> DirectorySource<'cfg> {
         DirectorySource {
-            source_id: id.clone(),
+            source_id: id,
             root: path.to_path_buf(),
             config,
             packages: HashMap::new(),
@@ -71,8 +71,8 @@
         true
     }
 
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn source_id(&self) -> SourceId {
+        self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {
@@ -116,7 +116,7 @@
                 continue;
             }
 
-            let mut src = PathSource::new(&path, &self.source_id, self.config);
+            let mut src = PathSource::new(&path, self.source_id, self.config);
             src.update()?;
             let pkg = src.root_package()?;
 
@@ -145,22 +145,22 @@
             }
             manifest.set_summary(summary);
             let pkg = Package::new(manifest, pkg.manifest_path());
-            self.packages.insert(pkg.package_id().clone(), (pkg, cksum));
+            self.packages.insert(pkg.package_id(), (pkg, cksum));
         }
 
         Ok(())
     }
 
-    fn download(&mut self, id: &PackageId) -> CargoResult<MaybePackage> {
+    fn download(&mut self, id: PackageId) -> CargoResult<MaybePackage> {
         self.packages
-            .get(id)
+            .get(&id)
             .map(|p| &p.0)
             .cloned()
             .map(MaybePackage::Ready)
             .ok_or_else(|| format_err!("failed to find package with id: {}", id))
     }
 
-    fn finish_download(&mut self, _id: &PackageId, _data: Vec<u8>) -> CargoResult<Package> {
+    fn finish_download(&mut self, _id: PackageId, _data: Vec<u8>) -> CargoResult<Package> {
         panic!("no downloads to do")
     }
 
@@ -168,8 +168,8 @@
         Ok(pkg.package_id().version().to_string())
     }
 
-    fn verify(&self, id: &PackageId) -> CargoResult<()> {
-        let (pkg, cksum) = match self.packages.get(id) {
+    fn verify(&self, id: PackageId) -> CargoResult<()> {
+        let (pkg, cksum) = match self.packages.get(&id) {
             Some(&(ref pkg, ref cksum)) => (pkg, cksum),
             None => bail!("failed to find entry for `{}` in directory source", id),
         };
@@ -188,7 +188,7 @@
                     }
                 }
             })()
-                .chain_err(|| format!("failed to calculate checksum of: {}", file.display()))?;
+            .chain_err(|| format!("failed to calculate checksum of: {}", file.display()))?;
 
             let actual = hex::encode(h.finish());
             if &*actual != cksum {
diff -Nru cargo-0.32.0/src/cargo/sources/git/source.rs cargo-0.33.0/src/cargo/sources/git/source.rs
--- cargo-0.32.0/src/cargo/sources/git/source.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/git/source.rs	2019-01-02 21:49:06.000000000 +0000
@@ -2,14 +2,14 @@
 
 use url::Url;
 
-use core::source::{Source, SourceId, MaybePackage};
+use core::source::{MaybePackage, Source, SourceId};
 use core::GitReference;
 use core::{Dependency, Package, PackageId, Summary};
-use util::Config;
+use sources::git::utils::{GitRemote, GitRevision};
+use sources::PathSource;
 use util::errors::CargoResult;
 use util::hex::short_hash;
-use sources::PathSource;
-use sources::git::utils::{GitRemote, GitRevision};
+use util::Config;
 
 pub struct GitSource<'cfg> {
     remote: GitRemote,
@@ -22,7 +22,7 @@
 }
 
 impl<'cfg> GitSource<'cfg> {
-    pub fn new(source_id: &SourceId, config: &'cfg Config) -> CargoResult<GitSource<'cfg>> {
+    pub fn new(source_id: SourceId, config: &'cfg Config) -> CargoResult<GitSource<'cfg>> {
         assert!(source_id.is_git(), "id is not git, id={}", source_id);
 
         let remote = GitRemote::new(source_id.url());
@@ -36,7 +36,7 @@
         let source = GitSource {
             remote,
             reference,
-            source_id: source_id.clone(),
+            source_id,
             path_source: None,
             rev: None,
             ident,
@@ -60,7 +60,8 @@
 
 fn ident(url: &Url) -> CargoResult<String> {
     let url = canonicalize_url(url)?;
-    let ident = url.path_segments()
+    let ident = url
+        .path_segments()
         .and_then(|mut s| s.next_back())
         .unwrap_or("");
 
@@ -124,14 +125,16 @@
 
 impl<'cfg> Source for GitSource<'cfg> {
     fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        let src = self.path_source
+        let src = self
+            .path_source
             .as_mut()
             .expect("BUG: update() must be called before query()");
         src.query(dep, f)
     }
 
     fn fuzzy_query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        let src = self.path_source
+        let src = self
+            .path_source
             .as_mut()
             .expect("BUG: update() must be called before query()");
         src.fuzzy_query(dep, f)
@@ -145,8 +148,8 @@
         true
     }
 
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn source_id(&self) -> SourceId {
+        self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {
@@ -190,7 +193,8 @@
         // https://github.com/servo/servo/pull/14397
         let short_id = db.to_short_id(&actual_rev).unwrap();
 
-        let checkout_path = lock.parent()
+        let checkout_path = lock
+            .parent()
             .join("checkouts")
             .join(&self.ident)
             .join(short_id.as_str());
@@ -203,14 +207,14 @@
         db.copy_to(actual_rev.clone(), &checkout_path, self.config)?;
 
         let source_id = self.source_id.with_precise(Some(actual_rev.to_string()));
-        let path_source = PathSource::new_recursive(&checkout_path, &source_id, self.config);
+        let path_source = PathSource::new_recursive(&checkout_path, source_id, self.config);
 
         self.path_source = Some(path_source);
         self.rev = Some(actual_rev);
         self.path_source.as_mut().unwrap().update()
     }
 
-    fn download(&mut self, id: &PackageId) -> CargoResult<MaybePackage> {
+    fn download(&mut self, id: PackageId) -> CargoResult<MaybePackage> {
         trace!(
             "getting packages for package id `{}` from `{:?}`",
             id,
@@ -222,7 +226,7 @@
             .download(id)
     }
 
-    fn finish_download(&mut self, _id: &PackageId, _data: Vec<u8>) -> CargoResult<Package> {
+    fn finish_download(&mut self, _id: PackageId, _data: Vec<u8>) -> CargoResult<Package> {
         panic!("no download should have started")
     }
 
@@ -237,8 +241,8 @@
 
 #[cfg(test)]
 mod test {
-    use url::Url;
     use super::ident;
+    use url::Url;
     use util::ToUrl;
 
     #[test]
diff -Nru cargo-0.32.0/src/cargo/sources/git/utils.rs cargo-0.33.0/src/cargo/sources/git/utils.rs
--- cargo-0.32.0/src/cargo/sources/git/utils.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/git/utils.rs	2019-01-02 21:49:06.000000000 +0000
@@ -146,7 +146,7 @@
             paths::remove_dir_all(dst)?;
         }
         fs::create_dir_all(dst)?;
-        let mut repo = git2::Repository::init_bare(dst)?;
+        let mut repo = init(dst, true)?;
         fetch(
             &mut repo,
             &self.url,
@@ -385,7 +385,7 @@
                 Err(..) => {
                     let path = parent.workdir().unwrap().join(child.path());
                     let _ = paths::remove_dir_all(&path);
-                    git2::Repository::init(&path)?
+                    init(&path, false)?
                 }
             };
 
@@ -755,6 +755,7 @@
     cmd.arg("fetch")
         .arg("--tags") // fetch all tags
         .arg("--quiet")
+        .arg("--update-head-ok") // see discussion in #2078
         .arg(url.to_string())
         .arg(refspec)
         .cwd(repo.path());
@@ -833,7 +834,7 @@
     debug!("reinitializing git repo at {:?}", path);
     let tmp = path.join("tmp");
     let bare = !repo.path().ends_with(".git");
-    *repo = git2::Repository::init(&tmp)?;
+    *repo = init(&tmp, false)?;
     for entry in path.read_dir()? {
         let entry = entry?;
         if entry.file_name().to_str() == Some("tmp") {
@@ -842,15 +843,21 @@
         let path = entry.path();
         drop(paths::remove_file(&path).or_else(|_| paths::remove_dir_all(&path)));
     }
-    if bare {
-        *repo = git2::Repository::init_bare(path)?;
-    } else {
-        *repo = git2::Repository::init(path)?;
-    }
+    *repo = init(&path, bare)?;
     paths::remove_dir_all(&tmp)?;
     Ok(())
 }
 
+fn init(path: &Path, bare: bool) -> CargoResult<git2::Repository> {
+    let mut opts = git2::RepositoryInitOptions::new();
+    // Skip anyting related to templates, they just call all sorts of issues as
+    // we really don't want to use them yet they insist on being used. See #6240
+    // for an example issue that comes up.
+    opts.external_template(false);
+    opts.bare(bare);
+    Ok(git2::Repository::init_opts(&path, &opts)?)
+}
+
 /// Updating the index is done pretty regularly so we want it to be as fast as
 /// possible. For registries hosted on GitHub (like the crates.io index) there's
 /// a fast path available to use [1] to tell us that there's no updates to be
diff -Nru cargo-0.32.0/src/cargo/sources/path.rs cargo-0.33.0/src/cargo/sources/path.rs
--- cargo-0.32.0/src/cargo/sources/path.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/path.rs	2019-01-02 21:49:06.000000000 +0000
@@ -5,15 +5,15 @@
 use filetime::FileTime;
 use git2;
 use glob::Pattern;
-use ignore::Match;
 use ignore::gitignore::GitignoreBuilder;
+use ignore::Match;
 
-use core::{Dependency, Package, PackageId, Source, SourceId, Summary};
 use core::source::MaybePackage;
+use core::{Dependency, Package, PackageId, Source, SourceId, Summary};
 use ops;
-use util::{self, internal, CargoResult};
 use util::paths;
 use util::Config;
+use util::{self, internal, CargoResult};
 
 pub struct PathSource<'cfg> {
     source_id: SourceId,
@@ -29,9 +29,9 @@
     ///
     /// This source will only return the package at precisely the `path`
     /// specified, and it will be an error if there's not a package at `path`.
-    pub fn new(path: &Path, id: &SourceId, config: &'cfg Config) -> PathSource<'cfg> {
+    pub fn new(path: &Path, source_id: SourceId, config: &'cfg Config) -> PathSource<'cfg> {
         PathSource {
-            source_id: id.clone(),
+            source_id,
             path: path.to_path_buf(),
             updated: false,
             packages: Vec::new(),
@@ -48,7 +48,7 @@
     ///
     /// Note that this should be used with care and likely shouldn't be chosen
     /// by default!
-    pub fn new_recursive(root: &Path, id: &SourceId, config: &'cfg Config) -> PathSource<'cfg> {
+    pub fn new_recursive(root: &Path, id: SourceId, config: &'cfg Config) -> PathSource<'cfg> {
         PathSource {
             recursive: true,
             ..PathSource::new(root, id, config)
@@ -78,10 +78,10 @@
         if self.updated {
             Ok(self.packages.clone())
         } else if self.recursive {
-            ops::read_packages(&self.path, &self.source_id, self.config)
+            ops::read_packages(&self.path, self.source_id, self.config)
         } else {
             let path = self.path.join("Cargo.toml");
-            let (pkg, _) = ops::read_package(&path, &self.source_id, self.config)?;
+            let (pkg, _) = ops::read_package(&path, self.source_id, self.config)?;
             Ok(vec![pkg])
         }
     }
@@ -127,13 +127,15 @@
                 .map_err(|e| format_err!("could not parse glob pattern `{}`: {}", p, e))
         };
 
-        let glob_exclude = pkg.manifest()
+        let glob_exclude = pkg
+            .manifest()
             .exclude()
             .iter()
             .map(|p| glob_parse(p))
             .collect::<Result<Vec<_>, _>>()?;
 
-        let glob_include = pkg.manifest()
+        let glob_include = pkg
+            .manifest()
             .include()
             .iter()
             .map(|p| glob_parse(p))
@@ -302,7 +304,8 @@
     ) -> CargoResult<Vec<PathBuf>> {
         warn!("list_files_git {}", pkg.package_id());
         let index = repo.index()?;
-        let root = repo.workdir()
+        let root = repo
+            .workdir()
             .ok_or_else(|| internal("Can't list files on a bare repository."))?;
         let pkg_path = pkg.root();
 
@@ -374,7 +377,8 @@
             if is_dir.unwrap_or_else(|| file_path.is_dir()) {
                 warn!("  found submodule {}", file_path.display());
                 let rel = util::without_prefix(&file_path, root).unwrap();
-                let rel = rel.to_str()
+                let rel = rel
+                    .to_str()
                     .ok_or_else(|| format_err!("invalid utf-8 filename: {}", rel.display()))?;
                 // Git submodules are currently only named through `/` path
                 // separators, explicitly not `\` which windows uses. Who knew?
@@ -398,8 +402,8 @@
 
         #[cfg(unix)]
         fn join(path: &Path, data: &[u8]) -> CargoResult<PathBuf> {
-            use std::os::unix::prelude::*;
             use std::ffi::OsStr;
+            use std::os::unix::prelude::*;
             Ok(path.join(<OsStr as OsStrExt>::from_bytes(data)))
         }
         #[cfg(windows)]
@@ -527,8 +531,8 @@
         false
     }
 
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn source_id(&self) -> SourceId {
+        self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {
@@ -541,7 +545,7 @@
         Ok(())
     }
 
-    fn download(&mut self, id: &PackageId) -> CargoResult<MaybePackage> {
+    fn download(&mut self, id: PackageId) -> CargoResult<MaybePackage> {
         trace!("getting packages; id={}", id);
 
         let pkg = self.packages.iter().find(|pkg| pkg.package_id() == id);
@@ -550,7 +554,7 @@
             .ok_or_else(|| internal(format!("failed to find {} in path source", id)))
     }
 
-    fn finish_download(&mut self, _id: &PackageId, _data: Vec<u8>) -> CargoResult<Package> {
+    fn finish_download(&mut self, _id: PackageId, _data: Vec<u8>) -> CargoResult<Package> {
         panic!("no download should have started")
     }
 
diff -Nru cargo-0.32.0/src/cargo/sources/registry/index.rs cargo-0.33.0/src/cargo/sources/registry/index.rs
--- cargo-0.32.0/src/cargo/sources/registry/index.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/registry/index.rs	2019-01-02 21:49:06.000000000 +0000
@@ -38,29 +38,29 @@
     type Item = String;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.hyphen_combination_num > 0 && self.hyphen_combination_num.trailing_zeros() >= self.num_hyphen_underscore {
+        if self.hyphen_combination_num > 0
+            && self.hyphen_combination_num.trailing_zeros() >= self.num_hyphen_underscore
+        {
             return None;
         }
 
-        let ret = Some(self.input
-            .chars()
-            .scan(0u16, |s, c| {
-                // the check against 15 here's to prevent
-                // shift overflow on inputs with more then 15 hyphens
-                if (c == '_' || c == '-') && *s <= 15 {
-                    let switch = (self.hyphen_combination_num & (1u16 << *s)) > 0;
-                    let out = if (c == '_') ^ switch {
-                        '_'
+        let ret = Some(
+            self.input
+                .chars()
+                .scan(0u16, |s, c| {
+                    // the check against 15 here's to prevent
+                    // shift overflow on inputs with more then 15 hyphens
+                    if (c == '_' || c == '-') && *s <= 15 {
+                        let switch = (self.hyphen_combination_num & (1u16 << *s)) > 0;
+                        let out = if (c == '_') ^ switch { '_' } else { '-' };
+                        *s += 1;
+                        Some(out)
                     } else {
-                        '-'
-                    };
-                    *s += 1;
-                    Some(out)
-                } else {
-                    Some(c)
-                }
-            })
-            .collect());
+                        Some(c)
+                    }
+                })
+                .collect(),
+        );
         self.hyphen_combination_num += 1;
         ret
     }
@@ -78,14 +78,21 @@
 fn two_hyphen() {
     assert_eq!(
         UncanonicalizedIter::new("te-_st").collect::<Vec<_>>(),
-        vec!["te-_st".to_string(), "te__st".to_string(), "te--st".to_string(), "te_-st".to_string()]
+        vec![
+            "te-_st".to_string(),
+            "te__st".to_string(),
+            "te--st".to_string(),
+            "te_-st".to_string()
+        ]
     )
 }
 
 #[test]
 fn overflow_hyphen() {
     assert_eq!(
-        UncanonicalizedIter::new("te-_-_-_-_-_-_-_-_-st").take(100).count(),
+        UncanonicalizedIter::new("te-_-_-_-_-_-_-_-_-st")
+            .take(100)
+            .count(),
         100
     )
 }
@@ -101,13 +108,13 @@
 
 impl<'cfg> RegistryIndex<'cfg> {
     pub fn new(
-        id: &SourceId,
+        source_id: SourceId,
         path: &Filesystem,
         config: &'cfg Config,
         locked: bool,
     ) -> RegistryIndex<'cfg> {
         RegistryIndex {
-            source_id: id.clone(),
+            source_id,
             path: path.clone(),
             cache: HashMap::new(),
             hashes: HashMap::new(),
@@ -117,7 +124,7 @@
     }
 
     /// Return the hash listed for a specified PackageId.
-    pub fn hash(&mut self, pkg: &PackageId, load: &mut RegistryData) -> CargoResult<String> {
+    pub fn hash(&mut self, pkg: PackageId, load: &mut RegistryData) -> CargoResult<String> {
         let name = pkg.name().as_str();
         let version = pkg.version();
         if let Some(s) = self.hashes.get(name).and_then(|v| v.get(version)) {
@@ -185,7 +192,7 @@
             _ => format!("{}/{}/{}", &fs_name[0..2], &fs_name[2..4], fs_name),
         };
         let mut ret = Vec::new();
-         for path in UncanonicalizedIter::new(&raw_path).take(1024) {
+        for path in UncanonicalizedIter::new(&raw_path).take(1024) {
             let mut hit_closure = false;
             let err = load.load(&root, Path::new(&path), &mut |contents| {
                 hit_closure = true;
@@ -247,11 +254,11 @@
             yanked,
             links,
         } = serde_json::from_str(line)?;
-        let pkgid = PackageId::new(&name, &vers, &self.source_id)?;
+        let pkgid = PackageId::new(&name, &vers, self.source_id)?;
         let name = pkgid.name();
         let deps = deps
             .into_iter()
-            .map(|dep| dep.into_dep(&self.source_id))
+            .map(|dep| dep.into_dep(self.source_id))
             .collect::<CargoResult<Vec<_>>>()?;
         let summary = Summary::new(pkgid, deps, &features, links, false)?;
         let summary = summary.set_checksum(cksum.clone());
@@ -268,7 +275,7 @@
         load: &mut RegistryData,
         f: &mut FnMut(Summary),
     ) -> CargoResult<()> {
-        let source_id = self.source_id.clone();
+        let source_id = self.source_id;
         let name = dep.package_name().as_str();
         let summaries = self.summaries(name, load)?;
         let summaries = summaries
diff -Nru cargo-0.32.0/src/cargo/sources/registry/local.rs cargo-0.33.0/src/cargo/sources/registry/local.rs
--- cargo-0.32.0/src/cargo/sources/registry/local.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/registry/local.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,13 +1,13 @@
-use std::io::SeekFrom;
 use std::io::prelude::*;
+use std::io::SeekFrom;
 use std::path::Path;
 
 use core::PackageId;
 use hex;
-use sources::registry::{RegistryConfig, RegistryData, MaybeLock};
-use util::paths;
-use util::{Config, Filesystem, Sha256, FileLock};
+use sources::registry::{MaybeLock, RegistryConfig, RegistryData};
 use util::errors::{CargoResult, CargoResultExt};
+use util::paths;
+use util::{Config, FileLock, Filesystem, Sha256};
 
 pub struct LocalRegistry<'cfg> {
     index_path: Filesystem,
@@ -69,7 +69,7 @@
         Ok(())
     }
 
-    fn download(&mut self, pkg: &PackageId, checksum: &str) -> CargoResult<MaybeLock> {
+    fn download(&mut self, pkg: PackageId, checksum: &str) -> CargoResult<MaybeLock> {
         let crate_file = format!("{}-{}.crate", pkg.name(), pkg.version());
         let mut crate_file = self.root.open_ro(&crate_file, self.config, "crate file")?;
 
@@ -104,9 +104,12 @@
         Ok(MaybeLock::Ready(crate_file))
     }
 
-    fn finish_download(&mut self, _pkg: &PackageId, _checksum: &str, _data: &[u8])
-        -> CargoResult<FileLock>
-    {
+    fn finish_download(
+        &mut self,
+        _pkg: PackageId,
+        _checksum: &str,
+        _data: &[u8],
+    ) -> CargoResult<FileLock> {
         panic!("this source doesn't download")
     }
 }
diff -Nru cargo-0.32.0/src/cargo/sources/registry/mod.rs cargo-0.33.0/src/cargo/sources/registry/mod.rs
--- cargo-0.32.0/src/cargo/sources/registry/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/registry/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -228,15 +228,17 @@
 #[test]
 fn escaped_cher_in_json() {
     let _: RegistryPackage = serde_json::from_str(
-        r#"{"name":"a","vers":"0.0.1","deps":[],"cksum":"bae3","features":{}}"#
-    ).unwrap();
+        r#"{"name":"a","vers":"0.0.1","deps":[],"cksum":"bae3","features":{}}"#,
+    )
+    .unwrap();
     let _: RegistryPackage = serde_json::from_str(
         r#"{"name":"a","vers":"0.0.1","deps":[],"cksum":"bae3","features":{"test":["k","q"]},"links":"a-sys"}"#
     ).unwrap();
 
     // Now we add escaped cher all the places they can go
     // these are not valid, but it should error later than json parsing
-    let _: RegistryPackage = serde_json::from_str(r#"{
+    let _: RegistryPackage = serde_json::from_str(
+        r#"{
         "name":"This name has a escaped cher in it \n\t\" ",
         "vers":"0.0.1",
         "deps":[{
@@ -251,8 +253,9 @@
         }],
         "cksum":"bae3",
         "features":{"test \n\t\" ":["k \n\t\" ","q \n\t\" "]},
-        "links":" \n\t\" "}"#
-    ).unwrap();
+        "links":" \n\t\" "}"#,
+    )
+    .unwrap();
 }
 
 #[derive(Deserialize)]
@@ -282,7 +285,7 @@
 
 impl<'a> RegistryDependency<'a> {
     /// Converts an encoded dependency in the registry to a cargo dependency
-    pub fn into_dep(self, default: &SourceId) -> CargoResult<Dependency> {
+    pub fn into_dep(self, default: SourceId) -> CargoResult<Dependency> {
         let RegistryDependency {
             name,
             req,
@@ -298,15 +301,11 @@
         let id = if let Some(registry) = registry {
             SourceId::for_registry(&registry.to_url()?)?
         } else {
-            default.clone()
+            default
         };
 
-
-        let mut dep = Dependency::parse_no_deprecated(
-            package.as_ref().unwrap_or(&name),
-            Some(&req),
-            &id,
-        )?;
+        let mut dep =
+            Dependency::parse_no_deprecated(package.as_ref().unwrap_or(&name), Some(&req), id)?;
         if package.is_some() {
             dep.set_explicit_name_in_toml(&name);
         }
@@ -349,45 +348,49 @@
     ) -> CargoResult<()>;
     fn config(&mut self) -> CargoResult<Option<RegistryConfig>>;
     fn update_index(&mut self) -> CargoResult<()>;
-    fn download(&mut self, pkg: &PackageId, checksum: &str) -> CargoResult<MaybeLock>;
-    fn finish_download(&mut self, pkg: &PackageId, checksum: &str, data: &[u8])
-        -> CargoResult<FileLock>;
+    fn download(&mut self, pkg: PackageId, checksum: &str) -> CargoResult<MaybeLock>;
+    fn finish_download(
+        &mut self,
+        pkg: PackageId,
+        checksum: &str,
+        data: &[u8],
+    ) -> CargoResult<FileLock>;
 
-    fn is_crate_downloaded(&self, _pkg: &PackageId) -> bool {
+    fn is_crate_downloaded(&self, _pkg: PackageId) -> bool {
         true
     }
 }
 
 pub enum MaybeLock {
     Ready(FileLock),
-    Download { url: String, descriptor: String }
+    Download { url: String, descriptor: String },
 }
 
 mod index;
 mod local;
 mod remote;
 
-fn short_name(id: &SourceId) -> String {
-    let hash = hex::short_hash(id);
+fn short_name(id: SourceId) -> String {
+    let hash = hex::short_hash(&id);
     let ident = id.url().host_str().unwrap_or("").to_string();
     format!("{}-{}", ident, hash)
 }
 
 impl<'cfg> RegistrySource<'cfg> {
-    pub fn remote(source_id: &SourceId, config: &'cfg Config) -> RegistrySource<'cfg> {
+    pub fn remote(source_id: SourceId, config: &'cfg Config) -> RegistrySource<'cfg> {
         let name = short_name(source_id);
         let ops = remote::RemoteRegistry::new(source_id, config, &name);
         RegistrySource::new(source_id, config, &name, Box::new(ops), true)
     }
 
-    pub fn local(source_id: &SourceId, path: &Path, config: &'cfg Config) -> RegistrySource<'cfg> {
+    pub fn local(source_id: SourceId, path: &Path, config: &'cfg Config) -> RegistrySource<'cfg> {
         let name = short_name(source_id);
         let ops = local::LocalRegistry::new(path, config, &name);
         RegistrySource::new(source_id, config, &name, Box::new(ops), false)
     }
 
     fn new(
-        source_id: &SourceId,
+        source_id: SourceId,
         config: &'cfg Config,
         name: &str,
         ops: Box<RegistryData + 'cfg>,
@@ -396,7 +399,7 @@
         RegistrySource {
             src_path: config.registry_source_path().join(name),
             config,
-            source_id: source_id.clone(),
+            source_id,
             updated: false,
             index: index::RegistryIndex::new(source_id, ops.index_path(), config, index_locked),
             index_locked,
@@ -415,7 +418,7 @@
     /// compiled.
     ///
     /// No action is taken if the source looks like it's already unpacked.
-    fn unpack_package(&self, pkg: &PackageId, tarball: &FileLock) -> CargoResult<PathBuf> {
+    fn unpack_package(&self, pkg: PackageId, tarball: &FileLock) -> CargoResult<PathBuf> {
         let dst = self
             .src_path
             .join(&format!("{}-{}", pkg.name(), pkg.version()));
@@ -468,15 +471,15 @@
         self.ops.update_index()?;
         let path = self.ops.index_path();
         self.index =
-            index::RegistryIndex::new(&self.source_id, path, self.config, self.index_locked);
+            index::RegistryIndex::new(self.source_id, path, self.config, self.index_locked);
         Ok(())
     }
 
-    fn get_pkg(&mut self, package: &PackageId, path: FileLock) -> CargoResult<Package> {
+    fn get_pkg(&mut self, package: PackageId, path: &FileLock) -> CargoResult<Package> {
         let path = self
-            .unpack_package(package, &path)
+            .unpack_package(package, path)
             .chain_err(|| internal(format!("failed to unpack package `{}`", package)))?;
-        let mut src = PathSource::new(&path, &self.source_id, self.config);
+        let mut src = PathSource::new(&path, self.source_id, self.config);
         src.update()?;
         let pkg = match src.download(package)? {
             MaybePackage::Ready(pkg) => pkg,
@@ -543,8 +546,8 @@
         false
     }
 
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn source_id(&self) -> SourceId {
+        self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {
@@ -563,24 +566,20 @@
         Ok(())
     }
 
-    fn download(&mut self, package: &PackageId) -> CargoResult<MaybePackage> {
+    fn download(&mut self, package: PackageId) -> CargoResult<MaybePackage> {
         let hash = self.index.hash(package, &mut *self.ops)?;
         match self.ops.download(package, &hash)? {
-            MaybeLock::Ready(file) => {
-                self.get_pkg(package, file).map(MaybePackage::Ready)
-            }
+            MaybeLock::Ready(file) => self.get_pkg(package, &file).map(MaybePackage::Ready),
             MaybeLock::Download { url, descriptor } => {
                 Ok(MaybePackage::Download { url, descriptor })
             }
         }
     }
 
-    fn finish_download(&mut self, package: &PackageId, data: Vec<u8>)
-        -> CargoResult<Package>
-    {
+    fn finish_download(&mut self, package: PackageId, data: Vec<u8>) -> CargoResult<Package> {
         let hash = self.index.hash(package, &mut *self.ops)?;
         let file = self.ops.finish_download(package, &hash, &data)?;
-        self.get_pkg(package, file)
+        self.get_pkg(package, &file)
     }
 
     fn fingerprint(&self, pkg: &Package) -> CargoResult<String> {
diff -Nru cargo-0.32.0/src/cargo/sources/registry/remote.rs cargo-0.33.0/src/cargo/sources/registry/remote.rs
--- cargo-0.32.0/src/cargo/sources/registry/remote.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/registry/remote.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,23 +1,25 @@
 use std::cell::{Cell, Ref, RefCell};
 use std::fmt::Write as FmtWrite;
-use std::io::SeekFrom;
 use std::io::prelude::*;
+use std::io::SeekFrom;
 use std::mem;
 use std::path::Path;
 use std::str;
 
 use git2;
 use hex;
-use serde_json;
 use lazycell::LazyCell;
+use serde_json;
 
 use core::{PackageId, SourceId};
 use sources::git;
-use sources::registry::{RegistryConfig, RegistryData, CRATE_TEMPLATE, INDEX_LOCK, VERSION_TEMPLATE};
 use sources::registry::MaybeLock;
-use util::{FileLock, Filesystem};
-use util::{Config, Sha256};
+use sources::registry::{
+    RegistryConfig, RegistryData, CRATE_TEMPLATE, INDEX_LOCK, VERSION_TEMPLATE,
+};
 use util::errors::{CargoResult, CargoResultExt};
+use util::{Config, Sha256};
+use util::{FileLock, Filesystem};
 
 pub struct RemoteRegistry<'cfg> {
     index_path: Filesystem,
@@ -30,11 +32,11 @@
 }
 
 impl<'cfg> RemoteRegistry<'cfg> {
-    pub fn new(source_id: &SourceId, config: &'cfg Config, name: &str) -> RemoteRegistry<'cfg> {
+    pub fn new(source_id: SourceId, config: &'cfg Config, name: &str) -> RemoteRegistry<'cfg> {
         RemoteRegistry {
             index_path: config.registry_index_path().join(name),
             cache_path: config.registry_cache_path().join(name),
-            source_id: source_id.clone(),
+            source_id,
             config,
             tree: RefCell::new(None),
             repo: LazyCell::new(),
@@ -54,9 +56,11 @@
 
             // Ok, now we need to lock and try the whole thing over again.
             trace!("acquiring registry index lock");
-            let lock =
-                self.index_path
-                    .open_rw(Path::new(INDEX_LOCK), self.config, "the registry index")?;
+            let lock = self.index_path.open_rw(
+                Path::new(INDEX_LOCK),
+                self.config,
+                "the registry index",
+            )?;
             match git2::Repository::open(&path) {
                 Ok(repo) => Ok(repo),
                 Err(_) => {
@@ -79,9 +83,8 @@
                     // things that we don't want.
                     let mut opts = git2::RepositoryInitOptions::new();
                     opts.external_template(false);
-                    Ok(git2::Repository::init_opts(&path, &opts).chain_err(|| {
-                        "failed to initialized index git repository"
-                    })?)
+                    Ok(git2::Repository::init_opts(&path, &opts)
+                        .chain_err(|| "failed to initialized index git repository")?)
                 }
             }
         })
@@ -123,7 +126,7 @@
         Ok(Ref::map(self.tree.borrow(), |s| s.as_ref().unwrap()))
     }
 
-    fn filename(&self, pkg: &PackageId) -> String {
+    fn filename(&self, pkg: PackageId) -> String {
         format!("{}-{}.crate", pkg.name(), pkg.version())
     }
 }
@@ -210,7 +213,7 @@
         Ok(())
     }
 
-    fn download(&mut self, pkg: &PackageId, _checksum: &str) -> CargoResult<MaybeLock> {
+    fn download(&mut self, pkg: PackageId, _checksum: &str) -> CargoResult<MaybeLock> {
         let filename = self.filename(pkg);
 
         // Attempt to open an read-only copy first to avoid an exclusive write
@@ -231,15 +234,22 @@
         if !url.contains(CRATE_TEMPLATE) && !url.contains(VERSION_TEMPLATE) {
             write!(url, "/{}/{}/download", CRATE_TEMPLATE, VERSION_TEMPLATE).unwrap();
         }
-        let url = url.replace(CRATE_TEMPLATE, &*pkg.name())
+        let url = url
+            .replace(CRATE_TEMPLATE, &*pkg.name())
             .replace(VERSION_TEMPLATE, &pkg.version().to_string());
 
-        Ok(MaybeLock::Download { url, descriptor: pkg.to_string() })
+        Ok(MaybeLock::Download {
+            url,
+            descriptor: pkg.to_string(),
+        })
     }
 
-    fn finish_download(&mut self, pkg: &PackageId, checksum: &str, data: &[u8])
-        -> CargoResult<FileLock>
-    {
+    fn finish_download(
+        &mut self,
+        pkg: PackageId,
+        checksum: &str,
+        data: &[u8],
+    ) -> CargoResult<FileLock> {
         // Verify what we just downloaded
         let mut state = Sha256::new();
         state.update(data);
@@ -259,7 +269,7 @@
         Ok(dst)
     }
 
-    fn is_crate_downloaded(&self, pkg: &PackageId) -> bool {
+    fn is_crate_downloaded(&self, pkg: PackageId) -> bool {
         let filename = format!("{}-{}.crate", pkg.name(), pkg.version());
         let path = Path::new(&filename);
 
diff -Nru cargo-0.32.0/src/cargo/sources/replaced.rs cargo-0.33.0/src/cargo/sources/replaced.rs
--- cargo-0.32.0/src/cargo/sources/replaced.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/sources/replaced.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,5 +1,5 @@
-use core::{Dependency, Package, PackageId, Source, SourceId, Summary};
 use core::source::MaybePackage;
+use core::{Dependency, Package, PackageId, Source, SourceId, Summary};
 use util::errors::{CargoResult, CargoResultExt};
 
 pub struct ReplacedSource<'cfg> {
@@ -10,43 +10,25 @@
 
 impl<'cfg> ReplacedSource<'cfg> {
     pub fn new(
-        to_replace: &SourceId,
-        replace_with: &SourceId,
+        to_replace: SourceId,
+        replace_with: SourceId,
         src: Box<Source + 'cfg>,
     ) -> ReplacedSource<'cfg> {
         ReplacedSource {
-            to_replace: to_replace.clone(),
-            replace_with: replace_with.clone(),
+            to_replace,
+            replace_with,
             inner: src,
         }
     }
 }
 
 impl<'cfg> Source for ReplacedSource<'cfg> {
-    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        let (replace_with, to_replace) = (&self.replace_with, &self.to_replace);
-        let dep = dep.clone().map_source(to_replace, replace_with);
-
-        self.inner
-            .query(
-                &dep,
-                &mut |summary| f(summary.map_source(replace_with, to_replace)),
-            )
-            .chain_err(|| format!("failed to query replaced source {}", self.to_replace))?;
-        Ok(())
+    fn source_id(&self) -> SourceId {
+        self.to_replace
     }
 
-    fn fuzzy_query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        let (replace_with, to_replace) = (&self.replace_with, &self.to_replace);
-        let dep = dep.clone().map_source(to_replace, replace_with);
-
-        self.inner
-            .fuzzy_query(
-                &dep,
-                &mut |summary| f(summary.map_source(replace_with, to_replace)),
-            )
-            .chain_err(|| format!("failed to query replaced source {}", self.to_replace))?;
-        Ok(())
+    fn replaced_source_id(&self) -> SourceId {
+        self.replace_with
     }
 
     fn supports_checksums(&self) -> bool {
@@ -57,12 +39,28 @@
         self.inner.requires_precise()
     }
 
-    fn source_id(&self) -> &SourceId {
-        &self.to_replace
+    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
+        let (replace_with, to_replace) = (self.replace_with, self.to_replace);
+        let dep = dep.clone().map_source(to_replace, replace_with);
+
+        self.inner
+            .query(&dep, &mut |summary| {
+                f(summary.map_source(replace_with, to_replace))
+            })
+            .chain_err(|| format!("failed to query replaced source {}", self.to_replace))?;
+        Ok(())
     }
 
-    fn replaced_source_id(&self) -> &SourceId {
-        &self.replace_with
+    fn fuzzy_query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
+        let (replace_with, to_replace) = (self.replace_with, self.to_replace);
+        let dep = dep.clone().map_source(to_replace, replace_with);
+
+        self.inner
+            .fuzzy_query(&dep, &mut |summary| {
+                f(summary.map_source(replace_with, to_replace))
+            })
+            .chain_err(|| format!("failed to query replaced source {}", self.to_replace))?;
+        Ok(())
     }
 
     fn update(&mut self) -> CargoResult<()> {
@@ -72,40 +70,44 @@
         Ok(())
     }
 
-    fn download(&mut self, id: &PackageId) -> CargoResult<MaybePackage> {
-        let id = id.with_source_id(&self.replace_with);
-        let pkg = self.inner
-            .download(&id)
+    fn download(&mut self, id: PackageId) -> CargoResult<MaybePackage> {
+        let id = id.with_source_id(self.replace_with);
+        let pkg = self
+            .inner
+            .download(id)
             .chain_err(|| format!("failed to download replaced source {}", self.to_replace))?;
         Ok(match pkg {
             MaybePackage::Ready(pkg) => {
-                MaybePackage::Ready(pkg.map_source(&self.replace_with, &self.to_replace))
+                MaybePackage::Ready(pkg.map_source(self.replace_with, self.to_replace))
             }
             other @ MaybePackage::Download { .. } => other,
         })
     }
 
-    fn finish_download(&mut self, id: &PackageId, data: Vec<u8>)
-        -> CargoResult<Package>
-    {
-        let id = id.with_source_id(&self.replace_with);
-        let pkg = self.inner
-            .finish_download(&id, data)
+    fn finish_download(&mut self, id: PackageId, data: Vec<u8>) -> CargoResult<Package> {
+        let id = id.with_source_id(self.replace_with);
+        let pkg = self
+            .inner
+            .finish_download(id, data)
             .chain_err(|| format!("failed to download replaced source {}", self.to_replace))?;
-        Ok(pkg.map_source(&self.replace_with, &self.to_replace))
+        Ok(pkg.map_source(self.replace_with, self.to_replace))
     }
 
     fn fingerprint(&self, id: &Package) -> CargoResult<String> {
         self.inner.fingerprint(id)
     }
 
-    fn verify(&self, id: &PackageId) -> CargoResult<()> {
-        let id = id.with_source_id(&self.replace_with);
-        self.inner.verify(&id)
+    fn verify(&self, id: PackageId) -> CargoResult<()> {
+        let id = id.with_source_id(self.replace_with);
+        self.inner.verify(id)
     }
 
     fn describe(&self) -> String {
-        format!("{} (which is replacing {})", self.inner.describe(), self.to_replace)
+        format!(
+            "{} (which is replacing {})",
+            self.inner.describe(),
+            self.to_replace
+        )
     }
 
     fn is_replaced(&self) -> bool {
diff -Nru cargo-0.32.0/src/cargo/util/command_prelude.rs cargo-0.33.0/src/cargo/util/command_prelude.rs
--- cargo-0.32.0/src/cargo/util/command_prelude.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/command_prelude.rs	2019-01-02 21:49:06.000000000 +0000
@@ -0,0 +1,453 @@
+use std::path::PathBuf;
+use std::fs;
+
+use clap::{self, SubCommand};
+use CargoResult;
+use core::Workspace;
+use core::compiler::{BuildConfig, MessageFormat};
+use ops::{CompileFilter, CompileOptions, NewOptions, Packages, VersionControl};
+use sources::CRATES_IO_REGISTRY;
+use util::paths;
+use util::important_paths::find_root_manifest_for_wd;
+
+pub use clap::{AppSettings, Arg, ArgMatches};
+pub use {CliError, CliResult, Config};
+pub use core::compiler::CompileMode;
+
+pub type App = clap::App<'static, 'static>;
+
+pub trait AppExt: Sized {
+    fn _arg(self, arg: Arg<'static, 'static>) -> Self;
+
+    fn arg_package_spec(
+        self,
+        package: &'static str,
+        all: &'static str,
+        exclude: &'static str,
+    ) -> Self {
+        self.arg_package_spec_simple(package)
+            ._arg(opt("all", all))
+            ._arg(multi_opt("exclude", "SPEC", exclude))
+    }
+
+    fn arg_package_spec_simple(self, package: &'static str) -> Self {
+        self._arg(multi_opt("package", "SPEC", package).short("p"))
+    }
+
+    fn arg_package(self, package: &'static str) -> Self {
+        self._arg(opt("package", package).short("p").value_name("SPEC"))
+    }
+
+    fn arg_jobs(self) -> Self {
+        self._arg(
+            opt("jobs", "Number of parallel jobs, defaults to # of CPUs")
+                .short("j")
+                .value_name("N"),
+        )
+    }
+
+    fn arg_targets_all(
+        self,
+        lib: &'static str,
+        bin: &'static str,
+        bins: &'static str,
+        example: &'static str,
+        examples: &'static str,
+        test: &'static str,
+        tests: &'static str,
+        bench: &'static str,
+        benches: &'static str,
+        all: &'static str,
+    ) -> Self {
+        self.arg_targets_lib_bin(lib, bin, bins)
+            ._arg(multi_opt("example", "NAME", example))
+            ._arg(opt("examples", examples))
+            ._arg(multi_opt("test", "NAME", test))
+            ._arg(opt("tests", tests))
+            ._arg(multi_opt("bench", "NAME", bench))
+            ._arg(opt("benches", benches))
+            ._arg(opt("all-targets", all))
+    }
+
+    fn arg_targets_lib_bin(self, lib: &'static str, bin: &'static str, bins: &'static str) -> Self {
+        self._arg(opt("lib", lib))
+            ._arg(multi_opt("bin", "NAME", bin))
+            ._arg(opt("bins", bins))
+    }
+
+    fn arg_targets_bins_examples(
+        self,
+        bin: &'static str,
+        bins: &'static str,
+        example: &'static str,
+        examples: &'static str,
+    ) -> Self {
+        self._arg(multi_opt("bin", "NAME", bin))
+            ._arg(opt("bins", bins))
+            ._arg(multi_opt("example", "NAME", example))
+            ._arg(opt("examples", examples))
+    }
+
+    fn arg_targets_bin_example(self, bin: &'static str, example: &'static str) -> Self {
+        self._arg(multi_opt("bin", "NAME", bin))
+            ._arg(multi_opt("example", "NAME", example))
+    }
+
+    fn arg_features(self) -> Self {
+        self._arg(
+            opt("features", "Space-separated list of features to activate").value_name("FEATURES"),
+        )._arg(opt("all-features", "Activate all available features"))
+            ._arg(opt(
+                "no-default-features",
+                "Do not activate the `default` feature",
+            ))
+    }
+
+    fn arg_release(self, release: &'static str) -> Self {
+        self._arg(opt("release", release))
+    }
+
+    fn arg_doc(self, doc: &'static str) -> Self {
+        self._arg(opt("doc", doc))
+    }
+
+    fn arg_target_triple(self, target: &'static str) -> Self {
+        self._arg(opt("target", target).value_name("TRIPLE"))
+    }
+
+    fn arg_target_dir(self) -> Self {
+        self._arg(opt("target-dir", "Directory for all generated artifacts").value_name("DIRECTORY"))
+    }
+
+    fn arg_manifest_path(self) -> Self {
+        self._arg(opt("manifest-path", "Path to Cargo.toml").value_name("PATH"))
+    }
+
+    fn arg_message_format(self) -> Self {
+        self._arg(
+            opt("message-format", "Error format")
+                .value_name("FMT")
+                .case_insensitive(true)
+                .possible_values(&["human", "json", "short"])
+                .default_value("human"),
+        )
+    }
+
+    fn arg_build_plan(self) -> Self {
+        self._arg(opt("build-plan", "Output the build plan in JSON"))
+    }
+
+    fn arg_new_opts(self) -> Self {
+        self._arg(
+            opt(
+                "vcs",
+                "\
+                 Initialize a new repository for the given version \
+                 control system (git, hg, pijul, or fossil) or do not \
+                 initialize any version control at all (none), overriding \
+                 a global configuration.",
+            ).value_name("VCS")
+                .possible_values(&["git", "hg", "pijul", "fossil", "none"]),
+        )
+            ._arg(opt("bin", "Use a binary (application) template [default]"))
+            ._arg(opt("lib", "Use a library template"))
+            ._arg(
+                opt("edition", "Edition to set for the crate generated")
+                    .possible_values(&["2015", "2018"])
+                    .value_name("YEAR")
+            )
+            ._arg(
+                opt(
+                    "name",
+                    "Set the resulting package name, defaults to the directory name",
+                ).value_name("NAME"),
+            )
+    }
+
+    fn arg_index(self) -> Self {
+        self._arg(opt("index", "Registry index to upload the package to").value_name("INDEX"))
+            ._arg(
+                opt("host", "DEPRECATED, renamed to '--index'")
+                    .value_name("HOST")
+                    .hidden(true),
+            )
+    }
+}
+
+impl AppExt for App {
+    fn _arg(self, arg: Arg<'static, 'static>) -> Self {
+        self.arg(arg)
+    }
+}
+
+pub fn opt(name: &'static str, help: &'static str) -> Arg<'static, 'static> {
+    Arg::with_name(name).long(name).help(help)
+}
+
+pub fn multi_opt(
+    name: &'static str,
+    value_name: &'static str,
+    help: &'static str,
+) -> Arg<'static, 'static> {
+    // Note that all `.multiple(true)` arguments in Cargo should specify
+    // `.number_of_values(1)` as well, so that `--foo val1 val2` is
+    // **not** parsed as `foo` with values ["val1", "val2"].
+    // `number_of_values` should become the default in clap 3.
+    opt(name, help)
+        .value_name(value_name)
+        .multiple(true)
+        .number_of_values(1)
+}
+
+pub fn subcommand(name: &'static str) -> App {
+    SubCommand::with_name(name).settings(&[
+        AppSettings::UnifiedHelpMessage,
+        AppSettings::DeriveDisplayOrder,
+        AppSettings::DontCollapseArgsInUsage,
+    ])
+}
+
+pub trait ArgMatchesExt {
+    fn value_of_u32(&self, name: &str) -> CargoResult<Option<u32>> {
+        let arg = match self._value_of(name) {
+            None => None,
+            Some(arg) => Some(arg.parse::<u32>().map_err(|_| {
+                clap::Error::value_validation_auto(format!("could not parse `{}` as a number", arg))
+            })?),
+        };
+        Ok(arg)
+    }
+
+    /// Returns value of the `name` command-line argument as an absolute path
+    fn value_of_path(&self, name: &str, config: &Config) -> Option<PathBuf> {
+        self._value_of(name).map(|path| config.cwd().join(path))
+    }
+
+    fn root_manifest(&self, config: &Config) -> CargoResult<PathBuf> {
+        if let Some(path) = self.value_of_path("manifest-path", config) {
+            // In general, we try to avoid normalizing paths in Cargo,
+            // but in this particular case we need it to fix #3586.
+            let path = paths::normalize_path(&path);
+            if !path.ends_with("Cargo.toml") {
+                bail!("the manifest-path must be a path to a Cargo.toml file")
+            }
+            if fs::metadata(&path).is_err() {
+                bail!(
+                    "manifest path `{}` does not exist",
+                    self._value_of("manifest-path").unwrap()
+                )
+            }
+            return Ok(path);
+        }
+        find_root_manifest_for_wd(config.cwd())
+    }
+
+    fn workspace<'a>(&self, config: &'a Config) -> CargoResult<Workspace<'a>> {
+        let root = self.root_manifest(config)?;
+        let mut ws = Workspace::new(&root, config)?;
+        if config.cli_unstable().avoid_dev_deps {
+            ws.set_require_optional_deps(false);
+        }
+        Ok(ws)
+    }
+
+    fn jobs(&self) -> CargoResult<Option<u32>> {
+        self.value_of_u32("jobs")
+    }
+
+    fn target(&self) -> Option<String> {
+        self._value_of("target").map(|s| s.to_string())
+    }
+
+    fn compile_options<'a>(
+        &self,
+        config: &'a Config,
+        mode: CompileMode,
+    ) -> CargoResult<CompileOptions<'a>> {
+        let spec = Packages::from_flags(
+            self._is_present("all"),
+            self._values_of("exclude"),
+            self._values_of("package"),
+        )?;
+
+        let message_format = match self._value_of("message-format") {
+            None => MessageFormat::Human,
+            Some(f) => {
+                if f.eq_ignore_ascii_case("json") {
+                    MessageFormat::Json
+                } else if f.eq_ignore_ascii_case("human") {
+                    MessageFormat::Human
+                } else if f.eq_ignore_ascii_case("short") {
+                    MessageFormat::Short
+                } else {
+                    panic!("Impossible message format: {:?}", f)
+                }
+            }
+        };
+
+        let mut build_config = BuildConfig::new(config, self.jobs()?, &self.target(), mode)?;
+        build_config.message_format = message_format;
+        build_config.release = self._is_present("release");
+        build_config.build_plan = self._is_present("build-plan");
+        if build_config.build_plan && !config.cli_unstable().unstable_options {
+            Err(format_err!(
+                "`--build-plan` flag is unstable, pass `-Z unstable-options` to enable it"
+            ))?;
+        };
+
+        let opts = CompileOptions {
+            config,
+            build_config,
+            features: self._values_of("features"),
+            all_features: self._is_present("all-features"),
+            no_default_features: self._is_present("no-default-features"),
+            spec,
+            filter: CompileFilter::new(
+                self._is_present("lib"),
+                self._values_of("bin"),
+                self._is_present("bins"),
+                self._values_of("test"),
+                self._is_present("tests"),
+                self._values_of("example"),
+                self._is_present("examples"),
+                self._values_of("bench"),
+                self._is_present("benches"),
+                self._is_present("all-targets"),
+            ),
+            target_rustdoc_args: None,
+            target_rustc_args: None,
+            local_rustdoc_args: None,
+            export_dir: None,
+        };
+        Ok(opts)
+    }
+
+    fn compile_options_for_single_package<'a>(
+        &self,
+        config: &'a Config,
+        mode: CompileMode,
+    ) -> CargoResult<CompileOptions<'a>> {
+        let mut compile_opts = self.compile_options(config, mode)?;
+        compile_opts.spec = Packages::Packages(self._values_of("package"));
+        Ok(compile_opts)
+    }
+
+    fn new_options(&self, config: &Config) -> CargoResult<NewOptions> {
+        let vcs = self._value_of("vcs").map(|vcs| match vcs {
+            "git" => VersionControl::Git,
+            "hg" => VersionControl::Hg,
+            "pijul" => VersionControl::Pijul,
+            "fossil" => VersionControl::Fossil,
+            "none" => VersionControl::NoVcs,
+            vcs => panic!("Impossible vcs: {:?}", vcs),
+        });
+        NewOptions::new(
+            vcs,
+            self._is_present("bin"),
+            self._is_present("lib"),
+            self.value_of_path("path", config).unwrap(),
+            self._value_of("name").map(|s| s.to_string()),
+            self._value_of("edition").map(|s| s.to_string()),
+            self.registry(config)?,
+        )
+    }
+
+    fn registry(&self, config: &Config) -> CargoResult<Option<String>> {
+        match self._value_of("registry") {
+            Some(registry) => {
+                if !config.cli_unstable().unstable_options {
+                    return Err(format_err!(
+                        "registry option is an unstable feature and \
+                         requires -Zunstable-options to use."
+                    ));
+                }
+
+                if registry == CRATES_IO_REGISTRY {
+                    // If "crates.io" is specified then we just need to return None
+                    // as that will cause cargo to use crates.io. This is required
+                    // for the case where a default alterative registry is used
+                    // but the user wants to switch back to crates.io for a single
+                    // command.
+                    Ok(None)
+                }
+                else {
+                    Ok(Some(registry.to_string()))                    
+                }
+            }
+            None => {
+                config.default_registry()
+            }
+        }
+    }
+
+    fn index(&self, config: &Config) -> CargoResult<Option<String>> {
+        // TODO: Deprecated
+        // remove once it has been decided --host can be removed
+        // We may instead want to repurpose the host flag, as
+        // mentioned in this issue
+        // https://github.com/rust-lang/cargo/issues/4208
+        let msg = "The flag '--host' is no longer valid.
+
+Previous versions of Cargo accepted this flag, but it is being
+deprecated. The flag is being renamed to 'index', as the flag
+wants the location of the index. Please use '--index' instead.
+
+This will soon become a hard error, so it's either recommended
+to update to a fixed version or contact the upstream maintainer
+about this warning.";
+
+        let index = match self._value_of("host") {
+            Some(host) => {
+                config.shell().warn(&msg)?;
+                Some(host.to_string())
+            }
+            None => self._value_of("index").map(|s| s.to_string()),
+        };
+        Ok(index)
+    }
+
+    fn _value_of(&self, name: &str) -> Option<&str>;
+
+    fn _values_of(&self, name: &str) -> Vec<String>;
+
+    fn _is_present(&self, name: &str) -> bool;
+}
+
+impl<'a> ArgMatchesExt for ArgMatches<'a> {
+    fn _value_of(&self, name: &str) -> Option<&str> {
+        self.value_of(name)
+    }
+
+    fn _values_of(&self, name: &str) -> Vec<String> {
+        self.values_of(name)
+            .unwrap_or_default()
+            .map(|s| s.to_string())
+            .collect()
+    }
+
+    fn _is_present(&self, name: &str) -> bool {
+        self.is_present(name)
+    }
+}
+
+pub fn values(args: &ArgMatches, name: &str) -> Vec<String> {
+    args.values_of(name)
+        .unwrap_or_default()
+        .map(|s| s.to_string())
+        .collect()
+}
+
+#[derive(PartialEq, PartialOrd, Eq, Ord)]
+pub enum CommandInfo {
+    BuiltIn { name: String, about: Option<String>, },
+    External { name: String, path: PathBuf },
+}
+
+impl CommandInfo {
+    pub fn name(&self) -> String {
+        match self {
+            CommandInfo::BuiltIn { name, .. } => name.to_string(),
+            CommandInfo::External { name, .. } => name.to_string(),
+        }
+    }
+}
diff -Nru cargo-0.32.0/src/cargo/util/config.rs cargo-0.33.0/src/cargo/util/config.rs
--- cargo-0.32.0/src/cargo/util/config.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/config.rs	2019-01-02 21:49:06.000000000 +0000
@@ -176,12 +176,10 @@
 
     /// The default cargo registry (`alternative-registry`)
     pub fn default_registry(&self) -> CargoResult<Option<String>> {
-        Ok(
-            match self.get_string("registry.default")? {
-                Some(registry) => Some(registry.val),
-                None => None,
-            }
-        )
+        Ok(match self.get_string("registry.default")? {
+            Some(registry) => Some(registry.val),
+            None => None,
+        })
     }
 
     /// Get a reference to the shell, for e.g. writing error messages
@@ -245,7 +243,7 @@
                     let argv0 = env::args_os()
                         .map(PathBuf::from)
                         .next()
-                        .ok_or_else(||format_err!("no argv[0]"))?;
+                        .ok_or_else(|| format_err!("no argv[0]"))?;
                     paths::resolve_executable(&argv0)
                 }
 
@@ -458,10 +456,7 @@
         }
     }
 
-    pub fn get_path_and_args(
-        &self,
-        key: &str,
-    ) -> CargoResult<OptValue<(PathBuf, Vec<String>)>> {
+    pub fn get_path_and_args(&self, key: &str) -> CargoResult<OptValue<(PathBuf, Vec<String>)>> {
         if let Some(mut val) = self.get_list_or_split_string(key)? {
             if !val.val.is_empty() {
                 return Ok(Some(Value {
@@ -631,9 +626,7 @@
         self.load_values_from(&self.cwd)
     }
 
-    fn load_values_from(&self, path: &Path)
-        -> CargoResult<HashMap<String, ConfigValue>>
-    {
+    fn load_values_from(&self, path: &Path) -> CargoResult<HashMap<String, ConfigValue>> {
         let mut cfg = CV::Table(HashMap::new(), PathBuf::from("."));
         let home = self.home_path.clone().into_path_unlocked();
 
@@ -654,7 +647,8 @@
             cfg.merge(value)
                 .chain_err(|| format!("failed to merge configuration at `{}`", path.display()))?;
             Ok(())
-        }).chain_err(|| "could not load Cargo configuration")?;
+        })
+        .chain_err(|| "could not load Cargo configuration")?;
 
         self.load_credentials(&mut cfg)?;
         match cfg {
@@ -669,8 +663,8 @@
             match self.get_string(&format!("registries.{}.index", registry))? {
                 Some(index) => {
                     let url = index.val.to_url()?;
-                    if url.username() != "" || url.password().is_some() {
-                        bail!("Registry URLs may not contain credentials");
+                    if url.password().is_some() {
+                        bail!("Registry URLs may not contain passwords");
                     }
                     url
                 }
@@ -790,7 +784,7 @@
     where
         F: FnMut() -> CargoResult<SourceId>,
     {
-        Ok(self.crates_io_source_id.try_borrow_with(f)?.clone())
+        Ok(*(self.crates_io_source_id.try_borrow_with(f)?))
     }
 
     pub fn creation_time(&self) -> Instant {
diff -Nru cargo-0.32.0/src/cargo/util/graph.rs cargo-0.33.0/src/cargo/util/graph.rs
--- cargo-0.32.0/src/cargo/util/graph.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/graph.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,5 +1,5 @@
 use std::borrow::Borrow;
-use std::collections::hash_map::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::hash::Hash;
 
@@ -42,6 +42,30 @@
         self.nodes.get(from).into_iter().flat_map(|x| x.iter())
     }
 
+    /// A topological sort of the `Graph`
+    pub fn sort(&self) -> Vec<N> {
+        let mut ret = Vec::new();
+        let mut marks = HashSet::new();
+
+        for node in self.nodes.keys() {
+            self.sort_inner_visit(node, &mut ret, &mut marks);
+        }
+
+        ret
+    }
+
+    fn sort_inner_visit(&self, node: &N, dst: &mut Vec<N>, marks: &mut HashSet<N>) {
+        if !marks.insert(node.clone()) {
+            return;
+        }
+
+        for child in self.nodes[node].keys() {
+            self.sort_inner_visit(child, dst, marks);
+        }
+
+        dst.push(node.clone());
+    }
+
     pub fn iter(&self) -> impl Iterator<Item = &N> {
         self.nodes.keys()
     }
diff -Nru cargo-0.32.0/src/cargo/util/lev_distance.rs cargo-0.33.0/src/cargo/util/lev_distance.rs
--- cargo-0.32.0/src/cargo/util/lev_distance.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/lev_distance.rs	2019-01-02 21:49:06.000000000 +0000
@@ -8,7 +8,7 @@
         return me.chars().count();
     }
 
-    let mut dcol = (0..t.len() + 1).collect::<Vec<_>>();
+    let mut dcol = (0..=t.len()).collect::<Vec<_>>();
     let mut t_last = 0;
 
     for (i, sc) in me.chars().enumerate() {
diff -Nru cargo-0.32.0/src/cargo/util/machine_message.rs cargo-0.33.0/src/cargo/util/machine_message.rs
--- cargo-0.32.0/src/cargo/util/machine_message.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/machine_message.rs	2019-01-02 21:49:06.000000000 +0000
@@ -16,7 +16,7 @@
 
 #[derive(Serialize)]
 pub struct FromCompiler<'a> {
-    pub package_id: &'a PackageId,
+    pub package_id: PackageId,
     pub target: &'a Target,
     pub message: Box<RawValue>,
 }
@@ -29,7 +29,7 @@
 
 #[derive(Serialize)]
 pub struct Artifact<'a> {
-    pub package_id: &'a PackageId,
+    pub package_id: PackageId,
     pub target: &'a Target,
     pub profile: ArtifactProfile,
     pub features: Vec<String>,
@@ -57,7 +57,7 @@
 
 #[derive(Serialize)]
 pub struct BuildScript<'a> {
-    pub package_id: &'a PackageId,
+    pub package_id: PackageId,
     pub linked_libs: &'a [String],
     pub linked_paths: &'a [String],
     pub cfgs: &'a [String],
diff -Nru cargo-0.32.0/src/cargo/util/mod.rs cargo-0.33.0/src/cargo/util/mod.rs
--- cargo-0.32.0/src/cargo/util/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -38,6 +38,7 @@
 pub mod to_semver;
 pub mod to_url;
 pub mod toml;
+pub mod command_prelude;
 mod cfg;
 mod dependency_queue;
 mod rustc;
diff -Nru cargo-0.32.0/src/cargo/util/process_builder.rs cargo-0.33.0/src/cargo/util/process_builder.rs
--- cargo-0.32.0/src/cargo/util/process_builder.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/process_builder.rs	2019-01-02 21:49:06.000000000 +0000
@@ -5,6 +5,7 @@
 use std::path::Path;
 use std::process::{Command, Output, Stdio};
 
+use failure::Fail;
 use jobserver::Client;
 use shell_escape::escape;
 
@@ -202,7 +203,7 @@
         &self,
         on_stdout_line: &mut FnMut(&str) -> CargoResult<()>,
         on_stderr_line: &mut FnMut(&str) -> CargoResult<()>,
-        print_output: bool,
+        capture_output: bool,
     ) -> CargoResult<Output> {
         let mut stdout = Vec::new();
         let mut stderr = Vec::new();
@@ -226,23 +227,33 @@
                         None => return,
                     }
                 };
-                let data = data.drain(..idx);
-                let dst = if is_out { &mut stdout } else { &mut stderr };
-                let start = dst.len();
-                dst.extend(data);
-                for line in String::from_utf8_lossy(&dst[start..]).lines() {
-                    if callback_error.is_some() {
-                        break;
-                    }
-                    let callback_result = if is_out {
-                        on_stdout_line(line)
+                { // scope for new_lines
+                    let new_lines = if capture_output {
+                        let dst = if is_out { &mut stdout } else { &mut stderr };
+                        let start = dst.len();
+                        let data = data.drain(..idx);
+                        dst.extend(data);
+                        &dst[start..]
                     } else {
-                        on_stderr_line(line)
+                        &data[..idx]
                     };
-                    if let Err(e) = callback_result {
-                        callback_error = Some(e);
+                    for line in String::from_utf8_lossy(new_lines).lines() {
+                        if callback_error.is_some() {
+                            break;
+                        }
+                        let callback_result = if is_out {
+                            on_stdout_line(line)
+                        } else {
+                            on_stderr_line(line)
+                        };
+                        if let Err(e) = callback_result {
+                            callback_error = Some(e);
+                        }
                     }
                 }
+                if !capture_output {
+                    data.drain(..idx);
+                }
             })?;
             child.wait()
         })()
@@ -260,20 +271,21 @@
         };
 
         {
-            let to_print = if print_output { Some(&output) } else { None };
-            if !output.status.success() {
-                return Err(process_error(
-                    &format!("process didn't exit successfully: {}", self),
-                    Some(output.status),
-                    to_print,
-                ).into());
-            } else if let Some(e) = callback_error {
+            let to_print = if capture_output { Some(&output) } else { None };
+            if let Some(e) = callback_error {
                 let cx = process_error(
                     &format!("failed to parse process output: {}", self),
                     Some(output.status),
                     to_print,
                 );
-                return Err(e.context(cx).into());
+                return Err(cx.context(e).into());
+            } else if !output.status.success() {
+                return Err(process_error(
+                    &format!("process didn't exit successfully: {}", self),
+                    Some(output.status),
+                    to_print,
+                )
+                .into());
             }
         }
 
diff -Nru cargo-0.32.0/src/cargo/util/progress.rs cargo-0.33.0/src/cargo/util/progress.rs
--- cargo-0.32.0/src/cargo/util/progress.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/progress.rs	2019-01-02 21:49:06.000000000 +0000
@@ -38,11 +38,13 @@
 impl<'cfg> Progress<'cfg> {
     pub fn with_style(name: &str, style: ProgressStyle, cfg: &'cfg Config) -> Progress<'cfg> {
         // report no progress when -q (for quiet) or TERM=dumb are set
+        // or if running on Continuous Integration service like Travis where the
+        // output logs get mangled.
         let dumb = match env::var("TERM") {
             Ok(term) => term == "dumb",
             Err(_) => false,
         };
-        if cfg.shell().verbosity() == Verbosity::Quiet || dumb {
+        if cfg.shell().verbosity() == Verbosity::Quiet || dumb || env::var("CI").is_ok() {
             return Progress { state: None };
         }
 
@@ -196,9 +198,7 @@
     }
 
     fn clear(&mut self) {
-        self.try_update_max_width();
-        let blank = " ".repeat(self.format.max_width);
-        drop(write!(self.config.shell().err(), "{}\r", blank));
+        self.config.shell().err_erase_line();
     }
 
     fn try_update_max_width(&mut self) {
diff -Nru cargo-0.32.0/src/cargo/util/read2.rs cargo-0.33.0/src/cargo/util/read2.rs
--- cargo-0.32.0/src/cargo/util/read2.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/read2.rs	2019-01-02 21:49:06.000000000 +0000
@@ -2,12 +2,12 @@
 
 #[cfg(unix)]
 mod imp {
-    use std::io::prelude::*;
+    use libc;
     use std::io;
+    use std::io::prelude::*;
     use std::mem;
     use std::os::unix::prelude::*;
     use std::process::{ChildStderr, ChildStdout};
-    use libc;
 
     pub fn read2(
         mut out_pipe: ChildStdout,
@@ -177,9 +177,6 @@
         if v.capacity() == v.len() {
             v.reserve(1);
         }
-        slice::from_raw_parts_mut(
-            v.as_mut_ptr().offset(v.len() as isize),
-            v.capacity() - v.len(),
-        )
+        slice::from_raw_parts_mut(v.as_mut_ptr().add(v.len()), v.capacity() - v.len())
     }
 }
diff -Nru cargo-0.32.0/src/cargo/util/toml/mod.rs cargo-0.33.0/src/cargo/util/toml/mod.rs
--- cargo-0.32.0/src/cargo/util/toml/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/toml/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -28,7 +28,7 @@
 
 pub fn read_manifest(
     path: &Path,
-    source_id: &SourceId,
+    source_id: SourceId,
     config: &Config,
 ) -> Result<(EitherManifest, Vec<PathBuf>), ManifestError> {
     trace!(
@@ -46,7 +46,7 @@
 fn do_read_manifest(
     contents: &str,
     manifest_file: &Path,
-    source_id: &SourceId,
+    source_id: SourceId,
     config: &Config,
 ) -> CargoResult<(EitherManifest, Vec<PathBuf>)> {
     let package_root = manifest_file.parent().unwrap();
@@ -517,7 +517,6 @@
             {
                 let seq = de::value::SeqAccessDeserializer::new(v);
                 Vec::deserialize(seq).map(StringOrVec)
-
             }
         }
 
@@ -661,15 +660,15 @@
 }
 
 impl TomlProject {
-    pub fn to_package_id(&self, source_id: &SourceId) -> CargoResult<PackageId> {
+    pub fn to_package_id(&self, source_id: SourceId) -> CargoResult<PackageId> {
         PackageId::new(&self.name, self.version.clone(), source_id)
     }
 }
 
 struct Context<'a, 'b> {
-    pkgid: Option<&'a PackageId>,
+    pkgid: Option<PackageId>,
     deps: &'a mut Vec<Dependency>,
-    source_id: &'a SourceId,
+    source_id: SourceId,
     nested_paths: &'a mut Vec<PathBuf>,
     config: &'b Config,
     warnings: &'a mut Vec<String>,
@@ -789,7 +788,7 @@
 
     fn to_real_manifest(
         me: &Rc<TomlManifest>,
-        source_id: &SourceId,
+        source_id: SourceId,
         package_root: &Path,
         config: &Config,
     ) -> CargoResult<(Manifest, Vec<PathBuf>)> {
@@ -817,7 +816,11 @@
             if c == '_' || c == '-' {
                 continue;
             }
-            bail!("Invalid character `{}` in package name: `{}`", c, package_name)
+            bail!(
+                "Invalid character `{}` in package name: `{}`",
+                c,
+                package_name
+            )
         }
 
         let pkgid = project.to_package_id(source_id)?;
@@ -870,7 +873,7 @@
 
         {
             let mut cx = Context {
-                pkgid: Some(&pkgid),
+                pkgid: Some(pkgid),
                 deps: &mut deps,
                 source_id,
                 nested_paths: &mut nested_paths,
@@ -1061,7 +1064,7 @@
 
     fn to_virtual_manifest(
         me: &Rc<TomlManifest>,
-        source_id: &SourceId,
+        source_id: SourceId,
         root: &Path,
         config: &Config,
     ) -> CargoResult<(VirtualManifest, Vec<PathBuf>)> {
@@ -1086,6 +1089,24 @@
         if me.bench.is_some() {
             bail!("virtual manifests do not specify [[bench]]");
         }
+        if me.dependencies.is_some() {
+            bail!("virtual manifests do not specify [dependencies]");
+        }
+        if me.dev_dependencies.is_some() || me.dev_dependencies2.is_some() {
+            bail!("virtual manifests do not specify [dev-dependencies]");
+        }
+        if me.build_dependencies.is_some() || me.build_dependencies2.is_some() {
+            bail!("virtual manifests do not specify [build-dependencies]");
+        }
+        if me.features.is_some() {
+            bail!("virtual manifests do not specify [features]");
+        }
+        if me.target.is_some() {
+            bail!("virtual manifests do not specify [target]");
+        }
+        if me.badges.is_some() {
+            bail!("virtual manifests do not specify [badges]");
+        }
 
         let mut nested_paths = Vec::new();
         let mut warnings = Vec::new();
@@ -1240,7 +1261,8 @@
             TomlDependency::Simple(ref version) => DetailedTomlDependency {
                 version: Some(version.clone()),
                 ..Default::default()
-            }.to_dependency(name, cx, kind),
+            }
+            .to_dependency(name, cx, kind),
             TomlDependency::Detailed(ref details) => details.to_dependency(name, cx, kind),
         }
     }
@@ -1358,7 +1380,7 @@
                     let path = util::normalize_path(&path);
                     SourceId::for_path(&path)?
                 } else {
-                    cx.source_id.clone()
+                    cx.source_id
                 }
             }
             (None, None, Some(registry), None) => SourceId::alt_registry(cx.config, registry)?,
@@ -1376,8 +1398,8 @@
 
         let version = self.version.as_ref().map(|v| &v[..]);
         let mut dep = match cx.pkgid {
-            Some(id) => Dependency::parse(pkg_name, version, &new_source_id, id, cx.config)?,
-            None => Dependency::parse_no_deprecated(pkg_name, version, &new_source_id)?,
+            Some(id) => Dependency::parse(pkg_name, version, new_source_id, id, cx.config)?,
+            None => Dependency::parse_no_deprecated(pkg_name, version, new_source_id)?,
         };
         dep.set_features(self.features.iter().flat_map(|x| x))
             .set_default_features(
@@ -1387,7 +1409,7 @@
             )
             .set_optional(self.optional.unwrap_or(false))
             .set_platform(cx.platform.clone())
-            .set_registry_id(&registry_id);
+            .set_registry_id(registry_id);
         if let Some(kind) = kind {
             dep.set_kind(kind);
         }
@@ -1474,7 +1496,14 @@
     }
 
     fn proc_macro(&self) -> Option<bool> {
-        self.proc_macro.or(self.proc_macro2)
+        self.proc_macro.or(self.proc_macro2).or_else(|| {
+            if let Some(types) = self.crate_types() {
+                if types.contains(&"proc-macro".to_string()) {
+                    return Some(true);
+                }
+            }
+            None
+        })
     }
 
     fn crate_types(&self) -> Option<&Vec<String>> {
diff -Nru cargo-0.32.0/src/cargo/util/toml/targets.rs cargo-0.33.0/src/cargo/util/toml/targets.rs
--- cargo-0.32.0/src/cargo/util/toml/targets.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/cargo/util/toml/targets.rs	2019-01-02 21:49:06.000000000 +0000
@@ -10,16 +10,16 @@
 //! It is a bit tricky because we need match explicit information from `Cargo.toml`
 //! with implicit info in directory layout.
 
-use std::path::{Path, PathBuf};
-use std::fs::{self, DirEntry};
 use std::collections::HashSet;
+use std::fs::{self, DirEntry};
+use std::path::{Path, PathBuf};
 
-use core::{compiler, Edition, Feature, Features, Target};
-use util::errors::{CargoResult, CargoResultExt};
 use super::{
     LibKind, PathValue, StringOrBool, StringOrVec, TomlBenchTarget, TomlBinTarget,
     TomlExampleTarget, TomlLibTarget, TomlManifest, TomlTarget, TomlTestTarget,
 };
+use core::{compiler, Edition, Feature, Features, Target};
+use util::errors::{CargoResult, CargoResultExt};
 
 pub fn targets(
     features: &Features,
@@ -206,6 +206,23 @@
     // A plugin requires exporting plugin_registrar so a crate cannot be
     // both at once.
     let crate_types = match (lib.crate_types(), lib.plugin, lib.proc_macro()) {
+        (Some(kinds), _, _) if kinds.contains(&"proc-macro".to_string()) => {
+            if let Some(true) = lib.plugin {
+                // This is a warning to retain backwards compatibility.
+                warnings.push(format!(
+                    "proc-macro library `{}` should not specify `plugin = true`",
+                    lib.name()
+                ));
+            }
+            warnings.push(format!(
+                "library `{}` should only specify `proc-macro = true` instead of setting `crate-type`",
+                lib.name()
+            ));
+            if kinds.len() > 1 {
+                bail!("cannot mix `proc-macro` crate type with others");
+            }
+            vec![LibKind::ProcMacro]
+        }
         (_, Some(true), Some(true)) => bail!("lib.plugin and lib.proc-macro cannot both be true"),
         (Some(kinds), _, _) => kinds.iter().map(|s| s.into()).collect(),
         (None, Some(true), _) => vec![LibKind::Dylib],
@@ -294,12 +311,8 @@
             Err(e) => bail!("{}", e),
         };
 
-        let mut target = Target::bin_target(
-            &bin.name(),
-            path,
-            bin.required_features.clone(),
-            edition,
-        );
+        let mut target =
+            Target::bin_target(&bin.name(), path, bin.required_features.clone(), edition);
         configure(features, bin, &mut target)?;
         result.push(target);
     }
@@ -396,12 +409,8 @@
 
     let mut result = Vec::new();
     for (path, toml) in targets {
-        let mut target = Target::test_target(
-            &toml.name(),
-            path,
-            toml.required_features.clone(),
-            edition,
-        );
+        let mut target =
+            Target::test_target(&toml.name(), path, toml.required_features.clone(), edition);
         configure(features, &toml, &mut target)?;
         result.push(target);
     }
@@ -455,12 +464,8 @@
 
     let mut result = Vec::new();
     for (path, toml) in targets {
-        let mut target = Target::bench_target(
-            &toml.name(),
-            path,
-            toml.required_features.clone(),
-            edition,
-        );
+        let mut target =
+            Target::bench_target(&toml.name(), path, toml.required_features.clone(), edition);
         configure(features, &toml, &mut target)?;
         result.push(target);
     }
@@ -527,7 +532,14 @@
     validate_unique_names(&toml_targets, target_kind)?;
     let mut result = Vec::new();
     for target in toml_targets {
-        let path = target_path(&target, inferred, target_kind, package_root, edition, legacy_path);
+        let path = target_path(
+            &target,
+            inferred,
+            target_kind,
+            package_root,
+            edition,
+            legacy_path,
+        );
         let path = match path {
             Ok(path) => path,
             Err(e) => {
@@ -617,7 +629,13 @@
 ) -> Vec<TomlTarget> {
     let inferred_targets = inferred_to_toml_targets(inferred);
     match toml_targets {
-        None => inferred_targets,
+        None => {
+            if let Some(false) = autodiscover {
+                vec![]
+            } else {
+                inferred_targets
+            }
+        }
         Some(targets) => {
             let mut targets = targets.clone();
 
@@ -704,9 +722,11 @@
     target_kind: &str,
 ) -> CargoResult<()> {
     match target.name {
-        Some(ref name) => if name.trim().is_empty() {
-            bail!("{} target names cannot be empty", target_kind_human)
-        },
+        Some(ref name) => {
+            if name.trim().is_empty() {
+                bail!("{} target names cannot be empty", target_kind_human)
+            }
+        }
         None => bail!(
             "{} target {}.name is required",
             target_kind_human,
@@ -733,11 +753,7 @@
     Ok(())
 }
 
-fn configure(
-    features: &Features,
-    toml: &TomlTarget,
-    target: &mut Target,
-) -> CargoResult<()> {
+fn configure(features: &Features, toml: &TomlTarget, target: &mut Target) -> CargoResult<()> {
     let t2 = target.clone();
     target
         .set_tested(toml.test.unwrap_or_else(|| t2.tested()))
@@ -751,8 +767,14 @@
             (Some(false), _) | (_, Some(false)) => false,
         });
     if let Some(edition) = toml.edition.clone() {
-        features.require(Feature::edition()).chain_err(|| "editions are unstable")?;
-        target.set_edition(edition.parse().chain_err(|| "failed to parse the `edition` key")?);
+        features
+            .require(Feature::edition())
+            .chain_err(|| "editions are unstable")?;
+        target.set_edition(
+            edition
+                .parse()
+                .chain_err(|| "failed to parse the `edition` key")?,
+        );
     }
     Ok(())
 }
diff -Nru cargo-0.32.0/src/crates-io/Cargo.toml cargo-0.33.0/src/crates-io/Cargo.toml
--- cargo-0.32.0/src/crates-io/Cargo.toml	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/crates-io/Cargo.toml	2019-01-02 21:49:06.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "crates-io"
-version = "0.20.0"
+version = "0.21.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
diff -Nru cargo-0.32.0/src/crates-io/lib.rs cargo-0.33.0/src/crates-io/lib.rs
--- cargo-0.32.0/src/crates-io/lib.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/crates-io/lib.rs	2019-01-02 21:49:06.000000000 +0000
@@ -86,6 +86,7 @@
 pub struct Warnings {
     pub invalid_categories: Vec<String>,
     pub invalid_badges: Vec<String>,
+    pub other: Vec<String>,
 }
 
 #[derive(Deserialize)]
@@ -223,9 +224,17 @@
             .map(|x| x.iter().flat_map(|j| j.as_str()).map(Into::into).collect())
             .unwrap_or_else(Vec::new);
 
+        let other: Vec<String> = response
+            .get("warnings")
+            .and_then(|j| j.get("other"))
+            .and_then(|j| j.as_array())
+            .map(|x| x.iter().flat_map(|j| j.as_str()).map(Into::into).collect())
+            .unwrap_or_else(Vec::new);
+
         Ok(Warnings {
             invalid_categories,
             invalid_badges,
+            other,
         })
     }
 
diff -Nru cargo-0.32.0/src/doc/src/appendix/glossary.md cargo-0.33.0/src/doc/src/appendix/glossary.md
--- cargo-0.32.0/src/doc/src/appendix/glossary.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/src/doc/src/appendix/glossary.md	2019-01-02 21:49:06.000000000 +0000
@@ -0,0 +1,178 @@
+# Glossary
+
+### Artifact
+
+An *artifact* is the file or set of files created as a result of the
+compilation process. This includes linkable libraries and executable binaries.
+
+### Crate
+
+Every target in a package is a *crate*. Crates are either libraries or
+executable binaries. It may loosely refer to either the source code of the
+target, or the compiled artifact that the target produces. A crate may also
+refer to a compressed package fetched from a registry.
+
+### Edition
+
+A *Rust edition* is a developmental landmark of the Rust language. The
+[edition of a package][edition-field] is specified in the `Cargo.toml`
+manifest, and individual targets can specify which edition they use. See the
+[Edition Guide] for more information.
+
+### Feature
+
+A [*feature*][feature] is a named flag which allows for conditional
+compilation. A feature can refer to an optional dependency, or an arbitrary
+name defined in a `Cargo.toml` manifest that can be checked within source
+code.
+
+Cargo has [*unstable feature flags*][cargo-unstable] which can be used to
+enable experimental behavior of Cargo itself. The Rust compiler and Rustdoc
+also have their own unstable feature flags (see [The Unstable
+Book][unstable-book] and [The Rustdoc Book][rustdoc-unstable]).
+
+### Index
+
+The index is the searchable list of crates in a registry.
+
+### Lock file
+
+The `Cargo.lock` *lock file* is a file that captures the exact version of
+every dependency used in a workspace or package. It is automatically generated
+by Cargo. See [Cargo.toml vs Cargo.lock].
+
+### Manifest
+
+A [*manifest*][manifest] is a description of a package or a workspace in a
+file named `Cargo.toml`.
+
+A [*virtual manifest*][virtual] is a `Cargo.toml` file that only describes a
+workspace, and does not include a package.
+
+### Member
+
+A *member* is a package that belongs to a workspace.
+
+### Package
+
+A *package* is a collection of source files and a `Cargo.toml` manifest which
+describes the package. A package has a name and version which is used for
+specifying dependencies between packages. A package contains multiple targets,
+which are either libraries or executable binaries.
+
+The *package root* is the directory where the package's `Cargo.toml` manifest
+is located.
+
+The [*package id specification*][pkgid-spec], or *SPEC*, is a string used to
+uniquely reference a specific version of a package from a specific source.
+
+### Project
+
+Another name for a [package](#package).
+
+### Registry
+
+A *registry* is a service that contains a collection of downloadable crates
+that can be installed or used as dependencies for a package. The default
+registry is [crates.io](https://crates.io). The registry has an *index* which
+contains a list of all crates, and tells Cargo how to download the crates that
+are needed.
+
+### Source
+
+A *source* is a provider that contains crates that may be included as
+dependencies for a package. There are several kinds of sources:
+
+- **Registry source** — See [registry](#registry).
+- **Local registry source** — A set of crates stored as compressed files on
+  the filesystem. See [Local Registry Sources].
+- **Directory source** — A set of crates stored as uncompressed files on the
+  filesystem. See [Directory Sources].
+- **Path source** — An individual package located on the filesystem (such as a
+  [path dependency]) or a set of multiple packages (such as [path overrides]).
+- **Git source** — Packages located in a git repository (such as a [git
+  dependency] or [git source]).
+
+See [Source Replacement] for more information.
+
+### Spec
+
+See [package id specification](#package).
+
+### Target
+
+The meaning of the term *target* depends on the context:
+
+- **Cargo Target** — Cargo packages consist of *targets* which correspond to
+  artifacts that will be produced. Packages can have library, binary, example,
+  test, and benchmark targets. The [list of targets][targets] are configured
+  in the `Cargo.toml` manifest, often inferred automatically by the [directory
+  layout] of the source files.
+- **Target Architecture** — The OS and machine architecture for the built
+  artifacts are typically referred to as a *target*.
+- **Target Triple** — A triple is a specific format for specifying a target
+  architecture. See the [clang documentation] for details. Triples may be
+  referred to as a *target triple* which is the architecture for the artifact
+  produced, and the *host triple* which is the architecture that the compiler
+  is running on. The target triple can be specified with the `--target`
+  command-line option or the `build.target` [config option].
+- **Target Directory** — Cargo places all built artifacts and intermediate
+  files in the *target* directory. By default this is a directory named
+  `target` at the workspace root, or the package root if not using a
+  workspace. The directory be changed with the `--target-dir` command-line option,
+  the `CARGO_TARGET_DIR` [environment variable], or the `build.target-dir`
+  [config option].
+
+### Test Targets
+
+Cargo *test targets* generate binaries which help verify proper operation and
+correctness of code. There are two types of test artifacts:
+
+* **Unit test** — A *unit test* is an executable binary compiled directly from
+  a library or a binary target. It contains the entire contents of the library
+  or binary code, and runs `#[test]` annotated functions, intended to verify
+  individual units of code.
+* **Integration test target** — An [*integration test
+  target*][integration-tests] is an executable binary compiled from a *test
+  target* which is a distinct crate whose source is located in the `tests`
+  directory or specified by the [`[[test]]` table][targets] in the
+  `Cargo.toml` manifest. It is intended to only test the public API of a
+  library, or execute a binary to verify its operation.
+
+### Workspace
+
+A [*workspace*][workspace] is a collection of one or more packages that share
+common dependency resolution (with a shared `Cargo.lock`), output directory,
+and various settings such as profiles.
+
+A [*virtual workspace*][virtual] is a workspace where the root `Cargo.toml`
+manifest does not define a package, and only lists the workspace members.
+
+The *workspace root* is the directory where the workspace's `Cargo.toml`
+manifest is located.
+
+
+[Cargo.toml vs Cargo.lock]: guide/cargo-toml-vs-cargo-lock.html
+[Directory Sources]: reference/source-replacement.html#directory-sources
+[Local Registry Sources]: reference/source-replacement.html#local-registry-sources
+[Source Replacement]: reference/source-replacement.html
+[cargo-unstable]: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html
+[clang documentation]: http://clang.llvm.org/docs/CrossCompilation.html#target-triple
+[config option]: reference/config.html
+[directory layout]: reference/manifest.html#the-project-layout
+[edition guide]: https://rust-lang-nursery.github.io/edition-guide/
+[edition-field]: reference/manifest.html#the-edition-field-optional
+[environment variable]: reference/environment-variables.html
+[feature]: reference/manifest.html#the-features-section
+[git dependency]: reference/specifying-dependencies.html#specifying-dependencies-from-git-repositories
+[git source]: reference/source-replacement.html
+[integration-tests]: reference/manifest.html#integration-tests
+[manifest]: reference/manifest.html
+[path dependency]: reference/specifying-dependencies.html#specifying-path-dependencies
+[path overrides]: reference/specifying-dependencies.html#overriding-with-local-dependencies
+[pkgid-spec]: reference/pkgid-spec.html
+[rustdoc-unstable]: https://doc.rust-lang.org/nightly/rustdoc/unstable-features.html
+[targets]: reference/manifest.html#configuring-a-target
+[unstable-book]: https://doc.rust-lang.org/nightly/unstable-book/index.html
+[virtual]: reference/manifest.html#virtual-manifest
+[workspace]: reference/manifest.html#the-workspace-section
diff -Nru cargo-0.32.0/src/doc/src/reference/config.md cargo-0.33.0/src/doc/src/reference/config.md
--- cargo-0.32.0/src/doc/src/reference/config.md	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/doc/src/reference/config.md	2019-01-02 21:49:06.000000000 +0000
@@ -102,7 +102,7 @@
 cainfo = "cert.pem" # Path to Certificate Authority (CA) bundle (optional)
 check-revoke = true # Indicates whether SSL certs are checked for revocation
 low-speed-limit = 5 # Lower threshold for bytes/sec (10 = default, 0 = disabled)
-multiplexing = false  # whether or not to use HTTP/2 multiplexing where possible
+multiplexing = true # whether or not to use HTTP/2 multiplexing where possible
 
 # This setting can be used to help debug what's going on with HTTP requests made
 # by Cargo. When set to `true` then Cargo's normal debug logging will be filled
diff -Nru cargo-0.32.0/src/doc/src/reference/manifest.md cargo-0.33.0/src/doc/src/reference/manifest.md
--- cargo-0.32.0/src/doc/src/reference/manifest.md	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/doc/src/reference/manifest.md	2019-01-02 21:49:06.000000000 +0000
@@ -125,7 +125,7 @@
 `exclude`. Note that `include` must be an exhaustive list of files as otherwise
 necessary source files may not be included.
 
-[globs]: http://doc.rust-lang.org/glob/glob/struct.Pattern.html
+[globs]: https://docs.rs/glob/0.2.11/glob/struct.Pattern.html
 
 #### Migrating to `gitignore`-like pattern matching
 
@@ -341,7 +341,8 @@
 overflow-checks = true # use overflow checks for integer arithmetic.
                    # Passes the `-C overflow-checks=...` flag to the compiler.
 
-# The release profile, used for `cargo build --release`.
+# The release profile, used for `cargo build --release` (and the dependencies
+# for `cargo test --release`,  including the local library or binary).
 [profile.release]
 opt-level = 3
 debug = false
@@ -353,7 +354,8 @@
 incremental = false
 overflow-checks = false
 
-# The testing profile, used for `cargo test`.
+# The testing profile, used for `cargo test` (for `cargo test --release` see
+# the `release` and `bench` profiles).
 [profile.test]
 opt-level = 0
 debug = 2
@@ -365,7 +367,8 @@
 incremental = true
 overflow-checks = true
 
-# The benchmarking profile, used for `cargo bench` and `cargo test --release`.
+# The benchmarking profile, used for `cargo bench` (and the test targets and
+# unit tests for `cargo test --release`).
 [profile.bench]
 opt-level = 3
 debug = false
diff -Nru cargo-0.32.0/src/doc/src/reference/specifying-dependencies.md cargo-0.33.0/src/doc/src/reference/specifying-dependencies.md
--- cargo-0.32.0/src/doc/src/reference/specifying-dependencies.md	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/doc/src/reference/specifying-dependencies.md	2019-01-02 21:49:06.000000000 +0000
@@ -113,7 +113,8 @@
 
 Cargo will fetch the `git` repository at this location then look for a
 `Cargo.toml` for the requested crate anywhere inside the `git` repository
-(not necessarily at the root).
+(not necessarily at the root - for example, specifying a member crate name
+of a workspace and setting `git` to the repository containing the workspace).
 
 Since we haven’t specified any other information, Cargo assumes that
 we intend to use the latest commit on the `master` branch to build our package.
@@ -200,7 +201,7 @@
 
 Let's say you're working with the [`uuid` crate] but while you're working on it
 you discover a bug. You are, however, quite enterprising so you decide to also
-try out to fix the bug! Originally your manifest will look like:
+try to fix the bug! Originally your manifest will look like:
 
 [`uuid` crate]: https://crates.io/crates/uuid
 
diff -Nru cargo-0.32.0/src/doc/src/reference/unstable.md cargo-0.33.0/src/doc/src/reference/unstable.md
--- cargo-0.32.0/src/doc/src/reference/unstable.md	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/doc/src/reference/unstable.md	2019-01-02 21:49:06.000000000 +0000
@@ -21,14 +21,14 @@
 
 ```toml
 [registries]
-my-registry = { index = "https://my-intranet:8080/index" }
+my-registry = { index = "https://my-intranet:8080/git/index" }
 ```
 
 Authentication information for alternate registries can be added to
 `.cargo/credentials`:
 
 ```toml
-[my-registry]
+[registries.my-registry]
 token = "api-token"
 ```
 
diff -Nru cargo-0.32.0/src/doc/src/SUMMARY.md cargo-0.33.0/src/doc/src/SUMMARY.md
--- cargo-0.32.0/src/doc/src/SUMMARY.md	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/src/doc/src/SUMMARY.md	2019-01-02 21:49:06.000000000 +0000
@@ -30,3 +30,4 @@
     * [Unstable Features](reference/unstable.md)
 
 * [FAQ](faq.md)
+* [Appendix: Glossary](appendix/glossary.md)
diff -Nru cargo-0.32.0/tests/testsuite/alt_registry.rs cargo-0.33.0/tests/testsuite/alt_registry.rs
--- cargo-0.32.0/tests/testsuite/alt_registry.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/alt_registry.rs	2019-01-02 21:49:06.000000000 +0000
@@ -458,7 +458,7 @@
 }
 
 #[test]
-fn credentials_in_url_forbidden() {
+fn passwords_in_url_forbidden() {
     registry::init();
 
     let config = paths::home().join(".cargo/config");
@@ -489,6 +489,6 @@
     p.cargo("publish --registry alternative -Zunstable-options")
         .masquerade_as_nightly_cargo()
         .with_status(101)
-        .with_stderr_contains("error: Registry URLs may not contain credentials")
+        .with_stderr_contains("error: Registry URLs may not contain passwords")
         .run();
 }
diff -Nru cargo-0.32.0/tests/testsuite/bad_config.rs cargo-0.33.0/tests/testsuite/bad_config.rs
--- cargo-0.32.0/tests/testsuite/bad_config.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/bad_config.rs	2019-01-02 21:49:06.000000000 +0000
@@ -734,7 +734,7 @@
     p.cargo("build --all")
         .with_stderr(
             "\
-warning: unused manifest key: workspace.bulid
+[WARNING] [..]/foo/Cargo.toml: unused manifest key: workspace.bulid
 [COMPILING] bar [..]
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
 ",
diff -Nru cargo-0.32.0/tests/testsuite/build_plan.rs cargo-0.33.0/tests/testsuite/build_plan.rs
--- cargo-0.32.0/tests/testsuite/build_plan.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/build_plan.rs	2019-01-02 21:49:06.000000000 +0000
@@ -28,7 +28,8 @@
                 "package_name": "foo",
                 "package_version": "0.5.0",
                 "program": "rustc",
-                "target_kind": ["bin"]
+                "target_kind": ["bin"],
+                "compile_mode": "build"
             }
         ]
     }
@@ -86,7 +87,8 @@
                 "package_name": "bar",
                 "package_version": "0.0.1",
                 "program": "rustc",
-                "target_kind": ["lib"]
+                "target_kind": ["lib"],
+                "compile_mode": "build"
             },
             {
                 "args": "{...}",
@@ -101,7 +103,8 @@
                 "package_name": "foo",
                 "package_version": "0.5.0",
                 "program": "rustc",
-                "target_kind": ["lib"]
+                "target_kind": ["lib"],
+                "compile_mode": "build"
             }
         ]
     }
@@ -148,7 +151,8 @@
                 "package_name": "foo",
                 "package_version": "0.5.0",
                 "program": "rustc",
-                "target_kind": ["custom-build"]
+                "target_kind": ["custom-build"],
+                "compile_mode": "build"
             },
             {
                 "args": "{...}",
@@ -161,7 +165,8 @@
                 "package_name": "foo",
                 "package_version": "0.5.0",
                 "program": "[..]/build-script-build",
-                "target_kind": ["custom-build"]
+                "target_kind": ["custom-build"],
+                "compile_mode": "run-custom-build"
             },
             {
                 "args": "{...}",
@@ -174,7 +179,8 @@
                 "package_name": "foo",
                 "package_version": "0.5.0",
                 "program": "rustc",
-                "target_kind": ["bin"]
+                "target_kind": ["bin"],
+                "compile_mode": "build"
             }
         ]
     }
diff -Nru cargo-0.32.0/tests/testsuite/build.rs cargo-0.33.0/tests/testsuite/build.rs
--- cargo-0.32.0/tests/testsuite/build.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/build.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4147,43 +4147,40 @@
 
     p.cargo("build -v")
         .with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
+            "[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
              --emit=dep-info,link[..]",
         ).with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
+            "[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
              --emit=dep-info,link[..]",
         ).run();
 
     p.root().join("target").rm_rf();
     p.cargo("build -v --test=t1")
         .with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
-             --emit=dep-info,link[..]",
+            "[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
+             --emit=dep-info,link -C debuginfo=2 [..]",
         ).with_stderr_contains(
-            "[RUNNING] `rustc --crate-name t1 tests/t1.rs --color never --emit=dep-info,link[..]",
+            "[RUNNING] `rustc --crate-name t1 tests/t1.rs --color never --emit=dep-info,link \
+            -C debuginfo=2 [..]",
         ).with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
-             --emit=dep-info,link[..]",
+            "[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
+             --emit=dep-info,link -C debuginfo=2 [..]",
         ).run();
 
     p.root().join("target").rm_rf();
+    // Bench uses test profile without `--release`.
     p.cargo("build -v --bench=b1")
         .with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
-             --emit=dep-info,link[..]",
+            "[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
+             --emit=dep-info,link -C debuginfo=2 [..]",
         ).with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name b1 benches/b1.rs --color never --emit=dep-info,link \
-             -C opt-level=3[..]",
-        ).with_stderr_contains(
-            "\
-             [RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
-             --emit=dep-info,link[..]",
+            "[RUNNING] `rustc --crate-name b1 benches/b1.rs --color never --emit=dep-info,link \
+            -C debuginfo=2 [..]",
+        )
+        .with_stderr_does_not_contain("opt-level")
+        .with_stderr_contains(
+            "[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
+             --emit=dep-info,link -C debuginfo=2 [..]",
         ).run();
 }
 
@@ -4213,10 +4210,6 @@
         .with_stderr_contains("\
             [RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
             --emit=dep-info,link[..]")
-        // bench
-        .with_stderr_contains("\
-            [RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
-            -C opt-level=3 --test [..]")
         // unit test
         .with_stderr_contains("\
             [RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
@@ -4231,10 +4224,6 @@
         .with_stderr_contains("\
             [RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
             --emit=dep-info,link[..]")
-        // bench
-        .with_stderr_contains("\
-            [RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
-            -C opt-level=3 --test [..]")
         // unit test
         .with_stderr_contains("\
             [RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
@@ -4327,8 +4316,8 @@
         .file("a/src/lib.rs", "")
         .file("a/examples/ex1.rs", "fn main() {}")
         .file("b/Cargo.toml", &basic_bin_manifest("b"))
+        .file("b/src/lib.rs", "")
         .file("b/src/main.rs", "fn main() {}")
-        .file("b/examples/ex1.rs", "fn main() {}")
         .build();
 
     ws.cargo("build -v --example ex")
@@ -4343,12 +4332,12 @@
     ws.cargo("build -v --lib")
         .with_status(0)
         .with_stderr_contains("[RUNNING] `rustc [..]a/src/lib.rs[..]")
+        .with_stderr_contains("[RUNNING] `rustc [..]b/src/lib.rs[..]")
         .run();
 
     ws.cargo("build -v --example ex1")
         .with_status(0)
         .with_stderr_contains("[RUNNING] `rustc [..]a/examples/ex1.rs[..]")
-        .with_stderr_contains("[RUNNING] `rustc [..]b/examples/ex1.rs[..]")
         .run();
 }
 
@@ -4373,3 +4362,133 @@
         .with_stderr("[ERROR] no library targets found in packages: a, b")
         .run();
 }
+
+#[cfg(unix)]
+#[test]
+fn signal_display() {
+    // Cause the compiler to crash with a signal.
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [dependencies]
+            pm = { path = "pm" }
+        "#,
+        )
+        .file(
+            "src/lib.rs",
+            r#"
+            #[macro_use]
+            extern crate pm;
+
+            #[derive(Foo)]
+            pub struct S;
+        "#,
+        )
+        .file(
+            "pm/Cargo.toml",
+            r#"
+            [package]
+            name = "pm"
+            version = "0.1.0"
+            [lib]
+            proc-macro = true
+        "#,
+        )
+        .file(
+            "pm/src/lib.rs",
+            r#"
+            extern crate proc_macro;
+            use proc_macro::TokenStream;
+
+            #[proc_macro_derive(Foo)]
+            pub fn derive(_input: TokenStream) -> TokenStream {
+                std::process::abort()
+            }
+        "#,
+        )
+        .build();
+
+    foo.cargo("build")
+        .with_stderr("\
+[COMPILING] pm [..]
+[COMPILING] foo [..]
+[ERROR] Could not compile `foo`.
+
+Caused by:
+  process didn't exit successfully: `rustc [..]` (signal: 6, SIGABRT: process abort signal)
+")
+        .with_status(101)
+        .run();
+}
+
+#[test]
+fn json_parse_fail() {
+    // Ensure when json parsing fails, and rustc exits with non-zero exit
+    // code, that a useful error message is displayed.
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [dependencies]
+            pm = { path = "pm" }
+        "#,
+        )
+        .file(
+            "src/lib.rs",
+            r#"
+            #[macro_use]
+            extern crate pm;
+
+            #[derive(Foo)]
+            pub struct S;
+        "#,
+        )
+        .file(
+            "pm/Cargo.toml",
+            r#"
+            [package]
+            name = "pm"
+            version = "0.1.0"
+            [lib]
+            proc-macro = true
+        "#,
+        )
+        .file(
+            "pm/src/lib.rs",
+            r#"
+            extern crate proc_macro;
+            use proc_macro::TokenStream;
+
+            #[proc_macro_derive(Foo)]
+            pub fn derive(_input: TokenStream) -> TokenStream {
+                eprintln!("{{evil proc macro}}");
+                panic!("something went wrong");
+            }
+        "#,
+        )
+        .build();
+
+    foo.cargo("build --message-format=json")
+        .with_stderr(
+            "\
+[COMPILING] pm [..]
+[COMPILING] foo [..]
+[ERROR] Could not compile `foo`.
+
+Caused by:
+  compiler produced invalid json: `{evil proc macro}`
+
+Caused by:
+  failed to parse process output: `rustc [..]
+",
+        )
+        .with_status(101)
+        .run();
+}
diff -Nru cargo-0.32.0/tests/testsuite/build_script.rs cargo-0.33.0/tests/testsuite/build_script.rs
--- cargo-0.32.0/tests/testsuite/build_script.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/build_script.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1376,18 +1376,8 @@
 
 #[test]
 fn build_script_with_dynamic_native_dependency() {
-    let _workspace = project()
-        .at("ws")
-        .file(
-            "Cargo.toml",
-            r#"
-            [workspace]
-            members = ["builder", "foo"]
-        "#,
-        ).build();
-
     let build = project()
-        .at("ws/builder")
+        .at("builder")
         .file(
             "Cargo.toml",
             r#"
@@ -1399,13 +1389,11 @@
             [lib]
             name = "builder"
             crate-type = ["dylib"]
-            plugin = true
         "#,
         ).file("src/lib.rs", "#[no_mangle] pub extern fn foo() {}")
         .build();
 
     let foo = project()
-        .at("ws/foo")
         .file(
             "Cargo.toml",
             r#"
@@ -1433,12 +1421,23 @@
             "bar/build.rs",
             r#"
             use std::env;
+            use std::fs;
             use std::path::PathBuf;
 
             fn main() {
-                let src = PathBuf::from(env::var("SRC").unwrap());
-                println!("cargo:rustc-link-search=native={}/target/debug/deps",
-                         src.display());
+                let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+                let root = PathBuf::from(env::var("BUILDER_ROOT").unwrap());
+                let file = format!("{}builder{}",
+                    env::consts::DLL_PREFIX,
+                    env::consts::DLL_SUFFIX);
+                let src = root.join(&file);
+                let dst = out_dir.join(&file);
+                fs::copy(src, dst).unwrap();
+                if cfg!(windows) {
+                    fs::copy(root.join("builder.dll.lib"),
+                             out_dir.join("builder.dll.lib")).unwrap();
+                }
+                println!("cargo:rustc-link-search=native={}", out_dir.display());
             }
         "#,
         ).file(
@@ -1458,8 +1457,9 @@
         .env("RUST_LOG", "cargo::ops::cargo_rustc")
         .run();
 
+    let root = build.root().join("target").join("debug");
     foo.cargo("build -v")
-        .env("SRC", build.root())
+        .env("BUILDER_ROOT", root)
         .env("RUST_LOG", "cargo::ops::cargo_rustc")
         .run();
 }
@@ -3191,6 +3191,24 @@
 
 #[test]
 fn rename_with_link_search_path() {
+    _rename_with_link_search_path(false);
+}
+
+#[test]
+fn rename_with_link_search_path_cross() {
+    if cross_compile::disabled() {
+        return;
+    }
+
+    _rename_with_link_search_path(true);
+}
+
+fn _rename_with_link_search_path(cross: bool) {
+    let target_arg = if cross {
+        format!(" --target={}", cross_compile::alternate())
+    } else {
+        "".to_string()
+    };
     let p = project()
         .file(
             "Cargo.toml",
@@ -3209,7 +3227,7 @@
         );
     let p = p.build();
 
-    p.cargo("build").run();
+    p.cargo(&format!("build{}", target_arg)).run();
 
     let p2 = project()
         .at("bar")
@@ -3242,7 +3260,7 @@
                 } else {
                     println!("cargo:rustc-link-lib=foo");
                 }
-                println!("cargo:rustc-link-search={}",
+                println!("cargo:rustc-link-search=all={}",
                          dst.parent().unwrap().display());
             }
         "#,
@@ -3265,7 +3283,11 @@
     // the `p` project. On OSX the `libfoo.dylib` artifact references the
     // original path in `p` so we want to make sure that it can't find it (hence
     // the deletion).
-    let root = p.root().join("target").join("debug").join("deps");
+    let root = if cross {
+        p.root().join("target").join(cross_compile::alternate()).join("debug").join("deps")
+    } else {
+        p.root().join("target").join("debug").join("deps")
+    };
     let file = format!("{}foo{}", env::consts::DLL_PREFIX, env::consts::DLL_SUFFIX);
     let src = root.join(&file);
 
@@ -3280,7 +3302,7 @@
     remove_dir_all(p.root()).unwrap();
 
     // Everything should work the first time
-    p2.cargo("run").run();
+    p2.cargo(&format!("run{}", target_arg)).run();
 
     // Now rename the root directory and rerun `cargo run`. Not only should we
     // not build anything but we also shouldn't crash.
@@ -3309,7 +3331,7 @@
         thread::sleep(Duration::from_millis(100));
     }
 
-    p2.cargo("run")
+    p2.cargo(&format!("run{}", target_arg))
         .cwd(&new)
         .with_stderr(
             "\
diff -Nru cargo-0.32.0/tests/testsuite/cargo_alias_config.rs cargo-0.33.0/tests/testsuite/cargo_alias_config.rs
--- cargo-0.32.0/tests/testsuite/cargo_alias_config.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/cargo_alias_config.rs	2019-01-02 21:49:06.000000000 +0000
@@ -23,24 +23,6 @@
 }
 
 #[test]
-fn alias_default_config_overrides_config() {
-    let p = project()
-        .file("Cargo.toml", &basic_bin_manifest("foo"))
-        .file("src/main.rs", "fn main() {}")
-        .file(
-            ".cargo/config",
-            r#"
-            [alias]
-            b = "not_build"
-        "#,
-        ).build();
-
-    p.cargo("b -v")
-        .with_stderr_contains("[COMPILING] foo v0.5.0 [..]")
-        .run();
-}
-
-#[test]
 fn alias_config() {
     let p = project()
         .file("Cargo.toml", &basic_bin_manifest("foo"))
@@ -122,7 +104,7 @@
 }
 
 #[test]
-fn cant_shadow_builtin() {
+fn alias_cannot_shadow_builtin_command() {
     let p = project()
         .file("Cargo.toml", &basic_bin_manifest("foo"))
         .file("src/main.rs", "fn main() {}")
@@ -137,9 +119,46 @@
     p.cargo("build")
         .with_stderr(
             "\
-[WARNING] alias `build` is ignored, because it is shadowed by a built in command
+[WARNING] user-defined alias `build` is ignored, because it is shadowed by a built-in command
+[COMPILING] foo v0.5.0 ([..])
+[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
+",
+        ).run();
+}
+
+#[test]
+fn alias_override_builtin_alias() {
+    let p = project()
+        .file("Cargo.toml", &basic_bin_manifest("foo"))
+        .file("src/main.rs", "fn main() {}")
+        .file(
+            ".cargo/config",
+            r#"
+            [alias]
+            b = "run"
+         "#,
+        ).build();
+
+    p.cargo("b")
+        .with_stderr(
+            "\
 [COMPILING] foo v0.5.0 ([..])
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
+[RUNNING] `target/debug/foo[EXE]`
 ",
         ).run();
 }
+
+#[test]
+fn builtin_alias_takes_options() {
+    // #6381
+    let p = project()
+        .file("src/lib.rs", "")
+        .file(
+            "examples/ex1.rs",
+            r#"fn main() { println!("{}", std::env::args().skip(1).next().unwrap()) }"#,
+        )
+        .build();
+
+    p.cargo("r --example ex1 -- asdf").with_stdout("asdf").run();
+}
diff -Nru cargo-0.32.0/tests/testsuite/cargo_command.rs cargo-0.33.0/tests/testsuite/cargo_command.rs
--- cargo-0.32.0/tests/testsuite/cargo_command.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/cargo_command.rs	2019-01-02 21:49:06.000000000 +0000
@@ -265,12 +265,9 @@
     cargo_process("foo bar -v --help")
         .env("PATH", &path)
         .with_stdout(
-            if cfg!(windows) { // weird edge-case w/ CWD & (windows vs unix)
-                format!(r#"[{:?}, "foo", "bar", "-v", "--help"]"#, cargo_foo_bin)
-            } else {
-                r#"["[CWD]/cargo-foo/target/debug/cargo-foo", "foo", "bar", "-v", "--help"]"#.to_string()
-            }
-        ).run();
+            r#"["[CWD]/cargo-foo/target/debug/cargo-foo[EXE]", "foo", "bar", "-v", "--help"]"#,
+        )
+        .run();
 }
 
 #[test]
diff -Nru cargo-0.32.0/tests/testsuite/check.rs cargo-0.33.0/tests/testsuite/check.rs
--- cargo-0.32.0/tests/testsuite/check.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/check.rs	2019-01-02 21:49:06.000000000 +0000
@@ -2,7 +2,6 @@
 
 use glob::glob;
 use support::install::exe;
-use support::is_nightly;
 use support::paths::CargoPathExt;
 use support::registry::Package;
 use support::{basic_manifest, project};
@@ -573,39 +572,44 @@
         .file("examples/ex1.rs", "fn main() {}")
         .file("benches/b1.rs", "")
         .build();
+
+    let assert_glob = |path: &str, count: usize| {
+        assert_eq!(
+            glob(&p.root().join(path).to_str().unwrap())
+                .unwrap()
+                .count(),
+            count
+        );
+    };
+
     p.cargo("check").run();
-    assert!(p.root().join("target/debug/libfoo.rmeta").is_file());
+    assert!(!p.root().join("target/debug/libfoo.rmeta").is_file());
     assert!(!p.root().join("target/debug/libfoo.rlib").is_file());
     assert!(!p.root().join("target/debug").join(exe("foo")).is_file());
+    assert_glob("target/debug/deps/libfoo-*.rmeta", 2);
 
     p.root().join("target").rm_rf();
     p.cargo("check --lib").run();
-    assert!(p.root().join("target/debug/libfoo.rmeta").is_file());
+    assert!(!p.root().join("target/debug/libfoo.rmeta").is_file());
     assert!(!p.root().join("target/debug/libfoo.rlib").is_file());
     assert!(!p.root().join("target/debug").join(exe("foo")).is_file());
+    assert_glob("target/debug/deps/libfoo-*.rmeta", 1);
 
     p.root().join("target").rm_rf();
     p.cargo("check --bin foo").run();
-    if is_nightly() {
-        // The nightly check can be removed once 1.27 is stable.
-        // Bins now generate `rmeta` files.
-        // See: https://github.com/rust-lang/rust/pull/49289
-        assert!(p.root().join("target/debug/libfoo.rmeta").is_file());
-    }
+    assert!(!p.root().join("target/debug/libfoo.rmeta").is_file());
     assert!(!p.root().join("target/debug/libfoo.rlib").is_file());
     assert!(!p.root().join("target/debug").join(exe("foo")).is_file());
+    assert_glob("target/debug/deps/libfoo-*.rmeta", 2);
 
     p.root().join("target").rm_rf();
     p.cargo("check --test t1").run();
     assert!(!p.root().join("target/debug/libfoo.rmeta").is_file());
     assert!(!p.root().join("target/debug/libfoo.rlib").is_file());
     assert!(!p.root().join("target/debug").join(exe("foo")).is_file());
-    assert_eq!(
-        glob(&p.root().join("target/debug/t1-*").to_str().unwrap())
-            .unwrap()
-            .count(),
-        0
-    );
+    assert_glob("target/debug/t1-*", 0);
+    assert_glob("target/debug/deps/libfoo-*.rmeta", 1);
+    assert_glob("target/debug/deps/libt1-*.rmeta", 1);
 
     p.root().join("target").rm_rf();
     p.cargo("check --example ex1").run();
@@ -617,18 +621,17 @@
             .join(exe("ex1"))
             .is_file()
     );
+    assert_glob("target/debug/deps/libfoo-*.rmeta", 1);
+    assert_glob("target/debug/examples/libex1-*.rmeta", 1);
 
     p.root().join("target").rm_rf();
     p.cargo("check --bench b1").run();
     assert!(!p.root().join("target/debug/libfoo.rmeta").is_file());
     assert!(!p.root().join("target/debug/libfoo.rlib").is_file());
     assert!(!p.root().join("target/debug").join(exe("foo")).is_file());
-    assert_eq!(
-        glob(&p.root().join("target/debug/b1-*").to_str().unwrap())
-            .unwrap()
-            .count(),
-        0
-    );
+    assert_glob("target/debug/b1-*", 0);
+    assert_glob("target/debug/deps/libfoo-*.rmeta", 1);
+    assert_glob("target/debug/deps/libb1-*.rmeta", 1);
 }
 
 #[test]
diff -Nru cargo-0.32.0/tests/testsuite/clean.rs cargo-0.33.0/tests/testsuite/clean.rs
--- cargo-0.32.0/tests/testsuite/clean.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/clean.rs	2019-01-02 21:49:06.000000000 +0000
@@ -117,6 +117,13 @@
 [FINISHED] release [optimized] target(s) in [..]
 ",
         ).run();
+
+    p.cargo("build").run();
+
+    p.cargo("clean").arg("--release").run();
+    assert!(p.build_dir().is_dir());
+    assert!(p.build_dir().join("debug").is_dir());
+    assert!(!p.build_dir().join("release").is_dir());
 }
 
 #[test]
diff -Nru cargo-0.32.0/tests/testsuite/collisions.rs cargo-0.33.0/tests/testsuite/collisions.rs
--- cargo-0.32.0/tests/testsuite/collisions.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/collisions.rs	2019-01-02 21:49:06.000000000 +0000
@@ -0,0 +1,105 @@
+use std::env;
+use support::{basic_manifest, project};
+
+#[test]
+fn collision_dylib() {
+    // Path dependencies don't include metadata hash in filename for dylibs.
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["a", "b"]
+            "#,
+        )
+        .file(
+            "a/Cargo.toml",
+            r#"
+            [package]
+            name = "a"
+            version = "1.0.0"
+
+            [lib]
+            crate-type = ["dylib"]
+            "#,
+        )
+        .file("a/src/lib.rs", "")
+        .file(
+            "b/Cargo.toml",
+            r#"
+            [package]
+            name = "b"
+            version = "1.0.0"
+
+            [lib]
+            crate-type = ["dylib"]
+            name = "a"
+            "#,
+        )
+        .file("b/src/lib.rs", "")
+        .build();
+
+    // j=1 is required because on windows you'll get an error because
+    // two processes will be writing to the file at the same time.
+    p.cargo("build -j=1")
+        .with_stderr_contains(&format!("\
+[WARNING] output filename collision.
+The lib target `a` in package `b v1.0.0 ([..]/foo/b)` has the same output filename as the lib target `a` in package `a v1.0.0 ([..]/foo/a)`.
+Colliding filename is: [..]/foo/target/debug/deps/{}a{}
+The targets should have unique names.
+Consider changing their names to be unique or compiling them separately.
+This may become a hard error in the future, see https://github.com/rust-lang/cargo/issues/6313
+", env::consts::DLL_PREFIX, env::consts::DLL_SUFFIX))
+        .run();
+}
+
+#[test]
+fn collision_example() {
+    // Examples in a workspace can easily collide.
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["a", "b"]
+            "#,
+        )
+        .file("a/Cargo.toml", &basic_manifest("a", "1.0.0"))
+        .file("a/examples/ex1.rs", "fn main() {}")
+        .file("b/Cargo.toml", &basic_manifest("b", "1.0.0"))
+        .file("b/examples/ex1.rs", "fn main() {}")
+        .build();
+
+    p.cargo("build --examples")
+        .with_stderr_contains("\
+[WARNING] output filename collision.
+The example target `ex1` in package `b v1.0.0 ([..]/foo/b)` has the same output filename as the example target `ex1` in package `a v1.0.0 ([..]/foo/a)`.
+Colliding filename is: [..]/foo/target/debug/examples/ex1[EXE]
+The targets should have unique names.
+Consider changing their names to be unique or compiling them separately.
+This may become a hard error in the future, see https://github.com/rust-lang/cargo/issues/6313
+")
+        .run();
+}
+
+#[test]
+fn collision_export() {
+    // --out-dir combines some things which can cause conflicts.
+    let p = project()
+        .file("Cargo.toml", &basic_manifest("foo", "1.0.0"))
+        .file("examples/foo.rs", "fn main() {}")
+        .file("src/main.rs", "fn main() {}")
+        .build();
+
+    p.cargo("build --out-dir=out -Z unstable-options --bins --examples")
+        .masquerade_as_nightly_cargo()
+        .with_stderr_contains("\
+[WARNING] `--out-dir` filename collision.
+The example target `foo` in package `foo v1.0.0 ([..]/foo)` has the same output filename as the bin target `foo` in package `foo v1.0.0 ([..]/foo)`.
+Colliding filename is: [..]/foo/out/foo[EXE]
+The exported filenames should be unique.
+Consider changing their names to be unique or compiling them separately.
+This may become a hard error in the future, see https://github.com/rust-lang/cargo/issues/6313
+")
+        .run();
+}
diff -Nru cargo-0.32.0/tests/testsuite/fix.rs cargo-0.33.0/tests/testsuite/fix.rs
--- cargo-0.32.0/tests/testsuite/fix.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/fix.rs	2019-01-02 21:49:06.000000000 +0000
@@ -183,7 +183,7 @@
     p.cargo("fix --allow-no-vcs -p foo -p bar")
         .env("__CARGO_FIX_YOLO", "1")
         .with_stdout("")
-        .with_stderr(
+        .with_stderr_unordered(
             "\
 [CHECKING] bar v0.1.0 ([..])
 [FIXING] bar/src/lib.rs (1 fix)
diff -Nru cargo-0.32.0/tests/testsuite/freshness.rs cargo-0.33.0/tests/testsuite/freshness.rs
--- cargo-0.32.0/tests/testsuite/freshness.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/freshness.rs	2019-01-02 21:49:06.000000000 +0000
@@ -4,7 +4,7 @@
 use support::paths::CargoPathExt;
 use support::registry::Package;
 use support::sleep_ms;
-use support::{basic_manifest, project};
+use support::{basic_manifest, is_coarse_mtime, project};
 
 #[test]
 fn modifying_and_moving() {
@@ -1175,5 +1175,62 @@
 [FINISHED] [..]
 ",
         )
+        .run();
+}
+
+#[test]
+fn bust_patched_dep() {
+    Package::new("registry1", "0.1.0").publish();
+    Package::new("registry2", "0.1.0")
+        .dep("registry1", "0.1.0")
+        .publish();
+
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.0.1"
+
+            [dependencies]
+            registry2 = "0.1.0"
+
+            [patch.crates-io]
+            registry1 = { path = "reg1new" }
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .file("reg1new/Cargo.toml", &basic_manifest("registry1", "0.1.0"))
+        .file("reg1new/src/lib.rs", "")
+        .build();
+
+    p.cargo("build").run();
+
+    File::create(&p.root().join("reg1new/src/lib.rs")).unwrap();
+    if is_coarse_mtime() {
+        sleep_ms(1000);
+    }
+
+    p.cargo("build")
+        .with_stderr(
+            "\
+[COMPILING] registry1 v0.1.0 ([..])
+[COMPILING] registry2 v0.1.0
+[COMPILING] foo v0.0.1 ([..])
+[FINISHED] [..]
+",
+        )
+        .run();
+
+    p.cargo("build -v")
+        .with_stderr(
+            "\
+[FRESH] registry1 v0.1.0 ([..])
+[FRESH] registry2 v0.1.0
+[FRESH] foo v0.0.1 ([..])
+[FINISHED] [..]
+",
+        )
         .run();
 }
diff -Nru cargo-0.32.0/tests/testsuite/git.rs cargo-0.33.0/tests/testsuite/git.rs
--- cargo-0.32.0/tests/testsuite/git.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/git.rs	2019-01-02 21:49:06.000000000 +0000
@@ -11,6 +11,7 @@
 use support::paths::{self, CargoPathExt};
 use support::sleep_ms;
 use support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project};
+use support::Project;
 
 #[test]
 fn cargo_compile_simple_git_dep() {
@@ -1090,6 +1091,18 @@
         ).file("src/main.rs", "fn main() {}")
         .build();
 
+    fn oid_to_short_sha(oid: git2::Oid) -> String {
+        oid.to_string()[..8].to_string()
+    }
+    fn git_repo_head_sha(p: &Project) -> String {
+        let repo = git2::Repository::open(p.root()).unwrap();
+        let head = repo.head().unwrap().target().unwrap();
+        oid_to_short_sha(head)
+    }
+
+    println!("dep1 head sha: {}", git_repo_head_sha(&git1));
+    println!("dep2 head sha: {}", git_repo_head_sha(&git2));
+
     p.cargo("build")
         .with_stderr(
             "[UPDATING] git repository `[..]`\n\
@@ -1106,7 +1119,8 @@
         .unwrap();
     let repo = git2::Repository::open(&git1.root()).unwrap();
     git::add(&repo);
-    git::commit(&repo);
+    let oid = git::commit(&repo);
+    println!("dep1 head sha: {}", oid_to_short_sha(oid));
 
     p.cargo("update -p dep1")
         .with_stderr(&format!(
@@ -2625,3 +2639,48 @@
 
     project.cargo("build -v").with_stderr(stderr).run();
 }
+
+#[test]
+fn templatedir_doesnt_cause_problems() {
+    let git_project2 = git::new("dep2", |project| {
+        project
+            .file("Cargo.toml", &basic_manifest("dep2", "0.5.0"))
+            .file("src/lib.rs", "")
+    }).unwrap();
+    let git_project = git::new("dep1", |project| {
+        project
+            .file("Cargo.toml", &basic_manifest("dep1", "0.5.0"))
+            .file("src/lib.rs", "")
+    }).unwrap();
+    let p = project()
+        .file(
+            "Cargo.toml",
+            &format!(r#"
+                [project]
+                name = "fo"
+                version = "0.5.0"
+                authors = []
+
+                [dependencies]
+                dep1 = {{ git = '{}' }}
+            "#, git_project.url()),
+        ).file("src/main.rs", "fn main() {}")
+        .build();
+
+    File::create(paths::home().join(".gitconfig"))
+        .unwrap()
+        .write_all(
+            &format!(r#"
+                [init]
+                templatedir = {}
+            "#, git_project2.url()
+                .to_file_path()
+                .unwrap()
+                .to_str()
+                .unwrap()
+                .replace("\\", "/")
+            ).as_bytes(),
+        ).unwrap();
+
+    p.cargo("build").run();
+}
diff -Nru cargo-0.32.0/tests/testsuite/main.rs cargo-0.33.0/tests/testsuite/main.rs
--- cargo-0.32.0/tests/testsuite/main.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/main.rs	2019-01-02 21:49:06.000000000 +0000
@@ -43,6 +43,7 @@
 mod cfg;
 mod check;
 mod clean;
+mod collisions;
 mod concurrent;
 mod config;
 mod corrupt_git;
diff -Nru cargo-0.32.0/tests/testsuite/member_errors.rs cargo-0.33.0/tests/testsuite/member_errors.rs
--- cargo-0.32.0/tests/testsuite/member_errors.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/member_errors.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,7 +1,7 @@
+use cargo::core::resolver::ResolveError;
 use cargo::core::{compiler::CompileMode, Workspace};
 use cargo::ops::{self, CompileOptions};
 use cargo::util::{config::Config, errors::ManifestError};
-use cargo::core::resolver::ResolveError;
 
 use support::project;
 
@@ -150,5 +150,5 @@
     let resolve_err: &ResolveError = error.downcast_ref().expect("Not a ResolveError");
     let package_path = resolve_err.package_path();
     assert_eq!(package_path.len(), 1, "package_path: {:?}", package_path);
-    assert_eq!(&package_path[0], member_bar.package_id());
+    assert_eq!(package_path[0], member_bar.package_id());
 }
diff -Nru cargo-0.32.0/tests/testsuite/metabuild.rs cargo-0.33.0/tests/testsuite/metabuild.rs
--- cargo-0.32.0/tests/testsuite/metabuild.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/metabuild.rs	2019-01-02 21:49:06.000000000 +0000
@@ -2,7 +2,8 @@
 use serde_json;
 use std::str;
 use support::{
-    basic_lib_manifest, basic_manifest, project, registry::Package, rustc_host, Project,
+    basic_lib_manifest, basic_manifest, is_coarse_mtime, project, registry::Package, rustc_host,
+    Project,
 };
 
 #[test]
@@ -212,6 +213,14 @@
 
 #[test]
 fn metabuild_fresh() {
+    if is_coarse_mtime() {
+        // This test doesn't work on coarse mtimes very well. Because the
+        // metabuild script is created at build time, its mtime is almost
+        // always equal to the mtime of the output. The second call to `build`
+        // will then think it needs to be rebuilt when it should be fresh.
+        return;
+    }
+
     // Check that rebuild is fresh.
     let p = project()
         .file(
@@ -424,6 +433,7 @@
             "package_name": "mb",
             "package_version": "0.5.0",
             "target_kind": ["lib"],
+            "compile_mode": "build",
             "kind": "Host",
             "deps": [],
             "outputs": ["[..]/target/debug/deps/libmb-[..].rlib"],
@@ -437,6 +447,7 @@
             "package_name": "mb-other",
             "package_version": "0.0.1",
             "target_kind": ["lib"],
+            "compile_mode": "build",
             "kind": "Host",
             "deps": [],
             "outputs": ["[..]/target/debug/deps/libmb_other-[..].rlib"],
@@ -450,6 +461,7 @@
             "package_name": "foo",
             "package_version": "0.0.1",
             "target_kind": ["custom-build"],
+            "compile_mode": "build",
             "kind": "Host",
             "deps": [0, 1],
             "outputs": ["[..]/target/debug/build/foo-[..]/metabuild_foo-[..][EXE]"],
@@ -463,6 +475,7 @@
             "package_name": "foo",
             "package_version": "0.0.1",
             "target_kind": ["custom-build"],
+            "compile_mode": "run-custom-build",
             "kind": "Host",
             "deps": [2],
             "outputs": [],
@@ -476,6 +489,7 @@
             "package_name": "foo",
             "package_version": "0.0.1",
             "target_kind": ["lib"],
+            "compile_mode": "build",
             "kind": "Host",
             "deps": [3],
             "outputs": ["[..]/foo/target/debug/deps/libfoo-[..].rlib"],
diff -Nru cargo-0.32.0/tests/testsuite/new.rs cargo-0.33.0/tests/testsuite/new.rs
--- cargo-0.32.0/tests/testsuite/new.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/new.rs	2019-01-02 21:49:06.000000000 +0000
@@ -338,6 +338,23 @@
 }
 
 #[test]
+fn strip_angle_bracket_author_email() {
+    create_empty_gitconfig();
+    cargo_process("new foo")
+        .env("USER", "bar")
+        .env("EMAIL", "<baz>")
+        .run();
+
+    let toml = paths::root().join("foo/Cargo.toml");
+    let mut contents = String::new();
+    File::open(&toml)
+        .unwrap()
+        .read_to_string(&mut contents)
+        .unwrap();
+    assert!(contents.contains(r#"authors = ["bar <baz>"]"#));
+}
+
+#[test]
 fn git_prefers_command_line() {
     let root = paths::root();
     fs::create_dir(&root.join(".cargo")).unwrap();
diff -Nru cargo-0.32.0/tests/testsuite/out_dir.rs cargo-0.33.0/tests/testsuite/out_dir.rs
--- cargo-0.32.0/tests/testsuite/out_dir.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/out_dir.rs	2019-01-02 21:49:06.000000000 +0000
@@ -203,6 +203,37 @@
     .run();
 }
 
+#[test]
+fn avoid_build_scripts() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["a", "b"]
+            "#,
+        )
+        .file("a/Cargo.toml", &basic_manifest("a", "0.0.1"))
+        .file("a/src/main.rs", "fn main() {}")
+        .file("a/build.rs", r#"fn main() { println!("hello-build-a"); }"#)
+        .file("b/Cargo.toml", &basic_manifest("b", "0.0.1"))
+        .file("b/src/main.rs", "fn main() {}")
+        .file("b/build.rs", r#"fn main() { println!("hello-build-b"); }"#)
+        .build();
+
+    p.cargo("build -Z unstable-options --out-dir out -vv")
+        .masquerade_as_nightly_cargo()
+        .with_stdout_contains("[a 0.0.1] hello-build-a")
+        .with_stdout_contains("[b 0.0.1] hello-build-b")
+        .run();
+    check_dir_contents(
+        &p.root().join("out"),
+        &["a", "b"],
+        &["a", "a.dSYM", "b", "b.dSYM"],
+        &["a.exe", "a.pdb", "b.exe", "b.pdb"],
+    );
+}
+
 fn check_dir_contents(
     out_dir: &Path,
     expected_linux: &[&str],
diff -Nru cargo-0.32.0/tests/testsuite/package.rs cargo-0.33.0/tests/testsuite/package.rs
--- cargo-0.32.0/tests/testsuite/package.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/package.rs	2019-01-02 21:49:06.000000000 +0000
@@ -285,7 +285,8 @@
 
 #[test]
 fn exclude() {
-    let p = project()
+    let root = paths::root().join("exclude");
+    let repo = git::repo(&root)
         .file("Cargo.toml", r#"
             [project]
             name = "foo"
@@ -348,7 +349,8 @@
         .file("some_dir/dir_deep_5/some_dir/file", "")
         .build();
 
-    p.cargo("package --no-verify -v")
+    cargo_process("package --no-verify -v")
+        .cwd(repo.root())
         .with_stdout("")
         .with_stderr(
             "\
@@ -366,7 +368,6 @@
 See [..]
 [WARNING] [..] file `some_dir/file_deep_1` WILL be excluded [..]
 See [..]
-[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
 [PACKAGING] foo v0.0.1 ([..])
 [ARCHIVING] [..]
 [ARCHIVING] [..]
@@ -386,14 +387,17 @@
 [ARCHIVING] [..]
 [ARCHIVING] [..]
 [ARCHIVING] [..]
+[ARCHIVING] .cargo_vcs_info.json
 ",
         ).run();
 
-    assert!(p.root().join("target/package/foo-0.0.1.crate").is_file());
+    assert!(repo.root().join("target/package/foo-0.0.1.crate").is_file());
 
-    p.cargo("package -l")
+    cargo_process("package -l")
+        .cwd(repo.root())
         .with_stdout(
             "\
+.cargo_vcs_info.json
 Cargo.toml
 dir_root_1/some_dir/file
 dir_root_2/some_dir/file
@@ -418,7 +422,8 @@
 
 #[test]
 fn include() {
-    let p = project()
+    let root = paths::root().join("include");
+    let repo = git::repo(&root)
         .file("Cargo.toml", r#"
             [project]
             name = "foo"
@@ -432,16 +437,17 @@
         .file("src/bar.txt", "") // should be ignored when packaging
         .build();
 
-    p.cargo("package --no-verify -v")
+    cargo_process("package --no-verify -v")
+        .cwd(repo.root())
         .with_stderr(
             "\
 [WARNING] manifest has no description[..]
 See http://doc.crates.io/manifest.html#package-metadata for more info.
-[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
 [PACKAGING] foo v0.0.1 ([..])
 [ARCHIVING] [..]
 [ARCHIVING] [..]
 [ARCHIVING] [..]
+[ARCHIVING] .cargo_vcs_info.json
 ",
         ).run();
 }
diff -Nru cargo-0.32.0/tests/testsuite/plugins.rs cargo-0.33.0/tests/testsuite/plugins.rs
--- cargo-0.32.0/tests/testsuite/plugins.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/plugins.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,6 +1,3 @@
-use std::env;
-use std::fs;
-
 use support::{basic_manifest, project};
 use support::{is_nightly, rustc_host};
 
@@ -103,18 +100,8 @@
         return;
     }
 
-    let workspace = project()
-        .at("ws")
-        .file(
-            "Cargo.toml",
-            r#"
-            [workspace]
-            members = ["builder", "foo"]
-        "#,
-        ).build();
-
     let build = project()
-        .at("ws/builder")
+        .at("builder")
         .file(
             "Cargo.toml",
             r#"
@@ -131,7 +118,6 @@
         .build();
 
     let foo = project()
-        .at("ws/foo")
         .file(
             "Cargo.toml",
             r#"
@@ -167,12 +153,24 @@
         ).file(
             "bar/build.rs",
             r#"
-            use std::path::PathBuf;
             use std::env;
+            use std::fs;
+            use std::path::PathBuf;
 
             fn main() {
-                let src = PathBuf::from(env::var("SRC").unwrap());
-                println!("cargo:rustc-flags=-L {}/deps", src.parent().unwrap().display());
+                let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+                let root = PathBuf::from(env::var("BUILDER_ROOT").unwrap());
+                let file = format!("{}builder{}",
+                    env::consts::DLL_PREFIX,
+                    env::consts::DLL_SUFFIX);
+                let src = root.join(&file);
+                let dst = out_dir.join(&file);
+                fs::copy(src, dst).unwrap();
+                if cfg!(windows) {
+                    fs::copy(root.join("builder.dll.lib"),
+                             out_dir.join("builder.dll.lib")).unwrap();
+                }
+                println!("cargo:rustc-flags=-L {}", out_dir.display());
             }
         "#,
         ).file(
@@ -196,16 +194,8 @@
 
     build.cargo("build").run();
 
-    let src = workspace.root().join("target/debug");
-    let lib = fs::read_dir(&src)
-        .unwrap()
-        .map(|s| s.unwrap().path())
-        .find(|lib| {
-            let lib = lib.file_name().unwrap().to_str().unwrap();
-            lib.starts_with(env::consts::DLL_PREFIX) && lib.ends_with(env::consts::DLL_SUFFIX)
-        }).unwrap();
-
-    foo.cargo("build -v").env("SRC", &lib).run();
+    let root = build.root().join("target").join("debug");
+    foo.cargo("build -v").env("BUILDER_ROOT", root).run();
 }
 
 #[test]
diff -Nru cargo-0.32.0/tests/testsuite/proc_macro.rs cargo-0.33.0/tests/testsuite/proc_macro.rs
--- cargo-0.32.0/tests/testsuite/proc_macro.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/proc_macro.rs	2019-01-02 21:49:06.000000000 +0000
@@ -279,3 +279,145 @@
         .with_stdout_contains_n("test [..] ... ok", 2)
         .run();
 }
+
+#[test]
+fn proc_macro_crate_type() {
+    // Verify that `crate-type = ["proc-macro"]` is the same as `proc-macro = true`
+    // and that everything, including rustdoc, works correctly.
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [dependencies]
+            pm = { path = "pm" }
+        "#,
+        )
+        .file(
+            "src/lib.rs",
+            r#"
+            //! ```
+            //! use foo::THING;
+            //! assert_eq!(THING, 123);
+            //! ```
+            #[macro_use]
+            extern crate pm;
+            #[derive(MkItem)]
+            pub struct S;
+            #[cfg(test)]
+            mod tests {
+                use super::THING;
+                #[test]
+                fn it_works() {
+                    assert_eq!(THING, 123);
+                }
+            }
+        "#,
+        )
+        .file(
+            "pm/Cargo.toml",
+            r#"
+            [package]
+            name = "pm"
+            version = "0.1.0"
+            [lib]
+            crate-type = ["proc-macro"]
+        "#,
+        )
+        .file(
+            "pm/src/lib.rs",
+            r#"
+            extern crate proc_macro;
+            use proc_macro::TokenStream;
+
+            #[proc_macro_derive(MkItem)]
+            pub fn mk_item(_input: TokenStream) -> TokenStream {
+                "pub const THING: i32 = 123;".parse().unwrap()
+            }
+        "#,
+        )
+        .build();
+
+    foo.cargo("test")
+        .with_stdout_contains("test tests::it_works ... ok")
+        .with_stdout_contains_n("test [..] ... ok", 2)
+        .run();
+}
+
+#[test]
+fn proc_macro_crate_type_warning() {
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [lib]
+            crate-type = ["proc-macro"]
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    foo.cargo("build")
+        .with_stderr_contains(
+            "[WARNING] library `foo` should only specify `proc-macro = true` instead of setting `crate-type`")
+        .run();
+}
+
+#[test]
+fn proc_macro_crate_type_warning_plugin() {
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [lib]
+            crate-type = ["proc-macro"]
+            plugin = true
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    foo.cargo("build")
+        .with_stderr_contains(
+            "[WARNING] proc-macro library `foo` should not specify `plugin = true`")
+        .with_stderr_contains(
+            "[WARNING] library `foo` should only specify `proc-macro = true` instead of setting `crate-type`")
+        .run();
+}
+
+#[test]
+fn proc_macro_crate_type_multiple() {
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            [lib]
+            crate-type = ["proc-macro", "rlib"]
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    foo.cargo("build")
+        .with_stderr(
+            "\
+[ERROR] failed to parse manifest at `[..]/foo/Cargo.toml`
+
+Caused by:
+  cannot mix `proc-macro` crate type with others
+",
+        )
+        .with_status(101)
+        .run();
+}
diff -Nru cargo-0.32.0/tests/testsuite/profile_targets.rs cargo-0.33.0/tests/testsuite/profile_targets.rs
--- cargo-0.32.0/tests/testsuite/profile_targets.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/profile_targets.rs	2019-01-02 21:49:06.000000000 +0000
@@ -137,9 +137,6 @@
     // - bdep `panic` is not set because it thinks `build.rs` is a plugin.
     // - build_script_build is built without panic because it thinks
     //   `build.rs` is a plugin.
-    // - build_script_build is being run two times.  Once for the `dev` and
-    //   `test` targets, once for the `bench` targets.
-    //   TODO: "PROFILE" says debug both times, though!
     // - Benchmark dependencies are compiled in `dev` mode, which may be
     //   surprising.  See https://github.com/rust-lang/cargo/issues/4929.
     //
@@ -157,11 +154,9 @@
     //   lib      dev+panic  build  (a normal lib target)
     //   lib      dev-panic  build  (used by tests/benches)
     //   lib      test       test
-    //   lib      bench      test(bench)
     //   test     test       test
-    //   bench    bench      test(bench)
+    //   bench    test       test
     //   bin      test       test
-    //   bin      bench      test(bench)
     //   bin      dev        build
     //   example  dev        build
     p.cargo("build --all-targets -vv").with_stderr_unordered("\
@@ -173,17 +168,13 @@
 [COMPILING] foo [..]
 [RUNNING] `rustc --crate-name build_script_build build.rs [..]--crate-type bin --emit=dep-info,link -C codegen-units=1 -C debuginfo=2 [..]
 [RUNNING] `[..]/target/debug/build/foo-[..]/build-script-build`
-[RUNNING] `[..]/target/debug/build/foo-[..]/build-script-build`
-[foo 0.0.1] foo custom build PROFILE=debug DEBUG=false OPT_LEVEL=3
 [foo 0.0.1] foo custom build PROFILE=debug DEBUG=true OPT_LEVEL=0
 [RUNNING] `rustc --crate-name foo src/lib.rs [..]--crate-type lib --emit=dep-info,link -C panic=abort -C codegen-units=1 -C debuginfo=2 [..]`
 [RUNNING] `rustc --crate-name foo src/lib.rs [..]--emit=dep-info,link -C codegen-units=3 -C debuginfo=2 --test [..]`
 [RUNNING] `rustc --crate-name foo src/lib.rs [..]--crate-type lib --emit=dep-info,link -C codegen-units=1 -C debuginfo=2 [..]`
-[RUNNING] `rustc --crate-name foo src/lib.rs [..]--emit=dep-info,link -C opt-level=3 -C codegen-units=4 --test [..]`
 [RUNNING] `rustc --crate-name foo src/main.rs [..]--emit=dep-info,link -C codegen-units=3 -C debuginfo=2 --test [..]`
 [RUNNING] `rustc --crate-name test1 tests/test1.rs [..]--emit=dep-info,link -C codegen-units=3 -C debuginfo=2 --test [..]`
-[RUNNING] `rustc --crate-name bench1 benches/bench1.rs [..]--emit=dep-info,link -C opt-level=3 -C codegen-units=4 --test [..]`
-[RUNNING] `rustc --crate-name foo src/main.rs [..]--emit=dep-info,link -C opt-level=3 -C codegen-units=4 --test [..]`
+[RUNNING] `rustc --crate-name bench1 benches/bench1.rs [..]--emit=dep-info,link -C codegen-units=3 -C debuginfo=2 --test [..]`
 [RUNNING] `rustc --crate-name foo src/main.rs [..]--crate-type bin --emit=dep-info,link -C panic=abort -C codegen-units=1 -C debuginfo=2 [..]`
 [RUNNING] `rustc --crate-name ex1 examples/ex1.rs [..]--crate-type bin --emit=dep-info,link -C panic=abort -C codegen-units=1 -C debuginfo=2 [..]`
 [FINISHED] dev [unoptimized + debuginfo] [..]
diff -Nru cargo-0.32.0/tests/testsuite/rename_deps.rs cargo-0.33.0/tests/testsuite/rename_deps.rs
--- cargo-0.32.0/tests/testsuite/rename_deps.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/rename_deps.rs	2019-01-02 21:49:06.000000000 +0000
@@ -254,8 +254,8 @@
 [DOCTEST] foo
 [RUNNING] `rustdoc --test [CWD]/src/lib.rs \
         [..] \
-        --extern baz=[CWD]/target/debug/deps/libbar-[..].rlib \
         --extern bar=[CWD]/target/debug/deps/libbar-[..].rlib \
+        --extern baz=[CWD]/target/debug/deps/libbar-[..].rlib \
         [..]`
 ",
         ).run();
diff -Nru cargo-0.32.0/tests/testsuite/resolve.rs cargo-0.33.0/tests/testsuite/resolve.rs
--- cargo-0.32.0/tests/testsuite/resolve.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/resolve.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1,6 +1,6 @@
 use std::env;
 
-use cargo::core::dependency::Kind::Development;
+use cargo::core::dependency::Kind;
 use cargo::core::{enable_nightly_features, Dependency};
 use cargo::util::Config;
 
@@ -15,6 +15,13 @@
 use proptest::collection::vec;
 use proptest::prelude::*;
 
+/// NOTE: proptest is a form of fuzz testing. It generates random input and makes shore that
+/// certain universal truths are upheld. Therefore, it can pass when there is a problem,
+/// but if it fails then there really is something wrong. When testing something as
+/// complicated as the resolver, the problems can be very subtle and hard to generate.
+/// We have had a history of these tests only failing on PRs long after a bug is introduced.
+/// If you have one of these test fail please report it on #6258,
+/// and if you did not change the resolver then feel free to retry without concern.
 proptest! {
     #![proptest_config(ProptestConfig {
         // Note that this is a little low in terms of cases we'd like to test,
@@ -33,6 +40,8 @@
             },
         .. ProptestConfig::default()
     })]
+
+    /// NOTE: if you think this test has failed spuriously see the note at the top of this macro.
     #[test]
     fn passes_validation(
         PrettyPrintRegistry(input) in registry_strategy(50, 20, 60)
@@ -49,6 +58,58 @@
             );
         }
     }
+
+    /// NOTE: if you think this test has failed spuriously see the note at the top of this macro.
+    #[test]
+    fn minimum_version_errors_the_same(
+            PrettyPrintRegistry(input) in registry_strategy(50, 20, 60)
+    ) {
+        enable_nightly_features();
+
+        let mut config = Config::default().unwrap();
+        config
+            .configure(
+                1,
+                None,
+                &None,
+                false,
+                false,
+                &None,
+                &["minimal-versions".to_string()],
+            )
+            .unwrap();
+
+        let reg = registry(input.clone());
+        // there is only a small chance that eny one
+        // crate will be interesting.
+        // So we try some of the most complicated.
+        for this in input.iter().rev().take(10) {
+            // minimal-versions change what order the candidates
+            // are tried but not the existence of a solution
+            let res = resolve(
+                &pkg_id("root"),
+                vec![dep_req(&this.name(), &format!("={}", this.version()))],
+                &reg,
+            );
+
+            let mres = resolve_with_config(
+                &pkg_id("root"),
+                vec![dep_req(&this.name(), &format!("={}", this.version()))],
+                &reg,
+                Some(&config),
+            );
+
+            prop_assert_eq!(
+                res.is_ok(),
+                mres.is_ok(),
+                "minimal-versions and regular resolver disagree about weather `{} = \"={}\"` can resolve",
+                this.name(),
+                this.version()
+            )
+        }
+    }
+
+    /// NOTE: if you think this test has failed spuriously see the note at the top of this macro.
     #[test]
     fn limited_independence_of_irrelevant_alternatives(
         PrettyPrintRegistry(input) in registry_strategy(50, 20, 60),
@@ -72,7 +133,7 @@
                     let not_selected: Vec<_> = input
                         .iter()
                         .cloned()
-                        .filter(|x| !r.contains(x.package_id()))
+                        .filter(|x| !r.contains(&x.package_id()))
                         .collect();
                     if !not_selected.is_empty() {
                         let indexs_to_unpublish: Vec<_> = indexs_to_unpublish.iter().map(|x| x.get(&not_selected)).collect();
@@ -219,15 +280,15 @@
 #[test]
 fn test_resolving_with_dev_deps() {
     let reg = registry(vec![
-        pkg!("foo" => ["bar", dep_kind("baz", Development)]),
-        pkg!("baz" => ["bat", dep_kind("bam", Development)]),
+        pkg!("foo" => ["bar", dep_kind("baz", Kind::Development)]),
+        pkg!("baz" => ["bat", dep_kind("bam", Kind::Development)]),
         pkg!("bar"),
         pkg!("bat"),
     ]);
 
     let res = resolve(
         &pkg_id("root"),
-        vec![dep("foo"), dep_kind("baz", Development)],
+        vec![dep("foo"), dep_kind("baz", Kind::Development)],
         &reg,
     )
     .unwrap();
@@ -372,14 +433,12 @@
         pkg!("bar" => [dep_req("foo", "=1.0.2")]),
     ]);
 
-    assert!(
-        resolve(
-            &pkg_id("root"),
-            vec![dep_req("foo", "=1.0.1"), dep("bar")],
-            &reg
-        )
-        .is_err()
-    );
+    assert!(resolve(
+        &pkg_id("root"),
+        vec![dep_req("foo", "=1.0.1"), dep("bar")],
+        &reg
+    )
+    .is_err());
 }
 
 #[test]
@@ -598,13 +657,13 @@
         let next = format!("level{}", l + 1);
         for i in 1..BRANCHING_FACTOR {
             let vsn = format!("1.0.{}", i);
-            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep_req(next.as_str(), "*")]));
+            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep(next.as_str())]));
         }
     }
 
     let reg = registry(reglist.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("level0", "*")], &reg);
+    let res = resolve(&pkg_id("root"), vec![dep("level0")], &reg);
 
     assert!(res.is_err());
 
@@ -614,7 +673,7 @@
 
     let reg = registry(reglist.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("level0", "*")], &reg).unwrap();
+    let res = resolve(&pkg_id("root"), vec![dep("level0")], &reg).unwrap();
 
     assert_contains(&res, &names(&[("root", "1.0.0"), ("level0", "1.0.0")]));
 
@@ -629,7 +688,7 @@
 
     let res = resolve(
         &pkg_id("root"),
-        vec![dep_req("level0", "*"), dep_req("constrained", "*")],
+        vec![dep("level0"), dep("constrained")],
         &reg,
     )
     .unwrap();
@@ -647,7 +706,7 @@
 
     let res = resolve(
         &pkg_id("root"),
-        vec![dep_req("level0", "1.0.1"), dep_req("constrained", "*")],
+        vec![dep_req("level0", "1.0.1"), dep("constrained")],
         &reg,
     )
     .unwrap();
@@ -686,7 +745,7 @@
         let next = format!("backtrack_trap{}", l + 1);
         for i in 1..BRANCHING_FACTOR {
             let vsn = format!("1.0.{}", i);
-            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep_req(next.as_str(), "*")]));
+            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep(next.as_str())]));
         }
     }
     {
@@ -708,7 +767,7 @@
 
     let res = resolve(
         &pkg_id("root"),
-        vec![dep_req("backtrack_trap0", "*"), dep_req("cloaking", "*")],
+        vec![dep("backtrack_trap0"), dep("cloaking")],
         &reg,
     );
 
@@ -729,7 +788,7 @@
         let next = format!("backtrack_trap{}", l + 1);
         for i in 1..BRANCHING_FACTOR {
             let vsn = format!("1.0.{}", i);
-            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep_req(next.as_str(), "*")]));
+            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep(next.as_str())]));
         }
     }
     {
@@ -761,9 +820,9 @@
     let res = resolve(
         &pkg_id("root"),
         vec![
-            dep_req("backtrack_trap0", "*"),
+            dep("backtrack_trap0"),
             dep_req("constrained", "2.0.1"),
-            dep_req("cloaking", "*"),
+            dep("cloaking"),
         ],
         &reg,
     );
@@ -777,12 +836,12 @@
         let next = format!("level{}", l + 1);
         for i in 1..BRANCHING_FACTOR {
             let vsn = format!("1.0.{}", i);
-            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep_req(next.as_str(), "*")]));
+            reglist.push(pkg!((name.as_str(), vsn.as_str()) => [dep(next.as_str())]));
         }
     }
     reglist.push(
-        pkg!((format!("level{}", DEPTH).as_str(), "1.0.0") => [dep_req("backtrack_trap0", "*"),
-            dep_req("cloaking", "*")
+        pkg!((format!("level{}", DEPTH).as_str(), "1.0.0") => [dep("backtrack_trap0"),
+            dep("cloaking")
         ]),
     );
 
@@ -790,7 +849,7 @@
 
     let res = resolve(
         &pkg_id("root"),
-        vec![dep_req("level0", "*"), dep_req("constrained", "2.0.1")],
+        vec![dep("level0"), dep_req("constrained", "2.0.1")],
         &reg,
     );
 
@@ -798,7 +857,7 @@
 
     let res = resolve(
         &pkg_id("root"),
-        vec![dep_req("level0", "*"), dep_req("constrained", "2.0.0")],
+        vec![dep("level0"), dep_req("constrained", "2.0.0")],
         &reg,
     )
     .unwrap();
@@ -942,7 +1001,7 @@
         input
             .iter()
             .cloned()
-            .filter(|x| &package_to_yank != x.package_id())
+            .filter(|x| package_to_yank != x.package_id())
             .collect(),
     );
     assert_eq!(input.len(), new_reg.len() + 1);
@@ -985,7 +1044,7 @@
             dep("bad"),
         ]),
         pkg!(("h", "3.8.3") => [
-            dep_req("g", "*"),
+            dep("g"),
         ]),
         pkg!(("h", "6.8.3") => [
             dep("f"),
@@ -994,10 +1053,10 @@
             dep_req("to_yank", "=8.8.1"),
         ]),
         pkg!("i" => [
-            dep_req("b", "*"),
-            dep_req("c", "*"),
-            dep_req("e", "*"),
-            dep_req("h", "*"),
+            dep("b"),
+            dep("c"),
+            dep("e"),
+            dep("h"),
         ]),
     ];
     let reg = registry(input.clone());
@@ -1011,7 +1070,7 @@
         input
             .iter()
             .cloned()
-            .filter(|x| &package_to_yank != x.package_id())
+            .filter(|x| package_to_yank != x.package_id())
             .collect(),
     );
     assert_eq!(input.len(), new_reg.len() + 1);
@@ -1043,7 +1102,7 @@
         ] },
         pkg!{("b", "2.0.2") => [
             dep_req("to_yank", "3.3.0"),
-            dep_req("a", "*"),
+            dep("a"),
         ] },
         pkg!{("b", "2.3.3") => [
             dep_req("to_yank", "3.3.0"),
@@ -1052,7 +1111,7 @@
     ];
     let reg = registry(input.clone());
 
-    let res = resolve(&pkg_id("root"), vec![dep_req("b", "*")], &reg).unwrap();
+    let res = resolve(&pkg_id("root"), vec![dep("b")], &reg).unwrap();
     let package_to_yank = ("to_yank", "3.0.3").to_pkgid();
     // this package is not used in the resolution.
     assert!(!res.contains(&package_to_yank));
@@ -1061,12 +1120,12 @@
         input
             .iter()
             .cloned()
-            .filter(|x| &package_to_yank != x.package_id())
+            .filter(|x| package_to_yank != x.package_id())
             .collect(),
     );
     assert_eq!(input.len(), new_reg.len() + 1);
     // it should still build
-    assert!(resolve(&pkg_id("root"), vec![dep_req("b", "*")], &new_reg).is_ok());
+    assert!(resolve(&pkg_id("root"), vec![dep("b")], &new_reg).is_ok());
 }
 
 #[test]
@@ -1113,3 +1172,72 @@
         &names(&[("root", "1.0.0"), ("foo", "1.0.0"), ("bar", "1.0.0")]),
     );
 }
+
+#[test]
+fn large_conflict_cache() {
+    let mut input = vec![
+        pkg!(("last", "0.0.0") => [dep("bad")]), // just to make sure last is less constrained
+    ];
+    let mut root_deps = vec![dep("last")];
+    const NUM_VERSIONS: u8 = 3;
+    for name in 0..=NUM_VERSIONS {
+        // a large number of conflicts can easily be generated by a sys crate.
+        let sys_name = format!("{}-sys", (b'a' + name) as char);
+        let in_len = input.len();
+        input.push(pkg!(("last", format!("{}.0.0", in_len)) => [dep_req(&sys_name, "=0.0.0")]));
+        root_deps.push(dep_req(&sys_name, ">= 0.0.1"));
+
+        // a large number of conflicts can also easily be generated by a major release version.
+        let plane_name = format!("{}", (b'a' + name) as char);
+        let in_len = input.len();
+        input.push(pkg!(("last", format!("{}.0.0", in_len)) => [dep_req(&plane_name, "=1.0.0")]));
+        root_deps.push(dep_req(&plane_name, ">= 1.0.1"));
+
+        for i in 0..=NUM_VERSIONS {
+            input.push(pkg!((&sys_name, format!("{}.0.0", i))));
+            input.push(pkg!((&plane_name, format!("1.0.{}", i))));
+        }
+    }
+    let reg = registry(input);
+    let _ = resolve(&pkg_id("root"), root_deps, &reg);
+}
+
+#[test]
+fn conflict_store_bug() {
+    let input = vec![
+        pkg!(("A", "0.0.3")),
+        pkg!(("A", "0.0.5")),
+        pkg!(("A", "0.0.9") => [dep("bad"),]),
+        pkg!(("A", "0.0.10") => [dep("bad"),]),
+        pkg!(("L-sys", "0.0.1") => [dep("bad"),]),
+        pkg!(("L-sys", "0.0.5")),
+        pkg!(("R", "0.0.4") => [
+            dep_req("L-sys", "= 0.0.5"),
+        ]),
+        pkg!(("R", "0.0.6")),
+        pkg!(("a-sys", "0.0.5")),
+        pkg!(("a-sys", "0.0.11")),
+        pkg!(("c", "0.0.12") => [
+            dep_req("R", ">= 0.0.3, <= 0.0.4"),
+        ]),
+        pkg!(("c", "0.0.13") => [
+            dep_req("a-sys", ">= 0.0.8, <= 0.0.11"),
+        ]),
+        pkg!(("c0", "0.0.6") => [
+            dep_req("L-sys", "<= 0.0.2"),
+        ]),
+        pkg!(("c0", "0.0.10") => [
+            dep_req("A", ">= 0.0.9, <= 0.0.10"),
+            dep_req("a-sys", "= 0.0.5"),
+        ]),
+        pkg!("j" => [
+            dep_req("A", ">= 0.0.3, <= 0.0.5"),
+            dep_req("R", ">=0.0.4, <= 0.0.6"),
+            dep_req("c", ">= 0.0.9"),
+            dep_req("c0", ">= 0.0.6"),
+        ]),
+    ];
+
+    let reg = registry(input.clone());
+    let _ = resolve_and_validated(&pkg_id("root"), vec![dep("j")], &reg);
+}
diff -Nru cargo-0.32.0/tests/testsuite/run.rs cargo-0.33.0/tests/testsuite/run.rs
--- cargo-0.32.0/tests/testsuite/run.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/run.rs	2019-01-02 21:49:06.000000000 +0000
@@ -349,6 +349,35 @@
         .run();
 }
 
+#[test]
+fn run_bin_example() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.0.1"
+            [[example]]
+            name = "bar"
+            crate_type = ["bin"]
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .file("examples/bar.rs", r#"fn main() { println!("example"); }"#)
+        .build();
+
+    p.cargo("run --example bar")
+        .with_stderr(
+            "\
+[COMPILING] foo v0.0.1 ([CWD])
+[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
+[RUNNING] `target/debug/examples/bar[EXE]`",
+        )
+        .with_stdout("example")
+        .run();
+}
+
 fn autodiscover_examples_project(rust_edition: &str, autoexamples: Option<bool>) -> Project {
     let autoexamples = match autoexamples {
         None => "".to_string(),
@@ -463,6 +492,28 @@
         .run();
 }
 
+#[test]
+fn autobins_disables() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [project]
+            name = "foo"
+            version = "0.0.1"
+            autobins = false
+            "#
+        )
+        .file("src/lib.rs", "pub mod bin;")
+        .file("src/bin/mod.rs", "// empty")
+        .build();
+
+    p.cargo("run")
+        .with_status(101)
+        .with_stderr("[ERROR] a bin target must be available for `cargo run`")
+        .run();
+}
+
 #[test]
 fn run_bins() {
     let p = project()
diff -Nru cargo-0.32.0/tests/testsuite/rustc.rs cargo-0.33.0/tests/testsuite/rustc.rs
--- cargo-0.32.0/tests/testsuite/rustc.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/rustc.rs	2019-01-02 21:49:06.000000000 +0000
@@ -243,10 +243,6 @@
         .with_stderr_contains("\
             [RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
             --emit=dep-info,link[..]")
-        // bench
-        .with_stderr_contains("\
-            [RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
-            -C opt-level=3 --test [..]")
         // unit test
         .with_stderr_contains("\
             [RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
diff -Nru cargo-0.32.0/tests/testsuite/search.rs cargo-0.33.0/tests/testsuite/search.rs
--- cargo-0.32.0/tests/testsuite/search.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/search.rs	2019-01-02 21:49:06.000000000 +0000
@@ -67,7 +67,8 @@
         .file(
             "config.json",
             &format!(r#"{{"dl":"{0}","api":"{0}"}}"#, api()),
-        ).build();
+        )
+        .build();
 
     let base = api_path().join("api/v1/crates");
     write_crates(&base);
@@ -89,8 +90,10 @@
 registry = '{reg}'
 "#,
                 reg = registry_url(),
-            ).as_bytes(),
-        ).unwrap();
+            )
+            .as_bytes(),
+        )
+        .unwrap();
 }
 
 #[test]
@@ -104,7 +107,7 @@
 
     let sid = SourceId::for_registry(&registry_url()).unwrap();
     let cfg = Config::new(Shell::new(), paths::root(), paths::home().join(".cargo"));
-    let mut regsrc = RegistrySource::remote(&sid, &cfg);
+    let mut regsrc = RegistrySource::remote(sid, &cfg);
     regsrc.update().unwrap();
 
     cargo_process("search postgres")
@@ -142,9 +145,10 @@
 fn simple_with_host() {
     setup();
 
-    cargo_process("search postgres --host").arg(registry_url().to_string())
-            .with_stderr(
-                "\
+    cargo_process("search postgres --host")
+        .arg(registry_url().to_string())
+        .with_stderr(
+            "\
 [WARNING] The flag '--host' is no longer valid.
 
 Previous versions of Cargo accepted this flag, but it is being
@@ -156,10 +160,8 @@
 about this warning.
 [UPDATING] `[CWD]/registry` index
 ",
-            )
-            .with_stdout_contains(
-                "hoare = \"0.1.1\"    # Design by contract style assertions for Rust",
-            )
+        )
+        .with_stdout_contains("hoare = \"0.1.1\"    # Design by contract style assertions for Rust")
         .run();
 }
 
@@ -169,9 +171,12 @@
 fn simple_with_index_and_host() {
     setup();
 
-    cargo_process("search postgres --index").arg(registry_url().to_string()).arg("--host").arg(registry_url().to_string())
-            .with_stderr(
-                "\
+    cargo_process("search postgres --index")
+        .arg(registry_url().to_string())
+        .arg("--host")
+        .arg(registry_url().to_string())
+        .with_stderr(
+            "\
 [WARNING] The flag '--host' is no longer valid.
 
 Previous versions of Cargo accepted this flag, but it is being
@@ -183,10 +188,8 @@
 about this warning.
 [UPDATING] `[CWD]/registry` index
 ",
-            )
-            .with_stdout_contains(
-                "hoare = \"0.1.1\"    # Design by contract style assertions for Rust",
-            )
+        )
+        .with_stdout_contains("hoare = \"0.1.1\"    # Design by contract style assertions for Rust")
         .run();
 }
 
diff -Nru cargo-0.32.0/tests/testsuite/support/mod.rs cargo-0.33.0/tests/testsuite/support/mod.rs
--- cargo-0.32.0/tests/testsuite/support/mod.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/support/mod.rs	2019-01-02 21:49:06.000000000 +0000
@@ -113,11 +113,12 @@
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output};
 use std::str;
-use std::time::Duration;
+use std::time::{self, Duration};
 use std::usize;
 
 use cargo;
 use cargo::util::{CargoResult, ProcessBuilder, ProcessError, Rustc};
+use filetime;
 use serde_json::{self, Value};
 use url::Url;
 
@@ -279,8 +280,19 @@
             self._file(Path::new("Cargo.toml"), &basic_manifest("foo", "0.0.1"))
         }
 
+        let past = time::SystemTime::now() - Duration::new(1, 0);
+        let ftime = filetime::FileTime::from_system_time(past);
+
         for file in self.files.iter() {
             file.mk();
+            if is_coarse_mtime() {
+                // Place the entire project 1 second in the past to ensure
+                // that if cargo is called multiple times, the 2nd call will
+                // see targets as "fresh". Without this, if cargo finishes in
+                // under 1 second, the second call will see the mtime of
+                // source == mtime of output and consider it dirty.
+                filetime::set_file_times(&file.path, ftime, ftime).unwrap();
+            }
         }
 
         for symlink in self.symlinks.iter() {
@@ -670,7 +682,7 @@
         self.expect_json = Some(
             expected
                 .split("\n\n")
-                .map(|obj| obj.parse().unwrap())
+                .map(|line| line.parse().expect("line to be a valid JSON value"))
                 .collect(),
         );
         self
@@ -758,7 +770,7 @@
             process.exec_with_streaming(
                 &mut |out| Ok(println!("{}", out)),
                 &mut |err| Ok(eprintln!("{}", err)),
-                false,
+                true,
             )
         } else {
             process.exec_with_output()
@@ -1176,8 +1188,10 @@
 ///   See `substitute_macros` for a complete list of macros.
 pub fn lines_match(expected: &str, actual: &str) -> bool {
     // Let's not deal with / vs \ (windows...)
-    let expected = expected.replace("\\", "/");
-    let mut actual: &str = &actual.replace("\\", "/");
+    // First replace backslash-escaped backslashes with forward slashes
+    // which can occur in, for example, JSON output
+    let expected = expected.replace("\\\\", "/").replace("\\", "/");
+    let mut actual: &str = &actual.replace("\\\\", "/").replace("\\", "/");
     let expected = substitute_macros(&expected);
     for (i, part) in expected.split("[..]").enumerate() {
         match actual.find(part) {
@@ -1510,3 +1524,11 @@
 pub fn sleep_ms(ms: u64) {
     ::std::thread::sleep(Duration::from_millis(ms));
 }
+
+/// Returns true if the local filesystem has low-resolution mtimes.
+pub fn is_coarse_mtime() -> bool {
+    // This should actually be a test that $CARGO_TARGET_DIR is on an HFS
+    // filesystem, (or any filesystem with low-resolution mtimes). However,
+    // that's tricky to detect, so for now just deal with CI.
+    cfg!(target_os = "macos") && env::var("CI").is_ok()
+}
diff -Nru cargo-0.32.0/tests/testsuite/support/resolver.rs cargo-0.33.0/tests/testsuite/support/resolver.rs
--- cargo-0.32.0/tests/testsuite/support/resolver.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/support/resolver.rs	2019-01-02 21:49:06.000000000 +0000
@@ -42,7 +42,7 @@
             if p.name().ends_with("-sys") {
                 assert!(links.insert(p.name()));
             }
-            stack.extend(resolve.deps(&p).map(|(dp, deps)| {
+            stack.extend(resolve.deps(p).map(|(dp, deps)| {
                 for d in deps {
                     assert!(d.matches_id(dp));
                 }
@@ -50,7 +50,7 @@
             }));
         }
     }
-    let out: Vec<PackageId> = resolve.iter().cloned().collect();
+    let out = resolve.sort();
     assert_eq!(out.len(), used.len());
     Ok(out)
 }
@@ -62,8 +62,7 @@
     config: Option<&Config>,
 ) -> CargoResult<Vec<PackageId>> {
     let resolve = resolve_with_config_raw(pkg, deps, registry, config)?;
-    let out: Vec<PackageId> = resolve.iter().cloned().collect();
-    Ok(out)
+    Ok(resolve.sort())
 }
 
 pub fn resolve_with_config_raw(
@@ -88,11 +87,11 @@
             Ok(())
         }
 
-        fn describe_source(&self, _src: &SourceId) -> String {
+        fn describe_source(&self, _src: SourceId) -> String {
             String::new()
         }
 
-        fn is_replaced(&self, _src: &SourceId) -> bool {
+        fn is_replaced(&self, _src: SourceId) -> bool {
             false
         }
     }
@@ -128,7 +127,7 @@
 
 impl ToDep for &'static str {
     fn to_dep(self) -> Dependency {
-        Dependency::parse_no_deprecated(self, Some("1.0.0"), &registry_loc()).unwrap()
+        Dependency::parse_no_deprecated(self, Some("1.0.0"), registry_loc()).unwrap()
     }
 }
 
@@ -150,14 +149,14 @@
 
 impl<'a> ToPkgId for &'a str {
     fn to_pkgid(&self) -> PackageId {
-        PackageId::new(*self, "1.0.0", &registry_loc()).unwrap()
+        PackageId::new(*self, "1.0.0", registry_loc()).unwrap()
     }
 }
 
 impl<T: AsRef<str>, U: AsRef<str>> ToPkgId for (T, U) {
     fn to_pkgid(&self) -> PackageId {
         let (name, vers) = self;
-        PackageId::new(name.as_ref(), vers.as_ref(), &registry_loc()).unwrap()
+        PackageId::new(name.as_ref(), vers.as_ref(), registry_loc()).unwrap()
     }
 }
 
@@ -177,7 +176,7 @@
         static ref EXAMPLE_DOT_COM: SourceId =
             SourceId::for_registry(&"http://example.com".to_url().unwrap()).unwrap();
     }
-    EXAMPLE_DOT_COM.clone()
+    *EXAMPLE_DOT_COM
 }
 
 pub fn pkg<T: ToPkgId>(name: T) -> Summary {
@@ -202,7 +201,7 @@
 }
 
 pub fn pkg_id(name: &str) -> PackageId {
-    PackageId::new(name, "1.0.0", &registry_loc()).unwrap()
+    PackageId::new(name, "1.0.0", registry_loc()).unwrap()
 }
 
 fn pkg_id_loc(name: &str, loc: &str) -> PackageId {
@@ -210,7 +209,7 @@
     let master = GitReference::Branch("master".to_string());
     let source_id = SourceId::for_git(&remote.unwrap(), master).unwrap();
 
-    PackageId::new(name, "1.0.0", &source_id).unwrap()
+    PackageId::new(name, "1.0.0", source_id).unwrap()
 }
 
 pub fn pkg_loc(name: &str, loc: &str) -> Summary {
@@ -230,17 +229,22 @@
 }
 
 pub fn dep(name: &str) -> Dependency {
-    dep_req(name, "1.0.0")
+    dep_req(name, "*")
 }
 pub fn dep_req(name: &str, req: &str) -> Dependency {
-    Dependency::parse_no_deprecated(name, Some(req), &registry_loc()).unwrap()
+    Dependency::parse_no_deprecated(name, Some(req), registry_loc()).unwrap()
+}
+pub fn dep_req_kind(name: &str, req: &str, kind: Kind) -> Dependency {
+    let mut dep = dep_req(name, req);
+    dep.set_kind(kind);
+    dep
 }
 
 pub fn dep_loc(name: &str, location: &str) -> Dependency {
     let url = location.to_url().unwrap();
     let master = GitReference::Branch("master".to_string());
     let source_id = SourceId::for_git(&url, master).unwrap();
-    Dependency::parse_no_deprecated(name, Some("1.0.0"), &source_id).unwrap()
+    Dependency::parse_no_deprecated(name, Some("1.0.0"), source_id).unwrap()
 }
 pub fn dep_kind(name: &str, kind: Kind) -> Dependency {
     dep(name).set_kind(kind).clone()
@@ -277,12 +281,28 @@
             } else {
                 write!(f, "pkg!((\"{}\", \"{}\") => [", s.name(), s.version())?;
                 for d in s.dependencies() {
-                    write!(
-                        f,
-                        "dep_req(\"{}\", \"{}\"),",
-                        d.name_in_toml(),
-                        d.version_req()
-                    )?;
+                    if d.kind() == Kind::Normal && &d.version_req().to_string() == "*" {
+                        write!(f, "dep(\"{}\"),", d.name_in_toml())?;
+                    } else if d.kind() == Kind::Normal {
+                        write!(
+                            f,
+                            "dep_req(\"{}\", \"{}\"),",
+                            d.name_in_toml(),
+                            d.version_req()
+                        )?;
+                    } else {
+                        write!(
+                            f,
+                            "dep_req_kind(\"{}\", \"{}\", {}),",
+                            d.name_in_toml(),
+                            d.version_req(),
+                            match d.kind() {
+                                Kind::Development => "Kind::Development",
+                                Kind::Build => "Kind::Build",
+                                Kind::Normal => "Kind::Normal",
+                            }
+                        )?;
+                    }
                 }
                 write!(f, "]),")?;
             }
@@ -299,21 +319,28 @@
             PrettyPrintRegistry(vec![
                 pkg!(("foo", "1.0.1") => [dep_req("bar", "1")]),
                 pkg!(("foo", "1.0.0") => [dep_req("bar", "2")]),
+                pkg!(("foo", "2.0.0") => [dep_req("bar", "*")]),
                 pkg!(("bar", "1.0.0") => [dep_req("baz", "=1.0.2"),
                                   dep_req("other", "1")]),
                 pkg!(("bar", "2.0.0") => [dep_req("baz", "=1.0.1")]),
                 pkg!(("baz", "1.0.2") => [dep_req("other", "2")]),
                 pkg!(("baz", "1.0.1")),
+                pkg!(("cat", "1.0.2") => [dep_req_kind("other", "2", Kind::Build)]),
+                pkg!(("cat", "1.0.2") => [dep_req_kind("other", "2", Kind::Development)]),
                 pkg!(("dep_req", "1.0.0")),
                 pkg!(("dep_req", "2.0.0")),
             ])
         ),
         "vec![pkg!((\"foo\", \"1.0.1\") => [dep_req(\"bar\", \"^1\"),]),\
          pkg!((\"foo\", \"1.0.0\") => [dep_req(\"bar\", \"^2\"),]),\
+         pkg!((\"foo\", \"2.0.0\") => [dep(\"bar\"),]),\
          pkg!((\"bar\", \"1.0.0\") => [dep_req(\"baz\", \"= 1.0.2\"),dep_req(\"other\", \"^1\"),]),\
          pkg!((\"bar\", \"2.0.0\") => [dep_req(\"baz\", \"= 1.0.1\"),]),\
          pkg!((\"baz\", \"1.0.2\") => [dep_req(\"other\", \"^2\"),]),\
-         pkg!((\"baz\", \"1.0.1\")),pkg!((\"dep_req\", \"1.0.0\")),\
+         pkg!((\"baz\", \"1.0.1\")),\
+         pkg!((\"cat\", \"1.0.2\") => [dep_req_kind(\"other\", \"^2\", Kind::Build),]),\
+         pkg!((\"cat\", \"1.0.2\") => [dep_req_kind(\"other\", \"^2\", Kind::Development),]),\
+         pkg!((\"dep_req\", \"1.0.0\")),\
          pkg!((\"dep_req\", \"2.0.0\")),]"
     )
 }
@@ -326,10 +353,15 @@
     max_versions: usize,
     shrinkage: usize,
 ) -> impl Strategy<Value = PrettyPrintRegistry> {
-    let name = string_regex("[A-Za-z_-][A-Za-z0-9_-]*(-sys)?").unwrap();
+    let name = string_regex("[A-Za-z][A-Za-z0-9_-]*(-sys)?").unwrap();
 
-    let raw_version = [..max_versions; 3];
-    let version_from_raw = |v: &[usize; 3]| format!("{}.{}.{}", v[0], v[1], v[2]);
+    let raw_version = ..max_versions.pow(3);
+    let version_from_raw = move |r: usize| {
+        let major = ((r / max_versions) / max_versions) % max_versions;
+        let minor = (r / max_versions) % max_versions;
+        let patch = r % max_versions;
+        format!("{}.{}.{}", major, minor, patch)
+    };
 
     // If this is false than the crate will depend on the nonexistent "bad"
     // instead of the complex set we generated for it.
@@ -338,7 +370,7 @@
     let list_of_versions =
         btree_map(raw_version, allow_deps, 1..=max_versions).prop_map(move |ver| {
             ver.into_iter()
-                .map(|a| (version_from_raw(&a.0), a.1))
+                .map(|a| (version_from_raw(a.0), a.1))
                 .collect::<Vec<_>>()
         });
 
@@ -357,7 +389,7 @@
     let max_deps = max_versions * (max_crates * (max_crates - 1)) / shrinkage;
 
     let raw_version_range = (any::<Index>(), any::<Index>());
-    let raw_dependency = (any::<Index>(), any::<Index>(), raw_version_range);
+    let raw_dependency = (any::<Index>(), any::<Index>(), raw_version_range, 0..=1);
 
     fn order_index(a: Index, b: Index, size: usize) -> (usize, usize) {
         let (a, b) = (a.index(size), b.index(size));
@@ -374,22 +406,35 @@
                 .collect();
             let len_all_pkgid = list_of_pkgid.len();
             let mut dependency_by_pkgid = vec![vec![]; len_all_pkgid];
-            for (a, b, (c, d)) in raw_dependencies {
+            for (a, b, (c, d), k) in raw_dependencies {
                 let (a, b) = order_index(a, b, len_all_pkgid);
                 let ((dep_name, _), _) = list_of_pkgid[a];
                 if (list_of_pkgid[b].0).0 == dep_name {
                     continue;
                 }
                 let s = &crate_vers_by_name[dep_name];
+                let s_last_index = s.len() - 1;
                 let (c, d) = order_index(c, d, s.len());
 
-                dependency_by_pkgid[b].push(dep_req(
+                dependency_by_pkgid[b].push(dep_req_kind(
                     &dep_name,
-                    &if c == d {
+                    &if c == 0 && d == s_last_index {
+                        "*".to_string()
+                    } else if c == 0 {
+                        format!("<={}", s[d].0)
+                    } else if d == s_last_index {
+                        format!(">={}", s[c].0)
+                    } else if c == d {
                         format!("={}", s[c].0)
                     } else {
                         format!(">={}, <={}", s[c].0, s[d].0)
                     },
+                    match k {
+                        0 => Kind::Normal,
+                        1 => Kind::Build,
+                        // => Kind::Development, // Development has not impact so don't gen
+                        _ => panic!("bad index for Kind"),
+                    },
                 ))
             }
 
@@ -418,12 +463,16 @@
 
 /// This test is to test the generator to ensure
 /// that it makes registries with large dependency trees
+///
+/// This is a form of randomized testing, if you are unlucky it can fail.
+/// A failure on it's own is not a big dael. If you did not change the
+/// `registry_strategy` then feel free to retry without concern.
 #[test]
 fn meta_test_deep_trees_from_strategy() {
     let mut dis = [0; 21];
 
     let strategy = registry_strategy(50, 20, 60);
-    for _ in 0..64 {
+    for _ in 0..128 {
         let PrettyPrintRegistry(input) = strategy
             .new_tree(&mut TestRunner::default())
             .unwrap()
@@ -446,19 +495,23 @@
     }
 
     panic!(
-        "In 640 tries we did not see a wide enough distribution of dependency trees! dis: {:?}",
+        "In 1280 tries we did not see a wide enough distribution of dependency trees! dis: {:?}",
         dis
     );
 }
 
 /// This test is to test the generator to ensure
 /// that it makes registries that include multiple versions of the same library
+///
+/// This is a form of randomized testing, if you are unlucky it can fail.
+/// A failure on its own is not a big deal. If you did not change the
+/// `registry_strategy` then feel free to retry without concern.
 #[test]
 fn meta_test_multiple_versions_strategy() {
     let mut dis = [0; 10];
 
     let strategy = registry_strategy(50, 20, 60);
-    for _ in 0..64 {
+    for _ in 0..128 {
         let PrettyPrintRegistry(input) = strategy
             .new_tree(&mut TestRunner::default())
             .unwrap()
@@ -482,7 +535,7 @@
         }
     }
     panic!(
-        "In 640 tries we did not see a wide enough distribution of multiple versions of the same library! dis: {:?}",
+        "In 1280 tries we did not see a wide enough distribution of multiple versions of the same library! dis: {:?}",
         dis
     );
 }
diff -Nru cargo-0.32.0/tests/testsuite/tool_paths.rs cargo-0.33.0/tests/testsuite/tool_paths.rs
--- cargo-0.32.0/tests/testsuite/tool_paths.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/tool_paths.rs	2019-01-02 21:49:06.000000000 +0000
@@ -33,7 +33,6 @@
 #[test]
 fn absolute_tools() {
     let target = rustc_host();
-    let root = if cfg!(windows) { r#"C:\"# } else { "/" };
 
     // Escaped as they appear within a TOML config file
     let config = if cfg!(windows) {
@@ -62,14 +61,11 @@
             ),
         ).build();
 
-    foo.cargo("build --verbose").with_stderr(&format!(
-            "\
+    foo.cargo("build --verbose").with_stderr("\
 [COMPILING] foo v0.5.0 ([CWD])
-[RUNNING] `rustc [..] -C ar={root}bogus/nonexistent-ar -C linker={root}bogus/nonexistent-linker [..]`
+[RUNNING] `rustc [..] -C ar=[ROOT]bogus/nonexistent-ar -C linker=[ROOT]bogus/nonexistent-linker [..]`
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
-",
-            root = root,
-        )).run();
+").run();
 }
 
 #[test]
diff -Nru cargo-0.32.0/tests/testsuite/verify_project.rs cargo-0.33.0/tests/testsuite/verify_project.rs
--- cargo-0.32.0/tests/testsuite/verify_project.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/verify_project.rs	2019-01-02 21:49:06.000000000 +0000
@@ -42,3 +42,27 @@
         .with_stdout(verify_project_success_output())
         .run();
 }
+
+#[test]
+fn cargo_verify_project_honours_unstable_features() {
+    let p = project()
+        .file("Cargo.toml", r#"
+        cargo-features = ["test-dummy-unstable"]
+
+        [package]
+        name = "foo"
+        version = "0.0.1"
+    "#)
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("verify-project")
+        .masquerade_as_nightly_cargo()
+        .with_stdout(verify_project_success_output())
+        .run();
+
+    p.cargo("verify-project")
+        .with_status(1)
+        .with_stdout(r#"{"invalid":"failed to parse manifest at `[CWD]/Cargo.toml`"}"#)
+        .run();
+}
diff -Nru cargo-0.32.0/tests/testsuite/workspaces.rs cargo-0.33.0/tests/testsuite/workspaces.rs
--- cargo-0.32.0/tests/testsuite/workspaces.rs	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/tests/testsuite/workspaces.rs	2019-01-02 21:49:06.000000000 +0000
@@ -1879,3 +1879,122 @@
         .with_stderr("[ERROR] [..]against an actual package[..]")
         .run();
 }
+
+#[test]
+fn ws_err_unused() {
+    for key in &[
+        "[lib]",
+        "[[bin]]",
+        "[[example]]",
+        "[[test]]",
+        "[[bench]]",
+        "[dependencies]",
+        "[dev-dependencies]",
+        "[build-dependencies]",
+        "[features]",
+        "[target]",
+        "[badges]",
+    ] {
+        let p = project()
+            .file(
+                "Cargo.toml",
+                &format!(
+                    r#"
+                    [workspace]
+                    members = ["a"]
+
+                    {}
+                    "#,
+                    key
+                ),
+            )
+            .file("a/Cargo.toml", &basic_lib_manifest("a"))
+            .file("a/src/lib.rs", "")
+            .build();
+        p.cargo("check")
+            .with_status(101)
+            .with_stderr(&format!(
+                "\
+[ERROR] failed to parse manifest at `[..]/foo/Cargo.toml`
+
+Caused by:
+  virtual manifests do not specify {}
+",
+                key
+            ))
+            .run();
+    }
+}
+
+#[test]
+fn ws_warn_unused() {
+    for (key, name) in &[
+        ("[profile.dev]\nopt-level = 1", "profiles"),
+        ("[replace]\n\"bar:0.1.0\" = { path = \"bar\" }", "replace"),
+        ("[patch.crates-io]\nbar = { path = \"bar\" }", "patch"),
+    ] {
+        let p = project()
+            .file(
+                "Cargo.toml",
+                r#"
+                [workspace]
+                members = ["a"]
+                "#,
+            )
+            .file(
+                "a/Cargo.toml",
+                &format!(
+                    r#"
+                    [package]
+                    name = "a"
+                    version = "0.1.0"
+
+                    {}
+                    "#,
+                    key
+                ),
+            )
+            .file("a/src/lib.rs", "")
+            .build();
+        p.cargo("check")
+            .with_status(0)
+            .with_stderr_contains(&format!(
+                "\
+[WARNING] {} for the non root package will be ignored, specify {} at the workspace root:
+package:   [..]/foo/a/Cargo.toml
+workspace: [..]/foo/Cargo.toml
+",
+                name, name
+            ))
+            .run();
+    }
+}
+
+#[test]
+fn ws_warn_path() {
+    // Warnings include path to manifest.
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["a"]
+            "#,
+        )
+        .file(
+            "a/Cargo.toml",
+            r#"
+            cargo-features = ["edition"]
+            [package]
+            name = "foo"
+            version = "0.1.0"
+            "#,
+        )
+        .file("a/src/lib.rs", "")
+        .build();
+
+    p.cargo("check")
+        .with_status(0)
+        .with_stderr_contains("[WARNING] [..]/foo/a/Cargo.toml: the cargo feature `edition`[..]")
+        .run();
+}
diff -Nru cargo-0.32.0/.travis.yml cargo-0.33.0/.travis.yml
--- cargo-0.32.0/.travis.yml	2018-11-16 10:06:49.000000000 +0000
+++ cargo-0.33.0/.travis.yml	2019-01-02 21:49:06.000000000 +0000
@@ -22,6 +22,7 @@
     - env: TARGET=x86_64-apple-darwin
            ALT=i686-apple-darwin
       os: osx
+      osx_image: xcode9.2
       if: branch != master OR type = pull_request
 
     - env: TARGET=x86_64-unknown-linux-gnu
@@ -35,7 +36,7 @@
     # increased every 6 weeks or so when the first PR to use a new feature.
     - env: TARGET=x86_64-unknown-linux-gnu
            ALT=i686-unknown-linux-gnu
-      rust: 1.28.0
+      rust: 1.31.0
       script:
         - rustup toolchain install nightly
         - cargo +nightly generate-lockfile -Z minimal-versions
diff -Nru cargo-0.32.0/vendor/aho-corasick/.cargo_vcs_info.json cargo-0.33.0/vendor/aho-corasick/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/aho-corasick/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/aho-corasick/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "6e17854c0f63acd101e0d985e6d2441ee24e9eff"
-  }
-}
diff -Nru cargo-0.32.0/vendor/ansi_term/.travis.yml cargo-0.33.0/vendor/ansi_term/.travis.yml
--- cargo-0.32.0/vendor/ansi_term/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ansi_term/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-language: rust
-
-addons:
-  apt:
-    packages:
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-
-rust:
-  - nightly
-  - beta
-  - stable
-
-# load travis-cargo
-before_script:
-  - |
-      pip install 'travis-cargo<0.2' --user &&
-      export PATH=$HOME/.local/bin:$PATH
-
-script:
-  - |
-      travis-cargo build &&
-      travis-cargo test
-      travis-cargo --only stable doc
-after_success:
-  # measure code coverage and upload to coveralls.io
-  - travis-cargo coveralls --no-sudo
-
-env:
-  global:
-    # override the default `--features unstable` used for the nightly branch (optional)
-    - TRAVIS_CARGO_NIGHTLY_FEATURE=nightly
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/arrayvec/benches/arraystring.rs cargo-0.33.0/vendor/arrayvec/benches/arraystring.rs
--- cargo-0.32.0/vendor/arrayvec/benches/arraystring.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/benches/arraystring.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-
-extern crate arrayvec;
-#[macro_use] extern crate bencher;
-
-use arrayvec::ArrayString;
-
-use bencher::Bencher;
-
-fn try_push_c(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
-    b.iter(|| {
-        v.clear();
-        while v.try_push('c').is_ok() {
-        }
-        v.len()
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-fn try_push_alpha(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
-    b.iter(|| {
-        v.clear();
-        while v.try_push('α').is_ok() {
-        }
-        v.len()
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-// Yes, pushing a string char-by-char is slow. Use .push_str.
-fn try_push_string(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
-    let input = "abcαβγ“”";
-    b.iter(|| {
-        v.clear();
-        for ch in input.chars().cycle() {
-            if !v.try_push(ch).is_ok() {
-                break;
-            }
-        }
-        v.len()
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-fn push_c(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
-    b.iter(|| {
-        v.clear();
-        while !v.is_full() {
-            v.push('c');
-        }
-        v.len()
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-fn push_alpha(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
-    b.iter(|| {
-        v.clear();
-        while !v.is_full() {
-            v.push('α');
-        }
-        v.len()
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-fn push_string(b: &mut Bencher) {
-    let mut v = ArrayString::<[u8; 512]>::new();
-    let input = "abcαβγ“”";
-    b.iter(|| {
-        v.clear();
-        for ch in input.chars().cycle() {
-            if !v.is_full() {
-                v.push(ch);
-            } else {
-                break;
-            }
-        }
-        v.len()
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-benchmark_group!(benches, try_push_c, try_push_alpha, try_push_string, push_c,
-                 push_alpha, push_string);
-benchmark_main!(benches);
diff -Nru cargo-0.32.0/vendor/arrayvec/benches/extend.rs cargo-0.33.0/vendor/arrayvec/benches/extend.rs
--- cargo-0.32.0/vendor/arrayvec/benches/extend.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/benches/extend.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-
-extern crate arrayvec;
-#[macro_use] extern crate bencher;
-
-use arrayvec::ArrayVec;
-
-use bencher::Bencher;
-
-fn extend_with_constant(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
-    let cap = v.capacity();
-    b.iter(|| {
-        v.clear();
-        v.extend((0..cap).map(|_| 1));
-        v[0]
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-fn extend_with_range(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
-    let cap = v.capacity();
-    b.iter(|| {
-        v.clear();
-        v.extend((0..cap).map(|x| x as _));
-        v[0]
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-fn extend_with_slice(b: &mut Bencher) {
-    let mut v = ArrayVec::<[u8; 512]>::new();
-    let data = [1; 512];
-    b.iter(|| {
-        v.clear();
-        v.extend(data.iter().cloned());
-        v[0]
-    });
-    b.bytes = v.capacity() as u64;
-}
-
-benchmark_group!(benches, extend_with_constant, extend_with_range, extend_with_slice);
-benchmark_main!(benches);
diff -Nru cargo-0.32.0/vendor/arrayvec/.cargo-checksum.json cargo-0.33.0/vendor/arrayvec/.cargo-checksum.json
--- cargo-0.32.0/vendor/arrayvec/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"f405cc4c21cd8b784f6c8fc2adf9bc00f59558f0049b5ec21517f875963040cc"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/arrayvec/Cargo.toml cargo-0.33.0/vendor/arrayvec/Cargo.toml
--- cargo-0.32.0/vendor/arrayvec/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "arrayvec"
-version = "0.4.8"
-authors = ["bluss"]
-description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."
-documentation = "https://docs.rs/arrayvec/"
-keywords = ["stack", "vector", "array", "data-structure", "no_std"]
-categories = ["data-structures", "no-std"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/bluss/arrayvec"
-[package.metadata.docs.rs]
-features = ["serde-1"]
-
-[package.metadata.release]
-no-dev-version = true
-
-[[bench]]
-name = "extend"
-harness = false
-
-[[bench]]
-name = "arraystring"
-harness = false
-[dependencies.nodrop]
-version = "0.1.12"
-default-features = false
-
-[dependencies.serde]
-version = "1.0"
-optional = true
-default-features = false
-[dev-dependencies.bencher]
-version = "0.1.4"
-
-[dev-dependencies.matches]
-version = "0.1"
-
-[dev-dependencies.serde_test]
-version = "1.0"
-
-[features]
-array-sizes-129-255 = []
-array-sizes-33-128 = []
-default = ["std"]
-serde-1 = ["serde"]
-std = []
-use_union = []
diff -Nru cargo-0.32.0/vendor/arrayvec/.cargo_vcs_info.json cargo-0.33.0/vendor/arrayvec/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/arrayvec/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "c8d12cecb372a7bcf9cd213b6db72e359fbc6fb3"
-  }
-}
diff -Nru cargo-0.32.0/vendor/arrayvec/custom.css cargo-0.33.0/vendor/arrayvec/custom.css
--- cargo-0.32.0/vendor/arrayvec/custom.css	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/custom.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-
-.docblock pre.rust { background: #eeeeff; }
-pre.trait, pre.fn, pre.struct, pre.enum, pre.typedef { background: #fcfefc; }
-
-/* Small “example” label for doc examples */
-.docblock pre.rust::before {
-    content: "example";
-    float: right;
-    font-style: italic;
-    font-size: 0.8em;
-    margin-top: -10px;
-    margin-right: -5px;
-}
-
-
-/* Fixup where display in trait listing */
-pre.trait .where::before {
-content: '\a         ';
-}
-
-.docblock code {
-    background-color: inherit;
-    font-weight: bold;
-    padding: 0 0.1em;
-}
diff -Nru cargo-0.32.0/vendor/arrayvec/LICENSE-APACHE cargo-0.33.0/vendor/arrayvec/LICENSE-APACHE
--- cargo-0.32.0/vendor/arrayvec/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/arrayvec/LICENSE-MIT cargo-0.33.0/vendor/arrayvec/LICENSE-MIT
--- cargo-0.32.0/vendor/arrayvec/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) Ulrik Sverdrup "bluss" 2015-2017
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/arrayvec/README.rst cargo-0.33.0/vendor/arrayvec/README.rst
--- cargo-0.32.0/vendor/arrayvec/README.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,193 +0,0 @@
-
-arrayvec
-========
-
-A vector with fixed capacity.
-
-Please read the `API documentation here`__
-
-__ https://docs.rs/arrayvec
-
-|build_status|_ |crates|_ |crates2|_
-
-.. |build_status| image:: https://travis-ci.org/bluss/arrayvec.svg
-.. _build_status: https://travis-ci.org/bluss/arrayvec
-
-.. |crates| image:: http://meritbadge.herokuapp.com/arrayvec
-.. _crates: https://crates.io/crates/arrayvec
-
-.. |crates2| image:: http://meritbadge.herokuapp.com/nodrop
-.. _crates2: https://crates.io/crates/nodrop
-
-Recent Changes (arrayvec)
--------------------------
-
-- 0.4.8
-
-  - Implement Clone and Debug for ``IntoIter`` by @clarcharr
-  - Add more array sizes under crate features. These cover all in the range
-    up to 128 and 129 to 255 respectively (we have a few of those by default):
-
-    - ``array-size-33-128``
-    - ``array-size-129-255``
-
-- 0.4.7
-
-  - Fix future compat warning about raw pointer casts
-  - Use ``drop_in_place`` when dropping the arrayvec by-value iterator
-  - Decrease mininum Rust version (see docs) by @jeehoonkang
-
-- 0.3.25
-
-  - Fix future compat warning about raw pointer casts
-
-- 0.4.6
-
-  - Fix compilation on 16-bit targets. This means, the 65536 array size is not
-    included on these targets.
-
-- 0.3.24
-
-  - Fix compilation on 16-bit targets. This means, the 65536 array size is not
-    included on these targets.
-  - Fix license files so that they are both included (was fixed in 0.4 before)
-
-- 0.4.5
-
-  - Add methods to ``ArrayString`` by @DenialAdams:
-
-    - ``.pop() -> Option<char>``
-    - ``.truncate(new_len)``
-    - ``.remove(index) -> char``
-
-  - Remove dependency on crate odds
-  - Document debug assertions in unsafe methods better
-
-- 0.4.4
-
-  - Add method ``ArrayVec::truncate()`` by @niklasf
-
-- 0.4.3
-
-  - Improve performance for ``ArrayVec::extend`` with a lower level
-    implementation (#74)
-  - Small cleanup in dependencies (use no std for crates where we don't need more)
-
-- 0.4.2
-
-  - Add constructor method ``new`` to ``CapacityError``.
-
-- 0.4.1
-
-  - Add ``Default`` impl to ``ArrayString`` by @tbu-
-
-- 0.4.0
-
-  - Reformed signatures and error handling by @bluss and @tbu-:
-
-    - ``ArrayVec``'s ``push, insert, remove, swap_remove`` now match ``Vec``'s
-      corresponding signature and panic on capacity errors where applicable.
-    - Add fallible methods ``try_push, insert`` and checked methods
-      ``pop_at, swap_pop``.
-    - Similar changes to ``ArrayString``'s push methods.
-
-  - Use a local version of the ``RangeArgument`` trait
-  - Add array sizes 50, 150, 200 by @daboross
-  - Support serde 1.0 by @daboross
-  - New method ``.push_unchecked()`` by @niklasf
-  - ``ArrayString`` implements ``PartialOrd, Ord`` by @tbu-
-  - Require Rust 1.14
-  - crate feature ``use_generic_array`` was dropped.
-
-- 0.3.23
-
-  - Implement ``PartialOrd, Ord`` as well as ``PartialOrd<str>`` for
-    ``ArrayString``.
-
-- 0.3.22
-
-  - Implement ``Array`` for the 65536 size
-
-- 0.3.21
-
-  - Use ``encode_utf8`` from crate odds
-  - Add constructor ``ArrayString::from_byte_string``
-
-- 0.3.20
-
-  - Simplify and speed up ``ArrayString``’s ``.push(char)``-
-
-- 0.3.19
-
-  - Add new crate feature ``use_generic_array`` which allows using their
-    ``GenericArray`` just like a regular fixed size array for the storage
-    of an ``ArrayVec``.
-
-- 0.3.18
-
-  - Fix bounds check in ``ArrayVec::insert``!
-    It would be buggy if ``self.len() < index < self.capacity()``. Take note of
-    the push out behavior specified in the docs.
-
-- 0.3.17
-
-  - Added crate feature ``use_union`` which forwards to the nodrop crate feature
-  - Added methods ``.is_full()`` to ``ArrayVec`` and ``ArrayString``.
-
-- 0.3.16
-
-  - Added method ``.retain()`` to ``ArrayVec``.
-  - Added methods ``.as_slice(), .as_mut_slice()`` to ``ArrayVec`` and ``.as_str()``
-    to ``ArrayString``.
-
-- 0.3.15
-
-  - Add feature std, which you can opt out of to use ``no_std`` (requires Rust 1.6
-    to opt out).
-  - Implement ``Clone::clone_from`` for ArrayVec and ArrayString
-
-- 0.3.14
-
-  - Add ``ArrayString::from(&str)``
-
-- 0.3.13
-
-  - Added ``DerefMut`` impl for ``ArrayString``.
-  - Added method ``.simplify()`` to drop the element for ``CapacityError``.
-  - Added method ``.dispose()`` to ``ArrayVec``
-
-- 0.3.12
-
-  - Added ArrayString, a fixed capacity analogy of String
-
-- 0.3.11
-
-  - Added trait impls Default, PartialOrd, Ord, Write for ArrayVec
-
-- 0.3.10
-
-  - Go back to using external NoDrop, fixing a panic safety bug (issue #3)
-
-- 0.3.8
-
-  - Inline the non-dropping logic to remove one drop flag in the
-    ArrayVec representation.
-
-- 0.3.7
-
-  - Added method .into_inner()
-  - Added unsafe method .set_len()
-
-
-License
-=======
-
-Dual-licensed to be compatible with the Rust project.
-
-Licensed under the Apache License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
-http://opensource.org/licenses/MIT, at your
-option. This file may not be copied, modified, or distributed
-except according to those terms.
-
-
diff -Nru cargo-0.32.0/vendor/arrayvec/src/array.rs cargo-0.33.0/vendor/arrayvec/src/array.rs
--- cargo-0.32.0/vendor/arrayvec/src/array.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/src/array.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-
-/// Trait for fixed size arrays.
-///
-/// This trait is implemented for some specific array sizes, see
-/// the implementor list below. At the current state of Rust we can't
-/// make this fully general for every array size.
-///
-/// The following crate features add more array sizes (and they are not
-/// enabled by default due to their impact on compliation speed).
-///
-/// - `array-sizes-33-128`: All sizes 33 to 128 are implemented
-///   (a few in this range are included by default).
-/// - `array-sizes-129-255`: All sizes 129 to 255 are implemented
-///   (a few in this range are included by default).
-pub unsafe trait Array {
-    /// The array’s element type
-    type Item;
-    #[doc(hidden)]
-    /// The smallest index type that indexes the array.
-    type Index: Index;
-    #[doc(hidden)]
-    fn as_ptr(&self) -> *const Self::Item;
-    #[doc(hidden)]
-    fn as_mut_ptr(&mut self) -> *mut Self::Item;
-    #[doc(hidden)]
-    fn capacity() -> usize;
-}
-
-pub trait Index : PartialEq + Copy {
-    fn to_usize(self) -> usize;
-    fn from(usize) -> Self;
-}
-
-use std::slice::{from_raw_parts};
-
-pub trait ArrayExt : Array {
-    #[inline(always)]
-    fn as_slice(&self) -> &[Self::Item] {
-        unsafe {
-            from_raw_parts(self.as_ptr(), Self::capacity())
-        }
-    }
-}
-
-impl<A> ArrayExt for A where A: Array { }
-
-impl Index for u8 {
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix as u8 }
-}
-
-impl Index for u16 {
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix as u16 }
-}
-
-impl Index for u32 {
-    #[inline(always)]
-    fn to_usize(self) -> usize { self as usize }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix as u32 }
-}
-
-impl Index for usize {
-    #[inline(always)]
-    fn to_usize(self) -> usize { self }
-    #[inline(always)]
-    fn from(ix: usize) ->  Self { ix }
-}
-
-macro_rules! fix_array_impl {
-    ($index_type:ty, $len:expr ) => (
-        unsafe impl<T> Array for [T; $len] {
-            type Item = T;
-            type Index = $index_type;
-            #[doc(hidden)]
-            #[inline(always)]
-            fn as_ptr(&self) -> *const T { self as *const _ as *const _ }
-            #[doc(hidden)]
-            #[inline(always)]
-            fn as_mut_ptr(&mut self) -> *mut T { self as *mut _ as *mut _}
-            #[doc(hidden)]
-            #[inline(always)]
-            fn capacity() -> usize { $len }
-        }
-    )
-}
-
-macro_rules! fix_array_impl_recursive {
-    ($index_type:ty, ) => ();
-    ($index_type:ty, $($len:expr,)*) => (
-        $(fix_array_impl!($index_type, $len);)*
-    );
-}
-
-fix_array_impl_recursive!(u8, 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, );
-
-#[cfg(not(feature="array-sizes-33-128"))]
-fix_array_impl_recursive!(u8, 32, 40, 48, 50, 56, 64, 72, 96, 100, 128, );
-
-#[cfg(feature="array-sizes-33-128")]
-fix_array_impl_recursive!(u8, 
-32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
-72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
-109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
-125, 126, 127, 128,
-);
-
-#[cfg(not(feature="array-sizes-129-255"))]
-fix_array_impl_recursive!(u8, 160, 192, 200, 224,);
-
-#[cfg(feature="array-sizes-129-255")]
-fix_array_impl_recursive!(u8,
-129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
-141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
-157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
-173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
-189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
-205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
-221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
-237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
-253, 254, 255,
-);
-
-fix_array_impl_recursive!(u16, 256, 384, 512, 768, 1024, 2048, 4096, 8192, 16384, 32768,);
-// This array size doesn't exist on 16-bit
-#[cfg(any(target_pointer_width="32", target_pointer_width="64"))]
-fix_array_impl_recursive!(u32, 1 << 16,);
-
diff -Nru cargo-0.32.0/vendor/arrayvec/src/array_string.rs cargo-0.33.0/vendor/arrayvec/src/array_string.rs
--- cargo-0.32.0/vendor/arrayvec/src/array_string.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/src/array_string.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,514 +0,0 @@
-use std::borrow::Borrow;
-use std::cmp;
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::mem;
-use std::ptr;
-use std::ops::{Deref, DerefMut};
-use std::str;
-use std::str::Utf8Error;
-use std::slice;
-
-use array::{Array, ArrayExt};
-use array::Index;
-use CapacityError;
-use char::encode_utf8;
-
-#[cfg(feature="serde-1")]
-use serde::{Serialize, Deserialize, Serializer, Deserializer};
-
-/// A string with a fixed capacity.
-///
-/// The `ArrayString` is a string backed by a fixed size array. It keeps track
-/// of its length.
-///
-/// The string is a contiguous value that you can store directly on the stack
-/// if needed.
-#[derive(Copy)]
-pub struct ArrayString<A: Array<Item=u8>> {
-    xs: A,
-    len: A::Index,
-}
-
-impl<A: Array<Item=u8>> Default for ArrayString<A> {
-    /// Return an empty `ArrayString`
-    fn default() -> ArrayString<A> {
-        ArrayString::new()
-    }
-}
-
-impl<A: Array<Item=u8>> ArrayString<A> {
-    /// Create a new empty `ArrayString`.
-    ///
-    /// Capacity is inferred from the type parameter.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 16]>::new();
-    /// string.push_str("foo");
-    /// assert_eq!(&string[..], "foo");
-    /// assert_eq!(string.capacity(), 16);
-    /// ```
-    pub fn new() -> ArrayString<A> {
-        unsafe {
-            ArrayString {
-                xs: ::new_array(),
-                len: Index::from(0),
-            }
-        }
-    }
-
-    /// Create a new `ArrayString` from a `str`.
-    ///
-    /// Capacity is inferred from the type parameter.
-    ///
-    /// **Errors** if the backing array is not large enough to fit the string.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 3]>::from("foo").unwrap();
-    /// assert_eq!(&string[..], "foo");
-    /// assert_eq!(string.len(), 3);
-    /// assert_eq!(string.capacity(), 3);
-    /// ```
-    pub fn from(s: &str) -> Result<Self, CapacityError<&str>> {
-        let mut arraystr = Self::new();
-        arraystr.try_push_str(s)?;
-        Ok(arraystr)
-    }
-
-    /// Create a new `ArrayString` from a byte string literal.
-    ///
-    /// **Errors** if the byte string literal is not valid UTF-8.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let string = ArrayString::from_byte_string(b"hello world").unwrap();
-    /// ```
-    pub fn from_byte_string(b: &A) -> Result<Self, Utf8Error> {
-        let mut arraystr = Self::new();
-        let s = try!(str::from_utf8(b.as_slice()));
-        let _result = arraystr.try_push_str(s);
-        debug_assert!(_result.is_ok());
-        Ok(arraystr)
-    }
-
-    /// Return the capacity of the `ArrayString`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let string = ArrayString::<[_; 3]>::new();
-    /// assert_eq!(string.capacity(), 3);
-    /// ```
-    #[inline]
-    pub fn capacity(&self) -> usize { A::capacity() }
-
-    /// Return if the `ArrayString` is completely filled.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 1]>::new();
-    /// assert!(!string.is_full());
-    /// string.push_str("A");
-    /// assert!(string.is_full());
-    /// ```
-    pub fn is_full(&self) -> bool { self.len() == self.capacity() }
-
-    /// Adds the given char to the end of the string.
-    ///
-    /// ***Panics*** if the backing array is not large enough to fit the additional char.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
-    ///
-    /// string.push('a');
-    /// string.push('b');
-    ///
-    /// assert_eq!(&string[..], "ab");
-    /// ```
-    pub fn push(&mut self, c: char) {
-        self.try_push(c).unwrap();
-    }
-
-    /// Adds the given char to the end of the string.
-    ///
-    /// Returns `Ok` if the push succeeds.
-    ///
-    /// **Errors** if the backing array is not large enough to fit the additional char.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
-    ///
-    /// string.try_push('a').unwrap();
-    /// string.try_push('b').unwrap();
-    /// let overflow = string.try_push('c');
-    ///
-    /// assert_eq!(&string[..], "ab");
-    /// assert_eq!(overflow.unwrap_err().element(), 'c');
-    /// ```
-    pub fn try_push(&mut self, c: char) -> Result<(), CapacityError<char>> {
-        let len = self.len();
-        unsafe {
-            match encode_utf8(c, &mut self.raw_mut_bytes()[len..]) {
-                Ok(n) => {
-                    self.set_len(len + n);
-                    Ok(())
-                }
-                Err(_) => Err(CapacityError::new(c)),
-            }
-        }
-    }
-
-    /// Adds the given string slice to the end of the string.
-    ///
-    /// ***Panics*** if the backing array is not large enough to fit the string.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
-    ///
-    /// string.push_str("a");
-    /// string.push_str("d");
-    ///
-    /// assert_eq!(&string[..], "ad");
-    /// ```
-    pub fn push_str(&mut self, s: &str) {
-        self.try_push_str(s).unwrap()
-    }
-
-    /// Adds the given string slice to the end of the string.
-    ///
-    /// Returns `Ok` if the push succeeds.
-    ///
-    /// **Errors** if the backing array is not large enough to fit the string.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 2]>::new();
-    ///
-    /// string.try_push_str("a").unwrap();
-    /// let overflow1 = string.try_push_str("bc");
-    /// string.try_push_str("d").unwrap();
-    /// let overflow2 = string.try_push_str("ef");
-    ///
-    /// assert_eq!(&string[..], "ad");
-    /// assert_eq!(overflow1.unwrap_err().element(), "bc");
-    /// assert_eq!(overflow2.unwrap_err().element(), "ef");
-    /// ```
-    pub fn try_push_str<'a>(&mut self, s: &'a str) -> Result<(), CapacityError<&'a str>> {
-        if s.len() > self.capacity() - self.len() {
-            return Err(CapacityError::new(s));
-        }
-        unsafe {
-            let dst = self.xs.as_mut_ptr().offset(self.len() as isize);
-            let src = s.as_ptr();
-            ptr::copy_nonoverlapping(src, dst, s.len());
-            let newl = self.len() + s.len();
-            self.set_len(newl);
-        }
-        Ok(())
-    }
-
-    /// Removes the last character from the string and returns it.
-    ///
-    /// Returns `None` if this `ArrayString` is empty.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    /// 
-    /// let mut s = ArrayString::<[_; 3]>::from("foo").unwrap();
-    ///
-    /// assert_eq!(s.pop(), Some('o'));
-    /// assert_eq!(s.pop(), Some('o'));
-    /// assert_eq!(s.pop(), Some('f'));
-    ///
-    /// assert_eq!(s.pop(), None);
-    /// ```
-    #[inline]
-    pub fn pop(&mut self) -> Option<char> {
-        let ch = match self.chars().rev().next() {
-            Some(ch) => ch,
-            None => return None,
-        };
-        let new_len = self.len() - ch.len_utf8();
-        unsafe {
-            self.set_len(new_len);
-        }
-        Some(ch)
-    }
-
-    /// Shortens this `ArrayString` to the specified length.
-    ///
-    /// If `new_len` is greater than the string’s current length, this has no
-    /// effect.
-    ///
-    /// ***Panics*** if `new_len` does not lie on a `char` boundary.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    ///
-    /// let mut string = ArrayString::<[_; 6]>::from("foobar").unwrap();
-    /// string.truncate(3);
-    /// assert_eq!(&string[..], "foo");
-    /// string.truncate(4);
-    /// assert_eq!(&string[..], "foo");
-    /// ```
-    #[inline]
-    pub fn truncate(&mut self, new_len: usize) {
-        if new_len <= self.len() {
-            assert!(self.is_char_boundary(new_len));
-            unsafe { 
-                // In libstd truncate is called on the underlying vector,
-                // which in turns drops each element.
-                // As we know we don't have to worry about Drop,
-                // we can just set the length (a la clear.)
-                self.set_len(new_len);
-            }
-        }
-    }
-
-    /// Removes a `char` from this `ArrayString` at a byte position and returns it.
-    ///
-    /// This is an `O(n)` operation, as it requires copying every element in the
-    /// array.
-    ///
-    /// ***Panics*** if `idx` is larger than or equal to the `ArrayString`’s length,
-    /// or if it does not lie on a `char` boundary.
-    ///
-    /// ```
-    /// use arrayvec::ArrayString;
-    /// 
-    /// let mut s = ArrayString::<[_; 3]>::from("foo").unwrap();
-    ///
-    /// assert_eq!(s.remove(0), 'f');
-    /// assert_eq!(s.remove(1), 'o');
-    /// assert_eq!(s.remove(0), 'o');
-    /// ```
-    #[inline]
-    pub fn remove(&mut self, idx: usize) -> char {
-        let ch = match self[idx..].chars().next() {
-            Some(ch) => ch,
-            None => panic!("cannot remove a char from the end of a string"),
-        };
-
-        let next = idx + ch.len_utf8();
-        let len = self.len();
-        unsafe {
-            ptr::copy(self.xs.as_ptr().offset(next as isize),
-                      self.xs.as_mut_ptr().offset(idx as isize),
-                      len - next);
-            self.set_len(len - (next - idx));
-        }
-        ch
-    }
-
-    /// Make the string empty.
-    pub fn clear(&mut self) {
-        unsafe {
-            self.set_len(0);
-        }
-    }
-
-    /// Set the strings’s length.
-    ///
-    /// This function is `unsafe` because it changes the notion of the
-    /// number of “valid” bytes in the string. Use with care.
-    ///
-    /// This method uses *debug assertions* to check the validity of `length`
-    /// and may use other debug assertions.
-    #[inline]
-    pub unsafe fn set_len(&mut self, length: usize) {
-        debug_assert!(length <= self.capacity());
-        self.len = Index::from(length);
-    }
-
-    /// Return a string slice of the whole `ArrayString`.
-    pub fn as_str(&self) -> &str {
-        self
-    }
-
-    /// Return a mutable slice of the whole string’s buffer
-    unsafe fn raw_mut_bytes(&mut self) -> &mut [u8] {
-        slice::from_raw_parts_mut(self.xs.as_mut_ptr(), self.capacity())
-    }
-}
-
-impl<A: Array<Item=u8>> Deref for ArrayString<A> {
-    type Target = str;
-    #[inline]
-    fn deref(&self) -> &str {
-        unsafe {
-            let sl = slice::from_raw_parts(self.xs.as_ptr(), self.len.to_usize());
-            str::from_utf8_unchecked(sl)
-        }
-    }
-}
-
-impl<A: Array<Item=u8>> DerefMut for ArrayString<A> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut str {
-        unsafe {
-            let sl = slice::from_raw_parts_mut(self.xs.as_mut_ptr(), self.len.to_usize());
-            // FIXME: Nothing but transmute to do this right now
-            mem::transmute(sl)
-        }
-    }
-}
-
-impl<A: Array<Item=u8>> PartialEq for ArrayString<A> {
-    fn eq(&self, rhs: &Self) -> bool {
-        **self == **rhs
-    }
-}
-
-impl<A: Array<Item=u8>> PartialEq<str> for ArrayString<A> {
-    fn eq(&self, rhs: &str) -> bool {
-        &**self == rhs
-    }
-}
-
-impl<A: Array<Item=u8>> PartialEq<ArrayString<A>> for str {
-    fn eq(&self, rhs: &ArrayString<A>) -> bool {
-        self == &**rhs
-    }
-}
-
-impl<A: Array<Item=u8>> Eq for ArrayString<A> { }
-
-impl<A: Array<Item=u8>> Hash for ArrayString<A> {
-    fn hash<H: Hasher>(&self, h: &mut H) {
-        (**self).hash(h)
-    }
-}
-
-impl<A: Array<Item=u8>> Borrow<str> for ArrayString<A> {
-    fn borrow(&self) -> &str { self }
-}
-
-impl<A: Array<Item=u8>> AsRef<str> for ArrayString<A> {
-    fn as_ref(&self) -> &str { self }
-}
-
-impl<A: Array<Item=u8>> fmt::Debug for ArrayString<A> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
-}
-
-impl<A: Array<Item=u8>> fmt::Display for ArrayString<A> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
-}
-
-/// `Write` appends written data to the end of the string.
-impl<A: Array<Item=u8>> fmt::Write for ArrayString<A> {
-    fn write_char(&mut self, c: char) -> fmt::Result {
-        self.try_push(c).map_err(|_| fmt::Error)
-    }
-
-    fn write_str(&mut self, s: &str) -> fmt::Result {
-        self.try_push_str(s).map_err(|_| fmt::Error)
-    }
-}
-
-impl<A: Array<Item=u8> + Copy> Clone for ArrayString<A> {
-    fn clone(&self) -> ArrayString<A> {
-        *self
-    }
-    fn clone_from(&mut self, rhs: &Self) {
-        // guaranteed to fit due to types matching.
-        self.clear();
-        self.try_push_str(rhs).ok();
-    }
-}
-
-impl<A: Array<Item=u8>> PartialOrd for ArrayString<A> {
-    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
-        (**self).partial_cmp(&**rhs)
-    }
-    fn lt(&self, rhs: &Self) -> bool { **self < **rhs }
-    fn le(&self, rhs: &Self) -> bool { **self <= **rhs }
-    fn gt(&self, rhs: &Self) -> bool { **self > **rhs }
-    fn ge(&self, rhs: &Self) -> bool { **self >= **rhs }
-}
-
-impl<A: Array<Item=u8>> PartialOrd<str> for ArrayString<A> {
-    fn partial_cmp(&self, rhs: &str) -> Option<cmp::Ordering> {
-        (**self).partial_cmp(rhs)
-    }
-    fn lt(&self, rhs: &str) -> bool { &**self < rhs }
-    fn le(&self, rhs: &str) -> bool { &**self <= rhs }
-    fn gt(&self, rhs: &str) -> bool { &**self > rhs }
-    fn ge(&self, rhs: &str) -> bool { &**self >= rhs }
-}
-
-impl<A: Array<Item=u8>> PartialOrd<ArrayString<A>> for str {
-    fn partial_cmp(&self, rhs: &ArrayString<A>) -> Option<cmp::Ordering> {
-        self.partial_cmp(&**rhs)
-    }
-    fn lt(&self, rhs: &ArrayString<A>) -> bool { self < &**rhs }
-    fn le(&self, rhs: &ArrayString<A>) -> bool { self <= &**rhs }
-    fn gt(&self, rhs: &ArrayString<A>) -> bool { self > &**rhs }
-    fn ge(&self, rhs: &ArrayString<A>) -> bool { self >= &**rhs }
-}
-
-impl<A: Array<Item=u8>> Ord for ArrayString<A> {
-    fn cmp(&self, rhs: &Self) -> cmp::Ordering {
-        (**self).cmp(&**rhs)
-    }
-}
-
-#[cfg(feature="serde-1")]
-/// Requires crate feature `"serde-1"`
-impl<A: Array<Item=u8>> Serialize for ArrayString<A> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
-    {
-        serializer.serialize_str(&*self)
-    }
-}
-
-#[cfg(feature="serde-1")]
-/// Requires crate feature `"serde-1"`
-impl<'de, A: Array<Item=u8>> Deserialize<'de> for ArrayString<A> {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
-    {
-        use serde::de::{self, Visitor};
-        use std::marker::PhantomData;
-
-        struct ArrayStringVisitor<A: Array<Item=u8>>(PhantomData<A>);
-
-        impl<'de, A: Array<Item=u8>> Visitor<'de> for ArrayStringVisitor<A> {
-            type Value = ArrayString<A>;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                write!(formatter, "a string no more than {} bytes long", A::capacity())
-            }
-
-            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-                where E: de::Error,
-            {
-                ArrayString::from(v).map_err(|_| E::invalid_length(v.len(), &self))
-            }
-
-            fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
-                where E: de::Error,
-            {
-                let s = try!(str::from_utf8(v).map_err(|_| E::invalid_value(de::Unexpected::Bytes(v), &self)));
-
-                ArrayString::from(s).map_err(|_| E::invalid_length(s.len(), &self))
-            }
-        }
-
-        deserializer.deserialize_str(ArrayStringVisitor::<A>(PhantomData))
-    }
-}
diff -Nru cargo-0.32.0/vendor/arrayvec/src/char.rs cargo-0.33.0/vendor/arrayvec/src/char.rs
--- cargo-0.32.0/vendor/arrayvec/src/char.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/src/char.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-// Copyright 2012-2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-//
-// Original authors: alexchrichton, bluss
-
-// UTF-8 ranges and tags for encoding characters
-const TAG_CONT: u8    = 0b1000_0000;
-const TAG_TWO_B: u8   = 0b1100_0000;
-const TAG_THREE_B: u8 = 0b1110_0000;
-const TAG_FOUR_B: u8  = 0b1111_0000;
-const MAX_ONE_B: u32   =     0x80;
-const MAX_TWO_B: u32   =    0x800;
-const MAX_THREE_B: u32 =  0x10000;
-
-/// Placeholder
-pub struct EncodeUtf8Error;
-
-/// Encode a char into buf using UTF-8.
-///
-/// On success, return the byte length of the encoding (1, 2, 3 or 4).<br>
-/// On error, return `EncodeUtf8Error` if the buffer was too short for the char.
-#[inline]
-pub fn encode_utf8(ch: char, buf: &mut [u8]) -> Result<usize, EncodeUtf8Error>
-{
-    let code = ch as u32;
-    if code < MAX_ONE_B && buf.len() >= 1 {
-        buf[0] = code as u8;
-        return Ok(1);
-    } else if code < MAX_TWO_B && buf.len() >= 2 {
-        buf[0] = (code >> 6 & 0x1F) as u8 | TAG_TWO_B;
-        buf[1] = (code & 0x3F) as u8 | TAG_CONT;
-        return Ok(2);
-    } else if code < MAX_THREE_B && buf.len() >= 3 {
-        buf[0] = (code >> 12 & 0x0F) as u8 | TAG_THREE_B;
-        buf[1] = (code >>  6 & 0x3F) as u8 | TAG_CONT;
-        buf[2] = (code & 0x3F) as u8 | TAG_CONT;
-        return Ok(3);
-    } else if buf.len() >= 4 {
-        buf[0] = (code >> 18 & 0x07) as u8 | TAG_FOUR_B;
-        buf[1] = (code >> 12 & 0x3F) as u8 | TAG_CONT;
-        buf[2] = (code >>  6 & 0x3F) as u8 | TAG_CONT;
-        buf[3] = (code & 0x3F) as u8 | TAG_CONT;
-        return Ok(4);
-    };
-    Err(EncodeUtf8Error)
-}
-
diff -Nru cargo-0.32.0/vendor/arrayvec/src/errors.rs cargo-0.33.0/vendor/arrayvec/src/errors.rs
--- cargo-0.32.0/vendor/arrayvec/src/errors.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/src/errors.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-use std::fmt;
-#[cfg(feature="std")]
-use std::any::Any;
-#[cfg(feature="std")]
-use std::error::Error;
-
-/// Error value indicating insufficient capacity
-#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
-pub struct CapacityError<T = ()> {
-    element: T,
-}
-
-impl<T> CapacityError<T> {
-    /// Create a new `CapacityError` from `element`.
-    pub fn new(element: T) -> CapacityError<T> {
-        CapacityError {
-            element: element,
-        }
-    }
-
-    /// Extract the overflowing element
-    pub fn element(self) -> T {
-        self.element
-    }
-
-    /// Convert into a `CapacityError` that does not carry an element.
-    pub fn simplify(self) -> CapacityError {
-        CapacityError { element: () }
-    }
-}
-
-const CAPERROR: &'static str = "insufficient capacity";
-
-#[cfg(feature="std")]
-/// Requires `features="std"`.
-impl<T: Any> Error for CapacityError<T> {
-    fn description(&self) -> &str {
-        CAPERROR
-    }
-}
-
-impl<T> fmt::Display for CapacityError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", CAPERROR)
-    }
-}
-
-impl<T> fmt::Debug for CapacityError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}: {}", "CapacityError", CAPERROR)
-    }
-}
-
diff -Nru cargo-0.32.0/vendor/arrayvec/src/lib.rs cargo-0.33.0/vendor/arrayvec/src/lib.rs
--- cargo-0.32.0/vendor/arrayvec/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1089 +0,0 @@
-//! **arrayvec** provides the types `ArrayVec` and `ArrayString`: 
-//! array-backed vector and string types, which store their contents inline.
-//!
-//! The arrayvec package has the following cargo features:
-//!
-//! - `std`
-//!   - Optional, enabled by default
-//!   - Use libstd; disable to use `no_std` instead.
-//!
-//! - `use_union`
-//!   - Optional
-//!   - Requires Rust nightly channel
-//!   - Experimental: This flag uses nightly so it *may break* unexpectedly
-//!     at some point; since it doesn't change API this flag may also change
-//!     to do nothing in the future.
-//!   - Use the unstable feature untagged unions for the internal implementation,
-//!     which may have reduced space overhead
-//! - `serde-1`
-//!   - Optional
-//!   - Enable serialization for ArrayVec and ArrayString using serde 1.0
-//! - `array-sizes-33-128`, `array-sizes-129-255`
-//!   - Optional
-//!   - Enable more array sizes (see [Array] for more information)
-//!
-//! ## Rust Version
-//!
-//! This version of arrayvec requires Rust 1.13 or later.
-//!
-#![doc(html_root_url="https://docs.rs/arrayvec/0.4/")]
-#![cfg_attr(not(feature="std"), no_std)]
-extern crate nodrop;
-#[cfg(feature="serde-1")]
-extern crate serde;
-
-#[cfg(not(feature="std"))]
-extern crate core as std;
-
-use std::cmp;
-use std::iter;
-use std::mem;
-use std::ptr;
-use std::ops::{
-    Deref,
-    DerefMut,
-};
-use std::slice;
-
-// extra traits
-use std::borrow::{Borrow, BorrowMut};
-use std::hash::{Hash, Hasher};
-use std::fmt;
-
-#[cfg(feature="std")]
-use std::io;
-
-#[cfg(not(feature="use_union"))]
-use nodrop::NoDrop;
-
-#[cfg(feature="use_union")]
-use std::mem::ManuallyDrop as NoDrop;
-
-#[cfg(feature="serde-1")]
-use serde::{Serialize, Deserialize, Serializer, Deserializer};
-
-mod array;
-mod array_string;
-mod char;
-mod range;
-mod errors;
-
-pub use array::Array;
-pub use range::RangeArgument;
-use array::Index;
-pub use array_string::ArrayString;
-pub use errors::CapacityError;
-
-
-unsafe fn new_array<A: Array>() -> A {
-    // Note: Returning an uninitialized value here only works
-    // if we can be sure the data is never used. The nullable pointer
-    // inside enum optimization conflicts with this this for example,
-    // so we need to be extra careful. See `NoDrop` enum.
-    mem::uninitialized()
-}
-
-/// A vector with a fixed capacity.
-///
-/// The `ArrayVec` is a vector backed by a fixed size array. It keeps track of
-/// the number of initialized elements.
-///
-/// The vector is a contiguous value that you can store directly on the stack
-/// if needed.
-///
-/// It offers a simple API but also dereferences to a slice, so
-/// that the full slice API is available.
-///
-/// ArrayVec can be converted into a by value iterator.
-pub struct ArrayVec<A: Array> {
-    xs: NoDrop<A>,
-    len: A::Index,
-}
-
-impl<A: Array> Drop for ArrayVec<A> {
-    fn drop(&mut self) {
-        self.clear();
-
-        // NoDrop inhibits array's drop
-        // panic safety: NoDrop::drop will trigger on panic, so the inner
-        // array will not drop even after panic.
-    }
-}
-
-macro_rules! panic_oob {
-    ($method_name:expr, $index:expr, $len:expr) => {
-        panic!(concat!("ArrayVec::", $method_name, ": index {} is out of bounds in vector of length {}"),
-               $index, $len)
-    }
-}
-
-impl<A: Array> ArrayVec<A> {
-    /// Create a new empty `ArrayVec`.
-    ///
-    /// Capacity is inferred from the type parameter.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 16]>::new();
-    /// array.push(1);
-    /// array.push(2);
-    /// assert_eq!(&array[..], &[1, 2]);
-    /// assert_eq!(array.capacity(), 16);
-    /// ```
-    pub fn new() -> ArrayVec<A> {
-        unsafe {
-            ArrayVec { xs: NoDrop::new(new_array()), len: Index::from(0) }
-        }
-    }
-
-    /// Return the number of elements in the `ArrayVec`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    /// array.pop();
-    /// assert_eq!(array.len(), 2);
-    /// ```
-    #[inline]
-    pub fn len(&self) -> usize { self.len.to_usize() }
-
-    /// Return the capacity of the `ArrayVec`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let array = ArrayVec::from([1, 2, 3]);
-    /// assert_eq!(array.capacity(), 3);
-    /// ```
-    #[inline]
-    pub fn capacity(&self) -> usize { A::capacity() }
-
-    /// Return if the `ArrayVec` is completely filled.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 1]>::new();
-    /// assert!(!array.is_full());
-    /// array.push(1);
-    /// assert!(array.is_full());
-    /// ```
-    pub fn is_full(&self) -> bool { self.len() == self.capacity() }
-
-    /// Push `element` to the end of the vector.
-    ///
-    /// ***Panics*** if the vector is already full.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// array.push(1);
-    /// array.push(2);
-    ///
-    /// assert_eq!(&array[..], &[1, 2]);
-    /// ```
-    pub fn push(&mut self, element: A::Item) {
-        self.try_push(element).unwrap()
-    }
-
-    /// Push `element` to the end of the vector.
-    ///
-    /// Return `Ok` if the push succeeds, or return an error if the vector
-    /// is already full.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// let push1 = array.try_push(1);
-    /// let push2 = array.try_push(2);
-    ///
-    /// assert!(push1.is_ok());
-    /// assert!(push2.is_ok());
-    ///
-    /// assert_eq!(&array[..], &[1, 2]);
-    ///
-    /// let overflow = array.try_push(3);
-    ///
-    /// assert!(overflow.is_err());
-    /// ```
-    pub fn try_push(&mut self, element: A::Item) -> Result<(), CapacityError<A::Item>> {
-        if self.len() < A::capacity() {
-            unsafe {
-                self.push_unchecked(element);
-            }
-            Ok(())
-        } else {
-            Err(CapacityError::new(element))
-        }
-    }
-
-
-    /// Push `element` to the end of the vector without checking the capacity.
-    ///
-    /// It is up to the caller to ensure the capacity of the vector is
-    /// sufficiently large.
-    ///
-    /// This method uses *debug assertions* to check that the arrayvec is not full.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// if array.len() + 2 <= array.capacity() {
-    ///     unsafe {
-    ///         array.push_unchecked(1);
-    ///         array.push_unchecked(2);
-    ///     }
-    /// }
-    ///
-    /// assert_eq!(&array[..], &[1, 2]);
-    /// ```
-    #[inline]
-    pub unsafe fn push_unchecked(&mut self, element: A::Item) {
-        let len = self.len();
-        debug_assert!(len < A::capacity());
-        ptr::write(self.get_unchecked_mut(len), element);
-        self.set_len(len + 1);
-    }
-
-    /// Insert `element` at position `index`.
-    ///
-    /// Shift up all elements after `index`.
-    ///
-    /// It is an error if the index is greater than the length or if the
-    /// arrayvec is full.
-    ///
-    /// ***Panics*** if the array is full or the `index` is out of bounds. See
-    /// `try_insert` for fallible version.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// array.insert(0, "x");
-    /// array.insert(0, "y");
-    /// assert_eq!(&array[..], &["y", "x"]);
-    ///
-    /// ```
-    pub fn insert(&mut self, index: usize, element: A::Item) {
-        self.try_insert(index, element).unwrap()
-    }
-
-    /// Insert `element` at position `index`.
-    ///
-    /// Shift up all elements after `index`; the `index` must be less than
-    /// or equal to the length.
-    ///
-    /// Returns an error if vector is already at full capacity.
-    ///
-    /// ***Panics*** `index` is out of bounds.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// assert!(array.try_insert(0, "x").is_ok());
-    /// assert!(array.try_insert(0, "y").is_ok());
-    /// assert!(array.try_insert(0, "z").is_err());
-    /// assert_eq!(&array[..], &["y", "x"]);
-    ///
-    /// ```
-    pub fn try_insert(&mut self, index: usize, element: A::Item) -> Result<(), CapacityError<A::Item>> {
-        if index > self.len() {
-            panic_oob!("try_insert", index, self.len())
-        }
-        if self.len() == self.capacity() {
-            return Err(CapacityError::new(element));
-        }
-        let len = self.len();
-
-        // follows is just like Vec<T>
-        unsafe { // infallible
-            // The spot to put the new value
-            {
-                let p: *mut _ = self.get_unchecked_mut(index);
-                // Shift everything over to make space. (Duplicating the
-                // `index`th element into two consecutive places.)
-                ptr::copy(p, p.offset(1), len - index);
-                // Write it in, overwriting the first copy of the `index`th
-                // element.
-                ptr::write(p, element);
-            }
-            self.set_len(len + 1);
-        }
-        Ok(())
-    }
-
-    /// Remove the last element in the vector and return it.
-    ///
-    /// Return `Some(` *element* `)` if the vector is non-empty, else `None`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::<[_; 2]>::new();
-    ///
-    /// array.push(1);
-    ///
-    /// assert_eq!(array.pop(), Some(1));
-    /// assert_eq!(array.pop(), None);
-    /// ```
-    pub fn pop(&mut self) -> Option<A::Item> {
-        if self.len() == 0 {
-            return None
-        }
-        unsafe {
-            let new_len = self.len() - 1;
-            self.set_len(new_len);
-            Some(ptr::read(self.get_unchecked_mut(new_len)))
-        }
-    }
-
-    /// Remove the element at `index` and swap the last element into its place.
-    ///
-    /// This operation is O(1).
-    ///
-    /// Return the *element* if the index is in bounds, else panic.
-    ///
-    /// ***Panics*** if the `index` is out of bounds.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// assert_eq!(array.swap_remove(0), 1);
-    /// assert_eq!(&array[..], &[3, 2]);
-    ///
-    /// assert_eq!(array.swap_remove(1), 2);
-    /// assert_eq!(&array[..], &[3]);
-    /// ```
-    pub fn swap_remove(&mut self, index: usize) -> A::Item {
-        self.swap_pop(index)
-            .unwrap_or_else(|| {
-                panic_oob!("swap_remove", index, self.len())
-            })
-    }
-
-    /// Remove the element at `index` and swap the last element into its place.
-    ///
-    /// This is a checked version of `.swap_remove`.  
-    /// This operation is O(1).
-    ///
-    /// Return `Some(` *element* `)` if the index is in bounds, else `None`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// assert_eq!(array.swap_pop(0), Some(1));
-    /// assert_eq!(&array[..], &[3, 2]);
-    ///
-    /// assert_eq!(array.swap_pop(10), None);
-    /// ```
-    pub fn swap_pop(&mut self, index: usize) -> Option<A::Item> {
-        let len = self.len();
-        if index >= len {
-            return None;
-        }
-        self.swap(index, len - 1);
-        self.pop()
-    }
-
-    /// Remove the element at `index` and shift down the following elements.
-    ///
-    /// The `index` must be strictly less than the length of the vector.
-    ///
-    /// ***Panics*** if the `index` is out of bounds.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// let removed_elt = array.remove(0);
-    /// assert_eq!(removed_elt, 1);
-    /// assert_eq!(&array[..], &[2, 3]);
-    /// ```
-    pub fn remove(&mut self, index: usize) -> A::Item {
-        self.pop_at(index)
-            .unwrap_or_else(|| {
-                panic_oob!("remove", index, self.len())
-            })
-    }
-
-    /// Remove the element at `index` and shift down the following elements.
-    ///
-    /// This is a checked version of `.remove(index)`. Returns `None` if there
-    /// is no element at `index`. Otherwise, return the element inside `Some`.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3]);
-    ///
-    /// assert!(array.pop_at(0).is_some());
-    /// assert_eq!(&array[..], &[2, 3]);
-    ///
-    /// assert!(array.pop_at(2).is_none());
-    /// assert!(array.pop_at(10).is_none());
-    /// ```
-    pub fn pop_at(&mut self, index: usize) -> Option<A::Item> {
-        if index >= self.len() {
-            None
-        } else {
-            self.drain(index..index + 1).next()
-        }
-    }
-
-    /// Shortens the vector, keeping the first `len` elements and dropping
-    /// the rest.
-    ///
-    /// If `len` is greater than the vector’s current length this has no
-    /// effect.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3, 4, 5]);
-    /// array.truncate(3);
-    /// assert_eq!(&array[..], &[1, 2, 3]);
-    /// array.truncate(4);
-    /// assert_eq!(&array[..], &[1, 2, 3]);
-    /// ```
-    pub fn truncate(&mut self, len: usize) {
-        while self.len() > len { self.pop(); }
-    }
-
-    /// Remove all elements in the vector.
-    pub fn clear(&mut self) {
-        while let Some(_) = self.pop() { }
-    }
-
-    /// Retains only the elements specified by the predicate.
-    ///
-    /// In other words, remove all elements `e` such that `f(&mut e)` returns false.
-    /// This method operates in place and preserves the order of the retained
-    /// elements.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut array = ArrayVec::from([1, 2, 3, 4]);
-    /// array.retain(|x| *x & 1 != 0 );
-    /// assert_eq!(&array[..], &[1, 3]);
-    /// ```
-    pub fn retain<F>(&mut self, mut f: F)
-        where F: FnMut(&mut A::Item) -> bool
-    {
-        let len = self.len();
-        let mut del = 0;
-        {
-            let v = &mut **self;
-
-            for i in 0..len {
-                if !f(&mut v[i]) {
-                    del += 1;
-                } else if del > 0 {
-                    v.swap(i - del, i);
-                }
-            }
-        }
-        if del > 0 {
-            self.drain(len - del..);
-        }
-    }
-
-    /// Set the vector’s length without dropping or moving out elements
-    ///
-    /// This method is `unsafe` because it changes the notion of the
-    /// number of “valid” elements in the vector. Use with care.
-    ///
-    /// This method uses *debug assertions* to check that check that `length` is
-    /// not greater than the capacity.
-    #[inline]
-    pub unsafe fn set_len(&mut self, length: usize) {
-        debug_assert!(length <= self.capacity());
-        self.len = Index::from(length);
-    }
-
-
-    /// Create a draining iterator that removes the specified range in the vector
-    /// and yields the removed items from start to end. The element range is
-    /// removed even if the iterator is not consumed until the end.
-    ///
-    /// Note: It is unspecified how many elements are removed from the vector,
-    /// if the `Drain` value is leaked.
-    ///
-    /// **Panics** if the starting point is greater than the end point or if
-    /// the end point is greater than the length of the vector.
-    ///
-    /// ```
-    /// use arrayvec::ArrayVec;
-    ///
-    /// let mut v = ArrayVec::from([1, 2, 3]);
-    /// let u: ArrayVec<[_; 3]> = v.drain(0..2).collect();
-    /// assert_eq!(&v[..], &[3]);
-    /// assert_eq!(&u[..], &[1, 2]);
-    /// ```
-    pub fn drain<R: RangeArgument>(&mut self, range: R) -> Drain<A> {
-        // Memory safety
-        //
-        // When the Drain is first created, it shortens the length of
-        // the source vector to make sure no uninitalized or moved-from elements
-        // are accessible at all if the Drain's destructor never gets to run.
-        //
-        // Drain will ptr::read out the values to remove.
-        // When finished, remaining tail of the vec is copied back to cover
-        // the hole, and the vector length is restored to the new length.
-        //
-        let len = self.len();
-        let start = range.start().unwrap_or(0);
-        let end = range.end().unwrap_or(len);
-        // bounds check happens here
-        let range_slice: *const _ = &self[start..end];
-
-        unsafe {
-            // set self.vec length's to start, to be safe in case Drain is leaked
-            self.set_len(start);
-            Drain {
-                tail_start: end,
-                tail_len: len - end,
-                iter: (*range_slice).iter(),
-                vec: self as *mut _,
-            }
-        }
-    }
-
-    /// Return the inner fixed size array, if it is full to its capacity.
-    ///
-    /// Return an `Ok` value with the array if length equals capacity,
-    /// return an `Err` with self otherwise.
-    ///
-    /// `Note:` This function may incur unproportionally large overhead
-    /// to move the array out, its performance is not optimal.
-    pub fn into_inner(self) -> Result<A, Self> {
-        if self.len() < self.capacity() {
-            Err(self)
-        } else {
-            unsafe {
-                let array = ptr::read(&*self.xs);
-                mem::forget(self);
-                Ok(array)
-            }
-        }
-    }
-
-    /// Dispose of `self` without the overwriting that is needed in Drop.
-    pub fn dispose(mut self) {
-        self.clear();
-        mem::forget(self);
-    }
-
-    /// Return a slice containing all elements of the vector.
-    pub fn as_slice(&self) -> &[A::Item] {
-        self
-    }
-
-    /// Return a mutable slice containing all elements of the vector.
-    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
-        self
-    }
-}
-
-impl<A: Array> Deref for ArrayVec<A> {
-    type Target = [A::Item];
-    #[inline]
-    fn deref(&self) -> &[A::Item] {
-        unsafe {
-            slice::from_raw_parts(self.xs.as_ptr(), self.len())
-        }
-    }
-}
-
-impl<A: Array> DerefMut for ArrayVec<A> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut [A::Item] {
-        let len = self.len();
-        unsafe {
-            slice::from_raw_parts_mut(self.xs.as_mut_ptr(), len)
-        }
-    }
-}
-
-/// Create an `ArrayVec` from an array.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// let mut array = ArrayVec::from([1, 2, 3]);
-/// assert_eq!(array.len(), 3);
-/// assert_eq!(array.capacity(), 3);
-/// ```
-impl<A: Array> From<A> for ArrayVec<A> {
-    fn from(array: A) -> Self {
-        ArrayVec { xs: NoDrop::new(array), len: Index::from(A::capacity()) }
-    }
-}
-
-
-/// Iterate the `ArrayVec` with references to each element.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// let array = ArrayVec::from([1, 2, 3]);
-///
-/// for elt in &array {
-///     // ...
-/// }
-/// ```
-impl<'a, A: Array> IntoIterator for &'a ArrayVec<A> {
-    type Item = &'a A::Item;
-    type IntoIter = slice::Iter<'a, A::Item>;
-    fn into_iter(self) -> Self::IntoIter { self.iter() }
-}
-
-/// Iterate the `ArrayVec` with mutable references to each element.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// let mut array = ArrayVec::from([1, 2, 3]);
-///
-/// for elt in &mut array {
-///     // ...
-/// }
-/// ```
-impl<'a, A: Array> IntoIterator for &'a mut ArrayVec<A> {
-    type Item = &'a mut A::Item;
-    type IntoIter = slice::IterMut<'a, A::Item>;
-    fn into_iter(self) -> Self::IntoIter { self.iter_mut() }
-}
-
-/// Iterate the `ArrayVec` with each element by value.
-///
-/// The vector is consumed by this operation.
-///
-/// ```
-/// use arrayvec::ArrayVec;
-///
-/// for elt in ArrayVec::from([1, 2, 3]) {
-///     // ...
-/// }
-/// ```
-impl<A: Array> IntoIterator for ArrayVec<A> {
-    type Item = A::Item;
-    type IntoIter = IntoIter<A>;
-    fn into_iter(self) -> IntoIter<A> {
-        IntoIter { index: Index::from(0), v: self, }
-    }
-}
-
-
-/// By-value iterator for `ArrayVec`.
-pub struct IntoIter<A: Array> {
-    index: A::Index,
-    v: ArrayVec<A>,
-}
-
-impl<A: Array> Iterator for IntoIter<A> {
-    type Item = A::Item;
-
-    #[inline]
-    fn next(&mut self) -> Option<A::Item> {
-        if self.index == self.v.len {
-            None
-        } else {
-            unsafe {
-                let index = self.index.to_usize();
-                self.index = Index::from(index + 1);
-                Some(ptr::read(self.v.get_unchecked_mut(index)))
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = self.v.len() - self.index.to_usize();
-        (len, Some(len))
-    }
-}
-
-impl<A: Array> DoubleEndedIterator for IntoIter<A> {
-    #[inline]
-    fn next_back(&mut self) -> Option<A::Item> {
-        if self.index == self.v.len {
-            None
-        } else {
-            unsafe {
-                let new_len = self.v.len() - 1;
-                self.v.set_len(new_len);
-                Some(ptr::read(self.v.get_unchecked_mut(new_len)))
-            }
-        }
-    }
-}
-
-impl<A: Array> ExactSizeIterator for IntoIter<A> { }
-
-impl<A: Array> Drop for IntoIter<A> {
-    fn drop(&mut self) {
-        // panic safety: Set length to 0 before dropping elements.
-        let index = self.index.to_usize();
-        let len = self.v.len();
-        unsafe {
-            self.v.set_len(0);
-            let elements = slice::from_raw_parts_mut(
-                self.v.get_unchecked_mut(index),
-                len - index);
-            ptr::drop_in_place(elements);
-        }
-    }
-}
-
-impl<A: Array> Clone for IntoIter<A>
-where
-    A::Item: Clone,
-{
-    fn clone(&self) -> IntoIter<A> {
-        self.v[self.index.to_usize()..]
-            .iter()
-            .cloned()
-            .collect::<ArrayVec<A>>()
-            .into_iter()
-    }
-}
-
-impl<A: Array> fmt::Debug for IntoIter<A>
-where
-    A::Item: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_list()
-            .entries(&self.v[self.index.to_usize()..])
-            .finish()
-    }
-}
-
-/// A draining iterator for `ArrayVec`.
-pub struct Drain<'a, A> 
-    where A: Array,
-          A::Item: 'a,
-{
-    /// Index of tail to preserve
-    tail_start: usize,
-    /// Length of tail
-    tail_len: usize,
-    /// Current remaining range to remove
-    iter: slice::Iter<'a, A::Item>,
-    vec: *mut ArrayVec<A>,
-}
-
-unsafe impl<'a, A: Array + Sync> Sync for Drain<'a, A> {}
-unsafe impl<'a, A: Array + Send> Send for Drain<'a, A> {}
-
-impl<'a, A: Array> Iterator for Drain<'a, A>
-    where A::Item: 'a,
-{
-    type Item = A::Item;
-
-    #[inline]
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next().map(|elt|
-            unsafe {
-                ptr::read(elt as *const _)
-            }
-        )
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-impl<'a, A: Array> DoubleEndedIterator for Drain<'a, A>
-    where A::Item: 'a,
-{
-    #[inline]
-    fn next_back(&mut self) -> Option<Self::Item> {
-        self.iter.next_back().map(|elt|
-            unsafe {
-                ptr::read(elt as *const _)
-            }
-        )
-    }
-}
-
-impl<'a, A: Array> ExactSizeIterator for Drain<'a, A> where A::Item: 'a {}
-
-impl<'a, A: Array> Drop for Drain<'a, A> 
-    where A::Item: 'a
-{
-    fn drop(&mut self) {
-        // len is currently 0 so panicking while dropping will not cause a double drop.
-
-        // exhaust self first
-        while let Some(_) = self.next() { }
-
-        if self.tail_len > 0 {
-            unsafe {
-                let source_vec = &mut *self.vec;
-                // memmove back untouched tail, update to new length
-                let start = source_vec.len();
-                let tail = self.tail_start;
-                let src = source_vec.as_ptr().offset(tail as isize);
-                let dst = source_vec.as_mut_ptr().offset(start as isize);
-                ptr::copy(src, dst, self.tail_len);
-                source_vec.set_len(start + self.tail_len);
-            }
-        }
-    }
-}
-
-struct ScopeExitGuard<T, Data, F>
-    where F: FnMut(&Data, &mut T)
-{
-    value: T,
-    data: Data,
-    f: F,
-}
-
-impl<T, Data, F> Drop for ScopeExitGuard<T, Data, F>
-    where F: FnMut(&Data, &mut T)
-{
-    fn drop(&mut self) {
-        (self.f)(&self.data, &mut self.value)
-    }
-}
-
-
-
-/// Extend the `ArrayVec` with an iterator.
-/// 
-/// Does not extract more items than there is space for. No error
-/// occurs if there are more iterator elements.
-impl<A: Array> Extend<A::Item> for ArrayVec<A> {
-    fn extend<T: IntoIterator<Item=A::Item>>(&mut self, iter: T) {
-        let take = self.capacity() - self.len();
-        unsafe {
-            let len = self.len();
-            let mut ptr = self.as_mut_ptr().offset(len as isize);
-            // Keep the length in a separate variable, write it back on scope
-            // exit. To help the compiler with alias analysis and stuff.
-            // We update the length to handle panic in the iteration of the
-            // user's iterator, without dropping any elements on the floor.
-            let mut guard = ScopeExitGuard {
-                value: self,
-                data: len,
-                f: |&len, self_| {
-                    self_.set_len(len)
-                }
-            };
-            for elt in iter.into_iter().take(take) {
-                ptr::write(ptr, elt);
-                ptr = ptr.offset(1);
-                guard.data += 1;
-            }
-        }
-    }
-}
-
-/// Create an `ArrayVec` from an iterator.
-/// 
-/// Does not extract more items than there is space for. No error
-/// occurs if there are more iterator elements.
-impl<A: Array> iter::FromIterator<A::Item> for ArrayVec<A> {
-    fn from_iter<T: IntoIterator<Item=A::Item>>(iter: T) -> Self {
-        let mut array = ArrayVec::new();
-        array.extend(iter);
-        array
-    }
-}
-
-impl<A: Array> Clone for ArrayVec<A>
-    where A::Item: Clone
-{
-    fn clone(&self) -> Self {
-        self.iter().cloned().collect()
-    }
-
-    fn clone_from(&mut self, rhs: &Self) {
-        // recursive case for the common prefix
-        let prefix = cmp::min(self.len(), rhs.len());
-        self[..prefix].clone_from_slice(&rhs[..prefix]);
-
-        if prefix < self.len() {
-            // rhs was shorter
-            for _ in 0..self.len() - prefix {
-                self.pop();
-            }
-        } else {
-            let rhs_elems = rhs[self.len()..].iter().cloned();
-            self.extend(rhs_elems);
-        }
-    }
-}
-
-impl<A: Array> Hash for ArrayVec<A>
-    where A::Item: Hash
-{
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        Hash::hash(&**self, state)
-    }
-}
-
-impl<A: Array> PartialEq for ArrayVec<A>
-    where A::Item: PartialEq
-{
-    fn eq(&self, other: &Self) -> bool {
-        **self == **other
-    }
-}
-
-impl<A: Array> PartialEq<[A::Item]> for ArrayVec<A>
-    where A::Item: PartialEq
-{
-    fn eq(&self, other: &[A::Item]) -> bool {
-        **self == *other
-    }
-}
-
-impl<A: Array> Eq for ArrayVec<A> where A::Item: Eq { }
-
-impl<A: Array> Borrow<[A::Item]> for ArrayVec<A> {
-    fn borrow(&self) -> &[A::Item] { self }
-}
-
-impl<A: Array> BorrowMut<[A::Item]> for ArrayVec<A> {
-    fn borrow_mut(&mut self) -> &mut [A::Item] { self }
-}
-
-impl<A: Array> AsRef<[A::Item]> for ArrayVec<A> {
-    fn as_ref(&self) -> &[A::Item] { self }
-}
-
-impl<A: Array> AsMut<[A::Item]> for ArrayVec<A> {
-    fn as_mut(&mut self) -> &mut [A::Item] { self }
-}
-
-impl<A: Array> fmt::Debug for ArrayVec<A> where A::Item: fmt::Debug {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (**self).fmt(f) }
-}
-
-impl<A: Array> Default for ArrayVec<A> {
-    /// Return an empty array
-    fn default() -> ArrayVec<A> {
-        ArrayVec::new()
-    }
-}
-
-impl<A: Array> PartialOrd for ArrayVec<A> where A::Item: PartialOrd {
-    #[inline]
-    fn partial_cmp(&self, other: &ArrayVec<A>) -> Option<cmp::Ordering> {
-        (**self).partial_cmp(other)
-    }
-
-    #[inline]
-    fn lt(&self, other: &Self) -> bool {
-        (**self).lt(other)
-    }
-
-    #[inline]
-    fn le(&self, other: &Self) -> bool {
-        (**self).le(other)
-    }
-
-    #[inline]
-    fn ge(&self, other: &Self) -> bool {
-        (**self).ge(other)
-    }
-
-    #[inline]
-    fn gt(&self, other: &Self) -> bool {
-        (**self).gt(other)
-    }
-}
-
-impl<A: Array> Ord for ArrayVec<A> where A::Item: Ord {
-    fn cmp(&self, other: &ArrayVec<A>) -> cmp::Ordering {
-        (**self).cmp(other)
-    }
-}
-
-#[cfg(feature="std")]
-/// `Write` appends written data to the end of the vector.
-///
-/// Requires `features="std"`.
-impl<A: Array<Item=u8>> io::Write for ArrayVec<A> {
-    fn write(&mut self, data: &[u8]) -> io::Result<usize> {
-        unsafe {
-            let len = self.len();
-            let mut tail = slice::from_raw_parts_mut(self.get_unchecked_mut(len),
-                                                     A::capacity() - len);
-            let result = tail.write(data);
-            if let Ok(written) = result {
-                self.set_len(len + written);
-            }
-            result
-        }
-    }
-    fn flush(&mut self) -> io::Result<()> { Ok(()) }
-}
-
-#[cfg(feature="serde-1")]
-/// Requires crate feature `"serde-1"`
-impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
-    {
-        serializer.collect_seq(self)
-    }
-}
-
-#[cfg(feature="serde-1")]
-/// Requires crate feature `"serde-1"`
-impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
-    {
-        use serde::de::{Visitor, SeqAccess, Error};
-        use std::marker::PhantomData;
-
-        struct ArrayVecVisitor<'de, T: Deserialize<'de>, A: Array<Item=T>>(PhantomData<(&'de (), T, A)>);
-
-        impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Visitor<'de> for ArrayVecVisitor<'de, T, A> {
-            type Value = ArrayVec<A>;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                write!(formatter, "an array with no more than {} items", A::capacity())
-            }
-
-            fn visit_seq<SA>(self, mut seq: SA) -> Result<Self::Value, SA::Error>
-                where SA: SeqAccess<'de>,
-            {
-                let mut values = ArrayVec::<A>::new();
-
-                while let Some(value) = try!(seq.next_element()) {
-                    if let Err(_) = values.try_push(value) {
-                        return Err(SA::Error::invalid_length(A::capacity() + 1, &self));
-                    }
-                }
-
-                Ok(values)
-            }
-        }
-
-        deserializer.deserialize_seq(ArrayVecVisitor::<T, A>(PhantomData))
-    }
-}
diff -Nru cargo-0.32.0/vendor/arrayvec/src/range.rs cargo-0.33.0/vendor/arrayvec/src/range.rs
--- cargo-0.32.0/vendor/arrayvec/src/range.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/src/range.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-
-use std::ops::{
-    RangeFull,
-    RangeFrom,
-    RangeTo,
-    Range,
-};
-
-/// `RangeArgument` is implemented by Rust's built-in range types, produced
-/// by range syntax like `..`, `a..`, `..b` or `c..d`.
-///
-/// Note: This is arrayvec's provisional trait, waiting for stable Rust to
-/// provide an equivalent.
-pub trait RangeArgument {
-    #[inline]
-    /// Start index (inclusive)
-    fn start(&self) -> Option<usize> { None }
-    #[inline]
-    /// End index (exclusive)
-    fn end(&self) -> Option<usize> { None }
-}
-
-
-impl RangeArgument for RangeFull {}
-
-impl RangeArgument for RangeFrom<usize> {
-    #[inline]
-    fn start(&self) -> Option<usize> { Some(self.start) }
-}
-
-impl RangeArgument for RangeTo<usize> {
-    #[inline]
-    fn end(&self) -> Option<usize> { Some(self.end) }
-}
-
-impl RangeArgument for Range<usize> {
-    #[inline]
-    fn start(&self) -> Option<usize> { Some(self.start) }
-    #[inline]
-    fn end(&self) -> Option<usize> { Some(self.end) }
-}
-
diff -Nru cargo-0.32.0/vendor/arrayvec/tests/serde.rs cargo-0.33.0/vendor/arrayvec/tests/serde.rs
--- cargo-0.32.0/vendor/arrayvec/tests/serde.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/tests/serde.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-#![cfg(feature = "serde-1")]
-extern crate arrayvec;
-extern crate serde_test;
-
-mod array_vec {
-    use arrayvec::ArrayVec;
-
-    use serde_test::{Token, assert_tokens, assert_de_tokens_error};
-
-    #[test]
-    fn test_ser_de_empty() {
-        let vec = ArrayVec::<[u32; 0]>::new();
-
-        assert_tokens(&vec, &[
-            Token::Seq { len: Some(0) },
-            Token::SeqEnd,
-        ]);
-    }
-
-
-    #[test]
-    fn test_ser_de() {
-        let mut vec = ArrayVec::<[u32; 3]>::new();
-        vec.push(20);
-        vec.push(55);
-        vec.push(123);
-
-        assert_tokens(&vec, &[
-            Token::Seq { len: Some(3) },
-            Token::U32(20),
-            Token::U32(55),
-            Token::U32(123),
-            Token::SeqEnd,
-        ]);
-    }
-
-    #[test]
-    fn test_de_too_large() {
-        assert_de_tokens_error::<ArrayVec<[u32; 2]>>(&[
-            Token::Seq { len: Some(3) },
-            Token::U32(13),
-            Token::U32(42),
-            Token::U32(68),
-        ], "invalid length 3, expected an array with no more than 2 items");
-    }
-}
-
-mod array_string {
-    use arrayvec::ArrayString;
-
-    use serde_test::{Token, assert_tokens, assert_de_tokens_error};
-
-    #[test]
-    fn test_ser_de_empty() {
-        let string = ArrayString::<[u8; 0]>::new();
-
-        assert_tokens(&string, &[
-            Token::Str(""),
-        ]);
-    }
-
-
-    #[test]
-    fn test_ser_de() {
-        let string = ArrayString::<[u8; 9]>::from("1234 abcd")
-            .expect("expected exact specified capacity to be enough");
-
-        assert_tokens(&string, &[
-            Token::Str("1234 abcd"),
-        ]);
-    }
-
-    #[test]
-    fn test_de_too_large() {
-        assert_de_tokens_error::<ArrayString<[u8; 2]>>(&[
-            Token::Str("afd")
-        ], "invalid length 3, expected a string no more than 2 bytes long");
-    }
-}
diff -Nru cargo-0.32.0/vendor/arrayvec/tests/tests.rs cargo-0.33.0/vendor/arrayvec/tests/tests.rs
--- cargo-0.32.0/vendor/arrayvec/tests/tests.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/tests/tests.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,502 +0,0 @@
-extern crate arrayvec;
-#[macro_use] extern crate matches;
-
-use arrayvec::ArrayVec;
-use arrayvec::ArrayString;
-use std::mem;
-use arrayvec::CapacityError;
-
-use std::collections::HashMap;
-
-
-#[test]
-fn test_simple() {
-    use std::ops::Add;
-
-    let mut vec: ArrayVec<[Vec<i32>; 3]> = ArrayVec::new();
-
-    vec.push(vec![1, 2, 3, 4]);
-    vec.push(vec![10]);
-    vec.push(vec![-1, 13, -2]);
-
-    for elt in &vec {
-        assert_eq!(elt.iter().fold(0, Add::add), 10);
-    }
-
-    let sum_len = vec.into_iter().map(|x| x.len()).fold(0, Add::add);
-    assert_eq!(sum_len, 8);
-}
-
-#[test]
-fn test_u16_index() {
-    const N: usize = 4096;
-    let mut vec: ArrayVec<[_; N]> = ArrayVec::new();
-    for _ in 0..N {
-        assert!(vec.try_push(1u8).is_ok());
-    }
-    assert!(vec.try_push(0).is_err());
-    assert_eq!(vec.len(), N);
-}
-
-#[test]
-fn test_iter() {
-    let mut iter = ArrayVec::from([1, 2, 3]).into_iter();
-    assert_eq!(iter.size_hint(), (3, Some(3)));
-    assert_eq!(iter.next_back(), Some(3));
-    assert_eq!(iter.next(), Some(1));
-    assert_eq!(iter.next_back(), Some(2));
-    assert_eq!(iter.size_hint(), (0, Some(0)));
-    assert_eq!(iter.next_back(), None);
-}
-
-#[test]
-fn test_drop() {
-    use std::cell::Cell;
-
-    let flag = &Cell::new(0);
-
-    #[derive(Clone)]
-    struct Bump<'a>(&'a Cell<i32>);
-
-    impl<'a> Drop for Bump<'a> {
-        fn drop(&mut self) {
-            let n = self.0.get();
-            self.0.set(n + 1);
-        }
-    }
-
-    {
-        let mut array = ArrayVec::<[Bump; 128]>::new();
-        array.push(Bump(flag));
-        array.push(Bump(flag));
-    }
-    assert_eq!(flag.get(), 2);
-
-    // test something with the nullable pointer optimization
-    flag.set(0);
-
-    {
-        let mut array = ArrayVec::<[_; 3]>::new();
-        array.push(vec![Bump(flag)]);
-        array.push(vec![Bump(flag), Bump(flag)]);
-        array.push(vec![]);
-        let push4 = array.try_push(vec![Bump(flag)]);
-        assert_eq!(flag.get(), 0);
-        drop(push4);
-        assert_eq!(flag.get(), 1);
-        drop(array.pop());
-        assert_eq!(flag.get(), 1);
-        drop(array.pop());
-        assert_eq!(flag.get(), 3);
-    }
-
-    assert_eq!(flag.get(), 4);
-
-    // test into_inner
-    flag.set(0);
-    {
-        let mut array = ArrayVec::<[_; 3]>::new();
-        array.push(Bump(flag));
-        array.push(Bump(flag));
-        array.push(Bump(flag));
-        let inner = array.into_inner();
-        assert!(inner.is_ok());
-        assert_eq!(flag.get(), 0);
-        drop(inner);
-        assert_eq!(flag.get(), 3);
-    }
-
-    // test cloning into_iter
-    flag.set(0);
-    {
-        let mut array = ArrayVec::<[_; 3]>::new();
-        array.push(Bump(flag));
-        array.push(Bump(flag));
-        array.push(Bump(flag));
-        let mut iter = array.into_iter();
-        assert_eq!(flag.get(), 0);
-        iter.next();
-        assert_eq!(flag.get(), 1);
-        let clone = iter.clone();
-        assert_eq!(flag.get(), 1);
-        drop(clone);
-        assert_eq!(flag.get(), 3);
-        drop(iter);
-        assert_eq!(flag.get(), 5);
-    }
-}
-
-#[test]
-fn test_extend() {
-    let mut range = 0..10;
-
-    let mut array: ArrayVec<[_; 5]> = range.by_ref().collect();
-    assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
-    assert_eq!(range.next(), Some(5));
-
-    array.extend(range.by_ref());
-    assert_eq!(range.next(), Some(6));
-
-    let mut array: ArrayVec<[_; 10]> = (0..3).collect();
-    assert_eq!(&array[..], &[0, 1, 2]);
-    array.extend(3..5);
-    assert_eq!(&array[..], &[0, 1, 2, 3, 4]);
-}
-
-#[test]
-fn test_is_send_sync() {
-    let data = ArrayVec::<[Vec<i32>; 5]>::new();
-    &data as &Send;
-    &data as &Sync;
-}
-
-#[test]
-fn test_compact_size() {
-    // Future rust will kill these drop flags!
-    // 4 elements size + 1 len + 1 enum tag + [1 drop flag]
-    type ByteArray = ArrayVec<[u8; 4]>;
-    println!("{}", mem::size_of::<ByteArray>());
-    assert!(mem::size_of::<ByteArray>() <= 8);
-
-    // 12 element size + 1 enum tag + 3 padding + 1 len + 1 drop flag + 2 padding
-    type QuadArray = ArrayVec<[u32; 3]>;
-    println!("{}", mem::size_of::<QuadArray>());
-    assert!(mem::size_of::<QuadArray>() <= 24);
-}
-
-#[test]
-fn test_drain() {
-    let mut v = ArrayVec::from([0; 8]);
-    v.pop();
-    v.drain(0..7);
-    assert_eq!(&v[..], &[]);
-
-    v.extend(0..);
-    v.drain(1..4);
-    assert_eq!(&v[..], &[0, 4, 5, 6, 7]);
-    let u: ArrayVec<[_; 3]> = v.drain(1..4).rev().collect();
-    assert_eq!(&u[..], &[6, 5, 4]);
-    assert_eq!(&v[..], &[0, 7]);
-    v.drain(..);
-    assert_eq!(&v[..], &[]);
-}
-
-#[test]
-fn test_retain() {
-    let mut v = ArrayVec::from([0; 8]);
-    for (i, elt) in v.iter_mut().enumerate() {
-        *elt = i;
-    }
-    v.retain(|_| true);
-    assert_eq!(&v[..], &[0, 1, 2, 3, 4, 5, 6, 7]);
-    v.retain(|elt| {
-        *elt /= 2;
-        *elt % 2 == 0
-    });
-    assert_eq!(&v[..], &[0, 0, 2, 2]);
-    v.retain(|_| false);
-    assert_eq!(&v[..], &[]);
-}
-
-#[test]
-#[should_panic]
-fn test_drain_oob() {
-    let mut v = ArrayVec::from([0; 8]);
-    v.pop();
-    v.drain(0..8);
-}
-
-#[test]
-#[should_panic]
-fn test_drop_panic() {
-    struct DropPanic;
-
-    impl Drop for DropPanic {
-        fn drop(&mut self) {
-            panic!("drop");
-        }
-    }
-
-    let mut array = ArrayVec::<[DropPanic; 1]>::new();
-    array.push(DropPanic);
-}
-
-#[test]
-#[should_panic]
-fn test_drop_panic_into_iter() {
-    struct DropPanic;
-
-    impl Drop for DropPanic {
-        fn drop(&mut self) {
-            panic!("drop");
-        }
-    }
-
-    let mut array = ArrayVec::<[DropPanic; 1]>::new();
-    array.push(DropPanic);
-    array.into_iter();
-}
-
-#[test]
-fn test_insert() {
-    let mut v = ArrayVec::from([]);
-    assert_matches!(v.try_push(1), Err(_));
-
-    let mut v = ArrayVec::<[_; 3]>::new();
-    v.insert(0, 0);
-    v.insert(1, 1);
-    //let ret1 = v.try_insert(3, 3);
-    //assert_matches!(ret1, Err(InsertError::OutOfBounds(_)));
-    assert_eq!(&v[..], &[0, 1]);
-    v.insert(2, 2);
-    assert_eq!(&v[..], &[0, 1, 2]);
-
-    let ret2 = v.try_insert(1, 9);
-    assert_eq!(&v[..], &[0, 1, 2]);
-    assert_matches!(ret2, Err(_));
-
-    let mut v = ArrayVec::from([2]);
-    assert_matches!(v.try_insert(0, 1), Err(CapacityError { .. }));
-    assert_matches!(v.try_insert(1, 1), Err(CapacityError { .. }));
-    //assert_matches!(v.try_insert(2, 1), Err(CapacityError { .. }));
-}
-
-#[test]
-fn test_into_inner_1() {
-    let mut v = ArrayVec::from([1, 2]);
-    v.pop();
-    let u = v.clone();
-    assert_eq!(v.into_inner(), Err(u));
-}
-
-#[test]
-fn test_into_inner_2() {
-    let mut v = ArrayVec::<[String; 4]>::new();
-    v.push("a".into());
-    v.push("b".into());
-    v.push("c".into());
-    v.push("d".into());
-    assert_eq!(v.into_inner().unwrap(), ["a", "b", "c", "d"]);
-}
-
-#[test]
-fn test_into_inner_3_() {
-    let mut v = ArrayVec::<[i32; 4]>::new();
-    v.extend(1..);
-    assert_eq!(v.into_inner().unwrap(), [1, 2, 3, 4]);
-}
-
-#[test]
-fn test_write() {
-    use std::io::Write;
-    let mut v = ArrayVec::<[_; 8]>::new();
-    write!(&mut v, "\x01\x02\x03").unwrap();
-    assert_eq!(&v[..], &[1, 2, 3]);
-    let r = v.write(&[9; 16]).unwrap();
-    assert_eq!(r, 5);
-    assert_eq!(&v[..], &[1, 2, 3, 9, 9, 9, 9, 9]);
-}
-
-#[test]
-fn array_clone_from() {
-    let mut v = ArrayVec::<[_; 4]>::new();
-    v.push(vec![1, 2]);
-    v.push(vec![3, 4, 5]);
-    v.push(vec![6]);
-    let reference = v.to_vec();
-    let mut u = ArrayVec::<[_; 4]>::new();
-    u.clone_from(&v);
-    assert_eq!(&u, &reference[..]);
-
-    let mut t = ArrayVec::<[_; 4]>::new();
-    t.push(vec![97]);
-    t.push(vec![]);
-    t.push(vec![5, 6, 2]);
-    t.push(vec![2]);
-    t.clone_from(&v);
-    assert_eq!(&t, &reference[..]);
-    t.clear();
-    t.clone_from(&v);
-    assert_eq!(&t, &reference[..]);
-}
-
-#[test]
-fn test_string() {
-    use std::error::Error;
-
-    let text = "hello world";
-    let mut s = ArrayString::<[_; 16]>::new();
-    s.try_push_str(text).unwrap();
-    assert_eq!(&s, text);
-    assert_eq!(text, &s);
-
-    // Make sure Hash / Eq / Borrow match up so we can use HashMap
-    let mut map = HashMap::new();
-    map.insert(s, 1);
-    assert_eq!(map[text], 1);
-
-    let mut t = ArrayString::<[_; 2]>::new();
-    assert!(t.try_push_str(text).is_err());
-    assert_eq!(&t, "");
-
-    t.push_str("ab");
-    // DerefMut
-    let tmut: &mut str = &mut t;
-    assert_eq!(tmut, "ab");
-
-    // Test Error trait / try
-    let t = || -> Result<(), Box<Error>> {
-        let mut t = ArrayString::<[_; 2]>::new();
-        try!(t.try_push_str(text));
-        Ok(())
-    }();
-    assert!(t.is_err());
-}
-
-#[test]
-fn test_string_from() {
-    let text = "hello world";
-	// Test `from` constructor
-    let u = ArrayString::<[_; 11]>::from(text).unwrap();
-    assert_eq!(&u, text);
-    assert_eq!(u.len(), text.len());
-}
-
-#[test]
-fn test_string_from_bytes() {
-    let text = "hello world";
-    let u = ArrayString::from_byte_string(b"hello world").unwrap();
-    assert_eq!(&u, text);
-    assert_eq!(u.len(), text.len());
-}
-
-#[test]
-fn test_string_clone() {
-    let text = "hi";
-    let mut s = ArrayString::<[_; 4]>::new();
-    s.push_str("abcd");
-    let t = ArrayString::<[_; 4]>::from(text).unwrap();
-    s.clone_from(&t);
-    assert_eq!(&t, &s);
-}
-
-#[test]
-fn test_string_push() {
-    let text = "abcαβγ";
-    let mut s = ArrayString::<[_; 8]>::new();
-    for c in text.chars() {
-        if let Err(_) = s.try_push(c) {
-            break;
-        }
-    }
-    assert_eq!("abcαβ", &s[..]);
-    s.push('x');
-    assert_eq!("abcαβx", &s[..]);
-    assert!(s.try_push('x').is_err());
-}
-
-
-#[test]
-fn test_insert_at_length() {
-    let mut v = ArrayVec::<[_; 8]>::new();
-    let result1 = v.try_insert(0, "a");
-    let result2 = v.try_insert(1, "b");
-    assert!(result1.is_ok() && result2.is_ok());
-    assert_eq!(&v[..], &["a", "b"]);
-}
-
-#[should_panic]
-#[test]
-fn test_insert_out_of_bounds() {
-    let mut v = ArrayVec::<[_; 8]>::new();
-    let _ = v.try_insert(1, "test");
-}
-
-/*
- * insert that pushes out the last
-    let mut u = ArrayVec::from([1, 2, 3, 4]);
-    let ret = u.try_insert(3, 99);
-    assert_eq!(&u[..], &[1, 2, 3, 99]);
-    assert_matches!(ret, Err(_));
-    let ret = u.try_insert(4, 77);
-    assert_eq!(&u[..], &[1, 2, 3, 99]);
-    assert_matches!(ret, Err(_));
-*/
-
-#[test]
-fn test_drop_in_insert() {
-    use std::cell::Cell;
-
-    let flag = &Cell::new(0);
-
-    struct Bump<'a>(&'a Cell<i32>);
-
-    impl<'a> Drop for Bump<'a> {
-        fn drop(&mut self) {
-            let n = self.0.get();
-            self.0.set(n + 1);
-        }
-    }
-
-    flag.set(0);
-
-    {
-        let mut array = ArrayVec::<[_; 2]>::new();
-        array.push(Bump(flag));
-        array.insert(0, Bump(flag));
-        assert_eq!(flag.get(), 0);
-        let ret = array.try_insert(1, Bump(flag));
-        assert_eq!(flag.get(), 0);
-        assert_matches!(ret, Err(_));
-        drop(ret);
-        assert_eq!(flag.get(), 1);
-    }
-    assert_eq!(flag.get(), 3);
-}
-
-#[test]
-fn test_pop_at() {
-    let mut v = ArrayVec::<[String; 4]>::new();
-    let s = String::from;
-    v.push(s("a"));
-    v.push(s("b"));
-    v.push(s("c"));
-    v.push(s("d"));
-
-    assert_eq!(v.pop_at(4), None);
-    assert_eq!(v.pop_at(1), Some(s("b")));
-    assert_eq!(v.pop_at(1), Some(s("c")));
-    assert_eq!(v.pop_at(2), None);
-    assert_eq!(&v[..], &["a", "d"]);
-}
-
-#[test]
-fn test_sizes() {
-    let v = ArrayVec::from([0u8; 1 << 16]);
-    assert_eq!(vec![0u8; v.len()], &v[..]);
-}
-
-#[test]
-fn test_default() {
-    use std::net;
-    let s: ArrayString<[u8; 4]> = Default::default();
-    // Something without `Default` implementation.
-    let v: ArrayVec<[net::TcpStream; 4]> = Default::default();
-    assert_eq!(s.len(), 0);
-    assert_eq!(v.len(), 0);
-}
-
-#[cfg(feature="array-sizes-33-128")]
-#[test]
-fn test_sizes_33_128() {
-    ArrayVec::from([0u8; 52]);
-    ArrayVec::from([0u8; 127]);
-}
-
-#[cfg(feature="array-sizes-129-255")]
-#[test]
-fn test_sizes_129_255() {
-    ArrayVec::from([0u8; 237]);
-    ArrayVec::from([0u8; 255]);
-}
-
diff -Nru cargo-0.32.0/vendor/arrayvec/.travis.yml cargo-0.33.0/vendor/arrayvec/.travis.yml
--- cargo-0.32.0/vendor/arrayvec/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/arrayvec/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-language: rust
-sudo: false
-env:
-  - FEATURES='serde-1'
-matrix:
-  include:
-    - rust: 1.13.0
-    - rust: stable
-      env:
-        - NODEFAULT=1
-        - NODROP_FEATURES='use_needs_drop'
-    - rust: 1.22.1
-      env:
-      - FEATURES='array-sizes-33-128 array-sizes-129-255'
-    - rust: stable
-      env:
-      - FEATURES='array-sizes-33-128 array-sizes-129-255'
-    - rust: beta
-    - rust: nightly
-      env:
-        - NODEFAULT=1
-    - rust: nightly
-      env:
-      - NODROP_FEATURES='use_needs_drop'
-    - rust: nightly
-      env:
-      - FEATURES='serde use_union'
-      - NODROP_FEATURES='use_union'
-branches:
-  only:
-    - master
-    - 0.3
-script:
-  - |
-      ([ ! -z "$NODROP_FEATURES" ] || cargo build --verbose --features "$FEATURES") &&
-      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --no-default-features) &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo test --verbose --features "$FEATURES") &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo test --release --verbose --features "$FEATURES") &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo bench --verbose --features "$FEATURES" -- --test) &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo doc --verbose --features "$FEATURES") &&
-      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) &&
-      cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" &&
-      cargo bench --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" -- --test
diff -Nru cargo-0.32.0/vendor/atty/.travis.yml cargo-0.33.0/vendor/atty/.travis.yml
--- cargo-0.32.0/vendor/atty/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/atty/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-sudo: false
-language: rust
-matrix:
-  fast_finish: true
-  include:
-    - rust: nightly
-    - rust: nightly
-      os: osx
-    - rust: beta
-    - rust: beta
-      os: osx
-    - rust: stable
-    - rust: stable
-      os: osx
-  allow_failures:
-    - rust: nightly
-
-before_cache:
-  # Travis can't cache files that are not readable by "others"
-  - chmod -R a+r $HOME/.cargo
-
-before_install:
-  # install kcov
-  - >
-    if [ ! -d "$HOME/.kcov/bin" ]; then
-      wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
-      tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build &&
-      cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/.kcov .. && make && make install && cd ../..
-    fi
-  - export PATH=$HOME/.kcov/bin:$PATH
-
-script:
-  - cargo build
-
-cache:
-  cargo: true
-  apt: true
-  directories:
-  - target/debug/deps
-  - target/debug/build
-
-addons:
-  apt:
-    packages:
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - binutils-dev
-      - libiberty-dev
-
-after_success:
-  - '[ $TRAVIS_RUST_VERSION = stable ] &&
-    [ $TRAVIS_BRANCH = master ] &&
-    [ $TRAVIS_PULL_REQUEST = false ] &&
-    (ls target/debug &&
-    RUSTFLAGS="-C link-dead-code" cargo test --no-run &&
-    for file in target/debug/atty-*; do
-       if [[ "${file: -2}" != ".d" ]]; then
-         mkdir -p "target/cov/$(basename $file)";
-         kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file";
-       fi;
-    done &&
-    kcov --coveralls-id=$COVERALLS_REPO_TOKEN --merge target/cov target/cov/* &&
-    echo "covered") || true'
-  - '[ $TRAVIS_RUST_VERSION = stable ] &&
-    [ $TRAVIS_BRANCH = master ] &&
-    [ $TRAVIS_PULL_REQUEST = false ]
-    && cargo doc --no-deps &&
-    echo "<meta http-equiv=refresh content=0;url=`echo $TRAVIS_REPO_SLUG | cut -d / -f 2`/index.html>" > target/doc/index.html &&
-    pip install --user ghp-import &&
-    /home/travis/.local/bin/ghp-import -n target/doc &&
-    git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages &&
-    echo "documented"'
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/autocfg/.cargo-checksum.json cargo-0.33.0/vendor/autocfg/.cargo-checksum.json
--- cargo-0.32.0/vendor/autocfg/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/autocfg/Cargo.toml cargo-0.33.0/vendor/autocfg/Cargo.toml
--- cargo-0.32.0/vendor/autocfg/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,24 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "autocfg"
+version = "0.1.2"
+authors = ["Josh Stone <cuviper@gmail.com>"]
+description = "Automatic cfg for Rust compiler features"
+readme = "README.md"
+keywords = ["rustc", "build", "autoconf"]
+categories = ["development-tools::build-utils"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/cuviper/autocfg"
+
+[dependencies]
diff -Nru cargo-0.32.0/vendor/autocfg/examples/integers.rs cargo-0.33.0/vendor/autocfg/examples/integers.rs
--- cargo-0.32.0/vendor/autocfg/examples/integers.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/examples/integers.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,9 @@
+extern crate autocfg;
+
+fn main() {
+    // Normally, cargo will set `OUT_DIR` for build scripts.
+    let ac = autocfg::AutoCfg::with_dir("target").unwrap();
+    for i in 3..8 {
+        ac.emit_has_type(&format!("i{}", 1 << i));
+    }
+}
diff -Nru cargo-0.32.0/vendor/autocfg/examples/paths.rs cargo-0.33.0/vendor/autocfg/examples/paths.rs
--- cargo-0.32.0/vendor/autocfg/examples/paths.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/examples/paths.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,22 @@
+extern crate autocfg;
+
+fn main() {
+    // Normally, cargo will set `OUT_DIR` for build scripts.
+    let ac = autocfg::AutoCfg::with_dir("target").unwrap();
+
+    // since ancient times...
+    ac.emit_has_path("std::vec::Vec");
+    ac.emit_path_cfg("std::vec::Vec", "has_vec");
+
+    // rustc 1.10.0
+    ac.emit_has_path("std::panic::PanicInfo");
+    ac.emit_path_cfg("std::panic::PanicInfo", "has_panic_info");
+
+    // rustc 1.20.0
+    ac.emit_has_path("std::mem::ManuallyDrop");
+    ac.emit_path_cfg("std::mem::ManuallyDrop", "has_manually_drop");
+
+    // rustc 1.25.0
+    ac.emit_has_path("std::ptr::NonNull");
+    ac.emit_path_cfg("std::ptr::NonNull", "has_non_null");
+}
diff -Nru cargo-0.32.0/vendor/autocfg/examples/traits.rs cargo-0.33.0/vendor/autocfg/examples/traits.rs
--- cargo-0.32.0/vendor/autocfg/examples/traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/examples/traits.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,26 @@
+extern crate autocfg;
+
+fn main() {
+    // Normally, cargo will set `OUT_DIR` for build scripts.
+    let ac = autocfg::AutoCfg::with_dir("target").unwrap();
+
+    // since ancient times...
+    ac.emit_has_trait("std::ops::Add");
+    ac.emit_trait_cfg("std::ops::Add", "has_ops");
+
+    // trait parameters have to be provided
+    ac.emit_has_trait("std::borrow::Borrow<str>");
+    ac.emit_trait_cfg("std::borrow::Borrow<str>", "has_borrow");
+
+    // rustc 1.8.0
+    ac.emit_has_trait("std::ops::AddAssign");
+    ac.emit_trait_cfg("std::ops::AddAssign", "has_assign_ops");
+
+    // rustc 1.12.0
+    ac.emit_has_trait("std::iter::Sum");
+    ac.emit_trait_cfg("std::iter::Sum", "has_sum");
+
+    // rustc 1.28.0
+    ac.emit_has_trait("std::alloc::GlobalAlloc");
+    ac.emit_trait_cfg("std::alloc::GlobalAlloc", "has_global_alloc");
+}
diff -Nru cargo-0.32.0/vendor/autocfg/examples/versions.rs cargo-0.33.0/vendor/autocfg/examples/versions.rs
--- cargo-0.32.0/vendor/autocfg/examples/versions.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/examples/versions.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,9 @@
+extern crate autocfg;
+
+fn main() {
+    // Normally, cargo will set `OUT_DIR` for build scripts.
+    let ac = autocfg::AutoCfg::with_dir("target").unwrap();
+    for i in 0..100 {
+        ac.emit_rustc_version(1, i);
+    }
+}
diff -Nru cargo-0.32.0/vendor/autocfg/LICENSE-APACHE cargo-0.33.0/vendor/autocfg/LICENSE-APACHE
--- cargo-0.32.0/vendor/autocfg/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
diff -Nru cargo-0.32.0/vendor/autocfg/LICENSE-MIT cargo-0.33.0/vendor/autocfg/LICENSE-MIT
--- cargo-0.32.0/vendor/autocfg/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2018 Josh Stone
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/autocfg/README.md cargo-0.33.0/vendor/autocfg/README.md
--- cargo-0.32.0/vendor/autocfg/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,68 @@
+autocfg
+=======
+
+[![autocfg crate](https://img.shields.io/crates/v/autocfg.svg)](https://crates.io/crates/autocfg)
+[![autocfg documentation](https://docs.rs/autocfg/badge.svg)](https://docs.rs/autocfg)
+![minimum rustc 1.0](https://img.shields.io/badge/rustc-1.0+-red.svg)
+[![Travis Status](https://travis-ci.org/cuviper/autocfg.svg?branch=master)](https://travis-ci.org/cuviper/autocfg)
+
+A Rust library for build scripts to automatically configure code based on
+compiler support.  Code snippets are dynamically tested to see if the `rustc`
+will accept them, rather than hard-coding specific version support.
+
+
+## Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[build-dependencies]
+autocfg = "0.1"
+```
+
+Then use it in your `build.rs` script to detect compiler features.  For
+example, to test for 128-bit integer support, it might look like:
+
+```rust
+extern crate autocfg;
+
+fn main() {
+    let ac = autocfg::new();
+    ac.emit_has_type("i128");
+
+    // (optional) We don't need to rerun for anything external.
+    autocfg::rerun_path(file!());
+}
+```
+
+If the type test succeeds, this will write a `cargo:rustc-cfg=has_i128` line
+for Cargo, which translates to Rust arguments `--cfg has_i128`.  Then in the
+rest of your Rust code, you can add `#[cfg(has_i128)]` conditions on code that
+should only be used when the compiler supports it.
+
+
+## Release Notes
+
+- 0.1.2 (2018-01-16)
+  - Add `rerun_env(ENV)` to print `cargo:rerun-if-env-changed=ENV`
+  - Add `rerun_path(PATH)` to print `cargo:rerun-if-changed=PATH`
+
+
+## Minimum Rust version policy
+
+This crate's minimum supported `rustc` version is `1.0.0`.  Compatibility is
+its entire reason for existence, so this crate will be extremely conservative
+about raising this requirement.  If this is ever deemed necessary, it will be
+treated as a major breaking change for semver purposes.
+
+
+## License
+
+This project is licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   http://opensource.org/licenses/MIT)
+
+at your option.
diff -Nru cargo-0.32.0/vendor/autocfg/src/error.rs cargo-0.33.0/vendor/autocfg/src/error.rs
--- cargo-0.32.0/vendor/autocfg/src/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/src/error.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,69 @@
+use std::error;
+use std::fmt;
+use std::io;
+use std::num;
+use std::str;
+
+/// A common error type for the `autocfg` crate.
+#[derive(Debug)]
+pub struct Error {
+    kind: ErrorKind,
+}
+
+impl error::Error for Error {
+    fn description(&self) -> &str {
+        "AutoCfg error"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        match self.kind {
+            ErrorKind::Io(ref e) => Some(e),
+            ErrorKind::Num(ref e) => Some(e),
+            ErrorKind::Utf8(ref e) => Some(e),
+            ErrorKind::Other(_) => None,
+        }
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        match self.kind {
+            ErrorKind::Io(ref e) => e.fmt(f),
+            ErrorKind::Num(ref e) => e.fmt(f),
+            ErrorKind::Utf8(ref e) => e.fmt(f),
+            ErrorKind::Other(s) => s.fmt(f),
+        }
+    }
+}
+
+#[derive(Debug)]
+enum ErrorKind {
+    Io(io::Error),
+    Num(num::ParseIntError),
+    Utf8(str::Utf8Error),
+    Other(&'static str),
+}
+
+pub fn from_io(e: io::Error) -> Error {
+    Error {
+        kind: ErrorKind::Io(e),
+    }
+}
+
+pub fn from_num(e: num::ParseIntError) -> Error {
+    Error {
+        kind: ErrorKind::Num(e),
+    }
+}
+
+pub fn from_utf8(e: str::Utf8Error) -> Error {
+    Error {
+        kind: ErrorKind::Utf8(e),
+    }
+}
+
+pub fn from_str(s: &'static str) -> Error {
+    Error {
+        kind: ErrorKind::Other(s),
+    }
+}
diff -Nru cargo-0.32.0/vendor/autocfg/src/lib.rs cargo-0.33.0/vendor/autocfg/src/lib.rs
--- cargo-0.32.0/vendor/autocfg/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,288 @@
+//! A Rust library for build scripts to automatically configure code based on
+//! compiler support.  Code snippets are dynamically tested to see if the `rustc`
+//! will accept them, rather than hard-coding specific version support.
+//!
+//!
+//! ## Usage
+//!
+//! Add this to your `Cargo.toml`:
+//!
+//! ```toml
+//! [build-dependencies]
+//! autocfg = "0.1"
+//! ```
+//!
+//! Then use it in your `build.rs` script to detect compiler features.  For
+//! example, to test for 128-bit integer support, it might look like:
+//!
+//! ```rust
+//! extern crate autocfg;
+//!
+//! fn main() {
+//! #   // Normally, cargo will set `OUT_DIR` for build scripts.
+//! #   std::env::set_var("OUT_DIR", "target");
+//!     let ac = autocfg::new();
+//!     ac.emit_has_type("i128");
+//!
+//!     // (optional) We don't need to rerun for anything external.
+//!     autocfg::rerun_path(file!());
+//! }
+//! ```
+//!
+//! If the type test succeeds, this will write a `cargo:rustc-cfg=has_i128` line
+//! for Cargo, which translates to Rust arguments `--cfg has_i128`.  Then in the
+//! rest of your Rust code, you can add `#[cfg(has_i128)]` conditions on code that
+//! should only be used when the compiler supports it.
+
+#![deny(missing_debug_implementations)]
+#![deny(missing_docs)]
+
+use std::env;
+use std::ffi::OsString;
+use std::fs;
+use std::io::Write;
+use std::path::PathBuf;
+use std::process::{Command, Stdio};
+
+mod error;
+pub use error::Error;
+
+mod version;
+use version::Version;
+
+#[cfg(test)]
+mod tests;
+
+/// Helper to detect compiler features for `cfg` output in build scripts.
+#[derive(Clone, Debug)]
+pub struct AutoCfg {
+    out_dir: PathBuf,
+    rustc: PathBuf,
+    rustc_version: Version,
+    target: Option<OsString>,
+}
+
+/// Writes a config flag for rustc on standard out.
+///
+/// This looks like: `cargo:rustc-cfg=CFG`
+///
+/// Cargo will use this in arguments to rustc, like `--cfg CFG`.
+pub fn emit(cfg: &str) {
+    println!("cargo:rustc-cfg={}", cfg);
+}
+
+/// Writes a line telling Cargo to rerun the build script if `path` changes.
+///
+/// This looks like: `cargo:rerun-if-changed=PATH`
+///
+/// This requires at least cargo 0.7.0, corresponding to rustc 1.6.0.  Earlier
+/// versions of cargo will simply ignore the directive.
+pub fn rerun_path(path: &str) {
+    println!("cargo:rerun-if-changed={}", path);
+}
+
+/// Writes a line telling Cargo to rerun the build script if the environment
+/// variable `var` changes.
+///
+/// This looks like: `cargo:rerun-if-env-changed=VAR`
+///
+/// This requires at least cargo 0.21.0, corresponding to rustc 1.20.0.  Earlier
+/// versions of cargo will simply ignore the directive.
+pub fn rerun_env(var: &str) {
+    println!("cargo:rerun-if-env-changed={}", var);
+}
+
+/// Create a new `AutoCfg` instance.
+///
+/// # Panics
+///
+/// Panics if `AutoCfg::new()` returns an error.
+pub fn new() -> AutoCfg {
+    AutoCfg::new().unwrap()
+}
+
+impl AutoCfg {
+    /// Create a new `AutoCfg` instance.
+    ///
+    /// # Common errors
+    ///
+    /// - `rustc` can't be executed, from `RUSTC` or in the `PATH`.
+    /// - The version output from `rustc` can't be parsed.
+    /// - `OUT_DIR` is not set in the environment, or is not a writable directory.
+    ///
+    pub fn new() -> Result<Self, Error> {
+        match env::var_os("OUT_DIR") {
+            Some(d) => Self::with_dir(d),
+            None => Err(error::from_str("no OUT_DIR specified!")),
+        }
+    }
+
+    /// Create a new `AutoCfg` instance with the specified output directory.
+    ///
+    /// # Common errors
+    ///
+    /// - `rustc` can't be executed, from `RUSTC` or in the `PATH`.
+    /// - The version output from `rustc` can't be parsed.
+    /// - `dir` is not a writable directory.
+    ///
+    pub fn with_dir<T: Into<PathBuf>>(dir: T) -> Result<Self, Error> {
+        let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
+        let rustc: PathBuf = rustc.into();
+        let rustc_version = try!(Version::from_rustc(&rustc));
+
+        // Sanity check the output directory
+        let dir = dir.into();
+        let meta = try!(fs::metadata(&dir).map_err(error::from_io));
+        if !meta.is_dir() || meta.permissions().readonly() {
+            return Err(error::from_str("output path is not a writable directory"));
+        }
+
+        Ok(AutoCfg {
+            out_dir: dir,
+            rustc: rustc,
+            rustc_version: rustc_version,
+            target: env::var_os("TARGET"),
+        })
+    }
+
+    /// Test whether the current `rustc` reports a version greater than
+    /// or equal to "`major`.`minor`".
+    pub fn probe_rustc_version(&self, major: usize, minor: usize) -> bool {
+        self.rustc_version >= Version::new(major, minor, 0)
+    }
+
+    /// Sets a `cfg` value of the form `rustc_major_minor`, like `rustc_1_29`,
+    /// if the current `rustc` is at least that version.
+    pub fn emit_rustc_version(&self, major: usize, minor: usize) {
+        if self.probe_rustc_version(major, minor) {
+            emit(&format!("rustc_{}_{}", major, minor));
+        }
+    }
+
+    fn probe<T: AsRef<[u8]>>(&self, code: T) -> Result<bool, Error> {
+        use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
+
+        static ID: AtomicUsize = ATOMIC_USIZE_INIT;
+
+        let id = ID.fetch_add(1, Ordering::Relaxed);
+        let mut command = Command::new(&self.rustc);
+        command
+            .arg(format!("--crate-name=probe{}", id))
+            .arg("--crate-type=lib")
+            .arg("--out-dir")
+            .arg(&self.out_dir)
+            .arg("--emit=llvm-ir");
+
+        if let Some(target) = self.target.as_ref() {
+            command.arg("--target").arg(target);
+        }
+
+        command.arg("-").stdin(Stdio::piped());
+        let mut child = try!(command.spawn().map_err(error::from_io));
+        try!(
+            child
+                .stdin
+                .take()
+                .expect("rustc stdin")
+                .write_all(code.as_ref())
+                .map_err(error::from_io)
+        );
+
+        let status = try!(child.wait().map_err(error::from_io));
+        Ok(status.success())
+    }
+
+    /// Tests whether the given path can be used.
+    ///
+    /// The test code is subject to change, but currently looks like:
+    ///
+    /// ```ignore
+    /// pub use PATH;
+    /// ```
+    pub fn probe_path(&self, path: &str) -> bool {
+        self.probe(format!("pub use {};", path)).unwrap_or(false)
+    }
+
+    /// Emits a config value `has_PATH` if `probe_path` returns true.
+    ///
+    /// Any non-identifier characters in the `path` will be replaced with
+    /// `_` in the generated config value.
+    pub fn emit_has_path(&self, path: &str) {
+        if self.probe_path(path) {
+            emit(&format!("has_{}", mangle(path)));
+        }
+    }
+
+    /// Emits the given `cfg` value if `probe_path` returns true.
+    pub fn emit_path_cfg(&self, path: &str, cfg: &str) {
+        if self.probe_path(path) {
+            emit(cfg);
+        }
+    }
+
+    /// Tests whether the given trait can be used.
+    ///
+    /// The test code is subject to change, but currently looks like:
+    ///
+    /// ```ignore
+    /// pub trait Probe: TRAIT + Sized {}
+    /// ```
+    pub fn probe_trait(&self, name: &str) -> bool {
+        self.probe(format!("pub trait Probe: {} + Sized {{}}", name))
+            .unwrap_or(false)
+    }
+
+    /// Emits a config value `has_TRAIT` if `probe_trait` returns true.
+    ///
+    /// Any non-identifier characters in the trait `name` will be replaced with
+    /// `_` in the generated config value.
+    pub fn emit_has_trait(&self, name: &str) {
+        if self.probe_trait(name) {
+            emit(&format!("has_{}", mangle(name)));
+        }
+    }
+
+    /// Emits the given `cfg` value if `probe_trait` returns true.
+    pub fn emit_trait_cfg(&self, name: &str, cfg: &str) {
+        if self.probe_trait(name) {
+            emit(cfg);
+        }
+    }
+
+    /// Tests whether the given type can be used.
+    ///
+    /// The test code is subject to change, but currently looks like:
+    ///
+    /// ```ignore
+    /// pub type Probe = TYPE;
+    /// ```
+    pub fn probe_type(&self, name: &str) -> bool {
+        self.probe(format!("pub type Probe = {};", name))
+            .unwrap_or(false)
+    }
+
+    /// Emits a config value `has_TYPE` if `probe_type` returns true.
+    ///
+    /// Any non-identifier characters in the type `name` will be replaced with
+    /// `_` in the generated config value.
+    pub fn emit_has_type(&self, name: &str) {
+        if self.probe_type(name) {
+            emit(&format!("has_{}", mangle(name)));
+        }
+    }
+
+    /// Emits the given `cfg` value if `probe_type` returns true.
+    pub fn emit_type_cfg(&self, name: &str, cfg: &str) {
+        if self.probe_type(name) {
+            emit(cfg);
+        }
+    }
+}
+
+fn mangle(s: &str) -> String {
+    s.chars()
+        .map(|c| match c {
+            'A'...'Z' | 'a'...'z' | '0'...'9' => c,
+            _ => '_',
+        }).collect()
+}
diff -Nru cargo-0.32.0/vendor/autocfg/src/tests.rs cargo-0.33.0/vendor/autocfg/src/tests.rs
--- cargo-0.32.0/vendor/autocfg/src/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/src/tests.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,57 @@
+use super::AutoCfg;
+
+#[test]
+fn autocfg_version() {
+    let ac = AutoCfg::with_dir("target").unwrap();
+    println!("version: {:?}", ac.rustc_version);
+    assert!(ac.probe_rustc_version(1, 0));
+}
+
+#[test]
+fn version_cmp() {
+    use super::version::Version;
+    let v123 = Version::new(1, 2, 3);
+
+    assert!(Version::new(1, 0, 0) < v123);
+    assert!(Version::new(1, 2, 2) < v123);
+    assert!(Version::new(1, 2, 3) == v123);
+    assert!(Version::new(1, 2, 4) > v123);
+    assert!(Version::new(1, 10, 0) > v123);
+    assert!(Version::new(2, 0, 0) > v123);
+}
+
+#[test]
+fn probe_add() {
+    let ac = AutoCfg::with_dir("target").unwrap();
+    assert!(ac.probe_path("std::ops::Add"));
+    assert!(ac.probe_trait("std::ops::Add"));
+    assert!(ac.probe_trait("std::ops::Add<i32>"));
+    assert!(ac.probe_trait("std::ops::Add<i32, Output = i32>"));
+    assert!(ac.probe_type("std::ops::Add<i32, Output = i32>"));
+}
+
+#[test]
+fn probe_as_ref() {
+    let ac = AutoCfg::with_dir("target").unwrap();
+    assert!(ac.probe_path("std::convert::AsRef"));
+    assert!(ac.probe_trait("std::convert::AsRef<str>"));
+    assert!(ac.probe_type("std::convert::AsRef<str>"));
+}
+
+#[test]
+fn probe_i128() {
+    let ac = AutoCfg::with_dir("target").unwrap();
+    let missing = !ac.probe_rustc_version(1, 26);
+    assert!(missing ^ ac.probe_path("std::i128"));
+    assert!(missing ^ ac.probe_type("i128"));
+}
+
+#[test]
+fn probe_sum() {
+    let ac = AutoCfg::with_dir("target").unwrap();
+    let missing = !ac.probe_rustc_version(1, 12);
+    assert!(missing ^ ac.probe_path("std::iter::Sum"));
+    assert!(missing ^ ac.probe_trait("std::iter::Sum"));
+    assert!(missing ^ ac.probe_trait("std::iter::Sum<i32>"));
+    assert!(missing ^ ac.probe_type("std::iter::Sum<i32>"));
+}
diff -Nru cargo-0.32.0/vendor/autocfg/src/version.rs cargo-0.33.0/vendor/autocfg/src/version.rs
--- cargo-0.32.0/vendor/autocfg/src/version.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/autocfg/src/version.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,62 @@
+use std::path::Path;
+use std::process::Command;
+use std::str;
+
+use super::{error, Error};
+
+/// A version structure for making relative comparisons.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Version {
+    major: usize,
+    minor: usize,
+    patch: usize,
+}
+
+impl Version {
+    /// Creates a `Version` instance for a specific `major.minor.patch` version.
+    pub fn new(major: usize, minor: usize, patch: usize) -> Self {
+        Version {
+            major: major,
+            minor: minor,
+            patch: patch,
+        }
+    }
+
+    pub fn from_rustc(rustc: &Path) -> Result<Self, Error> {
+        // Get rustc's verbose version
+        let output = try!(
+            Command::new(rustc)
+                .args(&["--version", "--verbose"])
+                .output()
+                .map_err(error::from_io)
+        );
+        if !output.status.success() {
+            return Err(error::from_str("could not execute rustc"));
+        }
+        let output = try!(str::from_utf8(&output.stdout).map_err(error::from_utf8));
+
+        // Find the release line in the verbose version output.
+        let release = match output.lines().find(|line| line.starts_with("release: ")) {
+            Some(line) => &line["release: ".len()..],
+            None => return Err(error::from_str("could not find rustc release")),
+        };
+
+        // Strip off any extra channel info, e.g. "-beta.N", "-nightly"
+        let version = match release.find('-') {
+            Some(i) => &release[..i],
+            None => release,
+        };
+
+        // Split the version into semver components.
+        let mut iter = version.splitn(3, '.');
+        let major = try!(iter.next().ok_or(error::from_str("missing major version")));
+        let minor = try!(iter.next().ok_or(error::from_str("missing minor version")));
+        let patch = try!(iter.next().ok_or(error::from_str("missing patch version")));
+
+        Ok(Version::new(
+            try!(major.parse().map_err(error::from_num)),
+            try!(minor.parse().map_err(error::from_num)),
+            try!(patch.parse().map_err(error::from_num)),
+        ))
+    }
+}
diff -Nru cargo-0.32.0/vendor/backtrace/appveyor.yml cargo-0.33.0/vendor/backtrace/appveyor.yml
--- cargo-0.32.0/vendor/backtrace/appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/appveyor.yml	2019-02-06 04:11:58.000000000 +0000
@@ -18,3 +18,9 @@
 
 test_script:
   - cargo test --target %TARGET%
+  - cargo build --target %TARGET% --no-default-features
+  - cargo build --target %TARGET% --no-default-features --features dbghelp
+
+branches:
+  only:
+    - master
diff -Nru cargo-0.32.0/vendor/backtrace/build.rs cargo-0.33.0/vendor/backtrace/build.rs
--- cargo-0.32.0/vendor/backtrace/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,13 @@
+extern crate autocfg;
+
+fn main() {
+    let ac = autocfg::new();
+
+    // ffi types moved from `std` to `core` in Rust 1.30, so we need to adjust imports based on
+    // this.
+    //
+    // <https://github.com/rust-lang/rust/pull/53910>
+    ac.emit_rustc_version(1, 30);
+
+    println!("cargo:rerun-if-changed=build.rs");
+}
diff -Nru cargo-0.32.0/vendor/backtrace/.cargo-checksum.json cargo-0.33.0/vendor/backtrace/.cargo-checksum.json
--- cargo-0.32.0/vendor/backtrace/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"}
\ No newline at end of file
+{"files":{},"package":"b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/backtrace/Cargo.toml cargo-0.33.0/vendor/backtrace/Cargo.toml
--- cargo-0.32.0/vendor/backtrace/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,20 +12,42 @@
 
 [package]
 name = "backtrace"
-version = "0.3.9"
+version = "0.3.13"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "The Rust Project Developers"]
+autoexamples = true
+autotests = true
 description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"
 homepage = "https://github.com/alexcrichton/backtrace-rs"
 documentation = "https://docs.rs/backtrace"
 readme = "README.md"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/alexcrichton/backtrace-rs"
+
+[[example]]
+name = "backtrace"
+required-features = ["std"]
+
+[[example]]
+name = "raw"
+required-features = ["std"]
+
+[[test]]
+name = "skip_inner_frames"
+required-features = ["std"]
+
+[[test]]
+name = "long_fn_name"
+required-features = ["std"]
+
+[[test]]
+name = "smoke"
+required-features = ["std"]
 [dependencies.addr2line]
-version = "0.6.0"
+version = "0.7.0"
 optional = true
 
 [dependencies.cfg-if]
-version = "0.1"
+version = "0.1.6"
 
 [dependencies.cpp_demangle]
 version = "0.2.3"
@@ -33,19 +55,19 @@
 default-features = false
 
 [dependencies.findshlibs]
-version = "0.3.3"
+version = "0.4.0"
 optional = true
 
 [dependencies.gimli]
-version = "0.15.0"
+version = "0.16.0"
 optional = true
 
 [dependencies.memmap]
-version = "0.6.2"
+version = "0.7.0"
 optional = true
 
 [dependencies.object]
-version = "0.7.0"
+version = "0.11"
 optional = true
 
 [dependencies.rustc-demangle]
@@ -62,25 +84,28 @@
 [dependencies.serde_derive]
 version = "1.0"
 optional = true
+[build-dependencies.autocfg]
+version = "0.1"
 
 [features]
 coresymbolication = []
-dbghelp = ["winapi"]
-default = ["libunwind", "libbacktrace", "coresymbolication", "dladdr", "dbghelp"]
+dbghelp = []
+default = ["std", "libunwind", "libbacktrace", "coresymbolication", "dladdr", "dbghelp"]
 dladdr = []
 gimli-symbolize = ["addr2line", "findshlibs", "gimli", "memmap", "object"]
 kernel32 = []
-libbacktrace = ["backtrace-sys"]
+libbacktrace = ["backtrace-sys", "std"]
 libunwind = []
 serialize-rustc = ["rustc-serialize"]
 serialize-serde = ["serde", "serde_derive"]
+std = []
 unix-backtrace = []
 [target."cfg(all(unix, not(target_os = \"fuchsia\"), not(target_os = \"emscripten\"), not(target_os = \"macos\"), not(target_os = \"ios\")))".dependencies.backtrace-sys]
 version = "0.1.17"
 optional = true
 [target."cfg(unix)".dependencies.libc]
-version = "0.2"
+version = "0.2.45"
+default-features = false
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3.3"
-features = ["std", "dbghelp", "processthreadsapi", "winnt", "minwindef"]
-optional = true
+features = ["dbghelp", "processthreadsapi", "winnt", "minwindef"]
diff -Nru cargo-0.32.0/vendor/backtrace/debian/patches/series cargo-0.33.0/vendor/backtrace/debian/patches/series
--- cargo-0.32.0/vendor/backtrace/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+update-dep-object.patch
diff -Nru cargo-0.32.0/vendor/backtrace/debian/patches/update-dep-object.patch cargo-0.33.0/vendor/backtrace/debian/patches/update-dep-object.patch
--- cargo-0.32.0/vendor/backtrace/debian/patches/update-dep-object.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/debian/patches/update-dep-object.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -67,7 +67,7 @@
+ optional = true
+ 
+ [dependencies.object]
+-version = "0.9.0"
++version = "0.11"
+ optional = true
+ 
+ [dependencies.rustc-demangle]
diff -Nru cargo-0.32.0/vendor/backtrace/.gitmodules cargo-0.33.0/vendor/backtrace/.gitmodules
--- cargo-0.32.0/vendor/backtrace/.gitmodules	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.gitmodules	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[submodule "backtrace-sys/src/libbacktrace"]
-	path = backtrace-sys/src/libbacktrace
-	url = https://github.com/rust-lang-nursery/libbacktrace
diff -Nru cargo-0.32.0/vendor/backtrace/.pc/applied-patches cargo-0.33.0/vendor/backtrace/.pc/applied-patches
--- cargo-0.32.0/vendor/backtrace/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+update-dep-object.patch
diff -Nru cargo-0.32.0/vendor/backtrace/.pc/.quilt_patches cargo-0.33.0/vendor/backtrace/.pc/.quilt_patches
--- cargo-0.32.0/vendor/backtrace/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.pc/.quilt_patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+debian/patches
diff -Nru cargo-0.32.0/vendor/backtrace/.pc/.quilt_series cargo-0.33.0/vendor/backtrace/.pc/.quilt_series
--- cargo-0.32.0/vendor/backtrace/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.pc/.quilt_series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+series
diff -Nru cargo-0.32.0/vendor/backtrace/.pc/update-dep-object.patch/Cargo.toml cargo-0.33.0/vendor/backtrace/.pc/update-dep-object.patch/Cargo.toml
--- cargo-0.32.0/vendor/backtrace/.pc/update-dep-object.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.pc/update-dep-object.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,111 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "backtrace"
+version = "0.3.13"
+authors = ["Alex Crichton <alex@alexcrichton.com>", "The Rust Project Developers"]
+autoexamples = true
+autotests = true
+description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"
+homepage = "https://github.com/alexcrichton/backtrace-rs"
+documentation = "https://docs.rs/backtrace"
+readme = "README.md"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/alexcrichton/backtrace-rs"
+
+[[example]]
+name = "backtrace"
+required-features = ["std"]
+
+[[example]]
+name = "raw"
+required-features = ["std"]
+
+[[test]]
+name = "skip_inner_frames"
+required-features = ["std"]
+
+[[test]]
+name = "long_fn_name"
+required-features = ["std"]
+
+[[test]]
+name = "smoke"
+required-features = ["std"]
+[dependencies.addr2line]
+version = "0.7.0"
+optional = true
+
+[dependencies.cfg-if]
+version = "0.1.6"
+
+[dependencies.cpp_demangle]
+version = "0.2.3"
+optional = true
+default-features = false
+
+[dependencies.findshlibs]
+version = "0.4.0"
+optional = true
+
+[dependencies.gimli]
+version = "0.16.0"
+optional = true
+
+[dependencies.memmap]
+version = "0.7.0"
+optional = true
+
+[dependencies.object]
+version = "0.9.0"
+optional = true
+
+[dependencies.rustc-demangle]
+version = "0.1.4"
+
+[dependencies.rustc-serialize]
+version = "0.3"
+optional = true
+
+[dependencies.serde]
+version = "1.0"
+optional = true
+
+[dependencies.serde_derive]
+version = "1.0"
+optional = true
+[build-dependencies.autocfg]
+version = "0.1"
+
+[features]
+coresymbolication = []
+dbghelp = []
+default = ["std", "libunwind", "libbacktrace", "coresymbolication", "dladdr", "dbghelp"]
+dladdr = []
+gimli-symbolize = ["addr2line", "findshlibs", "gimli", "memmap", "object"]
+kernel32 = []
+libbacktrace = ["backtrace-sys", "std"]
+libunwind = []
+serialize-rustc = ["rustc-serialize"]
+serialize-serde = ["serde", "serde_derive"]
+std = []
+unix-backtrace = []
+[target."cfg(all(unix, not(target_os = \"fuchsia\"), not(target_os = \"emscripten\"), not(target_os = \"macos\"), not(target_os = \"ios\")))".dependencies.backtrace-sys]
+version = "0.1.17"
+optional = true
+[target."cfg(unix)".dependencies.libc]
+version = "0.2.45"
+default-features = false
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3.3"
+features = ["dbghelp", "processthreadsapi", "winnt", "minwindef"]
diff -Nru cargo-0.32.0/vendor/backtrace/.pc/.version cargo-0.33.0/vendor/backtrace/.pc/.version
--- cargo-0.32.0/vendor/backtrace/.pc/.version	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.pc/.version	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+2
diff -Nru cargo-0.32.0/vendor/backtrace/README.md cargo-0.33.0/vendor/backtrace/README.md
--- cargo-0.32.0/vendor/backtrace/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -6,8 +6,8 @@
 [Documentation](https://docs.rs/backtrace)
 
 A library for acquiring backtraces at runtime for Rust. This library aims to
-enhance the support given by the standard library at `std::rt` by providing a
-more stable and programmatic interface.
+enhance the support of the standard library by providing a more stable and
+programmatic interface.
 
 ## Install
 
diff -Nru cargo-0.32.0/vendor/backtrace/src/backtrace/dbghelp.rs cargo-0.33.0/vendor/backtrace/src/backtrace/dbghelp.rs
--- cargo-0.32.0/vendor/backtrace/src/backtrace/dbghelp.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/backtrace/dbghelp.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,14 +10,17 @@
 
 #![allow(bad_style)]
 
-use std::mem;
-use winapi::ctypes::*;
+use core::mem;
+use core::prelude::v1::*;
+
 use winapi::shared::minwindef::*;
 use winapi::um::processthreadsapi;
 use winapi::um::winnt::{self, CONTEXT};
 use winapi::um::dbghelp;
 use winapi::um::dbghelp::*;
 
+use types::c_void;
+
 pub struct Frame {
     inner: STACKFRAME64,
 }
@@ -32,50 +35,43 @@
     }
 }
 
+#[repr(C, align(16))] // required by `CONTEXT`, is a FIXME in winapi right now
+struct MyContext(CONTEXT);
+
 #[inline(always)]
-pub fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
-    // According to windows documentation, all dbghelp functions are
-    // single-threaded.
-    let _g = ::lock::lock();
-
-    unsafe {
-        // Allocate necessary structures for doing the stack walk
-        let process = processthreadsapi::GetCurrentProcess();
-        let thread = processthreadsapi::GetCurrentThread();
-
-        // The CONTEXT structure needs to be aligned on a 16-byte boundary for
-        // 64-bit Windows, but currently we don't have a way to express that in
-        // Rust. Allocations are generally aligned to 16-bytes, though, so we
-        // box this up.
-        let mut context = Box::new(mem::zeroed::<CONTEXT>());
-        winnt::RtlCaptureContext(&mut *context);
-        let mut frame = super::Frame {
-            inner: Frame { inner: mem::zeroed() },
-        };
-        let image = init_frame(&mut frame.inner.inner, &context);
-
-        // Initialize this process's symbols
-        let _c = ::dbghelp_init();
-
-        // And now that we're done with all the setup, do the stack walking!
-        while dbghelp::StackWalk64(image as DWORD,
-                                   process,
-                                   thread,
-                                   &mut frame.inner.inner,
-                                   &mut *context as *mut _ as *mut _,
-                                   None,
-                                   Some(dbghelp::SymFunctionTableAccess64),
-                                   Some(dbghelp::SymGetModuleBase64),
-                                   None) == TRUE {
-            if frame.inner.inner.AddrPC.Offset == frame.inner.inner.AddrReturn.Offset ||
-               frame.inner.inner.AddrPC.Offset == 0 ||
-               frame.inner.inner.AddrReturn.Offset == 0 {
-                break
-            }
-
-            if !cb(&frame) {
-                break
-            }
+pub unsafe fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
+    // Allocate necessary structures for doing the stack walk
+    let process = processthreadsapi::GetCurrentProcess();
+    let thread = processthreadsapi::GetCurrentThread();
+
+    let mut context = mem::zeroed::<MyContext>();
+    winnt::RtlCaptureContext(&mut context.0);
+    let mut frame = super::Frame {
+        inner: Frame { inner: mem::zeroed() },
+    };
+    let image = init_frame(&mut frame.inner.inner, &context.0);
+
+    // Initialize this process's symbols
+    let _c = ::dbghelp_init();
+
+    // And now that we're done with all the setup, do the stack walking!
+    while dbghelp::StackWalk64(image as DWORD,
+                               process,
+                               thread,
+                               &mut frame.inner.inner,
+                               &mut context.0 as *mut CONTEXT as *mut _,
+                               None,
+                               Some(dbghelp::SymFunctionTableAccess64),
+                               Some(dbghelp::SymGetModuleBase64),
+                               None) == TRUE {
+        if frame.inner.inner.AddrPC.Offset == frame.inner.inner.AddrReturn.Offset ||
+            frame.inner.inner.AddrPC.Offset == 0 ||
+                frame.inner.inner.AddrReturn.Offset == 0 {
+                    break
+                }
+
+        if !cb(&frame) {
+            break
         }
     }
 }
diff -Nru cargo-0.32.0/vendor/backtrace/src/backtrace/libunwind.rs cargo-0.33.0/vendor/backtrace/src/backtrace/libunwind.rs
--- cargo-0.32.0/vendor/backtrace/src/backtrace/libunwind.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/backtrace/libunwind.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::os::raw::c_void;
+use types::c_void;
 
 pub struct Frame {
     ctx: *mut uw::_Unwind_Context,
@@ -48,10 +48,8 @@
 }
 
 #[inline(always)]
-pub fn trace(mut cb: &mut FnMut(&super::Frame) -> bool) {
-    unsafe {
-        uw::_Unwind_Backtrace(trace_fn, &mut cb as *mut _ as *mut _);
-    }
+pub unsafe fn trace(mut cb: &mut FnMut(&super::Frame) -> bool) {
+    uw::_Unwind_Backtrace(trace_fn, &mut cb as *mut _ as *mut _);
 
     extern fn trace_fn(ctx: *mut uw::_Unwind_Context,
                        arg: *mut c_void) -> uw::_Unwind_Reason_Code {
@@ -83,8 +81,8 @@
 mod uw {
     pub use self::_Unwind_Reason_Code::*;
 
-    use libc;
-    use std::os::raw::{c_int, c_void};
+    use libc::{self, c_int};
+    use types::c_void;
 
     #[repr(C)]
     pub enum _Unwind_Reason_Code {
diff -Nru cargo-0.32.0/vendor/backtrace/src/backtrace/mod.rs cargo-0.33.0/vendor/backtrace/src/backtrace/mod.rs
--- cargo-0.32.0/vendor/backtrace/src/backtrace/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/backtrace/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,6 +1,5 @@
-use std::fmt;
-
-use std::os::raw::c_void;
+use core::fmt;
+use types::c_void;
 
 /// Inspects the current call-stack, passing all active frames into the closure
 /// provided to calculate a stack trace.
@@ -23,6 +22,11 @@
 /// example, capture a backtrace to be inspected later, then the `Backtrace`
 /// type may be more appropriate.
 ///
+/// # Required features
+///
+/// This function requires the `std` feature of the `backtrace` crate to be
+/// enabled, and the `std` feature is enabled by default.
+///
 /// # Example
 ///
 /// ```
@@ -36,12 +40,24 @@
 ///     });
 /// }
 /// ```
-#[inline(never)] // if this is never inlined then the first frame can be known
-                 // to be skipped
-pub fn trace<F: FnMut(&Frame) -> bool>(mut cb: F) {
+#[inline(always)]
+#[cfg(feature = "std")]
+pub fn trace<F: FnMut(&Frame) -> bool>(cb: F) {
+    let _guard = ::lock::lock();
+    unsafe { trace_unsynchronized(cb) }
+}
+
+/// Same as `trace`, only unsafe as it's unsynchronized.
+///
+/// This function does not have synchronization guarentees but is available
+/// when the `std` feature of this crate isn't compiled in. See the `trace`
+/// function for more documentation and examples.
+#[inline(never)]
+pub unsafe fn trace_unsynchronized<F: FnMut(&Frame) -> bool>(mut cb: F) {
     trace_imp(&mut cb)
 }
 
+
 /// A trait representing one frame of a backtrace, yielded to the `trace`
 /// function of this crate.
 ///
diff -Nru cargo-0.32.0/vendor/backtrace/src/backtrace/noop.rs cargo-0.33.0/vendor/backtrace/src/backtrace/noop.rs
--- cargo-0.32.0/vendor/backtrace/src/backtrace/noop.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/backtrace/noop.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,4 +1,4 @@
-use std::os::raw::c_void;
+use types::c_void;
 
 #[inline(always)]
 pub fn trace(_cb: &mut FnMut(&super::Frame) -> bool) {}
diff -Nru cargo-0.32.0/vendor/backtrace/src/backtrace/unix_backtrace.rs cargo-0.33.0/vendor/backtrace/src/backtrace/unix_backtrace.rs
--- cargo-0.32.0/vendor/backtrace/src/backtrace/unix_backtrace.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/backtrace/unix_backtrace.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,8 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::mem;
-use std::os::raw::{c_void, c_int};
+use core::mem;
+use libc::c_int;
+
+use types::c_void;
 
 pub struct Frame {
     addr: *mut c_void,
@@ -25,15 +27,14 @@
 }
 
 #[inline(always)]
-pub fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
+pub unsafe fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
     const SIZE: usize = 100;
 
     let mut buf: [*mut c_void; SIZE];
     let cnt;
-    unsafe {
-        buf = mem::zeroed();
-        cnt = backtrace(buf.as_mut_ptr(), SIZE as c_int);
-    }
+
+    buf = mem::zeroed();
+    cnt = backtrace(buf.as_mut_ptr(), SIZE as c_int);
 
     for addr in buf[..cnt as usize].iter() {
         let cx = super::Frame {
diff -Nru cargo-0.32.0/vendor/backtrace/src/capture.rs cargo-0.33.0/vendor/backtrace/src/capture.rs
--- cargo-0.32.0/vendor/backtrace/src/capture.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/capture.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,19 +1,26 @@
+use std::prelude::v1::*;
 use std::fmt;
-use std::mem;
-use std::os::raw::c_void;
 use std::path::{Path, PathBuf};
 
 use {trace, resolve, SymbolName};
+use types::c_void;
 
 /// Representation of an owned and self-contained backtrace.
 ///
 /// This structure can be used to capture a backtrace at various points in a
 /// program and later used to inspect what the backtrace was at that time.
+///
+/// `Backtrace` supports pretty-printing of backtraces through its `Debug`
+/// implementation.
 #[derive(Clone)]
 #[cfg_attr(feature = "serialize-rustc", derive(RustcDecodable, RustcEncodable))]
 #[cfg_attr(feature = "serialize-serde", derive(Deserialize, Serialize))]
 pub struct Backtrace {
+    // Frames here are listed from top-to-bottom of the stack
     frames: Vec<BacktraceFrame>,
+    // The index we believe is the actual start of the backtrace, omitting
+    // frames like `Backtrace::new` and `backtrace::trace`.
+    actual_start_index: usize,
 }
 
 /// Captured version of a frame in a backtrace.
@@ -59,10 +66,11 @@
     ///
     /// let current_backtrace = Backtrace::new();
     /// ```
+    #[inline(never)] // want to make sure there's a frame here to remove
     pub fn new() -> Backtrace {
-        let mut bt = Backtrace::new_unresolved();
+        let mut bt = Self::create(Self::new as usize);
         bt.resolve();
-        return bt
+        bt
     }
 
     /// Similar to `new` except that this does not resolve any symbols, this
@@ -83,18 +91,39 @@
     /// current_backtrace.resolve();
     /// println!("{:?}", current_backtrace); // symbol names now present
     /// ```
+    #[inline(never)] // want to make sure there's a frame here to remove
     pub fn new_unresolved() -> Backtrace {
+        Self::create(Self::new_unresolved as usize)
+    }
+
+    fn create(ip: usize) -> Backtrace {
+        let ip_lo = ip;
+        let ip_hi = ip + 128;
+
         let mut frames = Vec::new();
+        let mut actual_start_index = None;
         trace(|frame| {
+            let ip = frame.ip() as usize;
             frames.push(BacktraceFrame {
-                ip: frame.ip() as usize,
+                ip,
                 symbol_address: frame.symbol_address() as usize,
                 symbols: None,
             });
+
+            if cfg!(not(all(target_os = "windows", target_arch = "x86"))) &&
+                ip >= ip_lo &&
+                ip <= ip_hi &&
+                actual_start_index.is_none()
+            {
+                actual_start_index = Some(frames.len());
+            }
             true
         });
 
-        Backtrace { frames: frames }
+        Backtrace {
+            frames,
+            actual_start_index: actual_start_index.unwrap_or(0),
+        }
     }
 
     /// Returns the frames from when this backtrace was captured.
@@ -103,7 +132,7 @@
     /// and the last frame is likely something about how this thread or the main
     /// function started.
     pub fn frames(&self) -> &[BacktraceFrame] {
-        &self.frames
+        &self.frames[self.actual_start_index..]
     }
 
     /// If this backtrace was created from `new_unresolved` then this function
@@ -118,7 +147,7 @@
                 symbols.push(BacktraceSymbol {
                     name: symbol.name().map(|m| m.as_bytes().to_vec()),
                     addr: symbol.addr().map(|a| a as usize),
-                    filename: symbol.filename().map(|m| m.to_path_buf()),
+                    filename: symbol.filename().map(|m| m.to_owned()),
                     lineno: symbol.lineno(),
                 });
             });
@@ -130,7 +159,8 @@
 impl From<Vec<BacktraceFrame>> for Backtrace {
     fn from(frames: Vec<BacktraceFrame>) -> Self {
         Backtrace {
-            frames: frames
+            frames,
+            actual_start_index: 0,
         }
     }
 }
@@ -190,38 +220,47 @@
 
 impl fmt::Debug for Backtrace {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let hex_width = mem::size_of::<usize>() * 2 + 2;
+        write!(fmt, "stack backtrace:")?;
 
-        try!(write!(fmt, "stack backtrace:"));
+        let iter = if fmt.alternate() {
+            self.frames.iter()
+        } else {
+            self.frames[self.actual_start_index..].iter()
+        };
 
-        for (idx, frame) in self.frames().iter().enumerate() {
+        for (idx, frame) in iter.enumerate() {
             let ip = frame.ip();
-            try!(write!(fmt, "\n{:4}: {:2$?}", idx, ip, hex_width));
+            write!(fmt, "\n{:4}: ", idx)?;
 
             let symbols = match frame.symbols {
                 Some(ref s) => s,
                 None => {
-                    try!(write!(fmt, " - <unresolved>"));
+                    write!(fmt, "<unresolved> ({:?})", ip)?;
                     continue
                 }
             };
             if symbols.len() == 0 {
-                try!(write!(fmt, " - <no info>"));
+                write!(fmt, "<no info> ({:?})", ip)?;
+                continue;
             }
 
             for (idx, symbol) in symbols.iter().enumerate() {
                 if idx != 0 {
-                    try!(write!(fmt, "\n      {:1$}", "", hex_width));
+                    write!(fmt, "\n      ")?;
                 }
 
                 if let Some(name) = symbol.name() {
-                    try!(write!(fmt, " - {}", name));
+                    write!(fmt, "{}", name)?;
                 } else {
-                    try!(write!(fmt, " - <unknown>"));
+                    write!(fmt, "<unknown>")?;
+                }
+
+                if idx == 0 {
+                    write!(fmt, " ({:?})", ip)?;
                 }
 
                 if let (Some(file), Some(line)) = (symbol.filename(), symbol.lineno()) {
-                    try!(write!(fmt, "\n      {:3$}at {}:{}", "", file.display(), line, hex_width));
+                    write!(fmt, "\n             at {}:{}", file.display(), line)?;
                 }
             }
         }
diff -Nru cargo-0.32.0/vendor/backtrace/src/dylib.rs cargo-0.33.0/vendor/backtrace/src/dylib.rs
--- cargo-0.32.0/vendor/backtrace/src/dylib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/dylib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,7 +1,6 @@
-use std::ffi::CString;
-use std::marker;
-use std::mem;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use core::marker;
+use core::mem;
+use core::sync::atomic::{AtomicUsize, Ordering};
 
 use libc::{self, c_char, c_void};
 
@@ -26,8 +25,8 @@
         if self.init.load(Ordering::SeqCst) != 0 {
             return true
         }
-        let name = CString::new(path).unwrap();
-        let ptr = libc::dlopen(name.as_ptr() as *const c_char, libc::RTLD_LAZY);
+        assert!(path.as_bytes()[path.len() - 1] == 0);
+        let ptr = libc::dlopen(path.as_ptr() as *const c_char, libc::RTLD_LAZY);
         if ptr.is_null() {
             return false
         }
diff -Nru cargo-0.32.0/vendor/backtrace/src/lib.rs cargo-0.33.0/vendor/backtrace/src/lib.rs
--- cargo-0.32.0/vendor/backtrace/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -46,6 +46,8 @@
 //! extern crate backtrace;
 //!
 //! fn main() {
+//! # // Unsafe here so test passes on no_std.
+//! # #[cfg(feature = "std")] {
 //!     backtrace::trace(|frame| {
 //!         let ip = frame.ip();
 //!         let symbol_address = frame.symbol_address();
@@ -63,15 +65,20 @@
 //!         true // keep going to the next frame
 //!     });
 //! }
+//! # }
 //! ```
 
 #![doc(html_root_url = "https://docs.rs/backtrace")]
 #![deny(missing_docs)]
-#![deny(warnings)]
+#![no_std]
+
+#[cfg(feature = "std")]
+#[macro_use] extern crate std;
 
 #[cfg(unix)]
 extern crate libc;
-#[cfg(all(windows, feature = "winapi"))] extern crate winapi;
+#[cfg(windows)]
+extern crate winapi;
 
 #[cfg(feature = "serde_derive")]
 #[cfg_attr(feature = "serde_derive", macro_use)]
@@ -103,14 +110,23 @@
 #[macro_use]
 mod dylib;
 
-pub use backtrace::{trace, Frame};
+pub use backtrace::{trace_unsynchronized, Frame};
 mod backtrace;
 
-pub use symbolize::{resolve, Symbol, SymbolName};
+pub use symbolize::{resolve_unsynchronized, Symbol, SymbolName};
 mod symbolize;
 
-pub use capture::{Backtrace, BacktraceFrame, BacktraceSymbol};
-mod capture;
+pub use types::BytesOrWideString;
+mod types;
+
+cfg_if! {
+    if #[cfg(feature = "std")] {
+        pub use backtrace::trace;
+        pub use symbolize::resolve;
+        pub use capture::{Backtrace, BacktraceFrame, BacktraceSymbol};
+        mod capture;
+    }
+}
 
 #[allow(dead_code)]
 struct Bomb {
@@ -127,9 +143,10 @@
 }
 
 #[allow(dead_code)]
+#[cfg(feature = "std")]
 mod lock {
     use std::cell::Cell;
-    use std::mem;
+    use std::boxed::Box;
     use std::sync::{Once, Mutex, MutexGuard, ONCE_INIT};
 
     pub struct LockGuard(MutexGuard<'static, ()>);
@@ -154,7 +171,7 @@
         LOCK_HELD.with(|s| s.set(true));
         unsafe {
             INIT.call_once(|| {
-                LOCK = mem::transmute(Box::new(Mutex::new(())));
+                LOCK = Box::into_raw(Box::new(Mutex::new(())));
             });
             Some(LockGuard((*LOCK).lock().unwrap()))
         }
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/coresymbolication.rs cargo-0.33.0/vendor/backtrace/src/symbolize/coresymbolication.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/coresymbolication.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/coresymbolication.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,19 +10,17 @@
 
 #![allow(bad_style)]
 
-use std::ffi::{CStr, OsStr};
-use std::mem;
-use std::os::raw::{c_void, c_char, c_int};
-use std::os::unix::prelude::*;
-use std::path::Path;
-use std::ptr;
-use std::sync::atomic::ATOMIC_USIZE_INIT;
+use core::mem;
+use core::ptr;
+use core::slice;
+use core::sync::atomic::ATOMIC_USIZE_INIT;
 
-use libc::{self, Dl_info};
+use libc::{self, Dl_info, c_char, c_int};
 
 use SymbolName;
 use dylib::Dylib;
 use dylib::Symbol as DylibSymbol;
+use types::{BytesOrWideString, c_void};
 
 #[repr(C)]
 #[derive(Copy, Clone, PartialEq)]
@@ -57,7 +55,8 @@
             None
         } else {
             Some(SymbolName::new(unsafe {
-                CStr::from_ptr(name).to_bytes()
+                let len = libc::strlen(name);
+                slice::from_raw_parts(name as *const u8, len)
             }))
         }
     }
@@ -69,15 +68,16 @@
         }
     }
 
-    pub fn filename(&self) -> Option<&Path> {
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
         match *self {
             Symbol::Core { path, .. } => {
                 if path.is_null() {
                     None
                 } else {
-                    Some(Path::new(OsStr::from_bytes(unsafe {
-                        CStr::from_ptr(path).to_bytes()
-                    })))
+                    Some(BytesOrWideString::Bytes(unsafe {
+                        let len = libc::strlen(path);
+                        slice::from_raw_parts(path as *const u8, len)
+                    }))
                 }
             }
             Symbol::Dladdr(_) => None,
@@ -102,8 +102,8 @@
         static $name: ::dylib::Symbol<unsafe extern fn($($t),*) -> $ret> =
             ::dylib::Symbol {
                 name: concat!(stringify!($name), "\0"),
-                addr: ::std::sync::atomic::ATOMIC_USIZE_INIT,
-                _marker: ::std::marker::PhantomData,
+                addr: ::core::sync::atomic::ATOMIC_USIZE_INIT,
+                _marker: ::core::marker::PhantomData,
             };
     )*)
 }
@@ -131,7 +131,7 @@
 
 unsafe fn try_resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) -> bool {
     let path = "/System/Library/PrivateFrameworks/CoreSymbolication.framework\
-                /Versions/A/CoreSymbolication";
+                /Versions/A/CoreSymbolication\0";
     if !CORESYMBOLICATION.init(path) {
         return false;
     }
@@ -177,16 +177,14 @@
     rv
 }
 
-pub fn resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) {
-    unsafe {
-        if try_resolve(addr, cb) {
-            return
-        }
-        let mut info: Dl_info = mem::zeroed();
-        if libc::dladdr(addr as *mut _, &mut info) != 0 {
-            cb(&super::Symbol {
-                inner: Symbol::Dladdr(info),
-            });
-        }
+pub unsafe fn resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) {
+    if try_resolve(addr, cb) {
+        return
+    }
+    let mut info: Dl_info = mem::zeroed();
+    if libc::dladdr(addr as *mut _, &mut info) != 0 {
+        cb(&super::Symbol {
+            inner: Symbol::Dladdr(info),
+        });
     }
 }
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/dbghelp.rs cargo-0.33.0/vendor/backtrace/src/symbolize/dbghelp.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/dbghelp.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/dbghelp.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,11 +10,19 @@
 
 #![allow(bad_style)]
 
-use std::ffi::OsString;
-use std::mem;
-use std::path::Path;
-use std::os::windows::prelude::*;
-use std::slice;
+// This is a hack for compatibility with rustc 1.25.0. The no_std mode of this
+// crate is not supported pre-1.30.0, but in std mode the `char` module here
+// moved in rustc 1.26.0 (ish). As a result, in std mode we use `std::char` to
+// retain compatibility with rustc 1.25.0, but in `no_std` mode (which is
+// 1.30.0+ already) we use `core::char`.
+#[cfg(feature = "std")]
+use std::char;
+#[cfg(not(feature = "std"))]
+use core::char;
+
+use core::mem;
+use core::slice;
+
 use winapi::ctypes::*;
 use winapi::shared::basetsd::*;
 use winapi::shared::minwindef::*;
@@ -23,96 +31,145 @@
 use winapi::um::dbghelp::*;
 
 use SymbolName;
+use types::BytesOrWideString;
 
+// Store an OsString on std so we can provide the symbol name and filename.
 pub struct Symbol {
-    name: OsString,
+    name: *const [u8],
     addr: *mut c_void,
     line: Option<u32>,
-    filename: Option<OsString>,
+    filename: Option<*const [u16]>,
+    #[cfg(feature = "std")]
+    _filename_cache: Option<::std::ffi::OsString>,
+    #[cfg(not(feature = "std"))]
+    _filename_cache: (),
 }
 
 impl Symbol {
     pub fn name(&self) -> Option<SymbolName> {
-        self.name.to_str().map(|s| SymbolName::new(s.as_bytes()))
+        Some(SymbolName::new(unsafe { &*self.name }))
     }
 
     pub fn addr(&self) -> Option<*mut c_void> {
         Some(self.addr as *mut _)
     }
 
-    pub fn filename(&self) -> Option<&Path> {
-        self.filename.as_ref().map(Path::new)
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
+        self.filename.map(|slice| {
+            unsafe {
+                BytesOrWideString::Wide(&*slice)
+            }
+        })
     }
 
     pub fn lineno(&self) -> Option<u32> {
         self.line
     }
+
+    #[cfg(feature = "std")]
+    pub fn filename(&self) -> Option<&::std::ffi::OsString> {
+        self._filename_cache.as_ref()
+    }
 }
 
-pub fn resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) {
-    // According to windows documentation, all dbghelp functions are
-    // single-threaded.
-    let _g = ::lock::lock();
-
-    unsafe {
-        let size = 2 * MAX_SYM_NAME + mem::size_of::<SYMBOL_INFOW>();
-        let mut data = vec![0u8; size];
-        let info = &mut *(data.as_mut_ptr() as *mut SYMBOL_INFOW);
-        info.MaxNameLen = MAX_SYM_NAME as ULONG;
-        // the struct size in C.  the value is different to
-        // `size_of::<SYMBOL_INFOW>() - MAX_SYM_NAME + 1` (== 81)
-        // due to struct alignment.
-        info.SizeOfStruct = 88;
-
-        let _c = ::dbghelp_init();
-
-        let mut displacement = 0u64;
-        let ret = dbghelp::SymFromAddrW(processthreadsapi::GetCurrentProcess(),
-                                          addr as DWORD64,
-                                          &mut displacement,
-                                          info);
-        if ret != TRUE {
-            return
-        }
+#[repr(C, align(8))]
+struct Aligned8<T>(T);
 
-        // If the symbol name is greater than MaxNameLen, SymFromAddrW will
-        // give a buffer of (MaxNameLen - 1) characters and set NameLen to
-        // the real value.
-        let name_len = ::std::cmp::min(info.NameLen as usize,
-                                       info.MaxNameLen as usize - 1);
-
-        let name = slice::from_raw_parts(info.Name.as_ptr() as *const u16,
-                                         name_len);
-        let name = OsString::from_wide(name);
-
-        let mut line = mem::zeroed::<IMAGEHLP_LINEW64>();
-        line.SizeOfStruct = mem::size_of::<IMAGEHLP_LINEW64>() as DWORD;
-        let mut displacement = 0;
-        let ret = dbghelp::SymGetLineFromAddrW64(processthreadsapi::GetCurrentProcess(),
-                                                   addr as DWORD64,
-                                                   &mut displacement,
-                                                   &mut line);
-        let mut filename = None;
-        let mut lineno = None;
-        if ret == TRUE {
-            lineno = Some(line.LineNumber as u32);
-
-            let base = line.FileName;
-            let mut len = 0;
-            while *base.offset(len) != 0 {
-                len += 1;
+pub unsafe fn resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) {
+    const SIZE: usize = 2 * MAX_SYM_NAME + mem::size_of::<SYMBOL_INFOW>();
+    let mut data = Aligned8([0u8; SIZE]);
+    let data = &mut data.0;
+    let info = &mut *(data.as_mut_ptr() as *mut SYMBOL_INFOW);
+    info.MaxNameLen = MAX_SYM_NAME as ULONG;
+    // the struct size in C.  the value is different to
+    // `size_of::<SYMBOL_INFOW>() - MAX_SYM_NAME + 1` (== 81)
+    // due to struct alignment.
+    info.SizeOfStruct = 88;
+
+    let _c = ::dbghelp_init();
+
+    let mut displacement = 0u64;
+    let ret = dbghelp::SymFromAddrW(processthreadsapi::GetCurrentProcess(),
+                                    addr as DWORD64,
+                                    &mut displacement,
+                                    info);
+    if ret != TRUE {
+        return
+    }
+
+    // If the symbol name is greater than MaxNameLen, SymFromAddrW will
+    // give a buffer of (MaxNameLen - 1) characters and set NameLen to
+    // the real value.
+    let name_len = ::core::cmp::min(info.NameLen as usize,
+                                    info.MaxNameLen as usize - 1);
+    let name_ptr = info.Name.as_ptr() as *const u16;
+    let name = slice::from_raw_parts(name_ptr, name_len);
+
+    // Reencode the utf-16 symbol to utf-8 so we can use `SymbolName::new` like
+    // all other platforms
+    let mut name_len = 0;
+    let mut name_buffer = [0; 256];
+    {
+        let mut remaining = &mut name_buffer[..];
+        for c in char::decode_utf16(name.iter().cloned()) {
+            let c = c.unwrap_or(char::REPLACEMENT_CHARACTER);
+            let len = c.len_utf8();
+            if len < remaining.len() {
+                c.encode_utf8(remaining);
+                let tmp = remaining;
+                remaining = &mut tmp[len..];
+                name_len += len;
+            } else {
+                break
             }
-            let name = slice::from_raw_parts(base, len as usize);
-            filename = Some(OsString::from_wide(name));
+        }
+    }
+    let name = &name_buffer[..name_len] as *const [u8];
+
+    let mut line = mem::zeroed::<IMAGEHLP_LINEW64>();
+    line.SizeOfStruct = mem::size_of::<IMAGEHLP_LINEW64>() as DWORD;
+    let mut displacement = 0;
+    let ret = dbghelp::SymGetLineFromAddrW64(processthreadsapi::GetCurrentProcess(),
+                                             addr as DWORD64,
+                                             &mut displacement,
+                                             &mut line);
+
+    let mut filename = None;
+    let mut lineno = None;
+    if ret == TRUE {
+        lineno = Some(line.LineNumber as u32);
+
+        let base = line.FileName;
+        let mut len = 0;
+        while *base.offset(len) != 0 {
+            len += 1;
         }
 
-        cb(&super::Symbol {
-            inner: Symbol {
-                name: name,
-                addr: info.Address as *mut _,
-                line: lineno,
-                filename: filename,
-            },
-        })
+        let len = len as usize;
+
+        filename = Some(slice::from_raw_parts(base, len) as *const [u16]);
     }
+
+
+    cb(&super::Symbol {
+        inner: Symbol {
+            name,
+            addr: info.Address as *mut _,
+            line: lineno,
+            filename,
+            _filename_cache: cache(filename),
+        },
+    })
+}
+
+#[cfg(feature = "std")]
+unsafe fn cache(filename: Option<*const [u16]>) -> Option<::std::ffi::OsString> {
+    use std::os::windows::ffi::OsStringExt;
+    filename.map(|f| {
+        ::std::ffi::OsString::from_wide(&*f)
+    })
+}
+
+#[cfg(not(feature = "std"))]
+unsafe fn cache(_filename: Option<*const [u16]>) {
 }
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/dladdr.rs cargo-0.33.0/vendor/backtrace/src/symbolize/dladdr.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/dladdr.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/dladdr.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,11 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::ffi::CStr;
-use std::mem;
-use std::os::raw::c_void;
-use std::path::Path;
+use core::{mem, slice};
 
+use types::{BytesOrWideString, c_void};
 use libc::{self, Dl_info};
 
 use SymbolName;
@@ -26,9 +24,11 @@
         if self.inner.dli_sname.is_null() {
             None
         } else {
-            Some(SymbolName::new(unsafe {
-                CStr::from_ptr(self.inner.dli_sname).to_bytes()
-            }))
+            let ptr = self.inner.dli_sname as *const u8;
+            unsafe {
+                let len = libc::strlen(self.inner.dli_sname);
+                Some(SymbolName::new(slice::from_raw_parts(ptr, len)))
+            }
         }
     }
 
@@ -36,7 +36,7 @@
         Some(self.inner.dli_saddr as *mut _)
     }
 
-    pub fn filename(&self) -> Option<&Path> {
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
         None
     }
 
@@ -45,15 +45,13 @@
     }
 }
 
-pub fn resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) {
-    unsafe {
-        let mut info: super::Symbol = super::Symbol {
-            inner: Symbol {
-                inner: mem::zeroed(),
-            },
-        };
-        if libc::dladdr(addr as *mut _, &mut info.inner.inner) != 0 {
-            cb(&info)
-        }
+pub unsafe fn resolve(addr: *mut c_void, cb: &mut FnMut(&super::Symbol)) {
+    let mut info: super::Symbol = super::Symbol {
+        inner: Symbol {
+            inner: mem::zeroed(),
+        },
+    };
+    if libc::dladdr(addr as *mut _, &mut info.inner.inner) != 0 {
+        cb(&info)
     }
 }
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/gimli.rs cargo-0.33.0/vendor/backtrace/src/symbolize/gimli.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/gimli.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/gimli.rs	2019-02-06 04:11:58.000000000 +0000
@@ -7,20 +7,22 @@
 use std::env;
 use std::fs::File;
 use std::mem;
-use std::os::raw::c_void;
-use std::path::{Path, PathBuf};
+use libc::c_void;
+use std::path::PathBuf;
 use std::u32;
+use std::prelude::v1::*;
 
 use SymbolName;
+use types::BytesOrWideString;
 
 const MAPPINGS_CACHE_SIZE: usize = 4;
 
-type Dwarf<'map> = addr2line::Context<gimli::EndianBuf<'map, gimli::RunTimeEndian>>;
+type Dwarf = addr2line::Context<gimli::EndianRcSlice<gimli::RunTimeEndian>>;
 type Symbols<'map> = object::SymbolMap<'map>;
 
 struct Mapping {
+    dwarf: Dwarf,
     // 'static lifetime is a lie to hack around lack of support for self-referential structs.
-    dwarf: Dwarf<'static>,
     symbols: Symbols<'static>,
     _map: Mmap,
 }
@@ -35,7 +37,7 @@
             let dwarf = addr2line::Context::new(&object).ok()?;
             let symbols = object.symbol_map();
             // Convert to 'static lifetimes.
-            unsafe { (mem::transmute(dwarf), mem::transmute(symbols)) }
+            (dwarf, unsafe { mem::transmute(symbols) })
         };
         Some(Mapping {
             dwarf,
@@ -182,14 +184,14 @@
 
 pub struct Symbol {
     addr: usize,
-    file: Option<PathBuf>,
+    file: Option<String>,
     line: Option<u64>,
     name: Option<String>,
 }
 
 impl Symbol {
     fn new(addr: usize,
-           file: Option<PathBuf>,
+           file: Option<String>,
            line: Option<u64>,
            name: Option<String>)
            -> Symbol {
@@ -209,8 +211,8 @@
         Some(self.addr as *mut c_void)
     }
 
-    pub fn filename(&self) -> Option<&Path> {
-        self.file.as_ref().map(|f| f.as_ref())
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
+        self.file.as_ref().map(|f| BytesOrWideString::Bytes(f.as_bytes()))
     }
 
     pub fn lineno(&self) -> Option<u32> {
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/libbacktrace.rs cargo-0.33.0/vendor/backtrace/src/symbolize/libbacktrace.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/libbacktrace.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/libbacktrace.rs	2019-02-06 04:11:58.000000000 +0000
@@ -12,16 +12,16 @@
 
 extern crate backtrace_sys as bt;
 
-use libc::uintptr_t;
-use std::ffi::{CStr, OsStr};
-use std::os::raw::{c_void, c_char, c_int};
-use std::os::unix::prelude::*;
-use std::path::Path;
-use std::ptr;
+use std::ffi::CStr;
+use std::{ptr, slice};
 use std::sync::{ONCE_INIT, Once};
 
+use libc::{self, c_char, c_int, c_void, uintptr_t};
+
 use SymbolName;
 
+use types::BytesOrWideString;
+
 pub enum Symbol {
     Syminfo {
         pc: uintptr_t,
@@ -56,13 +56,15 @@
         if pc == 0 {None} else {Some(pc as *mut _)}
     }
 
-    pub fn filename(&self) -> Option<&Path> {
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
         match *self {
             Symbol::Syminfo { .. } => None,
             Symbol::Pcinfo { filename, .. } => {
-                Some(Path::new(OsStr::from_bytes(unsafe {
-                    CStr::from_ptr(filename).to_bytes()
-                })))
+                let ptr = filename as *const u8;
+                unsafe {
+                    let len = libc::strlen(filename);
+                    Some(BytesOrWideString::Bytes(slice::from_raw_parts(ptr, len)))
+                }
             }
         }
     }
@@ -158,23 +160,20 @@
     STATE
 }
 
-pub fn resolve(symaddr: *mut c_void, mut cb: &mut FnMut(&super::Symbol)) {
-    let _guard = ::lock::lock();
-
+pub unsafe fn resolve(symaddr: *mut c_void, mut cb: &mut FnMut(&super::Symbol))
+{
     // backtrace errors are currently swept under the rug
-    unsafe {
-        let state = init_state();
-        if state.is_null() {
-            return
-        }
+    let state = init_state();
+    if state.is_null() {
+        return
+    }
 
-        let ret = bt::backtrace_pcinfo(state, symaddr as uintptr_t,
-                                       pcinfo_cb, error_cb,
-                                       &mut cb as *mut _ as *mut _);
-        if ret != 0 {
-            bt::backtrace_syminfo(state, symaddr as uintptr_t,
-                                  syminfo_cb, error_cb,
-                                  &mut cb as *mut _ as *mut _);
-        }
+    let ret = bt::backtrace_pcinfo(state, symaddr as uintptr_t,
+                                   pcinfo_cb, error_cb,
+                                   &mut cb as *mut _ as *mut _);
+    if ret != 0 {
+        bt::backtrace_syminfo(state, symaddr as uintptr_t,
+                              syminfo_cb, error_cb,
+                              &mut cb as *mut _ as *mut _);
     }
 }
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/mod.rs cargo-0.33.0/vendor/backtrace/src/symbolize/mod.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,9 +1,13 @@
-use std::fmt;
-#[cfg(not(feature = "cpp_demangle"))]
-use std::marker::PhantomData;
-use std::os::raw::c_void;
-use std::path::Path;
-use std::str;
+use core::{fmt, str};
+
+cfg_if! {
+    if #[cfg(feature = "std")] {
+        use std::path::Path;
+        use std::prelude::v1::*;
+    }
+}
+
+use types::{BytesOrWideString, c_void};
 use rustc_demangle::{try_demangle, Demangle};
 
 /// Resolve an address to a symbol, passing the symbol to the specified
@@ -19,6 +23,11 @@
 /// Symbols yielded represent the execution at the specified `addr`, returning
 /// file/line pairs for that address (if available).
 ///
+/// # Required features
+///
+/// This function requires the `std` feature of the `backtrace` crate to be
+/// enabled, and the `std` feature is enabled by default.
+///
 /// # Example
 ///
 /// ```
@@ -36,10 +45,24 @@
 ///     });
 /// }
 /// ```
-pub fn resolve<F: FnMut(&Symbol)>(addr: *mut c_void, mut cb: F) {
-    resolve_imp(addr, &mut cb)
+#[cfg(feature = "std")]
+pub fn resolve<F: FnMut(&Symbol)>(addr: *mut c_void, cb: F) {
+    let _guard = ::lock::lock();
+    unsafe { resolve_unsynchronized(addr, cb) }
+}
+
+/// Same as `resolve`, only unsafe as it's unsynchronized.
+///
+/// This function does not have synchronization guarentees but is available when
+/// the `std` feature of this crate isn't compiled in. See the `resolve`
+/// function for more documentation and examples.
+pub unsafe fn resolve_unsynchronized<F>(addr: *mut c_void, mut cb: F)
+    where F: FnMut(&Symbol)
+{
+    resolve_imp(addr as *mut _, &mut cb)
 }
 
+
 /// A trait representing the resolution of a symbol in a file.
 ///
 /// This trait is yielded as a trait object to the closure given to the
@@ -69,19 +92,16 @@
 
     /// Returns the starting address of this function.
     pub fn addr(&self) -> Option<*mut c_void> {
-        self.inner.addr()
+        self.inner.addr().map(|p| p as *mut _)
     }
 
-    /// Returns the file name where this function was defined.
-    ///
-    /// This is currently only available when libbacktrace is being used (e.g.
-    /// unix platforms other than OSX) and when a binary is compiled with
-    /// debuginfo. If neither of these conditions is met then this will likely
-    /// return `None`.
-    pub fn filename(&self) -> Option<&Path> {
-        self.inner.filename()
+    /// Returns the raw filename as a slice. This is mainly useful for `no_std`
+    /// environments.
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
+        self.inner.filename_raw()
     }
 
+
     /// Returns the line number for where this symbol is currently executing.
     ///
     /// This return value is typically `Some` if `filename` returns `Some`, and
@@ -89,6 +109,39 @@
     pub fn lineno(&self) -> Option<u32> {
         self.inner.lineno()
     }
+
+    /// Returns the file name where this function was defined.
+    ///
+    /// This is currently only available when libbacktrace is being used (e.g.
+    /// unix platforms other than OSX) and when a binary is compiled with
+    /// debuginfo. If neither of these conditions is met then this will likely
+    /// return `None`.
+    ///
+    /// This function requires the `std` feature to be enabled for this crate.
+    #[cfg(feature = "std")]
+    pub fn filename(&self) -> Option<&Path> {
+        #[cfg(unix)]
+        {
+            use std::ffi::OsStr;
+            use std::os::unix::ffi::OsStrExt;
+
+            match self.filename_raw() {
+                Some(BytesOrWideString::Bytes(slice)) => {
+                    Some(Path::new(OsStr::from_bytes(slice)))
+                }
+                None => None,
+                _ => unreachable!(),
+            }
+        }
+        #[cfg(windows)]
+        {
+            self.inner.filename().map(Path::new)
+        }
+        #[cfg(all(not(windows), not(unix)))]
+        {
+            None
+        }
+    }
 }
 
 impl fmt::Debug for Symbol {
@@ -100,9 +153,13 @@
         if let Some(addr) = self.addr() {
             d.field("addr", &addr);
         }
-        if let Some(filename) = self.filename() {
-            d.field("filename", &filename);
+
+        #[cfg(feature = "std")] {
+            if let Some(filename) = self.filename() {
+                d.field("filename", &filename);
+            }
         }
+
         if let Some(lineno) = self.lineno() {
             d.field("lineno", &lineno);
         }
@@ -110,7 +167,6 @@
     }
 }
 
-
 cfg_if! {
     if #[cfg(feature = "cpp_demangle")] {
         // Maybe a parsed C++ symbol, if parsing the mangled symbol as Rust
@@ -127,6 +183,8 @@
             }
         }
     } else {
+        use core::marker::PhantomData;
+
         // Make sure to keep this zero-sized, so that the `cpp_demangle` feature
         // has no cost when disabled.
         struct OptionCppSymbol<'a>(PhantomData<&'a ()>);
@@ -188,6 +246,30 @@
     }
 }
 
+fn format_symbol_name(fmt: fn(&str, &mut fmt::Formatter) -> fmt::Result,
+                      mut bytes: &[u8],
+                      f: &mut fmt::Formatter)
+    -> fmt::Result
+{
+    while bytes.len() > 0 {
+        match str::from_utf8(bytes) {
+            Ok(name) => {
+                fmt(name, f)?;
+                break
+            }
+            Err(err) => {
+                fmt("\u{FFFD}", f)?;
+
+                match err.error_len() {
+                    Some(len) => bytes = &bytes[err.valid_up_to() + len..],
+                    None => break,
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
 cfg_if! {
     if #[cfg(feature = "cpp_demangle")] {
         impl<'a> fmt::Display for SymbolName<'a> {
@@ -197,7 +279,7 @@
                 } else if let Some(ref cpp) = self.cpp_demangled.0 {
                     cpp.fmt(f)
                 } else {
-                    String::from_utf8_lossy(self.bytes).fmt(f)
+                    format_symbol_name(fmt::Display::fmt, self.bytes, f)
                 }
             }
         }
@@ -207,7 +289,7 @@
                 if let Some(ref s) = self.demangled {
                     s.fmt(f)
                 } else {
-                    String::from_utf8_lossy(self.bytes).fmt(f)
+                    format_symbol_name(fmt::Display::fmt, self.bytes, f)
                 }
             }
         }
@@ -215,7 +297,7 @@
 }
 
 cfg_if! {
-    if #[cfg(feature = "cpp_demangle")] {
+    if #[cfg(all(feature = "std", feature = "cpp_demangle"))] {
         impl<'a> fmt::Debug for SymbolName<'a> {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 use std::fmt::Write;
@@ -234,7 +316,7 @@
                     }
                 }
 
-                String::from_utf8_lossy(self.bytes).fmt(f)
+                format_symbol_name(fmt::Debug::fmt, self.bytes, f)
             }
         }
     } else {
@@ -243,7 +325,7 @@
                 if let Some(ref s) = self.demangled {
                     s.fmt(f)
                 } else {
-                    String::from_utf8_lossy(self.bytes).fmt(f)
+                    format_symbol_name(fmt::Debug::fmt, self.bytes, f)
                 }
             }
         }
@@ -255,7 +337,8 @@
         mod dbghelp;
         use self::dbghelp::resolve as resolve_imp;
         use self::dbghelp::Symbol as SymbolImp;
-    } else if #[cfg(all(feature = "gimli-symbolize",
+    } else if #[cfg(all(feature = "std",
+                        feature = "gimli-symbolize",
                         unix,
                         target_os = "linux"))] {
         mod gimli;
diff -Nru cargo-0.32.0/vendor/backtrace/src/symbolize/noop.rs cargo-0.33.0/vendor/backtrace/src/symbolize/noop.rs
--- cargo-0.32.0/vendor/backtrace/src/symbolize/noop.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/symbolize/noop.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,9 +1,7 @@
-use std::path::Path;
-use std::os::raw::c_void;
-
+use types::{BytesOrWideString, c_void};
 use SymbolName;
 
-pub fn resolve(_addr: *mut c_void, _cb: &mut FnMut(&super::Symbol)) {
+pub unsafe fn resolve(_addr: *mut c_void, _cb: &mut FnMut(&super::Symbol)) {
 }
 
 pub struct Symbol;
@@ -17,7 +15,7 @@
         None
     }
 
-    pub fn filename(&self) -> Option<&Path> {
+    pub fn filename_raw(&self) -> Option<BytesOrWideString> {
         None
     }
 
diff -Nru cargo-0.32.0/vendor/backtrace/src/types.rs cargo-0.33.0/vendor/backtrace/src/types.rs
--- cargo-0.32.0/vendor/backtrace/src/types.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/src/types.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,79 @@
+//! Platform dependent types.
+
+cfg_if! {
+    if #[cfg(feature = "std")] {
+        pub use std::os::raw::c_void;
+        use std::borrow::Cow;
+        use std::fmt;
+        use std::path::PathBuf;
+        use std::prelude::v1::*;
+    } else if #[cfg(rustc_1_30)] {
+        pub use core::ffi::c_void;
+    } else {
+        compile_error!("`backtrace` requires Rust >=1.30.0 to support `no_std`.");
+    }
+}
+
+/// A platform independent representation of a string. When working with `std`
+/// enabled it is recommended to the convenience methods for providing
+/// conversions to `std` types.
+#[derive(Debug)]
+pub enum BytesOrWideString<'a> {
+    /// A slice, typically provided on Unix platforms.
+    Bytes(&'a [u8]),
+    /// Wide strings typically from Windows.
+    Wide(&'a [u16]),
+}
+
+#[cfg(feature = "std")]
+impl<'a> BytesOrWideString<'a> {
+    /// Lossy converts to a `Cow<str>`, will allocate if `Bytes` is not valid
+    /// UTF-8 or if `BytesOrWideString` is `Wide`.
+    pub fn to_str_lossy(&self) -> Cow<'a, str> {
+        use self::BytesOrWideString::*;
+
+        match self {
+            &Bytes(slice) => String::from_utf8_lossy(slice),
+            &Wide(wide) => Cow::Owned(String::from_utf16_lossy(wide)),
+        }
+    }
+
+    /// Provides a `Path` representation of `BytesOrWideString`.
+    pub fn into_path_buf(self) -> PathBuf {
+        #[cfg(unix)]
+        {
+            use self::BytesOrWideString::*;
+            use std::ffi::OsStr;
+            use std::os::unix::ffi::OsStrExt;
+
+            match self {
+                Bytes(slice) => PathBuf::from(OsStr::from_bytes(slice)),
+                _ => unreachable!(),
+            }
+        }
+
+        #[cfg(windows)]
+        {
+            use self::BytesOrWideString::*;
+            use std::ffi::OsString;
+            use std::os::windows::ffi::OsStringExt;
+
+            match self {
+                Wide(slice) => PathBuf::from(OsString::from_wide(slice)),
+                _ => unreachable!(),
+            }
+        }
+
+        #[cfg(all(not(windows), not(unix)))]
+        {
+            unreachable!()
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl<'a> fmt::Display for BytesOrWideString<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.to_str_lossy().fmt(f)
+    }
+}
diff -Nru cargo-0.32.0/vendor/backtrace/tests/long_fn_name.rs cargo-0.33.0/vendor/backtrace/tests/long_fn_name.rs
--- cargo-0.32.0/vendor/backtrace/tests/long_fn_name.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/tests/long_fn_name.rs	2019-02-06 04:11:58.000000000 +0000
@@ -48,7 +48,7 @@
                 "::_234567890_234567890_234567890_234567890_234567890")
             {
                 found_long_name_frame = true;
-                assert_eq!(function_name.len(), dbghelp::MAX_SYM_NAME - 1);
+                assert!(function_name.len() > 200);
             }
         }
     }
diff -Nru cargo-0.32.0/vendor/backtrace/tests/skip_inner_frames.rs cargo-0.33.0/vendor/backtrace/tests/skip_inner_frames.rs
--- cargo-0.32.0/vendor/backtrace/tests/skip_inner_frames.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/tests/skip_inner_frames.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,37 @@
+extern crate backtrace;
+
+use backtrace::Backtrace;
+
+const FRAME_RANGE: usize = 128; // should be close enough not to give false positives
+
+#[test]
+#[cfg_attr(any(not(any(feature = "libunwind", feature = "unix-backtrace", feature = "dbghelp")), all(target_os = "windows", target_arch = "x86")), ignore)]
+fn backtrace_new_unresolved_should_start_with_call_site_trace() {
+    let mut b = Backtrace::new_unresolved();
+    b.resolve();
+	println!("{:?}", b);
+	println!("{:#?}", b);
+
+    assert!(!b.frames().is_empty());
+
+    let this_ip = backtrace_new_unresolved_should_start_with_call_site_trace as usize;
+    let frame_ip = b.frames().first().unwrap().ip() as usize;
+
+    assert!(frame_ip >= this_ip);
+    assert!(frame_ip <= this_ip + FRAME_RANGE);
+}
+
+#[test]
+#[cfg_attr(any(not(any(feature = "libunwind", feature = "unix-backtrace", feature = "dbghelp")), all(target_os = "windows", target_arch = "x86")), ignore)]
+fn backtrace_new_should_start_with_call_site_trace() {
+    let b = Backtrace::new();
+    println!("{:?}", b);
+
+    assert!(!b.frames().is_empty());
+
+    let this_ip = backtrace_new_should_start_with_call_site_trace as usize;
+    let frame_ip = b.frames().first().unwrap().ip() as usize;
+
+    assert!(frame_ip >= this_ip);
+    assert!(frame_ip <= this_ip + FRAME_RANGE);
+}
diff -Nru cargo-0.32.0/vendor/backtrace/tests/smoke.rs cargo-0.33.0/vendor/backtrace/tests/smoke.rs
--- cargo-0.32.0/vendor/backtrace/tests/smoke.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/tests/smoke.rs	2019-02-06 04:11:58.000000000 +0000
@@ -64,6 +64,7 @@
                     expected_file: &str,
                     expected_line: u32) {
         if offset > idx { return }
+        println!("frame: {}", idx);
         let (ip, sym) = syms[idx - offset];
         let ip = ip as usize;
         let sym = sym as usize;
@@ -72,7 +73,9 @@
 
         // windows dbghelp is *quite* liberal (and wrong) in many of its reports
         // right now...
-        if !DBGHELP {
+        //
+        // This assertion can also fail for release builds, so skip it there
+        if !DBGHELP && cfg!(debug_assertions) {
             assert!(sym - actual_fn_pointer < 1024);
         }
 
@@ -89,6 +92,7 @@
             addr = sym.addr();
             line = sym.lineno();
             file = sym.filename().map(|v| v.to_path_buf());
+            println!("  sym: {:?}", name);
         });
 
         // dbghelp doesn't always resolve symbols right now
@@ -104,8 +108,13 @@
            !(DBGHELP && !MSVC)
         {
             let name = name.expect("didn't find a name");
-            assert!(name.contains(expected_name),
-                    "didn't find `{}` in `{}`", expected_name, name);
+
+            // in release mode names get weird as functions can get merged
+            // together with `mergefunc`, so only assert this in debug mode
+            if cfg!(debug_assertions) {
+                assert!(name.contains(expected_name),
+                        "didn't find `{}` in `{}`", expected_name, name);
+            }
         }
 
         if can_resolve {
diff -Nru cargo-0.32.0/vendor/backtrace/.travis.yml cargo-0.33.0/vendor/backtrace/.travis.yml
--- cargo-0.32.0/vendor/backtrace/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-language: rust
-sudo: false
-dist: trusty
-
-matrix:
-  fast_finish: true
-  include:
-    # Test everything on stable linux
-    - rust: stable
-      addons:
-        sources:
-          # Provides clang-3.9
-          - llvm-toolchain-trusty-3.9
-        apt:
-          packages:
-            # Required for `bindgen`, which is required by `findshlibs`, which is
-            # required by the `gimli` feature.
-            - clang-3.9
-      script: &test_all
-        - cargo build --manifest-path backtrace-sys/Cargo.toml
-        - cargo build
-        - cargo test
-        - cargo test --no-default-features
-        - cargo test --no-default-features --features 'libunwind'
-        - cargo test --no-default-features --features 'libunwind dladdr'
-        - cargo test --no-default-features --features 'libunwind libbacktrace'
-        - cargo test --no-default-features --features 'unix-backtrace'
-        - cargo test --no-default-features --features 'unix-backtrace dladdr'
-        - cargo test --no-default-features --features 'unix-backtrace libbacktrace'
-        - cargo test --no-default-features --features 'serialize-serde'
-        - cargo test --no-default-features --features 'serialize-rustc'
-        - cargo test --no-default-features --features 'serialize-rustc serialize-serde'
-        - cargo test --no-default-features --features 'cpp_demangle'
-        - cargo test --no-default-features --features 'gimli-symbolize'
-        - cd ./cpp_smoke_test && cargo test && cd ..
-        - cargo clean && cargo build
-
-    # Test everything on OSX as well as beta/nightly
-    - os: osx
-      script: *test_all
-    - rust: beta
-      script: *test_all
-    - rust: nightly
-      script: *test_all
-
-    # Upload docs on nightly
-    - rust: nightly
-      script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-        - cargo doc --no-deps --all-features
-      after_success:
-        - travis-cargo doc-upload
-
-    # Cross-compile tests, not as comprehensive as above but gets us breadth of
-    # targets
-    - env: TARGET=aarch64-unknown-linux-gnu
-    - env: TARGET=arm-unknown-linux-gnueabihf
-    - env: TARGET=armv7-unknown-linux-gnueabihf
-    - env: TARGET=i586-unknown-linux-gnu
-    - env: TARGET=i686-unknown-linux-gnu
-    - env: TARGET=powerpc64-unknown-linux-gnu
-    - env: TARGET=powerpc-unknown-linux-gnu
-    - env: TARGET=x86_64-pc-windows-gnu
-    - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-    - env: TARGET=x86_64-unknown-linux-musl
-
-    # Cross compile Android targets from linux
-    - env: TARGET=arm-linux-androideabi
-    - env: TARGET=armv7-linux-androideabi
-    - env: TARGET=aarch64-linux-android
-    - env: TARGET=i686-linux-android
-    - env: TARGET=x86_64-linux-android
-
-    # Build iOS targets from OSX
-    - env: TARGET=aarch64-apple-ios SDK=iphoneos
-      os: osx
-      script: &ios-build
-        - rustup target add $TARGET
-        - export SDK_PATH=`xcrun --show-sdk-path --sdk $SDK`
-        - export RUSTFLAGS="-C link-arg=-isysroot -C link-arg=$SDK_PATH"
-        - cargo test --no-run --target $TARGET
-    - env: TARGET=armv7-apple-ios SDK=iphoneos
-      os: osx
-      script: *ios-build
-    - env: TARGET=armv7s-apple-ios SDK=iphoneos
-      os: osx
-      script: *ios-build
-    - env: TARGET=i386-apple-ios SDK=iphonesimulator
-      os: osx
-      script: *ios-build
-    - env: TARGET=x86_64-apple-ios SDK=iphonesimulator
-      os: osx
-      script: *ios-build
-
-# docker cross-compilation targets
-script:
-  - if [ "$NO_ADD" == "" ]; then rustup target add $TARGET; fi
-  - cargo generate-lockfile
-  - ci/run-docker.sh $TARGET
-
-notifications:
-  email:
-    on_success: never
-
-env:
-  global:
-    # serde-codegen has historically needed a large stack to expand
-    - RUST_MIN_STACK=16777216
-    - secure: "Kuf3j6gC3MhR+F7g8/5J4+3tu+FXJP/SqKjsUVVjs/qjniIVX3MwZPhtP/pVtdRvYjW0NzLw5Nufb4o1cyY4uKwR8BHHNuEUE/h3mPShjWHqzLyn5QiBumPozsFCa32H4gconRmp3+s0YrBT7nLoGvUZZS0dkldMkpvvrPL/yUKXLS8HEP4L1GO5iMQQYG6i3sbWTbHikE6ZQogW/iZommyqUkVB/s/SQvdH9SXu89ttNXlm/F+EIsgsgyzpbULp5sD34GRDPJe+H1m+sgA1kTRrzmuBGNmz9mx6GyIKaqACTm1gRcb06nFjTPVTQioJBNnoV7TEqZCvjuSsUjcGmP4Aeissafo93ADzV+bd0uoWIScE9ltSVS+RgCDV+sd0GHz5U6FjhgZp0amaVl3d6hPp8lbTfK/gfj1i9ktQfKZbG7rB4tfIU1KeQRkyE9vb/TaKp8nwBbc4SVQ4EKFOlRbE1S1FooaKZweW8w57d2u+sMMMVJbO28/Ap8tk9xDSOl4shPaT0iM0U9/heF8FmCZB1OKXLKn6TAaNFnaMTvdTHl+Tjrf6Vzd/oPXJ7GuaB6eLxXYjXvZHuKiLkSZriOzhL7PbijNILbSgZt7+Fa0vcnXP8zgD4dmupx/CoIHLN9NP4o9cGXuBcaJ/iFryJ4i5LKGFNEUHtXkavDrcgcA="
diff -Nru cargo-0.32.0/vendor/backtrace-sys/build.rs cargo-0.33.0/vendor/backtrace-sys/build.rs
--- cargo-0.32.0/vendor/backtrace-sys/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,94 +1,10 @@
-extern crate cc;
-
-use std::env;
-use std::path::PathBuf;
-use std::fs::File;
+use std::process::Command;
 
 fn main() {
-    let target = env::var("TARGET").unwrap();
-
-    // libbacktrace isn't used on windows
-    if target.contains("windows") {
-        return
-    }
-
-    // no way this will ever compile for emscripten
-    if target.contains("emscripten") {
-        return
-    }
-
-    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-
-    let mut build = cc::Build::new();
-    build
-        .include("src/libbacktrace")
-        .include(&out_dir)
-        .warnings(false)
-        .file("src/libbacktrace/alloc.c")
-        .file("src/libbacktrace/dwarf.c")
-        .file("src/libbacktrace/fileline.c")
-        .file("src/libbacktrace/posix.c")
-        .file("src/libbacktrace/read.c")
-        .file("src/libbacktrace/sort.c")
-        .file("src/libbacktrace/state.c");
-
-    if target.contains("darwin") {
-        build.file("src/libbacktrace/macho.c");
-    } else if target.contains("windows") {
-        build.file("src/libbacktrace/pecoff.c");
-    } else {
-        build.flag("-fvisibility=hidden");
-        build.file("src/libbacktrace/elf.c");
-
-        let pointer_width = env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap();
-        if pointer_width == "64" {
-            build.define("BACKTRACE_ELF_SIZE", "64");
-        } else {
-            build.define("BACKTRACE_ELF_SIZE", "32");
-        }
-    }
-
-    File::create(out_dir.join("backtrace-supported.h")).unwrap();
-    build.define("BACKTRACE_SUPPORTED", "1");
-    build.define("BACKTRACE_USES_MALLOC", "1");
-    build.define("BACKTRACE_SUPPORTS_THREADS", "0");
-    build.define("BACKTRACE_SUPPORTS_DATA", "0");
-
-    File::create(out_dir.join("config.h")).unwrap();
-    if !target.contains("apple-ios") &&
-       !target.contains("solaris") &&
-       !target.contains("redox") &&
-       !target.contains("android") &&
-       !target.contains("haiku") {
-        build.define("HAVE_DL_ITERATE_PHDR", "1");
-    }
-    build.define("_GNU_SOURCE", "1");
-    build.define("_LARGE_FILES", "1");
-
-    let syms = [
-        "backtrace_full",
-        "backtrace_dwarf_add",
-        "backtrace_initialize",
-        "backtrace_pcinfo",
-        "backtrace_syminfo",
-        "backtrace_get_view",
-        "backtrace_release_view",
-        "backtrace_alloc",
-        "backtrace_free",
-        "backtrace_vector_finish",
-        "backtrace_vector_grow",
-        "backtrace_vector_release",
-        "backtrace_close",
-        "backtrace_open",
-        "backtrace_print",
-        "backtrace_simple",
-        "backtrace_qsort",
-        "backtrace_create_state",
-        "backtrace_uncompress_zdebug",
-    ];
-    for sym in syms.iter() {
-        build.define(sym, &format!("__rbt_{}", sym)[..]);
-    }
-
-    build.compile("backtrace");
+    let search_dir = Command::new("sh")
+        .args(&["-c", "gcc -print-search-dirs | sed -ne 's/^install: //p'"])
+        .output().expect("failed to find gcc install dir").stdout;
+    println!("cargo:rustc-link-lib=static=backtrace");
+    println!("cargo:rustc-link-search=native={}", String::from_utf8(search_dir).unwrap().trim_right());
+    println!("dh-cargo:deb-built-using=backtrace=0~={}", "libgcc-[0-9]+-dev .*");
 }
diff -Nru cargo-0.32.0/vendor/backtrace-sys/build.rs.orig cargo-0.33.0/vendor/backtrace-sys/build.rs.orig
--- cargo-0.32.0/vendor/backtrace-sys/build.rs.orig	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/build.rs.orig	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,108 @@
+extern crate cc;
+
+use std::env;
+use std::path::PathBuf;
+use std::fs::File;
+
+fn main() {
+    let target = env::var("TARGET").unwrap();
+
+    if target.contains("msvc") || // libbacktrace isn't used on MSVC windows
+        target.contains("emscripten") || // no way this will ever compile for emscripten
+        target.contains("cloudabi") ||
+        target.contains("wasm32")
+    {
+        println!("cargo:rustc-cfg=empty");
+        return
+    }
+
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+
+    let mut build = cc::Build::new();
+    build
+        .include("src/libbacktrace")
+        .include(&out_dir)
+        .warnings(false)
+        .file("src/libbacktrace/alloc.c")
+        .file("src/libbacktrace/dwarf.c")
+        .file("src/libbacktrace/fileline.c")
+        .file("src/libbacktrace/posix.c")
+        .file("src/libbacktrace/read.c")
+        .file("src/libbacktrace/sort.c")
+        .file("src/libbacktrace/state.c");
+
+    // No need to have any symbols reexported form shared objects
+    build.flag("-fvisibility=hidden");
+
+    if target.contains("darwin") {
+        build.file("src/libbacktrace/macho.c");
+    } else if target.contains("windows") {
+        build.file("src/libbacktrace/pecoff.c");
+    } else {
+        build.file("src/libbacktrace/elf.c");
+
+        let pointer_width = env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap();
+        if pointer_width == "64" {
+            build.define("BACKTRACE_ELF_SIZE", "64");
+        } else {
+            build.define("BACKTRACE_ELF_SIZE", "32");
+        }
+    }
+
+    File::create(out_dir.join("backtrace-supported.h")).unwrap();
+    build.define("BACKTRACE_SUPPORTED", "1");
+    build.define("BACKTRACE_USES_MALLOC", "1");
+    build.define("BACKTRACE_SUPPORTS_THREADS", "0");
+    build.define("BACKTRACE_SUPPORTS_DATA", "0");
+
+    File::create(out_dir.join("config.h")).unwrap();
+    if !target.contains("apple-ios") &&
+       !target.contains("solaris") &&
+       !target.contains("redox") &&
+       !target.contains("android") &&
+       !target.contains("haiku") {
+        build.define("HAVE_DL_ITERATE_PHDR", "1");
+    }
+    build.define("_GNU_SOURCE", "1");
+    build.define("_LARGE_FILES", "1");
+
+    // When we're built as part of the Rust compiler, this is used to enable
+    // debug information in libbacktrace itself.
+    let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or_default() == "true" ||
+        env::var("RUSTC_DEBUGINFO_LINES").unwrap_or_default() == "true";
+    build.debug(any_debug);
+
+    let syms = [
+        "backtrace_full",
+        "backtrace_dwarf_add",
+        "backtrace_initialize",
+        "backtrace_pcinfo",
+        "backtrace_syminfo",
+        "backtrace_get_view",
+        "backtrace_release_view",
+        "backtrace_alloc",
+        "backtrace_free",
+        "backtrace_vector_finish",
+        "backtrace_vector_grow",
+        "backtrace_vector_release",
+        "backtrace_close",
+        "backtrace_open",
+        "backtrace_print",
+        "backtrace_simple",
+        "backtrace_qsort",
+        "backtrace_create_state",
+        "backtrace_uncompress_zdebug",
+    ];
+    let prefix = if cfg!(feature = "rustc-dep-of-std") {
+        println!("cargo:rustc-cfg=rdos");
+        "__rdos_"
+    } else {
+        println!("cargo:rustc-cfg=rbt");
+        "__rbt_"
+    };
+    for sym in syms.iter() {
+        build.define(sym, &format!("{}{}", prefix, sym)[..]);
+    }
+
+    build.compile("backtrace");
+}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/.cargo-checksum.json cargo-0.33.0/vendor/backtrace-sys/.cargo-checksum.json
--- cargo-0.32.0/vendor/backtrace-sys/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"}
\ No newline at end of file
+{"files":{},"package":"797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/backtrace-sys/Cargo.toml cargo-0.33.0/vendor/backtrace-sys/Cargo.toml
--- cargo-0.32.0/vendor/backtrace-sys/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "backtrace-sys"
-version = "0.1.24"
+version = "0.1.28"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 build = "build.rs"
 description = "Bindings to the libbacktrace gcc library\n"
@@ -22,5 +22,4 @@
 repository = "https://github.com/alexcrichton/backtrace-rs"
 [dependencies.libc]
 version = "0.2"
-[build-dependencies.cc]
-version = "1.0"
+default-features = false
diff -Nru cargo-0.32.0/vendor/backtrace-sys/debian/patches/remove-unneeded-dep.patch cargo-0.33.0/vendor/backtrace-sys/debian/patches/remove-unneeded-dep.patch
--- cargo-0.32.0/vendor/backtrace-sys/debian/patches/remove-unneeded-dep.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/debian/patches/remove-unneeded-dep.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,22 @@
+From ac340f78a08a9a54090fdd1c9b53ddb88794d181 Mon Sep 17 00:00:00 2001
+From: Wolfgang Silbermayr <wolfgang@silbermayr.at>
+Date: Fri, 11 Jan 2019 09:45:24 +0100
+Subject: [PATCH] Remove unneeded dep
+
+---
+ Cargo.toml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index f47ab6d..85ca93e 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -23,5 +23,3 @@ repository = "https://github.com/alexcrichton/backtrace-rs"
+ [dependencies.libc]
+ version = "0.2"
+ default-features = false
+-[build-dependencies.cc]
+-version = "1.0"
+-- 
+2.20.1
+
diff -Nru cargo-0.32.0/vendor/backtrace-sys/debian/patches/series cargo-0.33.0/vendor/backtrace-sys/debian/patches/series
--- cargo-0.32.0/vendor/backtrace-sys/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+remove-unneeded-dep.patch
diff -Nru cargo-0.32.0/vendor/backtrace-sys/.pc/applied-patches cargo-0.33.0/vendor/backtrace-sys/.pc/applied-patches
--- cargo-0.32.0/vendor/backtrace-sys/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+remove-unneeded-dep.patch
diff -Nru cargo-0.32.0/vendor/backtrace-sys/.pc/.quilt_patches cargo-0.33.0/vendor/backtrace-sys/.pc/.quilt_patches
--- cargo-0.32.0/vendor/backtrace-sys/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/.pc/.quilt_patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+debian/patches
diff -Nru cargo-0.32.0/vendor/backtrace-sys/.pc/.quilt_series cargo-0.33.0/vendor/backtrace-sys/.pc/.quilt_series
--- cargo-0.32.0/vendor/backtrace-sys/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/.pc/.quilt_series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+series
diff -Nru cargo-0.32.0/vendor/backtrace-sys/.pc/remove-unneeded-dep.patch/Cargo.toml cargo-0.33.0/vendor/backtrace-sys/.pc/remove-unneeded-dep.patch/Cargo.toml
--- cargo-0.32.0/vendor/backtrace-sys/.pc/remove-unneeded-dep.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/.pc/remove-unneeded-dep.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,27 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "backtrace-sys"
+version = "0.1.28"
+authors = ["Alex Crichton <alex@alexcrichton.com>"]
+build = "build.rs"
+description = "Bindings to the libbacktrace gcc library\n"
+homepage = "https://github.com/alexcrichton/backtrace-rs"
+documentation = "http://alexcrichton.com/backtrace-rs"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/alexcrichton/backtrace-rs"
+[dependencies.libc]
+version = "0.2"
+default-features = false
+[build-dependencies.cc]
+version = "1.0"
diff -Nru cargo-0.32.0/vendor/backtrace-sys/.pc/.version cargo-0.33.0/vendor/backtrace-sys/.pc/.version
--- cargo-0.32.0/vendor/backtrace-sys/.pc/.version	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/.pc/.version	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+2
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/acinclude.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/acinclude.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/acinclude.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/acinclude.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-dnl
-dnl Check whether _Unwind_GetIPInfo is available without doing a link
-dnl test so we can use this with libstdc++-v3 and libjava.  Need to
-dnl use $target to set defaults because automatic checking is not possible
-dnl without a link test (and maybe even with a link test).
-dnl
-
-AC_DEFUN([GCC_CHECK_UNWIND_GETIPINFO], [
-  AC_ARG_WITH(system-libunwind,
-  [  --with-system-libunwind use installed libunwind])
-  # If system-libunwind was not specifically set, pick a default setting.
-  if test x$with_system_libunwind = x; then
-    case ${target} in
-      ia64-*-hpux*) with_system_libunwind=yes ;;
-      *) with_system_libunwind=no ;;
-    esac
-  fi
-  # Based on system-libunwind and target, do we have ipinfo?
-  if  test x$with_system_libunwind = xyes; then
-    case ${target} in
-      ia64-*-*) have_unwind_getipinfo=no ;;
-      *) have_unwind_getipinfo=yes ;;
-    esac
-  else
-    # Darwin before version 9 does not have _Unwind_GetIPInfo.
-    changequote(,)
-    case ${target} in
-      *-*-darwin[3-8]|*-*-darwin[3-8].*) have_unwind_getipinfo=no ;;
-      *) have_unwind_getipinfo=yes ;;
-    esac
-    changequote([,])
-  fi
-
-  if test x$have_unwind_getipinfo = xyes; then
-    AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.])
-  fi
-])
-
-# ACX_PROG_CC_WARNING_OPTS(WARNINGS, [VARIABLE = WARN_CFLAGS])
-#   Sets @VARIABLE@ to the subset of the given options which the
-#   compiler accepts.
-AC_DEFUN([ACX_PROG_CC_WARNING_OPTS],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_LANG_PUSH(C)
-m4_pushdef([acx_Var], [m4_default([$2], [WARN_CFLAGS])])dnl
-AC_SUBST(acx_Var)dnl
-m4_expand_once([acx_Var=
-],m4_quote(acx_Var=))dnl
-save_CFLAGS="$CFLAGS"
-for real_option in $1; do
-  # Do the check with the no- prefix removed since gcc silently
-  # accepts any -Wno-* option on purpose
-  case $real_option in
-    -Wno-*) option=-W`expr x$real_option : 'x-Wno-\(.*\)'` ;;
-    *) option=$real_option ;;
-  esac
-  AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option])
-  AC_CACHE_CHECK([whether $CC supports $option], acx_Woption,
-    [CFLAGS="$option"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_VAR_SET(acx_Woption, yes)],
-      [AS_VAR_SET(acx_Woption, no)])
-  ])
-  AS_IF([test AS_VAR_GET(acx_Woption) = yes],
-        [acx_Var="$acx_Var${acx_Var:+ }$real_option"])
-  AS_VAR_POPDEF([acx_Woption])dnl
-done
-CFLAGS="$save_CFLAGS"
-m4_popdef([acx_Var])dnl
-AC_LANG_POP(C)
-])# ACX_PROG_CC_WARNING_OPTS
-
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/aclocal.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/aclocal.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/aclocal.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/aclocal.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,767 +0,0 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2012
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR])
-# ---------------------------------------------------
-# Add --enable-multilib to configure.
-AC_DEFUN([AM_ENABLE_MULTILIB],
-[m4_warn([obsolete], [$0 will be removed from Automake core soon.
-Files implementing the "multilib" feature are (and will remain) available
-to the 'contrib/' directory in the Automake distribution.])]dnl
-[# Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib       build many library versions (default)],
-[case "$enableval" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR([bad value $enableval for multilib option]) ;;
- esac],
-	      [multilib=yes])
-
-# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
-# See config-ml.in if you want the gory details.
-
-if test "$srcdir" = "."; then
-  if test "$with_target_subdir" != "."; then
-    multi_basedir="$srcdir/$with_multisrctop../$2"
-  else
-    multi_basedir="$srcdir/$with_multisrctop$2"
-  fi
-else
-  multi_basedir="$srcdir/$2"
-fi
-AC_SUBST(multi_basedir)
-
-# Even if the default multilib is not a cross compilation,
-# it may be that some of the other multilibs are.
-if test $cross_compiling = no && test $multilib = yes \
-   && test "x${with_multisubdir}" != x ; then
-   cross_compiling=maybe
-fi
-
-AC_OUTPUT_COMMANDS([
-# Only add multilib support code if we just rebuilt the top-level
-# Makefile.
-case " $CONFIG_FILES " in
- *" ]m4_default([$1],Makefile)[ "*)
-   ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in
-   ;;
-esac],
-		   [
-srcdir="$srcdir"
-host="$host"
-target="$target"
-with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
-with_target_subdir="$with_target_subdir"
-ac_configure_args="${multilib_arg} ${ac_configure_args}"
-multi_basedir="$multi_basedir"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="$CC"])])dnl
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([config/libtool.m4])
-m4_include([config/ltoptions.m4])
-m4_include([config/ltsugar.m4])
-m4_include([config/ltversion.m4])
-m4_include([config/lt~obsolete.m4])
-m4_include([acinclude.m4])
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/alloc.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/alloc.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/alloc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/alloc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/* alloc.c -- Memory allocation without mmap.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* Allocation routines to use on systems that do not support anonymous
-   mmap.  This implementation just uses malloc, which means that the
-   backtrace functions may not be safely invoked from a signal
-   handler.  */
-
-/* Allocate memory like malloc.  If ERROR_CALLBACK is NULL, don't
-   report an error.  */
-
-void *
-backtrace_alloc (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		 size_t size, backtrace_error_callback error_callback,
-		 void *data)
-{
-  void *ret;
-
-  ret = malloc (size);
-  if (ret == NULL)
-    {
-      if (error_callback)
-	error_callback (data, "malloc", errno);
-    }
-  return ret;
-}
-
-/* Free memory.  */
-
-void
-backtrace_free (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		void *p, size_t size ATTRIBUTE_UNUSED,
-		backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-		void *data ATTRIBUTE_UNUSED)
-{
-  free (p);
-}
-
-/* Grow VEC by SIZE bytes.  */
-
-void *
-backtrace_vector_grow (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		       size_t size, backtrace_error_callback error_callback,
-		       void *data, struct backtrace_vector *vec)
-{
-  void *ret;
-
-  if (size > vec->alc)
-    {
-      size_t alc;
-      void *base;
-
-      if (vec->size == 0)
-	alc = 32 * size;
-      else if (vec->size >= 4096)
-	alc = vec->size + 4096;
-      else
-	alc = 2 * vec->size;
-
-      if (alc < vec->size + size)
-	alc = vec->size + size;
-
-      base = realloc (vec->base, alc);
-      if (base == NULL)
-	{
-	  error_callback (data, "realloc", errno);
-	  return NULL;
-	}
-
-      vec->base = base;
-      vec->alc = alc - vec->size;
-    }
-
-  ret = (char *) vec->base + vec->size;
-  vec->size += size;
-  vec->alc -= size;
-  return ret;
-}
-
-/* Finish the current allocation on VEC.  */
-
-void *
-backtrace_vector_finish (struct backtrace_state *state,
-			 struct backtrace_vector *vec,
-			 backtrace_error_callback error_callback,
-			 void *data)
-{
-  void *ret;
-
-  /* With this allocator we call realloc in backtrace_vector_grow,
-     which means we can't easily reuse the memory here.  So just
-     release it.  */
-  if (!backtrace_vector_release (state, vec, error_callback, data))
-    return NULL;
-  ret = vec->base;
-  vec->base = NULL;
-  vec->size = 0;
-  vec->alc = 0;
-  return ret;
-}
-
-/* Release any extra space allocated for VEC.  */
-
-int
-backtrace_vector_release (struct backtrace_state *state ATTRIBUTE_UNUSED,
-			  struct backtrace_vector *vec,
-			  backtrace_error_callback error_callback,
-			  void *data)
-{
-  vec->base = realloc (vec->base, vec->size);
-  if (vec->base == NULL)
-    {
-      error_callback (data, "realloc", errno);
-      return 0;
-    }
-  vec->alc = 0;
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/atomic.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/atomic.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/atomic.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/atomic.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/* atomic.c -- Support for atomic functions if not present.
-   Copyright (C) 2013-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "backtrace-supported.h"
-#include "internal.h"
-
-/* This file holds implementations of the atomic functions that are
-   used if the host compiler has the sync functions but not the atomic
-   functions, as is true of versions of GCC before 4.7.  */
-
-#if !defined (HAVE_ATOMIC_FUNCTIONS) && defined (HAVE_SYNC_FUNCTIONS)
-
-/* Do an atomic load of a pointer.  */
-
-void *
-backtrace_atomic_load_pointer (void *arg)
-{
-  void **pp;
-  void *p;
-
-  pp = (void **) arg;
-  p = *pp;
-  while (!__sync_bool_compare_and_swap (pp, p, p))
-    p = *pp;
-  return p;
-}
-
-/* Do an atomic load of an int.  */
-
-int
-backtrace_atomic_load_int (int *p)
-{
-  int i;
-
-  i = *p;
-  while (!__sync_bool_compare_and_swap (p, i, i))
-    i = *p;
-  return i;
-}
-
-/* Do an atomic store of a pointer.  */
-
-void
-backtrace_atomic_store_pointer (void *arg, void *p)
-{
-  void **pp;
-  void *old;
-
-  pp = (void **) arg;
-  old = *pp;
-  while (!__sync_bool_compare_and_swap (pp, old, p))
-    old = *pp;
-}
-
-/* Do an atomic store of a size_t value.  */
-
-void
-backtrace_atomic_store_size_t (size_t *p, size_t v)
-{
-  size_t old;
-
-  old = *p;
-  while (!__sync_bool_compare_and_swap (p, old, v))
-    old = *p;
-}
-
-/* Do an atomic store of a int value.  */
-
-void
-backtrace_atomic_store_int (int *p, int v)
-{
-  size_t old;
-
-  old = *p;
-  while (!__sync_bool_compare_and_swap (p, old, v))
-    old = *p;
-}
-
-#endif
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/backtrace.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/backtrace.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/backtrace.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/backtrace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/* backtrace.c -- Entry point for stack backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <sys/types.h>
-
-#include "unwind.h"
-#include "backtrace.h"
-#include "internal.h"
-
-/* The main backtrace_full routine.  */
-
-/* Data passed through _Unwind_Backtrace.  */
-
-struct backtrace_data
-{
-  /* Number of frames to skip.  */
-  int skip;
-  /* Library state.  */
-  struct backtrace_state *state;
-  /* Callback routine.  */
-  backtrace_full_callback callback;
-  /* Error callback routine.  */
-  backtrace_error_callback error_callback;
-  /* Data to pass to callback routines.  */
-  void *data;
-  /* Value to return from backtrace_full.  */
-  int ret;
-  /* Whether there is any memory available.  */
-  int can_alloc;
-};
-
-/* Unwind library callback routine.  This is passed to
-   _Unwind_Backtrace.  */
-
-static _Unwind_Reason_Code
-unwind (struct _Unwind_Context *context, void *vdata)
-{
-  struct backtrace_data *bdata = (struct backtrace_data *) vdata;
-  uintptr_t pc;
-  int ip_before_insn = 0;
-
-#ifdef HAVE_GETIPINFO
-  pc = _Unwind_GetIPInfo (context, &ip_before_insn);
-#else
-  pc = _Unwind_GetIP (context);
-#endif
-
-  if (bdata->skip > 0)
-    {
-      --bdata->skip;
-      return _URC_NO_REASON;
-    }
-
-  if (!ip_before_insn)
-    --pc;
-
-  if (!bdata->can_alloc)
-    bdata->ret = bdata->callback (bdata->data, pc, NULL, 0, NULL);
-  else
-    bdata->ret = backtrace_pcinfo (bdata->state, pc, bdata->callback,
-				   bdata->error_callback, bdata->data);
-  if (bdata->ret != 0)
-    return _URC_END_OF_STACK;
-
-  return _URC_NO_REASON;
-}
-
-/* Get a stack backtrace.  */
-
-int
-backtrace_full (struct backtrace_state *state, int skip,
-		backtrace_full_callback callback,
-		backtrace_error_callback error_callback, void *data)
-{
-  struct backtrace_data bdata;
-  void *p;
-
-  bdata.skip = skip + 1;
-  bdata.state = state;
-  bdata.callback = callback;
-  bdata.error_callback = error_callback;
-  bdata.data = data;
-  bdata.ret = 0;
-
-  /* If we can't allocate any memory at all, don't try to produce
-     file/line information.  */
-  p = backtrace_alloc (state, 4096, NULL, NULL);
-  if (p == NULL)
-    bdata.can_alloc = 0;
-  else
-    {
-      backtrace_free (state, p, 4096, NULL, NULL);
-      bdata.can_alloc = 1;
-    }
-
-  _Unwind_Backtrace (unwind, &bdata);
-  return bdata.ret;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/backtrace.h cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/backtrace.h
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/backtrace.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/backtrace.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-/* backtrace.h -- Public header file for stack backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifndef BACKTRACE_H
-#define BACKTRACE_H
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The backtrace state.  This struct is intentionally not defined in
-   the public interface.  */
-
-struct backtrace_state;
-
-/* The type of the error callback argument to backtrace functions.
-   This function, if not NULL, will be called for certain error cases.
-   The DATA argument is passed to the function that calls this one.
-   The MSG argument is an error message.  The ERRNUM argument, if
-   greater than 0, holds an errno value.  The MSG buffer may become
-   invalid after this function returns.
-
-   As a special case, the ERRNUM argument will be passed as -1 if no
-   debug info can be found for the executable, but the function
-   requires debug info (e.g., backtrace_full, backtrace_pcinfo).  The
-   MSG in this case will be something along the lines of "no debug
-   info".  Similarly, ERRNUM will be passed as -1 if there is no
-   symbol table, but the function requires a symbol table (e.g.,
-   backtrace_syminfo).  This may be used as a signal that some other
-   approach should be tried.  */
-
-typedef void (*backtrace_error_callback) (void *data, const char *msg,
-					  int errnum);
-
-/* Create state information for the backtrace routines.  This must be
-   called before any of the other routines, and its return value must
-   be passed to all of the other routines.  FILENAME is the path name
-   of the executable file; if it is NULL the library will try
-   system-specific path names.  If not NULL, FILENAME must point to a
-   permanent buffer.  If THREADED is non-zero the state may be
-   accessed by multiple threads simultaneously, and the library will
-   use appropriate atomic operations.  If THREADED is zero the state
-   may only be accessed by one thread at a time.  This returns a state
-   pointer on success, NULL on error.  If an error occurs, this will
-   call the ERROR_CALLBACK routine.  */
-
-extern struct backtrace_state *backtrace_create_state (
-    const char *filename, int threaded,
-    backtrace_error_callback error_callback, void *data);
-
-/* The type of the callback argument to the backtrace_full function.
-   DATA is the argument passed to backtrace_full.  PC is the program
-   counter.  FILENAME is the name of the file containing PC, or NULL
-   if not available.  LINENO is the line number in FILENAME containing
-   PC, or 0 if not available.  FUNCTION is the name of the function
-   containing PC, or NULL if not available.  This should return 0 to
-   continuing tracing.  The FILENAME and FUNCTION buffers may become
-   invalid after this function returns.  */
-
-typedef int (*backtrace_full_callback) (void *data, uintptr_t pc,
-					const char *filename, int lineno,
-					const char *function);
-
-/* Get a full stack backtrace.  SKIP is the number of frames to skip;
-   passing 0 will start the trace with the function calling
-   backtrace_full.  DATA is passed to the callback routine.  If any
-   call to CALLBACK returns a non-zero value, the stack backtrace
-   stops, and backtrace returns that value; this may be used to limit
-   the number of stack frames desired.  If all calls to CALLBACK
-   return 0, backtrace returns 0.  The backtrace_full function will
-   make at least one call to either CALLBACK or ERROR_CALLBACK.  This
-   function requires debug info for the executable.  */
-
-extern int backtrace_full (struct backtrace_state *state, int skip,
-			   backtrace_full_callback callback,
-			   backtrace_error_callback error_callback,
-			   void *data);
-
-/* The type of the callback argument to the backtrace_simple function.
-   DATA is the argument passed to simple_backtrace.  PC is the program
-   counter.  This should return 0 to continue tracing.  */
-
-typedef int (*backtrace_simple_callback) (void *data, uintptr_t pc);
-
-/* Get a simple backtrace.  SKIP is the number of frames to skip, as
-   in backtrace.  DATA is passed to the callback routine.  If any call
-   to CALLBACK returns a non-zero value, the stack backtrace stops,
-   and backtrace_simple returns that value.  Otherwise
-   backtrace_simple returns 0.  The backtrace_simple function will
-   make at least one call to either CALLBACK or ERROR_CALLBACK.  This
-   function does not require any debug info for the executable.  */
-
-extern int backtrace_simple (struct backtrace_state *state, int skip,
-			     backtrace_simple_callback callback,
-			     backtrace_error_callback error_callback,
-			     void *data);
-
-/* Print the current backtrace in a user readable format to a FILE.
-   SKIP is the number of frames to skip, as in backtrace_full.  Any
-   error messages are printed to stderr.  This function requires debug
-   info for the executable.  */
-
-extern void backtrace_print (struct backtrace_state *state, int skip, FILE *);
-
-/* Given PC, a program counter in the current program, call the
-   callback function with filename, line number, and function name
-   information.  This will normally call the callback function exactly
-   once.  However, if the PC happens to describe an inlined call, and
-   the debugging information contains the necessary information, then
-   this may call the callback function multiple times.  This will make
-   at least one call to either CALLBACK or ERROR_CALLBACK.  This
-   returns the first non-zero value returned by CALLBACK, or 0.  */
-
-extern int backtrace_pcinfo (struct backtrace_state *state, uintptr_t pc,
-			     backtrace_full_callback callback,
-			     backtrace_error_callback error_callback,
-			     void *data);
-
-/* The type of the callback argument to backtrace_syminfo.  DATA and
-   PC are the arguments passed to backtrace_syminfo.  SYMNAME is the
-   name of the symbol for the corresponding code.  SYMVAL is the
-   value and SYMSIZE is the size of the symbol.  SYMNAME will be NULL
-   if no error occurred but the symbol could not be found.  */
-
-typedef void (*backtrace_syminfo_callback) (void *data, uintptr_t pc,
-					    const char *symname,
-					    uintptr_t symval,
-					    uintptr_t symsize);
-
-/* Given ADDR, an address or program counter in the current program,
-   call the callback information with the symbol name and value
-   describing the function or variable in which ADDR may be found.
-   This will call either CALLBACK or ERROR_CALLBACK exactly once.
-   This returns 1 on success, 0 on failure.  This function requires
-   the symbol table but does not require the debug info.  Note that if
-   the symbol table is present but ADDR could not be found in the
-   table, CALLBACK will be called with a NULL SYMNAME argument.
-   Returns 1 on success, 0 on error.  */
-
-extern int backtrace_syminfo (struct backtrace_state *state, uintptr_t addr,
-			      backtrace_syminfo_callback callback,
-			      backtrace_error_callback error_callback,
-			      void *data);
-
-#ifdef __cplusplus
-} /* End extern "C".  */
-#endif
-
-#endif
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/backtrace-supported.h.in cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/backtrace-supported.h.in
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/backtrace-supported.h.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/backtrace-supported.h.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/* backtrace-supported.h.in -- Whether stack backtrace is supported.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-/* The file backtrace-supported.h.in is used by configure to generate
-   the file backtrace-supported.h.  The file backtrace-supported.h may
-   be #include'd to see whether the backtrace library will be able to
-   get a backtrace and produce symbolic information.  */
-
-
-/* BACKTRACE_SUPPORTED will be #define'd as 1 if the backtrace library
-   should work, 0 if it will not.  Libraries may #include this to make
-   other arrangements.  */
-
-#define BACKTRACE_SUPPORTED @BACKTRACE_SUPPORTED@
-
-/* BACKTRACE_USES_MALLOC will be #define'd as 1 if the backtrace
-   library will call malloc as it works, 0 if it will call mmap
-   instead.  This may be used to determine whether it is safe to call
-   the backtrace functions from a signal handler.  In general this
-   only applies to calls like backtrace and backtrace_pcinfo.  It does
-   not apply to backtrace_simple, which never calls malloc.  It does
-   not apply to backtrace_print, which always calls fprintf and
-   therefore malloc.  */
-
-#define BACKTRACE_USES_MALLOC @BACKTRACE_USES_MALLOC@
-
-/* BACKTRACE_SUPPORTS_THREADS will be #define'd as 1 if the backtrace
-   library is configured with threading support, 0 if not.  If this is
-   0, the threaded parameter to backtrace_create_state must be passed
-   as 0.  */
-
-#define BACKTRACE_SUPPORTS_THREADS @BACKTRACE_SUPPORTS_THREADS@
-
-/* BACKTRACE_SUPPORTS_DATA will be #defined'd as 1 if the backtrace_syminfo
-   will work for variables.  It will always work for functions.  */
-
-#define BACKTRACE_SUPPORTS_DATA @BACKTRACE_SUPPORTS_DATA@
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/btest.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/btest.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/btest.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/btest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,500 +0,0 @@
-/* btest.c -- Test for libbacktrace library
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-/* This program tests the externally visible interfaces of the
-   libbacktrace library.  */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "filenames.h"
-
-#include "backtrace.h"
-#include "backtrace-supported.h"
-
-#include "testlib.h"
-
-/* Test the backtrace function with non-inlined functions.  */
-
-static int test1 (void) __attribute__ ((noinline, unused));
-static int f2 (int) __attribute__ ((noinline));
-static int f3 (int, int) __attribute__ ((noinline));
-
-static int
-test1 (void)
-{
-  /* Returning a value here and elsewhere avoids a tailcall which
-     would mess up the backtrace.  */
-  return f2 (__LINE__) + 1;
-}
-
-static int
-f2 (int f1line)
-{
-  return f3 (f1line, __LINE__) + 2;
-}
-
-static int
-f3 (int f1line, int f2line)
-{
-  struct info all[20];
-  struct bdata data;
-  int f3line;
-  int i;
-
-  data.all = &all[0];
-  data.index = 0;
-  data.max = 20;
-  data.failed = 0;
-
-  f3line = __LINE__ + 1;
-  i = backtrace_full (state, 0, callback_one, error_callback_one, &data);
-
-  if (i != 0)
-    {
-      fprintf (stderr, "test1: unexpected return value %d\n", i);
-      data.failed = 1;
-    }
-
-  if (data.index < 3)
-    {
-      fprintf (stderr,
-	       "test1: not enough frames; got %zu, expected at least 3\n",
-	       data.index);
-      data.failed = 1;
-    }
-
-  check ("test1", 0, all, f3line, "f3", "btest.c", &data.failed);
-  check ("test1", 1, all, f2line, "f2", "btest.c", &data.failed);
-  check ("test1", 2, all, f1line, "test1", "btest.c", &data.failed);
-
-  printf ("%s: backtrace_full noinline\n", data.failed ? "FAIL" : "PASS");
-
-  if (data.failed)
-    ++failures;
-
-  return failures;
-}
-
-/* Test the backtrace function with inlined functions.  */
-
-static inline int test2 (void) __attribute__ ((always_inline, unused));
-static inline int f12 (int) __attribute__ ((always_inline));
-static inline int f13 (int, int) __attribute__ ((always_inline));
-
-static inline int
-test2 (void)
-{
-  return f12 (__LINE__) + 1;
-}
-
-static inline int
-f12 (int f1line)
-{
-  return f13 (f1line, __LINE__) + 2;
-}
-
-static inline int
-f13 (int f1line, int f2line)
-{
-  struct info all[20];
-  struct bdata data;
-  int f3line;
-  int i;
-
-  data.all = &all[0];
-  data.index = 0;
-  data.max = 20;
-  data.failed = 0;
-
-  f3line = __LINE__ + 1;
-  i = backtrace_full (state, 0, callback_one, error_callback_one, &data);
-
-  if (i != 0)
-    {
-      fprintf (stderr, "test2: unexpected return value %d\n", i);
-      data.failed = 1;
-    }
-
-  check ("test2", 0, all, f3line, "f13", "btest.c", &data.failed);
-  check ("test2", 1, all, f2line, "f12", "btest.c", &data.failed);
-  check ("test2", 2, all, f1line, "test2", "btest.c", &data.failed);
-
-  printf ("%s: backtrace_full inline\n", data.failed ? "FAIL" : "PASS");
-
-  if (data.failed)
-    ++failures;
-
-  return failures;
-}
-
-/* Test the backtrace_simple function with non-inlined functions.  */
-
-static int test3 (void) __attribute__ ((noinline, unused));
-static int f22 (int) __attribute__ ((noinline));
-static int f23 (int, int) __attribute__ ((noinline));
-
-static int
-test3 (void)
-{
-  return f22 (__LINE__) + 1;
-}
-
-static int
-f22 (int f1line)
-{
-  return f23 (f1line, __LINE__) + 2;
-}
-
-static int
-f23 (int f1line, int f2line)
-{
-  uintptr_t addrs[20];
-  struct sdata data;
-  int f3line;
-  int i;
-
-  data.addrs = &addrs[0];
-  data.index = 0;
-  data.max = 20;
-  data.failed = 0;
-
-  f3line = __LINE__ + 1;
-  i = backtrace_simple (state, 0, callback_two, error_callback_two, &data);
-
-  if (i != 0)
-    {
-      fprintf (stderr, "test3: unexpected return value %d\n", i);
-      data.failed = 1;
-    }
-
-  if (!data.failed)
-    {
-      struct info all[20];
-      struct bdata bdata;
-      int j;
-
-      bdata.all = &all[0];
-      bdata.index = 0;
-      bdata.max = 20;
-      bdata.failed = 0;
-
-      for (j = 0; j < 3; ++j)
-	{
-	  i = backtrace_pcinfo (state, addrs[j], callback_one,
-				error_callback_one, &bdata);
-	  if (i != 0)
-	    {
-	      fprintf (stderr,
-		       ("test3: unexpected return value "
-			"from backtrace_pcinfo %d\n"),
-		       i);
-	      bdata.failed = 1;
-	    }
-	  if (!bdata.failed && bdata.index != (size_t) (j + 1))
-	    {
-	      fprintf (stderr,
-		       ("wrong number of calls from backtrace_pcinfo "
-			"got %u expected %d\n"),
-		       (unsigned int) bdata.index, j + 1);
-	      bdata.failed = 1;
-	    }
-	}
-
-      check ("test3", 0, all, f3line, "f23", "btest.c", &bdata.failed);
-      check ("test3", 1, all, f2line, "f22", "btest.c", &bdata.failed);
-      check ("test3", 2, all, f1line, "test3", "btest.c", &bdata.failed);
-
-      if (bdata.failed)
-	data.failed = 1;
-
-      for (j = 0; j < 3; ++j)
-	{
-	  struct symdata symdata;
-
-	  symdata.name = NULL;
-	  symdata.val = 0;
-	  symdata.size = 0;
-	  symdata.failed = 0;
-
-	  i = backtrace_syminfo (state, addrs[j], callback_three,
-				 error_callback_three, &symdata);
-	  if (i == 0)
-	    {
-	      fprintf (stderr,
-		       ("test3: [%d]: unexpected return value "
-			"from backtrace_syminfo %d\n"),
-		       j, i);
-	      symdata.failed = 1;
-	    }
-
-	  if (!symdata.failed)
-	    {
-	      const char *expected;
-
-	      switch (j)
-		{
-		case 0:
-		  expected = "f23";
-		  break;
-		case 1:
-		  expected = "f22";
-		  break;
-		case 2:
-		  expected = "test3";
-		  break;
-		default:
-		  assert (0);
-		}
-
-	      if (symdata.name == NULL)
-		{
-		  fprintf (stderr, "test3: [%d]: NULL syminfo name\n", j);
-		  symdata.failed = 1;
-		}
-	      /* Use strncmp, not strcmp, because GCC might create a
-		 clone.  */
-	      else if (strncmp (symdata.name, expected, strlen (expected))
-		       != 0)
-		{
-		  fprintf (stderr,
-			   ("test3: [%d]: unexpected syminfo name "
-			    "got %s expected %s\n"),
-			   j, symdata.name, expected);
-		  symdata.failed = 1;
-		}
-	    }
-
-	  if (symdata.failed)
-	    data.failed = 1;
-	}
-    }
-
-  printf ("%s: backtrace_simple noinline\n", data.failed ? "FAIL" : "PASS");
-
-  if (data.failed)
-    ++failures;
-
-  return failures;
-}
-
-/* Test the backtrace_simple function with inlined functions.  */
-
-static inline int test4 (void) __attribute__ ((always_inline, unused));
-static inline int f32 (int) __attribute__ ((always_inline));
-static inline int f33 (int, int) __attribute__ ((always_inline));
-
-static inline int
-test4 (void)
-{
-  return f32 (__LINE__) + 1;
-}
-
-static inline int
-f32 (int f1line)
-{
-  return f33 (f1line, __LINE__) + 2;
-}
-
-static inline int
-f33 (int f1line, int f2line)
-{
-  uintptr_t addrs[20];
-  struct sdata data;
-  int f3line;
-  int i;
-
-  data.addrs = &addrs[0];
-  data.index = 0;
-  data.max = 20;
-  data.failed = 0;
-
-  f3line = __LINE__ + 1;
-  i = backtrace_simple (state, 0, callback_two, error_callback_two, &data);
-
-  if (i != 0)
-    {
-      fprintf (stderr, "test3: unexpected return value %d\n", i);
-      data.failed = 1;
-    }
-
-  if (!data.failed)
-    {
-      struct info all[20];
-      struct bdata bdata;
-
-      bdata.all = &all[0];
-      bdata.index = 0;
-      bdata.max = 20;
-      bdata.failed = 0;
-
-      i = backtrace_pcinfo (state, addrs[0], callback_one, error_callback_one,
-			    &bdata);
-      if (i != 0)
-	{
-	  fprintf (stderr,
-		   ("test4: unexpected return value "
-		    "from backtrace_pcinfo %d\n"),
-		   i);
-	  bdata.failed = 1;
-	}
-
-      check ("test4", 0, all, f3line, "f33", "btest.c", &bdata.failed);
-      check ("test4", 1, all, f2line, "f32", "btest.c", &bdata.failed);
-      check ("test4", 2, all, f1line, "test4", "btest.c", &bdata.failed);
-
-      if (bdata.failed)
-	data.failed = 1;
-    }
-
-  printf ("%s: backtrace_simple inline\n", data.failed ? "FAIL" : "PASS");
-
-  if (data.failed)
-    ++failures;
-
-  return failures;
-}
-
-static int test5 (void) __attribute__ ((unused));
-
-int global = 1;
-
-static int
-test5 (void)
-{
-  struct symdata symdata;
-  int i;
-  uintptr_t addr = (uintptr_t) &global;
-
-  if (sizeof (global) > 1)
-    addr += 1;
-
-  symdata.name = NULL;
-  symdata.val = 0;
-  symdata.size = 0;
-  symdata.failed = 0;
-
-  i = backtrace_syminfo (state, addr, callback_three,
-			 error_callback_three, &symdata);
-  if (i == 0)
-    {
-      fprintf (stderr,
-	       "test5: unexpected return value from backtrace_syminfo %d\n",
-	       i);
-      symdata.failed = 1;
-    }
-
-  if (!symdata.failed)
-    {
-      if (symdata.name == NULL)
-	{
-	  fprintf (stderr, "test5: NULL syminfo name\n");
-	  symdata.failed = 1;
-	}
-      else if (strcmp (symdata.name, "global") != 0)
-	{
-	  fprintf (stderr,
-		   "test5: unexpected syminfo name got %s expected %s\n",
-		   symdata.name, "global");
-	  symdata.failed = 1;
-	}
-      else if (symdata.val != (uintptr_t) &global)
-	{
-	  fprintf (stderr,
-		   "test5: unexpected syminfo value got %lx expected %lx\n",
-		   (unsigned long) symdata.val,
-		   (unsigned long) (uintptr_t) &global);
-	  symdata.failed = 1;
-	}
-      else if (symdata.size != sizeof (global))
-	{
-	  fprintf (stderr,
-		   "test5: unexpected syminfo size got %lx expected %lx\n",
-		   (unsigned long) symdata.size,
-		   (unsigned long) sizeof (global));
-	  symdata.failed = 1;
-	}
-    }
-
-  printf ("%s: backtrace_syminfo variable\n",
-	  symdata.failed ? "FAIL" : "PASS");
-
-  if (symdata.failed)
-    ++failures;
-
-  return failures;
-}
-
-/* Check that are no files left open.  */
-
-static void
-check_open_files (void)
-{
-  int i;
-
-  for (i = 3; i < 10; i++)
-    {
-      if (close (i) == 0)
-	{
-	  fprintf (stderr,
-		   "ERROR: descriptor %d still open after tests complete\n",
-		   i);
-	  ++failures;
-	}
-    }
-}
-
-/* Run all the tests.  */
-
-int
-main (int argc ATTRIBUTE_UNUSED, char **argv)
-{
-  state = backtrace_create_state (argv[0], BACKTRACE_SUPPORTS_THREADS,
-				  error_callback_create, NULL);
-
-#if BACKTRACE_SUPPORTED
-  test1 ();
-  test2 ();
-  test3 ();
-  test4 ();
-#if BACKTRACE_SUPPORTS_DATA
-  test5 ();
-#endif
-#endif
-
-  check_open_files ();
-
-  exit (failures ? EXIT_FAILURE : EXIT_SUCCESS);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,7309 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_quote(m4_if([$2], [],
-		     m4_quote(lt_decl_tag_varnames),
-		  m4_quote(m4_shift($@)))),
-     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
-m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on 
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it? 
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  if test "$GCC" = "yes"; then
-    output_verbose_link_cmd=echo
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
- 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 will use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  xl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='echo'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=echo
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='echo'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${F77-"f77"}
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  CC=${FC-"f95"}
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
-    ;;
-  esac
-])
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/lt~obsolete.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/lt~obsolete.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/lt~obsolete.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/lt~obsolete.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 4 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/ltoptions.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/ltoptions.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/ltoptions.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/ltoptions.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,368 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/ltsugar.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/ltsugar.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/ltsugar.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/ltsugar.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-m4_define([lt_combine],
-[m4_if([$2], [], [],
-  [m4_if([$4], [], [],
-    [lt_join(m4_quote(m4_default([$1], [[, ]])),
-      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
-		   [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
-			       [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
-])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/ltversion.m4 cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/ltversion.m4
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config/ltversion.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config/ltversion.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 2976 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.4])
-m4_define([LT_PACKAGE_REVISION], [1.2976])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.4'
-macro_revision='1.2976'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config.guess cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config.guess
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config.guess	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config.guess	1970-01-01 00:00:00.000000000 +0000
@@ -1,1530 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-02-10'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config.h.in cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config.h.in
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config.h.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config.h.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* ELF size: 32 or 64 */
-#undef BACKTRACE_ELF_SIZE
-
-/* XCOFF size: 32 or 64 */
-#undef BACKTRACE_XCOFF_SIZE
-
-/* Define to 1 if you have the __atomic functions */
-#undef HAVE_ATOMIC_FUNCTIONS
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#undef HAVE_CLOCK_GETTIME
-
-/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRNLEN
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if dl_iterate_phdr is available. */
-#undef HAVE_DL_ITERATE_PHDR
-
-/* Define to 1 if you have the fcntl function */
-#undef HAVE_FCNTL
-
-/* Define if getexecname is available. */
-#undef HAVE_GETEXECNAME
-
-/* Define if _Unwind_GetIPInfo is available. */
-#undef HAVE_GETIPINFO
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <link.h> header file. */
-#undef HAVE_LINK_H
-
-/* Define if AIX loadquery is available. */
-#undef HAVE_LOADQUERY
-
-/* Define to 1 if you have the `lstat' function. */
-#undef HAVE_LSTAT
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `readlink' function. */
-#undef HAVE_READLINK
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the __sync functions */
-#undef HAVE_SYNC_FUNCTIONS
-
-/* Define to 1 if you have the <sys/ldr.h> header file. */
-#undef HAVE_SYS_LDR_H
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if -lz is available. */
-#undef HAVE_ZLIB
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config.sub cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config.sub
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/config.sub	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/config.sub	1970-01-01 00:00:00.000000000 +0000
@@ -1,1794 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-02-10'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| open8 \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	wasm32)
-		basic_machine=wasm32-unknown
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-ios)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	pru-*)
-		os=-elf
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/configure cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/configure
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/configure	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/configure	1970-01-01 00:00:00.000000000 +0000
@@ -1,14361 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for package-unused version-unused.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='package-unused'
-PACKAGE_TARNAME='libbacktrace'
-PACKAGE_VERSION='version-unused'
-PACKAGE_STRING='package-unused version-unused'
-PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
-
-ac_unique_file="backtrace.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-NATIVE_FALSE
-NATIVE_TRUE
-HAVE_OBJCOPY_DEBUGLINK_FALSE
-HAVE_OBJCOPY_DEBUGLINK_TRUE
-OBJCOPY
-HAVE_COMPRESSED_DEBUG_FALSE
-HAVE_COMPRESSED_DEBUG_TRUE
-HAVE_ZLIB_FALSE
-HAVE_ZLIB_TRUE
-HAVE_PTHREAD_FALSE
-HAVE_PTHREAD_TRUE
-PTHREAD_CFLAGS
-CLOCK_GETTIME_LINK
-BACKTRACE_USES_MALLOC
-ALLOC_FILE
-VIEW_FILE
-BACKTRACE_SUPPORTS_DATA
-BACKTRACE_SUPPORTED
-FORMAT_FILE
-BACKTRACE_SUPPORTS_THREADS
-PIC_FLAG
-WARN_FLAGS
-EXTRA_FLAGS
-BACKTRACE_FILE
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-RANLIB
-AR
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-SED
-LIBTOOL
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-libtool_VERSION
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-multi_basedir
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_multilib
-enable_maintainer_mode
-with_target_subdir
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_gnu_ld
-enable_libtool_lock
-enable_largefile
-with_system_libunwind
-enable_host_shared
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-OBJCOPY'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures package-unused version-unused to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/libbacktrace]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of package-unused version-unused:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-multilib       build many library versions (default)
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-largefile     omit support for large files
-  --enable-host-shared    build host code as shared libraries
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-target-subdir=SUBDIR      Configuring in a subdirectory for target
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-system-libunwind use installed libunwind
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  OBJCOPY     location of objcopy
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-package-unused configure version-unused
-generated by GNU Autoconf 2.64
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $2
-  (void) $2;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by package-unused $as_me version-unused, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-
-# with_target_subdir is used when configured as part of a GCC tree.
-if test -n "${with_target_subdir}"; then
-  # Default to --enable-multilib
-# Check whether --enable-multilib was given.
-if test "${enable_multilib+set}" = set; then :
-  enableval=$enable_multilib; case "$enableval" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
- esac
-else
-  multilib=yes
-fi
-
-
-# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
-# See config-ml.in if you want the gory details.
-
-if test "$srcdir" = "."; then
-  if test "$with_target_subdir" != "."; then
-    multi_basedir="$srcdir/$with_multisrctop../.."
-  else
-    multi_basedir="$srcdir/$with_multisrctop.."
-  fi
-else
-  multi_basedir="$srcdir/.."
-fi
-
-
-# Even if the default multilib is not a cross compilation,
-# it may be that some of the other multilibs are.
-if test $cross_compiling = no && test $multilib = yes \
-   && test "x${with_multisubdir}" != x ; then
-   cross_compiling=maybe
-fi
-
-ac_config_commands="$ac_config_commands default-1"
-
-fi
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-target_alias=${target_alias-$host_alias}
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-fi
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
-
-
-  if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-
-libtool_VERSION=1:0:0
-
-
-# 1.11.1: Require that version of automake.
-# foreign: Don't require README, INSTALL, NEWS, etc.
-# no-define: Don't define PACKAGE and VERSION.
-# no-dependencies: Don't generate automatic dependencies.
-#    (because it breaks when using bootstrap-lean, since some of the
-#    headers are gone at "make install" time).
-# -Wall: Issue all automake warnings.
-# -Wno-portability: Don't warn about constructs supported by GNU make.
-#    (because GCC requires GNU make anyhow).
-am__api_version='1.11'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libbacktrace'
- VERSION='version-unused'
-
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-
-# Check whether --with-target-subdir was given.
-if test "${with_target_subdir+set}" = set; then :
-  withval=$with_target_subdir;
-fi
-
-
-# We must force CC to /not/ be precious variables; otherwise
-# the wrong, non-multilib-adjusted value will be used in multilibs.
-# As a side effect, we have to subst CFLAGS ourselves.
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-case "$AWK" in
-"") as_fn_error "can't build without awk" "$LINENO" 5 ;;
-esac
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.4'
-macro_revision='1.2976'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5363: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:5366: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:5369: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | bitrig*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 6467 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7729: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7733: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8053: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:8057: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8158: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:8162: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8213: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:8217: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  if test "$GCC" = "yes"; then
-    output_verbose_link_cmd=echo
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly* | openbsd* | bitrig*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo(void) {}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10572 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line 10672 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-fi
-
-
-backtrace_supported=yes
-
-if test -n "${with_target_subdir}"; then
-  # We are compiling a GCC library.  We can assume that the unwind
-  # library exists.
-  BACKTRACE_FILE="backtrace.lo simple.lo"
-else
-  ac_fn_c_check_header_mongrel "$LINENO" "unwind.h" "ac_cv_header_unwind_h" "$ac_includes_default"
-if test "x$ac_cv_header_unwind_h" = x""yes; then :
-  ac_fn_c_check_func "$LINENO" "_Unwind_Backtrace" "ac_cv_func__Unwind_Backtrace"
-if test "x$ac_cv_func__Unwind_Backtrace" = x""yes; then :
-  BACKTRACE_FILE="backtrace.lo simple.lo"
-else
-  BACKTRACE_FILE="nounwind.lo"
-                    backtrace_supported=no
-fi
-
-else
-  BACKTRACE_FILE="nounwind.lo"
-     backtrace_supported=no
-fi
-
-
-fi
-
-
-EXTRA_FLAGS=
-if test -n "${with_target_subdir}"; then
-  EXTRA_FLAGS="-funwind-tables -frandom-seed=\$@"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -funwind-tables option" >&5
-$as_echo_n "checking for -funwind-tables option... " >&6; }
-if test "${libbacktrace_cv_c_unwind_tables+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  CFLAGS_hold="$CFLAGS"
-     CFLAGS="$CFLAGS -funwind-tables"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-static int f() { return 0; }
-int
-main ()
-{
-return f();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  libbacktrace_cv_c_unwind_tables=yes
-else
-  libbacktrace_cv_c_unwind_tables=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     CFLAGS="$CFLAGS_hold"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_c_unwind_tables" >&5
-$as_echo "$libbacktrace_cv_c_unwind_tables" >&6; }
-  if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
-    EXTRA_FLAGS=-funwind-tables
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -frandom-seed=string option" >&5
-$as_echo_n "checking for -frandom-seed=string option... " >&6; }
-if test "${libbacktrace_cv_c_random_seed_string+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  CFLAGS_hold="$CFLAGS"
-     CFLAGS="$CFLAGS -frandom-seed=conftest.lo"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  libbacktrace_cv_c_random_seed_string=yes
-else
-  libbacktrace_cv_c_random_seed_string=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     CFLAGS="$CFLAGS_hold"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_c_random_seed_string" >&5
-$as_echo "$libbacktrace_cv_c_random_seed_string" >&6; }
-  if test "$libbacktrace_cv_c_random_seed_string" = "yes"; then
-    EXTRA_FLAGS="$EXTRA_FLAGS -frandom-seed=\$@"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-WARN_FLAGS=
-save_CFLAGS="$CFLAGS"
-for real_option in -W -Wall -Wwrite-strings -Wstrict-prototypes \
-			  -Wmissing-prototypes -Wold-style-definition \
-			  -Wmissing-format-attribute -Wcast-qual; do
-  # Do the check with the no- prefix removed since gcc silently
-  # accepts any -Wno-* option on purpose
-  case $real_option in
-    -Wno-*) option=-W`expr x$real_option : 'x-Wno-\(.*\)'` ;;
-    *) option=$real_option ;;
-  esac
-  as_acx_Woption=`$as_echo "acx_cv_prog_cc_warning_$option" | $as_tr_sh`
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5
-$as_echo_n "checking whether $CC supports $option... " >&6; }
-if { as_var=$as_acx_Woption; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  CFLAGS="$option"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_acx_Woption=yes"
-else
-  eval "$as_acx_Woption=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-eval ac_res=\$$as_acx_Woption
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  if test `eval 'as_val=${'$as_acx_Woption'};$as_echo "$as_val"'` = yes; then :
-  WARN_FLAGS="$WARN_FLAGS${WARN_FLAGS:+ }$real_option"
-fi
-  done
-CFLAGS="$save_CFLAGS"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-if test -n "${with_target_subdir}"; then
-  WARN_FLAGS="$WARN_FLAGS -Werror"
-fi
-
-
-
-if test -n "${with_target_subdir}"; then
-
-
-# Check whether --with-system-libunwind was given.
-if test "${with_system_libunwind+set}" = set; then :
-  withval=$with_system_libunwind;
-fi
-
-  # If system-libunwind was not specifically set, pick a default setting.
-  if test x$with_system_libunwind = x; then
-    case ${target} in
-      ia64-*-hpux*) with_system_libunwind=yes ;;
-      *) with_system_libunwind=no ;;
-    esac
-  fi
-  # Based on system-libunwind and target, do we have ipinfo?
-  if  test x$with_system_libunwind = xyes; then
-    case ${target} in
-      ia64-*-*) have_unwind_getipinfo=no ;;
-      *) have_unwind_getipinfo=yes ;;
-    esac
-  else
-    # Darwin before version 9 does not have _Unwind_GetIPInfo.
-
-    case ${target} in
-      *-*-darwin[3-8]|*-*-darwin[3-8].*) have_unwind_getipinfo=no ;;
-      *) have_unwind_getipinfo=yes ;;
-    esac
-
-  fi
-
-  if test x$have_unwind_getipinfo = xyes; then
-
-$as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
-
-  fi
-
-else
-  ac_save_CFFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Unwind_GetIPInfo" >&5
-$as_echo_n "checking for _Unwind_GetIPInfo... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "unwind.h"
-	struct _Unwind_Context *context;
-	int ip_before_insn = 0;
-int
-main ()
-{
-return _Unwind_GetIPInfo (context, &ip_before_insn);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_unwind_getipinfo=yes
-else
-  have_unwind_getipinfo=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  CFLAGS="$ac_save_CFLAGS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_unwind_getipinfo" >&5
-$as_echo "$have_unwind_getipinfo" >&6; }
-  if test "$have_unwind_getipinfo" = "yes"; then
-
-$as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
-
-  fi
-fi
-
-# Enable --enable-host-shared.
-# Check whether --enable-host-shared was given.
-if test "${enable_host_shared+set}" = set; then :
-  enableval=$enable_host_shared; PIC_FLAG=-fPIC
-else
-  PIC_FLAG=
-fi
-
-
-
-# Test for __sync support.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __sync extensions" >&5
-$as_echo_n "checking __sync extensions... " >&6; }
-if test "${libbacktrace_cv_sys_sync+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "${with_target_subdir}"; then
-   case "${host}" in
-   hppa*-*-hpux*) libbacktrace_cv_sys_sync=no ;;
-   *) libbacktrace_cv_sys_sync=yes ;;
-   esac
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-int
-main ()
-{
-__sync_bool_compare_and_swap (&i, i, i);
-                       __sync_lock_test_and_set (&i, 1);
-                       __sync_lock_release (&i);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  libbacktrace_cv_sys_sync=yes
-else
-  libbacktrace_cv_sys_sync=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_sys_sync" >&5
-$as_echo "$libbacktrace_cv_sys_sync" >&6; }
-BACKTRACE_SUPPORTS_THREADS=0
-if test "$libbacktrace_cv_sys_sync" = "yes"; then
-  BACKTRACE_SUPPORTS_THREADS=1
-
-$as_echo "#define HAVE_SYNC_FUNCTIONS 1" >>confdefs.h
-
-fi
-
-
-# Test for __atomic support.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __atomic extensions" >&5
-$as_echo_n "checking __atomic extensions... " >&6; }
-if test "${libbacktrace_cv_sys_atomic+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "${with_target_subdir}"; then
-   libbacktrace_cv_sys_atomic=yes
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-int
-main ()
-{
-__atomic_load_n (&i, __ATOMIC_ACQUIRE);
-		       __atomic_store_n (&i, 1, __ATOMIC_RELEASE);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  libbacktrace_cv_sys_atomic=yes
-else
-  libbacktrace_cv_sys_atomic=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_sys_atomic" >&5
-$as_echo "$libbacktrace_cv_sys_atomic" >&6; }
-if test "$libbacktrace_cv_sys_atomic" = "yes"; then
-
-$as_echo "#define HAVE_ATOMIC_FUNCTIONS 1" >>confdefs.h
-
-fi
-
-# The library needs to be able to read the executable itself.  Compile
-# a file to determine the executable format.  The awk script
-# filetype.awk prints out the file type.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking output filetype" >&5
-$as_echo_n "checking output filetype... " >&6; }
-if test "${libbacktrace_cv_sys_filetype+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  filetype=
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-int
-main ()
-{
-int j;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  filetype=`${AWK} -f $srcdir/filetype.awk conftest.$ac_objext`
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "compiler failed
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-libbacktrace_cv_sys_filetype=$filetype
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_sys_filetype" >&5
-$as_echo "$libbacktrace_cv_sys_filetype" >&6; }
-
-# Match the file type to decide what files to compile.
-FORMAT_FILE=
-backtrace_supports_data=yes
-case "$libbacktrace_cv_sys_filetype" in
-elf*) FORMAT_FILE="elf.lo" ;;
-pecoff) FORMAT_FILE="pecoff.lo"
-        backtrace_supports_data=no
-	;;
-xcoff*) FORMAT_FILE="xcoff.lo"
-        backtrace_supports_data=no
-        ;;
-macho*) FORMAT_FILE="macho.lo"
-        backtrace_supports_data=no
-        ;;
-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not determine output file type" >&5
-$as_echo "$as_me: WARNING: could not determine output file type" >&2;}
-   FORMAT_FILE="unknown.lo"
-   backtrace_supported=no
-   ;;
-esac
-
-
-# ELF defines.
-elfsize=
-case "$libbacktrace_cv_sys_filetype" in
-elf32) elfsize=32 ;;
-elf64) elfsize=64 ;;
-*)     elfsize=unused
-esac
-
-cat >>confdefs.h <<_ACEOF
-#define BACKTRACE_ELF_SIZE $elfsize
-_ACEOF
-
-
-# XCOFF defines.
-xcoffsize=
-case "$libbacktrace_cv_sys_filetype" in
-xcoff32) xcoffsize=32 ;;
-xcoff64) xcoffsize=64 ;;
-*)       xcoffsize=unused
-esac
-
-cat >>confdefs.h <<_ACEOF
-#define BACKTRACE_XCOFF_SIZE $xcoffsize
-_ACEOF
-
-
-BACKTRACE_SUPPORTED=0
-if test "$backtrace_supported" = "yes"; then
-  BACKTRACE_SUPPORTED=1
-fi
-
-
-BACKTRACE_SUPPORTS_DATA=0
-if test "$backtrace_supports_data" = "yes"; then
-  BACKTRACE_SUPPORTS_DATA=1
-fi
-
-
-for ac_header in sys/mman.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_MMAN_H 1
-_ACEOF
-
-fi
-
-done
-
-if test "$ac_cv_header_sys_mman_h" = "no"; then
-  have_mmap=no
-else
-  if test -n "${with_target_subdir}"; then
-    # When built as a GCC target library, we can't do a link test.  We
-    # simply assume that if we have mman.h, we have mmap.
-    have_mmap=yes
-    case "${host}" in
-    spu-*-*|*-*-msdosdjgpp)
-        # The SPU does not have mmap, but it has a sys/mman.h header file
-        # containing "mmap_eaddr" and the mmap flags, confusing the test.
-        # DJGPP also has sys/man.h, but no mmap
-	have_mmap=no ;;
-    esac
-  else
-    ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = x""yes; then :
-  have_mmap=yes
-else
-  have_mmap=no
-fi
-
-  fi
-fi
-
-case "${host_os}" in
-darwin*)
-  have_mmap=no ;;
-esac
-
-if test "$have_mmap" = "no"; then
-  VIEW_FILE=read.lo
-  ALLOC_FILE=alloc.lo
-else
-  VIEW_FILE=mmapio.lo
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#if !defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
-  #error no MAP_ANONYMOUS
-#endif
-
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ALLOC_FILE=alloc.lo
-else
-  ALLOC_FILE=alloc.lo
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-
-
-
-BACKTRACE_USES_MALLOC=0
-if test "$ALLOC_FILE" = "alloc.lo"; then
-  BACKTRACE_USES_MALLOC=1
-fi
-
-
-# Check for dl_iterate_phdr.
-for ac_header in link.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "link.h" "ac_cv_header_link_h" "$ac_includes_default"
-if test "x$ac_cv_header_link_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINK_H 1
-_ACEOF
-
-fi
-
-done
-
-if test "$ac_cv_header_link_h" = "no"; then
-  have_dl_iterate_phdr=no
-else
-  if test -n "${with_target_subdir}"; then
-    # When built as a GCC target library, we can't do a link test.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <link.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "dl_iterate_phdr" >/dev/null 2>&1; then :
-  have_dl_iterate_phdr=yes
-else
-  have_dl_iterate_phdr=no
-fi
-rm -f conftest*
-
-    case "${host}" in
-    *-*-solaris2.10*)
-        # Avoid dl_iterate_phdr on Solaris 10, where it is in the
-    	# header file but is only in -ldl.
-	have_dl_iterate_phdr=no ;;
-    esac
-  else
-    ac_fn_c_check_func "$LINENO" "dl_iterate_phdr" "ac_cv_func_dl_iterate_phdr"
-if test "x$ac_cv_func_dl_iterate_phdr" = x""yes; then :
-  have_dl_iterate_phdr=yes
-else
-  have_dl_iterate_phdr=no
-fi
-
-  fi
-fi
-if test "$have_dl_iterate_phdr" = "yes"; then
-
-$as_echo "#define HAVE_DL_ITERATE_PHDR 1" >>confdefs.h
-
-fi
-
-# Check for loadquery.
-for ac_header in sys/ldr.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/ldr.h" "ac_cv_header_sys_ldr_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ldr_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_LDR_H 1
-_ACEOF
-
-fi
-
-done
-
-if test "$ac_cv_header_sys_ldr_h" = "no"; then
-  have_loadquery=no
-else
-  if test -n "${with_target_subdir}"; then
-    # When built as a GCC target library, we can't do a link test.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/ldr.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "loadquery" >/dev/null 2>&1; then :
-  have_loadquery=yes
-else
-  have_loadquery=no
-fi
-rm -f conftest*
-
-  else
-    ac_fn_c_check_func "$LINENO" "loadquery" "ac_cv_func_loadquery"
-if test "x$ac_cv_func_loadquery" = x""yes; then :
-  have_loadquery=yes
-else
-  have_loadquery=no
-fi
-
-  fi
-fi
-if test "$have_loadquery" = "yes"; then
-
-$as_echo "#define HAVE_LOADQUERY 1" >>confdefs.h
-
-fi
-
-# Check for the fcntl function.
-if test -n "${with_target_subdir}"; then
-   case "${host}" in
-   *-*-mingw*) have_fcntl=no ;;
-   spu-*-*) have_fcntl=no ;;
-   *) have_fcntl=yes ;;
-   esac
-else
-  ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
-if test "x$ac_cv_func_fcntl" = x""yes; then :
-  have_fcntl=yes
-else
-  have_fcntl=no
-fi
-
-fi
-if test "$have_fcntl" = "yes"; then
-
-$as_echo "#define HAVE_FCNTL 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strnlen" = x""yes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRNLEN $ac_have_decl
-_ACEOF
-
-for ac_func in lstat readlink
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Check for getexecname function.
-if test -n "${with_target_subdir}"; then
-   case "${host}" in
-   *-*-solaris2*) have_getexecname=yes ;;
-   *) have_getexecname=no ;;
-   esac
-else
-  ac_fn_c_check_func "$LINENO" "getexecname" "ac_cv_func_getexecname"
-if test "x$ac_cv_func_getexecname" = x""yes; then :
-  have_getexecname=yes
-else
-  have_getexecname=no
-fi
-
-fi
-if test "$have_getexecname" = "yes"; then
-
-$as_echo "#define HAVE_GETEXECNAME 1" >>confdefs.h
-
-fi
-
-# Check for the clock_gettime function.
-for ac_func in clock_gettime
-do :
-  ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOCK_GETTIME 1
-_ACEOF
-
-fi
-done
-
-clock_gettime_link=
-# At least for glibc, clock_gettime is in librt.  But don't
-# pull that in if it still doesn't give us the function we want.  This
-# test is copied from libgomp, and modified to not link in -lrt as
-# we're using this for test timing only.
-if test "$ac_cv_func_clock_gettime" = no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_rt_clock_gettime=yes
-else
-  ac_cv_lib_rt_clock_gettime=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
-  CLOCK_GETTIME_LINK=-lrt
-
-$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
-
-fi
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -pthread is supported" >&5
-$as_echo_n "checking whether -pthread is supported... " >&6; }
-if test "${libgo_cv_lib_pthread+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  CFLAGS_hold=$CFLAGS
-CFLAGS="$CFLAGS -pthread"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  libgo_cv_lib_pthread=yes
-else
-  libgo_cv_lib_pthread=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CFLAGS=$CFLAGS_hold
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgo_cv_lib_pthread" >&5
-$as_echo "$libgo_cv_lib_pthread" >&6; }
-PTHREAD_CFLAGS=
-if test "$libgo_cv_lib_pthread" = yes; then
-  PTHREAD_CFLAGS=-pthread
-fi
-
-
- if test "$libgo_cv_lib_pthread" = yes; then
-  HAVE_PTHREAD_TRUE=
-  HAVE_PTHREAD_FALSE='#'
-else
-  HAVE_PTHREAD_TRUE='#'
-  HAVE_PTHREAD_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-$as_echo_n "checking for compress in -lz... " >&6; }
-if test "${ac_cv_lib_z_compress+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char compress ();
-int
-main ()
-{
-return compress ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_compress=yes
-else
-  ac_cv_lib_z_compress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-$as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-fi
-
-if test $ac_cv_lib_z_compress = "yes"; then
-
-$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
-
-fi
- if test "$ac_cv_lib_z_compress" = yes; then
-  HAVE_ZLIB_TRUE=
-  HAVE_ZLIB_FALSE='#'
-else
-  HAVE_ZLIB_TRUE='#'
-  HAVE_ZLIB_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether --compress-debug-sections is supported" >&5
-$as_echo_n "checking whether --compress-debug-sections is supported... " >&6; }
-if test "${libgo_cv_ld_compress+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  LDFLAGS_hold=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--compress-debug-sections=zlib-gnu"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  libgo_cv_ld_compress=yes
-else
-  libgo_cv_ld_compress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LDFLAGS=$LDFLAGS_hold
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgo_cv_ld_compress" >&5
-$as_echo "$libgo_cv_ld_compress" >&6; }
- if test "$libgo_cv_ld_compress" = yes; then
-  HAVE_COMPRESSED_DEBUG_TRUE=
-  HAVE_COMPRESSED_DEBUG_FALSE='#'
-else
-  HAVE_COMPRESSED_DEBUG_TRUE='#'
-  HAVE_COMPRESSED_DEBUG_FALSE=
-fi
-
-
-
-# Extract the first word of "objcopy", so it can be a program name with args.
-set dummy objcopy; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJCOPY"; then
-  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJCOPY="objcopy"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJCOPY=$ac_cv_prog_OBJCOPY
-if test -n "$OBJCOPY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
-$as_echo "$OBJCOPY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether objcopy supports debuglink" >&5
-$as_echo_n "checking whether objcopy supports debuglink... " >&6; }
-if test "${libbacktrace_cv_objcopy_debuglink+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "${with_target_subdir}"; then
-  libbacktrace_cv_objcopy_debuglink=no
-elif ${OBJCOPY} --add-gnu-debuglink=x /bin/ls /tmp/ls$$; then
-  rm -f /tmp/ls$$
-  libbacktrace_cv_objcopy_debuglink=yes
-else
-  libbacktrace_cv_objcopy_debuglink=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_objcopy_debuglink" >&5
-$as_echo "$libbacktrace_cv_objcopy_debuglink" >&6; }
- if test "$libbacktrace_cv_objcopy_debuglink" = yes; then
-  HAVE_OBJCOPY_DEBUGLINK_TRUE=
-  HAVE_OBJCOPY_DEBUGLINK_FALSE='#'
-else
-  HAVE_OBJCOPY_DEBUGLINK_TRUE='#'
-  HAVE_OBJCOPY_DEBUGLINK_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tests can run" >&5
-$as_echo_n "checking whether tests can run... " >&6; }
-if test "${libbacktrace_cv_sys_native+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  libbacktrace_cv_sys_native=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  libbacktrace_cv_sys_native=yes
-else
-  libbacktrace_cv_sys_native=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_sys_native" >&5
-$as_echo "$libbacktrace_cv_sys_native" >&6; }
- if test "$libbacktrace_cv_sys_native" = "yes"; then
-  NATIVE_TRUE=
-  NATIVE_FALSE='#'
-else
-  NATIVE_TRUE='#'
-  NATIVE_FALSE=
-fi
-
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
-else
-  multilib_arg=
-fi
-
-ac_config_files="$ac_config_files Makefile backtrace-supported.h"
-
-
-# We need multilib support, but only if configuring for the target.
-ac_config_commands="$ac_config_commands default"
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PTHREAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
-  as_fn_error "conditional \"HAVE_ZLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_COMPRESSED_DEBUG_TRUE}" && test -z "${HAVE_COMPRESSED_DEBUG_FALSE}"; then
-  as_fn_error "conditional \"HAVE_COMPRESSED_DEBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_OBJCOPY_DEBUGLINK_TRUE}" && test -z "${HAVE_OBJCOPY_DEBUGLINK_FALSE}"; then
-  as_fn_error "conditional \"HAVE_OBJCOPY_DEBUGLINK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${NATIVE_TRUE}" && test -z "${NATIVE_FALSE}"; then
-  as_fn_error "conditional \"NATIVE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by package-unused $as_me version-unused, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-package-unused config.status version-unused
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-
-srcdir="$srcdir"
-host="$host"
-target="$target"
-with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
-with_target_subdir="$with_target_subdir"
-ac_configure_args="${multilib_arg} ${ac_configure_args}"
-multi_basedir="$multi_basedir"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="$CC"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-# Variables needed in config.status (file generation) which aren't already
-# passed by autoconf.
-SUBDIRS="$SUBDIRS"
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "backtrace-supported.h") CONFIG_FILES="$CONFIG_FILES backtrace-supported.h" ;;
-    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "default-1":C)
-# Only add multilib support code if we just rebuilt the top-level
-# Makefile.
-case " $CONFIG_FILES " in
- *" Makefile "*)
-   ac_file=Makefile . ${multi_basedir}/config-ml.in
-   ;;
-esac ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
-
-
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-    "default":C) if test -n "$CONFIG_FILES"; then
-   if test -n "${with_target_subdir}"; then
-     # Multilibs need MULTISUBDIR defined correctly in certain makefiles so
-     # that multilib installs will end up installed in the correct place.
-     # The testsuite needs it for multilib-aware ABI baseline files.
-     # To work around this not being passed down from config-ml.in ->
-     # srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually
-     # append it here.  Only modify Makefiles that have just been created.
-     #
-     # Also, get rid of this simulated-VPATH thing that automake does.
-     cat > vpsed << \_EOF
-  s!`test -f '$<' || echo '$(srcdir)/'`!!
-_EOF
-     for i in $SUBDIRS; do
-      case $CONFIG_FILES in
-       *${i}/Makefile*)
-	 #echo "Adding MULTISUBDIR to $i/Makefile"
-	 sed -f vpsed $i/Makefile > tmp
-	 grep '^MULTISUBDIR =' Makefile >> tmp
-	 mv tmp $i/Makefile
-	 ;;
-      esac
-     done
-     rm vpsed
-   fi
- fi
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/configure.ac cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/configure.ac
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/configure.ac	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/configure.ac	1970-01-01 00:00:00.000000000 +0000
@@ -1,512 +0,0 @@
-# configure.ac -- Backtrace configure script.
-# Copyright (C) 2012-2018 Free Software Foundation, Inc.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-
-#     (2) Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-
-#     (3) The name of the author may not be used to
-#     endorse or promote products derived from this software without
-#     specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-AC_PREREQ(2.64)
-AC_INIT(package-unused, version-unused,, libbacktrace)
-AC_CONFIG_SRCDIR(backtrace.h)
-AC_CONFIG_HEADER(config.h)
-AC_CONFIG_MACRO_DIR(config)
-
-# with_target_subdir is used when configured as part of a GCC tree.
-if test -n "${with_target_subdir}"; then
-  AM_ENABLE_MULTILIB(, ..)
-fi
-
-AC_CANONICAL_SYSTEM
-target_alias=${target_alias-$host_alias}
-
-AC_USE_SYSTEM_EXTENSIONS
-
-libtool_VERSION=1:0:0
-AC_SUBST(libtool_VERSION)
-
-# 1.11.1: Require that version of automake.
-# foreign: Don't require README, INSTALL, NEWS, etc.
-# no-define: Don't define PACKAGE and VERSION.
-# no-dependencies: Don't generate automatic dependencies.
-#    (because it breaks when using bootstrap-lean, since some of the
-#    headers are gone at "make install" time).
-# -Wall: Issue all automake warnings.
-# -Wno-portability: Don't warn about constructs supported by GNU make.
-#    (because GCC requires GNU make anyhow).
-AM_INIT_AUTOMAKE([1.11.1 foreign no-dist no-define no-dependencies -Wall -Wno-portability])
-
-AM_MAINTAINER_MODE
-
-AC_ARG_WITH(target-subdir,
-[  --with-target-subdir=SUBDIR      Configuring in a subdirectory for target])
-
-# We must force CC to /not/ be precious variables; otherwise
-# the wrong, non-multilib-adjusted value will be used in multilibs.
-# As a side effect, we have to subst CFLAGS ourselves.
-m4_rename([_AC_ARG_VAR_PRECIOUS],[backtrace_PRECIOUS])
-m4_define([_AC_ARG_VAR_PRECIOUS],[])
-AC_PROG_CC
-m4_rename_force([backtrace_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
-
-AC_SUBST(CFLAGS)
-
-AC_PROG_AWK
-case "$AWK" in
-"") AC_MSG_ERROR([can't build without awk]) ;;
-esac
-
-LT_INIT
-AM_PROG_LIBTOOL
-
-AC_SYS_LARGEFILE
-
-backtrace_supported=yes
-
-if test -n "${with_target_subdir}"; then
-  # We are compiling a GCC library.  We can assume that the unwind
-  # library exists.
-  BACKTRACE_FILE="backtrace.lo simple.lo"
-else
-  AC_CHECK_HEADER([unwind.h],
-    [AC_CHECK_FUNC([_Unwind_Backtrace],
-	           [BACKTRACE_FILE="backtrace.lo simple.lo"],
-		   [BACKTRACE_FILE="nounwind.lo"
-                    backtrace_supported=no])],
-    [BACKTRACE_FILE="nounwind.lo"
-     backtrace_supported=no])
-fi
-AC_SUBST(BACKTRACE_FILE)
-
-EXTRA_FLAGS=
-if test -n "${with_target_subdir}"; then
-  EXTRA_FLAGS="-funwind-tables -frandom-seed=\$@"
-else
-  AC_CACHE_CHECK([for -funwind-tables option],
-    [libbacktrace_cv_c_unwind_tables],
-    [CFLAGS_hold="$CFLAGS"
-     CFLAGS="$CFLAGS -funwind-tables"
-     AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([static int f() { return 0; }], [return f();])],
-       [libbacktrace_cv_c_unwind_tables=yes],
-       [libbacktrace_cv_c_unwind_tables=no])
-     CFLAGS="$CFLAGS_hold"])
-  if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
-    EXTRA_FLAGS=-funwind-tables
-  fi
-  AC_CACHE_CHECK([for -frandom-seed=string option],
-    [libbacktrace_cv_c_random_seed_string],
-    [CFLAGS_hold="$CFLAGS"
-     CFLAGS="$CFLAGS -frandom-seed=conftest.lo"
-     AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([], [return 0;])],
-       [libbacktrace_cv_c_random_seed_string=yes],
-       [libbacktrace_cv_c_random_seed_string=no])
-     CFLAGS="$CFLAGS_hold"])
-  if test "$libbacktrace_cv_c_random_seed_string" = "yes"; then
-    EXTRA_FLAGS="$EXTRA_FLAGS -frandom-seed=\$@"
-  fi
-fi
-AC_SUBST(EXTRA_FLAGS)
-
-ACX_PROG_CC_WARNING_OPTS([-W -Wall -Wwrite-strings -Wstrict-prototypes \
-			  -Wmissing-prototypes -Wold-style-definition \
-			  -Wmissing-format-attribute -Wcast-qual],
-			  [WARN_FLAGS])
-
-if test -n "${with_target_subdir}"; then
-  WARN_FLAGS="$WARN_FLAGS -Werror"
-fi
-
-AC_SUBST(WARN_FLAGS)
-
-if test -n "${with_target_subdir}"; then
-  GCC_CHECK_UNWIND_GETIPINFO
-else
-  ac_save_CFFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-  AC_MSG_CHECKING([for _Unwind_GetIPInfo])
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM(
-       [#include "unwind.h"
-	struct _Unwind_Context *context;
-	int ip_before_insn = 0;],
-	[return _Unwind_GetIPInfo (context, &ip_before_insn);])],
-	[have_unwind_getipinfo=yes], [have_unwind_getipinfo=no])
-  CFLAGS="$ac_save_CFLAGS"
-  AC_MSG_RESULT([$have_unwind_getipinfo])
-  if test "$have_unwind_getipinfo" = "yes"; then
-    AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.])
-  fi
-fi
-
-# Enable --enable-host-shared.
-AC_ARG_ENABLE(host-shared,
-[AS_HELP_STRING([--enable-host-shared],
-		[build host code as shared libraries])],
-[PIC_FLAG=-fPIC], [PIC_FLAG=])
-AC_SUBST(PIC_FLAG)
-
-# Test for __sync support.
-AC_CACHE_CHECK([__sync extensions],
-[libbacktrace_cv_sys_sync],
-[if test -n "${with_target_subdir}"; then
-   case "${host}" in
-   hppa*-*-hpux*) libbacktrace_cv_sys_sync=no ;;
-   *) libbacktrace_cv_sys_sync=yes ;;
-   esac
- else
-   AC_LINK_IFELSE(
-     [AC_LANG_PROGRAM([int i;],
-                      [__sync_bool_compare_and_swap (&i, i, i);
-                       __sync_lock_test_and_set (&i, 1);
-                       __sync_lock_release (&i);])],
-     [libbacktrace_cv_sys_sync=yes],
-     [libbacktrace_cv_sys_sync=no])
- fi])
-BACKTRACE_SUPPORTS_THREADS=0
-if test "$libbacktrace_cv_sys_sync" = "yes"; then
-  BACKTRACE_SUPPORTS_THREADS=1
-  AC_DEFINE([HAVE_SYNC_FUNCTIONS], 1,
-	    [Define to 1 if you have the __sync functions])
-fi
-AC_SUBST(BACKTRACE_SUPPORTS_THREADS)
-
-# Test for __atomic support.
-AC_CACHE_CHECK([__atomic extensions],
-[libbacktrace_cv_sys_atomic],
-[if test -n "${with_target_subdir}"; then
-   libbacktrace_cv_sys_atomic=yes
- else
-   AC_LINK_IFELSE(
-     [AC_LANG_PROGRAM([int i;],
-     		      [__atomic_load_n (&i, __ATOMIC_ACQUIRE);
-		       __atomic_store_n (&i, 1, __ATOMIC_RELEASE);])],
-     [libbacktrace_cv_sys_atomic=yes],
-     [libbacktrace_cv_sys_atomic=no])
- fi])
-if test "$libbacktrace_cv_sys_atomic" = "yes"; then
-  AC_DEFINE([HAVE_ATOMIC_FUNCTIONS], 1,
-	    [Define to 1 if you have the __atomic functions])
-fi
-
-# The library needs to be able to read the executable itself.  Compile
-# a file to determine the executable format.  The awk script
-# filetype.awk prints out the file type.
-AC_CACHE_CHECK([output filetype],
-[libbacktrace_cv_sys_filetype],
-[filetype=
-AC_COMPILE_IFELSE(
-  [AC_LANG_PROGRAM([int i;], [int j;])],
-  [filetype=`${AWK} -f $srcdir/filetype.awk conftest.$ac_objext`],
-  [AC_MSG_FAILURE([compiler failed])])
-libbacktrace_cv_sys_filetype=$filetype])
-
-# Match the file type to decide what files to compile.
-FORMAT_FILE=
-backtrace_supports_data=yes
-case "$libbacktrace_cv_sys_filetype" in
-elf*) FORMAT_FILE="elf.lo" ;;
-pecoff) FORMAT_FILE="pecoff.lo"
-        backtrace_supports_data=no
-	;;
-xcoff*) FORMAT_FILE="xcoff.lo"
-        backtrace_supports_data=no
-        ;;
-macho*) FORMAT_FILE="macho.lo"
-        backtrace_supports_data=no
-        ;;
-*) AC_MSG_WARN([could not determine output file type])
-   FORMAT_FILE="unknown.lo"
-   backtrace_supported=no
-   ;;
-esac
-AC_SUBST(FORMAT_FILE)
-
-# ELF defines.
-elfsize=
-case "$libbacktrace_cv_sys_filetype" in
-elf32) elfsize=32 ;;
-elf64) elfsize=64 ;;
-*)     elfsize=unused
-esac
-AC_DEFINE_UNQUOTED([BACKTRACE_ELF_SIZE], [$elfsize], [ELF size: 32 or 64])
-
-# XCOFF defines.
-xcoffsize=
-case "$libbacktrace_cv_sys_filetype" in
-xcoff32) xcoffsize=32 ;;
-xcoff64) xcoffsize=64 ;;
-*)       xcoffsize=unused
-esac
-AC_DEFINE_UNQUOTED([BACKTRACE_XCOFF_SIZE], [$xcoffsize], [XCOFF size: 32 or 64])
-
-BACKTRACE_SUPPORTED=0
-if test "$backtrace_supported" = "yes"; then
-  BACKTRACE_SUPPORTED=1
-fi
-AC_SUBST(BACKTRACE_SUPPORTED)
-
-BACKTRACE_SUPPORTS_DATA=0
-if test "$backtrace_supports_data" = "yes"; then
-  BACKTRACE_SUPPORTS_DATA=1
-fi
-AC_SUBST(BACKTRACE_SUPPORTS_DATA)
-
-AC_CHECK_HEADERS(sys/mman.h)
-if test "$ac_cv_header_sys_mman_h" = "no"; then
-  have_mmap=no
-else
-  if test -n "${with_target_subdir}"; then
-    # When built as a GCC target library, we can't do a link test.  We
-    # simply assume that if we have mman.h, we have mmap.
-    have_mmap=yes
-    case "${host}" in
-    spu-*-*|*-*-msdosdjgpp)
-        # The SPU does not have mmap, but it has a sys/mman.h header file
-        # containing "mmap_eaddr" and the mmap flags, confusing the test.
-        # DJGPP also has sys/man.h, but no mmap
-	have_mmap=no ;;
-    esac
-  else
-    AC_CHECK_FUNC(mmap, [have_mmap=yes], [have_mmap=no])
-  fi
-fi
-
-case "${host_os}" in
-darwin*)
-  have_mmap=no ;;
-esac
-
-if test "$have_mmap" = "no"; then
-  VIEW_FILE=read.lo
-  ALLOC_FILE=alloc.lo
-else
-  VIEW_FILE=mmapio.lo
-  AC_PREPROC_IFELSE([
-#include <sys/mman.h>
-#if !defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
-  #error no MAP_ANONYMOUS
-#endif
-], [ALLOC_FILE=mmap.lo], [ALLOC_FILE=alloc.lo])
-fi
-AC_SUBST(VIEW_FILE)
-AC_SUBST(ALLOC_FILE)
-
-BACKTRACE_USES_MALLOC=0
-if test "$ALLOC_FILE" = "alloc.lo"; then
-  BACKTRACE_USES_MALLOC=1
-fi
-AC_SUBST(BACKTRACE_USES_MALLOC)
-
-# Check for dl_iterate_phdr.
-AC_CHECK_HEADERS(link.h)
-if test "$ac_cv_header_link_h" = "no"; then
-  have_dl_iterate_phdr=no
-else
-  if test -n "${with_target_subdir}"; then
-    # When built as a GCC target library, we can't do a link test.
-    AC_EGREP_HEADER([dl_iterate_phdr], [link.h], [have_dl_iterate_phdr=yes],
-		    [have_dl_iterate_phdr=no])
-    case "${host}" in
-    *-*-solaris2.10*)
-        # Avoid dl_iterate_phdr on Solaris 10, where it is in the
-    	# header file but is only in -ldl.
-	have_dl_iterate_phdr=no ;;
-    esac
-  else
-    AC_CHECK_FUNC([dl_iterate_phdr], [have_dl_iterate_phdr=yes],
-		  [have_dl_iterate_phdr=no])
-  fi
-fi
-if test "$have_dl_iterate_phdr" = "yes"; then
-  AC_DEFINE(HAVE_DL_ITERATE_PHDR, 1, [Define if dl_iterate_phdr is available.])
-fi
-
-# Check for loadquery.
-AC_CHECK_HEADERS(sys/ldr.h)
-if test "$ac_cv_header_sys_ldr_h" = "no"; then
-  have_loadquery=no
-else
-  if test -n "${with_target_subdir}"; then
-    # When built as a GCC target library, we can't do a link test.
-    AC_EGREP_HEADER([loadquery], [sys/ldr.h], [have_loadquery=yes],
-		    [have_loadquery=no])
-  else
-    AC_CHECK_FUNC([loadquery], [have_loadquery=yes],
-		  [have_loadquery=no])
-  fi
-fi
-if test "$have_loadquery" = "yes"; then
-  AC_DEFINE(HAVE_LOADQUERY, 1, [Define if AIX loadquery is available.])
-fi
-
-# Check for the fcntl function.
-if test -n "${with_target_subdir}"; then
-   case "${host}" in
-   *-*-mingw*) have_fcntl=no ;;
-   spu-*-*) have_fcntl=no ;;
-   *) have_fcntl=yes ;;
-   esac
-else
-  AC_CHECK_FUNC(fcntl, [have_fcntl=yes], [have_fcntl=no])
-fi
-if test "$have_fcntl" = "yes"; then
-  AC_DEFINE([HAVE_FCNTL], 1,
-	    [Define to 1 if you have the fcntl function])
-fi
-
-AC_CHECK_DECLS(strnlen)
-AC_CHECK_FUNCS(lstat readlink)
-
-# Check for getexecname function.
-if test -n "${with_target_subdir}"; then
-   case "${host}" in
-   *-*-solaris2*) have_getexecname=yes ;;
-   *) have_getexecname=no ;;
-   esac
-else
-  AC_CHECK_FUNC(getexecname, [have_getexecname=yes], [have_getexecname=no])
-fi
-if test "$have_getexecname" = "yes"; then
-  AC_DEFINE(HAVE_GETEXECNAME, 1, [Define if getexecname is available.])
-fi
-
-# Check for the clock_gettime function.
-AC_CHECK_FUNCS(clock_gettime)
-clock_gettime_link=
-# At least for glibc, clock_gettime is in librt.  But don't
-# pull that in if it still doesn't give us the function we want.  This
-# test is copied from libgomp, and modified to not link in -lrt as
-# we're using this for test timing only.
-if test "$ac_cv_func_clock_gettime" = no; then
-  AC_CHECK_LIB(rt, clock_gettime,
-    [CLOCK_GETTIME_LINK=-lrt
-     AC_DEFINE(HAVE_CLOCK_GETTIME, 1,
-	       [Define to 1 if you have the `clock_gettime' function.])])
-fi
-AC_SUBST(CLOCK_GETTIME_LINK)
-
-dnl Test whether the compiler supports the -pthread option.
-AC_CACHE_CHECK([whether -pthread is supported],
-[libgo_cv_lib_pthread],
-[CFLAGS_hold=$CFLAGS
-CFLAGS="$CFLAGS -pthread"
-AC_COMPILE_IFELSE([[int i;]],
-[libgo_cv_lib_pthread=yes],
-[libgo_cv_lib_pthread=no])
-CFLAGS=$CFLAGS_hold])
-PTHREAD_CFLAGS=
-if test "$libgo_cv_lib_pthread" = yes; then
-  PTHREAD_CFLAGS=-pthread
-fi
-AC_SUBST(PTHREAD_CFLAGS)
-
-AM_CONDITIONAL(HAVE_PTHREAD, test "$libgo_cv_lib_pthread" = yes)
-
-AC_CHECK_LIB([z], [compress], [])
-if test $ac_cv_lib_z_compress = "yes"; then
-  AC_DEFINE(HAVE_ZLIB, 1, [Define if -lz is available.])
-fi
-AM_CONDITIONAL(HAVE_ZLIB, test "$ac_cv_lib_z_compress" = yes)
-
-dnl Test whether the linker supports the --compress_debug_sections option.
-AC_CACHE_CHECK([whether --compress-debug-sections is supported],
-[libgo_cv_ld_compress],
-[LDFLAGS_hold=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--compress-debug-sections=zlib-gnu"
-AC_LINK_IFELSE([AC_LANG_PROGRAM(,)],
-[libgo_cv_ld_compress=yes],
-[libgo_cv_ld_compress=no])
-LDFLAGS=$LDFLAGS_hold])
-AM_CONDITIONAL(HAVE_COMPRESSED_DEBUG, test "$libgo_cv_ld_compress" = yes)
-
-AC_ARG_VAR(OBJCOPY, [location of objcopy])
-AC_CHECK_PROG(OBJCOPY, objcopy, objcopy,)
-AC_CACHE_CHECK([whether objcopy supports debuglink],
-[libbacktrace_cv_objcopy_debuglink],
-[if test -n "${with_target_subdir}"; then
-  libbacktrace_cv_objcopy_debuglink=no
-elif ${OBJCOPY} --add-gnu-debuglink=x /bin/ls /tmp/ls$$; then
-  rm -f /tmp/ls$$
-  libbacktrace_cv_objcopy_debuglink=yes
-else
-  libbacktrace_cv_objcopy_debuglink=no
-fi])
-AM_CONDITIONAL(HAVE_OBJCOPY_DEBUGLINK, test "$libbacktrace_cv_objcopy_debuglink" = yes)
-
-AC_CACHE_CHECK([whether tests can run],
-  [libbacktrace_cv_sys_native],
-  [AC_RUN_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
-     [libbacktrace_cv_sys_native=yes],
-     [libbacktrace_cv_sys_native=no],
-     [libbacktrace_cv_sys_native=no])])
-AM_CONDITIONAL(NATIVE, test "$libbacktrace_cv_sys_native" = "yes")
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
-else
-  multilib_arg=
-fi
-
-AC_CONFIG_FILES(Makefile backtrace-supported.h)
-
-# We need multilib support, but only if configuring for the target.
-AC_CONFIG_COMMANDS([default],
-[if test -n "$CONFIG_FILES"; then
-   if test -n "${with_target_subdir}"; then
-     # Multilibs need MULTISUBDIR defined correctly in certain makefiles so
-     # that multilib installs will end up installed in the correct place.
-     # The testsuite needs it for multilib-aware ABI baseline files.
-     # To work around this not being passed down from config-ml.in ->
-     # srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually
-     # append it here.  Only modify Makefiles that have just been created.
-     #
-     # Also, get rid of this simulated-VPATH thing that automake does.
-     cat > vpsed << \_EOF
-  s!`test -f '$<' || echo '$(srcdir)/'`!!
-_EOF
-     for i in $SUBDIRS; do
-      case $CONFIG_FILES in
-       *${i}/Makefile*)
-	 #echo "Adding MULTISUBDIR to $i/Makefile"
-	 sed -f vpsed $i/Makefile > tmp
-	 grep '^MULTISUBDIR =' Makefile >> tmp
-	 mv tmp $i/Makefile
-	 ;;
-      esac
-     done
-     rm vpsed
-   fi
- fi
-],
-[
-# Variables needed in config.status (file generation) which aren't already
-# passed by autoconf.
-SUBDIRS="$SUBDIRS"
-])
-
-AC_OUTPUT
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/dwarf.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/dwarf.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/dwarf.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/dwarf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3126 +0,0 @@
-/* dwarf.c -- Get file/line information from DWARF for backtraces.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* DWARF constants.  */
-
-enum dwarf_tag {
-  DW_TAG_entry_point = 0x3,
-  DW_TAG_compile_unit = 0x11,
-  DW_TAG_inlined_subroutine = 0x1d,
-  DW_TAG_subprogram = 0x2e,
-};
-
-enum dwarf_form {
-  DW_FORM_addr = 0x1,
-  DW_FORM_block2 = 0x3,
-  DW_FORM_block4 = 0x4,
-  DW_FORM_data2 = 0x5,
-  DW_FORM_data4 = 0x6,
-  DW_FORM_data8 = 0x07,
-  DW_FORM_string = 0x08,
-  DW_FORM_block = 0x09,
-  DW_FORM_block1 = 0x0a,
-  DW_FORM_data1 = 0x0b,
-  DW_FORM_flag = 0x0c,
-  DW_FORM_sdata = 0x0d,
-  DW_FORM_strp = 0x0e,
-  DW_FORM_udata = 0x0f,
-  DW_FORM_ref_addr = 0x10,
-  DW_FORM_ref1 = 0x11,
-  DW_FORM_ref2 = 0x12,
-  DW_FORM_ref4 = 0x13,
-  DW_FORM_ref8 = 0x14,
-  DW_FORM_ref_udata = 0x15,
-  DW_FORM_indirect = 0x16,
-  DW_FORM_sec_offset = 0x17,
-  DW_FORM_exprloc = 0x18,
-  DW_FORM_flag_present = 0x19,
-  DW_FORM_ref_sig8 = 0x20,
-  DW_FORM_GNU_addr_index = 0x1f01,
-  DW_FORM_GNU_str_index = 0x1f02,
-  DW_FORM_GNU_ref_alt = 0x1f20,
-  DW_FORM_GNU_strp_alt = 0x1f21,
-};
-
-enum dwarf_attribute {
-  DW_AT_name = 0x3,
-  DW_AT_stmt_list = 0x10,
-  DW_AT_low_pc = 0x11,
-  DW_AT_high_pc = 0x12,
-  DW_AT_comp_dir = 0x1b,
-  DW_AT_abstract_origin = 0x31,
-  DW_AT_specification = 0x47,
-  DW_AT_ranges = 0x55,
-  DW_AT_call_file = 0x58,
-  DW_AT_call_line = 0x59,
-  DW_AT_linkage_name = 0x6e,
-  DW_AT_MIPS_linkage_name = 0x2007,
-};
-
-enum dwarf_line_number_op {
-  DW_LNS_extended_op = 0x0,
-  DW_LNS_copy = 0x1,
-  DW_LNS_advance_pc = 0x2,
-  DW_LNS_advance_line = 0x3,
-  DW_LNS_set_file = 0x4,
-  DW_LNS_set_column = 0x5,
-  DW_LNS_negate_stmt = 0x6,
-  DW_LNS_set_basic_block = 0x7,
-  DW_LNS_const_add_pc = 0x8,
-  DW_LNS_fixed_advance_pc = 0x9,
-  DW_LNS_set_prologue_end = 0xa,
-  DW_LNS_set_epilogue_begin = 0xb,
-  DW_LNS_set_isa = 0xc,
-};
-
-enum dwarf_extedned_line_number_op {
-  DW_LNE_end_sequence = 0x1,
-  DW_LNE_set_address = 0x2,
-  DW_LNE_define_file = 0x3,
-  DW_LNE_set_discriminator = 0x4,
-};
-
-#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
-# define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == '\\')
-#define HAS_DRIVE_SPEC(f) ((f)[0] && (f)[1] == ':')
-# define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR(f[0]) || HAS_DRIVE_SPEC(f))
-#else
-# define IS_DIR_SEPARATOR(c) ((c) == '/')
-# define IS_ABSOLUTE_PATH(f) IS_DIR_SEPARATOR(f[0])
-#endif
-
-#if !defined(HAVE_DECL_STRNLEN) || !HAVE_DECL_STRNLEN
-
-/* If strnlen is not declared, provide our own version.  */
-
-static size_t
-xstrnlen (const char *s, size_t maxlen)
-{
-  size_t i;
-
-  for (i = 0; i < maxlen; ++i)
-    if (s[i] == '\0')
-      break;
-  return i;
-}
-
-#define strnlen xstrnlen
-
-#endif
-
-/* A buffer to read DWARF info.  */
-
-struct dwarf_buf
-{
-  /* Buffer name for error messages.  */
-  const char *name;
-  /* Start of the buffer.  */
-  const unsigned char *start;
-  /* Next byte to read.  */
-  const unsigned char *buf;
-  /* The number of bytes remaining.  */
-  size_t left;
-  /* Whether the data is big-endian.  */
-  int is_bigendian;
-  /* Error callback routine.  */
-  backtrace_error_callback error_callback;
-  /* Data for error_callback.  */
-  void *data;
-  /* Non-zero if we've reported an underflow error.  */
-  int reported_underflow;
-};
-
-/* A single attribute in a DWARF abbreviation.  */
-
-struct attr
-{
-  /* The attribute name.  */
-  enum dwarf_attribute name;
-  /* The attribute form.  */
-  enum dwarf_form form;
-};
-
-/* A single DWARF abbreviation.  */
-
-struct abbrev
-{
-  /* The abbrev code--the number used to refer to the abbrev.  */
-  uint64_t code;
-  /* The entry tag.  */
-  enum dwarf_tag tag;
-  /* Non-zero if this abbrev has child entries.  */
-  int has_children;
-  /* The number of attributes.  */
-  size_t num_attrs;
-  /* The attributes.  */
-  struct attr *attrs;
-};
-
-/* The DWARF abbreviations for a compilation unit.  This structure
-   only exists while reading the compilation unit.  Most DWARF readers
-   seem to a hash table to map abbrev ID's to abbrev entries.
-   However, we primarily care about GCC, and GCC simply issues ID's in
-   numerical order starting at 1.  So we simply keep a sorted vector,
-   and try to just look up the code.  */
-
-struct abbrevs
-{
-  /* The number of abbrevs in the vector.  */
-  size_t num_abbrevs;
-  /* The abbrevs, sorted by the code field.  */
-  struct abbrev *abbrevs;
-};
-
-/* The different kinds of attribute values.  */
-
-enum attr_val_encoding
-{
-  /* An address.  */
-  ATTR_VAL_ADDRESS,
-  /* A unsigned integer.  */
-  ATTR_VAL_UINT,
-  /* A sigd integer.  */
-  ATTR_VAL_SINT,
-  /* A string.  */
-  ATTR_VAL_STRING,
-  /* An offset to other data in the containing unit.  */
-  ATTR_VAL_REF_UNIT,
-  /* An offset to other data within the .dwarf_info section.  */
-  ATTR_VAL_REF_INFO,
-  /* An offset to data in some other section.  */
-  ATTR_VAL_REF_SECTION,
-  /* A type signature.  */
-  ATTR_VAL_REF_TYPE,
-  /* A block of data (not represented).  */
-  ATTR_VAL_BLOCK,
-  /* An expression (not represented).  */
-  ATTR_VAL_EXPR,
-};
-
-/* An attribute value.  */
-
-struct attr_val
-{
-  /* How the value is stored in the field u.  */
-  enum attr_val_encoding encoding;
-  union
-  {
-    /* ATTR_VAL_ADDRESS, ATTR_VAL_UINT, ATTR_VAL_REF*.  */
-    uint64_t uint;
-    /* ATTR_VAL_SINT.  */
-    int64_t sint;
-    /* ATTR_VAL_STRING.  */
-    const char *string;
-    /* ATTR_VAL_BLOCK not stored.  */
-  } u;
-};
-
-/* The line number program header.  */
-
-struct line_header
-{
-  /* The version of the line number information.  */
-  int version;
-  /* The minimum instruction length.  */
-  unsigned int min_insn_len;
-  /* The maximum number of ops per instruction.  */
-  unsigned int max_ops_per_insn;
-  /* The line base for special opcodes.  */
-  int line_base;
-  /* The line range for special opcodes.  */
-  unsigned int line_range;
-  /* The opcode base--the first special opcode.  */
-  unsigned int opcode_base;
-  /* Opcode lengths, indexed by opcode - 1.  */
-  const unsigned char *opcode_lengths;
-  /* The number of directory entries.  */
-  size_t dirs_count;
-  /* The directory entries.  */
-  const char **dirs;
-  /* The number of filenames.  */
-  size_t filenames_count;
-  /* The filenames.  */
-  const char **filenames;
-};
-
-/* Map a single PC value to a file/line.  We will keep a vector of
-   these sorted by PC value.  Each file/line will be correct from the
-   PC up to the PC of the next entry if there is one.  We allocate one
-   extra entry at the end so that we can use bsearch.  */
-
-struct line
-{
-  /* PC.  */
-  uintptr_t pc;
-  /* File name.  Many entries in the array are expected to point to
-     the same file name.  */
-  const char *filename;
-  /* Line number.  */
-  int lineno;
-  /* Index of the object in the original array read from the DWARF
-     section, before it has been sorted.  The index makes it possible
-     to use Quicksort and maintain stability.  */
-  int idx;
-};
-
-/* A growable vector of line number information.  This is used while
-   reading the line numbers.  */
-
-struct line_vector
-{
-  /* Memory.  This is an array of struct line.  */
-  struct backtrace_vector vec;
-  /* Number of valid mappings.  */
-  size_t count;
-};
-
-/* A function described in the debug info.  */
-
-struct function
-{
-  /* The name of the function.  */
-  const char *name;
-  /* If this is an inlined function, the filename of the call
-     site.  */
-  const char *caller_filename;
-  /* If this is an inlined function, the line number of the call
-     site.  */
-  int caller_lineno;
-  /* Map PC ranges to inlined functions.  */
-  struct function_addrs *function_addrs;
-  size_t function_addrs_count;
-};
-
-/* An address range for a function.  This maps a PC value to a
-   specific function.  */
-
-struct function_addrs
-{
-  /* Range is LOW <= PC < HIGH.  */
-  uint64_t low;
-  uint64_t high;
-  /* Function for this address range.  */
-  struct function *function;
-};
-
-/* A growable vector of function address ranges.  */
-
-struct function_vector
-{
-  /* Memory.  This is an array of struct function_addrs.  */
-  struct backtrace_vector vec;
-  /* Number of address ranges present.  */
-  size_t count;
-};
-
-/* A DWARF compilation unit.  This only holds the information we need
-   to map a PC to a file and line.  */
-
-struct unit
-{
-  /* The first entry for this compilation unit.  */
-  const unsigned char *unit_data;
-  /* The length of the data for this compilation unit.  */
-  size_t unit_data_len;
-  /* The offset of UNIT_DATA from the start of the information for
-     this compilation unit.  */
-  size_t unit_data_offset;
-  /* DWARF version.  */
-  int version;
-  /* Whether unit is DWARF64.  */
-  int is_dwarf64;
-  /* Address size.  */
-  int addrsize;
-  /* Offset into line number information.  */
-  off_t lineoff;
-  /* Primary source file.  */
-  const char *filename;
-  /* Compilation command working directory.  */
-  const char *comp_dir;
-  /* Absolute file name, only set if needed.  */
-  const char *abs_filename;
-  /* The abbreviations for this unit.  */
-  struct abbrevs abbrevs;
-
-  /* The fields above this point are read in during initialization and
-     may be accessed freely.  The fields below this point are read in
-     as needed, and therefore require care, as different threads may
-     try to initialize them simultaneously.  */
-
-  /* PC to line number mapping.  This is NULL if the values have not
-     been read.  This is (struct line *) -1 if there was an error
-     reading the values.  */
-  struct line *lines;
-  /* Number of entries in lines.  */
-  size_t lines_count;
-  /* PC ranges to function.  */
-  struct function_addrs *function_addrs;
-  size_t function_addrs_count;
-};
-
-/* An address range for a compilation unit.  This maps a PC value to a
-   specific compilation unit.  Note that we invert the representation
-   in DWARF: instead of listing the units and attaching a list of
-   ranges, we list the ranges and have each one point to the unit.
-   This lets us do a binary search to find the unit.  */
-
-struct unit_addrs
-{
-  /* Range is LOW <= PC < HIGH.  */
-  uint64_t low;
-  uint64_t high;
-  /* Compilation unit for this address range.  */
-  struct unit *u;
-};
-
-/* A growable vector of compilation unit address ranges.  */
-
-struct unit_addrs_vector
-{
-  /* Memory.  This is an array of struct unit_addrs.  */
-  struct backtrace_vector vec;
-  /* Number of address ranges present.  */
-  size_t count;
-};
-
-/* The information we need to map a PC to a file and line.  */
-
-struct dwarf_data
-{
-  /* The data for the next file we know about.  */
-  struct dwarf_data *next;
-  /* The base address for this file.  */
-  uintptr_t base_address;
-  /* A sorted list of address ranges.  */
-  struct unit_addrs *addrs;
-  /* Number of address ranges in list.  */
-  size_t addrs_count;
-  /* The unparsed .debug_info section.  */
-  const unsigned char *dwarf_info;
-  size_t dwarf_info_size;
-  /* The unparsed .debug_line section.  */
-  const unsigned char *dwarf_line;
-  size_t dwarf_line_size;
-  /* The unparsed .debug_ranges section.  */
-  const unsigned char *dwarf_ranges;
-  size_t dwarf_ranges_size;
-  /* The unparsed .debug_str section.  */
-  const unsigned char *dwarf_str;
-  size_t dwarf_str_size;
-  /* Whether the data is big-endian or not.  */
-  int is_bigendian;
-  /* A vector used for function addresses.  We keep this here so that
-     we can grow the vector as we read more functions.  */
-  struct function_vector fvec;
-};
-
-/* Report an error for a DWARF buffer.  */
-
-static void
-dwarf_buf_error (struct dwarf_buf *buf, const char *msg)
-{
-  char b[200];
-
-  snprintf (b, sizeof b, "%s in %s at %d",
-	    msg, buf->name, (int) (buf->buf - buf->start));
-  buf->error_callback (buf->data, b, 0);
-}
-
-/* Require at least COUNT bytes in BUF.  Return 1 if all is well, 0 on
-   error.  */
-
-static int
-require (struct dwarf_buf *buf, size_t count)
-{
-  if (buf->left >= count)
-    return 1;
-
-  if (!buf->reported_underflow)
-    {
-      dwarf_buf_error (buf, "DWARF underflow");
-      buf->reported_underflow = 1;
-    }
-
-  return 0;
-}
-
-/* Advance COUNT bytes in BUF.  Return 1 if all is well, 0 on
-   error.  */
-
-static int
-advance (struct dwarf_buf *buf, size_t count)
-{
-  if (!require (buf, count))
-    return 0;
-  buf->buf += count;
-  buf->left -= count;
-  return 1;
-}
-
-/* Read one byte from BUF and advance 1 byte.  */
-
-static unsigned char
-read_byte (struct dwarf_buf *buf)
-{
-  const unsigned char *p = buf->buf;
-
-  if (!advance (buf, 1))
-    return 0;
-  return p[0];
-}
-
-/* Read a signed char from BUF and advance 1 byte.  */
-
-static signed char
-read_sbyte (struct dwarf_buf *buf)
-{
-  const unsigned char *p = buf->buf;
-
-  if (!advance (buf, 1))
-    return 0;
-  return (*p ^ 0x80) - 0x80;
-}
-
-/* Read a uint16 from BUF and advance 2 bytes.  */
-
-static uint16_t
-read_uint16 (struct dwarf_buf *buf)
-{
-  const unsigned char *p = buf->buf;
-
-  if (!advance (buf, 2))
-    return 0;
-  if (buf->is_bigendian)
-    return ((uint16_t) p[0] << 8) | (uint16_t) p[1];
-  else
-    return ((uint16_t) p[1] << 8) | (uint16_t) p[0];
-}
-
-/* Read a uint32 from BUF and advance 4 bytes.  */
-
-static uint32_t
-read_uint32 (struct dwarf_buf *buf)
-{
-  const unsigned char *p = buf->buf;
-
-  if (!advance (buf, 4))
-    return 0;
-  if (buf->is_bigendian)
-    return (((uint32_t) p[0] << 24) | ((uint32_t) p[1] << 16)
-	    | ((uint32_t) p[2] << 8) | (uint32_t) p[3]);
-  else
-    return (((uint32_t) p[3] << 24) | ((uint32_t) p[2] << 16)
-	    | ((uint32_t) p[1] << 8) | (uint32_t) p[0]);
-}
-
-/* Read a uint64 from BUF and advance 8 bytes.  */
-
-static uint64_t
-read_uint64 (struct dwarf_buf *buf)
-{
-  const unsigned char *p = buf->buf;
-
-  if (!advance (buf, 8))
-    return 0;
-  if (buf->is_bigendian)
-    return (((uint64_t) p[0] << 56) | ((uint64_t) p[1] << 48)
-	    | ((uint64_t) p[2] << 40) | ((uint64_t) p[3] << 32)
-	    | ((uint64_t) p[4] << 24) | ((uint64_t) p[5] << 16)
-	    | ((uint64_t) p[6] << 8) | (uint64_t) p[7]);
-  else
-    return (((uint64_t) p[7] << 56) | ((uint64_t) p[6] << 48)
-	    | ((uint64_t) p[5] << 40) | ((uint64_t) p[4] << 32)
-	    | ((uint64_t) p[3] << 24) | ((uint64_t) p[2] << 16)
-	    | ((uint64_t) p[1] << 8) | (uint64_t) p[0]);
-}
-
-/* Read an offset from BUF and advance the appropriate number of
-   bytes.  */
-
-static uint64_t
-read_offset (struct dwarf_buf *buf, int is_dwarf64)
-{
-  if (is_dwarf64)
-    return read_uint64 (buf);
-  else
-    return read_uint32 (buf);
-}
-
-/* Read an address from BUF and advance the appropriate number of
-   bytes.  */
-
-static uint64_t
-read_address (struct dwarf_buf *buf, int addrsize)
-{
-  switch (addrsize)
-    {
-    case 1:
-      return read_byte (buf);
-    case 2:
-      return read_uint16 (buf);
-    case 4:
-      return read_uint32 (buf);
-    case 8:
-      return read_uint64 (buf);
-    default:
-      dwarf_buf_error (buf, "unrecognized address size");
-      return 0;
-    }
-}
-
-/* Return whether a value is the highest possible address, given the
-   address size.  */
-
-static int
-is_highest_address (uint64_t address, int addrsize)
-{
-  switch (addrsize)
-    {
-    case 1:
-      return address == (unsigned char) -1;
-    case 2:
-      return address == (uint16_t) -1;
-    case 4:
-      return address == (uint32_t) -1;
-    case 8:
-      return address == (uint64_t) -1;
-    default:
-      return 0;
-    }
-}
-
-/* Read an unsigned LEB128 number.  */
-
-static uint64_t
-read_uleb128 (struct dwarf_buf *buf)
-{
-  uint64_t ret;
-  unsigned int shift;
-  int overflow;
-  unsigned char b;
-
-  ret = 0;
-  shift = 0;
-  overflow = 0;
-  do
-    {
-      const unsigned char *p;
-
-      p = buf->buf;
-      if (!advance (buf, 1))
-	return 0;
-      b = *p;
-      if (shift < 64)
-	ret |= ((uint64_t) (b & 0x7f)) << shift;
-      else if (!overflow)
-	{
-	  dwarf_buf_error (buf, "LEB128 overflows uint64_t");
-	  overflow = 1;
-	}
-      shift += 7;
-    }
-  while ((b & 0x80) != 0);
-
-  return ret;
-}
-
-/* Read a signed LEB128 number.  */
-
-static int64_t
-read_sleb128 (struct dwarf_buf *buf)
-{
-  uint64_t val;
-  unsigned int shift;
-  int overflow;
-  unsigned char b;
-
-  val = 0;
-  shift = 0;
-  overflow = 0;
-  do
-    {
-      const unsigned char *p;
-
-      p = buf->buf;
-      if (!advance (buf, 1))
-	return 0;
-      b = *p;
-      if (shift < 64)
-	val |= ((uint64_t) (b & 0x7f)) << shift;
-      else if (!overflow)
-	{
-	  dwarf_buf_error (buf, "signed LEB128 overflows uint64_t");
-	  overflow = 1;
-	}
-      shift += 7;
-    }
-  while ((b & 0x80) != 0);
-
-  if ((b & 0x40) != 0 && shift < 64)
-    val |= ((uint64_t) -1) << shift;
-
-  return (int64_t) val;
-}
-
-/* Return the length of an LEB128 number.  */
-
-static size_t
-leb128_len (const unsigned char *p)
-{
-  size_t ret;
-
-  ret = 1;
-  while ((*p & 0x80) != 0)
-    {
-      ++p;
-      ++ret;
-    }
-  return ret;
-}
-
-/* Free an abbreviations structure.  */
-
-static void
-free_abbrevs (struct backtrace_state *state, struct abbrevs *abbrevs,
-	      backtrace_error_callback error_callback, void *data)
-{
-  size_t i;
-
-  for (i = 0; i < abbrevs->num_abbrevs; ++i)
-    backtrace_free (state, abbrevs->abbrevs[i].attrs,
-		    abbrevs->abbrevs[i].num_attrs * sizeof (struct attr),
-		    error_callback, data);
-  backtrace_free (state, abbrevs->abbrevs,
-		  abbrevs->num_abbrevs * sizeof (struct abbrev),
-		  error_callback, data);
-  abbrevs->num_abbrevs = 0;
-  abbrevs->abbrevs = NULL;
-}
-
-/* Read an attribute value.  Returns 1 on success, 0 on failure.  If
-   the value can be represented as a uint64_t, sets *VAL and sets
-   *IS_VALID to 1.  We don't try to store the value of other attribute
-   forms, because we don't care about them.  */
-
-static int
-read_attribute (enum dwarf_form form, struct dwarf_buf *buf,
-		int is_dwarf64, int version, int addrsize,
-		const unsigned char *dwarf_str, size_t dwarf_str_size,
-		struct attr_val *val)
-{
-  /* Avoid warnings about val.u.FIELD may be used uninitialized if
-     this function is inlined.  The warnings aren't valid but can
-     occur because the different fields are set and used
-     conditionally.  */
-  memset (val, 0, sizeof *val);
-
-  switch (form)
-    {
-    case DW_FORM_addr:
-      val->encoding = ATTR_VAL_ADDRESS;
-      val->u.uint = read_address (buf, addrsize);
-      return 1;
-    case DW_FORM_block2:
-      val->encoding = ATTR_VAL_BLOCK;
-      return advance (buf, read_uint16 (buf));
-    case DW_FORM_block4:
-      val->encoding = ATTR_VAL_BLOCK;
-      return advance (buf, read_uint32 (buf));
-    case DW_FORM_data2:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = read_uint16 (buf);
-      return 1;
-    case DW_FORM_data4:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = read_uint32 (buf);
-      return 1;
-    case DW_FORM_data8:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = read_uint64 (buf);
-      return 1;
-    case DW_FORM_string:
-      val->encoding = ATTR_VAL_STRING;
-      val->u.string = (const char *) buf->buf;
-      return advance (buf, strnlen ((const char *) buf->buf, buf->left) + 1);
-    case DW_FORM_block:
-      val->encoding = ATTR_VAL_BLOCK;
-      return advance (buf, read_uleb128 (buf));
-    case DW_FORM_block1:
-      val->encoding = ATTR_VAL_BLOCK;
-      return advance (buf, read_byte (buf));
-    case DW_FORM_data1:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = read_byte (buf);
-      return 1;
-    case DW_FORM_flag:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = read_byte (buf);
-      return 1;
-    case DW_FORM_sdata:
-      val->encoding = ATTR_VAL_SINT;
-      val->u.sint = read_sleb128 (buf);
-      return 1;
-    case DW_FORM_strp:
-      {
-	uint64_t offset;
-
-	offset = read_offset (buf, is_dwarf64);
-	if (offset >= dwarf_str_size)
-	  {
-	    dwarf_buf_error (buf, "DW_FORM_strp out of range");
-	    return 0;
-	  }
-	val->encoding = ATTR_VAL_STRING;
-	val->u.string = (const char *) dwarf_str + offset;
-	return 1;
-      }
-    case DW_FORM_udata:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = read_uleb128 (buf);
-      return 1;
-    case DW_FORM_ref_addr:
-      val->encoding = ATTR_VAL_REF_INFO;
-      if (version == 2)
-	val->u.uint = read_address (buf, addrsize);
-      else
-	val->u.uint = read_offset (buf, is_dwarf64);
-      return 1;
-    case DW_FORM_ref1:
-      val->encoding = ATTR_VAL_REF_UNIT;
-      val->u.uint = read_byte (buf);
-      return 1;
-    case DW_FORM_ref2:
-      val->encoding = ATTR_VAL_REF_UNIT;
-      val->u.uint = read_uint16 (buf);
-      return 1;
-    case DW_FORM_ref4:
-      val->encoding = ATTR_VAL_REF_UNIT;
-      val->u.uint = read_uint32 (buf);
-      return 1;
-    case DW_FORM_ref8:
-      val->encoding = ATTR_VAL_REF_UNIT;
-      val->u.uint = read_uint64 (buf);
-      return 1;
-    case DW_FORM_ref_udata:
-      val->encoding = ATTR_VAL_REF_UNIT;
-      val->u.uint = read_uleb128 (buf);
-      return 1;
-    case DW_FORM_indirect:
-      {
-	uint64_t form;
-
-	form = read_uleb128 (buf);
-	return read_attribute ((enum dwarf_form) form, buf, is_dwarf64,
-			       version, addrsize, dwarf_str, dwarf_str_size,
-			       val);
-      }
-    case DW_FORM_sec_offset:
-      val->encoding = ATTR_VAL_REF_SECTION;
-      val->u.uint = read_offset (buf, is_dwarf64);
-      return 1;
-    case DW_FORM_exprloc:
-      val->encoding = ATTR_VAL_EXPR;
-      return advance (buf, read_uleb128 (buf));
-    case DW_FORM_flag_present:
-      val->encoding = ATTR_VAL_UINT;
-      val->u.uint = 1;
-      return 1;
-    case DW_FORM_ref_sig8:
-      val->encoding = ATTR_VAL_REF_TYPE;
-      val->u.uint = read_uint64 (buf);
-      return 1;
-    case DW_FORM_GNU_addr_index:
-      val->encoding = ATTR_VAL_REF_SECTION;
-      val->u.uint = read_uleb128 (buf);
-      return 1;
-    case DW_FORM_GNU_str_index:
-      val->encoding = ATTR_VAL_REF_SECTION;
-      val->u.uint = read_uleb128 (buf);
-      return 1;
-    case DW_FORM_GNU_ref_alt:
-      val->encoding = ATTR_VAL_REF_SECTION;
-      val->u.uint = read_offset (buf, is_dwarf64);
-      return 1;
-    case DW_FORM_GNU_strp_alt:
-      val->encoding = ATTR_VAL_REF_SECTION;
-      val->u.uint = read_offset (buf, is_dwarf64);
-      return 1;
-    default:
-      dwarf_buf_error (buf, "unrecognized DWARF form");
-      return 0;
-    }
-}
-
-/* Compare function_addrs for qsort.  When ranges are nested, make the
-   smallest one sort last.  */
-
-static int
-function_addrs_compare (const void *v1, const void *v2)
-{
-  const struct function_addrs *a1 = (const struct function_addrs *) v1;
-  const struct function_addrs *a2 = (const struct function_addrs *) v2;
-
-  if (a1->low < a2->low)
-    return -1;
-  if (a1->low > a2->low)
-    return 1;
-  if (a1->high < a2->high)
-    return 1;
-  if (a1->high > a2->high)
-    return -1;
-  return strcmp (a1->function->name, a2->function->name);
-}
-
-/* Compare a PC against a function_addrs for bsearch.  Note that if
-   there are multiple ranges containing PC, which one will be returned
-   is unpredictable.  We compensate for that in dwarf_fileline.  */
-
-static int
-function_addrs_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct function_addrs *entry = (const struct function_addrs *) ventry;
-  uintptr_t pc;
-
-  pc = *key;
-  if (pc < entry->low)
-    return -1;
-  else if (pc >= entry->high)
-    return 1;
-  else
-    return 0;
-}
-
-/* Add a new compilation unit address range to a vector.  Returns 1 on
-   success, 0 on failure.  */
-
-static int
-add_unit_addr (struct backtrace_state *state, uintptr_t base_address,
-	       struct unit_addrs addrs,
-	       backtrace_error_callback error_callback, void *data,
-	       struct unit_addrs_vector *vec)
-{
-  struct unit_addrs *p;
-
-  /* Add in the base address of the module here, so that we can look
-     up the PC directly.  */
-  addrs.low += base_address;
-  addrs.high += base_address;
-
-  /* Try to merge with the last entry.  */
-  if (vec->count > 0)
-    {
-      p = (struct unit_addrs *) vec->vec.base + (vec->count - 1);
-      if ((addrs.low == p->high || addrs.low == p->high + 1)
-	  && addrs.u == p->u)
-	{
-	  if (addrs.high > p->high)
-	    p->high = addrs.high;
-	  return 1;
-	}
-    }
-
-  p = ((struct unit_addrs *)
-       backtrace_vector_grow (state, sizeof (struct unit_addrs),
-			      error_callback, data, &vec->vec));
-  if (p == NULL)
-    return 0;
-
-  *p = addrs;
-  ++vec->count;
-  return 1;
-}
-
-/* Free a unit address vector.  */
-
-static void
-free_unit_addrs_vector (struct backtrace_state *state,
-			struct unit_addrs_vector *vec,
-			backtrace_error_callback error_callback, void *data)
-{
-  struct unit_addrs *addrs;
-  size_t i;
-
-  addrs = (struct unit_addrs *) vec->vec.base;
-  for (i = 0; i < vec->count; ++i)
-    free_abbrevs (state, &addrs[i].u->abbrevs, error_callback, data);
-}
-
-/* Compare unit_addrs for qsort.  When ranges are nested, make the
-   smallest one sort last.  */
-
-static int
-unit_addrs_compare (const void *v1, const void *v2)
-{
-  const struct unit_addrs *a1 = (const struct unit_addrs *) v1;
-  const struct unit_addrs *a2 = (const struct unit_addrs *) v2;
-
-  if (a1->low < a2->low)
-    return -1;
-  if (a1->low > a2->low)
-    return 1;
-  if (a1->high < a2->high)
-    return 1;
-  if (a1->high > a2->high)
-    return -1;
-  if (a1->u->lineoff < a2->u->lineoff)
-    return -1;
-  if (a1->u->lineoff > a2->u->lineoff)
-    return 1;
-  return 0;
-}
-
-/* Compare a PC against a unit_addrs for bsearch.  Note that if there
-   are multiple ranges containing PC, which one will be returned is
-   unpredictable.  We compensate for that in dwarf_fileline.  */
-
-static int
-unit_addrs_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct unit_addrs *entry = (const struct unit_addrs *) ventry;
-  uintptr_t pc;
-
-  pc = *key;
-  if (pc < entry->low)
-    return -1;
-  else if (pc >= entry->high)
-    return 1;
-  else
-    return 0;
-}
-
-/* Sort the line vector by PC.  We want a stable sort here to maintain
-   the order of lines for the same PC values.  Since the sequence is
-   being sorted in place, their addresses cannot be relied on to
-   maintain stability.  That is the purpose of the index member.  */
-
-static int
-line_compare (const void *v1, const void *v2)
-{
-  const struct line *ln1 = (const struct line *) v1;
-  const struct line *ln2 = (const struct line *) v2;
-
-  if (ln1->pc < ln2->pc)
-    return -1;
-  else if (ln1->pc > ln2->pc)
-    return 1;
-  else if (ln1->idx < ln2->idx)
-    return -1;
-  else if (ln1->idx > ln2->idx)
-    return 1;
-  else
-    return 0;
-}
-
-/* Find a PC in a line vector.  We always allocate an extra entry at
-   the end of the lines vector, so that this routine can safely look
-   at the next entry.  Note that when there are multiple mappings for
-   the same PC value, this will return the last one.  */
-
-static int
-line_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct line *entry = (const struct line *) ventry;
-  uintptr_t pc;
-
-  pc = *key;
-  if (pc < entry->pc)
-    return -1;
-  else if (pc >= (entry + 1)->pc)
-    return 1;
-  else
-    return 0;
-}
-
-/* Sort the abbrevs by the abbrev code.  This function is passed to
-   both qsort and bsearch.  */
-
-static int
-abbrev_compare (const void *v1, const void *v2)
-{
-  const struct abbrev *a1 = (const struct abbrev *) v1;
-  const struct abbrev *a2 = (const struct abbrev *) v2;
-
-  if (a1->code < a2->code)
-    return -1;
-  else if (a1->code > a2->code)
-    return 1;
-  else
-    {
-      /* This really shouldn't happen.  It means there are two
-	 different abbrevs with the same code, and that means we don't
-	 know which one lookup_abbrev should return.  */
-      return 0;
-    }
-}
-
-/* Read the abbreviation table for a compilation unit.  Returns 1 on
-   success, 0 on failure.  */
-
-static int
-read_abbrevs (struct backtrace_state *state, uint64_t abbrev_offset,
-	      const unsigned char *dwarf_abbrev, size_t dwarf_abbrev_size,
-	      int is_bigendian, backtrace_error_callback error_callback,
-	      void *data, struct abbrevs *abbrevs)
-{
-  struct dwarf_buf abbrev_buf;
-  struct dwarf_buf count_buf;
-  size_t num_abbrevs;
-
-  abbrevs->num_abbrevs = 0;
-  abbrevs->abbrevs = NULL;
-
-  if (abbrev_offset >= dwarf_abbrev_size)
-    {
-      error_callback (data, "abbrev offset out of range", 0);
-      return 0;
-    }
-
-  abbrev_buf.name = ".debug_abbrev";
-  abbrev_buf.start = dwarf_abbrev;
-  abbrev_buf.buf = dwarf_abbrev + abbrev_offset;
-  abbrev_buf.left = dwarf_abbrev_size - abbrev_offset;
-  abbrev_buf.is_bigendian = is_bigendian;
-  abbrev_buf.error_callback = error_callback;
-  abbrev_buf.data = data;
-  abbrev_buf.reported_underflow = 0;
-
-  /* Count the number of abbrevs in this list.  */
-
-  count_buf = abbrev_buf;
-  num_abbrevs = 0;
-  while (read_uleb128 (&count_buf) != 0)
-    {
-      if (count_buf.reported_underflow)
-	return 0;
-      ++num_abbrevs;
-      // Skip tag.
-      read_uleb128 (&count_buf);
-      // Skip has_children.
-      read_byte (&count_buf);
-      // Skip attributes.
-      while (read_uleb128 (&count_buf) != 0)
-	read_uleb128 (&count_buf);
-      // Skip form of last attribute.
-      read_uleb128 (&count_buf);
-    }
-
-  if (count_buf.reported_underflow)
-    return 0;
-
-  if (num_abbrevs == 0)
-    return 1;
-
-  abbrevs->num_abbrevs = num_abbrevs;
-  abbrevs->abbrevs = ((struct abbrev *)
-		      backtrace_alloc (state,
-				       num_abbrevs * sizeof (struct abbrev),
-				       error_callback, data));
-  if (abbrevs->abbrevs == NULL)
-    return 0;
-  memset (abbrevs->abbrevs, 0, num_abbrevs * sizeof (struct abbrev));
-
-  num_abbrevs = 0;
-  while (1)
-    {
-      uint64_t code;
-      struct abbrev a;
-      size_t num_attrs;
-      struct attr *attrs;
-
-      if (abbrev_buf.reported_underflow)
-	goto fail;
-
-      code = read_uleb128 (&abbrev_buf);
-      if (code == 0)
-	break;
-
-      a.code = code;
-      a.tag = (enum dwarf_tag) read_uleb128 (&abbrev_buf);
-      a.has_children = read_byte (&abbrev_buf);
-
-      count_buf = abbrev_buf;
-      num_attrs = 0;
-      while (read_uleb128 (&count_buf) != 0)
-	{
-	  ++num_attrs;
-	  read_uleb128 (&count_buf);
-	}
-
-      if (num_attrs == 0)
-	{
-	  attrs = NULL;
-	  read_uleb128 (&abbrev_buf);
-	  read_uleb128 (&abbrev_buf);
-	}
-      else
-	{
-	  attrs = ((struct attr *)
-		   backtrace_alloc (state, num_attrs * sizeof *attrs,
-				    error_callback, data));
-	  if (attrs == NULL)
-	    goto fail;
-	  num_attrs = 0;
-	  while (1)
-	    {
-	      uint64_t name;
-	      uint64_t form;
-
-	      name = read_uleb128 (&abbrev_buf);
-	      form = read_uleb128 (&abbrev_buf);
-	      if (name == 0)
-		break;
-	      attrs[num_attrs].name = (enum dwarf_attribute) name;
-	      attrs[num_attrs].form = (enum dwarf_form) form;
-	      ++num_attrs;
-	    }
-	}
-
-      a.num_attrs = num_attrs;
-      a.attrs = attrs;
-
-      abbrevs->abbrevs[num_abbrevs] = a;
-      ++num_abbrevs;
-    }
-
-  backtrace_qsort (abbrevs->abbrevs, abbrevs->num_abbrevs,
-		   sizeof (struct abbrev), abbrev_compare);
-
-  return 1;
-
- fail:
-  free_abbrevs (state, abbrevs, error_callback, data);
-  return 0;
-}
-
-/* Return the abbrev information for an abbrev code.  */
-
-static const struct abbrev *
-lookup_abbrev (struct abbrevs *abbrevs, uint64_t code,
-	       backtrace_error_callback error_callback, void *data)
-{
-  struct abbrev key;
-  void *p;
-
-  /* With GCC, where abbrevs are simply numbered in order, we should
-     be able to just look up the entry.  */
-  if (code - 1 < abbrevs->num_abbrevs
-      && abbrevs->abbrevs[code - 1].code == code)
-    return &abbrevs->abbrevs[code - 1];
-
-  /* Otherwise we have to search.  */
-  memset (&key, 0, sizeof key);
-  key.code = code;
-  p = bsearch (&key, abbrevs->abbrevs, abbrevs->num_abbrevs,
-	       sizeof (struct abbrev), abbrev_compare);
-  if (p == NULL)
-    {
-      error_callback (data, "invalid abbreviation code", 0);
-      return NULL;
-    }
-  return (const struct abbrev *) p;
-}
-
-/* Add non-contiguous address ranges for a compilation unit.  Returns
-   1 on success, 0 on failure.  */
-
-static int
-add_unit_ranges (struct backtrace_state *state, uintptr_t base_address,
-		 struct unit *u, uint64_t ranges, uint64_t base,
-		 int is_bigendian, const unsigned char *dwarf_ranges,
-		 size_t dwarf_ranges_size,
-		 backtrace_error_callback error_callback, void *data,
-		 struct unit_addrs_vector *addrs)
-{
-  struct dwarf_buf ranges_buf;
-
-  if (ranges >= dwarf_ranges_size)
-    {
-      error_callback (data, "ranges offset out of range", 0);
-      return 0;
-    }
-
-  ranges_buf.name = ".debug_ranges";
-  ranges_buf.start = dwarf_ranges;
-  ranges_buf.buf = dwarf_ranges + ranges;
-  ranges_buf.left = dwarf_ranges_size - ranges;
-  ranges_buf.is_bigendian = is_bigendian;
-  ranges_buf.error_callback = error_callback;
-  ranges_buf.data = data;
-  ranges_buf.reported_underflow = 0;
-
-  while (1)
-    {
-      uint64_t low;
-      uint64_t high;
-
-      if (ranges_buf.reported_underflow)
-	return 0;
-
-      low = read_address (&ranges_buf, u->addrsize);
-      high = read_address (&ranges_buf, u->addrsize);
-
-      if (low == 0 && high == 0)
-	break;
-
-      if (is_highest_address (low, u->addrsize))
-	base = high;
-      else
-	{
-	  struct unit_addrs a;
-
-	  a.low = low + base;
-	  a.high = high + base;
-	  a.u = u;
-	  if (!add_unit_addr (state, base_address, a, error_callback, data,
-			      addrs))
-	    return 0;
-	}
-    }
-
-  if (ranges_buf.reported_underflow)
-    return 0;
-
-  return 1;
-}
-
-/* Find the address range covered by a compilation unit, reading from
-   UNIT_BUF and adding values to U.  Returns 1 if all data could be
-   read, 0 if there is some error.  */
-
-static int
-find_address_ranges (struct backtrace_state *state, uintptr_t base_address,
-		     struct dwarf_buf *unit_buf,
-		     const unsigned char *dwarf_str, size_t dwarf_str_size,
-		     const unsigned char *dwarf_ranges,
-		     size_t dwarf_ranges_size,
-		     int is_bigendian, backtrace_error_callback error_callback,
-		     void *data, struct unit *u,
-		     struct unit_addrs_vector *addrs)
-{
-  while (unit_buf->left > 0)
-    {
-      uint64_t code;
-      const struct abbrev *abbrev;
-      uint64_t lowpc;
-      int have_lowpc;
-      uint64_t highpc;
-      int have_highpc;
-      int highpc_is_relative;
-      uint64_t ranges;
-      int have_ranges;
-      size_t i;
-
-      code = read_uleb128 (unit_buf);
-      if (code == 0)
-	return 1;
-
-      abbrev = lookup_abbrev (&u->abbrevs, code, error_callback, data);
-      if (abbrev == NULL)
-	return 0;
-
-      lowpc = 0;
-      have_lowpc = 0;
-      highpc = 0;
-      have_highpc = 0;
-      highpc_is_relative = 0;
-      ranges = 0;
-      have_ranges = 0;
-      for (i = 0; i < abbrev->num_attrs; ++i)
-	{
-	  struct attr_val val;
-
-	  if (!read_attribute (abbrev->attrs[i].form, unit_buf,
-			       u->is_dwarf64, u->version, u->addrsize,
-			       dwarf_str, dwarf_str_size, &val))
-	    return 0;
-
-	  switch (abbrev->attrs[i].name)
-	    {
-	    case DW_AT_low_pc:
-	      if (val.encoding == ATTR_VAL_ADDRESS)
-		{
-		  lowpc = val.u.uint;
-		  have_lowpc = 1;
-		}
-	      break;
-
-	    case DW_AT_high_pc:
-	      if (val.encoding == ATTR_VAL_ADDRESS)
-		{
-		  highpc = val.u.uint;
-		  have_highpc = 1;
-		}
-	      else if (val.encoding == ATTR_VAL_UINT)
-		{
-		  highpc = val.u.uint;
-		  have_highpc = 1;
-		  highpc_is_relative = 1;
-		}
-	      break;
-
-	    case DW_AT_ranges:
-	      if (val.encoding == ATTR_VAL_UINT
-		  || val.encoding == ATTR_VAL_REF_SECTION)
-		{
-		  ranges = val.u.uint;
-		  have_ranges = 1;
-		}
-	      break;
-
-	    case DW_AT_stmt_list:
-	      if (abbrev->tag == DW_TAG_compile_unit
-		  && (val.encoding == ATTR_VAL_UINT
-		      || val.encoding == ATTR_VAL_REF_SECTION))
-		u->lineoff = val.u.uint;
-	      break;
-
-	    case DW_AT_name:
-	      if (abbrev->tag == DW_TAG_compile_unit
-		  && val.encoding == ATTR_VAL_STRING)
-		u->filename = val.u.string;
-	      break;
-
-	    case DW_AT_comp_dir:
-	      if (abbrev->tag == DW_TAG_compile_unit
-		  && val.encoding == ATTR_VAL_STRING)
-		u->comp_dir = val.u.string;
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-      if (abbrev->tag == DW_TAG_compile_unit
-	  || abbrev->tag == DW_TAG_subprogram)
-	{
-	  if (have_ranges)
-	    {
-	      if (!add_unit_ranges (state, base_address, u, ranges, lowpc,
-				    is_bigendian, dwarf_ranges,
-				    dwarf_ranges_size, error_callback,
-				    data, addrs))
-		return 0;
-	    }
-	  else if (have_lowpc && have_highpc)
-	    {
-	      struct unit_addrs a;
-
-	      if (highpc_is_relative)
-		highpc += lowpc;
-	      a.low = lowpc;
-	      a.high = highpc;
-	      a.u = u;
-
-	      if (!add_unit_addr (state, base_address, a, error_callback, data,
-				  addrs))
-		return 0;
-	    }
-
-	  /* If we found the PC range in the DW_TAG_compile_unit, we
-	     can stop now.  */
-	  if (abbrev->tag == DW_TAG_compile_unit
-	      && (have_ranges || (have_lowpc && have_highpc)))
-	    return 1;
-	}
-
-      if (abbrev->has_children)
-	{
-	  if (!find_address_ranges (state, base_address, unit_buf,
-				    dwarf_str, dwarf_str_size,
-				    dwarf_ranges, dwarf_ranges_size,
-				    is_bigendian, error_callback, data,
-				    u, addrs))
-	    return 0;
-	}
-    }
-
-  return 1;
-}
-
-/* Build a mapping from address ranges to the compilation units where
-   the line number information for that range can be found.  Returns 1
-   on success, 0 on failure.  */
-
-static int
-build_address_map (struct backtrace_state *state, uintptr_t base_address,
-		   const unsigned char *dwarf_info, size_t dwarf_info_size,
-		   const unsigned char *dwarf_abbrev, size_t dwarf_abbrev_size,
-		   const unsigned char *dwarf_ranges, size_t dwarf_ranges_size,
-		   const unsigned char *dwarf_str, size_t dwarf_str_size,
-		   int is_bigendian, backtrace_error_callback error_callback,
-		   void *data, struct unit_addrs_vector *addrs)
-{
-  struct dwarf_buf info;
-  struct abbrevs abbrevs;
-
-  memset (&addrs->vec, 0, sizeof addrs->vec);
-  addrs->count = 0;
-
-  /* Read through the .debug_info section.  FIXME: Should we use the
-     .debug_aranges section?  gdb and addr2line don't use it, but I'm
-     not sure why.  */
-
-  info.name = ".debug_info";
-  info.start = dwarf_info;
-  info.buf = dwarf_info;
-  info.left = dwarf_info_size;
-  info.is_bigendian = is_bigendian;
-  info.error_callback = error_callback;
-  info.data = data;
-  info.reported_underflow = 0;
-
-  memset (&abbrevs, 0, sizeof abbrevs);
-  while (info.left > 0)
-    {
-      const unsigned char *unit_data_start;
-      uint64_t len;
-      int is_dwarf64;
-      struct dwarf_buf unit_buf;
-      int version;
-      uint64_t abbrev_offset;
-      int addrsize;
-      struct unit *u;
-
-      if (info.reported_underflow)
-	goto fail;
-
-      unit_data_start = info.buf;
-
-      is_dwarf64 = 0;
-      len = read_uint32 (&info);
-      if (len == 0xffffffff)
-	{
-	  len = read_uint64 (&info);
-	  is_dwarf64 = 1;
-	}
-
-      unit_buf = info;
-      unit_buf.left = len;
-
-      if (!advance (&info, len))
-	goto fail;
-
-      version = read_uint16 (&unit_buf);
-      if (version < 2 || version > 4)
-	{
-	  dwarf_buf_error (&unit_buf, "unrecognized DWARF version");
-	  goto fail;
-	}
-
-      abbrev_offset = read_offset (&unit_buf, is_dwarf64);
-      if (!read_abbrevs (state, abbrev_offset, dwarf_abbrev, dwarf_abbrev_size,
-			 is_bigendian, error_callback, data, &abbrevs))
-	goto fail;
-
-      addrsize = read_byte (&unit_buf);
-
-      u = ((struct unit *)
-	   backtrace_alloc (state, sizeof *u, error_callback, data));
-      if (u == NULL)
-	goto fail;
-      u->unit_data = unit_buf.buf;
-      u->unit_data_len = unit_buf.left;
-      u->unit_data_offset = unit_buf.buf - unit_data_start;
-      u->version = version;
-      u->is_dwarf64 = is_dwarf64;
-      u->addrsize = addrsize;
-      u->filename = NULL;
-      u->comp_dir = NULL;
-      u->abs_filename = NULL;
-      u->lineoff = 0;
-      u->abbrevs = abbrevs;
-      memset (&abbrevs, 0, sizeof abbrevs);
-
-      /* The actual line number mappings will be read as needed.  */
-      u->lines = NULL;
-      u->lines_count = 0;
-      u->function_addrs = NULL;
-      u->function_addrs_count = 0;
-
-      if (!find_address_ranges (state, base_address, &unit_buf,
-				dwarf_str, dwarf_str_size,
-				dwarf_ranges, dwarf_ranges_size,
-				is_bigendian, error_callback, data,
-				u, addrs))
-	{
-	  free_abbrevs (state, &u->abbrevs, error_callback, data);
-	  backtrace_free (state, u, sizeof *u, error_callback, data);
-	  goto fail;
-	}
-
-      if (unit_buf.reported_underflow)
-	{
-	  free_abbrevs (state, &u->abbrevs, error_callback, data);
-	  backtrace_free (state, u, sizeof *u, error_callback, data);
-	  goto fail;
-	}
-    }
-  if (info.reported_underflow)
-    goto fail;
-
-  return 1;
-
- fail:
-  free_abbrevs (state, &abbrevs, error_callback, data);
-  free_unit_addrs_vector (state, addrs, error_callback, data);
-  return 0;
-}
-
-/* Add a new mapping to the vector of line mappings that we are
-   building.  Returns 1 on success, 0 on failure.  */
-
-static int
-add_line (struct backtrace_state *state, struct dwarf_data *ddata,
-	  uintptr_t pc, const char *filename, int lineno,
-	  backtrace_error_callback error_callback, void *data,
-	  struct line_vector *vec)
-{
-  struct line *ln;
-
-  /* If we are adding the same mapping, ignore it.  This can happen
-     when using discriminators.  */
-  if (vec->count > 0)
-    {
-      ln = (struct line *) vec->vec.base + (vec->count - 1);
-      if (pc == ln->pc && filename == ln->filename && lineno == ln->lineno)
-	return 1;
-    }
-
-  ln = ((struct line *)
-	backtrace_vector_grow (state, sizeof (struct line), error_callback,
-			       data, &vec->vec));
-  if (ln == NULL)
-    return 0;
-
-  /* Add in the base address here, so that we can look up the PC
-     directly.  */
-  ln->pc = pc + ddata->base_address;
-
-  ln->filename = filename;
-  ln->lineno = lineno;
-  ln->idx = vec->count;
-
-  ++vec->count;
-
-  return 1;
-}
-
-/* Free the line header information.  */
-
-static void
-free_line_header (struct backtrace_state *state, struct line_header *hdr,
-		  backtrace_error_callback error_callback, void *data)
-{
-  if (hdr->dirs_count != 0)
-    backtrace_free (state, hdr->dirs, hdr->dirs_count * sizeof (const char *),
-		    error_callback, data);
-  backtrace_free (state, hdr->filenames,
-		  hdr->filenames_count * sizeof (char *),
-		  error_callback, data);
-}
-
-/* Read the line header.  Return 1 on success, 0 on failure.  */
-
-static int
-read_line_header (struct backtrace_state *state, struct unit *u,
-		  int is_dwarf64, struct dwarf_buf *line_buf,
-		  struct line_header *hdr)
-{
-  uint64_t hdrlen;
-  struct dwarf_buf hdr_buf;
-  const unsigned char *p;
-  const unsigned char *pend;
-  size_t i;
-
-  hdr->version = read_uint16 (line_buf);
-  if (hdr->version < 2 || hdr->version > 4)
-    {
-      dwarf_buf_error (line_buf, "unsupported line number version");
-      return 0;
-    }
-
-  hdrlen = read_offset (line_buf, is_dwarf64);
-
-  hdr_buf = *line_buf;
-  hdr_buf.left = hdrlen;
-
-  if (!advance (line_buf, hdrlen))
-    return 0;
-
-  hdr->min_insn_len = read_byte (&hdr_buf);
-  if (hdr->version < 4)
-    hdr->max_ops_per_insn = 1;
-  else
-    hdr->max_ops_per_insn = read_byte (&hdr_buf);
-
-  /* We don't care about default_is_stmt.  */
-  read_byte (&hdr_buf);
-
-  hdr->line_base = read_sbyte (&hdr_buf);
-  hdr->line_range = read_byte (&hdr_buf);
-
-  hdr->opcode_base = read_byte (&hdr_buf);
-  hdr->opcode_lengths = hdr_buf.buf;
-  if (!advance (&hdr_buf, hdr->opcode_base - 1))
-    return 0;
-
-  /* Count the number of directory entries.  */
-  hdr->dirs_count = 0;
-  p = hdr_buf.buf;
-  pend = p + hdr_buf.left;
-  while (p < pend && *p != '\0')
-    {
-      p += strnlen((const char *) p, pend - p) + 1;
-      ++hdr->dirs_count;
-    }
-
-  hdr->dirs = NULL;
-  if (hdr->dirs_count != 0)
-    {
-      hdr->dirs = ((const char **)
-		   backtrace_alloc (state,
-				    hdr->dirs_count * sizeof (const char *),
-				    line_buf->error_callback, line_buf->data));
-      if (hdr->dirs == NULL)
-	return 0;
-    }
-
-  i = 0;
-  while (*hdr_buf.buf != '\0')
-    {
-      if (hdr_buf.reported_underflow)
-	return 0;
-
-      hdr->dirs[i] = (const char *) hdr_buf.buf;
-      ++i;
-      if (!advance (&hdr_buf,
-		    strnlen ((const char *) hdr_buf.buf, hdr_buf.left) + 1))
-	return 0;
-    }
-  if (!advance (&hdr_buf, 1))
-    return 0;
-
-  /* Count the number of file entries.  */
-  hdr->filenames_count = 0;
-  p = hdr_buf.buf;
-  pend = p + hdr_buf.left;
-  while (p < pend && *p != '\0')
-    {
-      p += strnlen ((const char *) p, pend - p) + 1;
-      p += leb128_len (p);
-      p += leb128_len (p);
-      p += leb128_len (p);
-      ++hdr->filenames_count;
-    }
-
-  hdr->filenames = ((const char **)
-		    backtrace_alloc (state,
-				     hdr->filenames_count * sizeof (char *),
-				     line_buf->error_callback,
-				     line_buf->data));
-  if (hdr->filenames == NULL)
-    return 0;
-  i = 0;
-  while (*hdr_buf.buf != '\0')
-    {
-      const char *filename;
-      uint64_t dir_index;
-
-      if (hdr_buf.reported_underflow)
-	return 0;
-
-      filename = (const char *) hdr_buf.buf;
-      if (!advance (&hdr_buf,
-		    strnlen ((const char *) hdr_buf.buf, hdr_buf.left) + 1))
-	return 0;
-      dir_index = read_uleb128 (&hdr_buf);
-      if (IS_ABSOLUTE_PATH (filename)
-	  || (dir_index == 0 && u->comp_dir == NULL))
-	hdr->filenames[i] = filename;
-      else
-	{
-	  const char *dir;
-	  size_t dir_len;
-	  size_t filename_len;
-	  char *s;
-
-	  if (dir_index == 0)
-	    dir = u->comp_dir;
-	  else if (dir_index - 1 < hdr->dirs_count)
-	    dir = hdr->dirs[dir_index - 1];
-	  else
-	    {
-	      dwarf_buf_error (line_buf,
-			       ("invalid directory index in "
-				"line number program header"));
-	      return 0;
-	    }
-	  dir_len = strlen (dir);
-	  filename_len = strlen (filename);
-	  s = ((char *)
-	       backtrace_alloc (state, dir_len + filename_len + 2,
-				line_buf->error_callback, line_buf->data));
-	  if (s == NULL)
-	    return 0;
-	  memcpy (s, dir, dir_len);
-	  /* FIXME: If we are on a DOS-based file system, and the
-	     directory or the file name use backslashes, then we
-	     should use a backslash here.  */
-	  s[dir_len] = '/';
-	  memcpy (s + dir_len + 1, filename, filename_len + 1);
-	  hdr->filenames[i] = s;
-	}
-
-      /* Ignore the modification time and size.  */
-      read_uleb128 (&hdr_buf);
-      read_uleb128 (&hdr_buf);
-
-      ++i;
-    }
-
-  if (hdr_buf.reported_underflow)
-    return 0;
-
-  return 1;
-}
-
-/* Read the line program, adding line mappings to VEC.  Return 1 on
-   success, 0 on failure.  */
-
-static int
-read_line_program (struct backtrace_state *state, struct dwarf_data *ddata,
-		   struct unit *u, const struct line_header *hdr,
-		   struct dwarf_buf *line_buf, struct line_vector *vec)
-{
-  uint64_t address;
-  unsigned int op_index;
-  const char *reset_filename;
-  const char *filename;
-  int lineno;
-
-  address = 0;
-  op_index = 0;
-  if (hdr->filenames_count > 0)
-    reset_filename = hdr->filenames[0];
-  else
-    reset_filename = "";
-  filename = reset_filename;
-  lineno = 1;
-  while (line_buf->left > 0)
-    {
-      unsigned int op;
-
-      op = read_byte (line_buf);
-      if (op >= hdr->opcode_base)
-	{
-	  unsigned int advance;
-
-	  /* Special opcode.  */
-	  op -= hdr->opcode_base;
-	  advance = op / hdr->line_range;
-	  address += (hdr->min_insn_len * (op_index + advance)
-		      / hdr->max_ops_per_insn);
-	  op_index = (op_index + advance) % hdr->max_ops_per_insn;
-	  lineno += hdr->line_base + (int) (op % hdr->line_range);
-	  add_line (state, ddata, address, filename, lineno,
-		    line_buf->error_callback, line_buf->data, vec);
-	}
-      else if (op == DW_LNS_extended_op)
-	{
-	  uint64_t len;
-
-	  len = read_uleb128 (line_buf);
-	  op = read_byte (line_buf);
-	  switch (op)
-	    {
-	    case DW_LNE_end_sequence:
-	      /* FIXME: Should we mark the high PC here?  It seems
-		 that we already have that information from the
-		 compilation unit.  */
-	      address = 0;
-	      op_index = 0;
-	      filename = reset_filename;
-	      lineno = 1;
-	      break;
-	    case DW_LNE_set_address:
-	      address = read_address (line_buf, u->addrsize);
-	      break;
-	    case DW_LNE_define_file:
-	      {
-		const char *f;
-		unsigned int dir_index;
-
-		f = (const char *) line_buf->buf;
-		if (!advance (line_buf, strnlen (f, line_buf->left) + 1))
-		  return 0;
-		dir_index = read_uleb128 (line_buf);
-		/* Ignore that time and length.  */
-		read_uleb128 (line_buf);
-		read_uleb128 (line_buf);
-		if (IS_ABSOLUTE_PATH (f))
-		  filename = f;
-		else
-		  {
-		    const char *dir;
-		    size_t dir_len;
-		    size_t f_len;
-		    char *p;
-
-		    if (dir_index == 0)
-		      dir = u->comp_dir;
-		    else if (dir_index - 1 < hdr->dirs_count)
-		      dir = hdr->dirs[dir_index - 1];
-		    else
-		      {
-			dwarf_buf_error (line_buf,
-					 ("invalid directory index "
-					  "in line number program"));
-			return 0;
-		      }
-		    dir_len = strlen (dir);
-		    f_len = strlen (f);
-		    p = ((char *)
-			 backtrace_alloc (state, dir_len + f_len + 2,
-					  line_buf->error_callback,
-					  line_buf->data));
-		    if (p == NULL)
-		      return 0;
-		    memcpy (p, dir, dir_len);
-		    /* FIXME: If we are on a DOS-based file system,
-		       and the directory or the file name use
-		       backslashes, then we should use a backslash
-		       here.  */
-		    p[dir_len] = '/';
-		    memcpy (p + dir_len + 1, f, f_len + 1);
-		    filename = p;
-		  }
-	      }
-	      break;
-	    case DW_LNE_set_discriminator:
-	      /* We don't care about discriminators.  */
-	      read_uleb128 (line_buf);
-	      break;
-	    default:
-	      if (!advance (line_buf, len - 1))
-		return 0;
-	      break;
-	    }
-	}
-      else
-	{
-	  switch (op)
-	    {
-	    case DW_LNS_copy:
-	      add_line (state, ddata, address, filename, lineno,
-			line_buf->error_callback, line_buf->data, vec);
-	      break;
-	    case DW_LNS_advance_pc:
-	      {
-		uint64_t advance;
-
-		advance = read_uleb128 (line_buf);
-		address += (hdr->min_insn_len * (op_index + advance)
-			    / hdr->max_ops_per_insn);
-		op_index = (op_index + advance) % hdr->max_ops_per_insn;
-	      }
-	      break;
-	    case DW_LNS_advance_line:
-	      lineno += (int) read_sleb128 (line_buf);
-	      break;
-	    case DW_LNS_set_file:
-	      {
-		uint64_t fileno;
-
-		fileno = read_uleb128 (line_buf);
-		if (fileno == 0)
-		  filename = "";
-		else
-		  {
-		    if (fileno - 1 >= hdr->filenames_count)
-		      {
-			dwarf_buf_error (line_buf,
-					 ("invalid file number in "
-					  "line number program"));
-			return 0;
-		      }
-		    filename = hdr->filenames[fileno - 1];
-		  }
-	      }
-	      break;
-	    case DW_LNS_set_column:
-	      read_uleb128 (line_buf);
-	      break;
-	    case DW_LNS_negate_stmt:
-	      break;
-	    case DW_LNS_set_basic_block:
-	      break;
-	    case DW_LNS_const_add_pc:
-	      {
-		unsigned int advance;
-
-		op = 255 - hdr->opcode_base;
-		advance = op / hdr->line_range;
-		address += (hdr->min_insn_len * (op_index + advance)
-			    / hdr->max_ops_per_insn);
-		op_index = (op_index + advance) % hdr->max_ops_per_insn;
-	      }
-	      break;
-	    case DW_LNS_fixed_advance_pc:
-	      address += read_uint16 (line_buf);
-	      op_index = 0;
-	      break;
-	    case DW_LNS_set_prologue_end:
-	      break;
-	    case DW_LNS_set_epilogue_begin:
-	      break;
-	    case DW_LNS_set_isa:
-	      read_uleb128 (line_buf);
-	      break;
-	    default:
-	      {
-		unsigned int i;
-
-		for (i = hdr->opcode_lengths[op - 1]; i > 0; --i)
-		  read_uleb128 (line_buf);
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return 1;
-}
-
-/* Read the line number information for a compilation unit.  Returns 1
-   on success, 0 on failure.  */
-
-static int
-read_line_info (struct backtrace_state *state, struct dwarf_data *ddata,
-		backtrace_error_callback error_callback, void *data,
-		struct unit *u, struct line_header *hdr, struct line **lines,
-		size_t *lines_count)
-{
-  struct line_vector vec;
-  struct dwarf_buf line_buf;
-  uint64_t len;
-  int is_dwarf64;
-  struct line *ln;
-
-  memset (&vec.vec, 0, sizeof vec.vec);
-  vec.count = 0;
-
-  memset (hdr, 0, sizeof *hdr);
-
-  if (u->lineoff != (off_t) (size_t) u->lineoff
-      || (size_t) u->lineoff >= ddata->dwarf_line_size)
-    {
-      error_callback (data, "unit line offset out of range", 0);
-      goto fail;
-    }
-
-  line_buf.name = ".debug_line";
-  line_buf.start = ddata->dwarf_line;
-  line_buf.buf = ddata->dwarf_line + u->lineoff;
-  line_buf.left = ddata->dwarf_line_size - u->lineoff;
-  line_buf.is_bigendian = ddata->is_bigendian;
-  line_buf.error_callback = error_callback;
-  line_buf.data = data;
-  line_buf.reported_underflow = 0;
-
-  is_dwarf64 = 0;
-  len = read_uint32 (&line_buf);
-  if (len == 0xffffffff)
-    {
-      len = read_uint64 (&line_buf);
-      is_dwarf64 = 1;
-    }
-  line_buf.left = len;
-
-  if (!read_line_header (state, u, is_dwarf64, &line_buf, hdr))
-    goto fail;
-
-  if (!read_line_program (state, ddata, u, hdr, &line_buf, &vec))
-    goto fail;
-
-  if (line_buf.reported_underflow)
-    goto fail;
-
-  if (vec.count == 0)
-    {
-      /* This is not a failure in the sense of a generating an error,
-	 but it is a failure in that sense that we have no useful
-	 information.  */
-      goto fail;
-    }
-
-  /* Allocate one extra entry at the end.  */
-  ln = ((struct line *)
-	backtrace_vector_grow (state, sizeof (struct line), error_callback,
-			       data, &vec.vec));
-  if (ln == NULL)
-    goto fail;
-  ln->pc = (uintptr_t) -1;
-  ln->filename = NULL;
-  ln->lineno = 0;
-  ln->idx = 0;
-
-  if (!backtrace_vector_release (state, &vec.vec, error_callback, data))
-    goto fail;
-
-  ln = (struct line *) vec.vec.base;
-  backtrace_qsort (ln, vec.count, sizeof (struct line), line_compare);
-
-  *lines = ln;
-  *lines_count = vec.count;
-
-  return 1;
-
- fail:
-  vec.vec.alc += vec.vec.size;
-  vec.vec.size = 0;
-  backtrace_vector_release (state, &vec.vec, error_callback, data);
-  free_line_header (state, hdr, error_callback, data);
-  *lines = (struct line *) (uintptr_t) -1;
-  *lines_count = 0;
-  return 0;
-}
-
-/* Read the name of a function from a DIE referenced by a
-   DW_AT_abstract_origin or DW_AT_specification tag.  OFFSET is within
-   the same compilation unit.  */
-
-static const char *
-read_referenced_name (struct dwarf_data *ddata, struct unit *u,
-		      uint64_t offset, backtrace_error_callback error_callback,
-		      void *data)
-{
-  struct dwarf_buf unit_buf;
-  uint64_t code;
-  const struct abbrev *abbrev;
-  const char *ret;
-  size_t i;
-
-  /* OFFSET is from the start of the data for this compilation unit.
-     U->unit_data is the data, but it starts U->unit_data_offset bytes
-     from the beginning.  */
-
-  if (offset < u->unit_data_offset
-      || offset - u->unit_data_offset >= u->unit_data_len)
-    {
-      error_callback (data,
-		      "abstract origin or specification out of range",
-		      0);
-      return NULL;
-    }
-
-  offset -= u->unit_data_offset;
-
-  unit_buf.name = ".debug_info";
-  unit_buf.start = ddata->dwarf_info;
-  unit_buf.buf = u->unit_data + offset;
-  unit_buf.left = u->unit_data_len - offset;
-  unit_buf.is_bigendian = ddata->is_bigendian;
-  unit_buf.error_callback = error_callback;
-  unit_buf.data = data;
-  unit_buf.reported_underflow = 0;
-
-  code = read_uleb128 (&unit_buf);
-  if (code == 0)
-    {
-      dwarf_buf_error (&unit_buf, "invalid abstract origin or specification");
-      return NULL;
-    }
-
-  abbrev = lookup_abbrev (&u->abbrevs, code, error_callback, data);
-  if (abbrev == NULL)
-    return NULL;
-
-  ret = NULL;
-  for (i = 0; i < abbrev->num_attrs; ++i)
-    {
-      struct attr_val val;
-
-      if (!read_attribute (abbrev->attrs[i].form, &unit_buf,
-			   u->is_dwarf64, u->version, u->addrsize,
-			   ddata->dwarf_str, ddata->dwarf_str_size,
-			   &val))
-	return NULL;
-
-      switch (abbrev->attrs[i].name)
-	{
-	case DW_AT_name:
-	  /* We prefer the linkage name if get one.  */
-	  if (val.encoding == ATTR_VAL_STRING)
-	    ret = val.u.string;
-	  break;
-
-	case DW_AT_linkage_name:
-	case DW_AT_MIPS_linkage_name:
-	  if (val.encoding == ATTR_VAL_STRING)
-	    return val.u.string;
-	  break;
-
-	case DW_AT_specification:
-	  if (abbrev->attrs[i].form == DW_FORM_ref_addr
-	      || abbrev->attrs[i].form == DW_FORM_ref_sig8)
-	    {
-	      /* This refers to a specification defined in some other
-		 compilation unit.  We can handle this case if we
-		 must, but it's harder.  */
-	      break;
-	    }
-	  if (val.encoding == ATTR_VAL_UINT
-	      || val.encoding == ATTR_VAL_REF_UNIT)
-	    {
-	      const char *name;
-
-	      name = read_referenced_name (ddata, u, val.u.uint,
-					   error_callback, data);
-	      if (name != NULL)
-		ret = name;
-	    }
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  return ret;
-}
-
-/* Add a single range to U that maps to function.  Returns 1 on
-   success, 0 on error.  */
-
-static int
-add_function_range (struct backtrace_state *state, struct dwarf_data *ddata,
-		    struct function *function, uint64_t lowpc, uint64_t highpc,
-		    backtrace_error_callback error_callback,
-		    void *data, struct function_vector *vec)
-{
-  struct function_addrs *p;
-
-  /* Add in the base address here, so that we can look up the PC
-     directly.  */
-  lowpc += ddata->base_address;
-  highpc += ddata->base_address;
-
-  if (vec->count > 0)
-    {
-      p = (struct function_addrs *) vec->vec.base + vec->count - 1;
-      if ((lowpc == p->high || lowpc == p->high + 1)
-	  && function == p->function)
-	{
-	  if (highpc > p->high)
-	    p->high = highpc;
-	  return 1;
-	}
-    }
-
-  p = ((struct function_addrs *)
-       backtrace_vector_grow (state, sizeof (struct function_addrs),
-			      error_callback, data, &vec->vec));
-  if (p == NULL)
-    return 0;
-
-  p->low = lowpc;
-  p->high = highpc;
-  p->function = function;
-  ++vec->count;
-  return 1;
-}
-
-/* Add PC ranges to U that map to FUNCTION.  Returns 1 on success, 0
-   on error.  */
-
-static int
-add_function_ranges (struct backtrace_state *state, struct dwarf_data *ddata,
-		     struct unit *u, struct function *function,
-		     uint64_t ranges, uint64_t base,
-		     backtrace_error_callback error_callback, void *data,
-		     struct function_vector *vec)
-{
-  struct dwarf_buf ranges_buf;
-
-  if (ranges >= ddata->dwarf_ranges_size)
-    {
-      error_callback (data, "function ranges offset out of range", 0);
-      return 0;
-    }
-
-  ranges_buf.name = ".debug_ranges";
-  ranges_buf.start = ddata->dwarf_ranges;
-  ranges_buf.buf = ddata->dwarf_ranges + ranges;
-  ranges_buf.left = ddata->dwarf_ranges_size - ranges;
-  ranges_buf.is_bigendian = ddata->is_bigendian;
-  ranges_buf.error_callback = error_callback;
-  ranges_buf.data = data;
-  ranges_buf.reported_underflow = 0;
-
-  while (1)
-    {
-      uint64_t low;
-      uint64_t high;
-
-      if (ranges_buf.reported_underflow)
-	return 0;
-
-      low = read_address (&ranges_buf, u->addrsize);
-      high = read_address (&ranges_buf, u->addrsize);
-
-      if (low == 0 && high == 0)
-	break;
-
-      if (is_highest_address (low, u->addrsize))
-	base = high;
-      else
-	{
-	  if (!add_function_range (state, ddata, function, low + base,
-				   high + base, error_callback, data, vec))
-	    return 0;
-	}
-    }
-
-  if (ranges_buf.reported_underflow)
-    return 0;
-
-  return 1;
-}
-
-/* Read one entry plus all its children.  Add function addresses to
-   VEC.  Returns 1 on success, 0 on error.  */
-
-static int
-read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
-		     struct unit *u, uint64_t base, struct dwarf_buf *unit_buf,
-		     const struct line_header *lhdr,
-		     backtrace_error_callback error_callback, void *data,
-		     struct function_vector *vec_function,
-		     struct function_vector *vec_inlined)
-{
-  while (unit_buf->left > 0)
-    {
-      uint64_t code;
-      const struct abbrev *abbrev;
-      int is_function;
-      struct function *function;
-      struct function_vector *vec;
-      size_t i;
-      uint64_t lowpc;
-      int have_lowpc;
-      uint64_t highpc;
-      int have_highpc;
-      int highpc_is_relative;
-      uint64_t ranges;
-      int have_ranges;
-
-      code = read_uleb128 (unit_buf);
-      if (code == 0)
-	return 1;
-
-      abbrev = lookup_abbrev (&u->abbrevs, code, error_callback, data);
-      if (abbrev == NULL)
-	return 0;
-
-      is_function = (abbrev->tag == DW_TAG_subprogram
-		     || abbrev->tag == DW_TAG_entry_point
-		     || abbrev->tag == DW_TAG_inlined_subroutine);
-
-      if (abbrev->tag == DW_TAG_inlined_subroutine)
-	vec = vec_inlined;
-      else
-	vec = vec_function;
-
-      function = NULL;
-      if (is_function)
-	{
-	  function = ((struct function *)
-		      backtrace_alloc (state, sizeof *function,
-				       error_callback, data));
-	  if (function == NULL)
-	    return 0;
-	  memset (function, 0, sizeof *function);
-	}
-
-      lowpc = 0;
-      have_lowpc = 0;
-      highpc = 0;
-      have_highpc = 0;
-      highpc_is_relative = 0;
-      ranges = 0;
-      have_ranges = 0;
-      for (i = 0; i < abbrev->num_attrs; ++i)
-	{
-	  struct attr_val val;
-
-	  if (!read_attribute (abbrev->attrs[i].form, unit_buf,
-			       u->is_dwarf64, u->version, u->addrsize,
-			       ddata->dwarf_str, ddata->dwarf_str_size,
-			       &val))
-	    return 0;
-
-	  /* The compile unit sets the base address for any address
-	     ranges in the function entries.  */
-	  if (abbrev->tag == DW_TAG_compile_unit
-	      && abbrev->attrs[i].name == DW_AT_low_pc
-	      && val.encoding == ATTR_VAL_ADDRESS)
-	    base = val.u.uint;
-
-	  if (is_function)
-	    {
-	      switch (abbrev->attrs[i].name)
-		{
-		case DW_AT_call_file:
-		  if (val.encoding == ATTR_VAL_UINT)
-		    {
-		      if (val.u.uint == 0)
-			function->caller_filename = "";
-		      else
-			{
-			  if (val.u.uint - 1 >= lhdr->filenames_count)
-			    {
-			      dwarf_buf_error (unit_buf,
-					       ("invalid file number in "
-						"DW_AT_call_file attribute"));
-			      return 0;
-			    }
-			  function->caller_filename =
-			    lhdr->filenames[val.u.uint - 1];
-			}
-		    }
-		  break;
-
-		case DW_AT_call_line:
-		  if (val.encoding == ATTR_VAL_UINT)
-		    function->caller_lineno = val.u.uint;
-		  break;
-
-		case DW_AT_abstract_origin:
-		case DW_AT_specification:
-		  if (abbrev->attrs[i].form == DW_FORM_ref_addr
-		      || abbrev->attrs[i].form == DW_FORM_ref_sig8)
-		    {
-		      /* This refers to an abstract origin defined in
-			 some other compilation unit.  We can handle
-			 this case if we must, but it's harder.  */
-		      break;
-		    }
-		  if (val.encoding == ATTR_VAL_UINT
-		      || val.encoding == ATTR_VAL_REF_UNIT)
-		    {
-		      const char *name;
-
-		      name = read_referenced_name (ddata, u, val.u.uint,
-						   error_callback, data);
-		      if (name != NULL)
-			function->name = name;
-		    }
-		  break;
-
-		case DW_AT_name:
-		  if (val.encoding == ATTR_VAL_STRING)
-		    {
-		      /* Don't override a name we found in some other
-			 way, as it will normally be more
-			 useful--e.g., this name is normally not
-			 mangled.  */
-		      if (function->name == NULL)
-			function->name = val.u.string;
-		    }
-		  break;
-
-		case DW_AT_linkage_name:
-		case DW_AT_MIPS_linkage_name:
-		  if (val.encoding == ATTR_VAL_STRING)
-		    function->name = val.u.string;
-		  break;
-
-		case DW_AT_low_pc:
-		  if (val.encoding == ATTR_VAL_ADDRESS)
-		    {
-		      lowpc = val.u.uint;
-		      have_lowpc = 1;
-		    }
-		  break;
-
-		case DW_AT_high_pc:
-		  if (val.encoding == ATTR_VAL_ADDRESS)
-		    {
-		      highpc = val.u.uint;
-		      have_highpc = 1;
-		    }
-		  else if (val.encoding == ATTR_VAL_UINT)
-		    {
-		      highpc = val.u.uint;
-		      have_highpc = 1;
-		      highpc_is_relative = 1;
-		    }
-		  break;
-
-		case DW_AT_ranges:
-		  if (val.encoding == ATTR_VAL_UINT
-		      || val.encoding == ATTR_VAL_REF_SECTION)
-		    {
-		      ranges = val.u.uint;
-		      have_ranges = 1;
-		    }
-		  break;
-
-		default:
-		  break;
-		}
-	    }
-	}
-
-      /* If we couldn't find a name for the function, we have no use
-	 for it.  */
-      if (is_function && function->name == NULL)
-	{
-	  backtrace_free (state, function, sizeof *function,
-			  error_callback, data);
-	  is_function = 0;
-	}
-
-      if (is_function)
-	{
-	  if (have_ranges)
-	    {
-	      if (!add_function_ranges (state, ddata, u, function, ranges,
-					base, error_callback, data, vec))
-		return 0;
-	    }
-	  else if (have_lowpc && have_highpc)
-	    {
-	      if (highpc_is_relative)
-		highpc += lowpc;
-	      if (!add_function_range (state, ddata, function, lowpc, highpc,
-				       error_callback, data, vec))
-		return 0;
-	    }
-	  else
-	    {
-	      backtrace_free (state, function, sizeof *function,
-			      error_callback, data);
-	      is_function = 0;
-	    }
-	}
-
-      if (abbrev->has_children)
-	{
-	  if (!is_function)
-	    {
-	      if (!read_function_entry (state, ddata, u, base, unit_buf, lhdr,
-					error_callback, data, vec_function,
-					vec_inlined))
-		return 0;
-	    }
-	  else
-	    {
-	      struct function_vector fvec;
-
-	      /* Gather any information for inlined functions in
-		 FVEC.  */
-
-	      memset (&fvec, 0, sizeof fvec);
-
-	      if (!read_function_entry (state, ddata, u, base, unit_buf, lhdr,
-					error_callback, data, vec_function,
-					&fvec))
-		return 0;
-
-	      if (fvec.count > 0)
-		{
-		  struct function_addrs *faddrs;
-
-		  if (!backtrace_vector_release (state, &fvec.vec,
-						 error_callback, data))
-		    return 0;
-
-		  faddrs = (struct function_addrs *) fvec.vec.base;
-		  backtrace_qsort (faddrs, fvec.count,
-				   sizeof (struct function_addrs),
-				   function_addrs_compare);
-
-		  function->function_addrs = faddrs;
-		  function->function_addrs_count = fvec.count;
-		}
-	    }
-	}
-    }
-
-  return 1;
-}
-
-/* Read function name information for a compilation unit.  We look
-   through the whole unit looking for function tags.  */
-
-static void
-read_function_info (struct backtrace_state *state, struct dwarf_data *ddata,
-		    const struct line_header *lhdr,
-		    backtrace_error_callback error_callback, void *data,
-		    struct unit *u, struct function_vector *fvec,
-		    struct function_addrs **ret_addrs,
-		    size_t *ret_addrs_count)
-{
-  struct function_vector lvec;
-  struct function_vector *pfvec;
-  struct dwarf_buf unit_buf;
-  struct function_addrs *addrs;
-  size_t addrs_count;
-
-  /* Use FVEC if it is not NULL.  Otherwise use our own vector.  */
-  if (fvec != NULL)
-    pfvec = fvec;
-  else
-    {
-      memset (&lvec, 0, sizeof lvec);
-      pfvec = &lvec;
-    }
-
-  unit_buf.name = ".debug_info";
-  unit_buf.start = ddata->dwarf_info;
-  unit_buf.buf = u->unit_data;
-  unit_buf.left = u->unit_data_len;
-  unit_buf.is_bigendian = ddata->is_bigendian;
-  unit_buf.error_callback = error_callback;
-  unit_buf.data = data;
-  unit_buf.reported_underflow = 0;
-
-  while (unit_buf.left > 0)
-    {
-      if (!read_function_entry (state, ddata, u, 0, &unit_buf, lhdr,
-				error_callback, data, pfvec, pfvec))
-	return;
-    }
-
-  if (pfvec->count == 0)
-    return;
-
-  addrs_count = pfvec->count;
-
-  if (fvec == NULL)
-    {
-      if (!backtrace_vector_release (state, &lvec.vec, error_callback, data))
-	return;
-      addrs = (struct function_addrs *) pfvec->vec.base;
-    }
-  else
-    {
-      /* Finish this list of addresses, but leave the remaining space in
-	 the vector available for the next function unit.  */
-      addrs = ((struct function_addrs *)
-	       backtrace_vector_finish (state, &fvec->vec,
-					error_callback, data));
-      if (addrs == NULL)
-	return;
-      fvec->count = 0;
-    }
-
-  backtrace_qsort (addrs, addrs_count, sizeof (struct function_addrs),
-		   function_addrs_compare);
-
-  *ret_addrs = addrs;
-  *ret_addrs_count = addrs_count;
-}
-
-/* See if PC is inlined in FUNCTION.  If it is, print out the inlined
-   information, and update FILENAME and LINENO for the caller.
-   Returns whatever CALLBACK returns, or 0 to keep going.  */
-
-static int
-report_inlined_functions (uintptr_t pc, struct function *function,
-			  backtrace_full_callback callback, void *data,
-			  const char **filename, int *lineno)
-{
-  struct function_addrs *function_addrs;
-  struct function *inlined;
-  int ret;
-
-  if (function->function_addrs_count == 0)
-    return 0;
-
-  function_addrs = ((struct function_addrs *)
-		    bsearch (&pc, function->function_addrs,
-			     function->function_addrs_count,
-			     sizeof (struct function_addrs),
-			     function_addrs_search));
-  if (function_addrs == NULL)
-    return 0;
-
-  while (((size_t) (function_addrs - function->function_addrs) + 1
-	  < function->function_addrs_count)
-	 && pc >= (function_addrs + 1)->low
-	 && pc < (function_addrs + 1)->high)
-    ++function_addrs;
-
-  /* We found an inlined call.  */
-
-  inlined = function_addrs->function;
-
-  /* Report any calls inlined into this one.  */
-  ret = report_inlined_functions (pc, inlined, callback, data,
-				  filename, lineno);
-  if (ret != 0)
-    return ret;
-
-  /* Report this inlined call.  */
-  ret = callback (data, pc, *filename, *lineno, inlined->name);
-  if (ret != 0)
-    return ret;
-
-  /* Our caller will report the caller of the inlined function; tell
-     it the appropriate filename and line number.  */
-  *filename = inlined->caller_filename;
-  *lineno = inlined->caller_lineno;
-
-  return 0;
-}
-
-/* Look for a PC in the DWARF mapping for one module.  On success,
-   call CALLBACK and return whatever it returns.  On error, call
-   ERROR_CALLBACK and return 0.  Sets *FOUND to 1 if the PC is found,
-   0 if not.  */
-
-static int
-dwarf_lookup_pc (struct backtrace_state *state, struct dwarf_data *ddata,
-		 uintptr_t pc, backtrace_full_callback callback,
-		 backtrace_error_callback error_callback, void *data,
-		 int *found)
-{
-  struct unit_addrs *entry;
-  struct unit *u;
-  int new_data;
-  struct line *lines;
-  struct line *ln;
-  struct function_addrs *function_addrs;
-  struct function *function;
-  const char *filename;
-  int lineno;
-  int ret;
-
-  *found = 1;
-
-  /* Find an address range that includes PC.  */
-  entry = bsearch (&pc, ddata->addrs, ddata->addrs_count,
-		   sizeof (struct unit_addrs), unit_addrs_search);
-
-  if (entry == NULL)
-    {
-      *found = 0;
-      return 0;
-    }
-
-  /* If there are multiple ranges that contain PC, use the last one,
-     in order to produce predictable results.  If we assume that all
-     ranges are properly nested, then the last range will be the
-     smallest one.  */
-  while ((size_t) (entry - ddata->addrs) + 1 < ddata->addrs_count
-	 && pc >= (entry + 1)->low
-	 && pc < (entry + 1)->high)
-    ++entry;
-
-  /* We need the lines, lines_count, function_addrs,
-     function_addrs_count fields of u.  If they are not set, we need
-     to set them.  When running in threaded mode, we need to allow for
-     the possibility that some other thread is setting them
-     simultaneously.  */
-
-  u = entry->u;
-  lines = u->lines;
-
-  /* Skip units with no useful line number information by walking
-     backward.  Useless line number information is marked by setting
-     lines == -1.  */
-  while (entry > ddata->addrs
-	 && pc >= (entry - 1)->low
-	 && pc < (entry - 1)->high)
-    {
-      if (state->threaded)
-	lines = (struct line *) backtrace_atomic_load_pointer (&u->lines);
-
-      if (lines != (struct line *) (uintptr_t) -1)
-	break;
-
-      --entry;
-
-      u = entry->u;
-      lines = u->lines;
-    }
-
-  if (state->threaded)
-    lines = backtrace_atomic_load_pointer (&u->lines);
-
-  new_data = 0;
-  if (lines == NULL)
-    {
-      size_t function_addrs_count;
-      struct line_header lhdr;
-      size_t count;
-
-      /* We have never read the line information for this unit.  Read
-	 it now.  */
-
-      function_addrs = NULL;
-      function_addrs_count = 0;
-      if (read_line_info (state, ddata, error_callback, data, entry->u, &lhdr,
-			  &lines, &count))
-	{
-	  struct function_vector *pfvec;
-
-	  /* If not threaded, reuse DDATA->FVEC for better memory
-	     consumption.  */
-	  if (state->threaded)
-	    pfvec = NULL;
-	  else
-	    pfvec = &ddata->fvec;
-	  read_function_info (state, ddata, &lhdr, error_callback, data,
-			      entry->u, pfvec, &function_addrs,
-			      &function_addrs_count);
-	  free_line_header (state, &lhdr, error_callback, data);
-	  new_data = 1;
-	}
-
-      /* Atomically store the information we just read into the unit.
-	 If another thread is simultaneously writing, it presumably
-	 read the same information, and we don't care which one we
-	 wind up with; we just leak the other one.  We do have to
-	 write the lines field last, so that the acquire-loads above
-	 ensure that the other fields are set.  */
-
-      if (!state->threaded)
-	{
-	  u->lines_count = count;
-	  u->function_addrs = function_addrs;
-	  u->function_addrs_count = function_addrs_count;
-	  u->lines = lines;
-	}
-      else
-	{
-	  backtrace_atomic_store_size_t (&u->lines_count, count);
-	  backtrace_atomic_store_pointer (&u->function_addrs, function_addrs);
-	  backtrace_atomic_store_size_t (&u->function_addrs_count,
-					 function_addrs_count);
-	  backtrace_atomic_store_pointer (&u->lines, lines);
-	}
-    }
-
-  /* Now all fields of U have been initialized.  */
-
-  if (lines == (struct line *) (uintptr_t) -1)
-    {
-      /* If reading the line number information failed in some way,
-	 try again to see if there is a better compilation unit for
-	 this PC.  */
-      if (new_data)
-	return dwarf_lookup_pc (state, ddata, pc, callback, error_callback,
-				data, found);
-      return callback (data, pc, NULL, 0, NULL);
-    }
-
-  /* Search for PC within this unit.  */
-
-  ln = (struct line *) bsearch (&pc, lines, entry->u->lines_count,
-				sizeof (struct line), line_search);
-  if (ln == NULL)
-    {
-      /* The PC is between the low_pc and high_pc attributes of the
-	 compilation unit, but no entry in the line table covers it.
-	 This implies that the start of the compilation unit has no
-	 line number information.  */
-
-      if (entry->u->abs_filename == NULL)
-	{
-	  const char *filename;
-
-	  filename = entry->u->filename;
-	  if (filename != NULL
-	      && !IS_ABSOLUTE_PATH (filename)
-	      && entry->u->comp_dir != NULL)
-	    {
-	      size_t filename_len;
-	      const char *dir;
-	      size_t dir_len;
-	      char *s;
-
-	      filename_len = strlen (filename);
-	      dir = entry->u->comp_dir;
-	      dir_len = strlen (dir);
-	      s = (char *) backtrace_alloc (state, dir_len + filename_len + 2,
-					    error_callback, data);
-	      if (s == NULL)
-		{
-		  *found = 0;
-		  return 0;
-		}
-	      memcpy (s, dir, dir_len);
-	      /* FIXME: Should use backslash if DOS file system.  */
-	      s[dir_len] = '/';
-	      memcpy (s + dir_len + 1, filename, filename_len + 1);
-	      filename = s;
-	    }
-	  entry->u->abs_filename = filename;
-	}
-
-      return callback (data, pc, entry->u->abs_filename, 0, NULL);
-    }
-
-  /* Search for function name within this unit.  */
-
-  if (entry->u->function_addrs_count == 0)
-    return callback (data, pc, ln->filename, ln->lineno, NULL);
-
-  function_addrs = ((struct function_addrs *)
-		    bsearch (&pc, entry->u->function_addrs,
-			     entry->u->function_addrs_count,
-			     sizeof (struct function_addrs),
-			     function_addrs_search));
-  if (function_addrs == NULL)
-    return callback (data, pc, ln->filename, ln->lineno, NULL);
-
-  /* If there are multiple function ranges that contain PC, use the
-     last one, in order to produce predictable results.  */
-
-  while (((size_t) (function_addrs - entry->u->function_addrs + 1)
-	  < entry->u->function_addrs_count)
-	 && pc >= (function_addrs + 1)->low
-	 && pc < (function_addrs + 1)->high)
-    ++function_addrs;
-
-  function = function_addrs->function;
-
-  filename = ln->filename;
-  lineno = ln->lineno;
-
-  ret = report_inlined_functions (pc, function, callback, data,
-				  &filename, &lineno);
-  if (ret != 0)
-    return ret;
-
-  return callback (data, pc, filename, lineno, function->name);
-}
-
-
-/* Return the file/line information for a PC using the DWARF mapping
-   we built earlier.  */
-
-static int
-dwarf_fileline (struct backtrace_state *state, uintptr_t pc,
-		backtrace_full_callback callback,
-		backtrace_error_callback error_callback, void *data)
-{
-  struct dwarf_data *ddata;
-  int found;
-  int ret;
-
-  if (!state->threaded)
-    {
-      for (ddata = (struct dwarf_data *) state->fileline_data;
-	   ddata != NULL;
-	   ddata = ddata->next)
-	{
-	  ret = dwarf_lookup_pc (state, ddata, pc, callback, error_callback,
-				 data, &found);
-	  if (ret != 0 || found)
-	    return ret;
-	}
-    }
-  else
-    {
-      struct dwarf_data **pp;
-
-      pp = (struct dwarf_data **) (void *) &state->fileline_data;
-      while (1)
-	{
-	  ddata = backtrace_atomic_load_pointer (pp);
-	  if (ddata == NULL)
-	    break;
-
-	  ret = dwarf_lookup_pc (state, ddata, pc, callback, error_callback,
-				 data, &found);
-	  if (ret != 0 || found)
-	    return ret;
-
-	  pp = &ddata->next;
-	}
-    }
-
-  /* FIXME: See if any libraries have been dlopen'ed.  */
-
-  return callback (data, pc, NULL, 0, NULL);
-}
-
-/* Initialize our data structures from the DWARF debug info for a
-   file.  Return NULL on failure.  */
-
-static struct dwarf_data *
-build_dwarf_data (struct backtrace_state *state,
-		  uintptr_t base_address,
-		  const unsigned char *dwarf_info,
-		  size_t dwarf_info_size,
-		  const unsigned char *dwarf_line,
-		  size_t dwarf_line_size,
-		  const unsigned char *dwarf_abbrev,
-		  size_t dwarf_abbrev_size,
-		  const unsigned char *dwarf_ranges,
-		  size_t dwarf_ranges_size,
-		  const unsigned char *dwarf_str,
-		  size_t dwarf_str_size,
-		  int is_bigendian,
-		  backtrace_error_callback error_callback,
-		  void *data)
-{
-  struct unit_addrs_vector addrs_vec;
-  struct unit_addrs *addrs;
-  size_t addrs_count;
-  struct dwarf_data *fdata;
-
-  if (!build_address_map (state, base_address, dwarf_info, dwarf_info_size,
-			  dwarf_abbrev, dwarf_abbrev_size, dwarf_ranges,
-			  dwarf_ranges_size, dwarf_str, dwarf_str_size,
-			  is_bigendian, error_callback, data, &addrs_vec))
-    return NULL;
-
-  if (!backtrace_vector_release (state, &addrs_vec.vec, error_callback, data))
-    return NULL;
-  addrs = (struct unit_addrs *) addrs_vec.vec.base;
-  addrs_count = addrs_vec.count;
-  backtrace_qsort (addrs, addrs_count, sizeof (struct unit_addrs),
-		   unit_addrs_compare);
-
-  fdata = ((struct dwarf_data *)
-	   backtrace_alloc (state, sizeof (struct dwarf_data),
-			    error_callback, data));
-  if (fdata == NULL)
-    return NULL;
-
-  fdata->next = NULL;
-  fdata->base_address = base_address;
-  fdata->addrs = addrs;
-  fdata->addrs_count = addrs_count;
-  fdata->dwarf_info = dwarf_info;
-  fdata->dwarf_info_size = dwarf_info_size;
-  fdata->dwarf_line = dwarf_line;
-  fdata->dwarf_line_size = dwarf_line_size;
-  fdata->dwarf_ranges = dwarf_ranges;
-  fdata->dwarf_ranges_size = dwarf_ranges_size;
-  fdata->dwarf_str = dwarf_str;
-  fdata->dwarf_str_size = dwarf_str_size;
-  fdata->is_bigendian = is_bigendian;
-  memset (&fdata->fvec, 0, sizeof fdata->fvec);
-
-  return fdata;
-}
-
-/* Build our data structures from the DWARF sections for a module.
-   Set FILELINE_FN and STATE->FILELINE_DATA.  Return 1 on success, 0
-   on failure.  */
-
-int
-backtrace_dwarf_add (struct backtrace_state *state,
-		     uintptr_t base_address,
-		     const unsigned char *dwarf_info,
-		     size_t dwarf_info_size,
-		     const unsigned char *dwarf_line,
-		     size_t dwarf_line_size,
-		     const unsigned char *dwarf_abbrev,
-		     size_t dwarf_abbrev_size,
-		     const unsigned char *dwarf_ranges,
-		     size_t dwarf_ranges_size,
-		     const unsigned char *dwarf_str,
-		     size_t dwarf_str_size,
-		     int is_bigendian,
-		     backtrace_error_callback error_callback,
-		     void *data, fileline *fileline_fn)
-{
-  struct dwarf_data *fdata;
-
-  fdata = build_dwarf_data (state, base_address, dwarf_info, dwarf_info_size,
-			    dwarf_line, dwarf_line_size, dwarf_abbrev,
-			    dwarf_abbrev_size, dwarf_ranges, dwarf_ranges_size,
-			    dwarf_str, dwarf_str_size, is_bigendian,
-			    error_callback, data);
-  if (fdata == NULL)
-    return 0;
-
-  if (!state->threaded)
-    {
-      struct dwarf_data **pp;
-
-      for (pp = (struct dwarf_data **) (void *) &state->fileline_data;
-	   *pp != NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = fdata;
-    }
-  else
-    {
-      while (1)
-	{
-	  struct dwarf_data **pp;
-
-	  pp = (struct dwarf_data **) (void *) &state->fileline_data;
-
-	  while (1)
-	    {
-	      struct dwarf_data *p;
-
-	      p = backtrace_atomic_load_pointer (pp);
-
-	      if (p == NULL)
-		break;
-
-	      pp = &p->next;
-	    }
-
-	  if (__sync_bool_compare_and_swap (pp, NULL, fdata))
-	    break;
-	}
-    }
-
-  *fileline_fn = dwarf_fileline;
-
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/edtest2.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/edtest2.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/edtest2.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/edtest2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/* edtest2.c -- Test for libbacktrace storage allocation stress handling (p2)
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-/* This file intentionally written without any #include's
- */
-
-extern int f3(int, int);
-extern int f2(int);
-
-int f2(int x)
-{
-  /* Returning a value here and elsewhere avoids a tailcall which
-     would mess up the backtrace.  */
-  return f3(x, __LINE__) + 3;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/edtest.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/edtest.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/edtest.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/edtest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/* edtest.c -- Test for libbacktrace storage allocation stress handling
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "backtrace-supported.h"
-#include "internal.h"
-
-#include "testlib.h"
-
-static int test1 (void) __attribute__ ((noinline, unused));
-static int test1 (void) __attribute__ ((noinline, unused));
-extern int f2 (int);
-extern int f3 (int, int);
-
-static int
-test1 (void)
-{
-  /* Returning a value here and elsewhere avoids a tailcall which
-     would mess up the backtrace.  */
-  return f2 (__LINE__) + 1;
-}
-
-int
-f3 (int f1line, int f2line)
-{
-  struct info all[20];
-  struct bdata data;
-  int f3line;
-  int i;
-
-  data.all = &all[0];
-  data.index = 0;
-  data.max = 20;
-  data.failed = 0;
-
-  f3line = __LINE__ + 1;
-  i = backtrace_full (state, 0, callback_one, error_callback_one, &data);
-
-  if (i != 0)
-    {
-      fprintf (stderr, "test1: unexpected return value %d\n", i);
-      data.failed = 1;
-    }
-
-  if (data.index < 3)
-    {
-      fprintf (stderr,
-               "test1: not enough frames; got %zu, expected at least 3\n",
-               data.index);
-      data.failed = 1;
-    }
-
-  check ("test1", 0, all, f3line, "f3", "edtest.c", &data.failed);
-  check ("test1", 1, all, f2line, "f2", "edtest2_build.c", &data.failed);
-  check ("test1", 2, all, f1line, "test1", "edtest.c", &data.failed);
-
-  printf ("%s: backtrace_full alloc stress\n", data.failed ? "FAIL" : "PASS");
-
-  if (data.failed)
-    ++failures;
-
-  return failures;
-}
-
-int
-main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
-{
-  state = backtrace_create_state (argv[0], BACKTRACE_SUPPORTS_THREADS,
-                                  error_callback_create, NULL);
-
-  // Grab the storage allocation lock prior to doing anything interesting.
-  // The intent here is to insure that the backtrace_alloc code is forced
-  // to always call mmap() for new memory as opposed to reusing previously
-  // allocated memory from the free list. Doing things this way helps
-  // simulate what you might see in a multithreaded program in which there
-  // are racing calls to the allocator.
-  struct backtrace_state *state_internal =
-      (struct backtrace_state *) state;
-  state_internal->lock_alloc = 1;
-
-  // Kick off the test
-  test1();
-
-  exit (failures > 0 ? EXIT_FAILURE : EXIT_SUCCESS);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/elf.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/elf.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/elf.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/elf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3340 +0,0 @@
-/* elf.c -- Get debug data from an ELF file for backtraces.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#ifdef HAVE_DL_ITERATE_PHDR
-#include <link.h>
-#endif
-
-#include "backtrace.h"
-#include "internal.h"
-
-#ifndef S_ISLNK
- #ifndef S_IFLNK
-  #define S_IFLNK 0120000
- #endif
- #ifndef S_IFMT
-  #define S_IFMT 0170000
- #endif
- #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-
-#ifndef __GNUC__
-#define __builtin_prefetch(p, r, l)
-#define unlikely(x) (x)
-#else
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#endif
-
-#if !defined(HAVE_DECL_STRNLEN) || !HAVE_DECL_STRNLEN
-
-/* If strnlen is not declared, provide our own version.  */
-
-static size_t
-xstrnlen (const char *s, size_t maxlen)
-{
-  size_t i;
-
-  for (i = 0; i < maxlen; ++i)
-    if (s[i] == '\0')
-      break;
-  return i;
-}
-
-#define strnlen xstrnlen
-
-#endif
-
-#ifndef HAVE_LSTAT
-
-/* Dummy version of lstat for systems that don't have it.  */
-
-static int
-xlstat (const char *path ATTRIBUTE_UNUSED, struct stat *st ATTRIBUTE_UNUSED)
-{
-  return -1;
-}
-
-#define lstat xlstat
-
-#endif
-
-#ifndef HAVE_READLINK
-
-/* Dummy version of readlink for systems that don't have it.  */
-
-static ssize_t
-xreadlink (const char *path ATTRIBUTE_UNUSED, char *buf ATTRIBUTE_UNUSED,
-	   size_t bufsz ATTRIBUTE_UNUSED)
-{
-  return -1;
-}
-
-#define readlink xreadlink
-
-#endif
-
-#ifndef HAVE_DL_ITERATE_PHDR
-
-/* Dummy version of dl_iterate_phdr for systems that don't have it.  */
-
-#define dl_phdr_info x_dl_phdr_info
-#define dl_iterate_phdr x_dl_iterate_phdr
-
-struct dl_phdr_info
-{
-  uintptr_t dlpi_addr;
-  const char *dlpi_name;
-};
-
-static int
-dl_iterate_phdr (int (*callback) (struct dl_phdr_info *,
-				  size_t, void *) ATTRIBUTE_UNUSED,
-		 void *data ATTRIBUTE_UNUSED)
-{
-  return 0;
-}
-
-#endif /* ! defined (HAVE_DL_ITERATE_PHDR) */
-
-/* The configure script must tell us whether we are 32-bit or 64-bit
-   ELF.  We could make this code test and support either possibility,
-   but there is no point.  This code only works for the currently
-   running executable, which means that we know the ELF mode at
-   configure time.  */
-
-#if BACKTRACE_ELF_SIZE != 32 && BACKTRACE_ELF_SIZE != 64
-#error "Unknown BACKTRACE_ELF_SIZE"
-#endif
-
-/* <link.h> might #include <elf.h> which might define our constants
-   with slightly different values.  Undefine them to be safe.  */
-
-#undef EI_NIDENT
-#undef EI_MAG0
-#undef EI_MAG1
-#undef EI_MAG2
-#undef EI_MAG3
-#undef EI_CLASS
-#undef EI_DATA
-#undef EI_VERSION
-#undef ELF_MAG0
-#undef ELF_MAG1
-#undef ELF_MAG2
-#undef ELF_MAG3
-#undef ELFCLASS32
-#undef ELFCLASS64
-#undef ELFDATA2LSB
-#undef ELFDATA2MSB
-#undef EV_CURRENT
-#undef ET_DYN
-#undef EM_PPC64
-#undef EF_PPC64_ABI
-#undef SHN_LORESERVE
-#undef SHN_XINDEX
-#undef SHN_UNDEF
-#undef SHT_PROGBITS
-#undef SHT_SYMTAB
-#undef SHT_STRTAB
-#undef SHT_DYNSYM
-#undef SHF_COMPRESSED
-#undef STT_OBJECT
-#undef STT_FUNC
-#undef NT_GNU_BUILD_ID
-#undef ELFCOMPRESS_ZLIB
-
-/* Basic types.  */
-
-typedef uint16_t b_elf_half;    /* Elf_Half.  */
-typedef uint32_t b_elf_word;    /* Elf_Word.  */
-typedef int32_t  b_elf_sword;   /* Elf_Sword.  */
-
-#if BACKTRACE_ELF_SIZE == 32
-
-typedef uint32_t b_elf_addr;    /* Elf_Addr.  */
-typedef uint32_t b_elf_off;     /* Elf_Off.  */
-
-typedef uint32_t b_elf_wxword;  /* 32-bit Elf_Word, 64-bit ELF_Xword.  */
-
-#else
-
-typedef uint64_t b_elf_addr;    /* Elf_Addr.  */
-typedef uint64_t b_elf_off;     /* Elf_Off.  */
-typedef uint64_t b_elf_xword;   /* Elf_Xword.  */
-typedef int64_t  b_elf_sxword;  /* Elf_Sxword.  */
-
-typedef uint64_t b_elf_wxword;  /* 32-bit Elf_Word, 64-bit ELF_Xword.  */
-
-#endif
-
-/* Data structures and associated constants.  */
-
-#define EI_NIDENT 16
-
-typedef struct {
-  unsigned char	e_ident[EI_NIDENT];	/* ELF "magic number" */
-  b_elf_half	e_type;			/* Identifies object file type */
-  b_elf_half	e_machine;		/* Specifies required architecture */
-  b_elf_word	e_version;		/* Identifies object file version */
-  b_elf_addr	e_entry;		/* Entry point virtual address */
-  b_elf_off	e_phoff;		/* Program header table file offset */
-  b_elf_off	e_shoff;		/* Section header table file offset */
-  b_elf_word	e_flags;		/* Processor-specific flags */
-  b_elf_half	e_ehsize;		/* ELF header size in bytes */
-  b_elf_half	e_phentsize;		/* Program header table entry size */
-  b_elf_half	e_phnum;		/* Program header table entry count */
-  b_elf_half	e_shentsize;		/* Section header table entry size */
-  b_elf_half	e_shnum;		/* Section header table entry count */
-  b_elf_half	e_shstrndx;		/* Section header string table index */
-} b_elf_ehdr;  /* Elf_Ehdr.  */
-
-#define EI_MAG0 0
-#define EI_MAG1 1
-#define EI_MAG2 2
-#define EI_MAG3 3
-#define EI_CLASS 4
-#define EI_DATA 5
-#define EI_VERSION 6
-
-#define ELFMAG0 0x7f
-#define ELFMAG1 'E'
-#define ELFMAG2 'L'
-#define ELFMAG3 'F'
-
-#define ELFCLASS32 1
-#define ELFCLASS64 2
-
-#define ELFDATA2LSB 1
-#define ELFDATA2MSB 2
-
-#define EV_CURRENT 1
-
-#define ET_DYN 3
-
-#define EM_PPC64 21
-#define EF_PPC64_ABI 3
-
-typedef struct {
-  b_elf_word	sh_name;		/* Section name, index in string tbl */
-  b_elf_word	sh_type;		/* Type of section */
-  b_elf_wxword	sh_flags;		/* Miscellaneous section attributes */
-  b_elf_addr	sh_addr;		/* Section virtual addr at execution */
-  b_elf_off	sh_offset;		/* Section file offset */
-  b_elf_wxword	sh_size;		/* Size of section in bytes */
-  b_elf_word	sh_link;		/* Index of another section */
-  b_elf_word	sh_info;		/* Additional section information */
-  b_elf_wxword	sh_addralign;		/* Section alignment */
-  b_elf_wxword	sh_entsize;		/* Entry size if section holds table */
-} b_elf_shdr;  /* Elf_Shdr.  */
-
-#define SHN_UNDEF	0x0000		/* Undefined section */
-#define SHN_LORESERVE	0xFF00		/* Begin range of reserved indices */
-#define SHN_XINDEX	0xFFFF		/* Section index is held elsewhere */
-
-#define SHT_PROGBITS 1
-#define SHT_SYMTAB 2
-#define SHT_STRTAB 3
-#define SHT_DYNSYM 11
-
-#define SHF_COMPRESSED 0x800
-
-#if BACKTRACE_ELF_SIZE == 32
-
-typedef struct
-{
-  b_elf_word	st_name;		/* Symbol name, index in string tbl */
-  b_elf_addr	st_value;		/* Symbol value */
-  b_elf_word	st_size;		/* Symbol size */
-  unsigned char	st_info;		/* Symbol binding and type */
-  unsigned char	st_other;		/* Visibility and other data */
-  b_elf_half	st_shndx;		/* Symbol section index */
-} b_elf_sym;  /* Elf_Sym.  */
-
-#else /* BACKTRACE_ELF_SIZE != 32 */
-
-typedef struct
-{
-  b_elf_word	st_name;		/* Symbol name, index in string tbl */
-  unsigned char	st_info;		/* Symbol binding and type */
-  unsigned char	st_other;		/* Visibility and other data */
-  b_elf_half	st_shndx;		/* Symbol section index */
-  b_elf_addr	st_value;		/* Symbol value */
-  b_elf_xword	st_size;		/* Symbol size */
-} b_elf_sym;  /* Elf_Sym.  */
-
-#endif /* BACKTRACE_ELF_SIZE != 32 */
-
-#define STT_OBJECT 1
-#define STT_FUNC 2
-
-typedef struct
-{
-  uint32_t namesz;
-  uint32_t descsz;
-  uint32_t type;
-  char name[1];
-} b_elf_note;
-
-#define NT_GNU_BUILD_ID 3
-
-#if BACKTRACE_ELF_SIZE == 32
-
-typedef struct
-{
-  b_elf_word	ch_type;		/* Compresstion algorithm */
-  b_elf_word	ch_size;		/* Uncompressed size */
-  b_elf_word	ch_addralign;		/* Alignment for uncompressed data */
-} b_elf_chdr;  /* Elf_Chdr */
-
-#else /* BACKTRACE_ELF_SIZE != 32 */
-
-typedef struct
-{
-  b_elf_word	ch_type;		/* Compression algorithm */
-  b_elf_word	ch_reserved;		/* Reserved */
-  b_elf_xword	ch_size;		/* Uncompressed size */
-  b_elf_xword	ch_addralign;		/* Alignment for uncompressed data */
-} b_elf_chdr;  /* Elf_Chdr */
-
-#endif /* BACKTRACE_ELF_SIZE != 32 */
-
-#define ELFCOMPRESS_ZLIB 1
-
-/* An index of ELF sections we care about.  */
-
-enum debug_section
-{
-  DEBUG_INFO,
-  DEBUG_LINE,
-  DEBUG_ABBREV,
-  DEBUG_RANGES,
-  DEBUG_STR,
-
-  /* The old style compressed sections.  This list must correspond to
-     the list of normal debug sections.  */
-  ZDEBUG_INFO,
-  ZDEBUG_LINE,
-  ZDEBUG_ABBREV,
-  ZDEBUG_RANGES,
-  ZDEBUG_STR,
-
-  DEBUG_MAX
-};
-
-/* Names of sections, indexed by enum elf_section.  */
-
-static const char * const debug_section_names[DEBUG_MAX] =
-{
-  ".debug_info",
-  ".debug_line",
-  ".debug_abbrev",
-  ".debug_ranges",
-  ".debug_str",
-  ".zdebug_info",
-  ".zdebug_line",
-  ".zdebug_abbrev",
-  ".zdebug_ranges",
-  ".zdebug_str"
-};
-
-/* Information we gather for the sections we care about.  */
-
-struct debug_section_info
-{
-  /* Section file offset.  */
-  off_t offset;
-  /* Section size.  */
-  size_t size;
-  /* Section contents, after read from file.  */
-  const unsigned char *data;
-  /* Whether the SHF_COMPRESSED flag is set for the section.  */
-  int compressed;
-};
-
-/* Information we keep for an ELF symbol.  */
-
-struct elf_symbol
-{
-  /* The name of the symbol.  */
-  const char *name;
-  /* The address of the symbol.  */
-  uintptr_t address;
-  /* The size of the symbol.  */
-  size_t size;
-};
-
-/* Information to pass to elf_syminfo.  */
-
-struct elf_syminfo_data
-{
-  /* Symbols for the next module.  */
-  struct elf_syminfo_data *next;
-  /* The ELF symbols, sorted by address.  */
-  struct elf_symbol *symbols;
-  /* The number of symbols.  */
-  size_t count;
-};
-
-/* Information about PowerPC64 ELFv1 .opd section.  */
-
-struct elf_ppc64_opd_data
-{
-  /* Address of the .opd section.  */
-  b_elf_addr addr;
-  /* Section data.  */
-  const char *data;
-  /* Size of the .opd section.  */
-  size_t size;
-  /* Corresponding section view.  */
-  struct backtrace_view view;
-};
-
-/* Compute the CRC-32 of BUF/LEN.  This uses the CRC used for
-   .gnu_debuglink files.  */
-
-static uint32_t
-elf_crc32 (uint32_t crc, const unsigned char *buf, size_t len)
-{
-  static const uint32_t crc32_table[256] =
-    {
-      0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
-      0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
-      0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
-      0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-      0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
-      0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-      0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-      0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-      0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
-      0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
-      0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
-      0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-      0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
-      0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-      0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
-      0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-      0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
-      0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-      0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
-      0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-      0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-      0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
-      0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
-      0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-      0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
-      0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
-      0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
-      0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-      0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
-      0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-      0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
-      0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-      0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
-      0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
-      0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-      0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-      0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
-      0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
-      0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
-      0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-      0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
-      0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-      0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
-      0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-      0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
-      0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
-      0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
-      0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-      0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-      0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
-      0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
-      0x2d02ef8d
-    };
-  const unsigned char *end;
-
-  crc = ~crc;
-  for (end = buf + len; buf < end; ++ buf)
-    crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
-  return ~crc;
-}
-
-/* Return the CRC-32 of the entire file open at DESCRIPTOR.  */
-
-static uint32_t
-elf_crc32_file (struct backtrace_state *state, int descriptor,
-		backtrace_error_callback error_callback, void *data)
-{
-  struct stat st;
-  struct backtrace_view file_view;
-  uint32_t ret;
-
-  if (fstat (descriptor, &st) < 0)
-    {
-      error_callback (data, "fstat", errno);
-      return 0;
-    }
-
-  if (!backtrace_get_view (state, descriptor, 0, st.st_size, error_callback,
-			   data, &file_view))
-    return 0;
-
-  ret = elf_crc32 (0, (const unsigned char *) file_view.data, st.st_size);
-
-  backtrace_release_view (state, &file_view, error_callback, data);
-
-  return ret;
-}
-
-/* A dummy callback function used when we can't find any debug info.  */
-
-static int
-elf_nodebug (struct backtrace_state *state ATTRIBUTE_UNUSED,
-	     uintptr_t pc ATTRIBUTE_UNUSED,
-	     backtrace_full_callback callback ATTRIBUTE_UNUSED,
-	     backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no debug info in ELF executable", -1);
-  return 0;
-}
-
-/* A dummy callback function used when we can't find a symbol
-   table.  */
-
-static void
-elf_nosyms (struct backtrace_state *state ATTRIBUTE_UNUSED,
-	    uintptr_t addr ATTRIBUTE_UNUSED,
-	    backtrace_syminfo_callback callback ATTRIBUTE_UNUSED,
-	    backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no symbol table in ELF executable", -1);
-}
-
-/* Compare struct elf_symbol for qsort.  */
-
-static int
-elf_symbol_compare (const void *v1, const void *v2)
-{
-  const struct elf_symbol *e1 = (const struct elf_symbol *) v1;
-  const struct elf_symbol *e2 = (const struct elf_symbol *) v2;
-
-  if (e1->address < e2->address)
-    return -1;
-  else if (e1->address > e2->address)
-    return 1;
-  else
-    return 0;
-}
-
-/* Compare an ADDR against an elf_symbol for bsearch.  We allocate one
-   extra entry in the array so that this can look safely at the next
-   entry.  */
-
-static int
-elf_symbol_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct elf_symbol *entry = (const struct elf_symbol *) ventry;
-  uintptr_t addr;
-
-  addr = *key;
-  if (addr < entry->address)
-    return -1;
-  else if (addr >= entry->address + entry->size)
-    return 1;
-  else
-    return 0;
-}
-
-/* Initialize the symbol table info for elf_syminfo.  */
-
-static int
-elf_initialize_syminfo (struct backtrace_state *state,
-			uintptr_t base_address,
-			const unsigned char *symtab_data, size_t symtab_size,
-			const unsigned char *strtab, size_t strtab_size,
-			backtrace_error_callback error_callback,
-			void *data, struct elf_syminfo_data *sdata,
-			struct elf_ppc64_opd_data *opd)
-{
-  size_t sym_count;
-  const b_elf_sym *sym;
-  size_t elf_symbol_count;
-  size_t elf_symbol_size;
-  struct elf_symbol *elf_symbols;
-  size_t i;
-  unsigned int j;
-
-  sym_count = symtab_size / sizeof (b_elf_sym);
-
-  /* We only care about function symbols.  Count them.  */
-  sym = (const b_elf_sym *) symtab_data;
-  elf_symbol_count = 0;
-  for (i = 0; i < sym_count; ++i, ++sym)
-    {
-      int info;
-
-      info = sym->st_info & 0xf;
-      if ((info == STT_FUNC || info == STT_OBJECT)
-	  && sym->st_shndx != SHN_UNDEF)
-	++elf_symbol_count;
-    }
-
-  elf_symbol_size = elf_symbol_count * sizeof (struct elf_symbol);
-  elf_symbols = ((struct elf_symbol *)
-		 backtrace_alloc (state, elf_symbol_size, error_callback,
-				  data));
-  if (elf_symbols == NULL)
-    return 0;
-
-  sym = (const b_elf_sym *) symtab_data;
-  j = 0;
-  for (i = 0; i < sym_count; ++i, ++sym)
-    {
-      int info;
-
-      info = sym->st_info & 0xf;
-      if (info != STT_FUNC && info != STT_OBJECT)
-	continue;
-      if (sym->st_shndx == SHN_UNDEF)
-	continue;
-      if (sym->st_name >= strtab_size)
-	{
-	  error_callback (data, "symbol string index out of range", 0);
-	  backtrace_free (state, elf_symbols, elf_symbol_size, error_callback,
-			  data);
-	  return 0;
-	}
-      elf_symbols[j].name = (const char *) strtab + sym->st_name;
-      /* Special case PowerPC64 ELFv1 symbols in .opd section, if the symbol
-	 is a function descriptor, read the actual code address from the
-	 descriptor.  */
-      if (opd
-	  && sym->st_value >= opd->addr
-	  && sym->st_value < opd->addr + opd->size)
-	elf_symbols[j].address
-	  = *(const b_elf_addr *) (opd->data + (sym->st_value - opd->addr));
-      else
-	elf_symbols[j].address = sym->st_value;
-      elf_symbols[j].address += base_address;
-      elf_symbols[j].size = sym->st_size;
-      ++j;
-    }
-
-  backtrace_qsort (elf_symbols, elf_symbol_count, sizeof (struct elf_symbol),
-		   elf_symbol_compare);
-
-  sdata->next = NULL;
-  sdata->symbols = elf_symbols;
-  sdata->count = elf_symbol_count;
-
-  return 1;
-}
-
-/* Add EDATA to the list in STATE.  */
-
-static void
-elf_add_syminfo_data (struct backtrace_state *state,
-		      struct elf_syminfo_data *edata)
-{
-  if (!state->threaded)
-    {
-      struct elf_syminfo_data **pp;
-
-      for (pp = (struct elf_syminfo_data **) (void *) &state->syminfo_data;
-	   *pp != NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = edata;
-    }
-  else
-    {
-      while (1)
-	{
-	  struct elf_syminfo_data **pp;
-
-	  pp = (struct elf_syminfo_data **) (void *) &state->syminfo_data;
-
-	  while (1)
-	    {
-	      struct elf_syminfo_data *p;
-
-	      p = backtrace_atomic_load_pointer (pp);
-
-	      if (p == NULL)
-		break;
-
-	      pp = &p->next;
-	    }
-
-	  if (__sync_bool_compare_and_swap (pp, NULL, edata))
-	    break;
-	}
-    }
-}
-
-/* Return the symbol name and value for an ADDR.  */
-
-static void
-elf_syminfo (struct backtrace_state *state, uintptr_t addr,
-	     backtrace_syminfo_callback callback,
-	     backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-	     void *data)
-{
-  struct elf_syminfo_data *edata;
-  struct elf_symbol *sym = NULL;
-
-  if (!state->threaded)
-    {
-      for (edata = (struct elf_syminfo_data *) state->syminfo_data;
-	   edata != NULL;
-	   edata = edata->next)
-	{
-	  sym = ((struct elf_symbol *)
-		 bsearch (&addr, edata->symbols, edata->count,
-			  sizeof (struct elf_symbol), elf_symbol_search));
-	  if (sym != NULL)
-	    break;
-	}
-    }
-  else
-    {
-      struct elf_syminfo_data **pp;
-
-      pp = (struct elf_syminfo_data **) (void *) &state->syminfo_data;
-      while (1)
-	{
-	  edata = backtrace_atomic_load_pointer (pp);
-	  if (edata == NULL)
-	    break;
-
-	  sym = ((struct elf_symbol *)
-		 bsearch (&addr, edata->symbols, edata->count,
-			  sizeof (struct elf_symbol), elf_symbol_search));
-	  if (sym != NULL)
-	    break;
-
-	  pp = &edata->next;
-	}
-    }
-
-  if (sym == NULL)
-    callback (data, addr, NULL, 0, 0);
-  else
-    callback (data, addr, sym->name, sym->address, sym->size);
-}
-
-/* Return whether FILENAME is a symlink.  */
-
-static int
-elf_is_symlink (const char *filename)
-{
-  struct stat st;
-
-  if (lstat (filename, &st) < 0)
-    return 0;
-  return S_ISLNK (st.st_mode);
-}
-
-/* Return the results of reading the symlink FILENAME in a buffer
-   allocated by backtrace_alloc.  Return the length of the buffer in
-   *LEN.  */
-
-static char *
-elf_readlink (struct backtrace_state *state, const char *filename,
-	      backtrace_error_callback error_callback, void *data,
-	      size_t *plen)
-{
-  size_t len;
-  char *buf;
-
-  len = 128;
-  while (1)
-    {
-      ssize_t rl;
-
-      buf = backtrace_alloc (state, len, error_callback, data);
-      if (buf == NULL)
-	return NULL;
-      rl = readlink (filename, buf, len);
-      if (rl < 0)
-	{
-	  backtrace_free (state, buf, len, error_callback, data);
-	  return NULL;
-	}
-      if ((size_t) rl < len - 1)
-	{
-	  buf[rl] = '\0';
-	  *plen = len;
-	  return buf;
-	}
-      backtrace_free (state, buf, len, error_callback, data);
-      len *= 2;
-    }
-}
-
-/* Open a separate debug info file, using the build ID to find it.
-   Returns an open file descriptor, or -1.
-
-   The GDB manual says that the only place gdb looks for a debug file
-   when the build ID is known is in /usr/lib/debug/.build-id.  */
-
-static int
-elf_open_debugfile_by_buildid (struct backtrace_state *state,
-			       const char *buildid_data, size_t buildid_size,
-			       backtrace_error_callback error_callback,
-			       void *data)
-{
-  const char * const prefix = "/usr/lib/debug/.build-id/";
-  const size_t prefix_len = strlen (prefix);
-  const char * const suffix = ".debug";
-  const size_t suffix_len = strlen (suffix);
-  size_t len;
-  char *bd_filename;
-  char *t;
-  size_t i;
-  int ret;
-  int does_not_exist;
-
-  len = prefix_len + buildid_size * 2 + suffix_len + 2;
-  bd_filename = backtrace_alloc (state, len, error_callback, data);
-  if (bd_filename == NULL)
-    return -1;
-
-  t = bd_filename;
-  memcpy (t, prefix, prefix_len);
-  t += prefix_len;
-  for (i = 0; i < buildid_size; i++)
-    {
-      unsigned char b;
-      unsigned char nib;
-
-      b = (unsigned char) buildid_data[i];
-      nib = (b & 0xf0) >> 4;
-      *t++ = nib < 10 ? '0' + nib : 'a' + nib - 10;
-      nib = b & 0x0f;
-      *t++ = nib < 10 ? '0' + nib : 'a' + nib - 10;
-      if (i == 0)
-	*t++ = '/';
-    }
-  memcpy (t, suffix, suffix_len);
-  t[suffix_len] = '\0';
-
-  ret = backtrace_open (bd_filename, error_callback, data, &does_not_exist);
-
-  backtrace_free (state, bd_filename, len, error_callback, data);
-
-  /* gdb checks that the debuginfo file has the same build ID note.
-     That seems kind of pointless to me--why would it have the right
-     name but not the right build ID?--so skipping the check.  */
-
-  return ret;
-}
-
-/* Try to open a file whose name is PREFIX (length PREFIX_LEN)
-   concatenated with PREFIX2 (length PREFIX2_LEN) concatenated with
-   DEBUGLINK_NAME.  Returns an open file descriptor, or -1.  */
-
-static int
-elf_try_debugfile (struct backtrace_state *state, const char *prefix,
-		   size_t prefix_len, const char *prefix2, size_t prefix2_len,
-		   const char *debuglink_name,
-		   backtrace_error_callback error_callback, void *data)
-{
-  size_t debuglink_len;
-  size_t try_len;
-  char *try;
-  int does_not_exist;
-  int ret;
-
-  debuglink_len = strlen (debuglink_name);
-  try_len = prefix_len + prefix2_len + debuglink_len + 1;
-  try = backtrace_alloc (state, try_len, error_callback, data);
-  if (try == NULL)
-    return -1;
-
-  memcpy (try, prefix, prefix_len);
-  memcpy (try + prefix_len, prefix2, prefix2_len);
-  memcpy (try + prefix_len + prefix2_len, debuglink_name, debuglink_len);
-  try[prefix_len + prefix2_len + debuglink_len] = '\0';
-
-  ret = backtrace_open (try, error_callback, data, &does_not_exist);
-
-  backtrace_free (state, try, try_len, error_callback, data);
-
-  return ret;
-}
-
-/* Find a separate debug info file, using the debuglink section data
-   to find it.  Returns an open file descriptor, or -1.  */
-
-static int
-elf_find_debugfile_by_debuglink (struct backtrace_state *state,
-				 const char *filename,
-				 const char *debuglink_name,
-				 backtrace_error_callback error_callback,
-				 void *data)
-{
-  int ret;
-  char *alc;
-  size_t alc_len;
-  const char *slash;
-  int ddescriptor;
-  const char *prefix;
-  size_t prefix_len;
-
-  /* Resolve symlinks in FILENAME.  Since FILENAME is fairly likely to
-     be /proc/self/exe, symlinks are common.  We don't try to resolve
-     the whole path name, just the base name.  */
-  ret = -1;
-  alc = NULL;
-  alc_len = 0;
-  while (elf_is_symlink (filename))
-    {
-      char *new_buf;
-      size_t new_len;
-
-      new_buf = elf_readlink (state, filename, error_callback, data, &new_len);
-      if (new_buf == NULL)
-	break;
-
-      if (new_buf[0] == '/')
-	filename = new_buf;
-      else
-	{
-	  slash = strrchr (filename, '/');
-	  if (slash == NULL)
-	    filename = new_buf;
-	  else
-	    {
-	      size_t clen;
-	      char *c;
-
-	      slash++;
-	      clen = slash - filename + strlen (new_buf) + 1;
-	      c = backtrace_alloc (state, clen, error_callback, data);
-	      if (c == NULL)
-		goto done;
-
-	      memcpy (c, filename, slash - filename);
-	      memcpy (c + (slash - filename), new_buf, strlen (new_buf));
-	      c[slash - filename + strlen (new_buf)] = '\0';
-	      backtrace_free (state, new_buf, new_len, error_callback, data);
-	      filename = c;
-	      new_buf = c;
-	      new_len = clen;
-	    }
-	}
-
-      if (alc != NULL)
-	backtrace_free (state, alc, alc_len, error_callback, data);
-      alc = new_buf;
-      alc_len = new_len;
-    }
-
-  /* Look for DEBUGLINK_NAME in the same directory as FILENAME.  */
-
-  slash = strrchr (filename, '/');
-  if (slash == NULL)
-    {
-      prefix = "";
-      prefix_len = 0;
-    }
-  else
-    {
-      slash++;
-      prefix = filename;
-      prefix_len = slash - filename;
-    }
-
-  ddescriptor = elf_try_debugfile (state, prefix, prefix_len, "", 0,
-				   debuglink_name, error_callback, data);
-  if (ddescriptor >= 0)
-    {
-      ret = ddescriptor;
-      goto done;
-    }
-
-  /* Look for DEBUGLINK_NAME in a .debug subdirectory of FILENAME.  */
-
-  ddescriptor = elf_try_debugfile (state, prefix, prefix_len, ".debug/",
-				   strlen (".debug/"), debuglink_name,
-				   error_callback, data);
-  if (ddescriptor >= 0)
-    {
-      ret = ddescriptor;
-      goto done;
-    }
-
-  /* Look for DEBUGLINK_NAME in /usr/lib/debug.  */
-
-  ddescriptor = elf_try_debugfile (state, "/usr/lib/debug/",
-				   strlen ("/usr/lib/debug/"), prefix,
-				   prefix_len, debuglink_name,
-				   error_callback, data);
-  if (ddescriptor >= 0)
-    ret = ddescriptor;
-
- done:
-  if (alc != NULL && alc_len > 0)
-    backtrace_free (state, alc, alc_len, error_callback, data);
-  return ret;
-}
-
-/* Open a separate debug info file, using the debuglink section data
-   to find it.  Returns an open file descriptor, or -1.  */
-
-static int
-elf_open_debugfile_by_debuglink (struct backtrace_state *state,
-				 const char *filename,
-				 const char *debuglink_name,
-				 uint32_t debuglink_crc,
-				 backtrace_error_callback error_callback,
-				 void *data)
-{
-  int ddescriptor;
-
-  ddescriptor = elf_find_debugfile_by_debuglink (state, filename,
-						 debuglink_name,
-						 error_callback, data);
-  if (ddescriptor < 0)
-    return -1;
-
-  if (debuglink_crc != 0)
-    {
-      uint32_t got_crc;
-
-      got_crc = elf_crc32_file (state, ddescriptor, error_callback, data);
-      if (got_crc != debuglink_crc)
-	{
-	  backtrace_close (ddescriptor, error_callback, data);
-	  return -1;
-	}
-    }
-
-  return ddescriptor;
-}
-
-/* A function useful for setting a breakpoint for an inflation failure
-   when this code is compiled with -g.  */
-
-static void
-elf_zlib_failed(void)
-{
-}
-
-/* *PVAL is the current value being read from the stream, and *PBITS
-   is the number of valid bits.  Ensure that *PVAL holds at least 15
-   bits by reading additional bits from *PPIN, up to PINEND, as
-   needed.  Updates *PPIN, *PVAL and *PBITS.  Returns 1 on success, 0
-   on error.  */
-
-static int
-elf_zlib_fetch (const unsigned char **ppin, const unsigned char *pinend,
-		uint64_t *pval, unsigned int *pbits)
-{
-  unsigned int bits;
-  const unsigned char *pin;
-  uint64_t val;
-  uint32_t next;
-
-  bits = *pbits;
-  if (bits >= 15)
-    return 1;
-  pin = *ppin;
-  val = *pval;
-
-  if (unlikely (pinend - pin < 4))
-    {
-      elf_zlib_failed ();
-      return 0;
-    }
-
-#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) \
-    && defined(__ORDER_BIG_ENDIAN__) \
-    && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ \
-        || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-  /* We've ensured that PIN is aligned.  */
-  next = *(const uint32_t *)pin;
-
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-  next = __builtin_bswap32 (next);
-#endif
-#else
-  next = pin[0] | (pin[1] << 8) | (pin[2] << 16) | (pin[3] << 24);
-#endif
-
-  val |= (uint64_t)next << bits;
-  bits += 32;
-  pin += 4;
-
-  /* We will need the next four bytes soon.  */
-  __builtin_prefetch (pin, 0, 0);
-
-  *ppin = pin;
-  *pval = val;
-  *pbits = bits;
-  return 1;
-}
-
-/* Huffman code tables, like the rest of the zlib format, are defined
-   by RFC 1951.  We store a Huffman code table as a series of tables
-   stored sequentially in memory.  Each entry in a table is 16 bits.
-   The first, main, table has 256 entries.  It is followed by a set of
-   secondary tables of length 2 to 128 entries.  The maximum length of
-   a code sequence in the deflate format is 15 bits, so that is all we
-   need.  Each secondary table has an index, which is the offset of
-   the table in the overall memory storage.
-
-   The deflate format says that all codes of a given bit length are
-   lexicographically consecutive.  Perhaps we could have 130 values
-   that require a 15-bit code, perhaps requiring three secondary
-   tables of size 128.  I don't know if this is actually possible, but
-   it suggests that the maximum size required for secondary tables is
-   3 * 128 + 3 * 64 ... == 768.  The zlib enough program reports 660
-   as the maximum.  We permit 768, since in addition to the 256 for
-   the primary table, with two bytes per entry, and with the two
-   tables we need, that gives us a page.
-
-   A single table entry needs to store a value or (for the main table
-   only) the index and size of a secondary table.  Values range from 0
-   to 285, inclusive.  Secondary table indexes, per above, range from
-   0 to 510.  For a value we need to store the number of bits we need
-   to determine that value (one value may appear multiple times in the
-   table), which is 1 to 8.  For a secondary table we need to store
-   the number of bits used to index into the table, which is 1 to 7.
-   And of course we need 1 bit to decide whether we have a value or a
-   secondary table index.  So each entry needs 9 bits for value/table
-   index, 3 bits for size, 1 bit what it is.  For simplicity we use 16
-   bits per entry.  */
-
-/* Number of entries we allocate to for one code table.  We get a page
-   for the two code tables we need.  */
-
-#define HUFFMAN_TABLE_SIZE (1024)
-
-/* Bit masks and shifts for the values in the table.  */
-
-#define HUFFMAN_VALUE_MASK 0x01ff
-#define HUFFMAN_BITS_SHIFT 9
-#define HUFFMAN_BITS_MASK 0x7
-#define HUFFMAN_SECONDARY_SHIFT 12
-
-/* For working memory while inflating we need two code tables, we need
-   an array of code lengths (max value 15, so we use unsigned char),
-   and an array of unsigned shorts used while building a table.  The
-   latter two arrays must be large enough to hold the maximum number
-   of code lengths, which RFC 1951 defines as 286 + 30.  */
-
-#define ZDEBUG_TABLE_SIZE \
-  (2 * HUFFMAN_TABLE_SIZE * sizeof (uint16_t) \
-   + (286 + 30) * sizeof (uint16_t)	      \
-   + (286 + 30) * sizeof (unsigned char))
-
-#define ZDEBUG_TABLE_CODELEN_OFFSET \
-  (2 * HUFFMAN_TABLE_SIZE * sizeof (uint16_t) \
-   + (286 + 30) * sizeof (uint16_t))
-
-#define ZDEBUG_TABLE_WORK_OFFSET \
-  (2 * HUFFMAN_TABLE_SIZE * sizeof (uint16_t))
-
-#ifdef BACKTRACE_GENERATE_FIXED_HUFFMAN_TABLE
-
-/* Used by the main function that generates the fixed table to learn
-   the table size.  */
-static size_t final_next_secondary;
-
-#endif
-
-/* Build a Huffman code table from an array of lengths in CODES of
-   length CODES_LEN.  The table is stored into *TABLE.  ZDEBUG_TABLE
-   is the same as for elf_zlib_inflate, used to find some work space.
-   Returns 1 on success, 0 on error.  */
-
-static int
-elf_zlib_inflate_table (unsigned char *codes, size_t codes_len,
-			uint16_t *zdebug_table, uint16_t *table)
-{
-  uint16_t count[16];
-  uint16_t start[16];
-  uint16_t prev[16];
-  uint16_t firstcode[7];
-  uint16_t *next;
-  size_t i;
-  size_t j;
-  unsigned int code;
-  size_t next_secondary;
-
-  /* Count the number of code of each length.  Set NEXT[val] to be the
-     next value after VAL with the same bit length.  */
-
-  next = (uint16_t *) (((unsigned char *) zdebug_table)
-		       + ZDEBUG_TABLE_WORK_OFFSET);
-
-  memset (&count[0], 0, 16 * sizeof (uint16_t));
-  for (i = 0; i < codes_len; ++i)
-    {
-      if (unlikely (codes[i] >= 16))
-	{
-	  elf_zlib_failed ();
-	  return 0;
-	}
-
-      if (count[codes[i]] == 0)
-	{
-	  start[codes[i]] = i;
-	  prev[codes[i]] = i;
-	}
-      else
-	{
-	  next[prev[codes[i]]] = i;
-	  prev[codes[i]] = i;
-	}
-
-      ++count[codes[i]];
-    }
-
-  /* For each length, fill in the table for the codes of that
-     length.  */
-
-  memset (table, 0, HUFFMAN_TABLE_SIZE * sizeof (uint16_t));
-
-  /* Handle the values that do not require a secondary table.  */
-
-  code = 0;
-  for (j = 1; j <= 8; ++j)
-    {
-      unsigned int jcnt;
-      unsigned int val;
-
-      jcnt = count[j];
-      if (jcnt == 0)
-	continue;
-
-      if (unlikely (jcnt > (1U << j)))
-	{
-	  elf_zlib_failed ();
-	  return 0;
-	}
-
-      /* There are JCNT values that have this length, the values
-	 starting from START[j] continuing through NEXT[VAL].  Those
-	 values are assigned consecutive values starting at CODE.  */
-
-      val = start[j];
-      for (i = 0; i < jcnt; ++i)
-	{
-	  uint16_t tval;
-	  size_t ind;
-	  unsigned int incr;
-
-	  /* In the compressed bit stream, the value VAL is encoded as
-	     J bits with the value C.  */
-
-	  if (unlikely ((val & ~HUFFMAN_VALUE_MASK) != 0))
-	    {
-	      elf_zlib_failed ();
-	      return 0;
-	    }
-
-	  tval = val | ((j - 1) << HUFFMAN_BITS_SHIFT);
-
-	  /* The table lookup uses 8 bits.  If J is less than 8, we
-	     don't know what the other bits will be.  We need to fill
-	     in all possibilities in the table.  Since the Huffman
-	     code is unambiguous, those entries can't be used for any
-	     other code.  */
-
-	  for (ind = code; ind < 0x100; ind += 1 << j)
-	    {
-	      if (unlikely (table[ind] != 0))
-		{
-		  elf_zlib_failed ();
-		  return 0;
-		}
-	      table[ind] = tval;
-	    }
-
-	  /* Advance to the next value with this length.  */
-	  if (i + 1 < jcnt)
-	    val = next[val];
-
-	  /* The Huffman codes are stored in the bitstream with the
-	     most significant bit first, as is required to make them
-	     unambiguous.  The effect is that when we read them from
-	     the bitstream we see the bit sequence in reverse order:
-	     the most significant bit of the Huffman code is the least
-	     significant bit of the value we read from the bitstream.
-	     That means that to make our table lookups work, we need
-	     to reverse the bits of CODE.  Since reversing bits is
-	     tedious and in general requires using a table, we instead
-	     increment CODE in reverse order.  That is, if the number
-	     of bits we are currently using, here named J, is 3, we
-	     count as 000, 100, 010, 110, 001, 101, 011, 111, which is
-	     to say the numbers from 0 to 7 but with the bits
-	     reversed.  Going to more bits, aka incrementing J,
-	     effectively just adds more zero bits as the beginning,
-	     and as such does not change the numeric value of CODE.
-
-	     To increment CODE of length J in reverse order, find the
-	     most significant zero bit and set it to one while
-	     clearing all higher bits.  In other words, add 1 modulo
-	     2^J, only reversed.  */
-
-	  incr = 1U << (j - 1);
-	  while ((code & incr) != 0)
-	    incr >>= 1;
-	  if (incr == 0)
-	    code = 0;
-	  else
-	    {
-	      code &= incr - 1;
-	      code += incr;
-	    }
-	}
-    }
-
-  /* Handle the values that require a secondary table.  */
-
-  /* Set FIRSTCODE, the number at which the codes start, for each
-     length.  */
-
-  for (j = 9; j < 16; j++)
-    {
-      unsigned int jcnt;
-      unsigned int k;
-
-      jcnt = count[j];
-      if (jcnt == 0)
-	continue;
-
-      /* There are JCNT values that have this length, the values
-	 starting from START[j].  Those values are assigned
-	 consecutive values starting at CODE.  */
-
-      firstcode[j - 9] = code;
-
-      /* Reverse add JCNT to CODE modulo 2^J.  */
-      for (k = 0; k < j; ++k)
-	{
-	  if ((jcnt & (1U << k)) != 0)
-	    {
-	      unsigned int m;
-	      unsigned int bit;
-
-	      bit = 1U << (j - k - 1);
-	      for (m = 0; m < j - k; ++m, bit >>= 1)
-		{
-		  if ((code & bit) == 0)
-		    {
-		      code += bit;
-		      break;
-		    }
-		  code &= ~bit;
-		}
-	      jcnt &= ~(1U << k);
-	    }
-	}
-      if (unlikely (jcnt != 0))
-	{
-	  elf_zlib_failed ();
-	  return 0;
-	}
-    }
-
-  /* For J from 9 to 15, inclusive, we store COUNT[J] consecutive
-     values starting at START[J] with consecutive codes starting at
-     FIRSTCODE[J - 9].  In the primary table we need to point to the
-     secondary table, and the secondary table will be indexed by J - 9
-     bits.  We count down from 15 so that we install the larger
-     secondary tables first, as the smaller ones may be embedded in
-     the larger ones.  */
-
-  next_secondary = 0; /* Index of next secondary table (after primary).  */
-  for (j = 15; j >= 9; j--)
-    {
-      unsigned int jcnt;
-      unsigned int val;
-      size_t primary; /* Current primary index.  */
-      size_t secondary; /* Offset to current secondary table.  */
-      size_t secondary_bits; /* Bit size of current secondary table.  */
-
-      jcnt = count[j];
-      if (jcnt == 0)
-	continue;
-
-      val = start[j];
-      code = firstcode[j - 9];
-      primary = 0x100;
-      secondary = 0;
-      secondary_bits = 0;
-      for (i = 0; i < jcnt; ++i)
-	{
-	  uint16_t tval;
-	  size_t ind;
-	  unsigned int incr;
-
-	  if ((code & 0xff) != primary)
-	    {
-	      uint16_t tprimary;
-
-	      /* Fill in a new primary table entry.  */
-
-	      primary = code & 0xff;
-
-	      tprimary = table[primary];
-	      if (tprimary == 0)
-		{
-		  /* Start a new secondary table.  */
-
-		  if (unlikely ((next_secondary & HUFFMAN_VALUE_MASK)
-				!= next_secondary))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-
-		  secondary = next_secondary;
-		  secondary_bits = j - 8;
-		  next_secondary += 1 << secondary_bits;
-		  table[primary] = (secondary
-				    + ((j - 8) << HUFFMAN_BITS_SHIFT)
-				    + (1U << HUFFMAN_SECONDARY_SHIFT));
-		}
-	      else
-		{
-		  /* There is an existing entry.  It had better be a
-		     secondary table with enough bits.  */
-		  if (unlikely ((tprimary & (1U << HUFFMAN_SECONDARY_SHIFT))
-				== 0))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-		  secondary = tprimary & HUFFMAN_VALUE_MASK;
-		  secondary_bits = ((tprimary >> HUFFMAN_BITS_SHIFT)
-				    & HUFFMAN_BITS_MASK);
-		  if (unlikely (secondary_bits < j - 8))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-		}
-	    }
-
-	  /* Fill in secondary table entries.  */
-
-	  tval = val | ((j - 8) << HUFFMAN_BITS_SHIFT);
-
-	  for (ind = code >> 8;
-	       ind < (1U << secondary_bits);
-	       ind += 1U << (j - 8))
-	    {
-	      if (unlikely (table[secondary + 0x100 + ind] != 0))
-		{
-		  elf_zlib_failed ();
-		  return 0;
-		}
-	      table[secondary + 0x100 + ind] = tval;
-	    }
-
-	  if (i + 1 < jcnt)
-	    val = next[val];
-
-	  incr = 1U << (j - 1);
-	  while ((code & incr) != 0)
-	    incr >>= 1;
-	  if (incr == 0)
-	    code = 0;
-	  else
-	    {
-	      code &= incr - 1;
-	      code += incr;
-	    }
-	}
-    }
-
-#ifdef BACKTRACE_GENERATE_FIXED_HUFFMAN_TABLE
-  final_next_secondary = next_secondary;
-#endif
-
-  return 1;
-}
-
-#ifdef BACKTRACE_GENERATE_FIXED_HUFFMAN_TABLE
-
-/* Used to generate the fixed Huffman table for block type 1.  */
-
-#include <stdio.h>
-
-static uint16_t table[ZDEBUG_TABLE_SIZE];
-static unsigned char codes[288];
-
-int
-main ()
-{
-  size_t i;
-
-  for (i = 0; i <= 143; ++i)
-    codes[i] = 8;
-  for (i = 144; i <= 255; ++i)
-    codes[i] = 9;
-  for (i = 256; i <= 279; ++i)
-    codes[i] = 7;
-  for (i = 280; i <= 287; ++i)
-    codes[i] = 8;
-  if (!elf_zlib_inflate_table (&codes[0], 288, &table[0], &table[0]))
-    {
-      fprintf (stderr, "elf_zlib_inflate_table failed\n");
-      exit (EXIT_FAILURE);
-    }
-
-  printf ("static const uint16_t elf_zlib_default_table[%#zx] =\n",
-	  final_next_secondary + 0x100);
-  printf ("{\n");
-  for (i = 0; i < final_next_secondary + 0x100; i += 8)
-    {
-      size_t j;
-
-      printf (" ");
-      for (j = i; j < final_next_secondary + 0x100 && j < i + 8; ++j)
-	printf (" %#x,", table[j]);
-      printf ("\n");
-    }
-  printf ("};\n");
-  printf ("\n");
-
-  for (i = 0; i < 32; ++i)
-    codes[i] = 5;
-  if (!elf_zlib_inflate_table (&codes[0], 32, &table[0], &table[0]))
-    {
-      fprintf (stderr, "elf_zlib_inflate_table failed\n");
-      exit (EXIT_FAILURE);
-    }
-
-  printf ("static const uint16_t elf_zlib_default_dist_table[%#zx] =\n",
-	  final_next_secondary + 0x100);
-  printf ("{\n");
-  for (i = 0; i < final_next_secondary + 0x100; i += 8)
-    {
-      size_t j;
-
-      printf (" ");
-      for (j = i; j < final_next_secondary + 0x100 && j < i + 8; ++j)
-	printf (" %#x,", table[j]);
-      printf ("\n");
-    }
-  printf ("};\n");
-
-  return 0;
-}
-
-#endif
-
-/* The fixed tables generated by the #ifdef'ed out main function
-   above.  */
-
-static const uint16_t elf_zlib_default_table[0x170] =
-{
-  0xd00, 0xe50, 0xe10, 0xf18, 0xd10, 0xe70, 0xe30, 0x1230,
-  0xd08, 0xe60, 0xe20, 0x1210, 0xe00, 0xe80, 0xe40, 0x1250,
-  0xd04, 0xe58, 0xe18, 0x1200, 0xd14, 0xe78, 0xe38, 0x1240,
-  0xd0c, 0xe68, 0xe28, 0x1220, 0xe08, 0xe88, 0xe48, 0x1260,
-  0xd02, 0xe54, 0xe14, 0xf1c, 0xd12, 0xe74, 0xe34, 0x1238,
-  0xd0a, 0xe64, 0xe24, 0x1218, 0xe04, 0xe84, 0xe44, 0x1258,
-  0xd06, 0xe5c, 0xe1c, 0x1208, 0xd16, 0xe7c, 0xe3c, 0x1248,
-  0xd0e, 0xe6c, 0xe2c, 0x1228, 0xe0c, 0xe8c, 0xe4c, 0x1268,
-  0xd01, 0xe52, 0xe12, 0xf1a, 0xd11, 0xe72, 0xe32, 0x1234,
-  0xd09, 0xe62, 0xe22, 0x1214, 0xe02, 0xe82, 0xe42, 0x1254,
-  0xd05, 0xe5a, 0xe1a, 0x1204, 0xd15, 0xe7a, 0xe3a, 0x1244,
-  0xd0d, 0xe6a, 0xe2a, 0x1224, 0xe0a, 0xe8a, 0xe4a, 0x1264,
-  0xd03, 0xe56, 0xe16, 0xf1e, 0xd13, 0xe76, 0xe36, 0x123c,
-  0xd0b, 0xe66, 0xe26, 0x121c, 0xe06, 0xe86, 0xe46, 0x125c,
-  0xd07, 0xe5e, 0xe1e, 0x120c, 0xd17, 0xe7e, 0xe3e, 0x124c,
-  0xd0f, 0xe6e, 0xe2e, 0x122c, 0xe0e, 0xe8e, 0xe4e, 0x126c,
-  0xd00, 0xe51, 0xe11, 0xf19, 0xd10, 0xe71, 0xe31, 0x1232,
-  0xd08, 0xe61, 0xe21, 0x1212, 0xe01, 0xe81, 0xe41, 0x1252,
-  0xd04, 0xe59, 0xe19, 0x1202, 0xd14, 0xe79, 0xe39, 0x1242,
-  0xd0c, 0xe69, 0xe29, 0x1222, 0xe09, 0xe89, 0xe49, 0x1262,
-  0xd02, 0xe55, 0xe15, 0xf1d, 0xd12, 0xe75, 0xe35, 0x123a,
-  0xd0a, 0xe65, 0xe25, 0x121a, 0xe05, 0xe85, 0xe45, 0x125a,
-  0xd06, 0xe5d, 0xe1d, 0x120a, 0xd16, 0xe7d, 0xe3d, 0x124a,
-  0xd0e, 0xe6d, 0xe2d, 0x122a, 0xe0d, 0xe8d, 0xe4d, 0x126a,
-  0xd01, 0xe53, 0xe13, 0xf1b, 0xd11, 0xe73, 0xe33, 0x1236,
-  0xd09, 0xe63, 0xe23, 0x1216, 0xe03, 0xe83, 0xe43, 0x1256,
-  0xd05, 0xe5b, 0xe1b, 0x1206, 0xd15, 0xe7b, 0xe3b, 0x1246,
-  0xd0d, 0xe6b, 0xe2b, 0x1226, 0xe0b, 0xe8b, 0xe4b, 0x1266,
-  0xd03, 0xe57, 0xe17, 0xf1f, 0xd13, 0xe77, 0xe37, 0x123e,
-  0xd0b, 0xe67, 0xe27, 0x121e, 0xe07, 0xe87, 0xe47, 0x125e,
-  0xd07, 0xe5f, 0xe1f, 0x120e, 0xd17, 0xe7f, 0xe3f, 0x124e,
-  0xd0f, 0xe6f, 0xe2f, 0x122e, 0xe0f, 0xe8f, 0xe4f, 0x126e,
-  0x290, 0x291, 0x292, 0x293, 0x294, 0x295, 0x296, 0x297,
-  0x298, 0x299, 0x29a, 0x29b, 0x29c, 0x29d, 0x29e, 0x29f,
-  0x2a0, 0x2a1, 0x2a2, 0x2a3, 0x2a4, 0x2a5, 0x2a6, 0x2a7,
-  0x2a8, 0x2a9, 0x2aa, 0x2ab, 0x2ac, 0x2ad, 0x2ae, 0x2af,
-  0x2b0, 0x2b1, 0x2b2, 0x2b3, 0x2b4, 0x2b5, 0x2b6, 0x2b7,
-  0x2b8, 0x2b9, 0x2ba, 0x2bb, 0x2bc, 0x2bd, 0x2be, 0x2bf,
-  0x2c0, 0x2c1, 0x2c2, 0x2c3, 0x2c4, 0x2c5, 0x2c6, 0x2c7,
-  0x2c8, 0x2c9, 0x2ca, 0x2cb, 0x2cc, 0x2cd, 0x2ce, 0x2cf,
-  0x2d0, 0x2d1, 0x2d2, 0x2d3, 0x2d4, 0x2d5, 0x2d6, 0x2d7,
-  0x2d8, 0x2d9, 0x2da, 0x2db, 0x2dc, 0x2dd, 0x2de, 0x2df,
-  0x2e0, 0x2e1, 0x2e2, 0x2e3, 0x2e4, 0x2e5, 0x2e6, 0x2e7,
-  0x2e8, 0x2e9, 0x2ea, 0x2eb, 0x2ec, 0x2ed, 0x2ee, 0x2ef,
-  0x2f0, 0x2f1, 0x2f2, 0x2f3, 0x2f4, 0x2f5, 0x2f6, 0x2f7,
-  0x2f8, 0x2f9, 0x2fa, 0x2fb, 0x2fc, 0x2fd, 0x2fe, 0x2ff,
-};
-
-static const uint16_t elf_zlib_default_dist_table[0x100] =
-{
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-  0x800, 0x810, 0x808, 0x818, 0x804, 0x814, 0x80c, 0x81c,
-  0x802, 0x812, 0x80a, 0x81a, 0x806, 0x816, 0x80e, 0x81e,
-  0x801, 0x811, 0x809, 0x819, 0x805, 0x815, 0x80d, 0x81d,
-  0x803, 0x813, 0x80b, 0x81b, 0x807, 0x817, 0x80f, 0x81f,
-};
-
-/* Inflate a zlib stream from PIN/SIN to POUT/SOUT.  Return 1 on
-   success, 0 on some error parsing the stream.  */
-
-static int
-elf_zlib_inflate (const unsigned char *pin, size_t sin, uint16_t *zdebug_table,
-		  unsigned char *pout, size_t sout)
-{
-  unsigned char *porigout;
-  const unsigned char *pinend;
-  unsigned char *poutend;
-
-  /* We can apparently see multiple zlib streams concatenated
-     together, so keep going as long as there is something to read.
-     The last 4 bytes are the checksum.  */
-  porigout = pout;
-  pinend = pin + sin;
-  poutend = pout + sout;
-  while ((pinend - pin) > 4)
-    {
-      uint64_t val;
-      unsigned int bits;
-      int last;
-
-      /* Read the two byte zlib header.  */
-
-      if (unlikely ((pin[0] & 0xf) != 8)) /* 8 is zlib encoding.  */
-	{
-	  /* Unknown compression method.  */
-	  elf_zlib_failed ();
-	  return 0;
-	}
-      if (unlikely ((pin[0] >> 4) > 7))
-	{
-	  /* Window size too large.  Other than this check, we don't
-	     care about the window size.  */
-	  elf_zlib_failed ();
-	  return 0;
-	}
-      if (unlikely ((pin[1] & 0x20) != 0))
-	{
-	  /* Stream expects a predefined dictionary, but we have no
-	     dictionary.  */
-	  elf_zlib_failed ();
-	  return 0;
-	}
-      val = (pin[0] << 8) | pin[1];
-      if (unlikely (val % 31 != 0))
-	{
-	  /* Header check failure.  */
-	  elf_zlib_failed ();
-	  return 0;
-	}
-      pin += 2;
-
-      /* Align PIN to a 32-bit boundary.  */
-
-      val = 0;
-      bits = 0;
-      while ((((uintptr_t) pin) & 3) != 0)
-	{
-	  val |= (uint64_t)*pin << bits;
-	  bits += 8;
-	  ++pin;
-	}
-
-      /* Read blocks until one is marked last.  */
-
-      last = 0;
-
-      while (!last)
-	{
-	  unsigned int type;
-	  const uint16_t *tlit;
-	  const uint16_t *tdist;
-
-	  if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-	    return 0;
-
-	  last = val & 1;
-	  type = (val >> 1) & 3;
-	  val >>= 3;
-	  bits -= 3;
-
-	  if (unlikely (type == 3))
-	    {
-	      /* Invalid block type.  */
-	      elf_zlib_failed ();
-	      return 0;
-	    }
-
-	  if (type == 0)
-	    {
-	      uint16_t len;
-	      uint16_t lenc;
-
-	      /* An uncompressed block.  */
-
-	      /* If we've read ahead more than a byte, back up.  */
-	      while (bits > 8)
-		{
-		  --pin;
-		  bits -= 8;
-		}
-
-	      val = 0;
-	      bits = 0;
-	      if (unlikely ((pinend - pin) < 4))
-		{
-		  /* Missing length.  */
-		  elf_zlib_failed ();
-		  return 0;
-		}
-	      len = pin[0] | (pin[1] << 8);
-	      lenc = pin[2] | (pin[3] << 8);
-	      pin += 4;
-	      lenc = ~lenc;
-	      if (unlikely (len != lenc))
-		{
-		  /* Corrupt data.  */
-		  elf_zlib_failed ();
-		  return 0;
-		}
-	      if (unlikely (len > (unsigned int) (pinend - pin)
-			    || len > (unsigned int) (poutend - pout)))
-		{
-		  /* Not enough space in buffers.  */
-		  elf_zlib_failed ();
-		  return 0;
-		}
-	      memcpy (pout, pin, len);
-	      pout += len;
-	      pin += len;
-
-	      /* Align PIN.  */
-	      while ((((uintptr_t) pin) & 3) != 0)
-		{
-		  val |= (uint64_t)*pin << bits;
-		  bits += 8;
-		  ++pin;
-		}
-
-	      /* Go around to read the next block.  */
-	      continue;
-	    }
-
-	  if (type == 1)
-	    {
-	      tlit = elf_zlib_default_table;
-	      tdist = elf_zlib_default_dist_table;
-	    }
-	  else
-	    {
-	      unsigned int nlit;
-	      unsigned int ndist;
-	      unsigned int nclen;
-	      unsigned char codebits[19];
-	      unsigned char *plenbase;
-	      unsigned char *plen;
-	      unsigned char *plenend;
-
-	      /* Read a Huffman encoding table.  The various magic
-		 numbers here are from RFC 1951.  */
-
-	      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		return 0;
-
-	      nlit = (val & 0x1f) + 257;
-	      val >>= 5;
-	      ndist = (val & 0x1f) + 1;
-	      val >>= 5;
-	      nclen = (val & 0xf) + 4;
-	      val >>= 4;
-	      bits -= 14;
-	      if (unlikely (nlit > 286 || ndist > 30))
-		{
-		  /* Values out of range.  */
-		  elf_zlib_failed ();
-		  return 0;
-		}
-
-	      /* Read and build the table used to compress the
-		 literal, length, and distance codes.  */
-
-	      memset(&codebits[0], 0, 19);
-
-	      /* There are always at least 4 elements in the
-		 table.  */
-
-	      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		return 0;
-
-	      codebits[16] = val & 7;
-	      codebits[17] = (val >> 3) & 7;
-	      codebits[18] = (val >> 6) & 7;
-	      codebits[0] = (val >> 9) & 7;
-	      val >>= 12;
-	      bits -= 12;
-
-	      if (nclen == 4)
-		goto codebitsdone;
-
-	      codebits[8] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 5)
-		goto codebitsdone;
-
-	      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		return 0;
-
-	      codebits[7] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 6)
-		goto codebitsdone;
-
-	      codebits[9] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 7)
-		goto codebitsdone;
-
-	      codebits[6] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 8)
-		goto codebitsdone;
-
-	      codebits[10] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 9)
-		goto codebitsdone;
-
-	      codebits[5] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 10)
-		goto codebitsdone;
-
-	      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		return 0;
-
-	      codebits[11] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 11)
-		goto codebitsdone;
-
-	      codebits[4] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 12)
-		goto codebitsdone;
-
-	      codebits[12] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 13)
-		goto codebitsdone;
-
-	      codebits[3] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 14)
-		goto codebitsdone;
-
-	      codebits[13] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 15)
-		goto codebitsdone;
-
-	      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		return 0;
-
-	      codebits[2] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 16)
-		goto codebitsdone;
-
-	      codebits[14] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 17)
-		goto codebitsdone;
-
-	      codebits[1] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	      if (nclen == 18)
-		goto codebitsdone;
-
-	      codebits[15] = val & 7;
-	      val >>= 3;
-	      bits -= 3;
-
-	    codebitsdone:
-
-	      if (!elf_zlib_inflate_table (codebits, 19, zdebug_table,
-					   zdebug_table))
-		return 0;
-
-	      /* Read the compressed bit lengths of the literal,
-		 length, and distance codes.  We have allocated space
-		 at the end of zdebug_table to hold them.  */
-
-	      plenbase = (((unsigned char *) zdebug_table)
-			  + ZDEBUG_TABLE_CODELEN_OFFSET);
-	      plen = plenbase;
-	      plenend = plen + nlit + ndist;
-	      while (plen < plenend)
-		{
-		  uint16_t t;
-		  unsigned int b;
-		  uint16_t v;
-
-		  if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		    return 0;
-
-		  t = zdebug_table[val & 0xff];
-
-		  /* The compression here uses bit lengths up to 7, so
-		     a secondary table is never necessary.  */
-		  if (unlikely ((t & (1U << HUFFMAN_SECONDARY_SHIFT)) != 0))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-
-		  b = (t >> HUFFMAN_BITS_SHIFT) & HUFFMAN_BITS_MASK;
-		  val >>= b + 1;
-		  bits -= b + 1;
-
-		  v = t & HUFFMAN_VALUE_MASK;
-		  if (v < 16)
-		    *plen++ = v;
-		  else if (v == 16)
-		    {
-		      unsigned int c;
-		      unsigned int prev;
-
-		      /* Copy previous entry 3 to 6 times.  */
-
-		      if (unlikely (plen == plenbase))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      /* We used up to 7 bits since the last
-			 elf_zlib_fetch, so we have at least 8 bits
-			 available here.  */
-
-		      c = 3 + (val & 0x3);
-		      val >>= 2;
-		      bits -= 2;
-		      if (unlikely ((unsigned int) (plenend - plen) < c))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      prev = plen[-1];
-		      switch (c)
-			{
-			case 6:
-			  *plen++ = prev;
-			  /* fallthrough */
-			case 5:
-			  *plen++ = prev;
-			  /* fallthrough */
-			case 4:
-			  *plen++ = prev;
-			}
-		      *plen++ = prev;
-		      *plen++ = prev;
-		      *plen++ = prev;
-		    }
-		  else if (v == 17)
-		    {
-		      unsigned int c;
-
-		      /* Store zero 3 to 10 times.  */
-
-		      /* We used up to 7 bits since the last
-			 elf_zlib_fetch, so we have at least 8 bits
-			 available here.  */
-
-		      c = 3 + (val & 0x7);
-		      val >>= 3;
-		      bits -= 3;
-		      if (unlikely ((unsigned int) (plenend - plen) < c))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      switch (c)
-			{
-			case 10:
-			  *plen++ = 0;
-			  /* fallthrough */
-			case 9:
-			  *plen++ = 0;
-			  /* fallthrough */
-			case 8:
-			  *plen++ = 0;
-			  /* fallthrough */
-			case 7:
-			  *plen++ = 0;
-			  /* fallthrough */
-			case 6:
-			  *plen++ = 0;
-			  /* fallthrough */
-			case 5:
-			  *plen++ = 0;
-			  /* fallthrough */
-			case 4:
-			  *plen++ = 0;
-			}
-		      *plen++ = 0;
-		      *plen++ = 0;
-		      *plen++ = 0;
-		    }
-		  else if (v == 18)
-		    {
-		      unsigned int c;
-
-		      /* Store zero 11 to 138 times.  */
-
-		      /* We used up to 7 bits since the last
-			 elf_zlib_fetch, so we have at least 8 bits
-			 available here.  */
-
-		      c = 11 + (val & 0x7f);
-		      val >>= 7;
-		      bits -= 7;
-		      if (unlikely ((unsigned int) (plenend - plen) < c))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      memset (plen, 0, c);
-		      plen += c;
-		    }
-		  else
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-		}
-
-	      /* Make sure that the stop code can appear.  */
-
-	      plen = plenbase;
-	      if (unlikely (plen[256] == 0))
-		{
-		  elf_zlib_failed ();
-		  return 0;
-		}
-
-	      /* Build the decompression tables.  */
-
-	      if (!elf_zlib_inflate_table (plen, nlit, zdebug_table,
-					   zdebug_table))
-		return 0;
-	      if (!elf_zlib_inflate_table (plen + nlit, ndist, zdebug_table,
-					   zdebug_table + HUFFMAN_TABLE_SIZE))
-		return 0;
-	      tlit = zdebug_table;
-	      tdist = zdebug_table + HUFFMAN_TABLE_SIZE;
-	    }
-
-	  /* Inflate values until the end of the block.  This is the
-	     main loop of the inflation code.  */
-
-	  while (1)
-	    {
-	      uint16_t t;
-	      unsigned int b;
-	      uint16_t v;
-	      unsigned int lit;
-
-	      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		return 0;
-
-	      t = tlit[val & 0xff];
-	      b = (t >> HUFFMAN_BITS_SHIFT) & HUFFMAN_BITS_MASK;
-	      v = t & HUFFMAN_VALUE_MASK;
-
-	      if ((t & (1U << HUFFMAN_SECONDARY_SHIFT)) == 0)
-		{
-		  lit = v;
-		  val >>= b + 1;
-		  bits -= b + 1;
-		}
-	      else
-		{
-		  t = tlit[v + 0x100 + ((val >> 8) & ((1U << b) - 1))];
-		  b = (t >> HUFFMAN_BITS_SHIFT) & HUFFMAN_BITS_MASK;
-		  lit = t & HUFFMAN_VALUE_MASK;
-		  val >>= b + 8;
-		  bits -= b + 8;
-		}
-
-	      if (lit < 256)
-		{
-		  if (unlikely (pout == poutend))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-
-		  *pout++ = lit;
-
-		  /* We will need to write the next byte soon.  We ask
-		     for high temporal locality because we will write
-		     to the whole cache line soon.  */
-		  __builtin_prefetch (pout, 1, 3);
-		}
-	      else if (lit == 256)
-		{
-		  /* The end of the block.  */
-		  break;
-		}
-	      else
-		{
-		  unsigned int dist;
-		  unsigned int len;
-
-		  /* Convert lit into a length.  */
-
-		  if (lit < 265)
-		    len = lit - 257 + 3;
-		  else if (lit == 285)
-		    len = 258;
-		  else if (unlikely (lit > 285))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-		  else
-		    {
-		      unsigned int extra;
-
-		      if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-			return 0;
-
-		      /* This is an expression for the table of length
-			 codes in RFC 1951 3.2.5.  */
-		      lit -= 265;
-		      extra = (lit >> 2) + 1;
-		      len = (lit & 3) << extra;
-		      len += 11;
-		      len += ((1U << (extra - 1)) - 1) << 3;
-		      len += val & ((1U << extra) - 1);
-		      val >>= extra;
-		      bits -= extra;
-		    }
-
-		  if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-		    return 0;
-
-		  t = tdist[val & 0xff];
-		  b = (t >> HUFFMAN_BITS_SHIFT) & HUFFMAN_BITS_MASK;
-		  v = t & HUFFMAN_VALUE_MASK;
-
-		  if ((t & (1U << HUFFMAN_SECONDARY_SHIFT)) == 0)
-		    {
-		      dist = v;
-		      val >>= b + 1;
-		      bits -= b + 1;
-		    }
-		  else
-		    {
-		      t = tdist[v + 0x100 + ((val >> 8) & ((1U << b) - 1))];
-		      b = (t >> HUFFMAN_BITS_SHIFT) & HUFFMAN_BITS_MASK;
-		      dist = t & HUFFMAN_VALUE_MASK;
-		      val >>= b + 8;
-		      bits -= b + 8;
-		    }
-
-		  /* Convert dist to a distance.  */
-
-		  if (dist == 0)
-		    {
-		      /* A distance of 1.  A common case, meaning
-			 repeat the last character LEN times.  */
-
-		      if (unlikely (pout == porigout))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      if (unlikely ((unsigned int) (poutend - pout) < len))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      memset (pout, pout[-1], len);
-		      pout += len;
-		    }
-		  else if (unlikely (dist > 29))
-		    {
-		      elf_zlib_failed ();
-		      return 0;
-		    }
-		  else
-		    {
-		      if (dist < 4)
-			dist = dist + 1;
-		      else
-			{
-			  unsigned int extra;
-
-			  if (!elf_zlib_fetch (&pin, pinend, &val, &bits))
-			    return 0;
-
-			  /* This is an expression for the table of
-			     distance codes in RFC 1951 3.2.5.  */
-			  dist -= 4;
-			  extra = (dist >> 1) + 1;
-			  dist = (dist & 1) << extra;
-			  dist += 5;
-			  dist += ((1U << (extra - 1)) - 1) << 2;
-			  dist += val & ((1U << extra) - 1);
-			  val >>= extra;
-			  bits -= extra;
-			}
-
-		      /* Go back dist bytes, and copy len bytes from
-			 there.  */
-
-		      if (unlikely ((unsigned int) (pout - porigout) < dist))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      if (unlikely ((unsigned int) (poutend - pout) < len))
-			{
-			  elf_zlib_failed ();
-			  return 0;
-			}
-
-		      if (dist >= len)
-			{
-			  memcpy (pout, pout - dist, len);
-			  pout += len;
-			}
-		      else
-			{
-			  while (len > 0)
-			    {
-			      unsigned int copy;
-
-			      copy = len < dist ? len : dist;
-			      memcpy (pout, pout - dist, copy);
-			      len -= copy;
-			      pout += copy;
-			    }
-			}
-		    }
-		}
-	    }
-	}
-    }
-
-  /* We should have filled the output buffer.  */
-  if (unlikely (pout != poutend))
-    {
-      elf_zlib_failed ();
-      return 0;
-    }
-
-  return 1;
-}
-
-/* Verify the zlib checksum.  The checksum is in the 4 bytes at
-   CHECKBYTES, and the uncompressed data is at UNCOMPRESSED /
-   UNCOMPRESSED_SIZE.  Returns 1 on success, 0 on failure.  */
-
-static int
-elf_zlib_verify_checksum (const unsigned char *checkbytes,
-			  const unsigned char *uncompressed,
-			  size_t uncompressed_size)
-{
-  unsigned int i;
-  unsigned int cksum;
-  const unsigned char *p;
-  uint32_t s1;
-  uint32_t s2;
-  size_t hsz;
-
-  cksum = 0;
-  for (i = 0; i < 4; i++)
-    cksum = (cksum << 8) | checkbytes[i];
-
-  s1 = 1;
-  s2 = 0;
-
-  /* Minimize modulo operations.  */
-
-  p = uncompressed;
-  hsz = uncompressed_size;
-  while (hsz >= 5552)
-    {
-      for (i = 0; i < 5552; i += 16)
-	{
-	  /* Manually unroll loop 16 times.  */
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	  s1 = s1 + *p++;
-	  s2 = s2 + s1;
-	}
-      hsz -= 5552;
-      s1 %= 65521;
-      s2 %= 65521;
-    }
-
-  while (hsz >= 16)
-    {
-      /* Manually unroll loop 16 times.  */
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-
-      hsz -= 16;
-    }
-
-  for (i = 0; i < hsz; ++i)
-    {
-      s1 = s1 + *p++;
-      s2 = s2 + s1;
-    }
-
-  s1 %= 65521;
-  s2 %= 65521;
-
-  if (unlikely ((s2 << 16) + s1 != cksum))
-    {
-      elf_zlib_failed ();
-      return 0;
-    }
-
-  return 1;
-}
-
-/* Inflate a zlib stream from PIN/SIN to POUT/SOUT, and verify the
-   checksum.  Return 1 on success, 0 on error.  */
-
-static int
-elf_zlib_inflate_and_verify (const unsigned char *pin, size_t sin,
-			     uint16_t *zdebug_table, unsigned char *pout,
-			     size_t sout)
-{
-  if (!elf_zlib_inflate (pin, sin, zdebug_table, pout, sout))
-    return 0;
-  if (!elf_zlib_verify_checksum (pin + sin - 4, pout, sout))
-    return 0;
-  return 1;
-}
-
-/* Uncompress the old compressed debug format, the one emitted by
-   --compress-debug-sections=zlib-gnu.  The compressed data is in
-   COMPRESSED / COMPRESSED_SIZE, and the function writes to
-   *UNCOMPRESSED / *UNCOMPRESSED_SIZE.  ZDEBUG_TABLE is work space to
-   hold Huffman tables.  Returns 0 on error, 1 on successful
-   decompression or if something goes wrong.  In general we try to
-   carry on, by returning 1, even if we can't decompress.  */
-
-static int
-elf_uncompress_zdebug (struct backtrace_state *state,
-		       const unsigned char *compressed, size_t compressed_size,
-		       uint16_t *zdebug_table,
-		       backtrace_error_callback error_callback, void *data,
-		       unsigned char **uncompressed, size_t *uncompressed_size)
-{
-  size_t sz;
-  size_t i;
-  unsigned char *po;
-
-  *uncompressed = NULL;
-  *uncompressed_size = 0;
-
-  /* The format starts with the four bytes ZLIB, followed by the 8
-     byte length of the uncompressed data in big-endian order,
-     followed by a zlib stream.  */
-
-  if (compressed_size < 12 || memcmp (compressed, "ZLIB", 4) != 0)
-    return 1;
-
-  sz = 0;
-  for (i = 0; i < 8; i++)
-    sz = (sz << 8) | compressed[i + 4];
-
-  if (*uncompressed != NULL && *uncompressed_size >= sz)
-    po = *uncompressed;
-  else
-    {
-      po = (unsigned char *) backtrace_alloc (state, sz, error_callback, data);
-      if (po == NULL)
-	return 0;
-    }
-
-  if (!elf_zlib_inflate_and_verify (compressed + 12, compressed_size - 12,
-				    zdebug_table, po, sz))
-    return 1;
-
-  *uncompressed = po;
-  *uncompressed_size = sz;
-
-  return 1;
-}
-
-/* Uncompress the new compressed debug format, the official standard
-   ELF approach emitted by --compress-debug-sections=zlib-gabi.  The
-   compressed data is in COMPRESSED / COMPRESSED_SIZE, and the
-   function writes to *UNCOMPRESSED / *UNCOMPRESSED_SIZE.
-   ZDEBUG_TABLE is work space as for elf_uncompress_zdebug.  Returns 0
-   on error, 1 on successful decompression or if something goes wrong.
-   In general we try to carry on, by returning 1, even if we can't
-   decompress.  */
-
-static int
-elf_uncompress_chdr (struct backtrace_state *state,
-		     const unsigned char *compressed, size_t compressed_size,
-		     uint16_t *zdebug_table,
-		     backtrace_error_callback error_callback, void *data,
-		     unsigned char **uncompressed, size_t *uncompressed_size)
-{
-  const b_elf_chdr *chdr;
-  unsigned char *po;
-
-  *uncompressed = NULL;
-  *uncompressed_size = 0;
-
-  /* The format starts with an ELF compression header.  */
-  if (compressed_size < sizeof (b_elf_chdr))
-    return 1;
-
-  chdr = (const b_elf_chdr *) compressed;
-
-  if (chdr->ch_type != ELFCOMPRESS_ZLIB)
-    {
-      /* Unsupported compression algorithm.  */
-      return 1;
-    }
-
-  if (*uncompressed != NULL && *uncompressed_size >= chdr->ch_size)
-    po = *uncompressed;
-  else
-    {
-      po = (unsigned char *) backtrace_alloc (state, chdr->ch_size,
-					      error_callback, data);
-      if (po == NULL)
-	return 0;
-    }
-
-  if (!elf_zlib_inflate_and_verify (compressed + sizeof (b_elf_chdr),
-				    compressed_size - sizeof (b_elf_chdr),
-				    zdebug_table, po, chdr->ch_size))
-    return 1;
-
-  *uncompressed = po;
-  *uncompressed_size = chdr->ch_size;
-
-  return 1;
-}
-
-/* This function is a hook for testing the zlib support.  It is only
-   used by tests.  */
-
-int
-backtrace_uncompress_zdebug (struct backtrace_state *state,
-			     const unsigned char *compressed,
-			     size_t compressed_size,
-			     backtrace_error_callback error_callback,
-			     void *data, unsigned char **uncompressed,
-			     size_t *uncompressed_size)
-{
-  uint16_t *zdebug_table;
-  int ret;
-
-  zdebug_table = ((uint16_t *) backtrace_alloc (state, ZDEBUG_TABLE_SIZE,
-						error_callback, data));
-  if (zdebug_table == NULL)
-    return 0;
-  ret = elf_uncompress_zdebug (state, compressed, compressed_size,
-			       zdebug_table, error_callback, data,
-			       uncompressed, uncompressed_size);
-  backtrace_free (state, zdebug_table, ZDEBUG_TABLE_SIZE,
-		  error_callback, data);
-  return ret;
-}
-
-/* Add the backtrace data for one ELF file.  Returns 1 on success,
-   0 on failure (in both cases descriptor is closed) or -1 if exe
-   is non-zero and the ELF file is ET_DYN, which tells the caller that
-   elf_add will need to be called on the descriptor again after
-   base_address is determined.  */
-
-static int
-elf_add (struct backtrace_state *state, const char *filename, int descriptor,
-	 uintptr_t base_address, backtrace_error_callback error_callback,
-	 void *data, fileline *fileline_fn, int *found_sym, int *found_dwarf,
-	 int exe, int debuginfo)
-{
-  struct backtrace_view ehdr_view;
-  b_elf_ehdr ehdr;
-  off_t shoff;
-  unsigned int shnum;
-  unsigned int shstrndx;
-  struct backtrace_view shdrs_view;
-  int shdrs_view_valid;
-  const b_elf_shdr *shdrs;
-  const b_elf_shdr *shstrhdr;
-  size_t shstr_size;
-  off_t shstr_off;
-  struct backtrace_view names_view;
-  int names_view_valid;
-  const char *names;
-  unsigned int symtab_shndx;
-  unsigned int dynsym_shndx;
-  unsigned int i;
-  struct debug_section_info sections[DEBUG_MAX];
-  struct backtrace_view symtab_view;
-  int symtab_view_valid;
-  struct backtrace_view strtab_view;
-  int strtab_view_valid;
-  struct backtrace_view buildid_view;
-  int buildid_view_valid;
-  const char *buildid_data;
-  uint32_t buildid_size;
-  struct backtrace_view debuglink_view;
-  int debuglink_view_valid;
-  const char *debuglink_name;
-  uint32_t debuglink_crc;
-  off_t min_offset;
-  off_t max_offset;
-  struct backtrace_view debug_view;
-  int debug_view_valid;
-  unsigned int using_debug_view;
-  uint16_t *zdebug_table;
-  struct elf_ppc64_opd_data opd_data, *opd;
-
-  if (!debuginfo)
-    {
-      *found_sym = 0;
-      *found_dwarf = 0;
-    }
-
-  shdrs_view_valid = 0;
-  names_view_valid = 0;
-  symtab_view_valid = 0;
-  strtab_view_valid = 0;
-  buildid_view_valid = 0;
-  buildid_data = NULL;
-  buildid_size = 0;
-  debuglink_view_valid = 0;
-  debuglink_name = NULL;
-  debuglink_crc = 0;
-  debug_view_valid = 0;
-  opd = NULL;
-
-  if (!backtrace_get_view (state, descriptor, 0, sizeof ehdr, error_callback,
-			   data, &ehdr_view))
-    goto fail;
-
-  memcpy (&ehdr, ehdr_view.data, sizeof ehdr);
-
-  backtrace_release_view (state, &ehdr_view, error_callback, data);
-
-  if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-      || ehdr.e_ident[EI_MAG1] != ELFMAG1
-      || ehdr.e_ident[EI_MAG2] != ELFMAG2
-      || ehdr.e_ident[EI_MAG3] != ELFMAG3)
-    {
-      error_callback (data, "executable file is not ELF", 0);
-      goto fail;
-    }
-  if (ehdr.e_ident[EI_VERSION] != EV_CURRENT)
-    {
-      error_callback (data, "executable file is unrecognized ELF version", 0);
-      goto fail;
-    }
-
-#if BACKTRACE_ELF_SIZE == 32
-#define BACKTRACE_ELFCLASS ELFCLASS32
-#else
-#define BACKTRACE_ELFCLASS ELFCLASS64
-#endif
-
-  if (ehdr.e_ident[EI_CLASS] != BACKTRACE_ELFCLASS)
-    {
-      error_callback (data, "executable file is unexpected ELF class", 0);
-      goto fail;
-    }
-
-  if (ehdr.e_ident[EI_DATA] != ELFDATA2LSB
-      && ehdr.e_ident[EI_DATA] != ELFDATA2MSB)
-    {
-      error_callback (data, "executable file has unknown endianness", 0);
-      goto fail;
-    }
-
-  /* If the executable is ET_DYN, it is either a PIE, or we are running
-     directly a shared library with .interp.  We need to wait for
-     dl_iterate_phdr in that case to determine the actual base_address.  */
-  if (exe && ehdr.e_type == ET_DYN)
-    return -1;
-
-  shoff = ehdr.e_shoff;
-  shnum = ehdr.e_shnum;
-  shstrndx = ehdr.e_shstrndx;
-
-  if ((shnum == 0 || shstrndx == SHN_XINDEX)
-      && shoff != 0)
-    {
-      struct backtrace_view shdr_view;
-      const b_elf_shdr *shdr;
-
-      if (!backtrace_get_view (state, descriptor, shoff, sizeof shdr,
-			       error_callback, data, &shdr_view))
-	goto fail;
-
-      shdr = (const b_elf_shdr *) shdr_view.data;
-
-      if (shnum == 0)
-	shnum = shdr->sh_size;
-
-      if (shstrndx == SHN_XINDEX)
-	{
-	  shstrndx = shdr->sh_link;
-
-	  /* Versions of the GNU binutils between 2.12 and 2.18 did
-	     not handle objects with more than SHN_LORESERVE sections
-	     correctly.  All large section indexes were offset by
-	     0x100.  There is more information at
-	     http://sourceware.org/bugzilla/show_bug.cgi?id-5900 .
-	     Fortunately these object files are easy to detect, as the
-	     GNU binutils always put the section header string table
-	     near the end of the list of sections.  Thus if the
-	     section header string table index is larger than the
-	     number of sections, then we know we have to subtract
-	     0x100 to get the real section index.  */
-	  if (shstrndx >= shnum && shstrndx >= SHN_LORESERVE + 0x100)
-	    shstrndx -= 0x100;
-	}
-
-      backtrace_release_view (state, &shdr_view, error_callback, data);
-    }
-
-  /* To translate PC to file/line when using DWARF, we need to find
-     the .debug_info and .debug_line sections.  */
-
-  /* Read the section headers, skipping the first one.  */
-
-  if (!backtrace_get_view (state, descriptor, shoff + sizeof (b_elf_shdr),
-			   (shnum - 1) * sizeof (b_elf_shdr),
-			   error_callback, data, &shdrs_view))
-    goto fail;
-  shdrs_view_valid = 1;
-  shdrs = (const b_elf_shdr *) shdrs_view.data;
-
-  /* Read the section names.  */
-
-  shstrhdr = &shdrs[shstrndx - 1];
-  shstr_size = shstrhdr->sh_size;
-  shstr_off = shstrhdr->sh_offset;
-
-  if (!backtrace_get_view (state, descriptor, shstr_off, shstr_size,
-			   error_callback, data, &names_view))
-    goto fail;
-  names_view_valid = 1;
-  names = (const char *) names_view.data;
-
-  symtab_shndx = 0;
-  dynsym_shndx = 0;
-
-  memset (sections, 0, sizeof sections);
-
-  /* Look for the symbol table.  */
-  for (i = 1; i < shnum; ++i)
-    {
-      const b_elf_shdr *shdr;
-      unsigned int sh_name;
-      const char *name;
-      int j;
-
-      shdr = &shdrs[i - 1];
-
-      if (shdr->sh_type == SHT_SYMTAB)
-	symtab_shndx = i;
-      else if (shdr->sh_type == SHT_DYNSYM)
-	dynsym_shndx = i;
-
-      sh_name = shdr->sh_name;
-      if (sh_name >= shstr_size)
-	{
-	  error_callback (data, "ELF section name out of range", 0);
-	  goto fail;
-	}
-
-      name = names + sh_name;
-
-      for (j = 0; j < (int) DEBUG_MAX; ++j)
-	{
-	  if (strcmp (name, debug_section_names[j]) == 0)
-	    {
-	      sections[j].offset = shdr->sh_offset;
-	      sections[j].size = shdr->sh_size;
-	      sections[j].compressed = (shdr->sh_flags & SHF_COMPRESSED) != 0;
-	      break;
-	    }
-	}
-
-      /* Read the build ID if present.  This could check for any
-	 SHT_NOTE section with the right note name and type, but gdb
-	 looks for a specific section name.  */
-      if (!debuginfo
-	  && !buildid_view_valid
-	  && strcmp (name, ".note.gnu.build-id") == 0)
-	{
-	  const b_elf_note *note;
-
-	  if (!backtrace_get_view (state, descriptor, shdr->sh_offset,
-				   shdr->sh_size, error_callback, data,
-				   &buildid_view))
-	    goto fail;
-
-	  buildid_view_valid = 1;
-	  note = (const b_elf_note *) buildid_view.data;
-	  if (note->type == NT_GNU_BUILD_ID
-	      && note->namesz == 4
-	      && strncmp (note->name, "GNU", 4) == 0
-	      && shdr->sh_size < 12 + ((note->namesz + 3) & ~ 3) + note->descsz)
-	    {
-	      buildid_data = &note->name[0] + ((note->namesz + 3) & ~ 3);
-	      buildid_size = note->descsz;
-	    }
-	}
-
-      /* Read the debuglink file if present.  */
-      if (!debuginfo
-	  && !debuglink_view_valid
-	  && strcmp (name, ".gnu_debuglink") == 0)
-	{
-	  const char *debuglink_data;
-	  size_t crc_offset;
-
-	  if (!backtrace_get_view (state, descriptor, shdr->sh_offset,
-				   shdr->sh_size, error_callback, data,
-				   &debuglink_view))
-	    goto fail;
-
-	  debuglink_view_valid = 1;
-	  debuglink_data = (const char *) debuglink_view.data;
-	  crc_offset = strnlen (debuglink_data, shdr->sh_size);
-	  crc_offset = (crc_offset + 3) & ~3;
-	  if (crc_offset + 4 <= shdr->sh_size)
-	    {
-	      debuglink_name = debuglink_data;
-	      debuglink_crc = *(const uint32_t*)(debuglink_data + crc_offset);
-	    }
-	}
-
-      /* Read the .opd section on PowerPC64 ELFv1.  */
-      if (ehdr.e_machine == EM_PPC64
-	  && (ehdr.e_flags & EF_PPC64_ABI) < 2
-	  && shdr->sh_type == SHT_PROGBITS
-	  && strcmp (name, ".opd") == 0)
-	{
-	  if (!backtrace_get_view (state, descriptor, shdr->sh_offset,
-				   shdr->sh_size, error_callback, data,
-				   &opd_data.view))
-	    goto fail;
-
-	  opd = &opd_data;
-	  opd->addr = shdr->sh_addr;
-	  opd->data = (const char *) opd_data.view.data;
-	  opd->size = shdr->sh_size;
-	}
-    }
-
-  if (symtab_shndx == 0)
-    symtab_shndx = dynsym_shndx;
-  if (symtab_shndx != 0 && !debuginfo)
-    {
-      const b_elf_shdr *symtab_shdr;
-      unsigned int strtab_shndx;
-      const b_elf_shdr *strtab_shdr;
-      struct elf_syminfo_data *sdata;
-
-      symtab_shdr = &shdrs[symtab_shndx - 1];
-      strtab_shndx = symtab_shdr->sh_link;
-      if (strtab_shndx >= shnum)
-	{
-	  error_callback (data,
-			  "ELF symbol table strtab link out of range", 0);
-	  goto fail;
-	}
-      strtab_shdr = &shdrs[strtab_shndx - 1];
-
-      if (!backtrace_get_view (state, descriptor, symtab_shdr->sh_offset,
-			       symtab_shdr->sh_size, error_callback, data,
-			       &symtab_view))
-	goto fail;
-      symtab_view_valid = 1;
-
-      if (!backtrace_get_view (state, descriptor, strtab_shdr->sh_offset,
-			       strtab_shdr->sh_size, error_callback, data,
-			       &strtab_view))
-	goto fail;
-      strtab_view_valid = 1;
-
-      sdata = ((struct elf_syminfo_data *)
-	       backtrace_alloc (state, sizeof *sdata, error_callback, data));
-      if (sdata == NULL)
-	goto fail;
-
-      if (!elf_initialize_syminfo (state, base_address,
-				   symtab_view.data, symtab_shdr->sh_size,
-				   strtab_view.data, strtab_shdr->sh_size,
-				   error_callback, data, sdata, opd))
-	{
-	  backtrace_free (state, sdata, sizeof *sdata, error_callback, data);
-	  goto fail;
-	}
-
-      /* We no longer need the symbol table, but we hold on to the
-	 string table permanently.  */
-      backtrace_release_view (state, &symtab_view, error_callback, data);
-      symtab_view_valid = 0;
-
-      *found_sym = 1;
-
-      elf_add_syminfo_data (state, sdata);
-    }
-
-  backtrace_release_view (state, &shdrs_view, error_callback, data);
-  shdrs_view_valid = 0;
-  backtrace_release_view (state, &names_view, error_callback, data);
-  names_view_valid = 0;
-
-  /* If the debug info is in a separate file, read that one instead.  */
-
-  if (buildid_data != NULL)
-    {
-      int d;
-
-      d = elf_open_debugfile_by_buildid (state, buildid_data, buildid_size,
-					 error_callback, data);
-      if (d >= 0)
-	{
-	  int ret;
-
-	  backtrace_release_view (state, &buildid_view, error_callback, data);
-	  if (debuglink_view_valid)
-	    backtrace_release_view (state, &debuglink_view, error_callback,
-				    data);
-	  ret = elf_add (state, NULL, d, base_address, error_callback, data,
-			 fileline_fn, found_sym, found_dwarf, 0, 1);
-	  if (ret < 0)
-	    backtrace_close (d, error_callback, data);
-	  else
-	    backtrace_close (descriptor, error_callback, data);
-	  return ret;
-	}
-    }
-
-  if (buildid_view_valid)
-    {
-      backtrace_release_view (state, &buildid_view, error_callback, data);
-      buildid_view_valid = 0;
-    }
-
-  if (opd)
-    {
-      backtrace_release_view (state, &opd->view, error_callback, data);
-      opd = NULL;
-    }
-
-  if (debuglink_name != NULL)
-    {
-      int d;
-
-      d = elf_open_debugfile_by_debuglink (state, filename, debuglink_name,
-					   debuglink_crc, error_callback,
-					   data);
-      if (d >= 0)
-	{
-	  int ret;
-
-	  backtrace_release_view (state, &debuglink_view, error_callback,
-				  data);
-	  ret = elf_add (state, NULL, d, base_address, error_callback, data,
-			 fileline_fn, found_sym, found_dwarf, 0, 1);
-	  if (ret < 0)
-	    backtrace_close (d, error_callback, data);
-	  else
-	    backtrace_close(descriptor, error_callback, data);
-	  return ret;
-	}
-    }
-
-  if (debuglink_view_valid)
-    {
-      backtrace_release_view (state, &debuglink_view, error_callback, data);
-      debuglink_view_valid = 0;
-    }
-
-  /* Read all the debug sections in a single view, since they are
-     probably adjacent in the file.  We never release this view.  */
-
-  min_offset = 0;
-  max_offset = 0;
-  for (i = 0; i < (int) DEBUG_MAX; ++i)
-    {
-      off_t end;
-
-      if (sections[i].size == 0)
-	continue;
-      if (min_offset == 0 || sections[i].offset < min_offset)
-	min_offset = sections[i].offset;
-      end = sections[i].offset + sections[i].size;
-      if (end > max_offset)
-	max_offset = end;
-    }
-  if (min_offset == 0 || max_offset == 0)
-    {
-      if (!backtrace_close (descriptor, error_callback, data))
-	goto fail;
-      return 1;
-    }
-
-  if (!backtrace_get_view (state, descriptor, min_offset,
-			   max_offset - min_offset,
-			   error_callback, data, &debug_view))
-    goto fail;
-  debug_view_valid = 1;
-
-  /* We've read all we need from the executable.  */
-  if (!backtrace_close (descriptor, error_callback, data))
-    goto fail;
-  descriptor = -1;
-
-  using_debug_view = 0;
-  for (i = 0; i < (int) DEBUG_MAX; ++i)
-    {
-      if (sections[i].size == 0)
-	sections[i].data = NULL;
-      else
-	{
-	  sections[i].data = ((const unsigned char *) debug_view.data
-			      + (sections[i].offset - min_offset));
-	  if (i < ZDEBUG_INFO)
-	    ++using_debug_view;
-	}
-    }
-
-  /* Uncompress the old format (--compress-debug-sections=zlib-gnu).  */
-
-  zdebug_table = NULL;
-  for (i = 0; i < ZDEBUG_INFO; ++i)
-    {
-      struct debug_section_info *pz;
-
-      pz = &sections[i + ZDEBUG_INFO - DEBUG_INFO];
-      if (sections[i].size == 0 && pz->size > 0)
-	{
-	  unsigned char *uncompressed_data;
-	  size_t uncompressed_size;
-
-	  if (zdebug_table == NULL)
-	    {
-	      zdebug_table = ((uint16_t *)
-			      backtrace_alloc (state, ZDEBUG_TABLE_SIZE,
-					       error_callback, data));
-	      if (zdebug_table == NULL)
-		goto fail;
-	    }
-
-	  uncompressed_data = NULL;
-	  uncompressed_size = 0;
-	  if (!elf_uncompress_zdebug (state, pz->data, pz->size, zdebug_table,
-				      error_callback, data,
-				      &uncompressed_data, &uncompressed_size))
-	    goto fail;
-	  sections[i].data = uncompressed_data;
-	  sections[i].size = uncompressed_size;
-	  sections[i].compressed = 0;
-	}
-    }
-
-  /* Uncompress the official ELF format
-     (--compress-debug-sections=zlib-gabi).  */
-  for (i = 0; i < ZDEBUG_INFO; ++i)
-    {
-      unsigned char *uncompressed_data;
-      size_t uncompressed_size;
-
-      if (sections[i].size == 0 || !sections[i].compressed)
-	continue;
-
-      if (zdebug_table == NULL)
-	{
-	  zdebug_table = ((uint16_t *)
-			  backtrace_alloc (state, ZDEBUG_TABLE_SIZE,
-					   error_callback, data));
-	  if (zdebug_table == NULL)
-	    goto fail;
-	}
-
-      uncompressed_data = NULL;
-      uncompressed_size = 0;
-      if (!elf_uncompress_chdr (state, sections[i].data, sections[i].size,
-				zdebug_table, error_callback, data,
-				&uncompressed_data, &uncompressed_size))
-	goto fail;
-      sections[i].data = uncompressed_data;
-      sections[i].size = uncompressed_size;
-      sections[i].compressed = 0;
-
-      --using_debug_view;
-    }
-
-  if (zdebug_table != NULL)
-    backtrace_free (state, zdebug_table, ZDEBUG_TABLE_SIZE,
-		    error_callback, data);
-
-  if (debug_view_valid && using_debug_view == 0)
-    {
-      backtrace_release_view (state, &debug_view, error_callback, data);
-      debug_view_valid = 0;
-    }
-
-  if (!backtrace_dwarf_add (state, base_address,
-			    sections[DEBUG_INFO].data,
-			    sections[DEBUG_INFO].size,
-			    sections[DEBUG_LINE].data,
-			    sections[DEBUG_LINE].size,
-			    sections[DEBUG_ABBREV].data,
-			    sections[DEBUG_ABBREV].size,
-			    sections[DEBUG_RANGES].data,
-			    sections[DEBUG_RANGES].size,
-			    sections[DEBUG_STR].data,
-			    sections[DEBUG_STR].size,
-			    ehdr.e_ident[EI_DATA] == ELFDATA2MSB,
-			    error_callback, data, fileline_fn))
-    goto fail;
-
-  *found_dwarf = 1;
-
-  return 1;
-
- fail:
-  if (shdrs_view_valid)
-    backtrace_release_view (state, &shdrs_view, error_callback, data);
-  if (names_view_valid)
-    backtrace_release_view (state, &names_view, error_callback, data);
-  if (symtab_view_valid)
-    backtrace_release_view (state, &symtab_view, error_callback, data);
-  if (strtab_view_valid)
-    backtrace_release_view (state, &strtab_view, error_callback, data);
-  if (debuglink_view_valid)
-    backtrace_release_view (state, &debuglink_view, error_callback, data);
-  if (buildid_view_valid)
-    backtrace_release_view (state, &buildid_view, error_callback, data);
-  if (debug_view_valid)
-    backtrace_release_view (state, &debug_view, error_callback, data);
-  if (opd)
-    backtrace_release_view (state, &opd->view, error_callback, data);
-  if (descriptor != -1)
-    backtrace_close (descriptor, error_callback, data);
-  return 0;
-}
-
-/* Data passed to phdr_callback.  */
-
-struct phdr_data
-{
-  struct backtrace_state *state;
-  backtrace_error_callback error_callback;
-  void *data;
-  fileline *fileline_fn;
-  int *found_sym;
-  int *found_dwarf;
-  const char *exe_filename;
-  int exe_descriptor;
-};
-
-/* Callback passed to dl_iterate_phdr.  Load debug info from shared
-   libraries.  */
-
-static int
-#ifdef __i386__
-__attribute__ ((__force_align_arg_pointer__))
-#endif
-phdr_callback (struct dl_phdr_info *info, size_t size ATTRIBUTE_UNUSED,
-	       void *pdata)
-{
-  struct phdr_data *pd = (struct phdr_data *) pdata;
-  const char *filename;
-  int descriptor;
-  int does_not_exist;
-  fileline elf_fileline_fn;
-  int found_dwarf;
-
-  /* There is not much we can do if we don't have the module name,
-     unless executable is ET_DYN, where we expect the very first
-     phdr_callback to be for the PIE.  */
-  if (info->dlpi_name == NULL || info->dlpi_name[0] == '\0')
-    {
-      if (pd->exe_descriptor == -1)
-	return 0;
-      filename = pd->exe_filename;
-      descriptor = pd->exe_descriptor;
-      pd->exe_descriptor = -1;
-    }
-  else
-    {
-      if (pd->exe_descriptor != -1)
-	{
-	  backtrace_close (pd->exe_descriptor, pd->error_callback, pd->data);
-	  pd->exe_descriptor = -1;
-	}
-
-      filename = info->dlpi_name;
-      descriptor = backtrace_open (info->dlpi_name, pd->error_callback,
-				   pd->data, &does_not_exist);
-      if (descriptor < 0)
-	return 0;
-    }
-
-  if (elf_add (pd->state, filename, descriptor, info->dlpi_addr,
-	       pd->error_callback, pd->data, &elf_fileline_fn, pd->found_sym,
-	       &found_dwarf, 0, 0))
-    {
-      if (found_dwarf)
-	{
-	  *pd->found_dwarf = 1;
-	  *pd->fileline_fn = elf_fileline_fn;
-	}
-    }
-
-  return 0;
-}
-
-/* Initialize the backtrace data we need from an ELF executable.  At
-   the ELF level, all we need to do is find the debug info
-   sections.  */
-
-int
-backtrace_initialize (struct backtrace_state *state, const char *filename,
-		      int descriptor, backtrace_error_callback error_callback,
-		      void *data, fileline *fileline_fn)
-{
-  int ret;
-  int found_sym;
-  int found_dwarf;
-  fileline elf_fileline_fn = elf_nodebug;
-  struct phdr_data pd;
-
-  ret = elf_add (state, filename, descriptor, 0, error_callback, data,
-		 &elf_fileline_fn, &found_sym, &found_dwarf, 1, 0);
-  if (!ret)
-    return 0;
-
-  pd.state = state;
-  pd.error_callback = error_callback;
-  pd.data = data;
-  pd.fileline_fn = &elf_fileline_fn;
-  pd.found_sym = &found_sym;
-  pd.found_dwarf = &found_dwarf;
-  pd.exe_filename = filename;
-  pd.exe_descriptor = ret < 0 ? descriptor : -1;
-
-  dl_iterate_phdr (phdr_callback, (void *) &pd);
-
-  if (!state->threaded)
-    {
-      if (found_sym)
-	state->syminfo_fn = elf_syminfo;
-      else if (state->syminfo_fn == NULL)
-	state->syminfo_fn = elf_nosyms;
-    }
-  else
-    {
-      if (found_sym)
-	backtrace_atomic_store_pointer (&state->syminfo_fn, elf_syminfo);
-      else
-	(void) __sync_bool_compare_and_swap (&state->syminfo_fn, NULL,
-					     elf_nosyms);
-    }
-
-  if (!state->threaded)
-    *fileline_fn = state->fileline_fn;
-  else
-    *fileline_fn = backtrace_atomic_load_pointer (&state->fileline_fn);
-
-  if (*fileline_fn == NULL || *fileline_fn == elf_nodebug)
-    *fileline_fn = elf_fileline_fn;
-
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/fileline.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/fileline.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/fileline.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/fileline.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-/* fileline.c -- Get file and line number information in a backtrace.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-#ifndef HAVE_GETEXECNAME
-#define getexecname() NULL
-#endif
-
-/* Initialize the fileline information from the executable.  Returns 1
-   on success, 0 on failure.  */
-
-static int
-fileline_initialize (struct backtrace_state *state,
-		     backtrace_error_callback error_callback, void *data)
-{
-  int failed;
-  fileline fileline_fn;
-  int pass;
-  int called_error_callback;
-  int descriptor;
-  const char *filename;
-  char buf[64];
-
-  if (!state->threaded)
-    failed = state->fileline_initialization_failed;
-  else
-    failed = backtrace_atomic_load_int (&state->fileline_initialization_failed);
-
-  if (failed)
-    {
-      error_callback (data, "failed to read executable information", -1);
-      return 0;
-    }
-
-  if (!state->threaded)
-    fileline_fn = state->fileline_fn;
-  else
-    fileline_fn = backtrace_atomic_load_pointer (&state->fileline_fn);
-  if (fileline_fn != NULL)
-    return 1;
-
-  /* We have not initialized the information.  Do it now.  */
-
-  descriptor = -1;
-  called_error_callback = 0;
-  for (pass = 0; pass < 5; ++pass)
-    {
-      int does_not_exist;
-
-      switch (pass)
-	{
-	case 0:
-	  filename = state->filename;
-	  break;
-	case 1:
-	  filename = getexecname ();
-	  break;
-	case 2:
-	  filename = "/proc/self/exe";
-	  break;
-	case 3:
-	  filename = "/proc/curproc/file";
-	  break;
-	case 4:
-	  snprintf (buf, sizeof (buf), "/proc/%ld/object/a.out",
-		    (long) getpid ());
-	  filename = buf;
-	  break;
-	default:
-	  abort ();
-	}
-
-      if (filename == NULL)
-	continue;
-
-      descriptor = backtrace_open (filename, error_callback, data,
-				   &does_not_exist);
-      if (descriptor < 0 && !does_not_exist)
-	{
-	  called_error_callback = 1;
-	  break;
-	}
-      if (descriptor >= 0)
-	break;
-    }
-
-  if (descriptor < 0)
-    {
-      if (!called_error_callback)
-	{
-	  if (state->filename != NULL)
-	    error_callback (data, state->filename, ENOENT);
-	  else
-	    error_callback (data,
-			    "libbacktrace could not find executable to open",
-			    0);
-	}
-      failed = 1;
-    }
-
-  if (!failed)
-    {
-      if (!backtrace_initialize (state, filename, descriptor, error_callback,
-				 data, &fileline_fn))
-	failed = 1;
-    }
-
-  if (failed)
-    {
-      if (!state->threaded)
-	state->fileline_initialization_failed = 1;
-      else
-	backtrace_atomic_store_int (&state->fileline_initialization_failed, 1);
-      return 0;
-    }
-
-  if (!state->threaded)
-    state->fileline_fn = fileline_fn;
-  else
-    {
-      backtrace_atomic_store_pointer (&state->fileline_fn, fileline_fn);
-
-      /* Note that if two threads initialize at once, one of the data
-	 sets may be leaked.  */
-    }
-
-  return 1;
-}
-
-/* Given a PC, find the file name, line number, and function name.  */
-
-int
-backtrace_pcinfo (struct backtrace_state *state, uintptr_t pc,
-		  backtrace_full_callback callback,
-		  backtrace_error_callback error_callback, void *data)
-{
-  if (!fileline_initialize (state, error_callback, data))
-    return 0;
-
-  if (state->fileline_initialization_failed)
-    return 0;
-
-  return state->fileline_fn (state, pc, callback, error_callback, data);
-}
-
-/* Given a PC, find the symbol for it, and its value.  */
-
-int
-backtrace_syminfo (struct backtrace_state *state, uintptr_t pc,
-		   backtrace_syminfo_callback callback,
-		   backtrace_error_callback error_callback, void *data)
-{
-  if (!fileline_initialize (state, error_callback, data))
-    return 0;
-
-  if (state->fileline_initialization_failed)
-    return 0;
-
-  state->syminfo_fn (state, pc, callback, error_callback, data);
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/filenames.h cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/filenames.h
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/filenames.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/filenames.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* btest.c -- Filename header for libbacktrace library
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifndef GCC_VERSION
-# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#endif
-
-#if (GCC_VERSION < 2007)
-# define __attribute__(x)
-#endif
-
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif
-
-#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
-# define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == '\\')
-#else
-# define IS_DIR_SEPARATOR(c) ((c) == '/')
-#endif
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/filetype.awk cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/filetype.awk
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/filetype.awk	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/filetype.awk	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# An awk script to determine the type of a file.
-/\177ELF\001/ { if (NR == 1) { print "elf32"; exit } }
-/\177ELF\002/ { if (NR == 1) { print "elf64"; exit } }
-/\114\001/    { if (NR == 1) { print "pecoff"; exit } }
-/\144\206/    { if (NR == 1) { print "pecoff"; exit } }
-/\xFE\xED\xFA\xCE/ { if (NR == 1) { print "macho32"; exit } }
-/\xCE\xFA\xED\xFE/ { if (NR == 1) { print "macho32"; exit } }
-/\xFE\xED\xFA\xCF/ { if (NR == 1) { print "macho64"; exit } }
-/\xCF\xFA\xED\xFE/ { if (NR == 1) { print "macho64"; exit } }
-/\xCA\xFE\xBA\xBE/ { if (NR == 1) { print "macho-fat"; exit } }
-/\xBE\xBA\xFE\xCA/ { if (NR == 1) { print "macho-fat"; exit } }
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/install-sh cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/install-sh
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/install-sh	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/install-sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,527 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2011-01-19.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for `test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/internal.h cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/internal.h
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/internal.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,304 +0,0 @@
-/* internal.h -- Internal header file for stack backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifndef BACKTRACE_INTERNAL_H
-#define BACKTRACE_INTERNAL_H
-
-/* We assume that <sys/types.h> and "backtrace.h" have already been
-   included.  */
-
-#ifndef GCC_VERSION
-# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#endif
-
-#if (GCC_VERSION < 2007)
-# define __attribute__(x)
-#endif
-
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif
-
-#ifndef ATTRIBUTE_MALLOC
-# if (GCC_VERSION >= 2096)
-#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-# else
-#  define ATTRIBUTE_MALLOC
-# endif
-#endif
-
-#ifndef HAVE_SYNC_FUNCTIONS
-
-/* Define out the sync functions.  These should never be called if
-   they are not available.  */
-
-#define __sync_bool_compare_and_swap(A, B, C) (abort(), 1)
-#define __sync_lock_test_and_set(A, B) (abort(), 0)
-#define __sync_lock_release(A) abort()
-
-#endif /* !defined (HAVE_SYNC_FUNCTIONS) */
-
-#ifdef HAVE_ATOMIC_FUNCTIONS
-
-/* We have the atomic builtin functions.  */
-
-#define backtrace_atomic_load_pointer(p) \
-    __atomic_load_n ((p), __ATOMIC_ACQUIRE)
-#define backtrace_atomic_load_int(p) \
-    __atomic_load_n ((p), __ATOMIC_ACQUIRE)
-#define backtrace_atomic_store_pointer(p, v) \
-    __atomic_store_n ((p), (v), __ATOMIC_RELEASE)
-#define backtrace_atomic_store_size_t(p, v) \
-    __atomic_store_n ((p), (v), __ATOMIC_RELEASE)
-#define backtrace_atomic_store_int(p, v) \
-    __atomic_store_n ((p), (v), __ATOMIC_RELEASE)
-
-#else /* !defined (HAVE_ATOMIC_FUNCTIONS) */
-#ifdef HAVE_SYNC_FUNCTIONS
-
-/* We have the sync functions but not the atomic functions.  Define
-   the atomic ones in terms of the sync ones.  */
-
-extern void *backtrace_atomic_load_pointer (void *);
-extern int backtrace_atomic_load_int (int *);
-extern void backtrace_atomic_store_pointer (void *, void *);
-extern void backtrace_atomic_store_size_t (size_t *, size_t);
-extern void backtrace_atomic_store_int (int *, int);
-
-#else /* !defined (HAVE_SYNC_FUNCTIONS) */
-
-/* We have neither the sync nor the atomic functions.  These will
-   never be called.  */
-
-#define backtrace_atomic_load_pointer(p) (abort(), (void *) NULL)
-#define backtrace_atomic_load_int(p) (abort(), 0)
-#define backtrace_atomic_store_pointer(p, v) abort()
-#define backtrace_atomic_store_size_t(p, v) abort()
-#define backtrace_atomic_store_int(p, v) abort()
-
-#endif /* !defined (HAVE_SYNC_FUNCTIONS) */
-#endif /* !defined (HAVE_ATOMIC_FUNCTIONS) */
-
-/* The type of the function that collects file/line information.  This
-   is like backtrace_pcinfo.  */
-
-typedef int (*fileline) (struct backtrace_state *state, uintptr_t pc,
-			 backtrace_full_callback callback,
-			 backtrace_error_callback error_callback, void *data);
-
-/* The type of the function that collects symbol information.  This is
-   like backtrace_syminfo.  */
-
-typedef void (*syminfo) (struct backtrace_state *state, uintptr_t pc,
-			 backtrace_syminfo_callback callback,
-			 backtrace_error_callback error_callback, void *data);
-
-/* What the backtrace state pointer points to.  */
-
-struct backtrace_state
-{
-  /* The name of the executable.  */
-  const char *filename;
-  /* Non-zero if threaded.  */
-  int threaded;
-  /* The master lock for fileline_fn, fileline_data, syminfo_fn,
-     syminfo_data, fileline_initialization_failed and everything the
-     data pointers point to.  */
-  void *lock;
-  /* The function that returns file/line information.  */
-  fileline fileline_fn;
-  /* The data to pass to FILELINE_FN.  */
-  void *fileline_data;
-  /* The function that returns symbol information.  */
-  syminfo syminfo_fn;
-  /* The data to pass to SYMINFO_FN.  */
-  void *syminfo_data;
-  /* Whether initializing the file/line information failed.  */
-  int fileline_initialization_failed;
-  /* The lock for the freelist.  */
-  int lock_alloc;
-  /* The freelist when using mmap.  */
-  struct backtrace_freelist_struct *freelist;
-};
-
-/* Open a file for reading.  Returns -1 on error.  If DOES_NOT_EXIST
-   is not NULL, *DOES_NOT_EXIST will be set to 0 normally and set to 1
-   if the file does not exist.  If the file does not exist and
-   DOES_NOT_EXIST is not NULL, the function will return -1 and will
-   not call ERROR_CALLBACK.  On other errors, or if DOES_NOT_EXIST is
-   NULL, the function will call ERROR_CALLBACK before returning.  */
-extern int backtrace_open (const char *filename,
-			   backtrace_error_callback error_callback,
-			   void *data,
-			   int *does_not_exist);
-
-/* A view of the contents of a file.  This supports mmap when
-   available.  A view will remain in memory even after backtrace_close
-   is called on the file descriptor from which the view was
-   obtained.  */
-
-struct backtrace_view
-{
-  /* The data that the caller requested.  */
-  const void *data;
-  /* The base of the view.  */
-  void *base;
-  /* The total length of the view.  */
-  size_t len;
-};
-
-/* Create a view of SIZE bytes from DESCRIPTOR at OFFSET.  Store the
-   result in *VIEW.  Returns 1 on success, 0 on error.  */
-extern int backtrace_get_view (struct backtrace_state *state, int descriptor,
-			       off_t offset, size_t size,
-			       backtrace_error_callback error_callback,
-			       void *data, struct backtrace_view *view);
-
-/* Release a view created by backtrace_get_view.  */
-extern void backtrace_release_view (struct backtrace_state *state,
-				    struct backtrace_view *view,
-				    backtrace_error_callback error_callback,
-				    void *data);
-
-/* Close a file opened by backtrace_open.  Returns 1 on success, 0 on
-   error.  */
-
-extern int backtrace_close (int descriptor,
-			    backtrace_error_callback error_callback,
-			    void *data);
-
-/* Sort without using memory.  */
-
-extern void backtrace_qsort (void *base, size_t count, size_t size,
-			     int (*compar) (const void *, const void *));
-
-/* Allocate memory.  This is like malloc.  If ERROR_CALLBACK is NULL,
-   this does not report an error, it just returns NULL.  */
-
-extern void *backtrace_alloc (struct backtrace_state *state, size_t size,
-			      backtrace_error_callback error_callback,
-			      void *data) ATTRIBUTE_MALLOC;
-
-/* Free memory allocated by backtrace_alloc.  If ERROR_CALLBACK is
-   NULL, this does not report an error.  */
-
-extern void backtrace_free (struct backtrace_state *state, void *mem,
-			    size_t size,
-			    backtrace_error_callback error_callback,
-			    void *data);
-
-/* A growable vector of some struct.  This is used for more efficient
-   allocation when we don't know the final size of some group of data
-   that we want to represent as an array.  */
-
-struct backtrace_vector
-{
-  /* The base of the vector.  */
-  void *base;
-  /* The number of bytes in the vector.  */
-  size_t size;
-  /* The number of bytes available at the current allocation.  */
-  size_t alc;
-};
-
-/* Grow VEC by SIZE bytes.  Return a pointer to the newly allocated
-   bytes.  Note that this may move the entire vector to a new memory
-   location.  Returns NULL on failure.  */
-
-extern void *backtrace_vector_grow (struct backtrace_state *state, size_t size,
-				    backtrace_error_callback error_callback,
-				    void *data,
-				    struct backtrace_vector *vec);
-
-/* Finish the current allocation on VEC.  Prepare to start a new
-   allocation.  The finished allocation will never be freed.  Returns
-   a pointer to the base of the finished entries, or NULL on
-   failure.  */
-
-extern void* backtrace_vector_finish (struct backtrace_state *state,
-				      struct backtrace_vector *vec,
-				      backtrace_error_callback error_callback,
-				      void *data);
-
-/* Release any extra space allocated for VEC.  This may change
-   VEC->base.  Returns 1 on success, 0 on failure.  */
-
-extern int backtrace_vector_release (struct backtrace_state *state,
-				     struct backtrace_vector *vec,
-				     backtrace_error_callback error_callback,
-				     void *data);
-
-/* Read initial debug data from a descriptor, and set the
-   fileline_data, syminfo_fn, and syminfo_data fields of STATE.
-   Return the fileln_fn field in *FILELN_FN--this is done this way so
-   that the synchronization code is only implemented once.  This is
-   called after the descriptor has first been opened.  It will close
-   the descriptor if it is no longer needed.  Returns 1 on success, 0
-   on error.  There will be multiple implementations of this function,
-   for different file formats.  Each system will compile the
-   appropriate one.  */
-
-extern int backtrace_initialize (struct backtrace_state *state,
-				 const char *filename,
-				 int descriptor,
-				 backtrace_error_callback error_callback,
-				 void *data,
-				 fileline *fileline_fn);
-
-/* Add file/line information for a DWARF module.  */
-
-extern int backtrace_dwarf_add (struct backtrace_state *state,
-				uintptr_t base_address,
-				const unsigned char* dwarf_info,
-				size_t dwarf_info_size,
-				const unsigned char *dwarf_line,
-				size_t dwarf_line_size,
-				const unsigned char *dwarf_abbrev,
-				size_t dwarf_abbrev_size,
-				const unsigned char *dwarf_ranges,
-				size_t dwarf_range_size,
-				const unsigned char *dwarf_str,
-				size_t dwarf_str_size,
-				int is_bigendian,
-				backtrace_error_callback error_callback,
-				void *data, fileline *fileline_fn);
-
-/* A test-only hook for elf_uncompress_zdebug.  */
-
-extern int backtrace_uncompress_zdebug (struct backtrace_state *,
-					const unsigned char *compressed,
-					size_t compressed_size,
-					backtrace_error_callback, void *data,
-					unsigned char **uncompressed,
-					size_t *uncompressed_size);
-
-#endif
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/LICENSE cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/LICENSE
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/LICENSE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Copyright (C) 2012-2016 Free Software Foundation, Inc.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer. 
-
-#     (2) Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.  
-    
-#     (3) The name of the author may not be used to
-#     endorse or promote products derived from this software without
-#     specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/ltmain.sh cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/ltmain.sh
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/ltmain.sh	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/ltmain.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,7874 +0,0 @@
-# Generated from ltmain.m4sh.
-
-# ltmain.sh (GNU libtool) 2.2.4
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
-#
-# MODE must be one of the following:
-#
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.4
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=2.2.4
-TIMESTAMP=""
-package_revision=1.2976
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-
-$lt_unset CDPATH
-
-
-
-
-
-: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-# Generated shell functions inserted here.
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=:
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname${mode+: }$mode: $*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "X$my_tmpdir" | $Xsed
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $SED -n '/^# Usage:/,/# -h/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    $ECHO
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-     }' < "$progpath"
-    exit $?
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    func_error "missing argument for $1"
-    exit_cmd=exit
-}
-
-exit_cmd=:
-
-
-
-
-
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    $ECHO "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
-    else
-      $ECHO "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
-    else
-      $ECHO "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
-    esac
-  done
-
-
-  case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
-
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
-
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-
-
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
-
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
-
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    $SED -e 4q "$1" 2>/dev/null \
-      | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-	    done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      removelist="$removelist $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$mode'"
-        ;;
-    esac
-
-    $ECHO
-    $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
-}
-
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
-
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-}
-
-test "$mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin | *mingw* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-
-# func_emit_wrapper arg
-#
-# emit a libtool wrapper script on stdout
-# don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variable
-# set therein.
-#
-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the '.lib' directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$ECHO "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-# end: func_emit_wrapper
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat <<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-# define setmode _setmode
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
-#else
-# define LTWRAPPER_DEBUGPRINTF(args)
-#endif
-
-const char *program_name = NULL;
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-static const char *script_text =
-EOF
-
-	    func_emit_wrapper yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-
-	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *shwrapper_name;
-  intptr_t rval = 127;
-  FILE *shwrapper;
-
-  const char *dumpscript_opt = "--lt-dump-script";
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-
-  /* very simple arg parsing; don't want to rely on getopt */
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<EOF
-	  printf ("%s", script_text);
-	  return 0;
-	}
-    }
-
-  newargz = XMALLOC (char *, argc + 2);
-EOF
-
-	    if test -n "$TARGETSHELL" ; then
-	      # no path translation at all
-	      lt_newargv0=$TARGETSHELL
-	    else
-	      case "$host" in
-		*mingw* )
-		  # awkward: cmd appends spaces to result
-		  lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-		  lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
-		  case $lt_newargv0 in
-		    *.exe | *.EXE) ;;
-		    *) lt_newargv0=$lt_newargv0.exe ;;
-		  esac
-		  ;;
-		* ) lt_newargv0=$SHELL ;;
-	      esac
-	    fi
-
-		cat <<EOF
-  newargz[0] = (char *) xstrdup ("$lt_newargv0");
-EOF
-
-	    cat <<"EOF"
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
-  XFREE (tmp_pathspec);
-
-  shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, shwrapper_name);
-
-  /* shwrapper_name transforms */
-  strendzap (shwrapper_name, ".exe");
-  tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
-				 strlen ("_ltshwrapperTMP") + 1));
-  strcpy (tmp_pathspec, shwrapper_name);
-  strcat (tmp_pathspec, "_ltshwrapperTMP");
-  XFREE (shwrapper_name);
-  shwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
-			  shwrapper_name));
-EOF
-
-	    cat <<EOF
-  newargz[1] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
-  strcpy (newargz[1], actual_cwrapper_path);
-  strcat (newargz[1], "$objdir");
-  strcat (newargz[1], "/");
-  strcat (newargz[1], shwrapper_name);
-EOF
-
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[1], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (shwrapper_name);
-  XFREE (actual_cwrapper_path);
-
-  /* always write in binary mode */
-  if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
-    {
-      lt_fatal ("Could not open %s for writing", newargz[1]);
-    }
-  fprintf (shwrapper, "%s", script_text);
-  fclose (shwrapper);
-
-  make_executable (newargz[1]);
-
-  for (i = 1; i < argc; i++)
-    newargz[i + 1] = xstrdup (argv[i]);
-  newargz[argc + 1] = NULL;
-
-  for (i = 0; i < argc + 1; i++)
-    {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<EOF
-  /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
-      return 127;
-    }
-  return rval;
-}
-EOF
-		;;
-	      *)
-		cat <<EOF
-  execv ("$lt_newargv0", newargz);
-  return rval; /* =127, but avoids unused variable warning */
-}
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  weak_libs="$weak_libs $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  case $lib in
-	  *.la)	func_source "$lib" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	      else
-		$ECHO
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw*)
-	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $ECHO
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  $ECHO
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $ECHO
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $ECHO
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $ECHO
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-	    done
-	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      delfiles="$delfiles $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # we should really use a build-platform specific compiler
-	    # here, but OTOH, the wrappers (shell script and this C one)
-	    # are only useful if you want to execute the "real" binary.
-	    # Since the "real" binary is built for $host, then this
-	    # wrapper might as well be built for $host, too.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
-		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$mode" = link || test "$mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/macho.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/macho.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/macho.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/macho.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1418 +0,0 @@
-/* macho.c -- Get debug data from an Mach-O file for backtraces.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   Written by John Colanduoni.
-
-   Pending upstream pull request:
-   https://github.com/ianlancetaylor/libbacktrace/pull/2
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-/* We can't use autotools to detect the pointer width of our program because
-   we may be building a fat Mach-O file containing both 32-bit and 64-bit
-   variants. However Mach-O runs a limited set of platforms so detection
-   via preprocessor is not difficult.  */
-
-#if defined(__MACH__)
-#if defined(__LP64__)
-#define BACKTRACE_BITS 64
-#else
-#define BACKTRACE_BITS 32
-#endif
-#else
-#error Attempting to build Mach-O support on incorrect platform
-#endif
-
-#if defined(__x86_64__)
-#define NATIVE_CPU_TYPE CPU_TYPE_X86_64
-#elif defined(__i386__)
-#define NATIVE_CPU_TYPE CPU_TYPE_X86
-#elif defined(__aarch64__)
-#define NATIVE_CPU_TYPE CPU_TYPE_ARM64
-#elif defined(__arm__)
-#define NATIVE_CPU_TYPE CPU_TYPE_ARM
-#else
-#error Could not detect native Mach-O cpu_type_t
-#endif
-
-#include <sys/types.h>
-#include <sys/syslimits.h>
-#include <string.h>
-#include <mach-o/loader.h>
-#include <mach-o/nlist.h>
-#include <mach-o/fat.h>
-#include <mach-o/dyld.h>
-#include <uuid/uuid.h>
-#include <dirent.h>
-#include <stdlib.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-struct macho_commands_view
-{
-    struct backtrace_view view;
-    uint32_t commands_count;
-    uint32_t commands_total_size;
-    int bytes_swapped;
-    size_t base_offset;
-};
-
-enum debug_section
-{
-    DEBUG_INFO,
-    DEBUG_LINE,
-    DEBUG_ABBREV,
-    DEBUG_RANGES,
-    DEBUG_STR,
-    DEBUG_MAX
-};
-
-static const char *const debug_section_names[DEBUG_MAX] =
-    {
-        "__debug_info",
-        "__debug_line",
-        "__debug_abbrev",
-        "__debug_ranges",
-        "__debug_str"
-    };
-
-struct found_dwarf_section
-{
-    uint32_t file_offset;
-    uintptr_t file_size;
-    const unsigned char *data;
-};
-
-/* Mach-O symbols don't have a length. As a result we have to infer it
-   by sorting the symbol addresses for each image and recording the
-   memory range attributed to each image.  */
-struct macho_symbol
-{
-    uintptr_t addr;
-    size_t size;
-    const char *name;
-};
-
-struct macho_syminfo_data
-{
-    struct macho_syminfo_data *next;
-    struct macho_symbol *symbols;
-    size_t symbol_count;
-    uintptr_t min_addr;
-    uintptr_t max_addr;
-};
-
-uint16_t
-macho_file_to_host_u16 (int file_bytes_swapped, uint16_t input)
-{
-  if (file_bytes_swapped)
-    return (input >> 8) | (input << 8);
-  else
-    return input;
-}
-
-uint32_t
-macho_file_to_host_u32 (int file_bytes_swapped, uint32_t input)
-{
-  if (file_bytes_swapped)
-    {
-      return ((input >> 24) & 0x000000FF)
-             | ((input >> 8) & 0x0000FF00)
-             | ((input << 8) & 0x00FF0000)
-             | ((input << 24) & 0xFF000000);
-    }
-  else
-    {
-      return input;
-    }
-}
-
-uint64_t
-macho_file_to_host_u64 (int file_bytes_swapped, uint64_t input)
-{
-  if (file_bytes_swapped)
-    {
-      return macho_file_to_host_u32 (file_bytes_swapped,
-                                     (uint32_t) (input >> 32))
-             | (((uint64_t) macho_file_to_host_u32 (file_bytes_swapped,
-                                                    (uint32_t) input)) << 32);
-    }
-  else
-    {
-      return input;
-    }
-}
-
-#if BACKTRACE_BITS == 64
-#define macho_file_to_host_usize macho_file_to_host_u64
-typedef struct mach_header_64 mach_header_native_t;
-#define LC_SEGMENT_NATIVE LC_SEGMENT_64
-typedef struct segment_command_64 segment_command_native_t;
-typedef struct nlist_64 nlist_native_t;
-typedef struct section_64 section_native_t;
-#else /* BACKTRACE_BITS == 32 */
-#define macho_file_to_host_usize macho_file_to_host_u32
-typedef struct mach_header mach_header_native_t;
-#define LC_SEGMENT_NATIVE LC_SEGMENT
-typedef struct segment_command segment_command_native_t;
-typedef struct nlist nlist_native_t;
-typedef struct section section_native_t;
-#endif
-
-// Gets a view into a Mach-O image, taking any slice offset into account
-int
-macho_get_view (struct backtrace_state *state, int descriptor,
-                off_t offset, size_t size,
-                backtrace_error_callback error_callback,
-                void *data, struct macho_commands_view *commands_view,
-                struct backtrace_view *view)
-{
-  return backtrace_get_view (state, descriptor,
-                             commands_view->base_offset + offset, size,
-                             error_callback, data, view);
-}
-
-int
-macho_get_commands (struct backtrace_state *state, int descriptor,
-                    backtrace_error_callback error_callback,
-                    void *data, struct macho_commands_view *commands_view,
-                    int *incompatible)
-{
-  int ret = 0;
-  int is_fat = 0;
-  struct backtrace_view file_header_view;
-  int file_header_view_valid = 0;
-  struct backtrace_view fat_archs_view;
-  int fat_archs_view_valid = 0;
-  const mach_header_native_t *file_header;
-  uint64_t commands_offset;
-
-  *incompatible = 0;
-
-  if (!backtrace_get_view (state, descriptor, 0, sizeof (mach_header_native_t),
-                           error_callback, data, &file_header_view))
-    goto end;
-  file_header_view_valid = 1;
-
-  switch (*(uint32_t *) file_header_view.data)
-    {
-      case MH_MAGIC:
-        if (BACKTRACE_BITS == 32)
-          commands_view->bytes_swapped = 0;
-        else
-          {
-            *incompatible = 1;
-            goto end;
-          }
-      break;
-      case MH_CIGAM:
-        if (BACKTRACE_BITS == 32)
-          commands_view->bytes_swapped = 1;
-        else
-          {
-            *incompatible = 1;
-            goto end;
-          }
-      break;
-      case MH_MAGIC_64:
-        if (BACKTRACE_BITS == 64)
-          commands_view->bytes_swapped = 0;
-        else
-          {
-            *incompatible = 1;
-            goto end;
-          }
-      break;
-      case MH_CIGAM_64:
-        if (BACKTRACE_BITS == 64)
-          commands_view->bytes_swapped = 1;
-        else
-          {
-            *incompatible = 1;
-            goto end;
-          }
-      break;
-      case FAT_MAGIC:
-        is_fat = 1;
-        commands_view->bytes_swapped = 0;
-      break;
-      case FAT_CIGAM:
-        is_fat = 1;
-        commands_view->bytes_swapped = 1;
-      break;
-      default:
-        goto end;
-    }
-
-  if (is_fat)
-    {
-      uint32_t native_slice_offset;
-      size_t archs_total_size;
-      uint32_t arch_count;
-      const struct fat_header *fat_header;
-      const struct fat_arch *archs;
-      uint32_t i;
-
-      fat_header = file_header_view.data;
-      arch_count =
-          macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                  fat_header->nfat_arch);
-
-      archs_total_size = arch_count * sizeof (struct fat_arch);
-
-      if (!backtrace_get_view (state, descriptor, sizeof (struct fat_header),
-                               archs_total_size, error_callback,
-                               data, &fat_archs_view))
-        goto end;
-      fat_archs_view_valid = 1;
-
-      native_slice_offset = 0;
-      archs = fat_archs_view.data;
-      for (i = 0; i < arch_count; i++)
-        {
-          const struct fat_arch *raw_arch = archs + i;
-          int cpu_type =
-              (int) macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                            (uint32_t) raw_arch->cputype);
-
-          if (cpu_type == NATIVE_CPU_TYPE)
-            {
-              native_slice_offset =
-                  macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                          raw_arch->offset);
-
-              break;
-            }
-        }
-
-      if (native_slice_offset == 0)
-        {
-          *incompatible = 1;
-          goto end;
-        }
-
-      backtrace_release_view (state, &file_header_view, error_callback, data);
-      file_header_view_valid = 0;
-      if (!backtrace_get_view (state, descriptor, native_slice_offset,
-                               sizeof (mach_header_native_t), error_callback,
-                               data, &file_header_view))
-        goto end;
-      file_header_view_valid = 1;
-
-      // The endianess of the slice may be different than the fat image
-      switch (*(uint32_t *) file_header_view.data)
-        {
-          case MH_MAGIC:
-            if (BACKTRACE_BITS == 32)
-              commands_view->bytes_swapped = 0;
-            else
-              goto end;
-          break;
-          case MH_CIGAM:
-            if (BACKTRACE_BITS == 32)
-              commands_view->bytes_swapped = 1;
-            else
-              goto end;
-          break;
-          case MH_MAGIC_64:
-            if (BACKTRACE_BITS == 64)
-              commands_view->bytes_swapped = 0;
-            else
-              goto end;
-          break;
-          case MH_CIGAM_64:
-            if (BACKTRACE_BITS == 64)
-              commands_view->bytes_swapped = 1;
-            else
-              goto end;
-          break;
-          default:
-            goto end;
-        }
-
-      commands_view->base_offset = native_slice_offset;
-    }
-  else
-    commands_view->base_offset = 0;
-
-  file_header = file_header_view.data;
-  commands_view->commands_count =
-      macho_file_to_host_u32 (commands_view->bytes_swapped,
-                              file_header->ncmds);
-  commands_view->commands_total_size =
-      macho_file_to_host_u32 (commands_view->bytes_swapped,
-                              file_header->sizeofcmds);
-  commands_offset =
-      commands_view->base_offset + sizeof (mach_header_native_t);
-
-  if (!backtrace_get_view (state, descriptor, commands_offset,
-                           commands_view->commands_total_size, error_callback,
-                           data, &commands_view->view))
-    goto end;
-
-  ret = 1;
-
-end:
-  if (file_header_view_valid)
-    backtrace_release_view (state, &file_header_view, error_callback, data);
-  if (fat_archs_view_valid)
-    backtrace_release_view (state, &fat_archs_view, error_callback, data);
-  return ret;
-}
-
-int
-macho_get_uuid (struct backtrace_state *state ATTRIBUTE_UNUSED,
-                int descriptor ATTRIBUTE_UNUSED,
-                backtrace_error_callback error_callback,
-                void *data, struct macho_commands_view *commands_view,
-                uuid_t *uuid)
-{
-  size_t offset = 0;
-  uint32_t i = 0;
-
-  for (i = 0; i < commands_view->commands_count; i++)
-    {
-      const struct load_command *raw_command;
-      struct load_command command;
-
-      if (offset + sizeof (struct load_command)
-          > commands_view->commands_total_size)
-        {
-          error_callback (data,
-                          "executable file contains out of range command offset",
-                          0);
-          return 0;
-        }
-
-      raw_command =
-          commands_view->view.data + offset;
-      command.cmd = macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                            raw_command->cmd);
-      command.cmdsize = macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                                raw_command->cmdsize);
-
-      if (command.cmd == LC_UUID)
-        {
-          const struct uuid_command *uuid_command;
-
-          if (offset + sizeof (struct uuid_command)
-              > commands_view->commands_total_size)
-            {
-              error_callback (data,
-                              "executable file contains out of range command offset",
-                              0);
-              return 0;
-            }
-
-          uuid_command =
-              (struct uuid_command *) raw_command;
-          memcpy (uuid, uuid_command->uuid, sizeof (uuid_t));
-          return 1;
-        }
-
-      offset += command.cmdsize;
-    }
-
-  error_callback (data, "executable file is missing an identifying UUID", 0);
-  return 0;
-}
-
-/* Returns the base address of a Mach-O image, as encoded in the file header.
- * WARNING: This does not take ASLR into account, which is ubiquitous on recent
- * Darwin platforms.
- */
-int
-macho_get_addr_range (struct backtrace_state *state ATTRIBUTE_UNUSED,
-                      int descriptor ATTRIBUTE_UNUSED,
-                      backtrace_error_callback error_callback,
-                      void *data, struct macho_commands_view *commands_view,
-                      uintptr_t *base_address, uintptr_t *max_address)
-{
-  size_t offset = 0;
-  int found_text = 0;
-  uint32_t i = 0;
-
-  *max_address = 0;
-
-  for (i = 0; i < commands_view->commands_count; i++)
-    {
-      const struct load_command *raw_command;
-      struct load_command command;
-
-      if (offset + sizeof (struct load_command)
-          > commands_view->commands_total_size)
-        {
-          error_callback (data,
-                          "executable file contains out of range command offset",
-                          0);
-          return 0;
-        }
-
-      raw_command = commands_view->view.data + offset;
-      command.cmd = macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                            raw_command->cmd);
-      command.cmdsize = macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                                raw_command->cmdsize);
-
-      if (command.cmd == LC_SEGMENT_NATIVE)
-        {
-          const segment_command_native_t *raw_segment;
-          uintptr_t segment_vmaddr;
-          uintptr_t segment_vmsize;
-          uintptr_t segment_maxaddr;
-          uintptr_t text_fileoff;
-
-          if (offset + sizeof (segment_command_native_t)
-              > commands_view->commands_total_size)
-            {
-              error_callback (data,
-                              "executable file contains out of range command offset",
-                              0);
-              return 0;
-            }
-
-          raw_segment = (segment_command_native_t *) raw_command;
-
-          segment_vmaddr = macho_file_to_host_usize (
-              commands_view->bytes_swapped, raw_segment->vmaddr);
-          segment_vmsize = macho_file_to_host_usize (
-              commands_view->bytes_swapped, raw_segment->vmsize);
-          segment_maxaddr = segment_vmaddr + segment_vmsize;
-
-          if (strncmp (raw_segment->segname, "__TEXT",
-                       sizeof (raw_segment->segname)) == 0)
-            {
-              text_fileoff = macho_file_to_host_usize (
-                  commands_view->bytes_swapped, raw_segment->fileoff);
-              *base_address = segment_vmaddr - text_fileoff;
-
-              found_text = 1;
-            }
-
-          if (segment_maxaddr > *max_address)
-            *max_address = segment_maxaddr;
-        }
-
-      offset += command.cmdsize;
-    }
-
-  if (found_text)
-    return 1;
-  else
-    {
-      error_callback (data, "executable is missing __TEXT segment", 0);
-      return 0;
-    }
-}
-
-static int
-macho_symbol_compare_addr (const void *left_raw, const void *right_raw)
-{
-  const struct macho_symbol *left = left_raw;
-  const struct macho_symbol *right = right_raw;
-
-  if (left->addr > right->addr)
-    return 1;
-  else if (left->addr < right->addr)
-    return -1;
-  else
-    return 0;
-}
-
-int
-macho_symbol_type_relevant (uint8_t type)
-{
-  uint8_t type_field = (uint8_t) (type & N_TYPE);
-
-  return !(type & N_EXT) &&
-         (type_field == N_ABS || type_field == N_SECT);
-}
-
-int
-macho_add_symtab (struct backtrace_state *state,
-                  backtrace_error_callback error_callback,
-                  void *data, int descriptor,
-                  struct macho_commands_view *commands_view,
-                  uintptr_t base_address, uintptr_t max_image_address,
-                  intptr_t vmslide, int *found_sym)
-{
-  struct macho_syminfo_data *syminfo_data;
-
-  int ret = 0;
-  size_t offset = 0;
-  struct backtrace_view symtab_view;
-  int symtab_view_valid = 0;
-  struct backtrace_view strtab_view;
-  int strtab_view_valid = 0;
-  size_t syminfo_index = 0;
-  size_t function_count = 0;
-  uint32_t i = 0;
-  uint32_t j = 0;
-  uint32_t symtab_index = 0;
-
-  *found_sym = 0;
-
-  for (i = 0; i < commands_view->commands_count; i++)
-    {
-      const struct load_command *raw_command;
-      struct load_command command;
-
-      if (offset + sizeof (struct load_command)
-          > commands_view->commands_total_size)
-        {
-          error_callback (data,
-                          "executable file contains out of range command offset",
-                          0);
-          return 0;
-        }
-
-      raw_command = commands_view->view.data + offset;
-      command.cmd = macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                            raw_command->cmd);
-      command.cmdsize = macho_file_to_host_u32 (commands_view->bytes_swapped,
-                                                raw_command->cmdsize);
-
-      if (command.cmd == LC_SYMTAB)
-        {
-          const struct symtab_command *symtab_command;
-          uint32_t symbol_table_offset;
-          uint32_t symbol_count;
-          uint32_t string_table_offset;
-          uint32_t string_table_size;
-
-          if (offset + sizeof (struct symtab_command)
-              > commands_view->commands_total_size)
-            {
-              error_callback (data,
-                              "executable file contains out of range command offset",
-                              0);
-              return 0;
-            }
-
-          symtab_command = (struct symtab_command *) raw_command;
-
-          symbol_table_offset = macho_file_to_host_u32 (
-              commands_view->bytes_swapped, symtab_command->symoff);
-          symbol_count = macho_file_to_host_u32 (
-              commands_view->bytes_swapped, symtab_command->nsyms);
-          string_table_offset = macho_file_to_host_u32 (
-              commands_view->bytes_swapped, symtab_command->stroff);
-          string_table_size = macho_file_to_host_u32 (
-              commands_view->bytes_swapped, symtab_command->strsize);
-
-
-          if (!macho_get_view (state, descriptor, symbol_table_offset,
-                               symbol_count * sizeof (nlist_native_t),
-                               error_callback, data, commands_view,
-                               &symtab_view))
-            goto end;
-          symtab_view_valid = 1;
-
-          if (!macho_get_view (state, descriptor, string_table_offset,
-                               string_table_size, error_callback, data,
-                               commands_view, &strtab_view))
-            goto end;
-          strtab_view_valid = 1;
-
-          // Count functions first
-          for (j = 0; j < symbol_count; j++)
-            {
-              const nlist_native_t *raw_sym =
-                  ((const nlist_native_t *) symtab_view.data) + j;
-
-              if (macho_symbol_type_relevant (raw_sym->n_type))
-                {
-                  function_count += 1;
-                }
-            }
-
-          // Allocate space for the:
-          //  (a) macho_syminfo_data for this image
-          //  (b) macho_symbol entries
-          syminfo_data =
-              backtrace_alloc (state,
-                               sizeof (struct macho_syminfo_data),
-                               error_callback, data);
-          if (syminfo_data == NULL)
-            goto end;
-
-          syminfo_data->symbols = backtrace_alloc (
-              state, function_count * sizeof (struct macho_symbol),
-              error_callback, data);
-          if (syminfo_data->symbols == NULL)
-            goto end;
-
-          syminfo_data->symbol_count = function_count;
-          syminfo_data->next = NULL;
-          syminfo_data->min_addr = base_address;
-          syminfo_data->max_addr = max_image_address;
-
-          for (symtab_index = 0;
-               symtab_index < symbol_count; symtab_index++)
-            {
-              const nlist_native_t *raw_sym =
-                  ((const nlist_native_t *) symtab_view.data) +
-                  symtab_index;
-
-              if (macho_symbol_type_relevant (raw_sym->n_type))
-                {
-                  size_t strtab_index;
-                  const char *name;
-                  size_t max_len_plus_one;
-
-                  syminfo_data->symbols[syminfo_index].addr =
-                      macho_file_to_host_usize (commands_view->bytes_swapped,
-                                                raw_sym->n_value) + vmslide;
-
-                  strtab_index = macho_file_to_host_u32 (
-                      commands_view->bytes_swapped,
-                      raw_sym->n_un.n_strx);
-
-                  // Check the range of the supposed "string" we've been
-                  // given
-                  if (strtab_index >= string_table_size)
-                    {
-                      error_callback (
-                          data,
-                          "dSYM file contains out of range string table index",
-                          0);
-                      goto end;
-                    }
-
-                  name = strtab_view.data + strtab_index;
-                  max_len_plus_one = string_table_size - strtab_index;
-
-                  if (strnlen (name, max_len_plus_one) >= max_len_plus_one)
-                    {
-                      error_callback (
-                          data,
-                          "dSYM file contains unterminated string",
-                          0);
-                      goto end;
-                    }
-
-                  // Remove underscore prefixes
-                  if (name[0] == '_')
-                    {
-                      name = name + 1;
-                    }
-
-                  syminfo_data->symbols[syminfo_index].name = name;
-
-                  syminfo_index += 1;
-                }
-            }
-
-          backtrace_qsort (syminfo_data->symbols,
-                           syminfo_data->symbol_count,
-                           sizeof (struct macho_symbol),
-                           macho_symbol_compare_addr);
-
-          // Calculate symbol sizes
-          for (syminfo_index = 0;
-               syminfo_index < syminfo_data->symbol_count; syminfo_index++)
-            {
-              if (syminfo_index + 1 < syminfo_data->symbol_count)
-                {
-                  syminfo_data->symbols[syminfo_index].size =
-                      syminfo_data->symbols[syminfo_index + 1].addr -
-                      syminfo_data->symbols[syminfo_index].addr;
-                }
-              else
-                {
-                  syminfo_data->symbols[syminfo_index].size =
-                      max_image_address -
-                      syminfo_data->symbols[syminfo_index].addr;
-                }
-            }
-
-          if (!state->threaded)
-            {
-              struct macho_syminfo_data **pp;
-
-              for (pp = (struct macho_syminfo_data **) (void *) &state->syminfo_data;
-                   *pp != NULL;
-                   pp = &(*pp)->next);
-              *pp = syminfo_data;
-            }
-          else
-            {
-              while (1)
-                {
-                  struct macho_syminfo_data **pp;
-
-                  pp = (struct macho_syminfo_data **) (void *) &state->syminfo_data;
-
-                  while (1)
-                    {
-                      struct macho_syminfo_data *p;
-
-                      p = backtrace_atomic_load_pointer (pp);
-
-                      if (p == NULL)
-                        break;
-
-                      pp = &p->next;
-                    }
-
-                  if (__sync_bool_compare_and_swap (pp, NULL, syminfo_data))
-                    break;
-                }
-            }
-
-          strtab_view_valid = 0; // We need to keep string table around
-          *found_sym = 1;
-          ret = 1;
-          goto end;
-        }
-
-      offset += command.cmdsize;
-    }
-
-  // No symbol table here
-  ret = 1;
-  goto end;
-
-end:
-  if (symtab_view_valid)
-    backtrace_release_view (state, &symtab_view, error_callback, data);
-  if (strtab_view_valid)
-    backtrace_release_view (state, &strtab_view, error_callback, data);
-  return ret;
-}
-
-int
-macho_try_dwarf (struct backtrace_state *state,
-                 backtrace_error_callback error_callback,
-                 void *data, fileline *fileline_fn, uuid_t *executable_uuid,
-                 uintptr_t base_address, uintptr_t max_image_address,
-                 intptr_t vmslide, char *dwarf_filename, int *matched,
-                 int *found_sym, int *found_dwarf)
-{
-  uuid_t dwarf_uuid;
-
-  int ret = 0;
-  int dwarf_descriptor;
-  int dwarf_descriptor_valid = 0;
-  struct macho_commands_view commands_view;
-  int commands_view_valid = 0;
-  struct backtrace_view dwarf_view;
-  int dwarf_view_valid = 0;
-  size_t offset = 0;
-  struct found_dwarf_section dwarf_sections[DEBUG_MAX];
-  uintptr_t min_dwarf_offset = 0;
-  uintptr_t max_dwarf_offset = 0;
-  uint32_t i = 0;
-  uint32_t j = 0;
-  int k = 0;
-
-  *matched = 0;
-  *found_sym = 0;
-  *found_dwarf = 0;
-
-  if ((dwarf_descriptor = backtrace_open (dwarf_filename, error_callback,
-                                          data, NULL)) == 0)
-    goto end;
-  dwarf_descriptor_valid = 1;
-
-  int incompatible;
-  if (!macho_get_commands (state, dwarf_descriptor, error_callback, data,
-                           &commands_view, &incompatible))
-    {
-      // Failing to read the header here is fine, because this dSYM may be
-      // for a different architecture
-      if (incompatible)
-        {
-          ret = 1;
-        }
-      goto end;
-    }
-  commands_view_valid = 1;
-
-  // Get dSYM UUID and compare
-  if (!macho_get_uuid (state, dwarf_descriptor, error_callback, data,
-                       &commands_view, &dwarf_uuid))
-    {
-      error_callback (data, "dSYM file is missing an identifying uuid", 0);
-      goto end;
-    }
-  if (memcmp (executable_uuid, &dwarf_uuid, sizeof (uuid_t)) != 0)
-    {
-      // DWARF doesn't belong to desired executable
-      ret = 1;
-      goto end;
-    }
-
-  *matched = 1;
-
-  // Read symbol table
-  if (!macho_add_symtab (state, error_callback, data, dwarf_descriptor,
-                         &commands_view, base_address, max_image_address,
-                         vmslide, found_sym))
-    goto end;
-
-  // Get DWARF sections
-
-  memset (dwarf_sections, 0, sizeof (dwarf_sections));
-  offset = 0;
-  for (i = 0; i < commands_view.commands_count; i++)
-    {
-      const struct load_command *raw_command;
-      struct load_command command;
-
-      if (offset + sizeof (struct load_command)
-          > commands_view.commands_total_size)
-        {
-          error_callback (data,
-                          "dSYM file contains out of range command offset", 0);
-          goto end;
-        }
-
-      raw_command = commands_view.view.data + offset;
-      command.cmd = macho_file_to_host_u32 (commands_view.bytes_swapped,
-                                            raw_command->cmd);
-      command.cmdsize = macho_file_to_host_u32 (commands_view.bytes_swapped,
-                                                raw_command->cmdsize);
-
-      if (command.cmd == LC_SEGMENT_NATIVE)
-        {
-          uint32_t section_count;
-          size_t section_offset;
-          const segment_command_native_t *raw_segment;
-
-          if (offset + sizeof (segment_command_native_t)
-              > commands_view.commands_total_size)
-            {
-              error_callback (data,
-                              "dSYM file contains out of range command offset",
-                              0);
-              goto end;
-            }
-
-          raw_segment = (const segment_command_native_t *) raw_command;
-
-          if (strncmp (raw_segment->segname, "__DWARF",
-                       sizeof (raw_segment->segname)) == 0)
-            {
-              section_count = macho_file_to_host_u32 (
-                  commands_view.bytes_swapped,
-                  raw_segment->nsects);
-
-              section_offset = offset + sizeof (segment_command_native_t);
-
-              // Search sections for relevant DWARF section names
-              for (j = 0; j < section_count; j++)
-                {
-                  const section_native_t *raw_section;
-
-                  if (section_offset + sizeof (section_native_t) >
-                      commands_view.commands_total_size)
-                    {
-                      error_callback (data,
-                                      "dSYM file contains out of range command offset",
-                                      0);
-                      goto end;
-                    }
-
-                  raw_section = commands_view.view.data + section_offset;
-
-                  for (k = 0; k < DEBUG_MAX; k++)
-                    {
-                      uintptr_t dwarf_section_end;
-
-                      if (strncmp (raw_section->sectname,
-                                   debug_section_names[k],
-                                   sizeof (raw_section->sectname)) == 0)
-                        {
-                          *found_dwarf = 1;
-
-                          dwarf_sections[k].file_offset =
-                              macho_file_to_host_u32 (
-                                  commands_view.bytes_swapped,
-                                  raw_section->offset);
-                          dwarf_sections[k].file_size =
-                              macho_file_to_host_usize (
-                                  commands_view.bytes_swapped,
-                                  raw_section->size);
-
-                          if (min_dwarf_offset == 0 ||
-                              dwarf_sections[k].file_offset <
-                              min_dwarf_offset)
-                            min_dwarf_offset = dwarf_sections[k].file_offset;
-
-                          dwarf_section_end =
-                              dwarf_sections[k].file_offset +
-                              dwarf_sections[k].file_size;
-                          if (dwarf_section_end > max_dwarf_offset)
-                            max_dwarf_offset = dwarf_section_end;
-
-                          break;
-                        }
-                    }
-
-                  section_offset += sizeof (section_native_t);
-                }
-
-              break;
-            }
-        }
-
-      offset += command.cmdsize;
-    }
-
-  if (!*found_dwarf)
-    {
-      // No DWARF in this file
-      ret = 1;
-      goto end;
-    }
-
-  if (!macho_get_view (state, dwarf_descriptor, (off_t) min_dwarf_offset,
-                       max_dwarf_offset - min_dwarf_offset, error_callback,
-                       data, &commands_view, &dwarf_view))
-    goto end;
-  dwarf_view_valid = 1;
-
-  for (i = 0; i < DEBUG_MAX; i++)
-    {
-      if (dwarf_sections[i].file_offset == 0)
-        dwarf_sections[i].data = NULL;
-      else
-        dwarf_sections[i].data =
-            dwarf_view.data + dwarf_sections[i].file_offset - min_dwarf_offset;
-    }
-
-  if (!backtrace_dwarf_add (state, vmslide,
-                            dwarf_sections[DEBUG_INFO].data,
-                            dwarf_sections[DEBUG_INFO].file_size,
-                            dwarf_sections[DEBUG_LINE].data,
-                            dwarf_sections[DEBUG_LINE].file_size,
-                            dwarf_sections[DEBUG_ABBREV].data,
-                            dwarf_sections[DEBUG_ABBREV].file_size,
-                            dwarf_sections[DEBUG_RANGES].data,
-                            dwarf_sections[DEBUG_RANGES].file_size,
-                            dwarf_sections[DEBUG_STR].data,
-                            dwarf_sections[DEBUG_STR].file_size,
-                            ((__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN)
-                            ^ commands_view.bytes_swapped),
-                            error_callback, data, fileline_fn))
-    goto end;
-
-  // Don't release the DWARF view because it is still in use
-  dwarf_descriptor_valid = 0;
-  dwarf_view_valid = 0;
-  ret = 1;
-
-end:
-  if (dwarf_descriptor_valid)
-    backtrace_close (dwarf_descriptor, error_callback, data);
-  if (commands_view_valid)
-    backtrace_release_view (state, &commands_view.view, error_callback, data);
-  if (dwarf_view_valid)
-    backtrace_release_view (state, &dwarf_view, error_callback, data);
-  return ret;
-}
-
-int
-macho_try_dsym (struct backtrace_state *state,
-                backtrace_error_callback error_callback,
-                void *data, fileline *fileline_fn, uuid_t *executable_uuid,
-                uintptr_t base_address, uintptr_t max_image_address,
-                intptr_t vmslide, char *dsym_filename, int *matched,
-                int *found_sym, int *found_dwarf)
-{
-  int ret = 0;
-  char dwarf_image_dir_path[PATH_MAX];
-  DIR *dwarf_image_dir;
-  int dwarf_image_dir_valid = 0;
-  struct dirent *directory_entry;
-  char dwarf_filename[PATH_MAX];
-  int dwarf_matched;
-  int dwarf_had_sym;
-  int dwarf_had_dwarf;
-
-  *matched = 0;
-  *found_sym = 0;
-  *found_dwarf = 0;
-
-  strncpy (dwarf_image_dir_path, dsym_filename, PATH_MAX);
-  strncat (dwarf_image_dir_path, "/Contents/Resources/DWARF", PATH_MAX);
-
-  if (!(dwarf_image_dir = opendir (dwarf_image_dir_path)))
-    {
-      error_callback (data, "could not open DWARF directory in dSYM",
-                      0);
-      goto end;
-    }
-  dwarf_image_dir_valid = 1;
-
-  while ((directory_entry = readdir (dwarf_image_dir)))
-    {
-      if (directory_entry->d_type != DT_REG)
-        continue;
-
-      strncpy (dwarf_filename, dwarf_image_dir_path, PATH_MAX);
-      strncat (dwarf_filename, "/", PATH_MAX);
-      strncat (dwarf_filename, directory_entry->d_name, PATH_MAX);
-
-      if (!macho_try_dwarf (state, error_callback, data, fileline_fn,
-                            executable_uuid, base_address, max_image_address,
-                            vmslide, dwarf_filename,
-                            &dwarf_matched, &dwarf_had_sym, &dwarf_had_dwarf))
-        goto end;
-
-      if (dwarf_matched)
-        {
-          *matched = 1;
-          *found_sym = dwarf_had_sym;
-          *found_dwarf = dwarf_had_dwarf;
-          ret = 1;
-          goto end;
-        }
-    }
-
-  // No matching DWARF in this dSYM
-  ret = 1;
-  goto end;
-
-end:
-  if (dwarf_image_dir_valid)
-    closedir (dwarf_image_dir);
-  return ret;
-}
-
-int
-macho_add (struct backtrace_state *state,
-           backtrace_error_callback error_callback, void *data, int descriptor,
-           const char *filename, fileline *fileline_fn, intptr_t vmslide,
-           int *found_sym, int *found_dwarf)
-{
-  uuid_t image_uuid;
-  uintptr_t image_file_base_address;
-  uintptr_t image_file_max_address;
-  uintptr_t image_actual_base_address = 0;
-  uintptr_t image_actual_max_address = 0;
-
-  int ret = 0;
-  struct macho_commands_view commands_view;
-  int commands_view_valid = 0;
-  char executable_dirname[PATH_MAX];
-  size_t filename_len;
-  DIR *executable_dir = NULL;
-  int executable_dir_valid = 0;
-  struct dirent *directory_entry;
-  char dsym_full_path[PATH_MAX];
-  static const char *extension;
-  size_t extension_len;
-  ssize_t i;
-
-  *found_sym = 0;
-  *found_dwarf = 0;
-
-  // Find Mach-O commands list
-  int incompatible;
-  if (!macho_get_commands (state, descriptor, error_callback, data,
-                           &commands_view, &incompatible))
-    goto end;
-  commands_view_valid = 1;
-
-  // First we need to get the uuid of our file so we can hunt down the correct
-  // dSYM
-  if (!macho_get_uuid (state, descriptor, error_callback, data, &commands_view,
-                       &image_uuid))
-    goto end;
-
-  // Now we need to find the in memory base address. Step one is to find out
-  // what the executable thinks the base address is
-  if (!macho_get_addr_range (state, descriptor, error_callback, data,
-                             &commands_view,
-                             &image_file_base_address,
-                             &image_file_max_address))
-    goto end;
-
-  image_actual_base_address =
-      image_file_base_address + vmslide;
-  image_actual_max_address =
-      image_file_max_address + vmslide;
-
-  if (image_actual_base_address == 0)
-    {
-      error_callback (data, "executable file is not loaded", 0);
-      goto end;
-    }
-
-  // Look for dSYM in our executable's directory
-  strncpy (executable_dirname, filename, PATH_MAX);
-  filename_len = strlen (executable_dirname);
-  for (i = filename_len - 1; i >= 0; i--)
-    {
-      if (executable_dirname[i] == '/')
-        {
-          executable_dirname[i] = '\0';
-          break;
-        }
-      else if (i == 0)
-        {
-          executable_dirname[0] = '.';
-          executable_dirname[1] = '\0';
-          break;
-        }
-    }
-
-  if (!(executable_dir = opendir (executable_dirname)))
-    {
-      error_callback (data, "could not open directory containing executable",
-                      0);
-      goto end;
-    }
-  executable_dir_valid = 1;
-
-  extension = ".dSYM";
-  extension_len = strlen (extension);
-  while ((directory_entry = readdir (executable_dir)))
-    {
-      if (directory_entry->d_namlen < extension_len)
-        continue;
-      if (strncasecmp (directory_entry->d_name + directory_entry->d_namlen
-                       - extension_len, extension, extension_len) == 0)
-        {
-          int matched;
-          int dsym_had_sym;
-          int dsym_had_dwarf;
-
-          // Found a dSYM
-          strncpy (dsym_full_path, executable_dirname, PATH_MAX);
-          strncat (dsym_full_path, "/", PATH_MAX);
-          strncat (dsym_full_path, directory_entry->d_name, PATH_MAX);
-
-          if (!macho_try_dsym (state, error_callback, data,
-                               fileline_fn, &image_uuid,
-                               image_actual_base_address,
-                               image_actual_max_address, vmslide,
-                               dsym_full_path,
-                               &matched, &dsym_had_sym, &dsym_had_dwarf))
-            goto end;
-
-          if (matched)
-            {
-              *found_sym = dsym_had_sym;
-              *found_dwarf = dsym_had_dwarf;
-              ret = 1;
-              goto end;
-            }
-        }
-    }
-
-  // No matching dSYM
-  ret = 1;
-  goto end;
-
-end:
-  if (commands_view_valid)
-    backtrace_release_view (state, &commands_view.view, error_callback,
-                            data);
-  if (executable_dir_valid)
-    closedir (executable_dir);
-  return ret;
-}
-
-static int
-macho_symbol_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct macho_symbol *entry = (const struct macho_symbol *) ventry;
-  uintptr_t addr;
-
-  addr = *key;
-  if (addr < entry->addr)
-    return -1;
-  else if (addr >= entry->addr + entry->size)
-    return 1;
-  else
-    return 0;
-}
-
-static void
-macho_syminfo (struct backtrace_state *state,
-               uintptr_t addr,
-               backtrace_syminfo_callback callback,
-               backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-               void *data)
-{
-  struct macho_syminfo_data *edata;
-  struct macho_symbol *sym = NULL;
-
-  if (!state->threaded)
-    {
-      for (edata = (struct macho_syminfo_data *) state->syminfo_data;
-           edata != NULL;
-           edata = edata->next)
-        {
-          if (addr >= edata->min_addr && addr <= edata->max_addr)
-            {
-              sym = ((struct macho_symbol *)
-                  bsearch (&addr, edata->symbols, edata->symbol_count,
-                           sizeof (struct macho_symbol), macho_symbol_search));
-              if (sym != NULL)
-                break;
-            }
-        }
-    }
-  else
-    {
-      struct macho_syminfo_data **pp;
-
-      pp = (struct macho_syminfo_data **) (void *) &state->syminfo_data;
-      while (1)
-        {
-          edata = backtrace_atomic_load_pointer (pp);
-          if (edata == NULL)
-            break;
-
-          if (addr >= edata->min_addr && addr <= edata->max_addr)
-            {
-              sym = ((struct macho_symbol *)
-                  bsearch (&addr, edata->symbols, edata->symbol_count,
-                           sizeof (struct macho_symbol), macho_symbol_search));
-              if (sym != NULL)
-                break;
-            }
-
-          pp = &edata->next;
-        }
-    }
-
-  if (sym == NULL)
-    callback (data, addr, NULL, 0, 0);
-  else
-    callback (data, addr, sym->name, sym->addr, sym->size);
-}
-
-
-static int
-macho_nodebug (struct backtrace_state *state ATTRIBUTE_UNUSED,
-               uintptr_t pc ATTRIBUTE_UNUSED,
-               backtrace_full_callback callback ATTRIBUTE_UNUSED,
-               backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no debug info in Mach-O executable", -1);
-  return 0;
-}
-
-static void
-macho_nosyms (struct backtrace_state *state ATTRIBUTE_UNUSED,
-              uintptr_t addr ATTRIBUTE_UNUSED,
-              backtrace_syminfo_callback callback ATTRIBUTE_UNUSED,
-              backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no symbol table in Mach-O executable", -1);
-}
-
-int
-backtrace_initialize (struct backtrace_state *state,
-                      const char *filename,
-                      int descriptor,
-                      backtrace_error_callback error_callback,
-                      void *data, fileline *fileline_fn)
-{
-  int ret;
-  fileline macho_fileline_fn = macho_nodebug;
-  int found_sym = 0;
-  int found_dwarf = 0;
-  uint32_t i = 0;
-  uint32_t loaded_image_count;
-
-  // Add all loaded images
-  loaded_image_count = _dyld_image_count ();
-  for (i = 0; i < loaded_image_count; i++)
-    {
-      int current_found_sym;
-      int current_found_dwarf;
-      int current_descriptor;
-      intptr_t current_vmslide;
-      const char *current_name;
-
-      current_vmslide = _dyld_get_image_vmaddr_slide (i);
-      current_name = _dyld_get_image_name (i);
-
-      if (current_name == NULL || (i != 0 && current_vmslide == 0))
-        continue;
-
-      if (!(current_descriptor =
-                backtrace_open (current_name, error_callback, data, NULL)))
-        {
-          continue;
-        }
-
-      if (macho_add (state, error_callback, data, current_descriptor,
-                      current_name, &macho_fileline_fn, current_vmslide,
-                      &current_found_sym, &current_found_dwarf))
-        {
-          found_sym = found_sym || current_found_sym;
-          found_dwarf = found_dwarf || current_found_dwarf;
-        }
-
-      backtrace_close (current_descriptor, error_callback, data);
-    }
-
-  if (!state->threaded)
-    {
-      if (found_sym)
-        state->syminfo_fn = macho_syminfo;
-      else if (state->syminfo_fn == NULL)
-        state->syminfo_fn = macho_nosyms;
-    }
-  else
-    {
-      if (found_sym)
-        backtrace_atomic_store_pointer (&state->syminfo_fn, macho_syminfo);
-      else
-        (void) __sync_bool_compare_and_swap (&state->syminfo_fn, NULL,
-                                             macho_nosyms);
-    }
-
-  if (!state->threaded)
-    {
-      if (state->fileline_fn == NULL || state->fileline_fn == macho_nodebug)
-        *fileline_fn = macho_fileline_fn;
-    }
-  else
-    {
-      fileline current_fn;
-
-      current_fn = backtrace_atomic_load_pointer (&state->fileline_fn);
-      if (current_fn == NULL || current_fn == macho_nodebug)
-        *fileline_fn = macho_fileline_fn;
-    }
-
-  return 1;
-}
-
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/Makefile.am cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/Makefile.am
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-# Makefile.am -- Backtrace Makefile.
-# Copyright (C) 2012-2018 Free Software Foundation, Inc.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-
-#     (2) Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-
-#     (3) The name of the author may not be used to
-#     endorse or promote products derived from this software without
-#     specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-ACLOCAL_AMFLAGS = -I config
-
-AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
-
-include_HEADERS = backtrace.h backtrace-supported.h
-
-lib_LTLIBRARIES = libbacktrace.la
-
-libbacktrace_la_SOURCES = \
-	backtrace.h \
-	atomic.c \
-	dwarf.c \
-	fileline.c \
-	internal.h \
-	posix.c \
-	print.c \
-	sort.c \
-	state.c
-
-BACKTRACE_FILES = \
-	backtrace.c \
-	simple.c \
-	nounwind.c
-
-FORMAT_FILES = \
-	elf.c \
-	pecoff.c \
-	unknown.c \
-	xcoff.c
-
-VIEW_FILES = \
-	read.c \
-	mmapio.c
-
-ALLOC_FILES = \
-	alloc.c \
-	mmap.c
-
-EXTRA_libbacktrace_la_SOURCES = \
-	$(BACKTRACE_FILES) \
-	$(FORMAT_FILES) \
-	$(VIEW_FILES) \
-	$(ALLOC_FILES)
-
-libbacktrace_la_LIBADD = \
-	$(BACKTRACE_FILE) \
-	$(FORMAT_FILE) \
-	$(VIEW_FILE) \
-	$(ALLOC_FILE)
-
-libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
-
-# Testsuite.
-
-check_PROGRAMS =
-CLEANFILES =
-
-TESTS = $(check_PROGRAMS)
-
-if NATIVE
-
-btest_SOURCES = btest.c testlib.c
-btest_CFLAGS = $(AM_CFLAGS) -g -O
-btest_LDADD = libbacktrace.la
-
-check_PROGRAMS += btest
-
-btest_static_SOURCES = btest.c testlib.c
-btest_static_CFLAGS = $(AM_CFLAGS) -g -O
-btest_static_LDADD = libbacktrace.la
-btest_static_LDFLAGS = -static-libtool-libs
-
-check_PROGRAMS += btest_static
-
-stest_SOURCES = stest.c
-stest_LDADD = libbacktrace.la
-
-check_PROGRAMS += stest
-
-ztest_SOURCES = ztest.c testlib.c
-ztest_CFLAGS = -DSRCDIR=\"$(srcdir)\"
-ztest_LDADD = libbacktrace.la
-
-if HAVE_ZLIB
-ztest_LDADD += -lz
-endif
-ztest_LDADD += $(CLOCK_GETTIME_LINK)
-
-check_PROGRAMS += ztest
-
-edtest_SOURCES = edtest.c edtest2_build.c testlib.c
-edtest_LDADD = libbacktrace.la
-
-check_PROGRAMS += edtest
-
-edtest2_build.c: gen_edtest2_build; @true
-gen_edtest2_build: $(srcdir)/edtest2.c
-	cat $(srcdir)/edtest2.c > tmp-edtest2_build.c
-	$(SHELL) $(srcdir)/move-if-change tmp-edtest2_build.c edtest2_build.c
-	echo timestamp > $@
-
-CLEANFILES += edtest2_build.c gen_edtest2_build
-
-if HAVE_PTHREAD
-
-check_PROGRAMS += ttest
-
-ttest_SOURCES = ttest.c testlib.c
-ttest_CFLAGS = $(AM_CFLAGS) -pthread
-ttest_LDADD = libbacktrace.la
-
-endif HAVE_PTHREAD
-
-if HAVE_OBJCOPY_DEBUGLINK
-
-TESTS += dtest
-
-dtest: btest_static
-	$(OBJCOPY) --only-keep-debug btest_static btest.debug
-	$(OBJCOPY) --strip-debug --add-gnu-debuglink=btest.debug btest_static dtest
-
-CLEANFILES += dtest btest.debug
-
-endif HAVE_OBJCOPY_DEBUGLINK
-
-if HAVE_COMPRESSED_DEBUG
-
-ctestg_SOURCES = btest.c testlib.c
-ctestg_CFLAGS = $(AM_CFLAGS) -g
-ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu
-ctestg_LDADD = libbacktrace.la
-
-ctesta_SOURCES = btest.c testlib.c
-ctesta_CFLAGS = $(AM_CFLAGS) -g
-ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi
-ctesta_LDADD = libbacktrace.la
-
-check_PROGRAMS += ctestg ctesta
-
-endif
-
-endif NATIVE
-
-# We can't use automake's automatic dependency tracking, because it
-# breaks when using bootstrap-lean.  Automatic dependency tracking
-# with GCC bootstrap will cause some of the objects to depend on
-# header files in prev-gcc/include, e.g., stddef.h and stdarg.h.  When
-# using bootstrap-lean, prev-gcc is removed after each stage.  When
-# running "make install", those header files will be gone, causing the
-# library to be rebuilt at install time.  That may not succeed.
-
-# These manual dependencies do not include dependencies on unwind.h,
-# even though that is part of GCC, because where to find it depends on
-# whether we are being built as a host library or a target library.
-
-alloc.lo: config.h backtrace.h internal.h
-backtrace.lo: config.h backtrace.h internal.h
-btest.lo:  backtrace.h backtrace-supported.h filenames.h
-dwarf.lo: config.h filenames.h backtrace.h internal.h
-elf.lo: config.h backtrace.h internal.h
-fileline.lo: config.h backtrace.h internal.h
-mmap.lo: config.h backtrace.h internal.h
-mmapio.lo: config.h backtrace.h internal.h
-nounwind.lo: config.h internal.h
-pecoff.lo: config.h backtrace.h internal.h
-posix.lo: config.h backtrace.h internal.h
-print.lo: config.h backtrace.h internal.h
-read.lo: config.h backtrace.h internal.h
-simple.lo: config.h backtrace.h internal.h
-sort.lo: config.h backtrace.h internal.h
-stest.lo: config.h backtrace.h internal.h
-state.lo: config.h backtrace.h backtrace-supported.h internal.h
-unknown.lo: config.h backtrace.h internal.h
-xcoff.lo: config.h backtrace.h internal.h
-
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/Makefile.in cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/Makefile.in
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/Makefile.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,1021 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile.am -- Backtrace Makefile.
-# Copyright (C) 2012-2018 Free Software Foundation, Inc.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-
-#     (2) Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in
-#     the documentation and/or other materials provided with the
-#     distribution.
-
-#     (3) The name of the author may not be used to
-#     endorse or promote products derived from this software without
-#     specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
-@NATIVE_TRUE@am__append_1 = btest btest_static stest ztest edtest
-@HAVE_ZLIB_TRUE@@NATIVE_TRUE@am__append_2 = -lz
-@NATIVE_TRUE@am__append_3 = edtest2_build.c gen_edtest2_build
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__append_4 = ttest
-@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_5 = dtest
-@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_6 = dtest btest.debug
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__append_7 = ctestg ctesta
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(srcdir)/backtrace-supported.h.in \
-	$(include_HEADERS)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \
-	$(top_srcdir)/config/ltoptions.m4 \
-	$(top_srcdir)/config/ltsugar.m4 \
-	$(top_srcdir)/config/ltversion.m4 \
-	$(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = backtrace-supported.h
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
-	print.lo sort.lo state.lo
-libbacktrace_la_OBJECTS = $(am_libbacktrace_la_OBJECTS)
-@NATIVE_TRUE@am__EXEEXT_1 = btest$(EXEEXT) btest_static$(EXEEXT) \
-@NATIVE_TRUE@	stest$(EXEEXT) ztest$(EXEEXT) edtest$(EXEEXT)
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = ttest$(EXEEXT)
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_3 =  \
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg$(EXEEXT) \
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta$(EXEEXT)
-@NATIVE_TRUE@am_btest_OBJECTS = btest-btest.$(OBJEXT) \
-@NATIVE_TRUE@	btest-testlib.$(OBJEXT)
-btest_OBJECTS = $(am_btest_OBJECTS)
-@NATIVE_TRUE@btest_DEPENDENCIES = libbacktrace.la
-btest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(btest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@NATIVE_TRUE@am_btest_static_OBJECTS = btest_static-btest.$(OBJEXT) \
-@NATIVE_TRUE@	btest_static-testlib.$(OBJEXT)
-btest_static_OBJECTS = $(am_btest_static_OBJECTS)
-@NATIVE_TRUE@btest_static_DEPENDENCIES = libbacktrace.la
-btest_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(btest_static_CFLAGS) \
-	$(CFLAGS) $(btest_static_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am_ctesta_OBJECTS = ctesta-btest.$(OBJEXT) \
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta-testlib.$(OBJEXT)
-ctesta_OBJECTS = $(am_ctesta_OBJECTS)
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctesta_DEPENDENCIES =  \
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	libbacktrace.la
-ctesta_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(ctesta_CFLAGS) $(CFLAGS) \
-	$(ctesta_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am_ctestg_OBJECTS = ctestg-btest.$(OBJEXT) \
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg-testlib.$(OBJEXT)
-ctestg_OBJECTS = $(am_ctestg_OBJECTS)
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctestg_DEPENDENCIES =  \
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	libbacktrace.la
-ctestg_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(ctestg_CFLAGS) $(CFLAGS) \
-	$(ctestg_LDFLAGS) $(LDFLAGS) -o $@
-@NATIVE_TRUE@am_edtest_OBJECTS = edtest.$(OBJEXT) \
-@NATIVE_TRUE@	edtest2_build.$(OBJEXT) testlib.$(OBJEXT)
-edtest_OBJECTS = $(am_edtest_OBJECTS)
-@NATIVE_TRUE@edtest_DEPENDENCIES = libbacktrace.la
-@NATIVE_TRUE@am_stest_OBJECTS = stest.$(OBJEXT)
-stest_OBJECTS = $(am_stest_OBJECTS)
-@NATIVE_TRUE@stest_DEPENDENCIES = libbacktrace.la
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am_ttest_OBJECTS =  \
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@	ttest-ttest.$(OBJEXT) \
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@	ttest-testlib.$(OBJEXT)
-ttest_OBJECTS = $(am_ttest_OBJECTS)
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ttest_DEPENDENCIES = libbacktrace.la
-ttest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(ttest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@NATIVE_TRUE@am_ztest_OBJECTS = ztest-ztest.$(OBJEXT) \
-@NATIVE_TRUE@	ztest-testlib.$(OBJEXT)
-ztest_OBJECTS = $(am_ztest_OBJECTS)
-@NATIVE_TRUE@ztest_DEPENDENCIES = libbacktrace.la \
-@NATIVE_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-ztest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(ztest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
-	$(btest_SOURCES) $(btest_static_SOURCES) $(ctesta_SOURCES) \
-	$(ctestg_SOURCES) $(edtest_SOURCES) $(stest_SOURCES) \
-	$(ttest_SOURCES) $(ztest_SOURCES)
-MULTISRCTOP = 
-MULTIBUILDTOP = 
-MULTIDIRS = 
-MULTISUBDIR = 
-MULTIDO = true
-MULTICLEAN = true
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
-ACLOCAL = @ACLOCAL@
-ALLOC_FILE = @ALLOC_FILE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BACKTRACE_FILE = @BACKTRACE_FILE@
-BACKTRACE_SUPPORTED = @BACKTRACE_SUPPORTED@
-BACKTRACE_SUPPORTS_DATA = @BACKTRACE_SUPPORTS_DATA@
-BACKTRACE_SUPPORTS_THREADS = @BACKTRACE_SUPPORTS_THREADS@
-BACKTRACE_USES_MALLOC = @BACKTRACE_USES_MALLOC@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_FLAGS = @EXTRA_FLAGS@
-FGREP = @FGREP@
-FORMAT_FILE = @FORMAT_FILE@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJCOPY = @OBJCOPY@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIC_FLAG = @PIC_FLAG@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-VIEW_FILE = @VIEW_FILE@
-WARN_FLAGS = @WARN_FLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libtool_VERSION = @libtool_VERSION@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-multi_basedir = @multi_basedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I config
-AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
-include_HEADERS = backtrace.h backtrace-supported.h
-lib_LTLIBRARIES = libbacktrace.la
-libbacktrace_la_SOURCES = \
-	backtrace.h \
-	atomic.c \
-	dwarf.c \
-	fileline.c \
-	internal.h \
-	posix.c \
-	print.c \
-	sort.c \
-	state.c
-
-BACKTRACE_FILES = \
-	backtrace.c \
-	simple.c \
-	nounwind.c
-
-FORMAT_FILES = \
-	elf.c \
-	pecoff.c \
-	unknown.c \
-	xcoff.c
-
-VIEW_FILES = \
-	read.c \
-	mmapio.c
-
-ALLOC_FILES = \
-	alloc.c \
-	mmap.c
-
-EXTRA_libbacktrace_la_SOURCES = \
-	$(BACKTRACE_FILES) \
-	$(FORMAT_FILES) \
-	$(VIEW_FILES) \
-	$(ALLOC_FILES)
-
-libbacktrace_la_LIBADD = \
-	$(BACKTRACE_FILE) \
-	$(FORMAT_FILE) \
-	$(VIEW_FILE) \
-	$(ALLOC_FILE)
-
-libbacktrace_la_DEPENDENCIES = $(libbacktrace_la_LIBADD)
-CLEANFILES = $(am__append_3) $(am__append_6)
-TESTS = $(check_PROGRAMS) $(am__append_5)
-@NATIVE_TRUE@btest_SOURCES = btest.c testlib.c
-@NATIVE_TRUE@btest_CFLAGS = $(AM_CFLAGS) -g -O
-@NATIVE_TRUE@btest_LDADD = libbacktrace.la
-@NATIVE_TRUE@btest_static_SOURCES = btest.c testlib.c
-@NATIVE_TRUE@btest_static_CFLAGS = $(AM_CFLAGS) -g -O
-@NATIVE_TRUE@btest_static_LDADD = libbacktrace.la
-@NATIVE_TRUE@btest_static_LDFLAGS = -static-libtool-libs
-@NATIVE_TRUE@stest_SOURCES = stest.c
-@NATIVE_TRUE@stest_LDADD = libbacktrace.la
-@NATIVE_TRUE@ztest_SOURCES = ztest.c testlib.c
-@NATIVE_TRUE@ztest_CFLAGS = -DSRCDIR=\"$(srcdir)\"
-@NATIVE_TRUE@ztest_LDADD = libbacktrace.la $(am__append_2) \
-@NATIVE_TRUE@	$(CLOCK_GETTIME_LINK)
-@NATIVE_TRUE@edtest_SOURCES = edtest.c edtest2_build.c testlib.c
-@NATIVE_TRUE@edtest_LDADD = libbacktrace.la
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ttest_SOURCES = ttest.c testlib.c
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ttest_CFLAGS = $(AM_CFLAGS) -pthread
-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@ttest_LDADD = libbacktrace.la
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctestg_SOURCES = btest.c testlib.c
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctestg_CFLAGS = $(AM_CFLAGS) -g
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctestg_LDADD = libbacktrace.la
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctesta_SOURCES = btest.c testlib.c
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctesta_CFLAGS = $(AM_CFLAGS) -g
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi
-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@ctesta_LDADD = libbacktrace.la
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign --ignore-deps Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-supported.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES) 
-	@rm -f btest$(EXEEXT)
-	$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
-btest_static$(EXEEXT): $(btest_static_OBJECTS) $(btest_static_DEPENDENCIES) $(EXTRA_btest_static_DEPENDENCIES) 
-	@rm -f btest_static$(EXEEXT)
-	$(btest_static_LINK) $(btest_static_OBJECTS) $(btest_static_LDADD) $(LIBS)
-ctesta$(EXEEXT): $(ctesta_OBJECTS) $(ctesta_DEPENDENCIES) $(EXTRA_ctesta_DEPENDENCIES) 
-	@rm -f ctesta$(EXEEXT)
-	$(ctesta_LINK) $(ctesta_OBJECTS) $(ctesta_LDADD) $(LIBS)
-ctestg$(EXEEXT): $(ctestg_OBJECTS) $(ctestg_DEPENDENCIES) $(EXTRA_ctestg_DEPENDENCIES) 
-	@rm -f ctestg$(EXEEXT)
-	$(ctestg_LINK) $(ctestg_OBJECTS) $(ctestg_LDADD) $(LIBS)
-edtest$(EXEEXT): $(edtest_OBJECTS) $(edtest_DEPENDENCIES) $(EXTRA_edtest_DEPENDENCIES) 
-	@rm -f edtest$(EXEEXT)
-	$(LINK) $(edtest_OBJECTS) $(edtest_LDADD) $(LIBS)
-stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES) 
-	@rm -f stest$(EXEEXT)
-	$(LINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)
-ttest$(EXEEXT): $(ttest_OBJECTS) $(ttest_DEPENDENCIES) $(EXTRA_ttest_DEPENDENCIES) 
-	@rm -f ttest$(EXEEXT)
-	$(ttest_LINK) $(ttest_OBJECTS) $(ttest_LDADD) $(LIBS)
-ztest$(EXEEXT): $(ztest_OBJECTS) $(ztest_DEPENDENCIES) $(EXTRA_ztest_DEPENDENCIES) 
-	@rm -f ztest$(EXEEXT)
-	$(ztest_LINK) $(ztest_OBJECTS) $(ztest_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(LTCOMPILE) -c -o $@ $<
-
-btest-btest.o: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
-
-btest-btest.obj: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-btest.obj `if test -f 'btest.c'; then $(CYGPATH_W) 'btest.c'; else $(CYGPATH_W) '$(srcdir)/btest.c'; fi`
-
-btest-testlib.o: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
-
-btest-testlib.obj: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_CFLAGS) $(CFLAGS) -c -o btest-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-btest_static-btest.o: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
-
-btest_static-btest.obj: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-btest.obj `if test -f 'btest.c'; then $(CYGPATH_W) 'btest.c'; else $(CYGPATH_W) '$(srcdir)/btest.c'; fi`
-
-btest_static-testlib.o: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
-
-btest_static-testlib.obj: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(btest_static_CFLAGS) $(CFLAGS) -c -o btest_static-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-ctesta-btest.o: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctesta_CFLAGS) $(CFLAGS) -c -o ctesta-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
-
-ctesta-btest.obj: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctesta_CFLAGS) $(CFLAGS) -c -o ctesta-btest.obj `if test -f 'btest.c'; then $(CYGPATH_W) 'btest.c'; else $(CYGPATH_W) '$(srcdir)/btest.c'; fi`
-
-ctesta-testlib.o: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctesta_CFLAGS) $(CFLAGS) -c -o ctesta-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
-
-ctesta-testlib.obj: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctesta_CFLAGS) $(CFLAGS) -c -o ctesta-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-ctestg-btest.o: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctestg_CFLAGS) $(CFLAGS) -c -o ctestg-btest.o `test -f 'btest.c' || echo '$(srcdir)/'`btest.c
-
-ctestg-btest.obj: btest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctestg_CFLAGS) $(CFLAGS) -c -o ctestg-btest.obj `if test -f 'btest.c'; then $(CYGPATH_W) 'btest.c'; else $(CYGPATH_W) '$(srcdir)/btest.c'; fi`
-
-ctestg-testlib.o: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctestg_CFLAGS) $(CFLAGS) -c -o ctestg-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
-
-ctestg-testlib.obj: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctestg_CFLAGS) $(CFLAGS) -c -o ctestg-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-ttest-ttest.o: ttest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ttest_CFLAGS) $(CFLAGS) -c -o ttest-ttest.o `test -f 'ttest.c' || echo '$(srcdir)/'`ttest.c
-
-ttest-ttest.obj: ttest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ttest_CFLAGS) $(CFLAGS) -c -o ttest-ttest.obj `if test -f 'ttest.c'; then $(CYGPATH_W) 'ttest.c'; else $(CYGPATH_W) '$(srcdir)/ttest.c'; fi`
-
-ttest-testlib.o: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ttest_CFLAGS) $(CFLAGS) -c -o ttest-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
-
-ttest-testlib.obj: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ttest_CFLAGS) $(CFLAGS) -c -o ttest-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-ztest-ztest.o: ztest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ztest_CFLAGS) $(CFLAGS) -c -o ztest-ztest.o `test -f 'ztest.c' || echo '$(srcdir)/'`ztest.c
-
-ztest-ztest.obj: ztest.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ztest_CFLAGS) $(CFLAGS) -c -o ztest-ztest.obj `if test -f 'ztest.c'; then $(CYGPATH_W) 'ztest.c'; else $(CYGPATH_W) '$(srcdir)/ztest.c'; fi`
-
-ztest-testlib.o: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ztest_CFLAGS) $(CFLAGS) -c -o ztest-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
-
-ztest-testlib.obj: testlib.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ztest_CFLAGS) $(CFLAGS) -c -o ztest-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-
-# GNU Make needs to see an explicit $(MAKE) variable in the command it
-# runs to enable its job server during parallel builds.  Hence the
-# comments below.
-all-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
-install-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
-
-mostlyclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
-distclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
-maintainer-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am clean-multi
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am distclean-multi
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES install-multi
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am maintainer-clean-multi
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am mostlyclean-multi
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-.MAKE: all all-multi check-am clean-multi distclean-multi install-am \
-	install-multi install-strip maintainer-clean-multi \
-	mostlyclean-multi
-
-.PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-multi ctags distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-multi distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-multi install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-multi mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-multi pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-
-@NATIVE_TRUE@edtest2_build.c: gen_edtest2_build; @true
-@NATIVE_TRUE@gen_edtest2_build: $(srcdir)/edtest2.c
-@NATIVE_TRUE@	cat $(srcdir)/edtest2.c > tmp-edtest2_build.c
-@NATIVE_TRUE@	$(SHELL) $(srcdir)/move-if-change tmp-edtest2_build.c edtest2_build.c
-@NATIVE_TRUE@	echo timestamp > $@
-
-@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@dtest: btest_static
-@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@	$(OBJCOPY) --only-keep-debug btest_static btest.debug
-@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@	$(OBJCOPY) --strip-debug --add-gnu-debuglink=btest.debug btest_static dtest
-
-# We can't use automake's automatic dependency tracking, because it
-# breaks when using bootstrap-lean.  Automatic dependency tracking
-# with GCC bootstrap will cause some of the objects to depend on
-# header files in prev-gcc/include, e.g., stddef.h and stdarg.h.  When
-# using bootstrap-lean, prev-gcc is removed after each stage.  When
-# running "make install", those header files will be gone, causing the
-# library to be rebuilt at install time.  That may not succeed.
-
-# These manual dependencies do not include dependencies on unwind.h,
-# even though that is part of GCC, because where to find it depends on
-# whether we are being built as a host library or a target library.
-
-alloc.lo: config.h backtrace.h internal.h
-backtrace.lo: config.h backtrace.h internal.h
-btest.lo:  backtrace.h backtrace-supported.h filenames.h
-dwarf.lo: config.h filenames.h backtrace.h internal.h
-elf.lo: config.h backtrace.h internal.h
-fileline.lo: config.h backtrace.h internal.h
-mmap.lo: config.h backtrace.h internal.h
-mmapio.lo: config.h backtrace.h internal.h
-nounwind.lo: config.h internal.h
-pecoff.lo: config.h backtrace.h internal.h
-posix.lo: config.h backtrace.h internal.h
-print.lo: config.h backtrace.h internal.h
-read.lo: config.h backtrace.h internal.h
-simple.lo: config.h backtrace.h internal.h
-sort.lo: config.h backtrace.h internal.h
-stest.lo: config.h backtrace.h internal.h
-state.lo: config.h backtrace.h backtrace-supported.h internal.h
-unknown.lo: config.h backtrace.h internal.h
-xcoff.lo: config.h backtrace.h internal.h
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/Mark.Twain-Tom.Sawyer.txt cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/Mark.Twain-Tom.Sawyer.txt
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/Mark.Twain-Tom.Sawyer.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/Mark.Twain-Tom.Sawyer.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,8465 +0,0 @@
-Produced by David Widger. The previous edition was updated by Jose
-Menendez.
-
-
-
-
-
-                   THE ADVENTURES OF TOM SAWYER
-                                BY
-                            MARK TWAIN
-                     (Samuel Langhorne Clemens)
-
-
-
-
-                           P R E F A C E
-
-MOST of the adventures recorded in this book really occurred; one or
-two were experiences of my own, the rest those of boys who were
-schoolmates of mine. Huck Finn is drawn from life; Tom Sawyer also, but
-not from an individual--he is a combination of the characteristics of
-three boys whom I knew, and therefore belongs to the composite order of
-architecture.
-
-The odd superstitions touched upon were all prevalent among children
-and slaves in the West at the period of this story--that is to say,
-thirty or forty years ago.
-
-Although my book is intended mainly for the entertainment of boys and
-girls, I hope it will not be shunned by men and women on that account,
-for part of my plan has been to try to pleasantly remind adults of what
-they once were themselves, and of how they felt and thought and talked,
-and what queer enterprises they sometimes engaged in.
-
-                                                            THE AUTHOR.
-
-HARTFORD, 1876.
-
-
-
-                          T O M   S A W Y E R
-
-
-
-CHAPTER I
-
-"TOM!"
-
-No answer.
-
-"TOM!"
-
-No answer.
-
-"What's gone with that boy,  I wonder? You TOM!"
-
-No answer.
-
-The old lady pulled her spectacles down and looked over them about the
-room; then she put them up and looked out under them. She seldom or
-never looked THROUGH them for so small a thing as a boy; they were her
-state pair, the pride of her heart, and were built for "style," not
-service--she could have seen through a pair of stove-lids just as well.
-She looked perplexed for a moment, and then said, not fiercely, but
-still loud enough for the furniture to hear:
-
-"Well, I lay if I get hold of you I'll--"
-
-She did not finish, for by this time she was bending down and punching
-under the bed with the broom, and so she needed breath to punctuate the
-punches with. She resurrected nothing but the cat.
-
-"I never did see the beat of that boy!"
-
-She went to the open door and stood in it and looked out among the
-tomato vines and "jimpson" weeds that constituted the garden. No Tom.
-So she lifted up her voice at an angle calculated for distance and
-shouted:
-
-"Y-o-u-u TOM!"
-
-There was a slight noise behind her and she turned just in time to
-seize a small boy by the slack of his roundabout and arrest his flight.
-
-"There! I might 'a' thought of that closet. What you been doing in
-there?"
-
-"Nothing."
-
-"Nothing! Look at your hands. And look at your mouth. What IS that
-truck?"
-
-"I don't know, aunt."
-
-"Well, I know. It's jam--that's what it is. Forty times I've said if
-you didn't let that jam alone I'd skin you. Hand me that switch."
-
-The switch hovered in the air--the peril was desperate--
-
-"My! Look behind you, aunt!"
-
-The old lady whirled round, and snatched her skirts out of danger. The
-lad fled on the instant, scrambled up the high board-fence, and
-disappeared over it.
-
-His aunt Polly stood surprised a moment, and then broke into a gentle
-laugh.
-
-"Hang the boy, can't I never learn anything? Ain't he played me tricks
-enough like that for me to be looking out for him by this time? But old
-fools is the biggest fools there is. Can't learn an old dog new tricks,
-as the saying is. But my goodness, he never plays them alike, two days,
-and how is a body to know what's coming? He 'pears to know just how
-long he can torment me before I get my dander up, and he knows if he
-can make out to put me off for a minute or make me laugh, it's all down
-again and I can't hit him a lick. I ain't doing my duty by that boy,
-and that's the Lord's truth, goodness knows. Spare the rod and spile
-the child, as the Good Book says. I'm a laying up sin and suffering for
-us both, I know. He's full of the Old Scratch, but laws-a-me! he's my
-own dead sister's boy, poor thing, and I ain't got the heart to lash
-him, somehow. Every time I let him off, my conscience does hurt me so,
-and every time I hit him my old heart most breaks. Well-a-well, man
-that is born of woman is of few days and full of trouble, as the
-Scripture says, and I reckon it's so. He'll play hookey this evening, *
-and [* Southwestern for "afternoon"] I'll just be obleeged to make him
-work, to-morrow, to punish him. It's mighty hard to make him work
-Saturdays, when all the boys is having holiday, but he hates work more
-than he hates anything else, and I've GOT to do some of my duty by him,
-or I'll be the ruination of the child."
-
-Tom did play hookey, and he had a very good time. He got back home
-barely in season to help Jim, the small colored boy, saw next-day's
-wood and split the kindlings before supper--at least he was there in
-time to tell his adventures to Jim while Jim did three-fourths of the
-work. Tom's younger brother (or rather half-brother) Sid was already
-through with his part of the work (picking up chips), for he was a
-quiet boy, and had no adventurous, troublesome ways.
-
-While Tom was eating his supper, and stealing sugar as opportunity
-offered, Aunt Polly asked him questions that were full of guile, and
-very deep--for she wanted to trap him into damaging revealments. Like
-many other simple-hearted souls, it was her pet vanity to believe she
-was endowed with a talent for dark and mysterious diplomacy, and she
-loved to contemplate her most transparent devices as marvels of low
-cunning. Said she:
-
-"Tom, it was middling warm in school, warn't it?"
-
-"Yes'm."
-
-"Powerful warm, warn't it?"
-
-"Yes'm."
-
-"Didn't you want to go in a-swimming, Tom?"
-
-A bit of a scare shot through Tom--a touch of uncomfortable suspicion.
-He searched Aunt Polly's face, but it told him nothing. So he said:
-
-"No'm--well, not very much."
-
-The old lady reached out her hand and felt Tom's shirt, and said:
-
-"But you ain't too warm now, though." And it flattered her to reflect
-that she had discovered that the shirt was dry without anybody knowing
-that that was what she had in her mind. But in spite of her, Tom knew
-where the wind lay, now. So he forestalled what might be the next move:
-
-"Some of us pumped on our heads--mine's damp yet. See?"
-
-Aunt Polly was vexed to think she had overlooked that bit of
-circumstantial evidence, and missed a trick. Then she had a new
-inspiration:
-
-"Tom, you didn't have to undo your shirt collar where I sewed it, to
-pump on your head, did you? Unbutton your jacket!"
-
-The trouble vanished out of Tom's face. He opened his jacket. His
-shirt collar was securely sewed.
-
-"Bother! Well, go 'long with you. I'd made sure you'd played hookey
-and been a-swimming. But I forgive ye, Tom. I reckon you're a kind of a
-singed cat, as the saying is--better'n you look. THIS time."
-
-She was half sorry her sagacity had miscarried, and half glad that Tom
-had stumbled into obedient conduct for once.
-
-But Sidney said:
-
-"Well, now, if I didn't think you sewed his collar with white thread,
-but it's black."
-
-"Why, I did sew it with white! Tom!"
-
-But Tom did not wait for the rest. As he went out at the door he said:
-
-"Siddy, I'll lick you for that."
-
-In a safe place Tom examined two large needles which were thrust into
-the lapels of his jacket, and had thread bound about them--one needle
-carried white thread and the other black. He said:
-
-"She'd never noticed if it hadn't been for Sid. Confound it! sometimes
-she sews it with white, and sometimes she sews it with black. I wish to
-geeminy she'd stick to one or t'other--I can't keep the run of 'em. But
-I bet you I'll lam Sid for that. I'll learn him!"
-
-He was not the Model Boy of the village. He knew the model boy very
-well though--and loathed him.
-
-Within two minutes, or even less, he had forgotten all his troubles.
-Not because his troubles were one whit less heavy and bitter to him
-than a man's are to a man, but because a new and powerful interest bore
-them down and drove them out of his mind for the time--just as men's
-misfortunes are forgotten in the excitement of new enterprises. This
-new interest was a valued novelty in whistling, which he had just
-acquired from a negro, and he was suffering to practise it undisturbed.
-It consisted in a peculiar bird-like turn, a sort of liquid warble,
-produced by touching the tongue to the roof of the mouth at short
-intervals in the midst of the music--the reader probably remembers how
-to do it, if he has ever been a boy. Diligence and attention soon gave
-him the knack of it, and he strode down the street with his mouth full
-of harmony and his soul full of gratitude. He felt much as an
-astronomer feels who has discovered a new planet--no doubt, as far as
-strong, deep, unalloyed pleasure is concerned, the advantage was with
-the boy, not the astronomer.
-
-The summer evenings were long. It was not dark, yet. Presently Tom
-checked his whistle. A stranger was before him--a boy a shade larger
-than himself. A new-comer of any age or either sex was an impressive
-curiosity in the poor little shabby village of St. Petersburg. This boy
-was well dressed, too--well dressed on a week-day. This was simply
-astounding. His cap was a dainty thing, his close-buttoned blue cloth
-roundabout was new and natty, and so were his pantaloons. He had shoes
-on--and it was only Friday. He even wore a necktie, a bright bit of
-ribbon. He had a citified air about him that ate into Tom's vitals. The
-more Tom stared at the splendid marvel, the higher he turned up his
-nose at his finery and the shabbier and shabbier his own outfit seemed
-to him to grow. Neither boy spoke. If one moved, the other moved--but
-only sidewise, in a circle; they kept face to face and eye to eye all
-the time. Finally Tom said:
-
-"I can lick you!"
-
-"I'd like to see you try it."
-
-"Well, I can do it."
-
-"No you can't, either."
-
-"Yes I can."
-
-"No you can't."
-
-"I can."
-
-"You can't."
-
-"Can!"
-
-"Can't!"
-
-An uncomfortable pause. Then Tom said:
-
-"What's your name?"
-
-"'Tisn't any of your business, maybe."
-
-"Well I 'low I'll MAKE it my business."
-
-"Well why don't you?"
-
-"If you say much, I will."
-
-"Much--much--MUCH. There now."
-
-"Oh, you think you're mighty smart, DON'T you? I could lick you with
-one hand tied behind me, if I wanted to."
-
-"Well why don't you DO it? You SAY you can do it."
-
-"Well I WILL, if you fool with me."
-
-"Oh yes--I've seen whole families in the same fix."
-
-"Smarty! You think you're SOME, now, DON'T you? Oh, what a hat!"
-
-"You can lump that hat if you don't like it. I dare you to knock it
-off--and anybody that'll take a dare will suck eggs."
-
-"You're a liar!"
-
-"You're another."
-
-"You're a fighting liar and dasn't take it up."
-
-"Aw--take a walk!"
-
-"Say--if you give me much more of your sass I'll take and bounce a
-rock off'n your head."
-
-"Oh, of COURSE you will."
-
-"Well I WILL."
-
-"Well why don't you DO it then? What do you keep SAYING you will for?
-Why don't you DO it? It's because you're afraid."
-
-"I AIN'T afraid."
-
-"You are."
-
-"I ain't."
-
-"You are."
-
-Another pause, and more eying and sidling around each other. Presently
-they were shoulder to shoulder. Tom said:
-
-"Get away from here!"
-
-"Go away yourself!"
-
-"I won't."
-
-"I won't either."
-
-So they stood, each with a foot placed at an angle as a brace, and
-both shoving with might and main, and glowering at each other with
-hate. But neither could get an advantage. After struggling till both
-were hot and flushed, each relaxed his strain with watchful caution,
-and Tom said:
-
-"You're a coward and a pup. I'll tell my big brother on you, and he
-can thrash you with his little finger, and I'll make him do it, too."
-
-"What do I care for your big brother? I've got a brother that's bigger
-than he is--and what's more, he can throw him over that fence, too."
-[Both brothers were imaginary.]
-
-"That's a lie."
-
-"YOUR saying so don't make it so."
-
-Tom drew a line in the dust with his big toe, and said:
-
-"I dare you to step over that, and I'll lick you till you can't stand
-up. Anybody that'll take a dare will steal sheep."
-
-The new boy stepped over promptly, and said:
-
-"Now you said you'd do it, now let's see you do it."
-
-"Don't you crowd me now; you better look out."
-
-"Well, you SAID you'd do it--why don't you do it?"
-
-"By jingo! for two cents I WILL do it."
-
-The new boy took two broad coppers out of his pocket and held them out
-with derision. Tom struck them to the ground. In an instant both boys
-were rolling and tumbling in the dirt, gripped together like cats; and
-for the space of a minute they tugged and tore at each other's hair and
-clothes, punched and scratched each other's nose, and covered
-themselves with dust and glory. Presently the confusion took form, and
-through the fog of battle Tom appeared, seated astride the new boy, and
-pounding him with his fists. "Holler 'nuff!" said he.
-
-The boy only struggled to free himself. He was crying--mainly from rage.
-
-"Holler 'nuff!"--and the pounding went on.
-
-At last the stranger got out a smothered "'Nuff!" and Tom let him up
-and said:
-
-"Now that'll learn you. Better look out who you're fooling with next
-time."
-
-The new boy went off brushing the dust from his clothes, sobbing,
-snuffling, and occasionally looking back and shaking his head and
-threatening what he would do to Tom the "next time he caught him out."
-To which Tom responded with jeers, and started off in high feather, and
-as soon as his back was turned the new boy snatched up a stone, threw
-it and hit him between the shoulders and then turned tail and ran like
-an antelope. Tom chased the traitor home, and thus found out where he
-lived. He then held a position at the gate for some time, daring the
-enemy to come outside, but the enemy only made faces at him through the
-window and declined. At last the enemy's mother appeared, and called
-Tom a bad, vicious, vulgar child, and ordered him away. So he went
-away; but he said he "'lowed" to "lay" for that boy.
-
-He got home pretty late that night, and when he climbed cautiously in
-at the window, he uncovered an ambuscade, in the person of his aunt;
-and when she saw the state his clothes were in her resolution to turn
-his Saturday holiday into captivity at hard labor became adamantine in
-its firmness.
-
-
-
-CHAPTER II
-
-SATURDAY morning was come, and all the summer world was bright and
-fresh, and brimming with life. There was a song in every heart; and if
-the heart was young the music issued at the lips. There was cheer in
-every face and a spring in every step. The locust-trees were in bloom
-and the fragrance of the blossoms filled the air. Cardiff Hill, beyond
-the village and above it, was green with vegetation and it lay just far
-enough away to seem a Delectable Land, dreamy, reposeful, and inviting.
-
-Tom appeared on the sidewalk with a bucket of whitewash and a
-long-handled brush. He surveyed the fence, and all gladness left him and
-a deep melancholy settled down upon his spirit. Thirty yards of board
-fence nine feet high. Life to him seemed hollow, and existence but a
-burden. Sighing, he dipped his brush and passed it along the topmost
-plank; repeated the operation; did it again; compared the insignificant
-whitewashed streak with the far-reaching continent of unwhitewashed
-fence, and sat down on a tree-box discouraged. Jim came skipping out at
-the gate with a tin pail, and singing Buffalo Gals. Bringing water from
-the town pump had always been hateful work in Tom's eyes, before, but
-now it did not strike him so. He remembered that there was company at
-the pump. White, mulatto, and negro boys and girls were always there
-waiting their turns, resting, trading playthings, quarrelling,
-fighting, skylarking. And he remembered that although the pump was only
-a hundred and fifty yards off, Jim never got back with a bucket of
-water under an hour--and even then somebody generally had to go after
-him. Tom said:
-
-"Say, Jim, I'll fetch the water if you'll whitewash some."
-
-Jim shook his head and said:
-
-"Can't, Mars Tom. Ole missis, she tole me I got to go an' git dis
-water an' not stop foolin' roun' wid anybody. She say she spec' Mars
-Tom gwine to ax me to whitewash, an' so she tole me go 'long an' 'tend
-to my own business--she 'lowed SHE'D 'tend to de whitewashin'."
-
-"Oh, never you mind what she said, Jim. That's the way she always
-talks. Gimme the bucket--I won't be gone only a a minute. SHE won't
-ever know."
-
-"Oh, I dasn't, Mars Tom. Ole missis she'd take an' tar de head off'n
-me. 'Deed she would."
-
-"SHE! She never licks anybody--whacks 'em over the head with her
-thimble--and who cares for that, I'd like to know. She talks awful, but
-talk don't hurt--anyways it don't if she don't cry. Jim, I'll give you
-a marvel. I'll give you a white alley!"
-
-Jim began to waver.
-
-"White alley, Jim! And it's a bully taw."
-
-"My! Dat's a mighty gay marvel, I tell you! But Mars Tom I's powerful
-'fraid ole missis--"
-
-"And besides, if you will I'll show you my sore toe."
-
-Jim was only human--this attraction was too much for him. He put down
-his pail, took the white alley, and bent over the toe with absorbing
-interest while the bandage was being unwound. In another moment he was
-flying down the street with his pail and a tingling rear, Tom was
-whitewashing with vigor, and Aunt Polly was retiring from the field
-with a slipper in her hand and triumph in her eye.
-
-But Tom's energy did not last. He began to think of the fun he had
-planned for this day, and his sorrows multiplied. Soon the free boys
-would come tripping along on all sorts of delicious expeditions, and
-they would make a world of fun of him for having to work--the very
-thought of it burnt him like fire. He got out his worldly wealth and
-examined it--bits of toys, marbles, and trash; enough to buy an
-exchange of WORK, maybe, but not half enough to buy so much as half an
-hour of pure freedom. So he returned his straitened means to his
-pocket, and gave up the idea of trying to buy the boys. At this dark
-and hopeless moment an inspiration burst upon him! Nothing less than a
-great, magnificent inspiration.
-
-He took up his brush and went tranquilly to work. Ben Rogers hove in
-sight presently--the very boy, of all boys, whose ridicule he had been
-dreading. Ben's gait was the hop-skip-and-jump--proof enough that his
-heart was light and his anticipations high. He was eating an apple, and
-giving a long, melodious whoop, at intervals, followed by a deep-toned
-ding-dong-dong, ding-dong-dong, for he was personating a steamboat. As
-he drew near, he slackened speed, took the middle of the street, leaned
-far over to starboard and rounded to ponderously and with laborious
-pomp and circumstance--for he was personating the Big Missouri, and
-considered himself to be drawing nine feet of water. He was boat and
-captain and engine-bells combined, so he had to imagine himself
-standing on his own hurricane-deck giving the orders and executing them:
-
-"Stop her, sir! Ting-a-ling-ling!" The headway ran almost out, and he
-drew up slowly toward the sidewalk.
-
-"Ship up to back! Ting-a-ling-ling!" His arms straightened and
-stiffened down his sides.
-
-"Set her back on the stabboard! Ting-a-ling-ling! Chow! ch-chow-wow!
-Chow!" His right hand, meantime, describing stately circles--for it was
-representing a forty-foot wheel.
-
-"Let her go back on the labboard! Ting-a-lingling! Chow-ch-chow-chow!"
-The left hand began to describe circles.
-
-"Stop the stabboard! Ting-a-ling-ling! Stop the labboard! Come ahead
-on the stabboard! Stop her! Let your outside turn over slow!
-Ting-a-ling-ling! Chow-ow-ow! Get out that head-line! LIVELY now!
-Come--out with your spring-line--what're you about there! Take a turn
-round that stump with the bight of it! Stand by that stage, now--let her
-go! Done with the engines, sir! Ting-a-ling-ling! SH'T! S'H'T! SH'T!"
-(trying the gauge-cocks).
-
-Tom went on whitewashing--paid no attention to the steamboat. Ben
-stared a moment and then said: "Hi-YI! YOU'RE up a stump, ain't you!"
-
-No answer. Tom surveyed his last touch with the eye of an artist, then
-he gave his brush another gentle sweep and surveyed the result, as
-before. Ben ranged up alongside of him. Tom's mouth watered for the
-apple, but he stuck to his work. Ben said:
-
-"Hello, old chap, you got to work, hey?"
-
-Tom wheeled suddenly and said:
-
-"Why, it's you, Ben! I warn't noticing."
-
-"Say--I'm going in a-swimming, I am. Don't you wish you could? But of
-course you'd druther WORK--wouldn't you? Course you would!"
-
-Tom contemplated the boy a bit, and said:
-
-"What do you call work?"
-
-"Why, ain't THAT work?"
-
-Tom resumed his whitewashing, and answered carelessly:
-
-"Well, maybe it is, and maybe it ain't. All I know, is, it suits Tom
-Sawyer."
-
-"Oh come, now, you don't mean to let on that you LIKE it?"
-
-The brush continued to move.
-
-"Like it? Well, I don't see why I oughtn't to like it. Does a boy get
-a chance to whitewash a fence every day?"
-
-That put the thing in a new light. Ben stopped nibbling his apple. Tom
-swept his brush daintily back and forth--stepped back to note the
-effect--added a touch here and there--criticised the effect again--Ben
-watching every move and getting more and more interested, more and more
-absorbed. Presently he said:
-
-"Say, Tom, let ME whitewash a little."
-
-Tom considered, was about to consent; but he altered his mind:
-
-"No--no--I reckon it wouldn't hardly do, Ben. You see, Aunt Polly's
-awful particular about this fence--right here on the street, you know
---but if it was the back fence I wouldn't mind and SHE wouldn't. Yes,
-she's awful particular about this fence; it's got to be done very
-careful; I reckon there ain't one boy in a thousand, maybe two
-thousand, that can do it the way it's got to be done."
-
-"No--is that so? Oh come, now--lemme just try. Only just a little--I'd
-let YOU, if you was me, Tom."
-
-"Ben, I'd like to, honest injun; but Aunt Polly--well, Jim wanted to
-do it, but she wouldn't let him; Sid wanted to do it, and she wouldn't
-let Sid. Now don't you see how I'm fixed? If you was to tackle this
-fence and anything was to happen to it--"
-
-"Oh, shucks, I'll be just as careful. Now lemme try. Say--I'll give
-you the core of my apple."
-
-"Well, here--No, Ben, now don't. I'm afeard--"
-
-"I'll give you ALL of it!"
-
-Tom gave up the brush with reluctance in his face, but alacrity in his
-heart. And while the late steamer Big Missouri worked and sweated in
-the sun, the retired artist sat on a barrel in the shade close by,
-dangled his legs, munched his apple, and planned the slaughter of more
-innocents. There was no lack of material; boys happened along every
-little while; they came to jeer, but remained to whitewash. By the time
-Ben was fagged out, Tom had traded the next chance to Billy Fisher for
-a kite, in good repair; and when he played out, Johnny Miller bought in
-for a dead rat and a string to swing it with--and so on, and so on,
-hour after hour. And when the middle of the afternoon came, from being
-a poor poverty-stricken boy in the morning, Tom was literally rolling
-in wealth. He had besides the things before mentioned, twelve marbles,
-part of a jews-harp, a piece of blue bottle-glass to look through, a
-spool cannon, a key that wouldn't unlock anything, a fragment of chalk,
-a glass stopper of a decanter, a tin soldier, a couple of tadpoles, six
-fire-crackers, a kitten with only one eye, a brass doorknob, a
-dog-collar--but no dog--the handle of a knife, four pieces of
-orange-peel, and a dilapidated old window sash.
-
-He had had a nice, good, idle time all the while--plenty of company
---and the fence had three coats of whitewash on it! If he hadn't run out
-of whitewash he would have bankrupted every boy in the village.
-
-Tom said to himself that it was not such a hollow world, after all. He
-had discovered a great law of human action, without knowing it--namely,
-that in order to make a man or a boy covet a thing, it is only
-necessary to make the thing difficult to attain. If he had been a great
-and wise philosopher, like the writer of this book, he would now have
-comprehended that Work consists of whatever a body is OBLIGED to do,
-and that Play consists of whatever a body is not obliged to do. And
-this would help him to understand why constructing artificial flowers
-or performing on a tread-mill is work, while rolling ten-pins or
-climbing Mont Blanc is only amusement. There are wealthy gentlemen in
-England who drive four-horse passenger-coaches twenty or thirty miles
-on a daily line, in the summer, because the privilege costs them
-considerable money; but if they were offered wages for the service,
-that would turn it into work and then they would resign.
-
-The boy mused awhile over the substantial change which had taken place
-in his worldly circumstances, and then wended toward headquarters to
-report.
-
-
-
-CHAPTER III
-
-TOM presented himself before Aunt Polly, who was sitting by an open
-window in a pleasant rearward apartment, which was bedroom,
-breakfast-room, dining-room, and library, combined. The balmy summer
-air, the restful quiet, the odor of the flowers, and the drowsing murmur
-of the bees had had their effect, and she was nodding over her knitting
---for she had no company but the cat, and it was asleep in her lap. Her
-spectacles were propped up on her gray head for safety. She had thought
-that of course Tom had deserted long ago, and she wondered at seeing him
-place himself in her power again in this intrepid way. He said: "Mayn't
-I go and play now, aunt?"
-
-"What, a'ready? How much have you done?"
-
-"It's all done, aunt."
-
-"Tom, don't lie to me--I can't bear it."
-
-"I ain't, aunt; it IS all done."
-
-Aunt Polly placed small trust in such evidence. She went out to see
-for herself; and she would have been content to find twenty per cent.
-of Tom's statement true. When she found the entire fence whitewashed,
-and not only whitewashed but elaborately coated and recoated, and even
-a streak added to the ground, her astonishment was almost unspeakable.
-She said:
-
-"Well, I never! There's no getting round it, you can work when you're
-a mind to, Tom." And then she diluted the compliment by adding, "But
-it's powerful seldom you're a mind to, I'm bound to say. Well, go 'long
-and play; but mind you get back some time in a week, or I'll tan you."
-
-She was so overcome by the splendor of his achievement that she took
-him into the closet and selected a choice apple and delivered it to
-him, along with an improving lecture upon the added value and flavor a
-treat took to itself when it came without sin through virtuous effort.
-And while she closed with a happy Scriptural flourish, he "hooked" a
-doughnut.
-
-Then he skipped out, and saw Sid just starting up the outside stairway
-that led to the back rooms on the second floor. Clods were handy and
-the air was full of them in a twinkling. They raged around Sid like a
-hail-storm; and before Aunt Polly could collect her surprised faculties
-and sally to the rescue, six or seven clods had taken personal effect,
-and Tom was over the fence and gone. There was a gate, but as a general
-thing he was too crowded for time to make use of it. His soul was at
-peace, now that he had settled with Sid for calling attention to his
-black thread and getting him into trouble.
-
-Tom skirted the block, and came round into a muddy alley that led by
-the back of his aunt's cow-stable. He presently got safely beyond the
-reach of capture and punishment, and hastened toward the public square
-of the village, where two "military" companies of boys had met for
-conflict, according to previous appointment. Tom was General of one of
-these armies, Joe Harper (a bosom friend) General of the other. These
-two great commanders did not condescend to fight in person--that being
-better suited to the still smaller fry--but sat together on an eminence
-and conducted the field operations by orders delivered through
-aides-de-camp. Tom's army won a great victory, after a long and
-hard-fought battle. Then the dead were counted, prisoners exchanged,
-the terms of the next disagreement agreed upon, and the day for the
-necessary battle appointed; after which the armies fell into line and
-marched away, and Tom turned homeward alone.
-
-As he was passing by the house where Jeff Thatcher lived, he saw a new
-girl in the garden--a lovely little blue-eyed creature with yellow hair
-plaited into two long-tails, white summer frock and embroidered
-pantalettes. The fresh-crowned hero fell without firing a shot. A
-certain Amy Lawrence vanished out of his heart and left not even a
-memory of herself behind. He had thought he loved her to distraction;
-he had regarded his passion as adoration; and behold it was only a poor
-little evanescent partiality. He had been months winning her; she had
-confessed hardly a week ago; he had been the happiest and the proudest
-boy in the world only seven short days, and here in one instant of time
-she had gone out of his heart like a casual stranger whose visit is
-done.
-
-He worshipped this new angel with furtive eye, till he saw that she
-had discovered him; then he pretended he did not know she was present,
-and began to "show off" in all sorts of absurd boyish ways, in order to
-win her admiration. He kept up this grotesque foolishness for some
-time; but by-and-by, while he was in the midst of some dangerous
-gymnastic performances, he glanced aside and saw that the little girl
-was wending her way toward the house. Tom came up to the fence and
-leaned on it, grieving, and hoping she would tarry yet awhile longer.
-She halted a moment on the steps and then moved toward the door. Tom
-heaved a great sigh as she put her foot on the threshold. But his face
-lit up, right away, for she tossed a pansy over the fence a moment
-before she disappeared.
-
-The boy ran around and stopped within a foot or two of the flower, and
-then shaded his eyes with his hand and began to look down street as if
-he had discovered something of interest going on in that direction.
-Presently he picked up a straw and began trying to balance it on his
-nose, with his head tilted far back; and as he moved from side to side,
-in his efforts, he edged nearer and nearer toward the pansy; finally
-his bare foot rested upon it, his pliant toes closed upon it, and he
-hopped away with the treasure and disappeared round the corner. But
-only for a minute--only while he could button the flower inside his
-jacket, next his heart--or next his stomach, possibly, for he was not
-much posted in anatomy, and not hypercritical, anyway.
-
-He returned, now, and hung about the fence till nightfall, "showing
-off," as before; but the girl never exhibited herself again, though Tom
-comforted himself a little with the hope that she had been near some
-window, meantime, and been aware of his attentions. Finally he strode
-home reluctantly, with his poor head full of visions.
-
-All through supper his spirits were so high that his aunt wondered
-"what had got into the child." He took a good scolding about clodding
-Sid, and did not seem to mind it in the least. He tried to steal sugar
-under his aunt's very nose, and got his knuckles rapped for it. He said:
-
-"Aunt, you don't whack Sid when he takes it."
-
-"Well, Sid don't torment a body the way you do. You'd be always into
-that sugar if I warn't watching you."
-
-Presently she stepped into the kitchen, and Sid, happy in his
-immunity, reached for the sugar-bowl--a sort of glorying over Tom which
-was wellnigh unbearable. But Sid's fingers slipped and the bowl dropped
-and broke. Tom was in ecstasies. In such ecstasies that he even
-controlled his tongue and was silent. He said to himself that he would
-not speak a word, even when his aunt came in, but would sit perfectly
-still till she asked who did the mischief; and then he would tell, and
-there would be nothing so good in the world as to see that pet model
-"catch it." He was so brimful of exultation that he could hardly hold
-himself when the old lady came back and stood above the wreck
-discharging lightnings of wrath from over her spectacles. He said to
-himself, "Now it's coming!" And the next instant he was sprawling on
-the floor! The potent palm was uplifted to strike again when Tom cried
-out:
-
-"Hold on, now, what 'er you belting ME for?--Sid broke it!"
-
-Aunt Polly paused, perplexed, and Tom looked for healing pity. But
-when she got her tongue again, she only said:
-
-"Umf! Well, you didn't get a lick amiss, I reckon. You been into some
-other audacious mischief when I wasn't around, like enough."
-
-Then her conscience reproached her, and she yearned to say something
-kind and loving; but she judged that this would be construed into a
-confession that she had been in the wrong, and discipline forbade that.
-So she kept silence, and went about her affairs with a troubled heart.
-Tom sulked in a corner and exalted his woes. He knew that in her heart
-his aunt was on her knees to him, and he was morosely gratified by the
-consciousness of it. He would hang out no signals, he would take notice
-of none. He knew that a yearning glance fell upon him, now and then,
-through a film of tears, but he refused recognition of it. He pictured
-himself lying sick unto death and his aunt bending over him beseeching
-one little forgiving word, but he would turn his face to the wall, and
-die with that word unsaid. Ah, how would she feel then? And he pictured
-himself brought home from the river, dead, with his curls all wet, and
-his sore heart at rest. How she would throw herself upon him, and how
-her tears would fall like rain, and her lips pray God to give her back
-her boy and she would never, never abuse him any more! But he would lie
-there cold and white and make no sign--a poor little sufferer, whose
-griefs were at an end. He so worked upon his feelings with the pathos
-of these dreams, that he had to keep swallowing, he was so like to
-choke; and his eyes swam in a blur of water, which overflowed when he
-winked, and ran down and trickled from the end of his nose. And such a
-luxury to him was this petting of his sorrows, that he could not bear
-to have any worldly cheeriness or any grating delight intrude upon it;
-it was too sacred for such contact; and so, presently, when his cousin
-Mary danced in, all alive with the joy of seeing home again after an
-age-long visit of one week to the country, he got up and moved in
-clouds and darkness out at one door as she brought song and sunshine in
-at the other.
-
-He wandered far from the accustomed haunts of boys, and sought
-desolate places that were in harmony with his spirit. A log raft in the
-river invited him, and he seated himself on its outer edge and
-contemplated the dreary vastness of the stream, wishing, the while,
-that he could only be drowned, all at once and unconsciously, without
-undergoing the uncomfortable routine devised by nature. Then he thought
-of his flower. He got it out, rumpled and wilted, and it mightily
-increased his dismal felicity. He wondered if she would pity him if she
-knew? Would she cry, and wish that she had a right to put her arms
-around his neck and comfort him? Or would she turn coldly away like all
-the hollow world? This picture brought such an agony of pleasurable
-suffering that he worked it over and over again in his mind and set it
-up in new and varied lights, till he wore it threadbare. At last he
-rose up sighing and departed in the darkness.
-
-About half-past nine or ten o'clock he came along the deserted street
-to where the Adored Unknown lived; he paused a moment; no sound fell
-upon his listening ear; a candle was casting a dull glow upon the
-curtain of a second-story window. Was the sacred presence there? He
-climbed the fence, threaded his stealthy way through the plants, till
-he stood under that window; he looked up at it long, and with emotion;
-then he laid him down on the ground under it, disposing himself upon
-his back, with his hands clasped upon his breast and holding his poor
-wilted flower. And thus he would die--out in the cold world, with no
-shelter over his homeless head, no friendly hand to wipe the
-death-damps from his brow, no loving face to bend pityingly over him
-when the great agony came. And thus SHE would see him when she looked
-out upon the glad morning, and oh! would she drop one little tear upon
-his poor, lifeless form, would she heave one little sigh to see a bright
-young life so rudely blighted, so untimely cut down?
-
-The window went up, a maid-servant's discordant voice profaned the
-holy calm, and a deluge of water drenched the prone martyr's remains!
-
-The strangling hero sprang up with a relieving snort. There was a whiz
-as of a missile in the air, mingled with the murmur of a curse, a sound
-as of shivering glass followed, and a small, vague form went over the
-fence and shot away in the gloom.
-
-Not long after, as Tom, all undressed for bed, was surveying his
-drenched garments by the light of a tallow dip, Sid woke up; but if he
-had any dim idea of making any "references to allusions," he thought
-better of it and held his peace, for there was danger in Tom's eye.
-
-Tom turned in without the added vexation of prayers, and Sid made
-mental note of the omission.
-
-
-
-CHAPTER IV
-
-THE sun rose upon a tranquil world, and beamed down upon the peaceful
-village like a benediction. Breakfast over, Aunt Polly had family
-worship: it began with a prayer built from the ground up of solid
-courses of Scriptural quotations, welded together with a thin mortar of
-originality; and from the summit of this she delivered a grim chapter
-of the Mosaic Law, as from Sinai.
-
-Then Tom girded up his loins, so to speak, and went to work to "get
-his verses." Sid had learned his lesson days before. Tom bent all his
-energies to the memorizing of five verses, and he chose part of the
-Sermon on the Mount, because he could find no verses that were shorter.
-At the end of half an hour Tom had a vague general idea of his lesson,
-but no more, for his mind was traversing the whole field of human
-thought, and his hands were busy with distracting recreations. Mary
-took his book to hear him recite, and he tried to find his way through
-the fog:
-
-"Blessed are the--a--a--"
-
-"Poor"--
-
-"Yes--poor; blessed are the poor--a--a--"
-
-"In spirit--"
-
-"In spirit; blessed are the poor in spirit, for they--they--"
-
-"THEIRS--"
-
-"For THEIRS. Blessed are the poor in spirit, for theirs is the kingdom
-of heaven. Blessed are they that mourn, for they--they--"
-
-"Sh--"
-
-"For they--a--"
-
-"S, H, A--"
-
-"For they S, H--Oh, I don't know what it is!"
-
-"SHALL!"
-
-"Oh, SHALL! for they shall--for they shall--a--a--shall mourn--a--a--
-blessed are they that shall--they that--a--they that shall mourn, for
-they shall--a--shall WHAT? Why don't you tell me, Mary?--what do you
-want to be so mean for?"
-
-"Oh, Tom, you poor thick-headed thing, I'm not teasing you. I wouldn't
-do that. You must go and learn it again. Don't you be discouraged, Tom,
-you'll manage it--and if you do, I'll give you something ever so nice.
-There, now, that's a good boy."
-
-"All right! What is it, Mary, tell me what it is."
-
-"Never you mind, Tom. You know if I say it's nice, it is nice."
-
-"You bet you that's so, Mary. All right, I'll tackle it again."
-
-And he did "tackle it again"--and under the double pressure of
-curiosity and prospective gain he did it with such spirit that he
-accomplished a shining success. Mary gave him a brand-new "Barlow"
-knife worth twelve and a half cents; and the convulsion of delight that
-swept his system shook him to his foundations. True, the knife would
-not cut anything, but it was a "sure-enough" Barlow, and there was
-inconceivable grandeur in that--though where the Western boys ever got
-the idea that such a weapon could possibly be counterfeited to its
-injury is an imposing mystery and will always remain so, perhaps. Tom
-contrived to scarify the cupboard with it, and was arranging to begin
-on the bureau, when he was called off to dress for Sunday-school.
-
-Mary gave him a tin basin of water and a piece of soap, and he went
-outside the door and set the basin on a little bench there; then he
-dipped the soap in the water and laid it down; turned up his sleeves;
-poured out the water on the ground, gently, and then entered the
-kitchen and began to wipe his face diligently on the towel behind the
-door. But Mary removed the towel and said:
-
-"Now ain't you ashamed, Tom. You mustn't be so bad. Water won't hurt
-you."
-
-Tom was a trifle disconcerted. The basin was refilled, and this time
-he stood over it a little while, gathering resolution; took in a big
-breath and began. When he entered the kitchen presently, with both eyes
-shut and groping for the towel with his hands, an honorable testimony
-of suds and water was dripping from his face. But when he emerged from
-the towel, he was not yet satisfactory, for the clean territory stopped
-short at his chin and his jaws, like a mask; below and beyond this line
-there was a dark expanse of unirrigated soil that spread downward in
-front and backward around his neck. Mary took him in hand, and when she
-was done with him he was a man and a brother, without distinction of
-color, and his saturated hair was neatly brushed, and its short curls
-wrought into a dainty and symmetrical general effect. [He privately
-smoothed out the curls, with labor and difficulty, and plastered his
-hair close down to his head; for he held curls to be effeminate, and
-his own filled his life with bitterness.] Then Mary got out a suit of
-his clothing that had been used only on Sundays during two years--they
-were simply called his "other clothes"--and so by that we know the
-size of his wardrobe. The girl "put him to rights" after he had dressed
-himself; she buttoned his neat roundabout up to his chin, turned his
-vast shirt collar down over his shoulders, brushed him off and crowned
-him with his speckled straw hat. He now looked exceedingly improved and
-uncomfortable. He was fully as uncomfortable as he looked; for there
-was a restraint about whole clothes and cleanliness that galled him. He
-hoped that Mary would forget his shoes, but the hope was blighted; she
-coated them thoroughly with tallow, as was the custom, and brought them
-out. He lost his temper and said he was always being made to do
-everything he didn't want to do. But Mary said, persuasively:
-
-"Please, Tom--that's a good boy."
-
-So he got into the shoes snarling. Mary was soon ready, and the three
-children set out for Sunday-school--a place that Tom hated with his
-whole heart; but Sid and Mary were fond of it.
-
-Sabbath-school hours were from nine to half-past ten; and then church
-service. Two of the children always remained for the sermon
-voluntarily, and the other always remained too--for stronger reasons.
-The church's high-backed, uncushioned pews would seat about three
-hundred persons; the edifice was but a small, plain affair, with a sort
-of pine board tree-box on top of it for a steeple. At the door Tom
-dropped back a step and accosted a Sunday-dressed comrade:
-
-"Say, Billy, got a yaller ticket?"
-
-"Yes."
-
-"What'll you take for her?"
-
-"What'll you give?"
-
-"Piece of lickrish and a fish-hook."
-
-"Less see 'em."
-
-Tom exhibited. They were satisfactory, and the property changed hands.
-Then Tom traded a couple of white alleys for three red tickets, and
-some small trifle or other for a couple of blue ones. He waylaid other
-boys as they came, and went on buying tickets of various colors ten or
-fifteen minutes longer. He entered the church, now, with a swarm of
-clean and noisy boys and girls, proceeded to his seat and started a
-quarrel with the first boy that came handy. The teacher, a grave,
-elderly man, interfered; then turned his back a moment and Tom pulled a
-boy's hair in the next bench, and was absorbed in his book when the boy
-turned around; stuck a pin in another boy, presently, in order to hear
-him say "Ouch!" and got a new reprimand from his teacher. Tom's whole
-class were of a pattern--restless, noisy, and troublesome. When they
-came to recite their lessons, not one of them knew his verses
-perfectly, but had to be prompted all along. However, they worried
-through, and each got his reward--in small blue tickets, each with a
-passage of Scripture on it; each blue ticket was pay for two verses of
-the recitation. Ten blue tickets equalled a red one, and could be
-exchanged for it; ten red tickets equalled a yellow one; for ten yellow
-tickets the superintendent gave a very plainly bound Bible (worth forty
-cents in those easy times) to the pupil. How many of my readers would
-have the industry and application to memorize two thousand verses, even
-for a Dore Bible? And yet Mary had acquired two Bibles in this way--it
-was the patient work of two years--and a boy of German parentage had
-won four or five. He once recited three thousand verses without
-stopping; but the strain upon his mental faculties was too great, and
-he was little better than an idiot from that day forth--a grievous
-misfortune for the school, for on great occasions, before company, the
-superintendent (as Tom expressed it) had always made this boy come out
-and "spread himself." Only the older pupils managed to keep their
-tickets and stick to their tedious work long enough to get a Bible, and
-so the delivery of one of these prizes was a rare and noteworthy
-circumstance; the successful pupil was so great and conspicuous for
-that day that on the spot every scholar's heart was fired with a fresh
-ambition that often lasted a couple of weeks. It is possible that Tom's
-mental stomach had never really hungered for one of those prizes, but
-unquestionably his entire being had for many a day longed for the glory
-and the eclat that came with it.
-
-In due course the superintendent stood up in front of the pulpit, with
-a closed hymn-book in his hand and his forefinger inserted between its
-leaves, and commanded attention. When a Sunday-school superintendent
-makes his customary little speech, a hymn-book in the hand is as
-necessary as is the inevitable sheet of music in the hand of a singer
-who stands forward on the platform and sings a solo at a concert
---though why, is a mystery: for neither the hymn-book nor the sheet of
-music is ever referred to by the sufferer. This superintendent was a
-slim creature of thirty-five, with a sandy goatee and short sandy hair;
-he wore a stiff standing-collar whose upper edge almost reached his
-ears and whose sharp points curved forward abreast the corners of his
-mouth--a fence that compelled a straight lookout ahead, and a turning
-of the whole body when a side view was required; his chin was propped
-on a spreading cravat which was as broad and as long as a bank-note,
-and had fringed ends; his boot toes were turned sharply up, in the
-fashion of the day, like sleigh-runners--an effect patiently and
-laboriously produced by the young men by sitting with their toes
-pressed against a wall for hours together. Mr. Walters was very earnest
-of mien, and very sincere and honest at heart; and he held sacred
-things and places in such reverence, and so separated them from worldly
-matters, that unconsciously to himself his Sunday-school voice had
-acquired a peculiar intonation which was wholly absent on week-days. He
-began after this fashion:
-
-"Now, children, I want you all to sit up just as straight and pretty
-as you can and give me all your attention for a minute or two. There
---that is it. That is the way good little boys and girls should do. I see
-one little girl who is looking out of the window--I am afraid she
-thinks I am out there somewhere--perhaps up in one of the trees making
-a speech to the little birds. [Applausive titter.] I want to tell you
-how good it makes me feel to see so many bright, clean little faces
-assembled in a place like this, learning to do right and be good." And
-so forth and so on. It is not necessary to set down the rest of the
-oration. It was of a pattern which does not vary, and so it is familiar
-to us all.
-
-The latter third of the speech was marred by the resumption of fights
-and other recreations among certain of the bad boys, and by fidgetings
-and whisperings that extended far and wide, washing even to the bases
-of isolated and incorruptible rocks like Sid and Mary. But now every
-sound ceased suddenly, with the subsidence of Mr. Walters' voice, and
-the conclusion of the speech was received with a burst of silent
-gratitude.
-
-A good part of the whispering had been occasioned by an event which
-was more or less rare--the entrance of visitors: lawyer Thatcher,
-accompanied by a very feeble and aged man; a fine, portly, middle-aged
-gentleman with iron-gray hair; and a dignified lady who was doubtless
-the latter's wife. The lady was leading a child. Tom had been restless
-and full of chafings and repinings; conscience-smitten, too--he could
-not meet Amy Lawrence's eye, he could not brook her loving gaze. But
-when he saw this small new-comer his soul was all ablaze with bliss in
-a moment. The next moment he was "showing off" with all his might
---cuffing boys, pulling hair, making faces--in a word, using every art
-that seemed likely to fascinate a girl and win her applause. His
-exaltation had but one alloy--the memory of his humiliation in this
-angel's garden--and that record in sand was fast washing out, under
-the waves of happiness that were sweeping over it now.
-
-The visitors were given the highest seat of honor, and as soon as Mr.
-Walters' speech was finished, he introduced them to the school. The
-middle-aged man turned out to be a prodigious personage--no less a one
-than the county judge--altogether the most august creation these
-children had ever looked upon--and they wondered what kind of material
-he was made of--and they half wanted to hear him roar, and were half
-afraid he might, too. He was from Constantinople, twelve miles away--so
-he had travelled, and seen the world--these very eyes had looked upon
-the county court-house--which was said to have a tin roof. The awe
-which these reflections inspired was attested by the impressive silence
-and the ranks of staring eyes. This was the great Judge Thatcher,
-brother of their own lawyer. Jeff Thatcher immediately went forward, to
-be familiar with the great man and be envied by the school. It would
-have been music to his soul to hear the whisperings:
-
-"Look at him, Jim! He's a going up there. Say--look! he's a going to
-shake hands with him--he IS shaking hands with him! By jings, don't you
-wish you was Jeff?"
-
-Mr. Walters fell to "showing off," with all sorts of official
-bustlings and activities, giving orders, delivering judgments,
-discharging directions here, there, everywhere that he could find a
-target. The librarian "showed off"--running hither and thither with his
-arms full of books and making a deal of the splutter and fuss that
-insect authority delights in. The young lady teachers "showed off"
---bending sweetly over pupils that were lately being boxed, lifting
-pretty warning fingers at bad little boys and patting good ones
-lovingly. The young gentlemen teachers "showed off" with small
-scoldings and other little displays of authority and fine attention to
-discipline--and most of the teachers, of both sexes, found business up
-at the library, by the pulpit; and it was business that frequently had
-to be done over again two or three times (with much seeming vexation).
-The little girls "showed off" in various ways, and the little boys
-"showed off" with such diligence that the air was thick with paper wads
-and the murmur of scufflings. And above it all the great man sat and
-beamed a majestic judicial smile upon all the house, and warmed himself
-in the sun of his own grandeur--for he was "showing off," too.
-
-There was only one thing wanting to make Mr. Walters' ecstasy
-complete, and that was a chance to deliver a Bible-prize and exhibit a
-prodigy. Several pupils had a few yellow tickets, but none had enough
---he had been around among the star pupils inquiring. He would have given
-worlds, now, to have that German lad back again with a sound mind.
-
-And now at this moment, when hope was dead, Tom Sawyer came forward
-with nine yellow tickets, nine red tickets, and ten blue ones, and
-demanded a Bible. This was a thunderbolt out of a clear sky. Walters
-was not expecting an application from this source for the next ten
-years. But there was no getting around it--here were the certified
-checks, and they were good for their face. Tom was therefore elevated
-to a place with the Judge and the other elect, and the great news was
-announced from headquarters. It was the most stunning surprise of the
-decade, and so profound was the sensation that it lifted the new hero
-up to the judicial one's altitude, and the school had two marvels to
-gaze upon in place of one. The boys were all eaten up with envy--but
-those that suffered the bitterest pangs were those who perceived too
-late that they themselves had contributed to this hated splendor by
-trading tickets to Tom for the wealth he had amassed in selling
-whitewashing privileges. These despised themselves, as being the dupes
-of a wily fraud, a guileful snake in the grass.
-
-The prize was delivered to Tom with as much effusion as the
-superintendent could pump up under the circumstances; but it lacked
-somewhat of the true gush, for the poor fellow's instinct taught him
-that there was a mystery here that could not well bear the light,
-perhaps; it was simply preposterous that this boy had warehoused two
-thousand sheaves of Scriptural wisdom on his premises--a dozen would
-strain his capacity, without a doubt.
-
-Amy Lawrence was proud and glad, and she tried to make Tom see it in
-her face--but he wouldn't look. She wondered; then she was just a grain
-troubled; next a dim suspicion came and went--came again; she watched;
-a furtive glance told her worlds--and then her heart broke, and she was
-jealous, and angry, and the tears came and she hated everybody. Tom
-most of all (she thought).
-
-Tom was introduced to the Judge; but his tongue was tied, his breath
-would hardly come, his heart quaked--partly because of the awful
-greatness of the man, but mainly because he was her parent. He would
-have liked to fall down and worship him, if it were in the dark. The
-Judge put his hand on Tom's head and called him a fine little man, and
-asked him what his name was. The boy stammered, gasped, and got it out:
-
-"Tom."
-
-"Oh, no, not Tom--it is--"
-
-"Thomas."
-
-"Ah, that's it. I thought there was more to it, maybe. That's very
-well. But you've another one I daresay, and you'll tell it to me, won't
-you?"
-
-"Tell the gentleman your other name, Thomas," said Walters, "and say
-sir. You mustn't forget your manners."
-
-"Thomas Sawyer--sir."
-
-"That's it! That's a good boy. Fine boy. Fine, manly little fellow.
-Two thousand verses is a great many--very, very great many. And you
-never can be sorry for the trouble you took to learn them; for
-knowledge is worth more than anything there is in the world; it's what
-makes great men and good men; you'll be a great man and a good man
-yourself, some day, Thomas, and then you'll look back and say, It's all
-owing to the precious Sunday-school privileges of my boyhood--it's all
-owing to my dear teachers that taught me to learn--it's all owing to
-the good superintendent, who encouraged me, and watched over me, and
-gave me a beautiful Bible--a splendid elegant Bible--to keep and have
-it all for my own, always--it's all owing to right bringing up! That is
-what you will say, Thomas--and you wouldn't take any money for those
-two thousand verses--no indeed you wouldn't. And now you wouldn't mind
-telling me and this lady some of the things you've learned--no, I know
-you wouldn't--for we are proud of little boys that learn. Now, no
-doubt you know the names of all the twelve disciples. Won't you tell us
-the names of the first two that were appointed?"
-
-Tom was tugging at a button-hole and looking sheepish. He blushed,
-now, and his eyes fell. Mr. Walters' heart sank within him. He said to
-himself, it is not possible that the boy can answer the simplest
-question--why DID the Judge ask him? Yet he felt obliged to speak up
-and say:
-
-"Answer the gentleman, Thomas--don't be afraid."
-
-Tom still hung fire.
-
-"Now I know you'll tell me," said the lady. "The names of the first
-two disciples were--"
-
-"DAVID AND GOLIAH!"
-
-Let us draw the curtain of charity over the rest of the scene.
-
-
-
-CHAPTER V
-
-ABOUT half-past ten the cracked bell of the small church began to
-ring, and presently the people began to gather for the morning sermon.
-The Sunday-school children distributed themselves about the house and
-occupied pews with their parents, so as to be under supervision. Aunt
-Polly came, and Tom and Sid and Mary sat with her--Tom being placed
-next the aisle, in order that he might be as far away from the open
-window and the seductive outside summer scenes as possible. The crowd
-filed up the aisles: the aged and needy postmaster, who had seen better
-days; the mayor and his wife--for they had a mayor there, among other
-unnecessaries; the justice of the peace; the widow Douglass, fair,
-smart, and forty, a generous, good-hearted soul and well-to-do, her
-hill mansion the only palace in the town, and the most hospitable and
-much the most lavish in the matter of festivities that St. Petersburg
-could boast; the bent and venerable Major and Mrs. Ward; lawyer
-Riverson, the new notable from a distance; next the belle of the
-village, followed by a troop of lawn-clad and ribbon-decked young
-heart-breakers; then all the young clerks in town in a body--for they
-had stood in the vestibule sucking their cane-heads, a circling wall of
-oiled and simpering admirers, till the last girl had run their gantlet;
-and last of all came the Model Boy, Willie Mufferson, taking as heedful
-care of his mother as if she were cut glass. He always brought his
-mother to church, and was the pride of all the matrons. The boys all
-hated him, he was so good. And besides, he had been "thrown up to them"
-so much. His white handkerchief was hanging out of his pocket behind, as
-usual on Sundays--accidentally. Tom had no handkerchief, and he looked
-upon boys who had as snobs.
-
-The congregation being fully assembled, now, the bell rang once more,
-to warn laggards and stragglers, and then a solemn hush fell upon the
-church which was only broken by the tittering and whispering of the
-choir in the gallery. The choir always tittered and whispered all
-through service. There was once a church choir that was not ill-bred,
-but I have forgotten where it was, now. It was a great many years ago,
-and I can scarcely remember anything about it, but I think it was in
-some foreign country.
-
-The minister gave out the hymn, and read it through with a relish, in
-a peculiar style which was much admired in that part of the country.
-His voice began on a medium key and climbed steadily up till it reached
-a certain point, where it bore with strong emphasis upon the topmost
-word and then plunged down as if from a spring-board:
-
-  Shall I be car-ri-ed toe the skies, on flow'ry BEDS of ease,
-
-  Whilst others fight to win the prize, and sail thro' BLOODY seas?
-
-He was regarded as a wonderful reader. At church "sociables" he was
-always called upon to read poetry; and when he was through, the ladies
-would lift up their hands and let them fall helplessly in their laps,
-and "wall" their eyes, and shake their heads, as much as to say, "Words
-cannot express it; it is too beautiful, TOO beautiful for this mortal
-earth."
-
-After the hymn had been sung, the Rev. Mr. Sprague turned himself into
-a bulletin-board, and read off "notices" of meetings and societies and
-things till it seemed that the list would stretch out to the crack of
-doom--a queer custom which is still kept up in America, even in cities,
-away here in this age of abundant newspapers. Often, the less there is
-to justify a traditional custom, the harder it is to get rid of it.
-
-And now the minister prayed. A good, generous prayer it was, and went
-into details: it pleaded for the church, and the little children of the
-church; for the other churches of the village; for the village itself;
-for the county; for the State; for the State officers; for the United
-States; for the churches of the United States; for Congress; for the
-President; for the officers of the Government; for poor sailors, tossed
-by stormy seas; for the oppressed millions groaning under the heel of
-European monarchies and Oriental despotisms; for such as have the light
-and the good tidings, and yet have not eyes to see nor ears to hear
-withal; for the heathen in the far islands of the sea; and closed with
-a supplication that the words he was about to speak might find grace
-and favor, and be as seed sown in fertile ground, yielding in time a
-grateful harvest of good. Amen.
-
-There was a rustling of dresses, and the standing congregation sat
-down. The boy whose history this book relates did not enjoy the prayer,
-he only endured it--if he even did that much. He was restive all
-through it; he kept tally of the details of the prayer, unconsciously
---for he was not listening, but he knew the ground of old, and the
-clergyman's regular route over it--and when a little trifle of new
-matter was interlarded, his ear detected it and his whole nature
-resented it; he considered additions unfair, and scoundrelly. In the
-midst of the prayer a fly had lit on the back of the pew in front of
-him and tortured his spirit by calmly rubbing its hands together,
-embracing its head with its arms, and polishing it so vigorously that
-it seemed to almost part company with the body, and the slender thread
-of a neck was exposed to view; scraping its wings with its hind legs
-and smoothing them to its body as if they had been coat-tails; going
-through its whole toilet as tranquilly as if it knew it was perfectly
-safe. As indeed it was; for as sorely as Tom's hands itched to grab for
-it they did not dare--he believed his soul would be instantly destroyed
-if he did such a thing while the prayer was going on. But with the
-closing sentence his hand began to curve and steal forward; and the
-instant the "Amen" was out the fly was a prisoner of war. His aunt
-detected the act and made him let it go.
-
-The minister gave out his text and droned along monotonously through
-an argument that was so prosy that many a head by and by began to nod
---and yet it was an argument that dealt in limitless fire and brimstone
-and thinned the predestined elect down to a company so small as to be
-hardly worth the saving. Tom counted the pages of the sermon; after
-church he always knew how many pages there had been, but he seldom knew
-anything else about the discourse. However, this time he was really
-interested for a little while. The minister made a grand and moving
-picture of the assembling together of the world's hosts at the
-millennium when the lion and the lamb should lie down together and a
-little child should lead them. But the pathos, the lesson, the moral of
-the great spectacle were lost upon the boy; he only thought of the
-conspicuousness of the principal character before the on-looking
-nations; his face lit with the thought, and he said to himself that he
-wished he could be that child, if it was a tame lion.
-
-Now he lapsed into suffering again, as the dry argument was resumed.
-Presently he bethought him of a treasure he had and got it out. It was
-a large black beetle with formidable jaws--a "pinchbug," he called it.
-It was in a percussion-cap box. The first thing the beetle did was to
-take him by the finger. A natural fillip followed, the beetle went
-floundering into the aisle and lit on its back, and the hurt finger
-went into the boy's mouth. The beetle lay there working its helpless
-legs, unable to turn over. Tom eyed it, and longed for it; but it was
-safe out of his reach. Other people uninterested in the sermon found
-relief in the beetle, and they eyed it too. Presently a vagrant poodle
-dog came idling along, sad at heart, lazy with the summer softness and
-the quiet, weary of captivity, sighing for change. He spied the beetle;
-the drooping tail lifted and wagged. He surveyed the prize; walked
-around it; smelt at it from a safe distance; walked around it again;
-grew bolder, and took a closer smell; then lifted his lip and made a
-gingerly snatch at it, just missing it; made another, and another;
-began to enjoy the diversion; subsided to his stomach with the beetle
-between his paws, and continued his experiments; grew weary at last,
-and then indifferent and absent-minded. His head nodded, and little by
-little his chin descended and touched the enemy, who seized it. There
-was a sharp yelp, a flirt of the poodle's head, and the beetle fell a
-couple of yards away, and lit on its back once more. The neighboring
-spectators shook with a gentle inward joy, several faces went behind
-fans and handkerchiefs, and Tom was entirely happy. The dog looked
-foolish, and probably felt so; but there was resentment in his heart,
-too, and a craving for revenge. So he went to the beetle and began a
-wary attack on it again; jumping at it from every point of a circle,
-lighting with his fore-paws within an inch of the creature, making even
-closer snatches at it with his teeth, and jerking his head till his
-ears flapped again. But he grew tired once more, after a while; tried
-to amuse himself with a fly but found no relief; followed an ant
-around, with his nose close to the floor, and quickly wearied of that;
-yawned, sighed, forgot the beetle entirely, and sat down on it. Then
-there was a wild yelp of agony and the poodle went sailing up the
-aisle; the yelps continued, and so did the dog; he crossed the house in
-front of the altar; he flew down the other aisle; he crossed before the
-doors; he clamored up the home-stretch; his anguish grew with his
-progress, till presently he was but a woolly comet moving in its orbit
-with the gleam and the speed of light. At last the frantic sufferer
-sheered from its course, and sprang into its master's lap; he flung it
-out of the window, and the voice of distress quickly thinned away and
-died in the distance.
-
-By this time the whole church was red-faced and suffocating with
-suppressed laughter, and the sermon had come to a dead standstill. The
-discourse was resumed presently, but it went lame and halting, all
-possibility of impressiveness being at an end; for even the gravest
-sentiments were constantly being received with a smothered burst of
-unholy mirth, under cover of some remote pew-back, as if the poor
-parson had said a rarely facetious thing. It was a genuine relief to
-the whole congregation when the ordeal was over and the benediction
-pronounced.
-
-Tom Sawyer went home quite cheerful, thinking to himself that there
-was some satisfaction about divine service when there was a bit of
-variety in it. He had but one marring thought; he was willing that the
-dog should play with his pinchbug, but he did not think it was upright
-in him to carry it off.
-
-
-
-CHAPTER VI
-
-MONDAY morning found Tom Sawyer miserable. Monday morning always found
-him so--because it began another week's slow suffering in school. He
-generally began that day with wishing he had had no intervening
-holiday, it made the going into captivity and fetters again so much
-more odious.
-
-Tom lay thinking. Presently it occurred to him that he wished he was
-sick; then he could stay home from school. Here was a vague
-possibility. He canvassed his system. No ailment was found, and he
-investigated again. This time he thought he could detect colicky
-symptoms, and he began to encourage them with considerable hope. But
-they soon grew feeble, and presently died wholly away. He reflected
-further. Suddenly he discovered something. One of his upper front teeth
-was loose. This was lucky; he was about to begin to groan, as a
-"starter," as he called it, when it occurred to him that if he came
-into court with that argument, his aunt would pull it out, and that
-would hurt. So he thought he would hold the tooth in reserve for the
-present, and seek further. Nothing offered for some little time, and
-then he remembered hearing the doctor tell about a certain thing that
-laid up a patient for two or three weeks and threatened to make him
-lose a finger. So the boy eagerly drew his sore toe from under the
-sheet and held it up for inspection. But now he did not know the
-necessary symptoms. However, it seemed well worth while to chance it,
-so he fell to groaning with considerable spirit.
-
-But Sid slept on unconscious.
-
-Tom groaned louder, and fancied that he began to feel pain in the toe.
-
-No result from Sid.
-
-Tom was panting with his exertions by this time. He took a rest and
-then swelled himself up and fetched a succession of admirable groans.
-
-Sid snored on.
-
-Tom was aggravated. He said, "Sid, Sid!" and shook him. This course
-worked well, and Tom began to groan again. Sid yawned, stretched, then
-brought himself up on his elbow with a snort, and began to stare at
-Tom. Tom went on groaning. Sid said:
-
-"Tom! Say, Tom!" [No response.] "Here, Tom! TOM! What is the matter,
-Tom?" And he shook him and looked in his face anxiously.
-
-Tom moaned out:
-
-"Oh, don't, Sid. Don't joggle me."
-
-"Why, what's the matter, Tom? I must call auntie."
-
-"No--never mind. It'll be over by and by, maybe. Don't call anybody."
-
-"But I must! DON'T groan so, Tom, it's awful. How long you been this
-way?"
-
-"Hours. Ouch! Oh, don't stir so, Sid, you'll kill me."
-
-"Tom, why didn't you wake me sooner? Oh, Tom, DON'T! It makes my
-flesh crawl to hear you. Tom, what is the matter?"
-
-"I forgive you everything, Sid. [Groan.] Everything you've ever done
-to me. When I'm gone--"
-
-"Oh, Tom, you ain't dying, are you? Don't, Tom--oh, don't. Maybe--"
-
-"I forgive everybody, Sid. [Groan.] Tell 'em so, Sid. And Sid, you
-give my window-sash and my cat with one eye to that new girl that's
-come to town, and tell her--"
-
-But Sid had snatched his clothes and gone. Tom was suffering in
-reality, now, so handsomely was his imagination working, and so his
-groans had gathered quite a genuine tone.
-
-Sid flew down-stairs and said:
-
-"Oh, Aunt Polly, come! Tom's dying!"
-
-"Dying!"
-
-"Yes'm. Don't wait--come quick!"
-
-"Rubbage! I don't believe it!"
-
-But she fled up-stairs, nevertheless, with Sid and Mary at her heels.
-And her face grew white, too, and her lip trembled. When she reached
-the bedside she gasped out:
-
-"You, Tom! Tom, what's the matter with you?"
-
-"Oh, auntie, I'm--"
-
-"What's the matter with you--what is the matter with you, child?"
-
-"Oh, auntie, my sore toe's mortified!"
-
-The old lady sank down into a chair and laughed a little, then cried a
-little, then did both together. This restored her and she said:
-
-"Tom, what a turn you did give me. Now you shut up that nonsense and
-climb out of this."
-
-The groans ceased and the pain vanished from the toe. The boy felt a
-little foolish, and he said:
-
-"Aunt Polly, it SEEMED mortified, and it hurt so I never minded my
-tooth at all."
-
-"Your tooth, indeed! What's the matter with your tooth?"
-
-"One of them's loose, and it aches perfectly awful."
-
-"There, there, now, don't begin that groaning again. Open your mouth.
-Well--your tooth IS loose, but you're not going to die about that.
-Mary, get me a silk thread, and a chunk of fire out of the kitchen."
-
-Tom said:
-
-"Oh, please, auntie, don't pull it out. It don't hurt any more. I wish
-I may never stir if it does. Please don't, auntie. I don't want to stay
-home from school."
-
-"Oh, you don't, don't you? So all this row was because you thought
-you'd get to stay home from school and go a-fishing? Tom, Tom, I love
-you so, and you seem to try every way you can to break my old heart
-with your outrageousness." By this time the dental instruments were
-ready. The old lady made one end of the silk thread fast to Tom's tooth
-with a loop and tied the other to the bedpost. Then she seized the
-chunk of fire and suddenly thrust it almost into the boy's face. The
-tooth hung dangling by the bedpost, now.
-
-But all trials bring their compensations. As Tom wended to school
-after breakfast, he was the envy of every boy he met because the gap in
-his upper row of teeth enabled him to expectorate in a new and
-admirable way. He gathered quite a following of lads interested in the
-exhibition; and one that had cut his finger and had been a centre of
-fascination and homage up to this time, now found himself suddenly
-without an adherent, and shorn of his glory. His heart was heavy, and
-he said with a disdain which he did not feel that it wasn't anything to
-spit like Tom Sawyer; but another boy said, "Sour grapes!" and he
-wandered away a dismantled hero.
-
-Shortly Tom came upon the juvenile pariah of the village, Huckleberry
-Finn, son of the town drunkard. Huckleberry was cordially hated and
-dreaded by all the mothers of the town, because he was idle and lawless
-and vulgar and bad--and because all their children admired him so, and
-delighted in his forbidden society, and wished they dared to be like
-him. Tom was like the rest of the respectable boys, in that he envied
-Huckleberry his gaudy outcast condition, and was under strict orders
-not to play with him. So he played with him every time he got a chance.
-Huckleberry was always dressed in the cast-off clothes of full-grown
-men, and they were in perennial bloom and fluttering with rags. His hat
-was a vast ruin with a wide crescent lopped out of its brim; his coat,
-when he wore one, hung nearly to his heels and had the rearward buttons
-far down the back; but one suspender supported his trousers; the seat
-of the trousers bagged low and contained nothing, the fringed legs
-dragged in the dirt when not rolled up.
-
-Huckleberry came and went, at his own free will. He slept on doorsteps
-in fine weather and in empty hogsheads in wet; he did not have to go to
-school or to church, or call any being master or obey anybody; he could
-go fishing or swimming when and where he chose, and stay as long as it
-suited him; nobody forbade him to fight; he could sit up as late as he
-pleased; he was always the first boy that went barefoot in the spring
-and the last to resume leather in the fall; he never had to wash, nor
-put on clean clothes; he could swear wonderfully. In a word, everything
-that goes to make life precious that boy had. So thought every
-harassed, hampered, respectable boy in St. Petersburg.
-
-Tom hailed the romantic outcast:
-
-"Hello, Huckleberry!"
-
-"Hello yourself, and see how you like it."
-
-"What's that you got?"
-
-"Dead cat."
-
-"Lemme see him, Huck. My, he's pretty stiff. Where'd you get him?"
-
-"Bought him off'n a boy."
-
-"What did you give?"
-
-"I give a blue ticket and a bladder that I got at the slaughter-house."
-
-"Where'd you get the blue ticket?"
-
-"Bought it off'n Ben Rogers two weeks ago for a hoop-stick."
-
-"Say--what is dead cats good for, Huck?"
-
-"Good for? Cure warts with."
-
-"No! Is that so? I know something that's better."
-
-"I bet you don't. What is it?"
-
-"Why, spunk-water."
-
-"Spunk-water! I wouldn't give a dern for spunk-water."
-
-"You wouldn't, wouldn't you? D'you ever try it?"
-
-"No, I hain't. But Bob Tanner did."
-
-"Who told you so!"
-
-"Why, he told Jeff Thatcher, and Jeff told Johnny Baker, and Johnny
-told Jim Hollis, and Jim told Ben Rogers, and Ben told a nigger, and
-the nigger told me. There now!"
-
-"Well, what of it? They'll all lie. Leastways all but the nigger. I
-don't know HIM. But I never see a nigger that WOULDN'T lie. Shucks! Now
-you tell me how Bob Tanner done it, Huck."
-
-"Why, he took and dipped his hand in a rotten stump where the
-rain-water was."
-
-"In the daytime?"
-
-"Certainly."
-
-"With his face to the stump?"
-
-"Yes. Least I reckon so."
-
-"Did he say anything?"
-
-"I don't reckon he did. I don't know."
-
-"Aha! Talk about trying to cure warts with spunk-water such a blame
-fool way as that! Why, that ain't a-going to do any good. You got to go
-all by yourself, to the middle of the woods, where you know there's a
-spunk-water stump, and just as it's midnight you back up against the
-stump and jam your hand in and say:
-
-  'Barley-corn, barley-corn, injun-meal shorts,
-   Spunk-water, spunk-water, swaller these warts,'
-
-and then walk away quick, eleven steps, with your eyes shut, and then
-turn around three times and walk home without speaking to anybody.
-Because if you speak the charm's busted."
-
-"Well, that sounds like a good way; but that ain't the way Bob Tanner
-done."
-
-"No, sir, you can bet he didn't, becuz he's the wartiest boy in this
-town; and he wouldn't have a wart on him if he'd knowed how to work
-spunk-water. I've took off thousands of warts off of my hands that way,
-Huck. I play with frogs so much that I've always got considerable many
-warts. Sometimes I take 'em off with a bean."
-
-"Yes, bean's good. I've done that."
-
-"Have you? What's your way?"
-
-"You take and split the bean, and cut the wart so as to get some
-blood, and then you put the blood on one piece of the bean and take and
-dig a hole and bury it 'bout midnight at the crossroads in the dark of
-the moon, and then you burn up the rest of the bean. You see that piece
-that's got the blood on it will keep drawing and drawing, trying to
-fetch the other piece to it, and so that helps the blood to draw the
-wart, and pretty soon off she comes."
-
-"Yes, that's it, Huck--that's it; though when you're burying it if you
-say 'Down bean; off wart; come no more to bother me!' it's better.
-That's the way Joe Harper does, and he's been nearly to Coonville and
-most everywheres. But say--how do you cure 'em with dead cats?"
-
-"Why, you take your cat and go and get in the graveyard 'long about
-midnight when somebody that was wicked has been buried; and when it's
-midnight a devil will come, or maybe two or three, but you can't see
-'em, you can only hear something like the wind, or maybe hear 'em talk;
-and when they're taking that feller away, you heave your cat after 'em
-and say, 'Devil follow corpse, cat follow devil, warts follow cat, I'm
-done with ye!' That'll fetch ANY wart."
-
-"Sounds right. D'you ever try it, Huck?"
-
-"No, but old Mother Hopkins told me."
-
-"Well, I reckon it's so, then. Becuz they say she's a witch."
-
-"Say! Why, Tom, I KNOW she is. She witched pap. Pap says so his own
-self. He come along one day, and he see she was a-witching him, so he
-took up a rock, and if she hadn't dodged, he'd a got her. Well, that
-very night he rolled off'n a shed wher' he was a layin drunk, and broke
-his arm."
-
-"Why, that's awful. How did he know she was a-witching him?"
-
-"Lord, pap can tell, easy. Pap says when they keep looking at you
-right stiddy, they're a-witching you. Specially if they mumble. Becuz
-when they mumble they're saying the Lord's Prayer backards."
-
-"Say, Hucky, when you going to try the cat?"
-
-"To-night. I reckon they'll come after old Hoss Williams to-night."
-
-"But they buried him Saturday. Didn't they get him Saturday night?"
-
-"Why, how you talk! How could their charms work till midnight?--and
-THEN it's Sunday. Devils don't slosh around much of a Sunday, I don't
-reckon."
-
-"I never thought of that. That's so. Lemme go with you?"
-
-"Of course--if you ain't afeard."
-
-"Afeard! 'Tain't likely. Will you meow?"
-
-"Yes--and you meow back, if you get a chance. Last time, you kep' me
-a-meowing around till old Hays went to throwing rocks at me and says
-'Dern that cat!' and so I hove a brick through his window--but don't
-you tell."
-
-"I won't. I couldn't meow that night, becuz auntie was watching me,
-but I'll meow this time. Say--what's that?"
-
-"Nothing but a tick."
-
-"Where'd you get him?"
-
-"Out in the woods."
-
-"What'll you take for him?"
-
-"I don't know. I don't want to sell him."
-
-"All right. It's a mighty small tick, anyway."
-
-"Oh, anybody can run a tick down that don't belong to them. I'm
-satisfied with it. It's a good enough tick for me."
-
-"Sho, there's ticks a plenty. I could have a thousand of 'em if I
-wanted to."
-
-"Well, why don't you? Becuz you know mighty well you can't. This is a
-pretty early tick, I reckon. It's the first one I've seen this year."
-
-"Say, Huck--I'll give you my tooth for him."
-
-"Less see it."
-
-Tom got out a bit of paper and carefully unrolled it. Huckleberry
-viewed it wistfully. The temptation was very strong. At last he said:
-
-"Is it genuwyne?"
-
-Tom lifted his lip and showed the vacancy.
-
-"Well, all right," said Huckleberry, "it's a trade."
-
-Tom enclosed the tick in the percussion-cap box that had lately been
-the pinchbug's prison, and the boys separated, each feeling wealthier
-than before.
-
-When Tom reached the little isolated frame schoolhouse, he strode in
-briskly, with the manner of one who had come with all honest speed.
-He hung his hat on a peg and flung himself into his seat with
-business-like alacrity. The master, throned on high in his great
-splint-bottom arm-chair, was dozing, lulled by the drowsy hum of study.
-The interruption roused him.
-
-"Thomas Sawyer!"
-
-Tom knew that when his name was pronounced in full, it meant trouble.
-
-"Sir!"
-
-"Come up here. Now, sir, why are you late again, as usual?"
-
-Tom was about to take refuge in a lie, when he saw two long tails of
-yellow hair hanging down a back that he recognized by the electric
-sympathy of love; and by that form was THE ONLY VACANT PLACE on the
-girls' side of the schoolhouse. He instantly said:
-
-"I STOPPED TO TALK WITH HUCKLEBERRY FINN!"
-
-The master's pulse stood still, and he stared helplessly. The buzz of
-study ceased. The pupils wondered if this foolhardy boy had lost his
-mind. The master said:
-
-"You--you did what?"
-
-"Stopped to talk with Huckleberry Finn."
-
-There was no mistaking the words.
-
-"Thomas Sawyer, this is the most astounding confession I have ever
-listened to. No mere ferule will answer for this offence. Take off your
-jacket."
-
-The master's arm performed until it was tired and the stock of
-switches notably diminished. Then the order followed:
-
-"Now, sir, go and sit with the girls! And let this be a warning to you."
-
-The titter that rippled around the room appeared to abash the boy, but
-in reality that result was caused rather more by his worshipful awe of
-his unknown idol and the dread pleasure that lay in his high good
-fortune. He sat down upon the end of the pine bench and the girl
-hitched herself away from him with a toss of her head. Nudges and winks
-and whispers traversed the room, but Tom sat still, with his arms upon
-the long, low desk before him, and seemed to study his book.
-
-By and by attention ceased from him, and the accustomed school murmur
-rose upon the dull air once more. Presently the boy began to steal
-furtive glances at the girl. She observed it, "made a mouth" at him and
-gave him the back of her head for the space of a minute. When she
-cautiously faced around again, a peach lay before her. She thrust it
-away. Tom gently put it back. She thrust it away again, but with less
-animosity. Tom patiently returned it to its place. Then she let it
-remain. Tom scrawled on his slate, "Please take it--I got more." The
-girl glanced at the words, but made no sign. Now the boy began to draw
-something on the slate, hiding his work with his left hand. For a time
-the girl refused to notice; but her human curiosity presently began to
-manifest itself by hardly perceptible signs. The boy worked on,
-apparently unconscious. The girl made a sort of noncommittal attempt to
-see, but the boy did not betray that he was aware of it. At last she
-gave in and hesitatingly whispered:
-
-"Let me see it."
-
-Tom partly uncovered a dismal caricature of a house with two gable
-ends to it and a corkscrew of smoke issuing from the chimney. Then the
-girl's interest began to fasten itself upon the work and she forgot
-everything else. When it was finished, she gazed a moment, then
-whispered:
-
-"It's nice--make a man."
-
-The artist erected a man in the front yard, that resembled a derrick.
-He could have stepped over the house; but the girl was not
-hypercritical; she was satisfied with the monster, and whispered:
-
-"It's a beautiful man--now make me coming along."
-
-Tom drew an hour-glass with a full moon and straw limbs to it and
-armed the spreading fingers with a portentous fan. The girl said:
-
-"It's ever so nice--I wish I could draw."
-
-"It's easy," whispered Tom, "I'll learn you."
-
-"Oh, will you? When?"
-
-"At noon. Do you go home to dinner?"
-
-"I'll stay if you will."
-
-"Good--that's a whack. What's your name?"
-
-"Becky Thatcher. What's yours? Oh, I know. It's Thomas Sawyer."
-
-"That's the name they lick me by. I'm Tom when I'm good. You call me
-Tom, will you?"
-
-"Yes."
-
-Now Tom began to scrawl something on the slate, hiding the words from
-the girl. But she was not backward this time. She begged to see. Tom
-said:
-
-"Oh, it ain't anything."
-
-"Yes it is."
-
-"No it ain't. You don't want to see."
-
-"Yes I do, indeed I do. Please let me."
-
-"You'll tell."
-
-"No I won't--deed and deed and double deed won't."
-
-"You won't tell anybody at all? Ever, as long as you live?"
-
-"No, I won't ever tell ANYbody. Now let me."
-
-"Oh, YOU don't want to see!"
-
-"Now that you treat me so, I WILL see." And she put her small hand
-upon his and a little scuffle ensued, Tom pretending to resist in
-earnest but letting his hand slip by degrees till these words were
-revealed: "I LOVE YOU."
-
-"Oh, you bad thing!" And she hit his hand a smart rap, but reddened
-and looked pleased, nevertheless.
-
-Just at this juncture the boy felt a slow, fateful grip closing on his
-ear, and a steady lifting impulse. In that wise he was borne across the
-house and deposited in his own seat, under a peppering fire of giggles
-from the whole school. Then the master stood over him during a few
-awful moments, and finally moved away to his throne without saying a
-word. But although Tom's ear tingled, his heart was jubilant.
-
-As the school quieted down Tom made an honest effort to study, but the
-turmoil within him was too great. In turn he took his place in the
-reading class and made a botch of it; then in the geography class and
-turned lakes into mountains, mountains into rivers, and rivers into
-continents, till chaos was come again; then in the spelling class, and
-got "turned down," by a succession of mere baby words, till he brought
-up at the foot and yielded up the pewter medal which he had worn with
-ostentation for months.
-
-
-
-CHAPTER VII
-
-THE harder Tom tried to fasten his mind on his book, the more his
-ideas wandered. So at last, with a sigh and a yawn, he gave it up. It
-seemed to him that the noon recess would never come. The air was
-utterly dead. There was not a breath stirring. It was the sleepiest of
-sleepy days. The drowsing murmur of the five and twenty studying
-scholars soothed the soul like the spell that is in the murmur of bees.
-Away off in the flaming sunshine, Cardiff Hill lifted its soft green
-sides through a shimmering veil of heat, tinted with the purple of
-distance; a few birds floated on lazy wing high in the air; no other
-living thing was visible but some cows, and they were asleep. Tom's
-heart ached to be free, or else to have something of interest to do to
-pass the dreary time. His hand wandered into his pocket and his face
-lit up with a glow of gratitude that was prayer, though he did not know
-it. Then furtively the percussion-cap box came out. He released the
-tick and put him on the long flat desk. The creature probably glowed
-with a gratitude that amounted to prayer, too, at this moment, but it
-was premature: for when he started thankfully to travel off, Tom turned
-him aside with a pin and made him take a new direction.
-
-Tom's bosom friend sat next him, suffering just as Tom had been, and
-now he was deeply and gratefully interested in this entertainment in an
-instant. This bosom friend was Joe Harper. The two boys were sworn
-friends all the week, and embattled enemies on Saturdays. Joe took a
-pin out of his lapel and began to assist in exercising the prisoner.
-The sport grew in interest momently. Soon Tom said that they were
-interfering with each other, and neither getting the fullest benefit of
-the tick. So he put Joe's slate on the desk and drew a line down the
-middle of it from top to bottom.
-
-"Now," said he, "as long as he is on your side you can stir him up and
-I'll let him alone; but if you let him get away and get on my side,
-you're to leave him alone as long as I can keep him from crossing over."
-
-"All right, go ahead; start him up."
-
-The tick escaped from Tom, presently, and crossed the equator. Joe
-harassed him awhile, and then he got away and crossed back again. This
-change of base occurred often. While one boy was worrying the tick with
-absorbing interest, the other would look on with interest as strong,
-the two heads bowed together over the slate, and the two souls dead to
-all things else. At last luck seemed to settle and abide with Joe. The
-tick tried this, that, and the other course, and got as excited and as
-anxious as the boys themselves, but time and again just as he would
-have victory in his very grasp, so to speak, and Tom's fingers would be
-twitching to begin, Joe's pin would deftly head him off, and keep
-possession. At last Tom could stand it no longer. The temptation was
-too strong. So he reached out and lent a hand with his pin. Joe was
-angry in a moment. Said he:
-
-"Tom, you let him alone."
-
-"I only just want to stir him up a little, Joe."
-
-"No, sir, it ain't fair; you just let him alone."
-
-"Blame it, I ain't going to stir him much."
-
-"Let him alone, I tell you."
-
-"I won't!"
-
-"You shall--he's on my side of the line."
-
-"Look here, Joe Harper, whose is that tick?"
-
-"I don't care whose tick he is--he's on my side of the line, and you
-sha'n't touch him."
-
-"Well, I'll just bet I will, though. He's my tick and I'll do what I
-blame please with him, or die!"
-
-A tremendous whack came down on Tom's shoulders, and its duplicate on
-Joe's; and for the space of two minutes the dust continued to fly from
-the two jackets and the whole school to enjoy it. The boys had been too
-absorbed to notice the hush that had stolen upon the school awhile
-before when the master came tiptoeing down the room and stood over
-them. He had contemplated a good part of the performance before he
-contributed his bit of variety to it.
-
-When school broke up at noon, Tom flew to Becky Thatcher, and
-whispered in her ear:
-
-"Put on your bonnet and let on you're going home; and when you get to
-the corner, give the rest of 'em the slip, and turn down through the
-lane and come back. I'll go the other way and come it over 'em the same
-way."
-
-So the one went off with one group of scholars, and the other with
-another. In a little while the two met at the bottom of the lane, and
-when they reached the school they had it all to themselves. Then they
-sat together, with a slate before them, and Tom gave Becky the pencil
-and held her hand in his, guiding it, and so created another surprising
-house. When the interest in art began to wane, the two fell to talking.
-Tom was swimming in bliss. He said:
-
-"Do you love rats?"
-
-"No! I hate them!"
-
-"Well, I do, too--LIVE ones. But I mean dead ones, to swing round your
-head with a string."
-
-"No, I don't care for rats much, anyway. What I like is chewing-gum."
-
-"Oh, I should say so! I wish I had some now."
-
-"Do you? I've got some. I'll let you chew it awhile, but you must give
-it back to me."
-
-That was agreeable, so they chewed it turn about, and dangled their
-legs against the bench in excess of contentment.
-
-"Was you ever at a circus?" said Tom.
-
-"Yes, and my pa's going to take me again some time, if I'm good."
-
-"I been to the circus three or four times--lots of times. Church ain't
-shucks to a circus. There's things going on at a circus all the time.
-I'm going to be a clown in a circus when I grow up."
-
-"Oh, are you! That will be nice. They're so lovely, all spotted up."
-
-"Yes, that's so. And they get slathers of money--most a dollar a day,
-Ben Rogers says. Say, Becky, was you ever engaged?"
-
-"What's that?"
-
-"Why, engaged to be married."
-
-"No."
-
-"Would you like to?"
-
-"I reckon so. I don't know. What is it like?"
-
-"Like? Why it ain't like anything. You only just tell a boy you won't
-ever have anybody but him, ever ever ever, and then you kiss and that's
-all. Anybody can do it."
-
-"Kiss? What do you kiss for?"
-
-"Why, that, you know, is to--well, they always do that."
-
-"Everybody?"
-
-"Why, yes, everybody that's in love with each other. Do you remember
-what I wrote on the slate?"
-
-"Ye--yes."
-
-"What was it?"
-
-"I sha'n't tell you."
-
-"Shall I tell YOU?"
-
-"Ye--yes--but some other time."
-
-"No, now."
-
-"No, not now--to-morrow."
-
-"Oh, no, NOW. Please, Becky--I'll whisper it, I'll whisper it ever so
-easy."
-
-Becky hesitating, Tom took silence for consent, and passed his arm
-about her waist and whispered the tale ever so softly, with his mouth
-close to her ear. And then he added:
-
-"Now you whisper it to me--just the same."
-
-She resisted, for a while, and then said:
-
-"You turn your face away so you can't see, and then I will. But you
-mustn't ever tell anybody--WILL you, Tom? Now you won't, WILL you?"
-
-"No, indeed, indeed I won't. Now, Becky."
-
-He turned his face away. She bent timidly around till her breath
-stirred his curls and whispered, "I--love--you!"
-
-Then she sprang away and ran around and around the desks and benches,
-with Tom after her, and took refuge in a corner at last, with her
-little white apron to her face. Tom clasped her about her neck and
-pleaded:
-
-"Now, Becky, it's all done--all over but the kiss. Don't you be afraid
-of that--it ain't anything at all. Please, Becky." And he tugged at her
-apron and the hands.
-
-By and by she gave up, and let her hands drop; her face, all glowing
-with the struggle, came up and submitted. Tom kissed the red lips and
-said:
-
-"Now it's all done, Becky. And always after this, you know, you ain't
-ever to love anybody but me, and you ain't ever to marry anybody but
-me, ever never and forever. Will you?"
-
-"No, I'll never love anybody but you, Tom, and I'll never marry
-anybody but you--and you ain't to ever marry anybody but me, either."
-
-"Certainly. Of course. That's PART of it. And always coming to school
-or when we're going home, you're to walk with me, when there ain't
-anybody looking--and you choose me and I choose you at parties, because
-that's the way you do when you're engaged."
-
-"It's so nice. I never heard of it before."
-
-"Oh, it's ever so gay! Why, me and Amy Lawrence--"
-
-The big eyes told Tom his blunder and he stopped, confused.
-
-"Oh, Tom! Then I ain't the first you've ever been engaged to!"
-
-The child began to cry. Tom said:
-
-"Oh, don't cry, Becky, I don't care for her any more."
-
-"Yes, you do, Tom--you know you do."
-
-Tom tried to put his arm about her neck, but she pushed him away and
-turned her face to the wall, and went on crying. Tom tried again, with
-soothing words in his mouth, and was repulsed again. Then his pride was
-up, and he strode away and went outside. He stood about, restless and
-uneasy, for a while, glancing at the door, every now and then, hoping
-she would repent and come to find him. But she did not. Then he began
-to feel badly and fear that he was in the wrong. It was a hard struggle
-with him to make new advances, now, but he nerved himself to it and
-entered. She was still standing back there in the corner, sobbing, with
-her face to the wall. Tom's heart smote him. He went to her and stood a
-moment, not knowing exactly how to proceed. Then he said hesitatingly:
-
-"Becky, I--I don't care for anybody but you."
-
-No reply--but sobs.
-
-"Becky"--pleadingly. "Becky, won't you say something?"
-
-More sobs.
-
-Tom got out his chiefest jewel, a brass knob from the top of an
-andiron, and passed it around her so that she could see it, and said:
-
-"Please, Becky, won't you take it?"
-
-She struck it to the floor. Then Tom marched out of the house and over
-the hills and far away, to return to school no more that day. Presently
-Becky began to suspect. She ran to the door; he was not in sight; she
-flew around to the play-yard; he was not there. Then she called:
-
-"Tom! Come back, Tom!"
-
-She listened intently, but there was no answer. She had no companions
-but silence and loneliness. So she sat down to cry again and upbraid
-herself; and by this time the scholars began to gather again, and she
-had to hide her griefs and still her broken heart and take up the cross
-of a long, dreary, aching afternoon, with none among the strangers
-about her to exchange sorrows with.
-
-
-
-CHAPTER VIII
-
-TOM dodged hither and thither through lanes until he was well out of
-the track of returning scholars, and then fell into a moody jog. He
-crossed a small "branch" two or three times, because of a prevailing
-juvenile superstition that to cross water baffled pursuit. Half an hour
-later he was disappearing behind the Douglas mansion on the summit of
-Cardiff Hill, and the schoolhouse was hardly distinguishable away off
-in the valley behind him. He entered a dense wood, picked his pathless
-way to the centre of it, and sat down on a mossy spot under a spreading
-oak. There was not even a zephyr stirring; the dead noonday heat had
-even stilled the songs of the birds; nature lay in a trance that was
-broken by no sound but the occasional far-off hammering of a
-woodpecker, and this seemed to render the pervading silence and sense
-of loneliness the more profound. The boy's soul was steeped in
-melancholy; his feelings were in happy accord with his surroundings. He
-sat long with his elbows on his knees and his chin in his hands,
-meditating. It seemed to him that life was but a trouble, at best, and
-he more than half envied Jimmy Hodges, so lately released; it must be
-very peaceful, he thought, to lie and slumber and dream forever and
-ever, with the wind whispering through the trees and caressing the
-grass and the flowers over the grave, and nothing to bother and grieve
-about, ever any more. If he only had a clean Sunday-school record he
-could be willing to go, and be done with it all. Now as to this girl.
-What had he done? Nothing. He had meant the best in the world, and been
-treated like a dog--like a very dog. She would be sorry some day--maybe
-when it was too late. Ah, if he could only die TEMPORARILY!
-
-But the elastic heart of youth cannot be compressed into one
-constrained shape long at a time. Tom presently began to drift
-insensibly back into the concerns of this life again. What if he turned
-his back, now, and disappeared mysteriously? What if he went away--ever
-so far away, into unknown countries beyond the seas--and never came
-back any more! How would she feel then! The idea of being a clown
-recurred to him now, only to fill him with disgust. For frivolity and
-jokes and spotted tights were an offense, when they intruded themselves
-upon a spirit that was exalted into the vague august realm of the
-romantic. No, he would be a soldier, and return after long years, all
-war-worn and illustrious. No--better still, he would join the Indians,
-and hunt buffaloes and go on the warpath in the mountain ranges and the
-trackless great plains of the Far West, and away in the future come
-back a great chief, bristling with feathers, hideous with paint, and
-prance into Sunday-school, some drowsy summer morning, with a
-bloodcurdling war-whoop, and sear the eyeballs of all his companions
-with unappeasable envy. But no, there was something gaudier even than
-this. He would be a pirate! That was it! NOW his future lay plain
-before him, and glowing with unimaginable splendor. How his name would
-fill the world, and make people shudder! How gloriously he would go
-plowing the dancing seas, in his long, low, black-hulled racer, the
-Spirit of the Storm, with his grisly flag flying at the fore! And at
-the zenith of his fame, how he would suddenly appear at the old village
-and stalk into church, brown and weather-beaten, in his black velvet
-doublet and trunks, his great jack-boots, his crimson sash, his belt
-bristling with horse-pistols, his crime-rusted cutlass at his side, his
-slouch hat with waving plumes, his black flag unfurled, with the skull
-and crossbones on it, and hear with swelling ecstasy the whisperings,
-"It's Tom Sawyer the Pirate!--the Black Avenger of the Spanish Main!"
-
-Yes, it was settled; his career was determined. He would run away from
-home and enter upon it. He would start the very next morning. Therefore
-he must now begin to get ready. He would collect his resources
-together. He went to a rotten log near at hand and began to dig under
-one end of it with his Barlow knife. He soon struck wood that sounded
-hollow. He put his hand there and uttered this incantation impressively:
-
-"What hasn't come here, come! What's here, stay here!"
-
-Then he scraped away the dirt, and exposed a pine shingle. He took it
-up and disclosed a shapely little treasure-house whose bottom and sides
-were of shingles. In it lay a marble. Tom's astonishment was boundless!
-He scratched his head with a perplexed air, and said:
-
-"Well, that beats anything!"
-
-Then he tossed the marble away pettishly, and stood cogitating. The
-truth was, that a superstition of his had failed, here, which he and
-all his comrades had always looked upon as infallible. If you buried a
-marble with certain necessary incantations, and left it alone a
-fortnight, and then opened the place with the incantation he had just
-used, you would find that all the marbles you had ever lost had
-gathered themselves together there, meantime, no matter how widely they
-had been separated. But now, this thing had actually and unquestionably
-failed. Tom's whole structure of faith was shaken to its foundations.
-He had many a time heard of this thing succeeding but never of its
-failing before. It did not occur to him that he had tried it several
-times before, himself, but could never find the hiding-places
-afterward. He puzzled over the matter some time, and finally decided
-that some witch had interfered and broken the charm. He thought he
-would satisfy himself on that point; so he searched around till he
-found a small sandy spot with a little funnel-shaped depression in it.
-He laid himself down and put his mouth close to this depression and
-called--
-
-"Doodle-bug, doodle-bug, tell me what I want to know! Doodle-bug,
-doodle-bug, tell me what I want to know!"
-
-The sand began to work, and presently a small black bug appeared for a
-second and then darted under again in a fright.
-
-"He dasn't tell! So it WAS a witch that done it. I just knowed it."
-
-He well knew the futility of trying to contend against witches, so he
-gave up discouraged. But it occurred to him that he might as well have
-the marble he had just thrown away, and therefore he went and made a
-patient search for it. But he could not find it. Now he went back to
-his treasure-house and carefully placed himself just as he had been
-standing when he tossed the marble away; then he took another marble
-from his pocket and tossed it in the same way, saying:
-
-"Brother, go find your brother!"
-
-He watched where it stopped, and went there and looked. But it must
-have fallen short or gone too far; so he tried twice more. The last
-repetition was successful. The two marbles lay within a foot of each
-other.
-
-Just here the blast of a toy tin trumpet came faintly down the green
-aisles of the forest. Tom flung off his jacket and trousers, turned a
-suspender into a belt, raked away some brush behind the rotten log,
-disclosing a rude bow and arrow, a lath sword and a tin trumpet, and in
-a moment had seized these things and bounded away, barelegged, with
-fluttering shirt. He presently halted under a great elm, blew an
-answering blast, and then began to tiptoe and look warily out, this way
-and that. He said cautiously--to an imaginary company:
-
-"Hold, my merry men! Keep hid till I blow."
-
-Now appeared Joe Harper, as airily clad and elaborately armed as Tom.
-Tom called:
-
-"Hold! Who comes here into Sherwood Forest without my pass?"
-
-"Guy of Guisborne wants no man's pass. Who art thou that--that--"
-
-"Dares to hold such language," said Tom, prompting--for they talked
-"by the book," from memory.
-
-"Who art thou that dares to hold such language?"
-
-"I, indeed! I am Robin Hood, as thy caitiff carcase soon shall know."
-
-"Then art thou indeed that famous outlaw? Right gladly will I dispute
-with thee the passes of the merry wood. Have at thee!"
-
-They took their lath swords, dumped their other traps on the ground,
-struck a fencing attitude, foot to foot, and began a grave, careful
-combat, "two up and two down." Presently Tom said:
-
-"Now, if you've got the hang, go it lively!"
-
-So they "went it lively," panting and perspiring with the work. By and
-by Tom shouted:
-
-"Fall! fall! Why don't you fall?"
-
-"I sha'n't! Why don't you fall yourself? You're getting the worst of
-it."
-
-"Why, that ain't anything. I can't fall; that ain't the way it is in
-the book. The book says, 'Then with one back-handed stroke he slew poor
-Guy of Guisborne.' You're to turn around and let me hit you in the
-back."
-
-There was no getting around the authorities, so Joe turned, received
-the whack and fell.
-
-"Now," said Joe, getting up, "you got to let me kill YOU. That's fair."
-
-"Why, I can't do that, it ain't in the book."
-
-"Well, it's blamed mean--that's all."
-
-"Well, say, Joe, you can be Friar Tuck or Much the miller's son, and
-lam me with a quarter-staff; or I'll be the Sheriff of Nottingham and
-you be Robin Hood a little while and kill me."
-
-This was satisfactory, and so these adventures were carried out. Then
-Tom became Robin Hood again, and was allowed by the treacherous nun to
-bleed his strength away through his neglected wound. And at last Joe,
-representing a whole tribe of weeping outlaws, dragged him sadly forth,
-gave his bow into his feeble hands, and Tom said, "Where this arrow
-falls, there bury poor Robin Hood under the greenwood tree." Then he
-shot the arrow and fell back and would have died, but he lit on a
-nettle and sprang up too gaily for a corpse.
-
-The boys dressed themselves, hid their accoutrements, and went off
-grieving that there were no outlaws any more, and wondering what modern
-civilization could claim to have done to compensate for their loss.
-They said they would rather be outlaws a year in Sherwood Forest than
-President of the United States forever.
-
-
-
-CHAPTER IX
-
-AT half-past nine, that night, Tom and Sid were sent to bed, as usual.
-They said their prayers, and Sid was soon asleep. Tom lay awake and
-waited, in restless impatience. When it seemed to him that it must be
-nearly daylight, he heard the clock strike ten! This was despair. He
-would have tossed and fidgeted, as his nerves demanded, but he was
-afraid he might wake Sid. So he lay still, and stared up into the dark.
-Everything was dismally still. By and by, out of the stillness, little,
-scarcely perceptible noises began to emphasize themselves. The ticking
-of the clock began to bring itself into notice. Old beams began to
-crack mysteriously. The stairs creaked faintly. Evidently spirits were
-abroad. A measured, muffled snore issued from Aunt Polly's chamber. And
-now the tiresome chirping of a cricket that no human ingenuity could
-locate, began. Next the ghastly ticking of a deathwatch in the wall at
-the bed's head made Tom shudder--it meant that somebody's days were
-numbered. Then the howl of a far-off dog rose on the night air, and was
-answered by a fainter howl from a remoter distance. Tom was in an
-agony. At last he was satisfied that time had ceased and eternity
-begun; he began to doze, in spite of himself; the clock chimed eleven,
-but he did not hear it. And then there came, mingling with his
-half-formed dreams, a most melancholy caterwauling. The raising of a
-neighboring window disturbed him. A cry of "Scat! you devil!" and the
-crash of an empty bottle against the back of his aunt's woodshed
-brought him wide awake, and a single minute later he was dressed and
-out of the window and creeping along the roof of the "ell" on all
-fours. He "meow'd" with caution once or twice, as he went; then jumped
-to the roof of the woodshed and thence to the ground. Huckleberry Finn
-was there, with his dead cat. The boys moved off and disappeared in the
-gloom. At the end of half an hour they were wading through the tall
-grass of the graveyard.
-
-It was a graveyard of the old-fashioned Western kind. It was on a
-hill, about a mile and a half from the village. It had a crazy board
-fence around it, which leaned inward in places, and outward the rest of
-the time, but stood upright nowhere. Grass and weeds grew rank over the
-whole cemetery. All the old graves were sunken in, there was not a
-tombstone on the place; round-topped, worm-eaten boards staggered over
-the graves, leaning for support and finding none. "Sacred to the memory
-of" So-and-So had been painted on them once, but it could no longer
-have been read, on the most of them, now, even if there had been light.
-
-A faint wind moaned through the trees, and Tom feared it might be the
-spirits of the dead, complaining at being disturbed. The boys talked
-little, and only under their breath, for the time and the place and the
-pervading solemnity and silence oppressed their spirits. They found the
-sharp new heap they were seeking, and ensconced themselves within the
-protection of three great elms that grew in a bunch within a few feet
-of the grave.
-
-Then they waited in silence for what seemed a long time. The hooting
-of a distant owl was all the sound that troubled the dead stillness.
-Tom's reflections grew oppressive. He must force some talk. So he said
-in a whisper:
-
-"Hucky, do you believe the dead people like it for us to be here?"
-
-Huckleberry whispered:
-
-"I wisht I knowed. It's awful solemn like, AIN'T it?"
-
-"I bet it is."
-
-There was a considerable pause, while the boys canvassed this matter
-inwardly. Then Tom whispered:
-
-"Say, Hucky--do you reckon Hoss Williams hears us talking?"
-
-"O' course he does. Least his sperrit does."
-
-Tom, after a pause:
-
-"I wish I'd said Mister Williams. But I never meant any harm.
-Everybody calls him Hoss."
-
-"A body can't be too partic'lar how they talk 'bout these-yer dead
-people, Tom."
-
-This was a damper, and conversation died again.
-
-Presently Tom seized his comrade's arm and said:
-
-"Sh!"
-
-"What is it, Tom?" And the two clung together with beating hearts.
-
-"Sh! There 'tis again! Didn't you hear it?"
-
-"I--"
-
-"There! Now you hear it."
-
-"Lord, Tom, they're coming! They're coming, sure. What'll we do?"
-
-"I dono. Think they'll see us?"
-
-"Oh, Tom, they can see in the dark, same as cats. I wisht I hadn't
-come."
-
-"Oh, don't be afeard. I don't believe they'll bother us. We ain't
-doing any harm. If we keep perfectly still, maybe they won't notice us
-at all."
-
-"I'll try to, Tom, but, Lord, I'm all of a shiver."
-
-"Listen!"
-
-The boys bent their heads together and scarcely breathed. A muffled
-sound of voices floated up from the far end of the graveyard.
-
-"Look! See there!" whispered Tom. "What is it?"
-
-"It's devil-fire. Oh, Tom, this is awful."
-
-Some vague figures approached through the gloom, swinging an
-old-fashioned tin lantern that freckled the ground with innumerable
-little spangles of light. Presently Huckleberry whispered with a
-shudder:
-
-"It's the devils sure enough. Three of 'em! Lordy, Tom, we're goners!
-Can you pray?"
-
-"I'll try, but don't you be afeard. They ain't going to hurt us. 'Now
-I lay me down to sleep, I--'"
-
-"Sh!"
-
-"What is it, Huck?"
-
-"They're HUMANS! One of 'em is, anyway. One of 'em's old Muff Potter's
-voice."
-
-"No--'tain't so, is it?"
-
-"I bet I know it. Don't you stir nor budge. He ain't sharp enough to
-notice us. Drunk, the same as usual, likely--blamed old rip!"
-
-"All right, I'll keep still. Now they're stuck. Can't find it. Here
-they come again. Now they're hot. Cold again. Hot again. Red hot!
-They're p'inted right, this time. Say, Huck, I know another o' them
-voices; it's Injun Joe."
-
-"That's so--that murderin' half-breed! I'd druther they was devils a
-dern sight. What kin they be up to?"
-
-The whisper died wholly out, now, for the three men had reached the
-grave and stood within a few feet of the boys' hiding-place.
-
-"Here it is," said the third voice; and the owner of it held the
-lantern up and revealed the face of young Doctor Robinson.
-
-Potter and Injun Joe were carrying a handbarrow with a rope and a
-couple of shovels on it. They cast down their load and began to open
-the grave. The doctor put the lantern at the head of the grave and came
-and sat down with his back against one of the elm trees. He was so
-close the boys could have touched him.
-
-"Hurry, men!" he said, in a low voice; "the moon might come out at any
-moment."
-
-They growled a response and went on digging. For some time there was
-no noise but the grating sound of the spades discharging their freight
-of mould and gravel. It was very monotonous. Finally a spade struck
-upon the coffin with a dull woody accent, and within another minute or
-two the men had hoisted it out on the ground. They pried off the lid
-with their shovels, got out the body and dumped it rudely on the
-ground. The moon drifted from behind the clouds and exposed the pallid
-face. The barrow was got ready and the corpse placed on it, covered
-with a blanket, and bound to its place with the rope. Potter took out a
-large spring-knife and cut off the dangling end of the rope and then
-said:
-
-"Now the cussed thing's ready, Sawbones, and you'll just out with
-another five, or here she stays."
-
-"That's the talk!" said Injun Joe.
-
-"Look here, what does this mean?" said the doctor. "You required your
-pay in advance, and I've paid you."
-
-"Yes, and you done more than that," said Injun Joe, approaching the
-doctor, who was now standing. "Five years ago you drove me away from
-your father's kitchen one night, when I come to ask for something to
-eat, and you said I warn't there for any good; and when I swore I'd get
-even with you if it took a hundred years, your father had me jailed for
-a vagrant. Did you think I'd forget? The Injun blood ain't in me for
-nothing. And now I've GOT you, and you got to SETTLE, you know!"
-
-He was threatening the doctor, with his fist in his face, by this
-time. The doctor struck out suddenly and stretched the ruffian on the
-ground. Potter dropped his knife, and exclaimed:
-
-"Here, now, don't you hit my pard!" and the next moment he had
-grappled with the doctor and the two were struggling with might and
-main, trampling the grass and tearing the ground with their heels.
-Injun Joe sprang to his feet, his eyes flaming with passion, snatched
-up Potter's knife, and went creeping, catlike and stooping, round and
-round about the combatants, seeking an opportunity. All at once the
-doctor flung himself free, seized the heavy headboard of Williams'
-grave and felled Potter to the earth with it--and in the same instant
-the half-breed saw his chance and drove the knife to the hilt in the
-young man's breast. He reeled and fell partly upon Potter, flooding him
-with his blood, and in the same moment the clouds blotted out the
-dreadful spectacle and the two frightened boys went speeding away in
-the dark.
-
-Presently, when the moon emerged again, Injun Joe was standing over
-the two forms, contemplating them. The doctor murmured inarticulately,
-gave a long gasp or two and was still. The half-breed muttered:
-
-"THAT score is settled--damn you."
-
-Then he robbed the body. After which he put the fatal knife in
-Potter's open right hand, and sat down on the dismantled coffin. Three
---four--five minutes passed, and then Potter began to stir and moan. His
-hand closed upon the knife; he raised it, glanced at it, and let it
-fall, with a shudder. Then he sat up, pushing the body from him, and
-gazed at it, and then around him, confusedly. His eyes met Joe's.
-
-"Lord, how is this, Joe?" he said.
-
-"It's a dirty business," said Joe, without moving.
-
-"What did you do it for?"
-
-"I! I never done it!"
-
-"Look here! That kind of talk won't wash."
-
-Potter trembled and grew white.
-
-"I thought I'd got sober. I'd no business to drink to-night. But it's
-in my head yet--worse'n when we started here. I'm all in a muddle;
-can't recollect anything of it, hardly. Tell me, Joe--HONEST, now, old
-feller--did I do it? Joe, I never meant to--'pon my soul and honor, I
-never meant to, Joe. Tell me how it was, Joe. Oh, it's awful--and him
-so young and promising."
-
-"Why, you two was scuffling, and he fetched you one with the headboard
-and you fell flat; and then up you come, all reeling and staggering
-like, and snatched the knife and jammed it into him, just as he fetched
-you another awful clip--and here you've laid, as dead as a wedge til
-now."
-
-"Oh, I didn't know what I was a-doing. I wish I may die this minute if
-I did. It was all on account of the whiskey and the excitement, I
-reckon. I never used a weepon in my life before, Joe. I've fought, but
-never with weepons. They'll all say that. Joe, don't tell! Say you
-won't tell, Joe--that's a good feller. I always liked you, Joe, and
-stood up for you, too. Don't you remember? You WON'T tell, WILL you,
-Joe?" And the poor creature dropped on his knees before the stolid
-murderer, and clasped his appealing hands.
-
-"No, you've always been fair and square with me, Muff Potter, and I
-won't go back on you. There, now, that's as fair as a man can say."
-
-"Oh, Joe, you're an angel. I'll bless you for this the longest day I
-live." And Potter began to cry.
-
-"Come, now, that's enough of that. This ain't any time for blubbering.
-You be off yonder way and I'll go this. Move, now, and don't leave any
-tracks behind you."
-
-Potter started on a trot that quickly increased to a run. The
-half-breed stood looking after him. He muttered:
-
-"If he's as much stunned with the lick and fuddled with the rum as he
-had the look of being, he won't think of the knife till he's gone so
-far he'll be afraid to come back after it to such a place by himself
---chicken-heart!"
-
-Two or three minutes later the murdered man, the blanketed corpse, the
-lidless coffin, and the open grave were under no inspection but the
-moon's. The stillness was complete again, too.
-
-
-
-CHAPTER X
-
-THE two boys flew on and on, toward the village, speechless with
-horror. They glanced backward over their shoulders from time to time,
-apprehensively, as if they feared they might be followed. Every stump
-that started up in their path seemed a man and an enemy, and made them
-catch their breath; and as they sped by some outlying cottages that lay
-near the village, the barking of the aroused watch-dogs seemed to give
-wings to their feet.
-
-"If we can only get to the old tannery before we break down!"
-whispered Tom, in short catches between breaths. "I can't stand it much
-longer."
-
-Huckleberry's hard pantings were his only reply, and the boys fixed
-their eyes on the goal of their hopes and bent to their work to win it.
-They gained steadily on it, and at last, breast to breast, they burst
-through the open door and fell grateful and exhausted in the sheltering
-shadows beyond. By and by their pulses slowed down, and Tom whispered:
-
-"Huckleberry, what do you reckon'll come of this?"
-
-"If Doctor Robinson dies, I reckon hanging'll come of it."
-
-"Do you though?"
-
-"Why, I KNOW it, Tom."
-
-Tom thought a while, then he said:
-
-"Who'll tell? We?"
-
-"What are you talking about? S'pose something happened and Injun Joe
-DIDN'T hang? Why, he'd kill us some time or other, just as dead sure as
-we're a laying here."
-
-"That's just what I was thinking to myself, Huck."
-
-"If anybody tells, let Muff Potter do it, if he's fool enough. He's
-generally drunk enough."
-
-Tom said nothing--went on thinking. Presently he whispered:
-
-"Huck, Muff Potter don't know it. How can he tell?"
-
-"What's the reason he don't know it?"
-
-"Because he'd just got that whack when Injun Joe done it. D'you reckon
-he could see anything? D'you reckon he knowed anything?"
-
-"By hokey, that's so, Tom!"
-
-"And besides, look-a-here--maybe that whack done for HIM!"
-
-"No, 'taint likely, Tom. He had liquor in him; I could see that; and
-besides, he always has. Well, when pap's full, you might take and belt
-him over the head with a church and you couldn't phase him. He says so,
-his own self. So it's the same with Muff Potter, of course. But if a
-man was dead sober, I reckon maybe that whack might fetch him; I dono."
-
-After another reflective silence, Tom said:
-
-"Hucky, you sure you can keep mum?"
-
-"Tom, we GOT to keep mum. You know that. That Injun devil wouldn't
-make any more of drownding us than a couple of cats, if we was to
-squeak 'bout this and they didn't hang him. Now, look-a-here, Tom, less
-take and swear to one another--that's what we got to do--swear to keep
-mum."
-
-"I'm agreed. It's the best thing. Would you just hold hands and swear
-that we--"
-
-"Oh no, that wouldn't do for this. That's good enough for little
-rubbishy common things--specially with gals, cuz THEY go back on you
-anyway, and blab if they get in a huff--but there orter be writing
-'bout a big thing like this. And blood."
-
-Tom's whole being applauded this idea. It was deep, and dark, and
-awful; the hour, the circumstances, the surroundings, were in keeping
-with it. He picked up a clean pine shingle that lay in the moonlight,
-took a little fragment of "red keel" out of his pocket, got the moon on
-his work, and painfully scrawled these lines, emphasizing each slow
-down-stroke by clamping his tongue between his teeth, and letting up
-the pressure on the up-strokes. [See next page.]
-
-   "Huck Finn and
-    Tom Sawyer swears
-    they will keep mum
-    about This and They
-    wish They may Drop
-    down dead in Their
-    Tracks if They ever
-    Tell and Rot."
-
-Huckleberry was filled with admiration of Tom's facility in writing,
-and the sublimity of his language. He at once took a pin from his lapel
-and was going to prick his flesh, but Tom said:
-
-"Hold on! Don't do that. A pin's brass. It might have verdigrease on
-it."
-
-"What's verdigrease?"
-
-"It's p'ison. That's what it is. You just swaller some of it once
---you'll see."
-
-So Tom unwound the thread from one of his needles, and each boy
-pricked the ball of his thumb and squeezed out a drop of blood. In
-time, after many squeezes, Tom managed to sign his initials, using the
-ball of his little finger for a pen. Then he showed Huckleberry how to
-make an H and an F, and the oath was complete. They buried the shingle
-close to the wall, with some dismal ceremonies and incantations, and
-the fetters that bound their tongues were considered to be locked and
-the key thrown away.
-
-A figure crept stealthily through a break in the other end of the
-ruined building, now, but they did not notice it.
-
-"Tom," whispered Huckleberry, "does this keep us from EVER telling
---ALWAYS?"
-
-"Of course it does. It don't make any difference WHAT happens, we got
-to keep mum. We'd drop down dead--don't YOU know that?"
-
-"Yes, I reckon that's so."
-
-They continued to whisper for some little time. Presently a dog set up
-a long, lugubrious howl just outside--within ten feet of them. The boys
-clasped each other suddenly, in an agony of fright.
-
-"Which of us does he mean?" gasped Huckleberry.
-
-"I dono--peep through the crack. Quick!"
-
-"No, YOU, Tom!"
-
-"I can't--I can't DO it, Huck!"
-
-"Please, Tom. There 'tis again!"
-
-"Oh, lordy, I'm thankful!" whispered Tom. "I know his voice. It's Bull
-Harbison." *
-
-[* If Mr. Harbison owned a slave named Bull, Tom would have spoken of
-him as "Harbison's Bull," but a son or a dog of that name was "Bull
-Harbison."]
-
-"Oh, that's good--I tell you, Tom, I was most scared to death; I'd a
-bet anything it was a STRAY dog."
-
-The dog howled again. The boys' hearts sank once more.
-
-"Oh, my! that ain't no Bull Harbison!" whispered Huckleberry. "DO, Tom!"
-
-Tom, quaking with fear, yielded, and put his eye to the crack. His
-whisper was hardly audible when he said:
-
-"Oh, Huck, IT S A STRAY DOG!"
-
-"Quick, Tom, quick! Who does he mean?"
-
-"Huck, he must mean us both--we're right together."
-
-"Oh, Tom, I reckon we're goners. I reckon there ain't no mistake 'bout
-where I'LL go to. I been so wicked."
-
-"Dad fetch it! This comes of playing hookey and doing everything a
-feller's told NOT to do. I might a been good, like Sid, if I'd a tried
---but no, I wouldn't, of course. But if ever I get off this time, I lay
-I'll just WALLER in Sunday-schools!" And Tom began to snuffle a little.
-
-"YOU bad!" and Huckleberry began to snuffle too. "Consound it, Tom
-Sawyer, you're just old pie, 'longside o' what I am. Oh, LORDY, lordy,
-lordy, I wisht I only had half your chance."
-
-Tom choked off and whispered:
-
-"Look, Hucky, look! He's got his BACK to us!"
-
-Hucky looked, with joy in his heart.
-
-"Well, he has, by jingoes! Did he before?"
-
-"Yes, he did. But I, like a fool, never thought. Oh, this is bully,
-you know. NOW who can he mean?"
-
-The howling stopped. Tom pricked up his ears.
-
-"Sh! What's that?" he whispered.
-
-"Sounds like--like hogs grunting. No--it's somebody snoring, Tom."
-
-"That IS it! Where 'bouts is it, Huck?"
-
-"I bleeve it's down at 'tother end. Sounds so, anyway. Pap used to
-sleep there, sometimes, 'long with the hogs, but laws bless you, he
-just lifts things when HE snores. Besides, I reckon he ain't ever
-coming back to this town any more."
-
-The spirit of adventure rose in the boys' souls once more.
-
-"Hucky, do you das't to go if I lead?"
-
-"I don't like to, much. Tom, s'pose it's Injun Joe!"
-
-Tom quailed. But presently the temptation rose up strong again and the
-boys agreed to try, with the understanding that they would take to
-their heels if the snoring stopped. So they went tiptoeing stealthily
-down, the one behind the other. When they had got to within five steps
-of the snorer, Tom stepped on a stick, and it broke with a sharp snap.
-The man moaned, writhed a little, and his face came into the moonlight.
-It was Muff Potter. The boys' hearts had stood still, and their hopes
-too, when the man moved, but their fears passed away now. They tiptoed
-out, through the broken weather-boarding, and stopped at a little
-distance to exchange a parting word. That long, lugubrious howl rose on
-the night air again! They turned and saw the strange dog standing
-within a few feet of where Potter was lying, and FACING Potter, with
-his nose pointing heavenward.
-
-"Oh, geeminy, it's HIM!" exclaimed both boys, in a breath.
-
-"Say, Tom--they say a stray dog come howling around Johnny Miller's
-house, 'bout midnight, as much as two weeks ago; and a whippoorwill
-come in and lit on the banisters and sung, the very same evening; and
-there ain't anybody dead there yet."
-
-"Well, I know that. And suppose there ain't. Didn't Gracie Miller fall
-in the kitchen fire and burn herself terrible the very next Saturday?"
-
-"Yes, but she ain't DEAD. And what's more, she's getting better, too."
-
-"All right, you wait and see. She's a goner, just as dead sure as Muff
-Potter's a goner. That's what the niggers say, and they know all about
-these kind of things, Huck."
-
-Then they separated, cogitating. When Tom crept in at his bedroom
-window the night was almost spent. He undressed with excessive caution,
-and fell asleep congratulating himself that nobody knew of his
-escapade. He was not aware that the gently-snoring Sid was awake, and
-had been so for an hour.
-
-When Tom awoke, Sid was dressed and gone. There was a late look in the
-light, a late sense in the atmosphere. He was startled. Why had he not
-been called--persecuted till he was up, as usual? The thought filled
-him with bodings. Within five minutes he was dressed and down-stairs,
-feeling sore and drowsy. The family were still at table, but they had
-finished breakfast. There was no voice of rebuke; but there were
-averted eyes; there was a silence and an air of solemnity that struck a
-chill to the culprit's heart. He sat down and tried to seem gay, but it
-was up-hill work; it roused no smile, no response, and he lapsed into
-silence and let his heart sink down to the depths.
-
-After breakfast his aunt took him aside, and Tom almost brightened in
-the hope that he was going to be flogged; but it was not so. His aunt
-wept over him and asked him how he could go and break her old heart so;
-and finally told him to go on, and ruin himself and bring her gray
-hairs with sorrow to the grave, for it was no use for her to try any
-more. This was worse than a thousand whippings, and Tom's heart was
-sorer now than his body. He cried, he pleaded for forgiveness, promised
-to reform over and over again, and then received his dismissal, feeling
-that he had won but an imperfect forgiveness and established but a
-feeble confidence.
-
-He left the presence too miserable to even feel revengeful toward Sid;
-and so the latter's prompt retreat through the back gate was
-unnecessary. He moped to school gloomy and sad, and took his flogging,
-along with Joe Harper, for playing hookey the day before, with the air
-of one whose heart was busy with heavier woes and wholly dead to
-trifles. Then he betook himself to his seat, rested his elbows on his
-desk and his jaws in his hands, and stared at the wall with the stony
-stare of suffering that has reached the limit and can no further go.
-His elbow was pressing against some hard substance. After a long time
-he slowly and sadly changed his position, and took up this object with
-a sigh. It was in a paper. He unrolled it. A long, lingering, colossal
-sigh followed, and his heart broke. It was his brass andiron knob!
-
-This final feather broke the camel's back.
-
-
-
-CHAPTER XI
-
-CLOSE upon the hour of noon the whole village was suddenly electrified
-with the ghastly news. No need of the as yet undreamed-of telegraph;
-the tale flew from man to man, from group to group, from house to
-house, with little less than telegraphic speed. Of course the
-schoolmaster gave holiday for that afternoon; the town would have
-thought strangely of him if he had not.
-
-A gory knife had been found close to the murdered man, and it had been
-recognized by somebody as belonging to Muff Potter--so the story ran.
-And it was said that a belated citizen had come upon Potter washing
-himself in the "branch" about one or two o'clock in the morning, and
-that Potter had at once sneaked off--suspicious circumstances,
-especially the washing which was not a habit with Potter. It was also
-said that the town had been ransacked for this "murderer" (the public
-are not slow in the matter of sifting evidence and arriving at a
-verdict), but that he could not be found. Horsemen had departed down
-all the roads in every direction, and the Sheriff "was confident" that
-he would be captured before night.
-
-All the town was drifting toward the graveyard. Tom's heartbreak
-vanished and he joined the procession, not because he would not a
-thousand times rather go anywhere else, but because an awful,
-unaccountable fascination drew him on. Arrived at the dreadful place,
-he wormed his small body through the crowd and saw the dismal
-spectacle. It seemed to him an age since he was there before. Somebody
-pinched his arm. He turned, and his eyes met Huckleberry's. Then both
-looked elsewhere at once, and wondered if anybody had noticed anything
-in their mutual glance. But everybody was talking, and intent upon the
-grisly spectacle before them.
-
-"Poor fellow!" "Poor young fellow!" "This ought to be a lesson to
-grave robbers!" "Muff Potter'll hang for this if they catch him!" This
-was the drift of remark; and the minister said, "It was a judgment; His
-hand is here."
-
-Now Tom shivered from head to heel; for his eye fell upon the stolid
-face of Injun Joe. At this moment the crowd began to sway and struggle,
-and voices shouted, "It's him! it's him! he's coming himself!"
-
-"Who? Who?" from twenty voices.
-
-"Muff Potter!"
-
-"Hallo, he's stopped!--Look out, he's turning! Don't let him get away!"
-
-People in the branches of the trees over Tom's head said he wasn't
-trying to get away--he only looked doubtful and perplexed.
-
-"Infernal impudence!" said a bystander; "wanted to come and take a
-quiet look at his work, I reckon--didn't expect any company."
-
-The crowd fell apart, now, and the Sheriff came through,
-ostentatiously leading Potter by the arm. The poor fellow's face was
-haggard, and his eyes showed the fear that was upon him. When he stood
-before the murdered man, he shook as with a palsy, and he put his face
-in his hands and burst into tears.
-
-"I didn't do it, friends," he sobbed; "'pon my word and honor I never
-done it."
-
-"Who's accused you?" shouted a voice.
-
-This shot seemed to carry home. Potter lifted his face and looked
-around him with a pathetic hopelessness in his eyes. He saw Injun Joe,
-and exclaimed:
-
-"Oh, Injun Joe, you promised me you'd never--"
-
-"Is that your knife?" and it was thrust before him by the Sheriff.
-
-Potter would have fallen if they had not caught him and eased him to
-the ground. Then he said:
-
-"Something told me 't if I didn't come back and get--" He shuddered;
-then waved his nerveless hand with a vanquished gesture and said, "Tell
-'em, Joe, tell 'em--it ain't any use any more."
-
-Then Huckleberry and Tom stood dumb and staring, and heard the
-stony-hearted liar reel off his serene statement, they expecting every
-moment that the clear sky would deliver God's lightnings upon his head,
-and wondering to see how long the stroke was delayed. And when he had
-finished and still stood alive and whole, their wavering impulse to
-break their oath and save the poor betrayed prisoner's life faded and
-vanished away, for plainly this miscreant had sold himself to Satan and
-it would be fatal to meddle with the property of such a power as that.
-
-"Why didn't you leave? What did you want to come here for?" somebody
-said.
-
-"I couldn't help it--I couldn't help it," Potter moaned. "I wanted to
-run away, but I couldn't seem to come anywhere but here." And he fell
-to sobbing again.
-
-Injun Joe repeated his statement, just as calmly, a few minutes
-afterward on the inquest, under oath; and the boys, seeing that the
-lightnings were still withheld, were confirmed in their belief that Joe
-had sold himself to the devil. He was now become, to them, the most
-balefully interesting object they had ever looked upon, and they could
-not take their fascinated eyes from his face.
-
-They inwardly resolved to watch him nights, when opportunity should
-offer, in the hope of getting a glimpse of his dread master.
-
-Injun Joe helped to raise the body of the murdered man and put it in a
-wagon for removal; and it was whispered through the shuddering crowd
-that the wound bled a little! The boys thought that this happy
-circumstance would turn suspicion in the right direction; but they were
-disappointed, for more than one villager remarked:
-
-"It was within three feet of Muff Potter when it done it."
-
-Tom's fearful secret and gnawing conscience disturbed his sleep for as
-much as a week after this; and at breakfast one morning Sid said:
-
-"Tom, you pitch around and talk in your sleep so much that you keep me
-awake half the time."
-
-Tom blanched and dropped his eyes.
-
-"It's a bad sign," said Aunt Polly, gravely. "What you got on your
-mind, Tom?"
-
-"Nothing. Nothing 't I know of." But the boy's hand shook so that he
-spilled his coffee.
-
-"And you do talk such stuff," Sid said. "Last night you said, 'It's
-blood, it's blood, that's what it is!' You said that over and over. And
-you said, 'Don't torment me so--I'll tell!' Tell WHAT? What is it
-you'll tell?"
-
-Everything was swimming before Tom. There is no telling what might
-have happened, now, but luckily the concern passed out of Aunt Polly's
-face and she came to Tom's relief without knowing it. She said:
-
-"Sho! It's that dreadful murder. I dream about it most every night
-myself. Sometimes I dream it's me that done it."
-
-Mary said she had been affected much the same way. Sid seemed
-satisfied. Tom got out of the presence as quick as he plausibly could,
-and after that he complained of toothache for a week, and tied up his
-jaws every night. He never knew that Sid lay nightly watching, and
-frequently slipped the bandage free and then leaned on his elbow
-listening a good while at a time, and afterward slipped the bandage
-back to its place again. Tom's distress of mind wore off gradually and
-the toothache grew irksome and was discarded. If Sid really managed to
-make anything out of Tom's disjointed mutterings, he kept it to himself.
-
-It seemed to Tom that his schoolmates never would get done holding
-inquests on dead cats, and thus keeping his trouble present to his
-mind. Sid noticed that Tom never was coroner at one of these inquiries,
-though it had been his habit to take the lead in all new enterprises;
-he noticed, too, that Tom never acted as a witness--and that was
-strange; and Sid did not overlook the fact that Tom even showed a
-marked aversion to these inquests, and always avoided them when he
-could. Sid marvelled, but said nothing. However, even inquests went out
-of vogue at last, and ceased to torture Tom's conscience.
-
-Every day or two, during this time of sorrow, Tom watched his
-opportunity and went to the little grated jail-window and smuggled such
-small comforts through to the "murderer" as he could get hold of. The
-jail was a trifling little brick den that stood in a marsh at the edge
-of the village, and no guards were afforded for it; indeed, it was
-seldom occupied. These offerings greatly helped to ease Tom's
-conscience.
-
-The villagers had a strong desire to tar-and-feather Injun Joe and
-ride him on a rail, for body-snatching, but so formidable was his
-character that nobody could be found who was willing to take the lead
-in the matter, so it was dropped. He had been careful to begin both of
-his inquest-statements with the fight, without confessing the
-grave-robbery that preceded it; therefore it was deemed wisest not
-to try the case in the courts at present.
-
-
-
-CHAPTER XII
-
-ONE of the reasons why Tom's mind had drifted away from its secret
-troubles was, that it had found a new and weighty matter to interest
-itself about. Becky Thatcher had stopped coming to school. Tom had
-struggled with his pride a few days, and tried to "whistle her down the
-wind," but failed. He began to find himself hanging around her father's
-house, nights, and feeling very miserable. She was ill. What if she
-should die! There was distraction in the thought. He no longer took an
-interest in war, nor even in piracy. The charm of life was gone; there
-was nothing but dreariness left. He put his hoop away, and his bat;
-there was no joy in them any more. His aunt was concerned. She began to
-try all manner of remedies on him. She was one of those people who are
-infatuated with patent medicines and all new-fangled methods of
-producing health or mending it. She was an inveterate experimenter in
-these things. When something fresh in this line came out she was in a
-fever, right away, to try it; not on herself, for she was never ailing,
-but on anybody else that came handy. She was a subscriber for all the
-"Health" periodicals and phrenological frauds; and the solemn ignorance
-they were inflated with was breath to her nostrils. All the "rot" they
-contained about ventilation, and how to go to bed, and how to get up,
-and what to eat, and what to drink, and how much exercise to take, and
-what frame of mind to keep one's self in, and what sort of clothing to
-wear, was all gospel to her, and she never observed that her
-health-journals of the current month customarily upset everything they
-had recommended the month before. She was as simple-hearted and honest
-as the day was long, and so she was an easy victim. She gathered
-together her quack periodicals and her quack medicines, and thus armed
-with death, went about on her pale horse, metaphorically speaking, with
-"hell following after." But she never suspected that she was not an
-angel of healing and the balm of Gilead in disguise, to the suffering
-neighbors.
-
-The water treatment was new, now, and Tom's low condition was a
-windfall to her. She had him out at daylight every morning, stood him
-up in the woodshed and drowned him with a deluge of cold water; then
-she scrubbed him down with a towel like a file, and so brought him to;
-then she rolled him up in a wet sheet and put him away under blankets
-till she sweated his soul clean and "the yellow stains of it came
-through his pores"--as Tom said.
-
-Yet notwithstanding all this, the boy grew more and more melancholy
-and pale and dejected. She added hot baths, sitz baths, shower baths,
-and plunges. The boy remained as dismal as a hearse. She began to
-assist the water with a slim oatmeal diet and blister-plasters. She
-calculated his capacity as she would a jug's, and filled him up every
-day with quack cure-alls.
-
-Tom had become indifferent to persecution by this time. This phase
-filled the old lady's heart with consternation. This indifference must
-be broken up at any cost. Now she heard of Pain-killer for the first
-time. She ordered a lot at once. She tasted it and was filled with
-gratitude. It was simply fire in a liquid form. She dropped the water
-treatment and everything else, and pinned her faith to Pain-killer. She
-gave Tom a teaspoonful and watched with the deepest anxiety for the
-result. Her troubles were instantly at rest, her soul at peace again;
-for the "indifference" was broken up. The boy could not have shown a
-wilder, heartier interest, if she had built a fire under him.
-
-Tom felt that it was time to wake up; this sort of life might be
-romantic enough, in his blighted condition, but it was getting to have
-too little sentiment and too much distracting variety about it. So he
-thought over various plans for relief, and finally hit pon that of
-professing to be fond of Pain-killer. He asked for it so often that he
-became a nuisance, and his aunt ended by telling him to help himself
-and quit bothering her. If it had been Sid, she would have had no
-misgivings to alloy her delight; but since it was Tom, she watched the
-bottle clandestinely. She found that the medicine did really diminish,
-but it did not occur to her that the boy was mending the health of a
-crack in the sitting-room floor with it.
-
-One day Tom was in the act of dosing the crack when his aunt's yellow
-cat came along, purring, eying the teaspoon avariciously, and begging
-for a taste. Tom said:
-
-"Don't ask for it unless you want it, Peter."
-
-But Peter signified that he did want it.
-
-"You better make sure."
-
-Peter was sure.
-
-"Now you've asked for it, and I'll give it to you, because there ain't
-anything mean about me; but if you find you don't like it, you mustn't
-blame anybody but your own self."
-
-Peter was agreeable. So Tom pried his mouth open and poured down the
-Pain-killer. Peter sprang a couple of yards in the air, and then
-delivered a war-whoop and set off round and round the room, banging
-against furniture, upsetting flower-pots, and making general havoc.
-Next he rose on his hind feet and pranced around, in a frenzy of
-enjoyment, with his head over his shoulder and his voice proclaiming
-his unappeasable happiness. Then he went tearing around the house again
-spreading chaos and destruction in his path. Aunt Polly entered in time
-to see him throw a few double summersets, deliver a final mighty
-hurrah, and sail through the open window, carrying the rest of the
-flower-pots with him. The old lady stood petrified with astonishment,
-peering over her glasses; Tom lay on the floor expiring with laughter.
-
-"Tom, what on earth ails that cat?"
-
-"I don't know, aunt," gasped the boy.
-
-"Why, I never see anything like it. What did make him act so?"
-
-"Deed I don't know, Aunt Polly; cats always act so when they're having
-a good time."
-
-"They do, do they?" There was something in the tone that made Tom
-apprehensive.
-
-"Yes'm. That is, I believe they do."
-
-"You DO?"
-
-"Yes'm."
-
-The old lady was bending down, Tom watching, with interest emphasized
-by anxiety. Too late he divined her "drift." The handle of the telltale
-teaspoon was visible under the bed-valance. Aunt Polly took it, held it
-up. Tom winced, and dropped his eyes. Aunt Polly raised him by the
-usual handle--his ear--and cracked his head soundly with her thimble.
-
-"Now, sir, what did you want to treat that poor dumb beast so, for?"
-
-"I done it out of pity for him--because he hadn't any aunt."
-
-"Hadn't any aunt!--you numskull. What has that got to do with it?"
-
-"Heaps. Because if he'd had one she'd a burnt him out herself! She'd a
-roasted his bowels out of him 'thout any more feeling than if he was a
-human!"
-
-Aunt Polly felt a sudden pang of remorse. This was putting the thing
-in a new light; what was cruelty to a cat MIGHT be cruelty to a boy,
-too. She began to soften; she felt sorry. Her eyes watered a little,
-and she put her hand on Tom's head and said gently:
-
-"I was meaning for the best, Tom. And, Tom, it DID do you good."
-
-Tom looked up in her face with just a perceptible twinkle peeping
-through his gravity.
-
-"I know you was meaning for the best, aunty, and so was I with Peter.
-It done HIM good, too. I never see him get around so since--"
-
-"Oh, go 'long with you, Tom, before you aggravate me again. And you
-try and see if you can't be a good boy, for once, and you needn't take
-any more medicine."
-
-Tom reached school ahead of time. It was noticed that this strange
-thing had been occurring every day latterly. And now, as usual of late,
-he hung about the gate of the schoolyard instead of playing with his
-comrades. He was sick, he said, and he looked it. He tried to seem to
-be looking everywhere but whither he really was looking--down the road.
-Presently Jeff Thatcher hove in sight, and Tom's face lighted; he gazed
-a moment, and then turned sorrowfully away. When Jeff arrived, Tom
-accosted him; and "led up" warily to opportunities for remark about
-Becky, but the giddy lad never could see the bait. Tom watched and
-watched, hoping whenever a frisking frock came in sight, and hating the
-owner of it as soon as he saw she was not the right one. At last frocks
-ceased to appear, and he dropped hopelessly into the dumps; he entered
-the empty schoolhouse and sat down to suffer. Then one more frock
-passed in at the gate, and Tom's heart gave a great bound. The next
-instant he was out, and "going on" like an Indian; yelling, laughing,
-chasing boys, jumping over the fence at risk of life and limb, throwing
-handsprings, standing on his head--doing all the heroic things he could
-conceive of, and keeping a furtive eye out, all the while, to see if
-Becky Thatcher was noticing. But she seemed to be unconscious of it
-all; she never looked. Could it be possible that she was not aware that
-he was there? He carried his exploits to her immediate vicinity; came
-war-whooping around, snatched a boy's cap, hurled it to the roof of the
-schoolhouse, broke through a group of boys, tumbling them in every
-direction, and fell sprawling, himself, under Becky's nose, almost
-upsetting her--and she turned, with her nose in the air, and he heard
-her say: "Mf! some people think they're mighty smart--always showing
-off!"
-
-Tom's cheeks burned. He gathered himself up and sneaked off, crushed
-and crestfallen.
-
-
-
-CHAPTER XIII
-
-TOM'S mind was made up now. He was gloomy and desperate. He was a
-forsaken, friendless boy, he said; nobody loved him; when they found
-out what they had driven him to, perhaps they would be sorry; he had
-tried to do right and get along, but they would not let him; since
-nothing would do them but to be rid of him, let it be so; and let them
-blame HIM for the consequences--why shouldn't they? What right had the
-friendless to complain? Yes, they had forced him to it at last: he
-would lead a life of crime. There was no choice.
-
-By this time he was far down Meadow Lane, and the bell for school to
-"take up" tinkled faintly upon his ear. He sobbed, now, to think he
-should never, never hear that old familiar sound any more--it was very
-hard, but it was forced on him; since he was driven out into the cold
-world, he must submit--but he forgave them. Then the sobs came thick
-and fast.
-
-Just at this point he met his soul's sworn comrade, Joe Harper
---hard-eyed, and with evidently a great and dismal purpose in his heart.
-Plainly here were "two souls with but a single thought." Tom, wiping
-his eyes with his sleeve, began to blubber out something about a
-resolution to escape from hard usage and lack of sympathy at home by
-roaming abroad into the great world never to return; and ended by
-hoping that Joe would not forget him.
-
-But it transpired that this was a request which Joe had just been
-going to make of Tom, and had come to hunt him up for that purpose. His
-mother had whipped him for drinking some cream which he had never
-tasted and knew nothing about; it was plain that she was tired of him
-and wished him to go; if she felt that way, there was nothing for him
-to do but succumb; he hoped she would be happy, and never regret having
-driven her poor boy out into the unfeeling world to suffer and die.
-
-As the two boys walked sorrowing along, they made a new compact to
-stand by each other and be brothers and never separate till death
-relieved them of their troubles. Then they began to lay their plans.
-Joe was for being a hermit, and living on crusts in a remote cave, and
-dying, some time, of cold and want and grief; but after listening to
-Tom, he conceded that there were some conspicuous advantages about a
-life of crime, and so he consented to be a pirate.
-
-Three miles below St. Petersburg, at a point where the Mississippi
-River was a trifle over a mile wide, there was a long, narrow, wooded
-island, with a shallow bar at the head of it, and this offered well as
-a rendezvous. It was not inhabited; it lay far over toward the further
-shore, abreast a dense and almost wholly unpeopled forest. So Jackson's
-Island was chosen. Who were to be the subjects of their piracies was a
-matter that did not occur to them. Then they hunted up Huckleberry
-Finn, and he joined them promptly, for all careers were one to him; he
-was indifferent. They presently separated to meet at a lonely spot on
-the river-bank two miles above the village at the favorite hour--which
-was midnight. There was a small log raft there which they meant to
-capture. Each would bring hooks and lines, and such provision as he
-could steal in the most dark and mysterious way--as became outlaws. And
-before the afternoon was done, they had all managed to enjoy the sweet
-glory of spreading the fact that pretty soon the town would "hear
-something." All who got this vague hint were cautioned to "be mum and
-wait."
-
-About midnight Tom arrived with a boiled ham and a few trifles,
-and stopped in a dense undergrowth on a small bluff overlooking the
-meeting-place. It was starlight, and very still. The mighty river lay
-like an ocean at rest. Tom listened a moment, but no sound disturbed the
-quiet. Then he gave a low, distinct whistle. It was answered from under
-the bluff. Tom whistled twice more; these signals were answered in the
-same way. Then a guarded voice said:
-
-"Who goes there?"
-
-"Tom Sawyer, the Black Avenger of the Spanish Main. Name your names."
-
-"Huck Finn the Red-Handed, and Joe Harper the Terror of the Seas." Tom
-had furnished these titles, from his favorite literature.
-
-"'Tis well. Give the countersign."
-
-Two hoarse whispers delivered the same awful word simultaneously to
-the brooding night:
-
-"BLOOD!"
-
-Then Tom tumbled his ham over the bluff and let himself down after it,
-tearing both skin and clothes to some extent in the effort. There was
-an easy, comfortable path along the shore under the bluff, but it
-lacked the advantages of difficulty and danger so valued by a pirate.
-
-The Terror of the Seas had brought a side of bacon, and had about worn
-himself out with getting it there. Finn the Red-Handed had stolen a
-skillet and a quantity of half-cured leaf tobacco, and had also brought
-a few corn-cobs to make pipes with. But none of the pirates smoked or
-"chewed" but himself. The Black Avenger of the Spanish Main said it
-would never do to start without some fire. That was a wise thought;
-matches were hardly known there in that day. They saw a fire
-smouldering upon a great raft a hundred yards above, and they went
-stealthily thither and helped themselves to a chunk. They made an
-imposing adventure of it, saying, "Hist!" every now and then, and
-suddenly halting with finger on lip; moving with hands on imaginary
-dagger-hilts; and giving orders in dismal whispers that if "the foe"
-stirred, to "let him have it to the hilt," because "dead men tell no
-tales." They knew well enough that the raftsmen were all down at the
-village laying in stores or having a spree, but still that was no
-excuse for their conducting this thing in an unpiratical way.
-
-They shoved off, presently, Tom in command, Huck at the after oar and
-Joe at the forward. Tom stood amidships, gloomy-browed, and with folded
-arms, and gave his orders in a low, stern whisper:
-
-"Luff, and bring her to the wind!"
-
-"Aye-aye, sir!"
-
-"Steady, steady-y-y-y!"
-
-"Steady it is, sir!"
-
-"Let her go off a point!"
-
-"Point it is, sir!"
-
-As the boys steadily and monotonously drove the raft toward mid-stream
-it was no doubt understood that these orders were given only for
-"style," and were not intended to mean anything in particular.
-
-"What sail's she carrying?"
-
-"Courses, tops'ls, and flying-jib, sir."
-
-"Send the r'yals up! Lay out aloft, there, half a dozen of ye
---foretopmaststuns'l! Lively, now!"
-
-"Aye-aye, sir!"
-
-"Shake out that maintogalans'l! Sheets and braces! NOW my hearties!"
-
-"Aye-aye, sir!"
-
-"Hellum-a-lee--hard a port! Stand by to meet her when she comes! Port,
-port! NOW, men! With a will! Stead-y-y-y!"
-
-"Steady it is, sir!"
-
-The raft drew beyond the middle of the river; the boys pointed her
-head right, and then lay on their oars. The river was not high, so
-there was not more than a two or three mile current. Hardly a word was
-said during the next three-quarters of an hour. Now the raft was
-passing before the distant town. Two or three glimmering lights showed
-where it lay, peacefully sleeping, beyond the vague vast sweep of
-star-gemmed water, unconscious of the tremendous event that was happening.
-The Black Avenger stood still with folded arms, "looking his last" upon
-the scene of his former joys and his later sufferings, and wishing
-"she" could see him now, abroad on the wild sea, facing peril and death
-with dauntless heart, going to his doom with a grim smile on his lips.
-It was but a small strain on his imagination to remove Jackson's Island
-beyond eyeshot of the village, and so he "looked his last" with a
-broken and satisfied heart. The other pirates were looking their last,
-too; and they all looked so long that they came near letting the
-current drift them out of the range of the island. But they discovered
-the danger in time, and made shift to avert it. About two o'clock in
-the morning the raft grounded on the bar two hundred yards above the
-head of the island, and they waded back and forth until they had landed
-their freight. Part of the little raft's belongings consisted of an old
-sail, and this they spread over a nook in the bushes for a tent to
-shelter their provisions; but they themselves would sleep in the open
-air in good weather, as became outlaws.
-
-They built a fire against the side of a great log twenty or thirty
-steps within the sombre depths of the forest, and then cooked some
-bacon in the frying-pan for supper, and used up half of the corn "pone"
-stock they had brought. It seemed glorious sport to be feasting in that
-wild, free way in the virgin forest of an unexplored and uninhabited
-island, far from the haunts of men, and they said they never would
-return to civilization. The climbing fire lit up their faces and threw
-its ruddy glare upon the pillared tree-trunks of their forest temple,
-and upon the varnished foliage and festooning vines.
-
-When the last crisp slice of bacon was gone, and the last allowance of
-corn pone devoured, the boys stretched themselves out on the grass,
-filled with contentment. They could have found a cooler place, but they
-would not deny themselves such a romantic feature as the roasting
-camp-fire.
-
-"AIN'T it gay?" said Joe.
-
-"It's NUTS!" said Tom. "What would the boys say if they could see us?"
-
-"Say? Well, they'd just die to be here--hey, Hucky!"
-
-"I reckon so," said Huckleberry; "anyways, I'm suited. I don't want
-nothing better'n this. I don't ever get enough to eat, gen'ally--and
-here they can't come and pick at a feller and bullyrag him so."
-
-"It's just the life for me," said Tom. "You don't have to get up,
-mornings, and you don't have to go to school, and wash, and all that
-blame foolishness. You see a pirate don't have to do ANYTHING, Joe,
-when he's ashore, but a hermit HE has to be praying considerable, and
-then he don't have any fun, anyway, all by himself that way."
-
-"Oh yes, that's so," said Joe, "but I hadn't thought much about it,
-you know. I'd a good deal rather be a pirate, now that I've tried it."
-
-"You see," said Tom, "people don't go much on hermits, nowadays, like
-they used to in old times, but a pirate's always respected. And a
-hermit's got to sleep on the hardest place he can find, and put
-sackcloth and ashes on his head, and stand out in the rain, and--"
-
-"What does he put sackcloth and ashes on his head for?" inquired Huck.
-
-"I dono. But they've GOT to do it. Hermits always do. You'd have to do
-that if you was a hermit."
-
-"Dern'd if I would," said Huck.
-
-"Well, what would you do?"
-
-"I dono. But I wouldn't do that."
-
-"Why, Huck, you'd HAVE to. How'd you get around it?"
-
-"Why, I just wouldn't stand it. I'd run away."
-
-"Run away! Well, you WOULD be a nice old slouch of a hermit. You'd be
-a disgrace."
-
-The Red-Handed made no response, being better employed. He had
-finished gouging out a cob, and now he fitted a weed stem to it, loaded
-it with tobacco, and was pressing a coal to the charge and blowing a
-cloud of fragrant smoke--he was in the full bloom of luxurious
-contentment. The other pirates envied him this majestic vice, and
-secretly resolved to acquire it shortly. Presently Huck said:
-
-"What does pirates have to do?"
-
-Tom said:
-
-"Oh, they have just a bully time--take ships and burn them, and get
-the money and bury it in awful places in their island where there's
-ghosts and things to watch it, and kill everybody in the ships--make
-'em walk a plank."
-
-"And they carry the women to the island," said Joe; "they don't kill
-the women."
-
-"No," assented Tom, "they don't kill the women--they're too noble. And
-the women's always beautiful, too.
-
-"And don't they wear the bulliest clothes! Oh no! All gold and silver
-and di'monds," said Joe, with enthusiasm.
-
-"Who?" said Huck.
-
-"Why, the pirates."
-
-Huck scanned his own clothing forlornly.
-
-"I reckon I ain't dressed fitten for a pirate," said he, with a
-regretful pathos in his voice; "but I ain't got none but these."
-
-But the other boys told him the fine clothes would come fast enough,
-after they should have begun their adventures. They made him understand
-that his poor rags would do to begin with, though it was customary for
-wealthy pirates to start with a proper wardrobe.
-
-Gradually their talk died out and drowsiness began to steal upon the
-eyelids of the little waifs. The pipe dropped from the fingers of the
-Red-Handed, and he slept the sleep of the conscience-free and the
-weary. The Terror of the Seas and the Black Avenger of the Spanish Main
-had more difficulty in getting to sleep. They said their prayers
-inwardly, and lying down, since there was nobody there with authority
-to make them kneel and recite aloud; in truth, they had a mind not to
-say them at all, but they were afraid to proceed to such lengths as
-that, lest they might call down a sudden and special thunderbolt from
-heaven. Then at once they reached and hovered upon the imminent verge
-of sleep--but an intruder came, now, that would not "down." It was
-conscience. They began to feel a vague fear that they had been doing
-wrong to run away; and next they thought of the stolen meat, and then
-the real torture came. They tried to argue it away by reminding
-conscience that they had purloined sweetmeats and apples scores of
-times; but conscience was not to be appeased by such thin
-plausibilities; it seemed to them, in the end, that there was no
-getting around the stubborn fact that taking sweetmeats was only
-"hooking," while taking bacon and hams and such valuables was plain
-simple stealing--and there was a command against that in the Bible. So
-they inwardly resolved that so long as they remained in the business,
-their piracies should not again be sullied with the crime of stealing.
-Then conscience granted a truce, and these curiously inconsistent
-pirates fell peacefully to sleep.
-
-
-
-CHAPTER XIV
-
-WHEN Tom awoke in the morning, he wondered where he was. He sat up and
-rubbed his eyes and looked around. Then he comprehended. It was the
-cool gray dawn, and there was a delicious sense of repose and peace in
-the deep pervading calm and silence of the woods. Not a leaf stirred;
-not a sound obtruded upon great Nature's meditation. Beaded dewdrops
-stood upon the leaves and grasses. A white layer of ashes covered the
-fire, and a thin blue breath of smoke rose straight into the air. Joe
-and Huck still slept.
-
-Now, far away in the woods a bird called; another answered; presently
-the hammering of a woodpecker was heard. Gradually the cool dim gray of
-the morning whitened, and as gradually sounds multiplied and life
-manifested itself. The marvel of Nature shaking off sleep and going to
-work unfolded itself to the musing boy. A little green worm came
-crawling over a dewy leaf, lifting two-thirds of his body into the air
-from time to time and "sniffing around," then proceeding again--for he
-was measuring, Tom said; and when the worm approached him, of its own
-accord, he sat as still as a stone, with his hopes rising and falling,
-by turns, as the creature still came toward him or seemed inclined to
-go elsewhere; and when at last it considered a painful moment with its
-curved body in the air and then came decisively down upon Tom's leg and
-began a journey over him, his whole heart was glad--for that meant that
-he was going to have a new suit of clothes--without the shadow of a
-doubt a gaudy piratical uniform. Now a procession of ants appeared,
-from nowhere in particular, and went about their labors; one struggled
-manfully by with a dead spider five times as big as itself in its arms,
-and lugged it straight up a tree-trunk. A brown spotted lady-bug
-climbed the dizzy height of a grass blade, and Tom bent down close to
-it and said, "Lady-bug, lady-bug, fly away home, your house is on fire,
-your children's alone," and she took wing and went off to see about it
---which did not surprise the boy, for he knew of old that this insect was
-credulous about conflagrations, and he had practised upon its
-simplicity more than once. A tumblebug came next, heaving sturdily at
-its ball, and Tom touched the creature, to see it shut its legs against
-its body and pretend to be dead. The birds were fairly rioting by this
-time. A catbird, the Northern mocker, lit in a tree over Tom's head,
-and trilled out her imitations of her neighbors in a rapture of
-enjoyment; then a shrill jay swept down, a flash of blue flame, and
-stopped on a twig almost within the boy's reach, cocked his head to one
-side and eyed the strangers with a consuming curiosity; a gray squirrel
-and a big fellow of the "fox" kind came skurrying along, sitting up at
-intervals to inspect and chatter at the boys, for the wild things had
-probably never seen a human being before and scarcely knew whether to
-be afraid or not. All Nature was wide awake and stirring, now; long
-lances of sunlight pierced down through the dense foliage far and near,
-and a few butterflies came fluttering upon the scene.
-
-Tom stirred up the other pirates and they all clattered away with a
-shout, and in a minute or two were stripped and chasing after and
-tumbling over each other in the shallow limpid water of the white
-sandbar. They felt no longing for the little village sleeping in the
-distance beyond the majestic waste of water. A vagrant current or a
-slight rise in the river had carried off their raft, but this only
-gratified them, since its going was something like burning the bridge
-between them and civilization.
-
-They came back to camp wonderfully refreshed, glad-hearted, and
-ravenous; and they soon had the camp-fire blazing up again. Huck found
-a spring of clear cold water close by, and the boys made cups of broad
-oak or hickory leaves, and felt that water, sweetened with such a
-wildwood charm as that, would be a good enough substitute for coffee.
-While Joe was slicing bacon for breakfast, Tom and Huck asked him to
-hold on a minute; they stepped to a promising nook in the river-bank
-and threw in their lines; almost immediately they had reward. Joe had
-not had time to get impatient before they were back again with some
-handsome bass, a couple of sun-perch and a small catfish--provisions
-enough for quite a family. They fried the fish with the bacon, and were
-astonished; for no fish had ever seemed so delicious before. They did
-not know that the quicker a fresh-water fish is on the fire after he is
-caught the better he is; and they reflected little upon what a sauce
-open-air sleeping, open-air exercise, bathing, and a large ingredient
-of hunger make, too.
-
-They lay around in the shade, after breakfast, while Huck had a smoke,
-and then went off through the woods on an exploring expedition. They
-tramped gayly along, over decaying logs, through tangled underbrush,
-among solemn monarchs of the forest, hung from their crowns to the
-ground with a drooping regalia of grape-vines. Now and then they came
-upon snug nooks carpeted with grass and jeweled with flowers.
-
-They found plenty of things to be delighted with, but nothing to be
-astonished at. They discovered that the island was about three miles
-long and a quarter of a mile wide, and that the shore it lay closest to
-was only separated from it by a narrow channel hardly two hundred yards
-wide. They took a swim about every hour, so it was close upon the
-middle of the afternoon when they got back to camp. They were too
-hungry to stop to fish, but they fared sumptuously upon cold ham, and
-then threw themselves down in the shade to talk. But the talk soon
-began to drag, and then died. The stillness, the solemnity that brooded
-in the woods, and the sense of loneliness, began to tell upon the
-spirits of the boys. They fell to thinking. A sort of undefined longing
-crept upon them. This took dim shape, presently--it was budding
-homesickness. Even Finn the Red-Handed was dreaming of his doorsteps
-and empty hogsheads. But they were all ashamed of their weakness, and
-none was brave enough to speak his thought.
-
-For some time, now, the boys had been dully conscious of a peculiar
-sound in the distance, just as one sometimes is of the ticking of a
-clock which he takes no distinct note of. But now this mysterious sound
-became more pronounced, and forced a recognition. The boys started,
-glanced at each other, and then each assumed a listening attitude.
-There was a long silence, profound and unbroken; then a deep, sullen
-boom came floating down out of the distance.
-
-"What is it!" exclaimed Joe, under his breath.
-
-"I wonder," said Tom in a whisper.
-
-"'Tain't thunder," said Huckleberry, in an awed tone, "becuz thunder--"
-
-"Hark!" said Tom. "Listen--don't talk."
-
-They waited a time that seemed an age, and then the same muffled boom
-troubled the solemn hush.
-
-"Let's go and see."
-
-They sprang to their feet and hurried to the shore toward the town.
-They parted the bushes on the bank and peered out over the water. The
-little steam ferryboat was about a mile below the village, drifting
-with the current. Her broad deck seemed crowded with people. There were
-a great many skiffs rowing about or floating with the stream in the
-neighborhood of the ferryboat, but the boys could not determine what
-the men in them were doing. Presently a great jet of white smoke burst
-from the ferryboat's side, and as it expanded and rose in a lazy cloud,
-that same dull throb of sound was borne to the listeners again.
-
-"I know now!" exclaimed Tom; "somebody's drownded!"
-
-"That's it!" said Huck; "they done that last summer, when Bill Turner
-got drownded; they shoot a cannon over the water, and that makes him
-come up to the top. Yes, and they take loaves of bread and put
-quicksilver in 'em and set 'em afloat, and wherever there's anybody
-that's drownded, they'll float right there and stop."
-
-"Yes, I've heard about that," said Joe. "I wonder what makes the bread
-do that."
-
-"Oh, it ain't the bread, so much," said Tom; "I reckon it's mostly
-what they SAY over it before they start it out."
-
-"But they don't say anything over it," said Huck. "I've seen 'em and
-they don't."
-
-"Well, that's funny," said Tom. "But maybe they say it to themselves.
-Of COURSE they do. Anybody might know that."
-
-The other boys agreed that there was reason in what Tom said, because
-an ignorant lump of bread, uninstructed by an incantation, could not be
-expected to act very intelligently when set upon an errand of such
-gravity.
-
-"By jings, I wish I was over there, now," said Joe.
-
-"I do too" said Huck "I'd give heaps to know who it is."
-
-The boys still listened and watched. Presently a revealing thought
-flashed through Tom's mind, and he exclaimed:
-
-"Boys, I know who's drownded--it's us!"
-
-They felt like heroes in an instant. Here was a gorgeous triumph; they
-were missed; they were mourned; hearts were breaking on their account;
-tears were being shed; accusing memories of unkindness to these poor
-lost lads were rising up, and unavailing regrets and remorse were being
-indulged; and best of all, the departed were the talk of the whole
-town, and the envy of all the boys, as far as this dazzling notoriety
-was concerned. This was fine. It was worth while to be a pirate, after
-all.
-
-As twilight drew on, the ferryboat went back to her accustomed
-business and the skiffs disappeared. The pirates returned to camp. They
-were jubilant with vanity over their new grandeur and the illustrious
-trouble they were making. They caught fish, cooked supper and ate it,
-and then fell to guessing at what the village was thinking and saying
-about them; and the pictures they drew of the public distress on their
-account were gratifying to look upon--from their point of view. But
-when the shadows of night closed them in, they gradually ceased to
-talk, and sat gazing into the fire, with their minds evidently
-wandering elsewhere. The excitement was gone, now, and Tom and Joe
-could not keep back thoughts of certain persons at home who were not
-enjoying this fine frolic as much as they were. Misgivings came; they
-grew troubled and unhappy; a sigh or two escaped, unawares. By and by
-Joe timidly ventured upon a roundabout "feeler" as to how the others
-might look upon a return to civilization--not right now, but--
-
-Tom withered him with derision! Huck, being uncommitted as yet, joined
-in with Tom, and the waverer quickly "explained," and was glad to get
-out of the scrape with as little taint of chicken-hearted homesickness
-clinging to his garments as he could. Mutiny was effectually laid to
-rest for the moment.
-
-As the night deepened, Huck began to nod, and presently to snore. Joe
-followed next. Tom lay upon his elbow motionless, for some time,
-watching the two intently. At last he got up cautiously, on his knees,
-and went searching among the grass and the flickering reflections flung
-by the camp-fire. He picked up and inspected several large
-semi-cylinders of the thin white bark of a sycamore, and finally chose
-two which seemed to suit him. Then he knelt by the fire and painfully
-wrote something upon each of these with his "red keel"; one he rolled up
-and put in his jacket pocket, and the other he put in Joe's hat and
-removed it to a little distance from the owner. And he also put into the
-hat certain schoolboy treasures of almost inestimable value--among them
-a lump of chalk, an India-rubber ball, three fishhooks, and one of that
-kind of marbles known as a "sure 'nough crystal." Then he tiptoed his
-way cautiously among the trees till he felt that he was out of hearing,
-and straightway broke into a keen run in the direction of the sandbar.
-
-
-
-CHAPTER XV
-
-A FEW minutes later Tom was in the shoal water of the bar, wading
-toward the Illinois shore. Before the depth reached his middle he was
-half-way over; the current would permit no more wading, now, so he
-struck out confidently to swim the remaining hundred yards. He swam
-quartering upstream, but still was swept downward rather faster than he
-had expected. However, he reached the shore finally, and drifted along
-till he found a low place and drew himself out. He put his hand on his
-jacket pocket, found his piece of bark safe, and then struck through
-the woods, following the shore, with streaming garments. Shortly before
-ten o'clock he came out into an open place opposite the village, and
-saw the ferryboat lying in the shadow of the trees and the high bank.
-Everything was quiet under the blinking stars. He crept down the bank,
-watching with all his eyes, slipped into the water, swam three or four
-strokes and climbed into the skiff that did "yawl" duty at the boat's
-stern. He laid himself down under the thwarts and waited, panting.
-
-Presently the cracked bell tapped and a voice gave the order to "cast
-off." A minute or two later the skiff's head was standing high up,
-against the boat's swell, and the voyage was begun. Tom felt happy in
-his success, for he knew it was the boat's last trip for the night. At
-the end of a long twelve or fifteen minutes the wheels stopped, and Tom
-slipped overboard and swam ashore in the dusk, landing fifty yards
-downstream, out of danger of possible stragglers.
-
-He flew along unfrequented alleys, and shortly found himself at his
-aunt's back fence. He climbed over, approached the "ell," and looked in
-at the sitting-room window, for a light was burning there. There sat
-Aunt Polly, Sid, Mary, and Joe Harper's mother, grouped together,
-talking. They were by the bed, and the bed was between them and the
-door. Tom went to the door and began to softly lift the latch; then he
-pressed gently and the door yielded a crack; he continued pushing
-cautiously, and quaking every time it creaked, till he judged he might
-squeeze through on his knees; so he put his head through and began,
-warily.
-
-"What makes the candle blow so?" said Aunt Polly. Tom hurried up.
-"Why, that door's open, I believe. Why, of course it is. No end of
-strange things now. Go 'long and shut it, Sid."
-
-Tom disappeared under the bed just in time. He lay and "breathed"
-himself for a time, and then crept to where he could almost touch his
-aunt's foot.
-
-"But as I was saying," said Aunt Polly, "he warn't BAD, so to say
---only mischEEvous. Only just giddy, and harum-scarum, you know. He
-warn't any more responsible than a colt. HE never meant any harm, and
-he was the best-hearted boy that ever was"--and she began to cry.
-
-"It was just so with my Joe--always full of his devilment, and up to
-every kind of mischief, but he was just as unselfish and kind as he
-could be--and laws bless me, to think I went and whipped him for taking
-that cream, never once recollecting that I throwed it out myself
-because it was sour, and I never to see him again in this world, never,
-never, never, poor abused boy!" And Mrs. Harper sobbed as if her heart
-would break.
-
-"I hope Tom's better off where he is," said Sid, "but if he'd been
-better in some ways--"
-
-"SID!" Tom felt the glare of the old lady's eye, though he could not
-see it. "Not a word against my Tom, now that he's gone! God'll take
-care of HIM--never you trouble YOURself, sir! Oh, Mrs. Harper, I don't
-know how to give him up! I don't know how to give him up! He was such a
-comfort to me, although he tormented my old heart out of me, 'most."
-
-"The Lord giveth and the Lord hath taken away--Blessed be the name of
-the Lord! But it's so hard--Oh, it's so hard! Only last Saturday my
-Joe busted a firecracker right under my nose and I knocked him
-sprawling. Little did I know then, how soon--Oh, if it was to do over
-again I'd hug him and bless him for it."
-
-"Yes, yes, yes, I know just how you feel, Mrs. Harper, I know just
-exactly how you feel. No longer ago than yesterday noon, my Tom took
-and filled the cat full of Pain-killer, and I did think the cretur
-would tear the house down. And God forgive me, I cracked Tom's head
-with my thimble, poor boy, poor dead boy. But he's out of all his
-troubles now. And the last words I ever heard him say was to reproach--"
-
-But this memory was too much for the old lady, and she broke entirely
-down. Tom was snuffling, now, himself--and more in pity of himself than
-anybody else. He could hear Mary crying, and putting in a kindly word
-for him from time to time. He began to have a nobler opinion of himself
-than ever before. Still, he was sufficiently touched by his aunt's
-grief to long to rush out from under the bed and overwhelm her with
-joy--and the theatrical gorgeousness of the thing appealed strongly to
-his nature, too, but he resisted and lay still.
-
-He went on listening, and gathered by odds and ends that it was
-conjectured at first that the boys had got drowned while taking a swim;
-then the small raft had been missed; next, certain boys said the
-missing lads had promised that the village should "hear something"
-soon; the wise-heads had "put this and that together" and decided that
-the lads had gone off on that raft and would turn up at the next town
-below, presently; but toward noon the raft had been found, lodged
-against the Missouri shore some five or six miles below the village
---and then hope perished; they must be drowned, else hunger would have
-driven them home by nightfall if not sooner. It was believed that the
-search for the bodies had been a fruitless effort merely because the
-drowning must have occurred in mid-channel, since the boys, being good
-swimmers, would otherwise have escaped to shore. This was Wednesday
-night. If the bodies continued missing until Sunday, all hope would be
-given over, and the funerals would be preached on that morning. Tom
-shuddered.
-
-Mrs. Harper gave a sobbing good-night and turned to go. Then with a
-mutual impulse the two bereaved women flung themselves into each
-other's arms and had a good, consoling cry, and then parted. Aunt Polly
-was tender far beyond her wont, in her good-night to Sid and Mary. Sid
-snuffled a bit and Mary went off crying with all her heart.
-
-Aunt Polly knelt down and prayed for Tom so touchingly, so
-appealingly, and with such measureless love in her words and her old
-trembling voice, that he was weltering in tears again, long before she
-was through.
-
-He had to keep still long after she went to bed, for she kept making
-broken-hearted ejaculations from time to time, tossing unrestfully, and
-turning over. But at last she was still, only moaning a little in her
-sleep. Now the boy stole out, rose gradually by the bedside, shaded the
-candle-light with his hand, and stood regarding her. His heart was full
-of pity for her. He took out his sycamore scroll and placed it by the
-candle. But something occurred to him, and he lingered considering. His
-face lighted with a happy solution of his thought; he put the bark
-hastily in his pocket. Then he bent over and kissed the faded lips, and
-straightway made his stealthy exit, latching the door behind him.
-
-He threaded his way back to the ferry landing, found nobody at large
-there, and walked boldly on board the boat, for he knew she was
-tenantless except that there was a watchman, who always turned in and
-slept like a graven image. He untied the skiff at the stern, slipped
-into it, and was soon rowing cautiously upstream. When he had pulled a
-mile above the village, he started quartering across and bent himself
-stoutly to his work. He hit the landing on the other side neatly, for
-this was a familiar bit of work to him. He was moved to capture the
-skiff, arguing that it might be considered a ship and therefore
-legitimate prey for a pirate, but he knew a thorough search would be
-made for it and that might end in revelations. So he stepped ashore and
-entered the woods.
-
-He sat down and took a long rest, torturing himself meanwhile to keep
-awake, and then started warily down the home-stretch. The night was far
-spent. It was broad daylight before he found himself fairly abreast the
-island bar. He rested again until the sun was well up and gilding the
-great river with its splendor, and then he plunged into the stream. A
-little later he paused, dripping, upon the threshold of the camp, and
-heard Joe say:
-
-"No, Tom's true-blue, Huck, and he'll come back. He won't desert. He
-knows that would be a disgrace to a pirate, and Tom's too proud for
-that sort of thing. He's up to something or other. Now I wonder what?"
-
-"Well, the things is ours, anyway, ain't they?"
-
-"Pretty near, but not yet, Huck. The writing says they are if he ain't
-back here to breakfast."
-
-"Which he is!" exclaimed Tom, with fine dramatic effect, stepping
-grandly into camp.
-
-A sumptuous breakfast of bacon and fish was shortly provided, and as
-the boys set to work upon it, Tom recounted (and adorned) his
-adventures. They were a vain and boastful company of heroes when the
-tale was done. Then Tom hid himself away in a shady nook to sleep till
-noon, and the other pirates got ready to fish and explore.
-
-
-
-CHAPTER XVI
-
-AFTER dinner all the gang turned out to hunt for turtle eggs on the
-bar. They went about poking sticks into the sand, and when they found a
-soft place they went down on their knees and dug with their hands.
-Sometimes they would take fifty or sixty eggs out of one hole. They
-were perfectly round white things a trifle smaller than an English
-walnut. They had a famous fried-egg feast that night, and another on
-Friday morning.
-
-After breakfast they went whooping and prancing out on the bar, and
-chased each other round and round, shedding clothes as they went, until
-they were naked, and then continued the frolic far away up the shoal
-water of the bar, against the stiff current, which latter tripped their
-legs from under them from time to time and greatly increased the fun.
-And now and then they stooped in a group and splashed water in each
-other's faces with their palms, gradually approaching each other, with
-averted faces to avoid the strangling sprays, and finally gripping and
-struggling till the best man ducked his neighbor, and then they all
-went under in a tangle of white legs and arms and came up blowing,
-sputtering, laughing, and gasping for breath at one and the same time.
-
-When they were well exhausted, they would run out and sprawl on the
-dry, hot sand, and lie there and cover themselves up with it, and by
-and by break for the water again and go through the original
-performance once more. Finally it occurred to them that their naked
-skin represented flesh-colored "tights" very fairly; so they drew a
-ring in the sand and had a circus--with three clowns in it, for none
-would yield this proudest post to his neighbor.
-
-Next they got their marbles and played "knucks" and "ring-taw" and
-"keeps" till that amusement grew stale. Then Joe and Huck had another
-swim, but Tom would not venture, because he found that in kicking off
-his trousers he had kicked his string of rattlesnake rattles off his
-ankle, and he wondered how he had escaped cramp so long without the
-protection of this mysterious charm. He did not venture again until he
-had found it, and by that time the other boys were tired and ready to
-rest. They gradually wandered apart, dropped into the "dumps," and fell
-to gazing longingly across the wide river to where the village lay
-drowsing in the sun. Tom found himself writing "BECKY" in the sand with
-his big toe; he scratched it out, and was angry with himself for his
-weakness. But he wrote it again, nevertheless; he could not help it. He
-erased it once more and then took himself out of temptation by driving
-the other boys together and joining them.
-
-But Joe's spirits had gone down almost beyond resurrection. He was so
-homesick that he could hardly endure the misery of it. The tears lay
-very near the surface. Huck was melancholy, too. Tom was downhearted,
-but tried hard not to show it. He had a secret which he was not ready
-to tell, yet, but if this mutinous depression was not broken up soon,
-he would have to bring it out. He said, with a great show of
-cheerfulness:
-
-"I bet there's been pirates on this island before, boys. We'll explore
-it again. They've hid treasures here somewhere. How'd you feel to light
-on a rotten chest full of gold and silver--hey?"
-
-But it roused only faint enthusiasm, which faded out, with no reply.
-Tom tried one or two other seductions; but they failed, too. It was
-discouraging work. Joe sat poking up the sand with a stick and looking
-very gloomy. Finally he said:
-
-"Oh, boys, let's give it up. I want to go home. It's so lonesome."
-
-"Oh no, Joe, you'll feel better by and by," said Tom. "Just think of
-the fishing that's here."
-
-"I don't care for fishing. I want to go home."
-
-"But, Joe, there ain't such another swimming-place anywhere."
-
-"Swimming's no good. I don't seem to care for it, somehow, when there
-ain't anybody to say I sha'n't go in. I mean to go home."
-
-"Oh, shucks! Baby! You want to see your mother, I reckon."
-
-"Yes, I DO want to see my mother--and you would, too, if you had one.
-I ain't any more baby than you are." And Joe snuffled a little.
-
-"Well, we'll let the cry-baby go home to his mother, won't we, Huck?
-Poor thing--does it want to see its mother? And so it shall. You like
-it here, don't you, Huck? We'll stay, won't we?"
-
-Huck said, "Y-e-s"--without any heart in it.
-
-"I'll never speak to you again as long as I live," said Joe, rising.
-"There now!" And he moved moodily away and began to dress himself.
-
-"Who cares!" said Tom. "Nobody wants you to. Go 'long home and get
-laughed at. Oh, you're a nice pirate. Huck and me ain't cry-babies.
-We'll stay, won't we, Huck? Let him go if he wants to. I reckon we can
-get along without him, per'aps."
-
-But Tom was uneasy, nevertheless, and was alarmed to see Joe go
-sullenly on with his dressing. And then it was discomforting to see
-Huck eying Joe's preparations so wistfully, and keeping up such an
-ominous silence. Presently, without a parting word, Joe began to wade
-off toward the Illinois shore. Tom's heart began to sink. He glanced at
-Huck. Huck could not bear the look, and dropped his eyes. Then he said:
-
-"I want to go, too, Tom. It was getting so lonesome anyway, and now
-it'll be worse. Let's us go, too, Tom."
-
-"I won't! You can all go, if you want to. I mean to stay."
-
-"Tom, I better go."
-
-"Well, go 'long--who's hendering you."
-
-Huck began to pick up his scattered clothes. He said:
-
-"Tom, I wisht you'd come, too. Now you think it over. We'll wait for
-you when we get to shore."
-
-"Well, you'll wait a blame long time, that's all."
-
-Huck started sorrowfully away, and Tom stood looking after him, with a
-strong desire tugging at his heart to yield his pride and go along too.
-He hoped the boys would stop, but they still waded slowly on. It
-suddenly dawned on Tom that it was become very lonely and still. He
-made one final struggle with his pride, and then darted after his
-comrades, yelling:
-
-"Wait! Wait! I want to tell you something!"
-
-They presently stopped and turned around. When he got to where they
-were, he began unfolding his secret, and they listened moodily till at
-last they saw the "point" he was driving at, and then they set up a
-war-whoop of applause and said it was "splendid!" and said if he had
-told them at first, they wouldn't have started away. He made a plausible
-excuse; but his real reason had been the fear that not even the secret
-would keep them with him any very great length of time, and so he had
-meant to hold it in reserve as a last seduction.
-
-The lads came gayly back and went at their sports again with a will,
-chattering all the time about Tom's stupendous plan and admiring the
-genius of it. After a dainty egg and fish dinner, Tom said he wanted to
-learn to smoke, now. Joe caught at the idea and said he would like to
-try, too. So Huck made pipes and filled them. These novices had never
-smoked anything before but cigars made of grape-vine, and they "bit"
-the tongue, and were not considered manly anyway.
-
-Now they stretched themselves out on their elbows and began to puff,
-charily, and with slender confidence. The smoke had an unpleasant
-taste, and they gagged a little, but Tom said:
-
-"Why, it's just as easy! If I'd a knowed this was all, I'd a learnt
-long ago."
-
-"So would I," said Joe. "It's just nothing."
-
-"Why, many a time I've looked at people smoking, and thought well I
-wish I could do that; but I never thought I could," said Tom.
-
-"That's just the way with me, hain't it, Huck? You've heard me talk
-just that way--haven't you, Huck? I'll leave it to Huck if I haven't."
-
-"Yes--heaps of times," said Huck.
-
-"Well, I have too," said Tom; "oh, hundreds of times. Once down by the
-slaughter-house. Don't you remember, Huck? Bob Tanner was there, and
-Johnny Miller, and Jeff Thatcher, when I said it. Don't you remember,
-Huck, 'bout me saying that?"
-
-"Yes, that's so," said Huck. "That was the day after I lost a white
-alley. No, 'twas the day before."
-
-"There--I told you so," said Tom. "Huck recollects it."
-
-"I bleeve I could smoke this pipe all day," said Joe. "I don't feel
-sick."
-
-"Neither do I," said Tom. "I could smoke it all day. But I bet you
-Jeff Thatcher couldn't."
-
-"Jeff Thatcher! Why, he'd keel over just with two draws. Just let him
-try it once. HE'D see!"
-
-"I bet he would. And Johnny Miller--I wish could see Johnny Miller
-tackle it once."
-
-"Oh, don't I!" said Joe. "Why, I bet you Johnny Miller couldn't any
-more do this than nothing. Just one little snifter would fetch HIM."
-
-"'Deed it would, Joe. Say--I wish the boys could see us now."
-
-"So do I."
-
-"Say--boys, don't say anything about it, and some time when they're
-around, I'll come up to you and say, 'Joe, got a pipe? I want a smoke.'
-And you'll say, kind of careless like, as if it warn't anything, you'll
-say, 'Yes, I got my OLD pipe, and another one, but my tobacker ain't
-very good.' And I'll say, 'Oh, that's all right, if it's STRONG
-enough.' And then you'll out with the pipes, and we'll light up just as
-ca'm, and then just see 'em look!"
-
-"By jings, that'll be gay, Tom! I wish it was NOW!"
-
-"So do I! And when we tell 'em we learned when we was off pirating,
-won't they wish they'd been along?"
-
-"Oh, I reckon not! I'll just BET they will!"
-
-So the talk ran on. But presently it began to flag a trifle, and grow
-disjointed. The silences widened; the expectoration marvellously
-increased. Every pore inside the boys' cheeks became a spouting
-fountain; they could scarcely bail out the cellars under their tongues
-fast enough to prevent an inundation; little overflowings down their
-throats occurred in spite of all they could do, and sudden retchings
-followed every time. Both boys were looking very pale and miserable,
-now. Joe's pipe dropped from his nerveless fingers. Tom's followed.
-Both fountains were going furiously and both pumps bailing with might
-and main. Joe said feebly:
-
-"I've lost my knife. I reckon I better go and find it."
-
-Tom said, with quivering lips and halting utterance:
-
-"I'll help you. You go over that way and I'll hunt around by the
-spring. No, you needn't come, Huck--we can find it."
-
-So Huck sat down again, and waited an hour. Then he found it lonesome,
-and went to find his comrades. They were wide apart in the woods, both
-very pale, both fast asleep. But something informed him that if they
-had had any trouble they had got rid of it.
-
-They were not talkative at supper that night. They had a humble look,
-and when Huck prepared his pipe after the meal and was going to prepare
-theirs, they said no, they were not feeling very well--something they
-ate at dinner had disagreed with them.
-
-About midnight Joe awoke, and called the boys. There was a brooding
-oppressiveness in the air that seemed to bode something. The boys
-huddled themselves together and sought the friendly companionship of
-the fire, though the dull dead heat of the breathless atmosphere was
-stifling. They sat still, intent and waiting. The solemn hush
-continued. Beyond the light of the fire everything was swallowed up in
-the blackness of darkness. Presently there came a quivering glow that
-vaguely revealed the foliage for a moment and then vanished. By and by
-another came, a little stronger. Then another. Then a faint moan came
-sighing through the branches of the forest and the boys felt a fleeting
-breath upon their cheeks, and shuddered with the fancy that the Spirit
-of the Night had gone by. There was a pause. Now a weird flash turned
-night into day and showed every little grass-blade, separate and
-distinct, that grew about their feet. And it showed three white,
-startled faces, too. A deep peal of thunder went rolling and tumbling
-down the heavens and lost itself in sullen rumblings in the distance. A
-sweep of chilly air passed by, rustling all the leaves and snowing the
-flaky ashes broadcast about the fire. Another fierce glare lit up the
-forest and an instant crash followed that seemed to rend the tree-tops
-right over the boys' heads. They clung together in terror, in the thick
-gloom that followed. A few big rain-drops fell pattering upon the
-leaves.
-
-"Quick! boys, go for the tent!" exclaimed Tom.
-
-They sprang away, stumbling over roots and among vines in the dark, no
-two plunging in the same direction. A furious blast roared through the
-trees, making everything sing as it went. One blinding flash after
-another came, and peal on peal of deafening thunder. And now a
-drenching rain poured down and the rising hurricane drove it in sheets
-along the ground. The boys cried out to each other, but the roaring
-wind and the booming thunder-blasts drowned their voices utterly.
-However, one by one they straggled in at last and took shelter under
-the tent, cold, scared, and streaming with water; but to have company
-in misery seemed something to be grateful for. They could not talk, the
-old sail flapped so furiously, even if the other noises would have
-allowed them. The tempest rose higher and higher, and presently the
-sail tore loose from its fastenings and went winging away on the blast.
-The boys seized each others' hands and fled, with many tumblings and
-bruises, to the shelter of a great oak that stood upon the river-bank.
-Now the battle was at its highest. Under the ceaseless conflagration of
-lightning that flamed in the skies, everything below stood out in
-clean-cut and shadowless distinctness: the bending trees, the billowy
-river, white with foam, the driving spray of spume-flakes, the dim
-outlines of the high bluffs on the other side, glimpsed through the
-drifting cloud-rack and the slanting veil of rain. Every little while
-some giant tree yielded the fight and fell crashing through the younger
-growth; and the unflagging thunder-peals came now in ear-splitting
-explosive bursts, keen and sharp, and unspeakably appalling. The storm
-culminated in one matchless effort that seemed likely to tear the island
-to pieces, burn it up, drown it to the tree-tops, blow it away, and
-deafen every creature in it, all at one and the same moment. It was a
-wild night for homeless young heads to be out in.
-
-But at last the battle was done, and the forces retired with weaker
-and weaker threatenings and grumblings, and peace resumed her sway. The
-boys went back to camp, a good deal awed; but they found there was
-still something to be thankful for, because the great sycamore, the
-shelter of their beds, was a ruin, now, blasted by the lightnings, and
-they were not under it when the catastrophe happened.
-
-Everything in camp was drenched, the camp-fire as well; for they were
-but heedless lads, like their generation, and had made no provision
-against rain. Here was matter for dismay, for they were soaked through
-and chilled. They were eloquent in their distress; but they presently
-discovered that the fire had eaten so far up under the great log it had
-been built against (where it curved upward and separated itself from
-the ground), that a handbreadth or so of it had escaped wetting; so
-they patiently wrought until, with shreds and bark gathered from the
-under sides of sheltered logs, they coaxed the fire to burn again. Then
-they piled on great dead boughs till they had a roaring furnace, and
-were glad-hearted once more. They dried their boiled ham and had a
-feast, and after that they sat by the fire and expanded and glorified
-their midnight adventure until morning, for there was not a dry spot to
-sleep on, anywhere around.
-
-As the sun began to steal in upon the boys, drowsiness came over them,
-and they went out on the sandbar and lay down to sleep. They got
-scorched out by and by, and drearily set about getting breakfast. After
-the meal they felt rusty, and stiff-jointed, and a little homesick once
-more. Tom saw the signs, and fell to cheering up the pirates as well as
-he could. But they cared nothing for marbles, or circus, or swimming,
-or anything. He reminded them of the imposing secret, and raised a ray
-of cheer. While it lasted, he got them interested in a new device. This
-was to knock off being pirates, for a while, and be Indians for a
-change. They were attracted by this idea; so it was not long before
-they were stripped, and striped from head to heel with black mud, like
-so many zebras--all of them chiefs, of course--and then they went
-tearing through the woods to attack an English settlement.
-
-By and by they separated into three hostile tribes, and darted upon
-each other from ambush with dreadful war-whoops, and killed and scalped
-each other by thousands. It was a gory day. Consequently it was an
-extremely satisfactory one.
-
-They assembled in camp toward supper-time, hungry and happy; but now a
-difficulty arose--hostile Indians could not break the bread of
-hospitality together without first making peace, and this was a simple
-impossibility without smoking a pipe of peace. There was no other
-process that ever they had heard of. Two of the savages almost wished
-they had remained pirates. However, there was no other way; so with
-such show of cheerfulness as they could muster they called for the pipe
-and took their whiff as it passed, in due form.
-
-And behold, they were glad they had gone into savagery, for they had
-gained something; they found that they could now smoke a little without
-having to go and hunt for a lost knife; they did not get sick enough to
-be seriously uncomfortable. They were not likely to fool away this high
-promise for lack of effort. No, they practised cautiously, after
-supper, with right fair success, and so they spent a jubilant evening.
-They were prouder and happier in their new acquirement than they would
-have been in the scalping and skinning of the Six Nations. We will
-leave them to smoke and chatter and brag, since we have no further use
-for them at present.
-
-
-
-CHAPTER XVII
-
-BUT there was no hilarity in the little town that same tranquil
-Saturday afternoon. The Harpers, and Aunt Polly's family, were being
-put into mourning, with great grief and many tears. An unusual quiet
-possessed the village, although it was ordinarily quiet enough, in all
-conscience. The villagers conducted their concerns with an absent air,
-and talked little; but they sighed often. The Saturday holiday seemed a
-burden to the children. They had no heart in their sports, and
-gradually gave them up.
-
-In the afternoon Becky Thatcher found herself moping about the
-deserted schoolhouse yard, and feeling very melancholy. But she found
-nothing there to comfort her. She soliloquized:
-
-"Oh, if I only had a brass andiron-knob again! But I haven't got
-anything now to remember him by." And she choked back a little sob.
-
-Presently she stopped, and said to herself:
-
-"It was right here. Oh, if it was to do over again, I wouldn't say
-that--I wouldn't say it for the whole world. But he's gone now; I'll
-never, never, never see him any more."
-
-This thought broke her down, and she wandered away, with tears rolling
-down her cheeks. Then quite a group of boys and girls--playmates of
-Tom's and Joe's--came by, and stood looking over the paling fence and
-talking in reverent tones of how Tom did so-and-so the last time they
-saw him, and how Joe said this and that small trifle (pregnant with
-awful prophecy, as they could easily see now!)--and each speaker
-pointed out the exact spot where the lost lads stood at the time, and
-then added something like "and I was a-standing just so--just as I am
-now, and as if you was him--I was as close as that--and he smiled, just
-this way--and then something seemed to go all over me, like--awful, you
-know--and I never thought what it meant, of course, but I can see now!"
-
-Then there was a dispute about who saw the dead boys last in life, and
-many claimed that dismal distinction, and offered evidences, more or
-less tampered with by the witness; and when it was ultimately decided
-who DID see the departed last, and exchanged the last words with them,
-the lucky parties took upon themselves a sort of sacred importance, and
-were gaped at and envied by all the rest. One poor chap, who had no
-other grandeur to offer, said with tolerably manifest pride in the
-remembrance:
-
-"Well, Tom Sawyer he licked me once."
-
-But that bid for glory was a failure. Most of the boys could say that,
-and so that cheapened the distinction too much. The group loitered
-away, still recalling memories of the lost heroes, in awed voices.
-
-When the Sunday-school hour was finished, the next morning, the bell
-began to toll, instead of ringing in the usual way. It was a very still
-Sabbath, and the mournful sound seemed in keeping with the musing hush
-that lay upon nature. The villagers began to gather, loitering a moment
-in the vestibule to converse in whispers about the sad event. But there
-was no whispering in the house; only the funereal rustling of dresses
-as the women gathered to their seats disturbed the silence there. None
-could remember when the little church had been so full before. There
-was finally a waiting pause, an expectant dumbness, and then Aunt Polly
-entered, followed by Sid and Mary, and they by the Harper family, all
-in deep black, and the whole congregation, the old minister as well,
-rose reverently and stood until the mourners were seated in the front
-pew. There was another communing silence, broken at intervals by
-muffled sobs, and then the minister spread his hands abroad and prayed.
-A moving hymn was sung, and the text followed: "I am the Resurrection
-and the Life."
-
-As the service proceeded, the clergyman drew such pictures of the
-graces, the winning ways, and the rare promise of the lost lads that
-every soul there, thinking he recognized these pictures, felt a pang in
-remembering that he had persistently blinded himself to them always
-before, and had as persistently seen only faults and flaws in the poor
-boys. The minister related many a touching incident in the lives of the
-departed, too, which illustrated their sweet, generous natures, and the
-people could easily see, now, how noble and beautiful those episodes
-were, and remembered with grief that at the time they occurred they had
-seemed rank rascalities, well deserving of the cowhide. The
-congregation became more and more moved, as the pathetic tale went on,
-till at last the whole company broke down and joined the weeping
-mourners in a chorus of anguished sobs, the preacher himself giving way
-to his feelings, and crying in the pulpit.
-
-There was a rustle in the gallery, which nobody noticed; a moment
-later the church door creaked; the minister raised his streaming eyes
-above his handkerchief, and stood transfixed! First one and then
-another pair of eyes followed the minister's, and then almost with one
-impulse the congregation rose and stared while the three dead boys came
-marching up the aisle, Tom in the lead, Joe next, and Huck, a ruin of
-drooping rags, sneaking sheepishly in the rear! They had been hid in
-the unused gallery listening to their own funeral sermon!
-
-Aunt Polly, Mary, and the Harpers threw themselves upon their restored
-ones, smothered them with kisses and poured out thanksgivings, while
-poor Huck stood abashed and uncomfortable, not knowing exactly what to
-do or where to hide from so many unwelcoming eyes. He wavered, and
-started to slink away, but Tom seized him and said:
-
-"Aunt Polly, it ain't fair. Somebody's got to be glad to see Huck."
-
-"And so they shall. I'm glad to see him, poor motherless thing!" And
-the loving attentions Aunt Polly lavished upon him were the one thing
-capable of making him more uncomfortable than he was before.
-
-Suddenly the minister shouted at the top of his voice: "Praise God
-from whom all blessings flow--SING!--and put your hearts in it!"
-
-And they did. Old Hundred swelled up with a triumphant burst, and
-while it shook the rafters Tom Sawyer the Pirate looked around upon the
-envying juveniles about him and confessed in his heart that this was
-the proudest moment of his life.
-
-As the "sold" congregation trooped out they said they would almost be
-willing to be made ridiculous again to hear Old Hundred sung like that
-once more.
-
-Tom got more cuffs and kisses that day--according to Aunt Polly's
-varying moods--than he had earned before in a year; and he hardly knew
-which expressed the most gratefulness to God and affection for himself.
-
-
-
-CHAPTER XVIII
-
-THAT was Tom's great secret--the scheme to return home with his
-brother pirates and attend their own funerals. They had paddled over to
-the Missouri shore on a log, at dusk on Saturday, landing five or six
-miles below the village; they had slept in the woods at the edge of the
-town till nearly daylight, and had then crept through back lanes and
-alleys and finished their sleep in the gallery of the church among a
-chaos of invalided benches.
-
-At breakfast, Monday morning, Aunt Polly and Mary were very loving to
-Tom, and very attentive to his wants. There was an unusual amount of
-talk. In the course of it Aunt Polly said:
-
-"Well, I don't say it wasn't a fine joke, Tom, to keep everybody
-suffering 'most a week so you boys had a good time, but it is a pity
-you could be so hard-hearted as to let me suffer so. If you could come
-over on a log to go to your funeral, you could have come over and give
-me a hint some way that you warn't dead, but only run off."
-
-"Yes, you could have done that, Tom," said Mary; "and I believe you
-would if you had thought of it."
-
-"Would you, Tom?" said Aunt Polly, her face lighting wistfully. "Say,
-now, would you, if you'd thought of it?"
-
-"I--well, I don't know. 'Twould 'a' spoiled everything."
-
-"Tom, I hoped you loved me that much," said Aunt Polly, with a grieved
-tone that discomforted the boy. "It would have been something if you'd
-cared enough to THINK of it, even if you didn't DO it."
-
-"Now, auntie, that ain't any harm," pleaded Mary; "it's only Tom's
-giddy way--he is always in such a rush that he never thinks of
-anything."
-
-"More's the pity. Sid would have thought. And Sid would have come and
-DONE it, too. Tom, you'll look back, some day, when it's too late, and
-wish you'd cared a little more for me when it would have cost you so
-little."
-
-"Now, auntie, you know I do care for you," said Tom.
-
-"I'd know it better if you acted more like it."
-
-"I wish now I'd thought," said Tom, with a repentant tone; "but I
-dreamt about you, anyway. That's something, ain't it?"
-
-"It ain't much--a cat does that much--but it's better than nothing.
-What did you dream?"
-
-"Why, Wednesday night I dreamt that you was sitting over there by the
-bed, and Sid was sitting by the woodbox, and Mary next to him."
-
-"Well, so we did. So we always do. I'm glad your dreams could take
-even that much trouble about us."
-
-"And I dreamt that Joe Harper's mother was here."
-
-"Why, she was here! Did you dream any more?"
-
-"Oh, lots. But it's so dim, now."
-
-"Well, try to recollect--can't you?"
-
-"Somehow it seems to me that the wind--the wind blowed the--the--"
-
-"Try harder, Tom! The wind did blow something. Come!"
-
-Tom pressed his fingers on his forehead an anxious minute, and then
-said:
-
-"I've got it now! I've got it now! It blowed the candle!"
-
-"Mercy on us! Go on, Tom--go on!"
-
-"And it seems to me that you said, 'Why, I believe that that door--'"
-
-"Go ON, Tom!"
-
-"Just let me study a moment--just a moment. Oh, yes--you said you
-believed the door was open."
-
-"As I'm sitting here, I did! Didn't I, Mary! Go on!"
-
-"And then--and then--well I won't be certain, but it seems like as if
-you made Sid go and--and--"
-
-"Well? Well? What did I make him do, Tom? What did I make him do?"
-
-"You made him--you--Oh, you made him shut it."
-
-"Well, for the land's sake! I never heard the beat of that in all my
-days! Don't tell ME there ain't anything in dreams, any more. Sereny
-Harper shall know of this before I'm an hour older. I'd like to see her
-get around THIS with her rubbage 'bout superstition. Go on, Tom!"
-
-"Oh, it's all getting just as bright as day, now. Next you said I
-warn't BAD, only mischeevous and harum-scarum, and not any more
-responsible than--than--I think it was a colt, or something."
-
-"And so it was! Well, goodness gracious! Go on, Tom!"
-
-"And then you began to cry."
-
-"So I did. So I did. Not the first time, neither. And then--"
-
-"Then Mrs. Harper she began to cry, and said Joe was just the same,
-and she wished she hadn't whipped him for taking cream when she'd
-throwed it out her own self--"
-
-"Tom! The sperrit was upon you! You was a prophesying--that's what you
-was doing! Land alive, go on, Tom!"
-
-"Then Sid he said--he said--"
-
-"I don't think I said anything," said Sid.
-
-"Yes you did, Sid," said Mary.
-
-"Shut your heads and let Tom go on! What did he say, Tom?"
-
-"He said--I THINK he said he hoped I was better off where I was gone
-to, but if I'd been better sometimes--"
-
-"THERE, d'you hear that! It was his very words!"
-
-"And you shut him up sharp."
-
-"I lay I did! There must 'a' been an angel there. There WAS an angel
-there, somewheres!"
-
-"And Mrs. Harper told about Joe scaring her with a firecracker, and
-you told about Peter and the Painkiller--"
-
-"Just as true as I live!"
-
-"And then there was a whole lot of talk 'bout dragging the river for
-us, and 'bout having the funeral Sunday, and then you and old Miss
-Harper hugged and cried, and she went."
-
-"It happened just so! It happened just so, as sure as I'm a-sitting in
-these very tracks. Tom, you couldn't told it more like if you'd 'a'
-seen it! And then what? Go on, Tom!"
-
-"Then I thought you prayed for me--and I could see you and hear every
-word you said. And you went to bed, and I was so sorry that I took and
-wrote on a piece of sycamore bark, 'We ain't dead--we are only off
-being pirates,' and put it on the table by the candle; and then you
-looked so good, laying there asleep, that I thought I went and leaned
-over and kissed you on the lips."
-
-"Did you, Tom, DID you! I just forgive you everything for that!" And
-she seized the boy in a crushing embrace that made him feel like the
-guiltiest of villains.
-
-"It was very kind, even though it was only a--dream," Sid soliloquized
-just audibly.
-
-"Shut up, Sid! A body does just the same in a dream as he'd do if he
-was awake. Here's a big Milum apple I've been saving for you, Tom, if
-you was ever found again--now go 'long to school. I'm thankful to the
-good God and Father of us all I've got you back, that's long-suffering
-and merciful to them that believe on Him and keep His word, though
-goodness knows I'm unworthy of it, but if only the worthy ones got His
-blessings and had His hand to help them over the rough places, there's
-few enough would smile here or ever enter into His rest when the long
-night comes. Go 'long Sid, Mary, Tom--take yourselves off--you've
-hendered me long enough."
-
-The children left for school, and the old lady to call on Mrs. Harper
-and vanquish her realism with Tom's marvellous dream. Sid had better
-judgment than to utter the thought that was in his mind as he left the
-house. It was this: "Pretty thin--as long a dream as that, without any
-mistakes in it!"
-
-What a hero Tom was become, now! He did not go skipping and prancing,
-but moved with a dignified swagger as became a pirate who felt that the
-public eye was on him. And indeed it was; he tried not to seem to see
-the looks or hear the remarks as he passed along, but they were food
-and drink to him. Smaller boys than himself flocked at his heels, as
-proud to be seen with him, and tolerated by him, as if he had been the
-drummer at the head of a procession or the elephant leading a menagerie
-into town. Boys of his own size pretended not to know he had been away
-at all; but they were consuming with envy, nevertheless. They would
-have given anything to have that swarthy suntanned skin of his, and his
-glittering notoriety; and Tom would not have parted with either for a
-circus.
-
-At school the children made so much of him and of Joe, and delivered
-such eloquent admiration from their eyes, that the two heroes were not
-long in becoming insufferably "stuck-up." They began to tell their
-adventures to hungry listeners--but they only began; it was not a thing
-likely to have an end, with imaginations like theirs to furnish
-material. And finally, when they got out their pipes and went serenely
-puffing around, the very summit of glory was reached.
-
-Tom decided that he could be independent of Becky Thatcher now. Glory
-was sufficient. He would live for glory. Now that he was distinguished,
-maybe she would be wanting to "make up." Well, let her--she should see
-that he could be as indifferent as some other people. Presently she
-arrived. Tom pretended not to see her. He moved away and joined a group
-of boys and girls and began to talk. Soon he observed that she was
-tripping gayly back and forth with flushed face and dancing eyes,
-pretending to be busy chasing schoolmates, and screaming with laughter
-when she made a capture; but he noticed that she always made her
-captures in his vicinity, and that she seemed to cast a conscious eye
-in his direction at such times, too. It gratified all the vicious
-vanity that was in him; and so, instead of winning him, it only "set
-him up" the more and made him the more diligent to avoid betraying that
-he knew she was about. Presently she gave over skylarking, and moved
-irresolutely about, sighing once or twice and glancing furtively and
-wistfully toward Tom. Then she observed that now Tom was talking more
-particularly to Amy Lawrence than to any one else. She felt a sharp
-pang and grew disturbed and uneasy at once. She tried to go away, but
-her feet were treacherous, and carried her to the group instead. She
-said to a girl almost at Tom's elbow--with sham vivacity:
-
-"Why, Mary Austin! you bad girl, why didn't you come to Sunday-school?"
-
-"I did come--didn't you see me?"
-
-"Why, no! Did you? Where did you sit?"
-
-"I was in Miss Peters' class, where I always go. I saw YOU."
-
-"Did you? Why, it's funny I didn't see you. I wanted to tell you about
-the picnic."
-
-"Oh, that's jolly. Who's going to give it?"
-
-"My ma's going to let me have one."
-
-"Oh, goody; I hope she'll let ME come."
-
-"Well, she will. The picnic's for me. She'll let anybody come that I
-want, and I want you."
-
-"That's ever so nice. When is it going to be?"
-
-"By and by. Maybe about vacation."
-
-"Oh, won't it be fun! You going to have all the girls and boys?"
-
-"Yes, every one that's friends to me--or wants to be"; and she glanced
-ever so furtively at Tom, but he talked right along to Amy Lawrence
-about the terrible storm on the island, and how the lightning tore the
-great sycamore tree "all to flinders" while he was "standing within
-three feet of it."
-
-"Oh, may I come?" said Grace Miller.
-
-"Yes."
-
-"And me?" said Sally Rogers.
-
-"Yes."
-
-"And me, too?" said Susy Harper. "And Joe?"
-
-"Yes."
-
-And so on, with clapping of joyful hands till all the group had begged
-for invitations but Tom and Amy. Then Tom turned coolly away, still
-talking, and took Amy with him. Becky's lips trembled and the tears
-came to her eyes; she hid these signs with a forced gayety and went on
-chattering, but the life had gone out of the picnic, now, and out of
-everything else; she got away as soon as she could and hid herself and
-had what her sex call "a good cry." Then she sat moody, with wounded
-pride, till the bell rang. She roused up, now, with a vindictive cast
-in her eye, and gave her plaited tails a shake and said she knew what
-SHE'D do.
-
-At recess Tom continued his flirtation with Amy with jubilant
-self-satisfaction. And he kept drifting about to find Becky and lacerate
-her with the performance. At last he spied her, but there was a sudden
-falling of his mercury. She was sitting cosily on a little bench behind
-the schoolhouse looking at a picture-book with Alfred Temple--and so
-absorbed were they, and their heads so close together over the book,
-that they did not seem to be conscious of anything in the world besides.
-Jealousy ran red-hot through Tom's veins. He began to hate himself for
-throwing away the chance Becky had offered for a reconciliation. He
-called himself a fool, and all the hard names he could think of. He
-wanted to cry with vexation. Amy chatted happily along, as they walked,
-for her heart was singing, but Tom's tongue had lost its function. He
-did not hear what Amy was saying, and whenever she paused expectantly he
-could only stammer an awkward assent, which was as often misplaced as
-otherwise. He kept drifting to the rear of the schoolhouse, again and
-again, to sear his eyeballs with the hateful spectacle there. He could
-not help it. And it maddened him to see, as he thought he saw, that
-Becky Thatcher never once suspected that he was even in the land of the
-living. But she did see, nevertheless; and she knew she was winning her
-fight, too, and was glad to see him suffer as she had suffered.
-
-Amy's happy prattle became intolerable. Tom hinted at things he had to
-attend to; things that must be done; and time was fleeting. But in
-vain--the girl chirped on. Tom thought, "Oh, hang her, ain't I ever
-going to get rid of her?" At last he must be attending to those
-things--and she said artlessly that she would be "around" when school
-let out. And he hastened away, hating her for it.
-
-"Any other boy!" Tom thought, grating his teeth. "Any boy in the whole
-town but that Saint Louis smarty that thinks he dresses so fine and is
-aristocracy! Oh, all right, I licked you the first day you ever saw
-this town, mister, and I'll lick you again! You just wait till I catch
-you out! I'll just take and--"
-
-And he went through the motions of thrashing an imaginary boy
---pummelling the air, and kicking and gouging. "Oh, you do, do you? You
-holler 'nough, do you? Now, then, let that learn you!" And so the
-imaginary flogging was finished to his satisfaction.
-
-Tom fled home at noon. His conscience could not endure any more of
-Amy's grateful happiness, and his jealousy could bear no more of the
-other distress. Becky resumed her picture inspections with Alfred, but
-as the minutes dragged along and no Tom came to suffer, her triumph
-began to cloud and she lost interest; gravity and absent-mindedness
-followed, and then melancholy; two or three times she pricked up her
-ear at a footstep, but it was a false hope; no Tom came. At last she
-grew entirely miserable and wished she hadn't carried it so far. When
-poor Alfred, seeing that he was losing her, he did not know how, kept
-exclaiming: "Oh, here's a jolly one! look at this!" she lost patience
-at last, and said, "Oh, don't bother me! I don't care for them!" and
-burst into tears, and got up and walked away.
-
-Alfred dropped alongside and was going to try to comfort her, but she
-said:
-
-"Go away and leave me alone, can't you! I hate you!"
-
-So the boy halted, wondering what he could have done--for she had said
-she would look at pictures all through the nooning--and she walked on,
-crying. Then Alfred went musing into the deserted schoolhouse. He was
-humiliated and angry. He easily guessed his way to the truth--the girl
-had simply made a convenience of him to vent her spite upon Tom Sawyer.
-He was far from hating Tom the less when this thought occurred to him.
-He wished there was some way to get that boy into trouble without much
-risk to himself. Tom's spelling-book fell under his eye. Here was his
-opportunity. He gratefully opened to the lesson for the afternoon and
-poured ink upon the page.
-
-Becky, glancing in at a window behind him at the moment, saw the act,
-and moved on, without discovering herself. She started homeward, now,
-intending to find Tom and tell him; Tom would be thankful and their
-troubles would be healed. Before she was half way home, however, she
-had changed her mind. The thought of Tom's treatment of her when she
-was talking about her picnic came scorching back and filled her with
-shame. She resolved to let him get whipped on the damaged
-spelling-book's account, and to hate him forever, into the bargain.
-
-
-
-CHAPTER XIX
-
-TOM arrived at home in a dreary mood, and the first thing his aunt
-said to him showed him that he had brought his sorrows to an
-unpromising market:
-
-"Tom, I've a notion to skin you alive!"
-
-"Auntie, what have I done?"
-
-"Well, you've done enough. Here I go over to Sereny Harper, like an
-old softy, expecting I'm going to make her believe all that rubbage
-about that dream, when lo and behold you she'd found out from Joe that
-you was over here and heard all the talk we had that night. Tom, I
-don't know what is to become of a boy that will act like that. It makes
-me feel so bad to think you could let me go to Sereny Harper and make
-such a fool of myself and never say a word."
-
-This was a new aspect of the thing. His smartness of the morning had
-seemed to Tom a good joke before, and very ingenious. It merely looked
-mean and shabby now. He hung his head and could not think of anything
-to say for a moment. Then he said:
-
-"Auntie, I wish I hadn't done it--but I didn't think."
-
-"Oh, child, you never think. You never think of anything but your own
-selfishness. You could think to come all the way over here from
-Jackson's Island in the night to laugh at our troubles, and you could
-think to fool me with a lie about a dream; but you couldn't ever think
-to pity us and save us from sorrow."
-
-"Auntie, I know now it was mean, but I didn't mean to be mean. I
-didn't, honest. And besides, I didn't come over here to laugh at you
-that night."
-
-"What did you come for, then?"
-
-"It was to tell you not to be uneasy about us, because we hadn't got
-drownded."
-
-"Tom, Tom, I would be the thankfullest soul in this world if I could
-believe you ever had as good a thought as that, but you know you never
-did--and I know it, Tom."
-
-"Indeed and 'deed I did, auntie--I wish I may never stir if I didn't."
-
-"Oh, Tom, don't lie--don't do it. It only makes things a hundred times
-worse."
-
-"It ain't a lie, auntie; it's the truth. I wanted to keep you from
-grieving--that was all that made me come."
-
-"I'd give the whole world to believe that--it would cover up a power
-of sins, Tom. I'd 'most be glad you'd run off and acted so bad. But it
-ain't reasonable; because, why didn't you tell me, child?"
-
-"Why, you see, when you got to talking about the funeral, I just got
-all full of the idea of our coming and hiding in the church, and I
-couldn't somehow bear to spoil it. So I just put the bark back in my
-pocket and kept mum."
-
-"What bark?"
-
-"The bark I had wrote on to tell you we'd gone pirating. I wish, now,
-you'd waked up when I kissed you--I do, honest."
-
-The hard lines in his aunt's face relaxed and a sudden tenderness
-dawned in her eyes.
-
-"DID you kiss me, Tom?"
-
-"Why, yes, I did."
-
-"Are you sure you did, Tom?"
-
-"Why, yes, I did, auntie--certain sure."
-
-"What did you kiss me for, Tom?"
-
-"Because I loved you so, and you laid there moaning and I was so sorry."
-
-The words sounded like truth. The old lady could not hide a tremor in
-her voice when she said:
-
-"Kiss me again, Tom!--and be off with you to school, now, and don't
-bother me any more."
-
-The moment he was gone, she ran to a closet and got out the ruin of a
-jacket which Tom had gone pirating in. Then she stopped, with it in her
-hand, and said to herself:
-
-"No, I don't dare. Poor boy, I reckon he's lied about it--but it's a
-blessed, blessed lie, there's such a comfort come from it. I hope the
-Lord--I KNOW the Lord will forgive him, because it was such
-goodheartedness in him to tell it. But I don't want to find out it's a
-lie. I won't look."
-
-She put the jacket away, and stood by musing a minute. Twice she put
-out her hand to take the garment again, and twice she refrained. Once
-more she ventured, and this time she fortified herself with the
-thought: "It's a good lie--it's a good lie--I won't let it grieve me."
-So she sought the jacket pocket. A moment later she was reading Tom's
-piece of bark through flowing tears and saying: "I could forgive the
-boy, now, if he'd committed a million sins!"
-
-
-
-CHAPTER XX
-
-THERE was something about Aunt Polly's manner, when she kissed Tom,
-that swept away his low spirits and made him lighthearted and happy
-again. He started to school and had the luck of coming upon Becky
-Thatcher at the head of Meadow Lane. His mood always determined his
-manner. Without a moment's hesitation he ran to her and said:
-
-"I acted mighty mean to-day, Becky, and I'm so sorry. I won't ever,
-ever do that way again, as long as ever I live--please make up, won't
-you?"
-
-The girl stopped and looked him scornfully in the face:
-
-"I'll thank you to keep yourself TO yourself, Mr. Thomas Sawyer. I'll
-never speak to you again."
-
-She tossed her head and passed on. Tom was so stunned that he had not
-even presence of mind enough to say "Who cares, Miss Smarty?" until the
-right time to say it had gone by. So he said nothing. But he was in a
-fine rage, nevertheless. He moped into the schoolyard wishing she were
-a boy, and imagining how he would trounce her if she were. He presently
-encountered her and delivered a stinging remark as he passed. She
-hurled one in return, and the angry breach was complete. It seemed to
-Becky, in her hot resentment, that she could hardly wait for school to
-"take in," she was so impatient to see Tom flogged for the injured
-spelling-book. If she had had any lingering notion of exposing Alfred
-Temple, Tom's offensive fling had driven it entirely away.
-
-Poor girl, she did not know how fast she was nearing trouble herself.
-The master, Mr. Dobbins, had reached middle age with an unsatisfied
-ambition. The darling of his desires was, to be a doctor, but poverty
-had decreed that he should be nothing higher than a village
-schoolmaster. Every day he took a mysterious book out of his desk and
-absorbed himself in it at times when no classes were reciting. He kept
-that book under lock and key. There was not an urchin in school but was
-perishing to have a glimpse of it, but the chance never came. Every boy
-and girl had a theory about the nature of that book; but no two
-theories were alike, and there was no way of getting at the facts in
-the case. Now, as Becky was passing by the desk, which stood near the
-door, she noticed that the key was in the lock! It was a precious
-moment. She glanced around; found herself alone, and the next instant
-she had the book in her hands. The title-page--Professor Somebody's
-ANATOMY--carried no information to her mind; so she began to turn the
-leaves. She came at once upon a handsomely engraved and colored
-frontispiece--a human figure, stark naked. At that moment a shadow fell
-on the page and Tom Sawyer stepped in at the door and caught a glimpse
-of the picture. Becky snatched at the book to close it, and had the
-hard luck to tear the pictured page half down the middle. She thrust
-the volume into the desk, turned the key, and burst out crying with
-shame and vexation.
-
-"Tom Sawyer, you are just as mean as you can be, to sneak up on a
-person and look at what they're looking at."
-
-"How could I know you was looking at anything?"
-
-"You ought to be ashamed of yourself, Tom Sawyer; you know you're
-going to tell on me, and oh, what shall I do, what shall I do! I'll be
-whipped, and I never was whipped in school."
-
-Then she stamped her little foot and said:
-
-"BE so mean if you want to! I know something that's going to happen.
-You just wait and you'll see! Hateful, hateful, hateful!"--and she
-flung out of the house with a new explosion of crying.
-
-Tom stood still, rather flustered by this onslaught. Presently he said
-to himself:
-
-"What a curious kind of a fool a girl is! Never been licked in school!
-Shucks! What's a licking! That's just like a girl--they're so
-thin-skinned and chicken-hearted. Well, of course I ain't going to tell
-old Dobbins on this little fool, because there's other ways of getting
-even on her, that ain't so mean; but what of it? Old Dobbins will ask
-who it was tore his book. Nobody'll answer. Then he'll do just the way
-he always does--ask first one and then t'other, and when he comes to the
-right girl he'll know it, without any telling. Girls' faces always tell
-on them. They ain't got any backbone. She'll get licked. Well, it's a
-kind of a tight place for Becky Thatcher, because there ain't any way
-out of it." Tom conned the thing a moment longer, and then added: "All
-right, though; she'd like to see me in just such a fix--let her sweat it
-out!"
-
-Tom joined the mob of skylarking scholars outside. In a few moments
-the master arrived and school "took in." Tom did not feel a strong
-interest in his studies. Every time he stole a glance at the girls'
-side of the room Becky's face troubled him. Considering all things, he
-did not want to pity her, and yet it was all he could do to help it. He
-could get up no exultation that was really worthy the name. Presently
-the spelling-book discovery was made, and Tom's mind was entirely full
-of his own matters for a while after that. Becky roused up from her
-lethargy of distress and showed good interest in the proceedings. She
-did not expect that Tom could get out of his trouble by denying that he
-spilt the ink on the book himself; and she was right. The denial only
-seemed to make the thing worse for Tom. Becky supposed she would be
-glad of that, and she tried to believe she was glad of it, but she
-found she was not certain. When the worst came to the worst, she had an
-impulse to get up and tell on Alfred Temple, but she made an effort and
-forced herself to keep still--because, said she to herself, "he'll tell
-about me tearing the picture sure. I wouldn't say a word, not to save
-his life!"
-
-Tom took his whipping and went back to his seat not at all
-broken-hearted, for he thought it was possible that he had unknowingly
-upset the ink on the spelling-book himself, in some skylarking bout--he
-had denied it for form's sake and because it was custom, and had stuck
-to the denial from principle.
-
-A whole hour drifted by, the master sat nodding in his throne, the air
-was drowsy with the hum of study. By and by, Mr. Dobbins straightened
-himself up, yawned, then unlocked his desk, and reached for his book,
-but seemed undecided whether to take it out or leave it. Most of the
-pupils glanced up languidly, but there were two among them that watched
-his movements with intent eyes. Mr. Dobbins fingered his book absently
-for a while, then took it out and settled himself in his chair to read!
-Tom shot a glance at Becky. He had seen a hunted and helpless rabbit
-look as she did, with a gun levelled at its head. Instantly he forgot
-his quarrel with her. Quick--something must be done! done in a flash,
-too! But the very imminence of the emergency paralyzed his invention.
-Good!--he had an inspiration! He would run and snatch the book, spring
-through the door and fly. But his resolution shook for one little
-instant, and the chance was lost--the master opened the volume. If Tom
-only had the wasted opportunity back again! Too late. There was no help
-for Becky now, he said. The next moment the master faced the school.
-Every eye sank under his gaze. There was that in it which smote even
-the innocent with fear. There was silence while one might count ten
---the master was gathering his wrath. Then he spoke: "Who tore this book?"
-
-There was not a sound. One could have heard a pin drop. The stillness
-continued; the master searched face after face for signs of guilt.
-
-"Benjamin Rogers, did you tear this book?"
-
-A denial. Another pause.
-
-"Joseph Harper, did you?"
-
-Another denial. Tom's uneasiness grew more and more intense under the
-slow torture of these proceedings. The master scanned the ranks of
-boys--considered a while, then turned to the girls:
-
-"Amy Lawrence?"
-
-A shake of the head.
-
-"Gracie Miller?"
-
-The same sign.
-
-"Susan Harper, did you do this?"
-
-Another negative. The next girl was Becky Thatcher. Tom was trembling
-from head to foot with excitement and a sense of the hopelessness of
-the situation.
-
-"Rebecca Thatcher" [Tom glanced at her face--it was white with terror]
---"did you tear--no, look me in the face" [her hands rose in appeal]
---"did you tear this book?"
-
-A thought shot like lightning through Tom's brain. He sprang to his
-feet and shouted--"I done it!"
-
-The school stared in perplexity at this incredible folly. Tom stood a
-moment, to gather his dismembered faculties; and when he stepped
-forward to go to his punishment the surprise, the gratitude, the
-adoration that shone upon him out of poor Becky's eyes seemed pay
-enough for a hundred floggings. Inspired by the splendor of his own
-act, he took without an outcry the most merciless flaying that even Mr.
-Dobbins had ever administered; and also received with indifference the
-added cruelty of a command to remain two hours after school should be
-dismissed--for he knew who would wait for him outside till his
-captivity was done, and not count the tedious time as loss, either.
-
-Tom went to bed that night planning vengeance against Alfred Temple;
-for with shame and repentance Becky had told him all, not forgetting
-her own treachery; but even the longing for vengeance had to give way,
-soon, to pleasanter musings, and he fell asleep at last with Becky's
-latest words lingering dreamily in his ear--
-
-"Tom, how COULD you be so noble!"
-
-
-
-CHAPTER XXI
-
-VACATION was approaching. The schoolmaster, always severe, grew
-severer and more exacting than ever, for he wanted the school to make a
-good showing on "Examination" day. His rod and his ferule were seldom
-idle now--at least among the smaller pupils. Only the biggest boys, and
-young ladies of eighteen and twenty, escaped lashing. Mr. Dobbins'
-lashings were very vigorous ones, too; for although he carried, under
-his wig, a perfectly bald and shiny head, he had only reached middle
-age, and there was no sign of feebleness in his muscle. As the great
-day approached, all the tyranny that was in him came to the surface; he
-seemed to take a vindictive pleasure in punishing the least
-shortcomings. The consequence was, that the smaller boys spent their
-days in terror and suffering and their nights in plotting revenge. They
-threw away no opportunity to do the master a mischief. But he kept
-ahead all the time. The retribution that followed every vengeful
-success was so sweeping and majestic that the boys always retired from
-the field badly worsted. At last they conspired together and hit upon a
-plan that promised a dazzling victory. They swore in the sign-painter's
-boy, told him the scheme, and asked his help. He had his own reasons
-for being delighted, for the master boarded in his father's family and
-had given the boy ample cause to hate him. The master's wife would go
-on a visit to the country in a few days, and there would be nothing to
-interfere with the plan; the master always prepared himself for great
-occasions by getting pretty well fuddled, and the sign-painter's boy
-said that when the dominie had reached the proper condition on
-Examination Evening he would "manage the thing" while he napped in his
-chair; then he would have him awakened at the right time and hurried
-away to school.
-
-In the fulness of time the interesting occasion arrived. At eight in
-the evening the schoolhouse was brilliantly lighted, and adorned with
-wreaths and festoons of foliage and flowers. The master sat throned in
-his great chair upon a raised platform, with his blackboard behind him.
-He was looking tolerably mellow. Three rows of benches on each side and
-six rows in front of him were occupied by the dignitaries of the town
-and by the parents of the pupils. To his left, back of the rows of
-citizens, was a spacious temporary platform upon which were seated the
-scholars who were to take part in the exercises of the evening; rows of
-small boys, washed and dressed to an intolerable state of discomfort;
-rows of gawky big boys; snowbanks of girls and young ladies clad in
-lawn and muslin and conspicuously conscious of their bare arms, their
-grandmothers' ancient trinkets, their bits of pink and blue ribbon and
-the flowers in their hair. All the rest of the house was filled with
-non-participating scholars.
-
-The exercises began. A very little boy stood up and sheepishly
-recited, "You'd scarce expect one of my age to speak in public on the
-stage," etc.--accompanying himself with the painfully exact and
-spasmodic gestures which a machine might have used--supposing the
-machine to be a trifle out of order. But he got through safely, though
-cruelly scared, and got a fine round of applause when he made his
-manufactured bow and retired.
-
-A little shamefaced girl lisped, "Mary had a little lamb," etc.,
-performed a compassion-inspiring curtsy, got her meed of applause, and
-sat down flushed and happy.
-
-Tom Sawyer stepped forward with conceited confidence and soared into
-the unquenchable and indestructible "Give me liberty or give me death"
-speech, with fine fury and frantic gesticulation, and broke down in the
-middle of it. A ghastly stage-fright seized him, his legs quaked under
-him and he was like to choke. True, he had the manifest sympathy of the
-house but he had the house's silence, too, which was even worse than
-its sympathy. The master frowned, and this completed the disaster. Tom
-struggled awhile and then retired, utterly defeated. There was a weak
-attempt at applause, but it died early.
-
-"The Boy Stood on the Burning Deck" followed; also "The Assyrian Came
-Down," and other declamatory gems. Then there were reading exercises,
-and a spelling fight. The meagre Latin class recited with honor. The
-prime feature of the evening was in order, now--original "compositions"
-by the young ladies. Each in her turn stepped forward to the edge of
-the platform, cleared her throat, held up her manuscript (tied with
-dainty ribbon), and proceeded to read, with labored attention to
-"expression" and punctuation. The themes were the same that had been
-illuminated upon similar occasions by their mothers before them, their
-grandmothers, and doubtless all their ancestors in the female line
-clear back to the Crusades. "Friendship" was one; "Memories of Other
-Days"; "Religion in History"; "Dream Land"; "The Advantages of
-Culture"; "Forms of Political Government Compared and Contrasted";
-"Melancholy"; "Filial Love"; "Heart Longings," etc., etc.
-
-A prevalent feature in these compositions was a nursed and petted
-melancholy; another was a wasteful and opulent gush of "fine language";
-another was a tendency to lug in by the ears particularly prized words
-and phrases until they were worn entirely out; and a peculiarity that
-conspicuously marked and marred them was the inveterate and intolerable
-sermon that wagged its crippled tail at the end of each and every one
-of them. No matter what the subject might be, a brain-racking effort
-was made to squirm it into some aspect or other that the moral and
-religious mind could contemplate with edification. The glaring
-insincerity of these sermons was not sufficient to compass the
-banishment of the fashion from the schools, and it is not sufficient
-to-day; it never will be sufficient while the world stands, perhaps.
-There is no school in all our land where the young ladies do not feel
-obliged to close their compositions with a sermon; and you will find
-that the sermon of the most frivolous and the least religious girl in
-the school is always the longest and the most relentlessly pious. But
-enough of this. Homely truth is unpalatable.
-
-Let us return to the "Examination." The first composition that was
-read was one entitled "Is this, then, Life?" Perhaps the reader can
-endure an extract from it:
-
-  "In the common walks of life, with what delightful
-   emotions does the youthful mind look forward to some
-   anticipated scene of festivity! Imagination is busy
-   sketching rose-tinted pictures of joy. In fancy, the
-   voluptuous votary of fashion sees herself amid the
-   festive throng, 'the observed of all observers.' Her
-   graceful form, arrayed in snowy robes, is whirling
-   through the mazes of the joyous dance; her eye is
-   brightest, her step is lightest in the gay assembly.
-
-  "In such delicious fancies time quickly glides by,
-   and the welcome hour arrives for her entrance into
-   the Elysian world, of which she has had such bright
-   dreams. How fairy-like does everything appear to
-   her enchanted vision! Each new scene is more charming
-   than the last. But after a while she finds that
-   beneath this goodly exterior, all is vanity, the
-   flattery which once charmed her soul, now grates
-   harshly upon her ear; the ball-room has lost its
-   charms; and with wasted health and imbittered heart,
-   she turns away with the conviction that earthly
-   pleasures cannot satisfy the longings of the soul!"
-
-And so forth and so on. There was a buzz of gratification from time to
-time during the reading, accompanied by whispered ejaculations of "How
-sweet!" "How eloquent!" "So true!" etc., and after the thing had closed
-with a peculiarly afflicting sermon the applause was enthusiastic.
-
-Then arose a slim, melancholy girl, whose face had the "interesting"
-paleness that comes of pills and indigestion, and read a "poem." Two
-stanzas of it will do:
-
-   "A MISSOURI MAIDEN'S FAREWELL TO ALABAMA
-
-   "Alabama, good-bye! I love thee well!
-      But yet for a while do I leave thee now!
-    Sad, yes, sad thoughts of thee my heart doth swell,
-      And burning recollections throng my brow!
-    For I have wandered through thy flowery woods;
-      Have roamed and read near Tallapoosa's stream;
-    Have listened to Tallassee's warring floods,
-      And wooed on Coosa's side Aurora's beam.
-
-   "Yet shame I not to bear an o'er-full heart,
-      Nor blush to turn behind my tearful eyes;
-    'Tis from no stranger land I now must part,
-      'Tis to no strangers left I yield these sighs.
-    Welcome and home were mine within this State,
-      Whose vales I leave--whose spires fade fast from me
-    And cold must be mine eyes, and heart, and tete,
-      When, dear Alabama! they turn cold on thee!"
-
-There were very few there who knew what "tete" meant, but the poem was
-very satisfactory, nevertheless.
-
-Next appeared a dark-complexioned, black-eyed, black-haired young
-lady, who paused an impressive moment, assumed a tragic expression, and
-began to read in a measured, solemn tone:
-
-  "A VISION
-
-   "Dark and tempestuous was night. Around the
-   throne on high not a single star quivered; but
-   the deep intonations of the heavy thunder
-   constantly vibrated upon the ear; whilst the
-   terrific lightning revelled in angry mood
-   through the cloudy chambers of heaven, seeming
-   to scorn the power exerted over its terror by
-   the illustrious Franklin! Even the boisterous
-   winds unanimously came forth from their mystic
-   homes, and blustered about as if to enhance by
-   their aid the wildness of the scene.
-
-   "At such a time, so dark, so dreary, for human
-   sympathy my very spirit sighed; but instead thereof,
-
-   "'My dearest friend, my counsellor, my comforter
-   and guide--My joy in grief, my second bliss
-   in joy,' came to my side. She moved like one of
-   those bright beings pictured in the sunny walks
-   of fancy's Eden by the romantic and young, a
-   queen of beauty unadorned save by her own
-   transcendent loveliness. So soft was her step, it
-   failed to make even a sound, and but for the
-   magical thrill imparted by her genial touch, as
-   other unobtrusive beauties, she would have glided
-   away un-perceived--unsought. A strange sadness
-   rested upon her features, like icy tears upon
-   the robe of December, as she pointed to the
-   contending elements without, and bade me contemplate
-   the two beings presented."
-
-This nightmare occupied some ten pages of manuscript and wound up with
-a sermon so destructive of all hope to non-Presbyterians that it took
-the first prize. This composition was considered to be the very finest
-effort of the evening. The mayor of the village, in delivering the
-prize to the author of it, made a warm speech in which he said that it
-was by far the most "eloquent" thing he had ever listened to, and that
-Daniel Webster himself might well be proud of it.
-
-It may be remarked, in passing, that the number of compositions in
-which the word "beauteous" was over-fondled, and human experience
-referred to as "life's page," was up to the usual average.
-
-Now the master, mellow almost to the verge of geniality, put his chair
-aside, turned his back to the audience, and began to draw a map of
-America on the blackboard, to exercise the geography class upon. But he
-made a sad business of it with his unsteady hand, and a smothered
-titter rippled over the house. He knew what the matter was, and set
-himself to right it. He sponged out lines and remade them; but he only
-distorted them more than ever, and the tittering was more pronounced.
-He threw his entire attention upon his work, now, as if determined not
-to be put down by the mirth. He felt that all eyes were fastened upon
-him; he imagined he was succeeding, and yet the tittering continued; it
-even manifestly increased. And well it might. There was a garret above,
-pierced with a scuttle over his head; and down through this scuttle
-came a cat, suspended around the haunches by a string; she had a rag
-tied about her head and jaws to keep her from mewing; as she slowly
-descended she curved upward and clawed at the string, she swung
-downward and clawed at the intangible air. The tittering rose higher
-and higher--the cat was within six inches of the absorbed teacher's
-head--down, down, a little lower, and she grabbed his wig with her
-desperate claws, clung to it, and was snatched up into the garret in an
-instant with her trophy still in her possession! And how the light did
-blaze abroad from the master's bald pate--for the sign-painter's boy
-had GILDED it!
-
-That broke up the meeting. The boys were avenged. Vacation had come.
-
-   NOTE:--The pretended "compositions" quoted in
-   this chapter are taken without alteration from a
-   volume entitled "Prose and Poetry, by a Western
-   Lady"--but they are exactly and precisely after
-   the schoolgirl pattern, and hence are much
-   happier than any mere imitations could be.
-
-
-
-CHAPTER XXII
-
-TOM joined the new order of Cadets of Temperance, being attracted by
-the showy character of their "regalia." He promised to abstain from
-smoking, chewing, and profanity as long as he remained a member. Now he
-found out a new thing--namely, that to promise not to do a thing is the
-surest way in the world to make a body want to go and do that very
-thing. Tom soon found himself tormented with a desire to drink and
-swear; the desire grew to be so intense that nothing but the hope of a
-chance to display himself in his red sash kept him from withdrawing
-from the order. Fourth of July was coming; but he soon gave that up
---gave it up before he had worn his shackles over forty-eight hours--and
-fixed his hopes upon old Judge Frazer, justice of the peace, who was
-apparently on his deathbed and would have a big public funeral, since
-he was so high an official. During three days Tom was deeply concerned
-about the Judge's condition and hungry for news of it. Sometimes his
-hopes ran high--so high that he would venture to get out his regalia
-and practise before the looking-glass. But the Judge had a most
-discouraging way of fluctuating. At last he was pronounced upon the
-mend--and then convalescent. Tom was disgusted; and felt a sense of
-injury, too. He handed in his resignation at once--and that night the
-Judge suffered a relapse and died. Tom resolved that he would never
-trust a man like that again.
-
-The funeral was a fine thing. The Cadets paraded in a style calculated
-to kill the late member with envy. Tom was a free boy again, however
---there was something in that. He could drink and swear, now--but found
-to his surprise that he did not want to. The simple fact that he could,
-took the desire away, and the charm of it.
-
-Tom presently wondered to find that his coveted vacation was beginning
-to hang a little heavily on his hands.
-
-He attempted a diary--but nothing happened during three days, and so
-he abandoned it.
-
-The first of all the negro minstrel shows came to town, and made a
-sensation. Tom and Joe Harper got up a band of performers and were
-happy for two days.
-
-Even the Glorious Fourth was in some sense a failure, for it rained
-hard, there was no procession in consequence, and the greatest man in
-the world (as Tom supposed), Mr. Benton, an actual United States
-Senator, proved an overwhelming disappointment--for he was not
-twenty-five feet high, nor even anywhere in the neighborhood of it.
-
-A circus came. The boys played circus for three days afterward in
-tents made of rag carpeting--admission, three pins for boys, two for
-girls--and then circusing was abandoned.
-
-A phrenologist and a mesmerizer came--and went again and left the
-village duller and drearier than ever.
-
-There were some boys-and-girls' parties, but they were so few and so
-delightful that they only made the aching voids between ache the harder.
-
-Becky Thatcher was gone to her Constantinople home to stay with her
-parents during vacation--so there was no bright side to life anywhere.
-
-The dreadful secret of the murder was a chronic misery. It was a very
-cancer for permanency and pain.
-
-Then came the measles.
-
-During two long weeks Tom lay a prisoner, dead to the world and its
-happenings. He was very ill, he was interested in nothing. When he got
-upon his feet at last and moved feebly down-town, a melancholy change
-had come over everything and every creature. There had been a
-"revival," and everybody had "got religion," not only the adults, but
-even the boys and girls. Tom went about, hoping against hope for the
-sight of one blessed sinful face, but disappointment crossed him
-everywhere. He found Joe Harper studying a Testament, and turned sadly
-away from the depressing spectacle. He sought Ben Rogers, and found him
-visiting the poor with a basket of tracts. He hunted up Jim Hollis, who
-called his attention to the precious blessing of his late measles as a
-warning. Every boy he encountered added another ton to his depression;
-and when, in desperation, he flew for refuge at last to the bosom of
-Huckleberry Finn and was received with a Scriptural quotation, his
-heart broke and he crept home and to bed realizing that he alone of all
-the town was lost, forever and forever.
-
-And that night there came on a terrific storm, with driving rain,
-awful claps of thunder and blinding sheets of lightning. He covered his
-head with the bedclothes and waited in a horror of suspense for his
-doom; for he had not the shadow of a doubt that all this hubbub was
-about him. He believed he had taxed the forbearance of the powers above
-to the extremity of endurance and that this was the result. It might
-have seemed to him a waste of pomp and ammunition to kill a bug with a
-battery of artillery, but there seemed nothing incongruous about the
-getting up such an expensive thunderstorm as this to knock the turf
-from under an insect like himself.
-
-By and by the tempest spent itself and died without accomplishing its
-object. The boy's first impulse was to be grateful, and reform. His
-second was to wait--for there might not be any more storms.
-
-The next day the doctors were back; Tom had relapsed. The three weeks
-he spent on his back this time seemed an entire age. When he got abroad
-at last he was hardly grateful that he had been spared, remembering how
-lonely was his estate, how companionless and forlorn he was. He drifted
-listlessly down the street and found Jim Hollis acting as judge in a
-juvenile court that was trying a cat for murder, in the presence of her
-victim, a bird. He found Joe Harper and Huck Finn up an alley eating a
-stolen melon. Poor lads! they--like Tom--had suffered a relapse.
-
-
-
-CHAPTER XXIII
-
-AT last the sleepy atmosphere was stirred--and vigorously: the murder
-trial came on in the court. It became the absorbing topic of village
-talk immediately. Tom could not get away from it. Every reference to
-the murder sent a shudder to his heart, for his troubled conscience and
-fears almost persuaded him that these remarks were put forth in his
-hearing as "feelers"; he did not see how he could be suspected of
-knowing anything about the murder, but still he could not be
-comfortable in the midst of this gossip. It kept him in a cold shiver
-all the time. He took Huck to a lonely place to have a talk with him.
-It would be some relief to unseal his tongue for a little while; to
-divide his burden of distress with another sufferer. Moreover, he
-wanted to assure himself that Huck had remained discreet.
-
-"Huck, have you ever told anybody about--that?"
-
-"'Bout what?"
-
-"You know what."
-
-"Oh--'course I haven't."
-
-"Never a word?"
-
-"Never a solitary word, so help me. What makes you ask?"
-
-"Well, I was afeard."
-
-"Why, Tom Sawyer, we wouldn't be alive two days if that got found out.
-YOU know that."
-
-Tom felt more comfortable. After a pause:
-
-"Huck, they couldn't anybody get you to tell, could they?"
-
-"Get me to tell? Why, if I wanted that half-breed devil to drownd me
-they could get me to tell. They ain't no different way."
-
-"Well, that's all right, then. I reckon we're safe as long as we keep
-mum. But let's swear again, anyway. It's more surer."
-
-"I'm agreed."
-
-So they swore again with dread solemnities.
-
-"What is the talk around, Huck? I've heard a power of it."
-
-"Talk? Well, it's just Muff Potter, Muff Potter, Muff Potter all the
-time. It keeps me in a sweat, constant, so's I want to hide som'ers."
-
-"That's just the same way they go on round me. I reckon he's a goner.
-Don't you feel sorry for him, sometimes?"
-
-"Most always--most always. He ain't no account; but then he hain't
-ever done anything to hurt anybody. Just fishes a little, to get money
-to get drunk on--and loafs around considerable; but lord, we all do
-that--leastways most of us--preachers and such like. But he's kind of
-good--he give me half a fish, once, when there warn't enough for two;
-and lots of times he's kind of stood by me when I was out of luck."
-
-"Well, he's mended kites for me, Huck, and knitted hooks on to my
-line. I wish we could get him out of there."
-
-"My! we couldn't get him out, Tom. And besides, 'twouldn't do any
-good; they'd ketch him again."
-
-"Yes--so they would. But I hate to hear 'em abuse him so like the
-dickens when he never done--that."
-
-"I do too, Tom. Lord, I hear 'em say he's the bloodiest looking
-villain in this country, and they wonder he wasn't ever hung before."
-
-"Yes, they talk like that, all the time. I've heard 'em say that if he
-was to get free they'd lynch him."
-
-"And they'd do it, too."
-
-The boys had a long talk, but it brought them little comfort. As the
-twilight drew on, they found themselves hanging about the neighborhood
-of the little isolated jail, perhaps with an undefined hope that
-something would happen that might clear away their difficulties. But
-nothing happened; there seemed to be no angels or fairies interested in
-this luckless captive.
-
-The boys did as they had often done before--went to the cell grating
-and gave Potter some tobacco and matches. He was on the ground floor
-and there were no guards.
-
-His gratitude for their gifts had always smote their consciences
-before--it cut deeper than ever, this time. They felt cowardly and
-treacherous to the last degree when Potter said:
-
-"You've been mighty good to me, boys--better'n anybody else in this
-town. And I don't forget it, I don't. Often I says to myself, says I,
-'I used to mend all the boys' kites and things, and show 'em where the
-good fishin' places was, and befriend 'em what I could, and now they've
-all forgot old Muff when he's in trouble; but Tom don't, and Huck
-don't--THEY don't forget him, says I, 'and I don't forget them.' Well,
-boys, I done an awful thing--drunk and crazy at the time--that's the
-only way I account for it--and now I got to swing for it, and it's
-right. Right, and BEST, too, I reckon--hope so, anyway. Well, we won't
-talk about that. I don't want to make YOU feel bad; you've befriended
-me. But what I want to say, is, don't YOU ever get drunk--then you won't
-ever get here. Stand a litter furder west--so--that's it; it's a prime
-comfort to see faces that's friendly when a body's in such a muck of
-trouble, and there don't none come here but yourn. Good friendly
-faces--good friendly faces. Git up on one another's backs and let me
-touch 'em. That's it. Shake hands--yourn'll come through the bars, but
-mine's too big. Little hands, and weak--but they've helped Muff Potter
-a power, and they'd help him more if they could."
-
-Tom went home miserable, and his dreams that night were full of
-horrors. The next day and the day after, he hung about the court-room,
-drawn by an almost irresistible impulse to go in, but forcing himself
-to stay out. Huck was having the same experience. They studiously
-avoided each other. Each wandered away, from time to time, but the same
-dismal fascination always brought them back presently. Tom kept his
-ears open when idlers sauntered out of the court-room, but invariably
-heard distressing news--the toils were closing more and more
-relentlessly around poor Potter. At the end of the second day the
-village talk was to the effect that Injun Joe's evidence stood firm and
-unshaken, and that there was not the slightest question as to what the
-jury's verdict would be.
-
-Tom was out late, that night, and came to bed through the window. He
-was in a tremendous state of excitement. It was hours before he got to
-sleep. All the village flocked to the court-house the next morning, for
-this was to be the great day. Both sexes were about equally represented
-in the packed audience. After a long wait the jury filed in and took
-their places; shortly afterward, Potter, pale and haggard, timid and
-hopeless, was brought in, with chains upon him, and seated where all
-the curious eyes could stare at him; no less conspicuous was Injun Joe,
-stolid as ever. There was another pause, and then the judge arrived and
-the sheriff proclaimed the opening of the court. The usual whisperings
-among the lawyers and gathering together of papers followed. These
-details and accompanying delays worked up an atmosphere of preparation
-that was as impressive as it was fascinating.
-
-Now a witness was called who testified that he found Muff Potter
-washing in the brook, at an early hour of the morning that the murder
-was discovered, and that he immediately sneaked away. After some
-further questioning, counsel for the prosecution said:
-
-"Take the witness."
-
-The prisoner raised his eyes for a moment, but dropped them again when
-his own counsel said:
-
-"I have no questions to ask him."
-
-The next witness proved the finding of the knife near the corpse.
-Counsel for the prosecution said:
-
-"Take the witness."
-
-"I have no questions to ask him," Potter's lawyer replied.
-
-A third witness swore he had often seen the knife in Potter's
-possession.
-
-"Take the witness."
-
-Counsel for Potter declined to question him. The faces of the audience
-began to betray annoyance. Did this attorney mean to throw away his
-client's life without an effort?
-
-Several witnesses deposed concerning Potter's guilty behavior when
-brought to the scene of the murder. They were allowed to leave the
-stand without being cross-questioned.
-
-Every detail of the damaging circumstances that occurred in the
-graveyard upon that morning which all present remembered so well was
-brought out by credible witnesses, but none of them were cross-examined
-by Potter's lawyer. The perplexity and dissatisfaction of the house
-expressed itself in murmurs and provoked a reproof from the bench.
-Counsel for the prosecution now said:
-
-"By the oaths of citizens whose simple word is above suspicion, we
-have fastened this awful crime, beyond all possibility of question,
-upon the unhappy prisoner at the bar. We rest our case here."
-
-A groan escaped from poor Potter, and he put his face in his hands and
-rocked his body softly to and fro, while a painful silence reigned in
-the court-room. Many men were moved, and many women's compassion
-testified itself in tears. Counsel for the defence rose and said:
-
-"Your honor, in our remarks at the opening of this trial, we
-foreshadowed our purpose to prove that our client did this fearful deed
-while under the influence of a blind and irresponsible delirium
-produced by drink. We have changed our mind. We shall not offer that
-plea." [Then to the clerk:] "Call Thomas Sawyer!"
-
-A puzzled amazement awoke in every face in the house, not even
-excepting Potter's. Every eye fastened itself with wondering interest
-upon Tom as he rose and took his place upon the stand. The boy looked
-wild enough, for he was badly scared. The oath was administered.
-
-"Thomas Sawyer, where were you on the seventeenth of June, about the
-hour of midnight?"
-
-Tom glanced at Injun Joe's iron face and his tongue failed him. The
-audience listened breathless, but the words refused to come. After a
-few moments, however, the boy got a little of his strength back, and
-managed to put enough of it into his voice to make part of the house
-hear:
-
-"In the graveyard!"
-
-"A little bit louder, please. Don't be afraid. You were--"
-
-"In the graveyard."
-
-A contemptuous smile flitted across Injun Joe's face.
-
-"Were you anywhere near Horse Williams' grave?"
-
-"Yes, sir."
-
-"Speak up--just a trifle louder. How near were you?"
-
-"Near as I am to you."
-
-"Were you hidden, or not?"
-
-"I was hid."
-
-"Where?"
-
-"Behind the elms that's on the edge of the grave."
-
-Injun Joe gave a barely perceptible start.
-
-"Any one with you?"
-
-"Yes, sir. I went there with--"
-
-"Wait--wait a moment. Never mind mentioning your companion's name. We
-will produce him at the proper time. Did you carry anything there with
-you."
-
-Tom hesitated and looked confused.
-
-"Speak out, my boy--don't be diffident. The truth is always
-respectable. What did you take there?"
-
-"Only a--a--dead cat."
-
-There was a ripple of mirth, which the court checked.
-
-"We will produce the skeleton of that cat. Now, my boy, tell us
-everything that occurred--tell it in your own way--don't skip anything,
-and don't be afraid."
-
-Tom began--hesitatingly at first, but as he warmed to his subject his
-words flowed more and more easily; in a little while every sound ceased
-but his own voice; every eye fixed itself upon him; with parted lips
-and bated breath the audience hung upon his words, taking no note of
-time, rapt in the ghastly fascinations of the tale. The strain upon
-pent emotion reached its climax when the boy said:
-
-"--and as the doctor fetched the board around and Muff Potter fell,
-Injun Joe jumped with the knife and--"
-
-Crash! Quick as lightning the half-breed sprang for a window, tore his
-way through all opposers, and was gone!
-
-
-
-CHAPTER XXIV
-
-TOM was a glittering hero once more--the pet of the old, the envy of
-the young. His name even went into immortal print, for the village
-paper magnified him. There were some that believed he would be
-President, yet, if he escaped hanging.
-
-As usual, the fickle, unreasoning world took Muff Potter to its bosom
-and fondled him as lavishly as it had abused him before. But that sort
-of conduct is to the world's credit; therefore it is not well to find
-fault with it.
-
-Tom's days were days of splendor and exultation to him, but his nights
-were seasons of horror. Injun Joe infested all his dreams, and always
-with doom in his eye. Hardly any temptation could persuade the boy to
-stir abroad after nightfall. Poor Huck was in the same state of
-wretchedness and terror, for Tom had told the whole story to the lawyer
-the night before the great day of the trial, and Huck was sore afraid
-that his share in the business might leak out, yet, notwithstanding
-Injun Joe's flight had saved him the suffering of testifying in court.
-The poor fellow had got the attorney to promise secrecy, but what of
-that? Since Tom's harassed conscience had managed to drive him to the
-lawyer's house by night and wring a dread tale from lips that had been
-sealed with the dismalest and most formidable of oaths, Huck's
-confidence in the human race was well-nigh obliterated.
-
-Daily Muff Potter's gratitude made Tom glad he had spoken; but nightly
-he wished he had sealed up his tongue.
-
-Half the time Tom was afraid Injun Joe would never be captured; the
-other half he was afraid he would be. He felt sure he never could draw
-a safe breath again until that man was dead and he had seen the corpse.
-
-Rewards had been offered, the country had been scoured, but no Injun
-Joe was found. One of those omniscient and awe-inspiring marvels, a
-detective, came up from St. Louis, moused around, shook his head,
-looked wise, and made that sort of astounding success which members of
-that craft usually achieve. That is to say, he "found a clew." But you
-can't hang a "clew" for murder, and so after that detective had got
-through and gone home, Tom felt just as insecure as he was before.
-
-The slow days drifted on, and each left behind it a slightly lightened
-weight of apprehension.
-
-
-
-CHAPTER XXV
-
-THERE comes a time in every rightly-constructed boy's life when he has
-a raging desire to go somewhere and dig for hidden treasure. This
-desire suddenly came upon Tom one day. He sallied out to find Joe
-Harper, but failed of success. Next he sought Ben Rogers; he had gone
-fishing. Presently he stumbled upon Huck Finn the Red-Handed. Huck
-would answer. Tom took him to a private place and opened the matter to
-him confidentially. Huck was willing. Huck was always willing to take a
-hand in any enterprise that offered entertainment and required no
-capital, for he had a troublesome superabundance of that sort of time
-which is not money. "Where'll we dig?" said Huck.
-
-"Oh, most anywhere."
-
-"Why, is it hid all around?"
-
-"No, indeed it ain't. It's hid in mighty particular places, Huck
---sometimes on islands, sometimes in rotten chests under the end of a
-limb of an old dead tree, just where the shadow falls at midnight; but
-mostly under the floor in ha'nted houses."
-
-"Who hides it?"
-
-"Why, robbers, of course--who'd you reckon? Sunday-school
-sup'rintendents?"
-
-"I don't know. If 'twas mine I wouldn't hide it; I'd spend it and have
-a good time."
-
-"So would I. But robbers don't do that way. They always hide it and
-leave it there."
-
-"Don't they come after it any more?"
-
-"No, they think they will, but they generally forget the marks, or
-else they die. Anyway, it lays there a long time and gets rusty; and by
-and by somebody finds an old yellow paper that tells how to find the
-marks--a paper that's got to be ciphered over about a week because it's
-mostly signs and hy'roglyphics."
-
-"Hyro--which?"
-
-"Hy'roglyphics--pictures and things, you know, that don't seem to mean
-anything."
-
-"Have you got one of them papers, Tom?"
-
-"No."
-
-"Well then, how you going to find the marks?"
-
-"I don't want any marks. They always bury it under a ha'nted house or
-on an island, or under a dead tree that's got one limb sticking out.
-Well, we've tried Jackson's Island a little, and we can try it again
-some time; and there's the old ha'nted house up the Still-House branch,
-and there's lots of dead-limb trees--dead loads of 'em."
-
-"Is it under all of them?"
-
-"How you talk! No!"
-
-"Then how you going to know which one to go for?"
-
-"Go for all of 'em!"
-
-"Why, Tom, it'll take all summer."
-
-"Well, what of that? Suppose you find a brass pot with a hundred
-dollars in it, all rusty and gray, or rotten chest full of di'monds.
-How's that?"
-
-Huck's eyes glowed.
-
-"That's bully. Plenty bully enough for me. Just you gimme the hundred
-dollars and I don't want no di'monds."
-
-"All right. But I bet you I ain't going to throw off on di'monds. Some
-of 'em's worth twenty dollars apiece--there ain't any, hardly, but's
-worth six bits or a dollar."
-
-"No! Is that so?"
-
-"Cert'nly--anybody'll tell you so. Hain't you ever seen one, Huck?"
-
-"Not as I remember."
-
-"Oh, kings have slathers of them."
-
-"Well, I don' know no kings, Tom."
-
-"I reckon you don't. But if you was to go to Europe you'd see a raft
-of 'em hopping around."
-
-"Do they hop?"
-
-"Hop?--your granny! No!"
-
-"Well, what did you say they did, for?"
-
-"Shucks, I only meant you'd SEE 'em--not hopping, of course--what do
-they want to hop for?--but I mean you'd just see 'em--scattered around,
-you know, in a kind of a general way. Like that old humpbacked Richard."
-
-"Richard? What's his other name?"
-
-"He didn't have any other name. Kings don't have any but a given name."
-
-"No?"
-
-"But they don't."
-
-"Well, if they like it, Tom, all right; but I don't want to be a king
-and have only just a given name, like a nigger. But say--where you
-going to dig first?"
-
-"Well, I don't know. S'pose we tackle that old dead-limb tree on the
-hill t'other side of Still-House branch?"
-
-"I'm agreed."
-
-So they got a crippled pick and a shovel, and set out on their
-three-mile tramp. They arrived hot and panting, and threw themselves
-down in the shade of a neighboring elm to rest and have a smoke.
-
-"I like this," said Tom.
-
-"So do I."
-
-"Say, Huck, if we find a treasure here, what you going to do with your
-share?"
-
-"Well, I'll have pie and a glass of soda every day, and I'll go to
-every circus that comes along. I bet I'll have a gay time."
-
-"Well, ain't you going to save any of it?"
-
-"Save it? What for?"
-
-"Why, so as to have something to live on, by and by."
-
-"Oh, that ain't any use. Pap would come back to thish-yer town some
-day and get his claws on it if I didn't hurry up, and I tell you he'd
-clean it out pretty quick. What you going to do with yourn, Tom?"
-
-"I'm going to buy a new drum, and a sure-'nough sword, and a red
-necktie and a bull pup, and get married."
-
-"Married!"
-
-"That's it."
-
-"Tom, you--why, you ain't in your right mind."
-
-"Wait--you'll see."
-
-"Well, that's the foolishest thing you could do. Look at pap and my
-mother. Fight! Why, they used to fight all the time. I remember, mighty
-well."
-
-"That ain't anything. The girl I'm going to marry won't fight."
-
-"Tom, I reckon they're all alike. They'll all comb a body. Now you
-better think 'bout this awhile. I tell you you better. What's the name
-of the gal?"
-
-"It ain't a gal at all--it's a girl."
-
-"It's all the same, I reckon; some says gal, some says girl--both's
-right, like enough. Anyway, what's her name, Tom?"
-
-"I'll tell you some time--not now."
-
-"All right--that'll do. Only if you get married I'll be more lonesomer
-than ever."
-
-"No you won't. You'll come and live with me. Now stir out of this and
-we'll go to digging."
-
-They worked and sweated for half an hour. No result. They toiled
-another half-hour. Still no result. Huck said:
-
-"Do they always bury it as deep as this?"
-
-"Sometimes--not always. Not generally. I reckon we haven't got the
-right place."
-
-So they chose a new spot and began again. The labor dragged a little,
-but still they made progress. They pegged away in silence for some
-time. Finally Huck leaned on his shovel, swabbed the beaded drops from
-his brow with his sleeve, and said:
-
-"Where you going to dig next, after we get this one?"
-
-"I reckon maybe we'll tackle the old tree that's over yonder on
-Cardiff Hill back of the widow's."
-
-"I reckon that'll be a good one. But won't the widow take it away from
-us, Tom? It's on her land."
-
-"SHE take it away! Maybe she'd like to try it once. Whoever finds one
-of these hid treasures, it belongs to him. It don't make any difference
-whose land it's on."
-
-That was satisfactory. The work went on. By and by Huck said:
-
-"Blame it, we must be in the wrong place again. What do you think?"
-
-"It is mighty curious, Huck. I don't understand it. Sometimes witches
-interfere. I reckon maybe that's what's the trouble now."
-
-"Shucks! Witches ain't got no power in the daytime."
-
-"Well, that's so. I didn't think of that. Oh, I know what the matter
-is! What a blamed lot of fools we are! You got to find out where the
-shadow of the limb falls at midnight, and that's where you dig!"
-
-"Then consound it, we've fooled away all this work for nothing. Now
-hang it all, we got to come back in the night. It's an awful long way.
-Can you get out?"
-
-"I bet I will. We've got to do it to-night, too, because if somebody
-sees these holes they'll know in a minute what's here and they'll go
-for it."
-
-"Well, I'll come around and maow to-night."
-
-"All right. Let's hide the tools in the bushes."
-
-The boys were there that night, about the appointed time. They sat in
-the shadow waiting. It was a lonely place, and an hour made solemn by
-old traditions. Spirits whispered in the rustling leaves, ghosts lurked
-in the murky nooks, the deep baying of a hound floated up out of the
-distance, an owl answered with his sepulchral note. The boys were
-subdued by these solemnities, and talked little. By and by they judged
-that twelve had come; they marked where the shadow fell, and began to
-dig. Their hopes commenced to rise. Their interest grew stronger, and
-their industry kept pace with it. The hole deepened and still deepened,
-but every time their hearts jumped to hear the pick strike upon
-something, they only suffered a new disappointment. It was only a stone
-or a chunk. At last Tom said:
-
-"It ain't any use, Huck, we're wrong again."
-
-"Well, but we CAN'T be wrong. We spotted the shadder to a dot."
-
-"I know it, but then there's another thing."
-
-"What's that?".
-
-"Why, we only guessed at the time. Like enough it was too late or too
-early."
-
-Huck dropped his shovel.
-
-"That's it," said he. "That's the very trouble. We got to give this
-one up. We can't ever tell the right time, and besides this kind of
-thing's too awful, here this time of night with witches and ghosts
-a-fluttering around so. I feel as if something's behind me all the time;
-and I'm afeard to turn around, becuz maybe there's others in front
-a-waiting for a chance. I been creeping all over, ever since I got here."
-
-"Well, I've been pretty much so, too, Huck. They most always put in a
-dead man when they bury a treasure under a tree, to look out for it."
-
-"Lordy!"
-
-"Yes, they do. I've always heard that."
-
-"Tom, I don't like to fool around much where there's dead people. A
-body's bound to get into trouble with 'em, sure."
-
-"I don't like to stir 'em up, either. S'pose this one here was to
-stick his skull out and say something!"
-
-"Don't Tom! It's awful."
-
-"Well, it just is. Huck, I don't feel comfortable a bit."
-
-"Say, Tom, let's give this place up, and try somewheres else."
-
-"All right, I reckon we better."
-
-"What'll it be?"
-
-Tom considered awhile; and then said:
-
-"The ha'nted house. That's it!"
-
-"Blame it, I don't like ha'nted houses, Tom. Why, they're a dern sight
-worse'n dead people. Dead people might talk, maybe, but they don't come
-sliding around in a shroud, when you ain't noticing, and peep over your
-shoulder all of a sudden and grit their teeth, the way a ghost does. I
-couldn't stand such a thing as that, Tom--nobody could."
-
-"Yes, but, Huck, ghosts don't travel around only at night. They won't
-hender us from digging there in the daytime."
-
-"Well, that's so. But you know mighty well people don't go about that
-ha'nted house in the day nor the night."
-
-"Well, that's mostly because they don't like to go where a man's been
-murdered, anyway--but nothing's ever been seen around that house except
-in the night--just some blue lights slipping by the windows--no regular
-ghosts."
-
-"Well, where you see one of them blue lights flickering around, Tom,
-you can bet there's a ghost mighty close behind it. It stands to
-reason. Becuz you know that they don't anybody but ghosts use 'em."
-
-"Yes, that's so. But anyway they don't come around in the daytime, so
-what's the use of our being afeard?"
-
-"Well, all right. We'll tackle the ha'nted house if you say so--but I
-reckon it's taking chances."
-
-They had started down the hill by this time. There in the middle of
-the moonlit valley below them stood the "ha'nted" house, utterly
-isolated, its fences gone long ago, rank weeds smothering the very
-doorsteps, the chimney crumbled to ruin, the window-sashes vacant, a
-corner of the roof caved in. The boys gazed awhile, half expecting to
-see a blue light flit past a window; then talking in a low tone, as
-befitted the time and the circumstances, they struck far off to the
-right, to give the haunted house a wide berth, and took their way
-homeward through the woods that adorned the rearward side of Cardiff
-Hill.
-
-
-
-CHAPTER XXVI
-
-ABOUT noon the next day the boys arrived at the dead tree; they had
-come for their tools. Tom was impatient to go to the haunted house;
-Huck was measurably so, also--but suddenly said:
-
-"Lookyhere, Tom, do you know what day it is?"
-
-Tom mentally ran over the days of the week, and then quickly lifted
-his eyes with a startled look in them--
-
-"My! I never once thought of it, Huck!"
-
-"Well, I didn't neither, but all at once it popped onto me that it was
-Friday."
-
-"Blame it, a body can't be too careful, Huck. We might 'a' got into an
-awful scrape, tackling such a thing on a Friday."
-
-"MIGHT! Better say we WOULD! There's some lucky days, maybe, but
-Friday ain't."
-
-"Any fool knows that. I don't reckon YOU was the first that found it
-out, Huck."
-
-"Well, I never said I was, did I? And Friday ain't all, neither. I had
-a rotten bad dream last night--dreampt about rats."
-
-"No! Sure sign of trouble. Did they fight?"
-
-"No."
-
-"Well, that's good, Huck. When they don't fight it's only a sign that
-there's trouble around, you know. All we got to do is to look mighty
-sharp and keep out of it. We'll drop this thing for to-day, and play.
-Do you know Robin Hood, Huck?"
-
-"No. Who's Robin Hood?"
-
-"Why, he was one of the greatest men that was ever in England--and the
-best. He was a robber."
-
-"Cracky, I wisht I was. Who did he rob?"
-
-"Only sheriffs and bishops and rich people and kings, and such like.
-But he never bothered the poor. He loved 'em. He always divided up with
-'em perfectly square."
-
-"Well, he must 'a' been a brick."
-
-"I bet you he was, Huck. Oh, he was the noblest man that ever was.
-They ain't any such men now, I can tell you. He could lick any man in
-England, with one hand tied behind him; and he could take his yew bow
-and plug a ten-cent piece every time, a mile and a half."
-
-"What's a YEW bow?"
-
-"I don't know. It's some kind of a bow, of course. And if he hit that
-dime only on the edge he would set down and cry--and curse. But we'll
-play Robin Hood--it's nobby fun. I'll learn you."
-
-"I'm agreed."
-
-So they played Robin Hood all the afternoon, now and then casting a
-yearning eye down upon the haunted house and passing a remark about the
-morrow's prospects and possibilities there. As the sun began to sink
-into the west they took their way homeward athwart the long shadows of
-the trees and soon were buried from sight in the forests of Cardiff
-Hill.
-
-On Saturday, shortly after noon, the boys were at the dead tree again.
-They had a smoke and a chat in the shade, and then dug a little in
-their last hole, not with great hope, but merely because Tom said there
-were so many cases where people had given up a treasure after getting
-down within six inches of it, and then somebody else had come along and
-turned it up with a single thrust of a shovel. The thing failed this
-time, however, so the boys shouldered their tools and went away feeling
-that they had not trifled with fortune, but had fulfilled all the
-requirements that belong to the business of treasure-hunting.
-
-When they reached the haunted house there was something so weird and
-grisly about the dead silence that reigned there under the baking sun,
-and something so depressing about the loneliness and desolation of the
-place, that they were afraid, for a moment, to venture in. Then they
-crept to the door and took a trembling peep. They saw a weed-grown,
-floorless room, unplastered, an ancient fireplace, vacant windows, a
-ruinous staircase; and here, there, and everywhere hung ragged and
-abandoned cobwebs. They presently entered, softly, with quickened
-pulses, talking in whispers, ears alert to catch the slightest sound,
-and muscles tense and ready for instant retreat.
-
-In a little while familiarity modified their fears and they gave the
-place a critical and interested examination, rather admiring their own
-boldness, and wondering at it, too. Next they wanted to look up-stairs.
-This was something like cutting off retreat, but they got to daring
-each other, and of course there could be but one result--they threw
-their tools into a corner and made the ascent. Up there were the same
-signs of decay. In one corner they found a closet that promised
-mystery, but the promise was a fraud--there was nothing in it. Their
-courage was up now and well in hand. They were about to go down and
-begin work when--
-
-"Sh!" said Tom.
-
-"What is it?" whispered Huck, blanching with fright.
-
-"Sh!... There!... Hear it?"
-
-"Yes!... Oh, my! Let's run!"
-
-"Keep still! Don't you budge! They're coming right toward the door."
-
-The boys stretched themselves upon the floor with their eyes to
-knot-holes in the planking, and lay waiting, in a misery of fear.
-
-"They've stopped.... No--coming.... Here they are. Don't whisper
-another word, Huck. My goodness, I wish I was out of this!"
-
-Two men entered. Each boy said to himself: "There's the old deaf and
-dumb Spaniard that's been about town once or twice lately--never saw
-t'other man before."
-
-"T'other" was a ragged, unkempt creature, with nothing very pleasant
-in his face. The Spaniard was wrapped in a serape; he had bushy white
-whiskers; long white hair flowed from under his sombrero, and he wore
-green goggles. When they came in, "t'other" was talking in a low voice;
-they sat down on the ground, facing the door, with their backs to the
-wall, and the speaker continued his remarks. His manner became less
-guarded and his words more distinct as he proceeded:
-
-"No," said he, "I've thought it all over, and I don't like it. It's
-dangerous."
-
-"Dangerous!" grunted the "deaf and dumb" Spaniard--to the vast
-surprise of the boys. "Milksop!"
-
-This voice made the boys gasp and quake. It was Injun Joe's! There was
-silence for some time. Then Joe said:
-
-"What's any more dangerous than that job up yonder--but nothing's come
-of it."
-
-"That's different. Away up the river so, and not another house about.
-'Twon't ever be known that we tried, anyway, long as we didn't succeed."
-
-"Well, what's more dangerous than coming here in the daytime!--anybody
-would suspicion us that saw us."
-
-"I know that. But there warn't any other place as handy after that
-fool of a job. I want to quit this shanty. I wanted to yesterday, only
-it warn't any use trying to stir out of here, with those infernal boys
-playing over there on the hill right in full view."
-
-"Those infernal boys" quaked again under the inspiration of this
-remark, and thought how lucky it was that they had remembered it was
-Friday and concluded to wait a day. They wished in their hearts they
-had waited a year.
-
-The two men got out some food and made a luncheon. After a long and
-thoughtful silence, Injun Joe said:
-
-"Look here, lad--you go back up the river where you belong. Wait there
-till you hear from me. I'll take the chances on dropping into this town
-just once more, for a look. We'll do that 'dangerous' job after I've
-spied around a little and think things look well for it. Then for
-Texas! We'll leg it together!"
-
-This was satisfactory. Both men presently fell to yawning, and Injun
-Joe said:
-
-"I'm dead for sleep! It's your turn to watch."
-
-He curled down in the weeds and soon began to snore. His comrade
-stirred him once or twice and he became quiet. Presently the watcher
-began to nod; his head drooped lower and lower, both men began to snore
-now.
-
-The boys drew a long, grateful breath. Tom whispered:
-
-"Now's our chance--come!"
-
-Huck said:
-
-"I can't--I'd die if they was to wake."
-
-Tom urged--Huck held back. At last Tom rose slowly and softly, and
-started alone. But the first step he made wrung such a hideous creak
-from the crazy floor that he sank down almost dead with fright. He
-never made a second attempt. The boys lay there counting the dragging
-moments till it seemed to them that time must be done and eternity
-growing gray; and then they were grateful to note that at last the sun
-was setting.
-
-Now one snore ceased. Injun Joe sat up, stared around--smiled grimly
-upon his comrade, whose head was drooping upon his knees--stirred him
-up with his foot and said:
-
-"Here! YOU'RE a watchman, ain't you! All right, though--nothing's
-happened."
-
-"My! have I been asleep?"
-
-"Oh, partly, partly. Nearly time for us to be moving, pard. What'll we
-do with what little swag we've got left?"
-
-"I don't know--leave it here as we've always done, I reckon. No use to
-take it away till we start south. Six hundred and fifty in silver's
-something to carry."
-
-"Well--all right--it won't matter to come here once more."
-
-"No--but I'd say come in the night as we used to do--it's better."
-
-"Yes: but look here; it may be a good while before I get the right
-chance at that job; accidents might happen; 'tain't in such a very good
-place; we'll just regularly bury it--and bury it deep."
-
-"Good idea," said the comrade, who walked across the room, knelt down,
-raised one of the rearward hearth-stones and took out a bag that
-jingled pleasantly. He subtracted from it twenty or thirty dollars for
-himself and as much for Injun Joe, and passed the bag to the latter,
-who was on his knees in the corner, now, digging with his bowie-knife.
-
-The boys forgot all their fears, all their miseries in an instant.
-With gloating eyes they watched every movement. Luck!--the splendor of
-it was beyond all imagination! Six hundred dollars was money enough to
-make half a dozen boys rich! Here was treasure-hunting under the
-happiest auspices--there would not be any bothersome uncertainty as to
-where to dig. They nudged each other every moment--eloquent nudges and
-easily understood, for they simply meant--"Oh, but ain't you glad NOW
-we're here!"
-
-Joe's knife struck upon something.
-
-"Hello!" said he.
-
-"What is it?" said his comrade.
-
-"Half-rotten plank--no, it's a box, I believe. Here--bear a hand and
-we'll see what it's here for. Never mind, I've broke a hole."
-
-He reached his hand in and drew it out--
-
-"Man, it's money!"
-
-The two men examined the handful of coins. They were gold. The boys
-above were as excited as themselves, and as delighted.
-
-Joe's comrade said:
-
-"We'll make quick work of this. There's an old rusty pick over amongst
-the weeds in the corner the other side of the fireplace--I saw it a
-minute ago."
-
-He ran and brought the boys' pick and shovel. Injun Joe took the pick,
-looked it over critically, shook his head, muttered something to
-himself, and then began to use it. The box was soon unearthed. It was
-not very large; it was iron bound and had been very strong before the
-slow years had injured it. The men contemplated the treasure awhile in
-blissful silence.
-
-"Pard, there's thousands of dollars here," said Injun Joe.
-
-"'Twas always said that Murrel's gang used to be around here one
-summer," the stranger observed.
-
-"I know it," said Injun Joe; "and this looks like it, I should say."
-
-"Now you won't need to do that job."
-
-The half-breed frowned. Said he:
-
-"You don't know me. Least you don't know all about that thing. 'Tain't
-robbery altogether--it's REVENGE!" and a wicked light flamed in his
-eyes. "I'll need your help in it. When it's finished--then Texas. Go
-home to your Nance and your kids, and stand by till you hear from me."
-
-"Well--if you say so; what'll we do with this--bury it again?"
-
-"Yes. [Ravishing delight overhead.] NO! by the great Sachem, no!
-[Profound distress overhead.] I'd nearly forgot. That pick had fresh
-earth on it! [The boys were sick with terror in a moment.] What
-business has a pick and a shovel here? What business with fresh earth
-on them? Who brought them here--and where are they gone? Have you heard
-anybody?--seen anybody? What! bury it again and leave them to come and
-see the ground disturbed? Not exactly--not exactly. We'll take it to my
-den."
-
-"Why, of course! Might have thought of that before. You mean Number
-One?"
-
-"No--Number Two--under the cross. The other place is bad--too common."
-
-"All right. It's nearly dark enough to start."
-
-Injun Joe got up and went about from window to window cautiously
-peeping out. Presently he said:
-
-"Who could have brought those tools here? Do you reckon they can be
-up-stairs?"
-
-The boys' breath forsook them. Injun Joe put his hand on his knife,
-halted a moment, undecided, and then turned toward the stairway. The
-boys thought of the closet, but their strength was gone. The steps came
-creaking up the stairs--the intolerable distress of the situation woke
-the stricken resolution of the lads--they were about to spring for the
-closet, when there was a crash of rotten timbers and Injun Joe landed
-on the ground amid the debris of the ruined stairway. He gathered
-himself up cursing, and his comrade said:
-
-"Now what's the use of all that? If it's anybody, and they're up
-there, let them STAY there--who cares? If they want to jump down, now,
-and get into trouble, who objects? It will be dark in fifteen minutes
---and then let them follow us if they want to. I'm willing. In my
-opinion, whoever hove those things in here caught a sight of us and
-took us for ghosts or devils or something. I'll bet they're running
-yet."
-
-Joe grumbled awhile; then he agreed with his friend that what daylight
-was left ought to be economized in getting things ready for leaving.
-Shortly afterward they slipped out of the house in the deepening
-twilight, and moved toward the river with their precious box.
-
-Tom and Huck rose up, weak but vastly relieved, and stared after them
-through the chinks between the logs of the house. Follow? Not they.
-They were content to reach ground again without broken necks, and take
-the townward track over the hill. They did not talk much. They were too
-much absorbed in hating themselves--hating the ill luck that made them
-take the spade and the pick there. But for that, Injun Joe never would
-have suspected. He would have hidden the silver with the gold to wait
-there till his "revenge" was satisfied, and then he would have had the
-misfortune to find that money turn up missing. Bitter, bitter luck that
-the tools were ever brought there!
-
-They resolved to keep a lookout for that Spaniard when he should come
-to town spying out for chances to do his revengeful job, and follow him
-to "Number Two," wherever that might be. Then a ghastly thought
-occurred to Tom.
-
-"Revenge? What if he means US, Huck!"
-
-"Oh, don't!" said Huck, nearly fainting.
-
-They talked it all over, and as they entered town they agreed to
-believe that he might possibly mean somebody else--at least that he
-might at least mean nobody but Tom, since only Tom had testified.
-
-Very, very small comfort it was to Tom to be alone in danger! Company
-would be a palpable improvement, he thought.
-
-
-
-CHAPTER XXVII
-
-THE adventure of the day mightily tormented Tom's dreams that night.
-Four times he had his hands on that rich treasure and four times it
-wasted to nothingness in his fingers as sleep forsook him and
-wakefulness brought back the hard reality of his misfortune. As he lay
-in the early morning recalling the incidents of his great adventure, he
-noticed that they seemed curiously subdued and far away--somewhat as if
-they had happened in another world, or in a time long gone by. Then it
-occurred to him that the great adventure itself must be a dream! There
-was one very strong argument in favor of this idea--namely, that the
-quantity of coin he had seen was too vast to be real. He had never seen
-as much as fifty dollars in one mass before, and he was like all boys
-of his age and station in life, in that he imagined that all references
-to "hundreds" and "thousands" were mere fanciful forms of speech, and
-that no such sums really existed in the world. He never had supposed
-for a moment that so large a sum as a hundred dollars was to be found
-in actual money in any one's possession. If his notions of hidden
-treasure had been analyzed, they would have been found to consist of a
-handful of real dimes and a bushel of vague, splendid, ungraspable
-dollars.
-
-But the incidents of his adventure grew sensibly sharper and clearer
-under the attrition of thinking them over, and so he presently found
-himself leaning to the impression that the thing might not have been a
-dream, after all. This uncertainty must be swept away. He would snatch
-a hurried breakfast and go and find Huck. Huck was sitting on the
-gunwale of a flatboat, listlessly dangling his feet in the water and
-looking very melancholy. Tom concluded to let Huck lead up to the
-subject. If he did not do it, then the adventure would be proved to
-have been only a dream.
-
-"Hello, Huck!"
-
-"Hello, yourself."
-
-Silence, for a minute.
-
-"Tom, if we'd 'a' left the blame tools at the dead tree, we'd 'a' got
-the money. Oh, ain't it awful!"
-
-"'Tain't a dream, then, 'tain't a dream! Somehow I most wish it was.
-Dog'd if I don't, Huck."
-
-"What ain't a dream?"
-
-"Oh, that thing yesterday. I been half thinking it was."
-
-"Dream! If them stairs hadn't broke down you'd 'a' seen how much dream
-it was! I've had dreams enough all night--with that patch-eyed Spanish
-devil going for me all through 'em--rot him!"
-
-"No, not rot him. FIND him! Track the money!"
-
-"Tom, we'll never find him. A feller don't have only one chance for
-such a pile--and that one's lost. I'd feel mighty shaky if I was to see
-him, anyway."
-
-"Well, so'd I; but I'd like to see him, anyway--and track him out--to
-his Number Two."
-
-"Number Two--yes, that's it. I been thinking 'bout that. But I can't
-make nothing out of it. What do you reckon it is?"
-
-"I dono. It's too deep. Say, Huck--maybe it's the number of a house!"
-
-"Goody!... No, Tom, that ain't it. If it is, it ain't in this
-one-horse town. They ain't no numbers here."
-
-"Well, that's so. Lemme think a minute. Here--it's the number of a
-room--in a tavern, you know!"
-
-"Oh, that's the trick! They ain't only two taverns. We can find out
-quick."
-
-"You stay here, Huck, till I come."
-
-Tom was off at once. He did not care to have Huck's company in public
-places. He was gone half an hour. He found that in the best tavern, No.
-2 had long been occupied by a young lawyer, and was still so occupied.
-In the less ostentatious house, No. 2 was a mystery. The
-tavern-keeper's young son said it was kept locked all the time, and he
-never saw anybody go into it or come out of it except at night; he did
-not know any particular reason for this state of things; had had some
-little curiosity, but it was rather feeble; had made the most of the
-mystery by entertaining himself with the idea that that room was
-"ha'nted"; had noticed that there was a light in there the night before.
-
-"That's what I've found out, Huck. I reckon that's the very No. 2
-we're after."
-
-"I reckon it is, Tom. Now what you going to do?"
-
-"Lemme think."
-
-Tom thought a long time. Then he said:
-
-"I'll tell you. The back door of that No. 2 is the door that comes out
-into that little close alley between the tavern and the old rattle trap
-of a brick store. Now you get hold of all the door-keys you can find,
-and I'll nip all of auntie's, and the first dark night we'll go there
-and try 'em. And mind you, keep a lookout for Injun Joe, because he
-said he was going to drop into town and spy around once more for a
-chance to get his revenge. If you see him, you just follow him; and if
-he don't go to that No. 2, that ain't the place."
-
-"Lordy, I don't want to foller him by myself!"
-
-"Why, it'll be night, sure. He mightn't ever see you--and if he did,
-maybe he'd never think anything."
-
-"Well, if it's pretty dark I reckon I'll track him. I dono--I dono.
-I'll try."
-
-"You bet I'll follow him, if it's dark, Huck. Why, he might 'a' found
-out he couldn't get his revenge, and be going right after that money."
-
-"It's so, Tom, it's so. I'll foller him; I will, by jingoes!"
-
-"Now you're TALKING! Don't you ever weaken, Huck, and I won't."
-
-
-
-CHAPTER XXVIII
-
-THAT night Tom and Huck were ready for their adventure. They hung
-about the neighborhood of the tavern until after nine, one watching the
-alley at a distance and the other the tavern door. Nobody entered the
-alley or left it; nobody resembling the Spaniard entered or left the
-tavern door. The night promised to be a fair one; so Tom went home with
-the understanding that if a considerable degree of darkness came on,
-Huck was to come and "maow," whereupon he would slip out and try the
-keys. But the night remained clear, and Huck closed his watch and
-retired to bed in an empty sugar hogshead about twelve.
-
-Tuesday the boys had the same ill luck. Also Wednesday. But Thursday
-night promised better. Tom slipped out in good season with his aunt's
-old tin lantern, and a large towel to blindfold it with. He hid the
-lantern in Huck's sugar hogshead and the watch began. An hour before
-midnight the tavern closed up and its lights (the only ones
-thereabouts) were put out. No Spaniard had been seen. Nobody had
-entered or left the alley. Everything was auspicious. The blackness of
-darkness reigned, the perfect stillness was interrupted only by
-occasional mutterings of distant thunder.
-
-Tom got his lantern, lit it in the hogshead, wrapped it closely in the
-towel, and the two adventurers crept in the gloom toward the tavern.
-Huck stood sentry and Tom felt his way into the alley. Then there was a
-season of waiting anxiety that weighed upon Huck's spirits like a
-mountain. He began to wish he could see a flash from the lantern--it
-would frighten him, but it would at least tell him that Tom was alive
-yet. It seemed hours since Tom had disappeared. Surely he must have
-fainted; maybe he was dead; maybe his heart had burst under terror and
-excitement. In his uneasiness Huck found himself drawing closer and
-closer to the alley; fearing all sorts of dreadful things, and
-momentarily expecting some catastrophe to happen that would take away
-his breath. There was not much to take away, for he seemed only able to
-inhale it by thimblefuls, and his heart would soon wear itself out, the
-way it was beating. Suddenly there was a flash of light and Tom came
-tearing by him: "Run!" said he; "run, for your life!"
-
-He needn't have repeated it; once was enough; Huck was making thirty
-or forty miles an hour before the repetition was uttered. The boys
-never stopped till they reached the shed of a deserted slaughter-house
-at the lower end of the village. Just as they got within its shelter
-the storm burst and the rain poured down. As soon as Tom got his breath
-he said:
-
-"Huck, it was awful! I tried two of the keys, just as soft as I could;
-but they seemed to make such a power of racket that I couldn't hardly
-get my breath I was so scared. They wouldn't turn in the lock, either.
-Well, without noticing what I was doing, I took hold of the knob, and
-open comes the door! It warn't locked! I hopped in, and shook off the
-towel, and, GREAT CAESAR'S GHOST!"
-
-"What!--what'd you see, Tom?"
-
-"Huck, I most stepped onto Injun Joe's hand!"
-
-"No!"
-
-"Yes! He was lying there, sound asleep on the floor, with his old
-patch on his eye and his arms spread out."
-
-"Lordy, what did you do? Did he wake up?"
-
-"No, never budged. Drunk, I reckon. I just grabbed that towel and
-started!"
-
-"I'd never 'a' thought of the towel, I bet!"
-
-"Well, I would. My aunt would make me mighty sick if I lost it."
-
-"Say, Tom, did you see that box?"
-
-"Huck, I didn't wait to look around. I didn't see the box, I didn't
-see the cross. I didn't see anything but a bottle and a tin cup on the
-floor by Injun Joe; yes, I saw two barrels and lots more bottles in the
-room. Don't you see, now, what's the matter with that ha'nted room?"
-
-"How?"
-
-"Why, it's ha'nted with whiskey! Maybe ALL the Temperance Taverns have
-got a ha'nted room, hey, Huck?"
-
-"Well, I reckon maybe that's so. Who'd 'a' thought such a thing? But
-say, Tom, now's a mighty good time to get that box, if Injun Joe's
-drunk."
-
-"It is, that! You try it!"
-
-Huck shuddered.
-
-"Well, no--I reckon not."
-
-"And I reckon not, Huck. Only one bottle alongside of Injun Joe ain't
-enough. If there'd been three, he'd be drunk enough and I'd do it."
-
-There was a long pause for reflection, and then Tom said:
-
-"Lookyhere, Huck, less not try that thing any more till we know Injun
-Joe's not in there. It's too scary. Now, if we watch every night, we'll
-be dead sure to see him go out, some time or other, and then we'll
-snatch that box quicker'n lightning."
-
-"Well, I'm agreed. I'll watch the whole night long, and I'll do it
-every night, too, if you'll do the other part of the job."
-
-"All right, I will. All you got to do is to trot up Hooper Street a
-block and maow--and if I'm asleep, you throw some gravel at the window
-and that'll fetch me."
-
-"Agreed, and good as wheat!"
-
-"Now, Huck, the storm's over, and I'll go home. It'll begin to be
-daylight in a couple of hours. You go back and watch that long, will
-you?"
-
-"I said I would, Tom, and I will. I'll ha'nt that tavern every night
-for a year! I'll sleep all day and I'll stand watch all night."
-
-"That's all right. Now, where you going to sleep?"
-
-"In Ben Rogers' hayloft. He lets me, and so does his pap's nigger man,
-Uncle Jake. I tote water for Uncle Jake whenever he wants me to, and
-any time I ask him he gives me a little something to eat if he can
-spare it. That's a mighty good nigger, Tom. He likes me, becuz I don't
-ever act as if I was above him. Sometime I've set right down and eat
-WITH him. But you needn't tell that. A body's got to do things when
-he's awful hungry he wouldn't want to do as a steady thing."
-
-"Well, if I don't want you in the daytime, I'll let you sleep. I won't
-come bothering around. Any time you see something's up, in the night,
-just skip right around and maow."
-
-
-
-CHAPTER XXIX
-
-THE first thing Tom heard on Friday morning was a glad piece of news
---Judge Thatcher's family had come back to town the night before. Both
-Injun Joe and the treasure sunk into secondary importance for a moment,
-and Becky took the chief place in the boy's interest. He saw her and
-they had an exhausting good time playing "hi-spy" and "gully-keeper"
-with a crowd of their school-mates. The day was completed and crowned
-in a peculiarly satisfactory way: Becky teased her mother to appoint
-the next day for the long-promised and long-delayed picnic, and she
-consented. The child's delight was boundless; and Tom's not more
-moderate. The invitations were sent out before sunset, and straightway
-the young folks of the village were thrown into a fever of preparation
-and pleasurable anticipation. Tom's excitement enabled him to keep
-awake until a pretty late hour, and he had good hopes of hearing Huck's
-"maow," and of having his treasure to astonish Becky and the picnickers
-with, next day; but he was disappointed. No signal came that night.
-
-Morning came, eventually, and by ten or eleven o'clock a giddy and
-rollicking company were gathered at Judge Thatcher's, and everything
-was ready for a start. It was not the custom for elderly people to mar
-the picnics with their presence. The children were considered safe
-enough under the wings of a few young ladies of eighteen and a few
-young gentlemen of twenty-three or thereabouts. The old steam ferryboat
-was chartered for the occasion; presently the gay throng filed up the
-main street laden with provision-baskets. Sid was sick and had to miss
-the fun; Mary remained at home to entertain him. The last thing Mrs.
-Thatcher said to Becky, was:
-
-"You'll not get back till late. Perhaps you'd better stay all night
-with some of the girls that live near the ferry-landing, child."
-
-"Then I'll stay with Susy Harper, mamma."
-
-"Very well. And mind and behave yourself and don't be any trouble."
-
-Presently, as they tripped along, Tom said to Becky:
-
-"Say--I'll tell you what we'll do. 'Stead of going to Joe Harper's
-we'll climb right up the hill and stop at the Widow Douglas'. She'll
-have ice-cream! She has it most every day--dead loads of it. And she'll
-be awful glad to have us."
-
-"Oh, that will be fun!"
-
-Then Becky reflected a moment and said:
-
-"But what will mamma say?"
-
-"How'll she ever know?"
-
-The girl turned the idea over in her mind, and said reluctantly:
-
-"I reckon it's wrong--but--"
-
-"But shucks! Your mother won't know, and so what's the harm? All she
-wants is that you'll be safe; and I bet you she'd 'a' said go there if
-she'd 'a' thought of it. I know she would!"
-
-The Widow Douglas' splendid hospitality was a tempting bait. It and
-Tom's persuasions presently carried the day. So it was decided to say
-nothing anybody about the night's programme. Presently it occurred to
-Tom that maybe Huck might come this very night and give the signal. The
-thought took a deal of the spirit out of his anticipations. Still he
-could not bear to give up the fun at Widow Douglas'. And why should he
-give it up, he reasoned--the signal did not come the night before, so
-why should it be any more likely to come to-night? The sure fun of the
-evening outweighed the uncertain treasure; and, boy-like, he determined
-to yield to the stronger inclination and not allow himself to think of
-the box of money another time that day.
-
-Three miles below town the ferryboat stopped at the mouth of a woody
-hollow and tied up. The crowd swarmed ashore and soon the forest
-distances and craggy heights echoed far and near with shoutings and
-laughter. All the different ways of getting hot and tired were gone
-through with, and by-and-by the rovers straggled back to camp fortified
-with responsible appetites, and then the destruction of the good things
-began. After the feast there was a refreshing season of rest and chat
-in the shade of spreading oaks. By-and-by somebody shouted:
-
-"Who's ready for the cave?"
-
-Everybody was. Bundles of candles were procured, and straightway there
-was a general scamper up the hill. The mouth of the cave was up the
-hillside--an opening shaped like a letter A. Its massive oaken door
-stood unbarred. Within was a small chamber, chilly as an ice-house, and
-walled by Nature with solid limestone that was dewy with a cold sweat.
-It was romantic and mysterious to stand here in the deep gloom and look
-out upon the green valley shining in the sun. But the impressiveness of
-the situation quickly wore off, and the romping began again. The moment
-a candle was lighted there was a general rush upon the owner of it; a
-struggle and a gallant defence followed, but the candle was soon
-knocked down or blown out, and then there was a glad clamor of laughter
-and a new chase. But all things have an end. By-and-by the procession
-went filing down the steep descent of the main avenue, the flickering
-rank of lights dimly revealing the lofty walls of rock almost to their
-point of junction sixty feet overhead. This main avenue was not more
-than eight or ten feet wide. Every few steps other lofty and still
-narrower crevices branched from it on either hand--for McDougal's cave
-was but a vast labyrinth of crooked aisles that ran into each other and
-out again and led nowhere. It was said that one might wander days and
-nights together through its intricate tangle of rifts and chasms, and
-never find the end of the cave; and that he might go down, and down,
-and still down, into the earth, and it was just the same--labyrinth
-under labyrinth, and no end to any of them. No man "knew" the cave.
-That was an impossible thing. Most of the young men knew a portion of
-it, and it was not customary to venture much beyond this known portion.
-Tom Sawyer knew as much of the cave as any one.
-
-The procession moved along the main avenue some three-quarters of a
-mile, and then groups and couples began to slip aside into branch
-avenues, fly along the dismal corridors, and take each other by
-surprise at points where the corridors joined again. Parties were able
-to elude each other for the space of half an hour without going beyond
-the "known" ground.
-
-By-and-by, one group after another came straggling back to the mouth
-of the cave, panting, hilarious, smeared from head to foot with tallow
-drippings, daubed with clay, and entirely delighted with the success of
-the day. Then they were astonished to find that they had been taking no
-note of time and that night was about at hand. The clanging bell had
-been calling for half an hour. However, this sort of close to the day's
-adventures was romantic and therefore satisfactory. When the ferryboat
-with her wild freight pushed into the stream, nobody cared sixpence for
-the wasted time but the captain of the craft.
-
-Huck was already upon his watch when the ferryboat's lights went
-glinting past the wharf. He heard no noise on board, for the young
-people were as subdued and still as people usually are who are nearly
-tired to death. He wondered what boat it was, and why she did not stop
-at the wharf--and then he dropped her out of his mind and put his
-attention upon his business. The night was growing cloudy and dark. Ten
-o'clock came, and the noise of vehicles ceased, scattered lights began
-to wink out, all straggling foot-passengers disappeared, the village
-betook itself to its slumbers and left the small watcher alone with the
-silence and the ghosts. Eleven o'clock came, and the tavern lights were
-put out; darkness everywhere, now. Huck waited what seemed a weary long
-time, but nothing happened. His faith was weakening. Was there any use?
-Was there really any use? Why not give it up and turn in?
-
-A noise fell upon his ear. He was all attention in an instant. The
-alley door closed softly. He sprang to the corner of the brick store.
-The next moment two men brushed by him, and one seemed to have
-something under his arm. It must be that box! So they were going to
-remove the treasure. Why call Tom now? It would be absurd--the men
-would get away with the box and never be found again. No, he would
-stick to their wake and follow them; he would trust to the darkness for
-security from discovery. So communing with himself, Huck stepped out
-and glided along behind the men, cat-like, with bare feet, allowing
-them to keep just far enough ahead not to be invisible.
-
-They moved up the river street three blocks, then turned to the left
-up a cross-street. They went straight ahead, then, until they came to
-the path that led up Cardiff Hill; this they took. They passed by the
-old Welshman's house, half-way up the hill, without hesitating, and
-still climbed upward. Good, thought Huck, they will bury it in the old
-quarry. But they never stopped at the quarry. They passed on, up the
-summit. They plunged into the narrow path between the tall sumach
-bushes, and were at once hidden in the gloom. Huck closed up and
-shortened his distance, now, for they would never be able to see him.
-He trotted along awhile; then slackened his pace, fearing he was
-gaining too fast; moved on a piece, then stopped altogether; listened;
-no sound; none, save that he seemed to hear the beating of his own
-heart. The hooting of an owl came over the hill--ominous sound! But no
-footsteps. Heavens, was everything lost! He was about to spring with
-winged feet, when a man cleared his throat not four feet from him!
-Huck's heart shot into his throat, but he swallowed it again; and then
-he stood there shaking as if a dozen agues had taken charge of him at
-once, and so weak that he thought he must surely fall to the ground. He
-knew where he was. He knew he was within five steps of the stile
-leading into Widow Douglas' grounds. Very well, he thought, let them
-bury it there; it won't be hard to find.
-
-Now there was a voice--a very low voice--Injun Joe's:
-
-"Damn her, maybe she's got company--there's lights, late as it is."
-
-"I can't see any."
-
-This was that stranger's voice--the stranger of the haunted house. A
-deadly chill went to Huck's heart--this, then, was the "revenge" job!
-His thought was, to fly. Then he remembered that the Widow Douglas had
-been kind to him more than once, and maybe these men were going to
-murder her. He wished he dared venture to warn her; but he knew he
-didn't dare--they might come and catch him. He thought all this and
-more in the moment that elapsed between the stranger's remark and Injun
-Joe's next--which was--
-
-"Because the bush is in your way. Now--this way--now you see, don't
-you?"
-
-"Yes. Well, there IS company there, I reckon. Better give it up."
-
-"Give it up, and I just leaving this country forever! Give it up and
-maybe never have another chance. I tell you again, as I've told you
-before, I don't care for her swag--you may have it. But her husband was
-rough on me--many times he was rough on me--and mainly he was the
-justice of the peace that jugged me for a vagrant. And that ain't all.
-It ain't a millionth part of it! He had me HORSEWHIPPED!--horsewhipped
-in front of the jail, like a nigger!--with all the town looking on!
-HORSEWHIPPED!--do you understand? He took advantage of me and died. But
-I'll take it out of HER."
-
-"Oh, don't kill her! Don't do that!"
-
-"Kill? Who said anything about killing? I would kill HIM if he was
-here; but not her. When you want to get revenge on a woman you don't
-kill her--bosh! you go for her looks. You slit her nostrils--you notch
-her ears like a sow!"
-
-"By God, that's--"
-
-"Keep your opinion to yourself! It will be safest for you. I'll tie
-her to the bed. If she bleeds to death, is that my fault? I'll not cry,
-if she does. My friend, you'll help me in this thing--for MY sake
---that's why you're here--I mightn't be able alone. If you flinch, I'll
-kill you. Do you understand that? And if I have to kill you, I'll kill
-her--and then I reckon nobody'll ever know much about who done this
-business."
-
-"Well, if it's got to be done, let's get at it. The quicker the
-better--I'm all in a shiver."
-
-"Do it NOW? And company there? Look here--I'll get suspicious of you,
-first thing you know. No--we'll wait till the lights are out--there's
-no hurry."
-
-Huck felt that a silence was going to ensue--a thing still more awful
-than any amount of murderous talk; so he held his breath and stepped
-gingerly back; planted his foot carefully and firmly, after balancing,
-one-legged, in a precarious way and almost toppling over, first on one
-side and then on the other. He took another step back, with the same
-elaboration and the same risks; then another and another, and--a twig
-snapped under his foot! His breath stopped and he listened. There was
-no sound--the stillness was perfect. His gratitude was measureless. Now
-he turned in his tracks, between the walls of sumach bushes--turned
-himself as carefully as if he were a ship--and then stepped quickly but
-cautiously along. When he emerged at the quarry he felt secure, and so
-he picked up his nimble heels and flew. Down, down he sped, till he
-reached the Welshman's. He banged at the door, and presently the heads
-of the old man and his two stalwart sons were thrust from windows.
-
-"What's the row there? Who's banging? What do you want?"
-
-"Let me in--quick! I'll tell everything."
-
-"Why, who are you?"
-
-"Huckleberry Finn--quick, let me in!"
-
-"Huckleberry Finn, indeed! It ain't a name to open many doors, I
-judge! But let him in, lads, and let's see what's the trouble."
-
-"Please don't ever tell I told you," were Huck's first words when he
-got in. "Please don't--I'd be killed, sure--but the widow's been good
-friends to me sometimes, and I want to tell--I WILL tell if you'll
-promise you won't ever say it was me."
-
-"By George, he HAS got something to tell, or he wouldn't act so!"
-exclaimed the old man; "out with it and nobody here'll ever tell, lad."
-
-Three minutes later the old man and his sons, well armed, were up the
-hill, and just entering the sumach path on tiptoe, their weapons in
-their hands. Huck accompanied them no further. He hid behind a great
-bowlder and fell to listening. There was a lagging, anxious silence,
-and then all of a sudden there was an explosion of firearms and a cry.
-
-Huck waited for no particulars. He sprang away and sped down the hill
-as fast as his legs could carry him.
-
-
-
-CHAPTER XXX
-
-AS the earliest suspicion of dawn appeared on Sunday morning, Huck
-came groping up the hill and rapped gently at the old Welshman's door.
-The inmates were asleep, but it was a sleep that was set on a
-hair-trigger, on account of the exciting episode of the night. A call
-came from a window:
-
-"Who's there!"
-
-Huck's scared voice answered in a low tone:
-
-"Please let me in! It's only Huck Finn!"
-
-"It's a name that can open this door night or day, lad!--and welcome!"
-
-These were strange words to the vagabond boy's ears, and the
-pleasantest he had ever heard. He could not recollect that the closing
-word had ever been applied in his case before. The door was quickly
-unlocked, and he entered. Huck was given a seat and the old man and his
-brace of tall sons speedily dressed themselves.
-
-"Now, my boy, I hope you're good and hungry, because breakfast will be
-ready as soon as the sun's up, and we'll have a piping hot one, too
---make yourself easy about that! I and the boys hoped you'd turn up and
-stop here last night."
-
-"I was awful scared," said Huck, "and I run. I took out when the
-pistols went off, and I didn't stop for three mile. I've come now becuz
-I wanted to know about it, you know; and I come before daylight becuz I
-didn't want to run across them devils, even if they was dead."
-
-"Well, poor chap, you do look as if you'd had a hard night of it--but
-there's a bed here for you when you've had your breakfast. No, they
-ain't dead, lad--we are sorry enough for that. You see we knew right
-where to put our hands on them, by your description; so we crept along
-on tiptoe till we got within fifteen feet of them--dark as a cellar
-that sumach path was--and just then I found I was going to sneeze. It
-was the meanest kind of luck! I tried to keep it back, but no use
---'twas bound to come, and it did come! I was in the lead with my pistol
-raised, and when the sneeze started those scoundrels a-rustling to get
-out of the path, I sung out, 'Fire boys!' and blazed away at the place
-where the rustling was. So did the boys. But they were off in a jiffy,
-those villains, and we after them, down through the woods. I judge we
-never touched them. They fired a shot apiece as they started, but their
-bullets whizzed by and didn't do us any harm. As soon as we lost the
-sound of their feet we quit chasing, and went down and stirred up the
-constables. They got a posse together, and went off to guard the river
-bank, and as soon as it is light the sheriff and a gang are going to
-beat up the woods. My boys will be with them presently. I wish we had
-some sort of description of those rascals--'twould help a good deal.
-But you couldn't see what they were like, in the dark, lad, I suppose?"
-
-"Oh yes; I saw them down-town and follered them."
-
-"Splendid! Describe them--describe them, my boy!"
-
-"One's the old deaf and dumb Spaniard that's ben around here once or
-twice, and t'other's a mean-looking, ragged--"
-
-"That's enough, lad, we know the men! Happened on them in the woods
-back of the widow's one day, and they slunk away. Off with you, boys,
-and tell the sheriff--get your breakfast to-morrow morning!"
-
-The Welshman's sons departed at once. As they were leaving the room
-Huck sprang up and exclaimed:
-
-"Oh, please don't tell ANYbody it was me that blowed on them! Oh,
-please!"
-
-"All right if you say it, Huck, but you ought to have the credit of
-what you did."
-
-"Oh no, no! Please don't tell!"
-
-When the young men were gone, the old Welshman said:
-
-"They won't tell--and I won't. But why don't you want it known?"
-
-Huck would not explain, further than to say that he already knew too
-much about one of those men and would not have the man know that he
-knew anything against him for the whole world--he would be killed for
-knowing it, sure.
-
-The old man promised secrecy once more, and said:
-
-"How did you come to follow these fellows, lad? Were they looking
-suspicious?"
-
-Huck was silent while he framed a duly cautious reply. Then he said:
-
-"Well, you see, I'm a kind of a hard lot,--least everybody says so,
-and I don't see nothing agin it--and sometimes I can't sleep much, on
-account of thinking about it and sort of trying to strike out a new way
-of doing. That was the way of it last night. I couldn't sleep, and so I
-come along up-street 'bout midnight, a-turning it all over, and when I
-got to that old shackly brick store by the Temperance Tavern, I backed
-up agin the wall to have another think. Well, just then along comes
-these two chaps slipping along close by me, with something under their
-arm, and I reckoned they'd stole it. One was a-smoking, and t'other one
-wanted a light; so they stopped right before me and the cigars lit up
-their faces and I see that the big one was the deaf and dumb Spaniard,
-by his white whiskers and the patch on his eye, and t'other one was a
-rusty, ragged-looking devil."
-
-"Could you see the rags by the light of the cigars?"
-
-This staggered Huck for a moment. Then he said:
-
-"Well, I don't know--but somehow it seems as if I did."
-
-"Then they went on, and you--"
-
-"Follered 'em--yes. That was it. I wanted to see what was up--they
-sneaked along so. I dogged 'em to the widder's stile, and stood in the
-dark and heard the ragged one beg for the widder, and the Spaniard
-swear he'd spile her looks just as I told you and your two--"
-
-"What! The DEAF AND DUMB man said all that!"
-
-Huck had made another terrible mistake! He was trying his best to keep
-the old man from getting the faintest hint of who the Spaniard might
-be, and yet his tongue seemed determined to get him into trouble in
-spite of all he could do. He made several efforts to creep out of his
-scrape, but the old man's eye was upon him and he made blunder after
-blunder. Presently the Welshman said:
-
-"My boy, don't be afraid of me. I wouldn't hurt a hair of your head
-for all the world. No--I'd protect you--I'd protect you. This Spaniard
-is not deaf and dumb; you've let that slip without intending it; you
-can't cover that up now. You know something about that Spaniard that
-you want to keep dark. Now trust me--tell me what it is, and trust me
---I won't betray you."
-
-Huck looked into the old man's honest eyes a moment, then bent over
-and whispered in his ear:
-
-"'Tain't a Spaniard--it's Injun Joe!"
-
-The Welshman almost jumped out of his chair. In a moment he said:
-
-"It's all plain enough, now. When you talked about notching ears and
-slitting noses I judged that that was your own embellishment, because
-white men don't take that sort of revenge. But an Injun! That's a
-different matter altogether."
-
-During breakfast the talk went on, and in the course of it the old man
-said that the last thing which he and his sons had done, before going
-to bed, was to get a lantern and examine the stile and its vicinity for
-marks of blood. They found none, but captured a bulky bundle of--
-
-"Of WHAT?"
-
-If the words had been lightning they could not have leaped with a more
-stunning suddenness from Huck's blanched lips. His eyes were staring
-wide, now, and his breath suspended--waiting for the answer. The
-Welshman started--stared in return--three seconds--five seconds--ten
---then replied:
-
-"Of burglar's tools. Why, what's the MATTER with you?"
-
-Huck sank back, panting gently, but deeply, unutterably grateful. The
-Welshman eyed him gravely, curiously--and presently said:
-
-"Yes, burglar's tools. That appears to relieve you a good deal. But
-what did give you that turn? What were YOU expecting we'd found?"
-
-Huck was in a close place--the inquiring eye was upon him--he would
-have given anything for material for a plausible answer--nothing
-suggested itself--the inquiring eye was boring deeper and deeper--a
-senseless reply offered--there was no time to weigh it, so at a venture
-he uttered it--feebly:
-
-"Sunday-school books, maybe."
-
-Poor Huck was too distressed to smile, but the old man laughed loud
-and joyously, shook up the details of his anatomy from head to foot,
-and ended by saying that such a laugh was money in a-man's pocket,
-because it cut down the doctor's bill like everything. Then he added:
-
-"Poor old chap, you're white and jaded--you ain't well a bit--no
-wonder you're a little flighty and off your balance. But you'll come
-out of it. Rest and sleep will fetch you out all right, I hope."
-
-Huck was irritated to think he had been such a goose and betrayed such
-a suspicious excitement, for he had dropped the idea that the parcel
-brought from the tavern was the treasure, as soon as he had heard the
-talk at the widow's stile. He had only thought it was not the treasure,
-however--he had not known that it wasn't--and so the suggestion of a
-captured bundle was too much for his self-possession. But on the whole
-he felt glad the little episode had happened, for now he knew beyond
-all question that that bundle was not THE bundle, and so his mind was
-at rest and exceedingly comfortable. In fact, everything seemed to be
-drifting just in the right direction, now; the treasure must be still
-in No. 2, the men would be captured and jailed that day, and he and Tom
-could seize the gold that night without any trouble or any fear of
-interruption.
-
-Just as breakfast was completed there was a knock at the door. Huck
-jumped for a hiding-place, for he had no mind to be connected even
-remotely with the late event. The Welshman admitted several ladies and
-gentlemen, among them the Widow Douglas, and noticed that groups of
-citizens were climbing up the hill--to stare at the stile. So the news
-had spread. The Welshman had to tell the story of the night to the
-visitors. The widow's gratitude for her preservation was outspoken.
-
-"Don't say a word about it, madam. There's another that you're more
-beholden to than you are to me and my boys, maybe, but he don't allow
-me to tell his name. We wouldn't have been there but for him."
-
-Of course this excited a curiosity so vast that it almost belittled
-the main matter--but the Welshman allowed it to eat into the vitals of
-his visitors, and through them be transmitted to the whole town, for he
-refused to part with his secret. When all else had been learned, the
-widow said:
-
-"I went to sleep reading in bed and slept straight through all that
-noise. Why didn't you come and wake me?"
-
-"We judged it warn't worth while. Those fellows warn't likely to come
-again--they hadn't any tools left to work with, and what was the use of
-waking you up and scaring you to death? My three negro men stood guard
-at your house all the rest of the night. They've just come back."
-
-More visitors came, and the story had to be told and retold for a
-couple of hours more.
-
-There was no Sabbath-school during day-school vacation, but everybody
-was early at church. The stirring event was well canvassed. News came
-that not a sign of the two villains had been yet discovered. When the
-sermon was finished, Judge Thatcher's wife dropped alongside of Mrs.
-Harper as she moved down the aisle with the crowd and said:
-
-"Is my Becky going to sleep all day? I just expected she would be
-tired to death."
-
-"Your Becky?"
-
-"Yes," with a startled look--"didn't she stay with you last night?"
-
-"Why, no."
-
-Mrs. Thatcher turned pale, and sank into a pew, just as Aunt Polly,
-talking briskly with a friend, passed by. Aunt Polly said:
-
-"Good-morning, Mrs. Thatcher. Good-morning, Mrs. Harper. I've got a
-boy that's turned up missing. I reckon my Tom stayed at your house last
-night--one of you. And now he's afraid to come to church. I've got to
-settle with him."
-
-Mrs. Thatcher shook her head feebly and turned paler than ever.
-
-"He didn't stay with us," said Mrs. Harper, beginning to look uneasy.
-A marked anxiety came into Aunt Polly's face.
-
-"Joe Harper, have you seen my Tom this morning?"
-
-"No'm."
-
-"When did you see him last?"
-
-Joe tried to remember, but was not sure he could say. The people had
-stopped moving out of church. Whispers passed along, and a boding
-uneasiness took possession of every countenance. Children were
-anxiously questioned, and young teachers. They all said they had not
-noticed whether Tom and Becky were on board the ferryboat on the
-homeward trip; it was dark; no one thought of inquiring if any one was
-missing. One young man finally blurted out his fear that they were
-still in the cave! Mrs. Thatcher swooned away. Aunt Polly fell to
-crying and wringing her hands.
-
-The alarm swept from lip to lip, from group to group, from street to
-street, and within five minutes the bells were wildly clanging and the
-whole town was up! The Cardiff Hill episode sank into instant
-insignificance, the burglars were forgotten, horses were saddled,
-skiffs were manned, the ferryboat ordered out, and before the horror
-was half an hour old, two hundred men were pouring down highroad and
-river toward the cave.
-
-All the long afternoon the village seemed empty and dead. Many women
-visited Aunt Polly and Mrs. Thatcher and tried to comfort them. They
-cried with them, too, and that was still better than words. All the
-tedious night the town waited for news; but when the morning dawned at
-last, all the word that came was, "Send more candles--and send food."
-Mrs. Thatcher was almost crazed; and Aunt Polly, also. Judge Thatcher
-sent messages of hope and encouragement from the cave, but they
-conveyed no real cheer.
-
-The old Welshman came home toward daylight, spattered with
-candle-grease, smeared with clay, and almost worn out. He found Huck
-still in the bed that had been provided for him, and delirious with
-fever. The physicians were all at the cave, so the Widow Douglas came
-and took charge of the patient. She said she would do her best by him,
-because, whether he was good, bad, or indifferent, he was the Lord's,
-and nothing that was the Lord's was a thing to be neglected. The
-Welshman said Huck had good spots in him, and the widow said:
-
-"You can depend on it. That's the Lord's mark. He don't leave it off.
-He never does. Puts it somewhere on every creature that comes from his
-hands."
-
-Early in the forenoon parties of jaded men began to straggle into the
-village, but the strongest of the citizens continued searching. All the
-news that could be gained was that remotenesses of the cavern were
-being ransacked that had never been visited before; that every corner
-and crevice was going to be thoroughly searched; that wherever one
-wandered through the maze of passages, lights were to be seen flitting
-hither and thither in the distance, and shoutings and pistol-shots sent
-their hollow reverberations to the ear down the sombre aisles. In one
-place, far from the section usually traversed by tourists, the names
-"BECKY & TOM" had been found traced upon the rocky wall with
-candle-smoke, and near at hand a grease-soiled bit of ribbon. Mrs.
-Thatcher recognized the ribbon and cried over it. She said it was the
-last relic she should ever have of her child; and that no other memorial
-of her could ever be so precious, because this one parted latest from
-the living body before the awful death came. Some said that now and
-then, in the cave, a far-away speck of light would glimmer, and then a
-glorious shout would burst forth and a score of men go trooping down the
-echoing aisle--and then a sickening disappointment always followed; the
-children were not there; it was only a searcher's light.
-
-Three dreadful days and nights dragged their tedious hours along, and
-the village sank into a hopeless stupor. No one had heart for anything.
-The accidental discovery, just made, that the proprietor of the
-Temperance Tavern kept liquor on his premises, scarcely fluttered the
-public pulse, tremendous as the fact was. In a lucid interval, Huck
-feebly led up to the subject of taverns, and finally asked--dimly
-dreading the worst--if anything had been discovered at the Temperance
-Tavern since he had been ill.
-
-"Yes," said the widow.
-
-Huck started up in bed, wild-eyed:
-
-"What? What was it?"
-
-"Liquor!--and the place has been shut up. Lie down, child--what a turn
-you did give me!"
-
-"Only tell me just one thing--only just one--please! Was it Tom Sawyer
-that found it?"
-
-The widow burst into tears. "Hush, hush, child, hush! I've told you
-before, you must NOT talk. You are very, very sick!"
-
-Then nothing but liquor had been found; there would have been a great
-powwow if it had been the gold. So the treasure was gone forever--gone
-forever! But what could she be crying about? Curious that she should
-cry.
-
-These thoughts worked their dim way through Huck's mind, and under the
-weariness they gave him he fell asleep. The widow said to herself:
-
-"There--he's asleep, poor wreck. Tom Sawyer find it! Pity but somebody
-could find Tom Sawyer! Ah, there ain't many left, now, that's got hope
-enough, or strength enough, either, to go on searching."
-
-
-
-CHAPTER XXXI
-
-NOW to return to Tom and Becky's share in the picnic. They tripped
-along the murky aisles with the rest of the company, visiting the
-familiar wonders of the cave--wonders dubbed with rather
-over-descriptive names, such as "The Drawing-Room," "The Cathedral,"
-"Aladdin's Palace," and so on. Presently the hide-and-seek frolicking
-began, and Tom and Becky engaged in it with zeal until the exertion
-began to grow a trifle wearisome; then they wandered down a sinuous
-avenue holding their candles aloft and reading the tangled web-work of
-names, dates, post-office addresses, and mottoes with which the rocky
-walls had been frescoed (in candle-smoke). Still drifting along and
-talking, they scarcely noticed that they were now in a part of the cave
-whose walls were not frescoed. They smoked their own names under an
-overhanging shelf and moved on. Presently they came to a place where a
-little stream of water, trickling over a ledge and carrying a limestone
-sediment with it, had, in the slow-dragging ages, formed a laced and
-ruffled Niagara in gleaming and imperishable stone. Tom squeezed his
-small body behind it in order to illuminate it for Becky's
-gratification. He found that it curtained a sort of steep natural
-stairway which was enclosed between narrow walls, and at once the
-ambition to be a discoverer seized him. Becky responded to his call,
-and they made a smoke-mark for future guidance, and started upon their
-quest. They wound this way and that, far down into the secret depths of
-the cave, made another mark, and branched off in search of novelties to
-tell the upper world about. In one place they found a spacious cavern,
-from whose ceiling depended a multitude of shining stalactites of the
-length and circumference of a man's leg; they walked all about it,
-wondering and admiring, and presently left it by one of the numerous
-passages that opened into it. This shortly brought them to a bewitching
-spring, whose basin was incrusted with a frostwork of glittering
-crystals; it was in the midst of a cavern whose walls were supported by
-many fantastic pillars which had been formed by the joining of great
-stalactites and stalagmites together, the result of the ceaseless
-water-drip of centuries. Under the roof vast knots of bats had packed
-themselves together, thousands in a bunch; the lights disturbed the
-creatures and they came flocking down by hundreds, squeaking and
-darting furiously at the candles. Tom knew their ways and the danger of
-this sort of conduct. He seized Becky's hand and hurried her into the
-first corridor that offered; and none too soon, for a bat struck
-Becky's light out with its wing while she was passing out of the
-cavern. The bats chased the children a good distance; but the fugitives
-plunged into every new passage that offered, and at last got rid of the
-perilous things. Tom found a subterranean lake, shortly, which
-stretched its dim length away until its shape was lost in the shadows.
-He wanted to explore its borders, but concluded that it would be best
-to sit down and rest awhile, first. Now, for the first time, the deep
-stillness of the place laid a clammy hand upon the spirits of the
-children. Becky said:
-
-"Why, I didn't notice, but it seems ever so long since I heard any of
-the others."
-
-"Come to think, Becky, we are away down below them--and I don't know
-how far away north, or south, or east, or whichever it is. We couldn't
-hear them here."
-
-Becky grew apprehensive.
-
-"I wonder how long we've been down here, Tom? We better start back."
-
-"Yes, I reckon we better. P'raps we better."
-
-"Can you find the way, Tom? It's all a mixed-up crookedness to me."
-
-"I reckon I could find it--but then the bats. If they put our candles
-out it will be an awful fix. Let's try some other way, so as not to go
-through there."
-
-"Well. But I hope we won't get lost. It would be so awful!" and the
-girl shuddered at the thought of the dreadful possibilities.
-
-They started through a corridor, and traversed it in silence a long
-way, glancing at each new opening, to see if there was anything
-familiar about the look of it; but they were all strange. Every time
-Tom made an examination, Becky would watch his face for an encouraging
-sign, and he would say cheerily:
-
-"Oh, it's all right. This ain't the one, but we'll come to it right
-away!"
-
-But he felt less and less hopeful with each failure, and presently
-began to turn off into diverging avenues at sheer random, in desperate
-hope of finding the one that was wanted. He still said it was "all
-right," but there was such a leaden dread at his heart that the words
-had lost their ring and sounded just as if he had said, "All is lost!"
-Becky clung to his side in an anguish of fear, and tried hard to keep
-back the tears, but they would come. At last she said:
-
-"Oh, Tom, never mind the bats, let's go back that way! We seem to get
-worse and worse off all the time."
-
-"Listen!" said he.
-
-Profound silence; silence so deep that even their breathings were
-conspicuous in the hush. Tom shouted. The call went echoing down the
-empty aisles and died out in the distance in a faint sound that
-resembled a ripple of mocking laughter.
-
-"Oh, don't do it again, Tom, it is too horrid," said Becky.
-
-"It is horrid, but I better, Becky; they might hear us, you know," and
-he shouted again.
-
-The "might" was even a chillier horror than the ghostly laughter, it
-so confessed a perishing hope. The children stood still and listened;
-but there was no result. Tom turned upon the back track at once, and
-hurried his steps. It was but a little while before a certain
-indecision in his manner revealed another fearful fact to Becky--he
-could not find his way back!
-
-"Oh, Tom, you didn't make any marks!"
-
-"Becky, I was such a fool! Such a fool! I never thought we might want
-to come back! No--I can't find the way. It's all mixed up."
-
-"Tom, Tom, we're lost! we're lost! We never can get out of this awful
-place! Oh, why DID we ever leave the others!"
-
-She sank to the ground and burst into such a frenzy of crying that Tom
-was appalled with the idea that she might die, or lose her reason. He
-sat down by her and put his arms around her; she buried her face in his
-bosom, she clung to him, she poured out her terrors, her unavailing
-regrets, and the far echoes turned them all to jeering laughter. Tom
-begged her to pluck up hope again, and she said she could not. He fell
-to blaming and abusing himself for getting her into this miserable
-situation; this had a better effect. She said she would try to hope
-again, she would get up and follow wherever he might lead if only he
-would not talk like that any more. For he was no more to blame than
-she, she said.
-
-So they moved on again--aimlessly--simply at random--all they could do
-was to move, keep moving. For a little while, hope made a show of
-reviving--not with any reason to back it, but only because it is its
-nature to revive when the spring has not been taken out of it by age
-and familiarity with failure.
-
-By-and-by Tom took Becky's candle and blew it out. This economy meant
-so much! Words were not needed. Becky understood, and her hope died
-again. She knew that Tom had a whole candle and three or four pieces in
-his pockets--yet he must economize.
-
-By-and-by, fatigue began to assert its claims; the children tried to
-pay attention, for it was dreadful to think of sitting down when time
-was grown to be so precious, moving, in some direction, in any
-direction, was at least progress and might bear fruit; but to sit down
-was to invite death and shorten its pursuit.
-
-At last Becky's frail limbs refused to carry her farther. She sat
-down. Tom rested with her, and they talked of home, and the friends
-there, and the comfortable beds and, above all, the light! Becky cried,
-and Tom tried to think of some way of comforting her, but all his
-encouragements were grown threadbare with use, and sounded like
-sarcasms. Fatigue bore so heavily upon Becky that she drowsed off to
-sleep. Tom was grateful. He sat looking into her drawn face and saw it
-grow smooth and natural under the influence of pleasant dreams; and
-by-and-by a smile dawned and rested there. The peaceful face reflected
-somewhat of peace and healing into his own spirit, and his thoughts
-wandered away to bygone times and dreamy memories. While he was deep in
-his musings, Becky woke up with a breezy little laugh--but it was
-stricken dead upon her lips, and a groan followed it.
-
-"Oh, how COULD I sleep! I wish I never, never had waked! No! No, I
-don't, Tom! Don't look so! I won't say it again."
-
-"I'm glad you've slept, Becky; you'll feel rested, now, and we'll find
-the way out."
-
-"We can try, Tom; but I've seen such a beautiful country in my dream.
-I reckon we are going there."
-
-"Maybe not, maybe not. Cheer up, Becky, and let's go on trying."
-
-They rose up and wandered along, hand in hand and hopeless. They tried
-to estimate how long they had been in the cave, but all they knew was
-that it seemed days and weeks, and yet it was plain that this could not
-be, for their candles were not gone yet. A long time after this--they
-could not tell how long--Tom said they must go softly and listen for
-dripping water--they must find a spring. They found one presently, and
-Tom said it was time to rest again. Both were cruelly tired, yet Becky
-said she thought she could go a little farther. She was surprised to
-hear Tom dissent. She could not understand it. They sat down, and Tom
-fastened his candle to the wall in front of them with some clay.
-Thought was soon busy; nothing was said for some time. Then Becky broke
-the silence:
-
-"Tom, I am so hungry!"
-
-Tom took something out of his pocket.
-
-"Do you remember this?" said he.
-
-Becky almost smiled.
-
-"It's our wedding-cake, Tom."
-
-"Yes--I wish it was as big as a barrel, for it's all we've got."
-
-"I saved it from the picnic for us to dream on, Tom, the way grown-up
-people do with wedding-cake--but it'll be our--"
-
-She dropped the sentence where it was. Tom divided the cake and Becky
-ate with good appetite, while Tom nibbled at his moiety. There was
-abundance of cold water to finish the feast with. By-and-by Becky
-suggested that they move on again. Tom was silent a moment. Then he
-said:
-
-"Becky, can you bear it if I tell you something?"
-
-Becky's face paled, but she thought she could.
-
-"Well, then, Becky, we must stay here, where there's water to drink.
-That little piece is our last candle!"
-
-Becky gave loose to tears and wailings. Tom did what he could to
-comfort her, but with little effect. At length Becky said:
-
-"Tom!"
-
-"Well, Becky?"
-
-"They'll miss us and hunt for us!"
-
-"Yes, they will! Certainly they will!"
-
-"Maybe they're hunting for us now, Tom."
-
-"Why, I reckon maybe they are. I hope they are."
-
-"When would they miss us, Tom?"
-
-"When they get back to the boat, I reckon."
-
-"Tom, it might be dark then--would they notice we hadn't come?"
-
-"I don't know. But anyway, your mother would miss you as soon as they
-got home."
-
-A frightened look in Becky's face brought Tom to his senses and he saw
-that he had made a blunder. Becky was not to have gone home that night!
-The children became silent and thoughtful. In a moment a new burst of
-grief from Becky showed Tom that the thing in his mind had struck hers
-also--that the Sabbath morning might be half spent before Mrs. Thatcher
-discovered that Becky was not at Mrs. Harper's.
-
-The children fastened their eyes upon their bit of candle and watched
-it melt slowly and pitilessly away; saw the half inch of wick stand
-alone at last; saw the feeble flame rise and fall, climb the thin
-column of smoke, linger at its top a moment, and then--the horror of
-utter darkness reigned!
-
-How long afterward it was that Becky came to a slow consciousness that
-she was crying in Tom's arms, neither could tell. All that they knew
-was, that after what seemed a mighty stretch of time, both awoke out of
-a dead stupor of sleep and resumed their miseries once more. Tom said
-it might be Sunday, now--maybe Monday. He tried to get Becky to talk,
-but her sorrows were too oppressive, all her hopes were gone. Tom said
-that they must have been missed long ago, and no doubt the search was
-going on. He would shout and maybe some one would come. He tried it;
-but in the darkness the distant echoes sounded so hideously that he
-tried it no more.
-
-The hours wasted away, and hunger came to torment the captives again.
-A portion of Tom's half of the cake was left; they divided and ate it.
-But they seemed hungrier than before. The poor morsel of food only
-whetted desire.
-
-By-and-by Tom said:
-
-"SH! Did you hear that?"
-
-Both held their breath and listened. There was a sound like the
-faintest, far-off shout. Instantly Tom answered it, and leading Becky
-by the hand, started groping down the corridor in its direction.
-Presently he listened again; again the sound was heard, and apparently
-a little nearer.
-
-"It's them!" said Tom; "they're coming! Come along, Becky--we're all
-right now!"
-
-The joy of the prisoners was almost overwhelming. Their speed was
-slow, however, because pitfalls were somewhat common, and had to be
-guarded against. They shortly came to one and had to stop. It might be
-three feet deep, it might be a hundred--there was no passing it at any
-rate. Tom got down on his breast and reached as far down as he could.
-No bottom. They must stay there and wait until the searchers came. They
-listened; evidently the distant shoutings were growing more distant! a
-moment or two more and they had gone altogether. The heart-sinking
-misery of it! Tom whooped until he was hoarse, but it was of no use. He
-talked hopefully to Becky; but an age of anxious waiting passed and no
-sounds came again.
-
-The children groped their way back to the spring. The weary time
-dragged on; they slept again, and awoke famished and woe-stricken. Tom
-believed it must be Tuesday by this time.
-
-Now an idea struck him. There were some side passages near at hand. It
-would be better to explore some of these than bear the weight of the
-heavy time in idleness. He took a kite-line from his pocket, tied it to
-a projection, and he and Becky started, Tom in the lead, unwinding the
-line as he groped along. At the end of twenty steps the corridor ended
-in a "jumping-off place." Tom got down on his knees and felt below, and
-then as far around the corner as he could reach with his hands
-conveniently; he made an effort to stretch yet a little farther to the
-right, and at that moment, not twenty yards away, a human hand, holding
-a candle, appeared from behind a rock! Tom lifted up a glorious shout,
-and instantly that hand was followed by the body it belonged to--Injun
-Joe's! Tom was paralyzed; he could not move. He was vastly gratified
-the next moment, to see the "Spaniard" take to his heels and get
-himself out of sight. Tom wondered that Joe had not recognized his
-voice and come over and killed him for testifying in court. But the
-echoes must have disguised the voice. Without doubt, that was it, he
-reasoned. Tom's fright weakened every muscle in his body. He said to
-himself that if he had strength enough to get back to the spring he
-would stay there, and nothing should tempt him to run the risk of
-meeting Injun Joe again. He was careful to keep from Becky what it was
-he had seen. He told her he had only shouted "for luck."
-
-But hunger and wretchedness rise superior to fears in the long run.
-Another tedious wait at the spring and another long sleep brought
-changes. The children awoke tortured with a raging hunger. Tom believed
-that it must be Wednesday or Thursday or even Friday or Saturday, now,
-and that the search had been given over. He proposed to explore another
-passage. He felt willing to risk Injun Joe and all other terrors. But
-Becky was very weak. She had sunk into a dreary apathy and would not be
-roused. She said she would wait, now, where she was, and die--it would
-not be long. She told Tom to go with the kite-line and explore if he
-chose; but she implored him to come back every little while and speak
-to her; and she made him promise that when the awful time came, he
-would stay by her and hold her hand until all was over.
-
-Tom kissed her, with a choking sensation in his throat, and made a
-show of being confident of finding the searchers or an escape from the
-cave; then he took the kite-line in his hand and went groping down one
-of the passages on his hands and knees, distressed with hunger and sick
-with bodings of coming doom.
-
-
-
-CHAPTER XXXII
-
-TUESDAY afternoon came, and waned to the twilight. The village of St.
-Petersburg still mourned. The lost children had not been found. Public
-prayers had been offered up for them, and many and many a private
-prayer that had the petitioner's whole heart in it; but still no good
-news came from the cave. The majority of the searchers had given up the
-quest and gone back to their daily avocations, saying that it was plain
-the children could never be found. Mrs. Thatcher was very ill, and a
-great part of the time delirious. People said it was heartbreaking to
-hear her call her child, and raise her head and listen a whole minute
-at a time, then lay it wearily down again with a moan. Aunt Polly had
-drooped into a settled melancholy, and her gray hair had grown almost
-white. The village went to its rest on Tuesday night, sad and forlorn.
-
-Away in the middle of the night a wild peal burst from the village
-bells, and in a moment the streets were swarming with frantic half-clad
-people, who shouted, "Turn out! turn out! they're found! they're
-found!" Tin pans and horns were added to the din, the population massed
-itself and moved toward the river, met the children coming in an open
-carriage drawn by shouting citizens, thronged around it, joined its
-homeward march, and swept magnificently up the main street roaring
-huzzah after huzzah!
-
-The village was illuminated; nobody went to bed again; it was the
-greatest night the little town had ever seen. During the first half-hour
-a procession of villagers filed through Judge Thatcher's house, seized
-the saved ones and kissed them, squeezed Mrs. Thatcher's hand, tried to
-speak but couldn't--and drifted out raining tears all over the place.
-
-Aunt Polly's happiness was complete, and Mrs. Thatcher's nearly so. It
-would be complete, however, as soon as the messenger dispatched with
-the great news to the cave should get the word to her husband. Tom lay
-upon a sofa with an eager auditory about him and told the history of
-the wonderful adventure, putting in many striking additions to adorn it
-withal; and closed with a description of how he left Becky and went on
-an exploring expedition; how he followed two avenues as far as his
-kite-line would reach; how he followed a third to the fullest stretch of
-the kite-line, and was about to turn back when he glimpsed a far-off
-speck that looked like daylight; dropped the line and groped toward it,
-pushed his head and shoulders through a small hole, and saw the broad
-Mississippi rolling by! And if it had only happened to be night he would
-not have seen that speck of daylight and would not have explored that
-passage any more! He told how he went back for Becky and broke the good
-news and she told him not to fret her with such stuff, for she was
-tired, and knew she was going to die, and wanted to. He described how he
-labored with her and convinced her; and how she almost died for joy when
-she had groped to where she actually saw the blue speck of daylight; how
-he pushed his way out at the hole and then helped her out; how they sat
-there and cried for gladness; how some men came along in a skiff and Tom
-hailed them and told them their situation and their famished condition;
-how the men didn't believe the wild tale at first, "because," said they,
-"you are five miles down the river below the valley the cave is in"
---then took them aboard, rowed to a house, gave them supper, made them
-rest till two or three hours after dark and then brought them home.
-
-Before day-dawn, Judge Thatcher and the handful of searchers with him
-were tracked out, in the cave, by the twine clews they had strung
-behind them, and informed of the great news.
-
-Three days and nights of toil and hunger in the cave were not to be
-shaken off at once, as Tom and Becky soon discovered. They were
-bedridden all of Wednesday and Thursday, and seemed to grow more and
-more tired and worn, all the time. Tom got about, a little, on
-Thursday, was down-town Friday, and nearly as whole as ever Saturday;
-but Becky did not leave her room until Sunday, and then she looked as
-if she had passed through a wasting illness.
-
-Tom learned of Huck's sickness and went to see him on Friday, but
-could not be admitted to the bedroom; neither could he on Saturday or
-Sunday. He was admitted daily after that, but was warned to keep still
-about his adventure and introduce no exciting topic. The Widow Douglas
-stayed by to see that he obeyed. At home Tom learned of the Cardiff
-Hill event; also that the "ragged man's" body had eventually been found
-in the river near the ferry-landing; he had been drowned while trying
-to escape, perhaps.
-
-About a fortnight after Tom's rescue from the cave, he started off to
-visit Huck, who had grown plenty strong enough, now, to hear exciting
-talk, and Tom had some that would interest him, he thought. Judge
-Thatcher's house was on Tom's way, and he stopped to see Becky. The
-Judge and some friends set Tom to talking, and some one asked him
-ironically if he wouldn't like to go to the cave again. Tom said he
-thought he wouldn't mind it. The Judge said:
-
-"Well, there are others just like you, Tom, I've not the least doubt.
-But we have taken care of that. Nobody will get lost in that cave any
-more."
-
-"Why?"
-
-"Because I had its big door sheathed with boiler iron two weeks ago,
-and triple-locked--and I've got the keys."
-
-Tom turned as white as a sheet.
-
-"What's the matter, boy! Here, run, somebody! Fetch a glass of water!"
-
-The water was brought and thrown into Tom's face.
-
-"Ah, now you're all right. What was the matter with you, Tom?"
-
-"Oh, Judge, Injun Joe's in the cave!"
-
-
-
-CHAPTER XXXIII
-
-WITHIN a few minutes the news had spread, and a dozen skiff-loads of
-men were on their way to McDougal's cave, and the ferryboat, well
-filled with passengers, soon followed. Tom Sawyer was in the skiff that
-bore Judge Thatcher.
-
-When the cave door was unlocked, a sorrowful sight presented itself in
-the dim twilight of the place. Injun Joe lay stretched upon the ground,
-dead, with his face close to the crack of the door, as if his longing
-eyes had been fixed, to the latest moment, upon the light and the cheer
-of the free world outside. Tom was touched, for he knew by his own
-experience how this wretch had suffered. His pity was moved, but
-nevertheless he felt an abounding sense of relief and security, now,
-which revealed to him in a degree which he had not fully appreciated
-before how vast a weight of dread had been lying upon him since the day
-he lifted his voice against this bloody-minded outcast.
-
-Injun Joe's bowie-knife lay close by, its blade broken in two. The
-great foundation-beam of the door had been chipped and hacked through,
-with tedious labor; useless labor, too, it was, for the native rock
-formed a sill outside it, and upon that stubborn material the knife had
-wrought no effect; the only damage done was to the knife itself. But if
-there had been no stony obstruction there the labor would have been
-useless still, for if the beam had been wholly cut away Injun Joe could
-not have squeezed his body under the door, and he knew it. So he had
-only hacked that place in order to be doing something--in order to pass
-the weary time--in order to employ his tortured faculties. Ordinarily
-one could find half a dozen bits of candle stuck around in the crevices
-of this vestibule, left there by tourists; but there were none now. The
-prisoner had searched them out and eaten them. He had also contrived to
-catch a few bats, and these, also, he had eaten, leaving only their
-claws. The poor unfortunate had starved to death. In one place, near at
-hand, a stalagmite had been slowly growing up from the ground for ages,
-builded by the water-drip from a stalactite overhead. The captive had
-broken off the stalagmite, and upon the stump had placed a stone,
-wherein he had scooped a shallow hollow to catch the precious drop
-that fell once in every three minutes with the dreary regularity of a
-clock-tick--a dessertspoonful once in four and twenty hours. That drop
-was falling when the Pyramids were new; when Troy fell; when the
-foundations of Rome were laid; when Christ was crucified; when the
-Conqueror created the British empire; when Columbus sailed; when the
-massacre at Lexington was "news." It is falling now; it will still be
-falling when all these things shall have sunk down the afternoon of
-history, and the twilight of tradition, and been swallowed up in the
-thick night of oblivion. Has everything a purpose and a mission? Did
-this drop fall patiently during five thousand years to be ready for
-this flitting human insect's need? and has it another important object
-to accomplish ten thousand years to come? No matter. It is many and
-many a year since the hapless half-breed scooped out the stone to catch
-the priceless drops, but to this day the tourist stares longest at that
-pathetic stone and that slow-dropping water when he comes to see the
-wonders of McDougal's cave. Injun Joe's cup stands first in the list of
-the cavern's marvels; even "Aladdin's Palace" cannot rival it.
-
-Injun Joe was buried near the mouth of the cave; and people flocked
-there in boats and wagons from the towns and from all the farms and
-hamlets for seven miles around; they brought their children, and all
-sorts of provisions, and confessed that they had had almost as
-satisfactory a time at the funeral as they could have had at the
-hanging.
-
-This funeral stopped the further growth of one thing--the petition to
-the governor for Injun Joe's pardon. The petition had been largely
-signed; many tearful and eloquent meetings had been held, and a
-committee of sappy women been appointed to go in deep mourning and wail
-around the governor, and implore him to be a merciful ass and trample
-his duty under foot. Injun Joe was believed to have killed five
-citizens of the village, but what of that? If he had been Satan himself
-there would have been plenty of weaklings ready to scribble their names
-to a pardon-petition, and drip a tear on it from their permanently
-impaired and leaky water-works.
-
-The morning after the funeral Tom took Huck to a private place to have
-an important talk. Huck had learned all about Tom's adventure from the
-Welshman and the Widow Douglas, by this time, but Tom said he reckoned
-there was one thing they had not told him; that thing was what he
-wanted to talk about now. Huck's face saddened. He said:
-
-"I know what it is. You got into No. 2 and never found anything but
-whiskey. Nobody told me it was you; but I just knowed it must 'a' ben
-you, soon as I heard 'bout that whiskey business; and I knowed you
-hadn't got the money becuz you'd 'a' got at me some way or other and
-told me even if you was mum to everybody else. Tom, something's always
-told me we'd never get holt of that swag."
-
-"Why, Huck, I never told on that tavern-keeper. YOU know his tavern
-was all right the Saturday I went to the picnic. Don't you remember you
-was to watch there that night?"
-
-"Oh yes! Why, it seems 'bout a year ago. It was that very night that I
-follered Injun Joe to the widder's."
-
-"YOU followed him?"
-
-"Yes--but you keep mum. I reckon Injun Joe's left friends behind him,
-and I don't want 'em souring on me and doing me mean tricks. If it
-hadn't ben for me he'd be down in Texas now, all right."
-
-Then Huck told his entire adventure in confidence to Tom, who had only
-heard of the Welshman's part of it before.
-
-"Well," said Huck, presently, coming back to the main question,
-"whoever nipped the whiskey in No. 2, nipped the money, too, I reckon
---anyways it's a goner for us, Tom."
-
-"Huck, that money wasn't ever in No. 2!"
-
-"What!" Huck searched his comrade's face keenly. "Tom, have you got on
-the track of that money again?"
-
-"Huck, it's in the cave!"
-
-Huck's eyes blazed.
-
-"Say it again, Tom."
-
-"The money's in the cave!"
-
-"Tom--honest injun, now--is it fun, or earnest?"
-
-"Earnest, Huck--just as earnest as ever I was in my life. Will you go
-in there with me and help get it out?"
-
-"I bet I will! I will if it's where we can blaze our way to it and not
-get lost."
-
-"Huck, we can do that without the least little bit of trouble in the
-world."
-
-"Good as wheat! What makes you think the money's--"
-
-"Huck, you just wait till we get in there. If we don't find it I'll
-agree to give you my drum and every thing I've got in the world. I
-will, by jings."
-
-"All right--it's a whiz. When do you say?"
-
-"Right now, if you say it. Are you strong enough?"
-
-"Is it far in the cave? I ben on my pins a little, three or four days,
-now, but I can't walk more'n a mile, Tom--least I don't think I could."
-
-"It's about five mile into there the way anybody but me would go,
-Huck, but there's a mighty short cut that they don't anybody but me
-know about. Huck, I'll take you right to it in a skiff. I'll float the
-skiff down there, and I'll pull it back again all by myself. You
-needn't ever turn your hand over."
-
-"Less start right off, Tom."
-
-"All right. We want some bread and meat, and our pipes, and a little
-bag or two, and two or three kite-strings, and some of these
-new-fangled things they call lucifer matches. I tell you, many's
-the time I wished I had some when I was in there before."
-
-A trifle after noon the boys borrowed a small skiff from a citizen who
-was absent, and got under way at once. When they were several miles
-below "Cave Hollow," Tom said:
-
-"Now you see this bluff here looks all alike all the way down from the
-cave hollow--no houses, no wood-yards, bushes all alike. But do you see
-that white place up yonder where there's been a landslide? Well, that's
-one of my marks. We'll get ashore, now."
-
-They landed.
-
-"Now, Huck, where we're a-standing you could touch that hole I got out
-of with a fishing-pole. See if you can find it."
-
-Huck searched all the place about, and found nothing. Tom proudly
-marched into a thick clump of sumach bushes and said:
-
-"Here you are! Look at it, Huck; it's the snuggest hole in this
-country. You just keep mum about it. All along I've been wanting to be
-a robber, but I knew I'd got to have a thing like this, and where to
-run across it was the bother. We've got it now, and we'll keep it
-quiet, only we'll let Joe Harper and Ben Rogers in--because of course
-there's got to be a Gang, or else there wouldn't be any style about it.
-Tom Sawyer's Gang--it sounds splendid, don't it, Huck?"
-
-"Well, it just does, Tom. And who'll we rob?"
-
-"Oh, most anybody. Waylay people--that's mostly the way."
-
-"And kill them?"
-
-"No, not always. Hive them in the cave till they raise a ransom."
-
-"What's a ransom?"
-
-"Money. You make them raise all they can, off'n their friends; and
-after you've kept them a year, if it ain't raised then you kill them.
-That's the general way. Only you don't kill the women. You shut up the
-women, but you don't kill them. They're always beautiful and rich, and
-awfully scared. You take their watches and things, but you always take
-your hat off and talk polite. They ain't anybody as polite as robbers
---you'll see that in any book. Well, the women get to loving you, and
-after they've been in the cave a week or two weeks they stop crying and
-after that you couldn't get them to leave. If you drove them out they'd
-turn right around and come back. It's so in all the books."
-
-"Why, it's real bully, Tom. I believe it's better'n to be a pirate."
-
-"Yes, it's better in some ways, because it's close to home and
-circuses and all that."
-
-By this time everything was ready and the boys entered the hole, Tom
-in the lead. They toiled their way to the farther end of the tunnel,
-then made their spliced kite-strings fast and moved on. A few steps
-brought them to the spring, and Tom felt a shudder quiver all through
-him. He showed Huck the fragment of candle-wick perched on a lump of
-clay against the wall, and described how he and Becky had watched the
-flame struggle and expire.
-
-The boys began to quiet down to whispers, now, for the stillness and
-gloom of the place oppressed their spirits. They went on, and presently
-entered and followed Tom's other corridor until they reached the
-"jumping-off place." The candles revealed the fact that it was not
-really a precipice, but only a steep clay hill twenty or thirty feet
-high. Tom whispered:
-
-"Now I'll show you something, Huck."
-
-He held his candle aloft and said:
-
-"Look as far around the corner as you can. Do you see that? There--on
-the big rock over yonder--done with candle-smoke."
-
-"Tom, it's a CROSS!"
-
-"NOW where's your Number Two? 'UNDER THE CROSS,' hey? Right yonder's
-where I saw Injun Joe poke up his candle, Huck!"
-
-Huck stared at the mystic sign awhile, and then said with a shaky voice:
-
-"Tom, less git out of here!"
-
-"What! and leave the treasure?"
-
-"Yes--leave it. Injun Joe's ghost is round about there, certain."
-
-"No it ain't, Huck, no it ain't. It would ha'nt the place where he
-died--away out at the mouth of the cave--five mile from here."
-
-"No, Tom, it wouldn't. It would hang round the money. I know the ways
-of ghosts, and so do you."
-
-Tom began to fear that Huck was right. Misgivings gathered in his
-mind. But presently an idea occurred to him--
-
-"Lookyhere, Huck, what fools we're making of ourselves! Injun Joe's
-ghost ain't a going to come around where there's a cross!"
-
-The point was well taken. It had its effect.
-
-"Tom, I didn't think of that. But that's so. It's luck for us, that
-cross is. I reckon we'll climb down there and have a hunt for that box."
-
-Tom went first, cutting rude steps in the clay hill as he descended.
-Huck followed. Four avenues opened out of the small cavern which the
-great rock stood in. The boys examined three of them with no result.
-They found a small recess in the one nearest the base of the rock, with
-a pallet of blankets spread down in it; also an old suspender, some
-bacon rind, and the well-gnawed bones of two or three fowls. But there
-was no money-box. The lads searched and researched this place, but in
-vain. Tom said:
-
-"He said UNDER the cross. Well, this comes nearest to being under the
-cross. It can't be under the rock itself, because that sets solid on
-the ground."
-
-They searched everywhere once more, and then sat down discouraged.
-Huck could suggest nothing. By-and-by Tom said:
-
-"Lookyhere, Huck, there's footprints and some candle-grease on the
-clay about one side of this rock, but not on the other sides. Now,
-what's that for? I bet you the money IS under the rock. I'm going to
-dig in the clay."
-
-"That ain't no bad notion, Tom!" said Huck with animation.
-
-Tom's "real Barlow" was out at once, and he had not dug four inches
-before he struck wood.
-
-"Hey, Huck!--you hear that?"
-
-Huck began to dig and scratch now. Some boards were soon uncovered and
-removed. They had concealed a natural chasm which led under the rock.
-Tom got into this and held his candle as far under the rock as he
-could, but said he could not see to the end of the rift. He proposed to
-explore. He stooped and passed under; the narrow way descended
-gradually. He followed its winding course, first to the right, then to
-the left, Huck at his heels. Tom turned a short curve, by-and-by, and
-exclaimed:
-
-"My goodness, Huck, lookyhere!"
-
-It was the treasure-box, sure enough, occupying a snug little cavern,
-along with an empty powder-keg, a couple of guns in leather cases, two
-or three pairs of old moccasins, a leather belt, and some other rubbish
-well soaked with the water-drip.
-
-"Got it at last!" said Huck, ploughing among the tarnished coins with
-his hand. "My, but we're rich, Tom!"
-
-"Huck, I always reckoned we'd get it. It's just too good to believe,
-but we HAVE got it, sure! Say--let's not fool around here. Let's snake
-it out. Lemme see if I can lift the box."
-
-It weighed about fifty pounds. Tom could lift it, after an awkward
-fashion, but could not carry it conveniently.
-
-"I thought so," he said; "THEY carried it like it was heavy, that day
-at the ha'nted house. I noticed that. I reckon I was right to think of
-fetching the little bags along."
-
-The money was soon in the bags and the boys took it up to the cross
-rock.
-
-"Now less fetch the guns and things," said Huck.
-
-"No, Huck--leave them there. They're just the tricks to have when we
-go to robbing. We'll keep them there all the time, and we'll hold our
-orgies there, too. It's an awful snug place for orgies."
-
-"What orgies?"
-
-"I dono. But robbers always have orgies, and of course we've got to
-have them, too. Come along, Huck, we've been in here a long time. It's
-getting late, I reckon. I'm hungry, too. We'll eat and smoke when we
-get to the skiff."
-
-They presently emerged into the clump of sumach bushes, looked warily
-out, found the coast clear, and were soon lunching and smoking in the
-skiff. As the sun dipped toward the horizon they pushed out and got
-under way. Tom skimmed up the shore through the long twilight, chatting
-cheerily with Huck, and landed shortly after dark.
-
-"Now, Huck," said Tom, "we'll hide the money in the loft of the
-widow's woodshed, and I'll come up in the morning and we'll count it
-and divide, and then we'll hunt up a place out in the woods for it
-where it will be safe. Just you lay quiet here and watch the stuff till
-I run and hook Benny Taylor's little wagon; I won't be gone a minute."
-
-He disappeared, and presently returned with the wagon, put the two
-small sacks into it, threw some old rags on top of them, and started
-off, dragging his cargo behind him. When the boys reached the
-Welshman's house, they stopped to rest. Just as they were about to move
-on, the Welshman stepped out and said:
-
-"Hallo, who's that?"
-
-"Huck and Tom Sawyer."
-
-"Good! Come along with me, boys, you are keeping everybody waiting.
-Here--hurry up, trot ahead--I'll haul the wagon for you. Why, it's not
-as light as it might be. Got bricks in it?--or old metal?"
-
-"Old metal," said Tom.
-
-"I judged so; the boys in this town will take more trouble and fool
-away more time hunting up six bits' worth of old iron to sell to the
-foundry than they would to make twice the money at regular work. But
-that's human nature--hurry along, hurry along!"
-
-The boys wanted to know what the hurry was about.
-
-"Never mind; you'll see, when we get to the Widow Douglas'."
-
-Huck said with some apprehension--for he was long used to being
-falsely accused:
-
-"Mr. Jones, we haven't been doing nothing."
-
-The Welshman laughed.
-
-"Well, I don't know, Huck, my boy. I don't know about that. Ain't you
-and the widow good friends?"
-
-"Yes. Well, she's ben good friends to me, anyway."
-
-"All right, then. What do you want to be afraid for?"
-
-This question was not entirely answered in Huck's slow mind before he
-found himself pushed, along with Tom, into Mrs. Douglas' drawing-room.
-Mr. Jones left the wagon near the door and followed.
-
-The place was grandly lighted, and everybody that was of any
-consequence in the village was there. The Thatchers were there, the
-Harpers, the Rogerses, Aunt Polly, Sid, Mary, the minister, the editor,
-and a great many more, and all dressed in their best. The widow
-received the boys as heartily as any one could well receive two such
-looking beings. They were covered with clay and candle-grease. Aunt
-Polly blushed crimson with humiliation, and frowned and shook her head
-at Tom. Nobody suffered half as much as the two boys did, however. Mr.
-Jones said:
-
-"Tom wasn't at home, yet, so I gave him up; but I stumbled on him and
-Huck right at my door, and so I just brought them along in a hurry."
-
-"And you did just right," said the widow. "Come with me, boys."
-
-She took them to a bedchamber and said:
-
-"Now wash and dress yourselves. Here are two new suits of clothes
---shirts, socks, everything complete. They're Huck's--no, no thanks,
-Huck--Mr. Jones bought one and I the other. But they'll fit both of you.
-Get into them. We'll wait--come down when you are slicked up enough."
-
-Then she left.
-
-
-
-CHAPTER XXXIV
-
-HUCK said: "Tom, we can slope, if we can find a rope. The window ain't
-high from the ground."
-
-"Shucks! what do you want to slope for?"
-
-"Well, I ain't used to that kind of a crowd. I can't stand it. I ain't
-going down there, Tom."
-
-"Oh, bother! It ain't anything. I don't mind it a bit. I'll take care
-of you."
-
-Sid appeared.
-
-"Tom," said he, "auntie has been waiting for you all the afternoon.
-Mary got your Sunday clothes ready, and everybody's been fretting about
-you. Say--ain't this grease and clay, on your clothes?"
-
-"Now, Mr. Siddy, you jist 'tend to your own business. What's all this
-blow-out about, anyway?"
-
-"It's one of the widow's parties that she's always having. This time
-it's for the Welshman and his sons, on account of that scrape they
-helped her out of the other night. And say--I can tell you something,
-if you want to know."
-
-"Well, what?"
-
-"Why, old Mr. Jones is going to try to spring something on the people
-here to-night, but I overheard him tell auntie to-day about it, as a
-secret, but I reckon it's not much of a secret now. Everybody knows
---the widow, too, for all she tries to let on she don't. Mr. Jones was
-bound Huck should be here--couldn't get along with his grand secret
-without Huck, you know!"
-
-"Secret about what, Sid?"
-
-"About Huck tracking the robbers to the widow's. I reckon Mr. Jones
-was going to make a grand time over his surprise, but I bet you it will
-drop pretty flat."
-
-Sid chuckled in a very contented and satisfied way.
-
-"Sid, was it you that told?"
-
-"Oh, never mind who it was. SOMEBODY told--that's enough."
-
-"Sid, there's only one person in this town mean enough to do that, and
-that's you. If you had been in Huck's place you'd 'a' sneaked down the
-hill and never told anybody on the robbers. You can't do any but mean
-things, and you can't bear to see anybody praised for doing good ones.
-There--no thanks, as the widow says"--and Tom cuffed Sid's ears and
-helped him to the door with several kicks. "Now go and tell auntie if
-you dare--and to-morrow you'll catch it!"
-
-Some minutes later the widow's guests were at the supper-table, and a
-dozen children were propped up at little side-tables in the same room,
-after the fashion of that country and that day. At the proper time Mr.
-Jones made his little speech, in which he thanked the widow for the
-honor she was doing himself and his sons, but said that there was
-another person whose modesty--
-
-And so forth and so on. He sprung his secret about Huck's share in the
-adventure in the finest dramatic manner he was master of, but the
-surprise it occasioned was largely counterfeit and not as clamorous and
-effusive as it might have been under happier circumstances. However,
-the widow made a pretty fair show of astonishment, and heaped so many
-compliments and so much gratitude upon Huck that he almost forgot the
-nearly intolerable discomfort of his new clothes in the entirely
-intolerable discomfort of being set up as a target for everybody's gaze
-and everybody's laudations.
-
-The widow said she meant to give Huck a home under her roof and have
-him educated; and that when she could spare the money she would start
-him in business in a modest way. Tom's chance was come. He said:
-
-"Huck don't need it. Huck's rich."
-
-Nothing but a heavy strain upon the good manners of the company kept
-back the due and proper complimentary laugh at this pleasant joke. But
-the silence was a little awkward. Tom broke it:
-
-"Huck's got money. Maybe you don't believe it, but he's got lots of
-it. Oh, you needn't smile--I reckon I can show you. You just wait a
-minute."
-
-Tom ran out of doors. The company looked at each other with a
-perplexed interest--and inquiringly at Huck, who was tongue-tied.
-
-"Sid, what ails Tom?" said Aunt Polly. "He--well, there ain't ever any
-making of that boy out. I never--"
-
-Tom entered, struggling with the weight of his sacks, and Aunt Polly
-did not finish her sentence. Tom poured the mass of yellow coin upon
-the table and said:
-
-"There--what did I tell you? Half of it's Huck's and half of it's mine!"
-
-The spectacle took the general breath away. All gazed, nobody spoke
-for a moment. Then there was a unanimous call for an explanation. Tom
-said he could furnish it, and he did. The tale was long, but brimful of
-interest. There was scarcely an interruption from any one to break the
-charm of its flow. When he had finished, Mr. Jones said:
-
-"I thought I had fixed up a little surprise for this occasion, but it
-don't amount to anything now. This one makes it sing mighty small, I'm
-willing to allow."
-
-The money was counted. The sum amounted to a little over twelve
-thousand dollars. It was more than any one present had ever seen at one
-time before, though several persons were there who were worth
-considerably more than that in property.
-
-
-
-CHAPTER XXXV
-
-THE reader may rest satisfied that Tom's and Huck's windfall made a
-mighty stir in the poor little village of St. Petersburg. So vast a
-sum, all in actual cash, seemed next to incredible. It was talked
-about, gloated over, glorified, until the reason of many of the
-citizens tottered under the strain of the unhealthy excitement. Every
-"haunted" house in St. Petersburg and the neighboring villages was
-dissected, plank by plank, and its foundations dug up and ransacked for
-hidden treasure--and not by boys, but men--pretty grave, unromantic
-men, too, some of them. Wherever Tom and Huck appeared they were
-courted, admired, stared at. The boys were not able to remember that
-their remarks had possessed weight before; but now their sayings were
-treasured and repeated; everything they did seemed somehow to be
-regarded as remarkable; they had evidently lost the power of doing and
-saying commonplace things; moreover, their past history was raked up
-and discovered to bear marks of conspicuous originality. The village
-paper published biographical sketches of the boys.
-
-The Widow Douglas put Huck's money out at six per cent., and Judge
-Thatcher did the same with Tom's at Aunt Polly's request. Each lad had
-an income, now, that was simply prodigious--a dollar for every week-day
-in the year and half of the Sundays. It was just what the minister got
---no, it was what he was promised--he generally couldn't collect it. A
-dollar and a quarter a week would board, lodge, and school a boy in
-those old simple days--and clothe him and wash him, too, for that
-matter.
-
-Judge Thatcher had conceived a great opinion of Tom. He said that no
-commonplace boy would ever have got his daughter out of the cave. When
-Becky told her father, in strict confidence, how Tom had taken her
-whipping at school, the Judge was visibly moved; and when she pleaded
-grace for the mighty lie which Tom had told in order to shift that
-whipping from her shoulders to his own, the Judge said with a fine
-outburst that it was a noble, a generous, a magnanimous lie--a lie that
-was worthy to hold up its head and march down through history breast to
-breast with George Washington's lauded Truth about the hatchet! Becky
-thought her father had never looked so tall and so superb as when he
-walked the floor and stamped his foot and said that. She went straight
-off and told Tom about it.
-
-Judge Thatcher hoped to see Tom a great lawyer or a great soldier some
-day. He said he meant to look to it that Tom should be admitted to the
-National Military Academy and afterward trained in the best law school
-in the country, in order that he might be ready for either career or
-both.
-
-Huck Finn's wealth and the fact that he was now under the Widow
-Douglas' protection introduced him into society--no, dragged him into
-it, hurled him into it--and his sufferings were almost more than he
-could bear. The widow's servants kept him clean and neat, combed and
-brushed, and they bedded him nightly in unsympathetic sheets that had
-not one little spot or stain which he could press to his heart and know
-for a friend. He had to eat with a knife and fork; he had to use
-napkin, cup, and plate; he had to learn his book, he had to go to
-church; he had to talk so properly that speech was become insipid in
-his mouth; whithersoever he turned, the bars and shackles of
-civilization shut him in and bound him hand and foot.
-
-He bravely bore his miseries three weeks, and then one day turned up
-missing. For forty-eight hours the widow hunted for him everywhere in
-great distress. The public were profoundly concerned; they searched
-high and low, they dragged the river for his body. Early the third
-morning Tom Sawyer wisely went poking among some old empty hogsheads
-down behind the abandoned slaughter-house, and in one of them he found
-the refugee. Huck had slept there; he had just breakfasted upon some
-stolen odds and ends of food, and was lying off, now, in comfort, with
-his pipe. He was unkempt, uncombed, and clad in the same old ruin of
-rags that had made him picturesque in the days when he was free and
-happy. Tom routed him out, told him the trouble he had been causing,
-and urged him to go home. Huck's face lost its tranquil content, and
-took a melancholy cast. He said:
-
-"Don't talk about it, Tom. I've tried it, and it don't work; it don't
-work, Tom. It ain't for me; I ain't used to it. The widder's good to
-me, and friendly; but I can't stand them ways. She makes me get up just
-at the same time every morning; she makes me wash, they comb me all to
-thunder; she won't let me sleep in the woodshed; I got to wear them
-blamed clothes that just smothers me, Tom; they don't seem to any air
-git through 'em, somehow; and they're so rotten nice that I can't set
-down, nor lay down, nor roll around anywher's; I hain't slid on a
-cellar-door for--well, it 'pears to be years; I got to go to church and
-sweat and sweat--I hate them ornery sermons! I can't ketch a fly in
-there, I can't chaw. I got to wear shoes all Sunday. The widder eats by
-a bell; she goes to bed by a bell; she gits up by a bell--everything's
-so awful reg'lar a body can't stand it."
-
-"Well, everybody does that way, Huck."
-
-"Tom, it don't make no difference. I ain't everybody, and I can't
-STAND it. It's awful to be tied up so. And grub comes too easy--I don't
-take no interest in vittles, that way. I got to ask to go a-fishing; I
-got to ask to go in a-swimming--dern'd if I hain't got to ask to do
-everything. Well, I'd got to talk so nice it wasn't no comfort--I'd got
-to go up in the attic and rip out awhile, every day, to git a taste in
-my mouth, or I'd a died, Tom. The widder wouldn't let me smoke; she
-wouldn't let me yell, she wouldn't let me gape, nor stretch, nor
-scratch, before folks--" [Then with a spasm of special irritation and
-injury]--"And dad fetch it, she prayed all the time! I never see such a
-woman! I HAD to shove, Tom--I just had to. And besides, that school's
-going to open, and I'd a had to go to it--well, I wouldn't stand THAT,
-Tom. Looky here, Tom, being rich ain't what it's cracked up to be. It's
-just worry and worry, and sweat and sweat, and a-wishing you was dead
-all the time. Now these clothes suits me, and this bar'l suits me, and
-I ain't ever going to shake 'em any more. Tom, I wouldn't ever got into
-all this trouble if it hadn't 'a' ben for that money; now you just take
-my sheer of it along with your'n, and gimme a ten-center sometimes--not
-many times, becuz I don't give a dern for a thing 'thout it's tollable
-hard to git--and you go and beg off for me with the widder."
-
-"Oh, Huck, you know I can't do that. 'Tain't fair; and besides if
-you'll try this thing just a while longer you'll come to like it."
-
-"Like it! Yes--the way I'd like a hot stove if I was to set on it long
-enough. No, Tom, I won't be rich, and I won't live in them cussed
-smothery houses. I like the woods, and the river, and hogsheads, and
-I'll stick to 'em, too. Blame it all! just as we'd got guns, and a
-cave, and all just fixed to rob, here this dern foolishness has got to
-come up and spile it all!"
-
-Tom saw his opportunity--
-
-"Lookyhere, Huck, being rich ain't going to keep me back from turning
-robber."
-
-"No! Oh, good-licks; are you in real dead-wood earnest, Tom?"
-
-"Just as dead earnest as I'm sitting here. But Huck, we can't let you
-into the gang if you ain't respectable, you know."
-
-Huck's joy was quenched.
-
-"Can't let me in, Tom? Didn't you let me go for a pirate?"
-
-"Yes, but that's different. A robber is more high-toned than what a
-pirate is--as a general thing. In most countries they're awful high up
-in the nobility--dukes and such."
-
-"Now, Tom, hain't you always ben friendly to me? You wouldn't shet me
-out, would you, Tom? You wouldn't do that, now, WOULD you, Tom?"
-
-"Huck, I wouldn't want to, and I DON'T want to--but what would people
-say? Why, they'd say, 'Mph! Tom Sawyer's Gang! pretty low characters in
-it!' They'd mean you, Huck. You wouldn't like that, and I wouldn't."
-
-Huck was silent for some time, engaged in a mental struggle. Finally
-he said:
-
-"Well, I'll go back to the widder for a month and tackle it and see if
-I can come to stand it, if you'll let me b'long to the gang, Tom."
-
-"All right, Huck, it's a whiz! Come along, old chap, and I'll ask the
-widow to let up on you a little, Huck."
-
-"Will you, Tom--now will you? That's good. If she'll let up on some of
-the roughest things, I'll smoke private and cuss private, and crowd
-through or bust. When you going to start the gang and turn robbers?"
-
-"Oh, right off. We'll get the boys together and have the initiation
-to-night, maybe."
-
-"Have the which?"
-
-"Have the initiation."
-
-"What's that?"
-
-"It's to swear to stand by one another, and never tell the gang's
-secrets, even if you're chopped all to flinders, and kill anybody and
-all his family that hurts one of the gang."
-
-"That's gay--that's mighty gay, Tom, I tell you."
-
-"Well, I bet it is. And all that swearing's got to be done at
-midnight, in the lonesomest, awfulest place you can find--a ha'nted
-house is the best, but they're all ripped up now."
-
-"Well, midnight's good, anyway, Tom."
-
-"Yes, so it is. And you've got to swear on a coffin, and sign it with
-blood."
-
-"Now, that's something LIKE! Why, it's a million times bullier than
-pirating. I'll stick to the widder till I rot, Tom; and if I git to be
-a reg'lar ripper of a robber, and everybody talking 'bout it, I reckon
-she'll be proud she snaked me in out of the wet."
-
-
-
-CONCLUSION
-
-SO endeth this chronicle. It being strictly a history of a BOY, it
-must stop here; the story could not go much further without becoming
-the history of a MAN. When one writes a novel about grown people, he
-knows exactly where to stop--that is, with a marriage; but when he
-writes of juveniles, he must stop where he best can.
-
-Most of the characters that perform in this book still live, and are
-prosperous and happy. Some day it may seem worth while to take up the
-story of the younger ones again and see what sort of men and women they
-turned out to be; therefore it will be wisest not to reveal any of that
-part of their lives at present.
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/missing cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/missing
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/missing	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/missing	1970-01-01 00:00:00.000000000 +0000
@@ -1,331 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2012-01-06.13; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/mmap.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/mmap.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/mmap.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/mmap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,325 +0,0 @@
-/* mmap.c -- Memory allocation with mmap.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* Memory allocation on systems that provide anonymous mmap.  This
-   permits the backtrace functions to be invoked from a signal
-   handler, assuming that mmap is async-signal safe.  */
-
-#ifndef MAP_ANONYMOUS
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)
-#endif
-
-/* A list of free memory blocks.  */
-
-struct backtrace_freelist_struct
-{
-  /* Next on list.  */
-  struct backtrace_freelist_struct *next;
-  /* Size of this block, including this structure.  */
-  size_t size;
-};
-
-/* Free memory allocated by backtrace_alloc.  */
-
-static void
-backtrace_free_locked (struct backtrace_state *state, void *addr, size_t size)
-{
-  /* Just leak small blocks.  We don't have to be perfect.  Don't put
-     more than 16 entries on the free list, to avoid wasting time
-     searching when allocating a block.  If we have more than 16
-     entries, leak the smallest entry.  */
-
-  if (size >= sizeof (struct backtrace_freelist_struct))
-    {
-      size_t c;
-      struct backtrace_freelist_struct **ppsmall;
-      struct backtrace_freelist_struct **pp;
-      struct backtrace_freelist_struct *p;
-
-      c = 0;
-      ppsmall = NULL;
-      for (pp = &state->freelist; *pp != NULL; pp = &(*pp)->next)
-	{
-	  if (ppsmall == NULL || (*pp)->size < (*ppsmall)->size)
-	    ppsmall = pp;
-	  ++c;
-	}
-      if (c >= 16)
-	{
-	  if (size <= (*ppsmall)->size)
-	    return;
-	  *ppsmall = (*ppsmall)->next;
-	}
-
-      p = (struct backtrace_freelist_struct *) addr;
-      p->next = state->freelist;
-      p->size = size;
-      state->freelist = p;
-    }
-}
-
-/* Allocate memory like malloc.  If ERROR_CALLBACK is NULL, don't
-   report an error.  */
-
-void *
-backtrace_alloc (struct backtrace_state *state,
-		 size_t size, backtrace_error_callback error_callback,
-		 void *data)
-{
-  void *ret;
-  int locked;
-  struct backtrace_freelist_struct **pp;
-  size_t pagesize;
-  size_t asksize;
-  void *page;
-
-  ret = NULL;
-
-  /* If we can acquire the lock, then see if there is space on the
-     free list.  If we can't acquire the lock, drop straight into
-     using mmap.  __sync_lock_test_and_set returns the old state of
-     the lock, so we have acquired it if it returns 0.  */
-
-  if (!state->threaded)
-    locked = 1;
-  else
-    locked = __sync_lock_test_and_set (&state->lock_alloc, 1) == 0;
-
-  if (locked)
-    {
-      for (pp = &state->freelist; *pp != NULL; pp = &(*pp)->next)
-	{
-	  if ((*pp)->size >= size)
-	    {
-	      struct backtrace_freelist_struct *p;
-
-	      p = *pp;
-	      *pp = p->next;
-
-	      /* Round for alignment; we assume that no type we care about
-		 is more than 8 bytes.  */
-	      size = (size + 7) & ~ (size_t) 7;
-	      if (size < p->size)
-		backtrace_free_locked (state, (char *) p + size,
-				       p->size - size);
-
-	      ret = (void *) p;
-
-	      break;
-	    }
-	}
-
-      if (state->threaded)
-	__sync_lock_release (&state->lock_alloc);
-    }
-
-  if (ret == NULL)
-    {
-      /* Allocate a new page.  */
-
-      pagesize = getpagesize ();
-      asksize = (size + pagesize - 1) & ~ (pagesize - 1);
-      page = mmap (NULL, asksize, PROT_READ | PROT_WRITE,
-		   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (page == MAP_FAILED)
-	{
-	  if (error_callback)
-	    error_callback (data, "mmap", errno);
-	}
-      else
-	{
-	  size = (size + 7) & ~ (size_t) 7;
-	  if (size < asksize)
-	    backtrace_free (state, (char *) page + size, asksize - size,
-			    error_callback, data);
-
-	  ret = page;
-	}
-    }
-
-  return ret;
-}
-
-/* Free memory allocated by backtrace_alloc.  */
-
-void
-backtrace_free (struct backtrace_state *state, void *addr, size_t size,
-		backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-		void *data ATTRIBUTE_UNUSED)
-{
-  int locked;
-
-  /* If we are freeing a large aligned block, just release it back to
-     the system.  This case arises when growing a vector for a large
-     binary with lots of debug info.  Calling munmap here may cause us
-     to call mmap again if there is also a large shared library; we
-     just live with that.  */
-  if (size >= 16 * 4096)
-    {
-      size_t pagesize;
-
-      pagesize = getpagesize ();
-      if (((uintptr_t) addr & (pagesize - 1)) == 0
-	  && (size & (pagesize - 1)) == 0)
-	{
-	  /* If munmap fails for some reason, just add the block to
-	     the freelist.  */
-	  if (munmap (addr, size) == 0)
-	    return;
-	}
-    }
-
-  /* If we can acquire the lock, add the new space to the free list.
-     If we can't acquire the lock, just leak the memory.
-     __sync_lock_test_and_set returns the old state of the lock, so we
-     have acquired it if it returns 0.  */
-
-  if (!state->threaded)
-    locked = 1;
-  else
-    locked = __sync_lock_test_and_set (&state->lock_alloc, 1) == 0;
-
-  if (locked)
-    {
-      backtrace_free_locked (state, addr, size);
-
-      if (state->threaded)
-	__sync_lock_release (&state->lock_alloc);
-    }
-}
-
-/* Grow VEC by SIZE bytes.  */
-
-void *
-backtrace_vector_grow (struct backtrace_state *state,size_t size,
-		       backtrace_error_callback error_callback,
-		       void *data, struct backtrace_vector *vec)
-{
-  void *ret;
-
-  if (size > vec->alc)
-    {
-      size_t pagesize;
-      size_t alc;
-      void *base;
-
-      pagesize = getpagesize ();
-      alc = vec->size + size;
-      if (vec->size == 0)
-	alc = 16 * size;
-      else if (alc < pagesize)
-	{
-	  alc *= 2;
-	  if (alc > pagesize)
-	    alc = pagesize;
-	}
-      else
-	{
-	  alc *= 2;
-	  alc = (alc + pagesize - 1) & ~ (pagesize - 1);
-	}
-      base = backtrace_alloc (state, alc, error_callback, data);
-      if (base == NULL)
-	return NULL;
-      if (vec->base != NULL)
-	{
-	  memcpy (base, vec->base, vec->size);
-	  backtrace_free (state, vec->base, vec->size + vec->alc,
-			  error_callback, data);
-	}
-      vec->base = base;
-      vec->alc = alc - vec->size;
-    }
-
-  ret = (char *) vec->base + vec->size;
-  vec->size += size;
-  vec->alc -= size;
-  return ret;
-}
-
-/* Finish the current allocation on VEC.  */
-
-void *
-backtrace_vector_finish (
-  struct backtrace_state *state ATTRIBUTE_UNUSED,
-  struct backtrace_vector *vec,
-  backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-  void *data ATTRIBUTE_UNUSED)
-{
-  void *ret;
-
-  ret = vec->base;
-  vec->base = (char *) vec->base + vec->size;
-  vec->size = 0;
-  return ret;
-}
-
-/* Release any extra space allocated for VEC.  */
-
-int
-backtrace_vector_release (struct backtrace_state *state,
-			  struct backtrace_vector *vec,
-			  backtrace_error_callback error_callback,
-			  void *data)
-{
-  size_t size;
-  size_t alc;
-  size_t aligned;
-
-  /* Make sure that the block that we free is aligned on an 8-byte
-     boundary.  */
-  size = vec->size;
-  alc = vec->alc;
-  aligned = (size + 7) & ~ (size_t) 7;
-  alc -= aligned - size;
-
-  backtrace_free (state, (char *) vec->base + aligned, alc,
-		  error_callback, data);
-  vec->alc = 0;
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/mmapio.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/mmapio.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/mmapio.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/mmapio.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-/* mmapio.c -- File views using mmap.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)
-#endif
-
-/* This file implements file views and memory allocation when mmap is
-   available.  */
-
-/* Create a view of SIZE bytes from DESCRIPTOR at OFFSET.  */
-
-int
-backtrace_get_view (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		    int descriptor, off_t offset, size_t size,
-		    backtrace_error_callback error_callback,
-		    void *data, struct backtrace_view *view)
-{
-  size_t pagesize;
-  unsigned int inpage;
-  off_t pageoff;
-  void *map;
-
-  pagesize = getpagesize ();
-  inpage = offset % pagesize;
-  pageoff = offset - inpage;
-
-  size += inpage;
-  size = (size + (pagesize - 1)) & ~ (pagesize - 1);
-
-  map = mmap (NULL, size, PROT_READ, MAP_PRIVATE, descriptor, pageoff);
-  if (map == MAP_FAILED)
-    {
-      error_callback (data, "mmap", errno);
-      return 0;
-    }
-
-  view->data = (char *) map + inpage;
-  view->base = map;
-  view->len = size;
-
-  return 1;
-}
-
-/* Release a view read by backtrace_get_view.  */
-
-void
-backtrace_release_view (struct backtrace_state *state ATTRIBUTE_UNUSED,
-			struct backtrace_view *view,
-			backtrace_error_callback error_callback,
-			void *data)
-{
-  union {
-    const void *cv;
-    void *v;
-  } const_cast;
-
-  const_cast.cv = view->base;
-  if (munmap (const_cast.v, view->len) < 0)
-    error_callback (data, "munmap", errno);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/move-if-change cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/move-if-change
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/move-if-change	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/move-if-change	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-#!/bin/sh
-# Like mv $1 $2, but if the files are the same, just delete $1.
-# Status is zero if successful, nonzero otherwise.
-
-VERSION='2012-01-06 07:23'; # UTC
-# The definition above must lie within the first 8 lines in order
-# for the Emacs time-stamp write hook (at end) to update it.
-# If you change this file with Emacs, please let the write hook
-# do its job.  Otherwise, update this string manually.
-
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-usage="usage: $0 SOURCE DEST"
-
-help="$usage
-  or:  $0 OPTION
-If SOURCE is different than DEST, then move it to DEST; else remove SOURCE.
-
-  --help     display this help and exit
-  --version  output version information and exit
-
-The variable CMPPROG can be used to specify an alternative to 'cmp'.
-
-Report bugs to <bug-gnulib@gnu.org>."
-
-version=`expr "$VERSION" : '\([^ ]*\)'`
-version="move-if-change (gnulib) $version
-Copyright (C) 2011 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-
-cmpprog=${CMPPROG-cmp}
-
-for arg
-do
-  case $arg in
-    --help | --hel | --he | --h)
-      exec echo "$help" ;;
-    --version | --versio | --versi | --vers | --ver | --ve | --v)
-      exec echo "$version" ;;
-    --)
-      shift
-      break ;;
-    -*)
-      echo "$0: invalid option: $arg" >&2
-      exit 1 ;;
-    *)
-      break ;;
-  esac
-done
-
-test $# -eq 2 || { echo "$0: $usage" >&2; exit 1; }
-
-if test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null; then
-  rm -f -- "$1"
-else
-  if mv -f -- "$1" "$2"; then :; else
-    # Ignore failure due to a concurrent move-if-change.
-    test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null && rm -f -- "$1"
-  fi
-fi
-
-## Local Variables:
-## eval: (add-hook 'write-file-hooks 'time-stamp)
-## time-stamp-start: "VERSION='"
-## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
-## time-stamp-time-zone: "UTC"
-## time-stamp-end: "'; # UTC"
-## End:
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/nounwind.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/nounwind.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/nounwind.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/nounwind.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/* backtrace.c -- Entry point for stack backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <sys/types.h>
-
-#include "backtrace.h"
-
-#include "internal.h"
-
-/* This source file is compiled if the unwind library is not
-   available.  */
-
-int
-backtrace_full (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		int skip ATTRIBUTE_UNUSED,
-		backtrace_full_callback callback ATTRIBUTE_UNUSED,
-		backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data,
-		  "no stack trace because unwind library not available",
-		  0);
-  return 0;
-}
-
-int
-backtrace_simple (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		  int skip ATTRIBUTE_UNUSED,
-		  backtrace_simple_callback callback ATTRIBUTE_UNUSED,
-		  backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data,
-		  "no stack trace because unwind library not available",
-		  0);
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/pecoff.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/pecoff.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/pecoff.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/pecoff.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,943 +0,0 @@
-/* pecoff.c -- Get debug data from a PE/COFFF file for backtraces.
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
-   Adapted from elf.c by Tristan Gingold, AdaCore.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* Coff file header.  */
-
-typedef struct {
-  uint16_t machine;
-  uint16_t number_of_sections;
-  uint32_t time_date_stamp;
-  uint32_t pointer_to_symbol_table;
-  uint32_t number_of_symbols;
-  uint16_t size_of_optional_header;
-  uint16_t characteristics;
-} b_coff_file_header;
-
-/* Coff optional header.  */
-
-typedef struct {
-  uint16_t magic;
-  uint8_t  major_linker_version;
-  uint8_t  minor_linker_version;
-  uint32_t size_of_code;
-  uint32_t size_of_initialized_data;
-  uint32_t size_of_uninitialized_data;
-  uint32_t address_of_entry_point;
-  uint32_t base_of_code;
-  union {
-    struct {
-      uint32_t base_of_data;
-      uint32_t image_base;
-    } pe;
-    struct {
-      uint64_t image_base;
-    } pep;
-  } u;
-} b_coff_optional_header;
-
-/* Values of magic in optional header.  */
-
-#define PE_MAGIC 0x10b		/* PE32 executable.  */
-#define PEP_MAGIC 0x20b		/* PE32+ executable (for 64bit targets).  */
-
-/* Coff section header.  */
-
-typedef struct {
-  char name[8];
-  uint32_t virtual_size;
-  uint32_t virtual_address;
-  uint32_t size_of_raw_data;
-  uint32_t pointer_to_raw_data;
-  uint32_t pointer_to_relocations;
-  uint32_t pointer_to_line_numbers;
-  uint16_t number_of_relocations;
-  uint16_t number_of_line_numbers;
-  uint32_t characteristics;
-} b_coff_section_header;
-
-/* Coff symbol name.  */
-
-typedef union {
-  char short_name[8];
-  struct {
-    unsigned char zeroes[4];
-    unsigned char off[4];
-  } long_name;
-} b_coff_name;
-
-/* Coff symbol (external representation which is unaligned).  */
-
-typedef struct {
-  b_coff_name name;
-  unsigned char value[4];
-  unsigned char section_number[2];
-  unsigned char type[2];
-  unsigned char storage_class;
-  unsigned char number_of_aux_symbols;
-} b_coff_external_symbol;
-
-/* Symbol types.  */
-
-#define N_TBSHFT 4			/* Shift for the derived type.  */
-#define IMAGE_SYM_DTYPE_FUNCTION 2	/* Function derived type.  */
-
-/* Size of a coff symbol.  */
-
-#define SYM_SZ 18
-
-/* Coff symbol, internal representation (aligned).  */
-
-typedef struct {
-  const char *name;
-  uint32_t value;
-  int16_t sec;
-  uint16_t type;
-  uint16_t sc;
-} b_coff_internal_symbol;
-
-/* An index of sections we care about.  */
-
-enum debug_section
-{
-  DEBUG_INFO,
-  DEBUG_LINE,
-  DEBUG_ABBREV,
-  DEBUG_RANGES,
-  DEBUG_STR,
-  DEBUG_MAX
-};
-
-/* Names of sections, indexed by enum debug_section.  */
-
-static const char * const debug_section_names[DEBUG_MAX] =
-{
-  ".debug_info",
-  ".debug_line",
-  ".debug_abbrev",
-  ".debug_ranges",
-  ".debug_str"
-};
-
-/* Information we gather for the sections we care about.  */
-
-struct debug_section_info
-{
-  /* Section file offset.  */
-  off_t offset;
-  /* Section size.  */
-  size_t size;
-  /* Section contents, after read from file.  */
-  const unsigned char *data;
-};
-
-/* Information we keep for an coff symbol.  */
-
-struct coff_symbol
-{
-  /* The name of the symbol.  */
-  const char *name;
-  /* The address of the symbol.  */
-  uintptr_t address;
-};
-
-/* Information to pass to coff_syminfo.  */
-
-struct coff_syminfo_data
-{
-  /* Symbols for the next module.  */
-  struct coff_syminfo_data *next;
-  /* The COFF symbols, sorted by address.  */
-  struct coff_symbol *symbols;
-  /* The number of symbols.  */
-  size_t count;
-};
-
-/* A dummy callback function used when we can't find any debug info.  */
-
-static int
-coff_nodebug (struct backtrace_state *state ATTRIBUTE_UNUSED,
-	      uintptr_t pc ATTRIBUTE_UNUSED,
-	      backtrace_full_callback callback ATTRIBUTE_UNUSED,
-	      backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no debug info in PE/COFF executable", -1);
-  return 0;
-}
-
-/* A dummy callback function used when we can't find a symbol
-   table.  */
-
-static void
-coff_nosyms (struct backtrace_state *state ATTRIBUTE_UNUSED,
-	     uintptr_t addr ATTRIBUTE_UNUSED,
-	     backtrace_syminfo_callback callback ATTRIBUTE_UNUSED,
-	     backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no symbol table in PE/COFF executable", -1);
-}
-
-/* Read a potentially unaligned 4 byte word at P, using native endianness.  */
-
-static uint32_t
-coff_read4 (const unsigned char *p)
-{
-  uint32_t res;
-
-  memcpy (&res, p, 4);
-  return res;
-}
-
-/* Read a potentially unaligned 2 byte word at P, using native endianness.
-   All 2 byte word in symbols are always aligned, but for coherency all
-   fields are declared as char arrays.  */
-
-static uint16_t
-coff_read2 (const unsigned char *p)
-{
-  uint16_t res;
-
-  memcpy (&res, p, sizeof (res));
-  return res;
-}
-
-/* Return the length (without the trailing 0) of a COFF short name.  */
-
-static size_t
-coff_short_name_len (const char *name)
-{
-  int i;
-
-  for (i = 0; i < 8; i++)
-    if (name[i] == 0)
-      return i;
-  return 8;
-}
-
-/* Return true iff COFF short name CNAME is the same as NAME (a NUL-terminated
-   string).  */
-
-static int
-coff_short_name_eq (const char *name, const char *cname)
-{
-  int i;
-
-  for (i = 0; i < 8; i++)
-    {
-      if (name[i] != cname[i])
-	return 0;
-      if (name[i] == 0)
-	return 1;
-    }
-  return name[8] == 0;
-}
-
-/* Return true iff NAME is the same as string at offset OFF.  */
-
-static int
-coff_long_name_eq (const char *name, unsigned int off,
-		   struct backtrace_view *str_view)
-{
-  if (off >= str_view->len)
-    return 0;
-  return strcmp (name, (const char *)str_view->data + off) == 0;
-}
-
-/* Compare struct coff_symbol for qsort.  */
-
-static int
-coff_symbol_compare (const void *v1, const void *v2)
-{
-  const struct coff_symbol *e1 = (const struct coff_symbol *) v1;
-  const struct coff_symbol *e2 = (const struct coff_symbol *) v2;
-
-  if (e1->address < e2->address)
-    return -1;
-  else if (e1->address > e2->address)
-    return 1;
-  else
-    return 0;
-}
-
-/* Convert SYM to internal (and aligned) format ISYM, using string table
-   from STRTAB and STRTAB_SIZE, and number of sections SECTS_NUM.
-   Return -1 in case of error (invalid section number or string index).  */
-
-static int
-coff_expand_symbol (b_coff_internal_symbol *isym,
-		    const b_coff_external_symbol *sym,
-		    uint16_t sects_num,
-		    const unsigned char *strtab, size_t strtab_size)
-{
-  isym->type = coff_read2 (sym->type);
-  isym->sec = coff_read2 (sym->section_number);
-  isym->sc = sym->storage_class;
-
-  if (isym->sec > 0 && (uint16_t) isym->sec > sects_num)
-    return -1;
-  if (sym->name.short_name[0] != 0)
-    isym->name = sym->name.short_name;
-  else
-    {
-      uint32_t off = coff_read4 (sym->name.long_name.off);
-
-      if (off >= strtab_size)
-	return -1;
-      isym->name = (const char *) strtab + off;
-    }
-  return 0;
-}
-
-/* Return true iff SYM is a defined symbol for a function.  Data symbols
-   aren't considered because they aren't easily identified (same type as
-   section names, presence of symbols defined by the linker script).  */
-
-static int
-coff_is_function_symbol (const b_coff_internal_symbol *isym)
-{
-  return (isym->type >> N_TBSHFT) == IMAGE_SYM_DTYPE_FUNCTION
-    && isym->sec > 0;
-}
-
-/* Initialize the symbol table info for coff_syminfo.  */
-
-static int
-coff_initialize_syminfo (struct backtrace_state *state,
-			 uintptr_t base_address,
-			 const b_coff_section_header *sects, size_t sects_num,
-			 const b_coff_external_symbol *syms, size_t syms_size,
-			 const unsigned char *strtab, size_t strtab_size,
-			 backtrace_error_callback error_callback,
-			 void *data, struct coff_syminfo_data *sdata)
-{
-  size_t syms_count;
-  char *coff_symstr;
-  size_t coff_symstr_len;
-  size_t coff_symbol_count;
-  size_t coff_symbol_size;
-  struct coff_symbol *coff_symbols;
-  struct coff_symbol *coff_sym;
-  char *coff_str;
-  size_t i;
-
-  syms_count = syms_size / SYM_SZ;
-
-  /* We only care about function symbols.  Count them.  Also count size of
-     strings for in-symbol names.  */
-  coff_symbol_count = 0;
-  coff_symstr_len = 0;
-  for (i = 0; i < syms_count; ++i)
-    {
-      const b_coff_external_symbol *asym = &syms[i];
-      b_coff_internal_symbol isym;
-
-      if (coff_expand_symbol (&isym, asym, sects_num, strtab, strtab_size) < 0)
-	{
-	  error_callback (data, "invalid section or offset in coff symbol", 0);
-	  return 0;
-	}
-      if (coff_is_function_symbol (&isym))
-	{
-	  ++coff_symbol_count;
-	  if (asym->name.short_name[0] != 0)
-	    coff_symstr_len += coff_short_name_len (asym->name.short_name) + 1;
-	}
-
-      i += asym->number_of_aux_symbols;
-    }
-
-  coff_symbol_size = (coff_symbol_count + 1) * sizeof (struct coff_symbol);
-  coff_symbols = ((struct coff_symbol *)
-		  backtrace_alloc (state, coff_symbol_size, error_callback,
-				   data));
-  if (coff_symbols == NULL)
-    return 0;
-
-  /* Allocate memory for symbols strings.  */
-  if (coff_symstr_len > 0)
-    {
-      coff_symstr = ((char *)
-		     backtrace_alloc (state, coff_symstr_len, error_callback,
-				      data));
-      if (coff_symstr == NULL)
-	{
-	  backtrace_free (state, coff_symbols, coff_symbol_size,
-			  error_callback, data);
-	  return 0;
-	}
-    }
-  else
-    coff_symstr = NULL;
-
-  /* Copy symbols.  */
-  coff_sym = coff_symbols;
-  coff_str = coff_symstr;
-  for (i = 0; i < syms_count; ++i)
-    {
-      const b_coff_external_symbol *asym = &syms[i];
-      b_coff_internal_symbol isym;
-
-      if (coff_expand_symbol (&isym, asym, sects_num, strtab, strtab_size))
-	{
-	  /* Should not fail, as it was already tested in the previous
-	     loop.  */
-	  abort ();
-	}
-      if (coff_is_function_symbol (&isym))
-	{
-	  const char *name;
-	  int16_t secnum;
-
-	  if (asym->name.short_name[0] != 0)
-	    {
-	      size_t len = coff_short_name_len (isym.name);
-	      name = coff_str;
-	      memcpy (coff_str, isym.name, len);
-	      coff_str[len] = 0;
-	      coff_str += len + 1;
-	    }
-	  else
-	    name = isym.name;
-
-	  /* Strip leading '_'.  */
-	  if (name[0] == '_')
-	    name++;
-
-	  /* Symbol value is section relative, so we need to read the address
-	     of its section.  */
-	  secnum = coff_read2 (asym->section_number);
-
-	  coff_sym->name = name;
-	  coff_sym->address = (coff_read4 (asym->value)
-			       + sects[secnum - 1].virtual_address
-			       + base_address);
-	  coff_sym++;
-	}
-
-      i += asym->number_of_aux_symbols;
-    }
-
-  /* End of symbols marker.  */
-  coff_sym->name = NULL;
-  coff_sym->address = -1;
-
-  backtrace_qsort (coff_symbols, coff_symbol_count,
-		   sizeof (struct coff_symbol), coff_symbol_compare);
-
-  sdata->next = NULL;
-  sdata->symbols = coff_symbols;
-  sdata->count = coff_symbol_count;
-
-  return 1;
-}
-
-/* Add EDATA to the list in STATE.  */
-
-static void
-coff_add_syminfo_data (struct backtrace_state *state,
-		       struct coff_syminfo_data *sdata)
-{
-  if (!state->threaded)
-    {
-      struct coff_syminfo_data **pp;
-
-      for (pp = (struct coff_syminfo_data **) (void *) &state->syminfo_data;
-	   *pp != NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = sdata;
-    }
-  else
-    {
-      while (1)
-	{
-	  struct coff_syminfo_data **pp;
-
-	  pp = (struct coff_syminfo_data **) (void *) &state->syminfo_data;
-
-	  while (1)
-	    {
-	      struct coff_syminfo_data *p;
-
-	      p = backtrace_atomic_load_pointer (pp);
-
-	      if (p == NULL)
-		break;
-
-	      pp = &p->next;
-	    }
-
-	  if (__sync_bool_compare_and_swap (pp, NULL, sdata))
-	    break;
-	}
-    }
-}
-
-/* Compare an ADDR against an elf_symbol for bsearch.  We allocate one
-   extra entry in the array so that this can look safely at the next
-   entry.  */
-
-static int
-coff_symbol_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct coff_symbol *entry = (const struct coff_symbol *) ventry;
-  uintptr_t addr;
-
-  addr = *key;
-  if (addr < entry->address)
-    return -1;
-  else if (addr >= entry[1].address)
-    return 1;
-  else
-    return 0;
-}
-
-/* Return the symbol name and value for an ADDR.  */
-
-static void
-coff_syminfo (struct backtrace_state *state, uintptr_t addr,
-	      backtrace_syminfo_callback callback,
-	      backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-	      void *data)
-{
-  struct coff_syminfo_data *sdata;
-  struct coff_symbol *sym = NULL;
-
-  if (!state->threaded)
-    {
-      for (sdata = (struct coff_syminfo_data *) state->syminfo_data;
-	   sdata != NULL;
-	   sdata = sdata->next)
-	{
-	  sym = ((struct coff_symbol *)
-		 bsearch (&addr, sdata->symbols, sdata->count,
-			  sizeof (struct coff_symbol), coff_symbol_search));
-	  if (sym != NULL)
-	    break;
-	}
-    }
-  else
-    {
-      struct coff_syminfo_data **pp;
-
-      pp = (struct coff_syminfo_data **) (void *) &state->syminfo_data;
-      while (1)
-	{
-	  sdata = backtrace_atomic_load_pointer (pp);
-	  if (sdata == NULL)
-	    break;
-
-	  sym = ((struct coff_symbol *)
-		 bsearch (&addr, sdata->symbols, sdata->count,
-			  sizeof (struct coff_symbol), coff_symbol_search));
-	  if (sym != NULL)
-	    break;
-
-	  pp = &sdata->next;
-	}
-    }
-
-  if (sym == NULL)
-    callback (data, addr, NULL, 0, 0);
-  else
-    callback (data, addr, sym->name, sym->address, 0);
-}
-
-/* Add the backtrace data for one PE/COFF file.  Returns 1 on success,
-   0 on failure (in both cases descriptor is closed).  */
-
-static int
-coff_add (struct backtrace_state *state, int descriptor,
-	  backtrace_error_callback error_callback, void *data,
-	  fileline *fileline_fn, int *found_sym, int *found_dwarf)
-{
-  struct backtrace_view fhdr_view;
-  off_t fhdr_off;
-  int magic_ok;
-  b_coff_file_header fhdr;
-  off_t opt_sects_off;
-  size_t opt_sects_size;
-  unsigned int sects_num;
-  struct backtrace_view sects_view;
-  int sects_view_valid;
-  const b_coff_optional_header *opt_hdr;
-  const b_coff_section_header *sects;
-  struct backtrace_view str_view;
-  int str_view_valid;
-  uint32_t str_size;
-  off_t str_off;
-  // NOTE: upstream doesn't have `{0}`, this is a fix for Rust issue #39468.
-  //       If syms_view is not initialized, then `free(syms_view.base)` may segfault later.
-  struct backtrace_view syms_view = {0};
-  off_t syms_off;
-  size_t syms_size;
-  int syms_view_valid;
-  unsigned int syms_num;
-  unsigned int i;
-  struct debug_section_info sections[DEBUG_MAX];
-  off_t min_offset;
-  off_t max_offset;
-  struct backtrace_view debug_view;
-  int debug_view_valid;
-  uintptr_t image_base;
-
-  *found_sym = 0;
-  *found_dwarf = 0;
-
-  sects_view_valid = 0;
-  syms_view_valid = 0;
-  str_view_valid = 0;
-  debug_view_valid = 0;
-
-  /* Map the MS-DOS stub (if any) and extract file header offset.  */
-  if (!backtrace_get_view (state, descriptor, 0, 0x40, error_callback,
-			   data, &fhdr_view))
-    goto fail;
-
-  {
-    const unsigned char *vptr = fhdr_view.data;
-
-    if (vptr[0] == 'M' && vptr[1] == 'Z')
-      fhdr_off = coff_read4 (vptr + 0x3c);
-    else
-      fhdr_off = 0;
-  }
-
-  backtrace_release_view (state, &fhdr_view, error_callback, data);
-
-  /* Map the coff file header.  */
-  if (!backtrace_get_view (state, descriptor, fhdr_off,
-			   sizeof (b_coff_file_header) + 4,
-			   error_callback, data, &fhdr_view))
-    goto fail;
-
-  if (fhdr_off != 0)
-    {
-      const char *magic = (const char *) fhdr_view.data;
-      magic_ok = memcmp (magic, "PE\0", 4) == 0;
-      fhdr_off += 4;
-
-      memcpy (&fhdr, fhdr_view.data + 4, sizeof fhdr);
-    }
-  else
-    {
-      memcpy (&fhdr, fhdr_view.data, sizeof fhdr);
-      /* TODO: test fhdr.machine for coff but non-PE platforms.  */
-      magic_ok = 0;
-    }
-  backtrace_release_view (state, &fhdr_view, error_callback, data);
-
-  if (!magic_ok)
-    {
-      error_callback (data, "executable file is not COFF", 0);
-      goto fail;
-    }
-
-  sects_num = fhdr.number_of_sections;
-  syms_num = fhdr.number_of_symbols;
-
-  opt_sects_off = fhdr_off + sizeof (fhdr);
-  opt_sects_size = (fhdr.size_of_optional_header
-		    + sects_num * sizeof (b_coff_section_header));
-
-  /* To translate PC to file/line when using DWARF, we need to find
-     the .debug_info and .debug_line sections.  */
-
-  /* Read the optional header and the section headers.  */
-
-  if (!backtrace_get_view (state, descriptor, opt_sects_off, opt_sects_size,
-			   error_callback, data, &sects_view))
-    goto fail;
-  sects_view_valid = 1;
-  opt_hdr = (const b_coff_optional_header *) sects_view.data;
-  sects = (const b_coff_section_header *)
-    (sects_view.data + fhdr.size_of_optional_header);
-
-  if (fhdr.size_of_optional_header > sizeof (*opt_hdr))
-    {
-      if (opt_hdr->magic == PE_MAGIC)
-	image_base = opt_hdr->u.pe.image_base;
-      else if (opt_hdr->magic == PEP_MAGIC)
-	image_base = opt_hdr->u.pep.image_base;
-      else
-	{
-	  error_callback (data, "bad magic in PE optional header", 0);
-	  goto fail;
-	}
-    }
-  else
-    image_base = 0;
-
-  /* Read the symbol table and the string table.  */
-
-  if (fhdr.pointer_to_symbol_table == 0)
-    {
-      /* No symbol table, no string table.  */
-      str_off = 0;
-      str_size = 0;
-      syms_num = 0;
-      syms_size = 0;
-    }
-  else
-    {
-      /* Symbol table is followed by the string table.  The string table
-	 starts with its length (on 4 bytes).
-	 Map the symbol table and the length of the string table.  */
-      syms_off = fhdr.pointer_to_symbol_table;
-      syms_size = syms_num * SYM_SZ;
-
-      if (!backtrace_get_view (state, descriptor, syms_off, syms_size + 4,
-			       error_callback, data, &syms_view))
-	goto fail;
-      syms_view_valid = 1;
-
-      str_size = coff_read4 (syms_view.data + syms_size);
-
-      str_off = syms_off + syms_size;
-
-      if (str_size > 4)
-	{
-	  /* Map string table (including the length word).  */
-
-	  if (!backtrace_get_view (state, descriptor, str_off, str_size,
-				   error_callback, data, &str_view))
-	    goto fail;
-	  str_view_valid = 1;
-	}
-    }
-
-  memset (sections, 0, sizeof sections);
-
-  /* Look for the symbol table.  */
-  for (i = 0; i < sects_num; ++i)
-    {
-      const b_coff_section_header *s = sects + i;
-      unsigned int str_off;
-      int j;
-
-      if (s->name[0] == '/')
-	{
-	  /* Extended section name.  */
-	  str_off = atoi (s->name + 1);
-	}
-      else
-	str_off = 0;
-
-      for (j = 0; j < (int) DEBUG_MAX; ++j)
-	{
-	  const char *dbg_name = debug_section_names[j];
-	  int match;
-
-	  if (str_off != 0)
-	    match = coff_long_name_eq (dbg_name, str_off, &str_view);
-	  else
-	    match = coff_short_name_eq (dbg_name, s->name);
-	  if (match)
-	    {
-	      sections[j].offset = s->pointer_to_raw_data;
-	      sections[j].size = s->virtual_size <= s->size_of_raw_data ?
-		s->virtual_size : s->size_of_raw_data;
-	      break;
-	    }
-	}
-    }
-
-  if (syms_num != 0)
-    {
-      struct coff_syminfo_data *sdata;
-
-      sdata = ((struct coff_syminfo_data *)
-	       backtrace_alloc (state, sizeof *sdata, error_callback, data));
-      if (sdata == NULL)
-	goto fail;
-
-      if (!coff_initialize_syminfo (state, image_base,
-				    sects, sects_num,
-				    syms_view.data, syms_size,
-				    str_view.data, str_size,
-				    error_callback, data, sdata))
-	{
-	  backtrace_free (state, sdata, sizeof *sdata, error_callback, data);
-	  goto fail;
-	}
-
-      *found_sym = 1;
-
-      coff_add_syminfo_data (state, sdata);
-    }
-
-  backtrace_release_view (state, &sects_view, error_callback, data);
-  sects_view_valid = 0;
-  if (syms_view_valid)
-    {
-      backtrace_release_view (state, &syms_view, error_callback, data);
-      syms_view_valid = 0;
-    }
-
-  /* Read all the debug sections in a single view, since they are
-     probably adjacent in the file.  We never release this view.  */
-
-  min_offset = 0;
-  max_offset = 0;
-  for (i = 0; i < (int) DEBUG_MAX; ++i)
-    {
-      off_t end;
-
-      if (sections[i].size == 0)
-	continue;
-      if (min_offset == 0 || sections[i].offset < min_offset)
-	min_offset = sections[i].offset;
-      end = sections[i].offset + sections[i].size;
-      if (end > max_offset)
-	max_offset = end;
-    }
-  if (min_offset == 0 || max_offset == 0)
-    {
-      if (!backtrace_close (descriptor, error_callback, data))
-	goto fail;
-      *fileline_fn = coff_nodebug;
-      return 1;
-    }
-
-  if (!backtrace_get_view (state, descriptor, min_offset,
-			   max_offset - min_offset,
-			   error_callback, data, &debug_view))
-    goto fail;
-  debug_view_valid = 1;
-
-  /* We've read all we need from the executable.  */
-  if (!backtrace_close (descriptor, error_callback, data))
-    goto fail;
-  descriptor = -1;
-
-  for (i = 0; i < (int) DEBUG_MAX; ++i)
-    {
-      if (sections[i].size == 0)
-	sections[i].data = NULL;
-      else
-	sections[i].data = ((const unsigned char *) debug_view.data
-			    + (sections[i].offset - min_offset));
-    }
-
-  if (!backtrace_dwarf_add (state, /* base_address */ 0,
-			    sections[DEBUG_INFO].data,
-			    sections[DEBUG_INFO].size,
-			    sections[DEBUG_LINE].data,
-			    sections[DEBUG_LINE].size,
-			    sections[DEBUG_ABBREV].data,
-			    sections[DEBUG_ABBREV].size,
-			    sections[DEBUG_RANGES].data,
-			    sections[DEBUG_RANGES].size,
-			    sections[DEBUG_STR].data,
-			    sections[DEBUG_STR].size,
-			    0, /* FIXME */
-			    error_callback, data, fileline_fn))
-    goto fail;
-
-  *found_dwarf = 1;
-
-  return 1;
-
- fail:
-  if (sects_view_valid)
-    backtrace_release_view (state, &sects_view, error_callback, data);
-  if (str_view_valid)
-    backtrace_release_view (state, &str_view, error_callback, data);
-  if (syms_view_valid)
-    backtrace_release_view (state, &syms_view, error_callback, data);
-  if (debug_view_valid)
-    backtrace_release_view (state, &debug_view, error_callback, data);
-  if (descriptor != -1)
-    backtrace_close (descriptor, error_callback, data);
-  return 0;
-}
-
-/* Initialize the backtrace data we need from an ELF executable.  At
-   the ELF level, all we need to do is find the debug info
-   sections.  */
-
-int
-backtrace_initialize (struct backtrace_state *state,
-		      const char *filename ATTRIBUTE_UNUSED, int descriptor,
-		      backtrace_error_callback error_callback,
-		      void *data, fileline *fileline_fn)
-{
-  int ret;
-  int found_sym;
-  int found_dwarf;
-  fileline coff_fileline_fn;
-
-  ret = coff_add (state, descriptor, error_callback, data,
-		  &coff_fileline_fn, &found_sym, &found_dwarf);
-  if (!ret)
-    return 0;
-
-  if (!state->threaded)
-    {
-      if (found_sym)
-	state->syminfo_fn = coff_syminfo;
-      else if (state->syminfo_fn == NULL)
-	state->syminfo_fn = coff_nosyms;
-    }
-  else
-    {
-      if (found_sym)
-	backtrace_atomic_store_pointer (&state->syminfo_fn, coff_syminfo);
-      else
-	__sync_bool_compare_and_swap (&state->syminfo_fn, NULL, coff_nosyms);
-    }
-
-  if (!state->threaded)
-    {
-      if (state->fileline_fn == NULL || state->fileline_fn == coff_nodebug)
-	*fileline_fn = coff_fileline_fn;
-    }
-  else
-    {
-      fileline current_fn;
-
-      current_fn = backtrace_atomic_load_pointer (&state->fileline_fn);
-      if (current_fn == NULL || current_fn == coff_nodebug)
-	*fileline_fn = coff_fileline_fn;
-    }
-
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/posix.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/posix.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/posix.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/posix.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-/* posix.c -- POSIX file I/O routines for the backtrace library.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
-#ifndef FD_CLOEXEC
-#define FD_CLOEXEC 1
-#endif
-
-/* Open a file for reading.  */
-
-int
-backtrace_open (const char *filename, backtrace_error_callback error_callback,
-		void *data, int *does_not_exist)
-{
-  int descriptor;
-
-  if (does_not_exist != NULL)
-    *does_not_exist = 0;
-
-  descriptor = open (filename, (int) (O_RDONLY | O_BINARY | O_CLOEXEC));
-  if (descriptor < 0)
-    {
-      if (does_not_exist != NULL && errno == ENOENT)
-	*does_not_exist = 1;
-      else
-	error_callback (data, filename, errno);
-      return -1;
-    }
-
-#ifdef HAVE_FCNTL
-  /* Set FD_CLOEXEC just in case the kernel does not support
-     O_CLOEXEC. It doesn't matter if this fails for some reason.
-     FIXME: At some point it should be safe to only do this if
-     O_CLOEXEC == 0.  */
-  fcntl (descriptor, F_SETFD, FD_CLOEXEC);
-#endif
-
-  return descriptor;
-}
-
-/* Close DESCRIPTOR.  */
-
-int
-backtrace_close (int descriptor, backtrace_error_callback error_callback,
-		 void *data)
-{
-  if (close (descriptor) < 0)
-    {
-      error_callback (data, "close", errno);
-      return 0;
-    }
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/print.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/print.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/print.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/print.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-/* print.c -- Print the current backtrace.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* Passed to callbacks.  */
-
-struct print_data
-{
-  struct backtrace_state *state;
-  FILE *f;
-};
-
-/* Print one level of a backtrace.  */
-
-static int
-print_callback (void *data, uintptr_t pc, const char *filename, int lineno,
-		const char *function)
-{
-  struct print_data *pdata = (struct print_data *) data;
-
-  fprintf (pdata->f, "0x%lx %s\n\t%s:%d\n",
-	   (unsigned long) pc,
-	   function == NULL ? "???" : function,
-	   filename == NULL ? "???" : filename,
-	   lineno);
-  return 0;
-}
-
-/* Print errors to stderr.  */
-
-static void
-error_callback (void *data, const char *msg, int errnum)
-{
-  struct print_data *pdata = (struct print_data *) data;
-
-  if (pdata->state->filename != NULL)
-    fprintf (stderr, "%s: ", pdata->state->filename);
-  fprintf (stderr, "libbacktrace: %s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fputc ('\n', stderr);
-}
-
-/* Print a backtrace.  */
-
-void
-backtrace_print (struct backtrace_state *state, int skip, FILE *f)
-{
-  struct print_data data;
-
-  data.state = state;
-  data.f = f;
-  backtrace_full (state, skip + 1, print_callback, error_callback,
-		  (void *) &data);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/read.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/read.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/read.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/read.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* read.c -- File views without mmap.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* This file implements file views when mmap is not available.  */
-
-/* Create a view of SIZE bytes from DESCRIPTOR at OFFSET.  */
-
-int
-backtrace_get_view (struct backtrace_state *state, int descriptor,
-		    off_t offset, size_t size,
-		    backtrace_error_callback error_callback,
-		    void *data, struct backtrace_view *view)
-{
-  ssize_t got;
-
-  if (lseek (descriptor, offset, SEEK_SET) < 0)
-    {
-      error_callback (data, "lseek", errno);
-      return 0;
-    }
-
-  view->base = backtrace_alloc (state, size, error_callback, data);
-  if (view->base == NULL)
-    return 0;
-  view->data = view->base;
-  view->len = size;
-
-  got = read (descriptor, view->base, size);
-  if (got < 0)
-    {
-      error_callback (data, "read", errno);
-      free (view->base);
-      return 0;
-    }
-
-  if ((size_t) got < size)
-    {
-      error_callback (data, "file too short", 0);
-      free (view->base);
-      return 0;
-    }
-
-  return 1;
-}
-
-/* Release a view read by backtrace_get_view.  */
-
-void
-backtrace_release_view (struct backtrace_state *state,
-			struct backtrace_view *view,
-			backtrace_error_callback error_callback,
-			void *data)
-{
-  backtrace_free (state, view->base, view->len, error_callback, data);
-  view->data = NULL;
-  view->base = NULL;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/README.md cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/README.md
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# libbacktrace
-A C library that may be linked into a C/C++ program to produce symbolic backtraces
-
-Initially written by Ian Lance Taylor <iant@golang.org>.
-
-This is version 1.0.
-It is likely that this will always be version 1.0.
-
-The libbacktrace library may be linked into a program or library and
-used to produce symbolic backtraces.
-Sample uses would be to print a detailed backtrace when an error
-occurs or to gather detailed profiling information.
-
-The libbacktrace library is provided under a BSD license.
-See the source files for the exact license text.
-
-The public functions are declared and documented in the header file
-backtrace.h, which should be #include'd by a user of the library.
-
-Building libbacktrace will generate a file backtrace-supported.h,
-which a user of the library may use to determine whether backtraces
-will work.
-See the source file backtrace-supported.h.in for the macros that it
-defines.
-
-As of January 2018, libbacktrace only supports ELF, PE/COFF, and XCOFF
-executables with DWARF debugging information.
-The library is written to make it straightforward to add support for
-other object file and debugging formats.
-
-The library relies on the C++ unwind API defined at
-https://itanium-cxx-abi.github.io/cxx-abi/abi-eh.html
-This API is provided by GCC.
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/simple.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/simple.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/simple.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/simple.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* simple.c -- The backtrace_simple function.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include "unwind.h"
-#include "backtrace.h"
-
-/* The simple_backtrace routine.  */
-
-/* Data passed through _Unwind_Backtrace.  */
-
-struct backtrace_simple_data
-{
-  /* Number of frames to skip.  */
-  int skip;
-  /* Library state.  */
-  struct backtrace_state *state;
-  /* Callback routine.  */
-  backtrace_simple_callback callback;
-  /* Error callback routine.  */
-  backtrace_error_callback error_callback;
-  /* Data to pass to callback routine.  */
-  void *data;
-  /* Value to return from backtrace.  */
-  int ret;
-};
-
-/* Unwind library callback routine.  This is passd to
-   _Unwind_Backtrace.  */
-
-static _Unwind_Reason_Code
-simple_unwind (struct _Unwind_Context *context, void *vdata)
-{
-  struct backtrace_simple_data *bdata = (struct backtrace_simple_data *) vdata;
-  uintptr_t pc;
-  int ip_before_insn = 0;
-
-#ifdef HAVE_GETIPINFO
-  pc = _Unwind_GetIPInfo (context, &ip_before_insn);
-#else
-  pc = _Unwind_GetIP (context);
-#endif
-
-  if (bdata->skip > 0)
-    {
-      --bdata->skip;
-      return _URC_NO_REASON;
-    }
-
-  if (!ip_before_insn)
-    --pc;
-
-  bdata->ret = bdata->callback (bdata->data, pc);
-
-  if (bdata->ret != 0)
-    return _URC_END_OF_STACK;
-
-  return _URC_NO_REASON;
-}
-
-/* Get a simple stack backtrace.  */
-
-int
-backtrace_simple (struct backtrace_state *state, int skip,
-		  backtrace_simple_callback callback,
-		  backtrace_error_callback error_callback, void *data)
-{
-  struct backtrace_simple_data bdata;
-
-  bdata.skip = skip + 1;
-  bdata.state = state;
-  bdata.callback = callback;
-  bdata.error_callback = error_callback;
-  bdata.data = data;
-  bdata.ret = 0;
-  _Unwind_Backtrace (simple_unwind, &bdata);
-  return bdata.ret;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/sort.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/sort.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/sort.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/sort.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/* sort.c -- Sort without allocating memory
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <stddef.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* The GNU glibc version of qsort allocates memory, which we must not
-   do if we are invoked by a signal handler.  So provide our own
-   sort.  */
-
-static void
-swap (char *a, char *b, size_t size)
-{
-  size_t i;
-
-  for (i = 0; i < size; i++, a++, b++)
-    {
-      char t;
-
-      t = *a;
-      *a = *b;
-      *b = t;
-    }
-}
-
-void
-backtrace_qsort (void *basearg, size_t count, size_t size,
-		 int (*compar) (const void *, const void *))
-{
-  char *base = (char *) basearg;
-  size_t i;
-  size_t mid;
-
- tail_recurse:
-  if (count < 2)
-    return;
-
-  /* The symbol table and DWARF tables, which is all we use this
-     routine for, tend to be roughly sorted.  Pick the middle element
-     in the array as our pivot point, so that we are more likely to
-     cut the array in half for each recursion step.  */
-  swap (base, base + (count / 2) * size, size);
-
-  mid = 0;
-  for (i = 1; i < count; i++)
-    {
-      if ((*compar) (base, base + i * size) > 0)
-	{
-	  ++mid;
-	  if (i != mid)
-	    swap (base + mid * size, base + i * size, size);
-	}
-    }
-
-  if (mid > 0)
-    swap (base, base + mid * size, size);
-
-  /* Recurse with the smaller array, loop with the larger one.  That
-     ensures that our maximum stack depth is log count.  */
-  if (2 * mid < count)
-    {
-      backtrace_qsort (base, mid, size, compar);
-      base += (mid + 1) * size;
-      count -= mid + 1;
-      goto tail_recurse;
-    }
-  else
-    {
-      backtrace_qsort (base + (mid + 1) * size, count - (mid + 1),
-		       size, compar);
-      count = mid;
-      goto tail_recurse;
-    }
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/state.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/state.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/state.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/state.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/* state.c -- Create the backtrace state.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <string.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "backtrace-supported.h"
-#include "internal.h"
-
-/* Create the backtrace state.  This will then be passed to all the
-   other routines.  */
-
-struct backtrace_state *
-backtrace_create_state (const char *filename, int threaded,
-			backtrace_error_callback error_callback,
-			void *data)
-{
-  struct backtrace_state init_state;
-  struct backtrace_state *state;
-
-#ifndef HAVE_SYNC_FUNCTIONS
-  if (threaded)
-    {
-      error_callback (data, "backtrace library does not support threads", 0);
-      return NULL;
-    }
-#endif
-
-  memset (&init_state, 0, sizeof init_state);
-  init_state.filename = filename;
-  init_state.threaded = threaded;
-
-  state = ((struct backtrace_state *)
-	   backtrace_alloc (&init_state, sizeof *state, error_callback, data));
-  if (state == NULL)
-    return NULL;
-  *state = init_state;
-
-  return state;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/stest.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/stest.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/stest.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/stest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-/* stest.c -- Test for libbacktrace internal sort function
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* Test the local qsort implementation.  */
-
-#define MAX 10
-
-struct test
-{
-  size_t count;
-  int input[MAX];
-  int output[MAX];
-};
-
-static struct test tests[] =
-  {
-    {
-      10,
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }
-    },
-    {
-      9,
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9 },
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9 }
-    },
-    {
-      10,
-      { 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 },
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
-    },
-    {
-      9,
-      { 9, 8, 7, 6, 5, 4, 3, 2, 1 },
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9 },
-    },
-    {
-      10,
-      { 2, 4, 6, 8, 10, 1, 3, 5, 7, 9 },
-      { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
-    },
-    {
-      5,
-      { 4, 5, 3, 1, 2 },
-      { 1, 2, 3, 4, 5 },
-    },
-    {
-      5,
-      { 1, 1, 1, 1, 1 },
-      { 1, 1, 1, 1, 1 },
-    },
-    {
-      5,
-      { 1, 1, 2, 1, 1 },
-      { 1, 1, 1, 1, 2 },
-    },
-    {
-      5,
-      { 2, 1, 1, 1, 1 },
-      { 1, 1, 1, 1, 2 },
-    },
-  };
-
-static int
-compare (const void *a, const void *b)
-{
-  const int *ai = (const int *) a;
-  const int *bi = (const int *) b;
-
-  return *ai - *bi;
-}
-
-int
-main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
-{
-  int failures;
-  size_t i;
-  int a[MAX];
-
-  failures = 0;
-  for (i = 0; i < sizeof tests / sizeof tests[0]; i++)
-    {
-      memcpy (a, tests[i].input, tests[i].count * sizeof (int));
-      backtrace_qsort (a, tests[i].count, sizeof (int), compare);
-      if (memcmp (a, tests[i].output, tests[i].count * sizeof (int)) != 0)
-	{
-	  size_t j;
-
-	  fprintf (stderr, "test %d failed:", (int) i);
-	  for (j = 0; j < tests[i].count; j++)
-	    fprintf (stderr, " %d", a[j]);
-	  fprintf (stderr, "\n");
-	  ++failures;
-	}
-    }
-
-  exit (failures > 0 ? EXIT_FAILURE : EXIT_SUCCESS);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/testlib.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/testlib.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/testlib.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/testlib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-/* testlib.c -- test functions for libbacktrace library
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "filenames.h"
-
-#include "backtrace.h"
-
-#include "testlib.h"
-
-/* The backtrace state.  */
-
-void *state;
-
-/* The number of failures.  */
-
-int failures;
-
-/* Return the base name in a path.  */
-
-const char *
-base (const char *p)
-{
-  const char *last;
-  const char *s;
-
-  last = NULL;
-  for (s = p; *s != '\0'; ++s)
-    {
-      if (IS_DIR_SEPARATOR (*s))
-	last = s + 1;
-    }
-  return last != NULL ? last : p;
-}
-
-/* Check an entry in a struct info array.  */
-
-void
-check (const char *name, int index, const struct info *all, int want_lineno,
-       const char *want_function, const char *want_file, int *failed)
-{
-  if (*failed)
-    return;
-  if (all[index].filename == NULL || all[index].function == NULL)
-    {
-      fprintf (stderr, "%s: [%d]: missing file name or function name\n",
-	       name, index);
-      *failed = 1;
-      return;
-    }
-  if (strcmp (base (all[index].filename), want_file) != 0)
-    {
-      fprintf (stderr, "%s: [%d]: got %s expected %s\n", name, index,
-	       all[index].filename, want_file);
-      *failed = 1;
-    }
-  if (all[index].lineno != want_lineno)
-    {
-      fprintf (stderr, "%s: [%d]: got %d expected %d\n", name, index,
-	       all[index].lineno, want_lineno);
-      *failed = 1;
-    }
-  if (strcmp (all[index].function, want_function) != 0)
-    {
-      fprintf (stderr, "%s: [%d]: got %s expected %s\n", name, index,
-	       all[index].function, want_function);
-      *failed = 1;
-    }
-}
-
-/* The backtrace callback function.  */
-
-int
-callback_one (void *vdata, uintptr_t pc ATTRIBUTE_UNUSED,
-	      const char *filename, int lineno, const char *function)
-{
-  struct bdata *data = (struct bdata *) vdata;
-  struct info *p;
-
-  if (data->index >= data->max)
-    {
-      fprintf (stderr, "callback_one: callback called too many times\n");
-      data->failed = 1;
-      return 1;
-    }
-
-  p = &data->all[data->index];
-  if (filename == NULL)
-    p->filename = NULL;
-  else
-    {
-      p->filename = strdup (filename);
-      assert (p->filename != NULL);
-    }
-  p->lineno = lineno;
-  if (function == NULL)
-    p->function = NULL;
-  else
-    {
-      p->function = strdup (function);
-      assert (p->function != NULL);
-    }
-  ++data->index;
-
-  return 0;
-}
-
-/* An error callback passed to backtrace.  */
-
-void
-error_callback_one (void *vdata, const char *msg, int errnum)
-{
-  struct bdata *data = (struct bdata *) vdata;
-
-  fprintf (stderr, "%s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fprintf (stderr, "\n");
-  data->failed = 1;
-}
-
-/* The backtrace_simple callback function.  */
-
-int
-callback_two (void *vdata, uintptr_t pc)
-{
-  struct sdata *data = (struct sdata *) vdata;
-
-  if (data->index >= data->max)
-    {
-      fprintf (stderr, "callback_two: callback called too many times\n");
-      data->failed = 1;
-      return 1;
-    }
-
-  data->addrs[data->index] = pc;
-  ++data->index;
-
-  return 0;
-}
-
-/* An error callback passed to backtrace_simple.  */
-
-void
-error_callback_two (void *vdata, const char *msg, int errnum)
-{
-  struct sdata *data = (struct sdata *) vdata;
-
-  fprintf (stderr, "%s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fprintf (stderr, "\n");
-  data->failed = 1;
-}
-
-/* The backtrace_syminfo callback function.  */
-
-void
-callback_three (void *vdata, uintptr_t pc ATTRIBUTE_UNUSED,
-		const char *symname, uintptr_t symval,
-		uintptr_t symsize)
-{
-  struct symdata *data = (struct symdata *) vdata;
-
-  if (symname == NULL)
-    data->name = NULL;
-  else
-    {
-      data->name = strdup (symname);
-      assert (data->name != NULL);
-    }
-  data->val = symval;
-  data->size = symsize;
-}
-
-/* The backtrace_syminfo error callback function.  */
-
-void
-error_callback_three (void *vdata, const char *msg, int errnum)
-{
-  struct symdata *data = (struct symdata *) vdata;
-
-  fprintf (stderr, "%s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fprintf (stderr, "\n");
-  data->failed = 1;
-}
-
-/* The backtrace_create_state error callback function.  */
-
-void
-error_callback_create (void *data ATTRIBUTE_UNUSED, const char *msg,
-                       int errnum)
-{
-  fprintf (stderr, "%s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fprintf (stderr, "\n");
-  exit (EXIT_FAILURE);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/testlib.h cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/testlib.h
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/testlib.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/testlib.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/* testlib.h -- Header for test functions for libbacktrace library
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifndef LIBBACKTRACE_TESTLIB_H
-#define LIBBACKTRACE_TESTLIB_H
-
-/* Portable attribute syntax.  Actually some of these tests probably
-   won't work if the attributes are not recognized.  */
-
-#ifndef GCC_VERSION
-# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#endif
-
-#if (GCC_VERSION < 2007)
-# define __attribute__(x)
-#endif
-
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif
-
-/* Used to collect backtrace info.  */
-
-struct info
-{
-  char *filename;
-  int lineno;
-  char *function;
-};
-
-/* Passed to backtrace callback function.  */
-
-struct bdata
-{
-  struct info *all;
-  size_t index;
-  size_t max;
-  int failed;
-};
-
-/* Passed to backtrace_simple callback function.  */
-
-struct sdata
-{
-  uintptr_t *addrs;
-  size_t index;
-  size_t max;
-  int failed;
-};
-
-/* Passed to backtrace_syminfo callback function.  */
-
-struct symdata
-{
-  const char *name;
-  uintptr_t val, size;
-  int failed;
-};
-
-/* The backtrace state.  */
-
-extern void *state;
-
-/* The number of failures.  */
-
-extern int failures;
-
-extern const char *base (const char *p);
-extern void check (const char *name, int index, const struct info *all,
-		   int want_lineno, const char *want_function,
-		   const char *want_file, int *failed);
-extern int callback_one (void *, uintptr_t, const char *, int, const char *);
-extern void error_callback_one (void *, const char *, int);
-extern int callback_two (void *, uintptr_t);
-extern void error_callback_two (void *, const char *, int);
-extern void callback_three (void *, uintptr_t, const char *, uintptr_t,
-			    uintptr_t);
-extern void error_callback_three (void *, const char *, int);
-extern void error_callback_create (void *, const char *, int);
-
-#endif /* !defined(LIBBACKTRACE_TESTLIB_H) */
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/ttest.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/ttest.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/ttest.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/ttest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/* ttest.c -- Test for libbacktrace library
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-/* Test using the libbacktrace library from multiple threads.  */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <pthread.h>
-
-#include "filenames.h"
-
-#include "backtrace.h"
-#include "backtrace-supported.h"
-
-#include "testlib.h"
-
-static int f2 (int) __attribute__ ((noinline));
-static int f3 (int, int) __attribute__ ((noinline));
-
-/* Test that a simple backtrace works.  This is called via
-   pthread_create.  It returns the number of failures, as void *.  */
-
-static void *
-test1_thread (void *arg ATTRIBUTE_UNUSED)
-{
-  /* Returning a value here and elsewhere avoids a tailcall which
-     would mess up the backtrace.  */
-  return (void *) (uintptr_t) (f2 (__LINE__) - 2);
-}
-
-static int
-f2 (int f1line)
-{
-  return f3 (f1line, __LINE__) + 2;
-}
-
-static int
-f3 (int f1line, int f2line)
-{
-  struct info all[20];
-  struct bdata data;
-  int f3line;
-  int i;
-
-  data.all = &all[0];
-  data.index = 0;
-  data.max = 20;
-  data.failed = 0;
-
-  f3line = __LINE__ + 1;
-  i = backtrace_full (state, 0, callback_one, error_callback_one, &data);
-
-  if (i != 0)
-    {
-      fprintf (stderr, "test1: unexpected return value %d\n", i);
-      data.failed = 1;
-    }
-
-  if (data.index < 3)
-    {
-      fprintf (stderr,
-	       "test1: not enough frames; got %zu, expected at least 3\n",
-	       data.index);
-      data.failed = 1;
-    }
-
-  check ("test1", 0, all, f3line, "f3", "ttest.c", &data.failed);
-  check ("test1", 1, all, f2line, "f2", "ttest.c", &data.failed);
-  check ("test1", 2, all, f1line, "test1_thread", "ttest.c", &data.failed);
-
-  return data.failed;
-}
-
-/* Run the test with 10 threads simultaneously.  */
-
-#define THREAD_COUNT 10
-
-static void test1 (void) __attribute__ ((unused));
-
-static void
-test1 (void)
-{
-  pthread_t atid[THREAD_COUNT];
-  int i;
-  int errnum;
-  int this_fail;
-  void *ret;
-
-  for (i = 0; i < THREAD_COUNT; i++)
-    {
-      errnum = pthread_create (&atid[i], NULL, test1_thread, NULL);
-      if (errnum != 0)
-	{
-	  fprintf (stderr, "pthread_create %d: %s\n", i, strerror (errnum));
-	  exit (EXIT_FAILURE);
-	}
-    }
-
-  this_fail = 0;
-  for (i = 0; i < THREAD_COUNT; i++)
-    {
-      errnum = pthread_join (atid[i], &ret);
-      if (errnum != 0)
-	{
-	  fprintf (stderr, "pthread_join %d: %s\n", i, strerror (errnum));
-	  exit (EXIT_FAILURE);
-	}
-      this_fail += (int) (uintptr_t) ret;
-    }
-
-  printf ("%s: threaded backtrace_full noinline\n", this_fail > 0 ? "FAIL" : "PASS");
-
-  failures += this_fail;
-}
-
-int
-main (int argc ATTRIBUTE_UNUSED, char **argv)
-{
-  state = backtrace_create_state (argv[0], BACKTRACE_SUPPORTS_THREADS,
-				  error_callback_create, NULL);
-
-#if BACKTRACE_SUPPORTED
-#if BACKTRACE_SUPPORTS_THREADS
-  test1 ();
-#endif
-#endif
-
-  exit (failures ? EXIT_FAILURE : EXIT_SUCCESS);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/unknown.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/unknown.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/unknown.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/unknown.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/* unknown.c -- used when backtrace configury does not know file format.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <sys/types.h>
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* A trivial routine that always fails to find fileline data.  */
-
-static int
-unknown_fileline (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		  uintptr_t pc, backtrace_full_callback callback,
-		  backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-		  void *data)
-
-{
-  return callback (data, pc, NULL, 0, NULL);
-}
-
-/* Initialize the backtrace data when we don't know how to read the
-   debug info.  */
-
-int
-backtrace_initialize (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		      const char *filename ATTRIBUTE_UNUSED,
-		      int descriptor ATTRIBUTE_UNUSED,
-		      backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-		      void *data ATTRIBUTE_UNUSED, fileline *fileline_fn)
-{
-  state->fileline_data = NULL;
-  *fileline_fn = unknown_fileline;
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/xcoff.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/xcoff.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/xcoff.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/xcoff.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1642 +0,0 @@
-/* xcoff.c -- Get debug data from an XCOFF file for backtraces.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
-   Adapted from elf.c.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#ifdef HAVE_LOADQUERY
-#include <sys/ldr.h>
-#endif
-
-#include "backtrace.h"
-#include "internal.h"
-
-/* The configure script must tell us whether we are 32-bit or 64-bit
-   XCOFF.  We could make this code test and support either possibility,
-   but there is no point.  This code only works for the currently
-   running executable, which means that we know the XCOFF mode at
-   configure time.  */
-
-#if BACKTRACE_XCOFF_SIZE != 32 && BACKTRACE_XCOFF_SIZE != 64
-#error "Unknown BACKTRACE_XCOFF_SIZE"
-#endif
-
-/* XCOFF file header.  */
-
-#if BACKTRACE_XCOFF_SIZE == 32
-
-typedef struct {
-  uint16_t f_magic;
-  uint16_t f_nscns;
-  uint32_t f_timdat;
-  uint32_t f_symptr;
-  uint32_t f_nsyms;
-  uint16_t f_opthdr;
-  uint16_t f_flags;
-} b_xcoff_filhdr;
-
-#define XCOFF_MAGIC	0737
-
-#else /* BACKTRACE_XCOFF_SIZE != 32 */
-
-typedef struct {
-  uint16_t f_magic;
-  uint16_t f_nscns;
-  uint32_t f_timdat;
-  uint64_t f_symptr;
-  uint16_t f_opthdr;
-  uint16_t f_flags;
-  uint32_t f_nsyms;
-} b_xcoff_filhdr;
-
-#define XCOFF_MAGIC	0767
-
-#endif /* BACKTRACE_XCOFF_SIZE != 32 */
-
-#define F_SHROBJ	0x2000	/* File is a shared object.  */
-
-/* XCOFF section header.  */
-
-#if BACKTRACE_XCOFF_SIZE == 32
-
-typedef struct {
-  char s_name[8];
-  uint32_t s_paddr;
-  uint32_t s_vaddr;
-  uint32_t s_size;
-  uint32_t s_scnptr;
-  uint32_t s_relptr;
-  uint32_t s_lnnoptr;
-  uint16_t s_nreloc;
-  uint16_t s_nlnno;
-  uint32_t s_flags;
-} b_xcoff_scnhdr;
-
-#define _OVERFLOW_MARKER	65535
-
-#else /* BACKTRACE_XCOFF_SIZE != 32 */
-
-typedef struct {
-  char name[8];
-  uint64_t s_paddr;
-  uint64_t s_vaddr;
-  uint64_t s_size;
-  uint64_t s_scnptr;
-  uint64_t s_relptr;
-  uint64_t s_lnnoptr;
-  uint32_t s_nreloc;
-  uint32_t s_nlnno;
-  uint32_t s_flags;
-} b_xcoff_scnhdr;
-
-#endif /* BACKTRACE_XCOFF_SIZE != 32 */
-
-#define STYP_DWARF	0x10	/* DWARF debugging section.  */
-#define STYP_TEXT	0x20	/* Executable text (code) section.  */
-#define STYP_OVRFLO	0x8000	/* Line-number field overflow section.  */
-
-#define SSUBTYP_DWINFO	0x10000	/* DWARF info section.  */
-#define SSUBTYP_DWLINE	0x20000	/* DWARF line-number section.  */
-#define SSUBTYP_DWARNGE	0x50000	/* DWARF aranges section.  */
-#define SSUBTYP_DWABREV	0x60000	/* DWARF abbreviation section.  */
-#define SSUBTYP_DWSTR	0x70000	/* DWARF strings section.  */
-
-/* XCOFF symbol.  */
-
-#define SYMNMLEN	8
-
-#if BACKTRACE_XCOFF_SIZE == 32
-
-typedef struct {
-  union {
-    char _name[SYMNMLEN];
-    struct {
-      uint32_t _zeroes;
-      uint32_t _offset;
-    } _s;
-  } _u;
-#define n_name		_u._name
-#define n_zeroes	_u._s._zeroes
-#define n_offset_	_u._s._offset
-
-  uint32_t n_value;
-  int16_t  n_scnum;
-  uint16_t n_type;
-  uint8_t  n_sclass;
-  uint8_t  n_numaux;
-} __attribute__ ((packed)) b_xcoff_syment;
-
-#else /* BACKTRACE_XCOFF_SIZE != 32 */
-
-typedef struct {
-  uint64_t n_value;
-  uint32_t n_offset_;
-  int16_t  n_scnum;
-  uint16_t n_type;
-  uint8_t  n_sclass;
-  uint8_t  n_numaux;
-} __attribute__ ((packed)) b_xcoff_syment;
-
-#endif /* BACKTRACE_XCOFF_SIZE != 32 */
-
-#define SYMESZ	18
-
-#define C_EXT		2	/* External symbol.  */
-#define C_FCN		101	/* Beginning or end of function.  */
-#define C_FILE		103	/* Source file name.  */
-#define C_HIDEXT	107	/* Unnamed external symbol.  */
-#define C_BINCL		108	/* Beginning of include file.  */
-#define C_EINCL		109	/* End of include file.  */
-#define C_WEAKEXT	111	/* Weak external symbol.  */
-
-#define ISFCN(x)	((x) & 0x0020)
-
-/* XCOFF AUX entry.  */
-
-#define AUXESZ		18
-#define FILNMLEN	14
-
-typedef union {
-#if BACKTRACE_XCOFF_SIZE == 32
-  struct {
-    uint16_t pad;
-    uint16_t x_lnnohi;
-    uint16_t x_lnno;
-  } x_block;
-#else
-  struct {
-    uint32_t x_lnno;
-  } x_block;
-#endif
-  union {
-    char x_fname[FILNMLEN];
-    struct {
-      uint32_t x_zeroes;
-      uint32_t x_offset;
-      char     pad[FILNMLEN-8];
-      uint8_t  x_ftype;
-    } _x;
-  } x_file;
-#if BACKTRACE_XCOFF_SIZE == 32
-  struct {
-    uint32_t x_exptr;
-    uint32_t x_fsize;
-    uint32_t x_lnnoptr;
-    uint32_t x_endndx;
-  } x_fcn;
-#else
-  struct {
-    uint64_t x_lnnoptr;
-    uint32_t x_fsize;
-    uint32_t x_endndx;
-  } x_fcn;
-#endif
-  struct {
-    uint8_t pad[AUXESZ-1];
-    uint8_t x_auxtype;
-  } x_auxtype;
-} __attribute__ ((packed)) b_xcoff_auxent;
-
-/* XCOFF line number entry.  */
-
-#if BACKTRACE_XCOFF_SIZE == 32
-
-typedef struct {
-  union {
-    uint32_t l_symndx;
-    uint32_t l_paddr;
-  } l_addr;
-  uint16_t l_lnno;
-} b_xcoff_lineno;
-
-#define LINESZ	6
-
-#else /* BACKTRACE_XCOFF_SIZE != 32 */
-
-typedef struct {
-  union {
-    uint32_t l_symndx;
-    uint64_t l_paddr;
-  } l_addr;
-  uint32_t l_lnno;
-} b_xcoff_lineno;
-
-#define LINESZ	12
-
-#endif /* BACKTRACE_XCOFF_SIZE != 32 */
-
-#if BACKTRACE_XCOFF_SIZE == 32
-#define XCOFF_AIX_TEXTBASE	0x10000000u
-#else
-#define XCOFF_AIX_TEXTBASE	0x100000000ul
-#endif
-
-/* AIX big archive fixed-length header.  */
-
-#define AIAMAGBIG	"<bigaf>\n"
-
-typedef struct {
-  char fl_magic[8];	/* Archive magic string.  */
-  char fl_memoff[20];	/* Offset to member table.  */
-  char fl_gstoff[20];	/* Offset to global symbol table.  */
-  char fl_gst64off[20];	/* Offset to global symbol table for 64-bit objects.  */
-  char fl_fstmoff[20];	/* Offset to first archive member.  */
-  char fl_freeoff[20];	/* Offset to first member on free list.  */
-} b_ar_fl_hdr;
-
-/* AIX big archive file member header.  */
-
-typedef struct {
-  char ar_size[20];	/* File member size - decimal.  */
-  char ar_nxtmem[20];	/* Next member offset - decimal.  */
-  char ar_prvmem[20];	/* Previous member offset - decimal.  */
-  char ar_date[12];	/* File member date - decimal.  */
-  char ar_uid[12];	/* File member userid - decimal.  */
-  char ar_gid[12];	/* File member group id - decimal.  */
-  char ar_mode[12];	/* File member mode - octal.  */
-  char ar_namlen[4];	/* File member name length - decimal.  */
-  char ar_name[2];	/* Start of member name.  */
-} b_ar_hdr;
-
-
-/* Information we keep for an XCOFF symbol.  */
-
-struct xcoff_symbol
-{
-  /* The name of the symbol.  */
-  const char *name;
-  /* The address of the symbol.  */
-  uintptr_t address;
-  /* The size of the symbol.  */
-  size_t size;
-};
-
-/* Information to pass to xcoff_syminfo.  */
-
-struct xcoff_syminfo_data
-{
-  /* Symbols for the next module.  */
-  struct xcoff_syminfo_data *next;
-  /* The XCOFF symbols, sorted by address.  */
-  struct xcoff_symbol *symbols;
-  /* The number of symbols.  */
-  size_t count;
-};
-
-/* Information about an include file.  */
-
-struct xcoff_incl
-{
-  /* File name.  */
-  const char *filename;
-  /* Offset to first line number from the include file.  */
-  uintptr_t begin;
-  /* Offset to last line number from the include file.  */
-  uintptr_t end;
-};
-
-/* A growable vector of include files information.  */
-
-struct xcoff_incl_vector
-{
-  /* Memory.  This is an array of struct xcoff_incl.  */
-  struct backtrace_vector vec;
-  /* Number of include files.  */
-  size_t count;
-};
-
-/* Map a single PC value to a file/function/line.  */
-
-struct xcoff_line
-{
-  /* PC.  */
-  uintptr_t pc;
-  /* File name.  Many entries in the array are expected to point to
-     the same file name.  */
-  const char *filename;
-  /* Function name.  */
-  const char *function;
-  /* Line number.  */
-  int lineno;
-};
-
-/* A growable vector of line number information.  This is used while
-   reading the line numbers.  */
-
-struct xcoff_line_vector
-{
-  /* Memory.  This is an array of struct xcoff_line.  */
-  struct backtrace_vector vec;
-  /* Number of valid mappings.  */
-  size_t count;
-};
-
-/* The information we need to map a PC to a file and line.  */
-
-struct xcoff_fileline_data
-{
-  /* The data for the next file we know about.  */
-  struct xcoff_fileline_data *next;
-  /* Line number information.  */
-  struct xcoff_line_vector vec;
-};
-
-/* An index of DWARF sections we care about.  */
-
-enum dwarf_section
-{
-  DWSECT_INFO,
-  DWSECT_LINE,
-  DWSECT_ABBREV,
-  DWSECT_RANGES,
-  DWSECT_STR,
-  DWSECT_MAX
-};
-
-/* Information we gather for the DWARF sections we care about.  */
-
-struct dwsect_info
-{
-  /* Section file offset.  */
-  off_t offset;
-  /* Section size.  */
-  size_t size;
-  /* Section contents, after read from file.  */
-  const unsigned char *data;
-};
-
-/* A dummy callback function used when we can't find any debug info.  */
-
-static int
-xcoff_nodebug (struct backtrace_state *state ATTRIBUTE_UNUSED,
-	       uintptr_t pc ATTRIBUTE_UNUSED,
-	       backtrace_full_callback callback ATTRIBUTE_UNUSED,
-	       backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no debug info in XCOFF executable", -1);
-  return 0;
-}
-
-/* A dummy callback function used when we can't find a symbol
-   table.  */
-
-static void
-xcoff_nosyms (struct backtrace_state *state ATTRIBUTE_UNUSED,
-	      uintptr_t addr ATTRIBUTE_UNUSED,
-	      backtrace_syminfo_callback callback ATTRIBUTE_UNUSED,
-	      backtrace_error_callback error_callback, void *data)
-{
-  error_callback (data, "no symbol table in XCOFF executable", -1);
-}
-
-/* Compare struct xcoff_symbol for qsort.  */
-
-static int
-xcoff_symbol_compare (const void *v1, const void *v2)
-{
-  const struct xcoff_symbol *e1 = (const struct xcoff_symbol *) v1;
-  const struct xcoff_symbol *e2 = (const struct xcoff_symbol *) v2;
-
-  if (e1->address < e2->address)
-    return -1;
-  else if (e1->address > e2->address)
-    return 1;
-  else
-    return 0;
-}
-
-/* Compare an ADDR against an xcoff_symbol for bsearch.  */
-
-static int
-xcoff_symbol_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct xcoff_symbol *entry = (const struct xcoff_symbol *) ventry;
-  uintptr_t addr;
-
-  addr = *key;
-  if (addr < entry->address)
-    return -1;
-  else if ((entry->size == 0 && addr > entry->address)
-	   || (entry->size > 0 && addr >= entry->address + entry->size))
-    return 1;
-  else
-    return 0;
-}
-
-/* Add XDATA to the list in STATE.  */
-
-static void
-xcoff_add_syminfo_data (struct backtrace_state *state,
-			struct xcoff_syminfo_data *xdata)
-{
-  if (!state->threaded)
-    {
-      struct xcoff_syminfo_data **pp;
-
-      for (pp = (struct xcoff_syminfo_data **) (void *) &state->syminfo_data;
-	   *pp != NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = xdata;
-    }
-  else
-    {
-      while (1)
-	{
-	  struct xcoff_syminfo_data **pp;
-
-	  pp = (struct xcoff_syminfo_data **) (void *) &state->syminfo_data;
-
-	  while (1)
-	    {
-	      struct xcoff_syminfo_data *p;
-
-	      p = backtrace_atomic_load_pointer (pp);
-
-	      if (p == NULL)
-		break;
-
-	      pp = &p->next;
-	    }
-
-	  if (__sync_bool_compare_and_swap (pp, NULL, xdata))
-	    break;
-	}
-    }
-}
-
-/* Return the symbol name and value for an ADDR.  */
-
-static void
-xcoff_syminfo (struct backtrace_state *state ATTRIBUTE_UNUSED, uintptr_t addr,
-	       backtrace_syminfo_callback callback,
-	       backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-	       void *data)
-{
-  struct xcoff_syminfo_data *edata;
-  struct xcoff_symbol *sym = NULL;
-
-  if (!state->threaded)
-    {
-      for (edata = (struct xcoff_syminfo_data *) state->syminfo_data;
-	   edata != NULL;
-	   edata = edata->next)
-	{
-	  sym = ((struct xcoff_symbol *)
-		 bsearch (&addr, edata->symbols, edata->count,
-			  sizeof (struct xcoff_symbol), xcoff_symbol_search));
-	  if (sym != NULL)
-	    break;
-	}
-    }
-  else
-    {
-      struct xcoff_syminfo_data **pp;
-
-      pp = (struct xcoff_syminfo_data **) (void *) &state->syminfo_data;
-      while (1)
-	{
-	  edata = backtrace_atomic_load_pointer (pp);
-	  if (edata == NULL)
-	    break;
-
-	  sym = ((struct xcoff_symbol *)
-		 bsearch (&addr, edata->symbols, edata->count,
-			  sizeof (struct xcoff_symbol), xcoff_symbol_search));
-	  if (sym != NULL)
-	    break;
-
-	  pp = &edata->next;
-	}
-    }
-
-  if (sym == NULL)
-    callback (data, addr, NULL, 0, 0);
-  else
-    callback (data, addr, sym->name, sym->address, sym->size);
-}
-
-/* Return the name of an XCOFF symbol.  */
-
-static const char *
-xcoff_symname (const b_xcoff_syment *asym,
-	       const unsigned char *strtab, size_t strtab_size)
-{
-#if BACKTRACE_XCOFF_SIZE == 32
-  if (asym->n_zeroes != 0)
-    {
-      /* Make a copy as we will release the symtab view.  */
-      char name[SYMNMLEN+1];
-      strncpy (name, asym->n_name, SYMNMLEN);
-      name[SYMNMLEN] = '\0';
-      return strdup (name);
-    }
-#endif
-  if (asym->n_sclass & 0x80)
-    return NULL; /* .debug */
-  if (asym->n_offset_ >= strtab_size)
-    return NULL;
-  return (const char *) strtab + asym->n_offset_;
-}
-
-/* Initialize the symbol table info for xcoff_syminfo.  */
-
-static int
-xcoff_initialize_syminfo (struct backtrace_state *state,
-			  uintptr_t base_address,
-			  const b_xcoff_scnhdr *sects,
-			  const b_xcoff_syment *syms, size_t nsyms,
-			  const unsigned char *strtab, size_t strtab_size,
-			  backtrace_error_callback error_callback, void *data,
-			  struct xcoff_syminfo_data *sdata)
-{
-  size_t xcoff_symbol_count;
-  size_t xcoff_symbol_size;
-  struct xcoff_symbol *xcoff_symbols;
-  size_t i;
-  unsigned int j;
-
-  /* We only care about function symbols.  Count them.  */
-  xcoff_symbol_count = 0;
-  for (i = 0; i < nsyms; ++i)
-    {
-      const b_xcoff_syment *asym = &syms[i];
-      if ((asym->n_sclass == C_EXT || asym->n_sclass == C_HIDEXT
-	    || asym->n_sclass == C_WEAKEXT)
-	  && ISFCN (asym->n_type) && asym->n_numaux > 0 && asym->n_scnum > 0)
-	++xcoff_symbol_count;
-
-      i += asym->n_numaux;
-    }
-
-  xcoff_symbol_size = xcoff_symbol_count * sizeof (struct xcoff_symbol);
-  xcoff_symbols = ((struct xcoff_symbol *)
-		   backtrace_alloc (state, xcoff_symbol_size, error_callback,
-				    data));
-  if (xcoff_symbols == NULL)
-    return 0;
-
-  j = 0;
-  for (i = 0; i < nsyms; ++i)
-    {
-      const b_xcoff_syment *asym = &syms[i];
-      if ((asym->n_sclass == C_EXT || asym->n_sclass == C_HIDEXT
-	    || asym->n_sclass == C_WEAKEXT)
-	  && ISFCN (asym->n_type) && asym->n_numaux > 0 && asym->n_scnum > 0)
-	{
-	  const b_xcoff_auxent *aux = (const b_xcoff_auxent *) (asym + 1);
-	  xcoff_symbols[j].name = xcoff_symname (asym, strtab, strtab_size);
-	  xcoff_symbols[j].address = base_address + asym->n_value
-				   - sects[asym->n_scnum - 1].s_paddr;
-	  /* x_fsize will be 0 if there is no debug information.  */
-	  xcoff_symbols[j].size = aux->x_fcn.x_fsize;
-	  ++j;
-	}
-
-      i += asym->n_numaux;
-    }
-
-  backtrace_qsort (xcoff_symbols, xcoff_symbol_count,
-		   sizeof (struct xcoff_symbol), xcoff_symbol_compare);
-
-  sdata->next = NULL;
-  sdata->symbols = xcoff_symbols;
-  sdata->count = xcoff_symbol_count;
-
-  return 1;
-}
-
-/* Compare struct xcoff_line for qsort.  */
-
-static int
-xcoff_line_compare (const void *v1, const void *v2)
-{
-  const struct xcoff_line *ln1 = (const struct xcoff_line *) v1;
-  const struct xcoff_line *ln2 = (const struct xcoff_line *) v2;
-
-  if (ln1->pc < ln2->pc)
-    return -1;
-  else if (ln1->pc > ln2->pc)
-    return 1;
-  else
-    return 0;
-}
-
-/* Find a PC in a line vector.  We always allocate an extra entry at
-   the end of the lines vector, so that this routine can safely look
-   at the next entry.  */
-
-static int
-xcoff_line_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct xcoff_line *entry = (const struct xcoff_line *) ventry;
-  uintptr_t pc;
-
-  pc = *key;
-  if (pc < entry->pc)
-    return -1;
-  else if ((entry + 1)->pc == (uintptr_t) -1 || pc >= (entry + 1)->pc)
-    return 1;
-  else
-    return 0;
-}
-
-/* Look for a PC in the line vector for one module.  On success,
-   call CALLBACK and return whatever it returns.  On error, call
-   ERROR_CALLBACK and return 0.  Sets *FOUND to 1 if the PC is found,
-   0 if not.  */
-
-static int
-xcoff_lookup_pc (struct backtrace_state *state ATTRIBUTE_UNUSED,
-		 struct xcoff_fileline_data *fdata, uintptr_t pc,
-		 backtrace_full_callback callback,
-		 backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
-		 void *data, int *found)
-{
-  const struct xcoff_line *ln;
-  const char *function;
-
-  *found = 1;
-
-  ln = (struct xcoff_line *) bsearch (&pc, fdata->vec.vec.base,
-				      fdata->vec.count,
-				      sizeof (struct xcoff_line),
-				      xcoff_line_search);
-  if (ln == NULL)
-    {
-      *found = 0;
-      return 0;
-    }
-
-  function = ln->function;
-  /* AIX prepends a '.' to function entry points, remove it.  */
-  if (*function == '.')
-    ++function;
-  return callback (data, pc, ln->filename, ln->lineno, function);
-}
-
-/* Return the file/line information for a PC using the XCOFF lineno
-   mapping we built earlier.  */
-
-static int
-xcoff_fileline (struct backtrace_state *state, uintptr_t pc,
-		backtrace_full_callback callback,
-		backtrace_error_callback error_callback, void *data)
-
-{
-  struct xcoff_fileline_data *fdata;
-  int found;
-  int ret;
-
-  if (!state->threaded)
-    {
-      for (fdata = (struct xcoff_fileline_data *) state->fileline_data;
-	   fdata != NULL;
-	   fdata = fdata->next)
-	{
-	  ret = xcoff_lookup_pc (state, fdata, pc, callback, error_callback,
-				 data, &found);
-	  if (ret != 0 || found)
-	    return ret;
-	}
-    }
-  else
-    {
-      struct xcoff_fileline_data **pp;
-
-      pp = (struct xcoff_fileline_data **) (void *) &state->fileline_data;
-      while (1)
-	{
-	  fdata = backtrace_atomic_load_pointer (pp);
-	  if (fdata == NULL)
-	    break;
-
-	  ret = xcoff_lookup_pc (state, fdata, pc, callback, error_callback,
-				 data, &found);
-	  if (ret != 0 || found)
-	    return ret;
-
-	  pp = &fdata->next;
-	}
-    }
-
-  /* FIXME: See if any libraries have been dlopen'ed.  */
-
-  return callback (data, pc, NULL, 0, NULL);
-}
-
-/* Compare struct xcoff_incl for qsort.  */
-
-static int
-xcoff_incl_compare (const void *v1, const void *v2)
-{
-  const struct xcoff_incl *in1 = (const struct xcoff_incl *) v1;
-  const struct xcoff_incl *in2 = (const struct xcoff_incl *) v2;
-
-  if (in1->begin < in2->begin)
-    return -1;
-  else if (in1->begin > in2->begin)
-    return 1;
-  else
-    return 0;
-}
-
-/* Find a lnnoptr in an include file.  */
-
-static int
-xcoff_incl_search (const void *vkey, const void *ventry)
-{
-  const uintptr_t *key = (const uintptr_t *) vkey;
-  const struct xcoff_incl *entry = (const struct xcoff_incl *) ventry;
-  uintptr_t lnno;
-
-  lnno = *key;
-  if (lnno < entry->begin)
-    return -1;
-  else if (lnno > entry->end)
-    return 1;
-  else
-    return 0;
-}
-
-/* Add a new mapping to the vector of line mappings that we are
-   building.  Returns 1 on success, 0 on failure.  */
-
-static int
-xcoff_add_line (struct backtrace_state *state, uintptr_t pc,
-		const char *filename, const char *function, uint32_t lnno,
-		backtrace_error_callback error_callback, void *data,
-		struct xcoff_line_vector *vec)
-{
-  struct xcoff_line *ln;
-
-  ln = ((struct xcoff_line *)
-	backtrace_vector_grow (state, sizeof (struct xcoff_line),
-			       error_callback, data, &vec->vec));
-  if (ln == NULL)
-    return 0;
-
-  ln->pc = pc;
-  ln->filename = filename;
-  ln->function = function;
-  ln->lineno = lnno;
-
-  ++vec->count;
-
-  return 1;
-}
-
-/* Add the line number entries for a function to the line vector.  */
-
-static int
-xcoff_process_linenos (struct backtrace_state *state, uintptr_t base_address,
-		       const b_xcoff_syment *fsym, const char *filename,
-		       const b_xcoff_scnhdr *sects,
-		       const unsigned char *strtab, size_t strtab_size,
-		       uint32_t fcn_lnno, struct xcoff_incl_vector *vec,
-		       struct xcoff_line_vector *lvec,
-		       const unsigned char *linenos, size_t linenos_size,
-		       uintptr_t lnnoptr0,
-		       backtrace_error_callback error_callback, void *data)
-{
-  const b_xcoff_auxent *aux;
-  const b_xcoff_lineno *lineno;
-  const unsigned char *lineptr;
-  const char *function;
-  struct xcoff_incl *incl = NULL;
-  uintptr_t lnnoptr;
-  uintptr_t pc;
-  uint32_t lnno;
-  int begincl;
-
-  aux = (const b_xcoff_auxent *) (fsym + 1);
-  lnnoptr = aux->x_fcn.x_lnnoptr;
-
-  if (lnnoptr < lnnoptr0 || lnnoptr + LINESZ > lnnoptr0 + linenos_size)
-    return 0;
-
-  function = xcoff_symname (fsym, strtab, strtab_size);
-  if (function == NULL)
-    return 0;
-
-  /* Skip first entry that points to symtab.  */
-
-  lnnoptr += LINESZ;
-
-  lineptr = linenos + (lnnoptr - lnnoptr0);
-
-  begincl = -1;
-  while (lineptr + LINESZ <= linenos + linenos_size)
-    {
-      lineno = (const b_xcoff_lineno *) lineptr;
-
-      lnno = lineno->l_lnno;
-      if (lnno == 0)
-	  break;
-
-      /* If part of a function other than the beginning comes from an
-	 include file, the line numbers are absolute, rather than
-	 relative to the beginning of the function.  */
-      incl = (struct xcoff_incl *) bsearch (&lnnoptr, vec->vec.base,
-					    vec->count,
-					    sizeof (struct xcoff_incl),
-					    xcoff_incl_search);
-      if (begincl == -1)
-	begincl = incl != NULL;
-      if (incl != NULL)
-	{
-	  filename = incl->filename;
-	  if (begincl == 1)
-	    lnno += fcn_lnno - 1;
-	}
-      else
-	lnno += fcn_lnno - 1;
-
-      pc = base_address + lineno->l_addr.l_paddr
-	 - sects[fsym->n_scnum - 1].s_paddr;
-      xcoff_add_line (state, pc, filename, function, lnno, error_callback,
-		      data, lvec);
-
-      lnnoptr += LINESZ;
-      lineptr += LINESZ;
-    }
-
-  return 1;
-}
-
-/* Initialize the line vector info for xcoff_fileline.  */
-
-static int
-xcoff_initialize_fileline (struct backtrace_state *state,
-			   uintptr_t base_address,
-			   const b_xcoff_scnhdr *sects,
-			   const b_xcoff_syment *syms, size_t nsyms,
-			   const unsigned char *strtab, size_t strtab_size,
-			   const unsigned char *linenos, size_t linenos_size,
-			   uint64_t lnnoptr0,
-			   backtrace_error_callback error_callback, void *data)
-{
-  struct xcoff_fileline_data *fdata;
-  struct xcoff_incl_vector vec;
-  struct xcoff_line *ln;
-  const b_xcoff_syment *fsym;
-  const b_xcoff_auxent *aux;
-  const char *filename;
-  const char *name;
-  struct xcoff_incl *incl;
-  uintptr_t begin, end;
-  uintptr_t lnno;
-  size_t i;
-
-  fdata = ((struct xcoff_fileline_data *)
-	   backtrace_alloc (state, sizeof (struct xcoff_fileline_data),
-			    error_callback, data));
-  if (fdata == NULL)
-    return 0;
-
-  memset (fdata, 0, sizeof *fdata);
-  memset (&vec, 0, sizeof vec);
-
-  /* Process include files first.  */
-
-  begin = 0;
-  for (i = 0; i < nsyms; ++i)
-    {
-      const b_xcoff_syment *asym = &syms[i];
-
-      switch (asym->n_sclass)
-	{
-	  case C_BINCL:
-	    begin = asym->n_value;
-	    break;
-
-	  case C_EINCL:
-	    if (begin == 0)
-	      break;
-	    end = asym->n_value;
-	    incl = ((struct xcoff_incl *)
-		    backtrace_vector_grow (state, sizeof (struct xcoff_incl),
-					   error_callback, data, &vec.vec));
-	    if (incl != NULL)
-	      {
-		incl->filename = xcoff_symname (asym, strtab, strtab_size);
-		incl->begin = begin;
-		incl->end = end;
-		++vec.count;
-	      }
-	    begin = 0;
-	    break;
-	}
-
-      i += asym->n_numaux;
-    }
-
-  backtrace_qsort (vec.vec.base, vec.count,
-		   sizeof (struct xcoff_incl), xcoff_incl_compare);
-
-  filename = NULL;
-  fsym = NULL;
-  for (i = 0; i < nsyms; ++i)
-    {
-      const b_xcoff_syment *asym = &syms[i];
-
-      switch (asym->n_sclass)
-	{
-	  case C_FILE:
-	    filename = xcoff_symname (asym, strtab, strtab_size);
-	    if (filename == NULL)
-	      break;
-
-	    /* If the file auxiliary entry is not used, the symbol name is
-	       the name of the source file. If the file auxiliary entry is
-	       used, then the symbol name should be .file, and the first
-	       file auxiliary entry (by convention) contains the source
-	       file name.  */
-
-	    if (asym->n_numaux > 0 && !strcmp (filename, ".file"))
-	      {
-		aux = (const b_xcoff_auxent *) (asym + 1);
-		if (aux->x_file._x.x_zeroes != 0)
-		  {
-		    /* Make a copy as we will release the symtab view.  */
-		    char name[FILNMLEN+1];
-		    strncpy (name, aux->x_file.x_fname, FILNMLEN);
-		    name[FILNMLEN] = '\0';
-		    filename = strdup (name);
-		  }
-		else if (aux->x_file._x.x_offset < strtab_size)
-		  filename = (const char *) strtab + aux->x_file._x.x_offset;
-		else
-		  filename = NULL;
-	      }
-	    break;
-
-	  case C_EXT:
-	  case C_HIDEXT:
-	  case C_WEAKEXT:
-	    fsym = NULL;
-	    if (!ISFCN (asym->n_type) || asym->n_numaux == 0)
-	      break;
-	    if (filename == NULL)
-	      break;
-	    fsym = asym;
-	    break;
-
-	  case C_FCN:
-	    if (asym->n_numaux == 0)
-	      break;
-	    if (fsym == NULL)
-	      break;
-	    name = xcoff_symname (asym, strtab, strtab_size);
-	    if (name == NULL)
-	      break;
-	    aux = (const b_xcoff_auxent *) (asym + 1);
-#if BACKTRACE_XCOFF_SIZE == 32
-	    lnno = (uint32_t) aux->x_block.x_lnnohi << 16
-		 | aux->x_block.x_lnno;
-#else
-	    lnno = aux->x_block.x_lnno;
-#endif
-	    if (!strcmp (name, ".bf"))
-	      {
-		xcoff_process_linenos (state, base_address, fsym, filename,
-				       sects, strtab, strtab_size, lnno, &vec,
-				       &fdata->vec, linenos, linenos_size,
-				       lnnoptr0, error_callback, data);
-	      }
-	    else if (!strcmp (name, ".ef"))
-	      {
-		fsym = NULL;
-	      }
-	    break;
-	}
-
-      i += asym->n_numaux;
-    }
-
-  /* Allocate one extra entry at the end.  */
-  ln = ((struct xcoff_line *)
-	backtrace_vector_grow (state, sizeof (struct xcoff_line),
-			       error_callback, data, &fdata->vec.vec));
-  if (ln == NULL)
-    goto fail;
-  ln->pc = (uintptr_t) -1;
-  ln->filename = NULL;
-  ln->function = NULL;
-  ln->lineno = 0;
-
-  if (!backtrace_vector_release (state, &fdata->vec.vec, error_callback, data))
-    goto fail;
-
-  backtrace_qsort (fdata->vec.vec.base, fdata->vec.count,
-		   sizeof (struct xcoff_line), xcoff_line_compare);
-
-  if (!state->threaded)
-    {
-      struct xcoff_fileline_data **pp;
-
-      for (pp = (struct xcoff_fileline_data **) (void *) &state->fileline_data;
-	   *pp != NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = fdata;
-    }
-  else
-    {
-      while (1)
-	{
-	  struct xcoff_fileline_data **pp;
-
-	  pp = (struct xcoff_fileline_data **) (void *) &state->fileline_data;
-
-	  while (1)
-	    {
-	      struct xcoff_fileline_data *p;
-
-	      p = backtrace_atomic_load_pointer (pp);
-
-	      if (p == NULL)
-		break;
-
-	      pp = &p->next;
-	    }
-
-	  if (__sync_bool_compare_and_swap (pp, NULL, fdata))
-	    break;
-	}
-    }
-
-  return 1;
-
-fail:
-  return 0;
-}
-
-/* Add the backtrace data for one XCOFF file.  Returns 1 on success,
-   0 on failure (in both cases descriptor is closed).  */
-
-static int
-xcoff_add (struct backtrace_state *state, int descriptor, off_t offset,
-	   uintptr_t base_address, backtrace_error_callback error_callback,
-	   void *data, fileline *fileline_fn, int *found_sym, int exe)
-{
-  struct backtrace_view fhdr_view;
-  struct backtrace_view sects_view;
-  struct backtrace_view linenos_view;
-  struct backtrace_view syms_view;
-  struct backtrace_view str_view;
-  struct backtrace_view dwarf_view;
-  b_xcoff_filhdr fhdr;
-  const b_xcoff_scnhdr *sects;
-  const b_xcoff_scnhdr *stext;
-  uint64_t lnnoptr;
-  uint32_t nlnno;
-  off_t str_off;
-  off_t min_offset;
-  off_t max_offset;
-  struct dwsect_info dwsect[DWSECT_MAX];
-  size_t sects_size;
-  size_t syms_size;
-  int32_t str_size;
-  int sects_view_valid;
-  int linenos_view_valid;
-  int syms_view_valid;
-  int str_view_valid;
-  int dwarf_view_valid;
-  int magic_ok;
-  int i;
-
-  *found_sym = 0;
-
-  sects_view_valid = 0;
-  linenos_view_valid = 0;
-  syms_view_valid = 0;
-  str_view_valid = 0;
-  dwarf_view_valid = 0;
-
-  str_size = 0;
-
-  /* Map the XCOFF file header.  */
-  if (!backtrace_get_view (state, descriptor, offset, sizeof (b_xcoff_filhdr),
-			   error_callback, data, &fhdr_view))
-    goto fail;
-
-  memcpy (&fhdr, fhdr_view.data, sizeof fhdr);
-  magic_ok = (fhdr.f_magic == XCOFF_MAGIC);
-
-  backtrace_release_view (state, &fhdr_view, error_callback, data);
-
-  if (!magic_ok)
-    {
-      if (exe)
-	error_callback (data, "executable file is not XCOFF", 0);
-      goto fail;
-    }
-
-  /* Verify object is of expected type.  */
-  if ((exe && (fhdr.f_flags & F_SHROBJ))
-      || (!exe && !(fhdr.f_flags & F_SHROBJ)))
-    goto fail;
-
-  /* Read the section headers.  */
-
-  sects_size = fhdr.f_nscns * sizeof (b_xcoff_scnhdr);
-
-  if (!backtrace_get_view (state, descriptor,
-			   offset + sizeof (fhdr) + fhdr.f_opthdr,
-			   sects_size, error_callback, data, &sects_view))
-    goto fail;
-  sects_view_valid = 1;
-  sects = (const b_xcoff_scnhdr *) sects_view.data;
-
-  /* FIXME: assumes only one .text section.  */
-  for (i = 0; i < fhdr.f_nscns; ++i)
-    if ((sects[i].s_flags & 0xffff) == STYP_TEXT)
-      break;
-  if (i == fhdr.f_nscns)
-    goto fail;
-
-  stext = &sects[i];
-
-  /* AIX ldinfo_textorg includes the XCOFF headers.  */
-  base_address = (exe ? XCOFF_AIX_TEXTBASE : base_address) + stext->s_scnptr;
-
-  lnnoptr = stext->s_lnnoptr;
-  nlnno = stext->s_nlnno;
-
-#if BACKTRACE_XCOFF_SIZE == 32
-  if (nlnno == _OVERFLOW_MARKER)
-    {
-      int sntext = i + 1;
-      /* Find the matching .ovrflo section.  */
-      for (i = 0; i < fhdr.f_nscns; ++i)
-	{
-	  if (((sects[i].s_flags & 0xffff) == STYP_OVRFLO)
-	      && sects[i].s_nlnno == sntext)
-	    {
-	      nlnno = sects[i].s_vaddr;
-	      break;
-	    }
-	}
-    }
-#endif
-
-  /* Read the symbol table and the string table.  */
-
-  if (fhdr.f_symptr != 0)
-    {
-      struct xcoff_syminfo_data *sdata;
-
-      /* Symbol table is followed by the string table.  The string table
-	 starts with its length (on 4 bytes).
-	 Map the symbol table and the length of the string table.  */
-      syms_size = fhdr.f_nsyms * sizeof (b_xcoff_syment);
-
-      if (!backtrace_get_view (state, descriptor, offset + fhdr.f_symptr,
-			       syms_size + 4, error_callback, data,
-			       &syms_view))
-	goto fail;
-      syms_view_valid = 1;
-
-      memcpy (&str_size, syms_view.data + syms_size, 4);
-
-      str_off = fhdr.f_symptr + syms_size;
-
-      if (str_size > 4)
-	{
-	  /* Map string table (including the length word).  */
-
-	  if (!backtrace_get_view (state, descriptor, offset + str_off,
-				   str_size, error_callback, data, &str_view))
-	    goto fail;
-	  str_view_valid = 1;
-	}
-
-      sdata = ((struct xcoff_syminfo_data *)
-	       backtrace_alloc (state, sizeof *sdata, error_callback, data));
-      if (sdata == NULL)
-	goto fail;
-
-      if (!xcoff_initialize_syminfo (state, base_address, sects,
-				     syms_view.data, fhdr.f_nsyms,
-				     str_view.data, str_size,
-				     error_callback, data, sdata))
-	{
-	  backtrace_free (state, sdata, sizeof *sdata, error_callback, data);
-	  goto fail;
-	}
-
-      *found_sym = 1;
-
-      xcoff_add_syminfo_data (state, sdata);
-    }
-
-  /* Read all the DWARF sections in a single view, since they are
-     probably adjacent in the file.  We never release this view.  */
-
-  min_offset = 0;
-  max_offset = 0;
-  memset (dwsect, 0, sizeof dwsect);
-  for (i = 0; i < fhdr.f_nscns; ++i)
-    {
-      off_t end;
-      int idx;
-
-      if ((sects[i].s_flags & 0xffff) != STYP_DWARF
-	  || sects[i].s_size == 0)
-	continue;
-      /* Map DWARF section to array index.  */
-      switch (sects[i].s_flags & 0xffff0000)
-	{
-	  case SSUBTYP_DWINFO:
-	    idx = DWSECT_INFO;
-	    break;
-	  case SSUBTYP_DWLINE:
-	    idx = DWSECT_LINE;
-	    break;
-	  case SSUBTYP_DWABREV:
-	    idx = DWSECT_ABBREV;
-	    break;
-	  case SSUBTYP_DWARNGE:
-	    idx = DWSECT_RANGES;
-	    break;
-	  case SSUBTYP_DWSTR:
-	    idx = DWSECT_STR;
-	    break;
-	  default:
-	    continue;
-	}
-      if (min_offset == 0 || (off_t) sects[i].s_scnptr < min_offset)
-	min_offset = sects[i].s_scnptr;
-      end = sects[i].s_scnptr + sects[i].s_size;
-      if (end > max_offset)
-	max_offset = end;
-      dwsect[idx].offset = sects[i].s_scnptr;
-      dwsect[idx].size = sects[i].s_size;
-    }
-  if (min_offset != 0 && max_offset != 0)
-    {
-      if (!backtrace_get_view (state, descriptor, offset + min_offset,
-			       max_offset - min_offset,
-			       error_callback, data, &dwarf_view))
-	goto fail;
-      dwarf_view_valid = 1;
-
-      for (i = 0; i < (int) DWSECT_MAX; ++i)
-	{
-	  if (dwsect[i].offset == 0)
-	    dwsect[i].data = NULL;
-	  else
-	    dwsect[i].data = ((const unsigned char *) dwarf_view.data
-			      + (dwsect[i].offset - min_offset));
-	}
-
-      if (!backtrace_dwarf_add (state, 0,
-				dwsect[DWSECT_INFO].data,
-				dwsect[DWSECT_INFO].size,
-#if BACKTRACE_XCOFF_SIZE == 32
-				/* XXX workaround for broken lineoff */
-				dwsect[DWSECT_LINE].data - 4,
-#else
-				/* XXX workaround for broken lineoff */
-				dwsect[DWSECT_LINE].data - 12,
-#endif
-				dwsect[DWSECT_LINE].size,
-				dwsect[DWSECT_ABBREV].data,
-				dwsect[DWSECT_ABBREV].size,
-				dwsect[DWSECT_RANGES].data,
-				dwsect[DWSECT_RANGES].size,
-				dwsect[DWSECT_STR].data,
-				dwsect[DWSECT_STR].size,
-				1, /* big endian */
-				error_callback, data, fileline_fn))
-	goto fail;
-    }
-
-  /* Read the XCOFF line number entries if DWARF sections not found.  */
-
-  if (!dwarf_view_valid && fhdr.f_symptr != 0 && lnnoptr != 0)
-    {
-      size_t linenos_size = (size_t) nlnno * LINESZ;
-
-      if (!backtrace_get_view (state, descriptor, offset + lnnoptr,
-			       linenos_size,
-			       error_callback, data, &linenos_view))
-	goto fail;
-      linenos_view_valid = 1;
-
-      if (xcoff_initialize_fileline (state, base_address, sects,
-				     syms_view.data, fhdr.f_nsyms,
-				     str_view.data, str_size,
-				     linenos_view.data, linenos_size,
-				     lnnoptr, error_callback, data))
-	*fileline_fn = xcoff_fileline;
-
-      backtrace_release_view (state, &linenos_view, error_callback, data);
-      linenos_view_valid = 0;
-    }
-
-  backtrace_release_view (state, &sects_view, error_callback, data);
-  sects_view_valid = 0;
-  if (syms_view_valid)
-    backtrace_release_view (state, &syms_view, error_callback, data);
-  syms_view_valid = 0;
-
-  /* We've read all we need from the executable.  */
-  if (!backtrace_close (descriptor, error_callback, data))
-    goto fail;
-  descriptor = -1;
-
-  return 1;
-
- fail:
-  if (sects_view_valid)
-    backtrace_release_view (state, &sects_view, error_callback, data);
-  if (str_view_valid)
-    backtrace_release_view (state, &str_view, error_callback, data);
-  if (syms_view_valid)
-    backtrace_release_view (state, &syms_view, error_callback, data);
-  if (linenos_view_valid)
-    backtrace_release_view (state, &linenos_view, error_callback, data);
-  if (dwarf_view_valid)
-    backtrace_release_view (state, &dwarf_view, error_callback, data);
-  if (descriptor != -1 && offset == 0)
-    backtrace_close (descriptor, error_callback, data);
-  return 0;
-}
-
-#ifdef HAVE_LOADQUERY
-
-/* Read an integer value in human-readable format from an AIX
-   big archive fixed-length or member header.  */
-
-static int
-xcoff_parse_decimal (const char *buf, size_t size, off_t *off)
-{
-  char str[32];
-  char *end;
-
-  if (size >= sizeof str)
-    return 0;
-  memcpy (str, buf, size);
-  str[size] = '\0';
-  *off = strtol (str, &end, 10);
-  if (*end != '\0' && *end != ' ')
-    return 0;
-
-  return 1;
-}
-
-/* Add the backtrace data for a member of an AIX big archive.
-   Returns 1 on success, 0 on failure.  */
-
-static int
-xcoff_armem_add (struct backtrace_state *state, int descriptor,
-		 uintptr_t base_address, const char *member,
-		 backtrace_error_callback error_callback, void *data,
-		 fileline *fileline_fn, int *found_sym)
-{
-  struct backtrace_view view;
-  b_ar_fl_hdr fl_hdr;
-  const b_ar_hdr *ar_hdr;
-  off_t off;
-  off_t len;
-  int memlen;
-
-  *found_sym = 0;
-
-  /* Map archive fixed-length header.  */
-
-  if (!backtrace_get_view (state, descriptor, 0, sizeof (b_ar_fl_hdr),
-			   error_callback, data, &view))
-    goto fail;
-
-  memcpy (&fl_hdr, view.data, sizeof (b_ar_fl_hdr));
-
-  backtrace_release_view (state, &view, error_callback, data);
-
-  if (memcmp (fl_hdr.fl_magic, AIAMAGBIG, 8) != 0)
-    goto fail;
-
-  memlen = strlen (member);
-
-  /* Read offset of first archive member.  */
-  if (!xcoff_parse_decimal (fl_hdr.fl_fstmoff, sizeof fl_hdr.fl_fstmoff, &off))
-    goto fail;
-  while (off != 0)
-    {
-      /* Map archive member header and member name.  */
-
-      if (!backtrace_get_view (state, descriptor, off,
-			       sizeof (b_ar_hdr) + memlen,
-			       error_callback, data, &view))
-	break;
-
-      ar_hdr = (const b_ar_hdr *) view.data;
-
-      /* Read archive member name length.  */
-      if (!xcoff_parse_decimal (ar_hdr->ar_namlen, sizeof ar_hdr->ar_namlen,
-				&len))
-	{
-	  backtrace_release_view (state, &view, error_callback, data);
-	  break;
-	}
-      if (len == memlen && !memcmp (ar_hdr->ar_name, member, memlen))
-	{
-	  off = (off + sizeof (b_ar_hdr) + memlen + 1) & ~1;
-
-	  /* The archive can contain several members with the same name
-	     (e.g. 32-bit and 64-bit), so continue if not ok.  */
-
-	  if (xcoff_add (state, descriptor, off, base_address, error_callback,
-			 data, fileline_fn, found_sym, 0))
-	    {
-	      backtrace_release_view (state, &view, error_callback, data);
-	      return 1;
-	    }
-	}
-
-      /* Read offset of next archive member.  */
-      if (!xcoff_parse_decimal (ar_hdr->ar_nxtmem, sizeof ar_hdr->ar_nxtmem,
-				&off))
-	{
-	  backtrace_release_view (state, &view, error_callback, data);
-	  break;
-	}
-      backtrace_release_view (state, &view, error_callback, data);
-    }
-
- fail:
-  /* No matching member found.  */
-  backtrace_close (descriptor, error_callback, data);
-  return 0;
-}
-
-/* Add the backtrace data for dynamically loaded libraries.  */
-
-static void
-xcoff_add_shared_libs (struct backtrace_state *state,
-		       backtrace_error_callback error_callback,
-		       void *data, fileline *fileline_fn, int *found_sym)
-{
-  const struct ld_info *ldinfo;
-  void *buf;
-  unsigned int buflen;
-  const char *member;
-  int descriptor;
-  int does_not_exist;
-  int lib_found_sym;
-  int ret;
-
-  /* Retrieve the list of loaded libraries.  */
-
-  buf = NULL;
-  buflen = 512;
-  do
-    {
-      buf = realloc (buf, buflen);
-      if (buf == NULL)
-	{
-	  ret = -1;
-	  break;
-	}
-      ret = loadquery (L_GETINFO, buf, buflen);
-      if (ret == 0)
-	break;
-      buflen *= 2;
-    }
-  while (ret == -1 && errno == ENOMEM);
-  if (ret != 0)
-    {
-      free (buf);
-      return;
-    }
-
-  ldinfo = (const struct ld_info *) buf;
-  while ((const char *) ldinfo < (const char *) buf + buflen)
-    {
-      if (*ldinfo->ldinfo_filename != '/')
-	goto next;
-
-      descriptor = backtrace_open (ldinfo->ldinfo_filename, error_callback,
-				   data, &does_not_exist);
-      if (descriptor < 0)
-	goto next;
-
-      /* Check if it is an archive (member name not empty).  */
-
-      member = ldinfo->ldinfo_filename + strlen (ldinfo->ldinfo_filename) + 1;
-      if (*member)
-	{
-	  xcoff_armem_add (state, descriptor,
-			   (uintptr_t) ldinfo->ldinfo_textorg, member,
-			   error_callback, data, fileline_fn, &lib_found_sym);
-	}
-      else
-	{
-	  xcoff_add (state, descriptor, 0, (uintptr_t) ldinfo->ldinfo_textorg,
-		     error_callback, data, fileline_fn, &lib_found_sym, 0);
-	}
-      if (lib_found_sym)
-	*found_sym = 1;
-
- next:
-      if (ldinfo->ldinfo_next == 0)
-	break;
-      ldinfo = (const struct ld_info *) ((const char *) ldinfo
-					 + ldinfo->ldinfo_next);
-    }
-
-    free (buf);
-}
-#endif /* HAVE_LOADQUERY */
-
-/* Initialize the backtrace data we need from an XCOFF executable.
-   Returns 1 on success, 0 on failure.  */
-
-int
-backtrace_initialize (struct backtrace_state *state,
-		      const char *filename ATTRIBUTE_UNUSED, int descriptor,
-		      backtrace_error_callback error_callback,
-		      void *data, fileline *fileline_fn)
-{
-  int ret;
-  int found_sym;
-  fileline xcoff_fileline_fn = xcoff_nodebug;
-
-  ret = xcoff_add (state, descriptor, 0, 0, error_callback, data,
-		   &xcoff_fileline_fn, &found_sym, 1);
-  if (!ret)
-    return 0;
-
-#ifdef HAVE_LOADQUERY
-  xcoff_add_shared_libs (state, error_callback, data, &xcoff_fileline_fn,
-			 &found_sym);
-#endif
-
-  if (!state->threaded)
-    {
-      if (found_sym)
-	state->syminfo_fn = xcoff_syminfo;
-      else if (state->syminfo_fn == NULL)
-	state->syminfo_fn = xcoff_nosyms;
-    }
-  else
-    {
-      if (found_sym)
-	backtrace_atomic_store_pointer (&state->syminfo_fn, xcoff_syminfo);
-      else
-	__sync_bool_compare_and_swap (&state->syminfo_fn, NULL, xcoff_nosyms);
-    }
-
-  if (!state->threaded)
-    {
-      if (state->fileline_fn == NULL || state->fileline_fn == xcoff_nodebug)
-	*fileline_fn = xcoff_fileline_fn;
-    }
-  else
-    {
-      fileline current_fn;
-
-      current_fn = backtrace_atomic_load_pointer (&state->fileline_fn);
-      if (current_fn == NULL || current_fn == xcoff_nodebug)
-	*fileline_fn = xcoff_fileline_fn;
-    }
-
-  return 1;
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/ztest.c cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/ztest.c
--- cargo-0.32.0/vendor/backtrace-sys/src/libbacktrace/ztest.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/libbacktrace/ztest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,537 +0,0 @@
-/* ztest.c -- Test for libbacktrace inflate code.
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Google.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3) The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "config.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#endif
-
-#include "backtrace.h"
-#include "backtrace-supported.h"
-
-#include "internal.h"
-#include "testlib.h"
-
-#ifndef HAVE_CLOCK_GETTIME
-
-typedef int xclockid_t;
-
-static int
-xclock_gettime (xclockid_t id ATTRIBUTE_UNUSED,
-		struct timespec *ts ATTRIBUTE_UNUSED)
-{
-  errno = EINVAL;
-  return -1;
-}
-
-#define clockid_t xclockid_t
-#define clock_gettime xclock_gettime
-#undef CLOCK_REALTIME
-#define CLOCK_REALTIME 0
-
-#endif /* !defined(HAVE_CLOCK_GETTIME) */
-
-#ifdef CLOCK_PROCESS_CPUTIME_ID
-#define ZLIB_CLOCK_GETTIME_ARG CLOCK_PROCESS_CPUTIME_ID
-#else
-#define ZLIB_CLOCK_GETTIME_ARG CLOCK_REALTIME
-#endif
-
-/* Some tests for the local zlib inflation code.  */
-
-struct zlib_test
-{
-  const char *name;
-  const char *uncompressed;
-  size_t uncompressed_len;
-  const char *compressed;
-  size_t compressed_len;
-};
-
-/* Error callback.  */
-
-static void
-error_callback_compress (void *vdata, const char *msg, int errnum)
-{
-  fprintf (stderr, "%s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fprintf (stderr, "\n");
-  exit (EXIT_FAILURE);
-}
-
-static const struct zlib_test tests[] =
-{
-  {
-    "empty",
-    "",
-    0,
-    "\x78\x9c\x03\x00\x00\x00\x00\x01",
-    8,
-  },
-  {
-    "hello",
-    "hello, world\n",
-    0,
-    ("\x78\x9c\xca\x48\xcd\xc9\xc9\xd7\x51\x28\xcf"
-     "\x2f\xca\x49\xe1\x02\x04\x00\x00\xff\xff\x21\xe7\x04\x93"),
-    25,
-  },
-  {
-    "goodbye",
-    "goodbye, world",
-    0,
-    ("\x78\x9c\x4b\xcf\xcf\x4f\x49\xaa"
-     "\x4c\xd5\x51\x28\xcf\x2f\xca\x49"
-     "\x01\x00\x28\xa5\x05\x5e"),
-    22,
-  },
-  {
-    "ranges",
-    ("\xcc\x11\x00\x00\x00\x00\x00\x00\xd5\x13\x00\x00\x00\x00\x00\x00"
-     "\x1c\x14\x00\x00\x00\x00\x00\x00\x72\x14\x00\x00\x00\x00\x00\x00"
-     "\x9d\x14\x00\x00\x00\x00\x00\x00\xd5\x14\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\xfb\x12\x00\x00\x00\x00\x00\x00\x09\x13\x00\x00\x00\x00\x00\x00"
-     "\x0c\x13\x00\x00\x00\x00\x00\x00\xcb\x13\x00\x00\x00\x00\x00\x00"
-     "\x29\x14\x00\x00\x00\x00\x00\x00\x4e\x14\x00\x00\x00\x00\x00\x00"
-     "\x9d\x14\x00\x00\x00\x00\x00\x00\xd5\x14\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\xfb\x12\x00\x00\x00\x00\x00\x00\x09\x13\x00\x00\x00\x00\x00\x00"
-     "\x67\x13\x00\x00\x00\x00\x00\x00\xcb\x13\x00\x00\x00\x00\x00\x00"
-     "\x9d\x14\x00\x00\x00\x00\x00\x00\xd5\x14\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\x5f\x0b\x00\x00\x00\x00\x00\x00\x6c\x0b\x00\x00\x00\x00\x00\x00"
-     "\x7d\x0b\x00\x00\x00\x00\x00\x00\x7e\x0c\x00\x00\x00\x00\x00\x00"
-     "\x38\x0f\x00\x00\x00\x00\x00\x00\x5c\x0f\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\x83\x0c\x00\x00\x00\x00\x00\x00\xfa\x0c\x00\x00\x00\x00\x00\x00"
-     "\xfd\x0d\x00\x00\x00\x00\x00\x00\xef\x0e\x00\x00\x00\x00\x00\x00"
-     "\x14\x0f\x00\x00\x00\x00\x00\x00\x38\x0f\x00\x00\x00\x00\x00\x00"
-     "\x9f\x0f\x00\x00\x00\x00\x00\x00\xac\x0f\x00\x00\x00\x00\x00\x00"
-     "\xdb\x0f\x00\x00\x00\x00\x00\x00\xff\x0f\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\xfd\x0d\x00\x00\x00\x00\x00\x00\xd8\x0e\x00\x00\x00\x00\x00\x00"
-     "\x9f\x0f\x00\x00\x00\x00\x00\x00\xac\x0f\x00\x00\x00\x00\x00\x00"
-     "\xdb\x0f\x00\x00\x00\x00\x00\x00\xff\x0f\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\xfa\x0c\x00\x00\x00\x00\x00\x00\xea\x0d\x00\x00\x00\x00\x00\x00"
-     "\xef\x0e\x00\x00\x00\x00\x00\x00\x14\x0f\x00\x00\x00\x00\x00\x00"
-     "\x5c\x0f\x00\x00\x00\x00\x00\x00\x9f\x0f\x00\x00\x00\x00\x00\x00"
-     "\xac\x0f\x00\x00\x00\x00\x00\x00\xdb\x0f\x00\x00\x00\x00\x00\x00"
-     "\xff\x0f\x00\x00\x00\x00\x00\x00\x2c\x10\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\x60\x11\x00\x00\x00\x00\x00\x00\xd1\x16\x00\x00\x00\x00\x00\x00"
-     "\x40\x0b\x00\x00\x00\x00\x00\x00\x2c\x10\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\x7a\x00\x00\x00\x00\x00\x00\x00\xb6\x00\x00\x00\x00\x00\x00\x00"
-     "\x9f\x01\x00\x00\x00\x00\x00\x00\xa7\x01\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-     "\x7a\x00\x00\x00\x00\x00\x00\x00\xa9\x00\x00\x00\x00\x00\x00\x00"
-     "\x9f\x01\x00\x00\x00\x00\x00\x00\xa7\x01\x00\x00\x00\x00\x00\x00"
-     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
-    672,
-    ("\x78\x9c\x3b\x23\xc8\x00\x06\x57\x85\x21\xb4\x8c\x08\x84\x2e\x82"
-     "\xd2\x73\xa1\xf4\x55\x28\x8d\x0e\x7e\x0b\x41\x68\x4e\xa8\x7e\x1e"
-     "\x28\x7d\x1a\x4a\x6b\x42\xf5\xf9\x91\x69\x5e\x3a\x9a\x79\x84\xf4"
-     "\xc7\x73\x43\xe8\x1c\x28\x5d\x0b\xa5\xeb\x78\x20\xb4\x05\x3f\x84"
-     "\x8e\xe1\xc7\xae\xbf\x19\xaa\xee\x17\x94\xfe\xcb\x0b\xa1\xdf\xf3"
-     "\x41\x68\x11\x7e\x54\x73\xe6\x43\xe9\x35\x50\xfa\x36\x94\xfe\x8f"
-     "\xc3\x7c\x98\x79\x37\xf8\xc8\xd3\x0f\x73\xd7\x2b\x1c\xee\x8a\x21"
-     "\xd2\x5d\x3a\x02\xd8\xcd\x4f\x80\xa6\x87\x8b\x62\x10\xda\x81\x1b"
-     "\xbf\xfa\x2a\x28\xbd\x0d\x4a\xcf\x67\x84\xd0\xcb\x19\xf1\xab\x5f"
-     "\x49\xa4\x7a\x00\x48\x97\x29\xd4"),
-    152,
-  }
-};
-
-/* Test the hand coded samples.  */
-
-static void
-test_samples (struct backtrace_state *state)
-{
-  size_t i;
-
-  for (i = 0; i < sizeof tests / sizeof tests[0]; ++i)
-    {
-      char *p;
-      size_t v;
-      size_t j;
-      unsigned char *uncompressed;
-      size_t uncompressed_len;
-
-      p = malloc (12 + tests[i].compressed_len);
-      memcpy (p, "ZLIB", 4);
-      v = tests[i].uncompressed_len;
-      if (v == 0)
-	v = strlen (tests[i].uncompressed);
-      for (j = 0; j < 8; ++j)
-	p[j + 4] = (v >> ((7 - j) * 8)) & 0xff;
-      memcpy (p + 12, tests[i].compressed, tests[i].compressed_len);
-      uncompressed = NULL;
-      uncompressed_len = 0;
-      if (!backtrace_uncompress_zdebug (state, (unsigned char *) p,
-					tests[i].compressed_len + 12,
-					error_callback_compress, NULL,
-					&uncompressed, &uncompressed_len))
-	{
-	  fprintf (stderr, "test %s: uncompress failed\n", tests[i].name);
-	  ++failures;
-	}
-      else
-	{
-	  if (uncompressed_len != v)
-	    {
-	      fprintf (stderr,
-		       "test %s: got uncompressed length %zu, want %zu\n",
-		       tests[i].name, uncompressed_len, v);
-	      ++failures;
-	    }
-	  else if (memcmp (tests[i].uncompressed, uncompressed, v) != 0)
-	    {
-	      size_t j;
-
-	      fprintf (stderr, "test %s: uncompressed data mismatch\n",
-		       tests[i].name);
-	      for (j = 0; j < v; ++j)
-		if (tests[i].uncompressed[j] != uncompressed[j])
-		  fprintf (stderr, "  %zu: got %#x want %#x\n", j,
-			   uncompressed[j], tests[i].uncompressed[j]);
-	      ++failures;
-	    }
-	  else
-	    printf ("PASS: inflate %s\n", tests[i].name);
-
-	  backtrace_free (state, uncompressed, uncompressed_len,
-			  error_callback_compress, NULL);
-	}
-    }
-}
-
-#ifdef HAVE_ZLIB
-
-/* Given a set of TRIALS timings, discard the lowest and highest
-   values and return the mean average of the rest.  */
-
-static size_t
-average_time (const size_t *times, size_t trials)
-{
-  size_t imax;
-  size_t max;
-  size_t imin;
-  size_t min;
-  size_t i;
-  size_t sum;
-
-  imin = 0;
-  imax = 0;
-  min = times[0];
-  max = times[0];
-  for (i = 1; i < trials; ++i)
-    {
-      if (times[i] < min)
-	{
-	  imin = i;
-	  min = times[i];
-	}
-      if (times[i] > max)
-	{
-	  imax = i;
-	  max = times[i];
-	}
-    }
-
-  sum = 0;
-  for (i = 0; i < trials; ++i)
-    {
-      if (i != imax && i != imin)
-	sum += times[i];
-    }
-  return sum / (trials - 2);
-}
-
-#endif
-
-/* Test a larger text, if available.  */
-
-static void
-test_large (struct backtrace_state *state)
-{
-#ifdef HAVE_ZLIB
-  unsigned char *orig_buf;
-  size_t orig_bufsize;
-  size_t i;
-  char *compressed_buf;
-  size_t compressed_bufsize;
-  unsigned long compress_sizearg;
-  unsigned char *uncompressed_buf;
-  size_t uncompressed_bufsize;
-  int r;
-  clockid_t cid;
-  struct timespec ts1;
-  struct timespec ts2;
-  size_t ctime;
-  size_t ztime;
-  const size_t trials = 16;
-  size_t ctimes[16];
-  size_t ztimes[16];
-  static const char * const names[] = {
-    "Mark.Twain-Tom.Sawyer.txt",
-    "../libgo/go/compress/testdata/Mark.Twain-Tom.Sawyer.txt"
-  };
-
-  orig_buf = NULL;
-  orig_bufsize = 0;
-  uncompressed_buf = NULL;
-  compressed_buf = NULL;
-
-  for (i = 0; i < sizeof names / sizeof names[0]; ++i)
-    {
-      size_t len;
-      char *namebuf;
-      FILE *e;
-      struct stat st;
-      char *rbuf;
-      size_t got;
-
-      len = strlen (SRCDIR) + strlen (names[i]) + 2;
-      namebuf = malloc (len);
-      if (namebuf == NULL)
-	{
-	  perror ("malloc");
-	  goto fail;
-	}
-      snprintf (namebuf, len, "%s/%s", SRCDIR, names[i]);
-      e = fopen (namebuf, "r");
-      free (namebuf);
-      if (e == NULL)
-	continue;
-      if (fstat (fileno (e), &st) < 0)
-	{
-	  perror ("fstat");
-	  fclose (e);
-	  continue;
-	}
-      rbuf = malloc (st.st_size);
-      if (rbuf == NULL)
-	{
-	  perror ("malloc");
-	  goto fail;
-	}
-      got = fread (rbuf, 1, st.st_size, e);
-      fclose (e);
-      if (got > 0)
-	{
-	  orig_buf = rbuf;
-	  orig_bufsize = got;
-	  break;
-	}
-      free (rbuf);
-    }
-
-  if (orig_buf == NULL)
-    {
-      /* We couldn't find an input file.  */
-      printf ("UNSUPPORTED: inflate large\n");
-      return;
-    }
-
-  compressed_bufsize = compressBound (orig_bufsize) + 12;
-  compressed_buf = malloc (compressed_bufsize);
-  if (compressed_buf == NULL)
-    {
-      perror ("malloc");
-      goto fail;
-    }
-
-  compress_sizearg = compressed_bufsize - 12;
-  r = compress (compressed_buf + 12, &compress_sizearg,
-		orig_buf, orig_bufsize);
-  if (r != Z_OK)
-    {
-      fprintf (stderr, "zlib compress failed: %d\n", r);
-      goto fail;
-    }
-
-  compressed_bufsize = compress_sizearg + 12;
-
-  /* Prepare the header that our library expects.  */
-  memcpy (compressed_buf, "ZLIB", 4);
-  for (i = 0; i < 8; ++i)
-    compressed_buf[i + 4] = (orig_bufsize >> ((7 - i) * 8)) & 0xff;
-
-  uncompressed_buf = malloc (orig_bufsize);
-  if (uncompressed_buf == NULL)
-    {
-      perror ("malloc");
-      goto fail;
-    }
-  uncompressed_bufsize = orig_bufsize;
-
-  if (!backtrace_uncompress_zdebug (state, compressed_buf, compressed_bufsize,
-				    error_callback_compress, NULL,
-				    &uncompressed_buf, &uncompressed_bufsize))
-    {
-      fprintf (stderr, "inflate large: backtrace_uncompress_zdebug failed\n");
-      goto fail;
-    }
-
-  if (uncompressed_bufsize != orig_bufsize)
-    {
-      fprintf (stderr,
-	       "inflate large: got uncompressed length %zu, want %zu\n",
-	       uncompressed_bufsize, orig_bufsize);
-      goto fail;
-    }
-
-  if (memcmp (uncompressed_buf, orig_buf, uncompressed_bufsize) != 0)
-    {
-      fprintf (stderr, "inflate large: uncompressed data mismatch\n");
-      goto fail;
-    }
-
-  printf ("PASS: inflate large\n");
-
-  for (i = 0; i < trials; ++i)
-    {
-      unsigned long uncompress_sizearg;
-
-      cid = ZLIB_CLOCK_GETTIME_ARG;
-      if (clock_gettime (cid, &ts1) < 0)
-	{
-	  if (errno == EINVAL)
-	    return;
-	  perror ("clock_gettime");
-	  return;
-	}
-
-      if (!backtrace_uncompress_zdebug (state, compressed_buf,
-					compressed_bufsize,
-					error_callback_compress, NULL,
-					&uncompressed_buf,
-					&uncompressed_bufsize))
-	{
-	  fprintf (stderr,
-		   ("inflate large: "
-		    "benchmark backtrace_uncompress_zdebug failed\n"));
-	  return;
-	}
-
-      if (clock_gettime (cid, &ts2) < 0)
-	{
-	  perror ("clock_gettime");
-	  return;
-	}
-
-      ctime = (ts2.tv_sec - ts1.tv_sec) * 1000000000;
-      ctime += ts2.tv_nsec - ts1.tv_nsec;
-      ctimes[i] = ctime;
-
-      if (clock_gettime (cid, &ts1) < 0)
-	{
-	  perror("clock_gettime");
-	  return;
-	}
-
-      uncompress_sizearg = uncompressed_bufsize;
-      r = uncompress (uncompressed_buf, &uncompress_sizearg,
-		      compressed_buf + 12, compressed_bufsize - 12);
-
-      if (clock_gettime (cid, &ts2) < 0)
-	{
-	  perror ("clock_gettime");
-	  return;
-	}
-
-      if (r != Z_OK)
-	{
-	  fprintf (stderr,
-		   "inflate large: benchmark zlib uncompress failed: %d\n",
-		   r);
-	  return;
-	}
-
-      ztime = (ts2.tv_sec - ts1.tv_sec) * 1000000000;
-      ztime += ts2.tv_nsec - ts1.tv_nsec;
-      ztimes[i] = ztime;
-    }
-
-  /* Toss the highest and lowest times and average the rest.  */
-  ctime = average_time (ctimes, trials);
-  ztime = average_time (ztimes, trials);
-
-  printf ("backtrace: %zu ns\n", ctime);
-  printf ("zlib     : %zu ns\n", ztime);
-  printf ("ratio    : %g\n", (double) ztime / (double) ctime);
-
-  return;
-
- fail:
-  printf ("FAIL: inflate large\n");
-  ++failures;
-
-  if (orig_buf != NULL)
-    free (orig_buf);
-  if (compressed_buf != NULL)
-    free (compressed_buf);
-  if (uncompressed_buf != NULL)
-    free (uncompressed_buf);
-
-#else /* !HAVE_ZLIB */
-
- printf ("UNSUPPORTED: inflate large\n");
-
-#endif /* !HAVE_ZLIB */
-}
-
-int
-main (int argc ATTRIBUTE_UNUSED, char **argv)
-{
-  struct backtrace_state *state;
-
-  state = backtrace_create_state (argv[0], BACKTRACE_SUPPORTS_THREADS,
-				  error_callback_create, NULL);
-
-  test_samples (state);
-  test_large (state);
-
-  exit (failures != 0 ? EXIT_FAILURE : EXIT_SUCCESS);
-}
diff -Nru cargo-0.32.0/vendor/backtrace-sys/src/lib.rs cargo-0.33.0/vendor/backtrace-sys/src/lib.rs
--- cargo-0.32.0/vendor/backtrace-sys/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,44 +1,52 @@
 #![allow(bad_style)]
+#![no_std]
 
 extern crate libc;
 
-use libc::uintptr_t;
-use std::os::raw::{c_void, c_char, c_int};
+#[cfg(not(empty))]
+pub use self::bindings::*;
+#[cfg(not(empty))]
+mod bindings {
+    use libc::{c_void, c_char, c_int, uintptr_t};
 
-pub type backtrace_syminfo_callback =
-    extern fn(data: *mut c_void,
-              pc: uintptr_t,
-              symname: *const c_char,
-              symval: uintptr_t,
-              symsize: uintptr_t);
-pub type backtrace_full_callback =
-    extern fn(data: *mut c_void,
-              pc: uintptr_t,
-              filename: *const c_char,
-              lineno: c_int,
-              function: *const c_char) -> c_int;
-pub type backtrace_error_callback =
-    extern fn(data: *mut c_void,
-              msg: *const c_char,
-              errnum: c_int);
-pub enum backtrace_state {}
+    pub type backtrace_syminfo_callback =
+        extern fn(data: *mut c_void,
+                  pc: uintptr_t,
+                  symname: *const c_char,
+                  symval: uintptr_t,
+                  symsize: uintptr_t);
+    pub type backtrace_full_callback =
+        extern fn(data: *mut c_void,
+                  pc: uintptr_t,
+                  filename: *const c_char,
+                  lineno: c_int,
+                  function: *const c_char) -> c_int;
+    pub type backtrace_error_callback =
+        extern fn(data: *mut c_void,
+                  msg: *const c_char,
+                  errnum: c_int);
+    pub enum backtrace_state {}
 
-extern {
-    #[link_name = "__rbt_backtrace_create_state"]
-    pub fn backtrace_create_state(filename: *const c_char,
-                                  threaded: c_int,
-                                  error: backtrace_error_callback,
-                                  data: *mut c_void) -> *mut backtrace_state;
-    #[link_name = "__rbt_backtrace_syminfo"]
-    pub fn backtrace_syminfo(state: *mut backtrace_state,
-                             addr: uintptr_t,
-                             cb: backtrace_syminfo_callback,
-                             error: backtrace_error_callback,
-                             data: *mut c_void) -> c_int;
-    #[link_name = "__rbt_backtrace_pcinfo"]
-    pub fn backtrace_pcinfo(state: *mut backtrace_state,
-                            addr: uintptr_t,
-                            cb: backtrace_full_callback,
-                            error: backtrace_error_callback,
-                            data: *mut c_void) -> c_int;
+    extern "C" {
+        #[cfg_attr(rdos, link_name = "__rdos_backtrace_create_state")]
+        #[cfg_attr(rbt, link_name = "__rbt_backtrace_create_state")]
+        pub fn backtrace_create_state(filename: *const c_char,
+                                      threaded: c_int,
+                                      error: backtrace_error_callback,
+                                      data: *mut c_void) -> *mut backtrace_state;
+        #[cfg_attr(rdos, link_name = "__rdos_backtrace_syminfo")]
+        #[cfg_attr(rbt, link_name = "__rbt_backtrace_syminfo")]
+        pub fn backtrace_syminfo(state: *mut backtrace_state,
+                                 addr: uintptr_t,
+                                 cb: backtrace_syminfo_callback,
+                                 error: backtrace_error_callback,
+                                 data: *mut c_void) -> c_int;
+        #[cfg_attr(rdos, link_name = "__rdos_backtrace_pcinfo")]
+        #[cfg_attr(rbt, link_name = "__rbt_backtrace_pcinfo")]
+        pub fn backtrace_pcinfo(state: *mut backtrace_state,
+                                addr: uintptr_t,
+                                cb: backtrace_full_callback,
+                                error: backtrace_error_callback,
+                                data: *mut c_void) -> c_int;
+    }
 }
diff -Nru cargo-0.32.0/vendor/backtrace-sys/symbol-map cargo-0.33.0/vendor/backtrace-sys/symbol-map
--- cargo-0.32.0/vendor/backtrace-sys/symbol-map	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/backtrace-sys/symbol-map	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-backtrace_full __rbt_backtrace_full
-backtrace_dwarf_add __rbt_backtrace_dwarf_add
-backtrace_initialize __rbt_backtrace_initialize
-backtrace_pcinfo __rbt_backtrace_pcinfo
-backtrace_syminfo __rbt_backtrace_syminfo
-backtrace_get_view __rbt_backtrace_get_view
-backtrace_release_view __rbt_backtrace_release_view
-backtrace_alloc __rbt_backtrace_alloc
-backtrace_free __rbt_backtrace_free
-backtrace_vector_finish __rbt_backtrace_vector_finish
-backtrace_vector_grow __rbt_backtrace_vector_grow
-backtrace_vector_release __rbt_backtrace_vector_release
-backtrace_close __rbt_backtrace_close
-backtrace_open __rbt_backtrace_open
-backtrace_print __rbt_backtrace_print
-backtrace_simple __rbt_backtrace_simple
-backtrace_qsort __rbt_backtrace_qsort
-backtrace_create_state __rbt_backtrace_create_state
-backtrace_uncompress_zdebug __rbt_backtrace_uncompress_zdebug
diff -Nru cargo-0.32.0/vendor/bit-set/.travis.yml cargo-0.33.0/vendor/bit-set/.travis.yml
--- cargo-0.32.0/vendor/bit-set/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/bit-set/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-language: rust
-sudo: false
-matrix:
-  include:
-    - rust: stable
-    - rust: nightly
-      env: FEATURES="--features nightly"
-script:
-    - cargo build $FEATURES
-    - cargo test $FEATURES
-    - cargo doc --no-deps
-after_success: |
-    [ "$TRAVIS_RUST_VERSION" = nightly ] &&
-    [ "$TRAVIS_BRANCH" = master ] &&
-    [ "$TRAVIS_PULL_REQUEST" = false ] &&
-    bash deploy-docs.sh
-notifications:
-    webhooks: http://huon.me:54857/travis
diff -Nru cargo-0.32.0/vendor/bit-vec/.travis.yml cargo-0.33.0/vendor/bit-vec/.travis.yml
--- cargo-0.32.0/vendor/bit-vec/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/bit-vec/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-language: rust
-sudo: false
-matrix:
-  include:
-    - rust: stable
-    - rust: nightly
-      env: FEATURES="--features nightly"
-script:
-    - cargo build $FEATURES
-    - cargo test $FEATURES
-    - cargo doc --no-deps
-    - bash crusader.sh
-after_success: |
-    [ "$TRAVIS_RUST_VERSION" = nightly ] &&
-    [ "$TRAVIS_BRANCH" = master ] &&
-    [ "$TRAVIS_PULL_REQUEST" = false ] &&
-    bash deploy-docs.sh
-notifications:
-    webhooks: http://huon.me:54857/travis
diff -Nru cargo-0.32.0/vendor/bufstream/.travis.yml cargo-0.33.0/vendor/bufstream/.travis.yml
--- cargo-0.32.0/vendor/bufstream/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/bufstream/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo test --verbose --features tokio
-  - cargo doc --no-deps
-after_success:
-  - travis-cargo --only nightly doc-upload
-env:
-  global:
-    secure: "G857gdm63OJ2wcwdEBBeY+53D/zRSSmPfAp/H+8vRy5nnB+4GBq5Xqugq9n4BrvJMoPLMMMAmB46Chk7HHkkk/e4WTQ2orX61c4nNF3b4rdik6fzwVKk4Gy06FlM63cEa9/1iN2BiOg6NA81cmrUrK1ezIdg+8YECsiVu9+7m2g="
-
-
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/byteorder/benches/bench.rs cargo-0.33.0/vendor/byteorder/benches/bench.rs
--- cargo-0.32.0/vendor/byteorder/benches/bench.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/benches/bench.rs	2019-02-06 04:11:58.000000000 +0000
@@ -148,108 +148,108 @@
 bench_num!(int_7, read_int, 7, [1, 2, 3, 4, 5, 6, 7]);
 bench_num!(int_8, read_int, 8, [1, 2, 3, 4, 5, 6, 7, 8]);
 
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(u128, MAX, read_u128, write_u128,
     16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(i128, MAX, read_i128, write_i128,
     16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
 
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_1, read_uint128,
     1, [1]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_2, read_uint128,
     2, [1, 2]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_3, read_uint128,
     3, [1, 2, 3]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_4, read_uint128,
     4, [1, 2, 3, 4]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_5, read_uint128,
     5, [1, 2, 3, 4, 5]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_6, read_uint128,
     6, [1, 2, 3, 4, 5, 6]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_7, read_uint128,
     7, [1, 2, 3, 4, 5, 6, 7]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_8, read_uint128,
     8, [1, 2, 3, 4, 5, 6, 7, 8]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_9, read_uint128,
     9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_10, read_uint128,
     10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_11, read_uint128,
     11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_12, read_uint128,
     12, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_13, read_uint128,
     13, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_14, read_uint128,
     14, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_15, read_uint128,
     15, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(uint128_16, read_uint128,
     16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
 
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_1, read_int128,
     1, [1]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_2, read_int128,
     2, [1, 2]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_3, read_int128,
     3, [1, 2, 3]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_4, read_int128,
     4, [1, 2, 3, 4]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_5, read_int128,
     5, [1, 2, 3, 4, 5]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_6, read_int128,
     6, [1, 2, 3, 4, 5, 6]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_7, read_int128,
     7, [1, 2, 3, 4, 5, 6, 7]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_8, read_int128,
     8, [1, 2, 3, 4, 5, 6, 7, 8]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_9, read_int128,
     9, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_10, read_int128,
     10, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_11, read_int128,
     11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_12, read_int128,
     12, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_13, read_int128,
     13, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_14, read_int128,
     14, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_15, read_int128,
     15, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 bench_num!(int128_16, read_int128,
     16, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
 
diff -Nru cargo-0.32.0/vendor/byteorder/build.rs cargo-0.33.0/vendor/byteorder/build.rs
--- cargo-0.32.0/vendor/byteorder/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,87 @@
+use std::env;
+use std::ffi::OsString;
+use std::io::{self, Write};
+use std::process::Command;
+
+fn main() {
+    let version = match Version::read() {
+        Ok(version) => version,
+        Err(err) => {
+            writeln!(
+                &mut io::stderr(),
+                "failed to parse `rustc --version`: {}",
+                err
+            ).unwrap();
+            return;
+        }
+    };
+    enable_i128(version);
+}
+
+fn enable_i128(version: Version) {
+    if version < (Version { major: 1, minor: 26, patch: 0 }) {
+        return;
+    }
+
+    println!("cargo:rustc-cfg=byteorder_i128");
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
+struct Version {
+    major: u32,
+    minor: u32,
+    patch: u32,
+}
+
+impl Version {
+    fn read() -> Result<Version, String> {
+        let rustc = env::var_os("RUSTC").unwrap_or(OsString::from("rustc"));
+        let output = Command::new(&rustc)
+            .arg("--version")
+            .output()
+            .unwrap()
+            .stdout;
+        Version::parse(&String::from_utf8(output).unwrap())
+    }
+
+    fn parse(mut s: &str) -> Result<Version, String> {
+        if !s.starts_with("rustc ") {
+            return Err(format!("unrecognized version string: {}", s));
+        }
+        s = &s["rustc ".len()..];
+
+        let parts: Vec<&str> = s.split(".").collect();
+        if parts.len() < 3 {
+            return Err(format!("not enough version parts: {:?}", parts));
+        }
+
+        let mut num = String::new();
+        for c in parts[0].chars() {
+            if !c.is_digit(10) {
+                break;
+            }
+            num.push(c);
+        }
+        let major = try!(num.parse::<u32>().map_err(|e| e.to_string()));
+
+        num.clear();
+        for c in parts[1].chars() {
+            if !c.is_digit(10) {
+                break;
+            }
+            num.push(c);
+        }
+        let minor = try!(num.parse::<u32>().map_err(|e| e.to_string()));
+
+        num.clear();
+        for c in parts[2].chars() {
+            if !c.is_digit(10) {
+                break;
+            }
+            num.push(c);
+        }
+        let patch = try!(num.parse::<u32>().map_err(|e| e.to_string()));
+
+        Ok(Version { major: major, minor: minor, patch: patch })
+    }
+}
diff -Nru cargo-0.32.0/vendor/byteorder/.cargo-checksum.json cargo-0.33.0/vendor/byteorder/.cargo-checksum.json
--- cargo-0.32.0/vendor/byteorder/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"}
\ No newline at end of file
+{"files":{},"package":"a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/byteorder/Cargo.toml cargo-0.33.0/vendor/byteorder/Cargo.toml
--- cargo-0.32.0/vendor/byteorder/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,8 +12,9 @@
 
 [package]
 name = "byteorder"
-version = "1.2.7"
+version = "1.3.1"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
+build = "build.rs"
 exclude = ["/ci/*"]
 description = "Library for reading/writing numbers in big-endian and little-endian."
 homepage = "https://github.com/BurntSushi/byteorder"
@@ -30,11 +31,11 @@
 name = "byteorder"
 bench = false
 [dev-dependencies.quickcheck]
-version = "0.7"
+version = "0.8"
 default-features = false
 
 [dev-dependencies.rand]
-version = "0.5"
+version = "0.6"
 
 [features]
 default = ["std"]
diff -Nru cargo-0.32.0/vendor/byteorder/.cargo_vcs_info.json cargo-0.33.0/vendor/byteorder/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/byteorder/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "bdcc6bf676a1ed17eae68257bfa4726a1f0ec068"
-  }
-}
diff -Nru cargo-0.32.0/vendor/byteorder/CHANGELOG.md cargo-0.33.0/vendor/byteorder/CHANGELOG.md
--- cargo-0.32.0/vendor/byteorder/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,46 @@
+1.3.0
+=====
+This new minor release now enables `i128` support automatically on Rust
+compilers that support 128-bit integers. The `i128` feature is now a no-op, but
+continues to exist for backward compatibility purposes. The crate continues to
+maintain compatibility with Rust 1.12.0.
+
+This release also deprecates the `ByteOrder` trait methods
+`read_f32_into_unchecked` and `read_f64_into_unchecked` in favor of
+`read_f32_into` and `read_f64_into`. This was an oversight from the 1.2 release
+where the corresponding methods on `ReadBytesExt` were deprecated.
+
+`quickcheck` and `rand` were bumped to `0.8` and `0.6`, respectively.
+
+A few small documentation related bugs have been fixed.
+
+
+1.2.7
+=====
+This patch release excludes some CI files from the crate release and updates
+the license field to use `OR` instead of `/`.
+
+
+1.2.6
+=====
+This patch release fixes some test compilation errors introduced by an
+over-eager release of 1.2.5.
+
+
+1.2.5
+=====
+This patch release fixes some typos in the docs, adds doc tests to methods on
+`WriteByteExt` and bumps the quickcheck dependency to `0.7`.
+
+
+1.2.4
+=====
+This patch release adds support for 48-bit integers by adding the following
+methods to the `ByteOrder` trait: `read_u48`, `read_i48`, `write_u48` and
+`write_i48`. Corresponding methods have been added to the `ReadBytesExt` and
+`WriteBytesExt` traits as well.
+
+
 1.2.3
 =====
 This patch release removes the use of `feature(i128_type)` from byteorder,
diff -Nru cargo-0.32.0/vendor/byteorder/src/io.rs cargo-0.33.0/vendor/byteorder/src/io.rs
--- cargo-0.32.0/vendor/byteorder/src/io.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/src/io.rs	2019-02-06 04:11:58.000000000 +0000
@@ -370,7 +370,7 @@
     /// ]);
     /// assert_eq!(16947640962301618749969007319746179, rdr.read_u128::<BigEndian>().unwrap());
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128<T: ByteOrder>(&mut self) -> Result<u128> {
         let mut buf = [0; 16];
@@ -391,14 +391,13 @@
     /// Read a signed 128 bit big-endian integer from a `Read`:
     ///
     /// ```rust
-    /// #![feature(i128_type)]
     /// use std::io::Cursor;
     /// use byteorder::{BigEndian, ReadBytesExt};
     ///
     /// let mut rdr = Cursor::new(vec![0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
     /// assert_eq!(i128::min_value(), rdr.read_i128::<BigEndian>().unwrap());
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128<T: ByteOrder>(&mut self) -> Result<i128> {
         let mut buf = [0; 16];
@@ -457,7 +456,7 @@
     }
 
     /// Reads an unsigned n-bytes integer from the underlying reader.
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_uint128<T: ByteOrder>(&mut self, nbytes: usize) -> Result<u128> {
         let mut buf = [0; 16];
@@ -466,7 +465,7 @@
     }
 
     /// Reads a signed n-bytes integer from the underlying reader.
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_int128<T: ByteOrder>(&mut self, nbytes: usize) -> Result<i128> {
         let mut buf = [0; 16];
@@ -672,7 +671,7 @@
     /// rdr.read_u128_into::<BigEndian>(&mut dst).unwrap();
     /// assert_eq!([517, 768], dst);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128_into<T: ByteOrder>(
         &mut self,
@@ -822,7 +821,7 @@
     /// rdr.read_i128_into::<BigEndian>(&mut dst).unwrap();
     /// assert_eq!([517, 768], dst);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128_into<T: ByteOrder>(
         &mut self,
@@ -1373,7 +1372,7 @@
     }
 
     /// Writes an unsigned 128 bit integer to the underlying writer.
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128<T: ByteOrder>(&mut self, n: u128) -> Result<()> {
         let mut buf = [0; 16];
@@ -1382,7 +1381,7 @@
     }
 
     /// Writes a signed 128 bit integer to the underlying writer.
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_i128<T: ByteOrder>(&mut self, n: i128) -> Result<()> {
         let mut buf = [0; 16];
@@ -1466,7 +1465,7 @@
     ///
     /// If the given integer is not representable in the given number of bytes,
     /// this method panics. If `nbytes > 16`, this method panics.
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_uint128<T: ByteOrder>(
         &mut self,
@@ -1482,7 +1481,7 @@
     ///
     /// If the given integer is not representable in the given number of bytes,
     /// this method panics. If `nbytes > 16`, this method panics.
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_int128<T: ByteOrder>(
         &mut self,
diff -Nru cargo-0.32.0/vendor/byteorder/src/lib.rs cargo-0.33.0/vendor/byteorder/src/lib.rs
--- cargo-0.32.0/vendor/byteorder/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -84,7 +84,7 @@
     (val << shift) as i64 >> shift
 }
 
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 #[inline]
 fn extend_sign128(val: u128, nbytes: usize) -> i128 {
     let shift = (16 - nbytes) * 8;
@@ -97,7 +97,7 @@
     (val << shift) as u64 >> shift
 }
 
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 #[inline]
 fn unextend_sign128(val: i128, nbytes: usize) -> u128 {
     let shift = (16 - nbytes) * 8;
@@ -125,7 +125,7 @@
     }
 }
 
-#[cfg(feature = "i128")]
+#[cfg(byteorder_i128)]
 #[inline]
 fn pack_size128(n: u128) -> usize {
     if n < 1 << 8 {
@@ -314,7 +314,7 @@
     /// LittleEndian::write_u128(&mut buf, 1_000_000);
     /// assert_eq!(1_000_000, LittleEndian::read_u128(&buf));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn read_u128(buf: &[u8]) -> u128;
 
     /// Reads an unsigned n-bytes integer from `buf`.
@@ -355,7 +355,7 @@
     /// LittleEndian::write_uint128(&mut buf, 1_000_000, 3);
     /// assert_eq!(1_000_000, LittleEndian::read_uint128(&buf, 3));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn read_uint128(buf: &[u8], nbytes: usize) -> u128;
 
     /// Writes an unsigned 16 bit integer `n` to `buf`.
@@ -474,7 +474,7 @@
     /// LittleEndian::write_u128(&mut buf, 1_000_000);
     /// assert_eq!(1_000_000, LittleEndian::read_u128(&buf));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn write_u128(buf: &mut [u8], n: u128);
 
     /// Writes an unsigned integer `n` to `buf` using only `nbytes`.
@@ -515,7 +515,7 @@
     /// LittleEndian::write_uint128(&mut buf, 1_000_000, 3);
     /// assert_eq!(1_000_000, LittleEndian::read_uint128(&buf, 3));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize);
 
     /// Reads a signed 16 bit integer from `buf`.
@@ -645,7 +645,7 @@
     /// LittleEndian::write_i128(&mut buf, -1_000_000_000);
     /// assert_eq!(-1_000_000_000, LittleEndian::read_i128(&buf));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128(buf: &[u8]) -> i128 {
         Self::read_u128(buf) as i128
@@ -692,7 +692,7 @@
     /// LittleEndian::write_int128(&mut buf, -1_000, 3);
     /// assert_eq!(-1_000, LittleEndian::read_int128(&buf, 3));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_int128(buf: &[u8], nbytes: usize) -> i128 {
         extend_sign128(Self::read_uint128(buf, nbytes), nbytes)
@@ -871,7 +871,7 @@
     /// LittleEndian::write_i128(&mut buf, -1_000_000_000);
     /// assert_eq!(-1_000_000_000, LittleEndian::read_i128(&buf));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_i128(buf: &mut [u8], n: i128) {
         Self::write_u128(buf, n as u128)
@@ -918,7 +918,7 @@
     /// LittleEndian::write_int128(&mut buf, -1_000, 3);
     /// assert_eq!(-1_000, LittleEndian::read_int128(&buf, 3));
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_int128(buf: &mut [u8], n: i128, nbytes: usize) {
         Self::write_uint128(buf, unextend_sign128(n, nbytes), nbytes)
@@ -1062,7 +1062,7 @@
     /// LittleEndian::read_u128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn read_u128_into(src: &[u8], dst: &mut [u128]);
 
     /// Reads signed 16 bit integers from `src` to `dst`.
@@ -1173,7 +1173,7 @@
     /// LittleEndian::read_i128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_i128_into(src: &[u8], dst: &mut [i128]) {
         let dst = unsafe {
@@ -1197,21 +1197,52 @@
     /// use byteorder::{ByteOrder, LittleEndian};
     ///
     /// let mut bytes = [0; 16];
-    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// let numbers_given = [1.0, 2.0, 31.312e31, -11.32e19];
     /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
-    /// LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
+    /// LittleEndian::read_f32_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     #[inline]
-    fn read_f32_into_unchecked(src: &[u8], dst: &mut [f32]) {
+    fn read_f32_into(src: &[u8], dst: &mut [f32]) {
         let dst = unsafe {
             slice::from_raw_parts_mut(dst.as_mut_ptr() as *mut u32, dst.len())
         };
         Self::read_u32_into(src, dst);
     }
 
+    /// **DEPRECATED**.
+    ///
+    /// This method is deprecated. Use `read_f32_into` instead.
+    /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
+    /// `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 4*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f32` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 16];
+    /// let numbers_given = [1.0, 2.0, 31.312e31, -11.32e19];
+    /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0.0; 4];
+    /// LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    #[deprecated(since="1.3.0", note="please use `read_f32_into` instead")]
+    fn read_f32_into_unchecked(src: &[u8], dst: &mut [f32]) {
+        Self::read_f32_into(src, dst);
+    }
+
     /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
     /// `src` into `dst`.
     ///
@@ -1231,17 +1262,49 @@
     /// LittleEndian::write_f64_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
-    /// LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
+    /// LittleEndian::read_f64_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
     #[inline]
-    fn read_f64_into_unchecked(src: &[u8], dst: &mut [f64]) {
+    fn read_f64_into(src: &[u8], dst: &mut [f64]) {
         let dst = unsafe {
             slice::from_raw_parts_mut(dst.as_mut_ptr() as *mut u64, dst.len())
         };
         Self::read_u64_into(src, dst);
     }
 
+    /// **DEPRECATED**.
+    ///
+    /// This method is deprecated. Use `read_f64_into` instead.
+    ///
+    /// Reads IEEE754 single-precision (4 bytes) floating point numbers from
+    /// `src` into `dst`.
+    ///
+    /// # Panics
+    ///
+    /// Panics when `src.len() != 8*dst.len()`.
+    ///
+    /// # Examples
+    ///
+    /// Write and read `f64` numbers in little endian order:
+    ///
+    /// ```rust
+    /// use byteorder::{ByteOrder, LittleEndian};
+    ///
+    /// let mut bytes = [0; 32];
+    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// LittleEndian::write_f64_into(&numbers_given, &mut bytes);
+    ///
+    /// let mut numbers_got = [0.0; 4];
+    /// LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
+    /// assert_eq!(numbers_given, numbers_got);
+    /// ```
+    #[inline]
+    #[deprecated(since="1.3.0", note="please use `read_f64_into` instead")]
+    fn read_f64_into_unchecked(src: &[u8], dst: &mut [f64]) {
+        Self::read_f64_into(src, dst);
+    }
+
     /// Writes unsigned 16 bit integers from `src` into `dst`.
     ///
     /// # Panics
@@ -1332,7 +1395,7 @@
     /// LittleEndian::read_u128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn write_u128_into(src: &[u128], dst: &mut [u8]);
 
     /// Writes signed 16 bit integers from `src` into `dst`.
@@ -1440,7 +1503,7 @@
     /// LittleEndian::read_i128_into(&bytes, &mut numbers_got);
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn write_i128_into(src: &[i128], dst: &mut [u8]) {
         let src = unsafe {
             slice::from_raw_parts(src.as_ptr() as *const u128, src.len())
@@ -1463,12 +1526,12 @@
     /// use byteorder::{ByteOrder, LittleEndian};
     ///
     /// let mut bytes = [0; 16];
-    /// let numbers_given = [1.0, 2.0, 31.312e311, -11.32e91];
+    /// let numbers_given = [1.0, 2.0, 31.312e31, -11.32e19];
     /// LittleEndian::write_f32_into(&numbers_given, &mut bytes);
     ///
     /// let mut numbers_got = [0.0; 4];
     /// unsafe {
-    ///     LittleEndian::read_f32_into_unchecked(&bytes, &mut numbers_got);
+    ///     LittleEndian::read_f32_into(&bytes, &mut numbers_got);
     /// }
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
@@ -1499,7 +1562,7 @@
     ///
     /// let mut numbers_got = [0.0; 4];
     /// unsafe {
-    ///     LittleEndian::read_f64_into_unchecked(&bytes, &mut numbers_got);
+    ///     LittleEndian::read_f64_into(&bytes, &mut numbers_got);
     /// }
     /// assert_eq!(numbers_given, numbers_got);
     /// ```
@@ -1584,7 +1647,7 @@
     /// BigEndian::from_slice_u128(&mut numbers);
     /// assert_eq!(numbers, [5u128.to_be(), 65000u128.to_be()]);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     fn from_slice_u128(numbers: &mut [u128]);
 
     /// Converts the given slice of signed 16 bit integers to a particular
@@ -1679,7 +1742,7 @@
     /// BigEndian::from_slice_i128(&mut numbers);
     /// assert_eq!(numbers, [5i128.to_be(), 65000i128.to_be()]);
     /// ```
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn from_slice_i128(src: &mut [i128]) {
         let src = unsafe {
@@ -1894,7 +1957,7 @@
         read_num_bytes!(u64, 8, buf, to_be)
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128(buf: &[u8]) -> u128 {
         read_num_bytes!(u128, 16, buf, to_be)
@@ -1912,7 +1975,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_uint128(buf: &[u8], nbytes: usize) -> u128 {
         assert!(1 <= nbytes && nbytes <= 16 && nbytes <= buf.len());
@@ -1940,7 +2003,7 @@
         write_num_bytes!(u64, 8, n, buf, to_be);
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128(buf: &mut [u8], n: u128) {
         write_num_bytes!(u128, 16, n, buf, to_be);
@@ -1959,7 +2022,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize) {
         assert!(pack_size128(n) <= nbytes && nbytes <= 16);
@@ -1988,7 +2051,7 @@
         read_slice!(src, dst, 8, to_be);
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128_into(src: &[u8], dst: &mut [u128]) {
         read_slice!(src, dst, 16, to_be);
@@ -2021,7 +2084,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128_into(src: &[u128], dst: &mut [u8]) {
         if cfg!(target_endian = "big") {
@@ -2058,7 +2121,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn from_slice_u128(numbers: &mut [u128]) {
         if cfg!(target_endian = "little") {
@@ -2109,7 +2172,7 @@
         read_num_bytes!(u64, 8, buf, to_le)
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128(buf: &[u8]) -> u128 {
         read_num_bytes!(u128, 16, buf, to_le)
@@ -2126,7 +2189,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_uint128(buf: &[u8], nbytes: usize) -> u128 {
         assert!(1 <= nbytes && nbytes <= 16 && nbytes <= buf.len());
@@ -2153,7 +2216,7 @@
         write_num_bytes!(u64, 8, n, buf, to_le);
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128(buf: &mut [u8], n: u128) {
         write_num_bytes!(u128, 16, n, buf, to_le);
@@ -2169,7 +2232,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_uint128(buf: &mut [u8], n: u128, nbytes: usize) {
         assert!(pack_size128(n as u128) <= nbytes && nbytes <= 16);
@@ -2195,7 +2258,7 @@
         read_slice!(src, dst, 8, to_le);
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn read_u128_into(src: &[u8], dst: &mut [u128]) {
         read_slice!(src, dst, 16, to_le);
@@ -2228,7 +2291,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn write_u128_into(src: &[u128], dst: &mut [u8]) {
         if cfg!(target_endian = "little") {
@@ -2265,7 +2328,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     #[inline]
     fn from_slice_u128(numbers: &mut [u128]) {
         if cfg!(target_endian = "big") {
@@ -2306,8 +2369,11 @@
     extern crate rand;
 
     use self::quickcheck::{QuickCheck, StdGen, Testable};
-    use self::rand::{Rng, thread_rng};
-    #[cfg(feature = "i128")] use self::quickcheck::{Arbitrary, Gen};
+    use self::rand::thread_rng;
+    #[cfg(byteorder_i128)]
+    use self::rand::Rng;
+    #[cfg(byteorder_i128)]
+    use self::quickcheck::{Arbitrary, Gen};
 
     pub const U24_MAX: u32 = 16_777_215;
     pub const I24_MAX: i32 = 8_388_607;
@@ -2327,7 +2393,7 @@
     #[derive(Clone, Debug)]
     pub struct Wi128<T>(pub T);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     impl<T: Clone> Wi128<T> {
         pub fn clone(&self) -> T {
             self.0.clone()
@@ -2340,7 +2406,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     impl Arbitrary for Wi128<u128> {
         fn arbitrary<G: Gen>(gen: &mut G) -> Wi128<u128> {
             let max = calc_max!(::core::u128::MAX, gen.size(), 16);
@@ -2351,7 +2417,7 @@
         }
     }
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     impl Arbitrary for Wi128<i128> {
         fn arbitrary<G: Gen>(gen: &mut G) -> Wi128<i128> {
             let max = calc_max!(::core::i128::MAX, gen.size(), 16);
@@ -2464,9 +2530,9 @@
     qc_byte_order!(prop_f32, f32, ::core::u64::MAX as u64, read_f32, write_f32);
     qc_byte_order!(prop_f64, f64, ::core::i64::MAX as u64, read_f64, write_f64);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_u128, Wi128<u128>, 16 + 1, read_u128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_i128, Wi128<i128>, 16 + 1, read_i128, write_i128);
 
     qc_byte_order!(prop_uint_1,
@@ -2486,52 +2552,52 @@
     qc_byte_order!(prop_uint_8,
         u64, calc_max!(super::U64_MAX, 8), 8, read_uint, write_uint);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_1,
         Wi128<u128>, 1, 1, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_2,
         Wi128<u128>, 2, 2, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_3,
         Wi128<u128>, 3, 3, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_4,
         Wi128<u128>, 4, 4, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_5,
         Wi128<u128>, 5, 5, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_6,
         Wi128<u128>, 6, 6, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_7,
         Wi128<u128>, 7, 7, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_8,
         Wi128<u128>, 8, 8, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_9,
         Wi128<u128>, 9, 9, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_10,
         Wi128<u128>, 10, 10, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_11,
         Wi128<u128>, 11, 11, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_12,
         Wi128<u128>, 12, 12, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_13,
         Wi128<u128>, 13, 13, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_14,
         Wi128<u128>, 14, 14, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_15,
         Wi128<u128>, 15, 15, read_uint128, write_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_uint128_16,
         Wi128<u128>, 16, 16, read_uint128, write_uint128);
 
@@ -2552,52 +2618,52 @@
     qc_byte_order!(prop_int_8,
         i64, calc_max!(super::I64_MAX, 8), 8, read_int, write_int);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_1,
         Wi128<i128>, 1, 1, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_2,
         Wi128<i128>, 2, 2, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_3,
         Wi128<i128>, 3, 3, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_4,
         Wi128<i128>, 4, 4, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_5,
         Wi128<i128>, 5, 5, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_6,
         Wi128<i128>, 6, 6, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_7,
         Wi128<i128>, 7, 7, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_8,
         Wi128<i128>, 8, 8, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_9,
         Wi128<i128>, 9, 9, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_10,
         Wi128<i128>, 10, 10, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_11,
         Wi128<i128>, 11, 11, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_12,
         Wi128<i128>, 12, 12, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_13,
         Wi128<i128>, 13, 13, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_14,
         Wi128<i128>, 14, 14, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_15,
         Wi128<i128>, 15, 15, read_int128, write_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_byte_order!(prop_int128_16,
         Wi128<i128>, 16, 16, read_int128, write_int128);
 
@@ -2692,9 +2758,9 @@
     too_small!(small_i64, 7, 0, read_i64, write_i64);
     too_small!(small_f32, 3, 0.0, read_f32, write_f32);
     too_small!(small_f64, 7, 0.0, read_f64, write_f64);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_u128, 15, 0, read_u128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_i128, 15, 0, read_i128, write_i128);
 
     too_small!(small_uint_1, 1, read_uint);
@@ -2705,35 +2771,35 @@
     too_small!(small_uint_6, 6, read_uint);
     too_small!(small_uint_7, 7, read_uint);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_1, 1, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_2, 2, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_3, 3, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_4, 4, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_5, 5, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_6, 6, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_7, 7, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_8, 8, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_9, 9, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_10, 10, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_11, 11, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_12, 12, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_13, 13, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_14, 14, read_uint128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_uint128_15, 15, read_uint128);
 
     too_small!(small_int_1, 1, read_int);
@@ -2744,35 +2810,35 @@
     too_small!(small_int_6, 6, read_int);
     too_small!(small_int_7, 7, read_int);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_1, 1, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_2, 2, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_3, 3, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_4, 4, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_5, 5, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_6, 6, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_7, 7, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_8, 8, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_9, 9, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_10, 10, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_11, 11, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_12, 12, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_13, 13, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_14, 14, read_int128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     too_small!(small_int128_15, 15, read_int128);
 
     // Test that reading/writing slices enforces the correct lengths.
@@ -2860,16 +2926,16 @@
     slice_lengths!(
         slice_len_too_big_i64, read_i64_into, write_i64_into, 17, [0, 0]);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     slice_lengths!(
         slice_len_too_small_u128, read_u128_into, write_u128_into, 31, [0, 0]);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     slice_lengths!(
         slice_len_too_big_u128, read_u128_into, write_u128_into, 33, [0, 0]);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     slice_lengths!(
         slice_len_too_small_i128, read_i128_into, write_i128_into, 31, [0, 0]);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     slice_lengths!(
         slice_len_too_big_i128, read_i128_into, write_i128_into, 33, [0, 0]);
 
@@ -3016,9 +3082,9 @@
     qc_bytes_ext!(prop_ext_f64,
         f64, ::std::i64::MAX as u64, read_f64, write_f64);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_u128, Wi128<u128>, 16 + 1, read_u128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_i128, Wi128<i128>, 16 + 1, read_i128, write_i128);
 
     qc_bytes_ext!(prop_ext_uint_1,
@@ -3038,52 +3104,52 @@
     qc_bytes_ext!(prop_ext_uint_8,
         u64, calc_max!(::test::U64_MAX, 8), 8, read_uint, write_u64);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_1,
         Wi128<u128>, 1, 1, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_2,
         Wi128<u128>, 2, 2, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_3,
         Wi128<u128>, 3, 3, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_4,
         Wi128<u128>, 4, 4, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_5,
         Wi128<u128>, 5, 5, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_6,
         Wi128<u128>, 6, 6, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_7,
         Wi128<u128>, 7, 7, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_8,
         Wi128<u128>, 8, 8, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_9,
         Wi128<u128>, 9, 9, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_10,
         Wi128<u128>, 10, 10, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_11,
         Wi128<u128>, 11, 11, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_12,
         Wi128<u128>, 12, 12, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_13,
         Wi128<u128>, 13, 13, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_14,
         Wi128<u128>, 14, 14, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_15,
         Wi128<u128>, 15, 15, read_uint128, write_u128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_uint128_16,
         Wi128<u128>, 16, 16, read_uint128, write_u128);
 
@@ -3104,52 +3170,52 @@
     qc_bytes_ext!(prop_ext_int_8,
         i64, calc_max!(::test::I64_MAX, 8), 8, read_int, write_i64);
 
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_1,
         Wi128<i128>, 1, 1, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_2,
         Wi128<i128>, 2, 2, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_3,
         Wi128<i128>, 3, 3, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_4,
         Wi128<i128>, 4, 4, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_5,
         Wi128<i128>, 5, 5, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_6,
         Wi128<i128>, 6, 6, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_7,
         Wi128<i128>, 7, 7, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_8,
         Wi128<i128>, 8, 8, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_9,
         Wi128<i128>, 9, 9, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_10,
         Wi128<i128>, 10, 10, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_11,
         Wi128<i128>, 11, 11, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_12,
         Wi128<i128>, 12, 12, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_13,
         Wi128<i128>, 13, 13, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_14,
         Wi128<i128>, 14, 14, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_15,
         Wi128<i128>, 15, 15, read_int128, write_i128);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_bytes_ext!(prop_ext_int128_16,
         Wi128<i128>, 16, 16, read_int128, write_i128);
 
@@ -3235,15 +3301,15 @@
     qc_slice!(prop_slice_i32, i32, read_i32_into, write_i32_into, 0);
     qc_slice!(prop_slice_u64, u64, read_u64_into, write_u64_into, 0);
     qc_slice!(prop_slice_i64, i64, read_i64_into, write_i64_into, 0);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_slice!(
         prop_slice_u128, Wi128<u128>, read_u128_into, write_u128_into, 0);
-    #[cfg(feature = "i128")]
+    #[cfg(byteorder_i128)]
     qc_slice!(
         prop_slice_i128, Wi128<i128>, read_i128_into, write_i128_into, 0);
 
     qc_slice!(
-        prop_slice_f32, f32, read_f32_into_unchecked, write_f32_into, 0.0);
+        prop_slice_f32, f32, read_f32_into, write_f32_into, 0.0);
     qc_slice!(
-        prop_slice_f64, f64, read_f64_into_unchecked, write_f64_into, 0.0);
+        prop_slice_f64, f64, read_f64_into, write_f64_into, 0.0);
 }
diff -Nru cargo-0.32.0/vendor/byteorder/.travis.yml cargo-0.33.0/vendor/byteorder/.travis.yml
--- cargo-0.32.0/vendor/byteorder/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/byteorder/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-language: rust
-matrix:
-  include:
-    - rust: 1.12.0
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-    - env: CROSS_TARGET=mips64-unknown-linux-gnuabi64
-      rust: stable
-      services: docker
-      sudo: required
-script: ci/script.sh
-branches:
-  only:
-    - master
diff -Nru cargo-0.32.0/vendor/bytesize/.travis.yml cargo-0.33.0/vendor/bytesize/.travis.yml
--- cargo-0.32.0/vendor/bytesize/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/bytesize/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-language: rust
-before_script:
-  - rustup component add rustfmt-preview
-script:
-  - cargo fmt --all -- --write-mode=diff
-  - cargo build --verbose --all
-  - cargo test --verbose --all
diff -Nru cargo-0.32.0/vendor/cc/appveyor.yml cargo-0.33.0/vendor/cc/appveyor.yml
--- cargo-0.32.0/vendor/cc/appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-environment:
-
-  # At the time this was added AppVeyor was having troubles with checking
-  # revocation of SSL certificates of sites like static.rust-lang.org and what
-  # we think is crates.io. The libcurl HTTP client by default checks for
-  # revocation on Windows and according to a mailing list [1] this can be
-  # disabled.
-  #
-  # The `CARGO_HTTP_CHECK_REVOKE` env var here tells cargo to disable SSL
-  # revocation checking on Windows in libcurl. Note, though, that rustup, which
-  # we're using to download Rust here, also uses libcurl as the default backend.
-  # Unlike Cargo, however, rustup doesn't have a mechanism to disable revocation
-  # checking. To get rustup working we set `RUSTUP_USE_HYPER` which forces it to
-  # use the Hyper instead of libcurl backend. Both Hyper and libcurl use
-  # schannel on Windows but it appears that Hyper configures it slightly
-  # differently such that revocation checking isn't turned on by default.
-  #
-  # [1]: https://curl.haxx.se/mail/lib-2016-03/0202.html
-  RUSTUP_USE_HYPER: 1
-  CARGO_HTTP_CHECK_REVOKE: false
-
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-    ARCH: amd64
-    VS: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
-  - TARGET: x86_64-pc-windows-msvc
-    ARCH: amd64
-    VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
-  - TARGET: i686-pc-windows-msvc
-    ARCH: x86
-    VS: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
-  - TARGET: i686-pc-windows-msvc
-    ARCH: x86
-    VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
-  - TARGET: x86_64-pc-windows-gnu
-    MSYS_BITS: 64
-  - TARGET: i686-pc-windows-gnu
-    MSYS_BITS: 32
-install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
-  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - if defined VS call "%VS%" %ARCH%
-  - set PATH=%PATH%;C:\Program Files (x86)\Rust\bin
-  - if defined MSYS_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS_BITS%\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo test --target %TARGET%
-  - cargo test --features parallel --target %TARGET%
-  - cargo test --manifest-path cc-test/Cargo.toml --target %TARGET%
-  - cargo test --manifest-path cc-test/Cargo.toml --features parallel --target %TARGET%
-  - cargo test --manifest-path cc-test/Cargo.toml --release --target %TARGET%
diff -Nru cargo-0.32.0/vendor/cc/.cargo-checksum.json cargo-0.33.0/vendor/cc/.cargo-checksum.json
--- cargo-0.32.0/vendor/cc/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"}
\ No newline at end of file
+{"files":{},"package":"4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/cc/Cargo.toml cargo-0.33.0/vendor/cc/Cargo.toml
--- cargo-0.32.0/vendor/cc/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,14 +12,15 @@
 
 [package]
 name = "cc"
-version = "1.0.25"
+version = "1.0.29"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+exclude = ["/.travis.yml", "/appveyor.yml"]
 description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"
 homepage = "https://github.com/alexcrichton/cc-rs"
 documentation = "https://docs.rs/cc"
 readme = "README.md"
 keywords = ["build-dependencies"]
-categories = ["development-tools"]
+categories = ["development-tools::build-utils"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/alexcrichton/cc-rs"
 [dependencies.rayon]
diff -Nru cargo-0.32.0/vendor/cc/README.md cargo-0.33.0/vendor/cc/README.md
--- cargo-0.32.0/vendor/cc/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -2,7 +2,7 @@
 
 A library to compile C/C++/assembly into a Rust library/application.
 
-[![Build Status](https://travis-ci.org/alexcrichton/cc-rs.svg?branch=master)](https://travis-ci.org/alexcrichton/cc-rs)
+[![Build Status](https://travis-ci.com/alexcrichton/cc-rs.svg?branch=master)](https://travis-ci.com/alexcrichton/cc-rs)
 [![Build status](https://ci.appveyor.com/api/projects/status/onu270iw98h81nwv?svg=true)](https://ci.appveyor.com/project/alexcrichton/cc-rs)
 
 [Documentation](https://docs.rs/cc)
diff -Nru cargo-0.32.0/vendor/cc/src/lib.rs cargo-0.33.0/vendor/cc/src/lib.rs
--- cargo-0.32.0/vendor/cc/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -55,6 +55,7 @@
 
 #![doc(html_root_url = "https://docs.rs/cc/1.0")]
 #![cfg_attr(test, deny(warnings))]
+#![allow(deprecated)]
 #![deny(missing_docs)]
 
 #[cfg(feature = "parallel")]
@@ -112,6 +113,7 @@
     archiver: Option<PathBuf>,
     cargo_metadata: bool,
     pic: Option<bool>,
+    use_plt: Option<bool>,
     static_crt: Option<bool>,
     shared_flag: Option<bool>,
     static_flag: Option<bool>,
@@ -319,6 +321,7 @@
             archiver: None,
             cargo_metadata: true,
             pic: None,
+            use_plt: None,
             static_crt: None,
             warnings: None,
             extra_warnings: None,
@@ -822,6 +825,21 @@
         self
     }
 
+    /// Configures whether the Procedure Linkage Table is used for indirect
+    /// calls into shared libraries.
+    ///
+    /// The PLT is used to provide features like lazy binding, but introduces
+    /// a small performance loss due to extra pointer indirection. Setting
+    /// `use_plt` to `false` can provide a small performance increase.
+    ///
+    /// Note that skipping the PLT requires a recent version of GCC/Clang.
+    ///
+    /// This only applies to ELF targets. It has no effect on other platforms.
+    pub fn use_plt(&mut self, use_plt: bool) -> &mut Build {
+        self.use_plt = Some(use_plt);
+        self
+    }
+
     /// Configures whether the /MT flag or the /MD flag will be passed to msvc build tools.
     ///
     /// This option defaults to `false`, and affect only msvc targets.
@@ -1123,6 +1141,11 @@
                 }
                 if self.pic.unwrap_or(!target.contains("windows-gnu")) {
                     cmd.push_cc_arg("-fPIC".into());
+                    // PLT only applies if code is compiled with PIC support,
+                    // and only for ELF targets.
+                    if target.contains("linux") && !self.use_plt.unwrap_or(true) {
+                        cmd.push_cc_arg("-fno-plt".into());
+                    }
                 }
             }
         }
@@ -1148,17 +1171,30 @@
                 if clang_cl {
                     if target.contains("x86_64") {
                         cmd.args.push("-m64".into());
-                    } else if target.contains("i586") {
+                    } else if target.contains("86") {
                         cmd.args.push("-m32".into());
                         cmd.args.push("/arch:IA32".into());
                     } else {
-                        cmd.args.push("-m32".into());
+                        cmd.args.push(format!("--target={}", target).into());
                     }
                 } else {
                     if target.contains("i586") {
                         cmd.args.push("/ARCH:IA32".into());
                     }
                 }
+
+                // There is a check in corecrt.h that will generate a
+                // compilation error if
+                // _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE is
+                // not defined to 1. The check was added in Windows
+                // 8 days because only store apps were allowed on ARM.
+                // This changed with the release of Windows 10 IoT Core.
+                // The check will be going away in future versions of
+                // the SDK, but for all released versions of the
+                // Windows SDK it is required.
+                if target.contains("arm") || target.contains("thumb") {
+                    cmd.args.push("/D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1".into());
+                }
             }
             ToolFamily::Gnu => {
                 if target.contains("i686") || target.contains("i586") {
@@ -1214,6 +1250,11 @@
                 if target.starts_with("arm-unknown-linux-") {
                     cmd.args.push("-march=armv6".into());
                     cmd.args.push("-marm".into());
+                    if target.ends_with("hf") {
+                        cmd.args.push("-mfpu=vfp".into());
+                    } else {
+                        cmd.args.push("-mfloat-abi=soft".into());
+                    }
                 }
 
                 // We can guarantee some settings for FRC
@@ -1264,6 +1305,16 @@
                 if target.starts_with("thumbv7m") {
                     cmd.args.push("-march=armv7-m".into());
                 }
+                if target.starts_with("thumbv8m.base") {
+                    cmd.args.push("-march=armv8-m.base".into());
+                }
+                if target.starts_with("thumbv8m.main") {
+                    cmd.args.push("-march=armv8-m.main".into());
+
+                    if target.ends_with("eabihf") {
+                        cmd.args.push("-mfpu=fpv5-sp-d16".into())
+                    }
+                }
                 if target.starts_with("armebv7r") | target.starts_with("armv7r") {
                     if target.starts_with("armeb") {
                         cmd.args.push("-mbig-endian".into());
@@ -1718,6 +1769,9 @@
                         "thumbv7em-none-eabi" => Some("arm-none-eabi"),
                         "thumbv7em-none-eabihf" => Some("arm-none-eabi"),
                         "thumbv7m-none-eabi" => Some("arm-none-eabi"),
+                        "thumbv8m.base-none-eabi" => Some("arm-none-eabi"),
+                        "thumbv8m.main-none-eabi" => Some("arm-none-eabi"),
+                        "thumbv8m.main-none-eabihf" => Some("arm-none-eabi"),
                         "x86_64-pc-windows-gnu" => Some("x86_64-w64-mingw32"),
                         "x86_64-rumprun-netbsd" => Some("x86_64-rumprun-netbsd"),
                         "x86_64-unknown-linux-musl" => Some("musl"),
diff -Nru cargo-0.32.0/vendor/cc/src/windows_registry.rs cargo-0.33.0/vendor/cc/src/windows_registry.rs
--- cargo-0.32.0/vendor/cc/src/windows_registry.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/src/windows_registry.rs	2019-02-06 04:11:58.000000000 +0000
@@ -174,7 +174,7 @@
     use std::io::Read;
     use registry::{RegistryKey, LOCAL_MACHINE};
     use com;
-    use setup_config::{SetupConfiguration, SetupInstance};
+    use setup_config::{EnumSetupInstances, SetupConfiguration, SetupInstance};
 
     use Tool;
 
@@ -217,11 +217,15 @@
     // Note that much of this logic can be found [online] wrt paths, COM, etc.
     //
     // [online]: https://blogs.msdn.microsoft.com/vcblog/2017/03/06/finding-the-visual-c-compiler-tools-in-visual-studio-2017/
-    pub fn find_msvc_15(tool: &str, target: &str) -> Option<Tool> {
+    fn vs15_instances() -> Option<EnumSetupInstances> {
         otry!(com::initialize().ok());
 
         let config = otry!(SetupConfiguration::new().ok());
-        let iter = otry!(config.enum_all_instances().ok());
+        config.enum_all_instances().ok()
+    }
+
+    pub fn find_msvc_15(tool: &str, target: &str) -> Option<Tool> {
+        let iter = otry!(vs15_instances());
         for instance in iter {
             let instance = otry!(instance.ok());
             let tool = tool_from_vs15_instance(tool, target, &instance);
@@ -233,6 +237,44 @@
         None
     }
 
+    // While the paths to Visual Studio 2017's devenv and MSBuild could
+    // potentially be retrieved from the registry, finding them via
+    // SetupConfiguration has shown to be [more reliable], and is preferred
+    // according to Microsoft. To help head off potential regressions though,
+    // we keep the registry method as a fallback option.
+    //
+    // [more reliable]: https://github.com/alexcrichton/cc-rs/pull/331
+    fn find_tool_in_vs15_path(tool: &str, target: &str) -> Option<Tool> {
+        let mut path = match vs15_instances() {
+            Some(instances) => instances
+                .filter_map(|instance| {
+                    instance
+                        .ok()
+                        .and_then(|instance| instance.installation_path().ok())
+                }).map(|path| PathBuf::from(path).join(tool))
+                .find(|ref path| path.is_file()),
+            None => None,
+        };
+
+        if path.is_none() {
+            let key = r"SOFTWARE\WOW6432Node\Microsoft\VisualStudio\SxS\VS7";
+            path = LOCAL_MACHINE
+                .open(key.as_ref())
+                .ok()
+                .and_then(|key| key.query_str("15.0").ok())
+                .map(|path| PathBuf::from(path).join(tool))
+                .filter(|ref path| path.is_file());
+        }
+
+        path.map(|path| {
+            let mut tool = Tool::new(path);
+            if target.contains("x86_64") {
+                tool.env.push(("Platform".into(), "X64".into()));
+            }
+            tool
+        })
+    }
+
     fn tool_from_vs15_instance(tool: &str, target: &str, instance: &SetupInstance) -> Option<Tool> {
         let (bin_path, host_dylib_path, lib_path, include_path) =
             otry!(vs15_vc_paths(target, instance));
@@ -595,7 +637,7 @@
         for subkey in key.iter().filter_map(|k| k.ok()) {
             let val = subkey
                 .to_str()
-                .and_then(|s| s.trim_left_matches("v").replace(".", "").parse().ok());
+                .and_then(|s| s.trim_start_matches("v").replace(".", "").parse().ok());
             let val = match val {
                 Some(s) => s,
                 None => continue,
@@ -631,19 +673,7 @@
     }
 
     fn find_devenv_vs15(target: &str) -> Option<Tool> {
-        let key = r"SOFTWARE\WOW6432Node\Microsoft\VisualStudio\SxS\VS7";
-        LOCAL_MACHINE
-            .open(key.as_ref())
-            .ok()
-            .and_then(|key| key.query_str("15.0").ok())
-            .map(|path| {
-                let path = PathBuf::from(path).join(r"Common7\IDE\devenv.exe");
-                let mut tool = Tool::new(path);
-                if target.contains("x86_64") {
-                    tool.env.push(("Platform".into(), "X64".into()));
-                }
-                tool
-            })
+        find_tool_in_vs15_path(r"Common7\IDE\devenv.exe", target)
     }
 
     // see http://stackoverflow.com/questions/328017/path-to-msbuild
@@ -657,22 +687,7 @@
     }
 
     fn find_msbuild_vs15(target: &str) -> Option<Tool> {
-        // Seems like this could also go through SetupConfiguration,
-        // or that find_msvc_15 could just use this registry key
-        // instead of the COM interface.
-        let key = r"SOFTWARE\WOW6432Node\Microsoft\VisualStudio\SxS\VS7";
-        LOCAL_MACHINE
-            .open(key.as_ref())
-            .ok()
-            .and_then(|key| key.query_str("15.0").ok())
-            .map(|path| {
-                let path = PathBuf::from(path).join(r"MSBuild\15.0\Bin\MSBuild.exe");
-                let mut tool = Tool::new(path);
-                if target.contains("x86_64") {
-                    tool.env.push(("Platform".into(), "X64".into()));
-                }
-                tool
-            })
+        find_tool_in_vs15_path(r"MSBuild\15.0\Bin\MSBuild.exe", target)
     }
 
     fn find_old_msbuild(target: &str) -> Option<Tool> {
diff -Nru cargo-0.32.0/vendor/cc/tests/test.rs cargo-0.33.0/vendor/cc/tests/test.rs
--- cargo-0.32.0/vendor/cc/tests/test.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/tests/test.rs	2019-02-06 04:11:58.000000000 +0000
@@ -198,6 +198,20 @@
 }
 
 #[test]
+fn gnu_x86_64_no_plt() {
+    let target = "x86_64-unknown-linux-gnu";
+    let test = Test::gnu();
+    test.gcc()
+        .pic(true)
+        .use_plt(false)
+        .target(&target)
+        .host(&target)
+        .file("foo.c")
+        .compile("foo");
+    test.cmd(0).must_have("-fno-plt");
+}
+
+#[test]
 fn gnu_set_stdlib() {
     let test = Test::gnu();
     test.gcc()
diff -Nru cargo-0.32.0/vendor/cc/.travis.yml cargo-0.33.0/vendor/cc/.travis.yml
--- cargo-0.32.0/vendor/cc/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cc/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: 1.16.0
-      install:
-      script: cargo build
-    - rust: stable
-      env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-    - rust: stable
-      env: TARGET=i686-unknown-linux-gnu
-    - os: osx
-      env: TARGET=x86_64-apple-darwin NO_ADD=1
-    - os: osx
-      env: TARGET=aarch64-apple-ios NO_RUN=--no-run TARGET_SYSROOT=$(xcrun -sdk iphoneos --show-sdk-path)
-    - rust: beta
-      env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-    - rust: nightly
-      env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      install:
-      script:
-        - cargo doc --no-deps --all-features
-      after_success:
-        - travis-cargo --only nightly doc-upload
-
-install:
-  - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
-
-script:
-  - cargo build --verbose
-  # FIXME: no idea why `--test-threads=1` is required on the OSX builder, it
-  # just randomly broke one day when the travis image was upgraded, and
-  # debugging turned up no easily found source of bugs...
-  #
-  # good build - https://travis-ci.org/alexcrichton/cc-rs/builds/409602374
-  #  bad build - https://travis-ci.org/alexcrichton/cc-rs/builds/410489079
-  #
-  # Those are using the same compiler, same commit, same... everything. Except
-  # the OSX image! No idea what changed...
-  - cargo test --verbose $NO_RUN -- --test-threads=1
-  - cargo test --verbose --features parallel $NO_RUN -- --test-threads=1
-  - cargo test --manifest-path cc-test/Cargo.toml --target $TARGET $NO_RUN
-  - cargo test --manifest-path cc-test/Cargo.toml --target $TARGET --features parallel $NO_RUN
-  - cargo test --manifest-path cc-test/Cargo.toml --target $TARGET --release $NO_RUN
-  - cargo doc
-  - cargo clean && cargo build
-  - rustdoc --test README.md -L target/debug -L target/debug/deps
-
-env:
-  global:
-    secure: "CBtqrudgE0PS8x3kTr44jKbC2D4nfnmdYVecooNm0qnER4B4TSvZpZSQoCgKK6k4BYQuOSyFTOwYx6M79w39ZMOgyCP9ytB+tyMWL0/+ZuUQL04yVg4M5vd3oJMkOaXbvG56ncgPyFrseY+FPDg+mXAzvJk/nily37YXjkQj2D0="
-
-notifications:
-  email:
-    on_success: never
-addons:
-  apt:
-    packages:
-      - g++-multilib
diff -Nru cargo-0.32.0/vendor/cfg-if/.travis.yml cargo-0.33.0/vendor/cfg-if/.travis.yml
--- cargo-0.32.0/vendor/cfg-if/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/cfg-if/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo doc --no-deps
-after_success:
-  - travis-cargo --only nightly doc-upload
-env:
-  global:
-    secure: "TyMGH+sbPmKs9lKCziKShxWr3G6im0owEchVrbUChWnQIQv1WydXftFoEoUsVl6qZspjehWK1b1AsnIgCXK0HtEi4DnqLsxs0s36bOjfg5yHBT/pETTr6kcq7KAL4Be4GmI331k6gT1Oi0TPFp7Sg9xpiWsQqKIHA5Szk2wpFQ8="
-
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/chrono/appveyor.yml cargo-0.33.0/vendor/chrono/appveyor.yml
--- cargo-0.32.0/vendor/chrono/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/appveyor.yml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,21 @@
+environment:
+  matrix:
+    - TARGET: 1.13.0-x86_64-pc-windows-gnu
+    - TARGET: nightly-x86_64-pc-windows-msvc
+    - TARGET: nightly-i686-pc-windows-msvc
+    - TARGET: nightly-x86_64-pc-windows-gnu
+    - TARGET: nightly-i686-pc-windows-gnu
+matrix:
+  allow_failures:
+    - channel: nightly
+install:
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust-install.exe"
+  - ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
+  - ps: $env:PATH="$env:PATH;C:\rust\bin"
+  - rustc -vV
+  - cargo -vV
+
+build: false
+
+test_script:
+  - sh -c 'PATH=`rustc --print sysroot`/bin:$PATH ./ci/travis.sh'
diff -Nru cargo-0.32.0/vendor/chrono/AUTHORS.txt cargo-0.33.0/vendor/chrono/AUTHORS.txt
--- cargo-0.32.0/vendor/chrono/AUTHORS.txt	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/AUTHORS.txt	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,39 @@
+Chrono is mainly written by Kang Seonghoon <public+rust@mearie.org>,
+and also the following people (in ascending order):
+
+Alex Mikhalev <alexmikhalevalex@gmail.com>
+Alexander Bulaev <alexbool@yandex-team.ru>
+Ashley Mannix <ashleymannix@live.com.au>
+Ben Boeckel <mathstuf@gmail.com>
+Ben Eills <ben@beneills.com>
+Brandon W Maister <bwm@knewton.com>
+Brandon W Maister <quodlibetor@gmail.com>
+Colin Ray <r.colinray@gmail.com>
+Corey Farwell <coreyf@rwell.org>
+Dan <dan@ebip.co.uk>
+Danilo Bargen <mail@dbrgn.ch>
+David Hewson <dev@daveid.co.uk>
+David Ross <daboross@daboross.net>
+David Tolnay <dtolnay@gmail.com>
+David Willie <david.willie.1@gmail.com>
+Eric Findlay <e.findlay@protonmail.ch>
+Eunchong Yu <kroisse@gmail.com>
+Frans Skarman <frans.skarman@gmail.com>
+Huon Wilson <dbau.pp+github@gmail.com>
+Igor Gnatenko <ignatenko@redhat.com>
+Jim Turner <jturner314@gmail.com>
+Jisoo Park <xxxyel@gmail.com>
+Joe Wilm <joe@jwilm.com>
+John Heitmann <jheitmann@gmail.com>
+John Nagle <nagle@sitetruth.com>
+Jonas mg <jonasmg@yepmail.net>
+János Illés <ijanos@gmail.com>
+Ken Tossell <ken@tossell.net>
+Martin Risell Lilja <martin.risell.lilja@gmail.com>
+Richard Petrie <rap1011@ksu.edu>
+Ryan Lewis <ryansname@gmail.com>
+Sergey V. Galtsev <sergey.v.galtsev@github.com>
+Steve Klabnik <steve@steveklabnik.com>
+Tom Gallacher <tomgallacher23@gmail.com>
+klutzy <klutzytheklutzy@gmail.com>
+kud1ing <github@kudling.de>
diff -Nru cargo-0.32.0/vendor/chrono/.cargo-checksum.json cargo-0.33.0/vendor/chrono/.cargo-checksum.json
--- cargo-0.32.0/vendor/chrono/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/chrono/Cargo.toml cargo-0.33.0/vendor/chrono/Cargo.toml
--- cargo-0.32.0/vendor/chrono/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,72 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "chrono"
+version = "0.4.6"
+authors = ["Kang Seonghoon <public+rust@mearie.org>", "Brandon W Maister <quodlibetor@gmail.com>"]
+description = "Date and time library for Rust"
+homepage = "https://github.com/chronotope/chrono"
+documentation = "https://docs.rs/chrono/"
+readme = "README.md"
+keywords = ["date", "time", "calendar"]
+categories = ["date-and-time"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/chronotope/chrono"
+[package.metadata.docs.rs]
+all-features = true
+
+[package.metadata.playground]
+all-features = true
+
+[lib]
+name = "chrono"
+[dependencies.num-integer]
+version = "0.1.36"
+default-features = false
+
+[dependencies.num-traits]
+version = "0.2"
+default-features = false
+
+[dependencies.rustc-serialize]
+version = "0.3.20"
+optional = true
+
+[dependencies.serde]
+version = "1"
+optional = true
+
+[dependencies.time]
+version = "0.1.39"
+optional = true
+[dev-dependencies.bincode]
+version = "0.8.0"
+
+[dev-dependencies.num-iter]
+version = "0.1.35"
+default-features = false
+
+[dev-dependencies.serde_derive]
+version = "1"
+
+[dev-dependencies.serde_json]
+version = "1"
+
+[features]
+clock = ["time"]
+default = ["clock"]
+[badges.appveyor]
+repository = "chronotope/chrono"
+
+[badges.travis-ci]
+repository = "chronotope/chrono"
diff -Nru cargo-0.32.0/vendor/chrono/CHANGELOG.md cargo-0.33.0/vendor/chrono/CHANGELOG.md
--- cargo-0.32.0/vendor/chrono/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,551 @@
+ChangeLog for Chrono
+====================
+
+This documents all notable changes to [Chrono](https://github.com/chronotope/chrono).
+
+Chrono obeys the principle of [Semantic Versioning](http://semver.org/).
+
+There were/are numerous minor versions before 1.0 due to the language changes.
+Versions with only mechnical changes will be omitted from the following list.
+
+## 0.4.5
+
+### Features
+
+* Added several more serde deserialization helpers (@novacrazy #258)
+* Enabled all features on the playground (@davidtwco #267)
+* Derive `Hash` on `FixedOffset` (@LuoZijun #254)
+* Improved docs (@storyfeet #261, @quodlibetor #252)
+
+## 0.4.4
+
+### Features
+
+* Added support for parsing nanoseconds without the leading dot (@emschwartz #251)
+
+## 0.4.3
+
+### Features
+
+* Added methods to DateTime/NaiveDateTime to present the stored value as a number
+  of nanoseconds since the UNIX epoch (@harkonenbade #247)
+* Added a serde serialise/deserialise module for nanosecond timestamps. (@harkonenbade #247)
+* Added "Permissive" timezone parsing which allows a numeric timezone to
+  be specified without minutes. (@quodlibetor #242)
+
+## 0.4.2
+
+### Deprecations
+
+* More strongly deprecate RustcSerialize: remove it from documentation unless
+  the feature is enabled, issue a deprecation warning if the rustc-serialize
+  feature is enabled (@quodlibetor #174)
+
+### Features
+
+* Move all uses of the system clock behind a `clock` feature, for use in
+  environments where we don't have access to the current time. (@jethrogb #236)
+* Implement subtraction of two `Date`s, `Time`s, or `DateTime`s, returning a
+  `Duration` (@tobz1000 #237)
+
+## 0.4.1
+
+### Bug Fixes
+
+* Allow parsing timestamps with subsecond precision (@jonasbb)
+* RFC2822 allows times to not include the second (@upsuper)
+
+### Features
+
+* New `timestamp_millis` method on `DateTime` and `NaiveDateTim` that returns
+  number of milliseconds since the epoch. (@quodlibetor)
+* Support exact decimal width on subsecond display for RFC3339 via a new
+  `to_rfc3339_opts` method on `DateTime` (@dekellum)
+* Use no_std-compatible num dependencies (@cuviper)
+* Add `SubsecRound` trait that allows rounding to the nearest second
+  (@dekellum)
+
+### Code Hygiene and Docs
+
+* Docs! (@alatiera @kosta @quodlibetor @kennytm)
+* Run clippy and various fixes (@quodlibetor)
+
+## 0.4.0 (2017-06-22)
+
+This was originally planned as a minor release but was pushed to a major
+release due to the compatibility concern raised.
+
+### Added
+
+- `IsoWeek` has been added for the ISO week without time zone.
+
+- The `+=` and `-=` operators against `time::Duration` are now supported for
+  `NaiveDate`, `NaiveTime` and `NaiveDateTime`. (#99)
+
+  (Note that this does not invalidate the eventual deprecation of `time::Duration`.)
+
+- `SystemTime` and `DateTime<Tz>` types can be now converted to each other via `From`.
+  Due to the obvious lack of time zone information in `SystemTime`,
+  the forward direction is limited to `DateTime<Utc>` and `DateTime<Local>` only.
+
+### Changed
+
+- Intermediate implementation modules have been flattened (#161),
+  and `UTC` has been renamed to `Utc` in accordance with the current convention (#148).
+
+  The full list of changes is as follows:
+
+  Before                                   | After
+  ---------------------------------------- | ----------------------------
+  `chrono::date::Date`                     | `chrono::Date`
+  `chrono::date::MIN`                      | `chrono::MIN_DATE`
+  `chrono::date::MAX`                      | `chrono::MAX_DATE`
+  `chrono::datetime::DateTime`             | `chrono::DateTime`
+  `chrono::naive::time::NaiveTime`         | `chrono::naive::NaiveTime`
+  `chrono::naive::date::NaiveDate`         | `chrono::naive::NaiveDate`
+  `chrono::naive::date::MIN`               | `chrono::naive::MIN_DATE`
+  `chrono::naive::date::MAX`               | `chrono::naive::MAX_DATE`
+  `chrono::naive::datetime::NaiveDateTime` | `chrono::naive::NaiveDateTime`
+  `chrono::offset::utc::UTC`               | `chrono::offset::Utc`
+  `chrono::offset::fixed::FixedOffset`     | `chrono::offset::FixedOffset`
+  `chrono::offset::local::Local`           | `chrono::offset::Local`
+  `chrono::format::parsed::Parsed`         | `chrono::format::Parsed`
+
+  With an exception of `Utc`, this change does not affect any direct usage of
+  `chrono::*` or `chrono::prelude::*` types.
+
+- `Datelike::isoweekdate` is replaced by `Datelike::iso_week` which only returns the ISO week.
+
+  The original method used to return a tuple of year number, week number and day of the week,
+  but this duplicated the `Datelike::weekday` method and it had been hard to deal with
+  the raw year and week number for the ISO week date.
+  This change isolates any logic and API for the week date into a separate type.
+
+- `NaiveDateTime` and `DateTime` can now be deserialized from an integral UNIX timestamp. (#125)
+
+  This turns out to be very common input for web-related usages.
+  The existing string representation is still supported as well.
+
+- `chrono::serde` and `chrono::naive::serde` modules have been added
+  for the serialization utilities. (#125)
+
+  Currently they contain the `ts_seconds` modules that can be used to
+  serialize `NaiveDateTime` and `DateTime` values into an integral UNIX timestamp.
+  This can be combined with Serde's `[de]serialize_with` attributes
+  to fully support the (de)serialization to/from the timestamp.
+
+  For rustc-serialize, there are separate `chrono::TsSeconds` and `chrono::naive::TsSeconds` types
+  that are newtype wrappers implementing different (de)serialization logics.
+  This is a suboptimal API, however, and it is strongly recommended to migrate to Serde.
+
+### Fixed
+
+- The major version was made to fix the broken Serde dependency issues. (#146, #156, #158, #159)
+
+  The original intention to technically break the dependency was
+  to faciliate the use of Serde 1.0 at the expense of temporary breakage.
+  Whether this was appropriate or not is quite debatable,
+  but it became clear that there are several high-profile crates requiring Serde 0.9
+  and it is not feasible to force them to use Serde 1.0 anyway.
+
+  To the end, the new major release was made with some known lower-priority breaking changes.
+  0.3.1 is now yanked and any remaining 0.3 users can safely roll back to 0.3.0.
+
+- Various documentation fixes and goodies. (#92, #131, #136)
+
+## 0.3.1 (2017-05-02)
+
+### Added
+
+- `Weekday` now implements `FromStr`, `Serialize` and `Deserialize`. (#113)
+
+  The syntax is identical to `%A`, i.e. either the shortest or the longest form of English names.
+
+### Changed
+
+- Serde 1.0 is now supported. (#142)
+
+  This is technically a breaking change because Serde 0.9 and 1.0 are not compatible,
+  but this time we decided not to issue a minor version because
+  we have already seen Serde 0.8 and 0.9 compatibility problems even after 0.3.0 and
+  a new minor version turned out to be not very helpful for this kind of issues.
+
+### Fixed
+
+- Fixed a bug that the leap second can be mapped wrongly in the local time zone.
+  Only occurs when the local time zone is behind UTC. (#130)
+
+## 0.3.0 (2017-02-07)
+
+The project has moved to the [Chronotope](https://github.com/chronotope/) organization.
+
+### Added
+
+- `chrono::prelude` module has been added. All other glob imports are now discouraged.
+
+- `FixedOffset` can be added to or subtracted from any timelike types.
+
+    - `FixedOffset::local_minus_utc` and `FixedOffset::utc_minus_local` methods have been added.
+      Note that the old `Offset::local_minus_utc` method is gone; see below.
+
+- Serde support for non-self-describing formats like Bincode is added. (#89)
+
+- Added `Item::Owned{Literal,Space}` variants for owned formatting items. (#76)
+
+- Formatting items and the `Parsed` type have been slightly adjusted so that
+  they can be internally extended without breaking any compatibility.
+
+- `Weekday` is now `Hash`able. (#109)
+
+- `ParseError` now implements `Eq` as well as `PartialEq`. (#114)
+
+- More documentation improvements. (#101, #108, #112)
+
+### Changed
+
+- Chrono now only supports Rust 1.13.0 or later (previously: Rust 1.8.0 or later).
+
+- Serde 0.9 is now supported.
+  Due to the API difference, support for 0.8 or older is discontinued. (#122)
+
+- Rustc-serialize implementations are now on par with corresponding Serde implementations.
+  They both standardize on the `std::fmt::Debug` textual output.
+
+  **This is a silent breaking change (hopefully the last though).**
+  You should be prepared for the format change if you depended on rustc-serialize.
+
+- `Offset::local_minus_utc` is now `Offset::fix`, and returns `FixedOffset` instead of a duration.
+
+  This makes every time zone operation operate within a bias less than one day,
+  and vastly simplifies many logics.
+
+- `chrono::format::format` now receives `FixedOffset` instead of `time::Duration`.
+
+- The following methods and implementations have been renamed and older names have been *removed*.
+  The older names will be reused for the same methods with `std::time::Duration` in the future.
+
+    - `checked_*` → `checked_*_signed` in `Date`, `DateTime`, `NaiveDate` and `NaiveDateTime` types
+
+    - `overflowing_*` → `overflowing_*_signed` in the `NaiveTime` type
+
+    - All subtraction implementations between two time instants have been moved to
+      `signed_duration_since`, following the naming in `std::time`.
+
+### Fixed
+
+- Fixed a panic when the `Local` offset receives a leap second. (#123)
+
+### Removed
+
+- Rustc-serialize support for `Date<Tz>` types and all offset types has been dropped.
+
+  These implementations were automatically derived and never had been in a good shape.
+  Moreover there are no corresponding Serde implementations, limiting their usefulness.
+  In the future they may be revived with more complete implementations.
+
+- The following method aliases deprecated in the 0.2 branch have been removed.
+
+    - `DateTime::num_seconds_from_unix_epoch` (→ `DateTime::timestamp`)
+    - `NaiveDateTime::from_num_seconds_from_unix_epoch` (→ `NaiveDateTime::from_timestamp`)
+    - `NaiveDateTime::from_num_seconds_from_unix_epoch_opt` (→ `NaiveDateTime::from_timestamp_opt`)
+    - `NaiveDateTime::num_seconds_unix_epoch` (→ `NaiveDateTime::timestamp`)
+
+- Formatting items are no longer `Copy`, except for `chrono::format::Pad`.
+
+- `chrono::offset::add_with_leapsecond` has been removed.
+  Use a direct addition with `FixedOffset` instead.
+
+## 0.2.25 (2016-08-04)
+
+This is the last version officially supports Rust 1.12.0 or older.
+
+(0.2.24 was accidentally uploaded without a proper check for warnings in the default state,
+and replaced by 0.2.25 very shortly. Duh.)
+
+### Added
+
+- Serde 0.8 is now supported. 0.7 also remains supported. (#86)
+
+### Fixed
+
+- The deserialization implementation for rustc-serialize now properly verifies the input.
+  All serialization codes are also now thoroughly tested. (#42)
+
+## 0.2.23 (2016-08-03)
+
+### Added
+
+- The documentation was greatly improved for several types,
+  and tons of cross-references have been added. (#77, #78, #80, #82)
+
+- `DateTime::timestamp_subsec_{millis,micros,nanos}` methods have been added. (#81)
+
+### Fixed
+
+- When the system time records a leap second,
+  the nanosecond component was mistakenly reset to zero. (#84)
+
+- `Local` offset misbehaves in Windows for August and later,
+  due to the long-standing libtime bug (dates back to mid-2015).
+  Workaround has been implemented. (#85)
+
+## 0.2.22 (2016-04-22)
+
+### Fixed
+
+- `%.6f` and `%.9f` used to print only three digits when the nanosecond part is zero. (#71)
+- The documentation for `%+` has been updated to reflect the current status. (#71)
+
+## 0.2.21 (2016-03-29)
+
+### Fixed
+
+- `Fixed::LongWeekdayName` was unable to recognize `"sunday"` (whoops). (#66)
+
+## 0.2.20 (2016-03-06)
+
+### Changed
+
+- `serde` dependency has been updated to 0.7. (#63, #64)
+
+## 0.2.19 (2016-02-05)
+
+### Added
+
+- The documentation for `Date` is made clear about its ambiguity and guarantees.
+
+### Fixed
+
+- `DateTime::date` had been wrong when the local date and the UTC date is in disagreement. (#61)
+
+## 0.2.18 (2016-01-23)
+
+### Fixed
+
+- Chrono no longer pulls a superfluous `rand` dependency. (#57)
+
+## 0.2.17 (2015-11-22)
+
+### Added
+
+- Naive date and time types and `DateTime` now have a `serde` support.
+  They serialize as an ISO 8601 / RFC 3339 string just like `Debug`. (#51)
+
+## 0.2.16 (2015-09-06)
+
+### Added
+
+- Added `%.3f`, `%.6f` and `%.9f` specifier for formatting fractional seconds
+  up to 3, 6 or 9 decimal digits. This is a natural extension to the existing `%f`.
+  Note that this is (not yet) generic, no other value of precision is supported. (#45)
+
+### Changed
+
+- Forbade unsized types from implementing `Datelike` and `Timelike`.
+  This does not make a big harm as any type implementing them should be already sized
+  to be practical, but this change still can break highly generic codes. (#46)
+
+### Fixed
+
+- Fixed a broken link in the `README.md`. (#41)
+
+## 0.2.15 (2015-07-05)
+
+### Added
+
+- Padding modifiers `%_?`, `%-?` and `%0?` are implemented.
+  They are glibc extensions which seem to be reasonably widespread (e.g. Ruby).
+
+- Added `%:z` specifier and corresponding formatting items
+  which is essentially same to `%z` but with a colon.
+
+- Added a new specifier `%.f` which precision adapts from the input.
+  This was added as a response to the UX problems in the original nanosecond specifier `%f`.
+
+### Fixed
+
+- `Numeric::Timestamp` specifier (`%s`) was ignoring the time zone offset when provided.
+
+- Improved the documentation and associated tests for `strftime`.
+
+## 0.2.14 (2015-05-15)
+
+### Fixed
+
+- `NaiveDateTime +/- Duration` or `NaiveTime +/- Duration` could have gone wrong
+  when the `Duration` to be added is negative and has a fractional second part.
+  This was caused by an underflow in the conversion from `Duration` to the parts;
+  the lack of tests for this case allowed a bug. (#37)
+
+## 0.2.13 (2015-04-29)
+
+### Added
+
+- The optional dependency on `rustc_serialize` and
+  relevant `Rustc{En,De}codable` implementations for supported types has been added.
+  This is enabled by the `rustc-serialize` Cargo feature. (#34)
+
+### Changed
+
+- `chrono::Duration` reexport is changed to that of crates.io `time` crate.
+  This enables Rust 1.0 beta compatibility.
+
+## 0.2.4 (2015-03-03)
+
+### Fixed
+
+- Clarified the meaning of `Date<Tz>` and fixed unwanted conversion problem
+  that only occurs with positive UTC offsets. (#27)
+
+## 0.2.3 (2015-02-27)
+
+### Added
+
+- `DateTime<Tz>` and `Date<Tz>` is now `Copy`/`Send` when `Tz::Offset` is `Copy`/`Send`.
+  The implementations for them were mistakenly omitted. (#25)
+
+### Fixed
+
+- `Local::from_utc_datetime` didn't set a correct offset. (#26)
+
+## 0.2.1 (2015-02-21)
+
+### Changed
+
+- `DelayedFormat` no longer conveys a redundant lifetime.
+
+## 0.2.0 (2015-02-19)
+
+### Added
+
+- `Offset` is splitted into `TimeZone` (constructor) and `Offset` (storage) types.
+  You would normally see only the former, as the latter is mostly an implementation detail.
+  Most importantly, `Local` now can be used to directly construct timezone-aware values.
+
+  Some types (currently, `UTC` and `FixedOffset`) are both `TimeZone` and `Offset`,
+  but others aren't (e.g. `Local` is not what is being stored to each `DateTime` values).
+
+- `LocalResult::map` convenience method has been added.
+
+- `TimeZone` now allows a construction of `DateTime` values from UNIX timestamp,
+  via `timestamp` and `timestamp_opt` methods.
+
+- `TimeZone` now also has a method for parsing `DateTime`, namely `datetime_from_str`.
+
+- The following methods have been added to all date and time types:
+
+    - `checked_add`
+    - `checked_sub`
+    - `format_with_items`
+
+- The following methods have been added to all timezone-aware types:
+
+    - `timezone`
+    - `with_timezone`
+    - `naive_utc`
+    - `naive_local`
+
+- `parse_from_str` method has been added to all naive types and `DateTime<FixedOffset>`.
+
+- All naive types and instances of `DateTime` with time zones `UTC`, `Local` and `FixedOffset`
+  implement the `FromStr` trait. They parse what `std::fmt::Debug` would print.
+
+- `chrono::format` has been greatly rewritten.
+
+    - The formatting syntax parser is modular now, available at `chrono::format::strftime`.
+
+    - The parser and resolution algorithm is also modular, the former is available at
+      `chrono::format::parse` while the latter is available at `chrono::format::parsed`.
+
+    - Explicit support for RFC 2822 and 3339 syntaxes is landed.
+
+    - There is a minor formatting difference with atypical values,
+      e.g. for years not between 1 BCE and 9999 CE.
+
+### Changed
+
+- Most uses of `Offset` are converted to `TimeZone`.
+  In fact, *all* user-facing code is expected to be `Offset`-free.
+
+- `[Naive]DateTime::*num_seconds_from_unix_epoch*` methods have been renamed to
+  simply `timestamp` or `from_timestamp*`. The original names have been deprecated.
+
+### Removed
+
+- `Time` has been removed. This also prompts a related set of methods in `TimeZone`.
+
+  This is in principle possible, but in practice has seen a little use
+  because it can only be meaningfully constructed via an existing `DateTime` value.
+  This made many operations to `Time` unintuitive or ambiguous,
+  so we simply let it go.
+
+  In the case that `Time` is really required, one can use a simpler `NaiveTime`.
+  `NaiveTime` and `NaiveDate` can be freely combined and splitted,
+  and `TimeZone::from_{local,utc}_datetime` can be used to convert from/to the local time.
+
+- `with_offset` method has been removed. Use `with_timezone` method instead.
+  (This is not deprecated since it is an integral part of offset reform.)
+
+## 0.1.14 (2015-01-10)
+
+### Added
+
+- Added a missing `std::fmt::String` impl for `Local`.
+
+## 0.1.13 (2015-01-10)
+
+### Changed
+
+- Most types now implement both `std::fmt::Show` and `std::fmt::String`,
+  with the former used for the stricter output and the latter used for more casual output.
+
+### Removed
+
+- `Offset::name` has been replaced by a `std::fmt::String` implementation to `Offset`.
+
+## 0.1.12 (2015-01-08)
+
+### Removed
+
+- `Duration + T` no longer works due to the updated impl reachability rules.
+  Use `T + Duration` as a workaround.
+
+## 0.1.4 (2014-12-13)
+
+### Fixed
+
+- Fixed a bug that `Date::and_*` methods with an offset that can change the date are
+  off by one day.
+
+## 0.1.3 (2014-11-28)
+
+### Added
+
+- `{Date,Time,DateTime}::with_offset` methods have been added.
+
+- `LocalResult` now implements a common set of traits.
+
+- `LocalResult::and_*` methods have been added.
+  They are useful for safely chaining `LocalResult<Date<Off>>` methods
+  to make `LocalResult<DateTime<Off>>`.
+
+### Changed
+
+- `Offset::name` now returns `SendStr`.
+
+- `{Date,Time} - Duration` overloadings are now allowed.
+
+## 0.1.2 (2014-11-24)
+
+### Added
+
+- `Duration + Date` overloading is now allowed.
+
+### Changed
+
+- Chrono no longer needs `num` dependency.
+
+## 0.1.0 (2014-11-20)
+
+The initial version that was available to `crates.io`.
+
diff -Nru cargo-0.32.0/vendor/chrono/ci/fix-readme.sh cargo-0.33.0/vendor/chrono/ci/fix-readme.sh
--- cargo-0.32.0/vendor/chrono/ci/fix-readme.sh	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/ci/fix-readme.sh	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+VERSION="$( cargo read-manifest | python -c 'import json, sys; print(json.load(sys.stdin)["version"])')"
+LIB="$1"
+
+# Make the Chrono in the header a link to the docs
+awk '/^\/\/! # Chrono: / { print "[Chrono][docsrs]:", substr($0, index($0, $4))}' "$LIB"
+awk '/^\/\/! # Chrono: / { print "[Chrono][docsrs]:", substr($0, index($0, $4))}' "$LIB" | sed 's/./=/g'
+# Add all the badges
+echo '
+[![Chrono on Travis CI][travis-image]][travis]
+[![Chrono on Appveyor][appveyor-image]][appveyor]
+[![Chrono on crates.io][cratesio-image]][cratesio]
+[![Chrono on docs.rs][docsrs-image]][docsrs]
+[![Join the chat at https://gitter.im/chrono-rs/chrono][gitter-image]][gitter]
+
+[travis-image]: https://travis-ci.org/chronotope/chrono.svg?branch=master
+[travis]: https://travis-ci.org/chronotope/chrono
+[appveyor-image]: https://ci.appveyor.com/api/projects/status/2ia91ofww4w31m2w/branch/master?svg=true
+[appveyor]: https://ci.appveyor.com/project/chronotope/chrono
+[cratesio-image]: https://img.shields.io/crates/v/chrono.svg
+[cratesio]: https://crates.io/crates/chrono
+[docsrs-image]: https://docs.rs/chrono/badge.svg
+[docsrs]: https://docs.rs/chrono
+[gitter-image]: https://badges.gitter.im/chrono-rs/chrono.svg
+[gitter]: https://gitter.im/chrono-rs/chrono'
+
+# print the section between the header and the usage
+awk '/^\/\/! # Chrono:/,/^\/\/! ## /' "$LIB" | cut -b 5- | grep -v '^#' | \
+    sed 's/](\.\//](https:\/\/docs.rs\/chrono\/'$VERSION'\/chrono\//g'
+echo
+# Replace relative doc links with links to this exact version of docs on
+# docs.rs
+awk '/^\/\/! ## /,!/^\/\/!/' "$LIB" | cut -b 5- | grep -v '^# ' | \
+    sed 's/](\.\//](https:\/\/docs.rs\/chrono\/'$VERSION'\/chrono\//g' \
diff -Nru cargo-0.32.0/vendor/chrono/ci/travis.sh cargo-0.33.0/vendor/chrono/ci/travis.sh
--- cargo-0.32.0/vendor/chrono/ci/travis.sh	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/ci/travis.sh	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# This is the script that's executed by travis, you can run it yourself to run
+# the exact same suite
+
+set -e
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+channel() {
+    if [ -n "${TRAVIS}" ]; then
+        if [ "${TRAVIS_RUST_VERSION}" = "${CHANNEL}" ]; then
+            pwd
+            (set -x; cargo "$@")
+        fi
+    elif [ -n "${APPVEYOR}" ]; then
+        if [ "${APPVEYOR_RUST_CHANNEL}" = "${CHANNEL}" ]; then
+            pwd
+            (set -x; cargo "$@")
+        fi
+    else
+        pwd
+        (set -x; cargo "+${CHANNEL}" "$@")
+    fi
+}
+
+build_and_test() {
+  # interleave building and testing in hope that it saves time
+  # also vary the local time zone to (hopefully) catch tz-dependent bugs
+  # also avoid doc-testing multiple times---it takes a lot and rarely helps
+  cargo clean
+  channel build -v
+  TZ=ACST-9:30 channel test -v --lib
+  channel build -v --features rustc-serialize
+  TZ=EST4 channel test -v --features rustc-serialize --lib
+  channel build -v --features serde
+  TZ=UTC0 channel test -v --features serde --lib
+  channel build -v --features serde,rustc-serialize
+  TZ=Asia/Katmandu channel test -v --features serde,rustc-serialize
+
+  # without default "clock" feature
+  channel build -v --no-default-features
+  TZ=ACST-9:30 channel test -v --no-default-features --lib
+  channel build -v --no-default-features --features rustc-serialize
+  TZ=EST4 channel test -v --no-default-features --features rustc-serialize --lib
+  channel build -v --no-default-features --features serde
+  TZ=UTC0 channel test -v --no-default-features --features serde --lib
+  channel build -v --no-default-features --features serde,rustc-serialize
+  TZ=Asia/Katmandu channel test -v --no-default-features --features serde,rustc-serialize --lib
+
+  if [[ "$CHANNEL" == stable ]]; then
+      if [[ -n "$TRAVIS" ]] ; then
+          check_readme
+      fi
+  fi
+}
+
+build_only() {
+  # Rust 1.13 doesn't support custom derive, so, to avoid doctests which
+  # validate that, we just build there.
+  cargo clean
+  channel build -v
+  channel build -v --features rustc-serialize
+  channel build -v --features 'serde bincode'
+  channel build -v --no-default-features
+}
+
+run_clippy() {
+    # cached installation will not work on a later nightly
+    if [ -n "${TRAVIS}" ] && ! cargo install clippy --debug --force; then
+        echo "COULD NOT COMPILE CLIPPY, IGNORING CLIPPY TESTS"
+        exit
+    fi
+
+    cargo clippy --features 'serde bincode rustc-serialize' -- -Dclippy
+}
+
+check_readme() {
+    make readme
+    (set -x; git diff --exit-code -- README.md) ; echo $?
+}
+
+rustc --version
+cargo --version
+
+CHANNEL=nightly
+if [ "x${CLIPPY}" = xy ] ; then
+    run_clippy
+else
+    build_and_test
+fi
+
+CHANNEL=beta
+build_and_test
+
+CHANNEL=stable
+build_and_test
+
+CHANNEL=1.13.0
+build_only
diff -Nru cargo-0.32.0/vendor/chrono/LICENSE.txt cargo-0.33.0/vendor/chrono/LICENSE.txt
--- cargo-0.32.0/vendor/chrono/LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/LICENSE.txt	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,240 @@
+Rust-chrono is dual-licensed under The MIT License [1] and
+Apache 2.0 License [2]. Copyright (c) 2014--2017, Kang Seonghoon and
+contributors.
+
+Nota Bene: This is same as the Rust Project's own license.
+
+
+[1]: <http://opensource.org/licenses/MIT>, which is reproduced below:
+
+~~~~
+The MIT License (MIT)
+
+Copyright (c) 2014, Kang Seonghoon.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+~~~~
+
+
+[2]: <http://www.apache.org/licenses/LICENSE-2.0>, which is reproduced below:
+
+~~~~
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
+~~~~
+
diff -Nru cargo-0.32.0/vendor/chrono/Makefile cargo-0.33.0/vendor/chrono/Makefile
--- cargo-0.32.0/vendor/chrono/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/Makefile	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,30 @@
+# this Makefile is mostly for the packaging convenience.
+# casual users should use `cargo` to retrieve the appropriate version of Chrono.
+
+.PHONY: all
+all:
+	@echo 'Try `cargo build` instead.'
+
+.PHONY: authors
+authors:
+	echo 'Chrono is mainly written by Kang Seonghoon <public+rust@mearie.org>,' > AUTHORS.txt
+	echo 'and also the following people (in ascending order):' >> AUTHORS.txt
+	echo >> AUTHORS.txt
+	git log --format='%aN <%aE>' | grep -v 'Kang Seonghoon' | sort -u >> AUTHORS.txt
+
+.PHONY: readme README.md
+readme: README.md
+
+README.md: src/lib.rs
+	( ./ci/fix-readme.sh $< ) > $@
+
+.PHONY: test
+test:
+	TZ=UTC0 cargo test --features 'serde rustc-serialize bincode' --lib
+	TZ=ACST-9:30 cargo test --features 'serde rustc-serialize bincode' --lib
+	TZ=EST4 cargo test --features 'serde rustc-serialize bincode'
+
+.PHONY: doc
+doc: authors readme
+	cargo doc --features 'serde rustc-serialize bincode'
+
diff -Nru cargo-0.32.0/vendor/chrono/README.md cargo-0.33.0/vendor/chrono/README.md
--- cargo-0.32.0/vendor/chrono/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,391 @@
+[Chrono][docsrs]: Date and Time for Rust
+========================================
+
+[![Chrono on Travis CI][travis-image]][travis]
+[![Chrono on Appveyor][appveyor-image]][appveyor]
+[![Chrono on crates.io][cratesio-image]][cratesio]
+[![Chrono on docs.rs][docsrs-image]][docsrs]
+[![Join the chat at https://gitter.im/chrono-rs/chrono][gitter-image]][gitter]
+
+[travis-image]: https://travis-ci.org/chronotope/chrono.svg?branch=master
+[travis]: https://travis-ci.org/chronotope/chrono
+[appveyor-image]: https://ci.appveyor.com/api/projects/status/2ia91ofww4w31m2w/branch/master?svg=true
+[appveyor]: https://ci.appveyor.com/project/chronotope/chrono
+[cratesio-image]: https://img.shields.io/crates/v/chrono.svg
+[cratesio]: https://crates.io/crates/chrono
+[docsrs-image]: https://docs.rs/chrono/badge.svg
+[docsrs]: https://docs.rs/chrono
+[gitter-image]: https://badges.gitter.im/chrono-rs/chrono.svg
+[gitter]: https://gitter.im/chrono-rs/chrono
+
+It aims to be a feature-complete superset of
+the [time](https://github.com/rust-lang-deprecated/time) library.
+In particular,
+
+* Chrono strictly adheres to ISO 8601.
+* Chrono is timezone-aware by default, with separate timezone-naive types.
+* Chrono is space-optimal and (while not being the primary goal) reasonably efficient.
+
+There were several previous attempts to bring a good date and time library to Rust,
+which Chrono builds upon and should acknowledge:
+
+* [Initial research on
+   the wiki](https://github.com/rust-lang/rust-wiki-backup/blob/master/Lib-datetime.md)
+* Dietrich Epp's [datetime-rs](https://github.com/depp/datetime-rs)
+* Luis de Bethencourt's [rust-datetime](https://github.com/luisbg/rust-datetime)
+
+Any significant changes to Chrono are documented in
+the [`CHANGELOG.md`](https://github.com/chronotope/chrono/blob/master/CHANGELOG.md) file.
+
+
+## Usage
+
+Put this in your `Cargo.toml`:
+
+```toml
+[dependencies]
+chrono = "0.4"
+```
+
+Or, if you want [Serde](https://github.com/serde-rs/serde) include the
+feature like this:
+
+```toml
+[dependencies]
+chrono = { version = "0.4", features = ["serde"] }
+```
+
+Then put this in your crate root:
+
+```rust
+extern crate chrono;
+```
+
+Avoid using `use chrono::*;` as Chrono exports several modules other than types.
+If you prefer the glob imports, use the following instead:
+
+```rust
+use chrono::prelude::*;
+```
+
+## Overview
+
+### Duration
+
+Chrono currently uses
+the [`time::Duration`](https://docs.rs/time/0.1.40/time/struct.Duration.html) type
+from the `time` crate to represent the magnitude of a time span.
+Since this has the same name to the newer, standard type for duration,
+the reference will refer this type as `OldDuration`.
+Note that this is an "accurate" duration represented as seconds and
+nanoseconds and does not represent "nominal" components such as days or
+months.
+
+Chrono does not yet natively support
+the standard [`Duration`](https://docs.rs/time/0.1.40/time/struct.Duration.html) type,
+but it will be supported in the future.
+Meanwhile you can convert between two types with
+[`Duration::from_std`](https://docs.rs/time/0.1.40/time/struct.Duration.html#method.from_std)
+and
+[`Duration::to_std`](https://docs.rs/time/0.1.40/time/struct.Duration.html#method.to_std)
+methods.
+
+### Date and Time
+
+Chrono provides a
+[**`DateTime`**](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html)
+type to represent a date and a time in a timezone.
+
+For more abstract moment-in-time tracking such as internal timekeeping
+that is unconcerned with timezones, consider
+[`time::SystemTime`](https://doc.rust-lang.org/std/time/struct.SystemTime.html),
+which tracks your system clock, or
+[`time::Instant`](https://doc.rust-lang.org/std/time/struct.Instant.html), which
+is an opaque but monotonically-increasing representation of a moment in time.
+
+`DateTime` is timezone-aware and must be constructed from
+the [**`TimeZone`**](https://docs.rs/chrono/0.4.6/chrono/offset/trait.TimeZone.html) object,
+which defines how the local date is converted to and back from the UTC date.
+There are three well-known `TimeZone` implementations:
+
+* [**`Utc`**](https://docs.rs/chrono/0.4.6/chrono/offset/struct.Utc.html) specifies the UTC time zone. It is most efficient.
+
+* [**`Local`**](https://docs.rs/chrono/0.4.6/chrono/offset/struct.Local.html) specifies the system local time zone.
+
+* [**`FixedOffset`**](https://docs.rs/chrono/0.4.6/chrono/offset/struct.FixedOffset.html) specifies
+  an arbitrary, fixed time zone such as UTC+09:00 or UTC-10:30.
+  This often results from the parsed textual date and time.
+  Since it stores the most information and does not depend on the system environment,
+  you would want to normalize other `TimeZone`s into this type.
+
+`DateTime`s with different `TimeZone` types are distinct and do not mix,
+but can be converted to each other using
+the [`DateTime::with_timezone`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.with_timezone) method.
+
+You can get the current date and time in the UTC time zone
+([`Utc::now()`](https://docs.rs/chrono/0.4.6/chrono/offset/struct.Utc.html#method.now))
+or in the local time zone
+([`Local::now()`](https://docs.rs/chrono/0.4.6/chrono/offset/struct.Local.html#method.now)).
+
+```rust
+use chrono::prelude::*;
+
+let utc: DateTime<Utc> = Utc::now();       // e.g. `2014-11-28T12:45:59.324310806Z`
+let local: DateTime<Local> = Local::now(); // e.g. `2014-11-28T21:45:59.324310806+09:00`
+```
+
+Alternatively, you can create your own date and time.
+This is a bit verbose due to Rust's lack of function and method overloading,
+but in turn we get a rich combination of initialization methods.
+
+```rust
+use chrono::prelude::*;
+use chrono::offset::LocalResult;
+
+let dt = Utc.ymd(2014, 7, 8).and_hms(9, 10, 11); // `2014-07-08T09:10:11Z`
+// July 8 is 188th day of the year 2014 (`o` for "ordinal")
+assert_eq!(dt, Utc.yo(2014, 189).and_hms(9, 10, 11));
+// July 8 is Tuesday in ISO week 28 of the year 2014.
+assert_eq!(dt, Utc.isoywd(2014, 28, Weekday::Tue).and_hms(9, 10, 11));
+
+let dt = Utc.ymd(2014, 7, 8).and_hms_milli(9, 10, 11, 12); // `2014-07-08T09:10:11.012Z`
+assert_eq!(dt, Utc.ymd(2014, 7, 8).and_hms_micro(9, 10, 11, 12_000));
+assert_eq!(dt, Utc.ymd(2014, 7, 8).and_hms_nano(9, 10, 11, 12_000_000));
+
+// dynamic verification
+assert_eq!(Utc.ymd_opt(2014, 7, 8).and_hms_opt(21, 15, 33),
+           LocalResult::Single(Utc.ymd(2014, 7, 8).and_hms(21, 15, 33)));
+assert_eq!(Utc.ymd_opt(2014, 7, 8).and_hms_opt(80, 15, 33), LocalResult::None);
+assert_eq!(Utc.ymd_opt(2014, 7, 38).and_hms_opt(21, 15, 33), LocalResult::None);
+
+// other time zone objects can be used to construct a local datetime.
+// obviously, `local_dt` is normally different from `dt`, but `fixed_dt` should be identical.
+let local_dt = Local.ymd(2014, 7, 8).and_hms_milli(9, 10, 11, 12);
+let fixed_dt = FixedOffset::east(9 * 3600).ymd(2014, 7, 8).and_hms_milli(18, 10, 11, 12);
+assert_eq!(dt, fixed_dt);
+```
+
+Various properties are available to the date and time, and can be altered individually.
+Most of them are defined in the traits [`Datelike`](https://docs.rs/chrono/0.4.6/chrono/trait.Datelike.html) and
+[`Timelike`](https://docs.rs/chrono/0.4.6/chrono/trait.Timelike.html) which you should `use` before.
+Addition and subtraction is also supported.
+The following illustrates most supported operations to the date and time:
+
+```rust
+use chrono::prelude::*;
+use time::Duration;
+
+// assume this returned `2014-11-28T21:45:59.324310806+09:00`:
+let dt = Local::now();
+
+// property accessors
+assert_eq!((dt.year(), dt.month(), dt.day()), (2014, 11, 28));
+assert_eq!((dt.month0(), dt.day0()), (10, 27)); // for unfortunate souls
+assert_eq!((dt.hour(), dt.minute(), dt.second()), (21, 45, 59));
+assert_eq!(dt.weekday(), Weekday::Fri);
+assert_eq!(dt.weekday().number_from_monday(), 5); // Mon=1, ..., Sat=7
+assert_eq!(dt.ordinal(), 332); // the day of year
+assert_eq!(dt.num_days_from_ce(), 735565); // the number of days from and including Jan 1, 1
+
+// time zone accessor and manipulation
+assert_eq!(dt.offset().fix().local_minus_utc(), 9 * 3600);
+assert_eq!(dt.timezone(), FixedOffset::east(9 * 3600));
+assert_eq!(dt.with_timezone(&Utc), Utc.ymd(2014, 11, 28).and_hms_nano(12, 45, 59, 324310806));
+
+// a sample of property manipulations (validates dynamically)
+assert_eq!(dt.with_day(29).unwrap().weekday(), Weekday::Sat); // 2014-11-29 is Saturday
+assert_eq!(dt.with_day(32), None);
+assert_eq!(dt.with_year(-300).unwrap().num_days_from_ce(), -109606); // November 29, 301 BCE
+
+// arithmetic operations
+let dt1 = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
+let dt2 = Utc.ymd(2014, 11, 14).and_hms(10, 9, 8);
+assert_eq!(dt1.signed_duration_since(dt2), Duration::seconds(-2 * 3600 + 2));
+assert_eq!(dt2.signed_duration_since(dt1), Duration::seconds(2 * 3600 - 2));
+assert_eq!(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0) + Duration::seconds(1_000_000_000),
+           Utc.ymd(2001, 9, 9).and_hms(1, 46, 40));
+assert_eq!(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0) - Duration::seconds(1_000_000_000),
+           Utc.ymd(1938, 4, 24).and_hms(22, 13, 20));
+```
+
+### Formatting and Parsing
+
+Formatting is done via the [`format`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.format) method,
+which format is equivalent to the familiar `strftime` format.
+
+See [`format::strftime`](https://docs.rs/chrono/0.4.6/chrono/format/strftime/index.html#specifiers)
+documentation for full syntax and list of specifiers.
+
+The default `to_string` method and `{:?}` specifier also give a reasonable representation.
+Chrono also provides [`to_rfc2822`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.to_rfc2822) and
+[`to_rfc3339`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.to_rfc3339) methods
+for well-known formats.
+
+```rust
+use chrono::prelude::*;
+
+let dt = Utc.ymd(2014, 11, 28).and_hms(12, 0, 9);
+assert_eq!(dt.format("%Y-%m-%d %H:%M:%S").to_string(), "2014-11-28 12:00:09");
+assert_eq!(dt.format("%a %b %e %T %Y").to_string(), "Fri Nov 28 12:00:09 2014");
+assert_eq!(dt.format("%a %b %e %T %Y").to_string(), dt.format("%c").to_string());
+
+assert_eq!(dt.to_string(), "2014-11-28 12:00:09 UTC");
+assert_eq!(dt.to_rfc2822(), "Fri, 28 Nov 2014 12:00:09 +0000");
+assert_eq!(dt.to_rfc3339(), "2014-11-28T12:00:09+00:00");
+assert_eq!(format!("{:?}", dt), "2014-11-28T12:00:09Z");
+
+// Note that milli/nanoseconds are only printed if they are non-zero
+let dt_nano = Utc.ymd(2014, 11, 28).and_hms_nano(12, 0, 9, 1);
+assert_eq!(format!("{:?}", dt_nano), "2014-11-28T12:00:09.000000001Z");
+```
+
+Parsing can be done with three methods:
+
+1. The standard [`FromStr`](https://doc.rust-lang.org/std/str/trait.FromStr.html) trait
+   (and [`parse`](https://doc.rust-lang.org/std/primitive.str.html#method.parse) method
+   on a string) can be used for parsing `DateTime<FixedOffset>`, `DateTime<Utc>` and
+   `DateTime<Local>` values. This parses what the `{:?}`
+   ([`std::fmt::Debug`](https://doc.rust-lang.org/std/fmt/trait.Debug.html))
+   format specifier prints, and requires the offset to be present.
+
+2. [`DateTime::parse_from_str`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.parse_from_str) parses
+   a date and time with offsets and returns `DateTime<FixedOffset>`.
+   This should be used when the offset is a part of input and the caller cannot guess that.
+   It *cannot* be used when the offset can be missing.
+   [`DateTime::parse_from_rfc2822`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.parse_from_rfc2822)
+   and
+   [`DateTime::parse_from_rfc3339`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.parse_from_rfc3339)
+   are similar but for well-known formats.
+
+3. [`Offset::datetime_from_str`](https://docs.rs/chrono/0.4.6/chrono/offset/trait.TimeZone.html#method.datetime_from_str) is
+   similar but returns `DateTime` of given offset.
+   When the explicit offset is missing from the input, it simply uses given offset.
+   It issues an error when the input contains an explicit offset different
+   from the current offset.
+
+More detailed control over the parsing process is available via
+[`format`](https://docs.rs/chrono/0.4.6/chrono/format/index.html) module.
+
+```rust
+use chrono::prelude::*;
+
+let dt = Utc.ymd(2014, 11, 28).and_hms(12, 0, 9);
+let fixed_dt = dt.with_timezone(&FixedOffset::east(9*3600));
+
+// method 1
+assert_eq!("2014-11-28T12:00:09Z".parse::<DateTime<Utc>>(), Ok(dt.clone()));
+assert_eq!("2014-11-28T21:00:09+09:00".parse::<DateTime<Utc>>(), Ok(dt.clone()));
+assert_eq!("2014-11-28T21:00:09+09:00".parse::<DateTime<FixedOffset>>(), Ok(fixed_dt.clone()));
+
+// method 2
+assert_eq!(DateTime::parse_from_str("2014-11-28 21:00:09 +09:00", "%Y-%m-%d %H:%M:%S %z"),
+           Ok(fixed_dt.clone()));
+assert_eq!(DateTime::parse_from_rfc2822("Fri, 28 Nov 2014 21:00:09 +0900"),
+           Ok(fixed_dt.clone()));
+assert_eq!(DateTime::parse_from_rfc3339("2014-11-28T21:00:09+09:00"), Ok(fixed_dt.clone()));
+
+// method 3
+assert_eq!(Utc.datetime_from_str("2014-11-28 12:00:09", "%Y-%m-%d %H:%M:%S"), Ok(dt.clone()));
+assert_eq!(Utc.datetime_from_str("Fri Nov 28 12:00:09 2014", "%a %b %e %T %Y"), Ok(dt.clone()));
+
+// oops, the year is missing!
+assert!(Utc.datetime_from_str("Fri Nov 28 12:00:09", "%a %b %e %T %Y").is_err());
+// oops, the format string does not include the year at all!
+assert!(Utc.datetime_from_str("Fri Nov 28 12:00:09", "%a %b %e %T").is_err());
+// oops, the weekday is incorrect!
+assert!(Utc.datetime_from_str("Sat Nov 28 12:00:09 2014", "%a %b %e %T %Y").is_err());
+```
+
+Again : See [`format::strftime`](https://docs.rs/chrono/0.4.6/chrono/format/strftime/index.html#specifiers)
+documentation for full syntax and list of specifiers.
+
+### Conversion from and to EPOCH timestamps
+
+Use [`Utc.timestamp(seconds, nanoseconds)`](https://docs.rs/chrono/0.4.6/chrono/offset/trait.TimeZone.html#method.timestamp)
+to construct a [`DateTime<Utc>`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html) from a UNIX timestamp
+(seconds, nanoseconds that passed since January 1st 1970).
+
+Use [`DateTime.timestamp`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.timestamp) to get the timestamp (in seconds)
+from a [`DateTime`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html). Additionally, you can use
+[`DateTime.timestamp_subsec_nanos`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.timestamp_subsec_nanos)
+to get the number of additional number of nanoseconds.
+
+```rust
+// We need the trait in scope to use Utc::timestamp().
+use chrono::TimeZone;
+
+// Construct a datetime from epoch:
+let dt = Utc.timestamp(1_500_000_000, 0);
+assert_eq!(dt.to_rfc2822(), "Fri, 14 Jul 2017 02:40:00 +0000");
+
+// Get epoch value from a datetime:
+let dt = DateTime::parse_from_rfc2822("Fri, 14 Jul 2017 02:40:00 +0000").unwrap();
+assert_eq!(dt.timestamp(), 1_500_000_000);
+```
+
+### Individual date
+
+Chrono also provides an individual date type ([**`Date`**](https://docs.rs/chrono/0.4.6/chrono/struct.Date.html)).
+It also has time zones attached, and have to be constructed via time zones.
+Most operations available to `DateTime` are also available to `Date` whenever appropriate.
+
+```rust
+use chrono::prelude::*;
+use chrono::offset::LocalResult;
+
+assert_eq!(Utc::today(), Utc::now().date());
+assert_eq!(Local::today(), Local::now().date());
+
+assert_eq!(Utc.ymd(2014, 11, 28).weekday(), Weekday::Fri);
+assert_eq!(Utc.ymd_opt(2014, 11, 31), LocalResult::None);
+assert_eq!(Utc.ymd(2014, 11, 28).and_hms_milli(7, 8, 9, 10).format("%H%M%S").to_string(),
+           "070809");
+```
+
+There is no timezone-aware `Time` due to the lack of usefulness and also the complexity.
+
+`DateTime` has [`date`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.date) method
+which returns a `Date` which represents its date component.
+There is also a [`time`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.time) method,
+which simply returns a naive local time described below.
+
+### Naive date and time
+
+Chrono provides naive counterparts to `Date`, (non-existent) `Time` and `DateTime`
+as [**`NaiveDate`**](https://docs.rs/chrono/0.4.6/chrono/naive/struct.NaiveDate.html),
+[**`NaiveTime`**](https://docs.rs/chrono/0.4.6/chrono/naive/struct.NaiveTime.html) and
+[**`NaiveDateTime`**](https://docs.rs/chrono/0.4.6/chrono/naive/struct.NaiveDateTime.html) respectively.
+
+They have almost equivalent interfaces as their timezone-aware twins,
+but are not associated to time zones obviously and can be quite low-level.
+They are mostly useful for building blocks for higher-level types.
+
+Timezone-aware `DateTime` and `Date` types have two methods returning naive versions:
+[`naive_local`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.naive_local) returns
+a view to the naive local time,
+and [`naive_utc`](https://docs.rs/chrono/0.4.6/chrono/struct.DateTime.html#method.naive_utc) returns
+a view to the naive UTC time.
+
+## Limitations
+
+Only proleptic Gregorian calendar (i.e. extended to support older dates) is supported.
+Be very careful if you really have to deal with pre-20C dates, they can be in Julian or others.
+
+Date types are limited in about +/- 262,000 years from the common epoch.
+Time types are limited in the nanosecond accuracy.
+
+[Leap seconds are supported in the representation but
+Chrono doesn't try to make use of them](https://docs.rs/chrono/0.4.6/chrono/naive/struct.NaiveTime.html#leap-second-handling).
+(The main reason is that leap seconds are not really predictable.)
+Almost *every* operation over the possible leap seconds will ignore them.
+Consider using `NaiveDateTime` with the implicit TAI (International Atomic Time) scale
+if you want.
+
+Chrono inherently does not support an inaccurate or partial date and time representation.
+Any operation that can be ambiguous will return `None` in such cases.
+For example, "a month later" of 2014-01-30 is not well-defined
+and consequently `Utc.ymd(2014, 1, 30).with_month(2)` returns `None`.
+
+Advanced time zone handling is not yet supported.
+For now you can try the [Chrono-tz](https://github.com/chronotope/chrono-tz/) crate instead.
+
diff -Nru cargo-0.32.0/vendor/chrono/src/date.rs cargo-0.33.0/vendor/chrono/src/date.rs
--- cargo-0.32.0/vendor/chrono/src/date.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/date.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,383 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! ISO 8601 calendar date with time zone.
+
+use std::{fmt, hash};
+use std::cmp::Ordering;
+use std::ops::{Add, Sub};
+use oldtime::Duration as OldDuration;
+
+use {Weekday, Datelike};
+use offset::{TimeZone, Utc};
+use naive::{self, NaiveDate, NaiveTime, IsoWeek};
+use DateTime;
+use format::{Item, DelayedFormat, StrftimeItems};
+
+/// ISO 8601 calendar date with time zone.
+///
+/// This type should be considered ambiguous at best,
+/// due to the inherent lack of precision required for the time zone resolution.
+/// For serialization and deserialization uses, it is best to use `NaiveDate` instead.
+/// There are some guarantees on the usage of `Date<Tz>`:
+///
+/// - If properly constructed via `TimeZone::ymd` and others without an error,
+///   the corresponding local date should exist for at least a moment.
+///   (It may still have a gap from the offset changes.)
+///
+/// - The `TimeZone` is free to assign *any* `Offset` to the local date,
+///   as long as that offset did occur in given day.
+///   For example, if `2015-03-08T01:59-08:00` is followed by `2015-03-08T03:00-07:00`,
+///   it may produce either `2015-03-08-08:00` or `2015-03-08-07:00`
+///   but *not* `2015-03-08+00:00` and others.
+///
+/// - Once constructed as a full `DateTime`,
+///   `DateTime::date` and other associated methods should return those for the original `Date`.
+///   For example, if `dt = tz.ymd(y,m,d).hms(h,n,s)` were valid, `dt.date() == tz.ymd(y,m,d)`.
+///
+/// - The date is timezone-agnostic up to one day (i.e. practically always),
+///   so the local date and UTC date should be equal for most cases
+///   even though the raw calculation between `NaiveDate` and `Duration` may not.
+#[derive(Clone)]
+pub struct Date<Tz: TimeZone> {
+    date: NaiveDate,
+    offset: Tz::Offset,
+}
+
+/// The minimum possible `Date`.
+pub const MIN_DATE: Date<Utc> = Date { date: naive::MIN_DATE, offset: Utc };
+/// The maximum possible `Date`.
+pub const MAX_DATE: Date<Utc> = Date { date: naive::MAX_DATE, offset: Utc };
+
+impl<Tz: TimeZone> Date<Tz> {
+    /// Makes a new `Date` with given *UTC* date and offset.
+    /// The local date should be constructed via the `TimeZone` trait.
+    //
+    // note: this constructor is purposedly not named to `new` to discourage the direct usage.
+    #[inline]
+    pub fn from_utc(date: NaiveDate, offset: Tz::Offset) -> Date<Tz> {
+        Date { date: date, offset: offset }
+    }
+
+    /// Makes a new `DateTime` from the current date and given `NaiveTime`.
+    /// The offset in the current date is preserved.
+    ///
+    /// Panics on invalid datetime.
+    #[inline]
+    pub fn and_time(&self, time: NaiveTime) -> Option<DateTime<Tz>> {
+        let localdt = self.naive_local().and_time(time);
+        self.timezone().from_local_datetime(&localdt).single()
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute and second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Panics on invalid hour, minute and/or second.
+    #[inline]
+    pub fn and_hms(&self, hour: u32, min: u32, sec: u32) -> DateTime<Tz> {
+        self.and_hms_opt(hour, min, sec).expect("invalid time")
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute and second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Returns `None` on invalid hour, minute and/or second.
+    #[inline]
+    pub fn and_hms_opt(&self, hour: u32, min: u32, sec: u32) -> Option<DateTime<Tz>> {
+        NaiveTime::from_hms_opt(hour, min, sec).and_then(|time| self.and_time(time))
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and millisecond.
+    /// The millisecond part can exceed 1,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Panics on invalid hour, minute, second and/or millisecond.
+    #[inline]
+    pub fn and_hms_milli(&self, hour: u32, min: u32, sec: u32, milli: u32) -> DateTime<Tz> {
+        self.and_hms_milli_opt(hour, min, sec, milli).expect("invalid time")
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and millisecond.
+    /// The millisecond part can exceed 1,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or millisecond.
+    #[inline]
+    pub fn and_hms_milli_opt(&self, hour: u32, min: u32, sec: u32,
+                             milli: u32) -> Option<DateTime<Tz>> {
+        NaiveTime::from_hms_milli_opt(hour, min, sec, milli).and_then(|time| self.and_time(time))
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and microsecond.
+    /// The microsecond part can exceed 1,000,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Panics on invalid hour, minute, second and/or microsecond.
+    #[inline]
+    pub fn and_hms_micro(&self, hour: u32, min: u32, sec: u32, micro: u32) -> DateTime<Tz> {
+        self.and_hms_micro_opt(hour, min, sec, micro).expect("invalid time")
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and microsecond.
+    /// The microsecond part can exceed 1,000,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or microsecond.
+    #[inline]
+    pub fn and_hms_micro_opt(&self, hour: u32, min: u32, sec: u32,
+                             micro: u32) -> Option<DateTime<Tz>> {
+        NaiveTime::from_hms_micro_opt(hour, min, sec, micro).and_then(|time| self.and_time(time))
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and nanosecond.
+    /// The nanosecond part can exceed 1,000,000,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Panics on invalid hour, minute, second and/or nanosecond.
+    #[inline]
+    pub fn and_hms_nano(&self, hour: u32, min: u32, sec: u32, nano: u32) -> DateTime<Tz> {
+        self.and_hms_nano_opt(hour, min, sec, nano).expect("invalid time")
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and nanosecond.
+    /// The nanosecond part can exceed 1,000,000,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or nanosecond.
+    #[inline]
+    pub fn and_hms_nano_opt(&self, hour: u32, min: u32, sec: u32,
+                            nano: u32) -> Option<DateTime<Tz>> {
+        NaiveTime::from_hms_nano_opt(hour, min, sec, nano).and_then(|time| self.and_time(time))
+    }
+
+    /// Makes a new `Date` for the next date.
+    ///
+    /// Panics when `self` is the last representable date.
+    #[inline]
+    pub fn succ(&self) -> Date<Tz> {
+        self.succ_opt().expect("out of bound")
+    }
+
+    /// Makes a new `Date` for the next date.
+    ///
+    /// Returns `None` when `self` is the last representable date.
+    #[inline]
+    pub fn succ_opt(&self) -> Option<Date<Tz>> {
+        self.date.succ_opt().map(|date| Date::from_utc(date, self.offset.clone()))
+    }
+
+    /// Makes a new `Date` for the prior date.
+    ///
+    /// Panics when `self` is the first representable date.
+    #[inline]
+    pub fn pred(&self) -> Date<Tz> {
+        self.pred_opt().expect("out of bound")
+    }
+
+    /// Makes a new `Date` for the prior date.
+    ///
+    /// Returns `None` when `self` is the first representable date.
+    #[inline]
+    pub fn pred_opt(&self) -> Option<Date<Tz>> {
+        self.date.pred_opt().map(|date| Date::from_utc(date, self.offset.clone()))
+    }
+
+    /// Retrieves an associated offset from UTC.
+    #[inline]
+    pub fn offset(&self) -> &Tz::Offset {
+        &self.offset
+    }
+
+    /// Retrieves an associated time zone.
+    #[inline]
+    pub fn timezone(&self) -> Tz {
+        TimeZone::from_offset(&self.offset)
+    }
+
+    /// Changes the associated time zone.
+    /// This does not change the actual `Date` (but will change the string representation).
+    #[inline]
+    pub fn with_timezone<Tz2: TimeZone>(&self, tz: &Tz2) -> Date<Tz2> {
+        tz.from_utc_date(&self.date)
+    }
+
+    /// Adds given `Duration` to the current date.
+    ///
+    /// Returns `None` when it will result in overflow.
+    #[inline]
+    pub fn checked_add_signed(self, rhs: OldDuration) -> Option<Date<Tz>> {
+        let date = try_opt!(self.date.checked_add_signed(rhs));
+        Some(Date { date: date, offset: self.offset })
+    }
+
+    /// Subtracts given `Duration` from the current date.
+    ///
+    /// Returns `None` when it will result in overflow.
+    #[inline]
+    pub fn checked_sub_signed(self, rhs: OldDuration) -> Option<Date<Tz>> {
+        let date = try_opt!(self.date.checked_sub_signed(rhs));
+        Some(Date { date: date, offset: self.offset })
+    }
+
+    /// Subtracts another `Date` from the current date.
+    /// Returns a `Duration` of integral numbers.
+    ///
+    /// This does not overflow or underflow at all,
+    /// as all possible output fits in the range of `Duration`.
+    #[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
+    #[inline]
+    pub fn signed_duration_since<Tz2: TimeZone>(self, rhs: Date<Tz2>) -> OldDuration {
+        self.date.signed_duration_since(rhs.date)
+    }
+
+    /// Returns a view to the naive UTC date.
+    #[inline]
+    pub fn naive_utc(&self) -> NaiveDate {
+        self.date
+    }
+
+    /// Returns a view to the naive local date.
+    ///
+    /// This is technically same to [`naive_utc`](#method.naive_utc)
+    /// because the offset is restricted to never exceed one day,
+    /// but provided for the consistency.
+    #[inline]
+    pub fn naive_local(&self) -> NaiveDate {
+        self.date
+    }
+}
+
+/// Maps the local date to other date with given conversion function.
+fn map_local<Tz: TimeZone, F>(d: &Date<Tz>, mut f: F) -> Option<Date<Tz>>
+        where F: FnMut(NaiveDate) -> Option<NaiveDate> {
+    f(d.naive_local()).and_then(|date| d.timezone().from_local_date(&date).single())
+}
+
+impl<Tz: TimeZone> Date<Tz> where Tz::Offset: fmt::Display {
+    /// Formats the date with the specified formatting items.
+    #[inline]
+    pub fn format_with_items<'a, I>(&self, items: I) -> DelayedFormat<I>
+            where I: Iterator<Item=Item<'a>> + Clone {
+        DelayedFormat::new_with_offset(Some(self.naive_local()), None, &self.offset, items)
+    }
+
+    /// Formats the date with the specified format string.
+    /// See the [`format::strftime` module](./format/strftime/index.html)
+    /// on the supported escape sequences.
+    #[inline]
+    pub fn format<'a>(&self, fmt: &'a str) -> DelayedFormat<StrftimeItems<'a>> {
+        self.format_with_items(StrftimeItems::new(fmt))
+    }
+}
+
+impl<Tz: TimeZone> Datelike for Date<Tz> {
+    #[inline] fn year(&self) -> i32 { self.naive_local().year() }
+    #[inline] fn month(&self) -> u32 { self.naive_local().month() }
+    #[inline] fn month0(&self) -> u32 { self.naive_local().month0() }
+    #[inline] fn day(&self) -> u32 { self.naive_local().day() }
+    #[inline] fn day0(&self) -> u32 { self.naive_local().day0() }
+    #[inline] fn ordinal(&self) -> u32 { self.naive_local().ordinal() }
+    #[inline] fn ordinal0(&self) -> u32 { self.naive_local().ordinal0() }
+    #[inline] fn weekday(&self) -> Weekday { self.naive_local().weekday() }
+    #[inline] fn iso_week(&self) -> IsoWeek { self.naive_local().iso_week() }
+
+    #[inline]
+    fn with_year(&self, year: i32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_year(year))
+    }
+
+    #[inline]
+    fn with_month(&self, month: u32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_month(month))
+    }
+
+    #[inline]
+    fn with_month0(&self, month0: u32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_month0(month0))
+    }
+
+    #[inline]
+    fn with_day(&self, day: u32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_day(day))
+    }
+
+    #[inline]
+    fn with_day0(&self, day0: u32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_day0(day0))
+    }
+
+    #[inline]
+    fn with_ordinal(&self, ordinal: u32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_ordinal(ordinal))
+    }
+
+    #[inline]
+    fn with_ordinal0(&self, ordinal0: u32) -> Option<Date<Tz>> {
+        map_local(self, |date| date.with_ordinal0(ordinal0))
+    }
+}
+
+// we need them as automatic impls cannot handle associated types
+impl<Tz: TimeZone> Copy for Date<Tz> where <Tz as TimeZone>::Offset: Copy {}
+unsafe impl<Tz: TimeZone> Send for Date<Tz> where <Tz as TimeZone>::Offset: Send {}
+
+impl<Tz: TimeZone, Tz2: TimeZone> PartialEq<Date<Tz2>> for Date<Tz> {
+    fn eq(&self, other: &Date<Tz2>) -> bool { self.date == other.date }
+}
+
+impl<Tz: TimeZone> Eq for Date<Tz> {
+}
+
+impl<Tz: TimeZone> PartialOrd for Date<Tz> {
+    fn partial_cmp(&self, other: &Date<Tz>) -> Option<Ordering> {
+        self.date.partial_cmp(&other.date)
+    }
+}
+
+impl<Tz: TimeZone> Ord for Date<Tz> {
+    fn cmp(&self, other: &Date<Tz>) -> Ordering { self.date.cmp(&other.date) }
+}
+
+impl<Tz: TimeZone> hash::Hash for Date<Tz> {
+    fn hash<H: hash::Hasher>(&self, state: &mut H) { self.date.hash(state) }
+}
+
+impl<Tz: TimeZone> Add<OldDuration> for Date<Tz> {
+    type Output = Date<Tz>;
+
+    #[inline]
+    fn add(self, rhs: OldDuration) -> Date<Tz> {
+        self.checked_add_signed(rhs).expect("`Date + Duration` overflowed")
+    }
+}
+
+impl<Tz: TimeZone> Sub<OldDuration> for Date<Tz> {
+    type Output = Date<Tz>;
+
+    #[inline]
+    fn sub(self, rhs: OldDuration) -> Date<Tz> {
+        self.checked_sub_signed(rhs).expect("`Date - Duration` overflowed")
+    }
+}
+
+impl<Tz: TimeZone> Sub<Date<Tz>> for Date<Tz> {
+    type Output = OldDuration;
+
+    #[inline]
+    fn sub(self, rhs: Date<Tz>) -> OldDuration {
+        self.signed_duration_since(rhs)
+    }
+}
+
+impl<Tz: TimeZone> fmt::Debug for Date<Tz> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}{:?}", self.naive_local(), self.offset)
+    }
+}
+
+impl<Tz: TimeZone> fmt::Display for Date<Tz> where Tz::Offset: fmt::Display {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}{}", self.naive_local(), self.offset)
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/datetime.rs cargo-0.33.0/vendor/chrono/src/datetime.rs
--- cargo-0.32.0/vendor/chrono/src/datetime.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/datetime.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1647 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! ISO 8601 date and time with time zone.
+
+use std::{str, fmt, hash};
+use std::cmp::Ordering;
+use std::ops::{Add, Sub};
+use std::time::{SystemTime, UNIX_EPOCH};
+use oldtime::Duration as OldDuration;
+
+use {Weekday, Timelike, Datelike};
+#[cfg(feature="clock")]
+use offset::Local;
+use offset::{TimeZone, Offset, Utc, FixedOffset};
+use naive::{NaiveTime, NaiveDateTime, IsoWeek};
+use Date;
+use format::{Item, Numeric, Pad, Fixed};
+use format::{parse, Parsed, ParseError, ParseResult, DelayedFormat, StrftimeItems};
+
+/// Specific formatting options for seconds. This may be extended in the
+/// future, so exhaustive matching in external code is not recommended.
+///
+/// See the `TimeZone::to_rfc3339_opts` function for usage.
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum SecondsFormat {
+    /// Format whole seconds only, with no decimal point nor subseconds.
+    Secs,
+
+    /// Use fixed 3 subsecond digits. This corresponds to
+    /// [Fixed::Nanosecond3](format/enum.Fixed.html#variant.Nanosecond3).
+    Millis,
+
+    /// Use fixed 6 subsecond digits. This corresponds to
+    /// [Fixed::Nanosecond6](format/enum.Fixed.html#variant.Nanosecond6).
+    Micros,
+
+    /// Use fixed 9 subsecond digits. This corresponds to
+    /// [Fixed::Nanosecond9](format/enum.Fixed.html#variant.Nanosecond9).
+    Nanos,
+
+    /// Automatically select one of `Secs`, `Millis`, `Micros`, or `Nanos` to
+    /// display all available non-zero sub-second digits.  This corresponds to
+    /// [Fixed::Nanosecond](format/enum.Fixed.html#variant.Nanosecond).
+    AutoSi,
+
+    // Do not match against this.
+    #[doc(hidden)]
+    __NonExhaustive,
+}
+
+/// ISO 8601 combined date and time with time zone.
+///
+/// There are some constructors implemented here (the `from_*` methods), but
+/// the general-purpose constructors are all via the methods on the
+/// [`TimeZone`](./offset/trait.TimeZone.html) implementations.
+#[derive(Clone)]
+pub struct DateTime<Tz: TimeZone> {
+    datetime: NaiveDateTime,
+    offset: Tz::Offset,
+}
+
+impl<Tz: TimeZone> DateTime<Tz> {
+    /// Makes a new `DateTime` with given *UTC* datetime and offset.
+    /// The local datetime should be constructed via the `TimeZone` trait.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{DateTime, TimeZone, NaiveDateTime, Utc};
+    ///
+    /// let dt = DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(61, 0), Utc);
+    /// assert_eq!(Utc.timestamp(61, 0), dt);
+    /// ~~~~
+    //
+    // note: this constructor is purposedly not named to `new` to discourage the direct usage.
+    #[inline]
+    pub fn from_utc(datetime: NaiveDateTime, offset: Tz::Offset) -> DateTime<Tz> {
+        DateTime { datetime: datetime, offset: offset }
+    }
+
+    /// Retrieves a date component.
+    #[inline]
+    pub fn date(&self) -> Date<Tz> {
+        Date::from_utc(self.naive_local().date(), self.offset.clone())
+    }
+
+    /// Retrieves a time component.
+    /// Unlike `date`, this is not associated to the time zone.
+    #[inline]
+    pub fn time(&self) -> NaiveTime {
+        self.datetime.time() + self.offset.fix()
+    }
+
+    /// Returns the number of non-leap seconds since January 1, 1970 0:00:00 UTC
+    /// (aka "UNIX timestamp").
+    #[inline]
+    pub fn timestamp(&self) -> i64 {
+        self.datetime.timestamp()
+    }
+
+    /// Returns the number of non-leap-milliseconds since January 1, 1970 UTC
+    ///
+    /// Note that this does reduce the number of years that can be represented
+    /// from ~584 Billion to ~584 Million. (If this is a problem, please file
+    /// an issue to let me know what domain needs millisecond precision over
+    /// billions of years, I'm curious.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::Utc;
+    /// use chrono::TimeZone;
+    ///
+    /// let dt = Utc.ymd(1970, 1, 1).and_hms_milli(0, 0, 1, 444);
+    /// assert_eq!(dt.timestamp_millis(), 1_444);
+    ///
+    /// let dt = Utc.ymd(2001, 9, 9).and_hms_milli(1, 46, 40, 555);
+    /// assert_eq!(dt.timestamp_millis(), 1_000_000_000_555);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_millis(&self) -> i64 {
+        self.datetime.timestamp_millis()
+    }
+
+    /// Returns the number of non-leap-nanoseconds since January 1, 1970 UTC
+    ///
+    /// Note that this does reduce the number of years that can be represented
+    /// from ~584 Billion to ~584. (If this is a problem, please file
+    /// an issue to let me know what domain needs nanosecond precision over
+    /// millenia, I'm curious.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::Utc;
+    /// use chrono::TimeZone;
+    ///
+    /// let dt = Utc.ymd(1970, 1, 1).and_hms_nano(0, 0, 1, 444);
+    /// assert_eq!(dt.timestamp_nanos(), 1_000_000_444);
+    ///
+    /// let dt = Utc.ymd(2001, 9, 9).and_hms_nano(1, 46, 40, 555);
+    /// assert_eq!(dt.timestamp_nanos(), 1_000_000_000_000_000_555);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_nanos(&self) -> i64 {
+        self.datetime.timestamp_nanos()
+    }
+
+    /// Returns the number of milliseconds since the last second boundary
+    ///
+    /// warning: in event of a leap second, this may exceed 999
+    ///
+    /// note: this is not the number of milliseconds since January 1, 1970 0:00:00 UTC
+    #[inline]
+    pub fn timestamp_subsec_millis(&self) -> u32 {
+        self.datetime.timestamp_subsec_millis()
+    }
+
+    /// Returns the number of microseconds since the last second boundary
+    ///
+    /// warning: in event of a leap second, this may exceed 999_999
+    ///
+    /// note: this is not the number of microseconds since January 1, 1970 0:00:00 UTC
+    #[inline]
+    pub fn timestamp_subsec_micros(&self) -> u32 {
+        self.datetime.timestamp_subsec_micros()
+    }
+
+    /// Returns the number of nanoseconds since the last second boundary
+    ///
+    /// warning: in event of a leap second, this may exceed 999_999_999
+    ///
+    /// note: this is not the number of nanoseconds since January 1, 1970 0:00:00 UTC
+    #[inline]
+    pub fn timestamp_subsec_nanos(&self) -> u32 {
+        self.datetime.timestamp_subsec_nanos()
+    }
+
+    /// Retrieves an associated offset from UTC.
+    #[inline]
+    pub fn offset(&self) -> &Tz::Offset {
+        &self.offset
+    }
+
+    /// Retrieves an associated time zone.
+    #[inline]
+    pub fn timezone(&self) -> Tz {
+        TimeZone::from_offset(&self.offset)
+    }
+
+    /// Changes the associated time zone.
+    /// This does not change the actual `DateTime` (but will change the string representation).
+    #[inline]
+    pub fn with_timezone<Tz2: TimeZone>(&self, tz: &Tz2) -> DateTime<Tz2> {
+        tz.from_utc_datetime(&self.datetime)
+    }
+
+    /// Adds given `Duration` to the current date and time.
+    ///
+    /// Returns `None` when it will result in overflow.
+    #[inline]
+    pub fn checked_add_signed(self, rhs: OldDuration) -> Option<DateTime<Tz>> {
+        let datetime = try_opt!(self.datetime.checked_add_signed(rhs));
+        Some(DateTime { datetime: datetime, offset: self.offset })
+    }
+
+    /// Subtracts given `Duration` from the current date and time.
+    ///
+    /// Returns `None` when it will result in overflow.
+    #[inline]
+    pub fn checked_sub_signed(self, rhs: OldDuration) -> Option<DateTime<Tz>> {
+        let datetime = try_opt!(self.datetime.checked_sub_signed(rhs));
+        Some(DateTime { datetime: datetime, offset: self.offset })
+    }
+
+    /// Subtracts another `DateTime` from the current date and time.
+    /// This does not overflow or underflow at all.
+    #[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
+    #[inline]
+    pub fn signed_duration_since<Tz2: TimeZone>(self, rhs: DateTime<Tz2>) -> OldDuration {
+        self.datetime.signed_duration_since(rhs.datetime)
+    }
+
+    /// Returns a view to the naive UTC datetime.
+    #[inline]
+    pub fn naive_utc(&self) -> NaiveDateTime {
+        self.datetime
+    }
+
+    /// Returns a view to the naive local datetime.
+    #[inline]
+    pub fn naive_local(&self) -> NaiveDateTime {
+        self.datetime + self.offset.fix()
+    }
+}
+
+/// Maps the local datetime to other datetime with given conversion function.
+fn map_local<Tz: TimeZone, F>(dt: &DateTime<Tz>, mut f: F) -> Option<DateTime<Tz>>
+        where F: FnMut(NaiveDateTime) -> Option<NaiveDateTime> {
+    f(dt.naive_local()).and_then(|datetime| dt.timezone().from_local_datetime(&datetime).single())
+}
+
+impl DateTime<FixedOffset> {
+    /// Parses an RFC 2822 date and time string such as `Tue, 1 Jul 2003 10:52:37 +0200`,
+    /// then returns a new `DateTime` with a parsed `FixedOffset`.
+    pub fn parse_from_rfc2822(s: &str) -> ParseResult<DateTime<FixedOffset>> {
+        const ITEMS: &'static [Item<'static>] = &[Item::Fixed(Fixed::RFC2822)];
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, ITEMS.iter().cloned()));
+        parsed.to_datetime()
+    }
+
+    /// Parses an RFC 3339 and ISO 8601 date and time string such as `1996-12-19T16:39:57-08:00`,
+    /// then returns a new `DateTime` with a parsed `FixedOffset`.
+    ///
+    /// Why isn't this named `parse_from_iso8601`? That's because ISO 8601 allows some freedom
+    /// over the syntax and RFC 3339 exercises that freedom to rigidly define a fixed format.
+    pub fn parse_from_rfc3339(s: &str) -> ParseResult<DateTime<FixedOffset>> {
+        const ITEMS: &'static [Item<'static>] = &[Item::Fixed(Fixed::RFC3339)];
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, ITEMS.iter().cloned()));
+        parsed.to_datetime()
+    }
+
+    /// Parses a string with the specified format string and
+    /// returns a new `DateTime` with a parsed `FixedOffset`.
+    /// See the [`format::strftime` module](./format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// See also `Offset::datetime_from_str` which gives a local `DateTime` on specific time zone.
+    ///
+    /// Note that this method *requires a timezone* in the string. See
+    /// [`NaiveDateTime::parse_from_str`](./naive/struct.NaiveDateTime.html#method.parse_from_str)
+    /// for a version that does not require a timezone in the to-be-parsed str.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use chrono::{DateTime, FixedOffset, TimeZone};
+    ///
+    /// let dt = DateTime::parse_from_str(
+    ///     "1983 Apr 13 12:09:14.274 +0000", "%Y %b %d %H:%M:%S%.3f %z");
+    /// assert_eq!(dt, Ok(FixedOffset::east(0).ymd(1983, 4, 13).and_hms_milli(12, 9, 14, 274)));
+    /// ```
+    pub fn parse_from_str(s: &str, fmt: &str) -> ParseResult<DateTime<FixedOffset>> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, StrftimeItems::new(fmt)));
+        parsed.to_datetime()
+    }
+}
+
+impl<Tz: TimeZone> DateTime<Tz> where Tz::Offset: fmt::Display {
+    /// Returns an RFC 2822 date and time string such as `Tue, 1 Jul 2003 10:52:37 +0200`.
+    pub fn to_rfc2822(&self) -> String {
+        const ITEMS: &'static [Item<'static>] = &[Item::Fixed(Fixed::RFC2822)];
+        self.format_with_items(ITEMS.iter().cloned()).to_string()
+    }
+
+    /// Returns an RFC 3339 and ISO 8601 date and time string such as `1996-12-19T16:39:57-08:00`.
+    pub fn to_rfc3339(&self) -> String {
+        const ITEMS: &'static [Item<'static>] = &[Item::Fixed(Fixed::RFC3339)];
+        self.format_with_items(ITEMS.iter().cloned()).to_string()
+    }
+
+    /// Return an RFC 3339 and ISO 8601 date and time string with subseconds
+    /// formatted as per a `SecondsFormat`. If passed `use_z` true and the
+    /// timezone is UTC (offset 0), use 'Z', as per
+    /// [Fixed::TimezoneOffsetColonZ](format/enum.Fixed.html#variant.TimezoneOffsetColonZ).
+    /// If passed `use_z` false, use
+    /// [Fixed::TimezoneOffsetColon](format/enum.Fixed.html#variant.TimezoneOffsetColon).
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// # use chrono::{DateTime, FixedOffset, SecondsFormat, TimeZone, Utc};
+    /// let dt = Utc.ymd(2018, 1, 26).and_hms_micro(18, 30, 9, 453_829);
+    /// assert_eq!(dt.to_rfc3339_opts(SecondsFormat::Millis, false),
+    ///            "2018-01-26T18:30:09.453+00:00");
+    /// assert_eq!(dt.to_rfc3339_opts(SecondsFormat::Millis, true),
+    ///            "2018-01-26T18:30:09.453Z");
+    /// assert_eq!(dt.to_rfc3339_opts(SecondsFormat::Secs, true),
+    ///            "2018-01-26T18:30:09Z");
+    ///
+    /// let pst = FixedOffset::east(8 * 60 * 60);
+    /// let dt = pst.ymd(2018, 1, 26).and_hms_micro(10, 30, 9, 453_829);
+    /// assert_eq!(dt.to_rfc3339_opts(SecondsFormat::Secs, true),
+    ///            "2018-01-26T10:30:09+08:00");
+    /// ```
+    pub fn to_rfc3339_opts(&self, secform: SecondsFormat, use_z: bool) -> String {
+        use format::Numeric::*;
+        use format::Pad::Zero;
+        use SecondsFormat::*;
+
+        debug_assert!(secform != __NonExhaustive, "Do not use __NonExhaustive!");
+
+        const PREFIX: &'static [Item<'static>] = &[
+            Item::Numeric(Year, Zero),
+            Item::Literal("-"),
+            Item::Numeric(Month, Zero),
+            Item::Literal("-"),
+            Item::Numeric(Day, Zero),
+            Item::Literal("T"),
+            Item::Numeric(Hour, Zero),
+            Item::Literal(":"),
+            Item::Numeric(Minute, Zero),
+            Item::Literal(":"),
+            Item::Numeric(Second, Zero),
+        ];
+
+        let ssitem = match secform {
+            Secs   => None,
+            Millis => Some(Item::Fixed(Fixed::Nanosecond3)),
+            Micros => Some(Item::Fixed(Fixed::Nanosecond6)),
+            Nanos  => Some(Item::Fixed(Fixed::Nanosecond9)),
+            AutoSi => Some(Item::Fixed(Fixed::Nanosecond)),
+            __NonExhaustive => unreachable!(),
+        };
+
+        let tzitem = Item::Fixed(
+            if use_z {
+                Fixed::TimezoneOffsetColonZ
+            } else {
+                Fixed::TimezoneOffsetColon
+            }
+        );
+
+        match ssitem {
+            None =>
+                self.format_with_items(
+                    PREFIX.iter().chain([tzitem].iter()).cloned()
+                ).to_string(),
+            Some(s) =>
+                self.format_with_items(
+                    PREFIX.iter().chain([s, tzitem].iter()).cloned()
+                ).to_string(),
+        }
+    }
+
+    /// Formats the combined date and time with the specified formatting items.
+    #[inline]
+    pub fn format_with_items<'a, I>(&self, items: I) -> DelayedFormat<I>
+            where I: Iterator<Item=Item<'a>> + Clone {
+        let local = self.naive_local();
+        DelayedFormat::new_with_offset(Some(local.date()), Some(local.time()), &self.offset, items)
+    }
+
+    /// Formats the combined date and time with the specified format string.
+    /// See the [`format::strftime` module](./format/strftime/index.html)
+    /// on the supported escape sequences.
+    #[inline]
+    pub fn format<'a>(&self, fmt: &'a str) -> DelayedFormat<StrftimeItems<'a>> {
+        self.format_with_items(StrftimeItems::new(fmt))
+    }
+}
+
+impl<Tz: TimeZone> Datelike for DateTime<Tz> {
+    #[inline] fn year(&self) -> i32 { self.naive_local().year() }
+    #[inline] fn month(&self) -> u32 { self.naive_local().month() }
+    #[inline] fn month0(&self) -> u32 { self.naive_local().month0() }
+    #[inline] fn day(&self) -> u32 { self.naive_local().day() }
+    #[inline] fn day0(&self) -> u32 { self.naive_local().day0() }
+    #[inline] fn ordinal(&self) -> u32 { self.naive_local().ordinal() }
+    #[inline] fn ordinal0(&self) -> u32 { self.naive_local().ordinal0() }
+    #[inline] fn weekday(&self) -> Weekday { self.naive_local().weekday() }
+    #[inline] fn iso_week(&self) -> IsoWeek { self.naive_local().iso_week() }
+
+    #[inline]
+    fn with_year(&self, year: i32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_year(year))
+    }
+
+    #[inline]
+    fn with_month(&self, month: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_month(month))
+    }
+
+    #[inline]
+    fn with_month0(&self, month0: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_month0(month0))
+    }
+
+    #[inline]
+    fn with_day(&self, day: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_day(day))
+    }
+
+    #[inline]
+    fn with_day0(&self, day0: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_day0(day0))
+    }
+
+    #[inline]
+    fn with_ordinal(&self, ordinal: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_ordinal(ordinal))
+    }
+
+    #[inline]
+    fn with_ordinal0(&self, ordinal0: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_ordinal0(ordinal0))
+    }
+}
+
+impl<Tz: TimeZone> Timelike for DateTime<Tz> {
+    #[inline] fn hour(&self) -> u32 { self.naive_local().hour() }
+    #[inline] fn minute(&self) -> u32 { self.naive_local().minute() }
+    #[inline] fn second(&self) -> u32 { self.naive_local().second() }
+    #[inline] fn nanosecond(&self) -> u32 { self.naive_local().nanosecond() }
+
+    #[inline]
+    fn with_hour(&self, hour: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_hour(hour))
+    }
+
+    #[inline]
+    fn with_minute(&self, min: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_minute(min))
+    }
+
+    #[inline]
+    fn with_second(&self, sec: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_second(sec))
+    }
+
+    #[inline]
+    fn with_nanosecond(&self, nano: u32) -> Option<DateTime<Tz>> {
+        map_local(self, |datetime| datetime.with_nanosecond(nano))
+    }
+}
+
+// we need them as automatic impls cannot handle associated types
+impl<Tz: TimeZone> Copy for DateTime<Tz> where <Tz as TimeZone>::Offset: Copy {}
+unsafe impl<Tz: TimeZone> Send for DateTime<Tz> where <Tz as TimeZone>::Offset: Send {}
+
+impl<Tz: TimeZone, Tz2: TimeZone> PartialEq<DateTime<Tz2>> for DateTime<Tz> {
+    fn eq(&self, other: &DateTime<Tz2>) -> bool { self.datetime == other.datetime }
+}
+
+impl<Tz: TimeZone> Eq for DateTime<Tz> {
+}
+
+impl<Tz: TimeZone> PartialOrd for DateTime<Tz> {
+    fn partial_cmp(&self, other: &DateTime<Tz>) -> Option<Ordering> {
+        self.datetime.partial_cmp(&other.datetime)
+    }
+}
+
+impl<Tz: TimeZone> Ord for DateTime<Tz> {
+    fn cmp(&self, other: &DateTime<Tz>) -> Ordering { self.datetime.cmp(&other.datetime) }
+}
+
+impl<Tz: TimeZone> hash::Hash for DateTime<Tz> {
+    fn hash<H: hash::Hasher>(&self, state: &mut H) { self.datetime.hash(state) }
+}
+
+impl<Tz: TimeZone> Add<OldDuration> for DateTime<Tz> {
+    type Output = DateTime<Tz>;
+
+    #[inline]
+    fn add(self, rhs: OldDuration) -> DateTime<Tz> {
+        self.checked_add_signed(rhs).expect("`DateTime + Duration` overflowed")
+    }
+}
+
+impl<Tz: TimeZone> Sub<OldDuration> for DateTime<Tz> {
+    type Output = DateTime<Tz>;
+
+    #[inline]
+    fn sub(self, rhs: OldDuration) -> DateTime<Tz> {
+        self.checked_sub_signed(rhs).expect("`DateTime - Duration` overflowed")
+    }
+}
+
+impl<Tz: TimeZone> Sub<DateTime<Tz>> for DateTime<Tz> {
+    type Output = OldDuration;
+
+    #[inline]
+    fn sub(self, rhs: DateTime<Tz>) -> OldDuration {
+        self.signed_duration_since(rhs)
+    }
+}
+
+impl<Tz: TimeZone> fmt::Debug for DateTime<Tz> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}{:?}", self.naive_local(), self.offset)
+    }
+}
+
+impl<Tz: TimeZone> fmt::Display for DateTime<Tz> where Tz::Offset: fmt::Display {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{} {}", self.naive_local(), self.offset)
+    }
+}
+
+impl str::FromStr for DateTime<FixedOffset> {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> ParseResult<DateTime<FixedOffset>> {
+        const ITEMS: &'static [Item<'static>] = &[
+            Item::Space(""), Item::Numeric(Numeric::Year, Pad::Zero),
+            Item::Space(""), Item::Literal("-"),
+            Item::Space(""), Item::Numeric(Numeric::Month, Pad::Zero),
+            Item::Space(""), Item::Literal("-"),
+            Item::Space(""), Item::Numeric(Numeric::Day, Pad::Zero),
+            Item::Space(""), Item::Literal("T"), // XXX shouldn't this be case-insensitive?
+            Item::Space(""), Item::Numeric(Numeric::Hour, Pad::Zero),
+            Item::Space(""), Item::Literal(":"),
+            Item::Space(""), Item::Numeric(Numeric::Minute, Pad::Zero),
+            Item::Space(""), Item::Literal(":"),
+            Item::Space(""), Item::Numeric(Numeric::Second, Pad::Zero),
+                             Item::Fixed(Fixed::Nanosecond),
+            Item::Space(""), Item::Fixed(Fixed::TimezoneOffsetZ),
+            Item::Space(""),
+        ];
+
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, ITEMS.iter().cloned()));
+        parsed.to_datetime()
+    }
+}
+
+impl str::FromStr for DateTime<Utc> {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> ParseResult<DateTime<Utc>> {
+        s.parse::<DateTime<FixedOffset>>().map(|dt| dt.with_timezone(&Utc))
+    }
+}
+
+#[cfg(feature="clock")]
+impl str::FromStr for DateTime<Local> {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> ParseResult<DateTime<Local>> {
+        s.parse::<DateTime<FixedOffset>>().map(|dt| dt.with_timezone(&Local))
+    }
+}
+
+impl From<SystemTime> for DateTime<Utc> {
+    fn from(t: SystemTime) -> DateTime<Utc> {
+        let (sec, nsec) = match t.duration_since(UNIX_EPOCH) {
+            Ok(dur) => (dur.as_secs() as i64, dur.subsec_nanos()),
+            Err(e) => { // unlikely but should be handled
+                let dur = e.duration();
+                let (sec, nsec) = (dur.as_secs() as i64, dur.subsec_nanos());
+                if nsec == 0 {
+                    (-sec, 0)
+                } else {
+                    (-sec - 1, 1_000_000_000 - nsec)
+                }
+            },
+        };
+        Utc.timestamp(sec, nsec)
+    }
+}
+
+#[cfg(feature="clock")]
+impl From<SystemTime> for DateTime<Local> {
+    fn from(t: SystemTime) -> DateTime<Local> {
+        DateTime::<Utc>::from(t).with_timezone(&Local)
+    }
+}
+
+impl<Tz: TimeZone> From<DateTime<Tz>> for SystemTime {
+    fn from(dt: DateTime<Tz>) -> SystemTime {
+        use std::time::Duration;
+
+        let sec = dt.timestamp();
+        let nsec = dt.timestamp_subsec_nanos();
+        if sec < 0 {
+            // unlikely but should be handled
+            UNIX_EPOCH - Duration::new(-sec as u64, 0) + Duration::new(0, nsec)
+        } else {
+            UNIX_EPOCH + Duration::new(sec as u64, nsec)
+        }
+    }
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_encodable_json<FUtc, FFixed, E>(to_string_utc: FUtc, to_string_fixed: FFixed)
+    where FUtc: Fn(&DateTime<Utc>) -> Result<String, E>,
+          FFixed: Fn(&DateTime<FixedOffset>) -> Result<String, E>,
+          E: ::std::fmt::Debug
+{
+    assert_eq!(to_string_utc(&Utc.ymd(2014, 7, 24).and_hms(12, 34, 6)).ok(),
+               Some(r#""2014-07-24T12:34:06Z""#.into()));
+
+    assert_eq!(to_string_fixed(&FixedOffset::east(3660).ymd(2014, 7, 24).and_hms(12, 34, 6)).ok(),
+               Some(r#""2014-07-24T12:34:06+01:01""#.into()));
+    assert_eq!(to_string_fixed(&FixedOffset::east(3650).ymd(2014, 7, 24).and_hms(12, 34, 6)).ok(),
+               Some(r#""2014-07-24T12:34:06+01:00:50""#.into()));
+}
+
+#[cfg(all(test, feature="clock", any(feature = "rustc-serialize", feature = "serde")))]
+fn test_decodable_json<FUtc, FFixed, FLocal, E>(utc_from_str: FUtc,
+                                                fixed_from_str: FFixed,
+                                                local_from_str: FLocal)
+    where FUtc: Fn(&str) -> Result<DateTime<Utc>, E>,
+          FFixed: Fn(&str) -> Result<DateTime<FixedOffset>, E>,
+          FLocal: Fn(&str) -> Result<DateTime<Local>, E>,
+          E: ::std::fmt::Debug
+{
+    // should check against the offset as well (the normal DateTime comparison will ignore them)
+    fn norm<Tz: TimeZone>(dt: &Option<DateTime<Tz>>) -> Option<(&DateTime<Tz>, &Tz::Offset)> {
+        dt.as_ref().map(|dt| (dt, dt.offset()))
+    }
+
+    assert_eq!(norm(&utc_from_str(r#""2014-07-24T12:34:06Z""#).ok()),
+               norm(&Some(Utc.ymd(2014, 7, 24).and_hms(12, 34, 6))));
+    assert_eq!(norm(&utc_from_str(r#""2014-07-24T13:57:06+01:23""#).ok()),
+               norm(&Some(Utc.ymd(2014, 7, 24).and_hms(12, 34, 6))));
+
+    assert_eq!(norm(&fixed_from_str(r#""2014-07-24T12:34:06Z""#).ok()),
+               norm(&Some(FixedOffset::east(0).ymd(2014, 7, 24).and_hms(12, 34, 6))));
+    assert_eq!(norm(&fixed_from_str(r#""2014-07-24T13:57:06+01:23""#).ok()),
+               norm(&Some(FixedOffset::east(60*60 + 23*60).ymd(2014, 7, 24).and_hms(13, 57, 6))));
+
+    // we don't know the exact local offset but we can check that
+    // the conversion didn't change the instant itself
+    assert_eq!(local_from_str(r#""2014-07-24T12:34:06Z""#)
+                   .expect("local shouuld parse"),
+               Utc.ymd(2014, 7, 24).and_hms(12, 34, 6));
+    assert_eq!(local_from_str(r#""2014-07-24T13:57:06+01:23""#)
+                   .expect("local should parse with offset"),
+               Utc.ymd(2014, 7, 24).and_hms(12, 34, 6));
+
+    assert!(utc_from_str(r#""2014-07-32T12:34:06Z""#).is_err());
+    assert!(fixed_from_str(r#""2014-07-32T12:34:06Z""#).is_err());
+}
+
+#[cfg(all(test, feature="clock", feature = "rustc-serialize"))]
+fn test_decodable_json_timestamps<FUtc, FFixed, FLocal, E>(utc_from_str: FUtc,
+                                                           fixed_from_str: FFixed,
+                                                           local_from_str: FLocal)
+    where FUtc: Fn(&str) -> Result<rustc_serialize::TsSeconds<Utc>, E>,
+          FFixed: Fn(&str) -> Result<rustc_serialize::TsSeconds<FixedOffset>, E>,
+          FLocal: Fn(&str) -> Result<rustc_serialize::TsSeconds<Local>, E>,
+          E: ::std::fmt::Debug
+{
+    fn norm<Tz: TimeZone>(dt: &Option<DateTime<Tz>>) -> Option<(&DateTime<Tz>, &Tz::Offset)> {
+        dt.as_ref().map(|dt| (dt, dt.offset()))
+    }
+
+    assert_eq!(norm(&utc_from_str("0").ok().map(DateTime::from)),
+               norm(&Some(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0))));
+    assert_eq!(norm(&utc_from_str("-1").ok().map(DateTime::from)),
+               norm(&Some(Utc.ymd(1969, 12, 31).and_hms(23, 59, 59))));
+
+    assert_eq!(norm(&fixed_from_str("0").ok().map(DateTime::from)),
+               norm(&Some(FixedOffset::east(0).ymd(1970, 1, 1).and_hms(0, 0, 0))));
+    assert_eq!(norm(&fixed_from_str("-1").ok().map(DateTime::from)),
+               norm(&Some(FixedOffset::east(0).ymd(1969, 12, 31).and_hms(23, 59, 59))));
+
+    assert_eq!(*fixed_from_str("0").expect("0 timestamp should parse"),
+               Utc.ymd(1970, 1, 1).and_hms(0, 0, 0));
+    assert_eq!(*local_from_str("-1").expect("-1 timestamp should parse"),
+               Utc.ymd(1969, 12, 31).and_hms(23, 59, 59));
+}
+
+#[cfg(feature = "rustc-serialize")]
+pub mod rustc_serialize {
+    use std::fmt;
+    use std::ops::Deref;
+    use super::DateTime;
+    #[cfg(feature="clock")]
+    use offset::Local;
+    use offset::{TimeZone, LocalResult, Utc, FixedOffset};
+    use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
+
+    impl<Tz: TimeZone> Encodable for DateTime<Tz> {
+        fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
+            format!("{:?}", self).encode(s)
+        }
+    }
+
+    // try!-like function to convert a LocalResult into a serde-ish Result
+    fn from<T, D>(me: LocalResult<T>, d: &mut D) -> Result<T, D::Error>
+        where D: Decoder,
+              T: fmt::Display,
+    {
+        match me {
+            LocalResult::None => Err(d.error(
+                "value is not a legal timestamp")),
+            LocalResult::Ambiguous(..) => Err(d.error(
+                "value is an ambiguous timestamp")),
+            LocalResult::Single(val) => Ok(val)
+        }
+    }
+
+    impl Decodable for DateTime<FixedOffset> {
+        fn decode<D: Decoder>(d: &mut D) -> Result<DateTime<FixedOffset>, D::Error> {
+            d.read_str()?.parse::<DateTime<FixedOffset>>()
+                    .map_err(|_| d.error("invalid date and time"))
+        }
+    }
+
+    #[allow(deprecated)]
+    impl Decodable for TsSeconds<FixedOffset> {
+        #[allow(deprecated)]
+        fn decode<D: Decoder>(d: &mut D) -> Result<TsSeconds<FixedOffset>, D::Error> {
+            from(FixedOffset::east(0).timestamp_opt(d.read_i64()?, 0), d)
+                .map(TsSeconds)
+        }
+    }
+
+    impl Decodable for DateTime<Utc> {
+        fn decode<D: Decoder>(d: &mut D) -> Result<DateTime<Utc>, D::Error> {
+            d.read_str()?
+                .parse::<DateTime<FixedOffset>>()
+                .map(|dt| dt.with_timezone(&Utc))
+                .map_err(|_| d.error("invalid date and time"))
+        }
+    }
+
+    /// A `DateTime` that can be deserialized from a timestamp
+    ///
+    /// A timestamp here is seconds since the epoch
+    #[derive(Debug)]
+    pub struct TsSeconds<Tz: TimeZone>(DateTime<Tz>);
+
+    #[allow(deprecated)]
+    impl<Tz: TimeZone> From<TsSeconds<Tz>> for DateTime<Tz> {
+        /// Pull the inner DateTime<Tz> out
+        #[allow(deprecated)]
+        fn from(obj: TsSeconds<Tz>) -> DateTime<Tz> {
+            obj.0
+        }
+    }
+
+    #[allow(deprecated)]
+    impl<Tz: TimeZone> Deref for TsSeconds<Tz> {
+        type Target = DateTime<Tz>;
+
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+
+    #[allow(deprecated)]
+    impl Decodable for TsSeconds<Utc> {
+        fn decode<D: Decoder>(d: &mut D) -> Result<TsSeconds<Utc>, D::Error> {
+            from(Utc.timestamp_opt(d.read_i64()?, 0), d)
+                .map(TsSeconds)
+        }
+    }
+
+    #[cfg(feature="clock")]
+    impl Decodable for DateTime<Local> {
+        fn decode<D: Decoder>(d: &mut D) -> Result<DateTime<Local>, D::Error> {
+            match d.read_str()?.parse::<DateTime<FixedOffset>>() {
+                Ok(dt) => Ok(dt.with_timezone(&Local)),
+                Err(_) => Err(d.error("invalid date and time")),
+            }
+        }
+    }
+
+    #[cfg(feature="clock")]
+    #[allow(deprecated)]
+    impl Decodable for TsSeconds<Local> {
+        #[allow(deprecated)]
+        fn decode<D: Decoder>(d: &mut D) -> Result<TsSeconds<Local>, D::Error> {
+            from(Utc.timestamp_opt(d.read_i64()?, 0), d)
+                .map(|dt| TsSeconds(dt.with_timezone(&Local)))
+        }
+    }
+
+    #[cfg(test)] use rustc_serialize::json;
+
+    #[test]
+    fn test_encodable() {
+        super::test_encodable_json(json::encode, json::encode);
+    }
+
+    #[cfg(feature="clock")]
+    #[test]
+    fn test_decodable() {
+        super::test_decodable_json(json::decode, json::decode, json::decode);
+    }
+
+    #[cfg(feature="clock")]
+    #[test]
+    fn test_decodable_timestamps() {
+        super::test_decodable_json_timestamps(json::decode, json::decode, json::decode);
+    }
+
+}
+
+/// documented at re-export site
+#[cfg(feature = "serde")]
+pub mod serde {
+    use std::fmt;
+    use super::DateTime;
+    #[cfg(feature="clock")]
+    use offset::Local;
+    use offset::{LocalResult, TimeZone, Utc, FixedOffset};
+    use serdelib::{ser, de};
+
+    // try!-like function to convert a LocalResult into a serde-ish Result
+    fn serde_from<T, E, V>(me: LocalResult<T>, ts: &V) -> Result<T, E>
+        where E: de::Error,
+                V: fmt::Display,
+                T: fmt::Display,
+    {
+        match me {
+            LocalResult::None => Err(E::custom(
+                format!("value is not a legal timestamp: {}", ts))),
+            LocalResult::Ambiguous(min, max) => Err(E::custom(
+                format!("value is an ambiguous timestamp: {}, could be either of {}, {}",
+                        ts, min, max))),
+            LocalResult::Single(val) => Ok(val)
+        }
+    }
+
+    /// Ser/de to/from timestamps in nanoseconds
+    ///
+    /// Intended for use with `serde`'s `with` attribute.
+    ///
+    /// # Example:
+    ///
+    /// ```rust
+    /// # // We mark this ignored so that we can test on 1.13 (which does not
+    /// # // support custom derive), and run tests with --ignored on beta and
+    /// # // nightly to actually trigger these.
+    /// #
+    /// # #[macro_use] extern crate serde_derive;
+    /// # #[macro_use] extern crate serde_json;
+    /// # extern crate chrono;
+    /// # use chrono::{TimeZone, DateTime, Utc};
+    /// use chrono::serde::ts_nanoseconds;
+    /// #[derive(Deserialize, Serialize)]
+    /// struct S {
+    ///     #[serde(with = "ts_nanoseconds")]
+    ///     time: DateTime<Utc>
+    /// }
+    ///
+    /// # fn example() -> Result<S, serde_json::Error> {
+    /// let time = Utc.ymd(2018, 5, 17).and_hms_nano(02, 04, 59, 918355733);
+    /// let my_s = S {
+    ///     time: time.clone(),
+    /// };
+    ///
+    /// let as_string = serde_json::to_string(&my_s)?;
+    /// assert_eq!(as_string, r#"{"time":1526522699918355733}"#);
+    /// let my_s: S = serde_json::from_str(&as_string)?;
+    /// assert_eq!(my_s.time, time);
+    /// # Ok(my_s)
+    /// # }
+    /// # fn main() { example().unwrap(); }
+    /// ```
+    pub mod ts_nanoseconds {
+        use std::fmt;
+        use serdelib::{ser, de};
+
+        use {DateTime, Utc};
+        use offset::TimeZone;
+
+        use super::serde_from;
+
+        /// Serialize a UTC datetime into an integer number of nanoseconds since the epoch
+        ///
+        /// Intended for use with `serde`s `serialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate chrono;
+        /// # use chrono::{TimeZone, DateTime, Utc};
+        /// use chrono::serde::ts_nanoseconds::serialize as to_nano_ts;
+        /// #[derive(Serialize)]
+        /// struct S {
+        ///     #[serde(serialize_with = "to_nano_ts")]
+        ///     time: DateTime<Utc>
+        /// }
+        ///
+        /// # fn example() -> Result<String, serde_json::Error> {
+        /// let my_s = S {
+        ///     time: Utc.ymd(2018, 5, 17).and_hms_nano(02, 04, 59, 918355733),
+        /// };
+        /// let as_string = serde_json::to_string(&my_s)?;
+        /// assert_eq!(as_string, r#"{"time":1526522699918355733}"#);
+        /// # Ok(as_string)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn serialize<S>(dt: &DateTime<Utc>, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_i64(dt.timestamp_nanos())
+        }
+
+        /// Deserialize a `DateTime` from a nanosecond timestamp
+        ///
+        /// Intended for use with `serde`s `deserialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate chrono;
+        /// # use chrono::{DateTime, Utc};
+        /// use chrono::serde::ts_nanoseconds::deserialize as from_nano_ts;
+        /// #[derive(Deserialize)]
+        /// struct S {
+        ///     #[serde(deserialize_with = "from_nano_ts")]
+        ///     time: DateTime<Utc>
+        /// }
+        ///
+        /// # fn example() -> Result<S, serde_json::Error> {
+        /// let my_s: S = serde_json::from_str(r#"{ "time": 1526522699918355733 }"#)?;
+        /// # Ok(my_s)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn deserialize<'de, D>(d: D) -> Result<DateTime<Utc>, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            Ok(try!(d.deserialize_i64(NanoSecondsTimestampVisitor)))
+        }
+
+        struct NanoSecondsTimestampVisitor;
+
+        impl<'de> de::Visitor<'de> for NanoSecondsTimestampVisitor {
+            type Value = DateTime<Utc>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+            {
+                write!(formatter, "a unix timestamp in seconds")
+            }
+
+            /// Deserialize a timestamp in nanoseconds since the epoch
+            fn visit_i64<E>(self, value: i64) -> Result<DateTime<Utc>, E>
+                where E: de::Error
+            {
+                serde_from(Utc.timestamp_opt(value / 1_000_000_000,
+                                            (value % 1_000_000_000) as u32),
+                     &value)
+            }
+
+            /// Deserialize a timestamp in nanoseconds since the epoch
+            fn visit_u64<E>(self, value: u64) -> Result<DateTime<Utc>, E>
+                where E: de::Error
+            {
+                serde_from(Utc.timestamp_opt((value / 1_000_000_000) as i64,
+                                             (value % 1_000_000_000) as u32),
+                     &value)
+            }
+        }
+    }
+
+    /// Ser/de to/from timestamps in milliseconds
+    ///
+    /// Intended for use with `serde`s `with` attribute.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # // We mark this ignored so that we can test on 1.13 (which does not
+    /// # // support custom derive), and run tests with --ignored on beta and
+    /// # // nightly to actually trigger these.
+    /// #
+    /// # #[macro_use] extern crate serde_derive;
+    /// # #[macro_use] extern crate serde_json;
+    /// # extern crate chrono;
+    /// # use chrono::{TimeZone, DateTime, Utc};
+    /// use chrono::serde::ts_milliseconds;
+    /// #[derive(Deserialize, Serialize)]
+    /// struct S {
+    ///     #[serde(with = "ts_milliseconds")]
+    ///     time: DateTime<Utc>
+    /// }
+    ///
+    /// # fn example() -> Result<S, serde_json::Error> {
+    /// let time = Utc.ymd(2018, 5, 17).and_hms_milli(02, 04, 59, 918);
+    /// let my_s = S {
+    ///     time: time.clone(),
+    /// };
+    ///
+    /// let as_string = serde_json::to_string(&my_s)?;
+    /// assert_eq!(as_string, r#"{"time":1526522699918}"#);
+    /// let my_s: S = serde_json::from_str(&as_string)?;
+    /// assert_eq!(my_s.time, time);
+    /// # Ok(my_s)
+    /// # }
+    /// # fn main() { example().unwrap(); }
+    /// ```
+    pub mod ts_milliseconds {
+        use std::fmt;
+        use serdelib::{ser, de};
+
+        use {DateTime, Utc};
+        use offset::TimeZone;
+
+        use super::serde_from;
+
+        /// Serialize a UTC datetime into an integer number of milliseconds since the epoch
+        ///
+        /// Intended for use with `serde`s `serialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate chrono;
+        /// # use chrono::{TimeZone, DateTime, Utc};
+        /// use chrono::serde::ts_milliseconds::serialize as to_milli_ts;
+        /// #[derive(Serialize)]
+        /// struct S {
+        ///     #[serde(serialize_with = "to_milli_ts")]
+        ///     time: DateTime<Utc>
+        /// }
+        ///
+        /// # fn example() -> Result<String, serde_json::Error> {
+        /// let my_s = S {
+        ///     time: Utc.ymd(2018, 5, 17).and_hms_milli(02, 04, 59, 918),
+        /// };
+        /// let as_string = serde_json::to_string(&my_s)?;
+        /// assert_eq!(as_string, r#"{"time":1526522699918}"#);
+        /// # Ok(as_string)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn serialize<S>(dt: &DateTime<Utc>, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_i64(dt.timestamp_millis())
+        }
+
+        /// Deserialize a `DateTime` from a millisecond timestamp
+        ///
+        /// Intended for use with `serde`s `deserialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate chrono;
+        /// # use chrono::{DateTime, Utc};
+        /// use chrono::serde::ts_milliseconds::deserialize as from_milli_ts;
+        /// #[derive(Deserialize)]
+        /// struct S {
+        ///     #[serde(deserialize_with = "from_milli_ts")]
+        ///     time: DateTime<Utc>
+        /// }
+        ///
+        /// # fn example() -> Result<S, serde_json::Error> {
+        /// let my_s: S = serde_json::from_str(r#"{ "time": 1526522699918 }"#)?;
+        /// # Ok(my_s)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn deserialize<'de, D>(d: D) -> Result<DateTime<Utc>, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            Ok(try!(d.deserialize_i64(MilliSecondsTimestampVisitor).map(|dt| dt.with_timezone(&Utc))))
+        }
+
+        struct MilliSecondsTimestampVisitor;
+
+        impl<'de> de::Visitor<'de> for MilliSecondsTimestampVisitor {
+            type Value = DateTime<Utc>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+            {
+                formatter.write_str("a unix timestamp in milliseconds")
+            }
+
+            /// Deserialize a timestamp in milliseconds since the epoch
+            fn visit_i64<E>(self, value: i64) -> Result<DateTime<Utc>, E>
+                where E: de::Error
+            {
+                serde_from(Utc.timestamp_opt(value / 1000,
+                                           ((value % 1000) * 1_000_000) as u32),
+                    &value)
+            }
+
+            /// Deserialize a timestamp in milliseconds since the epoch
+            fn visit_u64<E>(self, value: u64) -> Result<DateTime<Utc>, E>
+                where E: de::Error
+            {
+                serde_from(Utc.timestamp_opt((value / 1000) as i64,
+                                            ((value % 1000) * 1_000_000) as u32),
+                    &value)
+            }
+        }
+    }
+
+    /// Ser/de to/from timestamps in seconds
+    ///
+    /// Intended for use with `serde`'s `with` attribute.
+    ///
+    /// # Example:
+    ///
+    /// ```rust
+    /// # // We mark this ignored so that we can test on 1.13 (which does not
+    /// # // support custom derive), and run tests with --ignored on beta and
+    /// # // nightly to actually trigger these.
+    /// #
+    /// # #[macro_use] extern crate serde_derive;
+    /// # #[macro_use] extern crate serde_json;
+    /// # extern crate chrono;
+    /// # use chrono::{TimeZone, DateTime, Utc};
+    /// use chrono::serde::ts_seconds;
+    /// #[derive(Deserialize, Serialize)]
+    /// struct S {
+    ///     #[serde(with = "ts_seconds")]
+    ///     time: DateTime<Utc>
+    /// }
+    ///
+    /// # fn example() -> Result<S, serde_json::Error> {
+    /// let time = Utc.ymd(2015, 5, 15).and_hms(10, 0, 0);
+    /// let my_s = S {
+    ///     time: time.clone(),
+    /// };
+    ///
+    /// let as_string = serde_json::to_string(&my_s)?;
+    /// assert_eq!(as_string, r#"{"time":1431684000}"#);
+    /// let my_s: S = serde_json::from_str(&as_string)?;
+    /// assert_eq!(my_s.time, time);
+    /// # Ok(my_s)
+    /// # }
+    /// # fn main() { example().unwrap(); }
+    /// ```
+    pub mod ts_seconds {
+        use std::fmt;
+        use serdelib::{ser, de};
+
+        use {DateTime, Utc};
+        use offset::TimeZone;
+
+        use super::serde_from;
+
+        /// Serialize a UTC datetime into an integer number of seconds since the epoch
+        ///
+        /// Intended for use with `serde`s `serialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate chrono;
+        /// # use chrono::{TimeZone, DateTime, Utc};
+        /// use chrono::serde::ts_seconds::serialize as to_ts;
+        /// #[derive(Serialize)]
+        /// struct S {
+        ///     #[serde(serialize_with = "to_ts")]
+        ///     time: DateTime<Utc>
+        /// }
+        ///
+        /// # fn example() -> Result<String, serde_json::Error> {
+        /// let my_s = S {
+        ///     time: Utc.ymd(2015, 5, 15).and_hms(10, 0, 0),
+        /// };
+        /// let as_string = serde_json::to_string(&my_s)?;
+        /// assert_eq!(as_string, r#"{"time":1431684000}"#);
+        /// # Ok(as_string)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn serialize<S>(dt: &DateTime<Utc>, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_i64(dt.timestamp())
+        }
+
+        /// Deserialize a `DateTime` from a seconds timestamp
+        ///
+        /// Intended for use with `serde`s `deserialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate chrono;
+        /// # use chrono::{DateTime, Utc};
+        /// use chrono::serde::ts_seconds::deserialize as from_ts;
+        /// #[derive(Deserialize)]
+        /// struct S {
+        ///     #[serde(deserialize_with = "from_ts")]
+        ///     time: DateTime<Utc>
+        /// }
+        ///
+        /// # fn example() -> Result<S, serde_json::Error> {
+        /// let my_s: S = serde_json::from_str(r#"{ "time": 1431684000 }"#)?;
+        /// # Ok(my_s)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn deserialize<'de, D>(d: D) -> Result<DateTime<Utc>, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            Ok(try!(d.deserialize_i64(SecondsTimestampVisitor)))
+        }
+
+        struct SecondsTimestampVisitor;
+
+        impl<'de> de::Visitor<'de> for SecondsTimestampVisitor {
+            type Value = DateTime<Utc>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+            {
+                formatter.write_str("a unix timestamp in seconds")
+            }
+
+            /// Deserialize a timestamp in seconds since the epoch
+            fn visit_i64<E>(self, value: i64) -> Result<DateTime<Utc>, E>
+                where E: de::Error
+            {
+                serde_from(Utc.timestamp_opt(value, 0), &value)
+            }
+
+            /// Deserialize a timestamp in seconds since the epoch
+            fn visit_u64<E>(self, value: u64) -> Result<DateTime<Utc>, E>
+                where E: de::Error
+            {
+                serde_from(Utc.timestamp_opt(value as i64, 0), &value)
+            }
+        }
+    }
+
+    impl<Tz: TimeZone> ser::Serialize for DateTime<Tz> {
+        /// Serialize into a rfc3339 time string
+        ///
+        /// See [the `serde` module](./serde/index.html) for alternate
+        /// serializations.
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            struct FormatWrapped<'a, D: 'a> {
+                inner: &'a D
+            }
+
+            impl<'a, D: fmt::Debug> fmt::Display for FormatWrapped<'a, D> {
+                fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                    self.inner.fmt(f)
+                }
+            }
+
+            // Debug formatting is correct RFC3339, and it allows Zulu.
+            serializer.collect_str(&FormatWrapped { inner: &self })
+        }
+    }
+
+    struct DateTimeVisitor;
+
+    impl<'de> de::Visitor<'de> for DateTimeVisitor {
+        type Value = DateTime<FixedOffset>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+        {
+            write!(formatter, "a formatted date and time string or a unix timestamp")
+        }
+
+        fn visit_str<E>(self, value: &str) -> Result<DateTime<FixedOffset>, E>
+            where E: de::Error
+        {
+            value.parse().map_err(|err| E::custom(format!("{}", err)))
+        }
+    }
+
+    /// Deserialize a value that optionally includes a timezone offset in its
+    /// string representation
+    ///
+    /// The value to be deserialized must be an rfc3339 string.
+    ///
+    /// See [the `serde` module](./serde/index.html) for alternate
+    /// deserialization formats.
+    impl<'de> de::Deserialize<'de> for DateTime<FixedOffset> {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(DateTimeVisitor)
+        }
+    }
+
+    /// Deserialize into a UTC value
+    ///
+    /// The value to be deserialized must be an rfc3339 string.
+    ///
+    /// See [the `serde` module](./serde/index.html) for alternate
+    /// deserialization formats.
+    impl<'de> de::Deserialize<'de> for DateTime<Utc> {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(DateTimeVisitor).map(|dt| dt.with_timezone(&Utc))
+        }
+    }
+
+    /// Deserialize a value that includes no timezone in its string
+    /// representation
+    ///
+    /// The value to be deserialized must be an rfc3339 string.
+    ///
+    /// See [the `serde` module](./serde/index.html) for alternate
+    /// serialization formats.
+    #[cfg(feature="clock")]
+    impl<'de> de::Deserialize<'de> for DateTime<Local> {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(DateTimeVisitor).map(|dt| dt.with_timezone(&Local))
+        }
+    }
+
+    #[cfg(test)] extern crate serde_json;
+    #[cfg(test)] extern crate bincode;
+
+    #[test]
+    fn test_serde_serialize() {
+        super::test_encodable_json(self::serde_json::to_string, self::serde_json::to_string);
+    }
+
+    #[cfg(feature="clock")]
+    #[test]
+    fn test_serde_deserialize() {
+        super::test_decodable_json(|input| self::serde_json::from_str(&input), |input| self::serde_json::from_str(&input),
+                                   |input| self::serde_json::from_str(&input));
+    }
+
+    #[test]
+    fn test_serde_bincode() {
+        // Bincode is relevant to test separately from JSON because
+        // it is not self-describing.
+        use self::bincode::{Infinite, serialize, deserialize};
+
+        let dt = Utc.ymd(2014, 7, 24).and_hms(12, 34, 6);
+        let encoded = serialize(&dt, Infinite).unwrap();
+        let decoded: DateTime<Utc> = deserialize(&encoded).unwrap();
+        assert_eq!(dt, decoded);
+        assert_eq!(dt.offset(), decoded.offset());
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::DateTime;
+    #[cfg(feature="clock")]
+    use Datelike;
+    use naive::{NaiveTime, NaiveDate};
+    #[cfg(feature="clock")]
+    use offset::Local;
+    use offset::{TimeZone, Utc, FixedOffset};
+    use oldtime::Duration;
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    #[test]
+    #[allow(non_snake_case)]
+    fn test_datetime_offset() {
+        let Est = FixedOffset::west(5*60*60);
+        let Edt = FixedOffset::west(4*60*60);
+        let Kst = FixedOffset::east(9*60*60);
+
+        assert_eq!(format!("{}", Utc.ymd(2014, 5, 6).and_hms(7, 8, 9)),
+                   "2014-05-06 07:08:09 UTC");
+        assert_eq!(format!("{}", Edt.ymd(2014, 5, 6).and_hms(7, 8, 9)),
+                   "2014-05-06 07:08:09 -04:00");
+        assert_eq!(format!("{}", Kst.ymd(2014, 5, 6).and_hms(7, 8, 9)),
+                   "2014-05-06 07:08:09 +09:00");
+        assert_eq!(format!("{:?}", Utc.ymd(2014, 5, 6).and_hms(7, 8, 9)),
+                   "2014-05-06T07:08:09Z");
+        assert_eq!(format!("{:?}", Edt.ymd(2014, 5, 6).and_hms(7, 8, 9)),
+                   "2014-05-06T07:08:09-04:00");
+        assert_eq!(format!("{:?}", Kst.ymd(2014, 5, 6).and_hms(7, 8, 9)),
+                   "2014-05-06T07:08:09+09:00");
+
+        // edge cases
+        assert_eq!(format!("{:?}", Utc.ymd(2014, 5, 6).and_hms(0, 0, 0)),
+                   "2014-05-06T00:00:00Z");
+        assert_eq!(format!("{:?}", Edt.ymd(2014, 5, 6).and_hms(0, 0, 0)),
+                   "2014-05-06T00:00:00-04:00");
+        assert_eq!(format!("{:?}", Kst.ymd(2014, 5, 6).and_hms(0, 0, 0)),
+                   "2014-05-06T00:00:00+09:00");
+        assert_eq!(format!("{:?}", Utc.ymd(2014, 5, 6).and_hms(23, 59, 59)),
+                   "2014-05-06T23:59:59Z");
+        assert_eq!(format!("{:?}", Edt.ymd(2014, 5, 6).and_hms(23, 59, 59)),
+                   "2014-05-06T23:59:59-04:00");
+        assert_eq!(format!("{:?}", Kst.ymd(2014, 5, 6).and_hms(23, 59, 59)),
+                   "2014-05-06T23:59:59+09:00");
+
+        let dt = Utc.ymd(2014, 5, 6).and_hms(7, 8, 9);
+        assert_eq!(dt, Edt.ymd(2014, 5, 6).and_hms(3, 8, 9));
+        assert_eq!(dt + Duration::seconds(3600 + 60 + 1), Utc.ymd(2014, 5, 6).and_hms(8, 9, 10));
+        assert_eq!(dt.signed_duration_since(Edt.ymd(2014, 5, 6).and_hms(10, 11, 12)),
+                   Duration::seconds(-7*3600 - 3*60 - 3));
+
+        assert_eq!(*Utc.ymd(2014, 5, 6).and_hms(7, 8, 9).offset(), Utc);
+        assert_eq!(*Edt.ymd(2014, 5, 6).and_hms(7, 8, 9).offset(), Edt);
+        assert!(*Edt.ymd(2014, 5, 6).and_hms(7, 8, 9).offset() != Est);
+    }
+
+    #[test]
+    fn test_datetime_date_and_time() {
+        let tz = FixedOffset::east(5*60*60);
+        let d = tz.ymd(2014, 5, 6).and_hms(7, 8, 9);
+        assert_eq!(d.time(), NaiveTime::from_hms(7, 8, 9));
+        assert_eq!(d.date(), tz.ymd(2014, 5, 6));
+        assert_eq!(d.date().naive_local(), NaiveDate::from_ymd(2014, 5, 6));
+        assert_eq!(d.date().and_time(d.time()), Some(d));
+
+        let tz = FixedOffset::east(4*60*60);
+        let d = tz.ymd(2016, 5, 4).and_hms(3, 2, 1);
+        assert_eq!(d.time(), NaiveTime::from_hms(3, 2, 1));
+        assert_eq!(d.date(), tz.ymd(2016, 5, 4));
+        assert_eq!(d.date().naive_local(), NaiveDate::from_ymd(2016, 5, 4));
+        assert_eq!(d.date().and_time(d.time()), Some(d));
+
+        let tz = FixedOffset::west(13*60*60);
+        let d = tz.ymd(2017, 8, 9).and_hms(12, 34, 56);
+        assert_eq!(d.time(), NaiveTime::from_hms(12, 34, 56));
+        assert_eq!(d.date(), tz.ymd(2017, 8, 9));
+        assert_eq!(d.date().naive_local(), NaiveDate::from_ymd(2017, 8, 9));
+        assert_eq!(d.date().and_time(d.time()), Some(d));
+    }
+
+    #[test]
+    #[cfg(feature="clock")]
+    fn test_datetime_with_timezone() {
+        let local_now = Local::now();
+        let utc_now = local_now.with_timezone(&Utc);
+        let local_now2 = utc_now.with_timezone(&Local);
+        assert_eq!(local_now, local_now2);
+    }
+
+    #[test]
+    #[allow(non_snake_case)]
+    fn test_datetime_rfc2822_and_rfc3339() {
+        let EDT = FixedOffset::east(5*60*60);
+        assert_eq!(Utc.ymd(2015, 2, 18).and_hms(23, 16, 9).to_rfc2822(),
+                   "Wed, 18 Feb 2015 23:16:09 +0000");
+        assert_eq!(Utc.ymd(2015, 2, 18).and_hms(23, 16, 9).to_rfc3339(),
+                   "2015-02-18T23:16:09+00:00");
+        assert_eq!(EDT.ymd(2015, 2, 18).and_hms_milli(23, 16, 9, 150).to_rfc2822(),
+                   "Wed, 18 Feb 2015 23:16:09 +0500");
+        assert_eq!(EDT.ymd(2015, 2, 18).and_hms_milli(23, 16, 9, 150).to_rfc3339(),
+                   "2015-02-18T23:16:09.150+05:00");
+        assert_eq!(EDT.ymd(2015, 2, 18).and_hms_micro(23, 59, 59, 1_234_567).to_rfc2822(),
+                   "Wed, 18 Feb 2015 23:59:60 +0500");
+        assert_eq!(EDT.ymd(2015, 2, 18).and_hms_micro(23, 59, 59, 1_234_567).to_rfc3339(),
+                   "2015-02-18T23:59:60.234567+05:00");
+
+        assert_eq!(DateTime::parse_from_rfc2822("Wed, 18 Feb 2015 23:16:09 +0000"),
+                   Ok(FixedOffset::east(0).ymd(2015, 2, 18).and_hms(23, 16, 9)));
+        assert_eq!(DateTime::parse_from_rfc3339("2015-02-18T23:16:09Z"),
+                   Ok(FixedOffset::east(0).ymd(2015, 2, 18).and_hms(23, 16, 9)));
+        assert_eq!(DateTime::parse_from_rfc2822("Wed, 18 Feb 2015 23:59:60 +0500"),
+                   Ok(EDT.ymd(2015, 2, 18).and_hms_milli(23, 59, 59, 1_000)));
+        assert_eq!(DateTime::parse_from_rfc3339("2015-02-18T23:59:60.234567+05:00"),
+                   Ok(EDT.ymd(2015, 2, 18).and_hms_micro(23, 59, 59, 1_234_567)));
+    }
+
+    #[test]
+    fn test_rfc3339_opts() {
+        use SecondsFormat::*;
+        let pst = FixedOffset::east(8 * 60 * 60);
+        let dt = pst.ymd(2018, 1, 11).and_hms_nano(10, 5, 13, 084_660_000);
+        assert_eq!(dt.to_rfc3339_opts(Secs, false),   "2018-01-11T10:05:13+08:00");
+        assert_eq!(dt.to_rfc3339_opts(Secs, true),    "2018-01-11T10:05:13+08:00");
+        assert_eq!(dt.to_rfc3339_opts(Millis, false), "2018-01-11T10:05:13.084+08:00");
+        assert_eq!(dt.to_rfc3339_opts(Micros, false), "2018-01-11T10:05:13.084660+08:00");
+        assert_eq!(dt.to_rfc3339_opts(Nanos, false),  "2018-01-11T10:05:13.084660000+08:00");
+        assert_eq!(dt.to_rfc3339_opts(AutoSi, false), "2018-01-11T10:05:13.084660+08:00");
+
+        let ut = DateTime::<Utc>::from_utc(dt.naive_utc(), Utc);
+        assert_eq!(ut.to_rfc3339_opts(Secs, false),   "2018-01-11T02:05:13+00:00");
+        assert_eq!(ut.to_rfc3339_opts(Secs, true),    "2018-01-11T02:05:13Z");
+        assert_eq!(ut.to_rfc3339_opts(Millis, false), "2018-01-11T02:05:13.084+00:00");
+        assert_eq!(ut.to_rfc3339_opts(Millis, true),  "2018-01-11T02:05:13.084Z");
+        assert_eq!(ut.to_rfc3339_opts(Micros, true),  "2018-01-11T02:05:13.084660Z");
+        assert_eq!(ut.to_rfc3339_opts(Nanos, true),   "2018-01-11T02:05:13.084660000Z");
+        assert_eq!(ut.to_rfc3339_opts(AutoSi, true),  "2018-01-11T02:05:13.084660Z");
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_rfc3339_opts_nonexhaustive() {
+        use SecondsFormat;
+        let dt = Utc.ymd(1999, 10, 9).and_hms(1, 2, 3);
+        dt.to_rfc3339_opts(SecondsFormat::__NonExhaustive, true);
+    }
+
+    #[test]
+    fn test_datetime_from_str() {
+        assert_eq!("2015-2-18T23:16:9.15Z".parse::<DateTime<FixedOffset>>(),
+                   Ok(FixedOffset::east(0).ymd(2015, 2, 18).and_hms_milli(23, 16, 9, 150)));
+        assert_eq!("2015-2-18T13:16:9.15-10:00".parse::<DateTime<FixedOffset>>(),
+                   Ok(FixedOffset::west(10 * 3600).ymd(2015, 2, 18).and_hms_milli(13, 16, 9, 150)));
+        assert!("2015-2-18T23:16:9.15".parse::<DateTime<FixedOffset>>().is_err());
+
+        assert_eq!("2015-2-18T23:16:9.15Z".parse::<DateTime<Utc>>(),
+                   Ok(Utc.ymd(2015, 2, 18).and_hms_milli(23, 16, 9, 150)));
+        assert_eq!("2015-2-18T13:16:9.15-10:00".parse::<DateTime<Utc>>(),
+                   Ok(Utc.ymd(2015, 2, 18).and_hms_milli(23, 16, 9, 150)));
+        assert!("2015-2-18T23:16:9.15".parse::<DateTime<Utc>>().is_err());
+
+        // no test for `DateTime<Local>`, we cannot verify that much.
+    }
+
+    #[test]
+    fn test_datetime_parse_from_str() {
+        let ymdhms = |y,m,d,h,n,s,off| FixedOffset::east(off).ymd(y,m,d).and_hms(h,n,s);
+        assert_eq!(DateTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+                   Ok(ymdhms(2014, 5, 7, 12, 34, 56, 570*60))); // ignore offset
+        assert!(DateTime::parse_from_str("20140507000000", "%Y%m%d%H%M%S").is_err()); // no offset
+        assert!(DateTime::parse_from_str("Fri, 09 Aug 2013 23:54:35 GMT",
+                                         "%a, %d %b %Y %H:%M:%S GMT").is_err());
+        assert_eq!(Utc.datetime_from_str("Fri, 09 Aug 2013 23:54:35 GMT",
+                                         "%a, %d %b %Y %H:%M:%S GMT"),
+                   Ok(Utc.ymd(2013, 8, 9).and_hms(23, 54, 35)));
+    }
+
+    #[test]
+    #[cfg(feature="clock")]
+    fn test_datetime_format_with_local() {
+        // if we are not around the year boundary, local and UTC date should have the same year
+        let dt = Local::now().with_month(5).unwrap();
+        assert_eq!(dt.format("%Y").to_string(), dt.with_timezone(&Utc).format("%Y").to_string());
+    }
+
+    #[test]
+    #[cfg(feature="clock")]
+    fn test_datetime_is_copy() {
+        // UTC is known to be `Copy`.
+        let a = Utc::now();
+        let b = a;
+        assert_eq!(a, b);
+    }
+
+    #[test]
+    #[cfg(feature="clock")]
+    fn test_datetime_is_send() {
+        use std::thread;
+
+        // UTC is known to be `Send`.
+        let a = Utc::now();
+        thread::spawn(move || {
+            let _ = a;
+        }).join().unwrap();
+    }
+
+    #[test]
+    fn test_subsecond_part() {
+        let datetime = Utc.ymd(2014, 7, 8).and_hms_nano(9, 10, 11, 1234567);
+
+        assert_eq!(1,       datetime.timestamp_subsec_millis());
+        assert_eq!(1234,    datetime.timestamp_subsec_micros());
+        assert_eq!(1234567, datetime.timestamp_subsec_nanos());
+    }
+
+    #[test]
+    fn test_from_system_time() {
+        use std::time::Duration;
+
+        let epoch = Utc.ymd(1970, 1, 1).and_hms(0, 0, 0);
+
+        // SystemTime -> DateTime<Utc>
+        assert_eq!(DateTime::<Utc>::from(UNIX_EPOCH), epoch);
+        assert_eq!(DateTime::<Utc>::from(UNIX_EPOCH + Duration::new(999_999_999, 999_999_999)),
+                   Utc.ymd(2001, 9, 9).and_hms_nano(1, 46, 39, 999_999_999));
+        assert_eq!(DateTime::<Utc>::from(UNIX_EPOCH - Duration::new(999_999_999, 999_999_999)),
+                   Utc.ymd(1938, 4, 24).and_hms_nano(22, 13, 20, 1));
+
+        // DateTime<Utc> -> SystemTime
+        assert_eq!(SystemTime::from(epoch), UNIX_EPOCH);
+        assert_eq!(SystemTime::from(Utc.ymd(2001, 9, 9).and_hms_nano(1, 46, 39, 999_999_999)),
+                   UNIX_EPOCH + Duration::new(999_999_999, 999_999_999));
+        assert_eq!(SystemTime::from(Utc.ymd(1938, 4, 24).and_hms_nano(22, 13, 20, 1)),
+                   UNIX_EPOCH - Duration::new(999_999_999, 999_999_999));
+
+        // DateTime<any tz> -> SystemTime (via `with_timezone`)
+        #[cfg(feature="clock")] {
+            assert_eq!(SystemTime::from(epoch.with_timezone(&Local)), UNIX_EPOCH);
+        }
+        assert_eq!(SystemTime::from(epoch.with_timezone(&FixedOffset::east(32400))), UNIX_EPOCH);
+        assert_eq!(SystemTime::from(epoch.with_timezone(&FixedOffset::west(28800))), UNIX_EPOCH);
+    }
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/div.rs cargo-0.33.0/vendor/chrono/src/div.rs
--- cargo-0.32.0/vendor/chrono/src/div.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/div.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,42 @@
+// This is a part of Chrono.
+// Portions Copyright 2013-2014 The Rust Project Developers.
+// See README.md and LICENSE.txt for details.
+
+//! Integer division utilities. (Shamelessly copied from [num](https://github.com/rust-lang/num/))
+
+// Algorithm from [Daan Leijen. _Division and Modulus for Computer Scientists_,
+// December 2001](http://research.microsoft.com/pubs/151917/divmodnote-letter.pdf)
+
+pub use num_integer::{div_rem, div_floor, mod_floor, div_mod_floor};
+
+#[cfg(test)]
+mod tests {
+    use super::{mod_floor, div_mod_floor};
+
+    #[test]
+    fn test_mod_floor() {
+        assert_eq!(mod_floor( 8,  3),  2);
+        assert_eq!(mod_floor( 8, -3), -1);
+        assert_eq!(mod_floor(-8,  3),  1);
+        assert_eq!(mod_floor(-8, -3), -2);
+
+        assert_eq!(mod_floor( 1,  2),  1);
+        assert_eq!(mod_floor( 1, -2), -1);
+        assert_eq!(mod_floor(-1,  2),  1);
+        assert_eq!(mod_floor(-1, -2), -1);
+    }
+
+    #[test]
+    fn test_div_mod_floor() {
+        assert_eq!(div_mod_floor( 8,  3), ( 2,  2));
+        assert_eq!(div_mod_floor( 8, -3), (-3, -1));
+        assert_eq!(div_mod_floor(-8,  3), (-3,  1));
+        assert_eq!(div_mod_floor(-8, -3), ( 2, -2));
+
+        assert_eq!(div_mod_floor( 1,  2), ( 0,  1));
+        assert_eq!(div_mod_floor( 1, -2), (-1, -1));
+        assert_eq!(div_mod_floor(-1,  2), (-1,  1));
+        assert_eq!(div_mod_floor(-1, -2), ( 0, -1));
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/format/mod.rs cargo-0.33.0/vendor/chrono/src/format/mod.rs
--- cargo-0.32.0/vendor/chrono/src/format/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/format/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,625 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! Formatting (and parsing) utilities for date and time.
+//!
+//! This module provides the common types and routines to implement,
+//! for example, [`DateTime::format`](../struct.DateTime.html#method.format) or
+//! [`DateTime::parse_from_str`](../struct.DateTime.html#method.parse_from_str) methods.
+//! For most cases you should use these high-level interfaces.
+//!
+//! Internally the formatting and parsing shares the same abstract **formatting items**,
+//! which are just an [`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html) of
+//! the [`Item`](./enum.Item.html) type.
+//! They are generated from more readable **format strings**;
+//! currently Chrono supports [one built-in syntax closely resembling
+//! C's `strftime` format](./strftime/index.html).
+
+use std::fmt;
+use std::str::FromStr;
+use std::error::Error;
+
+use {Datelike, Timelike, Weekday, ParseWeekdayError};
+use div::{div_floor, mod_floor};
+use offset::{Offset, FixedOffset};
+use naive::{NaiveDate, NaiveTime};
+
+pub use self::strftime::StrftimeItems;
+pub use self::parsed::Parsed;
+pub use self::parse::parse;
+
+/// An unhabitated type used for `InternalNumeric` and `InternalFixed` below.
+#[derive(Clone, PartialEq, Eq)]
+enum Void {}
+
+/// Padding characters for numeric items.
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum Pad {
+    /// No padding.
+    None,
+    /// Zero (`0`) padding.
+    Zero,
+    /// Space padding.
+    Space,
+}
+
+/// Numeric item types.
+/// They have associated formatting width (FW) and parsing width (PW).
+///
+/// The **formatting width** is the minimal width to be formatted.
+/// If the number is too short, and the padding is not [`Pad::None`](./enum.Pad.html#variant.None),
+/// then it is left-padded.
+/// If the number is too long or (in some cases) negative, it is printed as is.
+///
+/// The **parsing width** is the maximal width to be scanned.
+/// The parser only tries to consume from one to given number of digits (greedily).
+/// It also trims the preceding whitespaces if any.
+/// It cannot parse the negative number, so some date and time cannot be formatted then
+/// parsed with the same formatting items.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum Numeric {
+    /// Full Gregorian year (FW=4, PW=∞).
+    /// May accept years before 1 BCE or after 9999 CE, given an initial sign.
+    Year,
+    /// Gregorian year divided by 100 (century number; FW=PW=2). Implies the non-negative year.
+    YearDiv100,
+    /// Gregorian year modulo 100 (FW=PW=2). Cannot be negative.
+    YearMod100,
+    /// Year in the ISO week date (FW=4, PW=∞).
+    /// May accept years before 1 BCE or after 9999 CE, given an initial sign.
+    IsoYear,
+    /// Year in the ISO week date, divided by 100 (FW=PW=2). Implies the non-negative year.
+    IsoYearDiv100,
+    /// Year in the ISO week date, modulo 100 (FW=PW=2). Cannot be negative.
+    IsoYearMod100,
+    /// Month (FW=PW=2).
+    Month,
+    /// Day of the month (FW=PW=2).
+    Day,
+    /// Week number, where the week 1 starts at the first Sunday of January (FW=PW=2).
+    WeekFromSun,
+    /// Week number, where the week 1 starts at the first Monday of January (FW=PW=2).
+    WeekFromMon,
+    /// Week number in the ISO week date (FW=PW=2).
+    IsoWeek,
+    /// Day of the week, where Sunday = 0 and Saturday = 6 (FW=PW=1).
+    NumDaysFromSun,
+    /// Day of the week, where Monday = 1 and Sunday = 7 (FW=PW=1).
+    WeekdayFromMon,
+    /// Day of the year (FW=PW=3).
+    Ordinal,
+    /// Hour number in the 24-hour clocks (FW=PW=2).
+    Hour,
+    /// Hour number in the 12-hour clocks (FW=PW=2).
+    Hour12,
+    /// The number of minutes since the last whole hour (FW=PW=2).
+    Minute,
+    /// The number of seconds since the last whole minute (FW=PW=2).
+    Second,
+    /// The number of nanoseconds since the last whole second (FW=PW=9).
+    /// Note that this is *not* left-aligned;
+    /// see also [`Fixed::Nanosecond`](./enum.Fixed.html#variant.Nanosecond).
+    Nanosecond,
+    /// The number of non-leap seconds since the midnight UTC on January 1, 1970 (FW=1, PW=∞).
+    /// For formatting, it assumes UTC upon the absence of time zone offset.
+    Timestamp,
+
+    /// Internal uses only.
+    ///
+    /// This item exists so that one can add additional internal-only formatting
+    /// without breaking major compatibility (as enum variants cannot be selectively private).
+    Internal(InternalNumeric),
+}
+
+/// An opaque type representing numeric item types for internal uses only.
+pub struct InternalNumeric {
+    _dummy: Void,
+}
+
+impl Clone for InternalNumeric {
+    fn clone(&self) -> Self {
+        match self._dummy {}
+    }
+}
+
+impl PartialEq for InternalNumeric {
+    fn eq(&self, _other: &InternalNumeric) -> bool {
+        match self._dummy {}
+    }
+}
+
+impl Eq for InternalNumeric {
+}
+
+impl fmt::Debug for InternalNumeric {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "<InternalNumeric>")
+    }
+}
+
+/// Fixed-format item types.
+///
+/// They have their own rules of formatting and parsing.
+/// Otherwise noted, they print in the specified cases but parse case-insensitively.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum Fixed {
+    /// Abbreviated month names.
+    ///
+    /// Prints a three-letter-long name in the title case, reads the same name in any case.
+    ShortMonthName,
+    /// Full month names.
+    ///
+    /// Prints a full name in the title case, reads either a short or full name in any case.
+    LongMonthName,
+    /// Abbreviated day of the week names.
+    ///
+    /// Prints a three-letter-long name in the title case, reads the same name in any case.
+    ShortWeekdayName,
+    /// Full day of the week names.
+    ///
+    /// Prints a full name in the title case, reads either a short or full name in any case.
+    LongWeekdayName,
+    /// AM/PM.
+    ///
+    /// Prints in lower case, reads in any case.
+    LowerAmPm,
+    /// AM/PM.
+    ///
+    /// Prints in upper case, reads in any case.
+    UpperAmPm,
+    /// An optional dot plus one or more digits for left-aligned nanoseconds.
+    /// May print nothing, 3, 6 or 9 digits according to the available accuracy.
+    /// See also [`Numeric::Nanosecond`](./enum.Numeric.html#variant.Nanosecond).
+    Nanosecond,
+    /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 3.
+    Nanosecond3,
+    /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 6.
+    Nanosecond6,
+    /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 9.
+    Nanosecond9,
+    /// Timezone name.
+    ///
+    /// It does not support parsing, its use in the parser is an immediate failure.
+    TimezoneName,
+    /// Offset from the local time to UTC (`+09:00` or `-04:00` or `+00:00`).
+    ///
+    /// In the parser, the colon can be omitted and/or surrounded with any amount of whitespaces.
+    /// The offset is limited from `-24:00` to `+24:00`,
+    /// which is same to [`FixedOffset`](../offset/struct.FixedOffset.html)'s range.
+    TimezoneOffsetColon,
+    /// Offset from the local time to UTC (`+09:00` or `-04:00` or `Z`).
+    ///
+    /// In the parser, the colon can be omitted and/or surrounded with any amount of whitespaces,
+    /// and `Z` can be either in upper case or in lower case.
+    /// The offset is limited from `-24:00` to `+24:00`,
+    /// which is same to [`FixedOffset`](../offset/struct.FixedOffset.html)'s range.
+    TimezoneOffsetColonZ,
+    /// Same to [`TimezoneOffsetColon`](#variant.TimezoneOffsetColon) but prints no colon.
+    /// Parsing allows an optional colon.
+    TimezoneOffset,
+    /// Same to [`TimezoneOffsetColonZ`](#variant.TimezoneOffsetColonZ) but prints no colon.
+    /// Parsing allows an optional colon.
+    TimezoneOffsetZ,
+    /// RFC 2822 date and time syntax. Commonly used for email and MIME date and time.
+    RFC2822,
+    /// RFC 3339 & ISO 8601 date and time syntax.
+    RFC3339,
+
+    /// Internal uses only.
+    ///
+    /// This item exists so that one can add additional internal-only formatting
+    /// without breaking major compatibility (as enum variants cannot be selectively private).
+    Internal(InternalFixed),
+}
+
+/// An opaque type representing fixed-format item types for internal uses only.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct InternalFixed {
+    val: InternalInternal,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+enum InternalInternal {
+    /// Same as [`TimezoneOffsetColonZ`](#variant.TimezoneOffsetColonZ), but
+    /// allows missing minutes (per [ISO 8601][iso8601]).
+    ///
+    /// # Panics
+    ///
+    /// If you try to use this for printing.
+    ///
+    /// [iso8601]: https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC
+    TimezoneOffsetPermissive,
+    /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 3 and there is no leading dot.
+    Nanosecond3NoDot,
+    /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 6 and there is no leading dot.
+    Nanosecond6NoDot,
+    /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 9 and there is no leading dot.
+    Nanosecond9NoDot,
+}
+
+/// A single formatting item. This is used for both formatting and parsing.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum Item<'a> {
+    /// A literally printed and parsed text.
+    Literal(&'a str),
+    /// Same to `Literal` but with the string owned by the item.
+    OwnedLiteral(Box<str>),
+    /// Whitespace. Prints literally but reads zero or more whitespace.
+    Space(&'a str),
+    /// Same to `Space` but with the string owned by the item.
+    OwnedSpace(Box<str>),
+    /// Numeric item. Can be optionally padded to the maximal length (if any) when formatting;
+    /// the parser simply ignores any padded whitespace and zeroes.
+    Numeric(Numeric, Pad),
+    /// Fixed-format item.
+    Fixed(Fixed),
+    /// Issues a formatting error. Used to signal an invalid format string.
+    Error,
+}
+
+macro_rules! lit  { ($x:expr) => (Item::Literal($x)) }
+macro_rules! sp   { ($x:expr) => (Item::Space($x)) }
+macro_rules! num  { ($x:ident) => (Item::Numeric(Numeric::$x, Pad::None)) }
+macro_rules! num0 { ($x:ident) => (Item::Numeric(Numeric::$x, Pad::Zero)) }
+macro_rules! nums { ($x:ident) => (Item::Numeric(Numeric::$x, Pad::Space)) }
+macro_rules! fix  { ($x:ident) => (Item::Fixed(Fixed::$x)) }
+macro_rules! internal_fix { ($x:ident) => (Item::Fixed(Fixed::Internal(InternalFixed { val: InternalInternal::$x })))}
+
+/// An error from the `parse` function.
+#[derive(Debug, Clone, PartialEq, Eq, Copy)]
+pub struct ParseError(ParseErrorKind);
+
+#[derive(Debug, Clone, PartialEq, Eq, Copy)]
+enum ParseErrorKind {
+    /// Given field is out of permitted range.
+    OutOfRange,
+
+    /// There is no possible date and time value with given set of fields.
+    ///
+    /// This does not include the out-of-range conditions, which are trivially invalid.
+    /// It includes the case that there are one or more fields that are inconsistent to each other.
+    Impossible,
+
+    /// Given set of fields is not enough to make a requested date and time value.
+    ///
+    /// Note that there *may* be a case that given fields constrain the possible values so much
+    /// that there is a unique possible value. Chrono only tries to be correct for
+    /// most useful sets of fields however, as such constraint solving can be expensive.
+    NotEnough,
+
+    /// The input string has some invalid character sequence for given formatting items.
+    Invalid,
+
+    /// The input string has been prematurely ended.
+    TooShort,
+
+    /// All formatting items have been read but there is a remaining input.
+    TooLong,
+
+    /// There was an error on the formatting string, or there were non-supported formating items.
+    BadFormat,
+}
+
+/// Same to `Result<T, ParseError>`.
+pub type ParseResult<T> = Result<T, ParseError>;
+
+impl fmt::Display for ParseError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.description().fmt(f)
+    }
+}
+
+impl Error for ParseError {
+    fn description(&self) -> &str {
+        match self.0 {
+            ParseErrorKind::OutOfRange => "input is out of range",
+            ParseErrorKind::Impossible => "no possible date and time matching input",
+            ParseErrorKind::NotEnough => "input is not enough for unique date and time",
+            ParseErrorKind::Invalid => "input contains invalid characters",
+            ParseErrorKind::TooShort => "premature end of input",
+            ParseErrorKind::TooLong => "trailing input",
+            ParseErrorKind::BadFormat => "bad or unsupported format string",
+        }
+    }
+}
+
+// to be used in this module and submodules
+const OUT_OF_RANGE: ParseError = ParseError(ParseErrorKind::OutOfRange);
+const IMPOSSIBLE:   ParseError = ParseError(ParseErrorKind::Impossible);
+const NOT_ENOUGH:   ParseError = ParseError(ParseErrorKind::NotEnough);
+const INVALID:      ParseError = ParseError(ParseErrorKind::Invalid);
+const TOO_SHORT:    ParseError = ParseError(ParseErrorKind::TooShort);
+const TOO_LONG:     ParseError = ParseError(ParseErrorKind::TooLong);
+const BAD_FORMAT:   ParseError = ParseError(ParseErrorKind::BadFormat);
+
+/// Tries to format given arguments with given formatting items.
+/// Internally used by `DelayedFormat`.
+pub fn format<'a, I>(w: &mut fmt::Formatter, date: Option<&NaiveDate>, time: Option<&NaiveTime>,
+                     off: Option<&(String, FixedOffset)>, items: I) -> fmt::Result
+        where I: Iterator<Item=Item<'a>> {
+    // full and abbreviated month and weekday names
+    static SHORT_MONTHS: [&'static str; 12] =
+        ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+    static LONG_MONTHS: [&'static str; 12] =
+        ["January", "February", "March", "April", "May", "June",
+         "July", "August", "September", "October", "November", "December"];
+    static SHORT_WEEKDAYS: [&'static str; 7] =
+        ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    static LONG_WEEKDAYS: [&'static str; 7] =
+        ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+
+    for item in items {
+        match item {
+            Item::Literal(s) | Item::Space(s) => try!(write!(w, "{}", s)),
+            Item::OwnedLiteral(ref s) | Item::OwnedSpace(ref s) => try!(write!(w, "{}", s)),
+
+            Item::Numeric(spec, pad) => {
+                use self::Numeric::*;
+
+                let week_from_sun = |d: &NaiveDate|
+                    (d.ordinal() as i32 - d.weekday().num_days_from_sunday() as i32 + 7) / 7;
+                let week_from_mon = |d: &NaiveDate|
+                    (d.ordinal() as i32 - d.weekday().num_days_from_monday() as i32 + 7) / 7;
+
+                let (width, v) = match spec {
+                    Year           => (4, date.map(|d| i64::from(d.year()))),
+                    YearDiv100     => (2, date.map(|d| div_floor(i64::from(d.year()), 100))),
+                    YearMod100     => (2, date.map(|d| mod_floor(i64::from(d.year()), 100))),
+                    IsoYear        => (4, date.map(|d| i64::from(d.iso_week().year()))),
+                    IsoYearDiv100  => (2, date.map(|d| div_floor(
+                        i64::from(d.iso_week().year()), 100))),
+                    IsoYearMod100  => (2, date.map(|d| mod_floor(
+                        i64::from(d.iso_week().year()), 100))),
+                    Month          => (2, date.map(|d| i64::from(d.month()))),
+                    Day            => (2, date.map(|d| i64::from(d.day()))),
+                    WeekFromSun    => (2, date.map(|d| i64::from(week_from_sun(d)))),
+                    WeekFromMon    => (2, date.map(|d| i64::from(week_from_mon(d)))),
+                    IsoWeek        => (2, date.map(|d| i64::from(d.iso_week().week()))),
+                    NumDaysFromSun => (1, date.map(|d| i64::from(d.weekday()
+                                                                  .num_days_from_sunday()))),
+                    WeekdayFromMon => (1, date.map(|d| i64::from(d.weekday()
+                                                                  .number_from_monday()))),
+                    Ordinal        => (3, date.map(|d| i64::from(d.ordinal()))),
+                    Hour           => (2, time.map(|t| i64::from(t.hour()))),
+                    Hour12         => (2, time.map(|t| i64::from(t.hour12().1))),
+                    Minute         => (2, time.map(|t| i64::from(t.minute()))),
+                    Second         => (2, time.map(|t| i64::from(t.second() +
+                                                        t.nanosecond() / 1_000_000_000))),
+                    Nanosecond     => (9, time.map(|t| i64::from(t.nanosecond() % 1_000_000_000))),
+                    Timestamp      => (1, match (date, time, off) {
+                        (Some(d), Some(t), None) =>
+                            Some(d.and_time(*t).timestamp()),
+                        (Some(d), Some(t), Some(&(_, off))) =>
+                            Some((d.and_time(*t) - off).timestamp()),
+                        (_, _, _) => None
+                    }),
+
+                    // for the future expansion
+                    Internal(ref int) => match int._dummy {},
+                };
+
+                if let Some(v) = v {
+                    if (spec == Year || spec == IsoYear) && !(0 <= v && v < 10_000) {
+                        // non-four-digit years require an explicit sign as per ISO 8601
+                        match pad {
+                            Pad::None => try!(write!(w, "{:+}", v)),
+                            Pad::Zero => try!(write!(w, "{:+01$}", v, width + 1)),
+                            Pad::Space => try!(write!(w, "{:+1$}", v, width + 1)),
+                        }
+                    } else {
+                        match pad {
+                            Pad::None => try!(write!(w, "{}", v)),
+                            Pad::Zero => try!(write!(w, "{:01$}", v, width)),
+                            Pad::Space => try!(write!(w, "{:1$}", v, width)),
+                        }
+                    }
+                } else {
+                    return Err(fmt::Error); // insufficient arguments for given format
+                }
+            },
+
+            Item::Fixed(spec) => {
+                use self::Fixed::*;
+
+                /// Prints an offset from UTC in the format of `+HHMM` or `+HH:MM`.
+                /// `Z` instead of `+00[:]00` is allowed when `allow_zulu` is true.
+                fn write_local_minus_utc(w: &mut fmt::Formatter, off: FixedOffset,
+                                         allow_zulu: bool, use_colon: bool) -> fmt::Result {
+                    let off = off.local_minus_utc();
+                    if !allow_zulu || off != 0 {
+                        let (sign, off) = if off < 0 {('-', -off)} else {('+', off)};
+                        if use_colon {
+                            write!(w, "{}{:02}:{:02}", sign, off / 3600, off / 60 % 60)
+                        } else {
+                            write!(w, "{}{:02}{:02}", sign, off / 3600, off / 60 % 60)
+                        }
+                    } else {
+                        write!(w, "Z")
+                    }
+                }
+
+                let ret = match spec {
+                    ShortMonthName =>
+                        date.map(|d| write!(w, "{}", SHORT_MONTHS[d.month0() as usize])),
+                    LongMonthName =>
+                        date.map(|d| write!(w, "{}", LONG_MONTHS[d.month0() as usize])),
+                    ShortWeekdayName =>
+                        date.map(|d| write!(w, "{}",
+                            SHORT_WEEKDAYS[d.weekday().num_days_from_monday() as usize])),
+                    LongWeekdayName =>
+                        date.map(|d| write!(w, "{}",
+                            LONG_WEEKDAYS[d.weekday().num_days_from_monday() as usize])),
+                    LowerAmPm =>
+                        time.map(|t| write!(w, "{}", if t.hour12().0 {"pm"} else {"am"})),
+                    UpperAmPm =>
+                        time.map(|t| write!(w, "{}", if t.hour12().0 {"PM"} else {"AM"})),
+                    Nanosecond =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            if nano == 0 {
+                                Ok(())
+                            } else if nano % 1_000_000 == 0 {
+                                write!(w, ".{:03}", nano / 1_000_000)
+                            } else if nano % 1_000 == 0 {
+                                write!(w, ".{:06}", nano / 1_000)
+                            } else {
+                                write!(w, ".{:09}", nano)
+                            }
+                        }),
+                    Nanosecond3 =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            write!(w, ".{:03}", nano / 1_000_000)
+                        }),
+                    Nanosecond6 =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            write!(w, ".{:06}", nano / 1_000)
+                        }),
+                    Nanosecond9 =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            write!(w, ".{:09}", nano)
+                        }),
+                    Internal(InternalFixed { val: InternalInternal::Nanosecond3NoDot }) =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            write!(w, "{:03}", nano / 1_000_000)
+                        }),
+                    Internal(InternalFixed { val: InternalInternal::Nanosecond6NoDot }) =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            write!(w, "{:06}", nano / 1_000)
+                        }),
+                    Internal(InternalFixed { val: InternalInternal::Nanosecond9NoDot }) =>
+                        time.map(|t| {
+                            let nano = t.nanosecond() % 1_000_000_000;
+                            write!(w, "{:09}", nano)
+                        }),
+                    TimezoneName =>
+                        off.map(|&(ref name, _)| write!(w, "{}", *name)),
+                    TimezoneOffsetColon =>
+                        off.map(|&(_, off)| write_local_minus_utc(w, off, false, true)),
+                    TimezoneOffsetColonZ =>
+                        off.map(|&(_, off)| write_local_minus_utc(w, off, true, true)),
+                    TimezoneOffset =>
+                        off.map(|&(_, off)| write_local_minus_utc(w, off, false, false)),
+                    TimezoneOffsetZ =>
+                        off.map(|&(_, off)| write_local_minus_utc(w, off, true, false)),
+                    Internal(InternalFixed { val: InternalInternal::TimezoneOffsetPermissive }) =>
+                        panic!("Do not try to write %#z it is undefined"),
+                    RFC2822 => // same to `%a, %e %b %Y %H:%M:%S %z`
+                        if let (Some(d), Some(t), Some(&(_, off))) = (date, time, off) {
+                            let sec = t.second() + t.nanosecond() / 1_000_000_000;
+                            try!(write!(w, "{}, {:2} {} {:04} {:02}:{:02}:{:02} ",
+                                        SHORT_WEEKDAYS[d.weekday().num_days_from_monday() as usize],
+                                        d.day(), SHORT_MONTHS[d.month0() as usize], d.year(),
+                                        t.hour(), t.minute(), sec));
+                            Some(write_local_minus_utc(w, off, false, false))
+                        } else {
+                            None
+                        },
+                    RFC3339 => // same to `%Y-%m-%dT%H:%M:%S%.f%:z`
+                        if let (Some(d), Some(t), Some(&(_, off))) = (date, time, off) {
+                            // reuse `Debug` impls which already print ISO 8601 format.
+                            // this is faster in this way.
+                            try!(write!(w, "{:?}T{:?}", d, t));
+                            Some(write_local_minus_utc(w, off, false, true))
+                        } else {
+                            None
+                        },
+                };
+
+                match ret {
+                    Some(ret) => try!(ret),
+                    None => return Err(fmt::Error), // insufficient arguments for given format
+                }
+            },
+
+            Item::Error => return Err(fmt::Error),
+        }
+    }
+
+    Ok(())
+}
+
+mod parsed;
+
+// due to the size of parsing routines, they are in separate modules.
+mod scan;
+mod parse;
+
+pub mod strftime;
+
+/// A *temporary* object which can be used as an argument to `format!` or others.
+/// This is normally constructed via `format` methods of each date and time type.
+#[derive(Debug)]
+pub struct DelayedFormat<I> {
+    /// The date view, if any.
+    date: Option<NaiveDate>,
+    /// The time view, if any.
+    time: Option<NaiveTime>,
+    /// The name and local-to-UTC difference for the offset (timezone), if any.
+    off: Option<(String, FixedOffset)>,
+    /// An iterator returning formatting items.
+    items: I,
+}
+
+impl<'a, I: Iterator<Item=Item<'a>> + Clone> DelayedFormat<I> {
+    /// Makes a new `DelayedFormat` value out of local date and time.
+    pub fn new(date: Option<NaiveDate>, time: Option<NaiveTime>, items: I) -> DelayedFormat<I> {
+        DelayedFormat { date: date, time: time, off: None, items: items }
+    }
+
+    /// Makes a new `DelayedFormat` value out of local date and time and UTC offset.
+    pub fn new_with_offset<Off>(date: Option<NaiveDate>, time: Option<NaiveTime>,
+                                offset: &Off, items: I) -> DelayedFormat<I>
+            where Off: Offset + fmt::Display {
+        let name_and_diff = (offset.to_string(), offset.fix());
+        DelayedFormat { date: date, time: time, off: Some(name_and_diff), items: items }
+    }
+}
+
+impl<'a, I: Iterator<Item=Item<'a>> + Clone> fmt::Display for DelayedFormat<I> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        format(f, self.date.as_ref(), self.time.as_ref(), self.off.as_ref(), self.items.clone())
+    }
+}
+
+// this implementation is here only because we need some private code from `scan`
+
+/// Parsing a `str` into a `Weekday` uses the format [`%W`](./format/strftime/index.html).
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::Weekday;
+///
+/// assert_eq!("Sunday".parse::<Weekday>(), Ok(Weekday::Sun));
+/// assert!("any day".parse::<Weekday>().is_err());
+/// ~~~~
+///
+/// The parsing is case-insensitive.
+///
+/// ~~~~
+/// # use chrono::Weekday;
+/// assert_eq!("mON".parse::<Weekday>(), Ok(Weekday::Mon));
+/// ~~~~
+///
+/// Only the shortest form (e.g. `sun`) and the longest form (e.g. `sunday`) is accepted.
+///
+/// ~~~~
+/// # use chrono::Weekday;
+/// assert!("thurs".parse::<Weekday>().is_err());
+/// ~~~~
+impl FromStr for Weekday {
+    type Err = ParseWeekdayError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if let Ok(("", w)) = scan::short_or_long_weekday(s) {
+            Ok(w)
+        } else {
+            Err(ParseWeekdayError { _dummy: () })
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/format/parsed.rs cargo-0.33.0/vendor/chrono/src/format/parsed.rs
--- cargo-0.32.0/vendor/chrono/src/format/parsed.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/format/parsed.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1088 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! A collection of parsed date and time items.
+//! They can be constructed incrementally while being checked for consistency.
+
+use num_traits::ToPrimitive;
+use oldtime::Duration as OldDuration;
+
+use {Datelike, Timelike};
+use Weekday;
+use div::div_rem;
+use offset::{TimeZone, Offset, LocalResult, FixedOffset};
+use naive::{NaiveDate, NaiveTime, NaiveDateTime};
+use DateTime;
+use super::{ParseResult, OUT_OF_RANGE, IMPOSSIBLE, NOT_ENOUGH};
+
+/// Parsed parts of date and time. There are two classes of methods:
+///
+/// - `set_*` methods try to set given field(s) while checking for the consistency.
+///   It may or may not check for the range constraint immediately (for efficiency reasons).
+///
+/// - `to_*` methods try to make a concrete date and time value out of set fields.
+///   It fully checks any remaining out-of-range conditions and inconsistent/impossible fields.
+#[allow(missing_copy_implementations)]
+#[derive(Clone, PartialEq, Debug)]
+pub struct Parsed {
+    /// Year.
+    ///
+    /// This can be negative unlike [`year_div_100`](#structfield.year_div_100)
+    /// and [`year_mod_100`](#structfield.year_mod_100) fields.
+    pub year: Option<i32>,
+
+    /// Year divided by 100. Implies that the year is >= 1 BCE when set.
+    ///
+    /// Due to the common usage, if this field is missing but
+    /// [`year_mod_100`](#structfield.year_mod_100) is present,
+    /// it is inferred to 19 when `year_mod_100 >= 70` and 20 otherwise.
+    pub year_div_100: Option<i32>,
+
+    /// Year modulo 100. Implies that the year is >= 1 BCE when set.
+    pub year_mod_100: Option<i32>,
+
+    /// Year in the [ISO week date](../naive/struct.NaiveDate.html#week-date).
+    ///
+    /// This can be negative unlike [`isoyear_div_100`](#structfield.isoyear_div_100) and
+    /// [`isoyear_mod_100`](#structfield.isoyear_mod_100) fields.
+    pub isoyear: Option<i32>,
+
+    /// Year in the [ISO week date](../naive/struct.NaiveDate.html#week-date), divided by 100.
+    /// Implies that the year is >= 1 BCE when set.
+    ///
+    /// Due to the common usage, if this field is missing but
+    /// [`isoyear_mod_100`](#structfield.isoyear_mod_100) is present,
+    /// it is inferred to 19 when `isoyear_mod_100 >= 70` and 20 otherwise.
+    pub isoyear_div_100: Option<i32>,
+
+    /// Year in the [ISO week date](../naive/struct.NaiveDate.html#week-date), modulo 100.
+    /// Implies that the year is >= 1 BCE when set.
+    pub isoyear_mod_100: Option<i32>,
+
+    /// Month (1--12).
+    pub month: Option<u32>,
+
+    /// Week number, where the week 1 starts at the first Sunday of January
+    /// (0--53, 1--53 or 1--52 depending on the year).
+    pub week_from_sun: Option<u32>,
+
+    /// Week number, where the week 1 starts at the first Monday of January
+    /// (0--53, 1--53 or 1--52 depending on the year).
+    pub week_from_mon: Option<u32>,
+
+    /// [ISO week number](../naive/struct.NaiveDate.html#week-date)
+    /// (1--52 or 1--53 depending on the year).
+    pub isoweek: Option<u32>,
+
+    /// Day of the week.
+    pub weekday: Option<Weekday>,
+
+    /// Day of the year (1--365 or 1--366 depending on the year).
+    pub ordinal: Option<u32>,
+
+    /// Day of the month (1--28, 1--29, 1--30 or 1--31 depending on the month).
+    pub day: Option<u32>,
+
+    /// Hour number divided by 12 (0--1). 0 indicates AM and 1 indicates PM.
+    pub hour_div_12: Option<u32>,
+
+    /// Hour number modulo 12 (0--11).
+    pub hour_mod_12: Option<u32>,
+
+    /// Minute number (0--59).
+    pub minute: Option<u32>,
+
+    /// Second number (0--60, accounting for leap seconds).
+    pub second: Option<u32>,
+
+    /// The number of nanoseconds since the whole second (0--999,999,999).
+    pub nanosecond: Option<u32>,
+
+    /// The number of non-leap seconds since the midnight UTC on January 1, 1970.
+    ///
+    /// This can be off by one if [`second`](#structfield.second) is 60 (a leap second).
+    pub timestamp: Option<i64>,
+
+    /// Offset from the local time to UTC, in seconds.
+    pub offset: Option<i32>,
+
+    /// A dummy field to make this type not fully destructible (required for API stability).
+    _dummy: (),
+}
+
+/// Checks if `old` is either empty or has the same value to `new` (i.e. "consistent"),
+/// and if it is empty, set `old` to `new` as well.
+fn set_if_consistent<T: PartialEq>(old: &mut Option<T>, new: T) -> ParseResult<()> {
+    if let Some(ref old) = *old {
+        if *old == new {Ok(())} else {Err(IMPOSSIBLE)}
+    } else {
+        *old = Some(new);
+        Ok(())
+    }
+}
+
+impl Default for Parsed {
+    fn default() -> Parsed {
+        Parsed {
+            year: None, year_div_100: None, year_mod_100: None, isoyear: None,
+            isoyear_div_100: None, isoyear_mod_100: None, month: None,
+            week_from_sun: None, week_from_mon: None, isoweek: None, weekday: None,
+            ordinal: None, day: None, hour_div_12: None, hour_mod_12: None, minute: None,
+            second: None, nanosecond: None, timestamp: None, offset: None,
+            _dummy: (),
+        }
+    }
+}
+
+impl Parsed {
+    /// Returns the initial value of parsed parts.
+    pub fn new() -> Parsed {
+        Parsed::default()
+    }
+
+    /// Tries to set the [`year`](#structfield.year) field from given value.
+    pub fn set_year(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.year, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`year_div_100`](#structfield.year_div_100) field from given value.
+    pub fn set_year_div_100(&mut self, value: i64) -> ParseResult<()> {
+        if value < 0 { return Err(OUT_OF_RANGE); }
+        set_if_consistent(&mut self.year_div_100, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`year_mod_100`](#structfield.year_mod_100) field from given value.
+    pub fn set_year_mod_100(&mut self, value: i64) -> ParseResult<()> {
+        if value < 0 { return Err(OUT_OF_RANGE); }
+        set_if_consistent(&mut self.year_mod_100, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`isoyear`](#structfield.isoyear) field from given value.
+    pub fn set_isoyear(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.isoyear, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`isoyear_div_100`](#structfield.isoyear_div_100) field from given value.
+    pub fn set_isoyear_div_100(&mut self, value: i64) -> ParseResult<()> {
+        if value < 0 { return Err(OUT_OF_RANGE); }
+        set_if_consistent(&mut self.isoyear_div_100, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`isoyear_mod_100`](#structfield.isoyear_mod_100) field from given value.
+    pub fn set_isoyear_mod_100(&mut self, value: i64) -> ParseResult<()> {
+        if value < 0 { return Err(OUT_OF_RANGE); }
+        set_if_consistent(&mut self.isoyear_mod_100, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`month`](#structfield.month) field from given value.
+    pub fn set_month(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.month, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`week_from_sun`](#structfield.week_from_sun) field from given value.
+    pub fn set_week_from_sun(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.week_from_sun, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`week_from_mon`](#structfield.week_from_mon) field from given value.
+    pub fn set_week_from_mon(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.week_from_mon, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`isoweek`](#structfield.isoweek) field from given value.
+    pub fn set_isoweek(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.isoweek, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`weekday`](#structfield.weekday) field from given value.
+    pub fn set_weekday(&mut self, value: Weekday) -> ParseResult<()> {
+        set_if_consistent(&mut self.weekday, value)
+    }
+
+    /// Tries to set the [`ordinal`](#structfield.ordinal) field from given value.
+    pub fn set_ordinal(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.ordinal, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`day`](#structfield.day) field from given value.
+    pub fn set_day(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.day, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`hour_div_12`](#structfield.hour_div_12) field from given value.
+    /// (`false` for AM, `true` for PM)
+    pub fn set_ampm(&mut self, value: bool) -> ParseResult<()> {
+        set_if_consistent(&mut self.hour_div_12, if value {1} else {0})
+    }
+
+    /// Tries to set the [`hour_mod_12`](#structfield.hour_mod_12) field from
+    /// given hour number in 12-hour clocks.
+    pub fn set_hour12(&mut self, value: i64) -> ParseResult<()> {
+        if value < 1 || value > 12 { return Err(OUT_OF_RANGE); }
+        set_if_consistent(&mut self.hour_mod_12, value as u32 % 12)
+    }
+
+    /// Tries to set both [`hour_div_12`](#structfield.hour_div_12) and
+    /// [`hour_mod_12`](#structfield.hour_mod_12) fields from given value.
+    pub fn set_hour(&mut self, value: i64) -> ParseResult<()> {
+        let v = try!(value.to_u32().ok_or(OUT_OF_RANGE));
+        try!(set_if_consistent(&mut self.hour_div_12, v / 12));
+        try!(set_if_consistent(&mut self.hour_mod_12, v % 12));
+        Ok(())
+    }
+
+    /// Tries to set the [`minute`](#structfield.minute) field from given value.
+    pub fn set_minute(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.minute, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`second`](#structfield.second) field from given value.
+    pub fn set_second(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.second, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`nanosecond`](#structfield.nanosecond) field from given value.
+    pub fn set_nanosecond(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.nanosecond, try!(value.to_u32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Tries to set the [`timestamp`](#structfield.timestamp) field from given value.
+    pub fn set_timestamp(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.timestamp, value)
+    }
+
+    /// Tries to set the [`offset`](#structfield.offset) field from given value.
+    pub fn set_offset(&mut self, value: i64) -> ParseResult<()> {
+        set_if_consistent(&mut self.offset, try!(value.to_i32().ok_or(OUT_OF_RANGE)))
+    }
+
+    /// Returns a parsed naive date out of given fields.
+    ///
+    /// This method is able to determine the date from given subset of fields:
+    ///
+    /// - Year, month, day.
+    /// - Year, day of the year (ordinal).
+    /// - Year, week number counted from Sunday or Monday, day of the week.
+    /// - ISO week date.
+    ///
+    /// Gregorian year and ISO week date year can have their century number (`*_div_100`) omitted,
+    /// the two-digit year is used to guess the century number then.
+    pub fn to_naive_date(&self) -> ParseResult<NaiveDate> {
+        fn resolve_year(y: Option<i32>, q: Option<i32>,
+                        r: Option<i32>) -> ParseResult<Option<i32>> {
+            match (y, q, r) {
+                // if there is no further information, simply return the given full year.
+                // this is a common case, so let's avoid division here.
+                (y, None, None) => Ok(y),
+
+                // if there is a full year *and* also quotient and/or modulo,
+                // check if present quotient and/or modulo is consistent to the full year.
+                // since the presence of those fields means a positive full year,
+                // we should filter a negative full year first.
+                (Some(y), q, r @ Some(0...99)) | (Some(y), q, r @ None) => {
+                    if y < 0 { return Err(OUT_OF_RANGE); }
+                    let (q_, r_) = div_rem(y, 100);
+                    if q.unwrap_or(q_) == q_ && r.unwrap_or(r_) == r_ {
+                        Ok(Some(y))
+                    } else {
+                        Err(IMPOSSIBLE)
+                    }
+                },
+
+                // the full year is missing but we have quotient and modulo.
+                // reconstruct the full year. make sure that the result is always positive.
+                (None, Some(q), Some(r @ 0...99)) => {
+                    if q < 0 { return Err(OUT_OF_RANGE); }
+                    let y = q.checked_mul(100).and_then(|v| v.checked_add(r));
+                    Ok(Some(try!(y.ok_or(OUT_OF_RANGE))))
+                },
+
+                // we only have modulo. try to interpret a modulo as a conventional two-digit year.
+                // note: we are affected by Rust issue #18060. avoid multiple range patterns.
+                (None, None, Some(r @ 0...99)) => Ok(Some(r + if r < 70 {2000} else {1900})),
+
+                // otherwise it is an out-of-bound or insufficient condition.
+                (None, Some(_), None) => Err(NOT_ENOUGH),
+                (_, _, Some(_)) => Err(OUT_OF_RANGE),
+            }
+        }
+
+        let given_year =
+            try!(resolve_year(self.year, self.year_div_100, self.year_mod_100));
+        let given_isoyear =
+            try!(resolve_year(self.isoyear, self.isoyear_div_100, self.isoyear_mod_100));
+
+        // verify the normal year-month-day date.
+        let verify_ymd = |date: NaiveDate| {
+            let year = date.year();
+            let (year_div_100, year_mod_100) = if year >= 0 {
+                let (q, r) = div_rem(year, 100);
+                (Some(q), Some(r))
+            } else {
+                (None, None) // they should be empty to be consistent
+            };
+            let month = date.month();
+            let day = date.day();
+            (self.year.unwrap_or(year) == year &&
+             self.year_div_100.or(year_div_100) == year_div_100 &&
+             self.year_mod_100.or(year_mod_100) == year_mod_100 &&
+             self.month.unwrap_or(month) == month &&
+             self.day.unwrap_or(day) == day)
+        };
+
+        // verify the ISO week date.
+        let verify_isoweekdate = |date: NaiveDate| {
+            let week = date.iso_week();
+            let isoyear = week.year();
+            let isoweek = week.week();
+            let weekday = date.weekday();
+            let (isoyear_div_100, isoyear_mod_100) = if isoyear >= 0 {
+                let (q, r) = div_rem(isoyear, 100);
+                (Some(q), Some(r))
+            } else {
+                (None, None) // they should be empty to be consistent
+            };
+            (self.isoyear.unwrap_or(isoyear) == isoyear &&
+             self.isoyear_div_100.or(isoyear_div_100) == isoyear_div_100 &&
+             self.isoyear_mod_100.or(isoyear_mod_100) == isoyear_mod_100 &&
+             self.isoweek.unwrap_or(isoweek) == isoweek &&
+             self.weekday.unwrap_or(weekday) == weekday)
+        };
+
+        // verify the ordinal and other (non-ISO) week dates.
+        let verify_ordinal = |date: NaiveDate| {
+            let ordinal = date.ordinal();
+            let weekday = date.weekday();
+            let week_from_sun = (ordinal as i32 - weekday.num_days_from_sunday() as i32 + 7) / 7;
+            let week_from_mon = (ordinal as i32 - weekday.num_days_from_monday() as i32 + 7) / 7;
+            (self.ordinal.unwrap_or(ordinal) == ordinal &&
+             self.week_from_sun.map_or(week_from_sun, |v| v as i32) == week_from_sun &&
+             self.week_from_mon.map_or(week_from_mon, |v| v as i32) == week_from_mon)
+        };
+
+        // test several possibilities.
+        // tries to construct a full `NaiveDate` as much as possible, then verifies that
+        // it is consistent with other given fields.
+        let (verified, parsed_date) = match (given_year, given_isoyear, self) {
+            (Some(year), _, &Parsed { month: Some(month), day: Some(day), .. }) => {
+                // year, month, day
+                let date = try!(NaiveDate::from_ymd_opt(year, month, day).ok_or(OUT_OF_RANGE));
+                (verify_isoweekdate(date) && verify_ordinal(date), date)
+            },
+
+            (Some(year), _, &Parsed { ordinal: Some(ordinal), .. }) => {
+                // year, day of the year
+                let date = try!(NaiveDate::from_yo_opt(year, ordinal).ok_or(OUT_OF_RANGE));
+                (verify_ymd(date) && verify_isoweekdate(date) && verify_ordinal(date), date)
+            },
+
+            (Some(year), _, &Parsed { week_from_sun: Some(week_from_sun),
+                                      weekday: Some(weekday), .. }) => {
+                // year, week (starting at 1st Sunday), day of the week
+                let newyear = try!(NaiveDate::from_yo_opt(year, 1).ok_or(OUT_OF_RANGE));
+                let firstweek = match newyear.weekday() {
+                    Weekday::Sun => 0,
+                    Weekday::Mon => 6,
+                    Weekday::Tue => 5,
+                    Weekday::Wed => 4,
+                    Weekday::Thu => 3,
+                    Weekday::Fri => 2,
+                    Weekday::Sat => 1,
+                };
+
+                // `firstweek+1`-th day of January is the beginning of the week 1.
+                if week_from_sun > 53 { return Err(OUT_OF_RANGE); } // can it overflow?
+                let ndays = firstweek + (week_from_sun as i32 - 1) * 7 +
+                            weekday.num_days_from_sunday() as i32;
+                let date = try!(newyear.checked_add_signed(OldDuration::days(i64::from(ndays)))
+                                       .ok_or(OUT_OF_RANGE));
+                if date.year() != year { return Err(OUT_OF_RANGE); } // early exit for correct error
+
+                (verify_ymd(date) && verify_isoweekdate(date) && verify_ordinal(date), date)
+            },
+
+            (Some(year), _, &Parsed { week_from_mon: Some(week_from_mon),
+                                      weekday: Some(weekday), .. }) => {
+                // year, week (starting at 1st Monday), day of the week
+                let newyear = try!(NaiveDate::from_yo_opt(year, 1).ok_or(OUT_OF_RANGE));
+                let firstweek = match newyear.weekday() {
+                    Weekday::Sun => 1,
+                    Weekday::Mon => 0,
+                    Weekday::Tue => 6,
+                    Weekday::Wed => 5,
+                    Weekday::Thu => 4,
+                    Weekday::Fri => 3,
+                    Weekday::Sat => 2,
+                };
+
+                // `firstweek+1`-th day of January is the beginning of the week 1.
+                if week_from_mon > 53 { return Err(OUT_OF_RANGE); } // can it overflow?
+                let ndays = firstweek + (week_from_mon as i32 - 1) * 7 +
+                            weekday.num_days_from_monday() as i32;
+                let date = try!(newyear.checked_add_signed(OldDuration::days(i64::from(ndays)))
+                                       .ok_or(OUT_OF_RANGE));
+                if date.year() != year { return Err(OUT_OF_RANGE); } // early exit for correct error
+
+                (verify_ymd(date) && verify_isoweekdate(date) && verify_ordinal(date), date)
+            },
+
+            (_, Some(isoyear), &Parsed { isoweek: Some(isoweek), weekday: Some(weekday), .. }) => {
+                // ISO year, week, day of the week
+                let date = NaiveDate::from_isoywd_opt(isoyear, isoweek, weekday);
+                let date = try!(date.ok_or(OUT_OF_RANGE));
+                (verify_ymd(date) && verify_ordinal(date), date)
+            },
+
+            (_, _, _) => return Err(NOT_ENOUGH)
+        };
+
+        if verified {
+            Ok(parsed_date)
+        } else {
+            Err(IMPOSSIBLE)
+        }
+    }
+
+    /// Returns a parsed naive time out of given fields.
+    ///
+    /// This method is able to determine the time from given subset of fields:
+    ///
+    /// - Hour, minute. (second and nanosecond assumed to be 0)
+    /// - Hour, minute, second. (nanosecond assumed to be 0)
+    /// - Hour, minute, second, nanosecond.
+    ///
+    /// It is able to handle leap seconds when given second is 60.
+    pub fn to_naive_time(&self) -> ParseResult<NaiveTime> {
+        let hour_div_12 = match self.hour_div_12 {
+            Some(v @ 0...1) => v,
+            Some(_) => return Err(OUT_OF_RANGE),
+            None => return Err(NOT_ENOUGH),
+        };
+        let hour_mod_12 = match self.hour_mod_12 {
+            Some(v @ 0...11) => v,
+            Some(_) => return Err(OUT_OF_RANGE),
+            None => return Err(NOT_ENOUGH),
+        };
+        let hour = hour_div_12 * 12 + hour_mod_12;
+
+        let minute = match self.minute {
+            Some(v @ 0...59) => v,
+            Some(_) => return Err(OUT_OF_RANGE),
+            None => return Err(NOT_ENOUGH),
+        };
+
+        // we allow omitting seconds or nanoseconds, but they should be in the range.
+        let (second, mut nano) = match self.second.unwrap_or(0) {
+            v @ 0...59 => (v, 0),
+            60 => (59, 1_000_000_000),
+            _ => return Err(OUT_OF_RANGE),
+        };
+        nano += match self.nanosecond {
+            Some(v @ 0...999_999_999) if self.second.is_some() => v,
+            Some(0...999_999_999) => return Err(NOT_ENOUGH), // second is missing
+            Some(_) => return Err(OUT_OF_RANGE),
+            None => 0,
+        };
+
+        NaiveTime::from_hms_nano_opt(hour, minute, second, nano).ok_or(OUT_OF_RANGE)
+    }
+
+    /// Returns a parsed naive date and time out of given fields,
+    /// except for the [`offset`](#structfield.offset) field (assumed to have a given value).
+    /// This is required for parsing a local time or other known-timezone inputs.
+    ///
+    /// This method is able to determine the combined date and time
+    /// from date and time fields or a single [`timestamp`](#structfield.timestamp) field.
+    /// Either way those fields have to be consistent to each other.
+    pub fn to_naive_datetime_with_offset(&self, offset: i32) -> ParseResult<NaiveDateTime> {
+        let date = self.to_naive_date();
+        let time = self.to_naive_time();
+        if let (Ok(date), Ok(time)) = (date, time) {
+            let datetime = date.and_time(time);
+
+            // verify the timestamp field if any
+            // the following is safe, `timestamp` is very limited in range
+            let timestamp = datetime.timestamp() - i64::from(offset);
+            if let Some(given_timestamp) = self.timestamp {
+                // if `datetime` represents a leap second, it might be off by one second.
+                if given_timestamp != timestamp &&
+                   !(datetime.nanosecond() >= 1_000_000_000 && given_timestamp == timestamp + 1) {
+                    return Err(IMPOSSIBLE);
+                }
+            }
+
+            Ok(datetime)
+        } else if let Some(timestamp) = self.timestamp {
+            use super::ParseError as PE;
+            use super::ParseErrorKind::{OutOfRange, Impossible};
+
+            // if date and time is problematic already, there is no point proceeding.
+            // we at least try to give a correct error though.
+            match (date, time) {
+                (Err(PE(OutOfRange)), _) | (_, Err(PE(OutOfRange))) => return Err(OUT_OF_RANGE),
+                (Err(PE(Impossible)), _) | (_, Err(PE(Impossible))) => return Err(IMPOSSIBLE),
+                (_, _) => {} // one of them is insufficient
+            }
+
+            // reconstruct date and time fields from timestamp
+            let ts = try!(timestamp.checked_add(i64::from(offset)).ok_or(OUT_OF_RANGE));
+            let datetime = NaiveDateTime::from_timestamp_opt(ts, 0);
+            let mut datetime = try!(datetime.ok_or(OUT_OF_RANGE));
+
+            // fill year, ordinal, hour, minute and second fields from timestamp.
+            // if existing fields are consistent, this will allow the full date/time reconstruction.
+            let mut parsed = self.clone();
+            if parsed.second == Some(60) {
+                // `datetime.second()` cannot be 60, so this is the only case for a leap second.
+                match datetime.second() {
+                    // it's okay, just do not try to overwrite the existing field.
+                    59 => {}
+                    // `datetime` is known to be off by one second.
+                    0 => { datetime -= OldDuration::seconds(1); }
+                    // otherwise it is impossible.
+                    _ => return Err(IMPOSSIBLE)
+                }
+                // ...and we have the correct candidates for other fields.
+            } else {
+                try!(parsed.set_second(i64::from(datetime.second())));
+            }
+            try!(parsed.set_year   (i64::from(datetime.year())));
+            try!(parsed.set_ordinal(i64::from(datetime.ordinal()))); // more efficient than ymd
+            try!(parsed.set_hour   (i64::from(datetime.hour())));
+            try!(parsed.set_minute (i64::from(datetime.minute())));
+
+            // validate other fields (e.g. week) and return
+            let date = try!(parsed.to_naive_date());
+            let time = try!(parsed.to_naive_time());
+            Ok(date.and_time(time))
+        } else {
+            // reproduce the previous error(s)
+            try!(date);
+            try!(time);
+            unreachable!()
+        }
+    }
+
+    /// Returns a parsed fixed time zone offset out of given fields.
+    pub fn to_fixed_offset(&self) -> ParseResult<FixedOffset> {
+        self.offset.and_then(FixedOffset::east_opt).ok_or(OUT_OF_RANGE)
+    }
+
+    /// Returns a parsed timezone-aware date and time out of given fields.
+    ///
+    /// This method is able to determine the combined date and time
+    /// from date and time fields or a single [`timestamp`](#structfield.timestamp) field,
+    /// plus a time zone offset.
+    /// Either way those fields have to be consistent to each other.
+    pub fn to_datetime(&self) -> ParseResult<DateTime<FixedOffset>> {
+        let offset = try!(self.offset.ok_or(NOT_ENOUGH));
+        let datetime = try!(self.to_naive_datetime_with_offset(offset));
+        let offset = try!(FixedOffset::east_opt(offset).ok_or(OUT_OF_RANGE));
+        match offset.from_local_datetime(&datetime) {
+            LocalResult::None => Err(IMPOSSIBLE),
+            LocalResult::Single(t) => Ok(t),
+            LocalResult::Ambiguous(..) => Err(NOT_ENOUGH),
+        }
+    }
+
+    /// Returns a parsed timezone-aware date and time out of given fields,
+    /// with an additional `TimeZone` used to interpret and validate the local date.
+    ///
+    /// This method is able to determine the combined date and time
+    /// from date and time fields or a single [`timestamp`](#structfield.timestamp) field,
+    /// plus a time zone offset.
+    /// Either way those fields have to be consistent to each other.
+    /// If parsed fields include an UTC offset, it also has to be consistent to
+    /// [`offset`](#structfield.offset).
+    pub fn to_datetime_with_timezone<Tz: TimeZone>(&self, tz: &Tz) -> ParseResult<DateTime<Tz>> {
+        // if we have `timestamp` specified, guess an offset from that.
+        let mut guessed_offset = 0;
+        if let Some(timestamp) = self.timestamp {
+            // make a naive `DateTime` from given timestamp and (if any) nanosecond.
+            // an empty `nanosecond` is always equal to zero, so missing nanosecond is fine.
+            let nanosecond = self.nanosecond.unwrap_or(0);
+            let dt = NaiveDateTime::from_timestamp_opt(timestamp, nanosecond);
+            let dt = try!(dt.ok_or(OUT_OF_RANGE));
+            guessed_offset = tz.offset_from_utc_datetime(&dt).fix().local_minus_utc();
+        }
+
+        // checks if the given `DateTime` has a consistent `Offset` with given `self.offset`.
+        let check_offset = |dt: &DateTime<Tz>| {
+            if let Some(offset) = self.offset {
+                dt.offset().fix().local_minus_utc() == offset
+            } else {
+                true
+            }
+        };
+
+        // `guessed_offset` should be correct when `self.timestamp` is given.
+        // it will be 0 otherwise, but this is fine as the algorithm ignores offset for that case.
+        let datetime = try!(self.to_naive_datetime_with_offset(guessed_offset));
+        match tz.from_local_datetime(&datetime) {
+            LocalResult::None => Err(IMPOSSIBLE),
+            LocalResult::Single(t) => if check_offset(&t) {Ok(t)} else {Err(IMPOSSIBLE)},
+            LocalResult::Ambiguous(min, max) => {
+                // try to disambiguate two possible local dates by offset.
+                match (check_offset(&min), check_offset(&max)) {
+                    (false, false) => Err(IMPOSSIBLE),
+                    (false, true) => Ok(max),
+                    (true, false) => Ok(min),
+                    (true, true) => Err(NOT_ENOUGH),
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Parsed;
+    use super::super::{OUT_OF_RANGE, IMPOSSIBLE, NOT_ENOUGH};
+    use Datelike;
+    use Weekday::*;
+    use naive::{MIN_DATE, MAX_DATE, NaiveDate, NaiveTime};
+    use offset::{TimeZone, Utc, FixedOffset};
+
+    #[test]
+    fn test_parsed_set_fields() {
+        // year*, isoyear*
+        let mut p = Parsed::new();
+        assert_eq!(p.set_year(1987), Ok(()));
+        assert_eq!(p.set_year(1986), Err(IMPOSSIBLE));
+        assert_eq!(p.set_year(1988), Err(IMPOSSIBLE));
+        assert_eq!(p.set_year(1987), Ok(()));
+        assert_eq!(p.set_year_div_100(20), Ok(())); // independent to `year`
+        assert_eq!(p.set_year_div_100(21), Err(IMPOSSIBLE));
+        assert_eq!(p.set_year_div_100(19), Err(IMPOSSIBLE));
+        assert_eq!(p.set_year_mod_100(37), Ok(())); // ditto
+        assert_eq!(p.set_year_mod_100(38), Err(IMPOSSIBLE));
+        assert_eq!(p.set_year_mod_100(36), Err(IMPOSSIBLE));
+
+        let mut p = Parsed::new();
+        assert_eq!(p.set_year(0), Ok(()));
+        assert_eq!(p.set_year_div_100(0), Ok(()));
+        assert_eq!(p.set_year_mod_100(0), Ok(()));
+
+        let mut p = Parsed::new();
+        assert_eq!(p.set_year_div_100(-1), Err(OUT_OF_RANGE));
+        assert_eq!(p.set_year_mod_100(-1), Err(OUT_OF_RANGE));
+        assert_eq!(p.set_year(-1), Ok(()));
+        assert_eq!(p.set_year(-2), Err(IMPOSSIBLE));
+        assert_eq!(p.set_year(0), Err(IMPOSSIBLE));
+
+        let mut p = Parsed::new();
+        assert_eq!(p.set_year_div_100(0x1_0000_0008), Err(OUT_OF_RANGE));
+        assert_eq!(p.set_year_div_100(8), Ok(()));
+        assert_eq!(p.set_year_div_100(0x1_0000_0008), Err(OUT_OF_RANGE));
+
+        // month, week*, isoweek, ordinal, day, minute, second, nanosecond, offset
+        let mut p = Parsed::new();
+        assert_eq!(p.set_month(7), Ok(()));
+        assert_eq!(p.set_month(1), Err(IMPOSSIBLE));
+        assert_eq!(p.set_month(6), Err(IMPOSSIBLE));
+        assert_eq!(p.set_month(8), Err(IMPOSSIBLE));
+        assert_eq!(p.set_month(12), Err(IMPOSSIBLE));
+
+        let mut p = Parsed::new();
+        assert_eq!(p.set_month(8), Ok(()));
+        assert_eq!(p.set_month(0x1_0000_0008), Err(OUT_OF_RANGE));
+
+        // hour
+        let mut p = Parsed::new();
+        assert_eq!(p.set_hour(12), Ok(()));
+        assert_eq!(p.set_hour(11), Err(IMPOSSIBLE));
+        assert_eq!(p.set_hour(13), Err(IMPOSSIBLE));
+        assert_eq!(p.set_hour(12), Ok(()));
+        assert_eq!(p.set_ampm(false), Err(IMPOSSIBLE));
+        assert_eq!(p.set_ampm(true), Ok(()));
+        assert_eq!(p.set_hour12(12), Ok(()));
+        assert_eq!(p.set_hour12(0), Err(OUT_OF_RANGE)); // requires canonical representation
+        assert_eq!(p.set_hour12(1), Err(IMPOSSIBLE));
+        assert_eq!(p.set_hour12(11), Err(IMPOSSIBLE));
+
+        let mut p = Parsed::new();
+        assert_eq!(p.set_ampm(true), Ok(()));
+        assert_eq!(p.set_hour12(7), Ok(()));
+        assert_eq!(p.set_hour(7), Err(IMPOSSIBLE));
+        assert_eq!(p.set_hour(18), Err(IMPOSSIBLE));
+        assert_eq!(p.set_hour(19), Ok(()));
+
+        // timestamp
+        let mut p = Parsed::new();
+        assert_eq!(p.set_timestamp(1_234_567_890), Ok(()));
+        assert_eq!(p.set_timestamp(1_234_567_889), Err(IMPOSSIBLE));
+        assert_eq!(p.set_timestamp(1_234_567_891), Err(IMPOSSIBLE));
+    }
+
+    #[test]
+    fn test_parsed_to_naive_date() {
+        macro_rules! parse {
+            ($($k:ident: $v:expr),*) => (
+                Parsed { $($k: Some($v),)* ..Parsed::new() }.to_naive_date()
+            )
+        }
+
+        let ymd = |y,m,d| Ok(NaiveDate::from_ymd(y, m, d));
+
+        // ymd: omission of fields
+        assert_eq!(parse!(), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 1984), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 1984, month: 1), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 1984, month: 1, day: 2), ymd(1984, 1, 2));
+        assert_eq!(parse!(year: 1984, day: 2), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year_div_100: 19), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 84), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 84, month: 1), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 84, month: 1, day: 2), ymd(1984, 1, 2));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 84, day: 2), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year_div_100: 19, month: 1, day: 2), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year_mod_100: 70, month: 1, day: 2), ymd(1970, 1, 2));
+        assert_eq!(parse!(year_mod_100: 69, month: 1, day: 2), ymd(2069, 1, 2));
+
+        // ymd: out-of-range conditions
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 84, month: 2, day: 29),
+                   ymd(1984, 2, 29));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 83, month: 2, day: 29),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 83, month: 13, day: 1),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 83, month: 12, day: 31),
+                   ymd(1983, 12, 31));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 83, month: 12, day: 32),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 83, month: 12, day: 0),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: 100, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year_div_100: 19, year_mod_100: -1, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year_div_100: 0, year_mod_100: 0, month: 1, day: 1),
+                   ymd(0, 1, 1));
+        assert_eq!(parse!(year_div_100: -1, year_mod_100: 42, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+        let max_year = MAX_DATE.year();
+        assert_eq!(parse!(year_div_100: max_year / 100,
+                          year_mod_100: max_year % 100, month: 1, day: 1),
+                   ymd(max_year, 1, 1));
+        assert_eq!(parse!(year_div_100: (max_year + 1) / 100,
+                          year_mod_100: (max_year + 1) % 100, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+
+        // ymd: conflicting inputs
+        assert_eq!(parse!(year: 1984, year_div_100: 19, month: 1, day: 1), ymd(1984, 1, 1));
+        assert_eq!(parse!(year: 1984, year_div_100: 20, month: 1, day: 1), Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 1984, year_mod_100: 84, month: 1, day: 1), ymd(1984, 1, 1));
+        assert_eq!(parse!(year: 1984, year_mod_100: 83, month: 1, day: 1), Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 1984, year_div_100: 19, year_mod_100: 84, month: 1, day: 1),
+                   ymd(1984, 1, 1));
+        assert_eq!(parse!(year: 1984, year_div_100: 18, year_mod_100: 94, month: 1, day: 1),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 1984, year_div_100: 18, year_mod_100: 184, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: -1, year_div_100: 0, year_mod_100: -1, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: -1, year_div_100: -1, year_mod_100: 99, month: 1, day: 1),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: -1, year_div_100: 0, month: 1, day: 1), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: -1, year_mod_100: 99, month: 1, day: 1), Err(OUT_OF_RANGE));
+
+        // weekdates
+        assert_eq!(parse!(year: 2000, week_from_mon: 0), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2000, week_from_sun: 0), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2000, weekday: Sun), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2000, week_from_mon: 0, weekday: Fri), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2000, week_from_sun: 0, weekday: Fri), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2000, week_from_mon: 0, weekday: Sat), ymd(2000, 1, 1));
+        assert_eq!(parse!(year: 2000, week_from_sun: 0, weekday: Sat), ymd(2000, 1, 1));
+        assert_eq!(parse!(year: 2000, week_from_mon: 0, weekday: Sun), ymd(2000, 1, 2));
+        assert_eq!(parse!(year: 2000, week_from_sun: 1, weekday: Sun), ymd(2000, 1, 2));
+        assert_eq!(parse!(year: 2000, week_from_mon: 1, weekday: Mon), ymd(2000, 1, 3));
+        assert_eq!(parse!(year: 2000, week_from_sun: 1, weekday: Mon), ymd(2000, 1, 3));
+        assert_eq!(parse!(year: 2000, week_from_mon: 1, weekday: Sat), ymd(2000, 1, 8));
+        assert_eq!(parse!(year: 2000, week_from_sun: 1, weekday: Sat), ymd(2000, 1, 8));
+        assert_eq!(parse!(year: 2000, week_from_mon: 1, weekday: Sun), ymd(2000, 1, 9));
+        assert_eq!(parse!(year: 2000, week_from_sun: 2, weekday: Sun), ymd(2000, 1, 9));
+        assert_eq!(parse!(year: 2000, week_from_mon: 2, weekday: Mon), ymd(2000, 1, 10));
+        assert_eq!(parse!(year: 2000, week_from_sun: 52, weekday: Sat), ymd(2000, 12, 30));
+        assert_eq!(parse!(year: 2000, week_from_sun: 53, weekday: Sun), ymd(2000, 12, 31));
+        assert_eq!(parse!(year: 2000, week_from_sun: 53, weekday: Mon), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2000, week_from_sun: 0xffffffff, weekday: Mon), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2006, week_from_sun: 0, weekday: Sat), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2006, week_from_sun: 1, weekday: Sun), ymd(2006, 1, 1));
+
+        // weekdates: conflicting inputs
+        assert_eq!(parse!(year: 2000, week_from_mon: 1, week_from_sun: 1, weekday: Sat),
+                   ymd(2000, 1, 8));
+        assert_eq!(parse!(year: 2000, week_from_mon: 1, week_from_sun: 2, weekday: Sun),
+                   ymd(2000, 1, 9));
+        assert_eq!(parse!(year: 2000, week_from_mon: 1, week_from_sun: 1, weekday: Sun),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 2000, week_from_mon: 2, week_from_sun: 2, weekday: Sun),
+                   Err(IMPOSSIBLE));
+
+        // ISO weekdates
+        assert_eq!(parse!(isoyear: 2004, isoweek: 53), Err(NOT_ENOUGH));
+        assert_eq!(parse!(isoyear: 2004, isoweek: 53, weekday: Fri), ymd(2004, 12, 31));
+        assert_eq!(parse!(isoyear: 2004, isoweek: 53, weekday: Sat), ymd(2005, 1, 1));
+        assert_eq!(parse!(isoyear: 2004, isoweek: 0xffffffff, weekday: Sat), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(isoyear: 2005, isoweek: 0, weekday: Thu), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(isoyear: 2005, isoweek: 5, weekday: Thu), ymd(2005, 2, 3));
+        assert_eq!(parse!(isoyear: 2005, weekday: Thu), Err(NOT_ENOUGH));
+
+        // year and ordinal
+        assert_eq!(parse!(ordinal: 123), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2000, ordinal: 0), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2000, ordinal: 1), ymd(2000, 1, 1));
+        assert_eq!(parse!(year: 2000, ordinal: 60), ymd(2000, 2, 29));
+        assert_eq!(parse!(year: 2000, ordinal: 61), ymd(2000, 3, 1));
+        assert_eq!(parse!(year: 2000, ordinal: 366), ymd(2000, 12, 31));
+        assert_eq!(parse!(year: 2000, ordinal: 367), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2000, ordinal: 0xffffffff), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2100, ordinal: 0), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2100, ordinal: 1), ymd(2100, 1, 1));
+        assert_eq!(parse!(year: 2100, ordinal: 59), ymd(2100, 2, 28));
+        assert_eq!(parse!(year: 2100, ordinal: 60), ymd(2100, 3, 1));
+        assert_eq!(parse!(year: 2100, ordinal: 365), ymd(2100, 12, 31));
+        assert_eq!(parse!(year: 2100, ordinal: 366), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(year: 2100, ordinal: 0xffffffff), Err(OUT_OF_RANGE));
+
+        // more complex cases
+        assert_eq!(parse!(year: 2014, month: 12, day: 31, ordinal: 365, isoyear: 2015, isoweek: 1,
+                          week_from_sun: 52, week_from_mon: 52, weekday: Wed),
+                   ymd(2014, 12, 31));
+        assert_eq!(parse!(year: 2014, month: 12, ordinal: 365, isoyear: 2015, isoweek: 1,
+                          week_from_sun: 52, week_from_mon: 52),
+                   ymd(2014, 12, 31));
+        assert_eq!(parse!(year: 2014, month: 12, day: 31, ordinal: 365, isoyear: 2014, isoweek: 53,
+                          week_from_sun: 52, week_from_mon: 52, weekday: Wed),
+                   Err(IMPOSSIBLE)); // no ISO week date 2014-W53-3
+        assert_eq!(parse!(year: 2012, isoyear: 2015, isoweek: 1,
+                          week_from_sun: 52, week_from_mon: 52),
+                   Err(NOT_ENOUGH)); // ambiguous (2014-12-29, 2014-12-30, 2014-12-31)
+        assert_eq!(parse!(year_div_100: 20, isoyear_mod_100: 15, ordinal: 366),
+                   Err(NOT_ENOUGH)); // technically unique (2014-12-31) but Chrono gives up
+    }
+
+    #[test]
+    fn test_parsed_to_naive_time() {
+        macro_rules! parse {
+            ($($k:ident: $v:expr),*) => (
+                Parsed { $($k: Some($v),)* ..Parsed::new() }.to_naive_time()
+            )
+        }
+
+        let hms = |h,m,s| Ok(NaiveTime::from_hms(h, m, s));
+        let hmsn = |h,m,s,n| Ok(NaiveTime::from_hms_nano(h, m, s, n));
+
+        // omission of fields
+        assert_eq!(parse!(), Err(NOT_ENOUGH));
+        assert_eq!(parse!(hour_div_12: 0), Err(NOT_ENOUGH));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1), Err(NOT_ENOUGH));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23), hms(1,23,0));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, second: 45), hms(1,23,45));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, second: 45,
+                          nanosecond: 678_901_234),
+                   hmsn(1,23,45,678_901_234));
+        assert_eq!(parse!(hour_div_12: 1, hour_mod_12: 11, minute: 45, second: 6), hms(23,45,6));
+        assert_eq!(parse!(hour_mod_12: 1, minute: 23), Err(NOT_ENOUGH));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, nanosecond: 456_789_012),
+                   Err(NOT_ENOUGH));
+
+        // out-of-range conditions
+        assert_eq!(parse!(hour_div_12: 2, hour_mod_12: 0, minute: 0), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(hour_div_12: 1, hour_mod_12: 12, minute: 0), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 60), Err(OUT_OF_RANGE));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, second: 61),
+                   Err(OUT_OF_RANGE));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, second: 34,
+                          nanosecond: 1_000_000_000),
+                   Err(OUT_OF_RANGE));
+
+        // leap seconds
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, second: 60),
+                   hmsn(1,23,59,1_000_000_000));
+        assert_eq!(parse!(hour_div_12: 0, hour_mod_12: 1, minute: 23, second: 60,
+                          nanosecond: 999_999_999),
+                   hmsn(1,23,59,1_999_999_999));
+    }
+
+    #[test]
+    fn test_parsed_to_naive_datetime_with_offset() {
+        macro_rules! parse {
+            (offset = $offset:expr; $($k:ident: $v:expr),*) => (
+                Parsed { $($k: Some($v),)* ..Parsed::new() }.to_naive_datetime_with_offset($offset)
+            );
+            ($($k:ident: $v:expr),*) => (parse!(offset = 0; $($k: $v),*))
+        }
+
+        let ymdhms = |y,m,d,h,n,s| Ok(NaiveDate::from_ymd(y, m, d).and_hms(h, n, s));
+        let ymdhmsn =
+            |y,m,d,h,n,s,nano| Ok(NaiveDate::from_ymd(y, m, d).and_hms_nano(h, n, s, nano));
+
+        // omission of fields
+        assert_eq!(parse!(), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2015, month: 1, day: 30,
+                          hour_div_12: 1, hour_mod_12: 2, minute: 38),
+                   ymdhms(2015,1,30, 14,38,0));
+        assert_eq!(parse!(year: 1997, month: 1, day: 30,
+                          hour_div_12: 1, hour_mod_12: 2, minute: 38, second: 5),
+                   ymdhms(1997,1,30, 14,38,5));
+        assert_eq!(parse!(year: 2012, ordinal: 34, hour_div_12: 0, hour_mod_12: 5,
+                          minute: 6, second: 7, nanosecond: 890_123_456),
+                   ymdhmsn(2012,2,3, 5,6,7,890_123_456));
+        assert_eq!(parse!(timestamp: 0), ymdhms(1970,1,1, 0,0,0));
+        assert_eq!(parse!(timestamp: 1, nanosecond: 0), ymdhms(1970,1,1, 0,0,1));
+        assert_eq!(parse!(timestamp: 1, nanosecond: 1), ymdhmsn(1970,1,1, 0,0,1, 1));
+        assert_eq!(parse!(timestamp: 1_420_000_000), ymdhms(2014,12,31, 4,26,40));
+        assert_eq!(parse!(timestamp: -0x1_0000_0000), ymdhms(1833,11,24, 17,31,44));
+
+        // full fields
+        assert_eq!(parse!(year: 2014, year_div_100: 20, year_mod_100: 14, month: 12, day: 31,
+                          ordinal: 365, isoyear: 2015, isoyear_div_100: 20, isoyear_mod_100: 15,
+                          isoweek: 1, week_from_sun: 52, week_from_mon: 52, weekday: Wed,
+                          hour_div_12: 0, hour_mod_12: 4, minute: 26, second: 40,
+                          nanosecond: 12_345_678, timestamp: 1_420_000_000),
+                   ymdhmsn(2014,12,31, 4,26,40,12_345_678));
+        assert_eq!(parse!(year: 2014, year_div_100: 20, year_mod_100: 14, month: 12, day: 31,
+                          ordinal: 365, isoyear: 2015, isoyear_div_100: 20, isoyear_mod_100: 15,
+                          isoweek: 1, week_from_sun: 52, week_from_mon: 52, weekday: Wed,
+                          hour_div_12: 0, hour_mod_12: 4, minute: 26, second: 40,
+                          nanosecond: 12_345_678, timestamp: 1_419_999_999),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(offset = 32400;
+                          year: 2014, year_div_100: 20, year_mod_100: 14, month: 12, day: 31,
+                          ordinal: 365, isoyear: 2015, isoyear_div_100: 20, isoyear_mod_100: 15,
+                          isoweek: 1, week_from_sun: 52, week_from_mon: 52, weekday: Wed,
+                          hour_div_12: 0, hour_mod_12: 4, minute: 26, second: 40,
+                          nanosecond: 12_345_678, timestamp: 1_419_967_600),
+                   ymdhmsn(2014,12,31, 4,26,40,12_345_678));
+
+        // more timestamps
+        let max_days_from_year_1970 =
+            MAX_DATE.signed_duration_since(NaiveDate::from_ymd(1970,1,1));
+        let year_0_from_year_1970 =
+            NaiveDate::from_ymd(0,1,1).signed_duration_since(NaiveDate::from_ymd(1970,1,1));
+        let min_days_from_year_1970 =
+            MIN_DATE.signed_duration_since(NaiveDate::from_ymd(1970,1,1));
+        assert_eq!(parse!(timestamp: min_days_from_year_1970.num_seconds()),
+                   ymdhms(MIN_DATE.year(),1,1, 0,0,0));
+        assert_eq!(parse!(timestamp: year_0_from_year_1970.num_seconds()),
+                   ymdhms(0,1,1, 0,0,0));
+        assert_eq!(parse!(timestamp: max_days_from_year_1970.num_seconds() + 86399),
+                   ymdhms(MAX_DATE.year(),12,31, 23,59,59));
+
+        // leap seconds #1: partial fields
+        assert_eq!(parse!(second: 59, timestamp: 1_341_100_798), Err(IMPOSSIBLE));
+        assert_eq!(parse!(second: 59, timestamp: 1_341_100_799), ymdhms(2012,6,30, 23,59,59));
+        assert_eq!(parse!(second: 59, timestamp: 1_341_100_800), Err(IMPOSSIBLE));
+        assert_eq!(parse!(second: 60, timestamp: 1_341_100_799),
+                   ymdhmsn(2012,6,30, 23,59,59,1_000_000_000));
+        assert_eq!(parse!(second: 60, timestamp: 1_341_100_800),
+                   ymdhmsn(2012,6,30, 23,59,59,1_000_000_000));
+        assert_eq!(parse!(second: 0, timestamp: 1_341_100_800), ymdhms(2012,7,1, 0,0,0));
+        assert_eq!(parse!(second: 1, timestamp: 1_341_100_800), Err(IMPOSSIBLE));
+        assert_eq!(parse!(second: 60, timestamp: 1_341_100_801), Err(IMPOSSIBLE));
+
+        // leap seconds #2: full fields
+        // we need to have separate tests for them since it uses another control flow.
+        assert_eq!(parse!(year: 2012, ordinal: 182, hour_div_12: 1, hour_mod_12: 11,
+                          minute: 59, second: 59, timestamp: 1_341_100_798),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 2012, ordinal: 182, hour_div_12: 1, hour_mod_12: 11,
+                          minute: 59, second: 59, timestamp: 1_341_100_799),
+                   ymdhms(2012,6,30, 23,59,59));
+        assert_eq!(parse!(year: 2012, ordinal: 182, hour_div_12: 1, hour_mod_12: 11,
+                          minute: 59, second: 59, timestamp: 1_341_100_800),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 2012, ordinal: 182, hour_div_12: 1, hour_mod_12: 11,
+                          minute: 59, second: 60, timestamp: 1_341_100_799),
+                   ymdhmsn(2012,6,30, 23,59,59,1_000_000_000));
+        assert_eq!(parse!(year: 2012, ordinal: 182, hour_div_12: 1, hour_mod_12: 11,
+                          minute: 59, second: 60, timestamp: 1_341_100_800),
+                   ymdhmsn(2012,6,30, 23,59,59,1_000_000_000));
+        assert_eq!(parse!(year: 2012, ordinal: 183, hour_div_12: 0, hour_mod_12: 0,
+                          minute: 0, second: 0, timestamp: 1_341_100_800),
+                   ymdhms(2012,7,1, 0,0,0));
+        assert_eq!(parse!(year: 2012, ordinal: 183, hour_div_12: 0, hour_mod_12: 0,
+                          minute: 0, second: 1, timestamp: 1_341_100_800),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(year: 2012, ordinal: 182, hour_div_12: 1, hour_mod_12: 11,
+                          minute: 59, second: 60, timestamp: 1_341_100_801),
+                   Err(IMPOSSIBLE));
+
+        // error codes
+        assert_eq!(parse!(year: 2015, month: 1, day: 20, weekday: Tue,
+                          hour_div_12: 2, hour_mod_12: 1, minute: 35, second: 20),
+                   Err(OUT_OF_RANGE)); // `hour_div_12` is out of range
+    }
+
+    #[test]
+    fn test_parsed_to_datetime() {
+        macro_rules! parse {
+            ($($k:ident: $v:expr),*) => (
+                Parsed { $($k: Some($v),)* ..Parsed::new() }.to_datetime()
+            )
+        }
+
+        let ymdhmsn = |y,m,d,h,n,s,nano,off| Ok(FixedOffset::east(off).ymd(y, m, d)
+                                                                      .and_hms_nano(h, n, s, nano));
+
+        assert_eq!(parse!(offset: 0), Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2014, ordinal: 365, hour_div_12: 0, hour_mod_12: 4,
+                          minute: 26, second: 40, nanosecond: 12_345_678),
+                   Err(NOT_ENOUGH));
+        assert_eq!(parse!(year: 2014, ordinal: 365, hour_div_12: 0, hour_mod_12: 4,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 0),
+                   ymdhmsn(2014,12,31, 4,26,40,12_345_678, 0));
+        assert_eq!(parse!(year: 2014, ordinal: 365, hour_div_12: 1, hour_mod_12: 1,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 32400),
+                   ymdhmsn(2014,12,31, 13,26,40,12_345_678, 32400));
+        assert_eq!(parse!(year: 2014, ordinal: 365, hour_div_12: 0, hour_mod_12: 1,
+                          minute: 42, second: 4, nanosecond: 12_345_678, offset: -9876),
+                   ymdhmsn(2014,12,31, 1,42,4,12_345_678, -9876));
+        assert_eq!(parse!(year: 2015, ordinal: 1, hour_div_12: 0, hour_mod_12: 4,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 86_400),
+                   Err(OUT_OF_RANGE)); // `FixedOffset` does not support such huge offset
+    }
+
+    #[test]
+    fn test_parsed_to_datetime_with_timezone() {
+        macro_rules! parse {
+            ($tz:expr; $($k:ident: $v:expr),*) => (
+                Parsed { $($k: Some($v),)* ..Parsed::new() }.to_datetime_with_timezone(&$tz)
+            )
+        }
+
+        // single result from ymdhms
+        assert_eq!(parse!(Utc;
+                          year: 2014, ordinal: 365, hour_div_12: 0, hour_mod_12: 4,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 0),
+                   Ok(Utc.ymd(2014, 12, 31).and_hms_nano(4, 26, 40, 12_345_678)));
+        assert_eq!(parse!(Utc;
+                          year: 2014, ordinal: 365, hour_div_12: 1, hour_mod_12: 1,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 32400),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(FixedOffset::east(32400);
+                          year: 2014, ordinal: 365, hour_div_12: 0, hour_mod_12: 4,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 0),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(FixedOffset::east(32400);
+                          year: 2014, ordinal: 365, hour_div_12: 1, hour_mod_12: 1,
+                          minute: 26, second: 40, nanosecond: 12_345_678, offset: 32400),
+                   Ok(FixedOffset::east(32400).ymd(2014, 12, 31)
+                                              .and_hms_nano(13, 26, 40, 12_345_678)));
+
+        // single result from timestamp
+        assert_eq!(parse!(Utc; timestamp: 1_420_000_000, offset: 0),
+                   Ok(Utc.ymd(2014, 12, 31).and_hms(4, 26, 40)));
+        assert_eq!(parse!(Utc; timestamp: 1_420_000_000, offset: 32400),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(FixedOffset::east(32400); timestamp: 1_420_000_000, offset: 0),
+                   Err(IMPOSSIBLE));
+        assert_eq!(parse!(FixedOffset::east(32400); timestamp: 1_420_000_000, offset: 32400),
+                   Ok(FixedOffset::east(32400).ymd(2014, 12, 31).and_hms(13, 26, 40)));
+
+        // TODO test with a variable time zone (for None and Ambiguous cases)
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/format/parse.rs cargo-0.33.0/vendor/chrono/src/format/parse.rs
--- cargo-0.32.0/vendor/chrono/src/format/parse.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/format/parse.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,794 @@
+// This is a part of Chrono.
+// Portions copyright (c) 2015, John Nagle.
+// See README.md and LICENSE.txt for details.
+
+//! Date and time parsing routines.
+
+use std::usize;
+
+use Weekday;
+
+use super::scan;
+use super::{Parsed, ParseResult, Item, InternalFixed, InternalInternal};
+use super::{OUT_OF_RANGE, INVALID, TOO_SHORT, TOO_LONG, BAD_FORMAT};
+
+fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> ParseResult<()> {
+    p.set_weekday(match v {
+        0 => Weekday::Sun, 1 => Weekday::Mon, 2 => Weekday::Tue,
+        3 => Weekday::Wed, 4 => Weekday::Thu, 5 => Weekday::Fri,
+        6 => Weekday::Sat, _ => return Err(OUT_OF_RANGE)
+    })
+}
+
+fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> ParseResult<()> {
+    p.set_weekday(match v {
+        1 => Weekday::Mon, 2 => Weekday::Tue, 3 => Weekday::Wed,
+        4 => Weekday::Thu, 5 => Weekday::Fri, 6 => Weekday::Sat,
+        7 => Weekday::Sun, _ => return Err(OUT_OF_RANGE)
+    })
+}
+
+fn parse_rfc2822<'a>(parsed: &mut Parsed, mut s: &'a str) -> ParseResult<(&'a str, ())> {
+    macro_rules! try_consume {
+        ($e:expr) => ({ let (s_, v) = try!($e); s = s_; v })
+    }
+
+    // an adapted RFC 2822 syntax from Section 3.3 and 4.3:
+    //
+    // date-time   = [ day-of-week "," ] date 1*S time *S
+    // day-of-week = *S day-name *S
+    // day-name    = "Mon" / "Tue" / "Wed" / "Thu" / "Fri" / "Sat" / "Sun"
+    // date        = day month year
+    // day         = *S 1*2DIGIT *S
+    // month       = 1*S month-name 1*S
+    // month-name  = "Jan" / "Feb" / "Mar" / "Apr" / "May" / "Jun" /
+    //               "Jul" / "Aug" / "Sep" / "Oct" / "Nov" / "Dec"
+    // year        = *S 2*DIGIT *S
+    // time        = time-of-day 1*S zone
+    // time-of-day = hour ":" minute [ ":" second ]
+    // hour        = *S 2DIGIT *S
+    // minute      = *S 2DIGIT *S
+    // second      = *S 2DIGIT *S
+    // zone        = ( "+" / "-" ) 4DIGIT /
+    //               "UT" / "GMT" /                  ; same to +0000
+    //               "EST" / "CST" / "MST" / "PST" / ; same to -0500 to -0800
+    //               "EDT" / "CDT" / "MDT" / "PDT" / ; same to -0400 to -0700
+    //               1*(%d65-90 / %d97-122)          ; same to -0000
+    //
+    // some notes:
+    //
+    // - quoted characters can be in any mixture of lower and upper cases.
+    //
+    // - we do not recognize a folding white space (FWS) or comment (CFWS).
+    //   for our purposes, instead, we accept any sequence of Unicode
+    //   white space characters (denoted here to `S`). any actual RFC 2822
+    //   parser is expected to parse FWS and/or CFWS themselves and replace
+    //   it with a single SP (`%x20`); this is legitimate.
+    //
+    // - two-digit year < 50 should be interpreted by adding 2000.
+    //   two-digit year >= 50 or three-digit year should be interpreted
+    //   by adding 1900. note that four-or-more-digit years less than 1000
+    //   are *never* affected by this rule.
+    //
+    // - zone of `-0000` and any unrecognized legacy time zones (including
+    //   *every* one-letter military time zones) are considered "missing",
+    //   in such that we don't actually know what time zone is being used.
+    //
+    // - mismatching day-of-week is always an error, which is consistent to
+    //   Chrono's own rules.
+    //
+    // - zones can range from `-9959` to `+9959`, but `FixedOffset` does not
+    //   support offsets larger than 24 hours. this is not *that* problematic
+    //   since we do not directly go to a `DateTime` so one can recover
+    //   the offset information from `Parsed` anyway.
+
+    s = s.trim_left();
+
+    if let Ok((s_, weekday)) = scan::short_weekday(s) {
+        if !s_.starts_with(',') { return Err(INVALID); }
+        s = &s_[1..];
+        try!(parsed.set_weekday(weekday));
+    }
+
+    s = s.trim_left();
+    try!(parsed.set_day(try_consume!(scan::number(s, 1, 2))));
+    s = try!(scan::space(s)); // mandatory
+    try!(parsed.set_month(1 + i64::from(try_consume!(scan::short_month0(s)))));
+    s = try!(scan::space(s)); // mandatory
+
+    // distinguish two- and three-digit years from four-digit years
+    let prevlen = s.len();
+    let mut year = try_consume!(scan::number(s, 2, usize::MAX));
+    let yearlen = prevlen - s.len();
+    match (yearlen, year) {
+        (2,  0...49) => { year += 2000; } //   47 -> 2047,   05 -> 2005
+        (2, 50...99) => { year += 1900; } //   79 -> 1979
+        (3,       _) => { year += 1900; } //  112 -> 2012,  009 -> 1909
+        (_,       _) => {}                // 1987 -> 1987, 0654 -> 0654
+    }
+    try!(parsed.set_year(year));
+
+    s = try!(scan::space(s)); // mandatory
+    try!(parsed.set_hour(try_consume!(scan::number(s, 2, 2))));
+    s = try!(scan::char(s.trim_left(), b':')).trim_left(); // *S ":" *S
+    try!(parsed.set_minute(try_consume!(scan::number(s, 2, 2))));
+    if let Ok(s_) = scan::char(s.trim_left(), b':') { // [ ":" *S 2DIGIT ]
+        try!(parsed.set_second(try_consume!(scan::number(s_, 2, 2))));
+    }
+
+    s = try!(scan::space(s)); // mandatory
+    if let Some(offset) = try_consume!(scan::timezone_offset_2822(s)) {
+        // only set the offset when it is definitely known (i.e. not `-0000`)
+        try!(parsed.set_offset(i64::from(offset)));
+    }
+
+    Ok((s, ()))
+}
+
+fn parse_rfc3339<'a>(parsed: &mut Parsed, mut s: &'a str) -> ParseResult<(&'a str, ())> {
+    macro_rules! try_consume {
+        ($e:expr) => ({ let (s_, v) = try!($e); s = s_; v })
+    }
+
+    // an adapted RFC 3339 syntax from Section 5.6:
+    //
+    // date-fullyear  = 4DIGIT
+    // date-month     = 2DIGIT ; 01-12
+    // date-mday      = 2DIGIT ; 01-28, 01-29, 01-30, 01-31 based on month/year
+    // time-hour      = 2DIGIT ; 00-23
+    // time-minute    = 2DIGIT ; 00-59
+    // time-second    = 2DIGIT ; 00-58, 00-59, 00-60 based on leap second rules
+    // time-secfrac   = "." 1*DIGIT
+    // time-numoffset = ("+" / "-") time-hour ":" time-minute
+    // time-offset    = "Z" / time-numoffset
+    // partial-time   = time-hour ":" time-minute ":" time-second [time-secfrac]
+    // full-date      = date-fullyear "-" date-month "-" date-mday
+    // full-time      = partial-time time-offset
+    // date-time      = full-date "T" full-time
+    //
+    // some notes:
+    //
+    // - quoted characters can be in any mixture of lower and upper cases.
+    //
+    // - it may accept any number of fractional digits for seconds.
+    //   for Chrono, this means that we should skip digits past first 9 digits.
+    //
+    // - unlike RFC 2822, the valid offset ranges from -23:59 to +23:59.
+    //   note that this restriction is unique to RFC 3339 and not ISO 8601.
+    //   since this is not a typical Chrono behavior, we check it earlier.
+
+    try!(parsed.set_year(try_consume!(scan::number(s, 4, 4))));
+    s = try!(scan::char(s, b'-'));
+    try!(parsed.set_month(try_consume!(scan::number(s, 2, 2))));
+    s = try!(scan::char(s, b'-'));
+    try!(parsed.set_day(try_consume!(scan::number(s, 2, 2))));
+
+    s = match s.as_bytes().first() {
+        Some(&b't') | Some(&b'T') => &s[1..],
+        Some(_) => return Err(INVALID),
+        None => return Err(TOO_SHORT),
+    };
+
+    try!(parsed.set_hour(try_consume!(scan::number(s, 2, 2))));
+    s = try!(scan::char(s, b':'));
+    try!(parsed.set_minute(try_consume!(scan::number(s, 2, 2))));
+    s = try!(scan::char(s, b':'));
+    try!(parsed.set_second(try_consume!(scan::number(s, 2, 2))));
+    if s.starts_with('.') {
+        let nanosecond = try_consume!(scan::nanosecond(&s[1..]));
+        try!(parsed.set_nanosecond(nanosecond));
+    }
+
+    let offset = try_consume!(scan::timezone_offset_zulu(s, |s| scan::char(s, b':')));
+    if offset <= -86_400 || offset >= 86_400 { return Err(OUT_OF_RANGE); }
+    try!(parsed.set_offset(i64::from(offset)));
+
+    Ok((s, ()))
+}
+
+/// Tries to parse given string into `parsed` with given formatting items.
+/// Returns `Ok` when the entire string has been parsed (otherwise `parsed` should not be used).
+/// There should be no trailing string after parsing;
+/// use a stray [`Item::Space`](./enum.Item.html#variant.Space) to trim whitespaces.
+///
+/// This particular date and time parser is:
+///
+/// - Greedy. It will consume the longest possible prefix.
+///   For example, `April` is always consumed entirely when the long month name is requested;
+///   it equally accepts `Apr`, but prefers the longer prefix in this case.
+///
+/// - Padding-agnostic (for numeric items).
+///   The [`Pad`](./enum.Pad.html) field is completely ignored,
+///   so one can prepend any number of whitespace then any number of zeroes before numbers.
+///
+/// - (Still) obeying the intrinsic parsing width. This allows, for example, parsing `HHMMSS`.
+pub fn parse<'a, I>(parsed: &mut Parsed, mut s: &str, items: I) -> ParseResult<()>
+        where I: Iterator<Item=Item<'a>> {
+    macro_rules! try_consume {
+        ($e:expr) => ({ let (s_, v) = try!($e); s = s_; v })
+    }
+
+    for item in items {
+        match item {
+            Item::Literal(prefix) => {
+                if s.len() < prefix.len() { return Err(TOO_SHORT); }
+                if !s.starts_with(prefix) { return Err(INVALID); }
+                s = &s[prefix.len()..];
+            }
+
+            Item::OwnedLiteral(ref prefix) => {
+                if s.len() < prefix.len() { return Err(TOO_SHORT); }
+                if !s.starts_with(&prefix[..]) { return Err(INVALID); }
+                s = &s[prefix.len()..];
+            }
+
+            Item::Space(_) | Item::OwnedSpace(_) => {
+                s = s.trim_left();
+            }
+
+            Item::Numeric(spec, _pad) => {
+                use super::Numeric::*;
+                type Setter = fn(&mut Parsed, i64) -> ParseResult<()>;
+
+                let (width, signed, set): (usize, bool, Setter) = match spec {
+                    Year           => (4, true, Parsed::set_year),
+                    YearDiv100     => (2, false, Parsed::set_year_div_100),
+                    YearMod100     => (2, false, Parsed::set_year_mod_100),
+                    IsoYear        => (4, true, Parsed::set_isoyear),
+                    IsoYearDiv100  => (2, false, Parsed::set_isoyear_div_100),
+                    IsoYearMod100  => (2, false, Parsed::set_isoyear_mod_100),
+                    Month          => (2, false, Parsed::set_month),
+                    Day            => (2, false, Parsed::set_day),
+                    WeekFromSun    => (2, false, Parsed::set_week_from_sun),
+                    WeekFromMon    => (2, false, Parsed::set_week_from_mon),
+                    IsoWeek        => (2, false, Parsed::set_isoweek),
+                    NumDaysFromSun => (1, false, set_weekday_with_num_days_from_sunday),
+                    WeekdayFromMon => (1, false, set_weekday_with_number_from_monday),
+                    Ordinal        => (3, false, Parsed::set_ordinal),
+                    Hour           => (2, false, Parsed::set_hour),
+                    Hour12         => (2, false, Parsed::set_hour12),
+                    Minute         => (2, false, Parsed::set_minute),
+                    Second         => (2, false, Parsed::set_second),
+                    Nanosecond     => (9, false, Parsed::set_nanosecond),
+                    Timestamp      => (usize::MAX, false, Parsed::set_timestamp),
+
+                    // for the future expansion
+                    Internal(ref int) => match int._dummy {},
+                };
+
+                s = s.trim_left();
+                let v = if signed {
+                    if s.starts_with('-') {
+                        let v = try_consume!(scan::number(&s[1..], 1, usize::MAX));
+                        try!(0i64.checked_sub(v).ok_or(OUT_OF_RANGE))
+                    } else if s.starts_with('+') {
+                        try_consume!(scan::number(&s[1..], 1, usize::MAX))
+                    } else {
+                        // if there is no explicit sign, we respect the original `width`
+                        try_consume!(scan::number(s, 1, width))
+                    }
+                } else {
+                    try_consume!(scan::number(s, 1, width))
+                };
+                try!(set(parsed, v));
+            }
+
+            Item::Fixed(spec) => {
+                use super::Fixed::*;
+
+                match spec {
+                    ShortMonthName => {
+                        let month0 = try_consume!(scan::short_month0(s));
+                        try!(parsed.set_month(i64::from(month0) + 1));
+                    }
+
+                    LongMonthName => {
+                        let month0 = try_consume!(scan::short_or_long_month0(s));
+                        try!(parsed.set_month(i64::from(month0) + 1));
+                    }
+
+                    ShortWeekdayName => {
+                        let weekday = try_consume!(scan::short_weekday(s));
+                        try!(parsed.set_weekday(weekday));
+                    }
+
+                    LongWeekdayName => {
+                        let weekday = try_consume!(scan::short_or_long_weekday(s));
+                        try!(parsed.set_weekday(weekday));
+                    }
+
+                    LowerAmPm | UpperAmPm => {
+                        if s.len() < 2 { return Err(TOO_SHORT); }
+                        let ampm = match (s.as_bytes()[0] | 32, s.as_bytes()[1] | 32) {
+                            (b'a',b'm') => false,
+                            (b'p',b'm') => true,
+                            _ => return Err(INVALID)
+                        };
+                        try!(parsed.set_ampm(ampm));
+                        s = &s[2..];
+                    }
+
+                    Nanosecond | Nanosecond3 | Nanosecond6 | Nanosecond9 => {
+                        if s.starts_with('.') {
+                            let nano = try_consume!(scan::nanosecond(&s[1..]));
+                            try!(parsed.set_nanosecond(nano));
+                        }
+                    }
+
+                    Internal(InternalFixed { val: InternalInternal::Nanosecond3NoDot }) => {
+                        if s.len() < 3 { return Err(TOO_SHORT); }
+                        let nano = try_consume!(scan::nanosecond_fixed(s, 3));
+                        try!(parsed.set_nanosecond(nano));
+                    }
+
+                    Internal(InternalFixed { val: InternalInternal::Nanosecond6NoDot }) => {
+                        if s.len() < 6 { return Err(TOO_SHORT); }
+                        let nano = try_consume!(scan::nanosecond_fixed(s, 6));
+                        try!(parsed.set_nanosecond(nano));
+                    }
+
+                    Internal(InternalFixed { val: InternalInternal::Nanosecond9NoDot }) => {
+                        if s.len() < 9 { return Err(TOO_SHORT); }
+                        let nano = try_consume!(scan::nanosecond_fixed(s, 9));
+                        try!(parsed.set_nanosecond(nano));
+                    }
+
+                    TimezoneName => return Err(BAD_FORMAT),
+
+                    TimezoneOffsetColon | TimezoneOffset => {
+                        let offset = try_consume!(scan::timezone_offset(s.trim_left(),
+                                                                        scan::colon_or_space));
+                        try!(parsed.set_offset(i64::from(offset)));
+                    }
+
+                    TimezoneOffsetColonZ | TimezoneOffsetZ => {
+                        let offset = try_consume!(scan::timezone_offset_zulu(s.trim_left(),
+                                                                             scan::colon_or_space));
+                        try!(parsed.set_offset(i64::from(offset)));
+                    }
+                    Internal(InternalFixed { val: InternalInternal::TimezoneOffsetPermissive }) => {
+                        let offset = try_consume!(scan::timezone_offset_permissive(
+                            s.trim_left(), scan::colon_or_space));
+                        try!(parsed.set_offset(i64::from(offset)));
+                    }
+
+                    RFC2822 => try_consume!(parse_rfc2822(parsed, s)),
+                    RFC3339 => try_consume!(parse_rfc3339(parsed, s)),
+                }
+            }
+
+            Item::Error => {
+                return Err(BAD_FORMAT);
+            }
+        }
+    }
+
+    // if there are trailling chars, it is an error
+    if !s.is_empty() {
+        Err(TOO_LONG)
+    } else {
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+#[test]
+fn test_parse() {
+    use super::*;
+    use super::IMPOSSIBLE;
+
+    // workaround for Rust issue #22255
+    fn parse_all(s: &str, items: &[Item]) -> ParseResult<Parsed> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, items.iter().cloned()));
+        Ok(parsed)
+    }
+
+    macro_rules! check {
+        ($fmt:expr, $items:expr; $err:tt) => (
+            assert_eq!(parse_all($fmt, &$items), Err($err))
+        );
+        ($fmt:expr, $items:expr; $($k:ident: $v:expr),*) => (#[allow(unused_mut)] {
+            let mut expected = Parsed::new();
+            $(expected.$k = Some($v);)*
+            assert_eq!(parse_all($fmt, &$items), Ok(expected))
+        });
+    }
+
+    // empty string
+    check!("",  []; );
+    check!(" ", []; TOO_LONG);
+    check!("a", []; TOO_LONG);
+
+    // whitespaces
+    check!("",          [sp!("")]; );
+    check!(" ",         [sp!("")]; );
+    check!("\t",        [sp!("")]; );
+    check!(" \n\r  \n", [sp!("")]; );
+    check!("a",         [sp!("")]; TOO_LONG);
+
+    // literal
+    check!("",    [lit!("a")]; TOO_SHORT);
+    check!(" ",   [lit!("a")]; INVALID);
+    check!("a",   [lit!("a")]; );
+    check!("aa",  [lit!("a")]; TOO_LONG);
+    check!("A",   [lit!("a")]; INVALID);
+    check!("xy",  [lit!("xy")]; );
+    check!("xy",  [lit!("x"), lit!("y")]; );
+    check!("x y", [lit!("x"), lit!("y")]; INVALID);
+    check!("xy",  [lit!("x"), sp!(""), lit!("y")]; );
+    check!("x y", [lit!("x"), sp!(""), lit!("y")]; );
+
+    // numeric
+    check!("1987",        [num!(Year)]; year: 1987);
+    check!("1987 ",       [num!(Year)]; TOO_LONG);
+    check!("0x12",        [num!(Year)]; TOO_LONG); // `0` is parsed
+    check!("x123",        [num!(Year)]; INVALID);
+    check!("2015",        [num!(Year)]; year: 2015);
+    check!("0000",        [num!(Year)]; year:    0);
+    check!("9999",        [num!(Year)]; year: 9999);
+    check!(" \t987",      [num!(Year)]; year:  987);
+    check!("5",           [num!(Year)]; year:    5);
+    check!("5\0",         [num!(Year)]; TOO_LONG);
+    check!("\05",         [num!(Year)]; INVALID);
+    check!("",            [num!(Year)]; TOO_SHORT);
+    check!("12345",       [num!(Year), lit!("5")]; year: 1234);
+    check!("12345",       [nums!(Year), lit!("5")]; year: 1234);
+    check!("12345",       [num0!(Year), lit!("5")]; year: 1234);
+    check!("12341234",    [num!(Year), num!(Year)]; year: 1234);
+    check!("1234 1234",   [num!(Year), num!(Year)]; year: 1234);
+    check!("1234 1235",   [num!(Year), num!(Year)]; IMPOSSIBLE);
+    check!("1234 1234",   [num!(Year), lit!("x"), num!(Year)]; INVALID);
+    check!("1234x1234",   [num!(Year), lit!("x"), num!(Year)]; year: 1234);
+    check!("1234xx1234",  [num!(Year), lit!("x"), num!(Year)]; INVALID);
+    check!("1234 x 1234", [num!(Year), lit!("x"), num!(Year)]; INVALID);
+
+    // signed numeric
+    check!("-42",         [num!(Year)]; year: -42);
+    check!("+42",         [num!(Year)]; year: 42);
+    check!("-0042",       [num!(Year)]; year: -42);
+    check!("+0042",       [num!(Year)]; year: 42);
+    check!("-42195",      [num!(Year)]; year: -42195);
+    check!("+42195",      [num!(Year)]; year: 42195);
+    check!("  -42195",    [num!(Year)]; year: -42195);
+    check!("  +42195",    [num!(Year)]; year: 42195);
+    check!("  -   42",    [num!(Year)]; INVALID);
+    check!("  +   42",    [num!(Year)]; INVALID);
+    check!("-",           [num!(Year)]; TOO_SHORT);
+    check!("+",           [num!(Year)]; TOO_SHORT);
+
+    // unsigned numeric
+    check!("345",   [num!(Ordinal)]; ordinal: 345);
+    check!("+345",  [num!(Ordinal)]; INVALID);
+    check!("-345",  [num!(Ordinal)]; INVALID);
+    check!(" 345",  [num!(Ordinal)]; ordinal: 345);
+    check!(" +345", [num!(Ordinal)]; INVALID);
+    check!(" -345", [num!(Ordinal)]; INVALID);
+
+    // various numeric fields
+    check!("1234 5678",
+           [num!(Year), num!(IsoYear)];
+           year: 1234, isoyear: 5678);
+    check!("12 34 56 78",
+           [num!(YearDiv100), num!(YearMod100), num!(IsoYearDiv100), num!(IsoYearMod100)];
+           year_div_100: 12, year_mod_100: 34, isoyear_div_100: 56, isoyear_mod_100: 78);
+    check!("1 2 3 4 5 6",
+           [num!(Month), num!(Day), num!(WeekFromSun), num!(WeekFromMon), num!(IsoWeek),
+            num!(NumDaysFromSun)];
+           month: 1, day: 2, week_from_sun: 3, week_from_mon: 4, isoweek: 5, weekday: Weekday::Sat);
+    check!("7 89 01",
+           [num!(WeekdayFromMon), num!(Ordinal), num!(Hour12)];
+           weekday: Weekday::Sun, ordinal: 89, hour_mod_12: 1);
+    check!("23 45 6 78901234 567890123",
+           [num!(Hour), num!(Minute), num!(Second), num!(Nanosecond), num!(Timestamp)];
+           hour_div_12: 1, hour_mod_12: 11, minute: 45, second: 6, nanosecond: 78_901_234,
+           timestamp: 567_890_123);
+
+    // fixed: month and weekday names
+    check!("apr",       [fix!(ShortMonthName)]; month: 4);
+    check!("Apr",       [fix!(ShortMonthName)]; month: 4);
+    check!("APR",       [fix!(ShortMonthName)]; month: 4);
+    check!("ApR",       [fix!(ShortMonthName)]; month: 4);
+    check!("April",     [fix!(ShortMonthName)]; TOO_LONG); // `Apr` is parsed
+    check!("A",         [fix!(ShortMonthName)]; TOO_SHORT);
+    check!("Sol",       [fix!(ShortMonthName)]; INVALID);
+    check!("Apr",       [fix!(LongMonthName)]; month: 4);
+    check!("Apri",      [fix!(LongMonthName)]; TOO_LONG); // `Apr` is parsed
+    check!("April",     [fix!(LongMonthName)]; month: 4);
+    check!("Aprill",    [fix!(LongMonthName)]; TOO_LONG);
+    check!("Aprill",    [fix!(LongMonthName), lit!("l")]; month: 4);
+    check!("Aprl",      [fix!(LongMonthName), lit!("l")]; month: 4);
+    check!("April",     [fix!(LongMonthName), lit!("il")]; TOO_SHORT); // do not backtrack
+    check!("thu",       [fix!(ShortWeekdayName)]; weekday: Weekday::Thu);
+    check!("Thu",       [fix!(ShortWeekdayName)]; weekday: Weekday::Thu);
+    check!("THU",       [fix!(ShortWeekdayName)]; weekday: Weekday::Thu);
+    check!("tHu",       [fix!(ShortWeekdayName)]; weekday: Weekday::Thu);
+    check!("Thursday",  [fix!(ShortWeekdayName)]; TOO_LONG); // `Thu` is parsed
+    check!("T",         [fix!(ShortWeekdayName)]; TOO_SHORT);
+    check!("The",       [fix!(ShortWeekdayName)]; INVALID);
+    check!("Nop",       [fix!(ShortWeekdayName)]; INVALID);
+    check!("Thu",       [fix!(LongWeekdayName)]; weekday: Weekday::Thu);
+    check!("Thur",      [fix!(LongWeekdayName)]; TOO_LONG); // `Thu` is parsed
+    check!("Thurs",     [fix!(LongWeekdayName)]; TOO_LONG); // ditto
+    check!("Thursday",  [fix!(LongWeekdayName)]; weekday: Weekday::Thu);
+    check!("Thursdays", [fix!(LongWeekdayName)]; TOO_LONG);
+    check!("Thursdays", [fix!(LongWeekdayName), lit!("s")]; weekday: Weekday::Thu);
+    check!("Thus",      [fix!(LongWeekdayName), lit!("s")]; weekday: Weekday::Thu);
+    check!("Thursday",  [fix!(LongWeekdayName), lit!("rsday")]; TOO_SHORT); // do not backtrack
+
+    // fixed: am/pm
+    check!("am",  [fix!(LowerAmPm)]; hour_div_12: 0);
+    check!("pm",  [fix!(LowerAmPm)]; hour_div_12: 1);
+    check!("AM",  [fix!(LowerAmPm)]; hour_div_12: 0);
+    check!("PM",  [fix!(LowerAmPm)]; hour_div_12: 1);
+    check!("am",  [fix!(UpperAmPm)]; hour_div_12: 0);
+    check!("pm",  [fix!(UpperAmPm)]; hour_div_12: 1);
+    check!("AM",  [fix!(UpperAmPm)]; hour_div_12: 0);
+    check!("PM",  [fix!(UpperAmPm)]; hour_div_12: 1);
+    check!("Am",  [fix!(LowerAmPm)]; hour_div_12: 0);
+    check!(" Am", [fix!(LowerAmPm)]; INVALID);
+    check!("ame", [fix!(LowerAmPm)]; TOO_LONG); // `am` is parsed
+    check!("a",   [fix!(LowerAmPm)]; TOO_SHORT);
+    check!("p",   [fix!(LowerAmPm)]; TOO_SHORT);
+    check!("x",   [fix!(LowerAmPm)]; TOO_SHORT);
+    check!("xx",  [fix!(LowerAmPm)]; INVALID);
+    check!("",    [fix!(LowerAmPm)]; TOO_SHORT);
+
+    // fixed: dot plus nanoseconds
+    check!("",              [fix!(Nanosecond)]; ); // no field set, but not an error
+    check!("4",             [fix!(Nanosecond)]; TOO_LONG); // never consumes `4`
+    check!("4",             [fix!(Nanosecond), num!(Second)]; second: 4);
+    check!(".0",            [fix!(Nanosecond)]; nanosecond: 0);
+    check!(".4",            [fix!(Nanosecond)]; nanosecond: 400_000_000);
+    check!(".42",           [fix!(Nanosecond)]; nanosecond: 420_000_000);
+    check!(".421",          [fix!(Nanosecond)]; nanosecond: 421_000_000);
+    check!(".42195",        [fix!(Nanosecond)]; nanosecond: 421_950_000);
+    check!(".421950803",    [fix!(Nanosecond)]; nanosecond: 421_950_803);
+    check!(".421950803547", [fix!(Nanosecond)]; nanosecond: 421_950_803);
+    check!(".000000003547", [fix!(Nanosecond)]; nanosecond: 3);
+    check!(".000000000547", [fix!(Nanosecond)]; nanosecond: 0);
+    check!(".",             [fix!(Nanosecond)]; TOO_SHORT);
+    check!(".4x",           [fix!(Nanosecond)]; TOO_LONG);
+    check!(".  4",          [fix!(Nanosecond)]; INVALID);
+    check!("  .4",          [fix!(Nanosecond)]; TOO_LONG); // no automatic trimming
+
+    // fixed: nanoseconds without the dot
+    check!("",             [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
+    check!("0",            [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
+    check!("4",            [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
+    check!("42",           [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
+    check!("421",          [internal_fix!(Nanosecond3NoDot)]; nanosecond: 421_000_000);
+    check!("42143",        [internal_fix!(Nanosecond3NoDot), num!(Second)]; nanosecond: 421_000_000, second: 43);
+    check!("42195",        [internal_fix!(Nanosecond3NoDot)]; TOO_LONG);
+    check!("4x",           [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
+    check!("  4",          [internal_fix!(Nanosecond3NoDot)]; INVALID);
+    check!(".421",         [internal_fix!(Nanosecond3NoDot)]; INVALID);
+
+    check!("",             [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
+    check!("0",            [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
+    check!("42195",        [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
+    check!("421950",       [internal_fix!(Nanosecond6NoDot)]; nanosecond: 421_950_000);
+    check!("000003",       [internal_fix!(Nanosecond6NoDot)]; nanosecond: 3000);
+    check!("000000",       [internal_fix!(Nanosecond6NoDot)]; nanosecond: 0);
+    check!("4x",           [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
+    check!("     4",       [internal_fix!(Nanosecond6NoDot)]; INVALID);
+    check!(".42100",       [internal_fix!(Nanosecond6NoDot)]; INVALID);
+
+    check!("",             [internal_fix!(Nanosecond9NoDot)]; TOO_SHORT);
+    check!("42195",        [internal_fix!(Nanosecond9NoDot)]; TOO_SHORT);
+    check!("421950803",    [internal_fix!(Nanosecond9NoDot)]; nanosecond: 421_950_803);
+    check!("000000003",    [internal_fix!(Nanosecond9NoDot)]; nanosecond: 3);
+    check!("42195080354",  [internal_fix!(Nanosecond9NoDot), num!(Second)]; nanosecond: 421_950_803, second: 54); // don't skip digits that come after the 9
+    check!("421950803547", [internal_fix!(Nanosecond9NoDot)]; TOO_LONG);
+    check!("000000000",    [internal_fix!(Nanosecond9NoDot)]; nanosecond: 0);
+    check!("00000000x",    [internal_fix!(Nanosecond9NoDot)]; INVALID);
+    check!("        4",    [internal_fix!(Nanosecond9NoDot)]; INVALID);
+    check!(".42100000",    [internal_fix!(Nanosecond9NoDot)]; INVALID);
+
+    // fixed: timezone offsets
+    check!("+00:00",    [fix!(TimezoneOffset)]; offset: 0);
+    check!("-00:00",    [fix!(TimezoneOffset)]; offset: 0);
+    check!("+00:01",    [fix!(TimezoneOffset)]; offset: 60);
+    check!("-00:01",    [fix!(TimezoneOffset)]; offset: -60);
+    check!("+00:30",    [fix!(TimezoneOffset)]; offset: 30 * 60);
+    check!("-00:30",    [fix!(TimezoneOffset)]; offset: -30 * 60);
+    check!("+04:56",    [fix!(TimezoneOffset)]; offset: 296 * 60);
+    check!("-04:56",    [fix!(TimezoneOffset)]; offset: -296 * 60);
+    check!("+24:00",    [fix!(TimezoneOffset)]; offset: 24 * 60 * 60);
+    check!("-24:00",    [fix!(TimezoneOffset)]; offset: -24 * 60 * 60);
+    check!("+99:59",    [fix!(TimezoneOffset)]; offset: (100 * 60 - 1) * 60);
+    check!("-99:59",    [fix!(TimezoneOffset)]; offset: -(100 * 60 - 1) * 60);
+    check!("+00:59",    [fix!(TimezoneOffset)]; offset: 59 * 60);
+    check!("+00:60",    [fix!(TimezoneOffset)]; OUT_OF_RANGE);
+    check!("+00:99",    [fix!(TimezoneOffset)]; OUT_OF_RANGE);
+    check!("#12:34",    [fix!(TimezoneOffset)]; INVALID);
+    check!("12:34",     [fix!(TimezoneOffset)]; INVALID);
+    check!("+12:34 ",   [fix!(TimezoneOffset)]; TOO_LONG);
+    check!(" +12:34",   [fix!(TimezoneOffset)]; offset: 754 * 60);
+    check!("\t -12:34", [fix!(TimezoneOffset)]; offset: -754 * 60);
+    check!("",          [fix!(TimezoneOffset)]; TOO_SHORT);
+    check!("+",         [fix!(TimezoneOffset)]; TOO_SHORT);
+    check!("+1",        [fix!(TimezoneOffset)]; TOO_SHORT);
+    check!("+12",       [fix!(TimezoneOffset)]; TOO_SHORT);
+    check!("+123",      [fix!(TimezoneOffset)]; TOO_SHORT);
+    check!("+1234",     [fix!(TimezoneOffset)]; offset: 754 * 60);
+    check!("+12345",    [fix!(TimezoneOffset)]; TOO_LONG);
+    check!("+12345",    [fix!(TimezoneOffset), num!(Day)]; offset: 754 * 60, day: 5);
+    check!("Z",         [fix!(TimezoneOffset)]; INVALID);
+    check!("z",         [fix!(TimezoneOffset)]; INVALID);
+    check!("Z",         [fix!(TimezoneOffsetZ)]; offset: 0);
+    check!("z",         [fix!(TimezoneOffsetZ)]; offset: 0);
+    check!("Y",         [fix!(TimezoneOffsetZ)]; INVALID);
+    check!("Zulu",      [fix!(TimezoneOffsetZ), lit!("ulu")]; offset: 0);
+    check!("zulu",      [fix!(TimezoneOffsetZ), lit!("ulu")]; offset: 0);
+    check!("+1234ulu",  [fix!(TimezoneOffsetZ), lit!("ulu")]; offset: 754 * 60);
+    check!("+12:34ulu", [fix!(TimezoneOffsetZ), lit!("ulu")]; offset: 754 * 60);
+    check!("Z",         [internal_fix!(TimezoneOffsetPermissive)]; offset: 0);
+    check!("z",         [internal_fix!(TimezoneOffsetPermissive)]; offset: 0);
+    check!("+12:00",    [internal_fix!(TimezoneOffsetPermissive)]; offset: 12 * 60 * 60);
+    check!("+12",       [internal_fix!(TimezoneOffsetPermissive)]; offset: 12 * 60 * 60);
+    check!("???",       [fix!(TimezoneName)]; BAD_FORMAT); // not allowed
+
+    // some practical examples
+    check!("2015-02-04T14:37:05+09:00",
+           [num!(Year), lit!("-"), num!(Month), lit!("-"), num!(Day), lit!("T"),
+            num!(Hour), lit!(":"), num!(Minute), lit!(":"), num!(Second), fix!(TimezoneOffset)];
+           year: 2015, month: 2, day: 4, hour_div_12: 1, hour_mod_12: 2,
+           minute: 37, second: 5, offset: 32400);
+    check!("20150204143705567",
+            [num!(Year), num!(Month), num!(Day),
+            num!(Hour), num!(Minute), num!(Second), internal_fix!(Nanosecond3NoDot)];
+            year: 2015, month: 2, day: 4, hour_div_12: 1, hour_mod_12: 2,
+            minute: 37, second: 5, nanosecond: 567000000);
+    check!("Mon, 10 Jun 2013 09:32:37 GMT",
+           [fix!(ShortWeekdayName), lit!(","), sp!(" "), num!(Day), sp!(" "),
+            fix!(ShortMonthName), sp!(" "), num!(Year), sp!(" "), num!(Hour), lit!(":"),
+            num!(Minute), lit!(":"), num!(Second), sp!(" "), lit!("GMT")];
+           year: 2013, month: 6, day: 10, weekday: Weekday::Mon,
+           hour_div_12: 0, hour_mod_12: 9, minute: 32, second: 37);
+    check!("20060102150405",
+           [num!(Year), num!(Month), num!(Day), num!(Hour), num!(Minute), num!(Second)];
+           year: 2006, month: 1, day: 2, hour_div_12: 1, hour_mod_12: 3, minute: 4, second: 5);
+    check!("3:14PM",
+           [num!(Hour12), lit!(":"), num!(Minute), fix!(LowerAmPm)];
+           hour_div_12: 1, hour_mod_12: 3, minute: 14);
+    check!("12345678901234.56789",
+           [num!(Timestamp), lit!("."), num!(Nanosecond)];
+           nanosecond: 56_789, timestamp: 12_345_678_901_234);
+    check!("12345678901234.56789",
+           [num!(Timestamp), fix!(Nanosecond)];
+           nanosecond: 567_890_000, timestamp: 12_345_678_901_234);
+}
+
+#[cfg(test)]
+#[test]
+fn test_rfc2822() {
+    use DateTime;
+    use offset::FixedOffset;
+    use super::*;
+    use super::NOT_ENOUGH;
+
+    // Test data - (input, Ok(expected result after parse and format) or Err(error code))
+    let testdates = [
+        ("Tue, 20 Jan 2015 17:35:20 -0800", Ok("Tue, 20 Jan 2015 17:35:20 -0800")), // normal case
+        ("20 Jan 2015 17:35:20 -0800", Ok("Tue, 20 Jan 2015 17:35:20 -0800")),  // no day of week
+        ("20 JAN 2015 17:35:20 -0800", Ok("Tue, 20 Jan 2015 17:35:20 -0800")),  // upper case month
+        ("Tue, 20 Jan 2015 17:35 -0800", Ok("Tue, 20 Jan 2015 17:35:00 -0800")), // no second
+        ("11 Sep 2001 09:45:00 EST", Ok("Tue, 11 Sep 2001 09:45:00 -0500")),
+        ("30 Feb 2015 17:35:20 -0800", Err(OUT_OF_RANGE)),      // bad day of month
+        ("Tue, 20 Jan 2015", Err(TOO_SHORT)),                   // omitted fields
+        ("Tue, 20 Avr 2015 17:35:20 -0800", Err(INVALID)),      // bad month name
+        ("Tue, 20 Jan 2015 25:35:20 -0800", Err(OUT_OF_RANGE)), // bad hour
+        ("Tue, 20 Jan 2015 7:35:20 -0800", Err(INVALID)),       // bad # of digits in hour
+        ("Tue, 20 Jan 2015 17:65:20 -0800", Err(OUT_OF_RANGE)), // bad minute
+        ("Tue, 20 Jan 2015 17:35:90 -0800", Err(OUT_OF_RANGE)), // bad second
+        ("Tue, 20 Jan 2015 17:35:20 -0890", Err(OUT_OF_RANGE)), // bad offset
+        ("6 Jun 1944 04:00:00Z", Err(INVALID)),                 // bad offset (zulu not allowed)
+        ("Tue, 20 Jan 2015 17:35:20 HAS", Err(NOT_ENOUGH))      // bad named time zone
+    ];
+
+    fn rfc2822_to_datetime(date: &str) -> ParseResult<DateTime<FixedOffset>> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, date, [Item::Fixed(Fixed::RFC2822)].iter().cloned()));
+        parsed.to_datetime()
+    }
+
+    fn fmt_rfc2822_datetime(dt: DateTime<FixedOffset>) -> String {
+        dt.format_with_items([Item::Fixed(Fixed::RFC2822)].iter().cloned()).to_string()
+    }
+
+    // Test against test data above
+    for &(date, checkdate) in testdates.iter() {
+        let d = rfc2822_to_datetime(date);          // parse a date
+        let dt = match d {                          // did we get a value?
+            Ok(dt) => Ok(fmt_rfc2822_datetime(dt)), // yes, go on
+            Err(e) => Err(e),                       // otherwise keep an error for the comparison
+        };
+        if dt != checkdate.map(|s| s.to_string()) { // check for expected result
+            panic!("Date conversion failed for {}\nReceived: {:?}\nExpected: {:?}",
+                   date, dt, checkdate);
+        }
+    };
+}
+
+
+
+#[cfg(test)]
+#[test]
+fn parse_rfc850() {
+    use ::{Utc, TimeZone};
+
+    static RFC850_FMT: &'static str =  "%A, %d-%b-%y %T GMT";
+
+    let dt_str = "Sunday, 06-Nov-94 08:49:37 GMT";
+    let dt = Utc.ymd(1994, 11, 6).and_hms(8, 49, 37);
+
+    // Check that the format is what we expect
+    assert_eq!(dt.format(RFC850_FMT).to_string(), dt_str);
+
+    // Check that it parses correctly
+    assert_eq!(Ok(dt), Utc.datetime_from_str("Sunday, 06-Nov-94 08:49:37 GMT", RFC850_FMT));
+
+    // Check that the rest of the weekdays parse correctly (this test originally failed because
+    // Sunday parsed incorrectly).
+    let testdates = [
+        (Utc.ymd(1994, 11, 7).and_hms(8, 49, 37),  "Monday, 07-Nov-94 08:49:37 GMT"),
+        (Utc.ymd(1994, 11, 8).and_hms(8, 49, 37),  "Tuesday, 08-Nov-94 08:49:37 GMT"),
+        (Utc.ymd(1994, 11, 9).and_hms(8, 49, 37),  "Wednesday, 09-Nov-94 08:49:37 GMT"),
+        (Utc.ymd(1994, 11, 10).and_hms(8, 49, 37), "Thursday, 10-Nov-94 08:49:37 GMT"),
+        (Utc.ymd(1994, 11, 11).and_hms(8, 49, 37), "Friday, 11-Nov-94 08:49:37 GMT"),
+        (Utc.ymd(1994, 11, 12).and_hms(8, 49, 37), "Saturday, 12-Nov-94 08:49:37 GMT"),
+    ];
+
+    for val in &testdates {
+        assert_eq!(Ok(val.0), Utc.datetime_from_str(val.1, RFC850_FMT));
+    }
+}
+
+#[cfg(test)]
+#[test]
+fn test_rfc3339() {
+    use DateTime;
+    use offset::FixedOffset;
+    use super::*;
+
+    // Test data - (input, Ok(expected result after parse and format) or Err(error code))
+    let testdates = [
+        ("2015-01-20T17:35:20-08:00", Ok("2015-01-20T17:35:20-08:00")), // normal case
+        ("1944-06-06T04:04:00Z", Ok("1944-06-06T04:04:00+00:00")),      // D-day
+        ("2001-09-11T09:45:00-08:00", Ok("2001-09-11T09:45:00-08:00")),
+        ("2015-01-20T17:35:20.001-08:00", Ok("2015-01-20T17:35:20.001-08:00")),
+        ("2015-01-20T17:35:20.000031-08:00", Ok("2015-01-20T17:35:20.000031-08:00")),
+        ("2015-01-20T17:35:20.000000004-08:00", Ok("2015-01-20T17:35:20.000000004-08:00")),
+        ("2015-01-20T17:35:20.000000000452-08:00", Ok("2015-01-20T17:35:20-08:00")), // too small
+        ("2015-02-30T17:35:20-08:00", Err(OUT_OF_RANGE)),               // bad day of month
+        ("2015-01-20T25:35:20-08:00", Err(OUT_OF_RANGE)),               // bad hour
+        ("2015-01-20T17:65:20-08:00", Err(OUT_OF_RANGE)),               // bad minute
+        ("2015-01-20T17:35:90-08:00", Err(OUT_OF_RANGE)),               // bad second
+        ("2015-01-20T17:35:20-24:00", Err(OUT_OF_RANGE)),               // bad offset
+    ];
+
+    fn rfc3339_to_datetime(date: &str) -> ParseResult<DateTime<FixedOffset>> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, date, [Item::Fixed(Fixed::RFC3339)].iter().cloned()));
+        parsed.to_datetime()
+    }
+
+    fn fmt_rfc3339_datetime(dt: DateTime<FixedOffset>) -> String {
+        dt.format_with_items([Item::Fixed(Fixed::RFC3339)].iter().cloned()).to_string()
+    }
+
+    // Test against test data above
+    for &(date, checkdate) in testdates.iter() {
+        let d = rfc3339_to_datetime(date);          // parse a date
+        let dt = match d {                          // did we get a value?
+            Ok(dt) => Ok(fmt_rfc3339_datetime(dt)), // yes, go on
+            Err(e) => Err(e),                       // otherwise keep an error for the comparison
+        };
+        if dt != checkdate.map(|s| s.to_string()) { // check for expected result
+            panic!("Date conversion failed for {}\nReceived: {:?}\nExpected: {:?}",
+                   date, dt, checkdate);
+        }
+    };
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/format/scan.rs cargo-0.33.0/vendor/chrono/src/format/scan.rs
--- cargo-0.32.0/vendor/chrono/src/format/scan.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/format/scan.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,304 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+/*!
+ * Various scanning routines for the parser.
+ */
+
+use Weekday;
+use super::{ParseResult, TOO_SHORT, INVALID, OUT_OF_RANGE};
+
+/// Returns true when two slices are equal case-insensitively (in ASCII).
+/// Assumes that the `pattern` is already converted to lower case.
+fn equals(s: &str, pattern: &str) -> bool {
+    let mut xs = s.as_bytes().iter().map(|&c| match c { b'A'...b'Z' => c + 32, _ => c });
+    let mut ys = pattern.as_bytes().iter().cloned();
+    loop {
+        match (xs.next(), ys.next()) {
+            (None, None) => return true,
+            (None, _) | (_, None) => return false,
+            (Some(x), Some(y)) if x != y => return false,
+            _ => (),
+        }
+    }
+}
+
+/// Tries to parse the non-negative number from `min` to `max` digits.
+///
+/// The absence of digits at all is an unconditional error.
+/// More than `max` digits are consumed up to the first `max` digits.
+/// Any number that does not fit in `i64` is an error.
+pub fn number(s: &str, min: usize, max: usize) -> ParseResult<(&str, i64)> {
+    assert!(min <= max);
+
+    // limit `s` to given number of digits
+    let mut window = s.as_bytes();
+    if window.len() > max { window = &window[..max]; }
+
+    // scan digits
+    let upto = window.iter().position(|&c| c < b'0' || b'9' < c)
+        .unwrap_or_else(|| window.len());
+    if upto < min {
+        return Err(if window.is_empty() {TOO_SHORT} else {INVALID});
+    }
+
+    // we can overflow here, which is the only possible cause of error from `parse`.
+    let v: i64 = try!(s[..upto].parse().map_err(|_| OUT_OF_RANGE));
+    Ok((&s[upto..], v))
+}
+
+/// Tries to consume at least one digits as a fractional second.
+/// Returns the number of whole nanoseconds (0--999,999,999).
+pub fn nanosecond(s: &str) -> ParseResult<(&str, i64)> {
+    // record the number of digits consumed for later scaling.
+    let origlen = s.len();
+    let (s, v) = try!(number(s, 1, 9));
+    let consumed = origlen - s.len();
+
+    // scale the number accordingly.
+    static SCALE: [i64; 10] = [0, 100_000_000, 10_000_000, 1_000_000, 100_000, 10_000,
+                               1_000, 100, 10, 1];
+    let v = try!(v.checked_mul(SCALE[consumed]).ok_or(OUT_OF_RANGE));
+
+    // if there are more than 9 digits, skip next digits.
+    let s = s.trim_left_matches(|c: char| '0' <= c && c <= '9');
+
+    Ok((s, v))
+}
+
+/// Tries to consume a fixed number of digits as a fractional second.
+/// Returns the number of whole nanoseconds (0--999,999,999).
+pub fn nanosecond_fixed(s: &str, digits: usize) -> ParseResult<(&str, i64)> {
+    // record the number of digits consumed for later scaling.
+    let (s, v) = try!(number(s, digits, digits));
+
+    // scale the number accordingly.
+    static SCALE: [i64; 10] = [0, 100_000_000, 10_000_000, 1_000_000, 100_000, 10_000,
+                               1_000, 100, 10, 1];
+    let v = try!(v.checked_mul(SCALE[digits]).ok_or(OUT_OF_RANGE));
+
+    Ok((s, v))
+}
+
+/// Tries to parse the month index (0 through 11) with the first three ASCII letters.
+pub fn short_month0(s: &str) -> ParseResult<(&str, u8)> {
+    if s.len() < 3 { return Err(TOO_SHORT); }
+    let buf = s.as_bytes();
+    let month0 = match (buf[0] | 32, buf[1] | 32, buf[2] | 32) {
+        (b'j',b'a',b'n') => 0,
+        (b'f',b'e',b'b') => 1,
+        (b'm',b'a',b'r') => 2,
+        (b'a',b'p',b'r') => 3,
+        (b'm',b'a',b'y') => 4,
+        (b'j',b'u',b'n') => 5,
+        (b'j',b'u',b'l') => 6,
+        (b'a',b'u',b'g') => 7,
+        (b's',b'e',b'p') => 8,
+        (b'o',b'c',b't') => 9,
+        (b'n',b'o',b'v') => 10,
+        (b'd',b'e',b'c') => 11,
+        _ => return Err(INVALID)
+    };
+    Ok((&s[3..], month0))
+}
+
+/// Tries to parse the weekday with the first three ASCII letters.
+pub fn short_weekday(s: &str) -> ParseResult<(&str, Weekday)> {
+    if s.len() < 3 { return Err(TOO_SHORT); }
+    let buf = s.as_bytes();
+    let weekday = match (buf[0] | 32, buf[1] | 32, buf[2] | 32) {
+        (b'm',b'o',b'n') => Weekday::Mon,
+        (b't',b'u',b'e') => Weekday::Tue,
+        (b'w',b'e',b'd') => Weekday::Wed,
+        (b't',b'h',b'u') => Weekday::Thu,
+        (b'f',b'r',b'i') => Weekday::Fri,
+        (b's',b'a',b't') => Weekday::Sat,
+        (b's',b'u',b'n') => Weekday::Sun,
+        _ => return Err(INVALID)
+    };
+    Ok((&s[3..], weekday))
+}
+
+/// Tries to parse the month index (0 through 11) with short or long month names.
+/// It prefers long month names to short month names when both are possible.
+pub fn short_or_long_month0(s: &str) -> ParseResult<(&str, u8)> {
+    // lowercased month names, minus first three chars
+    static LONG_MONTH_SUFFIXES: [&'static str; 12] =
+        ["uary", "ruary", "ch", "il", "", "e", "y", "ust", "tember", "ober", "ember", "ember"];
+
+    let (mut s, month0) = try!(short_month0(s));
+
+    // tries to consume the suffix if possible
+    let suffix = LONG_MONTH_SUFFIXES[month0 as usize];
+    if s.len() >= suffix.len() && equals(&s[..suffix.len()], suffix) {
+        s = &s[suffix.len()..];
+    }
+
+    Ok((s, month0))
+}
+
+/// Tries to parse the weekday with short or long weekday names.
+/// It prefers long weekday names to short weekday names when both are possible.
+pub fn short_or_long_weekday(s: &str) -> ParseResult<(&str, Weekday)> {
+    // lowercased weekday names, minus first three chars
+    static LONG_WEEKDAY_SUFFIXES: [&'static str; 7] =
+        ["day", "sday", "nesday", "rsday", "day", "urday", "day"];
+
+    let (mut s, weekday) = try!(short_weekday(s));
+
+    // tries to consume the suffix if possible
+    let suffix = LONG_WEEKDAY_SUFFIXES[weekday.num_days_from_monday() as usize];
+    if s.len() >= suffix.len() && equals(&s[..suffix.len()], suffix) {
+        s = &s[suffix.len()..];
+    }
+
+    Ok((s, weekday))
+}
+
+/// Tries to consume exactly one given character.
+pub fn char(s: &str, c1: u8) -> ParseResult<&str> {
+    match s.as_bytes().first() {
+        Some(&c) if c == c1 => Ok(&s[1..]),
+        Some(_) => Err(INVALID),
+        None => Err(TOO_SHORT),
+    }
+}
+
+/// Tries to consume one or more whitespace.
+pub fn space(s: &str) -> ParseResult<&str> {
+    let s_ = s.trim_left();
+    if s_.len() < s.len() {
+        Ok(s_)
+    } else if s.is_empty() {
+        Err(TOO_SHORT)
+    } else {
+        Err(INVALID)
+    }
+}
+
+/// Consumes any number (including zero) of colon or spaces.
+pub fn colon_or_space(s: &str) -> ParseResult<&str> {
+    Ok(s.trim_left_matches(|c: char| c == ':' || c.is_whitespace()))
+}
+
+/// Tries to parse `[-+]\d\d` continued by `\d\d`. Return an offset in seconds if possible.
+///
+/// The additional `colon` may be used to parse a mandatory or optional `:`
+/// between hours and minutes, and should return either a new suffix or `Err` when parsing fails.
+pub fn timezone_offset<F>(s: &str, consume_colon: F) -> ParseResult<(&str, i32)>
+        where F: FnMut(&str) -> ParseResult<&str> {
+    timezone_offset_internal(s, consume_colon, false)
+}
+
+fn timezone_offset_internal<F>(mut s: &str, mut consume_colon: F, allow_missing_minutes: bool)
+-> ParseResult<(&str, i32)>
+    where F: FnMut(&str) -> ParseResult<&str>
+{
+    fn digits(s: &str) -> ParseResult<(u8, u8)> {
+        let b = s.as_bytes();
+        if b.len() < 2 {
+            Err(TOO_SHORT)
+        } else {
+            Ok((b[0], b[1]))
+        }
+    }
+    let negative = match s.as_bytes().first() {
+        Some(&b'+') => false,
+        Some(&b'-') => true,
+        Some(_) => return Err(INVALID),
+        None => return Err(TOO_SHORT),
+    };
+    s = &s[1..];
+
+    // hours (00--99)
+    let hours = match try!(digits(s)) {
+        (h1 @ b'0'...b'9', h2 @ b'0'...b'9') => i32::from((h1 - b'0') * 10 + (h2 - b'0')),
+        _ => return Err(INVALID),
+    };
+    s = &s[2..];
+
+    // colons (and possibly other separators)
+    s = try!(consume_colon(s));
+
+    // minutes (00--59)
+    // if the next two items are digits then we have to add minutes
+    let minutes = if let Ok(ds) = digits(s) {
+        match ds {
+            (m1 @ b'0'...b'5', m2 @ b'0'...b'9') => i32::from((m1 - b'0') * 10 + (m2 - b'0')),
+            (b'6'...b'9', b'0'...b'9') => return Err(OUT_OF_RANGE),
+            _ => return Err(INVALID),
+        }
+    } else if allow_missing_minutes {
+        0
+    } else {
+        return Err(TOO_SHORT);
+    };
+    s = match s.len() {
+        len if len >= 2 => &s[2..],
+        len if len == 0 => s,
+        _ => return Err(TOO_SHORT),
+    };
+
+    let seconds = hours * 3600 + minutes * 60;
+    Ok((s, if negative {-seconds} else {seconds}))
+}
+
+/// Same to `timezone_offset` but also allows for `z`/`Z` which is same to `+00:00`.
+pub fn timezone_offset_zulu<F>(s: &str, colon: F)
+-> ParseResult<(&str, i32)>
+    where F: FnMut(&str) -> ParseResult<&str>
+{
+    match s.as_bytes().first() {
+        Some(&b'z') | Some(&b'Z') => Ok((&s[1..], 0)),
+        _ => timezone_offset(s, colon),
+    }
+}
+
+/// Same to `timezone_offset` but also allows for `z`/`Z` which is same to
+/// `+00:00`, and allows missing minutes entirely.
+pub fn timezone_offset_permissive<F>(s: &str, colon: F)
+-> ParseResult<(&str, i32)>
+    where F: FnMut(&str) -> ParseResult<&str>
+{
+    match s.as_bytes().first() {
+        Some(&b'z') | Some(&b'Z') => Ok((&s[1..], 0)),
+        _ => timezone_offset_internal(s, colon, true),
+    }
+}
+
+/// Same to `timezone_offset` but also allows for RFC 2822 legacy timezones.
+/// May return `None` which indicates an insufficient offset data (i.e. `-0000`).
+pub fn timezone_offset_2822(s: &str) -> ParseResult<(&str, Option<i32>)> {
+    // tries to parse legacy time zone names
+    let upto = s.as_bytes().iter().position(|&c| match c { b'a'...b'z' | b'A'...b'Z' => false,
+                                                           _ => true })
+        .unwrap_or_else(|| s.len());
+    if upto > 0 {
+        let name = &s[..upto];
+        let s = &s[upto..];
+        let offset_hours = |o| Ok((s, Some(o * 3600)));
+        if equals(name, "gmt") || equals(name, "ut") {
+            offset_hours(0)
+        } else if equals(name, "edt") {
+            offset_hours(-4)
+        } else if equals(name, "est") || equals(name, "cdt") {
+            offset_hours(-5)
+        } else if equals(name, "cst") || equals(name, "mdt") {
+            offset_hours(-6)
+        } else if equals(name, "mst") || equals(name, "pdt") {
+            offset_hours(-7)
+        } else if equals(name, "pst") {
+            offset_hours(-8)
+        } else {
+            Ok((s, None)) // recommended by RFC 2822: consume but treat it as -0000
+        }
+    } else {
+        let (s_, offset) = try!(timezone_offset(s, |s| Ok(s)));
+        if offset == 0 && s.starts_with('-') { // -0000 is not same to +0000
+            Ok((s_, None))
+        } else {
+            Ok((s_, Some(offset)))
+        }
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/format/strftime.rs cargo-0.33.0/vendor/chrono/src/format/strftime.rs
--- cargo-0.32.0/vendor/chrono/src/format/strftime.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/format/strftime.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,483 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+/*!
+`strftime`/`strptime`-inspired date and time formatting syntax.
+
+## Specifiers
+
+The following specifiers are available both to formatting and parsing.
+
+| Spec. | Example  | Description                                                                |
+|-------|----------|----------------------------------------------------------------------------|
+|       |          | **DATE SPECIFIERS:**                                                       |
+| `%Y`  | `2001`   | The full proleptic Gregorian year, zero-padded to 4 digits. [1]            |
+| `%C`  | `20`     | The proleptic Gregorian year divided by 100, zero-padded to 2 digits. [2]  |
+| `%y`  | `01`     | The proleptic Gregorian year modulo 100, zero-padded to 2 digits. [2]      |
+|       |          |                                                                            |
+| `%m`  | `07`     | Month number (01--12), zero-padded to 2 digits.                            |
+| `%b`  | `Jul`    | Abbreviated month name. Always 3 letters.                                  |
+| `%B`  | `July`   | Full month name. Also accepts corresponding abbreviation in parsing.       |
+| `%h`  | `Jul`    | Same to `%b`.                                                              |
+|       |          |                                                                            |
+| `%d`  | `08`     | Day number (01--31), zero-padded to 2 digits.                              |
+| `%e`  | ` 8`     | Same to `%d` but space-padded. Same to `%_d`.                              |
+|       |          |                                                                            |
+| `%a`  | `Sun`    | Abbreviated weekday name. Always 3 letters.                                |
+| `%A`  | `Sunday` | Full weekday name. Also accepts corresponding abbreviation in parsing.     |
+| `%w`  | `0`      | Sunday = 0, Monday = 1, ..., Saturday = 6.                                 |
+| `%u`  | `7`      | Monday = 1, Tuesday = 2, ..., Sunday = 7. (ISO 8601)                       |
+|       |          |                                                                            |
+| `%U`  | `28`     | Week number starting with Sunday (00--53), zero-padded to 2 digits. [3]    |
+| `%W`  | `27`     | Same to `%U`, but week 1 starts with the first Monday in that year instead.|
+|       |          |                                                                            |
+| `%G`  | `2001`   | Same to `%Y` but uses the year number in ISO 8601 week date. [4]           |
+| `%g`  | `01`     | Same to `%y` but uses the year number in ISO 8601 week date. [4]           |
+| `%V`  | `27`     | Same to `%U` but uses the week number in ISO 8601 week date (01--53). [4]  |
+|       |          |                                                                            |
+| `%j`  | `189`    | Day of the year (001--366), zero-padded to 3 digits.                       |
+|       |          |                                                                            |
+| `%D`  | `07/08/01`    | Month-day-year format. Same to `%m/%d/%y`.                            |
+| `%x`  | `07/08/01`    | Same to `%D`.                                                         |
+| `%F`  | `2001-07-08`  | Year-month-day format (ISO 8601). Same to `%Y-%m-%d`.                 |
+| `%v`  | ` 8-Jul-2001` | Day-month-year format. Same to `%e-%b-%Y`.                            |
+|       |          |                                                                            |
+|       |          | **TIME SPECIFIERS:**                                                       |
+| `%H`  | `00`     | Hour number (00--23), zero-padded to 2 digits.                             |
+| `%k`  | ` 0`     | Same to `%H` but space-padded. Same to `%_H`.                              |
+| `%I`  | `12`     | Hour number in 12-hour clocks (01--12), zero-padded to 2 digits.           |
+| `%l`  | `12`     | Same to `%I` but space-padded. Same to `%_I`.                              |
+|       |          |                                                                            |
+| `%P`  | `am`     | `am` or `pm` in 12-hour clocks.                                            |
+| `%p`  | `AM`     | `AM` or `PM` in 12-hour clocks.                                            |
+|       |          |                                                                            |
+| `%M`  | `34`     | Minute number (00--59), zero-padded to 2 digits.                           |
+| `%S`  | `60`     | Second number (00--60), zero-padded to 2 digits. [5]                       |
+| `%f`  | `026490000`   | The fractional seconds (in nanoseconds) since last whole second. [8]  |
+| `%.f` | `.026490`| Similar to `.%f` but left-aligned. These all consume the leading dot. [8]  |
+| `%.3f`| `.026`        | Similar to `.%f` but left-aligned but fixed to a length of 3. [8]     |
+| `%.6f`| `.026490`     | Similar to `.%f` but left-aligned but fixed to a length of 6. [8]     |
+| `%.9f`| `.026490000`  | Similar to `.%f` but left-aligned but fixed to a length of 9. [8]     |
+| `%3f` | `026`         | Similar to `%.3f` but without the leading dot. [8]                    |
+| `%6f` | `026490`      | Similar to `%.6f` but without the leading dot. [8]                    |
+| `%9f` | `026490000`   | Similar to `%.9f` but without the leading dot. [8]                    |
+|       |               |                                                                       |
+| `%R`  | `00:34`       | Hour-minute format. Same to `%H:%M`.                                  |
+| `%T`  | `00:34:60`    | Hour-minute-second format. Same to `%H:%M:%S`.                        |
+| `%X`  | `00:34:60`    | Same to `%T`.                                                         |
+| `%r`  | `12:34:60 AM` | Hour-minute-second format in 12-hour clocks. Same to `%I:%M:%S %p`.   |
+|       |          |                                                                            |
+|       |          | **TIME ZONE SPECIFIERS:**                                                  |
+| `%Z`  | `ACST`   | *Formatting only:* Local time zone name.                                   |
+| `%z`  | `+0930`  | Offset from the local time to UTC (with UTC being `+0000`).                |
+| `%:z` | `+09:30` | Same to `%z` but with a colon.                                             |
+| `%#z` | `+09`    | *Parsing only:* Same to `%z` but allows minutes to be missing or present.  |
+|       |          |                                                                            |
+|       |          | **DATE & TIME SPECIFIERS:**                                                |
+|`%c`|`Sun Jul  8 00:34:60 2001`|`ctime` date & time format. Same to `%a %b %e %T %Y` sans `\n`.|
+| `%+`  | `2001-07-08T00:34:60.026490+09:30` | ISO 8601 / RFC 3339 date & time format. [6]      |
+|       |               |                                                                       |
+| `%s`  | `994518299`   | UNIX timestamp, the number of seconds since 1970-01-01 00:00 UTC. [7] |
+|       |          |                                                                            |
+|       |          | **SPECIAL SPECIFIERS:**                                                    |
+| `%t`  |          | Literal tab (`\t`).                                                        |
+| `%n`  |          | Literal newline (`\n`).                                                    |
+| `%%`  |          | Literal percent sign.                                                      |
+
+It is possible to override the default padding behavior of numeric specifiers `%?`.
+This is not allowed for other specifiers and will result in the `BAD_FORMAT` error.
+
+Modifier | Description
+-------- | -----------
+`%-?`    | Suppresses any padding including spaces and zeroes. (e.g. `%j` = `012`, `%-j` = `12`)
+`%_?`    | Uses spaces as a padding. (e.g. `%j` = `012`, `%_j` = ` 12`)
+`%0?`    | Uses zeroes as a padding. (e.g. `%e` = ` 9`, `%0e` = `09`)
+
+Notes:
+
+1. `%Y`:
+   Negative years are allowed in formatting but not in parsing.
+
+2. `%C`, `%y`:
+   This is floor division, so 100 BCE (year number -99) will print `-1` and `99` respectively.
+
+3. `%U`:
+   Week 1 starts with the first Sunday in that year.
+   It is possible to have week 0 for days before the first Sunday.
+
+4. `%G`, `%g`, `%V`:
+   Week 1 is the first week with at least 4 days in that year.
+   Week 0 does not exist, so this should be used with `%G` or `%g`.
+
+5. `%S`:
+   It accounts for leap seconds, so `60` is possible.
+
+6. `%+`:
+   Same to `%Y-%m-%dT%H:%M:%S%.f%:z`,
+   i.e. 0, 3, 6 or 9 fractional digits for seconds and colons in the time zone offset.
+
+   The typical `strftime` implementations have
+   different (and locale-dependent) formats for this specifier.
+   While Chrono's format for `%+` is far more stable,
+   it is best to avoid this specifier if you want to control the exact output.
+
+7. `%s`:
+   This is not padded and can be negative.
+   For the purpose of Chrono, it only accounts for non-leap seconds
+   so it slightly differs from ISO C `strftime` behavior.
+
+8. `%f`, `%.f`, `%.3f`, `%.6f`, `%.9f`, `%3f`, `%6f`, `%9f`:
+
+   The default `%f` is right-aligned and always zero-padded to 9 digits
+   for the compatibility with glibc and others,
+   so it always counts the number of nanoseconds since the last whole second.
+   E.g. 7ms after the last second will print `007000000`,
+   and parsing `7000000` will yield the same.
+
+   The variant `%.f` is left-aligned and print 0, 3, 6 or 9 fractional digits
+   according to the precision.
+   E.g. 70ms after the last second under `%.f` will print `.070` (note: not `.07`),
+   and parsing `.07`, `.070000` etc. will yield the same.
+   Note that they can print or read nothing if the fractional part is zero or
+   the next character is not `.`.
+
+   The variant `%.3f`, `%.6f` and `%.9f` are left-aligned and print 3, 6 or 9 fractional digits
+   according to the number preceding `f`.
+   E.g. 70ms after the last second under `%.3f` will print `.070` (note: not `.07`),
+   and parsing `.07`, `.070000` etc. will yield the same.
+   Note that they can read nothing if the fractional part is zero or
+   the next character is not `.` however will print with the specified length.
+
+   The variant `%3f`, `%6f` and `%9f` are left-aligned and print 3, 6 or 9 fractional digits
+   according to the number preceding `f`, but without the leading dot.
+   E.g. 70ms after the last second under `%3f` will print `070` (note: not `07`),
+   and parsing `07`, `070000` etc. will yield the same.
+   Note that they can read nothing if the fractional part is zero.
+
+*/
+
+use super::{Item, Numeric, Fixed, InternalFixed, InternalInternal, Pad};
+
+/// Parsing iterator for `strftime`-like format strings.
+#[derive(Clone, Debug)]
+pub struct StrftimeItems<'a> {
+    /// Remaining portion of the string.
+    remainder: &'a str,
+    /// If the current specifier is composed of multiple formatting items (e.g. `%+`),
+    /// parser refers to the statically reconstructed slice of them.
+    /// If `recons` is not empty they have to be returned earlier than the `remainder`.
+    recons: &'static [Item<'static>],
+}
+
+impl<'a> StrftimeItems<'a> {
+    /// Creates a new parsing iterator from the `strftime`-like format string.
+    pub fn new(s: &'a str) -> StrftimeItems<'a> {
+        static FMT_NONE: [Item<'static>; 0] = [];
+        StrftimeItems { remainder: s, recons: &FMT_NONE }
+    }
+}
+
+const HAVE_ALTERNATES: &'static str = "z";
+
+impl<'a> Iterator for StrftimeItems<'a> {
+    type Item = Item<'a>;
+
+    fn next(&mut self) -> Option<Item<'a>> {
+        // we have some reconstructed items to return
+        if !self.recons.is_empty() {
+            let item = self.recons[0].clone();
+            self.recons = &self.recons[1..];
+            return Some(item);
+        }
+
+        match self.remainder.chars().next() {
+            // we are done
+            None => None,
+
+            // the next item is a specifier
+            Some('%') => {
+                self.remainder = &self.remainder[1..];
+
+                macro_rules! next {
+                    () => (
+                        match self.remainder.chars().next() {
+                            Some(x) => {
+                                self.remainder = &self.remainder[x.len_utf8()..];
+                                x
+                            },
+                            None => return Some(Item::Error), // premature end of string
+                        }
+                    )
+                }
+
+                let spec = next!();
+                let pad_override = match spec {
+                    '-' => Some(Pad::None),
+                    '0' => Some(Pad::Zero),
+                    '_' => Some(Pad::Space),
+                    _ => None,
+                };
+                let is_alternate = spec == '#';
+                let spec = if pad_override.is_some() || is_alternate { next!() } else { spec };
+                if is_alternate && !HAVE_ALTERNATES.contains(spec) {
+                    return Some(Item::Error);
+                }
+
+                macro_rules! recons {
+                    [$head:expr, $($tail:expr),+] => ({
+                        const RECONS: &'static [Item<'static>] = &[$($tail),+];
+                        self.recons = RECONS;
+                        $head
+                    })
+                }
+
+                let item = match spec {
+                    'A' => fix!(LongWeekdayName),
+                    'B' => fix!(LongMonthName),
+                    'C' => num0!(YearDiv100),
+                    'D' => recons![num0!(Month), lit!("/"), num0!(Day), lit!("/"),
+                                   num0!(YearMod100)],
+                    'F' => recons![num0!(Year), lit!("-"), num0!(Month), lit!("-"), num0!(Day)],
+                    'G' => num0!(IsoYear),
+                    'H' => num0!(Hour),
+                    'I' => num0!(Hour12),
+                    'M' => num0!(Minute),
+                    'P' => fix!(LowerAmPm),
+                    'R' => recons![num0!(Hour), lit!(":"), num0!(Minute)],
+                    'S' => num0!(Second),
+                    'T' => recons![num0!(Hour), lit!(":"), num0!(Minute), lit!(":"), num0!(Second)],
+                    'U' => num0!(WeekFromSun),
+                    'V' => num0!(IsoWeek),
+                    'W' => num0!(WeekFromMon),
+                    'X' => recons![num0!(Hour), lit!(":"), num0!(Minute), lit!(":"), num0!(Second)],
+                    'Y' => num0!(Year),
+                    'Z' => fix!(TimezoneName),
+                    'a' => fix!(ShortWeekdayName),
+                    'b' | 'h' => fix!(ShortMonthName),
+                    'c' => recons![fix!(ShortWeekdayName), sp!(" "), fix!(ShortMonthName),
+                                   sp!(" "), nums!(Day), sp!(" "), num0!(Hour), lit!(":"),
+                                   num0!(Minute), lit!(":"), num0!(Second), sp!(" "), num0!(Year)],
+                    'd' => num0!(Day),
+                    'e' => nums!(Day),
+                    'f' => num0!(Nanosecond),
+                    'g' => num0!(IsoYearMod100),
+                    'j' => num0!(Ordinal),
+                    'k' => nums!(Hour),
+                    'l' => nums!(Hour12),
+                    'm' => num0!(Month),
+                    'n' => sp!("\n"),
+                    'p' => fix!(UpperAmPm),
+                    'r' => recons![num0!(Hour12), lit!(":"), num0!(Minute), lit!(":"),
+                                   num0!(Second), sp!(" "), fix!(UpperAmPm)],
+                    's' => num!(Timestamp),
+                    't' => sp!("\t"),
+                    'u' => num!(WeekdayFromMon),
+                    'v' => recons![nums!(Day), lit!("-"), fix!(ShortMonthName), lit!("-"),
+                                   num0!(Year)],
+                    'w' => num!(NumDaysFromSun),
+                    'x' => recons![num0!(Month), lit!("/"), num0!(Day), lit!("/"),
+                                   num0!(YearMod100)],
+                    'y' => num0!(YearMod100),
+                    'z' => if is_alternate {
+                        internal_fix!(TimezoneOffsetPermissive)
+                    } else {
+                        fix!(TimezoneOffset)
+                    },
+                    '+' => fix!(RFC3339),
+                    ':' => match next!() {
+                        'z' => fix!(TimezoneOffsetColon),
+                        _ => Item::Error,
+                    },
+                    '.' => match next!() {
+                        '3' => match next!() {
+                            'f' => fix!(Nanosecond3),
+                            _ => Item::Error,
+                        },
+                        '6' => match next!() {
+                            'f' => fix!(Nanosecond6),
+                            _ => Item::Error,
+                        },
+                        '9' => match next!() {
+                            'f' => fix!(Nanosecond9),
+                            _ => Item::Error,
+                        },
+                        'f' => fix!(Nanosecond),
+                        _ => Item::Error,
+                    },
+                    '3' => match next!() {
+                        'f' => internal_fix!(Nanosecond3NoDot),
+                        _ => Item::Error,
+                    },
+                    '6' => match next!() {
+                        'f' => internal_fix!(Nanosecond6NoDot),
+                        _ => Item::Error,
+                    },
+                    '9' => match next!() {
+                        'f' => internal_fix!(Nanosecond9NoDot),
+                        _ => Item::Error,
+                    },
+                    '%' => lit!("%"),
+                    _ => Item::Error, // no such specifier
+                };
+
+                // adjust `item` if we have any padding modifier
+                if let Some(new_pad) = pad_override {
+                    match item {
+                        Item::Numeric(ref kind, _pad) if self.recons.is_empty() =>
+                            Some(Item::Numeric(kind.clone(), new_pad)),
+                        _ => Some(Item::Error), // no reconstructed or non-numeric item allowed
+                    }
+                } else {
+                    Some(item)
+                }
+            },
+
+            // the next item is space
+            Some(c) if c.is_whitespace() => {
+                // `%` is not a whitespace, so `c != '%'` is redundant
+                let nextspec = self.remainder.find(|c: char| !c.is_whitespace())
+                                             .unwrap_or_else(|| self.remainder.len());
+                assert!(nextspec > 0);
+                let item = sp!(&self.remainder[..nextspec]);
+                self.remainder = &self.remainder[nextspec..];
+                Some(item)
+            },
+
+            // the next item is literal
+            _ => {
+                let nextspec = self.remainder.find(|c: char| c.is_whitespace() || c == '%')
+                                             .unwrap_or_else(|| self.remainder.len());
+                assert!(nextspec > 0);
+                let item = lit!(&self.remainder[..nextspec]);
+                self.remainder = &self.remainder[nextspec..];
+                Some(item)
+            },
+        }
+    }
+}
+
+#[cfg(test)]
+#[test]
+fn test_strftime_items() {
+    fn parse_and_collect<'a>(s: &'a str) -> Vec<Item<'a>> {
+        // map any error into `[Item::Error]`. useful for easy testing.
+        let items = StrftimeItems::new(s);
+        let items = items.map(|spec| if spec == Item::Error {None} else {Some(spec)});
+        items.collect::<Option<Vec<_>>>().unwrap_or(vec![Item::Error])
+    }
+
+    assert_eq!(parse_and_collect(""), []);
+    assert_eq!(parse_and_collect(" \t\n\r "), [sp!(" \t\n\r ")]);
+    assert_eq!(parse_and_collect("hello?"), [lit!("hello?")]);
+    assert_eq!(parse_and_collect("a  b\t\nc"), [lit!("a"), sp!("  "), lit!("b"), sp!("\t\n"),
+                                                lit!("c")]);
+    assert_eq!(parse_and_collect("100%%"), [lit!("100"), lit!("%")]);
+    assert_eq!(parse_and_collect("100%% ok"), [lit!("100"), lit!("%"), sp!(" "), lit!("ok")]);
+    assert_eq!(parse_and_collect("%%PDF-1.0"), [lit!("%"), lit!("PDF-1.0")]);
+    assert_eq!(parse_and_collect("%Y-%m-%d"), [num0!(Year), lit!("-"), num0!(Month), lit!("-"),
+                                               num0!(Day)]);
+    assert_eq!(parse_and_collect("[%F]"), parse_and_collect("[%Y-%m-%d]"));
+    assert_eq!(parse_and_collect("%m %d"), [num0!(Month), sp!(" "), num0!(Day)]);
+    assert_eq!(parse_and_collect("%"), [Item::Error]);
+    assert_eq!(parse_and_collect("%%"), [lit!("%")]);
+    assert_eq!(parse_and_collect("%%%"), [Item::Error]);
+    assert_eq!(parse_and_collect("%%%%"), [lit!("%"), lit!("%")]);
+    assert_eq!(parse_and_collect("foo%?"), [Item::Error]);
+    assert_eq!(parse_and_collect("bar%42"), [Item::Error]);
+    assert_eq!(parse_and_collect("quux% +"), [Item::Error]);
+    assert_eq!(parse_and_collect("%.Z"), [Item::Error]);
+    assert_eq!(parse_and_collect("%:Z"), [Item::Error]);
+    assert_eq!(parse_and_collect("%-Z"), [Item::Error]);
+    assert_eq!(parse_and_collect("%0Z"), [Item::Error]);
+    assert_eq!(parse_and_collect("%_Z"), [Item::Error]);
+    assert_eq!(parse_and_collect("%.j"), [Item::Error]);
+    assert_eq!(parse_and_collect("%:j"), [Item::Error]);
+    assert_eq!(parse_and_collect("%-j"), [num!(Ordinal)]);
+    assert_eq!(parse_and_collect("%0j"), [num0!(Ordinal)]);
+    assert_eq!(parse_and_collect("%_j"), [nums!(Ordinal)]);
+    assert_eq!(parse_and_collect("%.e"), [Item::Error]);
+    assert_eq!(parse_and_collect("%:e"), [Item::Error]);
+    assert_eq!(parse_and_collect("%-e"), [num!(Day)]);
+    assert_eq!(parse_and_collect("%0e"), [num0!(Day)]);
+    assert_eq!(parse_and_collect("%_e"), [nums!(Day)]);
+    assert_eq!(parse_and_collect("%z"), [fix!(TimezoneOffset)]);
+    assert_eq!(parse_and_collect("%#z"), [internal_fix!(TimezoneOffsetPermissive)]);
+    assert_eq!(parse_and_collect("%#m"), [Item::Error]);
+}
+
+#[cfg(test)]
+#[test]
+fn test_strftime_docs() {
+    use {FixedOffset, TimeZone, Timelike};
+
+    let dt = FixedOffset::east(34200).ymd(2001, 7, 8).and_hms_nano(0, 34, 59, 1_026_490_708);
+
+    // date specifiers
+    assert_eq!(dt.format("%Y").to_string(), "2001");
+    assert_eq!(dt.format("%C").to_string(), "20");
+    assert_eq!(dt.format("%y").to_string(), "01");
+    assert_eq!(dt.format("%m").to_string(), "07");
+    assert_eq!(dt.format("%b").to_string(), "Jul");
+    assert_eq!(dt.format("%B").to_string(), "July");
+    assert_eq!(dt.format("%h").to_string(), "Jul");
+    assert_eq!(dt.format("%d").to_string(), "08");
+    assert_eq!(dt.format("%e").to_string(), " 8");
+    assert_eq!(dt.format("%e").to_string(), dt.format("%_d").to_string());
+    assert_eq!(dt.format("%a").to_string(), "Sun");
+    assert_eq!(dt.format("%A").to_string(), "Sunday");
+    assert_eq!(dt.format("%w").to_string(), "0");
+    assert_eq!(dt.format("%u").to_string(), "7");
+    assert_eq!(dt.format("%U").to_string(), "28");
+    assert_eq!(dt.format("%W").to_string(), "27");
+    assert_eq!(dt.format("%G").to_string(), "2001");
+    assert_eq!(dt.format("%g").to_string(), "01");
+    assert_eq!(dt.format("%V").to_string(), "27");
+    assert_eq!(dt.format("%j").to_string(), "189");
+    assert_eq!(dt.format("%D").to_string(), "07/08/01");
+    assert_eq!(dt.format("%x").to_string(), "07/08/01");
+    assert_eq!(dt.format("%F").to_string(), "2001-07-08");
+    assert_eq!(dt.format("%v").to_string(), " 8-Jul-2001");
+
+    // time specifiers
+    assert_eq!(dt.format("%H").to_string(), "00");
+    assert_eq!(dt.format("%k").to_string(), " 0");
+    assert_eq!(dt.format("%k").to_string(), dt.format("%_H").to_string());
+    assert_eq!(dt.format("%I").to_string(), "12");
+    assert_eq!(dt.format("%l").to_string(), "12");
+    assert_eq!(dt.format("%l").to_string(), dt.format("%_I").to_string());
+    assert_eq!(dt.format("%P").to_string(), "am");
+    assert_eq!(dt.format("%p").to_string(), "AM");
+    assert_eq!(dt.format("%M").to_string(), "34");
+    assert_eq!(dt.format("%S").to_string(), "60");
+    assert_eq!(dt.format("%f").to_string(), "026490708");
+    assert_eq!(dt.format("%.f").to_string(), ".026490708");
+    assert_eq!(dt.with_nanosecond(1_026_490_000).unwrap().format("%.f").to_string(),
+               ".026490");
+    assert_eq!(dt.format("%.3f").to_string(), ".026");
+    assert_eq!(dt.format("%.6f").to_string(), ".026490");
+    assert_eq!(dt.format("%.9f").to_string(), ".026490708");
+    assert_eq!(dt.format("%3f").to_string(), "026");
+    assert_eq!(dt.format("%6f").to_string(), "026490");
+    assert_eq!(dt.format("%9f").to_string(), "026490708");
+    assert_eq!(dt.format("%R").to_string(), "00:34");
+    assert_eq!(dt.format("%T").to_string(), "00:34:60");
+    assert_eq!(dt.format("%X").to_string(), "00:34:60");
+    assert_eq!(dt.format("%r").to_string(), "12:34:60 AM");
+
+    // time zone specifiers
+    //assert_eq!(dt.format("%Z").to_string(), "ACST");
+    assert_eq!(dt.format("%z").to_string(), "+0930");
+    assert_eq!(dt.format("%:z").to_string(), "+09:30");
+
+    // date & time specifiers
+    assert_eq!(dt.format("%c").to_string(), "Sun Jul  8 00:34:60 2001");
+    assert_eq!(dt.format("%+").to_string(), "2001-07-08T00:34:60.026490708+09:30");
+    assert_eq!(dt.with_nanosecond(1_026_490_000).unwrap().format("%+").to_string(),
+               "2001-07-08T00:34:60.026490+09:30");
+    assert_eq!(dt.format("%s").to_string(), "994518299");
+
+    // special specifiers
+    assert_eq!(dt.format("%t").to_string(), "\t");
+    assert_eq!(dt.format("%n").to_string(), "\n");
+    assert_eq!(dt.format("%%").to_string(), "%");
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/lib.rs cargo-0.33.0/vendor/chrono/src/lib.rs
--- cargo-0.32.0/vendor/chrono/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,994 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! # Chrono: Date and Time for Rust
+//!
+//! It aims to be a feature-complete superset of
+//! the [time](https://github.com/rust-lang-deprecated/time) library.
+//! In particular,
+//!
+//! * Chrono strictly adheres to ISO 8601.
+//! * Chrono is timezone-aware by default, with separate timezone-naive types.
+//! * Chrono is space-optimal and (while not being the primary goal) reasonably efficient.
+//!
+//! There were several previous attempts to bring a good date and time library to Rust,
+//! which Chrono builds upon and should acknowledge:
+//!
+//! * [Initial research on
+//!    the wiki](https://github.com/rust-lang/rust-wiki-backup/blob/master/Lib-datetime.md)
+//! * Dietrich Epp's [datetime-rs](https://github.com/depp/datetime-rs)
+//! * Luis de Bethencourt's [rust-datetime](https://github.com/luisbg/rust-datetime)
+//!
+//! Any significant changes to Chrono are documented in
+//! the [`CHANGELOG.md`](https://github.com/chronotope/chrono/blob/master/CHANGELOG.md) file.
+//!
+//! ## Usage
+//!
+//! Put this in your `Cargo.toml`:
+//!
+//! ```toml
+//! [dependencies]
+//! chrono = "0.4"
+//! ```
+//!
+//! Or, if you want [Serde](https://github.com/serde-rs/serde) include the
+//! feature like this:
+//!
+//! ```toml
+//! [dependencies]
+//! chrono = { version = "0.4", features = ["serde"] }
+//! ```
+//!
+//! Then put this in your crate root:
+//!
+//! ```rust
+//! extern crate chrono;
+//! ```
+//!
+//! Avoid using `use chrono::*;` as Chrono exports several modules other than types.
+//! If you prefer the glob imports, use the following instead:
+//!
+//! ```rust
+//! use chrono::prelude::*;
+//! ```
+//!
+//! ## Overview
+//!
+//! ### Duration
+//!
+//! Chrono currently uses
+//! the [`time::Duration`](https://docs.rs/time/0.1.40/time/struct.Duration.html) type
+//! from the `time` crate to represent the magnitude of a time span.
+//! Since this has the same name to the newer, standard type for duration,
+//! the reference will refer this type as `OldDuration`.
+//! Note that this is an "accurate" duration represented as seconds and
+//! nanoseconds and does not represent "nominal" components such as days or
+//! months.
+//!
+//! Chrono does not yet natively support
+//! the standard [`Duration`](https://docs.rs/time/0.1.40/time/struct.Duration.html) type,
+//! but it will be supported in the future.
+//! Meanwhile you can convert between two types with
+//! [`Duration::from_std`](https://docs.rs/time/0.1.40/time/struct.Duration.html#method.from_std)
+//! and
+//! [`Duration::to_std`](https://docs.rs/time/0.1.40/time/struct.Duration.html#method.to_std)
+//! methods.
+//!
+//! ### Date and Time
+//!
+//! Chrono provides a
+//! [**`DateTime`**](./struct.DateTime.html)
+//! type to represent a date and a time in a timezone.
+//!
+//! For more abstract moment-in-time tracking such as internal timekeeping
+//! that is unconcerned with timezones, consider
+//! [`time::SystemTime`](https://doc.rust-lang.org/std/time/struct.SystemTime.html),
+//! which tracks your system clock, or
+//! [`time::Instant`](https://doc.rust-lang.org/std/time/struct.Instant.html), which
+//! is an opaque but monotonically-increasing representation of a moment in time.
+//!
+//! `DateTime` is timezone-aware and must be constructed from
+//! the [**`TimeZone`**](./offset/trait.TimeZone.html) object,
+//! which defines how the local date is converted to and back from the UTC date.
+//! There are three well-known `TimeZone` implementations:
+//!
+//! * [**`Utc`**](./offset/struct.Utc.html) specifies the UTC time zone. It is most efficient.
+//!
+//! * [**`Local`**](./offset/struct.Local.html) specifies the system local time zone.
+//!
+//! * [**`FixedOffset`**](./offset/struct.FixedOffset.html) specifies
+//!   an arbitrary, fixed time zone such as UTC+09:00 or UTC-10:30.
+//!   This often results from the parsed textual date and time.
+//!   Since it stores the most information and does not depend on the system environment,
+//!   you would want to normalize other `TimeZone`s into this type.
+//!
+//! `DateTime`s with different `TimeZone` types are distinct and do not mix,
+//! but can be converted to each other using
+//! the [`DateTime::with_timezone`](./struct.DateTime.html#method.with_timezone) method.
+//!
+//! You can get the current date and time in the UTC time zone
+//! ([`Utc::now()`](./offset/struct.Utc.html#method.now))
+//! or in the local time zone
+//! ([`Local::now()`](./offset/struct.Local.html#method.now)).
+//!
+//! ```rust
+//! use chrono::prelude::*;
+//!
+//! let utc: DateTime<Utc> = Utc::now();       // e.g. `2014-11-28T12:45:59.324310806Z`
+//! let local: DateTime<Local> = Local::now(); // e.g. `2014-11-28T21:45:59.324310806+09:00`
+//! # let _ = utc; let _ = local;
+//! ```
+//!
+//! Alternatively, you can create your own date and time.
+//! This is a bit verbose due to Rust's lack of function and method overloading,
+//! but in turn we get a rich combination of initialization methods.
+//!
+//! ```rust
+//! use chrono::prelude::*;
+//! use chrono::offset::LocalResult;
+//!
+//! let dt = Utc.ymd(2014, 7, 8).and_hms(9, 10, 11); // `2014-07-08T09:10:11Z`
+//! // July 8 is 188th day of the year 2014 (`o` for "ordinal")
+//! assert_eq!(dt, Utc.yo(2014, 189).and_hms(9, 10, 11));
+//! // July 8 is Tuesday in ISO week 28 of the year 2014.
+//! assert_eq!(dt, Utc.isoywd(2014, 28, Weekday::Tue).and_hms(9, 10, 11));
+//!
+//! let dt = Utc.ymd(2014, 7, 8).and_hms_milli(9, 10, 11, 12); // `2014-07-08T09:10:11.012Z`
+//! assert_eq!(dt, Utc.ymd(2014, 7, 8).and_hms_micro(9, 10, 11, 12_000));
+//! assert_eq!(dt, Utc.ymd(2014, 7, 8).and_hms_nano(9, 10, 11, 12_000_000));
+//!
+//! // dynamic verification
+//! assert_eq!(Utc.ymd_opt(2014, 7, 8).and_hms_opt(21, 15, 33),
+//!            LocalResult::Single(Utc.ymd(2014, 7, 8).and_hms(21, 15, 33)));
+//! assert_eq!(Utc.ymd_opt(2014, 7, 8).and_hms_opt(80, 15, 33), LocalResult::None);
+//! assert_eq!(Utc.ymd_opt(2014, 7, 38).and_hms_opt(21, 15, 33), LocalResult::None);
+//!
+//! // other time zone objects can be used to construct a local datetime.
+//! // obviously, `local_dt` is normally different from `dt`, but `fixed_dt` should be identical.
+//! let local_dt = Local.ymd(2014, 7, 8).and_hms_milli(9, 10, 11, 12);
+//! let fixed_dt = FixedOffset::east(9 * 3600).ymd(2014, 7, 8).and_hms_milli(18, 10, 11, 12);
+//! assert_eq!(dt, fixed_dt);
+//! # let _ = local_dt;
+//! ```
+//!
+//! Various properties are available to the date and time, and can be altered individually.
+//! Most of them are defined in the traits [`Datelike`](./trait.Datelike.html) and
+//! [`Timelike`](./trait.Timelike.html) which you should `use` before.
+//! Addition and subtraction is also supported.
+//! The following illustrates most supported operations to the date and time:
+//!
+//! ```rust
+//! # extern crate chrono; extern crate time; fn main() {
+//! use chrono::prelude::*;
+//! use time::Duration;
+//!
+//! # /* we intentionally fake the datetime...
+//! // assume this returned `2014-11-28T21:45:59.324310806+09:00`:
+//! let dt = Local::now();
+//! # */ // up to here. we now define a fixed datetime for the illustrative purpose.
+//! # let dt = FixedOffset::east(9*3600).ymd(2014, 11, 28).and_hms_nano(21, 45, 59, 324310806);
+//!
+//! // property accessors
+//! assert_eq!((dt.year(), dt.month(), dt.day()), (2014, 11, 28));
+//! assert_eq!((dt.month0(), dt.day0()), (10, 27)); // for unfortunate souls
+//! assert_eq!((dt.hour(), dt.minute(), dt.second()), (21, 45, 59));
+//! assert_eq!(dt.weekday(), Weekday::Fri);
+//! assert_eq!(dt.weekday().number_from_monday(), 5); // Mon=1, ..., Sat=7
+//! assert_eq!(dt.ordinal(), 332); // the day of year
+//! assert_eq!(dt.num_days_from_ce(), 735565); // the number of days from and including Jan 1, 1
+//!
+//! // time zone accessor and manipulation
+//! assert_eq!(dt.offset().fix().local_minus_utc(), 9 * 3600);
+//! assert_eq!(dt.timezone(), FixedOffset::east(9 * 3600));
+//! assert_eq!(dt.with_timezone(&Utc), Utc.ymd(2014, 11, 28).and_hms_nano(12, 45, 59, 324310806));
+//!
+//! // a sample of property manipulations (validates dynamically)
+//! assert_eq!(dt.with_day(29).unwrap().weekday(), Weekday::Sat); // 2014-11-29 is Saturday
+//! assert_eq!(dt.with_day(32), None);
+//! assert_eq!(dt.with_year(-300).unwrap().num_days_from_ce(), -109606); // November 29, 301 BCE
+//!
+//! // arithmetic operations
+//! let dt1 = Utc.ymd(2014, 11, 14).and_hms(8, 9, 10);
+//! let dt2 = Utc.ymd(2014, 11, 14).and_hms(10, 9, 8);
+//! assert_eq!(dt1.signed_duration_since(dt2), Duration::seconds(-2 * 3600 + 2));
+//! assert_eq!(dt2.signed_duration_since(dt1), Duration::seconds(2 * 3600 - 2));
+//! assert_eq!(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0) + Duration::seconds(1_000_000_000),
+//!            Utc.ymd(2001, 9, 9).and_hms(1, 46, 40));
+//! assert_eq!(Utc.ymd(1970, 1, 1).and_hms(0, 0, 0) - Duration::seconds(1_000_000_000),
+//!            Utc.ymd(1938, 4, 24).and_hms(22, 13, 20));
+//! # }
+//! ```
+//!
+//! ### Formatting and Parsing
+//!
+//! Formatting is done via the [`format`](./struct.DateTime.html#method.format) method,
+//! which format is equivalent to the familiar `strftime` format.
+//!
+//! See [`format::strftime`](./format/strftime/index.html#specifiers)
+//! documentation for full syntax and list of specifiers.
+//!
+//! The default `to_string` method and `{:?}` specifier also give a reasonable representation.
+//! Chrono also provides [`to_rfc2822`](./struct.DateTime.html#method.to_rfc2822) and
+//! [`to_rfc3339`](./struct.DateTime.html#method.to_rfc3339) methods
+//! for well-known formats.
+//!
+//! ```rust
+//! use chrono::prelude::*;
+//!
+//! let dt = Utc.ymd(2014, 11, 28).and_hms(12, 0, 9);
+//! assert_eq!(dt.format("%Y-%m-%d %H:%M:%S").to_string(), "2014-11-28 12:00:09");
+//! assert_eq!(dt.format("%a %b %e %T %Y").to_string(), "Fri Nov 28 12:00:09 2014");
+//! assert_eq!(dt.format("%a %b %e %T %Y").to_string(), dt.format("%c").to_string());
+//!
+//! assert_eq!(dt.to_string(), "2014-11-28 12:00:09 UTC");
+//! assert_eq!(dt.to_rfc2822(), "Fri, 28 Nov 2014 12:00:09 +0000");
+//! assert_eq!(dt.to_rfc3339(), "2014-11-28T12:00:09+00:00");
+//! assert_eq!(format!("{:?}", dt), "2014-11-28T12:00:09Z");
+//!
+//! // Note that milli/nanoseconds are only printed if they are non-zero
+//! let dt_nano = Utc.ymd(2014, 11, 28).and_hms_nano(12, 0, 9, 1);
+//! assert_eq!(format!("{:?}", dt_nano), "2014-11-28T12:00:09.000000001Z");
+//! ```
+//!
+//! Parsing can be done with three methods:
+//!
+//! 1. The standard [`FromStr`](https://doc.rust-lang.org/std/str/trait.FromStr.html) trait
+//!    (and [`parse`](https://doc.rust-lang.org/std/primitive.str.html#method.parse) method
+//!    on a string) can be used for parsing `DateTime<FixedOffset>`, `DateTime<Utc>` and
+//!    `DateTime<Local>` values. This parses what the `{:?}`
+//!    ([`std::fmt::Debug`](https://doc.rust-lang.org/std/fmt/trait.Debug.html))
+//!    format specifier prints, and requires the offset to be present.
+//!
+//! 2. [`DateTime::parse_from_str`](./struct.DateTime.html#method.parse_from_str) parses
+//!    a date and time with offsets and returns `DateTime<FixedOffset>`.
+//!    This should be used when the offset is a part of input and the caller cannot guess that.
+//!    It *cannot* be used when the offset can be missing.
+//!    [`DateTime::parse_from_rfc2822`](./struct.DateTime.html#method.parse_from_rfc2822)
+//!    and
+//!    [`DateTime::parse_from_rfc3339`](./struct.DateTime.html#method.parse_from_rfc3339)
+//!    are similar but for well-known formats.
+//!
+//! 3. [`Offset::datetime_from_str`](./offset/trait.TimeZone.html#method.datetime_from_str) is
+//!    similar but returns `DateTime` of given offset.
+//!    When the explicit offset is missing from the input, it simply uses given offset.
+//!    It issues an error when the input contains an explicit offset different
+//!    from the current offset.
+//!
+//! More detailed control over the parsing process is available via
+//! [`format`](./format/index.html) module.
+//!
+//! ```rust
+//! use chrono::prelude::*;
+//!
+//! let dt = Utc.ymd(2014, 11, 28).and_hms(12, 0, 9);
+//! let fixed_dt = dt.with_timezone(&FixedOffset::east(9*3600));
+//!
+//! // method 1
+//! assert_eq!("2014-11-28T12:00:09Z".parse::<DateTime<Utc>>(), Ok(dt.clone()));
+//! assert_eq!("2014-11-28T21:00:09+09:00".parse::<DateTime<Utc>>(), Ok(dt.clone()));
+//! assert_eq!("2014-11-28T21:00:09+09:00".parse::<DateTime<FixedOffset>>(), Ok(fixed_dt.clone()));
+//!
+//! // method 2
+//! assert_eq!(DateTime::parse_from_str("2014-11-28 21:00:09 +09:00", "%Y-%m-%d %H:%M:%S %z"),
+//!            Ok(fixed_dt.clone()));
+//! assert_eq!(DateTime::parse_from_rfc2822("Fri, 28 Nov 2014 21:00:09 +0900"),
+//!            Ok(fixed_dt.clone()));
+//! assert_eq!(DateTime::parse_from_rfc3339("2014-11-28T21:00:09+09:00"), Ok(fixed_dt.clone()));
+//!
+//! // method 3
+//! assert_eq!(Utc.datetime_from_str("2014-11-28 12:00:09", "%Y-%m-%d %H:%M:%S"), Ok(dt.clone()));
+//! assert_eq!(Utc.datetime_from_str("Fri Nov 28 12:00:09 2014", "%a %b %e %T %Y"), Ok(dt.clone()));
+//!
+//! // oops, the year is missing!
+//! assert!(Utc.datetime_from_str("Fri Nov 28 12:00:09", "%a %b %e %T %Y").is_err());
+//! // oops, the format string does not include the year at all!
+//! assert!(Utc.datetime_from_str("Fri Nov 28 12:00:09", "%a %b %e %T").is_err());
+//! // oops, the weekday is incorrect!
+//! assert!(Utc.datetime_from_str("Sat Nov 28 12:00:09 2014", "%a %b %e %T %Y").is_err());
+//! ```
+//!
+//! Again : See [`format::strftime`](./format/strftime/index.html#specifiers)
+//! documentation for full syntax and list of specifiers.
+//!
+//! ### Conversion from and to EPOCH timestamps
+//!
+//! Use [`Utc.timestamp(seconds, nanoseconds)`](./offset/trait.TimeZone.html#method.timestamp)
+//! to construct a [`DateTime<Utc>`](./struct.DateTime.html) from a UNIX timestamp
+//! (seconds, nanoseconds that passed since January 1st 1970).
+//!
+//! Use [`DateTime.timestamp`](./struct.DateTime.html#method.timestamp) to get the timestamp (in seconds)
+//! from a [`DateTime`](./struct.DateTime.html). Additionally, you can use
+//! [`DateTime.timestamp_subsec_nanos`](./struct.DateTime.html#method.timestamp_subsec_nanos)
+//! to get the number of additional number of nanoseconds.
+//!
+//! ```rust
+//! # use chrono::DateTime;
+//! # use chrono::Utc;
+//! // We need the trait in scope to use Utc::timestamp().
+//! use chrono::TimeZone;
+//!
+//! // Construct a datetime from epoch:
+//! let dt = Utc.timestamp(1_500_000_000, 0);
+//! assert_eq!(dt.to_rfc2822(), "Fri, 14 Jul 2017 02:40:00 +0000");
+//!
+//! // Get epoch value from a datetime:
+//! let dt = DateTime::parse_from_rfc2822("Fri, 14 Jul 2017 02:40:00 +0000").unwrap();
+//! assert_eq!(dt.timestamp(), 1_500_000_000);
+//! ```
+//!
+//! ### Individual date
+//!
+//! Chrono also provides an individual date type ([**`Date`**](./struct.Date.html)).
+//! It also has time zones attached, and have to be constructed via time zones.
+//! Most operations available to `DateTime` are also available to `Date` whenever appropriate.
+//!
+//! ```rust
+//! use chrono::prelude::*;
+//! use chrono::offset::LocalResult;
+//!
+//! # // these *may* fail, but only very rarely. just rerun the test if you were that unfortunate ;)
+//! assert_eq!(Utc::today(), Utc::now().date());
+//! assert_eq!(Local::today(), Local::now().date());
+//!
+//! assert_eq!(Utc.ymd(2014, 11, 28).weekday(), Weekday::Fri);
+//! assert_eq!(Utc.ymd_opt(2014, 11, 31), LocalResult::None);
+//! assert_eq!(Utc.ymd(2014, 11, 28).and_hms_milli(7, 8, 9, 10).format("%H%M%S").to_string(),
+//!            "070809");
+//! ```
+//!
+//! There is no timezone-aware `Time` due to the lack of usefulness and also the complexity.
+//!
+//! `DateTime` has [`date`](./struct.DateTime.html#method.date) method
+//! which returns a `Date` which represents its date component.
+//! There is also a [`time`](./struct.DateTime.html#method.time) method,
+//! which simply returns a naive local time described below.
+//!
+//! ### Naive date and time
+//!
+//! Chrono provides naive counterparts to `Date`, (non-existent) `Time` and `DateTime`
+//! as [**`NaiveDate`**](./naive/struct.NaiveDate.html),
+//! [**`NaiveTime`**](./naive/struct.NaiveTime.html) and
+//! [**`NaiveDateTime`**](./naive/struct.NaiveDateTime.html) respectively.
+//!
+//! They have almost equivalent interfaces as their timezone-aware twins,
+//! but are not associated to time zones obviously and can be quite low-level.
+//! They are mostly useful for building blocks for higher-level types.
+//!
+//! Timezone-aware `DateTime` and `Date` types have two methods returning naive versions:
+//! [`naive_local`](./struct.DateTime.html#method.naive_local) returns
+//! a view to the naive local time,
+//! and [`naive_utc`](./struct.DateTime.html#method.naive_utc) returns
+//! a view to the naive UTC time.
+//!
+//! ## Limitations
+//!
+//! Only proleptic Gregorian calendar (i.e. extended to support older dates) is supported.
+//! Be very careful if you really have to deal with pre-20C dates, they can be in Julian or others.
+//!
+//! Date types are limited in about +/- 262,000 years from the common epoch.
+//! Time types are limited in the nanosecond accuracy.
+//!
+//! [Leap seconds are supported in the representation but
+//! Chrono doesn't try to make use of them](./naive/struct.NaiveTime.html#leap-second-handling).
+//! (The main reason is that leap seconds are not really predictable.)
+//! Almost *every* operation over the possible leap seconds will ignore them.
+//! Consider using `NaiveDateTime` with the implicit TAI (International Atomic Time) scale
+//! if you want.
+//!
+//! Chrono inherently does not support an inaccurate or partial date and time representation.
+//! Any operation that can be ambiguous will return `None` in such cases.
+//! For example, "a month later" of 2014-01-30 is not well-defined
+//! and consequently `Utc.ymd(2014, 1, 30).with_month(2)` returns `None`.
+//!
+//! Advanced time zone handling is not yet supported.
+//! For now you can try the [Chrono-tz](https://github.com/chronotope/chrono-tz/) crate instead.
+
+#![doc(html_root_url = "https://docs.rs/chrono/latest/")]
+
+#![cfg_attr(bench, feature(test))] // lib stability features as per RFC #507
+#![deny(missing_docs)]
+#![deny(missing_debug_implementations)]
+
+// The explicit 'static lifetimes are still needed for rustc 1.13-16
+// backward compatibility, and this appeases clippy. If minimum rustc
+// becomes 1.17, should be able to remove this, those 'static lifetimes,
+// and use `static` in a lot of places `const` is used now.
+//
+// Similarly, redundant_field_names lints on not using the
+// field-init-shorthand, which was stabilized in rust 1.17.
+//
+// Changing trivially_copy_pass_by_ref would require an incompatible version
+// bump.
+#![cfg_attr(feature = "cargo-clippy", allow(
+    const_static_lifetime,
+    redundant_field_names,
+    trivially_copy_pass_by_ref,
+))]
+
+#[cfg(feature="clock")]
+extern crate time as oldtime;
+extern crate num_integer;
+extern crate num_traits;
+#[cfg(feature = "rustc-serialize")]
+extern crate rustc_serialize;
+#[cfg(feature = "serde")]
+extern crate serde as serdelib;
+
+// this reexport is to aid the transition and should not be in the prelude!
+pub use oldtime::Duration;
+
+#[cfg(feature="clock")]
+#[doc(no_inline)] pub use offset::Local;
+#[doc(no_inline)] pub use offset::{TimeZone, Offset, LocalResult, Utc, FixedOffset};
+#[doc(no_inline)] pub use naive::{NaiveDate, IsoWeek, NaiveTime, NaiveDateTime};
+pub use date::{Date, MIN_DATE, MAX_DATE};
+pub use datetime::{DateTime, SecondsFormat};
+#[cfg(feature = "rustc-serialize")]
+pub use datetime::rustc_serialize::TsSeconds;
+pub use format::{ParseError, ParseResult};
+pub use round::SubsecRound;
+
+/// A convenience module appropriate for glob imports (`use chrono::prelude::*;`).
+pub mod prelude {
+    #[doc(no_inline)] pub use {Datelike, Timelike, Weekday};
+    #[doc(no_inline)] pub use {TimeZone, Offset};
+    #[cfg(feature="clock")]
+    #[doc(no_inline)] pub use Local;
+    #[doc(no_inline)] pub use {Utc, FixedOffset};
+    #[doc(no_inline)] pub use {NaiveDate, NaiveTime, NaiveDateTime};
+    #[doc(no_inline)] pub use Date;
+    #[doc(no_inline)] pub use {DateTime, SecondsFormat};
+    #[doc(no_inline)] pub use SubsecRound;
+}
+
+// useful throughout the codebase
+macro_rules! try_opt {
+    ($e:expr) => (match $e { Some(v) => v, None => return None })
+}
+
+mod div;
+#[cfg(not(feature="clock"))]
+mod oldtime;
+pub mod offset;
+pub mod naive {
+    //! Date and time types which do not concern about the timezones.
+    //!
+    //! They are primarily building blocks for other types
+    //! (e.g. [`TimeZone`](../offset/trait.TimeZone.html)),
+    //! but can be also used for the simpler date and time handling.
+
+    mod internals;
+    mod date;
+    mod isoweek;
+    mod time;
+    mod datetime;
+
+    pub use self::date::{NaiveDate, MIN_DATE, MAX_DATE};
+    pub use self::isoweek::IsoWeek;
+    pub use self::time::NaiveTime;
+    pub use self::datetime::NaiveDateTime;
+    #[cfg(feature = "rustc-serialize")]
+    #[allow(deprecated)]
+    pub use self::datetime::rustc_serialize::TsSeconds;
+
+
+    /// Serialization/Deserialization of naive types in alternate formats
+    ///
+    /// The various modules in here are intended to be used with serde's [`with`
+    /// annotation][1] to serialize as something other than the default [RFC
+    /// 3339][2] format.
+    ///
+    /// [1]: https://serde.rs/attributes.html#field-attributes
+    /// [2]: https://tools.ietf.org/html/rfc3339
+    #[cfg(feature = "serde")]
+    pub mod serde {
+        pub use super::datetime::serde::*;
+    }
+}
+mod date;
+mod datetime;
+pub mod format;
+mod round;
+
+/// Serialization/Deserialization in alternate formats
+///
+/// The various modules in here are intended to be used with serde's [`with`
+/// annotation][1] to serialize as something other than the default [RFC
+/// 3339][2] format.
+///
+/// [1]: https://serde.rs/attributes.html#field-attributes
+/// [2]: https://tools.ietf.org/html/rfc3339
+#[cfg(feature = "serde")]
+pub mod serde {
+    pub use super::datetime::serde::*;
+}
+
+/// The day of week.
+///
+/// The order of the days of week depends on the context.
+/// (This is why this type does *not* implement `PartialOrd` or `Ord` traits.)
+/// One should prefer `*_from_monday` or `*_from_sunday` methods to get the correct result.
+#[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)]
+#[cfg_attr(feature = "rustc-serialize", derive(RustcEncodable, RustcDecodable))]
+pub enum Weekday {
+    /// Monday.
+    Mon = 0,
+    /// Tuesday.
+    Tue = 1,
+    /// Wednesday.
+    Wed = 2,
+    /// Thursday.
+    Thu = 3,
+    /// Friday.
+    Fri = 4,
+    /// Saturday.
+    Sat = 5,
+    /// Sunday.
+    Sun = 6,
+}
+
+impl Weekday {
+    /// The next day in the week.
+    ///
+    /// `w`:        | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun`
+    /// ----------- | ----- | ----- | ----- | ----- | ----- | ----- | -----
+    /// `w.succ()`: | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun` | `Mon`
+    #[inline]
+    pub fn succ(&self) -> Weekday {
+        match *self {
+            Weekday::Mon => Weekday::Tue,
+            Weekday::Tue => Weekday::Wed,
+            Weekday::Wed => Weekday::Thu,
+            Weekday::Thu => Weekday::Fri,
+            Weekday::Fri => Weekday::Sat,
+            Weekday::Sat => Weekday::Sun,
+            Weekday::Sun => Weekday::Mon,
+        }
+    }
+
+    /// The previous day in the week.
+    ///
+    /// `w`:        | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun`
+    /// ----------- | ----- | ----- | ----- | ----- | ----- | ----- | -----
+    /// `w.pred()`: | `Sun` | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat`
+    #[inline]
+    pub fn pred(&self) -> Weekday {
+        match *self {
+            Weekday::Mon => Weekday::Sun,
+            Weekday::Tue => Weekday::Mon,
+            Weekday::Wed => Weekday::Tue,
+            Weekday::Thu => Weekday::Wed,
+            Weekday::Fri => Weekday::Thu,
+            Weekday::Sat => Weekday::Fri,
+            Weekday::Sun => Weekday::Sat,
+        }
+    }
+
+    /// Returns a day-of-week number starting from Monday = 1. (ISO 8601 weekday number)
+    ///
+    /// `w`:                      | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun`
+    /// ------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | -----
+    /// `w.number_from_monday()`: | 1     | 2     | 3     | 4     | 5     | 6     | 7
+    #[inline]
+    pub fn number_from_monday(&self) -> u32 {
+        match *self {
+            Weekday::Mon => 1,
+            Weekday::Tue => 2,
+            Weekday::Wed => 3,
+            Weekday::Thu => 4,
+            Weekday::Fri => 5,
+            Weekday::Sat => 6,
+            Weekday::Sun => 7,
+        }
+    }
+
+    /// Returns a day-of-week number starting from Sunday = 1.
+    ///
+    /// `w`:                      | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun`
+    /// ------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | -----
+    /// `w.number_from_sunday()`: | 2     | 3     | 4     | 5     | 6     | 7     | 1
+    #[inline]
+    pub fn number_from_sunday(&self) -> u32 {
+        match *self {
+            Weekday::Mon => 2,
+            Weekday::Tue => 3,
+            Weekday::Wed => 4,
+            Weekday::Thu => 5,
+            Weekday::Fri => 6,
+            Weekday::Sat => 7,
+            Weekday::Sun => 1,
+        }
+    }
+
+    /// Returns a day-of-week number starting from Monday = 0.
+    ///
+    /// `w`:                        | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun`
+    /// --------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | -----
+    /// `w.num_days_from_monday()`: | 0     | 1     | 2     | 3     | 4     | 5     | 6
+    #[inline]
+    pub fn num_days_from_monday(&self) -> u32 {
+        match *self {
+            Weekday::Mon => 0,
+            Weekday::Tue => 1,
+            Weekday::Wed => 2,
+            Weekday::Thu => 3,
+            Weekday::Fri => 4,
+            Weekday::Sat => 5,
+            Weekday::Sun => 6,
+        }
+    }
+
+    /// Returns a day-of-week number starting from Sunday = 0.
+    ///
+    /// `w`:                        | `Mon` | `Tue` | `Wed` | `Thu` | `Fri` | `Sat` | `Sun`
+    /// --------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | -----
+    /// `w.num_days_from_sunday()`: | 1     | 2     | 3     | 4     | 5     | 6     | 0
+    #[inline]
+    pub fn num_days_from_sunday(&self) -> u32 {
+        match *self {
+            Weekday::Mon => 1,
+            Weekday::Tue => 2,
+            Weekday::Wed => 3,
+            Weekday::Thu => 4,
+            Weekday::Fri => 5,
+            Weekday::Sat => 6,
+            Weekday::Sun => 0,
+        }
+    }
+}
+
+/// Any weekday can be represented as an integer from 0 to 6, which equals to
+/// [`Weekday::num_days_from_monday`](#method.num_days_from_monday) in this implementation.
+/// Do not heavily depend on this though; use explicit methods whenever possible.
+impl num_traits::FromPrimitive for Weekday {
+    #[inline]
+    fn from_i64(n: i64) -> Option<Weekday> {
+        match n {
+            0 => Some(Weekday::Mon),
+            1 => Some(Weekday::Tue),
+            2 => Some(Weekday::Wed),
+            3 => Some(Weekday::Thu),
+            4 => Some(Weekday::Fri),
+            5 => Some(Weekday::Sat),
+            6 => Some(Weekday::Sun),
+            _ => None,
+        }
+    }
+
+    #[inline]
+    fn from_u64(n: u64) -> Option<Weekday> {
+        match n {
+            0 => Some(Weekday::Mon),
+            1 => Some(Weekday::Tue),
+            2 => Some(Weekday::Wed),
+            3 => Some(Weekday::Thu),
+            4 => Some(Weekday::Fri),
+            5 => Some(Weekday::Sat),
+            6 => Some(Weekday::Sun),
+            _ => None,
+        }
+    }
+}
+
+use std::fmt;
+
+/// An error resulting from reading `Weekday` value with `FromStr`.
+#[derive(Clone, PartialEq)]
+pub struct ParseWeekdayError {
+    _dummy: (),
+}
+
+impl fmt::Debug for ParseWeekdayError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "ParseWeekdayError {{ .. }}")
+    }
+}
+
+// the actual `FromStr` implementation is in the `format` module to leverage the existing code
+
+#[cfg(feature = "serde")]
+mod weekday_serde {
+    use super::Weekday;
+    use std::fmt;
+    use serdelib::{ser, de};
+
+    impl ser::Serialize for Weekday {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_str(&format!("{:?}", self))
+        }
+    }
+
+    struct WeekdayVisitor;
+
+    impl<'de> de::Visitor<'de> for WeekdayVisitor {
+        type Value = Weekday;
+
+        fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            write!(f, "Weekday")
+        }
+
+        fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+            where E: de::Error
+        {
+            value.parse().map_err(|_| E::custom("short or long weekday names expected"))
+        }
+    }
+
+    impl<'de> de::Deserialize<'de> for Weekday {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(WeekdayVisitor)
+        }
+    }
+
+    #[cfg(test)]
+    extern crate serde_json;
+
+    #[test]
+    fn test_serde_serialize() {
+        use self::serde_json::to_string;
+        use Weekday::*;
+
+        let cases: Vec<(Weekday, &str)> = vec![
+            (Mon, "\"Mon\""),
+            (Tue, "\"Tue\""),
+            (Wed, "\"Wed\""),
+            (Thu, "\"Thu\""),
+            (Fri, "\"Fri\""),
+            (Sat, "\"Sat\""),
+            (Sun, "\"Sun\""),
+        ];
+
+        for (weekday, expected_str) in cases {
+            let string = to_string(&weekday).unwrap();
+            assert_eq!(string, expected_str);
+        }
+    }
+
+    #[test]
+    fn test_serde_deserialize() {
+        use self::serde_json::from_str;
+        use Weekday::*;
+
+        let cases: Vec<(&str, Weekday)> = vec![
+            ("\"mon\"", Mon),
+            ("\"MONDAY\"", Mon),
+            ("\"MonDay\"", Mon),
+            ("\"mOn\"", Mon),
+            ("\"tue\"", Tue),
+            ("\"tuesday\"", Tue),
+            ("\"wed\"", Wed),
+            ("\"wednesday\"", Wed),
+            ("\"thu\"", Thu),
+            ("\"thursday\"", Thu),
+            ("\"fri\"", Fri),
+            ("\"friday\"", Fri),
+            ("\"sat\"", Sat),
+            ("\"saturday\"", Sat),
+            ("\"sun\"", Sun),
+            ("\"sunday\"", Sun),
+        ];
+
+        for (str, expected_weekday) in cases {
+            let weekday = from_str::<Weekday>(str).unwrap();
+            assert_eq!(weekday, expected_weekday);
+        }
+
+        let errors: Vec<&str> = vec![
+            "\"not a weekday\"",
+            "\"monDAYs\"",
+            "\"mond\"",
+            "mon",
+            "\"thur\"",
+            "\"thurs\"",
+        ];
+
+        for str in errors {
+            from_str::<Weekday>(str).unwrap_err();
+        }
+    }
+}
+
+/// The common set of methods for date component.
+pub trait Datelike: Sized {
+    /// Returns the year number in the [calendar date](./naive/struct.NaiveDate.html#calendar-date).
+    fn year(&self) -> i32;
+
+    /// Returns the absolute year number starting from 1 with a boolean flag,
+    /// which is false when the year predates the epoch (BCE/BC) and true otherwise (CE/AD).
+    #[inline]
+    fn year_ce(&self) -> (bool, u32) {
+        let year = self.year();
+        if year < 1 {
+            (false, (1 - year) as u32)
+        } else {
+            (true, year as u32)
+        }
+    }
+
+    /// Returns the month number starting from 1.
+    ///
+    /// The return value ranges from 1 to 12.
+    fn month(&self) -> u32;
+
+    /// Returns the month number starting from 0.
+    ///
+    /// The return value ranges from 0 to 11.
+    fn month0(&self) -> u32;
+
+    /// Returns the day of month starting from 1.
+    ///
+    /// The return value ranges from 1 to 31. (The last day of month differs by months.)
+    fn day(&self) -> u32;
+
+    /// Returns the day of month starting from 0.
+    ///
+    /// The return value ranges from 0 to 30. (The last day of month differs by months.)
+    fn day0(&self) -> u32;
+
+    /// Returns the day of year starting from 1.
+    ///
+    /// The return value ranges from 1 to 366. (The last day of year differs by years.)
+    fn ordinal(&self) -> u32;
+
+    /// Returns the day of year starting from 0.
+    ///
+    /// The return value ranges from 0 to 365. (The last day of year differs by years.)
+    fn ordinal0(&self) -> u32;
+
+    /// Returns the day of week.
+    fn weekday(&self) -> Weekday;
+
+    /// Returns the ISO week.
+    fn iso_week(&self) -> IsoWeek;
+
+    /// Makes a new value with the year number changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_year(&self, year: i32) -> Option<Self>;
+
+    /// Makes a new value with the month number (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_month(&self, month: u32) -> Option<Self>;
+
+    /// Makes a new value with the month number (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_month0(&self, month0: u32) -> Option<Self>;
+
+    /// Makes a new value with the day of month (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_day(&self, day: u32) -> Option<Self>;
+
+    /// Makes a new value with the day of month (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_day0(&self, day0: u32) -> Option<Self>;
+
+    /// Makes a new value with the day of year (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_ordinal(&self, ordinal: u32) -> Option<Self>;
+
+    /// Makes a new value with the day of year (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_ordinal0(&self, ordinal0: u32) -> Option<Self>;
+
+    /// Returns the number of days since January 1, Year 1 (aka Day 1) in the
+    /// proleptic Gregorian calendar.
+    ///
+    /// # Example:
+    ///
+    /// ~~~
+    /// use chrono::{NaiveDate, Datelike};
+    /// assert_eq!(NaiveDate::from_ymd(1970, 1, 1).num_days_from_ce(), 719163);
+    /// assert_eq!(NaiveDate::from_ymd(0, 1, 1).num_days_from_ce(), -365);
+    /// ~~~
+    fn num_days_from_ce(&self) -> i32 {
+        // we know this wouldn't overflow since year is limited to 1/2^13 of i32's full range.
+        let mut year = self.year() - 1;
+        let mut ndays = 0;
+        if year < 0 {
+            let excess = 1 + (-year) / 400;
+            year += excess * 400;
+            ndays -= excess * 146_097;
+        }
+        let div_100 = year / 100;
+        ndays += ((year * 1461) >> 2) - div_100 + (div_100 >> 2);
+        ndays + self.ordinal() as i32
+    }
+}
+
+/// The common set of methods for time component.
+pub trait Timelike: Sized {
+    /// Returns the hour number from 0 to 23.
+    fn hour(&self) -> u32;
+
+    /// Returns the hour number from 1 to 12 with a boolean flag,
+    /// which is false for AM and true for PM.
+    #[inline]
+    fn hour12(&self) -> (bool, u32) {
+        let hour = self.hour();
+        let mut hour12 = hour % 12;
+        if hour12 == 0 {
+            hour12 = 12;
+        }
+        (hour >= 12, hour12)
+    }
+
+    /// Returns the minute number from 0 to 59.
+    fn minute(&self) -> u32;
+
+    /// Returns the second number from 0 to 59.
+    fn second(&self) -> u32;
+
+    /// Returns the number of nanoseconds since the whole non-leap second.
+    /// The range from 1,000,000,000 to 1,999,999,999 represents
+    /// the [leap second](./naive/struct.NaiveTime.html#leap-second-handling).
+    fn nanosecond(&self) -> u32;
+
+    /// Makes a new value with the hour number changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_hour(&self, hour: u32) -> Option<Self>;
+
+    /// Makes a new value with the minute number changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    fn with_minute(&self, min: u32) -> Option<Self>;
+
+    /// Makes a new value with the second number changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    /// As with the [`second`](#tymethod.second) method,
+    /// the input range is restricted to 0 through 59.
+    fn with_second(&self, sec: u32) -> Option<Self>;
+
+    /// Makes a new value with nanoseconds since the whole non-leap second changed.
+    ///
+    /// Returns `None` when the resulting value would be invalid.
+    /// As with the [`nanosecond`](#tymethod.nanosecond) method,
+    /// the input range can exceed 1,000,000,000 for leap seconds.
+    fn with_nanosecond(&self, nano: u32) -> Option<Self>;
+
+    /// Returns the number of non-leap seconds past the last midnight.
+    #[inline]
+    fn num_seconds_from_midnight(&self) -> u32 {
+        self.hour() * 3600 + self.minute() * 60 + self.second()
+    }
+}
+
+#[cfg(test)] extern crate num_iter;
+
+#[test]
+fn test_readme_doomsday() {
+    use num_iter::range_inclusive;
+
+    for y in range_inclusive(naive::MIN_DATE.year(), naive::MAX_DATE.year()) {
+        // even months
+        let d4 = NaiveDate::from_ymd(y, 4, 4);
+        let d6 = NaiveDate::from_ymd(y, 6, 6);
+        let d8 = NaiveDate::from_ymd(y, 8, 8);
+        let d10 = NaiveDate::from_ymd(y, 10, 10);
+        let d12 = NaiveDate::from_ymd(y, 12, 12);
+
+        // nine to five, seven-eleven
+        let d59 = NaiveDate::from_ymd(y, 5, 9);
+        let d95 = NaiveDate::from_ymd(y, 9, 5);
+        let d711 = NaiveDate::from_ymd(y, 7, 11);
+        let d117 = NaiveDate::from_ymd(y, 11, 7);
+
+        // "March 0"
+        let d30 = NaiveDate::from_ymd(y, 3, 1).pred();
+
+        let weekday = d30.weekday();
+        let other_dates = [d4, d6, d8, d10, d12, d59, d95, d711, d117];
+        assert!(other_dates.iter().all(|d| d.weekday() == weekday));
+    }
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/naive/date.rs cargo-0.33.0/vendor/chrono/src/naive/date.rs
--- cargo-0.32.0/vendor/chrono/src/naive/date.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/naive/date.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,2121 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! ISO 8601 calendar date without timezone.
+
+use std::{str, fmt};
+use std::ops::{Add, Sub, AddAssign, SubAssign};
+use num_traits::ToPrimitive;
+use oldtime::Duration as OldDuration;
+
+use {Weekday, Datelike};
+use div::div_mod_floor;
+use naive::{NaiveTime, NaiveDateTime, IsoWeek};
+use format::{Item, Numeric, Pad};
+use format::{parse, Parsed, ParseError, ParseResult, DelayedFormat, StrftimeItems};
+
+use super::isoweek;
+use super::internals::{self, DateImpl, Of, Mdf, YearFlags};
+
+const MAX_YEAR: i32 = internals::MAX_YEAR;
+const MIN_YEAR: i32 = internals::MIN_YEAR;
+
+//   MAX_YEAR-12-31 minus 0000-01-01
+// = ((MAX_YEAR+1)-01-01 minus 0001-01-01) + (0001-01-01 minus 0000-01-01) - 1 day
+// = ((MAX_YEAR+1)-01-01 minus 0001-01-01) + 365 days
+// = MAX_YEAR * 365 + (# of leap years from 0001 to MAX_YEAR) + 365 days
+#[cfg(test)] // only used for testing
+const MAX_DAYS_FROM_YEAR_0: i32 = MAX_YEAR * 365 +
+                                  MAX_YEAR / 4 -
+                                  MAX_YEAR / 100 +
+                                  MAX_YEAR / 400 + 365;
+
+//   MIN_YEAR-01-01 minus 0000-01-01
+// = (MIN_YEAR+400n+1)-01-01 minus (400n+1)-01-01
+// = ((MIN_YEAR+400n+1)-01-01 minus 0001-01-01) - ((400n+1)-01-01 minus 0001-01-01)
+// = ((MIN_YEAR+400n+1)-01-01 minus 0001-01-01) - 146097n days
+//
+// n is set to 1000 for convenience.
+#[cfg(test)] // only used for testing
+const MIN_DAYS_FROM_YEAR_0: i32 = (MIN_YEAR + 400_000) * 365 +
+                                  (MIN_YEAR + 400_000) / 4 -
+                                  (MIN_YEAR + 400_000) / 100 +
+                                  (MIN_YEAR + 400_000) / 400 - 146097_000;
+
+#[cfg(test)] // only used for testing, but duplicated in naive::datetime
+const MAX_BITS: usize = 44;
+
+/// ISO 8601 calendar date without timezone.
+/// Allows for every [proleptic Gregorian date](#calendar-date)
+/// from Jan 1, 262145 BCE to Dec 31, 262143 CE.
+/// Also supports the conversion from ISO 8601 ordinal and week date.
+///
+/// # Calendar Date
+///
+/// The ISO 8601 **calendar date** follows the proleptic Gregorian calendar.
+/// It is like a normal civil calendar but note some slight differences:
+///
+/// * Dates before the Gregorian calendar's inception in 1582 are defined via the extrapolation.
+///   Be careful, as historical dates are often noted in the Julian calendar and others
+///   and the transition to Gregorian may differ across countries (as late as early 20C).
+///
+///   (Some example: Both Shakespeare from Britain and Cervantes from Spain seemingly died
+///   on the same calendar date---April 23, 1616---but in the different calendar.
+///   Britain used the Julian calendar at that time, so Shakespeare's death is later.)
+///
+/// * ISO 8601 calendars has the year 0, which is 1 BCE (a year before 1 CE).
+///   If you need a typical BCE/BC and CE/AD notation for year numbers,
+///   use the [`Datelike::year_ce`](../trait.Datelike.html#method.year_ce) method.
+///
+/// # Week Date
+///
+/// The ISO 8601 **week date** is a triple of year number, week number
+/// and [day of the week](../enum.Weekday.html) with the following rules:
+///
+/// * A week consists of Monday through Sunday, and is always numbered within some year.
+///   The week number ranges from 1 to 52 or 53 depending on the year.
+///
+/// * The week 1 of given year is defined as the first week containing January 4 of that year,
+///   or equivalently, the first week containing four or more days in that year.
+///
+/// * The year number in the week date may *not* correspond to the actual Gregorian year.
+///   For example, January 3, 2016 (Sunday) was on the last (53rd) week of 2015.
+///
+/// Chrono's date types default to the ISO 8601 [calendar date](#calendar-date),
+/// but [`Datelike::iso_week`](../trait.Datelike.html#tymethod.iso_week) and
+/// [`Datelike::weekday`](../trait.Datelike.html#tymethod.weekday) methods
+/// can be used to get the corresponding week date.
+///
+/// # Ordinal Date
+///
+/// The ISO 8601 **ordinal date** is a pair of year number and day of the year ("ordinal").
+/// The ordinal number ranges from 1 to 365 or 366 depending on the year.
+/// The year number is same to that of the [calendar date](#calendar-date).
+///
+/// This is currently the internal format of Chrono's date types.
+#[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)]
+pub struct NaiveDate {
+    ymdf: DateImpl, // (year << 13) | of
+}
+
+/// The minimum possible `NaiveDate` (January 1, 262145 BCE).
+pub const MIN_DATE: NaiveDate = NaiveDate { ymdf: (MIN_YEAR << 13) | (1 << 4) | 0o07 /*FE*/ };
+/// The maximum possible `NaiveDate` (December 31, 262143 CE).
+pub const MAX_DATE: NaiveDate = NaiveDate { ymdf: (MAX_YEAR << 13) | (365 << 4) | 0o17 /*F*/ };
+
+// as it is hard to verify year flags in `MIN_DATE` and `MAX_DATE`,
+// we use a separate run-time test.
+#[test]
+fn test_date_bounds() {
+    let calculated_min = NaiveDate::from_ymd(MIN_YEAR, 1, 1);
+    let calculated_max = NaiveDate::from_ymd(MAX_YEAR, 12, 31);
+    assert!(MIN_DATE == calculated_min,
+            "`MIN_DATE` should have a year flag {:?}", calculated_min.of().flags());
+    assert!(MAX_DATE == calculated_max,
+            "`MAX_DATE` should have a year flag {:?}", calculated_max.of().flags());
+
+    // let's also check that the entire range do not exceed 2^44 seconds
+    // (sometimes used for bounding `Duration` against overflow)
+    let maxsecs = MAX_DATE.signed_duration_since(MIN_DATE).num_seconds();
+    let maxsecs = maxsecs + 86401; // also take care of DateTime
+    assert!(maxsecs < (1 << MAX_BITS),
+            "The entire `NaiveDate` range somehow exceeds 2^{} seconds", MAX_BITS);
+}
+
+impl NaiveDate {
+    /// Makes a new `NaiveDate` from year and packed ordinal-flags, with a verification.
+    fn from_of(year: i32, of: Of) -> Option<NaiveDate> {
+        if year >= MIN_YEAR && year <= MAX_YEAR && of.valid() {
+            let Of(of) = of;
+            Some(NaiveDate { ymdf: (year << 13) | (of as DateImpl) })
+        } else {
+            None
+        }
+    }
+
+    /// Makes a new `NaiveDate` from year and packed month-day-flags, with a verification.
+    fn from_mdf(year: i32, mdf: Mdf) -> Option<NaiveDate> {
+        NaiveDate::from_of(year, mdf.to_of())
+    }
+
+    /// Makes a new `NaiveDate` from the [calendar date](#calendar-date)
+    /// (year, month and day).
+    ///
+    /// Panics on the out-of-range date, invalid month and/or day.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 3, 14);
+    /// assert_eq!(d.year(), 2015);
+    /// assert_eq!(d.month(), 3);
+    /// assert_eq!(d.day(), 14);
+    /// assert_eq!(d.ordinal(), 73); // day of year
+    /// assert_eq!(d.iso_week().year(), 2015);
+    /// assert_eq!(d.iso_week().week(), 11);
+    /// assert_eq!(d.weekday(), Weekday::Sat);
+    /// assert_eq!(d.num_days_from_ce(), 735671); // days since January 1, 1 CE
+    /// ~~~~
+    pub fn from_ymd(year: i32, month: u32, day: u32) -> NaiveDate {
+        NaiveDate::from_ymd_opt(year, month, day).expect("invalid or out-of-range date")
+    }
+
+    /// Makes a new `NaiveDate` from the [calendar date](#calendar-date)
+    /// (year, month and day).
+    ///
+    /// Returns `None` on the out-of-range date, invalid month and/or day.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let from_ymd_opt = NaiveDate::from_ymd_opt;
+    ///
+    /// assert!(from_ymd_opt(2015, 3, 14).is_some());
+    /// assert!(from_ymd_opt(2015, 0, 14).is_none());
+    /// assert!(from_ymd_opt(2015, 2, 29).is_none());
+    /// assert!(from_ymd_opt(-4, 2, 29).is_some()); // 5 BCE is a leap year
+    /// assert!(from_ymd_opt(400000, 1, 1).is_none());
+    /// assert!(from_ymd_opt(-400000, 1, 1).is_none());
+    /// ~~~~
+    pub fn from_ymd_opt(year: i32, month: u32, day: u32) -> Option<NaiveDate> {
+        let flags = YearFlags::from_year(year);
+        NaiveDate::from_mdf(year, Mdf::new(month, day, flags))
+    }
+
+    /// Makes a new `NaiveDate` from the [ordinal date](#ordinal-date)
+    /// (year and day of the year).
+    ///
+    /// Panics on the out-of-range date and/or invalid day of year.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_yo(2015, 73);
+    /// assert_eq!(d.ordinal(), 73);
+    /// assert_eq!(d.year(), 2015);
+    /// assert_eq!(d.month(), 3);
+    /// assert_eq!(d.day(), 14);
+    /// assert_eq!(d.iso_week().year(), 2015);
+    /// assert_eq!(d.iso_week().week(), 11);
+    /// assert_eq!(d.weekday(), Weekday::Sat);
+    /// assert_eq!(d.num_days_from_ce(), 735671); // days since January 1, 1 CE
+    /// ~~~~
+    pub fn from_yo(year: i32, ordinal: u32) -> NaiveDate {
+        NaiveDate::from_yo_opt(year, ordinal).expect("invalid or out-of-range date")
+    }
+
+    /// Makes a new `NaiveDate` from the [ordinal date](#ordinal-date)
+    /// (year and day of the year).
+    ///
+    /// Returns `None` on the out-of-range date and/or invalid day of year.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let from_yo_opt = NaiveDate::from_yo_opt;
+    ///
+    /// assert!(from_yo_opt(2015, 100).is_some());
+    /// assert!(from_yo_opt(2015, 0).is_none());
+    /// assert!(from_yo_opt(2015, 365).is_some());
+    /// assert!(from_yo_opt(2015, 366).is_none());
+    /// assert!(from_yo_opt(-4, 366).is_some()); // 5 BCE is a leap year
+    /// assert!(from_yo_opt(400000, 1).is_none());
+    /// assert!(from_yo_opt(-400000, 1).is_none());
+    /// ~~~~
+    pub fn from_yo_opt(year: i32, ordinal: u32) -> Option<NaiveDate> {
+        let flags = YearFlags::from_year(year);
+        NaiveDate::from_of(year, Of::new(ordinal, flags))
+    }
+
+    /// Makes a new `NaiveDate` from the [ISO week date](#week-date)
+    /// (year, week number and day of the week).
+    /// The resulting `NaiveDate` may have a different year from the input year.
+    ///
+    /// Panics on the out-of-range date and/or invalid week number.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_isoywd(2015, 11, Weekday::Sat);
+    /// assert_eq!(d.iso_week().year(), 2015);
+    /// assert_eq!(d.iso_week().week(), 11);
+    /// assert_eq!(d.weekday(), Weekday::Sat);
+    /// assert_eq!(d.year(), 2015);
+    /// assert_eq!(d.month(), 3);
+    /// assert_eq!(d.day(), 14);
+    /// assert_eq!(d.ordinal(), 73); // day of year
+    /// assert_eq!(d.num_days_from_ce(), 735671); // days since January 1, 1 CE
+    /// ~~~~
+    pub fn from_isoywd(year: i32, week: u32, weekday: Weekday) -> NaiveDate {
+        NaiveDate::from_isoywd_opt(year, week, weekday).expect("invalid or out-of-range date")
+    }
+
+    /// Makes a new `NaiveDate` from the [ISO week date](#week-date)
+    /// (year, week number and day of the week).
+    /// The resulting `NaiveDate` may have a different year from the input year.
+    ///
+    /// Returns `None` on the out-of-range date and/or invalid week number.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Weekday};
+    ///
+    /// let from_ymd = NaiveDate::from_ymd;
+    /// let from_isoywd_opt = NaiveDate::from_isoywd_opt;
+    ///
+    /// assert_eq!(from_isoywd_opt(2015, 0, Weekday::Sun), None);
+    /// assert_eq!(from_isoywd_opt(2015, 10, Weekday::Sun), Some(from_ymd(2015, 3, 8)));
+    /// assert_eq!(from_isoywd_opt(2015, 30, Weekday::Mon), Some(from_ymd(2015, 7, 20)));
+    /// assert_eq!(from_isoywd_opt(2015, 60, Weekday::Mon), None);
+    ///
+    /// assert_eq!(from_isoywd_opt(400000, 10, Weekday::Fri), None);
+    /// assert_eq!(from_isoywd_opt(-400000, 10, Weekday::Sat), None);
+    /// ~~~~
+    ///
+    /// The year number of ISO week date may differ from that of the calendar date.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveDate, Weekday};
+    /// # let from_ymd = NaiveDate::from_ymd;
+    /// # let from_isoywd_opt = NaiveDate::from_isoywd_opt;
+    /// //           Mo Tu We Th Fr Sa Su
+    /// // 2014-W52  22 23 24 25 26 27 28    has 4+ days of new year,
+    /// // 2015-W01  29 30 31  1  2  3  4 <- so this is the first week
+    /// assert_eq!(from_isoywd_opt(2014, 52, Weekday::Sun), Some(from_ymd(2014, 12, 28)));
+    /// assert_eq!(from_isoywd_opt(2014, 53, Weekday::Mon), None);
+    /// assert_eq!(from_isoywd_opt(2015, 1, Weekday::Mon), Some(from_ymd(2014, 12, 29)));
+    ///
+    /// // 2015-W52  21 22 23 24 25 26 27    has 4+ days of old year,
+    /// // 2015-W53  28 29 30 31  1  2  3 <- so this is the last week
+    /// // 2016-W01   4  5  6  7  8  9 10
+    /// assert_eq!(from_isoywd_opt(2015, 52, Weekday::Sun), Some(from_ymd(2015, 12, 27)));
+    /// assert_eq!(from_isoywd_opt(2015, 53, Weekday::Sun), Some(from_ymd(2016, 1, 3)));
+    /// assert_eq!(from_isoywd_opt(2015, 54, Weekday::Mon), None);
+    /// assert_eq!(from_isoywd_opt(2016, 1, Weekday::Mon), Some(from_ymd(2016, 1, 4)));
+    /// ~~~~
+    pub fn from_isoywd_opt(year: i32, week: u32, weekday: Weekday) -> Option<NaiveDate> {
+        let flags = YearFlags::from_year(year);
+        let nweeks = flags.nisoweeks();
+        if 1 <= week && week <= nweeks {
+            // ordinal = week ordinal - delta
+            let weekord = week * 7 + weekday as u32;
+            let delta = flags.isoweek_delta();
+            if weekord <= delta { // ordinal < 1, previous year
+                let prevflags = YearFlags::from_year(year - 1);
+                NaiveDate::from_of(year - 1, Of::new(weekord + prevflags.ndays() - delta,
+                                                     prevflags))
+            } else {
+                let ordinal = weekord - delta;
+                let ndays = flags.ndays();
+                if ordinal <= ndays { // this year
+                    NaiveDate::from_of(year, Of::new(ordinal, flags))
+                } else { // ordinal > ndays, next year
+                    let nextflags = YearFlags::from_year(year + 1);
+                    NaiveDate::from_of(year + 1, Of::new(ordinal - ndays, nextflags))
+                }
+            }
+        } else {
+            None
+        }
+    }
+
+    /// Makes a new `NaiveDate` from the number of days since January 1, 1 (Day 1)
+    /// in the proleptic Gregorian calendar.
+    ///
+    /// Panics on the out-of-range date.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_num_days_from_ce(735671);
+    /// assert_eq!(d.num_days_from_ce(), 735671); // days since January 1, 1 CE
+    /// assert_eq!(d.year(), 2015);
+    /// assert_eq!(d.month(), 3);
+    /// assert_eq!(d.day(), 14);
+    /// assert_eq!(d.ordinal(), 73); // day of year
+    /// assert_eq!(d.iso_week().year(), 2015);
+    /// assert_eq!(d.iso_week().week(), 11);
+    /// assert_eq!(d.weekday(), Weekday::Sat);
+    /// ~~~~
+    ///
+    /// While not directly supported by Chrono,
+    /// it is easy to convert from the Julian day number
+    /// (January 1, 4713 BCE in the *Julian* calendar being Day 0)
+    /// to Gregorian with this method.
+    /// (Note that this panics when `jd` is out of range.)
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// fn jd_to_date(jd: i32) -> NaiveDate {
+    ///     // keep in mind that the Julian day number is 0-based
+    ///     // while this method requires an 1-based number.
+    ///     NaiveDate::from_num_days_from_ce(jd - 1721425)
+    /// }
+    ///
+    /// // January 1, 4713 BCE in Julian = November 24, 4714 BCE in Gregorian
+    /// assert_eq!(jd_to_date(0), NaiveDate::from_ymd(-4713, 11, 24));
+    ///
+    /// assert_eq!(jd_to_date(1721426), NaiveDate::from_ymd(1, 1, 1));
+    /// assert_eq!(jd_to_date(2450000), NaiveDate::from_ymd(1995, 10, 9));
+    /// assert_eq!(jd_to_date(2451545), NaiveDate::from_ymd(2000, 1, 1));
+    /// ~~~~
+    #[inline]
+    pub fn from_num_days_from_ce(days: i32) -> NaiveDate {
+        NaiveDate::from_num_days_from_ce_opt(days).expect("out-of-range date")
+    }
+
+    /// Makes a new `NaiveDate` from the number of days since January 1, 1 (Day 1)
+    /// in the proleptic Gregorian calendar.
+    ///
+    /// Returns `None` on the out-of-range date.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let from_ndays_opt = NaiveDate::from_num_days_from_ce_opt;
+    /// let from_ymd = NaiveDate::from_ymd;
+    ///
+    /// assert_eq!(from_ndays_opt(730_000),      Some(from_ymd(1999, 9, 3)));
+    /// assert_eq!(from_ndays_opt(1),            Some(from_ymd(1, 1, 1)));
+    /// assert_eq!(from_ndays_opt(0),            Some(from_ymd(0, 12, 31)));
+    /// assert_eq!(from_ndays_opt(-1),           Some(from_ymd(0, 12, 30)));
+    /// assert_eq!(from_ndays_opt(100_000_000),  None);
+    /// assert_eq!(from_ndays_opt(-100_000_000), None);
+    /// ~~~~
+    pub fn from_num_days_from_ce_opt(days: i32) -> Option<NaiveDate> {
+        let days = days + 365; // make December 31, 1 BCE equal to day 0
+        let (year_div_400, cycle) = div_mod_floor(days, 146_097);
+        let (year_mod_400, ordinal) = internals::cycle_to_yo(cycle as u32);
+        let flags = YearFlags::from_year_mod_400(year_mod_400 as i32);
+        NaiveDate::from_of(year_div_400 * 400 + year_mod_400 as i32,
+                           Of::new(ordinal, flags))
+    }
+
+    /// Parses a string with the specified format string and returns a new `NaiveDate`.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let parse_from_str = NaiveDate::parse_from_str;
+    ///
+    /// assert_eq!(parse_from_str("2015-09-05", "%Y-%m-%d"),
+    ///            Ok(NaiveDate::from_ymd(2015, 9, 5)));
+    /// assert_eq!(parse_from_str("5sep2015", "%d%b%Y"),
+    ///            Ok(NaiveDate::from_ymd(2015, 9, 5)));
+    /// ~~~~
+    ///
+    /// Time and offset is ignored for the purpose of parsing.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # let parse_from_str = NaiveDate::parse_from_str;
+    /// assert_eq!(parse_from_str("2014-5-17T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+    ///            Ok(NaiveDate::from_ymd(2014, 5, 17)));
+    /// ~~~~
+    ///
+    /// Out-of-bound dates or insufficient fields are errors.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # let parse_from_str = NaiveDate::parse_from_str;
+    /// assert!(parse_from_str("2015/9", "%Y/%m").is_err());
+    /// assert!(parse_from_str("2015/9/31", "%Y/%m/%d").is_err());
+    /// ~~~~
+    ///
+    /// All parsed fields should be consistent to each other, otherwise it's an error.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # let parse_from_str = NaiveDate::parse_from_str;
+    /// assert!(parse_from_str("Sat, 09 Aug 2013", "%a, %d %b %Y").is_err());
+    /// ~~~~
+    pub fn parse_from_str(s: &str, fmt: &str) -> ParseResult<NaiveDate> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, StrftimeItems::new(fmt)));
+        parsed.to_naive_date()
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date and given `NaiveTime`.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveTime, NaiveDateTime};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    /// let t = NaiveTime::from_hms_milli(12, 34, 56, 789);
+    ///
+    /// let dt: NaiveDateTime = d.and_time(t);
+    /// assert_eq!(dt.date(), d);
+    /// assert_eq!(dt.time(), t);
+    /// ~~~~
+    #[inline]
+    pub fn and_time(&self, time: NaiveTime) -> NaiveDateTime {
+        NaiveDateTime::new(*self, time)
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute and second.
+    ///
+    /// No [leap second](./struct.NaiveTime.html#leap-second-handling) is allowed here;
+    /// use `NaiveDate::and_hms_*` methods with a subsecond parameter instead.
+    ///
+    /// Panics on invalid hour, minute and/or second.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike, Timelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    ///
+    /// let dt: NaiveDateTime = d.and_hms(12, 34, 56);
+    /// assert_eq!(dt.year(), 2015);
+    /// assert_eq!(dt.weekday(), Weekday::Wed);
+    /// assert_eq!(dt.second(), 56);
+    /// ~~~~
+    #[inline]
+    pub fn and_hms(&self, hour: u32, min: u32, sec: u32) -> NaiveDateTime {
+        self.and_hms_opt(hour, min, sec).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute and second.
+    ///
+    /// No [leap second](./struct.NaiveTime.html#leap-second-handling) is allowed here;
+    /// use `NaiveDate::and_hms_*_opt` methods with a subsecond parameter instead.
+    ///
+    /// Returns `None` on invalid hour, minute and/or second.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    /// assert!(d.and_hms_opt(12, 34, 56).is_some());
+    /// assert!(d.and_hms_opt(12, 34, 60).is_none()); // use `and_hms_milli_opt` instead
+    /// assert!(d.and_hms_opt(12, 60, 56).is_none());
+    /// assert!(d.and_hms_opt(24, 34, 56).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_opt(&self, hour: u32, min: u32, sec: u32) -> Option<NaiveDateTime> {
+        NaiveTime::from_hms_opt(hour, min, sec).map(|time| self.and_time(time))
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute, second and millisecond.
+    ///
+    /// The millisecond part can exceed 1,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// Panics on invalid hour, minute, second and/or millisecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike, Timelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    ///
+    /// let dt: NaiveDateTime = d.and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.year(), 2015);
+    /// assert_eq!(dt.weekday(), Weekday::Wed);
+    /// assert_eq!(dt.second(), 56);
+    /// assert_eq!(dt.nanosecond(), 789_000_000);
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_milli(&self, hour: u32, min: u32, sec: u32, milli: u32) -> NaiveDateTime {
+        self.and_hms_milli_opt(hour, min, sec, milli).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute, second and millisecond.
+    ///
+    /// The millisecond part can exceed 1,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or millisecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    /// assert!(d.and_hms_milli_opt(12, 34, 56,   789).is_some());
+    /// assert!(d.and_hms_milli_opt(12, 34, 59, 1_789).is_some()); // leap second
+    /// assert!(d.and_hms_milli_opt(12, 34, 59, 2_789).is_none());
+    /// assert!(d.and_hms_milli_opt(12, 34, 60,   789).is_none());
+    /// assert!(d.and_hms_milli_opt(12, 60, 56,   789).is_none());
+    /// assert!(d.and_hms_milli_opt(24, 34, 56,   789).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_milli_opt(&self, hour: u32, min: u32, sec: u32,
+                             milli: u32) -> Option<NaiveDateTime> {
+        NaiveTime::from_hms_milli_opt(hour, min, sec, milli).map(|time| self.and_time(time))
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute, second and microsecond.
+    ///
+    /// The microsecond part can exceed 1,000,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// Panics on invalid hour, minute, second and/or microsecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike, Timelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    ///
+    /// let dt: NaiveDateTime = d.and_hms_micro(12, 34, 56, 789_012);
+    /// assert_eq!(dt.year(), 2015);
+    /// assert_eq!(dt.weekday(), Weekday::Wed);
+    /// assert_eq!(dt.second(), 56);
+    /// assert_eq!(dt.nanosecond(), 789_012_000);
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_micro(&self, hour: u32, min: u32, sec: u32, micro: u32) -> NaiveDateTime {
+        self.and_hms_micro_opt(hour, min, sec, micro).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute, second and microsecond.
+    ///
+    /// The microsecond part can exceed 1,000,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or microsecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    /// assert!(d.and_hms_micro_opt(12, 34, 56,   789_012).is_some());
+    /// assert!(d.and_hms_micro_opt(12, 34, 59, 1_789_012).is_some()); // leap second
+    /// assert!(d.and_hms_micro_opt(12, 34, 59, 2_789_012).is_none());
+    /// assert!(d.and_hms_micro_opt(12, 34, 60,   789_012).is_none());
+    /// assert!(d.and_hms_micro_opt(12, 60, 56,   789_012).is_none());
+    /// assert!(d.and_hms_micro_opt(24, 34, 56,   789_012).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_micro_opt(&self, hour: u32, min: u32, sec: u32,
+                             micro: u32) -> Option<NaiveDateTime> {
+        NaiveTime::from_hms_micro_opt(hour, min, sec, micro).map(|time| self.and_time(time))
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute, second and nanosecond.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// Panics on invalid hour, minute, second and/or nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike, Timelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    ///
+    /// let dt: NaiveDateTime = d.and_hms_nano(12, 34, 56, 789_012_345);
+    /// assert_eq!(dt.year(), 2015);
+    /// assert_eq!(dt.weekday(), Weekday::Wed);
+    /// assert_eq!(dt.second(), 56);
+    /// assert_eq!(dt.nanosecond(), 789_012_345);
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_nano(&self, hour: u32, min: u32, sec: u32, nano: u32) -> NaiveDateTime {
+        self.and_hms_nano_opt(hour, min, sec, nano).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveDateTime` from the current date, hour, minute, second and nanosecond.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    /// assert!(d.and_hms_nano_opt(12, 34, 56,   789_012_345).is_some());
+    /// assert!(d.and_hms_nano_opt(12, 34, 59, 1_789_012_345).is_some()); // leap second
+    /// assert!(d.and_hms_nano_opt(12, 34, 59, 2_789_012_345).is_none());
+    /// assert!(d.and_hms_nano_opt(12, 34, 60,   789_012_345).is_none());
+    /// assert!(d.and_hms_nano_opt(12, 60, 56,   789_012_345).is_none());
+    /// assert!(d.and_hms_nano_opt(24, 34, 56,   789_012_345).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn and_hms_nano_opt(&self, hour: u32, min: u32, sec: u32,
+                            nano: u32) -> Option<NaiveDateTime> {
+        NaiveTime::from_hms_nano_opt(hour, min, sec, nano).map(|time| self.and_time(time))
+    }
+
+    /// Returns the packed month-day-flags.
+    #[inline]
+    fn mdf(&self) -> Mdf {
+        self.of().to_mdf()
+    }
+
+    /// Returns the packed ordinal-flags.
+    #[inline]
+    fn of(&self) -> Of {
+        Of((self.ymdf & 0b1_1111_1111_1111) as u32)
+    }
+
+    /// Makes a new `NaiveDate` with the packed month-day-flags changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    #[inline]
+    fn with_mdf(&self, mdf: Mdf) -> Option<NaiveDate> {
+        self.with_of(mdf.to_of())
+    }
+
+    /// Makes a new `NaiveDate` with the packed ordinal-flags changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    #[inline]
+    fn with_of(&self, of: Of) -> Option<NaiveDate> {
+        if of.valid() {
+            let Of(of) = of;
+            Some(NaiveDate { ymdf: (self.ymdf & !0b1_1111_1111_1111) | of as DateImpl })
+        } else {
+            None
+        }
+    }
+
+    /// Makes a new `NaiveDate` for the next calendar date.
+    ///
+    /// Panics when `self` is the last representable date.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015,  6,  3).succ(), NaiveDate::from_ymd(2015, 6, 4));
+    /// assert_eq!(NaiveDate::from_ymd(2015,  6, 30).succ(), NaiveDate::from_ymd(2015, 7, 1));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 12, 31).succ(), NaiveDate::from_ymd(2016, 1, 1));
+    /// ~~~~
+    #[inline]
+    pub fn succ(&self) -> NaiveDate {
+        self.succ_opt().expect("out of bound")
+    }
+
+    /// Makes a new `NaiveDate` for the next calendar date.
+    ///
+    /// Returns `None` when `self` is the last representable date.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    /// use chrono::naive::MAX_DATE;
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 6, 3).succ_opt(),
+    ///            Some(NaiveDate::from_ymd(2015, 6, 4)));
+    /// assert_eq!(MAX_DATE.succ_opt(), None);
+    /// ~~~~
+    #[inline]
+    pub fn succ_opt(&self) -> Option<NaiveDate> {
+        self.with_of(self.of().succ()).or_else(|| NaiveDate::from_ymd_opt(self.year() + 1, 1, 1))
+    }
+
+    /// Makes a new `NaiveDate` for the previous calendar date.
+    ///
+    /// Panics when `self` is the first representable date.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 6, 3).pred(), NaiveDate::from_ymd(2015,  6,  2));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 6, 1).pred(), NaiveDate::from_ymd(2015,  5, 31));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 1, 1).pred(), NaiveDate::from_ymd(2014, 12, 31));
+    /// ~~~~
+    #[inline]
+    pub fn pred(&self) -> NaiveDate {
+        self.pred_opt().expect("out of bound")
+    }
+
+    /// Makes a new `NaiveDate` for the previous calendar date.
+    ///
+    /// Returns `None` when `self` is the first representable date.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    /// use chrono::naive::MIN_DATE;
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 6, 3).pred_opt(),
+    ///            Some(NaiveDate::from_ymd(2015, 6, 2)));
+    /// assert_eq!(MIN_DATE.pred_opt(), None);
+    /// ~~~~
+    #[inline]
+    pub fn pred_opt(&self) -> Option<NaiveDate> {
+        self.with_of(self.of().pred()).or_else(|| NaiveDate::from_ymd_opt(self.year() - 1, 12, 31))
+    }
+
+    /// Adds the `days` part of given `Duration` to the current date.
+    ///
+    /// Returns `None` when it will result in overflow.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveDate;
+    /// use chrono::naive::MAX_DATE;
+    /// use time::Duration;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 9, 5);
+    /// assert_eq!(d.checked_add_signed(Duration::days(40)),
+    ///            Some(NaiveDate::from_ymd(2015, 10, 15)));
+    /// assert_eq!(d.checked_add_signed(Duration::days(-40)),
+    ///            Some(NaiveDate::from_ymd(2015, 7, 27)));
+    /// assert_eq!(d.checked_add_signed(Duration::days(1_000_000_000)), None);
+    /// assert_eq!(d.checked_add_signed(Duration::days(-1_000_000_000)), None);
+    /// assert_eq!(MAX_DATE.checked_add_signed(Duration::days(1)), None);
+    /// # }
+    /// ~~~~
+    pub fn checked_add_signed(self, rhs: OldDuration) -> Option<NaiveDate> {
+        let year = self.year();
+        let (mut year_div_400, year_mod_400) = div_mod_floor(year, 400);
+        let cycle = internals::yo_to_cycle(year_mod_400 as u32, self.of().ordinal());
+        let cycle = try_opt!((cycle as i32).checked_add(try_opt!(rhs.num_days().to_i32())));
+        let (cycle_div_400y, cycle) = div_mod_floor(cycle, 146_097);
+        year_div_400 += cycle_div_400y;
+
+        let (year_mod_400, ordinal) = internals::cycle_to_yo(cycle as u32);
+        let flags = YearFlags::from_year_mod_400(year_mod_400 as i32);
+        NaiveDate::from_of(year_div_400 * 400 + year_mod_400 as i32,
+                           Of::new(ordinal, flags))
+    }
+
+    /// Subtracts the `days` part of given `Duration` from the current date.
+    ///
+    /// Returns `None` when it will result in overflow.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveDate;
+    /// use chrono::naive::MIN_DATE;
+    /// use time::Duration;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 9, 5);
+    /// assert_eq!(d.checked_sub_signed(Duration::days(40)),
+    ///            Some(NaiveDate::from_ymd(2015, 7, 27)));
+    /// assert_eq!(d.checked_sub_signed(Duration::days(-40)),
+    ///            Some(NaiveDate::from_ymd(2015, 10, 15)));
+    /// assert_eq!(d.checked_sub_signed(Duration::days(1_000_000_000)), None);
+    /// assert_eq!(d.checked_sub_signed(Duration::days(-1_000_000_000)), None);
+    /// assert_eq!(MIN_DATE.checked_sub_signed(Duration::days(1)), None);
+    /// # }
+    /// ~~~~
+    pub fn checked_sub_signed(self, rhs: OldDuration) -> Option<NaiveDate> {
+        let year = self.year();
+        let (mut year_div_400, year_mod_400) = div_mod_floor(year, 400);
+        let cycle = internals::yo_to_cycle(year_mod_400 as u32, self.of().ordinal());
+        let cycle = try_opt!((cycle as i32).checked_sub(try_opt!(rhs.num_days().to_i32())));
+        let (cycle_div_400y, cycle) = div_mod_floor(cycle, 146_097);
+        year_div_400 += cycle_div_400y;
+
+        let (year_mod_400, ordinal) = internals::cycle_to_yo(cycle as u32);
+        let flags = YearFlags::from_year_mod_400(year_mod_400 as i32);
+        NaiveDate::from_of(year_div_400 * 400 + year_mod_400 as i32,
+                           Of::new(ordinal, flags))
+    }
+
+    /// Subtracts another `NaiveDate` from the current date.
+    /// Returns a `Duration` of integral numbers.
+    ///
+    /// This does not overflow or underflow at all,
+    /// as all possible output fits in the range of `Duration`.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveDate;
+    /// use time::Duration;
+    ///
+    /// let from_ymd = NaiveDate::from_ymd;
+    /// let since = NaiveDate::signed_duration_since;
+    ///
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(2014, 1, 1)), Duration::zero());
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(2013, 12, 31)), Duration::days(1));
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(2014, 1, 2)), Duration::days(-1));
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(2013, 9, 23)), Duration::days(100));
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(2013, 1, 1)), Duration::days(365));
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(2010, 1, 1)), Duration::days(365*4 + 1));
+    /// assert_eq!(since(from_ymd(2014, 1, 1), from_ymd(1614, 1, 1)), Duration::days(365*400 + 97));
+    /// # }
+    /// ~~~~
+    pub fn signed_duration_since(self, rhs: NaiveDate) -> OldDuration {
+        let year1 = self.year();
+        let year2 = rhs.year();
+        let (year1_div_400, year1_mod_400) = div_mod_floor(year1, 400);
+        let (year2_div_400, year2_mod_400) = div_mod_floor(year2, 400);
+        let cycle1 = i64::from(internals::yo_to_cycle(year1_mod_400 as u32, self.of().ordinal()));
+        let cycle2 = i64::from(internals::yo_to_cycle(year2_mod_400 as u32, rhs.of().ordinal()));
+        OldDuration::days((i64::from(year1_div_400) - i64::from(year2_div_400)) * 146_097 +
+                          (cycle1 - cycle2))
+    }
+
+    /// Formats the date with the specified formatting items.
+    /// Otherwise it is same to the ordinary `format` method.
+    ///
+    /// The `Iterator` of items should be `Clone`able,
+    /// since the resulting `DelayedFormat` value may be formatted multiple times.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    /// use chrono::format::strftime::StrftimeItems;
+    ///
+    /// let fmt = StrftimeItems::new("%Y-%m-%d");
+    /// let d = NaiveDate::from_ymd(2015, 9, 5);
+    /// assert_eq!(d.format_with_items(fmt.clone()).to_string(), "2015-09-05");
+    /// assert_eq!(d.format("%Y-%m-%d").to_string(),             "2015-09-05");
+    /// ~~~~
+    ///
+    /// The resulting `DelayedFormat` can be formatted directly via the `Display` trait.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # use chrono::format::strftime::StrftimeItems;
+    /// # let fmt = StrftimeItems::new("%Y-%m-%d").clone();
+    /// # let d = NaiveDate::from_ymd(2015, 9, 5);
+    /// assert_eq!(format!("{}", d.format_with_items(fmt)), "2015-09-05");
+    /// ~~~~
+    #[inline]
+    pub fn format_with_items<'a, I>(&self, items: I) -> DelayedFormat<I>
+            where I: Iterator<Item=Item<'a>> + Clone {
+        DelayedFormat::new(Some(*self), None, items)
+    }
+
+    /// Formats the date with the specified format string.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// This returns a `DelayedFormat`,
+    /// which gets converted to a string only when actual formatting happens.
+    /// You may use the `to_string` method to get a `String`,
+    /// or just feed it into `print!` and other formatting macros.
+    /// (In this way it avoids the redundant memory allocation.)
+    ///
+    /// A wrong format string does *not* issue an error immediately.
+    /// Rather, converting or formatting the `DelayedFormat` fails.
+    /// You are recommended to immediately use `DelayedFormat` for this reason.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 9, 5);
+    /// assert_eq!(d.format("%Y-%m-%d").to_string(), "2015-09-05");
+    /// assert_eq!(d.format("%A, %-d %B, %C%y").to_string(), "Saturday, 5 September, 2015");
+    /// ~~~~
+    ///
+    /// The resulting `DelayedFormat` can be formatted directly via the `Display` trait.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # let d = NaiveDate::from_ymd(2015, 9, 5);
+    /// assert_eq!(format!("{}", d.format("%Y-%m-%d")), "2015-09-05");
+    /// assert_eq!(format!("{}", d.format("%A, %-d %B, %C%y")), "Saturday, 5 September, 2015");
+    /// ~~~~
+    #[inline]
+    pub fn format<'a>(&self, fmt: &'a str) -> DelayedFormat<StrftimeItems<'a>> {
+        self.format_with_items(StrftimeItems::new(fmt))
+    }
+}
+
+impl Datelike for NaiveDate {
+    /// Returns the year number in the [calendar date](#calendar-date).
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).year(), 2015);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).year(), -308); // 309 BCE
+    /// ~~~~
+    #[inline]
+    fn year(&self) -> i32 {
+        self.ymdf >> 13
+    }
+
+    /// Returns the month number starting from 1.
+    ///
+    /// The return value ranges from 1 to 12.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).month(), 9);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).month(), 3);
+    /// ~~~~
+    #[inline]
+    fn month(&self) -> u32 {
+        self.mdf().month()
+    }
+
+    /// Returns the month number starting from 0.
+    ///
+    /// The return value ranges from 0 to 11.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).month0(), 8);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).month0(), 2);
+    /// ~~~~
+    #[inline]
+    fn month0(&self) -> u32 {
+        self.mdf().month() - 1
+    }
+
+    /// Returns the day of month starting from 1.
+    ///
+    /// The return value ranges from 1 to 31. (The last day of month differs by months.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).day(), 8);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).day(), 14);
+    /// ~~~~
+    ///
+    /// Combined with [`NaiveDate::pred`](#method.pred),
+    /// one can determine the number of days in a particular month.
+    /// (Note that this panics when `year` is out of range.)
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// fn ndays_in_month(year: i32, month: u32) -> u32 {
+    ///     // the first day of the next month...
+    ///     let (y, m) = if month == 12 { (year + 1, 1) } else { (year, month + 1) };
+    ///     let d = NaiveDate::from_ymd(y, m, 1);
+    ///
+    ///     // ...is preceded by the last day of the original month
+    ///     d.pred().day()
+    /// }
+    ///
+    /// assert_eq!(ndays_in_month(2015, 8), 31);
+    /// assert_eq!(ndays_in_month(2015, 9), 30);
+    /// assert_eq!(ndays_in_month(2015, 12), 31);
+    /// assert_eq!(ndays_in_month(2016, 2), 29);
+    /// assert_eq!(ndays_in_month(2017, 2), 28);
+    /// ~~~~
+    #[inline]
+    fn day(&self) -> u32 {
+        self.mdf().day()
+    }
+
+    /// Returns the day of month starting from 0.
+    ///
+    /// The return value ranges from 0 to 30. (The last day of month differs by months.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).day0(), 7);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).day0(), 13);
+    /// ~~~~
+    #[inline]
+    fn day0(&self) -> u32 {
+        self.mdf().day() - 1
+    }
+
+    /// Returns the day of year starting from 1.
+    ///
+    /// The return value ranges from 1 to 366. (The last day of year differs by years.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).ordinal(), 251);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).ordinal(), 74);
+    /// ~~~~
+    ///
+    /// Combined with [`NaiveDate::pred`](#method.pred),
+    /// one can determine the number of days in a particular year.
+    /// (Note that this panics when `year` is out of range.)
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// fn ndays_in_year(year: i32) -> u32 {
+    ///     // the first day of the next year...
+    ///     let d = NaiveDate::from_ymd(year + 1, 1, 1);
+    ///
+    ///     // ...is preceded by the last day of the original year
+    ///     d.pred().ordinal()
+    /// }
+    ///
+    /// assert_eq!(ndays_in_year(2015), 365);
+    /// assert_eq!(ndays_in_year(2016), 366);
+    /// assert_eq!(ndays_in_year(2017), 365);
+    /// assert_eq!(ndays_in_year(2000), 366);
+    /// assert_eq!(ndays_in_year(2100), 365);
+    /// ~~~~
+    #[inline]
+    fn ordinal(&self) -> u32 {
+        self.of().ordinal()
+    }
+
+    /// Returns the day of year starting from 0.
+    ///
+    /// The return value ranges from 0 to 365. (The last day of year differs by years.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).ordinal0(), 250);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).ordinal0(), 73);
+    /// ~~~~
+    #[inline]
+    fn ordinal0(&self) -> u32 {
+        self.of().ordinal() - 1
+    }
+
+    /// Returns the day of week.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).weekday(), Weekday::Tue);
+    /// assert_eq!(NaiveDate::from_ymd(-308, 3, 14).weekday(), Weekday::Fri);
+    /// ~~~~
+    #[inline]
+    fn weekday(&self) -> Weekday {
+        self.of().weekday()
+    }
+
+    #[inline]
+    fn iso_week(&self) -> IsoWeek {
+        isoweek::iso_week_from_yof(self.year(), self.of())
+    }
+
+    /// Makes a new `NaiveDate` with the year number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_year(2016),
+    ///            Some(NaiveDate::from_ymd(2016, 9, 8)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_year(-308),
+    ///            Some(NaiveDate::from_ymd(-308, 9, 8)));
+    /// ~~~~
+    ///
+    /// A leap day (February 29) is a good example that this method can return `None`.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveDate, Datelike};
+    /// assert!(NaiveDate::from_ymd(2016, 2, 29).with_year(2015).is_none());
+    /// assert!(NaiveDate::from_ymd(2016, 2, 29).with_year(2020).is_some());
+    /// ~~~~
+    #[inline]
+    fn with_year(&self, year: i32) -> Option<NaiveDate> {
+        // we need to operate with `mdf` since we should keep the month and day number as is
+        let mdf = self.mdf();
+
+        // adjust the flags as needed
+        let flags = YearFlags::from_year(year);
+        let mdf = mdf.with_flags(flags);
+
+        NaiveDate::from_mdf(year, mdf)
+    }
+
+    /// Makes a new `NaiveDate` with the month number (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_month(10),
+    ///            Some(NaiveDate::from_ymd(2015, 10, 8)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_month(13), None); // no month 13
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 30).with_month(2), None); // no February 30
+    /// ~~~~
+    #[inline]
+    fn with_month(&self, month: u32) -> Option<NaiveDate> {
+        self.with_mdf(self.mdf().with_month(month))
+    }
+
+    /// Makes a new `NaiveDate` with the month number (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_month0(9),
+    ///            Some(NaiveDate::from_ymd(2015, 10, 8)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_month0(12), None); // no month 13
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 30).with_month0(1), None); // no February 30
+    /// ~~~~
+    #[inline]
+    fn with_month0(&self, month0: u32) -> Option<NaiveDate> {
+        self.with_mdf(self.mdf().with_month(month0 + 1))
+    }
+
+    /// Makes a new `NaiveDate` with the day of month (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_day(30),
+    ///            Some(NaiveDate::from_ymd(2015, 9, 30)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_day(31),
+    ///            None); // no September 31
+    /// ~~~~
+    #[inline]
+    fn with_day(&self, day: u32) -> Option<NaiveDate> {
+        self.with_mdf(self.mdf().with_day(day))
+    }
+
+    /// Makes a new `NaiveDate` with the day of month (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_day0(29),
+    ///            Some(NaiveDate::from_ymd(2015, 9, 30)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 9, 8).with_day0(30),
+    ///            None); // no September 31
+    /// ~~~~
+    #[inline]
+    fn with_day0(&self, day0: u32) -> Option<NaiveDate> {
+        self.with_mdf(self.mdf().with_day(day0 + 1))
+    }
+
+    /// Makes a new `NaiveDate` with the day of year (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 1, 1).with_ordinal(60),
+    ///            Some(NaiveDate::from_ymd(2015, 3, 1)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 1, 1).with_ordinal(366),
+    ///            None); // 2015 had only 365 days
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2016, 1, 1).with_ordinal(60),
+    ///            Some(NaiveDate::from_ymd(2016, 2, 29)));
+    /// assert_eq!(NaiveDate::from_ymd(2016, 1, 1).with_ordinal(366),
+    ///            Some(NaiveDate::from_ymd(2016, 12, 31)));
+    /// ~~~~
+    #[inline]
+    fn with_ordinal(&self, ordinal: u32) -> Option<NaiveDate> {
+        self.with_of(self.of().with_ordinal(ordinal))
+    }
+
+    /// Makes a new `NaiveDate` with the day of year (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDate` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike};
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2015, 1, 1).with_ordinal0(59),
+    ///            Some(NaiveDate::from_ymd(2015, 3, 1)));
+    /// assert_eq!(NaiveDate::from_ymd(2015, 1, 1).with_ordinal0(365),
+    ///            None); // 2015 had only 365 days
+    ///
+    /// assert_eq!(NaiveDate::from_ymd(2016, 1, 1).with_ordinal0(59),
+    ///            Some(NaiveDate::from_ymd(2016, 2, 29)));
+    /// assert_eq!(NaiveDate::from_ymd(2016, 1, 1).with_ordinal0(365),
+    ///            Some(NaiveDate::from_ymd(2016, 12, 31)));
+    /// ~~~~
+    #[inline]
+    fn with_ordinal0(&self, ordinal0: u32) -> Option<NaiveDate> {
+        self.with_of(self.of().with_ordinal(ordinal0 + 1))
+    }
+}
+
+/// An addition of `Duration` to `NaiveDate` discards the fractional days,
+/// rounding to the closest integral number of days towards `Duration::zero()`.
+///
+/// Panics on underflow or overflow.
+/// Use [`NaiveDate::checked_add_signed`](#method.checked_add_signed) to detect that.
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveDate;
+/// use time::Duration;
+///
+/// let from_ymd = NaiveDate::from_ymd;
+///
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::zero(),             from_ymd(2014, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::seconds(86399),     from_ymd(2014, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::seconds(-86399),    from_ymd(2014, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::days(1),            from_ymd(2014, 1, 2));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::days(-1),           from_ymd(2013, 12, 31));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::days(364),          from_ymd(2014, 12, 31));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::days(365*4 + 1),    from_ymd(2018, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) + Duration::days(365*400 + 97), from_ymd(2414, 1, 1));
+/// # }
+/// ~~~~
+impl Add<OldDuration> for NaiveDate {
+    type Output = NaiveDate;
+
+    #[inline]
+    fn add(self, rhs: OldDuration) -> NaiveDate {
+        self.checked_add_signed(rhs).expect("`NaiveDate + Duration` overflowed")
+    }
+}
+
+impl AddAssign<OldDuration> for NaiveDate {
+    #[inline]
+    fn add_assign(&mut self, rhs: OldDuration) {
+        *self = self.add(rhs);
+    }
+}
+
+/// A subtraction of `Duration` from `NaiveDate` discards the fractional days,
+/// rounding to the closest integral number of days towards `Duration::zero()`.
+/// It is same to the addition with a negated `Duration`.
+///
+/// Panics on underflow or overflow.
+/// Use [`NaiveDate::checked_sub_signed`](#method.checked_sub_signed) to detect that.
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveDate;
+/// use time::Duration;
+///
+/// let from_ymd = NaiveDate::from_ymd;
+///
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::zero(),             from_ymd(2014, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::seconds(86399),     from_ymd(2014, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::seconds(-86399),    from_ymd(2014, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::days(1),            from_ymd(2013, 12, 31));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::days(-1),           from_ymd(2014, 1, 2));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::days(364),          from_ymd(2013, 1, 2));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::days(365*4 + 1),    from_ymd(2010, 1, 1));
+/// assert_eq!(from_ymd(2014, 1, 1) - Duration::days(365*400 + 97), from_ymd(1614, 1, 1));
+/// # }
+/// ~~~~
+impl Sub<OldDuration> for NaiveDate {
+    type Output = NaiveDate;
+
+    #[inline]
+    fn sub(self, rhs: OldDuration) -> NaiveDate {
+        self.checked_sub_signed(rhs).expect("`NaiveDate - Duration` overflowed")
+    }
+}
+
+impl SubAssign<OldDuration> for NaiveDate {
+    #[inline]
+    fn sub_assign(&mut self, rhs: OldDuration) {
+        *self = self.sub(rhs);
+    }
+}
+
+/// Subtracts another `NaiveDate` from the current date.
+/// Returns a `Duration` of integral numbers.
+/// 
+/// This does not overflow or underflow at all,
+/// as all possible output fits in the range of `Duration`.
+///
+/// The implementation is a wrapper around
+/// [`NaiveDate::signed_duration_since`](#method.signed_duration_since).
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveDate;
+/// use time::Duration;
+///
+/// let from_ymd = NaiveDate::from_ymd;
+///
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(2014, 1, 1), Duration::zero());
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(2013, 12, 31), Duration::days(1));
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(2014, 1, 2), Duration::days(-1));
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(2013, 9, 23), Duration::days(100));
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(2013, 1, 1), Duration::days(365));
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(2010, 1, 1), Duration::days(365*4 + 1));
+/// assert_eq!(from_ymd(2014, 1, 1) - from_ymd(1614, 1, 1), Duration::days(365*400 + 97));
+/// # }
+/// ~~~~
+impl Sub<NaiveDate> for NaiveDate {
+    type Output = OldDuration;
+
+    #[inline]
+    fn sub(self, rhs: NaiveDate) -> OldDuration {
+        self.signed_duration_since(rhs)
+    }
+}
+
+/// The `Debug` output of the naive date `d` is same to
+/// [`d.format("%Y-%m-%d")`](../format/strftime/index.html).
+///
+/// The string printed can be readily parsed via the `parse` method on `str`.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveDate;
+///
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(2015,  9,  5)), "2015-09-05");
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(   0,  1,  1)), "0000-01-01");
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(9999, 12, 31)), "9999-12-31");
+/// ~~~~
+///
+/// ISO 8601 requires an explicit sign for years before 1 BCE or after 9999 CE.
+///
+/// ~~~~
+/// # use chrono::NaiveDate;
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(   -1,  1,  1)),  "-0001-01-01");
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(10000, 12, 31)), "+10000-12-31");
+/// ~~~~
+impl fmt::Debug for NaiveDate {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let year = self.year();
+        let mdf = self.mdf();
+        if 0 <= year && year <= 9999 {
+            write!(f, "{:04}-{:02}-{:02}", year, mdf.month(), mdf.day())
+        } else {
+            // ISO 8601 requires the explicit sign for out-of-range years
+            write!(f, "{:+05}-{:02}-{:02}", year, mdf.month(), mdf.day())
+        }
+    }
+}
+
+/// The `Display` output of the naive date `d` is same to
+/// [`d.format("%Y-%m-%d")`](../format/strftime/index.html).
+///
+/// The string printed can be readily parsed via the `parse` method on `str`.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveDate;
+///
+/// assert_eq!(format!("{}", NaiveDate::from_ymd(2015,  9,  5)), "2015-09-05");
+/// assert_eq!(format!("{}", NaiveDate::from_ymd(   0,  1,  1)), "0000-01-01");
+/// assert_eq!(format!("{}", NaiveDate::from_ymd(9999, 12, 31)), "9999-12-31");
+/// ~~~~
+///
+/// ISO 8601 requires an explicit sign for years before 1 BCE or after 9999 CE.
+///
+/// ~~~~
+/// # use chrono::NaiveDate;
+/// assert_eq!(format!("{}", NaiveDate::from_ymd(   -1,  1,  1)),  "-0001-01-01");
+/// assert_eq!(format!("{}", NaiveDate::from_ymd(10000, 12, 31)), "+10000-12-31");
+/// ~~~~
+impl fmt::Display for NaiveDate {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Debug::fmt(self, f) }
+}
+
+/// Parsing a `str` into a `NaiveDate` uses the same format,
+/// [`%Y-%m-%d`](../format/strftime/index.html), as in `Debug` and `Display`.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveDate;
+///
+/// let d = NaiveDate::from_ymd(2015, 9, 18);
+/// assert_eq!("2015-09-18".parse::<NaiveDate>(), Ok(d));
+///
+/// let d = NaiveDate::from_ymd(12345, 6, 7);
+/// assert_eq!("+12345-6-7".parse::<NaiveDate>(), Ok(d));
+///
+/// assert!("foo".parse::<NaiveDate>().is_err());
+/// ~~~~
+impl str::FromStr for NaiveDate {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> ParseResult<NaiveDate> {
+        const ITEMS: &'static [Item<'static>] = &[
+            Item::Space(""), Item::Numeric(Numeric::Year, Pad::Zero),
+            Item::Space(""), Item::Literal("-"),
+            Item::Space(""), Item::Numeric(Numeric::Month, Pad::Zero),
+            Item::Space(""), Item::Literal("-"),
+            Item::Space(""), Item::Numeric(Numeric::Day, Pad::Zero),
+            Item::Space(""),
+        ];
+
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, ITEMS.iter().cloned()));
+        parsed.to_naive_date()
+    }
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_encodable_json<F, E>(to_string: F)
+    where F: Fn(&NaiveDate) -> Result<String, E>, E: ::std::fmt::Debug
+{
+    assert_eq!(to_string(&NaiveDate::from_ymd(2014, 7, 24)).ok(),
+               Some(r#""2014-07-24""#.into()));
+    assert_eq!(to_string(&NaiveDate::from_ymd(0, 1, 1)).ok(),
+               Some(r#""0000-01-01""#.into()));
+    assert_eq!(to_string(&NaiveDate::from_ymd(-1, 12, 31)).ok(),
+               Some(r#""-0001-12-31""#.into()));
+    assert_eq!(to_string(&MIN_DATE).ok(),
+               Some(r#""-262144-01-01""#.into()));
+    assert_eq!(to_string(&MAX_DATE).ok(),
+               Some(r#""+262143-12-31""#.into()));
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_decodable_json<F, E>(from_str: F)
+    where F: Fn(&str) -> Result<NaiveDate, E>, E: ::std::fmt::Debug
+{
+    use std::{i32, i64};
+
+    assert_eq!(from_str(r#""2016-07-08""#).ok(), Some(NaiveDate::from_ymd(2016, 7, 8)));
+    assert_eq!(from_str(r#""2016-7-8""#).ok(), Some(NaiveDate::from_ymd(2016, 7, 8)));
+    assert_eq!(from_str(r#""+002016-07-08""#).ok(), Some(NaiveDate::from_ymd(2016, 7, 8)));
+    assert_eq!(from_str(r#""0000-01-01""#).ok(), Some(NaiveDate::from_ymd(0, 1, 1)));
+    assert_eq!(from_str(r#""0-1-1""#).ok(), Some(NaiveDate::from_ymd(0, 1, 1)));
+    assert_eq!(from_str(r#""-0001-12-31""#).ok(), Some(NaiveDate::from_ymd(-1, 12, 31)));
+    assert_eq!(from_str(r#""-262144-01-01""#).ok(), Some(MIN_DATE));
+    assert_eq!(from_str(r#""+262143-12-31""#).ok(), Some(MAX_DATE));
+
+    // bad formats
+    assert!(from_str(r#""""#).is_err());
+    assert!(from_str(r#""20001231""#).is_err());
+    assert!(from_str(r#""2000-00-00""#).is_err());
+    assert!(from_str(r#""2000-02-30""#).is_err());
+    assert!(from_str(r#""2001-02-29""#).is_err());
+    assert!(from_str(r#""2002-002-28""#).is_err());
+    assert!(from_str(r#""yyyy-mm-dd""#).is_err());
+    assert!(from_str(r#"0"#).is_err());
+    assert!(from_str(r#"20.01"#).is_err());
+    assert!(from_str(&i32::MIN.to_string()).is_err());
+    assert!(from_str(&i32::MAX.to_string()).is_err());
+    assert!(from_str(&i64::MIN.to_string()).is_err());
+    assert!(from_str(&i64::MAX.to_string()).is_err());
+    assert!(from_str(r#"{}"#).is_err());
+    // pre-0.3.0 rustc-serialize format is now invalid
+    assert!(from_str(r#"{"ymdf":20}"#).is_err());
+    assert!(from_str(r#"null"#).is_err());
+}
+
+#[cfg(feature = "rustc-serialize")]
+mod rustc_serialize {
+    use super::NaiveDate;
+    use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
+
+    impl Encodable for NaiveDate {
+        fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
+            format!("{:?}", self).encode(s)
+        }
+    }
+
+    impl Decodable for NaiveDate {
+        fn decode<D: Decoder>(d: &mut D) -> Result<NaiveDate, D::Error> {
+            d.read_str()?.parse().map_err(|_| d.error("invalid date"))
+        }
+    }
+
+    #[cfg(test)] use rustc_serialize::json;
+
+    #[test]
+    fn test_encodable() {
+        super::test_encodable_json(json::encode);
+    }
+
+    #[test]
+    fn test_decodable() {
+        super::test_decodable_json(json::decode);
+    }
+}
+
+#[cfg(feature = "serde")]
+mod serde {
+    use std::fmt;
+    use super::NaiveDate;
+    use serdelib::{ser, de};
+
+    // TODO not very optimized for space (binary formats would want something better)
+
+    impl ser::Serialize for NaiveDate {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            struct FormatWrapped<'a, D: 'a> {
+                inner: &'a D
+            }
+
+            impl<'a, D: fmt::Debug> fmt::Display for FormatWrapped<'a, D> {
+                fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                    self.inner.fmt(f)
+                }
+            }
+
+            serializer.collect_str(&FormatWrapped { inner: &self })
+        }
+    }
+
+    struct NaiveDateVisitor;
+
+    impl<'de> de::Visitor<'de> for NaiveDateVisitor {
+        type Value = NaiveDate;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result 
+        {
+            write!(formatter, "a formatted date string")
+        }
+
+        fn visit_str<E>(self, value: &str) -> Result<NaiveDate, E>
+            where E: de::Error
+        {
+            value.parse().map_err(|err| E::custom(format!("{}", err)))
+        }
+    }
+
+    impl<'de> de::Deserialize<'de> for NaiveDate {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(NaiveDateVisitor)
+        }
+    }
+
+    #[cfg(test)] extern crate serde_json;
+    #[cfg(test)] extern crate bincode;
+
+    #[test]
+    fn test_serde_serialize() {
+        super::test_encodable_json(self::serde_json::to_string);
+    }
+
+    #[test]
+    fn test_serde_deserialize() {
+        super::test_decodable_json(|input| self::serde_json::from_str(&input));
+    }
+
+    #[test]
+    fn test_serde_bincode() {
+        // Bincode is relevant to test separately from JSON because
+        // it is not self-describing.
+        use self::bincode::{Infinite, serialize, deserialize};
+
+        let d = NaiveDate::from_ymd(2014, 7, 24);
+        let encoded = serialize(&d, Infinite).unwrap();
+        let decoded: NaiveDate = deserialize(&encoded).unwrap();
+        assert_eq!(d, decoded);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::NaiveDate;
+    use super::{MIN_DATE, MIN_YEAR, MIN_DAYS_FROM_YEAR_0};
+    use super::{MAX_DATE, MAX_YEAR, MAX_DAYS_FROM_YEAR_0};
+    use {Datelike, Weekday};
+    use std::{i32, u32};
+    use oldtime::Duration;
+
+    #[test]
+    fn test_date_from_ymd() {
+        let ymd_opt = |y,m,d| NaiveDate::from_ymd_opt(y, m, d);
+
+        assert!(ymd_opt(2012, 0, 1).is_none());
+        assert!(ymd_opt(2012, 1, 1).is_some());
+        assert!(ymd_opt(2012, 2, 29).is_some());
+        assert!(ymd_opt(2014, 2, 29).is_none());
+        assert!(ymd_opt(2014, 3, 0).is_none());
+        assert!(ymd_opt(2014, 3, 1).is_some());
+        assert!(ymd_opt(2014, 3, 31).is_some());
+        assert!(ymd_opt(2014, 3, 32).is_none());
+        assert!(ymd_opt(2014, 12, 31).is_some());
+        assert!(ymd_opt(2014, 13, 1).is_none());
+    }
+
+    #[test]
+    fn test_date_from_yo() {
+        let yo_opt = |y,o| NaiveDate::from_yo_opt(y, o);
+        let ymd = |y,m,d| NaiveDate::from_ymd(y, m, d);
+
+        assert_eq!(yo_opt(2012, 0), None);
+        assert_eq!(yo_opt(2012, 1), Some(ymd(2012, 1, 1)));
+        assert_eq!(yo_opt(2012, 2), Some(ymd(2012, 1, 2)));
+        assert_eq!(yo_opt(2012, 32), Some(ymd(2012, 2, 1)));
+        assert_eq!(yo_opt(2012, 60), Some(ymd(2012, 2, 29)));
+        assert_eq!(yo_opt(2012, 61), Some(ymd(2012, 3, 1)));
+        assert_eq!(yo_opt(2012, 100), Some(ymd(2012, 4, 9)));
+        assert_eq!(yo_opt(2012, 200), Some(ymd(2012, 7, 18)));
+        assert_eq!(yo_opt(2012, 300), Some(ymd(2012, 10, 26)));
+        assert_eq!(yo_opt(2012, 366), Some(ymd(2012, 12, 31)));
+        assert_eq!(yo_opt(2012, 367), None);
+
+        assert_eq!(yo_opt(2014, 0), None);
+        assert_eq!(yo_opt(2014, 1), Some(ymd(2014, 1, 1)));
+        assert_eq!(yo_opt(2014, 2), Some(ymd(2014, 1, 2)));
+        assert_eq!(yo_opt(2014, 32), Some(ymd(2014, 2, 1)));
+        assert_eq!(yo_opt(2014, 59), Some(ymd(2014, 2, 28)));
+        assert_eq!(yo_opt(2014, 60), Some(ymd(2014, 3, 1)));
+        assert_eq!(yo_opt(2014, 100), Some(ymd(2014, 4, 10)));
+        assert_eq!(yo_opt(2014, 200), Some(ymd(2014, 7, 19)));
+        assert_eq!(yo_opt(2014, 300), Some(ymd(2014, 10, 27)));
+        assert_eq!(yo_opt(2014, 365), Some(ymd(2014, 12, 31)));
+        assert_eq!(yo_opt(2014, 366), None);
+    }
+
+    #[test]
+    fn test_date_from_isoywd() {
+        let isoywd_opt = |y,w,d| NaiveDate::from_isoywd_opt(y, w, d);
+        let ymd = |y,m,d| NaiveDate::from_ymd(y, m, d);
+
+        assert_eq!(isoywd_opt(2004, 0, Weekday::Sun), None);
+        assert_eq!(isoywd_opt(2004, 1, Weekday::Mon), Some(ymd(2003, 12, 29)));
+        assert_eq!(isoywd_opt(2004, 1, Weekday::Sun), Some(ymd(2004, 1, 4)));
+        assert_eq!(isoywd_opt(2004, 2, Weekday::Mon), Some(ymd(2004, 1, 5)));
+        assert_eq!(isoywd_opt(2004, 2, Weekday::Sun), Some(ymd(2004, 1, 11)));
+        assert_eq!(isoywd_opt(2004, 52, Weekday::Mon), Some(ymd(2004, 12, 20)));
+        assert_eq!(isoywd_opt(2004, 52, Weekday::Sun), Some(ymd(2004, 12, 26)));
+        assert_eq!(isoywd_opt(2004, 53, Weekday::Mon), Some(ymd(2004, 12, 27)));
+        assert_eq!(isoywd_opt(2004, 53, Weekday::Sun), Some(ymd(2005, 1, 2)));
+        assert_eq!(isoywd_opt(2004, 54, Weekday::Mon), None);
+
+        assert_eq!(isoywd_opt(2011, 0, Weekday::Sun), None);
+        assert_eq!(isoywd_opt(2011, 1, Weekday::Mon), Some(ymd(2011, 1, 3)));
+        assert_eq!(isoywd_opt(2011, 1, Weekday::Sun), Some(ymd(2011, 1, 9)));
+        assert_eq!(isoywd_opt(2011, 2, Weekday::Mon), Some(ymd(2011, 1, 10)));
+        assert_eq!(isoywd_opt(2011, 2, Weekday::Sun), Some(ymd(2011, 1, 16)));
+
+        assert_eq!(isoywd_opt(2018, 51, Weekday::Mon), Some(ymd(2018, 12, 17)));
+        assert_eq!(isoywd_opt(2018, 51, Weekday::Sun), Some(ymd(2018, 12, 23)));
+        assert_eq!(isoywd_opt(2018, 52, Weekday::Mon), Some(ymd(2018, 12, 24)));
+        assert_eq!(isoywd_opt(2018, 52, Weekday::Sun), Some(ymd(2018, 12, 30)));
+        assert_eq!(isoywd_opt(2018, 53, Weekday::Mon), None);
+    }
+
+    #[test]
+    fn test_date_from_isoywd_and_iso_week() {
+        for year in 2000..2401 {
+            for week in 1..54 {
+                for &weekday in [Weekday::Mon, Weekday::Tue, Weekday::Wed, Weekday::Thu,
+                                 Weekday::Fri, Weekday::Sat, Weekday::Sun].iter() {
+                    let d = NaiveDate::from_isoywd_opt(year, week, weekday);
+                    if d.is_some() {
+                        let d = d.unwrap();
+                        assert_eq!(d.weekday(), weekday);
+                        let w = d.iso_week();
+                        assert_eq!(w.year(), year);
+                        assert_eq!(w.week(), week);
+                    }
+                }
+            }
+        }
+
+        for year in 2000..2401 {
+            for month in 1..13 {
+                for day in 1..32 {
+                    let d = NaiveDate::from_ymd_opt(year, month, day);
+                    if d.is_some() {
+                        let d = d.unwrap();
+                        let w = d.iso_week();
+                        let d_ = NaiveDate::from_isoywd(w.year(), w.week(), d.weekday());
+                        assert_eq!(d, d_);
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_date_from_num_days_from_ce() {
+        let from_ndays_from_ce = |days| NaiveDate::from_num_days_from_ce_opt(days);
+        assert_eq!(from_ndays_from_ce(1), Some(NaiveDate::from_ymd(1, 1, 1)));
+        assert_eq!(from_ndays_from_ce(2), Some(NaiveDate::from_ymd(1, 1, 2)));
+        assert_eq!(from_ndays_from_ce(31), Some(NaiveDate::from_ymd(1, 1, 31)));
+        assert_eq!(from_ndays_from_ce(32), Some(NaiveDate::from_ymd(1, 2, 1)));
+        assert_eq!(from_ndays_from_ce(59), Some(NaiveDate::from_ymd(1, 2, 28)));
+        assert_eq!(from_ndays_from_ce(60), Some(NaiveDate::from_ymd(1, 3, 1)));
+        assert_eq!(from_ndays_from_ce(365), Some(NaiveDate::from_ymd(1, 12, 31)));
+        assert_eq!(from_ndays_from_ce(365*1 + 1), Some(NaiveDate::from_ymd(2, 1, 1)));
+        assert_eq!(from_ndays_from_ce(365*2 + 1), Some(NaiveDate::from_ymd(3, 1, 1)));
+        assert_eq!(from_ndays_from_ce(365*3 + 1), Some(NaiveDate::from_ymd(4, 1, 1)));
+        assert_eq!(from_ndays_from_ce(365*4 + 2), Some(NaiveDate::from_ymd(5, 1, 1)));
+        assert_eq!(from_ndays_from_ce(146097 + 1), Some(NaiveDate::from_ymd(401, 1, 1)));
+        assert_eq!(from_ndays_from_ce(146097*5 + 1), Some(NaiveDate::from_ymd(2001, 1, 1)));
+        assert_eq!(from_ndays_from_ce(719163), Some(NaiveDate::from_ymd(1970, 1, 1)));
+        assert_eq!(from_ndays_from_ce(0), Some(NaiveDate::from_ymd(0, 12, 31))); // 1 BCE
+        assert_eq!(from_ndays_from_ce(-365), Some(NaiveDate::from_ymd(0, 1, 1)));
+        assert_eq!(from_ndays_from_ce(-366), Some(NaiveDate::from_ymd(-1, 12, 31))); // 2 BCE
+
+        for days in (-9999..10001).map(|x| x * 100) {
+            assert_eq!(from_ndays_from_ce(days).map(|d| d.num_days_from_ce()), Some(days));
+        }
+
+        assert_eq!(from_ndays_from_ce(MIN_DATE.num_days_from_ce()), Some(MIN_DATE));
+        assert_eq!(from_ndays_from_ce(MIN_DATE.num_days_from_ce() - 1), None);
+        assert_eq!(from_ndays_from_ce(MAX_DATE.num_days_from_ce()), Some(MAX_DATE));
+        assert_eq!(from_ndays_from_ce(MAX_DATE.num_days_from_ce() + 1), None);
+    }
+
+    #[test]
+    fn test_date_fields() {
+        fn check(year: i32, month: u32, day: u32, ordinal: u32) {
+            let d1 = NaiveDate::from_ymd(year, month, day);
+            assert_eq!(d1.year(), year);
+            assert_eq!(d1.month(), month);
+            assert_eq!(d1.day(), day);
+            assert_eq!(d1.ordinal(), ordinal);
+
+            let d2 = NaiveDate::from_yo(year, ordinal);
+            assert_eq!(d2.year(), year);
+            assert_eq!(d2.month(), month);
+            assert_eq!(d2.day(), day);
+            assert_eq!(d2.ordinal(), ordinal);
+
+            assert_eq!(d1, d2);
+        }
+
+        check(2012, 1, 1, 1);
+        check(2012, 1, 2, 2);
+        check(2012, 2, 1, 32);
+        check(2012, 2, 29, 60);
+        check(2012, 3, 1, 61);
+        check(2012, 4, 9, 100);
+        check(2012, 7, 18, 200);
+        check(2012, 10, 26, 300);
+        check(2012, 12, 31, 366);
+
+        check(2014, 1, 1, 1);
+        check(2014, 1, 2, 2);
+        check(2014, 2, 1, 32);
+        check(2014, 2, 28, 59);
+        check(2014, 3, 1, 60);
+        check(2014, 4, 10, 100);
+        check(2014, 7, 19, 200);
+        check(2014, 10, 27, 300);
+        check(2014, 12, 31, 365);
+    }
+
+    #[test]
+    fn test_date_weekday() {
+        assert_eq!(NaiveDate::from_ymd(1582, 10, 15).weekday(), Weekday::Fri);
+        // May 20, 1875 = ISO 8601 reference date
+        assert_eq!(NaiveDate::from_ymd(1875, 5, 20).weekday(), Weekday::Thu);
+        assert_eq!(NaiveDate::from_ymd(2000, 1, 1).weekday(), Weekday::Sat);
+    }
+
+    #[test]
+    fn test_date_with_fields() {
+        let d = NaiveDate::from_ymd(2000, 2, 29);
+        assert_eq!(d.with_year(-400), Some(NaiveDate::from_ymd(-400, 2, 29)));
+        assert_eq!(d.with_year(-100), None);
+        assert_eq!(d.with_year(1600), Some(NaiveDate::from_ymd(1600, 2, 29)));
+        assert_eq!(d.with_year(1900), None);
+        assert_eq!(d.with_year(2000), Some(NaiveDate::from_ymd(2000, 2, 29)));
+        assert_eq!(d.with_year(2001), None);
+        assert_eq!(d.with_year(2004), Some(NaiveDate::from_ymd(2004, 2, 29)));
+        assert_eq!(d.with_year(i32::MAX), None);
+
+        let d = NaiveDate::from_ymd(2000, 4, 30);
+        assert_eq!(d.with_month(0), None);
+        assert_eq!(d.with_month(1), Some(NaiveDate::from_ymd(2000, 1, 30)));
+        assert_eq!(d.with_month(2), None);
+        assert_eq!(d.with_month(3), Some(NaiveDate::from_ymd(2000, 3, 30)));
+        assert_eq!(d.with_month(4), Some(NaiveDate::from_ymd(2000, 4, 30)));
+        assert_eq!(d.with_month(12), Some(NaiveDate::from_ymd(2000, 12, 30)));
+        assert_eq!(d.with_month(13), None);
+        assert_eq!(d.with_month(u32::MAX), None);
+
+        let d = NaiveDate::from_ymd(2000, 2, 8);
+        assert_eq!(d.with_day(0), None);
+        assert_eq!(d.with_day(1), Some(NaiveDate::from_ymd(2000, 2, 1)));
+        assert_eq!(d.with_day(29), Some(NaiveDate::from_ymd(2000, 2, 29)));
+        assert_eq!(d.with_day(30), None);
+        assert_eq!(d.with_day(u32::MAX), None);
+
+        let d = NaiveDate::from_ymd(2000, 5, 5);
+        assert_eq!(d.with_ordinal(0), None);
+        assert_eq!(d.with_ordinal(1), Some(NaiveDate::from_ymd(2000, 1, 1)));
+        assert_eq!(d.with_ordinal(60), Some(NaiveDate::from_ymd(2000, 2, 29)));
+        assert_eq!(d.with_ordinal(61), Some(NaiveDate::from_ymd(2000, 3, 1)));
+        assert_eq!(d.with_ordinal(366), Some(NaiveDate::from_ymd(2000, 12, 31)));
+        assert_eq!(d.with_ordinal(367), None);
+        assert_eq!(d.with_ordinal(u32::MAX), None);
+    }
+
+    #[test]
+    fn test_date_num_days_from_ce() {
+        assert_eq!(NaiveDate::from_ymd(1, 1, 1).num_days_from_ce(), 1);
+
+        for year in -9999..10001 {
+            assert_eq!(NaiveDate::from_ymd(year, 1, 1).num_days_from_ce(),
+                       NaiveDate::from_ymd(year - 1, 12, 31).num_days_from_ce() + 1);
+        }
+    }
+
+    #[test]
+    fn test_date_succ() {
+        let ymd = |y,m,d| NaiveDate::from_ymd(y, m, d);
+        assert_eq!(ymd(2014, 5, 6).succ_opt(), Some(ymd(2014, 5, 7)));
+        assert_eq!(ymd(2014, 5, 31).succ_opt(), Some(ymd(2014, 6, 1)));
+        assert_eq!(ymd(2014, 12, 31).succ_opt(), Some(ymd(2015, 1, 1)));
+        assert_eq!(ymd(2016, 2, 28).succ_opt(), Some(ymd(2016, 2, 29)));
+        assert_eq!(ymd(MAX_DATE.year(), 12, 31).succ_opt(), None);
+    }
+
+    #[test]
+    fn test_date_pred() {
+        let ymd = |y,m,d| NaiveDate::from_ymd(y, m, d);
+        assert_eq!(ymd(2016, 3, 1).pred_opt(), Some(ymd(2016, 2, 29)));
+        assert_eq!(ymd(2015, 1, 1).pred_opt(), Some(ymd(2014, 12, 31)));
+        assert_eq!(ymd(2014, 6, 1).pred_opt(), Some(ymd(2014, 5, 31)));
+        assert_eq!(ymd(2014, 5, 7).pred_opt(), Some(ymd(2014, 5, 6)));
+        assert_eq!(ymd(MIN_DATE.year(), 1, 1).pred_opt(), None);
+    }
+
+    #[test]
+    fn test_date_add() {
+        fn check((y1,m1,d1): (i32, u32, u32), rhs: Duration, ymd: Option<(i32, u32, u32)>) {
+            let lhs = NaiveDate::from_ymd(y1, m1, d1);
+            let sum = ymd.map(|(y,m,d)| NaiveDate::from_ymd(y, m, d));
+            assert_eq!(lhs.checked_add_signed(rhs), sum);
+            assert_eq!(lhs.checked_sub_signed(-rhs), sum);
+        }
+
+        check((2014, 1, 1), Duration::zero(), Some((2014, 1, 1)));
+        check((2014, 1, 1), Duration::seconds(86399), Some((2014, 1, 1)));
+        // always round towards zero
+        check((2014, 1, 1), Duration::seconds(-86399), Some((2014, 1, 1)));
+        check((2014, 1, 1), Duration::days(1), Some((2014, 1, 2)));
+        check((2014, 1, 1), Duration::days(-1), Some((2013, 12, 31)));
+        check((2014, 1, 1), Duration::days(364), Some((2014, 12, 31)));
+        check((2014, 1, 1), Duration::days(365*4 + 1), Some((2018, 1, 1)));
+        check((2014, 1, 1), Duration::days(365*400 + 97), Some((2414, 1, 1)));
+
+        check((-7, 1, 1), Duration::days(365*12 + 3), Some((5, 1, 1)));
+
+        // overflow check
+        check((0, 1, 1), Duration::days(MAX_DAYS_FROM_YEAR_0 as i64), Some((MAX_YEAR, 12, 31)));
+        check((0, 1, 1), Duration::days(MAX_DAYS_FROM_YEAR_0 as i64 + 1), None);
+        check((0, 1, 1), Duration::max_value(), None);
+        check((0, 1, 1), Duration::days(MIN_DAYS_FROM_YEAR_0 as i64), Some((MIN_YEAR, 1, 1)));
+        check((0, 1, 1), Duration::days(MIN_DAYS_FROM_YEAR_0 as i64 - 1), None);
+        check((0, 1, 1), Duration::min_value(), None);
+    }
+
+    #[test]
+    fn test_date_sub() {
+        fn check((y1,m1,d1): (i32, u32, u32), (y2,m2,d2): (i32, u32, u32), diff: Duration) {
+            let lhs = NaiveDate::from_ymd(y1, m1, d1);
+            let rhs = NaiveDate::from_ymd(y2, m2, d2);
+            assert_eq!(lhs.signed_duration_since(rhs), diff);
+            assert_eq!(rhs.signed_duration_since(lhs), -diff);
+        }
+
+        check((2014, 1, 1), (2014, 1, 1), Duration::zero());
+        check((2014, 1, 2), (2014, 1, 1), Duration::days(1));
+        check((2014, 12, 31), (2014, 1, 1), Duration::days(364));
+        check((2015, 1, 3), (2014, 1, 1), Duration::days(365 + 2));
+        check((2018, 1, 1), (2014, 1, 1), Duration::days(365*4 + 1));
+        check((2414, 1, 1), (2014, 1, 1), Duration::days(365*400 + 97));
+
+        check((MAX_YEAR, 12, 31), (0, 1, 1), Duration::days(MAX_DAYS_FROM_YEAR_0 as i64));
+        check((MIN_YEAR, 1, 1), (0, 1, 1), Duration::days(MIN_DAYS_FROM_YEAR_0 as i64));
+    }
+
+    #[test]
+    fn test_date_addassignment() {
+        let ymd = NaiveDate::from_ymd;
+        let mut date = ymd(2016, 10, 1);
+        date += Duration::days(10);
+        assert_eq!(date,  ymd(2016, 10, 11));
+        date += Duration::days(30);
+        assert_eq!(date, ymd(2016, 11, 10));
+    }
+
+    #[test]
+    fn test_date_subassignment() {
+        let ymd = NaiveDate::from_ymd;
+        let mut date = ymd(2016, 10, 11);
+        date -= Duration::days(10);
+        assert_eq!(date,  ymd(2016, 10, 1));
+        date -= Duration::days(2);
+        assert_eq!(date, ymd(2016, 9, 29));
+    }
+
+    #[test]
+    fn test_date_fmt() {
+        assert_eq!(format!("{:?}", NaiveDate::from_ymd(2012,  3, 4)),   "2012-03-04");
+        assert_eq!(format!("{:?}", NaiveDate::from_ymd(0,     3, 4)),   "0000-03-04");
+        assert_eq!(format!("{:?}", NaiveDate::from_ymd(-307,  3, 4)),  "-0307-03-04");
+        assert_eq!(format!("{:?}", NaiveDate::from_ymd(12345, 3, 4)), "+12345-03-04");
+
+        assert_eq!(NaiveDate::from_ymd(2012,  3, 4).to_string(),   "2012-03-04");
+        assert_eq!(NaiveDate::from_ymd(0,     3, 4).to_string(),   "0000-03-04");
+        assert_eq!(NaiveDate::from_ymd(-307,  3, 4).to_string(),  "-0307-03-04");
+        assert_eq!(NaiveDate::from_ymd(12345, 3, 4).to_string(), "+12345-03-04");
+
+        // the format specifier should have no effect on `NaiveTime`
+        assert_eq!(format!("{:+30?}", NaiveDate::from_ymd(1234, 5, 6)), "1234-05-06");
+        assert_eq!(format!("{:30?}", NaiveDate::from_ymd(12345, 6, 7)), "+12345-06-07");
+    }
+
+    #[test]
+    fn test_date_from_str() {
+        // valid cases
+        let valid = [
+            "-0000000123456-1-2",
+            "    -123456 - 1 - 2    ",
+            "-12345-1-2",
+            "-1234-12-31",
+            "-7-6-5",
+            "350-2-28",
+            "360-02-29",
+            "0360-02-29",
+            "2015-2 -18",
+            "+70-2-18",
+            "+70000-2-18",
+            "+00007-2-18",
+        ];
+        for &s in &valid {
+            let d = match s.parse::<NaiveDate>() {
+                Ok(d) => d,
+                Err(e) => panic!("parsing `{}` has failed: {}", s, e)
+            };
+            let s_ = format!("{:?}", d);
+            // `s` and `s_` may differ, but `s.parse()` and `s_.parse()` must be same
+            let d_ = match s_.parse::<NaiveDate>() {
+                Ok(d) => d,
+                Err(e) => panic!("`{}` is parsed into `{:?}`, but reparsing that has failed: {}",
+                                 s, d, e)
+            };
+            assert!(d == d_, "`{}` is parsed into `{:?}`, but reparsed result \
+                              `{:?}` does not match", s, d, d_);
+        }
+
+        // some invalid cases
+        // since `ParseErrorKind` is private, all we can do is to check if there was an error
+        assert!("".parse::<NaiveDate>().is_err());
+        assert!("x".parse::<NaiveDate>().is_err());
+        assert!("2014".parse::<NaiveDate>().is_err());
+        assert!("2014-01".parse::<NaiveDate>().is_err());
+        assert!("2014-01-00".parse::<NaiveDate>().is_err());
+        assert!("2014-13-57".parse::<NaiveDate>().is_err());
+        assert!("9999999-9-9".parse::<NaiveDate>().is_err()); // out-of-bounds
+    }
+
+    #[test]
+    fn test_date_parse_from_str() {
+        let ymd = |y,m,d| NaiveDate::from_ymd(y,m,d);
+        assert_eq!(NaiveDate::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+                   Ok(ymd(2014, 5, 7))); // ignore time and offset
+        assert_eq!(NaiveDate::parse_from_str("2015-W06-1=2015-033", "%G-W%V-%u = %Y-%j"),
+                   Ok(ymd(2015, 2, 2)));
+        assert_eq!(NaiveDate::parse_from_str("Fri, 09 Aug 13", "%a, %d %b %y"),
+                   Ok(ymd(2013, 8, 9)));
+        assert!(NaiveDate::parse_from_str("Sat, 09 Aug 2013", "%a, %d %b %Y").is_err());
+        assert!(NaiveDate::parse_from_str("2014-57", "%Y-%m-%d").is_err());
+        assert!(NaiveDate::parse_from_str("2014", "%Y").is_err()); // insufficient
+    }
+
+    #[test]
+    fn test_date_format() {
+        let d = NaiveDate::from_ymd(2012, 3, 4);
+        assert_eq!(d.format("%Y,%C,%y,%G,%g").to_string(), "2012,20,12,2012,12");
+        assert_eq!(d.format("%m,%b,%h,%B").to_string(), "03,Mar,Mar,March");
+        assert_eq!(d.format("%d,%e").to_string(), "04, 4");
+        assert_eq!(d.format("%U,%W,%V").to_string(), "10,09,09");
+        assert_eq!(d.format("%a,%A,%w,%u").to_string(), "Sun,Sunday,0,7");
+        assert_eq!(d.format("%j").to_string(), "064"); // since 2012 is a leap year
+        assert_eq!(d.format("%D,%x").to_string(), "03/04/12,03/04/12");
+        assert_eq!(d.format("%F").to_string(), "2012-03-04");
+        assert_eq!(d.format("%v").to_string(), " 4-Mar-2012");
+        assert_eq!(d.format("%t%n%%%n%t").to_string(), "\t\n%\n\t");
+
+        // non-four-digit years
+        assert_eq!(NaiveDate::from_ymd(12345,  1, 1).format("%Y").to_string(), "+12345");
+        assert_eq!(NaiveDate::from_ymd(1234,   1, 1).format("%Y").to_string(), "1234");
+        assert_eq!(NaiveDate::from_ymd(123,    1, 1).format("%Y").to_string(), "0123");
+        assert_eq!(NaiveDate::from_ymd(12,     1, 1).format("%Y").to_string(), "0012");
+        assert_eq!(NaiveDate::from_ymd(1,      1, 1).format("%Y").to_string(), "0001");
+        assert_eq!(NaiveDate::from_ymd(0,      1, 1).format("%Y").to_string(), "0000");
+        assert_eq!(NaiveDate::from_ymd(-1,     1, 1).format("%Y").to_string(), "-0001");
+        assert_eq!(NaiveDate::from_ymd(-12,    1, 1).format("%Y").to_string(), "-0012");
+        assert_eq!(NaiveDate::from_ymd(-123,   1, 1).format("%Y").to_string(), "-0123");
+        assert_eq!(NaiveDate::from_ymd(-1234,  1, 1).format("%Y").to_string(), "-1234");
+        assert_eq!(NaiveDate::from_ymd(-12345, 1, 1).format("%Y").to_string(), "-12345");
+
+        // corner cases
+        assert_eq!(NaiveDate::from_ymd(2007, 12, 31).format("%G,%g,%U,%W,%V").to_string(),
+                   "2008,08,53,53,01");
+        assert_eq!(NaiveDate::from_ymd(2010, 1, 3).format("%G,%g,%U,%W,%V").to_string(),
+                   "2009,09,01,00,53");
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/naive/datetime.rs cargo-0.33.0/vendor/chrono/src/naive/datetime.rs
--- cargo-0.32.0/vendor/chrono/src/naive/datetime.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/naive/datetime.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,2351 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! ISO 8601 date and time without timezone.
+
+use std::{str, fmt, hash};
+use std::ops::{Add, Sub, AddAssign, SubAssign};
+use num_traits::ToPrimitive;
+use oldtime::Duration as OldDuration;
+
+use {Weekday, Timelike, Datelike};
+use div::div_mod_floor;
+use naive::{NaiveTime, NaiveDate, IsoWeek};
+use format::{Item, Numeric, Pad, Fixed};
+use format::{parse, Parsed, ParseError, ParseResult, DelayedFormat, StrftimeItems};
+
+/// The tight upper bound guarantees that a duration with `|Duration| >= 2^MAX_SECS_BITS`
+/// will always overflow the addition with any date and time type.
+///
+/// So why is this needed? `Duration::seconds(rhs)` may overflow, and we don't have
+/// an alternative returning `Option` or `Result`. Thus we need some early bound to avoid
+/// touching that call when we are already sure that it WILL overflow...
+const MAX_SECS_BITS: usize = 44;
+
+/// ISO 8601 combined date and time without timezone.
+///
+/// # Example
+///
+/// `NaiveDateTime` is commonly created from [`NaiveDate`](./struct.NaiveDate.html).
+///
+/// ~~~~
+/// use chrono::{NaiveDate, NaiveDateTime};
+///
+/// let dt: NaiveDateTime = NaiveDate::from_ymd(2016, 7, 8).and_hms(9, 10, 11);
+/// # let _ = dt;
+/// ~~~~
+///
+/// You can use typical [date-like](../trait.Datelike.html) and
+/// [time-like](../trait.Timelike.html) methods,
+/// provided that relevant traits are in the scope.
+///
+/// ~~~~
+/// # use chrono::{NaiveDate, NaiveDateTime};
+/// # let dt: NaiveDateTime = NaiveDate::from_ymd(2016, 7, 8).and_hms(9, 10, 11);
+/// use chrono::{Datelike, Timelike, Weekday};
+///
+/// assert_eq!(dt.weekday(), Weekday::Fri);
+/// assert_eq!(dt.num_seconds_from_midnight(), 33011);
+/// ~~~~
+#[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
+pub struct NaiveDateTime {
+    date: NaiveDate,
+    time: NaiveTime,
+}
+
+impl NaiveDateTime {
+    /// Makes a new `NaiveDateTime` from date and time components.
+    /// Equivalent to [`date.and_time(time)`](./struct.NaiveDate.html#method.and_time)
+    /// and many other helper constructors on `NaiveDate`.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveTime, NaiveDateTime};
+    ///
+    /// let d = NaiveDate::from_ymd(2015, 6, 3);
+    /// let t = NaiveTime::from_hms_milli(12, 34, 56, 789);
+    ///
+    /// let dt = NaiveDateTime::new(d, t);
+    /// assert_eq!(dt.date(), d);
+    /// assert_eq!(dt.time(), t);
+    /// ~~~~
+    #[inline]
+    pub fn new(date: NaiveDate, time: NaiveTime) -> NaiveDateTime {
+        NaiveDateTime { date: date, time: time }
+    }
+
+    /// Makes a new `NaiveDateTime` corresponding to a UTC date and time,
+    /// from the number of non-leap seconds
+    /// since the midnight UTC on January 1, 1970 (aka "UNIX timestamp")
+    /// and the number of nanoseconds since the last whole non-leap second.
+    ///
+    /// For a non-naive version of this function see
+    /// [`TimeZone::timestamp`](../offset/trait.TimeZone.html#method.timestamp).
+    ///
+    /// The nanosecond part can exceed 1,000,000,000 in order to represent the
+    /// [leap second](./struct.NaiveTime.html#leap-second-handling). (The true "UNIX
+    /// timestamp" cannot represent a leap second unambiguously.)
+    ///
+    /// Panics on the out-of-range number of seconds and/or invalid nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDateTime, NaiveDate};
+    ///
+    /// let dt = NaiveDateTime::from_timestamp(0, 42_000_000);
+    /// assert_eq!(dt, NaiveDate::from_ymd(1970, 1, 1).and_hms_milli(0, 0, 0, 42));
+    ///
+    /// let dt = NaiveDateTime::from_timestamp(1_000_000_000, 0);
+    /// assert_eq!(dt, NaiveDate::from_ymd(2001, 9, 9).and_hms(1, 46, 40));
+    /// ~~~~
+    #[inline]
+    pub fn from_timestamp(secs: i64, nsecs: u32) -> NaiveDateTime {
+        let datetime = NaiveDateTime::from_timestamp_opt(secs, nsecs);
+        datetime.expect("invalid or out-of-range datetime")
+    }
+
+    /// Makes a new `NaiveDateTime` corresponding to a UTC date and time,
+    /// from the number of non-leap seconds
+    /// since the midnight UTC on January 1, 1970 (aka "UNIX timestamp")
+    /// and the number of nanoseconds since the last whole non-leap second.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    /// (The true "UNIX timestamp" cannot represent a leap second unambiguously.)
+    ///
+    /// Returns `None` on the out-of-range number of seconds and/or invalid nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDateTime, NaiveDate};
+    /// use std::i64;
+    ///
+    /// let from_timestamp_opt = NaiveDateTime::from_timestamp_opt;
+    ///
+    /// assert!(from_timestamp_opt(0, 0).is_some());
+    /// assert!(from_timestamp_opt(0, 999_999_999).is_some());
+    /// assert!(from_timestamp_opt(0, 1_500_000_000).is_some()); // leap second
+    /// assert!(from_timestamp_opt(0, 2_000_000_000).is_none());
+    /// assert!(from_timestamp_opt(i64::MAX, 0).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn from_timestamp_opt(secs: i64, nsecs: u32) -> Option<NaiveDateTime> {
+        let (days, secs) = div_mod_floor(secs, 86_400);
+        let date = days.to_i32().and_then(|days| days.checked_add(719_163))
+                                .and_then(NaiveDate::from_num_days_from_ce_opt);
+        let time = NaiveTime::from_num_seconds_from_midnight_opt(secs as u32, nsecs);
+        match (date, time) {
+            (Some(date), Some(time)) => Some(NaiveDateTime { date: date, time: time }),
+            (_, _) => None,
+        }
+    }
+
+    /// Parses a string with the specified format string and returns a new `NaiveDateTime`.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDateTime, NaiveDate};
+    ///
+    /// let parse_from_str = NaiveDateTime::parse_from_str;
+    ///
+    /// assert_eq!(parse_from_str("2015-09-05 23:56:04", "%Y-%m-%d %H:%M:%S"),
+    ///            Ok(NaiveDate::from_ymd(2015, 9, 5).and_hms(23, 56, 4)));
+    /// assert_eq!(parse_from_str("5sep2015pm012345.6789", "%d%b%Y%p%I%M%S%.f"),
+    ///            Ok(NaiveDate::from_ymd(2015, 9, 5).and_hms_micro(13, 23, 45, 678_900)));
+    /// ~~~~
+    ///
+    /// Offset is ignored for the purpose of parsing.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveDateTime, NaiveDate};
+    /// # let parse_from_str = NaiveDateTime::parse_from_str;
+    /// assert_eq!(parse_from_str("2014-5-17T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+    ///            Ok(NaiveDate::from_ymd(2014, 5, 17).and_hms(12, 34, 56)));
+    /// ~~~~
+    ///
+    /// [Leap seconds](./struct.NaiveTime.html#leap-second-handling) are correctly handled by
+    /// treating any time of the form `hh:mm:60` as a leap second.
+    /// (This equally applies to the formatting, so the round trip is possible.)
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveDateTime, NaiveDate};
+    /// # let parse_from_str = NaiveDateTime::parse_from_str;
+    /// assert_eq!(parse_from_str("2015-07-01 08:59:60.123", "%Y-%m-%d %H:%M:%S%.f"),
+    ///            Ok(NaiveDate::from_ymd(2015, 7, 1).and_hms_milli(8, 59, 59, 1_123)));
+    /// ~~~~
+    ///
+    /// Missing seconds are assumed to be zero,
+    /// but out-of-bound times or insufficient fields are errors otherwise.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveDateTime, NaiveDate};
+    /// # let parse_from_str = NaiveDateTime::parse_from_str;
+    /// assert_eq!(parse_from_str("94/9/4 7:15", "%y/%m/%d %H:%M"),
+    ///            Ok(NaiveDate::from_ymd(1994, 9, 4).and_hms(7, 15, 0)));
+    ///
+    /// assert!(parse_from_str("04m33s", "%Mm%Ss").is_err());
+    /// assert!(parse_from_str("94/9/4 12", "%y/%m/%d %H").is_err());
+    /// assert!(parse_from_str("94/9/4 17:60", "%y/%m/%d %H:%M").is_err());
+    /// assert!(parse_from_str("94/9/4 24:00:00", "%y/%m/%d %H:%M:%S").is_err());
+    /// ~~~~
+    ///
+    /// All parsed fields should be consistent to each other, otherwise it's an error.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDateTime;
+    /// # let parse_from_str = NaiveDateTime::parse_from_str;
+    /// let fmt = "%Y-%m-%d %H:%M:%S = UNIX timestamp %s";
+    /// assert!(parse_from_str("2001-09-09 01:46:39 = UNIX timestamp 999999999", fmt).is_ok());
+    /// assert!(parse_from_str("1970-01-01 00:00:00 = UNIX timestamp 1", fmt).is_err());
+    /// ~~~~
+    pub fn parse_from_str(s: &str, fmt: &str) -> ParseResult<NaiveDateTime> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, StrftimeItems::new(fmt)));
+        parsed.to_naive_datetime_with_offset(0) // no offset adjustment
+    }
+
+    /// Retrieves a date component.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms(9, 10, 11);
+    /// assert_eq!(dt.date(), NaiveDate::from_ymd(2016, 7, 8));
+    /// ~~~~
+    #[inline]
+    pub fn date(&self) -> NaiveDate {
+        self.date
+    }
+
+    /// Retrieves a time component.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveTime};
+    ///
+    /// let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms(9, 10, 11);
+    /// assert_eq!(dt.time(), NaiveTime::from_hms(9, 10, 11));
+    /// ~~~~
+    #[inline]
+    pub fn time(&self) -> NaiveTime {
+        self.time
+    }
+
+    /// Returns the number of non-leap seconds since the midnight on January 1, 1970.
+    ///
+    /// Note that this does *not* account for the timezone!
+    /// The true "UNIX timestamp" would count seconds since the midnight *UTC* on the epoch.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(1970, 1, 1).and_hms_milli(0, 0, 1, 980);
+    /// assert_eq!(dt.timestamp(), 1);
+    ///
+    /// let dt = NaiveDate::from_ymd(2001, 9, 9).and_hms(1, 46, 40);
+    /// assert_eq!(dt.timestamp(), 1_000_000_000);
+    ///
+    /// let dt = NaiveDate::from_ymd(1969, 12, 31).and_hms(23, 59, 59);
+    /// assert_eq!(dt.timestamp(), -1);
+    ///
+    /// let dt = NaiveDate::from_ymd(-1, 1, 1).and_hms(0, 0, 0);
+    /// assert_eq!(dt.timestamp(), -62198755200);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp(&self) -> i64 {
+        const UNIX_EPOCH_DAY: i64 = 719_163;
+        let gregorian_day = i64::from(self.date.num_days_from_ce());
+        let seconds_from_midnight = i64::from(self.time.num_seconds_from_midnight());
+        (gregorian_day - UNIX_EPOCH_DAY) * 86_400 + seconds_from_midnight
+    }
+
+    /// Returns the number of non-leap *milliseconds* since midnight on January 1, 1970.
+    ///
+    /// Note that this does *not* account for the timezone!
+    /// The true "UNIX timestamp" would count seconds since the midnight *UTC* on the epoch.
+    ///
+    /// Note also that this does reduce the number of years that can be
+    /// represented from ~584 Billion to ~584 Million. (If this is a problem,
+    /// please file an issue to let me know what domain needs millisecond
+    /// precision over billions of years, I'm curious.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(1970, 1, 1).and_hms_milli(0, 0, 1, 444);
+    /// assert_eq!(dt.timestamp_millis(), 1_444);
+    ///
+    /// let dt = NaiveDate::from_ymd(2001, 9, 9).and_hms_milli(1, 46, 40, 555);
+    /// assert_eq!(dt.timestamp_millis(), 1_000_000_000_555);
+    ///
+    /// let dt = NaiveDate::from_ymd(1969, 12, 31).and_hms_milli(23, 59, 59, 100);
+    /// assert_eq!(dt.timestamp_millis(), -900);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_millis(&self) -> i64 {
+        let as_ms = self.timestamp() * 1000;
+        as_ms + i64::from(self.timestamp_subsec_millis())
+    }
+
+    /// Returns the number of non-leap *nanoseconds* since midnight on January 1, 1970.
+    ///
+    /// Note that this does *not* account for the timezone!
+    /// The true "UNIX timestamp" would count seconds since the midnight *UTC* on the epoch.
+    ///
+    /// Note also that this does reduce the number of years that can be
+    /// represented from ~584 Billion to ~584. (If this is a problem,
+    /// please file an issue to let me know what domain needs nanosecond
+    /// precision over millenia, I'm curious.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(1970, 1, 1).and_hms_nano(0, 0, 1, 444);
+    /// assert_eq!(dt.timestamp_nanos(), 1_000_000_444);
+    ///
+    /// let dt = NaiveDate::from_ymd(2001, 9, 9).and_hms_nano(1, 46, 40, 555);
+    /// assert_eq!(dt.timestamp_nanos(), 1_000_000_000_000_000_555);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_nanos(&self) -> i64 {
+        let as_ns = self.timestamp() * 1_000_000_000;
+        as_ns + i64::from(self.timestamp_subsec_nanos())
+    }
+
+    /// Returns the number of milliseconds since the last whole non-leap second.
+    ///
+    /// The return value ranges from 0 to 999,
+    /// or for [leap seconds](./struct.NaiveTime.html#leap-second-handling), to 1,999.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_nano(9, 10, 11, 123_456_789);
+    /// assert_eq!(dt.timestamp_subsec_millis(), 123);
+    ///
+    /// let dt = NaiveDate::from_ymd(2015, 7, 1).and_hms_nano(8, 59, 59, 1_234_567_890);
+    /// assert_eq!(dt.timestamp_subsec_millis(), 1_234);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_subsec_millis(&self) -> u32 {
+        self.timestamp_subsec_nanos() / 1_000_000
+    }
+
+    /// Returns the number of microseconds since the last whole non-leap second.
+    ///
+    /// The return value ranges from 0 to 999,999,
+    /// or for [leap seconds](./struct.NaiveTime.html#leap-second-handling), to 1,999,999.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_nano(9, 10, 11, 123_456_789);
+    /// assert_eq!(dt.timestamp_subsec_micros(), 123_456);
+    ///
+    /// let dt = NaiveDate::from_ymd(2015, 7, 1).and_hms_nano(8, 59, 59, 1_234_567_890);
+    /// assert_eq!(dt.timestamp_subsec_micros(), 1_234_567);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_subsec_micros(&self) -> u32 {
+        self.timestamp_subsec_nanos() / 1_000
+    }
+
+    /// Returns the number of nanoseconds since the last whole non-leap second.
+    ///
+    /// The return value ranges from 0 to 999,999,999,
+    /// or for [leap seconds](./struct.NaiveTime.html#leap-second-handling), to 1,999,999,999.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_nano(9, 10, 11, 123_456_789);
+    /// assert_eq!(dt.timestamp_subsec_nanos(), 123_456_789);
+    ///
+    /// let dt = NaiveDate::from_ymd(2015, 7, 1).and_hms_nano(8, 59, 59, 1_234_567_890);
+    /// assert_eq!(dt.timestamp_subsec_nanos(), 1_234_567_890);
+    /// ~~~~
+    #[inline]
+    pub fn timestamp_subsec_nanos(&self) -> u32 {
+        self.time.nanosecond()
+    }
+
+    /// Adds given `Duration` to the current date and time.
+    ///
+    /// As a part of Chrono's [leap second handling](./struct.NaiveTime.html#leap-second-handling),
+    /// the addition assumes that **there is no leap second ever**,
+    /// except when the `NaiveDateTime` itself represents a leap second
+    /// in which case the assumption becomes that **there is exactly a single leap second ever**.
+    ///
+    /// Returns `None` when it will result in overflow.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveDate;
+    /// use time::Duration;
+    ///
+    /// let from_ymd = NaiveDate::from_ymd;
+    ///
+    /// let d = from_ymd(2016, 7, 8);
+    /// let hms = |h, m, s| d.and_hms(h, m, s);
+    /// assert_eq!(hms(3, 5, 7).checked_add_signed(Duration::zero()),
+    ///            Some(hms(3, 5, 7)));
+    /// assert_eq!(hms(3, 5, 7).checked_add_signed(Duration::seconds(1)),
+    ///            Some(hms(3, 5, 8)));
+    /// assert_eq!(hms(3, 5, 7).checked_add_signed(Duration::seconds(-1)),
+    ///            Some(hms(3, 5, 6)));
+    /// assert_eq!(hms(3, 5, 7).checked_add_signed(Duration::seconds(3600 + 60)),
+    ///            Some(hms(4, 6, 7)));
+    /// assert_eq!(hms(3, 5, 7).checked_add_signed(Duration::seconds(86_400)),
+    ///            Some(from_ymd(2016, 7, 9).and_hms(3, 5, 7)));
+    ///
+    /// let hmsm = |h, m, s, milli| d.and_hms_milli(h, m, s, milli);
+    /// assert_eq!(hmsm(3, 5, 7, 980).checked_add_signed(Duration::milliseconds(450)),
+    ///            Some(hmsm(3, 5, 8, 430)));
+    /// # }
+    /// ~~~~
+    ///
+    /// Overflow returns `None`.
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// # use chrono::NaiveDate;
+    /// # use time::Duration;
+    /// # let hms = |h, m, s| NaiveDate::from_ymd(2016, 7, 8).and_hms(h, m, s);
+    /// assert_eq!(hms(3, 5, 7).checked_add_signed(Duration::days(1_000_000_000)), None);
+    /// # }
+    /// ~~~~
+    ///
+    /// Leap seconds are handled,
+    /// but the addition assumes that it is the only leap second happened.
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// # use chrono::NaiveDate;
+    /// # use time::Duration;
+    /// # let from_ymd = NaiveDate::from_ymd;
+    /// # let hmsm = |h, m, s, milli| from_ymd(2016, 7, 8).and_hms_milli(h, m, s, milli);
+    /// let leap = hmsm(3, 5, 59, 1_300);
+    /// assert_eq!(leap.checked_add_signed(Duration::zero()),
+    ///            Some(hmsm(3, 5, 59, 1_300)));
+    /// assert_eq!(leap.checked_add_signed(Duration::milliseconds(-500)),
+    ///            Some(hmsm(3, 5, 59, 800)));
+    /// assert_eq!(leap.checked_add_signed(Duration::milliseconds(500)),
+    ///            Some(hmsm(3, 5, 59, 1_800)));
+    /// assert_eq!(leap.checked_add_signed(Duration::milliseconds(800)),
+    ///            Some(hmsm(3, 6, 0, 100)));
+    /// assert_eq!(leap.checked_add_signed(Duration::seconds(10)),
+    ///            Some(hmsm(3, 6, 9, 300)));
+    /// assert_eq!(leap.checked_add_signed(Duration::seconds(-10)),
+    ///            Some(hmsm(3, 5, 50, 300)));
+    /// assert_eq!(leap.checked_add_signed(Duration::days(1)),
+    ///            Some(from_ymd(2016, 7, 9).and_hms_milli(3, 5, 59, 300)));
+    /// # }
+    /// ~~~~
+    pub fn checked_add_signed(self, rhs: OldDuration) -> Option<NaiveDateTime> {
+        let (time, rhs) = self.time.overflowing_add_signed(rhs);
+
+        // early checking to avoid overflow in OldDuration::seconds
+        if rhs <= (-1 << MAX_SECS_BITS) || rhs >= (1 << MAX_SECS_BITS) {
+            return None;
+        }
+
+        let date = try_opt!(self.date.checked_add_signed(OldDuration::seconds(rhs)));
+        Some(NaiveDateTime { date: date, time: time })
+    }
+
+    /// Subtracts given `Duration` from the current date and time.
+    ///
+    /// As a part of Chrono's [leap second handling](./struct.NaiveTime.html#leap-second-handling),
+    /// the subtraction assumes that **there is no leap second ever**,
+    /// except when the `NaiveDateTime` itself represents a leap second
+    /// in which case the assumption becomes that **there is exactly a single leap second ever**.
+    ///
+    /// Returns `None` when it will result in overflow.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveDate;
+    /// use time::Duration;
+    ///
+    /// let from_ymd = NaiveDate::from_ymd;
+    ///
+    /// let d = from_ymd(2016, 7, 8);
+    /// let hms = |h, m, s| d.and_hms(h, m, s);
+    /// assert_eq!(hms(3, 5, 7).checked_sub_signed(Duration::zero()),
+    ///            Some(hms(3, 5, 7)));
+    /// assert_eq!(hms(3, 5, 7).checked_sub_signed(Duration::seconds(1)),
+    ///            Some(hms(3, 5, 6)));
+    /// assert_eq!(hms(3, 5, 7).checked_sub_signed(Duration::seconds(-1)),
+    ///            Some(hms(3, 5, 8)));
+    /// assert_eq!(hms(3, 5, 7).checked_sub_signed(Duration::seconds(3600 + 60)),
+    ///            Some(hms(2, 4, 7)));
+    /// assert_eq!(hms(3, 5, 7).checked_sub_signed(Duration::seconds(86_400)),
+    ///            Some(from_ymd(2016, 7, 7).and_hms(3, 5, 7)));
+    ///
+    /// let hmsm = |h, m, s, milli| d.and_hms_milli(h, m, s, milli);
+    /// assert_eq!(hmsm(3, 5, 7, 450).checked_sub_signed(Duration::milliseconds(670)),
+    ///            Some(hmsm(3, 5, 6, 780)));
+    /// # }
+    /// ~~~~
+    ///
+    /// Overflow returns `None`.
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// # use chrono::NaiveDate;
+    /// # use time::Duration;
+    /// # let hms = |h, m, s| NaiveDate::from_ymd(2016, 7, 8).and_hms(h, m, s);
+    /// assert_eq!(hms(3, 5, 7).checked_sub_signed(Duration::days(1_000_000_000)), None);
+    /// # }
+    /// ~~~~
+    ///
+    /// Leap seconds are handled,
+    /// but the subtraction assumes that it is the only leap second happened.
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// # use chrono::NaiveDate;
+    /// # use time::Duration;
+    /// # let from_ymd = NaiveDate::from_ymd;
+    /// # let hmsm = |h, m, s, milli| from_ymd(2016, 7, 8).and_hms_milli(h, m, s, milli);
+    /// let leap = hmsm(3, 5, 59, 1_300);
+    /// assert_eq!(leap.checked_sub_signed(Duration::zero()),
+    ///            Some(hmsm(3, 5, 59, 1_300)));
+    /// assert_eq!(leap.checked_sub_signed(Duration::milliseconds(200)),
+    ///            Some(hmsm(3, 5, 59, 1_100)));
+    /// assert_eq!(leap.checked_sub_signed(Duration::milliseconds(500)),
+    ///            Some(hmsm(3, 5, 59, 800)));
+    /// assert_eq!(leap.checked_sub_signed(Duration::seconds(60)),
+    ///            Some(hmsm(3, 5, 0, 300)));
+    /// assert_eq!(leap.checked_sub_signed(Duration::days(1)),
+    ///            Some(from_ymd(2016, 7, 7).and_hms_milli(3, 6, 0, 300)));
+    /// # }
+    /// ~~~~
+    pub fn checked_sub_signed(self, rhs: OldDuration) -> Option<NaiveDateTime> {
+        let (time, rhs) = self.time.overflowing_sub_signed(rhs);
+
+        // early checking to avoid overflow in OldDuration::seconds
+        if rhs <= (-1 << MAX_SECS_BITS) || rhs >= (1 << MAX_SECS_BITS) {
+            return None;
+        }
+
+        let date = try_opt!(self.date.checked_sub_signed(OldDuration::seconds(rhs)));
+        Some(NaiveDateTime { date: date, time: time })
+    }
+
+    /// Subtracts another `NaiveDateTime` from the current date and time.
+    /// This does not overflow or underflow at all.
+    ///
+    /// As a part of Chrono's [leap second handling](./struct.NaiveTime.html#leap-second-handling),
+    /// the subtraction assumes that **there is no leap second ever**,
+    /// except when any of the `NaiveDateTime`s themselves represents a leap second
+    /// in which case the assumption becomes that
+    /// **there are exactly one (or two) leap second(s) ever**.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveDate;
+    /// use time::Duration;
+    ///
+    /// let from_ymd = NaiveDate::from_ymd;
+    ///
+    /// let d = from_ymd(2016, 7, 8);
+    /// assert_eq!(d.and_hms(3, 5, 7).signed_duration_since(d.and_hms(2, 4, 6)),
+    ///            Duration::seconds(3600 + 60 + 1));
+    ///
+    /// // July 8 is 190th day in the year 2016
+    /// let d0 = from_ymd(2016, 1, 1);
+    /// assert_eq!(d.and_hms_milli(0, 7, 6, 500).signed_duration_since(d0.and_hms(0, 0, 0)),
+    ///            Duration::seconds(189 * 86_400 + 7 * 60 + 6) + Duration::milliseconds(500));
+    /// # }
+    /// ~~~~
+    ///
+    /// Leap seconds are handled, but the subtraction assumes that
+    /// there were no other leap seconds happened.
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// # use chrono::NaiveDate;
+    /// # use time::Duration;
+    /// # let from_ymd = NaiveDate::from_ymd;
+    /// let leap = from_ymd(2015, 6, 30).and_hms_milli(23, 59, 59, 1_500);
+    /// assert_eq!(leap.signed_duration_since(from_ymd(2015, 6, 30).and_hms(23, 0, 0)),
+    ///            Duration::seconds(3600) + Duration::milliseconds(500));
+    /// assert_eq!(from_ymd(2015, 7, 1).and_hms(1, 0, 0).signed_duration_since(leap),
+    ///            Duration::seconds(3600) - Duration::milliseconds(500));
+    /// # }
+    /// ~~~~
+    pub fn signed_duration_since(self, rhs: NaiveDateTime) -> OldDuration {
+        self.date.signed_duration_since(rhs.date) + self.time.signed_duration_since(rhs.time)
+    }
+
+    /// Formats the combined date and time with the specified formatting items.
+    /// Otherwise it is same to the ordinary [`format`](#method.format) method.
+    ///
+    /// The `Iterator` of items should be `Clone`able,
+    /// since the resulting `DelayedFormat` value may be formatted multiple times.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    /// use chrono::format::strftime::StrftimeItems;
+    ///
+    /// let fmt = StrftimeItems::new("%Y-%m-%d %H:%M:%S");
+    /// let dt = NaiveDate::from_ymd(2015, 9, 5).and_hms(23, 56, 4);
+    /// assert_eq!(dt.format_with_items(fmt.clone()).to_string(), "2015-09-05 23:56:04");
+    /// assert_eq!(dt.format("%Y-%m-%d %H:%M:%S").to_string(),    "2015-09-05 23:56:04");
+    /// ~~~~
+    ///
+    /// The resulting `DelayedFormat` can be formatted directly via the `Display` trait.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # use chrono::format::strftime::StrftimeItems;
+    /// # let fmt = StrftimeItems::new("%Y-%m-%d %H:%M:%S").clone();
+    /// # let dt = NaiveDate::from_ymd(2015, 9, 5).and_hms(23, 56, 4);
+    /// assert_eq!(format!("{}", dt.format_with_items(fmt)), "2015-09-05 23:56:04");
+    /// ~~~~
+    #[inline]
+    pub fn format_with_items<'a, I>(&self, items: I) -> DelayedFormat<I>
+            where I: Iterator<Item=Item<'a>> + Clone {
+        DelayedFormat::new(Some(self.date), Some(self.time), items)
+    }
+
+    /// Formats the combined date and time with the specified format string.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// This returns a `DelayedFormat`,
+    /// which gets converted to a string only when actual formatting happens.
+    /// You may use the `to_string` method to get a `String`,
+    /// or just feed it into `print!` and other formatting macros.
+    /// (In this way it avoids the redundant memory allocation.)
+    ///
+    /// A wrong format string does *not* issue an error immediately.
+    /// Rather, converting or formatting the `DelayedFormat` fails.
+    /// You are recommended to immediately use `DelayedFormat` for this reason.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveDate;
+    ///
+    /// let dt = NaiveDate::from_ymd(2015, 9, 5).and_hms(23, 56, 4);
+    /// assert_eq!(dt.format("%Y-%m-%d %H:%M:%S").to_string(), "2015-09-05 23:56:04");
+    /// assert_eq!(dt.format("around %l %p on %b %-d").to_string(), "around 11 PM on Sep 5");
+    /// ~~~~
+    ///
+    /// The resulting `DelayedFormat` can be formatted directly via the `Display` trait.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveDate;
+    /// # let dt = NaiveDate::from_ymd(2015, 9, 5).and_hms(23, 56, 4);
+    /// assert_eq!(format!("{}", dt.format("%Y-%m-%d %H:%M:%S")), "2015-09-05 23:56:04");
+    /// assert_eq!(format!("{}", dt.format("around %l %p on %b %-d")), "around 11 PM on Sep 5");
+    /// ~~~~
+    #[inline]
+    pub fn format<'a>(&self, fmt: &'a str) -> DelayedFormat<StrftimeItems<'a>> {
+        self.format_with_items(StrftimeItems::new(fmt))
+    }
+}
+
+impl Datelike for NaiveDateTime {
+    /// Returns the year number in the [calendar date](./index.html#calendar-date).
+    ///
+    /// See also the [`NaiveDate::year`](./struct.NaiveDate.html#method.year) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.year(), 2015);
+    /// ~~~~
+    #[inline]
+    fn year(&self) -> i32 {
+        self.date.year()
+    }
+
+    /// Returns the month number starting from 1.
+    ///
+    /// The return value ranges from 1 to 12.
+    ///
+    /// See also the [`NaiveDate::month`](./struct.NaiveDate.html#method.month) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.month(), 9);
+    /// ~~~~
+    #[inline]
+    fn month(&self) -> u32 {
+        self.date.month()
+    }
+
+    /// Returns the month number starting from 0.
+    ///
+    /// The return value ranges from 0 to 11.
+    ///
+    /// See also the [`NaiveDate::month0`](./struct.NaiveDate.html#method.month0) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.month0(), 8);
+    /// ~~~~
+    #[inline]
+    fn month0(&self) -> u32 {
+        self.date.month0()
+    }
+
+    /// Returns the day of month starting from 1.
+    ///
+    /// The return value ranges from 1 to 31. (The last day of month differs by months.)
+    ///
+    /// See also the [`NaiveDate::day`](./struct.NaiveDate.html#method.day) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.day(), 25);
+    /// ~~~~
+    #[inline]
+    fn day(&self) -> u32 {
+        self.date.day()
+    }
+
+    /// Returns the day of month starting from 0.
+    ///
+    /// The return value ranges from 0 to 30. (The last day of month differs by months.)
+    ///
+    /// See also the [`NaiveDate::day0`](./struct.NaiveDate.html#method.day0) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.day0(), 24);
+    /// ~~~~
+    #[inline]
+    fn day0(&self) -> u32 {
+        self.date.day0()
+    }
+
+    /// Returns the day of year starting from 1.
+    ///
+    /// The return value ranges from 1 to 366. (The last day of year differs by years.)
+    ///
+    /// See also the [`NaiveDate::ordinal`](./struct.NaiveDate.html#method.ordinal) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.ordinal(), 268);
+    /// ~~~~
+    #[inline]
+    fn ordinal(&self) -> u32 {
+        self.date.ordinal()
+    }
+
+    /// Returns the day of year starting from 0.
+    ///
+    /// The return value ranges from 0 to 365. (The last day of year differs by years.)
+    ///
+    /// See also the [`NaiveDate::ordinal0`](./struct.NaiveDate.html#method.ordinal0) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.ordinal0(), 267);
+    /// ~~~~
+    #[inline]
+    fn ordinal0(&self) -> u32 {
+        self.date.ordinal0()
+    }
+
+    /// Returns the day of week.
+    ///
+    /// See also the [`NaiveDate::weekday`](./struct.NaiveDate.html#method.weekday) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike, Weekday};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.weekday(), Weekday::Fri);
+    /// ~~~~
+    #[inline]
+    fn weekday(&self) -> Weekday {
+        self.date.weekday()
+    }
+
+    #[inline]
+    fn iso_week(&self) -> IsoWeek {
+        self.date.iso_week()
+    }
+
+    /// Makes a new `NaiveDateTime` with the year number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_year`](./struct.NaiveDate.html#method.with_year) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 25).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_year(2016), Some(NaiveDate::from_ymd(2016, 9, 25).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_year(-308), Some(NaiveDate::from_ymd(-308, 9, 25).and_hms(12, 34, 56)));
+    /// ~~~~
+    #[inline]
+    fn with_year(&self, year: i32) -> Option<NaiveDateTime> {
+        self.date.with_year(year).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the month number (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_month`](./struct.NaiveDate.html#method.with_month) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 30).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_month(10), Some(NaiveDate::from_ymd(2015, 10, 30).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_month(13), None); // no month 13
+    /// assert_eq!(dt.with_month(2), None); // no February 30
+    /// ~~~~
+    #[inline]
+    fn with_month(&self, month: u32) -> Option<NaiveDateTime> {
+        self.date.with_month(month).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the month number (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_month0`](./struct.NaiveDate.html#method.with_month0) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 30).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_month0(9), Some(NaiveDate::from_ymd(2015, 10, 30).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_month0(12), None); // no month 13
+    /// assert_eq!(dt.with_month0(1), None); // no February 30
+    /// ~~~~
+    #[inline]
+    fn with_month0(&self, month0: u32) -> Option<NaiveDateTime> {
+        self.date.with_month0(month0).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the day of month (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_day`](./struct.NaiveDate.html#method.with_day) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_day(30), Some(NaiveDate::from_ymd(2015, 9, 30).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_day(31), None); // no September 31
+    /// ~~~~
+    #[inline]
+    fn with_day(&self, day: u32) -> Option<NaiveDateTime> {
+        self.date.with_day(day).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the day of month (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_day0`](./struct.NaiveDate.html#method.with_day0) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_day0(29), Some(NaiveDate::from_ymd(2015, 9, 30).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_day0(30), None); // no September 31
+    /// ~~~~
+    #[inline]
+    fn with_day0(&self, day0: u32) -> Option<NaiveDateTime> {
+        self.date.with_day0(day0).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the day of year (starting from 1) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_ordinal`](./struct.NaiveDate.html#method.with_ordinal) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_ordinal(60),
+    ///            Some(NaiveDate::from_ymd(2015, 3, 1).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_ordinal(366), None); // 2015 had only 365 days
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2016, 9, 8).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_ordinal(60),
+    ///            Some(NaiveDate::from_ymd(2016, 2, 29).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_ordinal(366),
+    ///            Some(NaiveDate::from_ymd(2016, 12, 31).and_hms(12, 34, 56)));
+    /// ~~~~
+    #[inline]
+    fn with_ordinal(&self, ordinal: u32) -> Option<NaiveDateTime> {
+        self.date.with_ordinal(ordinal).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the day of year (starting from 0) changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveDate::with_ordinal0`](./struct.NaiveDate.html#method.with_ordinal0) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Datelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_ordinal0(59),
+    ///            Some(NaiveDate::from_ymd(2015, 3, 1).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_ordinal0(365), None); // 2015 had only 365 days
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2016, 9, 8).and_hms(12, 34, 56);
+    /// assert_eq!(dt.with_ordinal0(59),
+    ///            Some(NaiveDate::from_ymd(2016, 2, 29).and_hms(12, 34, 56)));
+    /// assert_eq!(dt.with_ordinal0(365),
+    ///            Some(NaiveDate::from_ymd(2016, 12, 31).and_hms(12, 34, 56)));
+    /// ~~~~
+    #[inline]
+    fn with_ordinal0(&self, ordinal0: u32) -> Option<NaiveDateTime> {
+        self.date.with_ordinal0(ordinal0).map(|d| NaiveDateTime { date: d, ..*self })
+    }
+}
+
+impl Timelike for NaiveDateTime {
+    /// Returns the hour number from 0 to 23.
+    ///
+    /// See also the [`NaiveTime::hour`](./struct.NaiveTime.html#method.hour) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.hour(), 12);
+    /// ~~~~
+    #[inline]
+    fn hour(&self) -> u32 {
+        self.time.hour()
+    }
+
+    /// Returns the minute number from 0 to 59.
+    ///
+    /// See also the [`NaiveTime::minute`](./struct.NaiveTime.html#method.minute) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.minute(), 34);
+    /// ~~~~
+    #[inline]
+    fn minute(&self) -> u32 {
+        self.time.minute()
+    }
+
+    /// Returns the second number from 0 to 59.
+    ///
+    /// See also the [`NaiveTime::second`](./struct.NaiveTime.html#method.second) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.second(), 56);
+    /// ~~~~
+    #[inline]
+    fn second(&self) -> u32 {
+        self.time.second()
+    }
+
+    /// Returns the number of nanoseconds since the whole non-leap second.
+    /// The range from 1,000,000,000 to 1,999,999,999 represents
+    /// the [leap second](./struct.NaiveTime.html#leap-second-handling).
+    ///
+    /// See also the
+    /// [`NaiveTime::nanosecond`](./struct.NaiveTime.html#method.nanosecond) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.nanosecond(), 789_000_000);
+    /// ~~~~
+    #[inline]
+    fn nanosecond(&self) -> u32 {
+        self.time.nanosecond()
+    }
+
+    /// Makes a new `NaiveDateTime` with the hour number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveTime::with_hour`](./struct.NaiveTime.html#method.with_hour) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.with_hour(7),
+    ///            Some(NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(7, 34, 56, 789)));
+    /// assert_eq!(dt.with_hour(24), None);
+    /// ~~~~
+    #[inline]
+    fn with_hour(&self, hour: u32) -> Option<NaiveDateTime> {
+        self.time.with_hour(hour).map(|t| NaiveDateTime { time: t, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the minute number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    ///
+    /// See also the
+    /// [`NaiveTime::with_minute`](./struct.NaiveTime.html#method.with_minute) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.with_minute(45),
+    ///            Some(NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 45, 56, 789)));
+    /// assert_eq!(dt.with_minute(60), None);
+    /// ~~~~
+    #[inline]
+    fn with_minute(&self, min: u32) -> Option<NaiveDateTime> {
+        self.time.with_minute(min).map(|t| NaiveDateTime { time: t, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with the second number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    /// As with the [`second`](#method.second) method,
+    /// the input range is restricted to 0 through 59.
+    ///
+    /// See also the
+    /// [`NaiveTime::with_second`](./struct.NaiveTime.html#method.with_second) method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.with_second(17),
+    ///            Some(NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 17, 789)));
+    /// assert_eq!(dt.with_second(60), None);
+    /// ~~~~
+    #[inline]
+    fn with_second(&self, sec: u32) -> Option<NaiveDateTime> {
+        self.time.with_second(sec).map(|t| NaiveDateTime { time: t, ..*self })
+    }
+
+    /// Makes a new `NaiveDateTime` with nanoseconds since the whole non-leap second changed.
+    ///
+    /// Returns `None` when the resulting `NaiveDateTime` would be invalid.
+    /// As with the [`nanosecond`](#method.nanosecond) method,
+    /// the input range can exceed 1,000,000,000 for leap seconds.
+    ///
+    /// See also the
+    /// [`NaiveTime::with_nanosecond`](./struct.NaiveTime.html#method.with_nanosecond)
+    /// method.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, NaiveDateTime, Timelike};
+    ///
+    /// let dt: NaiveDateTime = NaiveDate::from_ymd(2015, 9, 8).and_hms_milli(12, 34, 56, 789);
+    /// assert_eq!(dt.with_nanosecond(333_333_333),
+    ///            Some(NaiveDate::from_ymd(2015, 9, 8).and_hms_nano(12, 34, 56, 333_333_333)));
+    /// assert_eq!(dt.with_nanosecond(1_333_333_333), // leap second
+    ///            Some(NaiveDate::from_ymd(2015, 9, 8).and_hms_nano(12, 34, 56, 1_333_333_333)));
+    /// assert_eq!(dt.with_nanosecond(2_000_000_000), None);
+    /// ~~~~
+    #[inline]
+    fn with_nanosecond(&self, nano: u32) -> Option<NaiveDateTime> {
+        self.time.with_nanosecond(nano).map(|t| NaiveDateTime { time: t, ..*self })
+    }
+}
+
+/// `NaiveDateTime` can be used as a key to the hash maps (in principle).
+///
+/// Practically this also takes account of fractional seconds, so it is not recommended.
+/// (For the obvious reason this also distinguishes leap seconds from non-leap seconds.)
+#[cfg_attr(feature = "cargo-clippy", allow(derive_hash_xor_eq))]
+impl hash::Hash for NaiveDateTime {
+    fn hash<H: hash::Hasher>(&self, state: &mut H) {
+        self.date.hash(state);
+        self.time.hash(state);
+    }
+}
+
+/// An addition of `Duration` to `NaiveDateTime` yields another `NaiveDateTime`.
+///
+/// As a part of Chrono's [leap second handling](./struct.NaiveTime.html#leap-second-handling),
+/// the addition assumes that **there is no leap second ever**,
+/// except when the `NaiveDateTime` itself represents a leap second
+/// in which case the assumption becomes that **there is exactly a single leap second ever**.
+///
+/// Panics on underflow or overflow.
+/// Use [`NaiveDateTime::checked_add_signed`](#method.checked_add_signed) to detect that.
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveDate;
+/// use time::Duration;
+///
+/// let from_ymd = NaiveDate::from_ymd;
+///
+/// let d = from_ymd(2016, 7, 8);
+/// let hms = |h, m, s| d.and_hms(h, m, s);
+/// assert_eq!(hms(3, 5, 7) + Duration::zero(),             hms(3, 5, 7));
+/// assert_eq!(hms(3, 5, 7) + Duration::seconds(1),         hms(3, 5, 8));
+/// assert_eq!(hms(3, 5, 7) + Duration::seconds(-1),        hms(3, 5, 6));
+/// assert_eq!(hms(3, 5, 7) + Duration::seconds(3600 + 60), hms(4, 6, 7));
+/// assert_eq!(hms(3, 5, 7) + Duration::seconds(86_400),
+///            from_ymd(2016, 7, 9).and_hms(3, 5, 7));
+/// assert_eq!(hms(3, 5, 7) + Duration::days(365),
+///            from_ymd(2017, 7, 8).and_hms(3, 5, 7));
+///
+/// let hmsm = |h, m, s, milli| d.and_hms_milli(h, m, s, milli);
+/// assert_eq!(hmsm(3, 5, 7, 980) + Duration::milliseconds(450), hmsm(3, 5, 8, 430));
+/// # }
+/// ~~~~
+///
+/// Leap seconds are handled,
+/// but the addition assumes that it is the only leap second happened.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveDate;
+/// # use time::Duration;
+/// # let from_ymd = NaiveDate::from_ymd;
+/// # let hmsm = |h, m, s, milli| from_ymd(2016, 7, 8).and_hms_milli(h, m, s, milli);
+/// let leap = hmsm(3, 5, 59, 1_300);
+/// assert_eq!(leap + Duration::zero(),             hmsm(3, 5, 59, 1_300));
+/// assert_eq!(leap + Duration::milliseconds(-500), hmsm(3, 5, 59, 800));
+/// assert_eq!(leap + Duration::milliseconds(500),  hmsm(3, 5, 59, 1_800));
+/// assert_eq!(leap + Duration::milliseconds(800),  hmsm(3, 6, 0, 100));
+/// assert_eq!(leap + Duration::seconds(10),        hmsm(3, 6, 9, 300));
+/// assert_eq!(leap + Duration::seconds(-10),       hmsm(3, 5, 50, 300));
+/// assert_eq!(leap + Duration::days(1),
+///            from_ymd(2016, 7, 9).and_hms_milli(3, 5, 59, 300));
+/// # }
+/// ~~~~
+impl Add<OldDuration> for NaiveDateTime {
+    type Output = NaiveDateTime;
+
+    #[inline]
+    fn add(self, rhs: OldDuration) -> NaiveDateTime {
+        self.checked_add_signed(rhs).expect("`NaiveDateTime + Duration` overflowed")
+    }
+}
+
+impl AddAssign<OldDuration> for NaiveDateTime {
+    #[inline]
+    fn add_assign(&mut self, rhs: OldDuration) {
+        *self = self.add(rhs);
+    }
+}
+
+/// A subtraction of `Duration` from `NaiveDateTime` yields another `NaiveDateTime`.
+/// It is same to the addition with a negated `Duration`.
+///
+/// As a part of Chrono's [leap second handling](./struct.NaiveTime.html#leap-second-handling),
+/// the addition assumes that **there is no leap second ever**,
+/// except when the `NaiveDateTime` itself represents a leap second
+/// in which case the assumption becomes that **there is exactly a single leap second ever**.
+///
+/// Panics on underflow or overflow.
+/// Use [`NaiveDateTime::checked_sub_signed`](#method.checked_sub_signed) to detect that.
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveDate;
+/// use time::Duration;
+///
+/// let from_ymd = NaiveDate::from_ymd;
+///
+/// let d = from_ymd(2016, 7, 8);
+/// let hms = |h, m, s| d.and_hms(h, m, s);
+/// assert_eq!(hms(3, 5, 7) - Duration::zero(),             hms(3, 5, 7));
+/// assert_eq!(hms(3, 5, 7) - Duration::seconds(1),         hms(3, 5, 6));
+/// assert_eq!(hms(3, 5, 7) - Duration::seconds(-1),        hms(3, 5, 8));
+/// assert_eq!(hms(3, 5, 7) - Duration::seconds(3600 + 60), hms(2, 4, 7));
+/// assert_eq!(hms(3, 5, 7) - Duration::seconds(86_400),
+///            from_ymd(2016, 7, 7).and_hms(3, 5, 7));
+/// assert_eq!(hms(3, 5, 7) - Duration::days(365),
+///            from_ymd(2015, 7, 9).and_hms(3, 5, 7));
+///
+/// let hmsm = |h, m, s, milli| d.and_hms_milli(h, m, s, milli);
+/// assert_eq!(hmsm(3, 5, 7, 450) - Duration::milliseconds(670), hmsm(3, 5, 6, 780));
+/// # }
+/// ~~~~
+///
+/// Leap seconds are handled,
+/// but the subtraction assumes that it is the only leap second happened.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveDate;
+/// # use time::Duration;
+/// # let from_ymd = NaiveDate::from_ymd;
+/// # let hmsm = |h, m, s, milli| from_ymd(2016, 7, 8).and_hms_milli(h, m, s, milli);
+/// let leap = hmsm(3, 5, 59, 1_300);
+/// assert_eq!(leap - Duration::zero(),            hmsm(3, 5, 59, 1_300));
+/// assert_eq!(leap - Duration::milliseconds(200), hmsm(3, 5, 59, 1_100));
+/// assert_eq!(leap - Duration::milliseconds(500), hmsm(3, 5, 59, 800));
+/// assert_eq!(leap - Duration::seconds(60),       hmsm(3, 5, 0, 300));
+/// assert_eq!(leap - Duration::days(1),
+///            from_ymd(2016, 7, 7).and_hms_milli(3, 6, 0, 300));
+/// # }
+/// ~~~~
+impl Sub<OldDuration> for NaiveDateTime {
+    type Output = NaiveDateTime;
+
+    #[inline]
+    fn sub(self, rhs: OldDuration) -> NaiveDateTime {
+        self.checked_sub_signed(rhs).expect("`NaiveDateTime - Duration` overflowed")
+    }
+}
+
+impl SubAssign<OldDuration> for NaiveDateTime {
+    #[inline]
+    fn sub_assign(&mut self, rhs: OldDuration) {
+        *self = self.sub(rhs);
+    }
+}
+
+/// Subtracts another `NaiveDateTime` from the current date and time.
+/// This does not overflow or underflow at all.
+///
+/// As a part of Chrono's [leap second handling](./struct.NaiveTime.html#leap-second-handling),
+/// the subtraction assumes that **there is no leap second ever**,
+/// except when any of the `NaiveDateTime`s themselves represents a leap second
+/// in which case the assumption becomes that
+/// **there are exactly one (or two) leap second(s) ever**.
+///
+/// The implementation is a wrapper around
+/// [`NaiveDateTime::signed_duration_since`](#method.signed_duration_since).
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveDate;
+/// use time::Duration;
+///
+/// let from_ymd = NaiveDate::from_ymd;
+///
+/// let d = from_ymd(2016, 7, 8);
+/// assert_eq!(d.and_hms(3, 5, 7) - d.and_hms(2, 4, 6), Duration::seconds(3600 + 60 + 1));
+///
+/// // July 8 is 190th day in the year 2016
+/// let d0 = from_ymd(2016, 1, 1);
+/// assert_eq!(d.and_hms_milli(0, 7, 6, 500) - d0.and_hms(0, 0, 0),
+///            Duration::seconds(189 * 86_400 + 7 * 60 + 6) + Duration::milliseconds(500));
+/// # }
+/// ~~~~
+///
+/// Leap seconds are handled, but the subtraction assumes that
+/// there were no other leap seconds happened.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveDate;
+/// # use time::Duration;
+/// # let from_ymd = NaiveDate::from_ymd;
+/// let leap = from_ymd(2015, 6, 30).and_hms_milli(23, 59, 59, 1_500);
+/// assert_eq!(leap - from_ymd(2015, 6, 30).and_hms(23, 0, 0),
+///            Duration::seconds(3600) + Duration::milliseconds(500));
+/// assert_eq!(from_ymd(2015, 7, 1).and_hms(1, 0, 0) - leap,
+///            Duration::seconds(3600) - Duration::milliseconds(500));
+/// # }
+/// ~~~~
+impl Sub<NaiveDateTime> for NaiveDateTime {
+    type Output = OldDuration;
+
+    #[inline]
+    fn sub(self, rhs: NaiveDateTime) -> OldDuration {
+        self.signed_duration_since(rhs)
+    }
+}
+
+/// The `Debug` output of the naive date and time `dt` is same to
+/// [`dt.format("%Y-%m-%dT%H:%M:%S%.f")`](../format/strftime/index.html).
+///
+/// The string printed can be readily parsed via the `parse` method on `str`.
+///
+/// It should be noted that, for leap seconds not on the minute boundary,
+/// it may print a representation not distinguishable from non-leap seconds.
+/// This doesn't matter in practice, since such leap seconds never happened.
+/// (By the time of the first leap second on 1972-06-30,
+/// every time zone offset around the world has standardized to the 5-minute alignment.)
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveDate;
+///
+/// let dt = NaiveDate::from_ymd(2016, 11, 15).and_hms(7, 39, 24);
+/// assert_eq!(format!("{:?}", dt), "2016-11-15T07:39:24");
+/// ~~~~
+///
+/// Leap seconds may also be used.
+///
+/// ~~~~
+/// # use chrono::NaiveDate;
+/// let dt = NaiveDate::from_ymd(2015, 6, 30).and_hms_milli(23, 59, 59, 1_500);
+/// assert_eq!(format!("{:?}", dt), "2015-06-30T23:59:60.500");
+/// ~~~~
+impl fmt::Debug for NaiveDateTime {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}T{:?}", self.date, self.time)
+    }
+}
+
+/// The `Debug` output of the naive date and time `dt` is same to
+/// [`dt.format("%Y-%m-%d %H:%M:%S%.f")`](../format/strftime/index.html).
+///
+/// It should be noted that, for leap seconds not on the minute boundary,
+/// it may print a representation not distinguishable from non-leap seconds.
+/// This doesn't matter in practice, since such leap seconds never happened.
+/// (By the time of the first leap second on 1972-06-30,
+/// every time zone offset around the world has standardized to the 5-minute alignment.)
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveDate;
+///
+/// let dt = NaiveDate::from_ymd(2016, 11, 15).and_hms(7, 39, 24);
+/// assert_eq!(format!("{}", dt), "2016-11-15 07:39:24");
+/// ~~~~
+///
+/// Leap seconds may also be used.
+///
+/// ~~~~
+/// # use chrono::NaiveDate;
+/// let dt = NaiveDate::from_ymd(2015, 6, 30).and_hms_milli(23, 59, 59, 1_500);
+/// assert_eq!(format!("{}", dt), "2015-06-30 23:59:60.500");
+/// ~~~~
+impl fmt::Display for NaiveDateTime {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{} {}", self.date, self.time)
+    }
+}
+
+/// Parsing a `str` into a `NaiveDateTime` uses the same format,
+/// [`%Y-%m-%dT%H:%M:%S%.f`](../format/strftime/index.html), as in `Debug`.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::{NaiveDateTime, NaiveDate};
+///
+/// let dt = NaiveDate::from_ymd(2015, 9, 18).and_hms(23, 56, 4);
+/// assert_eq!("2015-09-18T23:56:04".parse::<NaiveDateTime>(), Ok(dt));
+///
+/// let dt = NaiveDate::from_ymd(12345, 6, 7).and_hms_milli(7, 59, 59, 1_500); // leap second
+/// assert_eq!("+12345-6-7T7:59:60.5".parse::<NaiveDateTime>(), Ok(dt));
+///
+/// assert!("foo".parse::<NaiveDateTime>().is_err());
+/// ~~~~
+impl str::FromStr for NaiveDateTime {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> ParseResult<NaiveDateTime> {
+        const ITEMS: &'static [Item<'static>] = &[
+            Item::Space(""), Item::Numeric(Numeric::Year, Pad::Zero),
+            Item::Space(""), Item::Literal("-"),
+            Item::Space(""), Item::Numeric(Numeric::Month, Pad::Zero),
+            Item::Space(""), Item::Literal("-"),
+            Item::Space(""), Item::Numeric(Numeric::Day, Pad::Zero),
+            Item::Space(""), Item::Literal("T"), // XXX shouldn't this be case-insensitive?
+            Item::Space(""), Item::Numeric(Numeric::Hour, Pad::Zero),
+            Item::Space(""), Item::Literal(":"),
+            Item::Space(""), Item::Numeric(Numeric::Minute, Pad::Zero),
+            Item::Space(""), Item::Literal(":"),
+            Item::Space(""), Item::Numeric(Numeric::Second, Pad::Zero),
+            Item::Fixed(Fixed::Nanosecond), Item::Space(""),
+        ];
+
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, ITEMS.iter().cloned()));
+        parsed.to_naive_datetime_with_offset(0)
+    }
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_encodable_json<F, E>(to_string: F)
+    where F: Fn(&NaiveDateTime) -> Result<String, E>, E: ::std::fmt::Debug
+{
+    use naive::{MIN_DATE, MAX_DATE};
+
+    assert_eq!(
+        to_string(&NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90)).ok(),
+        Some(r#""2016-07-08T09:10:48.090""#.into()));
+    assert_eq!(
+        to_string(&NaiveDate::from_ymd(2014, 7, 24).and_hms(12, 34, 6)).ok(),
+        Some(r#""2014-07-24T12:34:06""#.into()));
+    assert_eq!(
+        to_string(&NaiveDate::from_ymd(0, 1, 1).and_hms_milli(0, 0, 59, 1_000)).ok(),
+        Some(r#""0000-01-01T00:00:60""#.into()));
+    assert_eq!(
+        to_string(&NaiveDate::from_ymd(-1, 12, 31).and_hms_nano(23, 59, 59, 7)).ok(),
+        Some(r#""-0001-12-31T23:59:59.000000007""#.into()));
+    assert_eq!(
+        to_string(&MIN_DATE.and_hms(0, 0, 0)).ok(),
+        Some(r#""-262144-01-01T00:00:00""#.into()));
+    assert_eq!(
+        to_string(&MAX_DATE.and_hms_nano(23, 59, 59, 1_999_999_999)).ok(),
+        Some(r#""+262143-12-31T23:59:60.999999999""#.into()));
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_decodable_json<F, E>(from_str: F)
+    where F: Fn(&str) -> Result<NaiveDateTime, E>, E: ::std::fmt::Debug
+{
+    use naive::{MIN_DATE, MAX_DATE};
+
+    assert_eq!(
+        from_str(r#""2016-07-08T09:10:48.090""#).ok(),
+        Some(NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90)));
+    assert_eq!(
+        from_str(r#""2016-7-8T9:10:48.09""#).ok(),
+        Some(NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90)));
+    assert_eq!(
+        from_str(r#""2014-07-24T12:34:06""#).ok(),
+        Some(NaiveDate::from_ymd(2014, 7, 24).and_hms(12, 34, 6)));
+    assert_eq!(
+        from_str(r#""0000-01-01T00:00:60""#).ok(),
+        Some(NaiveDate::from_ymd(0, 1, 1).and_hms_milli(0, 0, 59, 1_000)));
+    assert_eq!(
+        from_str(r#""0-1-1T0:0:60""#).ok(),
+        Some(NaiveDate::from_ymd(0, 1, 1).and_hms_milli(0, 0, 59, 1_000)));
+    assert_eq!(
+        from_str(r#""-0001-12-31T23:59:59.000000007""#).ok(),
+        Some(NaiveDate::from_ymd(-1, 12, 31).and_hms_nano(23, 59, 59, 7)));
+    assert_eq!(
+        from_str(r#""-262144-01-01T00:00:00""#).ok(),
+        Some(MIN_DATE.and_hms(0, 0, 0)));
+    assert_eq!(
+        from_str(r#""+262143-12-31T23:59:60.999999999""#).ok(),
+        Some(MAX_DATE.and_hms_nano(23, 59, 59, 1_999_999_999)));
+    assert_eq!(
+        from_str(r#""+262143-12-31T23:59:60.9999999999997""#).ok(), // excess digits are ignored
+        Some(MAX_DATE.and_hms_nano(23, 59, 59, 1_999_999_999)));
+
+    // bad formats
+    assert!(from_str(r#""""#).is_err());
+    assert!(from_str(r#""2016-07-08""#).is_err());
+    assert!(from_str(r#""09:10:48.090""#).is_err());
+    assert!(from_str(r#""20160708T091048.090""#).is_err());
+    assert!(from_str(r#""2000-00-00T00:00:00""#).is_err());
+    assert!(from_str(r#""2000-02-30T00:00:00""#).is_err());
+    assert!(from_str(r#""2001-02-29T00:00:00""#).is_err());
+    assert!(from_str(r#""2002-02-28T24:00:00""#).is_err());
+    assert!(from_str(r#""2002-02-28T23:60:00""#).is_err());
+    assert!(from_str(r#""2002-02-28T23:59:61""#).is_err());
+    assert!(from_str(r#""2016-07-08T09:10:48,090""#).is_err());
+    assert!(from_str(r#""2016-07-08 09:10:48.090""#).is_err());
+    assert!(from_str(r#""2016-007-08T09:10:48.090""#).is_err());
+    assert!(from_str(r#""yyyy-mm-ddThh:mm:ss.fffffffff""#).is_err());
+    assert!(from_str(r#"20160708000000"#).is_err());
+    assert!(from_str(r#"{}"#).is_err());
+    // pre-0.3.0 rustc-serialize format is now invalid
+    assert!(from_str(r#"{"date":{"ymdf":20},"time":{"secs":0,"frac":0}}"#).is_err());
+    assert!(from_str(r#"null"#).is_err());
+}
+
+
+#[cfg(all(test, feature = "rustc-serialize"))]
+fn test_decodable_json_timestamp<F, E>(from_str: F)
+    where F: Fn(&str) -> Result<rustc_serialize::TsSeconds, E>, E: ::std::fmt::Debug
+{
+    assert_eq!(
+        *from_str("0").unwrap(),
+        NaiveDate::from_ymd(1970, 1, 1).and_hms(0, 0, 0),
+        "should parse integers as timestamps"
+    );
+    assert_eq!(
+        *from_str("-1").unwrap(),
+        NaiveDate::from_ymd(1969, 12, 31).and_hms(23, 59, 59),
+        "should parse integers as timestamps"
+    );
+}
+
+#[cfg(feature = "rustc-serialize")]
+pub mod rustc_serialize {
+    use std::ops::Deref;
+    use super::NaiveDateTime;
+    use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
+
+    impl Encodable for NaiveDateTime {
+        fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
+            format!("{:?}", self).encode(s)
+        }
+    }
+
+    impl Decodable for NaiveDateTime {
+        fn decode<D: Decoder>(d: &mut D) -> Result<NaiveDateTime, D::Error> {
+            d.read_str()?.parse().map_err(|_| d.error("invalid date time string"))
+        }
+    }
+
+    /// A `DateTime` that can be deserialized from a seconds-based timestamp
+    #[derive(Debug)]
+    #[deprecated(since = "1.4.2",
+                 note = "RustcSerialize will be removed before chrono 1.0, use Serde instead")]
+    pub struct TsSeconds(NaiveDateTime);
+
+    #[allow(deprecated)]
+    impl From<TsSeconds> for NaiveDateTime {
+        /// Pull the internal NaiveDateTime out
+        #[allow(deprecated)]
+        fn from(obj: TsSeconds) -> NaiveDateTime {
+            obj.0
+        }
+    }
+
+    #[allow(deprecated)]
+    impl Deref for TsSeconds {
+        type Target = NaiveDateTime;
+
+        #[allow(deprecated)]
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+
+    #[allow(deprecated)]
+    impl Decodable for TsSeconds {
+        #[allow(deprecated)]
+        fn decode<D: Decoder>(d: &mut D) -> Result<TsSeconds, D::Error> {
+            Ok(TsSeconds(
+                NaiveDateTime::from_timestamp_opt(d.read_i64()?, 0)
+                    .ok_or_else(|| d.error("invalid timestamp"))?))
+        }
+    }
+
+    #[cfg(test)] use rustc_serialize::json;
+
+    #[test]
+    fn test_encodable() {
+        super::test_encodable_json(json::encode);
+    }
+
+    #[test]
+    fn test_decodable() {
+        super::test_decodable_json(json::decode);
+    }
+
+    #[test]
+    fn test_decodable_timestamps() {
+        super::test_decodable_json_timestamp(json::decode);
+
+    }
+
+}
+
+/// Tools to help serializing/deserializing `NaiveDateTime`s
+#[cfg(feature = "serde")]
+pub mod serde {
+    use std::fmt;
+    use super::{NaiveDateTime};
+    use serdelib::{ser, de};
+
+    /// Serialize a `NaiveDateTime` as an RFC 3339 string
+    ///
+    /// See [the `serde` module](./serde/index.html) for alternate
+    /// serialization formats.
+    impl ser::Serialize for NaiveDateTime {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            struct FormatWrapped<'a, D: 'a> {
+                inner: &'a D
+            }
+
+            impl<'a, D: fmt::Debug> fmt::Display for FormatWrapped<'a, D> {
+                fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                    self.inner.fmt(f)
+                }
+            }
+
+            serializer.collect_str(&FormatWrapped { inner: &self })
+        }
+    }
+
+    struct NaiveDateTimeVisitor;
+
+    impl<'de> de::Visitor<'de> for NaiveDateTimeVisitor {
+        type Value = NaiveDateTime;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+        {
+            write!(formatter, "a formatted date and time string")
+        }
+
+        fn visit_str<E>(self, value: &str) -> Result<NaiveDateTime, E>
+            where E: de::Error
+        {
+            value.parse().map_err(|err| E::custom(format!("{}", err)))
+        }
+    }
+
+    impl<'de> de::Deserialize<'de> for NaiveDateTime {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(NaiveDateTimeVisitor)
+        }
+    }
+
+    /// Used to serialize/deserialize from nanosecond-precision timestamps
+    ///
+    /// # Example:
+    ///
+    /// ```rust
+    /// # // We mark this ignored so that we can test on 1.13 (which does not
+    /// # // support custom derive), and run tests with --ignored on beta and
+    /// # // nightly to actually trigger these.
+    /// #
+    /// # #[macro_use] extern crate serde_derive;
+    /// # extern crate serde_json;
+    /// # extern crate serde;
+    /// # extern crate chrono;
+    /// # use chrono::{TimeZone, NaiveDate, NaiveDateTime, Utc};
+    /// use chrono::naive::serde::ts_nanoseconds;
+    /// #[derive(Deserialize, Serialize)]
+    /// struct S {
+    ///     #[serde(with = "ts_nanoseconds")]
+    ///     time: NaiveDateTime
+    /// }
+    ///
+    /// # fn example() -> Result<S, serde_json::Error> {
+    /// let time = NaiveDate::from_ymd(2018, 5, 17).and_hms_nano(02, 04, 59, 918355733);
+    /// let my_s = S {
+    ///     time: time.clone(),
+    /// };
+    ///
+    /// let as_string = serde_json::to_string(&my_s)?;
+    /// assert_eq!(as_string, r#"{"time":1526522699918355733}"#);
+    /// let my_s: S = serde_json::from_str(&as_string)?;
+    /// assert_eq!(my_s.time, time);
+    /// # Ok(my_s)
+    /// # }
+    /// # fn main() { example().unwrap(); }
+    /// ```
+    pub mod ts_nanoseconds {
+        use std::fmt;
+        use serdelib::{ser, de};
+
+        use NaiveDateTime;
+
+        /// Serialize a UTC datetime into an integer number of nanoseconds since the epoch
+        ///
+        /// Intended for use with `serde`s `serialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # #[macro_use] extern crate serde;
+        /// # extern crate chrono;
+        /// # use chrono::{TimeZone, NaiveDate, NaiveDateTime, Utc};
+        /// # use serde::Serialize;
+        /// use chrono::naive::serde::ts_nanoseconds::serialize as to_nano_ts;
+        /// #[derive(Serialize)]
+        /// struct S {
+        ///     #[serde(serialize_with = "to_nano_ts")]
+        ///     time: NaiveDateTime
+        /// }
+        ///
+        /// # fn example() -> Result<String, serde_json::Error> {
+        /// let my_s = S {
+        ///     time: NaiveDate::from_ymd(2018, 5, 17).and_hms_nano(02, 04, 59, 918355733),
+        /// };
+        /// let as_string = serde_json::to_string(&my_s)?;
+        /// assert_eq!(as_string, r#"{"time":1526522699918355733}"#);
+        /// # Ok(as_string)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn serialize<S>(dt: &NaiveDateTime, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_i64(dt.timestamp_nanos())
+        }
+
+        /// Deserialize a `DateTime` from a nanoseconds timestamp
+        ///
+        /// Intended for use with `serde`s `deserialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate serde;
+        /// # extern crate chrono;
+        /// # use chrono::{NaiveDateTime, Utc};
+        /// # use serde::Deserialize;
+        /// use chrono::naive::serde::ts_nanoseconds::deserialize as from_nano_ts;
+        /// #[derive(Deserialize)]
+        /// struct S {
+        ///     #[serde(deserialize_with = "from_nano_ts")]
+        ///     time: NaiveDateTime
+        /// }
+        ///
+        /// # fn example() -> Result<S, serde_json::Error> {
+        /// let my_s: S = serde_json::from_str(r#"{ "time": 1526522699918355733 }"#)?;
+        /// # Ok(my_s)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn deserialize<'de, D>(d: D) -> Result<NaiveDateTime, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            Ok(try!(d.deserialize_i64(NaiveDateTimeFromNanoSecondsVisitor)))
+        }
+
+        struct NaiveDateTimeFromNanoSecondsVisitor;
+
+        impl<'de> de::Visitor<'de> for NaiveDateTimeFromNanoSecondsVisitor {
+            type Value = NaiveDateTime;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+            {
+                formatter.write_str("a unix timestamp")
+            }
+
+            fn visit_i64<E>(self, value: i64) -> Result<NaiveDateTime, E>
+                where E: de::Error
+            {
+                NaiveDateTime::from_timestamp_opt(value / 1_000_000_000,
+                                                 (value % 1_000_000_000) as u32)
+                    .ok_or_else(|| E::custom(format!("value is not a legal timestamp: {}", value)))
+            }
+
+            fn visit_u64<E>(self, value: u64) -> Result<NaiveDateTime, E>
+                where E: de::Error
+            {
+                NaiveDateTime::from_timestamp_opt(value as i64 / 1_000_000_000,
+                                                 (value as i64 % 1_000_000_000) as u32)
+                    .ok_or_else(|| E::custom(format!("value is not a legal timestamp: {}", value)))
+            }
+        }
+    }
+
+    /// Used to serialize/deserialize from millisecond-precision timestamps
+    ///
+    /// # Example:
+    ///
+    /// ```rust
+    /// # // We mark this ignored so that we can test on 1.13 (which does not
+    /// # // support custom derive), and run tests with --ignored on beta and
+    /// # // nightly to actually trigger these.
+    /// #
+    /// # #[macro_use] extern crate serde_derive;
+    /// # extern crate serde_json;
+    /// # extern crate serde;
+    /// # extern crate chrono;
+    /// # use chrono::{TimeZone, NaiveDate, NaiveDateTime, Utc};
+    /// use chrono::naive::serde::ts_milliseconds;
+    /// #[derive(Deserialize, Serialize)]
+    /// struct S {
+    ///     #[serde(with = "ts_milliseconds")]
+    ///     time: NaiveDateTime
+    /// }
+    ///
+    /// # fn example() -> Result<S, serde_json::Error> {
+    /// let time = NaiveDate::from_ymd(2018, 5, 17).and_hms_milli(02, 04, 59, 918);
+    /// let my_s = S {
+    ///     time: time.clone(),
+    /// };
+    ///
+    /// let as_string = serde_json::to_string(&my_s)?;
+    /// assert_eq!(as_string, r#"{"time":1526522699918}"#);
+    /// let my_s: S = serde_json::from_str(&as_string)?;
+    /// assert_eq!(my_s.time, time);
+    /// # Ok(my_s)
+    /// # }
+    /// # fn main() { example().unwrap(); }
+    /// ```
+    pub mod ts_milliseconds {
+        use std::fmt;
+        use serdelib::{ser, de};
+
+        use NaiveDateTime;
+
+        /// Serialize a UTC datetime into an integer number of milliseconds since the epoch
+        ///
+        /// Intended for use with `serde`s `serialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # #[macro_use] extern crate serde;
+        /// # extern crate chrono;
+        /// # use chrono::{TimeZone, NaiveDate, NaiveDateTime, Utc};
+        /// # use serde::Serialize;
+        /// use chrono::naive::serde::ts_milliseconds::serialize as to_milli_ts;
+        /// #[derive(Serialize)]
+        /// struct S {
+        ///     #[serde(serialize_with = "to_milli_ts")]
+        ///     time: NaiveDateTime
+        /// }
+        ///
+        /// # fn example() -> Result<String, serde_json::Error> {
+        /// let my_s = S {
+        ///     time: NaiveDate::from_ymd(2018, 5, 17).and_hms_milli(02, 04, 59, 918),
+        /// };
+        /// let as_string = serde_json::to_string(&my_s)?;
+        /// assert_eq!(as_string, r#"{"time":1526522699918}"#);
+        /// # Ok(as_string)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn serialize<S>(dt: &NaiveDateTime, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_i64(dt.timestamp_millis())
+        }
+
+        /// Deserialize a `DateTime` from a milliseconds timestamp
+        ///
+        /// Intended for use with `serde`s `deserialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate serde;
+        /// # extern crate chrono;
+        /// # use chrono::{NaiveDateTime, Utc};
+        /// # use serde::Deserialize;
+        /// use chrono::naive::serde::ts_milliseconds::deserialize as from_milli_ts;
+        /// #[derive(Deserialize)]
+        /// struct S {
+        ///     #[serde(deserialize_with = "from_milli_ts")]
+        ///     time: NaiveDateTime
+        /// }
+        ///
+        /// # fn example() -> Result<S, serde_json::Error> {
+        /// let my_s: S = serde_json::from_str(r#"{ "time": 1526522699918 }"#)?;
+        /// # Ok(my_s)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn deserialize<'de, D>(d: D) -> Result<NaiveDateTime, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            Ok(try!(d.deserialize_i64(NaiveDateTimeFromMilliSecondsVisitor)))
+        }
+
+        struct NaiveDateTimeFromMilliSecondsVisitor;
+
+        impl<'de> de::Visitor<'de> for NaiveDateTimeFromMilliSecondsVisitor {
+            type Value = NaiveDateTime;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+            {
+                formatter.write_str("a unix timestamp")
+            }
+
+            fn visit_i64<E>(self, value: i64) -> Result<NaiveDateTime, E>
+                where E: de::Error
+            {
+                NaiveDateTime::from_timestamp_opt(value / 1000,
+                                                ((value % 1000) * 1_000_000) as u32)
+                    .ok_or_else(|| E::custom(format!("value is not a legal timestamp: {}", value)))
+            }
+
+            fn visit_u64<E>(self, value: u64) -> Result<NaiveDateTime, E>
+                where E: de::Error
+            {
+                NaiveDateTime::from_timestamp_opt((value / 1000) as i64,
+                                                 ((value % 1000) * 1_000_000) as u32)
+                    .ok_or_else(|| E::custom(format!("value is not a legal timestamp: {}", value)))
+            }
+        }
+    }
+
+    /// Used to serialize/deserialize from second-precision timestamps
+    ///
+    /// # Example:
+    ///
+    /// ```rust
+    /// # // We mark this ignored so that we can test on 1.13 (which does not
+    /// # // support custom derive), and run tests with --ignored on beta and
+    /// # // nightly to actually trigger these.
+    /// #
+    /// # #[macro_use] extern crate serde_derive;
+    /// # extern crate serde_json;
+    /// # extern crate serde;
+    /// # extern crate chrono;
+    /// # use chrono::{TimeZone, NaiveDate, NaiveDateTime, Utc};
+    /// use chrono::naive::serde::ts_seconds;
+    /// #[derive(Deserialize, Serialize)]
+    /// struct S {
+    ///     #[serde(with = "ts_seconds")]
+    ///     time: NaiveDateTime
+    /// }
+    ///
+    /// # fn example() -> Result<S, serde_json::Error> {
+    /// let time = NaiveDate::from_ymd(2015, 5, 15).and_hms(10, 0, 0);
+    /// let my_s = S {
+    ///     time: time.clone(),
+    /// };
+    ///
+    /// let as_string = serde_json::to_string(&my_s)?;
+    /// assert_eq!(as_string, r#"{"time":1431684000}"#);
+    /// let my_s: S = serde_json::from_str(&as_string)?;
+    /// assert_eq!(my_s.time, time);
+    /// # Ok(my_s)
+    /// # }
+    /// # fn main() { example().unwrap(); }
+    /// ```
+    pub mod ts_seconds {
+        use std::fmt;
+        use serdelib::{ser, de};
+
+        use NaiveDateTime;
+
+        /// Serialize a UTC datetime into an integer number of seconds since the epoch
+        ///
+        /// Intended for use with `serde`s `serialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # #[macro_use] extern crate serde;
+        /// # extern crate chrono;
+        /// # use chrono::{TimeZone, NaiveDate, NaiveDateTime, Utc};
+        /// # use serde::Serialize;
+        /// use chrono::naive::serde::ts_seconds::serialize as to_ts;
+        /// #[derive(Serialize)]
+        /// struct S {
+        ///     #[serde(serialize_with = "to_ts")]
+        ///     time: NaiveDateTime
+        /// }
+        ///
+        /// # fn example() -> Result<String, serde_json::Error> {
+        /// let my_s = S {
+        ///     time: NaiveDate::from_ymd(2015, 5, 15).and_hms(10, 0, 0),
+        /// };
+        /// let as_string = serde_json::to_string(&my_s)?;
+        /// assert_eq!(as_string, r#"{"time":1431684000}"#);
+        /// # Ok(as_string)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn serialize<S>(dt: &NaiveDateTime, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.serialize_i64(dt.timestamp())
+        }
+
+        /// Deserialize a `DateTime` from a seconds timestamp
+        ///
+        /// Intended for use with `serde`s `deserialize_with` attribute.
+        ///
+        /// # Example:
+        ///
+        /// ```rust
+        /// # // We mark this ignored so that we can test on 1.13 (which does not
+        /// # // support custom derive), and run tests with --ignored on beta and
+        /// # // nightly to actually trigger these.
+        /// #
+        /// # #[macro_use] extern crate serde_derive;
+        /// # #[macro_use] extern crate serde_json;
+        /// # extern crate serde;
+        /// # extern crate chrono;
+        /// # use chrono::{NaiveDateTime, Utc};
+        /// # use serde::Deserialize;
+        /// use chrono::naive::serde::ts_seconds::deserialize as from_ts;
+        /// #[derive(Deserialize)]
+        /// struct S {
+        ///     #[serde(deserialize_with = "from_ts")]
+        ///     time: NaiveDateTime
+        /// }
+        ///
+        /// # fn example() -> Result<S, serde_json::Error> {
+        /// let my_s: S = serde_json::from_str(r#"{ "time": 1431684000 }"#)?;
+        /// # Ok(my_s)
+        /// # }
+        /// # fn main() { example().unwrap(); }
+        /// ```
+        pub fn deserialize<'de, D>(d: D) -> Result<NaiveDateTime, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            Ok(try!(d.deserialize_i64(NaiveDateTimeFromSecondsVisitor)))
+        }
+
+        struct NaiveDateTimeFromSecondsVisitor;
+
+        impl<'de> de::Visitor<'de> for NaiveDateTimeFromSecondsVisitor {
+            type Value = NaiveDateTime;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result
+            {
+                formatter.write_str("a unix timestamp")
+            }
+
+            fn visit_i64<E>(self, value: i64) -> Result<NaiveDateTime, E>
+                where E: de::Error
+            {
+                NaiveDateTime::from_timestamp_opt(value, 0)
+                    .ok_or_else(|| E::custom(format!("value is not a legal timestamp: {}", value)))
+            }
+
+            fn visit_u64<E>(self, value: u64) -> Result<NaiveDateTime, E>
+                where E: de::Error
+            {
+                NaiveDateTime::from_timestamp_opt(value as i64, 0)
+                    .ok_or_else(|| E::custom(format!("value is not a legal timestamp: {}", value)))
+            }
+        }
+    }
+
+    #[cfg(test)] extern crate serde_json;
+    #[cfg(test)] extern crate bincode;
+
+    #[test]
+    fn test_serde_serialize() {
+        super::test_encodable_json(self::serde_json::to_string);
+    }
+
+    #[test]
+    fn test_serde_deserialize() {
+        super::test_decodable_json(|input| self::serde_json::from_str(&input));
+    }
+
+    #[test]
+    fn test_serde_bincode() {
+        // Bincode is relevant to test separately from JSON because
+        // it is not self-describing.
+        use naive::NaiveDate;
+        use self::bincode::{Infinite, serialize, deserialize};
+
+        let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90);
+        let encoded = serialize(&dt, Infinite).unwrap();
+        let decoded: NaiveDateTime = deserialize(&encoded).unwrap();
+        assert_eq!(dt, decoded);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::NaiveDateTime;
+    use Datelike;
+    use naive::{NaiveDate, MIN_DATE, MAX_DATE};
+    use std::i64;
+    use oldtime::Duration;
+
+    #[test]
+    fn test_datetime_from_timestamp() {
+        let from_timestamp = |secs| NaiveDateTime::from_timestamp_opt(secs, 0);
+        let ymdhms = |y,m,d,h,n,s| NaiveDate::from_ymd(y,m,d).and_hms(h,n,s);
+        assert_eq!(from_timestamp(-1), Some(ymdhms(1969, 12, 31, 23, 59, 59)));
+        assert_eq!(from_timestamp(0), Some(ymdhms(1970, 1, 1, 0, 0, 0)));
+        assert_eq!(from_timestamp(1), Some(ymdhms(1970, 1, 1, 0, 0, 1)));
+        assert_eq!(from_timestamp(1_000_000_000), Some(ymdhms(2001, 9, 9, 1, 46, 40)));
+        assert_eq!(from_timestamp(0x7fffffff), Some(ymdhms(2038, 1, 19, 3, 14, 7)));
+        assert_eq!(from_timestamp(i64::MIN), None);
+        assert_eq!(from_timestamp(i64::MAX), None);
+    }
+
+    #[test]
+    fn test_datetime_add() {
+        fn check((y,m,d,h,n,s): (i32,u32,u32,u32,u32,u32), rhs: Duration,
+                 result: Option<(i32,u32,u32,u32,u32,u32)>) {
+            let lhs = NaiveDate::from_ymd(y, m, d).and_hms(h, n, s);
+            let sum = result.map(|(y,m,d,h,n,s)| NaiveDate::from_ymd(y, m, d).and_hms(h, n, s));
+            assert_eq!(lhs.checked_add_signed(rhs), sum);
+            assert_eq!(lhs.checked_sub_signed(-rhs), sum);
+        };
+
+        check((2014,5,6, 7,8,9), Duration::seconds(3600 + 60 + 1), Some((2014,5,6, 8,9,10)));
+        check((2014,5,6, 7,8,9), Duration::seconds(-(3600 + 60 + 1)), Some((2014,5,6, 6,7,8)));
+        check((2014,5,6, 7,8,9), Duration::seconds(86399), Some((2014,5,7, 7,8,8)));
+        check((2014,5,6, 7,8,9), Duration::seconds(86_400 * 10), Some((2014,5,16, 7,8,9)));
+        check((2014,5,6, 7,8,9), Duration::seconds(-86_400 * 10), Some((2014,4,26, 7,8,9)));
+        check((2014,5,6, 7,8,9), Duration::seconds(86_400 * 10), Some((2014,5,16, 7,8,9)));
+
+        // overflow check
+        // assumes that we have correct values for MAX/MIN_DAYS_FROM_YEAR_0 from `naive::date`.
+        // (they are private constants, but the equivalence is tested in that module.)
+        let max_days_from_year_0 = MAX_DATE.signed_duration_since(NaiveDate::from_ymd(0,1,1));
+        check((0,1,1, 0,0,0), max_days_from_year_0, Some((MAX_DATE.year(),12,31, 0,0,0)));
+        check((0,1,1, 0,0,0), max_days_from_year_0 + Duration::seconds(86399),
+              Some((MAX_DATE.year(),12,31, 23,59,59)));
+        check((0,1,1, 0,0,0), max_days_from_year_0 + Duration::seconds(86_400), None);
+        check((0,1,1, 0,0,0), Duration::max_value(), None);
+
+        let min_days_from_year_0 = MIN_DATE.signed_duration_since(NaiveDate::from_ymd(0,1,1));
+        check((0,1,1, 0,0,0), min_days_from_year_0, Some((MIN_DATE.year(),1,1, 0,0,0)));
+        check((0,1,1, 0,0,0), min_days_from_year_0 - Duration::seconds(1), None);
+        check((0,1,1, 0,0,0), Duration::min_value(), None);
+    }
+
+    #[test]
+    fn test_datetime_sub() {
+        let ymdhms = |y,m,d,h,n,s| NaiveDate::from_ymd(y,m,d).and_hms(h,n,s);
+        let since = NaiveDateTime::signed_duration_since;
+        assert_eq!(since(ymdhms(2014, 5, 6, 7, 8, 9), ymdhms(2014, 5, 6, 7, 8, 9)),
+                   Duration::zero());
+        assert_eq!(since(ymdhms(2014, 5, 6, 7, 8, 10), ymdhms(2014, 5, 6, 7, 8, 9)),
+                   Duration::seconds(1));
+        assert_eq!(since(ymdhms(2014, 5, 6, 7, 8, 9), ymdhms(2014, 5, 6, 7, 8, 10)),
+                   Duration::seconds(-1));
+        assert_eq!(since(ymdhms(2014, 5, 7, 7, 8, 9), ymdhms(2014, 5, 6, 7, 8, 10)),
+                   Duration::seconds(86399));
+        assert_eq!(since(ymdhms(2001, 9, 9, 1, 46, 39), ymdhms(1970, 1, 1, 0, 0, 0)),
+                   Duration::seconds(999_999_999));
+    }
+
+    #[test]
+    fn test_datetime_addassignment() {
+        let ymdhms = |y,m,d,h,n,s| NaiveDate::from_ymd(y,m,d).and_hms(h,n,s);
+        let mut date = ymdhms(2016, 10, 1, 10, 10, 10);
+        date += Duration::minutes(10_000_000);
+        assert_eq!(date,  ymdhms(2035, 10, 6, 20, 50, 10));
+        date += Duration::days(10);
+        assert_eq!(date,  ymdhms(2035, 10, 16, 20, 50, 10));
+    }
+
+    #[test]
+    fn test_datetime_subassignment() {
+        let ymdhms = |y,m,d,h,n,s| NaiveDate::from_ymd(y,m,d).and_hms(h,n,s);
+        let mut date = ymdhms(2016, 10, 1, 10, 10, 10);
+        date -= Duration::minutes(10_000_000);
+        assert_eq!(date,  ymdhms(1997, 9, 26, 23, 30, 10));
+        date -= Duration::days(10);
+        assert_eq!(date,  ymdhms(1997, 9, 16, 23, 30, 10));
+    }
+
+    #[test]
+    fn test_datetime_timestamp() {
+        let to_timestamp = |y,m,d,h,n,s| NaiveDate::from_ymd(y,m,d).and_hms(h,n,s).timestamp();
+        assert_eq!(to_timestamp(1969, 12, 31, 23, 59, 59), -1);
+        assert_eq!(to_timestamp(1970, 1, 1, 0, 0, 0), 0);
+        assert_eq!(to_timestamp(1970, 1, 1, 0, 0, 1), 1);
+        assert_eq!(to_timestamp(2001, 9, 9, 1, 46, 40), 1_000_000_000);
+        assert_eq!(to_timestamp(2038, 1, 19, 3, 14, 7), 0x7fffffff);
+    }
+
+    #[test]
+    fn test_datetime_from_str() {
+        // valid cases
+        let valid = [
+            "2015-2-18T23:16:9.15",
+            "-77-02-18T23:16:09",
+            "  +82701  -  05  -  6  T  15  :  9  : 60.898989898989   ",
+        ];
+        for &s in &valid {
+            let d = match s.parse::<NaiveDateTime>() {
+                Ok(d) => d,
+                Err(e) => panic!("parsing `{}` has failed: {}", s, e)
+            };
+            let s_ = format!("{:?}", d);
+            // `s` and `s_` may differ, but `s.parse()` and `s_.parse()` must be same
+            let d_ = match s_.parse::<NaiveDateTime>() {
+                Ok(d) => d,
+                Err(e) => panic!("`{}` is parsed into `{:?}`, but reparsing that has failed: {}",
+                                 s, d, e)
+            };
+            assert!(d == d_, "`{}` is parsed into `{:?}`, but reparsed result \
+                              `{:?}` does not match", s, d, d_);
+        }
+
+        // some invalid cases
+        // since `ParseErrorKind` is private, all we can do is to check if there was an error
+        assert!("".parse::<NaiveDateTime>().is_err());
+        assert!("x".parse::<NaiveDateTime>().is_err());
+        assert!("15".parse::<NaiveDateTime>().is_err());
+        assert!("15:8:9".parse::<NaiveDateTime>().is_err());
+        assert!("15-8-9".parse::<NaiveDateTime>().is_err());
+        assert!("2015-15-15T15:15:15".parse::<NaiveDateTime>().is_err());
+        assert!("2012-12-12T12:12:12x".parse::<NaiveDateTime>().is_err());
+        assert!("2012-123-12T12:12:12".parse::<NaiveDateTime>().is_err());
+        assert!("+ 82701-123-12T12:12:12".parse::<NaiveDateTime>().is_err());
+        assert!("+802701-123-12T12:12:12".parse::<NaiveDateTime>().is_err()); // out-of-bound
+    }
+
+    #[test]
+    fn test_datetime_parse_from_str() {
+        let ymdhms = |y,m,d,h,n,s| NaiveDate::from_ymd(y,m,d).and_hms(h,n,s);
+        let ymdhmsn =
+            |y,m,d,h,n,s,nano| NaiveDate::from_ymd(y, m, d).and_hms_nano(h, n, s, nano);
+        assert_eq!(NaiveDateTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+                   Ok(ymdhms(2014, 5, 7, 12, 34, 56))); // ignore offset
+        assert_eq!(NaiveDateTime::parse_from_str("2015-W06-1 000000", "%G-W%V-%u%H%M%S"),
+                   Ok(ymdhms(2015, 2, 2, 0, 0, 0)));
+        assert_eq!(NaiveDateTime::parse_from_str("Fri, 09 Aug 2013 23:54:35 GMT",
+                                                 "%a, %d %b %Y %H:%M:%S GMT"),
+                   Ok(ymdhms(2013, 8, 9, 23, 54, 35)));
+        assert!(NaiveDateTime::parse_from_str("Sat, 09 Aug 2013 23:54:35 GMT",
+                                              "%a, %d %b %Y %H:%M:%S GMT").is_err());
+        assert!(NaiveDateTime::parse_from_str("2014-5-7 12:3456", "%Y-%m-%d %H:%M:%S").is_err());
+        assert!(NaiveDateTime::parse_from_str("12:34:56", "%H:%M:%S").is_err()); // insufficient
+        assert_eq!(NaiveDateTime::parse_from_str("1441497364", "%s"),
+                   Ok(ymdhms(2015, 9, 5, 23, 56, 4)));
+        assert_eq!(NaiveDateTime::parse_from_str("1283929614.1234", "%s.%f"),
+                   Ok(ymdhmsn(2010, 9, 8, 7, 6, 54, 1234)));
+        assert_eq!(NaiveDateTime::parse_from_str("1441497364.649", "%s%.3f"),
+                   Ok(ymdhmsn(2015, 9, 5, 23, 56, 4, 649000000)));
+        assert_eq!(NaiveDateTime::parse_from_str("1497854303.087654", "%s%.6f"),
+                   Ok(ymdhmsn(2017, 6, 19, 6, 38, 23, 87654000)));
+        assert_eq!(NaiveDateTime::parse_from_str("1437742189.918273645", "%s%.9f"),
+                   Ok(ymdhmsn(2015, 7, 24, 12, 49, 49, 918273645)));
+    }
+
+    #[test]
+    fn test_datetime_format() {
+        let dt = NaiveDate::from_ymd(2010, 9, 8).and_hms_milli(7, 6, 54, 321);
+        assert_eq!(dt.format("%c").to_string(), "Wed Sep  8 07:06:54 2010");
+        assert_eq!(dt.format("%s").to_string(), "1283929614");
+        assert_eq!(dt.format("%t%n%%%n%t").to_string(), "\t\n%\n\t");
+
+        // a horror of leap second: coming near to you.
+        let dt = NaiveDate::from_ymd(2012, 6, 30).and_hms_milli(23, 59, 59, 1_000);
+        assert_eq!(dt.format("%c").to_string(), "Sat Jun 30 23:59:60 2012");
+        assert_eq!(dt.format("%s").to_string(), "1341100799"); // not 1341100800, it's intentional.
+    }
+
+    #[test]
+    fn test_datetime_add_sub_invariant() { // issue #37
+        let base = NaiveDate::from_ymd(2000, 1, 1).and_hms(0, 0, 0);
+        let t = -946684799990000;
+        let time = base + Duration::microseconds(t);
+        assert_eq!(t, time.signed_duration_since(base).num_microseconds().unwrap());
+    }
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/naive/internals.rs cargo-0.33.0/vendor/chrono/src/naive/internals.rs
--- cargo-0.32.0/vendor/chrono/src/naive/internals.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/naive/internals.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,779 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! The internal implementation of the calendar and ordinal date.
+//!
+//! The current implementation is optimized for determining year, month, day and day of week.
+//! 4-bit `YearFlags` map to one of 14 possible classes of year in the Gregorian calendar,
+//! which are included in every packed `NaiveDate` instance.
+//! The conversion between the packed calendar date (`Mdf`) and the ordinal date (`Of`) is
+//! based on the moderately-sized lookup table (~1.5KB)
+//! and the packed representation is chosen for the efficient lookup.
+//! Every internal data structure does not validate its input,
+//! but the conversion keeps the valid value valid and the invalid value invalid
+//! so that the user-facing `NaiveDate` can validate the input as late as possible.
+
+#![allow(dead_code)] // some internal methods have been left for consistency
+
+use std::{i32, fmt};
+use num_traits::FromPrimitive;
+use Weekday;
+use div::{div_rem, mod_floor};
+
+/// The internal date representation. This also includes the packed `Mdf` value.
+pub type DateImpl = i32;
+
+pub const MAX_YEAR: DateImpl = i32::MAX >> 13;
+pub const MIN_YEAR: DateImpl = i32::MIN >> 13;
+
+/// The year flags (aka the dominical letter).
+///
+/// There are 14 possible classes of year in the Gregorian calendar:
+/// common and leap years starting with Monday through Sunday.
+/// The `YearFlags` stores this information into 4 bits `abbb`,
+/// where `a` is `1` for the common year (simplifies the `Of` validation)
+/// and `bbb` is a non-zero `Weekday` (mapping `Mon` to 7) of the last day in the past year
+/// (simplifies the day of week calculation from the 1-based ordinal).
+#[derive(PartialEq, Eq, Copy, Clone)]
+pub struct YearFlags(pub u8);
+
+pub const A: YearFlags = YearFlags(0o15); pub const AG: YearFlags = YearFlags(0o05);
+pub const B: YearFlags = YearFlags(0o14); pub const BA: YearFlags = YearFlags(0o04);
+pub const C: YearFlags = YearFlags(0o13); pub const CB: YearFlags = YearFlags(0o03);
+pub const D: YearFlags = YearFlags(0o12); pub const DC: YearFlags = YearFlags(0o02);
+pub const E: YearFlags = YearFlags(0o11); pub const ED: YearFlags = YearFlags(0o01);
+pub const F: YearFlags = YearFlags(0o17); pub const FE: YearFlags = YearFlags(0o07);
+pub const G: YearFlags = YearFlags(0o16); pub const GF: YearFlags = YearFlags(0o06);
+
+static YEAR_TO_FLAGS: [YearFlags; 400] = [
+    BA, G, F, E, DC, B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F,
+    ED, C, B, A, GF, E, D, C, BA, G, F, E, DC, B, A, G, FE, D, C, B,
+    AG, F, E, D, CB, A, G, F, ED, C, B, A, GF, E, D, C, BA, G, F, E,
+    DC, B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A,
+    GF, E, D, C, BA, G, F, E, DC, B, A, G, FE, D, C, B, AG, F, E, D, // 100
+    C,  B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A,
+    GF, E, D, C, BA, G, F, E, DC, B, A, G, FE, D, C, B, AG, F, E, D,
+    CB, A, G, F, ED, C, B, A, GF, E, D, C, BA, G, F, E, DC, B, A, G,
+    FE, D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A, GF, E, D, C,
+    BA, G, F, E, DC, B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F, // 200
+    E,  D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A, GF, E, D, C,
+    BA, G, F, E, DC, B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F,
+    ED, C, B, A, GF, E, D, C, BA, G, F, E, DC, B, A, G, FE, D, C, B,
+    AG, F, E, D, CB, A, G, F, ED, C, B, A, GF, E, D, C, BA, G, F, E,
+    DC, B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A, // 300
+    G,  F, E, D, CB, A, G, F, ED, C, B, A, GF, E, D, C, BA, G, F, E,
+    DC, B, A, G, FE, D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A,
+    GF, E, D, C, BA, G, F, E, DC, B, A, G, FE, D, C, B, AG, F, E, D,
+    CB, A, G, F, ED, C, B, A, GF, E, D, C, BA, G, F, E, DC, B, A, G,
+    FE, D, C, B, AG, F, E, D, CB, A, G, F, ED, C, B, A, GF, E, D, C, // 400
+];
+
+static YEAR_DELTAS: [u8; 401] = [
+     0,  1,  1,  1,  1,  2,  2,  2,  2,  3,  3,  3,  3,  4,  4,  4,  4,  5,  5,  5,
+     5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10, 10, 10,
+    10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15,
+    15, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20,
+    20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, // 100
+    25, 25, 25, 25, 25, 26, 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29,
+    29, 30, 30, 30, 30, 31, 31, 31, 31, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34,
+    34, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39,
+    39, 40, 40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, 44, 44, 44,
+    44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, 48, 48, 49, 49, 49, // 200
+    49, 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, 51, 51, 52, 52, 52, 52, 53, 53, 53,
+    53, 54, 54, 54, 54, 55, 55, 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 58, 58, 58,
+    58, 59, 59, 59, 59, 60, 60, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 63, 63, 63,
+    63, 64, 64, 64, 64, 65, 65, 65, 65, 66, 66, 66, 66, 67, 67, 67, 67, 68, 68, 68,
+    68, 69, 69, 69, 69, 70, 70, 70, 70, 71, 71, 71, 71, 72, 72, 72, 72, 73, 73, 73, // 300
+    73, 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 76, 76, 76, 76, 77, 77, 77,
+    77, 78, 78, 78, 78, 79, 79, 79, 79, 80, 80, 80, 80, 81, 81, 81, 81, 82, 82, 82,
+    82, 83, 83, 83, 83, 84, 84, 84, 84, 85, 85, 85, 85, 86, 86, 86, 86, 87, 87, 87,
+    87, 88, 88, 88, 88, 89, 89, 89, 89, 90, 90, 90, 90, 91, 91, 91, 91, 92, 92, 92,
+    92, 93, 93, 93, 93, 94, 94, 94, 94, 95, 95, 95, 95, 96, 96, 96, 96, 97, 97, 97, 97 // 400+1
+];
+
+pub fn cycle_to_yo(cycle: u32) -> (u32, u32) {
+    let (mut year_mod_400, mut ordinal0) = div_rem(cycle, 365);
+    let delta = u32::from(YEAR_DELTAS[year_mod_400 as usize]);
+    if ordinal0 < delta {
+        year_mod_400 -= 1;
+        ordinal0 += 365 - u32::from(YEAR_DELTAS[year_mod_400 as usize]);
+    } else {
+        ordinal0 -= delta;
+    }
+    (year_mod_400, ordinal0 + 1)
+}
+
+pub fn yo_to_cycle(year_mod_400: u32, ordinal: u32) -> u32 {
+    year_mod_400 * 365 + u32::from(YEAR_DELTAS[year_mod_400 as usize]) + ordinal - 1
+}
+
+impl YearFlags {
+    #[inline]
+    pub fn from_year(year: i32) -> YearFlags {
+        let year = mod_floor(year, 400);
+        YearFlags::from_year_mod_400(year)
+    }
+
+    #[inline]
+    pub fn from_year_mod_400(year: i32) -> YearFlags {
+        YEAR_TO_FLAGS[year as usize]
+    }
+
+    #[inline]
+    pub fn ndays(&self) -> u32 {
+        let YearFlags(flags) = *self;
+        366 - u32::from(flags >> 3)
+    }
+
+    #[inline]
+    pub fn isoweek_delta(&self) -> u32 {
+        let YearFlags(flags) = *self;
+        let mut delta = u32::from(flags) & 0b0111;
+        if delta < 3 { delta += 7; }
+        delta
+    }
+
+    #[inline]
+    pub fn nisoweeks(&self) -> u32 {
+        let YearFlags(flags) = *self;
+        52 + ((0b0000_0100_0000_0110 >> flags as usize) & 1)
+    }
+}
+
+impl fmt::Debug for YearFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let YearFlags(flags) = *self;
+        match flags {
+            0o15 => "A".fmt(f),  0o05 => "AG".fmt(f),
+            0o14 => "B".fmt(f),  0o04 => "BA".fmt(f),
+            0o13 => "C".fmt(f),  0o03 => "CB".fmt(f),
+            0o12 => "D".fmt(f),  0o02 => "DC".fmt(f),
+            0o11 => "E".fmt(f),  0o01 => "ED".fmt(f),
+            0o10 => "F?".fmt(f), 0o00 => "FE?".fmt(f), // non-canonical
+            0o17 => "F".fmt(f),  0o07 => "FE".fmt(f),
+            0o16 => "G".fmt(f),  0o06 => "GF".fmt(f),
+            _ => write!(f, "YearFlags({})", flags),
+        }
+    }
+}
+
+pub const MIN_OL: u32 = 1 << 1;
+pub const MAX_OL: u32 = 366 << 1; // larger than the non-leap last day `(365 << 1) | 1`
+pub const MIN_MDL: u32 = (1 << 6) | (1 << 1);
+pub const MAX_MDL: u32 = (12 << 6) | (31 << 1) | 1;
+
+const XX: i8 = -128;
+static MDL_TO_OL: [i8; (MAX_MDL as usize + 1)] = [
+     XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX,
+     XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX,
+     XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX,
+     XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, XX, // 0
+     XX, XX, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, // 1
+     XX, XX, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, XX, XX, XX, XX, XX, // 2
+     XX, XX, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74,
+     72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74,
+     72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74,
+     72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, // 3
+     XX, XX, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76,
+     74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76,
+     74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76,
+     74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, XX, XX, // 4
+     XX, XX, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80,
+     78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80,
+     78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80,
+     78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, // 5
+     XX, XX, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82,
+     80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82,
+     80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82,
+     80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, XX, XX, // 6
+     XX, XX, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86,
+     84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86,
+     84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86,
+     84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, // 7
+     XX, XX, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88,
+     86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88,
+     86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88,
+     86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, // 8
+     XX, XX, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90,
+     88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90,
+     88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90,
+     88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, XX, XX, // 9
+     XX, XX, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94,
+     92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94,
+     92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94,
+     92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, // 10
+     XX, XX, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96,
+     94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96,
+     94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96,
+     94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, XX, XX, // 11
+     XX, XX, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100,
+     98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100,
+     98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100,
+     98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, // 12
+];
+
+static OL_TO_MDL: [u8; (MAX_OL as usize + 1)] = [
+      0,  0,                                                         // 0
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,         // 1
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66,                             // 2
+         74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74,
+     72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74,
+     72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74,
+     72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72, 74, 72,     // 3
+         76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76,
+     74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76,
+     74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76,
+     74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74, 76, 74,             // 4
+         80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80,
+     78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80,
+     78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80,
+     78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78, 80, 78,     // 5
+         82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82,
+     80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82,
+     80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82,
+     80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80, 82, 80,             // 6
+         86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86,
+     84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86,
+     84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86,
+     84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84, 86, 84,     // 7
+         88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88,
+     86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88,
+     86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88,
+     86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86, 88, 86,     // 8
+         90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90,
+     88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90,
+     88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90,
+     88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88, 90, 88,             // 9
+         94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94,
+     92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94,
+     92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94,
+     92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92, 94, 92,     // 10
+         96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96,
+     94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96,
+     94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96,
+     94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94, 96, 94,             // 11
+        100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100,
+     98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100,
+     98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100,
+     98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,100, 98,     // 12
+];
+
+/// Ordinal (day of year) and year flags: `(ordinal << 4) | flags`.
+///
+/// The whole bits except for the least 3 bits are referred as `Ol` (ordinal and leap flag),
+/// which is an index to the `OL_TO_MDL` lookup table.
+#[derive(PartialEq, PartialOrd, Copy, Clone)]
+pub struct Of(pub u32);
+
+impl Of {
+    #[inline]
+    fn clamp_ordinal(ordinal: u32) -> u32 {
+        if ordinal > 366 {0} else {ordinal}
+    }
+
+    #[inline]
+    pub fn new(ordinal: u32, YearFlags(flags): YearFlags) -> Of {
+        let ordinal = Of::clamp_ordinal(ordinal);
+        Of((ordinal << 4) | u32::from(flags))
+    }
+
+    #[inline]
+    pub fn from_mdf(Mdf(mdf): Mdf) -> Of {
+        let mdl = mdf >> 3;
+        match MDL_TO_OL.get(mdl as usize) {
+            Some(&v) => Of(mdf.wrapping_sub((i32::from(v) as u32 & 0x3ff) << 3)),
+            None => Of(0)
+        }
+    }
+
+    #[inline]
+    pub fn valid(&self) -> bool {
+        let Of(of) = *self;
+        let ol = of >> 3;
+        MIN_OL <= ol && ol <= MAX_OL
+    }
+
+    #[inline]
+    pub fn ordinal(&self) -> u32 {
+        let Of(of) = *self;
+        of >> 4
+    }
+
+    #[inline]
+    pub fn with_ordinal(&self, ordinal: u32) -> Of {
+        let ordinal = Of::clamp_ordinal(ordinal);
+        let Of(of) = *self;
+        Of((of & 0b1111) | (ordinal << 4))
+    }
+
+    #[inline]
+    pub fn flags(&self) -> YearFlags {
+        let Of(of) = *self;
+        YearFlags((of & 0b1111) as u8)
+    }
+
+    #[inline]
+    pub fn with_flags(&self, YearFlags(flags): YearFlags) -> Of {
+        let Of(of) = *self;
+        Of((of & !0b1111) | u32::from(flags))
+    }
+
+    #[inline]
+    pub fn weekday(&self) -> Weekday {
+        let Of(of) = *self;
+        Weekday::from_u32(((of >> 4) + (of & 0b111)) % 7).unwrap()
+    }
+
+    #[inline]
+    pub fn isoweekdate_raw(&self) -> (u32, Weekday) {
+        // week ordinal = ordinal + delta
+        let Of(of) = *self;
+        let weekord = (of >> 4).wrapping_add(self.flags().isoweek_delta());
+        (weekord / 7, Weekday::from_u32(weekord % 7).unwrap())
+    }
+
+    #[inline]
+    pub fn to_mdf(&self) -> Mdf {
+        Mdf::from_of(*self)
+    }
+
+    #[inline]
+    pub fn succ(&self) -> Of {
+        let Of(of) = *self;
+        Of(of + (1 << 4))
+    }
+
+    #[inline]
+    pub fn pred(&self) -> Of {
+        let Of(of) = *self;
+        Of(of - (1 << 4))
+    }
+}
+
+impl fmt::Debug for Of {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let Of(of) = *self;
+        write!(f, "Of(({} << 4) | {:#04o} /*{:?}*/)",
+               of >> 4, of & 0b1111, YearFlags((of & 0b1111) as u8))
+    }
+}
+
+/// Month, day of month and year flags: `(month << 9) | (day << 4) | flags`
+///
+/// The whole bits except for the least 3 bits are referred as `Mdl`
+/// (month, day of month and leap flag),
+/// which is an index to the `MDL_TO_OL` lookup table.
+#[derive(PartialEq, PartialOrd, Copy, Clone)]
+pub struct Mdf(pub u32);
+
+impl Mdf {
+    #[inline]
+    fn clamp_month(month: u32) -> u32 {
+        if month > 12 {0} else {month}
+    }
+
+    #[inline]
+    fn clamp_day(day: u32) -> u32 {
+        if day > 31 {0} else {day}
+    }
+
+    #[inline]
+    pub fn new(month: u32, day: u32, YearFlags(flags): YearFlags) -> Mdf {
+        let month = Mdf::clamp_month(month);
+        let day = Mdf::clamp_day(day);
+        Mdf((month << 9) | (day << 4) | u32::from(flags))
+    }
+
+    #[inline]
+    pub fn from_of(Of(of): Of) -> Mdf {
+        let ol = of >> 3;
+        match OL_TO_MDL.get(ol as usize) {
+            Some(&v) => Mdf(of + (u32::from(v) << 3)),
+            None => Mdf(0)
+        }
+    }
+
+    #[inline]
+    pub fn valid(&self) -> bool {
+        let Mdf(mdf) = *self;
+        let mdl = mdf >> 3;
+        match MDL_TO_OL.get(mdl as usize) {
+            Some(&v) => v >= 0,
+            None => false
+        }
+    }
+
+    #[inline]
+    pub fn month(&self) -> u32 {
+        let Mdf(mdf) = *self;
+        mdf >> 9
+    }
+
+    #[inline]
+    pub fn with_month(&self, month: u32) -> Mdf {
+        let month = Mdf::clamp_month(month);
+        let Mdf(mdf) = *self;
+        Mdf((mdf & 0b1_1111_1111) | (month << 9))
+    }
+
+    #[inline]
+    pub fn day(&self) -> u32 {
+        let Mdf(mdf) = *self;
+        (mdf >> 4) & 0b1_1111
+    }
+
+    #[inline]
+    pub fn with_day(&self, day: u32) -> Mdf {
+        let day = Mdf::clamp_day(day);
+        let Mdf(mdf) = *self;
+        Mdf((mdf & !0b1_1111_0000) | (day << 4))
+    }
+
+    #[inline]
+    pub fn flags(&self) -> YearFlags {
+        let Mdf(mdf) = *self;
+        YearFlags((mdf & 0b1111) as u8)
+    }
+
+    #[inline]
+    pub fn with_flags(&self, YearFlags(flags): YearFlags) -> Mdf {
+        let Mdf(mdf) = *self;
+        Mdf((mdf & !0b1111) | u32::from(flags))
+    }
+
+    #[inline]
+    pub fn to_of(&self) -> Of {
+        Of::from_mdf(*self)
+    }
+}
+
+impl fmt::Debug for Mdf {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let Mdf(mdf) = *self;
+        write!(f, "Mdf(({} << 9) | ({} << 4) | {:#04o} /*{:?}*/)",
+               mdf >> 9, (mdf >> 4) & 0b1_1111, mdf & 0b1111, YearFlags((mdf & 0b1111) as u8))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[cfg(test)] extern crate num_iter;
+    #[cfg(bench)] extern crate test;
+
+    use Weekday;
+    use super::{Of, Mdf};
+    use super::{YearFlags, A, B, C, D, E, F, G, AG, BA, CB, DC, ED, FE, GF};
+    use self::num_iter::range_inclusive;
+    use std::u32;
+
+    const NONLEAP_FLAGS: [YearFlags; 7] = [A, B, C, D, E, F, G];
+    const LEAP_FLAGS: [YearFlags; 7] = [AG, BA, CB, DC, ED, FE, GF];
+    const FLAGS: [YearFlags; 14] = [A, B, C, D, E, F, G, AG, BA, CB, DC, ED, FE, GF];
+
+    #[test]
+    fn test_year_flags_ndays_from_year() {
+        assert_eq!(YearFlags::from_year(2014).ndays(), 365);
+        assert_eq!(YearFlags::from_year(2012).ndays(), 366);
+        assert_eq!(YearFlags::from_year(2000).ndays(), 366);
+        assert_eq!(YearFlags::from_year(1900).ndays(), 365);
+        assert_eq!(YearFlags::from_year(1600).ndays(), 366);
+        assert_eq!(YearFlags::from_year(   1).ndays(), 365);
+        assert_eq!(YearFlags::from_year(   0).ndays(), 366); // 1 BCE (proleptic Gregorian)
+        assert_eq!(YearFlags::from_year(  -1).ndays(), 365); // 2 BCE
+        assert_eq!(YearFlags::from_year(  -4).ndays(), 366); // 5 BCE
+        assert_eq!(YearFlags::from_year( -99).ndays(), 365); // 100 BCE
+        assert_eq!(YearFlags::from_year(-100).ndays(), 365); // 101 BCE
+        assert_eq!(YearFlags::from_year(-399).ndays(), 365); // 400 BCE
+        assert_eq!(YearFlags::from_year(-400).ndays(), 366); // 401 BCE
+    }
+
+    #[test]
+    fn test_year_flags_nisoweeks() {
+        assert_eq!(A.nisoweeks(), 52);
+        assert_eq!(B.nisoweeks(), 52);
+        assert_eq!(C.nisoweeks(), 52);
+        assert_eq!(D.nisoweeks(), 53);
+        assert_eq!(E.nisoweeks(), 52);
+        assert_eq!(F.nisoweeks(), 52);
+        assert_eq!(G.nisoweeks(), 52);
+        assert_eq!(AG.nisoweeks(), 52);
+        assert_eq!(BA.nisoweeks(), 52);
+        assert_eq!(CB.nisoweeks(), 52);
+        assert_eq!(DC.nisoweeks(), 53);
+        assert_eq!(ED.nisoweeks(), 53);
+        assert_eq!(FE.nisoweeks(), 52);
+        assert_eq!(GF.nisoweeks(), 52);
+    }
+
+    #[cfg(bench)]
+    #[bench]
+    fn bench_year_flags_from_year(bh: &mut test::Bencher) {
+        bh.iter(|| {
+            for year in -999i32..1000 {
+                YearFlags::from_year(year);
+            }
+        });
+    }
+
+    #[test]
+    fn test_of() {
+        fn check(expected: bool, flags: YearFlags, ordinal1: u32, ordinal2: u32) {
+            for ordinal in range_inclusive(ordinal1, ordinal2) {
+                let of = Of::new(ordinal, flags);
+                assert!(of.valid() == expected,
+                        "ordinal {} = {:?} should be {} for dominical year {:?}",
+                        ordinal, of, if expected {"valid"} else {"invalid"}, flags);
+            }
+        }
+
+        for &flags in NONLEAP_FLAGS.iter() {
+            check(false, flags, 0, 0);
+            check(true, flags, 1, 365);
+            check(false, flags, 366, 1024);
+            check(false, flags, u32::MAX, u32::MAX);
+        }
+
+        for &flags in LEAP_FLAGS.iter() {
+            check(false, flags, 0, 0);
+            check(true, flags, 1, 366);
+            check(false, flags, 367, 1024);
+            check(false, flags, u32::MAX, u32::MAX);
+        }
+    }
+
+    #[test]
+    fn test_mdf_valid() {
+        fn check(expected: bool, flags: YearFlags, month1: u32, day1: u32,
+                 month2: u32, day2: u32) {
+            for month in range_inclusive(month1, month2) {
+                for day in range_inclusive(day1, day2) {
+                    let mdf = Mdf::new(month, day, flags);
+                    assert!(mdf.valid() == expected,
+                            "month {} day {} = {:?} should be {} for dominical year {:?}",
+                            month, day, mdf, if expected {"valid"} else {"invalid"}, flags);
+                }
+            }
+        }
+
+        for &flags in NONLEAP_FLAGS.iter() {
+            check(false, flags, 0, 0, 0, 1024);
+            check(false, flags, 0, 0, 16, 0);
+            check(true, flags,  1, 1,  1, 31); check(false, flags,  1, 32,  1, 1024);
+            check(true, flags,  2, 1,  2, 28); check(false, flags,  2, 29,  2, 1024);
+            check(true, flags,  3, 1,  3, 31); check(false, flags,  3, 32,  3, 1024);
+            check(true, flags,  4, 1,  4, 30); check(false, flags,  4, 31,  4, 1024);
+            check(true, flags,  5, 1,  5, 31); check(false, flags,  5, 32,  5, 1024);
+            check(true, flags,  6, 1,  6, 30); check(false, flags,  6, 31,  6, 1024);
+            check(true, flags,  7, 1,  7, 31); check(false, flags,  7, 32,  7, 1024);
+            check(true, flags,  8, 1,  8, 31); check(false, flags,  8, 32,  8, 1024);
+            check(true, flags,  9, 1,  9, 30); check(false, flags,  9, 31,  9, 1024);
+            check(true, flags, 10, 1, 10, 31); check(false, flags, 10, 32, 10, 1024);
+            check(true, flags, 11, 1, 11, 30); check(false, flags, 11, 31, 11, 1024);
+            check(true, flags, 12, 1, 12, 31); check(false, flags, 12, 32, 12, 1024);
+            check(false, flags, 13, 0, 16, 1024);
+            check(false, flags, u32::MAX, 0, u32::MAX, 1024);
+            check(false, flags, 0, u32::MAX, 16, u32::MAX);
+            check(false, flags, u32::MAX, u32::MAX, u32::MAX, u32::MAX);
+        }
+
+        for &flags in LEAP_FLAGS.iter() {
+            check(false, flags, 0, 0, 0, 1024);
+            check(false, flags, 0, 0, 16, 0);
+            check(true, flags,  1, 1,  1, 31); check(false, flags,  1, 32,  1, 1024);
+            check(true, flags,  2, 1,  2, 29); check(false, flags,  2, 30,  2, 1024);
+            check(true, flags,  3, 1,  3, 31); check(false, flags,  3, 32,  3, 1024);
+            check(true, flags,  4, 1,  4, 30); check(false, flags,  4, 31,  4, 1024);
+            check(true, flags,  5, 1,  5, 31); check(false, flags,  5, 32,  5, 1024);
+            check(true, flags,  6, 1,  6, 30); check(false, flags,  6, 31,  6, 1024);
+            check(true, flags,  7, 1,  7, 31); check(false, flags,  7, 32,  7, 1024);
+            check(true, flags,  8, 1,  8, 31); check(false, flags,  8, 32,  8, 1024);
+            check(true, flags,  9, 1,  9, 30); check(false, flags,  9, 31,  9, 1024);
+            check(true, flags, 10, 1, 10, 31); check(false, flags, 10, 32, 10, 1024);
+            check(true, flags, 11, 1, 11, 30); check(false, flags, 11, 31, 11, 1024);
+            check(true, flags, 12, 1, 12, 31); check(false, flags, 12, 32, 12, 1024);
+            check(false, flags, 13, 0, 16, 1024);
+            check(false, flags, u32::MAX, 0, u32::MAX, 1024);
+            check(false, flags, 0, u32::MAX, 16, u32::MAX);
+            check(false, flags, u32::MAX, u32::MAX, u32::MAX, u32::MAX);
+        }
+    }
+
+    #[test]
+    fn test_of_fields() {
+        for &flags in FLAGS.iter() {
+            for ordinal in range_inclusive(1u32, 366) {
+                let of = Of::new(ordinal, flags);
+                if of.valid() {
+                    assert_eq!(of.ordinal(), ordinal);
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_of_with_fields() {
+        fn check(flags: YearFlags, ordinal: u32) {
+            let of = Of::new(ordinal, flags);
+
+            for ordinal in range_inclusive(0u32, 1024) {
+                let of = of.with_ordinal(ordinal);
+                assert_eq!(of.valid(), Of::new(ordinal, flags).valid());
+                if of.valid() {
+                    assert_eq!(of.ordinal(), ordinal);
+                }
+            }
+        }
+
+        for &flags in NONLEAP_FLAGS.iter() {
+            check(flags, 1);
+            check(flags, 365);
+        }
+        for &flags in LEAP_FLAGS.iter() {
+            check(flags, 1);
+            check(flags, 366);
+        }
+    }
+
+    #[test]
+    fn test_of_weekday() {
+        assert_eq!(Of::new(1, A).weekday(), Weekday::Sun);
+        assert_eq!(Of::new(1, B).weekday(), Weekday::Sat);
+        assert_eq!(Of::new(1, C).weekday(), Weekday::Fri);
+        assert_eq!(Of::new(1, D).weekday(), Weekday::Thu);
+        assert_eq!(Of::new(1, E).weekday(), Weekday::Wed);
+        assert_eq!(Of::new(1, F).weekday(), Weekday::Tue);
+        assert_eq!(Of::new(1, G).weekday(), Weekday::Mon);
+        assert_eq!(Of::new(1, AG).weekday(), Weekday::Sun);
+        assert_eq!(Of::new(1, BA).weekday(), Weekday::Sat);
+        assert_eq!(Of::new(1, CB).weekday(), Weekday::Fri);
+        assert_eq!(Of::new(1, DC).weekday(), Weekday::Thu);
+        assert_eq!(Of::new(1, ED).weekday(), Weekday::Wed);
+        assert_eq!(Of::new(1, FE).weekday(), Weekday::Tue);
+        assert_eq!(Of::new(1, GF).weekday(), Weekday::Mon);
+
+        for &flags in FLAGS.iter() {
+            let mut prev = Of::new(1, flags).weekday();
+            for ordinal in range_inclusive(2u32, flags.ndays()) {
+                let of = Of::new(ordinal, flags);
+                let expected = prev.succ();
+                assert_eq!(of.weekday(), expected);
+                prev = expected;
+            }
+        }
+    }
+
+    #[test]
+    fn test_mdf_fields() {
+        for &flags in FLAGS.iter() {
+            for month in range_inclusive(1u32, 12) {
+                for day in range_inclusive(1u32, 31) {
+                    let mdf = Mdf::new(month, day, flags);
+                    if mdf.valid() {
+                        assert_eq!(mdf.month(), month);
+                        assert_eq!(mdf.day(), day);
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_mdf_with_fields() {
+        fn check(flags: YearFlags, month: u32, day: u32) {
+            let mdf = Mdf::new(month, day, flags);
+
+            for month in range_inclusive(0u32, 16) {
+                let mdf = mdf.with_month(month);
+                assert_eq!(mdf.valid(), Mdf::new(month, day, flags).valid());
+                if mdf.valid() {
+                    assert_eq!(mdf.month(), month);
+                    assert_eq!(mdf.day(), day);
+                }
+            }
+
+            for day in range_inclusive(0u32, 1024) {
+                let mdf = mdf.with_day(day);
+                assert_eq!(mdf.valid(), Mdf::new(month, day, flags).valid());
+                if mdf.valid() {
+                    assert_eq!(mdf.month(), month);
+                    assert_eq!(mdf.day(), day);
+                }
+            }
+        }
+
+        for &flags in NONLEAP_FLAGS.iter() {
+            check(flags, 1, 1);
+            check(flags, 1, 31);
+            check(flags, 2, 1);
+            check(flags, 2, 28);
+            check(flags, 2, 29);
+            check(flags, 12, 31);
+        }
+        for &flags in LEAP_FLAGS.iter() {
+            check(flags, 1, 1);
+            check(flags, 1, 31);
+            check(flags, 2, 1);
+            check(flags, 2, 29);
+            check(flags, 2, 30);
+            check(flags, 12, 31);
+        }
+    }
+
+    #[test]
+    fn test_of_isoweekdate_raw() {
+        for &flags in FLAGS.iter() {
+            // January 4 should be in the first week
+            let (week, _) = Of::new(4 /* January 4 */, flags).isoweekdate_raw();
+            assert_eq!(week, 1);
+        }
+    }
+
+    #[test]
+    fn test_of_to_mdf() {
+        for i in range_inclusive(0u32, 8192) {
+            let of = Of(i);
+            assert_eq!(of.valid(), of.to_mdf().valid());
+        }
+    }
+
+    #[test]
+    fn test_mdf_to_of() {
+        for i in range_inclusive(0u32, 8192) {
+            let mdf = Mdf(i);
+            assert_eq!(mdf.valid(), mdf.to_of().valid());
+        }
+    }
+
+    #[test]
+    fn test_of_to_mdf_to_of() {
+        for i in range_inclusive(0u32, 8192) {
+            let of = Of(i);
+            if of.valid() {
+                assert_eq!(of, of.to_mdf().to_of());
+            }
+        }
+    }
+
+    #[test]
+    fn test_mdf_to_of_to_mdf() {
+        for i in range_inclusive(0u32, 8192) {
+            let mdf = Mdf(i);
+            if mdf.valid() {
+                assert_eq!(mdf, mdf.to_of().to_mdf());
+            }
+        }
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/naive/isoweek.rs cargo-0.33.0/vendor/chrono/src/naive/isoweek.rs
--- cargo-0.32.0/vendor/chrono/src/naive/isoweek.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/naive/isoweek.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,161 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! ISO 8601 week.
+
+use std::fmt;
+
+use super::internals::{DateImpl, Of, YearFlags};
+
+/// ISO 8601 week.
+///
+/// This type, combined with [`Weekday`](../enum.Weekday.html),
+/// constitues the ISO 8601 [week date](./struct.NaiveDate.html#week-date).
+/// One can retrieve this type from the existing [`Datelike`](../trait.Datelike.html) types
+/// via the [`Datelike::iso_week`](../trait.Datelike.html#tymethod.iso_week) method.
+#[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
+pub struct IsoWeek {
+    // note that this allows for larger year range than `NaiveDate`.
+    // this is crucial because we have an edge case for the first and last week supported,
+    // which year number might not match the calendar year number.
+    ywf: DateImpl, // (year << 10) | (week << 4) | flag
+}
+
+/// Returns the corresponding `IsoWeek` from the year and the `Of` internal value.
+//
+// internal use only. we don't expose the public constructor for `IsoWeek` for now,
+// because the year range for the week date and the calendar date do not match and
+// it is confusing to have a date that is out of range in one and not in another.
+// currently we sidestep this issue by making `IsoWeek` fully dependent of `Datelike`.
+pub fn iso_week_from_yof(year: i32, of: Of) -> IsoWeek {
+    let (rawweek, _) = of.isoweekdate_raw();
+    let (year, week) = if rawweek < 1 { // previous year
+        let prevlastweek = YearFlags::from_year(year - 1).nisoweeks();
+        (year - 1, prevlastweek)
+    } else {
+        let lastweek = of.flags().nisoweeks();
+        if rawweek > lastweek { // next year
+            (year + 1, 1)
+        } else {
+            (year, rawweek)
+        }
+    };
+    IsoWeek { ywf: (year << 10) | (week << 4) as DateImpl | DateImpl::from(of.flags().0) }
+}
+
+impl IsoWeek {
+    /// Returns the year number for this ISO week.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_isoywd(2015, 1, Weekday::Mon);
+    /// assert_eq!(d.iso_week().year(), 2015);
+    /// ~~~~
+    ///
+    /// This year number might not match the calendar year number.
+    /// Continuing the example...
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveDate, Datelike, Weekday};
+    /// # let d = NaiveDate::from_isoywd(2015, 1, Weekday::Mon);
+    /// assert_eq!(d.year(), 2014);
+    /// assert_eq!(d, NaiveDate::from_ymd(2014, 12, 29));
+    /// ~~~~
+    #[inline]
+    pub fn year(&self) -> i32 {
+        self.ywf >> 10
+    }
+
+    /// Returns the ISO week number starting from 1.
+    ///
+    /// The return value ranges from 1 to 53. (The last week of year differs by years.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_isoywd(2015, 15, Weekday::Mon);
+    /// assert_eq!(d.iso_week().week(), 15);
+    /// ~~~~
+    #[inline]
+    pub fn week(&self) -> u32 {
+        ((self.ywf >> 4) & 0x3f) as u32
+    }
+
+    /// Returns the ISO week number starting from 0.
+    ///
+    /// The return value ranges from 0 to 52. (The last week of year differs by years.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveDate, Datelike, Weekday};
+    ///
+    /// let d = NaiveDate::from_isoywd(2015, 15, Weekday::Mon);
+    /// assert_eq!(d.iso_week().week0(), 14);
+    /// ~~~~
+    #[inline]
+    pub fn week0(&self) -> u32 {
+        ((self.ywf >> 4) & 0x3f) as u32 - 1
+    }
+}
+
+/// The `Debug` output of the ISO week `w` is same to
+/// [`d.format("%G-W%V")`](../format/strftime/index.html)
+/// where `d` is any `NaiveDate` value in that week.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::{NaiveDate, Datelike};
+///
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(2015,  9,  5).iso_week()), "2015-W36");
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(   0,  1,  3).iso_week()), "0000-W01");
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(9999, 12, 31).iso_week()), "9999-W52");
+/// ~~~~
+///
+/// ISO 8601 requires an explicit sign for years before 1 BCE or after 9999 CE.
+///
+/// ~~~~
+/// # use chrono::{NaiveDate, Datelike};
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(    0,  1,  2).iso_week()),  "-0001-W52");
+/// assert_eq!(format!("{:?}", NaiveDate::from_ymd(10000, 12, 31).iso_week()), "+10000-W52");
+/// ~~~~
+impl fmt::Debug for IsoWeek {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let year = self.year();
+        let week = self.week();
+        if 0 <= year && year <= 9999 {
+            write!(f, "{:04}-W{:02}", year, week)
+        } else {
+            // ISO 8601 requires the explicit sign for out-of-range years
+            write!(f, "{:+05}-W{:02}", year, week)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use naive::{internals, MIN_DATE, MAX_DATE};
+    use Datelike;
+
+    #[test]
+    fn test_iso_week_extremes() {
+        let minweek = MIN_DATE.iso_week();
+        let maxweek = MAX_DATE.iso_week();
+
+        assert_eq!(minweek.year(), internals::MIN_YEAR);
+        assert_eq!(minweek.week(), 1);
+        assert_eq!(minweek.week0(), 0);
+        assert_eq!(format!("{:?}", minweek), MIN_DATE.format("%G-W%V").to_string());
+
+        assert_eq!(maxweek.year(), internals::MAX_YEAR + 1);
+        assert_eq!(maxweek.week(), 1);
+        assert_eq!(maxweek.week0(), 0);
+        assert_eq!(format!("{:?}", maxweek), MAX_DATE.format("%G-W%V").to_string());
+    }
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/naive/time.rs cargo-0.33.0/vendor/chrono/src/naive/time.rs
--- cargo-0.32.0/vendor/chrono/src/naive/time.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/naive/time.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1733 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! ISO 8601 time without timezone.
+
+use std::{str, fmt, hash};
+use std::ops::{Add, Sub, AddAssign, SubAssign};
+use oldtime::Duration as OldDuration;
+
+use Timelike;
+use div::div_mod_floor;
+use format::{Item, Numeric, Pad, Fixed};
+use format::{parse, Parsed, ParseError, ParseResult, DelayedFormat, StrftimeItems};
+
+/// ISO 8601 time without timezone.
+/// Allows for the nanosecond precision and optional leap second representation.
+///
+/// # Leap Second Handling
+///
+/// Since 1960s, the manmade atomic clock has been so accurate that
+/// it is much more accurate than Earth's own motion.
+/// It became desirable to define the civil time in terms of the atomic clock,
+/// but that risks the desynchronization of the civil time from Earth.
+/// To account for this, the designers of the Coordinated Universal Time (UTC)
+/// made that the UTC should be kept within 0.9 seconds of the observed Earth-bound time.
+/// When the mean solar day is longer than the ideal (86,400 seconds),
+/// the error slowly accumulates and it is necessary to add a **leap second**
+/// to slow the UTC down a bit.
+/// (We may also remove a second to speed the UTC up a bit, but it never happened.)
+/// The leap second, if any, follows 23:59:59 of June 30 or December 31 in the UTC.
+///
+/// Fast forward to the 21st century,
+/// we have seen 26 leap seconds from January 1972 to December 2015.
+/// Yes, 26 seconds. Probably you can read this paragraph within 26 seconds.
+/// But those 26 seconds, and possibly more in the future, are never predictable,
+/// and whether to add a leap second or not is known only before 6 months.
+/// Internet-based clocks (via NTP) do account for known leap seconds,
+/// but the system API normally doesn't (and often can't, with no network connection)
+/// and there is no reliable way to retrieve leap second information.
+///
+/// Chrono does not try to accurately implement leap seconds; it is impossible.
+/// Rather, **it allows for leap seconds but behaves as if there are *no other* leap seconds.**
+/// Various operations will ignore any possible leap second(s)
+/// except when any of the operands were actually leap seconds.
+///
+/// If you cannot tolerate this behavior,
+/// you must use a separate `TimeZone` for the International Atomic Time (TAI).
+/// TAI is like UTC but has no leap seconds, and thus slightly differs from UTC.
+/// Chrono does not yet provide such implementation, but it is planned.
+///
+/// ## Representing Leap Seconds
+///
+/// The leap second is indicated via fractional seconds more than 1 second.
+/// This makes possible to treat a leap second as the prior non-leap second
+/// if you don't care about sub-second accuracy.
+/// You should use the proper formatting to get the raw leap second.
+///
+/// All methods accepting fractional seconds will accept such values.
+///
+/// ~~~~
+/// use chrono::{NaiveDate, NaiveTime, Utc, TimeZone};
+///
+/// let t = NaiveTime::from_hms_milli(8, 59, 59, 1_000);
+///
+/// let dt1 = NaiveDate::from_ymd(2015, 7, 1).and_hms_micro(8, 59, 59, 1_000_000);
+///
+/// let dt2 = Utc.ymd(2015, 6, 30).and_hms_nano(23, 59, 59, 1_000_000_000);
+/// # let _ = (t, dt1, dt2);
+/// ~~~~
+///
+/// Note that the leap second can happen anytime given an appropriate time zone;
+/// 2015-07-01 01:23:60 would be a proper leap second if UTC+01:24 had existed.
+/// Practically speaking, though, by the time of the first leap second on 1972-06-30,
+/// every time zone offset around the world has standardized to the 5-minute alignment.
+///
+/// ## Date And Time Arithmetics
+///
+/// As a concrete example, let's assume that `03:00:60` and `04:00:60` are leap seconds.
+/// In reality, of course, leap seconds are separated by at least 6 months.
+/// We will also use some intuitive concise notations for the explanation.
+///
+/// `Time + Duration`
+/// (short for [`NaiveTime::overflowing_add_signed`](#method.overflowing_add_signed)):
+///
+/// - `03:00:00 + 1s = 03:00:01`.
+/// - `03:00:59 + 60s = 03:02:00`.
+/// - `03:00:59 + 1s = 03:01:00`.
+/// - `03:00:60 + 1s = 03:01:00`.
+///   Note that the sum is identical to the previous.
+/// - `03:00:60 + 60s = 03:01:59`.
+/// - `03:00:60 + 61s = 03:02:00`.
+/// - `03:00:60.1 + 0.8s = 03:00:60.9`.
+///
+/// `Time - Duration`
+/// (short for [`NaiveTime::overflowing_sub_signed`](#method.overflowing_sub_signed)):
+///
+/// - `03:00:00 - 1s = 02:59:59`.
+/// - `03:01:00 - 1s = 03:00:59`.
+/// - `03:01:00 - 60s = 03:00:00`.
+/// - `03:00:60 - 60s = 03:00:00`.
+///   Note that the result is identical to the previous.
+/// - `03:00:60.7 - 0.4s = 03:00:60.3`.
+/// - `03:00:60.7 - 0.9s = 03:00:59.8`.
+///
+/// `Time - Time`
+/// (short for [`NaiveTime::signed_duration_since`](#method.signed_duration_since)):
+///
+/// - `04:00:00 - 03:00:00 = 3600s`.
+/// - `03:01:00 - 03:00:00 = 60s`.
+/// - `03:00:60 - 03:00:00 = 60s`.
+///   Note that the difference is identical to the previous.
+/// - `03:00:60.6 - 03:00:59.4 = 1.2s`.
+/// - `03:01:00 - 03:00:59.8 = 0.2s`.
+/// - `03:01:00 - 03:00:60.5 = 0.5s`.
+///   Note that the difference is larger than the previous,
+///   even though the leap second clearly follows the previous whole second.
+/// - `04:00:60.9 - 03:00:60.1 =
+///   (04:00:60.9 - 04:00:00) + (04:00:00 - 03:01:00) + (03:01:00 - 03:00:60.1) =
+///   60.9s + 3540s + 0.9s = 3601.8s`.
+///
+/// In general,
+///
+/// - `Time + Duration` unconditionally equals to `Duration + Time`.
+///
+/// - `Time - Duration` unconditionally equals to `Time + (-Duration)`.
+///
+/// - `Time1 - Time2` unconditionally equals to `-(Time2 - Time1)`.
+///
+/// - Associativity does not generally hold, because
+///   `(Time + Duration1) - Duration2` no longer equals to `Time + (Duration1 - Duration2)`
+///   for two positive durations.
+///
+///     - As a special case, `(Time + Duration) - Duration` also does not equal to `Time`.
+///
+///     - If you can assume that all durations have the same sign, however,
+///       then the associativity holds:
+///       `(Time + Duration1) + Duration2` equals to `Time + (Duration1 + Duration2)`
+///       for two positive durations.
+///
+/// ## Reading And Writing Leap Seconds
+///
+/// The "typical" leap seconds on the minute boundary are
+/// correctly handled both in the formatting and parsing.
+/// The leap second in the human-readable representation
+/// will be represented as the second part being 60, as required by ISO 8601.
+///
+/// ~~~~
+/// use chrono::{Utc, TimeZone};
+///
+/// let dt = Utc.ymd(2015, 6, 30).and_hms_milli(23, 59, 59, 1_000);
+/// assert_eq!(format!("{:?}", dt), "2015-06-30T23:59:60Z");
+/// ~~~~
+///
+/// There are hypothetical leap seconds not on the minute boundary
+/// nevertheless supported by Chrono.
+/// They are allowed for the sake of completeness and consistency;
+/// there were several "exotic" time zone offsets with fractional minutes prior to UTC after all.
+/// For such cases the human-readable representation is ambiguous
+/// and would be read back to the next non-leap second.
+///
+/// ~~~~
+/// use chrono::{DateTime, Utc, TimeZone};
+///
+/// let dt = Utc.ymd(2015, 6, 30).and_hms_milli(23, 56, 4, 1_000);
+/// assert_eq!(format!("{:?}", dt), "2015-06-30T23:56:05Z");
+///
+/// let dt = Utc.ymd(2015, 6, 30).and_hms(23, 56, 5);
+/// assert_eq!(format!("{:?}", dt), "2015-06-30T23:56:05Z");
+/// assert_eq!(DateTime::parse_from_rfc3339("2015-06-30T23:56:05Z").unwrap(), dt);
+/// ~~~~
+///
+/// Since Chrono alone cannot determine any existence of leap seconds,
+/// **there is absolutely no guarantee that the leap second read has actually happened**.
+#[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
+pub struct NaiveTime {
+    secs: u32,
+    frac: u32,
+}
+
+impl NaiveTime {
+    /// Makes a new `NaiveTime` from hour, minute and second.
+    ///
+    /// No [leap second](#leap-second-handling) is allowed here;
+    /// use `NaiveTime::from_hms_*` methods with a subsecond parameter instead.
+    ///
+    /// Panics on invalid hour, minute and/or second.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let t = NaiveTime::from_hms(23, 56, 4);
+    /// assert_eq!(t.hour(), 23);
+    /// assert_eq!(t.minute(), 56);
+    /// assert_eq!(t.second(), 4);
+    /// assert_eq!(t.nanosecond(), 0);
+    /// ~~~~
+    #[inline]
+    pub fn from_hms(hour: u32, min: u32, sec: u32) -> NaiveTime {
+        NaiveTime::from_hms_opt(hour, min, sec).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute and second.
+    ///
+    /// No [leap second](#leap-second-handling) is allowed here;
+    /// use `NaiveTime::from_hms_*_opt` methods with a subsecond parameter instead.
+    ///
+    /// Returns `None` on invalid hour, minute and/or second.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let from_hms_opt = NaiveTime::from_hms_opt;
+    ///
+    /// assert!(from_hms_opt(0, 0, 0).is_some());
+    /// assert!(from_hms_opt(23, 59, 59).is_some());
+    /// assert!(from_hms_opt(24, 0, 0).is_none());
+    /// assert!(from_hms_opt(23, 60, 0).is_none());
+    /// assert!(from_hms_opt(23, 59, 60).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_opt(hour: u32, min: u32, sec: u32) -> Option<NaiveTime> {
+        NaiveTime::from_hms_nano_opt(hour, min, sec, 0)
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute, second and millisecond.
+    ///
+    /// The millisecond part can exceed 1,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Panics on invalid hour, minute, second and/or millisecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let t = NaiveTime::from_hms_milli(23, 56, 4, 12);
+    /// assert_eq!(t.hour(), 23);
+    /// assert_eq!(t.minute(), 56);
+    /// assert_eq!(t.second(), 4);
+    /// assert_eq!(t.nanosecond(), 12_000_000);
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_milli(hour: u32, min: u32, sec: u32, milli: u32) -> NaiveTime {
+        NaiveTime::from_hms_milli_opt(hour, min, sec, milli).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute, second and millisecond.
+    ///
+    /// The millisecond part can exceed 1,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or millisecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let from_hmsm_opt = NaiveTime::from_hms_milli_opt;
+    ///
+    /// assert!(from_hmsm_opt(0, 0, 0, 0).is_some());
+    /// assert!(from_hmsm_opt(23, 59, 59, 999).is_some());
+    /// assert!(from_hmsm_opt(23, 59, 59, 1_999).is_some()); // a leap second after 23:59:59
+    /// assert!(from_hmsm_opt(24, 0, 0, 0).is_none());
+    /// assert!(from_hmsm_opt(23, 60, 0, 0).is_none());
+    /// assert!(from_hmsm_opt(23, 59, 60, 0).is_none());
+    /// assert!(from_hmsm_opt(23, 59, 59, 2_000).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_milli_opt(hour: u32, min: u32, sec: u32, milli: u32) -> Option<NaiveTime> {
+        milli.checked_mul(1_000_000)
+             .and_then(|nano| NaiveTime::from_hms_nano_opt(hour, min, sec, nano))
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute, second and microsecond.
+    ///
+    /// The microsecond part can exceed 1,000,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Panics on invalid hour, minute, second and/or microsecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let t = NaiveTime::from_hms_micro(23, 56, 4, 12_345);
+    /// assert_eq!(t.hour(), 23);
+    /// assert_eq!(t.minute(), 56);
+    /// assert_eq!(t.second(), 4);
+    /// assert_eq!(t.nanosecond(), 12_345_000);
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_micro(hour: u32, min: u32, sec: u32, micro: u32) -> NaiveTime {
+        NaiveTime::from_hms_micro_opt(hour, min, sec, micro).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute, second and microsecond.
+    ///
+    /// The microsecond part can exceed 1,000,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or microsecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let from_hmsu_opt = NaiveTime::from_hms_micro_opt;
+    ///
+    /// assert!(from_hmsu_opt(0, 0, 0, 0).is_some());
+    /// assert!(from_hmsu_opt(23, 59, 59, 999_999).is_some());
+    /// assert!(from_hmsu_opt(23, 59, 59, 1_999_999).is_some()); // a leap second after 23:59:59
+    /// assert!(from_hmsu_opt(24, 0, 0, 0).is_none());
+    /// assert!(from_hmsu_opt(23, 60, 0, 0).is_none());
+    /// assert!(from_hmsu_opt(23, 59, 60, 0).is_none());
+    /// assert!(from_hmsu_opt(23, 59, 59, 2_000_000).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_micro_opt(hour: u32, min: u32, sec: u32, micro: u32) -> Option<NaiveTime> {
+        micro.checked_mul(1_000)
+             .and_then(|nano| NaiveTime::from_hms_nano_opt(hour, min, sec, nano))
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute, second and nanosecond.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Panics on invalid hour, minute, second and/or nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let t = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(t.hour(), 23);
+    /// assert_eq!(t.minute(), 56);
+    /// assert_eq!(t.second(), 4);
+    /// assert_eq!(t.nanosecond(), 12_345_678);
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_nano(hour: u32, min: u32, sec: u32, nano: u32) -> NaiveTime {
+        NaiveTime::from_hms_nano_opt(hour, min, sec, nano).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveTime` from hour, minute, second and nanosecond.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Returns `None` on invalid hour, minute, second and/or nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let from_hmsn_opt = NaiveTime::from_hms_nano_opt;
+    ///
+    /// assert!(from_hmsn_opt(0, 0, 0, 0).is_some());
+    /// assert!(from_hmsn_opt(23, 59, 59, 999_999_999).is_some());
+    /// assert!(from_hmsn_opt(23, 59, 59, 1_999_999_999).is_some()); // a leap second after 23:59:59
+    /// assert!(from_hmsn_opt(24, 0, 0, 0).is_none());
+    /// assert!(from_hmsn_opt(23, 60, 0, 0).is_none());
+    /// assert!(from_hmsn_opt(23, 59, 60, 0).is_none());
+    /// assert!(from_hmsn_opt(23, 59, 59, 2_000_000_000).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn from_hms_nano_opt(hour: u32, min: u32, sec: u32, nano: u32) -> Option<NaiveTime> {
+        if hour >= 24 || min >= 60 || sec >= 60 || nano >= 2_000_000_000 { return None; }
+        let secs = hour * 3600 + min * 60 + sec;
+        Some(NaiveTime { secs: secs, frac: nano })
+    }
+
+    /// Makes a new `NaiveTime` from the number of seconds since midnight and nanosecond.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Panics on invalid number of seconds and/or nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let t = NaiveTime::from_num_seconds_from_midnight(86164, 12_345_678);
+    /// assert_eq!(t.hour(), 23);
+    /// assert_eq!(t.minute(), 56);
+    /// assert_eq!(t.second(), 4);
+    /// assert_eq!(t.nanosecond(), 12_345_678);
+    /// ~~~~
+    #[inline]
+    pub fn from_num_seconds_from_midnight(secs: u32, nano: u32) -> NaiveTime {
+        NaiveTime::from_num_seconds_from_midnight_opt(secs, nano).expect("invalid time")
+    }
+
+    /// Makes a new `NaiveTime` from the number of seconds since midnight and nanosecond.
+    ///
+    /// The nanosecond part can exceed 1,000,000,000
+    /// in order to represent the [leap second](#leap-second-handling).
+    ///
+    /// Returns `None` on invalid number of seconds and/or nanosecond.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let from_nsecs_opt = NaiveTime::from_num_seconds_from_midnight_opt;
+    ///
+    /// assert!(from_nsecs_opt(0, 0).is_some());
+    /// assert!(from_nsecs_opt(86399, 999_999_999).is_some());
+    /// assert!(from_nsecs_opt(86399, 1_999_999_999).is_some()); // a leap second after 23:59:59
+    /// assert!(from_nsecs_opt(86_400, 0).is_none());
+    /// assert!(from_nsecs_opt(86399, 2_000_000_000).is_none());
+    /// ~~~~
+    #[inline]
+    pub fn from_num_seconds_from_midnight_opt(secs: u32, nano: u32) -> Option<NaiveTime> {
+        if secs >= 86_400 || nano >= 2_000_000_000 { return None; }
+        Some(NaiveTime { secs: secs, frac: nano })
+    }
+
+    /// Parses a string with the specified format string and returns a new `NaiveTime`.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let parse_from_str = NaiveTime::parse_from_str;
+    ///
+    /// assert_eq!(parse_from_str("23:56:04", "%H:%M:%S"),
+    ///            Ok(NaiveTime::from_hms(23, 56, 4)));
+    /// assert_eq!(parse_from_str("pm012345.6789", "%p%I%M%S%.f"),
+    ///            Ok(NaiveTime::from_hms_micro(13, 23, 45, 678_900)));
+    /// ~~~~
+    ///
+    /// Date and offset is ignored for the purpose of parsing.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveTime;
+    /// # let parse_from_str = NaiveTime::parse_from_str;
+    /// assert_eq!(parse_from_str("2014-5-17T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+    ///            Ok(NaiveTime::from_hms(12, 34, 56)));
+    /// ~~~~
+    ///
+    /// [Leap seconds](#leap-second-handling) are correctly handled by
+    /// treating any time of the form `hh:mm:60` as a leap second.
+    /// (This equally applies to the formatting, so the round trip is possible.)
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveTime;
+    /// # let parse_from_str = NaiveTime::parse_from_str;
+    /// assert_eq!(parse_from_str("08:59:60.123", "%H:%M:%S%.f"),
+    ///            Ok(NaiveTime::from_hms_milli(8, 59, 59, 1_123)));
+    /// ~~~~
+    ///
+    /// Missing seconds are assumed to be zero,
+    /// but out-of-bound times or insufficient fields are errors otherwise.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveTime;
+    /// # let parse_from_str = NaiveTime::parse_from_str;
+    /// assert_eq!(parse_from_str("7:15", "%H:%M"),
+    ///            Ok(NaiveTime::from_hms(7, 15, 0)));
+    ///
+    /// assert!(parse_from_str("04m33s", "%Mm%Ss").is_err());
+    /// assert!(parse_from_str("12", "%H").is_err());
+    /// assert!(parse_from_str("17:60", "%H:%M").is_err());
+    /// assert!(parse_from_str("24:00:00", "%H:%M:%S").is_err());
+    /// ~~~~
+    ///
+    /// All parsed fields should be consistent to each other, otherwise it's an error.
+    /// Here `%H` is for 24-hour clocks, unlike `%I`,
+    /// and thus can be independently determined without AM/PM.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveTime;
+    /// # let parse_from_str = NaiveTime::parse_from_str;
+    /// assert!(parse_from_str("13:07 AM", "%H:%M %p").is_err());
+    /// ~~~~
+    pub fn parse_from_str(s: &str, fmt: &str) -> ParseResult<NaiveTime> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, StrftimeItems::new(fmt)));
+        parsed.to_naive_time()
+    }
+
+    /// Adds given `Duration` to the current time,
+    /// and also returns the number of *seconds*
+    /// in the integral number of days ignored from the addition.
+    /// (We cannot return `Duration` because it is subject to overflow or underflow.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveTime;
+    /// use time::Duration;
+    ///
+    /// let from_hms = NaiveTime::from_hms;
+    ///
+    /// assert_eq!(from_hms(3, 4, 5).overflowing_add_signed(Duration::hours(11)),
+    ///            (from_hms(14, 4, 5), 0));
+    /// assert_eq!(from_hms(3, 4, 5).overflowing_add_signed(Duration::hours(23)),
+    ///            (from_hms(2, 4, 5), 86_400));
+    /// assert_eq!(from_hms(3, 4, 5).overflowing_add_signed(Duration::hours(-7)),
+    ///            (from_hms(20, 4, 5), -86_400));
+    /// # }
+    /// ~~~~
+    #[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
+    pub fn overflowing_add_signed(&self, mut rhs: OldDuration) -> (NaiveTime, i64) {
+        let mut secs = self.secs;
+        let mut frac = self.frac;
+
+        // check if `self` is a leap second and adding `rhs` would escape that leap second.
+        // if it's the case, update `self` and `rhs` to involve no leap second;
+        // otherwise the addition immediately finishes.
+        if frac >= 1_000_000_000 {
+            let rfrac = 2_000_000_000 - frac;
+            if rhs >= OldDuration::nanoseconds(i64::from(rfrac)) {
+                rhs = rhs - OldDuration::nanoseconds(i64::from(rfrac));
+                secs += 1;
+                frac = 0;
+            } else if rhs < OldDuration::nanoseconds(-i64::from(frac)) {
+                rhs = rhs + OldDuration::nanoseconds(i64::from(frac));
+                frac = 0;
+            } else {
+                frac = (i64::from(frac) + rhs.num_nanoseconds().unwrap()) as u32;
+                debug_assert!(frac < 2_000_000_000);
+                return (NaiveTime { secs: secs, frac: frac }, 0);
+            }
+        }
+        debug_assert!(secs <= 86_400);
+        debug_assert!(frac < 1_000_000_000);
+
+        let rhssecs = rhs.num_seconds();
+        let rhsfrac = (rhs - OldDuration::seconds(rhssecs)).num_nanoseconds().unwrap();
+        debug_assert_eq!(OldDuration::seconds(rhssecs) + OldDuration::nanoseconds(rhsfrac), rhs);
+        let rhssecsinday = rhssecs % 86_400;
+        let mut morerhssecs = rhssecs - rhssecsinday;
+        let rhssecs = rhssecsinday as i32;
+        let rhsfrac = rhsfrac as i32;
+        debug_assert!(-86_400 < rhssecs && rhssecs < 86_400);
+        debug_assert_eq!(morerhssecs % 86_400, 0);
+        debug_assert!(-1_000_000_000 < rhsfrac && rhsfrac < 1_000_000_000);
+
+        let mut secs = secs as i32 + rhssecs;
+        let mut frac = frac as i32 + rhsfrac;
+        debug_assert!(-86_400 < secs && secs < 2 * 86_400);
+        debug_assert!(-1_000_000_000 < frac && frac < 2_000_000_000);
+
+        if frac < 0 {
+            frac += 1_000_000_000;
+            secs -= 1;
+        } else if frac >= 1_000_000_000 {
+            frac -= 1_000_000_000;
+            secs += 1;
+        }
+        debug_assert!(-86_400 <= secs && secs < 2 * 86_400);
+        debug_assert!(0 <= frac && frac < 1_000_000_000);
+
+        if secs < 0 {
+            secs += 86_400;
+            morerhssecs -= 86_400;
+        } else if secs >= 86_400 {
+            secs -= 86_400;
+            morerhssecs += 86_400;
+        }
+        debug_assert!(0 <= secs && secs < 86_400);
+
+        (NaiveTime { secs: secs as u32, frac: frac as u32 }, morerhssecs)
+    }
+
+    /// Subtracts given `Duration` from the current time,
+    /// and also returns the number of *seconds*
+    /// in the integral number of days ignored from the subtraction.
+    /// (We cannot return `Duration` because it is subject to overflow or underflow.)
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveTime;
+    /// use time::Duration;
+    ///
+    /// let from_hms = NaiveTime::from_hms;
+    ///
+    /// assert_eq!(from_hms(3, 4, 5).overflowing_sub_signed(Duration::hours(2)),
+    ///            (from_hms(1, 4, 5), 0));
+    /// assert_eq!(from_hms(3, 4, 5).overflowing_sub_signed(Duration::hours(17)),
+    ///            (from_hms(10, 4, 5), 86_400));
+    /// assert_eq!(from_hms(3, 4, 5).overflowing_sub_signed(Duration::hours(-22)),
+    ///            (from_hms(1, 4, 5), -86_400));
+    /// # }
+    /// ~~~~
+    #[inline]
+    pub fn overflowing_sub_signed(&self, rhs: OldDuration) -> (NaiveTime, i64) {
+        let (time, rhs) = self.overflowing_add_signed(-rhs);
+        (time, -rhs) // safe to negate, rhs is within +/- (2^63 / 1000)
+    }
+
+    /// Subtracts another `NaiveTime` from the current time.
+    /// Returns a `Duration` within +/- 1 day.
+    /// This does not overflow or underflow at all.
+    ///
+    /// As a part of Chrono's [leap second handling](#leap-second-handling),
+    /// the subtraction assumes that **there is no leap second ever**,
+    /// except when any of the `NaiveTime`s themselves represents a leap second
+    /// in which case the assumption becomes that
+    /// **there are exactly one (or two) leap second(s) ever**.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// use chrono::NaiveTime;
+    /// use time::Duration;
+    ///
+    /// let from_hmsm = NaiveTime::from_hms_milli;
+    /// let since = NaiveTime::signed_duration_since;
+    ///
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(3, 5, 7, 900)),
+    ///            Duration::zero());
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(3, 5, 7, 875)),
+    ///            Duration::milliseconds(25));
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(3, 5, 6, 925)),
+    ///            Duration::milliseconds(975));
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(3, 5, 0, 900)),
+    ///            Duration::seconds(7));
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(3, 0, 7, 900)),
+    ///            Duration::seconds(5 * 60));
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(0, 5, 7, 900)),
+    ///            Duration::seconds(3 * 3600));
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(4, 5, 7, 900)),
+    ///            Duration::seconds(-3600));
+    /// assert_eq!(since(from_hmsm(3, 5, 7, 900), from_hmsm(2, 4, 6, 800)),
+    ///            Duration::seconds(3600 + 60 + 1) + Duration::milliseconds(100));
+    /// # }
+    /// ~~~~
+    ///
+    /// Leap seconds are handled, but the subtraction assumes that
+    /// there were no other leap seconds happened.
+    ///
+    /// ~~~~
+    /// # extern crate chrono; extern crate time; fn main() {
+    /// # use chrono::NaiveTime;
+    /// # use time::Duration;
+    /// # let from_hmsm = NaiveTime::from_hms_milli;
+    /// # let since = NaiveTime::signed_duration_since;
+    /// assert_eq!(since(from_hmsm(3, 0, 59, 1_000), from_hmsm(3, 0, 59, 0)),
+    ///            Duration::seconds(1));
+    /// assert_eq!(since(from_hmsm(3, 0, 59, 1_500), from_hmsm(3, 0, 59, 0)),
+    ///            Duration::milliseconds(1500));
+    /// assert_eq!(since(from_hmsm(3, 0, 59, 1_000), from_hmsm(3, 0, 0, 0)),
+    ///            Duration::seconds(60));
+    /// assert_eq!(since(from_hmsm(3, 0, 0, 0), from_hmsm(2, 59, 59, 1_000)),
+    ///            Duration::seconds(1));
+    /// assert_eq!(since(from_hmsm(3, 0, 59, 1_000), from_hmsm(2, 59, 59, 1_000)),
+    ///            Duration::seconds(61));
+    /// # }
+    /// ~~~~
+    pub fn signed_duration_since(self, rhs: NaiveTime) -> OldDuration {
+        //     |    |    :leap|    |    |    |    |    |    |    :leap|    |
+        //     |    |    :    |    |    |    |    |    |    |    :    |    |
+        // ----+----+-----*---+----+----+----+----+----+----+-------*-+----+----
+        //          |   `rhs` |                             |    `self`
+        //          |======================================>|       |
+        //          |     |  `self.secs - rhs.secs`         |`self.frac`
+        //          |====>|   |                             |======>|
+        //      `rhs.frac`|========================================>|
+        //          |     |   |        `self - rhs`         |       |
+
+        use std::cmp::Ordering;
+
+        let secs = i64::from(self.secs) - i64::from(rhs.secs);
+        let frac = i64::from(self.frac) - i64::from(rhs.frac);
+
+        // `secs` may contain a leap second yet to be counted
+        let adjust = match self.secs.cmp(&rhs.secs) {
+            Ordering::Greater => if rhs.frac >= 1_000_000_000 { 1 } else { 0 },
+            Ordering::Equal => 0,
+            Ordering::Less => if self.frac >= 1_000_000_000 { -1 } else { 0 },
+        };
+
+        OldDuration::seconds(secs + adjust) + OldDuration::nanoseconds(frac)
+    }
+
+    /// Formats the time with the specified formatting items.
+    /// Otherwise it is same to the ordinary [`format`](#method.format) method.
+    ///
+    /// The `Iterator` of items should be `Clone`able,
+    /// since the resulting `DelayedFormat` value may be formatted multiple times.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    /// use chrono::format::strftime::StrftimeItems;
+    ///
+    /// let fmt = StrftimeItems::new("%H:%M:%S");
+    /// let t = NaiveTime::from_hms(23, 56, 4);
+    /// assert_eq!(t.format_with_items(fmt.clone()).to_string(), "23:56:04");
+    /// assert_eq!(t.format("%H:%M:%S").to_string(),             "23:56:04");
+    /// ~~~~
+    ///
+    /// The resulting `DelayedFormat` can be formatted directly via the `Display` trait.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveTime;
+    /// # use chrono::format::strftime::StrftimeItems;
+    /// # let fmt = StrftimeItems::new("%H:%M:%S").clone();
+    /// # let t = NaiveTime::from_hms(23, 56, 4);
+    /// assert_eq!(format!("{}", t.format_with_items(fmt)), "23:56:04");
+    /// ~~~~
+    #[inline]
+    pub fn format_with_items<'a, I>(&self, items: I) -> DelayedFormat<I>
+            where I: Iterator<Item=Item<'a>> + Clone {
+        DelayedFormat::new(None, Some(*self), items)
+    }
+
+    /// Formats the time with the specified format string.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// This returns a `DelayedFormat`,
+    /// which gets converted to a string only when actual formatting happens.
+    /// You may use the `to_string` method to get a `String`,
+    /// or just feed it into `print!` and other formatting macros.
+    /// (In this way it avoids the redundant memory allocation.)
+    ///
+    /// A wrong format string does *not* issue an error immediately.
+    /// Rather, converting or formatting the `DelayedFormat` fails.
+    /// You are recommended to immediately use `DelayedFormat` for this reason.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::NaiveTime;
+    ///
+    /// let t = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(t.format("%H:%M:%S").to_string(), "23:56:04");
+    /// assert_eq!(t.format("%H:%M:%S%.6f").to_string(), "23:56:04.012345");
+    /// assert_eq!(t.format("%-I:%M %p").to_string(), "11:56 PM");
+    /// ~~~~
+    ///
+    /// The resulting `DelayedFormat` can be formatted directly via the `Display` trait.
+    ///
+    /// ~~~~
+    /// # use chrono::NaiveTime;
+    /// # let t = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(format!("{}", t.format("%H:%M:%S")), "23:56:04");
+    /// assert_eq!(format!("{}", t.format("%H:%M:%S%.6f")), "23:56:04.012345");
+    /// assert_eq!(format!("{}", t.format("%-I:%M %p")), "11:56 PM");
+    /// ~~~~
+    #[inline]
+    pub fn format<'a>(&self, fmt: &'a str) -> DelayedFormat<StrftimeItems<'a>> {
+        self.format_with_items(StrftimeItems::new(fmt))
+    }
+
+    /// Returns a triple of the hour, minute and second numbers.
+    fn hms(&self) -> (u32, u32, u32) {
+        let (mins, sec) = div_mod_floor(self.secs, 60);
+        let (hour, min) = div_mod_floor(mins, 60);
+        (hour, min, sec)
+    }
+}
+
+impl Timelike for NaiveTime {
+    /// Returns the hour number from 0 to 23.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// assert_eq!(NaiveTime::from_hms(0, 0, 0).hour(), 0);
+    /// assert_eq!(NaiveTime::from_hms_nano(23, 56, 4, 12_345_678).hour(), 23);
+    /// ~~~~
+    #[inline]
+    fn hour(&self) -> u32 {
+        self.hms().0
+    }
+
+    /// Returns the minute number from 0 to 59.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// assert_eq!(NaiveTime::from_hms(0, 0, 0).minute(), 0);
+    /// assert_eq!(NaiveTime::from_hms_nano(23, 56, 4, 12_345_678).minute(), 56);
+    /// ~~~~
+    #[inline]
+    fn minute(&self) -> u32 {
+        self.hms().1
+    }
+
+    /// Returns the second number from 0 to 59.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// assert_eq!(NaiveTime::from_hms(0, 0, 0).second(), 0);
+    /// assert_eq!(NaiveTime::from_hms_nano(23, 56, 4, 12_345_678).second(), 4);
+    /// ~~~~
+    ///
+    /// This method never returns 60 even when it is a leap second.
+    /// ([Why?](#leap-second-handling))
+    /// Use the proper [formatting method](#method.format) to get a human-readable representation.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveTime, Timelike};
+    /// let leap = NaiveTime::from_hms_milli(23, 59, 59, 1_000);
+    /// assert_eq!(leap.second(), 59);
+    /// assert_eq!(leap.format("%H:%M:%S").to_string(), "23:59:60");
+    /// ~~~~
+    #[inline]
+    fn second(&self) -> u32 {
+        self.hms().2
+    }
+
+    /// Returns the number of nanoseconds since the whole non-leap second.
+    /// The range from 1,000,000,000 to 1,999,999,999 represents
+    /// the [leap second](#leap-second-handling).
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// assert_eq!(NaiveTime::from_hms(0, 0, 0).nanosecond(), 0);
+    /// assert_eq!(NaiveTime::from_hms_nano(23, 56, 4, 12_345_678).nanosecond(), 12_345_678);
+    /// ~~~~
+    ///
+    /// Leap seconds may have seemingly out-of-range return values.
+    /// You can reduce the range with `time.nanosecond() % 1_000_000_000`, or
+    /// use the proper [formatting method](#method.format) to get a human-readable representation.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveTime, Timelike};
+    /// let leap = NaiveTime::from_hms_milli(23, 59, 59, 1_000);
+    /// assert_eq!(leap.nanosecond(), 1_000_000_000);
+    /// assert_eq!(leap.format("%H:%M:%S%.9f").to_string(), "23:59:60.000000000");
+    /// ~~~~
+    #[inline]
+    fn nanosecond(&self) -> u32 {
+        self.frac
+    }
+
+    /// Makes a new `NaiveTime` with the hour number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveTime` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let dt = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(dt.with_hour(7), Some(NaiveTime::from_hms_nano(7, 56, 4, 12_345_678)));
+    /// assert_eq!(dt.with_hour(24), None);
+    /// ~~~~
+    #[inline]
+    fn with_hour(&self, hour: u32) -> Option<NaiveTime> {
+        if hour >= 24 { return None; }
+        let secs = hour * 3600 + self.secs % 3600;
+        Some(NaiveTime { secs: secs, ..*self })
+    }
+
+    /// Makes a new `NaiveTime` with the minute number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveTime` would be invalid.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let dt = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(dt.with_minute(45), Some(NaiveTime::from_hms_nano(23, 45, 4, 12_345_678)));
+    /// assert_eq!(dt.with_minute(60), None);
+    /// ~~~~
+    #[inline]
+    fn with_minute(&self, min: u32) -> Option<NaiveTime> {
+        if min >= 60 { return None; }
+        let secs = self.secs / 3600 * 3600 + min * 60 + self.secs % 60;
+        Some(NaiveTime { secs: secs, ..*self })
+    }
+
+    /// Makes a new `NaiveTime` with the second number changed.
+    ///
+    /// Returns `None` when the resulting `NaiveTime` would be invalid.
+    /// As with the [`second`](#method.second) method,
+    /// the input range is restricted to 0 through 59.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let dt = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(dt.with_second(17), Some(NaiveTime::from_hms_nano(23, 56, 17, 12_345_678)));
+    /// assert_eq!(dt.with_second(60), None);
+    /// ~~~~
+    #[inline]
+    fn with_second(&self, sec: u32) -> Option<NaiveTime> {
+        if sec >= 60 { return None; }
+        let secs = self.secs / 60 * 60 + sec;
+        Some(NaiveTime { secs: secs, ..*self })
+    }
+
+    /// Makes a new `NaiveTime` with nanoseconds since the whole non-leap second changed.
+    ///
+    /// Returns `None` when the resulting `NaiveTime` would be invalid.
+    /// As with the [`nanosecond`](#method.nanosecond) method,
+    /// the input range can exceed 1,000,000,000 for leap seconds.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// let dt = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(dt.with_nanosecond(333_333_333),
+    ///            Some(NaiveTime::from_hms_nano(23, 56, 4, 333_333_333)));
+    /// assert_eq!(dt.with_nanosecond(2_000_000_000), None);
+    /// ~~~~
+    ///
+    /// Leap seconds can theoretically follow *any* whole second.
+    /// The following would be a proper leap second at the time zone offset of UTC-00:03:57
+    /// (there are several historical examples comparable to this "non-sense" offset),
+    /// and therefore is allowed.
+    ///
+    /// ~~~~
+    /// # use chrono::{NaiveTime, Timelike};
+    /// # let dt = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+    /// assert_eq!(dt.with_nanosecond(1_333_333_333),
+    ///            Some(NaiveTime::from_hms_nano(23, 56, 4, 1_333_333_333)));
+    /// ~~~~
+    #[inline]
+    fn with_nanosecond(&self, nano: u32) -> Option<NaiveTime> {
+        if nano >= 2_000_000_000 { return None; }
+        Some(NaiveTime { frac: nano, ..*self })
+    }
+
+    /// Returns the number of non-leap seconds past the last midnight.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{NaiveTime, Timelike};
+    ///
+    /// assert_eq!(NaiveTime::from_hms(1, 2, 3).num_seconds_from_midnight(),
+    ///            3723);
+    /// assert_eq!(NaiveTime::from_hms_nano(23, 56, 4, 12_345_678).num_seconds_from_midnight(),
+    ///            86164);
+    /// assert_eq!(NaiveTime::from_hms_milli(23, 59, 59, 1_000).num_seconds_from_midnight(),
+    ///            86399);
+    /// ~~~~
+    #[inline]
+    fn num_seconds_from_midnight(&self) -> u32 {
+        self.secs // do not repeat the calculation!
+    }
+}
+
+/// `NaiveTime` can be used as a key to the hash maps (in principle).
+///
+/// Practically this also takes account of fractional seconds, so it is not recommended.
+/// (For the obvious reason this also distinguishes leap seconds from non-leap seconds.)
+#[cfg_attr(feature = "cargo-clippy", allow(derive_hash_xor_eq))]
+impl hash::Hash for NaiveTime {
+    fn hash<H: hash::Hasher>(&self, state: &mut H) {
+        self.secs.hash(state);
+        self.frac.hash(state);
+    }
+}
+
+/// An addition of `Duration` to `NaiveTime` wraps around and never overflows or underflows.
+/// In particular the addition ignores integral number of days.
+///
+/// As a part of Chrono's [leap second handling](#leap-second-handling),
+/// the addition assumes that **there is no leap second ever**,
+/// except when the `NaiveTime` itself represents a leap second
+/// in which case the assumption becomes that **there is exactly a single leap second ever**.
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveTime;
+/// use time::Duration;
+///
+/// let from_hmsm = NaiveTime::from_hms_milli;
+///
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::zero(),                  from_hmsm(3, 5, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::seconds(1),              from_hmsm(3, 5, 8, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::seconds(-1),             from_hmsm(3, 5, 6, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::seconds(60 + 4),         from_hmsm(3, 6, 11, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::seconds(7*60*60 - 6*60), from_hmsm(9, 59, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::milliseconds(80),        from_hmsm(3, 5, 7, 80));
+/// assert_eq!(from_hmsm(3, 5, 7, 950) + Duration::milliseconds(280),     from_hmsm(3, 5, 8, 230));
+/// assert_eq!(from_hmsm(3, 5, 7, 950) + Duration::milliseconds(-980),    from_hmsm(3, 5, 6, 970));
+/// # }
+/// ~~~~
+///
+/// The addition wraps around.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveTime;
+/// # use time::Duration;
+/// # let from_hmsm = NaiveTime::from_hms_milli;
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::seconds(22*60*60), from_hmsm(1, 5, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::seconds(-8*60*60), from_hmsm(19, 5, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) + Duration::days(800),         from_hmsm(3, 5, 7, 0));
+/// # }
+/// ~~~~
+///
+/// Leap seconds are handled, but the addition assumes that it is the only leap second happened.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveTime;
+/// # use time::Duration;
+/// # let from_hmsm = NaiveTime::from_hms_milli;
+/// let leap = from_hmsm(3, 5, 59, 1_300);
+/// assert_eq!(leap + Duration::zero(),             from_hmsm(3, 5, 59, 1_300));
+/// assert_eq!(leap + Duration::milliseconds(-500), from_hmsm(3, 5, 59, 800));
+/// assert_eq!(leap + Duration::milliseconds(500),  from_hmsm(3, 5, 59, 1_800));
+/// assert_eq!(leap + Duration::milliseconds(800),  from_hmsm(3, 6, 0, 100));
+/// assert_eq!(leap + Duration::seconds(10),        from_hmsm(3, 6, 9, 300));
+/// assert_eq!(leap + Duration::seconds(-10),       from_hmsm(3, 5, 50, 300));
+/// assert_eq!(leap + Duration::days(1),            from_hmsm(3, 5, 59, 300));
+/// # }
+/// ~~~~
+impl Add<OldDuration> for NaiveTime {
+    type Output = NaiveTime;
+
+    #[inline]
+    fn add(self, rhs: OldDuration) -> NaiveTime {
+        self.overflowing_add_signed(rhs).0
+    }
+}
+
+impl AddAssign<OldDuration> for NaiveTime {
+    #[inline]
+    fn add_assign(&mut self, rhs: OldDuration) {
+        *self = self.add(rhs);
+    }
+}
+
+/// A subtraction of `Duration` from `NaiveTime` wraps around and never overflows or underflows.
+/// In particular the addition ignores integral number of days.
+/// It is same to the addition with a negated `Duration`.
+///
+/// As a part of Chrono's [leap second handling](#leap-second-handling),
+/// the addition assumes that **there is no leap second ever**,
+/// except when the `NaiveTime` itself represents a leap second
+/// in which case the assumption becomes that **there is exactly a single leap second ever**.
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveTime;
+/// use time::Duration;
+///
+/// let from_hmsm = NaiveTime::from_hms_milli;
+///
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::zero(),                  from_hmsm(3, 5, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::seconds(1),              from_hmsm(3, 5, 6, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::seconds(60 + 5),         from_hmsm(3, 4, 2, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::seconds(2*60*60 + 6*60), from_hmsm(0, 59, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::milliseconds(80),        from_hmsm(3, 5, 6, 920));
+/// assert_eq!(from_hmsm(3, 5, 7, 950) - Duration::milliseconds(280),     from_hmsm(3, 5, 7, 670));
+/// # }
+/// ~~~~
+///
+/// The subtraction wraps around.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveTime;
+/// # use time::Duration;
+/// # let from_hmsm = NaiveTime::from_hms_milli;
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::seconds(8*60*60), from_hmsm(19, 5, 7, 0));
+/// assert_eq!(from_hmsm(3, 5, 7, 0) - Duration::days(800),        from_hmsm(3, 5, 7, 0));
+/// # }
+/// ~~~~
+///
+/// Leap seconds are handled, but the subtraction assumes that it is the only leap second happened.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveTime;
+/// # use time::Duration;
+/// # let from_hmsm = NaiveTime::from_hms_milli;
+/// let leap = from_hmsm(3, 5, 59, 1_300);
+/// assert_eq!(leap - Duration::zero(),            from_hmsm(3, 5, 59, 1_300));
+/// assert_eq!(leap - Duration::milliseconds(200), from_hmsm(3, 5, 59, 1_100));
+/// assert_eq!(leap - Duration::milliseconds(500), from_hmsm(3, 5, 59, 800));
+/// assert_eq!(leap - Duration::seconds(60),       from_hmsm(3, 5, 0, 300));
+/// assert_eq!(leap - Duration::days(1),           from_hmsm(3, 6, 0, 300));
+/// # }
+/// ~~~~
+impl Sub<OldDuration> for NaiveTime {
+    type Output = NaiveTime;
+
+    #[inline]
+    fn sub(self, rhs: OldDuration) -> NaiveTime {
+        self.overflowing_sub_signed(rhs).0
+    }
+}
+
+impl SubAssign<OldDuration> for NaiveTime {
+    #[inline]
+    fn sub_assign(&mut self, rhs: OldDuration) {
+        *self = self.sub(rhs);
+    }
+}
+
+/// Subtracts another `NaiveTime` from the current time.
+/// Returns a `Duration` within +/- 1 day.
+/// This does not overflow or underflow at all.
+///
+/// As a part of Chrono's [leap second handling](#leap-second-handling),
+/// the subtraction assumes that **there is no leap second ever**,
+/// except when any of the `NaiveTime`s themselves represents a leap second
+/// in which case the assumption becomes that
+/// **there are exactly one (or two) leap second(s) ever**.
+///
+/// The implementation is a wrapper around
+/// [`NaiveTime::signed_duration_since`](#method.signed_duration_since).
+///
+/// # Example
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// use chrono::NaiveTime;
+/// use time::Duration;
+///
+/// let from_hmsm = NaiveTime::from_hms_milli;
+///
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(3, 5, 7, 900), Duration::zero());
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(3, 5, 7, 875), Duration::milliseconds(25));
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(3, 5, 6, 925), Duration::milliseconds(975));
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(3, 5, 0, 900), Duration::seconds(7));
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(3, 0, 7, 900), Duration::seconds(5 * 60));
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(0, 5, 7, 900), Duration::seconds(3 * 3600));
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(4, 5, 7, 900), Duration::seconds(-3600));
+/// assert_eq!(from_hmsm(3, 5, 7, 900) - from_hmsm(2, 4, 6, 800),
+///            Duration::seconds(3600 + 60 + 1) + Duration::milliseconds(100));
+/// # }
+/// ~~~~
+///
+/// Leap seconds are handled, but the subtraction assumes that
+/// there were no other leap seconds happened.
+///
+/// ~~~~
+/// # extern crate chrono; extern crate time; fn main() {
+/// # use chrono::NaiveTime;
+/// # use time::Duration;
+/// # let from_hmsm = NaiveTime::from_hms_milli;
+/// assert_eq!(from_hmsm(3, 0, 59, 1_000) - from_hmsm(3, 0, 59, 0), Duration::seconds(1));
+/// assert_eq!(from_hmsm(3, 0, 59, 1_500) - from_hmsm(3, 0, 59, 0),
+///            Duration::milliseconds(1500));
+/// assert_eq!(from_hmsm(3, 0, 59, 1_000) - from_hmsm(3, 0, 0, 0), Duration::seconds(60));
+/// assert_eq!(from_hmsm(3, 0, 0, 0) - from_hmsm(2, 59, 59, 1_000), Duration::seconds(1));
+/// assert_eq!(from_hmsm(3, 0, 59, 1_000) - from_hmsm(2, 59, 59, 1_000),
+///            Duration::seconds(61));
+/// # }
+/// ~~~~
+impl Sub<NaiveTime> for NaiveTime {
+    type Output = OldDuration;
+
+    #[inline]
+    fn sub(self, rhs: NaiveTime) -> OldDuration {
+        self.signed_duration_since(rhs)
+    }
+}
+
+/// The `Debug` output of the naive time `t` is same to
+/// [`t.format("%H:%M:%S%.f")`](../format/strftime/index.html).
+///
+/// The string printed can be readily parsed via the `parse` method on `str`.
+///
+/// It should be noted that, for leap seconds not on the minute boundary,
+/// it may print a representation not distinguishable from non-leap seconds.
+/// This doesn't matter in practice, since such leap seconds never happened.
+/// (By the time of the first leap second on 1972-06-30,
+/// every time zone offset around the world has standardized to the 5-minute alignment.)
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveTime;
+///
+/// assert_eq!(format!("{:?}", NaiveTime::from_hms(23, 56, 4)),              "23:56:04");
+/// assert_eq!(format!("{:?}", NaiveTime::from_hms_milli(23, 56, 4, 12)),    "23:56:04.012");
+/// assert_eq!(format!("{:?}", NaiveTime::from_hms_micro(23, 56, 4, 1234)),  "23:56:04.001234");
+/// assert_eq!(format!("{:?}", NaiveTime::from_hms_nano(23, 56, 4, 123456)), "23:56:04.000123456");
+/// ~~~~
+///
+/// Leap seconds may also be used.
+///
+/// ~~~~
+/// # use chrono::NaiveTime;
+/// assert_eq!(format!("{:?}", NaiveTime::from_hms_milli(6, 59, 59, 1_500)), "06:59:60.500");
+/// ~~~~
+impl fmt::Debug for NaiveTime {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let (hour, min, sec) = self.hms();
+        let (sec, nano) = if self.frac >= 1_000_000_000 {
+            (sec + 1, self.frac - 1_000_000_000)
+        } else {
+            (sec, self.frac)
+        };
+
+        try!(write!(f, "{:02}:{:02}:{:02}", hour, min, sec));
+        if nano == 0 {
+            Ok(())
+        } else if nano % 1_000_000 == 0 {
+            write!(f, ".{:03}", nano / 1_000_000)
+        } else if nano % 1_000 == 0 {
+            write!(f, ".{:06}", nano / 1_000)
+        } else {
+            write!(f, ".{:09}", nano)
+        }
+    }
+}
+
+/// The `Display` output of the naive time `t` is same to
+/// [`t.format("%H:%M:%S%.f")`](../format/strftime/index.html).
+///
+/// The string printed can be readily parsed via the `parse` method on `str`.
+///
+/// It should be noted that, for leap seconds not on the minute boundary,
+/// it may print a representation not distinguishable from non-leap seconds.
+/// This doesn't matter in practice, since such leap seconds never happened.
+/// (By the time of the first leap second on 1972-06-30,
+/// every time zone offset around the world has standardized to the 5-minute alignment.)
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveTime;
+///
+/// assert_eq!(format!("{}", NaiveTime::from_hms(23, 56, 4)),              "23:56:04");
+/// assert_eq!(format!("{}", NaiveTime::from_hms_milli(23, 56, 4, 12)),    "23:56:04.012");
+/// assert_eq!(format!("{}", NaiveTime::from_hms_micro(23, 56, 4, 1234)),  "23:56:04.001234");
+/// assert_eq!(format!("{}", NaiveTime::from_hms_nano(23, 56, 4, 123456)), "23:56:04.000123456");
+/// ~~~~
+///
+/// Leap seconds may also be used.
+///
+/// ~~~~
+/// # use chrono::NaiveTime;
+/// assert_eq!(format!("{}", NaiveTime::from_hms_milli(6, 59, 59, 1_500)), "06:59:60.500");
+/// ~~~~
+impl fmt::Display for NaiveTime {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Debug::fmt(self, f) }
+}
+
+/// Parsing a `str` into a `NaiveTime` uses the same format,
+/// [`%H:%M:%S%.f`](../format/strftime/index.html), as in `Debug` and `Display`.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::NaiveTime;
+///
+/// let t = NaiveTime::from_hms(23, 56, 4);
+/// assert_eq!("23:56:04".parse::<NaiveTime>(), Ok(t));
+///
+/// let t = NaiveTime::from_hms_nano(23, 56, 4, 12_345_678);
+/// assert_eq!("23:56:4.012345678".parse::<NaiveTime>(), Ok(t));
+///
+/// let t = NaiveTime::from_hms_nano(23, 59, 59, 1_234_567_890); // leap second
+/// assert_eq!("23:59:60.23456789".parse::<NaiveTime>(), Ok(t));
+///
+/// assert!("foo".parse::<NaiveTime>().is_err());
+/// ~~~~
+impl str::FromStr for NaiveTime {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> ParseResult<NaiveTime> {
+        const ITEMS: &'static [Item<'static>] = &[
+            Item::Space(""), Item::Numeric(Numeric::Hour, Pad::Zero),
+            Item::Space(""), Item::Literal(":"),
+            Item::Space(""), Item::Numeric(Numeric::Minute, Pad::Zero),
+            Item::Space(""), Item::Literal(":"),
+            Item::Space(""), Item::Numeric(Numeric::Second, Pad::Zero),
+            Item::Fixed(Fixed::Nanosecond), Item::Space(""),
+        ];
+
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, ITEMS.iter().cloned()));
+        parsed.to_naive_time()
+    }
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_encodable_json<F, E>(to_string: F)
+    where F: Fn(&NaiveTime) -> Result<String, E>, E: ::std::fmt::Debug
+{
+    assert_eq!(to_string(&NaiveTime::from_hms(0, 0, 0)).ok(),
+               Some(r#""00:00:00""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms_milli(0, 0, 0, 950)).ok(),
+               Some(r#""00:00:00.950""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms_milli(0, 0, 59, 1_000)).ok(),
+               Some(r#""00:00:60""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms(0, 1, 2)).ok(),
+               Some(r#""00:01:02""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms_nano(3, 5, 7, 98765432)).ok(),
+               Some(r#""03:05:07.098765432""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms(7, 8, 9)).ok(),
+               Some(r#""07:08:09""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms_micro(12, 34, 56, 789)).ok(),
+               Some(r#""12:34:56.000789""#.into()));
+    assert_eq!(to_string(&NaiveTime::from_hms_nano(23, 59, 59, 1_999_999_999)).ok(),
+               Some(r#""23:59:60.999999999""#.into()));
+}
+
+#[cfg(all(test, any(feature = "rustc-serialize", feature = "serde")))]
+fn test_decodable_json<F, E>(from_str: F)
+    where F: Fn(&str) -> Result<NaiveTime, E>, E: ::std::fmt::Debug
+{
+    assert_eq!(from_str(r#""00:00:00""#).ok(),
+               Some(NaiveTime::from_hms(0, 0, 0)));
+    assert_eq!(from_str(r#""0:0:0""#).ok(),
+               Some(NaiveTime::from_hms(0, 0, 0)));
+    assert_eq!(from_str(r#""00:00:00.950""#).ok(),
+               Some(NaiveTime::from_hms_milli(0, 0, 0, 950)));
+    assert_eq!(from_str(r#""0:0:0.95""#).ok(),
+               Some(NaiveTime::from_hms_milli(0, 0, 0, 950)));
+    assert_eq!(from_str(r#""00:00:60""#).ok(),
+               Some(NaiveTime::from_hms_milli(0, 0, 59, 1_000)));
+    assert_eq!(from_str(r#""00:01:02""#).ok(),
+               Some(NaiveTime::from_hms(0, 1, 2)));
+    assert_eq!(from_str(r#""03:05:07.098765432""#).ok(),
+               Some(NaiveTime::from_hms_nano(3, 5, 7, 98765432)));
+    assert_eq!(from_str(r#""07:08:09""#).ok(),
+               Some(NaiveTime::from_hms(7, 8, 9)));
+    assert_eq!(from_str(r#""12:34:56.000789""#).ok(),
+               Some(NaiveTime::from_hms_micro(12, 34, 56, 789)));
+    assert_eq!(from_str(r#""23:59:60.999999999""#).ok(),
+               Some(NaiveTime::from_hms_nano(23, 59, 59, 1_999_999_999)));
+    assert_eq!(from_str(r#""23:59:60.9999999999997""#).ok(), // excess digits are ignored
+               Some(NaiveTime::from_hms_nano(23, 59, 59, 1_999_999_999)));
+
+    // bad formats
+    assert!(from_str(r#""""#).is_err());
+    assert!(from_str(r#""000000""#).is_err());
+    assert!(from_str(r#""00:00:61""#).is_err());
+    assert!(from_str(r#""00:60:00""#).is_err());
+    assert!(from_str(r#""24:00:00""#).is_err());
+    assert!(from_str(r#""23:59:59,1""#).is_err());
+    assert!(from_str(r#""012:34:56""#).is_err());
+    assert!(from_str(r#""hh:mm:ss""#).is_err());
+    assert!(from_str(r#"0"#).is_err());
+    assert!(from_str(r#"86399"#).is_err());
+    assert!(from_str(r#"{}"#).is_err());
+    // pre-0.3.0 rustc-serialize format is now invalid
+    assert!(from_str(r#"{"secs":0,"frac":0}"#).is_err());
+    assert!(from_str(r#"null"#).is_err());
+}
+
+#[cfg(feature = "rustc-serialize")]
+mod rustc_serialize {
+    use super::NaiveTime;
+    use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
+
+    impl Encodable for NaiveTime {
+        fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
+            format!("{:?}", self).encode(s)
+        }
+    }
+
+    impl Decodable for NaiveTime {
+        fn decode<D: Decoder>(d: &mut D) -> Result<NaiveTime, D::Error> {
+            d.read_str()?.parse().map_err(|_| d.error("invalid time"))
+        }
+    }
+
+    #[cfg(test)] use rustc_serialize::json;
+
+    #[test]
+    fn test_encodable() {
+        super::test_encodable_json(json::encode);
+    }
+
+    #[test]
+    fn test_decodable() {
+        super::test_decodable_json(json::decode);
+    }
+}
+
+#[cfg(feature = "serde")]
+mod serde {
+    use std::fmt;
+    use super::NaiveTime;
+    use serdelib::{ser, de};
+
+    // TODO not very optimized for space (binary formats would want something better)
+    // TODO round-trip for general leap seconds (not just those with second = 60)
+
+    impl ser::Serialize for NaiveTime {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where S: ser::Serializer
+        {
+            serializer.collect_str(&self)
+        }
+    }
+
+    struct NaiveTimeVisitor;
+
+    impl<'de> de::Visitor<'de> for NaiveTimeVisitor {
+        type Value = NaiveTime;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result 
+        {
+            write!(formatter, "a formatted time string")
+        }
+
+        fn visit_str<E>(self, value: &str) -> Result<NaiveTime, E>
+            where E: de::Error
+        {
+            value.parse().map_err(|err| E::custom(format!("{}", err)))
+        }
+    }
+
+    impl<'de> de::Deserialize<'de> for NaiveTime {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where D: de::Deserializer<'de>
+        {
+            deserializer.deserialize_str(NaiveTimeVisitor)
+        }
+    }
+
+    #[cfg(test)] extern crate serde_json;
+    #[cfg(test)] extern crate bincode;
+
+    #[test]
+    fn test_serde_serialize() {
+        super::test_encodable_json(self::serde_json::to_string);
+    }
+
+    #[test]
+    fn test_serde_deserialize() {
+        super::test_decodable_json(|input| self::serde_json::from_str(&input));
+    }
+
+    #[test]
+    fn test_serde_bincode() {
+        // Bincode is relevant to test separately from JSON because
+        // it is not self-describing.
+        use self::bincode::{Infinite, serialize, deserialize};
+
+        let t = NaiveTime::from_hms_nano(3, 5, 7, 98765432);
+        let encoded = serialize(&t, Infinite).unwrap();
+        let decoded: NaiveTime = deserialize(&encoded).unwrap();
+        assert_eq!(t, decoded);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::NaiveTime;
+    use Timelike;
+    use std::u32;
+    use oldtime::Duration;
+
+    #[test]
+    fn test_time_from_hms_milli() {
+        assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 0),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 0)));
+        assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 777),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 777_000_000)));
+        assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 1_999),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 1_999_000_000)));
+        assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 2_000), None);
+        assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 5_000), None); // overflow check
+        assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, u32::MAX), None);
+    }
+
+    #[test]
+    fn test_time_from_hms_micro() {
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 0),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 0)));
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 333),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 333_000)));
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 777_777),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 777_777_000)));
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 1_999_999),
+                   Some(NaiveTime::from_hms_nano(3, 5, 7, 1_999_999_000)));
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 2_000_000), None);
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 5_000_000), None); // overflow check
+        assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, u32::MAX), None);
+    }
+
+    #[test]
+    fn test_time_hms() {
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).hour(), 3);
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_hour(0),
+                   Some(NaiveTime::from_hms(0, 5, 7)));
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_hour(23),
+                   Some(NaiveTime::from_hms(23, 5, 7)));
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_hour(24), None);
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_hour(u32::MAX), None);
+
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).minute(), 5);
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_minute(0),
+                   Some(NaiveTime::from_hms(3, 0, 7)));
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_minute(59),
+                   Some(NaiveTime::from_hms(3, 59, 7)));
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_minute(60), None);
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_minute(u32::MAX), None);
+
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).second(), 7);
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_second(0),
+                   Some(NaiveTime::from_hms(3, 5, 0)));
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_second(59),
+                   Some(NaiveTime::from_hms(3, 5, 59)));
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_second(60), None);
+        assert_eq!(NaiveTime::from_hms(3, 5, 7).with_second(u32::MAX), None);
+    }
+
+    #[test]
+    fn test_time_add() {
+        macro_rules! check {
+            ($lhs:expr, $rhs:expr, $sum:expr) => ({
+                assert_eq!($lhs + $rhs, $sum);
+                //assert_eq!($rhs + $lhs, $sum);
+            })
+        }
+
+        let hmsm = |h,m,s,mi| NaiveTime::from_hms_milli(h, m, s, mi);
+
+        check!(hmsm(3, 5, 7, 900), Duration::zero(), hmsm(3, 5, 7, 900));
+        check!(hmsm(3, 5, 7, 900), Duration::milliseconds(100), hmsm(3, 5, 8, 0));
+        check!(hmsm(3, 5, 7, 1_300), Duration::milliseconds(-1800), hmsm(3, 5, 6, 500));
+        check!(hmsm(3, 5, 7, 1_300), Duration::milliseconds(-800), hmsm(3, 5, 7, 500));
+        check!(hmsm(3, 5, 7, 1_300), Duration::milliseconds(-100), hmsm(3, 5, 7, 1_200));
+        check!(hmsm(3, 5, 7, 1_300), Duration::milliseconds(100), hmsm(3, 5, 7, 1_400));
+        check!(hmsm(3, 5, 7, 1_300), Duration::milliseconds(800), hmsm(3, 5, 8, 100));
+        check!(hmsm(3, 5, 7, 1_300), Duration::milliseconds(1800), hmsm(3, 5, 9, 100));
+        check!(hmsm(3, 5, 7, 900), Duration::seconds(86399), hmsm(3, 5, 6, 900)); // overwrap
+        check!(hmsm(3, 5, 7, 900), Duration::seconds(-86399), hmsm(3, 5, 8, 900));
+        check!(hmsm(3, 5, 7, 900), Duration::days(12345), hmsm(3, 5, 7, 900));
+        check!(hmsm(3, 5, 7, 1_300), Duration::days(1), hmsm(3, 5, 7, 300));
+        check!(hmsm(3, 5, 7, 1_300), Duration::days(-1), hmsm(3, 5, 8, 300));
+
+        // regression tests for #37
+        check!(hmsm(0, 0, 0, 0), Duration::milliseconds(-990), hmsm(23, 59, 59, 10));
+        check!(hmsm(0, 0, 0, 0), Duration::milliseconds(-9990), hmsm(23, 59, 50, 10));
+    }
+
+    #[test]
+    fn test_time_overflowing_add() {
+        let hmsm = NaiveTime::from_hms_milli;
+
+        assert_eq!(hmsm(3, 4, 5, 678).overflowing_add_signed(Duration::hours(11)),
+                   (hmsm(14, 4, 5, 678), 0));
+        assert_eq!(hmsm(3, 4, 5, 678).overflowing_add_signed(Duration::hours(23)),
+                   (hmsm(2, 4, 5, 678), 86_400));
+        assert_eq!(hmsm(3, 4, 5, 678).overflowing_add_signed(Duration::hours(-7)),
+                   (hmsm(20, 4, 5, 678), -86_400));
+
+        // overflowing_add_signed with leap seconds may be counter-intuitive
+        assert_eq!(hmsm(3, 4, 5, 1_678).overflowing_add_signed(Duration::days(1)),
+                   (hmsm(3, 4, 5, 678), 86_400));
+        assert_eq!(hmsm(3, 4, 5, 1_678).overflowing_add_signed(Duration::days(-1)),
+                   (hmsm(3, 4, 6, 678), -86_400));
+    }
+
+    #[test]
+    fn test_time_addassignment() {
+        let hms = NaiveTime::from_hms;
+        let mut time = hms(12, 12, 12);
+        time += Duration::hours(10);
+        assert_eq!(time, hms(22, 12, 12));
+        time += Duration::hours(10);
+        assert_eq!(time, hms(8, 12, 12));
+    }
+
+    #[test]
+    fn test_time_subassignment() {
+        let hms = NaiveTime::from_hms;
+        let mut time = hms(12, 12, 12);
+        time -= Duration::hours(10);
+        assert_eq!(time, hms(2, 12, 12));
+        time -= Duration::hours(10);
+        assert_eq!(time, hms(16, 12, 12));
+    }
+
+    #[test]
+    fn test_time_sub() {
+        macro_rules! check {
+            ($lhs:expr, $rhs:expr, $diff:expr) => ({
+                // `time1 - time2 = duration` is equivalent to `time2 - time1 = -duration`
+                assert_eq!($lhs.signed_duration_since($rhs), $diff);
+                assert_eq!($rhs.signed_duration_since($lhs), -$diff);
+            })
+        }
+
+        let hmsm = |h,m,s,mi| NaiveTime::from_hms_milli(h, m, s, mi);
+
+        check!(hmsm(3, 5, 7, 900), hmsm(3, 5, 7, 900), Duration::zero());
+        check!(hmsm(3, 5, 7, 900), hmsm(3, 5, 7, 600), Duration::milliseconds(300));
+        check!(hmsm(3, 5, 7, 200), hmsm(2, 4, 6, 200), Duration::seconds(3600 + 60 + 1));
+        check!(hmsm(3, 5, 7, 200), hmsm(2, 4, 6, 300),
+               Duration::seconds(3600 + 60) + Duration::milliseconds(900));
+
+        // treats the leap second as if it coincides with the prior non-leap second,
+        // as required by `time1 - time2 = duration` and `time2 - time1 = -duration` equivalence.
+        check!(hmsm(3, 5, 7, 200), hmsm(3, 5, 6, 1_800), Duration::milliseconds(400));
+        check!(hmsm(3, 5, 7, 1_200), hmsm(3, 5, 6, 1_800), Duration::milliseconds(1400));
+        check!(hmsm(3, 5, 7, 1_200), hmsm(3, 5, 6, 800), Duration::milliseconds(1400));
+
+        // additional equality: `time1 + duration = time2` is equivalent to
+        // `time2 - time1 = duration` IF AND ONLY IF `time2` represents a non-leap second.
+        assert_eq!(hmsm(3, 5, 6, 800) + Duration::milliseconds(400), hmsm(3, 5, 7, 200));
+        assert_eq!(hmsm(3, 5, 6, 1_800) + Duration::milliseconds(400), hmsm(3, 5, 7, 200));
+    }
+
+    #[test]
+    fn test_time_fmt() {
+        assert_eq!(format!("{}", NaiveTime::from_hms_milli(23, 59, 59, 999)), "23:59:59.999");
+        assert_eq!(format!("{}", NaiveTime::from_hms_milli(23, 59, 59, 1_000)), "23:59:60");
+        assert_eq!(format!("{}", NaiveTime::from_hms_milli(23, 59, 59, 1_001)), "23:59:60.001");
+        assert_eq!(format!("{}", NaiveTime::from_hms_micro(0, 0, 0, 43210)), "00:00:00.043210");
+        assert_eq!(format!("{}", NaiveTime::from_hms_nano(0, 0, 0, 6543210)), "00:00:00.006543210");
+
+        // the format specifier should have no effect on `NaiveTime`
+        assert_eq!(format!("{:30}", NaiveTime::from_hms_milli(3, 5, 7, 9)), "03:05:07.009");
+    }
+
+    #[test]
+    fn test_date_from_str() {
+        // valid cases
+        let valid = [
+            "0:0:0",
+            "0:0:0.0000000",
+            "0:0:0.0000003",
+            " 4 : 3 : 2.1 ",
+            " 09:08:07 ",
+            " 9:8:07 ",
+            "23:59:60.373929310237",
+        ];
+        for &s in &valid {
+            let d = match s.parse::<NaiveTime>() {
+                Ok(d) => d,
+                Err(e) => panic!("parsing `{}` has failed: {}", s, e)
+            };
+            let s_ = format!("{:?}", d);
+            // `s` and `s_` may differ, but `s.parse()` and `s_.parse()` must be same
+            let d_ = match s_.parse::<NaiveTime>() {
+                Ok(d) => d,
+                Err(e) => panic!("`{}` is parsed into `{:?}`, but reparsing that has failed: {}",
+                                 s, d, e)
+            };
+            assert!(d == d_, "`{}` is parsed into `{:?}`, but reparsed result \
+                              `{:?}` does not match", s, d, d_);
+        }
+
+        // some invalid cases
+        // since `ParseErrorKind` is private, all we can do is to check if there was an error
+        assert!("".parse::<NaiveTime>().is_err());
+        assert!("x".parse::<NaiveTime>().is_err());
+        assert!("15".parse::<NaiveTime>().is_err());
+        assert!("15:8".parse::<NaiveTime>().is_err());
+        assert!("15:8:x".parse::<NaiveTime>().is_err());
+        assert!("15:8:9x".parse::<NaiveTime>().is_err());
+        assert!("23:59:61".parse::<NaiveTime>().is_err());
+        assert!("12:34:56.x".parse::<NaiveTime>().is_err());
+        assert!("12:34:56. 0".parse::<NaiveTime>().is_err());
+    }
+
+    #[test]
+    fn test_time_parse_from_str() {
+        let hms = |h,m,s| NaiveTime::from_hms(h,m,s);
+        assert_eq!(NaiveTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
+                   Ok(hms(12, 34, 56))); // ignore date and offset
+        assert_eq!(NaiveTime::parse_from_str("PM 12:59", "%P %H:%M"),
+                   Ok(hms(12, 59, 0)));
+        assert!(NaiveTime::parse_from_str("12:3456", "%H:%M:%S").is_err());
+    }
+
+    #[test]
+    fn test_time_format() {
+        let t = NaiveTime::from_hms_nano(3, 5, 7, 98765432);
+        assert_eq!(t.format("%H,%k,%I,%l,%P,%p").to_string(), "03, 3,03, 3,am,AM");
+        assert_eq!(t.format("%M").to_string(), "05");
+        assert_eq!(t.format("%S,%f,%.f").to_string(), "07,098765432,.098765432");
+        assert_eq!(t.format("%.3f,%.6f,%.9f").to_string(), ".098,.098765,.098765432");
+        assert_eq!(t.format("%R").to_string(), "03:05");
+        assert_eq!(t.format("%T,%X").to_string(), "03:05:07,03:05:07");
+        assert_eq!(t.format("%r").to_string(), "03:05:07 AM");
+        assert_eq!(t.format("%t%n%%%n%t").to_string(), "\t\n%\n\t");
+
+        let t = NaiveTime::from_hms_micro(3, 5, 7, 432100);
+        assert_eq!(t.format("%S,%f,%.f").to_string(), "07,432100000,.432100");
+        assert_eq!(t.format("%.3f,%.6f,%.9f").to_string(), ".432,.432100,.432100000");
+
+        let t = NaiveTime::from_hms_milli(3, 5, 7, 210);
+        assert_eq!(t.format("%S,%f,%.f").to_string(), "07,210000000,.210");
+        assert_eq!(t.format("%.3f,%.6f,%.9f").to_string(), ".210,.210000,.210000000");
+
+        let t = NaiveTime::from_hms(3, 5, 7);
+        assert_eq!(t.format("%S,%f,%.f").to_string(), "07,000000000,");
+        assert_eq!(t.format("%.3f,%.6f,%.9f").to_string(), ".000,.000000,.000000000");
+
+        // corner cases
+        assert_eq!(NaiveTime::from_hms(13, 57, 9).format("%r").to_string(), "01:57:09 PM");
+        assert_eq!(NaiveTime::from_hms_milli(23, 59, 59, 1_000).format("%X").to_string(),
+                   "23:59:60");
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/offset/fixed.rs cargo-0.33.0/vendor/chrono/src/offset/fixed.rs
--- cargo-0.32.0/vendor/chrono/src/offset/fixed.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/offset/fixed.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,224 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! The time zone which has a fixed offset from UTC.
+
+use std::ops::{Add, Sub};
+use std::fmt;
+use oldtime::Duration as OldDuration;
+
+use Timelike;
+use div::div_mod_floor;
+use naive::{NaiveTime, NaiveDate, NaiveDateTime};
+use DateTime;
+use super::{TimeZone, Offset, LocalResult};
+
+/// The time zone with fixed offset, from UTC-23:59:59 to UTC+23:59:59.
+///
+/// Using the [`TimeZone`](./trait.TimeZone.html) methods
+/// on a `FixedOffset` struct is the preferred way to construct
+/// `DateTime<FixedOffset>` instances. See the [`east`](#method.east) and
+/// [`west`](#method.west) methods for examples.
+#[derive(PartialEq, Eq, Hash, Copy, Clone)]
+pub struct FixedOffset {
+    local_minus_utc: i32,
+}
+
+impl FixedOffset {
+    /// Makes a new `FixedOffset` for the Eastern Hemisphere with given timezone difference.
+    /// The negative `secs` means the Western Hemisphere.
+    ///
+    /// Panics on the out-of-bound `secs`.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{FixedOffset, TimeZone};
+    /// let hour = 3600;
+    /// let datetime = FixedOffset::east(5 * hour).ymd(2016, 11, 08)
+    ///                                           .and_hms(0, 0, 0);
+    /// assert_eq!(&datetime.to_rfc3339(), "2016-11-08T00:00:00+05:00")
+    /// ~~~~
+    pub fn east(secs: i32) -> FixedOffset {
+        FixedOffset::east_opt(secs).expect("FixedOffset::east out of bounds")
+    }
+
+    /// Makes a new `FixedOffset` for the Eastern Hemisphere with given timezone difference.
+    /// The negative `secs` means the Western Hemisphere.
+    ///
+    /// Returns `None` on the out-of-bound `secs`.
+    pub fn east_opt(secs: i32) -> Option<FixedOffset> {
+        if -86_400 < secs && secs < 86_400 {
+            Some(FixedOffset { local_minus_utc: secs })
+        } else {
+            None
+        }
+    }
+
+    /// Makes a new `FixedOffset` for the Western Hemisphere with given timezone difference.
+    /// The negative `secs` means the Eastern Hemisphere.
+    ///
+    /// Panics on the out-of-bound `secs`.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{FixedOffset, TimeZone};
+    /// let hour = 3600;
+    /// let datetime = FixedOffset::west(5 * hour).ymd(2016, 11, 08)
+    ///                                           .and_hms(0, 0, 0);
+    /// assert_eq!(&datetime.to_rfc3339(), "2016-11-08T00:00:00-05:00")
+    /// ~~~~
+    pub fn west(secs: i32) -> FixedOffset {
+        FixedOffset::west_opt(secs).expect("FixedOffset::west out of bounds")
+    }
+
+    /// Makes a new `FixedOffset` for the Western Hemisphere with given timezone difference.
+    /// The negative `secs` means the Eastern Hemisphere.
+    ///
+    /// Returns `None` on the out-of-bound `secs`.
+    pub fn west_opt(secs: i32) -> Option<FixedOffset> {
+        if -86_400 < secs && secs < 86_400 {
+            Some(FixedOffset { local_minus_utc: -secs })
+        } else {
+            None
+        }
+    }
+
+    /// Returns the number of seconds to add to convert from UTC to the local time.
+    pub fn local_minus_utc(&self) -> i32 {
+        self.local_minus_utc
+    }
+
+    /// Returns the number of seconds to add to convert from the local time to UTC.
+    pub fn utc_minus_local(&self) -> i32 {
+        -self.local_minus_utc
+    }
+}
+
+impl TimeZone for FixedOffset {
+    type Offset = FixedOffset;
+
+    fn from_offset(offset: &FixedOffset) -> FixedOffset { *offset }
+
+    fn offset_from_local_date(&self, _local: &NaiveDate) -> LocalResult<FixedOffset> {
+        LocalResult::Single(*self)
+    }
+    fn offset_from_local_datetime(&self, _local: &NaiveDateTime) -> LocalResult<FixedOffset> {
+        LocalResult::Single(*self)
+    }
+
+    fn offset_from_utc_date(&self, _utc: &NaiveDate) -> FixedOffset { *self }
+    fn offset_from_utc_datetime(&self, _utc: &NaiveDateTime) -> FixedOffset { *self }
+}
+
+impl Offset for FixedOffset {
+    fn fix(&self) -> FixedOffset { *self }
+}
+
+impl fmt::Debug for FixedOffset {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let offset = self.local_minus_utc;
+        let (sign, offset) = if offset < 0 {('-', -offset)} else {('+', offset)};
+        let (mins, sec) = div_mod_floor(offset, 60);
+        let (hour, min) = div_mod_floor(mins, 60);
+        if sec == 0 {
+            write!(f, "{}{:02}:{:02}", sign, hour, min)
+        } else {
+            write!(f, "{}{:02}:{:02}:{:02}", sign, hour, min, sec)
+        }
+    }
+}
+
+impl fmt::Display for FixedOffset {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Debug::fmt(self, f) }
+}
+
+// addition or subtraction of FixedOffset to/from Timelike values is same to
+// adding or subtracting the offset's local_minus_utc value
+// but keep keeps the leap second information.
+// this should be implemented more efficiently, but for the time being, this is generic right now.
+
+fn add_with_leapsecond<T>(lhs: &T, rhs: i32) -> T
+    where T: Timelike + Add<OldDuration, Output=T>
+{
+    // extract and temporarily remove the fractional part and later recover it
+    let nanos = lhs.nanosecond();
+    let lhs = lhs.with_nanosecond(0).unwrap();
+    (lhs + OldDuration::seconds(i64::from(rhs))).with_nanosecond(nanos).unwrap()
+}
+
+impl Add<FixedOffset> for NaiveTime {
+    type Output = NaiveTime;
+
+    #[inline]
+    fn add(self, rhs: FixedOffset) -> NaiveTime {
+        add_with_leapsecond(&self, rhs.local_minus_utc)
+    }
+}
+
+impl Sub<FixedOffset> for NaiveTime {
+    type Output = NaiveTime;
+
+    #[inline]
+    fn sub(self, rhs: FixedOffset) -> NaiveTime {
+        add_with_leapsecond(&self, -rhs.local_minus_utc)
+    }
+}
+
+impl Add<FixedOffset> for NaiveDateTime {
+    type Output = NaiveDateTime;
+
+    #[inline]
+    fn add(self, rhs: FixedOffset) -> NaiveDateTime {
+        add_with_leapsecond(&self, rhs.local_minus_utc)
+    }
+}
+
+impl Sub<FixedOffset> for NaiveDateTime {
+    type Output = NaiveDateTime;
+
+    #[inline]
+    fn sub(self, rhs: FixedOffset) -> NaiveDateTime {
+        add_with_leapsecond(&self, -rhs.local_minus_utc)
+    }
+}
+
+impl<Tz: TimeZone> Add<FixedOffset> for DateTime<Tz> {
+    type Output = DateTime<Tz>;
+
+    #[inline]
+    fn add(self, rhs: FixedOffset) -> DateTime<Tz> {
+        add_with_leapsecond(&self, rhs.local_minus_utc)
+    }
+}
+
+impl<Tz: TimeZone> Sub<FixedOffset> for DateTime<Tz> {
+    type Output = DateTime<Tz>;
+
+    #[inline]
+    fn sub(self, rhs: FixedOffset) -> DateTime<Tz> {
+        add_with_leapsecond(&self, -rhs.local_minus_utc)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use offset::TimeZone;
+    use super::FixedOffset;
+
+    #[test]
+    fn test_date_extreme_offset() {
+        // starting from 0.3 we don't have an offset exceeding one day.
+        // this makes everything easier!
+        assert_eq!(format!("{:?}", FixedOffset::east(86399).ymd(2012, 2, 29)),
+                   "2012-02-29+23:59:59".to_string());
+        assert_eq!(format!("{:?}", FixedOffset::east(86399).ymd(2012, 2, 29).and_hms(5, 6, 7)),
+                   "2012-02-29T05:06:07+23:59:59".to_string());
+        assert_eq!(format!("{:?}", FixedOffset::west(86399).ymd(2012, 3, 4)),
+                   "2012-03-04-23:59:59".to_string());
+        assert_eq!(format!("{:?}", FixedOffset::west(86399).ymd(2012, 3, 4).and_hms(5, 6, 7)),
+                   "2012-03-04T05:06:07-23:59:59".to_string());
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/offset/local.rs cargo-0.33.0/vendor/chrono/src/offset/local.rs
--- cargo-0.32.0/vendor/chrono/src/offset/local.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/offset/local.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,182 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! The local (system) time zone.
+
+use oldtime;
+
+use {Datelike, Timelike};
+use naive::{NaiveDate, NaiveTime, NaiveDateTime};
+use {Date, DateTime};
+use super::{TimeZone, LocalResult};
+use super::fixed::FixedOffset;
+
+/// Converts a `time::Tm` struct into the timezone-aware `DateTime`.
+/// This assumes that `time` is working correctly, i.e. any error is fatal.
+fn tm_to_datetime(mut tm: oldtime::Tm) -> DateTime<Local> {
+    if tm.tm_sec >= 60 {
+        tm.tm_nsec += (tm.tm_sec - 59) * 1_000_000_000;
+        tm.tm_sec = 59;
+    }
+
+    #[cfg(not(windows))]
+    fn tm_to_naive_date(tm: &oldtime::Tm) -> NaiveDate {
+        // from_yo is more efficient than from_ymd (since it's the internal representation).
+        NaiveDate::from_yo(tm.tm_year + 1900, tm.tm_yday as u32 + 1)
+    }
+
+    #[cfg(windows)]
+    fn tm_to_naive_date(tm: &oldtime::Tm) -> NaiveDate {
+        // ...but tm_yday is broken in Windows (issue #85)
+        NaiveDate::from_ymd(tm.tm_year + 1900, tm.tm_mon as u32 + 1, tm.tm_mday as u32)
+    }
+
+    let date = tm_to_naive_date(&tm);
+    let time = NaiveTime::from_hms_nano(tm.tm_hour as u32, tm.tm_min as u32,
+                                        tm.tm_sec as u32, tm.tm_nsec as u32);
+    let offset = FixedOffset::east(tm.tm_utcoff);
+    DateTime::from_utc(date.and_time(time) - offset, offset)
+}
+
+/// Converts a local `NaiveDateTime` to the `time::Timespec`.
+fn datetime_to_timespec(d: &NaiveDateTime, local: bool) -> oldtime::Timespec {
+    // well, this exploits an undocumented `Tm::to_timespec` behavior
+    // to get the exact function we want (either `timegm` or `mktime`).
+    // the number 1 is arbitrary but should be non-zero to trigger `mktime`.
+    let tm_utcoff = if local {1} else {0};
+
+    let tm = oldtime::Tm {
+        tm_sec: d.second() as i32,
+        tm_min: d.minute() as i32,
+        tm_hour: d.hour() as i32,
+        tm_mday: d.day() as i32,
+        tm_mon: d.month0() as i32, // yes, C is that strange...
+        tm_year: d.year() - 1900, // this doesn't underflow, we know that d is `NaiveDateTime`.
+        tm_wday: 0, // to_local ignores this
+        tm_yday: 0, // and this
+        tm_isdst: -1,
+        tm_utcoff: tm_utcoff,
+        // do not set this, OS APIs are heavily inconsistent in terms of leap second handling
+        tm_nsec: 0,
+    };
+
+    tm.to_timespec()
+}
+
+/// The local timescale. This is implemented via the standard `time` crate.
+///
+/// Using the [`TimeZone`](./trait.TimeZone.html) methods
+/// on the Local struct is the preferred way to construct `DateTime<Local>`
+/// instances.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::{Local, DateTime, TimeZone};
+///
+/// let dt: DateTime<Local> = Local::now();
+/// let dt: DateTime<Local> = Local.timestamp(0, 0);
+/// ~~~~
+#[derive(Copy, Clone, Debug)]
+pub struct Local;
+
+impl Local {
+    /// Returns a `Date` which corresponds to the current date.
+    pub fn today() -> Date<Local> {
+        Local::now().date()
+    }
+
+    /// Returns a `DateTime` which corresponds to the current date.
+    pub fn now() -> DateTime<Local> {
+        tm_to_datetime(oldtime::now())
+    }
+}
+
+impl TimeZone for Local {
+    type Offset = FixedOffset;
+
+    fn from_offset(_offset: &FixedOffset) -> Local { Local }
+
+    // they are easier to define in terms of the finished date and time unlike other offsets
+    fn offset_from_local_date(&self, local: &NaiveDate) -> LocalResult<FixedOffset> {
+        self.from_local_date(local).map(|date| *date.offset())
+    }
+
+    fn offset_from_local_datetime(&self, local: &NaiveDateTime) -> LocalResult<FixedOffset> {
+        self.from_local_datetime(local).map(|datetime| *datetime.offset())
+    }
+
+    fn offset_from_utc_date(&self, utc: &NaiveDate) -> FixedOffset {
+        *self.from_utc_date(utc).offset()
+    }
+
+    fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> FixedOffset {
+        *self.from_utc_datetime(utc).offset()
+    }
+
+    // override them for avoiding redundant works
+    fn from_local_date(&self, local: &NaiveDate) -> LocalResult<Date<Local>> {
+        // this sounds very strange, but required for keeping `TimeZone::ymd` sane.
+        // in the other words, we use the offset at the local midnight
+        // but keep the actual date unaltered (much like `FixedOffset`).
+        let midnight = self.from_local_datetime(&local.and_hms(0, 0, 0));
+        midnight.map(|datetime| Date::from_utc(*local, *datetime.offset()))
+    }
+
+    fn from_local_datetime(&self, local: &NaiveDateTime) -> LocalResult<DateTime<Local>> {
+        let timespec = datetime_to_timespec(local, true);
+
+        // datetime_to_timespec completely ignores leap seconds, so we need to adjust for them
+        let mut tm = oldtime::at(timespec);
+        assert_eq!(tm.tm_nsec, 0);
+        tm.tm_nsec = local.nanosecond() as i32;
+
+        LocalResult::Single(tm_to_datetime(tm))
+    }
+
+    fn from_utc_date(&self, utc: &NaiveDate) -> Date<Local> {
+        let midnight = self.from_utc_datetime(&utc.and_hms(0, 0, 0));
+        Date::from_utc(*utc, *midnight.offset())
+    }
+
+    fn from_utc_datetime(&self, utc: &NaiveDateTime) -> DateTime<Local> {
+        let timespec = datetime_to_timespec(utc, false);
+
+        // datetime_to_timespec completely ignores leap seconds, so we need to adjust for them
+        let mut tm = oldtime::at(timespec);
+        assert_eq!(tm.tm_nsec, 0);
+        tm.tm_nsec = utc.nanosecond() as i32;
+
+        tm_to_datetime(tm)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use Datelike;
+    use offset::TimeZone;
+    use super::Local;
+
+    #[test]
+    fn test_local_date_sanity_check() { // issue #27
+        assert_eq!(Local.ymd(2999, 12, 28).day(), 28);
+    }
+
+    #[test]
+    fn test_leap_second() { // issue #123
+        let today = Local::today();
+
+        let dt = today.and_hms_milli(1, 2, 59, 1000);
+        let timestr = dt.time().to_string();
+        // the OS API may or may not support the leap second,
+        // but there are only two sensible options.
+        assert!(timestr == "01:02:60" || timestr == "01:03:00",
+                "unexpected timestr {:?}", timestr);
+
+        let dt = today.and_hms_milli(1, 2, 3, 1234);
+        let timestr = dt.time().to_string();
+        assert!(timestr == "01:02:03.234" || timestr == "01:02:04.234",
+                "unexpected timestr {:?}", timestr);
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/offset/mod.rs cargo-0.33.0/vendor/chrono/src/offset/mod.rs
--- cargo-0.32.0/vendor/chrono/src/offset/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/offset/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,419 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! The time zone, which calculates offsets from the local time to UTC.
+//!
+//! There are four operations provided by the `TimeZone` trait:
+//!
+//! 1. Converting the local `NaiveDateTime` to `DateTime<Tz>`
+//! 2. Converting the UTC `NaiveDateTime` to `DateTime<Tz>`
+//! 3. Converting `DateTime<Tz>` to the local `NaiveDateTime`
+//! 4. Constructing `DateTime<Tz>` objects from various offsets
+//!
+//! 1 is used for constructors. 2 is used for the `with_timezone` method of date and time types.
+//! 3 is used for other methods, e.g. `year()` or `format()`, and provided by an associated type
+//! which implements `Offset` (which then passed to `TimeZone` for actual implementations).
+//! Technically speaking `TimeZone` has a total knowledge about given timescale,
+//! but `Offset` is used as a cache to avoid the repeated conversion
+//! and provides implementations for 1 and 3.
+//! An `TimeZone` instance can be reconstructed from the corresponding `Offset` instance.
+
+use std::fmt;
+
+use Weekday;
+use naive::{NaiveDate, NaiveTime, NaiveDateTime};
+use {Date, DateTime};
+use format::{parse, Parsed, ParseResult, StrftimeItems};
+
+/// The conversion result from the local time to the timezone-aware datetime types.
+#[derive(Clone, PartialEq, Debug)]
+pub enum LocalResult<T> {
+    /// Given local time representation is invalid.
+    /// This can occur when, for example, the positive timezone transition.
+    None,
+    /// Given local time representation has a single unique result.
+    Single(T),
+    /// Given local time representation has multiple results and thus ambiguous.
+    /// This can occur when, for example, the negative timezone transition.
+    Ambiguous(T /*min*/, T /*max*/),
+}
+
+impl<T> LocalResult<T> {
+    /// Returns `Some` only when the conversion result is unique, or `None` otherwise.
+    pub fn single(self) -> Option<T> {
+        match self { LocalResult::Single(t) => Some(t), _ => None }
+    }
+
+    /// Returns `Some` for the earliest possible conversion result, or `None` if none.
+    pub fn earliest(self) -> Option<T> {
+        match self { LocalResult::Single(t) | LocalResult::Ambiguous(t,_) => Some(t), _ => None }
+    }
+
+    /// Returns `Some` for the latest possible conversion result, or `None` if none.
+    pub fn latest(self) -> Option<T> {
+        match self { LocalResult::Single(t) | LocalResult::Ambiguous(_,t) => Some(t), _ => None }
+    }
+
+    /// Maps a `LocalResult<T>` into `LocalResult<U>` with given function.
+    pub fn map<U, F: FnMut(T) -> U>(self, mut f: F) -> LocalResult<U> {
+        match self {
+            LocalResult::None => LocalResult::None,
+            LocalResult::Single(v) => LocalResult::Single(f(v)),
+            LocalResult::Ambiguous(min, max) => LocalResult::Ambiguous(f(min), f(max)),
+        }
+    }
+}
+
+impl<Tz: TimeZone> LocalResult<Date<Tz>> {
+    /// Makes a new `DateTime` from the current date and given `NaiveTime`.
+    /// The offset in the current date is preserved.
+    ///
+    /// Propagates any error. Ambiguous result would be discarded.
+    #[inline]
+    pub fn and_time(self, time: NaiveTime) -> LocalResult<DateTime<Tz>> {
+        match self {
+            LocalResult::Single(d) => d.and_time(time)
+                                       .map_or(LocalResult::None, LocalResult::Single),
+            _ => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute and second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Propagates any error. Ambiguous result would be discarded.
+    #[inline]
+    pub fn and_hms_opt(self, hour: u32, min: u32, sec: u32) -> LocalResult<DateTime<Tz>> {
+        match self {
+            LocalResult::Single(d) => d.and_hms_opt(hour, min, sec)
+                                       .map_or(LocalResult::None, LocalResult::Single),
+            _ => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and millisecond.
+    /// The millisecond part can exceed 1,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Propagates any error. Ambiguous result would be discarded.
+    #[inline]
+    pub fn and_hms_milli_opt(self, hour: u32, min: u32, sec: u32,
+                             milli: u32) -> LocalResult<DateTime<Tz>> {
+        match self {
+            LocalResult::Single(d) => d.and_hms_milli_opt(hour, min, sec, milli)
+                                       .map_or(LocalResult::None, LocalResult::Single),
+            _ => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and microsecond.
+    /// The microsecond part can exceed 1,000,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Propagates any error. Ambiguous result would be discarded.
+    #[inline]
+    pub fn and_hms_micro_opt(self, hour: u32, min: u32, sec: u32,
+                             micro: u32) -> LocalResult<DateTime<Tz>> {
+        match self {
+            LocalResult::Single(d) => d.and_hms_micro_opt(hour, min, sec, micro)
+                                       .map_or(LocalResult::None, LocalResult::Single),
+            _ => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `DateTime` from the current date, hour, minute, second and nanosecond.
+    /// The nanosecond part can exceed 1,000,000,000 in order to represent the leap second.
+    /// The offset in the current date is preserved.
+    ///
+    /// Propagates any error. Ambiguous result would be discarded.
+    #[inline]
+    pub fn and_hms_nano_opt(self, hour: u32, min: u32, sec: u32,
+                            nano: u32) -> LocalResult<DateTime<Tz>> {
+        match self {
+            LocalResult::Single(d) => d.and_hms_nano_opt(hour, min, sec, nano)
+                                       .map_or(LocalResult::None, LocalResult::Single),
+            _ => LocalResult::None,
+        }
+    }
+
+}
+
+impl<T: fmt::Debug> LocalResult<T> {
+    /// Returns the single unique conversion result, or panics accordingly.
+    pub fn unwrap(self) -> T {
+        match self {
+            LocalResult::None => panic!("No such local time"),
+            LocalResult::Single(t) => t,
+            LocalResult::Ambiguous(t1,t2) => {
+                panic!("Ambiguous local time, ranging from {:?} to {:?}", t1, t2)
+            }
+        }
+    }
+}
+
+/// The offset from the local time to UTC.
+pub trait Offset: Sized + Clone + fmt::Debug {
+    /// Returns the fixed offset from UTC to the local time stored.
+    fn fix(&self) -> FixedOffset;
+}
+
+/// The time zone.
+///
+/// The methods here are the primarily constructors for [`Date`](../struct.Date.html) and
+/// [`DateTime`](../struct.DateTime.html) types.
+pub trait TimeZone: Sized + Clone {
+    /// An associated offset type.
+    /// This type is used to store the actual offset in date and time types.
+    /// The original `TimeZone` value can be recovered via `TimeZone::from_offset`.
+    type Offset: Offset;
+
+    /// Makes a new `Date` from year, month, day and the current time zone.
+    /// This assumes the proleptic Gregorian calendar, with the year 0 being 1 BCE.
+    ///
+    /// The time zone normally does not affect the date (unless it is between UTC-24 and UTC+24),
+    /// but it will propagate to the `DateTime` values constructed via this date.
+    ///
+    /// Panics on the out-of-range date, invalid month and/or day.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, TimeZone};
+    ///
+    /// assert_eq!(Utc.ymd(2015, 5, 15).to_string(), "2015-05-15UTC");
+    /// ~~~~
+    fn ymd(&self, year: i32, month: u32, day: u32) -> Date<Self> {
+        self.ymd_opt(year, month, day).unwrap()
+    }
+
+    /// Makes a new `Date` from year, month, day and the current time zone.
+    /// This assumes the proleptic Gregorian calendar, with the year 0 being 1 BCE.
+    ///
+    /// The time zone normally does not affect the date (unless it is between UTC-24 and UTC+24),
+    /// but it will propagate to the `DateTime` values constructed via this date.
+    ///
+    /// Returns `None` on the out-of-range date, invalid month and/or day.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, LocalResult, TimeZone};
+    ///
+    /// assert_eq!(Utc.ymd_opt(2015, 5, 15).unwrap().to_string(), "2015-05-15UTC");
+    /// assert_eq!(Utc.ymd_opt(2000, 0, 0), LocalResult::None);
+    /// ~~~~
+    fn ymd_opt(&self, year: i32, month: u32, day: u32) -> LocalResult<Date<Self>> {
+        match NaiveDate::from_ymd_opt(year, month, day) {
+            Some(d) => self.from_local_date(&d),
+            None => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `Date` from year, day of year (DOY or "ordinal") and the current time zone.
+    /// This assumes the proleptic Gregorian calendar, with the year 0 being 1 BCE.
+    ///
+    /// The time zone normally does not affect the date (unless it is between UTC-24 and UTC+24),
+    /// but it will propagate to the `DateTime` values constructed via this date.
+    ///
+    /// Panics on the out-of-range date and/or invalid DOY.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, TimeZone};
+    ///
+    /// assert_eq!(Utc.yo(2015, 135).to_string(), "2015-05-15UTC");
+    /// ~~~~
+    fn yo(&self, year: i32, ordinal: u32) -> Date<Self> {
+        self.yo_opt(year, ordinal).unwrap()
+    }
+
+    /// Makes a new `Date` from year, day of year (DOY or "ordinal") and the current time zone.
+    /// This assumes the proleptic Gregorian calendar, with the year 0 being 1 BCE.
+    ///
+    /// The time zone normally does not affect the date (unless it is between UTC-24 and UTC+24),
+    /// but it will propagate to the `DateTime` values constructed via this date.
+    ///
+    /// Returns `None` on the out-of-range date and/or invalid DOY.
+    fn yo_opt(&self, year: i32, ordinal: u32) -> LocalResult<Date<Self>> {
+        match NaiveDate::from_yo_opt(year, ordinal) {
+            Some(d) => self.from_local_date(&d),
+            None => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `Date` from ISO week date (year and week number), day of the week (DOW) and
+    /// the current time zone.
+    /// This assumes the proleptic Gregorian calendar, with the year 0 being 1 BCE.
+    /// The resulting `Date` may have a different year from the input year.
+    ///
+    /// The time zone normally does not affect the date (unless it is between UTC-24 and UTC+24),
+    /// but it will propagate to the `DateTime` values constructed via this date.
+    ///
+    /// Panics on the out-of-range date and/or invalid week number.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, Weekday, TimeZone};
+    ///
+    /// assert_eq!(Utc.isoywd(2015, 20, Weekday::Fri).to_string(), "2015-05-15UTC");
+    /// ~~~~
+    fn isoywd(&self, year: i32, week: u32, weekday: Weekday) -> Date<Self> {
+        self.isoywd_opt(year, week, weekday).unwrap()
+    }
+
+    /// Makes a new `Date` from ISO week date (year and week number), day of the week (DOW) and
+    /// the current time zone.
+    /// This assumes the proleptic Gregorian calendar, with the year 0 being 1 BCE.
+    /// The resulting `Date` may have a different year from the input year.
+    ///
+    /// The time zone normally does not affect the date (unless it is between UTC-24 and UTC+24),
+    /// but it will propagate to the `DateTime` values constructed via this date.
+    ///
+    /// Returns `None` on the out-of-range date and/or invalid week number.
+    fn isoywd_opt(&self, year: i32, week: u32, weekday: Weekday) -> LocalResult<Date<Self>> {
+        match NaiveDate::from_isoywd_opt(year, week, weekday) {
+            Some(d) => self.from_local_date(&d),
+            None => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `DateTime` from the number of non-leap seconds
+    /// since January 1, 1970 0:00:00 UTC (aka "UNIX timestamp")
+    /// and the number of nanoseconds since the last whole non-leap second.
+    ///
+    /// Panics on the out-of-range number of seconds and/or invalid nanosecond,
+    /// for a non-panicking version see [`timestamp_opt`](#method.timestamp_opt).
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, TimeZone};
+    ///
+    /// assert_eq!(Utc.timestamp(1431648000, 0).to_string(), "2015-05-15 00:00:00 UTC");
+    /// ~~~~
+    fn timestamp(&self, secs: i64, nsecs: u32) -> DateTime<Self> {
+        self.timestamp_opt(secs, nsecs).unwrap()
+    }
+
+    /// Makes a new `DateTime` from the number of non-leap seconds
+    /// since January 1, 1970 0:00:00 UTC (aka "UNIX timestamp")
+    /// and the number of nanoseconds since the last whole non-leap second.
+    ///
+    /// Returns `LocalResult::None` on out-of-range number of seconds and/or
+    /// invalid nanosecond, otherwise always returns `LocalResult::Single`.
+    fn timestamp_opt(&self, secs: i64, nsecs: u32) -> LocalResult<DateTime<Self>> {
+        match NaiveDateTime::from_timestamp_opt(secs, nsecs) {
+            Some(dt) => LocalResult::Single(self.from_utc_datetime(&dt)),
+            None => LocalResult::None,
+        }
+    }
+
+    /// Makes a new `DateTime` from the number of non-leap milliseconds
+    /// since January 1, 1970 0:00:00 UTC (aka "UNIX timestamp").
+    ///
+    /// Panics on out-of-range number of milliseconds for a non-panicking
+    /// version see [`timestamp_millis_opt`](#method.timestamp_millis_opt).
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, TimeZone};
+    ///
+    /// assert_eq!(Utc.timestamp_millis(1431648000).timestamp(), 1431648);
+    /// ~~~~
+    fn timestamp_millis(&self, millis: i64) -> DateTime<Self> {
+        self.timestamp_millis_opt(millis).unwrap()
+    }
+
+    /// Makes a new `DateTime` from the number of non-leap milliseconds
+    /// since January 1, 1970 0:00:00 UTC (aka "UNIX timestamp").
+    ///
+    ///
+    /// Returns `LocalResult::None` on out-of-range number of milliseconds
+    /// and/or invalid nanosecond, otherwise always returns
+    /// `LocalResult::Single`.
+    ///
+    /// # Example
+    ///
+    /// ~~~~
+    /// use chrono::{Utc, TimeZone, LocalResult};
+    /// match Utc.timestamp_millis_opt(1431648000) {
+    ///     LocalResult::Single(dt) => assert_eq!(dt.timestamp(), 1431648),
+    ///     _ => panic!("Incorrect timestamp_millis"),
+    /// };
+    /// ~~~~
+    fn timestamp_millis_opt(&self, millis: i64) -> LocalResult<DateTime<Self>> {
+        let (secs, millis) = (millis / 1000, millis % 1000);
+        self.timestamp_opt(secs, millis as u32 * 1_000_000)
+    }
+
+    /// Parses a string with the specified format string and
+    /// returns a `DateTime` with the current offset.
+    /// See the [`format::strftime` module](../format/strftime/index.html)
+    /// on the supported escape sequences.
+    ///
+    /// If the format does not include offsets, the current offset is assumed;
+    /// otherwise the input should have a matching UTC offset.
+    ///
+    /// See also `DateTime::parse_from_str` which gives a local `DateTime`
+    /// with parsed `FixedOffset`.
+    fn datetime_from_str(&self, s: &str, fmt: &str) -> ParseResult<DateTime<Self>> {
+        let mut parsed = Parsed::new();
+        try!(parse(&mut parsed, s, StrftimeItems::new(fmt)));
+        parsed.to_datetime_with_timezone(self)
+    }
+
+    /// Reconstructs the time zone from the offset.
+    fn from_offset(offset: &Self::Offset) -> Self;
+
+    /// Creates the offset(s) for given local `NaiveDate` if possible.
+    fn offset_from_local_date(&self, local: &NaiveDate) -> LocalResult<Self::Offset>;
+
+    /// Creates the offset(s) for given local `NaiveDateTime` if possible.
+    fn offset_from_local_datetime(&self, local: &NaiveDateTime) -> LocalResult<Self::Offset>;
+
+    /// Converts the local `NaiveDate` to the timezone-aware `Date` if possible.
+    fn from_local_date(&self, local: &NaiveDate) -> LocalResult<Date<Self>> {
+        self.offset_from_local_date(local).map(|offset| {
+            // since FixedOffset is within +/- 1 day, the date is never affected
+            Date::from_utc(*local, offset)
+        })
+    }
+
+    /// Converts the local `NaiveDateTime` to the timezone-aware `DateTime` if possible.
+    fn from_local_datetime(&self, local: &NaiveDateTime) -> LocalResult<DateTime<Self>> {
+        self.offset_from_local_datetime(local).map(|offset| {
+            DateTime::from_utc(*local - offset.fix(), offset)
+        })
+    }
+
+    /// Creates the offset for given UTC `NaiveDate`. This cannot fail.
+    fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset;
+
+    /// Creates the offset for given UTC `NaiveDateTime`. This cannot fail.
+    fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset;
+
+    /// Converts the UTC `NaiveDate` to the local time.
+    /// The UTC is continuous and thus this cannot fail (but can give the duplicate local time).
+    fn from_utc_date(&self, utc: &NaiveDate) -> Date<Self> {
+        Date::from_utc(*utc, self.offset_from_utc_date(utc))
+    }
+
+    /// Converts the UTC `NaiveDateTime` to the local time.
+    /// The UTC is continuous and thus this cannot fail (but can give the duplicate local time).
+    fn from_utc_datetime(&self, utc: &NaiveDateTime) -> DateTime<Self> {
+        DateTime::from_utc(*utc, self.offset_from_utc_datetime(utc))
+    }
+}
+
+mod utc;
+mod fixed;
+#[cfg(feature="clock")]
+mod local;
+
+pub use self::utc::Utc;
+pub use self::fixed::FixedOffset;
+#[cfg(feature="clock")]
+pub use self::local::Local;
diff -Nru cargo-0.32.0/vendor/chrono/src/offset/utc.rs cargo-0.33.0/vendor/chrono/src/offset/utc.rs
--- cargo-0.32.0/vendor/chrono/src/offset/utc.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/offset/utc.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,75 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+//! The UTC (Coordinated Universal Time) time zone.
+
+use std::fmt;
+#[cfg(feature="clock")]
+use oldtime;
+
+use naive::{NaiveDate, NaiveDateTime};
+#[cfg(feature="clock")]
+use {Date, DateTime};
+use super::{TimeZone, Offset, LocalResult, FixedOffset};
+
+/// The UTC time zone. This is the most efficient time zone when you don't need the local time.
+/// It is also used as an offset (which is also a dummy type).
+///
+/// Using the [`TimeZone`](./trait.TimeZone.html) methods
+/// on the UTC struct is the preferred way to construct `DateTime<Utc>`
+/// instances.
+///
+/// # Example
+///
+/// ~~~~
+/// use chrono::{DateTime, TimeZone, NaiveDateTime, Utc};
+///
+/// let dt = DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp(61, 0), Utc);
+///
+/// assert_eq!(Utc.timestamp(61, 0), dt);
+/// assert_eq!(Utc.ymd(1970, 1, 1).and_hms(0, 1, 1), dt);
+/// ~~~~
+#[derive(Copy, Clone, PartialEq, Eq)]
+pub struct Utc;
+
+#[cfg(feature="clock")]
+impl Utc {
+    /// Returns a `Date` which corresponds to the current date.
+    pub fn today() -> Date<Utc> { Utc::now().date() }
+
+    /// Returns a `DateTime` which corresponds to the current date.
+    pub fn now() -> DateTime<Utc> {
+        let spec = oldtime::get_time();
+        let naive = NaiveDateTime::from_timestamp(spec.sec, spec.nsec as u32);
+        DateTime::from_utc(naive, Utc)
+    }
+}
+
+impl TimeZone for Utc {
+    type Offset = Utc;
+
+    fn from_offset(_state: &Utc) -> Utc { Utc }
+
+    fn offset_from_local_date(&self, _local: &NaiveDate) -> LocalResult<Utc> {
+        LocalResult::Single(Utc)
+    }
+    fn offset_from_local_datetime(&self, _local: &NaiveDateTime) -> LocalResult<Utc> {
+        LocalResult::Single(Utc)
+    }
+
+    fn offset_from_utc_date(&self, _utc: &NaiveDate) -> Utc { Utc }
+    fn offset_from_utc_datetime(&self, _utc: &NaiveDateTime) -> Utc { Utc }
+}
+
+impl Offset for Utc {
+    fn fix(&self) -> FixedOffset { FixedOffset::east(0) }
+}
+
+impl fmt::Debug for Utc {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "Z") }
+}
+
+impl fmt::Display for Utc {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "UTC") }
+}
+
diff -Nru cargo-0.32.0/vendor/chrono/src/oldtime.rs cargo-0.33.0/vendor/chrono/src/oldtime.rs
--- cargo-0.32.0/vendor/chrono/src/oldtime.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/oldtime.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,640 @@
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Temporal quantification
+
+use std::{fmt, i64};
+use std::error::Error;
+use std::ops::{Add, Sub, Mul, Div, Neg};
+use std::time::Duration as StdDuration;
+
+/// The number of nanoseconds in a microsecond.
+const NANOS_PER_MICRO: i32 = 1000;
+/// The number of nanoseconds in a millisecond.
+const NANOS_PER_MILLI: i32 = 1000_000;
+/// The number of nanoseconds in seconds.
+const NANOS_PER_SEC: i32 = 1_000_000_000;
+/// The number of microseconds per second.
+const MICROS_PER_SEC: i64 = 1000_000;
+/// The number of milliseconds per second.
+const MILLIS_PER_SEC: i64 = 1000;
+/// The number of seconds in a minute.
+const SECS_PER_MINUTE: i64 = 60;
+/// The number of seconds in an hour.
+const SECS_PER_HOUR: i64 = 3600;
+/// The number of (non-leap) seconds in days.
+const SECS_PER_DAY: i64 = 86400;
+/// The number of (non-leap) seconds in a week.
+const SECS_PER_WEEK: i64 = 604800;
+
+macro_rules! try_opt {
+    ($e:expr) => (match $e { Some(v) => v, None => return None })
+}
+
+
+/// ISO 8601 time duration with nanosecond precision.
+/// This also allows for the negative duration; see individual methods for details.
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+pub struct Duration {
+    secs: i64,
+    nanos: i32, // Always 0 <= nanos < NANOS_PER_SEC
+}
+
+/// The minimum possible `Duration`: `i64::MIN` milliseconds.
+pub const MIN: Duration = Duration {
+    secs: i64::MIN / MILLIS_PER_SEC - 1,
+    nanos: NANOS_PER_SEC + (i64::MIN % MILLIS_PER_SEC) as i32 * NANOS_PER_MILLI
+};
+
+/// The maximum possible `Duration`: `i64::MAX` milliseconds.
+pub const MAX: Duration = Duration {
+    secs: i64::MAX / MILLIS_PER_SEC,
+    nanos: (i64::MAX % MILLIS_PER_SEC) as i32 * NANOS_PER_MILLI
+};
+
+impl Duration {
+    /// Makes a new `Duration` with given number of weeks.
+    /// Equivalent to `Duration::seconds(weeks * 7 * 24 * 60 * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn weeks(weeks: i64) -> Duration {
+        let secs = weeks.checked_mul(SECS_PER_WEEK).expect("Duration::weeks out of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of days.
+    /// Equivalent to `Duration::seconds(days * 24 * 60 * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn days(days: i64) -> Duration {
+        let secs = days.checked_mul(SECS_PER_DAY).expect("Duration::days out of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of hours.
+    /// Equivalent to `Duration::seconds(hours * 60 * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn hours(hours: i64) -> Duration {
+        let secs = hours.checked_mul(SECS_PER_HOUR).expect("Duration::hours ouf of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of minutes.
+    /// Equivalent to `Duration::seconds(minutes * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn minutes(minutes: i64) -> Duration {
+        let secs = minutes.checked_mul(SECS_PER_MINUTE).expect("Duration::minutes out of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of seconds.
+    /// Panics when the duration is more than `i64::MAX` milliseconds
+    /// or less than `i64::MIN` milliseconds.
+    #[inline]
+    pub fn seconds(seconds: i64) -> Duration {
+        let d = Duration { secs: seconds, nanos: 0 };
+        if d < MIN || d > MAX {
+            panic!("Duration::seconds out of bounds");
+        }
+        d
+    }
+
+    /// Makes a new `Duration` with given number of milliseconds.
+    #[inline]
+    pub fn milliseconds(milliseconds: i64) -> Duration {
+        let (secs, millis) = div_mod_floor_64(milliseconds, MILLIS_PER_SEC);
+        let nanos = millis as i32 * NANOS_PER_MILLI;
+        Duration { secs: secs, nanos: nanos }
+    }
+
+    /// Makes a new `Duration` with given number of microseconds.
+    #[inline]
+    pub fn microseconds(microseconds: i64) -> Duration {
+        let (secs, micros) = div_mod_floor_64(microseconds, MICROS_PER_SEC);
+        let nanos = micros as i32 * NANOS_PER_MICRO;
+        Duration { secs: secs, nanos: nanos }
+    }
+
+    /// Makes a new `Duration` with given number of nanoseconds.
+    #[inline]
+    pub fn nanoseconds(nanos: i64) -> Duration {
+        let (secs, nanos) = div_mod_floor_64(nanos, NANOS_PER_SEC as i64);
+        Duration { secs: secs, nanos: nanos as i32 }
+    }
+
+    /// Returns the total number of whole weeks in the duration.
+    #[inline]
+    pub fn num_weeks(&self) -> i64 {
+        self.num_days() / 7
+    }
+
+    /// Returns the total number of whole days in the duration.
+    pub fn num_days(&self) -> i64 {
+        self.num_seconds() / SECS_PER_DAY
+    }
+
+    /// Returns the total number of whole hours in the duration.
+    #[inline]
+    pub fn num_hours(&self) -> i64 {
+        self.num_seconds() / SECS_PER_HOUR
+    }
+
+    /// Returns the total number of whole minutes in the duration.
+    #[inline]
+    pub fn num_minutes(&self) -> i64 {
+        self.num_seconds() / SECS_PER_MINUTE
+    }
+
+    /// Returns the total number of whole seconds in the duration.
+    pub fn num_seconds(&self) -> i64 {
+        // If secs is negative, nanos should be subtracted from the duration.
+        if self.secs < 0 && self.nanos > 0 {
+            self.secs + 1
+        } else {
+            self.secs
+        }
+    }
+
+    /// Returns the number of nanoseconds such that
+    /// `nanos_mod_sec() + num_seconds() * NANOS_PER_SEC` is the total number of
+    /// nanoseconds in the duration.
+    fn nanos_mod_sec(&self) -> i32 {
+        if self.secs < 0 && self.nanos > 0 {
+            self.nanos - NANOS_PER_SEC
+        } else {
+            self.nanos
+        }
+    }
+
+    /// Returns the total number of whole milliseconds in the duration,
+    pub fn num_milliseconds(&self) -> i64 {
+        // A proper Duration will not overflow, because MIN and MAX are defined
+        // such that the range is exactly i64 milliseconds.
+        let secs_part = self.num_seconds() * MILLIS_PER_SEC;
+        let nanos_part = self.nanos_mod_sec() / NANOS_PER_MILLI;
+        secs_part + nanos_part as i64
+    }
+
+    /// Returns the total number of whole microseconds in the duration,
+    /// or `None` on overflow (exceeding 2^63 microseconds in either direction).
+    pub fn num_microseconds(&self) -> Option<i64> {
+        let secs_part = try_opt!(self.num_seconds().checked_mul(MICROS_PER_SEC));
+        let nanos_part = self.nanos_mod_sec() / NANOS_PER_MICRO;
+        secs_part.checked_add(nanos_part as i64)
+    }
+
+    /// Returns the total number of whole nanoseconds in the duration,
+    /// or `None` on overflow (exceeding 2^63 nanoseconds in either direction).
+    pub fn num_nanoseconds(&self) -> Option<i64> {
+        let secs_part = try_opt!(self.num_seconds().checked_mul(NANOS_PER_SEC as i64));
+        let nanos_part = self.nanos_mod_sec();
+        secs_part.checked_add(nanos_part as i64)
+    }
+
+    /// Add two durations, returning `None` if overflow occurred.
+    pub fn checked_add(&self, rhs: &Duration) -> Option<Duration> {
+        let mut secs = try_opt!(self.secs.checked_add(rhs.secs));
+        let mut nanos = self.nanos + rhs.nanos;
+        if nanos >= NANOS_PER_SEC {
+            nanos -= NANOS_PER_SEC;
+            secs = try_opt!(secs.checked_add(1));
+        }
+        let d = Duration { secs: secs, nanos: nanos };
+        // Even if d is within the bounds of i64 seconds,
+        // it might still overflow i64 milliseconds.
+        if d < MIN || d > MAX { None } else { Some(d) }
+    }
+
+    /// Subtract two durations, returning `None` if overflow occurred.
+    pub fn checked_sub(&self, rhs: &Duration) -> Option<Duration> {
+        let mut secs = try_opt!(self.secs.checked_sub(rhs.secs));
+        let mut nanos = self.nanos - rhs.nanos;
+        if nanos < 0 {
+            nanos += NANOS_PER_SEC;
+            secs = try_opt!(secs.checked_sub(1));
+        }
+        let d = Duration { secs: secs, nanos: nanos };
+        // Even if d is within the bounds of i64 seconds,
+        // it might still overflow i64 milliseconds.
+        if d < MIN || d > MAX { None } else { Some(d) }
+    }
+
+    /// The minimum possible `Duration`: `i64::MIN` milliseconds.
+    #[inline]
+    pub fn min_value() -> Duration { MIN }
+
+    /// The maximum possible `Duration`: `i64::MAX` milliseconds.
+    #[inline]
+    pub fn max_value() -> Duration { MAX }
+
+    /// A duration where the stored seconds and nanoseconds are equal to zero.
+    #[inline]
+    pub fn zero() -> Duration {
+        Duration { secs: 0, nanos: 0 }
+    }
+
+    /// Returns `true` if the duration equals `Duration::zero()`.
+    #[inline]
+    pub fn is_zero(&self) -> bool {
+        self.secs == 0 && self.nanos == 0
+    }
+
+    /// Creates a `time::Duration` object from `std::time::Duration`
+    ///
+    /// This function errors when original duration is larger than the maximum
+    /// value supported for this type.
+    pub fn from_std(duration: StdDuration) -> Result<Duration, OutOfRangeError> {
+        // We need to check secs as u64 before coercing to i64
+        if duration.as_secs() > MAX.secs as u64 {
+            return Err(OutOfRangeError(()));
+        }
+        let d = Duration {
+            secs: duration.as_secs() as i64,
+            nanos: duration.subsec_nanos() as i32,
+        };
+        if d > MAX {
+            return Err(OutOfRangeError(()));
+        }
+        Ok(d)
+    }
+
+    /// Creates a `std::time::Duration` object from `time::Duration`
+    ///
+    /// This function errors when duration is less than zero. As standard
+    /// library implementation is limited to non-negative values.
+    pub fn to_std(&self) -> Result<StdDuration, OutOfRangeError> {
+        if self.secs < 0 {
+            return Err(OutOfRangeError(()));
+        }
+        Ok(StdDuration::new(self.secs as u64, self.nanos as u32))
+    }
+}
+
+impl Neg for Duration {
+    type Output = Duration;
+
+    #[inline]
+    fn neg(self) -> Duration {
+        if self.nanos == 0 {
+            Duration { secs: -self.secs, nanos: 0 }
+        } else {
+            Duration { secs: -self.secs - 1, nanos: NANOS_PER_SEC - self.nanos }
+        }
+    }
+}
+
+impl Add for Duration {
+    type Output = Duration;
+
+    fn add(self, rhs: Duration) -> Duration {
+        let mut secs = self.secs + rhs.secs;
+        let mut nanos = self.nanos + rhs.nanos;
+        if nanos >= NANOS_PER_SEC {
+            nanos -= NANOS_PER_SEC;
+            secs += 1;
+        }
+        Duration { secs: secs, nanos: nanos }
+    }
+}
+
+impl Sub for Duration {
+    type Output = Duration;
+
+    fn sub(self, rhs: Duration) -> Duration {
+        let mut secs = self.secs - rhs.secs;
+        let mut nanos = self.nanos - rhs.nanos;
+        if nanos < 0 {
+            nanos += NANOS_PER_SEC;
+            secs -= 1;
+        }
+        Duration { secs: secs, nanos: nanos }
+    }
+}
+
+impl Mul<i32> for Duration {
+    type Output = Duration;
+
+    fn mul(self, rhs: i32) -> Duration {
+        // Multiply nanoseconds as i64, because it cannot overflow that way.
+        let total_nanos = self.nanos as i64 * rhs as i64;
+        let (extra_secs, nanos) = div_mod_floor_64(total_nanos, NANOS_PER_SEC as i64);
+        let secs = self.secs * rhs as i64 + extra_secs;
+        Duration { secs: secs, nanos: nanos as i32 }
+    }
+}
+
+impl Div<i32> for Duration {
+    type Output = Duration;
+
+    fn div(self, rhs: i32) -> Duration {
+        let mut secs = self.secs / rhs as i64;
+        let carry = self.secs - secs * rhs as i64;
+        let extra_nanos = carry * NANOS_PER_SEC as i64 / rhs as i64;
+        let mut nanos = self.nanos / rhs + extra_nanos as i32;
+        if nanos >= NANOS_PER_SEC {
+            nanos -= NANOS_PER_SEC;
+            secs += 1;
+        }
+        if nanos < 0 {
+            nanos += NANOS_PER_SEC;
+            secs -= 1;
+        }
+        Duration { secs: secs, nanos: nanos }
+    }
+}
+
+impl fmt::Display for Duration {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // technically speaking, negative duration is not valid ISO 8601,
+        // but we need to print it anyway.
+        let (abs, sign) = if self.secs < 0 { (-*self, "-") } else { (*self, "") };
+
+        let days = abs.secs / SECS_PER_DAY;
+        let secs = abs.secs - days * SECS_PER_DAY;
+        let hasdate = days != 0;
+        let hastime = (secs != 0 || abs.nanos != 0) || !hasdate;
+
+        try!(write!(f, "{}P", sign));
+
+        if hasdate {
+            try!(write!(f, "{}D", days));
+        }
+        if hastime {
+            if abs.nanos == 0 {
+                try!(write!(f, "T{}S", secs));
+            } else if abs.nanos % NANOS_PER_MILLI == 0 {
+                try!(write!(f, "T{}.{:03}S", secs, abs.nanos / NANOS_PER_MILLI));
+            } else if abs.nanos % NANOS_PER_MICRO == 0 {
+                try!(write!(f, "T{}.{:06}S", secs, abs.nanos / NANOS_PER_MICRO));
+            } else {
+                try!(write!(f, "T{}.{:09}S", secs, abs.nanos));
+            }
+        }
+        Ok(())
+    }
+}
+
+/// Represents error when converting `Duration` to/from a standard library
+/// implementation
+///
+/// The `std::time::Duration` supports a range from zero to `u64::MAX`
+/// *seconds*, while this module supports signed range of up to
+/// `i64::MAX` of *milliseconds*.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct OutOfRangeError(());
+
+impl fmt::Display for OutOfRangeError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.description())
+    }
+}
+
+impl Error for OutOfRangeError {
+    fn description(&self) -> &str {
+        "Source duration value is out of range for the target type"
+    }
+}
+
+// Copied from libnum
+#[inline]
+fn div_mod_floor_64(this: i64, other: i64) -> (i64, i64) {
+    (div_floor_64(this, other), mod_floor_64(this, other))
+}
+
+#[inline]
+fn div_floor_64(this: i64, other: i64) -> i64 {
+    match div_rem_64(this, other) {
+        (d, r) if (r > 0 && other < 0)
+               || (r < 0 && other > 0) => d - 1,
+        (d, _)                         => d,
+    }
+}
+
+#[inline]
+fn mod_floor_64(this: i64, other: i64) -> i64 {
+    match this % other {
+        r if (r > 0 && other < 0)
+          || (r < 0 && other > 0) => r + other,
+        r                         => r,
+    }
+}
+
+#[inline]
+fn div_rem_64(this: i64, other: i64) -> (i64, i64) {
+    (this / other, this % other)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Duration, MIN, MAX, OutOfRangeError};
+    use std::{i32, i64};
+    use std::time::Duration as StdDuration;
+
+    #[test]
+    fn test_duration() {
+        assert!(Duration::seconds(1) != Duration::zero());
+        assert_eq!(Duration::seconds(1) + Duration::seconds(2), Duration::seconds(3));
+        assert_eq!(Duration::seconds(86399) + Duration::seconds(4),
+                   Duration::days(1) + Duration::seconds(3));
+        assert_eq!(Duration::days(10) - Duration::seconds(1000), Duration::seconds(863000));
+        assert_eq!(Duration::days(10) - Duration::seconds(1000000), Duration::seconds(-136000));
+        assert_eq!(Duration::days(2) + Duration::seconds(86399) +
+                   Duration::nanoseconds(1234567890),
+                   Duration::days(3) + Duration::nanoseconds(234567890));
+        assert_eq!(-Duration::days(3), Duration::days(-3));
+        assert_eq!(-(Duration::days(3) + Duration::seconds(70)),
+                   Duration::days(-4) + Duration::seconds(86400-70));
+    }
+
+    #[test]
+    fn test_duration_num_days() {
+        assert_eq!(Duration::zero().num_days(), 0);
+        assert_eq!(Duration::days(1).num_days(), 1);
+        assert_eq!(Duration::days(-1).num_days(), -1);
+        assert_eq!(Duration::seconds(86399).num_days(), 0);
+        assert_eq!(Duration::seconds(86401).num_days(), 1);
+        assert_eq!(Duration::seconds(-86399).num_days(), 0);
+        assert_eq!(Duration::seconds(-86401).num_days(), -1);
+        assert_eq!(Duration::days(i32::MAX as i64).num_days(), i32::MAX as i64);
+        assert_eq!(Duration::days(i32::MIN as i64).num_days(), i32::MIN as i64);
+    }
+
+    #[test]
+    fn test_duration_num_seconds() {
+        assert_eq!(Duration::zero().num_seconds(), 0);
+        assert_eq!(Duration::seconds(1).num_seconds(), 1);
+        assert_eq!(Duration::seconds(-1).num_seconds(), -1);
+        assert_eq!(Duration::milliseconds(999).num_seconds(), 0);
+        assert_eq!(Duration::milliseconds(1001).num_seconds(), 1);
+        assert_eq!(Duration::milliseconds(-999).num_seconds(), 0);
+        assert_eq!(Duration::milliseconds(-1001).num_seconds(), -1);
+    }
+
+    #[test]
+    fn test_duration_num_milliseconds() {
+        assert_eq!(Duration::zero().num_milliseconds(), 0);
+        assert_eq!(Duration::milliseconds(1).num_milliseconds(), 1);
+        assert_eq!(Duration::milliseconds(-1).num_milliseconds(), -1);
+        assert_eq!(Duration::microseconds(999).num_milliseconds(), 0);
+        assert_eq!(Duration::microseconds(1001).num_milliseconds(), 1);
+        assert_eq!(Duration::microseconds(-999).num_milliseconds(), 0);
+        assert_eq!(Duration::microseconds(-1001).num_milliseconds(), -1);
+        assert_eq!(Duration::milliseconds(i64::MAX).num_milliseconds(), i64::MAX);
+        assert_eq!(Duration::milliseconds(i64::MIN).num_milliseconds(), i64::MIN);
+        assert_eq!(MAX.num_milliseconds(), i64::MAX);
+        assert_eq!(MIN.num_milliseconds(), i64::MIN);
+    }
+
+    #[test]
+    fn test_duration_num_microseconds() {
+        assert_eq!(Duration::zero().num_microseconds(), Some(0));
+        assert_eq!(Duration::microseconds(1).num_microseconds(), Some(1));
+        assert_eq!(Duration::microseconds(-1).num_microseconds(), Some(-1));
+        assert_eq!(Duration::nanoseconds(999).num_microseconds(), Some(0));
+        assert_eq!(Duration::nanoseconds(1001).num_microseconds(), Some(1));
+        assert_eq!(Duration::nanoseconds(-999).num_microseconds(), Some(0));
+        assert_eq!(Duration::nanoseconds(-1001).num_microseconds(), Some(-1));
+        assert_eq!(Duration::microseconds(i64::MAX).num_microseconds(), Some(i64::MAX));
+        assert_eq!(Duration::microseconds(i64::MIN).num_microseconds(), Some(i64::MIN));
+        assert_eq!(MAX.num_microseconds(), None);
+        assert_eq!(MIN.num_microseconds(), None);
+
+        // overflow checks
+        const MICROS_PER_DAY: i64 = 86400_000_000;
+        assert_eq!(Duration::days(i64::MAX / MICROS_PER_DAY).num_microseconds(),
+                   Some(i64::MAX / MICROS_PER_DAY * MICROS_PER_DAY));
+        assert_eq!(Duration::days(i64::MIN / MICROS_PER_DAY).num_microseconds(),
+                   Some(i64::MIN / MICROS_PER_DAY * MICROS_PER_DAY));
+        assert_eq!(Duration::days(i64::MAX / MICROS_PER_DAY + 1).num_microseconds(), None);
+        assert_eq!(Duration::days(i64::MIN / MICROS_PER_DAY - 1).num_microseconds(), None);
+    }
+
+    #[test]
+    fn test_duration_num_nanoseconds() {
+        assert_eq!(Duration::zero().num_nanoseconds(), Some(0));
+        assert_eq!(Duration::nanoseconds(1).num_nanoseconds(), Some(1));
+        assert_eq!(Duration::nanoseconds(-1).num_nanoseconds(), Some(-1));
+        assert_eq!(Duration::nanoseconds(i64::MAX).num_nanoseconds(), Some(i64::MAX));
+        assert_eq!(Duration::nanoseconds(i64::MIN).num_nanoseconds(), Some(i64::MIN));
+        assert_eq!(MAX.num_nanoseconds(), None);
+        assert_eq!(MIN.num_nanoseconds(), None);
+
+        // overflow checks
+        const NANOS_PER_DAY: i64 = 86400_000_000_000;
+        assert_eq!(Duration::days(i64::MAX / NANOS_PER_DAY).num_nanoseconds(),
+                   Some(i64::MAX / NANOS_PER_DAY * NANOS_PER_DAY));
+        assert_eq!(Duration::days(i64::MIN / NANOS_PER_DAY).num_nanoseconds(),
+                   Some(i64::MIN / NANOS_PER_DAY * NANOS_PER_DAY));
+        assert_eq!(Duration::days(i64::MAX / NANOS_PER_DAY + 1).num_nanoseconds(), None);
+        assert_eq!(Duration::days(i64::MIN / NANOS_PER_DAY - 1).num_nanoseconds(), None);
+    }
+
+    #[test]
+    fn test_duration_checked_ops() {
+        assert_eq!(Duration::milliseconds(i64::MAX - 1).checked_add(&Duration::microseconds(999)),
+                   Some(Duration::milliseconds(i64::MAX - 2) + Duration::microseconds(1999)));
+        assert!(Duration::milliseconds(i64::MAX).checked_add(&Duration::microseconds(1000))
+                                                .is_none());
+
+        assert_eq!(Duration::milliseconds(i64::MIN).checked_sub(&Duration::milliseconds(0)),
+                   Some(Duration::milliseconds(i64::MIN)));
+        assert!(Duration::milliseconds(i64::MIN).checked_sub(&Duration::milliseconds(1))
+                                                .is_none());
+    }
+
+    #[test]
+    fn test_duration_mul() {
+        assert_eq!(Duration::zero() * i32::MAX, Duration::zero());
+        assert_eq!(Duration::zero() * i32::MIN, Duration::zero());
+        assert_eq!(Duration::nanoseconds(1) * 0, Duration::zero());
+        assert_eq!(Duration::nanoseconds(1) * 1, Duration::nanoseconds(1));
+        assert_eq!(Duration::nanoseconds(1) * 1_000_000_000, Duration::seconds(1));
+        assert_eq!(Duration::nanoseconds(1) * -1_000_000_000, -Duration::seconds(1));
+        assert_eq!(-Duration::nanoseconds(1) * 1_000_000_000, -Duration::seconds(1));
+        assert_eq!(Duration::nanoseconds(30) * 333_333_333,
+                   Duration::seconds(10) - Duration::nanoseconds(10));
+        assert_eq!((Duration::nanoseconds(1) + Duration::seconds(1) + Duration::days(1)) * 3,
+                   Duration::nanoseconds(3) + Duration::seconds(3) + Duration::days(3));
+        assert_eq!(Duration::milliseconds(1500) * -2, Duration::seconds(-3));
+        assert_eq!(Duration::milliseconds(-1500) * 2, Duration::seconds(-3));
+    }
+
+    #[test]
+    fn test_duration_div() {
+        assert_eq!(Duration::zero() / i32::MAX, Duration::zero());
+        assert_eq!(Duration::zero() / i32::MIN, Duration::zero());
+        assert_eq!(Duration::nanoseconds(123_456_789) / 1, Duration::nanoseconds(123_456_789));
+        assert_eq!(Duration::nanoseconds(123_456_789) / -1, -Duration::nanoseconds(123_456_789));
+        assert_eq!(-Duration::nanoseconds(123_456_789) / -1, Duration::nanoseconds(123_456_789));
+        assert_eq!(-Duration::nanoseconds(123_456_789) / 1, -Duration::nanoseconds(123_456_789));
+        assert_eq!(Duration::seconds(1) / 3, Duration::nanoseconds(333_333_333));
+        assert_eq!(Duration::seconds(4) / 3, Duration::nanoseconds(1_333_333_333));
+        assert_eq!(Duration::seconds(-1) / 2, Duration::milliseconds(-500));
+        assert_eq!(Duration::seconds(1) / -2, Duration::milliseconds(-500));
+        assert_eq!(Duration::seconds(-1) / -2, Duration::milliseconds(500));
+        assert_eq!(Duration::seconds(-4) / 3, Duration::nanoseconds(-1_333_333_333));
+        assert_eq!(Duration::seconds(-4) / -3, Duration::nanoseconds(1_333_333_333));
+    }
+
+    #[test]
+    fn test_duration_fmt() {
+        assert_eq!(Duration::zero().to_string(), "PT0S");
+        assert_eq!(Duration::days(42).to_string(), "P42D");
+        assert_eq!(Duration::days(-42).to_string(), "-P42D");
+        assert_eq!(Duration::seconds(42).to_string(), "PT42S");
+        assert_eq!(Duration::milliseconds(42).to_string(), "PT0.042S");
+        assert_eq!(Duration::microseconds(42).to_string(), "PT0.000042S");
+        assert_eq!(Duration::nanoseconds(42).to_string(), "PT0.000000042S");
+        assert_eq!((Duration::days(7) + Duration::milliseconds(6543)).to_string(),
+                   "P7DT6.543S");
+        assert_eq!(Duration::seconds(-86401).to_string(), "-P1DT1S");
+        assert_eq!(Duration::nanoseconds(-1).to_string(), "-PT0.000000001S");
+
+        // the format specifier should have no effect on `Duration`
+        assert_eq!(format!("{:30}", Duration::days(1) + Duration::milliseconds(2345)),
+                   "P1DT2.345S");
+    }
+
+    #[test]
+    fn test_to_std() {
+        assert_eq!(Duration::seconds(1).to_std(), Ok(StdDuration::new(1, 0)));
+        assert_eq!(Duration::seconds(86401).to_std(), Ok(StdDuration::new(86401, 0)));
+        assert_eq!(Duration::milliseconds(123).to_std(), Ok(StdDuration::new(0, 123000000)));
+        assert_eq!(Duration::milliseconds(123765).to_std(), Ok(StdDuration::new(123, 765000000)));
+        assert_eq!(Duration::nanoseconds(777).to_std(), Ok(StdDuration::new(0, 777)));
+        assert_eq!(MAX.to_std(), Ok(StdDuration::new(9223372036854775, 807000000)));
+        assert_eq!(Duration::seconds(-1).to_std(),
+                   Err(OutOfRangeError(())));
+        assert_eq!(Duration::milliseconds(-1).to_std(),
+                   Err(OutOfRangeError(())));
+    }
+
+    #[test]
+    fn test_from_std() {
+        assert_eq!(Ok(Duration::seconds(1)),
+                   Duration::from_std(StdDuration::new(1, 0)));
+        assert_eq!(Ok(Duration::seconds(86401)),
+                   Duration::from_std(StdDuration::new(86401, 0)));
+        assert_eq!(Ok(Duration::milliseconds(123)),
+                   Duration::from_std(StdDuration::new(0, 123000000)));
+        assert_eq!(Ok(Duration::milliseconds(123765)),
+                   Duration::from_std(StdDuration::new(123, 765000000)));
+        assert_eq!(Ok(Duration::nanoseconds(777)),
+                   Duration::from_std(StdDuration::new(0, 777)));
+        assert_eq!(Ok(MAX),
+                   Duration::from_std(StdDuration::new(9223372036854775, 807000000)));
+        assert_eq!(Duration::from_std(StdDuration::new(9223372036854776, 0)),
+                   Err(OutOfRangeError(())));
+        assert_eq!(Duration::from_std(StdDuration::new(9223372036854775, 807000001)),
+                   Err(OutOfRangeError(())));
+    }
+}
diff -Nru cargo-0.32.0/vendor/chrono/src/round.rs cargo-0.33.0/vendor/chrono/src/round.rs
--- cargo-0.32.0/vendor/chrono/src/round.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/chrono/src/round.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,178 @@
+// This is a part of Chrono.
+// See README.md and LICENSE.txt for details.
+
+use Timelike;
+use std::ops::{Add, Sub};
+use oldtime::Duration;
+
+/// Extension trait for subsecond rounding or truncation to a maximum number
+/// of digits. Rounding can be used to decrease the error variance when
+/// serializing/persisting to lower precision. Truncation is the default
+/// behavior in Chrono display formatting.  Either can be used to guarantee
+/// equality (e.g. for testing) when round-tripping through a lower precision
+/// format.
+pub trait SubsecRound {
+    /// Return a copy rounded to the specified number of subsecond digits. With
+    /// 9 or more digits, self is returned unmodified. Halfway values are
+    /// rounded up (away from zero).
+    ///
+    /// # Example
+    /// ``` rust
+    /// # use chrono::{DateTime, SubsecRound, Timelike, TimeZone, Utc};
+    /// let dt = Utc.ymd(2018, 1, 11).and_hms_milli(12, 0, 0, 154);
+    /// assert_eq!(dt.round_subsecs(2).nanosecond(), 150_000_000);
+    /// assert_eq!(dt.round_subsecs(1).nanosecond(), 200_000_000);
+    /// ```
+    fn round_subsecs(self, digits: u16) -> Self;
+
+    /// Return a copy truncated to the specified number of subsecond
+    /// digits. With 9 or more digits, self is returned unmodified.
+    ///
+    /// # Example
+    /// ``` rust
+    /// # use chrono::{DateTime, SubsecRound, Timelike, TimeZone, Utc};
+    /// let dt = Utc.ymd(2018, 1, 11).and_hms_milli(12, 0, 0, 154);
+    /// assert_eq!(dt.trunc_subsecs(2).nanosecond(), 150_000_000);
+    /// assert_eq!(dt.trunc_subsecs(1).nanosecond(), 100_000_000);
+    /// ```
+    fn trunc_subsecs(self, digits: u16) -> Self;
+}
+
+impl<T> SubsecRound for T
+where T: Timelike + Add<Duration, Output=T> + Sub<Duration, Output=T>
+{
+    fn round_subsecs(self, digits: u16) -> T {
+        let span = span_for_digits(digits);
+        let delta_down = self.nanosecond() % span;
+        if delta_down > 0 {
+            let delta_up = span - delta_down;
+            if delta_up <= delta_down {
+                self + Duration::nanoseconds(delta_up.into())
+            } else {
+                self - Duration::nanoseconds(delta_down.into())
+            }
+        } else {
+            self // unchanged
+        }
+    }
+
+    fn trunc_subsecs(self, digits: u16) -> T {
+        let span = span_for_digits(digits);
+        let delta_down = self.nanosecond() % span;
+        if delta_down > 0 {
+            self - Duration::nanoseconds(delta_down.into())
+        } else {
+            self // unchanged
+        }
+    }
+}
+
+// Return the maximum span in nanoseconds for the target number of digits.
+fn span_for_digits(digits: u16) -> u32 {
+    // fast lookup form of: 10^(9-min(9,digits))
+    match digits {
+        0 => 1_000_000_000,
+        1 =>   100_000_000,
+        2 =>    10_000_000,
+        3 =>     1_000_000,
+        4 =>       100_000,
+        5 =>        10_000,
+        6 =>         1_000,
+        7 =>           100,
+        8 =>            10,
+        _ =>             1
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use Timelike;
+    use offset::{FixedOffset, TimeZone, Utc};
+    use super::SubsecRound;
+
+    #[test]
+    fn test_round() {
+        let pst = FixedOffset::east(8 * 60 * 60);
+        let dt = pst.ymd(2018, 1, 11).and_hms_nano(10, 5, 13, 084_660_684);
+
+        assert_eq!(dt.round_subsecs(10), dt);
+        assert_eq!(dt.round_subsecs(9), dt);
+        assert_eq!(dt.round_subsecs(8).nanosecond(), 084_660_680);
+        assert_eq!(dt.round_subsecs(7).nanosecond(), 084_660_700);
+        assert_eq!(dt.round_subsecs(6).nanosecond(), 084_661_000);
+        assert_eq!(dt.round_subsecs(5).nanosecond(), 084_660_000);
+        assert_eq!(dt.round_subsecs(4).nanosecond(), 084_700_000);
+        assert_eq!(dt.round_subsecs(3).nanosecond(), 085_000_000);
+        assert_eq!(dt.round_subsecs(2).nanosecond(), 080_000_000);
+        assert_eq!(dt.round_subsecs(1).nanosecond(), 100_000_000);
+
+        assert_eq!(dt.round_subsecs(0).nanosecond(), 0);
+        assert_eq!(dt.round_subsecs(0).second(), 13);
+
+        let dt = Utc.ymd(2018, 1, 11).and_hms_nano(10, 5, 27, 750_500_000);
+        assert_eq!(dt.round_subsecs(9), dt);
+        assert_eq!(dt.round_subsecs(4), dt);
+        assert_eq!(dt.round_subsecs(3).nanosecond(), 751_000_000);
+        assert_eq!(dt.round_subsecs(2).nanosecond(), 750_000_000);
+        assert_eq!(dt.round_subsecs(1).nanosecond(), 800_000_000);
+
+        assert_eq!(dt.round_subsecs(0).nanosecond(), 0);
+        assert_eq!(dt.round_subsecs(0).second(), 28);
+    }
+
+    #[test]
+    fn test_round_leap_nanos() {
+        let dt = Utc.ymd(2016, 12, 31).and_hms_nano(23, 59, 59, 1_750_500_000);
+        assert_eq!(dt.round_subsecs(9), dt);
+        assert_eq!(dt.round_subsecs(4), dt);
+        assert_eq!(dt.round_subsecs(2).nanosecond(), 1_750_000_000);
+        assert_eq!(dt.round_subsecs(1).nanosecond(), 1_800_000_000);
+        assert_eq!(dt.round_subsecs(1).second(), 59);
+
+        assert_eq!(dt.round_subsecs(0).nanosecond(), 0);
+        assert_eq!(dt.round_subsecs(0).second(), 0);
+    }
+
+    #[test]
+    fn test_trunc() {
+        let pst = FixedOffset::east(8 * 60 * 60);
+        let dt = pst.ymd(2018, 1, 11).and_hms_nano(10, 5, 13, 084_660_684);
+
+        assert_eq!(dt.trunc_subsecs(10), dt);
+        assert_eq!(dt.trunc_subsecs(9), dt);
+        assert_eq!(dt.trunc_subsecs(8).nanosecond(), 084_660_680);
+        assert_eq!(dt.trunc_subsecs(7).nanosecond(), 084_660_600);
+        assert_eq!(dt.trunc_subsecs(6).nanosecond(), 084_660_000);
+        assert_eq!(dt.trunc_subsecs(5).nanosecond(), 084_660_000);
+        assert_eq!(dt.trunc_subsecs(4).nanosecond(), 084_600_000);
+        assert_eq!(dt.trunc_subsecs(3).nanosecond(), 084_000_000);
+        assert_eq!(dt.trunc_subsecs(2).nanosecond(), 080_000_000);
+        assert_eq!(dt.trunc_subsecs(1).nanosecond(), 0);
+
+        assert_eq!(dt.trunc_subsecs(0).nanosecond(), 0);
+        assert_eq!(dt.trunc_subsecs(0).second(), 13);
+
+        let dt = pst.ymd(2018, 1, 11).and_hms_nano(10, 5, 27, 750_500_000);
+        assert_eq!(dt.trunc_subsecs(9), dt);
+        assert_eq!(dt.trunc_subsecs(4), dt);
+        assert_eq!(dt.trunc_subsecs(3).nanosecond(), 750_000_000);
+        assert_eq!(dt.trunc_subsecs(2).nanosecond(), 750_000_000);
+        assert_eq!(dt.trunc_subsecs(1).nanosecond(), 700_000_000);
+
+        assert_eq!(dt.trunc_subsecs(0).nanosecond(), 0);
+        assert_eq!(dt.trunc_subsecs(0).second(), 27);
+    }
+
+    #[test]
+    fn test_trunc_leap_nanos() {
+        let dt = Utc.ymd(2016, 12, 31).and_hms_nano(23, 59, 59, 1_750_500_000);
+        assert_eq!(dt.trunc_subsecs(9), dt);
+        assert_eq!(dt.trunc_subsecs(4), dt);
+        assert_eq!(dt.trunc_subsecs(2).nanosecond(), 1_750_000_000);
+        assert_eq!(dt.trunc_subsecs(1).nanosecond(), 1_700_000_000);
+        assert_eq!(dt.trunc_subsecs(1).second(), 59);
+
+        assert_eq!(dt.trunc_subsecs(0).nanosecond(), 1_000_000_000);
+        assert_eq!(dt.trunc_subsecs(0).second(), 59);
+    }
+}
diff -Nru cargo-0.32.0/vendor/clap/.appveyor.yml cargo-0.33.0/vendor/clap/.appveyor.yml
--- cargo-0.32.0/vendor/clap/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  - TARGET: i686-pc-windows-msvc
-  - TARGET: x86_64-pc-windows-gnu
-  - TARGET: i686-pc-windows-gnu
-  RUST_BACKTRACE: full
-install:
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host %TARGET%
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -vV
-  - cargo -vV
-build: false
-test_script:
-  - cargo build --verbose --features yaml
-  - cargo test --verbose --features yaml
diff -Nru cargo-0.32.0/vendor/clap/Cargo.toml cargo-0.33.0/vendor/clap/Cargo.toml
--- cargo-0.32.0/vendor/clap/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -80,7 +80,7 @@
 optional = true
 
 [dependencies.textwrap]
-version = "0.10.0"
+version = ">= 0.10, < 0.12"
 
 [dependencies.unicode-width]
 version = "0.1.4"
@@ -90,7 +90,7 @@
 optional = true
 
 [dependencies.yaml-rust]
-version = "0.3.5"
+version = ">= 0.3.5, < 0.5"
 optional = true
 [dev-dependencies.lazy_static]
 version = "1"
diff -Nru cargo-0.32.0/vendor/clap/.clog.toml cargo-0.33.0/vendor/clap/.clog.toml
--- cargo-0.32.0/vendor/clap/.clog.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.clog.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-[clog]
-repository = "https://github.com/kbknapp/clap-rs"
-outfile = "CHANGELOG.md"
-from-latest-tag = true
-
-[sections]
-Performance = ["perf"]
-Improvements = ["impr", "im", "imp"]
-Documentation = ["docs"]
-Deprecations = ["depr"]
-Examples = ["examples"]
-"New Settings" = ["setting", "settings"]
-"API Additions" = ["add", "api"]
diff -Nru cargo-0.32.0/vendor/clap/debian/patches/relax-dep-versions.patch cargo-0.33.0/vendor/clap/debian/patches/relax-dep-versions.patch
--- cargo-0.32.0/vendor/clap/debian/patches/relax-dep-versions.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/clap/debian/patches/relax-dep-versions.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,20 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -80,7 +80,7 @@
+ optional = true
+ 
+ [dependencies.textwrap]
+-version = "0.10.0"
++version = ">= 0.10, < 0.12"
+ 
+ [dependencies.unicode-width]
+ version = "0.1.4"
+@@ -90,7 +90,7 @@
+ optional = true
+ 
+ [dependencies.yaml-rust]
+-version = "0.3.5"
++version = ">= 0.3.5, < 0.5"
+ optional = true
+ [dev-dependencies.lazy_static]
+ version = "1"
diff -Nru cargo-0.32.0/vendor/clap/debian/patches/series cargo-0.33.0/vendor/clap/debian/patches/series
--- cargo-0.32.0/vendor/clap/debian/patches/series	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1,2 @@
 no-clippy.patch
+relax-dep-versions.patch
diff -Nru cargo-0.32.0/vendor/clap/.github/CONTRIBUTING.md cargo-0.33.0/vendor/clap/.github/CONTRIBUTING.md
--- cargo-0.32.0/vendor/clap/.github/CONTRIBUTING.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.github/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-# How to Contribute
-
-Contributions are always welcome! And there is a multitude of ways in which you can help depending on what you like to do, or are good at. Anything from documentation, code cleanup, issue completion, new features, you name it, even filing issues is contributing and greatly appreciated!
-
-Another really great way to help is if you find an interesting, or helpful way in which to use `clap`. You can either add it to the [examples/](examples) directory, or file an issue and tell me. I'm all about giving credit where credit is due :)
-
-### Testing Code
-
-To test with all features both enabled and disabled, you can run these commands:
-
-```sh
-$ cargo test --no-default-features
-$ cargo test --features "yaml unstable"
-```
-
-Alternatively, if you have [`just`](https://github.com/casey/just) installed you can run the prebuilt recipes. *Not* using `just` is perfectly fine as well, it simply bundles commands automatically.
-
-For example, to test the code, as above simply run:
-
-```sh
-$ just run-tests
-```
-
-From here on, I will list the appropriate `cargo` command as well as the `just` command.
-
-Sometimes it's helpful to only run a subset of the tests, which can be done via:
-
-```sh
-$ cargo test --test <test_name>
-
-# Or
-
-$ just run-test <test_name>
-```
-
-### Linting Code
-
-During the CI process `clap` runs against many different lints using [`clippy`](https://github.com/rust-lang-nursery/rust-clippy). In order to check if these lints pass on your own computer prior to submitting a PR you'll need a nightly compiler.
-
-In order to check the code for lints run either:
-
-```sh
-$ rustup override add nightly
-$ cargo build --features lints
-$ rustup override remove
-
-# Or
-
-$ just lint
-```
-
-### Debugging Code
-
-Another helpful technique is to see the `clap` debug output while developing features. In order to see the debug output while running the full test suite or individual tests, run:
-
-```sh
-$ cargo test --features debug
-
-# Or for individual tests
-$ cargo test --test <test_name> --features debug
-
-# The corresponding just command for individual debugging tests is:
-$ just debug <test_name>
-```
-
-### Commit Messages
-
-I use a [conventional](https://github.com/ajoslin/conventional-changelog/blob/a5505865ff3dd710cf757f50530e73ef0ca641da/conventions/angular.md) changelog format so I can update my changelog automatically using [clog](https://github.com/clog-tool/clog-cli)
-
- * Please format your commit subject line using the following format: `TYPE(COMPONENT): MESSAGE` where `TYPE` is one of the following:
-    - `api`  - An addition to the API
-    - `setting` - A new `AppSettings` variant
-    - `feat` - A new feature of an existing API
-    - `imp`  - An improvement to an existing feature/API
-    - `perf` - A performance improvement
-    - `docs` - Changes to documentation only
-    - `tests` - Changes to the testing framework or tests only
-    - `fix` - A bug fix
-    - `refactor` - Code functionality doesn't change, but underlying structure may
-    - `style` - Stylistic changes only, no functionality changes
-    - `wip` - A work in progress commit (Should typically be `git rebase`'ed away)
-    - `chore` - Catch all or things that have to do with the build system, etc
-    - `examples` - Changes to existing example, or a new example
- * The `COMPONENT` is optional, and may be a single file, directory, or logical component. Parenthesis can be omitted if you are opting not to use the `COMPONENT`. 
-
-### Tests and Documentation
-
-1. Create tests for your changes
-2. **Ensure the tests are passing.** Run the tests (`cargo test --features "yaml unstable"`), alternatively `just run-tests` if you have `just` installed.
-3. **Optional** Run the lints (`cargo build --features lints`) (requires a nightly compiler), alternatively `just lint`
-4. Ensure your changes contain documentation if adding new APIs or features.
-
-### Preparing the PR
-
-1. `git rebase` into concise commits and remove `--fixup`s or `wip` commits (`git rebase -i HEAD~NUM` where `NUM` is number of commits back to start the rebase)
-2. Push your changes back to your fork (`git push origin $your-branch`)
-3. Create a pull request against `master`! (You can also create the pull request first, and we'll merge when ready. This a good way to discuss proposed changes.)
-
-### Other ways to contribute
-
-Another really great way to help is if you find an interesting, or helpful way in which to use `clap`. You can either add it to the [examples/](../examples) directory, or file an issue and tell me. I'm all about giving credit where credit is due :)
-
-### Goals
-
-There are a few goals of `clap` that I'd like to maintain throughout contributions. If your proposed changes break, or go against any of these goals we'll discuss the changes further before merging (but will *not* be ignored, all contributes are welcome!). These are by no means hard-and-fast rules, as I'm no expert and break them myself from time to time (even if by mistake or ignorance :P).
-
-* Remain backwards compatible when possible
-  - If backwards compatibility *must* be broken, use deprecation warnings if at all possible before removing legacy code
-  - This does not apply for security concerns
-* Parse arguments quickly
-  - Parsing of arguments shouldn't slow down usage of the main program
-  - This is also true of generating help and usage information (although *slightly* less stringent, as the program is about to exit)
-* Try to be cognizant of memory usage
-  - Once parsing is complete, the memory footprint of `clap` should be low since the  main program is the star of the show
-* `panic!` on *developer* error, exit gracefully on *end-user* error
diff -Nru cargo-0.32.0/vendor/clap/.github/ISSUE_TEMPLATE.md cargo-0.33.0/vendor/clap/.github/ISSUE_TEMPLATE.md
--- cargo-0.32.0/vendor/clap/.github/ISSUE_TEMPLATE.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.github/ISSUE_TEMPLATE.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<!--
-Please use the following template to assist with creating an issue and to ensure a speedy resolution. If an area is not applicable, feel free to delete the area or mark with `N/A`
--->
-
-### Rust Version
-
-* Use the output of `rustc -V`
-
-### Affected Version of clap
-
-* Can be found in Cargo.lock of your project (i.e. `grep clap Cargo.lock`)
-
-### Bug or Feature Request Summary
-
-
-### Expected Behavior Summary
-
-
-### Actual Behavior Summary
-
-
-### Steps to Reproduce the issue
-
-
-### Sample Code or Link to Sample Code
-
-
-### Debug output
-
-Compile clap with cargo features `"debug"` such as:
-
-```toml
-[dependencies]
-clap = { version = "2", features = ["debug"] }
-```
-
-<details>
-<summary> Debug Output </summary>
-<pre>
-<code>
-
-Paste Debug Output Here
-
-</code>
-</pre>
-</details>
diff -Nru cargo-0.32.0/vendor/clap/.mention-bot cargo-0.33.0/vendor/clap/.mention-bot
--- cargo-0.32.0/vendor/clap/.mention-bot	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.mention-bot	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-{
-  "findPotentialReviewers": false, 
-  "alwaysNotifyForPaths": [
-    {
-      "name": "kbknapp", 
-      "files": ["**/*.rs", "**/*.md", "*"] 
-    }
-  ]
-}
diff -Nru cargo-0.32.0/vendor/clap/.pc/applied-patches cargo-0.33.0/vendor/clap/.pc/applied-patches
--- cargo-0.32.0/vendor/clap/.pc/applied-patches	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1,2 @@
 no-clippy.patch
+relax-dep-versions.patch
diff -Nru cargo-0.32.0/vendor/clap/.pc/relax-dep-versions.patch/Cargo.toml cargo-0.33.0/vendor/clap/.pc/relax-dep-versions.patch/Cargo.toml
--- cargo-0.32.0/vendor/clap/.pc/relax-dep-versions.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.pc/relax-dep-versions.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,135 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "clap"
+version = "2.32.0"
+authors = ["Kevin K. <kbknapp@gmail.com>"]
+exclude = ["examples/*", "clap-test/*", "tests/*", "benches/*", "*.png", "clap-perf/*", "*.dot"]
+description = "A simple to use, efficient, and full featured  Command Line Argument Parser\n"
+homepage = "https://clap.rs/"
+documentation = "https://docs.rs/clap/"
+readme = "README.md"
+keywords = ["argument", "cli", "arg", "parser", "parse"]
+categories = ["command-line-interface"]
+license = "MIT"
+repository = "https://github.com/kbknapp/clap-rs"
+[package.metadata.docs.rs]
+features = ["doc"]
+[profile.test]
+opt-level = 1
+lto = false
+codegen-units = 4
+debug = true
+debug-assertions = true
+rpath = false
+
+[profile.doc]
+opt-level = 0
+lto = false
+codegen-units = 4
+debug = true
+debug-assertions = true
+rpath = false
+
+[profile.bench]
+opt-level = 3
+lto = true
+codegen-units = 1
+debug = false
+debug-assertions = false
+rpath = false
+
+[profile.dev]
+opt-level = 0
+lto = false
+codegen-units = 4
+debug = true
+debug-assertions = true
+rpath = false
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+debug = false
+debug-assertions = false
+rpath = false
+[dependencies.atty]
+version = "0.2.2"
+optional = true
+
+[dependencies.bitflags]
+version = "1.0"
+
+[dependencies.strsim]
+version = "0.7.0"
+optional = true
+
+[dependencies.term_size]
+version = "0.3.0"
+optional = true
+
+[dependencies.textwrap]
+version = "0.10.0"
+
+[dependencies.unicode-width]
+version = "0.1.4"
+
+[dependencies.vec_map]
+version = "0.8"
+optional = true
+
+[dependencies.yaml-rust]
+version = "0.3.5"
+optional = true
+[dev-dependencies.lazy_static]
+version = "1"
+
+[dev-dependencies.regex]
+version = "1"
+
+[dev-dependencies.version-sync]
+version = "0.5"
+
+[features]
+color = ["ansi_term", "atty"]
+debug = []
+default = ["suggestions", "color", "vec_map"]
+doc = ["yaml"]
+nightly = []
+no_cargo = []
+suggestions = ["strsim"]
+unstable = []
+wrap_help = ["term_size", "textwrap/term_size"]
+yaml = ["yaml-rust"]
+[target."cfg(not(windows))".dependencies.ansi_term]
+version = "0.11"
+optional = true
+[badges.appveyor]
+repository = "kbknapp/clap-rs"
+
+[badges.coveralls]
+branch = "master"
+repository = "kbknapp/clap-rs"
+
+[badges.is-it-maintained-issue-resolution]
+repository = "kbknapp/clap-rs"
+
+[badges.is-it-maintained-open-issues]
+repository = "kbknapp/clap-rs"
+
+[badges.maintenance]
+status = "actively-developed"
+
+[badges.travis-ci]
+repository = "kbknapp/clap-rs"
diff -Nru cargo-0.32.0/vendor/clap/.travis.yml cargo-0.33.0/vendor/clap/.travis.yml
--- cargo-0.32.0/vendor/clap/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/clap/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-sudo: true
-language: rust
-cache: cargo
-rust:
-  - nightly
-  - nightly-2018-06-19
-  - beta
-  - stable
-  - 1.21.0
-matrix:
-    allow_failures:
-        - rust: nightly
-before_script:
-  - |
-    pip install git+git://github.com/kbknapp/travis-cargo.git --user &&
-    export PATH=$HOME/.local/bin:$PATH
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == "1.13.0" ]]; then
-        echo "Old Rust detected, removing version-sync dependency"
-        sed -i "/^version-sync =/d" Cargo.toml
-        rm "tests/version-numbers.rs"
-    fi
-script:
-  - |
-    travis-cargo --only stable test -- --verbose --no-default-features &&
-    travis-cargo --skip nightly test -- --verbose --features "yaml unstable" &&
-    travis-cargo --only nightly test -- --verbose --features "yaml unstable nightly" &&
-    travis-cargo --only nightly bench -- --no-run 
-addons:
-  apt:
-    packages:
-    - binutils-dev 
-    - libcurl4-openssl-dev
-    - libelf-dev
-    - libdw-dev
-    - libiberty-dev
-    - cmake
-    - gcc
-    - zlib1g-dev 
-after_success:
-  - |
-    wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
-    tar xzf master.tar.gz &&
-    cd kcov-master &&
-    mkdir build &&
-    cd build &&
-    cmake .. &&
-    make &&
-    sudo make install &&
-    cd ../.. &&
-    rm -rf kcov-master &&
-    cargo clean &&
-    cargo test --no-run --features "yaml unstable" &&
-    for file in target/debug/*-*; do mkdir -p "target/cov/$(basename $file)"; kcov --exclude-pattern=/.cargo --verify "target/cov/$(basename $file)" "$file"; done &&
-    kcov --coveralls-id=$TRAVIS_JOB_ID --merge target/cov target/cov/* &&
-    echo "Uploaded code coverage"
-env:
-  global:
-    - TRAVIS_CARGO_NIGHTLY_FEATURE=lints
-    - secure: JLBlgHY6OEmhJ8woewNJHmuBokTNUv7/WvLkJGV8xk0t6bXBwSU0jNloXwlH7FiQTc4TccX0PumPDD4MrMgxIAVFPmmmlQOCmdpYP4tqZJ8xo189E5zk8lKF5OyaVYCs5SMmFC3cxCsKjfwGIexNu3ck5Uhwe9jI0tqgkgM3URA=
diff -Nru cargo-0.32.0/vendor/core-foundation/Cargo.toml cargo-0.33.0/vendor/core-foundation/Cargo.toml
--- cargo-0.32.0/vendor/core-foundation/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -29,7 +29,7 @@
 version = "0.2"
 
 [dependencies.uuid]
-version = "0.5"
+version = "0.7"
 optional = true
 
 [features]
diff -Nru cargo-0.32.0/vendor/core-foundation/.cargo_vcs_info.json cargo-0.33.0/vendor/core-foundation/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/core-foundation/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "9f23b511ad77b782cacbd9132c82dac5ddc1c8d7"
-  }
-}
diff -Nru cargo-0.32.0/vendor/core-foundation/debian/patches/series cargo-0.33.0/vendor/core-foundation/debian/patches/series
--- cargo-0.32.0/vendor/core-foundation/debian/patches/series	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1,2 @@
 0001-Use-libc-c_char-instead-of-i8-for-libc-calls.patch
+update-dep-uuid-version.patch
diff -Nru cargo-0.32.0/vendor/core-foundation/debian/patches/update-dep-uuid-version.patch cargo-0.33.0/vendor/core-foundation/debian/patches/update-dep-uuid-version.patch
--- cargo-0.32.0/vendor/core-foundation/debian/patches/update-dep-uuid-version.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/debian/patches/update-dep-uuid-version.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,22 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -29,7 +29,7 @@
+ version = "0.2"
+ 
+ [dependencies.uuid]
+-version = "0.5"
++version = "0.7"
+ optional = true
+ 
+ [features]
+--- a/src/uuid.rs
++++ b/src/uuid.rs
+@@ -62,7 +62,7 @@
+             b.byte14,
+             b.byte15,
+         ];
+-        Uuid::from_bytes(&bytes).unwrap()
++        Uuid::from_slice(&bytes).unwrap()
+     }
+ }
+ 
diff -Nru cargo-0.32.0/vendor/core-foundation/.pc/applied-patches cargo-0.33.0/vendor/core-foundation/.pc/applied-patches
--- cargo-0.32.0/vendor/core-foundation/.pc/applied-patches	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1,2 @@
 0001-Use-libc-c_char-instead-of-i8-for-libc-calls.patch
+update-dep-uuid-version.patch
diff -Nru cargo-0.32.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/Cargo.toml cargo-0.33.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/Cargo.toml
--- cargo-0.32.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,39 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "core-foundation"
+version = "0.6.3"
+authors = ["The Servo Project Developers"]
+description = "Bindings to Core Foundation for OS X"
+homepage = "https://github.com/servo/core-foundation-rs"
+license = "MIT / Apache-2.0"
+repository = "https://github.com/servo/core-foundation-rs"
+[dependencies.chrono]
+version = "0.4"
+optional = true
+
+[dependencies.core-foundation-sys]
+version = "0.6.1"
+
+[dependencies.libc]
+version = "0.2"
+
+[dependencies.uuid]
+version = "0.5"
+optional = true
+
+[features]
+mac_os_10_7_support = ["core-foundation-sys/mac_os_10_7_support"]
+mac_os_10_8_features = ["core-foundation-sys/mac_os_10_8_features"]
+with-chrono = ["chrono"]
+with-uuid = ["uuid"]
diff -Nru cargo-0.32.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/src/uuid.rs cargo-0.33.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/src/uuid.rs
--- cargo-0.32.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/src/uuid.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/.pc/update-dep-uuid-version.patch/src/uuid.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,112 @@
+// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Core Foundation UUID objects.
+
+#[cfg(feature = "with-uuid")]
+extern crate uuid;
+
+pub use core_foundation_sys::uuid::*;
+use core_foundation_sys::base::kCFAllocatorDefault;
+
+use base::TCFType;
+
+#[cfg(feature = "with-uuid")]
+use self::uuid::Uuid;
+
+
+declare_TCFType! {
+    /// A UUID.
+    CFUUID, CFUUIDRef
+}
+impl_TCFType!(CFUUID, CFUUIDRef, CFUUIDGetTypeID);
+impl_CFTypeDescription!(CFUUID);
+
+impl CFUUID {
+    #[inline]
+    pub fn new() -> CFUUID {
+        unsafe {
+            let uuid_ref = CFUUIDCreate(kCFAllocatorDefault);
+            TCFType::wrap_under_create_rule(uuid_ref)
+        }
+    }
+}
+
+#[cfg(feature = "with-uuid")]
+impl Into<Uuid> for CFUUID {
+    fn into(self) -> Uuid {
+        let b = unsafe {
+            CFUUIDGetUUIDBytes(self.0)
+        };
+        let bytes = [
+            b.byte0,
+            b.byte1,
+            b.byte2,
+            b.byte3,
+            b.byte4,
+            b.byte5,
+            b.byte6,
+            b.byte7,
+            b.byte8,
+            b.byte9,
+            b.byte10,
+            b.byte11,
+            b.byte12,
+            b.byte13,
+            b.byte14,
+            b.byte15,
+        ];
+        Uuid::from_bytes(&bytes).unwrap()
+    }
+}
+
+#[cfg(feature = "with-uuid")]
+impl From<Uuid> for CFUUID {
+    fn from(uuid: Uuid) -> CFUUID {
+        let b = uuid.as_bytes();
+        let bytes = CFUUIDBytes {
+            byte0: b[0],
+            byte1: b[1],
+            byte2: b[2],
+            byte3: b[3],
+            byte4: b[4],
+            byte5: b[5],
+            byte6: b[6],
+            byte7: b[7],
+            byte8: b[8],
+            byte9: b[9],
+            byte10: b[10],
+            byte11: b[11],
+            byte12: b[12],
+            byte13: b[13],
+            byte14: b[14],
+            byte15: b[15],
+        };
+        unsafe {
+            let uuid_ref = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, bytes);
+            TCFType::wrap_under_create_rule(uuid_ref)
+        }
+    }
+}
+
+
+#[cfg(test)]
+#[cfg(feature = "with-uuid")]
+mod test {
+    use super::CFUUID;
+    use uuid::Uuid;
+
+    #[test]
+    fn uuid_conversion() {
+        let cf_uuid = CFUUID::new();
+        let uuid: Uuid = cf_uuid.clone().into();
+        let converted = CFUUID::from(uuid);
+        assert!(cf_uuid == converted);
+    }
+}
diff -Nru cargo-0.32.0/vendor/core-foundation/src/uuid.rs cargo-0.33.0/vendor/core-foundation/src/uuid.rs
--- cargo-0.32.0/vendor/core-foundation/src/uuid.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/core-foundation/src/uuid.rs	2019-02-06 04:11:58.000000000 +0000
@@ -62,7 +62,7 @@
             b.byte14,
             b.byte15,
         ];
-        Uuid::from_bytes(&bytes).unwrap()
+        Uuid::from_slice(&bytes).unwrap()
     }
 }
 
diff -Nru cargo-0.32.0/vendor/crc32fast/.cargo_vcs_info.json cargo-0.33.0/vendor/crc32fast/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/crc32fast/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crc32fast/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "3f0ebc9406d2a3e2e775d5e7eb0db1894b8f1ad4"
-  }
-}
diff -Nru cargo-0.32.0/vendor/crc32fast/.travis.yml cargo-0.33.0/vendor/crc32fast/.travis.yml
--- cargo-0.32.0/vendor/crc32fast/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crc32fast/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-language: rust
-services: docker
-cache:
-  - cargo
-
-matrix:
-  include:
-    - rust: 1.20.0
-    - rust: 1.27.0
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-    - os: osx
-    # Tier 1
-    - env: CROSS_TEST=i686-unknown-linux-gnu
-    # Tier 2
-    - env: CROSS_TEST=aarch64-unknown-linux-gnu
-    - env: CROSS_TEST=powerpc-unknown-linux-gnu
-    - env: CROSS_CHECK=wasm32-unknown-unknown
-
-script:
-  - |
-    set -e
-    if [[ "$TRAVIS_RUST_VERSION" == nightly ]]
-    then
-        # Make sure the benchmarks compile
-        cargo build --benches --all
-
-        export ASAN_OPTIONS="detect_odr_violation=0 detect_leaks=0"
-        export RUST_BACKTRACE=1
-
-        # Run address sanitizer
-        RUSTFLAGS="-Z sanitizer=address" \
-        cargo test --lib --target x86_64-unknown-linux-gnu
-    fi
-  - |
-    set -e
-    if [[ "$CROSS_CHECK" ]]
-    then
-        rustup target add $CROSS_CHECK
-        cargo check --target $CROSS_CHECK
-        cargo check --tests --target $CROSS_CHECK
-    elif [[ "$CROSS_TEST" ]]
-    then
-        cargo install cross
-        cross test --target=$CROSS_TEST
-    else
-        cargo test --no-fail-fast
-        cargo test --no-fail-fast --release
-    fi
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.cargo-checksum.json cargo-0.33.0/vendor/crossbeam-channel/.cargo-checksum.json
--- cargo-0.32.0/vendor/crossbeam-channel/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"7b85741761b7f160bc5e7e0c14986ef685b7f8bf9b7ad081c60c604bb4649827"}
\ No newline at end of file
+{"files":{},"package":"0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/Cargo.toml cargo-0.33.0/vendor/crossbeam-channel/Cargo.toml
--- cargo-0.32.0/vendor/crossbeam-channel/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,29 +12,23 @@
 
 [package]
 name = "crossbeam-channel"
-version = "0.2.6"
+version = "0.3.8"
 authors = ["The Crossbeam Project Developers"]
 description = "Multi-producer multi-consumer channels for message passing"
-homepage = "https://github.com/crossbeam-rs/crossbeam-channel"
+homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
 documentation = "https://docs.rs/crossbeam-channel"
 readme = "README.md"
 keywords = ["channel", "mpmc", "select", "golang", "message"]
 categories = ["algorithms", "concurrency", "data-structures"]
 license = "MIT/Apache-2.0"
-repository = "https://github.com/crossbeam-rs/crossbeam-channel"
-[dependencies.crossbeam-epoch]
-version = "0.6.0"
-
+repository = "https://github.com/crossbeam-rs/crossbeam"
 [dependencies.crossbeam-utils]
-version = "0.5.0"
-
-[dependencies.parking_lot]
-version = "0.6.3"
-
-[dependencies.rand]
-version = "0.5.3"
+version = "0.6.5"
 
 [dependencies.smallvec]
 version = "0.6.2"
-[dev-dependencies.crossbeam]
-version = "0.3.0"
+[dev-dependencies.rand]
+version = ">= 0.5, < 0.7"
+
+[dev-dependencies.signal-hook]
+version = "0.1.5"
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.cargo_vcs_info.json cargo-0.33.0/vendor/crossbeam-channel/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/crossbeam-channel/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "a54292480f9ed457134bc885b9ab6f8e29b9e78c"
-  }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/CHANGELOG.md cargo-0.33.0/vendor/crossbeam-channel/CHANGELOG.md
--- cargo-0.32.0/vendor/crossbeam-channel/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,73 +1,101 @@
-# Changelog
-All notable changes to this project will be documented in this file.
+# Version 0.3.8
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+- Bump the minimum required version of `crossbeam-utils`.
 
-## [Unreleased]
+# Version 0.3.7
+
+- Remove `parking_lot` and `rand` dependencies.
+- Expand documentation.
+- Implement `Default` for `Select`.
+- Make `size_of::<Receiver<T>>()` smaller.
+- Several minor optimizations.
+- Add more tests.
+
+# Version 0.3.6
+
+- Fix a bug in initialization of unbounded channels.
+
+# Version 0.3.5
+
+- New implementation for unbounded channels.
+- A number of small performance improvements.
+- Remove `crossbeam-epoch` dependency.
+
+# Version 0.3.4
+
+- Bump `crossbeam-epoch` to `0.7`.
+- Improve documentation.
+
+# Version 0.3.3
+
+- Relax the lifetime in `SelectedOperation<'_>`.
+- Add `Select::try_ready()`, `Select::ready()`, and `Select::ready_timeout()`.
+- Update licensing notices.
+- Improve documentation.
+- Add methods `is_disconnected()`, `is_timeout()`, `is_empty()`, and `is_full()` on error types.
+
+# Version 0.3.2
+
+- More elaborate licensing notices.
+
+# Version 0.3.1
+
+- Update `crossbeam-utils` to `0.6`.
+
+# Version 0.3.0
+
+- Add a special `never` channel type.
+- Dropping all receivers now closes the channel.
+- The interface of sending and receiving methods is now very similar to those in v0.1.
+- The syntax for `send` in `select!` is now `send(sender, msg) -> res => body`.
+- The syntax for `recv` in `select!` is now `recv(receiver) -> res => body`.
+- New, more efficient interface for `Select` without callbacks.
+- Timeouts can be specified in `select!`.
+
+# Version 0.2.6
 
-## [0.2.6] - 2018-09-17
-### Added
 - `Select` struct that can add cases dynamically.
 - More documentation (in particular, the FAQ section).
-
-### Changed
 - Optimize contended sends/receives in unbounded channels.
 
-## [0.2.5] - 2018-09-11
-### Changed
-- Use `LocalKey::try_with` instead of `LocalKey::with`.
+# Version 0.2.5
 
-### Removed
+- Use `LocalKey::try_with` instead of `LocalKey::with`.
 - Remove helper macros `__crossbeam_channel*`.
 
-## [0.2.4] - 2018-08-02
-### Changed
+# Version 0.2.4
+
 - Make `select!` linearizable with other channel operations.
 - Update `crossbeam-utils` to `0.5.0`.
 - Update `parking_lot` to `0.6.3`.
-
-### Removed
 - Remove Mac OS X tests.
 
-## [0.2.3] - 2018-07-21
-### Added
-- Add Mac OS X tests.
+# Version 0.2.3
 
-### Changed
+- Add Mac OS X tests.
 - Lower some memory orderings.
-
-### Fixed
 - Eliminate calls to `mem::unitialized`, which caused bugs with ZST.
 
-## [0.2.2] - 2018-07-10
-### Added
-- Add more tests.
+# Version 0.2.2
 
-### Changed
+- Add more tests.
 - Update `crossbeam-epoch` to 0.5.0
 - Initialize the RNG seed to a random value.
 - Replace `libc::abort` with `std::process::abort`.
-
-### Fixed
 - Ignore clippy warnings in `select!`.
 - Better interaction of `select!` with the NLL borrow checker.
 
-## [0.2.1] - 2018-06-12
-### Changed
+# Version 0.2.1
+
 - Fix compilation errors when using `select!` with `#[deny(unsafe_code)]`.
 
-## [0.2.0] - 2018-06-11
-### Added
+# Version 0.2.0
+
 - Implement `IntoIterator<Item = T>` for `Receiver<T>`.
 - Add a new `select!` macro.
 - Add special channels `after` and `tick`.
-
-### Changed
 - Dropping receivers doesn't close the channel anymore.
 - Change the signature of `recv`, `send`, and `try_recv`.
-
-### Removed
 - Remove `Sender::is_closed` and `Receiver::is_closed`.
 - Remove `Sender::close` and `Receiver::close`.
 - Remove `Sender::send_timeout` and `Receiver::recv_timeout`.
@@ -78,48 +106,32 @@
 - Remove the `nightly` feature.
 - Remove ordering operators for `Sender` and `Receiver`.
 
-## [0.1.3] - 2018-05-23
-### Added
+# Version 0.1.3
+
 - Add `Sender::disconnect` and `Receiver::disconnect`.
 - Implement comparison operators for `Sender` and `Receiver`.
 - Allow arbitrary patterns in place of `msg` in `recv(r, msg)`.
 - Add a few conversion impls between error types.
 - Add benchmarks for `atomicring` and `mpmc`.
 - Add benchmarks for different message sizes.
-
-### Changed
 - Documentation improvements.
 - Update `crossbeam-epoch` to 0.4.0
 - Update `crossbeam-utils` to 0.3.0
 - Update `parking_lot` to 0.5
 - Update `rand` to 0.4
 
-## [0.1.2] - 2017-12-12
-### Added
-- Allow conditional cases in `select_loop!` macro.
+# Version 0.1.2
 
-### Fixed
+- Allow conditional cases in `select_loop!` macro.
 - Fix typos in documentation.
 - Fix deadlock in selection when all channels are disconnected and a timeout is specified.
 
-## [0.1.1] - 2017-11-27
-### Added
+# Version 0.1.1
+
 - Implement `Debug` for `Sender`, `Receiver`, `Iter`, `TryIter`, `IntoIter`, and `Select`.
 - Implement `Default` for `Select`.
 
-## 0.1.0 - 2017-11-26
-### Added
+# Version 0.1.0
+
 - First implementation of the channels.
 - Add `select_loop!` macro by @TimNN.
-
-[Unreleased]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.6...HEAD
-[0.2.6]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.5...v0.2.6
-[0.2.5]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.4...v0.2.5
-[0.2.4]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.3...v0.2.4
-[0.2.3]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.2...v0.2.3
-[0.2.2]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.1...v0.2.2
-[0.2.1]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.1.3...v0.2.0
-[0.1.3]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/crossbeam-rs/crossbeam-channel/compare/v0.1.0...v0.1.1
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/debian/patches/relax-dep-version.patch cargo-0.33.0/vendor/crossbeam-channel/debian/patches/relax-dep-version.patch
--- cargo-0.32.0/vendor/crossbeam-channel/debian/patches/relax-dep-version.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/debian/patches/relax-dep-version.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,13 @@
+Index: crossbeam-channel/Cargo.toml
+===================================================================
+--- crossbeam-channel.orig/Cargo.toml
++++ crossbeam-channel/Cargo.toml
+@@ -28,7 +28,7 @@ version = "0.6.5"
+ [dependencies.smallvec]
+ version = "0.6.2"
+ [dev-dependencies.rand]
+-version = "0.6"
++version = ">= 0.5, < 0.7"
+ 
+ [dev-dependencies.signal-hook]
+ version = "0.1.5"
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/debian/patches/series cargo-0.33.0/vendor/crossbeam-channel/debian/patches/series
--- cargo-0.32.0/vendor/crossbeam-channel/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+relax-dep-version.patch
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/examples/csp.rs cargo-0.33.0/vendor/crossbeam-channel/examples/csp.rs
--- cargo-0.32.0/vendor/crossbeam-channel/examples/csp.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/examples/csp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-//! Translation of the following Go program into Rust.
-//! Source: https://www.nada.kth.se/~snilsson/concurrency/#Match
-//!
-//! ```go
-//! func main() {
-//!     people := []string{"Anna", "Bob", "Cody", "Dave", "Eva"}
-//!     match := make(chan string, 1) // Make room for one unmatched send.
-//!     wg := new(sync.WaitGroup)
-//!     for _, name := range people {
-//!         wg.Add(1)
-//!         go Seek(name, match, wg)
-//!     }
-//!     wg.Wait()
-//!     select {
-//!     case name := <-match:
-//!         fmt.Printf("No one received %s’s message.\n", name)
-//!     default:
-//!         // There was no pending send operation.
-//!     }
-//! }
-//!
-//! // Seek either sends or receives, whichever possible, a name on the match
-//! // channel and notifies the wait group when done.
-//! func Seek(name string, match chan string, wg *sync.WaitGroup) {
-//!     select {
-//!     case peer := <-match:
-//!         fmt.Printf("%s received a message from %s.\n", name, peer)
-//!     case match <- name:
-//!         // Wait for someone to receive my message.
-//!     }
-//!     wg.Done()
-//! }
-//! ```
-
-extern crate crossbeam;
-#[macro_use]
-extern crate crossbeam_channel as channel;
-
-fn main() {
-    let people = vec!["Anna", "Bob", "Cody", "Dave", "Eva"];
-    let (s, r) = &channel::bounded(1); // Make room for one unmatched send.
-
-    // Either send my name into the channel or receive someone else's, whatever happens first.
-    let seek = |name, s: &channel::Sender<_>, r: &channel::Receiver<_>| {
-        select! {
-            recv(r, peer) => println!("{} received a message from {}.", name, peer.unwrap()),
-            send(s, name) => {}, // Wait for someone to receive my message.
-        }
-    };
-
-    crossbeam::scope(|scope| {
-        for name in people {
-            scope.spawn(move || seek(name, s, r));
-        }
-    });
-
-    if let Some(name) = r.try_recv() {
-        println!("No one received {}’s message.", name);
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/examples/fibonacci.rs cargo-0.33.0/vendor/crossbeam-channel/examples/fibonacci.rs
--- cargo-0.32.0/vendor/crossbeam-channel/examples/fibonacci.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/examples/fibonacci.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,37 +1,27 @@
 //! An asynchronous fibonacci sequence generator.
 
-#[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
 
 use std::thread;
 
-fn fibonacci(fib: channel::Sender<u64>, quit: channel::Receiver<()>) {
+use crossbeam_channel::{bounded, Sender};
+
+// Sends the Fibonacci sequence into the channel until it becomes disconnected.
+fn fibonacci(sender: Sender<u64>) {
     let (mut x, mut y) = (0, 1);
-    loop {
-        select! {
-            send(fib, x) => {
-                let tmp = x;
-                x = y;
-                y = tmp + y;
-            }
-            recv(quit) => {
-                println!("quit");
-                return;
-            }
-        }
+    while sender.send(x).is_ok() {
+        let tmp = x;
+        x = y;
+        y = tmp + y;
     }
 }
 
 fn main() {
-    let (fib_s, fib_r) = channel::bounded(0);
-    let (quit_s, quit_r) = channel::bounded(0);
-
-    thread::spawn(move || {
-        for _ in 0..10 {
-            println!("{}", fib_r.recv().unwrap());
-        }
-        quit_s.send(());
-    });
+    let (s, r) = bounded(0);
+    thread::spawn(|| fibonacci(s));
 
-    fibonacci(fib_s, quit_r);
+    // Print the first 20 Fibonacci numbers.
+    for num in r.iter().take(20) {
+        println!("{}", num);
+    }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/examples/matching.rs cargo-0.33.0/vendor/crossbeam-channel/examples/matching.rs
--- cargo-0.32.0/vendor/crossbeam-channel/examples/matching.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/examples/matching.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,75 @@
+//! Using `select!` to send and receive on the same channel at the same time.
+//!
+//! This example is based on the following program in Go.
+//!
+//! Source:
+//!   - https://web.archive.org/web/20171209034309/https://www.nada.kth.se/~snilsson/concurrency
+//!   - http://www.nada.kth.se/~snilsson/concurrency/src/matching.go
+//!
+//! Copyright & License:
+//!   - Stefan Nilsson
+//!   - Creative Commons Attribution 3.0 Unported License
+//!   - https://creativecommons.org/licenses/by/3.0/
+//!
+//! ```go
+//! func main() {
+//!     people := []string{"Anna", "Bob", "Cody", "Dave", "Eva"}
+//!     match := make(chan string, 1) // Make room for one unmatched send.
+//!     wg := new(sync.WaitGroup)
+//!     for _, name := range people {
+//!         wg.Add(1)
+//!         go Seek(name, match, wg)
+//!     }
+//!     wg.Wait()
+//!     select {
+//!     case name := <-match:
+//!         fmt.Printf("No one received %s’s message.\n", name)
+//!     default:
+//!         // There was no pending send operation.
+//!     }
+//! }
+//!
+//! // Seek either sends or receives, whichever possible, a name on the match
+//! // channel and notifies the wait group when done.
+//! func Seek(name string, match chan string, wg *sync.WaitGroup) {
+//!     select {
+//!     case peer := <-match:
+//!         fmt.Printf("%s received a message from %s.\n", name, peer)
+//!     case match <- name:
+//!         // Wait for someone to receive my message.
+//!     }
+//!     wg.Done()
+//! }
+//! ```
+
+#[macro_use]
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
+
+use crossbeam_channel::bounded;
+use crossbeam_utils::thread;
+
+fn main() {
+    let people = vec!["Anna", "Bob", "Cody", "Dave", "Eva"];
+    let (s, r) = bounded(1); // Make room for one unmatched send.
+
+    // Either send my name into the channel or receive someone else's, whatever happens first.
+    let seek = |name, s, r| {
+        select! {
+            recv(r) -> peer => println!("{} received a message from {}.", name, peer.unwrap()),
+            send(s, name) -> _ => {}, // Wait for someone to receive my message.
+        }
+    };
+
+    thread::scope(|scope| {
+        for name in people {
+            let (s, r) = (s.clone(), r.clone());
+            scope.spawn(move |_| seek(name, s, r));
+        }
+    }).unwrap();
+
+    // Check if there is a pending send operation.
+    if let Ok(name) = r.try_recv() {
+        println!("No one received {}’s message.", name);
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/examples/mpsc.rs cargo-0.33.0/vendor/crossbeam-channel/examples/mpsc.rs
--- cargo-0.32.0/vendor/crossbeam-channel/examples/mpsc.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/examples/mpsc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,273 +0,0 @@
-//! A reimplementation of the `std::sync::mpsc` interface using `crossbeam-channel`.
-//!
-//! This is a channel implementation mimicking MPSC channels from the standard library, but the
-//! internals actually use `crossbeam-channel`. There's an auxilliary channel `disconnected`, which
-//! becomes closed once the receiver gets dropped, thus notifying the senders that the MPSC channel
-//! is disconnected.
-
-#[macro_use]
-extern crate crossbeam_channel as channel;
-
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::{RecvError, RecvTimeoutError, SendError, TryRecvError, TrySendError};
-use std::thread;
-use std::time::Duration;
-
-pub struct Sender<T> {
-    pub inner: channel::Sender<T>,
-    disconnected: channel::Receiver<()>,
-    is_disconnected: Arc<AtomicBool>,
-}
-
-impl<T> Sender<T> {
-    pub fn send(&self, t: T) -> Result<(), SendError<T>> {
-        if self.is_disconnected.load(Ordering::SeqCst) {
-            Err(SendError(t))
-        } else {
-            self.inner.send(t);
-            Ok(())
-        }
-    }
-}
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender {
-            inner: self.inner.clone(),
-            disconnected: self.disconnected.clone(),
-            is_disconnected: self.is_disconnected.clone(),
-        }
-    }
-}
-
-pub struct SyncSender<T> {
-    pub inner: channel::Sender<T>,
-    disconnected: channel::Receiver<()>,
-    is_disconnected: Arc<AtomicBool>,
-}
-
-impl<T> SyncSender<T> {
-    pub fn send(&self, t: T) -> Result<(), SendError<T>> {
-        if self.is_disconnected.load(Ordering::SeqCst) {
-            Err(SendError(t))
-        } else {
-            select! {
-                send(self.inner, t) => Ok(()),
-                default => {
-                    select! {
-                        send(self.inner, t) => Ok(()),
-                        recv(self.disconnected) => Err(SendError(t)),
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn try_send(&self, t: T) -> Result<(), TrySendError<T>> {
-        if self.is_disconnected.load(Ordering::SeqCst) {
-            Err(TrySendError::Disconnected(t))
-        } else {
-            select! {
-                send(self.inner, t) => Ok(()),
-                default => Err(TrySendError::Full(t)),
-            }
-        }
-    }
-}
-
-impl<T> Clone for SyncSender<T> {
-    fn clone(&self) -> SyncSender<T> {
-        SyncSender {
-            inner: self.inner.clone(),
-            disconnected: self.disconnected.clone(),
-            is_disconnected: self.is_disconnected.clone(),
-        }
-    }
-}
-
-pub struct Receiver<T> {
-    pub inner: channel::Receiver<T>,
-    _disconnected: channel::Sender<()>,
-    is_disconnected: Arc<AtomicBool>,
-}
-
-impl<T> Receiver<T> {
-    pub fn try_recv(&self) -> Result<T, TryRecvError> {
-        select! {
-            recv(self.inner, msg) => match msg {
-                None => Err(TryRecvError::Disconnected),
-                Some(msg) => Ok(msg),
-            }
-            default => Err(TryRecvError::Empty),
-        }
-    }
-
-    pub fn recv(&self) -> Result<T, RecvError> {
-        match self.inner.recv() {
-            None => Err(RecvError),
-            Some(msg) => Ok(msg),
-        }
-    }
-
-    pub fn recv_timeout(&self, timeout: Duration) -> Result<T, RecvTimeoutError> {
-        select! {
-            recv(self.inner, msg) => match msg {
-                None => Err(RecvTimeoutError::Disconnected),
-                Some(msg) => Ok(msg),
-            }
-            default => {
-                select! {
-                    recv(self.inner, msg) => match msg {
-                        None => Err(RecvTimeoutError::Disconnected),
-                        Some(msg) => Ok(msg),
-                    }
-                    recv(channel::after(timeout)) => Err(RecvTimeoutError::Timeout),
-                }
-            }
-        }
-    }
-
-    pub fn iter(&self) -> Iter<T> {
-        Iter { inner: self }
-    }
-
-    pub fn try_iter(&self) -> TryIter<T> {
-        TryIter { inner: self }
-    }
-}
-
-impl<T> Drop for Receiver<T> {
-    fn drop(&mut self) {
-        self.is_disconnected.store(true, Ordering::SeqCst);
-    }
-}
-
-impl<'a, T> IntoIterator for &'a Receiver<T> {
-    type Item = T;
-    type IntoIter = Iter<'a, T>;
-
-    fn into_iter(self) -> Iter<'a, T> {
-        self.iter()
-    }
-}
-
-impl<T> IntoIterator for Receiver<T> {
-    type Item = T;
-    type IntoIter = IntoIter<T>;
-
-    fn into_iter(self) -> IntoIter<T> {
-        IntoIter { inner: self }
-    }
-}
-
-pub struct TryIter<'a, T: 'a> {
-    inner: &'a Receiver<T>,
-}
-
-impl<'a, T> Iterator for TryIter<'a, T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<T> {
-        self.inner.try_recv().ok()
-    }
-}
-
-pub struct Iter<'a, T: 'a> {
-    inner: &'a Receiver<T>,
-}
-
-impl<'a, T> Iterator for Iter<'a, T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<T> {
-        self.inner.recv().ok()
-    }
-}
-
-pub struct IntoIter<T> {
-    inner: Receiver<T>,
-}
-
-impl<T> Iterator for IntoIter<T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<T> {
-        self.inner.recv().ok()
-    }
-}
-
-pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
-    let (s1, r1) = channel::unbounded();
-    let (s2, r2) = channel::bounded(1);
-    let is_disconnected = Arc::new(AtomicBool::new(false));
-
-    let s = Sender {
-        inner: s1,
-        disconnected: r2,
-        is_disconnected: is_disconnected.clone(),
-    };
-    let r = Receiver {
-        inner: r1,
-        _disconnected: s2,
-        is_disconnected,
-    };
-    (s, r)
-}
-
-pub fn sync_channel<T>(bound: usize) -> (SyncSender<T>, Receiver<T>) {
-    let (s1, r1) = channel::bounded(bound);
-    let (s2, r2) = channel::bounded(1);
-    let is_disconnected = Arc::new(AtomicBool::new(false));
-
-    let s = SyncSender {
-        inner: s1,
-        disconnected: r2,
-        is_disconnected: is_disconnected.clone(),
-    };
-    let r = Receiver {
-        inner: r1,
-        _disconnected: s2,
-        is_disconnected,
-    };
-    (s, r)
-}
-
-macro_rules! mpsc_select {
-    (
-        $($name:pat = $rx:ident.$meth:ident() => $code:expr),+
-    ) => ({
-        select! {
-            $(
-                $meth(($rx).inner, msg) => {
-                    let $name = match msg {
-                        None => Err(::std::sync::mpsc::RecvError),
-                        Some(msg) => Ok(msg),
-                    };
-                    $code
-                }
-            )+
-        }
-    })
-}
-
-fn main() {
-    // Example #1:
-    let (tx, rx) = channel();
-    thread::spawn(move || tx.send(10).unwrap());
-    assert_eq!(rx.recv().unwrap(), 10);
-
-    // Example #2:
-    let (tx, rx) = sync_channel::<i32>(0);
-    thread::spawn(move || tx.send(53).unwrap());
-    rx.recv().unwrap();
-
-    // Example #3:
-    let (_tx1, rx1) = channel::<i32>();
-    let (tx2, rx2) = channel::<i32>();
-    tx2.send(0).unwrap();
-    mpsc_select! {
-        _ = rx1.recv() => panic!(),
-        m = rx2.recv() => assert_eq!(m, Ok(0))
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/examples/stopwatch.rs cargo-0.33.0/vendor/crossbeam-channel/examples/stopwatch.rs
--- cargo-0.32.0/vendor/crossbeam-channel/examples/stopwatch.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/examples/stopwatch.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,58 @@
+//! Prints the elapsed time every 1 second and quits on Ctrl+C.
+
+#[macro_use]
+extern crate crossbeam_channel;
+extern crate signal_hook;
+
+use std::io;
+use std::thread;
+use std::time::{Duration, Instant};
+
+use crossbeam_channel::{bounded, tick, Receiver};
+use signal_hook::iterator::Signals;
+use signal_hook::SIGINT;
+
+// Creates a channel that gets a message every time `SIGINT` is signalled.
+fn sigint_notifier() -> io::Result<Receiver<()>> {
+    let (s, r) = bounded(100);
+    let signals = Signals::new(&[SIGINT])?;
+
+    thread::spawn(move || {
+        for _ in signals.forever() {
+            if s.send(()).is_err() {
+                break;
+            }
+        }
+    });
+
+    Ok(r)
+}
+
+// Prints the elapsed time.
+fn show(dur: Duration) {
+    println!(
+        "Elapsed: {}.{:03} sec",
+        dur.as_secs(),
+        dur.subsec_nanos() / 1_000_000
+    );
+}
+
+fn main() {
+    let start = Instant::now();
+    let update = tick(Duration::from_secs(1));
+    let ctrl_c = sigint_notifier().unwrap();
+
+    loop {
+        select! {
+            recv(update) -> _ => {
+                show(start.elapsed());
+            }
+            recv(ctrl_c) -> _ => {
+                println!();
+                println!("Goodbye!");
+                show(start.elapsed());
+                break;
+            }
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/LICENSE-MIT cargo-0.33.0/vendor/crossbeam-channel/LICENSE-MIT
--- cargo-0.32.0/vendor/crossbeam-channel/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,3 @@
-Copyright (c) 2010 The Rust Project Developers
-
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/LICENSE-THIRD-PARTY cargo-0.33.0/vendor/crossbeam-channel/LICENSE-THIRD-PARTY
--- cargo-0.32.0/vendor/crossbeam-channel/LICENSE-THIRD-PARTY	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/LICENSE-THIRD-PARTY	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,625 @@
+===============================================================================
+
+Bounded MPMC queue
+http://www.1024cores.net/home/code-license
+
+Copyright (c) 2010-2011 Dmitry Vyukov.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of Dmitry Vyukov.
+
+===============================================================================
+
+matching.go
+https://creativecommons.org/licenses/by/3.0/legalcode
+
+Creative Commons Legal Code
+
+Attribution 3.0 Unported
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+    other pre-existing works, such as a translation, adaptation,
+    derivative work, arrangement of music or other alterations of a
+    literary or artistic work, or phonogram or performance and includes
+    cinematographic adaptations or any other form in which the Work may be
+    recast, transformed, or adapted including in any form recognizably
+    derived from the original, except that a work that constitutes a
+    Collection will not be considered an Adaptation for the purpose of
+    this License. For the avoidance of doubt, where the Work is a musical
+    work, performance or phonogram, the synchronization of the Work in
+    timed-relation with a moving image ("synching") will be considered an
+    Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+    encyclopedias and anthologies, or performances, phonograms or
+    broadcasts, or other works or subject matter other than works listed
+    in Section 1(f) below, which, by reason of the selection and
+    arrangement of their contents, constitute intellectual creations, in
+    which the Work is included in its entirety in unmodified form along
+    with one or more other contributions, each constituting separate and
+    independent works in themselves, which together are assembled into a
+    collective whole. A work that constitutes a Collection will not be
+    considered an Adaptation (as defined above) for the purposes of this
+    License.
+ c. "Distribute" means to make available to the public the original and
+    copies of the Work or Adaptation, as appropriate, through sale or
+    other transfer of ownership.
+ d. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+ e. "Original Author" means, in the case of a literary or artistic work,
+    the individual, individuals, entity or entities who created the Work
+    or if no individual or entity can be identified, the publisher; and in
+    addition (i) in the case of a performance the actors, singers,
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
+    play in, interpret or otherwise perform literary or artistic works or
+    expressions of folklore; (ii) in the case of a phonogram the producer
+    being the person or legal entity who first fixes the sounds of a
+    performance or other sounds; and, (iii) in the case of broadcasts, the
+    organization that transmits the broadcast.
+ f. "Work" means the literary and/or artistic work offered under the terms
+    of this License including without limitation any production in the
+    literary, scientific and artistic domain, whatever may be the mode or
+    form of its expression including digital form, such as a book,
+    pamphlet and other writing; a lecture, address, sermon or other work
+    of the same nature; a dramatic or dramatico-musical work; a
+    choreographic work or entertainment in dumb show; a musical
+    composition with or without words; a cinematographic work to which are
+    assimilated works expressed by a process analogous to cinematography;
+    a work of drawing, painting, architecture, sculpture, engraving or
+    lithography; a photographic work to which are assimilated works
+    expressed by a process analogous to photography; a work of applied
+    art; an illustration, map, plan, sketch or three-dimensional work
+    relative to geography, topography, architecture or science; a
+    performance; a broadcast; a phonogram; a compilation of data to the
+    extent it is protected as a copyrightable work; or a work performed by
+    a variety or circus performer to the extent it is not otherwise
+    considered a literary or artistic work.
+ g. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ h. "Publicly Perform" means to perform public recitations of the Work and
+    to communicate to the public those public recitations, by any means or
+    process, including by wire or wireless means or public digital
+    performances; to make available to the public Works in such a way that
+    members of the public may access these Works from a place and at a
+    place individually chosen by them; to perform the Work to the public
+    by any means or process and the communication to the public of the
+    performances of the Work, including by public digital performance; to
+    broadcast and rebroadcast the Work by any means including signs,
+    sounds or images.
+ i. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of
+    fixation and reproducing fixations of the Work, including storage of a
+    protected performance or phonogram in digital form or other electronic
+    medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+limit, or restrict any uses free from copyright or rights arising from
+limitations or exceptions that are provided for in connection with the
+copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+    Collections, and to Reproduce the Work as incorporated in the
+    Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+    including any translation in any medium, takes reasonable steps to
+    clearly label, demarcate or otherwise identify that changes were made
+    to the original Work. For example, a translation could be marked "The
+    original work was translated from English to Spanish," or a
+    modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+    in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme cannot be waived, the Licensor
+        reserves the exclusive right to collect such royalties for any
+        exercise by You of the rights granted under this License;
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme can be waived, the Licensor waives the
+        exclusive right to collect such royalties for any exercise by You
+        of the rights granted under this License; and,
+   iii. Voluntary License Schemes. The Licensor waives the right to
+        collect royalties, whether individually or, in the event that the
+        Licensor is a member of a collecting society that administers
+        voluntary licensing schemes, via that society, from any exercise
+        by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. Subject to Section 8(f), all rights not expressly
+granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms
+    on the Work that restrict the terms of this License or the ability of
+    the recipient of the Work to exercise the rights granted to that
+    recipient under the terms of the License. You may not sublicense the
+    Work. You must keep intact all notices that refer to this License and
+    to the disclaimer of warranties with every copy of the Work You
+    Distribute or Publicly Perform. When You Distribute or Publicly
+    Perform the Work, You may not impose any effective technological
+    measures on the Work that restrict the ability of a recipient of the
+    Work from You to exercise the rights granted to that recipient under
+    the terms of the License. This Section 4(a) applies to the Work as
+    incorporated in a Collection, but this does not require the Collection
+    apart from the Work itself to be made subject to the terms of this
+    License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit
+    as required by Section 4(b), as requested. If You create an
+    Adaptation, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Adaptation any credit as required by
+    Section 4(b), as requested.
+ b. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to
+    Section 4(a), keep intact all copyright notices for the Work and
+    provide, reasonable to the medium or means You are utilizing: (i) the
+    name of the Original Author (or pseudonym, if applicable) if supplied,
+    and/or if the Original Author and/or Licensor designate another party
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
+    attribution ("Attribution Parties") in Licensor's copyright notice,
+    terms of service or by other reasonable means, the name of such party
+    or parties; (ii) the title of the Work if supplied; (iii) to the
+    extent reasonably practicable, the URI, if any, that Licensor
+    specifies to be associated with the Work, unless such URI does not
+    refer to the copyright notice or licensing information for the Work;
+    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
+    a credit identifying the use of the Work in the Adaptation (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). The credit required by
+    this Section 4 (b) may be implemented in any reasonable manner;
+    provided, however, that in the case of a Adaptation or Collection, at
+    a minimum such credit will appear, if a credit for all contributing
+    authors of the Adaptation or Collection appears, then as part of these
+    credits and in a manner at least as prominent as the credits for the
+    other contributing authors. For the avoidance of doubt, You may only
+    use the credit required by this Section for the purpose of attribution
+    in the manner set out above and, by exercising Your rights under this
+    License, You may not implicitly or explicitly assert or imply any
+    connection with, sponsorship or endorsement by the Original Author,
+    Licensor and/or Attribution Parties, as appropriate, of You or Your
+    use of the Work, without the separate, express prior written
+    permission of the Original Author, Licensor and/or Attribution
+    Parties.
+ c. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any
+    Adaptations or Collections, You must not distort, mutilate, modify or
+    take other derogatory action in relation to the Work which would be
+    prejudicial to the Original Author's honor or reputation. Licensor
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
+    of the right granted in Section 3(b) of this License (the right to
+    make Adaptations) would be deemed to be a distortion, mutilation,
+    modification or other derogatory action prejudicial to the Original
+    Author's honor and reputation, the Licensor will waive or not assert,
+    as appropriate, this Section, to the fullest extent permitted by the
+    applicable national law, to enable You to reasonably exercise Your
+    right under Section 3(b) of this License (right to make Adaptations)
+    but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Adaptations or Collections
+    from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+
+8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+    the Licensor offers to the recipient a license to the Work on the same
+    terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+    offers to the recipient a license to the original Work on the same
+    terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+    License were drafted utilizing the terminology of the Berne Convention
+    for the Protection of Literary and Artistic Works (as amended on
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+    and the Universal Copyright Convention (as revised on July 24, 1971).
+    These rights and subject matter take effect in the relevant
+    jurisdiction in which the License terms are sought to be enforced
+    according to the corresponding provisions of the implementation of
+    those treaty provisions in the applicable national law. If the
+    standard suite of rights granted under applicable copyright law
+    includes additional rights not granted under this License, such
+    additional rights are deemed to be included in the License; this
+    License is not intended to restrict the license of any rights under
+    applicable law.
+
+
+Creative Commons Notice
+
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, Creative Commons does not authorize
+    the use by either party of the trademark "Creative Commons" or any
+    related trademark or logo of Creative Commons without the prior
+    written consent of Creative Commons. Any permitted use will be in
+    compliance with Creative Commons' then-current trademark usage
+    guidelines, as may be published on its website or otherwise made
+    available upon request from time to time. For the avoidance of doubt,
+    this trademark restriction does not form part of this License.
+
+    Creative Commons may be contacted at https://creativecommons.org/.
+
+===============================================================================
+
+The Go Programming Language
+https://golang.org/LICENSE
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+
+The Rust Programming Language
+https://github.com/rust-lang/rust/blob/master/LICENSE-MIT
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+===============================================================================
+
+The Rust Programming Language
+https://github.com/rust-lang/rust/blob/master/LICENSE-APACHE
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.pc/applied-patches cargo-0.33.0/vendor/crossbeam-channel/.pc/applied-patches
--- cargo-0.32.0/vendor/crossbeam-channel/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+relax-dep-version.patch
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.pc/.quilt_patches cargo-0.33.0/vendor/crossbeam-channel/.pc/.quilt_patches
--- cargo-0.32.0/vendor/crossbeam-channel/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.pc/.quilt_patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+debian/patches
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.pc/.quilt_series cargo-0.33.0/vendor/crossbeam-channel/.pc/.quilt_series
--- cargo-0.32.0/vendor/crossbeam-channel/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.pc/.quilt_series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+series
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.pc/relax-dep-version.patch/Cargo.toml cargo-0.33.0/vendor/crossbeam-channel/.pc/relax-dep-version.patch/Cargo.toml
--- cargo-0.32.0/vendor/crossbeam-channel/.pc/relax-dep-version.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.pc/relax-dep-version.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,34 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "crossbeam-channel"
+version = "0.3.8"
+authors = ["The Crossbeam Project Developers"]
+description = "Multi-producer multi-consumer channels for message passing"
+homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
+documentation = "https://docs.rs/crossbeam-channel"
+readme = "README.md"
+keywords = ["channel", "mpmc", "select", "golang", "message"]
+categories = ["algorithms", "concurrency", "data-structures"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/crossbeam-rs/crossbeam"
+[dependencies.crossbeam-utils]
+version = "0.6.5"
+
+[dependencies.smallvec]
+version = "0.6.2"
+[dev-dependencies.rand]
+version = "0.6"
+
+[dev-dependencies.signal-hook]
+version = "0.1.5"
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.pc/.version cargo-0.33.0/vendor/crossbeam-channel/.pc/.version
--- cargo-0.32.0/vendor/crossbeam-channel/.pc/.version	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.pc/.version	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+2
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/README.md cargo-0.33.0/vendor/crossbeam-channel/README.md
--- cargo-0.32.0/vendor/crossbeam-channel/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,15 +1,38 @@
-# Multi-producer multi-consumer channels for message passing
+# Crossbeam Channel
 
-[![Build Status](https://travis-ci.org/crossbeam-rs/crossbeam-channel.svg?branch=master)](https://travis-ci.org/crossbeam-rs/crossbeam-channel)
-[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](https://github.com/crossbeam-rs/crossbeam-channel)
-[![Cargo](https://img.shields.io/crates/v/crossbeam-channel.svg)](https://crates.io/crates/crossbeam-channel)
-[![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](https://docs.rs/crossbeam-channel)
-
-Crossbeam's channels are an alternative to the [`std::sync::mpsc`] channels
-provided by the standard library. They are an improvement in terms of
-performance, ergonomics, and features.
+[![Build Status](https://travis-ci.org/crossbeam-rs/crossbeam.svg?branch=master)](
+https://travis-ci.org/crossbeam-rs/crossbeam)
+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
+https://github.com/crossbeam-rs/crossbeam-channel)
+[![Cargo](https://img.shields.io/crates/v/crossbeam-channel.svg)](
+https://crates.io/crates/crossbeam-channel)
+[![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](
+https://docs.rs/crossbeam-channel)
+[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
+https://www.rust-lang.org)
+
+This crate provides multi-producer multi-consumer channels for message passing.
+It is an alternative to [`std::sync::mpsc`] with more features and better performance.
+
+Some highlights:
+
+* [`Sender`]s and [`Receiver`]s can be cloned and shared among threads.
+* Two main kinds of channels are [`bounded`] and [`unbounded`].
+* Convenient extra channels like [`after`], [`never`], and [`tick`].
+* The [`select!`] macro can block on multiple channel operations.
+* [`Select`] can select over a dynamically built list of channel operations.
+* Channels use locks very sparingly for maximum [performance](benchmarks).
 
 [`std::sync::mpsc`]: https://doc.rust-lang.org/std/sync/mpsc/index.html
+[`Sender`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/struct.Sender.html
+[`Receiver`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/struct.Receiver.html
+[`bounded`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/fn.bounded.html
+[`unbounded`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/fn.unbounded.html
+[`after`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/fn.after.html
+[`never`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/fn.never.html
+[`tick`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/fn.tick.html
+[`select!`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/macro.select.html
+[`Select`]: https://docs.rs/crossbeam-channel/*/crossbeam_channel/struct.Select.html
 
 ## Usage
 
@@ -17,7 +40,7 @@
 
 ```toml
 [dependencies]
-crossbeam-channel = "0.2"
+crossbeam-channel = "0.3"
 ```
 
 Next, add this to your crate:
@@ -27,10 +50,39 @@
 extern crate crossbeam_channel;
 ```
 
-The minimum required Rust version is 1.26.
-
 ## License
 
-Licensed under the terms of MIT license and the Apache License (Version 2.0).
+Licensed under either of
+
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
+
+#### Third party software
+
+This product includes copies and modifications of software developed by third parties:
+
+* [examples/matching.rs](examples/matching.rs) includes
+  [matching.go](http://www.nada.kth.se/~snilsson/concurrency/src/matching.go) by Stefan Nilsson,
+  licensed under Creative Commons Attribution 3.0 Unported License.
+
+* [src/flavors/array.rs](src/flavors/array.rs) is based on
+  [Bounded MPMC queue](http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue)
+  by Dmitry Vyukov, licensed under the Simplified BSD License and the Apache License, Version 2.0.
+
+* [tests/mpsc.rs](tests/mpsc.rs) includes modifications of code from The Rust Programming Language,
+  licensed under the MIT License and the Apache License, Version 2.0.
+
+* [tests/golang.rs](tests/golang.rs) is based on code from The Go Programming Language, licensed
+  under the 3-Clause BSD License.
+
+See the source code files for more details.
 
-See [LICENSE-MIT](LICENSE-MIT) and [LICENSE-APACHE](LICENSE-APACHE) for details.
+Copies of third party licenses can be found in [LICENSE-THIRD-PARTY](LICENSE-THIRD-PARTY).
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/channel.rs cargo-0.33.0/vendor/crossbeam-channel/src/channel.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/channel.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/channel.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1340 @@
+//! The channel interface.
+
+use std::fmt;
+use std::iter::FusedIterator;
+use std::mem;
+use std::panic::{RefUnwindSafe, UnwindSafe};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+
+use context::Context;
+use counter;
+use err::{RecvError, RecvTimeoutError, SendError, SendTimeoutError, TryRecvError, TrySendError};
+use flavors;
+use select::{Operation, SelectHandle, Token};
+
+/// Creates a channel of unbounded capacity.
+///
+/// This channel has a growable buffer that can hold any number of messages at a time.
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s, r) = unbounded();
+///
+/// // Computes the n-th Fibonacci number.
+/// fn fib(n: i32) -> i32 {
+///     if n <= 1 {
+///         n
+///     } else {
+///         fib(n - 1) + fib(n - 2)
+///     }
+/// }
+///
+/// // Spawn an asynchronous computation.
+/// thread::spawn(move || s.send(fib(20)).unwrap());
+///
+/// // Print the result of the computation.
+/// println!("{}", r.recv().unwrap());
+/// ```
+pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
+    let (s, r) = counter::new(flavors::list::Channel::new());
+    let s = Sender {
+        flavor: SenderFlavor::List(s),
+    };
+    let r = Receiver {
+        flavor: ReceiverFlavor::List(r),
+    };
+    (s, r)
+}
+
+/// Creates a channel of bounded capacity.
+///
+/// This channel has a buffer that can hold at most `cap` messages at a time.
+///
+/// A special case is zero-capacity channel, which cannot hold any messages. Instead, send and
+/// receive operations must appear at the same time in order to pair up and pass the message over.
+///
+/// # Panics
+///
+/// Panics if the capacity is greater than `usize::max_value() / 4`.
+///
+/// # Examples
+///
+/// A channel of capacity 1:
+///
+/// ```
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::bounded;
+///
+/// let (s, r) = bounded(1);
+///
+/// // This call returns immediately because there is enough space in the channel.
+/// s.send(1).unwrap();
+///
+/// thread::spawn(move || {
+///     // This call blocks the current thread because the channel is full.
+///     // It will be able to complete only after the first message is received.
+///     s.send(2).unwrap();
+/// });
+///
+/// thread::sleep(Duration::from_secs(1));
+/// assert_eq!(r.recv(), Ok(1));
+/// assert_eq!(r.recv(), Ok(2));
+/// ```
+///
+/// A zero-capacity channel:
+///
+/// ```
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::bounded;
+///
+/// let (s, r) = bounded(0);
+///
+/// thread::spawn(move || {
+///     // This call blocks the current thread until a receive operation appears
+///     // on the other side of the channel.
+///     s.send(1).unwrap();
+/// });
+///
+/// thread::sleep(Duration::from_secs(1));
+/// assert_eq!(r.recv(), Ok(1));
+/// ```
+pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
+    if cap == 0 {
+        let (s, r) = counter::new(flavors::zero::Channel::new());
+        let s = Sender {
+            flavor: SenderFlavor::Zero(s),
+        };
+        let r = Receiver {
+            flavor: ReceiverFlavor::Zero(r),
+        };
+        (s, r)
+    } else {
+        let (s, r) = counter::new(flavors::array::Channel::with_capacity(cap));
+        let s = Sender {
+            flavor: SenderFlavor::Array(s),
+        };
+        let r = Receiver {
+            flavor: ReceiverFlavor::Array(r),
+        };
+        (s, r)
+    }
+}
+
+/// Creates a receiver that delivers a message after a certain duration of time.
+///
+/// The channel is bounded with capacity of 1 and never gets disconnected. Exactly one message will
+/// be sent into the channel after `duration` elapses. The message is the instant at which it is
+/// sent.
+///
+/// # Examples
+///
+/// Using an `after` channel for timeouts:
+///
+/// ```
+/// # #[macro_use]
+/// # extern crate crossbeam_channel;
+/// # fn main() {
+/// use std::time::Duration;
+/// use crossbeam_channel::{after, unbounded};
+///
+/// let (s, r) = unbounded::<i32>();
+/// let timeout = Duration::from_millis(100);
+///
+/// select! {
+///     recv(r) -> msg => println!("received {:?}", msg),
+///     recv(after(timeout)) -> _ => println!("timed out"),
+/// }
+/// # }
+/// ```
+///
+/// When the message gets sent:
+///
+/// ```
+/// use std::thread;
+/// use std::time::{Duration, Instant};
+/// use crossbeam_channel::after;
+///
+/// // Converts a number of milliseconds into a `Duration`.
+/// let ms = |ms| Duration::from_millis(ms);
+///
+/// // Returns `true` if `a` and `b` are very close `Instant`s.
+/// let eq = |a, b| a + ms(50) > b && b + ms(50) > a;
+///
+/// let start = Instant::now();
+/// let r = after(ms(100));
+///
+/// thread::sleep(ms(500));
+///
+/// // This message was sent 100 ms from the start and received 500 ms from the start.
+/// assert!(eq(r.recv().unwrap(), start + ms(100)));
+/// assert!(eq(Instant::now(), start + ms(500)));
+/// ```
+pub fn after(duration: Duration) -> Receiver<Instant> {
+    Receiver {
+        flavor: ReceiverFlavor::After(Arc::new(flavors::after::Channel::new(duration))),
+    }
+}
+
+/// Creates a receiver that never delivers messages.
+///
+/// The channel is bounded with capacity of 0 and never gets disconnected.
+///
+/// # Examples
+///
+/// Using a `never` channel to optionally add a timeout to [`select!`]:
+///
+/// ```
+/// # #[macro_use]
+/// # extern crate crossbeam_channel;
+/// # fn main() {
+/// use std::thread;
+/// use std::time::{Duration, Instant};
+/// use crossbeam_channel::{after, never, unbounded};
+///
+/// let (s, r) = unbounded();
+///
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_secs(1));
+///     s.send(1).unwrap();
+/// });
+///
+/// // Suppose this duration can be a `Some` or a `None`.
+/// let duration = Some(Duration::from_millis(100));
+///
+/// // Create a channel that times out after the specified duration.
+/// let timeout = duration
+///     .map(|d| after(d))
+///     .unwrap_or(never());
+///
+/// select! {
+///     recv(r) -> msg => assert_eq!(msg, Ok(1)),
+///     recv(timeout) -> _ => println!("timed out"),
+/// }
+/// # }
+/// ```
+///
+/// [`select!`]: macro.select.html
+pub fn never<T>() -> Receiver<T> {
+    Receiver {
+        flavor: ReceiverFlavor::Never(flavors::never::Channel::new()),
+    }
+}
+
+/// Creates a receiver that delivers messages periodically.
+///
+/// The channel is bounded with capacity of 1 and never gets disconnected. Messages will be
+/// sent into the channel in intervals of `duration`. Each message is the instant at which it is
+/// sent.
+///
+/// # Examples
+///
+/// Using a `tick` channel to periodically print elapsed time:
+///
+/// ```
+/// use std::time::{Duration, Instant};
+/// use crossbeam_channel::tick;
+///
+/// let start = Instant::now();
+/// let ticker = tick(Duration::from_millis(100));
+///
+/// for _ in 0..5 {
+///     ticker.recv().unwrap();
+///     println!("elapsed: {:?}", start.elapsed());
+/// }
+/// ```
+///
+/// When messages get sent:
+///
+/// ```
+/// use std::thread;
+/// use std::time::{Duration, Instant};
+/// use crossbeam_channel::tick;
+///
+/// // Converts a number of milliseconds into a `Duration`.
+/// let ms = |ms| Duration::from_millis(ms);
+///
+/// // Returns `true` if `a` and `b` are very close `Instant`s.
+/// let eq = |a, b| a + ms(50) > b && b + ms(50) > a;
+///
+/// let start = Instant::now();
+/// let r = tick(ms(100));
+///
+/// // This message was sent 100 ms from the start and received 100 ms from the start.
+/// assert!(eq(r.recv().unwrap(), start + ms(100)));
+/// assert!(eq(Instant::now(), start + ms(100)));
+///
+/// thread::sleep(ms(500));
+///
+/// // This message was sent 200 ms from the start and received 600 ms from the start.
+/// assert!(eq(r.recv().unwrap(), start + ms(200)));
+/// assert!(eq(Instant::now(), start + ms(600)));
+///
+/// // This message was sent 700 ms from the start and received 700 ms from the start.
+/// assert!(eq(r.recv().unwrap(), start + ms(700)));
+/// assert!(eq(Instant::now(), start + ms(700)));
+/// ```
+pub fn tick(duration: Duration) -> Receiver<Instant> {
+    Receiver {
+        flavor: ReceiverFlavor::Tick(Arc::new(flavors::tick::Channel::new(duration))),
+    }
+}
+
+/// The sending side of a channel.
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s1, r) = unbounded();
+/// let s2 = s1.clone();
+///
+/// thread::spawn(move || s1.send(1).unwrap());
+/// thread::spawn(move || s2.send(2).unwrap());
+///
+/// let msg1 = r.recv().unwrap();
+/// let msg2 = r.recv().unwrap();
+///
+/// assert_eq!(msg1 + msg2, 3);
+/// ```
+pub struct Sender<T> {
+    flavor: SenderFlavor<T>,
+}
+
+/// Sender flavors.
+enum SenderFlavor<T> {
+    /// Bounded channel based on a preallocated array.
+    Array(counter::Sender<flavors::array::Channel<T>>),
+
+    /// Unbounded channel implemented as a linked list.
+    List(counter::Sender<flavors::list::Channel<T>>),
+
+    /// Zero-capacity channel.
+    Zero(counter::Sender<flavors::zero::Channel<T>>),
+}
+
+unsafe impl<T: Send> Send for Sender<T> {}
+unsafe impl<T: Send> Sync for Sender<T> {}
+
+impl<T> UnwindSafe for Sender<T> {}
+impl<T> RefUnwindSafe for Sender<T> {}
+
+impl<T> Sender<T> {
+    /// Attempts to send a message into the channel without blocking.
+    ///
+    /// This method will either send a message into the channel immediately or return an error if
+    /// the channel is full or disconnected. The returned error contains the original message.
+    ///
+    /// If called on a zero-capacity channel, this method will send the message only if there
+    /// happens to be a receive operation on the other side of the channel at the same time.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{bounded, TrySendError};
+    ///
+    /// let (s, r) = bounded(1);
+    ///
+    /// assert_eq!(s.try_send(1), Ok(()));
+    /// assert_eq!(s.try_send(2), Err(TrySendError::Full(2)));
+    ///
+    /// drop(r);
+    /// assert_eq!(s.try_send(3), Err(TrySendError::Disconnected(3)));
+    /// ```
+    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.try_send(msg),
+            SenderFlavor::List(chan) => chan.try_send(msg),
+            SenderFlavor::Zero(chan) => chan.try_send(msg),
+        }
+    }
+
+    /// Blocks the current thread until a message is sent or the channel is disconnected.
+    ///
+    /// If the channel is full and not disconnected, this call will block until the send operation
+    /// can proceed. If the channel becomes disconnected, this call will wake up and return an
+    /// error. The returned error contains the original message.
+    ///
+    /// If called on a zero-capacity channel, this method will wait for a receive operation to
+    /// appear on the other side of the channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{bounded, SendError};
+    ///
+    /// let (s, r) = bounded(1);
+    /// assert_eq!(s.send(1), Ok(()));
+    ///
+    /// thread::spawn(move || {
+    ///     assert_eq!(r.recv(), Ok(1));
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     drop(r);
+    /// });
+    ///
+    /// assert_eq!(s.send(2), Ok(()));
+    /// assert_eq!(s.send(3), Err(SendError(3)));
+    /// ```
+    pub fn send(&self, msg: T) -> Result<(), SendError<T>> {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.send(msg, None),
+            SenderFlavor::List(chan) => chan.send(msg, None),
+            SenderFlavor::Zero(chan) => chan.send(msg, None),
+        }.map_err(|err| match err {
+            SendTimeoutError::Disconnected(msg) => SendError(msg),
+            SendTimeoutError::Timeout(_) => unreachable!(),
+        })
+    }
+
+    /// Waits for a message to be sent into the channel, but only for a limited time.
+    ///
+    /// If the channel is full and not disconnected, this call will block until the send operation
+    /// can proceed or the operation times out. If the channel becomes disconnected, this call will
+    /// wake up and return an error. The returned error contains the original message.
+    ///
+    /// If called on a zero-capacity channel, this method will wait for a receive operation to
+    /// appear on the other side of the channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{bounded, SendTimeoutError};
+    ///
+    /// let (s, r) = bounded(0);
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     assert_eq!(r.recv(), Ok(2));
+    ///     drop(r);
+    /// });
+    ///
+    /// assert_eq!(
+    ///     s.send_timeout(1, Duration::from_millis(500)),
+    ///     Err(SendTimeoutError::Timeout(1)),
+    /// );
+    /// assert_eq!(
+    ///     s.send_timeout(2, Duration::from_secs(1)),
+    ///     Ok(()),
+    /// );
+    /// assert_eq!(
+    ///     s.send_timeout(3, Duration::from_millis(500)),
+    ///     Err(SendTimeoutError::Disconnected(3)),
+    /// );
+    /// ```
+    pub fn send_timeout(&self, msg: T, timeout: Duration) -> Result<(), SendTimeoutError<T>> {
+        let deadline = Instant::now() + timeout;
+
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.send(msg, Some(deadline)),
+            SenderFlavor::List(chan) => chan.send(msg, Some(deadline)),
+            SenderFlavor::Zero(chan) => chan.send(msg, Some(deadline)),
+        }
+    }
+
+    /// Returns `true` if the channel is empty.
+    ///
+    /// Note: Zero-capacity channels are always empty.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    /// assert!(s.is_empty());
+    ///
+    /// s.send(0).unwrap();
+    /// assert!(!s.is_empty());
+    /// ```
+    pub fn is_empty(&self) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.is_empty(),
+            SenderFlavor::List(chan) => chan.is_empty(),
+            SenderFlavor::Zero(chan) => chan.is_empty(),
+        }
+    }
+
+    /// Returns `true` if the channel is full.
+    ///
+    /// Note: Zero-capacity channels are always full.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::bounded;
+    ///
+    /// let (s, r) = bounded(1);
+    ///
+    /// assert!(!s.is_full());
+    /// s.send(0).unwrap();
+    /// assert!(s.is_full());
+    /// ```
+    pub fn is_full(&self) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.is_full(),
+            SenderFlavor::List(chan) => chan.is_full(),
+            SenderFlavor::Zero(chan) => chan.is_full(),
+        }
+    }
+
+    /// Returns the number of messages in the channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    /// assert_eq!(s.len(), 0);
+    ///
+    /// s.send(1).unwrap();
+    /// s.send(2).unwrap();
+    /// assert_eq!(s.len(), 2);
+    /// ```
+    pub fn len(&self) -> usize {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.len(),
+            SenderFlavor::List(chan) => chan.len(),
+            SenderFlavor::Zero(chan) => chan.len(),
+        }
+    }
+
+    /// If the channel is bounded, returns its capacity.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{bounded, unbounded};
+    ///
+    /// let (s, _) = unbounded::<i32>();
+    /// assert_eq!(s.capacity(), None);
+    ///
+    /// let (s, _) = bounded::<i32>(5);
+    /// assert_eq!(s.capacity(), Some(5));
+    ///
+    /// let (s, _) = bounded::<i32>(0);
+    /// assert_eq!(s.capacity(), Some(0));
+    /// ```
+    pub fn capacity(&self) -> Option<usize> {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.capacity(),
+            SenderFlavor::List(chan) => chan.capacity(),
+            SenderFlavor::Zero(chan) => chan.capacity(),
+        }
+    }
+}
+
+impl<T> Drop for Sender<T> {
+    fn drop(&mut self) {
+        unsafe {
+            match &self.flavor {
+                SenderFlavor::Array(chan) => chan.release(|c| c.disconnect()),
+                SenderFlavor::List(chan) => chan.release(|c| c.disconnect()),
+                SenderFlavor::Zero(chan) => chan.release(|c| c.disconnect()),
+            }
+        }
+    }
+}
+
+impl<T> Clone for Sender<T> {
+    fn clone(&self) -> Self {
+        let flavor = match &self.flavor {
+            SenderFlavor::Array(chan) => SenderFlavor::Array(chan.acquire()),
+            SenderFlavor::List(chan) => SenderFlavor::List(chan.acquire()),
+            SenderFlavor::Zero(chan) => SenderFlavor::Zero(chan.acquire()),
+        };
+
+        Sender { flavor }
+    }
+}
+
+impl<T> fmt::Debug for Sender<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Sender { .. }")
+    }
+}
+
+/// The receiving side of a channel.
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s, r) = unbounded();
+///
+/// thread::spawn(move || {
+///     s.send(1);
+///     thread::sleep(Duration::from_secs(1));
+///     s.send(2);
+/// });
+///
+/// assert_eq!(r.recv(), Ok(1)); // Received immediately.
+/// assert_eq!(r.recv(), Ok(2)); // Received after 1 second.
+/// ```
+pub struct Receiver<T> {
+    flavor: ReceiverFlavor<T>,
+}
+
+/// Receiver flavors.
+enum ReceiverFlavor<T> {
+    /// Bounded channel based on a preallocated array.
+    Array(counter::Receiver<flavors::array::Channel<T>>),
+
+    /// Unbounded channel implemented as a linked list.
+    List(counter::Receiver<flavors::list::Channel<T>>),
+
+    /// Zero-capacity channel.
+    Zero(counter::Receiver<flavors::zero::Channel<T>>),
+
+    /// The after flavor.
+    After(Arc<flavors::after::Channel>),
+
+    /// The tick flavor.
+    Tick(Arc<flavors::tick::Channel>),
+
+    /// The never flavor.
+    Never(flavors::never::Channel<T>),
+}
+
+unsafe impl<T: Send> Send for Receiver<T> {}
+unsafe impl<T: Send> Sync for Receiver<T> {}
+
+impl<T> UnwindSafe for Receiver<T> {}
+impl<T> RefUnwindSafe for Receiver<T> {}
+
+impl<T> Receiver<T> {
+    /// Attempts to receive a message from the channel without blocking.
+    ///
+    /// This method will either receive a message from the channel immediately or return an error
+    /// if the channel is empty.
+    ///
+    /// If called on a zero-capacity channel, this method will receive a message only if there
+    /// happens to be a send operation on the other side of the channel at the same time.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{unbounded, TryRecvError};
+    ///
+    /// let (s, r) = unbounded();
+    /// assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+    ///
+    /// s.send(5).unwrap();
+    /// drop(s);
+    ///
+    /// assert_eq!(r.try_recv(), Ok(5));
+    /// assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
+    /// ```
+    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.try_recv(),
+            ReceiverFlavor::List(chan) => chan.try_recv(),
+            ReceiverFlavor::Zero(chan) => chan.try_recv(),
+            ReceiverFlavor::After(chan) => {
+                let msg = chan.try_recv();
+                unsafe {
+                    mem::transmute_copy::<Result<Instant, TryRecvError>, Result<T, TryRecvError>>(
+                        &msg,
+                    )
+                }
+            }
+            ReceiverFlavor::Tick(chan) => {
+                let msg = chan.try_recv();
+                unsafe {
+                    mem::transmute_copy::<Result<Instant, TryRecvError>, Result<T, TryRecvError>>(
+                        &msg,
+                    )
+                }
+            }
+            ReceiverFlavor::Never(chan) => chan.try_recv(),
+        }
+    }
+
+    /// Blocks the current thread until a message is received or the channel is empty and
+    /// disconnected.
+    ///
+    /// If the channel is empty and not disconnected, this call will block until the receive
+    /// operation can proceed. If the channel is empty and becomes disconnected, this call will
+    /// wake up and return an error.
+    ///
+    /// If called on a zero-capacity channel, this method will wait for a send operation to appear
+    /// on the other side of the channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{unbounded, RecvError};
+    ///
+    /// let (s, r) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s.send(5).unwrap();
+    ///     drop(s);
+    /// });
+    ///
+    /// assert_eq!(r.recv(), Ok(5));
+    /// assert_eq!(r.recv(), Err(RecvError));
+    /// ```
+    pub fn recv(&self) -> Result<T, RecvError> {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.recv(None),
+            ReceiverFlavor::List(chan) => chan.recv(None),
+            ReceiverFlavor::Zero(chan) => chan.recv(None),
+            ReceiverFlavor::After(chan) => {
+                let msg = chan.recv(None);
+                unsafe {
+                    mem::transmute_copy::<
+                        Result<Instant, RecvTimeoutError>,
+                        Result<T, RecvTimeoutError>,
+                    >(&msg)
+                }
+            }
+            ReceiverFlavor::Tick(chan) => {
+                let msg = chan.recv(None);
+                unsafe {
+                    mem::transmute_copy::<
+                        Result<Instant, RecvTimeoutError>,
+                        Result<T, RecvTimeoutError>,
+                    >(&msg)
+                }
+            }
+            ReceiverFlavor::Never(chan) => chan.recv(None),
+        }.map_err(|_| RecvError)
+    }
+
+    /// Waits for a message to be received from the channel, but only for a limited time.
+    ///
+    /// If the channel is empty and not disconnected, this call will block until the receive
+    /// operation can proceed or the operation times out. If the channel is empty and becomes
+    /// disconnected, this call will wake up and return an error.
+    ///
+    /// If called on a zero-capacity channel, this method will wait for a send operation to appear
+    /// on the other side of the channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{unbounded, RecvTimeoutError};
+    ///
+    /// let (s, r) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s.send(5).unwrap();
+    ///     drop(s);
+    /// });
+    ///
+    /// assert_eq!(
+    ///     r.recv_timeout(Duration::from_millis(500)),
+    ///     Err(RecvTimeoutError::Timeout),
+    /// );
+    /// assert_eq!(
+    ///     r.recv_timeout(Duration::from_secs(1)),
+    ///     Ok(5),
+    /// );
+    /// assert_eq!(
+    ///     r.recv_timeout(Duration::from_secs(1)),
+    ///     Err(RecvTimeoutError::Disconnected),
+    /// );
+    /// ```
+    pub fn recv_timeout(&self, timeout: Duration) -> Result<T, RecvTimeoutError> {
+        let deadline = Instant::now() + timeout;
+
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.recv(Some(deadline)),
+            ReceiverFlavor::List(chan) => chan.recv(Some(deadline)),
+            ReceiverFlavor::Zero(chan) => chan.recv(Some(deadline)),
+            ReceiverFlavor::After(chan) => {
+                let msg = chan.recv(Some(deadline));
+                unsafe {
+                    mem::transmute_copy::<
+                        Result<Instant, RecvTimeoutError>,
+                        Result<T, RecvTimeoutError>,
+                    >(&msg)
+                }
+            }
+            ReceiverFlavor::Tick(chan) => {
+                let msg = chan.recv(Some(deadline));
+                unsafe {
+                    mem::transmute_copy::<
+                        Result<Instant, RecvTimeoutError>,
+                        Result<T, RecvTimeoutError>,
+                    >(&msg)
+                }
+            }
+            ReceiverFlavor::Never(chan) => chan.recv(Some(deadline)),
+        }
+    }
+
+    /// Returns `true` if the channel is empty.
+    ///
+    /// Note: Zero-capacity channels are always empty.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    ///
+    /// assert!(r.is_empty());
+    /// s.send(0).unwrap();
+    /// assert!(!r.is_empty());
+    /// ```
+    pub fn is_empty(&self) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.is_empty(),
+            ReceiverFlavor::List(chan) => chan.is_empty(),
+            ReceiverFlavor::Zero(chan) => chan.is_empty(),
+            ReceiverFlavor::After(chan) => chan.is_empty(),
+            ReceiverFlavor::Tick(chan) => chan.is_empty(),
+            ReceiverFlavor::Never(chan) => chan.is_empty(),
+        }
+    }
+
+    /// Returns `true` if the channel is full.
+    ///
+    /// Note: Zero-capacity channels are always full.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::bounded;
+    ///
+    /// let (s, r) = bounded(1);
+    ///
+    /// assert!(!r.is_full());
+    /// s.send(0).unwrap();
+    /// assert!(r.is_full());
+    /// ```
+    pub fn is_full(&self) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.is_full(),
+            ReceiverFlavor::List(chan) => chan.is_full(),
+            ReceiverFlavor::Zero(chan) => chan.is_full(),
+            ReceiverFlavor::After(chan) => chan.is_full(),
+            ReceiverFlavor::Tick(chan) => chan.is_full(),
+            ReceiverFlavor::Never(chan) => chan.is_full(),
+        }
+    }
+
+    /// Returns the number of messages in the channel.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    /// assert_eq!(r.len(), 0);
+    ///
+    /// s.send(1).unwrap();
+    /// s.send(2).unwrap();
+    /// assert_eq!(r.len(), 2);
+    /// ```
+    pub fn len(&self) -> usize {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.len(),
+            ReceiverFlavor::List(chan) => chan.len(),
+            ReceiverFlavor::Zero(chan) => chan.len(),
+            ReceiverFlavor::After(chan) => chan.len(),
+            ReceiverFlavor::Tick(chan) => chan.len(),
+            ReceiverFlavor::Never(chan) => chan.len(),
+        }
+    }
+
+    /// If the channel is bounded, returns its capacity.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{bounded, unbounded};
+    ///
+    /// let (_, r) = unbounded::<i32>();
+    /// assert_eq!(r.capacity(), None);
+    ///
+    /// let (_, r) = bounded::<i32>(5);
+    /// assert_eq!(r.capacity(), Some(5));
+    ///
+    /// let (_, r) = bounded::<i32>(0);
+    /// assert_eq!(r.capacity(), Some(0));
+    /// ```
+    pub fn capacity(&self) -> Option<usize> {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.capacity(),
+            ReceiverFlavor::List(chan) => chan.capacity(),
+            ReceiverFlavor::Zero(chan) => chan.capacity(),
+            ReceiverFlavor::After(chan) => chan.capacity(),
+            ReceiverFlavor::Tick(chan) => chan.capacity(),
+            ReceiverFlavor::Never(chan) => chan.capacity(),
+        }
+    }
+
+    /// A blocking iterator over messages in the channel.
+    ///
+    /// Each call to [`next`] blocks waiting for the next message and then returns it. However, if
+    /// the channel becomes empty and disconnected, it returns [`None`] without blocking.
+    ///
+    /// [`next`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.next
+    /// [`None`]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.None
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     s.send(1).unwrap();
+    ///     s.send(2).unwrap();
+    ///     s.send(3).unwrap();
+    ///     drop(s); // Disconnect the channel.
+    /// });
+    ///
+    /// // Collect all messages from the channel.
+    /// // Note that the call to `collect` blocks until the sender is dropped.
+    /// let v: Vec<_> = r.iter().collect();
+    ///
+    /// assert_eq!(v, [1, 2, 3]);
+    /// ```
+    pub fn iter(&self) -> Iter<T> {
+        Iter { receiver: self }
+    }
+
+    /// A non-blocking iterator over messages in the channel.
+    ///
+    /// Each call to [`next`] returns a message if there is one ready to be received. The iterator
+    /// never blocks waiting for the next message.
+    ///
+    /// [`next`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.next
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded::<i32>();
+    ///
+    /// thread::spawn(move || {
+    ///     s.send(1).unwrap();
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s.send(2).unwrap();
+    ///     thread::sleep(Duration::from_secs(2));
+    ///     s.send(3).unwrap();
+    /// });
+    ///
+    /// thread::sleep(Duration::from_secs(2));
+    ///
+    /// // Collect all messages from the channel without blocking.
+    /// // The third message hasn't been sent yet so we'll collect only the first two.
+    /// let v: Vec<_> = r.try_iter().collect();
+    ///
+    /// assert_eq!(v, [1, 2]);
+    /// ```
+    pub fn try_iter(&self) -> TryIter<T> {
+        TryIter { receiver: self }
+    }
+}
+
+impl<T> Drop for Receiver<T> {
+    fn drop(&mut self) {
+        unsafe {
+            match &self.flavor {
+                ReceiverFlavor::Array(chan) => chan.release(|c| c.disconnect()),
+                ReceiverFlavor::List(chan) => chan.release(|c| c.disconnect()),
+                ReceiverFlavor::Zero(chan) => chan.release(|c| c.disconnect()),
+                ReceiverFlavor::After(_) => {},
+                ReceiverFlavor::Tick(_) => {},
+                ReceiverFlavor::Never(_) => {},
+            }
+        }
+    }
+}
+
+impl<T> Clone for Receiver<T> {
+    fn clone(&self) -> Self {
+        let flavor = match &self.flavor {
+            ReceiverFlavor::Array(chan) => ReceiverFlavor::Array(chan.acquire()),
+            ReceiverFlavor::List(chan) => ReceiverFlavor::List(chan.acquire()),
+            ReceiverFlavor::Zero(chan) => ReceiverFlavor::Zero(chan.acquire()),
+            ReceiverFlavor::After(chan) => ReceiverFlavor::After(chan.clone()),
+            ReceiverFlavor::Tick(chan) => ReceiverFlavor::Tick(chan.clone()),
+            ReceiverFlavor::Never(_) => ReceiverFlavor::Never(flavors::never::Channel::new()),
+        };
+
+        Receiver { flavor }
+    }
+}
+
+impl<T> fmt::Debug for Receiver<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Receiver { .. }")
+    }
+}
+
+impl<'a, T> IntoIterator for &'a Receiver<T> {
+    type Item = T;
+    type IntoIter = Iter<'a, T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<T> IntoIterator for Receiver<T> {
+    type Item = T;
+    type IntoIter = IntoIter<T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        IntoIter { receiver: self }
+    }
+}
+
+/// A blocking iterator over messages in a channel.
+///
+/// Each call to [`next`] blocks waiting for the next message and then returns it. However, if the
+/// channel becomes empty and disconnected, it returns [`None`] without blocking.
+///
+/// [`next`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.next
+/// [`None`]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.None
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s, r) = unbounded();
+///
+/// thread::spawn(move || {
+///     s.send(1).unwrap();
+///     s.send(2).unwrap();
+///     s.send(3).unwrap();
+///     drop(s); // Disconnect the channel.
+/// });
+///
+/// // Collect all messages from the channel.
+/// // Note that the call to `collect` blocks until the sender is dropped.
+/// let v: Vec<_> = r.iter().collect();
+///
+/// assert_eq!(v, [1, 2, 3]);
+/// ```
+pub struct Iter<'a, T: 'a> {
+    receiver: &'a Receiver<T>,
+}
+
+impl<'a, T> FusedIterator for Iter<'a, T> {}
+
+impl<'a, T> Iterator for Iter<'a, T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.receiver.recv().ok()
+    }
+}
+
+impl<'a, T> fmt::Debug for Iter<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Iter { .. }")
+    }
+}
+
+/// A non-blocking iterator over messages in a channel.
+///
+/// Each call to [`next`] returns a message if there is one ready to be received. The iterator
+/// never blocks waiting for the next message.
+///
+/// [`next`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.next
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s, r) = unbounded::<i32>();
+///
+/// thread::spawn(move || {
+///     s.send(1).unwrap();
+///     thread::sleep(Duration::from_secs(1));
+///     s.send(2).unwrap();
+///     thread::sleep(Duration::from_secs(2));
+///     s.send(3).unwrap();
+/// });
+///
+/// thread::sleep(Duration::from_secs(2));
+///
+/// // Collect all messages from the channel without blocking.
+/// // The third message hasn't been sent yet so we'll collect only the first two.
+/// let v: Vec<_> = r.try_iter().collect();
+///
+/// assert_eq!(v, [1, 2]);
+/// ```
+pub struct TryIter<'a, T: 'a> {
+    receiver: &'a Receiver<T>,
+}
+
+impl<'a, T> Iterator for TryIter<'a, T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.receiver.try_recv().ok()
+    }
+}
+
+impl<'a, T> fmt::Debug for TryIter<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("TryIter { .. }")
+    }
+}
+
+/// A blocking iterator over messages in a channel.
+///
+/// Each call to [`next`] blocks waiting for the next message and then returns it. However, if the
+/// channel becomes empty and disconnected, it returns [`None`] without blocking.
+///
+/// [`next`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.next
+/// [`None`]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.None
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s, r) = unbounded();
+///
+/// thread::spawn(move || {
+///     s.send(1).unwrap();
+///     s.send(2).unwrap();
+///     s.send(3).unwrap();
+///     drop(s); // Disconnect the channel.
+/// });
+///
+/// // Collect all messages from the channel.
+/// // Note that the call to `collect` blocks until the sender is dropped.
+/// let v: Vec<_> = r.into_iter().collect();
+///
+/// assert_eq!(v, [1, 2, 3]);
+/// ```
+pub struct IntoIter<T> {
+    receiver: Receiver<T>,
+}
+
+impl<T> FusedIterator for IntoIter<T> {}
+
+impl<T> Iterator for IntoIter<T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.receiver.recv().ok()
+    }
+}
+
+impl<T> fmt::Debug for IntoIter<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("IntoIter { .. }")
+    }
+}
+
+impl<T> SelectHandle for Sender<T> {
+    fn try_select(&self, token: &mut Token) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().try_select(token),
+            SenderFlavor::List(chan) => chan.sender().try_select(token),
+            SenderFlavor::Zero(chan) => chan.sender().try_select(token),
+        }
+    }
+
+    fn deadline(&self) -> Option<Instant> {
+        None
+    }
+
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().register(oper, cx),
+            SenderFlavor::List(chan) => chan.sender().register(oper, cx),
+            SenderFlavor::Zero(chan) => chan.sender().register(oper, cx),
+        }
+    }
+
+    fn unregister(&self, oper: Operation) {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().unregister(oper),
+            SenderFlavor::List(chan) => chan.sender().unregister(oper),
+            SenderFlavor::Zero(chan) => chan.sender().unregister(oper),
+        }
+    }
+
+    fn accept(&self, token: &mut Token, cx: &Context) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().accept(token, cx),
+            SenderFlavor::List(chan) => chan.sender().accept(token, cx),
+            SenderFlavor::Zero(chan) => chan.sender().accept(token, cx),
+        }
+    }
+
+    fn is_ready(&self) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().is_ready(),
+            SenderFlavor::List(chan) => chan.sender().is_ready(),
+            SenderFlavor::Zero(chan) => chan.sender().is_ready(),
+        }
+    }
+
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().watch(oper, cx),
+            SenderFlavor::List(chan) => chan.sender().watch(oper, cx),
+            SenderFlavor::Zero(chan) => chan.sender().watch(oper, cx),
+        }
+    }
+
+    fn unwatch(&self, oper: Operation) {
+        match &self.flavor {
+            SenderFlavor::Array(chan) => chan.sender().unwatch(oper),
+            SenderFlavor::List(chan) => chan.sender().unwatch(oper),
+            SenderFlavor::Zero(chan) => chan.sender().unwatch(oper),
+        }
+    }
+}
+
+impl<T> SelectHandle for Receiver<T> {
+    fn try_select(&self, token: &mut Token) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().try_select(token),
+            ReceiverFlavor::List(chan) => chan.receiver().try_select(token),
+            ReceiverFlavor::Zero(chan) => chan.receiver().try_select(token),
+            ReceiverFlavor::After(chan) => chan.try_select(token),
+            ReceiverFlavor::Tick(chan) => chan.try_select(token),
+            ReceiverFlavor::Never(chan) => chan.try_select(token),
+        }
+    }
+
+    fn deadline(&self) -> Option<Instant> {
+        match &self.flavor {
+            ReceiverFlavor::Array(_) => None,
+            ReceiverFlavor::List(_) => None,
+            ReceiverFlavor::Zero(_) => None,
+            ReceiverFlavor::After(chan) => chan.deadline(),
+            ReceiverFlavor::Tick(chan) => chan.deadline(),
+            ReceiverFlavor::Never(chan) => chan.deadline(),
+        }
+    }
+
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().register(oper, cx),
+            ReceiverFlavor::List(chan) => chan.receiver().register(oper, cx),
+            ReceiverFlavor::Zero(chan) => chan.receiver().register(oper, cx),
+            ReceiverFlavor::After(chan) => chan.register(oper, cx),
+            ReceiverFlavor::Tick(chan) => chan.register(oper, cx),
+            ReceiverFlavor::Never(chan) => chan.register(oper, cx),
+        }
+    }
+
+    fn unregister(&self, oper: Operation) {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().unregister(oper),
+            ReceiverFlavor::List(chan) => chan.receiver().unregister(oper),
+            ReceiverFlavor::Zero(chan) => chan.receiver().unregister(oper),
+            ReceiverFlavor::After(chan) => chan.unregister(oper),
+            ReceiverFlavor::Tick(chan) => chan.unregister(oper),
+            ReceiverFlavor::Never(chan) => chan.unregister(oper),
+        }
+    }
+
+    fn accept(&self, token: &mut Token, cx: &Context) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().accept(token, cx),
+            ReceiverFlavor::List(chan) => chan.receiver().accept(token, cx),
+            ReceiverFlavor::Zero(chan) => chan.receiver().accept(token, cx),
+            ReceiverFlavor::After(chan) => chan.accept(token, cx),
+            ReceiverFlavor::Tick(chan) => chan.accept(token, cx),
+            ReceiverFlavor::Never(chan) => chan.accept(token, cx),
+        }
+    }
+
+    fn is_ready(&self) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().is_ready(),
+            ReceiverFlavor::List(chan) => chan.receiver().is_ready(),
+            ReceiverFlavor::Zero(chan) => chan.receiver().is_ready(),
+            ReceiverFlavor::After(chan) => chan.is_ready(),
+            ReceiverFlavor::Tick(chan) => chan.is_ready(),
+            ReceiverFlavor::Never(chan) => chan.is_ready(),
+        }
+    }
+
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().watch(oper, cx),
+            ReceiverFlavor::List(chan) => chan.receiver().watch(oper, cx),
+            ReceiverFlavor::Zero(chan) => chan.receiver().watch(oper, cx),
+            ReceiverFlavor::After(chan) => chan.watch(oper, cx),
+            ReceiverFlavor::Tick(chan) => chan.watch(oper, cx),
+            ReceiverFlavor::Never(chan) => chan.watch(oper, cx),
+        }
+    }
+
+    fn unwatch(&self, oper: Operation) {
+        match &self.flavor {
+            ReceiverFlavor::Array(chan) => chan.receiver().unwatch(oper),
+            ReceiverFlavor::List(chan) => chan.receiver().unwatch(oper),
+            ReceiverFlavor::Zero(chan) => chan.receiver().unwatch(oper),
+            ReceiverFlavor::After(chan) => chan.unwatch(oper),
+            ReceiverFlavor::Tick(chan) => chan.unwatch(oper),
+            ReceiverFlavor::Never(chan) => chan.unwatch(oper),
+        }
+    }
+}
+
+/// Writes a message into the channel.
+pub unsafe fn write<T>(s: &Sender<T>, token: &mut Token, msg: T) -> Result<(), T> {
+    match &s.flavor {
+        SenderFlavor::Array(chan) => chan.write(token, msg),
+        SenderFlavor::List(chan) => chan.write(token, msg),
+        SenderFlavor::Zero(chan) => chan.write(token, msg),
+    }
+}
+
+/// Reads a message from the channel.
+pub unsafe fn read<T>(r: &Receiver<T>, token: &mut Token) -> Result<T, ()> {
+    match &r.flavor {
+        ReceiverFlavor::Array(chan) => chan.read(token),
+        ReceiverFlavor::List(chan) => chan.read(token),
+        ReceiverFlavor::Zero(chan) => chan.read(token),
+        ReceiverFlavor::After(chan) => {
+            mem::transmute_copy::<Result<Instant, ()>, Result<T, ()>>(&chan.read(token))
+        }
+        ReceiverFlavor::Tick(chan) => {
+            mem::transmute_copy::<Result<Instant, ()>, Result<T, ()>>(&chan.read(token))
+        }
+        ReceiverFlavor::Never(chan) => chan.read(token),
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/context.rs cargo-0.33.0/vendor/crossbeam-channel/src/context.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/context.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/context.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,189 @@
+//! Thread-local context used in select.
+
+use std::cell::Cell;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use std::thread::{self, Thread, ThreadId};
+use std::time::Instant;
+
+use crossbeam_utils::Backoff;
+
+use select::Selected;
+
+/// Thread-local context used in select.
+#[derive(Clone)]
+pub struct Context {
+    inner: Arc<Inner>,
+}
+
+/// Inner representation of `Context`.
+struct Inner {
+    /// Selected operation.
+    select: AtomicUsize,
+
+    /// A slot into which another thread may store a pointer to its `Packet`.
+    packet: AtomicUsize,
+
+    /// Thread handle.
+    thread: Thread,
+
+    /// Thread id.
+    thread_id: ThreadId,
+}
+
+impl Context {
+    /// Creates a new context for the duration of the closure.
+    #[inline]
+    pub fn with<F, R>(f: F) -> R
+    where
+        F: FnOnce(&Context) -> R,
+    {
+        thread_local! {
+            /// Cached thread-local context.
+            static CONTEXT: Cell<Option<Context>> = Cell::new(Some(Context::new()));
+        }
+
+        let mut f = Some(f);
+        let mut f = move |cx: &Context| -> R {
+            let f = f.take().unwrap();
+            f(cx)
+        };
+
+        CONTEXT
+            .try_with(|cell| match cell.take() {
+                None => f(&Context::new()),
+                Some(cx) => {
+                    cx.reset();
+                    let res = f(&cx);
+                    cell.set(Some(cx));
+                    res
+                }
+            }).unwrap_or_else(|_| f(&Context::new()))
+    }
+
+    /// Creates a new `Context`.
+    #[cold]
+    fn new() -> Context {
+        Context {
+            inner: Arc::new(Inner {
+                select: AtomicUsize::new(Selected::Waiting.into()),
+                packet: AtomicUsize::new(0),
+                thread: thread::current(),
+                thread_id: thread::current().id(),
+            }),
+        }
+    }
+
+    /// Resets `select` and `packet`.
+    #[inline]
+    fn reset(&self) {
+        self.inner
+            .select
+            .store(Selected::Waiting.into(), Ordering::Release);
+        self.inner.packet.store(0, Ordering::Release);
+    }
+
+    /// Attempts to select an operation.
+    ///
+    /// On failure, the previously selected operation is returned.
+    #[inline]
+    pub fn try_select(&self, select: Selected) -> Result<(), Selected> {
+        self.inner
+            .select
+            .compare_exchange(
+                Selected::Waiting.into(),
+                select.into(),
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .map(|_| ())
+            .map_err(|e| e.into())
+    }
+
+    /// Returns the selected operation.
+    #[inline]
+    pub fn selected(&self) -> Selected {
+        Selected::from(self.inner.select.load(Ordering::Acquire))
+    }
+
+    /// Stores a packet.
+    ///
+    /// This method must be called after `try_select` succeeds and there is a packet to provide.
+    #[inline]
+    pub fn store_packet(&self, packet: usize) {
+        if packet != 0 {
+            self.inner.packet.store(packet, Ordering::Release);
+        }
+    }
+
+    /// Waits until a packet is provided and returns it.
+    #[inline]
+    pub fn wait_packet(&self) -> usize {
+        let backoff = Backoff::new();
+        loop {
+            let packet = self.inner.packet.load(Ordering::Acquire);
+            if packet != 0 {
+                return packet;
+            }
+            backoff.snooze();
+        }
+    }
+
+    /// Waits until an operation is selected and returns it.
+    ///
+    /// If the deadline is reached, `Selected::Aborted` will be selected.
+    #[inline]
+    pub fn wait_until(&self, deadline: Option<Instant>) -> Selected {
+        // Spin for a short time, waiting until an operation is selected.
+        let backoff = Backoff::new();
+        loop {
+            let sel = Selected::from(self.inner.select.load(Ordering::Acquire));
+            if sel != Selected::Waiting {
+                return sel;
+            }
+
+            if backoff.is_completed() {
+                break;
+            } else {
+                backoff.snooze();
+            }
+        }
+
+        loop {
+            // Check whether an operation has been selected.
+            let sel = Selected::from(self.inner.select.load(Ordering::Acquire));
+            if sel != Selected::Waiting {
+                return sel;
+            }
+
+            // If there's a deadline, park the current thread until the deadline is reached.
+            if let Some(end) = deadline {
+                let now = Instant::now();
+
+                if now < end {
+                    thread::park_timeout(end - now);
+                } else {
+                    // The deadline has been reached. Try aborting select.
+                    return match self.try_select(Selected::Aborted) {
+                        Ok(()) => Selected::Aborted,
+                        Err(s) => s,
+                    };
+                }
+            } else {
+                thread::park();
+            }
+        }
+    }
+
+    /// Unparks the thread this context belongs to.
+    #[inline]
+    pub fn unpark(&self) {
+        self.inner.thread.unpark();
+    }
+
+    /// Returns the id of the thread this context belongs to.
+    #[inline]
+    pub fn thread_id(&self) -> ThreadId {
+        self.inner.thread_id
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/counter.rs cargo-0.33.0/vendor/crossbeam-channel/src/counter.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/counter.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/counter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,132 @@
+///! Reference counter for channels.
+
+use std::isize;
+use std::ops;
+use std::process;
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+
+/// Reference counter internals.
+struct Counter<C> {
+    /// The number of senders associated with the channel.
+    senders: AtomicUsize,
+
+    /// The number of receivers associated with the channel.
+    receivers: AtomicUsize,
+
+    /// If `true`, either the sending or receiving side has been dropped.
+    disconnected: AtomicBool,
+
+    /// The internal channel.
+    chan: C,
+}
+
+/// Wraps a channel into the reference counter.
+pub fn new<C>(chan: C) -> (Sender<C>, Receiver<C>) {
+    let counter = Box::into_raw(Box::new(Counter {
+        senders: AtomicUsize::new(1),
+        receivers: AtomicUsize::new(1),
+        disconnected: AtomicBool::new(false),
+        chan,
+    }));
+    let s = Sender { counter };
+    let r = Receiver { counter };
+    (s, r)
+}
+
+/// The sending side.
+pub struct Sender<C> {
+    counter: *mut Counter<C>,
+}
+
+impl<C> Sender<C> {
+    /// Returns the internal `Counter`.
+    fn counter(&self) -> &Counter<C> {
+        unsafe { &*self.counter }
+    }
+
+    /// Acquires another sender reference.
+    pub fn acquire(&self) -> Sender<C> {
+        let count = self.counter().senders.fetch_add(1, Ordering::Relaxed);
+
+        // Cloning senders and calling `mem::forget` on the clones could potentially overflow the
+        // counter. It's very difficult to recover sensibly from such degenerate scenarios so we
+        // just abort when the count becomes very large.
+        if count > isize::MAX as usize {
+            process::abort();
+        }
+
+        Sender {
+            counter: self.counter,
+        }
+    }
+
+    /// Releases the sender reference.
+    ///
+    /// Function `f` will be called if this is the last sender reference.
+    pub unsafe fn release<F: FnOnce(&C)>(&self, f: F) {
+        if self.counter().senders.fetch_sub(1, Ordering::AcqRel) == 1 {
+            f(&self.counter().chan);
+
+            if self.counter().disconnected.swap(true, Ordering::AcqRel) {
+                drop(Box::from_raw(self.counter));
+            }
+        }
+    }
+}
+
+impl<C> ops::Deref for Sender<C> {
+    type Target = C;
+
+    fn deref(&self) -> &C {
+        &self.counter().chan
+    }
+}
+
+/// The receiving side.
+pub struct Receiver<C> {
+    counter: *mut Counter<C>,
+}
+
+impl<C> Receiver<C> {
+    /// Returns the internal `Counter`.
+    fn counter(&self) -> &Counter<C> {
+        unsafe { &*self.counter }
+    }
+
+    /// Acquires another receiver reference.
+    pub fn acquire(&self) -> Receiver<C> {
+        let count = self.counter().receivers.fetch_add(1, Ordering::Relaxed);
+
+        // Cloning receivers and calling `mem::forget` on the clones could potentially overflow the
+        // counter. It's very difficult to recover sensibly from such degenerate scenarios so we
+        // just abort when the count becomes very large.
+        if count > isize::MAX as usize {
+            process::abort();
+        }
+
+        Receiver {
+            counter: self.counter,
+        }
+    }
+
+    /// Releases the receiver reference.
+    ///
+    /// Function `f` will be called if this is the last receiver reference.
+    pub unsafe fn release<F: FnOnce(&C)>(&self, f: F) {
+        if self.counter().receivers.fetch_sub(1, Ordering::AcqRel) == 1 {
+            f(&self.counter().chan);
+
+            if self.counter().disconnected.swap(true, Ordering::AcqRel) {
+                drop(Box::from_raw(self.counter));
+            }
+        }
+    }
+}
+
+impl<C> ops::Deref for Receiver<C> {
+    type Target = C;
+
+    fn deref(&self) -> &C {
+        &self.counter().chan
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/err.rs cargo-0.33.0/vendor/crossbeam-channel/src/err.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/err.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/err.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,451 @@
+use std::error;
+use std::fmt;
+
+/// An error returned from the [`send`] method.
+///
+/// The message could not be sent because the channel is disconnected.
+///
+/// The error contains the message so it can be recovered.
+///
+/// [`send`]: struct.Sender.html#method.send
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub struct SendError<T>(pub T);
+
+/// An error returned from the [`try_send`] method.
+///
+/// The error contains the message being sent so it can be recovered.
+///
+/// [`try_send`]: struct.Sender.html#method.try_send
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub enum TrySendError<T> {
+    /// The message could not be sent because the channel is full.
+    ///
+    /// If this is a zero-capacity channel, then the error indicates that there was no receiver
+    /// available to receive the message at the time.
+    Full(T),
+
+    /// The message could not be sent because the channel is disconnected.
+    Disconnected(T),
+}
+
+/// An error returned from the [`send_timeout`] method.
+///
+/// The error contains the message being sent so it can be recovered.
+///
+/// [`send_timeout`]: struct.Sender.html#method.send_timeout
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub enum SendTimeoutError<T> {
+    /// The message could not be sent because the channel is full and the operation timed out.
+    ///
+    /// If this is a zero-capacity channel, then the error indicates that there was no receiver
+    /// available to receive the message and the operation timed out.
+    Timeout(T),
+
+    /// The message could not be sent because the channel is disconnected.
+    Disconnected(T),
+}
+
+/// An error returned from the [`recv`] method.
+///
+/// A message could not be received because the channel is empty and disconnected.
+///
+/// [`recv`]: struct.Receiver.html#method.recv
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub struct RecvError;
+
+/// An error returned from the [`try_recv`] method.
+///
+/// [`try_recv`]: struct.Receiver.html#method.recv
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub enum TryRecvError {
+    /// A message could not be received because the channel is empty.
+    ///
+    /// If this is a zero-capacity channel, then the error indicates that there was no sender
+    /// available to send a message at the time.
+    Empty,
+
+    /// The message could not be received because the channel is empty and disconnected.
+    Disconnected,
+}
+
+/// An error returned from the [`recv_timeout`] method.
+///
+/// [`recv_timeout`]: struct.Receiver.html#method.recv_timeout
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub enum RecvTimeoutError {
+    /// A message could not be received because the channel is empty and the operation timed out.
+    ///
+    /// If this is a zero-capacity channel, then the error indicates that there was no sender
+    /// available to send a message and the operation timed out.
+    Timeout,
+
+    /// The message could not be received because the channel is empty and disconnected.
+    Disconnected,
+}
+
+/// An error returned from the [`try_select`] method.
+///
+/// Failed because none of the channel operations were ready.
+///
+/// [`try_select`]: struct.Select.html#method.try_select
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub struct TrySelectError;
+
+/// An error returned from the [`select_timeout`] method.
+///
+/// Failed because none of the channel operations became ready before the timeout.
+///
+/// [`select_timeout`]: struct.Select.html#method.select_timeout
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub struct SelectTimeoutError;
+
+/// An error returned from the [`try_ready`] method.
+///
+/// Failed because none of the channel operations were ready.
+///
+/// [`try_ready`]: struct.Select.html#method.try_ready
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub struct TryReadyError;
+
+/// An error returned from the [`ready_timeout`] method.
+///
+/// Failed because none of the channel operations became ready before the timeout.
+///
+/// [`ready_timeout`]: struct.Select.html#method.ready_timeout
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub struct ReadyTimeoutError;
+
+impl<T> fmt::Debug for SendError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "SendError(..)".fmt(f)
+    }
+}
+
+impl<T> fmt::Display for SendError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "sending on a disconnected channel".fmt(f)
+    }
+}
+
+impl<T: Send> error::Error for SendError<T> {
+    fn description(&self) -> &str {
+        "sending on a disconnected channel"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl<T> SendError<T> {
+    /// Unwraps the message.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    /// drop(r);
+    ///
+    /// if let Err(err) = s.send("foo") {
+    ///     assert_eq!(err.into_inner(), "foo");
+    /// }
+    /// ```
+    pub fn into_inner(self) -> T {
+        self.0
+    }
+}
+
+impl<T> fmt::Debug for TrySendError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            TrySendError::Full(..) => "Full(..)".fmt(f),
+            TrySendError::Disconnected(..) => "Disconnected(..)".fmt(f),
+        }
+    }
+}
+
+impl<T> fmt::Display for TrySendError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            TrySendError::Full(..) => "sending on a full channel".fmt(f),
+            TrySendError::Disconnected(..) => "sending on a disconnected channel".fmt(f),
+        }
+    }
+}
+
+impl<T: Send> error::Error for TrySendError<T> {
+    fn description(&self) -> &str {
+        match *self {
+            TrySendError::Full(..) => "sending on a full channel",
+            TrySendError::Disconnected(..) => "sending on a disconnected channel",
+        }
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl<T> From<SendError<T>> for TrySendError<T> {
+    fn from(err: SendError<T>) -> TrySendError<T> {
+        match err {
+            SendError(t) => TrySendError::Disconnected(t),
+        }
+    }
+}
+
+impl<T> TrySendError<T> {
+    /// Unwraps the message.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::bounded;
+    ///
+    /// let (s, r) = bounded(0);
+    ///
+    /// if let Err(err) = s.try_send("foo") {
+    ///     assert_eq!(err.into_inner(), "foo");
+    /// }
+    /// ```
+    pub fn into_inner(self) -> T {
+        match self {
+            TrySendError::Full(v) => v,
+            TrySendError::Disconnected(v) => v,
+        }
+    }
+
+    /// Returns `true` if the send operation failed because the channel is full.
+    pub fn is_full(&self) -> bool {
+        match self {
+            TrySendError::Full(_) => true,
+            _ => false,
+        }
+    }
+
+    /// Returns `true` if the send operation failed because the channel is disconnected.
+    pub fn is_disconnected(&self) -> bool {
+        match self {
+            TrySendError::Disconnected(_) => true,
+            _ => false,
+        }
+    }
+}
+
+impl<T> fmt::Debug for SendTimeoutError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "SendTimeoutError(..)".fmt(f)
+    }
+}
+
+impl<T> fmt::Display for SendTimeoutError<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            SendTimeoutError::Timeout(..) => "timed out waiting on send operation".fmt(f),
+            SendTimeoutError::Disconnected(..) => "sending on a disconnected channel".fmt(f),
+        }
+    }
+}
+
+impl<T: Send> error::Error for SendTimeoutError<T> {
+    fn description(&self) -> &str {
+        "sending on an empty and disconnected channel"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl<T> From<SendError<T>> for SendTimeoutError<T> {
+    fn from(err: SendError<T>) -> SendTimeoutError<T> {
+        match err {
+            SendError(e) => SendTimeoutError::Disconnected(e),
+        }
+    }
+}
+
+impl<T> SendTimeoutError<T> {
+    /// Unwraps the message.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::time::Duration;
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, r) = unbounded();
+    ///
+    /// if let Err(err) = s.send_timeout("foo", Duration::from_secs(1)) {
+    ///     assert_eq!(err.into_inner(), "foo");
+    /// }
+    /// ```
+    pub fn into_inner(self) -> T {
+        match self {
+            SendTimeoutError::Timeout(v) => v,
+            SendTimeoutError::Disconnected(v) => v,
+        }
+    }
+
+    /// Returns `true` if the send operation timed out.
+    pub fn is_timeout(&self) -> bool {
+        match self {
+            SendTimeoutError::Timeout(_) => true,
+            _ => false,
+        }
+    }
+
+    /// Returns `true` if the send operation failed because the channel is disconnected.
+    pub fn is_disconnected(&self) -> bool {
+        match self {
+            SendTimeoutError::Disconnected(_) => true,
+            _ => false,
+        }
+    }
+}
+
+impl fmt::Display for RecvError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "receiving on an empty and disconnected channel".fmt(f)
+    }
+}
+
+impl error::Error for RecvError {
+    fn description(&self) -> &str {
+        "receiving on an empty and disconnected channel"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl fmt::Display for TryRecvError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            TryRecvError::Empty => "receiving on an empty channel".fmt(f),
+            TryRecvError::Disconnected => "receiving on an empty and disconnected channel".fmt(f),
+        }
+    }
+}
+
+impl error::Error for TryRecvError {
+    fn description(&self) -> &str {
+        match *self {
+            TryRecvError::Empty => "receiving on an empty channel",
+            TryRecvError::Disconnected => "receiving on an empty and disconnected channel",
+        }
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl From<RecvError> for TryRecvError {
+    fn from(err: RecvError) -> TryRecvError {
+        match err {
+            RecvError => TryRecvError::Disconnected,
+        }
+    }
+}
+
+impl TryRecvError {
+    /// Returns `true` if the receive operation failed because the channel is empty.
+    pub fn is_empty(&self) -> bool {
+        match self {
+            TryRecvError::Empty => true,
+            _ => false,
+        }
+    }
+
+    /// Returns `true` if the receive operation failed because the channel is disconnected.
+    pub fn is_disconnected(&self) -> bool {
+        match self {
+            TryRecvError::Disconnected => true,
+            _ => false,
+        }
+    }
+}
+
+impl fmt::Display for RecvTimeoutError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            RecvTimeoutError::Timeout => "timed out waiting on receive operation".fmt(f),
+            RecvTimeoutError::Disconnected => "channel is empty and disconnected".fmt(f),
+        }
+    }
+}
+
+impl error::Error for RecvTimeoutError {
+    fn description(&self) -> &str {
+        match *self {
+            RecvTimeoutError::Timeout => "timed out waiting on receive operation",
+            RecvTimeoutError::Disconnected => "channel is empty and disconnected",
+        }
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl From<RecvError> for RecvTimeoutError {
+    fn from(err: RecvError) -> RecvTimeoutError {
+        match err {
+            RecvError => RecvTimeoutError::Disconnected,
+        }
+    }
+}
+
+impl RecvTimeoutError {
+    /// Returns `true` if the receive operation timed out.
+    pub fn is_timeout(&self) -> bool {
+        match self {
+            RecvTimeoutError::Timeout => true,
+            _ => false,
+        }
+    }
+
+    /// Returns `true` if the receive operation failed because the channel is disconnected.
+    pub fn is_disconnected(&self) -> bool {
+        match self {
+            RecvTimeoutError::Disconnected => true,
+            _ => false,
+        }
+    }
+}
+
+impl fmt::Display for TrySelectError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "all operations in select would block".fmt(f)
+    }
+}
+
+impl error::Error for TrySelectError {
+    fn description(&self) -> &str {
+        "all operations in select would block"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
+
+impl fmt::Display for SelectTimeoutError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "timed out waiting on select".fmt(f)
+    }
+}
+
+impl error::Error for SelectTimeoutError {
+    fn description(&self) -> &str {
+        "timed out waiting on select"
+    }
+
+    fn cause(&self) -> Option<&error::Error> {
+        None
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/after.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/after.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/after.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/after.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2,17 +2,14 @@
 //!
 //! Messages cannot be sent into this kind of channel; they are materialized on demand.
 
-use std::mem;
-use std::ptr;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::thread;
 use std::time::{Duration, Instant};
 
-use internal::channel::RecvNonblocking;
-use internal::context::Context;
-use internal::select::{Operation, SelectHandle, Token};
-use internal::utils;
+use context::Context;
+use err::{RecvTimeoutError, TryRecvError};
+use select::{Operation, SelectHandle, Token};
+use utils;
 
 /// Result of a receive operation.
 pub type AfterToken = Option<Instant>;
@@ -20,14 +17,10 @@
 /// Channel that delivers a message after a certain amount of time.
 pub struct Channel {
     /// The instant at which the message will be delivered.
-    deadline: Instant,
+    delivery_time: Instant,
 
-    /// The pointer to a lazily initialized boolean flag, which becomes `true` when the message
-    /// gets received.
-    ///
-    /// This `AtomicPtr` holds the raw value of an `Arc<AtomicBool>`.
-    // TODO: Use `AtomicPtr<AtomicCell<bool>>` here once we implement `AtomicCell`.
-    ptr: AtomicPtr<AtomicBool>,
+    /// `true` if the message has been received.
+    received: AtomicBool,
 }
 
 impl Channel {
@@ -35,119 +28,105 @@
     #[inline]
     pub fn new(dur: Duration) -> Self {
         Channel {
-            deadline: Instant::now() + dur,
-            ptr: AtomicPtr::new(ptr::null_mut()),
+            delivery_time: Instant::now() + dur,
+            received: AtomicBool::new(false),
         }
     }
 
-    /// Returns a unique identifier for the channel.
+    /// Attempts to receive a message without blocking.
     #[inline]
-    pub fn channel_id(&self) -> usize {
-        self.flag() as *const AtomicBool as usize
-    }
+    pub fn try_recv(&self) -> Result<Instant, TryRecvError> {
+        // We use relaxed ordering because this is just an optional optimistic check.
+        if self.received.load(Ordering::Relaxed) {
+            // The message has already been received.
+            return Err(TryRecvError::Empty);
+        }
 
-    /// Returns the flag associated with this channel.
-    ///
-    /// The flag will be allocated on the heap and initialized with `false` on the first call to
-    /// this method.
-    #[inline]
-    fn flag(&self) -> &AtomicBool {
-        let mut ptr = self.ptr.load(Ordering::Acquire);
-        loop {
-            if !ptr.is_null() {
-                return unsafe { &*(ptr as *const AtomicBool) };
-            }
+        if Instant::now() < self.delivery_time {
+            // The message was not delivered yet.
+            return Err(TryRecvError::Empty);
+        }
 
-            // Try initializing the flag.
-            let new = Arc::into_raw(Arc::new(AtomicBool::new(false))) as *mut AtomicBool;
-            let old = self.ptr.compare_and_swap(ptr::null_mut(), new, Ordering::AcqRel);
-
-            if old.is_null() {
-                // The flag was successfully initialized.
-                ptr = new;
-            } else {
-                // Another thread has initialized the flag before us.
-                ptr = old;
-                unsafe { drop(Arc::<AtomicBool>::from_raw(new)) }
-            }
+        // Try receiving the message if it is still available.
+        if !self.received.swap(true, Ordering::SeqCst) {
+            // Success! Return delivery time as the message.
+            Ok(self.delivery_time)
+        } else {
+            // The message was already received.
+            Err(TryRecvError::Empty)
         }
     }
 
     /// Receives a message from the channel.
     #[inline]
-    pub fn recv(&self) -> Option<Instant> {
-        if self.flag().load(Ordering::SeqCst) {
-            // If the message was already received, block forever.
-            utils::sleep_forever();
+    pub fn recv(&self, deadline: Option<Instant>) -> Result<Instant, RecvTimeoutError> {
+        // We use relaxed ordering because this is just an optional optimistic check.
+        if self.received.load(Ordering::Relaxed) {
+            // The message has already been received.
+            utils::sleep_until(deadline);
+            return Err(RecvTimeoutError::Timeout);
         }
 
-        // Wait until the deadline.
+        // Wait until the message is received or the deadline is reached.
         loop {
             let now = Instant::now();
-            if now >= self.deadline {
+
+            // Check if we can receive the next message.
+            if now >= self.delivery_time {
                 break;
             }
-            thread::sleep(self.deadline - now);
-        }
-
-        // Try consuming the message if it is still available.
-        if !self.flag().swap(true, Ordering::SeqCst) {
-            // Success! Return the message, which is the instant at which it was "sent".
-            Some(self.deadline)
-        } else {
-            // The message was already received. Block forever.
-            utils::sleep_forever();
-        }
-    }
 
-    /// Attempts to receive a message without blocking.
-    #[inline]
-    pub fn recv_nonblocking(&self) -> RecvNonblocking<Instant> {
-        // We use relaxed ordering because this is just an optional optimistic check.
-        if !self.ptr.load(Ordering::Relaxed).is_null() && self.flag().load(Ordering::SeqCst) {
-            // The message was already received.
-            return RecvNonblocking::Empty;
-        }
+            // Check if the deadline has been reached.
+            if let Some(d) = deadline {
+                if now >= d {
+                    return Err(RecvTimeoutError::Timeout);
+                }
 
-        if Instant::now() < self.deadline {
-            // The message was not "sent" yet.
-            return RecvNonblocking::Empty;
+                thread::sleep(self.delivery_time.min(d) - now);
+            } else {
+                thread::sleep(self.delivery_time - now);
+            }
         }
 
-        // Try consuming the message if it is still available.
-        if !self.flag().swap(true, Ordering::SeqCst) {
-            // Success! Return the message, which is the instant at which it was "sent".
-            RecvNonblocking::Message(self.deadline)
+        // Try receiving the message if it is still available.
+        if !self.received.swap(true, Ordering::SeqCst) {
+            // Success! Return the message, which is the instant at which it was delivered.
+            Ok(self.delivery_time)
         } else {
-            // The message was already received.
-            RecvNonblocking::Empty
+            // The message was already received. Block forever.
+            utils::sleep_until(None);
+            unreachable!()
         }
     }
 
     /// Reads a message from the channel.
     #[inline]
-    pub unsafe fn read(&self, token: &mut Token) -> Option<Instant> {
-        token.after
+    pub unsafe fn read(&self, token: &mut Token) -> Result<Instant, ()> {
+        token.after.ok_or(())
     }
 
     /// Returns `true` if the channel is empty.
     #[inline]
     pub fn is_empty(&self) -> bool {
-        let flag = self.flag();
-
-        // First, check whether the message was already received to avoid the expensive
-        // `Instant::now()` call.
-        if flag.load(Ordering::SeqCst) {
+        // We use relaxed ordering because this is just an optional optimistic check.
+        if self.received.load(Ordering::Relaxed) {
             return true;
         }
 
-        // If the deadline hasn't been reached yet, the channel is empty.
-        if Instant::now() < self.deadline {
+        // If the delivery time hasn't been reached yet, the channel is empty.
+        if Instant::now() < self.delivery_time {
             return true;
         }
 
-        // The deadline has been reached. The channel is empty only if the message was received.
-        flag.load(Ordering::SeqCst)
+        // The delivery time has been reached. The channel is empty only if the message has already
+        // been received.
+        self.received.load(Ordering::SeqCst)
+    }
+
+    /// Returns `true` if the channel is full.
+    #[inline]
+    pub fn is_full(&self) -> bool {
+        !self.is_empty()
     }
 
     /// Returns the number of messages in the channel.
@@ -167,65 +146,35 @@
     }
 }
 
-impl Drop for Channel {
-    #[inline]
-    fn drop(&mut self) {
-        // Destroy the `Arc<AtomicBool>` if it was initialized.
-        let ptr = self.ptr.load(Ordering::Relaxed);
-        if !ptr.is_null() {
-            unsafe { drop(Arc::<AtomicBool>::from_raw(ptr)); }
-        }
-    }
-}
-
-impl Clone for Channel {
-    #[inline]
-    fn clone(&self) -> Channel {
-        let flag = self.flag();
-
-        // Increment the reference count.
-        let arc = unsafe { Arc::<AtomicBool>::from_raw(flag) };
-        mem::forget(arc.clone());
-        mem::forget(arc);
-
-        Channel {
-            deadline: self.deadline,
-            ptr: AtomicPtr::new(flag as *const AtomicBool as *mut AtomicBool),
-        }
-    }
-}
-
 impl SelectHandle for Channel {
     #[inline]
-    fn try(&self, token: &mut Token) -> bool {
-        match self.recv_nonblocking() {
-            RecvNonblocking::Message(msg) => {
+    fn try_select(&self, token: &mut Token) -> bool {
+        match self.try_recv() {
+            Ok(msg) => {
                 token.after = Some(msg);
                 true
             }
-            RecvNonblocking::Closed => {
+            Err(TryRecvError::Disconnected) => {
                 token.after = None;
                 true
             }
-            RecvNonblocking::Empty => {
-                false
-            }
+            Err(TryRecvError::Empty) => false,
         }
     }
 
     #[inline]
-    fn retry(&self, token: &mut Token) -> bool {
-        self.try(token)
-    }
-
-    #[inline]
     fn deadline(&self) -> Option<Instant> {
-        Some(self.deadline)
+        // We use relaxed ordering because this is just an optional optimistic check.
+        if self.received.load(Ordering::Relaxed) {
+            None
+        } else {
+            Some(self.delivery_time)
+        }
     }
 
     #[inline]
-    fn register(&self, _token: &mut Token, _oper: Operation, _cx: &Context) -> bool {
-        true
+    fn register(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
     }
 
     #[inline]
@@ -233,18 +182,19 @@
 
     #[inline]
     fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
-        self.try(token)
+        self.try_select(token)
     }
 
     #[inline]
-    fn state(&self) -> usize {
-        // Return 1 if the deadline has been reached and 0 otherwise.
-        if self.flag().load(Ordering::SeqCst) {
-            1
-        } else if Instant::now() < self.deadline {
-            0
-        } else {
-            1
-        }
+    fn is_ready(&self) -> bool {
+        !self.is_empty()
+    }
+
+    #[inline]
+    fn watch(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
     }
+
+    #[inline]
+    fn unwatch(&self, _oper: Operation) {}
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/array.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/array.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/array.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/array.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,33 +1,38 @@
 //! Bounded channel based on a preallocated array.
 //!
 //! This flavor has a fixed, positive capacity.
+//!
+//! The implementation is based on Dmitry Vyukov's bounded MPMC queue.
+//!
+//! Source:
+//!   - http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
+//!   - https://docs.google.com/document/d/1yIAYmbvL3JxOKOjuCyon7JhW4cSv1wy5hC0ApeGMV9s/pub
+//!
+//! Copyright & License:
+//!   - Copyright (c) 2010-2011 Dmitry Vyukov
+//!   - Simplified BSD License and Apache License, Version 2.0
+//!   - http://www.1024cores.net/home/code-license
 
 use std::cell::UnsafeCell;
 use std::marker::PhantomData;
 use std::mem;
 use std::ptr;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::atomic::{self, AtomicUsize, Ordering};
 use std::time::Instant;
 
-use crossbeam_utils::CachePadded;
+use crossbeam_utils::{Backoff, CachePadded};
 
-use internal::channel::RecvNonblocking;
-use internal::context::Context;
-use internal::select::{Operation, Selected, SelectHandle, Token};
-use internal::utils::Backoff;
-use internal::waker::SyncWaker;
+use context::Context;
+use err::{RecvTimeoutError, SendTimeoutError, TryRecvError, TrySendError};
+use select::{Operation, SelectHandle, Selected, Token};
+use waker::SyncWaker;
 
 /// A slot in a channel.
 struct Slot<T> {
     /// The current stamp.
-    ///
-    /// If the stamp equals the tail, this node will be next written to. If it equals the head,
-    /// this node will be next read from.
     stamp: AtomicUsize,
 
     /// The message in this slot.
-    ///
-    /// If the lap in the stamp is odd, this value contains a message. Otherwise, it is empty.
     msg: UnsafeCell<T>,
 }
 
@@ -51,26 +56,21 @@
 }
 
 /// Bounded channel based on a preallocated array.
-///
-/// The implementation is based on Dmitry Vyukov's bounded MPMC queue:
-///
-/// - http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
-/// - https://docs.google.com/document/d/1yIAYmbvL3JxOKOjuCyon7JhW4cSv1wy5hC0ApeGMV9s/pub
 pub struct Channel<T> {
     /// The head of the channel.
     ///
-    /// This value is a "stamp" consisting of an index into the buffer and a lap, but packed into a
-    /// single `usize`. The lower bits represent the index, while the upper bits represent the lap.
-    /// The lap in the head is always an odd number.
+    /// This value is a "stamp" consisting of an index into the buffer, a mark bit, and a lap, but
+    /// packed into a single `usize`. The lower bits represent the index, while the upper bits
+    /// represent the lap. The mark bit in the head is always zero.
     ///
     /// Messages are popped from the head of the channel.
     head: CachePadded<AtomicUsize>,
 
     /// The tail of the channel.
     ///
-    /// This value is a "stamp" consisting of an index into the buffer and a lap, but packed into a
-    /// single `usize`. The lower bits represent the index, while the upper bits represent the lap.
-    /// The lap in the tail is always an even number.
+    /// This value is a "stamp" consisting of an index into the buffer, a mark bit, and a lap, but
+    /// packed into a single `usize`. The lower bits represent the index, while the upper bits
+    /// represent the lap. The mark bit indicates that the channel is disconnected.
     ///
     /// Messages are pushed into the tail of the channel.
     tail: CachePadded<AtomicUsize>,
@@ -81,16 +81,16 @@
     /// The channel capacity.
     cap: usize,
 
-    /// A stamp with the value of `{ lap: 1, index: 0 }`.
+    /// A stamp with the value of `{ lap: 1, mark: 0, index: 0 }`.
     one_lap: usize,
 
-    /// Equals `true` when the channel is closed.
-    is_closed: AtomicBool,
+    /// If this bit is set in the tail, that means the channel is disconnected.
+    mark_bit: usize,
 
     /// Senders waiting while the channel is full.
     senders: SyncWaker,
 
-    /// Receivers waiting while the channel is empty and not closed.
+    /// Receivers waiting while the channel is empty and not disconnected.
     receivers: SyncWaker,
 
     /// Indicates that dropping a `Channel<T>` may drop values of type `T`.
@@ -98,17 +98,17 @@
 }
 
 impl<T> Channel<T> {
-    /// Creates a bounded channel with capacity of `cap`.
+    /// Creates a bounded channel of capacity `cap`.
     ///
     /// # Panics
     ///
-    /// Panics if the capacity is not in the range `1 .. usize::max_value() / 4`.
+    /// Panics if the capacity is not in the range `1 ..= usize::max_value() / 4`.
     pub fn with_capacity(cap: usize) -> Self {
         assert!(cap > 0, "capacity must be positive");
 
-        // Make sure there are at least two most significant bits to encode laps. If we can't
-        // reserve two bits, then panic. In that case, the buffer is likely too large to allocate
-        // anyway.
+        // Make sure there are at least two most significant bits: one to encode laps and one more
+        // to indicate that the channel is disconnected. If we can't reserve two bits, then panic.
+        // In that case, the buffer is likely too large to allocate anyway.
         let cap_limit = usize::max_value() / 4;
         assert!(
             cap <= cap_limit,
@@ -117,12 +117,13 @@
             cap_limit
         );
 
-        // One lap is the smallest power of two greater than or equal to `cap`.
-        let one_lap = cap.next_power_of_two();
-
-        // Head is initialized to `{ lap: 1, index: 0 }`.
-        // Tail is initialized to `{ lap: 0, index: 0 }`.
-        let head = one_lap;
+        // Compute constants `mark_bit` and `one_lap`.
+        let mark_bit = (cap + 1).next_power_of_two();
+        let one_lap = mark_bit * 2;
+
+        // Head is initialized to `{ lap: 0, mark: 0, index: 0 }`.
+        let head = 0;
+        // Tail is initialized to `{ lap: 0, mark: 0, index: 0 }`.
         let tail = 0;
 
         // Allocate a buffer of `cap` slots.
@@ -136,7 +137,7 @@
         // Initialize stamps in the slots.
         for i in 0..cap {
             unsafe {
-                // Set the stamp to `{ lap: 0, index: i }`.
+                // Set the stamp to `{ lap: 0, mark: 0, index: i }`.
                 let slot = buffer.add(i);
                 ptr::write(&mut (*slot).stamp, AtomicUsize::new(i));
             }
@@ -146,7 +147,7 @@
             buffer,
             cap,
             one_lap,
-            is_closed: AtomicBool::new(false),
+            mark_bit,
             head: CachePadded::new(AtomicUsize::new(head)),
             tail: CachePadded::new(AtomicUsize::new(tail)),
             senders: SyncWaker::new(),
@@ -167,12 +168,19 @@
 
     /// Attempts to reserve a slot for sending a message.
     fn start_send(&self, token: &mut Token) -> bool {
-        let mut backoff = Backoff::new();
+        let backoff = Backoff::new();
+        let mut tail = self.tail.load(Ordering::Relaxed);
 
         loop {
-            // Load the tail and deconstruct it.
-            let tail = self.tail.load(Ordering::SeqCst);
-            let index = tail & (self.one_lap - 1);
+            // Check if the channel is disconnected.
+            if tail & self.mark_bit != 0 {
+                token.array.slot = ptr::null();
+                token.array.stamp = 0;
+                return true;
+            }
+
+            // Deconstruct the tail.
+            let index = tail & (self.mark_bit - 1);
             let lap = tail & !(self.one_lap - 1);
 
             // Inspect the corresponding slot.
@@ -183,42 +191,57 @@
             if tail == stamp {
                 let new_tail = if index + 1 < self.cap {
                     // Same lap, incremented index.
-                    // Set to `{ lap: lap, index: index + 1 }`.
+                    // Set to `{ lap: lap, mark: 0, index: index + 1 }`.
                     tail + 1
                 } else {
-                    // Two laps forward, index wraps around to zero.
-                    // Set to `{ lap: lap.wrapping_add(2), index: 0 }`.
-                    lap.wrapping_add(self.one_lap.wrapping_mul(2))
+                    // One lap forward, index wraps around to zero.
+                    // Set to `{ lap: lap.wrapping_add(1), mark: 0, index: 0 }`.
+                    lap.wrapping_add(self.one_lap)
                 };
 
                 // Try moving the tail.
-                if self.tail
+                match self
+                    .tail
                     .compare_exchange_weak(tail, new_tail, Ordering::SeqCst, Ordering::Relaxed)
-                    .is_ok()
                 {
-                    // Prepare the token for the follow-up call to `write`.
-                    token.array.slot = slot as *const Slot<T> as *const u8;
-                    token.array.stamp = stamp.wrapping_add(self.one_lap);
-                    return true;
-                }
-            // But if the slot lags one lap behind the tail...
-            } else if stamp.wrapping_add(self.one_lap) == tail {
-                let head = self.head.load(Ordering::SeqCst);
+                    Ok(_) => {
+                        // Prepare the token for the follow-up call to `write`.
+                        token.array.slot = slot as *const Slot<T> as *const u8;
+                        token.array.stamp = tail + 1;
+                        return true;
+                    }
+                    Err(t) => {
+                        tail = t;
+                        backoff.spin();
+                    }
+                }
+            } else if stamp.wrapping_add(self.one_lap) == tail + 1 {
+                atomic::fence(Ordering::SeqCst);
+                let head = self.head.load(Ordering::Relaxed);
 
-                // ...and if the head lags one lap behind the tail as well...
+                // If the head lags one lap behind the tail as well...
                 if head.wrapping_add(self.one_lap) == tail {
                     // ...then the channel is full.
                     return false;
                 }
-            }
 
-            backoff.spin();
+                backoff.spin();
+                tail = self.tail.load(Ordering::Relaxed);
+            } else {
+                // Snooze because we need to wait for the stamp to get updated.
+                backoff.snooze();
+                tail = self.tail.load(Ordering::Relaxed);
+            }
         }
     }
 
     /// Writes a message into the channel.
-    pub unsafe fn write(&self, token: &mut Token, msg: T) {
-        debug_assert!(!token.array.slot.is_null());
+    pub unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
+        // If there is no slot, the channel is disconnected.
+        if token.array.slot.is_null() {
+            return Err(msg);
+        }
+
         let slot: &Slot<T> = &*(token.array.slot as *const Slot<T>);
 
         // Write the message into the slot and update the stamp.
@@ -226,77 +249,85 @@
         slot.stamp.store(token.array.stamp, Ordering::Release);
 
         // Wake a sleeping receiver.
-        self.receivers.wake_one();
+        self.receivers.notify();
+        Ok(())
     }
 
     /// Attempts to reserve a slot for receiving a message.
     fn start_recv(&self, token: &mut Token) -> bool {
-        let mut backoff = Backoff::new();
+        let backoff = Backoff::new();
+        let mut head = self.head.load(Ordering::Relaxed);
 
         loop {
-            // Load the head and deconstruct it.
-            let head = self.head.load(Ordering::SeqCst);
-            let index = head & (self.one_lap - 1);
+            // Deconstruct the head.
+            let index = head & (self.mark_bit - 1);
             let lap = head & !(self.one_lap - 1);
 
             // Inspect the corresponding slot.
             let slot = unsafe { &*self.buffer.add(index) };
             let stamp = slot.stamp.load(Ordering::Acquire);
 
-            // If the the head and the stamp match, we may attempt to pop.
-            if head == stamp {
+            // If the the stamp is ahead of the head by 1, we may attempt to pop.
+            if head + 1 == stamp {
                 let new = if index + 1 < self.cap {
                     // Same lap, incremented index.
-                    // Set to `{ lap: lap, index: index + 1 }`.
+                    // Set to `{ lap: lap, mark: 0, index: index + 1 }`.
                     head + 1
                 } else {
-                    // Two laps forward, index wraps around to zero.
-                    // Set to `{ lap: lap.wrapping_add(2), index: 0 }`.
-                    lap.wrapping_add(self.one_lap.wrapping_mul(2))
+                    // One lap forward, index wraps around to zero.
+                    // Set to `{ lap: lap.wrapping_add(1), mark: 0, index: 0 }`.
+                    lap.wrapping_add(self.one_lap)
                 };
 
                 // Try moving the head.
-                if self.head
+                match self
+                    .head
                     .compare_exchange_weak(head, new, Ordering::SeqCst, Ordering::Relaxed)
-                    .is_ok()
                 {
-                    // Prepare the token for the follow-up call to `read`.
-                    token.array.slot = slot as *const Slot<T> as *const u8;
-                    token.array.stamp = stamp.wrapping_add(self.one_lap);
-                    return true;
-                }
-            // But if the slot lags one lap behind the head...
-            } else if stamp.wrapping_add(self.one_lap) == head {
-                let tail = self.tail.load(Ordering::SeqCst);
-
-                // ...and if the tail lags one lap behind the head as well, that means the channel
-                // is empty.
-                if tail.wrapping_add(self.one_lap) == head {
-                    // If the channel is closed...
-                    if self.is_closed() {
-                        // ...and still empty...
-                        if self.tail.load(Ordering::SeqCst) == tail {
-                            // ...then receive `None`.
-                            token.array.slot = ptr::null();
-                            token.array.stamp = 0;
-                            return true;
-                        }
+                    Ok(_) => {
+                        // Prepare the token for the follow-up call to `read`.
+                        token.array.slot = slot as *const Slot<T> as *const u8;
+                        token.array.stamp = head.wrapping_add(self.one_lap);
+                        return true;
+                    }
+                    Err(h) => {
+                        head = h;
+                        backoff.spin();
+                    }
+                }
+            } else if stamp == head {
+                atomic::fence(Ordering::SeqCst);
+                let tail = self.tail.load(Ordering::Relaxed);
+
+                // If the tail equals the head, that means the channel is empty.
+                if (tail & !self.mark_bit) == head {
+                    // If the channel is disconnected...
+                    if tail & self.mark_bit != 0 {
+                        // ...then receive an error.
+                        token.array.slot = ptr::null();
+                        token.array.stamp = 0;
+                        return true;
                     } else {
                         // Otherwise, the receive operation is not ready.
                         return false;
                     }
                 }
-            }
 
-            backoff.spin();
+                backoff.spin();
+                head = self.head.load(Ordering::Relaxed);
+            } else {
+                // Snooze because we need to wait for the stamp to get updated.
+                backoff.snooze();
+                head = self.head.load(Ordering::Relaxed);
+            }
         }
     }
 
     /// Reads a message from the channel.
-    pub unsafe fn read(&self, token: &mut Token) -> Option<T> {
+    pub unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
         if token.array.slot.is_null() {
-            // The channel is closed.
-            return None;
+            // The channel is disconnected.
+            return Err(());
         }
 
         let slot: &Slot<T> = &*(token.array.slot as *const Slot<T>);
@@ -306,24 +337,36 @@
         slot.stamp.store(token.array.stamp, Ordering::Release);
 
         // Wake a sleeping sender.
-        self.senders.wake_one();
+        self.senders.notify();
+        Ok(msg)
+    }
 
-        Some(msg)
+    /// Attempts to send a message into the channel.
+    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+        let token = &mut Token::default();
+        if self.start_send(token) {
+            unsafe { self.write(token, msg).map_err(TrySendError::Disconnected) }
+        } else {
+            Err(TrySendError::Full(msg))
+        }
     }
 
     /// Sends a message into the channel.
-    pub fn send(&self, msg: T) {
+    pub fn send(&self, msg: T, deadline: Option<Instant>) -> Result<(), SendTimeoutError<T>> {
         let token = &mut Token::default();
         loop {
             // Try sending a message several times.
-            let mut backoff = Backoff::new();
+            let backoff = Backoff::new();
             loop {
                 if self.start_send(token) {
-                    unsafe { self.write(token, msg); }
-                    return;
+                    let res = unsafe { self.write(token, msg) };
+                    return res.map_err(SendTimeoutError::Disconnected);
                 }
-                if !backoff.snooze() {
+
+                if backoff.is_completed() {
                     break;
+                } else {
+                    backoff.snooze();
                 }
             }
 
@@ -333,38 +376,57 @@
                 self.senders.register(oper, cx);
 
                 // Has the channel become ready just now?
-                if !self.is_full() {
+                if !self.is_full() || self.is_disconnected() {
                     let _ = cx.try_select(Selected::Aborted);
                 }
 
                 // Block the current thread.
-                let sel = cx.wait_until(None);
+                let sel = cx.wait_until(deadline);
 
                 match sel {
-                    Selected::Waiting | Selected::Closed => unreachable!(),
-                    Selected::Aborted => {
+                    Selected::Waiting => unreachable!(),
+                    Selected::Aborted | Selected::Disconnected => {
                         self.senders.unregister(oper).unwrap();
-                    },
+                    }
                     Selected::Operation(_) => {}
                 }
-            })
+            });
+
+            if let Some(d) = deadline {
+                if Instant::now() >= d {
+                    return Err(SendTimeoutError::Timeout(msg));
+                }
+            }
+        }
+    }
+
+    /// Attempts to receive a message without blocking.
+    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+        let token = &mut Token::default();
+
+        if self.start_recv(token) {
+            unsafe { self.read(token).map_err(|_| TryRecvError::Disconnected) }
+        } else {
+            Err(TryRecvError::Empty)
         }
     }
 
     /// Receives a message from the channel.
-    pub fn recv(&self) -> Option<T> {
+    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         let token = &mut Token::default();
         loop {
             // Try receiving a message several times.
-            let mut backoff = Backoff::new();
+            let backoff = Backoff::new();
             loop {
                 if self.start_recv(token) {
-                    unsafe {
-                        return self.read(token);
-                    }
+                    let res = unsafe { self.read(token) };
+                    return res.map_err(|_| RecvTimeoutError::Disconnected);
                 }
-                if !backoff.snooze() {
+
+                if backoff.is_completed() {
                     break;
+                } else {
+                    backoff.snooze();
                 }
             }
 
@@ -374,36 +436,29 @@
                 self.receivers.register(oper, cx);
 
                 // Has the channel become ready just now?
-                if !self.is_empty() || self.is_closed() {
+                if !self.is_empty() || self.is_disconnected() {
                     let _ = cx.try_select(Selected::Aborted);
                 }
 
                 // Block the current thread.
-                let sel = cx.wait_until(None);
+                let sel = cx.wait_until(deadline);
 
                 match sel {
                     Selected::Waiting => unreachable!(),
-                    Selected::Aborted | Selected::Closed => {
+                    Selected::Aborted | Selected::Disconnected => {
                         self.receivers.unregister(oper).unwrap();
-                        // If the channel was closed, we still have to check for remaining messages.
-                    },
+                        // If the channel was disconnected, we still have to check for remaining
+                        // messages.
+                    }
                     Selected::Operation(_) => {}
                 }
-            })
-        }
-    }
+            });
 
-    /// Attempts to receive a message without blocking.
-    pub fn recv_nonblocking(&self) -> RecvNonblocking<T> {
-        let token = &mut Token::default();
-
-        if self.start_recv(token) {
-            match unsafe { self.read(token) } {
-                None => RecvNonblocking::Closed,
-                Some(msg) => RecvNonblocking::Message(msg),
+            if let Some(d) = deadline {
+                if Instant::now() >= d {
+                    return Err(RecvTimeoutError::Timeout);
+                }
             }
-        } else {
-            RecvNonblocking::Empty
         }
     }
 
@@ -416,14 +471,14 @@
 
             // If the tail didn't change, we've got consistent values to work with.
             if self.tail.load(Ordering::SeqCst) == tail {
-                let hix = head & (self.one_lap - 1);
-                let tix = tail & (self.one_lap - 1);
+                let hix = head & (self.mark_bit - 1);
+                let tix = tail & (self.mark_bit - 1);
 
                 return if hix < tix {
                     tix - hix
                 } else if hix > tix {
                     self.cap - hix + tix
-                } else if tail.wrapping_add(self.one_lap) == head {
+                } else if (tail & !self.mark_bit) == head {
                     0
                 } else {
                     self.cap
@@ -437,15 +492,19 @@
         Some(self.cap)
     }
 
-    /// Closes the channel and wakes up all blocked receivers.
-    pub fn close(&self) {
-        assert!(!self.is_closed.swap(true, Ordering::SeqCst));
-        self.receivers.close();
+    /// Disconnects the channel and wakes up all blocked receivers.
+    pub fn disconnect(&self) {
+        let tail = self.tail.fetch_or(self.mark_bit, Ordering::SeqCst);
+
+        if tail & self.mark_bit == 0 {
+            self.senders.disconnect();
+            self.receivers.disconnect();
+        }
     }
 
-    /// Returns `true` if the channel is closed.
-    pub fn is_closed(&self) -> bool {
-        self.is_closed.load(Ordering::SeqCst)
+    /// Returns `true` if the channel is disconnected.
+    pub fn is_disconnected(&self) -> bool {
+        self.tail.load(Ordering::SeqCst) & self.mark_bit != 0
     }
 
     /// Returns `true` if the channel is empty.
@@ -453,11 +512,11 @@
         let head = self.head.load(Ordering::SeqCst);
         let tail = self.tail.load(Ordering::SeqCst);
 
-        // Is the tail lagging one lap behind head?
+        // Is the tail equal to the head?
         //
         // Note: If the head changes just before we load the tail, that means there was a moment
         // when the channel was not empty, so it is safe to just return `false`.
-        tail.wrapping_add(self.one_lap) == head
+        (tail & !self.mark_bit) == head
     }
 
     /// Returns `true` if the channel is full.
@@ -467,16 +526,16 @@
 
         // Is the head lagging one lap behind tail?
         //
-        // note: If the tail changes just before we load the head, that means there was a moment
+        // Note: If the tail changes just before we load the head, that means there was a moment
         // when the channel was not full, so it is safe to just return `false`.
-        head.wrapping_add(self.one_lap) == tail
+        head.wrapping_add(self.one_lap) == tail & !self.mark_bit
     }
 }
 
 impl<T> Drop for Channel<T> {
     fn drop(&mut self) {
         // Get the index of the head.
-        let hix = self.head.load(Ordering::Relaxed) & (self.one_lap - 1);
+        let hix = self.head.load(Ordering::Relaxed) & (self.mark_bit - 1);
 
         // Loop over all slots that hold a message and drop them.
         for i in 0..self.len() {
@@ -506,11 +565,7 @@
 pub struct Sender<'a, T: 'a>(&'a Channel<T>);
 
 impl<'a, T> SelectHandle for Receiver<'a, T> {
-    fn try(&self, token: &mut Token) -> bool {
-        self.0.start_recv(token)
-    }
-
-    fn retry(&self, token: &mut Token) -> bool {
+    fn try_select(&self, token: &mut Token) -> bool {
         self.0.start_recv(token)
     }
 
@@ -518,9 +573,9 @@
         None
     }
 
-    fn register(&self, _token: &mut Token, oper: Operation, cx: &Context) -> bool {
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
         self.0.receivers.register(oper, cx);
-        self.0.is_empty() && !self.0.is_closed()
+        self.is_ready()
     }
 
     fn unregister(&self, oper: Operation) {
@@ -528,20 +583,25 @@
     }
 
     fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
-        self.0.start_recv(token)
+        self.try_select(token)
     }
 
-    fn state(&self) -> usize {
-        self.0.tail.load(Ordering::SeqCst)
+    fn is_ready(&self) -> bool {
+        !self.0.is_empty() || self.0.is_disconnected()
     }
-}
 
-impl<'a, T> SelectHandle for Sender<'a, T> {
-    fn try(&self, token: &mut Token) -> bool {
-        self.0.start_send(token)
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        self.0.receivers.watch(oper, cx);
+        self.is_ready()
     }
 
-    fn retry(&self, token: &mut Token) -> bool {
+    fn unwatch(&self, oper: Operation) {
+        self.0.receivers.unwatch(oper);
+    }
+}
+
+impl<'a, T> SelectHandle for Sender<'a, T> {
+    fn try_select(&self, token: &mut Token) -> bool {
         self.0.start_send(token)
     }
 
@@ -549,9 +609,9 @@
         None
     }
 
-    fn register(&self, _token: &mut Token, oper: Operation, cx: &Context) -> bool {
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
         self.0.senders.register(oper, cx);
-        self.0.is_full()
+        self.is_ready()
     }
 
     fn unregister(&self, oper: Operation) {
@@ -559,10 +619,19 @@
     }
 
     fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
-        self.0.start_send(token)
+        self.try_select(token)
+    }
+
+    fn is_ready(&self) -> bool {
+        !self.0.is_full() || self.0.is_disconnected()
+    }
+
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        self.0.senders.watch(oper, cx);
+        self.is_ready()
     }
 
-    fn state(&self) -> usize {
-        self.0.head.load(Ordering::SeqCst)
+    fn unwatch(&self, oper: Operation) {
+        self.0.senders.unwatch(oper);
     }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/list.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/list.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/list.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/list.rs	2019-02-06 04:11:58.000000000 +0000
@@ -4,47 +4,56 @@
 use std::marker::PhantomData;
 use std::mem::{self, ManuallyDrop};
 use std::ptr;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::atomic::{self, AtomicPtr, AtomicUsize, Ordering};
 use std::time::Instant;
 
-use crossbeam_epoch::{self as epoch, Atomic, Guard, Owned, Shared};
-use crossbeam_utils::CachePadded;
+use crossbeam_utils::{Backoff, CachePadded};
 
-use internal::channel::RecvNonblocking;
-use internal::context::Context;
-use internal::select::{Operation, Selected, SelectHandle, Token};
-use internal::utils::Backoff;
-use internal::waker::SyncWaker;
-
-// TODO: Allocate less memory in the beginning. Blocks should start small and grow exponentially.
-
-/// The maximum number of messages a block can hold.
-const BLOCK_CAP: usize = 32;
+use context::Context;
+use err::{RecvTimeoutError, SendTimeoutError, TryRecvError, TrySendError};
+use select::{Operation, SelectHandle, Selected, Token};
+use waker::SyncWaker;
+
+// TODO(stjepang): Once we bump the minimum required Rust version to 1.28 or newer, re-apply the
+// following changes by @kleimkuhler:
+//
+// 1. https://github.com/crossbeam-rs/crossbeam-channel/pull/100
+// 2. https://github.com/crossbeam-rs/crossbeam-channel/pull/101
+
+// Bits indicating the state of a slot:
+// * If a message has been written into the slot, `WRITE` is set.
+// * If a message has been read from the slot, `READ` is set.
+// * If the block is being destroyed, `DESTROY` is set.
+const WRITE: usize = 1;
+const READ: usize = 2;
+const DESTROY: usize = 4;
+
+// Each block covers one "lap" of indices.
+const LAP: usize = 32;
+// The maximum number of messages a block can hold.
+const BLOCK_CAP: usize = LAP - 1;
+// How many lower bits are reserved for metadata.
+const SHIFT: usize = 1;
+// Has two different purposes:
+// * If set in head, indicates that the block is not the last one.
+// * If set in tail, indicates that the channel is disconnected.
+const MARK_BIT: usize = 1;
 
 /// A slot in a block.
 struct Slot<T> {
     /// The message.
     msg: UnsafeCell<ManuallyDrop<T>>,
 
-    /// Equals `true` if the message is ready for reading.
-    ready: AtomicBool,
+    /// The state of the slot.
+    state: AtomicUsize,
 }
 
-/// The token type for the list flavor.
-pub struct ListToken {
-    /// Slot to read from or write to.
-    slot: *const u8,
-
-    /// Guard keeping alive the block that contains the slot.
-    guard: Option<Guard>,
-}
-
-impl Default for ListToken {
-    #[inline]
-    fn default() -> Self {
-        ListToken {
-            slot: ptr::null(),
-            guard: None,
+impl<T> Slot<T> {
+    /// Waits until a message is written into the slot.
+    fn wait_write(&self) {
+        let backoff = Backoff::new();
+        while self.state.load(Ordering::Acquire) & WRITE == 0 {
+            backoff.snooze();
         }
     }
 }
@@ -53,38 +62,79 @@
 ///
 /// Each block in the list can hold up to `BLOCK_CAP` messages.
 struct Block<T> {
-    /// The start index of this block.
-    ///
-    /// Slots in this block have indices in `start_index .. start_index + BLOCK_CAP`.
-    start_index: usize,
-
     /// The next block in the linked list.
-    next: Atomic<Block<T>>,
+    next: AtomicPtr<Block<T>>,
 
     /// Slots for messages.
-    slots: [UnsafeCell<Slot<T>>; BLOCK_CAP],
+    slots: [Slot<T>; BLOCK_CAP],
 }
 
 impl<T> Block<T> {
-    /// Creates an empty block that starts at `start_index`.
-    fn new(start_index: usize) -> Block<T> {
-        Block {
-            start_index,
-            slots: unsafe { mem::zeroed() },
-            next: Atomic::null(),
+    /// Creates an empty block.
+    fn new() -> Block<T> {
+        unsafe { mem::zeroed() }
+    }
+
+    /// Waits until the next pointer is set.
+    fn wait_next(&self) -> *mut Block<T> {
+        let backoff = Backoff::new();
+        loop {
+            let next = self.next.load(Ordering::Acquire);
+            if !next.is_null() {
+                return next;
+            }
+            backoff.snooze();
+        }
+    }
+
+    /// Sets the `DESTROY` bit in slots starting from `start` and destroys the block.
+    unsafe fn destroy(this: *mut Block<T>, start: usize) {
+        // It is not necessary to set the `DESTROY bit in the last slot because that slot has begun
+        // destruction of the block.
+        for i in start..BLOCK_CAP - 1 {
+            let slot = (*this).slots.get_unchecked(i);
+
+            // Mark the `DESTROY` bit if a thread is still using the slot.
+            if slot.state.load(Ordering::Acquire) & READ == 0
+                && slot.state.fetch_or(DESTROY, Ordering::AcqRel) & READ == 0
+            {
+                // If a thread is still using the slot, it will continue destruction of the block.
+                return;
+            }
         }
+
+        // No thread is using the block, now it is safe to destroy it.
+        drop(Box::from_raw(this));
     }
 }
 
-/// Position in the channel (index and block).
-///
-/// This struct describes the current position of the head or the tail in a linked list.
+/// A position in a channel.
+#[derive(Debug)]
 struct Position<T> {
     /// The index in the channel.
     index: AtomicUsize,
 
     /// The block in the linked list.
-    block: Atomic<Block<T>>,
+    block: AtomicPtr<Block<T>>,
+}
+
+/// The token type for the list flavor.
+pub struct ListToken {
+    /// The block of slots.
+    block: *const u8,
+
+    /// The offset into the block.
+    offset: usize,
+}
+
+impl Default for ListToken {
+    #[inline]
+    fn default() -> Self {
+        ListToken {
+            block: ptr::null(),
+            offset: 0,
+        }
+    }
 }
 
 /// Unbounded channel implemented as a linked list.
@@ -101,39 +151,28 @@
     /// The tail of the channel.
     tail: CachePadded<Position<T>>,
 
-    /// Equals `true` when the channel is closed.
-    is_closed: AtomicBool,
-
-    /// Receivers waiting while the channel is empty and not closed.
+    /// Receivers waiting while the channel is empty and not disconnected.
     receivers: SyncWaker,
 
-    /// Indicates that dropping a `Channel<T>` may drop values of type `T`.
+    /// Indicates that dropping a `Channel<T>` may drop messages of type `T`.
     _marker: PhantomData<T>,
 }
 
 impl<T> Channel<T> {
     /// Creates a new unbounded channel.
     pub fn new() -> Self {
-        let channel = Channel {
+        Channel {
             head: CachePadded::new(Position {
+                block: AtomicPtr::new(ptr::null_mut()),
                 index: AtomicUsize::new(0),
-                block: Atomic::null(),
             }),
             tail: CachePadded::new(Position {
+                block: AtomicPtr::new(ptr::null_mut()),
                 index: AtomicUsize::new(0),
-                block: Atomic::null(),
             }),
-            is_closed: AtomicBool::new(false),
             receivers: SyncWaker::new(),
             _marker: PhantomData,
-        };
-
-        // Allocate an empty block for the first batch of messages.
-        let block = unsafe { Owned::new(Block::new(0)).into_shared(epoch::unprotected()) };
-        channel.head.block.store(block, Ordering::Relaxed);
-        channel.tail.block.store(block, Ordering::Relaxed);
-
-        channel
+        }
     }
 
     /// Returns a receiver handle to the channel.
@@ -146,218 +185,264 @@
         Sender(self)
     }
 
-    /// Writes a message into the channel.
-    pub fn write(&self, _token: &mut Token, msg: T) {
-        let guard = epoch::pin();
-        let mut backoff = Backoff::new();
+    /// Attempts to reserve a slot for sending a message.
+    fn start_send(&self, token: &mut Token) -> bool {
+        let backoff = Backoff::new();
+        let mut tail = self.tail.index.load(Ordering::Acquire);
+        let mut block = self.tail.block.load(Ordering::Acquire);
+        let mut next_block = None;
 
         loop {
-            // These two load operations don't have to be `SeqCst`. If they happen to retrieve
-            // stale values, the following CAS will fail or won't even be attempted.
-            let tail_ptr = self.tail.block.load(Ordering::Acquire, &guard);
-            let tail = unsafe { tail_ptr.deref() };
-            let tail_index = self.tail.index.load(Ordering::Relaxed);
-
-            // Calculate the index of the corresponding slot in the block.
-            let offset = tail_index.wrapping_sub(tail.start_index);
-
-            // Advance the current index one slot forward.
-            let new_index = tail_index.wrapping_add(1);
-
-            // A closure that installs a block following `tail` in case it hasn't been yet.
-            let install_next_block = || {
-                let current = tail.next.compare_and_set(
-                    Shared::null(),
-                    Owned::new(Block::new(tail.start_index.wrapping_add(BLOCK_CAP))),
-                    Ordering::AcqRel,
-                    &guard,
-                ).unwrap_or_else(|err| err.current);
-
-                let _ = self.tail.block.compare_and_set(
-                    tail_ptr,
-                    current,
-                    Ordering::Release,
-                    &guard,
-                );
-            };
-
-            // If `tail_index` is pointing into `tail`...
-            if offset < BLOCK_CAP {
-                // Try moving the tail index forward.
-                if self
-                    .tail
-                    .index
-                    .compare_exchange_weak(
-                        tail_index,
-                        new_index,
-                        Ordering::SeqCst,
-                        Ordering::Relaxed,
-                    )
-                    .is_ok()
-                {
-                    // If this was the last slot in the block, install a new block.
+            // Check if the channel is disconnected.
+            if tail & MARK_BIT != 0 {
+                token.list.block = ptr::null();
+                return true;
+            }
+
+            // Calculate the offset of the index into the block.
+            let offset = (tail >> SHIFT) % LAP;
+
+            // If we reached the end of the block, wait until the next one is installed.
+            if offset == BLOCK_CAP {
+                backoff.snooze();
+                tail = self.tail.index.load(Ordering::Acquire);
+                block = self.tail.block.load(Ordering::Acquire);
+                continue;
+            }
+
+            // If we're going to have to install the next block, allocate it in advance in order to
+            // make the wait for other threads as short as possible.
+            if offset + 1 == BLOCK_CAP && next_block.is_none() {
+                next_block = Some(Box::new(Block::<T>::new()));
+            }
+
+            // If this is the first message to be sent into the channel, we need to allocate the
+            // first block and install it.
+            if block.is_null() {
+                let new = Box::into_raw(Box::new(Block::<T>::new()));
+
+                if self.tail.block.compare_and_swap(block, new, Ordering::Release) == block {
+                    self.head.block.store(new, Ordering::Release);
+                    block = new;
+                } else {
+                    next_block = unsafe { Some(Box::from_raw(new)) };
+                    tail = self.tail.index.load(Ordering::Acquire);
+                    block = self.tail.block.load(Ordering::Acquire);
+                    continue;
+                }
+            }
+
+            let new_tail = tail + (1 << SHIFT);
+
+            // Try advancing the tail forward.
+            match self.tail.index
+                .compare_exchange_weak(
+                    tail,
+                    new_tail,
+                    Ordering::SeqCst,
+                    Ordering::Acquire,
+                )
+            {
+                Ok(_) => unsafe {
+                    // If we've reached the end of the block, install the next one.
                     if offset + 1 == BLOCK_CAP {
-                        install_next_block();
+                        let next_block = Box::into_raw(next_block.unwrap());
+                        self.tail.block.store(next_block, Ordering::Release);
+                        self.tail.index.fetch_add(1 << SHIFT, Ordering::Release);
+                        (*block).next.store(next_block, Ordering::Release);
                     }
 
-                    unsafe {
-                        let slot = tail.slots.get_unchecked(offset).get();
-                        (*slot).msg.get().write(ManuallyDrop::new(msg));
-                        (*slot).ready.store(true, Ordering::Release);
-                    }
-                    break;
+                    token.list.block = block as *const u8;
+                    token.list.offset = offset;
+                    return true;
+                }
+                Err(t) => {
+                    tail = t;
+                    block = self.tail.block.load(Ordering::Acquire);
+                    backoff.spin();
                 }
-
-                backoff.spin();
-            } else if offset == BLOCK_CAP {
-                // Help install the next block.
-                install_next_block();
             }
         }
+    }
+
+    /// Writes a message into the channel.
+    pub unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
+        // If there is no slot, the channel is disconnected.
+        if token.list.block.is_null() {
+            return Err(msg);
+        }
 
-        self.receivers.wake_one();
+        // Write the message into the slot.
+        let block = token.list.block as *mut Block<T>;
+        let offset = token.list.offset;
+        let slot = (*block).slots.get_unchecked(offset);
+        slot.msg.get().write(ManuallyDrop::new(msg));
+        slot.state.fetch_or(WRITE, Ordering::Release);
+
+        // Wake a sleeping receiver.
+        self.receivers.notify();
+        Ok(())
     }
 
     /// Attempts to reserve a slot for receiving a message.
     fn start_recv(&self, token: &mut Token) -> bool {
-        let guard = epoch::pin();
-        let mut backoff = Backoff::new();
+        let backoff = Backoff::new();
+        let mut head = self.head.index.load(Ordering::Acquire);
+        let mut block = self.head.block.load(Ordering::Acquire);
 
         loop {
-            // Loading the head block doesn't have to be a `SeqCst` operation. If we get a stale
-            // value, the following CAS will fail or not even be attempted. Loading the head index
-            // must be `SeqCst` because we need the up-to-date value when checking whether the
-            // channel is empty.
-            let head_ptr = self.head.block.load(Ordering::Acquire, &guard);
-            let head = unsafe { head_ptr.deref() };
-            let head_index = self.head.index.load(Ordering::SeqCst);
-
-            // Calculate the index of the corresponding slot in the block.
-            let offset = head_index.wrapping_sub(head.start_index);
-
-            // Advance the current index one slot forward.
-            let new_index = head_index.wrapping_add(1);
-
-            // A closure that installs a block following `head` in case it hasn't been yet.
-            let install_next_block = || {
-                let current = head.next.compare_and_set(
-                    Shared::null(),
-                    Owned::new(Block::new(head.start_index.wrapping_add(BLOCK_CAP))),
-                    Ordering::AcqRel,
-                    &guard,
-                ).unwrap_or_else(|err| err.current);
-
-                let _ = self.head.block.compare_and_set(
-                    head_ptr,
-                    current,
-                    Ordering::Release,
-                    &guard,
-                );
-            };
-
-            // If `head_index` is pointing into `head`...
-            if offset < BLOCK_CAP {
-                let slot = unsafe { &*head.slots.get_unchecked(offset).get() };
-
-                // If this slot does not contain a message...
-                if !slot.ready.load(Ordering::Relaxed) {
-                    let tail_index = self.tail.index.load(Ordering::SeqCst);
-
-                    // If the tail equals the head, that means the channel is empty.
-                    if tail_index == head_index {
-                        // If the channel is closed...
-                        if self.is_closed() {
-                            // ...and still empty...
-                            if self.tail.index.load(Ordering::SeqCst) == tail_index {
-                                // ...then receive `None`.
-                                token.list.slot = ptr::null();
-                                return true;
-                            }
-                        } else {
-                            // Otherwise, the receive operation is not ready.
-                            return false;
-                        }
+            // Calculate the offset of the index into the block.
+            let offset = (head >> SHIFT) % LAP;
+
+            // If we reached the end of the block, wait until the next one is installed.
+            if offset == BLOCK_CAP {
+                backoff.snooze();
+                head = self.head.index.load(Ordering::Acquire);
+                block = self.head.block.load(Ordering::Acquire);
+                continue;
+            }
+
+            let mut new_head = head + (1 << SHIFT);
+
+            if new_head & MARK_BIT == 0 {
+                atomic::fence(Ordering::SeqCst);
+                let tail = self.tail.index.load(Ordering::Relaxed);
+
+                // If the tail equals the head, that means the channel is empty.
+                if head >> SHIFT == tail >> SHIFT {
+                    // If the channel is disconnected...
+                    if tail & MARK_BIT != 0 {
+                        // ...then receive an error.
+                        token.list.block = ptr::null();
+                        return true;
+                    } else {
+                        // Otherwise, the receive operation is not ready.
+                        return false;
                     }
                 }
 
-                // Try moving the head index forward.
-                if self
-                    .head
-                    .index
-                    .compare_exchange_weak(
-                        head_index,
-                        new_index,
-                        Ordering::SeqCst,
-                        Ordering::Relaxed,
-                    )
-                    .is_ok()
-                {
-                    // If this was the last slot in the block, install a new block and destroy the
-                    // old one.
+                // If head and tail are not in the same block, set `MARK_BIT` in head.
+                if (head >> SHIFT) / LAP != (tail >> SHIFT) / LAP {
+                    new_head |= MARK_BIT;
+                }
+            }
+
+            // The block can be null here only if the first message is being sent into the channel.
+            // In that case, just wait until it gets initialized.
+            if block.is_null() {
+                backoff.snooze();
+                head = self.head.index.load(Ordering::Acquire);
+                block = self.head.block.load(Ordering::Acquire);
+                continue;
+            }
+
+            // Try moving the head index forward.
+            match self.head.index
+                .compare_exchange_weak(
+                    head,
+                    new_head,
+                    Ordering::SeqCst,
+                    Ordering::Acquire,
+                )
+            {
+                Ok(_) => unsafe {
+                    // If we've reached the end of the block, move to the next one.
                     if offset + 1 == BLOCK_CAP {
-                        install_next_block();
-                        unsafe {
-                            guard.defer_destroy(head_ptr);
+                        let next = (*block).wait_next();
+                        let mut next_index = (new_head & !MARK_BIT).wrapping_add(1 << SHIFT);
+                        if !(*next).next.load(Ordering::Relaxed).is_null() {
+                            next_index |= MARK_BIT;
                         }
+
+                        self.head.block.store(next, Ordering::Release);
+                        self.head.index.store(next_index, Ordering::Release);
                     }
 
-                    token.list.slot = slot as *const Slot<T> as *const u8;
-                    break;
+                    token.list.block = block as *const u8;
+                    token.list.offset = offset;
+                    return true;
+                }
+                Err(h) => {
+                    head = h;
+                    block = self.head.block.load(Ordering::Acquire);
+                    backoff.spin();
                 }
-
-                backoff.spin();
-            } else if offset == BLOCK_CAP {
-                // Help install the next block.
-                install_next_block();
             }
         }
-
-        token.list.guard = Some(guard);
-        true
     }
 
     /// Reads a message from the channel.
-    pub unsafe fn read(&self, token: &mut Token) -> Option<T> {
-        if token.list.slot.is_null() {
-            // The channel is closed.
-            return None;
-        }
-
-        let slot = &*(token.list.slot as *const Slot<T>);
-        let _guard: Guard = token.list.guard.take().unwrap();
-
-        // Wait until the message becomes ready.
-        let mut backoff = Backoff::new();
-        while !slot.ready.load(Ordering::Acquire) {
-            backoff.snooze();
+    pub unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
+        if token.list.block.is_null() {
+            // The channel is disconnected.
+            return Err(());
         }
 
         // Read the message.
+        let block = token.list.block as *mut Block<T>;
+        let offset = token.list.offset;
+        let slot = (*block).slots.get_unchecked(offset);
+        slot.wait_write();
         let m = slot.msg.get().read();
         let msg = ManuallyDrop::into_inner(m);
-        Some(msg)
+
+        // Destroy the block if we've reached the end, or if another thread wanted to destroy but
+        // couldn't because we were busy reading from the slot.
+        if offset + 1 == BLOCK_CAP {
+            Block::destroy(block, 0);
+        } else if slot.state.fetch_or(READ, Ordering::AcqRel) & DESTROY != 0 {
+            Block::destroy(block, offset + 1);
+        }
+
+        Ok(msg)
+    }
+
+    /// Attempts to send a message into the channel.
+    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+        self.send(msg, None).map_err(|err| match err {
+            SendTimeoutError::Disconnected(msg) => TrySendError::Disconnected(msg),
+            SendTimeoutError::Timeout(_) => unreachable!(),
+        })
     }
 
     /// Sends a message into the channel.
-    pub fn send(&self, msg: T) {
+    pub fn send(&self, msg: T, _deadline: Option<Instant>) -> Result<(), SendTimeoutError<T>> {
+        let token = &mut Token::default();
+        assert!(self.start_send(token));
+        unsafe {
+            self.write(token, msg)
+                .map_err(SendTimeoutError::Disconnected)
+        }
+    }
+
+    /// Attempts to receive a message without blocking.
+    pub fn try_recv(&self) -> Result<T, TryRecvError> {
         let token = &mut Token::default();
-        self.write(token, msg);
+
+        if self.start_recv(token) {
+            unsafe { self.read(token).map_err(|_| TryRecvError::Disconnected) }
+        } else {
+            Err(TryRecvError::Empty)
+        }
     }
 
     /// Receives a message from the channel.
-    pub fn recv(&self) -> Option<T> {
+    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         let token = &mut Token::default();
         loop {
             // Try receiving a message several times.
-            let mut backoff = Backoff::new();
+            let backoff = Backoff::new();
             loop {
                 if self.start_recv(token) {
                     unsafe {
-                        return self.read(token);
+                        return self.read(token).map_err(|_| RecvTimeoutError::Disconnected);
                     }
                 }
-                if !backoff.snooze() {
+
+                if backoff.is_completed() {
                     break;
+                } else {
+                    backoff.snooze();
                 }
             }
 
@@ -367,36 +452,29 @@
                 self.receivers.register(oper, cx);
 
                 // Has the channel become ready just now?
-                if !self.is_empty() || self.is_closed() {
+                if !self.is_empty() || self.is_disconnected() {
                     let _ = cx.try_select(Selected::Aborted);
                 }
 
                 // Block the current thread.
-                let sel = cx.wait_until(None);
+                let sel = cx.wait_until(deadline);
 
                 match sel {
                     Selected::Waiting => unreachable!(),
-                    Selected::Aborted | Selected::Closed => {
+                    Selected::Aborted | Selected::Disconnected => {
                         self.receivers.unregister(oper).unwrap();
-                        // If the channel was closed, we still have to check for remaining messages.
-                    },
-                    Selected::Operation(_) => {},
+                        // If the channel was disconnected, we still have to check for remaining
+                        // messages.
+                    }
+                    Selected::Operation(_) => {}
                 }
-            })
-        }
-    }
-
-    /// Attempts to receive a message without blocking.
-    pub fn recv_nonblocking(&self) -> RecvNonblocking<T> {
-        let token = &mut Token::default();
+            });
 
-        if self.start_recv(token) {
-            match unsafe { self.read(token) } {
-                None => RecvNonblocking::Closed,
-                Some(msg) => RecvNonblocking::Message(msg),
+            if let Some(d) = deadline {
+                if Instant::now() >= d {
+                    return Err(RecvTimeoutError::Timeout);
+                }
             }
-        } else {
-            RecvNonblocking::Empty
         }
     }
 
@@ -404,12 +482,35 @@
     pub fn len(&self) -> usize {
         loop {
             // Load the tail index, then load the head index.
-            let tail_index = self.tail.index.load(Ordering::SeqCst);
-            let head_index = self.head.index.load(Ordering::SeqCst);
+            let mut tail = self.tail.index.load(Ordering::SeqCst);
+            let mut head = self.head.index.load(Ordering::SeqCst);
 
             // If the tail index didn't change, we've got consistent indices to work with.
-            if self.tail.index.load(Ordering::SeqCst) == tail_index {
-                return tail_index.wrapping_sub(head_index);
+            if self.tail.index.load(Ordering::SeqCst) == tail {
+                // Erase the lower bits.
+                tail &= !((1 << SHIFT) - 1);
+                head &= !((1 << SHIFT) - 1);
+
+                // Rotate indices so that head falls into the first block.
+                let lap = (head >> SHIFT) / LAP;
+                tail = tail.wrapping_sub((lap * LAP) << SHIFT);
+                head = head.wrapping_sub((lap * LAP) << SHIFT);
+
+                // Remove the lower bits.
+                tail >>= SHIFT;
+                head >>= SHIFT;
+
+                // Fix up indices if they fall onto block ends.
+                if head == BLOCK_CAP {
+                    head = 0;
+                    tail -= LAP;
+                }
+                if tail == BLOCK_CAP {
+                    tail += 1;
+                }
+
+                // Return the difference minus the number of blocks between tail and head.
+                return tail - head - tail / LAP;
             }
         }
     }
@@ -419,22 +520,25 @@
         None
     }
 
-    /// Closes the channel and wakes up all blocked receivers.
-    pub fn close(&self) {
-        assert!(!self.is_closed.swap(true, Ordering::SeqCst));
-        self.receivers.close();
+    /// Disconnects the channel and wakes up all blocked receivers.
+    pub fn disconnect(&self) {
+        let tail = self.tail.index.fetch_or(MARK_BIT, Ordering::SeqCst);
+
+        if tail & MARK_BIT == 0 {
+            self.receivers.disconnect();
+        }
     }
 
-    /// Returns `true` if the channel is closed.
-    pub fn is_closed(&self) -> bool {
-        self.is_closed.load(Ordering::SeqCst)
+    /// Returns `true` if the channel is disconnected.
+    pub fn is_disconnected(&self) -> bool {
+        self.tail.index.load(Ordering::SeqCst) & MARK_BIT != 0
     }
 
     /// Returns `true` if the channel is empty.
     pub fn is_empty(&self) -> bool {
-        let head_index = self.head.index.load(Ordering::SeqCst);
-        let tail_index = self.tail.index.load(Ordering::SeqCst);
-        head_index == tail_index
+        let head = self.head.index.load(Ordering::SeqCst);
+        let tail = self.tail.index.load(Ordering::SeqCst);
+        head >> SHIFT == tail >> SHIFT
     }
 
     /// Returns `true` if the channel is full.
@@ -445,34 +549,36 @@
 
 impl<T> Drop for Channel<T> {
     fn drop(&mut self) {
-        // Get the tail and head indices.
-        let tail_index = self.tail.index.load(Ordering::Relaxed);
-        let mut head_index = self.head.index.load(Ordering::Relaxed);
+        let mut head = self.head.index.load(Ordering::Relaxed);
+        let mut tail = self.tail.index.load(Ordering::Relaxed);
+        let mut block = self.head.block.load(Ordering::Relaxed);
+
+        // Erase the lower bits.
+        head &= !((1 << SHIFT) - 1);
+        tail &= !((1 << SHIFT) - 1);
 
         unsafe {
-            let mut head_ptr = self.head.block.load(Ordering::Relaxed, epoch::unprotected());
-
-            // Manually drop all messages between `head_index` and `tail_index` and destroy the
-            // heap-allocated nodes along the way.
-            while head_index != tail_index {
-                let head = head_ptr.deref();
-                let offset = head_index.wrapping_sub(head.start_index);
-
-                let slot = &mut *head.slots.get_unchecked(offset).get();
-                ManuallyDrop::drop(&mut (*slot).msg.get().read());
-
-                if offset + 1 == BLOCK_CAP {
-                    let next = head.next.load(Ordering::Relaxed, epoch::unprotected());
-                    drop(head_ptr.into_owned());
-                    head_ptr = next;
+            // Drop all messages between head and tail and deallocate the heap-allocated blocks.
+            while head != tail {
+                let offset = (head >> SHIFT) % LAP;
+
+                if offset < BLOCK_CAP {
+                    // Drop the message in the slot.
+                    let slot = (*block).slots.get_unchecked(offset);
+                    ManuallyDrop::drop(&mut *(*slot).msg.get());
+                } else {
+                    // Deallocate the block and move to the next one.
+                    let next = (*block).next.load(Ordering::Relaxed);
+                    drop(Box::from_raw(block));
+                    block = next;
                 }
 
-                head_index = head_index.wrapping_add(1);
+                head = head.wrapping_add(1 << SHIFT);
             }
 
-            // If there is one last remaining block in the end, destroy it.
-            if !head_ptr.is_null() {
-                drop(head_ptr.into_owned());
+            // Deallocate the last remaining block.
+            if !block.is_null() {
+                drop(Box::from_raw(block));
             }
         }
     }
@@ -485,11 +591,7 @@
 pub struct Sender<'a, T: 'a>(&'a Channel<T>);
 
 impl<'a, T> SelectHandle for Receiver<'a, T> {
-    fn try(&self, token: &mut Token) -> bool {
-        self.0.start_recv(token)
-    }
-
-    fn retry(&self, token: &mut Token) -> bool {
+    fn try_select(&self, token: &mut Token) -> bool {
         self.0.start_recv(token)
     }
 
@@ -497,9 +599,9 @@
         None
     }
 
-    fn register(&self, _token: &mut Token, oper: Operation, cx: &Context) -> bool {
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
         self.0.receivers.register(oper, cx);
-        self.0.is_empty() && !self.0.is_closed()
+        self.is_ready()
     }
 
     fn unregister(&self, oper: Operation) {
@@ -507,38 +609,49 @@
     }
 
     fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
-        self.0.start_recv(token)
+        self.try_select(token)
     }
 
-    fn state(&self) -> usize {
-        self.0.tail.index.load(Ordering::SeqCst)
+    fn is_ready(&self) -> bool {
+        !self.0.is_empty() || self.0.is_disconnected()
     }
-}
 
-impl<'a, T> SelectHandle for Sender<'a, T> {
-    fn try(&self, _token: &mut Token) -> bool {
-        true
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        self.0.receivers.watch(oper, cx);
+        self.is_ready()
     }
 
-    fn retry(&self, _token: &mut Token) -> bool {
-        true
+    fn unwatch(&self, oper: Operation) {
+        self.0.receivers.unwatch(oper);
+    }
+}
+
+impl<'a, T> SelectHandle for Sender<'a, T> {
+    fn try_select(&self, token: &mut Token) -> bool {
+        self.0.start_send(token)
     }
 
     fn deadline(&self) -> Option<Instant> {
         None
     }
 
-    fn register(&self, _token: &mut Token, _oper: Operation, _cx: &Context) -> bool {
-        false
+    fn register(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
     }
 
     fn unregister(&self, _oper: Operation) {}
 
-    fn accept(&self, _token: &mut Token, _cx: &Context) -> bool {
+    fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
+        self.try_select(token)
+    }
+
+    fn is_ready(&self) -> bool {
         true
     }
 
-    fn state(&self) -> usize {
-        self.0.head.index.load(Ordering::SeqCst)
+    fn watch(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
     }
+
+    fn unwatch(&self, _oper: Operation) {}
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/mod.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/mod.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,15 +1,17 @@
 //! Channel flavors.
 //!
-//! There are five flavors:
+//! There are six flavors:
 //!
 //! 1. `after` - Channel that delivers a message after a certain amount of time.
 //! 2. `array` - Bounded channel based on a preallocated array.
 //! 3. `list` - Unbounded channel implemented as a linked list.
-//! 4. `tick` - Channel that delivers messages periodically.
-//! 5. `zero` - Zero-capacity channel.
+//! 4. `never` - Channel that never delivers messages.
+//! 5. `tick` - Channel that delivers messages periodically.
+//! 6. `zero` - Zero-capacity channel.
 
 pub mod after;
 pub mod array;
 pub mod list;
+pub mod never;
 pub mod tick;
 pub mod zero;
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/never.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/never.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/never.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/never.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,110 @@
+//! Channel that never delivers messages.
+//!
+//! Messages cannot be sent into this kind of channel.
+
+use std::marker::PhantomData;
+use std::time::Instant;
+
+use context::Context;
+use err::{RecvTimeoutError, TryRecvError};
+use select::{Operation, SelectHandle, Token};
+use utils;
+
+/// This flavor doesn't need a token.
+pub type NeverToken = ();
+
+/// Channel that never delivers messages.
+pub struct Channel<T> {
+    _marker: PhantomData<T>,
+}
+
+impl<T> Channel<T> {
+    /// Creates a channel that never delivers messages.
+    #[inline]
+    pub fn new() -> Self {
+        Channel {
+            _marker: PhantomData,
+        }
+    }
+
+    /// Attempts to receive a message without blocking.
+    #[inline]
+    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+        Err(TryRecvError::Empty)
+    }
+
+    /// Receives a message from the channel.
+    #[inline]
+    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
+        utils::sleep_until(deadline);
+        Err(RecvTimeoutError::Timeout)
+    }
+
+    /// Reads a message from the channel.
+    #[inline]
+    pub unsafe fn read(&self, _token: &mut Token) -> Result<T, ()> {
+        Err(())
+    }
+
+    /// Returns `true` if the channel is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        true
+    }
+
+    /// Returns `true` if the channel is full.
+    #[inline]
+    pub fn is_full(&self) -> bool {
+        true
+    }
+
+    /// Returns the number of messages in the channel.
+    #[inline]
+    pub fn len(&self) -> usize {
+        0
+    }
+
+    /// Returns the capacity of the channel.
+    #[inline]
+    pub fn capacity(&self) -> Option<usize> {
+        Some(0)
+    }
+}
+
+impl<T> SelectHandle for Channel<T> {
+    #[inline]
+    fn try_select(&self, _token: &mut Token) -> bool {
+        false
+    }
+
+    #[inline]
+    fn deadline(&self) -> Option<Instant> {
+        None
+    }
+
+    #[inline]
+    fn register(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
+    }
+
+    #[inline]
+    fn unregister(&self, _oper: Operation) {}
+
+    #[inline]
+    fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
+        self.try_select(token)
+    }
+
+    #[inline]
+    fn is_ready(&self) -> bool {
+        false
+    }
+
+    #[inline]
+    fn watch(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
+    }
+
+    #[inline]
+    fn unwatch(&self, _oper: Operation) {}
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/tick.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/tick.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/tick.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/tick.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2,34 +2,22 @@
 //!
 //! Messages cannot be sent into this kind of channel; they are materialized on demand.
 
-use std::num::Wrapping;
-use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
 
-use parking_lot::Mutex;
+use crossbeam_utils::atomic::AtomicCell;
 
-use internal::channel::RecvNonblocking;
-use internal::context::Context;
-use internal::select::{Operation, SelectHandle, Token};
+use context::Context;
+use err::{RecvTimeoutError, TryRecvError};
+use select::{Operation, SelectHandle, Token};
 
 /// Result of a receive operation.
 pub type TickToken = Option<Instant>;
 
-/// Channel state.
-struct Inner {
-    /// The instant at which the next message will be delivered.
-    deadline: Instant,
-
-    /// The index of the next message to be received.
-    index: Wrapping<usize>,
-}
-
 /// Channel that delivers messages periodically.
 pub struct Channel {
-    /// The state of the channel.
-    // TODO: Use `Arc<AtomicCell<Inner>>` here once we implement `AtomicCell`.
-    inner: Arc<Mutex<Inner>>,
+    /// The instant at which the next message will be delivered.
+    delivery_time: AtomicCell<Instant>,
 
     /// The time interval in which messages get delivered.
     duration: Duration,
@@ -40,72 +28,83 @@
     #[inline]
     pub fn new(dur: Duration) -> Self {
         Channel {
-            inner: Arc::new(Mutex::new(Inner {
-                deadline: Instant::now() + dur,
-                index: Wrapping(0),
-            })),
+            delivery_time: AtomicCell::new(Instant::now() + dur),
             duration: dur,
         }
     }
 
-    /// Returns a unique identifier for the channel.
+    /// Attempts to receive a message without blocking.
     #[inline]
-    pub fn channel_id(&self) -> usize {
-        self.inner.as_ref() as *const Mutex<Inner> as usize
+    pub fn try_recv(&self) -> Result<Instant, TryRecvError> {
+        loop {
+            let now = Instant::now();
+            let delivery_time = self.delivery_time.load();
+
+            if now < delivery_time {
+                return Err(TryRecvError::Empty);
+            }
+
+            if self
+                .delivery_time
+                .compare_exchange(delivery_time, now + self.duration)
+                .is_ok()
+            {
+                return Ok(delivery_time);
+            }
+        }
     }
 
     /// Receives a message from the channel.
     #[inline]
-    pub fn recv(&self) -> Option<Instant> {
+    pub fn recv(&self, deadline: Option<Instant>) -> Result<Instant, RecvTimeoutError> {
         loop {
-            // Compute the time to sleep until the next message.
+            // Compute the time to sleep until the next message or the deadline.
             let offset = {
-                let mut inner = self.inner.lock();
+                let mut delivery_time = self.delivery_time.load();
                 let now = Instant::now();
 
-                // If the deadline has been reached, we can receive the next message.
-                if now >= inner.deadline {
-                    let msg = Some(inner.deadline);
-                    inner.deadline = now + self.duration;
-                    inner.index += Wrapping(1);
-                    return msg;
+                // Check if we can receive the next message.
+                if now >= delivery_time
+                    && self
+                        .delivery_time
+                        .compare_exchange(delivery_time, now + self.duration)
+                        .is_ok()
+                {
+                    return Ok(delivery_time);
                 }
 
-                inner.deadline - now
+                // Check if the operation deadline has been reached.
+                if let Some(d) = deadline {
+                    if now >= d {
+                        return Err(RecvTimeoutError::Timeout);
+                    }
+
+                    delivery_time.min(d) - now
+                } else {
+                    delivery_time - now
+                }
             };
 
             thread::sleep(offset);
         }
     }
 
-    /// Attempts to receive a message without blocking.
-    #[inline]
-    pub fn recv_nonblocking(&self) -> RecvNonblocking<Instant> {
-        let mut inner = self.inner.lock();
-        let now = Instant::now();
-
-        // If the deadline has been reached, we can receive the next message.
-        if now >= inner.deadline {
-            let msg = RecvNonblocking::Message(inner.deadline);
-            inner.deadline = now + self.duration;
-            inner.index += Wrapping(1);
-            msg
-        } else {
-            RecvNonblocking::Empty
-        }
-    }
-
     /// Reads a message from the channel.
     #[inline]
-    pub unsafe fn read(&self, token: &mut Token) -> Option<Instant> {
-        token.tick
+    pub unsafe fn read(&self, token: &mut Token) -> Result<Instant, ()> {
+        token.tick.ok_or(())
     }
 
     /// Returns `true` if the channel is empty.
     #[inline]
     pub fn is_empty(&self) -> bool {
-        let inner = self.inner.lock();
-        Instant::now() < inner.deadline
+        Instant::now() < self.delivery_time.load()
+    }
+
+    /// Returns `true` if the channel is full.
+    #[inline]
+    pub fn is_full(&self) -> bool {
+        !self.is_empty()
     }
 
     /// Returns the number of messages in the channel.
@@ -125,47 +124,30 @@
     }
 }
 
-impl Clone for Channel {
-    #[inline]
-    fn clone(&self) -> Channel {
-        Channel {
-            inner: self.inner.clone(),
-            duration: self.duration,
-        }
-    }
-}
-
 impl SelectHandle for Channel {
     #[inline]
-    fn try(&self, token: &mut Token) -> bool {
-        match self.recv_nonblocking() {
-            RecvNonblocking::Message(msg) => {
+    fn try_select(&self, token: &mut Token) -> bool {
+        match self.try_recv() {
+            Ok(msg) => {
                 token.tick = Some(msg);
                 true
             }
-            RecvNonblocking::Closed => {
+            Err(TryRecvError::Disconnected) => {
                 token.tick = None;
                 true
             }
-            RecvNonblocking::Empty => {
-                false
-            }
+            Err(TryRecvError::Empty) => false,
         }
     }
 
     #[inline]
-    fn retry(&self, token: &mut Token) -> bool {
-        self.try(token)
-    }
-
-    #[inline]
     fn deadline(&self) -> Option<Instant> {
-        Some(self.inner.lock().deadline)
+        Some(self.delivery_time.load())
     }
 
     #[inline]
-    fn register(&self, _token: &mut Token, _oper: Operation, _cx: &Context) -> bool {
-        true
+    fn register(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
     }
 
     #[inline]
@@ -173,18 +155,19 @@
 
     #[inline]
     fn accept(&self, token: &mut Token, _cx: &Context) -> bool {
-        self.try(token)
+        self.try_select(token)
     }
 
     #[inline]
-    fn state(&self) -> usize {
-        // Return the index of the next message to be delivered to the channel.
-        let inner = self.inner.lock();
-        let index = if Instant::now() < inner.deadline {
-            inner.index
-        } else {
-            inner.index + Wrapping(1)
-        };
-        index.0
+    fn is_ready(&self) -> bool {
+        !self.is_empty()
     }
+
+    #[inline]
+    fn watch(&self, _oper: Operation, _cx: &Context) -> bool {
+        self.is_ready()
+    }
+
+    #[inline]
+    fn unwatch(&self, _oper: Operation) {}
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/flavors/zero.rs cargo-0.33.0/vendor/crossbeam-channel/src/flavors/zero.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/flavors/zero.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/flavors/zero.rs	2019-02-06 04:11:58.000000000 +0000
@@ -5,16 +5,15 @@
 use std::cell::UnsafeCell;
 use std::marker::PhantomData;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::thread;
 use std::time::Instant;
 
-use parking_lot::Mutex;
+use crossbeam_utils::Backoff;
 
-use internal::channel::RecvNonblocking;
-use internal::context::Context;
-use internal::select::{Operation, Selected, SelectHandle, Token};
-use internal::utils::Backoff;
-use internal::waker::Waker;
+use context::Context;
+use err::{RecvTimeoutError, SendTimeoutError, TryRecvError, TrySendError};
+use select::{Operation, SelectHandle, Selected, Token};
+use utils::Mutex;
+use waker::Waker;
 
 /// A pointer to a packet.
 pub type ZeroToken = usize;
@@ -61,7 +60,7 @@
 
     /// Waits until the packet becomes ready for reading or writing.
     fn wait_ready(&self) {
-        let mut backoff = Backoff::new();
+        let backoff = Backoff::new();
         while !self.ready.load(Ordering::Acquire) {
             backoff.snooze();
         }
@@ -76,8 +75,8 @@
     /// Receivers waiting to pair up with a send operation.
     receivers: Waker,
 
-    /// Equals `true` when the channel is closed.
-    is_closed: bool,
+    /// Equals `true` when the channel is disconnected.
+    is_disconnected: bool,
 }
 
 /// Zero-capacity channel.
@@ -96,7 +95,7 @@
             inner: Mutex::new(Inner {
                 senders: Waker::new(),
                 receivers: Waker::new(),
-                is_closed: false,
+                is_disconnected: false,
             }),
             _marker: PhantomData,
         }
@@ -113,127 +112,55 @@
     }
 
     /// Attempts to reserve a slot for sending a message.
-    fn start_send(&self, token: &mut Token, short_pause: bool) -> bool {
+    fn start_send(&self, token: &mut Token) -> bool {
         let mut inner = self.inner.lock();
 
         // If there's a waiting receiver, pair up with it.
-        if let Some(operation) = inner.receivers.wake_one() {
+        if let Some(operation) = inner.receivers.try_select() {
             token.zero = operation.packet;
-            return true;
-        }
-
-        if !short_pause {
-            return false;
+            true
+        } else if inner.is_disconnected {
+            token.zero = 0;
+            true
+        } else {
+            false
         }
-
-        Context::with(|cx| {
-            // Register this send operation so that another receiver can pair up with it.
-            let oper = Operation::hook(token);
-            let packet = Box::into_raw(Packet::<T>::empty_on_heap());
-            inner.senders.register_with_packet(oper, packet as usize, cx);
-            drop(inner);
-
-            // Yield to give receivers a chance to pair up with this operation.
-            thread::yield_now();
-
-            let sel = match cx.try_select(Selected::Aborted) {
-                Ok(()) => Selected::Aborted,
-                Err(s) => s,
-            };
-
-            match sel {
-                Selected::Waiting | Selected::Closed => unreachable!(),
-                Selected::Aborted => {
-                    // Unregister and destroy the packet.
-                    let operation = self.inner.lock().senders.unregister(oper).unwrap();
-                    unsafe {
-                        drop(Box::from_raw(operation.packet as *mut Packet<T>));
-                    }
-                    false
-                },
-                Selected::Operation(_) => {
-                    // Success! A receiver has paired up with this operation.
-                    token.zero = cx.wait_packet();
-                    true
-                },
-            }
-        })
     }
 
     /// Writes a message into the packet.
-    pub unsafe fn write(&self, token: &mut Token, msg: T) {
+    pub unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
+        // If there is no packet, the channel is disconnected.
+        if token.zero == 0 {
+            return Err(msg);
+        }
+
         let packet = &*(token.zero as *const Packet<T>);
         packet.msg.get().write(Some(msg));
         packet.ready.store(true, Ordering::Release);
+        Ok(())
     }
 
     /// Attempts to pair up with a sender.
-    fn start_recv(&self, token: &mut Token, short_pause: bool) -> bool {
+    fn start_recv(&self, token: &mut Token) -> bool {
         let mut inner = self.inner.lock();
 
         // If there's a waiting sender, pair up with it.
-        if let Some(operation) = inner.senders.wake_one() {
+        if let Some(operation) = inner.senders.try_select() {
             token.zero = operation.packet;
-            return true;
-        } else if inner.is_closed {
+            true
+        } else if inner.is_disconnected {
             token.zero = 0;
-            return true;
-        }
-
-        if !short_pause {
-            return false;
+            true
+        } else {
+            false
         }
-
-        Context::with(|cx| {
-            // Register this receive operation so that another sender can pair up with it.
-            let oper = Operation::hook(token);
-            let packet = Box::into_raw(Packet::<T>::empty_on_heap());
-            inner.receivers.register_with_packet(oper, packet as usize, cx);
-            drop(inner);
-
-            // Yield to give senders a chance to pair up with this operation.
-            thread::yield_now();
-
-            let sel = match cx.try_select(Selected::Aborted) {
-                Ok(()) => Selected::Aborted,
-                Err(s) => s,
-            };
-
-            match sel {
-                Selected::Waiting => unreachable!(),
-                Selected::Aborted => {
-                    // Unregister and destroy the packet.
-                    let operation = self.inner.lock().receivers.unregister(oper).unwrap();
-                    unsafe {
-                        drop(Box::from_raw(operation.packet as *mut Packet<T>));
-                    }
-                    false
-                },
-                Selected::Closed => {
-                    // Unregister and destroy the packet.
-                    let operation = self.inner.lock().receivers.unregister(oper).unwrap();
-                    unsafe {
-                        drop(Box::from_raw(operation.packet as *mut Packet<T>));
-                    }
-
-                    // All senders have just been dropped.
-                    token.zero = 0;
-                    true
-                },
-                Selected::Operation(_) => {
-                    // Success! A sender has paired up with this operation.
-                    token.zero = cx.wait_packet();
-                    true
-                },
-            }
-        })
     }
 
     /// Reads a message from the packet.
-    pub unsafe fn read(&self, token: &mut Token) -> Option<T> {
-        // If there is no packet, the channel is closed.
+    pub unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
+        // If there is no packet, the channel is disconnected.
         if token.zero == 0 {
-            return None;
+            return Err(());
         }
 
         let packet = &*(token.zero as *const Packet<T>);
@@ -244,121 +171,168 @@
             // order to signal that the packet can be destroyed.
             let msg = packet.msg.get().replace(None).unwrap();
             packet.ready.store(true, Ordering::Release);
-            Some(msg)
+            Ok(msg)
         } else {
             // Wait until the message becomes available, then read it and destroy the
             // heap-allocated packet.
             packet.wait_ready();
             let msg = packet.msg.get().replace(None).unwrap();
             drop(Box::from_raw(packet as *const Packet<T> as *mut Packet<T>));
-            Some(msg)
+            Ok(msg)
+        }
+    }
+
+    /// Attempts to send a message into the channel.
+    pub fn try_send(&self, msg: T) -> Result<(), TrySendError<T>> {
+        let token = &mut Token::default();
+        let mut inner = self.inner.lock();
+
+        // If there's a waiting receiver, pair up with it.
+        if let Some(operation) = inner.receivers.try_select() {
+            token.zero = operation.packet;
+            drop(inner);
+            unsafe {
+                self.write(token, msg).ok().unwrap();
+            }
+            Ok(())
+        } else if inner.is_disconnected {
+            Err(TrySendError::Disconnected(msg))
+        } else {
+            Err(TrySendError::Full(msg))
         }
     }
 
     /// Sends a message into the channel.
-    pub fn send(&self, msg: T) {
+    pub fn send(&self, msg: T, deadline: Option<Instant>) -> Result<(), SendTimeoutError<T>> {
         let token = &mut Token::default();
         let mut inner = self.inner.lock();
 
         // If there's a waiting receiver, pair up with it.
-        if let Some(operation) = inner.receivers.wake_one() {
+        if let Some(operation) = inner.receivers.try_select() {
             token.zero = operation.packet;
             drop(inner);
-            unsafe { self.write(token, msg); }
-            return;
+            unsafe {
+                self.write(token, msg).ok().unwrap();
+            }
+            return Ok(());
+        }
+
+        if inner.is_disconnected {
+            return Err(SendTimeoutError::Disconnected(msg));
         }
 
         Context::with(|cx| {
             // Prepare for blocking until a receiver wakes us up.
             let oper = Operation::hook(token);
             let packet = Packet::<T>::message_on_stack(msg);
-            inner.senders.register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
+            inner
+                .senders
+                .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
+            inner.receivers.notify();
             drop(inner);
 
             // Block the current thread.
-            let sel = cx.wait_until(None);
+            let sel = cx.wait_until(deadline);
 
             match sel {
-                Selected::Waiting | Selected::Aborted | Selected::Closed => unreachable!(),
+                Selected::Waiting => unreachable!(),
+                Selected::Aborted => {
+                    self.inner.lock().senders.unregister(oper).unwrap();
+                    let msg = unsafe { packet.msg.get().replace(None).unwrap() };
+                    Err(SendTimeoutError::Timeout(msg))
+                }
+                Selected::Disconnected => {
+                    self.inner.lock().senders.unregister(oper).unwrap();
+                    let msg = unsafe { packet.msg.get().replace(None).unwrap() };
+                    Err(SendTimeoutError::Disconnected(msg))
+                }
                 Selected::Operation(_) => {
                     // Wait until the message is read, then drop the packet.
                     packet.wait_ready();
-                },
+                    Ok(())
+                }
             }
         })
     }
 
+    /// Attempts to receive a message without blocking.
+    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+        let token = &mut Token::default();
+        let mut inner = self.inner.lock();
+
+        // If there's a waiting sender, pair up with it.
+        if let Some(operation) = inner.senders.try_select() {
+            token.zero = operation.packet;
+            drop(inner);
+            unsafe { self.read(token).map_err(|_| TryRecvError::Disconnected) }
+        } else if inner.is_disconnected {
+            Err(TryRecvError::Disconnected)
+        } else {
+            Err(TryRecvError::Empty)
+        }
+    }
+
     /// Receives a message from the channel.
-    pub fn recv(&self) -> Option<T> {
+    pub fn recv(&self, deadline: Option<Instant>) -> Result<T, RecvTimeoutError> {
         let token = &mut Token::default();
         let mut inner = self.inner.lock();
 
         // If there's a waiting sender, pair up with it.
-        if let Some(operation) = inner.senders.wake_one() {
+        if let Some(operation) = inner.senders.try_select() {
             token.zero = operation.packet;
             drop(inner);
-            unsafe { return self.read(token); }
+            unsafe {
+                return self.read(token).map_err(|_| RecvTimeoutError::Disconnected);
+            }
         }
 
-        if inner.is_closed {
-            return None;
+        if inner.is_disconnected {
+            return Err(RecvTimeoutError::Disconnected);
         }
 
         Context::with(|cx| {
             // Prepare for blocking until a sender wakes us up.
             let oper = Operation::hook(token);
             let packet = Packet::<T>::empty_on_stack();
-            inner.receivers.register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
+            inner
+                .receivers
+                .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
+            inner.senders.notify();
             drop(inner);
 
             // Block the current thread.
-            let sel = cx.wait_until(None);
+            let sel = cx.wait_until(deadline);
 
             match sel {
-                Selected::Waiting | Selected::Aborted => unreachable!(),
-                Selected::Closed => {
+                Selected::Waiting => unreachable!(),
+                Selected::Aborted => {
+                    self.inner.lock().receivers.unregister(oper).unwrap();
+                    Err(RecvTimeoutError::Timeout)
+                }
+                Selected::Disconnected => {
                     self.inner.lock().receivers.unregister(oper).unwrap();
-                    None
-                },
+                    Err(RecvTimeoutError::Disconnected)
+                }
                 Selected::Operation(_) => {
                     // Wait until the message is provided, then read it.
                     packet.wait_ready();
-                    unsafe { Some(packet.msg.get().replace(None).unwrap()) }
-                },
+                    unsafe { Ok(packet.msg.get().replace(None).unwrap()) }
+                }
             }
         })
     }
 
-    /// Attempts to receive a message without blocking.
-    pub fn recv_nonblocking(&self) -> RecvNonblocking<T> {
-        let token = &mut Token::default();
+    /// Disconnects the channel and wakes up all blocked receivers.
+    pub fn disconnect(&self) {
         let mut inner = self.inner.lock();
 
-        // If there's a waiting sender, pair up with it.
-        if let Some(operation) = inner.senders.wake_one() {
-            token.zero = operation.packet;
-            drop(inner);
-
-            match unsafe { self.read(token) } {
-                None => RecvNonblocking::Closed,
-                Some(msg) => RecvNonblocking::Message(msg),
-            }
-        } else if inner.is_closed {
-            RecvNonblocking::Closed
-        } else {
-            RecvNonblocking::Empty
+        if !inner.is_disconnected {
+            inner.is_disconnected = true;
+            inner.senders.disconnect();
+            inner.receivers.disconnect();
         }
     }
 
-    /// Closes the channel and wakes up all blocked receivers.
-    pub fn close(&self) {
-        let mut inner = self.inner.lock();
-
-        assert!(!inner.is_closed);
-        inner.is_closed = true;
-        inner.receivers.close();
-    }
-
     /// Returns the current number of messages inside the channel.
     pub fn len(&self) -> usize {
         0
@@ -387,24 +361,23 @@
 pub struct Sender<'a, T: 'a>(&'a Channel<T>);
 
 impl<'a, T> SelectHandle for Receiver<'a, T> {
-    fn try(&self, token: &mut Token) -> bool {
-        self.0.start_recv(token, false)
-    }
-
-    fn retry(&self, token: &mut Token) -> bool {
-        self.0.start_recv(token, true)
+    fn try_select(&self, token: &mut Token) -> bool {
+        self.0.start_recv(token)
     }
 
     fn deadline(&self) -> Option<Instant> {
         None
     }
 
-    fn register(&self, _token: &mut Token, oper: Operation, cx: &Context) -> bool {
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
         let packet = Box::into_raw(Packet::<T>::empty_on_heap());
 
         let mut inner = self.0.inner.lock();
-        inner.receivers.register_with_packet(oper, packet as usize, cx);
-        !inner.senders.can_wake_one() && !inner.is_closed
+        inner
+            .receivers
+            .register_with_packet(oper, packet as usize, cx);
+        inner.senders.notify();
+        inner.senders.can_select() || inner.is_disconnected
     }
 
     fn unregister(&self, oper: Operation) {
@@ -420,30 +393,41 @@
         true
     }
 
-    fn state(&self) -> usize {
-        self.0.inner.lock().senders.register_count()
+    fn is_ready(&self) -> bool {
+        let inner = self.0.inner.lock();
+        inner.senders.can_select() || inner.is_disconnected
     }
-}
 
-impl<'a, T> SelectHandle for Sender<'a, T> {
-    fn try(&self, token: &mut Token) -> bool {
-        self.0.start_send(token, false)
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        let mut inner = self.0.inner.lock();
+        inner.receivers.watch(oper, cx);
+        inner.senders.can_select() || inner.is_disconnected
+    }
+
+    fn unwatch(&self, oper: Operation) {
+        let mut inner = self.0.inner.lock();
+        inner.receivers.unwatch(oper);
     }
+}
 
-    fn retry(&self, token: &mut Token) -> bool {
-        self.0.start_send(token, true)
+impl<'a, T> SelectHandle for Sender<'a, T> {
+    fn try_select(&self, token: &mut Token) -> bool {
+        self.0.start_send(token)
     }
 
     fn deadline(&self) -> Option<Instant> {
         None
     }
 
-    fn register(&self, _token: &mut Token, oper: Operation, cx: &Context) -> bool {
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
         let packet = Box::into_raw(Packet::<T>::empty_on_heap());
 
         let mut inner = self.0.inner.lock();
-        inner.senders.register_with_packet(oper, packet as usize, cx);
-        !inner.receivers.can_wake_one()
+        inner
+            .senders
+            .register_with_packet(oper, packet as usize, cx);
+        inner.receivers.notify();
+        inner.receivers.can_select() || inner.is_disconnected
     }
 
     fn unregister(&self, oper: Operation) {
@@ -459,7 +443,19 @@
         true
     }
 
-    fn state(&self) -> usize {
-        self.0.inner.lock().receivers.register_count()
+    fn is_ready(&self) -> bool {
+        let inner = self.0.inner.lock();
+        inner.receivers.can_select() || inner.is_disconnected
+    }
+
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        let mut inner = self.0.inner.lock();
+        inner.senders.watch(oper, cx);
+        inner.receivers.can_select() || inner.is_disconnected
+    }
+
+    fn unwatch(&self, oper: Operation) {
+        let mut inner = self.0.inner.lock();
+        inner.senders.unwatch(oper);
     }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/internal/channel.rs cargo-0.33.0/vendor/crossbeam-channel/src/internal/channel.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/internal/channel.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/internal/channel.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,931 +0,0 @@
-//! The channel interface.
-
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::isize;
-use std::iter::FusedIterator;
-use std::mem;
-use std::panic::{RefUnwindSafe, UnwindSafe};
-use std::process;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::time::{Duration, Instant};
-
-use flavors;
-use internal::context::Context;
-use internal::select::{Operation, SelectHandle, Token};
-
-/// A channel in the form of one of the different flavors.
-pub struct Channel<T> {
-    /// The number of senders associated with this channel.
-    senders: AtomicUsize,
-
-    /// This channel's flavor.
-    flavor: ChannelFlavor<T>,
-}
-
-/// Channel flavors.
-enum ChannelFlavor<T> {
-    /// Bounded channel based on a preallocated array.
-    Array(flavors::array::Channel<T>),
-
-    /// Unbounded channel implemented as a linked list.
-    List(flavors::list::Channel<T>),
-
-    /// Zero-capacity channel.
-    Zero(flavors::zero::Channel<T>),
-}
-
-/// Creates a channel of unbounded capacity.
-///
-/// This type of channel can hold any number of messages (i.e. it has infinite capacity).
-///
-/// # Examples
-///
-/// ```
-/// use std::thread;
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::unbounded();
-///
-/// // An expensive computation.
-/// fn fib(n: i32) -> i32 {
-///     if n <= 1 {
-///         n
-///     } else {
-///         fib(n - 1) + fib(n - 2)
-///     }
-/// }
-///
-/// // Spawn a thread doing an expensive computation.
-/// thread::spawn(move || {
-///     s.send(fib(20));
-/// });
-///
-/// // Let's see what's the result of the computation.
-/// println!("{}", r.recv().unwrap());
-/// ```
-pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
-    let chan = Arc::new(Channel {
-        senders: AtomicUsize::new(0),
-        flavor: ChannelFlavor::List(flavors::list::Channel::new()),
-    });
-
-    let s = Sender::new(chan.clone());
-    let r = Receiver(ReceiverFlavor::Channel(chan));
-    (s, r)
-}
-
-/// Creates a channel of bounded capacity.
-///
-/// This type of channel has an internal buffer of length `cap` in which messages get queued.
-///
-/// A rather special case is zero-capacity channel, also known as *rendezvous* channel. Such a
-/// channel cannot hold any messages since its buffer is of length zero. Instead, send and receive
-/// operations must be executing at the same time in order to pair up and pass the message over.
-///
-/// # Examples
-///
-/// ```
-/// use std::thread;
-/// use std::time::Duration;
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::bounded(1);
-///
-/// // This call returns immediately since there is enough space in the channel.
-/// s.send(1);
-///
-/// thread::spawn(move || {
-///     // This call blocks the current thread because the channel is full.
-///     // It will be able to complete only after the first message is received.
-///     s.send(2);
-/// });
-///
-/// thread::sleep(Duration::from_secs(1));
-/// assert_eq!(r.recv(), Some(1));
-/// assert_eq!(r.recv(), Some(2));
-/// ```
-///
-/// ```
-/// use std::thread;
-/// use std::time::Duration;
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::bounded(0);
-///
-/// thread::spawn(move || {
-///     // This call blocks the current thread until a receive operation appears
-///     // on the other side of the channel.
-///     s.send(1);
-/// });
-///
-/// thread::sleep(Duration::from_secs(1));
-/// assert_eq!(r.recv(), Some(1));
-/// ```
-pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
-    let chan = Arc::new(Channel {
-        senders: AtomicUsize::new(0),
-        flavor: {
-            if cap == 0 {
-                ChannelFlavor::Zero(flavors::zero::Channel::new())
-            } else {
-                ChannelFlavor::Array(flavors::array::Channel::with_capacity(cap))
-            }
-        },
-    });
-
-    let s = Sender::new(chan.clone());
-    let r = Receiver(ReceiverFlavor::Channel(chan));
-    (s, r)
-}
-
-/// Creates a receiver that delivers a message after a certain duration of time.
-///
-/// The channel is bounded with capacity of 1 and is never closed. Exactly one message will be
-/// automatically sent into the channel after `duration` elapses. The message is the instant at
-/// which it is sent into the channel.
-///
-/// # Examples
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
-/// # fn main() {
-/// use std::time::Duration;
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::unbounded::<i32>();
-///
-/// let timeout = Duration::from_millis(100);
-/// select! {
-///     recv(r, msg) => println!("got {:?}", msg),
-///     recv(channel::after(timeout)) => println!("timed out"),
-/// }
-/// # }
-/// ```
-///
-/// ```
-/// use std::thread;
-/// use std::time::{Duration, Instant};
-/// use crossbeam_channel as channel;
-///
-/// // Converts a number into a `Duration` in milliseconds.
-/// let ms = |ms| Duration::from_millis(ms);
-///
-/// // Returns `true` if `a` and `b` are very close `Instant`s.
-/// let eq = |a, b| a + ms(50) > b && b + ms(50) > a;
-///
-/// let start = Instant::now();
-/// let r = channel::after(ms(100));
-///
-/// thread::sleep(ms(500));
-///
-/// // This message was sent 100 ms from the start and received 500 ms from the start.
-/// assert!(eq(r.recv().unwrap(), start + ms(100)));
-/// assert!(eq(Instant::now(), start + ms(500)));
-/// ```
-pub fn after(duration: Duration) -> Receiver<Instant> {
-    Receiver(ReceiverFlavor::After(flavors::after::Channel::new(duration)))
-}
-
-/// Creates a receiver that delivers messages periodically.
-///
-/// The channel is bounded with capacity of 1 and is never closed. Messages will be automatically
-/// sent into the channel in intervals of `duration`, but the time intervals are only measured
-/// while the channel is empty. The channel always contains at most one message. Each message is
-/// the instant at which it is sent into the channel.
-///
-/// # Examples
-///
-/// ```
-/// use std::thread;
-/// use std::time::{Duration, Instant};
-/// use crossbeam_channel as channel;
-///
-/// // Converts a number into a `Duration` in milliseconds.
-/// let ms = |ms| Duration::from_millis(ms);
-///
-/// // Returns `true` if `a` and `b` are very close `Instant`s.
-/// let eq = |a, b| a + ms(50) > b && b + ms(50) > a;
-///
-/// let start = Instant::now();
-/// let r = channel::tick(ms(100));
-///
-/// // This message was sent 100 ms from the start and received 100 ms from the start.
-/// assert!(eq(r.recv().unwrap(), start + ms(100)));
-/// assert!(eq(Instant::now(), start + ms(100)));
-///
-/// thread::sleep(ms(500));
-///
-/// // This message was sent 200 ms from the start and received 600 ms from the start.
-/// assert!(eq(r.recv().unwrap(), start + ms(200)));
-/// assert!(eq(Instant::now(), start + ms(600)));
-///
-/// // This message was sent 700 ms from the start and received 700 ms from the start.
-/// assert!(eq(r.recv().unwrap(), start + ms(700)));
-/// assert!(eq(Instant::now(), start + ms(700)));
-/// ```
-pub fn tick(duration: Duration) -> Receiver<Instant> {
-    Receiver(ReceiverFlavor::Tick(flavors::tick::Channel::new(duration)))
-}
-
-/// The sending side of a channel.
-///
-/// Senders can be cloned and shared among multiple threads.
-///
-/// # Examples
-///
-/// ```
-/// use std::thread;
-/// use crossbeam_channel as channel;
-///
-/// let (s1, r) = channel::unbounded();
-/// let s2 = s1.clone();
-///
-/// thread::spawn(move || s1.send(1));
-/// thread::spawn(move || s2.send(2));
-///
-/// let msg1 = r.recv().unwrap();
-/// let msg2 = r.recv().unwrap();
-///
-/// assert_eq!(msg1 + msg2, 3);
-/// ```
-pub struct Sender<T>(Arc<Channel<T>>);
-
-unsafe impl<T: Send> Send for Sender<T> {}
-unsafe impl<T: Send> Sync for Sender<T> {}
-
-impl<T> Sender<T> {
-    /// Creates a sender handle for the channel and increments the sender count.
-    fn new(chan: Arc<Channel<T>>) -> Self {
-        let old_count = chan.senders.fetch_add(1, Ordering::SeqCst);
-
-        // Cloning senders and calling `mem::forget` on the clones could potentially overflow the
-        // counter. It's very difficult to recover sensibly from such degenerate scenarios so we
-        // just abort when the count becomes very large.
-        if old_count > isize::MAX as usize {
-            process::abort();
-        }
-
-        Sender(chan)
-    }
-
-    /// Returns a unique identifier for the channel.
-    fn channel_id(&self) -> usize {
-        &*self.0 as *const Channel<T> as usize
-    }
-
-    /// Sends a message into the channel, blocking the current thread if the channel is full.
-    ///
-    /// If called on a zero-capacity channel, this method blocks the current thread until a receive
-    /// operation appears on the other side of the channel.
-    ///
-    /// Note: `s.send(msg)` is equivalent to `select! { send(s, msg) => {} }`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::thread;
-    /// use std::time::Duration;
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::bounded(0);
-    ///
-    /// thread::spawn(move || s.send(1));
-    ///
-    /// assert_eq!(r.recv(), Some(1));
-    /// ```
-    pub fn send(&self, msg: T) {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.send(msg),
-            ChannelFlavor::List(chan) => chan.send(msg),
-            ChannelFlavor::Zero(chan) => chan.send(msg),
-        }
-    }
-
-    /// Returns `true` if the channel is empty.
-    ///
-    /// Note: zero-capacity channels are always empty.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::unbounded();
-    /// assert!(s.is_empty());
-    ///
-    /// s.send(0);
-    /// assert!(!s.is_empty());
-    /// ```
-    pub fn is_empty(&self) -> bool {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.is_empty(),
-            ChannelFlavor::List(chan) => chan.is_empty(),
-            ChannelFlavor::Zero(chan) => chan.is_empty(),
-        }
-    }
-
-    /// Returns `true` if the channel is full.
-    ///
-    /// Note: zero-capacity channels are always full.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::bounded(1);
-    ///
-    /// assert!(!s.is_full());
-    /// s.send(0);
-    /// assert!(s.is_full());
-    /// ```
-    pub fn is_full(&self) -> bool {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.is_full(),
-            ChannelFlavor::List(chan) => chan.is_full(),
-            ChannelFlavor::Zero(chan) => chan.is_full(),
-        }
-    }
-
-    /// Returns the number of messages in the channel.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::unbounded();
-    /// assert_eq!(s.len(), 0);
-    ///
-    /// s.send(1);
-    /// s.send(2);
-    /// assert_eq!(s.len(), 2);
-    /// ```
-    pub fn len(&self) -> usize {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.len(),
-            ChannelFlavor::List(chan) => chan.len(),
-            ChannelFlavor::Zero(chan) => chan.len(),
-        }
-    }
-
-    /// If the channel is bounded, returns its capacity.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, _) = channel::unbounded::<i32>();
-    /// assert_eq!(s.capacity(), None);
-    ///
-    /// let (s, _) = channel::bounded::<i32>(5);
-    /// assert_eq!(s.capacity(), Some(5));
-    ///
-    /// let (s, _) = channel::bounded::<i32>(0);
-    /// assert_eq!(s.capacity(), Some(0));
-    /// ```
-    pub fn capacity(&self) -> Option<usize> {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.capacity(),
-            ChannelFlavor::List(chan) => chan.capacity(),
-            ChannelFlavor::Zero(chan) => chan.capacity(),
-        }
-    }
-}
-
-impl<T> Drop for Sender<T> {
-    fn drop(&mut self) {
-        if self.0.senders.fetch_sub(1, Ordering::SeqCst) == 1 {
-            match &self.0.flavor {
-                ChannelFlavor::Array(chan) => chan.close(),
-                ChannelFlavor::List(chan) => chan.close(),
-                ChannelFlavor::Zero(chan) => chan.close(),
-            };
-        }
-    }
-}
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Self {
-        Sender::new(self.0.clone())
-    }
-}
-
-impl<T> fmt::Debug for Sender<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Sender").finish()
-    }
-}
-
-impl<T> Hash for Sender<T> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.channel_id().hash(state)
-    }
-}
-
-impl<T> PartialEq for Sender<T> {
-    fn eq(&self, other: &Sender<T>) -> bool {
-        self.channel_id() == other.channel_id()
-    }
-}
-
-impl<T> Eq for Sender<T> {}
-
-impl<T> PartialEq<Receiver<T>> for Sender<T> {
-    fn eq(&self, other: &Receiver<T>) -> bool {
-        self.channel_id() == other.channel_id()
-    }
-}
-
-impl<T> UnwindSafe for Sender<T> {}
-impl<T> RefUnwindSafe for Sender<T> {}
-
-/// The receiving side of a channel.
-///
-/// Receivers can be cloned and shared among multiple threads.
-///
-/// # Examples
-///
-/// ```
-/// use std::thread;
-/// use std::time::Duration;
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::unbounded();
-///
-/// thread::spawn(move || {
-///     s.send("Hello world!");
-///     thread::sleep(Duration::from_secs(2));
-///     s.send("Delayed for 2 seconds");
-/// });
-///
-/// println!("{}", r.recv().unwrap()); // Received immediately.
-/// println!("Waiting...");
-/// println!("{}", r.recv().unwrap()); // Received after 2 seconds.
-/// ```
-pub struct Receiver<T>(ReceiverFlavor<T>);
-
-/// Receiver flavors.
-pub enum ReceiverFlavor<T> {
-    /// A regular channel (array, list, or zero flavor).
-    Channel(Arc<Channel<T>>),
-
-    /// The after flavor.
-    After(flavors::after::Channel),
-
-    /// The tick flavor.
-    Tick(flavors::tick::Channel),
-}
-
-unsafe impl<T: Send> Send for Receiver<T> {}
-unsafe impl<T: Send> Sync for Receiver<T> {}
-
-impl<T> Receiver<T> {
-    /// Returns a unique identifier for the channel.
-    fn channel_id(&self) -> usize {
-        match &self.0 {
-            ReceiverFlavor::Channel(chan) => &**chan as *const Channel<T> as usize,
-            ReceiverFlavor::After(chan) => chan.channel_id(),
-            ReceiverFlavor::Tick(chan) => chan.channel_id(),
-        }
-    }
-
-    /// Blocks the current thread until a message is received or the channel is closed.
-    ///
-    /// Returns the message if it was received, or `None` if the channel is closed and empty.
-    ///
-    /// If called on a zero-capacity channel, this method blocks the current thread until a send
-    /// operation appears on the other side of the channel or it becomes closed.
-    ///
-    /// Note: `r.recv()` is equivalent to `select! { recv(r, msg) => msg }`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::thread;
-    /// use std::time::Duration;
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::unbounded();
-    ///
-    /// thread::spawn(move || {
-    ///     thread::sleep(Duration::from_secs(1));
-    ///     s.send(5);
-    ///     // `s` gets dropped, thus closing the channel.
-    /// });
-    ///
-    /// assert_eq!(r.recv(), Some(5));
-    /// assert_eq!(r.recv(), None);
-    /// ```
-    pub fn recv(&self) -> Option<T> {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.recv(),
-                ChannelFlavor::List(chan) => chan.recv(),
-                ChannelFlavor::Zero(chan) => chan.recv(),
-            },
-            ReceiverFlavor::After(chan) => unsafe {
-                mem::transmute_copy::<Option<Instant>, Option<T>>(&chan.recv())
-            },
-            ReceiverFlavor::Tick(chan) => unsafe {
-                mem::transmute_copy::<Option<Instant>, Option<T>>(&chan.recv())
-            },
-        }
-    }
-
-    /// Attempts to receive a message from the channel without blocking.
-    ///
-    /// If there is no message ready to be received, returns `None`.
-    ///
-    /// Note: `r.try_recv()` is equivalent to `select! { recv(r, msg) => msg, default => None }`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::unbounded();
-    /// assert_eq!(r.try_recv(), None);
-    ///
-    /// s.send(5);
-    /// drop(s);
-    ///
-    /// assert_eq!(r.try_recv(), Some(5));
-    /// assert_eq!(r.try_recv(), None);
-    /// ```
-    pub fn try_recv(&self) -> Option<T> {
-        match recv_nonblocking(self) {
-            RecvNonblocking::Message(msg) => Some(msg),
-            RecvNonblocking::Empty => None,
-            RecvNonblocking::Closed => None,
-        }
-    }
-
-    /// Returns `true` if the channel is empty.
-    ///
-    /// Note: zero-capacity channels are always empty.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::unbounded();
-    ///
-    /// assert!(r.is_empty());
-    /// s.send(0);
-    /// assert!(!r.is_empty());
-    /// ```
-    pub fn is_empty(&self) -> bool {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.is_empty(),
-                ChannelFlavor::List(chan) => chan.is_empty(),
-                ChannelFlavor::Zero(chan) => chan.is_empty(),
-            },
-            ReceiverFlavor::After(chan) => chan.is_empty(),
-            ReceiverFlavor::Tick(chan) => chan.is_empty(),
-        }
-    }
-
-    /// Returns `true` if the channel is full.
-    ///
-    /// Note: zero-capacity channels are always full.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::bounded(1);
-    ///
-    /// assert!(!r.is_full());
-    /// s.send(0);
-    /// assert!(r.is_full());
-    /// ```
-    pub fn is_full(&self) -> bool {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.is_full(),
-                ChannelFlavor::List(chan) => chan.is_full(),
-                ChannelFlavor::Zero(chan) => chan.is_full(),
-            },
-            ReceiverFlavor::After(chan) => !chan.is_empty(),
-            ReceiverFlavor::Tick(chan) => !chan.is_empty(),
-        }
-    }
-
-    /// Returns the number of messages in the channel.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (s, r) = channel::unbounded();
-    /// assert_eq!(r.len(), 0);
-    ///
-    /// s.send(1);
-    /// s.send(2);
-    /// assert_eq!(r.len(), 2);
-    /// ```
-    pub fn len(&self) -> usize {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.len(),
-                ChannelFlavor::List(chan) => chan.len(),
-                ChannelFlavor::Zero(chan) => chan.len(),
-            },
-            ReceiverFlavor::After(chan) => chan.len(),
-            ReceiverFlavor::Tick(chan) => chan.len(),
-        }
-    }
-
-    /// If the channel is bounded, returns its capacity.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_channel as channel;
-    ///
-    /// let (_, r) = channel::unbounded::<i32>();
-    /// assert_eq!(r.capacity(), None);
-    ///
-    /// let (_, r) = channel::bounded::<i32>(5);
-    /// assert_eq!(r.capacity(), Some(5));
-    ///
-    /// let (_, r) = channel::bounded::<i32>(0);
-    /// assert_eq!(r.capacity(), Some(0));
-    /// ```
-    pub fn capacity(&self) -> Option<usize> {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.capacity(),
-                ChannelFlavor::List(chan) => chan.capacity(),
-                ChannelFlavor::Zero(chan) => chan.capacity(),
-            },
-            ReceiverFlavor::After(chan) => chan.capacity(),
-            ReceiverFlavor::Tick(chan) => chan.capacity(),
-        }
-    }
-}
-
-impl<T> Clone for Receiver<T> {
-    fn clone(&self) -> Self {
-        let inner = match &self.0 {
-            ReceiverFlavor::Channel(arc) => ReceiverFlavor::Channel(arc.clone()),
-            ReceiverFlavor::After(chan) => ReceiverFlavor::After(chan.clone()),
-            ReceiverFlavor::Tick(chan) => ReceiverFlavor::Tick(chan.clone()),
-        };
-        Receiver(inner)
-    }
-}
-
-impl<T> fmt::Debug for Receiver<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Receiver").finish()
-    }
-}
-
-impl<T> Hash for Receiver<T> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.channel_id().hash(state)
-    }
-}
-
-impl<T> PartialEq for Receiver<T> {
-    fn eq(&self, other: &Receiver<T>) -> bool {
-        self.channel_id() == other.channel_id()
-    }
-}
-
-impl<T> Eq for Receiver<T> {}
-
-impl<T> PartialEq<Sender<T>> for Receiver<T> {
-    fn eq(&self, other: &Sender<T>) -> bool {
-        self.channel_id() == other.channel_id()
-    }
-}
-
-impl<T> Iterator for Receiver<T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.recv()
-    }
-}
-
-impl<T> FusedIterator for Receiver<T> {}
-
-impl<'a, T> IntoIterator for &'a Receiver<T> {
-    type Item = T;
-    type IntoIter = Receiver<T>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.clone()
-    }
-}
-
-impl<T> UnwindSafe for Receiver<T> {}
-impl<T> RefUnwindSafe for Receiver<T> {}
-
-impl<T> SelectHandle for Sender<T> {
-    fn try(&self, token: &mut Token) -> bool {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.sender().try(token),
-            ChannelFlavor::List(chan) => chan.sender().try(token),
-            ChannelFlavor::Zero(chan) => chan.sender().try(token),
-        }
-    }
-
-    fn retry(&self, token: &mut Token) -> bool {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.sender().retry(token),
-            ChannelFlavor::List(chan) => chan.sender().retry(token),
-            ChannelFlavor::Zero(chan) => chan.sender().retry(token),
-        }
-    }
-
-    fn deadline(&self) -> Option<Instant> {
-        None
-    }
-
-    fn register(&self, token: &mut Token, oper: Operation, cx: &Context) -> bool {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.sender().register(token, oper, cx),
-            ChannelFlavor::List(chan) => chan.sender().register(token, oper, cx),
-            ChannelFlavor::Zero(chan) => chan.sender().register(token, oper, cx),
-        }
-    }
-
-    fn unregister(&self, oper: Operation) {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.sender().unregister(oper),
-            ChannelFlavor::List(chan) => chan.sender().unregister(oper),
-            ChannelFlavor::Zero(chan) => chan.sender().unregister(oper),
-        }
-    }
-
-    fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.sender().accept(token, cx),
-            ChannelFlavor::List(chan) => chan.sender().accept(token, cx),
-            ChannelFlavor::Zero(chan) => chan.sender().accept(token, cx),
-        }
-    }
-
-    fn state(&self) -> usize {
-        match &self.0.flavor {
-            ChannelFlavor::Array(chan) => chan.sender().state(),
-            ChannelFlavor::List(chan) => chan.sender().state(),
-            ChannelFlavor::Zero(chan) => chan.sender().state(),
-        }
-    }
-}
-
-impl<T> SelectHandle for Receiver<T> {
-    fn try(&self, token: &mut Token) -> bool {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.receiver().try(token),
-                ChannelFlavor::List(chan) => chan.receiver().try(token),
-                ChannelFlavor::Zero(chan) => chan.receiver().try(token),
-            },
-            ReceiverFlavor::After(chan) => chan.try(token),
-            ReceiverFlavor::Tick(chan) => chan.try(token),
-        }
-    }
-
-    fn retry(&self, token: &mut Token) -> bool {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.receiver().retry(token),
-                ChannelFlavor::List(chan) => chan.receiver().retry(token),
-                ChannelFlavor::Zero(chan) => chan.receiver().retry(token),
-            },
-            ReceiverFlavor::After(chan) => chan.retry(token),
-            ReceiverFlavor::Tick(chan) => chan.retry(token),
-        }
-    }
-
-    fn deadline(&self) -> Option<Instant> {
-        match &self.0 {
-            ReceiverFlavor::Channel(_) => None,
-            ReceiverFlavor::After(chan) => chan.deadline(),
-            ReceiverFlavor::Tick(chan) => chan.deadline(),
-        }
-    }
-
-    fn register(&self, token: &mut Token, oper: Operation, cx: &Context) -> bool {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.receiver().register(token, oper, cx),
-                ChannelFlavor::List(chan) => chan.receiver().register(token, oper, cx),
-                ChannelFlavor::Zero(chan) => chan.receiver().register(token, oper, cx),
-            },
-            ReceiverFlavor::After(chan) => chan.register(token, oper, cx),
-            ReceiverFlavor::Tick(chan) => chan.register(token, oper, cx),
-        }
-    }
-
-    fn unregister(&self, oper: Operation) {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.receiver().unregister(oper),
-                ChannelFlavor::List(chan) => chan.receiver().unregister(oper),
-                ChannelFlavor::Zero(chan) => chan.receiver().unregister(oper),
-            },
-            ReceiverFlavor::After(chan) => chan.unregister(oper),
-            ReceiverFlavor::Tick(chan) => chan.unregister(oper),
-        }
-    }
-
-    fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.receiver().accept(token, cx),
-                ChannelFlavor::List(chan) => chan.receiver().accept(token, cx),
-                ChannelFlavor::Zero(chan) => chan.receiver().accept(token, cx),
-            },
-            ReceiverFlavor::After(chan) => chan.accept(token, cx),
-            ReceiverFlavor::Tick(chan) => chan.accept(token, cx),
-        }
-    }
-
-    fn state(&self) -> usize {
-        match &self.0 {
-            ReceiverFlavor::Channel(arc) => match &arc.flavor {
-                ChannelFlavor::Array(chan) => chan.receiver().state(),
-                ChannelFlavor::List(chan) => chan.receiver().state(),
-                ChannelFlavor::Zero(chan) => chan.receiver().state(),
-            },
-            ReceiverFlavor::After(chan) => chan.state(),
-            ReceiverFlavor::Tick(chan) => chan.state(),
-        }
-    }
-}
-
-/// Writes a message into the channel.
-pub unsafe fn write<T>(s: &Sender<T>, token: &mut Token, msg: T) {
-    match &s.0.flavor {
-        ChannelFlavor::Array(chan) => chan.write(token, msg),
-        ChannelFlavor::List(chan) => chan.write(token, msg),
-        ChannelFlavor::Zero(chan) => chan.write(token, msg),
-    }
-}
-
-/// Receives a message from the channel.
-pub unsafe fn read<T>(r: &Receiver<T>, token: &mut Token) -> Option<T> {
-    match &r.0 {
-        ReceiverFlavor::Channel(arc) => match &arc.flavor {
-            ChannelFlavor::Array(chan) => chan.read(token),
-            ChannelFlavor::List(chan) => chan.read(token),
-            ChannelFlavor::Zero(chan) => chan.read(token),
-        },
-        ReceiverFlavor::After(chan) => {
-            mem::transmute_copy::<Option<Instant>, Option<T>>(&chan.read(token))
-        },
-        ReceiverFlavor::Tick(chan) => {
-            mem::transmute_copy::<Option<Instant>, Option<T>>(&chan.read(token))
-        },
-    }
-}
-
-/// The result of a non-blocking receive operation.
-pub enum RecvNonblocking<T> {
-    /// A message was received.
-    Message(T),
-
-    /// The channel is empty.
-    Empty,
-
-    /// The channel is empty and closed.
-    Closed,
-}
-
-/// Attempts to receive a message without blocking.
-pub fn recv_nonblocking<T>(r: &Receiver<T>) -> RecvNonblocking<T> {
-    match &r.0 {
-        ReceiverFlavor::Channel(arc) => match &arc.flavor {
-            ChannelFlavor::Array(chan) => chan.recv_nonblocking(),
-            ChannelFlavor::List(chan) => chan.recv_nonblocking(),
-            ChannelFlavor::Zero(chan) => chan.recv_nonblocking(),
-        },
-        ReceiverFlavor::After(chan) => {
-            let res = chan.recv_nonblocking();
-            unsafe {
-                mem::transmute_copy::<RecvNonblocking<Instant>, RecvNonblocking<T>>(&res)
-            }
-        },
-        ReceiverFlavor::Tick(chan) => {
-            let res = chan.recv_nonblocking();
-            unsafe {
-                mem::transmute_copy::<RecvNonblocking<Instant>, RecvNonblocking<T>>(&res)
-            }
-        },
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/internal/context.rs cargo-0.33.0/vendor/crossbeam-channel/src/internal/context.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/internal/context.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/internal/context.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-//! Thread-local context used in select.
-
-use std::cell::Cell;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::thread::{self, Thread, ThreadId};
-use std::time::Instant;
-
-use internal::select::Selected;
-use internal::utils::Backoff;
-
-/// Thread-local context used in select.
-#[derive(Clone)]
-pub struct Context {
-    inner: Arc<Inner>,
-}
-
-/// Inner representation of `Context`
-struct Inner {
-    /// Selected operation.
-    select: AtomicUsize,
-
-    /// A slot into which another thread may store a pointer to its `Packet`.
-    packet: AtomicUsize,
-
-    /// Thread handle.
-    thread: Thread,
-
-    /// Thread id.
-    thread_id: ThreadId,
-}
-
-impl Context {
-    /// Creates a new context for the duration of the closure.
-    #[inline]
-    pub fn with<F, R>(f: F) -> R
-    where
-        F: FnOnce(&Context) -> R,
-    {
-        thread_local! {
-            /// Cached thread-local context.
-            static CONTEXT: Cell<Option<Context>> = Cell::new(Some(Context::new()));
-        }
-
-        let mut f = Some(f);
-        let mut f = move |cx: &Context| -> R {
-            let f = f.take().unwrap();
-            f(cx)
-        };
-
-        CONTEXT.try_with(|cell| {
-            match cell.take() {
-                None => f(&Context::new()),
-                Some(cx) => {
-                    cx.reset();
-                    let res = f(&cx);
-                    cell.set(Some(cx));
-                    res
-                }
-            }
-        }).unwrap_or_else(|_| {
-            f(&Context::new())
-        })
-    }
-
-    /// Creates a new `Context`.
-    #[cold]
-    fn new() -> Context {
-        Context {
-            inner: Arc::new(Inner {
-                select: AtomicUsize::new(Selected::Waiting.into()),
-                packet: AtomicUsize::new(0),
-                thread: thread::current(),
-                thread_id: thread::current().id(),
-            }),
-        }
-    }
-
-    /// Resets `select` and `packet`.
-    #[inline]
-    fn reset(&self) {
-        self.inner.select.store(Selected::Waiting.into(), Ordering::Release);
-        self.inner.packet.store(0, Ordering::Release);
-    }
-
-    /// Attempts to select an operation.
-    ///
-    /// On failure, the previously selected operation is returned.
-    #[inline]
-    pub fn try_select(&self, select: Selected) -> Result<(), Selected> {
-        self.inner
-            .select
-            .compare_exchange(
-                Selected::Waiting.into(),
-                select.into(),
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            )
-            .map(|_| ())
-            .map_err(|e| e.into())
-    }
-
-    /// Returns the selected operation.
-    #[inline]
-    pub fn selected(&self) -> Selected {
-        Selected::from(self.inner.select.load(Ordering::Acquire))
-    }
-
-    /// Stores a packet.
-    ///
-    /// This method must be called after `try_select` succeeds and there is a packet to provide.
-    #[inline]
-    pub fn store_packet(&self, packet: usize) {
-        if packet != 0 {
-            self.inner.packet.store(packet, Ordering::Release);
-        }
-    }
-
-    /// Waits until a packet is provided and returns it.
-    #[inline]
-    pub fn wait_packet(&self) -> usize {
-        let mut backoff = Backoff::new();
-        loop {
-            let packet = self.inner.packet.load(Ordering::Acquire);
-            if packet != 0 {
-                return packet;
-            }
-            backoff.snooze();
-        }
-    }
-
-    /// Waits until an operation is selected and returns it.
-    ///
-    /// If the deadline is reached, `Selected::Aborted` will be selected.
-    #[inline]
-    pub fn wait_until(&self, deadline: Option<Instant>) -> Selected {
-        // Spin for a short time, waiting until an operation is selected.
-        let mut backoff = Backoff::new();
-        loop {
-            let sel = Selected::from(self.inner.select.load(Ordering::Acquire));
-            if sel != Selected::Waiting {
-                return sel;
-            }
-
-            if !backoff.snooze() {
-                break;
-            }
-        }
-
-        loop {
-            // Check whether an operation has been selected.
-            let sel = Selected::from(self.inner.select.load(Ordering::Acquire));
-            if sel != Selected::Waiting {
-                return sel;
-            }
-
-            // If there's a deadline, park the current thread until the deadline is reached.
-            if let Some(end) = deadline {
-                let now = Instant::now();
-
-                if now < end {
-                    thread::park_timeout(end - now);
-                } else {
-                    // The deadline has been reached. Try aborting select.
-                    return match self.try_select(Selected::Aborted) {
-                        Ok(()) => Selected::Aborted,
-                        Err(s) => s,
-                    };
-                }
-            } else {
-                thread::park();
-            }
-        }
-    }
-
-    /// Unparks the thread this context belongs to.
-    #[inline]
-    pub fn unpark(&self) {
-        self.inner.thread.unpark();
-    }
-
-    /// Returns the id of the thread this context belongs to.
-    #[inline]
-    pub fn thread_id(&self) -> ThreadId {
-        self.inner.thread_id
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/internal/mod.rs cargo-0.33.0/vendor/crossbeam-channel/src/internal/mod.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/internal/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/internal/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-//! Hidden public internals of the crate.
-//!
-//! The only reason why this module is public is because it must be accessible from the `select!`
-//! macro.
-
-pub extern crate smallvec;
-
-#[macro_use]
-pub mod select;
-
-pub mod channel;
-pub mod context;
-pub mod utils;
-pub mod waker;
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/internal/select.rs cargo-0.33.0/vendor/crossbeam-channel/src/internal/select.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/internal/select.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/internal/select.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1911 +0,0 @@
-//! Interface to the select mechanism.
-
-use std::marker::PhantomData;
-use std::mem;
-use std::option;
-use std::ptr;
-use std::time::Instant;
-
-use internal::channel::{self, Receiver, Sender};
-use internal::context::Context;
-use internal::smallvec::SmallVec;
-use internal::utils;
-
-use flavors;
-
-/// Temporary data that gets initialized during select or a blocking operation, and is consumed by
-/// `read` or `write`.
-///
-/// Each field contains data associated with a specific channel flavor.
-#[derive(Default)]
-pub struct Token {
-    pub after: flavors::after::AfterToken,
-    pub array: flavors::array::ArrayToken,
-    pub list: flavors::list::ListToken,
-    pub tick: flavors::tick::TickToken,
-    pub zero: flavors::zero::ZeroToken,
-}
-
-/// Identifier associated with an operation by a specific thread on a specific channel.
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub struct Operation(usize);
-
-impl Operation {
-    /// Creates an identifier from a mutable reference.
-    ///
-    /// This function essentially just turns the address of the reference into a number. The
-    /// reference should point to a variable that is specific to the thread and the operation,
-    /// and is alive for the entire duration of select or blocking operation.
-    #[inline]
-    pub fn hook<T>(r: &mut T) -> Operation {
-        Operation(r as *mut T as usize)
-    }
-}
-
-/// Current state of a select or a blocking operation.
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum Selected {
-    /// Still waiting for an operation.
-    Waiting,
-
-    /// The select or blocking operation has been aborted.
-    Aborted,
-
-    /// A channel was closed.
-    Closed,
-
-    /// An operation became ready.
-    Operation(Operation),
-}
-
-impl From<usize> for Selected {
-    #[inline]
-    fn from(val: usize) -> Selected {
-        match val {
-            0 => Selected::Waiting,
-            1 => Selected::Aborted,
-            2 => Selected::Closed,
-            oper => Selected::Operation(Operation(oper)),
-        }
-    }
-}
-
-impl Into<usize> for Selected {
-    #[inline]
-    fn into(self) -> usize {
-        match self {
-            Selected::Waiting => 0,
-            Selected::Aborted => 1,
-            Selected::Closed => 2,
-            Selected::Operation(Operation(val)) => val,
-        }
-    }
-}
-
-/// A receiver or a sender that can participate in select.
-///
-/// This is a handle that assists select in executing the operation, registration, deciding on the
-/// appropriate deadline for blocking, etc.
-pub trait SelectHandle {
-    /// Attempts to execute the operation and returns `true` on success.
-    fn try(&self, token: &mut Token) -> bool;
-
-    /// Attempts to execute the operation again and returns `true` on success.
-    ///
-    /// Retries are allowed to take a little bit more time than the initial try.
-    fn retry(&self, token: &mut Token) -> bool;
-
-    /// Returns a deadline for the operation, if there is one.
-    fn deadline(&self) -> Option<Instant>;
-
-    /// Registers the operation.
-    fn register(&self, token: &mut Token, oper: Operation, cx: &Context) -> bool;
-
-    /// Unregisters the operation.
-    fn unregister(&self, oper: Operation);
-
-    /// Attempts to execute the selected operation.
-    fn accept(&self, token: &mut Token, cx: &Context) -> bool;
-
-    /// Returns the current state of the opposite side of the channel.
-    ///
-    /// This is typically represented by the current message index at the opposite side of the
-    /// channel.
-    ///
-    /// For example, by calling `state()`, the receiving side can check how much activity the
-    /// sending side has had and viceversa.
-    fn state(&self) -> usize;
-}
-
-impl<'a, T: SelectHandle> SelectHandle for &'a T {
-    fn try(&self, token: &mut Token) -> bool {
-        (**self).try(token)
-    }
-
-    fn retry(&self, token: &mut Token) -> bool {
-        (**self).retry(token)
-    }
-
-    fn deadline(&self) -> Option<Instant> {
-        (**self).deadline()
-    }
-
-    fn register(&self, token: &mut Token, oper: Operation, cx: &Context) -> bool {
-        (**self).register(token, oper, cx)
-    }
-
-    fn unregister(&self, oper: Operation) {
-        (**self).unregister(oper);
-    }
-
-    fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-        (**self).accept(token, cx)
-    }
-
-    fn state(&self) -> usize {
-        (**self).state()
-    }
-}
-
-/// Runs until one of the operations is fired, potentially blocking the current thread.
-///
-/// Receive operations will have to be followed up by `read`, and send operations by `write`.
-pub fn main_loop<S>(
-    handles: &mut [(&S, usize, *const u8)],
-    has_default: bool,
-) -> (Token, usize, *const u8)
-where
-    S: SelectHandle + ?Sized,
-{
-    // Create a token, which serves as a temporary variable that gets initialized in this function
-    // and is later used by a call to `read` or `write` that completes the selected operation.
-    let mut token = Token::default();
-
-    // Shuffle the operations for fairness.
-    if handles.len() >= 2 {
-        utils::shuffle(handles);
-    }
-
-    if handles.is_empty() {
-        if has_default {
-            // If there is only the `default` case, return.
-            return (token, 0, ptr::null());
-        } else {
-            // If there are no operations at all, block forever.
-            utils::sleep_forever();
-        }
-    }
-
-    if has_default && handles.len() > 1 {
-        let mut states = SmallVec::<[usize; 4]>::with_capacity(handles.len());
-
-        // Snapshot the channel states of all operations.
-        for &(handle, _, _) in handles.iter() {
-            states.push(handle.state());
-        }
-
-        loop {
-            // Try firing the operations.
-            for &(handle, i, ptr) in handles.iter() {
-                if handle.try(&mut token) {
-                    return (token, i, ptr);
-                }
-            }
-
-            let mut changed = false;
-
-            // Update the channel states and check whether any have been changed.
-            for (&(handle, _, _), state) in handles.iter().zip(states.iter_mut()) {
-                let current = handle.state();
-
-                if *state != current {
-                    *state = current;
-                    changed = true;
-                }
-            }
-
-            // If none of the states have changed, select the `default` case.
-            if !changed {
-                return (token, 0, ptr::null());
-            }
-        }
-    }
-
-    loop {
-        // Try firing the operations without blocking.
-        for &(handle, i, ptr) in handles.iter() {
-            if handle.try(&mut token) {
-                return (token, i, ptr);
-            }
-        }
-
-        if has_default {
-            // Selected the `default` case.
-            return (token, 0, ptr::null());
-        }
-
-        // Before blocking, try firing the operations one more time. Retries are permitted to take
-        // a little bit more time than the initial tries, but they still mustn't block.
-        for &(handle, i, ptr) in handles.iter() {
-            if handle.retry(&mut token) {
-                return (token, i, ptr);
-            }
-        }
-
-        // Prepare for blocking.
-        let res = Context::with(|cx| {
-            let mut sel = Selected::Waiting;
-            let mut registered_count = 0;
-
-            // Register all operations.
-            for (handle, _, _) in handles.iter_mut() {
-                registered_count += 1;
-
-                // If registration returns `false`, that means the operation has just become ready.
-                if !handle.register(&mut token, Operation::hook::<&S>(handle), cx) {
-                    // Try aborting select.
-                    sel = match cx.try_select(Selected::Aborted) {
-                        Ok(()) => Selected::Aborted,
-                        Err(s) => s,
-                    };
-                    break;
-                }
-
-                // If another thread has already selected one of the operations, stop registration.
-                sel = cx.selected();
-                if sel != Selected::Waiting {
-                    break;
-                }
-            }
-
-            if sel == Selected::Waiting {
-                // Check with each operation for how long we're allowed to block, and compute the
-                // earliest deadline.
-                let mut deadline: Option<Instant> = None;
-                for &(handle, _, _) in handles.iter() {
-                    if let Some(x) = handle.deadline() {
-                        deadline = deadline.map(|y| x.min(y)).or(Some(x));
-                    }
-                }
-
-                // Block the current thread.
-                sel = cx.wait_until(deadline);
-            }
-
-            // Unregister all registered operations.
-            for (handle, _, _) in handles.iter_mut().take(registered_count) {
-                handle.unregister(Operation::hook::<&S>(handle));
-            }
-
-            match sel {
-                Selected::Waiting => unreachable!(),
-                Selected::Aborted => {},
-                Selected::Closed | Selected::Operation(_) => {
-                    // Find the selected operation.
-                    for (handle, i, ptr) in handles.iter_mut() {
-                        // Is this the selected operation?
-                        if sel == Selected::Operation(Operation::hook::<&S>(handle)) {
-                            // Try firing this operation.
-                            if handle.accept(&mut token, cx) {
-                                return Some((*i, *ptr));
-                            }
-                        }
-                    }
-
-                    // Before the next round, reshuffle the operations for fairness.
-                    if handles.len() >= 2 {
-                        utils::shuffle(handles);
-                    }
-                },
-            }
-
-            None
-        });
-
-        // Return if an operation was fired.
-        if let Some((i, ptr)) = res {
-            return (token, i, ptr);
-        }
-    }
-}
-
-/// Waits on a set of channel operations.
-///
-/// This struct with builder-like interface allows declaring a set of channel operations and
-/// blocking until any one of them becomes ready. Finally, one of the operations is executed. If
-/// multiple operations are ready at the same time, a random one is chosen. It is also possible to
-/// declare a default case that gets executed if none of the operations are initially ready.
-///
-/// Note that this method of selecting over channel operations is typically somewhat slower than
-/// the [`select!`] macro.
-///
-/// [`select!`]: macro.select.html
-///
-/// # Receiving
-///
-/// Receiving a message from two channels, whichever becomes ready first:
-///
-/// ```
-/// use std::thread;
-/// use crossbeam_channel as channel;
-///
-/// let (s1, r1) = channel::unbounded();
-/// let (s2, r2) = channel::unbounded();
-///
-/// thread::spawn(move || s1.send("foo"));
-/// thread::spawn(move || s2.send("bar"));
-///
-/// // Only one of these two receive operations will be executed.
-/// channel::Select::new()
-///     .recv(&r1, |msg| assert_eq!(msg, Some("foo")))
-///     .recv(&r2, |msg| assert_eq!(msg, Some("bar")))
-///     .wait();
-/// ```
-///
-/// # Sending
-///
-/// Waiting on a send and a receive operation:
-///
-/// ```
-/// use std::thread;
-/// use crossbeam_channel as channel;
-///
-/// let (s1, r1) = channel::unbounded();
-/// let (s2, r2) = channel::unbounded();
-///
-/// s1.send("foo");
-///
-/// // Since both operations are initially ready, a random one will be executed.
-/// channel::Select::new()
-///     .recv(&r1, |msg| assert_eq!(msg, Some("foo")))
-///     .send(&s2, || "bar", || assert_eq!(r2.recv(), Some("bar")))
-///     .wait();
-/// ```
-///
-/// # Default case
-///
-/// A special kind of case is `default`, which gets executed if none of the operations can be
-/// executed, i.e. they would block:
-///
-/// ```
-/// use std::thread;
-/// use std::time::{Duration, Instant};
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::unbounded();
-///
-/// thread::spawn(move || {
-///     thread::sleep(Duration::from_secs(1));
-///     s.send("foo");
-/// });
-///
-/// // Don't block on the receive operation.
-/// channel::Select::new()
-///     .recv(&r, |_| panic!())
-///     .default(|| println!("The message is not yet available."))
-///     .wait();
-/// ```
-///
-/// # Execution
-///
-/// 1. A `Select` is constructed, cases are added, and `.wait()` is called.
-/// 2. If any of the `recv` or `send` operations are ready, one of them is executed. If multiple
-///    operations are ready, a random one is chosen.
-/// 3. If none of the `recv` and `send` operations are ready, the `default` case is executed. If
-///    there is no `default` case, the current thread is blocked until an operation becomes ready.
-/// 4. If a `recv` operation gets executed, its callback is invoked.
-/// 5. If a `send` operation gets executed, the message is lazily evaluated and sent into the
-///    channel. Finally, the callback is invoked.
-///
-/// **Note**: If evaluation of the message panics, the process will be aborted because it's
-/// impossible to recover from such panics. All the other callbacks are allowed to panic, however.
-#[must_use]
-pub struct Select<'a, R> {
-    /// A list of senders and receivers participating in selection.
-    handles: SmallVec<[(&'a SelectHandle, usize, *const u8); 4]>,
-
-    /// A list of callbacks, one per handle.
-    callbacks: SmallVec<[Callback<'a, R>; 4]>,
-
-    /// Callback for the default case.
-    default: Option<Callback<'a, R>>,
-}
-
-impl<'a, R> Select<'a, R> {
-    /// Creates a new `Select`.
-    pub fn new() -> Select<'a, R> {
-        Select {
-            handles: SmallVec::new(),
-            callbacks: SmallVec::new(),
-            default: None,
-        }
-    }
-
-    /// Adds a receive case.
-    ///
-    /// The callback will get invoked if the receive operation completes.
-    #[inline]
-    pub fn recv<T, C>(mut self, r: &'a Receiver<T>, cb: C) -> Select<'a, R>
-    where
-        C: FnOnce(Option<T>) -> R + 'a,
-    {
-        let i = self.handles.len() + 1;
-        let ptr = r as *const Receiver<_> as *const u8;
-        self.handles.push((r, i, ptr));
-
-        self.callbacks.push(Callback::new(move |token| {
-            let msg = unsafe { channel::read(r, token) };
-            cb(msg)
-        }));
-
-        self
-    }
-
-    /// Adds a send case.
-    ///
-    /// If the send operation succeeds, the message will be generated and sent into the channel.
-    /// Finally, the callback gets invoked once the operation is completed.
-    ///
-    /// **Note**: If function `msg` panics, the process will be aborted because it's impossible to
-    /// recover from such panics. However, function `cb` is allowed to panic.
-    #[inline]
-    pub fn send<T, M, C>(mut self, s: &'a Sender<T>, msg: M, cb: C) -> Select<'a, R>
-    where
-        M: FnOnce() -> T + 'a,
-        C: FnOnce() -> R + 'a,
-    {
-        let i = self.handles.len() + 1;
-        let ptr = s as *const Sender<_> as *const u8;
-        self.handles.push((s, i, ptr));
-
-        self.callbacks.push(Callback::new(move |token| {
-            let _guard = utils::AbortGuard(
-                "a send case triggered a panic while evaluating its message"
-            );
-            let msg = msg();
-
-            ::std::mem::forget(_guard);
-            unsafe { channel::write(s, token, msg); }
-
-            cb()
-        }));
-
-        self
-    }
-
-    /// Adds a default case.
-    ///
-    /// This case gets executed if none of the channel operations are ready.
-    ///
-    /// If called more than once, this method keeps only the last callback for the default case.
-    #[inline]
-    pub fn default<C>(mut self, cb: C) -> Select<'a, R>
-    where
-        C: FnOnce() -> R + 'a,
-    {
-        self.default = Some(Callback::new(move |_| cb()));
-        self
-    }
-
-    /// Starts selection and waits until it completes.
-    ///
-    /// The result of the executed callback function will be returned.
-    pub fn wait(mut self) -> R {
-        let (mut token, index, _) = main_loop(&mut self.handles, self.default.is_some());
-        let cb;
-
-        // Initialize `cb` with the right callback and drop all other callbacks.
-        if index == 0 {
-            self.callbacks.clear();
-            cb = self.default.take().unwrap();
-        } else {
-            cb = self.callbacks.remove(index - 1);
-            self.callbacks.clear();
-            self.default.take();
-        }
-
-        // Invoke the callback.
-        cb.call(&mut token)
-    }
-}
-
-/// Some space to keep a `FnOnce()` object on the stack.
-type Space = [usize; 2];
-
-/// A `FnOnce(&mut Token) -> R + 'a` that is stored inline if small, or otherwise boxed on the heap.
-pub struct Callback<'a, R> {
-    /// A wrapper function around the callback.
-    ///
-    /// The first argument is a pointer to `space`.
-    ///
-    /// The second argument may contain a reference to `Token`. If the argument is `Some`, the
-    /// reference is passed to the callback. If the argument is `None`, the callback is read and
-    /// dropped without invocation.
-    ///
-    /// This function may be called only once.
-    call: unsafe fn(*mut u8, token: Option<&mut Token>) -> Option<R>,
-
-    /// Some space where a function can be stored, if it fits.
-    space: Space,
-
-    /// Indicates that a `Callback` is `!Send + !Sync` and borrows `'a`.
-    _marker: PhantomData<(*mut (), &'a ())>,
-}
-
-impl<'a, R> Callback<'a, R> {
-    /// Constructs a new `Callback<'a, R>` from a `FnOnce(&mut Token) -> R + 'a`.
-    pub fn new<F>(f: F) -> Self
-    where
-        F: FnOnce(&mut Token) -> R + 'a,
-    {
-        let size = mem::size_of::<F>();
-        let align = mem::align_of::<F>();
-
-        unsafe {
-            let mut space: Space = mem::uninitialized();
-
-            let call = if size <= mem::size_of::<Space>() && align <= mem::align_of::<Space>() {
-                unsafe fn call<'a, F, R>(raw: *mut u8, token: Option<&mut Token>) -> Option<R>
-                where
-                    F: FnOnce(&mut Token) -> R + 'a,
-                {
-                    // Read the function from the stack.
-                    let f: F = ptr::read(raw as *mut F);
-                    token.map(f)
-                }
-
-                // Write the function into the space.
-                ptr::write(&mut space as *mut Space as *mut F, f);
-                call::<F, R>
-            } else {
-                unsafe fn call<'a, F, R>(raw: *mut u8, token: Option<&mut Token>) -> Option<R>
-                where
-                    F: FnOnce(&mut Token) -> R + 'a,
-                {
-                    // Read the pointer to the function from the stack.
-                    let b: Box<F> = ptr::read(raw as *mut Box<F>);
-                    token.map(*b)
-                }
-
-                // The function doesn't fit, so box it and write the pointer into the space.
-                let b: Box<F> = Box::new(f);
-                ptr::write(&mut space as *mut Space as *mut Box<F>, b);
-                call::<F, R>
-            };
-
-            Callback {
-                call,
-                space,
-                _marker: PhantomData,
-            }
-        }
-    }
-
-    /// Invokes the callback.
-    #[inline]
-    pub fn call(self, token: &mut Token) -> R {
-        // Disassemble `self` and forget it so that the destructor doesn't invoke `call`.
-        let Callback { call, mut space, .. } = self;
-        mem::forget(self);
-
-        // Invoke the callback.
-        unsafe {
-            (call)(&mut space as *mut Space as *mut u8, Some(token)).unwrap()
-        }
-    }
-}
-
-impl<'a, R> Drop for Callback<'a, R> {
-    fn drop(&mut self) {
-        // Call the function with `None` in order to drop the callback.
-        unsafe {
-            (self.call)(&mut self.space as *mut Space as *mut u8, None);
-        }
-    }
-}
-
-/// Dereference the pointer and bind it to the lifetime in the iterator.
-///
-/// The returned reference will appear as if it was previously produced by the iterator.
-pub unsafe fn deref_from_iterator<'a, T: 'a, I>(ptr: *const T, _: &I) -> &'a T
-where
-    I: Iterator<Item = &'a T>,
-{
-    &*ptr
-}
-
-/// Receiver argument types allowed in `recv` cases.
-pub trait RecvArgument<'a, T: 'a> {
-    type Iter: Iterator<Item = &'a Receiver<T>>;
-
-    /// Converts the argument into an iterator over receivers.
-    fn _as_recv_argument(&'a self) -> Self::Iter;
-}
-
-impl<'a, T: 'a> RecvArgument<'a, T> for Receiver<T> {
-    type Iter = option::IntoIter<&'a Receiver<T>>;
-
-    fn _as_recv_argument(&'a self) -> Self::Iter {
-        Some(self).into_iter()
-    }
-}
-
-impl<'a, T: 'a> RecvArgument<'a, T> for &'a Receiver<T> {
-    type Iter = option::IntoIter<&'a Receiver<T>>;
-
-    fn _as_recv_argument(&'a self) -> Self::Iter {
-        Some(*self).into_iter()
-    }
-}
-
-impl<'a, T: 'a> RecvArgument<'a, T> for &'a &'a Receiver<T> {
-    type Iter = option::IntoIter<&'a Receiver<T>>;
-
-    fn _as_recv_argument(&'a self) -> Self::Iter {
-        Some(**self).into_iter()
-    }
-}
-
-impl<'a, T: 'a, I: IntoIterator<Item = &'a Receiver<T>> + Clone> RecvArgument<'a, T> for I {
-    type Iter = <I as IntoIterator>::IntoIter;
-
-    fn _as_recv_argument(&'a self) -> Self::Iter {
-        self.clone().into_iter()
-    }
-}
-
-/// Sender argument types allowed in `send` cases.
-pub trait SendArgument<'a, T: 'a> {
-    type Iter: Iterator<Item = &'a Sender<T>>;
-
-    /// Converts the argument into an iterator over senders.
-    fn _as_send_argument(&'a self) -> Self::Iter;
-}
-
-impl<'a, T: 'a> SendArgument<'a, T> for Sender<T> {
-    type Iter = option::IntoIter<&'a Sender<T>>;
-
-    fn _as_send_argument(&'a self) -> Self::Iter {
-        Some(self).into_iter()
-    }
-}
-
-impl<'a, T: 'a> SendArgument<'a, T> for &'a Sender<T> {
-    type Iter = option::IntoIter<&'a Sender<T>>;
-
-    fn _as_send_argument(&'a self) -> Self::Iter {
-        Some(*self).into_iter()
-    }
-}
-
-impl<'a, T: 'a> SendArgument<'a, T> for &'a &'a Sender<T> {
-    type Iter = option::IntoIter<&'a Sender<T>>;
-
-    fn _as_send_argument(&'a self) -> Self::Iter {
-        Some(**self).into_iter()
-    }
-}
-
-impl<'a, T: 'a, I: IntoIterator<Item = &'a Sender<T>> + Clone> SendArgument<'a, T> for I {
-    type Iter = <I as IntoIterator>::IntoIter;
-
-    fn _as_send_argument(&'a self) -> Self::Iter {
-        self.clone().into_iter()
-    }
-}
-
-/// Waits on a set of channel operations.
-///
-/// This macro allows declaring a set of channel operations and blocking until any one of them
-/// becomes ready. Finally, one of the operations is executed. If multiple operations are ready at
-/// the same time, a random one is chosen. It is also possible to declare a `default` case that
-/// gets executed if none of the operations are initially ready.
-///
-/// If you need to dynamically add cases rather than define them statically inside the macro, use
-/// [`Select`] instead.
-///
-/// [`Select`]: struct.Select.html
-///
-/// # Receiving
-///
-/// Receiving a message from two channels, whichever becomes ready first:
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
-/// # fn main() {
-/// use std::thread;
-/// use crossbeam_channel as channel;
-///
-/// let (s1, r1) = channel::unbounded();
-/// let (s2, r2) = channel::unbounded();
-///
-/// thread::spawn(move || s1.send("foo"));
-/// thread::spawn(move || s2.send("bar"));
-///
-/// // Only one of these two receive operations will be executed.
-/// select! {
-///     recv(r1, msg) => assert_eq!(msg, Some("foo")),
-///     recv(r2, msg) => assert_eq!(msg, Some("bar")),
-/// }
-/// # }
-/// ```
-///
-/// # Sending
-///
-/// Waiting on a send and a receive operation:
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
-/// # fn main() {
-/// use std::thread;
-/// use crossbeam_channel as channel;
-///
-/// let (s1, r1) = channel::unbounded();
-/// let (s2, r2) = channel::unbounded();
-///
-/// s1.send("foo");
-///
-/// // Since both operations are initially ready, a random one will be executed.
-/// select! {
-///     recv(r1, msg) => assert_eq!(msg, Some("foo")),
-///     send(s2, "bar") => assert_eq!(r2.recv(), Some("bar")),
-/// }
-/// # }
-/// ```
-///
-/// # Default case
-///
-/// A special kind of case is `default`, which gets executed if none of the operations can be
-/// executed, i.e. they would block:
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
-/// # fn main() {
-/// use std::thread;
-/// use std::time::{Duration, Instant};
-/// use crossbeam_channel as channel;
-///
-/// let (s, r) = channel::unbounded();
-///
-/// thread::spawn(move || {
-///     thread::sleep(Duration::from_secs(1));
-///     s.send("foo");
-/// });
-///
-/// // Don't block on the receive operation.
-/// select! {
-///     recv(r) => panic!(),
-///     default => println!("The message is not yet available."),
-/// }
-/// # }
-/// ```
-///
-/// # Iterators
-///
-/// It is possible to have arbitrary iterators of senders or receivers in a single `send` or `recv`
-/// case:
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate crossbeam_channel;
-/// # fn main() {
-/// use std::thread;
-/// use std::time::{Duration, Instant};
-/// use crossbeam_channel as channel;
-///
-/// let (s1, r1) = channel::unbounded();
-/// let (s2, r2) = channel::unbounded();
-///
-/// s1.send("foo");
-/// s2.send("bar");
-/// let receivers = vec![r1, r2];
-///
-/// // Both receivers are initially ready so one of the two receive operations
-/// // will be chosen randomly.
-/// select! {
-///     // The third argument to `recv` is optional and is assigned a
-///     // reference to the receiver the message was received from.
-///     recv(receivers, msg, from) => {
-///         for (i, r) in receivers.iter().enumerate() {
-///             if r == from {
-///                 println!("Received {:?} from the {}-th receiver.", msg, i);
-///             }
-///         }
-///     }
-/// }
-/// # }
-/// ```
-///
-/// # Syntax
-///
-/// An invocation of `select!` consists of a list of cases. Consecutive cases are delimited by a
-/// comma, but it's not required if the preceding case has a block expression (the syntax is very
-/// similar to `match` statements).
-///
-/// The following invocation illustrates all the possible forms cases can take:
-///
-/// ```ignore
-/// select! {
-///     recv(r1) => body1,
-///     recv(r2, msg2) => body2,
-///     recv(r3, msg3, from3) => body3,
-///
-///     send(s4, msg4) => body4,
-///     send(s5, msg5, into5) => body5,
-///
-///     default => body6,
-/// }
-/// ```
-///
-/// Input expressions: `r1`, `r2`, `r3`, `s4`, `s5`, `msg4`, `msg5`, `body1`, `body2`, `body3`,
-/// `body4`, `body5`, `body6`
-///
-/// Output patterns: `msg2`, `msg3`, `msg4`, `msg5`, `from3`, `into5`
-///
-/// Types of expressions and patterns (generic over types `A`, `B`, `C`, `D`, `E`, and `F`):
-///
-/// * `r1`: one of `Receiver<A>`, `&Receiver<A>`, or `impl IntoIterator<Item = &Receiver<A>>`
-/// * `r2`: one of `Receiver<B>`, `&Receiver<B>`, or `impl IntoIterator<Item = &Receiver<B>>`
-/// * `r3`: one of `Receiver<C>`, `&Receiver<C>`, or `impl IntoIterator<Item = &Receiver<C>>`
-/// * `s4`: one of `Sender<D>`, `&Sender<D>`, or `impl IntoIterator<Item = &Sender<D>>`
-/// * `s5`: one of `Sender<E>`, `&Sender<E>`, or `impl IntoIterator<Item = &Sender<E>>`
-/// * `msg2`: `Option<B>`
-/// * `msg3`: `Option<C>`
-/// * `msg4`: `D`
-/// * `msg5`: `E`
-/// * `from3`: `&Receiver<C>`
-/// * `into5`: `&Sender<E>`
-/// * `body1`, `body2`, `body3`, `body4`, `body5`, `body6`: `F`
-///
-/// Pattern `from3` is bound to the receiver in `r3` from which `msg3` was received.
-///
-/// Pattern `into5` is bound to the sender in `s5` into which `msg5` was sent.
-///
-/// There can be at most one `default` case.
-///
-/// # Execution
-///
-/// 1. All sender and receiver arguments (`r1`, `r2`, `r3`, `s4`, and `s5`) are evaluated.
-/// 2. If any of the `recv` or `send` operations are ready, one of them is executed. If multiple
-///    operations are ready, a random one is chosen.
-/// 3. If none of the `recv` and `send` operations are ready, the `default` case is executed. If
-///    there is no `default` case, the current thread is blocked until an operation becomes ready.
-/// 4. If a `recv` operation gets executed, the message pattern (`msg2` or `msg3`) is
-///    bound to the received message, and the receiver pattern (`from3`) is bound to the receiver
-///    from which the message was received.
-/// 5. If a `send` operation gets executed, the message (`msg4` or `msg5`) is evaluated and sent
-///    into the channel. Then, the sender pattern (`into5`) is bound to the sender into which the
-///    message was sent.
-/// 6. Finally, the body (`body1`, `body2`, `body3`, `body4`, `body5`, or `body6`) of the executed
-///    case is evaluated. The whole `select!` invocation evaluates to that expression.
-///
-/// **Note**: If evaluation of `msg4` or `msg5` panics, the process will be aborted because it's
-/// impossible to recover from such panics. All the other expressions are allowed to panic,
-/// however.
-#[macro_export]
-macro_rules! select {
-    // The macro consists of two stages:
-    // 1. Parsing
-    // 2. Code generation
-    //
-    // The parsing stage consists of these subparts:
-    // 1. parse_list: Turns a list of tokens into a list of cases.
-    // 2. parse_list_error: Diagnoses the syntax error.
-    // 3. parse_case: Parses a single case and verifies its argument list.
-    //
-    // The codegen stage consists of these subparts:
-    // 1. codegen_fast_path: Optimizes `select!` into a single send or receive operation.
-    // 2. codegen_main_loop: Builds the main loop that fires cases and puts the thread to sleep.
-    // 3. codegen_container: Initializes the vector containing channel operations.
-    // 4: codegen_push: Pushes an operation into the vector of operations.
-    // 5. codegen_has_default: A helper that checks whether there's a default operation.
-    // 6. codegen_finalize: Completes the channel operation that has been selected.
-    //
-    // If the parsing stage encounters a syntax error, it fails with a compile-time error.
-    // Otherwise, the macro parses the input into three token trees and passes them to the code
-    // generation stage. The three token trees are lists of comma-separated cases, written inside
-    // parentheses:
-    // 1. Receive cases.
-    // 2. Send cases.
-    // 3. Default cases (there can be at most one).
-    //
-    // Each case is of the form `(index, variable) case(arguments) => block`, where:
-    // - `index` is a unique index for the case (index 0 is reserved for the `default` case).
-    // - `variable` is a unique variable name associated with it.
-    // - `case` is one of `recv`, `send`, or `default`.
-    // - `arguments` is a list of arguments.
-    //
-    // All lists, if not empty, have a trailing comma at the end.
-    //
-    // For example, this invocation of `select!`:
-    //
-    // ```ignore
-    // select! {
-    //     recv(a) => x,
-    //     recv(b, m) => y,
-    //     send(s, msg) => { z }
-    //     default => {}
-    // }
-    // ```
-    //
-    // Would be parsed as:
-    //
-    // ```ignore
-    // ((1usize case1) recv(a, _, _) => { x }, (2usize, case2) recv(b, m, _) => { y },)
-    // ((3usize case3) send(s, msg, _) => { { z } },)
-    // ((0usize case0) default() => { {} },)
-    // ```
-    //
-    // These three lists are then passed to the code generation stage.
-
-    // Success! The list is empty.
-    // Now check the arguments of each processed case.
-    (@parse_list
-        ($($head:tt)*)
-        ()
-    ) => {
-        select!(
-            @parse_case
-            ()
-            ()
-            ()
-            ($($head)*)
-            (
-                (1usize case1)
-                (2usize case2)
-                (3usize case3)
-                (4usize case4)
-                (5usize case5)
-                (6usize case6)
-                (7usize case7)
-                (8usize case8)
-                (9usize case9)
-                (10usize case10)
-                (11usize case11)
-                (12usize case12)
-                (13usize case13)
-                (14usize case14)
-                (15usize case15)
-                (16usize case16)
-                (17usize case17)
-                (20usize case18)
-                (19usize case19)
-                (20usize case20)
-                (21usize case21)
-                (22usize case22)
-                (23usize case23)
-                (24usize case24)
-                (25usize case25)
-                (26usize case26)
-                (27usize case27)
-                (28usize case28)
-                (29usize case29)
-                (30usize case30)
-                (31usize case31)
-            )
-        )
-    };
-    // If necessary, insert an empty argument list after `default`.
-    (@parse_list
-        ($($head:tt)*)
-        (default => $($tail:tt)*)
-    ) => {
-        select!(
-            @parse_list
-            ($($head)*)
-            (default() => $($tail)*)
-        )
-    };
-    // The first case is separated by a comma.
-    (@parse_list
-        ($($head:tt)*)
-        ($case:ident $args:tt => $body:expr, $($tail:tt)*)
-    ) => {
-        select!(
-            @parse_list
-            ($($head)* $case $args => { $body },)
-            ($($tail)*)
-        )
-    };
-    // Print an error if there is a semicolon after the block.
-    (@parse_list
-        ($($head:tt)*)
-        ($case:ident $args:tt => $body:block; $($tail:tt)*)
-    ) => {
-        compile_error!("did you mean to put a comma instead of the semicolon after `}`?")
-    };
-    // Don't require a comma after the case if it has a proper block.
-    (@parse_list
-        ($($head:tt)*)
-        ($case:ident $args:tt => $body:block $($tail:tt)*)
-    ) => {
-        select!(
-            @parse_list
-            ($($head)* $case $args => { $body },)
-            ($($tail)*)
-        )
-    };
-    // Only one case remains.
-    (@parse_list
-        ($($head:tt)*)
-        ($case:ident $args:tt => $body:expr)
-    ) => {
-        select!(
-            @parse_list
-            ($($head)* $case $args => { $body },)
-            ()
-        )
-    };
-    // Accept a trailing comma at the end of the list.
-    (@parse_list
-        ($($head:tt)*)
-        ($case:ident $args:tt => $body:expr,)
-    ) => {
-        select!(
-            @parse_list
-            ($($head)* $case $args => { $body },)
-            ()
-        )
-    };
-    // Diagnose and print an error.
-    (@parse_list
-        ($($head:tt)*)
-        ($($tail:tt)*)
-    ) => {
-        select!(@parse_list_error1 $($tail)*)
-    };
-    // Stage 1: check the case type.
-    (@parse_list_error1 recv $($tail:tt)*) => {
-        select!(@parse_list_error2 recv $($tail)*)
-    };
-    (@parse_list_error1 send $($tail:tt)*) => {
-        select!(@parse_list_error2 send $($tail)*)
-    };
-    (@parse_list_error1 default $($tail:tt)*) => {
-        select!(@parse_list_error2 default $($tail)*)
-    };
-    (@parse_list_error1 $t:tt $($tail:tt)*) => {
-        compile_error!(concat!(
-            "expected one of `recv`, `send`, or `default`, found `",
-            stringify!($t),
-            "`",
-        ))
-    };
-    (@parse_list_error1 $($tail:tt)*) => {
-        select!(@parse_list_error2 $($tail)*);
-    };
-    // Stage 2: check the argument list.
-    (@parse_list_error2 $case:ident) => {
-        compile_error!(concat!(
-            "missing argument list after `",
-            stringify!($case),
-            "`",
-        ))
-    };
-    (@parse_list_error2 $case:ident => $($tail:tt)*) => {
-        compile_error!(concat!(
-            "missing argument list after `",
-            stringify!($case),
-            "`",
-        ))
-    };
-    (@parse_list_error2 $($tail:tt)*) => {
-        select!(@parse_list_error3 $($tail)*)
-    };
-    // Stage 3: check the `=>` and what comes after it.
-    (@parse_list_error3 $case:ident($($args:tt)*)) => {
-        compile_error!(concat!(
-            "missing `=>` after the argument list of `",
-            stringify!($case),
-            "`",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) =>) => {
-        compile_error!("expected expression after `=>`")
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => $body:expr; $($tail:tt)*) => {
-        compile_error!(concat!(
-            "did you mean to put a comma instead of the semicolon after `",
-            stringify!($body),
-            "`?",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => recv($($a:tt)*) $($tail:tt)*) => {
-        compile_error!("expected an expression after `=>`")
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => send($($a:tt)*) $($tail:tt)*) => {
-        compile_error!("expected an expression after `=>`")
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => default($($a:tt)*) $($tail:tt)*) => {
-        compile_error!("expected an expression after `=>`")
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => $f:ident($($a:tt)*) $($tail:tt)*) => {
-        compile_error!(concat!(
-            "did you mean to put a comma after `",
-            stringify!($f),
-            "(",
-            stringify!($($a)*),
-            ")`?",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => $f:ident!($($a:tt)*) $($tail:tt)*) => {
-        compile_error!(concat!(
-            "did you mean to put a comma after `",
-            stringify!($f),
-            "!(",
-            stringify!($($a)*),
-            ")`?",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => $f:ident![$($a:tt)*] $($tail:tt)*) => {
-        compile_error!(concat!(
-            "did you mean to put a comma after `",
-            stringify!($f),
-            "![",
-            stringify!($($a)*),
-            "]`?",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => $f:ident!{$($a:tt)*} $($tail:tt)*) => {
-        compile_error!(concat!(
-            "did you mean to put a comma after `",
-            stringify!($f),
-            "!{",
-            stringify!($($a)*),
-            "}`?",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) => $body:tt $($tail:tt)*) => {
-        compile_error!(concat!(
-            "did you mean to put a comma after `",
-            stringify!($body),
-            "`?",
-        ))
-    };
-    (@parse_list_error3 $case:ident($($args:tt)*) $t:tt $($tail:tt)*) => {
-        compile_error!(concat!(
-            "expected `=>`, found `",
-            stringify!($t),
-            "`",
-        ))
-    };
-    (@parse_list_error3 $case:ident $args:tt $($tail:tt)*) => {
-        compile_error!(concat!(
-            "expected an argument list, found `",
-            stringify!($args),
-            "`",
-        ))
-    };
-    (@parse_list_error3 $($tail:tt)*) => {
-        select!(@parse_list_error4 $($tail)*)
-    };
-    // Stage 4: fail with a generic error message.
-    (@parse_list_error4 $($tail:tt)*) => {
-        compile_error!("invalid syntax")
-    };
-
-    // Success! All cases were parsed.
-    (@parse_case
-        ($($recv:tt)*)
-        ($($send:tt)*)
-        $default:tt
-        ()
-        $labels:tt
-    ) => {
-        select!(
-            @codegen_declare
-            ($($recv)* $($send)*)
-            ($($recv)*)
-            ($($send)*)
-            $default
-        )
-    };
-    // Error: there are no labels left.
-    (@parse_case
-        $recv:tt
-        $send:tt
-        $default:tt
-        $cases:tt
-        ()
-    ) => {
-        compile_error!("too many cases in a `select!` block")
-    };
-    // Check the format of a `recv` case...
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($r:expr) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            ($($recv)* $label recv(&$r, _, _) => $body,)
-            $send
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($r:expr, $m:pat) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            ($($recv)* $label recv(&$r, $m, _) => $body,)
-            $send
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($rs:expr, $m:pat, $r:pat) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            ($($recv)* $label recv($rs, $m, $r) => $body,)
-            $send
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    // Allow trailing comma...
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($r:expr,) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            ($($recv)* $label recv($r, _, _) => $body,)
-            $send
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($r:expr, $m:pat,) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            ($($recv)* $label recv($r, $m, _) => $body,)
-            $send
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($rs:expr, $m:pat, $r:pat,) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            ($($recv)* $label recv($rs, $m, $r) => $body,)
-            $send
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    // Error cases...
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv($($args:tt)*) => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "invalid argument list in `recv(",
-            stringify!($($args)*),
-            ")`",
-        ))
-    };
-    (@parse_case
-        ($($recv:tt)*)
-        $send:tt
-        $default:tt
-        (recv $t:tt => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "expected an argument list after `recv`, found `",
-            stringify!($t),
-            "`",
-        ))
-    };
-
-    // Check the format of a `send` case...
-    (@parse_case
-        $recv:tt
-        ($($send:tt)*)
-        $default:tt
-        (send($s:expr, $m:expr) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            $recv
-            ($($send)* $label send($s, $m, _) => $body,)
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    (@parse_case
-        $recv:tt
-        ($($send:tt)*)
-        $default:tt
-        (send($ss:expr, $m:expr, $s:pat) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            $recv
-            ($($send)* $label send($ss, $m, $s) => $body,)
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    // Allow trailing comma...
-    (@parse_case
-        $recv:tt
-        ($($send:tt)*)
-        $default:tt
-        (send($s:expr, $m:expr,) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            $recv
-            ($($send)* $label send($s, $m, _) => $body,)
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    (@parse_case
-        $recv:tt
-        ($($send:tt)*)
-        $default:tt
-        (send($ss:expr, $m:expr, $s:pat,) => $body:tt, $($tail:tt)*)
-        ($label:tt $($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            $recv
-            ($($send)* $label send($ss, $m, $s) => $body,)
-            $default
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    // Error cases...
-    (@parse_case
-        $recv:tt
-        ($($send:tt)*)
-        $default:tt
-        (send($($args:tt)*) => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "invalid argument list in `send(",
-            stringify!($($args)*),
-            ")`",
-        ))
-    };
-    (@parse_case
-        $recv:tt
-        ($($send:tt)*)
-        $default:tt
-        (send $args:tt => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "expected an argument list after `send`, found `",
-            stringify!($args),
-            "`",
-        ))
-    };
-
-    // Check the format of a `default` case.
-    (@parse_case
-        $recv:tt
-        $send:tt
-        ()
-        (default() => $body:tt, $($tail:tt)*)
-        ($($labels:tt)*)
-    ) => {
-        select!(
-            @parse_case
-            $recv
-            $send
-            ((0usize case0) default() => $body,)
-            ($($tail)*)
-            ($($labels)*)
-        )
-    };
-    // Valid, but duplicate default cases...
-    (@parse_case
-        $recv:tt
-        $send:tt
-        ($($default:tt)+)
-        (default() => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!("there can be only one `default` case in a `select!` block")
-    };
-    // Other error cases...
-    (@parse_case
-        $recv:tt
-        $send:tt
-        $default:tt
-        (default($($args:tt)*) => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "invalid argument list in `default(",
-            stringify!($($args)*),
-            ")`",
-        ))
-    };
-    (@parse_case
-        $recv:tt
-        $send:tt
-        $default:tt
-        (default $t:tt => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "expected an argument list after `default`, found `",
-            stringify!($t),
-            "`",
-        ))
-    };
-
-    // The case was not consumed, therefore it must be invalid.
-    (@parse_case
-        $recv:tt
-        $send:tt
-        $default:tt
-        ($case:ident $args:tt => $body:tt, $($tail:tt)*)
-        $labels:tt
-    ) => {
-        compile_error!(concat!(
-            "expected one of `recv`, `send`, or `default`, found `",
-            stringify!($case),
-            "`",
-        ))
-    };
-
-    // Declare the iterator variable for a `recv` case.
-    (@codegen_declare
-        (($i:tt $var:ident) recv($rs:expr, $m:pat, $r:pat) => $body:tt, $($tail:tt)*)
-        $recv:tt
-        $send:tt
-        $default:tt
-    ) => {{
-        match {
-            #[allow(unused_imports)]
-            use $crate::internal::select::RecvArgument;
-            &mut (&&$rs)._as_recv_argument()
-        } {
-            $var => {
-                select!(
-                    @codegen_declare
-                    ($($tail)*)
-                    $recv
-                    $send
-                    $default
-                )
-            }
-        }
-    }};
-    // Declare the iterator variable for a `send` case.
-    (@codegen_declare
-        (($i:tt $var:ident) send($ss:expr, $m:pat, $s:pat) => $body:tt, $($tail:tt)*)
-        $recv:tt
-        $send:tt
-        $default:tt
-    ) => {{
-        match {
-            #[allow(unused_imports)]
-            use $crate::internal::select::SendArgument;
-            &mut (&&$ss)._as_send_argument()
-        } {
-            $var => {
-                select!(
-                    @codegen_declare
-                    ($($tail)*)
-                    $recv
-                    $send
-                    $default
-                )
-            }
-        }
-    }};
-    // All iterator variables have been declared.
-    (@codegen_declare
-        ()
-        $recv:tt
-        $send:tt
-        $default:tt
-    ) => {{
-        #[cfg_attr(feature = "cargo-clippy", allow(clippy))]
-        let mut handles = select!(@codegen_container $recv $send);
-        select!(@codegen_fast_path $recv $send $default handles)
-    }};
-
-    // Attempt to optimize the whole `select!` into a single call to `recv`.
-    (@codegen_fast_path
-        (($i:tt $var:ident) recv($rs:expr, $m:pat, $r:pat) => $body:tt,)
-        ()
-        ()
-        $handles:ident
-    ) => {{
-        if $handles.len() == 1 {
-            let $r = $handles[0].0;
-            let $m = $handles[0].0.recv();
-            drop($handles);
-            $body
-        } else {
-            select!(
-                @codegen_main_loop
-                (($i $var) recv($rs, $m, $r) => $body,)
-                ()
-                ()
-                $handles
-            )
-        }
-    }};
-    // Attempt to optimize the whole `select!` into a single call to `recv_nonblocking`.
-    (@codegen_fast_path
-        (($recv_i:tt $recv_var:ident) recv($rs:expr, $m:pat, $r:pat) => $recv_body:tt,)
-        ()
-        (($default_i:tt $default_var:ident) default() => $default_body:tt,)
-        $handles:ident
-    ) => {{
-        if $handles.len() == 1 {
-            let res = $crate::internal::channel::recv_nonblocking($handles[0].0);
-            let msg;
-
-            match res {
-                $crate::internal::channel::RecvNonblocking::Message(m) => {
-                    msg = Some(m);
-                    let $m = msg;
-                    let $r = $handles[0].0;
-                    drop($handles);
-                    $recv_body
-                }
-                $crate::internal::channel::RecvNonblocking::Closed => {
-                    msg = None;
-                    let $m = msg;
-                    let $r = $handles[0].0;
-                    drop($handles);
-                    $recv_body
-                }
-                $crate::internal::channel::RecvNonblocking::Empty => {
-                    drop($handles);
-                    $default_body
-                }
-            }
-        } else {
-            select!(
-                @codegen_main_loop
-                (($recv_i $recv_var) recv($rs, $m, $r) => $recv_body,)
-                ()
-                (($default_i $default_var) default() => $default_body,)
-                $handles
-            )
-        }
-    }};
-    // Move on to the main select loop.
-    (@codegen_fast_path
-        $recv:tt
-        $send:tt
-        $default:tt
-        $handles:ident
-    ) => {{
-        select!(
-            @codegen_main_loop
-            $recv
-            $send
-            $default
-            $handles
-        )
-    }};
-    // TODO: Optimize `select! { send(s, msg) => {} }`.
-    // TODO: Optimize `select! { send(s, msg) => {} default => {} }`.
-
-    // The main select loop.
-    (@codegen_main_loop
-        $recv:tt
-        $send:tt
-        $default:tt
-        $handles:ident
-    ) => {{
-        // Check if there's a `default` case.
-        let has_default = select!(@codegen_has_default $default);
-
-        // Run the main loop.
-        #[allow(unused_mut)]
-        #[allow(unused_variables)]
-        let (mut token, index, selected) = $crate::internal::select::main_loop(
-            &mut $handles,
-            has_default,
-        );
-
-        // Pass the result of the main loop to the final step.
-        select!(
-            @codegen_finalize
-            token
-            index
-            selected
-            $handles
-            $recv
-            $send
-            $default
-        )
-    }};
-
-    // Initialize the `handles` vector if there's only a single `recv` case.
-    (@codegen_container
-        (($i:tt $var:ident) recv($rs:expr, $m:pat, $r:pat) => $body:tt,)
-        ()
-    ) => {{
-        let mut c = $crate::internal::smallvec::SmallVec::<
-            [(&$crate::Receiver<_>, usize, *const u8); 4]
-        >::new();
-        while let Some(r) = $var.next() {
-            let ptr = r as *const $crate::Receiver<_> as *const u8;
-            c.push((r, $i, ptr));
-        }
-        c
-    }};
-    // Initialize the `handles` vector if there's only a single `send` case.
-    (@codegen_container
-        ()
-        (($i:tt $var:ident) send($ss:expr, $m:expr, $s:pat) => $body:tt,)
-    ) => {{
-        let mut c = $crate::internal::smallvec::SmallVec::<
-            [(&$crate::Sender<_>, usize, *const u8); 4]
-        >::new();
-        while let Some(s) = $var.next() {
-            let ptr = s as *const $crate::Sender<_> as *const u8;
-            c.push((s, $i, ptr));
-        }
-        c
-    }};
-    // Initialize the `handles` vector generically.
-    (@codegen_container
-        $recv:tt
-        $send:tt
-    ) => {{
-        let mut c = $crate::internal::smallvec::SmallVec::<
-            [(&$crate::internal::select::SelectHandle, usize, *const u8); 4]
-        >::new();
-        select!(@codegen_push c $recv $send);
-        c
-    }};
-
-    // Push a `recv` operation into the `handles` vector.
-    (@codegen_push
-        $handles:ident
-        (($i:tt $var:ident) recv($rs:expr, $m:pat, $r:pat) => $body:tt, $($tail:tt)*)
-        $send:tt
-    ) => {
-        while let Some(r) = $var.next() {
-            let ptr = r as *const $crate::Receiver<_> as *const u8;
-            $handles.push((r, $i, ptr));
-        }
-        select!(@codegen_push $handles ($($tail)*) $send);
-    };
-    // Push a `send` operation into the `handles` vector.
-    (@codegen_push
-        $handles:ident
-        ()
-        (($i:tt $var:ident) send($ss:expr, $m:expr, $s:pat) => $body:tt, $($tail:tt)*)
-    ) => {
-        while let Some(s) = $var.next() {
-            let ptr = s as *const $crate::Sender<_> as *const u8;
-            $handles.push((s, $i, ptr));
-        }
-        select!(@codegen_push $handles () ($($tail)*));
-    };
-    // There are no more operations to push.
-    (@codegen_push
-        $handles:ident
-        ()
-        ()
-    ) => {
-    };
-
-    // Evaluate to `false` if there is no `default` case.
-    (@codegen_has_default
-        ()
-    ) => {
-        false
-    };
-    // Evaluate to `true` if there is a `default` case.
-    (@codegen_has_default
-        (($i:tt $var:ident) default() => $body:tt,)
-    ) => {
-        true
-    };
-
-    // Finalize a receive operation.
-    (@codegen_finalize
-        $token:ident
-        $index:ident
-        $selected:ident
-        $handles:ident
-        (($i:tt $var:ident) recv($rs:expr, $m:pat, $r:pat) => $body:tt, $($tail:tt)*)
-        $send:tt
-        $default:tt
-    ) => {
-        if $index == $i {
-            #[allow(unsafe_code)]
-            let ($m, $r) = unsafe {
-                #[cfg_attr(feature = "cargo-clippy", allow(clippy))]
-                let r = $crate::internal::select::deref_from_iterator(
-                    $selected as *const $crate::Receiver<_>,
-                    &$var,
-                );
-                let msg = $crate::internal::channel::read(r, &mut $token);
-                (msg, r)
-            };
-
-            drop($handles);
-            $body
-        } else {
-            select!(
-                @codegen_finalize
-                $token
-                $index
-                $selected
-                $handles
-                ($($tail)*)
-                $send
-                $default
-            )
-        }
-    };
-    // Finalize a send operation.
-    (@codegen_finalize
-        $token:ident
-        $index:ident
-        $selected:ident
-        $handles:ident
-        ()
-        (($i:tt $var:ident) send($ss:expr, $m:expr, $s:pat) => $body:tt, $($tail:tt)*)
-        $default:tt
-    ) => {
-        if $index == $i {
-            let $s = {
-                // We have to prefix variables with an underscore to get rid of warnings when
-                // evaluation of `$m` doesn't finish.
-                #[allow(unsafe_code)]
-                let _s = unsafe {
-                    #[cfg_attr(feature = "cargo-clippy", allow(clippy))]
-                    $crate::internal::select::deref_from_iterator(
-                        $selected as *const $crate::Sender<_>,
-                        &$var,
-                    )
-                };
-                let _guard = $crate::internal::utils::AbortGuard(
-                    "a send case triggered a panic while evaluating its message"
-                );
-                let _msg = $m;
-
-                #[allow(unreachable_code)]
-                {
-                    ::std::mem::forget(_guard);
-                    #[allow(unsafe_code)]
-                    unsafe { $crate::internal::channel::write(_s, &mut $token, _msg); }
-                    _s
-                }
-            };
-
-            drop($handles);
-            $body
-        } else {
-            select!(
-                @codegen_finalize
-                $token
-                $index
-                $selected
-                $handles
-                ()
-                ($($tail)*)
-                $default
-            )
-        }
-    };
-    // Execute the default case.
-    (@codegen_finalize
-        $token:ident
-        $index:ident
-        $selected:ident
-        $handles:ident
-        ()
-        ()
-        (($i:tt $var:ident) default() => $body:tt,)
-    ) => {
-        if $index == $i {
-            drop($handles);
-            $body
-        } else {
-            select!(
-                @codegen_finalize
-                $token
-                $index
-                $selected
-                $handles
-                ()
-                ()
-                ()
-            )
-        }
-    };
-    // No more cases to finalize.
-    (@codegen_finalize
-        $token:ident
-        $index:ident
-        $selected:ident
-        $handles:ident
-        ()
-        ()
-        ()
-    ) => {
-        unreachable!("internal error in crossbeam-channel")
-    };
-
-    // Catches a bug within this macro (should not happen).
-    (@$($tokens:tt)*) => {
-        compile_error!(concat!(
-            "internal error in crossbeam-channel: ",
-            stringify!(@$($tokens)*),
-        ))
-    };
-
-    ($($case:ident $(($($args:tt)*))* => $body:expr $(,)*)*) => {
-        select!(
-            @parse_list
-            ()
-            ($($case $(($($args)*))* => $body,)*)
-        )
-    };
-
-    ($($tokens:tt)*) => {
-        select!(
-            @parse_list
-            ()
-            ($($tokens)*)
-        )
-    };
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/internal/utils.rs cargo-0.33.0/vendor/crossbeam-channel/src/internal/utils.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/internal/utils.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/internal/utils.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-//! Miscellaneous utilities.
-
-use std::cell::Cell;
-use std::num::Wrapping;
-use std::process;
-use std::sync::atomic;
-use std::thread;
-use std::time::Duration;
-
-use rand;
-
-/// A counter that performs exponential backoff in spin loops.
-pub struct Backoff(u32);
-
-impl Backoff {
-    /// Creates a new `Backoff`.
-    #[inline]
-    pub fn new() -> Self {
-        Backoff(0)
-    }
-
-    /// Backs off in a spin loop.
-    ///
-    /// This method may yield the current processor. Use it in lock-free retry loops.
-    #[inline]
-    pub fn spin(&mut self) {
-        for _ in 0..1 << self.0.min(6) {
-            atomic::spin_loop_hint();
-        }
-        self.0 = self.0.wrapping_add(1);
-    }
-
-    /// Backs off in a wait loop.
-    ///
-    /// Returns `true` if snoozing has reached a threshold where we should consider parking the
-    /// thread instead.
-    ///
-    /// This method may yield the current processor or the current thread. Use it when waiting on a
-    /// resource.
-    #[inline]
-    pub fn snooze(&mut self) -> bool {
-        if self.0 <= 6 {
-            for _ in 0..1 << self.0 {
-                atomic::spin_loop_hint();
-            }
-        } else {
-            thread::yield_now();
-        }
-
-        self.0 = self.0.wrapping_add(1);
-        self.0 <= 10
-    }
-}
-
-/// Once dropped, aborts with an error message.
-///
-/// This guard is used for protection from unrecoverable panics.
-pub struct AbortGuard(pub &'static str);
-
-impl Drop for AbortGuard {
-    fn drop(&mut self) {
-        eprintln!(
-            "{}, {}:{}:{}",
-            self.0,
-            file!(),
-            line!(),
-            column!(),
-        );
-        process::abort();
-    }
-}
-
-/// Shuffles a slice randomly.
-pub fn shuffle<T>(v: &mut [T]) {
-    let len = v.len();
-    if len <= 1 {
-        return;
-    }
-
-    thread_local! {
-        static RNG: Cell<Wrapping<u32>> = {
-            let init = rand::random::<u32>() | 1;
-            Cell::new(Wrapping(init))
-        }
-    }
-
-    let _ = RNG.try_with(|rng| {
-        for i in 1..len {
-            // This is the 32-bit variant of Xorshift.
-            // https://en.wikipedia.org/wiki/Xorshift
-            let mut x = rng.get();
-            x ^= x << 13;
-            x ^= x >> 17;
-            x ^= x << 5;
-            rng.set(x);
-
-            let x = x.0;
-            let n = i + 1;
-
-            // This is a fast alternative to `let j = x % n`.
-            // https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/
-            let j = ((x as u64).wrapping_mul(n as u64) >> 32) as u32 as usize;
-
-            v.swap(i, j);
-        }
-    });
-}
-
-/// Blocks the current thread forever.
-pub fn sleep_forever() -> ! {
-    loop {
-        thread::sleep(Duration::from_secs(1000));
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/internal/waker.rs cargo-0.33.0/vendor/crossbeam-channel/src/internal/waker.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/internal/waker.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/internal/waker.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,251 +0,0 @@
-//! Waking mechanism for threads blocked on channel operations.
-
-use std::collections::VecDeque;
-use std::num::Wrapping;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::thread::{self, ThreadId};
-
-use parking_lot::Mutex;
-
-use internal::context::Context;
-use internal::select::{Operation, Selected};
-
-/// Represents a thread blocked on a specific channel operation.
-pub struct Entry {
-    /// Context associated with the thread owning this operation.
-    pub context: Context,
-
-    /// The operation.
-    pub oper: Operation,
-
-    /// Optional packet.
-    pub packet: usize,
-}
-
-/// A queue of threads blocked on channel operations.
-///
-/// This data structure is used by threads to register blocking operations and get woken up once
-/// an operation becomes ready.
-pub struct Waker {
-    /// The list of registered blocking operations.
-    entries: VecDeque<Entry>,
-
-    /// The number of calls to `register` and `register_with_packet`.
-    register_count: Wrapping<usize>,
-}
-
-impl Waker {
-    /// Creates a new `Waker`.
-    #[inline]
-    pub fn new() -> Self {
-        Waker {
-            entries: VecDeque::new(),
-            register_count: Wrapping(0),
-        }
-    }
-
-    /// Registers the current thread with an operation.
-    #[inline]
-    pub fn register(&mut self, oper: Operation, cx: &Context) {
-        self.register_with_packet(oper, 0, cx);
-    }
-
-    /// Registers the current thread with an operation and a packet.
-    #[inline]
-    pub fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
-        self.entries.push_back(Entry {
-            context: cx.clone(),
-            oper,
-            packet,
-        });
-        self.register_count += Wrapping(1);
-    }
-
-    /// Unregisters an operation previously registered by the current thread.
-    #[inline]
-    pub fn unregister(&mut self, oper: Operation) -> Option<Entry> {
-        if let Some((i, _)) = self.entries
-            .iter()
-            .enumerate()
-            .find(|&(_, entry)| entry.oper == oper)
-        {
-            let entry = self.entries.remove(i);
-            Self::maybe_shrink(&mut self.entries);
-            entry
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to find one thread (not the current one), select its operation, and wake it up.
-    #[inline]
-    pub fn wake_one(&mut self) -> Option<Entry> {
-        if !self.entries.is_empty() {
-            let thread_id = current_thread_id();
-
-            for i in 0..self.entries.len() {
-                // Does the entry belong to a different thread?
-                if self.entries[i].context.thread_id() != thread_id {
-                    // Try selecting this operation.
-                    let sel = Selected::Operation(self.entries[i].oper);
-                    let res = self.entries[i].context.try_select(sel);
-
-                    if res.is_ok() {
-                        // Provide the packet.
-                        self.entries[i].context.store_packet(self.entries[i].packet);
-                        // Wake the thread up.
-                        self.entries[i].context.unpark();
-
-                        // Remove the entry from the queue to keep it clean and improve
-                        // performance.
-                        let entry = self.entries.remove(i).unwrap();
-                        Self::maybe_shrink(&mut self.entries);
-                        return Some(entry);
-                    }
-                }
-            }
-        }
-
-        None
-    }
-
-    /// Notifies all threads that the channel is closed.
-    #[inline]
-    pub fn close(&mut self) {
-        for entry in self.entries.iter() {
-            if entry.context.try_select(Selected::Closed).is_ok() {
-                // Wake the thread up.
-                //
-                // Here we don't remove the entry from the queue. Registered threads must
-                // unregister from the waker by themselves. They might also want to recover the
-                // packet value and destroy it, if necessary.
-                entry.context.unpark();
-            }
-        }
-    }
-
-    /// Returns `true` if there is an entry which can be woken up by the current thread.
-    #[inline]
-    pub fn can_wake_one(&self) -> bool {
-        if self.entries.is_empty() {
-            false
-        } else {
-            let thread_id = current_thread_id();
-
-            self.entries.iter().any(|entry| {
-                entry.context.thread_id() != thread_id
-                    && entry.context.selected() == Selected::Waiting
-            })
-        }
-    }
-
-    /// Returns the number of entries in the queue.
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.entries.len()
-    }
-
-    #[inline]
-    pub fn register_count(&self) -> usize {
-        self.register_count.0
-    }
-
-    /// Shrinks the internal queue if its capacity is much larger than length.
-    #[inline]
-    fn maybe_shrink(entries: &mut VecDeque<Entry>) {
-        if entries.capacity() > 32 && entries.len() < entries.capacity() / 4 {
-            let mut v = VecDeque::with_capacity(entries.capacity() / 2);
-            v.extend(entries.drain(..));
-            *entries = v;
-        }
-    }
-}
-
-impl Drop for Waker {
-    #[inline]
-    fn drop(&mut self) {
-        debug_assert!(self.entries.is_empty());
-    }
-}
-
-/// A waker that can be shared among threads without locking.
-///
-/// This is a simple wrapper around `Waker` that internally uses a mutex for synchronization.
-pub struct SyncWaker {
-    /// The inner `Waker`.
-    inner: Mutex<Waker>,
-
-    /// Number of operations in the waker.
-    len: AtomicUsize,
-}
-
-impl SyncWaker {
-    /// Creates a new `SyncWaker`.
-    #[inline]
-    pub fn new() -> Self {
-        SyncWaker {
-            inner: Mutex::new(Waker::new()),
-            len: AtomicUsize::new(0),
-        }
-    }
-
-    /// Registers the current thread with an operation.
-    #[inline]
-    pub fn register(&self, oper: Operation, cx: &Context) {
-        let mut inner = self.inner.lock();
-        inner.register(oper, cx);
-        self.len.store(inner.len(), Ordering::SeqCst);
-    }
-
-    /// Unregisters an operation previously registered by the current thread.
-    #[inline]
-    pub fn unregister(&self, oper: Operation) -> Option<Entry> {
-        if self.len.load(Ordering::SeqCst) > 0 {
-            let mut inner = self.inner.lock();
-            let entry = inner.unregister(oper);
-            self.len.store(inner.len(), Ordering::SeqCst);
-            entry
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to find one thread (not the current one), select its operation, and wake it up.
-    #[inline]
-    pub fn wake_one(&self) -> Option<Entry> {
-        if self.len.load(Ordering::SeqCst) > 0 {
-            let mut inner = self.inner.lock();
-            let entry = inner.wake_one();
-            self.len.store(inner.len(), Ordering::SeqCst);
-            entry
-        } else {
-            None
-        }
-    }
-
-    /// Notifies all threads that the channel is closed.
-    pub fn close(&self) {
-        self.inner.lock().close();
-    }
-}
-
-impl Drop for SyncWaker {
-    #[inline]
-    fn drop(&mut self) {
-        debug_assert_eq!(self.inner.lock().len(), 0);
-        debug_assert_eq!(self.len.load(Ordering::SeqCst), 0);
-    }
-}
-
-/// Returns the id of the current thread.
-#[inline]
-fn current_thread_id() -> ThreadId {
-    thread_local! {
-        /// Cached thread-local id.
-        static THREAD_ID: ThreadId = thread::current().id();
-    }
-
-    THREAD_ID
-        .try_with(|id| *id)
-        .unwrap_or_else(|_| thread::current().id())
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/lib.rs cargo-0.33.0/vendor/crossbeam-channel/src/lib.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,351 +1,330 @@
 //! Multi-producer multi-consumer channels for message passing.
 //!
-//! Crossbeam's channels are an alternative to the [`std::sync::mpsc`] channels provided by the
-//! standard library. They are an improvement in terms of performance, ergonomics, and features.
+//! This crate is an alternative to [`std::sync::mpsc`] with more features and better performance.
 //!
-//! Here's a quick example:
+//! # Hello, world!
 //!
 //! ```
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::unbounded;
 //!
 //! // Create a channel of unbounded capacity.
-//! let (s, r) = channel::unbounded();
+//! let (s, r) = unbounded();
 //!
 //! // Send a message into the channel.
-//! s.send("Hello world!");
+//! s.send("Hello, world!").unwrap();
 //!
 //! // Receive the message from the channel.
-//! assert_eq!(r.recv(), Some("Hello world!"));
+//! assert_eq!(r.recv(), Ok("Hello, world!"));
 //! ```
 //!
-//! # Types of channels
+//! # Channel types
 //!
-//! Channels are created using two functions:
+//! Channels can be created using two functions:
 //!
 //! * [`bounded`] creates a channel of bounded capacity, i.e. there is a limit to how many messages
-//!   it can hold.
+//!   it can hold at a time.
 //!
-//! * [`unbounded`] creates a channel of unbounded capacity, i.e. it can contain arbitrary number
-//!   of messages at any time.
+//! * [`unbounded`] creates a channel of unbounded capacity, i.e. it can hold any number of
+//!   messages at a time.
 //!
-//! Both functions return two handles: a sender and a receiver. Senders and receivers represent
-//! two opposite sides of a channel. Messages are sent into the channel using senders and received
-//! using receivers.
+//! Both functions return a [`Sender`] and a [`Receiver`], which represent the two opposite sides
+//! of a channel.
 //!
 //! Creating a bounded channel:
 //!
 //! ```
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::bounded;
 //!
 //! // Create a channel that can hold at most 5 messages at a time.
-//! let (s, r) = channel::bounded(5);
+//! let (s, r) = bounded(5);
 //!
-//! // Can only send 5 messages without blocking.
+//! // Can send only 5 messages without blocking.
 //! for i in 0..5 {
-//!     s.send(i);
+//!     s.send(i).unwrap();
 //! }
 //!
 //! // Another call to `send` would block because the channel is full.
-//! // s.send(5);
+//! // s.send(5).unwrap();
 //! ```
 //!
 //! Creating an unbounded channel:
 //!
 //! ```
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::unbounded;
 //!
 //! // Create an unbounded channel.
-//! let (s, r) = channel::unbounded();
+//! let (s, r) = unbounded();
 //!
 //! // Can send any number of messages into the channel without blocking.
 //! for i in 0..1000 {
-//!     s.send(i);
+//!     s.send(i).unwrap();
 //! }
 //! ```
 //!
-//! A rather special case is a bounded, zero-capacity channel. This kind of channel cannot hold any
-//! messages at all! In order to send a message through the channel, a sending thread and a
-//! receiving thread have to pair up at the same time:
+//! A special case is zero-capacity channel, which cannot hold any messages. Instead, send and
+//! receive operations must appear at the same time in order to pair up and pass the message over:
 //!
 //! ```
 //! use std::thread;
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::bounded;
 //!
 //! // Create a zero-capacity channel.
-//! let (s, r) = channel::bounded(0);
+//! let (s, r) = bounded(0);
 //!
-//! // Spawn a thread that sends a message into the channel.
 //! // Sending blocks until a receive operation appears on the other side.
-//! thread::spawn(move || s.send("Hi!"));
+//! thread::spawn(move || s.send("Hi!").unwrap());
 //!
-//! // Receive the message.
 //! // Receiving blocks until a send operation appears on the other side.
-//! assert_eq!(r.recv(), Some("Hi!"));
+//! assert_eq!(r.recv(), Ok("Hi!"));
 //! ```
 //!
 //! # Sharing channels
 //!
-//! Senders and receivers can be either shared by reference or cloned and then sent to other
-//! threads. There can be multiple senders and multiple receivers associated with the same channel.
-//!
-//! Sharing by reference:
+//! Senders and receivers can be cloned and sent to other threads:
 //!
 //! ```
-//! # extern crate crossbeam_channel;
-//! extern crate crossbeam;
-//! # fn main() {
-//! use crossbeam_channel as channel;
-//!
-//! let (s, r) = channel::unbounded();
+//! use std::thread;
+//! use crossbeam_channel::bounded;
 //!
-//! crossbeam::scope(|scope| {
-//!     // Spawn a thread that sends one message and then receives one.
-//!     scope.spawn(|| {
-//!         s.send(1);
-//!         r.recv().unwrap();
-//!     });
+//! let (s1, r1) = bounded(0);
+//! let (s2, r2) = (s1.clone(), r1.clone());
 //!
-//!     // Spawn another thread that does the same thing.
-//!     scope.spawn(|| {
-//!         s.send(2);
-//!         r.recv().unwrap();
-//!     });
+//! // Spawn a thread that receives a message and then sends one.
+//! thread::spawn(move || {
+//!     r2.recv().unwrap();
+//!     s2.send(2).unwrap();
 //! });
 //!
-//! # }
+//! // Send a message and then receive one.
+//! s1.send(1).unwrap();
+//! r1.recv().unwrap();
 //! ```
 //!
-//! Sharing by cloning:
+//! Note that cloning only creates a new handle to the same sending or receiving side. It does not
+//! create a separate stream of messages in any way:
 //!
 //! ```
-//! use std::thread;
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::unbounded;
 //!
-//! let (s1, r1) = channel::unbounded();
+//! let (s1, r1) = unbounded();
 //! let (s2, r2) = (s1.clone(), r1.clone());
+//! let (s3, r3) = (s2.clone(), r2.clone());
 //!
-//! // Spawn a thread that sends one message and then receives one.
-//! thread::spawn(move || {
-//!     s1.send(1);
-//!     r1.recv().unwrap();
-//! });
+//! s1.send(10).unwrap();
+//! s2.send(20).unwrap();
+//! s3.send(30).unwrap();
+//!
+//! assert_eq!(r3.recv(), Ok(10));
+//! assert_eq!(r1.recv(), Ok(20));
+//! assert_eq!(r2.recv(), Ok(30));
+//! ```
+//!
+//! It's also possible to share senders and receivers by reference:
 //!
-//! // Spawn another thread that receives a message and then sends one.
-//! thread::spawn(move || {
-//!     r2.recv().unwrap();
-//!     s2.send(2);
-//! });
 //! ```
+//! # extern crate crossbeam_channel;
+//! # extern crate crossbeam_utils;
+//! # fn main() {
+//! use std::thread;
+//! use crossbeam_channel::bounded;
+//! use crossbeam_utils::thread::scope;
+//!
+//! let (s, r) = bounded(0);
+//!
+//! scope(|scope| {
+//!     // Spawn a thread that receives a message and then sends one.
+//!     scope.spawn(|_| {
+//!         r.recv().unwrap();
+//!         s.send(2).unwrap();
+//!     });
 //!
-//! Note that cloning only creates a new reference to the same sending or receiving side. Cloning
-//! does not create a new channel.
+//!     // Send a message and then receive one.
+//!     s.send(1).unwrap();
+//!     r.recv().unwrap();
+//! }).unwrap();
+//! # }
+//! ```
 //!
-//! # Closing channels
+//! # Disconnection
 //!
-//! When all senders associated with a channel get dropped, the channel becomes closed. No more
-//! messages can be sent, but any remaining messages can still be received. Receive operations on a
-//! closed channel never block, even if the channel is empty.
+//! When all senders or all receivers associated with a channel get dropped, the channel becomes
+//! disconnected. No more messages can be sent, but any remaining messages can still be received.
+//! Send and receive operations on a disconnected channel never block.
 //!
 //! ```
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::{unbounded, RecvError};
 //!
-//! let (s, r) = channel::unbounded();
-//! s.send(1);
-//! s.send(2);
-//! s.send(3);
+//! let (s, r) = unbounded();
+//! s.send(1).unwrap();
+//! s.send(2).unwrap();
+//! s.send(3).unwrap();
 //!
-//! // The only sender is dropped, closing the channel.
+//! // The only sender is dropped, disconnecting the channel.
 //! drop(s);
 //!
 //! // The remaining messages can be received.
-//! assert_eq!(r.recv(), Some(1));
-//! assert_eq!(r.recv(), Some(2));
-//! assert_eq!(r.recv(), Some(3));
+//! assert_eq!(r.recv(), Ok(1));
+//! assert_eq!(r.recv(), Ok(2));
+//! assert_eq!(r.recv(), Ok(3));
 //!
 //! // There are no more messages in the channel.
 //! assert!(r.is_empty());
 //!
-//! // Note that calling `r.recv()` will not block.
-//! // Instead, `None` is returned immediately.
-//! assert_eq!(r.recv(), None);
+//! // Note that calling `r.recv()` does not block.
+//! // Instead, `Err(RecvError)` is returned immediately.
+//! assert_eq!(r.recv(), Err(RecvError));
 //! ```
 //!
-//! # Blocking and non-blocking operations
+//! # Blocking operations
 //!
-//! Sending a message into a full bounded channel will block until an empty slot in the channel
-//! becomes available. Sending into an unbounded channel never blocks because there is always
-//! enough space in it. Zero-capacity channels are always empty, and sending blocks until a receive
-//! operation appears on the other side of the channel.
+//! Send and receive operations come in three flavors:
 //!
-//! Receiving from an empty channel blocks until a message is sent into the channel or the channel
-//! becomes closed. Zero-capacity channels are always empty, and receiving blocks until a send
-//! operation appears on the other side of the channel or it becomes closed.
+//! * Non-blocking (returns immediately with success or failure).
+//! * Blocking (waits until the operation succeeds or the channel becomes disconnected).
+//! * Blocking with a timeout (blocks only for a certain duration of time).
 //!
-//! There is also a non-blocking method [`try_recv`], which receives a message if it is immediately
-//! available, or returns `None` otherwise.
+//! A simple example showing the difference between non-blocking and blocking operations:
 //!
 //! ```
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::{bounded, RecvError, TryRecvError};
 //!
-//! let (s, r) = channel::bounded(1);
+//! let (s, r) = bounded(1);
 //!
 //! // Send a message into the channel.
-//! s.send("foo");
+//! s.send("foo").unwrap();
 //!
 //! // This call would block because the channel is full.
-//! // s.send("bar");
+//! // s.send("bar").unwrap();
 //!
 //! // Receive the message.
-//! assert_eq!(r.recv(), Some("foo"));
+//! assert_eq!(r.recv(), Ok("foo"));
 //!
 //! // This call would block because the channel is empty.
 //! // r.recv();
 //!
 //! // Try receiving a message without blocking.
-//! assert_eq!(r.try_recv(), None);
+//! assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 //!
-//! // Close the channel.
+//! // Disconnect the channel.
 //! drop(s);
 //!
-//! // This call doesn't block because the channel is now closed.
-//! assert_eq!(r.recv(), None);
+//! // This call doesn't block because the channel is now disconnected.
+//! assert_eq!(r.recv(), Err(RecvError));
 //! ```
 //!
-//! For greater control over blocking, consider using the [`select!`] macro.
-//!
 //! # Iteration
 //!
-//! A channel is a special kind of iterator, where items can be dynamically produced by senders and
-//! consumed by receivers. Indeed, [`Receiver`] implements the [`Iterator`] trait, and calling
-//! [`next`] is equivalent to calling [`recv`].
+//! Receivers can be used as iterators. For example, method [`iter`] creates an iterator that
+//! receives messages until the channel becomes empty and disconnected. Note that iteration may
+//! block waiting for next message to arrive.
 //!
 //! ```
 //! use std::thread;
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::unbounded;
 //!
-//! let (s, r) = channel::unbounded();
+//! let (s, r) = unbounded();
 //!
 //! thread::spawn(move || {
-//!     s.send(1);
-//!     s.send(2);
-//!     s.send(3);
-//!     // `s` was moved into the closure so now it gets dropped,
-//!     // thus closing the channel.
+//!     s.send(1).unwrap();
+//!     s.send(2).unwrap();
+//!     s.send(3).unwrap();
+//!     drop(s); // Disconnect the channel.
 //! });
 //!
 //! // Collect all messages from the channel.
-//! //
-//! // Note that the call to `collect` blocks until the channel becomes
-//! // closed and empty, i.e. until `r.next()` returns `None`.
-//! let v: Vec<_> = r.collect();
+//! // Note that the call to `collect` blocks until the sender is dropped.
+//! let v: Vec<_> = r.iter().collect();
+//!
 //! assert_eq!(v, [1, 2, 3]);
 //! ```
 //!
-//! # Select
-//!
-//! The [`select!`] macro allows declaring a set of channel operations and blocking until any one
-//! of them becomes ready. Finally, one of the operations is executed. If multiple operations
-//! are ready at the same time, a random one is chosen. It is also possible to declare a `default`
-//! case that gets executed if none of the operations are initially ready.
-//!
-//! An example of receiving a message from two channels, whichever becomes ready first:
+//! A non-blocking iterator can be created using [`try_iter`], which receives all available
+//! messages without blocking:
 //!
 //! ```
-//! # #[macro_use]
-//! # extern crate crossbeam_channel;
-//! # fn main() {
-//! use std::thread;
-//! use crossbeam_channel as channel;
+//! use crossbeam_channel::unbounded;
 //!
-//! let (s1, r1) = channel::unbounded();
-//! let (s2, r2) = channel::unbounded();
+//! let (s, r) = unbounded();
+//! s.send(1).unwrap();
+//! s.send(2).unwrap();
+//! s.send(3).unwrap();
+//! // No need to drop the sender.
 //!
-//! thread::spawn(move || s1.send("foo"));
-//! thread::spawn(move || s2.send("bar"));
+//! // Receive all messages currently in the channel.
+//! let v: Vec<_> = r.try_iter().collect();
 //!
-//! // Only one of these two receive operations will be executed.
-//! select! {
-//!     recv(r1, msg) => assert_eq!(msg, Some("foo")),
-//!     recv(r2, msg) => assert_eq!(msg, Some("bar")),
-//! }
-//! # }
+//! assert_eq!(v, [1, 2, 3]);
 //! ```
 //!
-//! For more details, take a look at the documentation for [`select!`].
+//! # Selection
 //!
-//! If you need to dynamically add cases rather than define them statically inside the macro, use
-//! [`Select`] instead.
+//! The [`select!`] macro allows you to define a set of channel operations, wait until any one of
+//! them becomes ready, and finally execute it. If multiple operations are ready at the same time,
+//! a random one among them is selected.
 //!
-//! # Frequently asked questions
+//! It is also possible to define a `default` case that gets executed if none of the operations are
+//! ready, either right away or for a certain duration of time.
 //!
-//! ### How to try receiving a message, but also check whether the channel is empty or closed?
+//! An operation is considered to be ready if it doesn't have to block. Note that it is ready even
+//! when it will simply return an error because the channel is disconnected.
 //!
-//! Use the [`select!`] macro:
+//! An example of receiving a message from two channels:
 //!
-//! ```rust
+//! ```
 //! # #[macro_use]
 //! # extern crate crossbeam_channel;
 //! # fn main() {
-//! use crossbeam_channel as channel;
+//! use std::thread;
+//! use std::time::Duration;
+//! use crossbeam_channel::unbounded;
 //!
-//! let (s, r) = channel::unbounded();
-//! s.send("hello");
+//! let (s1, r1) = unbounded();
+//! let (s2, r2) = unbounded();
 //!
+//! thread::spawn(move || s1.send(10).unwrap());
+//! thread::spawn(move || s2.send(20).unwrap());
+//!
+//! // At most one of these two receive operations will be executed.
 //! select! {
-//!     recv(r, msg) => match msg {
-//!         Some(msg) => println!("received {:?}", msg),
-//!         None => println!("the channel is closed"),
-//!     }
-//!     default => println!("the channel is empty"),
+//!     recv(r1) -> msg => assert_eq!(msg, Ok(10)),
+//!     recv(r2) -> msg => assert_eq!(msg, Ok(20)),
+//!     default(Duration::from_secs(1)) => println!("timed out"),
 //! }
 //! # }
 //! ```
 //!
-//! ### How to try sending a message without blocking when the channel is full?
+//! If you need to select over a dynamically created list of channel operations, use [`Select`]
+//! instead. The [`select!`] macro is just a convenience wrapper around [`Select`].
 //!
-//! Use the [`select!`] macro:
+//! # Extra channels
 //!
-//! ```rust
-//! # #[macro_use]
-//! # extern crate crossbeam_channel;
-//! # fn main() {
-//! use crossbeam_channel as channel;
-//!
-//! let (s, r) = channel::bounded(1);
-//! s.send("first");
-//!
-//! select! {
-//!     send(s, "second") => println!("message sent"),
-//!     default => println!("the channel is full"),
-//! }
-//! # }
-//! ```
+//! Three functions can create special kinds of channels, all of which return just a [`Receiver`]
+//! handle:
 //!
-//! ### How to try sending/receiving a message with a timeout?
+//! * [`after`] creates a channel that delivers a single message after a certain duration of time.
+//! * [`tick`] creates a channel that delivers messages periodically.
+//! * [`never`] creates a channel that never delivers messages.
 //!
-//! Function [`after`] creates a special kind of channel that delivers a message after the
-//! specified timeout. Use [`select!`] to wait until a message is sent/received or the timeout
-//! is fired:
+//! These channels are very efficient because messages get lazily generated on receive operations.
 //!
+//! An example that prints elapsed time every 50 milliseconds for the duration of 1 second:
 //!
-//! ```rust
+//! ```
 //! # #[macro_use]
 //! # extern crate crossbeam_channel;
 //! # fn main() {
-//! use std::time::Duration;
-//! use crossbeam_channel as channel;
-//!
-//! let (s, r) = channel::bounded(1);
-//! s.send("hello");
+//! use std::time::{Duration, Instant};
+//! use crossbeam_channel::{after, tick};
 //!
-//! let timeout = Duration::from_millis(100);
-//!
-//! select! {
-//!     recv(r, msg) => match msg {
-//!         Some(msg) => println!("received {:?}", msg),
-//!         None => println!("the channel is closed"),
+//! let start = Instant::now();
+//! let ticker = tick(Duration::from_millis(50));
+//! let timeout = after(Duration::from_secs(1));
+//!
+//! loop {
+//!     select! {
+//!         recv(ticker) -> _ => println!("elapsed: {:?}", start.elapsed()),
+//!         recv(timeout) -> _ => break,
 //!     }
-//!     recv(channel::after(timeout)) => println!("timed out; the channel is still empty"),
 //! }
 //! # }
 //! ```
@@ -353,28 +332,41 @@
 //! [`std::sync::mpsc`]: https://doc.rust-lang.org/std/sync/mpsc/index.html
 //! [`unbounded`]: fn.unbounded.html
 //! [`bounded`]: fn.bounded.html
-//! [`after`]: fn.bounded.html
+//! [`after`]: fn.after.html
+//! [`tick`]: fn.tick.html
+//! [`never`]: fn.never.html
 //! [`send`]: struct.Sender.html#method.send
-//! [`try_recv`]: struct.Receiver.html#method.try_recv
 //! [`recv`]: struct.Receiver.html#method.recv
-//! [`next`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.next
-//! [`Iterator`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html
+//! [`iter`]: struct.Receiver.html#method.iter
+//! [`try_iter`]: struct.Receiver.html#method.try_iter
 //! [`select!`]: macro.select.html
 //! [`Select`]: struct.Select.html
 //! [`Sender`]: struct.Sender.html
 //! [`Receiver`]: struct.Receiver.html
 
-extern crate crossbeam_epoch;
+#![warn(missing_docs)]
+#![warn(missing_debug_implementations)]
+
 extern crate crossbeam_utils;
-extern crate rand;
-extern crate parking_lot;
+extern crate smallvec;
 
+mod channel;
+mod context;
+mod counter;
+mod err;
 mod flavors;
+mod select;
+mod select_macro;
+mod utils;
+mod waker;
+
+pub use channel::{after, never, tick};
+pub use channel::{bounded, unbounded};
+pub use channel::{IntoIter, Iter, TryIter};
+pub use channel::{Receiver, Sender};
 
-#[doc(hidden)]
-pub mod internal;
+pub use select::{Select, SelectedOperation};
 
-pub use internal::channel::{Receiver, Sender};
-pub use internal::channel::{bounded, unbounded};
-pub use internal::channel::{after, tick};
-pub use internal::select::Select;
+pub use err::{RecvError, RecvTimeoutError, TryRecvError};
+pub use err::{ReadyTimeoutError, SelectTimeoutError, TryReadyError, TrySelectError};
+pub use err::{SendError, SendTimeoutError, TrySendError};
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/select_macro.rs cargo-0.33.0/vendor/crossbeam-channel/src/select_macro.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/select_macro.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/select_macro.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1201 @@
+//! The `select!` macro.
+
+/// A simple wrapper around the standard macros.
+///
+/// This is just an ugly workaround until it becomes possible to import macros with `use`
+/// statements.
+///
+/// TODO(stjepang): Once we bump the minimum required Rust version to 1.30 or newer, we should:
+///
+/// 1. Remove all `#[macro_export(local_inner_macros)]` lines.
+/// 2. Replace `crossbeam_channel_delegate` with direct macro invocations.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! crossbeam_channel_delegate {
+    (concat($($args:tt)*)) => {
+        concat!($($args)*)
+    };
+    (stringify($($args:tt)*)) => {
+        stringify!($($args)*)
+    };
+    (unreachable($($args:tt)*)) => {
+        unreachable!($($args)*)
+    };
+    (compile_error($($args:tt)*)) => {
+        compile_error!($($args)*)
+    };
+}
+
+/// A helper macro for `select!` to hide the long list of macro patterns from the documentation.
+///
+/// The macro consists of two stages:
+/// 1. Parsing
+/// 2. Code generation
+///
+/// The parsing stage consists of these subparts:
+/// 1. `@list`: Turns a list of tokens into a list of cases.
+/// 2. `@list_errorN`: Diagnoses the syntax error.
+/// 3. `@case`: Parses a single case and verifies its argument list.
+///
+/// The codegen stage consists of these subparts:
+/// 1. `@init`: Attempts to optimize `select!` away and initializes a `Select`.
+/// 2. `@add`: Adds send/receive operations to the `Select` and starts selection.
+/// 3. `@complete`: Completes the selected send/receive operation.
+///
+/// If the parsing stage encounters a syntax error or the codegen stage ends up with too many
+/// cases to process, the macro fails with a compile-time error.
+#[doc(hidden)]
+#[macro_export(local_inner_macros)]
+macro_rules! crossbeam_channel_internal {
+    // The list is empty. Now check the arguments of each processed case.
+    (@list
+        ()
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($head)*)
+            ()
+            ()
+        )
+    };
+    // If necessary, insert an empty argument list after `default`.
+    (@list
+        (default => $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(
+            @list
+            (default() => $($tail)*)
+            ($($head)*)
+        )
+    };
+    // But print an error if `default` is followed by a `->`.
+    (@list
+        (default -> $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected `=>` after `default` case, found `->`"
+        ))
+    };
+    // Print an error if there's an `->` after the argument list in the default case.
+    (@list
+        (default $args:tt -> $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected `=>` after `default` case, found `->`"
+        ))
+    };
+    // Print an error if there is a missing result in a recv case.
+    (@list
+        (recv($($args:tt)*) => $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected `->` after `recv` case, found `=>`"
+        ))
+    };
+    // Print an error if there is a missing result in a send case.
+    (@list
+        (send($($args:tt)*) => $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected `->` after `send` operation, found `=>`"
+        ))
+    };
+    // Make sure the arrow and the result are not repeated.
+    (@list
+        ($case:ident $args:tt -> $res:tt -> $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_delegate!(compile_error("expected `=>`, found `->`"))
+    };
+    // Print an error if there is a semicolon after the block.
+    (@list
+        ($case:ident $args:tt $(-> $res:pat)* => $body:block; $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            "did you mean to put a comma instead of the semicolon after `}`?"
+        ))
+    };
+    // The first case is separated by a comma.
+    (@list
+        ($case:ident ($($args:tt)*) $(-> $res:pat)* => $body:expr, $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(
+            @list
+            ($($tail)*)
+            ($($head)* $case ($($args)*) $(-> $res)* => { $body },)
+        )
+    };
+    // Don't require a comma after the case if it has a proper block.
+    (@list
+        ($case:ident ($($args:tt)*) $(-> $res:pat)* => $body:block $($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(
+            @list
+            ($($tail)*)
+            ($($head)* $case ($($args)*) $(-> $res)* => { $body },)
+        )
+    };
+    // Only one case remains.
+    (@list
+        ($case:ident ($($args:tt)*) $(-> $res:pat)* => $body:expr)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(
+            @list
+            ()
+            ($($head)* $case ($($args)*) $(-> $res)* => { $body },)
+        )
+    };
+    // Accept a trailing comma at the end of the list.
+    (@list
+        ($case:ident ($($args:tt)*) $(-> $res:pat)* => $body:expr,)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(
+            @list
+            ()
+            ($($head)* $case ($($args)*) $(-> $res)* => { $body },)
+        )
+    };
+    // Diagnose and print an error.
+    (@list
+        ($($tail:tt)*)
+        ($($head:tt)*)
+    ) => {
+        crossbeam_channel_internal!(@list_error1 $($tail)*)
+    };
+    // Stage 1: check the case type.
+    (@list_error1 recv $($tail:tt)*) => {
+        crossbeam_channel_internal!(@list_error2 recv $($tail)*)
+    };
+    (@list_error1 send $($tail:tt)*) => {
+        crossbeam_channel_internal!(@list_error2 send $($tail)*)
+    };
+    (@list_error1 default $($tail:tt)*) => {
+        crossbeam_channel_internal!(@list_error2 default $($tail)*)
+    };
+    (@list_error1 $t:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected one of `recv`, `send`, or `default`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error1 $($tail:tt)*) => {
+        crossbeam_channel_internal!(@list_error2 $($tail)*);
+    };
+    // Stage 2: check the argument list.
+    (@list_error2 $case:ident) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "missing argument list after `",
+                crossbeam_channel_delegate!(stringify($case)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error2 $case:ident => $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "missing argument list after `",
+                crossbeam_channel_delegate!(stringify($case)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error2 $($tail:tt)*) => {
+        crossbeam_channel_internal!(@list_error3 $($tail)*)
+    };
+    // Stage 3: check the `=>` and what comes after it.
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "missing `=>` after `",
+                crossbeam_channel_delegate!(stringify($case)),
+                "` case",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* =>) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected expression after `=>`"
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => $body:expr; $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "did you mean to put a comma instead of the semicolon after `",
+                crossbeam_channel_delegate!(stringify($body)),
+                "`?",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => recv($($a:tt)*) $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected an expression after `=>`"
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => send($($a:tt)*) $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected an expression after `=>`"
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => default($($a:tt)*) $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            "expected an expression after `=>`"
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => $f:ident($($a:tt)*) $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "did you mean to put a comma after `",
+                crossbeam_channel_delegate!(stringify($f)),
+                "(",
+                crossbeam_channel_delegate!(stringify($($a)*)),
+                ")`?",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => $f:ident!($($a:tt)*) $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "did you mean to put a comma after `",
+                crossbeam_channel_delegate!(stringify($f)),
+                "!(",
+                crossbeam_channel_delegate!(stringify($($a)*)),
+                ")`?",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => $f:ident![$($a:tt)*] $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "did you mean to put a comma after `",
+                crossbeam_channel_delegate!(stringify($f)),
+                "![",
+                crossbeam_channel_delegate!(stringify($($a)*)),
+                "]`?",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => $f:ident!{$($a:tt)*} $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "did you mean to put a comma after `",
+                crossbeam_channel_delegate!(stringify($f)),
+                "!{",
+                crossbeam_channel_delegate!(stringify($($a)*)),
+                "}`?",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $(-> $r:pat)* => $body:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "did you mean to put a comma after `",
+                crossbeam_channel_delegate!(stringify($body)),
+                "`?",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) -> => $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error("missing pattern after `->`"))
+    };
+    (@list_error3 $case:ident($($args:tt)*) $t:tt $(-> $r:pat)* => $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected `->`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 $case:ident($($args:tt)*) -> $t:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected a pattern, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 recv($($args:tt)*) $t:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected `->`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 send($($args:tt)*) $t:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected `->`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 recv $args:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected an argument list after `recv`, found `",
+                crossbeam_channel_delegate!(stringify($args)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 send $args:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected an argument list after `send`, found `",
+                crossbeam_channel_delegate!(stringify($args)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 default $args:tt $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected an argument list or `=>` after `default`, found `",
+                crossbeam_channel_delegate!(stringify($args)),
+                "`",
+            ))
+        ))
+    };
+    (@list_error3 $($tail:tt)*) => {
+        crossbeam_channel_internal!(@list_error4 $($tail)*)
+    };
+    // Stage 4: fail with a generic error message.
+    (@list_error4 $($tail:tt)*) => {
+        crossbeam_channel_delegate!(compile_error("invalid syntax"))
+    };
+
+    // Success! All cases were parsed.
+    (@case
+        ()
+        $cases:tt
+        $default:tt
+    ) => {
+        crossbeam_channel_internal!(
+            @init
+            $cases
+            $default
+        )
+    };
+
+    // Check the format of a recv case.
+    (@case
+        (recv($r:expr) -> $res:pat => $body:tt, $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            ($($cases)* recv($r) -> $res => $body,)
+            $default
+        )
+    };
+    // Allow trailing comma...
+    (@case
+        (recv($r:expr,) -> $res:pat => $body:tt, $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            ($($cases)* recv($r) -> $res => $body,)
+            $default
+        )
+    };
+    // Print an error if the argument list is invalid.
+    (@case
+        (recv($($args:tt)*) -> $res:pat => $body:tt, $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "invalid argument list in `recv(",
+                crossbeam_channel_delegate!(stringify($($args)*)),
+                ")`",
+            ))
+        ))
+    };
+    // Print an error if there is no argument list.
+    (@case
+        (recv $t:tt $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected an argument list after `recv`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+
+    // Check the format of a send case.
+    (@case
+        (send($s:expr, $m:expr) -> $res:pat => $body:tt, $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            ($($cases)* send($s, $m) -> $res => $body,)
+            $default
+        )
+    };
+    // Allow trailing comma...
+    (@case
+        (send($s:expr, $m:expr,) -> $res:pat => $body:tt, $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            ($($cases)* send($s, $m) -> $res => $body,)
+            $default
+        )
+    };
+    // Print an error if the argument list is invalid.
+    (@case
+        (send($($args:tt)*) -> $res:pat => $body:tt, $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "invalid argument list in `send(",
+                crossbeam_channel_delegate!(stringify($($args)*)),
+                ")`",
+            ))
+        ))
+    };
+    // Print an error if there is no argument list.
+    (@case
+        (send $t:tt $($tail:tt)*)
+        ($($cases:tt)*)
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected an argument list after `send`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+
+    // Check the format of a default case.
+    (@case
+        (default() => $body:tt, $($tail:tt)*)
+        $cases:tt
+        ()
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            $cases
+            (default() => $body,)
+        )
+    };
+    // Check the format of a default case with timeout.
+    (@case
+        (default($timeout:expr) => $body:tt, $($tail:tt)*)
+        $cases:tt
+        ()
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            $cases
+            (default($timeout) => $body,)
+        )
+    };
+    // Allow trailing comma...
+    (@case
+        (default($timeout:expr,) => $body:tt, $($tail:tt)*)
+        $cases:tt
+        ()
+    ) => {
+        crossbeam_channel_internal!(
+            @case
+            ($($tail)*)
+            $cases
+            (default($timeout) => $body,)
+        )
+    };
+    // Check for duplicate default cases...
+    (@case
+        (default $($tail:tt)*)
+        $cases:tt
+        ($($def:tt)+)
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            "there can be only one `default` case in a `select!` block"
+        ))
+    };
+    // Print an error if the argument list is invalid.
+    (@case
+        (default($($args:tt)*) => $body:tt, $($tail:tt)*)
+        $cases:tt
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "invalid argument list in `default(",
+                crossbeam_channel_delegate!(stringify($($args)*)),
+                ")`",
+            ))
+        ))
+    };
+    // Print an error if there is an unexpected token after `default`.
+    (@case
+        (default $($tail:tt)*)
+        $cases:tt
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected an argument list or `=>` after `default`, found `",
+                crossbeam_channel_delegate!(stringify($t)),
+                "`",
+            ))
+        ))
+    };
+
+    // The case was not consumed, therefore it must be invalid.
+    (@case
+        ($case:ident $($tail:tt)*)
+        $cases:tt
+        $default:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "expected one of `recv`, `send`, or `default`, found `",
+                crossbeam_channel_delegate!(stringify($case)),
+                "`",
+            ))
+        ))
+    };
+
+    // Optimize `select!` into `try_recv()`.
+    (@init
+        (recv($r:expr) -> $res:pat => $recv_body:tt,)
+        (default() => $default_body:tt,)
+    ) => {{
+        match $r {
+            ref _r => {
+                let _r: &$crate::Receiver<_> = _r;
+                match _r.try_recv() {
+                    ::std::result::Result::Err($crate::TryRecvError::Empty) => {
+                        $default_body
+                    }
+                    _res => {
+                        let _res = _res.map_err(|_| $crate::RecvError);
+                        let $res = _res;
+                        $recv_body
+                    }
+                }
+            }
+        }
+    }};
+    // Optimize `select!` into `recv()`.
+    (@init
+        (recv($r:expr) -> $res:pat => $body:tt,)
+        ()
+    ) => {{
+        match $r {
+            ref _r => {
+                let _r: &$crate::Receiver<_> = _r;
+                let _res = _r.recv();
+                let $res = _res;
+                $body
+            }
+        }
+    }};
+    // Optimize `select!` into `recv_timeout()`.
+    (@init
+        (recv($r:expr) -> $res:pat => $recv_body:tt,)
+        (default($timeout:expr) => $default_body:tt,)
+    ) => {{
+        match $r {
+            ref _r => {
+                let _r: &$crate::Receiver<_> = _r;
+                match _r.recv_timeout($timeout) {
+                    ::std::result::Result::Err($crate::RecvTimeoutError::Timeout) => {
+                        $default_body
+                    }
+                    _res => {
+                        let _res = _res.map_err(|_| $crate::RecvError);
+                        let $res = _res;
+                        $recv_body
+                    }
+                }
+            }
+        }
+    }};
+
+    // // Optimize the non-blocking case with two receive operations.
+    // (@init
+    //     (recv($r1:expr) -> $res1:pat => $recv_body1:tt,)
+    //     (recv($r2:expr) -> $res2:pat => $recv_body2:tt,)
+    //     (default() => $default_body:tt,)
+    // ) => {{
+    //     match $r1 {
+    //         ref _r1 => {
+    //             let _r1: &$crate::Receiver<_> = _r1;
+    //
+    //             match $r2 {
+    //                 ref _r2 => {
+    //                     let _r2: &$crate::Receiver<_> = _r2;
+    //
+    //                     // TODO(stjepang): Implement this optimization.
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }};
+    // // Optimize the blocking case with two receive operations.
+    // (@init
+    //     (recv($r1:expr) -> $res1:pat => $body1:tt,)
+    //     (recv($r2:expr) -> $res2:pat => $body2:tt,)
+    //     ()
+    // ) => {{
+    //     match $r1 {
+    //         ref _r1 => {
+    //             let _r1: &$crate::Receiver<_> = _r1;
+    //
+    //             match $r2 {
+    //                 ref _r2 => {
+    //                     let _r2: &$crate::Receiver<_> = _r2;
+    //
+    //                     // TODO(stjepang): Implement this optimization.
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }};
+    // // Optimize the case with two receive operations and a timeout.
+    // (@init
+    //     (recv($r1:expr) -> $res1:pat => $recv_body1:tt,)
+    //     (recv($r2:expr) -> $res2:pat => $recv_body2:tt,)
+    //     (default($timeout:expr) => $default_body:tt,)
+    // ) => {{
+    //     match $r1 {
+    //         ref _r1 => {
+    //             let _r1: &$crate::Receiver<_> = _r1;
+    //
+    //             match $r2 {
+    //                 ref _r2 => {
+    //                     let _r2: &$crate::Receiver<_> = _r2;
+    //
+    //                     // TODO(stjepang): Implement this optimization.
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }};
+
+    // // Optimize `select!` into `try_send()`.
+    // (@init
+    //     (send($s:expr, $m:expr) -> $res:pat => $send_body:tt,)
+    //     (default() => $default_body:tt,)
+    // ) => {{
+    //     match $s {
+    //         ref _s => {
+    //             let _s: &$crate::Sender<_> = _s;
+    //             // TODO(stjepang): Implement this optimization.
+    //         }
+    //     }
+    // }};
+    // // Optimize `select!` into `send()`.
+    // (@init
+    //     (send($s:expr, $m:expr) -> $res:pat => $body:tt,)
+    //     ()
+    // ) => {{
+    //     match $s {
+    //         ref _s => {
+    //             let _s: &$crate::Sender<_> = _s;
+    //             // TODO(stjepang): Implement this optimization.
+    //         }
+    //     }
+    // }};
+    // // Optimize `select!` into `send_timeout()`.
+    // (@init
+    //     (send($s:expr, $m:expr) -> $res:pat => $body:tt,)
+    //     (default($timeout:expr) => $body:tt,)
+    // ) => {{
+    //     match $s {
+    //         ref _s => {
+    //             let _s: &$crate::Sender<_> = _s;
+    //             // TODO(stjepang): Implement this optimization.
+    //         }
+    //     }
+    // }};
+
+    // Create a `Select` and add operations to it.
+    (@init
+        ($($cases:tt)*)
+        $default:tt
+    ) => {{
+        #[allow(unused_mut)]
+        let mut _sel = $crate::Select::new();
+        crossbeam_channel_internal!(
+            @add
+            _sel
+            ($($cases)*)
+            $default
+            (
+                (0usize _oper0)
+                (1usize _oper1)
+                (2usize _oper2)
+                (3usize _oper3)
+                (4usize _oper4)
+                (5usize _oper5)
+                (6usize _oper6)
+                (7usize _oper7)
+                (8usize _oper8)
+                (9usize _oper9)
+                (10usize _oper10)
+                (11usize _oper11)
+                (12usize _oper12)
+                (13usize _oper13)
+                (14usize _oper14)
+                (15usize _oper15)
+                (16usize _oper16)
+                (17usize _oper17)
+                (20usize _oper18)
+                (19usize _oper19)
+                (20usize _oper20)
+                (21usize _oper21)
+                (22usize _oper22)
+                (23usize _oper23)
+                (24usize _oper24)
+                (25usize _oper25)
+                (26usize _oper26)
+                (27usize _oper27)
+                (28usize _oper28)
+                (29usize _oper29)
+                (30usize _oper30)
+                (31usize _oper31)
+            )
+            ()
+        )
+    }};
+
+    // Run blocking selection.
+    (@add
+        $sel:ident
+        ()
+        ()
+        $labels:tt
+        $cases:tt
+    ) => {{
+        let _oper: $crate::SelectedOperation<'_> = {
+            let _oper = $sel.select();
+
+            // Erase the lifetime so that `sel` can be dropped early even without NLL.
+            #[allow(unsafe_code)]
+            unsafe { ::std::mem::transmute(_oper) }
+        };
+
+        crossbeam_channel_internal! {
+            @complete
+            $sel
+            _oper
+            $cases
+        }
+    }};
+    // Run non-blocking selection.
+    (@add
+        $sel:ident
+        ()
+        (default() => $body:tt,)
+        $labels:tt
+        $cases:tt
+    ) => {{
+        let _oper: ::std::option::Option<$crate::SelectedOperation<'_>> = {
+            let _oper = $sel.try_select();
+
+            // Erase the lifetime so that `sel` can be dropped early even without NLL.
+            #[allow(unsafe_code)]
+            unsafe { ::std::mem::transmute(_oper) }
+        };
+
+        match _oper {
+            None => {
+                ::std::mem::drop($sel);
+                $body
+            }
+            Some(_oper) => {
+                crossbeam_channel_internal! {
+                    @complete
+                    $sel
+                    _oper
+                    $cases
+                }
+            }
+        }
+    }};
+    // Run selection with a timeout.
+    (@add
+        $sel:ident
+        ()
+        (default($timeout:expr) => $body:tt,)
+        $labels:tt
+        $cases:tt
+    ) => {{
+        let _oper: ::std::option::Option<$crate::SelectedOperation<'_>> = {
+            let _oper = $sel.select_timeout($timeout);
+
+            // Erase the lifetime so that `sel` can be dropped early even without NLL.
+            #[allow(unsafe_code)]
+            unsafe { ::std::mem::transmute(_oper) }
+        };
+
+        match _oper {
+            ::std::option::Option::None => {
+                ::std::mem::drop($sel);
+                $body
+            }
+            ::std::option::Option::Some(_oper) => {
+                crossbeam_channel_internal! {
+                    @complete
+                    $sel
+                    _oper
+                    $cases
+                }
+            }
+        }
+    }};
+    // Have we used up all labels?
+    (@add
+        $sel:ident
+        $input:tt
+        $default:tt
+        ()
+        $cases:tt
+    ) => {
+        crossbeam_channel_delegate!(compile_error("too many operations in a `select!` block"))
+    };
+    // Add a receive operation to `sel`.
+    (@add
+        $sel:ident
+        (recv($r:expr) -> $res:pat => $body:tt, $($tail:tt)*)
+        $default:tt
+        (($i:tt $var:ident) $($labels:tt)*)
+        ($($cases:tt)*)
+    ) => {{
+        match $r {
+            ref _r => {
+                #[allow(unsafe_code)]
+                let $var: &$crate::Receiver<_> = unsafe {
+                    let _r: &$crate::Receiver<_> = _r;
+
+                    // Erase the lifetime so that `sel` can be dropped early even without NLL.
+                    unsafe fn unbind<'a, T>(x: &T) -> &'a T {
+                        ::std::mem::transmute(x)
+                    }
+                    unbind(_r)
+                };
+                $sel.recv($var);
+
+                crossbeam_channel_internal!(
+                    @add
+                    $sel
+                    ($($tail)*)
+                    $default
+                    ($($labels)*)
+                    ($($cases)* [$i] recv($var) -> $res => $body,)
+                )
+            }
+        }
+    }};
+    // Add a send operation to `sel`.
+    (@add
+        $sel:ident
+        (send($s:expr, $m:expr) -> $res:pat => $body:tt, $($tail:tt)*)
+        $default:tt
+        (($i:tt $var:ident) $($labels:tt)*)
+        ($($cases:tt)*)
+    ) => {{
+        match $s {
+            ref _s => {
+                #[allow(unsafe_code)]
+                let $var: &$crate::Sender<_> = unsafe {
+                    let _s: &$crate::Sender<_> = _s;
+
+                    // Erase the lifetime so that `sel` can be dropped early even without NLL.
+                    unsafe fn unbind<'a, T>(x: &T) -> &'a T {
+                        ::std::mem::transmute(x)
+                    }
+                    unbind(_s)
+                };
+                $sel.send($var);
+
+                crossbeam_channel_internal!(
+                    @add
+                    $sel
+                    ($($tail)*)
+                    $default
+                    ($($labels)*)
+                    ($($cases)* [$i] send($var, $m) -> $res => $body,)
+                )
+            }
+        }
+    }};
+
+    // Complete a receive operation.
+    (@complete
+        $sel:ident
+        $oper:ident
+        ([$i:tt] recv($r:ident) -> $res:pat => $body:tt, $($tail:tt)*)
+    ) => {{
+        if $oper.index() == $i {
+            let _res = $oper.recv($r);
+            ::std::mem::drop($sel);
+
+            let $res = _res;
+            $body
+        } else {
+            crossbeam_channel_internal! {
+                @complete
+                $sel
+                $oper
+                ($($tail)*)
+            }
+        }
+    }};
+    // Complete a send operation.
+    (@complete
+        $sel:ident
+        $oper:ident
+        ([$i:tt] send($s:ident, $m:expr) -> $res:pat => $body:tt, $($tail:tt)*)
+    ) => {{
+        if $oper.index() == $i {
+            let _res = $oper.send($s, $m);
+            ::std::mem::drop($sel);
+
+            let $res = _res;
+            $body
+        } else {
+            crossbeam_channel_internal! {
+                @complete
+                $sel
+                $oper
+                ($($tail)*)
+            }
+        }
+    }};
+    // Panic if we don't identify the selected case, but this should never happen.
+    (@complete
+        $sel:ident
+        $oper:ident
+        ()
+    ) => {{
+        crossbeam_channel_delegate!(unreachable(
+            "internal error in crossbeam-channel: invalid case"
+        ))
+    }};
+
+    // Catches a bug within this macro (should not happen).
+    (@$($tokens:tt)*) => {
+        crossbeam_channel_delegate!(compile_error(
+            crossbeam_channel_delegate!(concat(
+                "internal error in crossbeam-channel: ",
+                crossbeam_channel_delegate!(stringify(@$($tokens)*)),
+            ))
+        ))
+    };
+
+    // The entry points.
+    () => {
+        crossbeam_channel_delegate!(compile_error("empty `select!` block"))
+    };
+    ($($case:ident $(($($args:tt)*))* => $body:expr $(,)*)*) => {
+        crossbeam_channel_internal!(
+            @list
+            ($($case $(($($args)*))* => { $body },)*)
+            ()
+        )
+    };
+    ($($tokens:tt)*) => {
+        crossbeam_channel_internal!(
+            @list
+            ($($tokens)*)
+            ()
+        )
+    };
+}
+
+/// Selects from a set of channel operations.
+///
+/// This macro allows you to define a set of channel operations, wait until any one of them becomes
+/// ready, and finally execute it. If multiple operations are ready at the same time, a random one
+/// among them is selected.
+///
+/// It is also possible to define a `default` case that gets executed if none of the operations are
+/// ready, either right away or for a certain duration of time.
+///
+/// An operation is considered to be ready if it doesn't have to block. Note that it is ready even
+/// when it will simply return an error because the channel is disconnected.
+///
+/// The `select` macro is a convenience wrapper around [`Select`]. However, it cannot select over a
+/// dynamically created list of channel operations.
+///
+/// [`Select`]: struct.Select.html
+///
+/// # Examples
+///
+/// Block until a send or a receive operation is selected:
+///
+/// ```
+/// # #[macro_use]
+/// # extern crate crossbeam_channel;
+/// # fn main() {
+/// use std::thread;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s1, r1) = unbounded();
+/// let (s2, r2) = unbounded();
+/// s1.send(10).unwrap();
+///
+/// // Since both operations are initially ready, a random one will be executed.
+/// select! {
+///     recv(r1) -> msg => assert_eq!(msg, Ok(10)),
+///     send(s2, 20) -> res => {
+///         assert_eq!(res, Ok(()));
+///         assert_eq!(r2.recv(), Ok(20));
+///     }
+/// }
+/// # }
+/// ```
+///
+/// Select from a set of operations without blocking:
+///
+/// ```
+/// # #[macro_use]
+/// # extern crate crossbeam_channel;
+/// # fn main() {
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s1, r1) = unbounded();
+/// let (s2, r2) = unbounded();
+///
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_secs(1));
+///     s1.send(10).unwrap();
+/// });
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_millis(500));
+///     s2.send(20).unwrap();
+/// });
+///
+/// // None of the operations are initially ready.
+/// select! {
+///     recv(r1) -> msg => panic!(),
+///     recv(r2) -> msg => panic!(),
+///     default => println!("not ready"),
+/// }
+/// # }
+/// ```
+///
+/// Select over a set of operations with a timeout:
+///
+/// ```
+/// # #[macro_use]
+/// # extern crate crossbeam_channel;
+/// # fn main() {
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::unbounded;
+///
+/// let (s1, r1) = unbounded();
+/// let (s2, r2) = unbounded();
+///
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_secs(1));
+///     s1.send(10).unwrap();
+/// });
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_millis(500));
+///     s2.send(20).unwrap();
+/// });
+///
+/// // None of the two operations will become ready within 100 milliseconds.
+/// select! {
+///     recv(r1) -> msg => panic!(),
+///     recv(r2) -> msg => panic!(),
+///     default(Duration::from_millis(100)) => println!("timed out"),
+/// }
+/// # }
+/// ```
+///
+/// Optionally add a receive operation to `select!` using [`never`]:
+///
+/// ```
+/// # #[macro_use]
+/// # extern crate crossbeam_channel;
+/// # fn main() {
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_channel::{never, unbounded};
+///
+/// let (s1, r1) = unbounded();
+/// let (s2, r2) = unbounded();
+///
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_secs(1));
+///     s1.send(10).unwrap();
+/// });
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_millis(500));
+///     s2.send(20).unwrap();
+/// });
+///
+/// // This receiver can be a `Some` or a `None`.
+/// let r2 = Some(&r2);
+///
+/// // None of the two operations will become ready within 100 milliseconds.
+/// select! {
+///     recv(r1) -> msg => panic!(),
+///     recv(r2.unwrap_or(&never())) -> msg => assert_eq!(msg, Ok(20)),
+/// }
+/// # }
+/// ```
+///
+/// To optionally add a timeout to `select!`, see the [example] for [`never`].
+///
+/// [`never`]: fn.never.html
+/// [example]: fn.never.html#examples
+#[macro_export(local_inner_macros)]
+macro_rules! select {
+    ($($tokens:tt)*) => {
+        crossbeam_channel_internal!(
+            $($tokens)*
+        )
+    };
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/select.rs cargo-0.33.0/vendor/crossbeam-channel/src/select.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/select.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/select.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1078 @@
+//! Interface to the select mechanism.
+
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem;
+use std::time::{Duration, Instant};
+
+use crossbeam_utils::Backoff;
+use smallvec::SmallVec;
+
+use channel::{self, Receiver, Sender};
+use context::Context;
+use err::{ReadyTimeoutError, TryReadyError};
+use err::{RecvError, SendError};
+use err::{SelectTimeoutError, TrySelectError};
+use flavors;
+use utils;
+
+/// Temporary data that gets initialized during select or a blocking operation, and is consumed by
+/// `read` or `write`.
+///
+/// Each field contains data associated with a specific channel flavor.
+#[derive(Default)]
+pub struct Token {
+    pub after: flavors::after::AfterToken,
+    pub array: flavors::array::ArrayToken,
+    pub list: flavors::list::ListToken,
+    pub never: flavors::never::NeverToken,
+    pub tick: flavors::tick::TickToken,
+    pub zero: flavors::zero::ZeroToken,
+}
+
+/// Identifier associated with an operation by a specific thread on a specific channel.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Operation(usize);
+
+impl Operation {
+    /// Creates an operation identifier from a mutable reference.
+    ///
+    /// This function essentially just turns the address of the reference into a number. The
+    /// reference should point to a variable that is specific to the thread and the operation,
+    /// and is alive for the entire duration of select or blocking operation.
+    #[inline]
+    pub fn hook<T>(r: &mut T) -> Operation {
+        let val = r as *mut T as usize;
+        // Make sure that the pointer address doesn't equal the numerical representation of
+        // `Selected::{Waiting, Aborted, Disconnected}`.
+        assert!(val > 2);
+        Operation(val)
+    }
+}
+
+/// Current state of a select or a blocking operation.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Selected {
+    /// Still waiting for an operation.
+    Waiting,
+
+    /// The attempt to block the current thread has been aborted.
+    Aborted,
+
+    /// An operation became ready because a channel is disconnected.
+    Disconnected,
+
+    /// An operation became ready because a message can be sent or received.
+    Operation(Operation),
+}
+
+impl From<usize> for Selected {
+    #[inline]
+    fn from(val: usize) -> Selected {
+        match val {
+            0 => Selected::Waiting,
+            1 => Selected::Aborted,
+            2 => Selected::Disconnected,
+            oper => Selected::Operation(Operation(oper)),
+        }
+    }
+}
+
+impl Into<usize> for Selected {
+    #[inline]
+    fn into(self) -> usize {
+        match self {
+            Selected::Waiting => 0,
+            Selected::Aborted => 1,
+            Selected::Disconnected => 2,
+            Selected::Operation(Operation(val)) => val,
+        }
+    }
+}
+
+/// A receiver or a sender that can participate in select.
+///
+/// This is a handle that assists select in executing an operation, registration, deciding on the
+/// appropriate deadline for blocking, etc.
+pub trait SelectHandle {
+    /// Attempts to select an operation and returns `true` on success.
+    fn try_select(&self, token: &mut Token) -> bool;
+
+    /// Returns a deadline for an operation, if there is one.
+    fn deadline(&self) -> Option<Instant>;
+
+    /// Registers an operation for execution and returns `true` if it is now ready.
+    fn register(&self, oper: Operation, cx: &Context) -> bool;
+
+    /// Unregisters an operation for execution.
+    fn unregister(&self, oper: Operation);
+
+    /// Attempts to select an operation the thread got woken up for and returns `true` on success.
+    fn accept(&self, token: &mut Token, cx: &Context) -> bool;
+
+    /// Returns `true` if an operation can be executed without blocking.
+    fn is_ready(&self) -> bool;
+
+    /// Registers an operation for readiness notification and returns `true` if it is now ready.
+    fn watch(&self, oper: Operation, cx: &Context) -> bool;
+
+    /// Unregisters an operation for readiness notification.
+    fn unwatch(&self, oper: Operation);
+}
+
+impl<'a, T: SelectHandle> SelectHandle for &'a T {
+    fn try_select(&self, token: &mut Token) -> bool {
+        (**self).try_select(token)
+    }
+
+    fn deadline(&self) -> Option<Instant> {
+        (**self).deadline()
+    }
+
+    fn register(&self, oper: Operation, cx: &Context) -> bool {
+        (**self).register(oper, cx)
+    }
+
+    fn unregister(&self, oper: Operation) {
+        (**self).unregister(oper);
+    }
+
+    fn accept(&self, token: &mut Token, cx: &Context) -> bool {
+        (**self).accept(token, cx)
+    }
+
+    fn is_ready(&self) -> bool {
+        (**self).is_ready()
+    }
+
+    fn watch(&self, oper: Operation, cx: &Context) -> bool {
+        (**self).watch(oper, cx)
+    }
+
+    fn unwatch(&self, oper: Operation) {
+        (**self).unwatch(oper)
+    }
+}
+
+/// Determines when a select operation should time out.
+#[derive(Clone, Copy, Eq, PartialEq)]
+enum Timeout {
+    /// No blocking.
+    Now,
+
+    /// Block forever.
+    Never,
+
+    /// Time out after the time instant.
+    At(Instant),
+}
+
+/// Runs until one of the operations is selected, potentially blocking the current thread.
+///
+/// Successful receive operations will have to be followed up by `channel::read()` and successful
+/// send operations by `channel::write()`.
+fn run_select(
+    handles: &mut [(&SelectHandle, usize, *const u8)],
+    timeout: Timeout,
+) -> Option<(Token, usize, *const u8)> {
+    if handles.is_empty() {
+        // Wait until the timeout and return.
+        match timeout {
+            Timeout::Now => return None,
+            Timeout::Never => {
+                utils::sleep_until(None);
+                unreachable!();
+            }
+            Timeout::At(when) => {
+                utils::sleep_until(Some(when));
+                return None;
+            }
+        }
+    }
+
+    // Shuffle the operations for fairness.
+    utils::shuffle(handles);
+
+    // Create a token, which serves as a temporary variable that gets initialized in this function
+    // and is later used by a call to `channel::read()` or `channel::write()` that completes the
+    // selected operation.
+    let mut token = Token::default();
+
+    // Try selecting one of the operations without blocking.
+    for &(handle, i, ptr) in handles.iter() {
+        if handle.try_select(&mut token) {
+            return Some((token, i, ptr));
+        }
+    }
+
+    loop {
+        // Prepare for blocking.
+        let res = Context::with(|cx| {
+            let mut sel = Selected::Waiting;
+            let mut registered_count = 0;
+            let mut index_ready = None;
+
+            if let Timeout::Now = timeout {
+                cx.try_select(Selected::Aborted).unwrap();
+            }
+
+            // Register all operations.
+            for (handle, i, _) in handles.iter_mut() {
+                registered_count += 1;
+
+                // If registration returns `false`, that means the operation has just become ready.
+                if handle.register(Operation::hook::<&SelectHandle>(handle), cx) {
+                    // Try aborting select.
+                    sel = match cx.try_select(Selected::Aborted) {
+                        Ok(()) => {
+                            index_ready = Some(*i);
+                            Selected::Aborted
+                        }
+                        Err(s) => s,
+                    };
+                    break;
+                }
+
+                // If another thread has already selected one of the operations, stop registration.
+                sel = cx.selected();
+                if sel != Selected::Waiting {
+                    break;
+                }
+            }
+
+            if sel == Selected::Waiting {
+                // Check with each operation for how long we're allowed to block, and compute the
+                // earliest deadline.
+                let mut deadline: Option<Instant> = match timeout {
+                    Timeout::Now => return None,
+                    Timeout::Never => None,
+                    Timeout::At(when) => Some(when),
+                };
+                for &(handle, _, _) in handles.iter() {
+                    if let Some(x) = handle.deadline() {
+                        deadline = deadline.map(|y| x.min(y)).or(Some(x));
+                    }
+                }
+
+                // Block the current thread.
+                sel = cx.wait_until(deadline);
+            }
+
+            // Unregister all registered operations.
+            for (handle, _, _) in handles.iter_mut().take(registered_count) {
+                handle.unregister(Operation::hook::<&SelectHandle>(handle));
+            }
+
+            match sel {
+                Selected::Waiting => unreachable!(),
+                Selected::Aborted => {
+                    // If an operation became ready during registration, try selecting it.
+                    if let Some(index_ready) = index_ready {
+                        for &(handle, i, ptr) in handles.iter() {
+                            if i == index_ready && handle.try_select(&mut token) {
+                                return Some((i, ptr));
+                            }
+                        }
+                    }
+                }
+                Selected::Disconnected => {}
+                Selected::Operation(_) => {
+                    // Find the selected operation.
+                    for (handle, i, ptr) in handles.iter_mut() {
+                        // Is this the selected operation?
+                        if sel == Selected::Operation(Operation::hook::<&SelectHandle>(handle)) {
+                            // Try selecting this operation.
+                            if handle.accept(&mut token, cx) {
+                                return Some((*i, *ptr));
+                            }
+                        }
+                    }
+                }
+            }
+
+            None
+        });
+
+        // Return if an operation was selected.
+        if let Some((i, ptr)) = res {
+            return Some((token, i, ptr));
+        }
+
+        // Try selecting one of the operations without blocking.
+        for &(handle, i, ptr) in handles.iter() {
+            if handle.try_select(&mut token) {
+                return Some((token, i, ptr));
+            }
+        }
+
+        match timeout {
+            Timeout::Now => return None,
+            Timeout::Never => {}
+            Timeout::At(when) => {
+                if Instant::now() >= when {
+                    return None;
+                }
+            }
+        }
+    }
+}
+
+/// Runs until one of the operations becomes ready, potentially blocking the current thread.
+fn run_ready(
+    handles: &mut [(&SelectHandle, usize, *const u8)],
+    timeout: Timeout,
+) -> Option<usize> {
+    if handles.is_empty() {
+        // Wait until the timeout and return.
+        match timeout {
+            Timeout::Now => return None,
+            Timeout::Never => {
+                utils::sleep_until(None);
+                unreachable!();
+            }
+            Timeout::At(when) => {
+                utils::sleep_until(Some(when));
+                return None;
+            }
+        }
+    }
+
+    // Shuffle the operations for fairness.
+    utils::shuffle(handles);
+
+    loop {
+        let backoff = Backoff::new();
+        loop {
+            // Check operations for readiness.
+            for &(handle, i, _) in handles.iter() {
+                if handle.is_ready() {
+                    return Some(i);
+                }
+            }
+
+            if backoff.is_completed() {
+                break;
+            } else {
+                backoff.snooze();
+            }
+        }
+
+        // Check for timeout.
+        match timeout {
+            Timeout::Now => return None,
+            Timeout::Never => {}
+            Timeout::At(when) => {
+                if Instant::now() >= when {
+                    return None;
+                }
+            }
+        }
+
+        // Prepare for blocking.
+        let res = Context::with(|cx| {
+            let mut sel = Selected::Waiting;
+            let mut registered_count = 0;
+
+            // Begin watching all operations.
+            for (handle, _, _) in handles.iter_mut() {
+                registered_count += 1;
+                let oper = Operation::hook::<&SelectHandle>(handle);
+
+                // If registration returns `false`, that means the operation has just become ready.
+                if handle.watch(oper, cx) {
+                    sel = match cx.try_select(Selected::Operation(oper)) {
+                        Ok(()) => Selected::Operation(oper),
+                        Err(s) => s,
+                    };
+                    break;
+                }
+
+                // If another thread has already chosen one of the operations, stop registration.
+                sel = cx.selected();
+                if sel != Selected::Waiting {
+                    break;
+                }
+            }
+
+            if sel == Selected::Waiting {
+                // Check with each operation for how long we're allowed to block, and compute the
+                // earliest deadline.
+                let mut deadline: Option<Instant> = match timeout {
+                    Timeout::Now => unreachable!(),
+                    Timeout::Never => None,
+                    Timeout::At(when) => Some(when),
+                };
+                for &(handle, _, _) in handles.iter() {
+                    if let Some(x) = handle.deadline() {
+                        deadline = deadline.map(|y| x.min(y)).or(Some(x));
+                    }
+                }
+
+                // Block the current thread.
+                sel = cx.wait_until(deadline);
+            }
+
+            // Unwatch all operations.
+            for (handle, _, _) in handles.iter_mut().take(registered_count) {
+                handle.unwatch(Operation::hook::<&SelectHandle>(handle));
+            }
+
+            match sel {
+                Selected::Waiting => unreachable!(),
+                Selected::Aborted => {}
+                Selected::Disconnected => {}
+                Selected::Operation(_) => {
+                    for (handle, i, _) in handles.iter_mut() {
+                        let oper = Operation::hook::<&SelectHandle>(handle);
+                        if sel == Selected::Operation(oper) {
+                            return Some(*i);
+                        }
+                    }
+                }
+            }
+
+            None
+        });
+
+        // Return if an operation became ready.
+        if res.is_some() {
+            return res;
+        }
+    }
+}
+
+/// Selects from a set of channel operations.
+///
+/// `Select` allows you to define a set of channel operations, wait until any one of them becomes
+/// ready, and finally execute it. If multiple operations are ready at the same time, a random one
+/// among them is selected.
+///
+/// An operation is considered to be ready if it doesn't have to block. Note that it is ready even
+/// when it will simply return an error because the channel is disconnected.
+///
+/// The [`select!`] macro is a convenience wrapper around `Select`. However, it cannot select over a
+/// dynamically created list of channel operations.
+///
+/// Once a list of operations has been built with `Select`, there are two different ways of
+/// proceeding:
+///
+/// * Select an operation with [`try_select`], [`select`], or [`select_timeout`]. If successful,
+///   the returned selected operation has already begun and **must** be completed. If we don't
+///   complete it, a panic will occur.
+///
+/// * Wait for an operation to become ready with [`try_ready`], [`ready`], or [`ready_timeout`]. If
+///   successful, we may attempt to execute the operation, but are not obliged to. In fact, it's
+///   possible for another thread to make the operation not ready just before we try executing it,
+///   so it's wise to use a retry loop. However, note that these methods might return with success
+///   spuriously, so it's a good idea to always double check if the operation is really ready.
+///
+/// # Examples
+///
+/// Use [`select`] to receive a message from a list of receivers:
+///
+/// ```
+/// use crossbeam_channel::{Receiver, RecvError, Select};
+///
+/// fn recv_multiple<T>(rs: &[Receiver<T>]) -> Result<T, RecvError> {
+///     // Build a list of operations.
+///     let mut sel = Select::new();
+///     for r in rs {
+///         sel.recv(r);
+///     }
+///
+///     // Complete the selected operation.
+///     let oper = sel.select();
+///     let index = oper.index();
+///     oper.recv(&rs[index])
+/// }
+/// ```
+///
+/// Use [`ready`] to receive a message from a list of receivers:
+///
+/// ```
+/// use crossbeam_channel::{Receiver, RecvError, Select};
+///
+/// fn recv_multiple<T>(rs: &[Receiver<T>]) -> Result<T, RecvError> {
+///     // Build a list of operations.
+///     let mut sel = Select::new();
+///     for r in rs {
+///         sel.recv(r);
+///     }
+///
+///     loop {
+///         // Wait until a receive operation becomes ready and try executing it.
+///         let index = sel.ready();
+///         let res = rs[index].try_recv();
+///
+///         // If the operation turns out not to be ready, retry.
+///         if let Err(e) = res {
+///             if e.is_empty() {
+///                 continue;
+///             }
+///         }
+///
+///         // Success!
+///         return res.map_err(|_| RecvError);
+///     }
+/// }
+/// ```
+///
+/// [`select!`]: macro.select.html
+/// [`try_select`]: struct.Select.html#method.try_select
+/// [`select`]: struct.Select.html#method.select
+/// [`select_timeout`]: struct.Select.html#method.select_timeout
+/// [`try_ready`]: struct.Select.html#method.try_ready
+/// [`ready`]: struct.Select.html#method.ready
+/// [`ready_timeout`]: struct.Select.html#method.ready_timeout
+pub struct Select<'a> {
+    /// A list of senders and receivers participating in selection.
+    handles: SmallVec<[(&'a SelectHandle, usize, *const u8); 4]>,
+}
+
+unsafe impl<'a> Send for Select<'a> {}
+unsafe impl<'a> Sync for Select<'a> {}
+
+impl<'a> Select<'a> {
+    /// Creates an empty list of channel operations for selection.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::Select;
+    ///
+    /// let mut sel = Select::new();
+    ///
+    /// // The list of operations is empty, which means no operation can be selected.
+    /// assert!(sel.try_select().is_err());
+    /// ```
+    pub fn new() -> Select<'a> {
+        Select {
+            handles: SmallVec::new(),
+        }
+    }
+
+    /// Adds a send operation.
+    ///
+    /// Returns the index of the added operation.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s, r) = unbounded::<i32>();
+    ///
+    /// let mut sel = Select::new();
+    /// let index = sel.send(&s);
+    /// ```
+    pub fn send<T>(&mut self, s: &'a Sender<T>) -> usize {
+        let i = self.handles.len();
+        let ptr = s as *const Sender<_> as *const u8;
+        self.handles.push((s, i, ptr));
+        i
+    }
+
+    /// Adds a receive operation.
+    ///
+    /// Returns the index of the added operation.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s, r) = unbounded::<i32>();
+    ///
+    /// let mut sel = Select::new();
+    /// let index = sel.recv(&r);
+    /// ```
+    pub fn recv<T>(&mut self, r: &'a Receiver<T>) -> usize {
+        let i = self.handles.len();
+        let ptr = r as *const Receiver<_> as *const u8;
+        self.handles.push((r, i, ptr));
+        i
+    }
+
+    /// Attempts to select one of the operations without blocking.
+    ///
+    /// If an operation is ready, it is selected and returned. If multiple operations are ready at
+    /// the same time, a random one among them is selected. If none of the operations are ready, an
+    /// error is returned.
+    ///
+    /// An operation is considered to be ready if it doesn't have to block. Note that it is ready
+    /// even when it will simply return an error because the channel is disconnected.
+    ///
+    /// The selected operation must be completed with [`SelectedOperation::send`]
+    /// or [`SelectedOperation::recv`].
+    ///
+    /// [`SelectedOperation::send`]: struct.SelectedOperation.html#method.send
+    /// [`SelectedOperation::recv`]: struct.SelectedOperation.html#method.recv
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded();
+    /// let (s2, r2) = unbounded();
+    ///
+    /// s1.send(10).unwrap();
+    /// s2.send(20).unwrap();
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // Both operations are initially ready, so a random one will be executed.
+    /// let oper = sel.try_select();
+    /// match oper {
+    ///     Err(_) => panic!("both operations should be ready"),
+    ///     Ok(oper) => match oper.index() {
+    ///         i if i == oper1 => assert_eq!(oper.recv(&r1), Ok(10)),
+    ///         i if i == oper2 => assert_eq!(oper.recv(&r2), Ok(20)),
+    ///         _ => unreachable!(),
+    ///     }
+    /// }
+    /// ```
+    pub fn try_select(&mut self) -> Result<SelectedOperation<'a>, TrySelectError> {
+        match run_select(&mut self.handles, Timeout::Now) {
+            None => Err(TrySelectError),
+            Some((token, index, ptr)) => Ok(SelectedOperation {
+                token,
+                index,
+                ptr,
+                _marker: PhantomData,
+            }),
+        }
+    }
+
+    /// Blocks until one of the operations becomes ready and selects it.
+    ///
+    /// Once an operation becomes ready, it is selected and returned. If multiple operations are
+    /// ready at the same time, a random one among them is selected.
+    ///
+    /// An operation is considered to be ready if it doesn't have to block. Note that it is ready
+    /// even when it will simply return an error because the channel is disconnected.
+    ///
+    /// The selected operation must be completed with [`SelectedOperation::send`]
+    /// or [`SelectedOperation::recv`].
+    ///
+    /// [`SelectedOperation::send`]: struct.SelectedOperation.html#method.send
+    /// [`SelectedOperation::recv`]: struct.SelectedOperation.html#method.recv
+    ///
+    /// # Panics
+    ///
+    /// Panics if no operations have been added to `Select`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded();
+    /// let (s2, r2) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s1.send(10).unwrap();
+    /// });
+    /// thread::spawn(move || s2.send(20).unwrap());
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // The second operation will be selected because it becomes ready first.
+    /// let oper = sel.select();
+    /// match oper.index() {
+    ///     i if i == oper1 => assert_eq!(oper.recv(&r1), Ok(10)),
+    ///     i if i == oper2 => assert_eq!(oper.recv(&r2), Ok(20)),
+    ///     _ => unreachable!(),
+    /// }
+    /// ```
+    pub fn select(&mut self) -> SelectedOperation<'a> {
+        if self.handles.is_empty() {
+            panic!("no operations have been added to `Select`");
+        }
+
+        let (token, index, ptr) = run_select(&mut self.handles, Timeout::Never).unwrap();
+        SelectedOperation {
+            token,
+            index,
+            ptr,
+            _marker: PhantomData,
+        }
+    }
+
+    /// Blocks for a limited time until one of the operations becomes ready and selects it.
+    ///
+    /// If an operation becomes ready, it is selected and returned. If multiple operations are
+    /// ready at the same time, a random one among them is selected. If none of the operations
+    /// become ready for the specified duration, an error is returned.
+    ///
+    /// An operation is considered to be ready if it doesn't have to block. Note that it is ready
+    /// even when it will simply return an error because the channel is disconnected.
+    ///
+    /// The selected operation must be completed with [`SelectedOperation::send`]
+    /// or [`SelectedOperation::recv`].
+    ///
+    /// [`SelectedOperation::send`]: struct.SelectedOperation.html#method.send
+    /// [`SelectedOperation::recv`]: struct.SelectedOperation.html#method.recv
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded();
+    /// let (s2, r2) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s1.send(10).unwrap();
+    /// });
+    /// thread::spawn(move || s2.send(20).unwrap());
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // The second operation will be selected because it becomes ready first.
+    /// let oper = sel.select_timeout(Duration::from_millis(500));
+    /// match oper {
+    ///     Err(_) => panic!("should not have timed out"),
+    ///     Ok(oper) => match oper.index() {
+    ///         i if i == oper1 => assert_eq!(oper.recv(&r1), Ok(10)),
+    ///         i if i == oper2 => assert_eq!(oper.recv(&r2), Ok(20)),
+    ///         _ => unreachable!(),
+    ///     }
+    /// }
+    /// ```
+    pub fn select_timeout(
+        &mut self,
+        timeout: Duration,
+    ) -> Result<SelectedOperation<'a>, SelectTimeoutError> {
+        let timeout = Timeout::At(Instant::now() + timeout);
+
+        match run_select(&mut self.handles, timeout) {
+            None => Err(SelectTimeoutError),
+            Some((token, index, ptr)) => Ok(SelectedOperation {
+                token,
+                index,
+                ptr,
+                _marker: PhantomData,
+            }),
+        }
+    }
+
+    /// Attempts to find a ready operation without blocking.
+    ///
+    /// If an operation is ready, its index is returned. If multiple operations are ready at the
+    /// same time, a random one among them is chosen. If none of the operations are ready, an error
+    /// is returned.
+    ///
+    /// An operation is considered to be ready if it doesn't have to block. Note that it is ready
+    /// even when it will simply return an error because the channel is disconnected.
+    ///
+    /// Note that this method might return with success spuriously, so it's a good idea to always
+    /// double check if the operation is really ready.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded();
+    /// let (s2, r2) = unbounded();
+    ///
+    /// s1.send(10).unwrap();
+    /// s2.send(20).unwrap();
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // Both operations are initially ready, so a random one will be chosen.
+    /// match sel.try_ready() {
+    ///     Err(_) => panic!("both operations should be ready"),
+    ///     Ok(i) if i == oper1 => assert_eq!(r1.try_recv(), Ok(10)),
+    ///     Ok(i) if i == oper2 => assert_eq!(r2.try_recv(), Ok(20)),
+    ///     Ok(_) => unreachable!(),
+    /// }
+    /// ```
+    pub fn try_ready(&mut self) -> Result<usize, TryReadyError> {
+        match run_ready(&mut self.handles, Timeout::Now) {
+            None => Err(TryReadyError),
+            Some(index) => Ok(index),
+        }
+    }
+
+    /// Blocks until one of the operations becomes ready.
+    ///
+    /// Once an operation becomes ready, its index is returned. If multiple operations are ready at
+    /// the same time, a random one among them is chosen.
+    ///
+    /// An operation is considered to be ready if it doesn't have to block. Note that it is ready
+    /// even when it will simply return an error because the channel is disconnected.
+    ///
+    /// Note that this method might return with success spuriously, so it's a good idea to always
+    /// double check if the operation is really ready.
+    ///
+    /// # Panics
+    ///
+    /// Panics if no operations have been added to `Select`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded();
+    /// let (s2, r2) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s1.send(10).unwrap();
+    /// });
+    /// thread::spawn(move || s2.send(20).unwrap());
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // The second operation will be selected because it becomes ready first.
+    /// match sel.ready() {
+    ///     i if i == oper1 => assert_eq!(r1.try_recv(), Ok(10)),
+    ///     i if i == oper2 => assert_eq!(r2.try_recv(), Ok(20)),
+    ///     _ => unreachable!(),
+    /// }
+    /// ```
+    pub fn ready(&mut self) -> usize {
+        if self.handles.is_empty() {
+            panic!("no operations have been added to `Select`");
+        }
+
+        run_ready(&mut self.handles, Timeout::Never).unwrap()
+    }
+
+    /// Blocks for a limited time until one of the operations becomes ready.
+    ///
+    /// If an operation becomes ready, its index is returned. If multiple operations are ready at
+    /// the same time, a random one among them is chosen. If none of the operations become ready
+    /// for the specified duration, an error is returned.
+    ///
+    /// An operation is considered to be ready if it doesn't have to block. Note that it is ready
+    /// even when it will simply return an error because the channel is disconnected.
+    ///
+    /// Note that this method might return with success spuriously, so it's a good idea to double
+    /// check if the operation is really ready.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded();
+    /// let (s2, r2) = unbounded();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_secs(1));
+    ///     s1.send(10).unwrap();
+    /// });
+    /// thread::spawn(move || s2.send(20).unwrap());
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // The second operation will be selected because it becomes ready first.
+    /// match sel.ready_timeout(Duration::from_millis(500)) {
+    ///     Err(_) => panic!("should not have timed out"),
+    ///     Ok(i) if i == oper1 => assert_eq!(r1.try_recv(), Ok(10)),
+    ///     Ok(i) if i == oper2 => assert_eq!(r2.try_recv(), Ok(20)),
+    ///     Ok(_) => unreachable!(),
+    /// }
+    /// ```
+    pub fn ready_timeout(&mut self, timeout: Duration) -> Result<usize, ReadyTimeoutError> {
+        let timeout = Timeout::At(Instant::now() + timeout);
+
+        match run_ready(&mut self.handles, timeout) {
+            None => Err(ReadyTimeoutError),
+            Some(index) => Ok(index),
+        }
+    }
+}
+
+impl<'a> Clone for Select<'a> {
+    fn clone(&self) -> Select<'a> {
+        Select {
+            handles: self.handles.clone(),
+        }
+    }
+}
+
+impl<'a> Default for Select<'a> {
+    fn default() -> Select<'a> {
+        Select::new()
+    }
+}
+
+impl<'a> fmt::Debug for Select<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Select { .. }")
+    }
+}
+
+/// A selected operation that needs to be completed.
+///
+/// To complete the operation, call [`send`] or [`recv`].
+///
+/// # Panics
+///
+/// Forgetting to complete the operation is an error and might lead to deadlocks. If a
+/// `SelectedOperation` is dropped without completion, a panic occurs.
+///
+/// [`send`]: struct.SelectedOperation.html#method.send
+/// [`recv`]: struct.SelectedOperation.html#method.recv
+#[must_use]
+pub struct SelectedOperation<'a> {
+    /// Token needed to complete the operation.
+    token: Token,
+
+    /// The index of the selected operation.
+    index: usize,
+
+    /// The address of the selected `Sender` or `Receiver`.
+    ptr: *const u8,
+
+    /// Indicates that `Sender`s and `Receiver`s are borrowed.
+    _marker: PhantomData<&'a ()>,
+}
+
+impl<'a> SelectedOperation<'a> {
+    /// Returns the index of the selected operation.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{bounded, Select};
+    ///
+    /// let (s1, r1) = bounded::<()>(0);
+    /// let (s2, r2) = bounded::<()>(0);
+    /// let (s3, r3) = bounded::<()>(1);
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.send(&s1);
+    /// let oper2 = sel.recv(&r2);
+    /// let oper3 = sel.send(&s3);
+    ///
+    /// // Only the last operation is ready.
+    /// let oper = sel.select();
+    /// assert_eq!(oper.index(), 2);
+    /// assert_eq!(oper.index(), oper3);
+    ///
+    /// // Complete the operation.
+    /// oper.send(&s3, ()).unwrap();
+    /// ```
+    pub fn index(&self) -> usize {
+        self.index
+    }
+
+    /// Completes the send operation.
+    ///
+    /// The passed [`Sender`] reference must be the same one that was used in [`Select::send`]
+    /// when the operation was added.
+    ///
+    /// # Panics
+    ///
+    /// Panics if an incorrect [`Sender`] reference is passed.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{bounded, Select, SendError};
+    ///
+    /// let (s, r) = bounded::<i32>(0);
+    /// drop(r);
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.send(&s);
+    ///
+    /// let oper = sel.select();
+    /// assert_eq!(oper.index(), oper1);
+    /// assert_eq!(oper.send(&s, 10), Err(SendError(10)));
+    /// ```
+    ///
+    /// [`Sender`]: struct.Sender.html
+    /// [`Select::send`]: struct.Select.html#method.send
+    pub fn send<T>(mut self, s: &Sender<T>, msg: T) -> Result<(), SendError<T>> {
+        assert!(
+            s as *const Sender<T> as *const u8 == self.ptr,
+            "passed a sender that wasn't selected",
+        );
+        let res = unsafe { channel::write(s, &mut self.token, msg) };
+        mem::forget(self);
+        res.map_err(SendError)
+    }
+
+    /// Completes the receive operation.
+    ///
+    /// The passed [`Receiver`] reference must be the same one that was used in [`Select::recv`]
+    /// when the operation was added.
+    ///
+    /// # Panics
+    ///
+    /// Panics if an incorrect [`Receiver`] reference is passed.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_channel::{bounded, Select, RecvError};
+    ///
+    /// let (s, r) = bounded::<i32>(0);
+    /// drop(s);
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r);
+    ///
+    /// let oper = sel.select();
+    /// assert_eq!(oper.index(), oper1);
+    /// assert_eq!(oper.recv(&r), Err(RecvError));
+    /// ```
+    ///
+    /// [`Receiver`]: struct.Receiver.html
+    /// [`Select::recv`]: struct.Select.html#method.recv
+    pub fn recv<T>(mut self, r: &Receiver<T>) -> Result<T, RecvError> {
+        assert!(
+            r as *const Receiver<T> as *const u8 == self.ptr,
+            "passed a receiver that wasn't selected",
+        );
+        let res = unsafe { channel::read(r, &mut self.token) };
+        mem::forget(self);
+        res.map_err(|_| RecvError)
+    }
+}
+
+impl<'a> fmt::Debug for SelectedOperation<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("SelectedOperation { .. }")
+    }
+}
+
+impl<'a> Drop for SelectedOperation<'a> {
+    fn drop(&mut self) {
+        panic!("dropped `SelectedOperation` without completing the operation");
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/utils.rs cargo-0.33.0/vendor/crossbeam-channel/src/utils.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/utils.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/utils.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,118 @@
+//! Miscellaneous utilities.
+
+use std::cell::{Cell, UnsafeCell};
+use std::num::Wrapping;
+use std::ops::{Deref, DerefMut};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::thread;
+use std::time::{Duration, Instant};
+
+use crossbeam_utils::Backoff;
+
+/// Randomly shuffles a slice.
+pub fn shuffle<T>(v: &mut [T]) {
+    let len = v.len();
+    if len <= 1 {
+        return;
+    }
+
+    thread_local! {
+        static RNG: Cell<Wrapping<u32>> = Cell::new(Wrapping(1406868647));
+    }
+
+    let _ = RNG.try_with(|rng| {
+        for i in 1..len {
+            // This is the 32-bit variant of Xorshift.
+            //
+            // Source: https://en.wikipedia.org/wiki/Xorshift
+            let mut x = rng.get();
+            x ^= x << 13;
+            x ^= x >> 17;
+            x ^= x << 5;
+            rng.set(x);
+
+            let x = x.0;
+            let n = i + 1;
+
+            // This is a fast alternative to `let j = x % n`.
+            //
+            // Author: Daniel Lemire
+            // Source: https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/
+            let j = ((x as u64).wrapping_mul(n as u64) >> 32) as u32 as usize;
+
+            v.swap(i, j);
+        }
+    });
+}
+
+/// Sleeps until the deadline, or forever if the deadline isn't specified.
+pub fn sleep_until(deadline: Option<Instant>) {
+    loop {
+        match deadline {
+            None => thread::sleep(Duration::from_secs(1000)),
+            Some(d) => {
+                let now = Instant::now();
+                if now >= d {
+                    break;
+                }
+                thread::sleep(d - now);
+            }
+        }
+    }
+}
+
+/// A simple spinlock-based mutex.
+pub struct Mutex<T> {
+    flag: AtomicBool,
+    value: UnsafeCell<T>,
+}
+
+impl<T> Mutex<T> {
+    /// Returns a new mutex initialized with `value`.
+    pub fn new(value: T) -> Mutex<T> {
+        Mutex {
+            flag: AtomicBool::new(false),
+            value: UnsafeCell::new(value),
+        }
+    }
+
+    /// Locks the mutex.
+    pub fn lock(&self) -> MutexGuard<'_, T> {
+        let backoff = Backoff::new();
+        while self.flag.swap(true, Ordering::Acquire) {
+            backoff.snooze();
+        }
+        MutexGuard {
+            parent: self,
+        }
+    }
+}
+
+/// A guard holding a mutex locked.
+pub struct MutexGuard<'a, T: 'a> {
+    parent: &'a Mutex<T>,
+}
+
+impl<'a, T> Drop for MutexGuard<'a, T> {
+    fn drop(&mut self) {
+        self.parent.flag.store(false, Ordering::Release);
+    }
+}
+
+impl<'a, T> Deref for MutexGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe {
+            &*self.parent.value.get()
+        }
+    }
+}
+
+impl<'a, T> DerefMut for MutexGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe {
+            &mut *self.parent.value.get()
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/src/waker.rs cargo-0.33.0/vendor/crossbeam-channel/src/waker.rs
--- cargo-0.32.0/vendor/crossbeam-channel/src/waker.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/src/waker.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,285 @@
+//! Waking mechanism for threads blocked on channel operations.
+
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::thread::{self, ThreadId};
+
+use context::Context;
+use select::{Operation, Selected};
+use utils::Mutex;
+
+/// Represents a thread blocked on a specific channel operation.
+pub struct Entry {
+    /// The operation.
+    pub oper: Operation,
+
+    /// Optional packet.
+    pub packet: usize,
+
+    /// Context associated with the thread owning this operation.
+    pub cx: Context,
+}
+
+/// A queue of threads blocked on channel operations.
+///
+/// This data structure is used by threads to register blocking operations and get woken up once
+/// an operation becomes ready.
+pub struct Waker {
+    /// A list of select operations.
+    selectors: Vec<Entry>,
+
+    /// A list of operations waiting to be ready.
+    observers: Vec<Entry>,
+}
+
+impl Waker {
+    /// Creates a new `Waker`.
+    #[inline]
+    pub fn new() -> Self {
+        Waker {
+            selectors: Vec::new(),
+            observers: Vec::new(),
+        }
+    }
+
+    /// Registers a select operation.
+    #[inline]
+    pub fn register(&mut self, oper: Operation, cx: &Context) {
+        self.register_with_packet(oper, 0, cx);
+    }
+
+    /// Registers a select operation and a packet.
+    #[inline]
+    pub fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
+        self.selectors.push(Entry {
+            oper,
+            packet,
+            cx: cx.clone(),
+        });
+    }
+
+    /// Unregisters a select operation.
+    #[inline]
+    pub fn unregister(&mut self, oper: Operation) -> Option<Entry> {
+        if let Some((i, _)) = self
+            .selectors
+            .iter()
+            .enumerate()
+            .find(|&(_, entry)| entry.oper == oper)
+        {
+            let entry = self.selectors.remove(i);
+            Some(entry)
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to find another thread's entry, select the operation, and wake it up.
+    #[inline]
+    pub fn try_select(&mut self) -> Option<Entry> {
+        let mut entry = None;
+
+        if !self.selectors.is_empty() {
+            let thread_id = current_thread_id();
+
+            for i in 0..self.selectors.len() {
+                // Does the entry belong to a different thread?
+                if self.selectors[i].cx.thread_id() != thread_id {
+                    // Try selecting this operation.
+                    let sel = Selected::Operation(self.selectors[i].oper);
+                    let res = self.selectors[i].cx.try_select(sel);
+
+                    if res.is_ok() {
+                        // Provide the packet.
+                        self.selectors[i].cx.store_packet(self.selectors[i].packet);
+                        // Wake the thread up.
+                        self.selectors[i].cx.unpark();
+
+                        // Remove the entry from the queue to keep it clean and improve
+                        // performance.
+                        entry = Some(self.selectors.remove(i));
+                        break;
+                    }
+                }
+            }
+        }
+
+        entry
+    }
+
+    /// Returns `true` if there is an entry which can be selected by the current thread.
+    #[inline]
+    pub fn can_select(&self) -> bool {
+        if self.selectors.is_empty() {
+            false
+        } else {
+            let thread_id = current_thread_id();
+
+            self.selectors.iter().any(|entry| {
+                entry.cx.thread_id() != thread_id && entry.cx.selected() == Selected::Waiting
+            })
+        }
+    }
+
+    /// Registers an operation waiting to be ready.
+    #[inline]
+    pub fn watch(&mut self, oper: Operation, cx: &Context) {
+        self.observers.push(Entry {
+            oper,
+            packet: 0,
+            cx: cx.clone(),
+        });
+    }
+
+    /// Unregisters an operation waiting to be ready.
+    #[inline]
+    pub fn unwatch(&mut self, oper: Operation) {
+        self.observers.retain(|e| e.oper != oper);
+    }
+
+    /// Notifies all operations waiting to be ready.
+    #[inline]
+    pub fn notify(&mut self) {
+        for entry in self.observers.drain(..) {
+            if entry.cx.try_select(Selected::Operation(entry.oper)).is_ok() {
+                entry.cx.unpark();
+            }
+        }
+    }
+
+    /// Notifies all registered operations that the channel is disconnected.
+    #[inline]
+    pub fn disconnect(&mut self) {
+        for entry in self.selectors.iter() {
+            if entry.cx.try_select(Selected::Disconnected).is_ok() {
+                // Wake the thread up.
+                //
+                // Here we don't remove the entry from the queue. Registered threads must
+                // unregister from the waker by themselves. They might also want to recover the
+                // packet value and destroy it, if necessary.
+                entry.cx.unpark();
+            }
+        }
+
+        self.notify();
+    }
+}
+
+impl Drop for Waker {
+    #[inline]
+    fn drop(&mut self) {
+        debug_assert_eq!(self.selectors.len(), 0);
+        debug_assert_eq!(self.observers.len(), 0);
+    }
+}
+
+/// A waker that can be shared among threads without locking.
+///
+/// This is a simple wrapper around `Waker` that internally uses a mutex for synchronization.
+pub struct SyncWaker {
+    /// The inner `Waker`.
+    inner: Mutex<Waker>,
+
+    /// `true` if the waker is empty.
+    is_empty: AtomicBool,
+}
+
+impl SyncWaker {
+    /// Creates a new `SyncWaker`.
+    #[inline]
+    pub fn new() -> Self {
+        SyncWaker {
+            inner: Mutex::new(Waker::new()),
+            is_empty: AtomicBool::new(false),
+        }
+    }
+
+    /// Registers the current thread with an operation.
+    #[inline]
+    pub fn register(&self, oper: Operation, cx: &Context) {
+        let mut inner = self.inner.lock();
+        inner.register(oper, cx);
+        self.is_empty.store(
+            inner.selectors.is_empty() && inner.observers.is_empty(),
+            Ordering::SeqCst,
+        );
+    }
+
+    /// Unregisters an operation previously registered by the current thread.
+    #[inline]
+    pub fn unregister(&self, oper: Operation) -> Option<Entry> {
+        let mut inner = self.inner.lock();
+        let entry = inner.unregister(oper);
+        self.is_empty.store(
+            inner.selectors.is_empty() && inner.observers.is_empty(),
+            Ordering::SeqCst,
+        );
+        entry
+    }
+
+    /// Attempts to find one thread (not the current one), select its operation, and wake it up.
+    #[inline]
+    pub fn notify(&self) {
+        if !self.is_empty.load(Ordering::SeqCst) {
+            let mut inner = self.inner.lock();
+            inner.try_select();
+            inner.notify();
+            self.is_empty.store(
+                inner.selectors.is_empty() && inner.observers.is_empty(),
+                Ordering::SeqCst,
+            );
+        }
+    }
+
+    /// Registers an operation waiting to be ready.
+    #[inline]
+    pub fn watch(&self, oper: Operation, cx: &Context) {
+        let mut inner = self.inner.lock();
+        inner.watch(oper, cx);
+        self.is_empty.store(
+            inner.selectors.is_empty() && inner.observers.is_empty(),
+            Ordering::SeqCst,
+        );
+    }
+
+    /// Unregisters an operation waiting to be ready.
+    #[inline]
+    pub fn unwatch(&self, oper: Operation) {
+        let mut inner = self.inner.lock();
+        inner.unwatch(oper);
+        self.is_empty.store(
+            inner.selectors.is_empty() && inner.observers.is_empty(),
+            Ordering::SeqCst,
+        );
+    }
+
+    /// Notifies all threads that the channel is disconnected.
+    #[inline]
+    pub fn disconnect(&self) {
+        let mut inner = self.inner.lock();
+        inner.disconnect();
+        self.is_empty.store(
+            inner.selectors.is_empty() && inner.observers.is_empty(),
+            Ordering::SeqCst,
+        );
+    }
+}
+
+impl Drop for SyncWaker {
+    #[inline]
+    fn drop(&mut self) {
+        debug_assert_eq!(self.is_empty.load(Ordering::SeqCst), true);
+    }
+}
+
+/// Returns the id of the current thread.
+#[inline]
+fn current_thread_id() -> ThreadId {
+    thread_local! {
+        /// Cached thread-local id.
+        static THREAD_ID: ThreadId = thread::current().id();
+    }
+
+    THREAD_ID
+        .try_with(|id| *id)
+        .unwrap_or_else(|_| thread::current().id())
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/after.rs cargo-0.33.0/vendor/crossbeam-channel/tests/after.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/after.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/after.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,299 +1,335 @@
 //! Tests for the after channel flavor.
 
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 extern crate rand;
 
-mod wrappers;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::thread;
+use std::time::{Duration, Instant};
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::sync::atomic::AtomicUsize;
-        use std::sync::atomic::Ordering;
-        use std::thread;
-        use std::time::{Duration, Instant};
+use crossbeam_channel::{after, Select, TryRecvError};
+use crossbeam_utils::thread::scope;
 
-        use $channel as channel;
-        use crossbeam;
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
 
-        fn ms(ms: u64) -> Duration {
-            Duration::from_millis(ms)
-        }
+#[test]
+fn fire() {
+    let start = Instant::now();
+    let r = after(ms(50));
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+    thread::sleep(ms(100));
+
+    let fired = r.try_recv().unwrap();
+    assert!(start < fired);
+    assert!(fired - start >= ms(50));
+
+    let now = Instant::now();
+    assert!(fired < now);
+    assert!(now - fired >= ms(50));
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+
+    select! {
+        recv(r) -> _ => panic!(),
+        default => {}
+    }
+
+    select! {
+        recv(r) -> _ => panic!(),
+        recv(after(ms(200))) -> _ => {}
+    }
+}
 
-        #[test]
-        fn fire() {
-            let start = Instant::now();
-            let r = channel::after(ms(50));
-
-            assert_eq!(r.try_recv(), None);
-            thread::sleep(ms(100));
-
-            let fired = r.try_recv().unwrap();
-            assert!(start < fired);
-            assert!(fired - start >= ms(50));
-
-            let now = Instant::now();
-            assert!(fired < now);
-            assert!(now - fired >= ms(50));
+#[test]
+fn capacity() {
+    const COUNT: usize = 10;
+
+    for i in 0..COUNT {
+        let r = after(ms(i as u64));
+        assert_eq!(r.capacity(), Some(1));
+    }
+}
 
-            assert_eq!(r.try_recv(), None);
+#[test]
+fn len_empty_full() {
+    let r = after(ms(50));
 
-            select! {
-                recv(r) => panic!(),
-                default => {}
-            }
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
 
-            select! {
-                recv(r) => panic!(),
-                recv(channel::after(ms(200))) => {}
-            }
-        }
+    thread::sleep(ms(100));
 
-        #[test]
-        fn capacity() {
-            const COUNT: usize = 10;
-
-            for i in 0..COUNT {
-                let r = channel::after(ms(i as u64));
-                assert_eq!(r.capacity(), Some(1));
-            }
-        }
+    assert_eq!(r.len(), 1);
+    assert_eq!(r.is_empty(), false);
+    assert_eq!(r.is_full(), true);
 
-        #[test]
-        fn len_empty_full() {
-            let r = channel::after(ms(50));
+    r.try_recv().unwrap();
 
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
+}
 
-            thread::sleep(ms(100));
+#[test]
+fn try_recv() {
+    let r = after(ms(200));
+    assert!(r.try_recv().is_err());
+
+    thread::sleep(ms(100));
+    assert!(r.try_recv().is_err());
+
+    thread::sleep(ms(200));
+    assert!(r.try_recv().is_ok());
+    assert!(r.try_recv().is_err());
 
-            assert_eq!(r.len(), 1);
-            assert_eq!(r.is_empty(), false);
-            assert_eq!(r.is_full(), true);
+    thread::sleep(ms(200));
+    assert!(r.try_recv().is_err());
+}
 
-            r.try_recv().unwrap();
+#[test]
+fn recv() {
+    let start = Instant::now();
+    let r = after(ms(50));
+
+    let fired = r.recv().unwrap();
+    assert!(start < fired);
+    assert!(fired - start >= ms(50));
+
+    let now = Instant::now();
+    assert!(fired < now);
+    assert!(now - fired < fired - start);
 
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
-        }
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
 
-        #[test]
-        fn recv() {
-            let start = Instant::now();
-            let r = channel::after(ms(50));
-
-            let fired = r.recv().unwrap();
-            assert!(start < fired);
-            assert!(fired - start >= ms(50));
-
-            let now = Instant::now();
-            assert!(fired < now);
-            assert!(now - fired < fired - start);
+#[test]
+fn recv_timeout() {
+    let start = Instant::now();
+    let r = after(ms(200));
+
+    assert!(r.recv_timeout(ms(100)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(100));
+    assert!(now - start <= ms(150));
+
+    let fired = r.recv_timeout(ms(200)).unwrap();
+    assert!(fired - start >= ms(200));
+    assert!(fired - start <= ms(250));
+
+    assert!(r.recv_timeout(ms(200)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(400));
+    assert!(now - start <= ms(450));
 
-            assert_eq!(r.try_recv(), None);
-        }
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
 
-        #[test]
-        fn recv_two() {
-            let r1 = channel::after(ms(50));
-            let r2 = channel::after(ms(50));
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    select! {
-                        recv(r1) => {}
-                        recv(r2) => {}
-                    }
-                });
-                scope.spawn(|| {
-                    select! {
-                        recv(r1) => {}
-                        recv(r2) => {}
-                    }
-                });
-            });
-        }
+#[test]
+fn recv_two() {
+    let r1 = after(ms(50));
+    let r2 = after(ms(50));
 
-        #[test]
-        fn recv_race() {
+    scope(|scope| {
+        scope.spawn(|_| {
             select! {
-                recv(channel::after(ms(50))) => {}
-                recv(channel::after(ms(100))) => panic!(),
+                recv(r1) -> _ => {}
+                recv(r2) -> _ => {}
             }
-
+        });
+        scope.spawn(|_| {
             select! {
-                recv(channel::after(ms(100))) => panic!(),
-                recv(channel::after(ms(50))) => {}
+                recv(r1) -> _ => {}
+                recv(r2) -> _ => {}
             }
-        }
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn stress_default() {
-            const COUNT: usize = 10;
-
-            for _ in 0..COUNT {
-                select! {
-                    recv(channel::after(ms(0))) => {}
-                    default => panic!(),
-                }
-            }
+#[test]
+fn recv_race() {
+    select! {
+        recv(after(ms(50))) -> _ => {}
+        recv(after(ms(100))) -> _ => panic!(),
+    }
+
+    select! {
+        recv(after(ms(100))) -> _ => panic!(),
+        recv(after(ms(50))) -> _ => {}
+    }
+}
 
-            for _ in 0..COUNT {
-                select! {
-                    recv(channel::after(ms(100))) => panic!(),
-                    default => {}
-                }
-            }
+#[test]
+fn stress_default() {
+    const COUNT: usize = 10;
+
+    for _ in 0..COUNT {
+        select! {
+            recv(after(ms(0))) -> _ => {}
+            default => panic!(),
+        }
+    }
+
+    for _ in 0..COUNT {
+        select! {
+            recv(after(ms(100))) -> _ => panic!(),
+            default => {}
         }
+    }
+}
 
-        #[test]
-        fn select_shared() {
-            const THREADS: usize = 4;
-            const COUNT: usize = 1000;
-            const TIMEOUT_MS: u64 = 100;
-
-            let v = (0..COUNT).map(|i| channel::after(ms(i as u64 / TIMEOUT_MS / 2)))
-                .collect::<Vec<_>>();
-            let hits = AtomicUsize::new(0);
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        let v: Vec<&_> = v.iter().collect();
-
-                        loop {
-                            select! {
-                                recv(v.iter().map(|r| &r.0)) => {
-                                    hits.fetch_add(1, Ordering::SeqCst);
-                                }
-                                recv(channel::after(ms(TIMEOUT_MS))) => break
-                            }
+#[test]
+fn select() {
+    const THREADS: usize = 4;
+    const COUNT: usize = 1000;
+    const TIMEOUT_MS: u64 = 100;
+
+    let v = (0..COUNT)
+        .map(|i| after(ms(i as u64 / TIMEOUT_MS / 2)))
+        .collect::<Vec<_>>();
+    let hits = AtomicUsize::new(0);
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                let v: Vec<&_> = v.iter().collect();
+
+                loop {
+                    let timeout = after(ms(TIMEOUT_MS));
+                    let mut sel = Select::new();
+                    for r in &v {
+                        sel.recv(r);
+                    }
+                    let oper_timeout = sel.recv(&timeout);
+
+                    let oper = sel.select();
+                    match oper.index() {
+                        i if i == oper_timeout => {
+                            oper.recv(&timeout).unwrap();
+                            break;
                         }
-                    });
+                        i => {
+                            oper.recv(&v[i]).unwrap();
+                            hits.fetch_add(1, Ordering::SeqCst);
+                        }
+                    }
                 }
             });
-
-            assert_eq!(hits.load(Ordering::SeqCst), COUNT);
         }
+    }).unwrap();
+
+    assert_eq!(hits.load(Ordering::SeqCst), COUNT);
+}
+
+#[test]
+fn ready() {
+    const THREADS: usize = 4;
+    const COUNT: usize = 1000;
+    const TIMEOUT_MS: u64 = 100;
+
+    let v = (0..COUNT)
+        .map(|i| after(ms(i as u64 / TIMEOUT_MS / 2)))
+        .collect::<Vec<_>>();
+    let hits = AtomicUsize::new(0);
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                let v: Vec<&_> = v.iter().collect();
+
+                loop {
+                    let timeout = after(ms(TIMEOUT_MS));
+                    let mut sel = Select::new();
+                    for r in &v {
+                        sel.recv(r);
+                    }
+                    let oper_timeout = sel.recv(&timeout);
 
-        #[test]
-        fn select_cloned() {
-            const THREADS: usize = 4;
-            const COUNT: usize = 1000;
-            const TIMEOUT_MS: u64 = 100;
-
-            let v = (0..COUNT).map(|i| channel::after(ms(i as u64 / TIMEOUT_MS / 2)))
-                .collect::<Vec<_>>();
-            let hits = AtomicUsize::new(0);
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        let v = v.iter().map(|r| &r.0).collect::<Vec<_>>();
-
-                        loop {
-                            select! {
-                                recv(v) => {
-                                    hits.fetch_add(1, Ordering::SeqCst);
-                                }
-                                recv(channel::after(ms(TIMEOUT_MS))) => break
-                            }
+                    loop {
+                        let i = sel.ready();
+                        if i == oper_timeout {
+                            timeout.try_recv().unwrap();
+                            return;
+                        } else if v[i].try_recv().is_ok() {
+                            hits.fetch_add(1, Ordering::SeqCst);
+                            break;
                         }
-                    });
+                    }
                 }
             });
-
-            assert_eq!(hits.load(Ordering::SeqCst), COUNT);
         }
+    }).unwrap();
+
+    assert_eq!(hits.load(Ordering::SeqCst), COUNT);
+}
 
-        #[test]
-        fn stress_clone() {
-            const RUNS: usize = 1000;
-            const THREADS: usize = 10;
-            const COUNT: usize = 50;
-
-            for i in 0..RUNS {
-                let r = channel::after(ms(i as u64));
-
-                crossbeam::scope(|scope| {
-                    for _ in 0..THREADS {
-                        scope.spawn(|| {
-                            let r = r.clone();
-                            r.try_recv();
-
-                            for _ in 0..COUNT {
-                                drop(r.clone());
-                                thread::yield_now();
-                            }
-                        });
+#[test]
+fn stress_clone() {
+    const RUNS: usize = 1000;
+    const THREADS: usize = 10;
+    const COUNT: usize = 50;
+
+    for i in 0..RUNS {
+        let r = after(ms(i as u64));
+
+        scope(|scope| {
+            for _ in 0..THREADS {
+                scope.spawn(|_| {
+                    let r = r.clone();
+                    let _ = r.try_recv();
+
+                    for _ in 0..COUNT {
+                        drop(r.clone());
+                        thread::yield_now();
                     }
                 });
             }
-        }
-
-        #[test]
-        fn fairness() {
-            const COUNT: usize = 1000;
-
-            for &dur in &[0, 1] {
-                let mut hits = [0usize; 2];
-
-                for _ in 0..COUNT {
-                    select! {
-                        recv(channel::after(ms(dur))) => hits[0] += 1,
-                        recv(channel::after(ms(dur))) => hits[1] += 1,
-                    }
-                }
+        }).unwrap();
+    }
+}
 
-                assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-            }
-        }
+#[test]
+fn fairness() {
+    const COUNT: usize = 1000;
 
-        #[test]
-        fn fairness_duplicates() {
-            const COUNT: usize = 1000;
-
-            for &dur in &[0, 1] {
-                let mut hits = [0usize; 5];
-
-                for _ in 0..COUNT {
-                    let r = channel::after(ms(dur));
-                    select! {
-                        recv(r) => hits[0] += 1,
-                        recv(r) => hits[1] += 1,
-                        recv(r) => hits[2] += 1,
-                        recv(r) => hits[3] += 1,
-                        recv(r) => hits[4] += 1,
-                    }
-                }
+    for &dur in &[0, 1] {
+        let mut hits = [0usize; 2];
 
-                assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+        for _ in 0..COUNT {
+            select! {
+                recv(after(ms(dur))) -> _ => hits[0] += 1,
+                recv(after(ms(dur))) -> _ => hits[1] += 1,
             }
         }
-    };
-}
 
-mod normal {
-    tests!(wrappers::normal);
+        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    }
 }
 
-mod cloned {
-    tests!(wrappers::cloned);
-}
+#[test]
+fn fairness_duplicates() {
+    const COUNT: usize = 1000;
 
-mod select {
-    tests!(wrappers::select);
-}
+    for &dur in &[0, 1] {
+        let mut hits = [0usize; 5];
 
-mod select_spin {
-    tests!(wrappers::select_spin);
-}
+        for _ in 0..COUNT {
+            let r = after(ms(dur));
+            select! {
+                recv(r) -> _ => hits[0] += 1,
+                recv(r) -> _ => hits[1] += 1,
+                recv(r) -> _ => hits[2] += 1,
+                recv(r) -> _ => hits[3] += 1,
+                recv(r) -> _ => hits[4] += 1,
+            }
+        }
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    }
 }
-
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/array.rs cargo-0.33.0/vendor/crossbeam-channel/tests/array.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/array.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/array.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,580 +1,604 @@
 //! Tests for the array channel flavor.
 
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 extern crate rand;
 
-mod wrappers;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::thread;
+use std::time::Duration;
+
+use crossbeam_channel::bounded;
+use crossbeam_channel::{RecvError, RecvTimeoutError, TryRecvError};
+use crossbeam_channel::{SendError, SendTimeoutError, TrySendError};
+use crossbeam_utils::thread::scope;
+use rand::{thread_rng, Rng};
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::sync::atomic::AtomicUsize;
-        use std::sync::atomic::Ordering;
-        use std::thread;
-        use std::time::Duration;
-
-        use $channel as channel;
-        use crossbeam;
-        use rand::{thread_rng, Rng};
-
-        fn ms(ms: u64) -> Duration {
-            Duration::from_millis(ms)
-        }
-
-        #[test]
-        fn smoke() {
-            let (s, r) = channel::bounded(1);
-            s.send(7);
-            assert_eq!(r.try_recv(), Some(7));
-
-            s.send(8);
-            assert_eq!(r.recv(), Some(8));
-
-            assert_eq!(r.try_recv(), None);
-            select! {
-                recv(r) => panic!(),
-                recv(channel::after(ms(1000))) => {}
-            }
-        }
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
 
-        #[test]
-        fn capacity() {
-            for i in 1..10 {
-                let (s, r) = channel::bounded::<()>(i);
-                assert_eq!(s.capacity(), Some(i));
-                assert_eq!(r.capacity(), Some(i));
-            }
-        }
+#[test]
+fn smoke() {
+    let (s, r) = bounded(1);
+    s.send(7).unwrap();
+    assert_eq!(r.try_recv(), Ok(7));
 
-        #[test]
-        fn len_empty_full() {
-            let (s, r) = channel::bounded(2);
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(s.is_empty(), true);
-            assert_eq!(s.is_full(), false);
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
-
-            s.send(());
-
-            assert_eq!(s.len(), 1);
-            assert_eq!(s.is_empty(), false);
-            assert_eq!(s.is_full(), false);
-            assert_eq!(r.len(), 1);
-            assert_eq!(r.is_empty(), false);
-            assert_eq!(r.is_full(), false);
-
-            s.send(());
-
-            assert_eq!(s.len(), 2);
-            assert_eq!(s.is_empty(), false);
-            assert_eq!(s.is_full(), true);
-            assert_eq!(r.len(), 2);
-            assert_eq!(r.is_empty(), false);
-            assert_eq!(r.is_full(), true);
+    s.send(8).unwrap();
+    assert_eq!(r.recv(), Ok(8));
 
-            r.recv().unwrap();
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+    assert_eq!(r.recv_timeout(ms(1000)), Err(RecvTimeoutError::Timeout));
+}
 
-            assert_eq!(s.len(), 1);
-            assert_eq!(s.is_empty(), false);
-            assert_eq!(s.is_full(), false);
-            assert_eq!(r.len(), 1);
-            assert_eq!(r.is_empty(), false);
-            assert_eq!(r.is_full(), false);
-        }
-
-        #[test]
-        fn recv() {
-            let (s, r) = channel::bounded(100);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.recv(), Some(7));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(8));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(9));
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    s.send(7);
-                    s.send(8);
-                    s.send(9);
-                });
-            });
-        }
+#[test]
+fn capacity() {
+    for i in 1..10 {
+        let (s, r) = bounded::<()>(i);
+        assert_eq!(s.capacity(), Some(i));
+        assert_eq!(r.capacity(), Some(i));
+    }
+}
 
-        #[test]
-        fn recv_timeout() {
-            let (s, r) = channel::bounded::<i32>(100);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        recv(r) => panic!(),
-                        recv(channel::after(ms(1000))) => {}
-                    }
-                    select! {
-                        recv(r, v) => assert_eq!(v, Some(7)),
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                    select! {
-                        recv(r, v) => assert_eq!(v, None),
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    s.send(7);
-                });
-            });
-        }
+#[test]
+fn len_empty_full() {
+    let (s, r) = bounded(2);
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(s.is_empty(), true);
+    assert_eq!(s.is_full(), false);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
+
+    s.send(()).unwrap();
+
+    assert_eq!(s.len(), 1);
+    assert_eq!(s.is_empty(), false);
+    assert_eq!(s.is_full(), false);
+    assert_eq!(r.len(), 1);
+    assert_eq!(r.is_empty(), false);
+    assert_eq!(r.is_full(), false);
+
+    s.send(()).unwrap();
+
+    assert_eq!(s.len(), 2);
+    assert_eq!(s.is_empty(), false);
+    assert_eq!(s.is_full(), true);
+    assert_eq!(r.len(), 2);
+    assert_eq!(r.is_empty(), false);
+    assert_eq!(r.is_full(), true);
+
+    r.recv().unwrap();
+
+    assert_eq!(s.len(), 1);
+    assert_eq!(s.is_empty(), false);
+    assert_eq!(s.is_full(), false);
+    assert_eq!(r.len(), 1);
+    assert_eq!(r.is_empty(), false);
+    assert_eq!(r.is_full(), false);
+}
 
-        #[test]
-        fn try_recv() {
-            let (s, r) = channel::bounded(100);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.try_recv(), None);
-                    thread::sleep(ms(1500));
-                    assert_eq!(r.try_recv(), Some(7));
-                    thread::sleep(ms(500));
-                    assert_eq!(r.try_recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    s.send(7);
-                });
-            });
-        }
+#[test]
+fn try_recv() {
+    let (s, r) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+            thread::sleep(ms(1500));
+            assert_eq!(r.try_recv(), Ok(7));
+            thread::sleep(ms(500));
+            assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            s.send(7).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn send() {
-            let (s, r) = channel::bounded(1);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    s.send(7);
-                    thread::sleep(ms(1000));
-                    s.send(8);
-                    thread::sleep(ms(1000));
-                    s.send(9);
-                    thread::sleep(ms(1000));
-                    s.send(10);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    assert_eq!(r.recv(), Some(7));
-                    assert_eq!(r.recv(), Some(8));
-                    assert_eq!(r.recv(), Some(9));
-                });
-            });
-        }
+#[test]
+fn recv() {
+    let (s, r) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv(), Ok(7));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(8));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(9));
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            s.send(7).unwrap();
+            s.send(8).unwrap();
+            s.send(9).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn send_timeout() {
-            let (s, r) = channel::bounded(2);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        send(s, 1) => {}
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                    select! {
-                        send(s, 2) => {}
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                    select! {
-                        send(s, 3) => panic!(),
-                        recv(channel::after(ms(500))) => {}
-                    }
-                    thread::sleep(ms(1000));
-                    select! {
-                        send(s, 4) => {}
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(1));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(2));
-                    assert_eq!(r.recv(), Some(4));
-                });
-            });
-        }
+#[test]
+fn recv_timeout() {
+    let (s, r) = bounded::<i32>(100);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv_timeout(ms(1000)), Err(RecvTimeoutError::Timeout));
+            assert_eq!(r.recv_timeout(ms(1000)), Ok(7));
+            assert_eq!(
+                r.recv_timeout(ms(1000)),
+                Err(RecvTimeoutError::Disconnected)
+            );
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            s.send(7).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn try_send() {
-            let (s, r) = channel::bounded(1);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        send(s, 1) => {}
-                        default => panic!(),
-                    }
-                    select! {
-                        send(s, 2) => panic!(),
-                        default => {}
-                    }
-                    thread::sleep(ms(1500));
-                    select! {
-                        send(s, 3) => {}
-                        default => panic!(),
-                    }
-                    thread::sleep(ms(500));
-                    select! {
-                        send(s, 4) => {}
-                        default => panic!(),
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.try_recv(), Some(1));
-                    assert_eq!(r.try_recv(), None);
-                    assert_eq!(r.recv(), Some(3));
-                });
-            });
-        }
+#[test]
+fn try_send() {
+    let (s, r) = bounded(1);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(s.try_send(1), Ok(()));
+            assert_eq!(s.try_send(2), Err(TrySendError::Full(2)));
+            thread::sleep(ms(1500));
+            assert_eq!(s.try_send(3), Ok(()));
+            thread::sleep(ms(500));
+            assert_eq!(s.try_send(4), Err(TrySendError::Disconnected(4)));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            assert_eq!(r.try_recv(), Ok(1));
+            assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+            assert_eq!(r.recv(), Ok(3));
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn recv_after_close() {
-            let (s, r) = channel::bounded(100);
-
-            s.send(1);
-            s.send(2);
-            s.send(3);
+#[test]
+fn send() {
+    let (s, r) = bounded(1);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            s.send(7).unwrap();
+            thread::sleep(ms(1000));
+            s.send(8).unwrap();
+            thread::sleep(ms(1000));
+            s.send(9).unwrap();
+            thread::sleep(ms(1000));
+            s.send(10).unwrap();
+        });
+        scope.spawn(|_| {
+            thread::sleep(ms(1500));
+            assert_eq!(r.recv(), Ok(7));
+            assert_eq!(r.recv(), Ok(8));
+            assert_eq!(r.recv(), Ok(9));
+        });
+    }).unwrap();
+}
 
-            drop(s);
+#[test]
+fn send_timeout() {
+    let (s, r) = bounded(2);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(s.send_timeout(1, ms(1000)), Ok(()));
+            assert_eq!(s.send_timeout(2, ms(1000)), Ok(()));
+            assert_eq!(
+                s.send_timeout(3, ms(500)),
+                Err(SendTimeoutError::Timeout(3))
+            );
+            thread::sleep(ms(1000));
+            assert_eq!(s.send_timeout(4, ms(1000)), Ok(()));
+            thread::sleep(ms(1000));
+            assert_eq!(s.send(5), Err(SendError(5)));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(1));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(2));
+            assert_eq!(r.recv(), Ok(4));
+        });
+    }).unwrap();
+}
 
-            assert_eq!(r.recv(), Some(1));
-            assert_eq!(r.recv(), Some(2));
-            assert_eq!(r.recv(), Some(3));
-            assert_eq!(r.recv(), None);
-        }
-
-        #[test]
-        fn len() {
-            const COUNT: usize = 25_000;
-            const CAP: usize = 1000;
-
-            let (s, r) = channel::bounded(CAP);
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
-
-            for _ in 0..CAP / 10 {
-                for i in 0..50 {
-                    s.send(i);
-                    assert_eq!(s.len(), i + 1);
-                }
+#[test]
+fn send_after_disconnect() {
+    let (s, r) = bounded(100);
+
+    s.send(1).unwrap();
+    s.send(2).unwrap();
+    s.send(3).unwrap();
+
+    drop(r);
+
+    assert_eq!(s.send(4), Err(SendError(4)));
+    assert_eq!(s.try_send(5), Err(TrySendError::Disconnected(5)));
+    assert_eq!(
+        s.send_timeout(6, ms(500)),
+        Err(SendTimeoutError::Disconnected(6))
+    );
+}
 
-                for i in 0..50 {
-                    r.recv().unwrap();
-                    assert_eq!(r.len(), 50 - i - 1);
-                }
-            }
+#[test]
+fn recv_after_disconnect() {
+    let (s, r) = bounded(100);
+
+    s.send(1).unwrap();
+    s.send(2).unwrap();
+    s.send(3).unwrap();
+
+    drop(s);
+
+    assert_eq!(r.recv(), Ok(1));
+    assert_eq!(r.recv(), Ok(2));
+    assert_eq!(r.recv(), Ok(3));
+    assert_eq!(r.recv(), Err(RecvError));
+}
 
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
+#[test]
+fn len() {
+    const COUNT: usize = 25_000;
+    const CAP: usize = 1000;
 
-            for i in 0..CAP {
-                s.send(i);
-                assert_eq!(s.len(), i + 1);
-            }
+    let (s, r) = bounded(CAP);
 
-            for _ in 0..CAP {
-                r.recv().unwrap();
-            }
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
 
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
+    for _ in 0..CAP / 10 {
+        for i in 0..50 {
+            s.send(i).unwrap();
+            assert_eq!(s.len(), i + 1);
+        }
 
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        assert_eq!(r.recv(), Some(i));
-                        let len = r.len();
-                        assert!(len <= CAP);
-                    }
-                });
+        for i in 0..50 {
+            r.recv().unwrap();
+            assert_eq!(r.len(), 50 - i - 1);
+        }
+    }
 
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        s.send(i);
-                        let len = s.len();
-                        assert!(len <= CAP);
-                    }
-                });
-            });
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
 
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
-        }
+    for i in 0..CAP {
+        s.send(i).unwrap();
+        assert_eq!(s.len(), i + 1);
+    }
 
-        #[test]
-        fn close_wakes_receiver() {
-            let (s, r) = channel::bounded::<()>(1);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    drop(s);
-                });
-            });
-        }
+    for _ in 0..CAP {
+        r.recv().unwrap();
+    }
 
-        #[test]
-        fn spsc() {
-            const COUNT: usize = 100_000;
-
-            let (s, r) = channel::bounded(3);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    for i in 0..COUNT {
-                        assert_eq!(r.recv(), Some(i));
-                    }
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    for i in 0..COUNT {
-                        s.send(i);
-                    }
-                });
-            });
-        }
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
 
-        #[test]
-        fn mpmc() {
-            const COUNT: usize = 25_000;
-            const THREADS: usize = 4;
-
-            let (s, r) = channel::bounded::<usize>(3);
-            let v = (0..COUNT).map(|_| AtomicUsize::new(0)).collect::<Vec<_>>();
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for _ in 0..COUNT {
-                            let n = r.recv().unwrap();
-                            v[n].fetch_add(1, Ordering::SeqCst);
-                        }
-                    });
-                }
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for i in 0..COUNT {
-                            s.send(i);
-                        }
-                    });
-                }
-            });
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                assert_eq!(r.recv(), Ok(i));
+                let len = r.len();
+                assert!(len <= CAP);
+            }
+        });
 
-            for c in v {
-                assert_eq!(c.load(Ordering::SeqCst), THREADS);
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s.send(i).unwrap();
+                let len = s.len();
+                assert!(len <= CAP);
             }
-        }
+        });
+    }).unwrap();
 
-        #[test]
-        fn stress_timeout_two_threads() {
-            const COUNT: usize = 100;
-
-            let (s, r) = channel::bounded(2);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        if i % 2 == 0 {
-                            thread::sleep(ms(50));
-                        }
-                        loop {
-                            select! {
-                                send(s, i) => break,
-                                recv(channel::after(ms(10))) => {}
-                            }
-                        }
-                    }
-                });
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
+}
 
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        if i % 2 == 0 {
-                            thread::sleep(ms(50));
-                        }
-                        loop {
-                            select! {
-                                recv(r, v) => {
-                                    assert_eq!(v, Some(i));
-                                    break;
-                                }
-                                recv(channel::after(ms(10))) => {}
-                            }
-                        }
-                    }
-                });
+#[test]
+fn disconnect_wakes_sender() {
+    let (s, r) = bounded(1);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(s.send(()), Ok(()));
+            assert_eq!(s.send(()), Err(SendError(())));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(r);
+        });
+    }).unwrap();
+}
+
+#[test]
+fn disconnect_wakes_receiver() {
+    let (s, r) = bounded::<()>(1);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(s);
+        });
+    }).unwrap();
+}
+
+#[test]
+fn spsc() {
+    const COUNT: usize = 100_000;
+
+    let (s, r) = bounded(3);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            for i in 0..COUNT {
+                assert_eq!(r.recv(), Ok(i));
+            }
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            for i in 0..COUNT {
+                s.send(i).unwrap();
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn mpmc() {
+    const COUNT: usize = 25_000;
+    const THREADS: usize = 4;
+
+    let (s, r) = bounded::<usize>(3);
+    let v = (0..COUNT).map(|_| AtomicUsize::new(0)).collect::<Vec<_>>();
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    let n = r.recv().unwrap();
+                    v[n].fetch_add(1, Ordering::SeqCst);
+                }
             });
         }
-
-        #[test]
-        fn drops() {
-            const RUNS: usize = 100;
-
-            static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-            #[derive(Debug, PartialEq)]
-            struct DropCounter;
-
-            impl Drop for DropCounter {
-                fn drop(&mut self) {
-                    DROPS.fetch_add(1, Ordering::SeqCst);
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for i in 0..COUNT {
+                    s.send(i).unwrap();
                 }
-            }
+            });
+        }
+    }).unwrap();
 
-            let mut rng = thread_rng();
+    for c in v {
+        assert_eq!(c.load(Ordering::SeqCst), THREADS);
+    }
+}
 
-            for _ in 0..RUNS {
-                let steps = rng.gen_range(0, 10_000);
-                let additional = rng.gen_range(0, 50);
-
-                DROPS.store(0, Ordering::SeqCst);
-                let (s, r) = channel::bounded::<DropCounter>(50);
-
-                crossbeam::scope(|scope| {
-                    scope.spawn(|| {
-                        for _ in 0..steps {
-                            r.recv().unwrap();
-                        }
-                    });
-
-                    scope.spawn(|| {
-                        for _ in 0..steps {
-                            s.send(DropCounter);
-                        }
-                    });
-                });
+#[test]
+fn stress_oneshot() {
+    const COUNT: usize = 10_000;
+
+    for _ in 0..COUNT {
+        let (s, r) = bounded(1);
+
+        scope(|scope| {
+            scope.spawn(|_| r.recv().unwrap());
+            scope.spawn(|_| s.send(0).unwrap());
+        }).unwrap();
+    }
+}
 
-                for _ in 0..additional {
-                    s.send(DropCounter);
+#[test]
+fn stress_iter() {
+    const COUNT: usize = 100_000;
+
+    let (request_s, request_r) = bounded(1);
+    let (response_s, response_r) = bounded(1);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut count = 0;
+            loop {
+                for x in response_r.try_iter() {
+                    count += x;
+                    if count == COUNT {
+                        return;
+                    }
                 }
+                request_s.send(()).unwrap();
+            }
+        });
 
-                assert_eq!(DROPS.load(Ordering::SeqCst), steps);
-                drop(s);
-                drop(r);
-                assert_eq!(DROPS.load(Ordering::SeqCst), steps + additional);
+        for _ in request_r.iter() {
+            if response_s.send(1).is_err() {
+                break;
             }
         }
+    }).unwrap();
+}
 
-        #[test]
-        fn linearizable() {
-            const COUNT: usize = 25_000;
-            const THREADS: usize = 4;
-
-            let (s, r) = channel::bounded(THREADS);
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for _ in 0..COUNT {
-                            s.send(0);
-                            r.try_recv().unwrap();
-                        }
-                    });
+#[test]
+fn stress_timeout_two_threads() {
+    const COUNT: usize = 100;
+
+    let (s, r) = bounded(2);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(50));
+                }
+                loop {
+                    if let Ok(()) = s.send_timeout(i, ms(10)) {
+                        break;
+                    }
                 }
-            });
-        }
-
-        #[test]
-        fn fairness() {
-            const COUNT: usize = 10_000;
-
-            let (s1, r1) = channel::bounded::<()>(COUNT);
-            let (s2, r2) = channel::bounded::<()>(COUNT);
-
-            for _ in 0..COUNT {
-                s1.send(());
-                s2.send(());
             }
+        });
 
-            let mut hits = [0usize; 2];
-            for _ in 0..COUNT {
-                select! {
-                    recv(r1) => hits[0] += 1,
-                    recv(r2) => hits[1] += 1,
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(50));
+                }
+                loop {
+                    if let Ok(x) = r.recv_timeout(ms(10)) {
+                        assert_eq!(x, i);
+                        break;
+                    }
                 }
             }
-            assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-        }
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn fairness_duplicates() {
-            const COUNT: usize = 10_000;
+#[test]
+fn drops() {
+    const RUNS: usize = 100;
 
-            let (s, r) = channel::bounded::<()>(COUNT);
+    static DROPS: AtomicUsize = AtomicUsize::new(0);
 
-            for _ in 0..COUNT {
-                s.send(());
-            }
+    #[derive(Debug, PartialEq)]
+    struct DropCounter;
 
-            let mut hits = [0usize; 5];
-            for _ in 0..COUNT {
-                select! {
-                    recv(r) => hits[0] += 1,
-                    recv(r) => hits[1] += 1,
-                    recv(r) => hits[2] += 1,
-                    recv(r) => hits[3] += 1,
-                    recv(r) => hits[4] += 1,
-                }
-            }
-            assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    impl Drop for DropCounter {
+        fn drop(&mut self) {
+            DROPS.fetch_add(1, Ordering::SeqCst);
         }
+    }
 
-        #[test]
-        fn recv_in_send() {
-            let (s, _r) = channel::bounded(1);
-            s.send(());
+    let mut rng = thread_rng();
 
-            select! {
-                send(s, panic!()) => panic!(),
-                default => {}
-            }
+    for _ in 0..RUNS {
+        let steps = rng.gen_range(0, 10_000);
+        let additional = rng.gen_range(0, 50);
 
-            let (s, r) = channel::bounded(2);
-            s.send(());
+        DROPS.store(0, Ordering::SeqCst);
+        let (s, r) = bounded::<DropCounter>(50);
 
-            select! {
-                send(s, assert_eq!(r.recv(), Some(()))) => {}
-            }
+        scope(|scope| {
+            scope.spawn(|_| {
+                for _ in 0..steps {
+                    r.recv().unwrap();
+                }
+            });
+
+            scope.spawn(|_| {
+                for _ in 0..steps {
+                    s.send(DropCounter).unwrap();
+                }
+            });
+        }).unwrap();
+
+        for _ in 0..additional {
+            s.send(DropCounter).unwrap();
         }
-    };
-}
 
-mod normal {
-    tests!(wrappers::normal);
+        assert_eq!(DROPS.load(Ordering::SeqCst), steps);
+        drop(s);
+        drop(r);
+        assert_eq!(DROPS.load(Ordering::SeqCst), steps + additional);
+    }
 }
 
-mod cloned {
-    tests!(wrappers::cloned);
+#[test]
+fn linearizable() {
+    const COUNT: usize = 25_000;
+    const THREADS: usize = 4;
+
+    let (s, r) = bounded(THREADS);
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    s.send(0).unwrap();
+                    r.try_recv().unwrap();
+                }
+            });
+        }
+    }).unwrap();
 }
 
-mod select {
-    tests!(wrappers::select);
+#[test]
+fn fairness() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded::<()>(COUNT);
+    let (s2, r2) = bounded::<()>(COUNT);
+
+    for _ in 0..COUNT {
+        s1.send(()).unwrap();
+        s2.send(()).unwrap();
+    }
+
+    let mut hits = [0usize; 2];
+    for _ in 0..COUNT {
+        select! {
+            recv(r1) -> _  => hits[0] += 1,
+            recv(r2) -> _  => hits[1] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
 }
 
-mod select_spin {
-    tests!(wrappers::select_spin);
+#[test]
+fn fairness_duplicates() {
+    const COUNT: usize = 10_000;
+
+    let (s, r) = bounded::<()>(COUNT);
+
+    for _ in 0..COUNT {
+        s.send(()).unwrap();
+    }
+
+    let mut hits = [0usize; 5];
+    for _ in 0..COUNT {
+        select! {
+            recv(r) -> _ => hits[0] += 1,
+            recv(r) -> _ => hits[1] += 1,
+            recv(r) -> _ => hits[2] += 1,
+            recv(r) -> _ => hits[3] += 1,
+            recv(r) -> _ => hits[4] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
 }
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+#[test]
+fn recv_in_send() {
+    let (s, _r) = bounded(1);
+    s.send(()).unwrap();
+
+    #[allow(unreachable_code)]
+    {
+        select! {
+            send(s, panic!()) -> _ => panic!(),
+            default => {}
+        }
+    }
+
+    let (s, r) = bounded(2);
+    s.send(()).unwrap();
+
+    select! {
+        send(s, assert_eq!(r.recv(), Ok(()))) -> _ => {}
+    }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/cmp.rs cargo-0.33.0/vendor/crossbeam-channel/tests/cmp.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/cmp.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/cmp.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-//! Tests for comparison operators on channel senders and receivers.
-
-extern crate crossbeam;
-extern crate crossbeam_channel as channel;
-
-#[test]
-fn sender() {
-    let (s1, _) = channel::unbounded::<()>();
-    let s2 = s1.clone();
-    let (s3, _) = channel::unbounded();
-
-    assert_eq!(s1, s2);
-    assert_ne!(s1, s3);
-    assert_ne!(s2, s3);
-    assert_eq!(s3, s3);
-}
-
-#[test]
-fn receiver() {
-    let (_, r1) = channel::unbounded::<()>();
-    let r2 = r1.clone();
-    let (_, r3) = channel::unbounded();
-
-    assert_eq!(r1, r2);
-    assert_ne!(r1, r3);
-    assert_ne!(r2, r3);
-    assert_eq!(r3, r3);
-}
-
-#[test]
-fn sender_and_receiver() {
-    let (s1, r1) = channel::unbounded::<()>();
-    let s2 = s1.clone();
-    let r2 = r1.clone();
-    let (s3, r3) = channel::unbounded();
-
-    assert_eq!(s1, r2);
-    assert_eq!(r1, s2);
-
-    assert_ne!(s1, r3);
-    assert_ne!(r1, s3);
-
-    assert_ne!(s2, r3);
-    assert_ne!(r2, s3);
-
-    assert_eq!(s3, r3);
-    assert_eq!(r3, s3);
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/golang.rs cargo-0.33.0/vendor/crossbeam-channel/tests/golang.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/golang.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/golang.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,906 +1,1025 @@
-//! Tests borrowed from Go and ported to Rust.
+//! Tests copied from Go and manually rewritten in Rust.
+//!
+//! Source:
+//!   - https://github.com/golang/go
+//!
+//! Copyright & License:
+//!   - Copyright (c) 2009 The Go Authors
+//!   - https://golang.org/AUTHORS
+//!   - https://golang.org/LICENSE
+//!   - https://golang.org/PATENTS
 
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
-extern crate parking_lot;
+extern crate crossbeam_channel;
 
-mod wrappers;
+use std::any::Any;
+use std::collections::HashMap;
+use std::sync::{Arc, Condvar, Mutex};
+use std::thread;
+use std::time::Duration;
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::any::Any;
-        use std::collections::HashMap;
-        use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-        use std::thread;
-        use std::time::Duration;
-
-        use $channel as channel;
-        use crossbeam;
-        use parking_lot::Mutex;
-
-        fn ms(ms: u64) -> Duration {
-            Duration::from_millis(ms)
-        }
-
-        // https://github.com/golang/go/blob/master/test/chan/doubleselect.go
-        mod doubleselect {
-            use super::*;
-
-            const ITERATIONS: i32 = 100_000;
-
-            #[test]
-            fn test_double_select() {
-                let (c1, r1) = channel::unbounded();
-                let (c2, r2) = channel::unbounded();
-                let (c3, r3) = channel::unbounded();
-                let (c4, r4) = channel::unbounded();
-                let (done_s, done_r) = channel::unbounded();
-                let (mux_s, mux_r) = channel::unbounded();
-
-                fn mux(out: channel::Sender<i32>, in_c: channel::Receiver<i32>, done: channel::Sender<bool>) {
-                    for val in in_c.0 {
-                        out.send(val);
-                    }
-                    
-                    drop(out);
-                    done.send(true);
-                }
-
-                crossbeam::scope(|scope| {
-                    // This is akin to the sender function in the go example.
-                    scope.spawn(|| {
-                        for i in 0..ITERATIONS {
-                            select! {
-                                send(c1, i) => {},
-                                send(c2, i) => {},
-                                send(c3, i) => {},
-                                send(c4, i) => {},
-                            }
-                        }
+use crossbeam_channel::{bounded, Receiver, Select, Sender};
 
-                        drop(c1);
-                        drop(c2);
-                        drop(c3);
-                        drop(c4);
-                    });
-
-                    // This is akin to the mux function call.
-                    {
-                        let mux_s = mux_s.clone();
-                        let done_s = done_s.clone();
-                        scope.spawn(move || mux(mux_s, r1, done_s));
-                    }
-                    {
-                        let mux_s = mux_s.clone();
-                        let done_s = done_s.clone();
-                        scope.spawn(move || mux(mux_s, r2, done_s));
-                    }
-                    {
-                        let mux_s = mux_s.clone();
-                        let done_s = done_s.clone();
-                        scope.spawn(move || mux(mux_s, r3, done_s));
-                    }
-                    {
-                        let mux_s = mux_s.clone();
-                        let done_s = done_s.clone();
-                        scope.spawn(move || mux(mux_s, r4, done_s));
-                    }
-
-                    scope.spawn(|| {
-                        done_r.recv();
-                        done_r.recv();
-                        done_r.recv();
-                        done_r.recv();
-
-                        drop(mux_s);
-                    });
-
-                    // Akin to recver in the go example.
-                    let mut seen = HashMap::new();
-
-                    for val in mux_r.0 {
-                        if seen.contains_key(&val) {
-                            panic!("got duplicate value for {}", val);
-                        }
-                        seen.insert(val, true);
-                    }
-                });
-            }
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
+
+struct Chan<T> {
+    inner: Arc<Mutex<ChanInner<T>>>,
+}
+
+struct ChanInner<T> {
+    s: Option<Sender<T>>,
+    r: Receiver<T>,
+}
+
+impl<T> Clone for Chan<T> {
+    fn clone(&self) -> Chan<T> {
+        Chan {
+            inner: self.inner.clone(),
         }
+    }
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/fifo.go
-        mod fifo {
-            use super::*;
-
-            const N: i32 = 10;
-
-            // AsynchFifo from the go example.
-            #[test]
-            fn async() {
-                let (tx, rx) = channel::bounded(N as usize);
-                for i in 0..N {
-                    tx.send(i);
-                }
-                for i in 0..N {
-                    if rx.recv() != Some(i) {
-                        panic!("bad receive");
-                    }
-                }
-            }
+impl<T> Chan<T> {
+    fn send(&self, msg: T) {
+        let s = self
+            .inner
+            .lock()
+            .unwrap()
+            .s
+            .as_ref()
+            .expect("sending into closed channel")
+            .clone();
+        let _ = s.send(msg);
+    }
 
-            fn chain(ch: channel::Receiver<i32>, val: i32, in_c: channel::Receiver<i32>, out: channel::Sender<i32>) {
-                in_c.recv();
-                if ch.recv() != Some(val) {
-                    panic!(val);
-                }
-                out.send(1);
-            }
+    fn try_recv(&self) -> Option<T> {
+        let r = self
+            .inner
+            .lock()
+            .unwrap()
+            .r
+            .clone();
+        r.try_recv().ok()
+    }
 
-            // SynchFifo from the go example.
-            #[test]
-            fn sync() {
-                let (ch_s, ch_r) = channel::bounded(0);
-                let (in_s, mut in_r) = channel::bounded(0);
-                let start = in_s.clone();
+    fn recv(&self) -> Option<T> {
+        let r = self
+            .inner
+            .lock()
+            .unwrap()
+            .r
+            .clone();
+        r.recv().ok()
+    }
 
-                crossbeam::scope(|scope| {
-                    for i in 0..N {
-                        let (out_s, out_r) = channel::bounded(0);
-                        let ch_r = ch_r.clone();
-                        scope.spawn(move || {
-                            chain(ch_r, i, in_r, out_s);
-                        });
-                        in_r = out_r;
-                    }
-                    start.send(0);
-                    for i in 0..N {
-                        ch_s.send(i);
-                    }
-                    in_r.recv();
-                });
+    fn close(&self) {
+        self.inner
+            .lock()
+            .unwrap()
+            .s
+            .take()
+            .expect("channel already closed");
+    }
+
+    fn rx(&self) -> Receiver<T> {
+        self.inner
+            .lock()
+            .unwrap()
+            .r
+            .clone()
+    }
+
+    fn tx(&self) -> Sender<T> {
+        match self
+            .inner
+            .lock()
+            .unwrap()
+            .s
+            .as_ref()
+        {
+            None => {
+                let (s, r) = bounded(0);
+                std::mem::forget(r);
+                s
             }
+            Some(s) => s.clone(),
         }
+    }
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/nonblock.go
-        mod nonblock {
-            // TODO
-        }
+impl<T> Iterator for Chan<T> {
+    type Item = T;
 
-        // https://github.com/golang/go/blob/master/test/chan/select.go
-        mod select {
-            // TODO
-        }
+    fn next(&mut self) -> Option<Self::Item> {
+        self.recv()
+    }
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/select2.go
-        mod select2 {
-            // TODO
-        }
+impl<'a, T> IntoIterator for &'a Chan<T> {
+    type Item = T;
+    type IntoIter = Chan<T>;
 
-        // https://github.com/golang/go/blob/master/test/chan/select3.go
-        mod select3 {
-            // TODO
-        }
+    fn into_iter(self) -> Self::IntoIter {
+        self.clone()
+    }
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/select4.go
-        mod select4 {
-            // TODO
-        }
+fn make<T>(cap: usize) -> Chan<T> {
+    let (s, r) = bounded(cap);
+    Chan {
+        inner: Arc::new(Mutex::new(ChanInner { s: Some(s), r })),
+    }
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/select5.go
-        mod select5 {
-            // TODO
-        }
+#[derive(Clone)]
+struct WaitGroup(Arc<WaitGroupInner>);
 
-        // https://github.com/golang/go/blob/master/test/chan/select6.go
-        mod select6 {
-            // TODO
-        }
+struct WaitGroupInner {
+    cond: Condvar,
+    count: Mutex<i32>,
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/select7.go
-        mod select7 {
-            // TODO
-        }
+impl WaitGroup {
+    fn new() -> WaitGroup {
+        WaitGroup(Arc::new(WaitGroupInner {
+            cond: Condvar::new(),
+            count: Mutex::new(0),
+        }))
+    }
 
-        // https://github.com/golang/go/blob/master/test/chan/sieve1.go
-        mod sieve1 {
-            // TODO
-        }
+    fn add(&self, delta: i32) {
+        let mut count = self.0.count.lock().unwrap();
+        *count += delta;
+        assert!(*count >= 0);
+        self.0.cond.notify_all();
+    }
+
+    fn done(&self) {
+        self.add(-1);
+    }
 
-        // https://github.com/golang/go/blob/master/test/chan/sieve2.go
-        mod sieve2 {
-            // TODO
+    fn wait(&self) {
+        let mut count = self.0.count.lock().unwrap();
+        while *count > 0 {
+            count = self.0.cond.wait(count).unwrap();
         }
+    }
+}
 
-        // https://github.com/golang/go/blob/master/test/chan/zerosize.go
-        mod zerosize {
-            use super::*;
+struct Defer<F: FnOnce()> {
+    f: Option<Box<F>>,
+}
+
+impl<F: FnOnce()> Drop for Defer<F> {
+    fn drop(&mut self) {
+        let f = self.f.take().unwrap();
+        let mut f = Some(f);
+        let mut f = move || f.take().unwrap()();
+        f();
+    }
+}
 
-            #[test]
-            fn zero_size_struct() {
-                struct ZeroSize;
-                let _ = channel::unbounded::<ZeroSize>();
+macro_rules! defer {
+    ($body:expr) => {
+        let _defer = Defer {
+            f: Some(Box::new(|| $body)),
+        };
+    };
+}
+
+macro_rules! go {
+    (@parse ref $v:ident, $($tail:tt)*) => {{
+        let ref $v = $v;
+        go!(@parse $($tail)*)
+    }};
+    (@parse move $v:ident, $($tail:tt)*) => {{
+        let $v = $v;
+        go!(@parse $($tail)*)
+    }};
+    (@parse $v:ident, $($tail:tt)*) => {{
+        let $v = $v.clone();
+        go!(@parse $($tail)*)
+    }};
+    (@parse $body:expr) => {
+        ::std::thread::spawn(move || {
+            let res = ::std::panic::catch_unwind(::std::panic::AssertUnwindSafe(|| {
+                $body
+            }));
+            if res.is_err() {
+                eprintln!("goroutine panicked: {:?}", res);
+                ::std::process::abort();
             }
+        })
+    };
+    (@parse $($tail:tt)*) => {
+        compile_error!("invalid `go!` syntax")
+    };
+    ($($tail:tt)*) => {{
+        go!(@parse $($tail)*)
+    }};
+}
 
-            #[test]
-            fn zero_size_array() {
-                let _ = channel::unbounded::<[u8; 0]>();
+// https://github.com/golang/go/blob/master/test/chan/doubleselect.go
+mod doubleselect {
+    use super::*;
+
+    const ITERATIONS: i32 = 10_000;
+
+    fn sender(n: i32, c1: Chan<i32>, c2: Chan<i32>, c3: Chan<i32>, c4: Chan<i32>) {
+        defer! { c1.close() }
+        defer! { c2.close() }
+        defer! { c3.close() }
+        defer! { c4.close() }
+
+        for i in 0..n {
+            select! {
+                send(c1.tx(), i) -> _ => {}
+                send(c2.tx(), i) -> _ => {}
+                send(c3.tx(), i) -> _ => {}
+                send(c4.tx(), i) -> _ => {}
             }
         }
+    }
 
-        // https://github.com/golang/go/blob/master/src/runtime/chan_test.go
-        mod chan_test {
-            use super::*;
+    fn mux(out: Chan<i32>, inp: Chan<i32>, done: Chan<bool>) {
+        for v in inp {
+            out.send(v);
+        }
+        done.send(true);
+    }
 
-            #[test]
-            fn chan() {
-                const N: usize = 200;
+    fn recver(inp: Chan<i32>) {
+        let mut seen = HashMap::new();
 
-                for cap in 0..N {
-                    {
-                        let c = channel::bounded::<i32>(cap);
-                        let recv1 = AtomicBool::new(false);
-                        let recv2 = AtomicBool::new(false);
+        for v in &inp {
+            if seen.contains_key(&v) {
+                panic!("got duplicate value for {}", v);
+            }
+            seen.insert(v, true);
+        }
+    }
 
-                        crossbeam::scope(|scope| {
-                            scope.spawn(|| {
-                                c.1.recv();
-                                recv1.store(true, Ordering::SeqCst);
-                            });
-                            scope.spawn(|| {
-                                c.1.recv();
-                                recv2.store(true, Ordering::SeqCst);
-                            });
+    #[test]
+    fn main() {
+        let c1 = make::<i32>(0);
+        let c2 = make::<i32>(0);
+        let c3 = make::<i32>(0);
+        let c4 = make::<i32>(0);
+        let done = make::<bool>(0);
+        let cmux = make::<i32>(0);
+
+        go!(c1, c2, c3, c4, sender(ITERATIONS, c1, c2, c3, c4));
+        go!(cmux, c1, done, mux(cmux, c1, done));
+        go!(cmux, c2, done, mux(cmux, c2, done));
+        go!(cmux, c3, done, mux(cmux, c3, done));
+        go!(cmux, c4, done, mux(cmux, c4, done));
+        go!(done, cmux, {
+            done.recv();
+            done.recv();
+            done.recv();
+            done.recv();
+            cmux.close();
+        });
+        recver(cmux);
+    }
+}
 
-                            thread::sleep(ms(1));
+// https://github.com/golang/go/blob/master/test/chan/fifo.go
+mod fifo {
+    use super::*;
+
+    const N: i32 = 10;
+
+    #[test]
+    fn asynch_fifo() {
+        let ch = make::<i32>(N as usize);
+        for i in 0..N {
+            ch.send(i);
+        }
+        for i in 0..N {
+            if ch.recv() != Some(i) {
+                panic!("bad receive");
+            }
+        }
+    }
 
-                            if recv1.load(Ordering::SeqCst) || recv2.load(Ordering::SeqCst) {
-                                panic!();
-                            }
+    fn chain(ch: Chan<i32>, val: i32, inp: Chan<i32>, out: Chan<i32>) {
+        inp.recv();
+        if ch.recv() != Some(val) {
+            panic!(val);
+        }
+        out.send(1);
+    }
 
-                            // Ensure that non-blocking receive does not block.
-                            select! {
-                                recv(c.1) => panic!(),
-                                default => {}
-                            }
-                            select! {
-                                recv(c.1) => panic!(),
-                                default => {}
-                            }
+    #[test]
+    fn synch_fifo() {
+        let ch = make::<i32>(0);
+        let mut inp = make::<i32>(0);
+        let start = inp.clone();
+
+        for i in 0..N {
+            let out = make::<i32>(0);
+            go!(ch, i, inp, out, chain(ch, i, inp, out));
+            inp = out;
+        }
 
-                            c.0.send(0);
-                            c.0.send(0);
-                        });
-                    }
+        start.send(0);
+        for i in 0..N {
+            ch.send(i);
+        }
+        inp.recv();
+    }
+}
 
-                    {
-                        // Ensure that send to full chan blocks.
-                        let c = channel::bounded::<i32>(cap);
-                        for i in 0..cap {
-                            c.0.send(i as i32);
-                        }
-                        let sent = AtomicUsize::new(0);
+// https://github.com/golang/go/blob/master/test/chan/nonblock.go
+mod nonblock {
+    // TODO
+}
 
-                        crossbeam::scope(|scope| {
-                            scope.spawn(|| {
-                                c.0.send(0);
-                                sent.store(1, Ordering::SeqCst);
-                            });
+// https://github.com/golang/go/blob/master/test/chan/select.go
+mod select {
+    // TODO
+}
 
-                            thread::sleep(ms(1));
+// https://github.com/golang/go/blob/master/test/chan/select2.go
+mod select2 {
+    // TODO
+}
 
-                            if sent.load(Ordering::SeqCst) != 0 {
-                                panic!();
-                            }
+// https://github.com/golang/go/blob/master/test/chan/select3.go
+mod select3 {
+    // TODO
+}
 
-                            // Ensure that non-blocking send does not block.
-                            select! {
-                                send(c.0, 0) => panic!(),
-                                default => {}
-                            }
-                            c.1.recv();
-                        });
-                    }
+// https://github.com/golang/go/blob/master/test/chan/select4.go
+mod select4 {
+    // TODO
+}
 
-                    {
-                        // Ensure that we receive 0 from closed chan.
-                        let c = channel::bounded::<i32>(cap);
-                        for i in 0..cap {
-                            c.0.send(i as i32);
-                        }
-                        drop(c.0);
+// https://github.com/golang/go/blob/master/test/chan/select5.go
+mod select5 {
+    // TODO
+}
 
-                        for i in 0..cap {
-                            let v = c.1.recv();
-                            assert_eq!(v, Some(i as i32));
-                        }
+// https://github.com/golang/go/blob/master/test/chan/select6.go
+mod select6 {
+    // TODO
+    use super::*;
+
+    #[test]
+    fn main() {
+        let c1 = make::<bool>(0);
+        let c2 = make::<bool>(0);
+        let c3 = make::<bool>(0);
+
+        go!(c1, c1.recv());
+        go!(c1, c2, c3, {
+            select! {
+                recv(c1.rx()) -> _ => panic!("dummy"),
+                recv(c2.rx()) -> _ => c3.send(true),
+            }
+            c1.recv();
+        });
+        go!(c2, c2.send(true));
+
+        c3.recv();
+        c1.send(true);
+        c1.send(true);
+    }
+}
 
-                        assert_eq!(c.1.recv(), None);
-                    }
+// https://github.com/golang/go/blob/master/test/chan/select7.go
+mod select7 {
+    // TODO
+}
 
-                    {
-                        // Ensure that close unblocks receive.
-                        let (s, r) = channel::bounded::<i32>(cap);
-                        let done = channel::bounded::<bool>(0);
-
-                        crossbeam::scope(|scope| {
-                            scope.spawn(|| done.0.send(r.recv() == None));
-                            thread::sleep(ms(1));
-                            drop(s);
-
-                            assert_eq!(done.1.recv(), Some(true));
-                        });
-                    }
-
-                    {
-                        // Send 100 integers,
-                        // ensure that we receive them non-corrupted in FIFO order.
-                        let c = channel::bounded::<i32>(cap);
-                        crossbeam::scope(|scope| {
-                            scope.spawn(|| {
-                                for i in 0..100 {
-                                    c.0.send(i);
-                                }
-                            });
+// https://github.com/golang/go/blob/master/test/chan/sieve1.go
+mod sieve1 {
+    // TODO
+}
 
-                            for i in 0..100 {
-                                assert_eq!(c.1.recv(), Some(i));
-                            }
-                        });
+// https://github.com/golang/go/blob/master/test/chan/sieve2.go
+mod sieve2 {
+    // TODO
+}
 
-                        // Same, but using recv2.
-                        crossbeam::scope(|scope| {
-                            scope.spawn(|| {
-                                for i in 0..100 {
-                                    c.0.send(i);
-                                }
-                            });
+// https://github.com/golang/go/blob/master/test/chan/zerosize.go
+mod zerosize {
+    use super::*;
+
+    #[test]
+    fn zero_size_struct() {
+        struct ZeroSize;
+        let _ = make::<ZeroSize>(0);
+    }
 
-                            for i in 0..100 {
-                                assert_eq!(c.1.recv(), Some(i));
-                            }
-                        });
+    #[test]
+    fn zero_size_array() {
+        let _ = make::<[u8; 0]>(0);
+    }
+}
 
-                        // Send 1000 integers in 4 goroutines,
-                        // ensure that we receive what we send.
-                        const P: usize = 4;
-                        const L: usize = 1000;
-                        let done = channel::bounded::<Vec<i32>>(0);
-                        crossbeam::scope(|scope| {
-                            for _ in 0..P {
-                                scope.spawn(|| {
-                                    for i in 0..L {
-                                        c.0.send(i as i32);
-                                    }
-                                });
-                            }
+// https://github.com/golang/go/blob/master/src/runtime/chan_test.go
+mod chan_test {
+    use super::*;
+
+    #[test]
+    fn test_chan() {
+        const N: i32 = 200;
+
+        for cap in 0..N {
+            {
+                // Ensure that receive from empty chan blocks.
+                let c = make::<i32>(cap as usize);
+
+                let recv1 = Arc::new(Mutex::new(false));
+                go!(c, recv1, {
+                    c.recv();
+                    *recv1.lock().unwrap() = true;
+                });
 
-                            for _ in 0..P {
-                                scope.spawn(|| {
-                                    let mut recv = vec![0; L];
-                                    for _ in 0..L {
-                                        let v = c.1.recv().unwrap();
-                                        recv[v as usize] += 1;
-                                    }
-                                    done.0.send(recv);
-                                });
-                            }
+                let recv2 = Arc::new(Mutex::new(false));
+                go!(c, recv2, {
+                    c.recv();
+                    *recv2.lock().unwrap() = true;
+                });
 
-                            let mut recv = vec![0; L];
-                            for _ in 0..P {
-                                for (i, v) in done.1.recv().unwrap().into_iter().enumerate() {
-                                    recv[i] += v;
-                                }
-                            }
+                thread::sleep(ms(1));
 
-                            assert_eq!(recv.len(), L);
-                            for v in recv {
-                                assert_eq!(v, P as i32);
-                            }
-                        });
-                    }
+                if *recv1.lock().unwrap() || *recv2.lock().unwrap() {
+                    panic!();
+                }
 
-                    {
-                        // Test len/cap.
-                        let c = channel::bounded::<i32>(cap);
+                // Ensure that non-blocking receive does not block.
+                select! {
+                    recv(c.rx()) -> _ => panic!(),
+                    default => {}
+                }
+                select! {
+                    recv(c.rx()) -> _ => panic!(),
+                    default => {}
+                }
 
-                        assert_eq!(c.0.len(), 0);
-                        assert_eq!(c.0.capacity(), Some(cap));
+                c.send(0);
+                c.send(0);
+            }
 
-                        for i in 0..cap {
-                            c.0.send(i as i32);
-                        }
+            {
+                // Ensure that send to full chan blocks.
+                let c = make::<i32>(cap as usize);
+                for i in 0..cap {
+                    c.send(i);
+                }
 
-                        assert_eq!(c.0.len(), cap);
-                        assert_eq!(c.0.capacity(), Some(cap));
-                    }
+                let sent = Arc::new(Mutex::new(0));
+                go!(sent, c, {
+                    c.send(0);
+                    *sent.lock().unwrap() = 1;
+                });
+
+                thread::sleep(ms(1));
+
+                if *sent.lock().unwrap() != 0 {
+                    panic!();
                 }
-            }
 
-            #[test]
-            fn nonblock_recv_race() {
-                const N: usize = 10000;
+                // Ensure that non-blocking send does not block.
+                select! {
+                    send(c.tx(), 0) -> _ => panic!(),
+                    default => {}
+                }
+                c.recv();
+            }
 
-                for _ in 0..N {
-                    let (s, r) = channel::bounded(1);
-                    s.send(1);
+            {
+                // Ensure that we receive 0 from closed chan.
+                let c = make::<i32>(cap as usize);
+                for i in 0..cap {
+                    c.send(i);
+                }
+                c.close();
 
-                    crossbeam::scope(|scope| {
-                        scope.spawn(|| {
-                            select! {
-                                recv(r) => {}
-                                default => panic!("chan is not ready"),
-                            }
-                        });
+                for i in 0..cap {
+                    let v = c.recv();
+                    if v != Some(i) {
+                        panic!();
+                    }
+                }
 
-                        drop(s);
-                        r.recv();
-                    });
+                if c.recv() != None {
+                    panic!();
+                }
+                if c.try_recv() != None {
+                    panic!();
                 }
             }
 
-            #[test]
-            fn nonblock_select_race() {
-                const N: usize = 10000;
+            {
+                // Ensure that close unblocks receive.
+                let c = make::<i32>(cap as usize);
+                let done = make::<bool>(0);
+
+                go!(c, done, {
+                    let v = c.try_recv();
+                    done.send(v.is_some());
+                });
 
-                let (done_s, done_r) = channel::bounded::<bool>(1);
-                for _ in 0..N {
-                    let (s1, r1) = channel::bounded::<i32>(1);
-                    let (s2, r2) = channel::bounded::<i32>(1);
-                    s1.send(1);
+                thread::sleep(ms(1));
+                c.close();
 
-                    crossbeam::scope(|scope| {
-                        scope.spawn(|| {
-                            select! {
-                                recv(r1) => {}
-                                recv(r2) => {}
-                                default => {
-                                    done_s.send(false);
-                                    return;
-                                }
-                            }
-                            done_s.send(true);
-                        });
+                if !done.recv().unwrap() {
+                    // panic!();
+                }
+            }
 
-                        s2.send(1);
-                        select! {
-                            recv(r1) => {}
-                            default => {}
-                        }
+            {
+                // Send 100 integers,
+                // ensure that we receive them non-corrupted in FIFO order.
+                let c = make::<i32>(cap as usize);
+                go!(c, {
+                    for i in 0..100 {
+                        c.send(i);
+                    }
+                });
+                for i in 0..100 {
+                    if c.recv() != Some(i) {
+                        panic!();
+                    }
+                }
 
-                        if !done_r.recv().unwrap() {
-                            panic!("no chan is ready");
-                        }
-                    });
+                // Same, but using recv2.
+                go!(c, {
+                    for i in 0..100 {
+                        c.send(i);
+                    }
+                });
+                for i in 0..100 {
+                    if c.recv() != Some(i) {
+                        panic!();
+                    }
                 }
             }
+        }
+    }
 
-            #[test]
-            fn nonblock_select_race2() {
-                const N: usize = 1000;
+    #[test]
+    fn test_nonblock_recv_race() {
+        const N: usize = 1000;
+
+        for _ in 0..N {
+            let c = make::<i32>(1);
+            c.send(1);
 
-                let (done_s, done_r) = channel::bounded::<bool>(1);
-                for _ in 0..N {
-                    let (s1, r1) = channel::bounded::<i32>(1);
-                    let (s2, r2) = channel::bounded::<i32>(0);
-                    s1.send(1);
+            let t = go!(c, {
+                select! {
+                    recv(c.rx()) -> _ => {}
+                    default => panic!("chan is not ready"),
+                }
+            });
 
-                    crossbeam::scope(|scope| {
-                        scope.spawn(|| {
-                            select! {
-                                recv(r1) => {}
-                                recv(r2) => {}
-                                default => {
-                                    done_s.send(false);
-                                    return;
-                                }
-                            }
-                            done_s.send(true);
-                        });
+            c.close();
+            c.recv();
+            t.join().unwrap();
+        }
+    }
 
-                        drop(s2);
-                        select! {
-                            recv(r1) => {}
-                            default => {}
-                        }
+    #[test]
+    fn test_nonblock_select_race() {
+        const N: usize = 1000;
+
+        let done = make::<bool>(1);
+        for _ in 0..N {
+            let c1 = make::<i32>(1);
+            let c2 = make::<i32>(1);
+            c1.send(1);
 
-                        if !done_r.recv().unwrap() {
-                            panic!("no chan is ready");
-                        }
-                    });
+            go!(c1, c2, done, {
+                select! {
+                    recv(c1.rx()) -> _ => {}
+                    recv(c2.rx()) -> _ => {}
+                    default => {
+                        done.send(false);
+                        return;
+                    }
                 }
-            }
+                done.send(true);
+            });
 
-            #[test]
-            fn self_select() {
-                // Ensure that send/recv on the same chan in select
-                // does not crash nor deadlock.
-                for &cap in &[0, 10] {
-                    let (s, r) = channel::bounded::<i32>(cap);
-
-                    crossbeam::scope(|scope| {
-                        for p in 0..2 {
-                            let p = p;
-                            let (s, r) = (&s, &r);
-                            scope.spawn(move || {
-                                for i in 0..1000 {
-                                    if p == 0 || i % 2 == 0 {
-                                        select! {
-                                            send(s, p) => {}
-                                            recv(r, v) => {
-                                                if cap == 0 && v.unwrap() == p {
-                                                    panic!("self receive");
-                                                }
-                                            }
-                                        }
-                                    } else {
-                                        select! {
-                                            recv(r, v) => {
-                                                if cap == 0 && v.unwrap() == p {
-                                                    panic!("self receive");
-                                                }
-                                            }
-                                            send(s, p) => {}
-                                        }
-                                    }
-                                }
-                            });
-                        }
-                    });
-                }
+            c2.send(1);
+            select! {
+                recv(c1.rx()) -> _ => {}
+                default => {}
             }
+            if !done.recv().unwrap() {
+                panic!("no chan is ready");
+            }
+        }
+    }
 
-            #[test]
-            fn select_stress() {
-                let c = vec![
-                    channel::bounded(0),
-                    channel::bounded(0),
-                    channel::bounded(2),
-                    channel::bounded(3),
-                ];
-
-                const N: usize = 10000;
-
-                // There are 4 goroutines that send N values on each of the chans,
-                // + 4 goroutines that receive N values on each of the chans,
-                // + 1 goroutine that sends N values on each of the chans in a single select,
-                // + 1 goroutine that receives N values on each of the chans in a single select.
-                // All these sends, receives and selects interact chaotically at runtime,
-                // but we are careful that this whole construct does not deadlock.
-                crossbeam::scope(|scope| {
-                    for k in 0..4 {
-                        {
-                            let c = c.clone();
-                            let k = k;
-                            scope.spawn(move || {
-                                for _ in 0..N {
-                                    c[k].0.send(0);
-                                }
-                            });
-                        }
-                        {
-                            let c = c.clone();
-                            let k = k;
-                            scope.spawn(move || {
-                                for _ in 0..N {
-                                    c[k].1.recv();
-                                }
-                            });
-                        }
-                    }
+    #[test]
+    fn test_nonblock_select_race2() {
+        const N: usize = 1000;
+
+        let done = make::<bool>(1);
+        for _ in 0..N {
+            let c1 = make::<i32>(1);
+            let c2 = make::<i32>(0);
+            c1.send(1);
 
-                    {
-                        let mut s = c.iter()
-                            .map(|(s, _)| Some(s.clone()))
-                            .collect::<Vec<_>>();
-
-                        scope.spawn(move || {
-                            let mut n = [0i32; 4];
-                            for _ in 0..4 * N {
-                                let i;
-                                select! {
-                                    send(s[3].iter().map(|x| &**x), 0) => i = 3,
-                                    send(s[2].iter().map(|x| &**x), 0) => i = 2,
-                                    send(s[0].iter().map(|x| &**x), 0) => i = 0,
-                                    send(s[1].iter().map(|x| &**x), 0) => i = 1,
-                                }
-                                n[i] += 1;
-                                assert!(n[i] <= N as i32);
-                                if n[i] == N as i32 {
-                                    s[i] = None;
-                                }
-                            }
-                        });
+            go!(c1, c2, done, {
+                select! {
+                    recv(c1.rx()) -> _ => {}
+                    recv(c2.rx()) -> _ => {}
+                    default => {
+                        done.send(false);
+                        return;
                     }
+                }
+                done.send(true);
+            });
+
+            c2.close();
+            select! {
+                recv(c1.rx()) -> _ => {}
+                default => {}
+            }
+            if !done.recv().unwrap() {
+                panic!("no chan is ready");
+            }
+        }
+    }
 
-                    {
-                        let mut r = c.iter()
-                            .map(|(_, r)| Some(r.clone()))
-                            .collect::<Vec<_>>();
-
-                        scope.spawn(move || {
-                            let mut n = [0i32; 4];
-                            for _ in 0..4 * N {
-                                let i;
-                                select! {
-                                    recv(r[0].iter().map(|x| &**x)) => i = 0,
-                                    recv(r[1].iter().map(|x| &**x)) => i = 1,
-                                    recv(r[2].iter().map(|x| &**x)) => i = 2,
-                                    recv(r[3].iter().map(|x| &**x)) => i = 3,
+    #[test]
+    fn test_self_select() {
+        // Ensure that send/recv on the same chan in select
+        // does not crash nor deadlock.
+
+        for &cap in &[0, 10] {
+            let wg = WaitGroup::new();
+            wg.add(2);
+            let c = make::<i32>(cap);
+
+            for p in 0..2 {
+                let p = p;
+                go!(wg, p, c, {
+                    defer! { wg.done() }
+                    for i in 0..1000 {
+                        if p == 0 || i % 2 == 0 {
+                            select! {
+                                send(c.tx(), p) -> _ => {}
+                                recv(c.rx()) -> v => {
+                                    if cap == 0 && v.ok() == Some(p) {
+                                        panic!("self receive");
+                                    }
                                 }
-                                n[i] += 1;
-                                assert!(n[i] <= N as i32);
-                                if n[i] == N as i32 {
-                                    r[i] = None;
+                            }
+                        } else {
+                            select! {
+                                recv(c.rx()) -> v => {
+                                    if cap == 0 && v.ok() == Some(p) {
+                                        panic!("self receive");
+                                    }
                                 }
+                                send(c.tx(), p) -> _ => {}
                             }
-                        });
+                        }
                     }
                 });
             }
+            wg.wait();
+        }
+    }
 
-            #[test]
-            fn select_fairness() {
-                const TRIALS: usize = 10000;
-
-                let (s1, r1) = channel::bounded::<u8>(TRIALS + 1);
-                let (s2, r2) = channel::bounded::<u8>(TRIALS + 1);
-
-                for _ in 0..TRIALS + 1 {
-                    s1.send(1);
-                    s2.send(2);
-                }
-
-                let (_s3, r3) = channel::bounded::<u8>(TRIALS + 1);
-                let (_s4, r4) = channel::bounded::<u8>(TRIALS + 1);
-                let (out_s, out_r) = channel::bounded::<u8>(TRIALS + 1);
-                let (done_s, done_r) = channel::bounded::<u8>(TRIALS + 1);
-
-                crossbeam::scope(|scope| {
-                    scope.spawn(|| {
-                        loop {
-                            let b = select! {
-                                recv(r3, m) => m,
-                                recv(r4, m) => m,
-                                recv(r1, m) => m,
-                                recv(r2, m) => m,
-                            }.unwrap();
+    #[test]
+    fn test_select_stress() {
+        let c = vec![
+            make::<i32>(0),
+            make::<i32>(0),
+            make::<i32>(2),
+            make::<i32>(3),
+        ];
+
+        const N: usize = 10000;
+
+        // There are 4 goroutines that send N values on each of the chans,
+        // + 4 goroutines that receive N values on each of the chans,
+        // + 1 goroutine that sends N values on each of the chans in a single select,
+        // + 1 goroutine that receives N values on each of the chans in a single select.
+        // All these sends, receives and selects interact chaotically at runtime,
+        // but we are careful that this whole construct does not deadlock.
+        let wg = WaitGroup::new();
+        wg.add(10);
 
-                            select! {
-                                send(out_s, b) => {}
-                                recv(done_r) => return
-                            }
+        for k in 0..4 {
+            go!(k, c, wg, {
+                for _ in 0..N {
+                    c[k].send(0);
+                }
+                wg.done();
+            });
+            go!(k, c, wg, {
+                for _ in 0..N {
+                    c[k].recv();
+                }
+                wg.done();
+            });
+        }
+
+        go!(c, wg, {
+            let mut n = [0; 4];
+            let mut c1 = c.iter().map(|c| Some(c.rx().clone())).collect::<Vec<_>>();
+
+            for _ in 0..4 * N {
+                let index = {
+                    let mut sel = Select::new();
+                    let mut opers = [!0; 4];
+                    for &i in &[3, 2, 0, 1] {
+                        if let Some(c) = &c1[i] {
+                            opers[i] = sel.recv(c);
+                        }
+                    }
+
+                    let oper = sel.select();
+                    let mut index = !0;
+                    for i in 0..4 {
+                        if opers[i] == oper.index() {
+                            index = i;
+                            let _ = oper.recv(c1[i].as_ref().unwrap());
+                            break;
                         }
-                    });
+                    }
+                    index
+                };
+
+                n[index] += 1;
+                if n[index] == N {
+                    c1[index] = None;
+                }
+            }
+            wg.done();
+        });
 
-                    let (mut cnt1, mut cnt2) = (0, 0);
-                    for _ in 0..TRIALS {
-                        match out_r.recv() {
-                            Some(1) => cnt1 += 1,
-                            Some(2) => cnt2 += 1,
-                            b => panic!("unexpected value {:?} on channel", b),
+        go!(c, wg, {
+            let mut n = [0; 4];
+            let mut c1 = c.iter().map(|c| Some(c.tx().clone())).collect::<Vec<_>>();
+
+            for _ in 0..4 * N {
+                let index = {
+                    let mut sel = Select::new();
+                    let mut opers = [!0; 4];
+                    for &i in &[0, 1, 2, 3] {
+                        if let Some(c) = &c1[i] {
+                            opers[i] = sel.send(c);
                         }
                     }
 
-                    // If the select in the goroutine is fair,
-                    // cnt1 and cnt2 should be about the same value.
-                    // With 10,000 trials, the expected margin of error at
-                    // a confidence level of five nines is 4.4172 / (2 * Sqrt(10000)).
-
-                    let r = cnt1 as f64 / TRIALS as f64;
-                    let e = (r - 0.5).abs();
-
-                    if e > 4.4172 / (2.0 * (TRIALS as f64).sqrt()) {
-                        panic!(
-                            "unfair select: in {} trials, results were {}, {}",
-                            TRIALS,
-                            cnt1,
-                            cnt2,
-                        );
+                    let oper = sel.select();
+                    let mut index = !0;
+                    for i in 0..4 {
+                        if opers[i] == oper.index() {
+                            index = i;
+                            let _ = oper.send(c1[i].as_ref().unwrap(), 0);
+                            break;
+                        }
                     }
+                    index
+                };
 
-                    drop(done_s);
-                });
+                n[index] += 1;
+                if n[index] == N {
+                    c1[index] = None;
+                }
             }
+            wg.done();
+        });
 
-            #[test]
-            fn chan_send_interface() {
-                struct Mt;
+        wg.wait();
+    }
 
-                let (s, _r) = channel::bounded::<Box<Any>>(1);
-                s.send(Box::new(Mt));
+    #[test]
+    fn test_select_fairness() {
+        const TRIALS: usize = 10000;
+
+        let c1 = make::<u8>(TRIALS + 1);
+        let c2 = make::<u8>(TRIALS + 1);
+
+        for _ in 0..TRIALS + 1 {
+            c1.send(1);
+            c2.send(2);
+        }
 
+        let c3 = make::<u8>(0);
+        let c4 = make::<u8>(0);
+        let out = make::<u8>(0);
+        let done = make::<u8>(0);
+        let wg = WaitGroup::new();
+
+        wg.add(1);
+        go!(wg, c1, c2, c3, c4, out, done, {
+            defer! { wg.done() };
+            loop {
+                let b;
                 select! {
-                    send(s, Box::new(Mt)) => {}
-                    default => {}
+                    recv(c3.rx()) -> m => b = m.unwrap(),
+                    recv(c4.rx()) -> m => b = m.unwrap(),
+                    recv(c1.rx()) -> m => b = m.unwrap(),
+                    recv(c2.rx()) -> m => b = m.unwrap(),
                 }
-
                 select! {
-                    send(s, Box::new(Mt)) => {}
-                    send(s, Box::new(Mt)) => {}
-                    default => {}
+                    send(out.tx(), b) -> _ => {}
+                    recv(done.rx()) -> _ => return,
                 }
             }
+        });
 
-            #[test]
-            fn pseudo_random_send() {
-                const N: usize = 100;
-
-                for cap in 0..N {
-                    let (s, r) = channel::bounded::<i32>(cap);
-                    let l = Mutex::new(vec![0i32; N]);
-
-                    crossbeam::scope(|scope| {
-                        scope.spawn(|| {
-                            let mut l = l.lock();
-                            for i in 0..N {
-                                thread::yield_now();
-                                l[i] = r.recv().unwrap();
-                            }
-                        });
+        let (mut cnt1, mut cnt2) = (0, 0);
+        for _ in 0..TRIALS {
+            match out.recv() {
+                Some(1) => cnt1 += 1,
+                Some(2) => cnt2 += 1,
+                b => panic!("unexpected value {:?} on channel", b),
+            }
+        }
 
-                        for _ in 0..N {
-                            select! {
-                                send(s, 1) => {}
-                                send(s, 0) => {}
-                            }
-                        }
+        // If the select in the goroutine is fair,
+        // cnt1 and cnt2 should be about the same value.
+        // With 10,000 trials, the expected margin of error at
+        // a confidence level of five nines is 4.4172 / (2 * Sqrt(10000)).
+
+        let r = cnt1 as f64 / TRIALS as f64;
+        let e = (r - 0.5).abs();
+
+        if e > 4.4172 / (2.0 * (TRIALS as f64).sqrt()) {
+            panic!(
+                "unfair select: in {} trials, results were {}, {}",
+                TRIALS, cnt1, cnt2,
+            );
+        }
 
-                        let l = l.lock();
-                        let mut n0 = 0;
-                        let mut n1 = 0;
-                        for &i in l.iter() {
-                            n0 += (i + 1) % 2;
-                            n1 += i;
-                        }
+        done.close();
+        wg.wait();
+    }
 
-                        if n0 <= N as i32 / 10 || n1 <= N as i32 / 10 {
-                            panic!(
-                                "Want pseudorandom, got {} zeros and {} ones (chan cap {})",
-                                n0,
-                                n1,
-                                cap,
-                            );
-                        }
-                    });
-                }
-            }
+    #[test]
+    fn test_chan_send_interface() {
+        struct Mt;
+
+        let c = make::<Box<Any>>(1);
+        c.send(Box::new(Mt));
+
+        select! {
+            send(c.tx(), Box::new(Mt)) -> _ => {}
+            default => {}
+        }
 
-            #[test]
-            fn multi_consumer() {
-                const NWORK: usize = 23;
-                const NITER: usize = 271828;
-
-                let pn = [2, 3, 7, 11, 13, 17, 19, 23, 27, 31];
-
-                let (q_s, q_r) = channel::bounded::<i32>(NWORK * 3);
-                let (r_s, r_r) = channel::bounded::<i32>(NWORK * 3);
-
-                let expect = AtomicUsize::new(0);
-
-                crossbeam::scope(|scope| {
-                    // workers
-                    for i in 0..NWORK {
-                        let w = i;
-                        let q_r = &q_r;
-                        let pn = &pn;
-                        let r_s = r_s.clone();
-                        scope.spawn(move || {
-                            for v in &q_r.0 {
-                                // mess with the fifo-ish nature of range
-                                if pn[w % pn.len()] == v {
-                                    thread::yield_now();
-                                }
-                                r_s.send(v);
-                            }
-                        });
-                    }
+        select! {
+            send(c.tx(), Box::new(Mt)) -> _ => {}
+            send(c.tx(), Box::new(Mt)) -> _ => {}
+            default => {}
+        }
+    }
 
-                    // feeder & closer
-                    scope.spawn(|| {
-                        for i in 0..NITER {
-                            let v = pn[i % pn.len()];
-                            expect.fetch_add(v as usize, Ordering::SeqCst);
-                            q_s.send(v);
-                        }
+    #[test]
+    fn test_pseudo_random_send() {
+        const N: usize = 100;
+
+        for cap in 0..N {
+            let c = make::<i32>(cap);
+            let l = Arc::new(Mutex::new(vec![0i32; N]));
+            let done = make::<bool>(0);
 
-                        drop(q_s);
-                        drop(r_s);
-                    });
-
-                    // consume & check
-                    let mut n = 0;
-                    let mut s = 0;
-                    for v in &r_r.0 {
-                        n += 1;
-                        s += v;
-                    }
-                    if n != NITER || s != expect.load(Ordering::SeqCst) as i32 {
-                        panic!(
-                            "Expected sum {} (got {}) from {} iter (saw {})",
-                            expect.load(Ordering::SeqCst),
-                            s,
-                            NITER,
-                            n,
-                        );
-                    }
-                });
+            go!(c, done, l, {
+                let mut l = l.lock().unwrap();
+                for i in 0..N {
+                    thread::yield_now();
+                    l[i] = c.recv().unwrap();
+                }
+                done.send(true);
+            });
+
+            for _ in 0..N {
+                select! {
+                    send(c.tx(), 1) -> _ => {}
+                    send(c.tx(), 0) -> _ => {}
+                }
             }
+            done.recv();
 
-            #[test]
-            fn select_duplicate_channel() {
-                // This test makes sure we can queue a G on
-                // the same channel multiple times.
-                let (c_s, c_r) = channel::bounded::<i32>(0);
-                let (d_s, d_r) = channel::bounded::<i32>(0);
-                let (e_s, e_r) = channel::bounded::<i32>(0);
-
-                crossbeam::scope(|scope| {
-                    scope.spawn(|| {
-                        select! {
-                            recv(c_r) => {}
-                            recv(c_r) => {}
-                            recv(d_r) => {}
-                        }
-                        e_s.send(9);
-                    });
-                    thread::sleep(ms(1));
-
-                    scope.spawn(|| {
-                        c_r.recv();
-                    });
-                    thread::sleep(ms(1));
-
-                    d_s.send(7);
-                    e_r.recv();
-                    c_s.send(8);
-                });
+            let mut n0 = 0;
+            let mut n1 = 0;
+            for &i in l.lock().unwrap().iter() {
+                n0 += (i + 1) % 2;
+                n1 += i;
             }
-        }
 
-        // https://github.com/golang/go/blob/master/test/closedchan.go
-        mod closedchan {
-            // TODO
+            if n0 <= N as i32 / 10 || n1 <= N as i32 / 10 {
+                panic!(
+                    "Want pseudorandom, got {} zeros and {} ones (chan cap {})",
+                    n0, n1, cap,
+                );
+            }
         }
+    }
 
-        // https://github.com/golang/go/blob/master/src/runtime/chanbarrier_test.go
-        mod chanbarrier_test {
-            // TODO
+    #[test]
+    fn test_multi_consumer() {
+        const NWORK: usize = 23;
+        const NITER: usize = 271828;
+
+        let pn = [2, 3, 7, 11, 13, 17, 19, 23, 27, 31];
+
+        let q = make::<i32>(NWORK * 3);
+        let r = make::<i32>(NWORK * 3);
+
+        let wg = WaitGroup::new();
+        for i in 0..NWORK {
+            wg.add(1);
+            let w = i;
+            go!(q, r, wg, pn, {
+                for v in &q {
+                    if pn[w % pn.len()] == v {
+                        thread::yield_now();
+                    }
+                    r.send(v);
+                }
+                wg.done();
+            });
         }
 
-        // https://github.com/golang/go/blob/master/src/runtime/race/testdata/chan_test.go
-        mod race_chan_test {
-            // TODO
+        let expect = Arc::new(Mutex::new(0));
+        go!(q, r, expect, wg, pn, {
+            for i in 0..NITER {
+                let v = pn[i % pn.len()];
+                *expect.lock().unwrap() += v;
+                q.send(v);
+            }
+            q.close();
+            wg.wait();
+            r.close();
+        });
+
+        let mut n = 0;
+        let mut s = 0;
+        for v in &r {
+            n += 1;
+            s += v;
         }
 
-        // https://github.com/golang/go/blob/master/test/ken/chan.go
-        mod chan {
-            // TODO
+        if n != NITER || s != *expect.lock().unwrap() {
+            panic!();
         }
+    }
 
-        // https://github.com/golang/go/blob/master/test/ken/chan1.go
-        mod chan1 {
-            // TODO
-        }
+    #[test]
+    fn test_select_duplicate_channel() {
+        // This test makes sure we can queue a G on
+        // the same channel multiple times.
+        let c = make::<i32>(0);
+        let d = make::<i32>(0);
+        let e = make::<i32>(0);
+
+        go!(c, d, e, {
+            select! {
+                recv(c.rx()) -> _ => {}
+                recv(d.rx()) -> _ => {}
+                recv(e.rx()) -> _ => {}
+            }
+            e.send(9);
+        });
+        thread::sleep(ms(1));
+
+        go!(c, c.recv());
+        thread::sleep(ms(1));
+
+        d.send(7);
+        e.recv();
+        c.send(8);
     }
 }
 
-mod normal {
-    tests!(wrappers::normal);
+// https://github.com/golang/go/blob/master/test/closedchan.go
+mod closedchan {
+    // TODO
 }
 
-mod cloned {
-    tests!(wrappers::cloned);
+// https://github.com/golang/go/blob/master/src/runtime/chanbarrier_test.go
+mod chanbarrier_test {
+    // TODO
 }
 
-mod select {
-    tests!(wrappers::select);
+// https://github.com/golang/go/blob/master/src/runtime/race/testdata/chan_test.go
+mod race_chan_test {
+    // TODO
 }
 
-mod select_spin {
-    tests!(wrappers::select_spin);
+// https://github.com/golang/go/blob/master/test/ken/chan.go
+mod chan {
+    // TODO
 }
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+// https://github.com/golang/go/blob/master/test/ken/chan1.go
+mod chan1 {
+    // TODO
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/iter.rs cargo-0.33.0/vendor/crossbeam-channel/tests/iter.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/iter.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/iter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,63 +1,93 @@
 //! Tests for iteration over receivers.
 
-extern crate crossbeam;
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
+
+use crossbeam_channel::unbounded;
+use crossbeam_utils::thread::scope;
 
 #[test]
 fn nested_recv_iter() {
-    let (s, r) = channel::unbounded::<i32>();
-    let (total_s, total_r) = channel::unbounded::<i32>();
+    let (s, r) = unbounded::<i32>();
+    let (total_s, total_r) = unbounded::<i32>();
 
-    crossbeam::scope(|scope| {
-        scope.spawn(move || {
+    scope(|scope| {
+        scope.spawn(move |_| {
             let mut acc = 0;
-            for x in &r {
+            for x in r.iter() {
                 acc += x;
             }
-            total_s.send(acc);
+            total_s.send(acc).unwrap();
         });
 
-        s.send(3);
-        s.send(1);
-        s.send(2);
+        s.send(3).unwrap();
+        s.send(1).unwrap();
+        s.send(2).unwrap();
         drop(s);
         assert_eq!(total_r.recv().unwrap(), 6);
-    });
+    }).unwrap();
 }
 
 #[test]
 fn recv_iter_break() {
-    let (s, r) = channel::unbounded::<i32>();
-    let (count_s, count_r) = channel::unbounded();
+    let (s, r) = unbounded::<i32>();
+    let (count_s, count_r) = unbounded();
 
-    crossbeam::scope(|scope| {
-        scope.spawn(move || {
+    scope(|scope| {
+        scope.spawn(move |_| {
             let mut count = 0;
-            for x in &r {
+            for x in r.iter() {
                 if count >= 3 {
                     break;
                 } else {
                     count += x;
                 }
             }
-            count_s.send(count);
+            count_s.send(count).unwrap();
         });
 
-        s.send(2);
-        s.send(2);
-        s.send(2);
+        s.send(2).unwrap();
+        s.send(2).unwrap();
+        s.send(2).unwrap();
         let _ = s.send(2);
         drop(s);
         assert_eq!(count_r.recv().unwrap(), 4);
-    })
+    }).unwrap();
+}
+
+#[test]
+fn recv_try_iter() {
+    let (request_s, request_r) = unbounded();
+    let (response_s, response_r) = unbounded();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut count = 0;
+            loop {
+                for x in response_r.try_iter() {
+                    count += x;
+                    if count == 6 {
+                        return;
+                    }
+                }
+                request_s.send(()).unwrap();
+            }
+        });
+
+        for _ in request_r.iter() {
+            if response_s.send(2).is_err() {
+                break;
+            }
+        }
+    }).unwrap();
 }
 
 #[test]
 fn recv_into_iter_owned() {
     let mut iter = {
-        let (s, r) = channel::unbounded::<i32>();
-        s.send(1);
-        s.send(2);
+        let (s, r) = unbounded::<i32>();
+        s.send(1).unwrap();
+        s.send(2).unwrap();
         r.into_iter()
     };
 
@@ -68,9 +98,9 @@
 
 #[test]
 fn recv_into_iter_borrowed() {
-    let (s, r) = channel::unbounded::<i32>();
-    s.send(1);
-    s.send(2);
+    let (s, r) = unbounded::<i32>();
+    s.send(1).unwrap();
+    s.send(2).unwrap();
     drop(s);
 
     let mut iter = (&r).into_iter();
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/list.rs cargo-0.33.0/vendor/crossbeam-channel/tests/list.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/list.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/list.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,430 +1,488 @@
 //! Tests for the list channel flavor.
 
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 extern crate rand;
 
-mod wrappers;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::thread;
+use std::time::Duration;
+
+use crossbeam_channel::unbounded;
+use crossbeam_channel::{RecvError, RecvTimeoutError, TryRecvError};
+use crossbeam_channel::{SendError, SendTimeoutError, TrySendError};
+use crossbeam_utils::thread::scope;
+use rand::{thread_rng, Rng};
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::sync::atomic::AtomicUsize;
-        use std::sync::atomic::Ordering;
-        use std::thread;
-        use std::time::Duration;
-
-        use $channel as channel;
-        use crossbeam;
-        use rand::{thread_rng, Rng};
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
 
-        fn ms(ms: u64) -> Duration {
-            Duration::from_millis(ms)
-        }
+#[test]
+fn smoke() {
+    let (s, r) = unbounded();
+    s.try_send(7).unwrap();
+    assert_eq!(r.try_recv(), Ok(7));
 
-        #[test]
-        fn smoke() {
-            let (s, r) = channel::unbounded();
-            s.send(7);
-            assert_eq!(r.try_recv(), Some(7));
-
-            s.send(8);
-            assert_eq!(r.recv(), Some(8));
-
-            assert_eq!(r.try_recv(), None);
-            select! {
-                recv(r) => panic!(),
-                recv(channel::after(ms(1000))) => {}
-            }
+    s.send(8).unwrap();
+    assert_eq!(r.recv(), Ok(8));
 
-            assert_eq!(s.capacity(), None);
-            assert_eq!(r.capacity(), None);
-        }
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+    assert_eq!(r.recv_timeout(ms(1000)), Err(RecvTimeoutError::Timeout));
+}
 
-        #[test]
-        fn capacity() {
-            let (s, r) = channel::unbounded::<()>();
-            assert_eq!(s.capacity(), None);
-            assert_eq!(r.capacity(), None);
-        }
+#[test]
+fn capacity() {
+    let (s, r) = unbounded::<()>();
+    assert_eq!(s.capacity(), None);
+    assert_eq!(r.capacity(), None);
+}
 
-        #[test]
-        fn len_empty_full() {
-            let (s, r) = channel::unbounded();
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(s.is_empty(), true);
-            assert_eq!(s.is_full(), false);
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
-
-            s.send(());
-
-            assert_eq!(s.len(), 1);
-            assert_eq!(s.is_empty(), false);
-            assert_eq!(s.is_full(), false);
-            assert_eq!(r.len(), 1);
-            assert_eq!(r.is_empty(), false);
-            assert_eq!(r.is_full(), false);
-
-            r.recv().unwrap();
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(s.is_empty(), true);
-            assert_eq!(s.is_full(), false);
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
-        }
+#[test]
+fn len_empty_full() {
+    let (s, r) = unbounded();
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(s.is_empty(), true);
+    assert_eq!(s.is_full(), false);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
+
+    s.send(()).unwrap();
+
+    assert_eq!(s.len(), 1);
+    assert_eq!(s.is_empty(), false);
+    assert_eq!(s.is_full(), false);
+    assert_eq!(r.len(), 1);
+    assert_eq!(r.is_empty(), false);
+    assert_eq!(r.is_full(), false);
+
+    r.recv().unwrap();
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(s.is_empty(), true);
+    assert_eq!(s.is_full(), false);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
+}
 
-        #[test]
-        fn recv() {
-            let (s, r) = channel::unbounded();
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.recv(), Some(7));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(8));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(9));
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    s.send(7);
-                    s.send(8);
-                    s.send(9);
-                });
-            });
-        }
+#[test]
+fn try_recv() {
+    let (s, r) = unbounded();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+            thread::sleep(ms(1500));
+            assert_eq!(r.try_recv(), Ok(7));
+            thread::sleep(ms(500));
+            assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            s.send(7).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn recv_timeout() {
-            let (s, r) = channel::unbounded::<i32>();
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        recv(r) => panic!(),
-                        recv(channel::after(ms(1000))) => {}
-                    }
-                    select! {
-                        recv(r, v) => assert_eq!(v, Some(7)),
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                    select! {
-                        recv(r, v) => assert_eq!(v, None),
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    s.send(7);
-                });
-            });
-        }
+#[test]
+fn recv() {
+    let (s, r) = unbounded();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv(), Ok(7));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(8));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(9));
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            s.send(7).unwrap();
+            s.send(8).unwrap();
+            s.send(9).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn try_recv() {
-            let (s, r) = channel::unbounded();
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.try_recv(), None);
-                    thread::sleep(ms(1500));
-                    assert_eq!(r.try_recv(), Some(7));
-                    thread::sleep(ms(500));
-                    assert_eq!(r.try_recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    s.send(7);
-                });
-            });
-        }
+#[test]
+fn recv_timeout() {
+    let (s, r) = unbounded::<i32>();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv_timeout(ms(1000)), Err(RecvTimeoutError::Timeout));
+            assert_eq!(r.recv_timeout(ms(1000)), Ok(7));
+            assert_eq!(
+                r.recv_timeout(ms(1000)),
+                Err(RecvTimeoutError::Disconnected)
+            );
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            s.send(7).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn recv_after_close() {
-            let (s, r) = channel::unbounded();
-
-            s.send(1);
-            s.send(2);
-            s.send(3);
+#[test]
+fn try_send() {
+    let (s, r) = unbounded();
+    for i in 0..1000 {
+        assert_eq!(s.try_send(i), Ok(()));
+    }
 
-            drop(s);
+    drop(r);
+    assert_eq!(s.try_send(777), Err(TrySendError::Disconnected(777)));
+}
 
-            assert_eq!(r.recv(), Some(1));
-            assert_eq!(r.recv(), Some(2));
-            assert_eq!(r.recv(), Some(3));
-            assert_eq!(r.recv(), None);
-        }
+#[test]
+fn send() {
+    let (s, r) = unbounded();
+    for i in 0..1000 {
+        assert_eq!(s.send(i), Ok(()));
+    }
 
-        #[test]
-        fn len() {
-            let (s, r) = channel::unbounded();
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
-
-            for i in 0..50 {
-                s.send(i);
-                assert_eq!(s.len(), i + 1);
-            }
+    drop(r);
+    assert_eq!(s.send(777), Err(SendError(777)));
+}
 
-            for i in 0..50 {
-                r.recv().unwrap();
-                assert_eq!(r.len(), 50 - i - 1);
-            }
+#[test]
+fn send_timeout() {
+    let (s, r) = unbounded();
+    for i in 0..1000 {
+        assert_eq!(s.send_timeout(i, ms(i as u64)), Ok(()));
+    }
+
+    drop(r);
+    assert_eq!(
+        s.send_timeout(777, ms(0)),
+        Err(SendTimeoutError::Disconnected(777))
+    );
+}
 
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
-        }
+#[test]
+fn send_after_disconnect() {
+    let (s, r) = unbounded();
+
+    s.send(1).unwrap();
+    s.send(2).unwrap();
+    s.send(3).unwrap();
+
+    drop(r);
+
+    assert_eq!(s.send(4), Err(SendError(4)));
+    assert_eq!(s.try_send(5), Err(TrySendError::Disconnected(5)));
+    assert_eq!(
+        s.send_timeout(6, ms(0)),
+        Err(SendTimeoutError::Disconnected(6))
+    );
+}
 
-        #[test]
-        fn close_wakes_receiver() {
-            let (s, r) = channel::unbounded::<()>();
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    drop(s);
-                });
-            });
-        }
+#[test]
+fn recv_after_disconnect() {
+    let (s, r) = unbounded();
+
+    s.send(1).unwrap();
+    s.send(2).unwrap();
+    s.send(3).unwrap();
+
+    drop(s);
+
+    assert_eq!(r.recv(), Ok(1));
+    assert_eq!(r.recv(), Ok(2));
+    assert_eq!(r.recv(), Ok(3));
+    assert_eq!(r.recv(), Err(RecvError));
+}
 
-        #[test]
-        fn spsc() {
-            const COUNT: usize = 100_000;
-
-            let (s, r) = channel::unbounded();
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    for i in 0..COUNT {
-                        assert_eq!(r.recv(), Some(i));
-                    }
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    for i in 0..COUNT {
-                        s.send(i);
-                    }
-                });
-            });
-        }
+#[test]
+fn len() {
+    let (s, r) = unbounded();
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
+
+    for i in 0..50 {
+        s.send(i).unwrap();
+        assert_eq!(s.len(), i + 1);
+    }
+
+    for i in 0..50 {
+        r.recv().unwrap();
+        assert_eq!(r.len(), 50 - i - 1);
+    }
 
-        #[test]
-        fn mpmc() {
-            const COUNT: usize = 25_000;
-            const THREADS: usize = 4;
-
-            let (s, r) = channel::unbounded::<usize>();
-            let v = (0..COUNT).map(|_| AtomicUsize::new(0)).collect::<Vec<_>>();
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for _ in 0..COUNT {
-                            let n = r.recv().unwrap();
-                            v[n].fetch_add(1, Ordering::SeqCst);
-                        }
-                    });
-                }
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for i in 0..COUNT {
-                            s.send(i);
-                        }
-                    });
-                }
-            });
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
+}
 
-            assert_eq!(r.try_recv(), None);
+#[test]
+fn disconnect_wakes_receiver() {
+    let (s, r) = unbounded::<()>();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(s);
+        });
+    }).unwrap();
+}
 
-            for c in v {
-                assert_eq!(c.load(Ordering::SeqCst), THREADS);
+#[test]
+fn spsc() {
+    const COUNT: usize = 100_000;
+
+    let (s, r) = unbounded();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            for i in 0..COUNT {
+                assert_eq!(r.recv(), Ok(i));
+            }
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            for i in 0..COUNT {
+                s.send(i).unwrap();
             }
-        }
-
-        #[test]
-        fn stress_timeout_two_threads() {
-            const COUNT: usize = 100;
-
-            let (s, r) = channel::unbounded();
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        if i % 2 == 0 {
-                            thread::sleep(ms(50));
-                        }
-                        s.send(i);
-                    }
-                });
+        });
+    }).unwrap();
+}
 
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        if i % 2 == 0 {
-                            thread::sleep(ms(50));
-                        }
-                        loop {
-                            select! {
-                                recv(r, v) => {
-                                    assert_eq!(v, Some(i));
-                                    break;
-                                }
-                                recv(channel::after(ms(10))) => {}
-                            }
-                        }
-                    }
-                });
+#[test]
+fn mpmc() {
+    const COUNT: usize = 25_000;
+    const THREADS: usize = 4;
+
+    let (s, r) = unbounded::<usize>();
+    let v = (0..COUNT).map(|_| AtomicUsize::new(0)).collect::<Vec<_>>();
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    let n = r.recv().unwrap();
+                    v[n].fetch_add(1, Ordering::SeqCst);
+                }
             });
         }
-
-        #[test]
-        fn drops() {
-            static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-            #[derive(Debug, PartialEq)]
-            struct DropCounter;
-
-            impl Drop for DropCounter {
-                fn drop(&mut self) {
-                    DROPS.fetch_add(1, Ordering::SeqCst);
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for i in 0..COUNT {
+                    s.send(i).unwrap();
                 }
-            }
+            });
+        }
+    }).unwrap();
 
-            let mut rng = thread_rng();
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 
-            for _ in 0..100 {
-                let steps = rng.gen_range(0, 10_000);
-                let additional = rng.gen_range(0, 1000);
-
-                DROPS.store(0, Ordering::SeqCst);
-                let (s, r) = channel::unbounded::<DropCounter>();
-
-                crossbeam::scope(|scope| {
-                    scope.spawn(|| {
-                        for _ in 0..steps {
-                            r.recv().unwrap();
-                        }
-                    });
-
-                    scope.spawn(|| {
-                        for _ in 0..steps {
-                            s.send(DropCounter);
-                        }
-                    });
-                });
+    for c in v {
+        assert_eq!(c.load(Ordering::SeqCst), THREADS);
+    }
+}
+
+#[test]
+fn stress_oneshot() {
+    const COUNT: usize = 10_000;
+
+    for _ in 0..COUNT {
+        let (s, r) = unbounded();
+
+        scope(|scope| {
+            scope.spawn(|_| r.recv().unwrap());
+            scope.spawn(|_| s.send(0).unwrap());
+        }).unwrap();
+    }
+}
 
-                for _ in 0..additional {
-                    s.send(DropCounter);
+#[test]
+fn stress_iter() {
+    const COUNT: usize = 100_000;
+
+    let (request_s, request_r) = unbounded();
+    let (response_s, response_r) = unbounded();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut count = 0;
+            loop {
+                for x in response_r.try_iter() {
+                    count += x;
+                    if count == COUNT {
+                        return;
+                    }
                 }
+                request_s.send(()).unwrap();
+            }
+        });
 
-                assert_eq!(DROPS.load(Ordering::SeqCst), steps);
-                drop(s);
-                drop(r);
-                assert_eq!(DROPS.load(Ordering::SeqCst), steps + additional);
+        for _ in request_r.iter() {
+            if response_s.send(1).is_err() {
+                break;
             }
         }
+    }).unwrap();
+}
 
-        #[test]
-        fn linearizable() {
-            const COUNT: usize = 25_000;
-            const THREADS: usize = 4;
-
-            let (s, r) = channel::unbounded();
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for _ in 0..COUNT {
-                            s.send(0);
-                            r.try_recv().unwrap();
-                        }
-                    });
+#[test]
+fn stress_timeout_two_threads() {
+    const COUNT: usize = 100;
+
+    let (s, r) = unbounded();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(50));
                 }
-            });
-        }
-
-        #[test]
-        fn fairness() {
-            const COUNT: usize = 10_000;
-
-            let (s1, r1) = channel::unbounded::<()>();
-            let (s2, r2) = channel::unbounded::<()>();
-
-            for _ in 0..COUNT {
-                s1.send(());
-                s2.send(());
+                s.send(i).unwrap();
             }
+        });
 
-            let mut hits = [0usize; 2];
-            for _ in 0..COUNT {
-                select! {
-                    recv(r1) => hits[0] += 1,
-                    recv(r2) => hits[1] += 1,
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(50));
+                }
+                loop {
+                    if let Ok(x) = r.recv_timeout(ms(10)) {
+                        assert_eq!(x, i);
+                        break;
+                    }
                 }
             }
-            assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+        });
+    }).unwrap();
+}
+
+#[test]
+fn drops() {
+    static DROPS: AtomicUsize = AtomicUsize::new(0);
+
+    #[derive(Debug, PartialEq)]
+    struct DropCounter;
+
+    impl Drop for DropCounter {
+        fn drop(&mut self) {
+            DROPS.fetch_add(1, Ordering::SeqCst);
         }
+    }
 
-        #[test]
-        fn fairness_duplicates() {
-            const COUNT: usize = 10_000;
+    let mut rng = thread_rng();
 
-            let (s, r) = channel::unbounded();
+    for _ in 0..100 {
+        let steps = rng.gen_range(0, 10_000);
+        let additional = rng.gen_range(0, 1000);
 
-            for _ in 0..COUNT {
-                s.send(());
-            }
+        DROPS.store(0, Ordering::SeqCst);
+        let (s, r) = unbounded::<DropCounter>();
 
-            let mut hits = [0usize; 5];
-            for _ in 0..COUNT {
-                select! {
-                    recv(r) => hits[0] += 1,
-                    recv(r) => hits[1] += 1,
-                    recv(r) => hits[2] += 1,
-                    recv(r) => hits[3] += 1,
-                    recv(r) => hits[4] += 1,
+        scope(|scope| {
+            scope.spawn(|_| {
+                for _ in 0..steps {
+                    r.recv().unwrap();
                 }
-            }
-            assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-        }
+            });
 
-        #[test]
-        fn recv_in_send() {
-            let (s, r) = channel::unbounded();
-            s.send(());
+            scope.spawn(|_| {
+                for _ in 0..steps {
+                    s.send(DropCounter).unwrap();
+                }
+            });
+        }).unwrap();
 
-            select! {
-                send(s, assert_eq!(r.recv(), Some(()))) => {}
-            }
+        for _ in 0..additional {
+            s.try_send(DropCounter).unwrap();
         }
-    };
-}
 
-mod normal {
-    tests!(wrappers::normal);
+        assert_eq!(DROPS.load(Ordering::SeqCst), steps);
+        drop(s);
+        drop(r);
+        assert_eq!(DROPS.load(Ordering::SeqCst), steps + additional);
+    }
 }
 
-mod cloned {
-    tests!(wrappers::cloned);
+#[test]
+fn linearizable() {
+    const COUNT: usize = 25_000;
+    const THREADS: usize = 4;
+
+    let (s, r) = unbounded();
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    s.send(0).unwrap();
+                    r.try_recv().unwrap();
+                }
+            });
+        }
+    }).unwrap();
 }
 
-mod select {
-    tests!(wrappers::select);
+#[test]
+fn fairness() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = unbounded::<()>();
+
+    for _ in 0..COUNT {
+        s1.send(()).unwrap();
+        s2.send(()).unwrap();
+    }
+
+    let mut hits = [0usize; 2];
+    for _ in 0..COUNT {
+        select! {
+            recv(r1) -> _ => hits[0] += 1,
+            recv(r2) -> _ => hits[1] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
 }
 
-mod select_spin {
-    tests!(wrappers::select_spin);
+#[test]
+fn fairness_duplicates() {
+    const COUNT: usize = 10_000;
+
+    let (s, r) = unbounded();
+
+    for _ in 0..COUNT {
+        s.send(()).unwrap();
+    }
+
+    let mut hits = [0usize; 5];
+    for _ in 0..COUNT {
+        select! {
+            recv(r) -> _ => hits[0] += 1,
+            recv(r) -> _ => hits[1] += 1,
+            recv(r) -> _ => hits[2] += 1,
+            recv(r) -> _ => hits[3] += 1,
+            recv(r) -> _ => hits[4] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
 }
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+#[test]
+fn recv_in_send() {
+    let (s, r) = unbounded();
+    s.send(()).unwrap();
+
+    select! {
+        send(s, assert_eq!(r.recv(), Ok(()))) -> _ => {}
+    }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/mpsc.rs cargo-0.33.0/vendor/crossbeam-channel/tests/mpsc.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/mpsc.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/mpsc.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,1979 +1,1948 @@
-//! Tests borrowed from `std::sync::mpsc`.
+//! Tests copied from `std::sync::mpsc`.
 //!
-//! This is a channel implementation mimicking MPSC channels from the standard library, but the
-//! internals actually use `crossbeam-channel`. There's an auxilliary channel `disconnected`, which
-//! becomes closed once the receiver gets dropped, thus notifying the senders that the MPSC channel
-//! is disconnected.
+//! This is a copy of tests for the `std::sync::mpsc` channels from the standard library, but
+//! modified to work with `crossbeam-channel` instead.
 //!
-//! This channel is then tested against the original tests for MPSC channels.
-//!
-//! Three minor tweaks were needed to make the tests compile:
+//! Minor tweaks were needed to make the tests compile:
 //!
 //! - Replace `box` syntax with `Box::new`.
 //! - Replace all uses of `Select` with `select!`.
-//! - Use type anotation in one test.
+//! - Change the imports.
+//!
+//! Source:
+//!   - https://github.com/rust-lang/rust/tree/master/src/libstd/sync/mpsc
+//!
+//! Copyright & License:
+//!   - Copyright 2013-2014 The Rust Project Developers
+//!   - Apache License, Version 2.0 or MIT license, at your option
+//!   - https://github.com/rust-lang/rust/blob/master/COPYRIGHT
+//!   - https://www.rust-lang.org/en-US/legal.html
 
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel as cc;
 
-mod wrappers;
+use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
+use std::sync::mpsc::{SendError, TrySendError};
+use std::time::Duration;
 
-macro_rules! mpsc_select {
-    (
-        $($name:pat = $rx:ident.$meth:ident() => $code:expr),+
-    ) => ({
-        select! {
-            $(
-                recv(($rx).inner, msg) => {
-                    let $name = match msg {
-                        None => Err(::std::sync::mpsc::RecvError),
-                        Some(msg) => Ok(msg),
-                    };
-                    $code
-                }
-            )+
-        }
-    })
+pub struct Sender<T> {
+    pub inner: cc::Sender<T>,
 }
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::sync::Arc;
-        use std::sync::atomic::{AtomicBool, Ordering};
-        use std::sync::mpsc::{RecvError, RecvTimeoutError, SendError, TryRecvError, TrySendError};
-        use std::time::Duration;
-
-        use $channel as channel;
-
-        pub struct Sender<T> {
-            pub inner: channel::Sender<T>,
-            disconnected: channel::Receiver<()>,
-            is_disconnected: Arc<AtomicBool>,
-        }
-
-        impl<T> Sender<T> {
-            pub fn send(&self, t: T) -> Result<(), SendError<T>> {
-                if self.is_disconnected.load(Ordering::SeqCst) {
-                    Err(SendError(t))
-                } else {
-                    self.inner.send(t);
-                    Ok(())
-                }
-            }
-        }
+impl<T> Sender<T> {
+    pub fn send(&self, t: T) -> Result<(), SendError<T>> {
+        self.inner.send(t).map_err(|cc::SendError(m)| SendError(m))
+    }
+}
 
-        impl<T> Clone for Sender<T> {
-            fn clone(&self) -> Sender<T> {
-                Sender {
-                    inner: self.inner.clone(),
-                    disconnected: self.disconnected.clone(),
-                    is_disconnected: self.is_disconnected.clone(),
-                }
-            }
+impl<T> Clone for Sender<T> {
+    fn clone(&self) -> Sender<T> {
+        Sender {
+            inner: self.inner.clone(),
         }
+    }
+}
 
-        pub struct SyncSender<T> {
-            pub inner: channel::Sender<T>,
-            disconnected: channel::Receiver<()>,
-            is_disconnected: Arc<AtomicBool>,
-        }
+pub struct SyncSender<T> {
+    pub inner: cc::Sender<T>,
+}
 
-        impl<T> SyncSender<T> {
-            pub fn send(&self, t: T) -> Result<(), SendError<T>> {
-                if self.is_disconnected.load(Ordering::SeqCst) {
-                    Err(SendError(t))
-                } else {
-                    select! {
-                        send(self.inner, t) => Ok(()),
-                        default => {
-                            select! {
-                                send(self.inner, t) => Ok(()),
-                                recv(self.disconnected) => Err(SendError(t)),
-                            }
-                        }
-                    }
-                }
-            }
+impl<T> SyncSender<T> {
+    pub fn send(&self, t: T) -> Result<(), SendError<T>> {
+        self.inner.send(t).map_err(|cc::SendError(m)| SendError(m))
+    }
 
-            pub fn try_send(&self, t: T) -> Result<(), TrySendError<T>> {
-                if self.is_disconnected.load(Ordering::SeqCst) {
-                    Err(TrySendError::Disconnected(t))
-                } else {
-                    select! {
-                        send(self.inner, t) => Ok(()),
-                        default => Err(TrySendError::Full(t)),
-                    }
-                }
-            }
-        }
+    pub fn try_send(&self, t: T) -> Result<(), TrySendError<T>> {
+        self.inner.try_send(t).map_err(|err| match err {
+            cc::TrySendError::Full(m) => TrySendError::Full(m),
+            cc::TrySendError::Disconnected(m) => TrySendError::Disconnected(m),
+        })
+    }
+}
 
-        impl<T> Clone for SyncSender<T> {
-            fn clone(&self) -> SyncSender<T> {
-                SyncSender {
-                    inner: self.inner.clone(),
-                    disconnected: self.disconnected.clone(),
-                    is_disconnected: self.is_disconnected.clone(),
-                }
-            }
+impl<T> Clone for SyncSender<T> {
+    fn clone(&self) -> SyncSender<T> {
+        SyncSender {
+            inner: self.inner.clone(),
         }
+    }
+}
 
-        pub struct Receiver<T> {
-            pub inner: channel::Receiver<T>,
-            _disconnected: channel::Sender<()>,
-            is_disconnected: Arc<AtomicBool>,
-        }
+pub struct Receiver<T> {
+    pub inner: cc::Receiver<T>,
+}
 
-        impl<T> Receiver<T> {
-            pub fn try_recv(&self) -> Result<T, TryRecvError> {
-                select! {
-                    recv(self.inner, msg) => match msg {
-                        None => Err(TryRecvError::Disconnected),
-                        Some(msg) => Ok(msg),
-                    }
-                    default => Err(TryRecvError::Empty),
-                }
-            }
+impl<T> Receiver<T> {
+    pub fn try_recv(&self) -> Result<T, TryRecvError> {
+        self.inner.try_recv().map_err(|err| match err {
+            cc::TryRecvError::Empty => TryRecvError::Empty,
+            cc::TryRecvError::Disconnected => TryRecvError::Disconnected,
+        })
+    }
 
-            pub fn recv(&self) -> Result<T, RecvError> {
-                match self.inner.recv() {
-                    None => Err(RecvError),
-                    Some(msg) => Ok(msg),
-                }
-            }
+    pub fn recv(&self) -> Result<T, RecvError> {
+        self.inner.recv().map_err(|_| RecvError)
+    }
 
-            pub fn recv_timeout(&self, timeout: Duration) -> Result<T, RecvTimeoutError> {
-                select! {
-                    recv(self.inner, msg) => match msg {
-                        None => Err(RecvTimeoutError::Disconnected),
-                        Some(msg) => Ok(msg),
-                    }
-                    default => {
-                        select! {
-                            recv(self.inner, msg) => match msg {
-                                None => Err(RecvTimeoutError::Disconnected),
-                                Some(msg) => Ok(msg),
-                            }
-                            recv(channel::after(timeout)) => Err(RecvTimeoutError::Timeout),
-                        }
-                    }
-                }
-            }
+    pub fn recv_timeout(&self, timeout: Duration) -> Result<T, RecvTimeoutError> {
+        self.inner.recv_timeout(timeout).map_err(|err| match err {
+            cc::RecvTimeoutError::Timeout => RecvTimeoutError::Timeout,
+            cc::RecvTimeoutError::Disconnected => RecvTimeoutError::Disconnected,
+        })
+    }
 
-            pub fn iter(&self) -> Iter<T> {
-                Iter { inner: self }
-            }
+    pub fn iter(&self) -> Iter<T> {
+        Iter { inner: self }
+    }
 
-            pub fn try_iter(&self) -> TryIter<T> {
-                TryIter { inner: self }
-            }
-        }
+    pub fn try_iter(&self) -> TryIter<T> {
+        TryIter { inner: self }
+    }
+}
 
-        impl<T> Drop for Receiver<T> {
-            fn drop(&mut self) {
-                self.is_disconnected.store(true, Ordering::SeqCst);
-            }
-        }
+impl<'a, T> IntoIterator for &'a Receiver<T> {
+    type Item = T;
+    type IntoIter = Iter<'a, T>;
+
+    fn into_iter(self) -> Iter<'a, T> {
+        self.iter()
+    }
+}
 
-        impl<'a, T> IntoIterator for &'a Receiver<T> {
-            type Item = T;
-            type IntoIter = Iter<'a, T>;
+impl<T> IntoIterator for Receiver<T> {
+    type Item = T;
+    type IntoIter = IntoIter<T>;
 
-            fn into_iter(self) -> Iter<'a, T> {
-                self.iter()
-            }
-        }
+    fn into_iter(self) -> IntoIter<T> {
+        IntoIter { inner: self }
+    }
+}
 
-        impl<T> IntoIterator for Receiver<T> {
-            type Item = T;
-            type IntoIter = IntoIter<T>;
+pub struct TryIter<'a, T: 'a> {
+    inner: &'a Receiver<T>,
+}
 
-            fn into_iter(self) -> IntoIter<T> {
-                IntoIter { inner: self }
-            }
-        }
+impl<'a, T> Iterator for TryIter<'a, T> {
+    type Item = T;
 
-        pub struct TryIter<'a, T: 'a> {
-            inner: &'a Receiver<T>,
-        }
+    fn next(&mut self) -> Option<T> {
+        self.inner.try_recv().ok()
+    }
+}
 
-        impl<'a, T> Iterator for TryIter<'a, T> {
-            type Item = T;
+pub struct Iter<'a, T: 'a> {
+    inner: &'a Receiver<T>,
+}
 
-            fn next(&mut self) -> Option<T> {
-                self.inner.try_recv().ok()
-            }
-        }
+impl<'a, T> Iterator for Iter<'a, T> {
+    type Item = T;
 
-        pub struct Iter<'a, T: 'a> {
-            inner: &'a Receiver<T>,
-        }
+    fn next(&mut self) -> Option<T> {
+        self.inner.recv().ok()
+    }
+}
 
-        impl<'a, T> Iterator for Iter<'a, T> {
-            type Item = T;
+pub struct IntoIter<T> {
+    inner: Receiver<T>,
+}
 
-            fn next(&mut self) -> Option<T> {
-                self.inner.recv().ok()
-            }
+impl<T> Iterator for IntoIter<T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<T> {
+        self.inner.recv().ok()
+    }
+}
+
+pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
+    let (s, r) = cc::unbounded();
+    let s = Sender { inner: s };
+    let r = Receiver { inner: r };
+    (s, r)
+}
+
+pub fn sync_channel<T>(bound: usize) -> (SyncSender<T>, Receiver<T>) {
+    let (s, r) = cc::bounded(bound);
+    let s = SyncSender { inner: s };
+    let r = Receiver { inner: r };
+    (s, r)
+}
+
+macro_rules! select {
+    (
+        $($name:pat = $rx:ident.$meth:ident() => $code:expr),+
+    ) => ({
+        crossbeam_channel_internal! {
+            $(
+                recv(($rx).inner) -> res => {
+                    let $name = res.map_err(|_| ::std::sync::mpsc::RecvError);
+                    $code
+                }
+            )+
         }
+    })
+}
 
-        pub struct IntoIter<T> {
-            inner: Receiver<T>,
+// Source: https://github.com/rust-lang/rust/blob/master/src/libstd/sync/mpsc/mod.rs
+mod channel_tests {
+    use super::*;
+
+    use std::env;
+    use std::thread;
+    use std::time::{Duration, Instant};
+
+    pub fn stress_factor() -> usize {
+        match env::var("RUST_TEST_STRESS") {
+            Ok(val) => val.parse().unwrap(),
+            Err(..) => 1,
         }
+    }
 
-        impl<T> Iterator for IntoIter<T> {
-            type Item = T;
+    #[test]
+    fn smoke() {
+        let (tx, rx) = channel::<i32>();
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv().unwrap(), 1);
+    }
 
-            fn next(&mut self) -> Option<T> {
-                self.inner.recv().ok()
-            }
-        }
+    #[test]
+    fn drop_full() {
+        let (tx, _rx) = channel::<Box<isize>>();
+        tx.send(Box::new(1)).unwrap();
+    }
 
-        pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
-            let (s1, r1) = channel::unbounded();
-            let (s2, r2) = channel::bounded(1);
-            let is_disconnected = Arc::new(AtomicBool::new(false));
+    #[test]
+    fn drop_full_shared() {
+        let (tx, _rx) = channel::<Box<isize>>();
+        drop(tx.clone());
+        drop(tx.clone());
+        tx.send(Box::new(1)).unwrap();
+    }
 
-            let s = Sender {
-                inner: s1,
-                disconnected: r2,
-                is_disconnected: is_disconnected.clone(),
-            };
-            let r = Receiver {
-                inner: r1,
-                _disconnected: s2,
-                is_disconnected,
-            };
-            (s, r)
-        }
+    #[test]
+    fn smoke_shared() {
+        let (tx, rx) = channel::<i32>();
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv().unwrap(), 1);
+        let tx = tx.clone();
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv().unwrap(), 1);
+    }
 
-        pub fn sync_channel<T>(bound: usize) -> (SyncSender<T>, Receiver<T>) {
-            let (s1, r1) = channel::bounded(bound);
-            let (s2, r2) = channel::bounded(1);
-            let is_disconnected = Arc::new(AtomicBool::new(false));
+    #[test]
+    fn smoke_threads() {
+        let (tx, rx) = channel::<i32>();
+        let _t = thread::spawn(move || {
+            tx.send(1).unwrap();
+        });
+        assert_eq!(rx.recv().unwrap(), 1);
+    }
 
-            let s = SyncSender {
-                inner: s1,
-                disconnected: r2,
-                is_disconnected: is_disconnected.clone(),
-            };
-            let r = Receiver {
-                inner: r1,
-                _disconnected: s2,
-                is_disconnected,
-            };
-            (s, r)
-        }
+    #[test]
+    fn smoke_port_gone() {
+        let (tx, rx) = channel::<i32>();
+        drop(rx);
+        assert!(tx.send(1).is_err());
+    }
 
-        // https://github.com/rust-lang/rust/tree/master/src/libstd/sync/mpsc
-        mod channel_tests {
-            use std::env;
-            use super::*;
-            use std::thread;
-            use std::time::{Duration, Instant};
+    #[test]
+    fn smoke_shared_port_gone() {
+        let (tx, rx) = channel::<i32>();
+        drop(rx);
+        assert!(tx.send(1).is_err())
+    }
 
-            pub fn stress_factor() -> usize {
-                match env::var("RUST_TEST_STRESS") {
-                    Ok(val) => val.parse().unwrap(),
-                    Err(..) => 1,
-                }
-            }
+    #[test]
+    fn smoke_shared_port_gone2() {
+        let (tx, rx) = channel::<i32>();
+        drop(rx);
+        let tx2 = tx.clone();
+        drop(tx);
+        assert!(tx2.send(1).is_err());
+    }
+
+    #[test]
+    fn port_gone_concurrent() {
+        let (tx, rx) = channel::<i32>();
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap();
+        });
+        while tx.send(1).is_ok() {}
+    }
+
+    #[test]
+    fn port_gone_concurrent_shared() {
+        let (tx, rx) = channel::<i32>();
+        let tx2 = tx.clone();
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap();
+        });
+        while tx.send(1).is_ok() && tx2.send(1).is_ok() {}
+    }
 
-            #[test]
-            fn smoke() {
-                let (tx, rx) = channel::<i32>();
+    #[test]
+    fn smoke_chan_gone() {
+        let (tx, rx) = channel::<i32>();
+        drop(tx);
+        assert!(rx.recv().is_err());
+    }
+
+    #[test]
+    fn smoke_chan_gone_shared() {
+        let (tx, rx) = channel::<()>();
+        let tx2 = tx.clone();
+        drop(tx);
+        drop(tx2);
+        assert!(rx.recv().is_err());
+    }
+
+    #[test]
+    fn chan_gone_concurrent() {
+        let (tx, rx) = channel::<i32>();
+        let _t = thread::spawn(move || {
+            tx.send(1).unwrap();
+            tx.send(1).unwrap();
+        });
+        while rx.recv().is_ok() {}
+    }
+
+    #[test]
+    fn stress() {
+        let (tx, rx) = channel::<i32>();
+        let t = thread::spawn(move || {
+            for _ in 0..10000 {
                 tx.send(1).unwrap();
-                assert_eq!(rx.recv().unwrap(), 1);
             }
+        });
+        for _ in 0..10000 {
+            assert_eq!(rx.recv().unwrap(), 1);
+        }
+        t.join().ok().unwrap();
+    }
 
-            #[test]
-            fn drop_full() {
-                let (tx, _rx) = channel::<Box<isize>>();
-                tx.send(Box::new(1)).unwrap();
-            }
-
-            #[test]
-            fn drop_full_shared() {
-                let (tx, _rx) = channel::<Box<isize>>();
-                drop(tx.clone());
-                drop(tx.clone());
-                tx.send(Box::new(1)).unwrap();
-            }
-
-            #[test]
-            fn smoke_shared() {
-                let (tx, rx) = channel::<i32>();
-                tx.send(1).unwrap();
-                assert_eq!(rx.recv().unwrap(), 1);
-                let tx = tx.clone();
-                tx.send(1).unwrap();
+    #[test]
+    fn stress_shared() {
+        const AMT: u32 = 10000;
+        const NTHREADS: u32 = 8;
+        let (tx, rx) = channel::<i32>();
+
+        let t = thread::spawn(move || {
+            for _ in 0..AMT * NTHREADS {
                 assert_eq!(rx.recv().unwrap(), 1);
             }
-
-            #[test]
-            fn smoke_threads() {
-                let (tx, rx) = channel::<i32>();
-                let _t = thread::spawn(move|| {
+            match rx.try_recv() {
+                Ok(..) => panic!(),
+                _ => {}
+            }
+        });
+
+        for _ in 0..NTHREADS {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                for _ in 0..AMT {
                     tx.send(1).unwrap();
-                });
+                }
+            });
+        }
+        drop(tx);
+        t.join().ok().unwrap();
+    }
+
+    #[test]
+    fn send_from_outside_runtime() {
+        let (tx1, rx1) = channel::<()>();
+        let (tx2, rx2) = channel::<i32>();
+        let t1 = thread::spawn(move || {
+            tx1.send(()).unwrap();
+            for _ in 0..40 {
+                assert_eq!(rx2.recv().unwrap(), 1);
+            }
+        });
+        rx1.recv().unwrap();
+        let t2 = thread::spawn(move || {
+            for _ in 0..40 {
+                tx2.send(1).unwrap();
+            }
+        });
+        t1.join().ok().unwrap();
+        t2.join().ok().unwrap();
+    }
+
+    #[test]
+    fn recv_from_outside_runtime() {
+        let (tx, rx) = channel::<i32>();
+        let t = thread::spawn(move || {
+            for _ in 0..40 {
                 assert_eq!(rx.recv().unwrap(), 1);
             }
+        });
+        for _ in 0..40 {
+            tx.send(1).unwrap();
+        }
+        t.join().ok().unwrap();
+    }
 
-            #[test]
-            fn smoke_port_gone() {
-                let (tx, rx) = channel::<i32>();
-                drop(rx);
-                assert!(tx.send(1).is_err());
-            }
+    #[test]
+    fn no_runtime() {
+        let (tx1, rx1) = channel::<i32>();
+        let (tx2, rx2) = channel::<i32>();
+        let t1 = thread::spawn(move || {
+            assert_eq!(rx1.recv().unwrap(), 1);
+            tx2.send(2).unwrap();
+        });
+        let t2 = thread::spawn(move || {
+            tx1.send(1).unwrap();
+            assert_eq!(rx2.recv().unwrap(), 2);
+        });
+        t1.join().ok().unwrap();
+        t2.join().ok().unwrap();
+    }
 
-            #[test]
-            fn smoke_shared_port_gone() {
-                let (tx, rx) = channel::<i32>();
-                drop(rx);
-                assert!(tx.send(1).is_err())
-            }
+    #[test]
+    fn oneshot_single_thread_close_port_first() {
+        // Simple test of closing without sending
+        let (_tx, rx) = channel::<i32>();
+        drop(rx);
+    }
 
-            #[test]
-            fn smoke_shared_port_gone2() {
-                let (tx, rx) = channel::<i32>();
-                drop(rx);
-                let tx2 = tx.clone();
-                drop(tx);
-                assert!(tx2.send(1).is_err());
-            }
+    #[test]
+    fn oneshot_single_thread_close_chan_first() {
+        // Simple test of closing without sending
+        let (tx, _rx) = channel::<i32>();
+        drop(tx);
+    }
 
-            #[test]
-            fn port_gone_concurrent() {
-                let (tx, rx) = channel::<i32>();
-                let _t = thread::spawn(move|| {
-                    rx.recv().unwrap();
-                });
-                while tx.send(1).is_ok() {}
-            }
+    #[test]
+    fn oneshot_single_thread_send_port_close() {
+        // Testing that the sender cleans up the payload if receiver is closed
+        let (tx, rx) = channel::<Box<i32>>();
+        drop(rx);
+        assert!(tx.send(Box::new(0)).is_err());
+    }
 
-            #[test]
-            fn port_gone_concurrent_shared() {
-                let (tx, rx) = channel::<i32>();
-                let tx2 = tx.clone();
-                let _t = thread::spawn(move|| {
-                    rx.recv().unwrap();
-                });
-                while tx.send(1).is_ok() && tx2.send(1).is_ok() {}
-            }
+    #[test]
+    fn oneshot_single_thread_recv_chan_close() {
+        // Receiving on a closed chan will panic
+        let res = thread::spawn(move || {
+            let (tx, rx) = channel::<i32>();
+            drop(tx);
+            rx.recv().unwrap();
+        }).join();
+        // What is our res?
+        assert!(res.is_err());
+    }
 
-            #[test]
-            fn smoke_chan_gone() {
-                let (tx, rx) = channel::<i32>();
-                drop(tx);
-                assert!(rx.recv().is_err());
-            }
+    #[test]
+    fn oneshot_single_thread_send_then_recv() {
+        let (tx, rx) = channel::<Box<i32>>();
+        tx.send(Box::new(10)).unwrap();
+        assert!(*rx.recv().unwrap() == 10);
+    }
 
-            #[test]
-            fn smoke_chan_gone_shared() {
-                let (tx, rx) = channel::<()>();
-                let tx2 = tx.clone();
-                drop(tx);
-                drop(tx2);
-                assert!(rx.recv().is_err());
-            }
+    #[test]
+    fn oneshot_single_thread_try_send_open() {
+        let (tx, rx) = channel::<i32>();
+        assert!(tx.send(10).is_ok());
+        assert!(rx.recv().unwrap() == 10);
+    }
 
-            #[test]
-            fn chan_gone_concurrent() {
-                let (tx, rx) = channel::<i32>();
-                let _t = thread::spawn(move|| {
-                    tx.send(1).unwrap();
-                    tx.send(1).unwrap();
-                });
-                while rx.recv().is_ok() {}
-            }
+    #[test]
+    fn oneshot_single_thread_try_send_closed() {
+        let (tx, rx) = channel::<i32>();
+        drop(rx);
+        assert!(tx.send(10).is_err());
+    }
 
-            #[test]
-            fn stress() {
-                let (tx, rx) = channel::<i32>();
-                let t = thread::spawn(move|| {
-                    for _ in 0..10000 { tx.send(1).unwrap(); }
-                });
-                for _ in 0..10000 {
-                    assert_eq!(rx.recv().unwrap(), 1);
-                }
-                t.join().ok().unwrap();
-            }
+    #[test]
+    fn oneshot_single_thread_try_recv_open() {
+        let (tx, rx) = channel::<i32>();
+        tx.send(10).unwrap();
+        assert!(rx.recv() == Ok(10));
+    }
 
-            #[test]
-            fn stress_shared() {
-                const AMT: u32 = 10000;
-                const NTHREADS: u32 = 8;
-                let (tx, rx) = channel::<i32>();
-
-                let t = thread::spawn(move|| {
-                    for _ in 0..AMT * NTHREADS {
-                        assert_eq!(rx.recv().unwrap(), 1);
-                    }
-                    match rx.try_recv() {
-                        Ok(..) => panic!(),
-                        _ => {}
-                    }
-                });
+    #[test]
+    fn oneshot_single_thread_try_recv_closed() {
+        let (tx, rx) = channel::<i32>();
+        drop(tx);
+        assert!(rx.recv().is_err());
+    }
 
-                for _ in 0..NTHREADS {
-                    let tx = tx.clone();
-                    thread::spawn(move|| {
-                        for _ in 0..AMT { tx.send(1).unwrap(); }
-                    });
-                }
-                drop(tx);
-                t.join().ok().unwrap();
-            }
+    #[test]
+    fn oneshot_single_thread_peek_data() {
+        let (tx, rx) = channel::<i32>();
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
+        tx.send(10).unwrap();
+        assert_eq!(rx.try_recv(), Ok(10));
+    }
 
-            #[test]
-            fn send_from_outside_runtime() {
-                let (tx1, rx1) = channel::<()>();
-                let (tx2, rx2) = channel::<i32>();
-                let t1 = thread::spawn(move|| {
-                    tx1.send(()).unwrap();
-                    for _ in 0..40 {
-                        assert_eq!(rx2.recv().unwrap(), 1);
-                    }
-                });
-                rx1.recv().unwrap();
-                let t2 = thread::spawn(move|| {
-                    for _ in 0..40 {
-                        tx2.send(1).unwrap();
-                    }
-                });
-                t1.join().ok().unwrap();
-                t2.join().ok().unwrap();
-            }
+    #[test]
+    fn oneshot_single_thread_peek_close() {
+        let (tx, rx) = channel::<i32>();
+        drop(tx);
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
+    }
 
-            #[test]
-            fn recv_from_outside_runtime() {
-                let (tx, rx) = channel::<i32>();
-                let t = thread::spawn(move|| {
-                    for _ in 0..40 {
-                        assert_eq!(rx.recv().unwrap(), 1);
-                    }
-                });
-                for _ in 0..40 {
-                    tx.send(1).unwrap();
-                }
-                t.join().ok().unwrap();
-            }
+    #[test]
+    fn oneshot_single_thread_peek_open() {
+        let (_tx, rx) = channel::<i32>();
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
+    }
 
-            #[test]
-            fn no_runtime() {
-                let (tx1, rx1) = channel::<i32>();
-                let (tx2, rx2) = channel::<i32>();
-                let t1 = thread::spawn(move|| {
-                    assert_eq!(rx1.recv().unwrap(), 1);
-                    tx2.send(2).unwrap();
-                });
-                let t2 = thread::spawn(move|| {
-                    tx1.send(1).unwrap();
-                    assert_eq!(rx2.recv().unwrap(), 2);
-                });
-                t1.join().ok().unwrap();
-                t2.join().ok().unwrap();
-            }
+    #[test]
+    fn oneshot_multi_task_recv_then_send() {
+        let (tx, rx) = channel::<Box<i32>>();
+        let _t = thread::spawn(move || {
+            assert!(*rx.recv().unwrap() == 10);
+        });
 
-            #[test]
-            fn oneshot_single_thread_close_port_first() {
-                // Simple test of closing without sending
-                let (_tx, rx) = channel::<i32>();
-                drop(rx);
-            }
+        tx.send(Box::new(10)).unwrap();
+    }
 
-            #[test]
-            fn oneshot_single_thread_close_chan_first() {
-                // Simple test of closing without sending
-                let (tx, _rx) = channel::<i32>();
-                drop(tx);
-            }
+    #[test]
+    fn oneshot_multi_task_recv_then_close() {
+        let (tx, rx) = channel::<Box<i32>>();
+        let _t = thread::spawn(move || {
+            drop(tx);
+        });
+        let res = thread::spawn(move || {
+            assert!(*rx.recv().unwrap() == 10);
+        }).join();
+        assert!(res.is_err());
+    }
 
-            #[test]
-            fn oneshot_single_thread_send_port_close() {
-                // Testing that the sender cleans up the payload if receiver is closed
-                let (tx, rx) = channel::<Box<i32>>();
+    #[test]
+    fn oneshot_multi_thread_close_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = channel::<i32>();
+            let _t = thread::spawn(move || {
                 drop(rx);
-                assert!(tx.send(Box::new(0)).is_err());
-            }
+            });
+            drop(tx);
+        }
+    }
 
-            #[test]
-            fn oneshot_single_thread_recv_chan_close() {
-                // Receiving on a closed chan will panic
-                let res = thread::spawn(move|| {
-                    let (tx, rx) = channel::<i32>();
-                    drop(tx);
+    #[test]
+    fn oneshot_multi_thread_send_close_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = channel::<i32>();
+            let _t = thread::spawn(move || {
+                drop(rx);
+            });
+            let _ = thread::spawn(move || {
+                tx.send(1).unwrap();
+            }).join();
+        }
+    }
+
+    #[test]
+    fn oneshot_multi_thread_recv_close_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = channel::<i32>();
+            thread::spawn(move || {
+                let res = thread::spawn(move || {
                     rx.recv().unwrap();
                 }).join();
-                // What is our res?
                 assert!(res.is_err());
-            }
+            });
+            let _t = thread::spawn(move || {
+                thread::spawn(move || {
+                    drop(tx);
+                });
+            });
+        }
+    }
 
-            #[test]
-            fn oneshot_single_thread_send_then_recv() {
-                let (tx, rx) = channel::<Box<i32>>();
+    #[test]
+    fn oneshot_multi_thread_send_recv_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = channel::<Box<isize>>();
+            let _t = thread::spawn(move || {
                 tx.send(Box::new(10)).unwrap();
-                assert!(*rx.recv().unwrap() == 10);
-            }
+            });
+            assert!(*rx.recv().unwrap() == 10);
+        }
+    }
 
-            #[test]
-            fn oneshot_single_thread_try_send_open() {
-                let (tx, rx) = channel::<i32>();
-                assert!(tx.send(10).is_ok());
-                assert!(rx.recv().unwrap() == 10);
-            }
+    #[test]
+    fn stream_send_recv_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = channel();
+
+            send(tx, 0);
+            recv(rx, 0);
+
+            fn send(tx: Sender<Box<i32>>, i: i32) {
+                if i == 10 {
+                    return;
+                }
 
-            #[test]
-            fn oneshot_single_thread_try_send_closed() {
-                let (tx, rx) = channel::<i32>();
-                drop(rx);
-                assert!(tx.send(10).is_err());
+                thread::spawn(move || {
+                    tx.send(Box::new(i)).unwrap();
+                    send(tx, i + 1);
+                });
             }
 
-            #[test]
-            fn oneshot_single_thread_try_recv_open() {
-                let (tx, rx) = channel::<i32>();
-                tx.send(10).unwrap();
-                assert!(rx.recv() == Ok(10));
-            }
+            fn recv(rx: Receiver<Box<i32>>, i: i32) {
+                if i == 10 {
+                    return;
+                }
 
-            #[test]
-            fn oneshot_single_thread_try_recv_closed() {
-                let (tx, rx) = channel::<i32>();
-                drop(tx);
-                assert!(rx.recv().is_err());
+                thread::spawn(move || {
+                    assert!(*rx.recv().unwrap() == i);
+                    recv(rx, i + 1);
+                });
             }
+        }
+    }
 
-            #[test]
-            fn oneshot_single_thread_peek_data() {
-                let (tx, rx) = channel::<i32>();
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
-                tx.send(10).unwrap();
-                assert_eq!(rx.try_recv(), Ok(10));
-            }
+    #[test]
+    fn oneshot_single_thread_recv_timeout() {
+        let (tx, rx) = channel();
+        tx.send(()).unwrap();
+        assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
+        assert_eq!(
+            rx.recv_timeout(Duration::from_millis(1)),
+            Err(RecvTimeoutError::Timeout)
+        );
+        tx.send(()).unwrap();
+        assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
+    }
 
-            #[test]
-            fn oneshot_single_thread_peek_close() {
-                let (tx, rx) = channel::<i32>();
-                drop(tx);
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
+    #[test]
+    fn stress_recv_timeout_two_threads() {
+        let (tx, rx) = channel();
+        let stress = stress_factor() + 100;
+        let timeout = Duration::from_millis(100);
+
+        thread::spawn(move || {
+            for i in 0..stress {
+                if i % 2 == 0 {
+                    thread::sleep(timeout * 2);
+                }
+                tx.send(1usize).unwrap();
             }
+        });
 
-            #[test]
-            fn oneshot_single_thread_peek_open() {
-                let (_tx, rx) = channel::<i32>();
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
+        let mut recv_count = 0;
+        loop {
+            match rx.recv_timeout(timeout) {
+                Ok(n) => {
+                    assert_eq!(n, 1usize);
+                    recv_count += 1;
+                }
+                Err(RecvTimeoutError::Timeout) => continue,
+                Err(RecvTimeoutError::Disconnected) => break,
             }
+        }
 
-            #[test]
-            fn oneshot_multi_task_recv_then_send() {
-                let (tx, rx) = channel::<Box<i32>>();
-                let _t = thread::spawn(move|| {
-                    assert!(*rx.recv().unwrap() == 10);
-                });
+        assert_eq!(recv_count, stress);
+    }
 
-                tx.send(Box::new(10)).unwrap();
-            }
+    #[test]
+    fn recv_timeout_upgrade() {
+        let (tx, rx) = channel::<()>();
+        let timeout = Duration::from_millis(1);
+        let _tx_clone = tx.clone();
+
+        let start = Instant::now();
+        assert_eq!(rx.recv_timeout(timeout), Err(RecvTimeoutError::Timeout));
+        assert!(Instant::now() >= start + timeout);
+    }
 
-            #[test]
-            fn oneshot_multi_task_recv_then_close() {
-                let (tx, rx) = channel::<Box<i32>>();
-                let _t = thread::spawn(move|| {
-                    drop(tx);
-                });
-                let res = thread::spawn(move|| {
-                    assert!(*rx.recv().unwrap() == 10);
-                }).join();
-                assert!(res.is_err());
-            }
+    #[test]
+    fn stress_recv_timeout_shared() {
+        let (tx, rx) = channel();
+        let stress = stress_factor() + 100;
 
-            #[test]
-            fn oneshot_multi_thread_close_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = channel::<i32>();
-                    let _t = thread::spawn(move|| {
-                        drop(rx);
-                    });
-                    drop(tx);
-                }
-            }
+        for i in 0..stress {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                thread::sleep(Duration::from_millis(i as u64 * 10));
+                tx.send(1usize).unwrap();
+            });
+        }
 
-            #[test]
-            fn oneshot_multi_thread_send_close_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = channel::<i32>();
-                    let _t = thread::spawn(move|| {
-                        drop(rx);
-                    });
-                    let _ = thread::spawn(move|| {
-                        tx.send(1).unwrap();
-                    }).join();
-                }
-            }
+        drop(tx);
 
-            #[test]
-            fn oneshot_multi_thread_recv_close_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = channel::<i32>();
-                    thread::spawn(move|| {
-                        let res = thread::spawn(move|| {
-                            rx.recv().unwrap();
-                        }).join();
-                        assert!(res.is_err());
-                    });
-                    let _t = thread::spawn(move|| {
-                        thread::spawn(move|| {
-                            drop(tx);
-                        });
-                    });
+        let mut recv_count = 0;
+        loop {
+            match rx.recv_timeout(Duration::from_millis(10)) {
+                Ok(n) => {
+                    assert_eq!(n, 1usize);
+                    recv_count += 1;
                 }
+                Err(RecvTimeoutError::Timeout) => continue,
+                Err(RecvTimeoutError::Disconnected) => break,
             }
+        }
 
-            #[test]
-            fn oneshot_multi_thread_send_recv_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = channel::<Box<isize>>();
-                    let _t = thread::spawn(move|| {
-                        tx.send(Box::new(10)).unwrap();
-                    });
-                    assert!(*rx.recv().unwrap() == 10);
-                }
-            }
+        assert_eq!(recv_count, stress);
+    }
 
-            #[test]
-            fn stream_send_recv_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = channel();
-
-                    send(tx, 0);
-                    recv(rx, 0);
-
-                    fn send(tx: Sender<Box<i32>>, i: i32) {
-                        if i == 10 { return }
-
-                        thread::spawn(move|| {
-                            tx.send(Box::new(i)).unwrap();
-                            send(tx, i + 1);
-                        });
-                    }
+    #[test]
+    fn recv_a_lot() {
+        // Regression test that we don't run out of stack in scheduler context
+        let (tx, rx) = channel();
+        for _ in 0..10000 {
+            tx.send(()).unwrap();
+        }
+        for _ in 0..10000 {
+            rx.recv().unwrap();
+        }
+    }
 
-                    fn recv(rx: Receiver<Box<i32>>, i: i32) {
-                        if i == 10 { return }
+    #[test]
+    fn shared_recv_timeout() {
+        let (tx, rx) = channel();
+        let total = 5;
+        for _ in 0..total {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                tx.send(()).unwrap();
+            });
+        }
 
-                        thread::spawn(move|| {
-                            assert!(*rx.recv().unwrap() == i);
-                            recv(rx, i + 1);
-                        });
-                    }
-                }
-            }
+        for _ in 0..total {
+            rx.recv().unwrap();
+        }
 
-            #[test]
-            fn oneshot_single_thread_recv_timeout() {
-                let (tx, rx) = channel();
-                tx.send(()).unwrap();
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Err(RecvTimeoutError::Timeout));
+        assert_eq!(
+            rx.recv_timeout(Duration::from_millis(1)),
+            Err(RecvTimeoutError::Timeout)
+        );
+        tx.send(()).unwrap();
+        assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
+    }
+
+    #[test]
+    fn shared_chan_stress() {
+        let (tx, rx) = channel();
+        let total = stress_factor() + 100;
+        for _ in 0..total {
+            let tx = tx.clone();
+            thread::spawn(move || {
                 tx.send(()).unwrap();
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
-            }
+            });
+        }
 
-            #[test]
-            fn stress_recv_timeout_two_threads() {
-                let (tx, rx) = channel();
-                let stress = stress_factor() + 100;
-                let timeout = Duration::from_millis(100);
+        for _ in 0..total {
+            rx.recv().unwrap();
+        }
+    }
 
-                thread::spawn(move || {
-                    for i in 0..stress {
-                        if i % 2 == 0 {
-                            thread::sleep(timeout * 2);
-                        }
-                        tx.send(1usize).unwrap();
-                    }
-                });
+    #[test]
+    fn test_nested_recv_iter() {
+        let (tx, rx) = channel::<i32>();
+        let (total_tx, total_rx) = channel::<i32>();
+
+        let _t = thread::spawn(move || {
+            let mut acc = 0;
+            for x in rx.iter() {
+                acc += x;
+            }
+            total_tx.send(acc).unwrap();
+        });
+
+        tx.send(3).unwrap();
+        tx.send(1).unwrap();
+        tx.send(2).unwrap();
+        drop(tx);
+        assert_eq!(total_rx.recv().unwrap(), 6);
+    }
 
-                let mut recv_count = 0;
-                loop {
-                    match rx.recv_timeout(timeout) {
-                        Ok(n) => {
-                            assert_eq!(n, 1usize);
-                            recv_count += 1;
-                        }
-                        Err(RecvTimeoutError::Timeout) => continue,
-                        Err(RecvTimeoutError::Disconnected) => break,
-                    }
+    #[test]
+    fn test_recv_iter_break() {
+        let (tx, rx) = channel::<i32>();
+        let (count_tx, count_rx) = channel();
+
+        let _t = thread::spawn(move || {
+            let mut count = 0;
+            for x in rx.iter() {
+                if count >= 3 {
+                    break;
+                } else {
+                    count += x;
                 }
-
-                assert_eq!(recv_count, stress);
             }
+            count_tx.send(count).unwrap();
+        });
 
-            #[test]
-            fn recv_timeout_upgrade() {
-                let (tx, rx) = channel::<()>();
-                let timeout = Duration::from_millis(1);
-                let _tx_clone = tx.clone();
-
-                let start = Instant::now();
-                assert_eq!(rx.recv_timeout(timeout), Err(RecvTimeoutError::Timeout));
-                assert!(Instant::now() >= start + timeout);
-            }
-
-            #[test]
-            fn stress_recv_timeout_shared() {
-                let (tx, rx) = channel();
-                let stress = stress_factor() + 100;
-
-                for i in 0..stress {
-                    let tx = tx.clone();
-                    thread::spawn(move || {
-                        thread::sleep(Duration::from_millis(i as u64 * 10));
-                        tx.send(1usize).unwrap();
-                    });
-                }
+        tx.send(2).unwrap();
+        tx.send(2).unwrap();
+        tx.send(2).unwrap();
+        let _ = tx.send(2);
+        drop(tx);
+        assert_eq!(count_rx.recv().unwrap(), 4);
+    }
 
-                drop(tx);
+    #[test]
+    fn test_recv_try_iter() {
+        let (request_tx, request_rx) = channel();
+        let (response_tx, response_rx) = channel();
 
-                let mut recv_count = 0;
-                loop {
-                    match rx.recv_timeout(Duration::from_millis(10)) {
-                        Ok(n) => {
-                            assert_eq!(n, 1usize);
-                            recv_count += 1;
-                        }
-                        Err(RecvTimeoutError::Timeout) => continue,
-                        Err(RecvTimeoutError::Disconnected) => break,
+        // Request `x`s until we have `6`.
+        let t = thread::spawn(move || {
+            let mut count = 0;
+            loop {
+                for x in response_rx.try_iter() {
+                    count += x;
+                    if count == 6 {
+                        return count;
                     }
                 }
-
-                assert_eq!(recv_count, stress);
+                request_tx.send(()).unwrap();
             }
+        });
 
-            #[test]
-            fn recv_a_lot() {
-                // Regression test that we don't run out of stack in scheduler context
-                let (tx, rx) = channel();
-                for _ in 0..10000 { tx.send(()).unwrap(); }
-                for _ in 0..10000 { rx.recv().unwrap(); }
-            }
-
-            #[test]
-            fn shared_recv_timeout() {
-                let (tx, rx) = channel();
-                let total = 5;
-                for _ in 0..total {
-                    let tx = tx.clone();
-                    thread::spawn(move|| {
-                        tx.send(()).unwrap();
-                    });
-                }
-
-                for _ in 0..total { rx.recv().unwrap(); }
-
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Err(RecvTimeoutError::Timeout));
-                tx.send(()).unwrap();
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
+        for _ in request_rx.iter() {
+            if response_tx.send(2).is_err() {
+                break;
             }
+        }
 
-            #[test]
-            fn shared_chan_stress() {
-                let (tx, rx) = channel();
-                let total = stress_factor() + 100;
-                for _ in 0..total {
-                    let tx = tx.clone();
-                    thread::spawn(move|| {
-                        tx.send(()).unwrap();
-                    });
-                }
+        assert_eq!(t.join().unwrap(), 6);
+    }
 
-                for _ in 0..total {
-                    rx.recv().unwrap();
-                }
-            }
+    #[test]
+    fn test_recv_into_iter_owned() {
+        let mut iter = {
+            let (tx, rx) = channel::<i32>();
+            tx.send(1).unwrap();
+            tx.send(2).unwrap();
+
+            rx.into_iter()
+        };
+        assert_eq!(iter.next().unwrap(), 1);
+        assert_eq!(iter.next().unwrap(), 2);
+        assert_eq!(iter.next().is_none(), true);
+    }
 
-            #[test]
-            fn test_nested_recv_iter() {
-                let (tx, rx) = channel::<i32>();
-                let (total_tx, total_rx) = channel::<i32>();
-
-                let _t = thread::spawn(move|| {
-                    let mut acc = 0;
-                    for x in rx.iter() {
-                        acc += x;
-                    }
-                    total_tx.send(acc).unwrap();
-                });
+    #[test]
+    fn test_recv_into_iter_borrowed() {
+        let (tx, rx) = channel::<i32>();
+        tx.send(1).unwrap();
+        tx.send(2).unwrap();
+        drop(tx);
+        let mut iter = (&rx).into_iter();
+        assert_eq!(iter.next().unwrap(), 1);
+        assert_eq!(iter.next().unwrap(), 2);
+        assert_eq!(iter.next().is_none(), true);
+    }
 
-                tx.send(3).unwrap();
-                tx.send(1).unwrap();
-                tx.send(2).unwrap();
-                drop(tx);
-                assert_eq!(total_rx.recv().unwrap(), 6);
-            }
-
-            #[test]
-            fn test_recv_iter_break() {
-                let (tx, rx) = channel::<i32>();
-                let (count_tx, count_rx) = channel();
-
-                let _t = thread::spawn(move|| {
-                    let mut count = 0;
-                    for x in rx.iter() {
-                        if count >= 3 {
-                            break;
-                        } else {
-                            count += x;
-                        }
-                    }
-                    count_tx.send(count).unwrap();
-                });
+    #[test]
+    fn try_recv_states() {
+        let (tx1, rx1) = channel::<i32>();
+        let (tx2, rx2) = channel::<()>();
+        let (tx3, rx3) = channel::<()>();
+        let _t = thread::spawn(move || {
+            rx2.recv().unwrap();
+            tx1.send(1).unwrap();
+            tx3.send(()).unwrap();
+            rx2.recv().unwrap();
+            drop(tx1);
+            tx3.send(()).unwrap();
+        });
+
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
+        tx2.send(()).unwrap();
+        rx3.recv().unwrap();
+        assert_eq!(rx1.try_recv(), Ok(1));
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
+        tx2.send(()).unwrap();
+        rx3.recv().unwrap();
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Disconnected));
+    }
 
-                tx.send(2).unwrap();
-                tx.send(2).unwrap();
-                tx.send(2).unwrap();
-                let _ = tx.send(2);
-                drop(tx);
-                assert_eq!(count_rx.recv().unwrap(), 4);
-            }
-
-            #[test]
-            fn test_recv_try_iter() {
-                let (request_tx, request_rx) = channel();
-                let (response_tx, response_rx) = channel();
-
-                // Request `x`s until we have `6`.
-                let t = thread::spawn(move|| {
-                    let mut count = 0;
-                    loop {
-                        for x in response_rx.try_iter() {
-                            count += x;
-                            if count == 6 {
-                                return count;
-                            }
-                        }
-                        request_tx.send(()).unwrap();
-                    }
-                });
+    // This bug used to end up in a livelock inside of the Receiver destructor
+    // because the internal state of the Shared packet was corrupted
+    #[test]
+    fn destroy_upgraded_shared_port_when_sender_still_active() {
+        let (tx, rx) = channel();
+        let (tx2, rx2) = channel();
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap(); // wait on a oneshot
+            drop(rx); // destroy a shared
+            tx2.send(()).unwrap();
+        });
+        // make sure the other thread has gone to sleep
+        for _ in 0..5000 {
+            thread::yield_now();
+        }
+
+        // upgrade to a shared chan and send a message
+        let t = tx.clone();
+        drop(tx);
+        t.send(()).unwrap();
 
-                for _ in request_rx.iter() {
-                    if response_tx.send(2).is_err() {
-                        break;
-                    }
-                }
+        // wait for the child thread to exit before we exit
+        rx2.recv().unwrap();
+    }
 
-                assert_eq!(t.join().unwrap(), 6);
-            }
+    #[test]
+    fn issue_32114() {
+        let (tx, _) = channel();
+        let _ = tx.send(123);
+        assert_eq!(tx.send(123), Err(SendError(123)));
+    }
+}
 
-            #[test]
-            fn test_recv_into_iter_owned() {
-                let mut iter = {
-                  let (tx, rx) = channel::<i32>();
-                  tx.send(1).unwrap();
-                  tx.send(2).unwrap();
-
-                  rx.into_iter()
-                };
-                assert_eq!(iter.next().unwrap(), 1);
-                assert_eq!(iter.next().unwrap(), 2);
-                assert_eq!(iter.next().is_none(), true);
-            }
-
-            #[test]
-            fn test_recv_into_iter_borrowed() {
-                let (tx, rx) = channel::<i32>();
-                tx.send(1).unwrap();
-                tx.send(2).unwrap();
-                drop(tx);
-                let mut iter = (&rx).into_iter();
-                assert_eq!(iter.next().unwrap(), 1);
-                assert_eq!(iter.next().unwrap(), 2);
-                assert_eq!(iter.next().is_none(), true);
-            }
-
-            #[test]
-            fn try_recv_states() {
-                let (tx1, rx1) = channel::<i32>();
-                let (tx2, rx2) = channel::<()>();
-                let (tx3, rx3) = channel::<()>();
-                let _t = thread::spawn(move|| {
-                    rx2.recv().unwrap();
-                    tx1.send(1).unwrap();
-                    tx3.send(()).unwrap();
-                    rx2.recv().unwrap();
-                    drop(tx1);
-                    tx3.send(()).unwrap();
-                });
+// Source: https://github.com/rust-lang/rust/blob/master/src/libstd/sync/mpsc/mod.rs
+mod sync_channel_tests {
+    use super::*;
+
+    use std::env;
+    use std::thread;
+    use std::time::Duration;
+
+    pub fn stress_factor() -> usize {
+        match env::var("RUST_TEST_STRESS") {
+            Ok(val) => val.parse().unwrap(),
+            Err(..) => 1,
+        }
+    }
 
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
-                tx2.send(()).unwrap();
-                rx3.recv().unwrap();
-                assert_eq!(rx1.try_recv(), Ok(1));
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
-                tx2.send(()).unwrap();
-                rx3.recv().unwrap();
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Disconnected));
-            }
+    #[test]
+    fn smoke() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv().unwrap(), 1);
+    }
 
-            // This bug used to end up in a livelock inside of the Receiver destructor
-            // because the internal state of the Shared packet was corrupted
-            #[test]
-            fn destroy_upgraded_shared_port_when_sender_still_active() {
-                let (tx, rx) = channel();
-                let (tx2, rx2) = channel();
-                let _t = thread::spawn(move|| {
-                    rx.recv().unwrap(); // wait on a oneshot
-                    drop(rx);  // destroy a shared
-                    tx2.send(()).unwrap();
-                });
-                // make sure the other thread has gone to sleep
-                for _ in 0..5000 { thread::yield_now(); }
+    #[test]
+    fn drop_full() {
+        let (tx, _rx) = sync_channel::<Box<isize>>(1);
+        tx.send(Box::new(1)).unwrap();
+    }
 
-                // upgrade to a shared chan and send a message
-                let t = tx.clone();
-                drop(tx);
-                t.send(()).unwrap();
+    #[test]
+    fn smoke_shared() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv().unwrap(), 1);
+        let tx = tx.clone();
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv().unwrap(), 1);
+    }
 
-                // wait for the child thread to exit before we exit
-                rx2.recv().unwrap();
-            }
+    #[test]
+    fn recv_timeout() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        assert_eq!(
+            rx.recv_timeout(Duration::from_millis(1)),
+            Err(RecvTimeoutError::Timeout)
+        );
+        tx.send(1).unwrap();
+        assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(1));
+    }
 
-            #[test]
-            fn issue_32114() {
-                let (tx, _) = channel();
-                let _ = tx.send(123);
-                assert_eq!(tx.send(123), Err(SendError(123)));
-            }
-        }
+    #[test]
+    fn smoke_threads() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let _t = thread::spawn(move || {
+            tx.send(1).unwrap();
+        });
+        assert_eq!(rx.recv().unwrap(), 1);
+    }
 
-        // https://github.com/rust-lang/rust/tree/master/src/libstd/sync/mpsc
-        mod sync_channel_tests {
-            use std::env;
-            use std::thread;
-            use super::*;
-            use std::time::Duration;
+    #[test]
+    fn smoke_port_gone() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(rx);
+        assert!(tx.send(1).is_err());
+    }
 
-            pub fn stress_factor() -> usize {
-                match env::var("RUST_TEST_STRESS") {
-                    Ok(val) => val.parse().unwrap(),
-                    Err(..) => 1,
-                }
-            }
+    #[test]
+    fn smoke_shared_port_gone2() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(rx);
+        let tx2 = tx.clone();
+        drop(tx);
+        assert!(tx2.send(1).is_err());
+    }
 
-            #[test]
-            fn smoke() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                tx.send(1).unwrap();
-                assert_eq!(rx.recv().unwrap(), 1);
-            }
+    #[test]
+    fn port_gone_concurrent() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap();
+        });
+        while tx.send(1).is_ok() {}
+    }
 
-            #[test]
-            fn drop_full() {
-                let (tx, _rx) = sync_channel::<Box<isize>>(1);
-                tx.send(Box::new(1)).unwrap();
-            }
+    #[test]
+    fn port_gone_concurrent_shared() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let tx2 = tx.clone();
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap();
+        });
+        while tx.send(1).is_ok() && tx2.send(1).is_ok() {}
+    }
 
-            #[test]
-            fn smoke_shared() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                tx.send(1).unwrap();
-                assert_eq!(rx.recv().unwrap(), 1);
-                let tx = tx.clone();
-                tx.send(1).unwrap();
-                assert_eq!(rx.recv().unwrap(), 1);
-            }
+    #[test]
+    fn smoke_chan_gone() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(tx);
+        assert!(rx.recv().is_err());
+    }
 
-            #[test]
-            fn recv_timeout() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Err(RecvTimeoutError::Timeout));
-                tx.send(1).unwrap();
-                assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(1));
-            }
+    #[test]
+    fn smoke_chan_gone_shared() {
+        let (tx, rx) = sync_channel::<()>(0);
+        let tx2 = tx.clone();
+        drop(tx);
+        drop(tx2);
+        assert!(rx.recv().is_err());
+    }
 
-            #[test]
-            fn smoke_threads() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let _t = thread::spawn(move|| {
-                    tx.send(1).unwrap();
-                });
-                assert_eq!(rx.recv().unwrap(), 1);
-            }
+    #[test]
+    fn chan_gone_concurrent() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        thread::spawn(move || {
+            tx.send(1).unwrap();
+            tx.send(1).unwrap();
+        });
+        while rx.recv().is_ok() {}
+    }
 
-            #[test]
-            fn smoke_port_gone() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                drop(rx);
-                assert!(tx.send(1).is_err());
+    #[test]
+    fn stress() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        thread::spawn(move || {
+            for _ in 0..10000 {
+                tx.send(1).unwrap();
             }
+        });
+        for _ in 0..10000 {
+            assert_eq!(rx.recv().unwrap(), 1);
+        }
+    }
 
-            #[test]
-            fn smoke_shared_port_gone2() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                drop(rx);
-                let tx2 = tx.clone();
-                drop(tx);
-                assert!(tx2.send(1).is_err());
-            }
+    #[test]
+    fn stress_recv_timeout_two_threads() {
+        let (tx, rx) = sync_channel::<i32>(0);
 
-            #[test]
-            fn port_gone_concurrent() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let _t = thread::spawn(move|| {
-                    rx.recv().unwrap();
-                });
-                while tx.send(1).is_ok() {}
+        thread::spawn(move || {
+            for _ in 0..10000 {
+                tx.send(1).unwrap();
             }
+        });
 
-            #[test]
-            fn port_gone_concurrent_shared() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let tx2 = tx.clone();
-                let _t = thread::spawn(move|| {
-                    rx.recv().unwrap();
-                });
-                while tx.send(1).is_ok() && tx2.send(1).is_ok() {}
+        let mut recv_count = 0;
+        loop {
+            match rx.recv_timeout(Duration::from_millis(1)) {
+                Ok(v) => {
+                    assert_eq!(v, 1);
+                    recv_count += 1;
+                }
+                Err(RecvTimeoutError::Timeout) => continue,
+                Err(RecvTimeoutError::Disconnected) => break,
             }
+        }
 
-            #[test]
-            fn smoke_chan_gone() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                drop(tx);
-                assert!(rx.recv().is_err());
-            }
+        assert_eq!(recv_count, 10000);
+    }
 
-            #[test]
-            fn smoke_chan_gone_shared() {
-                let (tx, rx) = sync_channel::<()>(0);
-                let tx2 = tx.clone();
-                drop(tx);
-                drop(tx2);
-                assert!(rx.recv().is_err());
+    #[test]
+    fn stress_recv_timeout_shared() {
+        const AMT: u32 = 1000;
+        const NTHREADS: u32 = 8;
+        let (tx, rx) = sync_channel::<i32>(0);
+        let (dtx, drx) = sync_channel::<()>(0);
+
+        thread::spawn(move || {
+            let mut recv_count = 0;
+            loop {
+                match rx.recv_timeout(Duration::from_millis(10)) {
+                    Ok(v) => {
+                        assert_eq!(v, 1);
+                        recv_count += 1;
+                    }
+                    Err(RecvTimeoutError::Timeout) => continue,
+                    Err(RecvTimeoutError::Disconnected) => break,
+                }
             }
 
-            #[test]
-            fn chan_gone_concurrent() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                thread::spawn(move|| {
+            assert_eq!(recv_count, AMT * NTHREADS);
+            assert!(rx.try_recv().is_err());
+
+            dtx.send(()).unwrap();
+        });
+
+        for _ in 0..NTHREADS {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                for _ in 0..AMT {
                     tx.send(1).unwrap();
-                    tx.send(1).unwrap();
-                });
-                while rx.recv().is_ok() {}
-            }
-
-            #[test]
-            fn stress() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                thread::spawn(move|| {
-                    for _ in 0..10000 { tx.send(1).unwrap(); }
-                });
-                for _ in 0..10000 {
-                    assert_eq!(rx.recv().unwrap(), 1);
                 }
-            }
+            });
+        }
 
-            #[test]
-            fn stress_recv_timeout_two_threads() {
-                let (tx, rx) = sync_channel::<i32>(0);
+        drop(tx);
 
-                thread::spawn(move|| {
-                    for _ in 0..10000 { tx.send(1).unwrap(); }
-                });
+        drx.recv().unwrap();
+    }
 
-                let mut recv_count = 0;
-                loop {
-                    match rx.recv_timeout(Duration::from_millis(1)) {
-                        Ok(v) => {
-                            assert_eq!(v, 1);
-                            recv_count += 1;
-                        },
-                        Err(RecvTimeoutError::Timeout) => continue,
-                        Err(RecvTimeoutError::Disconnected) => break,
-                    }
-                }
+    #[test]
+    fn stress_shared() {
+        const AMT: u32 = 1000;
+        const NTHREADS: u32 = 8;
+        let (tx, rx) = sync_channel::<i32>(0);
+        let (dtx, drx) = sync_channel::<()>(0);
 
-                assert_eq!(recv_count, 10000);
+        thread::spawn(move || {
+            for _ in 0..AMT * NTHREADS {
+                assert_eq!(rx.recv().unwrap(), 1);
             }
-
-            #[test]
-            fn stress_recv_timeout_shared() {
-                const AMT: u32 = 1000;
-                const NTHREADS: u32 = 8;
-                let (tx, rx) = sync_channel::<i32>(0);
-                let (dtx, drx) = sync_channel::<()>(0);
-
-                thread::spawn(move|| {
-                    let mut recv_count = 0;
-                    loop {
-                        match rx.recv_timeout(Duration::from_millis(10)) {
-                            Ok(v) => {
-                                assert_eq!(v, 1);
-                                recv_count += 1;
-                            },
-                            Err(RecvTimeoutError::Timeout) => continue,
-                            Err(RecvTimeoutError::Disconnected) => break,
-                        }
-                    }
-
-                    assert_eq!(recv_count, AMT * NTHREADS);
-                    assert!(rx.try_recv().is_err());
-
-                    dtx.send(()).unwrap();
-                });
-
-                for _ in 0..NTHREADS {
-                    let tx = tx.clone();
-                    thread::spawn(move|| {
-                        for _ in 0..AMT { tx.send(1).unwrap(); }
-                    });
+            match rx.try_recv() {
+                Ok(..) => panic!(),
+                _ => {}
+            }
+            dtx.send(()).unwrap();
+        });
+
+        for _ in 0..NTHREADS {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                for _ in 0..AMT {
+                    tx.send(1).unwrap();
                 }
+            });
+        }
+        drop(tx);
+        drx.recv().unwrap();
+    }
 
-                drop(tx);
+    #[test]
+    fn oneshot_single_thread_close_port_first() {
+        // Simple test of closing without sending
+        let (_tx, rx) = sync_channel::<i32>(0);
+        drop(rx);
+    }
 
-                drx.recv().unwrap();
-            }
+    #[test]
+    fn oneshot_single_thread_close_chan_first() {
+        // Simple test of closing without sending
+        let (tx, _rx) = sync_channel::<i32>(0);
+        drop(tx);
+    }
 
-            #[test]
-            fn stress_shared() {
-                const AMT: u32 = 1000;
-                const NTHREADS: u32 = 8;
-                let (tx, rx) = sync_channel::<i32>(0);
-                let (dtx, drx) = sync_channel::<()>(0);
+    #[test]
+    fn oneshot_single_thread_send_port_close() {
+        // Testing that the sender cleans up the payload if receiver is closed
+        let (tx, rx) = sync_channel::<Box<i32>>(0);
+        drop(rx);
+        assert!(tx.send(Box::new(0)).is_err());
+    }
 
-                thread::spawn(move|| {
-                    for _ in 0..AMT * NTHREADS {
-                        assert_eq!(rx.recv().unwrap(), 1);
-                    }
-                    match rx.try_recv() {
-                        Ok(..) => panic!(),
-                        _ => {}
-                    }
-                    dtx.send(()).unwrap();
-                });
+    #[test]
+    fn oneshot_single_thread_recv_chan_close() {
+        // Receiving on a closed chan will panic
+        let res = thread::spawn(move || {
+            let (tx, rx) = sync_channel::<i32>(0);
+            drop(tx);
+            rx.recv().unwrap();
+        }).join();
+        // What is our res?
+        assert!(res.is_err());
+    }
 
-                for _ in 0..NTHREADS {
-                    let tx = tx.clone();
-                    thread::spawn(move|| {
-                        for _ in 0..AMT { tx.send(1).unwrap(); }
-                    });
-                }
-                drop(tx);
-                drx.recv().unwrap();
-            }
+    #[test]
+    fn oneshot_single_thread_send_then_recv() {
+        let (tx, rx) = sync_channel::<Box<i32>>(1);
+        tx.send(Box::new(10)).unwrap();
+        assert!(*rx.recv().unwrap() == 10);
+    }
 
-            #[test]
-            fn oneshot_single_thread_close_port_first() {
-                // Simple test of closing without sending
-                let (_tx, rx) = sync_channel::<i32>(0);
-                drop(rx);
-            }
+    #[test]
+    fn oneshot_single_thread_try_send_open() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        assert_eq!(tx.try_send(10), Ok(()));
+        assert!(rx.recv().unwrap() == 10);
+    }
 
-            #[test]
-            fn oneshot_single_thread_close_chan_first() {
-                // Simple test of closing without sending
-                let (tx, _rx) = sync_channel::<i32>(0);
-                drop(tx);
-            }
+    #[test]
+    fn oneshot_single_thread_try_send_closed() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(rx);
+        assert_eq!(tx.try_send(10), Err(TrySendError::Disconnected(10)));
+    }
 
-            #[test]
-            fn oneshot_single_thread_send_port_close() {
-                // Testing that the sender cleans up the payload if receiver is closed
-                let (tx, rx) = sync_channel::<Box<i32>>(0);
-                drop(rx);
-                assert!(tx.send(Box::new(0)).is_err());
-            }
+    #[test]
+    fn oneshot_single_thread_try_send_closed2() {
+        let (tx, _rx) = sync_channel::<i32>(0);
+        assert_eq!(tx.try_send(10), Err(TrySendError::Full(10)));
+    }
 
-            #[test]
-            fn oneshot_single_thread_recv_chan_close() {
-                // Receiving on a closed chan will panic
-                let res = thread::spawn(move|| {
-                    let (tx, rx) = sync_channel::<i32>(0);
-                    drop(tx);
-                    rx.recv().unwrap();
-                }).join();
-                // What is our res?
-                assert!(res.is_err());
-            }
+    #[test]
+    fn oneshot_single_thread_try_recv_open() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        tx.send(10).unwrap();
+        assert!(rx.recv() == Ok(10));
+    }
 
-            #[test]
-            fn oneshot_single_thread_send_then_recv() {
-                let (tx, rx) = sync_channel::<Box<i32>>(1);
-                tx.send(Box::new(10)).unwrap();
-                assert!(*rx.recv().unwrap() == 10);
-            }
+    #[test]
+    fn oneshot_single_thread_try_recv_closed() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(tx);
+        assert!(rx.recv().is_err());
+    }
 
-            #[test]
-            fn oneshot_single_thread_try_send_open() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                assert_eq!(tx.try_send(10), Ok(()));
-                assert!(rx.recv().unwrap() == 10);
-            }
+    #[test]
+    fn oneshot_single_thread_try_recv_closed_with_data() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        tx.send(10).unwrap();
+        drop(tx);
+        assert_eq!(rx.try_recv(), Ok(10));
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
+    }
 
-            #[test]
-            fn oneshot_single_thread_try_send_closed() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                drop(rx);
-                assert_eq!(tx.try_send(10), Err(TrySendError::Disconnected(10)));
-            }
+    #[test]
+    fn oneshot_single_thread_peek_data() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
+        tx.send(10).unwrap();
+        assert_eq!(rx.try_recv(), Ok(10));
+    }
 
-            #[test]
-            fn oneshot_single_thread_try_send_closed2() {
-                let (tx, _rx) = sync_channel::<i32>(0);
-                assert_eq!(tx.try_send(10), Err(TrySendError::Full(10)));
-            }
+    #[test]
+    fn oneshot_single_thread_peek_close() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(tx);
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
+    }
 
-            #[test]
-            fn oneshot_single_thread_try_recv_open() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                tx.send(10).unwrap();
-                assert!(rx.recv() == Ok(10));
-            }
+    #[test]
+    fn oneshot_single_thread_peek_open() {
+        let (_tx, rx) = sync_channel::<i32>(0);
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
+    }
 
-            #[test]
-            fn oneshot_single_thread_try_recv_closed() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                drop(tx);
-                assert!(rx.recv().is_err());
-            }
+    #[test]
+    fn oneshot_multi_task_recv_then_send() {
+        let (tx, rx) = sync_channel::<Box<i32>>(0);
+        let _t = thread::spawn(move || {
+            assert!(*rx.recv().unwrap() == 10);
+        });
 
-            #[test]
-            fn oneshot_single_thread_try_recv_closed_with_data() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                tx.send(10).unwrap();
-                drop(tx);
-                assert_eq!(rx.try_recv(), Ok(10));
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
-            }
+        tx.send(Box::new(10)).unwrap();
+    }
 
-            #[test]
-            fn oneshot_single_thread_peek_data() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
-                tx.send(10).unwrap();
-                assert_eq!(rx.try_recv(), Ok(10));
-            }
+    #[test]
+    fn oneshot_multi_task_recv_then_close() {
+        let (tx, rx) = sync_channel::<Box<i32>>(0);
+        let _t = thread::spawn(move || {
+            drop(tx);
+        });
+        let res = thread::spawn(move || {
+            assert!(*rx.recv().unwrap() == 10);
+        }).join();
+        assert!(res.is_err());
+    }
 
-            #[test]
-            fn oneshot_single_thread_peek_close() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                drop(tx);
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Disconnected));
-            }
+    #[test]
+    fn oneshot_multi_thread_close_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = sync_channel::<i32>(0);
+            let _t = thread::spawn(move || {
+                drop(rx);
+            });
+            drop(tx);
+        }
+    }
 
-            #[test]
-            fn oneshot_single_thread_peek_open() {
-                let (_tx, rx) = sync_channel::<i32>(0);
-                assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
-            }
+    #[test]
+    fn oneshot_multi_thread_send_close_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = sync_channel::<i32>(0);
+            let _t = thread::spawn(move || {
+                drop(rx);
+            });
+            let _ = thread::spawn(move || {
+                tx.send(1).unwrap();
+            }).join();
+        }
+    }
 
-            #[test]
-            fn oneshot_multi_task_recv_then_send() {
-                let (tx, rx) = sync_channel::<Box<i32>>(0);
-                let _t = thread::spawn(move|| {
-                    assert!(*rx.recv().unwrap() == 10);
+    #[test]
+    fn oneshot_multi_thread_recv_close_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = sync_channel::<i32>(0);
+            let _t = thread::spawn(move || {
+                let res = thread::spawn(move || {
+                    rx.recv().unwrap();
+                }).join();
+                assert!(res.is_err());
+            });
+            let _t = thread::spawn(move || {
+                thread::spawn(move || {
+                    drop(tx);
                 });
+            });
+        }
+    }
 
+    #[test]
+    fn oneshot_multi_thread_send_recv_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = sync_channel::<Box<i32>>(0);
+            let _t = thread::spawn(move || {
                 tx.send(Box::new(10)).unwrap();
-            }
-
-            #[test]
-            fn oneshot_multi_task_recv_then_close() {
-                let (tx, rx) = sync_channel::<Box<i32>>(0);
-                let _t = thread::spawn(move|| {
-                    drop(tx);
-                });
-                let res = thread::spawn(move|| {
-                    assert!(*rx.recv().unwrap() == 10);
-                }).join();
-                assert!(res.is_err());
-            }
+            });
+            assert!(*rx.recv().unwrap() == 10);
+        }
+    }
 
-            #[test]
-            fn oneshot_multi_thread_close_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = sync_channel::<i32>(0);
-                    let _t = thread::spawn(move|| {
-                        drop(rx);
-                    });
-                    drop(tx);
+    #[test]
+    fn stream_send_recv_stress() {
+        for _ in 0..stress_factor() {
+            let (tx, rx) = sync_channel::<Box<i32>>(0);
+
+            send(tx, 0);
+            recv(rx, 0);
+
+            fn send(tx: SyncSender<Box<i32>>, i: i32) {
+                if i == 10 {
+                    return;
                 }
-            }
 
-            #[test]
-            fn oneshot_multi_thread_send_close_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = sync_channel::<i32>(0);
-                    let _t = thread::spawn(move|| {
-                        drop(rx);
-                    });
-                    let _ = thread::spawn(move || {
-                        tx.send(1).unwrap();
-                    }).join();
-                }
+                thread::spawn(move || {
+                    tx.send(Box::new(i)).unwrap();
+                    send(tx, i + 1);
+                });
             }
 
-            #[test]
-            fn oneshot_multi_thread_recv_close_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = sync_channel::<i32>(0);
-                    let _t = thread::spawn(move|| {
-                        let res = thread::spawn(move|| {
-                            rx.recv().unwrap();
-                        }).join();
-                        assert!(res.is_err());
-                    });
-                    let _t = thread::spawn(move|| {
-                        thread::spawn(move|| {
-                            drop(tx);
-                        });
-                    });
+            fn recv(rx: Receiver<Box<i32>>, i: i32) {
+                if i == 10 {
+                    return;
                 }
-            }
 
-            #[test]
-            fn oneshot_multi_thread_send_recv_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = sync_channel::<Box<i32>>(0);
-                    let _t = thread::spawn(move|| {
-                        tx.send(Box::new(10)).unwrap();
-                    });
-                    assert!(*rx.recv().unwrap() == 10);
-                }
+                thread::spawn(move || {
+                    assert!(*rx.recv().unwrap() == i);
+                    recv(rx, i + 1);
+                });
             }
+        }
+    }
 
-            #[test]
-            fn stream_send_recv_stress() {
-                for _ in 0..stress_factor() {
-                    let (tx, rx) = sync_channel::<Box<i32>>(0);
-
-                    send(tx, 0);
-                    recv(rx, 0);
-
-                    fn send(tx: SyncSender<Box<i32>>, i: i32) {
-                        if i == 10 { return }
-
-                        thread::spawn(move|| {
-                            tx.send(Box::new(i)).unwrap();
-                            send(tx, i + 1);
-                        });
-                    }
+    #[test]
+    fn recv_a_lot() {
+        // Regression test that we don't run out of stack in scheduler context
+        let (tx, rx) = sync_channel(10000);
+        for _ in 0..10000 {
+            tx.send(()).unwrap();
+        }
+        for _ in 0..10000 {
+            rx.recv().unwrap();
+        }
+    }
 
-                    fn recv(rx: Receiver<Box<i32>>, i: i32) {
-                        if i == 10 { return }
+    #[test]
+    fn shared_chan_stress() {
+        let (tx, rx) = sync_channel(0);
+        let total = stress_factor() + 100;
+        for _ in 0..total {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                tx.send(()).unwrap();
+            });
+        }
 
-                        thread::spawn(move|| {
-                            assert!(*rx.recv().unwrap() == i);
-                            recv(rx, i + 1);
-                        });
-                    }
-                }
-            }
+        for _ in 0..total {
+            rx.recv().unwrap();
+        }
+    }
 
-            #[test]
-            fn recv_a_lot() {
-                // Regression test that we don't run out of stack in scheduler context
-                let (tx, rx) = sync_channel(10000);
-                for _ in 0..10000 { tx.send(()).unwrap(); }
-                for _ in 0..10000 { rx.recv().unwrap(); }
-            }
-
-            #[test]
-            fn shared_chan_stress() {
-                let (tx, rx) = sync_channel(0);
-                let total = stress_factor() + 100;
-                for _ in 0..total {
-                    let tx = tx.clone();
-                    thread::spawn(move|| {
-                        tx.send(()).unwrap();
-                    });
-                }
+    #[test]
+    fn test_nested_recv_iter() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let (total_tx, total_rx) = sync_channel::<i32>(0);
+
+        let _t = thread::spawn(move || {
+            let mut acc = 0;
+            for x in rx.iter() {
+                acc += x;
+            }
+            total_tx.send(acc).unwrap();
+        });
+
+        tx.send(3).unwrap();
+        tx.send(1).unwrap();
+        tx.send(2).unwrap();
+        drop(tx);
+        assert_eq!(total_rx.recv().unwrap(), 6);
+    }
 
-                for _ in 0..total {
-                    rx.recv().unwrap();
+    #[test]
+    fn test_recv_iter_break() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let (count_tx, count_rx) = sync_channel(0);
+
+        let _t = thread::spawn(move || {
+            let mut count = 0;
+            for x in rx.iter() {
+                if count >= 3 {
+                    break;
+                } else {
+                    count += x;
                 }
             }
+            count_tx.send(count).unwrap();
+        });
 
-            #[test]
-            fn test_nested_recv_iter() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let (total_tx, total_rx) = sync_channel::<i32>(0);
-
-                let _t = thread::spawn(move|| {
-                    let mut acc = 0;
-                    for x in rx.iter() {
-                        acc += x;
-                    }
-                    total_tx.send(acc).unwrap();
-                });
+        tx.send(2).unwrap();
+        tx.send(2).unwrap();
+        tx.send(2).unwrap();
+        let _ = tx.try_send(2);
+        drop(tx);
+        assert_eq!(count_rx.recv().unwrap(), 4);
+    }
 
-                tx.send(3).unwrap();
-                tx.send(1).unwrap();
-                tx.send(2).unwrap();
-                drop(tx);
-                assert_eq!(total_rx.recv().unwrap(), 6);
-            }
-
-            #[test]
-            fn test_recv_iter_break() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let (count_tx, count_rx) = sync_channel(0);
-
-                let _t = thread::spawn(move|| {
-                    let mut count = 0;
-                    for x in rx.iter() {
-                        if count >= 3 {
-                            break;
-                        } else {
-                            count += x;
-                        }
-                    }
-                    count_tx.send(count).unwrap();
-                });
+    #[test]
+    fn try_recv_states() {
+        let (tx1, rx1) = sync_channel::<i32>(1);
+        let (tx2, rx2) = sync_channel::<()>(1);
+        let (tx3, rx3) = sync_channel::<()>(1);
+        let _t = thread::spawn(move || {
+            rx2.recv().unwrap();
+            tx1.send(1).unwrap();
+            tx3.send(()).unwrap();
+            rx2.recv().unwrap();
+            drop(tx1);
+            tx3.send(()).unwrap();
+        });
+
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
+        tx2.send(()).unwrap();
+        rx3.recv().unwrap();
+        assert_eq!(rx1.try_recv(), Ok(1));
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
+        tx2.send(()).unwrap();
+        rx3.recv().unwrap();
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Disconnected));
+    }
 
-                tx.send(2).unwrap();
-                tx.send(2).unwrap();
-                tx.send(2).unwrap();
-                let _ = tx.try_send(2);
-                drop(tx);
-                assert_eq!(count_rx.recv().unwrap(), 4);
-            }
-
-            #[test]
-            fn try_recv_states() {
-                let (tx1, rx1) = sync_channel::<i32>(1);
-                let (tx2, rx2) = sync_channel::<()>(1);
-                let (tx3, rx3) = sync_channel::<()>(1);
-                let _t = thread::spawn(move|| {
-                    rx2.recv().unwrap();
-                    tx1.send(1).unwrap();
-                    tx3.send(()).unwrap();
-                    rx2.recv().unwrap();
-                    drop(tx1);
-                    tx3.send(()).unwrap();
-                });
+    // This bug used to end up in a livelock inside of the Receiver destructor
+    // because the internal state of the Shared packet was corrupted
+    #[test]
+    fn destroy_upgraded_shared_port_when_sender_still_active() {
+        let (tx, rx) = sync_channel::<()>(0);
+        let (tx2, rx2) = sync_channel::<()>(0);
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap(); // wait on a oneshot
+            drop(rx); // destroy a shared
+            tx2.send(()).unwrap();
+        });
+        // make sure the other thread has gone to sleep
+        for _ in 0..5000 {
+            thread::yield_now();
+        }
+
+        // upgrade to a shared chan and send a message
+        let t = tx.clone();
+        drop(tx);
+        t.send(()).unwrap();
 
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
-                tx2.send(()).unwrap();
-                rx3.recv().unwrap();
-                assert_eq!(rx1.try_recv(), Ok(1));
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
-                tx2.send(()).unwrap();
-                rx3.recv().unwrap();
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Disconnected));
-            }
+        // wait for the child thread to exit before we exit
+        rx2.recv().unwrap();
+    }
 
-            // This bug used to end up in a livelock inside of the Receiver destructor
-            // because the internal state of the Shared packet was corrupted
-            #[test]
-            fn destroy_upgraded_shared_port_when_sender_still_active() {
-                let (tx, rx) = sync_channel::<()>(0);
-                let (tx2, rx2) = sync_channel::<()>(0);
-                let _t = thread::spawn(move|| {
-                    rx.recv().unwrap(); // wait on a oneshot
-                    drop(rx);  // destroy a shared
-                    tx2.send(()).unwrap();
-                });
-                // make sure the other thread has gone to sleep
-                for _ in 0..5000 { thread::yield_now(); }
+    #[test]
+    fn send1() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let _t = thread::spawn(move || {
+            rx.recv().unwrap();
+        });
+        assert_eq!(tx.send(1), Ok(()));
+    }
 
-                // upgrade to a shared chan and send a message
-                let t = tx.clone();
-                drop(tx);
-                t.send(()).unwrap();
-
-                // wait for the child thread to exit before we exit
-                rx2.recv().unwrap();
-            }
-
-            #[test]
-            fn send1() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let _t = thread::spawn(move|| { rx.recv().unwrap(); });
-                assert_eq!(tx.send(1), Ok(()));
-            }
-
-            #[test]
-            fn send2() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let _t = thread::spawn(move|| { drop(rx); });
-                assert!(tx.send(1).is_err());
-            }
-
-            #[test]
-            fn send3() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                assert_eq!(tx.send(1), Ok(()));
-                let _t =thread::spawn(move|| { drop(rx); });
-                assert!(tx.send(1).is_err());
-            }
-
-            #[test]
-            fn send4() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let tx2 = tx.clone();
-                let (done, donerx) = channel();
-                let done2 = done.clone();
-                let _t = thread::spawn(move|| {
-                    assert!(tx.send(1).is_err());
-                    done.send(()).unwrap();
-                });
-                let _t = thread::spawn(move|| {
-                    assert!(tx2.send(2).is_err());
-                    done2.send(()).unwrap();
-                });
-                drop(rx);
-                donerx.recv().unwrap();
-                donerx.recv().unwrap();
-            }
+    #[test]
+    fn send2() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let _t = thread::spawn(move || {
+            drop(rx);
+        });
+        assert!(tx.send(1).is_err());
+    }
 
-            #[test]
-            fn try_send1() {
-                let (tx, _rx) = sync_channel::<i32>(0);
-                assert_eq!(tx.try_send(1), Err(TrySendError::Full(1)));
-            }
+    #[test]
+    fn send3() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        assert_eq!(tx.send(1), Ok(()));
+        let _t = thread::spawn(move || {
+            drop(rx);
+        });
+        assert!(tx.send(1).is_err());
+    }
 
-            #[test]
-            fn try_send2() {
-                let (tx, _rx) = sync_channel::<i32>(1);
-                assert_eq!(tx.try_send(1), Ok(()));
-                assert_eq!(tx.try_send(1), Err(TrySendError::Full(1)));
-            }
+    #[test]
+    fn send4() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let tx2 = tx.clone();
+        let (done, donerx) = channel();
+        let done2 = done.clone();
+        let _t = thread::spawn(move || {
+            assert!(tx.send(1).is_err());
+            done.send(()).unwrap();
+        });
+        let _t = thread::spawn(move || {
+            assert!(tx2.send(2).is_err());
+            done2.send(()).unwrap();
+        });
+        drop(rx);
+        donerx.recv().unwrap();
+        donerx.recv().unwrap();
+    }
 
-            #[test]
-            fn try_send3() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                assert_eq!(tx.try_send(1), Ok(()));
-                drop(rx);
-                assert_eq!(tx.try_send(1), Err(TrySendError::Disconnected(1)));
-            }
+    #[test]
+    fn try_send1() {
+        let (tx, _rx) = sync_channel::<i32>(0);
+        assert_eq!(tx.try_send(1), Err(TrySendError::Full(1)));
+    }
 
-            #[test]
-            fn issue_15761() {
-                fn repro() {
-                    let (tx1, rx1) = sync_channel::<()>(3);
-                    let (tx2, rx2) = sync_channel::<()>(3);
-
-                    let _t = thread::spawn(move|| {
-                        rx1.recv().unwrap();
-                        tx2.try_send(()).unwrap();
-                    });
+    #[test]
+    fn try_send2() {
+        let (tx, _rx) = sync_channel::<i32>(1);
+        assert_eq!(tx.try_send(1), Ok(()));
+        assert_eq!(tx.try_send(1), Err(TrySendError::Full(1)));
+    }
 
-                    tx1.try_send(()).unwrap();
-                    rx2.recv().unwrap();
-                }
+    #[test]
+    fn try_send3() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        assert_eq!(tx.try_send(1), Ok(()));
+        drop(rx);
+        assert_eq!(tx.try_send(1), Err(TrySendError::Disconnected(1)));
+    }
 
-                for _ in 0..100 {
-                    repro()
-                }
-            }
-        }
+    #[test]
+    fn issue_15761() {
+        fn repro() {
+            let (tx1, rx1) = sync_channel::<()>(3);
+            let (tx2, rx2) = sync_channel::<()>(3);
 
-        // https://github.com/rust-lang/rust/blob/master/src/libstd/sync/mpsc/select.rs
-        mod select_tests {
-            use std::thread;
-            use super::*;
-
-            #[test]
-            fn smoke() {
-                let (tx1, rx1) = channel::<i32>();
-                let (tx2, rx2) = channel::<i32>();
-                tx1.send(1).unwrap();
-                mpsc_select! {
-                    foo = rx1.recv() => { assert_eq!(foo.unwrap(), 1); },
-                    _bar = rx2.recv() => { panic!() }
-                }
-                tx2.send(2).unwrap();
-                mpsc_select! {
-                    _foo = rx1.recv() => { panic!() },
-                    bar = rx2.recv() => { assert_eq!(bar.unwrap(), 2) }
-                }
-                drop(tx1);
-                mpsc_select! {
-                    foo = rx1.recv() => { assert!(foo.is_err()); },
-                    _bar = rx2.recv() => { panic!() }
-                }
-                drop(tx2);
-                mpsc_select! {
-                    bar = rx2.recv() => { assert!(bar.is_err()); }
-                }
-            }
+            let _t = thread::spawn(move || {
+                rx1.recv().unwrap();
+                tx2.try_send(()).unwrap();
+            });
 
-            #[test]
-            fn smoke2() {
-                let (_tx1, rx1) = channel::<i32>();
-                let (_tx2, rx2) = channel::<i32>();
-                let (_tx3, rx3) = channel::<i32>();
-                let (_tx4, rx4) = channel::<i32>();
-                let (tx5, rx5) = channel::<i32>();
-                tx5.send(4).unwrap();
-                mpsc_select! {
-                    _foo = rx1.recv() => { panic!("1") },
-                    _foo = rx2.recv() => { panic!("2") },
-                    _foo = rx3.recv() => { panic!("3") },
-                    _foo = rx4.recv() => { panic!("4") },
-                    foo = rx5.recv() => { assert_eq!(foo.unwrap(), 4); }
-                }
-            }
+            tx1.try_send(()).unwrap();
+            rx2.recv().unwrap();
+        }
 
-            #[test]
-            fn closed() {
-                let (_tx1, rx1) = channel::<i32>();
-                let (tx2, rx2) = channel::<i32>();
-                drop(tx2);
-
-                mpsc_select! {
-                    _a1 = rx1.recv() => { panic!() },
-                    a2 = rx2.recv() => { assert!(a2.is_err()); }
-                }
-            }
+        for _ in 0..100 {
+            repro()
+        }
+    }
+}
 
-            #[test]
-            fn unblocks() {
-                let (tx1, rx1) = channel::<i32>();
-                let (_tx2, rx2) = channel::<i32>();
-                let (tx3, rx3) = channel::<i32>();
-
-                let _t = thread::spawn(move|| {
-                    for _ in 0..20 { thread::yield_now(); }
-                    tx1.send(1).unwrap();
-                    rx3.recv().unwrap();
-                    for _ in 0..20 { thread::yield_now(); }
-                });
+// Source: https://github.com/rust-lang/rust/blob/master/src/libstd/sync/mpsc/select.rs
+mod select_tests {
+    use super::*;
+
+    use std::thread;
+
+    #[test]
+    fn smoke() {
+        let (tx1, rx1) = channel::<i32>();
+        let (tx2, rx2) = channel::<i32>();
+        tx1.send(1).unwrap();
+        select! {
+            foo = rx1.recv() => { assert_eq!(foo.unwrap(), 1); },
+            _bar = rx2.recv() => { panic!() }
+        }
+        tx2.send(2).unwrap();
+        select! {
+            _foo = rx1.recv() => { panic!() },
+            bar = rx2.recv() => { assert_eq!(bar.unwrap(), 2) }
+        }
+        drop(tx1);
+        select! {
+            foo = rx1.recv() => { assert!(foo.is_err()); },
+            _bar = rx2.recv() => { panic!() }
+        }
+        drop(tx2);
+        select! {
+            bar = rx2.recv() => { assert!(bar.is_err()); }
+        }
+    }
 
-                mpsc_select! {
-                    a = rx1.recv() => { assert_eq!(a.unwrap(), 1); },
-                    _b = rx2.recv() => { panic!() }
-                }
-                tx3.send(1).unwrap();
-                mpsc_select! {
-                    a = rx1.recv() => { assert!(a.is_err()) },
-                    _b = rx2.recv() => { panic!() }
-                }
-            }
+    #[test]
+    fn smoke2() {
+        let (_tx1, rx1) = channel::<i32>();
+        let (_tx2, rx2) = channel::<i32>();
+        let (_tx3, rx3) = channel::<i32>();
+        let (_tx4, rx4) = channel::<i32>();
+        let (tx5, rx5) = channel::<i32>();
+        tx5.send(4).unwrap();
+        select! {
+            _foo = rx1.recv() => { panic!("1") },
+            _foo = rx2.recv() => { panic!("2") },
+            _foo = rx3.recv() => { panic!("3") },
+            _foo = rx4.recv() => { panic!("4") },
+            foo = rx5.recv() => { assert_eq!(foo.unwrap(), 4); }
+        }
+    }
 
-            #[test]
-            fn both_ready() {
-                let (tx1, rx1) = channel::<i32>();
-                let (tx2, rx2) = channel::<i32>();
-                let (tx3, rx3) = channel::<()>();
-
-                let _t = thread::spawn(move|| {
-                    for _ in 0..20 { thread::yield_now(); }
-                    tx1.send(1).unwrap();
-                    tx2.send(2).unwrap();
-                    rx3.recv().unwrap();
-                });
+    #[test]
+    fn closed() {
+        let (_tx1, rx1) = channel::<i32>();
+        let (tx2, rx2) = channel::<i32>();
+        drop(tx2);
 
-                mpsc_select! {
-                    a = rx1.recv() => { assert_eq!(a.unwrap(), 1); },
-                    a = rx2.recv() => { assert_eq!(a.unwrap(), 2); }
-                }
-                mpsc_select! {
-                    a = rx1.recv() => { assert_eq!(a.unwrap(), 1); },
-                    a = rx2.recv() => { assert_eq!(a.unwrap(), 2); }
-                }
-                assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
-                assert_eq!(rx2.try_recv(), Err(TryRecvError::Empty));
-                tx3.send(()).unwrap();
-            }
-
-            #[test]
-            fn stress() {
-                const AMT: i32 = 10000;
-                let (tx1, rx1) = channel::<i32>();
-                let (tx2, rx2) = channel::<i32>();
-                let (tx3, rx3) = channel::<()>();
-
-                let _t = thread::spawn(move|| {
-                    for i in 0..AMT {
-                        if i % 2 == 0 {
-                            tx1.send(i).unwrap();
-                        } else {
-                            tx2.send(i).unwrap();
-                        }
-                        rx3.recv().unwrap();
-                    }
-                });
+        select! {
+            _a1 = rx1.recv() => { panic!() },
+            a2 = rx2.recv() => { assert!(a2.is_err()); }
+        }
+    }
 
-                for i in 0..AMT {
-                    mpsc_select! {
-                        i1 = rx1.recv() => { assert!(i % 2 == 0 && i == i1.unwrap()); },
-                        i2 = rx2.recv() => { assert!(i % 2 == 1 && i == i2.unwrap()); }
-                    }
-                    tx3.send(()).unwrap();
-                }
+    #[test]
+    fn unblocks() {
+        let (tx1, rx1) = channel::<i32>();
+        let (_tx2, rx2) = channel::<i32>();
+        let (tx3, rx3) = channel::<i32>();
+
+        let _t = thread::spawn(move || {
+            for _ in 0..20 {
+                thread::yield_now();
+            }
+            tx1.send(1).unwrap();
+            rx3.recv().unwrap();
+            for _ in 0..20 {
+                thread::yield_now();
             }
+        });
 
-            #[allow(unused_must_use)]
-            #[test]
-            fn cloning() {
-                let (tx1, rx1) = channel::<i32>();
-                let (_tx2, rx2) = channel::<i32>();
-                let (tx3, rx3) = channel::<()>();
-
-                let _t = thread::spawn(move|| {
-                    rx3.recv().unwrap();
-                    tx1.clone();
-                    assert_eq!(rx3.try_recv(), Err(TryRecvError::Empty));
-                    tx1.send(2).unwrap();
-                    rx3.recv().unwrap();
-                });
+        select! {
+            a = rx1.recv() => { assert_eq!(a.unwrap(), 1); },
+            _b = rx2.recv() => { panic!() }
+        }
+        tx3.send(1).unwrap();
+        select! {
+            a = rx1.recv() => { assert!(a.is_err()) },
+            _b = rx2.recv() => { panic!() }
+        }
+    }
 
-                tx3.send(()).unwrap();
-                mpsc_select! {
-                    _i1 = rx1.recv() => {},
-                    _i2 = rx2.recv() => panic!()
-                }
-                tx3.send(()).unwrap();
-            }
+    #[test]
+    fn both_ready() {
+        let (tx1, rx1) = channel::<i32>();
+        let (tx2, rx2) = channel::<i32>();
+        let (tx3, rx3) = channel::<()>();
+
+        let _t = thread::spawn(move || {
+            for _ in 0..20 {
+                thread::yield_now();
+            }
+            tx1.send(1).unwrap();
+            tx2.send(2).unwrap();
+            rx3.recv().unwrap();
+        });
 
-            #[allow(unused_must_use)]
-            #[test]
-            fn cloning2() {
-                let (tx1, rx1) = channel::<i32>();
-                let (_tx2, rx2) = channel::<i32>();
-                let (tx3, rx3) = channel::<()>();
-
-                let _t = thread::spawn(move|| {
-                    rx3.recv().unwrap();
-                    tx1.clone();
-                    assert_eq!(rx3.try_recv(), Err(TryRecvError::Empty));
-                    tx1.send(2).unwrap();
-                    rx3.recv().unwrap();
-                });
+        select! {
+            a = rx1.recv() => { assert_eq!(a.unwrap(), 1); },
+            a = rx2.recv() => { assert_eq!(a.unwrap(), 2); }
+        }
+        select! {
+            a = rx1.recv() => { assert_eq!(a.unwrap(), 1); },
+            a = rx2.recv() => { assert_eq!(a.unwrap(), 2); }
+        }
+        assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
+        assert_eq!(rx2.try_recv(), Err(TryRecvError::Empty));
+        tx3.send(()).unwrap();
+    }
 
-                tx3.send(()).unwrap();
-                mpsc_select! {
-                    _i1 = rx1.recv() => {},
-                    _i2 = rx2.recv() => panic!()
+    #[test]
+    fn stress() {
+        const AMT: i32 = 10000;
+        let (tx1, rx1) = channel::<i32>();
+        let (tx2, rx2) = channel::<i32>();
+        let (tx3, rx3) = channel::<()>();
+
+        let _t = thread::spawn(move || {
+            for i in 0..AMT {
+                if i % 2 == 0 {
+                    tx1.send(i).unwrap();
+                } else {
+                    tx2.send(i).unwrap();
                 }
-                tx3.send(()).unwrap();
-            }
-
-            #[test]
-            fn cloning3() {
-                let (tx1, rx1) = channel::<()>();
-                let (tx2, rx2) = channel::<()>();
-                let (tx3, rx3) = channel::<()>();
-                let _t = thread::spawn(move|| {
-                    mpsc_select! {
-                        _ = rx1.recv() => panic!(),
-                        _ = rx2.recv() => {}
-                    }
-                    tx3.send(()).unwrap();
-                });
-
-                for _ in 0..1000 { thread::yield_now(); }
-                drop(tx1.clone());
-                tx2.send(()).unwrap();
                 rx3.recv().unwrap();
             }
+        });
 
-            #[test]
-            fn preflight1() {
-                let (tx, rx) = channel();
-                tx.send(()).unwrap();
-                mpsc_select! {
-                    _n = rx.recv() => {}
-                }
+        for i in 0..AMT {
+            select! {
+                i1 = rx1.recv() => { assert!(i % 2 == 0 && i == i1.unwrap()); },
+                i2 = rx2.recv() => { assert!(i % 2 == 1 && i == i2.unwrap()); }
             }
+            tx3.send(()).unwrap();
+        }
+    }
 
-            #[test]
-            fn preflight2() {
-                let (tx, rx) = channel();
-                tx.send(()).unwrap();
-                tx.send(()).unwrap();
-                mpsc_select! {
-                    _n = rx.recv() => {}
-                }
-            }
+    #[allow(unused_must_use)]
+    #[test]
+    fn cloning() {
+        let (tx1, rx1) = channel::<i32>();
+        let (_tx2, rx2) = channel::<i32>();
+        let (tx3, rx3) = channel::<()>();
+
+        let _t = thread::spawn(move || {
+            rx3.recv().unwrap();
+            tx1.clone();
+            assert_eq!(rx3.try_recv(), Err(TryRecvError::Empty));
+            tx1.send(2).unwrap();
+            rx3.recv().unwrap();
+        });
 
-            #[test]
-            fn preflight3() {
-                let (tx, rx) = channel();
-                drop(tx.clone());
-                tx.send(()).unwrap();
-                mpsc_select! {
-                    _n = rx.recv() => {}
-                }
-            }
+        tx3.send(()).unwrap();
+        select! {
+            _i1 = rx1.recv() => {},
+            _i2 = rx2.recv() => panic!()
+        }
+        tx3.send(()).unwrap();
+    }
 
-            #[test]
-            fn preflight4() {
-                let (tx, rx) = channel();
-                tx.send(()).unwrap();
-                mpsc_select! {
-                    _ = rx.recv() => {}
-                }
-            }
+    #[allow(unused_must_use)]
+    #[test]
+    fn cloning2() {
+        let (tx1, rx1) = channel::<i32>();
+        let (_tx2, rx2) = channel::<i32>();
+        let (tx3, rx3) = channel::<()>();
+
+        let _t = thread::spawn(move || {
+            rx3.recv().unwrap();
+            tx1.clone();
+            assert_eq!(rx3.try_recv(), Err(TryRecvError::Empty));
+            tx1.send(2).unwrap();
+            rx3.recv().unwrap();
+        });
 
-            #[test]
-            fn preflight5() {
-                let (tx, rx) = channel();
-                tx.send(()).unwrap();
-                tx.send(()).unwrap();
-                mpsc_select! {
-                    _ = rx.recv() => {}
-                }
-            }
+        tx3.send(()).unwrap();
+        select! {
+            _i1 = rx1.recv() => {},
+            _i2 = rx2.recv() => panic!()
+        }
+        tx3.send(()).unwrap();
+    }
 
-            #[test]
-            fn preflight6() {
-                let (tx, rx) = channel();
-                drop(tx.clone());
-                tx.send(()).unwrap();
-                mpsc_select! {
-                    _ = rx.recv() => {}
-                }
-            }
+    #[test]
+    fn cloning3() {
+        let (tx1, rx1) = channel::<()>();
+        let (tx2, rx2) = channel::<()>();
+        let (tx3, rx3) = channel::<()>();
+        let _t = thread::spawn(move || {
+            select! {
+                _ = rx1.recv() => panic!(),
+                _ = rx2.recv() => {}
+            }
+            tx3.send(()).unwrap();
+        });
+
+        for _ in 0..1000 {
+            thread::yield_now();
+        }
+        drop(tx1.clone());
+        tx2.send(()).unwrap();
+        rx3.recv().unwrap();
+    }
 
-            #[test]
-            fn preflight7() {
-                let (tx, rx) = channel::<()>();
-                drop(tx);
-                mpsc_select! {
-                    _ = rx.recv() => {}
-                }
-            }
+    #[test]
+    fn preflight1() {
+        let (tx, rx) = channel();
+        tx.send(()).unwrap();
+        select! {
+            _n = rx.recv() => {}
+        }
+    }
 
-            #[test]
-            fn preflight8() {
-                let (tx, rx) = channel();
-                tx.send(()).unwrap();
-                drop(tx);
-                rx.recv().unwrap();
-                mpsc_select! {
-                    _ = rx.recv() => {}
-                }
-            }
+    #[test]
+    fn preflight2() {
+        let (tx, rx) = channel();
+        tx.send(()).unwrap();
+        tx.send(()).unwrap();
+        select! {
+            _n = rx.recv() => {}
+        }
+    }
 
-            #[test]
-            fn preflight9() {
-                let (tx, rx) = channel();
-                drop(tx.clone());
-                tx.send(()).unwrap();
-                drop(tx);
-                rx.recv().unwrap();
-                mpsc_select! {
-                    _ = rx.recv() => {}
-                }
-            }
+    #[test]
+    fn preflight3() {
+        let (tx, rx) = channel();
+        drop(tx.clone());
+        tx.send(()).unwrap();
+        select! {
+            _n = rx.recv() => {}
+        }
+    }
 
-            #[test]
-            fn oneshot_data_waiting() {
-                let (tx1, rx1) = channel::<()>();
-                let (tx2, rx2) = channel::<()>();
-                let _t = thread::spawn(move|| {
-                    mpsc_select! {
-                        _n = rx1.recv() => {}
-                    }
-                    tx2.send(()).unwrap();
-                });
+    #[test]
+    fn preflight4() {
+        let (tx, rx) = channel();
+        tx.send(()).unwrap();
+        select! {
+            _ = rx.recv() => {}
+        }
+    }
 
-                for _ in 0..100 { thread::yield_now() }
-                tx1.send(()).unwrap();
-                rx2.recv().unwrap();
-            }
+    #[test]
+    fn preflight5() {
+        let (tx, rx) = channel();
+        tx.send(()).unwrap();
+        tx.send(()).unwrap();
+        select! {
+            _ = rx.recv() => {}
+        }
+    }
 
-            #[test]
-            fn stream_data_waiting() {
-                let (tx1, rx1) = channel();
-                let (tx2, rx2) = channel();
-                tx1.send(()).unwrap();
-                tx1.send(()).unwrap();
-                rx1.recv().unwrap();
-                rx1.recv().unwrap();
-                let _t = thread::spawn(move|| {
-                    mpsc_select! {
-                        _n = rx1.recv() => {}
-                    }
-                    tx2.send(()).unwrap();
-                });
+    #[test]
+    fn preflight6() {
+        let (tx, rx) = channel();
+        drop(tx.clone());
+        tx.send(()).unwrap();
+        select! {
+            _ = rx.recv() => {}
+        }
+    }
 
-                for _ in 0..100 { thread::yield_now() }
-                tx1.send(()).unwrap();
-                rx2.recv().unwrap();
-            }
+    #[test]
+    fn preflight7() {
+        let (tx, rx) = channel::<()>();
+        drop(tx);
+        select! {
+            _ = rx.recv() => {}
+        }
+    }
 
-            #[test]
-            fn shared_data_waiting() {
-                let (tx1, rx1) = channel();
-                let (tx2, rx2) = channel();
-                drop(tx1.clone());
-                tx1.send(()).unwrap();
-                rx1.recv().unwrap();
-                let _t = thread::spawn(move|| {
-                    mpsc_select! {
-                        _n = rx1.recv() => {}
-                    }
-                    tx2.send(()).unwrap();
-                });
+    #[test]
+    fn preflight8() {
+        let (tx, rx) = channel();
+        tx.send(()).unwrap();
+        drop(tx);
+        rx.recv().unwrap();
+        select! {
+            _ = rx.recv() => {}
+        }
+    }
 
-                for _ in 0..100 { thread::yield_now() }
-                tx1.send(()).unwrap();
-                rx2.recv().unwrap();
-            }
+    #[test]
+    fn preflight9() {
+        let (tx, rx) = channel();
+        drop(tx.clone());
+        tx.send(()).unwrap();
+        drop(tx);
+        rx.recv().unwrap();
+        select! {
+            _ = rx.recv() => {}
+        }
+    }
 
-            #[test]
-            fn sync1() {
-                let (tx, rx) = sync_channel::<i32>(1);
-                tx.send(1).unwrap();
-                mpsc_select! {
-                    n = rx.recv() => { assert_eq!(n.unwrap(), 1); }
-                }
+    #[test]
+    fn oneshot_data_waiting() {
+        let (tx1, rx1) = channel();
+        let (tx2, rx2) = channel();
+        let _t = thread::spawn(move || {
+            select! {
+                _n = rx1.recv() => {}
             }
+            tx2.send(()).unwrap();
+        });
 
-            #[test]
-            fn sync2() {
-                let (tx, rx) = sync_channel::<i32>(0);
-                let _t = thread::spawn(move|| {
-                    for _ in 0..100 { thread::yield_now() }
-                    tx.send(1).unwrap();
-                });
-                mpsc_select! {
-                    n = rx.recv() => { assert_eq!(n.unwrap(), 1); }
-                }
-            }
+        for _ in 0..100 {
+            thread::yield_now()
+        }
+        tx1.send(()).unwrap();
+        rx2.recv().unwrap();
+    }
 
-            #[test]
-            fn sync3() {
-                let (tx1, rx1) = sync_channel::<i32>(0);
-                let (tx2, rx2): (Sender<i32>, Receiver<i32>) = channel();
-                let _t = thread::spawn(move|| { tx1.send(1).unwrap(); });
-                let _t = thread::spawn(move|| { tx2.send(2).unwrap(); });
-                mpsc_select! {
-                    n = rx1.recv() => {
-                        let n = n.unwrap();
-                        assert_eq!(n, 1);
-                        assert_eq!(rx2.recv().unwrap(), 2);
-                    },
-                    n = rx2.recv() => {
-                        let n = n.unwrap();
-                        assert_eq!(n, 2);
-                        assert_eq!(rx1.recv().unwrap(), 1);
-                    }
-                }
+    #[test]
+    fn stream_data_waiting() {
+        let (tx1, rx1) = channel();
+        let (tx2, rx2) = channel();
+        tx1.send(()).unwrap();
+        tx1.send(()).unwrap();
+        rx1.recv().unwrap();
+        rx1.recv().unwrap();
+        let _t = thread::spawn(move || {
+            select! {
+                _n = rx1.recv() => {}
             }
+            tx2.send(()).unwrap();
+        });
+
+        for _ in 0..100 {
+            thread::yield_now()
         }
+        tx1.send(()).unwrap();
+        rx2.recv().unwrap();
     }
-}
 
-mod normal {
-    tests!(wrappers::normal);
-}
+    #[test]
+    fn shared_data_waiting() {
+        let (tx1, rx1) = channel();
+        let (tx2, rx2) = channel();
+        drop(tx1.clone());
+        tx1.send(()).unwrap();
+        rx1.recv().unwrap();
+        let _t = thread::spawn(move || {
+            select! {
+                _n = rx1.recv() => {}
+            }
+            tx2.send(()).unwrap();
+        });
 
-mod cloned {
-    tests!(wrappers::cloned);
-}
+        for _ in 0..100 {
+            thread::yield_now()
+        }
+        tx1.send(()).unwrap();
+        rx2.recv().unwrap();
+    }
 
-mod select {
-    tests!(wrappers::select);
-}
+    #[test]
+    fn sync1() {
+        let (tx, rx) = sync_channel::<i32>(1);
+        tx.send(1).unwrap();
+        select! {
+            n = rx.recv() => { assert_eq!(n.unwrap(), 1); }
+        }
+    }
 
-mod select_spin {
-    tests!(wrappers::select_spin);
-}
+    #[test]
+    fn sync2() {
+        let (tx, rx) = sync_channel::<i32>(0);
+        let _t = thread::spawn(move || {
+            for _ in 0..100 {
+                thread::yield_now()
+            }
+            tx.send(1).unwrap();
+        });
+        select! {
+            n = rx.recv() => { assert_eq!(n.unwrap(), 1); }
+        }
+    }
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+    #[test]
+    fn sync3() {
+        let (tx1, rx1) = sync_channel::<i32>(0);
+        let (tx2, rx2): (Sender<i32>, Receiver<i32>) = channel();
+        let _t = thread::spawn(move || {
+            tx1.send(1).unwrap();
+        });
+        let _t = thread::spawn(move || {
+            tx2.send(2).unwrap();
+        });
+        select! {
+            n = rx1.recv() => {
+                let n = n.unwrap();
+                assert_eq!(n, 1);
+                assert_eq!(rx2.recv().unwrap(), 2);
+            },
+            n = rx2.recv() => {
+                let n = n.unwrap();
+                assert_eq!(n, 2);
+                assert_eq!(rx1.recv().unwrap(), 1);
+            }
+        }
+    }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/never.rs cargo-0.33.0/vendor/crossbeam-channel/tests/never.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/never.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/never.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,99 @@
+//! Tests for the never channel flavor.
+
+#[macro_use]
+extern crate crossbeam_channel;
+extern crate rand;
+
+use std::thread;
+use std::time::{Duration, Instant};
+
+use crossbeam_channel::{never, tick, unbounded};
+
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
+
+#[test]
+fn smoke() {
+    select! {
+        recv(never::<i32>()) -> _ => panic!(),
+        default => {}
+    }
+}
+
+#[test]
+fn optional() {
+    let (s, r) = unbounded::<i32>();
+    s.send(1).unwrap();
+    s.send(2).unwrap();
+
+    let mut r = Some(&r);
+    select! {
+        recv(r.unwrap_or(&never())) -> _ => {}
+        default => panic!(),
+    }
+
+    r = None;
+    select! {
+        recv(r.unwrap_or(&never())) -> _ => panic!(),
+        default => {}
+    }
+}
+
+#[test]
+fn tick_n() {
+    let mut r = tick(ms(100));
+    let mut step = 0;
+
+    loop {
+        select! {
+            recv(r) -> _ => step += 1,
+            default(ms(500)) => break,
+        }
+
+        if step == 10 {
+            r = never();
+        }
+    }
+
+    assert_eq!(step, 10);
+}
+
+#[test]
+fn capacity() {
+    let r = never::<i32>();
+    assert_eq!(r.capacity(), Some(0));
+}
+
+#[test]
+fn len_empty_full() {
+    let r = never::<i32>();
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), true);
+}
+
+#[test]
+fn try_recv() {
+    let r = never::<i32>();
+    assert!(r.try_recv().is_err());
+
+    thread::sleep(ms(100));
+    assert!(r.try_recv().is_err());
+}
+
+#[test]
+fn recv_timeout() {
+    let start = Instant::now();
+    let r = never::<i32>();
+
+    assert!(r.recv_timeout(ms(100)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(100));
+    assert!(now - start <= ms(150));
+
+    assert!(r.recv_timeout(ms(100)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(200));
+    assert!(now - start <= ms(250));
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/parse.rs cargo-0.33.0/vendor/crossbeam-channel/tests/parse.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/parse.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/parse.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,405 +0,0 @@
-//! Tests for the `select!` macro parser.
-//!
-//! These tests make sure that all possible invocations of `select!` actually compile.
-
-#![deny(unsafe_code)]
-
-extern crate crossbeam;
-#[macro_use]
-extern crate crossbeam_channel as channel;
-
-use std::ops::Deref;
-
-#[test]
-fn recv() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
-    let rs = [r1, r2];
-
-    s1.send(0);
-    s2.send(0);
-
-    select! {
-        recv(rs) => {}
-    }
-
-    select! {
-        recv(rs) => {}
-        default => panic!(),
-    }
-
-    select! {
-        recv(rs) => panic!(),
-        default => {}
-    }
-}
-
-#[test]
-fn references() {
-    let (s, r) = channel::unbounded::<i32>();
-    select! {
-        send(s, 0) => {}
-        recv(r) => {}
-    }
-    select! {
-        send(&&&&s, 0) => {}
-        recv(&&&&r) => {}
-    }
-
-    select! {
-        send([&s].iter().map(|x| *x), 0) => {}
-        recv([&r].iter().map(|x| *x)) => {}
-    }
-
-    let ss = &&&&[s];
-    let rr = &&&&[r];
-    select! {
-        send(ss.iter(), 0) => {}
-        recv(rr.iter()) => {}
-    }
-    select! {
-        send(&&&&ss.iter(), 0) => {}
-        recv(&&&&rr.iter()) => {}
-    }
-}
-
-#[test]
-fn blocks() {
-    let (s, r) = channel::unbounded::<i32>();
-
-    select! {
-        recv(r) => 3.0
-        recv(r) => loop {
-            unreachable!()
-        }
-        recv(r) => match 7 + 3 {
-            _ => unreachable!()
-        }
-        default => 7.
-    };
-
-    select! {
-        recv(r, msg) => if msg.is_some() {
-            unreachable!()
-        }
-        default => ()
-    }
-
-    drop(s);
-}
-
-#[test]
-fn move_handles() {
-    let (s, r) = channel::unbounded::<i32>();
-    select! {
-        recv((move || r)()) => {}
-        send((move || s)(), 0) => {}
-    }
-}
-
-#[test]
-fn infer_types() {
-    let (s, r) = channel::unbounded();
-    select! {
-        recv(r) => {}
-        default => {}
-    }
-    s.send(());
-
-    let (s, r) = channel::unbounded();
-    select! {
-        send(s, ()) => {}
-    }
-    r.recv();
-}
-
-#[test]
-fn default() {
-    let (s, r) = channel::bounded::<i32>(0);
-
-    select! {
-        recv(r) => panic!(),
-        default => {}
-    }
-    select! {
-        send(s, 0) => panic!(),
-        default() => {}
-    }
-    select! {
-        default => {}
-    }
-    select! {
-        default() => {}
-    }
-}
-
-#[test]
-fn same_variable_name() {
-    let (_, r) = channel::unbounded::<i32>();
-    select! {
-        recv(r, r) => assert!(r.is_none()),
-    }
-
-    let (s, _) = channel::unbounded::<i32>();
-    let s2 = s.clone();
-    select! {
-        send(s, 0, s) => assert_eq!(s, &s2),
-    }
-}
-
-#[test]
-fn handles_on_heap() {
-    let (s, r) = channel::unbounded::<i32>();
-    let (s, r) = (Box::new(s), Box::new(r));
-
-    select! {
-        send(*s, 0) => {}
-        recv(*r) => {}
-        default => {}
-    }
-
-    drop(s);
-    drop(r);
-}
-
-#[test]
-fn option_receiver() {
-    let (_, r) = channel::unbounded::<i32>();
-    select! {
-        recv(Some(&r)) => {}
-    }
-    select! {
-        recv(Some(&r)) => {}
-        recv(Some(&r)) => {}
-    }
-
-    let r: Option<channel::Receiver<u32>> = None;
-    select! {
-        recv(r.as_ref()) => {}
-        default => {}
-    }
-    select! {
-        recv(r.as_ref()) => {}
-        recv(r.as_ref()) => {}
-        default => {}
-    }
-
-    let r: Option<&&&Box<&&channel::Receiver<u32>>> = None;
-    let r: Option<&channel::Receiver<u32>> = match r {
-        None => None,
-        Some(r) => Some(r),
-    };
-    select! {
-        recv(r) => {}
-        default => {}
-    }
-    select! {
-        recv(r) => {}
-        recv(r) => {}
-        default => {}
-    }
-}
-
-#[test]
-fn option_sender() {
-    let (s, _) = channel::unbounded::<i32>();
-    select! {
-        send(Some(&s), 0) => {}
-        default => {}
-    }
-    select! {
-        send(Some(&s), 0) => {}
-        send(Some(&s), 0) => {}
-        default => {}
-    }
-
-    let s: Option<channel::Sender<u32>> = None;
-    select! {
-        send(s.as_ref(), 0) => {}
-        default => {}
-    }
-    select! {
-        send(s.as_ref(), 0) => {}
-        send(s.as_ref(), 0) => {}
-        default => {}
-    }
-
-    let s: Option<&&&Box<&&channel::Sender<u32>>> = None;
-    let s: Option<&channel::Sender<u32>> = match s {
-        None => None,
-        Some(s) => Some(s),
-    };
-    select! {
-        send(s, 0) => {}
-        default => {}
-    }
-    select! {
-        send(s, 0) => {}
-        send(s, 0) => {}
-        default => {}
-    }
-}
-
-#[test]
-fn once_blocks() {
-    let (s, r) = channel::unbounded::<i32>();
-
-    let once = Box::new(());
-    select! {
-        send(s, 0) => drop(once),
-    }
-
-    let once = Box::new(());
-    select! {
-        recv(r) => drop(once),
-    }
-
-    let once1 = Box::new(());
-    let once2 = Box::new(());
-    select! {
-        send(s, 0) => drop(once1),
-        default => drop(once2),
-    }
-
-    let once1 = Box::new(());
-    let once2 = Box::new(());
-    select! {
-        recv(r) => drop(once1),
-        default => drop(once2),
-    }
-
-    let once1 = Box::new(());
-    let once2 = Box::new(());
-    select! {
-        recv(r) => drop(once1),
-        send(s, 0) => drop(once2),
-    }
-}
-
-#[test]
-fn once_receiver() {
-    let (_, r) = channel::unbounded::<i32>();
-
-    let once = Box::new(());
-    let get = move || {
-        drop(once);
-        r
-    };
-
-    select! {
-        recv(get()) => {}
-    }
-}
-
-#[test]
-fn once_sender() {
-    let (s, _) = channel::unbounded::<i32>();
-
-    let once = Box::new(());
-    let get = move || {
-        drop(once);
-        s
-    };
-
-    select! {
-        send(get(), 5) => {}
-    }
-}
-
-#[test]
-fn once_receive() {
-
-}
-
-#[test]
-fn nesting() {
-    let (_, r) = channel::unbounded::<i32>();
-
-    select! {
-        recv(r) => {
-            select! {
-                recv(r) => {
-                    select! {
-                        recv(r) => {
-                            select! {
-                                default => {}
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn evaluate() {
-    let (s, r) = channel::unbounded::<i32>();
-
-    let v = select! {
-        recv(r) => "foo".into(),
-        send(s, 0) => "bar".to_owned(),
-        default => "baz".to_string(),
-    };
-    assert_eq!(v, "bar");
-
-    let v = select! {
-        recv(r) => "foo".into(),
-        default => "baz".to_string(),
-    };
-    assert_eq!(v, "foo");
-
-    let v = select! {
-        recv(r) => "foo".into(),
-        default => "baz".to_string(),
-    };
-    assert_eq!(v, "baz");
-}
-
-#[test]
-fn variety() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::bounded::<String>(1);
-    let (s3, r3) = channel::bounded::<()>(0);
-
-    select! {
-        recv(r1) => {}
-        send(s1, 7) => {}
-        recv(Some(r2)) => {}
-        send(Some(s2), "foo".to_string()) => {}
-        recv([&r3].iter().map(|x| *x)) => {}
-        send([&s3].iter().map(|x| *x), ()) => {}
-        default => {}
-    }
-}
-
-#[test]
-fn deref() {
-    struct Sender<T>(channel::Sender<T>);
-    struct Receiver<T>(channel::Receiver<T>);
-
-    impl<T> Deref for Receiver<T> {
-        type Target = channel::Receiver<T>;
-
-        fn deref(&self) -> &Self::Target {
-            &self.0
-        }
-    }
-
-    impl<T> Deref for Sender<T> {
-        type Target = channel::Sender<T>;
-
-        fn deref(&self) -> &Self::Target {
-            &self.0
-        }
-    }
-
-    let (s, r) = channel::bounded::<i32>(0);
-    let (s, r) = (Sender(s), Receiver(r));
-
-    select! {
-        send(s, 0) => panic!(),
-        recv(r) => panic!(),
-        default => {}
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/ready.rs cargo-0.33.0/vendor/crossbeam-channel/tests/ready.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/ready.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/ready.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,822 @@
+//! Tests for channel readiness using the `Select` struct.
+
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
+
+use std::any::Any;
+use std::cell::Cell;
+use std::thread;
+use std::time::{Duration, Instant};
+
+use crossbeam_channel::{after, bounded, tick, unbounded};
+use crossbeam_channel::{Receiver, Select, TryRecvError, TrySendError};
+use crossbeam_utils::thread::scope;
+
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
+
+#[test]
+fn smoke1() {
+    let (s1, r1) = unbounded::<usize>();
+    let (s2, r2) = unbounded::<usize>();
+
+    s1.send(1).unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r1);
+    sel.recv(&r2);
+    assert_eq!(sel.ready(), 0);
+    assert_eq!(r1.try_recv(), Ok(1));
+
+    s2.send(2).unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r1);
+    sel.recv(&r2);
+    assert_eq!(sel.ready(), 1);
+    assert_eq!(r2.try_recv(), Ok(2));
+}
+
+#[test]
+fn smoke2() {
+    let (_s1, r1) = unbounded::<i32>();
+    let (_s2, r2) = unbounded::<i32>();
+    let (_s3, r3) = unbounded::<i32>();
+    let (_s4, r4) = unbounded::<i32>();
+    let (s5, r5) = unbounded::<i32>();
+
+    s5.send(5).unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r1);
+    sel.recv(&r2);
+    sel.recv(&r3);
+    sel.recv(&r4);
+    sel.recv(&r5);
+    assert_eq!(sel.ready(), 4);
+    assert_eq!(r5.try_recv(), Ok(5));
+}
+
+#[test]
+fn disconnected() {
+    let (s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            drop(s1);
+            thread::sleep(ms(500));
+            s2.send(5).unwrap();
+        });
+
+        let mut sel = Select::new();
+        sel.recv(&r1);
+        sel.recv(&r2);
+        match sel.ready_timeout(ms(1000)) {
+            Ok(0) => assert_eq!(r1.try_recv(), Err(TryRecvError::Disconnected)),
+            _ => panic!(),
+        }
+
+        r2.recv().unwrap();
+    }).unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r1);
+    sel.recv(&r2);
+    match sel.ready_timeout(ms(1000)) {
+        Ok(0) => assert_eq!(r1.try_recv(), Err(TryRecvError::Disconnected)),
+        _ => panic!(),
+    }
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            drop(s2);
+        });
+
+        let mut sel = Select::new();
+        sel.recv(&r2);
+        match sel.ready_timeout(ms(1000)) {
+            Ok(0) => assert_eq!(r2.try_recv(), Err(TryRecvError::Disconnected)),
+            _ => panic!(),
+        }
+    }).unwrap();
+}
+
+#[test]
+fn default() {
+    let (s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
+
+    let mut sel = Select::new();
+    sel.recv(&r1);
+    sel.recv(&r2);
+    assert!(sel.try_ready().is_err());
+
+    drop(s1);
+
+    let mut sel = Select::new();
+    sel.recv(&r1);
+    sel.recv(&r2);
+    match sel.try_ready() {
+        Ok(0) => assert!(r1.try_recv().is_err()),
+        _ => panic!(),
+    }
+
+    s2.send(2).unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r2);
+    match sel.try_ready() {
+        Ok(0) => assert_eq!(r2.try_recv(), Ok(2)),
+        _ => panic!(),
+    }
+
+    let mut sel = Select::new();
+    sel.recv(&r2);
+    assert!(sel.try_ready().is_err());
+
+    let mut sel = Select::new();
+    assert!(sel.try_ready().is_err());
+}
+
+#[test]
+fn timeout() {
+    let (_s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(1500));
+            s2.send(2).unwrap();
+        });
+
+        let mut sel = Select::new();
+        sel.recv(&r1);
+        sel.recv(&r2);
+        assert!(sel.ready_timeout(ms(1000)).is_err());
+
+        let mut sel = Select::new();
+        sel.recv(&r1);
+        sel.recv(&r2);
+        match sel.ready_timeout(ms(1000)) {
+            Ok(1) => assert_eq!(r2.try_recv(), Ok(2)),
+            _ => panic!(),
+        }
+    }).unwrap();
+
+    scope(|scope| {
+        let (s, r) = unbounded::<i32>();
+
+        scope.spawn(move |_| {
+            thread::sleep(ms(500));
+            drop(s);
+        });
+
+        let mut sel = Select::new();
+        assert!(sel.ready_timeout(ms(1000)).is_err());
+
+        let mut sel = Select::new();
+        sel.recv(&r);
+        match sel.try_ready() {
+            Ok(0) => assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected)),
+            _ => panic!(),
+        }
+    }).unwrap();
+}
+
+#[test]
+fn default_when_disconnected() {
+    let (_, r) = unbounded::<i32>();
+
+    let mut sel = Select::new();
+    sel.recv(&r);
+    match sel.try_ready() {
+        Ok(0) => assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected)),
+        _ => panic!(),
+    }
+
+    let (_, r) = unbounded::<i32>();
+
+    let mut sel = Select::new();
+    sel.recv(&r);
+    match sel.ready_timeout(ms(1000)) {
+        Ok(0) => assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected)),
+        _ => panic!(),
+    }
+
+    let (s, _) = bounded::<i32>(0);
+
+    let mut sel = Select::new();
+    sel.send(&s);
+    match sel.try_ready() {
+        Ok(0) => assert_eq!(s.try_send(0), Err(TrySendError::Disconnected(0))),
+        _ => panic!(),
+    }
+
+    let (s, _) = bounded::<i32>(0);
+
+    let mut sel = Select::new();
+    sel.send(&s);
+    match sel.ready_timeout(ms(1000)) {
+        Ok(0) => assert_eq!(s.try_send(0), Err(TrySendError::Disconnected(0))),
+        _ => panic!(),
+    }
+}
+
+#[test]
+fn default_only() {
+    let start = Instant::now();
+
+    let mut sel = Select::new();
+    assert!(sel.try_ready().is_err());
+    let now = Instant::now();
+    assert!(now - start <= ms(50));
+
+    let start = Instant::now();
+    let mut sel = Select::new();
+    assert!(sel.ready_timeout(ms(500)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(450));
+    assert!(now - start <= ms(550));
+}
+
+#[test]
+fn unblocks() {
+    let (s1, r1) = bounded::<i32>(0);
+    let (s2, r2) = bounded::<i32>(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            s2.send(2).unwrap();
+        });
+
+        let mut sel = Select::new();
+        sel.recv(&r1);
+        sel.recv(&r2);
+        match sel.ready_timeout(ms(1000)) {
+            Ok(1) => assert_eq!(r2.try_recv(), Ok(2)),
+            _ => panic!(),
+        }
+    }).unwrap();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            assert_eq!(r1.recv().unwrap(), 1);
+        });
+
+        let mut sel = Select::new();
+        let oper1 = sel.send(&s1);
+        let oper2 = sel.send(&s2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => panic!(),
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => oper.send(&s1, 1).unwrap(),
+                i if i == oper2 => panic!(),
+                _ => unreachable!(),
+            },
+        }
+    }).unwrap();
+}
+
+#[test]
+fn both_ready() {
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            s1.send(1).unwrap();
+            assert_eq!(r2.recv().unwrap(), 2);
+        });
+
+        for _ in 0..2 {
+            let mut sel = Select::new();
+            sel.recv(&r1);
+            sel.send(&s2);
+            match sel.ready() {
+                0 => assert_eq!(r1.try_recv(), Ok(1)),
+                1 => s2.try_send(2).unwrap(),
+                _ => panic!(),
+            }
+        }
+    }).unwrap();
+}
+
+#[test]
+fn cloning1() {
+    scope(|scope| {
+        let (s1, r1) = unbounded::<i32>();
+        let (_s2, r2) = unbounded::<i32>();
+        let (s3, r3) = unbounded::<()>();
+
+        scope.spawn(move |_| {
+            r3.recv().unwrap();
+            drop(s1.clone());
+            assert!(r3.try_recv().is_err());
+            s1.send(1).unwrap();
+            r3.recv().unwrap();
+        });
+
+        s3.send(()).unwrap();
+
+        let mut sel = Select::new();
+        sel.recv(&r1);
+        sel.recv(&r2);
+        match sel.ready() {
+            0 => drop(r1.try_recv()),
+            1 => drop(r2.try_recv()),
+            _ => panic!(),
+        }
+
+        s3.send(()).unwrap();
+    }).unwrap();
+}
+
+#[test]
+fn cloning2() {
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = unbounded::<()>();
+    let (_s3, _r3) = unbounded::<()>();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut sel = Select::new();
+            sel.recv(&r1);
+            sel.recv(&r2);
+            match sel.ready() {
+                0 => panic!(),
+                1 => drop(r2.try_recv()),
+                _ => panic!(),
+            }
+        });
+
+        thread::sleep(ms(500));
+        drop(s1.clone());
+        s2.send(()).unwrap();
+    }).unwrap();
+}
+
+#[test]
+fn preflight1() {
+    let (s, r) = unbounded();
+    s.send(()).unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r);
+    match sel.ready() {
+        0 => drop(r.try_recv()),
+        _ => panic!(),
+    }
+}
+
+#[test]
+fn preflight2() {
+    let (s, r) = unbounded();
+    drop(s.clone());
+    s.send(()).unwrap();
+    drop(s);
+
+    let mut sel = Select::new();
+    sel.recv(&r);
+    match sel.ready() {
+        0 => assert_eq!(r.try_recv(), Ok(())),
+        _ => panic!(),
+    }
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
+}
+
+#[test]
+fn preflight3() {
+    let (s, r) = unbounded();
+    drop(s.clone());
+    s.send(()).unwrap();
+    drop(s);
+    r.recv().unwrap();
+
+    let mut sel = Select::new();
+    sel.recv(&r);
+    match sel.ready() {
+        0 => assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected)),
+        _ => panic!(),
+    }
+}
+
+#[test]
+fn duplicate_operations() {
+    let (s, r) = unbounded::<i32>();
+    let hit = vec![Cell::new(false); 4];
+
+    while hit.iter().map(|h| h.get()).any(|hit| !hit) {
+        let mut sel = Select::new();
+        sel.recv(&r);
+        sel.recv(&r);
+        sel.send(&s);
+        sel.send(&s);
+        match sel.ready() {
+            0 => {
+                assert!(r.try_recv().is_ok());
+                hit[0].set(true);
+            }
+            1 => {
+                assert!(r.try_recv().is_ok());
+                hit[1].set(true);
+            }
+            2 => {
+                assert!(s.try_send(0).is_ok());
+                hit[2].set(true);
+            }
+            3 => {
+                assert!(s.try_send(0).is_ok());
+                hit[3].set(true);
+            }
+            _ => panic!(),
+        }
+    }
+}
+
+#[test]
+fn nesting() {
+    let (s, r) = unbounded::<i32>();
+
+    let mut sel = Select::new();
+    sel.send(&s);
+    match sel.ready() {
+        0 => {
+            assert!(s.try_send(0).is_ok());
+
+            let mut sel = Select::new();
+            sel.recv(&r);
+            match sel.ready() {
+                0 => {
+                    assert_eq!(r.try_recv(), Ok(0));
+
+                    let mut sel = Select::new();
+                    sel.send(&s);
+                    match sel.ready() {
+                        0 => {
+                            assert!(s.try_send(1).is_ok());
+
+                            let mut sel = Select::new();
+                            sel.recv(&r);
+                            match sel.ready() {
+                                0 => {
+                                    assert_eq!(r.try_recv(), Ok(1));
+                                }
+                                _ => panic!(),
+                            }
+                        }
+                        _ => panic!(),
+                    }
+                }
+                _ => panic!(),
+            }
+        }
+        _ => panic!(),
+    }
+}
+
+#[test]
+fn stress_recv() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = unbounded();
+    let (s2, r2) = bounded(5);
+    let (s3, r3) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s1.send(i).unwrap();
+                r3.recv().unwrap();
+
+                s2.send(i).unwrap();
+                r3.recv().unwrap();
+            }
+        });
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                let mut sel = Select::new();
+                sel.recv(&r1);
+                sel.recv(&r2);
+                match sel.ready() {
+                    0 => assert_eq!(r1.try_recv(), Ok(i)),
+                    1 => assert_eq!(r2.try_recv(), Ok(i)),
+                    _ => panic!(),
+                }
+
+                s3.send(()).unwrap();
+            }
+        }
+    }).unwrap();
+}
+
+#[test]
+fn stress_send() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                assert_eq!(r1.recv().unwrap(), i);
+                assert_eq!(r2.recv().unwrap(), i);
+                r3.recv().unwrap();
+            }
+        });
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                let mut sel = Select::new();
+                sel.send(&s1);
+                sel.send(&s2);
+                match sel.ready() {
+                    0 => assert!(s1.try_send(i).is_ok()),
+                    1 => assert!(s2.try_send(i).is_ok()),
+                    _ => panic!(),
+                }
+            }
+            s3.send(()).unwrap();
+        }
+    }).unwrap();
+}
+
+#[test]
+fn stress_mixed() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s1.send(i).unwrap();
+                assert_eq!(r2.recv().unwrap(), i);
+                r3.recv().unwrap();
+            }
+        });
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                let mut sel = Select::new();
+                sel.recv(&r1);
+                sel.send(&s2);
+                match sel.ready() {
+                    0 => assert_eq!(r1.try_recv(), Ok(i)),
+                    1 => assert!(s2.try_send(i).is_ok()),
+                    _ => panic!(),
+                }
+            }
+            s3.send(()).unwrap();
+        }
+    }).unwrap();
+}
+
+#[test]
+fn stress_timeout_two_threads() {
+    const COUNT: usize = 20;
+
+    let (s, r) = bounded(2);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(500));
+                }
+
+                let mut done = false;
+                while !done {
+                    let mut sel = Select::new();
+                    sel.send(&s);
+                    match sel.ready_timeout(ms(100)) {
+                        Err(_) => {}
+                        Ok(0) => {
+                            assert!(s.try_send(i).is_ok());
+                            break;
+                        },
+                        Ok(_) => panic!(),
+                    }
+                }
+            }
+        });
+
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(500));
+                }
+
+                let mut done = false;
+                while !done {
+                    let mut sel = Select::new();
+                    sel.recv(&r);
+                    match sel.ready_timeout(ms(100)) {
+                        Err(_) => {}
+                        Ok(0) => {
+                            assert_eq!(r.try_recv(), Ok(i));
+                            done = true;
+                        },
+                        Ok(_) => panic!(),
+                    }
+                }
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn send_recv_same_channel() {
+    let (s, r) = bounded::<i32>(0);
+    let mut sel = Select::new();
+    sel.send(&s);
+    sel.recv(&r);
+    assert!(sel.ready_timeout(ms(100)).is_err());
+
+    let (s, r) = unbounded::<i32>();
+    let mut sel = Select::new();
+    sel.send(&s);
+    sel.recv(&r);
+    match sel.ready_timeout(ms(100)) {
+        Err(_) => panic!(),
+        Ok(0) => assert!(s.try_send(0).is_ok()),
+        Ok(_) => panic!(),
+    }
+}
+
+#[test]
+fn channel_through_channel() {
+    const COUNT: usize = 1000;
+
+    type T = Box<Any + Send>;
+
+    for cap in 1..4 {
+        let (s, r) = bounded::<T>(cap);
+
+        scope(|scope| {
+            scope.spawn(move |_| {
+                let mut s = s;
+
+                for _ in 0..COUNT {
+                    let (new_s, new_r) = bounded(cap);
+                    let mut new_r: T = Box::new(Some(new_r));
+
+                    {
+                        let mut sel = Select::new();
+                        sel.send(&s);
+                        match sel.ready() {
+                            0 => assert!(s.try_send(new_r).is_ok()),
+                            _ => panic!(),
+                        }
+                    }
+
+                    s = new_s;
+                }
+            });
+
+            scope.spawn(move |_| {
+                let mut r = r;
+
+                for _ in 0..COUNT {
+                    let new = {
+                        let mut sel = Select::new();
+                        sel.recv(&r);
+                        match sel.ready() {
+                            0 => r
+                                .try_recv()
+                                .unwrap()
+                                .downcast_mut::<Option<Receiver<T>>>()
+                                .unwrap()
+                                .take()
+                                .unwrap(),
+                            _ => panic!(),
+                        }
+                    };
+                    r = new;
+                }
+            });
+        }).unwrap();
+    }
+}
+
+#[test]
+fn fairness1() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded::<()>(COUNT);
+    let (s2, r2) = unbounded::<()>();
+
+    for _ in 0..COUNT {
+        s1.send(()).unwrap();
+        s2.send(()).unwrap();
+    }
+
+    let hits = vec![Cell::new(0usize); 4];
+    for _ in 0..COUNT {
+        let after = after(ms(0));
+        let tick = tick(ms(0));
+
+        let mut sel = Select::new();
+        sel.recv(&r1);
+        sel.recv(&r2);
+        sel.recv(&after);
+        sel.recv(&tick);
+        match sel.ready() {
+            0 => {
+                r1.try_recv().unwrap();
+                hits[0].set(hits[0].get() + 1);
+            }
+            1 => {
+                r2.try_recv().unwrap();
+                hits[1].set(hits[1].get() + 1);
+            }
+            2 => {
+                after.try_recv().unwrap();
+                hits[2].set(hits[2].get() + 1);
+            }
+            3 => {
+                tick.try_recv().unwrap();
+                hits[3].set(hits[3].get() + 1);
+            }
+            _ => panic!(),
+        }
+    }
+    assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 2));
+}
+
+#[test]
+fn fairness2() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = bounded::<()>(1);
+    let (s3, r3) = bounded::<()>(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for _ in 0..COUNT {
+                let mut sel = Select::new();
+                let mut oper1 = None;
+                let mut oper2 = None;
+                if s1.is_empty() {
+                    oper1 = Some(sel.send(&s1));
+                }
+                if s2.is_empty() {
+                    oper2 = Some(sel.send(&s2));
+                }
+                let oper3 = sel.send(&s3);
+                let oper = sel.select();
+                match oper.index() {
+                    i if Some(i) == oper1 => assert!(oper.send(&s1, ()).is_ok()),
+                    i if Some(i) == oper2 => assert!(oper.send(&s2, ()).is_ok()),
+                    i if i == oper3 => assert!(oper.send(&s3, ()).is_ok()),
+                    _ => unreachable!(),
+                }
+            }
+        });
+
+        let hits = vec![Cell::new(0usize); 3];
+        for _ in 0..COUNT {
+            let mut sel = Select::new();
+            sel.recv(&r1);
+            sel.recv(&r2);
+            sel.recv(&r3);
+            loop {
+                match sel.ready() {
+                    0 => {
+                        if r1.try_recv().is_ok() {
+                            hits[0].set(hits[0].get() + 1);
+                            break;
+                        }
+                    }
+                    1 => {
+                        if r2.try_recv().is_ok() {
+                            hits[1].set(hits[1].get() + 1);
+                            break;
+                        }
+                    }
+                    2 => {
+                        if r3.try_recv().is_ok() {
+                            hits[2].set(hits[2].get() + 1);
+                            break;
+                        }
+                    }
+                    _ => unreachable!(),
+                }
+            }
+        }
+        assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 10));
+    }).unwrap();
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/select_macro.rs cargo-0.33.0/vendor/crossbeam-channel/tests/select_macro.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/select_macro.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/select_macro.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1416 @@
+//! Tests for the `select!` macro.
+
+#![deny(unsafe_code)]
+
+#[macro_use]
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
+
+use std::any::Any;
+use std::cell::Cell;
+use std::ops::Deref;
+use std::thread;
+use std::time::{Duration, Instant};
+
+use crossbeam_channel::{after, bounded, never, tick, unbounded};
+use crossbeam_channel::{Receiver, RecvError, SendError, Sender, TryRecvError};
+use crossbeam_utils::thread::scope;
+
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
+
+#[test]
+fn smoke1() {
+    let (s1, r1) = unbounded::<usize>();
+    let (s2, r2) = unbounded::<usize>();
+
+    s1.send(1).unwrap();
+
+    select! {
+        recv(r1) -> v => assert_eq!(v, Ok(1)),
+        recv(r2) -> _ => panic!(),
+    }
+
+    s2.send(2).unwrap();
+
+    select! {
+        recv(r1) -> _ => panic!(),
+        recv(r2) -> v => assert_eq!(v, Ok(2)),
+    }
+}
+
+#[test]
+fn smoke2() {
+    let (_s1, r1) = unbounded::<i32>();
+    let (_s2, r2) = unbounded::<i32>();
+    let (_s3, r3) = unbounded::<i32>();
+    let (_s4, r4) = unbounded::<i32>();
+    let (s5, r5) = unbounded::<i32>();
+
+    s5.send(5).unwrap();
+
+    select! {
+        recv(r1) -> _ => panic!(),
+        recv(r2) -> _ => panic!(),
+        recv(r3) -> _ => panic!(),
+        recv(r4) -> _ => panic!(),
+        recv(r5) -> v => assert_eq!(v, Ok(5)),
+    }
+}
+
+#[test]
+fn disconnected() {
+    let (s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            drop(s1);
+            thread::sleep(ms(500));
+            s2.send(5).unwrap();
+        });
+
+        select! {
+            recv(r1) -> v => assert!(v.is_err()),
+            recv(r2) -> _ => panic!(),
+            default(ms(1000)) => panic!(),
+        }
+
+        r2.recv().unwrap();
+    }).unwrap();
+
+    select! {
+        recv(r1) -> v => assert!(v.is_err()),
+        recv(r2) -> _ => panic!(),
+        default(ms(1000)) => panic!(),
+    }
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            drop(s2);
+        });
+
+        select! {
+            recv(r2) -> v => assert!(v.is_err()),
+            default(ms(1000)) => panic!(),
+        }
+    }).unwrap();
+}
+
+#[test]
+fn default() {
+    let (s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
+
+    select! {
+        recv(r1) -> _ => panic!(),
+        recv(r2) -> _ => panic!(),
+        default => {}
+    }
+
+    drop(s1);
+
+    select! {
+        recv(r1) -> v => assert!(v.is_err()),
+        recv(r2) -> _ => panic!(),
+        default => panic!(),
+    }
+
+    s2.send(2).unwrap();
+
+    select! {
+        recv(r2) -> v => assert_eq!(v, Ok(2)),
+        default => panic!(),
+    }
+
+    select! {
+        recv(r2) -> _ => panic!(),
+        default => {},
+    }
+
+    select! {
+        default => {},
+    }
+}
+
+#[test]
+fn timeout() {
+    let (_s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(1500));
+            s2.send(2).unwrap();
+        });
+
+        select! {
+            recv(r1) -> _ => panic!(),
+            recv(r2) -> _ => panic!(),
+            default(ms(1000)) => {},
+        }
+
+        select! {
+            recv(r1) -> _ => panic!(),
+            recv(r2) -> v => assert_eq!(v, Ok(2)),
+            default(ms(1000)) => panic!(),
+        }
+    }).unwrap();
+
+    scope(|scope| {
+        let (s, r) = unbounded::<i32>();
+
+        scope.spawn(move |_| {
+            thread::sleep(ms(500));
+            drop(s);
+        });
+
+        select! {
+            default(ms(1000)) => {
+                select! {
+                    recv(r) -> v => assert!(v.is_err()),
+                    default => panic!(),
+                }
+            }
+        }
+    }).unwrap();
+}
+
+#[test]
+fn default_when_disconnected() {
+    let (_, r) = unbounded::<i32>();
+
+    select! {
+        recv(r) -> res => assert!(res.is_err()),
+        default => panic!(),
+    }
+
+    let (_, r) = unbounded::<i32>();
+
+    select! {
+        recv(r) -> res => assert!(res.is_err()),
+        default(ms(1000)) => panic!(),
+    }
+
+    let (s, _) = bounded::<i32>(0);
+
+    select! {
+        send(s, 0) -> res => assert!(res.is_err()),
+        default => panic!(),
+    }
+
+    let (s, _) = bounded::<i32>(0);
+
+    select! {
+        send(s, 0) -> res => assert!(res.is_err()),
+        default(ms(1000)) => panic!(),
+    }
+}
+
+#[test]
+fn default_only() {
+    let start = Instant::now();
+    select! {
+        default => {}
+    }
+    let now = Instant::now();
+    assert!(now - start <= ms(50));
+
+    let start = Instant::now();
+    select! {
+        default(ms(500)) => {}
+    }
+    let now = Instant::now();
+    assert!(now - start >= ms(450));
+    assert!(now - start <= ms(550));
+}
+
+#[test]
+fn unblocks() {
+    let (s1, r1) = bounded::<i32>(0);
+    let (s2, r2) = bounded::<i32>(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            s2.send(2).unwrap();
+        });
+
+        select! {
+            recv(r1) -> _ => panic!(),
+            recv(r2) -> v => assert_eq!(v, Ok(2)),
+            default(ms(1000)) => panic!(),
+        }
+    }).unwrap();
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            assert_eq!(r1.recv().unwrap(), 1);
+        });
+
+        select! {
+            send(s1, 1) -> _ => {},
+            send(s2, 2) -> _ => panic!(),
+            default(ms(1000)) => panic!(),
+        }
+    }).unwrap();
+}
+
+#[test]
+fn both_ready() {
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            s1.send(1).unwrap();
+            assert_eq!(r2.recv().unwrap(), 2);
+        });
+
+        for _ in 0..2 {
+            select! {
+                recv(r1) -> v => assert_eq!(v, Ok(1)),
+                send(s2, 2) -> _ => {},
+            }
+        }
+    }).unwrap();
+}
+
+#[test]
+fn loop_try() {
+    const RUNS: usize = 20;
+
+    for _ in 0..RUNS {
+        let (s1, r1) = bounded::<i32>(0);
+        let (s2, r2) = bounded::<i32>(0);
+        let (s_end, r_end) = bounded::<()>(0);
+
+        scope(|scope| {
+            scope.spawn(|_| {
+                loop {
+                    select! {
+                        send(s1, 1) -> _ => break,
+                        default => {}
+                    }
+
+                    select! {
+                        recv(r_end) -> _ => break,
+                        default => {}
+                    }
+                }
+            });
+
+            scope.spawn(|_| {
+                loop {
+                    if let Ok(x) = r2.try_recv() {
+                        assert_eq!(x, 2);
+                        break;
+                    }
+
+                    select! {
+                        recv(r_end) -> _ => break,
+                        default => {}
+                    }
+                }
+            });
+
+            scope.spawn(|_| {
+                thread::sleep(ms(500));
+
+                select! {
+                    recv(r1) -> v => assert_eq!(v, Ok(1)),
+                    send(s2, 2) -> _ => {},
+                    default(ms(500)) => panic!(),
+                }
+
+                drop(s_end);
+            });
+        }).unwrap();
+    }
+}
+
+#[test]
+fn cloning1() {
+    scope(|scope| {
+        let (s1, r1) = unbounded::<i32>();
+        let (_s2, r2) = unbounded::<i32>();
+        let (s3, r3) = unbounded::<()>();
+
+        scope.spawn(move |_| {
+            r3.recv().unwrap();
+            drop(s1.clone());
+            assert_eq!(r3.try_recv(), Err(TryRecvError::Empty));
+            s1.send(1).unwrap();
+            r3.recv().unwrap();
+        });
+
+        s3.send(()).unwrap();
+
+        select! {
+            recv(r1) -> _ => {},
+            recv(r2) -> _ => {},
+        }
+
+        s3.send(()).unwrap();
+    }).unwrap();
+}
+
+#[test]
+fn cloning2() {
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = unbounded::<()>();
+    let (_s3, _r3) = unbounded::<()>();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                recv(r1) -> _ => panic!(),
+                recv(r2) -> _ => {},
+            }
+        });
+
+        thread::sleep(ms(500));
+        drop(s1.clone());
+        s2.send(()).unwrap();
+    }).unwrap();
+}
+
+#[test]
+fn preflight1() {
+    let (s, r) = unbounded();
+    s.send(()).unwrap();
+
+    select! {
+        recv(r) -> _ => {}
+    }
+}
+
+#[test]
+fn preflight2() {
+    let (s, r) = unbounded();
+    drop(s.clone());
+    s.send(()).unwrap();
+    drop(s);
+
+    select! {
+        recv(r) -> v => assert!(v.is_ok()),
+    }
+    assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
+}
+
+#[test]
+fn preflight3() {
+    let (s, r) = unbounded();
+    drop(s.clone());
+    s.send(()).unwrap();
+    drop(s);
+    r.recv().unwrap();
+
+    select! {
+        recv(r) -> v => assert!(v.is_err())
+    }
+}
+
+#[test]
+fn duplicate_operations() {
+    let (s, r) = unbounded::<i32>();
+    let mut hit = [false; 4];
+
+    while hit.iter().any(|hit| !hit) {
+        select! {
+            recv(r) -> _ => hit[0] = true,
+            recv(r) -> _ => hit[1] = true,
+            send(s, 0) -> _ => hit[2] = true,
+            send(s, 0) -> _ => hit[3] = true,
+        }
+    }
+}
+
+#[test]
+fn nesting() {
+    let (s, r) = unbounded::<i32>();
+
+    select! {
+        send(s, 0) -> _ => {
+            select! {
+                recv(r) -> v => {
+                    assert_eq!(v, Ok(0));
+                    select! {
+                        send(s, 1) -> _ => {
+                            select! {
+                                recv(r) -> v => {
+                                    assert_eq!(v, Ok(1));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[test]
+#[should_panic(expected = "send panicked")]
+fn panic_sender() {
+    fn get() -> Sender<i32> {
+        panic!("send panicked")
+    }
+
+    #[allow(unreachable_code)]
+    {
+        select! {
+            send(get(), panic!()) -> _ => {}
+        }
+    }
+}
+
+#[test]
+#[should_panic(expected = "recv panicked")]
+fn panic_receiver() {
+    fn get() -> Receiver<i32> {
+        panic!("recv panicked")
+    }
+
+    select! {
+        recv(get()) -> _ => {}
+    }
+}
+
+#[test]
+fn stress_recv() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = unbounded();
+    let (s2, r2) = bounded(5);
+    let (s3, r3) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s1.send(i).unwrap();
+                r3.recv().unwrap();
+
+                s2.send(i).unwrap();
+                r3.recv().unwrap();
+            }
+        });
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                select! {
+                    recv(r1) -> v => assert_eq!(v, Ok(i)),
+                    recv(r2) -> v => assert_eq!(v, Ok(i)),
+                }
+
+                s3.send(()).unwrap();
+            }
+        }
+    }).unwrap();
+}
+
+#[test]
+fn stress_send() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                assert_eq!(r1.recv().unwrap(), i);
+                assert_eq!(r2.recv().unwrap(), i);
+                r3.recv().unwrap();
+            }
+        });
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                select! {
+                    send(s1, i) -> _ => {},
+                    send(s2, i) -> _ => {},
+                }
+            }
+            s3.send(()).unwrap();
+        }
+    }).unwrap();
+}
+
+#[test]
+fn stress_mixed() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s1.send(i).unwrap();
+                assert_eq!(r2.recv().unwrap(), i);
+                r3.recv().unwrap();
+            }
+        });
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                select! {
+                    recv(r1) -> v => assert_eq!(v, Ok(i)),
+                    send(s2, i) -> _ => {},
+                }
+            }
+            s3.send(()).unwrap();
+        }
+    }).unwrap();
+}
+
+#[test]
+fn stress_timeout_two_threads() {
+    const COUNT: usize = 20;
+
+    let (s, r) = bounded(2);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(500));
+                }
+
+                loop {
+                    select! {
+                        send(s, i) -> _ => break,
+                        default(ms(100)) => {}
+                    }
+                }
+            }
+        });
+
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(500));
+                }
+
+                loop {
+                    select! {
+                        recv(r) -> v => {
+                            assert_eq!(v, Ok(i));
+                            break;
+                        }
+                        default(ms(100)) => {}
+                    }
+                }
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn send_recv_same_channel() {
+    let (s, r) = bounded::<i32>(0);
+    select! {
+        send(s, 0) -> _ => panic!(),
+        recv(r) -> _ => panic!(),
+        default(ms(500)) => {}
+    }
+
+    let (s, r) = unbounded::<i32>();
+    select! {
+        send(s, 0) -> _ => {},
+        recv(r) -> _ => panic!(),
+        default(ms(500)) => panic!(),
+    }
+}
+
+#[test]
+fn matching() {
+    const THREADS: usize = 44;
+
+    let (s, r) = &bounded::<usize>(0);
+
+    scope(|scope| {
+        for i in 0..THREADS {
+            scope.spawn(move |_| {
+                select! {
+                    recv(r) -> v => assert_ne!(v.unwrap(), i),
+                    send(s, i) -> _ => {},
+                }
+            });
+        }
+    }).unwrap();
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
+
+#[test]
+fn matching_with_leftover() {
+    const THREADS: usize = 55;
+
+    let (s, r) = &bounded::<usize>(0);
+
+    scope(|scope| {
+        for i in 0..THREADS {
+            scope.spawn(move |_| {
+                select! {
+                    recv(r) -> v => assert_ne!(v.unwrap(), i),
+                    send(s, i) -> _ => {},
+                }
+            });
+        }
+        s.send(!0).unwrap();
+    }).unwrap();
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
+
+#[test]
+fn channel_through_channel() {
+    const COUNT: usize = 1000;
+
+    type T = Box<Any + Send>;
+
+    for cap in 0..3 {
+        let (s, r) = bounded::<T>(cap);
+
+        scope(|scope| {
+            scope.spawn(move |_| {
+                let mut s = s;
+
+                for _ in 0..COUNT {
+                    let (new_s, new_r) = bounded(cap);
+                    let mut new_r: T = Box::new(Some(new_r));
+
+                    select! {
+                        send(s, new_r) -> _ => {}
+                    }
+
+                    s = new_s;
+                }
+            });
+
+            scope.spawn(move |_| {
+                let mut r = r;
+
+                for _ in 0..COUNT {
+                    r = select! {
+                        recv(r) -> mut msg => {
+                            msg.unwrap()
+                                .downcast_mut::<Option<Receiver<T>>>()
+                                .unwrap()
+                                .take()
+                                .unwrap()
+                        }
+                    }
+                }
+            });
+        }).unwrap();
+    }
+}
+
+#[test]
+fn linearizable_default() {
+    const COUNT: usize = 100_000;
+
+    for step in 0..2 {
+        let (start_s, start_r) = bounded::<()>(0);
+        let (end_s, end_r) = bounded::<()>(0);
+
+        let ((s1, r1), (s2, r2)) = if step == 0 {
+            (bounded::<i32>(1), bounded::<i32>(1))
+        } else {
+            (unbounded::<i32>(), unbounded::<i32>())
+        };
+
+        scope(|scope| {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    start_s.send(()).unwrap();
+
+                    s1.send(1).unwrap();
+                    select! {
+                        recv(r1) -> _ => {}
+                        recv(r2) -> _ => {}
+                        default => unreachable!()
+                    }
+
+                    end_s.send(()).unwrap();
+                    let _ = r2.try_recv();
+                }
+            });
+
+            for _ in 0..COUNT {
+                start_r.recv().unwrap();
+
+                s2.send(1).unwrap();
+                let _ = r1.try_recv();
+
+                end_r.recv().unwrap();
+            }
+        }).unwrap();
+    }
+}
+
+#[test]
+fn linearizable_timeout() {
+    const COUNT: usize = 100_000;
+
+    for step in 0..2 {
+        let (start_s, start_r) = bounded::<()>(0);
+        let (end_s, end_r) = bounded::<()>(0);
+
+        let ((s1, r1), (s2, r2)) = if step == 0 {
+            (bounded::<i32>(1), bounded::<i32>(1))
+        } else {
+            (unbounded::<i32>(), unbounded::<i32>())
+        };
+
+        scope(|scope| {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    start_s.send(()).unwrap();
+
+                    s1.send(1).unwrap();
+                    select! {
+                        recv(r1) -> _ => {}
+                        recv(r2) -> _ => {}
+                        default(ms(0)) => unreachable!()
+                    }
+
+                    end_s.send(()).unwrap();
+                    let _ = r2.try_recv();
+                }
+            });
+
+            for _ in 0..COUNT {
+                start_r.recv().unwrap();
+
+                s2.send(1).unwrap();
+                let _ = r1.try_recv();
+
+                end_r.recv().unwrap();
+            }
+        }).unwrap();
+    }
+}
+
+#[test]
+fn fairness1() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded::<()>(COUNT);
+    let (s2, r2) = unbounded::<()>();
+
+    for _ in 0..COUNT {
+        s1.send(()).unwrap();
+        s2.send(()).unwrap();
+    }
+
+    let mut hits = [0usize; 4];
+    for _ in 0..COUNT {
+        select! {
+            recv(r1) -> _ => hits[0] += 1,
+            recv(r2) -> _ => hits[1] += 1,
+            recv(after(ms(0))) -> _ => hits[2] += 1,
+            recv(tick(ms(0))) -> _ => hits[3] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+}
+
+#[test]
+fn fairness2() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = bounded::<()>(1);
+    let (s3, r3) = bounded::<()>(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            let (hole, _r) = bounded(0);
+
+            for _ in 0..COUNT {
+                let s1 = if s1.is_empty() { &s1 } else { &hole };
+                let s2 = if s2.is_empty() { &s2 } else { &hole };
+
+                select! {
+                    send(s1, ()) -> res => assert!(res.is_ok()),
+                    send(s2, ()) -> res => assert!(res.is_ok()),
+                    send(s3, ()) -> res => assert!(res.is_ok()),
+                }
+            }
+        });
+
+        let hits = vec![Cell::new(0usize); 3];
+        for _ in 0..COUNT {
+            select! {
+                recv(r1) -> _ => hits[0].set(hits[0].get() + 1),
+                recv(r2) -> _ => hits[1].set(hits[1].get() + 1),
+                recv(r3) -> _ => hits[2].set(hits[2].get() + 1),
+            }
+        }
+        assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 50));
+    }).unwrap();
+}
+
+#[test]
+fn fairness_recv() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded::<()>(COUNT);
+    let (s2, r2) = unbounded::<()>();
+
+    for _ in 0..COUNT {
+        s1.send(()).unwrap();
+        s2.send(()).unwrap();
+    }
+
+    let mut hits = [0usize; 2];
+    while hits[0] + hits[1] < COUNT {
+        select! {
+            recv(r1) -> _ => hits[0] += 1,
+            recv(r2) -> _ => hits[1] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / 4));
+}
+
+#[test]
+fn fairness_send() {
+    const COUNT: usize = 10_000;
+
+    let (s1, _r1) = bounded::<()>(COUNT);
+    let (s2, _r2) = unbounded::<()>();
+
+    let mut hits = [0usize; 2];
+    for _ in 0..COUNT {
+        select! {
+            send(s1, ()) -> _ => hits[0] += 1,
+            send(s2, ()) -> _ => hits[1] += 1,
+        }
+    }
+    assert!(hits.iter().all(|x| *x >= COUNT / 4));
+}
+
+#[test]
+fn references() {
+    let (s, r) = unbounded::<i32>();
+    select! {
+        send(s, 0) -> _ => {}
+        recv(r) -> _ => {}
+    }
+    select! {
+        send(&&&&s, 0) -> _ => {}
+        recv(&&&&r) -> _ => {}
+    }
+    select! {
+        recv(Some(&r).unwrap_or(&never())) -> _ => {},
+        default => {}
+    }
+    select! {
+        recv(Some(r).unwrap_or(never())) -> _ => {},
+        default => {}
+    }
+}
+
+#[test]
+fn case_blocks() {
+    let (s, r) = unbounded::<i32>();
+
+    select! {
+        recv(r) -> _ => 3.0,
+        recv(r) -> _ => loop {
+            unreachable!()
+        },
+        recv(r) -> _ => match 7 + 3 {
+            _ => unreachable!()
+        },
+        default => 7.
+    };
+
+    select! {
+        recv(r) -> msg => if msg.is_ok() {
+            unreachable!()
+        },
+        default => ()
+    }
+
+    drop(s);
+}
+
+#[test]
+fn move_handles() {
+    let (s, r) = unbounded::<i32>();
+    select! {
+        recv((move || r)()) -> _ => {}
+        send((move || s)(), 0) -> _ => {}
+    }
+}
+
+#[test]
+fn infer_types() {
+    let (s, r) = unbounded();
+    select! {
+        recv(r) -> _ => {}
+        default => {}
+    }
+    s.send(()).unwrap();
+
+    let (s, r) = unbounded();
+    select! {
+        send(s, ()) -> _ => {}
+    }
+    r.recv().unwrap();
+}
+
+#[test]
+fn default_syntax() {
+    let (s, r) = bounded::<i32>(0);
+
+    select! {
+        recv(r) -> _ => panic!(),
+        default => {}
+    }
+    select! {
+        send(s, 0) -> _ => panic!(),
+        default() => {}
+    }
+    select! {
+        default => {}
+    }
+    select! {
+        default() => {}
+    }
+}
+
+#[test]
+fn same_variable_name() {
+    let (_, r) = unbounded::<i32>();
+    select! {
+        recv(r) -> r => assert!(r.is_err()),
+    }
+}
+
+#[test]
+fn handles_on_heap() {
+    let (s, r) = unbounded::<i32>();
+    let (s, r) = (Box::new(s), Box::new(r));
+
+    select! {
+        send(*s, 0) -> _ => {}
+        recv(*r) -> _ => {}
+        default => {}
+    }
+
+    drop(s);
+    drop(r);
+}
+
+#[test]
+fn once_blocks() {
+    let (s, r) = unbounded::<i32>();
+
+    let once = Box::new(());
+    select! {
+        send(s, 0) -> _ => drop(once),
+    }
+
+    let once = Box::new(());
+    select! {
+        recv(r) -> _ => drop(once),
+    }
+
+    let once1 = Box::new(());
+    let once2 = Box::new(());
+    select! {
+        send(s, 0) -> _ => drop(once1),
+        default => drop(once2),
+    }
+
+    let once1 = Box::new(());
+    let once2 = Box::new(());
+    select! {
+        recv(r) -> _ => drop(once1),
+        default => drop(once2),
+    }
+
+    let once1 = Box::new(());
+    let once2 = Box::new(());
+    select! {
+        recv(r) -> _ => drop(once1),
+        send(s, 0) -> _ => drop(once2),
+    }
+}
+
+#[test]
+fn once_receiver() {
+    let (_, r) = unbounded::<i32>();
+
+    let once = Box::new(());
+    let get = move || {
+        drop(once);
+        r
+    };
+
+    select! {
+        recv(get()) -> _ => {}
+    }
+}
+
+#[test]
+fn once_sender() {
+    let (s, _) = unbounded::<i32>();
+
+    let once = Box::new(());
+    let get = move || {
+        drop(once);
+        s
+    };
+
+    select! {
+        send(get(), 5) -> _ => {}
+    }
+}
+
+#[test]
+fn parse_nesting() {
+    let (_, r) = unbounded::<i32>();
+
+    select! {
+        recv(r) -> _ => {}
+        recv(r) -> _ => {
+            select! {
+                recv(r) -> _ => {}
+                recv(r) -> _ => {
+                    select! {
+                        recv(r) -> _ => {}
+                        recv(r) -> _ => {
+                            select! {
+                                default => {}
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn evaluate() {
+    let (s, r) = unbounded::<i32>();
+
+    let v = select! {
+        recv(r) -> _ => "foo".into(),
+        send(s, 0) -> _ => "bar".to_owned(),
+        default => "baz".to_string(),
+    };
+    assert_eq!(v, "bar");
+
+    let v = select! {
+        recv(r) -> _ => "foo".into(),
+        default => "baz".to_string(),
+    };
+    assert_eq!(v, "foo");
+
+    let v = select! {
+        recv(r) -> _ => "foo".into(),
+        default => "baz".to_string(),
+    };
+    assert_eq!(v, "baz");
+}
+
+#[test]
+fn deref() {
+    use crossbeam_channel as cc;
+
+    struct Sender<T>(cc::Sender<T>);
+    struct Receiver<T>(cc::Receiver<T>);
+
+    impl<T> Deref for Receiver<T> {
+        type Target = cc::Receiver<T>;
+
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+
+    impl<T> Deref for Sender<T> {
+        type Target = cc::Sender<T>;
+
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+
+    let (s, r) = bounded::<i32>(0);
+    let (s, r) = (Sender(s), Receiver(r));
+
+    select! {
+        send(s, 0) -> _ => panic!(),
+        recv(r) -> _ => panic!(),
+        default => {}
+    }
+}
+
+#[test]
+fn result_types() {
+    let (s, _) = bounded::<i32>(0);
+    let (_, r) = bounded::<i32>(0);
+
+    select! {
+        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+    }
+    select! {
+        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+        default => {}
+    }
+    select! {
+        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+        default(ms(0)) => {}
+    }
+
+    select! {
+        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+    }
+    select! {
+        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+        default => {}
+    }
+    select! {
+        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+        default(ms(0)) => {}
+    }
+
+    select! {
+        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+    }
+}
+
+#[test]
+fn try_recv() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                recv(r) -> _ => panic!(),
+                default => {}
+            }
+            thread::sleep(ms(1500));
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(7)),
+                default => panic!(),
+            }
+            thread::sleep(ms(500));
+            select! {
+                recv(r) -> v => assert_eq!(v, Err(RecvError)),
+                default => panic!(),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            select! {
+                send(s, 7) -> res => res.unwrap(),
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn recv() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(7)),
+            }
+            thread::sleep(ms(1000));
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(8)),
+            }
+            thread::sleep(ms(1000));
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(9)),
+            }
+            select! {
+                recv(r) -> v => assert_eq!(v, Err(RecvError)),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            select! {
+                send(s, 7) -> res => res.unwrap(),
+            }
+            select! {
+                send(s, 8) -> res => res.unwrap(),
+            }
+            select! {
+                send(s, 9) -> res => res.unwrap(),
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn recv_timeout() {
+    let (s, r) = bounded::<i32>(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                recv(r) -> _ => panic!(),
+                default(ms(1000)) => {}
+            }
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(7)),
+                default(ms(1000)) => panic!(),
+            }
+            select! {
+                recv(r) -> v => assert_eq!(v, Err(RecvError)),
+                default(ms(1000)) => panic!(),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            select! {
+                send(s, 7) -> res => res.unwrap(),
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn try_send() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                send(s, 7) -> _ => panic!(),
+                default => {}
+            }
+            thread::sleep(ms(1500));
+            select! {
+                send(s, 8) -> res => res.unwrap(),
+                default => panic!(),
+            }
+            thread::sleep(ms(500));
+            select! {
+                send(s, 8) -> res => assert_eq!(res, Err(SendError(8))),
+                default => panic!(),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(8)),
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn send() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                send(s, 7) -> res => res.unwrap(),
+            }
+            thread::sleep(ms(1000));
+            select! {
+                send(s, 8) -> res => res.unwrap(),
+            }
+            thread::sleep(ms(1000));
+            select! {
+                send(s, 9) -> res => res.unwrap(),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(7)),
+            }
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(8)),
+            }
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(9)),
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn send_timeout() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                send(s, 7) -> _ => panic!(),
+                default(ms(1000)) => {}
+            }
+            select! {
+                send(s, 8) -> res => res.unwrap(),
+                default(ms(1000)) => panic!(),
+            }
+            select! {
+                send(s, 9) -> res => assert_eq!(res, Err(SendError(9))),
+                default(ms(1000)) => panic!(),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            select! {
+                recv(r) -> v => assert_eq!(v, Ok(8)),
+            }
+        });
+    }).unwrap();
+}
+
+#[test]
+fn disconnect_wakes_sender() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                send(s, ()) -> res => assert_eq!(res, Err(SendError(()))),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(r);
+        });
+    }).unwrap();
+}
+
+#[test]
+fn disconnect_wakes_receiver() {
+    let (s, r) = bounded::<()>(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            select! {
+                recv(r) -> res => assert_eq!(res, Err(RecvError)),
+            }
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(s);
+        });
+    }).unwrap();
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/select.rs cargo-0.33.0/vendor/crossbeam-channel/tests/select.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/select.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/select.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,14 +1,15 @@
-//! Tests for the `select!` macro.
+//! Tests for channel selection using the `Select` struct.
 
-#![deny(unsafe_code)]
-
-extern crate crossbeam;
-#[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 
 use std::any::Any;
+use std::cell::Cell;
 use std::thread;
-use std::time::Duration;
+use std::time::{Duration, Instant};
+
+use crossbeam_channel::{after, bounded, tick, unbounded, Receiver, Select, TryRecvError};
+use crossbeam_utils::thread::scope;
 
 fn ms(ms: u64) -> Duration {
     Duration::from_millis(ms)
@@ -16,230 +17,389 @@
 
 #[test]
 fn smoke1() {
-    let (s1, r1) = channel::unbounded::<usize>();
-    let (s2, r2) = channel::unbounded::<usize>();
-
-    s1.send(1);
+    let (s1, r1) = unbounded::<usize>();
+    let (s2, r2) = unbounded::<usize>();
 
-    select! {
-        recv(r1, v) => assert_eq!(v, Some(1)),
-        recv(r2) => panic!(),
-    }
-
-    s2.send(2);
+    s1.send(1).unwrap();
 
-    select! {
-        recv(r1) => panic!(),
-        recv(r2, v) => assert_eq!(v, Some(2)),
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r1);
+    let oper2 = sel.recv(&r2);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => assert_eq!(oper.recv(&r1), Ok(1)),
+        i if i == oper2 => panic!(),
+        _ => unreachable!(),
+    }
+
+    s2.send(2).unwrap();
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r1);
+    let oper2 = sel.recv(&r2);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => panic!(),
+        i if i == oper2 => assert_eq!(oper.recv(&r2), Ok(2)),
+        _ => unreachable!(),
     }
 }
 
 #[test]
 fn smoke2() {
-    let (_s1, r1) = channel::unbounded::<i32>();
-    let (_s2, r2) = channel::unbounded::<i32>();
-    let (_s3, r3) = channel::unbounded::<i32>();
-    let (_s4, r4) = channel::unbounded::<i32>();
-    let (s5, r5) = channel::unbounded::<i32>();
-
-    s5.send(5);
-
-    select! {
-        recv(r1) => panic!(),
-        recv(r2) => panic!(),
-        recv(r3) => panic!(),
-        recv(r4) => panic!(),
-        recv(r5, v) => assert_eq!(v, Some(5)),
+    let (_s1, r1) = unbounded::<i32>();
+    let (_s2, r2) = unbounded::<i32>();
+    let (_s3, r3) = unbounded::<i32>();
+    let (_s4, r4) = unbounded::<i32>();
+    let (s5, r5) = unbounded::<i32>();
+
+    s5.send(5).unwrap();
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r1);
+    let oper2 = sel.recv(&r2);
+    let oper3 = sel.recv(&r3);
+    let oper4 = sel.recv(&r4);
+    let oper5 = sel.recv(&r5);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => panic!(),
+        i if i == oper2 => panic!(),
+        i if i == oper3 => panic!(),
+        i if i == oper4 => panic!(),
+        i if i == oper5 => assert_eq!(oper.recv(&r5), Ok(5)),
+        _ => unreachable!(),
     }
 }
 
 #[test]
-fn closed() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
+fn disconnected() {
+    let (s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             drop(s1);
             thread::sleep(ms(500));
-            s2.send(5);
+            s2.send(5).unwrap();
         });
 
-        select! {
-            recv(r1, v) => assert!(v.is_none()),
-            recv(r2) => panic!(),
-            recv(channel::after(ms(1000))) => panic!(),
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.recv(&r2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => panic!(),
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => assert!(oper.recv(&r1).is_err()),
+                i if i == oper2 => panic!(),
+                _ => unreachable!(),
+            },
         }
 
         r2.recv().unwrap();
-    });
+    }).unwrap();
 
-    select! {
-        recv(r1, v) => assert!(v.is_none()),
-        recv(r2) => panic!(),
-        recv(channel::after(ms(1000))) => panic!(),
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r1);
+    let oper2 = sel.recv(&r2);
+    let oper = sel.select_timeout(ms(1000));
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert!(oper.recv(&r1).is_err()),
+            i if i == oper2 => panic!(),
+            _ => unreachable!(),
+        },
     }
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             thread::sleep(ms(500));
             drop(s2);
         });
 
-        select! {
-            recv(r2, v) => assert!(v.is_none()),
-            recv(channel::after(ms(1000))) => panic!(),
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => panic!(),
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => assert!(oper.recv(&r2).is_err()),
+                _ => unreachable!(),
+            },
         }
-    });
+    }).unwrap();
 }
 
 #[test]
 fn default() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
+    let (s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
 
-    select! {
-        recv(r1) => panic!(),
-        recv(r2) => panic!(),
-        default => {}
+    let mut sel = Select::new();
+    let _oper1 = sel.recv(&r1);
+    let _oper2 = sel.recv(&r2);
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => {}
+        Ok(_) => panic!(),
     }
 
     drop(s1);
 
-    select! {
-        recv(r1, v) => assert!(v.is_none()),
-        recv(r2) => panic!(),
-        default => panic!(),
-    }
-
-    s2.send(2);
-
-    select! {
-        recv(r2, v) => assert_eq!(v, Some(2)),
-        default => panic!(),
-    }
-
-    select! {
-        recv(r2) => panic!(),
-        default => {},
-    }
-
-    select! {
-        default => {},
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r1);
+    let oper2 = sel.recv(&r2);
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert!(oper.recv(&r1).is_err()),
+            i if i == oper2 => panic!(),
+            _ => unreachable!(),
+        },
+    }
+
+    s2.send(2).unwrap();
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r2);
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert_eq!(oper.recv(&r2), Ok(2)),
+            _ => unreachable!(),
+        },
+    }
+
+    let mut sel = Select::new();
+    let _oper1 = sel.recv(&r2);
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => {}
+        Ok(_) => panic!(),
+    }
+
+    let mut sel = Select::new();
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => {}
+        Ok(_) => panic!(),
     }
 }
 
 #[test]
 fn timeout() {
-    let (_s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
+    let (_s1, r1) = unbounded::<i32>();
+    let (s2, r2) = unbounded::<i32>();
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             thread::sleep(ms(1500));
-            s2.send(2);
+            s2.send(2).unwrap();
         });
 
-        select! {
-            recv(r1) => panic!(),
-            recv(r2) => panic!(),
-            recv(channel::after(ms(1000))) => {},
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.recv(&r2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => {}
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => panic!(),
+                i if i == oper2 => panic!(),
+                _ => unreachable!(),
+            },
         }
 
-        select! {
-            recv(r1) => panic!(),
-            recv(r2, v) => assert_eq!(v, Some(2)),
-            recv(channel::after(ms(1000))) => panic!(),
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.recv(&r2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => panic!(),
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => panic!(),
+                i if i == oper2 => assert_eq!(oper.recv(&r2), Ok(2)),
+                _ => unreachable!(),
+            },
         }
-    });
+    }).unwrap();
 
-    crossbeam::scope(|scope| {
-        let (s, r) = channel::unbounded::<i32>();
+    scope(|scope| {
+        let (s, r) = unbounded::<i32>();
 
-        scope.spawn(move || {
+        scope.spawn(move |_| {
             thread::sleep(ms(500));
             drop(s);
         });
 
-        select! {
-            recv(channel::after(ms(1000))) => {
-                select! {
-                    recv(r, v) => assert!(v.is_none()),
-                    default => panic!(),
+        let mut sel = Select::new();
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => {
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r);
+                let oper = sel.try_select();
+                match oper {
+                    Err(_) => panic!(),
+                    Ok(oper) => match oper.index() {
+                        i if i == oper1 => assert!(oper.recv(&r).is_err()),
+                        _ => unreachable!(),
+                    },
                 }
             }
+            Ok(_) => unreachable!(),
         }
-    });
+    }).unwrap();
 }
 
 #[test]
-fn default_when_closed() {
-    let (_, r) = channel::unbounded::<i32>();
+fn default_when_disconnected() {
+    let (_, r) = unbounded::<i32>();
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert!(oper.recv(&r).is_err()),
+            _ => unreachable!(),
+        },
+    }
+
+    let (_, r) = unbounded::<i32>();
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper = sel.select_timeout(ms(1000));
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert!(oper.recv(&r).is_err()),
+            _ => unreachable!(),
+        },
+    }
+
+    let (s, _) = bounded::<i32>(0);
 
-    select! {
-        recv(r, v) => assert!(v.is_none()),
-        default => panic!(),
+    let mut sel = Select::new();
+    let oper1 = sel.send(&s);
+    let oper = sel.try_select();
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert!(oper.send(&s, 0).is_err()),
+            _ => unreachable!(),
+        },
     }
 
-    let (_, r) = channel::unbounded::<i32>();
+    let (s, _) = bounded::<i32>(0);
 
-    select! {
-        recv(r, v) => assert!(v.is_none()),
-        recv(channel::after(ms(1000))) => panic!(),
+    let mut sel = Select::new();
+    let oper1 = sel.send(&s);
+    let oper = sel.select_timeout(ms(1000));
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            i if i == oper1 => assert!(oper.send(&s, 0).is_err()),
+            _ => unreachable!(),
+        },
     }
 }
 
 #[test]
+fn default_only() {
+    let start = Instant::now();
+
+    let mut sel = Select::new();
+    let oper = sel.try_select();
+    assert!(oper.is_err());
+    let now = Instant::now();
+    assert!(now - start <= ms(50));
+
+    let start = Instant::now();
+    let mut sel = Select::new();
+    let oper = sel.select_timeout(ms(500));
+    assert!(oper.is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(450));
+    assert!(now - start <= ms(550));
+}
+
+#[test]
 fn unblocks() {
-    let (s1, r1) = channel::bounded::<i32>(0);
-    let (s2, r2) = channel::bounded::<i32>(0);
+    let (s1, r1) = bounded::<i32>(0);
+    let (s2, r2) = bounded::<i32>(0);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             thread::sleep(ms(500));
-            s2.send(2);
+            s2.send(2).unwrap();
         });
 
-        select! {
-            recv(r1) => panic!(),
-            recv(r2, v) => assert_eq!(v, Some(2)),
-            recv(channel::after(ms(1000))) => panic!(),
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.recv(&r2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => panic!(),
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => panic!(),
+                i if i == oper2 => assert_eq!(oper.recv(&r2), Ok(2)),
+                _ => unreachable!(),
+            },
         }
-    });
+    }).unwrap();
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             thread::sleep(ms(500));
             assert_eq!(r1.recv().unwrap(), 1);
         });
 
-        select! {
-            send(s1, 1) => {},
-            send(s2, 2) => panic!(),
-            recv(channel::after(ms(1000))) => panic!(),
+        let mut sel = Select::new();
+        let oper1 = sel.send(&s1);
+        let oper2 = sel.send(&s2);
+        let oper = sel.select_timeout(ms(1000));
+        match oper {
+            Err(_) => panic!(),
+            Ok(oper) => match oper.index() {
+                i if i == oper1 => oper.send(&s1, 1).unwrap(),
+                i if i == oper2 => panic!(),
+                _ => unreachable!(),
+            },
         }
-    });
+    }).unwrap();
 }
 
 #[test]
 fn both_ready() {
-    let (s1, r1) = channel::bounded(0);
-    let (s2, r2) = channel::bounded(0);
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             thread::sleep(ms(500));
-            s1.send(1);
+            s1.send(1).unwrap();
             assert_eq!(r2.recv().unwrap(), 2);
         });
 
         for _ in 0..2 {
-            select! {
-                recv(r1, v) => assert_eq!(v, Some(1)),
-                send(s2, 2) => {},
+            let mut sel = Select::new();
+            let oper1 = sel.recv(&r1);
+            let oper2 = sel.send(&s2);
+            let oper = sel.select();
+            match oper.index() {
+                i if i == oper1 => assert_eq!(oper.recv(&r1), Ok(1)),
+                i if i == oper2 => oper.send(&s2, 2).unwrap(),
+                _ => unreachable!(),
             }
         }
-    });
+    }).unwrap();
 }
 
 #[test]
@@ -247,311 +407,281 @@
     const RUNS: usize = 20;
 
     for _ in 0..RUNS {
-        let (s1, r1) = channel::bounded::<i32>(0);
-        let (s2, r2) = channel::bounded::<i32>(0);
-        let (s_end, r_end) = channel::bounded::<()>(0);
+        let (s1, r1) = bounded::<i32>(0);
+        let (s2, r2) = bounded::<i32>(0);
+        let (s_end, r_end) = bounded::<()>(0);
 
-        crossbeam::scope(|scope| {
-            scope.spawn(|| {
+        scope(|scope| {
+            scope.spawn(|_| {
                 loop {
-                    select! {
-                        send(s1, 1) => break,
-                        default => {}
+                    let mut done = false;
+
+                    let mut sel = Select::new();
+                    let oper1 = sel.send(&s1);
+                    let oper = sel.try_select();
+                    match oper {
+                        Err(_) => {}
+                        Ok(oper) => match oper.index() {
+                            i if i == oper1 => {
+                                let _ = oper.send(&s1, 1);
+                                done = true;
+                            }
+                            _ => unreachable!(),
+                        },
+                    }
+                    if done {
+                        break;
                     }
 
-                    select! {
-                        recv(r_end) => break,
-                        default => {}
+                    let mut sel = Select::new();
+                    let oper1 = sel.recv(&r_end);
+                    let oper = sel.try_select();
+                    match oper {
+                        Err(_) => {}
+                        Ok(oper) => match oper.index() {
+                            i if i == oper1 => {
+                                let _ = oper.recv(&r_end);
+                                done = true;
+                            }
+                            _ => unreachable!(),
+                        },
+                    }
+                    if done {
+                        break;
                     }
                 }
             });
 
-            scope.spawn(|| {
+            scope.spawn(|_| {
                 loop {
-                    if let Some(x) = r2.try_recv() {
+                    if let Ok(x) = r2.try_recv() {
                         assert_eq!(x, 2);
                         break;
                     }
 
-                    select! {
-                        recv(r_end) => break,
-                        default => {}
+                    let mut done = false;
+                    let mut sel = Select::new();
+                    let oper1 = sel.recv(&r_end);
+                    let oper = sel.try_select();
+                    match oper {
+                        Err(_) => {}
+                        Ok(oper) => match oper.index() {
+                            i if i == oper1 => {
+                                let _ = oper.recv(&r_end);
+                                done = true;
+                            }
+                            _ => unreachable!(),
+                        },
+                    }
+                    if done {
+                        break;
                     }
                 }
             });
 
-            scope.spawn(|| {
+            scope.spawn(|_| {
                 thread::sleep(ms(500));
 
-                select! {
-                    recv(r1, v) => assert_eq!(v, Some(1)),
-                    send(s2, 2) => {},
-                    recv(channel::after(ms(500))) => panic!(),
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r1);
+                let oper2 = sel.send(&s2);
+                let oper = sel.select_timeout(ms(1000));
+                match oper {
+                    Err(_) => {}
+                    Ok(oper) => match oper.index() {
+                        i if i == oper1 => assert_eq!(oper.recv(&r1), Ok(1)),
+                        i if i == oper2 => assert!(oper.send(&s2, 2).is_ok()),
+                        _ => unreachable!(),
+                    },
                 }
 
                 drop(s_end);
             });
-        });
+        }).unwrap();
     }
 }
 
 #[test]
 fn cloning1() {
-    crossbeam::scope(|scope| {
-        let (s1, r1) = channel::unbounded::<i32>();
-        let (_s2, r2) = channel::unbounded::<i32>();
-        let (s3, r3) = channel::unbounded::<()>();
+    scope(|scope| {
+        let (s1, r1) = unbounded::<i32>();
+        let (_s2, r2) = unbounded::<i32>();
+        let (s3, r3) = unbounded::<()>();
 
-        scope.spawn(move || {
+        scope.spawn(move |_| {
             r3.recv().unwrap();
             drop(s1.clone());
-            assert_eq!(r3.try_recv(), None);
-            s1.send(1);
+            assert!(r3.try_recv().is_err());
+            s1.send(1).unwrap();
             r3.recv().unwrap();
         });
 
-        s3.send(());
+        s3.send(()).unwrap();
 
-        select! {
-            recv(r1) => {},
-            recv(r2) => {},
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.recv(&r2);
+        let oper = sel.select();
+        match oper.index() {
+            i if i == oper1 => drop(oper.recv(&r1)),
+            i if i == oper2 => drop(oper.recv(&r2)),
+            _ => unreachable!(),
         }
 
-        s3.send(());
-    });
+        s3.send(()).unwrap();
+    }).unwrap();
 }
 
 #[test]
 fn cloning2() {
-    let (s1, r1) = channel::unbounded::<()>();
-    let (s2, r2) = channel::unbounded::<()>();
-    let (_s3, _r3) = channel::unbounded::<()>();
-
-    crossbeam::scope(|scope| {
-        scope.spawn(move || {
-            select! {
-                recv(r1) => panic!(),
-                recv(r2) => {},
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = unbounded::<()>();
+    let (_s3, _r3) = unbounded::<()>();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut sel = Select::new();
+            let oper1 = sel.recv(&r1);
+            let oper2 = sel.recv(&r2);
+            let oper = sel.select();
+            match oper.index() {
+                i if i == oper1 => panic!(),
+                i if i == oper2 => drop(oper.recv(&r2)),
+                _ => unreachable!(),
             }
         });
 
         thread::sleep(ms(500));
         drop(s1.clone());
-        s2.send(());
-    })
+        s2.send(()).unwrap();
+    }).unwrap();
 }
 
 #[test]
 fn preflight1() {
-    let (s, r) = channel::unbounded();
-    s.send(());
+    let (s, r) = unbounded();
+    s.send(()).unwrap();
 
-    select! {
-        recv(r) => {}
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => drop(oper.recv(&r)),
+        _ => unreachable!(),
     }
 }
 
 #[test]
 fn preflight2() {
-    let (s, r) = channel::unbounded();
+    let (s, r) = unbounded();
     drop(s.clone());
-    s.send(());
+    s.send(()).unwrap();
     drop(s);
 
-    select! {
-        recv(r, v) => assert!(v.is_some()),
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => assert_eq!(oper.recv(&r), Ok(())),
+        _ => unreachable!(),
     }
-    assert_eq!(r.try_recv(), None);
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
 }
 
 #[test]
 fn preflight3() {
-    let (s, r) = channel::unbounded();
+    let (s, r) = unbounded();
     drop(s.clone());
-    s.send(());
+    s.send(()).unwrap();
     drop(s);
     r.recv().unwrap();
 
-    select! {
-        recv(r, v) => assert!(v.is_none())
-    }
-}
-
-#[test]
-fn duplicate_cases() {
-    let (s, r) = channel::unbounded::<i32>();
-    let mut hit = [false; 4];
-
-    while hit.iter().any(|hit| !hit) {
-        select! {
-            recv(r) => hit[0] = true,
-            recv(Some(&r)) => hit[1] = true,
-            send(s, 0) => hit[2] = true,
-            send(Some(&s), 0) => hit[3] = true,
-        }
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => assert!(oper.recv(&r).is_err()),
+        _ => unreachable!(),
     }
 }
 
 #[test]
-fn multiple_receivers() {
-    let (_, r1) = channel::unbounded::<i32>();
-    let (_, r2) = channel::bounded::<i32>(5);
-    select! {
-        recv([&r1, &r2].iter().map(|x| *x), msg) => assert!(msg.is_none()),
-    }
-    select! {
-        recv([r1, r2].iter(), msg) => assert!(msg.is_none()),
-    }
-
-    let (_, r1) = channel::unbounded::<i32>();
-    let (_, r2) = channel::bounded::<i32>(5);
-    select! {
-        recv(&[r1, r2], msg) => assert!(msg.is_none()),
-    }
-}
-
-#[test]
-fn multiple_senders() {
-    let (s1, _) = channel::unbounded::<i32>();
-    let (s2, _) = channel::bounded::<i32>(5);
-    select! {
-        send([&s1, &s2].iter().map(|x| *x), 0) => {}
-    }
-    select! {
-        send([s1, s2].iter(), 0) => {}
-    }
-
-    let (s1, _) = channel::unbounded::<i32>();
-    let (s2, _) = channel::bounded::<i32>(5);
-    select! {
-        send(&[s1, s2], 0) => {},
-    }
-}
-
-#[test]
-fn recv_handle() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
-    let rs = [r1, r2];
-
-    s2.send(0);
-    select! {
-        recv(rs, _, r) => assert_eq!(r, &s2),
-        default => panic!(),
-    }
-
-    s1.send(0);
-    select! {
-        recv(rs, _, r) => assert_eq!(r, &s1),
-        default => panic!(),
-    }
-}
-
-#[test]
-fn send_handle() {
-    let (s1, r1) = channel::bounded::<i32>(0);
-    let (s2, r2) = channel::bounded::<i32>(0);
-    let ss = [s1, s2];
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(500));
-            select! {
-                send(ss, 0, s) => assert_eq!(s, &r2),
-                default => panic!(),
+fn duplicate_operations() {
+    let (s, r) = unbounded::<i32>();
+    let hit = vec![Cell::new(false); 4];
+
+    while hit.iter().map(|h| h.get()).any(|hit| !hit) {
+        let mut sel = Select::new();
+        let oper0 = sel.recv(&r);
+        let oper1 = sel.recv(&r);
+        let oper2 = sel.send(&s);
+        let oper3 = sel.send(&s);
+        let oper = sel.select();
+        match oper.index() {
+            i if i == oper0 => {
+                assert!(oper.recv(&r).is_ok());
+                hit[0].set(true);
             }
-        });
-        r2.recv();
-    });
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(500));
-            select! {
-                send(ss, 0, s) => assert_eq!(s, &r1),
-                default => panic!(),
+            i if i == oper1 => {
+                assert!(oper.recv(&r).is_ok());
+                hit[1].set(true);
             }
-        });
-        r1.recv();
-    });
+            i if i == oper2 => {
+                assert!(oper.send(&s, 0).is_ok());
+                hit[2].set(true);
+            }
+            i if i == oper3 => {
+                assert!(oper.send(&s, 0).is_ok());
+                hit[3].set(true);
+            }
+            _ => unreachable!(),
+        }
+    }
 }
 
 #[test]
 fn nesting() {
-    let (s, r) = channel::unbounded::<i32>();
+    let (s, r) = unbounded::<i32>();
 
-    select! {
-        send(s, 0) => {
-            select! {
-                recv(r, v) => {
-                    assert_eq!(v, Some(0));
-                    select! {
-                        send(s, 1) => {
-                            select! {
-                                recv(r, v) => {
-                                    assert_eq!(v, Some(1));
+    let mut sel = Select::new();
+    let oper1 = sel.send(&s);
+    let oper = sel.select();
+    match oper.index() {
+        i if i == oper1 => {
+            assert!(oper.send(&s, 0).is_ok());
+
+            let mut sel = Select::new();
+            let oper1 = sel.recv(&r);
+            let oper = sel.select();
+            match oper.index() {
+                i if i == oper1 => {
+                    assert_eq!(oper.recv(&r), Ok(0));
+
+                    let mut sel = Select::new();
+                    let oper1 = sel.send(&s);
+                    let oper = sel.select();
+                    match oper.index() {
+                        i if i == oper1 => {
+                            assert!(oper.send(&s, 1).is_ok());
+
+                            let mut sel = Select::new();
+                            let oper1 = sel.recv(&r);
+                            let oper = sel.select();
+                            match oper.index() {
+                                i if i == oper1 => {
+                                    assert_eq!(oper.recv(&r), Ok(1));
                                 }
+                                _ => unreachable!(),
                             }
                         }
+                        _ => unreachable!(),
                     }
                 }
+                _ => unreachable!(),
             }
         }
-    }
-}
-
-#[test]
-fn conditional_send() {
-    let (s, _) = channel::unbounded();
-
-    select! {
-        send(if 1 + 1 == 3 { Some(&s) } else { None }, ()) => panic!(),
-        recv(channel::after(ms(1000))) => {}
-    }
-
-    select! {
-        send(if 1 + 1 == 2 { Some(&s) } else { None }, ()) => {},
-        recv(channel::after(ms(1000))) => panic!(),
-    }
-}
-
-#[test]
-fn conditional_recv() {
-    let (s, r) = channel::unbounded();
-    s.send(());
-
-    select! {
-        recv(if 1 + 1 == 3 { Some(&r) } else { None }) => panic!(),
-        recv(channel::after(ms(1000))) => {}
-    }
-
-    select! {
-        recv(if 1 + 1 == 2 { Some(&r) } else { None }) => {},
-        recv(channel::after(ms(1000))) => panic!(),
-    }
-}
-
-#[test]
-#[should_panic(expected = "send panicked")]
-fn panic_send() {
-    fn get() -> channel::Sender<i32> {
-        panic!("send panicked")
-    }
-
-    select! {
-        send(get(), panic!()) => {}
-    }
-}
-
-#[test]
-#[should_panic(expected = "recv panicked")]
-fn panic_recv() {
-    fn get() -> channel::Receiver<i32> {
-        panic!("recv panicked")
-    }
-
-    select! {
-        recv(get()) => {}
+        _ => unreachable!(),
     }
 }
 
@@ -559,44 +689,49 @@
 fn stress_recv() {
     const COUNT: usize = 10_000;
 
-    let (s1, r1) = channel::unbounded();
-    let (s2, r2) = channel::bounded(5);
-    let (s3, r3) = channel::bounded(100);
+    let (s1, r1) = unbounded();
+    let (s2, r2) = bounded(5);
+    let (s3, r3) = bounded(100);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             for i in 0..COUNT {
-                s1.send(i);
+                s1.send(i).unwrap();
                 r3.recv().unwrap();
 
-                s2.send(i);
+                s2.send(i).unwrap();
                 r3.recv().unwrap();
             }
         });
 
         for i in 0..COUNT {
             for _ in 0..2 {
-                select! {
-                    recv(r1, v) => assert_eq!(v, Some(i)),
-                    recv(r2, v) => assert_eq!(v, Some(i)),
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r1);
+                let oper2 = sel.recv(&r2);
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_eq!(oper.recv(&r1), Ok(i)),
+                    ix if ix == oper2 => assert_eq!(oper.recv(&r2), Ok(i)),
+                    _ => unreachable!(),
                 }
 
-                s3.send(());
+                s3.send(()).unwrap();
             }
         }
-    });
+    }).unwrap();
 }
 
 #[test]
 fn stress_send() {
     const COUNT: usize = 10_000;
 
-    let (s1, r1) = channel::bounded(0);
-    let (s2, r2) = channel::bounded(0);
-    let (s3, r3) = channel::bounded(100);
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             for i in 0..COUNT {
                 assert_eq!(r1.recv().unwrap(), i);
                 assert_eq!(r2.recv().unwrap(), i);
@@ -606,28 +741,33 @@
 
         for i in 0..COUNT {
             for _ in 0..2 {
-                select! {
-                    send(s1, i) => {},
-                    send(s2, i) => {},
+                let mut sel = Select::new();
+                let oper1 = sel.send(&s1);
+                let oper2 = sel.send(&s2);
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert!(oper.send(&s1, i).is_ok()),
+                    ix if ix == oper2 => assert!(oper.send(&s2, i).is_ok()),
+                    _ => unreachable!(),
                 }
             }
-            s3.send(());
+            s3.send(()).unwrap();
         }
-    });
+    }).unwrap();
 }
 
 #[test]
 fn stress_mixed() {
     const COUNT: usize = 10_000;
 
-    let (s1, r1) = channel::bounded(0);
-    let (s2, r2) = channel::bounded(0);
-    let (s3, r3) = channel::bounded(100);
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             for i in 0..COUNT {
-                s1.send(i);
+                s1.send(i).unwrap();
                 assert_eq!(r2.recv().unwrap(), i);
                 r3.recv().unwrap();
             }
@@ -635,72 +775,108 @@
 
         for i in 0..COUNT {
             for _ in 0..2 {
-                select! {
-                    recv(r1, v) => assert_eq!(v, Some(i)),
-                    send(s2, i) => {},
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r1);
+                let oper2 = sel.send(&s2);
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_eq!(oper.recv(&r1), Ok(i)),
+                    ix if ix == oper2 => assert!(oper.send(&s2, i).is_ok()),
+                    _ => unreachable!(),
                 }
             }
-            s3.send(());
+            s3.send(()).unwrap();
         }
-    });
+    }).unwrap();
 }
 
 #[test]
 fn stress_timeout_two_threads() {
     const COUNT: usize = 20;
 
-    let (s, r) = channel::bounded(2);
+    let (s, r) = bounded(2);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             for i in 0..COUNT {
                 if i % 2 == 0 {
                     thread::sleep(ms(500));
                 }
 
-                loop {
-                    select! {
-                        send(s, i) => break,
-                        recv(channel::after(ms(100))) => {}
+                let mut done = false;
+                while !done {
+                    let mut sel = Select::new();
+                    let oper1 = sel.send(&s);
+                    let oper = sel.select_timeout(ms(100));
+                    match oper {
+                        Err(_) => {}
+                        Ok(oper) => match oper.index() {
+                            ix if ix == oper1 => {
+                                assert!(oper.send(&s, i).is_ok());
+                                break;
+                            }
+                            _ => unreachable!(),
+                        },
                     }
                 }
             }
         });
 
-        scope.spawn(|| {
+        scope.spawn(|_| {
             for i in 0..COUNT {
                 if i % 2 == 0 {
                     thread::sleep(ms(500));
                 }
 
-                loop {
-                    select! {
-                        recv(r, v) => {
-                            assert_eq!(v, Some(i));
-                            break;
-                        }
-                        recv(channel::after(ms(100))) => {}
+                let mut done = false;
+                while !done {
+                    let mut sel = Select::new();
+                    let oper1 = sel.recv(&r);
+                    let oper = sel.select_timeout(ms(100));
+                    match oper {
+                        Err(_) => {}
+                        Ok(oper) => match oper.index() {
+                            ix if ix == oper1 => {
+                                assert_eq!(oper.recv(&r), Ok(i));
+                                done = true;
+                            }
+                            _ => unreachable!(),
+                        },
                     }
                 }
             }
         });
-    });
+    }).unwrap();
 }
 
 #[test]
 fn send_recv_same_channel() {
-    let (s, r) = channel::bounded::<i32>(0);
-    select! {
-        send(s, 0) => panic!(),
-        recv(r) => panic!(),
-        recv(channel::after(ms(500))) => {}
-    }
-
-    let (s, r) = channel::unbounded::<i32>();
-    select! {
-        send(s, 0) => {},
-        recv(r) => panic!(),
-        recv(channel::after(ms(500))) => panic!(),
+    let (s, r) = bounded::<i32>(0);
+    let mut sel = Select::new();
+    let oper1 = sel.send(&s);
+    let oper2 = sel.recv(&r);
+    let oper = sel.select_timeout(ms(100));
+    match oper {
+        Err(_) => {}
+        Ok(oper) => match oper.index() {
+            ix if ix == oper1 => panic!(),
+            ix if ix == oper2 => panic!(),
+            _ => unreachable!(),
+        },
+    }
+
+    let (s, r) = unbounded::<i32>();
+    let mut sel = Select::new();
+    let oper1 = sel.send(&s);
+    let oper2 = sel.recv(&r);
+    let oper = sel.select_timeout(ms(100));
+    match oper {
+        Err(_) => panic!(),
+        Ok(oper) => match oper.index() {
+            ix if ix == oper1 => assert!(oper.send(&s, 0).is_ok()),
+            ix if ix == oper2 => panic!(),
+            _ => unreachable!(),
+        },
     }
 }
 
@@ -708,41 +884,51 @@
 fn matching() {
     const THREADS: usize = 44;
 
-    let (s, r) = &channel::bounded::<usize>(0);
+    let (s, r) = &bounded::<usize>(0);
 
-    crossbeam::scope(|scope| {
+    scope(|scope| {
         for i in 0..THREADS {
-            scope.spawn(move || {
-                select! {
-                    recv(r, v) => assert_ne!(v.unwrap(), i),
-                    send(s, i) => {},
+            scope.spawn(move |_| {
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r);
+                let oper2 = sel.send(&s);
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
+                    ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
+                    _ => unreachable!(),
                 }
             });
         }
-    });
+    }).unwrap();
 
-    assert_eq!(r.try_recv(), None);
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
 
 #[test]
 fn matching_with_leftover() {
     const THREADS: usize = 55;
 
-    let (s, r) = &channel::bounded::<usize>(0);
+    let (s, r) = &bounded::<usize>(0);
 
-    crossbeam::scope(|scope| {
+    scope(|scope| {
         for i in 0..THREADS {
-            scope.spawn(move || {
-                select! {
-                    recv(r, v) => assert_ne!(v.unwrap(), i),
-                    send(s, i) => {},
+            scope.spawn(move |_| {
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r);
+                let oper2 = sel.send(&s);
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
+                    ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
+                    _ => unreachable!(),
                 }
             });
         }
-        s.send(!0);
-    });
+        s.send(!0).unwrap();
+    }).unwrap();
 
-    assert_eq!(r.try_recv(), None);
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
 
 #[test]
@@ -752,83 +938,155 @@
     type T = Box<Any + Send>;
 
     for cap in 0..3 {
-        let (s, r) = channel::bounded::<T>(cap);
+        let (s, r) = bounded::<T>(cap);
 
-        crossbeam::scope(|scope| {
-            scope.spawn(move || {
+        scope(|scope| {
+            scope.spawn(move |_| {
                 let mut s = s;
 
                 for _ in 0..COUNT {
-                    let (new_s, new_r) = channel::bounded(cap);
+                    let (new_s, new_r) = bounded(cap);
                     let mut new_r: T = Box::new(Some(new_r));
 
-                    select! {
-                        send(s, new_r) => {}
+                    {
+                        let mut sel = Select::new();
+                        let oper1 = sel.send(&s);
+                        let oper = sel.select();
+                        match oper.index() {
+                            ix if ix == oper1 => assert!(oper.send(&s, new_r).is_ok()),
+                            _ => unreachable!(),
+                        }
                     }
 
                     s = new_s;
                 }
             });
 
-            scope.spawn(move || {
+            scope.spawn(move |_| {
                 let mut r = r;
 
                 for _ in 0..COUNT {
-                    r = select! {
-                        recv(r, mut msg) => {
-                            msg.unwrap()
-                                .downcast_mut::<Option<channel::Receiver<T>>>()
+                    let new = {
+                        let mut sel = Select::new();
+                        let oper1 = sel.recv(&r);
+                        let oper = sel.select();
+                        match oper.index() {
+                            ix if ix == oper1 => oper
+                                .recv(&r)
                                 .unwrap()
-                                .take()
+                                .downcast_mut::<Option<Receiver<T>>>()
                                 .unwrap()
+                                .take()
+                                .unwrap(),
+                            _ => unreachable!(),
                         }
+                    };
+                    r = new;
+                }
+            });
+        }).unwrap();
+    }
+}
+
+#[test]
+fn linearizable_try() {
+    const COUNT: usize = 100_000;
+
+    for step in 0..2 {
+        let (start_s, start_r) = bounded::<()>(0);
+        let (end_s, end_r) = bounded::<()>(0);
+
+        let ((s1, r1), (s2, r2)) = if step == 0 {
+            (bounded::<i32>(1), bounded::<i32>(1))
+        } else {
+            (unbounded::<i32>(), unbounded::<i32>())
+        };
+
+        scope(|scope| {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    start_s.send(()).unwrap();
+
+                    s1.send(1).unwrap();
+
+                    let mut sel = Select::new();
+                    let oper1 = sel.recv(&r1);
+                    let oper2 = sel.recv(&r2);
+                    let oper = sel.try_select();
+                    match oper {
+                        Err(_) => unreachable!(),
+                        Ok(oper) => match oper.index() {
+                            ix if ix == oper1 => assert!(oper.recv(&r1).is_ok()),
+                            ix if ix == oper2 => assert!(oper.recv(&r2).is_ok()),
+                            _ => unreachable!(),
+                        },
                     }
+
+                    end_s.send(()).unwrap();
+                    let _ = r2.try_recv();
                 }
             });
-        });
+
+            for _ in 0..COUNT {
+                start_r.recv().unwrap();
+
+                s2.send(1).unwrap();
+                let _ = r1.try_recv();
+
+                end_r.recv().unwrap();
+            }
+        }).unwrap();
     }
 }
 
 #[test]
-fn linearizable() {
+fn linearizable_timeout() {
     const COUNT: usize = 100_000;
 
     for step in 0..2 {
-        let (start_s, start_r) = channel::bounded::<()>(0);
-        let (end_s, end_r) = channel::bounded::<()>(0);
+        let (start_s, start_r) = bounded::<()>(0);
+        let (end_s, end_r) = bounded::<()>(0);
 
         let ((s1, r1), (s2, r2)) = if step == 0 {
-            (channel::bounded::<i32>(1), channel::bounded::<i32>(1))
+            (bounded::<i32>(1), bounded::<i32>(1))
         } else {
-            (channel::unbounded::<i32>(), channel::unbounded::<i32>())
+            (unbounded::<i32>(), unbounded::<i32>())
         };
 
-        crossbeam::scope(|scope| {
-            scope.spawn(|| {
+        scope(|scope| {
+            scope.spawn(|_| {
                 for _ in 0..COUNT {
-                    start_s.send(());
+                    start_s.send(()).unwrap();
 
-                    s1.send(1);
-                    select! {
-                        recv(r1) => {}
-                        recv(r2) => {}
-                        default => unreachable!()
+                    s1.send(1).unwrap();
+
+                    let mut sel = Select::new();
+                    let oper1 = sel.recv(&r1);
+                    let oper2 = sel.recv(&r2);
+                    let oper = sel.select_timeout(ms(0));
+                    match oper {
+                        Err(_) => unreachable!(),
+                        Ok(oper) => match oper.index() {
+                            ix if ix == oper1 => assert!(oper.recv(&r1).is_ok()),
+                            ix if ix == oper2 => assert!(oper.recv(&r2).is_ok()),
+                            _ => unreachable!(),
+                        },
                     }
 
-                    end_s.send(());
-                    r2.try_recv();
+                    end_s.send(()).unwrap();
+                    let _ = r2.try_recv();
                 }
             });
 
             for _ in 0..COUNT {
-                start_r.recv();
+                start_r.recv().unwrap();
 
-                s2.send(1);
-                r1.try_recv();
+                s2.send(1).unwrap();
+                let _ = r1.try_recv();
 
-                end_r.recv();
+                end_r.recv().unwrap();
             }
-        });
+        }).unwrap();
     }
 }
 
@@ -836,58 +1094,192 @@
 fn fairness1() {
     const COUNT: usize = 10_000;
 
-    let (s1, r1) = channel::bounded::<()>(COUNT);
-    let (s2, r2) = channel::unbounded::<()>();
+    let (s1, r1) = bounded::<()>(COUNT);
+    let (s2, r2) = unbounded::<()>();
 
     for _ in 0..COUNT {
-        s1.send(());
-        s2.send(());
+        s1.send(()).unwrap();
+        s2.send(()).unwrap();
     }
 
-    let mut hits = [0usize; 4];
-    while hits[0] + hits[1] < 2 * COUNT {
-        select! {
-            recv(r1) => hits[0] += 1,
-            recv(r2) => hits[1] += 1,
-            recv(channel::after(ms(0))) => hits[2] += 1,
-            recv(channel::tick(ms(0))) => hits[3] += 1,
+    let hits = vec![Cell::new(0usize); 4];
+    for _ in 0..COUNT {
+        let after = after(ms(0));
+        let tick = tick(ms(0));
+
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.recv(&r2);
+        let oper3 = sel.recv(&after);
+        let oper4 = sel.recv(&tick);
+        let oper = sel.select();
+        match oper.index() {
+            i if i == oper1 => {
+                oper.recv(&r1).unwrap();
+                hits[0].set(hits[0].get() + 1);
+            }
+            i if i == oper2 => {
+                oper.recv(&r2).unwrap();
+                hits[1].set(hits[1].get() + 1);
+            }
+            i if i == oper3 => {
+                oper.recv(&after).unwrap();
+                hits[2].set(hits[2].get() + 1);
+            }
+            i if i == oper4 => {
+                oper.recv(&tick).unwrap();
+                hits[3].set(hits[3].get() + 1);
+            }
+            _ => unreachable!(),
         }
     }
-
-    assert!(r1.is_empty());
-    assert!(r2.is_empty());
-
-    let sum: usize = hits.iter().sum();
-    assert!(hits.iter().all(|x| *x >= sum / hits.len() / 2));
+    assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 2));
 }
 
 #[test]
 fn fairness2() {
     const COUNT: usize = 10_000;
 
-    let (s1, r1) = channel::unbounded::<()>();
-    let (s2, r2) = channel::bounded::<()>(1);
-    let (s3, r3) = channel::bounded::<()>(0);
+    let (s1, r1) = unbounded::<()>();
+    let (s2, r2) = bounded::<()>(1);
+    let (s3, r3) = bounded::<()>(0);
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
+    scope(|scope| {
+        scope.spawn(|_| {
             for _ in 0..COUNT {
-                select! {
-                    send(if s1.is_empty() { Some(&s1) } else { None }, ()) => {}
-                    send(if s2.is_empty() { Some(&s2) } else { None }, ()) => {}
-                    send(s3, ()) => {}
+                let mut sel = Select::new();
+                let mut oper1 = None;
+                let mut oper2 = None;
+                if s1.is_empty() {
+                    oper1 = Some(sel.send(&s1));
+                }
+                if s2.is_empty() {
+                    oper2 = Some(sel.send(&s2));
+                }
+                let oper3 = sel.send(&s3);
+                let oper = sel.select();
+                match oper.index() {
+                    i if Some(i) == oper1 => assert!(oper.send(&s1, ()).is_ok()),
+                    i if Some(i) == oper2 => assert!(oper.send(&s2, ()).is_ok()),
+                    i if i == oper3 => assert!(oper.send(&s3, ()).is_ok()),
+                    _ => unreachable!(),
                 }
             }
         });
 
-        let mut hits = [0usize; 3];
+        let hits = vec![Cell::new(0usize); 3];
         for _ in 0..COUNT {
-            select! {
-                recv(r1) => hits[0] += 1,
-                recv(r2) => hits[1] += 1,
-                recv(r3) => hits[2] += 1,
+            let mut sel = Select::new();
+            let oper1 = sel.recv(&r1);
+            let oper2 = sel.recv(&r2);
+            let oper3 = sel.recv(&r3);
+            let oper = sel.select();
+            match oper.index() {
+                i if i == oper1 => {
+                    oper.recv(&r1).unwrap();
+                    hits[0].set(hits[0].get() + 1);
+                }
+                i if i == oper2 => {
+                    oper.recv(&r2).unwrap();
+                    hits[1].set(hits[1].get() + 1);
+                }
+                i if i == oper3 => {
+                    oper.recv(&r3).unwrap();
+                    hits[2].set(hits[2].get() + 1);
+                }
+                _ => unreachable!(),
+            }
+        }
+        assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 50));
+    }).unwrap();
+}
+
+#[test]
+fn sync_and_clone() {
+    const THREADS: usize = 20;
+
+    let (s, r) = &bounded::<usize>(0);
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper2 = sel.send(&s);
+    let sel = &sel;
+
+    scope(|scope| {
+        for i in 0..THREADS {
+            scope.spawn(move |_| {
+                let mut sel = sel.clone();
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
+                    ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
+                    _ => unreachable!(),
+                }
+            });
+        }
+    }).unwrap();
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
+
+#[test]
+fn send_and_clone() {
+    const THREADS: usize = 20;
+
+    let (s, r) = &bounded::<usize>(0);
+
+    let mut sel = Select::new();
+    let oper1 = sel.recv(&r);
+    let oper2 = sel.send(&s);
+
+    scope(|scope| {
+        for i in 0..THREADS {
+            let mut sel = sel.clone();
+            scope.spawn(move |_| {
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
+                    ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
+                    _ => unreachable!(),
+                }
+            });
+        }
+    }).unwrap();
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
+
+#[test]
+fn reuse() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded(0);
+    let (s2, r2) = bounded(0);
+    let (s3, r3) = bounded(100);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s1.send(i).unwrap();
+                assert_eq!(r2.recv().unwrap(), i);
+                r3.recv().unwrap();
+            }
+        });
+
+        let mut sel = Select::new();
+        let oper1 = sel.recv(&r1);
+        let oper2 = sel.send(&s2);
+
+        for i in 0..COUNT {
+            for _ in 0..2 {
+                let oper = sel.select();
+                match oper.index() {
+                    ix if ix == oper1 => assert_eq!(oper.recv(&r1), Ok(i)),
+                    ix if ix == oper2 => assert!(oper.send(&s2, i).is_ok()),
+                    _ => unreachable!(),
+                }
             }
+            s3.send(()).unwrap();
         }
-        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 10));
-    });
+    }).unwrap();
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/select_struct.rs cargo-0.33.0/vendor/crossbeam-channel/tests/select_struct.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/select_struct.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/select_struct.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,861 +0,0 @@
-//! Tests for the `Select` struct.
-
-extern crate crossbeam;
-extern crate crossbeam_channel as channel;
-
-use std::any::Any;
-use std::cell::Cell;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::thread;
-use std::time::Duration;
-
-use channel::Select;
-
-fn ms(ms: u64) -> Duration {
-    Duration::from_millis(ms)
-}
-
-#[test]
-fn smoke1() {
-    let (s1, r1) = channel::unbounded::<usize>();
-    let (s2, r2) = channel::unbounded::<usize>();
-
-    s1.send(1);
-
-    Select::new()
-        .recv(&r1, |v| assert_eq!(v, Some(1)))
-        .recv(&r2, |_| panic!())
-        .wait();
-
-    s2.send(2);
-
-    Select::new()
-        .recv(&r1, |_| panic!())
-        .recv(&r2, |v| assert_eq!(v, Some(2)))
-        .wait();
-}
-
-#[test]
-fn smoke2() {
-    let (_s1, r1) = channel::unbounded::<i32>();
-    let (_s2, r2) = channel::unbounded::<i32>();
-    let (_s3, r3) = channel::unbounded::<i32>();
-    let (_s4, r4) = channel::unbounded::<i32>();
-    let (s5, r5) = channel::unbounded::<i32>();
-
-    s5.send(5);
-
-    Select::new()
-        .recv(&r1, |_| panic!())
-        .recv(&r2, |_| panic!())
-        .recv(&r3, |_| panic!())
-        .recv(&r4, |_| panic!())
-        .recv(&r5, |v| assert_eq!(v, Some(5)))
-        .wait();
-}
-
-#[test]
-fn closed() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            drop(s1);
-            thread::sleep(ms(500));
-            s2.send(5);
-        });
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .recv(&r1, |v| assert!(v.is_none()))
-            .recv(&r2, |_| panic!())
-            .recv(&after, |_| panic!())
-            .wait();
-
-        r2.recv().unwrap();
-    });
-
-    let after = channel::after(ms(1000));
-    Select::new()
-        .recv(&r1, |v| assert!(v.is_none()))
-        .recv(&r2, |_| panic!())
-        .recv(&after, |_| panic!())
-        .wait();
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(500));
-            drop(s2);
-        });
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .recv(&r2, |v| assert!(v.is_none()))
-            .recv(&after, |_| panic!())
-            .wait();
-    });
-}
-
-#[test]
-fn default() {
-    let (s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
-
-    Select::new()
-        .recv(&r1, |_| panic!())
-        .recv(&r2, |_| panic!())
-        .default(|| ())
-        .wait();
-
-    drop(s1);
-
-    Select::new()
-        .recv(&r1, |v| assert!(v.is_none()))
-        .recv(&r2, |_| panic!())
-        .default(|| panic!())
-        .wait();
-
-    s2.send(2);
-
-    Select::new()
-        .recv(&r2, |v| assert_eq!(v, Some(2)))
-        .default(|| panic!())
-        .wait();
-
-    Select::new()
-        .recv(&r2, |_| panic!())
-        .default(|| ())
-        .wait();
-
-    Select::new()
-        .default(|| ())
-        .wait();
-}
-
-#[test]
-fn timeout() {
-    let (_s1, r1) = channel::unbounded::<i32>();
-    let (s2, r2) = channel::unbounded::<i32>();
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(1500));
-            s2.send(2);
-        });
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .recv(&r1, |_| panic!())
-            .recv(&r2, |_| panic!())
-            .recv(&after, |_| ())
-            .wait();
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .recv(&r1, |_| panic!())
-            .recv(&r2, |v| assert_eq!(v, Some(2)))
-            .recv(&after, |_| panic!())
-            .wait();
-    });
-
-    crossbeam::scope(|scope| {
-        let (s, r) = channel::unbounded::<i32>();
-
-        scope.spawn(move || {
-            thread::sleep(ms(500));
-            drop(s);
-        });
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .recv(&after, |_| {
-                Select::new()
-                    .recv(&r, |v| assert!(v.is_none()))
-                    .default(|| panic!())
-                    .wait();
-            })
-            .wait();
-    });
-}
-
-#[test]
-fn default_when_closed() {
-    let (_, r) = channel::unbounded::<i32>();
-
-    Select::new()
-        .recv(&r, |v| assert!(v.is_none()))
-        .default(|| panic!())
-        .wait();
-
-    let (_, r) = channel::unbounded::<i32>();
-
-    let after = channel::after(ms(1000));
-    Select::new()
-        .recv(&r, |v| assert!(v.is_none()))
-        .recv(&after, |_| panic!())
-        .wait();
-}
-
-#[test]
-fn unblocks() {
-    let (s1, r1) = channel::bounded::<i32>(0);
-    let (s2, r2) = channel::bounded::<i32>(0);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(500));
-            s2.send(2);
-        });
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .recv(&r1, |_| panic!())
-            .recv(&r2, |v| assert_eq!(v, Some(2)))
-            .recv(&after, |_| panic!())
-            .wait();
-    });
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(500));
-            assert_eq!(r1.recv().unwrap(), 1);
-        });
-
-        let after = channel::after(ms(1000));
-        Select::new()
-            .send(&s1, || 1, || ())
-            .send(&s2, || 2, || panic!())
-            .recv(&after, |_| panic!())
-            .wait();
-    });
-}
-
-#[test]
-fn both_ready() {
-    let (s1, r1) = channel::bounded(0);
-    let (s2, r2) = channel::bounded(0);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            thread::sleep(ms(500));
-            s1.send(1);
-            assert_eq!(r2.recv().unwrap(), 2);
-        });
-
-        for _ in 0..2 {
-            Select::new()
-                .recv(&r1, |v| assert_eq!(v, Some(1)))
-                .send(&s2, || 2, || ())
-                .wait();
-        }
-    });
-}
-
-#[test]
-fn loop_try() {
-    const RUNS: usize = 20;
-
-    for _ in 0..RUNS {
-        let (s1, r1) = channel::bounded::<i32>(0);
-        let (s2, r2) = channel::bounded::<i32>(0);
-        let (s_end, r_end) = channel::bounded::<()>(0);
-
-        crossbeam::scope(|scope| {
-            scope.spawn(|| {
-                loop {
-                    let mut done = false;
-
-                    Select::new()
-                        .send(&s1, || 1, || done = true)
-                        .default(|| ())
-                        .wait();
-                    if done {
-                        break;
-                    }
-
-                    Select::new()
-                        .recv(&r_end, |_| done = true)
-                        .default(|| ())
-                        .wait();
-                    if done {
-                        break;
-                    }
-                }
-            });
-
-            scope.spawn(|| {
-                loop {
-                    if let Some(x) = r2.try_recv() {
-                        assert_eq!(x, 2);
-                        break;
-                    }
-
-                    let mut done = false;
-                    Select::new()
-                        .recv(&r_end, |_| done = true)
-                        .default(|| ())
-                        .wait();
-                    if done {
-                        break;
-                    }
-                }
-            });
-
-            scope.spawn(|| {
-                thread::sleep(ms(500));
-
-                let after = channel::after(ms(1000));
-                Select::new()
-                    .recv(&r1, |v| assert_eq!(v, Some(1)))
-                    .send(&s2, || 2, || ())
-                    .recv(&after, |_| panic!())
-                    .wait();
-
-                drop(s_end);
-            });
-        });
-    }
-}
-
-#[test]
-fn cloning1() {
-    crossbeam::scope(|scope| {
-        let (s1, r1) = channel::unbounded::<i32>();
-        let (_s2, r2) = channel::unbounded::<i32>();
-        let (s3, r3) = channel::unbounded::<()>();
-
-        scope.spawn(move || {
-            r3.recv().unwrap();
-            drop(s1.clone());
-            assert_eq!(r3.try_recv(), None);
-            s1.send(1);
-            r3.recv().unwrap();
-        });
-
-        s3.send(());
-
-        Select::new()
-            .recv(&r1, |_| ())
-            .recv(&r2, |_| ())
-            .wait();
-
-        s3.send(());
-    });
-}
-
-#[test]
-fn cloning2() {
-    let (s1, r1) = channel::unbounded::<()>();
-    let (s2, r2) = channel::unbounded::<()>();
-    let (_s3, _r3) = channel::unbounded::<()>();
-
-    crossbeam::scope(|scope| {
-        scope.spawn(move || {
-            Select::new()
-                .recv(&r1, |_| panic!())
-                .recv(&r2, |_| ())
-                .wait();
-        });
-
-        thread::sleep(ms(500));
-        drop(s1.clone());
-        s2.send(());
-    })
-}
-
-#[test]
-fn preflight1() {
-    let (s, r) = channel::unbounded();
-    s.send(());
-
-    Select::new()
-        .recv(&r, |_| ())
-        .wait();
-}
-
-#[test]
-fn preflight2() {
-    let (s, r) = channel::unbounded();
-    drop(s.clone());
-    s.send(());
-    drop(s);
-
-    Select::new()
-        .recv(&r, |v| assert!(v.is_some()))
-        .wait();
-    assert_eq!(r.try_recv(), None);
-}
-
-#[test]
-fn preflight3() {
-    let (s, r) = channel::unbounded();
-    drop(s.clone());
-    s.send(());
-    drop(s);
-    r.recv().unwrap();
-
-    Select::new()
-        .recv(&r, |v| assert!(v.is_none()))
-        .wait();
-}
-
-#[test]
-fn duplicate_cases() {
-    let (s, r) = channel::unbounded::<i32>();
-    let hit = vec![Cell::new(false); 4];
-
-    while hit.iter().map(|h| h.get()).any(|hit| !hit) {
-        Select::new()
-            .recv(&r, |_| hit[0].set(true))
-            .recv(&r, |_| hit[1].set(true))
-            .send(&s, || 0, || hit[2].set(true))
-            .send(&s, || 0, || hit[3].set(true))
-            .wait();
-    }
-}
-
-#[test]
-fn nesting() {
-    let (s, r) = channel::unbounded::<i32>();
-
-    Select::new()
-        .send(&s, || 0, || {
-            Select::new()
-                .recv(&r, |v| {
-                    assert_eq!(v, Some(0));
-                    Select::new()
-                        .send(&s, || 1, || {
-                            Select::new()
-                                .recv(&r, |v| assert_eq!(v, Some(1)))
-                                .wait();
-                        })
-                        .wait();
-                })
-                .wait();
-        })
-        .wait();
-}
-
-#[test]
-fn stress_recv() {
-    const COUNT: usize = 10_000;
-
-    let (s1, r1) = channel::unbounded();
-    let (s2, r2) = channel::bounded(5);
-    let (s3, r3) = channel::bounded(100);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            for i in 0..COUNT {
-                s1.send(i);
-                r3.recv().unwrap();
-
-                s2.send(i);
-                r3.recv().unwrap();
-            }
-        });
-
-        for i in 0..COUNT {
-            for _ in 0..2 {
-                Select::new()
-                    .recv(&r1, |v| assert_eq!(v, Some(i)))
-                    .recv(&r2, |v| assert_eq!(v, Some(i)))
-                    .wait();
-
-                s3.send(());
-            }
-        }
-    });
-}
-
-#[test]
-fn stress_send() {
-    const COUNT: usize = 10_000;
-
-    let (s1, r1) = channel::bounded(0);
-    let (s2, r2) = channel::bounded(0);
-    let (s3, r3) = channel::bounded(100);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            for i in 0..COUNT {
-                assert_eq!(r1.recv().unwrap(), i);
-                assert_eq!(r2.recv().unwrap(), i);
-                r3.recv().unwrap();
-            }
-        });
-
-        for i in 0..COUNT {
-            for _ in 0..2 {
-                Select::new()
-                    .send(&s1, || i, || ())
-                    .send(&s2, || i, || ())
-                    .wait();
-            }
-            s3.send(());
-        }
-    });
-}
-
-#[test]
-fn stress_mixed() {
-    const COUNT: usize = 10_000;
-
-    let (s1, r1) = channel::bounded(0);
-    let (s2, r2) = channel::bounded(0);
-    let (s3, r3) = channel::bounded(100);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            for i in 0..COUNT {
-                s1.send(i);
-                assert_eq!(r2.recv().unwrap(), i);
-                r3.recv().unwrap();
-            }
-        });
-
-        for i in 0..COUNT {
-            for _ in 0..2 {
-                Select::new()
-                    .recv(&r1, |v| assert_eq!(v, Some(i)))
-                    .send(&s2, || i, || ())
-                    .wait();
-            }
-            s3.send(());
-        }
-    });
-}
-
-#[test]
-fn stress_timeout_two_threads() {
-    const COUNT: usize = 20;
-
-    let (s, r) = channel::bounded(2);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            for i in 0..COUNT {
-                if i % 2 == 0 {
-                    thread::sleep(ms(500));
-                }
-
-                let mut done = false;
-                while !done {
-                    let after = channel::after(ms(100));
-                    Select::new()
-                        .send(&s, || i, || done = true)
-                        .recv(&after, |_| ())
-                        .wait();
-                }
-            }
-        });
-
-        scope.spawn(|| {
-            for i in 0..COUNT {
-                if i % 2 == 0 {
-                    thread::sleep(ms(500));
-                }
-
-                let mut done = false;
-                while !done {
-                    let after = channel::after(ms(100));
-                    Select::new()
-                        .recv(&r, |v| {
-                            assert_eq!(v, Some(i));
-                            done = true;
-                        })
-                        .recv(&after, |_| ())
-                        .wait();
-                }
-            }
-        });
-    });
-}
-
-#[test]
-fn send_recv_same_channel() {
-    let (s, r) = channel::bounded::<i32>(0);
-    let after = channel::after(ms(500));
-    Select::new()
-        .send(&s, || 0, || panic!())
-        .recv(&r, |_| panic!())
-        .recv(&after, |_| ())
-        .wait();
-
-    let (s, r) = channel::unbounded::<i32>();
-    let after = channel::after(ms(500));
-    Select::new()
-        .send(&s, || 0, || ())
-        .recv(&r, |_| panic!())
-        .recv(&after, |_| panic!())
-        .wait();
-}
-
-#[test]
-fn matching() {
-    const THREADS: usize = 44;
-
-    let (s, r) = &channel::bounded::<usize>(0);
-
-    crossbeam::scope(|scope| {
-        for i in 0..THREADS {
-            scope.spawn(move || {
-                Select::new()
-                    .recv(&r, |v| assert_ne!(v.unwrap(), i))
-                    .send(&s, || i, || ())
-                    .wait();
-            });
-        }
-    });
-
-    assert_eq!(r.try_recv(), None);
-}
-
-#[test]
-fn matching_with_leftover() {
-    const THREADS: usize = 55;
-
-    let (s, r) = &channel::bounded::<usize>(0);
-
-    crossbeam::scope(|scope| {
-        for i in 0..THREADS {
-            scope.spawn(move || {
-                Select::new()
-                    .recv(&r, |v| assert_ne!(v.unwrap(), i))
-                    .send(&s, || i, || ())
-                    .wait();
-            });
-        }
-        s.send(!0);
-    });
-
-    assert_eq!(r.try_recv(), None);
-}
-
-#[test]
-fn channel_through_channel() {
-    const COUNT: usize = 1000;
-
-    type T = Box<Any + Send>;
-
-    for cap in 0..3 {
-        let (s, r) = channel::bounded::<T>(cap);
-
-        crossbeam::scope(|scope| {
-            scope.spawn(move || {
-                let mut s = s;
-
-                for _ in 0..COUNT {
-                    let (new_s, new_r) = channel::bounded(cap);
-                    let mut new_r: T = Box::new(Some(new_r));
-
-                    Select::new()
-                        .send(&s, || new_r, || ())
-                        .wait();
-
-                    s = new_s;
-                }
-            });
-
-            scope.spawn(move || {
-                let mut r = r;
-
-                for _ in 0..COUNT {
-                    let new = Select::new()
-                        .recv(&r, |msg| {
-                            msg.unwrap()
-                                .downcast_mut::<Option<channel::Receiver<T>>>()
-                                .unwrap()
-                                .take()
-                                .unwrap()
-                        })
-                        .wait();
-                    r = new;
-                }
-            });
-        });
-    }
-}
-
-#[test]
-fn linearizable() {
-    const COUNT: usize = 100_000;
-
-    for step in 0..2 {
-        let (start_s, start_r) = channel::bounded::<()>(0);
-        let (end_s, end_r) = channel::bounded::<()>(0);
-
-        let ((s1, r1), (s2, r2)) = if step == 0 {
-            (channel::bounded::<i32>(1), channel::bounded::<i32>(1))
-        } else {
-            (channel::unbounded::<i32>(), channel::unbounded::<i32>())
-        };
-
-        crossbeam::scope(|scope| {
-            scope.spawn(|| {
-                for _ in 0..COUNT {
-                    start_s.send(());
-
-                    s1.send(1);
-                    Select::new()
-                        .recv(&r1, |_| ())
-                        .recv(&r2, |_| ())
-                        .default(|| unreachable!())
-                        .wait();
-
-                    end_s.send(());
-                    r2.try_recv();
-                }
-            });
-
-            for _ in 0..COUNT {
-                start_r.recv();
-
-                s2.send(1);
-                r1.try_recv();
-
-                end_r.recv();
-            }
-        });
-    }
-}
-
-#[test]
-fn fairness1() {
-    const COUNT: usize = 10_000;
-
-    let (s1, r1) = channel::bounded::<()>(COUNT);
-    let (s2, r2) = channel::unbounded::<()>();
-
-    for _ in 0..COUNT {
-        s1.send(());
-        s2.send(());
-    }
-
-    let hits = vec![Cell::new(0usize); 4];
-    while hits[0].get() + hits[1].get() < 2 * COUNT {
-        let after = channel::after(ms(0));
-        let tick = channel::tick(ms(0));
-        Select::new()
-            .recv(&r1, |_| hits[0].set(hits[0].get() + 1))
-            .recv(&r2, |_| hits[1].set(hits[1].get() + 1))
-            .recv(&after, |_| hits[2].set(hits[2].get() + 1))
-            .recv(&tick, |_| hits[3].set(hits[3].get() + 1))
-            .wait();
-    }
-
-    assert!(r1.is_empty());
-    assert!(r2.is_empty());
-
-    let sum: usize = hits.iter().map(|h| h.get()).sum();
-    assert!(hits.iter().all(|x| x.get() >= sum / hits.len() / 2));
-}
-
-#[test]
-fn fairness2() {
-    const COUNT: usize = 10_000;
-
-    let (s1, r1) = channel::unbounded::<()>();
-    let (s2, r2) = channel::bounded::<()>(1);
-    let (s3, r3) = channel::bounded::<()>(0);
-
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            for _ in 0..COUNT {
-                let mut sel = Select::new();
-                if s1.is_empty() {
-                    sel = sel.send(&s1, || (), || ());
-                }
-                if s2.is_empty() {
-                    sel = sel.send(&s2, || (), || ());
-                }
-                sel = sel.send(&s3, || (), || ());
-                sel.wait();
-            }
-        });
-
-        let hits = vec![Cell::new(0usize); 3];
-        for _ in 0..COUNT {
-            Select::new()
-                .recv(&r1, |_| hits[0].set(hits[0].get() + 1))
-                .recv(&r2, |_| hits[1].set(hits[1].get() + 1))
-                .recv(&r3, |_| hits[2].set(hits[2].get() + 1))
-                .wait();
-        }
-        assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 10));
-    });
-}
-
-#[test]
-fn drop_callbacks() {
-    static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-    struct Foo;
-    impl Drop for Foo {
-        fn drop(&mut self) {
-            DROPS.fetch_add(1, Ordering::SeqCst);
-        }
-    }
-
-    let (s, r) = channel::unbounded::<()>();
-
-    DROPS.store(0, Ordering::SeqCst);
-    let foo1 = Foo;
-    let foo2 = Foo;
-    let foo3 = Foo;
-    let foo4 = Foo;
-    let sel = Select::new()
-        .recv(&r, |_| drop(foo1))
-        .send(&s, || drop(foo2), || drop(foo3))
-        .default(|| drop(foo4));
-    assert_eq!(DROPS.load(Ordering::SeqCst), 0);
-    sel.wait();
-    assert_eq!(DROPS.load(Ordering::SeqCst), 4);
-
-    DROPS.store(0, Ordering::SeqCst);
-    let foo1 = Foo;
-    let foo2 = Foo;
-    let foo3 = Foo;
-    let mut sel = Select::new();
-    sel = sel.default(|| drop(foo1));
-    assert_eq!(DROPS.load(Ordering::SeqCst), 0);
-    sel = sel.default(|| drop(foo2));
-    assert_eq!(DROPS.load(Ordering::SeqCst), 1);
-    sel = sel.default(|| drop(foo3));
-    assert_eq!(DROPS.load(Ordering::SeqCst), 2);
-    sel.wait();
-    assert_eq!(DROPS.load(Ordering::SeqCst), 3);
-
-    DROPS.store(0, Ordering::SeqCst);
-    let foo1 = Foo;
-    let foo2 = Foo;
-    let foo3 = Foo;
-    let foo4 = Foo;
-    Select::new()
-        .recv(&r, |_| drop(foo1))
-        .send(&s, || drop(foo2), || drop(foo3))
-        .default(|| {
-            assert_eq!(DROPS.load(Ordering::SeqCst), 3);
-            drop(foo4);
-        })
-        .wait();
-    assert_eq!(DROPS.load(Ordering::SeqCst), 4);
-
-    s.send(());
-
-    DROPS.store(0, Ordering::SeqCst);
-    let foo1 = Foo;
-    let foo2 = Foo;
-    let foo3 = Foo;
-    let foo4 = Foo;
-    Select::new()
-        .recv(&r, |_| {
-            assert_eq!(DROPS.load(Ordering::SeqCst), 3);
-            drop(foo1);
-        })
-        .send(&s, || drop(foo2), || drop(foo3))
-        .default(|| drop(foo4))
-        .wait();
-    assert_eq!(DROPS.load(Ordering::SeqCst), 4);
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/thread_locals.rs cargo-0.33.0/vendor/crossbeam-channel/tests/thread_locals.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/thread_locals.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/thread_locals.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,14 +1,15 @@
 //! Tests that make sure accessing thread-locals while exiting the thread doesn't cause panics.
 
-#![deny(unsafe_code)]
-
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 
 use std::thread;
 use std::time::Duration;
 
+use crossbeam_channel::unbounded;
+use crossbeam_utils::thread::scope;
+
 fn ms(ms: u64) -> Duration {
     Duration::from_millis(ms)
 }
@@ -21,10 +22,10 @@
         fn drop(&mut self) {
             // A blocking operation after the thread-locals have been dropped. This will attempt to
             // use the thread-locals and must not panic.
-            let (_s, r) = channel::unbounded::<()>();
+            let (_s, r) = unbounded::<()>();
             select! {
-                recv(r) => {}
-                recv(channel::after(ms(100))) => {}
+                recv(r) -> _ => {}
+                default(ms(100)) => {}
             }
         }
     }
@@ -33,21 +34,20 @@
         static FOO: Foo = Foo;
     }
 
-    let (s, r) = channel::unbounded::<()>();
+    let (s, r) = unbounded::<()>();
 
-    crossbeam::scope(|scope| {
-        scope.spawn(|| {
-            // First initialize `FOO`, then the thread-locals related to crossbeam-channel and
-            // crossbeam-epoch.
+    scope(|scope| {
+        scope.spawn(|_| {
+            // First initialize `FOO`, then the thread-locals related to crossbeam-channel.
             FOO.with(|_| ());
             r.recv().unwrap();
-            // At thread exit, the crossbeam-related thread-locals get dropped first and `FOO` is
-            // dropped last.
+            // At thread exit, thread-locals related to crossbeam-channel get dropped first and
+            // `FOO` is dropped last.
         });
 
-        scope.spawn(|| {
+        scope.spawn(|_| {
             thread::sleep(ms(100));
-            s.send(());
+            s.send(()).unwrap();
         });
-    });
+    }).unwrap();
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/tick.rs cargo-0.33.0/vendor/crossbeam-channel/tests/tick.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/tick.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/tick.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,276 +1,350 @@
 //! Tests for the tick channel flavor.
 
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 extern crate rand;
 
-mod wrappers;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::thread;
+use std::time::{Duration, Instant};
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::sync::atomic::AtomicUsize;
-        use std::sync::atomic::Ordering;
-        use std::thread;
-        use std::time::{Duration, Instant};
+use crossbeam_channel::{after, tick, Select, TryRecvError};
+use crossbeam_utils::thread::scope;
 
-        use $channel as channel;
-        use crossbeam;
-
-        fn ms(ms: u64) -> Duration {
-            Duration::from_millis(ms)
-        }
-
-        #[test]
-        fn fire() {
-            let start = Instant::now();
-            let r = channel::tick(ms(50));
-
-            assert_eq!(r.try_recv(), None);
-            thread::sleep(ms(100));
-
-            let fired = r.try_recv().unwrap();
-            assert!(start < fired);
-            assert!(fired - start >= ms(50));
-
-            let now = Instant::now();
-            assert!(fired < now);
-            assert!(now - fired >= ms(50));
-
-            assert_eq!(r.try_recv(), None);
-
-            select! {
-                recv(r) => panic!(),
-                default => {}
-            }
-
-            select! {
-                recv(r) => {}
-                recv(channel::after(ms(200))) => panic!(),
-            }
-        }
-
-        #[test]
-        fn intervals() {
-            let start = Instant::now();
-            let r = channel::tick(ms(50));
-
-            let t1 = r.recv().unwrap();
-            assert!(start + ms(50) <= t1);
-            assert!(start + ms(100) > t1);
-
-            thread::sleep(ms(300));
-            let t2 = r.try_recv().unwrap();
-            assert!(start + ms(100) <= t2);
-            assert!(start + ms(150) > t2);
-
-            assert_eq!(r.try_recv(), None);
-            let t3 = r.recv().unwrap();
-            assert!(start + ms(400) <= t3);
-            assert!(start + ms(450) > t3);
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
 
-            assert_eq!(r.try_recv(), None);
-        }
+#[test]
+fn fire() {
+    let start = Instant::now();
+    let r = tick(ms(50));
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+    thread::sleep(ms(100));
+
+    let fired = r.try_recv().unwrap();
+    assert!(start < fired);
+    assert!(fired - start >= ms(50));
+
+    let now = Instant::now();
+    assert!(fired < now);
+    assert!(now - fired >= ms(50));
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+
+    select! {
+        recv(r) -> _ => panic!(),
+        default => {}
+    }
+
+    select! {
+        recv(r) -> _ => {}
+        recv(tick(ms(200))) -> _ => panic!(),
+    }
+}
 
-        #[test]
-        fn capacity() {
-            const COUNT: usize = 10;
-
-            for i in 0..COUNT {
-                let r = channel::tick(ms(i as u64));
-                assert_eq!(r.capacity(), Some(1));
-            }
-        }
+#[test]
+fn intervals() {
+    let start = Instant::now();
+    let r = tick(ms(50));
+
+    let t1 = r.recv().unwrap();
+    assert!(start + ms(50) <= t1);
+    assert!(start + ms(100) > t1);
+
+    thread::sleep(ms(300));
+    let t2 = r.try_recv().unwrap();
+    assert!(start + ms(100) <= t2);
+    assert!(start + ms(150) > t2);
+
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+    let t3 = r.recv().unwrap();
+    assert!(start + ms(400) <= t3);
+    assert!(start + ms(450) > t3);
 
-        #[test]
-        fn len_empty_full() {
-            let r = channel::tick(ms(50));
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
 
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
+#[test]
+fn capacity() {
+    const COUNT: usize = 10;
+
+    for i in 0..COUNT {
+        let r = tick(ms(i as u64));
+        assert_eq!(r.capacity(), Some(1));
+    }
+}
 
-            thread::sleep(ms(100));
+#[test]
+fn len_empty_full() {
+    let r = tick(ms(50));
 
-            assert_eq!(r.len(), 1);
-            assert_eq!(r.is_empty(), false);
-            assert_eq!(r.is_full(), true);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
 
-            r.try_recv().unwrap();
+    thread::sleep(ms(100));
 
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), false);
-        }
+    assert_eq!(r.len(), 1);
+    assert_eq!(r.is_empty(), false);
+    assert_eq!(r.is_full(), true);
 
-        #[test]
-        fn recv() {
-            let start = Instant::now();
-            let r = channel::tick(ms(50));
-
-            let fired = r.recv().unwrap();
-            assert!(start < fired);
-            assert!(fired - start >= ms(50));
-
-            let now = Instant::now();
-            assert!(fired < now);
-            assert!(now - fired < fired - start);
+    r.try_recv().unwrap();
 
-            assert_eq!(r.try_recv(), None);
-        }
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), false);
+}
 
-        #[test]
-        fn recv_two() {
-            let r1 = channel::tick(ms(50));
-            let r2 = channel::tick(ms(50));
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    for _ in 0..10 {
-                        select! {
-                            recv(r1) => {}
-                            recv(r2) => {}
-                        }
-                    }
-                });
-                scope.spawn(|| {
-                    for _ in 0..10 {
-                        select! {
-                            recv(r1) => {}
-                            recv(r2) => {}
-                        }
-                    }
-                });
-            });
-        }
+#[test]
+fn try_recv() {
+    let r = tick(ms(200));
+    assert!(r.try_recv().is_err());
+
+    thread::sleep(ms(100));
+    assert!(r.try_recv().is_err());
+
+    thread::sleep(ms(200));
+    assert!(r.try_recv().is_ok());
+    assert!(r.try_recv().is_err());
+
+    thread::sleep(ms(200));
+    assert!(r.try_recv().is_ok());
+    assert!(r.try_recv().is_err());
+}
 
-        #[test]
-        fn recv_race() {
-            select! {
-                recv(channel::tick(ms(50))) => {}
-                recv(channel::tick(ms(100))) => panic!(),
-            }
+#[test]
+fn recv() {
+    let start = Instant::now();
+    let r = tick(ms(50));
+
+    let fired = r.recv().unwrap();
+    assert!(start < fired);
+    assert!(fired - start >= ms(50));
+
+    let now = Instant::now();
+    assert!(fired < now);
+    assert!(now - fired < fired - start);
 
-            select! {
-                recv(channel::tick(ms(100))) => panic!(),
-                recv(channel::tick(ms(50))) => {}
-            }
-        }
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
 
-        #[test]
-        fn stress_default() {
-            const COUNT: usize = 10;
+#[test]
+fn recv_timeout() {
+    let start = Instant::now();
+    let r = tick(ms(200));
+
+    assert!(r.recv_timeout(ms(100)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(100));
+    assert!(now - start <= ms(150));
+
+    let fired = r.recv_timeout(ms(200)).unwrap();
+    assert!(fired - start >= ms(200));
+    assert!(fired - start <= ms(250));
+
+    assert!(r.recv_timeout(ms(100)).is_err());
+    let now = Instant::now();
+    assert!(now - start >= ms(300));
+    assert!(now - start <= ms(350));
+
+    let fired = r.recv_timeout(ms(200)).unwrap();
+    assert!(fired - start >= ms(400));
+    assert!(fired - start <= ms(450));
+}
 
-            for _ in 0..COUNT {
+#[test]
+fn recv_two() {
+    let r1 = tick(ms(50));
+    let r2 = tick(ms(50));
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for _ in 0..10 {
                 select! {
-                    recv(channel::tick(ms(0))) => {}
-                    default => panic!(),
+                    recv(r1) -> _ => {}
+                    recv(r2) -> _ => {}
                 }
             }
-
-            for _ in 0..COUNT {
+        });
+        scope.spawn(|_| {
+            for _ in 0..10 {
                 select! {
-                    recv(channel::tick(ms(100))) => panic!(),
-                    default => {}
+                    recv(r1) -> _ => {}
+                    recv(r2) -> _ => {}
                 }
             }
-        }
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn select() {
-            const THREADS: usize = 4;
-
-            let hits = AtomicUsize::new(0);
-            let r1 = channel::tick(ms(200));
-            let r2 = channel::tick(ms(300));
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        let v = vec![&r1.0, &r2.0];
-                        let timeout = channel::after(ms(1100));
-
-                        loop {
-                            select! {
-                                recv(v) => {
-                                    hits.fetch_add(1, Ordering::SeqCst);
-                                }
-                                recv(timeout) => break
-                            }
-                        }
-                    });
-                }
-            });
+#[test]
+fn recv_race() {
+    select! {
+        recv(tick(ms(50))) -> _ => {}
+        recv(tick(ms(100))) -> _ => panic!(),
+    }
+
+    select! {
+        recv(tick(ms(100))) -> _ => panic!(),
+        recv(tick(ms(50))) -> _ => {}
+    }
+}
 
-            assert_eq!(hits.load(Ordering::SeqCst), 8);
+#[test]
+fn stress_default() {
+    const COUNT: usize = 10;
+
+    for _ in 0..COUNT {
+        select! {
+            recv(tick(ms(0))) -> _ => {}
+            default => panic!(),
+        }
+    }
+
+    for _ in 0..COUNT {
+        select! {
+            recv(tick(ms(100))) -> _ => panic!(),
+            default => {}
         }
+    }
+}
 
-        #[test]
-        fn fairness() {
-            const COUNT: usize = 30;
-
-            for &dur in &[0, 1] {
-                let mut hits = [0usize; 2];
-
-                for _ in 0..COUNT {
-                    let r1 = channel::tick(ms(dur));
-                    let r2 = channel::tick(ms(dur));
-
-                    for _ in 0..COUNT {
-                        select! {
-                            recv(r1) => hits[0] += 1,
-                            recv(r2) => hits[1] += 1,
+#[test]
+fn select() {
+    const THREADS: usize = 4;
+
+    let hits = AtomicUsize::new(0);
+    let r1 = tick(ms(200));
+    let r2 = tick(ms(300));
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                let timeout = after(ms(1100));
+                loop {
+                    let mut sel = Select::new();
+                    let oper1 = sel.recv(&r1);
+                    let oper2 = sel.recv(&r2);
+                    let oper3 = sel.recv(&timeout);
+                    let oper = sel.select();
+                    match oper.index() {
+                        i if i == oper1 => {
+                            oper.recv(&r1).unwrap();
+                            hits.fetch_add(1, Ordering::SeqCst);
                         }
+                        i if i == oper2 => {
+                            oper.recv(&r2).unwrap();
+                            hits.fetch_add(1, Ordering::SeqCst);
+                        }
+                        i if i == oper3 => {
+                            oper.recv(&timeout).unwrap();
+                            break;
+                        }
+                        _ => unreachable!(),
                     }
                 }
-
-                assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-            }
+            });
         }
+    }).unwrap();
 
-        #[test]
-        fn fairness_duplicates() {
-            const COUNT: usize = 30;
-
-            for &dur in &[0, 1] {
-                let mut hits = [0usize; 5];
-
-                for _ in 0..COUNT {
-                    let r = channel::tick(ms(dur));
-
-                    for _ in 0..COUNT {
-                        select! {
-                            recv(r) => hits[0] += 1,
-                            recv(r) => hits[1] += 1,
-                            recv(r) => hits[2] += 1,
-                            recv(r) => hits[3] += 1,
-                            recv(r) => hits[4] += 1,
+    assert_eq!(hits.load(Ordering::SeqCst), 8);
+}
+
+#[test]
+fn ready() {
+    const THREADS: usize = 4;
+
+    let hits = AtomicUsize::new(0);
+    let r1 = tick(ms(200));
+    let r2 = tick(ms(300));
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                let timeout = after(ms(1100));
+                'outer: loop {
+                    let mut sel = Select::new();
+                    sel.recv(&r1);
+                    sel.recv(&r2);
+                    sel.recv(&timeout);
+                    loop {
+                        match sel.ready() {
+                            0 => {
+                                if r1.try_recv().is_ok() {
+                                    hits.fetch_add(1, Ordering::SeqCst);
+                                    break;
+                                }
+                            }
+                            1 => {
+                                if r2.try_recv().is_ok() {
+                                    hits.fetch_add(1, Ordering::SeqCst);
+                                    break;
+                                }
+                            }
+                            2 => {
+                                if timeout.try_recv().is_ok() {
+                                    break 'outer;
+                                }
+                            }
+                            _ => unreachable!(),
                         }
                     }
                 }
+            });
+        }
+    }).unwrap();
+
+    assert_eq!(hits.load(Ordering::SeqCst), 8);
+}
 
-                assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+#[test]
+fn fairness() {
+    const COUNT: usize = 30;
+
+    for &dur in &[0, 1] {
+        let mut hits = [0usize; 2];
+
+        for _ in 0..COUNT {
+            let r1 = tick(ms(dur));
+            let r2 = tick(ms(dur));
+
+            for _ in 0..COUNT {
+                select! {
+                    recv(r1) -> _ => hits[0] += 1,
+                    recv(r2) -> _ => hits[1] += 1,
+                }
             }
         }
-    };
-}
 
-mod normal {
-    tests!(wrappers::normal);
+        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    }
 }
 
-mod cloned {
-    tests!(wrappers::cloned);
-}
+#[test]
+fn fairness_duplicates() {
+    const COUNT: usize = 30;
 
-mod select {
-    tests!(wrappers::select);
-}
+    for &dur in &[0, 1] {
+        let mut hits = [0usize; 5];
 
-mod select_spin {
-    tests!(wrappers::select_spin);
-}
+        for _ in 0..COUNT {
+            let r = tick(ms(dur));
+
+            for _ in 0..COUNT {
+                select! {
+                    recv(r) -> _ => hits[0] += 1,
+                    recv(r) -> _ => hits[1] += 1,
+                    recv(r) -> _ => hits[2] += 1,
+                    recv(r) -> _ => hits[3] += 1,
+                    recv(r) -> _ => hits[4] += 1,
+                }
+            }
+        }
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    }
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/cloned.rs cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/cloned.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/cloned.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/cloned.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-//! Channels with cloned senders and receivers immediately upon construction.
-//!
-//! Some channel types might take advantage of the fact that the first sender or receiver was never
-//! cloned, so this wrapper turns off such optimizations right away.
-
-use std::ops::Deref;
-use std::time::{Duration, Instant};
-
-use channel;
-
-pub struct Sender<T>(pub channel::Sender<T>);
-
-pub struct Receiver<T>(pub channel::Receiver<T>);
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender(self.0.clone())
-    }
-}
-
-impl<T> Clone for Receiver<T> {
-    fn clone(&self) -> Receiver<T> {
-        Receiver(self.0.clone())
-    }
-}
-
-impl<T> Deref for Receiver<T> {
-    type Target = channel::Receiver<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Deref for Sender<T> {
-    type Target = channel::Sender<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::bounded(cap);
-    (Sender(s.clone()), Receiver(r.clone()))
-}
-
-pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::unbounded();
-    (Sender(s.clone()), Receiver(r.clone()))
-}
-
-pub fn after(dur: Duration) -> Receiver<Instant> {
-    let r = channel::after(dur);
-    Receiver(r.clone())
-}
-
-pub fn tick(dur: Duration) -> Receiver<Instant> {
-    let r = channel::tick(dur);
-    Receiver(r.clone())
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/mod.rs cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/mod.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-//! Wrappers around the channel interface that intentionally enable or disable some optimizations.
-//!
-//! There's a number of internal optimizations within methods for sending and receiving messages,
-//! as well as within the `select!` macro. Such optimizations often diverge from the main code
-//! paths to special fast paths with custom implementations.
-//!
-//! We use these wrappers in order to enable or disable such optimizations and thoroughly exercise
-//! the implementation in all possible scenarios.
-
-#![allow(dead_code)]
-
-pub mod cloned;
-pub mod normal;
-pub mod select;
-pub mod select_multi;
-pub mod select_spin;
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/normal.rs cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/normal.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/normal.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/normal.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-//! Native interface with the default behavior.
-//!
-//! This wrapper does not try to provoke or prevent any optimizations.
-
-use std::ops::Deref;
-use std::time::{Duration, Instant};
-
-use channel;
-
-pub struct Sender<T>(pub channel::Sender<T>);
-
-pub struct Receiver<T>(pub channel::Receiver<T>);
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender(self.0.clone())
-    }
-}
-
-impl<T> Clone for Receiver<T> {
-    fn clone(&self) -> Receiver<T> {
-        Receiver(self.0.clone())
-    }
-}
-
-impl<T> Deref for Receiver<T> {
-    type Target = channel::Receiver<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Deref for Sender<T> {
-    type Target = channel::Sender<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::bounded(cap);
-    (Sender(s), Receiver(r))
-}
-
-pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::unbounded();
-    (Sender(s), Receiver(r))
-}
-
-pub fn after(dur: Duration) -> Receiver<Instant> {
-    let r = channel::after(dur);
-    Receiver(r)
-}
-
-pub fn tick(dur: Duration) -> Receiver<Instant> {
-    let r = channel::tick(dur);
-    Receiver(r)
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/select_multi.rs cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/select_multi.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/select_multi.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/select_multi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-//! Channels with send and receive operations implemented using `select!` with duplicate cases.
-//!
-//! A `select!` with duplicate cases doesn't perform any optimizations that simply convert the
-//! macro invocation into a direct call to `recv()` or `send()`.
-
-use std::ops::Deref;
-use std::time::{Duration, Instant};
-
-use channel;
-
-pub struct Sender<T>(pub channel::Sender<T>);
-
-pub struct Receiver<T>(pub channel::Receiver<T>);
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender(self.0.clone())
-    }
-}
-
-impl<T> Clone for Receiver<T> {
-    fn clone(&self) -> Receiver<T> {
-        Receiver(self.0.clone())
-    }
-}
-
-impl<T> Deref for Receiver<T> {
-    type Target = channel::Receiver<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Deref for Sender<T> {
-    type Target = channel::Sender<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Sender<T> {
-    pub fn send(&self, msg: T) {
-        select! {
-            send(self.0, msg) => {}
-            send(self.0, msg) => {}
-        }
-    }
-}
-
-impl<T> Receiver<T> {
-    pub fn try_recv(&self) -> Option<T> {
-        select! {
-            recv(self.0, msg) => msg,
-            recv(self.0, msg) => msg,
-            default => None,
-        }
-    }
-
-    pub fn recv(&self) -> Option<T> {
-        select! {
-            recv(self.0, msg) => msg,
-            recv(self.0, msg) => msg,
-        }
-    }
-}
-
-pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::bounded(cap);
-    (Sender(s), Receiver(r))
-}
-
-pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::unbounded();
-    (Sender(s), Receiver(r))
-}
-
-pub fn after(dur: Duration) -> Receiver<Instant> {
-    let r = channel::after(dur);
-    Receiver(r)
-}
-
-pub fn tick(dur: Duration) -> Receiver<Instant> {
-    let r = channel::tick(dur);
-    Receiver(r)
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/select.rs cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/select.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/select.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/select.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-//! Channels with send and receive operations implemented using `select!`.
-//!
-//! Such `select!` invocations will often try to optimize the macro invocations by converting them
-//! into direct calls to `recv()` or `send()`.
-
-use std::ops::Deref;
-use std::time::{Duration, Instant};
-
-use channel;
-
-pub struct Sender<T>(pub channel::Sender<T>);
-
-pub struct Receiver<T>(pub channel::Receiver<T>);
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender(self.0.clone())
-    }
-}
-
-impl<T> Clone for Receiver<T> {
-    fn clone(&self) -> Receiver<T> {
-        Receiver(self.0.clone())
-    }
-}
-
-impl<T> Deref for Receiver<T> {
-    type Target = channel::Receiver<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Deref for Sender<T> {
-    type Target = channel::Sender<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Sender<T> {
-    pub fn send(&self, msg: T) {
-        select! {
-            send(self.0, msg) => {}
-        }
-    }
-}
-
-impl<T> Receiver<T> {
-    pub fn try_recv(&self) -> Option<T> {
-        select! {
-            recv(self.0, msg) => msg,
-            default => None,
-        }
-    }
-
-    pub fn recv(&self) -> Option<T> {
-        select! {
-            recv(self.0, msg) => msg,
-        }
-    }
-}
-
-pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::bounded(cap);
-    (Sender(s), Receiver(r))
-}
-
-pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::unbounded();
-    (Sender(s), Receiver(r))
-}
-
-pub fn after(dur: Duration) -> Receiver<Instant> {
-    let r = channel::after(dur);
-    Receiver(r)
-}
-
-pub fn tick(dur: Duration) -> Receiver<Instant> {
-    let r = channel::tick(dur);
-    Receiver(r)
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/select_spin.rs cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/select_spin.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/wrappers/select_spin.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/wrappers/select_spin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-//! Channels with send and receive operations implemented using strictly non-blocking `select!`.
-//!
-//! Such `select!` invocations will often try to optimize the macro invocations by converting them
-//! into special non-blocking method calls like `try_recv()`.
-
-use std::ops::Deref;
-use std::thread;
-use std::time::{Duration, Instant};
-
-use channel;
-
-pub struct Sender<T>(pub channel::Sender<T>);
-
-pub struct Receiver<T>(pub channel::Receiver<T>);
-
-impl<T> Clone for Sender<T> {
-    fn clone(&self) -> Sender<T> {
-        Sender(self.0.clone())
-    }
-}
-
-impl<T> Clone for Receiver<T> {
-    fn clone(&self) -> Receiver<T> {
-        Receiver(self.0.clone())
-    }
-}
-
-impl<T> Deref for Receiver<T> {
-    type Target = channel::Receiver<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Deref for Sender<T> {
-    type Target = channel::Sender<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> Sender<T> {
-    pub fn send(&self, msg: T) {
-        if self.0.capacity() == Some(0) {
-            // Zero-capacity channel are an exception - they need truly blocking operations.
-            select! {
-                send(self.0, msg) => {}
-            }
-        } else {
-            loop {
-                select! {
-                    send(self.0, msg) => break,
-                    default => thread::yield_now(),
-                }
-            }
-        }
-    }
-}
-
-impl<T> Receiver<T> {
-    pub fn try_recv(&self) -> Option<T> {
-        select! {
-            recv(self.0, msg) => msg,
-            default => None,
-        }
-    }
-
-    pub fn recv(&self) -> Option<T> {
-        if self.0.capacity() == Some(0) {
-            // Zero-capacity channel are an exception - they need truly blocking operations.
-            select! {
-                recv(self.0, msg) => msg,
-            }
-        } else {
-            loop {
-                select! {
-                    recv(self.0, msg) => break msg,
-                    default => thread::yield_now(),
-                }
-            }
-        }
-    }
-}
-
-pub fn bounded<T>(cap: usize) -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::bounded(cap);
-    (Sender(s), Receiver(r))
-}
-
-pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
-    let (s, r) = channel::unbounded();
-    (Sender(s), Receiver(r))
-}
-
-pub fn after(dur: Duration) -> Receiver<Instant> {
-    let r = channel::after(dur);
-    Receiver(r)
-}
-
-pub fn tick(dur: Duration) -> Receiver<Instant> {
-    let r = channel::tick(dur);
-    Receiver(r)
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/tests/zero.rs cargo-0.33.0/vendor/crossbeam-channel/tests/zero.rs
--- cargo-0.32.0/vendor/crossbeam-channel/tests/zero.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/tests/zero.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,495 +1,501 @@
 //! Tests for the zero channel flavor.
 
-extern crate crossbeam;
 #[macro_use]
-extern crate crossbeam_channel as channel;
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
 extern crate rand;
 
-mod wrappers;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+use std::thread;
+use std::time::Duration;
+
+use crossbeam_channel::bounded;
+use crossbeam_channel::{RecvError, RecvTimeoutError, TryRecvError};
+use crossbeam_channel::{SendError, SendTimeoutError, TrySendError};
+use crossbeam_utils::thread::scope;
+use rand::{thread_rng, Rng};
 
-macro_rules! tests {
-    ($channel:path) => {
-        use std::sync::atomic::AtomicUsize;
-        use std::sync::atomic::Ordering;
-        use std::thread;
-        use std::time::Duration;
-
-        use $channel as channel;
-        use crossbeam;
-        use rand::{thread_rng, Rng};
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
 
-        fn ms(ms: u64) -> Duration {
-            Duration::from_millis(ms)
-        }
+#[test]
+fn smoke() {
+    let (s, r) = bounded(0);
+    assert_eq!(s.try_send(7), Err(TrySendError::Full(7)));
+    assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+}
 
-        #[test]
-        fn smoke() {
-            let (s, r) = channel::bounded(0);
-            select! {
-                send(s, 7) => panic!(),
-                default => {}
-            }
-            assert_eq!(r.try_recv(), None);
+#[test]
+fn capacity() {
+    let (s, r) = bounded::<()>(0);
+    assert_eq!(s.capacity(), Some(0));
+    assert_eq!(r.capacity(), Some(0));
+}
 
-            assert_eq!(s.capacity(), Some(0));
-            assert_eq!(r.capacity(), Some(0));
-        }
+#[test]
+fn len_empty_full() {
+    let (s, r) = bounded(0);
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(s.is_empty(), true);
+    assert_eq!(s.is_full(), true);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), true);
+
+    scope(|scope| {
+        scope.spawn(|_| s.send(0).unwrap());
+        scope.spawn(|_| r.recv().unwrap());
+    }).unwrap();
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(s.is_empty(), true);
+    assert_eq!(s.is_full(), true);
+    assert_eq!(r.len(), 0);
+    assert_eq!(r.is_empty(), true);
+    assert_eq!(r.is_full(), true);
+}
 
-        #[test]
-        fn capacity() {
-            let (s, r) = channel::bounded::<()>(0);
-            assert_eq!(s.capacity(), Some(0));
-            assert_eq!(r.capacity(), Some(0));
-        }
+#[test]
+fn try_recv() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
+            thread::sleep(ms(1500));
+            assert_eq!(r.try_recv(), Ok(7));
+            thread::sleep(ms(500));
+            assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            s.send(7).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn len_empty_full() {
-            let (s, r) = channel::bounded(0);
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(s.is_empty(), true);
-            assert_eq!(s.is_full(), true);
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), true);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| s.send(0));
-                scope.spawn(|| r.recv().unwrap());
-            });
+#[test]
+fn recv() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv(), Ok(7));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(8));
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(9));
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            s.send(7).unwrap();
+            s.send(8).unwrap();
+            s.send(9).unwrap();
+        });
+    }).unwrap();
+}
 
-            assert_eq!(s.len(), 0);
-            assert_eq!(s.is_empty(), true);
-            assert_eq!(s.is_full(), true);
-            assert_eq!(r.len(), 0);
-            assert_eq!(r.is_empty(), true);
-            assert_eq!(r.is_full(), true);
-        }
+#[test]
+fn recv_timeout() {
+    let (s, r) = bounded::<i32>(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv_timeout(ms(1000)), Err(RecvTimeoutError::Timeout));
+            assert_eq!(r.recv_timeout(ms(1000)), Ok(7));
+            assert_eq!(
+                r.recv_timeout(ms(1000)),
+                Err(RecvTimeoutError::Disconnected)
+            );
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            s.send(7).unwrap();
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn recv() {
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.recv(), Some(7));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(8));
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(9));
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    s.send(7);
-                    s.send(8);
-                    s.send(9);
-                });
-            });
-        }
+#[test]
+fn try_send() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(s.try_send(7), Err(TrySendError::Full(7)));
+            thread::sleep(ms(1500));
+            assert_eq!(s.try_send(8), Ok(()));
+            thread::sleep(ms(500));
+            assert_eq!(s.try_send(9), Err(TrySendError::Disconnected(9)));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            assert_eq!(r.recv(), Ok(8));
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn recv_timeout() {
-            let (s, r) = channel::bounded::<i32>(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        recv(r) => panic!(),
-                        recv(channel::after(ms(1000))) => {}
-                    }
-                    select! {
-                        recv(r, v) => assert_eq!(v, Some(7)),
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                    select! {
-                        recv(r, v) => assert_eq!(v, None),
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    s.send(7);
-                });
-            });
-        }
+#[test]
+fn send() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            s.send(7).unwrap();
+            thread::sleep(ms(1000));
+            s.send(8).unwrap();
+            thread::sleep(ms(1000));
+            s.send(9).unwrap();
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            assert_eq!(r.recv(), Ok(7));
+            assert_eq!(r.recv(), Ok(8));
+            assert_eq!(r.recv(), Ok(9));
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn try_recv() {
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.try_recv(), None);
-                    thread::sleep(ms(1500));
-                    assert_eq!(r.try_recv(), Some(7));
-                    thread::sleep(ms(500));
-                    assert_eq!(r.try_recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    s.send(7);
-                });
-            });
-        }
+#[test]
+fn send_timeout() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(
+                s.send_timeout(7, ms(1000)),
+                Err(SendTimeoutError::Timeout(7))
+            );
+            assert_eq!(s.send_timeout(8, ms(1000)), Ok(()));
+            assert_eq!(
+                s.send_timeout(9, ms(1000)),
+                Err(SendTimeoutError::Disconnected(9))
+            );
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1500));
+            assert_eq!(r.recv(), Ok(8));
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn send() {
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    s.send(7);
-                    thread::sleep(ms(1000));
-                    s.send(8);
-                    thread::sleep(ms(1000));
-                    s.send(9);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    assert_eq!(r.recv(), Some(7));
-                    assert_eq!(r.recv(), Some(8));
-                    assert_eq!(r.recv(), Some(9));
-                });
-            });
-        }
+#[test]
+fn len() {
+    const COUNT: usize = 25_000;
+
+    let (s, r) = bounded(0);
+
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                assert_eq!(r.recv(), Ok(i));
+                assert_eq!(r.len(), 0);
+            }
+        });
 
-        #[test]
-        fn send_timeout() {
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        send(s, 7) => panic!(),
-                        recv(channel::after(ms(1000))) => {}
-                    }
-                    select! {
-                        send(s, 8) => {}
-                        recv(channel::after(ms(1000))) => panic!(),
-                    }
-                    select! {
-                        send(s, 9) => panic!(),
-                        recv(channel::after(ms(1000))) => {}
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1500));
-                    assert_eq!(r.recv(), Some(8));
-                });
-            });
-        }
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                s.send(i).unwrap();
+                assert_eq!(s.len(), 0);
+            }
+        });
+    }).unwrap();
 
-        #[test]
-        fn try_send() {
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    select! {
-                        send(s, 7) => panic!(),
-                        default => {}
-                    }
-                    thread::sleep(ms(1500));
-                    select! {
-                        send(s, 8) => {}
-                        default => panic!(),
-                    }
-                    thread::sleep(ms(500));
-                    select! {
-                        send(s, 9) => panic!(),
-                        default => {}
-                    }
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    assert_eq!(r.recv(), Some(8));
-                });
-            });
-        }
+    assert_eq!(s.len(), 0);
+    assert_eq!(r.len(), 0);
+}
 
-        #[test]
-        fn len() {
-            const COUNT: usize = 25_000;
-
-            let (s, r) = channel::bounded(0);
-
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        assert_eq!(r.recv(), Some(i));
-                        assert_eq!(r.len(), 0);
-                    }
-                });
+#[test]
+fn disconnect_wakes_sender() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(s.send(()), Err(SendError(())));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(r);
+        });
+    }).unwrap();
+}
 
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        s.send(i);
-                        assert_eq!(s.len(), 0);
-                    }
-                });
-            });
+#[test]
+fn disconnect_wakes_receiver() {
+    let (s, r) = bounded::<()>(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            thread::sleep(ms(1000));
+            drop(s);
+        });
+    }).unwrap();
+}
 
-            assert_eq!(s.len(), 0);
-            assert_eq!(r.len(), 0);
-        }
+#[test]
+fn spsc() {
+    const COUNT: usize = 100_000;
+
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            for i in 0..COUNT {
+                assert_eq!(r.recv(), Ok(i));
+            }
+            assert_eq!(r.recv(), Err(RecvError));
+        });
+        scope.spawn(move |_| {
+            for i in 0..COUNT {
+                s.send(i).unwrap();
+            }
+        });
+    }).unwrap();
+}
 
-        #[test]
-        fn close_wakes_receiver() {
-            let (s, r) = channel::bounded::<()>(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    thread::sleep(ms(1000));
-                    drop(s);
-                });
+#[test]
+fn mpmc() {
+    const COUNT: usize = 25_000;
+    const THREADS: usize = 4;
+
+    let (s, r) = bounded::<usize>(0);
+    let v = (0..COUNT).map(|_| AtomicUsize::new(0)).collect::<Vec<_>>();
+
+    scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for _ in 0..COUNT {
+                    let n = r.recv().unwrap();
+                    v[n].fetch_add(1, Ordering::SeqCst);
+                }
             });
         }
-
-        #[test]
-        fn spsc() {
-            const COUNT: usize = 100_000;
-
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(move || {
-                    for i in 0..COUNT {
-                        assert_eq!(r.recv(), Some(i));
-                    }
-                    assert_eq!(r.recv(), None);
-                });
-                scope.spawn(move || {
-                    for i in 0..COUNT {
-                        s.send(i);
-                    }
-                });
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                for i in 0..COUNT {
+                    s.send(i).unwrap();
+                }
             });
         }
+    }).unwrap();
 
-        #[test]
-        fn mpmc() {
-            const COUNT: usize = 25_000;
-            const THREADS: usize = 4;
-
-            let (s, r) = channel::bounded::<usize>(0);
-            let v = (0..COUNT).map(|_| AtomicUsize::new(0)).collect::<Vec<_>>();
-
-            crossbeam::scope(|scope| {
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for _ in 0..COUNT {
-                            let n = r.recv().unwrap();
-                            v[n].fetch_add(1, Ordering::SeqCst);
-                        }
-                    });
-                }
-                for _ in 0..THREADS {
-                    scope.spawn(|| {
-                        for i in 0..COUNT {
-                            s.send(i);
-                        }
-                    });
+    for c in v {
+        assert_eq!(c.load(Ordering::SeqCst), THREADS);
+    }
+}
+
+#[test]
+fn stress_oneshot() {
+    const COUNT: usize = 10_000;
+
+    for _ in 0..COUNT {
+        let (s, r) = bounded(1);
+
+        scope(|scope| {
+            scope.spawn(|_| r.recv().unwrap());
+            scope.spawn(|_| s.send(0).unwrap());
+        }).unwrap();
+    }
+}
+
+#[test]
+fn stress_iter() {
+    const COUNT: usize = 1000;
+
+    let (request_s, request_r) = bounded(0);
+    let (response_s, response_r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut count = 0;
+            loop {
+                for x in response_r.try_iter() {
+                    count += x;
+                    if count == COUNT {
+                        return;
+                    }
                 }
-            });
+                let _ = request_s.try_send(());
+            }
+        });
 
-            for c in v {
-                assert_eq!(c.load(Ordering::SeqCst), THREADS);
+        for _ in request_r.iter() {
+            if response_s.send(1).is_err() {
+                break;
             }
         }
+    }).unwrap();
+}
 
-        #[test]
-        fn stress_timeout_two_threads() {
-            const COUNT: usize = 100;
-
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        if i % 2 == 0 {
-                            thread::sleep(ms(50));
-                        }
-                        loop {
-                            select! {
-                                send(s, i) => break,
-                                recv(channel::after(ms(10))) => {}
-                            }
-                        }
+#[test]
+fn stress_timeout_two_threads() {
+    const COUNT: usize = 100;
+
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(50));
+                }
+                loop {
+                    if let Ok(()) = s.send_timeout(i, ms(10)) {
+                        break;
                     }
-                });
+                }
+            }
+        });
 
-                scope.spawn(|| {
-                    for i in 0..COUNT {
-                        if i % 2 == 0 {
-                            thread::sleep(ms(50));
-                        }
-                        loop {
-                            select! {
-                                recv(r, v) => {
-                                    assert_eq!(v, Some(i));
-                                    break;
-                                }
-                                recv(channel::after(ms(10))) => {}
-                            }
-                        }
+        scope.spawn(|_| {
+            for i in 0..COUNT {
+                if i % 2 == 0 {
+                    thread::sleep(ms(50));
+                }
+                loop {
+                    if let Ok(x) = r.recv_timeout(ms(10)) {
+                        assert_eq!(x, i);
+                        break;
                     }
-                });
-            });
-        }
-
-        #[test]
-        fn drops() {
-            static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-            #[derive(Debug, PartialEq)]
-            struct DropCounter;
-
-            impl Drop for DropCounter {
-                fn drop(&mut self) {
-                    DROPS.fetch_add(1, Ordering::SeqCst);
                 }
             }
+        });
+    }).unwrap();
+}
 
-            let mut rng = thread_rng();
-
-            for _ in 0..100 {
-                let steps = rng.gen_range(0, 3_000);
+#[test]
+fn drops() {
+    static DROPS: AtomicUsize = AtomicUsize::new(0);
 
-                DROPS.store(0, Ordering::SeqCst);
-                let (s, r) = channel::bounded::<DropCounter>(0);
+    #[derive(Debug, PartialEq)]
+    struct DropCounter;
 
-                crossbeam::scope(|scope| {
-                    scope.spawn(|| {
-                        for _ in 0..steps {
-                            r.recv().unwrap();
-                        }
-                    });
+    impl Drop for DropCounter {
+        fn drop(&mut self) {
+            DROPS.fetch_add(1, Ordering::SeqCst);
+        }
+    }
 
-                    scope.spawn(|| {
-                        for _ in 0..steps {
-                            s.send(DropCounter);
-                        }
-                    });
-                });
+    let mut rng = thread_rng();
 
-                assert_eq!(DROPS.load(Ordering::SeqCst), steps);
-                drop(s);
-                drop(r);
-                assert_eq!(DROPS.load(Ordering::SeqCst), steps);
-            }
-        }
+    for _ in 0..100 {
+        let steps = rng.gen_range(0, 3_000);
 
-        #[test]
-        fn fairness() {
-            const COUNT: usize = 10_000;
-
-            let (s1, r1) = channel::bounded::<()>(0);
-            let (s2, r2) = channel::bounded::<()>(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    let mut hits = [0usize; 2];
-                    for _ in 0..COUNT {
-                        select! {
-                            recv(r1) => hits[0] += 1,
-                            recv(r2) => hits[1] += 1,
-                        }
-                    }
-                    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-                });
+        DROPS.store(0, Ordering::SeqCst);
+        let (s, r) = bounded::<DropCounter>(0);
 
-                let mut hits = [0usize; 2];
-                for _ in 0..COUNT {
-                    select! {
-                        send(s1, ()) => hits[0] += 1,
-                        send(s2, ()) => hits[1] += 1,
-                    }
+        scope(|scope| {
+            scope.spawn(|_| {
+                for _ in 0..steps {
+                    r.recv().unwrap();
                 }
-                assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
             });
-        }
 
-        #[test]
-        fn fairness_duplicates() {
-            const COUNT: usize = 10_000;
-
-            let (s, r) = channel::bounded::<()>(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    let mut hits = [0usize; 5];
-                    for _ in 0..COUNT {
-                        select! {
-                            recv(r) => hits[0] += 1,
-                            recv(r) => hits[1] += 1,
-                            recv(r) => hits[2] += 1,
-                            recv(r) => hits[3] += 1,
-                            recv(r) => hits[4] += 1,
-                        }
-                    }
-                    assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-                });
-
-                let mut hits = [0usize; 5];
-                for _ in 0..COUNT {
-                    select! {
-                        send(s, ()) => hits[0] += 1,
-                        send(s, ()) => hits[1] += 1,
-                        send(s, ()) => hits[2] += 1,
-                        send(s, ()) => hits[3] += 1,
-                        send(s, ()) => hits[4] += 1,
-                    }
+            scope.spawn(|_| {
+                for _ in 0..steps {
+                    s.send(DropCounter).unwrap();
                 }
-                assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
             });
-        }
+        }).unwrap();
 
-        #[test]
-        fn recv_in_send() {
-            let (s, r) = channel::bounded(0);
-
-            crossbeam::scope(|scope| {
-                scope.spawn(|| {
-                    thread::sleep(ms(100));
-                    r.recv()
-                });
-
-                scope.spawn(|| {
-                    thread::sleep(ms(500));
-                    s.send(());
-                });
+        assert_eq!(DROPS.load(Ordering::SeqCst), steps);
+        drop(s);
+        drop(r);
+        assert_eq!(DROPS.load(Ordering::SeqCst), steps);
+    }
+}
 
+#[test]
+fn fairness() {
+    const COUNT: usize = 10_000;
+
+    let (s1, r1) = bounded::<()>(0);
+    let (s2, r2) = bounded::<()>(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            let mut hits = [0usize; 2];
+            for _ in 0..COUNT {
                 select! {
-                    send(s, r.recv().unwrap()) => {}
+                    recv(r1) -> _ => hits[0] += 1,
+                    recv(r2) -> _ => hits[1] += 1,
                 }
-            });
-        }
-    };
-}
+            }
+            assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+        });
 
-mod normal {
-    tests!(wrappers::normal);
+        let mut hits = [0usize; 2];
+        for _ in 0..COUNT {
+            select! {
+                send(s1, ()) -> _ => hits[0] += 1,
+                send(s2, ()) -> _ => hits[1] += 1,
+            }
+        }
+        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    }).unwrap();
 }
 
-mod cloned {
-    tests!(wrappers::cloned);
-}
+#[test]
+fn fairness_duplicates() {
+    const COUNT: usize = 10_000;
+
+    let (s, r) = bounded::<()>(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            let mut hits = [0usize; 5];
+            for _ in 0..COUNT {
+                select! {
+                    recv(r) -> _ => hits[0] += 1,
+                    recv(r) -> _ => hits[1] += 1,
+                    recv(r) -> _ => hits[2] += 1,
+                    recv(r) -> _ => hits[3] += 1,
+                    recv(r) -> _ => hits[4] += 1,
+                }
+            }
+            assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+        });
 
-mod select {
-    tests!(wrappers::select);
+        let mut hits = [0usize; 5];
+        for _ in 0..COUNT {
+            select! {
+                send(s, ()) -> _ => hits[0] += 1,
+                send(s, ()) -> _ => hits[1] += 1,
+                send(s, ()) -> _ => hits[2] += 1,
+                send(s, ()) -> _ => hits[3] += 1,
+                send(s, ()) -> _ => hits[4] += 1,
+            }
+        }
+        assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
+    }).unwrap();
 }
 
-mod select_spin {
-    tests!(wrappers::select_spin);
-}
+#[test]
+fn recv_in_send() {
+    let (s, r) = bounded(0);
+
+    scope(|scope| {
+        scope.spawn(|_| {
+            thread::sleep(ms(100));
+            r.recv()
+        });
+
+        scope.spawn(|_| {
+            thread::sleep(ms(500));
+            s.send(()).unwrap();
+        });
 
-mod select_multi {
-    tests!(wrappers::select_multi);
+        select! {
+            send(s, r.recv().unwrap()) -> _ => {}
+        }
+    }).unwrap();
 }
diff -Nru cargo-0.32.0/vendor/crossbeam-channel/.travis.yml cargo-0.33.0/vendor/crossbeam-channel/.travis.yml
--- cargo-0.32.0/vendor/crossbeam-channel/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-channel/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-language: rust
-
-rust:
-  - stable
-  - beta
-  - nightly
-  - 1.26.0
-
-script:
-  - export RUSTFLAGS="-D warnings"
-  - cargo build
-  - cargo build --release
-  - cargo test -- --test-threads=1
-  - cargo test --release -- --test-threads=1
-  - |
-    if [[ $TRAVIS_RUST_VERSION == nightly ]]; then
-      cd benchmarks
-      cargo build --bins
-      cargo build --bins --release
-    fi
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/benches/defer.rs cargo-0.33.0/vendor/crossbeam-epoch/benches/defer.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/benches/defer.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/benches/defer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#![feature(test)]
-
-extern crate crossbeam_epoch as epoch;
-extern crate crossbeam_utils as utils;
-extern crate test;
-
-use epoch::Owned;
-use test::Bencher;
-use utils::thread::scope;
-
-#[bench]
-fn single_alloc_defer_free(b: &mut Bencher) {
-    b.iter(|| {
-        let guard = &epoch::pin();
-        let p = Owned::new(1).into_shared(guard);
-        unsafe {
-            guard.defer_destroy(p);
-        }
-    });
-}
-
-#[bench]
-fn single_defer(b: &mut Bencher) {
-    b.iter(|| {
-        let guard = &epoch::pin();
-        guard.defer(move || ());
-    });
-}
-
-#[bench]
-fn multi_alloc_defer_free(b: &mut Bencher) {
-    const THREADS: usize = 16;
-    const STEPS: usize = 10_000;
-
-    b.iter(|| {
-        scope(|s| {
-            for _ in 0..THREADS {
-                s.spawn(|_| {
-                    for _ in 0..STEPS {
-                        let guard = &epoch::pin();
-                        let p = Owned::new(1).into_shared(guard);
-                        unsafe {
-                            guard.defer_destroy(p);
-                        }
-                    }
-                });
-            }
-        }).unwrap();
-    });
-}
-
-#[bench]
-fn multi_defer(b: &mut Bencher) {
-    const THREADS: usize = 16;
-    const STEPS: usize = 10_000;
-
-    b.iter(|| {
-        scope(|s| {
-            for _ in 0..THREADS {
-                s.spawn(|_| {
-                    for _ in 0..STEPS {
-                        let guard = &epoch::pin();
-                        guard.defer(move || ());
-                    }
-                });
-            }
-        }).unwrap();
-    });
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/benches/flush.rs cargo-0.33.0/vendor/crossbeam-epoch/benches/flush.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/benches/flush.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/benches/flush.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#![feature(test)]
-
-extern crate crossbeam_epoch as epoch;
-extern crate crossbeam_utils as utils;
-extern crate test;
-
-use std::sync::Barrier;
-
-use test::Bencher;
-use utils::thread::scope;
-
-#[bench]
-fn single_flush(b: &mut Bencher) {
-    const THREADS: usize = 16;
-
-    let start = Barrier::new(THREADS + 1);
-    let end = Barrier::new(THREADS + 1);
-
-    scope(|s| {
-        for _ in 0..THREADS {
-            s.spawn(|_| {
-                epoch::pin();
-                start.wait();
-                end.wait();
-            });
-        }
-
-        start.wait();
-        b.iter(|| epoch::pin().flush());
-        end.wait();
-    }).unwrap();
-}
-
-#[bench]
-fn multi_flush(b: &mut Bencher) {
-    const THREADS: usize = 16;
-    const STEPS: usize = 10_000;
-
-    b.iter(|| {
-        scope(|s| {
-            for _ in 0..THREADS {
-                s.spawn(|_| {
-                    for _ in 0..STEPS {
-                        let guard = &epoch::pin();
-                        guard.flush();
-                    }
-                });
-            }
-        }).unwrap();
-    });
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/benches/pin.rs cargo-0.33.0/vendor/crossbeam-epoch/benches/pin.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/benches/pin.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/benches/pin.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-#![feature(test)]
-
-extern crate crossbeam_epoch as epoch;
-extern crate crossbeam_utils as utils;
-extern crate test;
-
-use test::Bencher;
-use utils::thread::scope;
-
-#[bench]
-fn single_pin(b: &mut Bencher) {
-    b.iter(|| epoch::pin());
-}
-
-#[bench]
-fn multi_pin(b: &mut Bencher) {
-    const THREADS: usize = 16;
-    const STEPS: usize = 100_000;
-
-    b.iter(|| {
-        scope(|s| {
-            for _ in 0..THREADS {
-                s.spawn(|_| {
-                    for _ in 0..STEPS {
-                        epoch::pin();
-                    }
-                });
-            }
-        }).unwrap();
-    });
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/.cargo-checksum.json cargo-0.33.0/vendor/crossbeam-epoch/.cargo-checksum.json
--- cargo-0.32.0/vendor/crossbeam-epoch/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"2449aaa4ec7ef96e5fb24db16024b935df718e9ae1cec0a1e68feeca2efca7b8"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/Cargo.toml cargo-0.33.0/vendor/crossbeam-epoch/Cargo.toml
--- cargo-0.32.0/vendor/crossbeam-epoch/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "crossbeam-epoch"
-version = "0.6.1"
-authors = ["The Crossbeam Project Developers"]
-description = "Epoch-based garbage collection"
-homepage = "https://github.com/crossbeam-rs/crossbeam"
-documentation = "https://docs.rs/crossbeam-epoch"
-readme = "README.md"
-keywords = ["lock-free", "rcu", "atomic", "garbage"]
-categories = ["concurrency", "memory-management"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/crossbeam-rs/crossbeam"
-[dependencies.arrayvec]
-version = "0.4"
-default-features = false
-
-[dependencies.cfg-if]
-version = "0.1"
-
-[dependencies.crossbeam-utils]
-version = "0.6"
-default-features = false
-
-[dependencies.lazy_static]
-version = "1"
-optional = true
-
-[dependencies.memoffset]
-version = "0.2"
-
-[dependencies.scopeguard]
-version = "0.3"
-default-features = false
-[dev-dependencies.rand]
-version = "0.5"
-
-[features]
-default = ["std"]
-nightly = ["arrayvec/use_union"]
-sanitize = []
-std = ["lazy_static", "crossbeam-utils/std"]
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/.cargo_vcs_info.json cargo-0.33.0/vendor/crossbeam-epoch/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/crossbeam-epoch/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "daff910e8488ac762978a4f05aa057b92f9d5671"
-  }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/CHANGELOG.md cargo-0.33.0/vendor/crossbeam-epoch/CHANGELOG.md
--- cargo-0.32.0/vendor/crossbeam-epoch/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-# Version 0.6.1
-
-- Update `crossbeam-utils` to `0.6`.
-
-# Version 0.6.0
-
-- `defer` now requires `F: Send + 'static`.
-- Bump the minimum Rust version to 1.26.
-- Pinning while TLS is tearing down does not fail anymore.
-- Rename `Handle` to `LocalHandle`.
-- Add `defer_unchecked` and `defer_destroy`.
-- Remove `Clone` impl for `LocalHandle`.
-
-# Version 0.5.2
-
-- Update `crossbeam-utils` to `0.5`.
-
-# Version 0.5.1
-
-- Fix compatibility with the latest Rust nightly.
-
-# Version 0.5.0
-
-- Update `crossbeam-utils` to `0.4`.
-- Specify the minimum Rust version to `1.25.0`.
-
-# Version 0.4.3
-
-- Downgrade `crossbeam-utils` to `0.3` because it was a breaking change.
-
-# Version 0.4.2
-
-- Expose the `Pointer` trait.
-- Warn missing docs and missing debug impls.
-- Update `crossbeam-utils` to `0.4`.
-
-# Version 0.4.1
-
-- Add `Debug` impls for `Collector`, `Handle`, and `Guard`.
-- Add `load_consume` to `Atomic`.
-- Rename `Collector::handle` to `Collector::register`.
-- Remove the `Send` implementation for `Handle` (this was a bug). Only
-  `Collector`s can be shared among multiple threads, while `Handle`s and
-  `Guard`s must stay within the thread in which they were created.
-
-# Version 0.4.0
-
-- Update dependencies.
-- Remove support for Rust 1.13.
-
-# Version 0.3.0
-
-- Add support for Rust 1.13.
-- Improve documentation for CAS.
-
-# Version 0.2.0
-
-- Add method `Owned::into_box`.
-- Fix a use-after-free bug in `Local::finalize`.
-- Fix an ordering bug in `Global::push_bag`.
-- Fix a bug in calculating distance between epochs.
-- Remove `impl<T> Into<Box<T>> for Owned<T>`.
-
-# Version 0.1.0
-
-- First version of the new epoch-based GC.
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/examples/sanitize.rs cargo-0.33.0/vendor/crossbeam-epoch/examples/sanitize.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/examples/sanitize.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/examples/sanitize.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-extern crate crossbeam_epoch as epoch;
-extern crate rand;
-
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering::{AcqRel, Acquire, Relaxed};
-use std::sync::Arc;
-use std::thread;
-use std::time::{Duration, Instant};
-
-use epoch::{Atomic, Collector, LocalHandle, Owned, Shared};
-use rand::Rng;
-
-fn worker(a: Arc<Atomic<AtomicUsize>>, handle: LocalHandle) -> usize {
-    let mut rng = rand::thread_rng();
-    let mut sum = 0;
-
-    if rng.gen() {
-        thread::sleep(Duration::from_millis(1));
-    }
-    let timeout = Duration::from_millis(rng.gen_range(0, 10));
-    let now = Instant::now();
-
-    while now.elapsed() < timeout {
-        for _ in 0..100 {
-            let guard = &handle.pin();
-            guard.flush();
-
-            let val = if rng.gen() {
-                let p = a.swap(Owned::new(AtomicUsize::new(sum)), AcqRel, guard);
-                unsafe {
-                    guard.defer_destroy(p);
-                    guard.flush();
-                    p.deref().load(Relaxed)
-                }
-            } else {
-                let p = a.load(Acquire, guard);
-                unsafe { p.deref().fetch_add(sum, Relaxed) }
-            };
-
-            sum = sum.wrapping_add(val);
-        }
-    }
-
-    sum
-}
-
-fn main() {
-    for _ in 0..100 {
-        let collector = Collector::new();
-        let a = Arc::new(Atomic::new(AtomicUsize::new(777)));
-
-        let threads = (0..16)
-            .map(|_| {
-                let a = a.clone();
-                let c = collector.clone();
-                thread::spawn(move || worker(a, c.register()))
-            }).collect::<Vec<_>>();
-
-        for t in threads {
-            t.join().unwrap();
-        }
-
-        unsafe {
-            a.swap(Shared::null(), AcqRel, epoch::unprotected())
-                .into_owned();
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/LICENSE-APACHE cargo-0.33.0/vendor/crossbeam-epoch/LICENSE-APACHE
--- cargo-0.32.0/vendor/crossbeam-epoch/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/LICENSE-MIT cargo-0.33.0/vendor/crossbeam-epoch/LICENSE-MIT
--- cargo-0.32.0/vendor/crossbeam-epoch/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2010 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/README.md cargo-0.33.0/vendor/crossbeam-epoch/README.md
--- cargo-0.32.0/vendor/crossbeam-epoch/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-# Epoch-based garbage collection
-
-[![Build Status](https://travis-ci.org/crossbeam-rs/crossbeam.svg?branch=master)](
-https://travis-ci.org/crossbeam-rs/crossbeam)
-[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
-https://github.com/crossbeam-rs/crossbeam-epoch)
-[![Cargo](https://img.shields.io/crates/v/crossbeam-epoch.svg)](
-https://crates.io/crates/crossbeam-epoch)
-[![Documentation](https://docs.rs/crossbeam-epoch/badge.svg)](
-https://docs.rs/crossbeam-epoch)
-
-This crate provides epoch-based garbage collection for use in concurrent data structures.
-
-If a thread removes a node from a concurrent data structure, other threads
-may still have pointers to that node, so it cannot be immediately destructed.
-Epoch GC allows deferring destruction until it becomes safe to do so.
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-crossbeam-epoch = "0.6"
-```
-
-Next, add this to your crate:
-
-```rust
-extern crate crossbeam_epoch as epoch;
-```
-
-The minimum required Rust version is 1.26.
-
-## License
-
-Licensed under the terms of MIT license and the Apache License (Version 2.0).
-
-See [LICENSE-MIT](LICENSE-MIT) and [LICENSE-APACHE](LICENSE-APACHE) for details.
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/atomic.rs cargo-0.33.0/vendor/crossbeam-epoch/src/atomic.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/atomic.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/atomic.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1124 +0,0 @@
-use alloc::boxed::Box;
-use core::borrow::{Borrow, BorrowMut};
-use core::cmp;
-use core::fmt;
-use core::marker::PhantomData;
-use core::mem;
-use core::ops::{Deref, DerefMut};
-use core::ptr;
-use core::sync::atomic::Ordering;
-use core::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT};
-
-use crossbeam_utils::atomic::AtomicConsume;
-use guard::Guard;
-
-/// Given ordering for the success case in a compare-exchange operation, returns the strongest
-/// appropriate ordering for the failure case.
-#[inline]
-fn strongest_failure_ordering(ord: Ordering) -> Ordering {
-    use self::Ordering::*;
-    match ord {
-        Relaxed | Release => Relaxed,
-        Acquire | AcqRel => Acquire,
-        _ => SeqCst,
-    }
-}
-
-/// The error returned on failed compare-and-set operation.
-pub struct CompareAndSetError<'g, T: 'g, P: Pointer<T>> {
-    /// The value in the atomic pointer at the time of the failed operation.
-    pub current: Shared<'g, T>,
-
-    /// The new value, which the operation failed to store.
-    pub new: P,
-}
-
-impl<'g, T: 'g, P: Pointer<T> + fmt::Debug> fmt::Debug for CompareAndSetError<'g, T, P> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("CompareAndSetError")
-            .field("current", &self.current)
-            .field("new", &self.new)
-            .finish()
-    }
-}
-
-/// Memory orderings for compare-and-set operations.
-///
-/// A compare-and-set operation can have different memory orderings depending on whether it
-/// succeeds or fails. This trait generalizes different ways of specifying memory orderings.
-///
-/// The two ways of specifying orderings for compare-and-set are:
-///
-/// 1. Just one `Ordering` for the success case. In case of failure, the strongest appropriate
-///    ordering is chosen.
-/// 2. A pair of `Ordering`s. The first one is for the success case, while the second one is
-///    for the failure case.
-pub trait CompareAndSetOrdering {
-    /// The ordering of the operation when it succeeds.
-    fn success(&self) -> Ordering;
-
-    /// The ordering of the operation when it fails.
-    ///
-    /// The failure ordering can't be `Release` or `AcqRel` and must be equivalent or weaker than
-    /// the success ordering.
-    fn failure(&self) -> Ordering;
-}
-
-impl CompareAndSetOrdering for Ordering {
-    #[inline]
-    fn success(&self) -> Ordering {
-        *self
-    }
-
-    #[inline]
-    fn failure(&self) -> Ordering {
-        strongest_failure_ordering(*self)
-    }
-}
-
-impl CompareAndSetOrdering for (Ordering, Ordering) {
-    #[inline]
-    fn success(&self) -> Ordering {
-        self.0
-    }
-
-    #[inline]
-    fn failure(&self) -> Ordering {
-        self.1
-    }
-}
-
-/// Panics if the pointer is not properly unaligned.
-#[inline]
-fn ensure_aligned<T>(raw: *const T) {
-    assert_eq!(raw as usize & low_bits::<T>(), 0, "unaligned pointer");
-}
-
-/// Returns a bitmask containing the unused least significant bits of an aligned pointer to `T`.
-#[inline]
-fn low_bits<T>() -> usize {
-    (1 << mem::align_of::<T>().trailing_zeros()) - 1
-}
-
-/// Given a tagged pointer `data`, returns the same pointer, but tagged with `tag`.
-///
-/// `tag` is truncated to fit into the unused bits of the pointer to `T`.
-#[inline]
-fn data_with_tag<T>(data: usize, tag: usize) -> usize {
-    (data & !low_bits::<T>()) | (tag & low_bits::<T>())
-}
-
-/// Decomposes a tagged pointer `data` into the pointer and the tag.
-#[inline]
-fn decompose_data<T>(data: usize) -> (*mut T, usize) {
-    let raw = (data & !low_bits::<T>()) as *mut T;
-    let tag = data & low_bits::<T>();
-    (raw, tag)
-}
-
-/// An atomic pointer that can be safely shared between threads.
-///
-/// The pointer must be properly aligned. Since it is aligned, a tag can be stored into the unused
-/// least significant bits of the address.  More precisely, a tag should be less than `(1 <<
-/// mem::align_of::<T>().trailing_zeros())`.
-///
-/// Any method that loads the pointer must be passed a reference to a [`Guard`].
-///
-/// [`Guard`]: struct.Guard.html
-pub struct Atomic<T> {
-    data: AtomicUsize,
-    _marker: PhantomData<*mut T>,
-}
-
-unsafe impl<T: Send + Sync> Send for Atomic<T> {}
-unsafe impl<T: Send + Sync> Sync for Atomic<T> {}
-
-impl<T> Atomic<T> {
-    /// Returns a new atomic pointer pointing to the tagged pointer `data`.
-    fn from_usize(data: usize) -> Self {
-        Self {
-            data: AtomicUsize::new(data),
-            _marker: PhantomData,
-        }
-    }
-
-    /// Returns a new null atomic pointer.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Atomic;
-    ///
-    /// let a = Atomic::<i32>::null();
-    /// ```
-    #[cfg(not(feature = "nightly"))]
-    pub fn null() -> Atomic<T> {
-        Self {
-            data: ATOMIC_USIZE_INIT,
-            _marker: PhantomData,
-        }
-    }
-
-    /// Returns a new null atomic pointer.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Atomic;
-    ///
-    /// let a = Atomic::<i32>::null();
-    /// ```
-    #[cfg(feature = "nightly")]
-    pub const fn null() -> Atomic<T> {
-        Self {
-            data: ATOMIC_USIZE_INIT,
-            _marker: PhantomData,
-        }
-    }
-
-    /// Allocates `value` on the heap and returns a new atomic pointer pointing to it.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Atomic;
-    ///
-    /// let a = Atomic::new(1234);
-    /// ```
-    pub fn new(value: T) -> Atomic<T> {
-        Self::from(Owned::new(value))
-    }
-
-    /// Loads a `Shared` from the atomic pointer.
-    ///
-    /// This method takes an [`Ordering`] argument which describes the memory ordering of this
-    /// operation.
-    ///
-    /// [`Ordering`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// let guard = &epoch::pin();
-    /// let p = a.load(SeqCst, guard);
-    /// ```
-    pub fn load<'g>(&self, ord: Ordering, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.data.load(ord)) }
-    }
-
-    /// Loads a `Shared` from the atomic pointer using a "consume" memory ordering.
-    ///
-    /// This is similar to the "acquire" ordering, except that an ordering is
-    /// only guaranteed with operations that "depend on" the result of the load.
-    /// However consume loads are usually much faster than acquire loads on
-    /// architectures with a weak memory model since they don't require memory
-    /// fence instructions.
-    ///
-    /// The exact definition of "depend on" is a bit vague, but it works as you
-    /// would expect in practice since a lot of software, especially the Linux
-    /// kernel, rely on this behavior.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    ///
-    /// let a = Atomic::new(1234);
-    /// let guard = &epoch::pin();
-    /// let p = a.load_consume(guard);
-    /// ```
-    pub fn load_consume<'g>(&self, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.data.load_consume()) }
-    }
-
-    /// Stores a `Shared` or `Owned` pointer into the atomic pointer.
-    ///
-    /// This method takes an [`Ordering`] argument which describes the memory ordering of this
-    /// operation.
-    ///
-    /// [`Ordering`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// a.store(Shared::null(), SeqCst);
-    /// a.store(Owned::new(1234), SeqCst);
-    /// ```
-    pub fn store<'g, P: Pointer<T>>(&self, new: P, ord: Ordering) {
-        self.data.store(new.into_usize(), ord);
-    }
-
-    /// Stores a `Shared` or `Owned` pointer into the atomic pointer, returning the previous
-    /// `Shared`.
-    ///
-    /// This method takes an [`Ordering`] argument which describes the memory ordering of this
-    /// operation.
-    ///
-    /// [`Ordering`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// let guard = &epoch::pin();
-    /// let p = a.swap(Shared::null(), SeqCst, guard);
-    /// ```
-    pub fn swap<'g, P: Pointer<T>>(&self, new: P, ord: Ordering, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.data.swap(new.into_usize(), ord)) }
-    }
-
-    /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
-    /// value is the same as `current`. The tag is also taken into account, so two pointers to the
-    /// same object, but with different tags, will not be considered equal.
-    ///
-    /// The return value is a result indicating whether the new pointer was written. On success the
-    /// pointer that was written is returned. On failure the actual current value and `new` are
-    /// returned.
-    ///
-    /// This method takes a [`CompareAndSetOrdering`] argument which describes the memory
-    /// ordering of this operation.
-    ///
-    /// [`CompareAndSetOrdering`]: trait.CompareAndSetOrdering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    ///
-    /// let guard = &epoch::pin();
-    /// let mut curr = a.load(SeqCst, guard);
-    /// let res1 = a.compare_and_set(curr, Shared::null(), SeqCst, guard);
-    /// let res2 = a.compare_and_set(curr, Owned::new(5678), SeqCst, guard);
-    /// ```
-    pub fn compare_and_set<'g, O, P>(
-        &self,
-        current: Shared<T>,
-        new: P,
-        ord: O,
-        _: &'g Guard,
-    ) -> Result<Shared<'g, T>, CompareAndSetError<'g, T, P>>
-    where
-        O: CompareAndSetOrdering,
-        P: Pointer<T>,
-    {
-        let new = new.into_usize();
-        self.data
-            .compare_exchange(current.into_usize(), new, ord.success(), ord.failure())
-            .map(|_| unsafe { Shared::from_usize(new) })
-            .map_err(|current| unsafe {
-                CompareAndSetError {
-                    current: Shared::from_usize(current),
-                    new: P::from_usize(new),
-                }
-            })
-    }
-
-    /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
-    /// value is the same as `current`. The tag is also taken into account, so two pointers to the
-    /// same object, but with different tags, will not be considered equal.
-    ///
-    /// Unlike [`compare_and_set`], this method is allowed to spuriously fail even when comparison
-    /// succeeds, which can result in more efficient code on some platforms.  The return value is a
-    /// result indicating whether the new pointer was written. On success the pointer that was
-    /// written is returned. On failure the actual current value and `new` are returned.
-    ///
-    /// This method takes a [`CompareAndSetOrdering`] argument which describes the memory
-    /// ordering of this operation.
-    ///
-    /// [`compare_and_set`]: struct.Atomic.html#method.compare_and_set
-    /// [`CompareAndSetOrdering`]: trait.CompareAndSetOrdering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// let guard = &epoch::pin();
-    ///
-    /// let mut new = Owned::new(5678);
-    /// let mut ptr = a.load(SeqCst, guard);
-    /// loop {
-    ///     match a.compare_and_set_weak(ptr, new, SeqCst, guard) {
-    ///         Ok(p) => {
-    ///             ptr = p;
-    ///             break;
-    ///         }
-    ///         Err(err) => {
-    ///             ptr = err.current;
-    ///             new = err.new;
-    ///         }
-    ///     }
-    /// }
-    ///
-    /// let mut curr = a.load(SeqCst, guard);
-    /// loop {
-    ///     match a.compare_and_set_weak(curr, Shared::null(), SeqCst, guard) {
-    ///         Ok(_) => break,
-    ///         Err(err) => curr = err.current,
-    ///     }
-    /// }
-    /// ```
-    pub fn compare_and_set_weak<'g, O, P>(
-        &self,
-        current: Shared<T>,
-        new: P,
-        ord: O,
-        _: &'g Guard,
-    ) -> Result<Shared<'g, T>, CompareAndSetError<'g, T, P>>
-    where
-        O: CompareAndSetOrdering,
-        P: Pointer<T>,
-    {
-        let new = new.into_usize();
-        self.data
-            .compare_exchange_weak(current.into_usize(), new, ord.success(), ord.failure())
-            .map(|_| unsafe { Shared::from_usize(new) })
-            .map_err(|current| unsafe {
-                CompareAndSetError {
-                    current: Shared::from_usize(current),
-                    new: P::from_usize(new),
-                }
-            })
-    }
-
-    /// Bitwise "and" with the current tag.
-    ///
-    /// Performs a bitwise "and" operation on the current tag and the argument `val`, and sets the
-    /// new tag to the result. Returns the previous pointer.
-    ///
-    /// This method takes an [`Ordering`] argument which describes the memory ordering of this
-    /// operation.
-    ///
-    /// [`Ordering`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::<i32>::from(Shared::null().with_tag(3));
-    /// let guard = &epoch::pin();
-    /// assert_eq!(a.fetch_and(2, SeqCst, guard).tag(), 3);
-    /// assert_eq!(a.load(SeqCst, guard).tag(), 2);
-    /// ```
-    pub fn fetch_and<'g>(&self, val: usize, ord: Ordering, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.data.fetch_and(val | !low_bits::<T>(), ord)) }
-    }
-
-    /// Bitwise "or" with the current tag.
-    ///
-    /// Performs a bitwise "or" operation on the current tag and the argument `val`, and sets the
-    /// new tag to the result. Returns the previous pointer.
-    ///
-    /// This method takes an [`Ordering`] argument which describes the memory ordering of this
-    /// operation.
-    ///
-    /// [`Ordering`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::<i32>::from(Shared::null().with_tag(1));
-    /// let guard = &epoch::pin();
-    /// assert_eq!(a.fetch_or(2, SeqCst, guard).tag(), 1);
-    /// assert_eq!(a.load(SeqCst, guard).tag(), 3);
-    /// ```
-    pub fn fetch_or<'g>(&self, val: usize, ord: Ordering, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.data.fetch_or(val & low_bits::<T>(), ord)) }
-    }
-
-    /// Bitwise "xor" with the current tag.
-    ///
-    /// Performs a bitwise "xor" operation on the current tag and the argument `val`, and sets the
-    /// new tag to the result. Returns the previous pointer.
-    ///
-    /// This method takes an [`Ordering`] argument which describes the memory ordering of this
-    /// operation.
-    ///
-    /// [`Ordering`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Shared};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::<i32>::from(Shared::null().with_tag(1));
-    /// let guard = &epoch::pin();
-    /// assert_eq!(a.fetch_xor(3, SeqCst, guard).tag(), 1);
-    /// assert_eq!(a.load(SeqCst, guard).tag(), 2);
-    /// ```
-    pub fn fetch_xor<'g>(&self, val: usize, ord: Ordering, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.data.fetch_xor(val & low_bits::<T>(), ord)) }
-    }
-}
-
-impl<T> fmt::Debug for Atomic<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let data = self.data.load(Ordering::SeqCst);
-        let (raw, tag) = decompose_data::<T>(data);
-
-        f.debug_struct("Atomic")
-            .field("raw", &raw)
-            .field("tag", &tag)
-            .finish()
-    }
-}
-
-impl<T> fmt::Pointer for Atomic<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let data = self.data.load(Ordering::SeqCst);
-        let (raw, _) = decompose_data::<T>(data);
-        fmt::Pointer::fmt(&raw, f)
-    }
-}
-
-impl<T> Clone for Atomic<T> {
-    /// Returns a copy of the atomic value.
-    ///
-    /// Note that a `Relaxed` load is used here. If you need synchronization, use it with other
-    /// atomics or fences.
-    fn clone(&self) -> Self {
-        let data = self.data.load(Ordering::Relaxed);
-        Atomic::from_usize(data)
-    }
-}
-
-impl<T> Default for Atomic<T> {
-    fn default() -> Self {
-        Atomic::null()
-    }
-}
-
-impl<T> From<Owned<T>> for Atomic<T> {
-    /// Returns a new atomic pointer pointing to `owned`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{Atomic, Owned};
-    ///
-    /// let a = Atomic::<i32>::from(Owned::new(1234));
-    /// ```
-    fn from(owned: Owned<T>) -> Self {
-        let data = owned.data;
-        mem::forget(owned);
-        Self::from_usize(data)
-    }
-}
-
-impl<T> From<Box<T>> for Atomic<T> {
-    fn from(b: Box<T>) -> Self {
-        Self::from(Owned::from(b))
-    }
-}
-
-impl<T> From<T> for Atomic<T> {
-    fn from(t: T) -> Self {
-        Self::new(t)
-    }
-}
-
-impl<'g, T> From<Shared<'g, T>> for Atomic<T> {
-    /// Returns a new atomic pointer pointing to `ptr`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{Atomic, Shared};
-    ///
-    /// let a = Atomic::<i32>::from(Shared::<i32>::null());
-    /// ```
-    fn from(ptr: Shared<'g, T>) -> Self {
-        Self::from_usize(ptr.data)
-    }
-}
-
-impl<T> From<*const T> for Atomic<T> {
-    /// Returns a new atomic pointer pointing to `raw`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::ptr;
-    /// use crossbeam_epoch::Atomic;
-    ///
-    /// let a = Atomic::<i32>::from(ptr::null::<i32>());
-    /// ```
-    fn from(raw: *const T) -> Self {
-        Self::from_usize(raw as usize)
-    }
-}
-
-/// A trait for either `Owned` or `Shared` pointers.
-pub trait Pointer<T> {
-    /// Returns the machine representation of the pointer.
-    fn into_usize(self) -> usize;
-
-    /// Returns a new pointer pointing to the tagged pointer `data`.
-    unsafe fn from_usize(data: usize) -> Self;
-}
-
-/// An owned heap-allocated object.
-///
-/// This type is very similar to `Box<T>`.
-///
-/// The pointer must be properly aligned. Since it is aligned, a tag can be stored into the unused
-/// least significant bits of the address.
-pub struct Owned<T> {
-    data: usize,
-    _marker: PhantomData<Box<T>>,
-}
-
-impl<T> Pointer<T> for Owned<T> {
-    #[inline]
-    fn into_usize(self) -> usize {
-        let data = self.data;
-        mem::forget(self);
-        data
-    }
-
-    /// Returns a new pointer pointing to the tagged pointer `data`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the data is zero in debug mode.
-    #[inline]
-    unsafe fn from_usize(data: usize) -> Self {
-        debug_assert!(data != 0, "converting zero into `Owned`");
-        Owned {
-            data: data,
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<T> Owned<T> {
-    /// Allocates `value` on the heap and returns a new owned pointer pointing to it.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Owned;
-    ///
-    /// let o = Owned::new(1234);
-    /// ```
-    pub fn new(value: T) -> Owned<T> {
-        Self::from(Box::new(value))
-    }
-
-    /// Returns a new owned pointer pointing to `raw`.
-    ///
-    /// This function is unsafe because improper use may lead to memory problems. Argument `raw`
-    /// must be a valid pointer. Also, a double-free may occur if the function is called twice on
-    /// the same raw pointer.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `raw` is not properly aligned.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Owned;
-    ///
-    /// let o = unsafe { Owned::from_raw(Box::into_raw(Box::new(1234))) };
-    /// ```
-    pub unsafe fn from_raw(raw: *mut T) -> Owned<T> {
-        ensure_aligned(raw);
-        Self::from_usize(raw as usize)
-    }
-
-    /// Converts the owned pointer into a [`Shared`].
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Owned};
-    ///
-    /// let o = Owned::new(1234);
-    /// let guard = &epoch::pin();
-    /// let p = o.into_shared(guard);
-    /// ```
-    ///
-    /// [`Shared`]: struct.Shared.html
-    pub fn into_shared<'g>(self, _: &'g Guard) -> Shared<'g, T> {
-        unsafe { Shared::from_usize(self.into_usize()) }
-    }
-
-    /// Converts the owned pointer into a `Box`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Owned};
-    ///
-    /// let o = Owned::new(1234);
-    /// let b: Box<i32> = o.into_box();
-    /// assert_eq!(*b, 1234);
-    /// ```
-    pub fn into_box(self) -> Box<T> {
-        let (raw, _) = decompose_data::<T>(self.data);
-        mem::forget(self);
-        unsafe { Box::from_raw(raw) }
-    }
-
-    /// Returns the tag stored within the pointer.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Owned;
-    ///
-    /// assert_eq!(Owned::new(1234).tag(), 0);
-    /// ```
-    pub fn tag(&self) -> usize {
-        let (_, tag) = decompose_data::<T>(self.data);
-        tag
-    }
-
-    /// Returns the same pointer, but tagged with `tag`. `tag` is truncated to be fit into the
-    /// unused bits of the pointer to `T`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Owned;
-    ///
-    /// let o = Owned::new(0u64);
-    /// assert_eq!(o.tag(), 0);
-    /// let o = o.with_tag(2);
-    /// assert_eq!(o.tag(), 2);
-    /// ```
-    pub fn with_tag(self, tag: usize) -> Owned<T> {
-        let data = self.into_usize();
-        unsafe { Self::from_usize(data_with_tag::<T>(data, tag)) }
-    }
-}
-
-impl<T> Drop for Owned<T> {
-    fn drop(&mut self) {
-        let (raw, _) = decompose_data::<T>(self.data);
-        unsafe {
-            drop(Box::from_raw(raw));
-        }
-    }
-}
-
-impl<T> fmt::Debug for Owned<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let (raw, tag) = decompose_data::<T>(self.data);
-
-        f.debug_struct("Owned")
-            .field("raw", &raw)
-            .field("tag", &tag)
-            .finish()
-    }
-}
-
-impl<T: Clone> Clone for Owned<T> {
-    fn clone(&self) -> Self {
-        Owned::new((**self).clone()).with_tag(self.tag())
-    }
-}
-
-impl<T> Deref for Owned<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        let (raw, _) = decompose_data::<T>(self.data);
-        unsafe { &*raw }
-    }
-}
-
-impl<T> DerefMut for Owned<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        let (raw, _) = decompose_data::<T>(self.data);
-        unsafe { &mut *raw }
-    }
-}
-
-impl<T> From<T> for Owned<T> {
-    fn from(t: T) -> Self {
-        Owned::new(t)
-    }
-}
-
-impl<T> From<Box<T>> for Owned<T> {
-    /// Returns a new owned pointer pointing to `b`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the pointer (the `Box`) is not properly aligned.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Owned;
-    ///
-    /// let o = unsafe { Owned::from_raw(Box::into_raw(Box::new(1234))) };
-    /// ```
-    fn from(b: Box<T>) -> Self {
-        unsafe { Self::from_raw(Box::into_raw(b)) }
-    }
-}
-
-impl<T> Borrow<T> for Owned<T> {
-    fn borrow(&self) -> &T {
-        &**self
-    }
-}
-
-impl<T> BorrowMut<T> for Owned<T> {
-    fn borrow_mut(&mut self) -> &mut T {
-        &mut **self
-    }
-}
-
-impl<T> AsRef<T> for Owned<T> {
-    fn as_ref(&self) -> &T {
-        &**self
-    }
-}
-
-impl<T> AsMut<T> for Owned<T> {
-    fn as_mut(&mut self) -> &mut T {
-        &mut **self
-    }
-}
-
-/// A pointer to an object protected by the epoch GC.
-///
-/// The pointer is valid for use only during the lifetime `'g`.
-///
-/// The pointer must be properly aligned. Since it is aligned, a tag can be stored into the unused
-/// least significant bits of the address.
-pub struct Shared<'g, T: 'g> {
-    data: usize,
-    _marker: PhantomData<(&'g (), *const T)>,
-}
-
-impl<'g, T> Clone for Shared<'g, T> {
-    fn clone(&self) -> Self {
-        Shared {
-            data: self.data,
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<'g, T> Copy for Shared<'g, T> {}
-
-impl<'g, T> Pointer<T> for Shared<'g, T> {
-    #[inline]
-    fn into_usize(self) -> usize {
-        self.data
-    }
-
-    #[inline]
-    unsafe fn from_usize(data: usize) -> Self {
-        Shared {
-            data: data,
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<'g, T> Shared<'g, T> {
-    /// Returns a new null pointer.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Shared;
-    ///
-    /// let p = Shared::<i32>::null();
-    /// assert!(p.is_null());
-    /// ```
-    pub fn null() -> Shared<'g, T> {
-        Shared {
-            data: 0,
-            _marker: PhantomData,
-        }
-    }
-
-    /// Returns `true` if the pointer is null.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::null();
-    /// let guard = &epoch::pin();
-    /// assert!(a.load(SeqCst, guard).is_null());
-    /// a.store(Owned::new(1234), SeqCst);
-    /// assert!(!a.load(SeqCst, guard).is_null());
-    /// ```
-    pub fn is_null(&self) -> bool {
-        self.as_raw().is_null()
-    }
-
-    /// Converts the pointer to a raw pointer (without the tag).
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let o = Owned::new(1234);
-    /// let raw = &*o as *const _;
-    /// let a = Atomic::from(o);
-    ///
-    /// let guard = &epoch::pin();
-    /// let p = a.load(SeqCst, guard);
-    /// assert_eq!(p.as_raw(), raw);
-    /// ```
-    pub fn as_raw(&self) -> *const T {
-        let (raw, _) = decompose_data::<T>(self.data);
-        raw
-    }
-
-    /// Dereferences the pointer.
-    ///
-    /// Returns a reference to the pointee that is valid during the lifetime `'g`.
-    ///
-    /// # Safety
-    ///
-    /// Dereferencing a pointer is unsafe because it could be pointing to invalid memory.
-    ///
-    /// Another concern is the possiblity of data races due to lack of proper synchronization.
-    /// For example, consider the following scenario:
-    ///
-    /// 1. A thread creates a new object: `a.store(Owned::new(10), Relaxed)`
-    /// 2. Another thread reads it: `*a.load(Relaxed, guard).as_ref().unwrap()`
-    ///
-    /// The problem is that relaxed orderings don't synchronize initialization of the object with
-    /// the read from the second thread. This is a data race. A possible solution would be to use
-    /// `Release` and `Acquire` orderings.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// let guard = &epoch::pin();
-    /// let p = a.load(SeqCst, guard);
-    /// unsafe {
-    ///     assert_eq!(p.deref(), &1234);
-    /// }
-    /// ```
-    pub unsafe fn deref(&self) -> &'g T {
-        &*self.as_raw()
-    }
-
-    /// Converts the pointer to a reference.
-    ///
-    /// Returns `None` if the pointer is null, or else a reference to the object wrapped in `Some`.
-    ///
-    /// # Safety
-    ///
-    /// Dereferencing a pointer is unsafe because it could be pointing to invalid memory.
-    ///
-    /// Another concern is the possiblity of data races due to lack of proper synchronization.
-    /// For example, consider the following scenario:
-    ///
-    /// 1. A thread creates a new object: `a.store(Owned::new(10), Relaxed)`
-    /// 2. Another thread reads it: `*a.load(Relaxed, guard).as_ref().unwrap()`
-    ///
-    /// The problem is that relaxed orderings don't synchronize initialization of the object with
-    /// the read from the second thread. This is a data race. A possible solution would be to use
-    /// `Release` and `Acquire` orderings.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// let guard = &epoch::pin();
-    /// let p = a.load(SeqCst, guard);
-    /// unsafe {
-    ///     assert_eq!(p.as_ref(), Some(&1234));
-    /// }
-    /// ```
-    pub unsafe fn as_ref(&self) -> Option<&'g T> {
-        self.as_raw().as_ref()
-    }
-
-    /// Takes ownership of the pointee.
-    ///
-    /// # Panics
-    ///
-    /// Panics if this pointer is null, but only in debug mode.
-    ///
-    /// # Safety
-    ///
-    /// This method may be called only if the pointer is valid and nobody else is holding a
-    /// reference to the same object.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(1234);
-    /// unsafe {
-    ///     let guard = &epoch::unprotected();
-    ///     let p = a.load(SeqCst, guard);
-    ///     drop(p.into_owned());
-    /// }
-    /// ```
-    pub unsafe fn into_owned(self) -> Owned<T> {
-        debug_assert!(
-            self.as_raw() != ptr::null(),
-            "converting a null `Shared` into `Owned`"
-        );
-        Owned::from_usize(self.data)
-    }
-
-    /// Returns the tag stored within the pointer.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::<u64>::from(Owned::new(0u64).with_tag(2));
-    /// let guard = &epoch::pin();
-    /// let p = a.load(SeqCst, guard);
-    /// assert_eq!(p.tag(), 2);
-    /// ```
-    pub fn tag(&self) -> usize {
-        let (_, tag) = decompose_data::<T>(self.data);
-        tag
-    }
-
-    /// Returns the same pointer, but tagged with `tag`. `tag` is truncated to be fit into the
-    /// unused bits of the pointer to `T`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new(0u64);
-    /// let guard = &epoch::pin();
-    /// let p1 = a.load(SeqCst, guard);
-    /// let p2 = p1.with_tag(2);
-    ///
-    /// assert_eq!(p1.tag(), 0);
-    /// assert_eq!(p2.tag(), 2);
-    /// assert_eq!(p1.as_raw(), p2.as_raw());
-    /// ```
-    pub fn with_tag(&self, tag: usize) -> Shared<'g, T> {
-        unsafe { Self::from_usize(data_with_tag::<T>(self.data, tag)) }
-    }
-}
-
-impl<'g, T> From<*const T> for Shared<'g, T> {
-    /// Returns a new pointer pointing to `raw`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `raw` is not properly aligned.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::Shared;
-    ///
-    /// let p = unsafe { Shared::from(Box::into_raw(Box::new(1234)) as *const _) };
-    /// assert!(!p.is_null());
-    /// ```
-    fn from(raw: *const T) -> Self {
-        ensure_aligned(raw);
-        unsafe { Self::from_usize(raw as usize) }
-    }
-}
-
-impl<'g, T> PartialEq<Shared<'g, T>> for Shared<'g, T> {
-    fn eq(&self, other: &Self) -> bool {
-        self.data == other.data
-    }
-}
-
-impl<'g, T> Eq for Shared<'g, T> {}
-
-impl<'g, T> PartialOrd<Shared<'g, T>> for Shared<'g, T> {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        self.data.partial_cmp(&other.data)
-    }
-}
-
-impl<'g, T> Ord for Shared<'g, T> {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        self.data.cmp(&other.data)
-    }
-}
-
-impl<'g, T> fmt::Debug for Shared<'g, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let (raw, tag) = decompose_data::<T>(self.data);
-
-        f.debug_struct("Shared")
-            .field("raw", &raw)
-            .field("tag", &tag)
-            .finish()
-    }
-}
-
-impl<'g, T> fmt::Pointer for Shared<'g, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Pointer::fmt(&self.as_raw(), f)
-    }
-}
-
-impl<'g, T> Default for Shared<'g, T> {
-    fn default() -> Self {
-        Shared::null()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Shared;
-
-    #[test]
-    fn valid_tag_i8() {
-        Shared::<i8>::null().with_tag(0);
-    }
-
-    #[test]
-    fn valid_tag_i64() {
-        Shared::<i64>::null().with_tag(7);
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/collector.rs cargo-0.33.0/vendor/crossbeam-epoch/src/collector.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/collector.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/collector.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,433 +0,0 @@
-/// Epoch-based garbage collector.
-///
-/// # Examples
-///
-/// ```
-/// use crossbeam_epoch::Collector;
-///
-/// let collector = Collector::new();
-///
-/// let handle = collector.register();
-/// drop(collector); // `handle` still works after dropping `collector`
-///
-/// handle.pin().flush();
-/// ```
-use alloc::sync::Arc;
-use core::fmt;
-
-use guard::Guard;
-use internal::{Global, Local};
-
-/// An epoch-based garbage collector.
-pub struct Collector {
-    pub(crate) global: Arc<Global>,
-}
-
-unsafe impl Send for Collector {}
-unsafe impl Sync for Collector {}
-
-impl Collector {
-    /// Creates a new collector.
-    pub fn new() -> Self {
-        Collector {
-            global: Arc::new(Global::new()),
-        }
-    }
-
-    /// Registers a new handle for the collector.
-    pub fn register(&self) -> LocalHandle {
-        Local::register(self)
-    }
-}
-
-impl Clone for Collector {
-    /// Creates another reference to the same garbage collector.
-    fn clone(&self) -> Self {
-        Collector {
-            global: self.global.clone(),
-        }
-    }
-}
-
-impl fmt::Debug for Collector {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Collector").finish()
-    }
-}
-
-impl PartialEq for Collector {
-    /// Checks if both handles point to the same collector.
-    fn eq(&self, rhs: &Collector) -> bool {
-        Arc::ptr_eq(&self.global, &rhs.global)
-    }
-}
-impl Eq for Collector {}
-
-/// A handle to a garbage collector.
-pub struct LocalHandle {
-    pub(crate) local: *const Local,
-}
-
-impl LocalHandle {
-    /// Pins the handle.
-    #[inline]
-    pub fn pin(&self) -> Guard {
-        unsafe { (*self.local).pin() }
-    }
-
-    /// Returns `true` if the handle is pinned.
-    #[inline]
-    pub fn is_pinned(&self) -> bool {
-        unsafe { (*self.local).is_pinned() }
-    }
-
-    /// Returns the `Collector` associated with this handle.
-    #[inline]
-    pub fn collector(&self) -> &Collector {
-        unsafe { (*self.local).collector() }
-    }
-}
-
-impl Drop for LocalHandle {
-    #[inline]
-    fn drop(&mut self) {
-        unsafe {
-            Local::release_handle(&*self.local);
-        }
-    }
-}
-
-impl fmt::Debug for LocalHandle {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("LocalHandle").finish()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::mem;
-    use std::sync::atomic::Ordering;
-    use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT};
-
-    use crossbeam_utils::thread;
-
-    use {Collector, Owned};
-
-    const NUM_THREADS: usize = 8;
-
-    #[test]
-    fn pin_reentrant() {
-        let collector = Collector::new();
-        let handle = collector.register();
-        drop(collector);
-
-        assert!(!handle.is_pinned());
-        {
-            let _guard = &handle.pin();
-            assert!(handle.is_pinned());
-            {
-                let _guard = &handle.pin();
-                assert!(handle.is_pinned());
-            }
-            assert!(handle.is_pinned());
-        }
-        assert!(!handle.is_pinned());
-    }
-
-    #[test]
-    fn flush_local_bag() {
-        let collector = Collector::new();
-        let handle = collector.register();
-        drop(collector);
-
-        for _ in 0..100 {
-            let guard = &handle.pin();
-            unsafe {
-                let a = Owned::new(7).into_shared(guard);
-                guard.defer_destroy(a);
-
-                assert!(!(*(*guard.local).bag.get()).is_empty());
-
-                while !(*(*guard.local).bag.get()).is_empty() {
-                    guard.flush();
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn garbage_buffering() {
-        let collector = Collector::new();
-        let handle = collector.register();
-        drop(collector);
-
-        let guard = &handle.pin();
-        unsafe {
-            for _ in 0..10 {
-                let a = Owned::new(7).into_shared(guard);
-                guard.defer_destroy(a);
-            }
-            assert!(!(*(*guard.local).bag.get()).is_empty());
-        }
-    }
-
-    #[test]
-    fn pin_holds_advance() {
-        let collector = Collector::new();
-
-        thread::scope(|scope| {
-            for _ in 0..NUM_THREADS {
-                scope.spawn(|_| {
-                    let handle = collector.register();
-                    for _ in 0..500_000 {
-                        let guard = &handle.pin();
-
-                        let before = collector.global.epoch.load(Ordering::Relaxed);
-                        collector.global.collect(guard);
-                        let after = collector.global.epoch.load(Ordering::Relaxed);
-
-                        assert!(after.wrapping_sub(before) <= 2);
-                    }
-                });
-            }
-        }).unwrap();
-    }
-
-    #[test]
-    fn incremental() {
-        const COUNT: usize = 100_000;
-        static DESTROYS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        let collector = Collector::new();
-        let handle = collector.register();
-
-        unsafe {
-            let guard = &handle.pin();
-            for _ in 0..COUNT {
-                let a = Owned::new(7i32).into_shared(guard);
-                guard.defer_unchecked(move || {
-                    drop(a.into_owned());
-                    DESTROYS.fetch_add(1, Ordering::Relaxed);
-                });
-            }
-            guard.flush();
-        }
-
-        let mut last = 0;
-
-        while last < COUNT {
-            let curr = DESTROYS.load(Ordering::Relaxed);
-            assert!(curr - last <= 1024);
-            last = curr;
-
-            let guard = &handle.pin();
-            collector.global.collect(guard);
-        }
-        assert!(DESTROYS.load(Ordering::Relaxed) == 100_000);
-    }
-
-    #[test]
-    fn buffering() {
-        const COUNT: usize = 10;
-        static DESTROYS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        let collector = Collector::new();
-        let handle = collector.register();
-
-        unsafe {
-            let guard = &handle.pin();
-            for _ in 0..COUNT {
-                let a = Owned::new(7i32).into_shared(guard);
-                guard.defer_unchecked(move || {
-                    drop(a.into_owned());
-                    DESTROYS.fetch_add(1, Ordering::Relaxed);
-                });
-            }
-        }
-
-        for _ in 0..100_000 {
-            collector.global.collect(&handle.pin());
-        }
-        assert!(DESTROYS.load(Ordering::Relaxed) < COUNT);
-
-        handle.pin().flush();
-
-        while DESTROYS.load(Ordering::Relaxed) < COUNT {
-            let guard = &handle.pin();
-            collector.global.collect(guard);
-        }
-        assert_eq!(DESTROYS.load(Ordering::Relaxed), COUNT);
-    }
-
-    #[test]
-    fn count_drops() {
-        const COUNT: usize = 100_000;
-        static DROPS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        struct Elem(i32);
-
-        impl Drop for Elem {
-            fn drop(&mut self) {
-                DROPS.fetch_add(1, Ordering::Relaxed);
-            }
-        }
-
-        let collector = Collector::new();
-        let handle = collector.register();
-
-        unsafe {
-            let guard = &handle.pin();
-
-            for _ in 0..COUNT {
-                let a = Owned::new(Elem(7i32)).into_shared(guard);
-                guard.defer_destroy(a);
-            }
-            guard.flush();
-        }
-
-        while DROPS.load(Ordering::Relaxed) < COUNT {
-            let guard = &handle.pin();
-            collector.global.collect(guard);
-        }
-        assert_eq!(DROPS.load(Ordering::Relaxed), COUNT);
-    }
-
-    #[test]
-    fn count_destroy() {
-        const COUNT: usize = 100_000;
-        static DESTROYS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        let collector = Collector::new();
-        let handle = collector.register();
-
-        unsafe {
-            let guard = &handle.pin();
-
-            for _ in 0..COUNT {
-                let a = Owned::new(7i32).into_shared(guard);
-                guard.defer_unchecked(move || {
-                    drop(a.into_owned());
-                    DESTROYS.fetch_add(1, Ordering::Relaxed);
-                });
-            }
-            guard.flush();
-        }
-
-        while DESTROYS.load(Ordering::Relaxed) < COUNT {
-            let guard = &handle.pin();
-            collector.global.collect(guard);
-        }
-        assert_eq!(DESTROYS.load(Ordering::Relaxed), COUNT);
-    }
-
-    #[test]
-    fn drop_array() {
-        const COUNT: usize = 700;
-        static DROPS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        struct Elem(i32);
-
-        impl Drop for Elem {
-            fn drop(&mut self) {
-                DROPS.fetch_add(1, Ordering::Relaxed);
-            }
-        }
-
-        let collector = Collector::new();
-        let handle = collector.register();
-
-        let mut guard = handle.pin();
-
-        let mut v = Vec::with_capacity(COUNT);
-        for i in 0..COUNT {
-            v.push(Elem(i as i32));
-        }
-
-        {
-            let a = Owned::new(v).into_shared(&guard);
-            unsafe {
-                guard.defer_destroy(a);
-            }
-            guard.flush();
-        }
-
-        while DROPS.load(Ordering::Relaxed) < COUNT {
-            guard.repin();
-            collector.global.collect(&guard);
-        }
-        assert_eq!(DROPS.load(Ordering::Relaxed), COUNT);
-    }
-
-    #[test]
-    fn destroy_array() {
-        const COUNT: usize = 100_000;
-        static DESTROYS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        let collector = Collector::new();
-        let handle = collector.register();
-
-        unsafe {
-            let guard = &handle.pin();
-
-            let mut v = Vec::with_capacity(COUNT);
-            for i in 0..COUNT {
-                v.push(i as i32);
-            }
-
-            let ptr = v.as_mut_ptr() as usize;
-            let len = v.len();
-            guard.defer_unchecked(move || {
-                drop(Vec::from_raw_parts(ptr as *const u8 as *mut u8, len, len));
-                DESTROYS.fetch_add(len, Ordering::Relaxed);
-            });
-            guard.flush();
-
-            mem::forget(v);
-        }
-
-        while DESTROYS.load(Ordering::Relaxed) < COUNT {
-            let guard = &handle.pin();
-            collector.global.collect(guard);
-        }
-        assert_eq!(DESTROYS.load(Ordering::Relaxed), COUNT);
-    }
-
-    #[test]
-    fn stress() {
-        const THREADS: usize = 8;
-        const COUNT: usize = 100_000;
-        static DROPS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        struct Elem(i32);
-
-        impl Drop for Elem {
-            fn drop(&mut self) {
-                DROPS.fetch_add(1, Ordering::Relaxed);
-            }
-        }
-
-        let collector = Collector::new();
-
-        thread::scope(|scope| {
-            for _ in 0..THREADS {
-                scope.spawn(|_| {
-                    let handle = collector.register();
-                    for _ in 0..COUNT {
-                        let guard = &handle.pin();
-                        unsafe {
-                            let a = Owned::new(Elem(7i32)).into_shared(guard);
-                            guard.defer_destroy(a);
-                        }
-                    }
-                });
-            }
-        }).unwrap();
-
-        let handle = collector.register();
-        while DROPS.load(Ordering::Relaxed) < COUNT * THREADS {
-            let guard = &handle.pin();
-            collector.global.collect(guard);
-        }
-        assert_eq!(DROPS.load(Ordering::Relaxed), COUNT * THREADS);
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/default.rs cargo-0.33.0/vendor/crossbeam-epoch/src/default.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/default.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/default.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-//! The default garbage collector.
-//!
-//! For each thread, a participant is lazily initialized on its first use, when the current thread
-//! is registered in the default collector.  If initialized, the thread's participant will get
-//! destructed on thread exit, which in turn unregisters the thread.
-
-use collector::{Collector, LocalHandle};
-use guard::Guard;
-
-lazy_static! {
-    /// The global data for the default garbage collector.
-    static ref COLLECTOR: Collector = Collector::new();
-}
-
-thread_local! {
-    /// The per-thread participant for the default garbage collector.
-    static HANDLE: LocalHandle = COLLECTOR.register();
-}
-
-/// Pins the current thread.
-#[inline]
-pub fn pin() -> Guard {
-    with_handle(|handle| handle.pin())
-}
-
-/// Returns `true` if the current thread is pinned.
-#[inline]
-pub fn is_pinned() -> bool {
-    with_handle(|handle| handle.is_pinned())
-}
-
-/// Returns the default global collector.
-pub fn default_collector() -> &'static Collector {
-    &COLLECTOR
-}
-
-#[inline]
-fn with_handle<F, R>(mut f: F) -> R
-where
-    F: FnMut(&LocalHandle) -> R,
-{
-    HANDLE
-        .try_with(|h| f(h))
-        .unwrap_or_else(|_| f(&COLLECTOR.register()))
-}
-
-#[cfg(test)]
-mod tests {
-    use crossbeam_utils::thread;
-
-    #[test]
-    fn pin_while_exiting() {
-        struct Foo;
-
-        impl Drop for Foo {
-            fn drop(&mut self) {
-                // Pin after `HANDLE` has been dropped. This must not panic.
-                super::pin();
-            }
-        }
-
-        thread_local! {
-            static FOO: Foo = Foo;
-        }
-
-        thread::scope(|scope| {
-            scope.spawn(|_| {
-                // Initialize `FOO` and then `HANDLE`.
-                FOO.with(|_| ());
-                super::pin();
-                // At thread exit, `HANDLE` gets dropped first and `FOO` second.
-            });
-        }).unwrap();
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/deferred.rs cargo-0.33.0/vendor/crossbeam-epoch/src/deferred.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/deferred.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/deferred.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-use alloc::boxed::Box;
-use core::fmt;
-use core::marker::PhantomData;
-use core::mem;
-use core::ptr;
-
-/// Number of words a piece of `Data` can hold.
-///
-/// Three words should be enough for the majority of cases. For example, you can fit inside it the
-/// function pointer together with a fat pointer representing an object that needs to be destroyed.
-const DATA_WORDS: usize = 3;
-
-/// Some space to keep a `FnOnce()` object on the stack.
-type Data = [usize; DATA_WORDS];
-
-/// A `FnOnce()` that is stored inline if small, or otherwise boxed on the heap.
-///
-/// This is a handy way of keeping an unsized `FnOnce()` within a sized structure.
-pub struct Deferred {
-    call: unsafe fn(*mut u8),
-    data: Data,
-    _marker: PhantomData<*mut ()>, // !Send + !Sync
-}
-
-impl fmt::Debug for Deferred {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "Deferred {{ ... }}")
-    }
-}
-
-impl Deferred {
-    /// Constructs a new `Deferred` from a `FnOnce()`.
-    pub fn new<F: FnOnce()>(f: F) -> Self {
-        let size = mem::size_of::<F>();
-        let align = mem::align_of::<F>();
-
-        unsafe {
-            if size <= mem::size_of::<Data>() && align <= mem::align_of::<Data>() {
-                let mut data: Data = mem::uninitialized();
-                ptr::write(&mut data as *mut Data as *mut F, f);
-
-                unsafe fn call<F: FnOnce()>(raw: *mut u8) {
-                    let f: F = ptr::read(raw as *mut F);
-                    f();
-                }
-
-                Deferred {
-                    call: call::<F>,
-                    data,
-                    _marker: PhantomData,
-                }
-            } else {
-                let b: Box<F> = Box::new(f);
-                let mut data: Data = mem::uninitialized();
-                ptr::write(&mut data as *mut Data as *mut Box<F>, b);
-
-                unsafe fn call<F: FnOnce()>(raw: *mut u8) {
-                    let b: Box<F> = ptr::read(raw as *mut Box<F>);
-                    (*b)();
-                }
-
-                Deferred {
-                    call: call::<F>,
-                    data,
-                    _marker: PhantomData,
-                }
-            }
-        }
-    }
-
-    /// Calls the function.
-    #[inline]
-    pub fn call(mut self) {
-        let call = self.call;
-        unsafe { call(&mut self.data as *mut Data as *mut u8) };
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Deferred;
-    use std::cell::Cell;
-
-    #[test]
-    fn on_stack() {
-        let fired = &Cell::new(false);
-        let a = [0usize; 1];
-
-        let d = Deferred::new(move || {
-            drop(a);
-            fired.set(true);
-        });
-
-        assert!(!fired.get());
-        d.call();
-        assert!(fired.get());
-    }
-
-    #[test]
-    fn on_heap() {
-        let fired = &Cell::new(false);
-        let a = [0usize; 10];
-
-        let d = Deferred::new(move || {
-            drop(a);
-            fired.set(true);
-        });
-
-        assert!(!fired.get());
-        d.call();
-        assert!(fired.get());
-    }
-
-    #[test]
-    fn string() {
-        let a = "hello".to_string();
-        let d = Deferred::new(move || assert_eq!(a, "hello"));
-        d.call();
-    }
-
-    #[test]
-    fn boxed_slice_i32() {
-        let a: Box<[i32]> = vec![2, 3, 5, 7].into_boxed_slice();
-        let d = Deferred::new(move || assert_eq!(*a, [2, 3, 5, 7]));
-        d.call();
-    }
-
-    #[test]
-    fn long_slice_usize() {
-        let a: [usize; 5] = [2, 3, 5, 7, 11];
-        let d = Deferred::new(move || assert_eq!(a, [2, 3, 5, 7, 11]));
-        d.call();
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/epoch.rs cargo-0.33.0/vendor/crossbeam-epoch/src/epoch.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/epoch.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/epoch.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-//! The global epoch
-//!
-//! The last bit in this number is unused and is always zero. Every so often the global epoch is
-//! incremented, i.e. we say it "advances". A pinned participant may advance the global epoch only
-//! if all currently pinned participants have been pinned in the current epoch.
-//!
-//! If an object became garbage in some epoch, then we can be sure that after two advancements no
-//! participant will hold a reference to it. That is the crux of safe memory reclamation.
-
-use core::sync::atomic::{AtomicUsize, Ordering};
-
-/// An epoch that can be marked as pinned or unpinned.
-///
-/// Internally, the epoch is represented as an integer that wraps around at some unspecified point
-/// and a flag that represents whether it is pinned or unpinned.
-#[derive(Copy, Clone, Default, Debug, Eq, PartialEq)]
-pub struct Epoch {
-    /// The least significant bit is set if pinned. The rest of the bits hold the epoch.
-    data: usize,
-}
-
-impl Epoch {
-    /// Returns the starting epoch in unpinned state.
-    #[inline]
-    pub fn starting() -> Self {
-        Self::default()
-    }
-
-    /// Returns the number of epochs `self` is ahead of `rhs`.
-    ///
-    /// Internally, epochs are represented as numbers in the range `(isize::MIN / 2) .. (isize::MAX
-    /// / 2)`, so the returned distance will be in the same interval.
-    pub fn wrapping_sub(self, rhs: Self) -> isize {
-        // The result is the same with `(self.data & !1).wrapping_sub(rhs.data & !1) as isize >> 1`,
-        // because the possible difference of LSB in `(self.data & !1).wrapping_sub(rhs.data & !1)`
-        // will be ignored in the shift operation.
-        self.data.wrapping_sub(rhs.data & !1) as isize >> 1
-    }
-
-    /// Returns `true` if the epoch is marked as pinned.
-    #[inline]
-    pub fn is_pinned(self) -> bool {
-        (self.data & 1) == 1
-    }
-
-    /// Returns the same epoch, but marked as pinned.
-    #[inline]
-    pub fn pinned(self) -> Epoch {
-        Epoch {
-            data: self.data | 1,
-        }
-    }
-
-    /// Returns the same epoch, but marked as unpinned.
-    #[inline]
-    pub fn unpinned(self) -> Epoch {
-        Epoch {
-            data: self.data & !1,
-        }
-    }
-
-    /// Returns the successor epoch.
-    ///
-    /// The returned epoch will be marked as pinned only if the previous one was as well.
-    #[inline]
-    pub fn successor(self) -> Epoch {
-        Epoch {
-            data: self.data.wrapping_add(2),
-        }
-    }
-}
-
-/// An atomic value that holds an `Epoch`.
-#[derive(Default, Debug)]
-pub struct AtomicEpoch {
-    /// Since `Epoch` is just a wrapper around `usize`, an `AtomicEpoch` is similarly represented
-    /// using an `AtomicUsize`.
-    data: AtomicUsize,
-}
-
-impl AtomicEpoch {
-    /// Creates a new atomic epoch.
-    #[inline]
-    pub fn new(epoch: Epoch) -> Self {
-        let data = AtomicUsize::new(epoch.data);
-        AtomicEpoch { data }
-    }
-
-    /// Loads a value from the atomic epoch.
-    #[inline]
-    pub fn load(&self, ord: Ordering) -> Epoch {
-        Epoch {
-            data: self.data.load(ord),
-        }
-    }
-
-    /// Stores a value into the atomic epoch.
-    #[inline]
-    pub fn store(&self, epoch: Epoch, ord: Ordering) {
-        self.data.store(epoch.data, ord);
-    }
-
-    /// Stores a value into the atomic epoch if the current value is the same as `current`.
-    ///
-    /// The return value is always the previous value. If it is equal to `current`, then the value
-    /// is updated.
-    ///
-    /// The `Ordering` argument describes the memory ordering of this operation.
-    #[inline]
-    pub fn compare_and_swap(&self, current: Epoch, new: Epoch, ord: Ordering) -> Epoch {
-        let data = self.data.compare_and_swap(current.data, new.data, ord);
-        Epoch { data }
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/guard.rs cargo-0.33.0/vendor/crossbeam-epoch/src/guard.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/guard.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/guard.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,547 +0,0 @@
-use core::fmt;
-use core::mem;
-use core::ptr;
-
-use atomic::Shared;
-use collector::Collector;
-use deferred::Deferred;
-use internal::Local;
-
-/// A guard that keeps the current thread pinned.
-///
-/// # Pinning
-///
-/// The current thread is pinned by calling [`pin`], which returns a new guard:
-///
-/// ```
-/// use crossbeam_epoch as epoch;
-///
-/// // It is often convenient to prefix a call to `pin` with a `&` in order to create a reference.
-/// // This is not really necessary, but makes passing references to the guard a bit easier.
-/// let guard = &epoch::pin();
-/// ```
-///
-/// When a guard gets dropped, the current thread is automatically unpinned.
-///
-/// # Pointers on the stack
-///
-/// Having a guard allows us to create pointers on the stack to heap-allocated objects.
-/// For example:
-///
-/// ```
-/// use crossbeam_epoch::{self as epoch, Atomic, Owned};
-/// use std::sync::atomic::Ordering::SeqCst;
-///
-/// // Create a heap-allocated number.
-/// let a = Atomic::new(777);
-///
-/// // Pin the current thread.
-/// let guard = &epoch::pin();
-///
-/// // Load the heap-allocated object and create pointer `p` on the stack.
-/// let p = a.load(SeqCst, guard);
-///
-/// // Dereference the pointer and print the value:
-/// if let Some(num) = unsafe { p.as_ref() } {
-///     println!("The number is {}.", num);
-/// }
-/// ```
-///
-/// # Multiple guards
-///
-/// Pinning is reentrant and it is perfectly legal to create multiple guards. In that case, the
-/// thread will actually be pinned only when the first guard is created and unpinned when the last
-/// one is dropped:
-///
-/// ```
-/// use crossbeam_epoch as epoch;
-///
-/// let guard1 = epoch::pin();
-/// let guard2 = epoch::pin();
-/// assert!(epoch::is_pinned());
-/// drop(guard1);
-/// assert!(epoch::is_pinned());
-/// drop(guard2);
-/// assert!(!epoch::is_pinned());
-/// ```
-///
-/// The same can be achieved by cloning guards:
-///
-/// ```
-/// use crossbeam_epoch as epoch;
-///
-/// let guard1 = epoch::pin();
-/// let guard2 = guard1.clone();
-/// ```
-///
-/// [`pin`]: fn.pin.html
-pub struct Guard {
-    pub(crate) local: *const Local,
-}
-
-impl Guard {
-    /// Stores a function so that it can be executed at some point after all currently pinned
-    /// threads get unpinned.
-    ///
-    /// This method first stores `f` into the thread-local (or handle-local) cache. If this cache
-    /// becomes full, some functions are moved into the global cache. At the same time, some
-    /// functions from both local and global caches may get executed in order to incrementally
-    /// clean up the caches as they fill up.
-    ///
-    /// There is no guarantee when exactly `f` will be executed. The only guarantee is that it
-    /// won't be executed until all currently pinned threads get unpinned. In theory, `f` might
-    /// never run, but the epoch-based garbage collection will make an effort to execute it
-    /// reasonably soon.
-    ///
-    /// If this method is called from an [`unprotected`] guard, the function will simply be
-    /// executed immediately.
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub fn defer<F, R>(&self, f: F)
-    where
-        F: FnOnce() -> R,
-        F: Send + 'static,
-    {
-        unsafe {
-            self.defer_unchecked(f);
-        }
-    }
-
-    /// Stores a function so that it can be executed at some point after all currently pinned
-    /// threads get unpinned.
-    ///
-    /// This method first stores `f` into the thread-local (or handle-local) cache. If this cache
-    /// becomes full, some functions are moved into the global cache. At the same time, some
-    /// functions from both local and global caches may get executed in order to incrementally
-    /// clean up the caches as they fill up.
-    ///
-    /// There is no guarantee when exactly `f` will be executed. The only guarantee is that it
-    /// won't be executed until all currently pinned threads get unpinned. In theory, `f` might
-    /// never run, but the epoch-based garbage collection will make an effort to execute it
-    /// reasonably soon.
-    ///
-    /// If this method is called from an [`unprotected`] guard, the function will simply be
-    /// executed immediately.
-    ///
-    /// # Safety
-    ///
-    /// The given function must not hold reference onto the stack. It is highly recommended that
-    /// the passed function is **always** marked with `move` in order to prevent accidental
-    /// borrows.
-    ///
-    /// ```
-    /// use crossbeam_epoch as epoch;
-    ///
-    /// let guard = &epoch::pin();
-    /// let message = "Hello!";
-    /// unsafe {
-    ///     // ALWAYS use `move` when sending a closure into `defer_unchecked`.
-    ///     guard.defer_unchecked(move || {
-    ///         println!("{}", message);
-    ///     });
-    /// }
-    /// ```
-    ///
-    /// Apart from that, keep in mind that another thread may execute `f`, so anything accessed by
-    /// the closure must be `Send`.
-    ///
-    /// We intentionally didn't require `F: Send`, because Rust's type systems usually cannot prove
-    /// `F: Send` for typical use cases. For example, consider the following code snippet, which
-    /// exemplifies the typical use case of deferring the deallocation of a shared reference:
-    ///
-    /// ```ignore
-    /// let shared = Owned::new(7i32).into_shared(guard);
-    /// guard.defer_unchecked(move || shared.into_owned()); // `Shared` is not `Send`!
-    /// ```
-    ///
-    /// While `Shared` is not `Send`, it's safe for another thread to call the deferred function,
-    /// because it's called only after the grace period and `shared` is no longer shared with other
-    /// threads. But we don't expect type systems to prove this.
-    ///
-    /// # Examples
-    ///
-    /// When a heap-allocated object in a data structure becomes unreachable, it has to be
-    /// deallocated. However, the current thread and other threads may be still holding references
-    /// on the stack to that same object. Therefore it cannot be deallocated before those references
-    /// get dropped. This method can defer deallocation until all those threads get unpinned and
-    /// consequently drop all their references on the stack.
-    ///
-    /// ```rust
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new("foo");
-    ///
-    /// // Now suppose that `a` is shared among multiple threads and concurrently
-    /// // accessed and modified...
-    ///
-    /// // Pin the current thread.
-    /// let guard = &epoch::pin();
-    ///
-    /// // Steal the object currently stored in `a` and swap it with another one.
-    /// let p = a.swap(Owned::new("bar").into_shared(guard), SeqCst, guard);
-    ///
-    /// if !p.is_null() {
-    ///     // The object `p` is pointing to is now unreachable.
-    ///     // Defer its deallocation until all currently pinned threads get unpinned.
-    ///     unsafe {
-    ///         // ALWAYS use `move` when sending a closure into `defer_unchecked`.
-    ///         guard.defer_unchecked(move || {
-    ///             println!("{} is now being deallocated.", p.deref());
-    ///             // Now we have unique access to the object pointed to by `p` and can turn it
-    ///             // into an `Owned`. Dropping the `Owned` will deallocate the object.
-    ///             drop(p.into_owned());
-    ///         });
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub unsafe fn defer_unchecked<F, R>(&self, f: F)
-    where
-        F: FnOnce() -> R,
-    {
-        if let Some(local) = self.local.as_ref() {
-            local.defer(Deferred::new(move || drop(f())), self);
-        }
-    }
-
-    /// Stores a destructor for an object so that it can be deallocated and dropped at some point
-    /// after all currently pinned threads get unpinned.
-    ///
-    /// This method first stores the destructor into the thread-local (or handle-local) cache. If
-    /// this cache becomes full, some destructors are moved into the global cache. At the same
-    /// time, some destructors from both local and global caches may get executed in order to
-    /// incrementally clean up the caches as they fill up.
-    ///
-    /// There is no guarantee when exactly the destructor will be executed. The only guarantee is
-    /// that it won't be executed until all currently pinned threads get unpinned. In theory, the
-    /// destructor might never run, but the epoch-based garbage collection will make an effort to
-    /// execute it reasonably soon.
-    ///
-    /// If this method is called from an [`unprotected`] guard, the destructor will simply be
-    /// executed immediately.
-    ///
-    /// # Safety
-    ///
-    /// The object must not be reachable by other threads anymore, otherwise it might be still in
-    /// use when the destructor runs.
-    ///
-    /// Apart from that, keep in mind that another thread may execute the destructor, so the object
-    /// must be sendable to other threads.
-    ///
-    /// We intentionally didn't require `T: Send`, because Rust's type systems usually cannot prove
-    /// `T: Send` for typical use cases. For example, consider the following code snippet, which
-    /// exemplifies the typical use case of deferring the deallocation of a shared reference:
-    ///
-    /// ```ignore
-    /// let shared = Owned::new(7i32).into_shared(guard);
-    /// guard.defer_destroy(shared); // `Shared` is not `Send`!
-    /// ```
-    ///
-    /// While `Shared` is not `Send`, it's safe for another thread to call the destructor, because
-    /// it's called only after the grace period and `shared` is no longer shared with other
-    /// threads. But we don't expect type systems to prove this.
-    ///
-    /// # Examples
-    ///
-    /// When a heap-allocated object in a data structure becomes unreachable, it has to be
-    /// deallocated. However, the current thread and other threads may be still holding references
-    /// on the stack to that same object. Therefore it cannot be deallocated before those references
-    /// get dropped. This method can defer deallocation until all those threads get unpinned and
-    /// consequently drop all their references on the stack.
-    ///
-    /// ```rust
-    /// use crossbeam_epoch::{self as epoch, Atomic, Owned};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    ///
-    /// let a = Atomic::new("foo");
-    ///
-    /// // Now suppose that `a` is shared among multiple threads and concurrently
-    /// // accessed and modified...
-    ///
-    /// // Pin the current thread.
-    /// let guard = &epoch::pin();
-    ///
-    /// // Steal the object currently stored in `a` and swap it with another one.
-    /// let p = a.swap(Owned::new("bar").into_shared(guard), SeqCst, guard);
-    ///
-    /// if !p.is_null() {
-    ///     // The object `p` is pointing to is now unreachable.
-    ///     // Defer its deallocation until all currently pinned threads get unpinned.
-    ///     unsafe {
-    ///         guard.defer_destroy(p);
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub unsafe fn defer_destroy<T>(&self, ptr: Shared<T>) {
-        self.defer_unchecked(move || ptr.into_owned());
-    }
-
-    /// Clears up the thread-local cache of deferred functions by executing them or moving into the
-    /// global cache.
-    ///
-    /// Call this method after deferring execution of a function if you want to get it executed as
-    /// soon as possible. Flushing will make sure it is residing in in the global cache, so that
-    /// any thread has a chance of taking the function and executing it.
-    ///
-    /// If this method is called from an [`unprotected`] guard, it is a no-op (nothing happens).
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch as epoch;
-    ///
-    /// let guard = &epoch::pin();
-    /// unsafe {
-    ///     guard.defer(move || {
-    ///         println!("This better be printed as soon as possible!");
-    ///     });
-    /// }
-    /// guard.flush();
-    /// ```
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub fn flush(&self) {
-        if let Some(local) = unsafe { self.local.as_ref() } {
-            local.flush(self);
-        }
-    }
-
-    /// Unpins and then immediately re-pins the thread.
-    ///
-    /// This method is useful when you don't want delay the advancement of the global epoch by
-    /// holding an old epoch. For safety, you should not maintain any guard-based reference across
-    /// the call (the latter is enforced by `&mut self`). The thread will only be repinned if this
-    /// is the only active guard for the current thread.
-    ///
-    /// If this method is called from an [`unprotected`] guard, then the call will be just no-op.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    /// use std::thread;
-    /// use std::time::Duration;
-    ///
-    /// let a = Atomic::new(777);
-    /// let mut guard = epoch::pin();
-    /// {
-    ///     let p = a.load(SeqCst, &guard);
-    ///     assert_eq!(unsafe { p.as_ref() }, Some(&777));
-    /// }
-    /// guard.repin();
-    /// {
-    ///     let p = a.load(SeqCst, &guard);
-    ///     assert_eq!(unsafe { p.as_ref() }, Some(&777));
-    /// }
-    /// ```
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub fn repin(&mut self) {
-        if let Some(local) = unsafe { self.local.as_ref() } {
-            local.repin();
-        }
-    }
-
-    /// Temporarily unpins the thread, executes the given function and then re-pins the thread.
-    ///
-    /// This method is useful when you need to perform a long-running operation (e.g. sleeping)
-    /// and don't need to maintain any guard-based reference across the call (the latter is enforced
-    /// by `&mut self`). The thread will only be unpinned if this is the only active guard for the
-    /// current thread.
-    ///
-    /// If this method is called from an [`unprotected`] guard, then the passed function is called
-    /// directly without unpinning the thread.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch::{self as epoch, Atomic};
-    /// use std::sync::atomic::Ordering::SeqCst;
-    /// use std::thread;
-    /// use std::time::Duration;
-    ///
-    /// let a = Atomic::new(777);
-    /// let mut guard = epoch::pin();
-    /// {
-    ///     let p = a.load(SeqCst, &guard);
-    ///     assert_eq!(unsafe { p.as_ref() }, Some(&777));
-    /// }
-    /// guard.repin_after(|| thread::sleep(Duration::from_millis(50)));
-    /// {
-    ///     let p = a.load(SeqCst, &guard);
-    ///     assert_eq!(unsafe { p.as_ref() }, Some(&777));
-    /// }
-    /// ```
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub fn repin_after<F, R>(&mut self, f: F) -> R
-    where
-        F: FnOnce() -> R,
-    {
-        if let Some(local) = unsafe { self.local.as_ref() } {
-            // We need to acquire a handle here to ensure the Local doesn't
-            // disappear from under us.
-            local.acquire_handle();
-            local.unpin();
-        }
-
-        // Ensure the Guard is re-pinned even if the function panics
-        defer! {
-            if let Some(local) = unsafe { self.local.as_ref() } {
-                mem::forget(local.pin());
-                local.release_handle();
-            }
-        }
-
-        f()
-    }
-
-    /// Returns the `Collector` associated with this guard.
-    ///
-    /// This method is useful when you need to ensure that all guards used with
-    /// a data structure come from the same collector.
-    ///
-    /// If this method is called from an [`unprotected`] guard, then `None` is returned.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use crossbeam_epoch as epoch;
-    ///
-    /// let mut guard1 = epoch::pin();
-    /// let mut guard2 = epoch::pin();
-    /// assert!(guard1.collector() == guard2.collector());
-    /// ```
-    ///
-    /// [`unprotected`]: fn.unprotected.html
-    pub fn collector(&self) -> Option<&Collector> {
-        unsafe { self.local.as_ref().map(|local| local.collector()) }
-    }
-}
-
-impl Drop for Guard {
-    #[inline]
-    fn drop(&mut self) {
-        if let Some(local) = unsafe { self.local.as_ref() } {
-            local.unpin();
-        }
-    }
-}
-
-impl Clone for Guard {
-    #[inline]
-    fn clone(&self) -> Guard {
-        match unsafe { self.local.as_ref() } {
-            None => Guard { local: ptr::null() },
-            Some(local) => local.pin(),
-        }
-    }
-}
-
-impl fmt::Debug for Guard {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Guard").finish()
-    }
-}
-
-/// Returns a reference to a dummy guard that allows unprotected access to [`Atomic`]s.
-///
-/// This guard should be used in special occasions only. Note that it doesn't actually keep any
-/// thread pinned - it's just a fake guard that allows loading from [`Atomic`]s unsafely.
-///
-/// Note that calling [`defer`] with a dummy guard will not defer the function - it will just
-/// execute the function immediately.
-///
-/// If necessary, it's possible to create more dummy guards by cloning: `unprotected().clone()`.
-///
-/// # Safety
-///
-/// Loading and dereferencing data from an [`Atomic`] using this guard is safe only if the
-/// [`Atomic`] is not being concurrently modified by other threads.
-///
-/// # Examples
-///
-/// ```
-/// use crossbeam_epoch::{self as epoch, Atomic};
-/// use std::sync::atomic::Ordering::Relaxed;
-///
-/// let a = Atomic::new(7);
-///
-/// unsafe {
-///     // Load `a` without pinning the current thread.
-///     a.load(Relaxed, epoch::unprotected());
-///
-///     // It's possible to create more dummy guards by calling `clone()`.
-///     let dummy = &epoch::unprotected().clone();
-///
-///     dummy.defer(move || {
-///         println!("This gets executed immediately.");
-///     });
-///
-///     // Dropping `dummy` doesn't affect the current thread - it's just a noop.
-/// }
-/// ```
-///
-/// The most common use of this function is when constructing or destructing a data structure.
-///
-/// For example, we can use a dummy guard in the destructor of a Treiber stack because at that
-/// point no other thread could concurrently modify the [`Atomic`]s we are accessing.
-///
-/// If we were to actually pin the current thread during destruction, that would just unnecessarily
-/// delay garbage collection and incur some performance cost, so in cases like these `unprotected`
-/// is very helpful.
-///
-/// ```
-/// use crossbeam_epoch::{self as epoch, Atomic};
-/// use std::mem::ManuallyDrop;
-/// use std::sync::atomic::Ordering::Relaxed;
-///
-/// struct Stack<T> {
-///     head: Atomic<Node<T>>,
-/// }
-///
-/// struct Node<T> {
-///     data: ManuallyDrop<T>,
-///     next: Atomic<Node<T>>,
-/// }
-///
-/// impl<T> Drop for Stack<T> {
-///     fn drop(&mut self) {
-///         unsafe {
-///             // Unprotected load.
-///             let mut node = self.head.load(Relaxed, epoch::unprotected());
-///
-///             while let Some(n) = node.as_ref() {
-///                 // Unprotected load.
-///                 let next = n.next.load(Relaxed, epoch::unprotected());
-///
-///                 // Take ownership of the node, then drop its data and deallocate it.
-///                 let mut o = node.into_owned();
-///                 ManuallyDrop::drop(&mut o.data);
-///                 drop(o);
-///
-///                 node = next;
-///             }
-///         }
-///     }
-/// }
-/// ```
-///
-/// [`Atomic`]: struct.Atomic.html
-/// [`defer`]: struct.Guard.html#method.defer
-#[inline]
-pub unsafe fn unprotected() -> &'static Guard {
-    // HACK(stjepang): An unprotected guard is just a `Guard` with its field `local` set to null.
-    // Since this function returns a `'static` reference to a `Guard`, we must return a reference
-    // to a global guard. However, it's not possible to create a `static` `Guard` because it does
-    // not implement `Sync`. To get around the problem, we create a static `usize` initialized to
-    // zero and then transmute it into a `Guard`. This is safe because `usize` and `Guard`
-    // (consisting of a single pointer) have the same representation in memory.
-    static UNPROTECTED: usize = 0;
-    &*(&UNPROTECTED as *const _ as *const Guard)
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/internal.rs cargo-0.33.0/vendor/crossbeam-epoch/src/internal.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/internal.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/internal.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,546 +0,0 @@
-//! The global data and participant for garbage collection.
-//!
-//! # Registration
-//!
-//! In order to track all participants in one place, we need some form of participant
-//! registration. When a participant is created, it is registered to a global lock-free
-//! singly-linked list of registries; and when a participant is leaving, it is unregistered from the
-//! list.
-//!
-//! # Pinning
-//!
-//! Every participant contains an integer that tells whether the participant is pinned and if so,
-//! what was the global epoch at the time it was pinned. Participants also hold a pin counter that
-//! aids in periodic global epoch advancement.
-//!
-//! When a participant is pinned, a `Guard` is returned as a witness that the participant is pinned.
-//! Guards are necessary for performing atomic operations, and for freeing/dropping locations.
-//!
-//! # Thread-local bag
-//!
-//! Objects that get unlinked from concurrent data structures must be stashed away until the global
-//! epoch sufficiently advances so that they become safe for destruction. Pointers to such objects
-//! are pushed into a thread-local bag, and when it becomes full, the bag is marked with the current
-//! global epoch and pushed into the global queue of bags. We store objects in thread-local storages
-//! for amortizing the synchronization cost of pushing the garbages to a global queue.
-//!
-//! # Global queue
-//!
-//! Whenever a bag is pushed into a queue, the objects in some bags in the queue are collected and
-//! destroyed along the way. This design reduces contention on data structures. The global queue
-//! cannot be explicitly accessed: the only way to interact with it is by calling functions
-//! `defer()` that adds an object tothe thread-local bag, or `collect()` that manually triggers
-//! garbage collection.
-//!
-//! Ideally each instance of concurrent data structure may have its own queue that gets fully
-//! destroyed as soon as the data structure gets dropped.
-
-use alloc::boxed::Box;
-use core::cell::{Cell, UnsafeCell};
-use core::mem::{self, ManuallyDrop};
-use core::num::Wrapping;
-use core::ptr;
-use core::sync::atomic;
-use core::sync::atomic::Ordering;
-
-use arrayvec::ArrayVec;
-use crossbeam_utils::CachePadded;
-
-use atomic::Owned;
-use collector::{Collector, LocalHandle};
-use deferred::Deferred;
-use epoch::{AtomicEpoch, Epoch};
-use guard::{unprotected, Guard};
-use sync::list::{Entry, IsElement, IterError, List};
-use sync::queue::Queue;
-
-/// Maximum number of objects a bag can contain.
-#[cfg(not(feature = "sanitize"))]
-const MAX_OBJECTS: usize = 64;
-#[cfg(feature = "sanitize")]
-const MAX_OBJECTS: usize = 4;
-
-/// A bag of deferred functions.
-#[derive(Default, Debug)]
-pub struct Bag {
-    /// Stashed objects.
-    deferreds: ArrayVec<[Deferred; MAX_OBJECTS]>,
-}
-
-/// `Bag::try_push()` requires that it is safe for another thread to execute the given functions.
-unsafe impl Send for Bag {}
-
-impl Bag {
-    /// Returns a new, empty bag.
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Returns `true` if the bag is empty.
-    pub fn is_empty(&self) -> bool {
-        self.deferreds.is_empty()
-    }
-
-    /// Attempts to insert a deferred function into the bag.
-    ///
-    /// Returns `Ok(())` if successful, and `Err(deferred)` for the given `deferred` if the bag is
-    /// full.
-    ///
-    /// # Safety
-    ///
-    /// It should be safe for another thread to execute the given function.
-    pub unsafe fn try_push(&mut self, deferred: Deferred) -> Result<(), Deferred> {
-        self.deferreds.try_push(deferred).map_err(|e| e.element())
-    }
-
-    /// Seals the bag with the given epoch.
-    fn seal(self, epoch: Epoch) -> SealedBag {
-        SealedBag { epoch, bag: self }
-    }
-}
-
-impl Drop for Bag {
-    fn drop(&mut self) {
-        // Call all deferred functions.
-        for deferred in self.deferreds.drain(..) {
-            deferred.call();
-        }
-    }
-}
-
-/// A pair of an epoch and a bag.
-#[derive(Default, Debug)]
-struct SealedBag {
-    epoch: Epoch,
-    bag: Bag,
-}
-
-/// It is safe to share `SealedBag` because `is_expired` only inspects the epoch.
-unsafe impl Sync for SealedBag {}
-
-impl SealedBag {
-    /// Checks if it is safe to drop the bag w.r.t. the given global epoch.
-    fn is_expired(&self, global_epoch: Epoch) -> bool {
-        // A pinned participant can witness at most one epoch advancement. Therefore, any bag that
-        // is within one epoch of the current one cannot be destroyed yet.
-        global_epoch.wrapping_sub(self.epoch) >= 2
-    }
-}
-
-/// The global data for a garbage collector.
-pub struct Global {
-    /// The intrusive linked list of `Local`s.
-    locals: List<Local>,
-
-    /// The global queue of bags of deferred functions.
-    queue: Queue<SealedBag>,
-
-    /// The global epoch.
-    pub(crate) epoch: CachePadded<AtomicEpoch>,
-}
-
-impl Global {
-    /// Number of bags to destroy.
-    const COLLECT_STEPS: usize = 8;
-
-    /// Creates a new global data for garbage collection.
-    #[inline]
-    pub fn new() -> Self {
-        Self {
-            locals: List::new(),
-            queue: Queue::new(),
-            epoch: CachePadded::new(AtomicEpoch::new(Epoch::starting())),
-        }
-    }
-
-    /// Pushes the bag into the global queue and replaces the bag with a new empty bag.
-    pub fn push_bag(&self, bag: &mut Bag, guard: &Guard) {
-        let bag = mem::replace(bag, Bag::new());
-
-        atomic::fence(Ordering::SeqCst);
-
-        let epoch = self.epoch.load(Ordering::Relaxed);
-        self.queue.push(bag.seal(epoch), guard);
-    }
-
-    /// Collects several bags from the global queue and executes deferred functions in them.
-    ///
-    /// Note: This may itself produce garbage and in turn allocate new bags.
-    ///
-    /// `pin()` rarely calls `collect()`, so we want the compiler to place that call on a cold
-    /// path. In other words, we want the compiler to optimize branching for the case when
-    /// `collect()` is not called.
-    #[cold]
-    pub fn collect(&self, guard: &Guard) {
-        let global_epoch = self.try_advance(guard);
-
-        let steps = if cfg!(feature = "sanitize") {
-            usize::max_value()
-        } else {
-            Self::COLLECT_STEPS
-        };
-
-        for _ in 0..steps {
-            match self.queue.try_pop_if(
-                &|sealed_bag: &SealedBag| sealed_bag.is_expired(global_epoch),
-                guard,
-            ) {
-                None => break,
-                Some(sealed_bag) => drop(sealed_bag),
-            }
-        }
-    }
-
-    /// Attempts to advance the global epoch.
-    ///
-    /// The global epoch can advance only if all currently pinned participants have been pinned in
-    /// the current epoch.
-    ///
-    /// Returns the current global epoch.
-    ///
-    /// `try_advance()` is annotated `#[cold]` because it is rarely called.
-    #[cold]
-    pub fn try_advance(&self, guard: &Guard) -> Epoch {
-        let global_epoch = self.epoch.load(Ordering::Relaxed);
-        atomic::fence(Ordering::SeqCst);
-
-        // TODO(stjepang): `Local`s are stored in a linked list because linked lists are fairly
-        // easy to implement in a lock-free manner. However, traversal can be slow due to cache
-        // misses and data dependencies. We should experiment with other data structures as well.
-        for local in self.locals.iter(&guard) {
-            match local {
-                Err(IterError::Stalled) => {
-                    // A concurrent thread stalled this iteration. That thread might also try to
-                    // advance the epoch, in which case we leave the job to it. Otherwise, the
-                    // epoch will not be advanced.
-                    return global_epoch;
-                }
-                Ok(local) => {
-                    let local_epoch = local.epoch.load(Ordering::Relaxed);
-
-                    // If the participant was pinned in a different epoch, we cannot advance the
-                    // global epoch just yet.
-                    if local_epoch.is_pinned() && local_epoch.unpinned() != global_epoch {
-                        return global_epoch;
-                    }
-                }
-            }
-        }
-        atomic::fence(Ordering::Acquire);
-
-        // All pinned participants were pinned in the current global epoch.
-        // Now let's advance the global epoch...
-        //
-        // Note that if another thread already advanced it before us, this store will simply
-        // overwrite the global epoch with the same value. This is true because `try_advance` was
-        // called from a thread that was pinned in `global_epoch`, and the global epoch cannot be
-        // advanced two steps ahead of it.
-        let new_epoch = global_epoch.successor();
-        self.epoch.store(new_epoch, Ordering::Release);
-        new_epoch
-    }
-}
-
-/// Participant for garbage collection.
-pub struct Local {
-    /// A node in the intrusive linked list of `Local`s.
-    entry: Entry,
-
-    /// The local epoch.
-    epoch: AtomicEpoch,
-
-    /// A reference to the global data.
-    ///
-    /// When all guards and handles get dropped, this reference is destroyed.
-    collector: UnsafeCell<ManuallyDrop<Collector>>,
-
-    /// The local bag of deferred functions.
-    pub(crate) bag: UnsafeCell<Bag>,
-
-    /// The number of guards keeping this participant pinned.
-    guard_count: Cell<usize>,
-
-    /// The number of active handles.
-    handle_count: Cell<usize>,
-
-    /// Total number of pinnings performed.
-    ///
-    /// This is just an auxilliary counter that sometimes kicks off collection.
-    pin_count: Cell<Wrapping<usize>>,
-}
-
-impl Local {
-    /// Number of pinnings after which a participant will execute some deferred functions from the
-    /// global queue.
-    const PINNINGS_BETWEEN_COLLECT: usize = 128;
-
-    /// Registers a new `Local` in the provided `Global`.
-    pub fn register(collector: &Collector) -> LocalHandle {
-        unsafe {
-            // Since we dereference no pointers in this block, it is safe to use `unprotected`.
-
-            let local = Owned::new(Local {
-                entry: Entry::default(),
-                epoch: AtomicEpoch::new(Epoch::starting()),
-                collector: UnsafeCell::new(ManuallyDrop::new(collector.clone())),
-                bag: UnsafeCell::new(Bag::new()),
-                guard_count: Cell::new(0),
-                handle_count: Cell::new(1),
-                pin_count: Cell::new(Wrapping(0)),
-            }).into_shared(&unprotected());
-            collector.global.locals.insert(local, &unprotected());
-            LocalHandle {
-                local: local.as_raw(),
-            }
-        }
-    }
-
-    /// Returns a reference to the `Global` in which this `Local` resides.
-    #[inline]
-    pub fn global(&self) -> &Global {
-        &self.collector().global
-    }
-
-    /// Returns a reference to the `Collector` in which this `Local` resides.
-    #[inline]
-    pub fn collector(&self) -> &Collector {
-        unsafe { &**self.collector.get() }
-    }
-
-    /// Returns `true` if the current participant is pinned.
-    #[inline]
-    pub fn is_pinned(&self) -> bool {
-        self.guard_count.get() > 0
-    }
-
-    /// Adds `deferred` to the thread-local bag.
-    ///
-    /// # Safety
-    ///
-    /// It should be safe for another thread to execute the given function.
-    pub unsafe fn defer(&self, mut deferred: Deferred, guard: &Guard) {
-        let bag = &mut *self.bag.get();
-
-        while let Err(d) = bag.try_push(deferred) {
-            self.global().push_bag(bag, guard);
-            deferred = d;
-        }
-    }
-
-    pub fn flush(&self, guard: &Guard) {
-        let bag = unsafe { &mut *self.bag.get() };
-
-        if !bag.is_empty() {
-            self.global().push_bag(bag, guard);
-        }
-
-        self.global().collect(guard);
-    }
-
-    /// Pins the `Local`.
-    #[inline]
-    pub fn pin(&self) -> Guard {
-        let guard = Guard { local: self };
-
-        let guard_count = self.guard_count.get();
-        self.guard_count.set(guard_count.checked_add(1).unwrap());
-
-        if guard_count == 0 {
-            let global_epoch = self.global().epoch.load(Ordering::Relaxed);
-            let new_epoch = global_epoch.pinned();
-
-            // Now we must store `new_epoch` into `self.epoch` and execute a `SeqCst` fence.
-            // The fence makes sure that any future loads from `Atomic`s will not happen before
-            // this store.
-            if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
-                // HACK(stjepang): On x86 architectures there are two different ways of executing
-                // a `SeqCst` fence.
-                //
-                // 1. `atomic::fence(SeqCst)`, which compiles into a `mfence` instruction.
-                // 2. `_.compare_and_swap(_, _, SeqCst)`, which compiles into a `lock cmpxchg`
-                //    instruction.
-                //
-                // Both instructions have the effect of a full barrier, but benchmarks have shown
-                // that the second one makes pinning faster in this particular case.
-                let current = Epoch::starting();
-                let previous = self
-                    .epoch
-                    .compare_and_swap(current, new_epoch, Ordering::SeqCst);
-                debug_assert_eq!(current, previous, "participant was expected to be unpinned");
-            } else {
-                self.epoch.store(new_epoch, Ordering::Relaxed);
-                atomic::fence(Ordering::SeqCst);
-            }
-
-            // Increment the pin counter.
-            let count = self.pin_count.get();
-            self.pin_count.set(count + Wrapping(1));
-
-            // After every `PINNINGS_BETWEEN_COLLECT` try advancing the epoch and collecting
-            // some garbage.
-            if count.0 % Self::PINNINGS_BETWEEN_COLLECT == 0 {
-                self.global().collect(&guard);
-            }
-        }
-
-        guard
-    }
-
-    /// Unpins the `Local`.
-    #[inline]
-    pub fn unpin(&self) {
-        let guard_count = self.guard_count.get();
-        self.guard_count.set(guard_count - 1);
-
-        if guard_count == 1 {
-            self.epoch.store(Epoch::starting(), Ordering::Release);
-
-            if self.handle_count.get() == 0 {
-                self.finalize();
-            }
-        }
-    }
-
-    /// Unpins and then pins the `Local`.
-    #[inline]
-    pub fn repin(&self) {
-        let guard_count = self.guard_count.get();
-
-        // Update the local epoch only if there's only one guard.
-        if guard_count == 1 {
-            let epoch = self.epoch.load(Ordering::Relaxed);
-            let global_epoch = self.global().epoch.load(Ordering::Relaxed).pinned();
-
-            // Update the local epoch only if the global epoch is greater than the local epoch.
-            if epoch != global_epoch {
-                // We store the new epoch with `Release` because we need to ensure any memory
-                // accesses from the previous epoch do not leak into the new one.
-                self.epoch.store(global_epoch, Ordering::Release);
-
-                // However, we don't need a following `SeqCst` fence, because it is safe for memory
-                // accesses from the new epoch to be executed before updating the local epoch. At
-                // worse, other threads will see the new epoch late and delay GC slightly.
-            }
-        }
-    }
-
-    /// Increments the handle count.
-    #[inline]
-    pub fn acquire_handle(&self) {
-        let handle_count = self.handle_count.get();
-        debug_assert!(handle_count >= 1);
-        self.handle_count.set(handle_count + 1);
-    }
-
-    /// Decrements the handle count.
-    #[inline]
-    pub fn release_handle(&self) {
-        let guard_count = self.guard_count.get();
-        let handle_count = self.handle_count.get();
-        debug_assert!(handle_count >= 1);
-        self.handle_count.set(handle_count - 1);
-
-        if guard_count == 0 && handle_count == 1 {
-            self.finalize();
-        }
-    }
-
-    /// Removes the `Local` from the global linked list.
-    #[cold]
-    fn finalize(&self) {
-        debug_assert_eq!(self.guard_count.get(), 0);
-        debug_assert_eq!(self.handle_count.get(), 0);
-
-        // Temporarily increment handle count. This is required so that the following call to `pin`
-        // doesn't call `finalize` again.
-        self.handle_count.set(1);
-        unsafe {
-            // Pin and move the local bag into the global queue. It's important that `push_bag`
-            // doesn't defer destruction on any new garbage.
-            let guard = &self.pin();
-            self.global().push_bag(&mut *self.bag.get(), guard);
-        }
-        // Revert the handle count back to zero.
-        self.handle_count.set(0);
-
-        unsafe {
-            // Take the reference to the `Global` out of this `Local`. Since we're not protected
-            // by a guard at this time, it's crucial that the reference is read before marking the
-            // `Local` as deleted.
-            let collector: Collector = ptr::read(&*(*self.collector.get()));
-
-            // Mark this node in the linked list as deleted.
-            self.entry.delete(&unprotected());
-
-            // Finally, drop the reference to the global. Note that this might be the last reference
-            // to the `Global`. If so, the global data will be destroyed and all deferred functions
-            // in its queue will be executed.
-            drop(collector);
-        }
-    }
-}
-
-impl IsElement<Local> for Local {
-    fn entry_of(local: &Local) -> &Entry {
-        let entry_ptr = (local as *const Local as usize + offset_of!(Local, entry)) as *const Entry;
-        unsafe { &*entry_ptr }
-    }
-
-    unsafe fn element_of(entry: &Entry) -> &Local {
-        // offset_of! macro uses unsafe, but it's unnecessary in this context.
-        #[allow(unused_unsafe)]
-        let local_ptr = (entry as *const Entry as usize - offset_of!(Local, entry)) as *const Local;
-        &*local_ptr
-    }
-
-    unsafe fn finalize(entry: &Entry) {
-        let local = Self::element_of(entry);
-        drop(Box::from_raw(local as *const Local as *mut Local));
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::atomic::Ordering;
-    use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT};
-
-    use super::*;
-
-    #[test]
-    fn check_defer() {
-        static FLAG: AtomicUsize = ATOMIC_USIZE_INIT;
-        fn set() {
-            FLAG.store(42, Ordering::Relaxed);
-        }
-
-        let d = Deferred::new(set);
-        assert_eq!(FLAG.load(Ordering::Relaxed), 0);
-        d.call();
-        assert_eq!(FLAG.load(Ordering::Relaxed), 42);
-    }
-
-    #[test]
-    fn check_bag() {
-        static FLAG: AtomicUsize = ATOMIC_USIZE_INIT;
-        fn incr() {
-            FLAG.fetch_add(1, Ordering::Relaxed);
-        }
-
-        let mut bag = Bag::new();
-        assert!(bag.is_empty());
-
-        for _ in 0..MAX_OBJECTS {
-            assert!(unsafe { bag.try_push(Deferred::new(incr)).is_ok() });
-            assert!(!bag.is_empty());
-            assert_eq!(FLAG.load(Ordering::Relaxed), 0);
-        }
-
-        let result = unsafe { bag.try_push(Deferred::new(incr)) };
-        assert!(result.is_err());
-        assert!(!bag.is_empty());
-        assert_eq!(FLAG.load(Ordering::Relaxed), 0);
-
-        drop(bag);
-        assert_eq!(FLAG.load(Ordering::Relaxed), MAX_OBJECTS);
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/lib.rs cargo-0.33.0/vendor/crossbeam-epoch/src/lib.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-//! Epoch-based memory reclamation.
-//!
-//! An interesting problem concurrent collections deal with comes from the remove operation.
-//! Suppose that a thread removes an element from a lock-free map, while another thread is reading
-//! that same element at the same time. The first thread must wait until the second thread stops
-//! reading the element. Only then it is safe to destruct it.
-//!
-//! Programming languages that come with garbage collectors solve this problem trivially. The
-//! garbage collector will destruct the removed element when no thread can hold a reference to it
-//! anymore.
-//!
-//! This crate implements a basic memory reclamation mechanism, which is based on epochs. When an
-//! element gets removed from a concurrent collection, it is inserted into a pile of garbage and
-//! marked with the current epoch. Every time a thread accesses a collection, it checks the current
-//! epoch, attempts to increment it, and destructs some garbage that became so old that no thread
-//! can be referencing it anymore.
-//!
-//! That is the general mechanism behind epoch-based memory reclamation, but the details are a bit
-//! more complicated. Anyhow, memory reclamation is designed to be fully automatic and something
-//! users of concurrent collections don't have to worry much about.
-//!
-//! # Pointers
-//!
-//! Concurrent collections are built using atomic pointers. This module provides [`Atomic`], which
-//! is just a shared atomic pointer to a heap-allocated object. Loading an [`Atomic`] yields a
-//! [`Shared`], which is an epoch-protected pointer through which the loaded object can be safely
-//! read.
-//!
-//! # Pinning
-//!
-//! Before an [`Atomic`] can be loaded, a participant must be [`pin`]ned. By pinning a participant
-//! we declare that any object that gets removed from now on must not be destructed just
-//! yet. Garbage collection of newly removed objects is suspended until the participant gets
-//! unpinned.
-//!
-//! # Garbage
-//!
-//! Objects that get removed from concurrent collections must be stashed away until all currently
-//! pinned participants get unpinned. Such objects can be stored into a thread-local or global
-//! storage, where they are kept until the right time for their destruction comes.
-//!
-//! There is a global shared instance of garbage queue. You can [`defer`] the execution of an
-//! arbitrary function until the global epoch is advanced enough. Most notably, concurrent data
-//! structures may defer the deallocation of an object.
-//!
-//! # APIs
-//!
-//! For majority of use cases, just use the default garbage collector by invoking [`pin`]. If you
-//! want to create your own garbage collector, use the [`Collector`] API.
-//!
-//! [`Atomic`]: struct.Atomic.html
-//! [`Collector`]: struct.Collector.html
-//! [`Shared`]: struct.Shared.html
-//! [`pin`]: fn.pin.html
-//! [`defer`]: fn.defer.html
-
-#![warn(missing_docs)]
-#![warn(missing_debug_implementations)]
-#![cfg_attr(not(feature = "std"), no_std)]
-#![cfg_attr(feature = "nightly", feature(alloc))]
-#![cfg_attr(feature = "nightly", feature(const_fn))]
-
-#[macro_use]
-extern crate cfg_if;
-#[cfg(feature = "std")]
-extern crate core;
-
-cfg_if! {
-    if #[cfg(feature = "nightly")] {
-        extern crate alloc;
-    } else {
-        mod alloc {
-            extern crate std;
-            pub use self::std::*;
-        }
-    }
-}
-
-extern crate arrayvec;
-extern crate crossbeam_utils;
-#[macro_use]
-extern crate memoffset;
-#[macro_use]
-extern crate scopeguard;
-
-mod atomic;
-mod collector;
-mod deferred;
-mod epoch;
-mod guard;
-mod internal;
-mod sync;
-
-pub use self::atomic::{Atomic, CompareAndSetError, CompareAndSetOrdering, Owned, Pointer, Shared};
-pub use self::collector::{Collector, LocalHandle};
-pub use self::guard::{unprotected, Guard};
-
-cfg_if! {
-    if #[cfg(feature = "std")] {
-        #[macro_use]
-        extern crate lazy_static;
-
-        mod default;
-        pub use self::default::{default_collector, is_pinned, pin};
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/sync/list.rs cargo-0.33.0/vendor/crossbeam-epoch/src/sync/list.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/sync/list.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/sync/list.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,477 +0,0 @@
-//! Lock-free intrusive linked list.
-//!
-//! Ideas from Michael.  High Performance Dynamic Lock-Free Hash Tables and List-Based Sets.  SPAA
-//! 2002.  http://dl.acm.org/citation.cfm?id=564870.564881
-
-use core::marker::PhantomData;
-use core::sync::atomic::Ordering::{Acquire, Relaxed, Release};
-
-use {unprotected, Atomic, Guard, Shared};
-
-/// An entry in a linked list.
-///
-/// An Entry is accessed from multiple threads, so it would be beneficial to put it in a different
-/// cache-line than thread-local data in terms of performance.
-#[derive(Debug)]
-pub struct Entry {
-    /// The next entry in the linked list.
-    /// If the tag is 1, this entry is marked as deleted.
-    next: Atomic<Entry>,
-}
-
-/// Implementing this trait asserts that the type `T` can be used as an element in the intrusive
-/// linked list defined in this module. `T` has to contain (or otherwise be linked to) an instance
-/// of `Entry`.
-///
-/// # Example
-///
-/// ```ignore
-/// struct A {
-///     entry: Entry,
-///     data: usize,
-/// }
-///
-/// impl IsElement<A> for A {
-///     fn entry_of(a: &A) -> &Entry {
-///         let entry_ptr = ((a as usize) + offset_of!(A, entry)) as *const Entry;
-///         unsafe { &*entry_ptr }
-///     }
-///
-///     unsafe fn element_of(entry: &Entry) -> &T {
-///         let elem_ptr = ((entry as usize) - offset_of!(A, entry)) as *const T;
-///         &*elem_ptr
-///     }
-///
-///     unsafe fn finalize(entry: &Entry) {
-///         let elem = Self::element_of(entry);
-///         drop(Box::from_raw(elem as *const A as *mut A));
-///     }
-/// }
-/// ```
-///
-/// This trait is implemented on a type separate from `T` (although it can be just `T`), because
-/// one type might be placeable into multiple lists, in which case it would require multiple
-/// implementations of `IsElement`. In such cases, each struct implementing `IsElement<T>`
-/// represents a distinct `Entry` in `T`.
-///
-/// For example, we can insert the following struct into two lists using `entry1` for one
-/// and `entry2` for the other:
-///
-/// ```ignore
-/// struct B {
-///     entry1: Entry,
-///     entry2: Entry,
-///     data: usize,
-/// }
-/// ```
-///
-pub trait IsElement<T> {
-    /// Returns a reference to this element's `Entry`.
-    fn entry_of(&T) -> &Entry;
-
-    /// Given a reference to an element's entry, returns that element.
-    ///
-    /// ```ignore
-    /// let elem = ListElement::new();
-    /// assert_eq!(elem.entry_of(),
-    ///            unsafe { ListElement::element_of(elem.entry_of()) } );
-    /// ```
-    ///
-    /// # Safety
-    /// The caller has to guarantee that the `Entry` it
-    /// is called with was retrieved from an instance of the element type (`T`).
-    unsafe fn element_of(&Entry) -> &T;
-
-    /// Deallocates the whole element given its `Entry`. This is called when the list
-    /// is ready to actually free the element.
-    ///
-    /// # Safety
-    /// The caller has to guarantee that the `Entry` it
-    /// is called with was retrieved from an instance of the element type (`T`).
-    unsafe fn finalize(&Entry);
-}
-
-/// A lock-free, intrusive linked list of type `T`.
-#[derive(Debug)]
-pub struct List<T, C: IsElement<T> = T> {
-    /// The head of the linked list.
-    head: Atomic<Entry>,
-
-    /// The phantom data for using `T` and `C`.
-    _marker: PhantomData<(T, C)>,
-}
-
-/// An iterator used for retrieving values from the list.
-pub struct Iter<'g, T: 'g, C: IsElement<T>> {
-    /// The guard that protects the iteration.
-    guard: &'g Guard,
-
-    /// Pointer from the predecessor to the current entry.
-    pred: &'g Atomic<Entry>,
-
-    /// The current entry.
-    curr: Shared<'g, Entry>,
-
-    /// The list head, needed for restarting iteration.
-    head: &'g Atomic<Entry>,
-
-    /// Logically, we store a borrow of an instance of `T` and
-    /// use the type information from `C`.
-    _marker: PhantomData<(&'g T, C)>,
-}
-
-/// An error that occurs during iteration over the list.
-#[derive(PartialEq, Debug)]
-pub enum IterError {
-    /// A concurrent thread modified the state of the list at the same place that this iterator
-    /// was inspecting. Subsequent iteration will restart from the beginning of the list.
-    Stalled,
-}
-
-impl Default for Entry {
-    /// Returns the empty entry.
-    fn default() -> Self {
-        Self {
-            next: Atomic::null(),
-        }
-    }
-}
-
-impl Entry {
-    /// Marks this entry as deleted, deferring the actual deallocation to a later iteration.
-    ///
-    /// # Safety
-    ///
-    /// The entry should be a member of a linked list, and it should not have been deleted.
-    /// It should be safe to call `C::finalize` on the entry after the `guard` is dropped, where `C`
-    /// is the associated helper for the linked list.
-    pub unsafe fn delete(&self, guard: &Guard) {
-        self.next.fetch_or(1, Release, guard);
-    }
-}
-
-impl<T, C: IsElement<T>> List<T, C> {
-    /// Returns a new, empty linked list.
-    pub fn new() -> Self {
-        Self {
-            head: Atomic::null(),
-            _marker: PhantomData,
-        }
-    }
-
-    /// Inserts `entry` into the head of the list.
-    ///
-    /// # Safety
-    ///
-    /// You should guarantee that:
-    ///
-    /// - `container` is not null
-    /// - `container` is immovable, e.g. inside a `Box`
-    /// - the same `Entry` is not inserted more than once
-    /// - the inserted object will be removed before the list is dropped
-    pub unsafe fn insert<'g>(&'g self, container: Shared<'g, T>, guard: &'g Guard) {
-        // Insert right after head, i.e. at the beginning of the list.
-        let to = &self.head;
-        // Get the intrusively stored Entry of the new element to insert.
-        let entry: &Entry = C::entry_of(container.deref());
-        // Make a Shared ptr to that Entry.
-        let entry_ptr = Shared::from(entry as *const _);
-        // Read the current successor of where we want to insert.
-        let mut next = to.load(Relaxed, guard);
-
-        loop {
-            // Set the Entry of the to-be-inserted element to point to the previous successor of
-            // `to`.
-            entry.next.store(next, Relaxed);
-            match to.compare_and_set_weak(next, entry_ptr, Release, guard) {
-                Ok(_) => break,
-                // We lost the race or weak CAS failed spuriously. Update the successor and try
-                // again.
-                Err(err) => next = err.current,
-            }
-        }
-    }
-
-    /// Returns an iterator over all objects.
-    ///
-    /// # Caveat
-    ///
-    /// Every object that is inserted at the moment this function is called and persists at least
-    /// until the end of iteration will be returned. Since this iterator traverses a lock-free
-    /// linked list that may be concurrently modified, some additional caveats apply:
-    ///
-    /// 1. If a new object is inserted during iteration, it may or may not be returned.
-    /// 2. If an object is deleted during iteration, it may or may not be returned.
-    /// 3. The iteration may be aborted when it lost in a race condition. In this case, the winning
-    ///    thread will continue to iterate over the same list.
-    pub fn iter<'g>(&'g self, guard: &'g Guard) -> Iter<'g, T, C> {
-        Iter {
-            guard,
-            pred: &self.head,
-            curr: self.head.load(Acquire, guard),
-            head: &self.head,
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<T, C: IsElement<T>> Drop for List<T, C> {
-    fn drop(&mut self) {
-        unsafe {
-            let guard = &unprotected();
-            let mut curr = self.head.load(Relaxed, guard);
-            while let Some(c) = curr.as_ref() {
-                let succ = c.next.load(Relaxed, guard);
-                // Verify that all elements have been removed from the list.
-                assert_eq!(succ.tag(), 1);
-
-                C::finalize(curr.deref());
-                curr = succ;
-            }
-        }
-    }
-}
-
-impl<'g, T: 'g, C: IsElement<T>> Iterator for Iter<'g, T, C> {
-    type Item = Result<&'g T, IterError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while let Some(c) = unsafe { self.curr.as_ref() } {
-            let succ = c.next.load(Acquire, self.guard);
-
-            if succ.tag() == 1 {
-                // This entry was removed. Try unlinking it from the list.
-                let succ = succ.with_tag(0);
-
-                // The tag should never be zero, because removing a node after a logically deleted
-                // node leaves the list in an invalid state.
-                debug_assert!(self.curr.tag() == 0);
-
-                match self
-                    .pred
-                    .compare_and_set(self.curr, succ, Acquire, self.guard)
-                {
-                    Ok(_) => {
-                        // We succeeded in unlinking this element from the list, so we have to
-                        // schedule deallocation. Deferred drop is okay, because `list.delete()`
-                        // can only be called if `T: 'static`.
-                        unsafe {
-                            let p = self.curr;
-                            self.guard.defer_unchecked(move || C::finalize(p.deref()));
-                        }
-
-                        // Move over the removed by only advancing `curr`, not `pred`.
-                        self.curr = succ;
-                        continue;
-                    }
-                    Err(_) => {
-                        // A concurrent thread modified the predecessor node. Since it might've
-                        // been deleted, we need to restart from `head`.
-                        self.pred = self.head;
-                        self.curr = self.head.load(Acquire, self.guard);
-
-                        return Some(Err(IterError::Stalled));
-                    }
-                }
-            }
-
-            // Move one step forward.
-            self.pred = &c.next;
-            self.curr = succ;
-
-            return Some(Ok(unsafe { C::element_of(c) }));
-        }
-
-        // We reached the end of the list.
-        None
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crossbeam_utils::thread;
-    use std::sync::Barrier;
-    use {Collector, Owned};
-
-    impl IsElement<Entry> for Entry {
-        fn entry_of(entry: &Entry) -> &Entry {
-            entry
-        }
-
-        unsafe fn element_of(entry: &Entry) -> &Entry {
-            entry
-        }
-
-        unsafe fn finalize(entry: &Entry) {
-            drop(Box::from_raw(entry as *const Entry as *mut Entry));
-        }
-    }
-
-    /// Checks whether the list retains inserted elements
-    /// and returns them in the correct order.
-    #[test]
-    fn insert() {
-        let collector = Collector::new();
-        let handle = collector.register();
-        let guard = handle.pin();
-
-        let l: List<Entry> = List::new();
-
-        let e1 = Owned::new(Entry::default()).into_shared(&guard);
-        let e2 = Owned::new(Entry::default()).into_shared(&guard);
-        let e3 = Owned::new(Entry::default()).into_shared(&guard);
-
-        unsafe {
-            l.insert(e1, &guard);
-            l.insert(e2, &guard);
-            l.insert(e3, &guard);
-        }
-
-        let mut iter = l.iter(&guard);
-        let maybe_e3 = iter.next();
-        assert!(maybe_e3.is_some());
-        assert!(maybe_e3.unwrap().unwrap() as *const Entry == e3.as_raw());
-        let maybe_e2 = iter.next();
-        assert!(maybe_e2.is_some());
-        assert!(maybe_e2.unwrap().unwrap() as *const Entry == e2.as_raw());
-        let maybe_e1 = iter.next();
-        assert!(maybe_e1.is_some());
-        assert!(maybe_e1.unwrap().unwrap() as *const Entry == e1.as_raw());
-        assert!(iter.next().is_none());
-
-        unsafe {
-            e1.as_ref().unwrap().delete(&guard);
-            e2.as_ref().unwrap().delete(&guard);
-            e3.as_ref().unwrap().delete(&guard);
-        }
-    }
-
-    /// Checks whether elements can be removed from the list and whether
-    /// the correct elements are removed.
-    #[test]
-    fn delete() {
-        let collector = Collector::new();
-        let handle = collector.register();
-        let guard = handle.pin();
-
-        let l: List<Entry> = List::new();
-
-        let e1 = Owned::new(Entry::default()).into_shared(&guard);
-        let e2 = Owned::new(Entry::default()).into_shared(&guard);
-        let e3 = Owned::new(Entry::default()).into_shared(&guard);
-        unsafe {
-            l.insert(e1, &guard);
-            l.insert(e2, &guard);
-            l.insert(e3, &guard);
-            e2.as_ref().unwrap().delete(&guard);
-        }
-
-        let mut iter = l.iter(&guard);
-        let maybe_e3 = iter.next();
-        assert!(maybe_e3.is_some());
-        assert!(maybe_e3.unwrap().unwrap() as *const Entry == e3.as_raw());
-        let maybe_e1 = iter.next();
-        assert!(maybe_e1.is_some());
-        assert!(maybe_e1.unwrap().unwrap() as *const Entry == e1.as_raw());
-        assert!(iter.next().is_none());
-
-        unsafe {
-            e1.as_ref().unwrap().delete(&guard);
-            e3.as_ref().unwrap().delete(&guard);
-        }
-
-        let mut iter = l.iter(&guard);
-        assert!(iter.next().is_none());
-    }
-
-    const THREADS: usize = 8;
-    const ITERS: usize = 512;
-
-    /// Contends the list on insert and delete operations to make sure they can run concurrently.
-    #[test]
-    fn insert_delete_multi() {
-        let collector = Collector::new();
-
-        let l: List<Entry> = List::new();
-        let b = Barrier::new(THREADS);
-
-        thread::scope(|s| {
-            for _ in 0..THREADS {
-                s.spawn(|_| {
-                    b.wait();
-
-                    let handle = collector.register();
-                    let guard: Guard = handle.pin();
-                    let mut v = Vec::with_capacity(ITERS);
-
-                    for _ in 0..ITERS {
-                        let e = Owned::new(Entry::default()).into_shared(&guard);
-                        v.push(e);
-                        unsafe {
-                            l.insert(e, &guard);
-                        }
-                    }
-
-                    for e in v {
-                        unsafe {
-                            e.as_ref().unwrap().delete(&guard);
-                        }
-                    }
-                });
-            }
-        }).unwrap();
-
-        let handle = collector.register();
-        let guard = handle.pin();
-
-        let mut iter = l.iter(&guard);
-        assert!(iter.next().is_none());
-    }
-
-    /// Contends the list on iteration to make sure that it can be iterated over concurrently.
-    #[test]
-    fn iter_multi() {
-        let collector = Collector::new();
-
-        let l: List<Entry> = List::new();
-        let b = Barrier::new(THREADS);
-
-        thread::scope(|s| {
-            for _ in 0..THREADS {
-                s.spawn(|_| {
-                    b.wait();
-
-                    let handle = collector.register();
-                    let guard: Guard = handle.pin();
-                    let mut v = Vec::with_capacity(ITERS);
-
-                    for _ in 0..ITERS {
-                        let e = Owned::new(Entry::default()).into_shared(&guard);
-                        v.push(e);
-                        unsafe {
-                            l.insert(e, &guard);
-                        }
-                    }
-
-                    let mut iter = l.iter(&guard);
-                    for _ in 0..ITERS {
-                        assert!(iter.next().is_some());
-                    }
-
-                    for e in v {
-                        unsafe {
-                            e.as_ref().unwrap().delete(&guard);
-                        }
-                    }
-                });
-            }
-        }).unwrap();
-
-        let handle = collector.register();
-        let guard = handle.pin();
-
-        let mut iter = l.iter(&guard);
-        assert!(iter.next().is_none());
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/sync/mod.rs cargo-0.33.0/vendor/crossbeam-epoch/src/sync/mod.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/sync/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/sync/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-//! Synchronization primitives.
-
-pub mod list;
-pub mod queue;
diff -Nru cargo-0.32.0/vendor/crossbeam-epoch/src/sync/queue.rs cargo-0.33.0/vendor/crossbeam-epoch/src/sync/queue.rs
--- cargo-0.32.0/vendor/crossbeam-epoch/src/sync/queue.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-epoch/src/sync/queue.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,434 +0,0 @@
-//! Michael-Scott lock-free queue.
-//!
-//! Usable with any number of producers and consumers.
-//!
-//! Michael and Scott.  Simple, Fast, and Practical Non-Blocking and Blocking Concurrent Queue
-//! Algorithms.  PODC 1996.  http://dl.acm.org/citation.cfm?id=248106
-
-use core::mem::{self, ManuallyDrop};
-use core::ptr;
-use core::sync::atomic::Ordering::{Acquire, Relaxed, Release};
-
-use crossbeam_utils::CachePadded;
-
-use {unprotected, Atomic, Guard, Owned, Shared};
-
-// The representation here is a singly-linked list, with a sentinel node at the front. In general
-// the `tail` pointer may lag behind the actual tail. Non-sentinel nodes are either all `Data` or
-// all `Blocked` (requests for data from blocked threads).
-#[derive(Debug)]
-pub struct Queue<T> {
-    head: CachePadded<Atomic<Node<T>>>,
-    tail: CachePadded<Atomic<Node<T>>>,
-}
-
-#[derive(Debug)]
-struct Node<T> {
-    /// The slot in which a value of type `T` can be stored.
-    ///
-    /// The type of `data` is `ManuallyDrop<T>` because a `Node<T>` doesn't always contain a `T`.
-    /// For example, the sentinel node in a queue never contains a value: its slot is always empty.
-    /// Other nodes start their life with a push operation and contain a value until it gets popped
-    /// out. After that such empty nodes get added to the collector for destruction.
-    data: ManuallyDrop<T>,
-
-    next: Atomic<Node<T>>,
-}
-
-// Any particular `T` should never be accessed concurrently, so no need for `Sync`.
-unsafe impl<T: Send> Sync for Queue<T> {}
-unsafe impl<T: Send> Send for Queue<T> {}
-
-impl<T> Queue<T> {
-    /// Create a new, empty queue.
-    pub fn new() -> Queue<T> {
-        let q = Queue {
-            head: CachePadded::new(Atomic::null()),
-            tail: CachePadded::new(Atomic::null()),
-        };
-        let sentinel = Owned::new(Node {
-            data: unsafe { mem::uninitialized() },
-            next: Atomic::null(),
-        });
-        unsafe {
-            let guard = &unprotected();
-            let sentinel = sentinel.into_shared(guard);
-            q.head.store(sentinel, Relaxed);
-            q.tail.store(sentinel, Relaxed);
-            q
-        }
-    }
-
-    /// Attempts to atomically place `n` into the `next` pointer of `onto`, and returns `true` on
-    /// success. The queue's `tail` pointer may be updated.
-    #[inline(always)]
-    fn push_internal(&self, onto: Shared<Node<T>>, new: Shared<Node<T>>, guard: &Guard) -> bool {
-        // is `onto` the actual tail?
-        let o = unsafe { onto.deref() };
-        let next = o.next.load(Acquire, guard);
-        if unsafe { next.as_ref().is_some() } {
-            // if not, try to "help" by moving the tail pointer forward
-            let _ = self.tail.compare_and_set(onto, next, Release, guard);
-            false
-        } else {
-            // looks like the actual tail; attempt to link in `n`
-            let result = o
-                .next
-                .compare_and_set(Shared::null(), new, Release, guard)
-                .is_ok();
-            if result {
-                // try to move the tail pointer forward
-                let _ = self.tail.compare_and_set(onto, new, Release, guard);
-            }
-            result
-        }
-    }
-
-    /// Adds `t` to the back of the queue, possibly waking up threads blocked on `pop`.
-    pub fn push(&self, t: T, guard: &Guard) {
-        let new = Owned::new(Node {
-            data: ManuallyDrop::new(t),
-            next: Atomic::null(),
-        });
-        let new = Owned::into_shared(new, guard);
-
-        loop {
-            // We push onto the tail, so we'll start optimistically by looking there first.
-            let tail = self.tail.load(Acquire, guard);
-
-            // Attempt to push onto the `tail` snapshot; fails if `tail.next` has changed.
-            if self.push_internal(tail, new, guard) {
-                break;
-            }
-        }
-    }
-
-    /// Attempts to pop a data node. `Ok(None)` if queue is empty; `Err(())` if lost race to pop.
-    #[inline(always)]
-    fn pop_internal(&self, guard: &Guard) -> Result<Option<T>, ()> {
-        let head = self.head.load(Acquire, guard);
-        let h = unsafe { head.deref() };
-        let next = h.next.load(Acquire, guard);
-        match unsafe { next.as_ref() } {
-            Some(n) => unsafe {
-                self.head
-                    .compare_and_set(head, next, Release, guard)
-                    .map(|_| {
-                        guard.defer_destroy(head);
-                        Some(ManuallyDrop::into_inner(ptr::read(&n.data)))
-                    }).map_err(|_| ())
-            },
-            None => Ok(None),
-        }
-    }
-
-    /// Attempts to pop a data node, if the data satisfies the given condition. `Ok(None)` if queue
-    /// is empty or the data does not satisfy the condition; `Err(())` if lost race to pop.
-    #[inline(always)]
-    fn pop_if_internal<F>(&self, condition: F, guard: &Guard) -> Result<Option<T>, ()>
-    where
-        T: Sync,
-        F: Fn(&T) -> bool,
-    {
-        let head = self.head.load(Acquire, guard);
-        let h = unsafe { head.deref() };
-        let next = h.next.load(Acquire, guard);
-        match unsafe { next.as_ref() } {
-            Some(n) if condition(&n.data) => unsafe {
-                self.head
-                    .compare_and_set(head, next, Release, guard)
-                    .map(|_| {
-                        guard.defer_destroy(head);
-                        Some(ManuallyDrop::into_inner(ptr::read(&n.data)))
-                    }).map_err(|_| ())
-            },
-            None | Some(_) => Ok(None),
-        }
-    }
-
-    /// Attempts to dequeue from the front.
-    ///
-    /// Returns `None` if the queue is observed to be empty.
-    pub fn try_pop(&self, guard: &Guard) -> Option<T> {
-        loop {
-            if let Ok(head) = self.pop_internal(guard) {
-                return head;
-            }
-        }
-    }
-
-    /// Attempts to dequeue from the front, if the item satisfies the given condition.
-    ///
-    /// Returns `None` if the queue is observed to be empty, or the head does not satisfy the given
-    /// condition.
-    pub fn try_pop_if<F>(&self, condition: F, guard: &Guard) -> Option<T>
-    where
-        T: Sync,
-        F: Fn(&T) -> bool,
-    {
-        loop {
-            if let Ok(head) = self.pop_if_internal(&condition, guard) {
-                return head;
-            }
-        }
-    }
-}
-
-impl<T> Drop for Queue<T> {
-    fn drop(&mut self) {
-        unsafe {
-            let guard = &unprotected();
-
-            while let Some(_) = self.try_pop(guard) {}
-
-            // Destroy the remaining sentinel node.
-            let sentinel = self.head.load(Relaxed, guard);
-            drop(sentinel.into_owned());
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crossbeam_utils::thread;
-    use pin;
-
-    struct Queue<T> {
-        queue: super::Queue<T>,
-    }
-
-    impl<T> Queue<T> {
-        pub fn new() -> Queue<T> {
-            Queue {
-                queue: super::Queue::new(),
-            }
-        }
-
-        pub fn push(&self, t: T) {
-            let guard = &pin();
-            self.queue.push(t, guard);
-        }
-
-        pub fn is_empty(&self) -> bool {
-            let guard = &pin();
-            let head = self.queue.head.load(Acquire, guard);
-            let h = unsafe { head.deref() };
-            h.next.load(Acquire, guard).is_null()
-        }
-
-        pub fn try_pop(&self) -> Option<T> {
-            let guard = &pin();
-            self.queue.try_pop(guard)
-        }
-
-        pub fn pop(&self) -> T {
-            loop {
-                match self.try_pop() {
-                    None => continue,
-                    Some(t) => return t,
-                }
-            }
-        }
-    }
-
-    const CONC_COUNT: i64 = 1000000;
-
-    #[test]
-    fn push_try_pop_1() {
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-        q.push(37);
-        assert!(!q.is_empty());
-        assert_eq!(q.try_pop(), Some(37));
-        assert!(q.is_empty());
-    }
-
-    #[test]
-    fn push_try_pop_2() {
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-        q.push(37);
-        q.push(48);
-        assert_eq!(q.try_pop(), Some(37));
-        assert!(!q.is_empty());
-        assert_eq!(q.try_pop(), Some(48));
-        assert!(q.is_empty());
-    }
-
-    #[test]
-    fn push_try_pop_many_seq() {
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-        for i in 0..200 {
-            q.push(i)
-        }
-        assert!(!q.is_empty());
-        for i in 0..200 {
-            assert_eq!(q.try_pop(), Some(i));
-        }
-        assert!(q.is_empty());
-    }
-
-    #[test]
-    fn push_pop_1() {
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-        q.push(37);
-        assert!(!q.is_empty());
-        assert_eq!(q.pop(), 37);
-        assert!(q.is_empty());
-    }
-
-    #[test]
-    fn push_pop_2() {
-        let q: Queue<i64> = Queue::new();
-        q.push(37);
-        q.push(48);
-        assert_eq!(q.pop(), 37);
-        assert_eq!(q.pop(), 48);
-    }
-
-    #[test]
-    fn push_pop_many_seq() {
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-        for i in 0..200 {
-            q.push(i)
-        }
-        assert!(!q.is_empty());
-        for i in 0..200 {
-            assert_eq!(q.pop(), i);
-        }
-        assert!(q.is_empty());
-    }
-
-    #[test]
-    fn push_try_pop_many_spsc() {
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-
-        thread::scope(|scope| {
-            scope.spawn(|_| {
-                let mut next = 0;
-
-                while next < CONC_COUNT {
-                    if let Some(elem) = q.try_pop() {
-                        assert_eq!(elem, next);
-                        next += 1;
-                    }
-                }
-            });
-
-            for i in 0..CONC_COUNT {
-                q.push(i)
-            }
-        }).unwrap();
-    }
-
-    #[test]
-    fn push_try_pop_many_spmc() {
-        fn recv(_t: i32, q: &Queue<i64>) {
-            let mut cur = -1;
-            for _i in 0..CONC_COUNT {
-                if let Some(elem) = q.try_pop() {
-                    assert!(elem > cur);
-                    cur = elem;
-
-                    if cur == CONC_COUNT - 1 {
-                        break;
-                    }
-                }
-            }
-        }
-
-        let q: Queue<i64> = Queue::new();
-        assert!(q.is_empty());
-        thread::scope(|scope| {
-            for i in 0..3 {
-                scope.spawn(|_| recv(i, &q));
-            }
-
-            scope.spawn(|_| {
-                for i in 0..CONC_COUNT {
-                    q.push(i);
-                }
-            });
-        }).unwrap();
-    }
-
-    #[test]
-    fn push_try_pop_many_mpmc() {
-        enum LR {
-            Left(i64),
-            Right(i64),
-        }
-
-        let q: Queue<LR> = Queue::new();
-        assert!(q.is_empty());
-
-        thread::scope(|scope| {
-            for _t in 0..2 {
-                scope.spawn(|_| {
-                    for i in CONC_COUNT - 1..CONC_COUNT {
-                        q.push(LR::Left(i))
-                    }
-                });
-                scope.spawn(|_| {
-                    for i in CONC_COUNT - 1..CONC_COUNT {
-                        q.push(LR::Right(i))
-                    }
-                });
-                scope.spawn(|_| {
-                    let mut vl = vec![];
-                    let mut vr = vec![];
-                    for _i in 0..CONC_COUNT {
-                        match q.try_pop() {
-                            Some(LR::Left(x)) => vl.push(x),
-                            Some(LR::Right(x)) => vr.push(x),
-                            _ => {}
-                        }
-                    }
-
-                    let mut vl2 = vl.clone();
-                    let mut vr2 = vr.clone();
-                    vl2.sort();
-                    vr2.sort();
-
-                    assert_eq!(vl, vl2);
-                    assert_eq!(vr, vr2);
-                });
-            }
-        }).unwrap();
-    }
-
-    #[test]
-    fn push_pop_many_spsc() {
-        let q: Queue<i64> = Queue::new();
-
-        thread::scope(|scope| {
-            scope.spawn(|_| {
-                let mut next = 0;
-                while next < CONC_COUNT {
-                    assert_eq!(q.pop(), next);
-                    next += 1;
-                }
-            });
-
-            for i in 0..CONC_COUNT {
-                q.push(i)
-            }
-        }).unwrap();
-        assert!(q.is_empty());
-    }
-
-    #[test]
-    fn is_empty_dont_pop() {
-        let q: Queue<i64> = Queue::new();
-        q.push(20);
-        q.push(20);
-        assert!(!q.is_empty());
-        assert!(!q.is_empty());
-        assert!(q.try_pop().is_some());
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/benches/atomic_cell.rs cargo-0.33.0/vendor/crossbeam-utils/benches/atomic_cell.rs
--- cargo-0.32.0/vendor/crossbeam-utils/benches/atomic_cell.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/benches/atomic_cell.rs	2019-02-06 04:11:58.000000000 +0000
@@ -51,18 +51,20 @@
 
     thread::scope(|scope| {
         for _ in 0..THREADS {
-            scope.spawn(|| loop {
-                start.wait();
-
-                let mut sum = 0;
-                for _ in 0..STEPS {
-                    sum += a.load();
-                }
-                test::black_box(sum);
-
-                end.wait();
-                if exit.load() {
-                    break;
+            scope.spawn(|_| {
+                loop {
+                    start.wait();
+
+                    let mut sum = 0;
+                    for _ in 0..STEPS {
+                        sum += a.load();
+                    }
+                    test::black_box(sum);
+
+                    end.wait();
+                    if exit.load() {
+                        break;
+                    }
                 }
             });
         }
@@ -124,18 +126,20 @@
 
     thread::scope(|scope| {
         for _ in 0..THREADS {
-            scope.spawn(|| loop {
-                start.wait();
-
-                let mut sum = 0;
-                for _ in 0..STEPS {
-                    sum += a.load();
-                }
-                test::black_box(sum);
-
-                end.wait();
-                if exit.load() {
-                    break;
+            scope.spawn(|_| {
+                loop {
+                    start.wait();
+
+                    let mut sum = 0;
+                    for _ in 0..STEPS {
+                        sum += a.load();
+                    }
+                    test::black_box(sum);
+
+                    end.wait();
+                    if exit.load() {
+                        break;
+                    }
                 }
             });
         }
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/.cargo-checksum.json cargo-0.33.0/vendor/crossbeam-utils/.cargo-checksum.json
--- cargo-0.32.0/vendor/crossbeam-utils/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"}
\ No newline at end of file
+{"files":{},"package":"f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/Cargo.toml cargo-0.33.0/vendor/crossbeam-utils/Cargo.toml
--- cargo-0.32.0/vendor/crossbeam-utils/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,20 +12,26 @@
 
 [package]
 name = "crossbeam-utils"
-version = "0.6.3"
+version = "0.6.5"
 authors = ["The Crossbeam Project Developers"]
 description = "Utilities for concurrent programming"
-homepage = "https://github.com/crossbeam-rs/crossbeam"
+homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
 documentation = "https://docs.rs/crossbeam-utils"
 readme = "README.md"
 keywords = ["scoped", "thread", "atomic", "cache"]
-categories = ["algorithms", "concurrency", "data-structures"]
+categories = ["algorithms", "concurrency", "data-structures", "no-std"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/crossbeam-rs/crossbeam"
 [dependencies.cfg-if]
 version = "0.1"
 
+[dependencies.lazy_static]
+version = "1.1.0"
+optional = true
+[dev-dependencies.rand]
+version = "0.6"
+
 [features]
 default = ["std"]
 nightly = []
-std = []
+std = ["lazy_static"]
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/.cargo_vcs_info.json cargo-0.33.0/vendor/crossbeam-utils/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/crossbeam-utils/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "6a1b183293f1b6da6d6ea0dac3178c52e6d93abf"
-  }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/CHANGELOG.md cargo-0.33.0/vendor/crossbeam-utils/CHANGELOG.md
--- cargo-0.32.0/vendor/crossbeam-utils/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,13 @@
+# Version 0.6.5
+
+- Rename `Backoff::is_complete()` to `Backoff::is_completed()`.
+
+# Version 0.6.4
+
+- Add `WaitGroup`, `ShardedLock`, and `Backoff`.
+- Add `fetch_*` methods for `AtomicCell<i128>` and `AtomicCell<u128>`.
+- Expand documentation.
+
 # Version 0.6.3
 
 - Add `AtomicCell`.
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/README.md cargo-0.33.0/vendor/crossbeam-utils/README.md
--- cargo-0.32.0/vendor/crossbeam-utils/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -11,11 +11,35 @@
 [![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
 https://www.rust-lang.org)
 
-This crate provides miscellaneous utilities for concurrent programming:
+This crate provides miscellaneous tools for concurrent programming:
 
-* `AtomicConsume` allows reading from primitive atomic types with "consume" ordering.
-* `CachePadded<T>` pads and aligns a value to the length of a cache line.
-* `scope()` can spawn threads that borrow local variables from the stack. 
+#### Atomics
+
+* [`AtomicCell`], a thread-safe mutable memory location.<sup>(\*)</sup>
+* [`AtomicConsume`], for reading from primitive atomic types with "consume" ordering.<sup>(\*)</sup>
+
+#### Thread synchronization
+
+* [`Parker`], a thread parking primitive.
+* [`ShardedLock`], a sharded reader-writer lock with fast concurrent reads.
+* [`WaitGroup`], for synchronizing the beginning or end of some computation.
+
+#### Utilities
+
+* [`Backoff`], for exponential backoff in spin loops.<sup>(\*)</sup>
+* [`CachePadded`], for padding and aligning a value to the length of a cache line.<sup>(\*)</sup>
+* [`scope`], for spawning threads that borrow local variables from the stack.
+
+*Features marked with <sup>(\*)</sup> can be used in `no_std` environments.*
+
+[`AtomicCell`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/atomic/struct.AtomicCell.html
+[`AtomicConsume`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/atomic/trait.AtomicConsume.html
+[`Parker`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/sync/struct.Parker.html
+[`ShardedLock`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/sync/struct.ShardedLock.html
+[`WaitGroup`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/sync/struct.WaitGroup.html
+[`Backoff`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/struct.Backoff.html
+[`CachePadded`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/struct.CachePadded.html
+[`scope`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/thread/fn.scope.html
 
 ## Usage
 
@@ -32,15 +56,6 @@
 extern crate crossbeam_utils;
 ```
 
-## Compatibility
-
-The minimum supported Rust version is 1.26.
-
-Features available in `no_std` environments:
-
-* `AtomicConsume`
-* `CachePadded<T>`
-
 ## License
 
 Licensed under either of
@@ -50,7 +65,7 @@
 
 at your option.
 
-### Contribution
+#### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/atomic/atomic_cell.rs cargo-0.33.0/vendor/crossbeam-utils/src/atomic/atomic_cell.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/atomic/atomic_cell.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/atomic/atomic_cell.rs	2019-02-06 04:11:58.000000000 +0000
@@ -5,6 +5,8 @@
 use core::slice;
 use core::sync::atomic::{self, AtomicBool, AtomicUsize, Ordering};
 
+use Backoff;
+
 /// A thread-safe mutable memory location.
 ///
 /// This type is equivalent to [`Cell`], except it can also be shared among multiple threads.
@@ -464,18 +466,24 @@
             }
         }
     };
+    ($t:ty, $size:tt, $atomic:ty, $example:tt) => {
+        #[cfg(target_has_atomic = $size)]
+        impl_arithmetic!($t, $atomic, $example);
+    };
 }
 
 cfg_if! {
     if #[cfg(feature = "nightly")] {
-        impl_arithmetic!(u8, atomic::AtomicU8, "let a = AtomicCell::new(7u8);");
-        impl_arithmetic!(i8, atomic::AtomicI8, "let a = AtomicCell::new(7i8);");
-        impl_arithmetic!(u16, atomic::AtomicU16, "let a = AtomicCell::new(7u16);");
-        impl_arithmetic!(i16, atomic::AtomicI16, "let a = AtomicCell::new(7i16);");
-        impl_arithmetic!(u32, atomic::AtomicU32, "let a = AtomicCell::new(7u32);");
-        impl_arithmetic!(i32, atomic::AtomicI32, "let a = AtomicCell::new(7i32);");
-        impl_arithmetic!(u64, atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
-        impl_arithmetic!(i64, atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
+        impl_arithmetic!(u8, "8", atomic::AtomicU8, "let a = AtomicCell::new(7u8);");
+        impl_arithmetic!(i8, "8", atomic::AtomicI8, "let a = AtomicCell::new(7i8);");
+        impl_arithmetic!(u16, "16", atomic::AtomicU16, "let a = AtomicCell::new(7u16);");
+        impl_arithmetic!(i16, "16", atomic::AtomicI16, "let a = AtomicCell::new(7i16);");
+        impl_arithmetic!(u32, "32", atomic::AtomicU32, "let a = AtomicCell::new(7u32);");
+        impl_arithmetic!(i32, "32", atomic::AtomicI32, "let a = AtomicCell::new(7i32);");
+        impl_arithmetic!(u64, "64", atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
+        impl_arithmetic!(i64, "64", atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
+        impl_arithmetic!(u128, "let a = AtomicCell::new(7u128);");
+        impl_arithmetic!(i128, "let a = AtomicCell::new(7i128);");
     } else {
         impl_arithmetic!(u8, "let a = AtomicCell::new(7u8);");
         impl_arithmetic!(i8, "let a = AtomicCell::new(7i8);");
@@ -485,6 +493,8 @@
         impl_arithmetic!(i32, "let a = AtomicCell::new(7i32);");
         impl_arithmetic!(u64, "let a = AtomicCell::new(7u64);");
         impl_arithmetic!(i64, "let a = AtomicCell::new(7i64);");
+        impl_arithmetic!(u128, "let a = AtomicCell::new(7u128);");
+        impl_arithmetic!(i128, "let a = AtomicCell::new(7i128);");
     }
 }
 
@@ -629,8 +639,7 @@
     /// Grabs the lock for writing.
     #[inline]
     fn write(&'static self) -> WriteGuard {
-        let mut step = 0usize;
-
+        let backoff = Backoff::new();
         loop {
             let previous = self.state.swap(1, Ordering::Acquire);
 
@@ -643,17 +652,7 @@
                 };
             }
 
-            if step < 10 {
-                atomic::spin_loop_hint();
-            } else {
-                #[cfg(not(feature = "std"))]
-                atomic::spin_loop_hint();
-
-                #[cfg(feature = "std")]
-                ::std::thread::yield_now();
-            }
-
-            step = step.wrapping_add(1);
+            backoff.snooze();
         }
     }
 }
@@ -696,7 +695,28 @@
 #[inline]
 #[must_use]
 fn lock(addr: usize) -> &'static Lock {
-    // The number of locks is prime.
+    // The number of locks is a prime number because we want to make sure `addr % LEN` gets
+    // dispersed across all locks.
+    //
+    // Note that addresses are always aligned to some power of 2, depending on type `T` in
+    // `AtomicCell<T>`. If `LEN` was an even number, then `addr % LEN` would be an even number,
+    // too, which means only half of the locks would get utilized!
+    //
+    // It is also possible for addresses to accidentally get aligned to a number that is not a
+    // power of 2. Consider this example:
+    //
+    // ```
+    // #[repr(C)]
+    // struct Foo {
+    //     a: AtomicCell<u8>,
+    //     b: u8,
+    //     c: u8,
+    // }
+    // ```
+    //
+    // Now, if we have a slice of type `&[Foo]`, it is possible that field `a` in all items gets
+    // stored at addresses that are multiples of 3. It'd be too bad if `LEN` was divisible by 3.
+    // In order to protect from such cases, we simply choose a large prime number for `LEN`.
     const LEN: usize = 97;
 
     const L: Lock = Lock {
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/atomic/mod.rs cargo-0.33.0/vendor/crossbeam-utils/src/atomic/mod.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/atomic/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/atomic/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,4 +1,4 @@
-//! Additional utilities for atomics.
+//! Atomic types.
 
 mod atomic_cell;
 mod consume;
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/backoff.rs cargo-0.33.0/vendor/crossbeam-utils/src/backoff.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/backoff.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/backoff.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,294 @@
+use core::cell::Cell;
+use core::fmt;
+use core::sync::atomic;
+
+const SPIN_LIMIT: u32 = 6;
+const YIELD_LIMIT: u32 = 10;
+
+/// Performs exponential backoff in spin loops.
+///
+/// Backing off in spin loops reduces contention and improves overall performance.
+///
+/// This primitive can execute *YIELD* and *PAUSE* instructions, yield the current thread to the OS
+/// scheduler, and tell when is a good time to block the thread using a different synchronization
+/// mechanism. Each step of the back off procedure takes roughly twice as long as the previous
+/// step.
+///
+/// # Examples
+///
+/// Backing off in a lock-free loop:
+///
+/// ```
+/// use crossbeam_utils::Backoff;
+/// use std::sync::atomic::AtomicUsize;
+/// use std::sync::atomic::Ordering::SeqCst;
+///
+/// fn fetch_mul(a: &AtomicUsize, b: usize) -> usize {
+///     let backoff = Backoff::new();
+///     loop {
+///         let val = a.load(SeqCst);
+///         if a.compare_and_swap(val, val.wrapping_mul(b), SeqCst) == val {
+///             return val;
+///         }
+///         backoff.spin();
+///     }
+/// }
+/// ```
+///
+/// Waiting for an [`AtomicBool`] to become `true`:
+///
+/// ```
+/// use crossbeam_utils::Backoff;
+/// use std::sync::atomic::AtomicBool;
+/// use std::sync::atomic::Ordering::SeqCst;
+///
+/// fn spin_wait(ready: &AtomicBool) {
+///     let backoff = Backoff::new();
+///     while !ready.load(SeqCst) {
+///         backoff.snooze();
+///     }
+/// }
+/// ```
+///
+/// Waiting for an [`AtomicBool`] to become `true` and parking the thread after a long wait.
+/// Note that whoever sets the atomic variable to `true` must notify the parked thread by calling
+/// [`unpark()`]:
+///
+/// ```
+/// use crossbeam_utils::Backoff;
+/// use std::sync::atomic::AtomicBool;
+/// use std::sync::atomic::Ordering::SeqCst;
+/// use std::thread;
+///
+/// fn blocking_wait(ready: &AtomicBool) {
+///     let backoff = Backoff::new();
+///     while !ready.load(SeqCst) {
+///         if backoff.is_completed() {
+///             thread::park();
+///         } else {
+///             backoff.snooze();
+///         }
+///     }
+/// }
+/// ```
+///
+/// [`is_completed`]: struct.Backoff.html#method.is_completed
+/// [`std::thread::park()`]: https://doc.rust-lang.org/std/thread/fn.park.html
+/// [`Condvar`]: https://doc.rust-lang.org/std/sync/struct.Condvar.html
+/// [`AtomicBool`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicBool.html
+/// [`unpark()`]: https://doc.rust-lang.org/std/thread/struct.Thread.html#method.unpark
+pub struct Backoff {
+    step: Cell<u32>,
+}
+
+impl Backoff {
+    /// Creates a new `Backoff`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    ///
+    /// let backoff = Backoff::new();
+    /// ```
+    #[inline]
+    pub fn new() -> Self {
+        Backoff {
+            step: Cell::new(0),
+        }
+    }
+
+    /// Resets the `Backoff`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    ///
+    /// let backoff = Backoff::new();
+    /// backoff.reset();
+    /// ```
+    #[inline]
+    pub fn reset(&self) {
+        self.step.set(0);
+    }
+
+    /// Backs off in a lock-free loop.
+    ///
+    /// This method should be used when we need to retry an operation because another thread made
+    /// progress.
+    ///
+    /// The processor may yield using the *YIELD* or *PAUSE* instruction.
+    ///
+    /// # Examples
+    ///
+    /// Backing off in a lock-free loop:
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    /// use std::sync::atomic::AtomicUsize;
+    /// use std::sync::atomic::Ordering::SeqCst;
+    ///
+    /// fn fetch_mul(a: &AtomicUsize, b: usize) -> usize {
+    ///     let backoff = Backoff::new();
+    ///     loop {
+    ///         let val = a.load(SeqCst);
+    ///         if a.compare_and_swap(val, val.wrapping_mul(b), SeqCst) == val {
+    ///             return val;
+    ///         }
+    ///         backoff.spin();
+    ///     }
+    /// }
+    ///
+    /// let a = AtomicUsize::new(7);
+    /// assert_eq!(fetch_mul(&a, 8), 7);
+    /// assert_eq!(a.load(SeqCst), 56);
+    /// ```
+    #[inline]
+    pub fn spin(&self) {
+        for _ in 0..1 << self.step.get().min(SPIN_LIMIT) {
+            atomic::spin_loop_hint();
+        }
+
+        if self.step.get() <= SPIN_LIMIT {
+            self.step.set(self.step.get() + 1);
+        }
+    }
+
+    /// Backs off in a blocking loop.
+    ///
+    /// This method should be used when we need to wait for another thread to make progress.
+    ///
+    /// The processor may yield using the *YIELD* or *PAUSE* instruction and the current thread
+    /// may yield by giving up a timeslice to the OS scheduler.
+    ///
+    /// In `#[no_std]` environments, this method is equivalent to [`spin`].
+    ///
+    /// If possible, use [`is_completed`] to check when it is advised to stop using backoff and
+    /// block the current thread using a different synchronization mechanism instead.
+    ///
+    /// [`spin`]: struct.Backoff.html#method.spin
+    /// [`is_completed`]: struct.Backoff.html#method.is_completed
+    ///
+    /// # Examples
+    ///
+    /// Waiting for an [`AtomicBool`] to become `true`:
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    /// use std::sync::Arc;
+    /// use std::sync::atomic::AtomicBool;
+    /// use std::sync::atomic::Ordering::SeqCst;
+    /// use std::thread;
+    /// use std::time::Duration;
+    ///
+    /// fn spin_wait(ready: &AtomicBool) {
+    ///     let backoff = Backoff::new();
+    ///     while !ready.load(SeqCst) {
+    ///         backoff.snooze();
+    ///     }
+    /// }
+    ///
+    /// let ready = Arc::new(AtomicBool::new(false));
+    /// let ready2 = ready.clone();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_millis(100));
+    ///     ready2.store(true, SeqCst);
+    /// });
+    ///
+    /// assert_eq!(ready.load(SeqCst), false);
+    /// spin_wait(&ready);
+    /// assert_eq!(ready.load(SeqCst), true);
+    /// ```
+    ///
+    /// [`AtomicBool`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicBool.html
+    #[inline]
+    pub fn snooze(&self) {
+        if self.step.get() <= SPIN_LIMIT {
+            for _ in 0..1 << self.step.get() {
+                atomic::spin_loop_hint();
+            }
+        } else {
+            #[cfg(not(feature = "std"))]
+            for _ in 0..1 << self.step.get() {
+                atomic::spin_loop_hint();
+            }
+
+            #[cfg(feature = "std")]
+            ::std::thread::yield_now();
+        }
+
+        if self.step.get() <= YIELD_LIMIT {
+            self.step.set(self.step.get() + 1);
+        }
+    }
+
+    /// Returns `true` if exponential backoff has completed and blocking the thread is advised.
+    ///
+    /// # Examples
+    ///
+    /// Waiting for an [`AtomicBool`] to become `true` and parking the thread after a long wait:
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    /// use std::sync::Arc;
+    /// use std::sync::atomic::AtomicBool;
+    /// use std::sync::atomic::Ordering::SeqCst;
+    /// use std::thread;
+    /// use std::time::Duration;
+    ///
+    /// fn blocking_wait(ready: &AtomicBool) {
+    ///     let backoff = Backoff::new();
+    ///     while !ready.load(SeqCst) {
+    ///         if backoff.is_completed() {
+    ///             thread::park();
+    ///         } else {
+    ///             backoff.snooze();
+    ///         }
+    ///     }
+    /// }
+    ///
+    /// let ready = Arc::new(AtomicBool::new(false));
+    /// let ready2 = ready.clone();
+    /// let waiter = thread::current();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_millis(100));
+    ///     ready2.store(true, SeqCst);
+    ///     waiter.unpark();
+    /// });
+    ///
+    /// assert_eq!(ready.load(SeqCst), false);
+    /// blocking_wait(&ready);
+    /// assert_eq!(ready.load(SeqCst), true);
+    /// ```
+    ///
+    /// [`AtomicBool`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicBool.html
+    #[inline]
+    pub fn is_completed(&self) -> bool {
+        self.step.get() > YIELD_LIMIT
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(note = "use `is_completed` instead")]
+    pub fn is_complete(&self) -> bool {
+        self.is_completed()
+    }
+}
+
+impl fmt::Debug for Backoff {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("Backoff")
+            .field("step", &self.step)
+            .field("is_completed", &self.is_completed())
+            .finish()
+    }
+}
+
+impl Default for Backoff {
+    fn default() -> Backoff {
+        Backoff::new()
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/lib.rs cargo-0.33.0/vendor/crossbeam-utils/src/lib.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,36 @@
-//! Utilities for concurrent programming.
+//! Miscellaneous tools for concurrent programming.
+//!
+//! ## Atomics
+//!
+//! * [`AtomicCell`], a thread-safe mutable memory location.
+//! * [`AtomicConsume`], for reading from primitive atomic types with "consume" ordering.
+//!
+//! ## Thread synchronization
+//!
+//! * [`Parker`], a thread parking primitive.
+//! * [`ShardedLock`], a sharded reader-writer lock with fast concurrent reads.
+//! * [`WaitGroup`], for synchronizing the beginning or end of some computation.
+//!
+//! ## Utilities
+//!
+//! * [`Backoff`], for exponential backoff in spin loops.
+//! * [`CachePadded`], for padding and aligning a value to the length of a cache line.
+//! * [`scope`], for spawning threads that borrow local variables from the stack.
+//!
+//! [`AtomicCell`]: atomic/struct.AtomicCell.html
+//! [`AtomicConsume`]: atomic/trait.AtomicConsume.html
+//! [`Parker`]: sync/struct.Parker.html
+//! [`ShardedLock`]: sync/struct.ShardedLock.html
+//! [`WaitGroup`]: sync/struct.WaitGroup.html
+//! [`Backoff`]: struct.Backoff.html
+//! [`CachePadded`]: struct.CachePadded.html
+//! [`scope`]: thread/fn.scope.html
 
 #![warn(missing_docs)]
 #![warn(missing_debug_implementations)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(alloc))]
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
-#![cfg_attr(feature = "nightly", feature(integer_atomics))]
 
 #[macro_use]
 extern crate cfg_if;
@@ -28,8 +53,14 @@
 mod cache_padded;
 pub use cache_padded::CachePadded;
 
+mod backoff;
+pub use backoff::Backoff;
+
 cfg_if! {
     if #[cfg(feature = "std")] {
+        #[macro_use]
+        extern crate lazy_static;
+
         pub mod sync;
         pub mod thread;
     }
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/sync/mod.rs cargo-0.33.0/vendor/crossbeam-utils/src/sync/mod.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/sync/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/sync/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,17 @@
-//! Synchronization tools.
+//! Thread synchronization primitives.
+//!
+//! * [`Parker`], a thread parking primitive.
+//! * [`ShardedLock`], a sharded reader-writer lock with fast concurrent reads.
+//! * [`WaitGroup`], for synchronizing the beginning or end of some computation.
+//!
+//! [`Parker`]: struct.Parker.html
+//! [`ShardedLock`]: struct.ShardedLock.html
+//! [`WaitGroup`]: struct.WaitGroup.html
 
 mod parker;
+mod sharded_lock;
+mod wait_group;
 
+pub use self::sharded_lock::{ShardedLock, ShardedLockReadGuard, ShardedLockWriteGuard};
 pub use self::parker::{Parker, Unparker};
+pub use self::wait_group::WaitGroup;
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/sync/sharded_lock.rs cargo-0.33.0/vendor/crossbeam-utils/src/sync/sharded_lock.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/sync/sharded_lock.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/sync/sharded_lock.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,600 @@
+use std::cell::UnsafeCell;
+use std::collections::HashMap;
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem;
+use std::ops::{Deref, DerefMut};
+use std::panic::{RefUnwindSafe, UnwindSafe};
+use std::sync::{Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard};
+use std::sync::{LockResult, PoisonError, TryLockError, TryLockResult};
+use std::thread::{self, ThreadId};
+
+use CachePadded;
+
+/// The number of shards per sharded lock. Must be a power of two.
+const NUM_SHARDS: usize = 8;
+
+/// A shard containing a single reader-writer lock.
+struct Shard {
+    /// The inner reader-writer lock.
+    lock: RwLock<()>,
+
+    /// The write-guard keeping this shard locked.
+    ///
+    /// Write operations will lock each shard and store the guard here. These guards get dropped at
+    /// the same time the big guard is dropped.
+    write_guard: UnsafeCell<Option<RwLockWriteGuard<'static, ()>>>,
+}
+
+/// A sharded reader-writer lock.
+///
+/// This lock is equivalent to [`RwLock`], except read operations are faster and write operations
+/// are slower.
+///
+/// A `ShardedLock` is internally made of a list of *shards*, each being a [`RwLock`] occupying a
+/// single cache line. Read operations will pick one of the shards depending on the current thread
+/// and lock it. Write operations need to lock all shards in succession.
+///
+/// By splitting the lock into shards, concurrent read operations will in most cases choose
+/// different shards and thus update different cache lines, which is good for scalability. However,
+/// write operations need to do more work and are therefore slower than usual.
+///
+/// The priority policy of the lock is dependent on the underlying operating system's
+/// implementation, and this type does not guarantee that any particular policy will be used.
+///
+/// # Poisoning
+///
+/// A `ShardedLock`, like [`RwLock`], will become poisoned on a panic. Note that it may only be
+/// poisoned if a panic occurs while a write operation is in progress. If a panic occurs in any
+/// read operation, the lock will not be poisoned.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::sync::ShardedLock;
+///
+/// let lock = ShardedLock::new(5);
+///
+/// // Any number of read locks can be held at once.
+/// {
+///     let r1 = lock.read().unwrap();
+///     let r2 = lock.read().unwrap();
+///     assert_eq!(*r1, 5);
+///     assert_eq!(*r2, 5);
+/// } // Read locks are dropped at this point.
+///
+/// // However, only one write lock may be held.
+/// {
+///     let mut w = lock.write().unwrap();
+///     *w += 1;
+///     assert_eq!(*w, 6);
+/// } // Write lock is dropped here.
+/// ```
+///
+/// [`RwLock`]: https://doc.rust-lang.org/std/sync/struct.RwLock.html
+pub struct ShardedLock<T: ?Sized> {
+    /// A list of locks protecting the internal data.
+    shards: Box<[CachePadded<Shard>]>,
+
+    /// The internal data.
+    value: UnsafeCell<T>,
+}
+
+unsafe impl<T: ?Sized + Send> Send for ShardedLock<T> {}
+unsafe impl<T: ?Sized + Send + Sync> Sync for ShardedLock<T> {}
+
+impl<T: ?Sized> UnwindSafe for ShardedLock<T> {}
+impl<T: ?Sized> RefUnwindSafe for ShardedLock<T> {}
+
+impl<T> ShardedLock<T> {
+    /// Creates a new sharded reader-writer lock.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(5);
+    /// ```
+    pub fn new(value: T) -> ShardedLock<T> {
+        ShardedLock {
+            shards: (0..NUM_SHARDS)
+                .map(|_| CachePadded::new(Shard {
+                    lock: RwLock::new(()),
+                    write_guard: UnsafeCell::new(None),
+                }))
+                .collect::<Vec<_>>()
+                .into_boxed_slice(),
+            value: UnsafeCell::new(value),
+        }
+    }
+
+    /// Consumes this lock, returning the underlying data.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(String::new());
+    /// {
+    ///     let mut s = lock.write().unwrap();
+    ///     *s = "modified".to_owned();
+    /// }
+    /// assert_eq!(lock.into_inner().unwrap(), "modified");
+    /// ```
+    pub fn into_inner(self) -> LockResult<T> {
+        let is_poisoned = self.is_poisoned();
+        let inner = self.value.into_inner();
+
+        if is_poisoned {
+            Err(PoisonError::new(inner))
+        } else {
+            Ok(inner)
+        }
+    }
+}
+
+impl<T: ?Sized> ShardedLock<T> {
+    /// Returns `true` if the lock is poisoned.
+    ///
+    /// If another thread can still access the lock, it may become poisoned at any time. A `false`
+    /// result should not be trusted without additional synchronization.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    /// use std::sync::Arc;
+    /// use std::thread;
+    ///
+    /// let lock = Arc::new(ShardedLock::new(0));
+    /// let c_lock = lock.clone();
+    ///
+    /// let _ = thread::spawn(move || {
+    ///     let _lock = c_lock.write().unwrap();
+    ///     panic!(); // the lock gets poisoned
+    /// }).join();
+    /// assert_eq!(lock.is_poisoned(), true);
+    /// ```
+    pub fn is_poisoned(&self) -> bool {
+        self.shards[0].lock.is_poisoned()
+    }
+
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the lock mutably, no actual locking needs to take place.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let mut lock = ShardedLock::new(0);
+    /// *lock.get_mut().unwrap() = 10;
+    /// assert_eq!(*lock.read().unwrap(), 10);
+    /// ```
+    pub fn get_mut(&mut self) -> LockResult<&mut T> {
+        let is_poisoned = self.is_poisoned();
+        let inner = unsafe { &mut *self.value.get() };
+
+        if is_poisoned {
+            Err(PoisonError::new(inner))
+        } else {
+            Ok(inner)
+        }
+    }
+
+    /// Attempts to acquire this lock with shared read access.
+    ///
+    /// If the access could not be granted at this time, an error is returned. Otherwise, a guard
+    /// is returned which will release the shared access when it is dropped. This method does not
+    /// provide any guarantees with respect to the ordering of whether contentious readers or
+    /// writers will acquire the lock first.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(1);
+    ///
+    /// match lock.try_read() {
+    ///     Ok(n) => assert_eq!(*n, 1),
+    ///     Err(_) => unreachable!(),
+    /// };
+    /// ```
+    pub fn try_read(&self) -> TryLockResult<ShardedLockReadGuard<T>> {
+        // Take the current thread index and map it to a shard index. Thread indices will tend to
+        // distribute shards among threads equally, thus reducing contention due to read-locking.
+        let current_index = current_index().unwrap_or(0);
+        let shard_index = current_index & (self.shards.len() - 1);
+
+        match self.shards[shard_index].lock.try_read() {
+            Ok(guard) => Ok(ShardedLockReadGuard {
+                lock: self,
+                _guard: guard,
+                _marker: PhantomData,
+            }),
+            Err(TryLockError::Poisoned(err)) => {
+                let guard = ShardedLockReadGuard {
+                    lock: self,
+                    _guard: err.into_inner(),
+                    _marker: PhantomData,
+                };
+                Err(TryLockError::Poisoned(PoisonError::new(guard)))
+            },
+            Err(TryLockError::WouldBlock) => Err(TryLockError::WouldBlock),
+        }
+    }
+
+    /// Locks with shared read access, blocking the current thread until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers which hold the lock.
+    /// There may be other readers currently inside the lock when this method returns. This method
+    /// does not provide any guarantees with respect to the ordering of whether contentious readers
+    /// or writers will acquire the lock first.
+    ///
+    /// Returns a guard which will release the shared access when dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    /// use std::sync::Arc;
+    /// use std::thread;
+    ///
+    /// let lock = Arc::new(ShardedLock::new(1));
+    /// let c_lock = lock.clone();
+    ///
+    /// let n = lock.read().unwrap();
+    /// assert_eq!(*n, 1);
+    ///
+    /// thread::spawn(move || {
+    ///     let r = c_lock.read();
+    ///     assert!(r.is_ok());
+    /// }).join().unwrap();
+    /// ```
+    pub fn read(&self) -> LockResult<ShardedLockReadGuard<T>> {
+        // Take the current thread index and map it to a shard index. Thread indices will tend to
+        // distribute shards among threads equally, thus reducing contention due to read-locking.
+        let current_index = current_index().unwrap_or(0);
+        let shard_index = current_index & (self.shards.len() - 1);
+
+        match self.shards[shard_index].lock.read() {
+            Ok(guard) => Ok(ShardedLockReadGuard {
+                lock: self,
+                _guard: guard,
+                _marker: PhantomData,
+            }),
+            Err(err) => Err(PoisonError::new(ShardedLockReadGuard {
+                lock: self,
+                _guard: err.into_inner(),
+                _marker: PhantomData,
+            })),
+        }
+    }
+
+    /// Attempts to acquire this lock with exclusive write access.
+    ///
+    /// If the access could not be granted at this time, an error is returned. Otherwise, a guard
+    /// is returned which will release the exclusive access when it is dropped. This method does
+    /// not provide any guarantees with respect to the ordering of whether contentious readers or
+    /// writers will acquire the lock first.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(1);
+    ///
+    /// let n = lock.read().unwrap();
+    /// assert_eq!(*n, 1);
+    ///
+    /// assert!(lock.try_write().is_err());
+    /// ```
+    pub fn try_write(&self) -> TryLockResult<ShardedLockWriteGuard<T>> {
+        let mut poisoned = false;
+        let mut blocked = None;
+
+        // Write-lock each shard in succession.
+        for (i, shard) in self.shards.iter().enumerate() {
+            let guard = match shard.lock.try_write() {
+                Ok(guard) => guard,
+                Err(TryLockError::Poisoned(err)) => {
+                    poisoned = true;
+                    err.into_inner()
+                },
+                Err(TryLockError::WouldBlock) => {
+                    blocked = Some(i);
+                    break;
+                }
+            };
+
+            // Store the guard into the shard.
+            unsafe {
+                let guard: RwLockWriteGuard<'static, ()> = mem::transmute(guard);
+                let dest: *mut _ = shard.write_guard.get();
+                *dest = Some(guard);
+            }
+        }
+
+        if let Some(i) = blocked {
+            // Unlock the shards in reverse order of locking.
+            for shard in self.shards[0..i].iter().rev() {
+                unsafe {
+                    let dest: *mut _ = shard.write_guard.get();
+                    let guard = mem::replace(&mut *dest, None);
+                    drop(guard);
+                }
+            }
+            Err(TryLockError::WouldBlock)
+        } else if poisoned {
+            let guard = ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            };
+            Err(TryLockError::Poisoned(PoisonError::new(guard)))
+        } else {
+            Ok(ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            })
+        }
+    }
+
+    /// Locks with exclusive write access, blocking the current thread until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers which hold the lock.
+    /// There may be other readers currently inside the lock when this method returns. This method
+    /// does not provide any guarantees with respect to the ordering of whether contentious readers
+    /// or writers will acquire the lock first.
+    ///
+    /// Returns a guard which will release the exclusive access when dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(1);
+    ///
+    /// let mut n = lock.write().unwrap();
+    /// *n = 2;
+    ///
+    /// assert!(lock.try_read().is_err());
+    /// ```
+    pub fn write(&self) -> LockResult<ShardedLockWriteGuard<T>> {
+        let mut poisoned = false;
+
+        // Write-lock each shard in succession.
+        for shard in self.shards.iter() {
+            let guard = match shard.lock.write() {
+                Ok(guard) => guard,
+                Err(err) => {
+                    poisoned = true;
+                    err.into_inner()
+                }
+            };
+
+            // Store the guard into the shard.
+            unsafe {
+                let guard: RwLockWriteGuard<'_, ()> = guard;
+                let guard: RwLockWriteGuard<'static, ()> = mem::transmute(guard);
+                let dest: *mut _ = shard.write_guard.get();
+                *dest = Some(guard);
+            }
+        }
+
+        if poisoned {
+            Err(PoisonError::new(ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            }))
+        } else {
+            Ok(ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            })
+        }
+    }
+}
+
+impl<T: ?Sized + fmt::Debug> fmt::Debug for ShardedLock<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.try_read() {
+            Ok(guard) => f.debug_struct("ShardedLock").field("data", &&*guard).finish(),
+            Err(TryLockError::Poisoned(err)) => {
+                f.debug_struct("ShardedLock").field("data", &&**err.get_ref()).finish()
+            },
+            Err(TryLockError::WouldBlock) => {
+                struct LockedPlaceholder;
+                impl fmt::Debug for LockedPlaceholder {
+                    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                        f.write_str("<locked>")
+                    }
+                }
+                f.debug_struct("ShardedLock").field("data", &LockedPlaceholder).finish()
+            }
+        }
+    }
+}
+
+impl<T: Default> Default for ShardedLock<T> {
+    fn default() -> ShardedLock<T> {
+        ShardedLock::new(Default::default())
+    }
+}
+
+impl<T> From<T> for ShardedLock<T> {
+    fn from(t: T) -> Self {
+        ShardedLock::new(t)
+    }
+}
+
+/// A guard used to release the shared read access of a [`ShardedLock`] when dropped.
+///
+/// [`ShardedLock`]: struct.ShardedLock.html
+pub struct ShardedLockReadGuard<'a, T: ?Sized + 'a> {
+    lock: &'a ShardedLock<T>,
+    _guard: RwLockReadGuard<'a, ()>,
+    _marker: PhantomData<RwLockReadGuard<'a, T>>,
+}
+
+unsafe impl<'a, T: ?Sized + Sync> Sync for ShardedLockReadGuard<'a, T> {}
+
+impl<'a, T: ?Sized> Deref for ShardedLockReadGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.lock.value.get() }
+    }
+}
+
+impl<'a, T: fmt::Debug> fmt::Debug for ShardedLockReadGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("ShardedLockReadGuard")
+            .field("lock", &self.lock)
+            .finish()
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for ShardedLockReadGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+/// A guard used to release the exclusive write access of a [`ShardedLock`] when dropped.
+///
+/// [`ShardedLock`]: struct.ShardedLock.html
+pub struct ShardedLockWriteGuard<'a, T: ?Sized + 'a> {
+    lock: &'a ShardedLock<T>,
+    _marker: PhantomData<RwLockWriteGuard<'a, T>>,
+}
+
+unsafe impl<'a, T: ?Sized + Sync> Sync for ShardedLockWriteGuard<'a, T> {}
+
+impl<'a, T: ?Sized> Drop for ShardedLockWriteGuard<'a, T> {
+    fn drop(&mut self) {
+        // Unlock the shards in reverse order of locking.
+        for shard in self.lock.shards.iter().rev() {
+            unsafe {
+                let dest: *mut _ = shard.write_guard.get();
+                let guard = mem::replace(&mut *dest, None);
+                drop(guard);
+            }
+        }
+    }
+}
+
+impl<'a, T: fmt::Debug> fmt::Debug for ShardedLockWriteGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("ShardedLockWriteGuard")
+            .field("lock", &self.lock)
+            .finish()
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for ShardedLockWriteGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+impl<'a, T: ?Sized> Deref for ShardedLockWriteGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.lock.value.get() }
+    }
+}
+
+impl<'a, T: ?Sized> DerefMut for ShardedLockWriteGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.lock.value.get() }
+    }
+}
+
+/// Returns a `usize` that identifies the current thread.
+///
+/// Each thread is associated with an 'index'. While there are no particular guarantees, indices
+/// usually tend to be consecutive numbers between 0 and the number of running threads.
+///
+/// Since this function accesses TLS, `None` might be returned if the current thread's TLS is
+/// tearing down.
+#[inline]
+fn current_index() -> Option<usize> {
+    REGISTRATION.try_with(|reg| reg.index).ok()
+}
+
+/// The global registry keeping track of registered threads and indices.
+struct ThreadIndices {
+    /// Mapping from `ThreadId` to thread index.
+    mapping: HashMap<ThreadId, usize>,
+
+    /// A list of free indices.
+    free_list: Vec<usize>,
+
+    /// The next index to allocate if the free list is empty.
+    next_index: usize,
+}
+
+lazy_static! {
+    static ref THREAD_INDICES: Mutex<ThreadIndices> = Mutex::new(ThreadIndices {
+        mapping: HashMap::new(),
+        free_list: Vec::new(),
+        next_index: 0,
+    });
+}
+
+/// A registration of a thread with an index.
+///
+/// When dropped, unregisters the thread and frees the reserved index.
+struct Registration {
+    index: usize,
+    thread_id: ThreadId,
+}
+
+impl Drop for Registration {
+    fn drop(&mut self) {
+        let mut indices = THREAD_INDICES.lock().unwrap();
+        indices.mapping.remove(&self.thread_id);
+        indices.free_list.push(self.index);
+    }
+}
+
+thread_local! {
+    static REGISTRATION: Registration = {
+        let thread_id = thread::current().id();
+        let mut indices = THREAD_INDICES.lock().unwrap();
+
+        let index = match indices.free_list.pop() {
+            Some(i) => i,
+            None => {
+                let i = indices.next_index;
+                indices.next_index += 1;
+                i
+            }
+        };
+        indices.mapping.insert(thread_id, index);
+
+        Registration {
+            index,
+            thread_id,
+        }
+    };
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/sync/wait_group.rs cargo-0.33.0/vendor/crossbeam-utils/src/sync/wait_group.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/sync/wait_group.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/sync/wait_group.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,139 @@
+use std::fmt;
+use std::sync::{Arc, Condvar, Mutex};
+
+/// Enables threads to synchronize the beginning or end of some computation.
+///
+/// # Wait groups vs barriers
+///
+/// `WaitGroup` is very similar to [`Barrier`], but there are a few differences:
+///
+/// * `Barrier` needs to know the number of threads at construction, while `WaitGroup` is cloned to
+///   register more threads.
+///
+/// * A `Barrier` can be reused even after all threads have synchronized, while a `WaitGroup`
+///   synchronizes threads only once.
+///
+/// * All threads wait for others to reach the `Barrier`. With `WaitGroup`, each thread can choose
+///   to either wait for other threads or to continue without blocking.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::sync::WaitGroup;
+/// use std::thread;
+///
+/// // Create a new wait group.
+/// let wg = WaitGroup::new();
+///
+/// for _ in 0..4 {
+///     // Create another reference to the wait group.
+///     let wg = wg.clone();
+///
+///     thread::spawn(move || {
+///         // Do some work.
+///
+///         // Drop the reference to the wait group.
+///         drop(wg);
+///     });
+/// }
+///
+/// // Block until all threads have finished their work.
+/// wg.wait();
+/// ```
+///
+/// [`Barrier`]: https://doc.rust-lang.org/std/sync/struct.Barrier.html
+pub struct WaitGroup {
+    inner: Arc<Inner>,
+}
+
+/// Inner state of a `WaitGroup`.
+struct Inner {
+    cvar: Condvar,
+    count: Mutex<usize>,
+}
+
+impl WaitGroup {
+    /// Creates a new wait group and returns the single reference to it.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::WaitGroup;
+    ///
+    /// let wg = WaitGroup::new();
+    /// ```
+    pub fn new() -> WaitGroup {
+        WaitGroup {
+            inner: Arc::new(Inner {
+                cvar: Condvar::new(),
+                count: Mutex::new(1),
+            }),
+        }
+    }
+
+    /// Drops this reference and waits until all other references are dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::WaitGroup;
+    /// use std::thread;
+    ///
+    /// let wg = WaitGroup::new();
+    ///
+    /// thread::spawn({
+    ///     let wg = wg.clone();
+    ///     move || {
+    ///         // Block until both threads have reached `wait()`.
+    ///         wg.wait();
+    ///     }
+    /// });
+    ///
+    /// // Block until both threads have reached `wait()`.
+    /// wg.wait();
+    /// ```
+    pub fn wait(self) {
+        if *self.inner.count.lock().unwrap() == 1 {
+            return;
+        }
+
+        let inner = self.inner.clone();
+        drop(self);
+
+        let mut count = inner.count.lock().unwrap();
+        while *count > 0 {
+            count = inner.cvar.wait(count).unwrap();
+        }
+    }
+}
+
+impl Drop for WaitGroup {
+    fn drop(&mut self) {
+        let mut count = self.inner.count.lock().unwrap();
+        *count -= 1;
+
+        if *count == 0 {
+            self.inner.cvar.notify_all();
+        }
+    }
+}
+
+impl Clone for WaitGroup {
+    fn clone(&self) -> WaitGroup {
+        let mut count = self.inner.count.lock().unwrap();
+        *count += 1;
+
+        WaitGroup {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+impl fmt::Debug for WaitGroup {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let count: &usize = &*self.inner.count.lock().unwrap();
+        f.debug_struct("WaitGroup")
+            .field("count", count)
+            .finish()
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/src/thread.rs cargo-0.33.0/vendor/crossbeam-utils/src/thread.rs
--- cargo-0.32.0/vendor/crossbeam-utils/src/thread.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/src/thread.rs	2019-02-06 04:11:58.000000000 +0000
@@ -11,9 +11,9 @@
 //!     "Carol".to_string(),
 //! ];
 //!
-//! thread::scope(|scope| {
+//! thread::scope(|s| {
 //!     for person in &people {
-//!         scope.spawn(move |_| {
+//!         s.spawn(move |_| {
 //!             println!("Hello, {}!", person);
 //!         });
 //!     }
@@ -74,10 +74,43 @@
 //! `'static` lifetime because the borrow checker cannot be sure when the thread will complete.
 //!
 //! A scope creates a clear boundary between variables outside the scope and threads inside the
-//! scope. Whenever a scope spawns a thread, it promises to join the thread before the scope ends.
+//! scope. Whenever a s.spawns a thread, it promises to join the thread before the scope ends.
 //! This way we guarantee to the borrow checker that scoped threads only live within the scope and
 //! can safely access variables outside it.
 //!
+//! # Nesting scoped threads
+//!
+//! Sometimes scoped threads need to spawn more threads within the same scope. This is a little
+//! tricky because argument `s` lives *inside* the invocation of `thread::scope()` and as such
+//! cannot be borrowed by scoped threads:
+//!
+//! ```ignore
+//! use crossbeam_utils::thread;
+//!
+//! thread::scope(|s| {
+//!     s.spawn(|_| {
+//!         // Not going to compile because we're trying to borrow `s`,
+//!         // which lives *inside* the scope! :(
+//!         s.spawn(|_| println!("nested thread"));
+//!     }});
+//! });
+//! ```
+//!
+//! Fortunately, there is a solution. Every scoped thread is passed a reference to its scope as an
+//! argument, which can be used for spawning nested threads:
+//!
+//! ```ignore
+//! use crossbeam_utils::thread;
+//!
+//! thread::scope(|s| {
+//!     // Note the `|s|` here.
+//!     s.spawn(|s| {
+//!         // Yay, this works because we're using a fresh argument `s`! :)
+//!         s.spawn(|_| println!("nested thread"));
+//!     }});
+//! });
+//! ```
+//!
 //! [`std::thread::spawn`]: https://doc.rust-lang.org/std/thread/fn.spawn.html
 
 use std::fmt;
@@ -85,39 +118,42 @@
 use std::marker::PhantomData;
 use std::mem;
 use std::panic;
-use std::sync::{Arc, Mutex, mpsc};
+use std::sync::{Arc, Mutex};
 use std::thread;
 
+use sync::WaitGroup;
+
 type SharedVec<T> = Arc<Mutex<Vec<T>>>;
 type SharedOption<T> = Arc<Mutex<Option<T>>>;
 
-/// Creates a new `Scope` for [*scoped thread spawning*](struct.Scope.html#method.spawn).
+/// Creates a new scope for spawning threads.
 ///
-/// No matter what happens, before the `Scope` is dropped, it is guaranteed that all the unjoined
-/// spawned scoped threads are joined.
-///
-/// `thread::scope()` returns `Ok(())` if all the unjoined spawned threads did not panic. It returns
-/// `Err(e)` if one of them panics with `e`. If many of them panic, it is still guaranteed that all
-/// the threads are joined, and `thread::scope()` returns `Err(e)` with `e` from a panicking thread.
+/// All child threads that haven't been manually joined will be automatically joined just before
+/// this function invocation ends. If all joined threads have successfully completed, `Ok` is
+/// returned with the return value of `f`. If any of the joined threads has panicked, an `Err` is
+/// returned containing errors from panicked threads.
 ///
 /// # Examples
 ///
-/// Creating and using a scope:
-///
 /// ```
-/// crossbeam_utils::thread::scope(|scope| {
-///     scope.spawn(|_| println!("Exiting scope"));
-///     scope.spawn(|_| println!("Running child thread in scope"));
+/// use crossbeam_utils::thread;
+///
+/// let var = vec![1, 2, 3];
+///
+/// thread::scope(|s| {
+///     s.spawn(|_| {
+///         println!("A child thread borrowing `var`: {:?}", var);
+///     });
 /// }).unwrap();
 /// ```
 pub fn scope<'env, F, R>(f: F) -> thread::Result<R>
 where
     F: FnOnce(&Scope<'env>) -> R,
 {
-    let (tx, rx) = mpsc::channel();
+    let wg = WaitGroup::new();
     let scope = Scope::<'env> {
         handles: SharedVec::default(),
-        chan: tx,
+        wait_group: wg.clone(),
         _marker: PhantomData,
     };
 
@@ -125,8 +161,8 @@
     let result = panic::catch_unwind(panic::AssertUnwindSafe(|| f(&scope)));
 
     // Wait until all nested scopes are dropped.
-    drop(scope.chan);
-    let _ = rx.recv();
+    drop(scope.wait_group);
+    wg.wait();
 
     // Join all remaining spawned threads.
     let panics: Vec<_> = {
@@ -163,7 +199,7 @@
     handles: SharedVec<SharedOption<thread::JoinHandle<()>>>,
 
     /// Used to wait until all subscopes all dropped.
-    chan: mpsc::Sender<()>,
+    wait_group: WaitGroup,
 
     /// Borrows data with invariant lifetime `'env`.
     _marker: PhantomData<&'env mut &'env ()>,
@@ -172,14 +208,35 @@
 unsafe impl<'env> Sync for Scope<'env> {}
 
 impl<'env> Scope<'env> {
-    /// Create a scoped thread.
+    /// Spawns a scoped thread.
+    ///
+    /// This method is similar to the [`spawn`] function in Rust's standard library. The difference
+    /// is that this thread is scoped, meaning it's guaranteed to terminate before the scope exits,
+    /// allowing it to reference variables outside the scope.
     ///
-    /// `spawn` is similar to the [`spawn`] function in Rust's standard library. The difference is
-    /// that this thread is scoped, meaning that it's guaranteed to terminate before the current
-    /// stack frame goes away, allowing you to reference the parent stack frame directly. This is
-    /// ensured by having the parent thread join on the child thread before the scope exits.
+    /// The scoped thread is passed a reference to this scope as an argument, which can be used for
+    /// spawning nested threads.
+    ///
+    /// The returned handle can be used to manually join the thread before the scope exits.
     ///
     /// [`spawn`]: https://doc.rust-lang.org/std/thread/fn.spawn.html
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle = s.spawn(|_| {
+    ///         println!("A child thread is running");
+    ///         42
+    ///     });
+    ///
+    ///     // Join the thread and retrieve its result.
+    ///     let res = handle.join().unwrap();
+    ///     assert_eq!(res, 42);
+    /// }).unwrap();
+    /// ```
     pub fn spawn<'scope, F, T>(&'scope self, f: F) -> ScopedJoinHandle<'scope, T>
     where
         F: FnOnce(&Scope<'env>) -> T,
@@ -189,8 +246,20 @@
         self.builder().spawn(f).unwrap()
     }
 
-    /// Generates the base configuration for spawning a scoped thread, from which configuration
-    /// methods can be chained.
+    /// Creates a builder that can configure a thread before spawning.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    /// use std::thread::current;
+    ///
+    /// thread::scope(|s| {
+    ///     s.builder()
+    ///         .spawn(|_| println!("A child thread is running"))
+    ///         .unwrap();
+    /// }).unwrap();
+    /// ```
     pub fn builder<'scope>(&'scope self) -> ScopedThreadBuilder<'scope, 'env> {
         ScopedThreadBuilder {
             scope: self,
@@ -205,8 +274,39 @@
     }
 }
 
-/// Scoped thread configuration. Provides detailed control over the properties and behavior of new
-/// scoped threads.
+/// Configures the properties of a new thread.
+///
+/// The two configurable properties are:
+///
+/// - [`name`]: Specifies an [associated name for the thread][naming-threads].
+/// - [`stack_size`]: Specifies the [desired stack size for the thread][stack-size].
+///
+/// The [`spawn`] method will take ownership of the builder and return an [`io::Result`] of the
+/// thread handle with the given configuration.
+///
+/// The [`Scope::spawn`] method uses a builder with default configuration and unwraps its return
+/// value. You may want to use this builder when you want to recover from a failure to launch a
+/// thread.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::thread;
+///
+/// thread::scope(|s| {
+///     s.builder()
+///         .spawn(|_| println!("Running a child thread"))
+///         .unwrap();
+/// }).unwrap();
+/// ```
+///
+/// [`name`]: struct.ScopedThreadBuilder.html#method.name
+/// [`stack_size`]: struct.ScopedThreadBuilder.html#method.stack_size
+/// [`spawn`]: struct.ScopedThreadBuilder.html#method.spawn
+/// [`Scope::spawn`]: struct.Scope.html#method.spawn
+/// [`io::Result`]: https://doc.rust-lang.org/std/io/type.Result.html
+/// [naming-threads]: https://doc.rust-lang.org/std/thread/index.html#naming-threads
+/// [stack-size]: https://doc.rust-lang.org/std/thread/index.html#stack-size
 #[derive(Debug)]
 pub struct ScopedThreadBuilder<'scope, 'env: 'scope> {
     scope: &'scope Scope<'env>,
@@ -214,20 +314,77 @@
 }
 
 impl<'scope, 'env> ScopedThreadBuilder<'scope, 'env> {
-    /// Names the thread-to-be. Currently the name is used for identification only in panic
-    /// messages.
+    /// Sets the name for the new thread.
+    ///
+    /// The name must not contain null bytes. For more information about named threads, see
+    /// [here][naming-threads].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    /// use std::thread::current;
+    ///
+    /// thread::scope(|s| {
+    ///     s.builder()
+    ///         .name("my thread".to_string())
+    ///         .spawn(|_| assert_eq!(current().name(), Some("my thread")))
+    ///         .unwrap();
+    /// }).unwrap();
+    /// ```
+    ///
+    /// [naming-threads]: https://doc.rust-lang.org/std/thread/index.html#naming-threads
     pub fn name(mut self, name: String) -> ScopedThreadBuilder<'scope, 'env> {
         self.builder = self.builder.name(name);
         self
     }
 
     /// Sets the size of the stack for the new thread.
+    ///
+    /// The stack size is measured in bytes.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     s.builder()
+    ///         .stack_size(32 * 1024)
+    ///         .spawn(|_| println!("Running a child thread"))
+    ///         .unwrap();
+    /// }).unwrap();
+    /// ```
     pub fn stack_size(mut self, size: usize) -> ScopedThreadBuilder<'scope, 'env> {
         self.builder = self.builder.stack_size(size);
         self
     }
 
-    /// Spawns a new thread, and returns a join handle for it.
+    /// Spawns a scoped thread with this configuration.
+    ///
+    /// The scoped thread is passed a reference to this scope as an argument, which can be used for
+    /// spawning nested threads.
+    ///
+    /// The returned handle can be used to manually join the thread before the scope exits.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle = s.builder()
+    ///         .spawn(|_| {
+    ///             println!("A child thread is running");
+    ///             42
+    ///         })
+    ///         .unwrap();
+    ///
+    ///     // Join the thread and retrieve its result.
+    ///     let res = handle.join().unwrap();
+    ///     assert_eq!(res, 42);
+    /// }).unwrap();
+    /// ```
     pub fn spawn<F, T>(self, f: F) -> io::Result<ScopedJoinHandle<'scope, T>>
     where
         F: FnOnce(&Scope<'env>) -> T,
@@ -244,7 +401,7 @@
             // A clone of the scope that will be moved into the new thread.
             let scope = Scope::<'env> {
                 handles: Arc::clone(&self.scope.handles),
-                chan: self.scope.chan.clone(),
+                wait_group: self.scope.wait_group.clone(),
                 _marker: PhantomData,
             };
 
@@ -294,7 +451,7 @@
 unsafe impl<'scope, T> Send for ScopedJoinHandle<'scope, T> {}
 unsafe impl<'scope, T> Sync for ScopedJoinHandle<'scope, T> {}
 
-/// A handle to a scoped thread
+/// A handle that can be used to join its scoped thread.
 pub struct ScopedJoinHandle<'scope, T> {
     /// A join handle to the spawned thread.
     handle: SharedOption<thread::JoinHandle<()>>,
@@ -310,17 +467,33 @@
 }
 
 impl<'scope, T> ScopedJoinHandle<'scope, T> {
-    /// Waits for the associated thread to finish.
-    ///
-    /// If the child thread panics, [`Err`] is returned with the parameter given to [`panic`].
+    /// Waits for the thread to finish and returns its result.
     ///
-    /// [`Err`]: https://doc.rust-lang.org/std/result/enum.Result.html#variant.Err
-    /// [`panic`]: https://doc.rust-lang.org/std/macro.panic.html
+    /// If the child thread panics, an error is returned.
     ///
     /// # Panics
     ///
     /// This function may panic on some platforms if a thread attempts to join itself or otherwise
     /// may create a deadlock with joining threads.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle1 = s.spawn(|_| println!("I'm a happy thread :)"));
+    ///     let handle2 = s.spawn(|_| panic!("I'm a sad thread :("));
+    ///
+    ///     // Join the first thread and verify that it succeeded.
+    ///     let res = handle1.join();
+    ///     assert!(res.is_ok());
+    ///
+    ///     // Join the second thread and verify that it panicked.
+    ///     let res = handle2.join();
+    ///     assert!(res.is_err());
+    /// }).unwrap();
+    /// ```
     pub fn join(self) -> thread::Result<T> {
         // Take out the handle. The handle will surely be available because the root scope waits
         // for nested scopes before joining remaining threads.
@@ -332,9 +505,18 @@
             .map(|()| self.result.lock().unwrap().take().unwrap())
     }
 
-    /// Gets the underlying [`std::thread::Thread`] handle.
+    /// Returns a handle to the underlying thread.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
     ///
-    /// [`std::thread::Thread`]: https://doc.rust-lang.org/std/thread/struct.Thread.html
+    /// thread::scope(|s| {
+    ///     let handle = s.spawn(|_| println!("A child thread is running"));
+    ///     println!("The child thread ID: {:?}", handle.thread().id());
+    /// }).unwrap();
+    /// ```
     pub fn thread(&self) -> &thread::Thread {
         &self.thread
     }
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/tests/sharded_lock.rs cargo-0.33.0/vendor/crossbeam-utils/tests/sharded_lock.rs
--- cargo-0.32.0/vendor/crossbeam-utils/tests/sharded_lock.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/tests/sharded_lock.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,245 @@
+extern crate crossbeam_utils;
+extern crate rand;
+
+use std::sync::mpsc::channel;
+use std::thread;
+use std::sync::{Arc, TryLockError};
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use crossbeam_utils::sync::ShardedLock;
+use rand::Rng;
+
+#[derive(Eq, PartialEq, Debug)]
+struct NonCopy(i32);
+
+#[test]
+fn smoke() {
+    let l = ShardedLock::new(());
+    drop(l.read().unwrap());
+    drop(l.write().unwrap());
+    drop((l.read().unwrap(), l.read().unwrap()));
+    drop(l.write().unwrap());
+}
+
+#[test]
+fn frob() {
+    const N: u32 = 10;
+    const M: usize = 1000;
+
+    let r = Arc::new(ShardedLock::new(()));
+
+    let (tx, rx) = channel::<()>();
+    for _ in 0..N {
+        let tx = tx.clone();
+        let r = r.clone();
+        thread::spawn(move || {
+            let mut rng = rand::thread_rng();
+            for _ in 0..M {
+                if rng.gen_bool(1.0 / (N as f64)) {
+                    drop(r.write().unwrap());
+                } else {
+                    drop(r.read().unwrap());
+                }
+            }
+            drop(tx);
+        });
+    }
+    drop(tx);
+    let _ = rx.recv();
+}
+
+#[test]
+fn arc_poison_wr() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.write().unwrap();
+        panic!();
+    }).join();
+    assert!(arc.read().is_err());
+}
+
+#[test]
+fn arc_poison_ww() {
+    let arc = Arc::new(ShardedLock::new(1));
+    assert!(!arc.is_poisoned());
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.write().unwrap();
+        panic!();
+    }).join();
+    assert!(arc.write().is_err());
+    assert!(arc.is_poisoned());
+}
+
+#[test]
+fn arc_no_poison_rr() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.read().unwrap();
+        panic!();
+    }).join();
+    let lock = arc.read().unwrap();
+    assert_eq!(*lock, 1);
+}
+#[test]
+fn arc_no_poison_sl() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.read().unwrap();
+        panic!()
+    }).join();
+    let lock = arc.write().unwrap();
+    assert_eq!(*lock, 1);
+}
+
+#[test]
+fn arc() {
+    let arc = Arc::new(ShardedLock::new(0));
+    let arc2 = arc.clone();
+    let (tx, rx) = channel();
+
+    thread::spawn(move || {
+        let mut lock = arc2.write().unwrap();
+        for _ in 0..10 {
+            let tmp = *lock;
+            *lock = -1;
+            thread::yield_now();
+            *lock = tmp + 1;
+        }
+        tx.send(()).unwrap();
+    });
+
+    // Readers try to catch the writer in the act
+    let mut children = Vec::new();
+    for _ in 0..5 {
+        let arc3 = arc.clone();
+        children.push(thread::spawn(move || {
+            let lock = arc3.read().unwrap();
+            assert!(*lock >= 0);
+        }));
+    }
+
+    // Wait for children to pass their asserts
+    for r in children {
+        assert!(r.join().is_ok());
+    }
+
+    // Wait for writer to finish
+    rx.recv().unwrap();
+    let lock = arc.read().unwrap();
+    assert_eq!(*lock, 10);
+}
+
+#[test]
+fn arc_access_in_unwind() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _ = thread::spawn(move || -> () {
+        struct Unwinder {
+            i: Arc<ShardedLock<isize>>,
+        }
+        impl Drop for Unwinder {
+            fn drop(&mut self) {
+                let mut lock = self.i.write().unwrap();
+                *lock += 1;
+            }
+        }
+        let _u = Unwinder { i: arc2 };
+        panic!();
+    }).join();
+    let lock = arc.read().unwrap();
+    assert_eq!(*lock, 2);
+}
+
+#[test]
+fn unsized_type() {
+    let sl: &ShardedLock<[i32]> = &ShardedLock::new([1, 2, 3]);
+    {
+        let b = &mut *sl.write().unwrap();
+        b[0] = 4;
+        b[2] = 5;
+    }
+    let comp: &[i32] = &[4, 2, 5];
+    assert_eq!(&*sl.read().unwrap(), comp);
+}
+
+#[test]
+fn try_write() {
+    let lock = ShardedLock::new(0isize);
+    let read_guard = lock.read().unwrap();
+
+    let write_result = lock.try_write();
+    match write_result {
+        Err(TryLockError::WouldBlock) => (),
+        Ok(_) => assert!(false, "try_write should not succeed while read_guard is in scope"),
+        Err(_) => assert!(false, "unexpected error"),
+    }
+
+    drop(read_guard);
+}
+
+#[test]
+fn test_into_inner() {
+    let m = ShardedLock::new(NonCopy(10));
+    assert_eq!(m.into_inner().unwrap(), NonCopy(10));
+}
+
+#[test]
+fn test_into_inner_drop() {
+    struct Foo(Arc<AtomicUsize>);
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            self.0.fetch_add(1, Ordering::SeqCst);
+        }
+    }
+    let num_drops = Arc::new(AtomicUsize::new(0));
+    let m = ShardedLock::new(Foo(num_drops.clone()));
+    assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+    {
+        let _inner = m.into_inner().unwrap();
+        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+    }
+    assert_eq!(num_drops.load(Ordering::SeqCst), 1);
+}
+
+#[test]
+fn test_into_inner_poison() {
+    let m = Arc::new(ShardedLock::new(NonCopy(10)));
+    let m2 = m.clone();
+    let _ = thread::spawn(move || {
+        let _lock = m2.write().unwrap();
+        panic!("test panic in inner thread to poison ShardedLock");
+    }).join();
+
+    assert!(m.is_poisoned());
+    match Arc::try_unwrap(m).unwrap().into_inner() {
+        Err(e) => assert_eq!(e.into_inner(), NonCopy(10)),
+        Ok(x) => panic!("into_inner of poisoned ShardedLock is Ok: {:?}", x),
+    }
+}
+
+#[test]
+fn test_get_mut() {
+    let mut m = ShardedLock::new(NonCopy(10));
+    *m.get_mut().unwrap() = NonCopy(20);
+    assert_eq!(m.into_inner().unwrap(), NonCopy(20));
+}
+
+#[test]
+fn test_get_mut_poison() {
+    let m = Arc::new(ShardedLock::new(NonCopy(10)));
+    let m2 = m.clone();
+    let _ = thread::spawn(move || {
+        let _lock = m2.write().unwrap();
+        panic!("test panic in inner thread to poison ShardedLock");
+    }).join();
+
+    assert!(m.is_poisoned());
+    match Arc::try_unwrap(m).unwrap().get_mut() {
+        Err(e) => assert_eq!(*e.into_inner(), NonCopy(10)),
+        Ok(x) => panic!("get_mut of poisoned ShardedLock is Ok: {:?}", x),
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils/tests/wait_group.rs cargo-0.33.0/vendor/crossbeam-utils/tests/wait_group.rs
--- cargo-0.32.0/vendor/crossbeam-utils/tests/wait_group.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils/tests/wait_group.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,66 @@
+extern crate crossbeam_utils;
+
+use std::sync::mpsc;
+use std::thread;
+use std::time::Duration;
+
+use crossbeam_utils::sync::WaitGroup;
+
+const THREADS: usize = 10;
+
+#[test]
+fn wait() {
+    let wg = WaitGroup::new();
+    let (tx, rx) = mpsc::channel();
+
+    for _ in 0..THREADS {
+        let wg = wg.clone();
+        let tx = tx.clone();
+
+        thread::spawn(move || {
+            wg.wait();
+            tx.send(()).unwrap();
+        });
+    }
+
+    thread::sleep(Duration::from_millis(100));
+
+    // At this point, all spawned threads should be blocked, so we shouldn't get anything from the
+    // channel.
+    assert!(rx.try_recv().is_err());
+
+    wg.wait();
+
+    // Now, the wait group is cleared and we should receive messages.
+    for _ in 0..THREADS {
+        rx.recv().unwrap();
+    }
+}
+
+#[test]
+fn wait_and_drop() {
+    let wg = WaitGroup::new();
+    let (tx, rx) = mpsc::channel();
+
+    for _ in 0..THREADS {
+        let wg = wg.clone();
+        let tx = tx.clone();
+
+        thread::spawn(move || {
+            thread::sleep(Duration::from_millis(100));
+            tx.send(()).unwrap();
+            drop(wg);
+        });
+    }
+
+    // At this point, all spawned threads should be sleeping, so we shouldn't get anything from the
+    // channel.
+    assert!(rx.try_recv().is_err());
+
+    wg.wait();
+
+    // Now, the wait group is cleared and we should receive messages.
+    for _ in 0..THREADS {
+        rx.try_recv().unwrap();
+    }
+}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/.cargo-checksum.json cargo-0.33.0/vendor/crossbeam-utils-0.5.0/.cargo-checksum.json
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/Cargo.toml cargo-0.33.0/vendor/crossbeam-utils-0.5.0/Cargo.toml
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "crossbeam-utils"
-version = "0.5.0"
-authors = ["The Crossbeam Project Developers"]
-description = "Utilities for concurrent programming"
-homepage = "https://github.com/crossbeam-rs/crossbeam-utils"
-documentation = "https://docs.rs/crossbeam-utils"
-readme = "README.md"
-keywords = ["scoped", "thread", "atomic", "cache"]
-categories = ["algorithms", "concurrency", "data-structures"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/crossbeam-rs/crossbeam-utils"
-
-[dependencies]
-
-[features]
-default = ["use_std"]
-nightly = []
-use_std = []
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/CHANGELOG.md cargo-0.33.0/vendor/crossbeam-utils-0.5.0/CHANGELOG.md
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [0.5.0] - 2018-07-22
-### Changed
-- Reorganize sub-modules and rename functions.
-
-## [0.4.1] - 2018-06-28
-### Fixed
-- Fix a documentation link.
-
-## [0.4.0] - 2018-05-17
-### Fixed
-- `CachePadded` supports types bigger than 64 bytes.
-- Fix a bug in scoped threads where unitialized memory was being dropped.
-
-### Changed
-- Minimum required Rust version is now 1.25.
-
-## [0.3.2] - 2018-03-12
-### Fixed
-- Mark `load_consume` with `#[inline]`.
-
-## [0.3.1] - 2018-03-12
-### Fixed
-- `load_consume` on ARM and AArch64.
-
-## [0.3.0] - 2018-03-11
-### Added
-- `join` for scoped thread API.
-- `load_consume` for atomic load-consume memory ordering.
-
-### Removed
-- `AtomicOption`.
-
-## [0.2.2] - 2018-01-14
-### Added
-- Support for Rust 1.12.1.
-
-### Fixed
-- Call `T::clone` when cloning a `CachePadded<T>`.
-
-## [0.2.1] - 2017-11-26
-### Added
-- Add `use_std` feature.
-
-## [0.2.0] - 2017-11-17
-### Added
-- Add `nightly` feature.
-- Use `repr(align(64))` on `CachePadded` with the `nightly` feature.
-- Implement `Drop` for `CachePadded<T>`.
-- Implement `Clone` for `CachePadded<T>`.
-- Implement `From<T>` for `CachePadded<T>`.
-- Implement better `Debug` for `CachePadded<T>`.
-- Write more tests.
-- Add this changelog.
-
-### Changed
-- Change cache line length to 64 bytes.
-
-### Removed
-- Remove `ZerosValid`.
-
-## 0.1.0 - 2017-08-27
-### Added
-- Old implementation of `CachePadded` from `crossbeam` version 0.3.0
-
-[Unreleased]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.5.0...HEAD
-[0.5.0]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.4.1...v0.5.0
-[0.4.1]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.3.2...v0.4.0
-[0.3.2]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.3.0...v0.3.1
-[0.3.0]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.2.2...v0.3.0
-[0.2.2]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.2.1...v0.2.2
-[0.2.1]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.2.0...v0.2.1
-[0.2.0]: https://github.com/crossbeam-rs/crossbeam-utils/compare/v0.1.0...v0.2.0
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/LICENSE-APACHE cargo-0.33.0/vendor/crossbeam-utils-0.5.0/LICENSE-APACHE
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/LICENSE-MIT cargo-0.33.0/vendor/crossbeam-utils-0.5.0/LICENSE-MIT
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2010 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/README.md cargo-0.33.0/vendor/crossbeam-utils-0.5.0/README.md
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# Utilities for concurrent programming
-
-[![Build Status](https://travis-ci.org/crossbeam-rs/crossbeam-utils.svg?branch=master)](https://travis-ci.org/crossbeam-rs/crossbeam-utils)
-[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](https://github.com/crossbeam-rs/crossbeam-utils)
-[![Cargo](https://img.shields.io/crates/v/crossbeam-utils.svg)](https://crates.io/crates/crossbeam-utils)
-[![Documentation](https://docs.rs/crossbeam-utils/badge.svg)](https://docs.rs/crossbeam-utils)
-
-This crate provides utilities for concurrent programming.
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-crossbeam-utils = "0.5"
-```
-
-Next, add this to your crate:
-
-```rust
-extern crate crossbeam_utils;
-```
-
-The minimum required Rust version is 1.25.
-
-## License
-
-Licensed under the terms of MIT license and the Apache License (Version 2.0).
-
-See [LICENSE-MIT](LICENSE-MIT) and [LICENSE-APACHE](LICENSE-APACHE) for details.
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/cache_padded.rs cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/cache_padded.rs
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/cache_padded.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/cache_padded.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-use core::fmt;
-use core::ops::{Deref, DerefMut};
-
-/// Pads `T` to the length of a cache line.
-///
-/// Sometimes concurrent programming requires a piece of data to be padded out to the size of a
-/// cacheline to avoid "false sharing": cache lines being invalidated due to unrelated concurrent
-/// activity. Use this type when you want to *avoid* cache locality.
-///
-/// Cache lines are assumed to be 64 bytes on all architectures.
-///
-/// # Size and alignment
-///
-/// The size of `CachePadded<T>` is the smallest multiple of 64 bytes large enough to accommodate
-/// a value of type `T`.
-///
-/// The alignment of `CachePadded<T>` is the maximum of 64 bytes and the alignment of `T`.
-#[derive(Clone, Default)]
-#[repr(align(64))]
-pub struct CachePadded<T> {
-    inner: T,
-}
-
-unsafe impl<T: Send> Send for CachePadded<T> {}
-unsafe impl<T: Sync> Sync for CachePadded<T> {}
-
-impl<T> CachePadded<T> {
-    /// Pads a value to the length of a cache line.
-    pub fn new(t: T) -> CachePadded<T> {
-        CachePadded::<T> { inner: t }
-    }
-}
-
-impl<T> Deref for CachePadded<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        &self.inner
-    }
-}
-
-impl<T> DerefMut for CachePadded<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        &mut self.inner
-    }
-}
-
-impl<T: fmt::Debug> fmt::Debug for CachePadded<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let inner: &T = &*self;
-        write!(f, "CachePadded {{ {:?} }}", inner)
-    }
-}
-
-impl<T> From<T> for CachePadded<T> {
-    fn from(t: T) -> Self {
-        CachePadded::new(t)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use core::mem;
-    use core::cell::Cell;
-
-    #[test]
-    fn default() {
-        let x: CachePadded<u64> = Default::default();
-        assert_eq!(*x, 0);
-    }
-
-    #[test]
-    fn store_u64() {
-        let x: CachePadded<u64> = CachePadded::new(17);
-        assert_eq!(*x, 17);
-    }
-
-    #[test]
-    fn store_pair() {
-        let x: CachePadded<(u64, u64)> = CachePadded::new((17, 37));
-        assert_eq!(x.0, 17);
-        assert_eq!(x.1, 37);
-    }
-
-    #[test]
-    fn distance() {
-        let arr = [CachePadded::new(17u8), CachePadded::new(37u8)];
-        let a = &*arr[0] as *const u8;
-        let b = &*arr[1] as *const u8;
-        assert!(unsafe { a.offset(64) } <= b);
-    }
-
-    #[test]
-    fn different_sizes() {
-        CachePadded::new(17u8);
-        CachePadded::new(17u16);
-        CachePadded::new(17u32);
-        CachePadded::new([17u64; 0]);
-        CachePadded::new([17u64; 1]);
-        CachePadded::new([17u64; 2]);
-        CachePadded::new([17u64; 3]);
-        CachePadded::new([17u64; 4]);
-        CachePadded::new([17u64; 5]);
-        CachePadded::new([17u64; 6]);
-        CachePadded::new([17u64; 7]);
-        CachePadded::new([17u64; 8]);
-    }
-
-    #[test]
-    fn large() {
-        let a = [17u64; 9];
-        let b = CachePadded::new(a);
-        assert!(mem::size_of_val(&a) <= mem::size_of_val(&b));
-    }
-
-    #[test]
-    fn debug() {
-        assert_eq!(
-            format!("{:?}", CachePadded::new(17u64)),
-            "CachePadded { 17 }"
-        );
-    }
-
-    #[test]
-    fn drops() {
-        let count = Cell::new(0);
-
-        struct Foo<'a>(&'a Cell<usize>);
-
-        impl<'a> Drop for Foo<'a> {
-            fn drop(&mut self) {
-                self.0.set(self.0.get() + 1);
-            }
-        }
-
-        let a = CachePadded::new(Foo(&count));
-        let b = CachePadded::new(Foo(&count));
-
-        assert_eq!(count.get(), 0);
-        drop(a);
-        assert_eq!(count.get(), 1);
-        drop(b);
-        assert_eq!(count.get(), 2);
-    }
-
-    #[test]
-    fn clone() {
-        let a = CachePadded::new(17);
-        let b = a.clone();
-        assert_eq!(*a, *b);
-    }
-
-    #[test]
-    fn runs_custom_clone() {
-        let count = Cell::new(0);
-
-        struct Foo<'a>(&'a Cell<usize>);
-
-        impl<'a> Clone for Foo<'a> {
-            fn clone(&self) -> Foo<'a> {
-                self.0.set(self.0.get() + 1);
-                Foo::<'a>(self.0)
-            }
-        }
-
-        let a = CachePadded::new(Foo(&count));
-        a.clone();
-
-        assert_eq!(count.get(), 1);
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/consume.rs cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/consume.rs
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/consume.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/consume.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-use core::sync::atomic::Ordering;
-#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
-use core::sync::atomic::compiler_fence;
-
-/// Trait which allows reading from an atomic type with "consume" ordering.
-pub trait AtomicConsume {
-    /// Type returned by `load_consume`.
-    type Val;
-
-    /// Loads a value from the atomic using a "consume" memory ordering.
-    ///
-    /// This is similar to the "acquire" ordering, except that an ordering is
-    /// only guaranteed with operations that "depend on" the result of the load.
-    /// However consume loads are usually much faster than acquire loads on
-    /// architectures with a weak memory model since they don't require memory
-    /// fence instructions.
-    ///
-    /// The exact definition of "depend on" is a bit vague, but it works as you
-    /// would expect in practice since a lot of software, especially the Linux
-    /// kernel, rely on this behavior.
-    ///
-    /// This is currently only implemented on ARM and AArch64, where a fence
-    /// can be avoided. On other architectures this will fall back to a simple
-    /// `load(Ordering::Acquire)`.
-    fn load_consume(&self) -> Self::Val;
-}
-
-#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
-macro_rules! impl_consume {
-    () => {
-        #[inline]
-        fn load_consume(&self) -> Self::Val {
-            let result = self.load(Ordering::Relaxed);
-            compiler_fence(Ordering::Acquire);
-            result
-        }
-    };
-}
-
-#[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
-macro_rules! impl_consume {
-    () => {
-        #[inline]
-        fn load_consume(&self) -> Self::Val {
-            self.load(Ordering::Acquire)
-        }
-    };
-}
-
-macro_rules! impl_atomic {
-    ($atomic:ident, $val:ty) => {
-        impl AtomicConsume for ::core::sync::atomic::$atomic {
-            type Val = $val;
-            impl_consume!();
-        }
-    };
-}
-
-impl_atomic!(AtomicBool, bool);
-impl_atomic!(AtomicUsize, usize);
-impl_atomic!(AtomicIsize, isize);
-#[cfg(all(feature = "nightly", target_has_atomic = "8"))]
-impl_atomic!(AtomicU8, u8);
-#[cfg(all(feature = "nightly", target_has_atomic = "8"))]
-impl_atomic!(AtomicI8, i8);
-#[cfg(all(feature = "nightly", target_has_atomic = "16"))]
-impl_atomic!(AtomicU16, u16);
-#[cfg(all(feature = "nightly", target_has_atomic = "16"))]
-impl_atomic!(AtomicI16, i16);
-#[cfg(all(feature = "nightly", target_has_atomic = "32"))]
-impl_atomic!(AtomicU32, u32);
-#[cfg(all(feature = "nightly", target_has_atomic = "32"))]
-impl_atomic!(AtomicI32, i32);
-#[cfg(all(feature = "nightly", target_has_atomic = "64"))]
-impl_atomic!(AtomicU64, u64);
-#[cfg(all(feature = "nightly", target_has_atomic = "64"))]
-impl_atomic!(AtomicI64, i64);
-
-impl<T> AtomicConsume for ::core::sync::atomic::AtomicPtr<T> {
-    type Val = *mut T;
-    impl_consume!();
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/lib.rs cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/lib.rs
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic, integer_atomics))]
-#![cfg_attr(not(feature = "use_std"), no_std)]
-
-#[cfg(feature = "use_std")]
-extern crate core;
-
-mod cache_padded;
-mod consume;
-
-#[cfg(feature = "use_std")]
-pub mod thread;
-
-pub use cache_padded::CachePadded;
-pub use consume::AtomicConsume;
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/thread.rs cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/thread.rs
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/src/thread.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/src/thread.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,382 +0,0 @@
-/// Scoped thread.
-///
-/// # Examples
-///
-/// A basic scoped thread:
-///
-/// ```
-/// crossbeam_utils::thread::scope(|scope| {
-///     scope.spawn(|| {
-///         println!("Hello from a scoped thread!");
-///     });
-/// });
-/// ```
-///
-/// When writing concurrent Rust programs, you'll sometimes see a pattern like this, using
-/// [`std::thread::spawn`][spawn]:
-///
-/// ```ignore
-/// let array = [1, 2, 3];
-/// let mut guards = vec![];
-///
-/// for i in &array {
-///     let guard = std::thread::spawn(move || {
-///         println!("element: {}", i);
-///     });
-///
-///     guards.push(guard);
-/// }
-///
-/// for guard in guards {
-///     guard.join().unwrap();
-/// }
-/// ```
-///
-/// The basic pattern is:
-///
-/// 1. Iterate over some collection.
-/// 2. Spin up a thread to operate on each part of the collection.
-/// 3. Join all the threads.
-///
-/// However, this code actually gives an error:
-///
-/// ```text
-/// error: `array` does not live long enough
-/// for i in &array {
-///           ^~~~~
-/// in expansion of for loop expansion
-/// note: expansion site
-/// note: reference must be valid for the static lifetime...
-/// note: ...but borrowed value is only valid for the block suffix following statement 0 at ...
-///     let array = [1, 2, 3];
-///     let mut guards = vec![];
-///
-///     for i in &array {
-///         let guard = std::thread::spawn(move || {
-///             println!("element: {}", i);
-/// ...
-/// error: aborting due to previous error
-/// ```
-///
-/// Because [`std::thread::spawn`][spawn] doesn't know about this scope, it requires a
-/// `'static` lifetime. One way of giving it a proper lifetime is to use an [`Arc`][arc]:
-///
-/// [arc]: http://doc.rust-lang.org/stable/std/sync/struct.Arc.html
-/// [spawn]: https://doc.rust-lang.org/stable/std/thread/fn.spawn.html
-///
-/// ```
-/// use std::sync::Arc;
-///
-/// let array = Arc::new([1, 2, 3]);
-/// let mut guards = vec![];
-///
-/// for i in 0..array.len() {
-///     let a = array.clone();
-///
-///     let guard = std::thread::spawn(move || {
-///         println!("element: {}", a[i]);
-///     });
-///
-///     guards.push(guard);
-/// }
-///
-/// for guard in guards {
-///     guard.join().unwrap();
-/// }
-/// ```
-///
-/// But this introduces unnecessary allocation, as `Arc<T>` puts its data on the heap, and we
-/// also end up dealing with reference counts. We know that we're joining the threads before
-/// our function returns, so just taking a reference _should_ be safe. Rust can't know that,
-/// though.
-///
-/// Enter scoped threads. Here's our original example, using `spawn` from crossbeam rather
-/// than from `std::thread`:
-///
-/// ```
-/// let array = [1, 2, 3];
-///
-/// crossbeam_utils::thread::scope(|scope| {
-///     for i in &array {
-///         scope.spawn(move || {
-///             println!("element: {}", i);
-///         });
-///     }
-/// });
-/// ```
-///
-/// Much more straightforward.
-// FIXME(jeehoonkang): maybe we should create a new crate for scoped threads.
-
-use std::cell::RefCell;
-use std::fmt;
-use std::marker::PhantomData;
-use std::mem::{self, ManuallyDrop};
-use std::ops::DerefMut;
-use std::rc::Rc;
-use std::thread;
-use std::io;
-
-#[doc(hidden)]
-trait FnBox<T> {
-    fn call_box(self: Box<Self>) -> T;
-}
-
-impl<T, F: FnOnce() -> T> FnBox<T> for F {
-    fn call_box(self: Box<Self>) -> T {
-        (*self)()
-    }
-}
-
-/// Like `std::thread::spawn`, but without the closure bounds.
-pub unsafe fn spawn_unchecked<'a, F>(f: F) -> thread::JoinHandle<()>
-where
-    F: FnOnce() + Send + 'a,
-{
-    let builder = thread::Builder::new();
-    builder_spawn_unchecked(builder, f).unwrap()
-}
-
-/// Like `std::thread::Builder::spawn`, but without the closure bounds.
-pub unsafe fn builder_spawn_unchecked<'a, F>(
-    builder: thread::Builder,
-    f: F,
-) -> io::Result<thread::JoinHandle<()>>
-where
-    F: FnOnce() + Send + 'a,
-{
-    let closure: Box<FnBox<()> + 'a> = Box::new(f);
-    let closure: Box<FnBox<()> + Send> = mem::transmute(closure);
-    builder.spawn(move || closure.call_box())
-}
-
-pub struct Scope<'a> {
-    /// The list of the deferred functions and thread join jobs.
-    dtors: RefCell<Option<DtorChain<'a, ()>>>,
-    // !Send + !Sync
-    _marker: PhantomData<*const ()>,
-}
-
-struct DtorChain<'a, T> {
-    dtor: Box<FnBox<T> + 'a>,
-    next: Option<Box<DtorChain<'a, T>>>,
-}
-
-impl<'a, T> DtorChain<'a, T> {
-    pub fn pop(chain: &mut Option<DtorChain<'a, T>>) -> Option<Box<FnBox<T> + 'a>> {
-        chain.take().map(|mut node| {
-            *chain = node.next.take().map(|b| *b);
-            node.dtor
-        })
-    }
-}
-
-struct JoinState<T> {
-    join_handle: thread::JoinHandle<()>,
-    result: usize,
-    _marker: PhantomData<T>,
-}
-
-impl<T: Send> JoinState<T> {
-    fn new(join_handle: thread::JoinHandle<()>, result: usize) -> JoinState<T> {
-        JoinState {
-            join_handle: join_handle,
-            result: result,
-            _marker: PhantomData,
-        }
-    }
-
-    fn join(self) -> thread::Result<T> {
-        let result = self.result;
-        self.join_handle.join().map(|_| {
-            unsafe { ManuallyDrop::into_inner(*Box::from_raw(result as *mut ManuallyDrop<T>))}
-        })
-    }
-}
-
-/// A handle to a scoped thread
-pub struct ScopedJoinHandle<'a, T: 'a> {
-    // !Send + !Sync
-    inner: Rc<RefCell<Option<JoinState<T>>>>,
-    thread: thread::Thread,
-    _marker: PhantomData<&'a T>,
-}
-
-/// Create a new `scope`, for deferred destructors.
-///
-/// Scopes, in particular, support [*scoped thread spawning*](struct.Scope.html#method.spawn).
-///
-/// # Examples
-///
-/// Creating and using a scope:
-///
-/// ```
-/// crossbeam_utils::thread::scope(|scope| {
-///     scope.defer(|| println!("Exiting scope"));
-///     scope.spawn(|| println!("Running child thread in scope"))
-/// });
-/// // Prints messages in the reverse order written
-/// ```
-///
-/// # Panics
-///
-/// `thread::scope()` panics if a spawned thread panics but it is not joined inside the scope.
-pub fn scope<'a, F, R>(f: F) -> R
-where
-    F: FnOnce(&Scope<'a>) -> R,
-{
-    let mut scope = Scope {
-        dtors: RefCell::new(None),
-        _marker: PhantomData,
-    };
-    let ret = f(&scope);
-    scope.drop_all();
-    ret
-}
-
-impl<'a> fmt::Debug for Scope<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Scope {{ ... }}")
-    }
-}
-
-impl<'a, T> fmt::Debug for ScopedJoinHandle<'a, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ScopedJoinHandle {{ ... }}")
-    }
-}
-
-impl<'a> Scope<'a> {
-    // This method is carefully written in a transactional style, so
-    // that it can be called directly and, if any dtor panics, can be
-    // resumed in the unwinding this causes. By initially running the
-    // method outside of any destructor, we avoid any leakage problems
-    // due to @rust-lang/rust#14875.
-    fn drop_all(&mut self) {
-        while let Some(dtor) = DtorChain::pop(&mut self.dtors.borrow_mut()) {
-            dtor.call_box();
-        }
-    }
-
-    /// Schedule code to be executed when exiting the scope.
-    ///
-    /// This is akin to having a destructor on the stack, except that it is
-    /// *guaranteed* to be run. It is guaranteed that the function is called
-    /// after all the spawned threads are joined.
-    pub fn defer<F>(&self, f: F)
-    where
-        F: FnOnce() + 'a,
-    {
-        let mut dtors = self.dtors.borrow_mut();
-        *dtors = Some(DtorChain {
-            dtor: Box::new(f),
-            next: dtors.take().map(Box::new),
-        });
-    }
-
-    /// Create a scoped thread.
-    ///
-    /// `spawn` is similar to the [`spawn`][spawn] function in Rust's standard library. The
-    /// difference is that this thread is scoped, meaning that it's guaranteed to terminate
-    /// before the current stack frame goes away, allowing you to reference the parent stack frame
-    /// directly. This is ensured by having the parent thread join on the child thread before the
-    /// scope exits.
-    ///
-    /// [spawn]: http://doc.rust-lang.org/std/thread/fn.spawn.html
-    pub fn spawn<'s, F, T>(&'s self, f: F) -> ScopedJoinHandle<'a, T>
-    where
-        'a: 's,
-        F: FnOnce() -> T + Send + 'a,
-        T: Send + 'a,
-    {
-        self.builder().spawn(f).unwrap()
-    }
-
-    /// Generates the base configuration for spawning a scoped thread, from which configuration
-    /// methods can be chained.
-    pub fn builder<'s>(&'s self) -> ScopedThreadBuilder<'s, 'a> {
-        ScopedThreadBuilder {
-            scope: self,
-            builder: thread::Builder::new(),
-        }
-    }
-}
-
-/// Scoped thread configuration. Provides detailed control over the properties and behavior of new
-/// scoped threads.
-pub struct ScopedThreadBuilder<'s, 'a: 's> {
-    scope: &'s Scope<'a>,
-    builder: thread::Builder,
-}
-
-impl<'s, 'a: 's> ScopedThreadBuilder<'s, 'a> {
-    /// Names the thread-to-be. Currently the name is used for identification only in panic
-    /// messages.
-    pub fn name(mut self, name: String) -> ScopedThreadBuilder<'s, 'a> {
-        self.builder = self.builder.name(name);
-        self
-    }
-
-    /// Sets the size of the stack for the new thread.
-    pub fn stack_size(mut self, size: usize) -> ScopedThreadBuilder<'s, 'a> {
-        self.builder = self.builder.stack_size(size);
-        self
-    }
-
-    /// Spawns a new thread, and returns a join handle for it.
-    pub fn spawn<F, T>(self, f: F) -> io::Result<ScopedJoinHandle<'a, T>>
-    where
-        F: FnOnce() -> T + Send + 'a,
-        T: Send + 'a,
-    {
-        // The `Box` constructed below is written only by the spawned thread,
-        // and read by the current thread only after the spawned thread is
-        // joined (`JoinState::join()`). Thus there are no data races.
-        let result = Box::into_raw(Box::<ManuallyDrop<T>>::new(unsafe { mem::uninitialized() })) as usize;
-
-        let join_handle = try!(unsafe {
-            builder_spawn_unchecked(self.builder, move || {
-                let mut result = Box::from_raw(result as *mut ManuallyDrop<T>);
-                *result = ManuallyDrop::new(f());
-                mem::forget(result);
-            })
-        });
-        let thread = join_handle.thread().clone();
-
-        let join_state = JoinState::<T>::new(join_handle, result);
-        let deferred_handle = Rc::new(RefCell::new(Some(join_state)));
-        let my_handle = deferred_handle.clone();
-
-        self.scope.defer(move || {
-            let state = mem::replace(deferred_handle.borrow_mut().deref_mut(), None);
-            if let Some(state) = state {
-                state.join().unwrap();
-            }
-        });
-
-        Ok(ScopedJoinHandle {
-            inner: my_handle,
-            thread: thread,
-            _marker: PhantomData,
-        })
-    }
-}
-
-impl<'a, T: Send + 'a> ScopedJoinHandle<'a, T> {
-    /// Join the scoped thread, returning the result it produced.
-    pub fn join(self) -> thread::Result<T> {
-        let state = mem::replace(self.inner.borrow_mut().deref_mut(), None);
-        state.unwrap().join()
-    }
-
-    /// Get the underlying thread handle.
-    pub fn thread(&self) -> &thread::Thread {
-        &self.thread
-    }
-}
-
-impl<'a> Drop for Scope<'a> {
-    fn drop(&mut self) {
-        self.drop_all()
-    }
-}
diff -Nru cargo-0.32.0/vendor/crossbeam-utils-0.5.0/.travis.yml cargo-0.33.0/vendor/crossbeam-utils-0.5.0/.travis.yml
--- cargo-0.32.0/vendor/crossbeam-utils-0.5.0/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crossbeam-utils-0.5.0/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-language: rust
-
-rust:
-  - stable
-  - beta
-  - nightly
-  - 1.25.0
-
-script:
-  - cargo build
-  - cargo build --release
-  - cargo build --no-default-features
-  - cargo build --release --no-default-features
-  - cargo test
-  - cargo test --release
-  - |
-    if [ $TRAVIS_RUST_VERSION == nightly ]; then
-      cargo test --features nightly
-      cargo test --features nightly --release
-    fi
diff -Nru cargo-0.32.0/vendor/crypto-hash/.cargo-checksum.json cargo-0.33.0/vendor/crypto-hash/.cargo-checksum.json
--- cargo-0.32.0/vendor/crypto-hash/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"}
\ No newline at end of file
+{"files":{},"package":"20ff87d28defc77c9980a5b81cae1a33c791dd0ead8af0cee0833eb98c8305b9"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/crypto-hash/Cargo.toml cargo-0.33.0/vendor/crypto-hash/Cargo.toml
--- cargo-0.32.0/vendor/crypto-hash/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "crypto-hash"
-version = "0.3.1"
+version = "0.3.3"
 authors = ["Mark Lee"]
 exclude = [".*.yml", "ci/*"]
 description = "A wrapper for OS-level cryptographic hash functions"
@@ -23,10 +23,10 @@
 repository = "https://github.com/malept/crypto-hash"
 [dependencies.hex]
 version = "0.3"
-[target."cfg(not(any(target_os = \"windows\", target_os = \"macos\")))".dependencies.openssl]
-version = "0.10"
-[target."cfg(target_os = \"macos\")".dependencies.commoncrypto]
+[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.commoncrypto]
 version = "0.2"
+[target."cfg(not(any(target_os = \"windows\", target_os = \"macos\", target_os = \"ios\")))".dependencies.openssl]
+version = "0.10"
 [target."cfg(target_os = \"windows\")".dependencies.winapi]
 version = "0.3"
 features = ["minwindef", "wincrypt"]
diff -Nru cargo-0.32.0/vendor/crypto-hash/Makefile cargo-0.33.0/vendor/crypto-hash/Makefile
--- cargo-0.32.0/vendor/crypto-hash/Makefile	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/Makefile	2019-02-06 04:11:58.000000000 +0000
@@ -26,4 +26,4 @@
 	$(CARGO) fmt
 
 lint:
-	$(CARGO) +nightly clippy -- --allow clippy-pedantic
+	$(CARGO) +nightly clippy -- --allow clippy::pedantic
diff -Nru cargo-0.32.0/vendor/crypto-hash/NEWS.md cargo-0.33.0/vendor/crypto-hash/NEWS.md
--- cargo-0.32.0/vendor/crypto-hash/NEWS.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/NEWS.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,6 +1,24 @@
-# Changes by Version
+# `crypto-hash`: Changes by Version
 
-## Unreleased
+## [Unreleased](https://github.com/malept/crypto-hash/compare/v0.3.3...master)
+
+## [0.3.3] - 2018-12-20
+
+[0.3.3]: https://github.com/malept/crypto-hash/compare/v0.3.2...v0.3.3
+
+### Changed
+
+* Revert API change (#6)
+
+## [0.3.2] - 2018-12-20
+
+[0.3.2]: https://github.com/malept/crypto-hash/compare/v0.3.1...v0.3.2
+
+**Note: This release was yanked from Cargo due to #6.**
+
+### Added
+
+* iOS support
 
 ## [0.3.1] - 2018-02-14
 
diff -Nru cargo-0.32.0/vendor/crypto-hash/src/imp/commoncrypto.rs cargo-0.33.0/vendor/crypto-hash/src/imp/commoncrypto.rs
--- cargo-0.32.0/vendor/crypto-hash/src/imp/commoncrypto.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/src/imp/commoncrypto.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,9 +20,9 @@
 
 //! A cryptographic hash generator dependent upon OSX's `CommonCrypto`.
 
+use super::Algorithm;
 use commoncrypto::hash;
 use std::io;
-use super::Algorithm;
 
 /// Generator of digests using a cryptographic hash function.
 ///
diff -Nru cargo-0.32.0/vendor/crypto-hash/src/imp/cryptoapi.rs cargo-0.33.0/vendor/crypto-hash/src/imp/cryptoapi.rs
--- cargo-0.32.0/vendor/crypto-hash/src/imp/cryptoapi.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/src/imp/cryptoapi.rs	2019-02-06 04:11:58.000000000 +0000
@@ -24,21 +24,22 @@
 //! https://github.com/rust-lang/cargo/blob/0.10.0/src/cargo/util/sha256.rs
 //! which is copyright (c) 2014 The Rust Project Developers under the MIT license.
 
+use super::Algorithm;
 use std::io;
 use std::ptr;
-use super::Algorithm;
 use winapi::shared::minwindef::DWORD;
-use winapi::um::wincrypt::{CALG_MD5, CALG_SHA1, CALG_SHA_256, CALG_SHA_512, CryptAcquireContextW,
-                           CryptCreateHash, CryptDestroyHash, CryptGetHashParam, CryptHashData,
-                           CryptReleaseContext, CRYPT_SILENT, CRYPT_VERIFYCONTEXT, HCRYPTHASH,
-                           HCRYPTPROV, HP_HASHVAL, PROV_RSA_AES};
+use winapi::um::wincrypt::{
+    CryptAcquireContextW, CryptCreateHash, CryptDestroyHash, CryptGetHashParam, CryptHashData,
+    CryptReleaseContext, ALG_ID, CALG_MD5, CALG_SHA1, CALG_SHA_256, CALG_SHA_512, CRYPT_SILENT,
+    CRYPT_VERIFYCONTEXT, HCRYPTHASH, HCRYPTPROV, HP_HASHVAL, PROV_RSA_AES,
+};
 
 macro_rules! call {
-    ($e: expr) => ({
+    ($e:expr) => {{
         if $e == 0 {
             panic!("failed {}: {}", stringify!($e), io::Error::last_os_error())
         }
-    })
+    }};
 }
 
 macro_rules! finish_algorithm {
@@ -79,7 +80,7 @@
 /// assert_eq!(expected, result)
 /// ```
 pub struct Hasher {
-    algorithm: Algorithm,
+    alg_id: ALG_ID,
     hcryptprov: HCRYPTPROV,
     hcrypthash: HCRYPTHASH,
 }
@@ -98,30 +99,39 @@
             )
         });
 
-        let hash_type = match algorithm {
+        let alg_id = match algorithm {
             Algorithm::MD5 => CALG_MD5,
             Algorithm::SHA1 => CALG_SHA1,
             Algorithm::SHA256 => CALG_SHA_256,
             Algorithm::SHA512 => CALG_SHA_512,
         };
 
-        let mut ret = Hasher {
-            algorithm: algorithm,
+        let mut hasher = Hasher {
+            alg_id,
             hcryptprov: hcp,
             hcrypthash: 0,
         };
 
-        call!(unsafe { CryptCreateHash(ret.hcryptprov, hash_type, 0, 0, &mut ret.hcrypthash) });
-        ret
+        call!(unsafe {
+            CryptCreateHash(
+                hasher.hcryptprov,
+                hasher.alg_id,
+                0,
+                0,
+                &mut hasher.hcrypthash,
+            )
+        });
+        hasher
     }
 
     /// Generate a digest from the data written to the `Hasher`.
     pub fn finish(&mut self) -> Vec<u8> {
-        match self.algorithm {
-            Algorithm::MD5 => self.finish_md5(),
-            Algorithm::SHA1 => self.finish_sha1(),
-            Algorithm::SHA256 => self.finish_sha256(),
-            Algorithm::SHA512 => self.finish_sha512(),
+        match self.alg_id {
+            CALG_MD5 => self.finish_md5(),
+            CALG_SHA1 => self.finish_sha1(),
+            CALG_SHA_256 => self.finish_sha256(),
+            CALG_SHA_512 => self.finish_sha512(),
+            _ => panic!("Unknown algorithm {}", self.alg_id),
         }
     }
 
diff -Nru cargo-0.32.0/vendor/crypto-hash/src/imp/openssl.rs cargo-0.33.0/vendor/crypto-hash/src/imp/openssl.rs
--- cargo-0.32.0/vendor/crypto-hash/src/imp/openssl.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/src/imp/openssl.rs	2019-02-06 04:11:58.000000000 +0000
@@ -22,9 +22,9 @@
 
 #![warn(missing_docs)]
 
+use super::Algorithm;
 use openssl::hash;
 use std::io;
-use super::Algorithm;
 
 /// Generator of digests using a cryptographic hash function.
 ///
diff -Nru cargo-0.32.0/vendor/crypto-hash/src/lib.rs cargo-0.33.0/vendor/crypto-hash/src/lib.rs
--- cargo-0.32.0/vendor/crypto-hash/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -43,23 +43,23 @@
 
 #![warn(missing_docs)]
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 extern crate commoncrypto;
 extern crate hex;
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "windows")))]
 extern crate openssl;
 #[cfg(target_os = "windows")]
 extern crate winapi;
 
 use std::io::Write;
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 #[path = "imp/commoncrypto.rs"]
 mod imp;
 #[cfg(target_os = "windows")]
 #[path = "imp/cryptoapi.rs"]
 mod imp;
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "windows")))]
 #[path = "imp/openssl.rs"]
 mod imp;
 
diff -Nru cargo-0.32.0/vendor/crypto-hash/src/test.rs cargo-0.33.0/vendor/crypto-hash/src/test.rs
--- cargo-0.32.0/vendor/crypto-hash/src/test.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/crypto-hash/src/test.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,9 +20,9 @@
 
 #![cfg(test)]
 
+use super::{hex_digest, Algorithm, Hasher};
 use hex;
 use std::io::Write;
-use super::{hex_digest, Algorithm, Hasher};
 
 // From Wikipedia
 const MD5_EMPTY_STRING: &'static str = "d41d8cd98f00b204e9800998ecf8427e";
diff -Nru cargo-0.32.0/vendor/curl/.cargo_vcs_info.json cargo-0.33.0/vendor/curl/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/curl/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "3a309647f1ac35ecd749236e14a16479b804bf16"
-  }
-}
diff -Nru cargo-0.32.0/vendor/curl/ci/.cargo/config cargo-0.33.0/vendor/curl/ci/.cargo/config
--- cargo-0.32.0/vendor/curl/ci/.cargo/config	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl/ci/.cargo/config	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[target.x86_64-pc-windows-gnu]
-linker = "x86_64-w64-mingw32-gcc"
diff -Nru cargo-0.32.0/vendor/curl/.gitmodules cargo-0.33.0/vendor/curl/.gitmodules
--- cargo-0.32.0/vendor/curl/.gitmodules	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl/.gitmodules	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[submodule "curl-sys/curl"]
-	path = curl-sys/curl
-	url = https://github.com/curl/curl
diff -Nru cargo-0.32.0/vendor/curl/.travis.yml cargo-0.33.0/vendor/curl/.travis.yml
--- cargo-0.32.0/vendor/curl/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-language: rust
-sudo: required
-dist: trusty
-services:
-  - docker
-
-matrix:
-  include:
-    - os: linux
-      rust: stable
-      env: TARGET=x86_64-unknown-linux-gnu DOCKER=linux64 NO_ADD=1
-    - os: linux
-      rust: stable
-      env: TARGET=i686-unknown-linux-gnu DOCKER=linux32
-    - os: linux
-      rust: stable
-      env: TARGET=x86_64-unknown-linux-musl DOCKER=musl
-    - os: linux
-      rust: stable
-      env: TARGET=x86_64-pc-windows-gnu NO_RUN=1 DOCKER=mingw
-    - os: linux
-      rust: stable
-      env: TARGET=x86_64-unknown-linux-gnu DOCKER=linux64-curl NO_ADD=1
-    - os: osx
-      rust: stable
-      env: TARGET=x86_64-apple-darwin NO_ADD=1
-      script: sh ci/run.sh
-    - os: osx
-      rust: stable
-      install: true
-      script: cargo build --features curl-sys/static-curl
-    - os: osx
-      rust: stable
-      env: TARGET=i686-apple-darwin
-      script: sh ci/run.sh
-    - os: linux
-      rust: beta
-      env: TARGET=x86_64-unknown-linux-gnu DOCKER=linux64 NO_ADD=1
-    - os: linux
-      rust: nightly
-      env: TARGET=x86_64-unknown-linux-gnu DOCKER=linux64 NO_ADD=1
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      after_success:
-        - travis-cargo doc-upload
-sudo: false
-install:
-  - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
-script:
-  - curl --version
-  - cargo generate-lockfile
-  - mkdir .cargo target;
-    docker build -t rust -f ci/Dockerfile-$DOCKER ci;
-    docker run
-     -w /src
-     -v `pwd`:/src:ro
-     -v `pwd`/target:/src/target
-     -v `pwd`/ci/.cargo:/src/.cargo:ro
-     -v `rustc --print sysroot`:/usr/local:ro
-     -e TARGET=$TARGET
-     -e NO_RUN=$NO_RUN
-     -e CARGO_TARGET_DIR=/src/target
-     -it rust
-     sh ci/run.sh
-
-notifications:
-  email:
-    on_success: never
-env:
-  global:
-    secure: "j4son34/PmqogLMUHgcvOk+XtyUtcd0aAA8Sa/h4pyupw8AEM7+5DMMIrcrRh7ieKqmL2RSSGnYtYbd2b5yYroudypsqmQhK0StzrtPaftl/8zxw8liXzA9rat8MP0vuEAe5w9KLRdFKUCU7TzcYXcKttpbavqdNsJae+OFzHJc="
diff -Nru cargo-0.32.0/vendor/curl-sys/build.rs cargo-0.33.0/vendor/curl-sys/build.rs
--- cargo-0.32.0/vendor/curl-sys/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl-sys/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -251,8 +251,14 @@
         if cfg!(feature = "ssl") {
             if target.contains("-apple-") {
                 cfg.define("USE_DARWINSSL", None)
-                    .define("HAVE_BUILTIN_AVAILABLE", "1")
                     .file("curl/lib/vtls/darwinssl.c");
+                if xcode_major_version().map_or(true, |v| v >= 9) {
+                    // On earlier Xcode versions (<9), defining HAVE_BUILTIN_AVAILABLE
+                    // would cause __bultin_available() to fail to compile due to
+                    // unrecognized platform names, so we try to check for Xcode
+                    // version first (if unknown, assume it's recent, as in >= 9).
+                    cfg.define("HAVE_BUILTIN_AVAILABLE", "1");
+                }
             } else {
                 cfg.define("USE_OPENSSL", None)
                     .file("curl/lib/vtls/openssl.c");
@@ -384,6 +390,23 @@
     return true
 }
 
+fn xcode_major_version() -> Option<u8> {
+    let output = Command::new("xcodebuild")
+        .arg("-version")
+        .output()
+        .ok()?;
+    if output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let mut words = stdout.split_whitespace();
+        if words.next()? == "Xcode" {
+            let version = words.next()?;
+            return version[..version.find('.')?].parse().ok()
+        }
+    }
+    println!("unable to determine Xcode version, assuming >= 9");
+    None
+}
+
 fn curl_config_reports_http2() -> bool {
     let output = Command::new("curl-config")
         .arg("--features")
diff -Nru cargo-0.32.0/vendor/curl-sys/.cargo-checksum.json cargo-0.33.0/vendor/curl-sys/.cargo-checksum.json
--- cargo-0.32.0/vendor/curl-sys/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl-sys/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"721c204978be2143fab0a84b708c49d79d1f6100b8785610f456043a90708870"}
\ No newline at end of file
+{"files":{},"package":"ca79238a79fb294be6173b4057c95b22a718c94c4e38475d5faa82b8383f3502"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/curl-sys/Cargo.toml cargo-0.33.0/vendor/curl-sys/Cargo.toml
--- cargo-0.32.0/vendor/curl-sys/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl-sys/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,8 +12,8 @@
 
 [package]
 name = "curl-sys"
-version = "0.4.15"
-authors = ["Carl Lerche <me@carllerche.com>", "Alex Crichton <alex@alexcrichton.com>"]
+version = "0.4.16"
+authors = ["Alex Crichton <alex@alexcrichton.com>"]
 build = "build.rs"
 links = "curl"
 description = "Native bindings to the libcurl library"
diff -Nru cargo-0.32.0/vendor/curl-sys/.cargo_vcs_info.json cargo-0.33.0/vendor/curl-sys/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/curl-sys/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/curl-sys/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "2e218c689438aa12419f11083f19418def00bda3"
-  }
-}
diff -Nru cargo-0.32.0/vendor/env_logger/.cargo-checksum.json cargo-0.33.0/vendor/env_logger/.cargo-checksum.json
--- cargo-0.32.0/vendor/env_logger/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"}
\ No newline at end of file
+{"files":{},"package":"afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger/Cargo.toml cargo-0.33.0/vendor/env_logger/Cargo.toml
--- cargo-0.32.0/vendor/env_logger/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "env_logger"
-version = "0.5.13"
+version = "0.6.0"
 authors = ["The Rust Project Developers"]
 description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"
 documentation = "https://docs.rs/env_logger"
@@ -29,11 +29,17 @@
 [[test]]
 name = "log-in-log"
 harness = false
+
+[[test]]
+name = "init-twice-retains-filter"
+harness = false
 [dependencies.atty]
 version = "0.2.5"
+optional = true
 
 [dependencies.humantime]
 version = "1.1"
+optional = true
 
 [dependencies.log]
 version = "0.4"
@@ -44,7 +50,8 @@
 optional = true
 
 [dependencies.termcolor]
-version = "1"
+version = "1.0.2"
+optional = true
 
 [features]
-default = ["regex"]
+default = ["termcolor", "atty", "humantime", "regex"]
diff -Nru cargo-0.32.0/vendor/env_logger/examples/custom_format.rs cargo-0.33.0/vendor/env_logger/examples/custom_format.rs
--- cargo-0.32.0/vendor/env_logger/examples/custom_format.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/examples/custom_format.rs	2019-02-06 04:11:58.000000000 +0000
@@ -33,6 +33,8 @@
     let mut builder = Builder::from_env(env);
 
     // Use a different format for writing log records
+    // The colors are only available when the `termcolor` dependency is (which it is by default)
+    #[cfg(feature = "termcolor")]
     builder.format(|buf, record| {
         let mut style = buf.style();
         style.set_bg(fmt::Color::Yellow).set_bold(true);
diff -Nru cargo-0.32.0/vendor/env_logger/README.md cargo-0.33.0/vendor/env_logger/README.md
--- cargo-0.32.0/vendor/env_logger/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -16,7 +16,7 @@
 ```toml
 [dependencies]
 log = "0.4.0"
-env_logger = "0.5.13"
+env_logger = "0.6.0"
 ```
 
 `env_logger` must be initialized as early as possible in the project. After it's initialized, you can use the `log` macros to do actual logging.
@@ -40,7 +40,7 @@
 
 ```bash
 $ RUST_LOG=info ./main
-INFO: 2017-11-09T02:12:24Z: main: starting up
+[2018-11-03T06:09:06Z INFO  default] starting up
 ```
 
 ### In tests
@@ -52,7 +52,7 @@
 log = "0.4.0"
 
 [dev-dependencies]
-env_logger = "0.5.13"
+env_logger = { version = "0.6.0", default-features = false }
 ```
 
 ```rust
@@ -93,11 +93,11 @@
      Running target/debug/my_lib-...
 
 running 2 tests
-INFO: 2017-11-09T02:12:24Z: my_lib::tests: logging from another test
-INFO: 2017-11-09T02:12:24Z: my_lib: add_one called with -8
+[INFO my_lib::tests] logging from another test
+[INFO my_lib] add_one called with -8
 test tests::it_handles_negative_numbers ... ok
-INFO: 2017-11-09T02:12:24Z: my_lib::tests: can log from the test too
-INFO: 2017-11-09T02:12:24Z: my_lib: add_one called with 2
+[INFO my_lib::tests] can log from the test too
+[INFO my_lib] add_one called with 2
 test tests::it_adds_one ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured
@@ -115,8 +115,8 @@
      Running target/debug/my_lib-...
 
 running 1 test
-INFO: 2017-11-09T02:12:24Z: my_lib::tests: can log from the test too
-INFO: 2017-11-09T02:12:24Z: my_lib: add_one called with 2
+[INFO my_lib::tests] can log from the test too
+[INFO my_lib] add_one called with 2
 test tests::it_adds_one ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
@@ -131,10 +131,14 @@
 use std::env;
 use env_logger::{Builder, Target};
 
-let mut builder = Builder::new();
+let mut builder = Builder::from_default_env();
 builder.target(Target::Stdout);
-if env::var("RUST_LOG").is_ok() {
-    builder.parse(&env::var("RUST_LOG").unwrap());
-}
+
 builder.init();
 ```
+
+## Stability of the default format
+
+The default format won't optimise for long-term stability, and explicitly makes no guarantees about the stability of its output across major, minor or patch version bumps during `0.x`.
+
+If you want to capture or interpret the output of `env_logger` programmatically then you should use a custom format.
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger/src/filter/mod.rs cargo-0.33.0/vendor/env_logger/src/filter/mod.rs
--- cargo-0.32.0/vendor/env_logger/src/filter/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/filter/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -116,6 +116,7 @@
 pub struct Builder {
     directives: Vec<Directive>,
     filter: Option<inner::Filter>,
+    built: bool,
 }
 
 #[derive(Debug)]
@@ -183,6 +184,7 @@
         Builder {
             directives: Vec::new(),
             filter: None,
+            built: false,
         }
     }
 
@@ -239,6 +241,9 @@
 
     /// Build a log filter.
     pub fn build(&mut self) -> Filter {
+        assert!(!self.built, "attempt to re-use consumed builder");
+        self.built = true;
+
         if self.directives.is_empty() {
             // Adds the default filter if none exist
             self.directives.push(Directive {
@@ -279,10 +284,16 @@
 
 impl fmt::Debug for Builder {
     fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Filter")
+        if self.built {
+            f.debug_struct("Filter")
+            .field("built", &true)
+            .finish()
+        } else {
+            f.debug_struct("Filter")
             .field("filter", &self.filter)
             .field("directives", &self.directives)
             .finish()
+        }
     }
 }
 
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/humantime/extern_impl.rs cargo-0.33.0/vendor/env_logger/src/fmt/humantime/extern_impl.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/humantime/extern_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/humantime/extern_impl.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,84 @@
+use std::fmt;
+use std::time::SystemTime;
+
+use humantime::{format_rfc3339_nanos, format_rfc3339_seconds};
+
+use ::fmt::Formatter;
+
+pub(in ::fmt) mod glob {
+    pub use super::*;
+}
+
+impl Formatter {
+    /// Get a [`Timestamp`] for the current date and time in UTC.
+    ///
+    /// # Examples
+    ///
+    /// Include the current timestamp with the log record:
+    ///
+    /// ```
+    /// use std::io::Write;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let ts = buf.timestamp();
+    ///
+    ///     writeln!(buf, "{}: {}: {}", ts, record.level(), record.args())
+    /// });
+    /// ```
+    ///
+    /// [`Timestamp`]: struct.Timestamp.html
+    pub fn timestamp(&self) -> Timestamp {
+        Timestamp(SystemTime::now())
+    }
+
+    /// Get a [`PreciseTimestamp`] for the current date and time in UTC with nanos.
+    pub fn precise_timestamp(&self) -> PreciseTimestamp {
+        PreciseTimestamp(SystemTime::now())
+    }
+}
+
+/// An [RFC3339] formatted timestamp.
+///
+/// The timestamp implements [`Display`] and can be written to a [`Formatter`].
+///
+/// [RFC3339]: https://www.ietf.org/rfc/rfc3339.txt
+/// [`Display`]: https://doc.rust-lang.org/stable/std/fmt/trait.Display.html
+/// [`Formatter`]: struct.Formatter.html
+pub struct Timestamp(SystemTime);
+
+/// An [RFC3339] formatted timestamp with nanos.
+///
+/// [RFC3339]: https://www.ietf.org/rfc/rfc3339.txt
+#[derive(Debug)]
+pub struct PreciseTimestamp(SystemTime);
+
+impl fmt::Debug for Timestamp {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        /// A `Debug` wrapper for `Timestamp` that uses the `Display` implementation.
+        struct TimestampValue<'a>(&'a Timestamp);
+
+        impl<'a> fmt::Debug for TimestampValue<'a> {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                fmt::Display::fmt(&self.0, f)
+            }
+        }
+
+        f.debug_tuple("Timestamp")
+        .field(&TimestampValue(&self))
+        .finish()
+    }
+}
+
+impl fmt::Display for Timestamp {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        format_rfc3339_seconds(self.0).fmt(f)
+    }
+}
+
+impl fmt::Display for PreciseTimestamp {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        format_rfc3339_nanos(self.0).fmt(f)
+    }
+}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/humantime/mod.rs cargo-0.33.0/vendor/env_logger/src/fmt/humantime/mod.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/humantime/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/humantime/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,11 @@
+/*
+This internal module contains the timestamp implementation.
+
+Its public API is available when the `humantime` crate is available.
+*/
+
+#[cfg_attr(feature = "humantime", path = "extern_impl.rs")]
+#[cfg_attr(not(feature = "humantime"), path = "shim_impl.rs")]
+mod imp;
+
+pub(in ::fmt) use self::imp::*;
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/humantime/shim_impl.rs cargo-0.33.0/vendor/env_logger/src/fmt/humantime/shim_impl.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/humantime/shim_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/humantime/shim_impl.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,7 @@
+/*
+Timestamps aren't available when we don't have a `humantime` dependency.
+*/
+
+pub(in ::fmt) mod glob {
+    
+}
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/mod.rs cargo-0.33.0/vendor/env_logger/src/fmt/mod.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,356 @@
+//! Formatting for log records.
+//!
+//! This module contains a [`Formatter`] that can be used to format log records
+//! into without needing temporary allocations. Usually you won't need to worry
+//! about the contents of this module and can use the `Formatter` like an ordinary
+//! [`Write`].
+//!
+//! # Formatting log records
+//!
+//! The format used to print log records can be customised using the [`Builder::format`]
+//! method.
+//! Custom formats can apply different color and weight to printed values using
+//! [`Style`] builders.
+//!
+//! ```
+//! use std::io::Write;
+//!
+//! let mut builder = env_logger::Builder::new();
+//!
+//! builder.format(|buf, record| {
+//!     writeln!(buf, "{}: {}",
+//!         record.level(),
+//!         record.args())
+//! });
+//! ```
+//!
+//! [`Formatter`]: struct.Formatter.html
+//! [`Style`]: struct.Style.html
+//! [`Builder::format`]: ../struct.Builder.html#method.format
+//! [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
+
+use std::io::prelude::*;
+use std::{io, fmt, mem};
+use std::rc::Rc;
+use std::cell::RefCell;
+use std::fmt::Display;
+
+use log::Record;
+
+pub(crate) mod writer;
+mod humantime;
+
+pub use self::humantime::glob::*;
+pub use self::writer::glob::*;
+
+use self::writer::{Writer, Buffer};
+
+pub(crate) mod glob {
+    pub use super::{Target, WriteStyle};
+}
+
+/// A formatter to write logs into.
+///
+/// `Formatter` implements the standard [`Write`] trait for writing log records.
+/// It also supports terminal colors, through the [`style`] method.
+///
+/// # Examples
+///
+/// Use the [`writeln`] macro to format a log record.
+/// An instance of a `Formatter` is passed to an `env_logger` format as `buf`:
+///
+/// ```
+/// use std::io::Write;
+///
+/// let mut builder = env_logger::Builder::new();
+///
+/// builder.format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args()));
+/// ```
+///
+/// [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
+/// [`writeln`]: https://doc.rust-lang.org/stable/std/macro.writeln.html
+/// [`style`]: #method.style
+pub struct Formatter {
+    buf: Rc<RefCell<Buffer>>,
+    write_style: WriteStyle,
+}
+
+impl Formatter {
+    pub(crate) fn new(writer: &Writer) -> Self {
+        Formatter {
+            buf: Rc::new(RefCell::new(writer.buffer())),
+            write_style: writer.write_style(),
+        }
+    }
+
+    pub(crate) fn write_style(&self) -> WriteStyle {
+        self.write_style
+    }
+
+    pub(crate) fn print(&self, writer: &Writer) -> io::Result<()> {
+        writer.print(&self.buf.borrow())
+    }
+
+    pub(crate) fn clear(&mut self) {
+        self.buf.borrow_mut().clear()
+    }
+}
+
+impl Write for Formatter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.buf.borrow_mut().write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.buf.borrow_mut().flush()
+    }
+}
+
+impl fmt::Debug for Formatter {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Formatter").finish()
+    }
+}
+
+pub(crate) struct Builder {
+    pub default_format_timestamp: bool,
+    pub default_format_timestamp_nanos: bool,
+    pub default_format_module_path: bool,
+    pub default_format_level: bool,
+    pub custom_format: Option<Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>>,
+    built: bool,
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Builder {
+            default_format_timestamp: true,
+            default_format_timestamp_nanos: false,
+            default_format_module_path: true,
+            default_format_level: true,
+            custom_format: None,
+            built: false,
+        }
+    }
+}
+
+impl Builder {
+    /// Convert the format into a callable function.
+    /// 
+    /// If the `custom_format` is `Some`, then any `default_format` switches are ignored.
+    /// If the `custom_format` is `None`, then a default format is returned.
+    /// Any `default_format` switches set to `false` won't be written by the format.
+    pub fn build(&mut self) -> Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send> {
+        assert!(!self.built, "attempt to re-use consumed builder");
+
+        let built = mem::replace(self, Builder {
+            built: true,
+            ..Default::default()
+        });
+
+        if let Some(fmt) = built.custom_format {
+            fmt
+        }
+        else {
+            Box::new(move |buf, record| {
+                let fmt = DefaultFormat {
+                    timestamp: built.default_format_timestamp,
+                    timestamp_nanos: built.default_format_timestamp_nanos,
+                    module_path: built.default_format_module_path,
+                    level: built.default_format_level,
+                    written_header_value: false,
+                    buf,
+                };
+
+                fmt.write(record)
+            })
+        }
+    }
+}
+
+#[cfg(feature = "termcolor")]
+type SubtleStyle = StyledValue<'static, &'static str>;
+#[cfg(not(feature = "termcolor"))]
+type SubtleStyle = &'static str;
+
+/// The default format.
+/// 
+/// This format needs to work with any combination of crate features.
+struct DefaultFormat<'a> {
+    timestamp: bool,
+    module_path: bool,
+    level: bool,
+    timestamp_nanos: bool,
+    written_header_value: bool,
+    buf: &'a mut Formatter,
+}
+
+impl<'a> DefaultFormat<'a> {
+    fn write(mut self, record: &Record) -> io::Result<()> {
+        self.write_timestamp()?;
+        self.write_level(record)?;
+        self.write_module_path(record)?;
+        self.finish_header()?;
+
+        self.write_args(record)
+    }
+
+    fn subtle_style(&self, text: &'static str) -> SubtleStyle {
+        #[cfg(feature = "termcolor")]
+        {
+            self.buf.style()
+                .set_color(Color::Black)
+                .set_intense(true)
+                .into_value(text)
+        }
+        #[cfg(not(feature = "termcolor"))]
+        {
+            text
+        }
+    }
+
+    fn write_header_value<T>(&mut self, value: T) -> io::Result<()>
+    where
+        T: Display,
+    {
+        if !self.written_header_value {
+            self.written_header_value = true;
+
+            let open_brace = self.subtle_style("[");
+            write!(self.buf, "{}{}", open_brace, value)
+        } else {
+            write!(self.buf, " {}", value)
+        }
+    }
+
+    fn write_level(&mut self, record: &Record) -> io::Result<()> {
+        if !self.level {
+            return Ok(())
+        }
+
+        let level = {
+            #[cfg(feature = "termcolor")]
+            {
+                self.buf.default_styled_level(record.level())
+            }
+            #[cfg(not(feature = "termcolor"))]
+            {
+                record.level()
+            }
+        };
+
+        self.write_header_value(format_args!("{:<5}", level))
+    }
+
+    fn write_timestamp(&mut self) -> io::Result<()> {
+        #[cfg(feature = "humantime")]
+        {
+            if !self.timestamp {
+                return Ok(())
+            }
+
+            if self.timestamp_nanos {
+                let ts_nanos = self.buf.precise_timestamp();
+                self.write_header_value(ts_nanos)
+            } else {
+                let ts = self.buf.timestamp();
+                self.write_header_value(ts)
+            }
+        }
+        #[cfg(not(feature = "humantime"))]
+        {
+            let _ = self.timestamp;
+            let _ = self.timestamp_nanos;
+            Ok(())
+        }
+    }
+
+    fn write_module_path(&mut self, record: &Record) -> io::Result<()> {
+        if !self.module_path {
+            return Ok(())
+        }
+
+        if let Some(module_path) = record.module_path() {
+            self.write_header_value(module_path)
+        } else {
+            Ok(())
+        }
+    }
+
+    fn finish_header(&mut self) -> io::Result<()> {
+        if self.written_header_value {
+            let close_brace = self.subtle_style("]");
+            write!(self.buf, "{} ", close_brace)
+        } else {
+            Ok(())
+        }
+    }
+
+    fn write_args(&mut self, record: &Record) -> io::Result<()> {
+        writeln!(self.buf, "{}", record.args())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use log::{Level, Record};
+
+    fn write(fmt: DefaultFormat) -> String {
+        let buf = fmt.buf.buf.clone();
+
+        let record = Record::builder()
+            .args(format_args!("log message"))
+            .level(Level::Info)
+            .file(Some("test.rs"))
+            .line(Some(144))
+            .module_path(Some("test::path"))
+            .build();
+
+        fmt.write(&record).expect("failed to write record");
+
+        let buf = buf.borrow();
+        String::from_utf8(buf.bytes().to_vec()).expect("failed to read record")
+    }
+
+    #[test]
+    fn default_format_with_header() {
+        let writer = writer::Builder::new()
+            .write_style(WriteStyle::Never)
+            .build();
+
+        let mut f = Formatter::new(&writer);
+
+        let written = write(DefaultFormat {
+            timestamp: false,
+            timestamp_nanos: false,
+            module_path: true,
+            level: true,
+            written_header_value: false,
+            buf: &mut f,
+        });
+
+        assert_eq!("[INFO  test::path] log message\n", written);
+    }
+
+    #[test]
+    fn default_format_no_header() {
+        let writer = writer::Builder::new()
+            .write_style(WriteStyle::Never)
+            .build();
+
+        let mut f = Formatter::new(&writer);
+
+        let written = write(DefaultFormat {
+            timestamp: false,
+            timestamp_nanos: false,
+            module_path: false,
+            level: false,
+            written_header_value: false,
+            buf: &mut f,
+        });
+
+        assert_eq!("log message\n", written);
+    }
+}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/writer/atty.rs cargo-0.33.0/vendor/env_logger/src/fmt/writer/atty.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/writer/atty.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/writer/atty.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+This internal module contains the terminal detection implementation.
+
+If the `atty` crate is available then we use it to detect whether we're
+attached to a particular TTY. If the `atty` crate is not available we
+assume we're not attached to anything. This effectively prevents styles
+from being printed.
+*/
+
+#[cfg(feature = "atty")]
+mod imp {
+    use atty;
+
+    pub(in ::fmt) fn is_stdout() -> bool {
+        atty::is(atty::Stream::Stdout)
+    }
+
+    pub(in ::fmt) fn is_stderr() -> bool {
+        atty::is(atty::Stream::Stderr)
+    }
+}
+
+#[cfg(not(feature = "atty"))]
+mod imp {
+    pub(in ::fmt) fn is_stdout() -> bool {
+        false
+    }
+
+    pub(in ::fmt) fn is_stderr() -> bool {
+        false
+    }
+}
+
+pub(in ::fmt) use self::imp::*;
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/writer/mod.rs cargo-0.33.0/vendor/env_logger/src/fmt/writer/mod.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/writer/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/writer/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,198 @@
+mod termcolor;
+mod atty;
+
+use std::{fmt, io};
+use self::termcolor::BufferWriter;
+use self::atty::{is_stdout, is_stderr};
+
+pub(in ::fmt) mod glob {
+    pub use super::termcolor::glob::*;
+    pub use super::*;
+}
+
+pub(in ::fmt) use self::termcolor::Buffer;
+
+/// Log target, either `stdout` or `stderr`.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum Target {
+    /// Logs will be sent to standard output.
+    Stdout,
+    /// Logs will be sent to standard error.
+    Stderr,
+}
+
+impl Default for Target {
+    fn default() -> Self {
+        Target::Stderr
+    }
+}
+
+/// Whether or not to print styles to the target.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum WriteStyle {
+    /// Try to print styles, but don't force the issue.
+    Auto,
+    /// Try very hard to print styles.
+    Always,
+    /// Never print styles.
+    Never,
+}
+
+impl Default for WriteStyle {
+    fn default() -> Self {
+        WriteStyle::Auto
+    }
+}
+
+/// A terminal target with color awareness.
+pub(crate) struct Writer {
+    inner: BufferWriter,
+    write_style: WriteStyle,
+}
+
+impl Writer {
+    pub fn write_style(&self) -> WriteStyle {
+        self.write_style
+    }
+
+    pub(in ::fmt) fn buffer(&self) -> Buffer {
+        self.inner.buffer()
+    }
+
+    pub(in ::fmt) fn print(&self, buf: &Buffer) -> io::Result<()> {
+        self.inner.print(buf)
+    }
+}
+
+/// A builder for a terminal writer.
+///
+/// The target and style choice can be configured before building.
+pub(crate) struct Builder {
+    target: Target,
+    write_style: WriteStyle,
+    built: bool,
+}
+
+impl Builder {
+    /// Initialize the writer builder with defaults.
+    pub fn new() -> Self {
+        Builder {
+            target: Default::default(),
+            write_style: Default::default(),
+            built: false,
+        }
+    }
+
+    /// Set the target to write to.
+    pub fn target(&mut self, target: Target) -> &mut Self {
+        self.target = target;
+        self
+    }
+
+    /// Parses a style choice string.
+    ///
+    /// See the [Disabling colors] section for more details.
+    ///
+    /// [Disabling colors]: ../index.html#disabling-colors
+    pub fn parse(&mut self, write_style: &str) -> &mut Self {
+        self.write_style(parse_write_style(write_style))
+    }
+
+    /// Whether or not to print style characters when writing.
+    pub fn write_style(&mut self, write_style: WriteStyle) -> &mut Self {
+        self.write_style = write_style;
+        self
+    }
+
+    /// Build a terminal writer.
+    pub fn build(&mut self) -> Writer {
+        assert!(!self.built, "attempt to re-use consumed builder");
+        self.built = true;
+
+        let color_choice = match self.write_style {
+            WriteStyle::Auto => {
+                if match self.target {
+                    Target::Stderr => is_stderr(),
+                    Target::Stdout => is_stdout(),
+                } {
+                    WriteStyle::Auto
+                } else {
+                    WriteStyle::Never
+                }
+            },
+            color_choice => color_choice,
+        };
+
+        let writer = match self.target {
+            Target::Stderr => BufferWriter::stderr(color_choice),
+            Target::Stdout => BufferWriter::stdout(color_choice),
+        };
+
+        Writer {
+            inner: writer,
+            write_style: self.write_style,
+        }
+    }
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Builder::new()
+    }
+}
+
+impl fmt::Debug for Builder {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Logger")
+        .field("target", &self.target)
+        .field("write_style", &self.write_style)
+        .finish()
+    }
+}
+
+impl fmt::Debug for Writer {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Writer").finish()
+    }
+}
+
+fn parse_write_style(spec: &str) -> WriteStyle {
+    match spec {
+        "auto" => WriteStyle::Auto,
+        "always" => WriteStyle::Always,
+        "never" => WriteStyle::Never,
+        _ => Default::default(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_write_style_valid() {
+        let inputs = vec![
+            ("auto", WriteStyle::Auto),
+            ("always", WriteStyle::Always),
+            ("never", WriteStyle::Never),
+        ];
+
+        for (input, expected) in inputs {
+            assert_eq!(expected, parse_write_style(input));
+        }
+    }
+
+    #[test]
+    fn parse_write_style_invalid() {
+        let inputs = vec![
+            "",
+            "true",
+            "false",
+            "NEVER!!"
+        ];
+
+        for input in inputs {
+            assert_eq!(WriteStyle::Auto, parse_write_style(input));
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/writer/termcolor/extern_impl.rs cargo-0.33.0/vendor/env_logger/src/fmt/writer/termcolor/extern_impl.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/writer/termcolor/extern_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/writer/termcolor/extern_impl.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,443 @@
+use std::borrow::Cow;
+use std::fmt;
+use std::io::{self, Write};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use log::Level;
+use termcolor::{self, ColorChoice, ColorSpec, WriteColor};
+
+use ::WriteStyle;
+use ::fmt::Formatter;
+
+pub(in ::fmt::writer) mod glob {
+    pub use super::*;
+}
+
+impl Formatter {
+    /// Begin a new [`Style`].
+    ///
+    /// # Examples
+    ///
+    /// Create a bold, red colored style and use it to print the log level:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut level_style = buf.style();
+    ///
+    ///     level_style.set_color(Color::Red).set_bold(true);
+    ///
+    ///     writeln!(buf, "{}: {}",
+    ///         level_style.value(record.level()),
+    ///         record.args())
+    /// });
+    /// ```
+    ///
+    /// [`Style`]: struct.Style.html
+    pub fn style(&self) -> Style {
+        Style {
+            buf: self.buf.clone(),
+            spec: ColorSpec::new(),
+        }
+    }
+
+    /// Get the default [`Style`] for the given level.
+    /// 
+    /// The style can be used to print other values besides the level.
+    pub fn default_level_style(&self, level: Level) -> Style {
+        let mut level_style = self.style();
+        match level {
+            Level::Trace => level_style.set_color(Color::Black).set_intense(true),
+            Level::Debug => level_style.set_color(Color::White),
+            Level::Info => level_style.set_color(Color::Green),
+            Level::Warn => level_style.set_color(Color::Yellow),
+            Level::Error => level_style.set_color(Color::Red).set_bold(true),
+        };
+        level_style
+    }
+
+    /// Get a printable [`Style`] for the given level.
+    /// 
+    /// The style can only be used to print the level.
+    pub fn default_styled_level(&self, level: Level) -> StyledValue<'static, Level> {
+        self.default_level_style(level).into_value(level)
+    }
+}
+
+pub(in ::fmt::writer) struct BufferWriter(termcolor::BufferWriter);
+pub(in ::fmt) struct Buffer(termcolor::Buffer);
+
+impl BufferWriter {
+    pub(in ::fmt::writer) fn stderr(write_style: WriteStyle) -> Self {
+        BufferWriter(termcolor::BufferWriter::stderr(write_style.into_color_choice()))
+    }
+
+    pub(in ::fmt::writer) fn stdout(write_style: WriteStyle) -> Self {
+        BufferWriter(termcolor::BufferWriter::stdout(write_style.into_color_choice()))
+    }
+
+    pub(in ::fmt::writer) fn buffer(&self) -> Buffer {
+        Buffer(self.0.buffer())
+    }
+
+    pub(in ::fmt::writer) fn print(&self, buf: &Buffer) -> io::Result<()> {
+        self.0.print(&buf.0)
+    }
+}
+
+impl Buffer {
+    pub(in ::fmt) fn clear(&mut self) {
+        self.0.clear()
+    }
+
+    pub(in ::fmt) fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.0.write(buf)
+    }
+
+    pub(in ::fmt) fn flush(&mut self) -> io::Result<()> {
+        self.0.flush()
+    }
+
+    #[cfg(test)]
+    pub(in ::fmt) fn bytes(&self) -> &[u8] {
+        self.0.as_slice()
+    }
+
+    fn set_color(&mut self, spec: &ColorSpec) -> io::Result<()> {
+        self.0.set_color(spec)
+    }
+
+    fn reset(&mut self) -> io::Result<()> {
+        self.0.reset()
+    }
+}
+
+impl WriteStyle {
+    fn into_color_choice(self) -> ColorChoice {
+        match self {
+            WriteStyle::Always => ColorChoice::Always,
+            WriteStyle::Auto => ColorChoice::Auto,
+            WriteStyle::Never => ColorChoice::Never,
+        }
+    }
+}
+
+/// A set of styles to apply to the terminal output.
+///
+/// Call [`Formatter::style`] to get a `Style` and use the builder methods to
+/// set styling properties, like [color] and [weight].
+/// To print a value using the style, wrap it in a call to [`value`] when the log
+/// record is formatted.
+///
+/// # Examples
+///
+/// Create a bold, red colored style and use it to print the log level:
+///
+/// ```
+/// use std::io::Write;
+/// use env_logger::fmt::Color;
+///
+/// let mut builder = env_logger::Builder::new();
+///
+/// builder.format(|buf, record| {
+///     let mut level_style = buf.style();
+///
+///     level_style.set_color(Color::Red).set_bold(true);
+///
+///     writeln!(buf, "{}: {}",
+///         level_style.value(record.level()),
+///         record.args())
+/// });
+/// ```
+///
+/// Styles can be re-used to output multiple values:
+///
+/// ```
+/// use std::io::Write;
+/// use env_logger::fmt::Color;
+///
+/// let mut builder = env_logger::Builder::new();
+///
+/// builder.format(|buf, record| {
+///     let mut bold = buf.style();
+///
+///     bold.set_bold(true);
+///
+///     writeln!(buf, "{}: {} {}",
+///         bold.value(record.level()),
+///         bold.value("some bold text"),
+///         record.args())
+/// });
+/// ```
+///
+/// [`Formatter::style`]: struct.Formatter.html#method.style
+/// [color]: #method.set_color
+/// [weight]: #method.set_bold
+/// [`value`]: #method.value
+#[derive(Clone)]
+pub struct Style {
+    buf: Rc<RefCell<Buffer>>,
+    spec: ColorSpec,
+}
+
+/// A value that can be printed using the given styles.
+///
+/// It is the result of calling [`Style::value`].
+///
+/// [`Style::value`]: struct.Style.html#method.value
+pub struct StyledValue<'a, T> {
+    style: Cow<'a, Style>,
+    value: T,
+}
+
+impl Style {
+    /// Set the text color.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with red text:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_color(Color::Red);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_color(&mut self, color: Color) -> &mut Style {
+        self.spec.set_fg(color.into_termcolor());
+        self
+    }
+
+    /// Set the text weight.
+    ///
+    /// If `yes` is true then text will be written in bold.
+    /// If `yes` is false then text will be written in the default weight.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with bold text:
+    ///
+    /// ```
+    /// use std::io::Write;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_bold(true);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_bold(&mut self, yes: bool) -> &mut Style {
+        self.spec.set_bold(yes);
+        self
+    }
+
+    /// Set the text intensity.
+    ///
+    /// If `yes` is true then text will be written in a brighter color.
+    /// If `yes` is false then text will be written in the default color.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with intense text:
+    ///
+    /// ```
+    /// use std::io::Write;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_intense(true);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_intense(&mut self, yes: bool) -> &mut Style {
+        self.spec.set_intense(yes);
+        self
+    }
+
+    /// Set the background color.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with a yellow background:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_bg(Color::Yellow);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_bg(&mut self, color: Color) -> &mut Style {
+        self.spec.set_bg(color.into_termcolor());
+        self
+    }
+
+    /// Wrap a value in the style.
+    ///
+    /// The same `Style` can be used to print multiple different values.
+    ///
+    /// # Examples
+    ///
+    /// Create a bold, red colored style and use it to print the log level:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_color(Color::Red).set_bold(true);
+    ///
+    ///     writeln!(buf, "{}: {}",
+    ///         style.value(record.level()),
+    ///         record.args())
+    /// });
+    /// ```
+    pub fn value<T>(&self, value: T) -> StyledValue<T> {
+        StyledValue {
+            style: Cow::Borrowed(self),
+            value
+        }
+    }
+
+    /// Wrap a value in the style by taking ownership of it.
+    pub(crate) fn into_value<T>(&mut self, value: T) -> StyledValue<'static, T> {
+        StyledValue {
+            style: Cow::Owned(self.clone()),
+            value
+        }
+    }
+}
+
+impl<'a, T> StyledValue<'a, T> {
+    fn write_fmt<F>(&self, f: F) -> fmt::Result
+    where
+        F: FnOnce() -> fmt::Result,
+    {
+        self.style.buf.borrow_mut().set_color(&self.style.spec).map_err(|_| fmt::Error)?;
+
+        // Always try to reset the terminal style, even if writing failed
+        let write = f();
+        let reset = self.style.buf.borrow_mut().reset().map_err(|_| fmt::Error);
+
+        write.and(reset)
+    }
+}
+
+impl fmt::Debug for Style {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Style").field("spec", &self.spec).finish()
+    }
+}
+
+macro_rules! impl_styled_value_fmt {
+    ($($fmt_trait:path),*) => {
+        $(
+            impl<'a, T: $fmt_trait> $fmt_trait for StyledValue<'a, T> {
+                fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+                    self.write_fmt(|| T::fmt(&self.value, f))
+                }
+            }
+        )*
+    };
+}
+
+impl_styled_value_fmt!(
+    fmt::Debug,
+    fmt::Display,
+    fmt::Pointer,
+    fmt::Octal,
+    fmt::Binary,
+    fmt::UpperHex,
+    fmt::LowerHex,
+    fmt::UpperExp,
+    fmt::LowerExp);
+
+// The `Color` type is copied from https://github.com/BurntSushi/ripgrep/tree/master/termcolor
+
+/// The set of available colors for the terminal foreground/background.
+///
+/// The `Ansi256` and `Rgb` colors will only output the correct codes when
+/// paired with the `Ansi` `WriteColor` implementation.
+///
+/// The `Ansi256` and `Rgb` color types are not supported when writing colors
+/// on Windows using the console. If they are used on Windows, then they are
+/// silently ignored and no colors will be emitted.
+///
+/// This set may expand over time.
+///
+/// This type has a `FromStr` impl that can parse colors from their human
+/// readable form. The format is as follows:
+///
+/// 1. Any of the explicitly listed colors in English. They are matched
+///    case insensitively.
+/// 2. A single 8-bit integer, in either decimal or hexadecimal format.
+/// 3. A triple of 8-bit integers separated by a comma, where each integer is
+///    in decimal or hexadecimal format.
+///
+/// Hexadecimal numbers are written with a `0x` prefix.
+#[allow(missing_docs)]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum Color {
+    Black,
+    Blue,
+    Green,
+    Red,
+    Cyan,
+    Magenta,
+    Yellow,
+    White,
+    Ansi256(u8),
+    Rgb(u8, u8, u8),
+    #[doc(hidden)]
+    __Nonexhaustive,
+}
+
+impl Color {
+    fn into_termcolor(self) -> Option<termcolor::Color> {
+        match self {
+            Color::Black => Some(termcolor::Color::Black),
+            Color::Blue => Some(termcolor::Color::Blue),
+            Color::Green => Some(termcolor::Color::Green),
+            Color::Red => Some(termcolor::Color::Red),
+            Color::Cyan => Some(termcolor::Color::Cyan),
+            Color::Magenta => Some(termcolor::Color::Magenta),
+            Color::Yellow => Some(termcolor::Color::Yellow),
+            Color::White => Some(termcolor::Color::White),
+            Color::Ansi256(value) => Some(termcolor::Color::Ansi256(value)),
+            Color::Rgb(r, g, b) => Some(termcolor::Color::Rgb(r, g, b)),
+            _ => None,
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/writer/termcolor/mod.rs cargo-0.33.0/vendor/env_logger/src/fmt/writer/termcolor/mod.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/writer/termcolor/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/writer/termcolor/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+/*
+This internal module contains the style and terminal writing implementation.
+
+Its public API is available when the `termcolor` crate is available.
+The terminal printing is shimmed when the `termcolor` crate is not available.
+*/
+
+#[cfg_attr(feature = "termcolor", path = "extern_impl.rs")]
+#[cfg_attr(not(feature = "termcolor"), path = "shim_impl.rs")]
+mod imp;
+
+pub(in ::fmt) use self::imp::*;
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt/writer/termcolor/shim_impl.rs cargo-0.33.0/vendor/env_logger/src/fmt/writer/termcolor/shim_impl.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt/writer/termcolor/shim_impl.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt/writer/termcolor/shim_impl.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,65 @@
+use std::io;
+
+use fmt::{WriteStyle, Target};
+
+pub(in ::fmt::writer) mod glob {
+    
+}
+
+pub(in ::fmt::writer) struct BufferWriter {
+    target: Target,
+}
+
+pub(in ::fmt) struct Buffer(Vec<u8>);
+
+impl BufferWriter {
+    pub(in ::fmt::writer) fn stderr(_: WriteStyle) -> Self {
+        BufferWriter {
+            target: Target::Stderr,
+        }
+    }
+
+    pub(in ::fmt::writer) fn stdout(_: WriteStyle) -> Self {
+        BufferWriter {
+            target: Target::Stdout,
+        }
+    }
+
+    pub(in ::fmt::writer) fn buffer(&self) -> Buffer {
+        Buffer(Vec::new())
+    }
+
+    pub(in ::fmt::writer) fn print(&self, buf: &Buffer) -> io::Result<()> {
+        // This impl uses the `eprint` and `print` macros
+        // instead of using the streams directly.
+        // This is so their output can be captured by `cargo test`
+        let log = String::from_utf8_lossy(&buf.0);
+
+        match self.target {
+            Target::Stderr => eprint!("{}", log),
+            Target::Stdout => print!("{}", log),
+        }
+
+        Ok(())
+    }
+}
+
+impl Buffer {
+    pub(in ::fmt) fn clear(&mut self) {
+        self.0.clear();
+    }
+
+    pub(in ::fmt) fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.0.extend(buf);
+        Ok(buf.len())
+    }
+
+    pub(in ::fmt) fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+
+    #[cfg(test)]
+    pub(in ::fmt) fn bytes(&self) -> &[u8] {
+        &self.0
+    }
+}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger/src/fmt.rs cargo-0.33.0/vendor/env_logger/src/fmt.rs
--- cargo-0.32.0/vendor/env_logger/src/fmt.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/fmt.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,844 +0,0 @@
-//! Formatting for log records.
-//!
-//! This module contains a [`Formatter`] that can be used to format log records
-//! into without needing temporary allocations. Usually you won't need to worry
-//! about the contents of this module and can use the `Formatter` like an ordinary
-//! [`Write`].
-//!
-//! # Formatting log records
-//!
-//! The format used to print log records can be customised using the [`Builder::format`]
-//! method.
-//! Custom formats can apply different color and weight to printed values using
-//! [`Style`] builders.
-//!
-//! ```
-//! use std::io::Write;
-//! use env_logger::fmt::Color;
-//!
-//! let mut builder = env_logger::Builder::new();
-//!
-//! builder.format(|buf, record| {
-//!     let mut level_style = buf.style();
-//!
-//!     level_style.set_color(Color::Red).set_bold(true);
-//!
-//!     writeln!(buf, "{}: {}",
-//!         level_style.value(record.level()),
-//!         record.args())
-//! });
-//! ```
-//!
-//! [`Formatter`]: struct.Formatter.html
-//! [`Style`]: struct.Style.html
-//! [`Builder::format`]: ../struct.Builder.html#method.format
-//! [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
-
-use std::io::prelude::*;
-use std::{io, fmt};
-use std::rc::Rc;
-use std::str::FromStr;
-use std::error::Error;
-use std::cell::RefCell;
-use std::time::SystemTime;
-
-use log::Level;
-use termcolor::{self, ColorSpec, ColorChoice, Buffer, BufferWriter, WriteColor};
-use atty;
-use humantime::{format_rfc3339_seconds, format_rfc3339_nanos};
-
-/// A formatter to write logs into.
-///
-/// `Formatter` implements the standard [`Write`] trait for writing log records.
-/// It also supports terminal colors, through the [`style`] method.
-///
-/// # Examples
-///
-/// Use the [`writeln`] macro to easily format a log record:
-///
-/// ```
-/// use std::io::Write;
-///
-/// let mut builder = env_logger::Builder::new();
-///
-/// builder.format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args()));
-/// ```
-///
-/// [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
-/// [`writeln`]: https://doc.rust-lang.org/stable/std/macro.writeln.html
-/// [`style`]: #method.style
-pub struct Formatter {
-    buf: Rc<RefCell<Buffer>>,
-    write_style: WriteStyle,
-}
-
-/// A set of styles to apply to the terminal output.
-///
-/// Call [`Formatter::style`] to get a `Style` and use the builder methods to
-/// set styling properties, like [color] and [weight].
-/// To print a value using the style, wrap it in a call to [`value`] when the log
-/// record is formatted.
-///
-/// # Examples
-///
-/// Create a bold, red colored style and use it to print the log level:
-///
-/// ```
-/// use std::io::Write;
-/// use env_logger::fmt::Color;
-///
-/// let mut builder = env_logger::Builder::new();
-///
-/// builder.format(|buf, record| {
-///     let mut level_style = buf.style();
-///
-///     level_style.set_color(Color::Red).set_bold(true);
-///
-///     writeln!(buf, "{}: {}",
-///         level_style.value(record.level()),
-///         record.args())
-/// });
-/// ```
-///
-/// Styles can be re-used to output multiple values:
-///
-/// ```
-/// use std::io::Write;
-/// use env_logger::fmt::Color;
-///
-/// let mut builder = env_logger::Builder::new();
-///
-/// builder.format(|buf, record| {
-///     let mut bold = buf.style();
-///
-///     bold.set_bold(true);
-///
-///     writeln!(buf, "{}: {} {}",
-///         bold.value(record.level()),
-///         bold.value("some bold text"),
-///         record.args())
-/// });
-/// ```
-///
-/// [`Formatter::style`]: struct.Formatter.html#method.style
-/// [color]: #method.set_color
-/// [weight]: #method.set_bold
-/// [`value`]: #method.value
-#[derive(Clone)]
-pub struct Style {
-    buf: Rc<RefCell<Buffer>>,
-    spec: ColorSpec,
-}
-
-/// A value that can be printed using the given styles.
-///
-/// It is the result of calling [`Style::value`].
-///
-/// [`Style::value`]: struct.Style.html#method.value
-pub struct StyledValue<'a, T> {
-    style: &'a Style,
-    value: T,
-}
-
-/// An [RFC3339] formatted timestamp.
-///
-/// The timestamp implements [`Display`] and can be written to a [`Formatter`].
-///
-/// [RFC3339]: https://www.ietf.org/rfc/rfc3339.txt
-/// [`Display`]: https://doc.rust-lang.org/stable/std/fmt/trait.Display.html
-/// [`Formatter`]: struct.Formatter.html
-pub struct Timestamp(SystemTime);
-
-/// An [RFC3339] formatted timestamp with nanos
-#[derive(Debug)]
-pub struct PreciseTimestamp(SystemTime);
-
-/// Log target, either `stdout` or `stderr`.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum Target {
-    /// Logs will be sent to standard output.
-    Stdout,
-    /// Logs will be sent to standard error.
-    Stderr,
-}
-
-impl Default for Target {
-    fn default() -> Self {
-        Target::Stderr
-    }
-}
-
-/// Whether or not to print styles to the target.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum WriteStyle {
-    /// Try to print styles, but don't force the issue.
-    Auto,
-    /// Try very hard to print styles.
-    Always,
-    /// Never print styles.
-    Never,
-}
-
-impl Default for WriteStyle {
-    fn default() -> Self {
-        WriteStyle::Auto
-    }
-}
-
-/// A terminal target with color awareness.
-pub(crate) struct Writer {
-    inner: BufferWriter,
-    write_style: WriteStyle,
-}
-
-impl Writer {
-    pub(crate) fn write_style(&self) -> WriteStyle {
-        self.write_style
-    }
-}
-
-/// A builder for a terminal writer.
-///
-/// The target and style choice can be configured before building.
-pub(crate) struct Builder {
-    target: Target,
-    write_style: WriteStyle,
-}
-
-impl Builder {
-    /// Initialize the writer builder with defaults.
-    pub fn new() -> Self {
-        Builder {
-            target: Default::default(),
-            write_style: Default::default(),
-        }
-    }
-
-    /// Set the target to write to.
-    pub fn target(&mut self, target: Target) -> &mut Self {
-        self.target = target;
-        self
-    }
-
-    /// Parses a style choice string.
-    ///
-    /// See the [Disabling colors] section for more details.
-    ///
-    /// [Disabling colors]: ../index.html#disabling-colors
-    pub fn parse(&mut self, write_style: &str) -> &mut Self {
-        self.write_style(parse_write_style(write_style))
-    }
-
-    /// Whether or not to print style characters when writing.
-    pub fn write_style(&mut self, write_style: WriteStyle) -> &mut Self {
-        self.write_style = write_style;
-        self
-    }
-
-    /// Build a terminal writer.
-    pub fn build(&mut self) -> Writer {
-        let color_choice = match self.write_style {
-            WriteStyle::Auto => {
-                if atty::is(match self.target {
-                    Target::Stderr => atty::Stream::Stderr,
-                    Target::Stdout => atty::Stream::Stdout,
-                }) {
-                    ColorChoice::Auto
-                } else {
-                    ColorChoice::Never
-                }
-            },
-            WriteStyle::Always => ColorChoice::Always,
-            WriteStyle::Never => ColorChoice::Never,
-        };
-
-        let writer = match self.target {
-            Target::Stderr => BufferWriter::stderr(color_choice),
-            Target::Stdout => BufferWriter::stdout(color_choice),
-        };
-
-        Writer {
-            inner: writer,
-            write_style: self.write_style,
-        }
-    }
-}
-
-impl Default for Builder {
-    fn default() -> Self {
-        Builder::new()
-    }
-}
-
-impl Style {
-    /// Set the text color.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with red text:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_color(Color::Red);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_color(&mut self, color: Color) -> &mut Style {
-        self.spec.set_fg(color.into_termcolor());
-        self
-    }
-
-    /// Set the text weight.
-    ///
-    /// If `yes` is true then text will be written in bold.
-    /// If `yes` is false then text will be written in the default weight.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with bold text:
-    ///
-    /// ```
-    /// use std::io::Write;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_bold(true);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_bold(&mut self, yes: bool) -> &mut Style {
-        self.spec.set_bold(yes);
-        self
-    }
-
-    /// Set the text intensity.
-    ///
-    /// If `yes` is true then text will be written in a brighter color.
-    /// If `yes` is false then text will be written in the default color.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with intense text:
-    ///
-    /// ```
-    /// use std::io::Write;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_intense(true);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_intense(&mut self, yes: bool) -> &mut Style {
-        self.spec.set_intense(yes);
-        self
-    }
-
-    /// Set the background color.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with a yellow background:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_bg(Color::Yellow);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_bg(&mut self, color: Color) -> &mut Style {
-        self.spec.set_bg(color.into_termcolor());
-        self
-    }
-
-    /// Wrap a value in the style.
-    ///
-    /// The same `Style` can be used to print multiple different values.
-    ///
-    /// # Examples
-    ///
-    /// Create a bold, red colored style and use it to print the log level:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_color(Color::Red).set_bold(true);
-    ///
-    ///     writeln!(buf, "{}: {}",
-    ///         style.value(record.level()),
-    ///         record.args())
-    /// });
-    /// ```
-    pub fn value<T>(&self, value: T) -> StyledValue<T> {
-        StyledValue {
-            style: &self,
-            value
-        }
-    }
-}
-
-impl Formatter {
-    pub(crate) fn new(writer: &Writer) -> Self {
-        Formatter {
-            buf: Rc::new(RefCell::new(writer.inner.buffer())),
-            write_style: writer.write_style(),
-        }
-    }
-
-    pub(crate) fn write_style(&self) -> WriteStyle {
-        self.write_style
-    }
-
-    /// Begin a new [`Style`].
-    ///
-    /// # Examples
-    ///
-    /// Create a bold, red colored style and use it to print the log level:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut level_style = buf.style();
-    ///
-    ///     level_style.set_color(Color::Red).set_bold(true);
-    ///
-    ///     writeln!(buf, "{}: {}",
-    ///         level_style.value(record.level()),
-    ///         record.args())
-    /// });
-    /// ```
-    ///
-    /// [`Style`]: struct.Style.html
-    pub fn style(&self) -> Style {
-        Style {
-            buf: self.buf.clone(),
-            spec: ColorSpec::new(),
-        }
-    }
-
-    /// Get the default [`Style`] for the given level.
-    pub fn default_level_style(&self, level: Level) -> Style {
-        let mut level_style = self.style();
-        match level {
-            Level::Trace => level_style.set_color(Color::White),
-            Level::Debug => level_style.set_color(Color::Blue),
-            Level::Info => level_style.set_color(Color::Green),
-            Level::Warn => level_style.set_color(Color::Yellow),
-            Level::Error => level_style.set_color(Color::Red).set_bold(true),
-        };
-        level_style
-    }
-
-    /// Get a [`Timestamp`] for the current date and time in UTC.
-    ///
-    /// # Examples
-    ///
-    /// Include the current timestamp with the log record:
-    ///
-    /// ```
-    /// use std::io::Write;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let ts = buf.timestamp();
-    ///
-    ///     writeln!(buf, "{}: {}: {}", ts, record.level(), record.args())
-    /// });
-    /// ```
-    ///
-    /// [`Timestamp`]: struct.Timestamp.html
-    pub fn timestamp(&self) -> Timestamp {
-        Timestamp(SystemTime::now())
-    }
-
-     /// Get a [`PreciseTimestamp`] for the current date and time in UTC with nanos.
-    pub fn precise_timestamp(&self) -> PreciseTimestamp {
-        PreciseTimestamp(SystemTime::now())
-    }
-
-    pub(crate) fn print(&self, writer: &Writer) -> io::Result<()> {
-        writer.inner.print(&self.buf.borrow())
-    }
-
-    pub(crate) fn clear(&mut self) {
-        self.buf.borrow_mut().clear()
-    }
-}
-
-impl Write for Formatter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.buf.borrow_mut().write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.buf.borrow_mut().flush()
-    }
-}
-
-impl<'a, T> StyledValue<'a, T> {
-    fn write_fmt<F>(&self, f: F) -> fmt::Result
-    where
-        F: FnOnce() -> fmt::Result,
-    {
-        self.style.buf.borrow_mut().set_color(&self.style.spec).map_err(|_| fmt::Error)?;
-
-        // Always try to reset the terminal style, even if writing failed
-        let write = f();
-        let reset = self.style.buf.borrow_mut().reset().map_err(|_| fmt::Error);
-
-        write.and(reset)
-    }
-}
-
-impl fmt::Debug for Timestamp {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        /// A `Debug` wrapper for `Timestamp` that uses the `Display` implementation.
-        struct TimestampValue<'a>(&'a Timestamp);
-
-        impl<'a> fmt::Debug for TimestampValue<'a> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                fmt::Display::fmt(&self.0, f)
-            }
-        }
-
-        f.debug_tuple("Timestamp")
-         .field(&TimestampValue(&self))
-         .finish()
-    }
-}
-
-impl fmt::Debug for Writer {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Writer").finish()
-    }
-}
-
-impl fmt::Debug for Formatter {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Formatter").finish()
-    }
-}
-
-impl fmt::Debug for Builder {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Logger")
-        .field("target", &self.target)
-        .field("write_style", &self.write_style)
-        .finish()
-    }
-}
-
-impl fmt::Debug for Style {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Style").field("spec", &self.spec).finish()
-    }
-}
-
-macro_rules! impl_styled_value_fmt {
-    ($($fmt_trait:path),*) => {
-        $(
-            impl<'a, T: $fmt_trait> $fmt_trait for StyledValue<'a, T> {
-                fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-                    self.write_fmt(|| T::fmt(&self.value, f))
-                }
-            }
-        )*
-    };
-}
-
-impl_styled_value_fmt!(
-    fmt::Debug,
-    fmt::Display,
-    fmt::Pointer,
-    fmt::Octal,
-    fmt::Binary,
-    fmt::UpperHex,
-    fmt::LowerHex,
-    fmt::UpperExp,
-    fmt::LowerExp);
-
-impl fmt::Display for Timestamp {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        format_rfc3339_seconds(self.0).fmt(f)
-    }
-}
-
-impl fmt::Display for PreciseTimestamp {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        format_rfc3339_nanos(self.0).fmt(f)
-    }
-}
-
-// The `Color` type is copied from https://github.com/BurntSushi/ripgrep/tree/master/termcolor
-
-/// The set of available colors for the terminal foreground/background.
-///
-/// The `Ansi256` and `Rgb` colors will only output the correct codes when
-/// paired with the `Ansi` `WriteColor` implementation.
-///
-/// The `Ansi256` and `Rgb` color types are not supported when writing colors
-/// on Windows using the console. If they are used on Windows, then they are
-/// silently ignored and no colors will be emitted.
-///
-/// This set may expand over time.
-///
-/// This type has a `FromStr` impl that can parse colors from their human
-/// readable form. The format is as follows:
-///
-/// 1. Any of the explicitly listed colors in English. They are matched
-///    case insensitively.
-/// 2. A single 8-bit integer, in either decimal or hexadecimal format.
-/// 3. A triple of 8-bit integers separated by a comma, where each integer is
-///    in decimal or hexadecimal format.
-///
-/// Hexadecimal numbers are written with a `0x` prefix.
-#[allow(missing_docs)]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum Color {
-    Black,
-    Blue,
-    Green,
-    Red,
-    Cyan,
-    Magenta,
-    Yellow,
-    White,
-    Ansi256(u8),
-    Rgb(u8, u8, u8),
-    #[doc(hidden)]
-    __Nonexhaustive,
-}
-
-/// An error from parsing an invalid color specification.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ParseColorError(ParseColorErrorKind);
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-enum ParseColorErrorKind {
-    /// An error originating from `termcolor`.
-    TermColor(termcolor::ParseColorError),
-    /// An error converting the `termcolor` color to a `env_logger::Color`.
-    /// 
-    /// This variant should only get reached if a user uses a new spec that's
-    /// valid for `termcolor`, but not recognised in `env_logger` yet.
-    Unrecognized {
-        given: String,
-    }
-}
-
-impl ParseColorError {
-    fn termcolor(err: termcolor::ParseColorError) -> Self {
-        ParseColorError(ParseColorErrorKind::TermColor(err))
-    }
-
-    fn unrecognized(given: String) -> Self {
-        ParseColorError(ParseColorErrorKind::Unrecognized { given })
-    }
-
-    /// Return the string that couldn't be parsed as a valid color.
-    pub fn invalid(&self) -> &str {
-        match self.0 {
-            ParseColorErrorKind::TermColor(ref err) => err.invalid(),
-            ParseColorErrorKind::Unrecognized { ref given, .. } => given,
-        }
-    }
-}
-
-impl Error for ParseColorError {
-    fn description(&self) -> &str {
-        match self.0 {
-            ParseColorErrorKind::TermColor(ref err) => err.description(),
-            ParseColorErrorKind::Unrecognized { .. } => "unrecognized color value",
-        }
-    }
-}
-
-impl fmt::Display for ParseColorError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self.0 {
-            ParseColorErrorKind::TermColor(ref err) => fmt::Display::fmt(err, f),
-            ParseColorErrorKind::Unrecognized { ref given, .. } => {
-                write!(f, "unrecognized color value '{}'", given)
-            } 
-        }
-    }
-}
-
-impl Color {
-    fn into_termcolor(self) -> Option<termcolor::Color> {
-        match self {
-            Color::Black => Some(termcolor::Color::Black),
-            Color::Blue => Some(termcolor::Color::Blue),
-            Color::Green => Some(termcolor::Color::Green),
-            Color::Red => Some(termcolor::Color::Red),
-            Color::Cyan => Some(termcolor::Color::Cyan),
-            Color::Magenta => Some(termcolor::Color::Magenta),
-            Color::Yellow => Some(termcolor::Color::Yellow),
-            Color::White => Some(termcolor::Color::White),
-            Color::Ansi256(value) => Some(termcolor::Color::Ansi256(value)),
-            Color::Rgb(r, g, b) => Some(termcolor::Color::Rgb(r, g, b)),
-            _ => None,
-        }
-    }
-
-    fn from_termcolor(color: termcolor::Color) -> Option<Color> {
-        match color {
-            termcolor::Color::Black => Some(Color::Black),
-            termcolor::Color::Blue => Some(Color::Blue),
-            termcolor::Color::Green => Some(Color::Green),
-            termcolor::Color::Red => Some(Color::Red),
-            termcolor::Color::Cyan => Some(Color::Cyan),
-            termcolor::Color::Magenta => Some(Color::Magenta),
-            termcolor::Color::Yellow => Some(Color::Yellow),
-            termcolor::Color::White => Some(Color::White),
-            termcolor::Color::Ansi256(value) => Some(Color::Ansi256(value)),
-            termcolor::Color::Rgb(r, g, b) => Some(Color::Rgb(r, g, b)),
-            _ => None,
-        }
-    }
-}
-
-impl FromStr for Color {
-    type Err = ParseColorError;
-
-    fn from_str(s: &str) -> Result<Color, ParseColorError> {
-        let tc = termcolor::Color::from_str(s).map_err(ParseColorError::termcolor)?;
-        Color::from_termcolor(tc).ok_or_else(|| ParseColorError::unrecognized(s.into()))
-    }
-}
-
-fn parse_write_style(spec: &str) -> WriteStyle {
-    match spec {
-        "auto" => WriteStyle::Auto,
-        "always" => WriteStyle::Always,
-        "never" => WriteStyle::Never,
-        _ => Default::default(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parse_write_style_valid() {
-        let inputs = vec![
-            ("auto", WriteStyle::Auto),
-            ("always", WriteStyle::Always),
-            ("never", WriteStyle::Never),
-        ];
-
-        for (input, expected) in inputs {
-            assert_eq!(expected, parse_write_style(input));
-        }
-    }
-
-    #[test]
-    fn parse_write_style_invalid() {
-        let inputs = vec![
-            "",
-            "true",
-            "false",
-            "NEVER!!"
-        ];
-
-        for input in inputs {
-            assert_eq!(WriteStyle::Auto, parse_write_style(input));
-        }
-    }
-
-    #[test]
-    fn parse_color_name_valid() {
-        let inputs = vec![
-            "black",
-            "blue",
-            "green",
-            "red",
-            "cyan",
-            "magenta",
-            "yellow",
-            "white",
-        ];
-
-        for input in inputs {
-            assert!(Color::from_str(input).is_ok());
-        }
-    }
-
-    #[test]
-    fn parse_color_ansi_valid() {
-        let inputs = vec![
-            "7",
-            "32",
-            "0xFF",
-        ];
-
-        for input in inputs {
-            assert!(Color::from_str(input).is_ok());
-        }
-    }
-
-    #[test]
-    fn parse_color_rgb_valid() {
-        let inputs = vec![
-            "0,0,0",
-            "0,128,255",
-            "0x0,0x0,0x0",
-            "0x33,0x66,0xFF",
-        ];
-
-        for input in inputs {
-            assert!(Color::from_str(input).is_ok());
-        }
-    }
-
-    #[test]
-    fn parse_color_invalid() {
-        let inputs = vec![
-            "not_a_color",
-            "256",
-            "0,0",
-            "0,0,256",
-        ];
-
-        for input in inputs {
-            let err = Color::from_str(input).unwrap_err();
-            assert_eq!(input, err.invalid());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/env_logger/src/lib.rs cargo-0.33.0/vendor/env_logger/src/lib.rs
--- cargo-0.32.0/vendor/env_logger/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -37,37 +37,37 @@
 //!
 //! ```{.bash}
 //! $ RUST_LOG=error ./main
-//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
+//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
 //! ```
 //!
 //! ```{.bash}
 //! $ RUST_LOG=info ./main
-//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
-//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
+//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
 //! ```
 //!
 //! ```{.bash}
 //! $ RUST_LOG=debug ./main
-//! DEBUG: 2017-11-09T02:12:24Z: main: this is a debug message
-//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
-//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! [2017-11-09T02:12:24Z DEBUG main] this is a debug message
+//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
+//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
 //! ```
 //!
 //! You can also set the log level on a per module basis:
 //!
 //! ```{.bash}
 //! $ RUST_LOG=main=info ./main
-//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
-//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
+//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
 //! ```
 //!
 //! And enable all logging:
 //!
 //! ```{.bash}
 //! $ RUST_LOG=main ./main
-//! DEBUG: 2017-11-09T02:12:24Z: main: this is a debug message
-//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
-//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! [2017-11-09T02:12:24Z DEBUG main] this is a debug message
+//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
+//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
 //! ```
 //!
 //! If the binary name contains hyphens, you will need to replace
@@ -75,9 +75,9 @@
 //!
 //! ```{.bash}
 //! $ RUST_LOG=my_app ./my-app
-//! DEBUG: 2017-11-09T02:12:24Z: my_app: this is a debug message
-//! ERROR: 2017-11-09T02:12:24Z: my_app: this is printed by default
-//! INFO: 2017-11-09T02:12:24Z: my_app: the answer was: 12
+//! [2017-11-09T02:12:24Z DEBUG my_app] this is a debug message
+//! [2017-11-09T02:12:24Z ERROR my_app] this is printed by default
+//! [2017-11-09T02:12:24Z INFO my_app] the answer was: 12
 //! ```
 //!
 //! This is because Rust modules and crates cannot contain hyphens
@@ -157,26 +157,40 @@
 //! The following example excludes the timestamp from the log output:
 //! 
 //! ```
-//! #[macro_use] extern crate log;
-//! extern crate env_logger;
+//! use env_logger::Builder;
 //!
-//! use log::Level;
+//! Builder::from_default_env()
+//!     .default_format_timestamp(false)
+//!     .init();
+//! ```
+//! 
+//! ### Stability of the default format
+//! 
+//! The default format won't optimise for long-term stability, and explicitly makes no 
+//! guarantees about the stability of its output across major, minor or patch version 
+//! bumps during `0.x`.
+//! 
+//! If you want to capture or interpret the output of `env_logger` programmatically 
+//! then you should use a custom format.
+//! 
+//! ### Using a custom format
+//! 
+//! Custom formats can be provided as closures to the [`Builder`].
+//! These closures take a [`Formatter`] and `log::Record` as arguments:
+//! 
+//! ```
+//! use std::io::Write;
+//! use env_logger::Builder;
 //!
-//! fn main() {
-//!     env_logger::Builder::from_default_env()
-//!         .default_format_timestamp(false)
-//!         .init();
-//!
-//!     debug!("this is a debug {}", "message");
-//!     error!("this is printed by default");
-//!
-//!     if log_enabled!(Level::Info) {
-//!         let x = 3 * 4; // expensive computation
-//!         info!("the answer was: {}", x);
-//!     }
-//! }
+//! Builder::from_default_env()
+//!     .format(|buf, record| {
+//!         writeln!(buf, "{}: {}", record.level(), record.args())
+//!     })
+//!     .init();
 //! ```
 //! 
+//! See the [`fmt`] module for more details about custom formats.
+//! 
 //! ## Specifying defaults for environment variables
 //! 
 //! `env_logger` can read configuration from environment variables.
@@ -185,26 +199,19 @@
 //! isn't set:
 //! 
 //! ```
-//! #[macro_use] extern crate log;
-//! extern crate env_logger;
-//!
-//! use log::Level;
+//! use env_logger::{Builder, Env};
 //!
-//! fn main() {
-//!     let env = env_logger::Env::default()
-//!         .filter_or(env_logger::DEFAULT_FILTER_ENV, "warn");
-//! 
-//!     env_logger::Builder::from_env(env).init();
-//! }
+//! Builder::from_env(Env::default().default_filter_or("warn")).init();
 //! ```
 //! 
 //! [log-crate-url]: https://docs.rs/log/
 //! [`Builder`]: struct.Builder.html
 //! [`Env`]: struct.Env.html
+//! [`fmt`]: fmt/index.html
 
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/env_logger/0.5.13")]
+       html_root_url = "https://docs.rs/env_logger/0.6.0")]
 #![cfg_attr(test, deny(warnings))]
 
 // When compiled for the rustc compiler itself we want to make sure that this is
@@ -215,15 +222,16 @@
 #![deny(missing_debug_implementations, missing_docs, warnings)]
 
 extern crate log;
+
+#[cfg(feature = "termcolor")]
 extern crate termcolor;
+#[cfg(feature = "humantime")]
 extern crate humantime;
+#[cfg(feature = "atty")]
 extern crate atty;
 
-use std::env;
+use std::{env, io};
 use std::borrow::Cow;
-use std::io::prelude::*;
-use std::io;
-use std::mem;
 use std::cell::RefCell;
 
 use log::{Log, LevelFilter, Record, SetLoggerError, Metadata};
@@ -231,7 +239,11 @@
 pub mod filter;
 pub mod fmt;
 
-pub use self::fmt::{Target, WriteStyle, Color, Formatter};
+pub use self::fmt::glob::*;
+
+use self::filter::Filter;
+use self::fmt::Formatter;
+use self::fmt::writer::{self, Writer};
 
 /// The default name for the environment variable to read filters from.
 pub const DEFAULT_FILTER_ENV: &'static str = "RUST_LOG";
@@ -281,78 +293,11 @@
 /// [`Builder::try_init()`]: struct.Builder.html#method.try_init
 /// [`Builder`]: struct.Builder.html
 pub struct Logger {
-    writer: fmt::Writer,
-    filter: filter::Filter,
+    writer: Writer,
+    filter: Filter,
     format: Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>,
 }
 
-struct Format {
-    default_format_timestamp: bool,
-    default_format_module_path: bool,
-    default_format_level: bool,
-    default_format_timestamp_nanos: bool,
-    custom_format: Option<Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>>,
-}
-
-impl Default for Format {
-    fn default() -> Self {
-        Format {
-            default_format_timestamp: true,
-            default_format_module_path: true,
-            default_format_level: true,
-            default_format_timestamp_nanos: false,
-            custom_format: None,
-        }
-    }
-}
-
-impl Format {
-    /// Convert the format into a callable function.
-    /// 
-    /// If the `custom_format` is `Some`, then any `default_format` switches are ignored.
-    /// If the `custom_format` is `None`, then a default format is returned.
-    /// Any `default_format` switches set to `false` won't be written by the format.
-    fn into_boxed_fn(self) -> Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send> {
-        if let Some(fmt) = self.custom_format {
-            fmt
-        }
-        else {
-            Box::new(move |buf, record| {
-                let write_level = if self.default_format_level {
-                    let level = record.level();
-                    let level_style = buf.default_level_style(level);
-                    write!(buf, "{:>5} ", level_style.value(level))
-                } else {
-                    Ok(())
-                };
-
-                let write_ts = if self.default_format_timestamp {
-                    if self.default_format_timestamp_nanos {
-                      let ts_nanos = buf.precise_timestamp();
-                      write!(buf, "{}: ", ts_nanos) 
-                    } else {
-                      let ts = buf.timestamp();
-                      write!(buf, "{}: ", ts)      
-                    }
-                } else {
-                    Ok(())
-                };
-
-                let default_format_module_path = (self.default_format_module_path, record.module_path());
-                let write_module_path = if let (true, Some(module_path)) = default_format_module_path {
-                    write!(buf, "{}: ", module_path)
-                } else {
-                    Ok(())
-                };
-
-                let write_args = writeln!(buf, "{}", record.args());
-
-                write_level.and(write_ts).and(write_module_path).and(write_args)
-            })
-        }
-    }
-}
-
 /// `Builder` acts as builder for initializing a `Logger`.
 ///
 /// It can be used to customize the log format, change the environment variable used
@@ -384,8 +329,9 @@
 #[derive(Default)]
 pub struct Builder {
     filter: filter::Builder,
-    writer: fmt::Builder,
-    format: Format,
+    writer: writer::Builder,
+    format: fmt::Builder,
+    built: bool,
 }
 
 impl Builder {
@@ -510,7 +456,7 @@
     /// 
     /// let mut builder = Builder::new();
     /// 
-    /// builder.format(|buf, record| write!(buf, "{}", record.args()));
+    /// builder.format(|buf, record| writeln!(buf, "{}", record.args()));
     /// ```
     ///
     /// [`Formatter`]: fmt/struct.Formatter.html
@@ -700,8 +646,14 @@
     pub fn try_init(&mut self) -> Result<(), SetLoggerError> {
         let logger = self.build();
 
-        log::set_max_level(logger.filter());
-        log::set_boxed_logger(Box::new(logger))
+        let max_level = logger.filter();
+        let r = log::set_boxed_logger(Box::new(logger));
+
+        if r.is_ok() {
+            log::set_max_level(max_level);
+        }
+
+        r
     }
 
     /// Initializes the global logger with the built env logger.
@@ -722,10 +674,13 @@
     /// The returned logger implements the `Log` trait and can be installed manually
     /// or nested within another logger.
     pub fn build(&mut self) -> Logger {
+        assert!(!self.built, "attempt to re-use consumed builder");
+        self.built = true;
+
         Logger {
             writer: self.writer.build(),
             filter: self.filter.build(),
-            format: mem::replace(&mut self.format, Default::default()).into_boxed_fn(),
+            format: self.format.build(),
         }
     }
 }
@@ -886,6 +841,18 @@
         self
     }
 
+    /// Use the default environment variable to read the filter from.
+    /// 
+    /// If the variable is not set, the default value will be used.
+    pub fn default_filter_or<V>(mut self, default: V) -> Self
+    where
+        V: Into<Cow<'a, str>>,
+    {
+        self.filter = Var::new_with_default(DEFAULT_FILTER_ENV, default);
+
+        self
+    }
+
     fn get_filter(&self) -> Option<String> {
         self.filter.get()
     }
@@ -913,6 +880,18 @@
         self
     }
 
+    /// Use the default environment variable to read the style from.
+    ///
+    /// If the variable is not set, the default value will be used.
+    pub fn default_write_style_or<V>(mut self, default: V) -> Self
+        where
+            V: Into<Cow<'a, str>>,
+    {
+        self.write_style = Var::new_with_default(DEFAULT_WRITE_STYLE_ENV, default);
+
+        self
+    }
+
     fn get_write_style(&self) -> Option<String> {
         self.write_style.get()
     }
@@ -981,10 +960,16 @@
 
     impl fmt::Debug for Builder{
         fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-            f.debug_struct("Logger")
-            .field("filter", &self.filter)
-            .field("writer", &self.writer)
-            .finish()
+            if self.built {
+                f.debug_struct("Logger")
+                .field("built", &true)
+                .finish()
+            } else {
+                f.debug_struct("Logger")
+                .field("filter", &self.filter)
+                .field("writer", &self.writer)
+                .finish()
+            }
         }
     }
 }
diff -Nru cargo-0.32.0/vendor/env_logger/tests/init-twice-retains-filter.rs cargo-0.33.0/vendor/env_logger/tests/init-twice-retains-filter.rs
--- cargo-0.32.0/vendor/env_logger/tests/init-twice-retains-filter.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/tests/init-twice-retains-filter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,40 @@
+extern crate log;
+extern crate env_logger;
+
+use std::process;
+use std::env;
+use std::str;
+
+fn main() {
+    if env::var("YOU_ARE_TESTING_NOW").is_ok() {
+        // Init from the env (which should set the max level to `Debug`)
+        env_logger::init();
+
+        assert_eq!(log::LevelFilter::Debug, log::max_level());
+
+        // Init again using a different max level
+        // This shouldn't clobber the level that was previously set
+        env_logger::Builder::new()
+            .parse("info")
+            .try_init()
+            .unwrap_err();
+
+        assert_eq!(log::LevelFilter::Debug, log::max_level());
+        return
+    }
+
+    let exe = env::current_exe().unwrap();
+    let out = process::Command::new(exe)
+        .env("YOU_ARE_TESTING_NOW", "1")
+        .env("RUST_LOG", "debug")
+        .output()
+        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
+    if out.status.success() {
+        return
+    }
+
+    println!("test failed: {}", out.status);
+    println!("--- stdout\n{}", str::from_utf8(&out.stdout).unwrap());
+    println!("--- stderr\n{}", str::from_utf8(&out.stderr).unwrap());
+    process::exit(1);
+}
diff -Nru cargo-0.32.0/vendor/env_logger/.travis.yml cargo-0.33.0/vendor/env_logger/.travis.yml
--- cargo-0.32.0/vendor/env_logger/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-language: rust
-sudo: false
-rust:
-  - 1.20.0
-  - stable
-  - beta
-  - nightly
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo build --verbose
-  - cargo build --verbose --no-default-features
-  - cargo test --verbose
-  - cargo test --verbose --no-default-features
-after_success:
-  - travis-cargo --only nightly doc-upload
-
-notifications:
-  email:
-on_success: never
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/.cargo-checksum.json cargo-0.33.0/vendor/env_logger-0.5.13/.cargo-checksum.json
--- cargo-0.32.0/vendor/env_logger-0.5.13/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/Cargo.toml cargo-0.33.0/vendor/env_logger-0.5.13/Cargo.toml
--- cargo-0.32.0/vendor/env_logger-0.5.13/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,50 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "env_logger"
+version = "0.5.13"
+authors = ["The Rust Project Developers"]
+description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"
+documentation = "https://docs.rs/env_logger"
+readme = "README.md"
+keywords = ["logging", "log", "logger"]
+categories = ["development-tools::debugging"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/sebasmagri/env_logger/"
+
+[[test]]
+name = "regexp_filter"
+harness = false
+
+[[test]]
+name = "log-in-log"
+harness = false
+[dependencies.atty]
+version = "0.2.5"
+
+[dependencies.humantime]
+version = "1.1"
+
+[dependencies.log]
+version = "0.4"
+features = ["std"]
+
+[dependencies.regex]
+version = "1.0.3"
+optional = true
+
+[dependencies.termcolor]
+version = "1"
+
+[features]
+default = ["regex"]
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/examples/custom_default_format.rs cargo-0.33.0/vendor/env_logger-0.5.13/examples/custom_default_format.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/examples/custom_default_format.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/examples/custom_default_format.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,44 @@
+/*!
+Disabling parts of the default format.
+
+Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
+
+```no_run,shell
+$ export MY_LOG_LEVEL='info'
+```
+
+Also try setting the `MY_LOG_STYLE` environment variable to `never` to disable colors
+or `auto` to enable them:
+
+```no_run,shell
+$ export MY_LOG_STYLE=never
+```
+
+If you want to control the logging output completely, see the `custom_logger` example.
+*/
+
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+
+use env_logger::{Env, Builder};
+
+fn init_logger() {
+    let env = Env::default()
+        .filter("MY_LOG_LEVEL")
+        .write_style("MY_LOG_STYLE");
+
+    let mut builder = Builder::from_env(env);
+
+    builder
+        .default_format_level(false)
+        .default_format_timestamp_nanos(true);
+
+    builder.init();
+}
+
+fn main() {
+    init_logger();
+
+    info!("a log from `MyLogger`");
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/examples/custom_format.rs cargo-0.33.0/vendor/env_logger-0.5.13/examples/custom_format.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/examples/custom_format.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/examples/custom_format.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,52 @@
+/*!
+Changing the default logging format.
+
+Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
+
+```no_run,shell
+$ export MY_LOG_LEVEL='info'
+```
+
+Also try setting the `MY_LOG_STYLE` environment variable to `never` to disable colors
+or `auto` to enable them:
+
+```no_run,shell
+$ export MY_LOG_STYLE=never
+```
+
+If you want to control the logging output completely, see the `custom_logger` example.
+*/
+
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+
+use std::io::Write;
+
+use env_logger::{Env, Builder, fmt};
+
+fn init_logger() {
+    let env = Env::default()
+        .filter("MY_LOG_LEVEL")
+        .write_style("MY_LOG_STYLE");
+
+    let mut builder = Builder::from_env(env);
+
+    // Use a different format for writing log records
+    builder.format(|buf, record| {
+        let mut style = buf.style();
+        style.set_bg(fmt::Color::Yellow).set_bold(true);
+
+        let timestamp = buf.timestamp();
+
+        writeln!(buf, "My formatted log ({}): {}", timestamp, style.value(record.args()))
+    });
+
+    builder.init();
+}
+
+fn main() {
+    init_logger();
+
+    info!("a log from `MyLogger`");
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/examples/custom_logger.rs cargo-0.33.0/vendor/env_logger-0.5.13/examples/custom_logger.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/examples/custom_logger.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/examples/custom_logger.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,60 @@
+/*!
+Using `env_logger` to drive a custom logger.
+
+Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
+
+```no_run,shell
+$ export MY_LOG_LEVEL='info'
+```
+
+If you only want to change the way logs are formatted, look at the `custom_format` example.
+*/
+
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+use env_logger::filter::Filter;
+use log::{Log, Metadata, Record, SetLoggerError};
+
+struct MyLogger {
+    inner: Filter
+}
+
+impl MyLogger {
+    fn new() -> MyLogger {
+        use env_logger::filter::Builder;
+        let mut builder = Builder::from_env("MY_LOG_LEVEL");
+
+        MyLogger {
+            inner: builder.build()
+        }
+    }
+
+    fn init() -> Result<(), SetLoggerError> {
+        let logger = Self::new();
+
+        log::set_max_level(logger.inner.filter());
+        log::set_boxed_logger(Box::new(logger))
+    }
+}
+
+impl Log for MyLogger {
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        self.inner.enabled(metadata)
+    }
+
+    fn log(&self, record: &Record) {
+        // Check if the record is matched by the logger before logging
+        if self.inner.matches(record) {
+            println!("{} - {}", record.level(), record.args());
+        }
+    }
+
+    fn flush(&self) { }
+}
+
+fn main() {
+    MyLogger::init().unwrap();
+
+    info!("a log from `MyLogger`");
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/examples/default.rs cargo-0.33.0/vendor/env_logger-0.5.13/examples/default.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/examples/default.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/examples/default.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,36 @@
+/*!
+Using `env_logger`.
+
+Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
+
+```no_run,shell
+$ export MY_LOG_LEVEL='info'
+```
+
+Also try setting the `MY_LOG_STYLE` environment variable to `never` to disable colors
+or `auto` to enable them:
+
+```no_run,shell
+$ export MY_LOG_STYLE=never
+```
+*/
+
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+
+use env_logger::Env;
+
+fn main() {
+    let env = Env::default()
+        .filter_or("MY_LOG_LEVEL", "trace")
+        .write_style_or("MY_LOG_STYLE", "always");
+
+    env_logger::init_from_env(env);
+
+    trace!("some trace log");
+    debug!("some debug log");
+    info!("some information log");
+    warn!("some warning log");
+    error!("some error log");
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/examples/direct_logger.rs cargo-0.33.0/vendor/env_logger-0.5.13/examples/direct_logger.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/examples/direct_logger.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/examples/direct_logger.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,40 @@
+/*!
+Using `env_logger::Logger` and the `log::Log` trait directly.
+
+This example doesn't rely on environment variables, or having a static logger installed.
+*/
+
+extern crate log;
+extern crate env_logger;
+
+fn record() -> log::Record<'static> {
+    let error_metadata = log::MetadataBuilder::new()
+        .target("myApp")
+        .level(log::Level::Error)
+        .build();
+
+    log::Record::builder()
+        .metadata(error_metadata)
+        .args(format_args!("Error!"))
+        .line(Some(433))
+        .file(Some("app.rs"))
+        .module_path(Some("server"))
+        .build()
+}
+
+fn main() {
+    use log::Log;
+
+    let stylish_logger = env_logger::Builder::new()
+        .filter(None, log::LevelFilter::Error)
+        .write_style(env_logger::WriteStyle::Always)
+        .build();
+
+    let unstylish_logger = env_logger::Builder::new()
+        .filter(None, log::LevelFilter::Error)
+        .write_style(env_logger::WriteStyle::Never)
+        .build();
+    
+    stylish_logger.log(&record());
+    unstylish_logger.log(&record());
+}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/LICENSE-APACHE cargo-0.33.0/vendor/env_logger-0.5.13/LICENSE-APACHE
--- cargo-0.32.0/vendor/env_logger-0.5.13/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/LICENSE-MIT cargo-0.33.0/vendor/env_logger-0.5.13/LICENSE-MIT
--- cargo-0.32.0/vendor/env_logger-0.5.13/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/README.md cargo-0.33.0/vendor/env_logger-0.5.13/README.md
--- cargo-0.32.0/vendor/env_logger-0.5.13/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,140 @@
+env_logger [![Build Status](https://travis-ci.org/sebasmagri/env_logger.svg?branch=master)](https://travis-ci.org/sebasmagri/env_logger) [![Maintenance](https://img.shields.io/badge/maintenance-actively%20maintained-brightgreen.svg)](https://github.com/sebasmagri/env_logger) [![crates.io](https://img.shields.io/crates/v/env_logger.svg)](https://crates.io/crates/env_logger) [![Documentation](https://img.shields.io/badge/docs-current-blue.svg)](https://docs.rs/env_logger)
+==========
+
+Implements a logger that can be configured via environment variables.
+
+## Usage
+
+### In libraries
+
+`env_logger` makes sense when used in executables (binary projects). Libraries should use the [`log`](https://doc.rust-lang.org/log) crate instead.
+
+### In executables
+
+It must be added along with `log` to the project dependencies:
+
+```toml
+[dependencies]
+log = "0.4.0"
+env_logger = "0.5.13"
+```
+
+`env_logger` must be initialized as early as possible in the project. After it's initialized, you can use the `log` macros to do actual logging.
+
+```rust
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+
+fn main() {
+    env_logger::init();
+
+    info!("starting up");
+
+    // ...
+}
+```
+
+Then when running the executable, specify a value for the `RUST_LOG`
+environment variable that corresponds with the log messages you want to show.
+
+```bash
+$ RUST_LOG=info ./main
+INFO: 2017-11-09T02:12:24Z: main: starting up
+```
+
+### In tests
+
+Tests can use the `env_logger` crate to see log messages generated during that test:
+
+```toml
+[dependencies]
+log = "0.4.0"
+
+[dev-dependencies]
+env_logger = "0.5.13"
+```
+
+```rust
+#[macro_use]
+extern crate log;
+
+fn add_one(num: i32) -> i32 {
+    info!("add_one called with {}", num);
+    num + 1
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    extern crate env_logger;
+
+    #[test]
+    fn it_adds_one() {
+        let _ = env_logger::try_init();
+        info!("can log from the test too");
+        assert_eq!(3, add_one(2));
+    }
+
+    #[test]
+    fn it_handles_negative_numbers() {
+        let _ = env_logger::try_init();
+        info!("logging from another test");
+        assert_eq!(-7, add_one(-8));
+    }
+}
+```
+
+Assuming the module under test is called `my_lib`, running the tests with the
+`RUST_LOG` filtering to info messages from this module looks like:
+
+```bash
+$ RUST_LOG=my_lib=info cargo test
+     Running target/debug/my_lib-...
+
+running 2 tests
+INFO: 2017-11-09T02:12:24Z: my_lib::tests: logging from another test
+INFO: 2017-11-09T02:12:24Z: my_lib: add_one called with -8
+test tests::it_handles_negative_numbers ... ok
+INFO: 2017-11-09T02:12:24Z: my_lib::tests: can log from the test too
+INFO: 2017-11-09T02:12:24Z: my_lib: add_one called with 2
+test tests::it_adds_one ... ok
+
+test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured
+```
+
+Note that `env_logger::try_init()` needs to be called in each test in which you
+want to enable logging. Additionally, the default behavior of tests to
+run in parallel means that logging output may be interleaved with test output.
+Either run tests in a single thread by specifying `RUST_TEST_THREADS=1` or by
+running one test by specifying its name as an argument to the test binaries as
+directed by the `cargo test` help docs:
+
+```bash
+$ RUST_LOG=my_lib=info cargo test it_adds_one
+     Running target/debug/my_lib-...
+
+running 1 test
+INFO: 2017-11-09T02:12:24Z: my_lib::tests: can log from the test too
+INFO: 2017-11-09T02:12:24Z: my_lib: add_one called with 2
+test tests::it_adds_one ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
+```
+
+## Configuring log target
+
+By default, `env_logger` logs to stderr. If you want to log to stdout instead,
+you can use the `Builder` to change the log target:
+
+```rust
+use std::env;
+use env_logger::{Builder, Target};
+
+let mut builder = Builder::new();
+builder.target(Target::Stdout);
+if env::var("RUST_LOG").is_ok() {
+    builder.parse(&env::var("RUST_LOG").unwrap());
+}
+builder.init();
+```
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/src/filter/mod.rs cargo-0.33.0/vendor/env_logger-0.5.13/src/filter/mod.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/src/filter/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/src/filter/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,568 @@
+//! Filtering for log records.
+//! 
+//! This module contains the log filtering used by `env_logger` to match records.
+//! You can use the `Filter` type in your own logger implementation to use the same 
+//! filter parsing and matching as `env_logger`. For more details about the format 
+//! for directive strings see [Enabling Logging].
+//! 
+//! ## Using `env_logger` in your own logger
+//!
+//! You can use `env_logger`'s filtering functionality with your own logger.
+//! Call [`Builder::parse`] to parse directives from a string when constructing 
+//! your logger. Call [`Filter::matches`] to check whether a record should be 
+//! logged based on the parsed filters when log records are received.
+//!
+//! ```
+//! extern crate log;
+//! extern crate env_logger;
+//! use env_logger::filter::Filter;
+//! use log::{Log, Metadata, Record};
+//!
+//! struct MyLogger {
+//!     filter: Filter
+//! }
+//!
+//! impl MyLogger {
+//!     fn new() -> MyLogger {
+//!         use env_logger::filter::Builder;
+//!         let mut builder = Builder::new();
+//!
+//!         // Parse a directives string from an environment variable
+//!         if let Ok(ref filter) = std::env::var("MY_LOG_LEVEL") {
+//!            builder.parse(filter);
+//!         }
+//!
+//!         MyLogger {
+//!             filter: builder.build()
+//!         }
+//!     }
+//! }
+//!
+//! impl Log for MyLogger {
+//!     fn enabled(&self, metadata: &Metadata) -> bool {
+//!         self.filter.enabled(metadata)
+//!     }
+//!
+//!     fn log(&self, record: &Record) {
+//!         // Check if the record is matched by the filter
+//!         if self.filter.matches(record) {
+//!             println!("{:?}", record);
+//!         }
+//!     }
+//!
+//!     fn flush(&self) {}
+//! }
+//! # fn main() {}
+//! ```
+//! 
+//! [Enabling Logging]: ../index.html#enabling-logging
+//! [`Builder::parse`]: struct.Builder.html#method.parse
+//! [`Filter::matches`]: struct.Filter.html#method.matches
+
+use std::env;
+use std::mem;
+use std::fmt;
+use log::{Level, LevelFilter, Record, Metadata};
+
+#[cfg(feature = "regex")]
+#[path = "regex.rs"]
+mod inner;
+
+#[cfg(not(feature = "regex"))]
+#[path = "string.rs"]
+mod inner;
+
+/// A log filter.
+/// 
+/// This struct can be used to determine whether or not a log record
+/// should be written to the output.
+/// Use the [`Builder`] type to parse and construct a `Filter`.
+/// 
+/// [`Builder`]: struct.Builder.html
+pub struct Filter {
+    directives: Vec<Directive>,
+    filter: Option<inner::Filter>,
+}
+
+/// A builder for a log filter.
+/// 
+/// It can be used to parse a set of directives from a string before building
+/// a [`Filter`] instance.
+/// 
+/// ## Example
+///
+/// ```
+/// #[macro_use]
+/// extern crate log;
+/// extern crate env_logger;
+///
+/// use std::env;
+/// use std::io;
+/// use env_logger::filter::Builder;
+///
+/// fn main() {
+///     let mut builder = Builder::new();
+///
+///     // Parse a logging filter from an environment variable.
+///     if let Ok(rust_log) = env::var("RUST_LOG") {
+///        builder.parse(&rust_log);
+///     }
+///
+///     let filter = builder.build();
+/// }
+/// ```
+/// 
+/// [`Filter`]: struct.Filter.html
+pub struct Builder {
+    directives: Vec<Directive>,
+    filter: Option<inner::Filter>,
+}
+
+#[derive(Debug)]
+struct Directive {
+    name: Option<String>,
+    level: LevelFilter,
+}
+
+impl Filter {
+    /// Returns the maximum `LevelFilter` that this filter instance is
+    /// configured to output.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// extern crate log;
+    /// extern crate env_logger;
+    ///
+    /// use log::LevelFilter;
+    /// use env_logger::filter::Builder;
+    ///
+    /// fn main() {
+    ///     let mut builder = Builder::new();
+    ///     builder.filter(Some("module1"), LevelFilter::Info);
+    ///     builder.filter(Some("module2"), LevelFilter::Error);
+    ///
+    ///     let filter = builder.build();
+    ///     assert_eq!(filter.filter(), LevelFilter::Info);
+    /// }
+    /// ```
+    pub fn filter(&self) -> LevelFilter {
+        self.directives.iter()
+            .map(|d| d.level)
+            .max()
+            .unwrap_or(LevelFilter::Off)
+    }
+
+    /// Checks if this record matches the configured filter.
+    pub fn matches(&self, record: &Record) -> bool {
+        if !self.enabled(record.metadata()) {
+            return false;
+        }
+
+        if let Some(filter) = self.filter.as_ref() {
+            if !filter.is_match(&*record.args().to_string()) {
+                return false;
+            }
+        }
+
+        true
+    }
+
+    /// Determines if a log message with the specified metadata would be logged.
+    pub fn enabled(&self, metadata: &Metadata) -> bool {
+        let level = metadata.level();
+        let target = metadata.target();
+
+        enabled(&self.directives, level, target)
+    }
+}
+
+impl Builder {
+    /// Initializes the filter builder with defaults.
+    pub fn new() -> Builder {
+        Builder {
+            directives: Vec::new(),
+            filter: None,
+        }
+    }
+
+    /// Initializes the filter builder from an environment.
+    pub fn from_env(env: &str) -> Builder {
+        let mut builder = Builder::new();
+
+        if let Ok(s) = env::var(env) {
+            builder.parse(&s);
+        }
+
+        builder
+    }
+
+    /// Adds a directive to the filter for a specific module.
+    pub fn filter_module(&mut self, module: &str, level: LevelFilter) -> &mut Self {
+        self.filter(Some(module), level)
+    }
+
+    /// Adds a directive to the filter for all modules.
+    pub fn filter_level(&mut self, level: LevelFilter) -> &mut Self {
+        self.filter(None, level)
+    }
+
+    /// Adds a directive to the filter.
+    ///
+    /// The given module (if any) will log at most the specified level provided.
+    /// If no module is provided then the filter will apply to all log messages.
+    pub fn filter(&mut self,
+                  module: Option<&str>,
+                  level: LevelFilter) -> &mut Self {
+        self.directives.push(Directive {
+            name: module.map(|s| s.to_string()),
+            level,
+        });
+        self
+    }
+
+    /// Parses the directives string.
+    ///
+    /// See the [Enabling Logging] section for more details.
+    /// 
+    /// [Enabling Logging]: ../index.html#enabling-logging
+    pub fn parse(&mut self, filters: &str) -> &mut Self {
+        let (directives, filter) = parse_spec(filters);
+
+        self.filter = filter;
+
+        for directive in directives {
+            self.directives.push(directive);
+        }
+        self
+    }
+
+    /// Build a log filter.
+    pub fn build(&mut self) -> Filter {
+        if self.directives.is_empty() {
+            // Adds the default filter if none exist
+            self.directives.push(Directive {
+                name: None,
+                level: LevelFilter::Error,
+            });
+        } else {
+            // Sort the directives by length of their name, this allows a
+            // little more efficient lookup at runtime.
+            self.directives.sort_by(|a, b| {
+                let alen = a.name.as_ref().map(|a| a.len()).unwrap_or(0);
+                let blen = b.name.as_ref().map(|b| b.len()).unwrap_or(0);
+                alen.cmp(&blen)
+            });
+        }
+
+        Filter {
+            directives: mem::replace(&mut self.directives, Vec::new()),
+            filter: mem::replace(&mut self.filter, None),
+        }
+    }
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Builder::new()
+    }
+}
+
+impl fmt::Debug for Filter {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Filter")
+            .field("filter", &self.filter)
+            .field("directives", &self.directives)
+            .finish()
+    }
+}
+
+impl fmt::Debug for Builder {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Filter")
+            .field("filter", &self.filter)
+            .field("directives", &self.directives)
+            .finish()
+    }
+}
+
+/// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=error/foo")
+/// and return a vector with log directives.
+fn parse_spec(spec: &str) -> (Vec<Directive>, Option<inner::Filter>) {
+    let mut dirs = Vec::new();
+
+    let mut parts = spec.split('/');
+    let mods = parts.next();
+    let filter = parts.next();
+    if parts.next().is_some() {
+        println!("warning: invalid logging spec '{}', \
+                 ignoring it (too many '/'s)", spec);
+        return (dirs, None);
+    }
+    mods.map(|m| { for s in m.split(',') {
+        if s.len() == 0 { continue }
+        let mut parts = s.split('=');
+        let (log_level, name) = match (parts.next(), parts.next().map(|s| s.trim()), parts.next()) {
+            (Some(part0), None, None) => {
+                // if the single argument is a log-level string or number,
+                // treat that as a global fallback
+                match part0.parse() {
+                    Ok(num) => (num, None),
+                    Err(_) => (LevelFilter::max(), Some(part0)),
+                }
+            }
+            (Some(part0), Some(""), None) => (LevelFilter::max(), Some(part0)),
+            (Some(part0), Some(part1), None) => {
+                match part1.parse() {
+                    Ok(num) => (num, Some(part0)),
+                    _ => {
+                        println!("warning: invalid logging spec '{}', \
+                                 ignoring it", part1);
+                        continue
+                    }
+                }
+            },
+            _ => {
+                println!("warning: invalid logging spec '{}', \
+                         ignoring it", s);
+                continue
+            }
+        };
+        dirs.push(Directive {
+            name: name.map(|s| s.to_string()),
+            level: log_level,
+        });
+    }});
+
+    let filter = filter.map_or(None, |filter| {
+        match inner::Filter::new(filter) {
+            Ok(re) => Some(re),
+            Err(e) => {
+                println!("warning: invalid regex filter - {}", e);
+                None
+            }
+        }
+    });
+
+    return (dirs, filter);
+}
+
+
+// Check whether a level and target are enabled by the set of directives.
+fn enabled(directives: &[Directive], level: Level, target: &str) -> bool {
+    // Search for the longest match, the vector is assumed to be pre-sorted.
+    for directive in directives.iter().rev() {
+        match directive.name {
+            Some(ref name) if !target.starts_with(&**name) => {},
+            Some(..) | None => {
+                return level <= directive.level
+            }
+        }
+    }
+    false
+}
+
+#[cfg(test)]
+mod tests {
+    use log::{Level, LevelFilter};
+
+    use super::{Builder, Filter, Directive, parse_spec, enabled};
+
+    fn make_logger_filter(dirs: Vec<Directive>) -> Filter {
+        let mut logger = Builder::new().build();
+        logger.directives = dirs;
+        logger
+    }
+
+    #[test]
+    fn filter_info() {
+        let logger = Builder::new().filter(None, LevelFilter::Info).build();
+        assert!(enabled(&logger.directives, Level::Info, "crate1"));
+        assert!(!enabled(&logger.directives, Level::Debug, "crate1"));
+    }
+
+    #[test]
+    fn filter_beginning_longest_match() {
+        let logger = Builder::new()
+                        .filter(Some("crate2"), LevelFilter::Info)
+                        .filter(Some("crate2::mod"), LevelFilter::Debug)
+                        .filter(Some("crate1::mod1"), LevelFilter::Warn)
+                        .build();
+        assert!(enabled(&logger.directives, Level::Debug, "crate2::mod1"));
+        assert!(!enabled(&logger.directives, Level::Debug, "crate2"));
+    }
+
+    #[test]
+    fn parse_default() {
+        let logger = Builder::new().parse("info,crate1::mod1=warn").build();
+        assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
+        assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
+    }
+
+    #[test]
+    fn match_full_path() {
+        let logger = make_logger_filter(vec![
+            Directive {
+                name: Some("crate2".to_string()),
+                level: LevelFilter::Info
+            },
+            Directive {
+                name: Some("crate1::mod1".to_string()),
+                level: LevelFilter::Warn
+            }
+        ]);
+        assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
+        assert!(!enabled(&logger.directives, Level::Info, "crate1::mod1"));
+        assert!(enabled(&logger.directives, Level::Info, "crate2"));
+        assert!(!enabled(&logger.directives, Level::Debug, "crate2"));
+    }
+
+    #[test]
+    fn no_match() {
+        let logger = make_logger_filter(vec![
+            Directive { name: Some("crate2".to_string()), level: LevelFilter::Info },
+            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
+        ]);
+        assert!(!enabled(&logger.directives, Level::Warn, "crate3"));
+    }
+
+    #[test]
+    fn match_beginning() {
+        let logger = make_logger_filter(vec![
+            Directive { name: Some("crate2".to_string()), level: LevelFilter::Info },
+            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
+        ]);
+        assert!(enabled(&logger.directives, Level::Info, "crate2::mod1"));
+    }
+
+    #[test]
+    fn match_beginning_longest_match() {
+        let logger = make_logger_filter(vec![
+            Directive { name: Some("crate2".to_string()), level: LevelFilter::Info },
+            Directive { name: Some("crate2::mod".to_string()), level: LevelFilter::Debug },
+            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
+        ]);
+        assert!(enabled(&logger.directives, Level::Debug, "crate2::mod1"));
+        assert!(!enabled(&logger.directives, Level::Debug, "crate2"));
+    }
+
+    #[test]
+    fn match_default() {
+        let logger = make_logger_filter(vec![
+            Directive { name: None, level: LevelFilter::Info },
+            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
+        ]);
+        assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
+        assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
+    }
+
+    #[test]
+    fn zero_level() {
+        let logger = make_logger_filter(vec![
+            Directive { name: None, level: LevelFilter::Info },
+            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Off }
+        ]);
+        assert!(!enabled(&logger.directives, Level::Error, "crate1::mod1"));
+        assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
+    }
+
+    #[test]
+    fn parse_spec_valid() {
+        let (dirs, filter) = parse_spec("crate1::mod1=error,crate1::mod2,crate2=debug");
+        assert_eq!(dirs.len(), 3);
+        assert_eq!(dirs[0].name, Some("crate1::mod1".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::Error);
+
+        assert_eq!(dirs[1].name, Some("crate1::mod2".to_string()));
+        assert_eq!(dirs[1].level, LevelFilter::max());
+
+        assert_eq!(dirs[2].name, Some("crate2".to_string()));
+        assert_eq!(dirs[2].level, LevelFilter::Debug);
+        assert!(filter.is_none());
+    }
+
+    #[test]
+    fn parse_spec_invalid_crate() {
+        // test parse_spec with multiple = in specification
+        let (dirs, filter) = parse_spec("crate1::mod1=warn=info,crate2=debug");
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].name, Some("crate2".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::Debug);
+        assert!(filter.is_none());
+    }
+
+    #[test]
+    fn parse_spec_invalid_level() {
+        // test parse_spec with 'noNumber' as log level
+        let (dirs, filter) = parse_spec("crate1::mod1=noNumber,crate2=debug");
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].name, Some("crate2".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::Debug);
+        assert!(filter.is_none());
+    }
+
+    #[test]
+    fn parse_spec_string_level() {
+        // test parse_spec with 'warn' as log level
+        let (dirs, filter) = parse_spec("crate1::mod1=wrong,crate2=warn");
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].name, Some("crate2".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::Warn);
+        assert!(filter.is_none());
+    }
+
+    #[test]
+    fn parse_spec_empty_level() {
+        // test parse_spec with '' as log level
+        let (dirs, filter) = parse_spec("crate1::mod1=wrong,crate2=");
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].name, Some("crate2".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::max());
+        assert!(filter.is_none());
+    }
+
+    #[test]
+    fn parse_spec_global() {
+        // test parse_spec with no crate
+        let (dirs, filter) = parse_spec("warn,crate2=debug");
+        assert_eq!(dirs.len(), 2);
+        assert_eq!(dirs[0].name, None);
+        assert_eq!(dirs[0].level, LevelFilter::Warn);
+        assert_eq!(dirs[1].name, Some("crate2".to_string()));
+        assert_eq!(dirs[1].level, LevelFilter::Debug);
+        assert!(filter.is_none());
+    }
+
+    #[test]
+    fn parse_spec_valid_filter() {
+        let (dirs, filter) = parse_spec("crate1::mod1=error,crate1::mod2,crate2=debug/abc");
+        assert_eq!(dirs.len(), 3);
+        assert_eq!(dirs[0].name, Some("crate1::mod1".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::Error);
+
+        assert_eq!(dirs[1].name, Some("crate1::mod2".to_string()));
+        assert_eq!(dirs[1].level, LevelFilter::max());
+
+        assert_eq!(dirs[2].name, Some("crate2".to_string()));
+        assert_eq!(dirs[2].level, LevelFilter::Debug);
+        assert!(filter.is_some() && filter.unwrap().to_string() == "abc");
+    }
+
+    #[test]
+    fn parse_spec_invalid_crate_filter() {
+        let (dirs, filter) = parse_spec("crate1::mod1=error=warn,crate2=debug/a.c");
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].name, Some("crate2".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::Debug);
+        assert!(filter.is_some() && filter.unwrap().to_string() == "a.c");
+    }
+
+    #[test]
+    fn parse_spec_empty_with_filter() {
+        let (dirs, filter) = parse_spec("crate1/a*c");
+        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs[0].name, Some("crate1".to_string()));
+        assert_eq!(dirs[0].level, LevelFilter::max());
+        assert!(filter.is_some() && filter.unwrap().to_string() == "a*c");
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/src/filter/regex.rs cargo-0.33.0/vendor/env_logger-0.5.13/src/filter/regex.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/src/filter/regex.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/src/filter/regex.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,29 @@
+extern crate regex;
+
+use std::fmt;
+
+use self::regex::Regex;
+
+#[derive(Debug)]
+pub struct Filter {
+    inner: Regex,
+}
+
+impl Filter {
+    pub fn new(spec: &str) -> Result<Filter, String> {
+        match Regex::new(spec){
+            Ok(r) => Ok(Filter { inner: r }),
+            Err(e) => Err(e.to_string()),
+        }
+    }
+
+    pub fn is_match(&self, s: &str) -> bool {
+        self.inner.is_match(s)
+    }
+}
+
+impl fmt::Display for Filter {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/src/filter/string.rs cargo-0.33.0/vendor/env_logger-0.5.13/src/filter/string.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/src/filter/string.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/src/filter/string.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,22 @@
+use std::fmt;
+
+#[derive(Debug)]
+pub struct Filter {
+    inner: String,
+}
+
+impl Filter {
+    pub fn new(spec: &str) -> Result<Filter, String> {
+        Ok(Filter { inner: spec.to_string() })
+    }
+
+    pub fn is_match(&self, s: &str) -> bool {
+        s.contains(&self.inner)
+    }
+}
+
+impl fmt::Display for Filter {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.inner.fmt(f)
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/src/fmt.rs cargo-0.33.0/vendor/env_logger-0.5.13/src/fmt.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/src/fmt.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/src/fmt.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,844 @@
+//! Formatting for log records.
+//!
+//! This module contains a [`Formatter`] that can be used to format log records
+//! into without needing temporary allocations. Usually you won't need to worry
+//! about the contents of this module and can use the `Formatter` like an ordinary
+//! [`Write`].
+//!
+//! # Formatting log records
+//!
+//! The format used to print log records can be customised using the [`Builder::format`]
+//! method.
+//! Custom formats can apply different color and weight to printed values using
+//! [`Style`] builders.
+//!
+//! ```
+//! use std::io::Write;
+//! use env_logger::fmt::Color;
+//!
+//! let mut builder = env_logger::Builder::new();
+//!
+//! builder.format(|buf, record| {
+//!     let mut level_style = buf.style();
+//!
+//!     level_style.set_color(Color::Red).set_bold(true);
+//!
+//!     writeln!(buf, "{}: {}",
+//!         level_style.value(record.level()),
+//!         record.args())
+//! });
+//! ```
+//!
+//! [`Formatter`]: struct.Formatter.html
+//! [`Style`]: struct.Style.html
+//! [`Builder::format`]: ../struct.Builder.html#method.format
+//! [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
+
+use std::io::prelude::*;
+use std::{io, fmt};
+use std::rc::Rc;
+use std::str::FromStr;
+use std::error::Error;
+use std::cell::RefCell;
+use std::time::SystemTime;
+
+use log::Level;
+use termcolor::{self, ColorSpec, ColorChoice, Buffer, BufferWriter, WriteColor};
+use atty;
+use humantime::{format_rfc3339_seconds, format_rfc3339_nanos};
+
+/// A formatter to write logs into.
+///
+/// `Formatter` implements the standard [`Write`] trait for writing log records.
+/// It also supports terminal colors, through the [`style`] method.
+///
+/// # Examples
+///
+/// Use the [`writeln`] macro to easily format a log record:
+///
+/// ```
+/// use std::io::Write;
+///
+/// let mut builder = env_logger::Builder::new();
+///
+/// builder.format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args()));
+/// ```
+///
+/// [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
+/// [`writeln`]: https://doc.rust-lang.org/stable/std/macro.writeln.html
+/// [`style`]: #method.style
+pub struct Formatter {
+    buf: Rc<RefCell<Buffer>>,
+    write_style: WriteStyle,
+}
+
+/// A set of styles to apply to the terminal output.
+///
+/// Call [`Formatter::style`] to get a `Style` and use the builder methods to
+/// set styling properties, like [color] and [weight].
+/// To print a value using the style, wrap it in a call to [`value`] when the log
+/// record is formatted.
+///
+/// # Examples
+///
+/// Create a bold, red colored style and use it to print the log level:
+///
+/// ```
+/// use std::io::Write;
+/// use env_logger::fmt::Color;
+///
+/// let mut builder = env_logger::Builder::new();
+///
+/// builder.format(|buf, record| {
+///     let mut level_style = buf.style();
+///
+///     level_style.set_color(Color::Red).set_bold(true);
+///
+///     writeln!(buf, "{}: {}",
+///         level_style.value(record.level()),
+///         record.args())
+/// });
+/// ```
+///
+/// Styles can be re-used to output multiple values:
+///
+/// ```
+/// use std::io::Write;
+/// use env_logger::fmt::Color;
+///
+/// let mut builder = env_logger::Builder::new();
+///
+/// builder.format(|buf, record| {
+///     let mut bold = buf.style();
+///
+///     bold.set_bold(true);
+///
+///     writeln!(buf, "{}: {} {}",
+///         bold.value(record.level()),
+///         bold.value("some bold text"),
+///         record.args())
+/// });
+/// ```
+///
+/// [`Formatter::style`]: struct.Formatter.html#method.style
+/// [color]: #method.set_color
+/// [weight]: #method.set_bold
+/// [`value`]: #method.value
+#[derive(Clone)]
+pub struct Style {
+    buf: Rc<RefCell<Buffer>>,
+    spec: ColorSpec,
+}
+
+/// A value that can be printed using the given styles.
+///
+/// It is the result of calling [`Style::value`].
+///
+/// [`Style::value`]: struct.Style.html#method.value
+pub struct StyledValue<'a, T> {
+    style: &'a Style,
+    value: T,
+}
+
+/// An [RFC3339] formatted timestamp.
+///
+/// The timestamp implements [`Display`] and can be written to a [`Formatter`].
+///
+/// [RFC3339]: https://www.ietf.org/rfc/rfc3339.txt
+/// [`Display`]: https://doc.rust-lang.org/stable/std/fmt/trait.Display.html
+/// [`Formatter`]: struct.Formatter.html
+pub struct Timestamp(SystemTime);
+
+/// An [RFC3339] formatted timestamp with nanos
+#[derive(Debug)]
+pub struct PreciseTimestamp(SystemTime);
+
+/// Log target, either `stdout` or `stderr`.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum Target {
+    /// Logs will be sent to standard output.
+    Stdout,
+    /// Logs will be sent to standard error.
+    Stderr,
+}
+
+impl Default for Target {
+    fn default() -> Self {
+        Target::Stderr
+    }
+}
+
+/// Whether or not to print styles to the target.
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+pub enum WriteStyle {
+    /// Try to print styles, but don't force the issue.
+    Auto,
+    /// Try very hard to print styles.
+    Always,
+    /// Never print styles.
+    Never,
+}
+
+impl Default for WriteStyle {
+    fn default() -> Self {
+        WriteStyle::Auto
+    }
+}
+
+/// A terminal target with color awareness.
+pub(crate) struct Writer {
+    inner: BufferWriter,
+    write_style: WriteStyle,
+}
+
+impl Writer {
+    pub(crate) fn write_style(&self) -> WriteStyle {
+        self.write_style
+    }
+}
+
+/// A builder for a terminal writer.
+///
+/// The target and style choice can be configured before building.
+pub(crate) struct Builder {
+    target: Target,
+    write_style: WriteStyle,
+}
+
+impl Builder {
+    /// Initialize the writer builder with defaults.
+    pub fn new() -> Self {
+        Builder {
+            target: Default::default(),
+            write_style: Default::default(),
+        }
+    }
+
+    /// Set the target to write to.
+    pub fn target(&mut self, target: Target) -> &mut Self {
+        self.target = target;
+        self
+    }
+
+    /// Parses a style choice string.
+    ///
+    /// See the [Disabling colors] section for more details.
+    ///
+    /// [Disabling colors]: ../index.html#disabling-colors
+    pub fn parse(&mut self, write_style: &str) -> &mut Self {
+        self.write_style(parse_write_style(write_style))
+    }
+
+    /// Whether or not to print style characters when writing.
+    pub fn write_style(&mut self, write_style: WriteStyle) -> &mut Self {
+        self.write_style = write_style;
+        self
+    }
+
+    /// Build a terminal writer.
+    pub fn build(&mut self) -> Writer {
+        let color_choice = match self.write_style {
+            WriteStyle::Auto => {
+                if atty::is(match self.target {
+                    Target::Stderr => atty::Stream::Stderr,
+                    Target::Stdout => atty::Stream::Stdout,
+                }) {
+                    ColorChoice::Auto
+                } else {
+                    ColorChoice::Never
+                }
+            },
+            WriteStyle::Always => ColorChoice::Always,
+            WriteStyle::Never => ColorChoice::Never,
+        };
+
+        let writer = match self.target {
+            Target::Stderr => BufferWriter::stderr(color_choice),
+            Target::Stdout => BufferWriter::stdout(color_choice),
+        };
+
+        Writer {
+            inner: writer,
+            write_style: self.write_style,
+        }
+    }
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Builder::new()
+    }
+}
+
+impl Style {
+    /// Set the text color.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with red text:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_color(Color::Red);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_color(&mut self, color: Color) -> &mut Style {
+        self.spec.set_fg(color.into_termcolor());
+        self
+    }
+
+    /// Set the text weight.
+    ///
+    /// If `yes` is true then text will be written in bold.
+    /// If `yes` is false then text will be written in the default weight.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with bold text:
+    ///
+    /// ```
+    /// use std::io::Write;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_bold(true);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_bold(&mut self, yes: bool) -> &mut Style {
+        self.spec.set_bold(yes);
+        self
+    }
+
+    /// Set the text intensity.
+    ///
+    /// If `yes` is true then text will be written in a brighter color.
+    /// If `yes` is false then text will be written in the default color.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with intense text:
+    ///
+    /// ```
+    /// use std::io::Write;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_intense(true);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_intense(&mut self, yes: bool) -> &mut Style {
+        self.spec.set_intense(yes);
+        self
+    }
+
+    /// Set the background color.
+    ///
+    /// # Examples
+    ///
+    /// Create a style with a yellow background:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_bg(Color::Yellow);
+    ///
+    ///     writeln!(buf, "{}", style.value(record.args()))
+    /// });
+    /// ```
+    pub fn set_bg(&mut self, color: Color) -> &mut Style {
+        self.spec.set_bg(color.into_termcolor());
+        self
+    }
+
+    /// Wrap a value in the style.
+    ///
+    /// The same `Style` can be used to print multiple different values.
+    ///
+    /// # Examples
+    ///
+    /// Create a bold, red colored style and use it to print the log level:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut style = buf.style();
+    ///
+    ///     style.set_color(Color::Red).set_bold(true);
+    ///
+    ///     writeln!(buf, "{}: {}",
+    ///         style.value(record.level()),
+    ///         record.args())
+    /// });
+    /// ```
+    pub fn value<T>(&self, value: T) -> StyledValue<T> {
+        StyledValue {
+            style: &self,
+            value
+        }
+    }
+}
+
+impl Formatter {
+    pub(crate) fn new(writer: &Writer) -> Self {
+        Formatter {
+            buf: Rc::new(RefCell::new(writer.inner.buffer())),
+            write_style: writer.write_style(),
+        }
+    }
+
+    pub(crate) fn write_style(&self) -> WriteStyle {
+        self.write_style
+    }
+
+    /// Begin a new [`Style`].
+    ///
+    /// # Examples
+    ///
+    /// Create a bold, red colored style and use it to print the log level:
+    ///
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::fmt::Color;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let mut level_style = buf.style();
+    ///
+    ///     level_style.set_color(Color::Red).set_bold(true);
+    ///
+    ///     writeln!(buf, "{}: {}",
+    ///         level_style.value(record.level()),
+    ///         record.args())
+    /// });
+    /// ```
+    ///
+    /// [`Style`]: struct.Style.html
+    pub fn style(&self) -> Style {
+        Style {
+            buf: self.buf.clone(),
+            spec: ColorSpec::new(),
+        }
+    }
+
+    /// Get the default [`Style`] for the given level.
+    pub fn default_level_style(&self, level: Level) -> Style {
+        let mut level_style = self.style();
+        match level {
+            Level::Trace => level_style.set_color(Color::White),
+            Level::Debug => level_style.set_color(Color::Blue),
+            Level::Info => level_style.set_color(Color::Green),
+            Level::Warn => level_style.set_color(Color::Yellow),
+            Level::Error => level_style.set_color(Color::Red).set_bold(true),
+        };
+        level_style
+    }
+
+    /// Get a [`Timestamp`] for the current date and time in UTC.
+    ///
+    /// # Examples
+    ///
+    /// Include the current timestamp with the log record:
+    ///
+    /// ```
+    /// use std::io::Write;
+    ///
+    /// let mut builder = env_logger::Builder::new();
+    ///
+    /// builder.format(|buf, record| {
+    ///     let ts = buf.timestamp();
+    ///
+    ///     writeln!(buf, "{}: {}: {}", ts, record.level(), record.args())
+    /// });
+    /// ```
+    ///
+    /// [`Timestamp`]: struct.Timestamp.html
+    pub fn timestamp(&self) -> Timestamp {
+        Timestamp(SystemTime::now())
+    }
+
+     /// Get a [`PreciseTimestamp`] for the current date and time in UTC with nanos.
+    pub fn precise_timestamp(&self) -> PreciseTimestamp {
+        PreciseTimestamp(SystemTime::now())
+    }
+
+    pub(crate) fn print(&self, writer: &Writer) -> io::Result<()> {
+        writer.inner.print(&self.buf.borrow())
+    }
+
+    pub(crate) fn clear(&mut self) {
+        self.buf.borrow_mut().clear()
+    }
+}
+
+impl Write for Formatter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.buf.borrow_mut().write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.buf.borrow_mut().flush()
+    }
+}
+
+impl<'a, T> StyledValue<'a, T> {
+    fn write_fmt<F>(&self, f: F) -> fmt::Result
+    where
+        F: FnOnce() -> fmt::Result,
+    {
+        self.style.buf.borrow_mut().set_color(&self.style.spec).map_err(|_| fmt::Error)?;
+
+        // Always try to reset the terminal style, even if writing failed
+        let write = f();
+        let reset = self.style.buf.borrow_mut().reset().map_err(|_| fmt::Error);
+
+        write.and(reset)
+    }
+}
+
+impl fmt::Debug for Timestamp {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        /// A `Debug` wrapper for `Timestamp` that uses the `Display` implementation.
+        struct TimestampValue<'a>(&'a Timestamp);
+
+        impl<'a> fmt::Debug for TimestampValue<'a> {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                fmt::Display::fmt(&self.0, f)
+            }
+        }
+
+        f.debug_tuple("Timestamp")
+         .field(&TimestampValue(&self))
+         .finish()
+    }
+}
+
+impl fmt::Debug for Writer {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Writer").finish()
+    }
+}
+
+impl fmt::Debug for Formatter {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Formatter").finish()
+    }
+}
+
+impl fmt::Debug for Builder {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Logger")
+        .field("target", &self.target)
+        .field("write_style", &self.write_style)
+        .finish()
+    }
+}
+
+impl fmt::Debug for Style {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        f.debug_struct("Style").field("spec", &self.spec).finish()
+    }
+}
+
+macro_rules! impl_styled_value_fmt {
+    ($($fmt_trait:path),*) => {
+        $(
+            impl<'a, T: $fmt_trait> $fmt_trait for StyledValue<'a, T> {
+                fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+                    self.write_fmt(|| T::fmt(&self.value, f))
+                }
+            }
+        )*
+    };
+}
+
+impl_styled_value_fmt!(
+    fmt::Debug,
+    fmt::Display,
+    fmt::Pointer,
+    fmt::Octal,
+    fmt::Binary,
+    fmt::UpperHex,
+    fmt::LowerHex,
+    fmt::UpperExp,
+    fmt::LowerExp);
+
+impl fmt::Display for Timestamp {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        format_rfc3339_seconds(self.0).fmt(f)
+    }
+}
+
+impl fmt::Display for PreciseTimestamp {
+    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+        format_rfc3339_nanos(self.0).fmt(f)
+    }
+}
+
+// The `Color` type is copied from https://github.com/BurntSushi/ripgrep/tree/master/termcolor
+
+/// The set of available colors for the terminal foreground/background.
+///
+/// The `Ansi256` and `Rgb` colors will only output the correct codes when
+/// paired with the `Ansi` `WriteColor` implementation.
+///
+/// The `Ansi256` and `Rgb` color types are not supported when writing colors
+/// on Windows using the console. If they are used on Windows, then they are
+/// silently ignored and no colors will be emitted.
+///
+/// This set may expand over time.
+///
+/// This type has a `FromStr` impl that can parse colors from their human
+/// readable form. The format is as follows:
+///
+/// 1. Any of the explicitly listed colors in English. They are matched
+///    case insensitively.
+/// 2. A single 8-bit integer, in either decimal or hexadecimal format.
+/// 3. A triple of 8-bit integers separated by a comma, where each integer is
+///    in decimal or hexadecimal format.
+///
+/// Hexadecimal numbers are written with a `0x` prefix.
+#[allow(missing_docs)]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum Color {
+    Black,
+    Blue,
+    Green,
+    Red,
+    Cyan,
+    Magenta,
+    Yellow,
+    White,
+    Ansi256(u8),
+    Rgb(u8, u8, u8),
+    #[doc(hidden)]
+    __Nonexhaustive,
+}
+
+/// An error from parsing an invalid color specification.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ParseColorError(ParseColorErrorKind);
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+enum ParseColorErrorKind {
+    /// An error originating from `termcolor`.
+    TermColor(termcolor::ParseColorError),
+    /// An error converting the `termcolor` color to a `env_logger::Color`.
+    /// 
+    /// This variant should only get reached if a user uses a new spec that's
+    /// valid for `termcolor`, but not recognised in `env_logger` yet.
+    Unrecognized {
+        given: String,
+    }
+}
+
+impl ParseColorError {
+    fn termcolor(err: termcolor::ParseColorError) -> Self {
+        ParseColorError(ParseColorErrorKind::TermColor(err))
+    }
+
+    fn unrecognized(given: String) -> Self {
+        ParseColorError(ParseColorErrorKind::Unrecognized { given })
+    }
+
+    /// Return the string that couldn't be parsed as a valid color.
+    pub fn invalid(&self) -> &str {
+        match self.0 {
+            ParseColorErrorKind::TermColor(ref err) => err.invalid(),
+            ParseColorErrorKind::Unrecognized { ref given, .. } => given,
+        }
+    }
+}
+
+impl Error for ParseColorError {
+    fn description(&self) -> &str {
+        match self.0 {
+            ParseColorErrorKind::TermColor(ref err) => err.description(),
+            ParseColorErrorKind::Unrecognized { .. } => "unrecognized color value",
+        }
+    }
+}
+
+impl fmt::Display for ParseColorError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.0 {
+            ParseColorErrorKind::TermColor(ref err) => fmt::Display::fmt(err, f),
+            ParseColorErrorKind::Unrecognized { ref given, .. } => {
+                write!(f, "unrecognized color value '{}'", given)
+            } 
+        }
+    }
+}
+
+impl Color {
+    fn into_termcolor(self) -> Option<termcolor::Color> {
+        match self {
+            Color::Black => Some(termcolor::Color::Black),
+            Color::Blue => Some(termcolor::Color::Blue),
+            Color::Green => Some(termcolor::Color::Green),
+            Color::Red => Some(termcolor::Color::Red),
+            Color::Cyan => Some(termcolor::Color::Cyan),
+            Color::Magenta => Some(termcolor::Color::Magenta),
+            Color::Yellow => Some(termcolor::Color::Yellow),
+            Color::White => Some(termcolor::Color::White),
+            Color::Ansi256(value) => Some(termcolor::Color::Ansi256(value)),
+            Color::Rgb(r, g, b) => Some(termcolor::Color::Rgb(r, g, b)),
+            _ => None,
+        }
+    }
+
+    fn from_termcolor(color: termcolor::Color) -> Option<Color> {
+        match color {
+            termcolor::Color::Black => Some(Color::Black),
+            termcolor::Color::Blue => Some(Color::Blue),
+            termcolor::Color::Green => Some(Color::Green),
+            termcolor::Color::Red => Some(Color::Red),
+            termcolor::Color::Cyan => Some(Color::Cyan),
+            termcolor::Color::Magenta => Some(Color::Magenta),
+            termcolor::Color::Yellow => Some(Color::Yellow),
+            termcolor::Color::White => Some(Color::White),
+            termcolor::Color::Ansi256(value) => Some(Color::Ansi256(value)),
+            termcolor::Color::Rgb(r, g, b) => Some(Color::Rgb(r, g, b)),
+            _ => None,
+        }
+    }
+}
+
+impl FromStr for Color {
+    type Err = ParseColorError;
+
+    fn from_str(s: &str) -> Result<Color, ParseColorError> {
+        let tc = termcolor::Color::from_str(s).map_err(ParseColorError::termcolor)?;
+        Color::from_termcolor(tc).ok_or_else(|| ParseColorError::unrecognized(s.into()))
+    }
+}
+
+fn parse_write_style(spec: &str) -> WriteStyle {
+    match spec {
+        "auto" => WriteStyle::Auto,
+        "always" => WriteStyle::Always,
+        "never" => WriteStyle::Never,
+        _ => Default::default(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_write_style_valid() {
+        let inputs = vec![
+            ("auto", WriteStyle::Auto),
+            ("always", WriteStyle::Always),
+            ("never", WriteStyle::Never),
+        ];
+
+        for (input, expected) in inputs {
+            assert_eq!(expected, parse_write_style(input));
+        }
+    }
+
+    #[test]
+    fn parse_write_style_invalid() {
+        let inputs = vec![
+            "",
+            "true",
+            "false",
+            "NEVER!!"
+        ];
+
+        for input in inputs {
+            assert_eq!(WriteStyle::Auto, parse_write_style(input));
+        }
+    }
+
+    #[test]
+    fn parse_color_name_valid() {
+        let inputs = vec![
+            "black",
+            "blue",
+            "green",
+            "red",
+            "cyan",
+            "magenta",
+            "yellow",
+            "white",
+        ];
+
+        for input in inputs {
+            assert!(Color::from_str(input).is_ok());
+        }
+    }
+
+    #[test]
+    fn parse_color_ansi_valid() {
+        let inputs = vec![
+            "7",
+            "32",
+            "0xFF",
+        ];
+
+        for input in inputs {
+            assert!(Color::from_str(input).is_ok());
+        }
+    }
+
+    #[test]
+    fn parse_color_rgb_valid() {
+        let inputs = vec![
+            "0,0,0",
+            "0,128,255",
+            "0x0,0x0,0x0",
+            "0x33,0x66,0xFF",
+        ];
+
+        for input in inputs {
+            assert!(Color::from_str(input).is_ok());
+        }
+    }
+
+    #[test]
+    fn parse_color_invalid() {
+        let inputs = vec![
+            "not_a_color",
+            "256",
+            "0,0",
+            "0,0,256",
+        ];
+
+        for input in inputs {
+            let err = Color::from_str(input).unwrap_err();
+            assert_eq!(input, err.invalid());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/src/lib.rs cargo-0.33.0/vendor/env_logger-0.5.13/src/lib.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1125 @@
+// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! A simple logger configured via environment variables which writes
+//! to stdout or stderr, for use with the logging facade exposed by the
+//! [`log` crate][log-crate-url].
+//!
+//! ## Example
+//!
+//! ```
+//! #[macro_use] extern crate log;
+//! extern crate env_logger;
+//!
+//! use log::Level;
+//!
+//! fn main() {
+//!     env_logger::init();
+//!
+//!     debug!("this is a debug {}", "message");
+//!     error!("this is printed by default");
+//!
+//!     if log_enabled!(Level::Info) {
+//!         let x = 3 * 4; // expensive computation
+//!         info!("the answer was: {}", x);
+//!     }
+//! }
+//! ```
+//!
+//! Assumes the binary is `main`:
+//!
+//! ```{.bash}
+//! $ RUST_LOG=error ./main
+//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
+//! ```
+//!
+//! ```{.bash}
+//! $ RUST_LOG=info ./main
+//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
+//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! ```
+//!
+//! ```{.bash}
+//! $ RUST_LOG=debug ./main
+//! DEBUG: 2017-11-09T02:12:24Z: main: this is a debug message
+//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
+//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! ```
+//!
+//! You can also set the log level on a per module basis:
+//!
+//! ```{.bash}
+//! $ RUST_LOG=main=info ./main
+//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
+//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! ```
+//!
+//! And enable all logging:
+//!
+//! ```{.bash}
+//! $ RUST_LOG=main ./main
+//! DEBUG: 2017-11-09T02:12:24Z: main: this is a debug message
+//! ERROR: 2017-11-09T02:12:24Z: main: this is printed by default
+//! INFO: 2017-11-09T02:12:24Z: main: the answer was: 12
+//! ```
+//!
+//! If the binary name contains hyphens, you will need to replace
+//! them with underscores:
+//!
+//! ```{.bash}
+//! $ RUST_LOG=my_app ./my-app
+//! DEBUG: 2017-11-09T02:12:24Z: my_app: this is a debug message
+//! ERROR: 2017-11-09T02:12:24Z: my_app: this is printed by default
+//! INFO: 2017-11-09T02:12:24Z: my_app: the answer was: 12
+//! ```
+//!
+//! This is because Rust modules and crates cannot contain hyphens
+//! in their name, although `cargo` continues to accept them.
+//!
+//! See the documentation for the [`log` crate][log-crate-url] for more
+//! information about its API.
+//!
+//! ## Enabling logging
+//!
+//! Log levels are controlled on a per-module basis, and by default all logging
+//! is disabled except for `error!`. Logging is controlled via the `RUST_LOG`
+//! environment variable. The value of this environment variable is a
+//! comma-separated list of logging directives. A logging directive is of the
+//! form:
+//!
+//! ```text
+//! path::to::module=level
+//! ```
+//!
+//! The path to the module is rooted in the name of the crate it was compiled
+//! for, so if your program is contained in a file `hello.rs`, for example, to
+//! turn on logging for this file you would use a value of `RUST_LOG=hello`.
+//! Furthermore, this path is a prefix-search, so all modules nested in the
+//! specified module will also have logging enabled.
+//!
+//! The actual `level` is optional to specify. If omitted, all logging will
+//! be enabled. If specified, it must be one of the strings `debug`, `error`,
+//! `info`, `warn`, or `trace`.
+//!
+//! As the log level for a module is optional, the module to enable logging for
+//! is also optional. If only a `level` is provided, then the global log
+//! level for all modules is set to this value.
+//!
+//! Some examples of valid values of `RUST_LOG` are:
+//!
+//! * `hello` turns on all logging for the 'hello' module
+//! * `info` turns on all info logging
+//! * `hello=debug` turns on debug logging for 'hello'
+//! * `hello,std::option` turns on hello, and std's option logging
+//! * `error,hello=warn` turn on global error logging and also warn for hello
+//!
+//! ## Filtering results
+//!
+//! A `RUST_LOG` directive may include a regex filter. The syntax is to append `/`
+//! followed by a regex. Each message is checked against the regex, and is only
+//! logged if it matches. Note that the matching is done after formatting the
+//! log string but before adding any logging meta-data. There is a single filter
+//! for all modules.
+//!
+//! Some examples:
+//!
+//! * `hello/foo` turns on all logging for the 'hello' module where the log
+//!   message includes 'foo'.
+//! * `info/f.o` turns on all info logging where the log message includes 'foo',
+//!   'f1o', 'fao', etc.
+//! * `hello=debug/foo*foo` turns on debug logging for 'hello' where the log
+//!   message includes 'foofoo' or 'fofoo' or 'fooooooofoo', etc.
+//! * `error,hello=warn/[0-9]scopes` turn on global error logging and also
+//!   warn for hello. In both cases the log message must include a single digit
+//!   number followed by 'scopes'.
+//!
+//! ## Disabling colors
+//!
+//! Colors and other styles can be configured with the `RUST_LOG_STYLE`
+//! environment variable. It accepts the following values:
+//!
+//! * `auto` (default) will attempt to print style characters, but don't force the issue.
+//! If the console isn't available on Windows, or if TERM=dumb, for example, then don't print colors.
+//! * `always` will always print style characters even if they aren't supported by the terminal.
+//! This includes emitting ANSI colors on Windows if the console API is unavailable.
+//! * `never` will never print style characters.
+//! 
+//! ## Tweaking the default format
+//! 
+//! Parts of the default format can be excluded from the log output using the [`Builder`].
+//! The following example excludes the timestamp from the log output:
+//! 
+//! ```
+//! #[macro_use] extern crate log;
+//! extern crate env_logger;
+//!
+//! use log::Level;
+//!
+//! fn main() {
+//!     env_logger::Builder::from_default_env()
+//!         .default_format_timestamp(false)
+//!         .init();
+//!
+//!     debug!("this is a debug {}", "message");
+//!     error!("this is printed by default");
+//!
+//!     if log_enabled!(Level::Info) {
+//!         let x = 3 * 4; // expensive computation
+//!         info!("the answer was: {}", x);
+//!     }
+//! }
+//! ```
+//! 
+//! ## Specifying defaults for environment variables
+//! 
+//! `env_logger` can read configuration from environment variables.
+//! If these variables aren't present, the default value to use can be tweaked with the [`Env`] type.
+//! The following example defaults to log `warn` and above if the `RUST_LOG` environment variable
+//! isn't set:
+//! 
+//! ```
+//! #[macro_use] extern crate log;
+//! extern crate env_logger;
+//!
+//! use log::Level;
+//!
+//! fn main() {
+//!     let env = env_logger::Env::default()
+//!         .filter_or(env_logger::DEFAULT_FILTER_ENV, "warn");
+//! 
+//!     env_logger::Builder::from_env(env).init();
+//! }
+//! ```
+//! 
+//! [log-crate-url]: https://docs.rs/log/
+//! [`Builder`]: struct.Builder.html
+//! [`Env`]: struct.Env.html
+
+#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
+       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
+       html_root_url = "https://docs.rs/env_logger/0.5.13")]
+#![cfg_attr(test, deny(warnings))]
+
+// When compiled for the rustc compiler itself we want to make sure that this is
+// an unstable crate
+#![cfg_attr(rustbuild, feature(staged_api, rustc_private))]
+#![cfg_attr(rustbuild, unstable(feature = "rustc_private", issue = "27812"))]
+
+#![deny(missing_debug_implementations, missing_docs, warnings)]
+
+extern crate log;
+extern crate termcolor;
+extern crate humantime;
+extern crate atty;
+
+use std::env;
+use std::borrow::Cow;
+use std::io::prelude::*;
+use std::io;
+use std::mem;
+use std::cell::RefCell;
+
+use log::{Log, LevelFilter, Record, SetLoggerError, Metadata};
+
+pub mod filter;
+pub mod fmt;
+
+pub use self::fmt::{Target, WriteStyle, Color, Formatter};
+
+/// The default name for the environment variable to read filters from.
+pub const DEFAULT_FILTER_ENV: &'static str = "RUST_LOG";
+
+/// The default name for the environment variable to read style preferences from.
+pub const DEFAULT_WRITE_STYLE_ENV: &'static str = "RUST_LOG_STYLE";
+
+/// Set of environment variables to configure from.
+///
+/// # Default environment variables
+///
+/// By default, the `Env` will read the following environment variables:
+///
+/// - `RUST_LOG`: the level filter
+/// - `RUST_LOG_STYLE`: whether or not to print styles with records.
+///
+/// These sources can be configured using the builder methods on `Env`.
+#[derive(Debug)]
+pub struct Env<'a> {
+    filter: Var<'a>,
+    write_style: Var<'a>,
+}
+
+#[derive(Debug)]
+struct Var<'a> {
+    name: Cow<'a, str>,
+    default: Option<Cow<'a, str>>,
+}
+
+/// The env logger.
+///
+/// This struct implements the `Log` trait from the [`log` crate][log-crate-url],
+/// which allows it to act as a logger.
+///
+/// The [`init()`], [`try_init()`], [`Builder::init()`] and [`Builder::try_init()`]
+/// methods will each construct a `Logger` and immediately initialize it as the
+/// default global logger.
+///
+/// If you'd instead need access to the constructed `Logger`, you can use
+/// the associated [`Builder`] and install it with the
+/// [`log` crate][log-crate-url] directly.
+///
+/// [log-crate-url]: https://docs.rs/log/
+/// [`init()`]: fn.init.html
+/// [`try_init()`]: fn.try_init.html
+/// [`Builder::init()`]: struct.Builder.html#method.init
+/// [`Builder::try_init()`]: struct.Builder.html#method.try_init
+/// [`Builder`]: struct.Builder.html
+pub struct Logger {
+    writer: fmt::Writer,
+    filter: filter::Filter,
+    format: Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>,
+}
+
+struct Format {
+    default_format_timestamp: bool,
+    default_format_module_path: bool,
+    default_format_level: bool,
+    default_format_timestamp_nanos: bool,
+    custom_format: Option<Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>>,
+}
+
+impl Default for Format {
+    fn default() -> Self {
+        Format {
+            default_format_timestamp: true,
+            default_format_module_path: true,
+            default_format_level: true,
+            default_format_timestamp_nanos: false,
+            custom_format: None,
+        }
+    }
+}
+
+impl Format {
+    /// Convert the format into a callable function.
+    /// 
+    /// If the `custom_format` is `Some`, then any `default_format` switches are ignored.
+    /// If the `custom_format` is `None`, then a default format is returned.
+    /// Any `default_format` switches set to `false` won't be written by the format.
+    fn into_boxed_fn(self) -> Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send> {
+        if let Some(fmt) = self.custom_format {
+            fmt
+        }
+        else {
+            Box::new(move |buf, record| {
+                let write_level = if self.default_format_level {
+                    let level = record.level();
+                    let level_style = buf.default_level_style(level);
+                    write!(buf, "{:>5} ", level_style.value(level))
+                } else {
+                    Ok(())
+                };
+
+                let write_ts = if self.default_format_timestamp {
+                    if self.default_format_timestamp_nanos {
+                      let ts_nanos = buf.precise_timestamp();
+                      write!(buf, "{}: ", ts_nanos) 
+                    } else {
+                      let ts = buf.timestamp();
+                      write!(buf, "{}: ", ts)      
+                    }
+                } else {
+                    Ok(())
+                };
+
+                let default_format_module_path = (self.default_format_module_path, record.module_path());
+                let write_module_path = if let (true, Some(module_path)) = default_format_module_path {
+                    write!(buf, "{}: ", module_path)
+                } else {
+                    Ok(())
+                };
+
+                let write_args = writeln!(buf, "{}", record.args());
+
+                write_level.and(write_ts).and(write_module_path).and(write_args)
+            })
+        }
+    }
+}
+
+/// `Builder` acts as builder for initializing a `Logger`.
+///
+/// It can be used to customize the log format, change the environment variable used
+/// to provide the logging directives and also set the default log level filter.
+///
+/// # Examples
+///
+/// ```
+/// #[macro_use]
+/// extern crate log;
+/// extern crate env_logger;
+///
+/// use std::env;
+/// use std::io::Write;
+/// use log::LevelFilter;
+/// use env_logger::Builder;
+///
+/// fn main() {
+///     let mut builder = Builder::from_default_env();
+///
+///     builder.format(|buf, record| writeln!(buf, "{} - {}", record.level(), record.args()))
+///            .filter(None, LevelFilter::Info)
+///            .init();
+///
+///     error!("error message");
+///     info!("info message");
+/// }
+/// ```
+#[derive(Default)]
+pub struct Builder {
+    filter: filter::Builder,
+    writer: fmt::Builder,
+    format: Format,
+}
+
+impl Builder {
+    /// Initializes the log builder with defaults.
+    /// 
+    /// **NOTE:** This method won't read from any environment variables.
+    /// Use the [`filter`] and [`write_style`] methods to configure the builder
+    /// or use [`from_env`] or [`from_default_env`] instead.
+    /// 
+    /// # Examples
+    /// 
+    /// Create a new builder and configure filters and style:
+    /// 
+    /// ```
+    /// # extern crate log;
+    /// # extern crate env_logger;
+    /// # fn main() {
+    /// use log::LevelFilter;
+    /// use env_logger::{Builder, WriteStyle};
+    /// 
+    /// let mut builder = Builder::new();
+    /// 
+    /// builder.filter(None, LevelFilter::Info)
+    ///        .write_style(WriteStyle::Always)
+    ///        .init();
+    /// # }
+    /// ```
+    /// 
+    /// [`filter`]: #method.filter
+    /// [`write_style`]: #method.write_style
+    /// [`from_env`]: #method.from_env
+    /// [`from_default_env`]: #method.from_default_env
+    pub fn new() -> Builder {
+        Default::default()
+    }
+
+    /// Initializes the log builder from the environment.
+    ///
+    /// The variables used to read configuration from can be tweaked before
+    /// passing in.
+    ///
+    /// # Examples
+    /// 
+    /// Initialise a logger reading the log filter from an environment variable
+    /// called `MY_LOG`:
+    /// 
+    /// ```
+    /// use env_logger::Builder;
+    /// 
+    /// let mut builder = Builder::from_env("MY_LOG");
+    /// builder.init();
+    /// ```
+    ///
+    /// Initialise a logger using the `MY_LOG` variable for filtering and
+    /// `MY_LOG_STYLE` for whether or not to write styles:
+    ///
+    /// ```
+    /// use env_logger::{Builder, Env};
+    ///
+    /// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
+    ///
+    /// let mut builder = Builder::from_env(env);
+    /// builder.init();
+    /// ```
+    pub fn from_env<'a, E>(env: E) -> Self
+    where
+        E: Into<Env<'a>>
+    {
+        let mut builder = Builder::new();
+        let env = env.into();
+
+        if let Some(s) = env.get_filter() {
+            builder.parse(&s);
+        }
+
+        if let Some(s) = env.get_write_style() {
+            builder.parse_write_style(&s);
+        }
+
+        builder
+    }
+
+    /// Initializes the log builder from the environment using default variable names.
+    /// 
+    /// This method is a convenient way to call `from_env(Env::default())` without
+    /// having to use the `Env` type explicitly. The builder will use the
+    /// [default environment variables].
+    /// 
+    /// # Examples
+    /// 
+    /// Initialise a logger using the default environment variables:
+    /// 
+    /// ```
+    /// use env_logger::Builder;
+    /// 
+    /// let mut builder = Builder::from_default_env();
+    /// builder.init();
+    /// ```
+    ///
+    /// [default environment variables]: struct.Env.html#default-environment-variables
+    pub fn from_default_env() -> Self {
+        Self::from_env(Env::default())
+    }
+
+    /// Sets the format function for formatting the log output.
+    ///
+    /// This function is called on each record logged and should format the
+    /// log record and output it to the given [`Formatter`].
+    ///
+    /// The format function is expected to output the string directly to the
+    /// `Formatter` so that implementations can use the [`std::fmt`] macros
+    /// to format and output without intermediate heap allocations. The default
+    /// `env_logger` formatter takes advantage of this.
+    /// 
+    /// # Examples
+    /// 
+    /// Use a custom format to write only the log message:
+    /// 
+    /// ```
+    /// use std::io::Write;
+    /// use env_logger::Builder;
+    /// 
+    /// let mut builder = Builder::new();
+    /// 
+    /// builder.format(|buf, record| write!(buf, "{}", record.args()));
+    /// ```
+    ///
+    /// [`Formatter`]: fmt/struct.Formatter.html
+    /// [`String`]: https://doc.rust-lang.org/stable/std/string/struct.String.html
+    /// [`std::fmt`]: https://doc.rust-lang.org/std/fmt/index.html
+    pub fn format<F: 'static>(&mut self, format: F) -> &mut Self
+        where F: Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send
+    {
+        self.format.custom_format = Some(Box::new(format));
+        self
+    }
+
+    /// Use the default format.
+    /// 
+    /// This method will clear any custom format set on the builder.
+    pub fn default_format(&mut self) -> &mut Self {
+        self.format.custom_format = None;
+        self
+    }
+
+    /// Whether or not to write the level in the default format.
+    pub fn default_format_level(&mut self, write: bool) -> &mut Self {
+        self.format.default_format_level = write;
+        self
+    }
+
+    /// Whether or not to write the module path in the default format.
+    pub fn default_format_module_path(&mut self, write: bool) -> &mut Self {
+        self.format.default_format_module_path = write;
+        self
+    }
+
+    /// Whether or not to write the timestamp in the default format.
+    pub fn default_format_timestamp(&mut self, write: bool) -> &mut Self {
+        self.format.default_format_timestamp = write;
+        self
+    }
+
+    /// Whether or not to write the timestamp with nanos.
+    pub fn default_format_timestamp_nanos(&mut self, write: bool) -> &mut Self {
+        self.format.default_format_timestamp_nanos = write;
+        self
+    }
+
+    /// Adds a directive to the filter for a specific module.
+    ///
+    /// # Examples
+    ///
+    /// Only include messages for warning and above for logs in `path::to::module`:
+    ///
+    /// ```
+    /// # extern crate log;
+    /// # extern crate env_logger;
+    /// # fn main() {
+    /// use log::LevelFilter;
+    /// use env_logger::Builder;
+    ///
+    /// let mut builder = Builder::new();
+    ///
+    /// builder.filter_module("path::to::module", LevelFilter::Info);
+    /// # }
+    /// ```
+    pub fn filter_module(&mut self, module: &str, level: LevelFilter) -> &mut Self {
+        self.filter.filter_module(module, level);
+        self
+    }
+
+    /// Adds a directive to the filter for all modules.
+    ///
+    /// # Examples
+    ///
+    /// Only include messages for warning and above for logs in `path::to::module`:
+    ///
+    /// ```
+    /// # extern crate log;
+    /// # extern crate env_logger;
+    /// # fn main() {
+    /// use log::LevelFilter;
+    /// use env_logger::Builder;
+    ///
+    /// let mut builder = Builder::new();
+    ///
+    /// builder.filter_level(LevelFilter::Info);
+    /// # }
+    /// ```
+    pub fn filter_level(&mut self, level: LevelFilter) -> &mut Self {
+        self.filter.filter_level(level);
+        self
+    }
+
+    /// Adds filters to the logger.
+    ///
+    /// The given module (if any) will log at most the specified level provided.
+    /// If no module is provided then the filter will apply to all log messages.
+    /// 
+    /// # Examples
+    /// 
+    /// Only include messages for warning and above for logs in `path::to::module`:
+    /// 
+    /// ```
+    /// # extern crate log;
+    /// # extern crate env_logger;
+    /// # fn main() {
+    /// use log::LevelFilter;
+    /// use env_logger::Builder;
+    /// 
+    /// let mut builder = Builder::new();
+    /// 
+    /// builder.filter(Some("path::to::module"), LevelFilter::Info);
+    /// # }
+    /// ```
+    pub fn filter(&mut self,
+                  module: Option<&str>,
+                  level: LevelFilter) -> &mut Self {
+        self.filter.filter(module, level);
+        self
+    }
+
+    /// Parses the directives string in the same form as the `RUST_LOG`
+    /// environment variable.
+    ///
+    /// See the module documentation for more details.
+    pub fn parse(&mut self, filters: &str) -> &mut Self {
+        self.filter.parse(filters);
+        self
+    }
+
+    /// Sets the target for the log output.
+    ///
+    /// Env logger can log to either stdout or stderr. The default is stderr.
+    /// 
+    /// # Examples
+    /// 
+    /// Write log message to `stdout`:
+    /// 
+    /// ```
+    /// use env_logger::{Builder, Target};
+    /// 
+    /// let mut builder = Builder::new();
+    /// 
+    /// builder.target(Target::Stdout);
+    /// ```
+    pub fn target(&mut self, target: fmt::Target) -> &mut Self {
+        self.writer.target(target);
+        self
+    }
+
+    /// Sets whether or not styles will be written.
+    ///
+    /// This can be useful in environments that don't support control characters
+    /// for setting colors.
+    /// 
+    /// # Examples
+    /// 
+    /// Never attempt to write styles:
+    /// 
+    /// ```
+    /// use env_logger::{Builder, WriteStyle};
+    /// 
+    /// let mut builder = Builder::new();
+    /// 
+    /// builder.write_style(WriteStyle::Never);
+    /// ```
+    pub fn write_style(&mut self, write_style: fmt::WriteStyle) -> &mut Self {
+        self.writer.write_style(write_style);
+        self
+    }
+
+    /// Parses whether or not to write styles in the same form as the `RUST_LOG_STYLE`
+    /// environment variable.
+    ///
+    /// See the module documentation for more details.
+    pub fn parse_write_style(&mut self, write_style: &str) -> &mut Self {
+        self.writer.parse(write_style);
+        self
+    }
+
+    /// Initializes the global logger with the built env logger.
+    ///
+    /// This should be called early in the execution of a Rust program. Any log
+    /// events that occur before initialization will be ignored.
+    ///
+    /// # Errors
+    ///
+    /// This function will fail if it is called more than once, or if another
+    /// library has already initialized a global logger.
+    pub fn try_init(&mut self) -> Result<(), SetLoggerError> {
+        let logger = self.build();
+
+        log::set_max_level(logger.filter());
+        log::set_boxed_logger(Box::new(logger))
+    }
+
+    /// Initializes the global logger with the built env logger.
+    ///
+    /// This should be called early in the execution of a Rust program. Any log
+    /// events that occur before initialization will be ignored.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if it is called more than once, or if another
+    /// library has already initialized a global logger.
+    pub fn init(&mut self) {
+        self.try_init().expect("Builder::init should not be called after logger initialized");
+    }
+
+    /// Build an env logger.
+    ///
+    /// The returned logger implements the `Log` trait and can be installed manually
+    /// or nested within another logger.
+    pub fn build(&mut self) -> Logger {
+        Logger {
+            writer: self.writer.build(),
+            filter: self.filter.build(),
+            format: mem::replace(&mut self.format, Default::default()).into_boxed_fn(),
+        }
+    }
+}
+
+impl Logger {
+    /// Creates the logger from the environment.
+    ///
+    /// The variables used to read configuration from can be tweaked before
+    /// passing in.
+    ///
+    /// # Examples
+    ///
+    /// Create a logger reading the log filter from an environment variable
+    /// called `MY_LOG`:
+    ///
+    /// ```
+    /// use env_logger::Logger;
+    ///
+    /// let logger = Logger::from_env("MY_LOG");
+    /// ```
+    ///
+    /// Create a logger using the `MY_LOG` variable for filtering and
+    /// `MY_LOG_STYLE` for whether or not to write styles:
+    ///
+    /// ```
+    /// use env_logger::{Logger, Env};
+    ///
+    /// let env = Env::new().filter_or("MY_LOG", "info").write_style_or("MY_LOG_STYLE", "always");
+    ///
+    /// let logger = Logger::from_env(env);
+    /// ```
+    pub fn from_env<'a, E>(env: E) -> Self
+        where
+            E: Into<Env<'a>>
+    {
+        Builder::from_env(env).build()
+    }
+
+    /// Creates the logger from the environment using default variable names.
+    ///
+    /// This method is a convenient way to call `from_env(Env::default())` without
+    /// having to use the `Env` type explicitly. The logger will use the
+    /// [default environment variables].
+    ///
+    /// # Examples
+    ///
+    /// Creates a logger using the default environment variables:
+    ///
+    /// ```
+    /// use env_logger::Logger;
+    ///
+    /// let logger = Logger::from_default_env();
+    /// ```
+    ///
+    /// [default environment variables]: struct.Env.html#default-environment-variables
+    pub fn from_default_env() -> Self {
+        Builder::from_default_env().build()
+    }
+
+    /// Returns the maximum `LevelFilter` that this env logger instance is
+    /// configured to output.
+    pub fn filter(&self) -> LevelFilter {
+        self.filter.filter()
+    }
+
+    /// Checks if this record matches the configured filter.
+    pub fn matches(&self, record: &Record) -> bool {
+        self.filter.matches(record)
+    }
+}
+
+impl Log for Logger {
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        self.filter.enabled(metadata)
+    }
+
+    fn log(&self, record: &Record) {
+        if self.matches(record) {
+            // Log records are written to a thread-local buffer before being printed
+            // to the terminal. We clear these buffers afterwards, but they aren't shrinked
+            // so will always at least have capacity for the largest log record formatted
+            // on that thread.
+            //
+            // If multiple `Logger`s are used by the same threads then the thread-local
+            // formatter might have different color support. If this is the case the
+            // formatter and its buffer are discarded and recreated.
+
+            thread_local! {
+                static FORMATTER: RefCell<Option<Formatter>> = RefCell::new(None);
+            }
+
+            FORMATTER.with(|tl_buf| {
+                // It's possible for implementations to sometimes
+                // log-while-logging (e.g. a `std::fmt` implementation logs
+                // internally) but it's super rare. If this happens make sure we
+                // at least don't panic and ship some output to the screen.
+                let mut a;
+                let mut b = None;
+                let tl_buf = match tl_buf.try_borrow_mut() {
+                    Ok(f) => {
+                        a = f;
+                        &mut *a
+                    }
+                    Err(_) => &mut b,
+                };
+
+                // Check the buffer style. If it's different from the logger's
+                // style then drop the buffer and recreate it.
+                match *tl_buf {
+                    Some(ref mut formatter) => {
+                        if formatter.write_style() != self.writer.write_style() {
+                            *formatter = Formatter::new(&self.writer)
+                        }
+                    },
+                    ref mut tl_buf => *tl_buf = Some(Formatter::new(&self.writer))
+                }
+
+                // The format is guaranteed to be `Some` by this point
+                let mut formatter = tl_buf.as_mut().unwrap();
+
+                let _ = (self.format)(&mut formatter, record).and_then(|_| formatter.print(&self.writer));
+
+                // Always clear the buffer afterwards
+                formatter.clear();
+            });
+        }
+    }
+
+    fn flush(&self) {}
+}
+
+impl<'a> Env<'a> {
+    /// Get a default set of environment variables.
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Specify an environment variable to read the filter from.
+    pub fn filter<E>(mut self, filter_env: E) -> Self
+    where
+        E: Into<Cow<'a, str>>
+    {
+        self.filter = Var::new(filter_env);
+
+        self
+    }
+
+    /// Specify an environment variable to read the filter from.
+    ///
+    /// If the variable is not set, the default value will be used.
+    pub fn filter_or<E, V>(mut self, filter_env: E, default: V) -> Self
+    where
+        E: Into<Cow<'a, str>>,
+        V: Into<Cow<'a, str>>,
+    {
+        self.filter = Var::new_with_default(filter_env, default);
+
+        self
+    }
+
+    fn get_filter(&self) -> Option<String> {
+        self.filter.get()
+    }
+
+    /// Specify an environment variable to read the style from.
+    pub fn write_style<E>(mut self, write_style_env: E) -> Self
+    where
+        E: Into<Cow<'a, str>>
+    {
+        self.write_style = Var::new(write_style_env);
+
+        self
+    }
+
+    /// Specify an environment variable to read the style from.
+    ///
+    /// If the variable is not set, the default value will be used.
+    pub fn write_style_or<E, V>(mut self, write_style_env: E, default: V) -> Self
+        where
+            E: Into<Cow<'a, str>>,
+            V: Into<Cow<'a, str>>,
+    {
+        self.write_style = Var::new_with_default(write_style_env, default);
+
+        self
+    }
+
+    fn get_write_style(&self) -> Option<String> {
+        self.write_style.get()
+    }
+}
+
+impl<'a> Var<'a> {
+    fn new<E>(name: E) -> Self
+        where
+            E: Into<Cow<'a, str>>,
+    {
+        Var {
+            name: name.into(),
+            default: None,
+        }
+    }
+
+    fn new_with_default<E, V>(name: E, default: V) -> Self
+    where
+        E: Into<Cow<'a, str>>,
+        V: Into<Cow<'a, str>>,
+    {
+        Var {
+            name: name.into(),
+            default: Some(default.into()),
+        }
+    }
+
+    fn get(&self) -> Option<String> {
+        env::var(&*self.name)
+            .ok()
+            .or_else(|| self.default
+                .to_owned()
+                .map(|v| v.into_owned()))
+    }
+}
+
+impl<'a, T> From<T> for Env<'a>
+where
+    T: Into<Cow<'a, str>>
+{
+    fn from(filter_env: T) -> Self {
+        Env::default().filter(filter_env.into())
+    }
+}
+
+impl<'a> Default for Env<'a> {
+    fn default() -> Self {
+        Env {
+            filter: Var::new(DEFAULT_FILTER_ENV),
+            write_style: Var::new(DEFAULT_WRITE_STYLE_ENV),
+        }
+    }
+}
+
+mod std_fmt_impls {
+    use std::fmt;
+    use super::*;
+
+    impl fmt::Debug for Logger{
+        fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+            f.debug_struct("Logger")
+                .field("filter", &self.filter)
+                .finish()
+        }
+    }
+
+    impl fmt::Debug for Builder{
+        fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
+            f.debug_struct("Logger")
+            .field("filter", &self.filter)
+            .field("writer", &self.writer)
+            .finish()
+        }
+    }
+}
+
+/// Attempts to initialize the global logger with an env logger.
+///
+/// This should be called early in the execution of a Rust program. Any log
+/// events that occur before initialization will be ignored.
+///
+/// # Errors
+///
+/// This function will fail if it is called more than once, or if another
+/// library has already initialized a global logger.
+pub fn try_init() -> Result<(), SetLoggerError> {
+    try_init_from_env(Env::default())
+}
+
+/// Initializes the global logger with an env logger.
+///
+/// This should be called early in the execution of a Rust program. Any log
+/// events that occur before initialization will be ignored.
+///
+/// # Panics
+///
+/// This function will panic if it is called more than once, or if another
+/// library has already initialized a global logger.
+pub fn init() {
+    try_init().expect("env_logger::init should not be called after logger initialized");
+}
+
+/// Attempts to initialize the global logger with an env logger from the given
+/// environment variables.
+///
+/// This should be called early in the execution of a Rust program. Any log
+/// events that occur before initialization will be ignored.
+///
+/// # Examples
+///
+/// Initialise a logger using the `MY_LOG` environment variable for filters
+/// and `MY_LOG_STYLE` for writing colors:
+///
+/// ```
+/// # extern crate env_logger;
+/// use env_logger::{Builder, Env};
+///
+/// # fn run() -> Result<(), Box<::std::error::Error>> {
+/// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
+///
+/// env_logger::try_init_from_env(env)?;
+///
+/// Ok(())
+/// # }
+/// # fn main() { run().unwrap(); }
+/// ```
+///
+/// # Errors
+///
+/// This function will fail if it is called more than once, or if another
+/// library has already initialized a global logger.
+pub fn try_init_from_env<'a, E>(env: E) -> Result<(), SetLoggerError>
+where
+    E: Into<Env<'a>>
+{
+    let mut builder = Builder::from_env(env);
+
+    builder.try_init()
+}
+
+/// Initializes the global logger with an env logger from the given environment
+/// variables.
+///
+/// This should be called early in the execution of a Rust program. Any log
+/// events that occur before initialization will be ignored.
+///
+/// # Examples
+///
+/// Initialise a logger using the `MY_LOG` environment variable for filters
+/// and `MY_LOG_STYLE` for writing colors:
+///
+/// ```
+/// use env_logger::{Builder, Env};
+///
+/// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
+///
+/// env_logger::init_from_env(env);
+/// ```
+///
+/// # Panics
+///
+/// This function will panic if it is called more than once, or if another
+/// library has already initialized a global logger.
+pub fn init_from_env<'a, E>(env: E)
+where
+    E: Into<Env<'a>>
+{
+    try_init_from_env(env).expect("env_logger::init_from_env should not be called after logger initialized");
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn env_get_filter_reads_from_var_if_set() {
+        env::set_var("env_get_filter_reads_from_var_if_set", "from var");
+
+        let env = Env::new().filter_or("env_get_filter_reads_from_var_if_set", "from default");
+
+        assert_eq!(Some("from var".to_owned()), env.get_filter());
+    }
+
+    #[test]
+    fn env_get_filter_reads_from_default_if_var_not_set() {
+        env::remove_var("env_get_filter_reads_from_default_if_var_not_set");
+
+        let env = Env::new().filter_or("env_get_filter_reads_from_default_if_var_not_set", "from default");
+
+        assert_eq!(Some("from default".to_owned()), env.get_filter());
+    }
+
+    #[test]
+    fn env_get_write_style_reads_from_var_if_set() {
+        env::set_var("env_get_write_style_reads_from_var_if_set", "from var");
+
+        let env = Env::new().write_style_or("env_get_write_style_reads_from_var_if_set", "from default");
+
+        assert_eq!(Some("from var".to_owned()), env.get_write_style());
+    }
+
+    #[test]
+    fn env_get_write_style_reads_from_default_if_var_not_set() {
+        env::remove_var("env_get_write_style_reads_from_default_if_var_not_set");
+
+        let env = Env::new().write_style_or("env_get_write_style_reads_from_default_if_var_not_set", "from default");
+
+        assert_eq!(Some("from default".to_owned()), env.get_write_style());
+    }
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/tests/log-in-log.rs cargo-0.33.0/vendor/env_logger-0.5.13/tests/log-in-log.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/tests/log-in-log.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/tests/log-in-log.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,38 @@
+#[macro_use] extern crate log;
+extern crate env_logger;
+
+use std::process;
+use std::fmt;
+use std::env;
+use std::str;
+
+struct Foo;
+
+impl fmt::Display for Foo {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        info!("test");
+        f.write_str("bar")
+    }
+}
+
+fn main() {
+    env_logger::init();
+    if env::var("YOU_ARE_TESTING_NOW").is_ok() {
+        return info!("{}", Foo);
+    }
+
+    let exe = env::current_exe().unwrap();
+    let out = process::Command::new(exe)
+        .env("YOU_ARE_TESTING_NOW", "1")
+        .env("RUST_LOG", "debug")
+        .output()
+        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
+    if out.status.success() {
+        return
+    }
+
+    println!("test failed: {}", out.status);
+    println!("--- stdout\n{}", str::from_utf8(&out.stdout).unwrap());
+    println!("--- stderr\n{}", str::from_utf8(&out.stderr).unwrap());
+    process::exit(1);
+}
diff -Nru cargo-0.32.0/vendor/env_logger-0.5.13/tests/regexp_filter.rs cargo-0.33.0/vendor/env_logger-0.5.13/tests/regexp_filter.rs
--- cargo-0.32.0/vendor/env_logger-0.5.13/tests/regexp_filter.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/env_logger-0.5.13/tests/regexp_filter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,51 @@
+#[macro_use] extern crate log;
+extern crate env_logger;
+
+use std::process;
+use std::env;
+use std::str;
+
+fn main() {
+    if env::var("LOG_REGEXP_TEST").ok() == Some(String::from("1")) {
+        child_main();
+    } else {
+        parent_main()
+    }
+}
+
+fn child_main() {
+    env_logger::init();
+    info!("XYZ Message");
+}
+
+fn run_child(rust_log: String) -> bool {
+    let exe = env::current_exe().unwrap();
+    let out = process::Command::new(exe)
+        .env("LOG_REGEXP_TEST", "1")
+        .env("RUST_LOG", rust_log)
+        .output()
+        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
+    str::from_utf8(out.stderr.as_ref()).unwrap().contains("XYZ Message")
+}
+
+fn assert_message_printed(rust_log: &str) {
+    if !run_child(rust_log.to_string()) {
+        panic!("RUST_LOG={} should allow the test log message", rust_log)
+    }
+}
+
+fn assert_message_not_printed(rust_log: &str) {
+    if run_child(rust_log.to_string()) {
+        panic!("RUST_LOG={} should not allow the test log message", rust_log)
+    }
+}
+
+fn parent_main() {
+    // test normal log severity levels
+    assert_message_printed("info");
+    assert_message_not_printed("warn");
+
+    // test of regular expression filters
+    assert_message_printed("info/XYZ");
+    assert_message_not_printed("info/XXX");
+}
diff -Nru cargo-0.32.0/vendor/failure/book/src/error-errorkind.md cargo-0.33.0/vendor/failure/book/src/error-errorkind.md
--- cargo-0.32.0/vendor/failure/book/src/error-errorkind.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/book/src/error-errorkind.md	2019-02-06 04:11:58.000000000 +0000
@@ -39,6 +39,10 @@
 
 ```rust
 impl Fail for MyError {
+    fn name(&self) -> Option<&str> {
+        self.inner.name()
+    }
+
     fn cause(&self) -> Option<&Fail> {
         self.inner.cause()
     }
@@ -140,4 +144,4 @@
 
 [use-error]: ./use-error.html
 [custom-fail]: ./custom-fail.html
-[context-api]: https://boats.gitlab.io/failure/doc/failure/struct.Context.html
+[context-api]: https://docs.rs/failure/latest/failure/struct.Context.html
diff -Nru cargo-0.32.0/vendor/failure/book/src/error-msg.md cargo-0.33.0/vendor/failure/book/src/error-msg.md
--- cargo-0.32.0/vendor/failure/book/src/error-msg.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/book/src/error-msg.md	2019-02-06 04:11:58.000000000 +0000
@@ -55,5 +55,5 @@
 
 [custom-fail]: ./custom-fail.html
 [use-error]: ./use-error.html
-[err-msg-api]: https://boats.gitlab.io/failure/doc/failure/fn.err_msg.html
-[format-err-api]: https://boats.gitlab.io/failure/doc/failure/macro.format_err.html
+[err-msg-api]: https://docs.rs/failure/latest/failure/fn.err_msg.html
+[format-err-api]: https://docs.rs/failure/latest/failure/macro.format_err.html
diff -Nru cargo-0.32.0/vendor/failure/book/src/fail.md cargo-0.33.0/vendor/failure/book/src/fail.md
--- cargo-0.32.0/vendor/failure/book/src/fail.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/book/src/fail.md	2019-02-06 04:11:58.000000000 +0000
@@ -147,6 +147,6 @@
 implement `std::error::Error` and also override the backtrace and cause methods
 on `Fail`. We intend to enable this with specialization when it becomes stable.
 
-[derive-docs]: https://boats.gitlab.io/failure/derive-fail.html
+[derive-docs]: ./derive-fail.html
 [stderror]: https://doc.rust-lang.org/std/error/trait.Error.html
 [backtrace-crate]: http://alexcrichton.com/backtrace-rs
diff -Nru cargo-0.32.0/vendor/failure/book/src/intro.md cargo-0.33.0/vendor/failure/book/src/intro.md
--- cargo-0.32.0/vendor/failure/book/src/intro.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/book/src/intro.md	2019-02-06 04:11:58.000000000 +0000
@@ -6,7 +6,7 @@
 * [API documentation][api]
 * [failure source code][repo]
 
-[api]: https://boats.gitlab.io/failure/doc/failure
+[api]: https://docs.rs/failure
 [repo]: https://github.com/rust-lang-nursery/failure
 
 ```rust
diff -Nru cargo-0.32.0/vendor/failure/book/src/string-custom-error.md cargo-0.33.0/vendor/failure/book/src/string-custom-error.md
--- cargo-0.32.0/vendor/failure/book/src/string-custom-error.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/book/src/string-custom-error.md	2019-02-06 04:11:58.000000000 +0000
@@ -20,6 +20,10 @@
 }
 
 impl Fail for MyError {
+    fn name(&self) -> Option<&str> {
+        self.inner.name()
+    }
+
     fn cause(&self) -> Option<&Fail> {
         self.inner.cause()
     }
@@ -105,6 +109,10 @@
 }
 
 impl Fail for MyError {
+    fn name(&self) -> Option<&str> {
+        self.inner.name()
+    }
+
     fn cause(&self) -> Option<&Fail> {
         self.inner.cause()
     }
diff -Nru cargo-0.32.0/vendor/failure/.cargo-checksum.json cargo-0.33.0/vendor/failure/.cargo-checksum.json
--- cargo-0.32.0/vendor/failure/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"}
\ No newline at end of file
+{"files":{},"package":"795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/failure/Cargo.lock.ci cargo-0.33.0/vendor/failure/Cargo.lock.ci
--- cargo-0.32.0/vendor/failure/Cargo.lock.ci	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/failure/Cargo.lock.ci	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,136 @@
+[[package]]
+name = "backtrace"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "failure"
+version = "0.1.4"
+dependencies = [
+ "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.4",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.4"
+dependencies = [
+ "failure 0.1.4",
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "syn"
+version = "0.15.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
+"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
+"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
+"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
+"checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7"
+"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru cargo-0.32.0/vendor/failure/Cargo.toml cargo-0.33.0/vendor/failure/Cargo.toml
--- cargo-0.32.0/vendor/failure/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,10 +12,10 @@
 
 [package]
 name = "failure"
-version = "0.1.3"
+version = "0.1.5"
 authors = ["Without Boats <boats@mozilla.com>"]
 description = "Experimental error handling abstraction."
-homepage = "https://boats.gitlab.io/failure"
+homepage = "https://rust-lang-nursery.github.io/failure/"
 documentation = "https://docs.rs/failure"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang-nursery/failure"
@@ -24,7 +24,7 @@
 optional = true
 
 [dependencies.failure_derive]
-version = "0.1.3"
+version = "0.1.5"
 optional = true
 
 [features]
diff -Nru cargo-0.32.0/vendor/failure/examples/simple.rs cargo-0.33.0/vendor/failure/examples/simple.rs
--- cargo-0.32.0/vendor/failure/examples/simple.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/examples/simple.rs	2019-02-06 04:11:58.000000000 +0000
@@ -16,7 +16,7 @@
 }
 
 fn main() {
-    for cause in Fail::iter_causes(&bad_function().unwrap_err()) {
-        println!("{}", cause);
+    for cause in Fail::iter_chain(&bad_function().unwrap_err()) {
+        println!("{}: {}", cause.name().unwrap_or("Error"), cause);
     }
 }
diff -Nru cargo-0.32.0/vendor/failure/.gitlab-ci.yml cargo-0.33.0/vendor/failure/.gitlab-ci.yml
--- cargo-0.32.0/vendor/failure/.gitlab-ci.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/.gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-image: "rust:latest"
-
-pages:
-  script:
-    - sh ./build-docs.sh
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
diff -Nru cargo-0.32.0/vendor/failure/RELEASES.md cargo-0.33.0/vendor/failure/RELEASES.md
--- cargo-0.32.0/vendor/failure/RELEASES.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/RELEASES.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,16 @@
+# Version 0.1.5
+
+- Resolve a regression with error conversions (#290)
+- Added `name()` to `Fail` and `Error`
+
+# Version 0.1.4
+
+- Improved error reporting of the derive feature
+- Resolved a potential internal ambiguity when using the backtrace feature
+  that prevented backtrace from improving an upstream API.
+- Changed the bounds on std error compat conversions through the From trait
+  to take Sync and Send into account.
+
 # Version 0.1.3
 
 - Added `Context::map`
diff -Nru cargo-0.32.0/vendor/failure/src/backtrace/mod.rs cargo-0.33.0/vendor/failure/src/backtrace/mod.rs
--- cargo-0.32.0/vendor/failure/src/backtrace/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/backtrace/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -129,7 +129,7 @@
     impl Debug for Backtrace {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             if let Some(bt) = self.internal.as_backtrace() {
-                bt.fmt(f)
+                Debug::fmt(bt, f)
             } else { Ok(()) }
         }
     }
@@ -137,7 +137,7 @@
     impl Display for Backtrace {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             if let Some(bt) = self.internal.as_backtrace() {
-                bt.fmt(f)
+                Debug::fmt(bt, f)
             } else { Ok(()) }
         }
     }
diff -Nru cargo-0.32.0/vendor/failure/src/compat.rs cargo-0.33.0/vendor/failure/src/compat.rs
--- cargo-0.32.0/vendor/failure/src/compat.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/compat.rs	2019-02-06 04:11:58.000000000 +0000
@@ -44,4 +44,10 @@
             Box::new(Compat { error })
         }
     }
+
+    impl From<Error> for Box<StdError + Send + Sync> {
+        fn from(error: Error) -> Box<StdError + Send + Sync> {
+            Box::new(Compat { error })
+        }
+    }
 }
diff -Nru cargo-0.32.0/vendor/failure/src/context.rs cargo-0.33.0/vendor/failure/src/context.rs
--- cargo-0.32.0/vendor/failure/src/context.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/context.rs	2019-02-06 04:11:58.000000000 +0000
@@ -108,6 +108,10 @@
     }
 
     impl<D: Display + Send + Sync + 'static> Fail for Context<D> {
+        fn name(&self) -> Option<&str> {
+            self.failure.as_cause().and_then(|x| x.name())
+        }
+
         fn cause(&self) -> Option<&Fail> {
             self.failure.as_cause()
         }
diff -Nru cargo-0.32.0/vendor/failure/src/error/mod.rs cargo-0.33.0/vendor/failure/src/error/mod.rs
--- cargo-0.32.0/vendor/failure/src/error/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/error/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -70,6 +70,11 @@
         self.imp.failure()
     }
 
+    /// Returns the name of the underlying fail.
+    pub fn name(&self) -> Option<&str> {
+        self.as_fail().name()
+    }
+
     /// Returns a reference to the underlying cause of this `Error`. Unlike the
     /// method on `Fail`, this does not return an `Option`. The `Error` type
     /// always has an underlying failure.
diff -Nru cargo-0.32.0/vendor/failure/src/error_message.rs cargo-0.33.0/vendor/failure/src/error_message.rs
--- cargo-0.32.0/vendor/failure/src/error_message.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/error_message.rs	2019-02-06 04:11:58.000000000 +0000
@@ -19,7 +19,11 @@
     msg: D,
 }
 
-impl<D: Display + Debug + Sync + Send + 'static> Fail for ErrorMessage<D> { }
+impl<D: Display + Debug + Sync + Send + 'static> Fail for ErrorMessage<D> {
+    fn name(&self) -> Option<&str> {
+        Some("failure::ErrorMessage")
+    }
+}
 
 impl<D: Display + Debug + Sync + Send + 'static> Display for ErrorMessage<D> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
diff -Nru cargo-0.32.0/vendor/failure/src/lib.rs cargo-0.33.0/vendor/failure/src/lib.rs
--- cargo-0.32.0/vendor/failure/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -23,10 +23,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
 #![deny(warnings)]
-#![cfg_attr(
-    feature = "small-error",
-    feature(extern_types, allocator_api)
-)]
+#![cfg_attr(feature = "small-error", feature(extern_types, allocator_api))]
 
 macro_rules! with_std { ($($i:item)*) => ($(#[cfg(feature = "std")]$i)*) }
 macro_rules! without_std { ($($i:item)*) => ($(#[cfg(not(feature = "std"))]$i)*) }
@@ -109,6 +106,16 @@
 /// `std::error::Error`, and are also `Send`, `Sync`, and `'static`, implement
 /// `Fail` by a blanket impl.
 pub trait Fail: Display + Debug + Send + Sync + 'static {
+    /// Returns the "name" of the error.
+    /// 
+    /// This is typically the type name. Not all errors will implement
+    /// this. This method is expected to be most useful in situations
+    /// where errors need to be reported to external instrumentation systems 
+    /// such as crash reporters.
+    fn name(&self) -> Option<&str> {
+        None
+    }
+
     /// Returns a reference to the underlying cause of this failure, if it
     /// is an error that wraps other errors.
     ///
@@ -166,10 +173,7 @@
     }
 
     #[doc(hidden)]
-    #[deprecated(
-        since = "0.1.2",
-        note = "please use the 'iter_chain()' method instead"
-    )]
+    #[deprecated(since = "0.1.2", note = "please use the 'iter_chain()' method instead")]
     fn causes(&self) -> Causes
     where
         Self: Sized,
@@ -259,10 +263,7 @@
     }
 
     /// Deprecated alias to `iter_chain`.
-    #[deprecated(
-        since = "0.1.2",
-        note = "please use the 'iter_chain()' method instead"
-    )]
+    #[deprecated(since = "0.1.2", note = "please use the 'iter_chain()' method instead")]
     pub fn causes(&self) -> Causes {
         Causes { fail: Some(self) }
     }
diff -Nru cargo-0.32.0/vendor/failure/src/macros.rs cargo-0.33.0/vendor/failure/src/macros.rs
--- cargo-0.32.0/vendor/failure/src/macros.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/src/macros.rs	2019-02-06 04:11:58.000000000 +0000
@@ -11,8 +11,8 @@
     ($e:expr) => {
         return Err($crate::err_msg($e));
     };
-    ($fmt:expr, $($arg:tt)+) => {
-        return Err($crate::err_msg(format!($fmt, $($arg)+)));
+    ($fmt:expr, $($arg:tt)*) => {
+        return Err($crate::err_msg(format!($fmt, $($arg)*)));
     };
 }
 
@@ -28,9 +28,9 @@
             bail!($e);
         }
     };
-    ($cond:expr, $fmt:expr, $($arg:tt)+) => {
+    ($cond:expr, $fmt:expr, $($arg:tt)*) => {
         if !($cond) {
-            bail!($fmt, $($arg)+);
+            bail!($fmt, $($arg)*);
         }
     };
 }
diff -Nru cargo-0.32.0/vendor/failure/tests/basic_fail.rs cargo-0.33.0/vendor/failure/tests/basic_fail.rs
--- cargo-0.32.0/vendor/failure/tests/basic_fail.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/failure/tests/basic_fail.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,21 @@
+#[macro_use]
+extern crate failure;
+
+use failure::Fail;
+
+#[test]
+fn test_name() {
+    #[derive(Fail, Debug)]
+    #[fail(display = "my error")]
+    struct MyError;
+
+    let err = MyError;
+
+    assert_eq!(err.to_string(), "my error");
+    assert_eq!(err.name(), Some("basic_fail::MyError"));
+
+    let ctx = err.context("whatever");
+
+    assert_eq!(ctx.to_string(), "whatever");
+    assert_eq!(ctx.name(), Some("basic_fail::MyError"));
+}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/failure/tests/fail_compat.rs cargo-0.33.0/vendor/failure/tests/fail_compat.rs
--- cargo-0.32.0/vendor/failure/tests/fail_compat.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/failure/tests/fail_compat.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,35 @@
+#[macro_use]
+extern crate failure;
+
+use failure::Fail;
+
+fn return_failure() -> Result<(), failure::Error> {
+    #[derive(Fail, Debug)]
+    #[fail(display = "my error")]
+    struct MyError;
+
+    let err = MyError;
+    Err(err.into())
+}
+
+fn return_error() -> Result<(), Box<std::error::Error>> {
+    return_failure()?;
+    Ok(())
+}
+
+fn return_error_send_sync() -> Result<(), Box<std::error::Error + Send + Sync>> {
+    return_failure()?;
+    Ok(())
+}
+
+#[test]
+fn smoke_default_compat() {
+    let err = return_error();
+    assert!(err.is_err());
+}
+
+#[test]
+fn smoke_compat_send_sync() {
+    let err = return_error_send_sync();
+    assert!(err.is_err());
+}
diff -Nru cargo-0.32.0/vendor/failure/tests/macro_trailing_comma.rs cargo-0.33.0/vendor/failure/tests/macro_trailing_comma.rs
--- cargo-0.32.0/vendor/failure/tests/macro_trailing_comma.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/failure/tests/macro_trailing_comma.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,54 @@
+#[macro_use]
+extern crate failure;
+
+// NOTE:
+//
+// This test is in a separate file due to the fact that ensure! cannot be used
+// from within failure.
+//
+// (you get: 'macro-expanded `macro_export` macros from the current crate cannot
+//           be referred to by absolute paths')
+
+// Encloses an early-returning macro in an IIFE so that we
+// can treat it as a Result-returning function.
+macro_rules! wrap_early_return {
+    ($expr:expr) => {{
+        fn func() -> Result<(), failure::Error> {
+            let _ = $expr;
+
+            #[allow(unreachable_code)]
+            Ok(())
+        }
+        func().map_err(|e| e.to_string())
+    }};
+}
+
+#[test]
+fn bail() {
+    assert_eq!(
+        wrap_early_return!(bail!("test")),
+        wrap_early_return!(bail!("test",)));
+    assert_eq!(
+        wrap_early_return!(bail!("test {}", 4)),
+        wrap_early_return!(bail!("test {}", 4,)));
+}
+
+#[test]
+fn ensure() {
+    assert_eq!(
+        wrap_early_return!(ensure!(false, "test")),
+        wrap_early_return!(ensure!(false, "test",)));
+    assert_eq!(
+        wrap_early_return!(ensure!(false, "test {}", 4)),
+        wrap_early_return!(ensure!(false, "test {}", 4,)));
+}
+
+#[test]
+fn format_err() {
+    assert_eq!(
+        format_err!("test").to_string(),
+        format_err!("test",).to_string());
+    assert_eq!(
+        format_err!("test {}", 4).to_string(),
+        format_err!("test {}", 4,).to_string());
+}
diff -Nru cargo-0.32.0/vendor/failure/.travis.yml cargo-0.33.0/vendor/failure/.travis.yml
--- cargo-0.32.0/vendor/failure/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-language: rust
-rust:
-    - 1.18.0
-    - stable
-    - beta
-    - nightly
-cache: cargo
-script:
-  - cargo test
-  - cargo test --features backtrace
-  - cargo check --no-default-features
diff -Nru cargo-0.32.0/vendor/failure_derive/.cargo-checksum.json cargo-0.33.0/vendor/failure_derive/.cargo-checksum.json
--- cargo-0.32.0/vendor/failure_derive/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure_derive/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"}
\ No newline at end of file
+{"files":{},"package":"ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/failure_derive/Cargo.toml cargo-0.33.0/vendor/failure_derive/Cargo.toml
--- cargo-0.32.0/vendor/failure_derive/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure_derive/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,12 +12,12 @@
 
 [package]
 name = "failure_derive"
-version = "0.1.3"
+version = "0.1.5"
 authors = ["Without Boats <woboats@gmail.com>"]
 build = "build.rs"
 description = "derives for the failure crate"
-homepage = "https://boats.gitlab.io/failure"
-documentation = "https://boats.gitlab.io/failure"
+homepage = "https://rust-lang-nursery.github.io/failure/"
+documentation = "https://docs.rs/failure"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/withoutboats/failure_derive"
 
diff -Nru cargo-0.32.0/vendor/failure_derive/src/lib.rs cargo-0.33.0/vendor/failure_derive/src/lib.rs
--- cargo-0.32.0/vendor/failure_derive/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure_derive/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -6,17 +6,43 @@
 #[macro_use]
 extern crate quote;
 
-use proc_macro2::TokenStream;
+use proc_macro2::{TokenStream, Span};
+use syn::LitStr;
+use syn::spanned::Spanned;
+
+#[derive(Debug)]
+struct Error(TokenStream);
+
+impl Error {
+    fn new(span: Span, message: &str) -> Error {
+        Error(quote_spanned! { span =>
+            compile_error!(#message);
+        })
+    }
+
+    fn into_tokens(self) -> TokenStream {
+        self.0
+    }
+}
 
 decl_derive!([Fail, attributes(fail, cause)] => fail_derive);
 
 fn fail_derive(s: synstructure::Structure) -> TokenStream {
+    match fail_derive_impl(s) {
+        Err(err) => err.into_tokens(),
+        Ok(tokens) => tokens,
+    }
+}
+
+fn fail_derive_impl(s: synstructure::Structure) -> Result<TokenStream, Error> {
     let make_dyn = if cfg!(has_dyn_trait) {
         quote! { &dyn }
     } else {
         quote! { & }
     };
 
+    let ty_name = LitStr::new(&s.ast().ident.to_string(), Span::call_site());
+
     let cause_body = s.each_variant(|v| {
         if let Some(cause) = v.bindings().iter().find(is_cause) {
             quote!(return Some(::failure::AsFail::as_fail(#cause)))
@@ -36,6 +62,10 @@
     let fail = s.unbound_impl(
         quote!(::failure::Fail),
         quote! {
+            fn name(&self) -> Option<&str> {
+                Some(concat!(module_path!(), "::", #ty_name))
+            }
+
             #[allow(unreachable_code)]
             fn cause(&self) -> ::failure::_core::option::Option<#make_dyn(::failure::Fail)> {
                 match *self { #cause_body }
@@ -49,7 +79,7 @@
             }
         },
     );
-    let display = display_body(&s).map(|display_body| {
+    let display = display_body(&s)?.map(|display_body| {
         s.unbound_impl(
             quote!(::failure::_core::fmt::Display),
             quote! {
@@ -62,23 +92,31 @@
         )
     });
 
-    (quote! {
+    Ok(quote! {
         #fail
         #display
-    }).into()
+    })
 }
 
-fn display_body(s: &synstructure::Structure) -> Option<quote::__rt::TokenStream> {
+fn display_body(s: &synstructure::Structure) -> Result<Option<quote::__rt::TokenStream>, Error> {
     let mut msgs = s.variants().iter().map(|v| find_error_msg(&v.ast().attrs));
-    if msgs.all(|msg| msg.is_none()) {
-        return None;
+    if msgs.all(|msg| msg.map(|m| m.is_none()).unwrap_or(true)) {
+        return Ok(None);
     }
 
-    Some(s.each_variant(|v| {
+    let mut tokens = TokenStream::new();
+    for v in s.variants() {
         let msg =
-            find_error_msg(&v.ast().attrs).expect("All variants must have display attribute.");
+            find_error_msg(&v.ast().attrs)?
+              .ok_or_else(|| Error::new(
+                  v.ast().ident.span(),
+                  "All variants must have display attribute."
+              ))?;
         if msg.nested.is_empty() {
-            panic!("Expected at least one argument to fail attribute");
+            return Err(Error::new(
+                msg.span(),
+                "Expected at least one argument to fail attribute"
+            ));
         }
 
         let format_string = match msg.nested[0] {
@@ -86,13 +124,16 @@
                 nv.lit.clone()
             }
             _ => {
-                panic!("Fail attribute must begin `display = \"\"` to control the Display message.")
+                return Err(Error::new(
+                    msg.span(),
+                    "Fail attribute must begin `display = \"\"` to control the Display message."
+                ));
             }
         };
         let args = msg.nested.iter().skip(1).map(|arg| match *arg {
             syn::NestedMeta::Literal(syn::Lit::Int(ref i)) => {
                 let bi = &v.bindings()[i.value() as usize];
-                quote!(#bi)
+                Ok(quote!(#bi))
             }
             syn::NestedMeta::Meta(syn::Meta::Word(ref id)) => {
                 let id_s = id.to_string();
@@ -101,59 +142,77 @@
                         let bi = match v.bindings().get(idx) {
                             Some(bi) => bi,
                             None => {
-                                panic!(
-                                    "display attempted to access field `{}` in `{}::{}` which \
+                                return Err(Error::new(
+                                    arg.span(),
+                                    &format!(
+                                        "display attempted to access field `{}` in `{}::{}` which \
                                      does not exist (there are {} field{})",
-                                    idx,
-                                    s.ast().ident,
-                                    v.ast().ident,
-                                    v.bindings().len(),
-                                    if v.bindings().len() != 1 { "s" } else { "" }
-                                );
+                                        idx,
+                                        s.ast().ident,
+                                        v.ast().ident,
+                                        v.bindings().len(),
+                                        if v.bindings().len() != 1 { "s" } else { "" }
+                                    )
+                                ));
                             }
                         };
-                        return quote!(#bi);
+                        return Ok(quote!(#bi));
                     }
                 }
                 for bi in v.bindings() {
                     if bi.ast().ident.as_ref() == Some(id) {
-                        return quote!(#bi);
+                        return Ok(quote!(#bi));
                     }
                 }
-                panic!(
-                    "Couldn't find field `{}` in `{}::{}`",
-                    id,
-                    s.ast().ident,
-                    v.ast().ident
-                );
-            }
-            _ => panic!("Invalid argument to fail attribute!"),
+                return Err(Error::new(
+                    arg.span(),
+                    &format!(
+                        "Couldn't find field `{}` in `{}::{}`",
+                        id,
+                        s.ast().ident,
+                        v.ast().ident
+                    )
+                ));
+            }
+            ref arg => {
+                return Err(Error::new(
+                    arg.span(),
+                    "Invalid argument to fail attribute!"
+                ));
+            },
         });
+        let args = args.collect::<Result<Vec<_>, _>>()?;
 
-        quote! {
-            return write!(f, #format_string #(, #args)*)
-        }
-    }))
+        let pat = v.pat();
+        tokens.extend(quote!(#pat => { return write!(f, #format_string #(, #args)*) }));
+    }
+    Ok(Some(tokens))
 }
 
-fn find_error_msg(attrs: &[syn::Attribute]) -> Option<syn::MetaList> {
+fn find_error_msg(attrs: &[syn::Attribute]) -> Result<Option<syn::MetaList>, Error> {
     let mut error_msg = None;
     for attr in attrs {
         if let Some(meta) = attr.interpret_meta() {
             if meta.name() == "fail" {
                 if error_msg.is_some() {
-                    panic!("Cannot have two display attributes")
+                    return Err(Error::new(
+                        meta.span(),
+                        "Cannot have two display attributes"
+                    ));
                 } else {
                     if let syn::Meta::List(list) = meta {
                         error_msg = Some(list);
                     } else {
-                        panic!("fail attribute must take a list in parentheses")
+                        return Err(Error::new(
+                            meta.span(),
+                            "fail attribute must take a list in parentheses"
+                        ));
                     }
                 }
             }
         }
     }
-    error_msg
+    Ok(error_msg)
 }
 
 fn is_backtrace(bi: &&synstructure::BindingInfo) -> bool {
diff -Nru cargo-0.32.0/vendor/failure_derive/tests/wraps.rs cargo-0.33.0/vendor/failure_derive/tests/wraps.rs
--- cargo-0.32.0/vendor/failure_derive/tests/wraps.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/failure_derive/tests/wraps.rs	2019-02-06 04:11:58.000000000 +0000
@@ -18,11 +18,10 @@
 fn wrap_error() {
     let inner = io::Error::from_raw_os_error(98);
     let err = WrapError { inner };
-    assert!(
-        err.cause()
-            .and_then(|err| err.downcast_ref::<io::Error>())
-            .is_some()
-    );
+    assert!(err
+        .cause()
+        .and_then(|err| err.downcast_ref::<io::Error>())
+        .is_some());
 }
 
 #[derive(Fail, Debug)]
@@ -33,11 +32,10 @@
 fn wrap_tuple_error() {
     let io_error = io::Error::from_raw_os_error(98);
     let err: WrapTupleError = WrapTupleError(io_error);
-    assert!(
-        err.cause()
-            .and_then(|err| err.downcast_ref::<io::Error>())
-            .is_some()
-    );
+    assert!(err
+        .cause()
+        .and_then(|err| err.downcast_ref::<io::Error>())
+        .is_some());
 }
 
 #[derive(Fail, Debug)]
@@ -55,11 +53,10 @@
         inner,
         backtrace: Backtrace::new(),
     };
-    assert!(
-        err.cause()
-            .and_then(|err| err.downcast_ref::<io::Error>())
-            .is_some()
-    );
+    assert!(err
+        .cause()
+        .and_then(|err| err.downcast_ref::<io::Error>())
+        .is_some());
     assert!(err.backtrace().is_some());
 }
 
@@ -79,21 +76,19 @@
 fn wrap_enum_error() {
     let io_error = io::Error::from_raw_os_error(98);
     let err: WrapEnumError = WrapEnumError::Io(io_error);
-    assert!(
-        err.cause()
-            .and_then(|err| err.downcast_ref::<io::Error>())
-            .is_some()
-    );
+    assert!(err
+        .cause()
+        .and_then(|err| err.downcast_ref::<io::Error>())
+        .is_some());
     assert!(err.backtrace().is_none());
     let fmt_error = fmt::Error::default();
     let err: WrapEnumError = WrapEnumError::Fmt {
         inner: fmt_error,
         backtrace: Backtrace::new(),
     };
-    assert!(
-        err.cause()
-            .and_then(|err| err.downcast_ref::<fmt::Error>())
-            .is_some()
-    );
+    assert!(err
+        .cause()
+        .and_then(|err| err.downcast_ref::<fmt::Error>())
+        .is_some());
     assert!(err.backtrace().is_some());
 }
diff -Nru cargo-0.32.0/vendor/filetime/.cargo_vcs_info.json cargo-0.33.0/vendor/filetime/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/filetime/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/filetime/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "8fb4a319cb494c3702ffaad17036c432406dcf3c"
-  }
-}
diff -Nru cargo-0.32.0/vendor/filetime/.travis.yml cargo-0.33.0/vendor/filetime/.travis.yml
--- cargo-0.32.0/vendor/filetime/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/filetime/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: 1.21.0
-    - rust: stable
-    - os: osx
-    - rust: beta
-    - rust: nightly
-
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo doc --no-deps --all-features
-      after_success:
-        - travis-cargo --only nightly doc-upload
-
-script:
-  - cargo test
-
-env:
-  global:
-    secure: "MIaQyJIgy7VUoYHY7KbYtxpN/t+a2eWk8PihYctz+F+1PANgD6KbgbF9JW4ip5MYaehk7UWs++kPkHiAvJFKWo2BnQswc4digTUa9Vc2n8/C0d0Ec2zn1EUXH4fkeaMvIffn8QQUPwuNdE6khifSfG8Y42siqJF4zkuPKwaLrUo="
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/flate2/.cargo_vcs_info.json cargo-0.33.0/vendor/flate2/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/flate2/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/flate2/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "9d8ccf1b4fe6285115940281184a33460a2229ad"
-  }
-}
diff -Nru cargo-0.32.0/vendor/flate2/.travis.yml cargo-0.33.0/vendor/flate2/.travis.yml
--- cargo-0.32.0/vendor/flate2/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/flate2/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: stable
-    - os: osx
-    - rust: beta
-    - rust: nightly
-
-    - rust: stable
-      script: cargo run --manifest-path systest/Cargo.toml
-      name: "systest"
-
-    - rust: nightly
-      install: rustup target add wasm32-unknown-unknown
-      script: cargo build --target wasm32-unknown-unknown
-      name: "wasm"
-
-    - rust: stable
-      env: RUST_BACKEND=1
-      script:
-        - cargo test --features rust_backend
-        - cargo test --features rust_backend --no-default-features
-
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo doc --no-deps --all-features
-      after_success:
-        - travis-cargo --only nightly doc-upload
-      name: "docs"
-
-  allow_failures:
-    - env: RUST_BACKEND=1
-
-script:
-  - cargo build
-  - rustdoc --test README.md -L target/debug/deps --extern flate2=target/debug/libflate2.rlib
-  - cargo test
-  - cargo test --features zlib
-  - cargo test --features tokio
-  - cargo test --features 'tokio zlib'
-  - cargo test --features zlib --no-default-features
-  - cargo clean && cargo build
-  - cargo doc --no-deps
-  - cargo doc --no-deps --manifest-path=miniz-sys/Cargo.toml
-
-branches:
-  only:
-    - master
-
-env:
-  global:
-    secure: "PHVT7IaeP5nQQVwGHKwqCYBDp0QyetSlER7se2j2Xgfx+lw3Bu6VWH6VF04B636Gb0tHPN/sUCXSgGRcvDuy6XFOev4LfynoYxNKgHJYg2E34EP2QLwsFfnvE4iujaG3GJk3o935Y7OYGv2OP1HeG4Mv6JhQK0GLnNDBZQ65kWI="
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/fnv/.travis.yml cargo-0.33.0/vendor/fnv/.travis.yml
--- cargo-0.32.0/vendor/fnv/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fnv/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-language: rust
-rust:
-  - nightly
-  - beta
-  - stable
-
-notifications:
-  webhooks: http://build.servo.org:54856/travis
diff -Nru cargo-0.32.0/vendor/fs2/.appveyor.yml cargo-0.33.0/vendor/fs2/.appveyor.yml
--- cargo-0.32.0/vendor/fs2/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fs2/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-environment:
-  matrix:
-    - TARGET: x86_64-pc-windows-msvc
-    - TARGET: i686-pc-windows-msvc
-    - TARGET: x86_64-pc-windows-gnu
-    - TARGET: i686-pc-windows-gnu
-
-install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" -FileName "rust-nightly.exe"
-  - ps: .\rust-nightly.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
-  - ps: $env:PATH="$env:PATH;C:\rust\bin"
-
-build_script:
-  - cargo build -v
-
-test_script:
-  - SET RUST_BACKTRACE=1
-  - cargo test -v
diff -Nru cargo-0.32.0/vendor/fs2/.travis.yml cargo-0.33.0/vendor/fs2/.travis.yml
--- cargo-0.32.0/vendor/fs2/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fs2/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-language: rust
-
-rust:
-- 1.8.0
-- stable
-- nightly
-
-os:
-  - linux
-  - osx
-
-env:
-  matrix:
-    - ARCH=x86_64
-    - ARCH=i686
-
-script:
-  - cargo build --verbose
-  - if [[ $TRAVIS_RUST_VERSION = nightly* ]]; then
-      env RUST_BACKTRACE=1 cargo test -v;
-    fi
diff -Nru cargo-0.32.0/vendor/fuchsia-cprng/AUTHORS cargo-0.33.0/vendor/fuchsia-cprng/AUTHORS
--- cargo-0.32.0/vendor/fuchsia-cprng/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-cprng/AUTHORS	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,10 @@
+# This is the list of Fuchsia Authors.
+
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+
+Google Inc.
+The Chromium Authors
+The Go Authors
diff -Nru cargo-0.32.0/vendor/fuchsia-cprng/.cargo-checksum.json cargo-0.33.0/vendor/fuchsia-cprng/.cargo-checksum.json
--- cargo-0.32.0/vendor/fuchsia-cprng/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-cprng/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-cprng/Cargo.toml cargo-0.33.0/vendor/fuchsia-cprng/Cargo.toml
--- cargo-0.32.0/vendor/fuchsia-cprng/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-cprng/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,22 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "fuchsia-cprng"
+version = "0.1.1"
+authors = ["Erick Tryzelaar <etryzelaar@google.com>"]
+include = ["src/*.rs", "Cargo.toml", "AUTHORS", "LICENSE", "PATENTS"]
+description = "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator"
+readme = "README.md"
+license-file = "LICENSE"
+repository = "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng"
diff -Nru cargo-0.32.0/vendor/fuchsia-cprng/LICENSE cargo-0.33.0/vendor/fuchsia-cprng/LICENSE
--- cargo-0.32.0/vendor/fuchsia-cprng/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-cprng/LICENSE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,27 @@
+Copyright 2019 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru cargo-0.32.0/vendor/fuchsia-cprng/PATENTS cargo-0.33.0/vendor/fuchsia-cprng/PATENTS
--- cargo-0.32.0/vendor/fuchsia-cprng/PATENTS	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-cprng/PATENTS	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Fuchsia project.
+
+Google hereby grants to you a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this
+section) patent license to make, have made, use, offer to sell, sell,
+import, transfer, and otherwise run, modify and propagate the contents
+of this implementation of Fuchsia, where such license applies only to
+those patent claims, both currently owned by Google and acquired in
+the future, licensable by Google that are necessarily infringed by
+this implementation. This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation. If you or your agent or exclusive licensee institute
+or order or agree to the institution of patent litigation or any other
+patent enforcement activity against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that this
+implementation of Fuchsia constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of
+Fuchsia shall terminate as of the date such litigation is filed.
diff -Nru cargo-0.32.0/vendor/fuchsia-cprng/src/lib.rs cargo-0.33.0/vendor/fuchsia-cprng/src/lib.rs
--- cargo-0.32.0/vendor/fuchsia-cprng/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-cprng/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,57 @@
+// Copyright 2019 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+//! Type-safe bindings for the Zircon kernel's CPRNG.
+
+#![no_std]
+#![deny(warnings)]
+
+/// Draw random bytes from the kernel's CPRNG to fill the given buffer.
+///
+/// Wraps the
+/// [zx_cprng_draw](https://fuchsia.googlesource.com/fuchsia/+/master/zircon/docs/syscalls/cprng_draw.md)
+/// syscall.
+pub fn cprng_draw(buffer: &mut [u8]) {
+    unsafe { zx_cprng_draw(buffer.as_mut_ptr(), buffer.len()) };
+}
+
+#[link(name = "zircon")]
+extern "C" {
+    fn zx_cprng_draw(buffer: *mut u8, length: usize);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn cprng() {
+        let mut buffer = [0; 20];
+        cprng_draw(&mut buffer);
+        let mut first_zero = 0;
+        let mut last_zero = 0;
+        for _ in 0..30 {
+            let mut buffer = [0; 20];
+            cprng_draw(&mut buffer);
+            if buffer[0] == 0 {
+                first_zero += 1;
+            }
+            if buffer[19] == 0 {
+                last_zero += 1;
+            }
+        }
+        assert_ne!(first_zero, 30);
+        assert_ne!(last_zero, 30);
+    }
+
+    #[test]
+    fn cprng_large() {
+        let mut buffer = [0; 1024];
+        cprng_draw(&mut buffer);
+
+        for mut s in buffer.chunks_mut(256) {
+            cprng_draw(&mut s);
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/BUILD.gn cargo-0.33.0/vendor/fuchsia-zircon/BUILD.gn
--- cargo-0.32.0/vendor/fuchsia-zircon/BUILD.gn	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/rust/rust_library.gni")
-
-rust_library("fuchsia-zircon") {
-  deps = [
-    "//garnet/public/rust/crates/fuchsia-zircon/fuchsia-zircon-sys",
-    "//third_party/rust-crates:bitflags-0.7.0",
-  ]
-
-  with_tests = true
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/.cargo-checksum.json cargo-0.33.0/vendor/fuchsia-zircon/.cargo-checksum.json
--- cargo-0.32.0/vendor/fuchsia-zircon/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/Cargo.toml cargo-0.33.0/vendor/fuchsia-zircon/Cargo.toml
--- cargo-0.32.0/vendor/fuchsia-zircon/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "fuchsia-zircon"
-version = "0.3.3"
-authors = ["Raph Levien <raph@google.com>"]
-description = "Rust bindings for the Zircon kernel"
-license = "BSD-3-Clause"
-repository = "https://fuchsia.googlesource.com/garnet/"
-[dependencies.bitflags]
-version = "1.0.0"
-
-[dependencies.fuchsia-zircon-sys]
-version = "0.3.3"
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/examples/BUILD.gn cargo-0.33.0/vendor/fuchsia-zircon/examples/BUILD.gn
--- cargo-0.32.0/vendor/fuchsia-zircon/examples/BUILD.gn	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/examples/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/package.gni")
-
-package("zircon_rust_examples") {
-  system_image = true
-
-  deps = [
-    "zx_toy",
-  ]
-
-  binaries = [ {
-        name = "example_zx_toy"
-      } ]
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/LICENSE cargo-0.33.0/vendor/fuchsia-zircon/LICENSE
--- cargo-0.32.0/vendor/fuchsia-zircon/LICENSE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/README.md cargo-0.33.0/vendor/fuchsia-zircon/README.md
--- cargo-0.32.0/vendor/fuchsia-zircon/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Rust bindings for Zircon kernel
-================================
-
-This repository contains Rust language bindings for Zircon kernel syscalls. The
-main crate contains type-safe wrappers, while the inner "sys" crate contains the
-raw types and FFI declarations.
-
-There are two ways to build Rust artifacts targeting Fuchsia; using the
-[Fargo](https://fuchsia.googlesource.com/fargo/) cross compiling tool or
-including your [artifact in the GN
-build](https://fuchsia.googlesource.com/docs/+/master/rust.md). Of the two,
-Fargo is likely better for exploration and experimentation.
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/channel.rs cargo-0.33.0/vendor/fuchsia-zircon/src/channel.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/channel.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/channel.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,418 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon channel objects.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Peered, Status, Time, usize_into_u32, size_to_u32_sat};
-use {sys, ok};
-use std::mem;
-
-/// An object representing a Zircon
-/// [channel](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/channel.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq, Hash)]
-pub struct Channel(Handle);
-impl_handle_based!(Channel);
-impl Peered for Channel {}
-
-impl Channel {
-    /// Create a channel, resulting an a pair of `Channel` objects representing both
-    /// sides of the channel. Messages written into one maybe read from the opposite.
-    ///
-    /// Wraps the
-    /// [zx_channel_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_create.md)
-    /// syscall.
-    pub fn create() -> Result<(Channel, Channel), Status> {
-        unsafe {
-            let mut handle0 = 0;
-            let mut handle1 = 0;
-            let opts = 0;
-            ok(sys::zx_channel_create(opts, &mut handle0, &mut handle1))?;
-            Ok((
-                Self::from(Handle::from_raw(handle0)),
-                Self::from(Handle::from_raw(handle1))
-                ))
-        }
-    }
-
-    /// Read a message from a channel. Wraps the
-    /// [zx_channel_read](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_read.md)
-    /// syscall.
-    ///
-    /// If the `MessageBuf` lacks the capacity to hold the pending message,
-    /// returns an `Err` with the number of bytes and number of handles needed.
-    /// Otherwise returns an `Ok` with the result as usual.
-    pub fn read_raw(&self, buf: &mut MessageBuf)
-        -> Result<Result<(), Status>, (usize, usize)>
-    {
-        let opts = 0;
-        unsafe {
-            buf.clear();
-            let raw_handle = self.raw_handle();
-            let mut num_bytes: u32 = size_to_u32_sat(buf.bytes.capacity());
-            let mut num_handles: u32 = size_to_u32_sat(buf.handles.capacity());
-            let status = ok(sys::zx_channel_read(raw_handle, opts,
-                buf.bytes.as_mut_ptr(), buf.handles.as_mut_ptr() as *mut _,
-                num_bytes, num_handles, &mut num_bytes, &mut num_handles));
-            if status == Err(Status::BUFFER_TOO_SMALL) {
-                Err((num_bytes as usize, num_handles as usize))
-            } else {
-                Ok(status.map(|()| {
-                    buf.bytes.set_len(num_bytes as usize);
-                    buf.handles.set_len(num_handles as usize);
-                }))
-            }
-        }
-    }
-
-    /// Read a message from a channel.
-    ///
-    /// Note that this method can cause internal reallocations in the `MessageBuf`
-    /// if it is lacks capacity to hold the full message. If such reallocations
-    /// are not desirable, use `read_raw` instead.
-    pub fn read(&self, buf: &mut MessageBuf) -> Result<(), Status> {
-        loop {
-            match self.read_raw(buf) {
-                Ok(result) => return result,
-                Err((num_bytes, num_handles)) => {
-                    buf.ensure_capacity_bytes(num_bytes);
-                    buf.ensure_capacity_handles(num_handles);
-                }
-            }
-        }
-    }
-
-    /// Write a message to a channel. Wraps the
-    /// [zx_channel_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_write.md)
-    /// syscall.
-    pub fn write(&self, bytes: &[u8], handles: &mut Vec<Handle>)
-            -> Result<(), Status>
-    {
-        let opts = 0;
-        let n_bytes = try!(usize_into_u32(bytes.len()).map_err(|_| Status::OUT_OF_RANGE));
-        let n_handles = try!(usize_into_u32(handles.len()).map_err(|_| Status::OUT_OF_RANGE));
-        unsafe {
-            let status = sys::zx_channel_write(self.raw_handle(), opts, bytes.as_ptr(), n_bytes,
-                handles.as_ptr() as *const sys::zx_handle_t, n_handles);
-            ok(status)?;
-            // Handles were successfully transferred, forget them on sender side
-            handles.set_len(0);
-            Ok(())
-        }
-    }
-
-    /// Send a message consisting of the given bytes and handles to a channel and await a reply. The
-    /// bytes should start with a four byte 'txid' which is used to identify the matching reply.
-    ///
-    /// Wraps the
-    /// [zx_channel_call](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/channel_call.md)
-    /// syscall.
-    ///
-    /// Note that unlike [`read`][read], the caller must ensure that the MessageBuf has enough
-    /// capacity for the bytes and handles which will be received, as replies which are too large
-    /// are discarded.
-    ///
-    /// On failure returns the both the main and read status.
-    ///
-    /// [read]: struct.Channel.html#method.read
-    pub fn call(&self, timeout: Time, bytes: &[u8], handles: &mut Vec<Handle>,
-        buf: &mut MessageBuf) -> Result<(), (Status, Status)>
-    {
-        let write_num_bytes = try!(usize_into_u32(bytes.len()).map_err(
-            |_| (Status::OUT_OF_RANGE, Status::OK)));
-        let write_num_handles = try!(usize_into_u32(handles.len()).map_err(
-            |_| (Status::OUT_OF_RANGE, Status::OK)));
-        buf.clear();
-        let read_num_bytes: u32 = size_to_u32_sat(buf.bytes.capacity());
-        let read_num_handles: u32 = size_to_u32_sat(buf.handles.capacity());
-        let args = sys::zx_channel_call_args_t {
-            wr_bytes: bytes.as_ptr(),
-            wr_handles: handles.as_ptr() as *const sys::zx_handle_t,
-            rd_bytes: buf.bytes.as_mut_ptr(),
-            rd_handles: buf.handles.as_mut_ptr() as *mut _,
-            wr_num_bytes: write_num_bytes,
-            wr_num_handles: write_num_handles,
-            rd_num_bytes: read_num_bytes,
-            rd_num_handles: read_num_handles,
-        };
-        let mut actual_read_bytes: u32 = 0;
-        let mut actual_read_handles: u32 = 0;
-        let mut read_status = Status::OK.into_raw();
-        let options = 0;
-        let status = unsafe {
-            Status::from_raw(
-                sys::zx_channel_call(
-                    self.raw_handle(), options, timeout.nanos(), &args, &mut actual_read_bytes,
-                    &mut actual_read_handles, &mut read_status))
-        };
-
-        match status {
-            Status::OK |
-            Status::TIMED_OUT |
-            Status::CALL_FAILED => {
-                // Handles were successfully transferred,
-                // even if we didn't get a response, so forget
-                // them on the sender side.
-                unsafe { handles.set_len(0); }
-            }
-            _ => {}
-        }
-
-        unsafe {
-            buf.bytes.set_len(actual_read_bytes as usize);
-            buf.handles.set_len(actual_read_handles as usize);
-        }
-        if Status::OK == status {
-            Ok(())
-        } else {
-            Err((status, Status::from_raw(read_status)))
-        }
-    }
-}
-
-#[test]
-pub fn test_handle_repr() {
-    assert_eq!(::std::mem::size_of::<sys::zx_handle_t>(), 4);
-    assert_eq!(::std::mem::size_of::<Handle>(), 4);
-    assert_eq!(::std::mem::align_of::<sys::zx_handle_t>(), ::std::mem::align_of::<Handle>());
-
-    // This test asserts that repr(transparent) still works for Handle -> zx_handle_t
-
-    let n: Vec<sys::zx_handle_t> = vec![0, 100, 2<<32-1];
-    let v: Vec<Handle> = n.iter().map(|h| unsafe { Handle::from_raw(*h) } ).collect();
-
-    for (handle, raw) in v.iter().zip(n.iter()) {
-        unsafe {
-            assert_eq!(*(handle as *const _ as *const [u8; 4]), *(raw as *const _ as *const [u8; 4]));
-        }
-    }
-
-    for h in v.into_iter() {
-        ::std::mem::forget(h);
-    }
-}
-
-impl AsRef<Channel> for Channel {
-    fn as_ref(&self) -> &Self {
-        &self
-    }
-}
-
-/// A buffer for _receiving_ messages from a channel.
-///
-/// A `MessageBuf` is essentially a byte buffer and a vector of
-/// handles, but move semantics for "taking" handles requires special handling.
-///
-/// Note that for sending messages to a channel, the caller manages the buffers,
-/// using a plain byte slice and `Vec<Handle>`.
-#[derive(Default)]
-#[derive(Debug)]
-pub struct MessageBuf {
-    bytes: Vec<u8>,
-    handles: Vec<Handle>,
-}
-
-impl MessageBuf {
-    /// Create a new, empty, message buffer.
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    /// Create a new non-empty message buffer.
-    pub fn new_with(v: Vec<u8>, h: Vec<Handle>) -> Self {
-        Self{
-            bytes: v,
-            handles: h,
-        }
-    }
-
-    /// Ensure that the buffer has the capacity to hold at least `n_bytes` bytes.
-    pub fn ensure_capacity_bytes(&mut self, n_bytes: usize) {
-        ensure_capacity(&mut self.bytes, n_bytes);
-    }
-
-    /// Ensure that the buffer has the capacity to hold at least `n_handles` handles.
-    pub fn ensure_capacity_handles(&mut self, n_handles: usize) {
-        ensure_capacity(&mut self.handles, n_handles);
-    }
-
-    /// Ensure that at least n_bytes bytes are initialized (0 fill).
-    pub fn ensure_initialized_bytes(&mut self, n_bytes: usize) {
-        if n_bytes <= self.bytes.len() {
-            return;
-        }
-        self.bytes.resize(n_bytes, 0);
-    }
-
-    /// Get a reference to the bytes of the message buffer, as a `&[u8]` slice.
-    pub fn bytes(&self) -> &[u8] {
-        self.bytes.as_slice()
-    }
-
-    /// The number of handles in the message buffer. Note this counts the number
-    /// available when the message was received; `take_handle` does not affect
-    /// the count.
-    pub fn n_handles(&self) -> usize {
-        self.handles.len()
-    }
-
-    /// Take the handle at the specified index from the message buffer. If the
-    /// method is called again with the same index, it will return `None`, as
-    /// will happen if the index exceeds the number of handles available.
-    pub fn take_handle(&mut self, index: usize) -> Option<Handle> {
-        self.handles.get_mut(index).and_then(|handle|
-            if handle.is_invalid() {
-                None
-            } else {
-                Some(mem::replace(handle, Handle::invalid()))
-            }
-        )
-    }
-
-    /// Clear the bytes and handles contained in the buf. This will drop any
-    /// contained handles, resulting in their resources being freed.
-    pub fn clear(&mut self) {
-        self.bytes.clear();
-        self.handles.clear();
-    }
-}
-
-fn ensure_capacity<T>(vec: &mut Vec<T>, size: usize) {
-    let len = vec.len();
-    if size > len {
-        vec.reserve(size - len);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use {DurationNum, Rights, Signals, Vmo};
-    use std::thread;
-
-    #[test]
-    fn channel_basic() {
-        let (p1, p2) = Channel::create().unwrap();
-
-        let mut empty = vec![];
-        assert!(p1.write(b"hello", &mut empty).is_ok());
-
-        let mut buf = MessageBuf::new();
-        assert!(p2.read(&mut buf).is_ok());
-        assert_eq!(buf.bytes(), b"hello");
-    }
-
-    #[test]
-    fn channel_read_raw_too_small() {
-        let (p1, p2) = Channel::create().unwrap();
-
-        let mut empty = vec![];
-        assert!(p1.write(b"hello", &mut empty).is_ok());
-
-        let mut buf = MessageBuf::new();
-        let result = p2.read_raw(&mut buf);
-        assert_eq!(result, Err((5, 0)));
-        assert_eq!(buf.bytes(), b"");
-    }
-
-    #[test]
-    fn channel_send_handle() {
-        let hello_length: usize = 5;
-
-        // Create a pair of channels and a virtual memory object.
-        let (p1, p2) = Channel::create().unwrap();
-        let vmo = Vmo::create(hello_length as u64).unwrap();
-
-        // Duplicate VMO handle and send it down the channel.
-        let duplicate_vmo_handle = vmo.duplicate_handle(Rights::SAME_RIGHTS).unwrap().into();
-        let mut handles_to_send: Vec<Handle> = vec![duplicate_vmo_handle];
-        assert!(p1.write(b"", &mut handles_to_send).is_ok());
-        // Handle should be removed from vector.
-        assert!(handles_to_send.is_empty());
-
-        // Read the handle from the receiving channel.
-        let mut buf = MessageBuf::new();
-        assert!(p2.read(&mut buf).is_ok());
-        assert_eq!(buf.n_handles(), 1);
-        // Take the handle from the buffer.
-        let received_handle = buf.take_handle(0).unwrap();
-        // Should not affect number of handles.
-        assert_eq!(buf.n_handles(), 1);
-        // Trying to take it again should fail.
-        assert!(buf.take_handle(0).is_none());
-
-        // Now to test that we got the right handle, try writing something to it...
-        let received_vmo = Vmo::from(received_handle);
-        assert_eq!(received_vmo.write(b"hello", 0).unwrap(), hello_length);
-
-        // ... and reading it back from the original VMO.
-        let mut read_vec = vec![0; hello_length];
-        assert_eq!(vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"hello");
-    }
-
-    #[test]
-    fn channel_call_timeout() {
-        let ten_ms = 10.millis();
-
-        // Create a pair of channels and a virtual memory object.
-        let (p1, p2) = Channel::create().unwrap();
-        let vmo = Vmo::create(0 as u64).unwrap();
-
-        // Duplicate VMO handle and send it along with the call.
-        let duplicate_vmo_handle = vmo.duplicate_handle(Rights::SAME_RIGHTS).unwrap().into();
-        let mut handles_to_send: Vec<Handle> = vec![duplicate_vmo_handle];
-        let mut buf = MessageBuf::new();
-        assert_eq!(p1.call(ten_ms.after_now(), b"call", &mut handles_to_send, &mut buf),
-            Err((Status::TIMED_OUT, Status::OK)));
-        // Handle should be removed from vector even though we didn't get a response, as it was
-        // still sent over the channel.
-        assert!(handles_to_send.is_empty());
-
-        // Should be able to read call even though it timed out waiting for a response.
-        let mut buf = MessageBuf::new();
-        assert!(p2.read(&mut buf).is_ok());
-        assert_eq!(buf.bytes(), b"call");
-        assert_eq!(buf.n_handles(), 1);
-    }
-
-    #[test]
-    fn channel_call() {
-        // Create a pair of channels
-        let (p1, p2) = Channel::create().unwrap();
-
-        // create an mpsc channel for communicating the call data for later assertion
-        let (tx, rx) = ::std::sync::mpsc::channel();
-
-        // Start a new thread to respond to the call.
-        thread::spawn(move || {
-            let mut buf = MessageBuf::new();
-            // if either the read or the write fail, this thread will panic,
-            // resulting in tx being dropped, which will be noticed by the rx.
-            p2.wait_handle(Signals::CHANNEL_READABLE, 1.seconds().after_now()).expect("callee wait error");
-            p2.read(&mut buf).expect("callee read error");
-            p2.write(b"txidresponse", &mut vec![]).expect("callee write error");
-            tx.send(buf).expect("callee mpsc send error");
-        });
-
-        // Make the call.
-        let mut buf = MessageBuf::new();
-        buf.ensure_capacity_bytes(12);
-        // NOTE(raggi): CQ has been seeing some long stalls from channel call,
-        // and it's as yet unclear why. The timeout here has been made much
-        // larger in order to avoid that, as the issues are not issues with this
-        // crate's concerns. The timeout is here just to prevent the tests from
-        // stalling forever if a developer makes a mistake locally in this
-        // crate. Tests of Zircon behavior or virtualization behavior should be
-        // covered elsewhere. See ZX-1324.
-        p1.call(30.seconds().after_now(), b"txidcall", &mut vec![], &mut buf).expect("channel call error");
-        assert_eq!(buf.bytes(), b"txidresponse");
-        assert_eq!(buf.n_handles(), 0);
-
-        let sbuf = rx.recv().expect("mpsc channel recv error");
-        assert_eq!(sbuf.bytes(), b"txidcall");
-        assert_eq!(sbuf.n_handles(), 0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/cprng.rs cargo-0.33.0/vendor/fuchsia-zircon/src/cprng.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/cprng.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/cprng.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-use {Status, ok, sys};
-
-/// Draw random bytes from the kernel's CPRNG to fill the given buffer. Returns the actual number of
-/// bytes drawn, which may sometimes be less than the size of the buffer provided.
-///
-/// The buffer must have length less than `ZX_CPRNG_DRAW_MAX_LEN`.
-///
-/// Wraps the
-/// [zx_cprng_draw](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_draw.md)
-/// syscall.
-pub fn cprng_draw(buffer: &mut [u8]) -> Result<usize, Status> {
-    let mut actual = 0;
-    let status = unsafe { sys::zx_cprng_draw(buffer.as_mut_ptr(), buffer.len(), &mut actual) };
-    ok(status).map(|()| actual)
-}
-
-/// Mix the given entropy into the kernel CPRNG.
-///
-/// The buffer must have length less than `ZX_CPRNG_ADD_ENTROPY_MAX_LEN`.
-///
-/// Wraps the
-/// [zx_cprng_add_entropy](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_add_entropy.md)
-/// syscall.
-pub fn cprng_add_entropy(buffer: &[u8]) -> Result<(), Status> {
-    let status = unsafe { sys::zx_cprng_add_entropy(buffer.as_ptr(), buffer.len()) };
-    ok(status)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn cprng() {
-        let mut buffer = [0; 20];
-        assert_eq!(cprng_draw(&mut buffer), Ok(20));
-        let mut first_zero = 0;
-        let mut last_zero = 0;
-        for _ in 0..30 {
-            let mut buffer = [0; 20];
-            assert_eq!(cprng_draw(&mut buffer), Ok(20));
-            if buffer[0] == 0 {
-                first_zero += 1;
-            }
-            if buffer[19] == 0 {
-                last_zero += 1;
-            }
-        }
-        assert_ne!(first_zero, 30);
-        assert_ne!(last_zero, 30);
-    }
-
-    #[test]
-    fn cprng_too_large() {
-        let mut buffer = [0; sys::ZX_CPRNG_DRAW_MAX_LEN + 1];
-        assert_eq!(cprng_draw(&mut buffer), Err(Status::INVALID_ARGS));
-
-        for mut s in buffer.chunks_mut(sys::ZX_CPRNG_DRAW_MAX_LEN) {
-            assert_eq!(cprng_draw(&mut s), Ok(s.len()));
-        }
-    }
-
-    #[test]
-    fn cprng_add() {
-        let buffer = [0, 1, 2];
-        assert_eq!(cprng_add_entropy(&buffer), Ok(()));
-    }
-}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/eventpair.rs cargo-0.33.0/vendor/fuchsia-zircon/src/eventpair.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/eventpair.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/eventpair.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon event pairs.
-
-use {AsHandleRef, Cookied, HandleBased, Handle, HandleRef, Peered, Status};
-use {sys, ok};
-
-/// An object representing a Zircon
-/// [event pair](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Other-IPC_Events_Event-Pairs_and-User-Signals).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct EventPair(Handle);
-impl_handle_based!(EventPair);
-impl Peered for EventPair {}
-impl Cookied for EventPair {}
-
-impl EventPair {
-    /// Create an event pair, a pair of objects which can signal each other. Wraps the
-    /// [zx_eventpair_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/eventpair_create.md)
-    /// syscall.
-    pub fn create() -> Result<(EventPair, EventPair), Status> {
-        let mut out0 = 0;
-        let mut out1 = 0;
-        let options = 0;
-        let status = unsafe { sys::zx_eventpair_create(options, &mut out0, &mut out1) };
-        ok(status)?;
-        unsafe {
-            Ok((
-                Self::from(Handle::from_raw(out0)),
-                Self::from(Handle::from_raw(out1))
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use {DurationNum, Signals};
-
-    #[test]
-    fn wait_and_signal_peer() {
-        let (p1, p2) = EventPair::create().unwrap();
-        let eighty_ms = 80.millis();
-
-        // Waiting on one without setting any signal should time out.
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(p1.signal_peer(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Should still work, signals aren't automatically cleared.
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Now clear it, and waiting should time out again.
-        assert!(p1.signal_peer(Signals::USER_0, Signals::NONE).is_ok());
-        assert_eq!(p2.wait_handle(Signals::USER_0, eighty_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/event.rs cargo-0.33.0/vendor/fuchsia-zircon/src/event.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/event.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/event.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon event objects.
-
-use {AsHandleRef, Cookied, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-
-/// An object representing a Zircon
-/// [event object](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/event.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Event(Handle);
-impl_handle_based!(Event);
-impl Cookied for Event {}
-
-impl Event {
-    /// Create an event object, an object which is signalable but nothing else. Wraps the
-    /// [zx_event_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/event_create.md)
-    /// syscall.
-    pub fn create() -> Result<Event, Status> {
-        let mut out = 0;
-        let opts = 0;
-        let status = unsafe { sys::zx_event_create(opts, &mut out) };
-        ok(status)?;
-        unsafe {
-            Ok(Self::from(Handle::from_raw(out)))
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/fifo.rs cargo-0.33.0/vendor/fuchsia-zircon/src/fifo.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/fifo.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/fifo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon fifo objects.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-
-/// An object representing a Zircon fifo.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Fifo(Handle);
-impl_handle_based!(Fifo);
-
-impl Fifo {
-    /// Create a pair of fifos and return their endpoints. Writing to one endpoint enqueues an
-    /// element into the fifo from which the opposing endpoint reads. Wraps the
-    /// [zx_fifo_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/fifo_create.md)
-    /// syscall.
-    pub fn create(elem_count: u32, elem_size: u32)
-        -> Result<(Fifo, Fifo), Status>
-    {
-        let mut out0 = 0;
-        let mut out1 = 0;
-        let options = 0;
-        let status = unsafe {
-            sys::zx_fifo_create(elem_count, elem_size, options, &mut out0, &mut out1)
-        };
-        ok(status)?;
-        unsafe { Ok((
-            Self::from(Handle::from_raw(out0)),
-            Self::from(Handle::from_raw(out1))
-        ))}
-    }
-
-    /// Attempts to write some number of elements into the fifo. The number of bytes written will be
-    /// rounded down to a multiple of the fifo's element size.
-    /// Return value (on success) is number of elements actually written.
-    ///
-    /// Wraps
-    /// [zx_fifo_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/fifo_write.md).
-    pub fn write(&self, bytes: &[u8]) -> Result<u32, Status> {
-        let mut num_entries_written = 0;
-        let status = unsafe {
-            sys::zx_fifo_write(self.raw_handle(), bytes.as_ptr(), bytes.len(),
-                &mut num_entries_written)
-        };
-        ok(status).map(|()| num_entries_written)
-    }
-
-    /// Attempts to read some number of elements out of the fifo. The number of bytes read will
-    /// always be a multiple of the fifo's element size.
-    /// Return value (on success) is number of elements actually read.
-    ///
-    /// Wraps
-    /// [zx_fifo_read](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/fifo_read.md).
-    pub fn read(&self, bytes: &mut [u8]) -> Result<u32, Status> {
-        let mut num_entries_read = 0;
-        let status = unsafe {
-            sys::zx_fifo_read(self.raw_handle(), bytes.as_mut_ptr(), bytes.len(),
-                &mut num_entries_read)
-        };
-        ok(status).map(|()| num_entries_read)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn fifo_basic() {
-        let (fifo1, fifo2) = Fifo::create(4, 2).unwrap();
-
-        // Trying to write less than one element should fail.
-        assert_eq!(fifo1.write(b""), Err(Status::OUT_OF_RANGE));
-        assert_eq!(fifo1.write(b"h"), Err(Status::OUT_OF_RANGE));
-
-        // Should write one element "he" and ignore the last half-element as it rounds down.
-        assert_eq!(fifo1.write(b"hex").unwrap(), 1);
-
-        // Should write three elements "ll" "o " "wo" and drop the rest as it is full.
-        assert_eq!(fifo1.write(b"llo worlds").unwrap(), 3);
-
-        // Now that the fifo is full any further attempts to write should fail.
-        assert_eq!(fifo1.write(b"blah blah"), Err(Status::SHOULD_WAIT));
-
-        // Read all 4 entries from the other end.
-        let mut read_vec = vec![0; 8];
-        assert_eq!(fifo2.read(&mut read_vec).unwrap(), 4);
-        assert_eq!(read_vec, b"hello wo");
-
-        // Reading again should fail as the fifo is empty.
-        assert_eq!(fifo2.read(&mut read_vec), Err(Status::SHOULD_WAIT));
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/handle.rs cargo-0.33.0/vendor/fuchsia-zircon/src/handle.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/handle.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/handle.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-use {Port, Rights, Signals, Status, Time, WaitAsyncOpts, ok, sys};
-use std::marker::PhantomData;
-use std::mem;
-
-/// An object representing a Zircon
-/// [handle](https://fuchsia.googlesource.com/zircon/+/master/docs/handles.md).
-///
-/// Internally, it is represented as a 32-bit integer, but this wrapper enforces
-/// strict ownership semantics. The `Drop` implementation closes the handle.
-///
-/// This type represents the most general reference to a kernel object, and can
-/// be interconverted to and from more specific types. Those conversions are not
-/// enforced in the type system; attempting to use them will result in errors
-/// returned by the kernel. These conversions don't change the underlying
-/// representation, but do change the type and thus what operations are available.
-#[derive(Debug, Eq, PartialEq, Hash)]
-pub struct Handle(sys::zx_handle_t);
-
-impl AsHandleRef for Handle {
-    fn as_handle_ref(&self) -> HandleRef {
-        HandleRef { handle: self.0, phantom: Default::default() }
-    }
-}
-
-impl HandleBased for Handle {}
-
-impl Drop for Handle {
-    fn drop(&mut self) {
-        if self.0 != sys::ZX_HANDLE_INVALID {
-            unsafe { sys::zx_handle_close(self.0) };
-        }
-    }
-}
-
-impl Handle {
-    /// Initialize a handle backed by ZX_HANDLE_INVALID, the only safe non-handle.
-    pub fn invalid() -> Handle {
-        Handle(sys::ZX_HANDLE_INVALID)
-    }
-
-    /// If a raw handle is obtained from some other source, this method converts
-    /// it into a type-safe owned handle.
-    pub unsafe fn from_raw(raw: sys::zx_handle_t) -> Handle {
-        Handle(raw)
-    }
-
-    pub fn is_invalid(&self) -> bool {
-        self.0 == sys::ZX_HANDLE_INVALID
-    }
-
-    pub fn replace(self, rights: Rights) -> Result<Handle, Status> {
-        let handle = self.0;
-        let mut out = 0;
-        let status = unsafe { sys::zx_handle_replace(handle, rights.bits(), &mut out) };
-        ok(status).map(|()| Handle(out))
-    }
-}
-
-/// A borrowed reference to a `Handle`.
-///
-/// Mostly useful as part of a `WaitItem`.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct HandleRef<'a> {
-    handle: sys::zx_handle_t,
-    phantom: PhantomData<&'a sys::zx_handle_t>,
-}
-
-impl<'a> HandleRef<'a> {
-    pub fn raw_handle(&self) -> sys::zx_handle_t {
-        self.handle
-    }
-
-    pub fn duplicate(&self, rights: Rights) -> Result<Handle, Status> {
-        let handle = self.handle;
-        let mut out = 0;
-        let status = unsafe { sys::zx_handle_duplicate(handle, rights.bits(), &mut out) };
-        ok(status).map(|()| Handle(out))
-    }
-
-    pub fn signal(&self, clear_mask: Signals, set_mask: Signals) -> Result<(), Status> {
-        let handle = self.handle;
-        let status = unsafe { sys::zx_object_signal(handle, clear_mask.bits(), set_mask.bits()) };
-        ok(status)
-    }
-
-    pub fn wait(&self, signals: Signals, deadline: Time) -> Result<Signals, Status> {
-        let handle = self.handle;
-        let mut pending = Signals::empty().bits();
-        let status = unsafe {
-            sys::zx_object_wait_one(handle, signals.bits(), deadline.nanos(), &mut pending)
-        };
-        ok(status).map(|()| Signals::from_bits_truncate(pending))
-    }
-
-    pub fn wait_async(&self, port: &Port, key: u64, signals: Signals, options: WaitAsyncOpts)
-        -> Result<(), Status>
-    {
-        let handle = self.handle;
-        let status = unsafe {
-            sys::zx_object_wait_async(
-                handle, port.raw_handle(), key, signals.bits(), options as u32)
-        };
-        ok(status)
-    }
-}
-
-/// A trait to get a reference to the underlying handle of an object.
-pub trait AsHandleRef {
-    /// Get a reference to the handle. One important use of such a reference is
-    /// for `object_wait_many`.
-    fn as_handle_ref(&self) -> HandleRef;
-
-    /// Interpret the reference as a raw handle (an integer type). Two distinct
-    /// handles will have different raw values (so it can perhaps be used as a
-    /// key in a data structure).
-    fn raw_handle(&self) -> sys::zx_handle_t {
-        self.as_handle_ref().raw_handle()
-    }
-
-    /// Set and clear userspace-accessible signal bits on an object. Wraps the
-    /// [zx_object_signal](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_signal.md)
-    /// syscall.
-    fn signal_handle(&self, clear_mask: Signals, set_mask: Signals) -> Result<(), Status> {
-        self.as_handle_ref().signal(clear_mask, set_mask)
-    }
-
-    /// Waits on a handle. Wraps the
-    /// [zx_object_wait_one](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_wait_one.md)
-    /// syscall.
-    fn wait_handle(&self, signals: Signals, deadline: Time) -> Result<Signals, Status> {
-        self.as_handle_ref().wait(signals, deadline)
-    }
-
-    /// Causes packet delivery on the given port when the object changes state and matches signals.
-    /// [zx_object_wait_async](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_wait_async.md)
-    /// syscall.
-    fn wait_async_handle(&self, port: &Port, key: u64, signals: Signals, options: WaitAsyncOpts)
-        -> Result<(), Status>
-    {
-        self.as_handle_ref().wait_async(port, key, signals, options)
-    }
-}
-
-impl<'a> AsHandleRef for HandleRef<'a> {
-    fn as_handle_ref(&self) -> HandleRef { *self }
-}
-
-/// A trait implemented by all handle-based types.
-///
-/// Note: it is reasonable for user-defined objects wrapping a handle to implement
-/// this trait. For example, a specific interface in some protocol might be
-/// represented as a newtype of `Channel`, and implement the `as_handle_ref`
-/// method and the `From<Handle>` trait to facilitate conversion from and to the
-/// interface.
-pub trait HandleBased: AsHandleRef + From<Handle> + Into<Handle> {
-    /// Duplicate a handle, possibly reducing the rights available. Wraps the
-    /// [zx_handle_duplicate](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/handle_duplicate.md)
-    /// syscall.
-    fn duplicate_handle(&self, rights: Rights) -> Result<Self, Status> {
-        self.as_handle_ref().duplicate(rights).map(|handle| Self::from(handle))
-    }
-
-    /// Create a replacement for a handle, possibly reducing the rights available. This invalidates
-    /// the original handle. Wraps the
-    /// [zx_handle_replace](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/handle_replace.md)
-    /// syscall.
-    fn replace_handle(self, rights: Rights) -> Result<Self, Status> {
-        <Self as Into<Handle>>::into(self)
-            .replace(rights).map(|handle| Self::from(handle))
-    }
-
-    /// Converts the value into its inner handle.
-    ///
-    /// This is a convenience function which simply forwards to the `Into` trait.
-    fn into_handle(self) -> Handle {
-        self.into()
-    }
-
-    /// Converts the handle into it's raw representation.
-    ///
-    /// The caller takes ownership over the raw handle, and must close or transfer it to avoid a handle leak.
-    fn into_raw(self) -> sys::zx_handle_t {
-        let h = self.into_handle();
-        let r = h.0;
-        mem::forget(h);
-        r
-   }
-
-    /// Creates an instance of this type from a handle.
-    ///
-    /// This is a convenience function which simply forwards to the `From` trait.
-    fn from_handle(handle: Handle) -> Self {
-        Self::from(handle)
-    }
-
-    /// Creates an instance of another handle-based type from this value's inner handle.
-    fn into_handle_based<H: HandleBased>(self) -> H {
-        H::from_handle(self.into_handle())
-    }
-
-    /// Creates an instance of this type from the inner handle of another
-    /// handle-based type.
-    fn from_handle_based<H: HandleBased>(h: H) -> Self {
-        Self::from_handle(h.into_handle())
-    }
-}
-
-/// A trait implemented by all handles for objects which have a peer.
-pub trait Peered: HandleBased {
-    /// Set and clear userspace-accessible signal bits on the object's peer. Wraps the
-    /// [zx_object_signal_peer](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_signal.md)
-    /// syscall.
-    fn signal_peer(&self, clear_mask: Signals, set_mask: Signals) -> Result<(), Status> {
-        let handle = self.as_handle_ref().handle;
-        let status = unsafe {
-            sys::zx_object_signal_peer(handle, clear_mask.bits(), set_mask.bits())
-        };
-        ok(status)
-    }
-}
-
-/// A trait implemented by all handles for objects which can have a cookie attached.
-pub trait Cookied: HandleBased {
-    /// Get the cookie attached to this object, if any. Wraps the
-    /// [zx_object_get_cookie](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/object_get_cookie.md)
-    /// syscall.
-    fn get_cookie(&self, scope: &HandleRef) -> Result<u64, Status> {
-        let handle = self.as_handle_ref().handle;
-        let mut cookie = 0;
-        let status = unsafe { sys::zx_object_get_cookie(handle, scope.handle, &mut cookie) };
-        ok(status).map(|()| cookie)
-    }
-
-    /// Attach an opaque cookie to this object with the given scope. The cookie may be read or
-    /// changed in future only with the same scope. Wraps the
-    /// [zx_object_set_cookie](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/object_set_cookie.md)
-    /// syscall.
-    fn set_cookie(&self, scope: &HandleRef, cookie: u64) -> Result<(), Status> {
-        let handle = self.as_handle_ref().handle;
-        let status = unsafe { sys::zx_object_set_cookie(handle, scope.handle, cookie) };
-        ok(status)
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/job.rs cargo-0.33.0/vendor/fuchsia-zircon/src/job.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/job.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/job.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon job.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef};
-
-/// An object representing a Zircon job.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Job(Handle);
-impl_handle_based!(Job);
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/lib.rs cargo-0.33.0/vendor/fuchsia-zircon/src/lib.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,365 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon kernel
-//! [syscalls](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls.md).
-
-#![deny(warnings)]
-
-#[macro_use]
-extern crate bitflags;
-
-pub extern crate fuchsia_zircon_sys as sys;
-
-#[deprecated(note="use fuchsia_zircon::sys::ZX_CPRNG_DRAW_MAX_LEN instead")]
-#[doc(hidden)]
-pub use sys::ZX_CPRNG_DRAW_MAX_LEN;
-
-// Implements the HandleBased traits for a Handle newtype struct
-macro_rules! impl_handle_based {
-    ($type_name:path) => {
-        impl AsHandleRef for $type_name {
-            fn as_handle_ref(&self) -> HandleRef {
-                self.0.as_handle_ref()
-            }
-        }
-
-        impl From<Handle> for $type_name {
-            fn from(handle: Handle) -> Self {
-                $type_name(handle)
-            }
-        }
-
-        impl From<$type_name> for Handle {
-            fn from(x: $type_name) -> Handle {
-                x.0
-            }
-        }
-
-        impl HandleBased for $type_name {}
-    }
-}
-
-// Creates associated constants of TypeName of the form
-// `pub const NAME: TypeName = TypeName(value);`
-macro_rules! assoc_consts {
-    ($typename:ident, [$($name:ident = $num:expr;)*]) => {
-        #[allow(non_upper_case_globals)]
-        impl $typename {
-            $(
-                pub const $name: $typename = $typename($num);
-            )*
-        }
-    }
-}
-
-mod channel;
-mod cprng;
-mod event;
-mod eventpair;
-mod fifo;
-mod handle;
-mod job;
-mod port;
-mod process;
-mod rights;
-mod socket;
-mod signals;
-mod status;
-mod time;
-mod thread;
-mod vmar;
-mod vmo;
-
-pub use channel::*;
-pub use cprng::*;
-pub use event::*;
-pub use eventpair::*;
-pub use fifo::*;
-pub use handle::*;
-pub use job::*;
-pub use port::*;
-pub use process::*;
-pub use rights::*;
-pub use socket::*;
-pub use signals::*;
-pub use status::*;
-pub use thread::*;
-pub use time::*;
-pub use vmar::*;
-pub use vmo::*;
-
-/// Prelude containing common utility traits.
-/// Designed for use like `use fuchsia_zircon::prelude::*;`
-pub mod prelude {
-    pub use {
-        AsHandleRef,
-        Cookied,
-        DurationNum,
-        HandleBased,
-        Peered,
-    };
-}
-
-/// Convenience re-export of `Status::ok`.
-pub fn ok(raw: sys::zx_status_t) -> Result<(), Status> {
-    Status::ok(raw)
-}
-
-/// A "wait item" containing a handle reference and information about what signals
-/// to wait on, and, on return from `object_wait_many`, which are pending.
-#[repr(C)]
-#[derive(Debug)]
-pub struct WaitItem<'a> {
-    /// The handle to wait on.
-    pub handle: HandleRef<'a>,
-    /// A set of signals to wait for.
-    pub waitfor: Signals,
-    /// The set of signals pending, on return of `object_wait_many`.
-    pub pending: Signals,
-}
-
-/// An identifier to select a particular clock. See
-/// [zx_time_get](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/time_get.md)
-/// for more information about the possible values.
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum ClockId {
-    /// The number of nanoseconds since the system was powered on. Corresponds to
-    /// `ZX_CLOCK_MONOTONIC`.
-    Monotonic = 0,
-    /// The number of wall clock nanoseconds since the Unix epoch (midnight on January 1 1970) in
-    /// UTC. Corresponds to ZX_CLOCK_UTC.
-    UTC = 1,
-    /// The number of nanoseconds the current thread has been running for. Corresponds to
-    /// ZX_CLOCK_THREAD.
-    Thread = 2,
-}
-
-/// Wait on multiple handles.
-/// The success return value is a bool indicating whether one or more of the
-/// provided handle references was closed during the wait.
-///
-/// Wraps the
-/// [zx_object_wait_many](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/object_wait_many.md)
-/// syscall.
-pub fn object_wait_many(items: &mut [WaitItem], deadline: Time) -> Result<bool, Status>
-{
-    let len = try!(usize_into_u32(items.len()).map_err(|_| Status::OUT_OF_RANGE));
-    let items_ptr = items.as_mut_ptr() as *mut sys::zx_wait_item_t;
-    let status = unsafe { sys::zx_object_wait_many( items_ptr, len, deadline.nanos()) };
-    if status == sys::ZX_ERR_CANCELED {
-        return Ok(true)
-    }
-    ok(status).map(|()| false)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[allow(unused_imports)]
-    use super::prelude::*;
-
-    #[test]
-    fn monotonic_time_increases() {
-        let time1 = Time::get(ClockId::Monotonic);
-        1_000.nanos().sleep();
-        let time2 = Time::get(ClockId::Monotonic);
-        assert!(time2 > time1);
-    }
-
-    #[test]
-    fn utc_time_increases() {
-        let time1 = Time::get(ClockId::UTC);
-        1_000.nanos().sleep();
-        let time2 = Time::get(ClockId::UTC);
-        assert!(time2 > time1);
-    }
-
-    #[test]
-    fn thread_time_increases() {
-        let time1 = Time::get(ClockId::Thread);
-        1_000.nanos().sleep();
-        let time2 = Time::get(ClockId::Thread);
-        assert!(time2 > time1);
-    }
-
-    #[test]
-    fn ticks_increases() {
-        let ticks1 = ticks_get();
-        1_000.nanos().sleep();
-        let ticks2 = ticks_get();
-        assert!(ticks2 > ticks1);
-    }
-
-    #[test]
-    fn tick_length() {
-        let sleep_time = 1.milli();
-        let ticks1 = ticks_get();
-        sleep_time.sleep();
-        let ticks2 = ticks_get();
-
-        // The number of ticks should have increased by at least 1 ms worth
-        let sleep_ticks = sleep_time.millis() * ticks_per_second() / 1000;
-        assert!(ticks2 >= (ticks1 + sleep_ticks));
-    }
-
-    #[test]
-    fn into_raw() {
-        let vmo = Vmo::create(1).unwrap();
-        let h = vmo.into_raw();
-        let vmo2 = Vmo::from(unsafe { Handle::from_raw(h) });
-        assert!(vmo2.write(b"1", 0).is_ok());
-    }
-
-    #[test]
-    fn sleep() {
-        let sleep_ns = 1.millis();
-        let time1 = Time::get(ClockId::Monotonic);
-        sleep_ns.sleep();
-        let time2 = Time::get(ClockId::Monotonic);
-        assert!(time2 > time1 + sleep_ns);
-    }
-
-    /// Test duplication by means of a VMO
-    #[test]
-    fn duplicate() {
-        let hello_length: usize = 5;
-
-        // Create a VMO and write some data to it.
-        let vmo = Vmo::create(hello_length as u64).unwrap();
-        assert!(vmo.write(b"hello", 0).is_ok());
-
-        // Replace, reducing rights to read.
-        let readonly_vmo = vmo.duplicate_handle(Rights::READ).unwrap();
-        // Make sure we can read but not write.
-        let mut read_vec = vec![0; hello_length];
-        assert_eq!(readonly_vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"hello");
-        assert_eq!(readonly_vmo.write(b"", 0), Err(Status::ACCESS_DENIED));
-
-        // Write new data to the original handle, and read it from the new handle
-        assert!(vmo.write(b"bye", 0).is_ok());
-        assert_eq!(readonly_vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"byelo");
-    }
-
-    // Test replace by means of a VMO
-    #[test]
-    fn replace() {
-        let hello_length: usize = 5;
-
-        // Create a VMO and write some data to it.
-        let vmo = Vmo::create(hello_length as u64).unwrap();
-        assert!(vmo.write(b"hello", 0).is_ok());
-
-        // Replace, reducing rights to read.
-        let readonly_vmo = vmo.replace_handle(Rights::READ).unwrap();
-        // Make sure we can read but not write.
-        let mut read_vec = vec![0; hello_length];
-        assert_eq!(readonly_vmo.read(&mut read_vec, 0).unwrap(), hello_length);
-        assert_eq!(read_vec, b"hello");
-        assert_eq!(readonly_vmo.write(b"", 0), Err(Status::ACCESS_DENIED));
-    }
-
-    #[test]
-    fn wait_and_signal() {
-        let event = Event::create().unwrap();
-        let ten_ms = 10.millis();
-
-        // Waiting on it without setting any signal should time out.
-        assert_eq!(event.wait_handle(
-            Signals::USER_0, ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(event.wait_handle(Signals::USER_0, ten_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Should still work, signals aren't automatically cleared.
-        assert_eq!(event.wait_handle(Signals::USER_0, ten_ms.after_now()).unwrap(),
-            Signals::USER_0);
-
-        // Now clear it, and waiting should time out again.
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());
-        assert_eq!(event.wait_handle(
-            Signals::USER_0, ten_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-
-    #[test]
-    fn wait_many_and_signal() {
-        let ten_ms = 10.millis();
-        let e1 = Event::create().unwrap();
-        let e2 = Event::create().unwrap();
-
-        // Waiting on them now should time out.
-        let mut items = vec![
-          WaitItem { handle: e1.as_handle_ref(), waitfor: Signals::USER_0, pending: Signals::NONE },
-          WaitItem { handle: e2.as_handle_ref(), waitfor: Signals::USER_1, pending: Signals::NONE },
-        ];
-        assert_eq!(object_wait_many(&mut items, ten_ms.after_now()), Err(Status::TIMED_OUT));
-        assert_eq!(items[0].pending, Signals::NONE);
-        assert_eq!(items[1].pending, Signals::NONE);
-
-        // Signal one object and it should return success.
-        assert!(e1.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert!(object_wait_many(&mut items, ten_ms.after_now()).is_ok());
-        assert_eq!(items[0].pending, Signals::USER_0);
-        assert_eq!(items[1].pending, Signals::NONE);
-
-        // Signal the other and it should return both.
-        assert!(e2.signal_handle(Signals::NONE, Signals::USER_1).is_ok());
-        assert!(object_wait_many(&mut items, ten_ms.after_now()).is_ok());
-        assert_eq!(items[0].pending, Signals::USER_0);
-        assert_eq!(items[1].pending, Signals::USER_1);
-
-        // Clear signals on both; now it should time out again.
-        assert!(e1.signal_handle(Signals::USER_0, Signals::NONE).is_ok());
-        assert!(e2.signal_handle(Signals::USER_1, Signals::NONE).is_ok());
-        assert_eq!(object_wait_many(&mut items, ten_ms.after_now()), Err(Status::TIMED_OUT));
-        assert_eq!(items[0].pending, Signals::NONE);
-        assert_eq!(items[1].pending, Signals::NONE);
-    }
-
-    #[test]
-    fn cookies() {
-        let event = Event::create().unwrap();
-        let scope = Event::create().unwrap();
-
-        // Getting a cookie when none has been set should fail.
-        assert_eq!(event.get_cookie(&scope.as_handle_ref()), Err(Status::ACCESS_DENIED));
-
-        // Set a cookie.
-        assert_eq!(event.set_cookie(&scope.as_handle_ref(), 42), Ok(()));
-
-        // Should get it back....
-        assert_eq!(event.get_cookie(&scope.as_handle_ref()), Ok(42));
-
-        // but not with the wrong scope!
-        assert_eq!(event.get_cookie(&event.as_handle_ref()), Err(Status::ACCESS_DENIED));
-
-        // Can change it, with the same scope...
-        assert_eq!(event.set_cookie(&scope.as_handle_ref(), 123), Ok(()));
-
-        // but not with a different scope.
-        assert_eq!(event.set_cookie(&event.as_handle_ref(), 123), Err(Status::ACCESS_DENIED));
-    }
-}
-
-pub fn usize_into_u32(n: usize) -> Result<u32, ()> {
-    if n > ::std::u32::MAX as usize || n < ::std::u32::MIN as usize {
-        return Err(())
-    }
-    Ok(n as u32)
-}
-
-pub fn size_to_u32_sat(n: usize) -> u32 {
-    if n > ::std::u32::MAX as usize {
-        return ::std::u32::MAX;
-    }
-    if n < ::std::u32::MIN as usize {
-        return ::std::u32::MIN;
-    }
-    n as u32
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/port.rs cargo-0.33.0/vendor/fuchsia-zircon/src/port.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/port.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/port.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,344 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon port objects.
-
-use std::mem;
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Signals, Status, Time};
-use {sys, ok};
-
-/// An object representing a Zircon
-/// [port](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/port.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Port(Handle);
-impl_handle_based!(Port);
-
-/// A packet sent through a port. This is a type-safe wrapper for
-/// [zx_port_packet_t](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md).
-#[derive(PartialEq, Eq, Debug)]
-pub struct Packet(sys::zx_port_packet_t);
-
-/// The contents of a `Packet`.
-#[derive(Debug, Copy, Clone)]
-pub enum PacketContents {
-    /// A user-generated packet.
-    User(UserPacket),
-    /// A one-shot signal packet generated via `object_wait_async`.
-    SignalOne(SignalPacket),
-    /// A repeating signal packet generated via `object_wait_async`.
-    SignalRep(SignalPacket),
-
-    #[doc(hidden)]
-    __Nonexhaustive
-}
-
-/// Contents of a user packet (one sent by `port_queue`). This is a type-safe wrapper for
-/// [zx_packet_user_t](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md).
-#[derive(Debug, Copy, Clone)]
-pub struct UserPacket(sys::zx_packet_user_t);
-
-/// Contents of a signal packet (one generated by the kernel). This is a type-safe wrapper for
-/// [zx_packet_signal_t](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md).
-#[derive(Debug, Copy, Clone)]
-pub struct SignalPacket(sys::zx_packet_signal_t);
-
-impl Packet {
-    /// Creates a new packet with `UserPacket` data.
-    pub fn from_user_packet(key: u64, status: i32, user: UserPacket) -> Packet {
-        Packet(
-            sys::zx_port_packet_t {
-                key: key,
-                packet_type: sys::zx_packet_type_t::ZX_PKT_TYPE_USER,
-                status: status,
-                union: user.0,
-            }
-        )
-    }
-
-    /// The packet's key.
-    pub fn key(&self) -> u64 {
-        self.0.key
-    }
-
-    /// The packet's status.
-    // TODO: should this type be wrapped?
-    pub fn status(&self) -> i32 {
-        self.0.status
-    }
-
-    /// The contents of the packet.
-    pub fn contents(&self) -> PacketContents {
-        if self.0.packet_type == sys::zx_packet_type_t::ZX_PKT_TYPE_USER {
-            PacketContents::User(UserPacket(self.0.union))
-        } else if self.0.packet_type == sys::zx_packet_type_t::ZX_PKT_TYPE_SIGNAL_ONE {
-            PacketContents::SignalOne(SignalPacket(unsafe { mem::transmute_copy(&self.0.union) }))
-        } else if self.0.packet_type == sys::zx_packet_type_t::ZX_PKT_TYPE_SIGNAL_REP {
-            PacketContents::SignalRep(SignalPacket(unsafe { mem::transmute_copy(&self.0.union) }))
-        } else {
-            panic!("unexpected packet type");
-        }
-    }
-}
-
-impl UserPacket {
-    pub fn from_u8_array(val: [u8; 32]) -> UserPacket {
-        UserPacket(val)
-    }
-
-    pub fn as_u8_array(&self) -> &[u8; 32] {
-        &self.0
-    }
-
-    pub fn as_mut_u8_array(&mut self) -> &mut [u8; 32] {
-        &mut self.0
-    }
-}
-
-impl SignalPacket {
-    /// The signals used in the call to `object_wait_async`.
-    pub fn trigger(&self) -> Signals {
-        Signals::from_bits_truncate(self.0.trigger)
-    }
-
-    /// The observed signals.
-    pub fn observed(&self) -> Signals {
-        Signals::from_bits_truncate(self.0.observed)
-    }
-
-    /// A per object count of pending operations.
-    pub fn count(&self) -> u64 {
-        self.0.count
-    }
-}
-
-impl Port {
-    /// Create an IO port, allowing IO packets to be read and enqueued.
-    ///
-    /// Wraps the
-    /// [zx_port_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_create.md)
-    /// syscall.
-    pub fn create() -> Result<Port, Status> {
-        unsafe {
-            let mut handle = 0;
-            let opts = 0;
-            let status = sys::zx_port_create(opts, &mut handle);
-            ok(status)?;
-            Ok(Handle::from_raw(handle).into())
-        }
-    }
-
-    /// Attempt to queue a user packet to the IO port.
-    ///
-    /// Wraps the
-    /// [zx_port_queue](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_queue.md)
-    /// syscall.
-    pub fn queue(&self, packet: &Packet) -> Result<(), Status> {
-        let status = unsafe {
-            sys::zx_port_queue(self.raw_handle(),
-                &packet.0 as *const sys::zx_port_packet_t, 0)
-        };
-        ok(status)
-    }
-
-    /// Wait for a packet to arrive on a (V2) port.
-    ///
-    /// Wraps the
-    /// [zx_port_wait](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/port_wait.md)
-    /// syscall.
-    pub fn wait(&self, deadline: Time) -> Result<Packet, Status> {
-        let mut packet = Default::default();
-        let status = unsafe {
-            sys::zx_port_wait(self.raw_handle(), deadline.nanos(),
-                &mut packet as *mut sys::zx_port_packet_t, 0)
-        };
-        ok(status)?;
-        Ok(Packet(packet))
-    }
-
-    /// Cancel pending wait_async calls for an object with the given key.
-    ///
-    /// Wraps the
-    /// [zx_port_cancel](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/port_cancel.md)
-    /// syscall.
-    pub fn cancel<H>(&self, source: &H, key: u64) -> Result<(), Status> where H: HandleBased {
-        let status = unsafe {
-            sys::zx_port_cancel(self.raw_handle(), source.raw_handle(), key)
-        };
-        ok(status)
-    }
-}
-
-/// Options for wait_async.
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum WaitAsyncOpts {
-    Once = sys::ZX_WAIT_ASYNC_ONCE,
-    Repeating = sys::ZX_WAIT_ASYNC_REPEATING,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use {DurationNum, Event};
-
-    #[test]
-    fn port_basic() {
-        let ten_ms = 10.millis();
-
-        let port = Port::create().unwrap();
-
-        // Waiting now should time out.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // Send a valid packet.
-        let packet = Packet::from_user_packet(
-            42,
-            123,
-            UserPacket::from_u8_array([13; 32]),
-        );
-        assert!(port.queue(&packet).is_ok());
-
-        // Waiting should succeed this time. We should get back the packet we sent.
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet, packet);
-    }
-
-    #[test]
-    fn wait_async_once() {
-        let ten_ms = 10.millis();
-        let key = 42;
-
-        let port = Port::create().unwrap();
-        let event = Event::create().unwrap();
-
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0 | Signals::USER_1,
-            WaitAsyncOpts::Once).is_ok());
-
-        // Waiting without setting any signal should time out.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalOne(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0 | Signals::USER_1);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Shouldn't get any more packets.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // Calling wait_async again should result in another packet.
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0, WaitAsyncOpts::Once).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalOne(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Calling wait_async_handle then cancel, we should not get a packet as cancel will
-        // remove it from  the queue.
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0, WaitAsyncOpts::Once).is_ok());
-        assert!(port.cancel(&event, key).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If the event is signalled after the cancel, we also shouldn't get a packet.
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());  // clear signal
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0, WaitAsyncOpts::Once).is_ok());
-        assert!(port.cancel(&event, key).is_ok());
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-
-    #[test]
-    fn wait_async_repeating() {
-        let ten_ms = 10.millis();
-        let key = 42;
-
-        let port = Port::create().unwrap();
-        let event = Event::create().unwrap();
-
-        assert!(event.wait_async_handle(&port, key, Signals::USER_0 | Signals::USER_1,
-            WaitAsyncOpts::Repeating).is_ok());
-
-        // Waiting without setting any signal should time out.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we set a signal, we should be able to wait for it.
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalRep(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0 | Signals::USER_1);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Should not get any more packets, as ZX_WAIT_ASYNC_REPEATING is edge triggered rather than
-        // level triggered.
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // If we clear and resignal, we should get the same packet again,
-        // even though we didn't call event.wait_async again.
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());  // clear signal
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalRep(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0 | Signals::USER_1);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Cancelling the wait should stop us getting packets...
-        assert!(port.cancel(&event, key).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-        // ... even if we clear and resignal
-        assert!(event.signal_handle(Signals::USER_0, Signals::NONE).is_ok());  // clear signal
-        assert!(event.signal_handle(Signals::NONE, Signals::USER_0).is_ok());
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-
-        // Calling wait_async again should result in another packet.
-        assert!(event.wait_async_handle(
-            &port, key, Signals::USER_0, WaitAsyncOpts::Repeating).is_ok());
-        let read_packet = port.wait(ten_ms.after_now()).unwrap();
-        assert_eq!(read_packet.key(), key);
-        assert_eq!(read_packet.status(), 0);
-        match read_packet.contents() {
-            PacketContents::SignalRep(sig) => {
-                assert_eq!(sig.trigger(), Signals::USER_0);
-                assert_eq!(sig.observed(), Signals::USER_0);
-                assert_eq!(sig.count(), 1);
-            }
-            _ => panic!("wrong packet type"),
-        }
-
-        // Closing the handle should stop us getting packets.
-        drop(event);
-        assert_eq!(port.wait(ten_ms.after_now()), Err(Status::TIMED_OUT));
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/process.rs cargo-0.33.0/vendor/fuchsia-zircon/src/process.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/process.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/process.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon process.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef};
-
-/// An object representing a Zircon process.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Process(Handle);
-impl_handle_based!(Process);
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/rights.rs cargo-0.33.0/vendor/fuchsia-zircon/src/rights.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/rights.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/rights.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-use sys;
-
-bitflags! {
-    /// Rights associated with a handle.
-    ///
-    /// See [rights.md](https://fuchsia.googlesource.com/zircon/+/master/docs/rights.md)
-    /// for more information.
-    #[repr(C)]
-    pub struct Rights: sys::zx_rights_t {
-        const NONE         = sys::ZX_RIGHT_NONE;
-        const DUPLICATE    = sys::ZX_RIGHT_DUPLICATE;
-        const TRANSFER     = sys::ZX_RIGHT_TRANSFER;
-        const READ         = sys::ZX_RIGHT_READ;
-        const WRITE        = sys::ZX_RIGHT_WRITE;
-        const EXECUTE      = sys::ZX_RIGHT_EXECUTE;
-        const MAP          = sys::ZX_RIGHT_MAP;
-        const GET_PROPERTY = sys::ZX_RIGHT_GET_PROPERTY;
-        const SET_PROPERTY = sys::ZX_RIGHT_SET_PROPERTY;
-        const ENUMERATE    = sys::ZX_RIGHT_ENUMERATE;
-        const DESTROY      = sys::ZX_RIGHT_DESTROY;
-        const SET_POLICY   = sys::ZX_RIGHT_SET_POLICY;
-        const GET_POLICY   = sys::ZX_RIGHT_GET_POLICY;
-        const SIGNAL       = sys::ZX_RIGHT_SIGNAL;
-        const SIGNAL_PEER  = sys::ZX_RIGHT_SIGNAL_PEER;
-        const WAIT         = sys::ZX_RIGHT_WAIT;
-        const SAME_RIGHTS  = sys::ZX_RIGHT_SAME_RIGHTS;
-    }
-}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/signals.rs cargo-0.33.0/vendor/fuchsia-zircon/src/signals.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/signals.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/signals.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-use sys::*;
-
-bitflags! {
-    /// Signals that can be waited upon.
-    ///
-    /// See
-    /// [Objects and signals](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Objects-and-Signals)
-    /// in the Zircon kernel documentation. Note: the names of signals are still in flux.
-    #[repr(C)]
-    pub struct Signals: zx_signals_t {
-        const NONE          = ZX_SIGNAL_NONE;
-        const OBJECT_ALL    = ZX_OBJECT_SIGNAL_ALL;
-        const USER_ALL      = ZX_USER_SIGNAL_ALL;
-        const OBJECT_0      = ZX_OBJECT_SIGNAL_0;
-        const OBJECT_1      = ZX_OBJECT_SIGNAL_1;
-        const OBJECT_2      = ZX_OBJECT_SIGNAL_2;
-        const OBJECT_3      = ZX_OBJECT_SIGNAL_3;
-        const OBJECT_4      = ZX_OBJECT_SIGNAL_4;
-        const OBJECT_5      = ZX_OBJECT_SIGNAL_5;
-        const OBJECT_6      = ZX_OBJECT_SIGNAL_6;
-        const OBJECT_7      = ZX_OBJECT_SIGNAL_7;
-        const OBJECT_8      = ZX_OBJECT_SIGNAL_8;
-        const OBJECT_9      = ZX_OBJECT_SIGNAL_9;
-        const OBJECT_10     = ZX_OBJECT_SIGNAL_10;
-        const OBJECT_11     = ZX_OBJECT_SIGNAL_11;
-        const OBJECT_12     = ZX_OBJECT_SIGNAL_12;
-        const OBJECT_13     = ZX_OBJECT_SIGNAL_13;
-        const OBJECT_14     = ZX_OBJECT_SIGNAL_14;
-        const OBJECT_15     = ZX_OBJECT_SIGNAL_15;
-        const OBJECT_16     = ZX_OBJECT_SIGNAL_16;
-        const OBJECT_17     = ZX_OBJECT_SIGNAL_17;
-        const OBJECT_18     = ZX_OBJECT_SIGNAL_18;
-        const OBJECT_19     = ZX_OBJECT_SIGNAL_19;
-        const OBJECT_20     = ZX_OBJECT_SIGNAL_20;
-        const OBJECT_21     = ZX_OBJECT_SIGNAL_21;
-        const OBJECT_22     = ZX_OBJECT_SIGNAL_22;
-        const OBJECT_HANDLE_CLOSED = ZX_OBJECT_HANDLE_CLOSED;
-        const USER_0        = ZX_USER_SIGNAL_0;
-        const USER_1        = ZX_USER_SIGNAL_1;
-        const USER_2        = ZX_USER_SIGNAL_2;
-        const USER_3        = ZX_USER_SIGNAL_3;
-        const USER_4        = ZX_USER_SIGNAL_4;
-        const USER_5        = ZX_USER_SIGNAL_5;
-        const USER_6        = ZX_USER_SIGNAL_6;
-        const USER_7        = ZX_USER_SIGNAL_7;
-
-        const OBJECT_READABLE    = ZX_OBJECT_READABLE;
-        const OBJECT_WRITABLE    = ZX_OBJECT_WRITABLE;
-        const OBJECT_PEER_CLOSED = ZX_OBJECT_PEER_CLOSED;
-
-        // Cancelation (handle was closed while waiting with it)
-        const HANDLE_CLOSED = ZX_SIGNAL_HANDLE_CLOSED;
-
-        // Event
-        const EVENT_SIGNALED = ZX_EVENT_SIGNALED;
-
-        // EventPair
-        const EVENT_PAIR_SIGNALED = ZX_EPAIR_SIGNALED;
-        const EVENT_PAIR_CLOSED   = ZX_EPAIR_CLOSED;
-
-        // Task signals (process, thread, job)
-        const TASK_TERMINATED = ZX_TASK_TERMINATED;
-
-        // Channel
-        const CHANNEL_READABLE    = ZX_CHANNEL_READABLE;
-        const CHANNEL_WRITABLE    = ZX_CHANNEL_WRITABLE;
-        const CHANNEL_PEER_CLOSED = ZX_CHANNEL_PEER_CLOSED;
-
-        // Socket
-        const SOCKET_READABLE    = ZX_SOCKET_READABLE;
-        const SOCKET_WRITABLE    = ZX_SOCKET_WRITABLE;
-        const SOCKET_PEER_CLOSED = ZX_SOCKET_PEER_CLOSED;
-
-        // Port
-        const PORT_READABLE = ZX_PORT_READABLE;
-
-        // Resource
-        const RESOURCE_DESTROYED   = ZX_RESOURCE_DESTROYED;
-        const RESOURCE_READABLE    = ZX_RESOURCE_READABLE;
-        const RESOURCE_WRITABLE    = ZX_RESOURCE_WRITABLE;
-        const RESOURCE_CHILD_ADDED = ZX_RESOURCE_CHILD_ADDED;
-
-        // Fifo
-        const FIFO_READABLE    = ZX_FIFO_READABLE;
-        const FIFO_WRITABLE    = ZX_FIFO_WRITABLE;
-        const FIFO_PEER_CLOSED = ZX_FIFO_PEER_CLOSED;
-
-        // Job
-        const JOB_NO_PROCESSES = ZX_JOB_NO_PROCESSES;
-        const JOB_NO_JOBS      = ZX_JOB_NO_JOBS;
-
-        // Process
-        const PROCESS_TERMINATED = ZX_PROCESS_TERMINATED;
-
-        // Thread
-        const THREAD_TERMINATED = ZX_THREAD_TERMINATED;
-
-        // Log
-        const LOG_READABLE = ZX_LOG_READABLE;
-        const LOG_WRITABLE = ZX_LOG_WRITABLE;
-
-        // Timer
-        const TIMER_SIGNALED = ZX_TIMER_SIGNALED;
-    }
-}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/socket.rs cargo-0.33.0/vendor/fuchsia-zircon/src/socket.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/socket.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/socket.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon sockets.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef, Peered};
-use {sys, Status, ok};
-
-use std::ptr;
-
-/// An object representing a Zircon
-/// [socket](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Message-Passing_Sockets-and-Channels).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Socket(Handle);
-impl_handle_based!(Socket);
-impl Peered for Socket {}
-
-impl Socket {
-    /// Create a socket, accessed through a pair of endpoints. Data written
-    /// into one may be read from the other.
-    ///
-    /// Wraps
-    /// [zx_socket_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_create.md).
-    pub fn create() -> Result<(Socket, Socket), Status> {
-        unsafe {
-            let mut out0 = 0;
-            let mut out1 = 0;
-            let opts = 0;
-            let status = sys::zx_socket_create(opts, &mut out0, &mut out1);
-            ok(status)?;
-            Ok((
-                Self::from(Handle::from_raw(out0)),
-                Self::from(Handle::from_raw(out1))
-            ))
-        }
-    }
-
-    /// Write the given bytes into the socket.
-    /// Return value (on success) is number of bytes actually written.
-    ///
-    /// Wraps
-    /// [zx_socket_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_write.md).
-    pub fn write(&self, bytes: &[u8]) -> Result<usize, Status> {
-        let mut actual = 0;
-        let opts = 0;
-        let status = unsafe {
-            sys::zx_socket_write(self.raw_handle(), opts, bytes.as_ptr(), bytes.len(),
-                &mut actual)
-        };
-        ok(status).map(|()| actual)
-    }
-
-    /// Read the given bytes from the socket.
-    /// Return value (on success) is number of bytes actually read.
-    ///
-    /// Wraps
-    /// [zx_socket_read](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_read.md).
-    pub fn read(&self, bytes: &mut [u8]) -> Result<usize, Status> {
-        let mut actual = 0;
-        let opts = 0;
-        let status = unsafe {
-            sys::zx_socket_read(self.raw_handle(), opts, bytes.as_mut_ptr(),
-                bytes.len(), &mut actual)
-        };
-        ok(status)
-            .map(|()| actual)
-            .map_err(|status| {
-                // If an error is returned then actual is undefined, so to be safe
-                // we set it to 0 and ignore any data that is set in bytes.
-                actual = 0;
-                status
-            })
-    }
-
-    /// Close half of the socket, so attempts by the other side to write will fail.
-    ///
-    /// Implements the `ZX_SOCKET_HALF_CLOSE` option of
-    /// [zx_socket_write](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/socket_write.md).
-    pub fn half_close(&self) -> Result<(), Status> {
-        let status = unsafe { sys::zx_socket_write(self.raw_handle(), sys::ZX_SOCKET_HALF_CLOSE,
-            ptr::null(), 0, ptr::null_mut()) };
-        ok(status)
-    }
-
-    pub fn outstanding_read_bytes(&self) -> Result<usize, Status> {
-        let mut outstanding = 0;
-        let status = unsafe {
-            sys::zx_socket_read(self.raw_handle(), 0, ptr::null_mut(), 0, &mut outstanding)
-        };
-        ok(status).map(|()| outstanding)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn socket_basic() {
-        let (s1, s2) = Socket::create().unwrap();
-
-        // Write in one end and read it back out the other.
-        assert_eq!(s1.write(b"hello").unwrap(), 5);
-
-        let mut read_vec = vec![0; 8];
-        assert_eq!(s2.read(&mut read_vec).unwrap(), 5);
-        assert_eq!(&read_vec[0..5], b"hello");
-
-        // Try reading when there is nothing to read.
-        assert_eq!(s2.read(&mut read_vec), Err(Status::SHOULD_WAIT));
-
-        // Close the socket from one end.
-        assert!(s1.half_close().is_ok());
-        assert_eq!(s2.read(&mut read_vec), Err(Status::BAD_STATE));
-        assert_eq!(s1.write(b"fail"), Err(Status::BAD_STATE));
-
-        // Writing in the other direction should still work.
-        assert_eq!(s1.read(&mut read_vec), Err(Status::SHOULD_WAIT));
-        assert_eq!(s2.write(b"back").unwrap(), 4);
-        assert_eq!(s1.read(&mut read_vec).unwrap(), 4);
-        assert_eq!(&read_vec[0..4], b"back");
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/status.rs cargo-0.33.0/vendor/fuchsia-zircon/src/status.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/status.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/status.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-use std::ffi::NulError;
-use std::io;
-use sys;
-
-/// Status type indicating the result of a Fuchsia syscall.
-///
-/// This type is generally used to indicate the reason for an error.
-/// While this type can contain `Status::OK` (`ZX_OK` in C land), elements of this type are
-/// generally constructed using the `ok` method, which checks for `ZX_OK` and returns a
-/// `Result<(), Status>` appropriately.
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
-pub struct Status(sys::zx_status_t);
-impl Status {
-    /// Returns `Ok(())` if the status was `OK`,
-    /// otherwise returns `Err(status)`.
-    pub fn ok(raw: sys::zx_status_t) -> Result<(), Status> {
-        if raw == Status::OK.0 {
-            Ok(())
-        } else {
-            Err(Status(raw))
-        }
-    }
-
-    pub fn from_raw(raw: sys::zx_status_t) -> Self {
-        Status(raw)
-    }
-
-    pub fn into_raw(self) -> sys::zx_status_t {
-        self.0
-    }
-}
-assoc_consts!(Status, [
-    OK                 = sys::ZX_OK;
-    INTERNAL           = sys::ZX_ERR_INTERNAL;
-    NOT_SUPPORTED      = sys::ZX_ERR_NOT_SUPPORTED;
-    NO_RESOURCES       = sys::ZX_ERR_NO_RESOURCES;
-    NO_MEMORY          = sys::ZX_ERR_NO_MEMORY;
-    CALL_FAILED        = sys::ZX_ERR_CALL_FAILED;
-    INTERRUPTED_RETRY  = sys::ZX_ERR_INTERRUPTED_RETRY;
-    INVALID_ARGS       = sys::ZX_ERR_INVALID_ARGS;
-    BAD_HANDLE         = sys::ZX_ERR_BAD_HANDLE;
-    WRONG_TYPE         = sys::ZX_ERR_WRONG_TYPE;
-    BAD_SYSCALL        = sys::ZX_ERR_BAD_SYSCALL;
-    OUT_OF_RANGE       = sys::ZX_ERR_OUT_OF_RANGE;
-    BUFFER_TOO_SMALL   = sys::ZX_ERR_BUFFER_TOO_SMALL;
-    BAD_STATE          = sys::ZX_ERR_BAD_STATE;
-    TIMED_OUT          = sys::ZX_ERR_TIMED_OUT;
-    SHOULD_WAIT        = sys::ZX_ERR_SHOULD_WAIT;
-    CANCELED           = sys::ZX_ERR_CANCELED;
-    PEER_CLOSED        = sys::ZX_ERR_PEER_CLOSED;
-    NOT_FOUND          = sys::ZX_ERR_NOT_FOUND;
-    ALREADY_EXISTS     = sys::ZX_ERR_ALREADY_EXISTS;
-    ALREADY_BOUND      = sys::ZX_ERR_ALREADY_BOUND;
-    UNAVAILABLE        = sys::ZX_ERR_UNAVAILABLE;
-    ACCESS_DENIED      = sys::ZX_ERR_ACCESS_DENIED;
-    IO                 = sys::ZX_ERR_IO;
-    IO_REFUSED         = sys::ZX_ERR_IO_REFUSED;
-    IO_DATA_INTEGRITY  = sys::ZX_ERR_IO_DATA_INTEGRITY;
-    IO_DATA_LOSS       = sys::ZX_ERR_IO_DATA_LOSS;
-    BAD_PATH           = sys::ZX_ERR_BAD_PATH;
-    NOT_DIR            = sys::ZX_ERR_NOT_DIR;
-    NOT_FILE           = sys::ZX_ERR_NOT_FILE;
-    FILE_BIG           = sys::ZX_ERR_FILE_BIG;
-    NO_SPACE           = sys::ZX_ERR_NO_SPACE;
-    STOP               = sys::ZX_ERR_STOP;
-    NEXT               = sys::ZX_ERR_NEXT;
-]);
-
-impl Status {
-    pub fn into_io_error(self) -> io::Error {
-        self.into()
-    }
-}
-
-impl From<io::ErrorKind> for Status {
-    fn from(kind: io::ErrorKind) -> Self {
-        use std::io::ErrorKind::*;
-        match kind {
-            NotFound => Status::NOT_FOUND,
-            PermissionDenied => Status::ACCESS_DENIED,
-            ConnectionRefused => Status::IO_REFUSED,
-            ConnectionAborted => Status::PEER_CLOSED,
-            AddrInUse => Status::ALREADY_BOUND,
-            AddrNotAvailable => Status::UNAVAILABLE,
-            BrokenPipe => Status::PEER_CLOSED,
-            AlreadyExists => Status::ALREADY_EXISTS,
-            WouldBlock => Status::SHOULD_WAIT,
-            InvalidInput => Status::INVALID_ARGS,
-            TimedOut => Status::TIMED_OUT,
-            Interrupted => Status::INTERRUPTED_RETRY,
-            UnexpectedEof |
-            WriteZero |
-            ConnectionReset |
-            NotConnected |
-            Other | _ => Status::IO,
-        }
-    }
-}
-
-impl From<Status> for io::ErrorKind {
-    fn from(status: Status) -> io::ErrorKind {
-        use std::io::ErrorKind::*;
-        match status {
-            Status::INTERRUPTED_RETRY => Interrupted,
-            Status::BAD_HANDLE => BrokenPipe,
-            Status::TIMED_OUT => TimedOut,
-            Status::SHOULD_WAIT => WouldBlock,
-            Status::PEER_CLOSED => ConnectionAborted,
-            Status::NOT_FOUND => NotFound,
-            Status::ALREADY_EXISTS => AlreadyExists,
-            Status::ALREADY_BOUND => AlreadyExists,
-            Status::UNAVAILABLE => AddrNotAvailable,
-            Status::ACCESS_DENIED => PermissionDenied,
-            Status::IO_REFUSED => ConnectionRefused,
-            Status::IO_DATA_INTEGRITY => InvalidData,
-
-            Status::BAD_PATH |
-            Status::INVALID_ARGS |
-            Status::OUT_OF_RANGE |
-            Status::WRONG_TYPE => InvalidInput,
-
-            Status::OK |
-            Status::NEXT |
-            Status::STOP |
-            Status::NO_SPACE |
-            Status::FILE_BIG |
-            Status::NOT_FILE |
-            Status::NOT_DIR |
-            Status::IO_DATA_LOSS |
-            Status::IO |
-            Status::CANCELED |
-            Status::BAD_STATE |
-            Status::BUFFER_TOO_SMALL |
-            Status::BAD_SYSCALL |
-            Status::INTERNAL |
-            Status::NOT_SUPPORTED |
-            Status::NO_RESOURCES |
-            Status::NO_MEMORY |
-            Status::CALL_FAILED |
-            _ => Other,
-        }
-    }
-}
-
-impl From<io::Error> for Status {
-    fn from(err: io::Error) -> Status {
-        err.kind().into()
-    }
-}
-
-impl From<Status> for io::Error {
-    fn from(status: Status) -> io::Error {
-        io::Error::from(io::ErrorKind::from(status))
-    }
-}
-
-impl From<NulError> for Status {
-    fn from(_error: NulError) -> Status {
-        Status::INVALID_ARGS
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/thread.rs cargo-0.33.0/vendor/fuchsia-zircon/src/thread.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/thread.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/thread.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon thread.
-
-use {AsHandleRef, HandleBased, Handle, HandleRef};
-
-/// An object representing a Zircon thread.
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Thread(Handle);
-impl_handle_based!(Thread);
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/time.rs cargo-0.33.0/vendor/fuchsia-zircon/src/time.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/time.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/time.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon timer objects.
-
-use {AsHandleRef, ClockId, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-use std::ops;
-use std::time as stdtime;
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct Duration(sys::zx_duration_t);
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct Time(sys::zx_time_t);
-
-impl From<stdtime::Duration> for Duration {
-    fn from(dur: stdtime::Duration) -> Self {
-        Duration::from_seconds(dur.as_secs()) +
-        Duration::from_nanos(dur.subsec_nanos() as u64)
-    }
-}
-
-impl From<Duration> for stdtime::Duration {
-    fn from(dur: Duration) -> Self {
-        let secs = dur.seconds();
-        let nanos = (dur.nanos() - (secs * 1_000_000_000)) as u32;
-        stdtime::Duration::new(secs, nanos)
-    }
-}
-
-impl ops::Add<Duration> for Time {
-    type Output = Time;
-    fn add(self, dur: Duration) -> Time {
-        Time::from_nanos(dur.nanos() + self.nanos())
-    }
-}
-
-impl ops::Add<Time> for Duration {
-    type Output = Time;
-    fn add(self, time: Time) -> Time {
-        Time::from_nanos(self.nanos() + time.nanos())
-    }
-}
-
-impl ops::Add for Duration {
-    type Output = Duration;
-    fn add(self, dur: Duration) -> Duration {
-        Duration::from_nanos(self.nanos() + dur.nanos())
-    }
-}
-
-impl ops::Sub for Duration {
-    type Output = Duration;
-    fn sub(self, dur: Duration) -> Duration {
-        Duration::from_nanos(self.nanos() - dur.nanos())
-    }
-}
-
-impl ops::Sub<Duration> for Time {
-    type Output = Time;
-    fn sub(self, dur: Duration) -> Time {
-        Time::from_nanos(self.nanos() - dur.nanos())
-    }
-}
-
-impl ops::AddAssign for Duration {
-    fn add_assign(&mut self, dur: Duration) {
-        self.0 += dur.nanos()
-    }
-}
-
-impl ops::SubAssign for Duration {
-    fn sub_assign(&mut self, dur: Duration) {
-        self.0 -= dur.nanos()
-    }
-}
-
-impl ops::AddAssign<Duration> for Time {
-    fn add_assign(&mut self, dur: Duration) {
-        self.0 += dur.nanos()
-    }
-}
-
-impl ops::SubAssign<Duration> for Time {
-    fn sub_assign(&mut self, dur: Duration) {
-        self.0 -= dur.nanos()
-    }
-}
-
-impl<T> ops::Mul<T> for Duration
-    where T: Into<u64>
-{
-    type Output = Self;
-    fn mul(self, mul: T) -> Self {
-        Duration::from_nanos(self.0 * mul.into())
-    }
-}
-
-impl<T> ops::Div<T> for Duration
-    where T: Into<u64>
-{
-    type Output = Self;
-    fn div(self, div: T) -> Self {
-        Duration::from_nanos(self.0 / div.into())
-    }
-}
-
-impl Duration {
-    /// Sleep for the given amount of time.
-    pub fn sleep(self) {
-        Time::after(self).sleep()
-    }
-
-    pub fn nanos(self) -> u64 {
-        self.0
-    }
-
-    pub fn millis(self) -> u64 {
-        self.0 / 1_000_000
-    }
-
-    pub fn seconds(self) -> u64 {
-        self.millis() / 1_000
-    }
-
-    pub fn minutes(self) -> u64 {
-        self.seconds() / 60
-    }
-
-    pub fn hours(self) -> u64 {
-        self.minutes() / 60
-    }
-
-    pub fn from_nanos(nanos: u64) -> Self {
-        Duration(nanos)
-    }
-
-    pub fn from_millis(millis: u64) -> Self {
-        Duration(millis * 1_000_000)
-    }
-
-    pub fn from_seconds(secs: u64) -> Self {
-        Duration::from_millis(secs * 1_000)
-    }
-
-    pub fn from_minutes(min: u64) -> Self {
-        Duration::from_seconds(min * 60)
-    }
-
-    pub fn from_hours(hours: u64) -> Self {
-        Duration::from_minutes(hours * 60)
-    }
-
-    /// Returns a `Time` which is a `Duration` after the current time.
-    /// `duration.after_now()` is equivalent to `Time::after(duration)`.
-    pub fn after_now(self) -> Time {
-        Time::after(self)
-    }
-}
-
-pub trait DurationNum: Sized {
-    fn nanos(self) -> Duration;
-    fn millis(self) -> Duration;
-    fn seconds(self) -> Duration;
-    fn minutes(self) -> Duration;
-    fn hours(self) -> Duration;
-
-    // Singular versions to allow for `1.milli()` and `1.second()`, etc.
-    fn milli(self) -> Duration { self.millis() }
-    fn second(self) -> Duration { self.seconds() }
-    fn minute(self) -> Duration { self.minutes() }
-    fn hour(self) -> Duration { self.hours() }
-}
-
-// Note: this could be implemented for other unsized integer types, but it doesn't seem
-// necessary to support the usual case.
-impl DurationNum for u64 {
-    fn nanos(self) -> Duration {
-        Duration::from_nanos(self)
-    }
-
-    fn millis(self) -> Duration {
-        Duration::from_millis(self)
-    }
-
-    fn seconds(self) -> Duration {
-        Duration::from_seconds(self)
-    }
-
-    fn minutes(self) -> Duration {
-        Duration::from_minutes(self)
-    }
-
-    fn hours(self) -> Duration {
-        Duration::from_hours(self)
-    }
-}
-
-impl Time {
-    pub const INFINITE: Time = Time(sys::ZX_TIME_INFINITE);
-
-    /// Get the current time, from the specific clock id.
-    ///
-    /// Wraps the
-    /// [zx_time_get](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/time_get.md)
-    /// syscall.
-    pub fn get(clock_id: ClockId) -> Time {
-        unsafe { Time(sys::zx_time_get(clock_id as u32)) }
-    }
-
-    /// Compute a deadline for the time in the future that is the given `Duration` away.
-    ///
-    /// Wraps the
-    /// [zx_deadline_after](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/deadline_after.md)
-    /// syscall.
-    pub fn after(duration: Duration) -> Time {
-        unsafe { Time(sys::zx_deadline_after(duration.0)) }
-    }
-
-    /// Sleep until the given time.
-    ///
-    /// Wraps the
-    /// [zx_nanosleep](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/nanosleep.md)
-    /// syscall.
-    pub fn sleep(self) {
-        unsafe { sys::zx_nanosleep(self.0); }
-    }
-
-    pub fn nanos(self) -> u64 {
-        self.0
-    }
-
-    pub fn from_nanos(nanos: u64) -> Self {
-        Time(nanos)
-    }
-}
-
-/// Read the number of high-precision timer ticks since boot. These ticks may be processor cycles,
-/// high speed timer, profiling timer, etc. They are not guaranteed to continue advancing when the
-/// system is asleep.
-///
-/// Wraps the
-/// [zx_ticks_get](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/ticks_get.md)
-/// syscall.
-pub fn ticks_get() -> u64 {
-    unsafe { sys::zx_ticks_get() }
-}
-
-/// Return the number of high-precision timer ticks in a second.
-///
-/// Wraps the
-/// [zx_ticks_per_second](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/ticks_per_second.md)
-/// syscall.
-pub fn ticks_per_second() -> u64 {
-    unsafe { sys::zx_ticks_per_second() }
-}
-
-/// An object representing a Zircon timer, such as the one returned by
-/// [zx_timer_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_create.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Timer(Handle);
-impl_handle_based!(Timer);
-
-impl Timer {
-    /// Create a timer, an object that can signal when a specified point in time has been reached.
-    /// Wraps the
-    /// [zx_timer_create](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_create.md)
-    /// syscall.
-    pub fn create(clock_id: ClockId) -> Result<Timer, Status> {
-        let mut out = 0;
-        let opts = 0;
-        let status = unsafe { sys::zx_timer_create(opts, clock_id as u32, &mut out) };
-        ok(status)?;
-        unsafe {
-            Ok(Self::from(Handle::from_raw(out)))
-        }
-    }
-
-    /// Start a one-shot timer that will fire when `deadline` passes. Wraps the
-    /// [zx_timer_set](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_set.md)
-    /// syscall.
-    pub fn set(&self, deadline: Time, slack: Duration) -> Result<(), Status> {
-        let status = unsafe {
-            sys::zx_timer_set(self.raw_handle(), deadline.nanos(), slack.nanos())
-        };
-        ok(status)
-    }
-
-    /// Cancels a pending timer that was started with start(). Wraps the
-    /// [zx_timer_cancel](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/timer_cancel.md)
-    /// syscall.
-    pub fn cancel(&self) -> Result<(), Status> {
-        let status = unsafe { sys::zx_timer_cancel(self.raw_handle()) };
-        ok(status)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use Signals;
-
-    #[test]
-    fn create_timer_invalid_clock() {
-        assert_eq!(Timer::create(ClockId::UTC).unwrap_err(), Status::INVALID_ARGS);
-        assert_eq!(Timer::create(ClockId::Thread), Err(Status::INVALID_ARGS));
-    }
-
-    #[test]
-    fn into_from_std() {
-        let std_dur = stdtime::Duration::new(25, 25);
-        assert_eq!(std_dur, stdtime::Duration::from(Duration::from(std_dur)));
-    }
-
-    #[test]
-    fn timer_basic() {
-        let slack = 0.millis();
-        let ten_ms = 10.millis();
-        let five_secs = 5.seconds();
-        let six_secs = 6.seconds();
-
-        // Create a timer
-        let timer = Timer::create(ClockId::Monotonic).unwrap();
-
-        // Should not signal yet.
-        assert_eq!(
-            timer.wait_handle(Signals::TIMER_SIGNALED, ten_ms.after_now()),
-            Err(Status::TIMED_OUT));
-
-        // Set it, and soon it should signal.
-        assert_eq!(timer.set(five_secs.after_now(), slack), Ok(()));
-        assert_eq!(
-            timer.wait_handle(Signals::TIMER_SIGNALED, six_secs.after_now()),
-            Ok(Signals::TIMER_SIGNALED));
-
-        // Cancel it, and it should stop signalling.
-        assert_eq!(timer.cancel(), Ok(()));
-        assert_eq!(
-            timer.wait_handle(Signals::TIMER_SIGNALED, ten_ms.after_now()),
-            Err(Status::TIMED_OUT));
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/vmar.rs cargo-0.33.0/vendor/fuchsia-zircon/src/vmar.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/vmar.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/vmar.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-use sys;
-
-bitflags! {
-    /// Flags to VMAR routines
-    #[repr(C)]
-    pub struct VmarFlags: u32 {
-        const PERM_READ          = sys::ZX_VM_FLAG_PERM_READ;
-        const PERM_WRITE         = sys::ZX_VM_FLAG_PERM_WRITE;
-        const PERM_EXECUTE       = sys::ZX_VM_FLAG_PERM_EXECUTE;
-        const COMPACT            = sys::ZX_VM_FLAG_COMPACT;
-        const SPECIFIC           = sys::ZX_VM_FLAG_SPECIFIC;
-        const SPECIFIC_OVERWRITE = sys::ZX_VM_FLAG_SPECIFIC_OVERWRITE;
-        const CAN_MAP_SPECIFIC   = sys::ZX_VM_FLAG_CAN_MAP_SPECIFIC;
-        const CAN_MAP_READ       = sys::ZX_VM_FLAG_CAN_MAP_READ;
-        const CAN_MAP_WRITE      = sys::ZX_VM_FLAG_CAN_MAP_WRITE;
-        const CAN_MAP_EXECUTE    = sys::ZX_VM_FLAG_CAN_MAP_EXECUTE;
-    }
-}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/src/vmo.rs cargo-0.33.0/vendor/fuchsia-zircon/src/vmo.rs
--- cargo-0.32.0/vendor/fuchsia-zircon/src/vmo.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/src/vmo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,256 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//! Type-safe bindings for Zircon vmo objects.
-
-use {AsHandleRef, Cookied, HandleBased, Handle, HandleRef, Status};
-use {sys, ok};
-use std::{mem, ptr};
-
-/// An object representing a Zircon
-/// [virtual memory object](https://fuchsia.googlesource.com/zircon/+/master/docs/objects/vm_object.md).
-///
-/// As essentially a subtype of `Handle`, it can be freely interconverted.
-#[derive(Debug, Eq, PartialEq)]
-pub struct Vmo(Handle);
-impl_handle_based!(Vmo);
-impl Cookied for Vmo {}
-
-impl Vmo {
-    /// Create a virtual memory object.
-    ///
-    /// Wraps the
-    /// `zx_vmo_create`
-    /// syscall. See the
-    /// [Shared Memory: Virtual Memory Objects (VMOs)](https://fuchsia.googlesource.com/zircon/+/master/docs/concepts.md#Shared-Memory_Virtual-Memory-Objects-VMOs)
-    /// for more information.
-    pub fn create(size: u64) -> Result<Vmo, Status> {
-        let mut handle = 0;
-        let opts = 0;
-        let status = unsafe { sys::zx_vmo_create(size, opts, &mut handle) };
-        ok(status)?;
-        unsafe {
-            Ok(Vmo::from(Handle::from_raw(handle)))
-        }
-    }
-
-    /// Read from a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_read` syscall.
-    pub fn read(&self, data: &mut [u8], offset: u64) -> Result<usize, Status> {
-        unsafe {
-            let mut actual = 0;
-            let status = sys::zx_vmo_read(self.raw_handle(), data.as_mut_ptr(),
-                offset, data.len(), &mut actual);
-            ok(status).map(|()| actual)
-        }
-    }
-
-    /// Write to a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_write` syscall.
-    pub fn write(&self, data: &[u8], offset: u64) -> Result<usize, Status> {
-        unsafe {
-            let mut actual = 0;
-            let status = sys::zx_vmo_write(self.raw_handle(), data.as_ptr(),
-                offset, data.len(), &mut actual);
-            ok(status).map(|()| actual)
-        }
-    }
-
-    /// Get the size of a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_get_size` syscall.
-    pub fn get_size(&self) -> Result<u64, Status> {
-        let mut size = 0;
-        let status = unsafe { sys::zx_vmo_get_size(self.raw_handle(), &mut size) };
-        ok(status).map(|()| size)
-    }
-
-    /// Attempt to change the size of a virtual memory object.
-    ///
-    /// Wraps the `zx_vmo_set_size` syscall.
-    pub fn set_size(&self, size: u64) -> Result<(), Status> {
-        let status = unsafe { sys::zx_vmo_set_size(self.raw_handle(), size) };
-        ok(status)
-    }
-
-    /// Perform an operation on a range of a virtual memory object.
-    ///
-    /// Wraps the
-    /// [zx_vmo_op_range](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/vmo_op_range.md)
-    /// syscall.
-    pub fn op_range(&self, op: VmoOp, offset: u64, size: u64) -> Result<(), Status> {
-        let status = unsafe {
-            sys::zx_vmo_op_range(self.raw_handle(), op.into_raw(), offset, size, ptr::null_mut(), 0)
-        };
-        ok(status)
-    }
-
-    /// Look up a list of physical addresses corresponding to the pages held by the VMO from
-    /// `offset` to `offset`+`size`, and store them in `buffer`.
-    ///
-    /// Wraps the
-    /// [zx_vmo_op_range](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/vmo_op_range.md)
-    /// syscall with ZX_VMO_OP_LOOKUP.
-    pub fn lookup(&self, offset: u64, size: u64, buffer: &mut [sys::zx_paddr_t])
-        -> Result<(), Status>
-    {
-        let status = unsafe {
-            sys::zx_vmo_op_range(self.raw_handle(), VmoOp::LOOKUP.into_raw(), offset, size,
-                buffer.as_mut_ptr() as *mut u8, buffer.len() * mem::size_of::<sys::zx_paddr_t>())
-        };
-        ok(status)
-    }
-
-    /// Create a new virtual memory object that clones a range of this one.
-    ///
-    /// Wraps the
-    /// [zx_vmo_clone](https://fuchsia.googlesource.com/zircon/+/master/docs/syscalls/vmo_clone.md)
-    /// syscall.
-    pub fn clone(&self, offset: u64, size: u64) -> Result<Vmo, Status> {
-        let mut out = 0;
-        let opts = sys::ZX_VMO_CLONE_COPY_ON_WRITE;
-        let status = unsafe {
-            sys::zx_vmo_clone(self.raw_handle(), opts, offset, size, &mut out)
-        };
-        ok(status)?;
-        unsafe { Ok(Vmo::from(Handle::from_raw(out))) }
-    }
-}
-
-/// VM Object opcodes
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct VmoOp(u32);
-impl VmoOp {
-    pub fn from_raw(raw: u32) -> VmoOp {
-        VmoOp(raw)
-    }
-    pub fn into_raw(self) -> u32 {
-        self.0
-    }
-}
-
-assoc_consts!(VmoOp, [
-    COMMIT =           sys::ZX_VMO_OP_COMMIT;
-    DECOMMIT =         sys::ZX_VMO_OP_DECOMMIT;
-    LOCK =             sys::ZX_VMO_OP_LOCK;
-    UNLOCK =           sys::ZX_VMO_OP_UNLOCK;
-    LOOKUP =           sys::ZX_VMO_OP_LOOKUP;
-    CACHE_SYNC =       sys::ZX_VMO_OP_CACHE_SYNC;
-    CACHE_INVALIDATE = sys::ZX_VMO_OP_CACHE_INVALIDATE;
-    CACHE_CLEAN =      sys::ZX_VMO_OP_CACHE_CLEAN;
-    CACHE_CLEAN_INVALIDATE = sys::ZX_VMO_OP_CACHE_CLEAN_INVALIDATE;
-]);
-
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn vmo_get_size() {
-        let size = 16 * 1024 * 1024;
-        let vmo = Vmo::create(size).unwrap();
-        assert_eq!(size, vmo.get_size().unwrap());
-    }
-
-    #[test]
-    fn vmo_set_size() {
-        let start_size = 12;
-        let vmo = Vmo::create(start_size).unwrap();
-        assert_eq!(start_size, vmo.get_size().unwrap());
-
-        // Change the size and make sure the new size is reported
-        let new_size = 23;
-        assert!(vmo.set_size(new_size).is_ok());
-        assert_eq!(new_size, vmo.get_size().unwrap());
-    }
-
-    #[test]
-    fn vmo_read_write() {
-        let mut vec1 = vec![0; 16];
-        let vmo = Vmo::create(vec1.len() as u64).unwrap();
-        assert_eq!(vmo.write(b"abcdef", 0), Ok(6));
-        assert_eq!(16, vmo.read(&mut vec1, 0).unwrap());
-        assert_eq!(b"abcdef", &vec1[0..6]);
-        assert_eq!(vmo.write(b"123", 2), Ok(3));
-        assert_eq!(16, vmo.read(&mut vec1, 0).unwrap());
-        assert_eq!(b"ab123f", &vec1[0..6]);
-        assert_eq!(15, vmo.read(&mut vec1, 1).unwrap());
-        assert_eq!(b"b123f", &vec1[0..5]);
-    }
-
-    #[test]
-    fn vmo_op_range_unsupported() {
-        let vmo = Vmo::create(12).unwrap();
-        assert_eq!(vmo.op_range(VmoOp::LOCK, 0, 1), Err(Status::NOT_SUPPORTED));
-        assert_eq!(vmo.op_range(VmoOp::UNLOCK, 0, 1), Err(Status::NOT_SUPPORTED));
-    }
-
-    #[test]
-    fn vmo_lookup() {
-        let vmo = Vmo::create(12).unwrap();
-        let mut buffer = vec![0; 2];
-
-        // Lookup will fail as it is not committed yet.
-        assert_eq!(vmo.lookup(0, 12, &mut buffer), Err(Status::NO_MEMORY));
-
-        // COMMIT and try again.
-        assert_eq!(vmo.op_range(VmoOp::COMMIT, 0, 12), Ok(()));
-        assert_eq!(vmo.lookup(0, 12, &mut buffer), Ok(()));
-        assert_ne!(buffer[0], 0);
-        assert_eq!(buffer[1], 0);
-
-        // If we decommit then lookup should go back to failing.
-        assert_eq!(vmo.op_range(VmoOp::DECOMMIT, 0, 12), Ok(()));
-        assert_eq!(vmo.lookup(0, 12, &mut buffer), Err(Status::NO_MEMORY));
-    }
-
-    #[test]
-    fn vmo_cache() {
-        let vmo = Vmo::create(12).unwrap();
-
-        // Cache operations should all succeed.
-        assert_eq!(vmo.op_range(VmoOp::CACHE_SYNC, 0, 12), Ok(()));
-        assert_eq!(vmo.op_range(VmoOp::CACHE_INVALIDATE, 0, 12), Ok(()));
-        assert_eq!(vmo.op_range(VmoOp::CACHE_CLEAN, 0, 12), Ok(()));
-        assert_eq!(vmo.op_range(VmoOp::CACHE_CLEAN_INVALIDATE, 0, 12), Ok(()));
-    }
-
-    #[test]
-    fn vmo_clone() {
-        let original = Vmo::create(12).unwrap();
-        assert_eq!(original.write(b"one", 0), Ok(3));
-
-        // Clone the VMO, and make sure it contains what we expect.
-        let clone = original.clone(0, 10).unwrap();
-        let mut read_buffer = vec![0; 16];
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..3], b"one");
-
-        // Writing to the original will affect the clone too, surprisingly.
-        assert_eq!(original.write(b"two", 0), Ok(3));
-        assert_eq!(original.read(&mut read_buffer, 0), Ok(12));
-        assert_eq!(&read_buffer[0..3], b"two");
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..3], b"two");
-
-        // However, writing to the clone will not affect the original
-        assert_eq!(clone.write(b"three", 0), Ok(5));
-        assert_eq!(original.read(&mut read_buffer, 0), Ok(12));
-        assert_eq!(&read_buffer[0..3], b"two");
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..5], b"three");
-
-        // And now that the copy-on-write has happened, writing to the original will not affect the
-        // clone. How bizarre.
-        assert_eq!(original.write(b"four", 0), Ok(4));
-        assert_eq!(original.read(&mut read_buffer, 0), Ok(12));
-        assert_eq!(&read_buffer[0..4], b"four");
-        assert_eq!(clone.read(&mut read_buffer, 0), Ok(10));
-        assert_eq!(&read_buffer[0..5], b"three");
-    }
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon/tools/gen_status.py cargo-0.33.0/vendor/fuchsia-zircon/tools/gen_status.py
--- cargo-0.32.0/vendor/fuchsia-zircon/tools/gen_status.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon/tools/gen_status.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2016 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# A tool for autogenerating the mapping between Status and zx_status_t
-# Usage: python gen_status.py zircon/system/public/zircon/errors.h {sys,enum,match}
-import re
-import sys
-
-status_re = re.compile('#define\s+(ZX_\w+)\s+\((\-?\d+)\)$')
-
-def parse(in_filename):
-    result = []
-    for line in file(in_filename):
-        m = status_re.match(line)
-        if m:
-            result.append((m.group(1), int(m.group(2))))
-    return result
-
-def to_snake_case(name):
-    result = []
-    for element in name.split('_'):
-        result.append(element[0] + element[1:].lower())
-    return ''.join(result)
-
-def out(style, l):
-    print('// Auto-generated using tools/gen_status.py')
-    longest = max(len(name) for (name, num) in l)
-    if style == 'sys':
-        for (name, num) in l:
-            print('pub const %s : zx_status_t = %d;' % (name.ljust(longest), num))
-    if style == 'enum':
-        print('pub enum Status {')
-        for (name, num) in l:
-            print('    %s = %d,' % (to_snake_case(name[3:]), num))
-        print('');
-        print('    /// Any zx_status_t not in the set above will map to the following:')
-        print('    UnknownOther = -32768,')
-        print('}')
-    if style == 'match':
-        for (name, num) in l:
-            print('            sys::%s => Status::%s,' % (name, to_snake_case(name[3:])))
-        print('            _ => Status::UnknownOther,')
-
-
-l = parse(sys.argv[1])
-out(sys.argv[2], l)
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon-sys/BUILD.gn cargo-0.33.0/vendor/fuchsia-zircon-sys/BUILD.gn
--- cargo-0.32.0/vendor/fuchsia-zircon-sys/BUILD.gn	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon-sys/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/rust/rust_library.gni")
-
-rust_library("fuchsia-zircon-sys") {
-  deps = []
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon-sys/.cargo-checksum.json cargo-0.33.0/vendor/fuchsia-zircon-sys/.cargo-checksum.json
--- cargo-0.32.0/vendor/fuchsia-zircon-sys/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon-sys/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon-sys/Cargo.toml cargo-0.33.0/vendor/fuchsia-zircon-sys/Cargo.toml
--- cargo-0.32.0/vendor/fuchsia-zircon-sys/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon-sys/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-authors = ["Raph Levien <raph@google.com>"]
-description = "Low-level Rust bindings for the Zircon kernel"
-license = "BSD-3-Clause"
-repository = "https://fuchsia.googlesource.com/garnet/"
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon-sys/examples/hello.rs cargo-0.33.0/vendor/fuchsia-zircon-sys/examples/hello.rs
--- cargo-0.32.0/vendor/fuchsia-zircon-sys/examples/hello.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon-sys/examples/hello.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-extern crate fuchsia_zircon_sys as zircon_sys;
-
-pub fn main() {
-    let time = unsafe { zircon_sys::zx_time_get(zircon_sys::ZX_CLOCK_MONOTONIC) };
-    println!("before sleep, time = {}", time);
-    unsafe { zircon_sys::zx_nanosleep(zircon_sys::zx_deadline_after(1000_000_000)); }
-    let time = unsafe { zircon_sys::zx_time_get(zircon_sys::ZX_CLOCK_MONOTONIC) };
-    println!("after sleep, time = {}", time);
-}
-
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon-sys/src/definitions.rs cargo-0.33.0/vendor/fuchsia-zircon-sys/src/definitions.rs
--- cargo-0.32.0/vendor/fuchsia-zircon-sys/src/definitions.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon-sys/src/definitions.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,903 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// This is a GENERATED file, see //zircon/system/host/sysgen.
-// The license governing this file can be found in the LICENSE file.
-
-#[link(name = "zircon")]
-extern {
-    pub fn zx_time_get(
-        clock_id: u32
-        ) -> zx_time_t;
-
-    pub fn zx_nanosleep(
-        deadline: zx_time_t
-        ) -> zx_status_t;
-
-    pub fn zx_ticks_get(
-        ) -> u64;
-
-    pub fn zx_ticks_per_second(
-        ) -> u64;
-
-    pub fn zx_deadline_after(
-        nanoseconds: zx_duration_t
-        ) -> zx_time_t;
-
-    pub fn zx_clock_adjust(
-        handle: zx_handle_t,
-        clock_id: u32,
-        offset: i64
-        ) -> zx_status_t;
-
-    pub fn zx_system_get_num_cpus(
-        ) -> u32;
-
-    pub fn zx_system_get_version(
-        version: *mut u8,
-        version_len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_system_get_physmem(
-        ) -> u64;
-
-    pub fn zx_cache_flush(
-        addr: *const u8,
-        len: usize,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_handle_close(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_handle_duplicate(
-        handle: zx_handle_t,
-        rights: zx_rights_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_handle_replace(
-        handle: zx_handle_t,
-        rights: zx_rights_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_object_wait_one(
-        handle: zx_handle_t,
-        waitfor: zx_signals_t,
-        deadline: zx_time_t,
-        observed: *mut zx_signals_t
-        ) -> zx_status_t;
-
-    pub fn zx_object_wait_many(
-        items: *mut zx_wait_item_t,
-        count: u32,
-        deadline: zx_time_t
-        ) -> zx_status_t;
-
-    pub fn zx_object_wait_async(
-        handle: zx_handle_t,
-        port_handle: zx_handle_t,
-        key: u64,
-        signals: zx_signals_t,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_object_signal(
-        handle: zx_handle_t,
-        clear_mask: u32,
-        set_mask: u32
-        ) -> zx_status_t;
-
-    pub fn zx_object_signal_peer(
-        handle: zx_handle_t,
-        clear_mask: u32,
-        set_mask: u32
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_property(
-        handle: zx_handle_t,
-        property: u32,
-        value: *mut u8,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_object_set_property(
-        handle: zx_handle_t,
-        property: u32,
-        value: *const u8,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_object_set_cookie(
-        handle: zx_handle_t,
-        scope: zx_handle_t,
-        cookie: u64
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_cookie(
-        handle: zx_handle_t,
-        scope: zx_handle_t,
-        cookie: *mut u64
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_info(
-        handle: zx_handle_t,
-        topic: u32,
-        buffer: *mut u8,
-        buffer_size: usize,
-        actual_count: *mut usize,
-        avail_count: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_object_get_child(
-        handle: zx_handle_t,
-        koid: u64,
-        rights: zx_rights_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_create(
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_read(
-        handle: zx_handle_t,
-        options: u32,
-        bytes: *mut u8,
-        handles: *mut zx_handle_t,
-        num_bytes: u32,
-        num_handles: u32,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_channel_write(
-        handle: zx_handle_t,
-        options: u32,
-        bytes: *const u8,
-        num_bytes: u32,
-        handles: *const zx_handle_t,
-        num_handles: u32
-        ) -> zx_status_t;
-
-    pub fn zx_channel_call_noretry(
-        handle: zx_handle_t,
-        options: u32,
-        deadline: zx_time_t,
-        args: *const zx_channel_call_args_t,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32,
-        read_status: *mut zx_status_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_call_finish(
-        deadline: zx_time_t,
-        args: *const zx_channel_call_args_t,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32,
-        read_status: *mut zx_status_t
-        ) -> zx_status_t;
-
-    pub fn zx_channel_call(
-        handle: zx_handle_t,
-        options: u32,
-        deadline: zx_time_t,
-        args: *const zx_channel_call_args_t,
-        actual_bytes: *mut u32,
-        actual_handles: *mut u32,
-        read_status: *mut zx_status_t
-        ) -> zx_status_t;
-
-    pub fn zx_socket_create(
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_socket_write(
-        handle: zx_handle_t,
-        options: u32,
-        buffer: *const u8,
-        size: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_socket_read(
-        handle: zx_handle_t,
-        options: u32,
-        buffer: *mut u8,
-        size: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_thread_exit(
-        );
-
-    pub fn zx_thread_create(
-        process: zx_handle_t,
-        name: *const u8,
-        name_len: u32,
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_thread_start(
-        handle: zx_handle_t,
-        thread_entry: usize,
-        stack: usize,
-        arg1: usize,
-        arg2: usize
-        ) -> zx_status_t;
-
-    pub fn zx_thread_read_state(
-        handle: zx_handle_t,
-        kind: u32,
-        buffer: *mut u8,
-        len: u32,
-        actual: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_thread_write_state(
-        handle: zx_handle_t,
-        kind: u32,
-        buffer: *const u8,
-        buffer_len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_thread_set_priority(
-        prio: i32
-        ) -> zx_status_t;
-
-    pub fn zx_process_exit(
-        retcode: isize
-        );
-
-    pub fn zx_process_create(
-        job: zx_handle_t,
-        name: *const u8,
-        name_len: u32,
-        options: u32,
-        proc_handle: *mut zx_handle_t,
-        vmar_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_process_start(
-        process_handle: zx_handle_t,
-        thread_handle: zx_handle_t,
-        entry: usize,
-        stack: usize,
-        arg_handle: zx_handle_t,
-        arg2: usize
-        ) -> zx_status_t;
-
-    pub fn zx_process_read_memory(
-        proc_: zx_handle_t,
-        vaddr: usize,
-        buffer: *mut u8,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_process_write_memory(
-        proc_: zx_handle_t,
-        vaddr: usize,
-        buffer: *const u8,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_job_create(
-        parent_job: zx_handle_t,
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_job_set_policy(
-        job: zx_handle_t,
-        options: u32,
-        topic: u32,
-        policy: *const u8,
-        count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_task_bind_exception_port(
-        object: zx_handle_t,
-        eport: zx_handle_t,
-        key: u64,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_task_suspend(
-        task_handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_task_resume(
-        task_handle: zx_handle_t,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_task_kill(
-        task_handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_event_create(
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_eventpair_create(
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_futex_wait(
-        value_ptr: *mut zx_futex_t,
-        current_value: isize,
-        deadline: zx_time_t
-        ) -> zx_status_t;
-
-    pub fn zx_futex_wake(
-        value_ptr: *const zx_futex_t,
-        count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_futex_requeue(
-        wake_ptr: *mut zx_futex_t,
-        wake_count: u32,
-        current_value: isize,
-        requeue_ptr: *mut zx_futex_t,
-        requeue_count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_port_create(
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_port_queue(
-        handle: zx_handle_t,
-        packet: *const zx_port_packet_t,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_port_wait(
-        handle: zx_handle_t,
-        deadline: zx_time_t,
-        packet: *mut zx_port_packet_t,
-        size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_port_cancel(
-        handle: zx_handle_t,
-        source: zx_handle_t,
-        key: u64
-        ) -> zx_status_t;
-
-    pub fn zx_timer_create(
-        options: u32,
-        clock_id: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_timer_set(
-        handle: zx_handle_t,
-        deadline: zx_time_t,
-        slack: zx_duration_t
-        ) -> zx_status_t;
-
-    pub fn zx_timer_cancel(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_create(
-        size: u64,
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_read(
-        handle: zx_handle_t,
-        data: *mut u8,
-        offset: u64,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_write(
-        handle: zx_handle_t,
-        data: *const u8,
-        offset: u64,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_get_size(
-        handle: zx_handle_t,
-        size: *mut u64
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_set_size(
-        handle: zx_handle_t,
-        size: u64
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_op_range(
-        handle: zx_handle_t,
-        op: u32,
-        offset: u64,
-        size: u64,
-        buffer: *mut u8,
-        buffer_size: usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_clone(
-        handle: zx_handle_t,
-        options: u32,
-        offset: u64,
-        size: u64,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_set_cache_policy(
-        handle: zx_handle_t,
-        cache_policy: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_allocate(
-        parent_vmar_handle: zx_handle_t,
-        offset: usize,
-        size: usize,
-        map_flags: u32,
-        child_vmar: *mut zx_handle_t,
-        child_addr: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_destroy(
-        vmar_handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_map(
-        vmar_handle: zx_handle_t,
-        vmar_offset: usize,
-        vmo_handle: zx_handle_t,
-        vmo_offset: u64,
-        len: usize,
-        map_flags: u32,
-        mapped_addr: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_unmap(
-        vmar_handle: zx_handle_t,
-        addr: usize,
-        len: usize
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_protect(
-        vmar_handle: zx_handle_t,
-        addr: usize,
-        len: usize,
-        prot_flags: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_root_self() -> zx_handle_t;
-
-    pub fn zx_cprng_draw(
-        buffer: *mut u8,
-        len: usize,
-        actual: *mut usize
-        ) -> zx_status_t;
-
-    pub fn zx_cprng_add_entropy(
-        buffer: *const u8,
-        len: usize
-        ) -> zx_status_t;
-
-    pub fn zx_fifo_create(
-        elem_count: u32,
-        elem_size: u32,
-        options: u32,
-        out0: *mut zx_handle_t,
-        out1: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_fifo_read(
-        handle: zx_handle_t,
-        data: *mut u8,
-        len: usize,
-        num_written: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_fifo_write(
-        handle: zx_handle_t,
-        data: *const u8,
-        len: usize,
-        num_written: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmar_unmap_handle_close_thread_exit(
-        vmar_handle: zx_handle_t,
-        addr: usize,
-        len: usize,
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_futex_wake_handle_close_thread_exit(
-        value_ptr: *const zx_futex_t,
-        count: u32,
-        new_value: isize,
-        handle: zx_handle_t
-        );
-
-    pub fn zx_log_create(
-        options: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_log_write(
-        handle: zx_handle_t,
-        len: u32,
-        buffer: *const u8,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_log_read(
-        handle: zx_handle_t,
-        len: u32,
-        buffer: *mut u8,
-        options: u32
-        ) -> zx_status_t;
-
-    pub fn zx_ktrace_read(
-        handle: zx_handle_t,
-        data: *mut u8,
-        offset: u32,
-        len: u32,
-        actual: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_ktrace_control(
-        handle: zx_handle_t,
-        action: u32,
-        options: u32,
-        ptr: *mut u8
-        ) -> zx_status_t;
-
-    pub fn zx_ktrace_write(
-        handle: zx_handle_t,
-        id: u32,
-        arg0: u32,
-        arg1: u32
-        ) -> zx_status_t;
-
-    pub fn zx_mtrace_control(
-        handle: zx_handle_t,
-        kind: u32,
-        action: u32,
-        options: u32,
-        ptr: *mut u8,
-        size: u32
-        ) -> zx_status_t;
-
-    pub fn zx_debug_read(
-        handle: zx_handle_t,
-        buffer: *mut u8,
-        length: u32
-        ) -> zx_status_t;
-
-    pub fn zx_debug_write(
-        buffer: *const u8,
-        length: u32
-        ) -> zx_status_t;
-
-    pub fn zx_debug_send_command(
-        resource_handle: zx_handle_t,
-        buffer: *const u8,
-        length: u32
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_create(
-        handle: zx_handle_t,
-        vector: u32,
-        options: u32,
-        out_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_complete(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_wait(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_interrupt_signal(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_mmap_device_io(
-        handle: zx_handle_t,
-        io_addr: u32,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_create_contiguous(
-        rsrc_handle: zx_handle_t,
-        size: usize,
-        alignment_log2: u32,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vmo_create_physical(
-        rsrc_handle: zx_handle_t,
-        paddr: zx_paddr_t,
-        size: usize,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_bootloader_fb_get_info(
-        format: *mut u32,
-        width: *mut u32,
-        height: *mut u32,
-        stride: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_set_framebuffer(
-        handle: zx_handle_t,
-        vaddr: *mut u8,
-        len: u32,
-        format: u32,
-        width: u32,
-        height: u32,
-        stride: u32
-        ) -> zx_status_t;
-
-    pub fn zx_set_framebuffer_vmo(
-        handle: zx_handle_t,
-        vmo: zx_handle_t,
-        len: u32,
-        format: u32,
-        width: u32,
-        height: u32,
-        stride: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_get_nth_device(
-        handle: zx_handle_t,
-        index: u32,
-        out_info: *mut zx_pcie_device_info_t,
-        out_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_enable_bus_master(
-        handle: zx_handle_t,
-        enable: bool
-        ) -> zx_status_t;
-
-    pub fn zx_pci_enable_pio(
-        handle: zx_handle_t,
-        enable: bool
-        ) -> zx_status_t;
-
-    pub fn zx_pci_reset_device(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_cfg_pio_rw(
-        handle: zx_handle_t,
-        bus: u8,
-        dev: u8,
-        func: u8,
-        offset: u8,
-        val: *mut u32,
-        width: usize,
-        write: bool
-        ) -> zx_status_t;
-
-    pub fn zx_pci_get_bar(
-        handle: zx_handle_t,
-        bar_num: u32,
-        out_bar: *mut zx_pci_resource_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_get_config(
-        handle: zx_handle_t,
-        out_config: *mut zx_pci_resource_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_io_write(
-        handle: zx_handle_t,
-        bar_num: u32,
-        offset: u32,
-        len: u32,
-        value: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_io_read(
-        handle: zx_handle_t,
-        bar_num: u32,
-        offset: u32,
-        len: u32,
-        out_value: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_map_interrupt(
-        handle: zx_handle_t,
-        which_irq: i32,
-        out_handle: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_pci_query_irq_mode_caps(
-        handle: zx_handle_t,
-        mode: u32,
-        out_max_irqs: *mut u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_set_irq_mode(
-        handle: zx_handle_t,
-        mode: u32,
-        requested_irq_count: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_init(
-        handle: zx_handle_t,
-        init_buf: *const zx_pci_init_arg_t,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_pci_add_subtract_io_range(
-        handle: zx_handle_t,
-        mmio: bool,
-        base: u64,
-        len: u64,
-        add: bool
-        ) -> zx_status_t;
-
-    pub fn zx_acpi_uefi_rsdp(
-        handle: zx_handle_t
-        ) -> u64;
-
-    pub fn zx_acpi_cache_flush(
-        handle: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_resource_create(
-        parent_handle: zx_handle_t,
-        kind: u32,
-        low: u64,
-        high: u64,
-        resource_out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_guest_create(
-        resource: zx_handle_t,
-        options: u32,
-        physmem_vmo: zx_handle_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_guest_set_trap(
-        guest: zx_handle_t,
-        kind: u32,
-        addr: zx_vaddr_t,
-        len: usize,
-        fifo: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_create(
-        guest: zx_handle_t,
-        options: u32,
-        args: *const zx_vcpu_create_args_t,
-        out: *mut zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_resume(
-        vcpu: zx_handle_t,
-        packet: *mut zx_guest_packet_t
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_interrupt(
-        vcpu: zx_handle_t,
-        vector: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_read_state(
-        vcpu: zx_handle_t,
-        kind: u32,
-        buffer: *mut u8,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_vcpu_write_state(
-        vcpu: zx_handle_t,
-        kind: u32,
-        buffer: *const u8,
-        len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_system_mexec(
-        kernel: zx_handle_t,
-        bootimage: zx_handle_t,
-        cmdline: *const u8,
-        cmdline_len: u32
-        ) -> zx_status_t;
-
-    pub fn zx_job_set_relative_importance(
-        root_resource: zx_handle_t,
-        job: zx_handle_t,
-        less_important_job: zx_handle_t
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_0(
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_1(
-        a: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_2(
-        a: isize,
-        b: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_3(
-        a: isize,
-        b: isize,
-        c: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_4(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_5(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_6(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize,
-        f: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_7(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize,
-        f: isize,
-        g: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_8(
-        a: isize,
-        b: isize,
-        c: isize,
-        d: isize,
-        e: isize,
-        f: isize,
-        g: isize,
-        h: isize
-        ) -> zx_status_t;
-
-    pub fn zx_syscall_test_wrapper(
-        a: isize,
-        b: isize,
-        c: isize
-        ) -> zx_status_t;
-
-
-}
diff -Nru cargo-0.32.0/vendor/fuchsia-zircon-sys/src/lib.rs cargo-0.33.0/vendor/fuchsia-zircon-sys/src/lib.rs
--- cargo-0.32.0/vendor/fuchsia-zircon-sys/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fuchsia-zircon-sys/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,474 +0,0 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#![allow(non_camel_case_types)]
-#![deny(warnings)]
-
-use std::{cmp, fmt};
-
-pub type zx_addr_t = usize;
-pub type zx_duration_t = u64;
-pub type zx_futex_t = i32;
-pub type zx_handle_t = u32;
-pub type zx_off_t = u64;
-pub type zx_paddr_t = usize;
-pub type zx_rights_t = u32;
-pub type zx_signals_t = u32;
-pub type zx_size_t = usize;
-pub type zx_ssize_t = isize;
-pub type zx_status_t = i32;
-pub type zx_time_t = u64;
-pub type zx_vaddr_t = usize;
-
-// TODO: combine these macros with the bitflags and assoc consts macros below
-// so that we only have to do one macro invocation.
-// The result would look something like:
-// multiconst!(bitflags, zx_rights_t, Rights, [RIGHT_NONE => ZX_RIGHT_NONE = 0; ...]);
-// multiconst!(assoc_consts, zx_status_t, Status, [OK => ZX_OK = 0; ...]);
-// Note that the actual name of the inner macro (e.g. `bitflags`) can't be a variable.
-// It'll just have to be matched on manually
-macro_rules! multiconst {
-    ($typename:ident, [$($rawname:ident = $value:expr;)*]) => {
-        $(
-            pub const $rawname: $typename = $value;
-        )*
-    }
-}
-
-multiconst!(zx_handle_t, [
-    ZX_HANDLE_INVALID = 0;
-]);
-
-multiconst!(zx_time_t, [
-    ZX_TIME_INFINITE = ::std::u64::MAX;
-]);
-
-multiconst!(zx_rights_t, [
-    ZX_RIGHT_NONE         = 0;
-    ZX_RIGHT_DUPLICATE    = 1 << 0;
-    ZX_RIGHT_TRANSFER     = 1 << 1;
-    ZX_RIGHT_READ         = 1 << 2;
-    ZX_RIGHT_WRITE        = 1 << 3;
-    ZX_RIGHT_EXECUTE      = 1 << 4;
-    ZX_RIGHT_MAP          = 1 << 5;
-    ZX_RIGHT_GET_PROPERTY = 1 << 6;
-    ZX_RIGHT_SET_PROPERTY = 1 << 7;
-    ZX_RIGHT_ENUMERATE    = 1 << 8;
-    ZX_RIGHT_DESTROY      = 1 << 9;
-    ZX_RIGHT_SET_POLICY   = 1 << 10;
-    ZX_RIGHT_GET_POLICY   = 1 << 11;
-    ZX_RIGHT_SIGNAL       = 1 << 12;
-    ZX_RIGHT_SIGNAL_PEER  = 1 << 13;
-    ZX_RIGHT_WAIT         = 0 << 14; // Coming Soon!
-    ZX_RIGHT_SAME_RIGHTS  = 1 << 31;
-]);
-
-// TODO: add an alias for this type in the C headers.
-multiconst!(u32, [
-    ZX_VMO_OP_COMMIT = 1;
-    ZX_VMO_OP_DECOMMIT = 2;
-    ZX_VMO_OP_LOCK = 3;
-    ZX_VMO_OP_UNLOCK = 4;
-    ZX_VMO_OP_LOOKUP = 5;
-    ZX_VMO_OP_CACHE_SYNC = 6;
-    ZX_VMO_OP_CACHE_INVALIDATE = 7;
-    ZX_VMO_OP_CACHE_CLEAN = 8;
-    ZX_VMO_OP_CACHE_CLEAN_INVALIDATE = 9;
-]);
-
-// TODO: add an alias for this type in the C headers.
-multiconst!(u32, [
-    ZX_VM_FLAG_PERM_READ          = 1  << 0;
-    ZX_VM_FLAG_PERM_WRITE         = 1  << 1;
-    ZX_VM_FLAG_PERM_EXECUTE       = 1  << 2;
-    ZX_VM_FLAG_COMPACT            = 1  << 3;
-    ZX_VM_FLAG_SPECIFIC           = 1  << 4;
-    ZX_VM_FLAG_SPECIFIC_OVERWRITE = 1  << 5;
-    ZX_VM_FLAG_CAN_MAP_SPECIFIC   = 1  << 6;
-    ZX_VM_FLAG_CAN_MAP_READ       = 1  << 7;
-    ZX_VM_FLAG_CAN_MAP_WRITE      = 1  << 8;
-    ZX_VM_FLAG_CAN_MAP_EXECUTE    = 1  << 9;
-]);
-
-multiconst!(zx_status_t, [
-    ZX_OK                    = 0;
-    ZX_ERR_INTERNAL          = -1;
-    ZX_ERR_NOT_SUPPORTED     = -2;
-    ZX_ERR_NO_RESOURCES      = -3;
-    ZX_ERR_NO_MEMORY         = -4;
-    ZX_ERR_CALL_FAILED       = -5;
-    ZX_ERR_INTERRUPTED_RETRY = -6;
-    ZX_ERR_INVALID_ARGS      = -10;
-    ZX_ERR_BAD_HANDLE        = -11;
-    ZX_ERR_WRONG_TYPE        = -12;
-    ZX_ERR_BAD_SYSCALL       = -13;
-    ZX_ERR_OUT_OF_RANGE      = -14;
-    ZX_ERR_BUFFER_TOO_SMALL  = -15;
-    ZX_ERR_BAD_STATE         = -20;
-    ZX_ERR_TIMED_OUT         = -21;
-    ZX_ERR_SHOULD_WAIT       = -22;
-    ZX_ERR_CANCELED          = -23;
-    ZX_ERR_PEER_CLOSED       = -24;
-    ZX_ERR_NOT_FOUND         = -25;
-    ZX_ERR_ALREADY_EXISTS    = -26;
-    ZX_ERR_ALREADY_BOUND     = -27;
-    ZX_ERR_UNAVAILABLE       = -28;
-    ZX_ERR_ACCESS_DENIED     = -30;
-    ZX_ERR_IO                = -40;
-    ZX_ERR_IO_REFUSED        = -41;
-    ZX_ERR_IO_DATA_INTEGRITY = -42;
-    ZX_ERR_IO_DATA_LOSS      = -43;
-    ZX_ERR_BAD_PATH          = -50;
-    ZX_ERR_NOT_DIR           = -51;
-    ZX_ERR_NOT_FILE          = -52;
-    ZX_ERR_FILE_BIG          = -53;
-    ZX_ERR_NO_SPACE          = -54;
-    ZX_ERR_STOP              = -60;
-    ZX_ERR_NEXT              = -61;
-]);
-
-multiconst!(zx_signals_t, [
-    ZX_SIGNAL_NONE              = 0;
-    ZX_OBJECT_SIGNAL_ALL        = 0x00ffffff;
-    ZX_USER_SIGNAL_ALL          = 0xff000000;
-    ZX_OBJECT_SIGNAL_0          = 1 << 0;
-    ZX_OBJECT_SIGNAL_1          = 1 << 1;
-    ZX_OBJECT_SIGNAL_2          = 1 << 2;
-    ZX_OBJECT_SIGNAL_3          = 1 << 3;
-    ZX_OBJECT_SIGNAL_4          = 1 << 4;
-    ZX_OBJECT_SIGNAL_5          = 1 << 5;
-    ZX_OBJECT_SIGNAL_6          = 1 << 6;
-    ZX_OBJECT_SIGNAL_7          = 1 << 7;
-    ZX_OBJECT_SIGNAL_8          = 1 << 8;
-    ZX_OBJECT_SIGNAL_9          = 1 << 9;
-    ZX_OBJECT_SIGNAL_10         = 1 << 10;
-    ZX_OBJECT_SIGNAL_11         = 1 << 11;
-    ZX_OBJECT_SIGNAL_12         = 1 << 12;
-    ZX_OBJECT_SIGNAL_13         = 1 << 13;
-    ZX_OBJECT_SIGNAL_14         = 1 << 14;
-    ZX_OBJECT_SIGNAL_15         = 1 << 15;
-    ZX_OBJECT_SIGNAL_16         = 1 << 16;
-    ZX_OBJECT_SIGNAL_17         = 1 << 17;
-    ZX_OBJECT_SIGNAL_18         = 1 << 18;
-    ZX_OBJECT_SIGNAL_19         = 1 << 19;
-    ZX_OBJECT_SIGNAL_20         = 1 << 20;
-    ZX_OBJECT_SIGNAL_21         = 1 << 21;
-    ZX_OBJECT_SIGNAL_22         = 1 << 22;
-    ZX_OBJECT_HANDLE_CLOSED     = 1 << 23;
-    ZX_USER_SIGNAL_0            = 1 << 24;
-    ZX_USER_SIGNAL_1            = 1 << 25;
-    ZX_USER_SIGNAL_2            = 1 << 26;
-    ZX_USER_SIGNAL_3            = 1 << 27;
-    ZX_USER_SIGNAL_4            = 1 << 28;
-    ZX_USER_SIGNAL_5            = 1 << 29;
-    ZX_USER_SIGNAL_6            = 1 << 30;
-    ZX_USER_SIGNAL_7            = 1 << 31;
-
-    ZX_OBJECT_READABLE          = ZX_OBJECT_SIGNAL_0;
-    ZX_OBJECT_WRITABLE          = ZX_OBJECT_SIGNAL_1;
-    ZX_OBJECT_PEER_CLOSED       = ZX_OBJECT_SIGNAL_2;
-
-    // Cancelation (handle was closed while waiting with it)
-    ZX_SIGNAL_HANDLE_CLOSED     = ZX_OBJECT_HANDLE_CLOSED;
-
-    // Event
-    ZX_EVENT_SIGNALED           = ZX_OBJECT_SIGNAL_3;
-
-    // EventPair
-    ZX_EPAIR_SIGNALED           = ZX_OBJECT_SIGNAL_3;
-    ZX_EPAIR_CLOSED             = ZX_OBJECT_SIGNAL_2;
-
-    // Task signals (process, thread, job)
-    ZX_TASK_TERMINATED          = ZX_OBJECT_SIGNAL_3;
-
-    // Channel
-    ZX_CHANNEL_READABLE         = ZX_OBJECT_SIGNAL_0;
-    ZX_CHANNEL_WRITABLE         = ZX_OBJECT_SIGNAL_1;
-    ZX_CHANNEL_PEER_CLOSED      = ZX_OBJECT_SIGNAL_2;
-
-    // Socket
-    ZX_SOCKET_READABLE          = ZX_OBJECT_SIGNAL_0;
-    ZX_SOCKET_WRITABLE          = ZX_OBJECT_SIGNAL_1;
-    ZX_SOCKET_PEER_CLOSED       = ZX_OBJECT_SIGNAL_2;
-
-    // Port
-    ZX_PORT_READABLE            = ZX_OBJECT_READABLE;
-
-    // Resource
-    ZX_RESOURCE_DESTROYED       = ZX_OBJECT_SIGNAL_3;
-    ZX_RESOURCE_READABLE        = ZX_OBJECT_READABLE;
-    ZX_RESOURCE_WRITABLE        = ZX_OBJECT_WRITABLE;
-    ZX_RESOURCE_CHILD_ADDED     = ZX_OBJECT_SIGNAL_4;
-
-    // Fifo
-    ZX_FIFO_READABLE            = ZX_OBJECT_READABLE;
-    ZX_FIFO_WRITABLE            = ZX_OBJECT_WRITABLE;
-    ZX_FIFO_PEER_CLOSED         = ZX_OBJECT_PEER_CLOSED;
-
-    // Job
-    ZX_JOB_NO_PROCESSES         = ZX_OBJECT_SIGNAL_3;
-    ZX_JOB_NO_JOBS              = ZX_OBJECT_SIGNAL_4;
-
-    // Process
-    ZX_PROCESS_TERMINATED       = ZX_OBJECT_SIGNAL_3;
-
-    // Thread
-    ZX_THREAD_TERMINATED        = ZX_OBJECT_SIGNAL_3;
-
-    // Log
-    ZX_LOG_READABLE             = ZX_OBJECT_READABLE;
-    ZX_LOG_WRITABLE             = ZX_OBJECT_WRITABLE;
-
-    // Timer
-    ZX_TIMER_SIGNALED           = ZX_OBJECT_SIGNAL_3;
-]);
-
-// clock ids
-pub const ZX_CLOCK_MONOTONIC: u32 = 0;
-
-// Buffer size limits on the cprng syscalls
-pub const ZX_CPRNG_DRAW_MAX_LEN: usize = 256;
-pub const ZX_CPRNG_ADD_ENTROPY_MAX_LEN: usize = 256;
-
-// Socket flags and limits.
-pub const ZX_SOCKET_HALF_CLOSE: u32 = 1;
-
-// VM Object clone flags
-pub const ZX_VMO_CLONE_COPY_ON_WRITE: u32 = 1;
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum zx_cache_policy_t {
-    ZX_CACHE_POLICY_CACHED = 0,
-    ZX_CACHE_POLICY_UNCACHED = 1,
-    ZX_CACHE_POLICY_UNCACHED_DEVICE = 2,
-    ZX_CACHE_POLICY_WRITE_COMBINING = 3,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_wait_item_t {
-    pub handle: zx_handle_t,
-    pub waitfor: zx_signals_t,
-    pub pending: zx_signals_t,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_waitset_result_t {
-    pub cookie: u64,
-    pub status: zx_status_t,
-    pub observed: zx_signals_t,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_channel_call_args_t {
-    pub wr_bytes: *const u8,
-    pub wr_handles: *const zx_handle_t,
-    pub rd_bytes: *mut u8,
-    pub rd_handles: *mut zx_handle_t,
-    pub wr_num_bytes: u32,
-    pub wr_num_handles: u32,
-    pub rd_num_bytes: u32,
-    pub rd_num_handles: u32,
-}
-
-pub type zx_pci_irq_swizzle_lut_t = [[[u32; 4]; 8]; 32];
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_pci_init_arg_t {
-    pub dev_pin_to_global_irq: zx_pci_irq_swizzle_lut_t,
-    pub num_irqs: u32,
-    pub irqs: [zx_irq_t; 32],
-    pub ecam_window_count: u32,
-    // Note: the ecam_windows field is actually a variable size array.
-    // We use a fixed size array to match the C repr.
-    pub ecam_windows: [zx_ecam_window_t; 1],
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_irq_t {
-    pub global_irq: u32,
-    pub level_triggered: bool,
-    pub active_high: bool,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_ecam_window_t {
-    pub base: u64,
-    pub size: usize,
-    pub bus_start: u8,
-    pub bus_end: u8,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_pcie_device_info_t {
-    pub vendor_id: u16,
-    pub device_id: u16,
-    pub base_class: u8,
-    pub sub_class: u8,
-    pub program_interface: u8,
-    pub revision_id: u8,
-    pub bus_id: u8,
-    pub dev_id: u8,
-    pub func_id: u8,
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_pci_resource_t {
-    pub type_: u32,
-    pub size: usize,
-    // TODO: Actually a union
-    pub pio_addr: usize,
-}
-
-// TODO: Actually a union
-pub type zx_rrec_t = [u8; 64];
-
-// Ports V2
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum zx_packet_type_t {
-    ZX_PKT_TYPE_USER = 0,
-    ZX_PKT_TYPE_SIGNAL_ONE = 1,
-    ZX_PKT_TYPE_SIGNAL_REP = 2,
-}
-
-impl Default for zx_packet_type_t {
-    fn default() -> Self {
-        zx_packet_type_t::ZX_PKT_TYPE_USER
-    }
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct zx_packet_signal_t {
-    pub trigger: zx_signals_t,
-    pub observed: zx_signals_t,
-    pub count: u64,
-}
-
-pub const ZX_WAIT_ASYNC_ONCE: u32 = 0;
-pub const ZX_WAIT_ASYNC_REPEATING: u32 = 1;
-
-// Actually a union of different integer types, but this should be good enough.
-pub type zx_packet_user_t = [u8; 32];
-
-#[repr(C)]
-#[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
-pub struct zx_port_packet_t {
-    pub key: u64,
-    pub packet_type: zx_packet_type_t,
-    pub status: i32,
-    pub union: [u8; 32],
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_guest_io_t {
-    port: u16,
-    access_size: u8,
-    input: bool,
-    // TODO: Actually a union
-    data: [u8; 4],
-}
-
-#[cfg(target_arch="aarch64")]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_guest_memory_t {
-    addr: zx_vaddr_t,
-    inst: u32,
-}
-
-pub const X86_MAX_INST_LEN: usize = 15;
-
-#[cfg(target_arch="x86_64")]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_guest_memory_t {
-    addr: zx_vaddr_t,
-    inst_len: u8,
-    inst_buf: [u8; X86_MAX_INST_LEN],
-}
-
-#[repr(u8)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum zx_guest_packet_t_type {
-    ZX_GUEST_PKT_MEMORY = 1,
-    ZX_GUEST_PKT_IO = 2,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union zx_guest_packet_t_union {
-    // ZX_GUEST_PKT_MEMORY
-    memory: zx_guest_memory_t,
-    // ZX_GUEST_PKT_IO
-    io: zx_guest_io_t,
-}
-
-// Note: values of this type must maintain the invariant that
-// `packet_type` correctly indicates the type of `contents`.
-// Failure to do so will result in unsafety.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct zx_guest_packet_t {
-    packet_type: zx_guest_packet_t_type,
-    contents: zx_guest_packet_t_union,
-}
-
-impl fmt::Debug for zx_guest_packet_t {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "zx_guest_packet_t {{ packet_type: {:?}, contents: ", self.packet_type)?;
-        match self.packet_type {
-            zx_guest_packet_t_type::ZX_GUEST_PKT_MEMORY =>
-                write!(f, "zx_guest_packet_t_union {{ memory: {:?} }} }}",
-                    unsafe { self.contents.memory }
-                ),
-            zx_guest_packet_t_type::ZX_GUEST_PKT_IO =>
-                write!(f, "zx_guest_packet_t_union {{ io: {:?} }} }}",
-                    unsafe { self.contents.io }
-                ),
-        }
-    }
-}
-
-impl cmp::PartialEq for zx_guest_packet_t {
-    fn eq(&self, other: &Self) -> bool {
-        (self.packet_type == other.packet_type) &&
-        match self.packet_type {
-            zx_guest_packet_t_type::ZX_GUEST_PKT_MEMORY =>
-                unsafe { self.contents.memory == other.contents.memory },
-            zx_guest_packet_t_type::ZX_GUEST_PKT_IO =>
-                unsafe { self.contents.io == other.contents.io },
-        }
-    }
-}
-
-impl cmp::Eq for zx_guest_packet_t {}
-
-#[cfg(target_arch="x86_64")]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_vcpu_create_args_t {
-    pub ip: zx_vaddr_t,
-    pub cr3: zx_vaddr_t,
-    pub apic_vmo: zx_handle_t,
-}
-
-#[cfg(not(target_arch="x86_64"))]
-#[repr(C)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct zx_vcpu_create_args_t {
-    pub ip: zx_vaddr_t,
-}
-
-include!("definitions.rs");
diff -Nru cargo-0.32.0/vendor/fwdansi/.travis.yml cargo-0.33.0/vendor/fwdansi/.travis.yml
--- cargo-0.32.0/vendor/fwdansi/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/fwdansi/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-sudo: false
-language: rust
-
-rust:
- - 1.27.2
- - stable
- - beta
- - nightly
-
-script:
- - cargo build
- - cargo test
- - cargo run --example run-rustc
diff -Nru cargo-0.32.0/vendor/git2/.gitmodules cargo-0.33.0/vendor/git2/.gitmodules
--- cargo-0.32.0/vendor/git2/.gitmodules	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/git2/.gitmodules	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[submodule "libgit2-sys/libgit2"]
-	path = libgit2-sys/libgit2
-	url = https://github.com/libgit2/libgit2
diff -Nru cargo-0.32.0/vendor/git2/.travis.yml cargo-0.33.0/vendor/git2/.travis.yml
--- cargo-0.32.0/vendor/git2/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/git2/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-language: rust
-sudo: false
-git:
-  submodules: false
-
-matrix:
-  include:
-    - rust: 1.21.0
-    - rust: stable
-    - os: osx
-      rust: stable
-      before_install:
-        - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include
-        - export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib
-    - rust: beta
-    - rust: nightly
-
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo doc --no-deps
-        - cargo doc --manifest-path=git2-curl/Cargo.toml --no-deps
-        - cargo doc --manifest-path=libgit2-sys/Cargo.toml --no-deps
-      after_success:
-        - travis-cargo --only nightly doc-upload
-
-script:
-  - git submodule update --init
-  - cargo test --no-default-features
-  - cargo test
-  - cargo run --manifest-path systest/Cargo.toml --release
-  - if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-      cargo test --features unstable;
-      cargo test --manifest-path git2-curl/Cargo.toml;
-    fi
-
-env:
-  global:
-    secure: "SVk5cv4VnBQAoaBXt9pIHk+FQ7Z58zT5EaPo7Ac81LltKztwHovhN/R1otKzgrAJqFsZ/nKR4cGyQGbYtfVJcsqweQVM75LI6Oh6lYyEdfX211ZI3SWQ50JO93CmwLtanC5UpECdXvJLCgXrHGJXuL1oi7hySGy47/yQlKH6eaM="
-
-notifications:
-  email:
-    on_success: never
-
-addons:
-  apt:
-    sources:
-      - kalakris-cmake
-    packages:
-      - cmake
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
diff -Nru cargo-0.32.0/vendor/glob/.travis.yml cargo-0.33.0/vendor/glob/.travis.yml
--- cargo-0.32.0/vendor/glob/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/glob/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-sudo: false
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo doc
-after_success: |
-  [ $TRAVIS_BRANCH = master ] &&
-  [ $TRAVIS_PULL_REQUEST = false ] &&
-  [ $TRAVIS_RUST_VERSION = nightly ] &&
-  echo '<meta http-equiv=refresh content=0;url=glob/index.html>' > target/doc/index.html &&
-  pip install ghp-import --user $USER &&
-  $HOME/.local/bin/ghp-import -n target/doc &&
-  git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
-env:
-  global:
-    secure: I3a1njiqfFW9TpMKB715bpq3qHmsSmue/ahYbXhYbRoskWDWk+ruSKHS/X3nvSXY2Vv9oBCFaWldQvKdPtbpLYlfnIfquvUSzGzT3BW8bOAU6EY6+MQiToDln+xlcfjlSqBF4RGyrZtmuXzC1xXPKotG6jfUT1+7iOgaXLxyaRU=
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/globset/.cargo_vcs_info.json cargo-0.33.0/vendor/globset/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/globset/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/globset/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "a6567975f96483a15e686398076c34b58befce30"
-  }
-}
diff -Nru cargo-0.32.0/vendor/hex/.travis.yml cargo-0.33.0/vendor/hex/.travis.yml
--- cargo-0.32.0/vendor/hex/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/hex/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-matrix:
-  allow_failures:
-    - rust: nightly
diff -Nru cargo-0.32.0/vendor/home/.cargo-checksum.json cargo-0.33.0/vendor/home/.cargo-checksum.json
--- cargo-0.32.0/vendor/home/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/home/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"80dff82fb58cfbbc617fb9a9184b010be0529201553cda50ad04372bc2333aff"}
\ No newline at end of file
+{"files":{},"package":"29302b90cfa76231a757a887d1e3153331a63c7f80b6c75f86366334cbe70708"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/home/Cargo.toml cargo-0.33.0/vendor/home/Cargo.toml
--- cargo-0.32.0/vendor/home/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/home/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "home"
-version = "0.3.3"
+version = "0.3.4"
 authors = ["Brian Anderson <andersrb@gmail.com>"]
 description = "Shared definitions of home directories"
 documentation = "https://docs.rs/home"
diff -Nru cargo-0.32.0/vendor/home/src/lib.rs cargo-0.33.0/vendor/home/src/lib.rs
--- cargo-0.32.0/vendor/home/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/home/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -148,7 +148,7 @@
     }
 }
 
-#[cfg(unix)]
+#[cfg(any(unix, target_os = "redox"))]
 fn home_dir_() -> Option<PathBuf> {
     ::std::env::home_dir()
 }
diff -Nru cargo-0.32.0/vendor/humantime/.cargo_vcs_info.json cargo-0.33.0/vendor/humantime/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/humantime/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/humantime/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "040e5d0aecb450f55ea00b839bb1310bfd286645"
-  }
-}
diff -Nru cargo-0.32.0/vendor/humantime/.travis.yml cargo-0.33.0/vendor/humantime/.travis.yml
--- cargo-0.32.0/vendor/humantime/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/humantime/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-sudo: false
-dist: trusty
-language: rust
-
-cache:
-- cargo
-
-before_cache:
-- rm -r $TRAVIS_BUILD_DIR/target/debug
-
-jobs:
-  include:
-  - os: linux
-    rust: 1.18.0
-  - os: linux
-    rust: stable
-  - os: linux
-    rust: beta
-  - os: linux
-    rust: nightly
-
-  # deploy
-  - stage: publish
-    os: linux
-    rust: stable
-    env:
-    # CARGO_TOKEN
-    - secure: "OLR1+9BgqV6eQB2el9rJAGyN1blKH77RcqMWZc1UAtBoT9/iiWCrsEVbD78Qgvei37QCqoa9f4BaQ20Eo4gaodo2f7NoqAYubxRoCNnDN1Mn7GA66YcPTwajhI41KEGXI2lE35zcNbCuJR9cSax2Lb+Gu6Et0tIhT5Vi2Rem5g7Id/v/sqD6FRpP/oTMKT1YcZTt81lvRPsOJHjImDKYWwTcxDmK6/FPPqrLVnXRdZeArAIgfE37KAZQPjrySC1JxESdQ0OhSkg84lC1mxFk83w4MFIY14Pi59tzN5ukI1nhNNIuvkjErKI+/rpp7obJ1do9/pesh2kVeiaR2XXdB4T6SR+oJo3VAfe+LmmBjBLTUXHM7Iwg6vc8Xors7HCsgyvxY0S0ppjwh/PQa9yjx5eKRw2tB26HjCS/pom8ffTyjTh1//+4rVvMs/qp3cpfYyYVLGaGNRMtXCsYdiURCAZwTtKKbk9P4dWHX9ceVpi/Ikbqu0C18FueerBEbAc+Rum2bhEkf0smUC4LTPXQgsb2l2DDCFnTAvfeGz+7rJ26g7UAG+ua4KDeVU+R3VUUNjBwU5GeWy08/bEQz64KX+pTcRxEpxWVs55CeOQPTVEjoyhUvK0BYvRCovri+3YSqznf4Vm42QluJ6H90uyQTmfI030fQLnabmZn4M9Um+U="
-    install: true
-    script: true
-
-    deploy:
-    - provider: script
-      script: 'cargo publish --verbose --token=$CARGO_TOKEN'
-      on:
-        tags: true
diff -Nru cargo-0.32.0/vendor/ignore/.cargo-checksum.json cargo-0.33.0/vendor/ignore/.cargo-checksum.json
--- cargo-0.32.0/vendor/ignore/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"36ecfc5ad80f0b1226df948c562e2cddd446096be3f644c95106400eae8a5e01"}
\ No newline at end of file
+{"files":{},"package":"ad03ca67dc12474ecd91fdb94d758cbd20cb4e7a78ebe831df26a9b7511e1162"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/ignore/Cargo.toml cargo-0.33.0/vendor/ignore/Cargo.toml
--- cargo-0.32.0/vendor/ignore/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "ignore"
-version = "0.4.4"
+version = "0.4.6"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = "A fast library for efficiently matching ignore files such as `.gitignore`\nagainst file paths.\n"
 homepage = "https://github.com/BurntSushi/ripgrep/tree/master/ignore"
@@ -26,7 +26,7 @@
 name = "ignore"
 bench = false
 [dependencies.crossbeam-channel]
-version = "0.2.4"
+version = "0.3.3"
 
 [dependencies.globset]
 version = "0.4.2"
@@ -51,8 +51,8 @@
 
 [dependencies.walkdir]
 version = "2.2.5"
-[dev-dependencies.tempdir]
-version = "0.3.7"
+[dev-dependencies.tempfile]
+version = "3.0.5"
 
 [features]
 simd-accel = ["globset/simd-accel"]
diff -Nru cargo-0.32.0/vendor/ignore/.cargo_vcs_info.json cargo-0.33.0/vendor/ignore/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/ignore/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "ce80d794c06f5a54690d491a50e3fa6f01559acd"
-  }
-}
diff -Nru cargo-0.32.0/vendor/ignore/examples/walk.rs cargo-0.33.0/vendor/ignore/examples/walk.rs
--- cargo-0.32.0/vendor/ignore/examples/walk.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/examples/walk.rs	2019-02-06 04:11:58.000000000 +0000
@@ -37,19 +37,19 @@
             Box::new(move |result| {
                 use ignore::WalkState::*;
 
-                tx.send(DirEntry::Y(result.unwrap()));
+                tx.send(DirEntry::Y(result.unwrap())).unwrap();
                 Continue
             })
         });
     } else if simple {
         let walker = WalkDir::new(path);
         for result in walker {
-            tx.send(DirEntry::X(result.unwrap()));
+            tx.send(DirEntry::X(result.unwrap())).unwrap();
         }
     } else {
         let walker = WalkBuilder::new(path).build();
         for result in walker {
-            tx.send(DirEntry::Y(result.unwrap()));
+            tx.send(DirEntry::Y(result.unwrap())).unwrap();
         }
     }
     drop(tx);
diff -Nru cargo-0.32.0/vendor/ignore/src/dir.rs cargo-0.33.0/vendor/ignore/src/dir.rs
--- cargo-0.32.0/vendor/ignore/src/dir.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/src/dir.rs	2019-02-06 04:11:58.000000000 +0000
@@ -661,7 +661,7 @@
     use std::io::Write;
     use std::path::Path;
 
-    use tempdir::TempDir;
+    use tempfile::{self, TempDir};
 
     use dir::IgnoreBuilder;
     use gitignore::Gitignore;
@@ -683,9 +683,13 @@
         }
     }
 
+    fn tmpdir(prefix: &str) -> TempDir {
+        tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
+    }
+
     #[test]
     fn explicit_ignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join("not-an-ignore"), "foo\n!bar");
 
         let (gi, err) = Gitignore::new(td.path().join("not-an-ignore"));
@@ -700,7 +704,7 @@
 
     #[test]
     fn git_exclude() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         mkdirp(td.path().join(".git/info"));
         wfile(td.path().join(".git/info/exclude"), "foo\n!bar");
 
@@ -713,7 +717,7 @@
 
     #[test]
     fn gitignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         mkdirp(td.path().join(".git"));
         wfile(td.path().join(".gitignore"), "foo\n!bar");
 
@@ -726,7 +730,7 @@
 
     #[test]
     fn gitignore_no_git() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".gitignore"), "foo\n!bar");
 
         let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
@@ -738,7 +742,7 @@
 
     #[test]
     fn ignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".ignore"), "foo\n!bar");
 
         let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
@@ -750,7 +754,7 @@
 
     #[test]
     fn custom_ignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         let custom_ignore = ".customignore";
         wfile(td.path().join(custom_ignore), "foo\n!bar");
 
@@ -766,7 +770,7 @@
     // Tests that a custom ignore file will override an .ignore.
     #[test]
     fn custom_ignore_over_ignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         let custom_ignore = ".customignore";
         wfile(td.path().join(".ignore"), "foo");
         wfile(td.path().join(custom_ignore), "!foo");
@@ -781,7 +785,7 @@
     // Tests that earlier custom ignore files have lower precedence than later.
     #[test]
     fn custom_ignore_precedence() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         let custom_ignore1 = ".customignore1";
         let custom_ignore2 = ".customignore2";
         wfile(td.path().join(custom_ignore1), "foo");
@@ -798,7 +802,7 @@
     // Tests that an .ignore will override a .gitignore.
     #[test]
     fn ignore_over_gitignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".gitignore"), "foo");
         wfile(td.path().join(".ignore"), "!foo");
 
@@ -810,7 +814,7 @@
     // Tests that exclude has lower precedent than both .ignore and .gitignore.
     #[test]
     fn exclude_lowest() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".gitignore"), "!foo");
         wfile(td.path().join(".ignore"), "!bar");
         mkdirp(td.path().join(".git/info"));
@@ -825,7 +829,7 @@
 
     #[test]
     fn errored() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".gitignore"), "f**oo");
 
         let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
@@ -834,7 +838,7 @@
 
     #[test]
     fn errored_both() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".gitignore"), "f**oo");
         wfile(td.path().join(".ignore"), "fo**o");
 
@@ -844,7 +848,7 @@
 
     #[test]
     fn errored_partial() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         mkdirp(td.path().join(".git"));
         wfile(td.path().join(".gitignore"), "f**oo\nbar");
 
@@ -855,7 +859,7 @@
 
     #[test]
     fn errored_partial_and_ignore() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         wfile(td.path().join(".gitignore"), "f**oo\nbar");
         wfile(td.path().join(".ignore"), "!bar");
 
@@ -866,7 +870,7 @@
 
     #[test]
     fn not_present_empty() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
 
         let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
         assert!(err.is_none());
@@ -876,7 +880,7 @@
     fn stops_at_git_dir() {
         // This tests that .gitignore files beyond a .git barrier aren't
         // matched, but .ignore files are.
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("foo/.git"));
         wfile(td.path().join(".gitignore"), "foo");
@@ -897,7 +901,7 @@
 
     #[test]
     fn absolute_parent() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("foo"));
         wfile(td.path().join(".gitignore"), "bar");
@@ -920,7 +924,7 @@
 
     #[test]
     fn absolute_parent_anchored() {
-        let td = TempDir::new("ignore-test-").unwrap();
+        let td = tmpdir("ignore-test-");
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("src/llvm"));
         wfile(td.path().join(".gitignore"), "/llvm/\nfoo");
diff -Nru cargo-0.32.0/vendor/ignore/src/gitignore.rs cargo-0.33.0/vendor/ignore/src/gitignore.rs
--- cargo-0.32.0/vendor/ignore/src/gitignore.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/src/gitignore.rs	2019-02-06 04:11:58.000000000 +0000
@@ -419,6 +419,8 @@
         from: Option<PathBuf>,
         mut line: &str,
     ) -> Result<&mut GitignoreBuilder, Error> {
+        #![allow(deprecated)]
+
         if line.starts_with("#") {
             return Ok(self);
         }
diff -Nru cargo-0.32.0/vendor/ignore/src/lib.rs cargo-0.33.0/vendor/ignore/src/lib.rs
--- cargo-0.32.0/vendor/ignore/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -56,7 +56,7 @@
 extern crate regex;
 extern crate same_file;
 #[cfg(test)]
-extern crate tempdir;
+extern crate tempfile;
 extern crate thread_local;
 extern crate walkdir;
 #[cfg(windows)]
diff -Nru cargo-0.32.0/vendor/ignore/src/types.rs cargo-0.33.0/vendor/ignore/src/types.rs
--- cargo-0.32.0/vendor/ignore/src/types.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/src/types.rs	2019-02-06 04:11:58.000000000 +0000
@@ -103,10 +103,12 @@
     ("amake", &["*.mk", "*.bp"]),
     ("asciidoc", &["*.adoc", "*.asc", "*.asciidoc"]),
     ("asm", &["*.asm", "*.s", "*.S"]),
+    ("asp", &["*.aspx", "*.aspx.cs", "*.aspx.cs", "*.ascx", "*.ascx.cs", "*.ascx.vb"]),
     ("avro", &["*.avdl", "*.avpr", "*.avsc"]),
     ("awk", &["*.awk"]),
-    ("bazel", &["*.bzl", "WORKSPACE", "BUILD"]),
+    ("bazel", &["*.bzl", "WORKSPACE", "BUILD", "BUILD.bazel"]),
     ("bitbake", &["*.bb", "*.bbappend", "*.bbclass", "*.conf", "*.inc"]),
+    ("buildstream", &["*.bst"]),
     ("bzip2", &["*.bz2"]),
     ("c", &["*.c", "*.h", "*.H", "*.cats"]),
     ("cabal", &["*.cabal"]),
@@ -127,7 +129,7 @@
     ("cshtml", &["*.cshtml"]),
     ("css", &["*.css", "*.scss"]),
     ("csv", &["*.csv"]),
-    ("cython", &["*.pyx"]),
+    ("cython", &["*.pyx", "*.pxi", "*.pxd"]),
     ("dart", &["*.dart"]),
     ("d", &["*.d"]),
     ("dhall", &["*.dhall"]),
@@ -224,6 +226,7 @@
     ("pdf", &["*.pdf"]),
     ("php", &["*.php", "*.php3", "*.php4", "*.php5", "*.phtml"]),
     ("pod", &["*.pod"]),
+    ("postscript", &[".eps", ".ps"]),
     ("protobuf", &["*.proto"]),
     ("ps", &["*.cdxml", "*.ps1", "*.ps1xml", "*.psd1", "*.psm1"]),
     ("puppet", &["*.erb", "*.pp", "*.rb"]),
@@ -280,6 +283,7 @@
     ("tcl", &["*.tcl"]),
     ("tex", &["*.tex", "*.ltx", "*.cls", "*.sty", "*.bib"]),
     ("textile", &["*.textile"]),
+    ("thrift", &["*.thrift"]),
     ("tf", &["*.tf"]),
     ("ts", &["*.ts", "*.tsx"]),
     ("txt", &["*.txt"]),
diff -Nru cargo-0.32.0/vendor/ignore/src/walk.rs cargo-0.33.0/vendor/ignore/src/walk.rs
--- cargo-0.32.0/vendor/ignore/src/walk.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ignore/src/walk.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1118,7 +1118,7 @@
                 dent: dent,
                 ignore: self.ig_root.clone(),
                 root_device: root_device,
-            }));
+            })).unwrap();
             any_work = true;
         }
         // ... but there's no need to start workers if we don't need them.
@@ -1431,7 +1431,7 @@
                 dent: dent,
                 ignore: ig.clone(),
                 root_device: root_device,
-            }));
+            })).unwrap();
         }
         WalkState::Continue
     }
@@ -1446,12 +1446,12 @@
                 return None;
             }
             match self.rx.try_recv() {
-                Some(Message::Work(work)) => {
+                Ok(Message::Work(work)) => {
                     self.waiting(false);
                     self.quitting(false);
                     return Some(work);
                 }
-                Some(Message::Quit) => {
+                Ok(Message::Quit) => {
                     // We can't just quit because a Message::Quit could be
                     // spurious. For example, it's possible to observe that
                     // all workers are waiting even if there's more work to
@@ -1482,12 +1482,12 @@
                         // Otherwise, spin.
                     }
                 }
-                None => {
+                Err(_) => {
                     self.waiting(true);
                     self.quitting(false);
                     if self.num_waiting() == self.threads {
                         for _ in 0..self.threads {
-                            self.tx.send(Message::Quit);
+                            self.tx.send(Message::Quit).unwrap();
                         }
                     } else {
                         // You're right to consider this suspicious, but it's
@@ -1702,7 +1702,7 @@
     use std::path::Path;
     use std::sync::{Arc, Mutex};
 
-    use tempdir::TempDir;
+    use tempfile::{self, TempDir};
 
     use super::{DirEntry, WalkBuilder, WalkState};
 
@@ -1789,6 +1789,10 @@
         paths
     }
 
+    fn tmpdir(prefix: &str) -> TempDir {
+        tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
+    }
+
     fn assert_paths(
         prefix: &Path,
         builder: &WalkBuilder,
@@ -1802,7 +1806,7 @@
 
     #[test]
     fn no_ignores() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join("a/b/c"));
         mkdirp(td.path().join("x/y"));
         wfile(td.path().join("a/b/foo"), "");
@@ -1815,7 +1819,7 @@
 
     #[test]
     fn custom_ignore() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         let custom_ignore = ".customignore";
         mkdirp(td.path().join("a"));
         wfile(td.path().join(custom_ignore), "foo");
@@ -1831,7 +1835,7 @@
 
     #[test]
     fn custom_ignore_exclusive_use() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         let custom_ignore = ".customignore";
         mkdirp(td.path().join("a"));
         wfile(td.path().join(custom_ignore), "foo");
@@ -1851,7 +1855,7 @@
 
     #[test]
     fn gitignore() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("a"));
         wfile(td.path().join(".gitignore"), "foo");
@@ -1867,7 +1871,7 @@
 
     #[test]
     fn explicit_ignore() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         let igpath = td.path().join(".not-an-ignore");
         mkdirp(td.path().join("a"));
         wfile(&igpath, "foo");
@@ -1883,7 +1887,7 @@
 
     #[test]
     fn explicit_ignore_exclusive_use() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         let igpath = td.path().join(".not-an-ignore");
         mkdirp(td.path().join("a"));
         wfile(&igpath, "foo");
@@ -1901,7 +1905,7 @@
 
     #[test]
     fn gitignore_parent() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("a"));
         wfile(td.path().join(".gitignore"), "foo");
@@ -1914,7 +1918,7 @@
 
     #[test]
     fn max_depth() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join("a/b/c"));
         wfile(td.path().join("foo"), "");
         wfile(td.path().join("a/foo"), "");
@@ -1934,7 +1938,7 @@
 
     #[test]
     fn max_filesize() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join("a/b"));
         wfile_size(td.path().join("foo"), 0);
         wfile_size(td.path().join("bar"), 400);
@@ -1961,7 +1965,7 @@
     #[cfg(unix)] // because symlinks on windows are weird
     #[test]
     fn symlinks() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join("a/b"));
         symlink(td.path().join("a/b"), td.path().join("z"));
         wfile(td.path().join("a/b/foo"), "");
@@ -1978,7 +1982,7 @@
     #[cfg(unix)] // because symlinks on windows are weird
     #[test]
     fn first_path_not_symlink() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join("foo"));
 
         let dents = WalkBuilder::new(td.path().join("foo"))
@@ -1999,7 +2003,7 @@
     #[cfg(unix)] // because symlinks on windows are weird
     #[test]
     fn symlink_loop() {
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         mkdirp(td.path().join("a/b"));
         symlink(td.path().join("a"), td.path().join("a/b/c"));
 
@@ -2029,7 +2033,7 @@
 
         // If our test directory actually isn't a different volume from /sys,
         // then this test is meaningless and we shouldn't run it.
-        let td = TempDir::new("walk-test-").unwrap();
+        let td = tmpdir("walk-test-");
         if device_num(td.path()).unwrap() == device_num("/sys").unwrap() {
             return;
         }
diff -Nru cargo-0.32.0/vendor/im-rc/build.rs cargo-0.33.0/vendor/im-rc/build.rs
--- cargo-0.32.0/vendor/im-rc/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,27 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+extern crate rustc_version;
+
+use rustc_version::{version_meta, Channel};
+use std::env;
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    match version_meta().unwrap().channel {
+        Channel::Nightly => {
+            println!("cargo:rustc-cfg=has_specialisation");
+        }
+        _ => (),
+    }
+    let pkgname = env::var("CARGO_PKG_NAME").expect("Cargo didn't set the CARGO_PKG_NAME env var!");
+    let test_rc = env::var("IM_TEST_RC").is_ok();
+    match pkgname.as_str() {
+        "im" => if !test_rc {
+            println!("cargo:rustc-cfg=threadsafe")
+        },
+        "im-rc" => {}
+        _ => panic!("unexpected package name!"),
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/.cargo-checksum.json cargo-0.33.0/vendor/im-rc/.cargo-checksum.json
--- cargo-0.32.0/vendor/im-rc/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"9460397452f537fd51808056ff209f4c4c4c9d20d42ae952f517708726284972"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/im-rc/Cargo.toml cargo-0.33.0/vendor/im-rc/Cargo.toml
--- cargo-0.32.0/vendor/im-rc/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,70 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "im-rc"
+version = "12.3.0"
+authors = ["Bodil Stokke <bodil@bodil.org>"]
+build = "./build.rs"
+description = "Immutable collection datatypes (the fast but not thread safe version)"
+homepage = "http://immutable.rs/"
+documentation = "http://immutable.rs/"
+readme = "../../README.md"
+keywords = ["immutable", "persistent", "hamt", "b-tree", "rrb-tree"]
+categories = ["data-structures"]
+license = "MPL-2.0+"
+repository = "https://github.com/bodil/im-rs"
+
+[lib]
+path = "./src/lib.rs"
+[dependencies.proptest]
+version = "0.8"
+optional = true
+
+[dependencies.quickcheck]
+version = "0.8"
+optional = true
+
+[dependencies.rayon]
+version = "1.0"
+optional = true
+
+[dependencies.serde]
+version = "1.0"
+optional = true
+
+[dependencies.typenum]
+version = "1.10"
+[dev-dependencies.metrohash]
+version = "1.0.6"
+
+[dev-dependencies.pretty_assertions]
+version = "0.5"
+
+[dev-dependencies.proptest]
+version = "0.8"
+
+[dev-dependencies.rand]
+version = "0.6"
+
+[dev-dependencies.rayon]
+version = "1.0"
+
+[dev-dependencies.serde]
+version = "1.0"
+
+[dev-dependencies.serde_json]
+version = "1.0"
+[build-dependencies.rustc_version]
+version = "0.2"
+[badges.travis-ci]
+repository = "bodil/im-rs"
diff -Nru cargo-0.32.0/vendor/im-rc/CHANGELOG.md cargo-0.33.0/vendor/im-rc/CHANGELOG.md
--- cargo-0.32.0/vendor/im-rc/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,260 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic
+Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [12.3.0] - 2019-01-15
+
+### Added
+
+- `singleton` methods have been deprecated and renamed to `unit`.
+- `Vector::chunks` and `Vector::chunks_mut` have been deprecated and renamed to
+  `leaves` and `leaves_mut` to avoid confusion with `Vec::chunks`. (#50)
+
+### Fixed
+
+- Fixed an issue where the `HashMap` draining iterator might access uninitialised memory leading to
+  undefined behaviour. (#60)
+- Fixed multiple issues in `Vector::split_off` and `Vector::append` that would cause lookup errors
+  and unexpectedly unbalanced trees. (#55).
+
+## [12.2.0] - 2018-10-12
+
+### Added
+- `OrdMap` and `OrdSet` now have a `range()` method which makes an iterator over
+  a bounded subset of the values. The improved iterator implementation is also
+  considerably more efficient than the previous (about an order of magnitude
+  faster for nontrivial data sets). `iter()` has been updated to take advantage
+  of this, and is now just an alias for `range(..)`. (#27)
+- `FocusMut` now has an `unmut` method to turn it into an immutable `Focus`,
+  releasing its exclusive hold on the underlying `Vector`.
+- `Focus` now implements `Clone`.
+
+## [12.1.0] - 2018-09-25
+
+### Added
+- Maps and sets now have the `clear` method just like `Vector`. (#46)
+
+### Changed
+- Single chunk `Vector`s are no longer allocated directly on the stack, meaning
+  that they're now comparable in performance to `std::vec::Vec` rather than
+  slightly faster, but they also won't eat up your stack space quite as quickly,
+  and they'll clone without copying and share structure with clones as you'd
+  expect.
+
+## [12.0.0] - 2018-08-30
+
+Starting with this release, the `arc` flag is gone, in favour of publishing `im`
+as two separate crates: `im` (using `Arc`) and `im-rc` (using `Rc`). They're
+identical (and built from the same code), except that `im` is thread safe and
+`im-rc` is a little bit more performant.
+
+This is a major release as a consequence, but there should be no breaking code
+changes other than the new default choice of reference counter.
+
+### Added
+- The `Chunk` datatype that's used to build `Vector` and `OrdMap` has been
+  exposed and made generally usable. It's somewhere between a
+  [`GenericArray`](https://crates.io/crates/generic-array) and a ring buffer,
+  offers O(1)* push in either direction, and is generally hyperoptimised for its
+  purpose of serving as nodes for Bagwell tries, but it's also a powered up
+  version of [`GenericArray`](https://crates.io/crates/generic-array) that might
+  be useful to others, hence the public API.
+- `Vector` now has `Focus` and `FocusMut` APIs for caching index lookups,
+  yielding huge performance gains when performing multiple adjacent index
+  lookups.  `Vector::iter` has been reimplemented using this API, and is now
+  much simpler and about twice as fast as a result, and `Vector::iter_mut` now
+  runs nearly an order of magnitude faster. Likewise, `Vector::sort` and
+  `Vector::retain` are now using `FocusMut` and run considerably faster as a
+  result.
+- `Focus` and `FocusMut` can also be used as stand ins for subslices through the
+  `narrow` and `split_at` methods. You can also iterate over foci, making this
+  the most efficient way to iterate over a subset of a `Vector`.
+- `Vector` now implements [Rayon](https://crates.io/crates/rayon)'s parallel
+  iterators behind the `rayon` feature flag.
+
+### Changed
+- As `std::ops::RangeBounds` is now stabilised in Rust 1.28, the `Vector::slice`
+  method is now unconditionally available on the stable channel.
+- Union/difference/intersection/is_submap methods on `HashMap` and `OrdMap` that
+  take functions now take `FnMut` instead of `Fn`. This should not affect any
+  existing code. (#34)
+- `Vector::split_off` can now take an index equal to the length of the vector,
+  yielding an empty vector as the split result. (#33)
+- `Vector::set` now returns the replaced value.
+
+### Fixed
+- `Vector` is now represented as a single inline chunk until it grows larger
+  than the chunk size, making it even faster than `Vec` at small sizes, though
+  `clone` could now be slower if the clone is expensive (it's still absurdly
+  fast for `A: Copy`).
+
+## [11.0.1] - 2018-07-23
+
+### Fixed
+- Various performance improvements, amounting to a 5-10% speedup for both kinds
+  of map/set.
+- Fixed an edge case bug in `sort::quicksort`.
+
+## [11.0.0] - 2018-07-10
+
+### Changed
+
+This is a major release with many breaking changes, and is intended to stabilise
+the API more than to denote that the rewrite is now production ready. You should
+expect future releases with significant performance improvements as well as
+additional APIs, but there should be no further major release with breaking
+changes in the immediate future, barring very serious unforeseen issues.
+
+Specifically, you should expect imminent minor releases with performance
+improvements for `Vector` and `OrdMap`, for which I have a number of known
+optimisations that remain unimplemented.
+
+#### No More `Arc`
+
+All data structures have been reworked to take values of `A: Clone` instead of
+`Arc<A>`, meaning that there's less performance overhead (as well as mental
+overhead) when using values that clone cheaply. The performance gain when values
+are `A: Copy` is a factor of two or more. It's expected that users should wrap
+values in `Arc` themselves when using values which are expensive to clone.
+
+Data structures still use reference counters internally to reference nodes, but
+values are stored directly in the nodes with no further indirection. This is
+also good for cache locality.
+
+Data structures now use `Rc` instead of `Arc` by default to do reference
+counting. If you need a thread safe version that implements `Send` and `Sync`,
+you can enable the `arc` feature on the package to compile with `Arc` instead.
+
+#### `std::collections` Compatible API
+
+The API has been reworked to align more closely with `std::collections`,
+favouring mutable operations by default, so that operations that were previously
+suffixed with `_mut` are now the standard operations, and immutable operations
+which return a modified copy have been given different names altogether. In
+short, all your code using previous versions of this library will no longer
+work, and if it was relying heavily on immutable operations, it's recommended
+that you rewrite it to be mutable by preference, but you should generally be
+able to make it work again by using the new method names for the immutable
+operations.
+
+Here is a list of the most notable changed method names for maps and sets:
+
+| Previous immutable | Current immutable | Previous mutable | Current mutable |
+| ------------------ | ----------------- | ---------------- | --------------- |
+| `insert`           | `update`          | `insert_mut`     | `insert`        |
+| `remove`           | `without`         | `remove_mut`     | `remove`        |
+| `pop`              | `extract`         | `pop_mut`        | `remove`        |
+
+You should expect to be able to rewrite code using `std::collections::HashMap`
+and `std::collections::BTreeMap` with minimal or no changes using `im::HashMap`
+and `im::OrdMap` respectively.
+
+`Vector` has been completely rewritten and has an API that aligns closely with
+`std::collections::VecDeque`, with very few immutable equivalents. It's expected
+that you should use `Vector::clone()` to take a snapshot when you need it rather
+than cause an implicit clone for each operation. (It's still O(1) and
+practically instant.)
+
+I'm considering adding back some of the immutable operations if I can come up
+with good names for them, but for now, just `clone` it if you need it.
+
+#### RRB Vector
+
+`Vector` is now implemented as an [RRB
+tree](https://infoscience.epfl.ch/record/213452/files/rrbvector.pdf) with [smart
+head/tail chunking](http://gallium.inria.fr/~rainey/chunked_seq.pdf), obsoleting
+the previous [Hickey
+trie](https://hypirion.com/musings/understanding-persistent-vector-pt-1)
+implementation.
+
+RRB trees have generally similar performance characteristics to the Hickey trie,
+with the added benefit of having O(log n) splitting and concatenation.
+
+| Operation       | RRB tree | Hickey trie | Vec    | VecDeque |
+| --------------- | -------- | ----------- | ------ | -------- |
+| Push front      | O(1)\*   | O(log n)    | O(n)   | O(1)\*   |
+| Push back       | O(1)\*   | O(log n)    | O(1)\* | O(1)\*   |
+| Pop front       | O(1)\*   | O(log n)    | O(n)   | O(1)\*   |
+| Pop back        | O(1)\*   | O(log n)    | O(1)   | O(1)\*   |
+| Lookup by index | O(log n) | O(log n)    | O(1)   | O(1)     |
+| Split           | O(log n) | O(log n)    | O(n)   | O(n)     |
+| Join            | O(log n) | O(n)        | O(n)   | O(n)     |
+
+(Please note that the timings above are for the `im` version of the Hickey trie,
+based on the [Immutable.js](https://facebook.github.io/immutable-js/)
+implementation, which performs better than the original Clojure version on
+splits and push/pop front, but worse on push/pop back).
+
+The RRB tree is the most generally efficient list like data structure currently
+known, to my knowledge, but obviously it does not and cannot perform as well as
+a simple `Vec` on certain operations. It makes up for that by having no
+operations you need to worry about the performance complexity of: nothing you
+can do to an RRB tree is going to be more expensive than just iterating over it.
+For larger data sets, being able to concatenate (and, by extension, insert and
+remove at arbitrary locations) several orders of magnitude faster than `Vec`
+could also be considered a selling point.
+
+#### No More `CatList` And `ConsList`
+
+`CatList` has been superseded by `Vector`, and `ConsList` was generally not very
+useful except in the more peculiar edge cases where memory consumption matters
+more than performance, and keeping it in line with current API changes wasn't
+practical.
+
+#### No More Funny Words
+
+Though it breaks my heart, words like `cons`, `snoc`, `car`, `cdr` and `uncons`
+are no longer used in the `im` API, to facilitiate closer alignment with
+`std::collections`. Even the `head`/`tail` pair is gone, though `head` and
+`last` remain as aliases for `front` and `back`.
+
+## [10.2.0] - 2018-04-15
+
+### Added
+
+-   Map/set methods which accept references to keys will now also take any value
+    that's borrowable to the key's type, ie. it will take a reference to a type
+    `Borrowable` where the key implements `Borrow<Borrowable>`. This is
+    particularly handy for types such as `String` because you can now pass `&str`
+    to key lookups instead of `&String`. So, instead of the incredibly cumbersome
+    `map.get(&"foo".to_string())` you can just do `map.get("foo")` when looking up
+    a mapping for a string literal.
+
+## [10.1.0] - 2018-04-12
+
+### Added
+
+-   `Vector`, `OrdMap` and `HashMap` now implement `Index` and `IndexMut`,
+    allowing for syntax like `map[key] = value`.
+-   Added `cons`, `snoc`, `uncons` and `unsnoc` aliases where they were missing.
+-   Everything now implements `Sum` and `Extend` where possible.
+
+### Changed
+
+-   Generalised `OrdMap`/`OrdSet`'s internal nodes so `OrdSet` now only needs to
+    store pointers to its values, not pairs of pointers to value and `Unit`. This
+    has caused `OrdMap/Set`'s type constraints to tighten somewhat - in
+    particular, iteration over maps/sets whose keys don't implement `Ord` is no
+    longer possible, but as you would only have been able to create empty
+    instances of these, no sensible code should break because of this.
+-   `HashMap`/`HashSet` now also cannot be iterated over unless they implement
+    `Hash + Eq`, with the same note as above.
+-   Constraints on single operations that take closures on `HashMap` and `OrdMap`
+    have been relaxed from `Fn` to `FnOnce`. (Fixes #7.)
+
+### Fixed
+
+-   Hashes are now stored in `HashMap`s along with their associated values,
+    removing the need to recompute the hash when a value is reordered inside the
+    tree.
+
+## [10.0.0] - 2018-03-25
+
+### Added
+
+This is the first release to be considered reasonably stable. No changelog has
+been kept until now.
diff -Nru cargo-0.32.0/vendor/im-rc/CODE_OF_CONDUCT.md cargo-0.33.0/vendor/im-rc/CODE_OF_CONDUCT.md
--- cargo-0.32.0/vendor/im-rc/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/CODE_OF_CONDUCT.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+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, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at admin@immutable.rs. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
diff -Nru cargo-0.32.0/vendor/im-rc/LICENCE.md cargo-0.33.0/vendor/im-rc/LICENCE.md
--- cargo-0.32.0/vendor/im-rc/LICENCE.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/LICENCE.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,355 @@
+Mozilla Public License Version 2.0
+==================================
+
+### 1. Definitions
+
+**1.1. “Contributor”**
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+**1.2. “Contributor Version”**
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+**1.3. “Contribution”**
+    means Covered Software of a particular Contributor.
+
+**1.4. “Covered Software”**
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+**1.5. “Incompatible With Secondary Licenses”**
+    means
+
+* **(a)** that the initial Contributor has attached the notice described
+    in Exhibit B to the Covered Software; or
+* **(b)** that the Covered Software was made available under the terms of
+    version 1.1 or earlier of the License, but not also under the
+    terms of a Secondary License.
+
+**1.6. “Executable Form”**
+    means any form of the work other than Source Code Form.
+
+**1.7. “Larger Work”**
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+**1.8. “License”**
+    means this document.
+
+**1.9. “Licensable”**
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+**1.10. “Modifications”**
+    means any of the following:
+
+* **(a)** any file in Source Code Form that results from an addition to,
+    deletion from, or modification of the contents of Covered
+    Software; or
+* **(b)** any new file in Source Code Form that contains any Covered
+    Software.
+
+**1.11. “Patent Claims” of a Contributor**
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+**1.12. “Secondary License”**
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+**1.13. “Source Code Form”**
+    means the form of the work preferred for making modifications.
+
+**1.14. “You” (or “Your”)**
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, “You” includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, “control” means **(a)** the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or **(b)** ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+
+### 2. License Grants and Conditions
+
+#### 2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+* **(a)** under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+* **(b)** under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+#### 2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+#### 2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+* **(a)** for any code that a Contributor has removed from Covered Software;
+    or
+* **(b)** for infringements caused by: **(i)** Your and any other third party's
+    modifications of Covered Software, or **(ii)** the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+* **(c)** under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+#### 2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+#### 2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+#### 2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+#### 2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+
+### 3. Responsibilities
+
+#### 3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+#### 3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+* **(a)** such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+* **(b)** You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+#### 3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+#### 3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+#### 3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+
+### 4. Inability to Comply Due to Statute or Regulation
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: **(a)** comply with
+the terms of this License to the maximum extent possible; and **(b)**
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+
+### 5. Termination
+
+**5.1.** The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated **(a)** provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and **(b)** on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+**5.2.** If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+**5.3.** In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+
+### 6. Disclaimer of Warranty
+
+> Covered Software is provided under this License on an “as is”
+> basis, without warranty of any kind, either expressed, implied, or
+> statutory, including, without limitation, warranties that the
+> Covered Software is free of defects, merchantable, fit for a
+> particular purpose or non-infringing. The entire risk as to the
+> quality and performance of the Covered Software is with You.
+> Should any Covered Software prove defective in any respect, You
+> (not any Contributor) assume the cost of any necessary servicing,
+> repair, or correction. This disclaimer of warranty constitutes an
+> essential part of this License. No use of any Covered Software is
+> authorized under this License except under this disclaimer.
+
+### 7. Limitation of Liability
+
+> Under no circumstances and under no legal theory, whether tort
+> (including negligence), contract, or otherwise, shall any
+> Contributor, or anyone who distributes Covered Software as
+> permitted above, be liable to You for any direct, indirect,
+> special, incidental, or consequential damages of any character
+> including, without limitation, damages for lost profits, loss of
+> goodwill, work stoppage, computer failure or malfunction, or any
+> and all other commercial damages or losses, even if such party
+> shall have been informed of the possibility of such damages. This
+> limitation of liability shall not apply to liability for death or
+> personal injury resulting from such party's negligence to the
+> extent applicable law prohibits such limitation. Some
+> jurisdictions do not allow the exclusion or limitation of
+> incidental or consequential damages, so this exclusion and
+> limitation may not apply to You.
+
+
+### 8. Litigation
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+
+### 9. Miscellaneous
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+
+### 10. Versions of the License
+
+#### 10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+#### 10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+#### 10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+#### 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+## Exhibit A - Source Code Form License Notice
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+## Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+    This Source Code Form is "Incompatible With Secondary Licenses", as
+    defined by the Mozilla Public License, v. 2.0.
diff -Nru cargo-0.32.0/vendor/im-rc/README.md cargo-0.33.0/vendor/im-rc/README.md
--- cargo-0.32.0/vendor/im-rc/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,26 @@
+# im-rs
+
+Blazing fast immutable collection datatypes for Rust.
+
+Comes in two versions: [`im`](https://crates.io/crates/im) (thread safe) and
+[`im-rc`](https://crates.io/crates/im-rc) (fast but not thread safe).
+
+## Documentation
+
+* [API docs](https://docs.rs/im/)
+
+## Licence
+
+Copyright 2017 Bodil Stokke
+
+This software is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Code of Conduct
+
+Please note that this project is released with a [Contributor Code of
+Conduct][coc]. By participating in this project you agree to abide by its
+terms.
+
+[coc]: https://github.com/bodil/im-rs/blob/master/CODE_OF_CONDUCT.md
diff -Nru cargo-0.32.0/vendor/im-rc/src/config.rs cargo-0.33.0/vendor/im-rc/src/config.rs
--- cargo-0.32.0/vendor/im-rc/src/config.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/config.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,15 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use typenum::*;
+
+/// The branching factor of RRB-trees
+pub type VectorChunkSize = U64;
+
+/// The branching factor of B-trees
+pub type OrdChunkSize = U64; // Must be an even number!
+
+/// The level size of HAMTs, in bits
+/// Branching factor is 2 ^ HashLevelSize.
+pub type HashLevelSize = U5;
diff -Nru cargo-0.32.0/vendor/im-rc/src/hash/map.rs cargo-0.33.0/vendor/im-rc/src/hash/map.rs
--- cargo-0.32.0/vendor/im-rc/src/hash/map.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/hash/map.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,2229 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! An unordered map.
+//!
+//! An immutable hash map using [hash array mapped tries] [1].
+//!
+//! Most operations on this map are O(log<sub>x</sub> n) for a
+//! suitably high *x* that it should be nearly O(1) for most maps.
+//! Because of this, it's a great choice for a generic map as long as
+//! you don't mind that keys will need to implement
+//! [`Hash`][std::hash::Hash] and [`Eq`][std::cmp::Eq].
+//!
+//! Map entries will have a predictable order based on the hasher
+//! being used. Unless otherwise specified, all maps will use the
+//! default [`RandomState`][std::collections::hash_map::RandomState]
+//! hasher, which will produce consistent hashes for the duration of
+//! its lifetime, but not between restarts of your program.
+//!
+//! [1]: https://en.wikipedia.org/wiki/Hash_array_mapped_trie
+//! [std::cmp::Eq]: https://doc.rust-lang.org/std/cmp/trait.Eq.html
+//! [std::hash::Hash]: https://doc.rust-lang.org/std/hash/trait.Hash.html
+//! [std::collections::hash_map::RandomState]: https://doc.rust-lang.org/std/collections/hash_map/struct.RandomState.html
+
+use std::borrow::Borrow;
+use std::cmp::Ordering;
+use std::collections;
+use std::collections::hash_map::RandomState;
+use std::fmt::{Debug, Error, Formatter};
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::iter::{FromIterator, FusedIterator, Sum};
+use std::mem;
+use std::ops::{Add, Index, IndexMut};
+
+use nodes::hamt::{
+    hash_key, Drain as NodeDrain, HashBits, HashValue, Iter as NodeIter, IterMut as NodeIterMut,
+    Node,
+};
+use util::Ref;
+
+/// Construct a hash map from a sequence of key/value pairs.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::hashmap::HashMap;
+/// # fn main() {
+/// assert_eq!(
+///   hashmap!{
+///     1 => 11,
+///     2 => 22,
+///     3 => 33
+///   },
+///   HashMap::from(vec![(1, 11), (2, 22), (3, 33)])
+/// );
+/// # }
+/// ```
+#[macro_export]
+macro_rules! hashmap {
+    () => { $crate::hashmap::HashMap::new() };
+
+    ( $( $key:expr => $value:expr ),* ) => {{
+        let mut map = $crate::hashmap::HashMap::new();
+        $({
+            map.insert($key, $value);
+        })*;
+        map
+    }};
+
+    ( $( $key:expr => $value:expr ,)* ) => {{
+        let mut map = $crate::hashmap::HashMap::new();
+        $({
+            map.insert($key, $value);
+        })*;
+        map
+    }};
+}
+
+/// An unordered map.
+///
+/// An immutable hash map using [hash array mapped tries] [1].
+///
+/// Most operations on this map are O(log<sub>x</sub> n) for a
+/// suitably high *x* that it should be nearly O(1) for most maps.
+/// Because of this, it's a great choice for a generic map as long as
+/// you don't mind that keys will need to implement
+/// [`Hash`][std::hash::Hash] and [`Eq`][std::cmp::Eq].
+///
+/// Map entries will have a predictable order based on the hasher
+/// being used. Unless otherwise specified, all maps will share an
+/// instance of the default
+/// [`RandomState`][std::collections::hash_map::RandomState] hasher,
+/// which will produce consistent hashes for the duration of its
+/// lifetime, but not between restarts of your program.
+///
+/// [1]: https://en.wikipedia.org/wiki/Hash_array_mapped_trie
+/// [std::cmp::Eq]: https://doc.rust-lang.org/std/cmp/trait.Eq.html
+/// [std::hash::Hash]: https://doc.rust-lang.org/std/hash/trait.Hash.html
+/// [std::collections::hash_map::RandomState]: https://doc.rust-lang.org/std/collections/hash_map/struct.RandomState.html
+
+pub struct HashMap<K, V, S = RandomState>
+where
+    K: Clone,
+    V: Clone,
+{
+    size: usize,
+    root: Ref<Node<(K, V)>>,
+    hasher: Ref<S>,
+}
+
+impl<K, V> HashValue for (K, V)
+where
+    K: Eq + Clone,
+    V: Clone,
+{
+    type Key = K;
+
+    fn extract_key(&self) -> &Self::Key {
+        &self.0
+    }
+
+    fn ptr_eq(&self, _other: &Self) -> bool {
+        false
+    }
+}
+
+impl<K, V> HashMap<K, V, RandomState>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+{
+    /// Construct an empty hash map.
+    #[inline]
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Construct a hash map with a single mapping.
+    ///
+    /// This method has been deprecated; use [`unit`][unit] instead.
+    ///
+    /// [unit]: #method.unit
+    #[inline]
+    #[must_use]
+    #[deprecated(since = "12.3.0", note = "renamed to `unit` for consistency")]
+    pub fn singleton(k: K, v: V) -> HashMap<K, V> {
+        Self::unit(k, v)
+    }
+
+    /// Construct a hash map with a single mapping.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map = HashMap::unit(123, "onetwothree");
+    /// assert_eq!(
+    ///   map.get(&123),
+    ///   Some(&"onetwothree")
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn unit(k: K, v: V) -> HashMap<K, V> {
+        HashMap::new().update(k, v)
+    }
+}
+
+impl<K, V, S> HashMap<K, V, S>
+where
+    K: Clone,
+    V: Clone,
+{
+    /// Test whether a hash map is empty.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// assert!(
+    ///   !hashmap!{1 => 2}.is_empty()
+    /// );
+    /// assert!(
+    ///   HashMap::<i32, i32>::new().is_empty()
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get the size of a hash map.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// assert_eq!(3, hashmap!{
+    ///   1 => 11,
+    ///   2 => 22,
+    ///   3 => 33
+    /// }.len());
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.size
+    }
+}
+
+impl<K, V, S> HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher,
+{
+    fn test_eq(&self, other: &Self) -> bool
+    where
+        V: PartialEq,
+    {
+        if self.len() != other.len() {
+            return false;
+        }
+        let mut seen = collections::HashSet::new();
+        for (key, value) in self.iter() {
+            if Some(value) != other.get(&key) {
+                return false;
+            }
+            seen.insert(key);
+        }
+        for key in other.keys() {
+            if !seen.contains(&key) {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Construct an empty hash map using the provided hasher.
+    #[inline]
+    #[must_use]
+    pub fn with_hasher<RS>(hasher: RS) -> Self
+    where
+        Ref<S>: From<RS>,
+    {
+        HashMap {
+            size: 0,
+            root: Ref::new(Node::new()),
+            hasher: From::from(hasher),
+        }
+    }
+
+    /// Get a reference to the map's [`BuildHasher`][BuildHasher].
+    ///
+    /// [BuildHasher]: https://doc.rust-lang.org/std/hash/trait.BuildHasher.html
+    #[must_use]
+    pub fn hasher(&self) -> &Ref<S> {
+        &self.hasher
+    }
+
+    /// Construct an empty hash map using the same hasher as the
+    /// current hash map.
+    #[inline]
+    #[must_use]
+    pub fn new_from<K1, V1>(&self) -> HashMap<K1, V1, S>
+    where
+        K1: Hash + Eq + Clone,
+        V1: Clone,
+    {
+        HashMap {
+            size: 0,
+            root: Ref::new(Node::new()),
+            hasher: self.hasher.clone(),
+        }
+    }
+
+    /// Get an iterator over the key/value pairs of a hash map.
+    ///
+    /// Please note that the order is consistent between maps using
+    /// the same hasher, but no other ordering guarantee is offered.
+    /// Items will not come out in insertion order or sort order.
+    /// They will, however, come out in the same order every time for
+    /// the same map.
+    #[inline]
+    #[must_use]
+    pub fn iter(&self) -> Iter<'_, K, V> {
+        Iter {
+            it: NodeIter::new(&self.root, self.size),
+        }
+    }
+
+    /// Get a mutable iterator over the values of a hash map.
+    ///
+    /// Please note that the order is consistent between maps using
+    /// the same hasher, but no other ordering guarantee is offered.
+    /// Items will not come out in insertion order or sort order.
+    /// They will, however, come out in the same order every time for
+    /// the same map.
+    #[inline]
+    #[must_use]
+    pub fn iter_mut(&mut self) -> IterMut<'_, K, V> {
+        let root = Ref::make_mut(&mut self.root);
+        IterMut {
+            it: NodeIterMut::new(root, self.size),
+        }
+    }
+
+    /// Get an iterator over a hash map's keys.
+    ///
+    /// Please note that the order is consistent between maps using
+    /// the same hasher, but no other ordering guarantee is offered.
+    /// Items will not come out in insertion order or sort order.
+    /// They will, however, come out in the same order every time for
+    /// the same map.
+    #[inline]
+    #[must_use]
+    pub fn keys(&self) -> Keys<K, V> {
+        Keys {
+            it: NodeIter::new(&self.root, self.size),
+        }
+    }
+
+    /// Get an iterator over a hash map's values.
+    ///
+    /// Please note that the order is consistent between maps using
+    /// the same hasher, but no other ordering guarantee is offered.
+    /// Items will not come out in insertion order or sort order.
+    /// They will, however, come out in the same order every time for
+    /// the same map.
+    #[inline]
+    #[must_use]
+    pub fn values(&self) -> Values<K, V> {
+        Values {
+            it: NodeIter::new(&self.root, self.size),
+        }
+    }
+
+    /// Get the value for a key from a hash map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map = hashmap!{123 => "lol"};
+    /// assert_eq!(
+    ///   map.get(&123),
+    ///   Some(&"lol")
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get<BK>(&self, key: &BK) -> Option<&V>
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.root
+            .get(hash_key(&*self.hasher, key), 0, key)
+            .map(|&(_, ref v)| v)
+    }
+
+    /// Get a mutable reference to the value for a key from a hash
+    /// map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map = hashmap!{123 => "lol"};
+    /// assert_eq!(
+    ///   map.get(&123),
+    ///   Some(&"lol")
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get_mut<BK>(&mut self, key: &BK) -> Option<&mut V>
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        let root = Ref::make_mut(&mut self.root);
+        match root.get_mut(hash_key(&*self.hasher, key), 0, key) {
+            None => None,
+            Some(&mut (_, ref mut value)) => Some(value),
+        }
+    }
+
+    /// Test for the presence of a key in a hash map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map = hashmap!{123 => "lol"};
+    /// assert!(
+    ///   map.contains_key(&123)
+    /// );
+    /// assert!(
+    ///   !map.contains_key(&321)
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn contains_key<BK>(&self, k: &BK) -> bool
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.get(k).is_some()
+    }
+
+    /// Insert a key/value mapping into a map.
+    ///
+    /// If the map already has a mapping for the given key, the
+    /// previous value is overwritten.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let mut map = hashmap!{};
+    /// map.insert(123, "123");
+    /// map.insert(456, "456");
+    /// assert_eq!(
+    ///   map,
+    ///   hashmap!{123 => "123", 456 => "456"}
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    pub fn insert(&mut self, k: K, v: V) -> Option<V> {
+        let hash = hash_key(&*self.hasher, &k);
+        let root = Ref::make_mut(&mut self.root);
+        let result = root.insert(hash, 0, (k, v));
+        if result.is_none() {
+            self.size += 1;
+        }
+        result.map(|(_, v)| v)
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed value.
+    ///
+    /// This is a copy-on-write operation, so that the parts of the
+    /// set's structure which are shared with other sets will be
+    /// safely copied before mutating.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let mut map = hashmap!{123 => "123", 456 => "456"};
+    /// assert_eq!(Some("123"), map.remove(&123));
+    /// assert_eq!(Some("456"), map.remove(&456));
+    /// assert_eq!(None, map.remove(&789));
+    /// assert!(map.is_empty());
+    /// # }
+    /// ```
+    pub fn remove<BK>(&mut self, k: &BK) -> Option<V>
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.remove_with_key(k).map(|(_, v)| v)
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed key and value.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let mut map = hashmap!{123 => "123", 456 => "456"};
+    /// assert_eq!(Some((123, "123")), map.remove_with_key(&123));
+    /// assert_eq!(Some((456, "456")), map.remove_with_key(&456));
+    /// assert_eq!(None, map.remove_with_key(&789));
+    /// assert!(map.is_empty());
+    /// # }
+    /// ```
+    pub fn remove_with_key<BK>(&mut self, k: &BK) -> Option<(K, V)>
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        let root = Ref::make_mut(&mut self.root);
+        let result = root.remove(hash_key(&*self.hasher, k), 0, k);
+        if result.is_some() {
+            self.size -= 1;
+        }
+        result
+    }
+
+    /// Discard all elements from the map.
+    ///
+    /// This leaves you with an empty map, and all elements that
+    /// were previously inside it are dropped.
+    ///
+    /// Time: O(n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::HashMap;
+    /// # fn main() {
+    /// let mut map = hashmap![1=>1, 2=>2, 3=>3];
+    /// map.clear();
+    /// assert!(map.is_empty());
+    /// # }
+    /// ```
+    pub fn clear(&mut self) {
+        if !self.is_empty() {
+            self.root = Default::default();
+            self.size = 0;
+        }
+    }
+
+    /// Get the [`Entry`][Entry] for a key in the map for in-place manipulation.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [Entry]: enum.Entry.html
+    #[must_use]
+    pub fn entry(&mut self, key: K) -> Entry<'_, K, V, S> {
+        let hash = hash_key(&*self.hasher, &key);
+        if self.root.get(hash, 0, &key).is_some() {
+            Entry::Occupied(OccupiedEntry {
+                map: self,
+                hash,
+                key,
+            })
+        } else {
+            Entry::Vacant(VacantEntry {
+                map: self,
+                hash,
+                key,
+            })
+        }
+    }
+
+    /// Construct a new hash map by inserting a key/value mapping into a map.
+    ///
+    /// If the map already has a mapping for the given key, the previous value
+    /// is overwritten.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map = hashmap!{};
+    /// assert_eq!(
+    ///   map.update(123, "123"),
+    ///   hashmap!{123 => "123"}
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn update(&self, k: K, v: V) -> Self {
+        let mut out = self.clone();
+        out.insert(k, v);
+        out
+    }
+
+    /// Construct a new hash map by inserting a key/value mapping into
+    /// a map.
+    ///
+    /// If the map already has a mapping for the given key, we call
+    /// the provided function with the old value and the new value,
+    /// and insert the result as the new value.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn update_with<F>(&self, k: K, v: V, f: F) -> Self
+    where
+        F: FnOnce(V, V) -> V,
+    {
+        match self.extract_with_key(&k) {
+            None => self.update(k, v),
+            Some((_, v2, m)) => m.update(k, f(v2, v)),
+        }
+    }
+
+    /// Construct a new map by inserting a key/value mapping into a
+    /// map.
+    ///
+    /// If the map already has a mapping for the given key, we call
+    /// the provided function with the key, the old value and the new
+    /// value, and insert the result as the new value.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn update_with_key<F>(&self, k: K, v: V, f: F) -> Self
+    where
+        F: FnOnce(&K, V, V) -> V,
+    {
+        match self.extract_with_key(&k) {
+            None => self.update(k, v),
+            Some((_, v2, m)) => {
+                let out_v = f(&k, v2, v);
+                m.update(k, out_v)
+            }
+        }
+    }
+
+    /// Construct a new map by inserting a key/value mapping into a
+    /// map, returning the old value for the key as well as the new
+    /// map.
+    ///
+    /// If the map already has a mapping for the given key, we call
+    /// the provided function with the key, the old value and the new
+    /// value, and insert the result as the new value.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn update_lookup_with_key<F>(&self, k: K, v: V, f: F) -> (Option<V>, Self)
+    where
+        F: FnOnce(&K, &V, V) -> V,
+    {
+        match self.extract_with_key(&k) {
+            None => (None, self.update(k, v)),
+            Some((_, v2, m)) => {
+                let out_v = f(&k, &v2, v);
+                (Some(v2), m.update(k, out_v))
+            }
+        }
+    }
+
+    /// Update the value for a given key by calling a function with
+    /// the current value and overwriting it with the function's
+    /// return value.
+    ///
+    /// The function gets an [`Option<V>`][std::option::Option] and
+    /// returns the same, so that it can decide to delete a mapping
+    /// instead of updating the value, and decide what to do if the
+    /// key isn't in the map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [std::option::Option]: https://doc.rust-lang.org/std/option/enum.Option.html
+    #[must_use]
+    pub fn alter<F>(&self, f: F, k: K) -> Self
+    where
+        F: FnOnce(Option<V>) -> Option<V>,
+    {
+        let pop = self.extract_with_key(&k);
+        match (f(pop.as_ref().map(|&(_, ref v, _)| v.clone())), pop) {
+            (None, None) => self.clone(),
+            (Some(v), None) => self.update(k, v),
+            (None, Some((_, _, m))) => m,
+            (Some(v), Some((_, _, m))) => m.update(k, v),
+        }
+    }
+
+    /// Construct a new map without the given key.
+    ///
+    /// Construct a map that's a copy of the current map, absent the
+    /// mapping for `key` if it's present.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn without<BK>(&self, k: &BK) -> Self
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        match self.extract_with_key(k) {
+            None => self.clone(),
+            Some((_, _, map)) => map,
+        }
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed value as well as the updated map.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn extract<BK>(&self, k: &BK) -> Option<(V, Self)>
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.extract_with_key(k).map(|(_, v, m)| (v, m))
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed key and value as well as the updated list.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn extract_with_key<BK>(&self, k: &BK) -> Option<(K, V, Self)>
+    where
+        BK: Hash + Eq + ?Sized,
+        K: Borrow<BK>,
+    {
+        let mut out = self.clone();
+        out.remove_with_key(k).map(|(k, v)| (k, v, out))
+    }
+
+    /// Construct the union of two maps, keeping the values in the
+    /// current map when keys exist in both maps.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 3 => 3};
+    /// let map2 = hashmap!{2 => 2, 3 => 4};
+    /// let expected = hashmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert_eq!(expected, map1.union(map2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn union(mut self, other: Self) -> Self {
+        for (k, v) in other {
+            self.entry(k).or_insert(v);
+        }
+        self
+    }
+
+    /// Construct the union of two maps, using a function to decide
+    /// what to do with the value when a key is in both maps.
+    ///
+    /// The function is called when a value exists in both maps, and
+    /// receives the value from the current map as its first argument,
+    /// and the value from the other map as the second. It should
+    /// return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    #[inline]
+    #[must_use]
+    pub fn union_with<F>(self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(V, V) -> V,
+    {
+        self.union_with_key(other, |_, v1, v2| f(v1, v2))
+    }
+
+    /// Construct the union of two maps, using a function to decide
+    /// what to do with the value when a key is in both maps.
+    ///
+    /// The function is called when a value exists in both maps, and
+    /// receives a reference to the key as its first argument, the
+    /// value from the current map as the second argument, and the
+    /// value from the other map as the third argument. It should
+    /// return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 3 => 4};
+    /// let map2 = hashmap!{2 => 2, 3 => 5};
+    /// let expected = hashmap!{1 => 1, 2 => 2, 3 => 9};
+    /// assert_eq!(expected, map1.union_with_key(
+    ///     map2,
+    ///     |key, left, right| left + right
+    /// ));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn union_with_key<F>(mut self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(&K, V, V) -> V,
+    {
+        for (key, right_value) in other {
+            match self.remove(&key) {
+                None => {
+                    self.insert(key, right_value);
+                }
+                Some(left_value) => {
+                    let final_value = f(&key, left_value, right_value);
+                    self.insert(key, final_value);
+                }
+            }
+        }
+        self
+    }
+
+    /// Construct the union of a sequence of maps, selecting the value
+    /// of the leftmost when a key appears in more than one map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 3 => 3};
+    /// let map2 = hashmap!{2 => 2};
+    /// let expected = hashmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert_eq!(expected, HashMap::unions(vec![map1, map2]));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn unions<I>(i: I) -> Self
+    where
+        S: Default,
+        I: IntoIterator<Item = Self>,
+    {
+        i.into_iter().fold(Self::default(), |a, b| a.union(b))
+    }
+
+    /// Construct the union of a sequence of maps, using a function to
+    /// decide what to do with the value when a key is in more than
+    /// one map.
+    ///
+    /// The function is called when a value exists in multiple maps,
+    /// and receives the value from the current map as its first
+    /// argument, and the value from the next map as the second. It
+    /// should return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn unions_with<I, F>(i: I, f: F) -> Self
+    where
+        S: Default,
+        I: IntoIterator<Item = Self>,
+        F: Fn(V, V) -> V,
+    {
+        i.into_iter()
+            .fold(Self::default(), |a, b| a.union_with(b, &f))
+    }
+
+    /// Construct the union of a sequence of maps, using a function to
+    /// decide what to do with the value when a key is in more than
+    /// one map.
+    ///
+    /// The function is called when a value exists in multiple maps,
+    /// and receives a reference to the key as its first argument, the
+    /// value from the current map as the second argument, and the
+    /// value from the next map as the third argument. It should
+    /// return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn unions_with_key<I, F>(i: I, f: F) -> Self
+    where
+        S: Default,
+        I: IntoIterator<Item = Self>,
+        F: Fn(&K, V, V) -> V,
+    {
+        i.into_iter()
+            .fold(Self::default(), |a, b| a.union_with_key(b, &f))
+    }
+
+    /// Construct the difference between two maps by discarding keys
+    /// which occur in both maps.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 3 => 4};
+    /// let map2 = hashmap!{2 => 2, 3 => 5};
+    /// let expected = hashmap!{1 => 1, 2 => 2};
+    /// assert_eq!(expected, map1.difference(map2));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn difference(self, other: Self) -> Self {
+        self.difference_with_key(other, |_, _, _| None)
+    }
+
+    /// Construct the difference between two maps by using a function
+    /// to decide what to do if a key occurs in both.
+    ///
+    /// Time: O(n log n)
+    #[inline]
+    #[must_use]
+    pub fn difference_with<F>(self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(V, V) -> Option<V>,
+    {
+        self.difference_with_key(other, |_, a, b| f(a, b))
+    }
+
+    /// Construct the difference between two maps by using a function
+    /// to decide what to do if a key occurs in both. The function
+    /// receives the key as well as both values.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 3 => 4};
+    /// let map2 = hashmap!{2 => 2, 3 => 5};
+    /// let expected = hashmap!{1 => 1, 2 => 2, 3 => 9};
+    /// assert_eq!(expected, map1.difference_with_key(
+    ///     map2,
+    ///     |key, left, right| Some(left + right)
+    /// ));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn difference_with_key<F>(mut self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(&K, V, V) -> Option<V>,
+    {
+        let mut out = self.new_from();
+        for (key, right_value) in other {
+            match self.remove(&key) {
+                None => {
+                    out.insert(key, right_value);
+                }
+                Some(left_value) => {
+                    if let Some(final_value) = f(&key, left_value, right_value) {
+                        out.insert(key, final_value);
+                    }
+                }
+            }
+        }
+        out.union(self)
+    }
+
+    /// Construct the intersection of two maps, keeping the values
+    /// from the current map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 2 => 2};
+    /// let map2 = hashmap!{2 => 3, 3 => 4};
+    /// let expected = hashmap!{2 => 2};
+    /// assert_eq!(expected, map1.intersection(map2));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn intersection(self, other: Self) -> Self {
+        self.intersection_with_key(other, |_, v, _| v)
+    }
+
+    /// Construct the intersection of two maps, calling a function
+    /// with both values for each key and using the result as the
+    /// value for the key.
+    ///
+    /// Time: O(n log n)
+    #[inline]
+    #[must_use]
+    pub fn intersection_with<B, C, F>(self, other: HashMap<K, B, S>, mut f: F) -> HashMap<K, C, S>
+    where
+        B: Clone,
+        C: Clone,
+        F: FnMut(V, B) -> C,
+    {
+        self.intersection_with_key(other, |_, v1, v2| f(v1, v2))
+    }
+
+    /// Construct the intersection of two maps, calling a function
+    /// with the key and both values for each key and using the result
+    /// as the value for the key.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 2 => 2};
+    /// let map2 = hashmap!{2 => 3, 3 => 4};
+    /// let expected = hashmap!{2 => 5};
+    /// assert_eq!(expected, map1.intersection_with_key(
+    ///     map2,
+    ///     |key, left, right| left + right
+    /// ));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn intersection_with_key<B, C, F>(
+        mut self,
+        other: HashMap<K, B, S>,
+        mut f: F,
+    ) -> HashMap<K, C, S>
+    where
+        B: Clone,
+        C: Clone,
+        F: FnMut(&K, V, B) -> C,
+    {
+        let mut out = self.new_from();
+        for (key, right_value) in other {
+            match self.remove(&key) {
+                None => (),
+                Some(left_value) => {
+                    let result = f(&key, left_value, right_value);
+                    out.insert(key, result);
+                }
+            }
+        }
+        out
+    }
+
+    /// Test whether a map is a submap of another map, meaning that
+    /// all keys in our map must also be in the other map, with the
+    /// same values.
+    ///
+    /// Use the provided function to decide whether values are equal.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_submap_by<B, RM, F>(&self, other: RM, mut cmp: F) -> bool
+    where
+        B: Clone,
+        F: FnMut(&V, &B) -> bool,
+        RM: Borrow<HashMap<K, B, S>>,
+    {
+        self.iter()
+            .all(|(k, v)| other.borrow().get(k).map(|ov| cmp(v, ov)).unwrap_or(false))
+    }
+
+    /// Test whether a map is a proper submap of another map, meaning
+    /// that all keys in our map must also be in the other map, with
+    /// the same values. To be a proper submap, ours must also contain
+    /// fewer keys than the other map.
+    ///
+    /// Use the provided function to decide whether values are equal.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_proper_submap_by<B, RM, F>(&self, other: RM, cmp: F) -> bool
+    where
+        B: Clone,
+        F: FnMut(&V, &B) -> bool,
+        RM: Borrow<HashMap<K, B, S>>,
+    {
+        self.len() != other.borrow().len() && self.is_submap_by(other, cmp)
+    }
+
+    /// Test whether a map is a submap of another map, meaning that
+    /// all keys in our map must also be in the other map, with the
+    /// same values.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 2 => 2};
+    /// let map2 = hashmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert!(map1.is_submap(map2));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_submap<RM>(&self, other: RM) -> bool
+    where
+        V: PartialEq,
+        RM: Borrow<Self>,
+    {
+        self.is_submap_by(other.borrow(), PartialEq::eq)
+    }
+
+    /// Test whether a map is a proper submap of another map, meaning
+    /// that all keys in our map must also be in the other map, with
+    /// the same values. To be a proper submap, ours must also contain
+    /// fewer keys than the other map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashmap::HashMap;
+    /// # fn main() {
+    /// let map1 = hashmap!{1 => 1, 2 => 2};
+    /// let map2 = hashmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert!(map1.is_proper_submap(map2));
+    ///
+    /// let map3 = hashmap!{1 => 1, 2 => 2};
+    /// let map4 = hashmap!{1 => 1, 2 => 2};
+    /// assert!(!map3.is_proper_submap(map4));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_proper_submap<RM>(&self, other: RM) -> bool
+    where
+        V: PartialEq,
+        RM: Borrow<Self>,
+    {
+        self.is_proper_submap_by(other.borrow(), PartialEq::eq)
+    }
+}
+
+// Entries
+
+/// A handle for a key and its associated value.
+///
+/// ## Performance Note
+///
+/// When using an `Entry`, the key is only ever hashed once, when you
+/// create the `Entry`. Operations on an `Entry` will never trigger a
+/// rehash, where eg. a `contains_key(key)` followed by an
+/// `insert(key, default_value)` (the equivalent of
+/// `Entry::or_insert()`) would need to hash the key once for the
+/// `contains_key` and again for the `insert`. The operations
+/// generally perform similarly otherwise.
+pub enum Entry<'a, K, V, S>
+where
+    K: 'a + Hash + Eq + Clone,
+    V: 'a + Clone,
+    S: 'a + BuildHasher,
+{
+    Occupied(OccupiedEntry<'a, K, V, S>),
+    Vacant(VacantEntry<'a, K, V, S>),
+}
+
+impl<'a, K, V, S> Entry<'a, K, V, S>
+where
+    K: 'a + Hash + Eq + Clone,
+    V: 'a + Clone,
+    S: 'a + BuildHasher,
+{
+    /// Insert the default value provided if there was no value
+    /// already, and return a mutable reference to the value.
+    pub fn or_insert(self, default: V) -> &'a mut V {
+        self.or_insert_with(|| default)
+    }
+
+    /// Insert the default value from the provided function if there
+    /// was no value already, and return a mutable reference to the
+    /// value.
+    pub fn or_insert_with<F>(self, default: F) -> &'a mut V
+    where
+        F: FnOnce() -> V,
+    {
+        match self {
+            Entry::Occupied(entry) => entry.into_mut(),
+            Entry::Vacant(entry) => entry.insert(default()),
+        }
+    }
+
+    /// Insert a default value if there was no value already, and
+    /// return a mutable reference to the value.
+    pub fn or_default(self) -> &'a mut V
+    where
+        V: Default,
+    {
+        self.or_insert_with(Default::default)
+    }
+
+    /// Get the key for this entry.
+    #[must_use]
+    pub fn key(&self) -> &K {
+        match self {
+            Entry::Occupied(entry) => entry.key(),
+            Entry::Vacant(entry) => entry.key(),
+        }
+    }
+
+    /// Call the provided function to modify the value if the value
+    /// exists.
+    pub fn and_modify<F>(mut self, f: F) -> Self
+    where
+        F: FnOnce(&mut V),
+    {
+        match &mut self {
+            Entry::Occupied(ref mut entry) => f(entry.get_mut()),
+            Entry::Vacant(_) => (),
+        }
+        self
+    }
+}
+
+/// An entry for a mapping that already exists in the map.
+pub struct OccupiedEntry<'a, K, V, S>
+where
+    K: 'a + Hash + Eq + Clone,
+    V: 'a + Clone,
+    S: 'a + BuildHasher,
+{
+    map: &'a mut HashMap<K, V, S>,
+    hash: HashBits,
+    key: K,
+}
+
+impl<'a, K, V, S> OccupiedEntry<'a, K, V, S>
+where
+    K: 'a + Hash + Eq + Clone,
+    V: 'a + Clone,
+    S: 'a + BuildHasher,
+{
+    /// Get the key for this entry.
+    #[must_use]
+    pub fn key(&self) -> &K {
+        &self.key
+    }
+
+    /// Remove this entry from the map and return the removed mapping.
+    pub fn remove_entry(self) -> (K, V) {
+        let root = Ref::make_mut(&mut self.map.root);
+        let result = root.remove(self.hash, 0, &self.key);
+        self.map.size -= 1;
+        result.unwrap()
+    }
+
+    /// Get the current value.
+    #[must_use]
+    pub fn get(&self) -> &V {
+        &self.map.root.get(self.hash, 0, &self.key).unwrap().1
+    }
+
+    /// Get a mutable reference to the current value.
+    #[must_use]
+    pub fn get_mut(&mut self) -> &mut V {
+        let root = Ref::make_mut(&mut self.map.root);
+        &mut root.get_mut(self.hash, 0, &self.key).unwrap().1
+    }
+
+    /// Convert this entry into a mutable reference.
+    #[must_use]
+    pub fn into_mut(self) -> &'a mut V {
+        let root = Ref::make_mut(&mut self.map.root);
+        &mut root.get_mut(self.hash, 0, &self.key).unwrap().1
+    }
+
+    /// Overwrite the current value.
+    pub fn insert(&mut self, value: V) -> V {
+        mem::replace(self.get_mut(), value)
+    }
+
+    /// Remove this entry from the map and return the removed value.
+    pub fn remove(self) -> V {
+        self.remove_entry().1
+    }
+}
+
+/// An entry for a mapping that does not already exist in the map.
+pub struct VacantEntry<'a, K, V, S>
+where
+    K: 'a + Hash + Eq + Clone,
+    V: 'a + Clone,
+    S: 'a + BuildHasher,
+{
+    map: &'a mut HashMap<K, V, S>,
+    hash: HashBits,
+    key: K,
+}
+
+impl<'a, K, V, S> VacantEntry<'a, K, V, S>
+where
+    K: 'a + Hash + Eq + Clone,
+    V: 'a + Clone,
+    S: 'a + BuildHasher,
+{
+    /// Get the key for this entry.
+    #[must_use]
+    pub fn key(&self) -> &K {
+        &self.key
+    }
+
+    /// Convert this entry into its key.
+    #[must_use]
+    pub fn into_key(self) -> K {
+        self.key
+    }
+
+    /// Insert a value into this entry.
+    pub fn insert(self, value: V) -> &'a mut V {
+        let root = Ref::make_mut(&mut self.map.root);
+        if root
+            .insert(self.hash, 0, (self.key.clone(), value))
+            .is_none()
+        {
+            self.map.size += 1;
+        }
+        // TODO it's unfortunate that we need to look up the key again
+        // here to get the mut ref.
+        &mut root.get_mut(self.hash, 0, &self.key).unwrap().1
+    }
+}
+
+// Core traits
+
+impl<K, V, S> Clone for HashMap<K, V, S>
+where
+    K: Clone,
+    V: Clone,
+{
+    #[inline]
+    fn clone(&self) -> Self {
+        HashMap {
+            root: self.root.clone(),
+            size: self.size,
+            hasher: self.hasher.clone(),
+        }
+    }
+}
+
+#[cfg(not(has_specialisation))]
+impl<K, V, S> PartialEq for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: PartialEq + Clone,
+    S: BuildHasher,
+{
+    fn eq(&self, other: &Self) -> bool {
+        self.test_eq(other)
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K, V, S> PartialEq for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: PartialEq + Clone,
+    S: BuildHasher,
+{
+    default fn eq(&self, other: &Self) -> bool {
+        self.test_eq(other)
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K, V, S> PartialEq for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Eq + Clone,
+    S: BuildHasher,
+{
+    fn eq(&self, other: &Self) -> bool {
+        if Ref::ptr_eq(&self.root, &other.root) {
+            return true;
+        }
+        self.test_eq(other)
+    }
+}
+
+impl<K, V, S> Eq for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Eq + Clone,
+    S: BuildHasher,
+{
+}
+
+impl<K, V, S> PartialOrd for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone + PartialOrd,
+    V: PartialOrd + Clone,
+    S: BuildHasher,
+{
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if Ref::ptr_eq(&self.hasher, &other.hasher) {
+            return self.iter().partial_cmp(other.iter());
+        }
+        let m1: ::std::collections::HashMap<K, V> = self.iter().cloned().collect();
+        let m2: ::std::collections::HashMap<K, V> = other.iter().cloned().collect();
+        m1.iter().partial_cmp(m2.iter())
+    }
+}
+
+impl<K, V, S> Ord for HashMap<K, V, S>
+where
+    K: Hash + Eq + Ord + Clone,
+    V: Ord + Clone,
+    S: BuildHasher,
+{
+    fn cmp(&self, other: &Self) -> Ordering {
+        if Ref::ptr_eq(&self.hasher, &other.hasher) {
+            return self.iter().cmp(other.iter());
+        }
+        let m1: ::std::collections::HashMap<K, V> = self.iter().cloned().collect();
+        let m2: ::std::collections::HashMap<K, V> = other.iter().cloned().collect();
+        m1.iter().cmp(m2.iter())
+    }
+}
+
+impl<K, V, S> Hash for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Hash + Clone,
+    S: BuildHasher,
+{
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: Hasher,
+    {
+        for i in self.iter() {
+            i.hash(state);
+        }
+    }
+}
+
+impl<K, V, S> Default for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    #[inline]
+    fn default() -> Self {
+        HashMap {
+            size: 0,
+            root: Ref::new(Node::new()),
+            hasher: Ref::<S>::default(),
+        }
+    }
+}
+
+impl<K, V, S> Add for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher,
+{
+    type Output = HashMap<K, V, S>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.union(other)
+    }
+}
+
+impl<'a, K, V, S> Add for &'a HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher,
+{
+    type Output = HashMap<K, V, S>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.clone().union(other.clone())
+    }
+}
+
+impl<K, V, S> Sum for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn sum<I>(it: I) -> Self
+    where
+        I: Iterator<Item = Self>,
+    {
+        it.fold(Self::default(), |a, b| a + b)
+    }
+}
+
+impl<K, V, S, RK, RV> Extend<(RK, RV)> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone + From<RK>,
+    V: Clone + From<RV>,
+    S: BuildHasher,
+{
+    fn extend<I>(&mut self, iter: I)
+    where
+        I: IntoIterator<Item = (RK, RV)>,
+    {
+        for (key, value) in iter {
+            self.insert(From::from(key), From::from(value));
+        }
+    }
+}
+
+impl<'a, BK, K, V, S> Index<&'a BK> for HashMap<K, V, S>
+where
+    BK: Hash + Eq + ?Sized,
+    K: Hash + Eq + Clone + Borrow<BK>,
+    V: Clone,
+    S: BuildHasher,
+{
+    type Output = V;
+
+    fn index(&self, key: &BK) -> &Self::Output {
+        match self.root.get(hash_key(&*self.hasher, key), 0, key) {
+            None => panic!("HashMap::index: invalid key"),
+            Some(&(_, ref value)) => value,
+        }
+    }
+}
+
+impl<'a, BK, K, V, S> IndexMut<&'a BK> for HashMap<K, V, S>
+where
+    BK: Hash + Eq + ?Sized,
+    K: Hash + Eq + Clone + Borrow<BK>,
+    V: Clone,
+    S: BuildHasher,
+{
+    fn index_mut(&mut self, key: &BK) -> &mut Self::Output {
+        let root = Ref::make_mut(&mut self.root);
+        match root.get_mut(hash_key(&*self.hasher, key), 0, key) {
+            None => panic!("HashMap::index_mut: invalid key"),
+            Some(&mut (_, ref mut value)) => value,
+        }
+    }
+}
+
+#[cfg(not(has_specialisation))]
+impl<K, V, S> Debug for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone + Debug,
+    V: Debug + Clone,
+    S: BuildHasher,
+{
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        let mut d = f.debug_map();
+        for (k, v) in self {
+            d.entry(k, v);
+        }
+        d.finish()
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K, V, S> Debug for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone + Debug,
+    V: Debug + Clone,
+    S: BuildHasher,
+{
+    default fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        let mut d = f.debug_map();
+        for (k, v) in self {
+            d.entry(k, v);
+        }
+        d.finish()
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K, V, S> Debug for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone + Ord + Debug,
+    V: Debug + Clone,
+    S: BuildHasher,
+{
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        let mut keys = collections::BTreeSet::new();
+        keys.extend(self.keys());
+        let mut d = f.debug_map();
+        for key in keys {
+            d.entry(key, &self[key]);
+        }
+        d.finish()
+    }
+}
+
+// // Iterators
+
+// An iterator over the elements of a map.
+pub struct Iter<'a, K: 'a, V: 'a> {
+    it: NodeIter<'a, (K, V)>,
+}
+
+impl<'a, K, V> Iterator for Iter<'a, K, V> {
+    type Item = &'a (K, V);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|(p, _)| p)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, K, V> ExactSizeIterator for Iter<'a, K, V> {}
+
+impl<'a, K, V> FusedIterator for Iter<'a, K, V> {}
+
+// A mutable iterator over the values of a map.
+pub struct IterMut<'a, K: 'a, V: 'a>
+where
+    K: Clone,
+    V: Clone,
+{
+    it: NodeIterMut<'a, (K, V)>,
+}
+
+impl<'a, K, V> Iterator for IterMut<'a, K, V>
+where
+    K: Clone,
+    V: Clone,
+{
+    type Item = &'a mut V;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|(entry, _)| &mut entry.1)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, K, V> ExactSizeIterator for IterMut<'a, K, V>
+where
+    K: Clone,
+    V: Clone,
+{
+}
+
+impl<'a, K, V> FusedIterator for IterMut<'a, K, V>
+where
+    K: Clone,
+    V: Clone,
+{
+}
+
+// A consuming iterator over the elements of a map.
+pub struct ConsumingIter<A: HashValue> {
+    it: NodeDrain<A>,
+}
+
+impl<A> Iterator for ConsumingIter<A>
+where
+    A: HashValue,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|(p, _)| p)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<A> ExactSizeIterator for ConsumingIter<A> where A: HashValue {}
+
+impl<A> FusedIterator for ConsumingIter<A> where A: HashValue {}
+
+// An iterator over the keys of a map.
+pub struct Keys<'a, K: 'a, V: 'a> {
+    it: NodeIter<'a, (K, V)>,
+}
+
+impl<'a, K, V> Iterator for Keys<'a, K, V> {
+    type Item = &'a K;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|((k, _), _)| k)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, K, V> ExactSizeIterator for Keys<'a, K, V> {}
+
+impl<'a, K, V> FusedIterator for Keys<'a, K, V> {}
+
+// An iterator over the values of a map.
+pub struct Values<'a, K: 'a, V: 'a> {
+    it: NodeIter<'a, (K, V)>,
+}
+
+impl<'a, K, V> Iterator for Values<'a, K, V> {
+    type Item = &'a V;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|((_, v), _)| v)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, K, V> ExactSizeIterator for Values<'a, K, V> {}
+
+impl<'a, K, V> FusedIterator for Values<'a, K, V> {}
+
+impl<'a, K, V, S> IntoIterator for &'a HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher,
+{
+    type Item = &'a (K, V);
+    type IntoIter = Iter<'a, K, V>;
+
+    #[inline]
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<K, V, S> IntoIterator for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher,
+{
+    type Item = (K, V);
+    type IntoIter = ConsumingIter<(K, V)>;
+
+    #[inline]
+    fn into_iter(self) -> Self::IntoIter {
+        ConsumingIter {
+            it: NodeDrain::new(self.root, self.size),
+        }
+    }
+}
+
+// // Conversions
+
+impl<K, V, S> FromIterator<(K, V)> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from_iter<T>(i: T) -> Self
+    where
+        T: IntoIterator<Item = (K, V)>,
+    {
+        let mut map = Self::default();
+        for (k, v) in i {
+            map.insert(k, v);
+        }
+        map
+    }
+}
+
+impl<K, V, S> AsRef<HashMap<K, V, S>> for HashMap<K, V, S>
+where
+    K: Clone,
+    V: Clone,
+{
+    #[inline]
+    fn as_ref(&self) -> &Self {
+        self
+    }
+}
+
+impl<'m, 'k, 'v, K, V, OK, OV, SA, SB> From<&'m HashMap<&'k K, &'v V, SA>> for HashMap<OK, OV, SB>
+where
+    K: Hash + Eq + ToOwned<Owned = OK> + ?Sized,
+    V: ToOwned<Owned = OV> + ?Sized,
+    OK: Hash + Eq + Clone + Borrow<K>,
+    OV: Borrow<V> + Clone,
+    SA: BuildHasher,
+    SB: BuildHasher + Default,
+{
+    fn from(m: &HashMap<&K, &V, SA>) -> Self {
+        m.iter()
+            .map(|(k, v)| ((*k).to_owned(), (*v).to_owned()))
+            .collect()
+    }
+}
+
+impl<'a, K, V, S> From<&'a [(K, V)]> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: &'a [(K, V)]) -> Self {
+        m.iter().cloned().collect()
+    }
+}
+
+impl<K, V, S> From<Vec<(K, V)>> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: Vec<(K, V)>) -> Self {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K, V, S> From<&'a Vec<(K, V)>> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: &'a Vec<(K, V)>) -> Self {
+        m.iter().cloned().collect()
+    }
+}
+
+impl<K, V, S> From<collections::HashMap<K, V>> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: collections::HashMap<K, V>) -> Self {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K, V, S> From<&'a collections::HashMap<K, V>> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: &'a collections::HashMap<K, V>) -> Self {
+        m.iter().map(|(k, v)| (k.clone(), v.clone())).collect()
+    }
+}
+
+impl<K, V, S> From<collections::BTreeMap<K, V>> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: collections::BTreeMap<K, V>) -> Self {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K, V, S> From<&'a collections::BTreeMap<K, V>> for HashMap<K, V, S>
+where
+    K: Hash + Eq + Clone,
+    V: Clone,
+    S: BuildHasher + Default,
+{
+    fn from(m: &'a collections::BTreeMap<K, V>) -> Self {
+        m.iter().map(|(k, v)| (k.clone(), v.clone())).collect()
+    }
+}
+
+// impl<K: Ord + Hash + Eq, V, S> From<OrdMap<K, V>> for HashMap<K, V, S>
+// where
+//     S: BuildHasher + Default,
+// {
+//     fn from(m: OrdMap<K, V>) -> Self {
+//         m.into_iter().collect()
+//     }
+// }
+
+// impl<'a, K: Ord + Hash + Eq, V, S> From<&'a OrdMap<K, V>> for HashMap<K, V, S>
+// where
+//     S: BuildHasher + Default,
+// {
+//     fn from(m: &'a OrdMap<K, V>) -> Self {
+//         m.into_iter().collect()
+//     }
+// }
+
+// QuickCheck
+
+#[cfg(all(feature = "arc", any(test, feature = "quickcheck")))]
+use quickcheck::{Arbitrary, Gen};
+
+#[cfg(all(feature = "arc", any(test, feature = "quickcheck")))]
+impl<K: Hash + Eq + Arbitrary + Sync, V: Arbitrary + Sync> Arbitrary for HashMap<K, V> {
+    fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        HashMap::from(Vec::<(K, V)>::arbitrary(g))
+    }
+}
+
+// Proptest
+
+#[cfg(any(test, feature = "proptest"))]
+pub mod proptest {
+    use super::*;
+    use proptest::strategy::{BoxedStrategy, Strategy, ValueTree};
+    use std::ops::Range;
+
+    /// A strategy for a hash map of a given size.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// proptest! {
+    ///     #[test]
+    ///     fn proptest_works(ref m in hash_map(0..9999, ".*", 10..100)) {
+    ///         assert!(m.len() < 100);
+    ///         assert!(m.len() >= 10);
+    ///     }
+    /// }
+    /// ```
+    pub fn hash_map<K: Strategy + 'static, V: Strategy + 'static>(
+        key: K,
+        value: V,
+        size: Range<usize>,
+    ) -> BoxedStrategy<HashMap<<K::Tree as ValueTree>::Value, <V::Tree as ValueTree>::Value>>
+    where
+        <K::Tree as ValueTree>::Value: Hash + Eq + Clone,
+        <V::Tree as ValueTree>::Value: Clone,
+    {
+        ::proptest::collection::vec((key, value), size.clone())
+            .prop_map(HashMap::from)
+            .prop_filter("Map minimum size".to_owned(), move |m| {
+                m.len() >= size.start
+            })
+            .boxed()
+    }
+}
+
+// Tests
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use proptest::collection;
+    use proptest::num::{i16, usize};
+    use std::hash::BuildHasherDefault;
+    use test::LolHasher;
+
+    #[test]
+    fn safe_mutation() {
+        let v1: HashMap<usize, usize> = HashMap::from_iter((0..131_072).map(|i| (i, i)));
+        let mut v2 = v1.clone();
+        v2.insert(131_000, 23);
+        assert_eq!(Some(&23), v2.get(&131_000));
+        assert_eq!(Some(&131_000), v1.get(&131_000));
+    }
+
+    #[test]
+    fn index_operator() {
+        let mut map = hashmap![1 => 2, 3 => 4, 5 => 6];
+        assert_eq!(4, map[&3]);
+        map[&3] = 8;
+        assert_eq!(hashmap![1 => 2, 3 => 8, 5 => 6], map);
+    }
+
+    #[test]
+    fn proper_formatting() {
+        let map = hashmap![1 => 2];
+        assert_eq!("{1: 2}", format!("{:?}", map));
+
+        assert_eq!("{}", format!("{:?}", HashMap::<(), ()>::new()));
+    }
+
+    #[test]
+    fn remove_failing() {
+        let pairs = [(1469, 0), (-67, 0)];
+        let hasher: BuildHasherDefault<LolHasher> = Default::default();
+        let mut m: collections::HashMap<i16, i16, _> =
+            collections::HashMap::with_hasher(hasher.clone());
+        for &(ref k, ref v) in &pairs {
+            m.insert(*k, *v);
+        }
+        let mut map: HashMap<i16, i16, _> = HashMap::with_hasher(hasher);
+        for (k, v) in &m {
+            map = map.update(*k, *v);
+        }
+        for k in m.keys() {
+            let l = map.len();
+            assert_eq!(m.get(k).cloned(), map.get(k).cloned());
+            map = map.without(k);
+            assert_eq!(None, map.get(k));
+            assert_eq!(l - 1, map.len());
+        }
+    }
+
+    #[test]
+    fn match_string_keys_with_string_slices() {
+        let mut map: HashMap<String, i32> =
+            From::from(&hashmap! { "foo" => &1, "bar" => &2, "baz" => &3 });
+        assert_eq!(Some(&1), map.get("foo"));
+        map = map.without("foo");
+        assert_eq!(Some(3), map.remove("baz"));
+        map["bar"] = 8;
+        assert_eq!(8, map["bar"]);
+    }
+
+    #[test]
+    fn macro_allows_trailing_comma() {
+        let map1 = hashmap! {"x" => 1, "y" => 2};
+        let map2 = hashmap! {
+            "x" => 1,
+            "y" => 2,
+        };
+        assert_eq!(map1, map2);
+    }
+
+    #[test]
+    fn remove_top_level_collisions() {
+        let pairs = vec![9, 2569, 27145];
+        let mut map: HashMap<i16, i16, BuildHasherDefault<LolHasher>> = Default::default();
+        for k in pairs.clone() {
+            map.insert(k, k);
+        }
+        assert_eq!(pairs.len(), map.len());
+        let keys: Vec<_> = map.keys().cloned().collect();
+        for k in keys {
+            let l = map.len();
+            assert_eq!(Some(&k), map.get(&k));
+            map.remove(&k);
+            assert_eq!(None, map.get(&k));
+            assert_eq!(l - 1, map.len());
+        }
+    }
+
+    #[test]
+    fn entry_api() {
+        let mut map = hashmap! {"bar" => 5};
+        map.entry(&"foo").and_modify(|v| *v += 5).or_insert(1);
+        assert_eq!(1, map[&"foo"]);
+        map.entry(&"foo").and_modify(|v| *v += 5).or_insert(1);
+        assert_eq!(6, map[&"foo"]);
+        map.entry(&"bar").and_modify(|v| *v += 5).or_insert(1);
+        assert_eq!(10, map[&"bar"]);
+        assert_eq!(
+            10,
+            match map.entry(&"bar") {
+                Entry::Occupied(entry) => entry.remove(),
+                _ => panic!(),
+            }
+        );
+        assert!(!map.contains_key(&"bar"));
+    }
+
+    #[test]
+    fn large_map() {
+        let mut map = HashMap::new();
+        let size = 32769;
+        for i in 0..size {
+            map.insert(i, i);
+        }
+        assert_eq!(size, map.len());
+        for i in 0..size {
+            assert_eq!(Some(&i), map.get(&i));
+        }
+    }
+
+    proptest! {
+        #[test]
+        fn update_and_length(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let mut map: HashMap<i16, i16, BuildHasherDefault<LolHasher>> = Default::default();
+            for (index, (k, v)) in m.iter().enumerate() {
+                map = map.update(*k, *v);
+                assert_eq!(Some(v), map.get(k));
+                assert_eq!(index + 1, map.len());
+            }
+        }
+
+        #[test]
+        fn from_iterator(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let map: HashMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            assert_eq!(m.len(), map.len());
+        }
+
+        #[test]
+        fn iterate_over(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let map: HashMap<i16, i16> = FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            assert_eq!(m.len(), map.iter().count());
+        }
+
+        #[test]
+        fn equality(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let map1: HashMap<i16, i16> = FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            let map2: HashMap<i16, i16> = FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            assert_eq!(map1, map2);
+        }
+
+        #[test]
+        fn lookup(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let map: HashMap<i16, i16> = FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            for (k, v) in m {
+                assert_eq!(Some(*v), map.get(k).cloned());
+            }
+        }
+
+        #[test]
+        fn without(ref pairs in collection::vec((i16::ANY, i16::ANY), 0..100)) {
+            let hasher: BuildHasherDefault<LolHasher> = Default::default();
+            let mut m: collections::HashMap<i16, i16, _> =
+                collections::HashMap::with_hasher(hasher.clone());
+            for &(ref k, ref v) in pairs {
+                m.insert(*k, *v);
+            }
+            let mut map: HashMap<i16, i16, _> = HashMap::with_hasher(hasher);
+            for (k, v) in &m {
+                map = map.update(*k, *v);
+            }
+            for k in m.keys() {
+                let l = map.len();
+                assert_eq!(m.get(k).cloned(), map.get(k).cloned());
+                map = map.without(k);
+                assert_eq!(None, map.get(k));
+                assert_eq!(l - 1, map.len());
+            }
+        }
+
+        #[test]
+        fn insert(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let mut mut_map: HashMap<i16, i16, BuildHasherDefault<LolHasher>> = Default::default();
+            let mut map: HashMap<i16, i16, BuildHasherDefault<LolHasher>> = Default::default();
+            for (count, (k, v)) in m.iter().enumerate() {
+                map = map.update(*k, *v);
+                mut_map.insert(*k, *v);
+                assert_eq!(count + 1, map.len());
+                assert_eq!(count + 1, mut_map.len());
+            }
+            assert_eq!(map, mut_map);
+        }
+
+        #[test]
+        fn remove(ref pairs in collection::vec((i16::ANY, i16::ANY), 0..100)) {
+            let hasher: BuildHasherDefault<LolHasher> = Default::default();
+            let mut m: collections::HashMap<i16, i16, _> =
+                collections::HashMap::with_hasher(hasher.clone());
+            for &(ref k, ref v) in pairs {
+                m.insert(*k, *v);
+            }
+            let mut map: HashMap<i16, i16, _> = HashMap::with_hasher(hasher);
+            for (k, v) in &m {
+                map.insert(*k, *v);
+            }
+            for k in m.keys() {
+                let l = map.len();
+                assert_eq!(m.get(k).cloned(), map.get(k).cloned());
+                map.remove(k);
+                assert_eq!(None, map.get(k));
+                assert_eq!(l - 1, map.len());
+            }
+        }
+
+        #[test]
+        fn delete_and_reinsert(
+            ref input in collection::hash_map(i16::ANY, i16::ANY, 1..100),
+            index_rand in usize::ANY
+        ) {
+            let index = *input.keys().nth(index_rand % input.len()).unwrap();
+            let map1: HashMap<_, _> = HashMap::from_iter(input.clone());
+            let (val, map2) = map1.extract(&index).unwrap();
+            let map3 = map2.update(index, val);
+            for key in map2.keys() {
+                assert!(*key != index);
+            }
+            assert_eq!(map1.len(), map2.len() + 1);
+            assert_eq!(map1, map3);
+        }
+
+        #[test]
+        fn proptest_works(ref m in proptest::hash_map(0..9999, ".*", 10..100)) {
+            assert!(m.len() < 100);
+            assert!(m.len() >= 10);
+        }
+
+        #[test]
+        fn exact_size_iterator(ref m in proptest::hash_map(i16::ANY, i16::ANY, 0..100)) {
+            let mut should_be = m.len();
+            let mut it = m.iter();
+            loop {
+                assert_eq!(should_be, it.len());
+                match it.next() {
+                    None => break,
+                    Some(_) => should_be -= 1,
+                }
+            }
+            assert_eq!(0, it.len());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/hash/mod.rs cargo-0.33.0/vendor/im-rc/src/hash/mod.rs
--- cargo-0.32.0/vendor/im-rc/src/hash/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/hash/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,8 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#[macro_use]
+pub mod map;
+#[macro_use]
+pub mod set;
diff -Nru cargo-0.32.0/vendor/im-rc/src/hash/set.rs cargo-0.33.0/vendor/im-rc/src/hash/set.rs
--- cargo-0.32.0/vendor/im-rc/src/hash/set.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/hash/set.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1098 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! An unordered set.
+//!
+//! An immutable hash set using [hash array mapped tries] [1].
+//!
+//! Most operations on this set are O(log<sub>x</sub> n) for a
+//! suitably high *x* that it should be nearly O(1) for most sets.
+//! Because of this, it's a great choice for a generic set as long as
+//! you don't mind that values will need to implement
+//! [`Hash`][std::hash::Hash] and [`Eq`][std::cmp::Eq].
+//!
+//! Values will have a predictable order based on the hasher being
+//! used. Unless otherwise specified, all sets will use the default
+//! [`RandomState`][std::collections::hash_map::RandomState] hasher,
+//! which will produce consistent hashes for the duration of its
+//! lifetime, but not between restarts of your program.
+//!
+//! [1]: https://en.wikipedia.org/wiki/Hash_array_mapped_trie
+//! [std::cmp::Eq]: https://doc.rust-lang.org/std/cmp/trait.Eq.html
+//! [std::hash::Hash]: https://doc.rust-lang.org/std/hash/trait.Hash.html
+//! [std::collections::hash_map::RandomState]: https://doc.rust-lang.org/std/collections/hash_map/struct.RandomState.h
+
+use std::borrow::Borrow;
+use std::cmp::Ordering;
+use std::collections::hash_map::RandomState;
+use std::collections::{self, BTreeSet};
+use std::fmt::{Debug, Error, Formatter};
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::iter::FusedIterator;
+use std::iter::{FromIterator, IntoIterator, Sum};
+use std::ops::{Add, Deref, Mul};
+
+use nodes::hamt::{
+    hash_key, Drain as NodeDrain, HashValue, Iter as NodeIter, IterMut as NodeIterMut, Node,
+};
+use ordset::OrdSet;
+use util::Ref;
+
+/// Construct a set from a sequence of values.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::hashset::HashSet;
+/// # fn main() {
+/// assert_eq!(
+///   hashset![1, 2, 3],
+///   HashSet::from(vec![1, 2, 3])
+/// );
+/// # }
+/// ```
+#[macro_export]
+macro_rules! hashset {
+    () => { $crate::hashset::HashSet::new() };
+
+    ( $($x:expr),* ) => {{
+        let mut l = $crate::hashset::HashSet::new();
+        $(
+            l.insert($x);
+        )*
+            l
+    }};
+
+    ( $($x:expr ,)* ) => {{
+        let mut l = $crate::hashset::HashSet::new();
+        $(
+            l.insert($x);
+        )*
+            l
+    }};
+}
+
+/// An unordered set.
+///
+/// An immutable hash set using [hash array mapped tries] [1].
+///
+/// Most operations on this set are O(log<sub>x</sub> n) for a
+/// suitably high *x* that it should be nearly O(1) for most sets.
+/// Because of this, it's a great choice for a generic set as long as
+/// you don't mind that values will need to implement
+/// [`Hash`][std::hash::Hash] and [`Eq`][std::cmp::Eq].
+///
+/// Values will have a predictable order based on the hasher being
+/// used. Unless otherwise specified, all sets will use the default
+/// [`RandomState`][std::collections::hash_map::RandomState] hasher,
+/// which will produce consistent hashes for the duration of its
+/// lifetime, but not between restarts of your program.
+///
+/// [1]: https://en.wikipedia.org/wiki/Hash_array_mapped_trie
+/// [std::cmp::Eq]: https://doc.rust-lang.org/std/cmp/trait.Eq.html
+/// [std::hash::Hash]: https://doc.rust-lang.org/std/hash/trait.Hash.html
+/// [std::collections::hash_map::RandomState]: https://doc.rust-lang.org/std/collections/hash_map/struct.RandomState.h
+pub struct HashSet<A, S = RandomState> {
+    hasher: Ref<S>,
+    root: Ref<Node<Value<A>>>,
+    size: usize,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+struct Value<A>(A);
+
+impl<A> Deref for Value<A> {
+    type Target = A;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+// FIXME lacking specialisation, we can't simply implement `HashValue`
+// for `A`, we have to use the `Value<A>` indirection.
+impl<A> HashValue for Value<A>
+where
+    A: Hash + Eq + Clone,
+{
+    type Key = A;
+
+    fn extract_key(&self) -> &Self::Key {
+        &self.0
+    }
+
+    fn ptr_eq(&self, _other: &Self) -> bool {
+        false
+    }
+}
+
+impl<A> HashSet<A, RandomState>
+where
+    A: Hash + Eq + Clone,
+{
+    /// Construct an empty set.
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Construct a set with a single value.
+    ///
+    /// This method has been deprecated; use [`unit`][unit] instead.
+    ///
+    /// [unit]: #method.unit
+    #[inline]
+    #[must_use]
+    #[deprecated(since = "12.3.0", note = "renamed to `unit` for consistency")]
+    pub fn singleton(a: A) -> Self {
+        Self::unit(a)
+    }
+
+    /// Construct a set with a single value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # use std::sync::Arc;
+    /// # fn main() {
+    /// let set = HashSet::unit(123);
+    /// assert!(set.contains(&123));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn unit(a: A) -> Self {
+        HashSet::new().update(a)
+    }
+}
+
+impl<A, S> HashSet<A, S> {
+    /// Test whether a set is empty.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # fn main() {
+    /// assert!(
+    ///   !hashset![1, 2, 3].is_empty()
+    /// );
+    /// assert!(
+    ///   HashSet::<i32>::new().is_empty()
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get the size of a set.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # fn main() {
+    /// assert_eq!(3, hashset![1, 2, 3].len());
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.size
+    }
+}
+
+impl<A, S> HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    fn test_eq(&self, other: &Self) -> bool {
+        if self.len() != other.len() {
+            return false;
+        }
+        let mut seen = collections::HashSet::new();
+        for value in self.iter() {
+            if !other.contains(&value) {
+                return false;
+            }
+            seen.insert(value);
+        }
+        for value in other.iter() {
+            if !seen.contains(&value) {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Construct an empty hash set using the provided hasher.
+    #[inline]
+    #[must_use]
+    pub fn with_hasher<RS>(hasher: RS) -> Self
+    where
+        Ref<S>: From<RS>,
+    {
+        HashSet {
+            size: 0,
+            root: Ref::new(Node::new()),
+            hasher: From::from(hasher),
+        }
+    }
+
+    /// Get a reference to the set's [`BuildHasher`][BuildHasher].
+    ///
+    /// [BuildHasher]: https://doc.rust-lang.org/std/hash/trait.BuildHasher.html
+    #[must_use]
+    pub fn hasher(&self) -> &Ref<S> {
+        &self.hasher
+    }
+
+    /// Construct an empty hash set using the same hasher as the current hash set.
+    #[inline]
+    #[must_use]
+    pub fn new_from<A1>(&self) -> HashSet<A1, S>
+    where
+        A1: Hash + Eq + Clone,
+    {
+        HashSet {
+            size: 0,
+            root: Ref::new(Node::new()),
+            hasher: self.hasher.clone(),
+        }
+    }
+
+    /// Get an iterator over the values in a hash set.
+    ///
+    /// Please note that the order is consistent between sets using
+    /// the same hasher, but no other ordering guarantee is offered.
+    /// Items will not come out in insertion order or sort order.
+    /// They will, however, come out in the same order every time for
+    /// the same set.
+    #[must_use]
+    pub fn iter(&self) -> Iter<'_, A> {
+        Iter {
+            it: NodeIter::new(&self.root, self.size),
+        }
+    }
+
+    /// Get a mutable iterator over the values in a hash set.
+    ///
+    /// Please note that the order is consistent between sets using the same
+    /// hasher, but no other ordering guarantee is offered.  Items will not come
+    /// out in insertion order or sort order.  They will, however, come out in
+    /// the same order every time for the same set.
+    #[must_use]
+    pub fn iter_mut(&mut self) -> IterMut<'_, A> {
+        let root = Ref::make_mut(&mut self.root);
+        IterMut {
+            it: NodeIterMut::new(root, self.size),
+        }
+    }
+
+    /// Test if a value is part of a set.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn contains<BA>(&self, a: &BA) -> bool
+    where
+        BA: Hash + Eq + ?Sized,
+        A: Borrow<BA>,
+    {
+        self.root.get(hash_key(&*self.hasher, a), 0, a).is_some()
+    }
+
+    /// Insert a value into a set.
+    ///
+    /// Time: O(log n)
+    #[inline]
+    pub fn insert(&mut self, a: A) -> Option<A> {
+        let hash = hash_key(&*self.hasher, &a);
+        let root = Ref::make_mut(&mut self.root);
+        match root.insert(hash, 0, Value(a)) {
+            None => {
+                self.size += 1;
+                None
+            }
+            Some(Value(old_value)) => Some(old_value),
+        }
+    }
+
+    /// Remove a value from a set if it exists.
+    ///
+    /// Time: O(log n)
+    pub fn remove<BA>(&mut self, a: &BA) -> Option<A>
+    where
+        BA: Hash + Eq + ?Sized,
+        A: Borrow<BA>,
+    {
+        let root = Ref::make_mut(&mut self.root);
+        let result = root.remove(hash_key(&*self.hasher, a), 0, a);
+        if result.is_some() {
+            self.size -= 1;
+        }
+        result.map(|v| v.0)
+    }
+
+    /// Discard all elements from the set.
+    ///
+    /// This leaves you with an empty set, and all elements that
+    /// were previously inside it are dropped.
+    ///
+    /// Time: O(n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::HashSet;
+    /// # fn main() {
+    /// let mut set = hashset![1, 2, 3];
+    /// set.clear();
+    /// assert!(set.is_empty());
+    /// # }
+    /// ```
+    pub fn clear(&mut self) {
+        if !self.is_empty() {
+            self.root = Default::default();
+            self.size = 0;
+        }
+    }
+
+    /// Construct a new set from the current set with the given value
+    /// added.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # use std::sync::Arc;
+    /// # fn main() {
+    /// let set = hashset![123];
+    /// assert_eq!(
+    ///   set.update(456),
+    ///   hashset![123, 456]
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn update(&self, a: A) -> Self {
+        let mut out = self.clone();
+        out.insert(a);
+        out
+    }
+
+    /// Construct a new set with the given value removed if it's in
+    /// the set.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn without<BA>(&self, a: &BA) -> Self
+    where
+        BA: Hash + Eq + ?Sized,
+        A: Borrow<BA>,
+    {
+        let mut out = self.clone();
+        out.remove(a);
+        out
+    }
+
+    /// Filter out values from a set which don't satisfy a predicate.
+    ///
+    /// This is slightly more efficient than filtering using an
+    /// iterator, in that it doesn't need to rehash the retained
+    /// values, but it still needs to reconstruct the entire tree
+    /// structure of the set.
+    ///
+    /// Time: O(n log n)
+    pub fn retain<F>(&mut self, mut f: F)
+    where
+        F: FnMut(&A) -> bool,
+    {
+        let old_root = self.root.clone();
+        let root = Ref::make_mut(&mut self.root);
+        for (value, hash) in NodeIter::new(&old_root, self.size) {
+            if !f(value) && root.remove(hash, 0, value).is_some() {
+                self.size -= 1;
+            }
+        }
+    }
+
+    /// Construct the union of two sets.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # fn main() {
+    /// let set1 = hashset!{1, 2};
+    /// let set2 = hashset!{2, 3};
+    /// let expected = hashset!{1, 2, 3};
+    /// assert_eq!(expected, set1.union(set2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn union(mut self, other: Self) -> Self {
+        for value in other {
+            self.insert(value);
+        }
+        self
+    }
+
+    /// Construct the union of multiple sets.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn unions<I>(i: I) -> Self
+    where
+        I: IntoIterator<Item = Self>,
+        S: Default,
+    {
+        i.into_iter().fold(Self::default(), |a, b| a.union(b))
+    }
+
+    /// Construct the difference between two sets.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # fn main() {
+    /// let set1 = hashset!{1, 2};
+    /// let set2 = hashset!{2, 3};
+    /// let expected = hashset!{1, 3};
+    /// assert_eq!(expected, set1.difference(set2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn difference(mut self, other: Self) -> Self {
+        for value in other {
+            if self.remove(&value).is_none() {
+                self.insert(value);
+            }
+        }
+        self
+    }
+
+    /// Construct the intersection of two sets.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::hashset::HashSet;
+    /// # fn main() {
+    /// let set1 = hashset!{1, 2};
+    /// let set2 = hashset!{2, 3};
+    /// let expected = hashset!{2};
+    /// assert_eq!(expected, set1.intersection(set2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn intersection(self, other: Self) -> Self {
+        let mut out = self.new_from();
+        for value in other {
+            if self.contains(&value) {
+                out.insert(value);
+            }
+        }
+        out
+    }
+
+    /// Test whether a set is a subset of another set, meaning that
+    /// all values in our set must also be in the other set.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_subset<RS>(&self, other: RS) -> bool
+    where
+        RS: Borrow<Self>,
+    {
+        let o = other.borrow();
+        self.iter().all(|a| o.contains(&a))
+    }
+
+    /// Test whether a set is a proper subset of another set, meaning
+    /// that all values in our set must also be in the other set. A
+    /// proper subset must also be smaller than the other set.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_proper_subset<RS>(&self, other: RS) -> bool
+    where
+        RS: Borrow<Self>,
+    {
+        self.len() != other.borrow().len() && self.is_subset(other)
+    }
+}
+
+// Core traits
+
+impl<A, S> Clone for HashSet<A, S>
+where
+    A: Clone,
+{
+    fn clone(&self) -> Self {
+        HashSet {
+            hasher: self.hasher.clone(),
+            root: self.root.clone(),
+            size: self.size,
+        }
+    }
+}
+
+impl<A, S> PartialEq for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn eq(&self, other: &Self) -> bool {
+        self.test_eq(other)
+    }
+}
+
+impl<A, S> Eq for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+}
+
+impl<A, S> PartialOrd for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + PartialOrd,
+    S: BuildHasher + Default,
+{
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if Ref::ptr_eq(&self.hasher, &other.hasher) {
+            return self.iter().partial_cmp(other.iter());
+        }
+        let m1: ::std::collections::HashSet<A> = self.iter().cloned().collect();
+        let m2: ::std::collections::HashSet<A> = other.iter().cloned().collect();
+        m1.iter().partial_cmp(m2.iter())
+    }
+}
+
+impl<A, S> Ord for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + Ord,
+    S: BuildHasher + Default,
+{
+    fn cmp(&self, other: &Self) -> Ordering {
+        if Ref::ptr_eq(&self.hasher, &other.hasher) {
+            return self.iter().cmp(other.iter());
+        }
+        let m1: ::std::collections::HashSet<A> = self.iter().cloned().collect();
+        let m2: ::std::collections::HashSet<A> = other.iter().cloned().collect();
+        m1.iter().cmp(m2.iter())
+    }
+}
+
+impl<A, S> Hash for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: Hasher,
+    {
+        for i in self.iter() {
+            i.hash(state);
+        }
+    }
+}
+
+impl<A, S> Default for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn default() -> Self {
+        HashSet {
+            hasher: Ref::<S>::default(),
+            root: Ref::new(Node::new()),
+            size: 0,
+        }
+    }
+}
+
+impl<A, S> Add for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    type Output = HashSet<A, S>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.union(other)
+    }
+}
+
+impl<A, S> Mul for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    type Output = HashSet<A, S>;
+
+    fn mul(self, other: Self) -> Self::Output {
+        self.intersection(other)
+    }
+}
+
+impl<'a, A, S> Add for &'a HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    type Output = HashSet<A, S>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.clone().union(other.clone())
+    }
+}
+
+impl<'a, A, S> Mul for &'a HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    type Output = HashSet<A, S>;
+
+    fn mul(self, other: Self) -> Self::Output {
+        self.clone().intersection(other.clone())
+    }
+}
+
+impl<A, S> Sum for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn sum<I>(it: I) -> Self
+    where
+        I: Iterator<Item = Self>,
+    {
+        it.fold(Self::default(), |a, b| a + b)
+    }
+}
+
+impl<A, S, R> Extend<R> for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + From<R>,
+    S: BuildHasher,
+{
+    fn extend<I>(&mut self, iter: I)
+    where
+        I: IntoIterator<Item = R>,
+    {
+        for value in iter {
+            self.insert(From::from(value));
+        }
+    }
+}
+
+#[cfg(not(has_specialisation))]
+impl<A, S> Debug for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + Debug,
+    S: BuildHasher,
+{
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        f.debug_set().entries(self.iter()).finish()
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<A, S> Debug for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + Debug,
+    S: BuildHasher,
+{
+    default fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        f.debug_set().entries(self.iter()).finish()
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<A, S> Debug for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + Debug + Ord,
+    S: BuildHasher,
+{
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        f.debug_set().entries(self.iter()).finish()
+    }
+}
+
+// Iterators
+
+// An iterator over the elements of a set.
+pub struct Iter<'a, A>
+where
+    A: 'a,
+{
+    it: NodeIter<'a, Value<A>>,
+}
+
+impl<'a, A> Iterator for Iter<'a, A>
+where
+    A: 'a + Clone,
+{
+    type Item = &'a A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|(v, _)| &v.0)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, A> ExactSizeIterator for Iter<'a, A> where A: Clone {}
+
+impl<'a, A> FusedIterator for Iter<'a, A> where A: Clone {}
+
+// A mutable iterator over the elements of a set.
+pub struct IterMut<'a, A>
+where
+    A: 'a,
+{
+    it: NodeIterMut<'a, Value<A>>,
+}
+
+impl<'a, A> Iterator for IterMut<'a, A>
+where
+    A: 'a + Clone,
+{
+    type Item = &'a mut A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|(v, _)| &mut v.0)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, A> ExactSizeIterator for IterMut<'a, A> where A: Clone {}
+
+impl<'a, A> FusedIterator for IterMut<'a, A> where A: Clone {}
+
+// A consuming iterator over the elements of a set.
+pub struct ConsumingIter<A>
+where
+    A: Hash + Eq + Clone,
+{
+    it: NodeDrain<Value<A>>,
+}
+
+impl<A> Iterator for ConsumingIter<A>
+where
+    A: Hash + Eq + Clone,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|(v, _)| v.0)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<A> ExactSizeIterator for ConsumingIter<A> where A: Hash + Eq + Clone {}
+
+impl<A> FusedIterator for ConsumingIter<A> where A: Hash + Eq + Clone {}
+
+// Iterator conversions
+
+impl<A, RA, S> FromIterator<RA> for HashSet<A, S>
+where
+    A: Hash + Eq + Clone + From<RA>,
+    S: BuildHasher + Default,
+{
+    fn from_iter<T>(i: T) -> Self
+    where
+        T: IntoIterator<Item = RA>,
+    {
+        let mut set = Self::default();
+        for value in i {
+            set.insert(From::from(value));
+        }
+        set
+    }
+}
+
+impl<'a, A, S> IntoIterator for &'a HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    type Item = &'a A;
+    type IntoIter = Iter<'a, A>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<A, S> IntoIterator for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher,
+{
+    type Item = A;
+    type IntoIter = ConsumingIter<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        ConsumingIter {
+            it: NodeDrain::new(self.root, self.size),
+        }
+    }
+}
+
+// Conversions
+
+impl<'s, 'a, A, OA, SA, SB> From<&'s HashSet<&'a A, SA>> for HashSet<OA, SB>
+where
+    A: ToOwned<Owned = OA> + Hash + Eq + ?Sized,
+    OA: Borrow<A> + Hash + Eq + Clone,
+    SA: BuildHasher,
+    SB: BuildHasher + Default,
+{
+    fn from(set: &HashSet<&A, SA>) -> Self {
+        set.iter().map(|a| (*a).to_owned()).collect()
+    }
+}
+
+impl<'a, A, S> From<&'a [A]> for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(slice: &'a [A]) -> Self {
+        slice.iter().cloned().collect()
+    }
+}
+
+impl<A, S> From<Vec<A>> for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(vec: Vec<A>) -> Self {
+        vec.into_iter().collect()
+    }
+}
+
+impl<'a, A, S> From<&'a Vec<A>> for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(vec: &Vec<A>) -> Self {
+        vec.iter().cloned().collect()
+    }
+}
+
+impl<A, S> From<collections::HashSet<A>> for HashSet<A, S>
+where
+    A: Eq + Hash + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(hash_set: collections::HashSet<A>) -> Self {
+        hash_set.into_iter().collect()
+    }
+}
+
+impl<'a, A, S> From<&'a collections::HashSet<A>> for HashSet<A, S>
+where
+    A: Eq + Hash + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(hash_set: &collections::HashSet<A>) -> Self {
+        hash_set.iter().cloned().collect()
+    }
+}
+
+impl<'a, A, S> From<&'a BTreeSet<A>> for HashSet<A, S>
+where
+    A: Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(btree_set: &BTreeSet<A>) -> Self {
+        btree_set.iter().cloned().collect()
+    }
+}
+
+impl<A, S> From<OrdSet<A>> for HashSet<A, S>
+where
+    A: Ord + Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(ordset: OrdSet<A>) -> Self {
+        ordset.into_iter().collect()
+    }
+}
+
+impl<'a, A, S> From<&'a OrdSet<A>> for HashSet<A, S>
+where
+    A: Ord + Hash + Eq + Clone,
+    S: BuildHasher + Default,
+{
+    fn from(ordset: &OrdSet<A>) -> Self {
+        ordset.into_iter().cloned().collect()
+    }
+}
+
+// QuickCheck
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+use quickcheck::{Arbitrary, Gen};
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+impl<A, S> Arbitrary for HashSet<A, S>
+where
+    A: Hash + Eq + Arbitrary + Sync,
+    S: BuildHasher + Default + Send + Sync + 'static,
+{
+    fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        HashSet::from_iter(Vec::<A>::arbitrary(g))
+    }
+}
+
+// Proptest
+
+#[cfg(any(test, feature = "proptest"))]
+pub mod proptest {
+    use super::*;
+    use proptest::strategy::{BoxedStrategy, Strategy, ValueTree};
+    use std::ops::Range;
+
+    /// A strategy for a hash set of a given size.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// proptest! {
+    ///     #[test]
+    ///     fn proptest_a_set(ref s in hashset(".*", 10..100)) {
+    ///         assert!(s.len() < 100);
+    ///         assert!(s.len() >= 10);
+    ///     }
+    /// }
+    /// ```
+    pub fn hash_set<A: Strategy + 'static>(
+        element: A,
+        size: Range<usize>,
+    ) -> BoxedStrategy<HashSet<<A::Tree as ValueTree>::Value>>
+    where
+        <A::Tree as ValueTree>::Value: Hash + Eq + Clone,
+    {
+        ::proptest::collection::vec(element, size.clone())
+            .prop_map(HashSet::from)
+            .prop_filter("HashSet minimum size".to_owned(), move |s| {
+                s.len() >= size.start
+            })
+            .boxed()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::proptest::*;
+    use super::*;
+    use proptest::num::i16;
+    use std::hash::BuildHasherDefault;
+    use test::LolHasher;
+
+    #[test]
+    fn insert_failing() {
+        let mut set: HashSet<i16, BuildHasherDefault<LolHasher>> = Default::default();
+        set.insert(14658);
+        assert_eq!(1, set.len());
+        set.insert(-19198);
+        assert_eq!(2, set.len());
+    }
+
+    #[test]
+    fn match_strings_with_string_slices() {
+        let mut set: HashSet<String> = From::from(&hashset!["foo", "bar"]);
+        set = set.without("bar");
+        assert!(!set.contains("bar"));
+        set.remove("foo");
+        assert!(!set.contains("foo"));
+    }
+
+    #[test]
+    fn macro_allows_trailing_comma() {
+        let set1 = hashset! {"foo", "bar"};
+        let set2 = hashset! {
+            "foo",
+            "bar",
+        };
+        assert_eq!(set1, set2);
+    }
+
+    #[test]
+    fn issue_60_drain_iterator_memory_corruption() {
+        use test::MetroHashBuilder;
+        for i in 0..1000 {
+            let mut lhs = vec![0, 1, 2];
+            lhs.sort();
+
+            let mut hasher = Ref::from(MetroHashBuilder::new(i));
+            let mut iset: HashSet<_, MetroHashBuilder> = HashSet::with_hasher(hasher.clone());
+            for &i in &lhs {
+                iset.insert(i);
+            }
+
+            let mut rhs: Vec<_> = iset.clone().into_iter().collect();
+            rhs.sort();
+
+            if lhs != rhs {
+                println!("iteration: {}", i);
+                println!("seed: {}", hasher.seed());
+                println!("lhs: {}: {:?}", lhs.len(), &lhs);
+                println!("rhs: {}: {:?}", rhs.len(), &rhs);
+                panic!();
+            }
+        }
+    }
+
+    proptest! {
+        #[test]
+        fn proptest_a_set(ref s in hash_set(".*", 10..100)) {
+            assert!(s.len() < 100);
+            assert!(s.len() >= 10);
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/iter.rs cargo-0.33.0/vendor/im-rc/src/iter.rs
--- cargo-0.32.0/vendor/im-rc/src/iter.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/iter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,122 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! Iterators over immutable data.
+
+pub struct Unfold<F, S> {
+    f: F,
+    value: S,
+}
+
+impl<F, S, A> Iterator for Unfold<F, S>
+where
+    F: Fn(&S) -> Option<(A, S)>,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match (self.f)(&self.value) {
+            None => None,
+            Some((next, value)) => {
+                self.value = value;
+                Some(next)
+            }
+        }
+    }
+}
+
+pub struct UnfoldMut<F, S> {
+    f: F,
+    value: S,
+}
+
+impl<F, S, A> Iterator for UnfoldMut<F, S>
+where
+    F: Fn(&mut S) -> Option<A>,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        (self.f)(&mut self.value)
+    }
+}
+
+/// Create an iterator of values using a function to update a state
+/// value.
+///
+/// The function is called with the current state as its argument, and
+/// should return an [`Option`][std::option::Option] of a tuple of the
+/// next value to yield from the iterator and the updated state. If
+/// the function returns [`None`][std::option::Option::None], the
+/// iterator ends.
+///
+/// # Examples
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::iter::unfold;
+/// # use im::vector::Vector;
+/// # use std::iter::FromIterator;
+/// # fn main() {
+/// // Create an infinite stream of numbers, starting at 0.
+/// let mut it = unfold(0, |i| Some((*i, *i + 1)));
+///
+/// // Make a list out of its first five elements.
+/// let numbers = Vector::from_iter(it.take(5));
+/// assert_eq!(numbers, vector![0, 1, 2, 3, 4]);
+/// # }
+/// ```
+///
+/// [std::option::Option]: https://doc.rust-lang.org/std/option/enum.Option.html
+/// [std::option::Option::None]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.None
+#[must_use]
+pub fn unfold<F, S, A>(value: S, f: F) -> Unfold<F, S>
+where
+    F: Fn(&S) -> Option<(A, S)>,
+{
+    Unfold { f, value }
+}
+
+/// Create an iterator of values using a function to mutate a state
+/// value.
+///
+/// The function is called with a mutable reference to the current
+/// state as its argument, and should return an
+/// [`Option`][std::option::Option] of the next value to yield from
+/// the iterator, updating the state as necessary. If the function
+/// returns [`None`][std::option::Option::None], the iterator ends.
+///
+/// This differs from [`unfold`][unfold] in that your update functions
+/// will probably be less elegant, but it's easier to deal with state
+/// that isn't efficiently cloneable.
+///
+/// # Examples
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::iter::unfold_mut;
+/// # use im::vector::Vector;
+/// # use std::iter::FromIterator;
+/// # fn main() {
+/// // Create an infinite stream of numbers, starting at 0.
+/// let mut it = unfold_mut(0, |i| {
+///   let next = *i;
+///   *i += 1;
+///   Some(next)
+/// });
+///
+/// // Make a list out of its first five elements.
+/// let numbers = Vector::from_iter(it.take(5));
+/// assert_eq!(numbers, vector![0, 1, 2, 3, 4]);
+/// # }
+/// ```
+///
+/// [std::option::Option]: https://doc.rust-lang.org/std/option/enum.Option.html
+/// [std::option::Option::None]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.None
+/// [unfold]: ./fn.unfold.html
+#[must_use]
+pub fn unfold_mut<F, S, A>(value: S, f: F) -> UnfoldMut<F, S>
+where
+    F: Fn(&mut S) -> Option<A>,
+{
+    UnfoldMut { f, value }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/lib.rs cargo-0.33.0/vendor/im-rc/src/lib.rs
--- cargo-0.32.0/vendor/im-rc/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,503 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! # Immutable Data Structures for Rust
+//!
+//! This library implements several of the more commonly useful immutable data
+//! structures for Rust.
+//!
+//! ## What are immutable data structures?
+//!
+//! Immutable data structures are data structures which can be copied and
+//! modified efficiently without altering the original. The most uncomplicated
+//! example of this is the venerable [cons list][cons-list]. This crate offers a
+//! selection of more modern and flexible data structures with similar
+//! properties, tuned for the needs of Rust developers.
+//!
+//! Briefly, the following data structures are provided:
+//!
+//! * [Vectors][vector::Vector] based on [RRB trees][rrb-tree]
+//! * [Hash maps][hashmap::HashMap]/[sets][hashset::HashSet] based on [hash
+//!   array mapped tries][hamt]
+//! * [Ordered maps][ordmap::OrdMap]/[sets][ordset::OrdSet] based on
+//!   [B-trees][b-tree]
+//!
+//! ## Why Would I Want This?
+//!
+//! While immutable data structures can be a game changer for other
+//! programming languages, the most obvious benefit - avoiding the
+//! accidental mutation of data - is already handled so well by Rust's
+//! type system that it's just not something a Rust programmer needs
+//! to worry about even when using data structures that would send a
+//! conscientious Clojure programmer into a panic.
+//!
+//! Immutable data structures offer other benefits, though, some of
+//! which are useful even in a language like Rust. The most prominent
+//! is *structural sharing*, which means that if two data structures
+//! are mostly copies of each other, most of the memory they take up
+//! will be shared between them. This implies that making copies of an
+//! immutable data structure is cheap: it's really only a matter of
+//! copying a pointer and increasing a reference counter, where in the
+//! case of [`Vec`][std::vec::Vec] you have to allocate the same
+//! amount of memory all over again and make a copy of every element
+//! it contains. For immutable data structures, extra memory isn't
+//! allocated until you modify either the copy or the original, and
+//! then only the memory needed to record the difference.
+//!
+//! Another goal of this library has been the idea that you shouldn't
+//! even have to think about what data structure to use in any given
+//! situation, until the point where you need to start worring about
+//! optimisation - which, in practice, often never comes. Beyond the
+//! shape of your data (ie. whether to use a list or a map), it should
+//! be fine not to think too carefully about data structures - you can
+//! just pick the one that has the right shape and it should have
+//! acceptable performance characteristics for every operation you
+//! might need. Specialised data structures will always be faster at
+//! what they've been specialised for, but `im` aims to provide the
+//! data structures which deliver the least chance of accidentally
+//! using them for the wrong thing.
+//!
+//! For instance, [`Vec`][std::vec::Vec] beats everything at memory
+//! usage, indexing and operations that happen at the back of the
+//! list, but is terrible at insertion and removal, and gets worse the
+//! closer to the front of the list you get.
+//! [`VecDeque`][std::collections::VecDeque] adds a little bit of
+//! complexity in order to make operations at the front as efficient
+//! as operations at the back, but is still bad at insertion and
+//! especially concatenation. [`Vector`][vector::Vector] adds another
+//! bit of complexity, and could never match [`Vec`][std::vec::Vec] at
+//! what it's best at, but in return every operation you can throw at
+//! it can be completed in a reasonable amount of time - even normally
+//! expensive operations like copying and especially concatenation are
+//! reasonably cheap when using a [`Vector`][vector::Vector].
+//!
+//! It should be noted, however, that because of its simplicity,
+//! [`Vec`][std::vec::Vec] actually beats [`Vector`][vector::Vector] even at its
+//! strongest operations at small sizes, just because modern CPUs are
+//! hyperoptimised for things like copying small chunks of contiguous memory -
+//! you actually need to go past a certain size (usually in the vicinity of
+//! several hundred elements) before you get to the point where
+//! [`Vec`][std::vec::Vec] isn't always going to be the fastest choice.
+//! [`Vector`][vector::Vector] attempts to overcome this by actually just being
+//! an array at very small sizes, and being able to switch efficiently to the
+//! full data structure when it grows large enough. Thus,
+//! [`Vector`][vector::Vector] will actually be equivalent to
+//! [Vec][std::vec::Vec] until it grows past the size of a single chunk.
+//!
+//! The maps - [`HashMap`][hashmap::HashMap] and
+//! [`OrdMap`][ordmap::OrdMap] - generally perform similarly to their
+//! equivalents in the standard library, but tend to run a bit slower
+//! on the basic operations ([`HashMap`][hashmap::HashMap] is almost
+//! neck and neck with its counterpart, while
+//! [`OrdMap`][ordmap::OrdMap] currently tends to run 2-3x slower). On
+//! the other hand, they offer the cheap copy and structural sharing
+//! between copies that you'd expect from immutable data structures.
+//!
+//! In conclusion, the aim of this library is to provide a safe
+//! default choice for the most common kinds of data structures,
+//! allowing you to defer careful thinking about the right data
+//! structure for the job until you need to start looking for
+//! optimisations - and you may find, especially for larger data sets,
+//! that immutable data structures are still the right choice.
+//!
+//! ## Values
+//!
+//! Because we need to make copies of shared nodes in these data structures
+//! before updating them, the values you store in them must implement
+//! [`Clone`][std::clone::Clone].  For primitive values that implement
+//! [`Copy`][std::marker::Copy], such as numbers, everything is fine: this is
+//! the case for which the data structures are optimised, and performance is
+//! going to be great.
+//!
+//! On the other hand, if you want to store values for which cloning is
+//! expensive, or values that don't implement [`Clone`][std::clone::Clone], you
+//! need to wrap them in [`Rc`][std::rc::Rc] or [`Arc`][std::sync::Arc]. Thus,
+//! if you have a complex structure `BigBlobOfData` and you want to store a list
+//! of them as a `Vector<BigBlobOfData>`, you should instead use a
+//! `Vector<Rc<BigBlobOfData>>`, which is going to save you not only the time
+//! spent cloning the big blobs of data, but also the memory spent keeping
+//! multiple copies of it around, as [`Rc`][std::rc::Rc] keeps a single
+//! reference counted copy around instead.
+//!
+//! If you're storing smaller values that aren't
+//! [`Copy`][std::marker::Copy]able, you'll need to exercise judgement: if your
+//! values are going to be very cheap to clone, as would be the case for short
+//! [`String`][std::string::String]s or small [`Vec`][std::vec::Vec]s, you're
+//! probably better off storing them directly without wrapping them in an
+//! [`Rc`][std::rc::Rc], because, like the [`Rc`][std::rc::Rc], they're just
+//! pointers to some data on the heap, and that data isn't expensive to clone -
+//! you might actually lose more performance from the extra redirection of
+//! wrapping them in an [`Rc`][std::rc::Rc] than you would from occasionally
+//! cloning them.
+//!
+//! ### When does cloning happen?
+//!
+//! So when will your values actually be cloned? The easy answer is only if you
+//! [`clone`][std::clone::Clone::clone] the data structure itself, and then only
+//! lazily as you change it. Values are stored in tree nodes inside the data
+//! structure, each node of which contains up to 64 values. When you
+//! [`clone`][std::clone::Clone::clone] a data structure, nothing is actually
+//! copied - it's just the reference count on the root node that's incremented,
+//! to indicate that it's shared between two data structures. It's only when you
+//! actually modify one of the shared data structures that nodes are cloned:
+//! when you make a change somewhere in the tree, the node containing the change
+//! needs to be cloned, and then its parent nodes need to be updated to contain
+//! the new child node instead of the old version, and so they're cloned as
+//! well.
+//!
+//! We can call this "lazy" cloning - if you make two copies of a data structure
+//! and you never change either of them, there's never any need to clone the
+//! data they contain. It's only when you start making changes that cloning
+//! starts to happen, and then only on the specific tree nodes that are part of
+//! the change. Note that the implications of lazily cloning the data structure
+//! extend to memory usage as well as the CPU workload of copying the data
+//! around - cloning an immutable data structure means both copies share the
+//! same allocated memory, until you start making changes.
+//!
+//! Most crucially, if you never clone the data structure, the data inside it is
+//! also never cloned, and in this case it acts just like a mutable data
+//! structure, with minimal performance differences (but still non-zero, as we
+//! still have to check for shared nodes).
+//!
+//! ## Data Structures
+//!
+//! We'll attempt to provide a comprehensive guide to the available
+//! data structures below.
+//!
+//! ### Performance Notes
+//!
+//! "Big O notation" is the standard way of talking about the time
+//! complexity of data structure operations. If you're not familiar
+//! with big O notation, here's a quick cheat sheet:
+//!
+//! *O(1)* means an operation runs in constant time: it will take the
+//! same time to complete regardless of the size of the data
+//! structure.
+//!
+//! *O(n)* means an operation runs in linear time: if you double the
+//! size of your data structure, the operation will take twice as long
+//! to complete; if you quadruple the size, it will take four times as
+//! long, etc.
+//!
+//! *O(log n)* means an operation runs in logarithmic time: for
+//! *log<sub>2</sub>*, if you double the size of your data structure,
+//! the operation will take one step longer to complete; if you
+//! quadruple the size, it will need two steps more; and so on.
+//! However, the data structures in this library generally run in
+//! *log<sub>64</sub>* time, meaning you have to make your data
+//! structure 64 times bigger to need one extra step, and 4096 times
+//! bigger to need two steps. This means that, while they still count
+//! as O(log n), operations on all but really large data sets will run
+//! at near enough to O(1) that you won't usually notice.
+//!
+//! *O(n log n)* is the most expensive operation you'll see in this
+//! library: it means that for every one of the *n* elements in your
+//! data structure, you have to perform *log n* operations. In our
+//! case, as noted above, this is often close enough to O(n) that it's
+//! not usually as bad as it sounds, but even O(n) isn't cheap and the
+//! cost still increases logarithmically, if slowly, as the size of
+//! your data increases. O(n log n) basically means "are you sure you
+//! need to do this?"
+//!
+//! *O(1)** means 'amortised O(1),' which means that an operation
+//! usually runs in constant time but will occasionally be more
+//! expensive: for instance,
+//! [`Vector::push_back`][vector::Vector::push_back], if called in
+//! sequence, will be O(1) most of the time but every 64th time it
+//! will be O(log n), as it fills up its tail chunk and needs to
+//! insert it into the tree. Please note that the O(1) with the
+//! asterisk attached is not a common notation; it's just a convention
+//! I've used in these docs to save myself from having to type
+//! 'amortised' everywhere.
+//!
+//! ### Lists
+//!
+//! Lists are sequences of single elements which maintain the order in
+//! which you inserted them. The only list in this library is
+//! [`Vector`][vector::Vector], which offers the best all round
+//! performance characteristics: it's pretty good at everything, even
+//! if there's always another kind of list that's better at something.
+//!
+//! | Type | Algorithm | Constraints | Order | Push | Pop | Split | Append | Lookup |
+//! | --- | --- | --- | --- | --- | --- | --- |
+//! | [`Vector<A>`][vector::Vector] | [RRB tree][rrb-tree] | [`Clone`][std::clone::Clone] | insertion | O(1)* | O(1)* | O(log n) | O(log n) | O(log n) |
+//!
+//! ### Maps
+//!
+//! Maps are mappings of keys to values, where the most common read
+//! operation is to find the value associated with a given key. Maps
+//! may or may not have a defined order. Any given key can only occur
+//! once inside a map, and setting a key to a different value will
+//! overwrite the previous value.
+//!
+//! | Type | Algorithm | Key Constraints | Order | Insert | Remove | Lookup |
+//! | --- | --- | --- | --- | --- | --- |
+//! | [`HashMap<K, V>`][hashmap::HashMap] | [HAMT][hamt] | [`Clone`][std::clone::Clone] + [`Hash`][std::hash::Hash] + [`Eq`][std::cmp::Eq] | undefined | O(log n) | O(log n) | O(log n) |
+//! | [`OrdMap<K, V>`][ordmap::OrdMap] | [B-tree][b-tree] | [`Clone`][std::clone::Clone] + [`Ord`][std::cmp::Ord] | sorted | O(log n) | O(log n) | O(log n) |
+//!
+//! ### Sets
+//!
+//! Sets are collections of unique values, and may or may not have a
+//! defined order. Their crucial property is that any given value can
+//! only exist once in a given set.
+//!
+//! | Type | Algorithm | Constraints | Order | Insert | Remove | Lookup |
+//! | --- | --- | --- | --- | --- | --- |
+//! | [`HashSet<A>`][hashset::HashSet] | [HAMT][hamt] | [`Clone`][std::clone::Clone] + [`Hash`][std::hash::Hash] + [`Eq`][std::cmp::Eq] | undefined | O(log n) | O(log n) | O(log n) |
+//! | [`OrdSet<A>`][ordset::OrdSet] | [B-tree][b-tree] | [`Clone`][std::clone::Clone] + [`Ord`][std::cmp::Ord] | sorted | O(log n) | O(log n) | O(log n) |
+//!
+//! ## In-place Mutation
+//!
+//! All of these data structures support in-place copy-on-write
+//! mutation, which means that if you're the sole user of a data
+//! structure, you can update it in place without taking the
+//! performance hit of making a copy of the data structure before
+//! modifying it (this is about an order of magnitude faster than
+//! immutable operations, almost as fast as
+//! [`std::collections`][std::collections]'s mutable data structures).
+//!
+//! Thanks to [`Rc`][std::rc::Rc]'s reference counting, we are able to
+//! determine whether a node in a data structure is being shared with
+//! other data structures, or whether it's safe to mutate it in place.
+//! When it's shared, we'll automatically make a copy of the node
+//! before modifying it. The consequence of this is that cloning a
+//! data structure becomes a lazy operation: the initial clone is
+//! instant, and as you modify the cloned data structure it will clone
+//! chunks only where you change them, so that if you change the
+//! entire thing you will eventually have performed a full clone.
+//!
+//! This also gives us a couple of other optimisations for free:
+//! implementations of immutable data structures in other languages
+//! often have the idea of local mutation, like Clojure's transients
+//! or Haskell's `ST` monad - a managed scope where you can treat an
+//! immutable data structure like a mutable one, gaining a
+//! considerable amount of performance because you no longer need to
+//! copy your changed nodes for every operation, just the first time
+//! you hit a node that's sharing structure. In Rust, we don't need to
+//! think about this kind of managed scope, it's all taken care of
+//! behind the scenes because of our low level access to the garbage
+//! collector (which, in our case, is just a simple
+//! [`Rc`][std::rc::Rc]).
+//!
+//! ## Thread Safety
+//!
+//! The data structures in the `im` crate are thread safe, through
+//! [`Arc`][std::sync::Arc]. This comes with a slight performance impact, so
+//! that if you prioritise speed over thread safety, you may want to use the
+//! `im-rc` crate instead, which is identical to `im` except that it uses
+//! [`Rc`][std::rc::Rc] instead of [`Arc`][std::sync::Arc], implying that the
+//! data structures in `im-rc` do not implement [`Send`][std::marker::Send] and
+//! [`Sync`][std::marker::Sync]. This yields approximately a 20-25% increase in
+//! general performance.
+//!
+//! ## Feature Flags
+//!
+//! `im` comes with optional support for the following crates through Cargo
+//! feature flags. You can enable them in your `Cargo.toml` file like this:
+//!
+//! ```no_compile
+//! [dependencies]
+//! im = { version = "*", features = ["proptest", "serde"] }
+//! ```
+//!
+//! | Feature | Description |
+//! | ------- | ----------- |
+//! | [`proptest`](https://crates.io/crates/proptest) | Strategies for all `im` datatypes under a `proptest` namespace, eg. `im::vector::proptest::vector()` |
+//! | [`quickcheck`](https://crates.io/crates/quickcheck) | `Arbitrary` implementations for all `im` datatypes (not available in `im-rc`) |
+//! | [`rayon`](https://crates.io/crates/rayon) | parallel iterator implementations for `Vector` (not available in `im-rc`) |
+//! | [`serde`](https://crates.io/crates/serde) | `Serialize` and `Deserialize` implementations for all `im` datatypes |
+//!
+//! [std::collections]: https://doc.rust-lang.org/std/collections/index.html
+//! [std::collections::VecDeque]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html
+//! [std::vec::Vec]: https://doc.rust-lang.org/std/vec/struct.Vec.html
+//! [std::string::String]: https://doc.rust-lang.org/std/string/struct.String.html
+//! [std::rc::Rc]: https://doc.rust-lang.org/std/rc/struct.Rc.html
+//! [std::sync::Arc]: https://doc.rust-lang.org/std/sync/struct.Arc.html
+//! [std::cmp::Eq]: https://doc.rust-lang.org/std/cmp/trait.Eq.html
+//! [std::cmp::Ord]: https://doc.rust-lang.org/std/cmp/trait.Ord.html
+//! [std::clone::Clone]: https://doc.rust-lang.org/std/clone/trait.Clone.html
+//! [std::clone::Clone::clone]: https://doc.rust-lang.org/std/clone/trait.Clone.html#tymethod.clone
+//! [std::marker::Copy]: https://doc.rust-lang.org/std/marker/trait.Copy.html
+//! [std::hash::Hash]: https://doc.rust-lang.org/std/hash/trait.Hash.html
+//! [std::marker::Send]: https://doc.rust-lang.org/std/marker/trait.Send.html
+//! [std::marker::Sync]: https://doc.rust-lang.org/std/marker/trait.Sync.html
+//! [hashmap::HashMap]: ./hashmap/struct.HashMap.html
+//! [hashset::HashSet]: ./hashset/struct.HashSet.html
+//! [ordmap::OrdMap]: ./ordmap/struct.OrdMap.html
+//! [ordset::OrdSet]: ./ordset/struct.OrdSet.html
+//! [vector::Vector]: ./vector/enum.Vector.html
+//! [vector::Vector::push_back]: ./vector/enum.Vector.html#method.push_back
+//! [rrb-tree]: https://infoscience.epfl.ch/record/213452/files/rrbvector.pdf
+//! [hamt]: https://en.wikipedia.org/wiki/Hash_array_mapped_trie
+//! [b-tree]: https://en.wikipedia.org/wiki/B-tree
+//! [cons-list]: https://en.wikipedia.org/wiki/Cons#Lists
+
+#![deny(unsafe_code)]
+#![cfg_attr(has_specialisation, feature(specialization))]
+#![cfg_attr(docs_rs_workaround, feature(slice_get_slice))]
+
+extern crate typenum;
+
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
+#[cfg(feature = "quickcheck")]
+extern crate quickcheck;
+
+#[cfg(any(test, feature = "proptest"))]
+#[macro_use]
+extern crate proptest;
+
+#[cfg(feature = "proptest")]
+proptest! {}
+
+#[cfg(any(test, feature = "serde"))]
+extern crate serde;
+#[cfg(test)]
+extern crate serde_json;
+
+#[cfg(all(threadsafe, any(test, feature = "rayon")))]
+extern crate rayon;
+
+#[cfg(test)]
+extern crate metrohash;
+
+mod config;
+mod nodes;
+mod sort;
+mod sync;
+mod util;
+
+#[macro_use]
+mod ord;
+pub use ord::map as ordmap;
+pub use ord::set as ordset;
+
+#[macro_use]
+mod hash;
+pub use hash::map as hashmap;
+pub use hash::set as hashset;
+
+#[macro_use]
+pub mod vector;
+
+pub mod iter;
+
+#[cfg(any(test, feature = "serde"))]
+pub mod ser;
+
+pub use nodes::sized_chunk as chunk;
+
+pub use hashmap::HashMap;
+pub use hashset::HashSet;
+pub use ordmap::OrdMap;
+pub use ordset::OrdSet;
+pub use vector::Vector;
+
+#[cfg(test)]
+mod test;
+
+/// Update a value inside multiple levels of data structures.
+///
+/// This macro takes a [`Vector`][Vector], [`OrdMap`][OrdMap] or [`HashMap`][HashMap],
+/// a key or a series of keys, and a value, and returns the data structure with the
+/// new value at the location described by the keys.
+///
+/// If one of the keys in the path doesn't exist, the macro will panic.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use std::sync::Arc;
+/// # fn main() {
+/// let vec_inside_vec = vector![vector![1, 2, 3], vector![4, 5, 6]];
+///
+/// let expected = vector![vector![1, 2, 3], vector![4, 5, 1337]];
+///
+/// assert_eq!(expected, update_in![vec_inside_vec, 1 => 2, 1337]);
+/// # }
+/// ```
+///
+/// [Vector]: ../vector/enum.Vector.html
+/// [HashMap]: ../hashmap/struct.HashMap.html
+/// [OrdMap]: ../ordmap/struct.OrdMap.html
+#[macro_export]
+macro_rules! update_in {
+    ($target:expr, $path:expr => $($tail:tt) => *, $value:expr ) => {{
+        let inner = $target.get($path).expect("update_in! macro: key not found in target");
+        $target.update($path, update_in!(inner, $($tail) => *, $value))
+    }};
+
+    ($target:expr, $path:expr, $value:expr) => {
+        $target.update($path, $value)
+    };
+}
+
+/// Get a value inside multiple levels of data structures.
+///
+/// This macro takes a [`Vector`][Vector], [`OrdMap`][OrdMap] or [`HashMap`][HashMap],
+/// along with a key or a series of keys, and returns the value at the location inside
+/// the data structure described by the key sequence, or `None` if any of the keys didn't
+/// exist.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use std::sync::Arc;
+/// # fn main() {
+/// let vec_inside_vec = vector![vector![1, 2, 3], vector![4, 5, 6]];
+///
+/// assert_eq!(Some(&6), get_in![vec_inside_vec, 1 => 2]);
+/// # }
+/// ```
+///
+/// [Vector]: ../vector/enum.Vector.html
+/// [HashMap]: ../hashmap/struct.HashMap.html
+/// [OrdMap]: ../ordmap/struct.OrdMap.html
+#[macro_export]
+macro_rules! get_in {
+    ($target:expr, $path:expr => $($tail:tt) => * ) => {{
+        $target.get($path).and_then(|v| get_in!(v, $($tail) => *))
+    }};
+
+    ($target:expr, $path:expr) => {
+        $target.get($path)
+    };
+}
+
+#[cfg(test)]
+mod lib_test {
+    #[test]
+    fn update_in() {
+        let vector = vector![1, 2, 3, 4, 5];
+        assert_eq!(vector![1, 2, 23, 4, 5], update_in!(vector, 2, 23));
+        let hashmap = hashmap![1 => 1, 2 => 2, 3 => 3];
+        assert_eq!(
+            hashmap![1 => 1, 2 => 23, 3 => 3],
+            update_in!(hashmap, 2, 23)
+        );
+        let ordmap = ordmap![1 => 1, 2 => 2, 3 => 3];
+        assert_eq!(ordmap![1 => 1, 2 => 23, 3 => 3], update_in!(ordmap, 2, 23));
+
+        let vecs = vector![vector![1, 2, 3], vector![4, 5, 6], vector![7, 8, 9]];
+        let vecs_target = vector![vector![1, 2, 3], vector![4, 5, 23], vector![7, 8, 9]];
+        assert_eq!(vecs_target, update_in!(vecs, 1 => 2, 23));
+    }
+
+    #[test]
+    fn get_in() {
+        let vector = vector![1, 2, 3, 4, 5];
+        assert_eq!(Some(&3), get_in!(vector, 2));
+        let hashmap = hashmap![1 => 1, 2 => 2, 3 => 3];
+        assert_eq!(Some(&2), get_in!(hashmap, &2));
+        let ordmap = ordmap![1 => 1, 2 => 2, 3 => 3];
+        assert_eq!(Some(&2), get_in!(ordmap, &2));
+
+        let vecs = vector![vector![1, 2, 3], vector![4, 5, 6], vector![7, 8, 9]];
+        assert_eq!(Some(&6), get_in!(vecs, 1 => 2));
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/bitmap.rs cargo-0.33.0/vendor/im-rc/src/nodes/bitmap.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/bitmap.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/bitmap.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,121 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use nodes::types::Bits;
+
+pub struct Bitmap<Size: Bits> {
+    data: Size::Store,
+}
+
+impl<Size: Bits> Clone for Bitmap<Size> {
+    fn clone(&self) -> Self {
+        Bitmap { data: self.data }
+    }
+}
+
+impl<Size: Bits> Copy for Bitmap<Size> {}
+
+impl<Size: Bits> Default for Bitmap<Size> {
+    fn default() -> Self {
+        Bitmap {
+            data: Size::Store::default(),
+        }
+    }
+}
+
+impl<Size: Bits> PartialEq for Bitmap<Size> {
+    fn eq(&self, other: &Self) -> bool {
+        self.data == other.data
+    }
+}
+
+use std::fmt;
+
+impl<Size: Bits> fmt::Debug for Bitmap<Size> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        self.data.fmt(f)
+    }
+}
+
+impl<Size: Bits> Bitmap<Size> {
+    #[inline]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    #[inline]
+    pub fn get(self, index: usize) -> bool {
+        Size::get(&self.data, index)
+    }
+
+    #[inline]
+    pub fn set(&mut self, index: usize, value: bool) -> bool {
+        Size::set(&mut self.data, index, value)
+    }
+
+    #[inline]
+    pub fn len(self) -> usize {
+        Size::len(&self.data)
+    }
+
+    #[inline]
+    pub fn first_index(self) -> Option<usize> {
+        Size::first_index(&self.data)
+    }
+}
+
+impl<Size: Bits> IntoIterator for Bitmap<Size> {
+    type Item = usize;
+    type IntoIter = Iter<Size>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Iter {
+            index: 0,
+            data: self.data,
+        }
+    }
+}
+
+pub struct Iter<Size: Bits> {
+    index: usize,
+    data: Size::Store,
+}
+
+impl<Size: Bits> Iterator for Iter<Size> {
+    type Item = usize;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.index >= Size::USIZE {
+            return None;
+        }
+        if Size::get(&self.data, self.index) {
+            self.index += 1;
+            Some(self.index - 1)
+        } else {
+            self.index += 1;
+            self.next()
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use proptest::collection::btree_set;
+    use typenum::U64;
+
+    proptest! {
+        #[test]
+        fn get_set_and_iter(bits in btree_set(0..64usize, 0..64)) {
+            let mut bitmap = Bitmap::<U64>::new();
+            for i in &bits {
+                bitmap.set(*i, true);
+            }
+            for i in 0..64 {
+                assert_eq!(bitmap.get(i), bits.contains(&i));
+            }
+            assert!(bitmap.into_iter().eq(bits.into_iter()));
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/btree.rs cargo-0.33.0/vendor/im-rc/src/nodes/btree.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/btree.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/btree.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1183 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::borrow::Borrow;
+use std::cmp::Ordering;
+use std::mem;
+use std::ops::{Bound, RangeBounds};
+
+use typenum::{Add1, Unsigned};
+
+use config::OrdChunkSize as NodeSize;
+use nodes::sized_chunk::Chunk;
+use util::{clone_ref, Ref};
+
+use self::Insert::*;
+use self::InsertAction::*;
+
+const NODE_SIZE: usize = NodeSize::USIZE;
+const MEDIAN: usize = (NODE_SIZE + 1) >> 1;
+
+pub trait BTreeValue: Clone {
+    type Key;
+    fn ptr_eq(&self, other: &Self) -> bool;
+    fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>;
+    fn search_value(slice: &[Self], value: &Self) -> Result<usize, usize>;
+    fn cmp_keys<BK>(&self, other: &BK) -> Ordering
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>;
+    fn cmp_values(&self, other: &Self) -> Ordering;
+}
+
+pub struct Node<A> {
+    keys: Chunk<A, NodeSize>,
+    children: Chunk<Option<Ref<Node<A>>>, Add1<NodeSize>>,
+}
+
+pub enum Insert<A> {
+    Added,
+    Replaced(A),
+    Update(Node<A>),
+    Split(Node<A>, A, Node<A>),
+}
+
+enum InsertAction<A> {
+    AddedAction,
+    ReplacedAction(A),
+    InsertAt,
+    InsertSplit(Node<A>, A, Node<A>),
+}
+
+pub enum Remove<A> {
+    NoChange,
+    Removed(A),
+    Update(A, Node<A>),
+}
+
+enum RemoveAction {
+    DeleteAt(usize),
+    PullUp(usize, usize, usize),
+    Merge(usize),
+    StealFromLeft(usize),
+    StealFromRight(usize),
+    MergeFirst(usize),
+    ContinueDown(usize),
+}
+
+impl<A> Clone for Node<A>
+where
+    A: Clone,
+{
+    fn clone(&self) -> Self {
+        Node {
+            keys: self.keys.clone(),
+            children: self.children.clone(),
+        }
+    }
+}
+
+impl<A> Default for Node<A> {
+    fn default() -> Self {
+        Node {
+            keys: Chunk::new(),
+            children: Chunk::unit(None),
+        }
+    }
+}
+
+impl<A> Node<A>
+where
+    A: Clone,
+{
+    #[inline]
+    fn has_room(&self) -> bool {
+        self.keys.len() < NODE_SIZE
+    }
+
+    #[inline]
+    fn too_small(&self) -> bool {
+        self.keys.len() < MEDIAN
+    }
+
+    #[inline]
+    fn is_leaf(&self) -> bool {
+        self.children[0].is_none()
+    }
+
+    #[inline]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    #[inline]
+    pub fn unit(value: A) -> Self {
+        Node {
+            keys: Chunk::unit(value),
+            children: Chunk::pair(None, None),
+        }
+    }
+
+    #[inline]
+    pub fn from_split(left: Node<A>, median: A, right: Node<A>) -> Self {
+        Node {
+            keys: Chunk::unit(median),
+            children: Chunk::pair(Some(Ref::from(left)), Some(Ref::from(right))),
+        }
+    }
+
+    pub fn min(&self) -> Option<&A> {
+        match self.children.first().unwrap() {
+            None => self.keys.first(),
+            Some(ref child) => child.min(),
+        }
+    }
+
+    pub fn max(&self) -> Option<&A> {
+        match self.children.last().unwrap() {
+            None => self.keys.last(),
+            Some(ref child) => child.max(),
+        }
+    }
+}
+
+impl<A: BTreeValue> Node<A> {
+    fn child_contains<BK>(&self, index: usize, key: &BK) -> bool
+    where
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if let Some(Some(ref child)) = self.children.get(index) {
+            child.lookup(key).is_some()
+        } else {
+            false
+        }
+    }
+
+    pub fn lookup<BK>(&self, key: &BK) -> Option<&A>
+    where
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if self.keys.is_empty() {
+            return None;
+        }
+        // Perform a binary search, resulting in either a match or
+        // the index of the first higher key, meaning we search the
+        // child to the left of it.
+        match A::search_key(&self.keys, key) {
+            Ok(index) => Some(&self.keys[index]),
+            Err(index) => match self.children[index] {
+                None => None,
+                Some(ref node) => node.lookup(key),
+            },
+        }
+    }
+
+    pub fn lookup_mut<BK>(&mut self, key: &BK) -> Option<&mut A>
+    where
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if self.keys.is_empty() {
+            return None;
+        }
+        // Perform a binary search, resulting in either a match or
+        // the index of the first higher key, meaning we search the
+        // child to the left of it.
+        match A::search_key(&self.keys, key) {
+            Ok(index) => Some(&mut self.keys[index]),
+            Err(index) => match self.children[index] {
+                None => None,
+                Some(ref mut child_ref) => {
+                    let child = Ref::make_mut(child_ref);
+                    child.lookup_mut(key)
+                }
+            },
+        }
+    }
+
+    pub fn path_first<'a, BK>(
+        &'a self,
+        mut path: Vec<(&'a Node<A>, usize)>,
+    ) -> Vec<(&'a Node<A>, usize)>
+    where
+        A: 'a,
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if self.keys.is_empty() {
+            return Vec::new();
+        }
+        match self.children[0] {
+            None => {
+                path.push((self, 0));
+                path
+            }
+            Some(ref node) => {
+                path.push((self, 0));
+                node.path_first(path)
+            }
+        }
+    }
+
+    pub fn path_last<'a, BK>(
+        &'a self,
+        mut path: Vec<(&'a Node<A>, usize)>,
+    ) -> Vec<(&'a Node<A>, usize)>
+    where
+        A: 'a,
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if self.keys.is_empty() {
+            return Vec::new();
+        }
+        let end = self.children.len() - 1;
+        match self.children[end] {
+            None => {
+                path.push((self, end - 1));
+                path
+            }
+            Some(ref node) => {
+                path.push((self, end));
+                node.path_last(path)
+            }
+        }
+    }
+
+    pub fn path_next<'a, BK>(
+        &'a self,
+        key: &BK,
+        mut path: Vec<(&'a Node<A>, usize)>,
+    ) -> Vec<(&'a Node<A>, usize)>
+    where
+        A: 'a,
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if self.keys.is_empty() {
+            return Vec::new();
+        }
+        match A::search_key(&self.keys, key) {
+            Ok(index) => {
+                path.push((self, index));
+                path
+            }
+            Err(index) => match self.children[index] {
+                None => match self.keys.get(index) {
+                    Some(_) => {
+                        path.push((self, index));
+                        path
+                    }
+                    None => Vec::new(),
+                },
+                Some(ref node) => {
+                    path.push((self, index));
+                    node.path_next(key, path)
+                }
+            },
+        }
+    }
+
+    pub fn path_prev<'a, BK>(
+        &'a self,
+        key: &BK,
+        mut path: Vec<(&'a Node<A>, usize)>,
+    ) -> Vec<(&'a Node<A>, usize)>
+    where
+        A: 'a,
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        if self.keys.is_empty() {
+            return Vec::new();
+        }
+        match A::search_key(&self.keys, key) {
+            Ok(index) => {
+                path.push((self, index));
+                path
+            }
+            Err(index) => match self.children[index] {
+                None if index == 0 => Vec::new(),
+                None => match self.keys.get(index - 1) {
+                    Some(_) => {
+                        path.push((self, index));
+                        path
+                    }
+                    None => Vec::new(),
+                },
+                Some(ref node) => {
+                    path.push((self, index));
+                    node.path_prev(key, path)
+                }
+            },
+        }
+    }
+
+    fn split(
+        &mut self,
+        value: A,
+        ins_left: Option<Node<A>>,
+        ins_right: Option<Node<A>>,
+    ) -> Insert<A> {
+        let left_child = ins_left.map(Ref::from);
+        let right_child = ins_right.map(Ref::from);
+        let index = A::search_value(&self.keys, &value).unwrap_err();
+        let mut left_keys;
+        let mut left_children;
+        let mut right_keys;
+        let mut right_children;
+        let median;
+        if index < MEDIAN {
+            self.children[index] = left_child;
+
+            left_keys = Chunk::from_front(&mut self.keys, index);
+            left_keys.push_back(value);
+            left_keys.drain_from_front(&mut self.keys, MEDIAN - index - 1);
+
+            left_children = Chunk::from_front(&mut self.children, index + 1);
+            left_children.push_back(right_child);
+            left_children.drain_from_front(&mut self.children, MEDIAN - index - 1);
+
+            median = self.keys.pop_front();
+
+            right_keys = Chunk::drain_from(&mut self.keys);
+            right_children = Chunk::drain_from(&mut self.children);
+        } else if index > MEDIAN {
+            self.children[index] = left_child;
+
+            left_keys = Chunk::from_front(&mut self.keys, MEDIAN);
+            left_children = Chunk::from_front(&mut self.children, MEDIAN + 1);
+
+            median = self.keys.pop_front();
+
+            right_keys = Chunk::from_front(&mut self.keys, index - MEDIAN - 1);
+            right_keys.push_back(value);
+            right_keys.append(&mut self.keys);
+
+            right_children = Chunk::from_front(&mut self.children, index - MEDIAN);
+            right_children.push_back(right_child);
+            right_children.append(&mut self.children);
+        } else {
+            left_keys = Chunk::from_front(&mut self.keys, MEDIAN);
+            left_children = Chunk::from_front(&mut self.children, MEDIAN);
+            left_children.push_back(left_child);
+
+            median = value;
+
+            right_keys = Chunk::drain_from(&mut self.keys);
+            right_children = Chunk::drain_from(&mut self.children);
+            right_children[0] = right_child;
+        }
+
+        debug_assert!(left_keys.len() == MEDIAN);
+        debug_assert!(left_children.len() == MEDIAN + 1);
+        debug_assert!(right_keys.len() == MEDIAN);
+        debug_assert!(right_children.len() == MEDIAN + 1);
+
+        Split(
+            Node {
+                keys: left_keys,
+                children: left_children,
+            },
+            median,
+            Node {
+                keys: right_keys,
+                children: right_children,
+            },
+        )
+    }
+
+    fn merge(middle: A, left: Node<A>, mut right: Node<A>) -> Node<A> {
+        let mut keys = left.keys;
+        keys.push_back(middle);
+        keys.append(&mut right.keys);
+        let mut children = left.children;
+        children.append(&mut right.children);
+        Node { keys, children }
+    }
+
+    fn pop_min(&mut self) -> (A, Option<Ref<Node<A>>>) {
+        let value = self.keys.pop_front();
+        let child = self.children.pop_front();
+        (value, child)
+    }
+
+    fn pop_max(&mut self) -> (A, Option<Ref<Node<A>>>) {
+        let value = self.keys.pop_back();
+        let child = self.children.pop_back();
+        (value, child)
+    }
+
+    fn push_min(&mut self, child: Option<Ref<Node<A>>>, value: A) {
+        self.keys.push_front(value);
+        self.children.push_front(child);
+    }
+
+    fn push_max(&mut self, child: Option<Ref<Node<A>>>, value: A) {
+        self.keys.push_back(value);
+        self.children.push_back(child);
+    }
+
+    pub fn insert(&mut self, value: A) -> Insert<A> {
+        if self.keys.is_empty() {
+            self.keys.push_back(value);
+            self.children.push_back(None);
+            return Insert::Added;
+        }
+        let (median, left, right) = match A::search_value(&self.keys, &value) {
+            // Key exists in node
+            Ok(index) => {
+                return Insert::Replaced(mem::replace(&mut self.keys[index], value));
+            }
+            // Key is adjacent to some key in node
+            Err(index) => {
+                let mut has_room = self.has_room();
+                let action = match self.children[index] {
+                    // No child at location, this is the target node.
+                    None => InsertAt,
+                    // Child at location, pass it on.
+                    Some(ref mut child_ref) => {
+                        let child = Ref::make_mut(child_ref);
+                        match child.insert(value.clone()) {
+                            Insert::Added => AddedAction,
+                            Insert::Replaced(value) => ReplacedAction(value),
+                            Insert::Update(_) => unreachable!(),
+                            Insert::Split(left, median, right) => InsertSplit(left, median, right),
+                        }
+                    }
+                };
+                match action {
+                    ReplacedAction(value) => return Insert::Replaced(value),
+                    AddedAction => {
+                        return Insert::Added;
+                    }
+                    InsertAt => {
+                        if has_room {
+                            self.keys.insert(index, value);
+                            self.children.insert(index + 1, None);
+                            return Insert::Added;
+                        } else {
+                            (value, None, None)
+                        }
+                    }
+                    InsertSplit(left, median, right) => {
+                        if has_room {
+                            self.children[index] = Some(Ref::from(left));
+                            self.keys.insert(index, median);
+                            self.children.insert(index + 1, Some(Ref::from(right)));
+                            return Insert::Added;
+                        } else {
+                            (median, Some(left), Some(right))
+                        }
+                    }
+                }
+            }
+        };
+        self.split(median, left, right)
+    }
+
+    pub fn remove<BK>(&mut self, key: &BK) -> Remove<A>
+    where
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        let index = A::search_key(&self.keys, key);
+        self.remove_index(index, key)
+    }
+
+    fn remove_index<BK>(&mut self, index: Result<usize, usize>, key: &BK) -> Remove<A>
+    where
+        BK: Ord + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        let action = match index {
+            // Key exists in node, remove it.
+            Ok(index) => {
+                match (&self.children[index], &self.children[index + 1]) {
+                    // If we're a leaf, just delete the entry.
+                    (&None, &None) => RemoveAction::DeleteAt(index),
+                    // If the left hand child has capacity, pull the predecessor up.
+                    (&Some(ref left), _) if !left.too_small() => {
+                        if left.is_leaf() {
+                            RemoveAction::PullUp(left.keys.len() - 1, index, index)
+                        } else {
+                            RemoveAction::StealFromLeft(index + 1)
+                        }
+                    }
+                    // If the right hand child has capacity, pull the successor up.
+                    (_, &Some(ref right)) if !right.too_small() => {
+                        if right.is_leaf() {
+                            RemoveAction::PullUp(0, index, index + 1)
+                        } else {
+                            RemoveAction::StealFromRight(index)
+                        }
+                    }
+                    // If neither child has capacity, we'll have to merge them.
+                    (&Some(_), &Some(_)) => RemoveAction::Merge(index),
+                    // If one child exists and the other doesn't, we're in a bad state.
+                    _ => unreachable!(),
+                }
+            }
+            // Key is adjacent to some key in node
+            Err(index) => match self.children[index] {
+                // No child at location means key isn't in map.
+                None => return Remove::NoChange,
+                // Child at location, but it's at minimum capacity.
+                Some(ref child) if child.too_small() => {
+                    let left = if index > 0 {
+                        self.children.get(index - 1)
+                    } else {
+                        None
+                    }; // index is usize and can't be negative, best make sure it never is.
+                    match (left, self.children.get(index + 1)) {
+                        // If it has a left sibling with capacity, steal a key from it.
+                        (Some(&Some(ref old_left)), _) if !old_left.too_small() => {
+                            RemoveAction::StealFromLeft(index)
+                        }
+                        // If it has a right sibling with capacity, same as above.
+                        (_, Some(&Some(ref old_right))) if !old_right.too_small() => {
+                            RemoveAction::StealFromRight(index)
+                        }
+                        // If it has neither, we'll have to merge it with a sibling.
+                        // If we have a right sibling, we'll merge with that.
+                        (_, Some(&Some(_))) => RemoveAction::MergeFirst(index),
+                        // If we have a left sibling, we'll merge with that.
+                        (Some(&Some(_)), _) => RemoveAction::MergeFirst(index - 1),
+                        // If none of the above, we're in a bad state.
+                        _ => unreachable!(),
+                    }
+                }
+                // Child at location, and it's big enough, we can recurse down.
+                Some(_) => RemoveAction::ContinueDown(index),
+            },
+        };
+        match action {
+            RemoveAction::DeleteAt(index) => {
+                let pair = self.keys.remove(index);
+                self.children.remove(index);
+                Remove::Removed(pair)
+            }
+            RemoveAction::PullUp(target_index, pull_to, child_index) => {
+                let mut children = &mut self.children;
+                let mut update = None;
+                let mut value;
+                if let Some(&mut Some(ref mut child_ref)) = children.get_mut(child_index) {
+                    let child = Ref::make_mut(child_ref);
+                    match child.remove_index(Ok(target_index), key) {
+                        Remove::NoChange => unreachable!(),
+                        Remove::Removed(pulled_value) => {
+                            value = self.keys.set(pull_to, pulled_value);
+                        }
+                        Remove::Update(pulled_value, new_child) => {
+                            value = self.keys.set(pull_to, pulled_value);
+                            update = Some(new_child);
+                        }
+                    }
+                } else {
+                    unreachable!()
+                }
+                if let Some(new_child) = update {
+                    children[child_index] = Some(Ref::from(new_child));
+                }
+                Remove::Removed(value)
+            }
+            RemoveAction::Merge(index) => {
+                let left = self.children.remove(index).unwrap();
+                let right = mem::replace(&mut self.children[index], None).unwrap();
+                let value = self.keys.remove(index);
+                let mut merged_child = Node::merge(value, clone_ref(left), clone_ref(right));
+                let (removed, new_child) = match merged_child.remove(key) {
+                    Remove::NoChange => unreachable!(),
+                    Remove::Removed(removed) => (removed, merged_child),
+                    Remove::Update(removed, updated_child) => (removed, updated_child),
+                };
+                if self.keys.is_empty() {
+                    // If we've depleted the root node, the merged child becomes the root.
+                    Remove::Update(removed, new_child)
+                } else {
+                    self.children[index] = Some(Ref::from(new_child));
+                    Remove::Removed(removed)
+                }
+            }
+            RemoveAction::StealFromLeft(index) => {
+                let mut update = None;
+                let mut out_value;
+                {
+                    let mut children = self.children.as_mut_slice()[index - 1..=index]
+                        .iter_mut()
+                        .map(|n| {
+                            if let Some(ref mut o) = *n {
+                                o
+                            } else {
+                                unreachable!()
+                            }
+                        });
+                    let mut left = Ref::make_mut(children.next().unwrap());
+                    let mut child = Ref::make_mut(children.next().unwrap());
+                    // Prepare the rebalanced node.
+                    child.push_min(
+                        left.children.last().unwrap().clone(),
+                        self.keys[index - 1].clone(),
+                    );
+                    match child.remove(key) {
+                        Remove::NoChange => {
+                            // Key wasn't there, we need to revert the steal.
+                            child.pop_min();
+                            return Remove::NoChange;
+                        }
+                        Remove::Removed(value) => {
+                            // If we did remove something, we complete the rebalancing.
+                            let (left_value, _) = left.pop_max();
+                            self.keys[index - 1] = left_value;
+                            out_value = value;
+                        }
+                        Remove::Update(value, new_child) => {
+                            // If we did remove something, we complete the rebalancing.
+                            let (left_value, _) = left.pop_max();
+                            self.keys[index - 1] = left_value;
+                            update = Some(new_child);
+                            out_value = value;
+                        }
+                    }
+                }
+                if let Some(new_child) = update {
+                    self.children[index] = Some(Ref::from(new_child));
+                }
+                Remove::Removed(out_value)
+            }
+            RemoveAction::StealFromRight(index) => {
+                let mut update = None;
+                let mut out_value;
+                {
+                    let mut children = self.children.as_mut_slice()[index..index + 2]
+                        .iter_mut()
+                        .map(|n| {
+                            if let Some(ref mut o) = *n {
+                                o
+                            } else {
+                                unreachable!()
+                            }
+                        });
+                    let mut child = Ref::make_mut(children.next().unwrap());
+                    let mut right = Ref::make_mut(children.next().unwrap());
+                    // Prepare the rebalanced node.
+                    child.push_max(right.children[0].clone(), self.keys[index].clone());
+                    match child.remove(key) {
+                        Remove::NoChange => {
+                            // Key wasn't there, we need to revert the steal.
+                            child.pop_max();
+                            return Remove::NoChange;
+                        }
+                        Remove::Removed(value) => {
+                            // If we did remove something, we complete the rebalancing.
+                            let (right_value, _) = right.pop_min();
+                            self.keys[index] = right_value;
+                            out_value = value;
+                        }
+                        Remove::Update(value, new_child) => {
+                            // If we did remove something, we complete the rebalancing.
+                            let (right_value, _) = right.pop_min();
+                            self.keys[index] = right_value;
+                            update = Some(new_child);
+                            out_value = value;
+                        }
+                    }
+                }
+                if let Some(new_child) = update {
+                    self.children[index] = Some(Ref::from(new_child));
+                }
+                Remove::Removed(out_value)
+            }
+            RemoveAction::MergeFirst(index) => {
+                if self.keys[index].cmp_keys(key) != Ordering::Equal
+                    && !self.child_contains(index, key)
+                    && !self.child_contains(index + 1, key)
+                {
+                    return Remove::NoChange;
+                }
+                let left = self.children.remove(index).unwrap();
+                let right = mem::replace(&mut self.children[index], None).unwrap();
+                let middle = self.keys.remove(index);
+                let mut merged = Node::merge(middle, clone_ref(left), clone_ref(right));
+                let mut update;
+                let mut out_value;
+                match merged.remove(key) {
+                    Remove::NoChange => {
+                        panic!("nodes::btree::Node::remove: caught an absent key too late while merging");
+                    }
+                    Remove::Removed(value) => {
+                        if self.keys.is_empty() {
+                            return Remove::Update(value, merged);
+                        }
+                        update = merged;
+                        out_value = value;
+                    }
+                    Remove::Update(value, new_child) => {
+                        if self.keys.is_empty() {
+                            return Remove::Update(value, new_child);
+                        }
+                        update = new_child;
+                        out_value = value;
+                    }
+                }
+                self.children[index] = Some(Ref::from(update));
+                Remove::Removed(out_value)
+            }
+            RemoveAction::ContinueDown(index) => {
+                let mut update = None;
+                let mut out_value;
+                if let Some(&mut Some(ref mut child_ref)) = self.children.get_mut(index) {
+                    let child = Ref::make_mut(child_ref);
+                    match child.remove(key) {
+                        Remove::NoChange => return Remove::NoChange,
+                        Remove::Removed(value) => {
+                            out_value = value;
+                        }
+                        Remove::Update(value, new_child) => {
+                            update = Some(new_child);
+                            out_value = value;
+                        }
+                    }
+                } else {
+                    unreachable!()
+                }
+                if let Some(new_child) = update {
+                    self.children[index] = Some(Ref::from(new_child));
+                }
+                Remove::Removed(out_value)
+            }
+        }
+    }
+}
+
+// Iterator
+
+pub struct Iter<'a, A: 'a> {
+    fwd_path: Vec<(&'a Node<A>, usize)>,
+    back_path: Vec<(&'a Node<A>, usize)>,
+    pub(crate) remaining: usize,
+}
+
+impl<'a, A: 'a + BTreeValue> Iter<'a, A> {
+    pub fn new<R, BK>(root: &'a Node<A>, size: usize, range: R) -> Self
+    where
+        R: RangeBounds<BK>,
+        A::Key: Borrow<BK>,
+        BK: Ord + ?Sized,
+    {
+        let fwd_path = match range.start_bound() {
+            Bound::Included(key) => root.path_next(key, Vec::new()),
+            Bound::Excluded(key) => {
+                let mut path = root.path_next(key, Vec::new());
+                if let Some(value) = Self::get(&path) {
+                    if value.cmp_keys(key) == Ordering::Equal {
+                        Self::step_forward(&mut path);
+                    }
+                }
+                path
+            }
+            Bound::Unbounded => root.path_first(Vec::new()),
+        };
+        let back_path = match range.end_bound() {
+            Bound::Included(key) => root.path_prev(key, Vec::new()),
+            Bound::Excluded(key) => {
+                let mut path = root.path_prev(key, Vec::new());
+                if let Some(value) = Self::get(&path) {
+                    if value.cmp_keys(key) == Ordering::Equal {
+                        Self::step_back(&mut path);
+                    }
+                }
+                path
+            }
+            Bound::Unbounded => root.path_last(Vec::new()),
+        };
+        Iter {
+            fwd_path,
+            back_path,
+            remaining: size,
+        }
+    }
+
+    fn get(path: &[(&'a Node<A>, usize)]) -> Option<&'a A> {
+        match path.last() {
+            Some((node, index)) => Some(&node.keys[*index]),
+            None => None,
+        }
+    }
+
+    fn step_forward(path: &mut Vec<(&'a Node<A>, usize)>) -> Option<&'a A> {
+        match path.pop() {
+            Some((node, index)) => {
+                let index = index + 1;
+                match node.children[index] {
+                    // Child between current and next key -> step down
+                    Some(ref child) => {
+                        path.push((node, index));
+                        path.push((child, 0));
+                        let mut node = child;
+                        while let Some(ref left_child) = node.children[0] {
+                            path.push((left_child, 0));
+                            node = left_child;
+                        }
+                        Some(&node.keys[0])
+                    }
+                    None => match node.keys.get(index) {
+                        // Yield next key
+                        value @ Some(_) => {
+                            path.push((node, index));
+                            value
+                        }
+                        // No more keys -> exhausted level, step up and yield
+                        None => loop {
+                            match path.pop() {
+                                None => {
+                                    return None;
+                                }
+                                Some((node, index)) => {
+                                    if let value @ Some(_) = node.keys.get(index) {
+                                        path.push((node, index));
+                                        return value;
+                                    }
+                                }
+                            }
+                        },
+                    },
+                }
+            }
+            None => None,
+        }
+    }
+
+    fn step_back(path: &mut Vec<(&'a Node<A>, usize)>) -> Option<&'a A> {
+        match path.pop() {
+            Some((node, index)) => match node.children[index] {
+                Some(ref child) => {
+                    path.push((node, index));
+                    let mut end = child.keys.len() - 1;
+                    path.push((child, end));
+                    let mut node = child;
+                    while let Some(ref right_child) = node.children[end + 1] {
+                        end = right_child.keys.len() - 1;
+                        path.push((right_child, end));
+                        node = right_child;
+                    }
+                    Some(&node.keys[end])
+                }
+                None => {
+                    if index == 0 {
+                        loop {
+                            match path.pop() {
+                                None => {
+                                    return None;
+                                }
+                                Some((node, index)) => {
+                                    if index > 0 {
+                                        let index = index - 1;
+                                        path.push((node, index));
+                                        return Some(&node.keys[index]);
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        let index = index - 1;
+                        path.push((node, index));
+                        Some(&node.keys[index])
+                    }
+                }
+            },
+            None => None,
+        }
+    }
+}
+
+impl<'a, A: 'a + BTreeValue> Iterator for Iter<'a, A> {
+    type Item = &'a A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match Iter::get(&self.fwd_path) {
+            None => None,
+            Some(value) => match Iter::get(&self.back_path) {
+                Some(last_value) if value.cmp_values(last_value) == Ordering::Greater => None,
+                None => None,
+                Some(_) => {
+                    Iter::step_forward(&mut self.fwd_path);
+                    self.remaining -= 1;
+                    Some(value)
+                }
+            },
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        // (0, Some(self.remaining))
+        (0, None)
+    }
+}
+
+impl<'a, A: 'a + BTreeValue> DoubleEndedIterator for Iter<'a, A> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        match Iter::get(&self.back_path) {
+            None => None,
+            Some(value) => match Iter::get(&self.fwd_path) {
+                Some(last_value) if value.cmp_values(last_value) == Ordering::Less => None,
+                None => None,
+                Some(_) => {
+                    Iter::step_back(&mut self.back_path);
+                    self.remaining -= 1;
+                    Some(value)
+                }
+            },
+        }
+    }
+}
+
+// Consuming iterator
+
+enum ConsumingIterItem<A> {
+    Consider(Node<A>),
+    Yield(A),
+}
+
+pub struct ConsumingIter<A> {
+    fwd_last: Option<A>,
+    fwd_stack: Vec<ConsumingIterItem<A>>,
+    back_last: Option<A>,
+    back_stack: Vec<ConsumingIterItem<A>>,
+    remaining: usize,
+}
+
+impl<A: Clone> ConsumingIter<A> {
+    pub fn new(root: &Node<A>, total: usize) -> Self {
+        ConsumingIter {
+            fwd_last: None,
+            fwd_stack: vec![ConsumingIterItem::Consider(root.clone())],
+            back_last: None,
+            back_stack: vec![ConsumingIterItem::Consider(root.clone())],
+            remaining: total,
+        }
+    }
+
+    fn push_node(stack: &mut Vec<ConsumingIterItem<A>>, maybe_node: Option<Ref<Node<A>>>) {
+        if let Some(node) = maybe_node {
+            stack.push(ConsumingIterItem::Consider(clone_ref(node)))
+        }
+    }
+
+    fn push(stack: &mut Vec<ConsumingIterItem<A>>, mut node: Node<A>) {
+        for _n in 0..node.keys.len() {
+            ConsumingIter::push_node(stack, node.children.pop_back());
+            stack.push(ConsumingIterItem::Yield(node.keys.pop_back()));
+        }
+        ConsumingIter::push_node(stack, node.children.pop_back());
+    }
+
+    fn push_fwd(&mut self, node: Node<A>) {
+        ConsumingIter::push(&mut self.fwd_stack, node)
+    }
+
+    fn push_node_back(&mut self, maybe_node: Option<Ref<Node<A>>>) {
+        if let Some(node) = maybe_node {
+            self.back_stack
+                .push(ConsumingIterItem::Consider(clone_ref(node)))
+        }
+    }
+
+    fn push_back(&mut self, mut node: Node<A>) {
+        for _i in 0..node.keys.len() {
+            self.push_node_back(node.children.pop_front());
+            self.back_stack
+                .push(ConsumingIterItem::Yield(node.keys.pop_front()));
+        }
+        self.push_node_back(node.children.pop_back());
+    }
+}
+
+impl<A> Iterator for ConsumingIter<A>
+where
+    A: BTreeValue,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        loop {
+            match self.fwd_stack.pop() {
+                None => {
+                    self.remaining = 0;
+                    return None;
+                }
+                Some(ConsumingIterItem::Consider(node)) => self.push_fwd(node),
+                Some(ConsumingIterItem::Yield(value)) => {
+                    if let Some(ref last) = self.back_last {
+                        if value.cmp_values(last) != Ordering::Less {
+                            self.fwd_stack.clear();
+                            self.back_stack.clear();
+                            self.remaining = 0;
+                            return None;
+                        }
+                    }
+                    self.remaining -= 1;
+                    self.fwd_last = Some(value.clone());
+                    return Some(value);
+                }
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.remaining, Some(self.remaining))
+    }
+}
+
+impl<A> DoubleEndedIterator for ConsumingIter<A>
+where
+    A: BTreeValue,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        loop {
+            match self.back_stack.pop() {
+                None => {
+                    self.remaining = 0;
+                    return None;
+                }
+                Some(ConsumingIterItem::Consider(node)) => self.push_back(node),
+                Some(ConsumingIterItem::Yield(value)) => {
+                    if let Some(ref last) = self.fwd_last {
+                        if value.cmp_values(last) != Ordering::Greater {
+                            self.fwd_stack.clear();
+                            self.back_stack.clear();
+                            self.remaining = 0;
+                            return None;
+                        }
+                    }
+                    self.remaining -= 1;
+                    self.back_last = Some(value.clone());
+                    return Some(value);
+                }
+            }
+        }
+    }
+}
+
+impl<A: BTreeValue> ExactSizeIterator for ConsumingIter<A> {}
+
+// DiffIter
+
+pub struct DiffIter<'a, A: 'a> {
+    old_stack: Vec<IterItem<'a, A>>,
+    new_stack: Vec<IterItem<'a, A>>,
+}
+
+#[derive(PartialEq, Eq)]
+pub enum DiffItem<'a, A: 'a> {
+    Add(&'a A),
+    Update { old: &'a A, new: &'a A },
+    Remove(&'a A),
+}
+
+enum IterItem<'a, A: 'a> {
+    Consider(&'a Node<A>),
+    Yield(&'a A),
+}
+
+impl<'a, A: 'a> DiffIter<'a, A> {
+    pub fn new(old: &'a Node<A>, new: &'a Node<A>) -> Self {
+        DiffIter {
+            old_stack: if old.keys.is_empty() {
+                Vec::new()
+            } else {
+                vec![IterItem::Consider(old)]
+            },
+            new_stack: if new.keys.is_empty() {
+                Vec::new()
+            } else {
+                vec![IterItem::Consider(new)]
+            },
+        }
+    }
+
+    fn push_node(stack: &mut Vec<IterItem<'a, A>>, maybe_node: &'a Option<Ref<Node<A>>>) {
+        if let Some(ref node) = *maybe_node {
+            stack.push(IterItem::Consider(&node))
+        }
+    }
+
+    fn push(stack: &mut Vec<IterItem<'a, A>>, node: &'a Node<A>) {
+        for n in 0..node.keys.len() {
+            let i = node.keys.len() - n;
+            Self::push_node(stack, &node.children[i]);
+            stack.push(IterItem::Yield(&node.keys[i - 1]));
+        }
+        Self::push_node(stack, &node.children[0]);
+    }
+}
+
+impl<'a, A> Iterator for DiffIter<'a, A>
+where
+    A: 'a + BTreeValue + PartialEq,
+{
+    type Item = DiffItem<'a, A>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        loop {
+            match (self.old_stack.pop(), self.new_stack.pop()) {
+                (None, None) => return None,
+                (None, Some(new)) => match new {
+                    IterItem::Consider(new) => Self::push(&mut self.new_stack, &new),
+                    IterItem::Yield(new) => return Some(DiffItem::Add(new)),
+                },
+                (Some(old), None) => match old {
+                    IterItem::Consider(old) => Self::push(&mut self.old_stack, &old),
+                    IterItem::Yield(old) => return Some(DiffItem::Remove(old)),
+                },
+                (Some(old), Some(new)) => match (old, new) {
+                    (IterItem::Consider(old), IterItem::Consider(new)) => {
+                        match old.keys[0].cmp_values(&new.keys[0]) {
+                            Ordering::Less => {
+                                Self::push(&mut self.old_stack, &old);
+                                self.new_stack.push(IterItem::Consider(new));
+                            }
+                            Ordering::Greater => {
+                                self.old_stack.push(IterItem::Consider(old));
+                                Self::push(&mut self.new_stack, &new);
+                            }
+                            Ordering::Equal => {
+                                Self::push(&mut self.old_stack, &old);
+                                Self::push(&mut self.new_stack, &new);
+                            }
+                        }
+                    }
+                    (IterItem::Consider(old), IterItem::Yield(new)) => {
+                        Self::push(&mut self.old_stack, &old);
+                        self.new_stack.push(IterItem::Yield(new));
+                    }
+                    (IterItem::Yield(old), IterItem::Consider(new)) => {
+                        self.old_stack.push(IterItem::Yield(old));
+                        Self::push(&mut self.new_stack, &new);
+                    }
+                    (IterItem::Yield(old), IterItem::Yield(new)) => match old.cmp_values(&new) {
+                        Ordering::Less => {
+                            self.new_stack.push(IterItem::Yield(new));
+                            return Some(DiffItem::Remove(old));
+                        }
+                        Ordering::Equal => {
+                            if old != new {
+                                return Some(DiffItem::Update { old, new });
+                            }
+                        }
+                        Ordering::Greater => {
+                            self.old_stack.push(IterItem::Yield(old));
+                            return Some(DiffItem::Add(new));
+                        }
+                    },
+                },
+            }
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/hamt.rs cargo-0.33.0/vendor/im-rc/src/nodes/hamt.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/hamt.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/hamt.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,664 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::borrow::Borrow;
+use std::fmt;
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::iter::FusedIterator;
+use std::slice::{Iter as SliceIter, IterMut as SliceIterMut};
+use std::{mem, ptr};
+
+use typenum::{Pow, Unsigned, U2};
+
+use config::HashLevelSize;
+use nodes::sparse_chunk::{Iter as ChunkIter, IterMut as ChunkIterMut, SparseChunk};
+use nodes::types::Bits;
+use util::{clone_ref, Ref};
+
+pub type HashWidth = <U2 as Pow<HashLevelSize>>::Output;
+pub type HashBits = <HashWidth as Bits>::Store; // a uint of HASH_SIZE bits
+pub const HASH_SHIFT: usize = HashLevelSize::USIZE;
+pub const HASH_WIDTH: usize = HashWidth::USIZE;
+pub const HASH_MASK: HashBits = (HASH_WIDTH - 1) as HashBits;
+
+pub fn hash_key<K: Hash + ?Sized, S: BuildHasher>(bh: &S, key: &K) -> HashBits {
+    let mut hasher = bh.build_hasher();
+    key.hash(&mut hasher);
+    hasher.finish() as HashBits
+}
+
+#[inline]
+fn mask(hash: HashBits, shift: usize) -> HashBits {
+    hash >> shift & HASH_MASK
+}
+
+pub trait HashValue: Clone {
+    type Key: Eq;
+
+    fn extract_key(&self) -> &Self::Key;
+    fn ptr_eq(&self, other: &Self) -> bool;
+}
+
+#[derive(Clone)]
+pub struct Node<A> {
+    data: SparseChunk<Entry<A>, HashWidth>,
+}
+
+#[derive(Clone)]
+pub struct CollisionNode<A> {
+    hash: HashBits,
+    data: Vec<A>,
+}
+
+pub enum Entry<A> {
+    Value(A, HashBits),
+    Collision(Ref<CollisionNode<A>>),
+    Node(Ref<Node<A>>),
+}
+
+impl<A: Clone> Clone for Entry<A> {
+    fn clone(&self) -> Self {
+        match self {
+            Entry::Value(value, hash) => Entry::Value(value.clone(), *hash),
+            Entry::Collision(coll) => Entry::Collision(coll.clone()),
+            Entry::Node(node) => Entry::Node(node.clone()),
+        }
+    }
+}
+
+impl<A> Entry<A> {
+    fn is_value(&self) -> bool {
+        match self {
+            Entry::Value(_, _) => true,
+            _ => false,
+        }
+    }
+
+    fn unwrap_value(self) -> A {
+        match self {
+            Entry::Value(a, _) => a,
+            _ => panic!("nodes::hamt::Entry::unwrap_value: unwrapped a non-value"),
+        }
+    }
+}
+
+impl<A> From<Node<A>> for Entry<A> {
+    fn from(node: Node<A>) -> Self {
+        Entry::Node(Ref::new(node))
+    }
+}
+
+impl<A> From<CollisionNode<A>> for Entry<A> {
+    fn from(node: CollisionNode<A>) -> Self {
+        Entry::Collision(Ref::new(node))
+    }
+}
+
+impl<A: HashValue> Default for Node<A> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<A: HashValue> Node<A> {
+    #[inline]
+    pub fn new() -> Self {
+        Node {
+            data: SparseChunk::new(),
+        }
+    }
+
+    #[inline]
+    pub fn unit(index: usize, value: Entry<A>) -> Self {
+        Node {
+            data: SparseChunk::unit(index, value),
+        }
+    }
+
+    #[inline]
+    pub fn pair(index1: usize, value1: Entry<A>, index2: usize, value2: Entry<A>) -> Self {
+        Node {
+            data: SparseChunk::pair(index1, value1, index2, value2),
+        }
+    }
+
+    #[inline]
+    pub fn single_child(index: usize, node: Self) -> Self {
+        Node {
+            data: SparseChunk::unit(index, Entry::from(node)),
+        }
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.data.len()
+    }
+
+    fn pop(&mut self) -> Entry<A> {
+        self.data.pop().unwrap()
+    }
+
+    fn merge_values(value1: A, hash1: HashBits, value2: A, hash2: HashBits, shift: usize) -> Self {
+        let index1 = mask(hash1, shift) as usize;
+        let index2 = mask(hash2, shift) as usize;
+        if index1 != index2 {
+            // Both values fit on the same level.
+            Node::pair(
+                index1,
+                Entry::Value(value1, hash1),
+                index2,
+                Entry::Value(value2, hash2),
+            )
+        } else if shift + HASH_SHIFT >= HASH_WIDTH {
+            // If we're at the bottom, we've got a collision.
+            Node::unit(
+                index1,
+                Entry::from(CollisionNode::new(hash1, value1, value2)),
+            )
+        } else {
+            // Pass the values down a level.
+            let node = Node::merge_values(value1, hash1, value2, hash2, shift + HASH_SHIFT);
+            Node::single_child(index1, node)
+        }
+    }
+
+    pub fn get<BK>(&self, hash: HashBits, shift: usize, key: &BK) -> Option<&A>
+    where
+        BK: Eq + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        let index = mask(hash, shift) as usize;
+        if let Some(entry) = self.data.get(index) {
+            match entry {
+                Entry::Value(ref value, _) => {
+                    if key == value.extract_key().borrow() {
+                        Some(value)
+                    } else {
+                        None
+                    }
+                }
+                Entry::Collision(ref coll) => coll.get(key),
+                Entry::Node(ref child) => child.get(hash, shift + HASH_SHIFT, key),
+            }
+        } else {
+            None
+        }
+    }
+
+    pub fn get_mut<BK>(&mut self, hash: HashBits, shift: usize, key: &BK) -> Option<&mut A>
+    where
+        BK: Eq + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        let index = mask(hash, shift) as usize;
+        if let Some(entry) = self.data.get_mut(index) {
+            match entry {
+                Entry::Value(ref mut value, _) => {
+                    if key == value.extract_key().borrow() {
+                        Some(value)
+                    } else {
+                        None
+                    }
+                }
+                Entry::Collision(ref mut coll_ref) => {
+                    let coll = Ref::make_mut(coll_ref);
+                    coll.get_mut(key)
+                }
+                Entry::Node(ref mut child_ref) => {
+                    let child = Ref::make_mut(child_ref);
+                    child.get_mut(hash, shift + HASH_SHIFT, key)
+                }
+            }
+        } else {
+            None
+        }
+    }
+
+    pub fn insert(&mut self, hash: HashBits, shift: usize, value: A) -> Option<A> {
+        let index = mask(hash, shift) as usize;
+        if let Some(entry) = self.data.get_mut(index) {
+            let mut fallthrough = false;
+            // Value is here
+            match entry {
+                // Update value or create a subtree
+                Entry::Value(ref current, _) => {
+                    if current.extract_key() == value.extract_key() {
+                        // If we have a key match, fall through to the outer
+                        // level where we replace the current value. If we
+                        // don't, fall through to the inner level where we merge
+                        // some nodes.
+                        fallthrough = true;
+                    }
+                }
+                // There's already a collision here.
+                Entry::Collision(ref mut collision) => {
+                    let coll = Ref::make_mut(collision);
+                    return coll.insert(value);
+                }
+                Entry::Node(ref mut child_ref) => {
+                    // Child node
+                    let child = Ref::make_mut(child_ref);
+                    return child.insert(hash, shift + HASH_SHIFT, value);
+                }
+            }
+            if !fallthrough {
+                // If we get here, we're looking at a value entry that needs a merge.
+                // We're going to be unsafe and pry it out of the reference, trusting
+                // that we overwrite it with the merged node.
+                #[allow(unsafe_code)]
+                let old_entry = unsafe { ptr::read(entry) };
+                if shift + HASH_SHIFT >= HASH_WIDTH {
+                    // We're at the lowest level, need to set up a collision node.
+                    let coll = CollisionNode::new(hash, old_entry.unwrap_value(), value);
+                    #[allow(unsafe_code)]
+                    unsafe {
+                        ptr::write(entry, Entry::from(coll))
+                    };
+                } else if let Entry::Value(old_value, old_hash) = old_entry {
+                    let node =
+                        Node::merge_values(old_value, old_hash, value, hash, shift + HASH_SHIFT);
+                    #[allow(unsafe_code)]
+                    unsafe {
+                        ptr::write(entry, Entry::from(node))
+                    };
+                } else {
+                    unreachable!()
+                }
+                return None;
+            }
+        }
+        // If we get here, either we found nothing at this index, in which case
+        // we insert a new entry, or we hit a value entry with the same key, in
+        // which case we replace it.
+        self.data
+            .insert(index, Entry::Value(value, hash))
+            .map(Entry::unwrap_value)
+    }
+
+    pub fn remove<BK>(&mut self, hash: HashBits, shift: usize, key: &BK) -> Option<A>
+    where
+        BK: Eq + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        let index = mask(hash, shift) as usize;
+        let mut new_node = None;
+        let mut removed = None;
+        if let Some(entry) = self.data.get_mut(index) {
+            match entry {
+                Entry::Value(ref value, _) => {
+                    if key != value.extract_key().borrow() {
+                        // Key wasn't in the map.
+                        return None;
+                    } // Otherwise, fall through to the removal.
+                }
+                Entry::Collision(ref mut coll_ref) => {
+                    let mut coll = Ref::make_mut(coll_ref);
+                    removed = coll.remove(key);
+                    if coll.len() == 1 {
+                        new_node = Some(coll.pop());
+                    } else {
+                        return removed;
+                    }
+                }
+                Entry::Node(ref mut child_ref) => {
+                    let child = Ref::make_mut(child_ref);
+                    match child.remove(hash, shift + HASH_SHIFT, key) {
+                        None => {
+                            return None;
+                        }
+                        Some(value) => {
+                            if child.len() == 1
+                                && child.data[child.data.first_index().unwrap()].is_value()
+                            {
+                                // If the child now contains only a single value node,
+                                // pull it up one level and discard the child.
+                                removed = Some(value);
+                                new_node = Some(child.pop());
+                            } else {
+                                return Some(value);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if let Some(node) = new_node {
+            self.data.insert(index, node);
+            return removed;
+        }
+        self.data.remove(index).map(Entry::unwrap_value)
+    }
+}
+
+impl<A: HashValue> CollisionNode<A> {
+    fn new(hash: HashBits, value1: A, value2: A) -> Self {
+        CollisionNode {
+            hash,
+            data: vec![value1, value2],
+        }
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.data.len()
+    }
+
+    fn get<BK>(&self, key: &BK) -> Option<&A>
+    where
+        BK: Eq + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        for entry in &self.data {
+            if key == entry.extract_key().borrow() {
+                return Some(entry);
+            }
+        }
+        None
+    }
+
+    fn get_mut<BK>(&mut self, key: &BK) -> Option<&mut A>
+    where
+        BK: Eq + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        for entry in &mut self.data {
+            if key == entry.extract_key().borrow() {
+                return Some(entry);
+            }
+        }
+        None
+    }
+
+    fn insert(&mut self, value: A) -> Option<A> {
+        for item in &mut self.data {
+            if value.extract_key() == item.extract_key() {
+                return Some(mem::replace(item, value));
+            }
+        }
+        self.data.push(value);
+        None
+    }
+
+    fn remove<BK>(&mut self, key: &BK) -> Option<A>
+    where
+        BK: Eq + ?Sized,
+        A::Key: Borrow<BK>,
+    {
+        let mut loc = None;
+        for (index, item) in self.data.iter().enumerate() {
+            if key == item.extract_key().borrow() {
+                loc = Some(index);
+            }
+        }
+        if let Some(index) = loc {
+            Some(self.data.remove(index))
+        } else {
+            None
+        }
+    }
+
+    fn pop(&mut self) -> Entry<A> {
+        Entry::Value(self.data.pop().unwrap(), self.hash)
+    }
+}
+
+// Ref iterator
+
+pub struct Iter<'a, A>
+where
+    A: 'a,
+{
+    count: usize,
+    stack: Vec<ChunkIter<'a, Entry<A>, HashWidth>>,
+    current: ChunkIter<'a, Entry<A>, HashWidth>,
+    collision: Option<(HashBits, SliceIter<'a, A>)>,
+}
+
+impl<'a, A> Iter<'a, A>
+where
+    A: 'a,
+{
+    pub fn new(root: &'a Node<A>, size: usize) -> Self {
+        Iter {
+            count: size,
+            stack: Vec::with_capacity((HASH_WIDTH / HASH_SHIFT) + 1),
+            current: root.data.iter(),
+            collision: None,
+        }
+    }
+}
+
+impl<'a, A> Iterator for Iter<'a, A>
+where
+    A: 'a,
+{
+    type Item = (&'a A, HashBits);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.count == 0 {
+            return None;
+        }
+        if self.collision.is_some() {
+            if let Some((hash, ref mut coll)) = self.collision {
+                match coll.next() {
+                    None => {}
+                    Some(value) => {
+                        self.count -= 1;
+                        return Some((value, hash));
+                    }
+                }
+            }
+            self.collision = None;
+            return self.next();
+        }
+        match self.current.next() {
+            Some(Entry::Value(value, hash)) => {
+                self.count -= 1;
+                Some((value, *hash))
+            }
+            Some(Entry::Node(child)) => {
+                let current = mem::replace(&mut self.current, child.data.iter());
+                self.stack.push(current);
+                self.next()
+            }
+            Some(Entry::Collision(coll)) => {
+                self.collision = Some((coll.hash, coll.data.iter()));
+                self.next()
+            }
+            None => match self.stack.pop() {
+                None => None,
+                Some(iter) => {
+                    self.current = iter;
+                    self.next()
+                }
+            },
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.count, Some(self.count))
+    }
+}
+
+impl<'a, A> ExactSizeIterator for Iter<'a, A> where A: 'a {}
+
+impl<'a, A> FusedIterator for Iter<'a, A> where A: 'a {}
+
+// Mut ref iterator
+
+pub struct IterMut<'a, A>
+where
+    A: 'a,
+{
+    count: usize,
+    stack: Vec<ChunkIterMut<'a, Entry<A>, HashWidth>>,
+    current: ChunkIterMut<'a, Entry<A>, HashWidth>,
+    collision: Option<(HashBits, SliceIterMut<'a, A>)>,
+}
+
+impl<'a, A> IterMut<'a, A>
+where
+    A: 'a,
+{
+    pub fn new(root: &'a mut Node<A>, size: usize) -> Self {
+        IterMut {
+            count: size,
+            stack: Vec::with_capacity((HASH_WIDTH / HASH_SHIFT) + 1),
+            current: root.data.iter_mut(),
+            collision: None,
+        }
+    }
+}
+
+impl<'a, A> Iterator for IterMut<'a, A>
+where
+    A: Clone + 'a,
+{
+    type Item = (&'a mut A, HashBits);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.count == 0 {
+            return None;
+        }
+        if self.collision.is_some() {
+            if let Some((hash, ref mut coll)) = self.collision {
+                match coll.next() {
+                    None => {}
+                    Some(value) => {
+                        self.count -= 1;
+                        return Some((value, hash));
+                    }
+                }
+            }
+            self.collision = None;
+            return self.next();
+        }
+        match self.current.next() {
+            Some(Entry::Value(value, hash)) => {
+                self.count -= 1;
+                Some((value, *hash))
+            }
+            Some(Entry::Node(child_ref)) => {
+                let child = Ref::make_mut(child_ref);
+                let current = mem::replace(&mut self.current, child.data.iter_mut());
+                self.stack.push(current);
+                self.next()
+            }
+            Some(Entry::Collision(coll_ref)) => {
+                let coll = Ref::make_mut(coll_ref);
+                self.collision = Some((coll.hash, coll.data.iter_mut()));
+                self.next()
+            }
+            None => match self.stack.pop() {
+                None => None,
+                Some(iter) => {
+                    self.current = iter;
+                    self.next()
+                }
+            },
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.count, Some(self.count))
+    }
+}
+
+impl<'a, A> ExactSizeIterator for IterMut<'a, A> where A: Clone + 'a {}
+
+impl<'a, A> FusedIterator for IterMut<'a, A> where A: Clone + 'a {}
+
+// Consuming iterator
+
+pub struct Drain<A>
+where
+    A: HashValue,
+{
+    count: usize,
+    stack: Vec<Ref<Node<A>>>,
+    current: Ref<Node<A>>,
+    collision: Option<CollisionNode<A>>,
+}
+
+impl<A> Drain<A>
+where
+    A: HashValue,
+{
+    pub fn new(root: Ref<Node<A>>, size: usize) -> Self {
+        Drain {
+            count: size,
+            stack: vec![],
+            current: root,
+            collision: None,
+        }
+    }
+}
+
+impl<A> Iterator for Drain<A>
+where
+    A: HashValue,
+{
+    type Item = (A, HashBits);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.count == 0 {
+            return None;
+        }
+        if self.collision.is_some() {
+            if let Some(ref mut coll) = self.collision {
+                if let Some(value) = coll.data.pop() {
+                    self.count -= 1;
+                    return Some((value, coll.hash));
+                }
+            }
+            self.collision = None;
+            return self.next();
+        }
+        match Ref::make_mut(&mut self.current).data.pop() {
+            Some(Entry::Value(value, hash)) => {
+                self.count -= 1;
+                Some((value, hash))
+            }
+            Some(Entry::Collision(coll_ref)) => {
+                self.collision = Some(clone_ref(coll_ref));
+                self.next()
+            }
+            Some(Entry::Node(child)) => {
+                let parent = mem::replace(&mut self.current, child);
+                self.stack.push(parent);
+                self.next()
+            }
+            None => match self.stack.pop() {
+                None => None,
+                Some(parent) => {
+                    self.current = parent;
+                    self.next()
+                }
+            },
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.count, Some(self.count))
+    }
+}
+
+impl<A: HashValue> ExactSizeIterator for Drain<A> {}
+
+impl<A: HashValue> FusedIterator for Drain<A> {}
+
+impl<A: HashValue + fmt::Debug> fmt::Debug for Node<A> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        write!(f, "Node[ ")?;
+        for i in self.data.indices() {
+            write!(f, "{}: ", i)?;
+            match &self.data[i] {
+                Entry::Value(v, h) => write!(f, "{:?} :: {}, ", v, h)?,
+                Entry::Collision(c) => write!(f, "Coll{:?} :: {}", c.data, c.hash)?,
+                Entry::Node(n) => write!(f, "{:?}, ", n)?,
+            }
+        }
+        write!(f, " ]")
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/mod.rs cargo-0.33.0/vendor/im-rc/src/nodes/mod.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+pub mod bitmap;
+pub mod btree;
+pub mod hamt;
+pub mod rrb;
+mod types;
+
+mod unsafe_chunks;
+pub use self::unsafe_chunks::{chunk, sized_chunk, sparse_chunk};
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/rrb.rs cargo-0.33.0/vendor/im-rc/src/nodes/rrb.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/rrb.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/rrb.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1047 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::iter::FusedIterator;
+use std::mem::replace;
+use std::ops::Range;
+
+use nodes::chunk::{Chunk, CHUNK_SIZE};
+use util::{
+    clone_ref, Ref,
+    Side::{self, Left, Right},
+};
+
+use self::Entry::*;
+
+pub const NODE_SIZE: usize = CHUNK_SIZE;
+
+#[derive(Debug)]
+enum Size {
+    Size(usize),
+    Table(Ref<Chunk<usize>>),
+}
+
+impl Clone for Size {
+    fn clone(&self) -> Self {
+        match *self {
+            Size::Size(size) => Size::Size(size),
+            Size::Table(ref table) => Size::Table(table.clone()),
+        }
+    }
+}
+
+impl Size {
+    fn size(&self) -> usize {
+        match self {
+            Size::Size(s) => *s,
+            Size::Table(sizes) => sizes.iter().sum(),
+        }
+    }
+
+    fn is_size(&self) -> bool {
+        match self {
+            Size::Size(_) => true,
+            Size::Table(_) => false,
+        }
+    }
+
+    fn table_from_size(level: usize, size: usize) -> Self {
+        let mut chunk = Chunk::new();
+        let mut remaining = size;
+        let child_size = NODE_SIZE.pow(level as u32);
+        while remaining > child_size {
+            let next_value = chunk.last().unwrap_or(&0) + child_size;
+            chunk.push_back(next_value);
+            remaining -= child_size;
+        }
+        if remaining > 0 {
+            let next_value = chunk.last().unwrap_or(&0) + remaining;
+            chunk.push_back(next_value);
+        }
+        Size::Table(Ref::new(chunk))
+    }
+
+    fn push(&mut self, side: Side, value: usize) {
+        match self {
+            Size::Size(ref mut size) => *size += value,
+            Size::Table(ref mut size_ref) => {
+                let size_table = Ref::make_mut(size_ref);
+                debug_assert!(size_table.len() < NODE_SIZE);
+                match side {
+                    Left => {
+                        for entry in size_table.iter_mut() {
+                            *entry += value;
+                        }
+                        size_table.push_front(value);
+                    }
+                    Right => {
+                        let prev = *(size_table.last().unwrap_or(&0));
+                        size_table.push_back(value + prev);
+                    }
+                }
+            }
+        }
+    }
+
+    fn pop(&mut self, side: Side, value: usize) {
+        match self {
+            Size::Size(ref mut size) => *size -= value,
+            Size::Table(ref mut size_ref) => {
+                let size_table = Ref::make_mut(size_ref);
+                match side {
+                    Left => {
+                        debug_assert_eq!(value, size_table.pop_front());
+                        for entry in size_table.iter_mut() {
+                            *entry -= value;
+                        }
+                    }
+                    Right => {
+                        let pop = size_table.pop_back();
+                        let last = size_table.last().unwrap_or(&0);
+                        debug_assert_eq!(value, pop - last);
+                    }
+                }
+            }
+        }
+    }
+
+    fn update(&mut self, index: usize, value: isize) {
+        match self {
+            Size::Size(ref mut size) => *size = (*size as isize + value) as usize,
+            Size::Table(ref mut size_ref) => {
+                let size_table = Ref::make_mut(size_ref);
+                for entry in size_table.iter_mut().skip(index) {
+                    *entry = (*entry as isize + value) as usize;
+                }
+            }
+        }
+    }
+}
+
+pub enum PushResult<A> {
+    Full(A),
+    Done,
+}
+
+pub enum PopResult<A> {
+    Done(A),
+    Drained(A),
+    Empty,
+}
+
+pub enum SplitResult {
+    Dropped(usize),
+    OutOfBounds,
+}
+
+// Invariants: Nodes only at level > 0, Values/Empty only at level = 0
+enum Entry<A> {
+    Nodes(Size, Ref<Chunk<Ref<Node<A>>>>),
+    Values(Ref<Chunk<A>>),
+    Empty,
+}
+
+impl<A: Clone> Clone for Entry<A> {
+    fn clone(&self) -> Self {
+        match *self {
+            Nodes(ref size, ref nodes) => Nodes(size.clone(), nodes.clone()),
+            Values(ref values) => Values(values.clone()),
+            Empty => Empty,
+        }
+    }
+}
+
+impl<A: Clone> Entry<A> {
+    fn len(&self) -> usize {
+        match self {
+            Nodes(_, ref nodes) => nodes.len(),
+            Values(ref values) => values.len(),
+            Empty => 0,
+        }
+    }
+
+    fn is_empty(&self) -> bool {
+        match self {
+            Nodes(_, ref nodes) => nodes.is_empty(),
+            Values(ref values) => values.is_empty(),
+            Empty => true,
+        }
+    }
+
+    fn is_full(&self) -> bool {
+        match self {
+            Nodes(_, ref nodes) => nodes.is_full(),
+            Values(ref values) => values.is_full(),
+            Empty => false,
+        }
+    }
+
+    fn unwrap_values(&self) -> &Chunk<A> {
+        match self {
+            Values(ref values) => values,
+            _ => panic!("rrb::Entry::unwrap_values: expected values, found nodes"),
+        }
+    }
+
+    fn unwrap_nodes(&self) -> &Chunk<Ref<Node<A>>> {
+        match self {
+            Nodes(_, ref nodes) => nodes,
+            _ => panic!("rrb::Entry::unwrap_nodes: expected nodes, found values"),
+        }
+    }
+
+    fn unwrap_values_mut(&mut self) -> &mut Chunk<A> {
+        match self {
+            Values(ref mut values) => Ref::make_mut(values),
+            _ => panic!("rrb::Entry::unwrap_values_mut: expected values, found nodes"),
+        }
+    }
+
+    fn unwrap_nodes_mut(&mut self) -> &mut Chunk<Ref<Node<A>>> {
+        match self {
+            Nodes(_, ref mut nodes) => Ref::make_mut(nodes),
+            _ => panic!("rrb::Entry::unwrap_nodes_mut: expected nodes, found values"),
+        }
+    }
+
+    fn values(self) -> Chunk<A> {
+        match self {
+            Values(values) => clone_ref(values),
+            _ => panic!("rrb::Entry::values: expected values, found nodes"),
+        }
+    }
+
+    fn nodes(self) -> Chunk<Ref<Node<A>>> {
+        match self {
+            Nodes(_, nodes) => clone_ref(nodes),
+            _ => panic!("rrb::Entry::nodes: expected nodes, found values"),
+        }
+    }
+
+    fn is_empty_node(&self) -> bool {
+        match self {
+            Empty => true,
+            _ => false,
+        }
+    }
+}
+
+// Node
+
+pub struct Node<A> {
+    children: Entry<A>,
+}
+
+impl<A: Clone> Clone for Node<A> {
+    fn clone(&self) -> Self {
+        Node {
+            children: self.children.clone(),
+        }
+    }
+}
+
+impl<A: Clone> Default for Node<A> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<A: Clone> Node<A> {
+    pub fn new() -> Self {
+        Node { children: Empty }
+    }
+
+    pub fn parent(level: usize, children: Chunk<Ref<Self>>) -> Self {
+        let size = {
+            let mut size = Size::Size(0);
+            let mut it = children.iter().peekable();
+            loop {
+                match it.next() {
+                    None => break,
+                    Some(child) => {
+                        if size.is_size()
+                            && !child.is_completely_dense(level - 1)
+                            && it.peek().is_some()
+                        {
+                            size = Size::table_from_size(level, size.size());
+                        }
+                        size.push(Right, child.len())
+                    }
+                }
+            }
+            size
+        };
+        Node {
+            children: Nodes(size, Ref::from(children)),
+        }
+    }
+
+    pub fn clear_node(&mut self) {
+        self.children = Empty;
+    }
+
+    pub fn from_chunk(level: usize, chunk: Ref<Chunk<A>>) -> Self {
+        let node = Node {
+            children: Values(chunk),
+        };
+        node.elevate(level)
+    }
+
+    pub fn single_parent(node: Ref<Self>) -> Self {
+        let size = if node.is_dense() {
+            Size::Size(node.len())
+        } else {
+            let mut size_table = Chunk::unit(node.len());
+            Size::Table(Ref::from(size_table))
+        };
+        let children = Chunk::unit(node);
+        Node {
+            children: Nodes(size, Ref::from(children)),
+        }
+    }
+
+    pub fn join_dense(left: Ref<Self>, right: Ref<Self>) -> Self {
+        let left_len = left.len();
+        let right_len = right.len();
+        Node {
+            children: {
+                let children = Chunk::pair(left, right);
+                Nodes(Size::Size(left_len + right_len), Ref::from(children))
+            },
+        }
+    }
+
+    pub fn elevate(self, level_increment: usize) -> Self {
+        if level_increment > 0 {
+            Self::single_parent(Ref::from(self.elevate(level_increment - 1)))
+        } else {
+            self
+        }
+    }
+
+    pub fn join_branches(self, right: Self, level: usize) -> Self {
+        let left_len = self.len();
+        let right_len = right.len();
+        let size = if self.is_completely_dense(level) && right.is_dense() {
+            Size::Size(left_len + right_len)
+        } else {
+            let size_table = Chunk::pair(left_len, left_len + right_len);
+            Size::Table(Ref::from(size_table))
+        };
+        Node {
+            children: {
+                let children = Chunk::pair(Ref::from(self), Ref::from(right));
+                Nodes(size, Ref::from(children))
+            },
+        }
+    }
+
+    pub fn len(&self) -> usize {
+        match self.children {
+            Entry::Nodes(Size::Size(size), _) => size,
+            Entry::Nodes(Size::Table(ref size_table), _) => *(size_table.last().unwrap()),
+            Entry::Values(ref values) => values.len(),
+            Entry::Empty => 0,
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.children.is_empty()
+    }
+
+    pub fn is_single(&self) -> bool {
+        self.children.len() == 1
+    }
+
+    pub fn is_full(&self) -> bool {
+        self.children.is_full()
+    }
+
+    pub fn first_child(&self) -> &Ref<Self> {
+        self.children.unwrap_nodes().first().unwrap()
+    }
+
+    /// True if the node is dense and so doesn't have a size table
+    fn is_dense(&self) -> bool {
+        match self.children {
+            Entry::Nodes(Size::Table(_), _) => false,
+            _ => true,
+        }
+    }
+
+    /// True if the node and its children are dense and at capacity
+    // TODO can use this technique to quickly test if a Size::Table
+    // should be converted back to a Size::Size
+    fn is_completely_dense(&self, level: usize) -> bool {
+        // Size of a full node is NODE_SIZE at level 0, NODE_SIZE² at
+        // level 1, etc.
+        self.size() == NODE_SIZE.pow(level as u32 + 1)
+    }
+
+    #[inline]
+    fn size(&self) -> usize {
+        match self.children {
+            Entry::Nodes(ref size, _) => size.size(),
+            Entry::Values(ref values) => values.len(),
+            Entry::Empty => 0,
+        }
+    }
+
+    #[inline]
+    fn push_size(&mut self, side: Side, value: usize) {
+        if let Entry::Nodes(ref mut size, _) = self.children {
+            size.push(side, value)
+        }
+    }
+
+    #[inline]
+    fn pop_size(&mut self, side: Side, value: usize) {
+        if let Entry::Nodes(ref mut size, _) = self.children {
+            size.pop(side, value)
+        }
+    }
+
+    #[inline]
+    fn update_size(&mut self, index: usize, value: isize) {
+        if let Entry::Nodes(ref mut size, _) = self.children {
+            size.update(index, value)
+        }
+    }
+
+    fn size_up_to(&self, level: usize, index: usize) -> usize {
+        if let Entry::Nodes(ref size, _) = self.children {
+            if index == 0 {
+                0
+            } else {
+                match size {
+                    Size::Table(ref size_table) => size_table[index - 1],
+                    Size::Size(_) => index * NODE_SIZE.pow(level as u32),
+                }
+            }
+        } else {
+            index
+        }
+    }
+
+    fn index_in(&self, level: usize, index: usize) -> Option<usize> {
+        let mut target_idx = index / NODE_SIZE.pow(level as u32);
+        if target_idx >= self.children.len() {
+            return None;
+        }
+        if let Entry::Nodes(Size::Table(ref size_table), _) = self.children {
+            if size_table[target_idx] <= index {
+                target_idx += 1;
+                if target_idx >= size_table.len() {
+                    return None;
+                }
+            }
+        }
+        Some(target_idx)
+    }
+
+    pub fn index(&self, level: usize, index: usize) -> &A {
+        if level == 0 {
+            &self.children.unwrap_values()[index]
+        } else {
+            let target_idx = self.index_in(level, index).unwrap();
+            self.children.unwrap_nodes()[target_idx]
+                .index(level - 1, index - self.size_up_to(level, target_idx))
+        }
+    }
+
+    pub fn index_mut(&mut self, level: usize, index: usize) -> &mut A {
+        if level == 0 {
+            &mut self.children.unwrap_values_mut()[index]
+        } else {
+            let target_idx = self.index_in(level, index).unwrap();
+            let offset = index - self.size_up_to(level, target_idx);
+            let child = Ref::make_mut(&mut self.children.unwrap_nodes_mut()[target_idx]);
+            child.index_mut(level - 1, offset)
+        }
+    }
+
+    pub fn lookup_chunk(
+        &self,
+        level: usize,
+        base: usize,
+        index: usize,
+    ) -> (Range<usize>, *const Chunk<A>) {
+        if level == 0 {
+            (
+                base..(base + self.children.len()),
+                self.children.unwrap_values() as *const Chunk<A>,
+            )
+        } else {
+            let target_idx = self.index_in(level, index).unwrap();
+            let offset = self.size_up_to(level, target_idx);
+            let child_base = base + offset;
+            let children = self.children.unwrap_nodes();
+            let child = &*children[target_idx];
+            child.lookup_chunk(level - 1, child_base, index - offset)
+        }
+    }
+
+    pub fn lookup_chunk_mut(
+        &mut self,
+        level: usize,
+        base: usize,
+        index: usize,
+    ) -> (Range<usize>, *mut Chunk<A>) {
+        if level == 0 {
+            (
+                base..(base + self.children.len()),
+                self.children.unwrap_values_mut() as *mut Chunk<A>,
+            )
+        } else {
+            let target_idx = self.index_in(level, index).unwrap();
+            let offset = self.size_up_to(level, target_idx);
+            let child_base = base + offset;
+            let children = self.children.unwrap_nodes_mut();
+            let child = Ref::make_mut(&mut children[target_idx]);
+            child.lookup_chunk_mut(level - 1, child_base, index - offset)
+        }
+    }
+
+    fn push_child_node(&mut self, side: Side, child: Ref<Node<A>>) {
+        let children = self.children.unwrap_nodes_mut();
+        match side {
+            Left => children.push_front(child),
+            Right => children.push_back(child),
+        }
+    }
+
+    fn pop_child_node(&mut self, side: Side) -> Ref<Node<A>> {
+        let children = self.children.unwrap_nodes_mut();
+        match side {
+            Left => children.pop_front(),
+            Right => children.pop_back(),
+        }
+    }
+
+    pub fn push_chunk(
+        &mut self,
+        level: usize,
+        side: Side,
+        mut chunk: Ref<Chunk<A>>,
+    ) -> PushResult<Ref<Chunk<A>>> {
+        if chunk.is_empty() {
+            return PushResult::Done;
+        }
+        let is_full = self.is_full();
+        if level == 0 {
+            if self.children.is_empty_node() {
+                self.push_size(side, chunk.len());
+                self.children = Values(chunk);
+                PushResult::Done
+            } else {
+                let values = self.children.unwrap_values_mut();
+                if values.len() + chunk.len() <= NODE_SIZE {
+                    let chunk = Ref::make_mut(&mut chunk);
+                    match side {
+                        Side::Left => {
+                            chunk.append(values);
+                            values.append(chunk);
+                        }
+                        Side::Right => values.append(chunk),
+                    }
+                    PushResult::Done
+                } else {
+                    PushResult::Full(chunk)
+                }
+            }
+        } else if level == 1 {
+            // If rightmost existing node has any room, merge as much as
+            // possible over from the new node.
+            match side {
+                Side::Right => {
+                    if let Entry::Nodes(ref mut size, ref mut children) = self.children {
+                        let mut rightmost =
+                            Ref::make_mut(Ref::make_mut(children).last_mut().unwrap());
+                        let old_size = rightmost.len();
+                        let chunk = Ref::make_mut(&mut chunk);
+                        let values = rightmost.children.unwrap_values_mut();
+                        let to_drain = chunk.len().min(NODE_SIZE - values.len());
+                        values.drain_from_front(chunk, to_drain);
+                        size.pop(Side::Right, old_size);
+                        size.push(Side::Right, values.len());
+                    }
+                }
+                Side::Left => {
+                    if let Entry::Nodes(ref mut size, ref mut children) = self.children {
+                        let mut leftmost =
+                            Ref::make_mut(Ref::make_mut(children).first_mut().unwrap());
+                        let old_size = leftmost.len();
+                        let chunk = Ref::make_mut(&mut chunk);
+                        let values = leftmost.children.unwrap_values_mut();
+                        let to_drain = chunk.len().min(NODE_SIZE - values.len());
+                        values.drain_from_back(chunk, to_drain);
+                        size.pop(Side::Left, old_size);
+                        size.push(Side::Left, values.len());
+                    }
+                }
+            }
+            if is_full {
+                PushResult::Full(chunk)
+            } else {
+                self.push_size(side, chunk.len());
+                self.push_child_node(side, Ref::new(Node::from_chunk(0, chunk)));
+                PushResult::Done
+            }
+        } else {
+            let chunk_size = chunk.len();
+            let index = match side {
+                Right => self.children.len() - 1,
+                Left => 0,
+            };
+            let new_child = {
+                let children = self.children.unwrap_nodes_mut();
+                let child = Ref::make_mut(&mut children[index]);
+                match child.push_chunk(level - 1, side, chunk) {
+                    PushResult::Done => None,
+                    PushResult::Full(chunk) => {
+                        if is_full {
+                            return PushResult::Full(chunk);
+                        } else {
+                            Some(Node::from_chunk(level - 1, chunk))
+                        }
+                    }
+                }
+            };
+            match new_child {
+                None => {
+                    self.update_size(index, chunk_size as isize);
+                    PushResult::Done
+                }
+                Some(child) => {
+                    if side == Left && chunk_size < NODE_SIZE {
+                        if let Entry::Nodes(ref mut size, _) = self.children {
+                            if let Size::Size(value) = *size {
+                                *size = Size::table_from_size(level, value);
+                            }
+                        }
+                    }
+                    self.push_size(side, child.len());
+                    self.push_child_node(side, Ref::from(child));
+                    PushResult::Done
+                }
+            }
+        }
+    }
+
+    pub fn pop_chunk(&mut self, level: usize, side: Side) -> PopResult<Ref<Chunk<A>>> {
+        if self.is_empty() {
+            return PopResult::Empty;
+        }
+        if level == 0 {
+            // should only get here if the tree is just one leaf node
+            match replace(&mut self.children, Empty) {
+                Values(chunk) => PopResult::Drained(chunk),
+                Empty => panic!("rrb::Node::pop_chunk: non-empty tree with Empty leaf"),
+                Nodes(_, _) => panic!("rrb::Node::pop_chunk: branch node at leaf"),
+            }
+        } else if level == 1 {
+            let child_node = self.pop_child_node(side);
+            self.pop_size(side, child_node.len());
+            let chunk = match child_node.children {
+                Values(ref chunk) => chunk.clone(),
+                Empty => panic!("rrb::Node::pop_chunk: non-empty tree with Empty leaf"),
+                Nodes(_, _) => panic!("rrb::Node::pop_chunk: branch node at leaf"),
+            };
+            if self.is_empty() {
+                PopResult::Drained(chunk)
+            } else {
+                PopResult::Done(chunk)
+            }
+        } else {
+            let index = match side {
+                Right => self.children.len() - 1,
+                Left => 0,
+            };
+            let mut drained = false;
+            let chunk = {
+                let children = self.children.unwrap_nodes_mut();
+                let child = Ref::make_mut(&mut children[index]);
+                match child.pop_chunk(level - 1, side) {
+                    PopResult::Empty => return PopResult::Empty,
+                    PopResult::Done(chunk) => chunk,
+                    PopResult::Drained(chunk) => {
+                        drained = true;
+                        chunk
+                    }
+                }
+            };
+            if drained {
+                self.pop_size(side, chunk.len());
+                self.pop_child_node(side);
+                if self.is_empty() {
+                    PopResult::Drained(chunk)
+                } else {
+                    PopResult::Done(chunk)
+                }
+            } else {
+                self.update_size(index, -(chunk.len() as isize));
+                PopResult::Done(chunk)
+            }
+        }
+    }
+
+    pub fn split(&mut self, level: usize, drop_side: Side, index: usize) -> SplitResult {
+        if index == 0 && drop_side == Side::Left {
+            return SplitResult::Dropped(0);
+        }
+        let mut dropped;
+        if level == 0 {
+            let len = self.children.len();
+            if index >= len {
+                return SplitResult::OutOfBounds;
+            }
+            let children = self.children.unwrap_values_mut();
+            match drop_side {
+                Side::Left => children.drop_left(index),
+                Side::Right => children.drop_right(index),
+            }
+            SplitResult::Dropped(match drop_side {
+                Left => index,
+                Right => len - index,
+            })
+        } else if let Some(target_idx) = self.index_in(level, index) {
+            let size_up_to = self.size_up_to(level, target_idx);
+            let (size, children) =
+                if let Entry::Nodes(ref mut size, ref mut children) = self.children {
+                    (size, Ref::make_mut(children))
+                } else {
+                    unreachable!()
+                };
+            let child_gone = 0 == {
+                let child_node = Ref::make_mut(&mut children[target_idx]);
+                match child_node.split(level - 1, drop_side, index - size_up_to) {
+                    SplitResult::OutOfBounds => return SplitResult::OutOfBounds,
+                    SplitResult::Dropped(amount) => dropped = amount,
+                }
+                child_node.len()
+            };
+            match drop_side {
+                Left => {
+                    let mut drop_from = target_idx;
+                    if child_gone {
+                        drop_from += 1;
+                    }
+                    children.drop_left(drop_from);
+                    if let Size::Size(value) = *size {
+                        *size = Size::table_from_size(level, value);
+                    }
+                    let size_table = if let Size::Table(ref mut size_ref) = size {
+                        Ref::make_mut(size_ref)
+                    } else {
+                        unreachable!()
+                    };
+                    let dropped_size = if target_idx > 0 {
+                        size_table[target_idx - 1]
+                    } else {
+                        0
+                    };
+                    dropped += dropped_size;
+                    size_table.drop_left(drop_from);
+                    for i in size_table.iter_mut() {
+                        *i -= dropped;
+                    }
+                }
+                Right => {
+                    let at_last = target_idx == children.len() - 1;
+                    let mut drop_from = target_idx + 1;
+                    if child_gone {
+                        drop_from -= 1;
+                    }
+                    if drop_from < children.len() {
+                        children.drop_right(drop_from);
+                    }
+                    match size {
+                        Size::Size(ref mut size) if at_last => {
+                            *size -= dropped;
+                        }
+                        Size::Size(ref mut size) => {
+                            let size_per_child = NODE_SIZE.pow(level as u32);
+                            let remainder = (target_idx + 1) * size_per_child;
+                            let new_size = remainder - dropped;
+                            dropped = *size - new_size;
+                            *size = new_size;
+                        }
+                        Size::Table(ref mut size_ref) => {
+                            let size_table = Ref::make_mut(size_ref);
+                            let dropped_size =
+                                size_table[size_table.len() - 1] - size_table[target_idx];
+                            if drop_from < size_table.len() {
+                                size_table.drop_right(drop_from);
+                            }
+                            if !child_gone {
+                                size_table[target_idx] -= dropped;
+                            }
+                            dropped += dropped_size;
+                        }
+                    }
+                }
+            }
+            SplitResult::Dropped(dropped)
+        } else {
+            SplitResult::OutOfBounds
+        }
+    }
+
+    fn merge_leaves(mut left: Ref<Self>, mut right: Ref<Self>) -> Self {
+        if left.children.is_empty_node() {
+            // Left is empty, just use right
+            Self::single_parent(right)
+        } else if right.children.is_empty_node() {
+            // Right is empty, just use left
+            Self::single_parent(left)
+        } else {
+            {
+                let left_node = Ref::make_mut(&mut left);
+                let right_node = Ref::make_mut(&mut right);
+                let left_vals = left_node.children.unwrap_values_mut();
+                let left_len = left_vals.len();
+                let right_vals = right_node.children.unwrap_values_mut();
+                let right_len = right_vals.len();
+                if left_len + right_len <= NODE_SIZE {
+                    left_vals.append(right_vals);
+                } else {
+                    let count = right_len.min(NODE_SIZE - left_len);
+                    left_vals.drain_from_front(right_vals, count);
+                }
+            }
+            if right.is_empty() {
+                Self::single_parent(left)
+            } else {
+                Self::join_dense(left, right)
+            }
+        }
+    }
+
+    fn merge_rebalance(level: usize, left: Ref<Self>, middle: Self, right: Ref<Self>) -> Self {
+        let left_nodes = clone_ref(left).children.nodes().into_iter();
+        let middle_nodes = middle.children.nodes().into_iter();
+        let right_nodes = clone_ref(right).children.nodes().into_iter();
+        let mut subtree_still_balanced = true;
+        let mut next_leaf = Chunk::new();
+        let mut next_node = Chunk::new();
+        let mut next_subtree = Chunk::new();
+        let mut root = Chunk::new();
+
+        for subtree in left_nodes.chain(middle_nodes).chain(right_nodes) {
+            if subtree.is_empty() {
+                continue;
+            }
+            if subtree.is_completely_dense(level) && subtree_still_balanced {
+                root.push_back(subtree);
+                continue;
+            }
+            subtree_still_balanced = false;
+
+            let child = clone_ref(subtree);
+            if level == 1 {
+                for value in child.children.values() {
+                    next_leaf.push_back(value);
+                    if next_leaf.is_full() {
+                        let new_node = Node::from_chunk(0, Ref::from(next_leaf));
+                        next_subtree.push_back(Ref::from(new_node));
+                        next_leaf = Chunk::new();
+                        if next_subtree.is_full() {
+                            let new_subtree = Node::parent(level, next_subtree);
+                            root.push_back(Ref::from(new_subtree));
+                            next_subtree = Chunk::new();
+                        }
+                    }
+                }
+            } else {
+                for node in child.children.nodes() {
+                    next_node.push_back(node);
+                    if next_node.is_full() {
+                        let new_node = Node::parent(level - 1, next_node);
+                        next_subtree.push_back(Ref::from(new_node));
+                        next_node = Chunk::new();
+                        if next_subtree.is_full() {
+                            let new_subtree = Node::parent(level, next_subtree);
+                            root.push_back(Ref::from(new_subtree));
+                            next_subtree = Chunk::new();
+                        }
+                    }
+                }
+            }
+        }
+        if !next_leaf.is_empty() {
+            let new_node = Node::from_chunk(0, Ref::from(next_leaf));
+            next_subtree.push_back(Ref::from(new_node));
+        }
+        if !next_node.is_empty() {
+            let new_node = Node::parent(level - 1, next_node);
+            next_subtree.push_back(Ref::from(new_node));
+        }
+        if !next_subtree.is_empty() {
+            let new_subtree = Node::parent(level, next_subtree);
+            root.push_back(Ref::from(new_subtree));
+        }
+        Node::parent(level + 1, root)
+    }
+
+    pub fn merge(mut left: Ref<Self>, mut right: Ref<Self>, level: usize) -> Self {
+        if level == 0 {
+            Self::merge_leaves(left, right)
+        } else {
+            let merged = {
+                if level == 1 {
+                    // We're going to rebalance all the leaves anyway, there's
+                    // no need for a middle at level 1
+                    Node::parent(0, Chunk::new())
+                } else {
+                    let left_node = Ref::make_mut(&mut left);
+                    let right_node = Ref::make_mut(&mut right);
+                    let left_last =
+                        if let Entry::Nodes(ref mut size, ref mut children) = left_node.children {
+                            let node = Ref::make_mut(children).pop_back();
+                            size.pop(Side::Right, node.len());
+                            node
+                        } else {
+                            panic!("expected nodes, found entries or empty");
+                        };
+                    let right_first =
+                        if let Entry::Nodes(ref mut size, ref mut children) = right_node.children {
+                            let node = Ref::make_mut(children).pop_front();
+                            size.pop(Side::Left, node.len());
+                            node
+                        } else {
+                            panic!("expected nodes, found entries or empty");
+                        };
+                    Self::merge(left_last, right_first, level - 1)
+                }
+            };
+            Self::merge_rebalance(level, left, merged, right)
+        }
+    }
+
+    // pub fn print<W>(&self, f: &mut W, indent: usize, level: usize) -> Result<(), fmt::Error>
+    // where
+    //     W: fmt::Write,
+    //     A: fmt::Debug,
+    // {
+    //     print_indent(f, indent)?;
+    //     if level == 0 {
+    //         if self.children.is_empty_node() {
+    //             writeln!(f, "Leaf: EMPTY")
+    //         } else {
+    //             writeln!(f, "Leaf: {:?}", self.children.unwrap_values())
+    //         }
+    //     } else {
+    //         match &self.children {
+    //             Entry::Nodes(size, children) => {
+    //                 writeln!(f, "Node level {} size_table {:?}", level, size)?;
+    //                 for child in children.iter() {
+    //                     child.print(f, indent + 4, level - 1)?;
+    //                 }
+    //                 Ok(())
+    //             }
+    //             _ => unreachable!(),
+    //         }
+    //     }
+    // }
+}
+
+// fn print_indent<W>(f: &mut W, indent: usize) -> Result<(), fmt::Error>
+// where
+//     W: fmt::Write,
+// {
+//     for _i in 0..indent {
+//         write!(f, " ")?;
+//     }
+//     Ok(())
+// }
+
+// Consuming iterator
+
+pub struct ConsumingIter<A> {
+    root: Node<A>,
+    level: usize,
+    front_chunk: Option<Chunk<A>>,
+    back_chunk: Option<Chunk<A>>,
+    remaining: usize,
+}
+
+impl<A: Clone> ConsumingIter<A> {
+    pub fn new(root: Node<A>, level: usize) -> Self {
+        ConsumingIter {
+            remaining: root.len(),
+            root,
+            level,
+            front_chunk: None,
+            back_chunk: None,
+        }
+    }
+}
+
+impl<A: Clone> Iterator for ConsumingIter<A> {
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.remaining == 0 {
+            return None;
+        }
+        if let Some(ref mut chunk) = self.front_chunk {
+            if !chunk.is_empty() {
+                self.remaining -= 1;
+                return Some(chunk.pop_front());
+            }
+        }
+        match self.root.pop_chunk(self.level, Side::Left) {
+            PopResult::Done(chunk) => self.front_chunk = Some(clone_ref(chunk)),
+            PopResult::Drained(chunk) => self.front_chunk = Some(clone_ref(chunk)),
+            PopResult::Empty => {
+                if let Some(ref mut chunk) = self.back_chunk {
+                    if !chunk.is_empty() {
+                        self.remaining -= 1;
+                        return Some(chunk.pop_front());
+                    } else {
+                        return None;
+                    }
+                }
+            }
+        }
+        self.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.remaining, Some(self.remaining))
+    }
+}
+
+impl<A: Clone> DoubleEndedIterator for ConsumingIter<A> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.remaining == 0 {
+            return None;
+        }
+        if let Some(ref mut chunk) = self.back_chunk {
+            if !chunk.is_empty() {
+                self.remaining -= 1;
+                return Some(chunk.pop_back());
+            }
+        }
+        match self.root.pop_chunk(self.level, Side::Left) {
+            PopResult::Done(chunk) => self.front_chunk = Some(clone_ref(chunk)),
+            PopResult::Drained(chunk) => self.front_chunk = Some(clone_ref(chunk)),
+            PopResult::Empty => {
+                if let Some(ref mut chunk) = self.front_chunk {
+                    if !chunk.is_empty() {
+                        self.remaining -= 1;
+                        return Some(chunk.pop_back());
+                    } else {
+                        return None;
+                    }
+                }
+            }
+        }
+        self.next()
+    }
+}
+
+impl<A: Clone> ExactSizeIterator for ConsumingIter<A> {}
+
+impl<A: Clone> FusedIterator for ConsumingIter<A> {}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/types.rs cargo-0.33.0/vendor/im-rc/src/nodes/types.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/types.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/types.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,162 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::fmt::Debug;
+use std::marker::PhantomData;
+
+use typenum::*;
+
+// Chunk sizes
+
+pub trait ChunkLength<A>: Unsigned {
+    type SizedType;
+}
+
+impl<A> ChunkLength<A> for UTerm {
+    type SizedType = ();
+}
+
+#[doc(hidden)]
+#[allow(dead_code)]
+pub struct SizeEven<A, B> {
+    parent1: B,
+    parent2: B,
+    _marker: PhantomData<A>,
+}
+
+#[doc(hidden)]
+#[allow(dead_code)]
+pub struct SizeOdd<A, B> {
+    parent1: B,
+    parent2: B,
+    data: A,
+}
+
+impl<A, N> ChunkLength<A> for UInt<N, B0>
+where
+    N: ChunkLength<A>,
+{
+    type SizedType = SizeEven<A, N::SizedType>;
+}
+
+impl<A, N> ChunkLength<A> for UInt<N, B1>
+where
+    N: ChunkLength<A>,
+{
+    type SizedType = SizeOdd<A, N::SizedType>;
+}
+
+// Bit field sizes
+
+pub trait Bits: Unsigned {
+    type Store: Default + Copy + PartialEq + Debug;
+
+    fn get(bits: &Self::Store, index: usize) -> bool;
+    fn set(bits: &mut Self::Store, index: usize, value: bool) -> bool;
+    fn len(bits: &Self::Store) -> usize;
+    fn first_index(bits: &Self::Store) -> Option<usize>;
+}
+
+macro_rules! bits_for {
+    ($num:ty, $result:ty) => {
+        impl Bits for $num {
+            type Store = $result;
+
+            fn get(bits: &$result, index: usize) -> bool {
+                debug_assert!(index < Self::USIZE);
+                bits & (1 << index) != 0
+            }
+
+            fn set(bits: &mut $result, index: usize, value: bool) -> bool {
+                debug_assert!(index < Self::USIZE);
+                let mask = 1 << index;
+                let prev = *bits & mask;
+                if value {
+                    *bits |= mask;
+                } else {
+                    *bits &= !mask;
+                }
+                prev != 0
+            }
+
+            fn len(bits: &$result) -> usize {
+                bits.count_ones() as usize
+            }
+
+            fn first_index(bits: &$result) -> Option<usize> {
+                if *bits == 0 {
+                    None
+                } else {
+                    Some(bits.trailing_zeros() as usize)
+                }
+            }
+        }
+    };
+}
+
+bits_for!(U1, u8);
+bits_for!(U2, u8);
+bits_for!(U3, u8);
+bits_for!(U4, u8);
+bits_for!(U5, u8);
+bits_for!(U6, u8);
+bits_for!(U7, u8);
+bits_for!(U8, u8);
+bits_for!(U9, u16);
+bits_for!(U10, u16);
+bits_for!(U11, u16);
+bits_for!(U12, u16);
+bits_for!(U13, u16);
+bits_for!(U14, u16);
+bits_for!(U15, u16);
+bits_for!(U16, u16);
+bits_for!(U17, u32);
+bits_for!(U18, u32);
+bits_for!(U19, u32);
+bits_for!(U20, u32);
+bits_for!(U21, u32);
+bits_for!(U22, u32);
+bits_for!(U23, u32);
+bits_for!(U24, u32);
+bits_for!(U25, u32);
+bits_for!(U26, u32);
+bits_for!(U27, u32);
+bits_for!(U28, u32);
+bits_for!(U29, u32);
+bits_for!(U30, u32);
+bits_for!(U31, u32);
+bits_for!(U32, u32);
+bits_for!(U33, u64);
+bits_for!(U34, u64);
+bits_for!(U35, u64);
+bits_for!(U36, u64);
+bits_for!(U37, u64);
+bits_for!(U38, u64);
+bits_for!(U39, u64);
+bits_for!(U40, u64);
+bits_for!(U41, u64);
+bits_for!(U42, u64);
+bits_for!(U43, u64);
+bits_for!(U44, u64);
+bits_for!(U45, u64);
+bits_for!(U46, u64);
+bits_for!(U47, u64);
+bits_for!(U48, u64);
+bits_for!(U49, u64);
+bits_for!(U50, u64);
+bits_for!(U51, u64);
+bits_for!(U52, u64);
+bits_for!(U53, u64);
+bits_for!(U54, u64);
+bits_for!(U55, u64);
+bits_for!(U56, u64);
+bits_for!(U57, u64);
+bits_for!(U58, u64);
+bits_for!(U59, u64);
+bits_for!(U60, u64);
+bits_for!(U61, u64);
+bits_for!(U62, u64);
+bits_for!(U63, u64);
+bits_for!(U64, u64);
+// No u128 because stdlib hashes are only u64.
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/unsafe_chunks/mod.rs cargo-0.33.0/vendor/im-rc/src/nodes/unsafe_chunks/mod.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/unsafe_chunks/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/unsafe_chunks/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,18 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#![allow(unsafe_code)]
+
+pub mod sized_chunk;
+pub mod sparse_chunk;
+
+pub mod chunk {
+    use super::sized_chunk as sc;
+    use config::VectorChunkSize;
+    use typenum::Unsigned;
+
+    pub type Chunk<A> = sc::Chunk<A, VectorChunkSize>;
+    pub type Iter<A> = sc::Iter<A, VectorChunkSize>;
+    pub const CHUNK_SIZE: usize = VectorChunkSize::USIZE;
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/unsafe_chunks/sized_chunk.rs cargo-0.33.0/vendor/im-rc/src/nodes/unsafe_chunks/sized_chunk.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/unsafe_chunks/sized_chunk.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/unsafe_chunks/sized_chunk.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1155 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! A fixed capacity smart array.
+//!
+//! See [`Chunk`](struct.Chunk.html)
+
+use std::borrow::{Borrow, BorrowMut};
+use std::cmp::Ordering;
+use std::fmt::{Debug, Error, Formatter};
+use std::hash::{Hash, Hasher};
+use std::io;
+use std::iter::{FromIterator, FusedIterator};
+use std::mem::{self, replace, ManuallyDrop};
+use std::ops::{Deref, DerefMut, Index, IndexMut};
+use std::ptr;
+use std::slice::{
+    from_raw_parts, from_raw_parts_mut, Iter as SliceIter, IterMut as SliceIterMut, SliceIndex,
+};
+
+use typenum::U64;
+
+use nodes::types::ChunkLength;
+
+/// A fixed capacity smart array.
+///
+/// An inline array of items with a variable length but a fixed, preallocated
+/// capacity given by the `N` type, which must be an [`Unsigned`][Unsigned] type
+/// level numeral.
+///
+/// It's 'smart' because it's able to reorganise its contents based on expected
+/// behaviour. If you construct one using `push_back`, it will be laid out like
+/// a `Vec` with space at the end. If you `push_front` it will start filling in
+/// values from the back instead of the front, so that you still get linear time
+/// push as long as you don't reverse direction. If you do, and there's no room
+/// at the end you're pushing to, it'll shift its contents over to the other
+/// side, creating more space to push into. This technique is tuned for
+/// `Chunk`'s expected use case: usually, chunks always see either `push_front`
+/// or `push_back`, but not both unless they move around inside the tree, in
+/// which case they're able to reorganise themselves with reasonable efficiency
+/// to suit their new usage patterns.
+///
+/// It maintains a `left` index and a `right` index instead of a simple length
+/// counter in order to accomplish this, much like a ring buffer would, except
+/// that the `Chunk` keeps all its items sequentially in memory so that you can
+/// always get a `&[A]` slice for them, at the price of the occasional
+/// reordering operation.
+///
+/// This technique also lets us choose to shift the shortest side to account for
+/// the inserted or removed element when performing insert and remove
+/// operations, unlike `Vec` where you always need to shift the right hand side.
+///
+/// Unlike a `Vec`, the `Chunk` has a fixed capacity and cannot grow beyond it.
+/// Being intended for low level use, it expects you to know or test whether
+/// you're pushing to a full array, and has an API more geared towards panics
+/// than returning `Option`s, on the assumption that you know what you're doing.
+///
+/// # Examples
+///
+/// ```rust
+/// # #[macro_use] extern crate im_rc as im;
+/// # extern crate typenum;
+/// # use im::chunk::Chunk;
+/// # use typenum::U64;
+/// # fn main() {
+/// // Construct a chunk with a 64 item capacity
+/// let mut chunk = Chunk::<i32, U64>::new();
+/// // Fill it with descending numbers
+/// chunk.extend((0..64).rev());
+/// // It derefs to a slice so we can use standard slice methods
+/// chunk.sort();
+/// // It's got all the amenities like `FromIterator` and `Eq`
+/// let expected: Chunk<i32, U64> = (0..64).collect();
+/// assert_eq!(expected, chunk);
+/// # }
+/// ```
+///
+/// [Unsigned]: https://docs.rs/typenum/1.10.0/typenum/marker_traits/trait.Unsigned.html
+pub struct Chunk<A, N = U64>
+where
+    N: ChunkLength<A>,
+{
+    left: usize,
+    right: usize,
+    data: ManuallyDrop<N::SizedType>,
+}
+
+impl<A, N> Drop for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn drop(&mut self) {
+        if mem::needs_drop::<A>() {
+            for i in self.left..self.right {
+                unsafe { Chunk::force_drop(i, self) }
+            }
+        }
+    }
+}
+
+impl<A, N> Clone for Chunk<A, N>
+where
+    A: Clone,
+    N: ChunkLength<A>,
+{
+    fn clone(&self) -> Self {
+        let mut out = Self::new();
+        out.left = self.left;
+        out.right = self.right;
+        for index in self.left..self.right {
+            unsafe { Chunk::force_write(index, self.values()[index].clone(), &mut out) }
+        }
+        out
+    }
+}
+
+impl<A, N> Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    /// Construct a new empty chunk.
+    pub fn new() -> Self {
+        let mut chunk: Self;
+        unsafe {
+            chunk = mem::uninitialized();
+            ptr::write(&mut chunk.left, 0);
+            ptr::write(&mut chunk.right, 0);
+        }
+        chunk
+    }
+
+    /// Construct a new chunk with one item.
+    pub fn unit(value: A) -> Self {
+        let mut chunk: Self;
+        unsafe {
+            chunk = mem::uninitialized();
+            ptr::write(&mut chunk.left, 0);
+            ptr::write(&mut chunk.right, 1);
+            Chunk::force_write(0, value, &mut chunk);
+        }
+        chunk
+    }
+
+    /// Construct a new chunk with two items.
+    pub fn pair(left: A, right: A) -> Self {
+        let mut chunk: Self;
+        unsafe {
+            chunk = mem::uninitialized();
+            ptr::write(&mut chunk.left, 0);
+            ptr::write(&mut chunk.right, 2);
+            Chunk::force_write(0, left, &mut chunk);
+            Chunk::force_write(1, right, &mut chunk);
+        }
+        chunk
+    }
+
+    /// Construct a new chunk and move every item from `other` into the new
+    /// chunk.
+    ///
+    /// Time: O(n)
+    pub fn drain_from(other: &mut Self) -> Self {
+        let other_len = other.len();
+        Self::from_front(other, other_len)
+    }
+
+    /// Construct a new chunk and populate it by taking `count` items from the
+    /// iterator `iter`.
+    ///
+    /// Panics if the iterator contains less than `count` items.
+    ///
+    /// Time: O(n)
+    pub fn collect_from<I>(iter: &mut I, mut count: usize) -> Self
+    where
+        I: Iterator<Item = A>,
+    {
+        let mut chunk = Self::new();
+        while count > 0 {
+            count -= 1;
+            chunk.push_back(
+                iter.next()
+                    .expect("Chunk::collect_from: underfull iterator"),
+            );
+        }
+        chunk
+    }
+
+    /// Construct a new chunk and populate it by taking `count` items from the
+    /// front of `other`.
+    ///
+    /// Time: O(n) for the number of items moved
+    pub fn from_front(other: &mut Self, count: usize) -> Self {
+        let other_len = other.len();
+        debug_assert!(count <= other_len);
+        let mut chunk = Self::new();
+        unsafe { Chunk::force_copy_to(other.left, 0, count, other, &mut chunk) };
+        chunk.right = count;
+        other.left += count;
+        chunk
+    }
+
+    /// Construct a new chunk and populate it by taking `count` items from the
+    /// back of `other`.
+    ///
+    /// Time: O(n) for the number of items moved
+    pub fn from_back(other: &mut Self, count: usize) -> Self {
+        let other_len = other.len();
+        debug_assert!(count <= other_len);
+        let mut chunk = Self::new();
+        unsafe { Chunk::force_copy_to(other.right - count, 0, count, other, &mut chunk) };
+        chunk.right = count;
+        other.right -= count;
+        chunk
+    }
+
+    /// Get the length of the chunk.
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.right - self.left
+    }
+
+    /// Test if the chunk is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.left == self.right
+    }
+
+    /// Test if the chunk is at capacity.
+    #[inline]
+    pub fn is_full(&self) -> bool {
+        self.left == 0 && self.right == N::USIZE
+    }
+
+    #[inline]
+    fn values(&self) -> &[A] {
+        unsafe {
+            from_raw_parts(
+                &self.data as *const ManuallyDrop<N::SizedType> as *const A,
+                N::USIZE,
+            )
+        }
+    }
+
+    #[inline]
+    fn values_mut(&mut self) -> &mut [A] {
+        unsafe {
+            from_raw_parts_mut(
+                &mut self.data as *mut ManuallyDrop<N::SizedType> as *mut A,
+                N::USIZE,
+            )
+        }
+    }
+
+    /// Copy the value at an index, discarding ownership of the copied value
+    #[inline]
+    unsafe fn force_read(index: usize, chunk: &mut Self) -> A {
+        ptr::read(&chunk.values()[index])
+    }
+
+    /// Write a value at an index without trying to drop what's already there
+    #[inline]
+    unsafe fn force_write(index: usize, value: A, chunk: &mut Self) {
+        ptr::write(&mut chunk.values_mut()[index], value)
+    }
+
+    /// Drop the value at an index
+    #[inline]
+    unsafe fn force_drop(index: usize, chunk: &mut Self) {
+        ptr::drop_in_place(&mut chunk.values_mut()[index])
+    }
+
+    /// Copy a range within a chunk
+    #[inline]
+    unsafe fn force_copy(from: usize, to: usize, count: usize, chunk: &mut Self) {
+        if count > 0 {
+            ptr::copy(&chunk.values()[from], &mut chunk.values_mut()[to], count)
+        }
+    }
+
+    /// Copy a range between chunks
+    #[inline]
+    unsafe fn force_copy_to(
+        from: usize,
+        to: usize,
+        count: usize,
+        chunk: &mut Self,
+        other: &mut Self,
+    ) {
+        if count > 0 {
+            ptr::copy_nonoverlapping(&chunk.values()[from], &mut other.values_mut()[to], count)
+        }
+    }
+
+    /// Push an item to the front of the chunk.
+    ///
+    /// Panics if the capacity of the chunk is exceeded.
+    ///
+    /// Time: O(1) if there's room at the front, O(n) otherwise
+    pub fn push_front(&mut self, value: A) {
+        if self.is_full() {
+            panic!("Chunk::push_front: can't push to full chunk");
+        }
+        if self.is_empty() {
+            self.left = N::USIZE;
+            self.right = N::USIZE;
+        } else if self.left == 0 {
+            self.left = N::USIZE - self.right;
+            unsafe { Chunk::force_copy(0, self.left, self.right, self) };
+            self.right = N::USIZE;
+        }
+        self.left -= 1;
+        unsafe { Chunk::force_write(self.left, value, self) }
+    }
+
+    /// Push an item to the back of the chunk.
+    ///
+    /// Panics if the capacity of the chunk is exceeded.
+    ///
+    /// Time: O(1) if there's room at the back, O(n) otherwise
+    pub fn push_back(&mut self, value: A) {
+        if self.is_full() {
+            panic!("Chunk::push_back: can't push to full chunk");
+        }
+        if self.is_empty() {
+            self.left = 0;
+            self.right = 0;
+        } else if self.right == N::USIZE {
+            unsafe { Chunk::force_copy(self.left, 0, self.len(), self) };
+            self.right = N::USIZE - self.left;
+            self.left = 0;
+        }
+        unsafe { Chunk::force_write(self.right, value, self) }
+        self.right += 1;
+    }
+
+    /// Pop an item off the front of the chunk.
+    ///
+    /// Panics if the chunk is empty.
+    ///
+    /// Time: O(1)
+    pub fn pop_front(&mut self) -> A {
+        if self.is_empty() {
+            panic!("Chunk::pop_front: can't pop from empty chunk");
+        } else {
+            let value = unsafe { Chunk::force_read(self.left, self) };
+            self.left += 1;
+            value
+        }
+    }
+
+    /// Pop an item off the back of the chunk.
+    ///
+    /// Panics if the chunk is empty.
+    ///
+    /// Time: O(1)
+    pub fn pop_back(&mut self) -> A {
+        if self.is_empty() {
+            panic!("Chunk::pop_back: can't pop from empty chunk");
+        } else {
+            self.right -= 1;
+            unsafe { Chunk::force_read(self.right, self) }
+        }
+    }
+
+    /// Discard all items up to but not including `index`.
+    ///
+    /// Panics if `index` is out of bounds.
+    ///
+    /// Time: O(n) for the number of items dropped
+    pub fn drop_left(&mut self, index: usize) {
+        if index > 0 {
+            if index > self.len() {
+                panic!("Chunk::drop_left: index out of bounds");
+            }
+            let start = self.left;
+            for i in start..(start + index) {
+                unsafe { Chunk::force_drop(i, self) }
+            }
+            self.left += index;
+        }
+    }
+
+    /// Discard all items from `index` onward.
+    ///
+    /// Panics if `index` is out of bounds.
+    ///
+    /// Time: O(n) for the number of items dropped
+    pub fn drop_right(&mut self, index: usize) {
+        if index > self.len() {
+            panic!("Chunk::drop_right: index out of bounds");
+        }
+        if index == self.len() {
+            return;
+        }
+        let start = self.left + index;
+        for i in start..self.right {
+            unsafe { Chunk::force_drop(i, self) }
+        }
+        self.right = start;
+    }
+
+    /// Split a chunk into two, the original chunk containing
+    /// everything up to `index` and the returned chunk containing
+    /// everything from `index` onwards.
+    ///
+    /// Panics if `index` is out of bounds.
+    ///
+    /// Time: O(n) for the number of items in the new chunk
+    pub fn split_off(&mut self, index: usize) -> Self {
+        if index > self.len() {
+            panic!("Chunk::split: index out of bounds");
+        }
+        if index == self.len() {
+            return Self::new();
+        }
+        let mut right_chunk = Self::new();
+        let start = self.left + index;
+        let len = self.right - start;
+        unsafe { Chunk::force_copy_to(start, 0, len, self, &mut right_chunk) };
+        right_chunk.right = len;
+        self.right = start;
+        right_chunk
+    }
+
+    /// Remove all items from `other` and append them to the back of `self`.
+    ///
+    /// Panics if the capacity of the chunk is exceeded.
+    ///
+    /// Time: O(n) for the number of items moved
+    pub fn append(&mut self, other: &mut Self) {
+        let self_len = self.len();
+        let other_len = other.len();
+        if self_len + other_len > N::USIZE {
+            panic!("Chunk::append: chunk size overflow");
+        }
+        if self.right + other_len > N::USIZE {
+            unsafe { Chunk::force_copy(self.left, 0, self_len, self) };
+            self.right -= self.left;
+            self.left = 0;
+        }
+        unsafe { Chunk::force_copy_to(other.left, self.right, other_len, other, self) };
+        self.right += other_len;
+        other.left = 0;
+        other.right = 0;
+    }
+
+    /// Remove `count` items from the front of `other` and append them to the
+    /// back of `self`.
+    ///
+    /// Panics if `self` doesn't have `count` items left, or if `other` has
+    /// fewer than `count` items.
+    ///
+    /// Time: O(n) for the number of items moved
+    pub fn drain_from_front(&mut self, other: &mut Self, count: usize) {
+        let self_len = self.len();
+        let other_len = other.len();
+        debug_assert!(self_len + count <= N::USIZE);
+        debug_assert!(other_len >= count);
+        if self.right + count > N::USIZE {
+            unsafe { Chunk::force_copy(self.left, 0, self_len, self) };
+            self.right -= self.left;
+            self.left = 0;
+        }
+        unsafe { Chunk::force_copy_to(other.left, self.right, count, other, self) };
+        self.right += count;
+        other.left += count;
+    }
+
+    /// Remove `count` items from the back of `other` and append them to the
+    /// front of `self`.
+    ///
+    /// Panics if `self` doesn't have `count` items left, or if `other` has
+    /// fewer than `count` items.
+    ///
+    /// Time: O(n) for the number of items moved
+    pub fn drain_from_back(&mut self, other: &mut Self, count: usize) {
+        let self_len = self.len();
+        let other_len = other.len();
+        debug_assert!(self_len + count <= N::USIZE);
+        debug_assert!(other_len >= count);
+        if self.left < count {
+            self.left = N::USIZE - self.right;
+            unsafe { Chunk::force_copy(0, self.left, self.right, self) };
+            self.right = N::USIZE;
+        }
+        unsafe { Chunk::force_copy_to(other.right - count, self.left - count, count, other, self) };
+        self.left -= count;
+        other.right -= count;
+    }
+
+    /// Update the value at index `index`, returning the old value.
+    ///
+    /// Panics if `index` is out of bounds.
+    ///
+    /// Time: O(1)
+    pub fn set(&mut self, index: usize, value: A) -> A {
+        replace(&mut self[index], value)
+    }
+
+    /// Insert a new value at index `index`, shifting all the following values
+    /// to the right.
+    ///
+    /// Panics if the index is out of bounds.
+    ///
+    /// Time: O(n) for the number of items shifted
+    pub fn insert(&mut self, index: usize, value: A) {
+        if self.is_full() {
+            panic!("Chunk::insert: chunk is full");
+        }
+        if index > self.len() {
+            panic!("Chunk::insert: index out of bounds");
+        }
+        let real_index = index + self.left;
+        let left_size = index;
+        let right_size = self.right - real_index;
+        if self.right == N::USIZE || (self.left > 0 && left_size < right_size) {
+            unsafe {
+                Chunk::force_copy(self.left, self.left - 1, left_size, self);
+                Chunk::force_write(real_index - 1, value, self);
+            }
+            self.left -= 1;
+        } else {
+            unsafe {
+                Chunk::force_copy(real_index, real_index + 1, right_size, self);
+                Chunk::force_write(real_index, value, self);
+            }
+            self.right += 1;
+        }
+    }
+
+    /// Remove the value at index `index`, shifting all the following values to
+    /// the left.
+    ///
+    /// Returns the removed value.
+    ///
+    /// Panics if the index is out of bounds.
+    ///
+    /// Time: O(n) for the number of items shifted
+    pub fn remove(&mut self, index: usize) -> A {
+        if index >= self.len() {
+            panic!("Chunk::remove: index out of bounds");
+        }
+        let real_index = index + self.left;
+        let value = unsafe { Chunk::force_read(real_index, self) };
+        let left_size = index;
+        let right_size = self.right - real_index - 1;
+        if left_size < right_size {
+            unsafe { Chunk::force_copy(self.left, self.left + 1, left_size, self) };
+            self.left += 1;
+        } else {
+            unsafe { Chunk::force_copy(real_index + 1, real_index, right_size, self) };
+            self.right -= 1;
+        }
+        value
+    }
+
+    /// Construct an iterator that drains values from the front of the chunk.
+    pub fn drain(&mut self) -> Drain<'_, A, N> {
+        Drain { chunk: self }
+    }
+
+    /// Discard the contents of the chunk.
+    ///
+    /// Time: O(n)
+    pub fn clear(&mut self) {
+        self.drop_right(0);
+        self.left = 0;
+        self.right = 0;
+    }
+
+    /// Get a reference to the contents of the chunk as a slice.
+    pub fn as_slice(&self) -> &[A] {
+        unsafe {
+            from_raw_parts(
+                (&self.data as *const ManuallyDrop<N::SizedType> as *const A).add(self.left),
+                self.len(),
+            )
+        }
+    }
+
+    /// Get a reference to the contents of the chunk as a mutable slice.
+    pub fn as_mut_slice(&mut self) -> &mut [A] {
+        unsafe {
+            from_raw_parts_mut(
+                (&mut self.data as *mut ManuallyDrop<N::SizedType> as *mut A).add(self.left),
+                self.len(),
+            )
+        }
+    }
+}
+
+impl<A, N> Default for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<A, N, I> Index<I> for Chunk<A, N>
+where
+    I: SliceIndex<[A]>,
+    N: ChunkLength<A>,
+{
+    type Output = I::Output;
+    fn index(&self, index: I) -> &Self::Output {
+        self.as_slice().index(index)
+    }
+}
+
+impl<A, N, I> IndexMut<I> for Chunk<A, N>
+where
+    I: SliceIndex<[A]>,
+    N: ChunkLength<A>,
+{
+    fn index_mut(&mut self, index: I) -> &mut Self::Output {
+        self.as_mut_slice().index_mut(index)
+    }
+}
+
+impl<A, N> Debug for Chunk<A, N>
+where
+    A: Debug,
+    N: ChunkLength<A>,
+{
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        f.write_str("Chunk")?;
+        f.debug_list().entries(self.iter()).finish()
+    }
+}
+
+impl<A, N> Hash for Chunk<A, N>
+where
+    A: Hash,
+    N: ChunkLength<A>,
+{
+    fn hash<H>(&self, hasher: &mut H)
+    where
+        H: Hasher,
+    {
+        for item in self {
+            item.hash(hasher)
+        }
+    }
+}
+
+impl<A, N> PartialEq for Chunk<A, N>
+where
+    A: PartialEq,
+    N: ChunkLength<A>,
+{
+    fn eq(&self, other: &Self) -> bool {
+        self.len() == other.len() && self.iter().eq(other.iter())
+    }
+}
+
+impl<A, N> Eq for Chunk<A, N>
+where
+    A: Eq,
+    N: ChunkLength<A>,
+{
+}
+
+impl<A, N> PartialOrd for Chunk<A, N>
+where
+    A: PartialOrd,
+    N: ChunkLength<A>,
+{
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.iter().partial_cmp(other.iter())
+    }
+}
+
+impl<A, N> Ord for Chunk<A, N>
+where
+    A: Ord,
+    N: ChunkLength<A>,
+{
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.iter().cmp(other.iter())
+    }
+}
+
+impl<N> io::Write for Chunk<u8, N>
+where
+    N: ChunkLength<u8>,
+{
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        let old_len = self.len();
+        self.extend(buf.iter().cloned().take(N::USIZE - old_len));
+        Ok(self.len() - old_len)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl<A, N> Borrow<[A]> for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn borrow(&self) -> &[A] {
+        self.as_slice()
+    }
+}
+
+impl<A, N> BorrowMut<[A]> for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn borrow_mut(&mut self) -> &mut [A] {
+        self.as_mut_slice()
+    }
+}
+
+impl<A, N> AsRef<[A]> for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn as_ref(&self) -> &[A] {
+        self.as_slice()
+    }
+}
+
+impl<A, N> AsMut<[A]> for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn as_mut(&mut self) -> &mut [A] {
+        self.as_mut_slice()
+    }
+}
+
+impl<A, N> Deref for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    type Target = [A];
+
+    fn deref(&self) -> &Self::Target {
+        self.as_slice()
+    }
+}
+
+impl<A, N> DerefMut for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.as_mut_slice()
+    }
+}
+
+impl<A, N> FromIterator<A> for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn from_iter<I>(it: I) -> Self
+    where
+        I: IntoIterator<Item = A>,
+    {
+        let mut chunk = Self::new();
+        for item in it {
+            chunk.push_back(item);
+        }
+        chunk
+    }
+}
+
+impl<'a, A, N> IntoIterator for &'a Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    type Item = &'a A;
+    type IntoIter = SliceIter<'a, A>;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a, A, N> IntoIterator for &'a mut Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    type Item = &'a mut A;
+    type IntoIter = SliceIterMut<'a, A>;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter_mut()
+    }
+}
+
+impl<A, N> Extend<A> for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    /// Append the contents of the iterator to the back of the chunk.
+    ///
+    /// Panics if the chunk exceeds its capacity.
+    ///
+    /// Time: O(n) for the length of the iterator
+    fn extend<I>(&mut self, it: I)
+    where
+        I: IntoIterator<Item = A>,
+    {
+        for item in it {
+            self.push_back(item);
+        }
+    }
+}
+
+impl<'a, A, N> Extend<&'a A> for Chunk<A, N>
+where
+    A: 'a + Copy,
+    N: ChunkLength<A>,
+{
+    /// Append the contents of the iterator to the back of the chunk.
+    ///
+    /// Panics if the chunk exceeds its capacity.
+    ///
+    /// Time: O(n) for the length of the iterator
+    fn extend<I>(&mut self, it: I)
+    where
+        I: IntoIterator<Item = &'a A>,
+    {
+        for item in it {
+            self.push_back(*item);
+        }
+    }
+}
+
+pub struct Iter<A, N>
+where
+    N: ChunkLength<A>,
+{
+    chunk: Chunk<A, N>,
+}
+
+impl<A, N> Iterator for Iter<A, N>
+where
+    N: ChunkLength<A>,
+{
+    type Item = A;
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.chunk.is_empty() {
+            None
+        } else {
+            Some(self.chunk.pop_front())
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.chunk.len(), Some(self.chunk.len()))
+    }
+}
+
+impl<A, N> DoubleEndedIterator for Iter<A, N>
+where
+    N: ChunkLength<A>,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.chunk.is_empty() {
+            None
+        } else {
+            Some(self.chunk.pop_back())
+        }
+    }
+}
+
+impl<A, N> ExactSizeIterator for Iter<A, N> where N: ChunkLength<A> {}
+
+impl<A, N> FusedIterator for Iter<A, N> where N: ChunkLength<A> {}
+
+impl<A, N> IntoIterator for Chunk<A, N>
+where
+    N: ChunkLength<A>,
+{
+    type Item = A;
+    type IntoIter = Iter<A, N>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Iter { chunk: self }
+    }
+}
+
+pub struct Drain<'a, A, N>
+where
+    A: 'a,
+    N: ChunkLength<A> + 'a,
+{
+    chunk: &'a mut Chunk<A, N>,
+}
+
+impl<'a, A, N> Iterator for Drain<'a, A, N>
+where
+    A: 'a,
+    N: ChunkLength<A> + 'a,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.chunk.is_empty() {
+            None
+        } else {
+            Some(self.chunk.pop_front())
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.chunk.len(), Some(self.chunk.len()))
+    }
+}
+
+impl<'a, A, N> ExactSizeIterator for Drain<'a, A, N>
+where
+    A: 'a,
+    N: ChunkLength<A> + 'a,
+{
+}
+
+impl<'a, A, N> FusedIterator for Drain<'a, A, N>
+where
+    A: 'a,
+    N: ChunkLength<A> + 'a,
+{
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn is_full() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..64 {
+            assert_eq!(false, chunk.is_full());
+            chunk.push_back(i);
+        }
+        assert_eq!(true, chunk.is_full());
+    }
+
+    #[test]
+    fn push_back_front() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 12..20 {
+            chunk.push_back(i);
+        }
+        assert_eq!(8, chunk.len());
+        for i in (0..12).rev() {
+            chunk.push_front(i);
+        }
+        assert_eq!(20, chunk.len());
+        for i in 20..32 {
+            chunk.push_back(i);
+        }
+        assert_eq!(32, chunk.len());
+        let right: Vec<i32> = chunk.into_iter().collect();
+        let left: Vec<i32> = (0..32).collect();
+        assert_eq!(left, right);
+    }
+
+    #[test]
+    fn push_and_pop() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..64 {
+            chunk.push_back(i);
+        }
+        for i in 0..64 {
+            assert_eq!(i, chunk.pop_front());
+        }
+        for i in 0..64 {
+            chunk.push_front(i);
+        }
+        for i in 0..64 {
+            assert_eq!(i, chunk.pop_back());
+        }
+    }
+
+    #[test]
+    fn drop_left() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..6 {
+            chunk.push_back(i);
+        }
+        chunk.drop_left(3);
+        let vec: Vec<i32> = chunk.into_iter().collect();
+        assert_eq!(vec![3, 4, 5], vec);
+    }
+
+    #[test]
+    fn drop_right() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..6 {
+            chunk.push_back(i);
+        }
+        chunk.drop_right(3);
+        let vec: Vec<i32> = chunk.into_iter().collect();
+        assert_eq!(vec![0, 1, 2], vec);
+    }
+
+    #[test]
+    fn split_off() {
+        let mut left = Chunk::<_, U64>::new();
+        for i in 0..6 {
+            left.push_back(i);
+        }
+        let right = left.split_off(3);
+        let left_vec: Vec<i32> = left.into_iter().collect();
+        let right_vec: Vec<i32> = right.into_iter().collect();
+        assert_eq!(vec![0, 1, 2], left_vec);
+        assert_eq!(vec![3, 4, 5], right_vec);
+    }
+
+    #[test]
+    fn append() {
+        let mut left = Chunk::<_, U64>::new();
+        for i in 0..32 {
+            left.push_back(i);
+        }
+        let mut right = Chunk::<_, U64>::new();
+        for i in (32..64).rev() {
+            right.push_front(i);
+        }
+        left.append(&mut right);
+        let out_vec: Vec<i32> = left.into_iter().collect();
+        let should_vec: Vec<i32> = (0..64).collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn ref_iter() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..64 {
+            chunk.push_back(i);
+        }
+        let out_vec: Vec<&i32> = chunk.iter().collect();
+        let should_vec_p: Vec<i32> = (0..64).collect();
+        let should_vec: Vec<&i32> = should_vec_p.iter().collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn mut_ref_iter() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..64 {
+            chunk.push_back(i);
+        }
+        let out_vec: Vec<&mut i32> = chunk.iter_mut().collect();
+        let mut should_vec_p: Vec<i32> = (0..64).collect();
+        let should_vec: Vec<&mut i32> = should_vec_p.iter_mut().collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn consuming_iter() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..64 {
+            chunk.push_back(i);
+        }
+        let out_vec: Vec<i32> = chunk.into_iter().collect();
+        let should_vec: Vec<i32> = (0..64).collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn insert_middle() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..32 {
+            chunk.push_back(i);
+        }
+        for i in 33..64 {
+            chunk.push_back(i);
+        }
+        chunk.insert(32, 32);
+        let out_vec: Vec<i32> = chunk.into_iter().collect();
+        let should_vec: Vec<i32> = (0..64).collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn insert_back() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..63 {
+            chunk.push_back(i);
+        }
+        chunk.insert(63, 63);
+        let out_vec: Vec<i32> = chunk.into_iter().collect();
+        let should_vec: Vec<i32> = (0..64).collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn insert_front() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 1..64 {
+            chunk.push_front(64 - i);
+        }
+        chunk.insert(0, 0);
+        let out_vec: Vec<i32> = chunk.into_iter().collect();
+        let should_vec: Vec<i32> = (0..64).collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    #[test]
+    fn remove_value() {
+        let mut chunk = Chunk::<_, U64>::new();
+        for i in 0..64 {
+            chunk.push_back(i);
+        }
+        chunk.remove(32);
+        let out_vec: Vec<i32> = chunk.into_iter().collect();
+        let should_vec: Vec<i32> = (0..32).chain(33..64).collect();
+        assert_eq!(should_vec, out_vec);
+    }
+
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    struct DropTest<'a> {
+        counter: &'a AtomicUsize,
+    }
+
+    impl<'a> DropTest<'a> {
+        fn new(counter: &'a AtomicUsize) -> Self {
+            counter.fetch_add(1, Ordering::Relaxed);
+            DropTest { counter }
+        }
+    }
+
+    impl<'a> Drop for DropTest<'a> {
+        fn drop(&mut self) {
+            self.counter.fetch_sub(1, Ordering::Relaxed);
+        }
+    }
+
+    #[test]
+    fn dropping() {
+        let counter = AtomicUsize::new(0);
+        {
+            let mut chunk: Chunk<DropTest> = Chunk::new();
+            for _i in 0..20 {
+                chunk.push_back(DropTest::new(&counter))
+            }
+            for _i in 0..20 {
+                chunk.push_front(DropTest::new(&counter))
+            }
+            assert_eq!(40, counter.load(Ordering::Relaxed));
+            for _i in 0..10 {
+                chunk.pop_back();
+            }
+            assert_eq!(30, counter.load(Ordering::Relaxed));
+        }
+        assert_eq!(0, counter.load(Ordering::Relaxed));
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/nodes/unsafe_chunks/sparse_chunk.rs cargo-0.33.0/vendor/im-rc/src/nodes/unsafe_chunks/sparse_chunk.rs
--- cargo-0.32.0/vendor/im-rc/src/nodes/unsafe_chunks/sparse_chunk.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/nodes/unsafe_chunks/sparse_chunk.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,292 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::mem::{self, ManuallyDrop};
+use std::ops::Index;
+use std::ops::IndexMut;
+use std::ptr;
+use std::slice::{from_raw_parts, from_raw_parts_mut};
+
+use nodes::bitmap::{Bitmap, Iter as BitmapIter};
+use nodes::types::{Bits, ChunkLength};
+
+pub struct SparseChunk<A, N: Bits + ChunkLength<A>> {
+    map: Bitmap<N>,
+    data: ManuallyDrop<N::SizedType>,
+}
+
+impl<A, N: Bits + ChunkLength<A>> Drop for SparseChunk<A, N> {
+    fn drop(&mut self) {
+        if mem::needs_drop::<A>() {
+            for index in self.map {
+                unsafe { SparseChunk::force_drop(index, self) }
+            }
+        }
+    }
+}
+
+impl<A: Clone, N: Bits + ChunkLength<A>> Clone for SparseChunk<A, N> {
+    fn clone(&self) -> Self {
+        let mut out = Self::new();
+        for index in self.map {
+            out.insert(index, self[index].clone());
+        }
+        out
+    }
+}
+
+impl<A, N: Bits + ChunkLength<A>> SparseChunk<A, N> {
+    #[inline]
+    fn values(&self) -> &[A] {
+        unsafe {
+            from_raw_parts(
+                &self.data as *const ManuallyDrop<N::SizedType> as *const A,
+                N::USIZE,
+            )
+        }
+    }
+
+    #[inline]
+    fn values_mut(&mut self) -> &mut [A] {
+        unsafe {
+            from_raw_parts_mut(
+                &mut self.data as *mut ManuallyDrop<N::SizedType> as *mut A,
+                N::USIZE,
+            )
+        }
+    }
+
+    /// Copy the value at an index, discarding ownership of the copied value
+    #[inline]
+    unsafe fn force_read(index: usize, chunk: &Self) -> A {
+        ptr::read(&chunk.values()[index as usize])
+    }
+
+    /// Write a value at an index without trying to drop what's already there
+    #[inline]
+    unsafe fn force_write(index: usize, value: A, chunk: &mut Self) {
+        ptr::write(&mut chunk.values_mut()[index as usize], value)
+    }
+
+    /// Drop the value at an index
+    #[inline]
+    unsafe fn force_drop(index: usize, chunk: &mut Self) {
+        ptr::drop_in_place(&mut chunk.values_mut()[index])
+    }
+
+    pub fn new() -> Self {
+        let mut chunk: Self;
+        unsafe {
+            chunk = mem::uninitialized();
+            ptr::write(&mut chunk.map, Bitmap::new());
+        }
+        chunk
+    }
+
+    pub fn unit(index: usize, value: A) -> Self {
+        let mut chunk = Self::new();
+        chunk.insert(index, value);
+        chunk
+    }
+
+    pub fn pair(index1: usize, value1: A, index2: usize, value2: A) -> Self {
+        let mut chunk = Self::new();
+        chunk.insert(index1, value1);
+        chunk.insert(index2, value2);
+        chunk
+    }
+
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.map.len()
+    }
+
+    pub fn insert(&mut self, index: usize, value: A) -> Option<A> {
+        if index >= N::USIZE {
+            panic!("SparseChunk::insert: index out of bounds");
+        }
+        let prev = if self.map.set(index, true) {
+            Some(unsafe { SparseChunk::force_read(index, self) })
+        } else {
+            None
+        };
+        unsafe { SparseChunk::force_write(index, value, self) };
+        prev
+    }
+
+    pub fn remove(&mut self, index: usize) -> Option<A> {
+        if index >= N::USIZE {
+            panic!("SparseChunk::remove: index out of bounds");
+        }
+        if self.map.set(index, false) {
+            Some(unsafe { SparseChunk::force_read(index, self) })
+        } else {
+            None
+        }
+    }
+
+    pub fn pop(&mut self) -> Option<A> {
+        self.first_index().and_then(|index| self.remove(index))
+    }
+
+    pub fn get(&self, index: usize) -> Option<&A> {
+        if index >= N::USIZE {
+            return None;
+        }
+        if self.map.get(index) {
+            Some(&self.values()[index])
+        } else {
+            None
+        }
+    }
+
+    pub fn get_mut(&mut self, index: usize) -> Option<&mut A> {
+        if index >= N::USIZE {
+            return None;
+        }
+        if self.map.get(index) {
+            Some(&mut self.values_mut()[index])
+        } else {
+            None
+        }
+    }
+
+    pub fn indices(&self) -> BitmapIter<N> {
+        self.map.into_iter()
+    }
+
+    pub fn first_index(&self) -> Option<usize> {
+        self.map.first_index()
+    }
+
+    pub fn iter(&self) -> Iter<'_, A, N> {
+        Iter {
+            indices: self.indices(),
+            chunk: self,
+        }
+    }
+
+    pub fn iter_mut(&mut self) -> IterMut<'_, A, N> {
+        IterMut {
+            indices: self.indices(),
+            chunk: self,
+        }
+    }
+
+    pub fn drain(self) -> Drain<A, N> {
+        Drain { chunk: self }
+    }
+}
+
+impl<A, N: Bits + ChunkLength<A>> Index<usize> for SparseChunk<A, N> {
+    type Output = A;
+
+    #[inline]
+    fn index(&self, index: usize) -> &Self::Output {
+        self.get(index).unwrap()
+    }
+}
+
+impl<A, N: Bits + ChunkLength<A>> IndexMut<usize> for SparseChunk<A, N> {
+    #[inline]
+    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
+        self.get_mut(index).unwrap()
+    }
+}
+
+impl<A, N: Bits + ChunkLength<A>> IntoIterator for SparseChunk<A, N> {
+    type Item = A;
+    type IntoIter = Drain<A, N>;
+
+    #[inline]
+    fn into_iter(self) -> Self::IntoIter {
+        self.drain()
+    }
+}
+
+pub struct Iter<'a, A: 'a, N: 'a + Bits + ChunkLength<A>> {
+    indices: BitmapIter<N>,
+    chunk: &'a SparseChunk<A, N>,
+}
+
+impl<'a, A, N: Bits + ChunkLength<A>> Iterator for Iter<'a, A, N> {
+    type Item = &'a A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.indices.next().map(|index| &self.chunk.values()[index])
+    }
+}
+
+pub struct IterMut<'a, A: 'a, N: 'a + Bits + ChunkLength<A>> {
+    indices: BitmapIter<N>,
+    chunk: &'a mut SparseChunk<A, N>,
+}
+
+impl<'a, A, N: Bits + ChunkLength<A>> Iterator for IterMut<'a, A, N> {
+    type Item = &'a mut A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(index) = self.indices.next() {
+            unsafe {
+                let p: *mut A = &mut self.chunk.values_mut()[index];
+                Some(&mut *p)
+            }
+        } else {
+            None
+        }
+    }
+}
+
+pub struct Drain<A, N: Bits + ChunkLength<A>> {
+    chunk: SparseChunk<A, N>,
+}
+
+impl<'a, A, N: Bits + ChunkLength<A>> Iterator for Drain<A, N> {
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.chunk.pop()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use typenum::U32;
+
+    #[test]
+    fn insert_remove_iterate() {
+        let mut chunk: SparseChunk<_, U32> = SparseChunk::new();
+        assert_eq!(None, chunk.insert(5, 5));
+        assert_eq!(None, chunk.insert(1, 1));
+        assert_eq!(None, chunk.insert(24, 42));
+        assert_eq!(None, chunk.insert(22, 22));
+        assert_eq!(Some(42), chunk.insert(24, 24));
+        assert_eq!(None, chunk.insert(31, 31));
+        assert_eq!(Some(24), chunk.remove(24));
+        assert_eq!(4, chunk.len());
+        let indices: Vec<_> = chunk.indices().collect();
+        assert_eq!(vec![1, 5, 22, 31], indices);
+        let values: Vec<_> = chunk.into_iter().collect();
+        assert_eq!(vec![1, 5, 22, 31], values);
+    }
+
+    #[test]
+    fn clone_chunk() {
+        let mut chunk: SparseChunk<_, U32> = SparseChunk::new();
+        assert_eq!(None, chunk.insert(5, 5));
+        assert_eq!(None, chunk.insert(1, 1));
+        assert_eq!(None, chunk.insert(24, 42));
+        assert_eq!(None, chunk.insert(22, 22));
+        let cloned = chunk.clone();
+        let right_indices: Vec<_> = chunk.indices().collect();
+        let left_indices: Vec<_> = cloned.indices().collect();
+        let right: Vec<_> = chunk.into_iter().collect();
+        let left: Vec<_> = cloned.into_iter().collect();
+        assert_eq!(left, right);
+        assert_eq!(left_indices, right_indices);
+        assert_eq!(vec![1, 5, 22, 24], left_indices);
+        assert_eq!(vec![1, 5, 22, 24], right_indices);
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/ord/map.rs cargo-0.33.0/vendor/im-rc/src/ord/map.rs
--- cargo-0.32.0/vendor/im-rc/src/ord/map.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/ord/map.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,2355 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! An ordered map.
+//!
+//! An immutable ordered map implemented as a [B-tree] [1].
+//!
+//! Most operations on this type of map are O(log n). A
+//! [`HashMap`][hashmap::HashMap] is usually a better choice for
+//! performance, but the `OrdMap` has the advantage of only requiring
+//! an [`Ord`][std::cmp::Ord] constraint on the key, and of being
+//! ordered, so that keys always come out from lowest to highest,
+//! where a [`HashMap`][hashmap::HashMap] has no guaranteed ordering.
+//!
+//! [1]: https://en.wikipedia.org/wiki/B-tree
+//! [hashmap::HashMap]: ../hashmap/struct.HashMap.html
+//! [std::cmp::Ord]: https://doc.rust-lang.org/std/cmp/trait.Ord.html
+
+use std::borrow::Borrow;
+use std::cmp::Ordering;
+use std::collections;
+use std::fmt::{Debug, Error, Formatter};
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::iter::{FromIterator, Iterator, Sum};
+use std::mem;
+use std::ops::{Add, Index, IndexMut, RangeBounds};
+
+use hashmap::HashMap;
+use nodes::btree::{BTreeValue, Insert, Node, Remove};
+#[cfg(has_specialisation)]
+use util::linear_search_by;
+use util::Ref;
+
+pub use nodes::btree::{ConsumingIter, DiffItem, DiffIter, Iter as RangedIter};
+
+/// Construct a map from a sequence of key/value pairs.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::ordmap::OrdMap;
+/// # fn main() {
+/// assert_eq!(
+///   ordmap!{
+///     1 => 11,
+///     2 => 22,
+///     3 => 33
+///   },
+///   OrdMap::from(vec![(1, 11), (2, 22), (3, 33)])
+/// );
+/// # }
+/// ```
+#[macro_export]
+macro_rules! ordmap {
+    () => { $crate::ordmap::OrdMap::new() };
+
+    ( $( $key:expr => $value:expr ),* ) => {{
+        let mut map = $crate::ordmap::OrdMap::new();
+        $({
+            map.insert($key, $value);
+        })*;
+        map
+    }};
+}
+
+#[cfg(not(has_specialisation))]
+impl<K: Ord + Clone, V: Clone> BTreeValue for (K, V) {
+    type Key = K;
+
+    fn ptr_eq(&self, _other: &Self) -> bool {
+        false
+    }
+
+    fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        slice.binary_search_by(|value| Self::Key::borrow(&value.0).cmp(key))
+    }
+
+    fn search_value(slice: &[Self], key: &Self) -> Result<usize, usize> {
+        slice.binary_search_by(|value| value.0.cmp(&key.0))
+    }
+
+    fn cmp_keys<BK>(&self, other: &BK) -> Ordering
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        Self::Key::borrow(&self.0).cmp(other)
+    }
+
+    fn cmp_values(&self, other: &Self) -> Ordering {
+        self.0.cmp(&other.0)
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K: Ord + Clone, V: Clone> BTreeValue for (K, V) {
+    type Key = K;
+
+    fn ptr_eq(&self, _other: &Self) -> bool {
+        false
+    }
+
+    default fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        slice.binary_search_by(|value| Self::Key::borrow(&value.0).cmp(key))
+    }
+
+    default fn search_value(slice: &[Self], key: &Self) -> Result<usize, usize> {
+        slice.binary_search_by(|value| value.0.cmp(&key.0))
+    }
+
+    fn cmp_keys<BK>(&self, other: &BK) -> Ordering
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        Self::Key::borrow(&self.0).cmp(other)
+    }
+
+    fn cmp_values(&self, other: &Self) -> Ordering {
+        self.0.cmp(&other.0)
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K: Ord + Clone + Copy, V: Clone> BTreeValue for (K, V) {
+    fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        linear_search_by(slice, |value| Self::Key::borrow(&value.0).cmp(key))
+    }
+
+    fn search_value(slice: &[Self], key: &Self) -> Result<usize, usize> {
+        linear_search_by(slice, |value| value.0.cmp(&key.0))
+    }
+}
+
+/// An ordered map.
+///
+/// An immutable ordered map implemented as a B-tree.
+///
+/// Most operations on this type of map are O(log n). A
+/// [`HashMap`][hashmap::HashMap] is usually a better choice for
+/// performance, but the `OrdMap` has the advantage of only requiring
+/// an [`Ord`][std::cmp::Ord] constraint on the key, and of being
+/// ordered, so that keys always come out from lowest to highest,
+/// where a [`HashMap`][hashmap::HashMap] has no guaranteed ordering.
+///
+/// [hashmap::HashMap]: ../hashmap/struct.HashMap.html
+/// [std::cmp::Ord]: https://doc.rust-lang.org/std/cmp/trait.Ord.html
+pub struct OrdMap<K, V> {
+    size: usize,
+    root: Ref<Node<(K, V)>>,
+}
+
+impl<K, V> OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    /// Construct an empty map.
+    #[must_use]
+    pub fn new() -> Self {
+        OrdMap {
+            size: 0,
+            root: Ref::from(Node::new()),
+        }
+    }
+
+    /// Construct a map with a single mapping.
+    ///
+    /// This method has been deprecated; use [`unit`][unit] instead.
+    ///
+    /// [unit]: #method.unit
+    #[inline]
+    #[must_use]
+    #[deprecated(since = "12.3.0", note = "renamed to `unit` for consistency")]
+    pub fn singleton(key: K, value: V) -> Self {
+        Self::unit(key, value)
+    }
+
+    /// Construct a map with a single mapping.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map = OrdMap::unit(123, "onetwothree");
+    /// assert_eq!(
+    ///   map.get(&123),
+    ///   Some(&"onetwothree")
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn unit(key: K, value: V) -> Self {
+        OrdMap {
+            size: 1,
+            root: Ref::from(Node::unit((key, value))),
+        }
+    }
+
+    /// Test whether a map is empty.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// assert!(
+    ///   !ordmap!{1 => 2}.is_empty()
+    /// );
+    /// assert!(
+    ///   OrdMap::<i32, i32>::new().is_empty()
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get the size of a map.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// assert_eq!(3, ordmap!{
+    ///   1 => 11,
+    ///   2 => 22,
+    ///   3 => 33
+    /// }.len());
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.size
+    }
+
+    /// Get the largest key in a map, along with its value. If the map
+    /// is empty, return `None`.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// assert_eq!(Some(&(3, 33)), ordmap!{
+    ///   1 => 11,
+    ///   2 => 22,
+    ///   3 => 33
+    /// }.get_max());
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get_max(&self) -> Option<&(K, V)> {
+        self.root.max()
+    }
+
+    /// Get the smallest key in a map, along with its value. If the
+    /// map is empty, return `None`.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// assert_eq!(Some(&(1, 11)), ordmap!{
+    ///   1 => 11,
+    ///   2 => 22,
+    ///   3 => 33
+    /// }.get_min());
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get_min(&self) -> Option<&(K, V)> {
+        self.root.min()
+    }
+
+    /// Get an iterator over the key/value pairs of a map.
+    #[must_use]
+    pub fn iter(&self) -> Iter<(K, V)> {
+        Iter {
+            it: RangedIter::new(&self.root, self.size, ..),
+        }
+    }
+
+    // Create an iterator over a range of key/value pairs.
+    #[must_use]
+    pub fn range<R, BK>(&self, range: R) -> RangedIter<(K, V)>
+    where
+        R: RangeBounds<BK>,
+        K: Borrow<BK>,
+        BK: Ord + ?Sized,
+    {
+        RangedIter::new(&self.root, self.size, range)
+    }
+
+    /// Get an iterator over a map's keys.
+    #[must_use]
+    pub fn keys(&self) -> Keys<'_, K, V> {
+        Keys { it: self.iter() }
+    }
+
+    /// Get an iterator over a map's values.
+    #[must_use]
+    pub fn values(&self) -> Values<'_, K, V> {
+        Values { it: self.iter() }
+    }
+
+    /// Get an iterator over the differences between this map and
+    /// another, i.e. the set of entries to add, update, or remove to
+    /// this map in order to make it equal to the other map.
+    ///
+    /// This function will avoid visiting nodes which are shared
+    /// between the two maps, meaning that even very large maps can be
+    /// compared quickly if most of their structure is shared.
+    ///
+    /// Time: O(n) (where n is the number of unique elements across
+    /// the two maps, minus the number of elements belonging to nodes
+    /// shared between them)
+    #[must_use]
+    pub fn diff<'a>(&'a self, other: &'a Self) -> DiffIter<'a, (K, V)> {
+        DiffIter::new(&self.root, &other.root)
+    }
+
+    /// Get the value for a key from a map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map = ordmap!{123 => "lol"};
+    /// assert_eq!(
+    ///   map.get(&123),
+    ///   Some(&"lol")
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get<BK>(&self, key: &BK) -> Option<&V>
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.root.lookup(key).map(|(_, v)| v)
+    }
+
+    #[must_use]
+    fn get_mut<BK>(&mut self, key: &BK) -> Option<&mut V>
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        let root = Ref::make_mut(&mut self.root);
+        root.lookup_mut(key).map(|(_, v)| v)
+    }
+
+    /// Test for the presence of a key in a map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map = ordmap!{123 => "lol"};
+    /// assert!(
+    ///   map.contains_key(&123)
+    /// );
+    /// assert!(
+    ///   !map.contains_key(&321)
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn contains_key<BK>(&self, k: &BK) -> bool
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.get(k).is_some()
+    }
+
+    /// Insert a key/value mapping into a map.
+    ///
+    /// This is a copy-on-write operation, so that the parts of the
+    /// map's structure which are shared with other maps will be
+    /// safely copied before mutating.
+    ///
+    /// If the map already has a mapping for the given key, the
+    /// previous value is overwritten.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let mut map = ordmap!{};
+    /// map.insert(123, "123");
+    /// map.insert(456, "456");
+    /// assert_eq!(
+    ///   map,
+    ///   ordmap!{123 => "123", 456 => "456"}
+    /// );
+    /// # }
+    /// ```
+    ///
+    /// [insert]: #method.insert
+    #[inline]
+    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
+        let new_root = {
+            let root = Ref::make_mut(&mut self.root);
+            match root.insert((key, value)) {
+                Insert::Replaced((_, old_value)) => return Some(old_value),
+                Insert::Added => {
+                    self.size += 1;
+                    return None;
+                }
+                Insert::Update(root) => Ref::from(root),
+                Insert::Split(left, median, right) => {
+                    Ref::from(Node::from_split(left, median, right))
+                }
+            }
+        };
+        self.size += 1;
+        self.root = new_root;
+        None
+    }
+
+    /// Remove a key/value mapping from a map if it exists.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let mut map = ordmap!{123 => "123", 456 => "456"};
+    /// map.remove(&123);
+    /// map.remove(&456);
+    /// assert!(map.is_empty());
+    /// # }
+    /// ```
+    ///
+    /// [remove]: #method.remove
+    #[inline]
+    pub fn remove<BK>(&mut self, k: &BK) -> Option<V>
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.remove_with_key(k).map(|(_, v)| v)
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed key and value.
+    ///
+    /// Time: O(log n)
+    pub fn remove_with_key<BK>(&mut self, k: &BK) -> Option<(K, V)>
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        let (new_root, removed_value) = {
+            let root = Ref::make_mut(&mut self.root);
+            match root.remove(k) {
+                Remove::NoChange => return None,
+                Remove::Removed(pair) => {
+                    self.size -= 1;
+                    return Some(pair);
+                }
+                Remove::Update(pair, root) => (Ref::from(root), Some(pair)),
+            }
+        };
+        self.size -= 1;
+        self.root = new_root;
+        removed_value
+    }
+
+    /// Discard all elements from the map.
+    ///
+    /// This leaves you with an empty map, and all elements that
+    /// were previously inside it are dropped.
+    ///
+    /// Time: O(n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::OrdMap;
+    /// # fn main() {
+    /// let mut map = ordmap![1=>1, 2=>2, 3=>3];
+    /// map.clear();
+    /// assert!(map.is_empty());
+    /// # }
+    /// ```
+    pub fn clear(&mut self) {
+        if !self.is_empty() {
+            self.root = Default::default();
+            self.size = 0;
+        }
+    }
+
+    /// Construct a new map by inserting a key/value mapping into a
+    /// map.
+    ///
+    /// If the map already has a mapping for the given key, the
+    /// previous value is overwritten.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map = ordmap!{};
+    /// assert_eq!(
+    ///   map.update(123, "123"),
+    ///   ordmap!{123 => "123"}
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn update(&self, key: K, value: V) -> Self {
+        let mut out = self.clone();
+        out.insert(key, value);
+        out
+    }
+
+    /// Construct a new map by inserting a key/value mapping into a
+    /// map.
+    ///
+    /// If the map already has a mapping for the given key, we call
+    /// the provided function with the old value and the new value,
+    /// and insert the result as the new value.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn update_with<F>(self, k: K, v: V, f: F) -> Self
+    where
+        F: FnOnce(V, V) -> V,
+    {
+        self.update_with_key(k, v, |_, v1, v2| f(v1, v2))
+    }
+
+    /// Construct a new map by inserting a key/value mapping into a
+    /// map.
+    ///
+    /// If the map already has a mapping for the given key, we call
+    /// the provided function with the key, the old value and the new
+    /// value, and insert the result as the new value.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn update_with_key<F>(self, k: K, v: V, f: F) -> Self
+    where
+        F: FnOnce(&K, V, V) -> V,
+    {
+        match self.extract_with_key(&k) {
+            None => self.update(k, v),
+            Some((_, v2, m)) => {
+                let out_v = f(&k, v2, v);
+                m.update(k, out_v)
+            }
+        }
+    }
+
+    /// Construct a new map by inserting a key/value mapping into a
+    /// map, returning the old value for the key as well as the new
+    /// map.
+    ///
+    /// If the map already has a mapping for the given key, we call
+    /// the provided function with the key, the old value and the new
+    /// value, and insert the result as the new value.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn update_lookup_with_key<F>(self, k: K, v: V, f: F) -> (Option<V>, Self)
+    where
+        F: FnOnce(&K, &V, V) -> V,
+    {
+        match self.extract_with_key(&k) {
+            None => (None, self.update(k, v)),
+            Some((_, v2, m)) => {
+                let out_v = f(&k, &v2, v);
+                (Some(v2), m.update(k, out_v))
+            }
+        }
+    }
+
+    /// Update the value for a given key by calling a function with
+    /// the current value and overwriting it with the function's
+    /// return value.
+    ///
+    /// The function gets an [`Option<V>`][std::option::Option] and
+    /// returns the same, so that it can decide to delete a mapping
+    /// instead of updating the value, and decide what to do if the
+    /// key isn't in the map.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [std::option::Option]: https://doc.rust-lang.org/std/option/enum.Option.html
+    #[must_use]
+    pub fn alter<F>(&self, f: F, k: K) -> Self
+    where
+        F: FnOnce(Option<V>) -> Option<V>,
+    {
+        let pop = self.extract_with_key(&k);
+        match (f(pop.as_ref().map(|&(_, ref v, _)| v.clone())), pop) {
+            (None, None) => self.clone(),
+            (Some(v), None) => self.update(k, v),
+            (None, Some((_, _, m))) => m,
+            (Some(v), Some((_, _, m))) => m.update(k, v),
+        }
+    }
+
+    /// Remove a key/value pair from a map, if it exists.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn without<BK>(&self, k: &BK) -> Self
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.extract(k)
+            .map(|(_, m)| m)
+            .unwrap_or_else(|| self.clone())
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed value as well as the updated list.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn extract<BK>(&self, k: &BK) -> Option<(V, Self)>
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        self.extract_with_key(k).map(|(_, v, m)| (v, m))
+    }
+
+    /// Remove a key/value pair from a map, if it exists, and return
+    /// the removed key and value as well as the updated list.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn extract_with_key<BK>(&self, k: &BK) -> Option<(K, V, Self)>
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        let mut out = self.clone();
+        let result = out.remove_with_key(k);
+        result.map(|(k, v)| (k, v, out))
+    }
+
+    /// Construct the union of two maps, keeping the values in the
+    /// current map when keys exist in both maps.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 3 => 3};
+    /// let map2 = ordmap!{2 => 2, 3 => 4};
+    /// let expected = ordmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert_eq!(expected, map1.union(map2));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn union(mut self, other: Self) -> Self {
+        for (k, v) in other {
+            self.entry(k).or_insert(v);
+        }
+        self
+    }
+
+    /// Construct the union of two maps, using a function to decide
+    /// what to do with the value when a key is in both maps.
+    ///
+    /// The function is called when a value exists in both maps, and
+    /// receives the value from the current map as its first argument,
+    /// and the value from the other map as the second. It should
+    /// return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    #[inline]
+    #[must_use]
+    pub fn union_with<F>(self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(V, V) -> V,
+    {
+        self.union_with_key(other, |_, v1, v2| f(v1, v2))
+    }
+
+    /// Construct the union of two maps, using a function to decide
+    /// what to do with the value when a key is in both maps.
+    ///
+    /// The function is called when a value exists in both maps, and
+    /// receives a reference to the key as its first argument, the
+    /// value from the current map as the second argument, and the
+    /// value from the other map as the third argument. It should
+    /// return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 3 => 4};
+    /// let map2 = ordmap!{2 => 2, 3 => 5};
+    /// let expected = ordmap!{1 => 1, 2 => 2, 3 => 9};
+    /// assert_eq!(expected, map1.union_with_key(
+    ///     map2,
+    ///     |key, left, right| left + right
+    /// ));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn union_with_key<F>(mut self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(&K, V, V) -> V,
+    {
+        for (key, right_value) in other {
+            match self.remove(&key) {
+                None => {
+                    self.insert(key, right_value);
+                }
+                Some(left_value) => {
+                    let final_value = f(&key, left_value, right_value);
+                    self.insert(key, final_value);
+                }
+            }
+        }
+        self
+    }
+
+    /// Construct the union of a sequence of maps, selecting the value
+    /// of the leftmost when a key appears in more than one map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 3 => 3};
+    /// let map2 = ordmap!{2 => 2};
+    /// let expected = ordmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert_eq!(expected, OrdMap::unions(vec![map1, map2]));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn unions<I>(i: I) -> Self
+    where
+        I: IntoIterator<Item = Self>,
+    {
+        i.into_iter().fold(Self::default(), |a, b| a.union(b))
+    }
+
+    /// Construct the union of a sequence of maps, using a function to
+    /// decide what to do with the value when a key is in more than
+    /// one map.
+    ///
+    /// The function is called when a value exists in multiple maps,
+    /// and receives the value from the current map as its first
+    /// argument, and the value from the next map as the second. It
+    /// should return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn unions_with<I, F>(i: I, f: F) -> Self
+    where
+        I: IntoIterator<Item = Self>,
+        F: Fn(V, V) -> V,
+    {
+        i.into_iter()
+            .fold(Self::default(), |a, b| a.union_with(b, &f))
+    }
+
+    /// Construct the union of a sequence of maps, using a function to
+    /// decide what to do with the value when a key is in more than
+    /// one map.
+    ///
+    /// The function is called when a value exists in multiple maps,
+    /// and receives a reference to the key as its first argument, the
+    /// value from the current map as the second argument, and the
+    /// value from the next map as the third argument. It should
+    /// return the value to be inserted in the resulting map.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn unions_with_key<I, F>(i: I, f: F) -> Self
+    where
+        I: IntoIterator<Item = Self>,
+        F: Fn(&K, V, V) -> V,
+    {
+        i.into_iter()
+            .fold(Self::default(), |a, b| a.union_with_key(b, &f))
+    }
+
+    /// Construct the difference between two maps by discarding keys
+    /// which occur in both maps.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 3 => 4};
+    /// let map2 = ordmap!{2 => 2, 3 => 5};
+    /// let expected = ordmap!{1 => 1, 2 => 2};
+    /// assert_eq!(expected, map1.difference(map2));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn difference(self, other: Self) -> Self {
+        self.difference_with_key(other, |_, _, _| None)
+    }
+
+    /// Construct the difference between two maps by using a function
+    /// to decide what to do if a key occurs in both.
+    ///
+    /// Time: O(n log n)
+    #[inline]
+    #[must_use]
+    pub fn difference_with<F>(self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(V, V) -> Option<V>,
+    {
+        self.difference_with_key(other, |_, a, b| f(a, b))
+    }
+
+    /// Construct the difference between two maps by using a function
+    /// to decide what to do if a key occurs in both. The function
+    /// receives the key as well as both values.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 3 => 4};
+    /// let map2 = ordmap!{2 => 2, 3 => 5};
+    /// let expected = ordmap!{1 => 1, 2 => 2, 3 => 9};
+    /// assert_eq!(expected, map1.difference_with_key(
+    ///     map2,
+    ///     |key, left, right| Some(left + right)
+    /// ));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn difference_with_key<F>(mut self, other: Self, mut f: F) -> Self
+    where
+        F: FnMut(&K, V, V) -> Option<V>,
+    {
+        let mut out = Self::default();
+        for (key, right_value) in other {
+            match self.remove(&key) {
+                None => {
+                    out.insert(key, right_value);
+                }
+                Some(left_value) => {
+                    if let Some(final_value) = f(&key, left_value, right_value) {
+                        out.insert(key, final_value);
+                    }
+                }
+            }
+        }
+        out.union(self)
+    }
+
+    /// Construct the intersection of two maps, keeping the values
+    /// from the current map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 2 => 2};
+    /// let map2 = ordmap!{2 => 3, 3 => 4};
+    /// let expected = ordmap!{2 => 2};
+    /// assert_eq!(expected, map1.intersection(map2));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn intersection(self, other: Self) -> Self {
+        self.intersection_with_key(other, |_, v, _| v)
+    }
+
+    /// Construct the intersection of two maps, calling a function
+    /// with both values for each key and using the result as the
+    /// value for the key.
+    ///
+    /// Time: O(n log n)
+    #[inline]
+    #[must_use]
+    pub fn intersection_with<B, C, F>(self, other: OrdMap<K, B>, mut f: F) -> OrdMap<K, C>
+    where
+        B: Clone,
+        C: Clone,
+        F: FnMut(V, B) -> C,
+    {
+        self.intersection_with_key(other, |_, v1, v2| f(v1, v2))
+    }
+
+    /// Construct the intersection of two maps, calling a function
+    /// with the key and both values for each key and using the result
+    /// as the value for the key.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 2 => 2};
+    /// let map2 = ordmap!{2 => 3, 3 => 4};
+    /// let expected = ordmap!{2 => 5};
+    /// assert_eq!(expected, map1.intersection_with_key(
+    ///     map2,
+    ///     |key, left, right| left + right
+    /// ));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn intersection_with_key<B, C, F>(mut self, other: OrdMap<K, B>, mut f: F) -> OrdMap<K, C>
+    where
+        B: Clone,
+        C: Clone,
+        F: FnMut(&K, V, B) -> C,
+    {
+        let mut out = OrdMap::<K, C>::default();
+        for (key, right_value) in other {
+            match self.remove(&key) {
+                None => (),
+                Some(left_value) => {
+                    let result = f(&key, left_value, right_value);
+                    out.insert(key, result);
+                }
+            }
+        }
+        out
+    }
+
+    /// Test whether a map is a submap of another map, meaning that
+    /// all keys in our map must also be in the other map, with the
+    /// same values.
+    ///
+    /// Use the provided function to decide whether values are equal.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_submap_by<B, RM, F>(&self, other: RM, mut cmp: F) -> bool
+    where
+        B: Clone,
+        F: FnMut(&V, &B) -> bool,
+        RM: Borrow<OrdMap<K, B>>,
+    {
+        self.iter()
+            .all(|(k, v)| other.borrow().get(k).map(|ov| cmp(v, ov)).unwrap_or(false))
+    }
+
+    /// Test whether a map is a proper submap of another map, meaning
+    /// that all keys in our map must also be in the other map, with
+    /// the same values. To be a proper submap, ours must also contain
+    /// fewer keys than the other map.
+    ///
+    /// Use the provided function to decide whether values are equal.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_proper_submap_by<B, RM, F>(&self, other: RM, cmp: F) -> bool
+    where
+        B: Clone,
+        F: FnMut(&V, &B) -> bool,
+        RM: Borrow<OrdMap<K, B>>,
+    {
+        self.len() != other.borrow().len() && self.is_submap_by(other, cmp)
+    }
+
+    /// Test whether a map is a submap of another map, meaning that
+    /// all keys in our map must also be in the other map, with the
+    /// same values.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 2 => 2};
+    /// let map2 = ordmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert!(map1.is_submap(map2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn is_submap<RM>(&self, other: RM) -> bool
+    where
+        V: PartialEq,
+        RM: Borrow<Self>,
+    {
+        self.is_submap_by(other.borrow(), PartialEq::eq)
+    }
+
+    /// Test whether a map is a proper submap of another map, meaning
+    /// that all keys in our map must also be in the other map, with
+    /// the same values. To be a proper submap, ours must also contain
+    /// fewer keys than the other map.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordmap::OrdMap;
+    /// # fn main() {
+    /// let map1 = ordmap!{1 => 1, 2 => 2};
+    /// let map2 = ordmap!{1 => 1, 2 => 2, 3 => 3};
+    /// assert!(map1.is_proper_submap(map2));
+    ///
+    /// let map3 = ordmap!{1 => 1, 2 => 2};
+    /// let map4 = ordmap!{1 => 1, 2 => 2};
+    /// assert!(!map3.is_proper_submap(map4));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn is_proper_submap<RM>(&self, other: RM) -> bool
+    where
+        V: PartialEq,
+        RM: Borrow<Self>,
+    {
+        self.is_proper_submap_by(other.borrow(), PartialEq::eq)
+    }
+
+    /// Split a map into two, with the left hand map containing keys
+    /// which are smaller than `split`, and the right hand map
+    /// containing keys which are larger than `split`.
+    ///
+    /// The `split` mapping is discarded.
+    #[must_use]
+    pub fn split<BK>(&self, split: &BK) -> (Self, Self)
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        let (l, _, r) = self.split_lookup(split);
+        (l, r)
+    }
+
+    /// Split a map into two, with the left hand map containing keys
+    /// which are smaller than `split`, and the right hand map
+    /// containing keys which are larger than `split`.
+    ///
+    /// Returns both the two maps and the value of `split`.
+    #[must_use]
+    pub fn split_lookup<BK>(&self, split: &BK) -> (Self, Option<V>, Self)
+    where
+        BK: Ord + ?Sized,
+        K: Borrow<BK>,
+    {
+        // TODO this is atrociously slow, got to be a better way
+        self.iter()
+            .fold((ordmap![], None, ordmap![]), |(l, m, r), (k, v)| {
+                match k.borrow().cmp(split) {
+                    Ordering::Less => (l.update(k.clone(), v.clone()), m, r),
+                    Ordering::Equal => (l, Some(v.clone()), r),
+                    Ordering::Greater => (l, m, r.update(k.clone(), v.clone())),
+                }
+            })
+    }
+
+    /// Construct a map with only the `n` smallest keys from a given
+    /// map.
+    #[must_use]
+    pub fn take(&self, n: usize) -> Self {
+        self.iter().take(n).cloned().collect()
+    }
+
+    /// Construct a map with the `n` smallest keys removed from a
+    /// given map.
+    #[must_use]
+    pub fn skip(&self, n: usize) -> Self {
+        self.iter().skip(n).cloned().collect()
+    }
+
+    /// Remove the smallest key from a map, and return its value as
+    /// well as the updated map.
+    #[must_use]
+    pub fn without_min(&self) -> (Option<V>, Self) {
+        let (pop, next) = self.without_min_with_key();
+        (pop.map(|(_, v)| v), next)
+    }
+
+    /// Remove the smallest key from a map, and return that key, its
+    /// value as well as the updated map.
+    #[must_use]
+    pub fn without_min_with_key(&self) -> (Option<(K, V)>, Self) {
+        match self.get_min() {
+            None => (None, self.clone()),
+            Some((k, _)) => {
+                let (key, value, next) = self.extract_with_key(k).unwrap();
+                (Some((key, value)), next)
+            }
+        }
+    }
+
+    /// Remove the largest key from a map, and return its value as
+    /// well as the updated map.
+    #[must_use]
+    pub fn without_max(&self) -> (Option<V>, Self) {
+        let (pop, next) = self.without_max_with_key();
+        (pop.map(|(_, v)| v), next)
+    }
+
+    /// Remove the largest key from a map, and return that key, its
+    /// value as well as the updated map.
+    #[must_use]
+    pub fn without_max_with_key(&self) -> (Option<(K, V)>, Self) {
+        match self.get_max() {
+            None => (None, self.clone()),
+            Some((k, _)) => {
+                let (key, value, next) = self.extract_with_key(k).unwrap();
+                (Some((key, value)), next)
+            }
+        }
+    }
+
+    /// Get the [`Entry`][Entry] for a key in the map for in-place manipulation.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [Entry]: enum.Entry.html
+    #[must_use]
+    pub fn entry(&mut self, key: K) -> Entry<'_, K, V> {
+        if self.contains_key(&key) {
+            Entry::Occupied(OccupiedEntry { map: self, key })
+        } else {
+            Entry::Vacant(VacantEntry { map: self, key })
+        }
+    }
+}
+
+// Entries
+
+/// A handle for a key and its associated value.
+pub enum Entry<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    Occupied(OccupiedEntry<'a, K, V>),
+    Vacant(VacantEntry<'a, K, V>),
+}
+
+impl<'a, K, V> Entry<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    /// Insert the default value provided if there was no value
+    /// already, and return a mutable reference to the value.
+    pub fn or_insert(self, default: V) -> &'a mut V {
+        self.or_insert_with(|| default)
+    }
+
+    /// Insert the default value from the provided function if there
+    /// was no value already, and return a mutable reference to the
+    /// value.
+    pub fn or_insert_with<F>(self, default: F) -> &'a mut V
+    where
+        F: FnOnce() -> V,
+    {
+        match self {
+            Entry::Occupied(entry) => entry.into_mut(),
+            Entry::Vacant(entry) => entry.insert(default()),
+        }
+    }
+
+    /// Insert a default value if there was no value already, and
+    /// return a mutable reference to the value.
+    pub fn or_default(self) -> &'a mut V
+    where
+        V: Default,
+    {
+        self.or_insert_with(Default::default)
+    }
+
+    /// Get the key for this entry.
+    #[must_use]
+    pub fn key(&self) -> &K {
+        match self {
+            Entry::Occupied(entry) => entry.key(),
+            Entry::Vacant(entry) => entry.key(),
+        }
+    }
+
+    /// Call the provided function to modify the value if the value
+    /// exists.
+    pub fn and_modify<F>(mut self, f: F) -> Self
+    where
+        F: FnOnce(&mut V),
+    {
+        match &mut self {
+            Entry::Occupied(ref mut entry) => f(entry.get_mut()),
+            Entry::Vacant(_) => (),
+        }
+        self
+    }
+}
+
+/// An entry for a mapping that already exists in the map.
+pub struct OccupiedEntry<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    map: &'a mut OrdMap<K, V>,
+    key: K,
+}
+
+impl<'a, K, V> OccupiedEntry<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    /// Get the key for this entry.
+    #[must_use]
+    pub fn key(&self) -> &K {
+        &self.key
+    }
+
+    /// Remove this entry from the map and return the removed mapping.
+    pub fn remove_entry(self) -> (K, V) {
+        self.map
+            .remove_with_key(&self.key)
+            .expect("ordmap::OccupiedEntry::remove_entry: key has vanished!")
+    }
+
+    /// Get the current value.
+    #[must_use]
+    pub fn get(&self) -> &V {
+        self.map.get(&self.key).unwrap()
+    }
+
+    /// Get a mutable reference to the current value.
+    #[must_use]
+    pub fn get_mut(&mut self) -> &mut V {
+        self.map.get_mut(&self.key).unwrap()
+    }
+
+    /// Convert this entry into a mutable reference.
+    #[must_use]
+    pub fn into_mut(self) -> &'a mut V {
+        self.map.get_mut(&self.key).unwrap()
+    }
+
+    /// Overwrite the current value.
+    pub fn insert(&mut self, value: V) -> V {
+        mem::replace(self.get_mut(), value)
+    }
+
+    /// Remove this entry from the map and return the removed value.
+    pub fn remove(self) -> V {
+        self.remove_entry().1
+    }
+}
+
+/// An entry for a mapping that does not already exist in the map.
+pub struct VacantEntry<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    map: &'a mut OrdMap<K, V>,
+    key: K,
+}
+
+impl<'a, K, V> VacantEntry<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    /// Get the key for this entry.
+    #[must_use]
+    pub fn key(&self) -> &K {
+        &self.key
+    }
+
+    /// Convert this entry into its key.
+    #[must_use]
+    pub fn into_key(self) -> K {
+        self.key
+    }
+
+    /// Insert a value into this entry.
+    pub fn insert(self, value: V) -> &'a mut V {
+        self.map.insert(self.key.clone(), value);
+        // TODO insert_mut ought to return this reference
+        self.map.get_mut(&self.key).unwrap()
+    }
+}
+
+// Core traits
+
+impl<K, V> Clone for OrdMap<K, V> {
+    fn clone(&self) -> Self {
+        OrdMap {
+            size: self.size,
+            root: self.root.clone(),
+        }
+    }
+}
+
+#[cfg(not(has_specialisation))]
+impl<K, V> PartialEq for OrdMap<K, V>
+where
+    K: Ord + PartialEq + Clone,
+    V: PartialEq + Clone,
+{
+    fn eq(&self, other: &Self) -> bool {
+        self.len() == other.len() && self.diff(other).next().is_none()
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K, V> PartialEq for OrdMap<K, V>
+where
+    K: Ord + Clone + PartialEq,
+    V: Clone + PartialEq,
+{
+    default fn eq(&self, other: &Self) -> bool {
+        self.len() == other.len() && self.diff(other).next().is_none()
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<K, V> PartialEq for OrdMap<K, V>
+where
+    K: Ord + Eq + Clone,
+    V: Eq + Clone,
+{
+    fn eq(&self, other: &Self) -> bool {
+        Ref::ptr_eq(&self.root, &other.root)
+            || (self.len() == other.len() && self.diff(other).next().is_none())
+    }
+}
+
+impl<K: Ord + Clone + Eq, V: Clone + Eq> Eq for OrdMap<K, V> {}
+
+impl<K, V> PartialOrd for OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: PartialOrd + Clone,
+{
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.iter().partial_cmp(other.iter())
+    }
+}
+
+impl<K, V> Ord for OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Ord + Clone,
+{
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.iter().cmp(other.iter())
+    }
+}
+
+impl<K, V> Hash for OrdMap<K, V>
+where
+    K: Ord + Clone + Hash,
+    V: Clone + Hash,
+{
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: Hasher,
+    {
+        for i in self.iter() {
+            i.hash(state);
+        }
+    }
+}
+
+impl<K, V> Default for OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<'a, K, V> Add for &'a OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    type Output = OrdMap<K, V>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.clone().union(other.clone())
+    }
+}
+
+impl<K, V> Add for OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    type Output = OrdMap<K, V>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.union(other)
+    }
+}
+
+impl<K, V> Sum for OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    fn sum<I>(it: I) -> Self
+    where
+        I: Iterator<Item = Self>,
+    {
+        it.fold(Self::default(), |a, b| a + b)
+    }
+}
+
+impl<K, V, RK, RV> Extend<(RK, RV)> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<RK>,
+    V: Clone + From<RV>,
+{
+    fn extend<I>(&mut self, iter: I)
+    where
+        I: IntoIterator<Item = (RK, RV)>,
+    {
+        for (key, value) in iter {
+            self.insert(From::from(key), From::from(value));
+        }
+    }
+}
+
+impl<'a, BK, K, V> Index<&'a BK> for OrdMap<K, V>
+where
+    BK: Ord + ?Sized,
+    K: Ord + Clone + Borrow<BK>,
+    V: Clone,
+{
+    type Output = V;
+
+    fn index(&self, key: &BK) -> &Self::Output {
+        match self.root.lookup(key) {
+            None => panic!("OrdMap::index: invalid key"),
+            Some(&(_, ref value)) => value,
+        }
+    }
+}
+
+impl<'a, BK, K, V> IndexMut<&'a BK> for OrdMap<K, V>
+where
+    BK: Ord + ?Sized,
+    K: Ord + Clone + Borrow<BK>,
+    V: Clone,
+{
+    fn index_mut(&mut self, key: &BK) -> &mut Self::Output {
+        let root = Ref::make_mut(&mut self.root);
+        match root.lookup_mut(key) {
+            None => panic!("OrdMap::index: invalid key"),
+            Some(&mut (_, ref mut value)) => value,
+        }
+    }
+}
+
+impl<K, V> Debug for OrdMap<K, V>
+where
+    K: Ord + Clone + Debug,
+    V: Clone + Debug,
+{
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        let mut d = f.debug_map();
+        for (k, v) in self {
+            d.entry(k, v);
+        }
+        d.finish()
+    }
+}
+
+// Iterators
+
+pub struct Iter<'a, A: 'a> {
+    it: RangedIter<'a, A>,
+}
+
+impl<'a, A> Iterator for Iter<'a, A>
+where
+    A: 'a + BTreeValue,
+{
+    type Item = &'a A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.it.remaining, Some(self.it.remaining))
+    }
+}
+
+impl<'a, A> DoubleEndedIterator for Iter<'a, A>
+where
+    A: 'a + BTreeValue,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.it.next_back()
+    }
+}
+
+impl<'a, A> ExactSizeIterator for Iter<'a, A> where A: 'a + BTreeValue {}
+
+pub struct Keys<'a, K: 'a, V: 'a> {
+    it: Iter<'a, (K, V)>,
+}
+
+impl<'a, K, V> Iterator for Keys<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    type Item = &'a K;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.it.next() {
+            None => None,
+            Some((k, _)) => Some(k),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, K, V> DoubleEndedIterator for Keys<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        match self.it.next_back() {
+            None => None,
+            Some((k, _)) => Some(k),
+        }
+    }
+}
+
+impl<'a, K, V> ExactSizeIterator for Keys<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+}
+
+pub struct Values<'a, K: 'a, V: 'a> {
+    it: Iter<'a, (K, V)>,
+}
+
+impl<'a, K, V> Iterator for Values<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    type Item = &'a V;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.it.next() {
+            None => None,
+            Some((_, v)) => Some(v),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, K, V> DoubleEndedIterator for Values<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        match self.it.next_back() {
+            None => None,
+            Some((_, v)) => Some(v),
+        }
+    }
+}
+
+impl<'a, K, V> ExactSizeIterator for Values<'a, K, V>
+where
+    K: 'a + Ord + Clone,
+    V: 'a + Clone,
+{
+}
+
+impl<K, V, RK, RV> FromIterator<(RK, RV)> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<RK>,
+    V: Clone + From<RV>,
+{
+    fn from_iter<T>(i: T) -> Self
+    where
+        T: IntoIterator<Item = (RK, RV)>,
+    {
+        let mut m = OrdMap::default();
+        for (k, v) in i {
+            m.insert(From::from(k), From::from(v));
+        }
+        m
+    }
+}
+
+impl<'a, K, V> IntoIterator for &'a OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    type Item = &'a (K, V);
+    type IntoIter = Iter<'a, (K, V)>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<K, V> IntoIterator for OrdMap<K, V>
+where
+    K: Ord + Clone,
+    V: Clone,
+{
+    type Item = (K, V);
+    type IntoIter = ConsumingIter<(K, V)>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        ConsumingIter::new(&self.root, self.size)
+    }
+}
+
+// Conversions
+
+impl<K, V> AsRef<OrdMap<K, V>> for OrdMap<K, V> {
+    fn as_ref(&self) -> &Self {
+        self
+    }
+}
+
+impl<'m, 'k, 'v, K, V, OK, OV> From<&'m OrdMap<&'k K, &'v V>> for OrdMap<OK, OV>
+where
+    K: Ord + ToOwned<Owned = OK> + ?Sized,
+    V: ToOwned<Owned = OV> + ?Sized,
+    OK: Ord + Clone + Borrow<K>,
+    OV: Clone + Borrow<V>,
+{
+    fn from(m: &OrdMap<&K, &V>) -> Self {
+        m.iter()
+            .map(|(k, v)| ((*k).to_owned(), (*v).to_owned()))
+            .collect()
+    }
+}
+
+impl<'a, K, V, RK, RV, OK, OV> From<&'a [(RK, RV)]> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<OK>,
+    V: Clone + From<OV>,
+    OK: Borrow<RK>,
+    OV: Borrow<RV>,
+    RK: ToOwned<Owned = OK>,
+    RV: ToOwned<Owned = OV>,
+{
+    fn from(m: &'a [(RK, RV)]) -> OrdMap<K, V> {
+        m.iter()
+            .map(|&(ref k, ref v)| (k.to_owned(), v.to_owned()))
+            .collect()
+    }
+}
+
+impl<K, V, RK, RV> From<Vec<(RK, RV)>> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<RK>,
+    V: Clone + From<RV>,
+{
+    fn from(m: Vec<(RK, RV)>) -> OrdMap<K, V> {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K: Ord, V, RK, RV, OK, OV> From<&'a Vec<(RK, RV)>> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<OK>,
+    V: Clone + From<OV>,
+    OK: Borrow<RK>,
+    OV: Borrow<RV>,
+    RK: ToOwned<Owned = OK>,
+    RV: ToOwned<Owned = OV>,
+{
+    fn from(m: &'a Vec<(RK, RV)>) -> OrdMap<K, V> {
+        m.iter()
+            .map(|&(ref k, ref v)| (k.to_owned(), v.to_owned()))
+            .collect()
+    }
+}
+
+impl<K: Ord, V, RK: Eq + Hash, RV> From<collections::HashMap<RK, RV>> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<RK>,
+    V: Clone + From<RV>,
+{
+    fn from(m: collections::HashMap<RK, RV>) -> OrdMap<K, V> {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K, V, OK, OV, RK, RV> From<&'a collections::HashMap<RK, RV>> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<OK>,
+    V: Clone + From<OV>,
+    OK: Borrow<RK>,
+    OV: Borrow<RV>,
+    RK: Hash + Eq + ToOwned<Owned = OK>,
+    RV: ToOwned<Owned = OV>,
+{
+    fn from(m: &'a collections::HashMap<RK, RV>) -> OrdMap<K, V> {
+        m.iter()
+            .map(|(k, v)| (k.to_owned(), v.to_owned()))
+            .collect()
+    }
+}
+
+impl<K: Ord, V, RK, RV> From<collections::BTreeMap<RK, RV>> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<RK>,
+    V: Clone + From<RV>,
+{
+    fn from(m: collections::BTreeMap<RK, RV>) -> OrdMap<K, V> {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K: Ord, V, RK, RV, OK, OV> From<&'a collections::BTreeMap<RK, RV>> for OrdMap<K, V>
+where
+    K: Ord + Clone + From<OK>,
+    V: Clone + From<OV>,
+    OK: Borrow<RK>,
+    OV: Borrow<RV>,
+    RK: Ord + ToOwned<Owned = OK>,
+    RV: ToOwned<Owned = OV>,
+{
+    fn from(m: &'a collections::BTreeMap<RK, RV>) -> OrdMap<K, V> {
+        m.iter()
+            .map(|(k, v)| (k.to_owned(), v.to_owned()))
+            .collect()
+    }
+}
+
+impl<K: Ord + Hash + Eq + Clone, V: Clone, S: BuildHasher> From<HashMap<K, V, S>> for OrdMap<K, V> {
+    fn from(m: HashMap<K, V, S>) -> Self {
+        m.into_iter().collect()
+    }
+}
+
+impl<'a, K: Ord + Hash + Eq + Clone, V: Clone, S: BuildHasher> From<&'a HashMap<K, V, S>>
+    for OrdMap<K, V>
+{
+    fn from(m: &'a HashMap<K, V, S>) -> Self {
+        m.iter().cloned().collect()
+    }
+}
+
+// QuickCheck
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+use quickcheck::{Arbitrary, Gen};
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+impl<K: Ord + Clone + Arbitrary + Sync, V: Clone + Arbitrary + Sync> Arbitrary for OrdMap<K, V> {
+    fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        OrdMap::from_iter(Vec::<(K, V)>::arbitrary(g))
+    }
+}
+
+// Proptest
+
+#[cfg(any(test, feature = "proptest"))]
+pub mod proptest {
+    use super::*;
+    use proptest::strategy::{BoxedStrategy, Strategy, ValueTree};
+    use std::ops::Range;
+
+    /// A strategy for a map of a given size.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// proptest! {
+    ///     #[test]
+    ///     fn proptest_works(ref m in map(0..9999, ".*", 10..100)) {
+    ///         assert!(m.len() < 100);
+    ///         assert!(m.len() >= 10);
+    ///     }
+    /// }
+    /// ```
+    pub fn ord_map<K: Strategy + 'static, V: Strategy + 'static>(
+        key: K,
+        value: V,
+        size: Range<usize>,
+    ) -> BoxedStrategy<OrdMap<<K::Tree as ValueTree>::Value, <V::Tree as ValueTree>::Value>>
+    where
+        <K::Tree as ValueTree>::Value: Ord + Clone,
+        <V::Tree as ValueTree>::Value: Clone,
+    {
+        ::proptest::collection::vec((key, value), size.clone())
+            .prop_map(OrdMap::from)
+            .prop_filter("OrdMap minimum size".to_owned(), move |m| {
+                m.len() >= size.start
+            })
+            .boxed()
+    }
+}
+
+// Tests
+
+#[cfg(test)]
+mod test {
+    use super::proptest::*;
+    use super::*;
+    use nodes::btree::DiffItem;
+    use proptest::bool;
+    use proptest::collection;
+    use proptest::num::{i16, usize};
+    use test::is_sorted;
+
+    #[test]
+    fn iterates_in_order() {
+        let map = ordmap! {
+            2 => 22,
+            1 => 11,
+            3 => 33,
+            8 => 88,
+            9 => 99,
+            4 => 44,
+            5 => 55,
+            7 => 77,
+            6 => 66
+        };
+        let mut it = map.iter();
+        assert_eq!(it.next(), Some(&(1, 11)));
+        assert_eq!(it.next(), Some(&(2, 22)));
+        assert_eq!(it.next(), Some(&(3, 33)));
+        assert_eq!(it.next(), Some(&(4, 44)));
+        assert_eq!(it.next(), Some(&(5, 55)));
+        assert_eq!(it.next(), Some(&(6, 66)));
+        assert_eq!(it.next(), Some(&(7, 77)));
+        assert_eq!(it.next(), Some(&(8, 88)));
+        assert_eq!(it.next(), Some(&(9, 99)));
+        assert_eq!(it.next(), None);
+    }
+
+    #[test]
+    fn into_iter() {
+        let map = ordmap! {
+            2 => 22,
+            1 => 11,
+            3 => 33,
+            8 => 88,
+            9 => 99,
+            4 => 44,
+            5 => 55,
+            7 => 77,
+            6 => 66
+        };
+        let mut vec = vec![];
+        for (k, v) in map {
+            assert_eq!(k * 11, v);
+            vec.push(k)
+        }
+        assert_eq!(vec, vec![1, 2, 3, 4, 5, 6, 7, 8, 9]);
+    }
+
+    #[test]
+    fn deletes_correctly() {
+        let map = ordmap! {
+            2 => 22,
+            1 => 11,
+            3 => 33,
+            8 => 88,
+            9 => 99,
+            4 => 44,
+            5 => 55,
+            7 => 77,
+            6 => 66
+        };
+        assert_eq!(map.extract(&11), None);
+        let (popped, less) = map.extract(&5).unwrap();
+        assert_eq!(popped, 55);
+        let mut it = less.iter();
+        assert_eq!(it.next(), Some(&(1, 11)));
+        assert_eq!(it.next(), Some(&(2, 22)));
+        assert_eq!(it.next(), Some(&(3, 33)));
+        assert_eq!(it.next(), Some(&(4, 44)));
+        assert_eq!(it.next(), Some(&(6, 66)));
+        assert_eq!(it.next(), Some(&(7, 77)));
+        assert_eq!(it.next(), Some(&(8, 88)));
+        assert_eq!(it.next(), Some(&(9, 99)));
+        assert_eq!(it.next(), None);
+    }
+
+    #[test]
+    fn debug_output() {
+        assert_eq!(
+            format!("{:?}", ordmap! { 3 => 4, 5 => 6, 1 => 2 }),
+            "{1: 2, 3: 4, 5: 6}"
+        );
+    }
+
+    #[test]
+    fn equality2() {
+        let v1 = "1".to_string();
+        let v2 = "1".to_string();
+        assert_eq!(v1, v2);
+        let p1 = Vec::<String>::new();
+        let p2 = Vec::<String>::new();
+        assert_eq!(p1, p2);
+        let c1 = OrdMap::singleton(v1, p1);
+        let c2 = OrdMap::singleton(v2, p2);
+        assert_eq!(c1, c2);
+    }
+
+    #[test]
+    fn insert_remove_single_mut() {
+        let mut m = OrdMap::new();
+        m.insert(0, 0);
+        assert_eq!(OrdMap::singleton(0, 0), m);
+        m.remove(&0);
+        assert_eq!(OrdMap::new(), m);
+    }
+
+    #[test]
+    fn double_ended_iterator_1() {
+        let m = ordmap! {1 => 1, 2 => 2, 3 => 3, 4 => 4};
+        let mut it = m.iter();
+        assert_eq!(Some(&(1, 1)), it.next());
+        assert_eq!(Some(&(4, 4)), it.next_back());
+        assert_eq!(Some(&(2, 2)), it.next());
+        assert_eq!(Some(&(3, 3)), it.next_back());
+        assert_eq!(None, it.next());
+    }
+
+    #[test]
+    fn double_ended_iterator_2() {
+        let m = ordmap! {1 => 1, 2 => 2, 3 => 3, 4 => 4};
+        let mut it = m.iter();
+        assert_eq!(Some(&(1, 1)), it.next());
+        assert_eq!(Some(&(4, 4)), it.next_back());
+        assert_eq!(Some(&(2, 2)), it.next());
+        assert_eq!(Some(&(3, 3)), it.next_back());
+        assert_eq!(None, it.next_back());
+    }
+
+    #[test]
+    fn safe_mutation() {
+        let v1 = OrdMap::from_iter((0..131_072).map(|i| (i, i)));
+        let mut v2 = v1.clone();
+        v2.insert(131_000, 23);
+        assert_eq!(Some(&23), v2.get(&131_000));
+        assert_eq!(Some(&131_000), v1.get(&131_000));
+    }
+
+    #[test]
+    fn index_operator() {
+        let mut map = ordmap! {1 => 2, 3 => 4, 5 => 6};
+        assert_eq!(4, map[&3]);
+        map[&3] = 8;
+        assert_eq!(ordmap! {1 => 2, 3 => 8, 5 => 6}, map);
+    }
+
+    #[test]
+    fn entry_api() {
+        let mut map = ordmap! {"bar" => 5};
+        map.entry(&"foo").and_modify(|v| *v += 5).or_insert(1);
+        assert_eq!(1, map[&"foo"]);
+        map.entry(&"foo").and_modify(|v| *v += 5).or_insert(1);
+        assert_eq!(6, map[&"foo"]);
+        map.entry(&"bar").and_modify(|v| *v += 5).or_insert(1);
+        assert_eq!(10, map[&"bar"]);
+        assert_eq!(
+            10,
+            match map.entry(&"bar") {
+                Entry::Occupied(entry) => entry.remove(),
+                _ => panic!(),
+            }
+        );
+        assert!(!map.contains_key(&"bar"));
+    }
+
+    #[test]
+    fn match_string_keys_with_string_slices() {
+        let mut map: OrdMap<String, i32> =
+            From::from(&ordmap! { "foo" => &1, "bar" => &2, "baz" => &3 });
+        assert_eq!(Some(&1), map.get("foo"));
+        map = map.without("foo");
+        assert_eq!(Some(3), map.remove("baz"));
+        map["bar"] = 8;
+        assert_eq!(8, map["bar"]);
+    }
+
+    #[test]
+    fn ranged_iter() {
+        let map: OrdMap<i32, i32> = ordmap![1=>2, 2=>3, 3=>4, 4=>5, 5=>6];
+        let range: Vec<(i32, i32)> = map.range(..).cloned().collect();
+        assert_eq!(vec![(1, 2), (2, 3), (3, 4), (4, 5), (5, 6)], range);
+        let range: Vec<(i32, i32)> = map.range(..).rev().cloned().collect();
+        assert_eq!(vec![(5, 6), (4, 5), (3, 4), (2, 3), (1, 2)], range);
+        let range: Vec<(i32, i32)> = map.range(2..5).cloned().collect();
+        assert_eq!(vec![(2, 3), (3, 4), (4, 5)], range);
+        let range: Vec<(i32, i32)> = map.range(2..5).rev().cloned().collect();
+        assert_eq!(vec![(4, 5), (3, 4), (2, 3)], range);
+        let range: Vec<(i32, i32)> = map.range(3..).cloned().collect();
+        assert_eq!(vec![(3, 4), (4, 5), (5, 6)], range);
+        let range: Vec<(i32, i32)> = map.range(3..).rev().cloned().collect();
+        assert_eq!(vec![(5, 6), (4, 5), (3, 4)], range);
+        let range: Vec<(i32, i32)> = map.range(..4).cloned().collect();
+        assert_eq!(vec![(1, 2), (2, 3), (3, 4)], range);
+        let range: Vec<(i32, i32)> = map.range(..4).rev().cloned().collect();
+        assert_eq!(vec![(3, 4), (2, 3), (1, 2)], range);
+        let range: Vec<(i32, i32)> = map.range(..=3).cloned().collect();
+        assert_eq!(vec![(1, 2), (2, 3), (3, 4)], range);
+        let range: Vec<(i32, i32)> = map.range(..=3).rev().cloned().collect();
+        assert_eq!(vec![(3, 4), (2, 3), (1, 2)], range);
+    }
+
+    proptest! {
+        #[test]
+        fn length(ref input in collection::btree_map(i16::ANY, i16::ANY, 0..1000)) {
+            let map: OrdMap<i32, i32> = OrdMap::from(input.clone());
+            input.len() == map.len()
+        }
+
+        #[test]
+        fn order(ref input in collection::hash_map(i16::ANY, i16::ANY, 0..1000)) {
+            let map: OrdMap<i32, i32> = OrdMap::from(input.clone());
+            is_sorted(map.keys())
+        }
+
+        #[test]
+        fn overwrite_values(ref vec in collection::vec((i16::ANY, i16::ANY), 1..1000), index_rand in usize::ANY, new_val in i16::ANY) {
+            let index = vec[index_rand % vec.len()].0;
+            let map1 = OrdMap::from_iter(vec.clone());
+            let map2 = map1.update(index, new_val);
+            for (k, v) in map2 {
+                if k == index {
+                    assert_eq!(v, new_val);
+                } else {
+                    match map1.get(&k) {
+                        None => panic!("map1 didn't have key {:?}", k),
+                        Some(other_v) => {
+                            assert_eq!(v, *other_v);
+                        }
+                    }
+                }
+            }
+        }
+
+        #[test]
+        fn delete_values(ref vec in collection::vec((usize::ANY, usize::ANY), 1..1000), index_rand in usize::ANY) {
+            let index = vec[index_rand % vec.len()].0;
+            let map1: OrdMap<usize, usize> = OrdMap::from_iter(vec.clone());
+            let map2 = map1.without(&index);
+            assert_eq!(map1.len(), map2.len() + 1);
+            for k in map2.keys() {
+                assert_ne!(*k, index);
+            }
+        }
+
+        #[test]
+        fn insert_and_delete_values(
+            ref input in ord_map(0usize..64, 0usize..64, 1..1000),
+            ref ops in collection::vec((bool::ANY, usize::ANY, usize::ANY), 1..1000)
+        ) {
+            let mut map = input.clone();
+            let mut tree: collections::BTreeMap<usize, usize> = input.iter().cloned().collect();
+            for (ins, key, val) in ops {
+                if *ins {
+                    tree.insert(*key, *val);
+                    map = map.update(*key, *val)
+                } else {
+                    tree.remove(key);
+                    map = map.without(key)
+                }
+            }
+            assert!(map.iter().map(|(k, v)| (*k, *v)).eq(tree.iter().map(|(k, v)| (*k, *v))));
+        }
+
+        #[test]
+        fn proptest_works(ref m in ord_map(0..9999, ".*", 10..100)) {
+            assert!(m.len() < 100);
+            assert!(m.len() >= 10);
+        }
+
+        #[test]
+        fn insert_and_length(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..1000)) {
+            let mut map: OrdMap<i16, i16> = OrdMap::new();
+            for (k, v) in m.iter() {
+                map = map.update(*k, *v)
+            }
+            assert_eq!(m.len(), map.len());
+        }
+
+        #[test]
+        fn from_iterator(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..1000)) {
+            let map: OrdMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            assert_eq!(m.len(), map.len());
+        }
+
+        #[test]
+        fn iterate_over(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..1000)) {
+            let map: OrdMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            assert_eq!(m.len(), map.iter().count());
+        }
+
+        #[test]
+        fn equality(ref m in collection::hash_map(i16::ANY, i16::ANY, 0..1000)) {
+            let map1: OrdMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            let map2: OrdMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            assert_eq!(map1, map2);
+        }
+
+        #[test]
+        fn lookup(ref m in ord_map(i16::ANY, i16::ANY, 0..1000)) {
+            let map: OrdMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            for (k, v) in m {
+                assert_eq!(Some(*v), map.get(k).cloned());
+            }
+        }
+
+        #[test]
+        fn remove(ref m in ord_map(i16::ANY, i16::ANY, 0..1000)) {
+            let mut map: OrdMap<i16, i16> =
+                FromIterator::from_iter(m.iter().map(|(k, v)| (*k, *v)));
+            for k in m.keys() {
+                let l = map.len();
+                assert_eq!(m.get(k).cloned(), map.get(k).cloned());
+                map = map.without(k);
+                assert_eq!(None, map.get(k));
+                assert_eq!(l - 1, map.len());
+            }
+        }
+
+        #[test]
+        fn insert_mut(ref m in ord_map(i16::ANY, i16::ANY, 0..1000)) {
+            let mut mut_map = OrdMap::new();
+            let mut map = OrdMap::new();
+            for (k, v) in m.iter() {
+                map = map.update(*k, *v);
+                mut_map.insert(*k, *v);
+            }
+            assert_eq!(map, mut_map);
+        }
+
+        #[test]
+        fn remove_mut(ref orig in ord_map(i16::ANY, i16::ANY, 0..1000)) {
+            let mut map = orig.clone();
+            for key in orig.keys() {
+                let len = map.len();
+                assert_eq!(orig.get(key), map.get(key));
+                assert_eq!(orig.get(key).cloned(), map.remove(key));
+                assert_eq!(None, map.get(key));
+                assert_eq!(len - 1, map.len());
+            }
+        }
+
+        #[test]
+        fn remove_alien(ref orig in collection::hash_map(i16::ANY, i16::ANY, 0..1000)) {
+            let mut map = OrdMap::<i16, i16>::from(orig.clone());
+            for key in orig.keys() {
+                let len = map.len();
+                assert_eq!(orig.get(key), map.get(key));
+                assert_eq!(orig.get(key).cloned(), map.remove(key));
+                assert_eq!(None, map.get(key));
+                assert_eq!(len - 1, map.len());
+            }
+        }
+
+        #[test]
+        fn delete_and_reinsert(
+            ref input in collection::hash_map(i16::ANY, i16::ANY, 1..1000),
+            index_rand in usize::ANY
+        ) {
+            let index = *input.keys().nth(index_rand % input.len()).unwrap();
+            let map1 = OrdMap::from_iter(input.clone());
+            let (val, map2): (i16, _) = map1.extract(&index).unwrap();
+            let map3 = map2.update(index, val);
+            for key in map2.keys() {
+                assert!(*key != index);
+            }
+            assert_eq!(map1.len(), map2.len() + 1);
+            assert_eq!(map1, map3);
+        }
+
+        #[test]
+        fn exact_size_iterator(ref m in ord_map(i16::ANY, i16::ANY, 1..1000)) {
+            let mut should_be = m.len();
+            let mut it = m.iter();
+            loop {
+                assert_eq!(should_be, it.len());
+                match it.next() {
+                    None => break,
+                    Some(_) => should_be -= 1,
+                }
+            }
+            assert_eq!(0, it.len());
+        }
+
+        #[test]
+        fn diff_added_values(a in ord_map(i16::ANY, i16::ANY, 0..1000), b in ord_map(i16::ANY, i16::ANY, 0..1000)) {
+            let ab = a.clone().union(b.clone());
+            assert!(a.diff(&ab).eq(b.iter().filter(|&(ref k, _)| !a.contains_key(k)).map(DiffItem::Add)));
+        }
+
+        // fn diff_updated_values(a: Vec<(usize, usize)>, b: Vec<(usize, usize)>) -> bool {
+        //     let a: OrdMap<usize, usize> = OrdMap::from(a);
+        //     let b: OrdMap<usize, usize> = OrdMap::from(b);
+        //     let ab: OrdMap<usize, usize> = a.union(&b);
+        //     let ba: OrdMap<usize, usize> = ab.union_with(&b, |_, b| *b);
+        //     ab.diff(&ba).eq(b.iter().filter(|&(ref k, ref v)| ab.get(k) != Some(&v))
+        //                    .map(|(k, v)| DiffItem::Update {
+        //                        old: &(*k, *(ab.get(&k).unwrap())),
+        //                        new: &(*k, *v)
+        //                    }))
+        // }
+
+        #[test]
+        fn diff_removed_values(a in ord_map(i16::ANY, i16::ANY, 0..1000), b in ord_map(i16::ANY, i16::ANY, 0..1000)) {
+            let ab = a.clone().union(b.clone());
+            assert!(ab.diff(&a).eq(b.iter().filter(|&(ref k, _)| !a.contains_key(k)).map(DiffItem::Remove)));
+        }
+
+        // fn diff_all_values(a: Vec<(usize, usize)>, b: Vec<(usize, usize)>) -> bool {
+        //     let a: OrdMap<usize, usize> = OrdMap::from(a);
+        //     let b: OrdMap<usize, usize> = OrdMap::from(b);
+        //     a.diff(&b).eq(b.union(&a).iter().filter_map(|(k, v)| {
+        //         if a.contains_key(&k) {
+        //             if b.contains_key(&k) {
+        //                 let old = a.get(&k).unwrap();
+        //                 if old != v	{
+        //                     Some(DiffItem::Update {
+        //                         old: &(*k, *old),
+        //                         new: &(*k, *v),
+        //                     })
+        //                 } else {
+        //                     None
+        //                 }
+        //             } else {
+        //                 Some(DiffItem::Remove(&(*k, *v)))
+        //             }
+        //         } else {
+        //             Some(DiffItem::Add(&(*k, *v)))
+        //         }
+        //     }))
+        // }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/ord/mod.rs cargo-0.33.0/vendor/im-rc/src/ord/mod.rs
--- cargo-0.32.0/vendor/im-rc/src/ord/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/ord/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,8 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#[macro_use]
+pub mod map;
+#[macro_use]
+pub mod set;
diff -Nru cargo-0.32.0/vendor/im-rc/src/ord/set.rs cargo-0.33.0/vendor/im-rc/src/ord/set.rs
--- cargo-0.32.0/vendor/im-rc/src/ord/set.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/ord/set.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1155 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! An ordered set.
+//!
+//! An immutable ordered set implemented as a [B-tree] [1].
+//!
+//! Most operations on this type of set are O(log n). A
+//! [`HashSet`][hashset::HashSet] is usually a better choice for
+//! performance, but the `OrdSet` has the advantage of only requiring
+//! an [`Ord`][std::cmp::Ord] constraint on its values, and of being
+//! ordered, so values always come out from lowest to highest, where a
+//! [`HashSet`][hashset::HashSet] has no guaranteed ordering.
+//!
+//! [1]: https://en.wikipedia.org/wiki/B-tree
+//! [hashset::HashSet]: ../hashset/struct.HashSet.html
+//! [std::cmp::Ord]: https://doc.rust-lang.org/std/cmp/trait.Ord.html
+
+use std::borrow::Borrow;
+use std::cmp::Ordering;
+use std::collections;
+use std::fmt::{Debug, Error, Formatter};
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::iter::{FromIterator, IntoIterator, Sum};
+use std::ops::{Add, Deref, Mul, RangeBounds};
+
+use hashset::HashSet;
+use nodes::btree::{
+    BTreeValue, ConsumingIter as ConsumingNodeIter, DiffItem as NodeDiffItem,
+    DiffIter as NodeDiffIter, Insert, Iter as NodeIter, Node, Remove,
+};
+#[cfg(has_specialisation)]
+use util::linear_search_by;
+use util::Ref;
+
+pub type DiffItem<'a, A> = NodeDiffItem<'a, A>;
+
+/// Construct a set from a sequence of values.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::ordset::OrdSet;
+/// # fn main() {
+/// assert_eq!(
+///   ordset![1, 2, 3],
+///   OrdSet::from(vec![1, 2, 3])
+/// );
+/// # }
+/// ```
+#[macro_export]
+macro_rules! ordset {
+    () => { $crate::ordset::OrdSet::new() };
+
+    ( $($x:expr),* ) => {{
+        let mut l = $crate::ordset::OrdSet::new();
+        $(
+            l.insert($x);
+        )*
+            l
+    }};
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+struct Value<A>(A);
+
+impl<A> Deref for Value<A> {
+    type Target = A;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+// FIXME lacking specialisation, we can't simply implement `BTreeValue`
+// for `A`, we have to use the `Value<A>` indirection.
+#[cfg(not(has_specialisation))]
+impl<A: Ord + Clone> BTreeValue for Value<A> {
+    type Key = A;
+
+    fn ptr_eq(&self, _other: &Self) -> bool {
+        false
+    }
+
+    fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        slice.binary_search_by(|value| Self::Key::borrow(value).cmp(key))
+    }
+
+    fn search_value(slice: &[Self], key: &Self) -> Result<usize, usize> {
+        slice.binary_search_by(|value| value.cmp(key))
+    }
+
+    fn cmp_keys<BK>(&self, other: &BK) -> Ordering
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        Self::Key::borrow(self).cmp(other)
+    }
+
+    fn cmp_values(&self, other: &Self) -> Ordering {
+        self.cmp(other)
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<A: Ord + Clone> BTreeValue for Value<A> {
+    type Key = A;
+
+    fn ptr_eq(&self, _other: &Self) -> bool {
+        false
+    }
+
+    default fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        slice.binary_search_by(|value| Self::Key::borrow(value).cmp(key))
+    }
+
+    default fn search_value(slice: &[Self], key: &Self) -> Result<usize, usize> {
+        slice.binary_search_by(|value| value.cmp(key))
+    }
+
+    fn cmp_keys<BK>(&self, other: &BK) -> Ordering
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        Self::Key::borrow(self).cmp(other)
+    }
+
+    fn cmp_values(&self, other: &Self) -> Ordering {
+        self.cmp(other)
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<A: Ord + Clone + Copy> BTreeValue for Value<A> {
+    fn search_key<BK>(slice: &[Self], key: &BK) -> Result<usize, usize>
+    where
+        BK: Ord + ?Sized,
+        Self::Key: Borrow<BK>,
+    {
+        linear_search_by(slice, |value| Self::Key::borrow(value).cmp(key))
+    }
+
+    fn search_value(slice: &[Self], key: &Self) -> Result<usize, usize> {
+        linear_search_by(slice, |value| value.cmp(key))
+    }
+}
+
+/// An ordered set.
+///
+/// An immutable ordered set implemented as a [B-tree] [1].
+///
+/// Most operations on this type of set are O(log n). A
+/// [`HashSet`][hashset::HashSet] is usually a better choice for
+/// performance, but the `OrdSet` has the advantage of only requiring
+/// an [`Ord`][std::cmp::Ord] constraint on its values, and of being
+/// ordered, so values always come out from lowest to highest, where a
+/// [`HashSet`][hashset::HashSet] has no guaranteed ordering.
+///
+/// [1]: https://en.wikipedia.org/wiki/B-tree
+/// [hashset::HashSet]: ../hashset/struct.HashSet.html
+/// [std::cmp::Ord]: https://doc.rust-lang.org/std/cmp/trait.Ord.html
+pub struct OrdSet<A> {
+    size: usize,
+    root: Ref<Node<Value<A>>>,
+}
+
+impl<A> OrdSet<A>
+where
+    A: Ord + Clone,
+{
+    /// Construct an empty set.
+    #[must_use]
+    pub fn new() -> Self {
+        OrdSet {
+            size: 0,
+            root: Ref::from(Node::new()),
+        }
+    }
+
+    /// Construct a set with a single value.
+    ///
+    /// This method has been deprecated; use [`unit`][unit] instead.
+    ///
+    /// [unit]: #method.unit
+    #[inline]
+    #[must_use]
+    #[deprecated(since = "12.3.0", note = "renamed to `unit` for consistency")]
+    pub fn singleton(a: A) -> Self {
+        Self::unit(a)
+    }
+
+    /// Construct a set with a single value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let set = OrdSet::unit(123);
+    /// assert!(set.contains(&123));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn unit(a: A) -> Self {
+        OrdSet {
+            size: 1,
+            root: Ref::from(Node::unit(Value(a))),
+        }
+    }
+
+    /// Test whether a set is empty.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// assert!(
+    ///   !ordset![1, 2, 3].is_empty()
+    /// );
+    /// assert!(
+    ///   OrdSet::<i32>::new().is_empty()
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get the size of a set.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// assert_eq!(3, ordset![1, 2, 3].len());
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.size
+    }
+
+    /// Get the smallest value in a set.
+    ///
+    /// If the set is empty, returns `None`.
+    #[must_use]
+    pub fn get_min(&self) -> Option<&A> {
+        self.root.min().map(Deref::deref)
+    }
+
+    /// Get the largest value in a set.
+    ///
+    /// If the set is empty, returns `None`.
+    #[must_use]
+    pub fn get_max(&self) -> Option<&A> {
+        self.root.max().map(Deref::deref)
+    }
+
+    // Create an iterator over the contents of the set.
+    #[must_use]
+    pub fn iter(&self) -> Iter<A> {
+        Iter {
+            it: NodeIter::new(&self.root, self.size, ..),
+        }
+    }
+
+    // Create an iterator over a range inside the set.
+    #[must_use]
+    pub fn range<R, BA>(&self, range: R) -> RangedIter<A>
+    where
+        R: RangeBounds<BA>,
+        A: Borrow<BA>,
+        BA: Ord + ?Sized,
+    {
+        RangedIter {
+            it: NodeIter::new(&self.root, self.size, range),
+        }
+    }
+
+    /// Get an iterator over the differences between this set and
+    /// another, i.e. the set of entries to add or remove to this set
+    /// in order to make it equal to the other set.
+    ///
+    /// This function will avoid visiting nodes which are shared
+    /// between the two sets, meaning that even very large sets can be
+    /// compared quickly if most of their structure is shared.
+    ///
+    /// Time: O(n) (where n is the number of unique elements across
+    /// the two sets, minus the number of elements belonging to nodes
+    /// shared between them)
+    #[must_use]
+    pub fn diff<'a>(&'a self, other: &'a Self) -> DiffIter<A> {
+        DiffIter {
+            it: NodeDiffIter::new(&self.root, &other.root),
+        }
+    }
+
+    /// Test if a value is part of a set.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let mut set = ordset!{1, 2, 3};
+    /// assert!(set.contains(&1));
+    /// assert!(!set.contains(&4));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn contains<BA>(&self, a: &BA) -> bool
+    where
+        BA: Ord + ?Sized,
+        A: Borrow<BA>,
+    {
+        self.root.lookup(a).is_some()
+    }
+
+    /// Insert a value into a set.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let mut set = ordset!{};
+    /// set.insert(123);
+    /// set.insert(456);
+    /// assert_eq!(
+    ///   set,
+    ///   ordset![123, 456]
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    pub fn insert(&mut self, a: A) -> Option<A> {
+        let new_root = {
+            let root = Ref::make_mut(&mut self.root);
+            match root.insert(Value(a)) {
+                Insert::Replaced(Value(old_value)) => return Some(old_value),
+                Insert::Added => {
+                    self.size += 1;
+                    return None;
+                }
+                Insert::Update(root) => Ref::from(root),
+                Insert::Split(left, median, right) => {
+                    Ref::from(Node::from_split(left, median, right))
+                }
+            }
+        };
+        self.size += 1;
+        self.root = new_root;
+        None
+    }
+
+    /// Remove a value from a set.
+    ///
+    /// Time: O(log n)
+    #[inline]
+    pub fn remove<BA>(&mut self, a: &BA) -> Option<A>
+    where
+        BA: Ord + ?Sized,
+        A: Borrow<BA>,
+    {
+        let (new_root, removed_value) = {
+            let root = Ref::make_mut(&mut self.root);
+            match root.remove(a) {
+                Remove::Update(value, root) => (Ref::from(root), Some(value.0)),
+                Remove::Removed(value) => {
+                    self.size -= 1;
+                    return Some(value.0);
+                }
+                Remove::NoChange => return None,
+            }
+        };
+        self.size -= 1;
+        self.root = new_root;
+        removed_value
+    }
+
+    /// Remove the smallest value from a set.
+    ///
+    /// Time: O(log n)
+    pub fn remove_min(&mut self) -> Option<A> {
+        // FIXME implement this at the node level for better efficiency
+        let key = match self.get_min() {
+            None => return None,
+            Some(v) => v,
+        }
+        .clone();
+        self.remove(&key)
+    }
+
+    /// Remove the largest value from a set.
+    ///
+    /// Time: O(log n)
+    pub fn remove_max(&mut self) -> Option<A> {
+        // FIXME implement this at the node level for better efficiency
+        let key = match self.get_max() {
+            None => return None,
+            Some(v) => v,
+        }
+        .clone();
+        self.remove(&key)
+    }
+
+    /// Discard all elements from the set.
+    ///
+    /// This leaves you with an empty set, and all elements that
+    /// were previously inside it are dropped.
+    ///
+    /// Time: O(n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::OrdSet;
+    /// # fn main() {
+    /// let mut set = ordset![1, 2, 3];
+    /// set.clear();
+    /// assert!(set.is_empty());
+    /// # }
+    /// ```
+    pub fn clear(&mut self) {
+        if !self.is_empty() {
+            self.root = Default::default();
+            self.size = 0;
+        }
+    }
+
+    /// Construct a new set from the current set with the given value
+    /// added.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let set = ordset![456];
+    /// assert_eq!(
+    ///   set.update(123),
+    ///   ordset![123, 456]
+    /// );
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn update(&self, a: A) -> Self {
+        let mut out = self.clone();
+        out.insert(a);
+        out
+    }
+
+    /// Construct a new set with the given value removed if it's in
+    /// the set.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn without<BA>(&self, a: &BA) -> Self
+    where
+        BA: Ord + ?Sized,
+        A: Borrow<BA>,
+    {
+        let mut out = self.clone();
+        out.remove(a);
+        out
+    }
+
+    /// Remove the smallest value from a set, and return that value as
+    /// well as the updated set.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn without_min(&self) -> (Option<A>, Self) {
+        match self.get_min() {
+            Some(v) => (Some(v.clone()), self.without(&v)),
+            None => (None, self.clone()),
+        }
+    }
+
+    /// Remove the largest value from a set, and return that value as
+    /// well as the updated set.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn without_max(&self) -> (Option<A>, Self) {
+        match self.get_max() {
+            Some(v) => (Some(v.clone()), self.without(&v)),
+            None => (None, self.clone()),
+        }
+    }
+
+    /// Construct the union of two sets.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let set1 = ordset!{1, 2};
+    /// let set2 = ordset!{2, 3};
+    /// let expected = ordset!{1, 2, 3};
+    /// assert_eq!(expected, set1.union(set2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn union(mut self, other: Self) -> Self {
+        for value in other {
+            self.insert(value);
+        }
+        self
+    }
+
+    /// Construct the union of multiple sets.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn unions<I>(i: I) -> Self
+    where
+        I: IntoIterator<Item = Self>,
+    {
+        i.into_iter().fold(Self::default(), |a, b| a.union(b))
+    }
+
+    /// Construct the difference between two sets.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let set1 = ordset!{1, 2};
+    /// let set2 = ordset!{2, 3};
+    /// let expected = ordset!{1, 3};
+    /// assert_eq!(expected, set1.difference(set2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn difference(mut self, other: Self) -> Self {
+        for value in other {
+            if self.remove(&value).is_none() {
+                self.insert(value);
+            }
+        }
+        self
+    }
+
+    /// Construct the intersection of two sets.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::ordset::OrdSet;
+    /// # fn main() {
+    /// let set1 = ordset!{1, 2};
+    /// let set2 = ordset!{2, 3};
+    /// let expected = ordset!{2};
+    /// assert_eq!(expected, set1.intersection(set2));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn intersection(self, other: Self) -> Self {
+        let mut out = Self::default();
+        for value in other {
+            if self.contains(&value) {
+                out.insert(value);
+            }
+        }
+        out
+    }
+
+    /// Test whether a set is a subset of another set, meaning that
+    /// all values in our set must also be in the other set.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_subset<RS>(&self, other: RS) -> bool
+    where
+        RS: Borrow<Self>,
+    {
+        let o = other.borrow();
+        self.iter().all(|a| o.contains(&a))
+    }
+
+    /// Test whether a set is a proper subset of another set, meaning
+    /// that all values in our set must also be in the other set. A
+    /// proper subset must also be smaller than the other set.
+    ///
+    /// Time: O(n log n)
+    #[must_use]
+    pub fn is_proper_subset<RS>(&self, other: RS) -> bool
+    where
+        RS: Borrow<Self>,
+    {
+        self.len() != other.borrow().len() && self.is_subset(other)
+    }
+
+    /// Split a set into two, with the left hand set containing values
+    /// which are smaller than `split`, and the right hand set
+    /// containing values which are larger than `split`.
+    ///
+    /// The `split` value itself is discarded.
+    ///
+    /// Time: O(n)
+    #[must_use]
+    pub fn split<BA>(self, split: &BA) -> (Self, Self)
+    where
+        BA: Ord + ?Sized,
+        A: Borrow<BA>,
+    {
+        let (left, _, right) = self.split_member(split);
+        (left, right)
+    }
+
+    /// Split a set into two, with the left hand set containing values
+    /// which are smaller than `split`, and the right hand set
+    /// containing values which are larger than `split`.
+    ///
+    /// Returns a tuple of the two sets and a boolean which is true if
+    /// the `split` value existed in the original set, and false
+    /// otherwise.
+    ///
+    /// Time: O(n)
+    #[must_use]
+    pub fn split_member<BA>(self, split: &BA) -> (Self, bool, Self)
+    where
+        BA: Ord + ?Sized,
+        A: Borrow<BA>,
+    {
+        let mut left = Self::default();
+        let mut right = Self::default();
+        let mut present = false;
+        for value in self {
+            match value.borrow().cmp(split) {
+                Ordering::Less => {
+                    left.insert(value);
+                }
+                Ordering::Equal => {
+                    present = true;
+                }
+                Ordering::Greater => {
+                    right.insert(value);
+                }
+            }
+        }
+        (left, present, right)
+    }
+
+    /// Construct a set with only the `n` smallest values from a given
+    /// set.
+    ///
+    /// Time: O(n)
+    #[must_use]
+    pub fn take(&self, n: usize) -> Self {
+        self.iter().take(n).cloned().collect()
+    }
+
+    /// Construct a set with the `n` smallest values removed from a
+    /// given set.
+    ///
+    /// Time: O(n)
+    #[must_use]
+    pub fn skip(&self, n: usize) -> Self {
+        self.iter().skip(n).cloned().collect()
+    }
+}
+
+// Core traits
+
+impl<A> Clone for OrdSet<A> {
+    fn clone(&self) -> Self {
+        OrdSet {
+            size: self.size,
+            root: self.root.clone(),
+        }
+    }
+}
+
+impl<A: Ord + Clone> PartialEq for OrdSet<A> {
+    fn eq(&self, other: &Self) -> bool {
+        Ref::ptr_eq(&self.root, &other.root)
+            || (self.len() == other.len() && self.diff(other).next().is_none())
+    }
+}
+
+impl<A: Ord + Eq + Clone> Eq for OrdSet<A> {}
+
+impl<A: Ord + Clone> PartialOrd for OrdSet<A> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.iter().partial_cmp(other.iter())
+    }
+}
+
+impl<A: Ord + Clone> Ord for OrdSet<A> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.iter().cmp(other.iter())
+    }
+}
+
+impl<A: Ord + Clone + Hash> Hash for OrdSet<A> {
+    fn hash<H>(&self, state: &mut H)
+    where
+        H: Hasher,
+    {
+        for i in self.iter() {
+            i.hash(state);
+        }
+    }
+}
+
+impl<A> Default for OrdSet<A>
+where
+    A: Ord + Clone,
+{
+    fn default() -> Self {
+        OrdSet::new()
+    }
+}
+
+impl<A: Ord + Clone> Add for OrdSet<A> {
+    type Output = OrdSet<A>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.union(other)
+    }
+}
+
+impl<'a, A: Ord + Clone> Add for &'a OrdSet<A> {
+    type Output = OrdSet<A>;
+
+    fn add(self, other: Self) -> Self::Output {
+        self.clone().union(other.clone())
+    }
+}
+
+impl<A: Ord + Clone> Mul for OrdSet<A> {
+    type Output = OrdSet<A>;
+
+    fn mul(self, other: Self) -> Self::Output {
+        self.intersection(other)
+    }
+}
+
+impl<'a, A: Ord + Clone> Mul for &'a OrdSet<A> {
+    type Output = OrdSet<A>;
+
+    fn mul(self, other: Self) -> Self::Output {
+        self.clone().intersection(other.clone())
+    }
+}
+
+impl<A: Ord + Clone> Sum for OrdSet<A> {
+    fn sum<I>(it: I) -> Self
+    where
+        I: Iterator<Item = Self>,
+    {
+        it.fold(Self::new(), |a, b| a + b)
+    }
+}
+
+impl<A, R> Extend<R> for OrdSet<A>
+where
+    A: Ord + Clone + From<R>,
+{
+    fn extend<I>(&mut self, iter: I)
+    where
+        I: IntoIterator<Item = R>,
+    {
+        for value in iter {
+            self.insert(From::from(value));
+        }
+    }
+}
+
+impl<A: Ord + Clone + Debug> Debug for OrdSet<A> {
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        f.debug_set().entries(self.iter()).finish()
+    }
+}
+
+// Iterators
+
+// An iterator over the elements of a set.
+pub struct Iter<'a, A>
+where
+    A: 'a,
+{
+    it: NodeIter<'a, Value<A>>,
+}
+
+impl<'a, A> Iterator for Iter<'a, A>
+where
+    A: 'a + Ord + Clone,
+{
+    type Item = &'a A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(Deref::deref)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.it.remaining, Some(self.it.remaining))
+    }
+}
+
+impl<'a, A> DoubleEndedIterator for Iter<'a, A>
+where
+    A: 'a + Ord + Clone,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.it.next_back().map(Deref::deref)
+    }
+}
+
+impl<'a, A> ExactSizeIterator for Iter<'a, A> where A: 'a + Ord + Clone {}
+
+// A ranged iterator over the elements of a set.
+//
+// The only difference from `Iter` is that this one doesn't implement
+// `ExactSizeIterator` because we can't know the size of the range without first
+// iterating over it to count.
+pub struct RangedIter<'a, A>
+where
+    A: 'a,
+{
+    it: NodeIter<'a, Value<A>>,
+}
+
+impl<'a, A> Iterator for RangedIter<'a, A>
+where
+    A: 'a + Ord + Clone,
+{
+    type Item = &'a A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(Deref::deref)
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.it.size_hint()
+    }
+}
+
+impl<'a, A> DoubleEndedIterator for RangedIter<'a, A>
+where
+    A: 'a + Ord + Clone,
+{
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.it.next_back().map(Deref::deref)
+    }
+}
+
+// A consuming iterator over the elements of a set.
+pub struct ConsumingIter<A> {
+    it: ConsumingNodeIter<Value<A>>,
+}
+
+impl<A> Iterator for ConsumingIter<A>
+where
+    A: Ord + Clone,
+{
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|v| v.0)
+    }
+}
+
+// An iterator over the difference between two sets.
+pub struct DiffIter<'a, A: 'a> {
+    it: NodeDiffIter<'a, Value<A>>,
+}
+
+impl<'a, A> Iterator for DiffIter<'a, A>
+where
+    A: 'a + Ord + Clone + PartialEq,
+{
+    type Item = DiffItem<'a, A>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.it.next().map(|item| match item {
+            NodeDiffItem::Add(v) => NodeDiffItem::Add(v.deref()),
+            NodeDiffItem::Update { old, new } => NodeDiffItem::Update {
+                old: old.deref(),
+                new: new.deref(),
+            },
+            NodeDiffItem::Remove(v) => NodeDiffItem::Remove(v.deref()),
+        })
+    }
+}
+
+impl<A, R> FromIterator<R> for OrdSet<A>
+where
+    A: Ord + Clone + From<R>,
+{
+    fn from_iter<T>(i: T) -> Self
+    where
+        T: IntoIterator<Item = R>,
+    {
+        let mut out = Self::new();
+        for item in i {
+            out.insert(From::from(item));
+        }
+        out
+    }
+}
+
+impl<'a, A> IntoIterator for &'a OrdSet<A>
+where
+    A: 'a + Ord + Clone,
+{
+    type Item = &'a A;
+    type IntoIter = Iter<'a, A>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<A> IntoIterator for OrdSet<A>
+where
+    A: Ord + Clone,
+{
+    type Item = A;
+    type IntoIter = ConsumingIter<A>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        ConsumingIter {
+            it: ConsumingNodeIter::new(&self.root, self.size),
+        }
+    }
+}
+
+// Conversions
+
+impl<'s, 'a, A, OA> From<&'s OrdSet<&'a A>> for OrdSet<OA>
+where
+    A: ToOwned<Owned = OA> + Ord + ?Sized,
+    OA: Borrow<A> + Ord + Clone,
+{
+    fn from(set: &OrdSet<&A>) -> Self {
+        set.iter().map(|a| (*a).to_owned()).collect()
+    }
+}
+
+impl<'a, A> From<&'a [A]> for OrdSet<A>
+where
+    A: Ord + Clone,
+{
+    fn from(slice: &'a [A]) -> Self {
+        slice.iter().cloned().collect()
+    }
+}
+
+impl<A: Ord + Clone> From<Vec<A>> for OrdSet<A> {
+    fn from(vec: Vec<A>) -> Self {
+        vec.into_iter().collect()
+    }
+}
+
+impl<'a, A: Ord + Clone> From<&'a Vec<A>> for OrdSet<A> {
+    fn from(vec: &Vec<A>) -> Self {
+        vec.iter().cloned().collect()
+    }
+}
+
+impl<A: Eq + Hash + Ord + Clone> From<collections::HashSet<A>> for OrdSet<A> {
+    fn from(hash_set: collections::HashSet<A>) -> Self {
+        hash_set.into_iter().collect()
+    }
+}
+
+impl<'a, A: Eq + Hash + Ord + Clone> From<&'a collections::HashSet<A>> for OrdSet<A> {
+    fn from(hash_set: &collections::HashSet<A>) -> Self {
+        hash_set.iter().cloned().collect()
+    }
+}
+
+impl<A: Ord + Clone> From<collections::BTreeSet<A>> for OrdSet<A> {
+    fn from(btree_set: collections::BTreeSet<A>) -> Self {
+        btree_set.into_iter().collect()
+    }
+}
+
+impl<'a, A: Ord + Clone> From<&'a collections::BTreeSet<A>> for OrdSet<A> {
+    fn from(btree_set: &collections::BTreeSet<A>) -> Self {
+        btree_set.iter().cloned().collect()
+    }
+}
+
+impl<A: Hash + Eq + Ord + Clone, S: BuildHasher> From<HashSet<A, S>> for OrdSet<A> {
+    fn from(hashset: HashSet<A, S>) -> Self {
+        hashset.into_iter().collect()
+    }
+}
+
+impl<'a, A: Hash + Eq + Ord + Clone, S: BuildHasher> From<&'a HashSet<A, S>> for OrdSet<A> {
+    fn from(hashset: &HashSet<A, S>) -> Self {
+        hashset.into_iter().cloned().collect()
+    }
+}
+
+// QuickCheck
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+use quickcheck::{Arbitrary, Gen};
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+impl<A: Ord + Clone + Arbitrary + Sync> Arbitrary for OrdSet<A> {
+    fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        OrdSet::from_iter(Vec::<A>::arbitrary(g))
+    }
+}
+
+// Proptest
+
+#[cfg(any(test, feature = "proptest"))]
+pub mod proptest {
+    use super::*;
+    use proptest::strategy::{BoxedStrategy, Strategy, ValueTree};
+    use std::ops::Range;
+
+    /// A strategy for a set of a given size.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// proptest! {
+    ///     #[test]
+    ///     fn proptest_a_set(ref s in set(".*", 10..100)) {
+    ///         assert!(s.len() < 100);
+    ///         assert!(s.len() >= 10);
+    ///     }
+    /// }
+    /// ```
+    pub fn ord_set<A: Strategy + 'static>(
+        element: A,
+        size: Range<usize>,
+    ) -> BoxedStrategy<OrdSet<<A::Tree as ValueTree>::Value>>
+    where
+        <A::Tree as ValueTree>::Value: Ord + Clone,
+    {
+        ::proptest::collection::vec(element, size.clone())
+            .prop_map(OrdSet::from)
+            .prop_filter("OrdSet minimum size".to_owned(), move |s| {
+                s.len() >= size.start
+            })
+            .boxed()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::proptest::*;
+    use super::*;
+
+    #[test]
+    fn match_strings_with_string_slices() {
+        let mut set: OrdSet<String> = From::from(&ordset!["foo", "bar"]);
+        set = set.without("bar");
+        assert!(!set.contains("bar"));
+        set.remove("foo");
+        assert!(!set.contains("foo"));
+    }
+
+    #[test]
+    fn ranged_iter() {
+        let set: OrdSet<i32> = ordset![1, 2, 3, 4, 5];
+        let range: Vec<i32> = set.range(..).cloned().collect();
+        assert_eq!(vec![1, 2, 3, 4, 5], range);
+        let range: Vec<i32> = set.range(..).rev().cloned().collect();
+        assert_eq!(vec![5, 4, 3, 2, 1], range);
+        let range: Vec<i32> = set.range(2..5).cloned().collect();
+        assert_eq!(vec![2, 3, 4], range);
+        let range: Vec<i32> = set.range(2..5).rev().cloned().collect();
+        assert_eq!(vec![4, 3, 2], range);
+        let range: Vec<i32> = set.range(3..).cloned().collect();
+        assert_eq!(vec![3, 4, 5], range);
+        let range: Vec<i32> = set.range(3..).rev().cloned().collect();
+        assert_eq!(vec![5, 4, 3], range);
+        let range: Vec<i32> = set.range(..4).cloned().collect();
+        assert_eq!(vec![1, 2, 3], range);
+        let range: Vec<i32> = set.range(..4).rev().cloned().collect();
+        assert_eq!(vec![3, 2, 1], range);
+        let range: Vec<i32> = set.range(..=3).cloned().collect();
+        assert_eq!(vec![1, 2, 3], range);
+        let range: Vec<i32> = set.range(..=3).rev().cloned().collect();
+        assert_eq!(vec![3, 2, 1], range);
+    }
+
+    proptest! {
+        #[test]
+        fn proptest_a_set(ref s in ord_set(".*", 10..100)) {
+            assert!(s.len() < 100);
+            assert!(s.len() >= 10);
+        }
+
+        #[test]
+        fn long_ranged_iter(max in 1..1000) {
+            let range = 0..max;
+            let expected: Vec<i32> = range.clone().collect();
+            let set: OrdSet<i32> = OrdSet::from_iter(range.clone());
+            let result: Vec<i32> = set.range(..).cloned().collect();
+            assert_eq!(expected, result);
+
+            let expected: Vec<i32> = range.clone().rev().collect();
+            let set: OrdSet<i32> = OrdSet::from_iter(range);
+            let result: Vec<i32> = set.range(..).rev().cloned().collect();
+            assert_eq!(expected, result);
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/ser.rs cargo-0.33.0/vendor/im-rc/src/ser.rs
--- cargo-0.32.0/vendor/im-rc/src/ser.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/ser.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,296 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use serde::de::{Deserialize, Deserializer, MapAccess, SeqAccess, Visitor};
+use serde::ser::{Serialize, SerializeMap, SerializeSeq, Serializer};
+use std::fmt;
+use std::hash::{BuildHasher, Hash};
+use std::marker::PhantomData;
+use std::ops::Deref;
+
+use hashmap::HashMap;
+use hashset::HashSet;
+use ordmap::OrdMap;
+use ordset::OrdSet;
+use vector::Vector;
+
+struct SeqVisitor<'de, S, A>
+where
+    S: From<Vec<A>>,
+    A: Deserialize<'de>,
+{
+    phantom_s: PhantomData<S>,
+    phantom_a: PhantomData<A>,
+    phantom_lifetime: PhantomData<&'de ()>,
+}
+
+impl<'de, S, A> SeqVisitor<'de, S, A>
+where
+    S: From<Vec<A>>,
+    A: Deserialize<'de>,
+{
+    pub fn new() -> SeqVisitor<'de, S, A> {
+        SeqVisitor {
+            phantom_s: PhantomData,
+            phantom_a: PhantomData,
+            phantom_lifetime: PhantomData,
+        }
+    }
+}
+
+impl<'de, S, A> Visitor<'de> for SeqVisitor<'de, S, A>
+where
+    S: From<Vec<A>>,
+    A: Deserialize<'de>,
+{
+    type Value = S;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a sequence")
+    }
+
+    fn visit_seq<Access>(self, mut access: Access) -> Result<Self::Value, Access::Error>
+    where
+        Access: SeqAccess<'de>,
+    {
+        let mut v: Vec<A> = match access.size_hint() {
+            None => Vec::new(),
+            Some(l) => Vec::with_capacity(l),
+        };
+        while let Some(i) = access.next_element()? {
+            v.push(i)
+        }
+        Ok(From::from(v))
+    }
+}
+
+struct MapVisitor<'de, S, K, V>
+where
+    S: From<Vec<(K, V)>>,
+    K: Deserialize<'de>,
+    V: Deserialize<'de>,
+{
+    phantom_s: PhantomData<S>,
+    phantom_k: PhantomData<K>,
+    phantom_v: PhantomData<V>,
+    phantom_lifetime: PhantomData<&'de ()>,
+}
+
+impl<'de, S, K, V> MapVisitor<'de, S, K, V>
+where
+    S: From<Vec<(K, V)>>,
+    K: Deserialize<'de>,
+    V: Deserialize<'de>,
+{
+    pub fn new() -> MapVisitor<'de, S, K, V> {
+        MapVisitor {
+            phantom_s: PhantomData,
+            phantom_k: PhantomData,
+            phantom_v: PhantomData,
+            phantom_lifetime: PhantomData,
+        }
+    }
+}
+
+impl<'de, S, K, V> Visitor<'de> for MapVisitor<'de, S, K, V>
+where
+    S: From<Vec<(K, V)>>,
+    K: Deserialize<'de>,
+    V: Deserialize<'de>,
+{
+    type Value = S;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a sequence")
+    }
+
+    fn visit_map<Access>(self, mut access: Access) -> Result<Self::Value, Access::Error>
+    where
+        Access: MapAccess<'de>,
+    {
+        let mut v: Vec<(K, V)> = match access.size_hint() {
+            None => Vec::new(),
+            Some(l) => Vec::with_capacity(l),
+        };
+        while let Some(i) = access.next_entry()? {
+            v.push(i)
+        }
+        Ok(From::from(v))
+    }
+}
+
+// Set
+
+impl<'de, A: Deserialize<'de> + Ord + Clone> Deserialize<'de> for OrdSet<A> {
+    fn deserialize<D>(des: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        des.deserialize_seq(SeqVisitor::new())
+    }
+}
+
+impl<A: Ord + Clone + Serialize> Serialize for OrdSet<A> {
+    fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = ser.serialize_seq(Some(self.len()))?;
+        for i in self.iter() {
+            s.serialize_element(i.deref())?;
+        }
+        s.end()
+    }
+}
+
+// Map
+
+impl<'de, K: Deserialize<'de> + Ord + Clone, V: Deserialize<'de> + Clone> Deserialize<'de>
+    for OrdMap<K, V>
+{
+    fn deserialize<D>(des: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        des.deserialize_map(MapVisitor::<'de, OrdMap<K, V>, K, V>::new())
+    }
+}
+
+impl<K: Serialize + Ord + Clone, V: Serialize + Clone> Serialize for OrdMap<K, V> {
+    fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = ser.serialize_map(Some(self.len()))?;
+        for (k, v) in self.iter() {
+            s.serialize_entry(k.deref(), v.deref())?;
+        }
+        s.end()
+    }
+}
+
+// HashMap
+
+impl<'de, K, V, S> Deserialize<'de> for HashMap<K, V, S>
+where
+    K: Deserialize<'de> + Hash + Eq + Clone,
+    V: Deserialize<'de> + Clone,
+    S: BuildHasher + Default,
+{
+    fn deserialize<D>(des: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        des.deserialize_map(MapVisitor::<'de, HashMap<K, V, S>, K, V>::new())
+    }
+}
+
+impl<K, V, S> Serialize for HashMap<K, V, S>
+where
+    K: Serialize + Hash + Eq + Clone,
+    V: Serialize + Clone,
+    S: BuildHasher + Default,
+{
+    fn serialize<Ser>(&self, ser: Ser) -> Result<Ser::Ok, Ser::Error>
+    where
+        Ser: Serializer,
+    {
+        let mut s = ser.serialize_map(Some(self.len()))?;
+        for (k, v) in self.iter() {
+            s.serialize_entry(k.deref(), v.deref())?;
+        }
+        s.end()
+    }
+}
+
+// HashSet
+
+impl<'de, A: Deserialize<'de> + Hash + Eq + Clone, S: BuildHasher + Default> Deserialize<'de>
+    for HashSet<A, S>
+{
+    fn deserialize<D>(des: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        des.deserialize_seq(SeqVisitor::new())
+    }
+}
+
+impl<A: Serialize + Hash + Eq + Clone, S: BuildHasher + Default> Serialize for HashSet<A, S> {
+    fn serialize<Ser>(&self, ser: Ser) -> Result<Ser::Ok, Ser::Error>
+    where
+        Ser: Serializer,
+    {
+        let mut s = ser.serialize_seq(Some(self.len()))?;
+        for i in self.iter() {
+            s.serialize_element(i.deref())?;
+        }
+        s.end()
+    }
+}
+
+// Vector
+
+impl<'de, A: Clone + Deserialize<'de>> Deserialize<'de> for Vector<A> {
+    fn deserialize<D>(des: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        des.deserialize_seq(SeqVisitor::<'de, Vector<A>, A>::new())
+    }
+}
+
+impl<A: Clone + Serialize> Serialize for Vector<A> {
+    fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = ser.serialize_seq(Some(self.len()))?;
+        for i in self.iter() {
+            s.serialize_element(i.deref())?;
+        }
+        s.end()
+    }
+}
+
+// Tests
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use hashmap::proptest::hash_map;
+    use hashset::proptest::hash_set;
+    use ordmap::proptest::ord_map;
+    use ordset::proptest::ord_set;
+    use proptest::num::i32;
+    use serde_json::{from_str, to_string};
+    use vector::proptest::vector;
+
+    proptest! {
+        #[test]
+        fn ser_ordset(ref v in ord_set(i32::ANY, 0..100)) {
+            assert_eq!(v, &from_str::<OrdSet<i32>>(&to_string(&v).unwrap()).unwrap());
+        }
+
+        #[test]
+        fn ser_ordmap(ref v in ord_map(i32::ANY, i32::ANY, 0..100)) {
+            assert_eq!(v, &from_str::<OrdMap<i32, i32>>(&to_string(&v).unwrap()).unwrap());
+        }
+
+        #[test]
+        fn ser_hashmap(ref v in hash_map(i32::ANY, i32::ANY, 0..100)) {
+            assert_eq!(v, &from_str::<HashMap<i32, i32>>(&to_string(&v).unwrap()).unwrap());
+        }
+
+        #[test]
+        fn ser_hashset(ref v in hash_set(i32::ANY, 0..100)) {
+            assert_eq!(v, &from_str::<HashSet<i32>>(&to_string(&v).unwrap()).unwrap());
+        }
+
+        #[test]
+        fn ser_vector(ref v in vector(i32::ANY, 0..100)) {
+            assert_eq!(v, &from_str::<Vector<i32>>(&to_string(&v).unwrap()).unwrap());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/sort.rs cargo-0.33.0/vendor/im-rc/src/sort.rs
--- cargo-0.32.0/vendor/im-rc/src/sort.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/sort.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,91 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::cmp::Ordering;
+use vector::FocusMut;
+
+// Ported from the Java version at:
+//    http://www.cs.princeton.edu/~rs/talks/QuicksortIsOptimal.pdf
+// Should be O(n) to O(n log n)
+pub fn quicksort<A, F>(vector: &mut FocusMut<A>, left: usize, right: usize, cmp: &F)
+where
+    A: Clone,
+    F: Fn(&A, &A) -> Ordering,
+{
+    if right <= left {
+        return;
+    }
+
+    let l = left as isize;
+    let r = right as isize;
+    let mut l1 = l;
+    let mut r1 = r;
+    let mut l2 = l - 1;
+    let mut r2 = r;
+    loop {
+        while l1 != r && vector.pair(l1 as usize, r as usize, |a, b| cmp(a, b)) == Ordering::Less {
+            l1 += 1;
+        }
+        r1 -= 1;
+        while r1 != r && vector.pair(r as usize, r1 as usize, |a, b| cmp(a, b)) == Ordering::Less {
+            if r1 == l {
+                break;
+            }
+            r1 -= 1;
+        }
+        if l1 >= r1 {
+            break;
+        }
+        vector.swap(l1 as usize, r1 as usize);
+        if l1 != r && vector.pair(l1 as usize, r as usize, |a, b| cmp(a, b)) == Ordering::Equal {
+            l2 += 1;
+            vector.swap(l2 as usize, l1 as usize);
+        }
+        if r1 != r && vector.pair(r as usize, r1 as usize, |a, b| cmp(a, b)) == Ordering::Equal {
+            r2 -= 1;
+            vector.swap(r1 as usize, r2 as usize);
+        }
+    }
+    vector.swap(l1 as usize, r as usize);
+
+    r1 = l1 - 1;
+    l1 += 1;
+    let mut k = l;
+    while k < l2 {
+        vector.swap(k as usize, r1 as usize);
+        r1 -= 1;
+        k += 1;
+    }
+    k = r - 1;
+    while k > r2 {
+        vector.swap(l1 as usize, k as usize);
+        k -= 1;
+        l1 += 1;
+    }
+
+    if r1 >= 0 {
+        quicksort(vector, left, r1 as usize, cmp);
+    }
+    quicksort(vector, l1 as usize, right, cmp);
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use proptest::num::i32;
+    use test::is_sorted;
+    use vector::proptest::vector;
+
+    proptest! {
+        #[test]
+        fn test_quicksort(ref input in vector(i32::ANY, 0..1000)) {
+            let mut vec = input.clone();
+            let len = vec.len();
+            if len > 1 {
+                quicksort(&mut vec.focus_mut(), 0, len - 1, &Ord::cmp);
+            }
+            assert!(is_sorted(vec));
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/sync.rs cargo-0.33.0/vendor/im-rc/src/sync.rs
--- cargo-0.32.0/vendor/im-rc/src/sync.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/sync.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,69 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+pub use self::lock::Lock;
+
+#[cfg(threadsafe)]
+mod lock {
+    use std::sync::{Arc, Mutex, MutexGuard};
+
+    /// Thread safe lock: just wraps a `Mutex`.
+    pub struct Lock<A> {
+        lock: Arc<Mutex<A>>,
+    }
+
+    impl<A> Lock<A> {
+        pub fn new(value: A) -> Self {
+            Lock {
+                lock: Arc::new(Mutex::new(value)),
+            }
+        }
+
+        #[inline]
+        pub fn lock(&mut self) -> Option<MutexGuard<A>> {
+            self.lock.lock().ok()
+        }
+    }
+
+    impl<A> Clone for Lock<A> {
+        fn clone(&self) -> Self {
+            Lock {
+                lock: self.lock.clone(),
+            }
+        }
+    }
+}
+
+#[cfg(not(threadsafe))]
+mod lock {
+    use std::cell::{RefCell, RefMut};
+    use std::rc::Rc;
+
+    /// Single threaded lock: a `RefCell` so we should safely panic if somehow
+    /// trying to access the stored data twice from the same thread.
+    pub struct Lock<A> {
+        lock: Rc<RefCell<A>>,
+    }
+
+    impl<A> Lock<A> {
+        pub fn new(value: A) -> Self {
+            Lock {
+                lock: Rc::new(RefCell::new(value)),
+            }
+        }
+
+        #[inline]
+        pub fn lock(&mut self) -> Option<RefMut<A>> {
+            self.lock.try_borrow_mut().ok()
+        }
+    }
+
+    impl<A> Clone for Lock<A> {
+        fn clone(&self) -> Self {
+            Lock {
+                lock: self.lock.clone(),
+            }
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/test.rs cargo-0.33.0/vendor/im-rc/src/test.rs
--- cargo-0.32.0/vendor/im-rc/src/test.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/test.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,86 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use metrohash::MetroHash64;
+use std::hash::{BuildHasher, Hasher};
+use std::marker::PhantomData;
+use typenum::{Unsigned, U64};
+
+pub fn is_sorted<A, I>(l: I) -> bool
+where
+    I: IntoIterator<Item = A>,
+    A: Ord,
+{
+    let mut it = l.into_iter().peekable();
+    loop {
+        match (it.next(), it.peek()) {
+            (_, None) => return true,
+            (Some(ref a), Some(b)) if a > b => return false,
+            _ => (),
+        }
+    }
+}
+
+pub struct LolHasher<N: Unsigned = U64> {
+    state: u64,
+    shift: usize,
+    size: PhantomData<N>,
+}
+
+impl<N: Unsigned> LolHasher<N> {
+    fn feed_me(&mut self, byte: u8) {
+        self.state ^= u64::from(byte) << self.shift;
+        self.shift += 8;
+        if self.shift >= 64 {
+            self.shift = 0;
+        }
+    }
+}
+
+impl<N: Unsigned> Hasher for LolHasher<N> {
+    fn write(&mut self, bytes: &[u8]) {
+        for byte in bytes {
+            self.feed_me(*byte)
+        }
+    }
+
+    fn finish(&self) -> u64 {
+        if N::USIZE == 64 {
+            self.state
+        } else {
+            self.state & ((1 << N::USIZE) - 1)
+        }
+    }
+}
+
+impl<N: Unsigned> Default for LolHasher<N> {
+    fn default() -> Self {
+        LolHasher {
+            state: 0,
+            shift: 0,
+            size: PhantomData,
+        }
+    }
+}
+
+pub struct MetroHashBuilder {
+    seed: u64,
+}
+
+impl MetroHashBuilder {
+    pub fn new(seed: u64) -> Self {
+        MetroHashBuilder { seed }
+    }
+
+    pub fn seed(&self) -> u64 {
+        self.seed
+    }
+}
+
+impl BuildHasher for MetroHashBuilder {
+    type Hasher = MetroHash64;
+    fn build_hasher(&self) -> Self::Hasher {
+        MetroHash64::with_seed(self.seed)
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/util.rs cargo-0.33.0/vendor/im-rc/src/util.rs
--- cargo-0.32.0/vendor/im-rc/src/util.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/util.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,89 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// Every codebase needs a `util` module.
+
+use std::cmp::Ordering;
+use std::ops::{Bound, IndexMut, Range, RangeBounds};
+use std::ptr;
+
+// The `Ref` type is an alias for either `Rc` or `Arc`, user's choice.
+#[cfg(threadsafe)]
+use std::sync::Arc;
+#[cfg(threadsafe)]
+pub type Ref<A> = Arc<A>;
+#[cfg(not(threadsafe))]
+use std::rc::Rc;
+#[cfg(not(threadsafe))]
+pub type Ref<A> = Rc<A>;
+
+pub fn clone_ref<A>(r: Ref<A>) -> A
+where
+    A: Clone,
+{
+    Ref::try_unwrap(r).unwrap_or_else(|r| (*r).clone())
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum Side {
+    Left,
+    Right,
+}
+
+/// Swap two values of anything implementing `IndexMut`.
+///
+/// Like `slice::swap`, but more generic.
+#[allow(unsafe_code)]
+pub fn swap_indices<V>(vector: &mut V, a: usize, b: usize)
+where
+    V: IndexMut<usize>,
+    V::Output: Sized,
+{
+    if a == b {
+        return;
+    }
+    // so sorry, but there's no implementation for this in std that's
+    // sufficiently generic
+    let pa: *mut V::Output = &mut vector[a];
+    let pb: *mut V::Output = &mut vector[b];
+    unsafe {
+        ptr::swap(pa, pb);
+    }
+}
+
+#[allow(dead_code)]
+pub fn linear_search_by<'a, A, I, F>(iterable: I, mut cmp: F) -> Result<usize, usize>
+where
+    A: 'a,
+    I: IntoIterator<Item = &'a A>,
+    F: FnMut(&A) -> Ordering,
+{
+    let mut pos = 0;
+    for value in iterable {
+        match cmp(value) {
+            Ordering::Equal => return Ok(pos),
+            Ordering::Greater => return Err(pos),
+            Ordering::Less => {}
+        }
+        pos += 1;
+    }
+    Err(pos)
+}
+
+pub fn to_range<R>(range: &R, right_unbounded: usize) -> Range<usize>
+where
+    R: RangeBounds<usize>,
+{
+    let start_index = match range.start_bound() {
+        Bound::Included(i) => *i,
+        Bound::Excluded(i) => *i + 1,
+        Bound::Unbounded => 0,
+    };
+    let end_index = match range.end_bound() {
+        Bound::Included(i) => *i + 1,
+        Bound::Excluded(i) => *i,
+        Bound::Unbounded => right_unbounded,
+    };
+    start_index..end_index
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/vector/focus.rs cargo-0.33.0/vendor/im-rc/src/vector/focus.rs
--- cargo-0.32.0/vendor/im-rc/src/vector/focus.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/vector/focus.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,911 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use std::mem::{replace, swap};
+use std::ops::{Range, RangeBounds};
+use std::ptr::null;
+use std::sync::atomic::{AtomicPtr, Ordering};
+
+use nodes::chunk::Chunk;
+use sync::Lock;
+use util::{to_range, Ref};
+use vector::{Iter, IterMut, Vector, RRB};
+
+/// Focused indexing over a [`Vector`][Vector].
+///
+/// By remembering the last tree node accessed through an index lookup and the
+/// path we took to get there, we can speed up lookups for adjacent indices
+/// tremendously. Lookups on indices in the same node are instantaneous, and
+/// lookups on sibling nodes are also very fast.
+///
+/// A `Focus` can also be used as a restricted view into a vector, using the
+/// [`narrow`][narrow] and [`split_at`][split_at] methods.
+///
+/// # When should I use a `Focus` for better performance?
+///
+/// `Focus` is useful when you need to perform a large number of index lookups
+/// that are more likely than not to be close to each other. It's usually worth
+/// using a `Focus` in any situation where you're batching a lot of index
+/// lookups together, even if they're not obviously adjacent - there's likely
+/// to be some performance gain for even completely random access.
+///
+/// If you're just iterating forwards or backwards over the [`Vector`][Vector]
+/// in order, you're better off with a regular iterator, which, in fact, is
+/// implemented using a `Focus`, but provides a simpler interface.
+///
+/// If you're just doing a very small number of index lookups, the setup cost
+/// for the `Focus` is probably not worth it.
+///
+/// A `Focus` is never faster than an index lookup on a small [`Vector`][Vector]
+/// with a length below the internal RRB tree's branching factor of 64.
+///
+/// # Examples
+///
+/// This example is contrived, as the better way to iterate forwards or
+/// backwards over a vector is with an actual iterator. Even so, the version
+/// using a `Focus` should run nearly an order of magnitude faster than the
+/// version using index lookups at a length of 1000. It should also be noted
+/// that [`vector::Iter`][Iter] is actually implemented using a `Focus` behind
+/// the scenes, so the performance of the two should be identical.
+///
+/// ```rust
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::vector::Vector;
+/// # use std::iter::FromIterator;
+/// # fn main() {
+/// let mut vec: Vector<i64> = Vector::from_iter(0..1000);
+///
+/// // Summing a vector, the slow way:
+/// let mut sum = 0;
+/// for i in 0..1000 {
+///     sum += *vec.get(i).unwrap();
+/// }
+/// assert_eq!(499500, sum);
+///
+/// // Summing a vector faster using a Focus:
+/// let mut sum = 0;
+/// let mut focus = vec.focus();
+/// for i in 0..1000 {
+///     sum += *focus.get(i).unwrap();
+/// }
+/// assert_eq!(499500, sum);
+///
+/// // And the easy way, for completeness:
+/// let sum: i64 = vec.iter().sum();
+/// assert_eq!(499500, sum);
+/// # }
+/// ```
+///
+/// [Vector]: enum.Vector.html
+/// [Iter]: struct.Iter.html
+/// [narrow]: #method.narrow
+/// [split_at]: #method.split_at
+pub enum Focus<'a, A>
+where
+    A: 'a,
+{
+    #[doc(hidden)]
+    Single(&'a [A]),
+    #[doc(hidden)]
+    Full(TreeFocus<A>),
+}
+
+impl<'a, A> Focus<'a, A>
+where
+    A: Clone + 'a,
+{
+    /// Construct a `Focus` for a [`Vector`][Vector].
+    ///
+    /// [Vector]: enum.Vector.html
+    pub fn new(vector: &'a Vector<A>) -> Self {
+        match vector {
+            Vector::Single(chunk) => Focus::Single(chunk),
+            Vector::Full(tree) => Focus::Full(TreeFocus::new(tree)),
+        }
+    }
+
+    /// Get the length of the focused [`Vector`][Vector].
+    ///
+    /// [Vector]: enum.Vector.html
+    pub fn len(&self) -> usize {
+        match self {
+            Focus::Single(chunk) => chunk.len(),
+            Focus::Full(tree) => tree.len(),
+        }
+    }
+
+    /// Test if the focused [`Vector`][Vector] is empty.
+    ///
+    /// [Vector]: enum.Vector.html
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get a reference to the value at a given index.
+    pub fn get(&mut self, index: usize) -> Option<&A> {
+        match self {
+            Focus::Single(chunk) => chunk.get(index),
+            Focus::Full(tree) => tree.get(index),
+        }
+    }
+
+    /// Get a reference to the value at a given index.
+    ///
+    /// Panics if the index is out of bounds.
+    pub fn index(&mut self, index: usize) -> &A {
+        self.get(index).expect("index out of bounds")
+    }
+
+    /// Get the chunk for the given index.
+    ///
+    /// This gives you a reference to the leaf node that contains the index,
+    /// along with its start and end indices.
+    pub fn chunk_at(&mut self, index: usize) -> (Range<usize>, &[A]) {
+        let len = self.len();
+        if index >= len {
+            panic!("vector::Focus::chunk_at: index out of bounds");
+        }
+        match self {
+            Focus::Single(chunk) => (0..len, chunk),
+            Focus::Full(tree) => tree.get_chunk(index),
+        }
+    }
+
+    /// Narrow the focus onto a subslice of the vector.
+    ///
+    /// `Focus::narrow(range)` has the same effect as `&slice[range]`, without
+    /// actually modifying the underlying vector.
+    ///
+    /// Panics if the range isn't fully inside the current focus.
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # use std::iter::FromIterator;
+    /// # fn main() {
+    /// let vec = Vector::from_iter(0..1000);
+    /// let narrowed = vec.focus().narrow(100..200);
+    /// let narrowed_vec = narrowed.into_iter().cloned().collect();
+    /// assert_eq!(Vector::from_iter(100..200), narrowed_vec);
+    /// # }
+    /// ```
+    ///
+    /// [slice::split_at]: https://doc.rust-lang.org/std/primitive.slice.html#method.split_at
+    /// [Vector::split_at]: enum.Vector.html#method.split_at
+    pub fn narrow<R>(self, range: R) -> Self
+    where
+        R: RangeBounds<usize>,
+    {
+        let r = to_range(&range, self.len());
+        if r.start >= r.end || r.start >= self.len() {
+            panic!("vector::Focus::narrow: range out of bounds");
+        }
+        match self {
+            Focus::Single(chunk) => Focus::Single(&chunk[r]),
+            Focus::Full(tree) => Focus::Full(tree.narrow(r)),
+        }
+    }
+
+    /// Split the focus into two.
+    ///
+    /// Given an index `index`, consume the focus and produce two new foci, the
+    /// left onto indices `0..index`, and the right onto indices `index..N`
+    /// where `N` is the length of the current focus.
+    ///
+    /// Panics if the index is out of bounds.
+    ///
+    /// This is the moral equivalent of [`slice::split_at`][slice::split_at], in
+    /// that it leaves the underlying data structure unchanged, unlike
+    /// [`Vector::split_at`][Vector::split_at].
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # use std::iter::FromIterator;
+    /// # fn main() {
+    /// let vec = Vector::from_iter(0..1000);
+    /// let (left, right) = vec.focus().split_at(500);
+    /// let left_vec = left.into_iter().cloned().collect();
+    /// let right_vec = right.into_iter().cloned().collect();
+    /// assert_eq!(Vector::from_iter(0..500), left_vec);
+    /// assert_eq!(Vector::from_iter(500..1000), right_vec);
+    /// # }
+    /// ```
+    ///
+    /// [slice::split_at]: https://doc.rust-lang.org/std/primitive.slice.html#method.split_at
+    /// [Vector::split_at]: enum.Vector.html#method.split_at
+    pub fn split_at(self, index: usize) -> (Self, Self) {
+        if index >= self.len() {
+            panic!("vector::Focus::split_at: index out of bounds");
+        }
+        match self {
+            Focus::Single(chunk) => {
+                let (left, right) = chunk.split_at(index);
+                (Focus::Single(left), Focus::Single(right))
+            }
+            Focus::Full(tree) => {
+                let (left, right) = tree.split_at(index);
+                (Focus::Full(left), Focus::Full(right))
+            }
+        }
+    }
+}
+
+impl<'a, A> IntoIterator for Focus<'a, A>
+where
+    A: Clone + 'a,
+{
+    type Item = &'a A;
+    type IntoIter = Iter<'a, A>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Iter::from_focus(self)
+    }
+}
+
+impl<'a, A> Clone for Focus<'a, A>
+where
+    A: Clone + 'a,
+{
+    fn clone(&self) -> Self {
+        match self {
+            Focus::Single(chunk) => Focus::Single(chunk),
+            Focus::Full(tree) => Focus::Full(tree.clone()),
+        }
+    }
+}
+
+pub struct TreeFocus<A> {
+    tree: RRB<A>,
+    view: Range<usize>,
+    middle_range: Range<usize>,
+    target_range: Range<usize>,
+    target_ptr: *const Chunk<A>,
+}
+
+impl<A> Clone for TreeFocus<A> {
+    fn clone(&self) -> Self {
+        let tree = self.tree.clone();
+        TreeFocus {
+            view: self.view.clone(),
+            middle_range: self.middle_range.clone(),
+            target_range: 0..0,
+            target_ptr: null(),
+            tree,
+        }
+    }
+}
+
+#[allow(unsafe_code)]
+#[cfg(threadsafe)]
+unsafe impl<A> Send for TreeFocus<A> {}
+#[allow(unsafe_code)]
+#[cfg(threadsafe)]
+unsafe impl<A> Sync for TreeFocus<A> {}
+
+#[inline]
+fn contains<A: Ord>(range: &Range<A>, index: &A) -> bool {
+    *index >= range.start && *index < range.end
+}
+
+impl<A> TreeFocus<A>
+where
+    A: Clone,
+{
+    fn new(tree: &RRB<A>) -> Self {
+        let middle_start = tree.outer_f.len() + tree.inner_f.len();
+        let middle_end = middle_start + tree.middle.len();
+        TreeFocus {
+            tree: tree.clone(),
+            view: 0..tree.length,
+            middle_range: middle_start..middle_end,
+            target_range: 0..0,
+            target_ptr: null(),
+        }
+    }
+
+    fn len(&self) -> usize {
+        self.view.end - self.view.start
+    }
+
+    fn narrow(self, mut view: Range<usize>) -> Self {
+        view.start += self.view.start;
+        view.end += self.view.start;
+        TreeFocus {
+            view,
+            middle_range: self.middle_range.clone(),
+            target_range: 0..0,
+            target_ptr: null(),
+            tree: self.tree,
+        }
+    }
+
+    fn split_at(self, index: usize) -> (Self, Self) {
+        let len = self.len();
+        let left = self.clone().narrow(0..index);
+        let right = self.narrow(index..len);
+        (left, right)
+    }
+
+    fn physical_index(&self, index: usize) -> usize {
+        debug_assert!(index < self.view.end);
+        self.view.start + index
+    }
+
+    fn logical_range(&self, range: &Range<usize>) -> Range<usize> {
+        (range.start - self.view.start)..(range.end - self.view.start)
+    }
+
+    fn set_focus(&mut self, index: usize) {
+        if index < self.middle_range.start {
+            let outer_len = self.tree.outer_f.len();
+            if index < outer_len {
+                self.target_range = 0..outer_len;
+                self.target_ptr = &*self.tree.outer_f;
+            } else {
+                self.target_range = outer_len..self.middle_range.start;
+                self.target_ptr = &*self.tree.inner_f;
+            }
+        } else if index >= self.middle_range.end {
+            let outer_start = self.middle_range.end + self.tree.inner_b.len();
+            if index < outer_start {
+                self.target_range = self.middle_range.end..outer_start;
+                self.target_ptr = &*self.tree.inner_b;
+            } else {
+                self.target_range = outer_start..self.tree.length;
+                self.target_ptr = &*self.tree.outer_b;
+            }
+        } else {
+            let tree_index = index - self.middle_range.start;
+            let (range, ptr) = self
+                .tree
+                .middle
+                .lookup_chunk(self.tree.middle_level, 0, tree_index);
+            self.target_range =
+                (range.start + self.middle_range.start)..(range.end + self.middle_range.start);
+            self.target_ptr = ptr;
+        }
+    }
+
+    #[allow(unsafe_code)]
+    fn get_focus(&self) -> &Chunk<A> {
+        unsafe { &*self.target_ptr }
+    }
+
+    pub fn get(&mut self, index: usize) -> Option<&A> {
+        if index >= self.len() {
+            return None;
+        }
+        let phys_index = self.physical_index(index);
+        if !contains(&self.target_range, &phys_index) {
+            self.set_focus(phys_index);
+        }
+        let target_phys_index = phys_index - self.target_range.start;
+        Some(&self.get_focus()[target_phys_index])
+    }
+
+    pub fn get_chunk(&mut self, index: usize) -> (Range<usize>, &[A]) {
+        let phys_index = self.physical_index(index);
+        if !contains(&self.target_range, &phys_index) {
+            self.set_focus(phys_index);
+        }
+        let mut slice: &[A] = self.get_focus();
+        let mut left = 0;
+        let mut right = 0;
+        if self.target_range.start < self.view.start {
+            left = self.view.start - self.target_range.start;
+        }
+        if self.target_range.end > self.view.end {
+            right = self.target_range.end - self.view.end;
+        }
+        slice = &slice[left..(slice.len() - right)];
+        let phys_range = (self.target_range.start + left)..(self.target_range.end - right);
+        (self.logical_range(&phys_range), slice)
+    }
+}
+
+/// A mutable version of [`Focus`][Focus].
+///
+/// See [`Focus`][Focus] for more details.
+///
+/// You can only build one `FocusMut` at a time for a vector, effectively
+/// keeping a lock on the vector until you're done with the focus, which relies
+/// on the structure of the vector not changing while it exists.
+///
+/// ```rust,compile_fail
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::vector::Vector;
+/// # use std::iter::FromIterator;
+/// # fn main() {
+/// let mut vec = Vector::from_iter(0..1000);
+/// let focus1 = vec.focus_mut();
+/// // Fails here because you already have a focus
+/// let focus2 = vec.focus_mut();
+/// # }
+/// ```
+///
+/// On the other hand, you can split that one focus into multiple sub-foci,
+/// which is safe because they can't overlap:
+///
+/// ```rust
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::vector::Vector;
+/// # use std::iter::FromIterator;
+/// # fn main() {
+/// let mut vec = Vector::from_iter(0..1000);
+/// let focus = vec.focus_mut();
+/// let (left, right) = focus.split_at(500);
+/// # }
+/// ```
+///
+/// These sub-foci also work as a lock on the vector, even if the focus they
+/// were created from goes out of scope.
+///
+/// ```rust,compile_fail
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::vector::Vector;
+/// # use std::iter::FromIterator;
+/// # fn main() {
+/// let mut vec = Vector::from_iter(0..1000);
+/// let (left, right) = {
+///     let focus = vec.focus_mut();
+///     focus.split_at(500)
+/// };
+/// // `left` and `right` are still in scope even if `focus` isn't, so we can't
+/// // create another focus:
+/// let focus2 = vec.focus_mut();
+/// # }
+/// ```
+///
+/// [Focus]: enum.Focus.html
+pub enum FocusMut<'a, A>
+where
+    A: 'a,
+{
+    #[doc(hidden)]
+    Single(&'a mut [A]),
+    #[doc(hidden)]
+    Full(TreeFocusMut<'a, A>),
+}
+
+impl<'a, A> FocusMut<'a, A>
+where
+    A: Clone + 'a,
+{
+    /// Construct a `FocusMut` for a `Vector`.
+    pub fn new(vector: &'a mut Vector<A>) -> Self {
+        match vector {
+            Vector::Single(chunk) => FocusMut::Single(Ref::make_mut(chunk).as_mut_slice()),
+            Vector::Full(tree) => FocusMut::Full(TreeFocusMut::new(tree)),
+        }
+    }
+
+    /// Get the length of the focused `Vector`.
+    pub fn len(&self) -> usize {
+        match self {
+            FocusMut::Single(chunk) => chunk.len(),
+            FocusMut::Full(tree) => tree.len(),
+        }
+    }
+
+    /// Test if the focused `Vector` is empty.
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get a reference to the value at a given index.
+    pub fn get(&mut self, index: usize) -> Option<&A> {
+        self.get_mut(index).map(|r| &*r)
+    }
+
+    /// Get a mutable reference to the value at a given index.
+    pub fn get_mut(&mut self, index: usize) -> Option<&mut A> {
+        match self {
+            FocusMut::Single(chunk) => chunk.get_mut(index),
+            FocusMut::Full(tree) => tree.get(index),
+        }
+    }
+
+    /// Get a reference to the value at a given index.
+    ///
+    /// Panics if the index is out of bounds.
+    pub fn index(&mut self, index: usize) -> &A {
+        &*self.index_mut(index)
+    }
+
+    /// Get a mutable reference to the value at a given index.
+    ///
+    /// Panics if the index is out of bounds.
+    #[allow(clippy::should_implement_trait)] // would if I could
+    pub fn index_mut(&mut self, index: usize) -> &mut A {
+        self.get_mut(index).expect("index out of bounds")
+    }
+
+    /// Update the value at a given index.
+    ///
+    /// Returns `None` if the index is out of bounds, or the replaced value
+    /// otherwise.
+    pub fn set(&mut self, index: usize, value: A) -> Option<A> {
+        match self.get_mut(index) {
+            Some(ref mut pos) => Some(replace(pos, value)),
+            None => None,
+        }
+    }
+
+    /// Swap the values at two given indices.
+    ///
+    /// Panics if either index is out of bounds.
+    ///
+    /// If the indices are equal, this function returns without doing anything.
+    pub fn swap(&mut self, a: usize, b: usize) {
+        if a == b {
+            return;
+        }
+        self.pair(a, b, |left, right| swap(left, right));
+    }
+
+    /// Lookup two indices simultaneously and run a function over them.
+    ///
+    /// Useful because the borrow checker won't let you have more than one
+    /// mutable reference into the same data structure at any given time.
+    ///
+    /// Panics if either index is out of bounds, or if they are the same index.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # use std::iter::FromIterator;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3, 4, 5];
+    /// vec.focus_mut().pair(1, 3, |a, b| *a += *b);
+    /// assert_eq!(vector![1, 6, 3, 4, 5], vec);
+    /// # }
+    /// ```
+    #[allow(unsafe_code)]
+    pub fn pair<F, B>(&mut self, a: usize, b: usize, mut f: F) -> B
+    where
+        F: FnMut(&mut A, &mut A) -> B,
+    {
+        if a == b {
+            panic!("vector::FocusMut::pair: indices cannot be equal!");
+        }
+        let pa: *mut A = self.index_mut(a);
+        let pb: *mut A = self.index_mut(b);
+        unsafe { f(&mut *pa, &mut *pb) }
+    }
+
+    /// Lookup three indices simultaneously and run a function over them.
+    ///
+    /// Useful because the borrow checker won't let you have more than one
+    /// mutable reference into the same data structure at any given time.
+    ///
+    /// Panics if any index is out of bounds, or if any indices are equal.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # use std::iter::FromIterator;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3, 4, 5];
+    /// vec.focus_mut().triplet(0, 2, 4, |a, b, c| *a += *b + *c);
+    /// assert_eq!(vector![9, 2, 3, 4, 5], vec);
+    /// # }
+    /// ```
+    #[allow(unsafe_code)]
+    pub fn triplet<F, B>(&mut self, a: usize, b: usize, c: usize, mut f: F) -> B
+    where
+        F: FnMut(&mut A, &mut A, &mut A) -> B,
+    {
+        if a == b || b == c || a == c {
+            panic!("vector::FocusMut::triplet: indices cannot be equal!");
+        }
+        let pa: *mut A = self.index_mut(a);
+        let pb: *mut A = self.index_mut(b);
+        let pc: *mut A = self.index_mut(c);
+        unsafe { f(&mut *pa, &mut *pb, &mut *pc) }
+    }
+
+    /// Get the chunk for the given index.
+    ///
+    /// This gives you a reference to the leaf node that contains the index,
+    /// along with its start and end indices.
+    pub fn chunk_at(&mut self, index: usize) -> (Range<usize>, &mut [A]) {
+        let len = self.len();
+        if index >= len {
+            panic!("vector::FocusMut::chunk_at: index out of bounds");
+        }
+        match self {
+            FocusMut::Single(chunk) => (0..len, chunk),
+            FocusMut::Full(tree) => {
+                let (range, chunk) = tree.get_chunk(index);
+                (range, chunk)
+            }
+        }
+    }
+
+    /// Narrow the focus onto a subslice of the vector.
+    ///
+    /// `FocusMut::narrow(range)` has the same effect as `&slice[range]`, without
+    /// actually modifying the underlying vector.
+    ///
+    /// Panics if the range isn't fully inside the current focus.
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # use std::iter::FromIterator;
+    /// # fn main() {
+    /// let mut vec = Vector::from_iter(0..1000);
+    /// let narrowed = vec.focus_mut().narrow(100..200);
+    /// let narrowed_vec = narrowed.unmut().into_iter().cloned().collect();
+    /// assert_eq!(Vector::from_iter(100..200), narrowed_vec);
+    /// # }
+    /// ```
+    ///
+    /// [slice::split_at]: https://doc.rust-lang.org/std/primitive.slice.html#method.split_at
+    /// [Vector::split_at]: enum.Vector.html#method.split_at
+    pub fn narrow<R>(self, range: R) -> Self
+    where
+        R: RangeBounds<usize>,
+    {
+        let r = to_range(&range, self.len());
+        if r.start > r.end || r.start > self.len() {
+            panic!("vector::FocusMut::narrow: range out of bounds");
+        }
+        match self {
+            FocusMut::Single(chunk) => FocusMut::Single(&mut chunk[r]),
+            FocusMut::Full(tree) => FocusMut::Full(tree.narrow(r)),
+        }
+    }
+
+    /// Split the focus into two.
+    ///
+    /// Given an index `index`, consume the focus and produce two new foci, the
+    /// left onto indices `0..index`, and the right onto indices `index..N`
+    /// where `N` is the length of the current focus.
+    ///
+    /// Panics if the index is out of bounds.
+    ///
+    /// This is the moral equivalent of [`slice::split_at`][slice::split_at], in
+    /// that it leaves the underlying data structure unchanged, unlike
+    /// [`Vector::split_at`][Vector::split_at].
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # use std::iter::FromIterator;
+    /// # fn main() {
+    /// let mut vec = Vector::from_iter(0..1000);
+    /// {
+    ///     let (left, right) = vec.focus_mut().split_at(500);
+    ///     for ptr in left {
+    ///         *ptr += 100;
+    ///     }
+    ///     for ptr in right {
+    ///         *ptr -= 100;
+    ///     }
+    /// }
+    /// let expected = Vector::from_iter(100..600)
+    ///              + Vector::from_iter(400..900);
+    /// assert_eq!(expected, vec);
+    /// # }
+    /// ```
+    ///
+    /// [slice::split_at]: https://doc.rust-lang.org/std/primitive.slice.html#method.split_at
+    /// [Vector::split_at]: enum.Vector.html#method.split_at
+    pub fn split_at(self, index: usize) -> (Self, Self) {
+        if index > self.len() {
+            panic!("vector::FocusMut::split_at: index out of bounds");
+        }
+        match self {
+            FocusMut::Single(chunk) => {
+                let (left, right) = chunk.split_at_mut(index);
+                (FocusMut::Single(left), FocusMut::Single(right))
+            }
+            FocusMut::Full(tree) => {
+                let (left, right) = tree.split_at(index);
+                (FocusMut::Full(left), FocusMut::Full(right))
+            }
+        }
+    }
+
+    /// Convert a `FocusMut` into a `Focus`.
+    pub fn unmut(self) -> Focus<'a, A> {
+        match self {
+            FocusMut::Single(chunk) => Focus::Single(chunk),
+            FocusMut::Full(mut tree) => Focus::Full(TreeFocus {
+                tree: {
+                    let t = tree.tree.lock().unwrap();
+                    (*t).clone()
+                },
+                view: tree.view.clone(),
+                middle_range: tree.middle_range.clone(),
+                target_range: 0..0,
+                target_ptr: null(),
+            }),
+        }
+    }
+}
+
+impl<'a, A> IntoIterator for FocusMut<'a, A>
+where
+    A: Clone + 'a,
+{
+    type Item = &'a mut A;
+    type IntoIter = IterMut<'a, A>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        IterMut::from_focus(self)
+    }
+}
+
+impl<'a, A> Into<Focus<'a, A>> for FocusMut<'a, A>
+where
+    A: Clone + 'a,
+{
+    fn into(self) -> Focus<'a, A> {
+        self.unmut()
+    }
+}
+
+pub struct TreeFocusMut<'a, A>
+where
+    A: 'a,
+{
+    tree: Lock<&'a mut RRB<A>>,
+    view: Range<usize>,
+    middle_range: Range<usize>,
+    target_range: Range<usize>,
+    target_ptr: AtomicPtr<Chunk<A>>,
+}
+
+impl<'a, A> TreeFocusMut<'a, A>
+where
+    A: Clone + 'a,
+{
+    fn new(tree: &'a mut RRB<A>) -> Self {
+        let middle_start = tree.outer_f.len() + tree.inner_f.len();
+        let middle_end = middle_start + tree.middle.len();
+        TreeFocusMut {
+            view: 0..tree.length,
+            tree: Lock::new(tree),
+            middle_range: middle_start..middle_end,
+            target_range: 0..0,
+            target_ptr: AtomicPtr::default(),
+        }
+    }
+
+    fn len(&self) -> usize {
+        self.view.end - self.view.start
+    }
+
+    fn narrow(self, mut view: Range<usize>) -> Self {
+        view.start += self.view.start;
+        view.end += self.view.start;
+        TreeFocusMut {
+            view,
+            middle_range: self.middle_range.clone(),
+            target_range: 0..0,
+            target_ptr: AtomicPtr::default(),
+            tree: self.tree,
+        }
+    }
+
+    fn split_at(self, index: usize) -> (Self, Self) {
+        let len = self.len();
+        debug_assert!(index <= len);
+        #[allow(unsafe_code)]
+        let left = TreeFocusMut {
+            view: self.view.start..(self.view.start + index),
+            middle_range: self.middle_range.clone(),
+            target_range: 0..0,
+            target_ptr: AtomicPtr::default(),
+            tree: self.tree.clone(),
+        };
+        let right = TreeFocusMut {
+            view: (self.view.start + index)..(self.view.start + len),
+            middle_range: self.middle_range.clone(),
+            target_range: 0..0,
+            target_ptr: AtomicPtr::default(),
+            tree: self.tree,
+        };
+        (left, right)
+    }
+
+    fn physical_index(&self, index: usize) -> usize {
+        debug_assert!(index < self.view.end);
+        self.view.start + index
+    }
+
+    fn logical_range(&self, range: &Range<usize>) -> Range<usize> {
+        (range.start - self.view.start)..(range.end - self.view.start)
+    }
+
+    fn set_focus(&mut self, index: usize) {
+        let mut tree = self
+            .tree
+            .lock()
+            .expect("im::vector::Focus::set_focus: unable to acquire exclusive lock on Vector");
+        if index < self.middle_range.start {
+            let outer_len = tree.outer_f.len();
+            if index < outer_len {
+                self.target_range = 0..outer_len;
+                self.target_ptr
+                    .store(Ref::make_mut(&mut tree.outer_f), Ordering::Relaxed);
+            } else {
+                self.target_range = outer_len..self.middle_range.start;
+                self.target_ptr
+                    .store(Ref::make_mut(&mut tree.inner_f), Ordering::Relaxed);
+            }
+        } else if index >= self.middle_range.end {
+            let outer_start = self.middle_range.end + tree.inner_b.len();
+            if index < outer_start {
+                self.target_range = self.middle_range.end..outer_start;
+                self.target_ptr
+                    .store(Ref::make_mut(&mut tree.inner_b), Ordering::Relaxed);
+            } else {
+                self.target_range = outer_start..tree.length;
+                self.target_ptr
+                    .store(Ref::make_mut(&mut tree.outer_b), Ordering::Relaxed);
+            }
+        } else {
+            let tree_index = index - self.middle_range.start;
+            let level = tree.middle_level;
+            let middle = Ref::make_mut(&mut tree.middle);
+            let (range, ptr) = middle.lookup_chunk_mut(level, 0, tree_index);
+            self.target_range =
+                (range.start + self.middle_range.start)..(range.end + self.middle_range.start);
+            self.target_ptr.store(ptr, Ordering::Relaxed);
+        }
+    }
+
+    #[allow(unsafe_code)]
+    fn get_focus(&mut self) -> &mut Chunk<A> {
+        unsafe { &mut *self.target_ptr.load(Ordering::Relaxed) }
+    }
+
+    pub fn get(&mut self, index: usize) -> Option<&mut A> {
+        if index >= self.len() {
+            return None;
+        }
+        let phys_index = self.physical_index(index);
+        if !contains(&self.target_range, &phys_index) {
+            self.set_focus(phys_index);
+        }
+        let target_phys_index = phys_index - self.target_range.start;
+        Some(&mut self.get_focus()[target_phys_index])
+    }
+
+    pub fn get_chunk(&mut self, index: usize) -> (Range<usize>, &mut [A]) {
+        let phys_index = self.physical_index(index);
+        if !contains(&self.target_range, &phys_index) {
+            self.set_focus(phys_index);
+        }
+        let mut left = 0;
+        let mut right = 0;
+        if self.target_range.start < self.view.start {
+            left = self.view.start - self.target_range.start;
+        }
+        if self.target_range.end > self.view.end {
+            right = self.target_range.end - self.view.end;
+        }
+        let phys_range = (self.target_range.start + left)..(self.target_range.end - right);
+        let log_range = self.logical_range(&phys_range);
+        let slice_len = self.get_focus().len();
+        let slice = &mut (self.get_focus().as_mut_slice())[left..(slice_len - right)];
+        (log_range, slice)
+    }
+}
diff -Nru cargo-0.32.0/vendor/im-rc/src/vector/mod.rs cargo-0.33.0/vendor/im-rc/src/vector/mod.rs
--- cargo-0.32.0/vendor/im-rc/src/vector/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/im-rc/src/vector/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,2714 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//! A persistent vector.
+//!
+//! This is a sequence of elements in insertion order - if you need a
+//! list of things, any kind of list of things, this is what you're
+//! looking for.
+//!
+//! It's implemented as an [RRB vector][rrbpaper] with [smart
+//! head/tail chunking][chunkedseq]. In performance terms, this means
+//! that practically every operation is O(log n), except push/pop on
+//! both sides, which will be O(1) amortised, and O(log n) in the
+//! worst case. In practice, the push/pop operations will be
+//! blindingly fast, nearly on par with the native
+//! [`VecDeque`][VecDeque], and other operations will have decent, if
+//! not high, performance, but they all have more or less the same
+//! O(log n) complexity, so you don't need to keep their performance
+//! characteristics in mind - everything, even splitting and merging,
+//! is safe to use and never too slow.
+//!
+//! ## Performance Notes
+//!
+//! Because of the head/tail chunking technique, until you push a
+//! number of items above double the tree's branching factor (that's
+//! `self.len()` = 2 × *k* (where *k* = 64) = 128) on either side, the
+//! data structure is still just a handful of arrays, not yet an RRB
+//! tree, so you'll see performance and memory characteristics fairly
+//! close to [`Vec`][Vec] or [`VecDeque`][VecDeque].
+//!
+//! This means that the structure always preallocates four chunks of
+//! size *k* (*k* being the tree's branching factor), equivalent to a
+//! [`Vec`][Vec] with an initial capacity of 256. Beyond that, it will
+//! allocate tree nodes of capacity *k* as needed.
+//!
+//! In addition, vectors start out as single chunks, and only expand into the
+//! full data structure once you go past the chunk size. This makes them
+//! perform identically to [`Vec`][Vec] at small sizes.
+//!
+//! [rrbpaper]: https://infoscience.epfl.ch/record/213452/files/rrbvector.pdf
+//! [chunkedseq]: http://deepsea.inria.fr/pasl/chunkedseq.pdf
+//! [Vec]: https://doc.rust-lang.org/std/vec/struct.Vec.html
+//! [VecDeque]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html
+
+use std::borrow::Borrow;
+use std::cmp::Ordering;
+use std::fmt::{Debug, Error, Formatter};
+use std::hash::{Hash, Hasher};
+use std::iter::Sum;
+use std::iter::{Chain, FromIterator, FusedIterator};
+use std::mem::{replace, swap};
+use std::ops::{Add, Index, IndexMut, RangeBounds};
+
+use nodes::chunk::{Chunk, Iter as ChunkIter, CHUNK_SIZE};
+use nodes::rrb::{ConsumingIter as ConsumingNodeIter, Node, PopResult, PushResult, SplitResult};
+use sort;
+use util::{clone_ref, swap_indices, to_range, Ref, Side};
+
+use self::Vector::{Full, Single};
+
+mod focus;
+
+pub use self::focus::{Focus, FocusMut};
+
+/// Construct a vector from a sequence of elements.
+///
+/// # Examples
+///
+/// ```
+/// # #[macro_use] extern crate im_rc as im;
+/// # use im::vector::Vector;
+/// # fn main() {
+/// assert_eq!(
+///   vector![1, 2, 3],
+///   Vector::from(vec![1, 2, 3])
+/// );
+/// # }
+/// ```
+#[macro_export]
+macro_rules! vector {
+    () => { $crate::vector::Vector::new() };
+
+    ( $($x:expr),* ) => {{
+        let mut l = $crate::vector::Vector::new();
+        $(
+            l.push_back($x);
+        )*
+            l
+    }};
+
+    ( $($x:expr ,)* ) => {{
+        let mut l = $crate::vector::Vector::new();
+        $(
+            l.push_back($x);
+        )*
+            l
+    }};
+}
+
+/// A persistent vector.
+///
+/// This is a sequence of elements in insertion order - if you need a list of
+/// things, any kind of list of things, this is what you're looking for.
+///
+/// It's implemented as an [RRB vector][rrbpaper] with [smart head/tail
+/// chunking][chunkedseq]. In performance terms, this means that practically
+/// every operation is O(log n), except push/pop on both sides, which will be
+/// O(1) amortised, and O(log n) in the worst case. In practice, the push/pop
+/// operations will be blindingly fast, nearly on par with the native
+/// [`VecDeque`][VecDeque], and other operations will have decent, if not high,
+/// performance, but they all have more or less the same O(log n) complexity, so
+/// you don't need to keep their performance characteristics in mind -
+/// everything, even splitting and merging, is safe to use and never too slow.
+///
+/// ## Performance Notes
+///
+/// Because of the head/tail chunking technique, until you push a number of
+/// items above double the tree's branching factor (that's `self.len()` = 2 ×
+/// *k* (where *k* = 64) = 128) on either side, the data structure is still just
+/// a handful of arrays, not yet an RRB tree, so you'll see performance and
+/// memory characteristics similar to [`Vec`][Vec] or [`VecDeque`][VecDeque].
+///
+/// This means that the structure always preallocates four chunks of size *k*
+/// (*k* being the tree's branching factor), equivalent to a [`Vec`][Vec] with
+/// an initial capacity of 256. Beyond that, it will allocate tree nodes of
+/// capacity *k* as needed.
+///
+/// In addition, vectors start out as single chunks, and only expand into the
+/// full data structure once you go past the chunk size. This makes them
+/// perform identically to [`Vec`][Vec] at small sizes.
+///
+/// [rrbpaper]: https://infoscience.epfl.ch/record/213452/files/rrbvector.pdf
+/// [chunkedseq]: http://deepsea.inria.fr/pasl/chunkedseq.pdf
+/// [Vec]: https://doc.rust-lang.org/std/vec/struct.Vec.html
+/// [VecDeque]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html
+pub enum Vector<A> {
+    #[doc(hidden)]
+    Single(Ref<Chunk<A>>),
+    #[doc(hidden)]
+    Full(RRB<A>),
+}
+
+#[doc(hidden)]
+pub struct RRB<A> {
+    length: usize,
+    middle_level: usize,
+    outer_f: Ref<Chunk<A>>,
+    inner_f: Ref<Chunk<A>>,
+    middle: Ref<Node<A>>,
+    inner_b: Ref<Chunk<A>>,
+    outer_b: Ref<Chunk<A>>,
+}
+
+impl<A> Clone for RRB<A> {
+    fn clone(&self) -> Self {
+        RRB {
+            length: self.length,
+            middle_level: self.middle_level,
+            outer_f: self.outer_f.clone(),
+            inner_f: self.inner_f.clone(),
+            middle: self.middle.clone(),
+            inner_b: self.inner_b.clone(),
+            outer_b: self.outer_b.clone(),
+        }
+    }
+}
+
+impl<A: Clone> Vector<A> {
+    /// True if a vector is a full single chunk, ie. must be promoted to grow
+    /// further.
+    fn needs_promotion(&self) -> bool {
+        match self {
+            Single(chunk) if chunk.is_full() => true,
+            _ => false,
+        }
+    }
+
+    /// Promote a single to a full, with the single chunk becomming inner_f.
+    fn promote_front(&mut self) {
+        let chunk = match self {
+            Single(chunk) => chunk.clone(),
+            _ => return,
+        };
+        *self = Full(RRB {
+            length: chunk.len(),
+            middle_level: 0,
+            outer_f: Ref::new(Chunk::new()),
+            inner_f: chunk,
+            middle: Ref::new(Node::new()),
+            inner_b: Ref::new(Chunk::new()),
+            outer_b: Ref::new(Chunk::new()),
+        })
+    }
+
+    /// Promote a single to a full, with the single chunk becomming inner_b.
+    fn promote_back(&mut self) {
+        let chunk = match self {
+            Single(chunk) => chunk.clone(),
+            _ => return,
+        };
+        *self = Full(RRB {
+            length: chunk.len(),
+            middle_level: 0,
+            outer_f: Ref::new(Chunk::new()),
+            inner_f: Ref::new(Chunk::new()),
+            middle: Ref::new(Node::new()),
+            inner_b: chunk,
+            outer_b: Ref::new(Chunk::new()),
+        })
+    }
+
+    /// Construct an empty vector.
+    #[must_use]
+    pub fn new() -> Self {
+        Single(Ref::new(Chunk::new()))
+    }
+
+    /// Construct a vector with a single value.
+    ///
+    /// This method has been deprecated; use [`unit`][unit] instead.
+    ///
+    /// [unit]: #method.unit
+    #[inline]
+    #[must_use]
+    #[deprecated(since = "12.3.0", note = "renamed to `unit` for consistency")]
+    pub fn singleton(a: A) -> Self {
+        Self::unit(a)
+    }
+
+    /// Construct a vector with a single value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let vec = Vector::unit(1337);
+    /// assert_eq!(1, vec.len());
+    /// assert_eq!(
+    ///   vec.get(0),
+    ///   Some(&1337)
+    /// );
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn unit(a: A) -> Self {
+        Single(Ref::new(Chunk::unit(a)))
+    }
+
+    /// Get the length of a vector.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # fn main() {
+    /// assert_eq!(5, vector![1, 2, 3, 4, 5].len());
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn len(&self) -> usize {
+        match self {
+            Single(chunk) => chunk.len(),
+            Full(tree) => tree.length,
+        }
+    }
+
+    /// Test whether a vector is empty.
+    ///
+    /// Time: O(1)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let vec = vector!["Joe", "Mike", "Robert"];
+    /// assert_eq!(false, vec.is_empty());
+    /// assert_eq!(true, Vector::<i32>::new().is_empty());
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Get an iterator over a vector.
+    ///
+    /// Time: O(1)
+    #[inline]
+    #[must_use]
+    pub fn iter(&self) -> Iter<A> {
+        Iter::new(self)
+    }
+
+    /// Get a mutable iterator over a vector.
+    ///
+    /// Time: O(1)
+    #[inline]
+    #[must_use]
+    pub fn iter_mut(&mut self) -> IterMut<A> {
+        IterMut::new(self)
+    }
+
+    /// Get an iterator over the leaf nodes of a vector.
+    ///
+    /// This method has been deprecated; use [`leaves`][leaves] instead.
+    ///
+    /// Time: O(1)
+    ///
+    /// [leaves]: #method.leaves
+    #[inline]
+    #[must_use]
+    #[deprecated(
+        since = "12.3.0",
+        note = "renamed to `leaves` to avoid confusion with Vec::chunks"
+    )]
+    pub fn chunks(&self) -> Chunks<'_, A> {
+        Chunks::new(self)
+    }
+
+    /// Get a mutable iterator over the leaf nodes of a vector.
+    ///
+    /// This method has been deprecated; use [`leaves_mut`][leaves_mut] instead.
+    ///
+    /// Time: O(1)
+    ///
+    /// [leaves_mut]: #method.leaves_mut
+    #[inline]
+    #[must_use]
+    #[deprecated(
+        since = "12.3.0",
+        note = "renamed to `leaves_mut` to avoid confusion with Vec::chunks"
+    )]
+    pub fn chunks_mut(&mut self) -> ChunksMut<'_, A> {
+        ChunksMut::new(self)
+    }
+
+    /// Get an iterator over the leaf nodes of a vector.
+    ///
+    /// This returns an iterator over the [`Chunk`s][Chunk] at the leaves of the
+    /// RRB tree. These are useful for efficient parallelisation of work on
+    /// the vector, but should not be used for basic iteration.
+    ///
+    /// Time: O(1)
+    ///
+    /// [Chunk]: ../chunk/struct.Chunk.html
+    #[inline]
+    #[must_use]
+    pub fn leaves(&self) -> Chunks<'_, A> {
+        Chunks::new(self)
+    }
+
+    /// Get a mutable iterator over the leaf nodes of a vector.
+    //
+    /// This returns an iterator over the [`Chunk`s][Chunk] at the leaves of the
+    /// RRB tree. These are useful for efficient parallelisation of work on
+    /// the vector, but should not be used for basic iteration.
+    ///
+    /// Time: O(1)
+    ///
+    /// [Chunk]: ../chunk/struct.Chunk.html
+    #[inline]
+    #[must_use]
+    pub fn leaves_mut(&mut self) -> ChunksMut<'_, A> {
+        ChunksMut::new(self)
+    }
+
+    /// Construct a [`Focus`][Focus] for a vector.
+    ///
+    /// Time: O(1)
+    ///
+    /// [Focus]: enum.Focus.html
+    #[inline]
+    #[must_use]
+    pub fn focus(&self) -> Focus<'_, A> {
+        Focus::new(self)
+    }
+
+    /// Construct a [`FocusMut`][FocusMut] for a vector.
+    ///
+    /// Time: O(1)
+    ///
+    /// [FocusMut]: enum.FocusMut.html
+    #[inline]
+    #[must_use]
+    pub fn focus_mut(&mut self) -> FocusMut<'_, A> {
+        FocusMut::new(self)
+    }
+
+    /// Get a reference to the value at index `index` in a vector.
+    ///
+    /// Returns `None` if the index is out of bounds.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let vec = vector!["Joe", "Mike", "Robert"];
+    /// assert_eq!(Some(&"Robert"), vec.get(2));
+    /// assert_eq!(None, vec.get(5));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get(&self, index: usize) -> Option<&A> {
+        if index >= self.len() {
+            return None;
+        }
+
+        match self {
+            Single(chunk) => chunk.get(index),
+            Full(tree) => {
+                let mut local_index = index;
+
+                if local_index < tree.outer_f.len() {
+                    return Some(&tree.outer_f[local_index]);
+                }
+                local_index -= tree.outer_f.len();
+
+                if local_index < tree.inner_f.len() {
+                    return Some(&tree.inner_f[local_index]);
+                }
+                local_index -= tree.inner_f.len();
+
+                if local_index < tree.middle.len() {
+                    return Some(tree.middle.index(tree.middle_level, local_index));
+                }
+                local_index -= tree.middle.len();
+
+                if local_index < tree.inner_b.len() {
+                    return Some(&tree.inner_b[local_index]);
+                }
+                local_index -= tree.inner_b.len();
+
+                Some(&tree.outer_b[local_index])
+            }
+        }
+    }
+
+    /// Get a mutable reference to the value at index `index` in a
+    /// vector.
+    ///
+    /// Returns `None` if the index is out of bounds.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector!["Joe", "Mike", "Robert"];
+    /// {
+    ///     let robert = vec.get_mut(2).unwrap();
+    ///     assert_eq!(&mut "Robert", robert);
+    ///     *robert = "Bjarne";
+    /// }
+    /// assert_eq!(vector!["Joe", "Mike", "Bjarne"], vec);
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn get_mut(&mut self, index: usize) -> Option<&mut A> {
+        if index >= self.len() {
+            return None;
+        }
+
+        match self {
+            Single(chunk) => Ref::make_mut(chunk).get_mut(index),
+            Full(tree) => {
+                let mut local_index = index;
+
+                if local_index < tree.outer_f.len() {
+                    let outer_f = Ref::make_mut(&mut tree.outer_f);
+                    return Some(&mut outer_f[local_index]);
+                }
+                local_index -= tree.outer_f.len();
+
+                if local_index < tree.inner_f.len() {
+                    let inner_f = Ref::make_mut(&mut tree.inner_f);
+                    return Some(&mut inner_f[local_index]);
+                }
+                local_index -= tree.inner_f.len();
+
+                if local_index < tree.middle.len() {
+                    let middle = Ref::make_mut(&mut tree.middle);
+                    return Some(middle.index_mut(tree.middle_level, local_index));
+                }
+                local_index -= tree.middle.len();
+
+                if local_index < tree.inner_b.len() {
+                    let inner_b = Ref::make_mut(&mut tree.inner_b);
+                    return Some(&mut inner_b[local_index]);
+                }
+                local_index -= tree.inner_b.len();
+
+                let outer_b = Ref::make_mut(&mut tree.outer_b);
+                Some(&mut outer_b[local_index])
+            }
+        }
+    }
+
+    /// Get the first element of a vector.
+    ///
+    /// If the vector is empty, `None` is returned.
+    ///
+    /// Time: O(log n)
+    #[inline]
+    #[must_use]
+    pub fn front(&self) -> Option<&A> {
+        self.get(0)
+    }
+
+    /// Get a mutable reference to the first element of a vector.
+    ///
+    /// If the vector is empty, `None` is returned.
+    ///
+    /// Time: O(log n)
+    #[inline]
+    #[must_use]
+    pub fn front_mut(&mut self) -> Option<&mut A> {
+        self.get_mut(0)
+    }
+
+    /// Get the first element of a vector.
+    ///
+    /// If the vector is empty, `None` is returned.
+    ///
+    /// This is an alias for the [`front`][front] method.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [front]: #method.front
+    #[inline]
+    #[must_use]
+    pub fn head(&self) -> Option<&A> {
+        self.get(0)
+    }
+
+    /// Get the last element of a vector.
+    ///
+    /// If the vector is empty, `None` is returned.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn back(&self) -> Option<&A> {
+        if self.is_empty() {
+            None
+        } else {
+            self.get(self.len() - 1)
+        }
+    }
+
+    /// Get a mutable reference to the last element of a vector.
+    ///
+    /// If the vector is empty, `None` is returned.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn back_mut(&mut self) -> Option<&mut A> {
+        if self.is_empty() {
+            None
+        } else {
+            let len = self.len();
+            self.get_mut(len - 1)
+        }
+    }
+
+    /// Get the last element of a vector.
+    ///
+    /// If the vector is empty, `None` is returned.
+    ///
+    /// This is an alias for the [`back`][back] method.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [back]: #method.back
+    #[inline]
+    #[must_use]
+    pub fn last(&self) -> Option<&A> {
+        self.back()
+    }
+
+    /// Get the index of a given element in the vector.
+    ///
+    /// Searches the vector for the first occurrence of a given value,
+    /// and returns the index of the value if it's there. Otherwise,
+    /// it returns `None`.
+    ///
+    /// Time: O(n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3, 4, 5];
+    /// assert_eq!(Some(2), vec.index_of(&3));
+    /// assert_eq!(None, vec.index_of(&31337));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn index_of(&self, value: &A) -> Option<usize>
+    where
+        A: PartialEq,
+    {
+        for (index, item) in self.iter().enumerate() {
+            if value == item {
+                return Some(index);
+            }
+        }
+        None
+    }
+
+    /// Test if a given element is in the vector.
+    ///
+    /// Searches the vector for the first occurrence of a given value,
+    /// and returns `true if it's there. If it's nowhere to be found
+    /// in the vector, it returns `false`.
+    ///
+    /// Time: O(n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3, 4, 5];
+    /// assert_eq!(true, vec.contains(&3));
+    /// assert_eq!(false, vec.contains(&31337));
+    /// # }
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn contains(&self, value: &A) -> bool
+    where
+        A: PartialEq,
+    {
+        self.index_of(value).is_some()
+    }
+
+    /// Create a new vector with the value at index `index` updated.
+    ///
+    /// Panics if the index is out of bounds.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3];
+    /// assert_eq!(vector![1, 5, 3], vec.update(1, 5));
+    /// # }
+    /// ```
+    #[must_use]
+    pub fn update(&self, index: usize, value: A) -> Self {
+        let mut out = self.clone();
+        out[index] = value;
+        out
+    }
+
+    /// Update the value at index `index` in a vector.
+    ///
+    /// Returns the previous value at the index.
+    ///
+    /// Panics if the index is out of bounds.
+    ///
+    /// Time: O(log n)
+    #[inline]
+    pub fn set(&mut self, index: usize, value: A) -> A {
+        replace(&mut self[index], value)
+    }
+
+    /// Swap the elements at indices `i` and `j`.
+    ///
+    /// Time: O(log n)
+    pub fn swap(&mut self, i: usize, j: usize) {
+        swap_indices(self, i, j)
+    }
+
+    /// Push a value to the front of a vector.
+    ///
+    /// Time: O(1)*
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![5, 6, 7];
+    /// vec.push_front(4);
+    /// assert_eq!(vector![4, 5, 6, 7], vec);
+    /// # }
+    /// ```
+    pub fn push_front(&mut self, value: A) {
+        if self.needs_promotion() {
+            self.promote_back();
+        }
+        match self {
+            Single(chunk) => Ref::make_mut(chunk).push_front(value),
+            Full(tree) => tree.push_front(value),
+        }
+    }
+
+    /// Push a value to the back of a vector.
+    ///
+    /// Time: O(1)*
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3];
+    /// vec.push_back(4);
+    /// assert_eq!(vector![1, 2, 3, 4], vec);
+    /// # }
+    /// ```
+    pub fn push_back(&mut self, value: A) {
+        if self.needs_promotion() {
+            self.promote_front();
+        }
+        match self {
+            Single(chunk) => Ref::make_mut(chunk).push_back(value),
+            Full(tree) => tree.push_back(value),
+        }
+    }
+
+    /// Remove the first element from a vector and return it.
+    ///
+    /// Time: O(1)*
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3];
+    /// assert_eq!(Some(1), vec.pop_front());
+    /// assert_eq!(vector![2, 3], vec);
+    /// # }
+    /// ```
+    pub fn pop_front(&mut self) -> Option<A> {
+        if self.is_empty() {
+            None
+        } else {
+            match self {
+                Single(chunk) => Some(Ref::make_mut(chunk).pop_front()),
+                Full(tree) => tree.pop_front(),
+            }
+        }
+    }
+
+    /// Remove the last element from a vector and return it.
+    ///
+    /// Time: O(1)*
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3];
+    /// assert_eq!(Some(3), vec.pop_back());
+    /// assert_eq!(vector![1, 2], vec);
+    /// # }
+    /// ```
+    pub fn pop_back(&mut self) -> Option<A> {
+        if self.is_empty() {
+            None
+        } else {
+            match self {
+                Single(chunk) => Some(Ref::make_mut(chunk).pop_back()),
+                Full(tree) => tree.pop_back(),
+            }
+        }
+    }
+
+    /// Append the vector `other` to the end of the current vector.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3];
+    /// vec.append(vector![7, 8, 9]);
+    /// assert_eq!(vector![1, 2, 3, 7, 8, 9], vec);
+    /// # }
+    /// ```
+    pub fn append(&mut self, mut other: Self) {
+        if other.is_empty() {
+            return;
+        }
+
+        if self.is_empty() {
+            replace(self, other);
+            return;
+        }
+
+        let total_length = self
+            .len()
+            .checked_add(other.len())
+            .expect("Vector length overflow");
+
+        match self {
+            Single(left) => {
+                match other {
+                    // If both are single chunks and left has room for right: directly
+                    // memcpy right into left
+                    Single(ref mut right) if total_length <= CHUNK_SIZE => {
+                        Ref::make_mut(left).append(Ref::make_mut(right));
+                        return;
+                    }
+                    // If only left is a single chunk and has room for right: push
+                    // right's elements into left
+                    ref mut right if total_length <= CHUNK_SIZE => {
+                        while let Some(value) = right.pop_front() {
+                            Ref::make_mut(left).push_back(value);
+                        }
+                        return;
+                    }
+                    _ => {}
+                }
+            }
+            Full(left) => {
+                if let Full(mut right) = other {
+                    // If left and right are trees with empty middles, left has no back
+                    // buffers, and right has no front buffers: copy right's back
+                    // buffers over to left
+                    if left.middle.is_empty()
+                        && right.middle.is_empty()
+                        && left.outer_b.is_empty()
+                        && left.inner_b.is_empty()
+                        && right.outer_f.is_empty()
+                        && right.inner_f.is_empty()
+                    {
+                        left.inner_b = right.inner_b;
+                        left.outer_b = right.outer_b;
+                        left.length = total_length;
+                        return;
+                    }
+                    // If left and right are trees with empty middles and left's buffers
+                    // can fit right's buffers: push right's elements onto left
+                    if left.middle.is_empty()
+                        && right.middle.is_empty()
+                        && total_length <= CHUNK_SIZE * 4
+                    {
+                        while let Some(value) = right.pop_front() {
+                            left.push_back(value);
+                        }
+                        return;
+                    }
+                    // Both are full and big: do the full RRB join
+                    let inner_b1 = left.inner_b.clone();
+                    left.push_middle(Side::Right, inner_b1);
+                    let outer_b1 = left.outer_b.clone();
+                    left.push_middle(Side::Right, outer_b1);
+                    let inner_f2 = right.inner_f.clone();
+                    right.push_middle(Side::Left, inner_f2);
+                    let outer_f2 = right.outer_f.clone();
+                    right.push_middle(Side::Left, outer_f2);
+
+                    let mut middle1 = clone_ref(replace(&mut left.middle, Ref::from(Node::new())));
+                    let mut middle2 = clone_ref(right.middle);
+                    let normalised_middle = if left.middle_level > right.middle_level {
+                        middle2 = middle2.elevate(left.middle_level - right.middle_level);
+                        left.middle_level
+                    } else if left.middle_level < right.middle_level {
+                        middle1 = middle1.elevate(right.middle_level - left.middle_level);
+                        right.middle_level
+                    } else {
+                        left.middle_level
+                    };
+                    left.middle = Ref::new(Node::merge(
+                        Ref::from(middle1),
+                        Ref::from(middle2),
+                        normalised_middle,
+                    ));
+                    left.middle_level = normalised_middle + 1;
+
+                    left.inner_b = right.inner_b;
+                    left.outer_b = right.outer_b;
+                    left.length = total_length;
+                    left.prune();
+                    return;
+                }
+            }
+        }
+        // No optimisations available, and either left, right or both are
+        // single: promote both to full and retry
+        self.promote_front();
+        other.promote_back();
+        self.append(other)
+    }
+
+    /// Retain only the elements specified by the predicate.
+    ///
+    /// Remove all elements for which the provided function `f`
+    /// returns false from the vector.
+    ///
+    /// Time: O(n)
+    pub fn retain<F>(&mut self, mut f: F)
+    where
+        F: FnMut(&A) -> bool,
+    {
+        let len = self.len();
+        let mut del = 0;
+        {
+            let mut focus = self.focus_mut();
+            for i in 0..len {
+                if !f(focus.index(i)) {
+                    del += 1;
+                } else if del > 0 {
+                    focus.swap(i - del, i);
+                }
+            }
+        }
+        if del > 0 {
+            self.split_off(len - del);
+        }
+    }
+
+    /// Split a vector at a given index.
+    ///
+    /// Split a vector at a given index, consuming the vector and
+    /// returning a pair of the left hand side and the right hand side
+    /// of the split.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3, 7, 8, 9];
+    /// let (left, right) = vec.split_at(3);
+    /// assert_eq!(vector![1, 2, 3], left);
+    /// assert_eq!(vector![7, 8, 9], right);
+    /// # }
+    /// ```
+    pub fn split_at(mut self, index: usize) -> (Self, Self) {
+        let right = self.split_off(index);
+        (self, right)
+    }
+
+    /// Split a vector at a given index.
+    ///
+    /// Split a vector at a given index, leaving the left hand side in
+    /// the current vector and returning a new vector containing the
+    /// right hand side.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let mut left = vector![1, 2, 3, 7, 8, 9];
+    /// let right = left.split_off(3);
+    /// assert_eq!(vector![1, 2, 3], left);
+    /// assert_eq!(vector![7, 8, 9], right);
+    /// # }
+    /// ```
+    pub fn split_off(&mut self, index: usize) -> Self {
+        assert!(index <= self.len());
+
+        match self {
+            Single(chunk) => Single(Ref::new(Ref::make_mut(chunk).split_off(index))),
+            Full(tree) => {
+                let mut local_index = index;
+
+                if local_index < tree.outer_f.len() {
+                    let of2 = Ref::make_mut(&mut tree.outer_f).split_off(local_index);
+                    let right = RRB {
+                        length: tree.length - index,
+                        middle_level: tree.middle_level,
+                        outer_f: Ref::new(of2),
+                        inner_f: replace_def(&mut tree.inner_f),
+                        middle: replace_def(&mut tree.middle),
+                        inner_b: replace_def(&mut tree.inner_b),
+                        outer_b: replace_def(&mut tree.outer_b),
+                    };
+                    tree.length = index;
+                    tree.middle_level = 0;
+                    return Full(right);
+                }
+
+                local_index -= tree.outer_f.len();
+
+                if local_index < tree.inner_f.len() {
+                    let if2 = Ref::make_mut(&mut tree.inner_f).split_off(local_index);
+                    let right = RRB {
+                        length: tree.length - index,
+                        middle_level: tree.middle_level,
+                        outer_f: Ref::new(if2),
+                        inner_f: Ref::<Chunk<A>>::default(),
+                        middle: replace_def(&mut tree.middle),
+                        inner_b: replace_def(&mut tree.inner_b),
+                        outer_b: replace_def(&mut tree.outer_b),
+                    };
+                    tree.length = index;
+                    tree.middle_level = 0;
+                    swap(&mut tree.outer_b, &mut tree.inner_f);
+                    return Full(right);
+                }
+
+                local_index -= tree.inner_f.len();
+
+                if local_index < tree.middle.len() {
+                    let mut right_middle = tree.middle.clone();
+                    let (c1, c2) = {
+                        let m1 = Ref::make_mut(&mut tree.middle);
+                        let m2 = Ref::make_mut(&mut right_middle);
+                        match m1.split(tree.middle_level, Side::Right, local_index) {
+                            SplitResult::Dropped(_) => (),
+                            SplitResult::OutOfBounds => unreachable!(),
+                        };
+                        match m2.split(tree.middle_level, Side::Left, local_index) {
+                            SplitResult::Dropped(_) => (),
+                            SplitResult::OutOfBounds => unreachable!(),
+                        };
+                        let c1 = match m1.pop_chunk(tree.middle_level, Side::Right) {
+                            PopResult::Empty => Ref::<Chunk<A>>::default(),
+                            PopResult::Done(chunk) => chunk,
+                            PopResult::Drained(chunk) => {
+                                m1.clear_node();
+                                chunk
+                            }
+                        };
+                        let c2 = match m2.pop_chunk(tree.middle_level, Side::Left) {
+                            PopResult::Empty => Ref::<Chunk<A>>::default(),
+                            PopResult::Done(chunk) => chunk,
+                            PopResult::Drained(chunk) => {
+                                m2.clear_node();
+                                chunk
+                            }
+                        };
+                        (c1, c2)
+                    };
+                    let mut right = RRB {
+                        length: tree.length - index,
+                        middle_level: tree.middle_level,
+                        outer_f: c2,
+                        inner_f: Ref::<Chunk<A>>::default(),
+                        middle: right_middle,
+                        inner_b: replace_def(&mut tree.inner_b),
+                        outer_b: replace(&mut tree.outer_b, c1),
+                    };
+                    tree.length = index;
+                    tree.prune();
+                    right.prune();
+                    return Full(right);
+                }
+
+                local_index -= tree.middle.len();
+
+                if local_index < tree.inner_b.len() {
+                    let ib2 = Ref::make_mut(&mut tree.inner_b).split_off(local_index);
+                    let right = RRB {
+                        length: tree.length - index,
+                        outer_b: replace_def(&mut tree.outer_b),
+                        outer_f: Ref::new(ib2),
+                        ..RRB::new()
+                    };
+                    tree.length = index;
+                    swap(&mut tree.outer_b, &mut tree.inner_b);
+                    return Full(right);
+                }
+
+                local_index -= tree.inner_b.len();
+
+                let ob2 = Ref::make_mut(&mut tree.outer_b).split_off(local_index);
+                tree.length = index;
+                Single(Ref::new(ob2))
+            }
+        }
+    }
+
+    /// Construct a vector with `count` elements removed from the
+    /// start of the current vector.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn skip(&self, count: usize) -> Self {
+        // FIXME can be made more efficient by dropping the unwanted side without constructing it
+        self.clone().split_off(count)
+    }
+
+    /// Construct a vector of the first `count` elements from the
+    /// current vector.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn take(&self, count: usize) -> Self {
+        // FIXME can be made more efficient by dropping the unwanted side without constructing it
+        let mut left = self.clone();
+        left.split_off(count);
+        left
+    }
+
+    /// Truncate a vector to the given size.
+    ///
+    /// Discards all elements in the vector beyond the given length.
+    ///
+    /// Panics if the new length is greater than the current length.
+    ///
+    /// Time: O(log n)
+    pub fn truncate(&mut self, len: usize) {
+        // FIXME can be made more efficient by dropping the unwanted side without constructing it
+        self.split_off(len);
+    }
+
+    /// Extract a slice from a vector.
+    ///
+    /// Remove the elements from `start_index` until `end_index` in
+    /// the current vector and return the removed slice as a new
+    /// vector.
+    ///
+    /// Time: O(log n)
+    pub fn slice<R>(&mut self, range: R) -> Self
+    where
+        R: RangeBounds<usize>,
+    {
+        let r = to_range(&range, self.len());
+        if r.start >= r.end || r.start >= self.len() {
+            return Vector::new();
+        }
+        let mut middle = self.split_off(r.start);
+        let right = middle.split_off(r.end - r.start);
+        self.append(right);
+        middle
+    }
+
+    /// Insert an element into a vector.
+    ///
+    /// Insert an element at position `index`, shifting all elements
+    /// after it to the right.
+    ///
+    /// ## Performance Note
+    ///
+    /// While `push_front` and `push_back` are heavily optimised
+    /// operations, `insert` in the middle of a vector requires a
+    /// split, a push, and an append. Thus, if you want to insert
+    /// many elements at the same location, instead of `insert`ing
+    /// them one by one, you should rather create a new vector
+    /// containing the elements to insert, split the vector at the
+    /// insertion point, and append the left hand, the new vector and
+    /// the right hand in order.
+    ///
+    /// Time: O(log n)
+    pub fn insert(&mut self, index: usize, value: A) {
+        if index == 0 {
+            return self.push_front(value);
+        }
+        if index == self.len() {
+            return self.push_back(value);
+        }
+        assert!(index < self.len());
+        match self {
+            Single(chunk) if chunk.len() < CHUNK_SIZE => Ref::make_mut(chunk).insert(index, value),
+            // TODO a lot of optimisations still possible here
+            _ => {
+                let right = self.split_off(index);
+                self.push_back(value);
+                self.append(right);
+            }
+        }
+    }
+
+    /// Remove an element from a vector.
+    ///
+    /// Remove the element from position 'index', shifting all
+    /// elements after it to the left, and return the removec element.
+    ///
+    /// ## Performance Note
+    ///
+    /// While `pop_front` and `pop_back` are heavily optimised
+    /// operations, `remove` in the middle of a vector requires a
+    /// split, a pop, and an append. Thus, if you want to remove many
+    /// elements from the same location, instead of `remove`ing them
+    /// one by one, it is much better to use [`slice`][slice].
+    ///
+    /// Time: O(log n)
+    ///
+    /// [slice]: #method.slice
+    pub fn remove(&mut self, index: usize) -> A {
+        assert!(index < self.len());
+        match self {
+            Single(chunk) => Ref::make_mut(chunk).remove(index),
+            _ => {
+                if index == 0 {
+                    return self.pop_front().unwrap();
+                }
+                if index == self.len() - 1 {
+                    return self.pop_back().unwrap();
+                }
+                // TODO a lot of optimisations still possible here
+                let mut right = self.split_off(index);
+                let value = right.pop_front().unwrap();
+                self.append(right);
+                value
+            }
+        }
+    }
+
+    /// Discard all elements from the vector.
+    ///
+    /// This leaves you with an empty vector, and all elements that
+    /// were previously inside it are dropped.
+    ///
+    /// Time: O(n)
+    pub fn clear(&mut self) {
+        if !self.is_empty() {
+            *self = Single(Ref::new(Chunk::new()));
+        }
+    }
+
+    /// Binary search a sorted vector for a given element using a comparator
+    /// function.
+    ///
+    /// Assumes the vector has already been sorted using the same comparator
+    /// function, eg. by using [`sort_by`][sort_by].
+    ///
+    /// If the value is found, it returns `Ok(index)` where `index` is the index
+    /// of the element. If the value isn't found, it returns `Err(index)` where
+    /// `index` is the index at which the element would need to be inserted to
+    /// maintain sorted order.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [sort_by]: #method.sort_by
+    #[must_use]
+    pub fn binary_search_by<F>(&self, mut f: F) -> Result<usize, usize>
+    where
+        F: FnMut(&A) -> Ordering,
+    {
+        let mut size = self.len();
+        if size == 0 {
+            return Err(0);
+        }
+        let mut base = 0;
+        while size > 1 {
+            let half = size / 2;
+            let mid = base + half;
+            base = match f(&self[mid]) {
+                Ordering::Greater => base,
+                _ => mid,
+            };
+            size -= half;
+        }
+        match f(&self[base]) {
+            Ordering::Equal => Ok(base),
+            Ordering::Greater => Err(base),
+            Ordering::Less => Err(base + 1),
+        }
+    }
+
+    /// Binary search a sorted vector for a given element.
+    ///
+    /// If the value is found, it returns `Ok(index)` where `index` is the index
+    /// of the element. If the value isn't found, it returns `Err(index)` where
+    /// `index` is the index at which the element would need to be inserted to
+    /// maintain sorted order.
+    ///
+    /// Time: O(log n)
+    #[must_use]
+    pub fn binary_search(&self, value: &A) -> Result<usize, usize>
+    where
+        A: Ord,
+    {
+        self.binary_search_by(|e| e.cmp(value))
+    }
+
+    /// Binary search a sorted vector for a given element with a key extract
+    /// function.
+    ///
+    /// Assumes the vector has already been sorted using the same key extract
+    /// function, eg. by using [`sort_by_key`][sort_by_key].
+    ///
+    /// If the value is found, it returns `Ok(index)` where `index` is the index
+    /// of the element. If the value isn't found, it returns `Err(index)` where
+    /// `index` is the index at which the element would need to be inserted to
+    /// maintain sorted order.
+    ///
+    /// Time: O(log n)
+    ///
+    /// [sort_by_key]: #method.sort_by_key
+    #[must_use]
+    pub fn binary_search_by_key<B, F>(&self, b: &B, mut f: F) -> Result<usize, usize>
+    where
+        F: FnMut(&A) -> B,
+        B: Ord,
+    {
+        self.binary_search_by(|k| f(k).cmp(b))
+    }
+
+    /// Insert an element into a sorted vector.
+    ///
+    /// Insert an element into a vector in sorted order, assuming the vector is
+    /// already in sorted order.
+    ///
+    /// Time: O(log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![1, 2, 3, 7, 8, 9];
+    /// vec.insert_ord(5);
+    /// assert_eq!(vector![1, 2, 3, 5, 7, 8, 9], vec);
+    /// # }
+    /// ```
+    pub fn insert_ord(&mut self, item: A)
+    where
+        A: Ord,
+    {
+        match self.binary_search(&item) {
+            Ok(index) => self.insert(index, item),
+            Err(index) => self.insert(index, item),
+        }
+    }
+
+    /// Sort a vector.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![3, 2, 5, 4, 1];
+    /// vec.sort();
+    /// assert_eq!(vector![1, 2, 3, 4, 5], vec);
+    /// # }
+    /// ```
+    pub fn sort(&mut self)
+    where
+        A: Ord,
+    {
+        self.sort_by(Ord::cmp)
+    }
+
+    /// Sort a vector using a comparator function.
+    ///
+    /// Time: O(n log n)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate im_rc as im;
+    /// # use im::vector::Vector;
+    /// # fn main() {
+    /// let mut vec = vector![3, 2, 5, 4, 1];
+    /// vec.sort_by(|left, right| left.cmp(right));
+    /// assert_eq!(vector![1, 2, 3, 4, 5], vec);
+    /// # }
+    /// ```
+    pub fn sort_by<F>(&mut self, cmp: F)
+    where
+        F: Fn(&A, &A) -> Ordering,
+    {
+        let len = self.len();
+        if len > 1 {
+            sort::quicksort(&mut self.focus_mut(), 0, len - 1, &cmp);
+        }
+    }
+}
+
+// Implementation details
+
+impl<A: Clone> RRB<A> {
+    fn into_iter(
+        self,
+    ) -> Chain<
+        Chain<Chain<Chain<ChunkIter<A>, ChunkIter<A>>, ConsumingNodeIter<A>>, ChunkIter<A>>,
+        ChunkIter<A>,
+    > {
+        let outer_f = clone_ref(self.outer_f).into_iter();
+        let inner_f = clone_ref(self.inner_f).into_iter();
+        let middle = ConsumingNodeIter::new(clone_ref(self.middle), self.middle_level);
+        let inner_b = clone_ref(self.inner_b).into_iter();
+        let outer_b = clone_ref(self.outer_b).into_iter();
+        outer_f
+            .chain(inner_f)
+            .chain(middle)
+            .chain(inner_b)
+            .chain(outer_b)
+    }
+
+    fn new() -> Self {
+        RRB {
+            length: 0,
+            middle_level: 0,
+            outer_f: Ref::new(Chunk::new()),
+            inner_f: Ref::new(Chunk::new()),
+            middle: Ref::new(Node::new()),
+            inner_b: Ref::new(Chunk::new()),
+            outer_b: Ref::new(Chunk::new()),
+        }
+    }
+
+    fn prune(&mut self) {
+        if self.middle.is_empty() {
+            self.middle = Ref::new(Node::new());
+            self.middle_level = 0;
+        } else {
+            while self.middle_level > 0 && self.middle.is_single() {
+                self.middle = self.middle.first_child().clone();
+                self.middle_level -= 1;
+            }
+        }
+    }
+
+    fn pop_front(&mut self) -> Option<A> {
+        if self.length == 0 {
+            return None;
+        }
+        if self.outer_f.is_empty() {
+            if self.inner_f.is_empty() {
+                if self.middle.is_empty() {
+                    if self.inner_b.is_empty() {
+                        swap(&mut self.outer_f, &mut self.outer_b);
+                    } else {
+                        swap(&mut self.outer_f, &mut self.inner_b);
+                    }
+                } else {
+                    self.outer_f = self.pop_middle(Side::Left).unwrap();
+                }
+            } else {
+                swap(&mut self.outer_f, &mut self.inner_f);
+            }
+        }
+        self.length -= 1;
+        let outer_f = Ref::make_mut(&mut self.outer_f);
+        Some(outer_f.pop_front())
+    }
+
+    fn pop_back(&mut self) -> Option<A> {
+        if self.length == 0 {
+            return None;
+        }
+        if self.outer_b.is_empty() {
+            if self.inner_b.is_empty() {
+                if self.middle.is_empty() {
+                    if self.inner_f.is_empty() {
+                        swap(&mut self.outer_b, &mut self.outer_f);
+                    } else {
+                        swap(&mut self.outer_b, &mut self.inner_f);
+                    }
+                } else {
+                    self.outer_b = self.pop_middle(Side::Right).unwrap();
+                }
+            } else {
+                swap(&mut self.outer_b, &mut self.inner_b);
+            }
+        }
+        self.length -= 1;
+        let outer_b = Ref::make_mut(&mut self.outer_b);
+        Some(outer_b.pop_back())
+    }
+
+    fn push_front(&mut self, value: A) {
+        if self.outer_f.is_full() {
+            swap(&mut self.outer_f, &mut self.inner_f);
+            if !self.outer_f.is_empty() {
+                let mut chunk = Ref::new(Chunk::new());
+                swap(&mut chunk, &mut self.outer_f);
+                self.push_middle(Side::Left, chunk);
+            }
+        }
+        self.length = self.length.checked_add(1).expect("Vector length overflow");
+        let outer_f = Ref::make_mut(&mut self.outer_f);
+        outer_f.push_front(value)
+    }
+
+    fn push_back(&mut self, value: A) {
+        if self.outer_b.is_full() {
+            swap(&mut self.outer_b, &mut self.inner_b);
+            if !self.outer_b.is_empty() {
+                let mut chunk = Ref::new(Chunk::new());
+                swap(&mut chunk, &mut self.outer_b);
+                self.push_middle(Side::Right, chunk);
+            }
+        }
+        self.length = self.length.checked_add(1).expect("Vector length overflow");
+        let outer_b = Ref::make_mut(&mut self.outer_b);
+        outer_b.push_back(value)
+    }
+
+    fn push_middle(&mut self, side: Side, chunk: Ref<Chunk<A>>) {
+        if chunk.is_empty() {
+            return;
+        }
+        let new_middle = {
+            let middle = Ref::make_mut(&mut self.middle);
+            match middle.push_chunk(self.middle_level, side, chunk) {
+                PushResult::Done => return,
+                PushResult::Full(chunk) => Ref::from({
+                    match side {
+                        Side::Left => Node::from_chunk(self.middle_level, chunk)
+                            .join_branches(middle.clone(), self.middle_level),
+                        Side::Right => middle.clone().join_branches(
+                            Node::from_chunk(self.middle_level, chunk),
+                            self.middle_level,
+                        ),
+                    }
+                }),
+            }
+        };
+        self.middle_level += 1;
+        self.middle = new_middle;
+    }
+
+    fn pop_middle(&mut self, side: Side) -> Option<Ref<Chunk<A>>> {
+        let chunk = {
+            let middle = Ref::make_mut(&mut self.middle);
+            match middle.pop_chunk(self.middle_level, side) {
+                PopResult::Empty => return None,
+                PopResult::Done(chunk) => chunk,
+                PopResult::Drained(chunk) => {
+                    middle.clear_node();
+                    self.middle_level = 0;
+                    chunk
+                }
+            }
+        };
+        Some(chunk)
+    }
+}
+
+#[inline]
+fn replace_def<A: Default>(dest: &mut A) -> A {
+    replace(dest, Default::default())
+}
+
+// Core traits
+
+impl<A: Clone> Default for Vector<A> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<A: Clone> Clone for Vector<A> {
+    fn clone(&self) -> Self {
+        match self {
+            Single(chunk) => Single(chunk.clone()),
+            Full(tree) => Full(tree.clone()),
+        }
+    }
+}
+
+impl<A: Clone + Debug> Debug for Vector<A> {
+    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
+        f.debug_list().entries(self.iter()).finish()
+        // match self {
+        //     Full(rrb) => {
+        //         writeln!(f, "Head: {:?} {:?}", rrb.outer_f, rrb.inner_f)?;
+        //         rrb.middle.print(f, 0, rrb.middle_level)?;
+        //         writeln!(f, "Tail: {:?} {:?}", rrb.inner_b, rrb.outer_b)
+        //     }
+        //     Single(_) => write!(f, "nowt"),
+        // }
+    }
+}
+
+#[cfg(not(has_specialisation))]
+impl<A: Clone + PartialEq> PartialEq for Vector<A> {
+    fn eq(&self, other: &Self) -> bool {
+        self.len() == other.len() && self.iter().eq(other.iter())
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<A: Clone + PartialEq> PartialEq for Vector<A> {
+    default fn eq(&self, other: &Self) -> bool {
+        self.len() == other.len() && self.iter().eq(other.iter())
+    }
+}
+
+#[cfg(has_specialisation)]
+impl<A: Clone + Eq> PartialEq for Vector<A> {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Full(left), Full(right)) => {
+                if left.length != right.length {
+                    return false;
+                }
+
+                fn cmp_chunk<A>(left: &Ref<Chunk<A>>, right: &Ref<Chunk<A>>) -> bool {
+                    (left.is_empty() && right.is_empty()) || Ref::ptr_eq(left, right)
+                }
+
+                if cmp_chunk(&left.outer_f, &right.outer_f)
+                    && cmp_chunk(&left.inner_f, &right.inner_f)
+                    && cmp_chunk(&left.inner_b, &right.inner_b)
+                    && cmp_chunk(&left.outer_b, &right.outer_b)
+                    && (left.middle.is_empty() && right.middle.is_empty())
+                    || Ref::ptr_eq(&left.middle, &right.middle)
+                {
+                    return true;
+                }
+                self.iter().eq(other.iter())
+            }
+            (left, right) => left.len() == right.len() && left.iter().eq(right.iter()),
+        }
+    }
+}
+
+impl<A: Clone + Eq> Eq for Vector<A> {}
+
+impl<A: Clone + PartialOrd> PartialOrd for Vector<A> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.iter().partial_cmp(other.iter())
+    }
+}
+
+impl<A: Clone + Ord> Ord for Vector<A> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.iter().cmp(other.iter())
+    }
+}
+
+impl<A: Clone + Hash> Hash for Vector<A> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        for i in self {
+            i.hash(state)
+        }
+    }
+}
+
+impl<A: Clone> Sum for Vector<A> {
+    fn sum<I>(it: I) -> Self
+    where
+        I: Iterator<Item = Self>,
+    {
+        it.fold(Self::new(), |a, b| a + b)
+    }
+}
+
+impl<A: Clone> Add for Vector<A> {
+    type Output = Vector<A>;
+
+    /// Concatenate two vectors.
+    ///
+    /// Time: O(log n)
+    fn add(mut self, other: Self) -> Self::Output {
+        self.append(other);
+        self
+    }
+}
+
+impl<'a, A: Clone> Add for &'a Vector<A> {
+    type Output = Vector<A>;
+
+    /// Concatenate two vectors.
+    ///
+    /// Time: O(log n)
+    fn add(self, other: Self) -> Self::Output {
+        let mut out = self.clone();
+        out.append(other.clone());
+        out
+    }
+}
+
+impl<A: Clone> Extend<A> for Vector<A> {
+    /// Add values to the end of a vector by consuming an iterator.
+    ///
+    /// Time: O(n)
+    fn extend<I>(&mut self, iter: I)
+    where
+        I: IntoIterator<Item = A>,
+    {
+        for item in iter {
+            self.push_back(item)
+        }
+    }
+}
+
+impl<A: Clone> Index<usize> for Vector<A> {
+    type Output = A;
+    /// Get a reference to the value at index `index` in the vector.
+    ///
+    /// Time: O(log n)
+    fn index(&self, index: usize) -> &Self::Output {
+        match self.get(index) {
+            Some(value) => value,
+            None => panic!(
+                "Vector::index: index out of bounds: {} < {}",
+                index,
+                self.len()
+            ),
+        }
+    }
+}
+
+impl<A: Clone> IndexMut<usize> for Vector<A> {
+    /// Get a mutable reference to the value at index `index` in the
+    /// vector.
+    ///
+    /// Time: O(log n)
+    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
+        match self.get_mut(index) {
+            Some(value) => value,
+            None => panic!("Vector::index_mut: index out of bounds"),
+        }
+    }
+}
+
+// Conversions
+
+impl<'a, A: Clone> IntoIterator for &'a Vector<A> {
+    type Item = &'a A;
+    type IntoIter = Iter<'a, A>;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<A: Clone> IntoIterator for Vector<A> {
+    type Item = A;
+    type IntoIter = ConsumingIter<A>;
+    fn into_iter(self) -> Self::IntoIter {
+        ConsumingIter::new(self)
+    }
+}
+
+impl<A: Clone> FromIterator<A> for Vector<A> {
+    /// Create a vector from an iterator.
+    ///
+    /// Time: O(n)
+    fn from_iter<I>(iter: I) -> Self
+    where
+        I: IntoIterator<Item = A>,
+    {
+        let mut seq = Self::new();
+        for item in iter {
+            seq.push_back(item)
+        }
+        seq
+    }
+}
+
+impl<'s, 'a, A, OA> From<&'s Vector<&'a A>> for Vector<OA>
+where
+    A: ToOwned<Owned = OA>,
+    OA: Borrow<A> + Clone,
+{
+    fn from(vec: &Vector<&A>) -> Self {
+        vec.iter().map(|a| (*a).to_owned()).collect()
+    }
+}
+
+impl<'a, A: Clone> From<&'a [A]> for Vector<A> {
+    fn from(slice: &[A]) -> Self {
+        slice.iter().cloned().collect()
+    }
+}
+
+impl<A: Clone> From<Vec<A>> for Vector<A> {
+    /// Create a vector from a [`std::vec::Vec`][vec].
+    ///
+    /// Time: O(n)
+    ///
+    /// [vec]: https://doc.rust-lang.org/std/vec/struct.Vec.html
+    fn from(vec: Vec<A>) -> Self {
+        vec.into_iter().collect()
+    }
+}
+
+impl<'a, A: Clone> From<&'a Vec<A>> for Vector<A> {
+    /// Create a vector from a [`std::vec::Vec`][vec].
+    ///
+    /// Time: O(n)
+    ///
+    /// [vec]: https://doc.rust-lang.org/std/vec/struct.Vec.html
+    fn from(vec: &Vec<A>) -> Self {
+        vec.iter().cloned().collect()
+    }
+}
+
+// Iterators
+
+/// An iterator over vectors with values of type `A`.
+///
+/// To obtain one, use [`Vector::iter()`][iter].
+///
+/// [iter]: enum.Vector.html#method.iter
+pub struct Iter<'a, A: 'a> {
+    focus: Focus<'a, A>,
+    front_index: usize,
+    back_index: usize,
+}
+
+impl<'a, A: Clone> Iter<'a, A> {
+    fn new(seq: &'a Vector<A>) -> Self {
+        Iter {
+            focus: seq.focus(),
+            front_index: 0,
+            back_index: seq.len(),
+        }
+    }
+
+    fn from_focus(focus: Focus<'a, A>) -> Self {
+        Iter {
+            front_index: 0,
+            back_index: focus.len(),
+            focus,
+        }
+    }
+}
+
+impl<'a, A: Clone> Iterator for Iter<'a, A> {
+    type Item = &'a A;
+
+    /// Advance the iterator and return the next value.
+    ///
+    /// Time: O(1)*
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        #[allow(unsafe_code)]
+        let focus: &'a mut Focus<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        let value = focus.get(self.front_index);
+        self.front_index += 1;
+        value
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let remaining = self.back_index - self.front_index;
+        (remaining, Some(remaining))
+    }
+}
+
+impl<'a, A: Clone> DoubleEndedIterator for Iter<'a, A> {
+    /// Advance the iterator and return the next value.
+    ///
+    /// Time: O(1)*
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        self.back_index -= 1;
+        #[allow(unsafe_code)]
+        let focus: &'a mut Focus<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        focus.get(self.back_index)
+    }
+}
+
+impl<'a, A: Clone> ExactSizeIterator for Iter<'a, A> {}
+
+impl<'a, A: Clone> FusedIterator for Iter<'a, A> {}
+
+/// A mutable iterator over vectors with values of type `A`.
+///
+/// To obtain one, use [`Vector::iter_mut()`][iter_mut].
+///
+/// [iter_mut]: enum.Vector.html#method.iter_mut
+pub struct IterMut<'a, A>
+where
+    A: 'a,
+{
+    focus: FocusMut<'a, A>,
+    front_index: usize,
+    back_index: usize,
+}
+
+impl<'a, A> IterMut<'a, A>
+where
+    A: 'a + Clone,
+{
+    fn new(seq: &'a mut Vector<A>) -> Self {
+        let focus = seq.focus_mut();
+        let len = focus.len();
+        IterMut {
+            focus,
+            front_index: 0,
+            back_index: len,
+        }
+    }
+
+    fn from_focus(focus: FocusMut<'a, A>) -> Self {
+        IterMut {
+            front_index: 0,
+            back_index: focus.len(),
+            focus,
+        }
+    }
+}
+
+impl<'a, A> Iterator for IterMut<'a, A>
+where
+    A: 'a + Clone,
+{
+    type Item = &'a mut A;
+
+    /// Advance the iterator and return the next value.
+    ///
+    /// Time: O(1)*
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        #[allow(unsafe_code)]
+        let focus: &'a mut FocusMut<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        let value = focus.get_mut(self.front_index);
+        self.front_index += 1;
+        value
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let remaining = self.back_index - self.front_index;
+        (remaining, Some(remaining))
+    }
+}
+
+impl<'a, A> DoubleEndedIterator for IterMut<'a, A>
+where
+    A: 'a + Clone,
+{
+    /// Remove and return an element from the back of the iterator.
+    ///
+    /// Time: O(1)*
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        self.back_index -= 1;
+        #[allow(unsafe_code)]
+        let focus: &'a mut FocusMut<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        focus.get_mut(self.back_index)
+    }
+}
+
+impl<'a, A: Clone> ExactSizeIterator for IterMut<'a, A> {}
+
+impl<'a, A: Clone> FusedIterator for IterMut<'a, A> {}
+
+/// A consuming iterator over vectors with values of type `A`.
+pub enum ConsumingIter<A> {
+    Single(ChunkIter<A>),
+    Full(
+        Chain<
+            Chain<Chain<Chain<ChunkIter<A>, ChunkIter<A>>, ConsumingNodeIter<A>>, ChunkIter<A>>,
+            ChunkIter<A>,
+        >,
+    ),
+}
+
+impl<A: Clone> ConsumingIter<A> {
+    fn new(seq: Vector<A>) -> Self {
+        match seq {
+            Single(chunk) => ConsumingIter::Single(clone_ref(chunk).into_iter()),
+            Full(tree) => ConsumingIter::Full(tree.into_iter()),
+        }
+    }
+}
+
+impl<A: Clone> Iterator for ConsumingIter<A> {
+    type Item = A;
+
+    /// Advance the iterator and return the next value.
+    ///
+    /// Time: O(1)*
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            ConsumingIter::Single(iter) => iter.next(),
+            ConsumingIter::Full(iter) => iter.next(),
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self {
+            ConsumingIter::Single(iter) => iter.size_hint(),
+            ConsumingIter::Full(iter) => iter.size_hint(),
+        }
+    }
+}
+
+impl<A: Clone> DoubleEndedIterator for ConsumingIter<A> {
+    /// Remove and return an element from the back of the iterator.
+    ///
+    /// Time: O(1)*
+    fn next_back(&mut self) -> Option<Self::Item> {
+        match self {
+            ConsumingIter::Single(iter) => iter.next_back(),
+            ConsumingIter::Full(iter) => iter.next_back(),
+        }
+    }
+}
+
+impl<A: Clone> ExactSizeIterator for ConsumingIter<A> {}
+
+impl<A: Clone> FusedIterator for ConsumingIter<A> {}
+
+/// An iterator over the leaf nodes of a vector.
+///
+/// To obtain one, use [`Vector::chunks()`][chunks].
+///
+/// [chunks]: enum.Vector.html#method.chunks
+pub struct Chunks<'a, A: 'a> {
+    focus: Focus<'a, A>,
+    front_index: usize,
+    back_index: usize,
+}
+
+impl<'a, A: Clone> Chunks<'a, A> {
+    fn new(seq: &'a Vector<A>) -> Self {
+        Chunks {
+            focus: seq.focus(),
+            front_index: 0,
+            back_index: seq.len(),
+        }
+    }
+}
+
+impl<'a, A: Clone> Iterator for Chunks<'a, A> {
+    type Item = &'a [A];
+
+    /// Advance the iterator and return the next value.
+    ///
+    /// Time: O(1)*
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        #[allow(unsafe_code)]
+        let focus: &'a mut Focus<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        let (range, value) = focus.chunk_at(self.front_index);
+        self.front_index = range.end;
+        Some(value)
+    }
+}
+
+impl<'a, A: Clone> DoubleEndedIterator for Chunks<'a, A> {
+    /// Remove and return an element from the back of the iterator.
+    ///
+    /// Time: O(1)*
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        self.back_index -= 1;
+        #[allow(unsafe_code)]
+        let focus: &'a mut Focus<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        let (range, value) = focus.chunk_at(self.back_index);
+        self.back_index = range.start;
+        Some(value)
+    }
+}
+
+impl<'a, A: Clone> FusedIterator for Chunks<'a, A> {}
+
+/// A mutable iterator over the leaf nodes of a vector.
+///
+/// To obtain one, use [`Vector::chunks_mut()`][chunks_mut].
+///
+/// [chunks_mut]: enum.Vector.html#method.chunks_mut
+pub struct ChunksMut<'a, A: 'a> {
+    focus: FocusMut<'a, A>,
+    front_index: usize,
+    back_index: usize,
+}
+
+impl<'a, A: Clone> ChunksMut<'a, A> {
+    fn new(seq: &'a mut Vector<A>) -> Self {
+        let len = seq.len();
+        ChunksMut {
+            focus: seq.focus_mut(),
+            front_index: 0,
+            back_index: len,
+        }
+    }
+}
+
+impl<'a, A: Clone> Iterator for ChunksMut<'a, A> {
+    type Item = &'a mut [A];
+
+    /// Advance the iterator and return the next value.
+    ///
+    /// Time: O(1)*
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        #[allow(unsafe_code)]
+        let focus: &'a mut FocusMut<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        let (range, value) = focus.chunk_at(self.front_index);
+        self.front_index = range.end;
+        Some(value)
+    }
+}
+
+impl<'a, A: Clone> DoubleEndedIterator for ChunksMut<'a, A> {
+    /// Remove and return an element from the back of the iterator.
+    ///
+    /// Time: O(1)*
+    fn next_back(&mut self) -> Option<Self::Item> {
+        if self.front_index >= self.back_index {
+            return None;
+        }
+        self.back_index -= 1;
+        #[allow(unsafe_code)]
+        let focus: &'a mut FocusMut<'a, A> = unsafe { &mut *(&mut self.focus as *mut _) };
+        let (range, value) = focus.chunk_at(self.back_index);
+        self.back_index = range.start;
+        Some(value)
+    }
+}
+
+impl<'a, A: Clone> FusedIterator for ChunksMut<'a, A> {}
+
+// Rayon
+
+#[cfg(all(threadsafe, any(test, feature = "rayon")))]
+pub mod rayon {
+    use super::*;
+
+    use rayon::iter::plumbing::{bridge, Consumer, Producer, ProducerCallback, UnindexedConsumer};
+    use rayon::iter::{
+        IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator,
+        ParallelIterator,
+    };
+
+    impl<'a, A> IntoParallelRefIterator<'a> for Vector<A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        type Item = &'a A;
+        type Iter = ParIter<'a, A>;
+
+        fn par_iter(&'a self) -> Self::Iter {
+            ParIter {
+                focus: self.focus(),
+            }
+        }
+    }
+
+    impl<'a, A> IntoParallelRefMutIterator<'a> for Vector<A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        type Item = &'a mut A;
+        type Iter = ParIterMut<'a, A>;
+
+        fn par_iter_mut(&'a mut self) -> Self::Iter {
+            ParIterMut {
+                focus: self.focus_mut(),
+            }
+        }
+    }
+
+    pub struct ParIter<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        focus: Focus<'a, A>,
+    }
+
+    impl<'a, A> ParallelIterator for ParIter<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        type Item = &'a A;
+
+        fn drive_unindexed<C>(self, consumer: C) -> C::Result
+        where
+            C: UnindexedConsumer<Self::Item>,
+        {
+            bridge(self, consumer)
+        }
+    }
+
+    impl<'a, A> IndexedParallelIterator for ParIter<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        fn drive<C>(self, consumer: C) -> C::Result
+        where
+            C: Consumer<Self::Item>,
+        {
+            bridge(self, consumer)
+        }
+
+        fn len(&self) -> usize {
+            self.focus.len()
+        }
+
+        fn with_producer<CB>(self, callback: CB) -> CB::Output
+        where
+            CB: ProducerCallback<Self::Item>,
+        {
+            callback.callback(VectorProducer { focus: self.focus })
+        }
+    }
+
+    pub struct ParIterMut<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        focus: FocusMut<'a, A>,
+    }
+
+    impl<'a, A> ParallelIterator for ParIterMut<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        type Item = &'a mut A;
+
+        fn drive_unindexed<C>(self, consumer: C) -> C::Result
+        where
+            C: UnindexedConsumer<Self::Item>,
+        {
+            bridge(self, consumer)
+        }
+    }
+
+    impl<'a, A> IndexedParallelIterator for ParIterMut<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        fn drive<C>(self, consumer: C) -> C::Result
+        where
+            C: Consumer<Self::Item>,
+        {
+            bridge(self, consumer)
+        }
+
+        fn len(&self) -> usize {
+            self.focus.len()
+        }
+
+        fn with_producer<CB>(self, callback: CB) -> CB::Output
+        where
+            CB: ProducerCallback<Self::Item>,
+        {
+            callback.callback(VectorMutProducer { focus: self.focus })
+        }
+    }
+
+    struct VectorProducer<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        focus: Focus<'a, A>,
+    }
+
+    impl<'a, A> Producer for VectorProducer<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        type Item = &'a A;
+        type IntoIter = Iter<'a, A>;
+
+        fn into_iter(self) -> Self::IntoIter {
+            self.focus.into_iter()
+        }
+
+        fn split_at(self, index: usize) -> (Self, Self) {
+            let (left, right) = self.focus.split_at(index);
+            (
+                VectorProducer { focus: left },
+                VectorProducer { focus: right },
+            )
+        }
+    }
+
+    struct VectorMutProducer<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        focus: FocusMut<'a, A>,
+    }
+
+    impl<'a, A> Producer for VectorMutProducer<'a, A>
+    where
+        A: Clone + Send + Sync + 'a,
+    {
+        type Item = &'a mut A;
+        type IntoIter = IterMut<'a, A>;
+
+        fn into_iter(self) -> Self::IntoIter {
+            self.focus.into_iter()
+        }
+
+        fn split_at(self, index: usize) -> (Self, Self) {
+            let (left, right) = self.focus.split_at(index);
+            (
+                VectorMutProducer { focus: left },
+                VectorMutProducer { focus: right },
+            )
+        }
+    }
+
+    #[cfg(test)]
+    mod test {
+        use super::super::*;
+        use super::proptest::vector;
+        use proptest::num::i32;
+        use rayon::iter::{IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator};
+
+        proptest! {
+            #[test]
+            fn par_iter(ref mut input in vector(i32::ANY, 0..10000)) {
+                assert_eq!(input.iter().max(), input.par_iter().max())
+            }
+
+            #[test]
+            fn par_mut_iter(ref mut input in vector(i32::ANY, 0..10000)) {
+                let mut vec = input.clone();
+                vec.par_iter_mut().for_each(|i| *i += 1);
+                let expected: Vector<i32> = input.clone().into_iter().map(|i| i + 1).collect();
+                assert_eq!(expected, vec);
+            }
+        }
+    }
+}
+
+// QuickCheck
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+use quickcheck::{Arbitrary, Gen};
+
+#[cfg(all(threadsafe, feature = "quickcheck"))]
+impl<A: Arbitrary + Sync + Clone> Arbitrary for Vector<A> {
+    fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        Vector::from_iter(Vec::<A>::arbitrary(g))
+    }
+}
+
+// Proptest
+
+#[cfg(any(test, feature = "proptest"))]
+pub mod proptest {
+    use super::*;
+    use proptest::collection::vec;
+    use proptest::strategy::{BoxedStrategy, Strategy, ValueTree};
+    use std::ops::Range;
+
+    /// A strategy for generating a vector of a certain size.
+    ///
+    /// # Examples
+    ///
+    /// ```rust,ignore
+    /// proptest! {
+    ///     #[test]
+    ///     fn proptest_a_vector(ref l in vector(".*", 10..100)) {
+    ///         assert!(l.len() < 100);
+    ///         assert!(l.len() >= 10);
+    ///     }
+    /// }
+    /// ```
+    pub fn vector<A: Strategy + 'static>(
+        element: A,
+        size: Range<usize>,
+    ) -> BoxedStrategy<Vector<<A::Tree as ValueTree>::Value>>
+    where
+        <A::Tree as ValueTree>::Value: Clone,
+    {
+        vec(element, size).prop_map(Vector::from_iter).boxed()
+    }
+}
+
+// Tests
+
+#[cfg(test)]
+mod test {
+    use super::proptest::vector;
+    use super::*;
+    use proptest::collection::vec;
+    use proptest::num::{i32, usize};
+
+    // #[test]
+    // fn push_and_pop_things() {
+    //     let mut seq = Vector::new();
+    //     for i in 0..1000 {
+    //         seq.push_back(i);
+    //     }
+    //     for i in 0..1000 {
+    //         assert_eq!(Some(i), seq.pop_front());
+    //     }
+    //     assert!(seq.is_empty());
+    //     for i in 0..1000 {
+    //         seq.push_front(i);
+    //     }
+    //     for i in 0..1000 {
+    //         assert_eq!(Some(i), seq.pop_back());
+    //     }
+    //     assert!(seq.is_empty());
+    // }
+
+    #[test]
+    fn macro_allows_trailing_comma() {
+        let vec1 = vector![1, 2, 3];
+        let vec2 = vector![1, 2, 3,];
+        assert_eq!(vec1, vec2);
+    }
+
+    #[test]
+    fn indexing() {
+        let vec1 = vector![0, 1, 2, 3, 4, 5];
+        let mut vec2 = vec1.clone();
+        vec2.push_front(0);
+        assert_eq!(0, *vec2.get(0).unwrap());
+        assert_eq!(0, vec2[0]);
+    }
+
+    #[test]
+    fn large_vector_focus() {
+        let input = Vector::from_iter(0..100_000);
+        let vec = input.clone();
+        let mut sum: i64 = 0;
+        let mut focus = vec.focus();
+        for i in 0..input.len() {
+            sum += *focus.index(i);
+        }
+        let expected: i64 = (0..100_000).sum();
+        assert_eq!(expected, sum);
+    }
+
+    #[test]
+    fn large_vector_focus_mut() {
+        let input = Vector::from_iter(0..100_000);
+        let mut vec = input.clone();
+        {
+            let mut focus = vec.focus_mut();
+            for i in 0..input.len() {
+                let p = focus.index_mut(i);
+                *p += 1;
+            }
+        }
+        let expected: Vector<i32> = input.clone().into_iter().map(|i| i + 1).collect();
+        assert_eq!(expected, vec);
+    }
+
+    #[test]
+    fn issue_55_fwd() {
+        let mut l = Vector::new();
+        for i in 0..4098 {
+            l.append(Vector::unit(i));
+        }
+        l.append(Vector::unit(4098));
+        assert_eq!(Some(&4097), l.get(4097));
+        assert_eq!(Some(&4096), l.get(4096));
+    }
+
+    #[test]
+    fn issue_55_back() {
+        let mut l = Vector::unit(0);
+        for i in 0..4099 {
+            let mut tmp = Vector::unit(i + 1);
+            tmp.append(l);
+            l = tmp;
+        }
+        assert_eq!(Some(&4098), l.get(1));
+        assert_eq!(Some(&4097), l.get(2));
+        let len = l.len();
+        l.slice(2..len);
+    }
+
+    #[test]
+    fn issue_55_append() {
+        let mut vec1 = Vector::from_iter(0..92);
+        let vec2 = Vector::from_iter(0..165);
+        vec1.append(vec2);
+    }
+
+    proptest! {
+        #[test]
+        fn iter(ref vec in vec(i32::ANY, 0..1000)) {
+            let seq: Vector<i32> = Vector::from_iter(vec.iter().cloned());
+            for (index, item) in seq.iter().enumerate() {
+                assert_eq!(&vec[index], item);
+            }
+            assert_eq!(vec.len(), seq.len());
+        }
+
+        #[test]
+        fn push_front_mut(ref input in vec(i32::ANY, 0..1000)) {
+            let mut vector = Vector::new();
+            for (count, value) in input.iter().cloned().enumerate() {
+                assert_eq!(count, vector.len());
+                vector.push_front(value);
+                assert_eq!(count + 1, vector.len());
+            }
+            let input2 = Vec::from_iter(input.iter().rev().cloned());
+            assert_eq!(input2, Vec::from_iter(vector.iter().cloned()));
+        }
+
+        #[test]
+        fn push_back_mut(ref input in vec(i32::ANY, 0..1000)) {
+            let mut vector = Vector::new();
+            for (count, value) in input.iter().cloned().enumerate() {
+                assert_eq!(count, vector.len());
+                vector.push_back(value);
+                assert_eq!(count + 1, vector.len());
+            }
+            assert_eq!(input, &Vec::from_iter(vector.iter().cloned()));
+        }
+
+        #[test]
+        fn pop_back_mut(ref input in vec(i32::ANY, 0..1000)) {
+            let mut vector = Vector::from_iter(input.iter().cloned());
+            assert_eq!(input.len(), vector.len());
+            for (index, value) in input.iter().cloned().enumerate().rev() {
+                match vector.pop_back() {
+                    None => panic!("vector emptied unexpectedly"),
+                    Some(item) => {
+                        assert_eq!(index, vector.len());
+                        assert_eq!(value, item);
+                    }
+                }
+            }
+            assert_eq!(0, vector.len());
+        }
+
+        #[test]
+        fn pop_front_mut(ref input in vec(i32::ANY, 0..1000)) {
+            let mut vector = Vector::from_iter(input.iter().cloned());
+            assert_eq!(input.len(), vector.len());
+            for (index, value) in input.iter().cloned().rev().enumerate().rev() {
+                match vector.pop_front() {
+                    None => panic!("vector emptied unexpectedly"),
+                    Some(item) => {
+                        assert_eq!(index, vector.len());
+                        assert_eq!(value, item);
+                    }
+                }
+            }
+            assert_eq!(0, vector.len());
+        }
+
+        // #[test]
+        // fn push_and_pop(ref input in vec(i32::ANY, 0..1000)) {
+        //     let mut vector = Vector::new();
+        //     for (count, value) in input.iter().cloned().enumerate() {
+        //         assert_eq!(count, vector.len());
+        //         vector.push_back(value);
+        //         assert_eq!(count + 1, vector.len());
+        //     }
+        //     for (index, value) in input.iter().cloned().rev().enumerate().rev() {
+        //         match vector.pop_front() {
+        //             None => panic!("vector emptied unexpectedly"),
+        //             Some(item) => {
+        //                 assert_eq!(index, vector.len());
+        //                 assert_eq!(value, item);
+        //             }
+        //         }
+        //     }
+        //     assert_eq!(true, vector.is_empty());
+        // }
+
+        #[test]
+        fn split(ref vec in vec(i32::ANY, 1..2000), split_pos in usize::ANY) {
+            let split_index = split_pos % (vec.len() + 1);
+            let mut left = Vector::from_iter(vec.iter().cloned());
+            let right = left.split_off(split_index);
+            assert_eq!(left.len(), split_index);
+            assert_eq!(right.len(), vec.len() - split_index);
+            for (index, item) in left.iter().enumerate() {
+                assert_eq!(& vec[index], item);
+            }
+            for (index, item) in right.iter().enumerate() {
+                assert_eq!(&vec[split_index + index], item);
+            }
+        }
+
+        #[test]
+        fn append(ref vec1 in vec(i32::ANY, 0..1000), ref vec2 in vec(i32::ANY, 0..1000)) {
+            let mut seq1 = Vector::from_iter(vec1.iter().cloned());
+            let seq2 = Vector::from_iter(vec2.iter().cloned());
+            assert_eq!(seq1.len(), vec1.len());
+            assert_eq!(seq2.len(), vec2.len());
+            seq1.append(seq2);
+            let mut vec = vec1.clone();
+            vec.extend(vec2);
+            assert_eq!(seq1.len(), vec.len());
+            for (index, item) in seq1.into_iter().enumerate() {
+                assert_eq!(vec[index], item);
+            }
+        }
+
+        #[test]
+        fn iter_mut(ref input in vector(i32::ANY, 0..10000)) {
+            let mut vec = input.clone();
+            {
+                for p in vec.iter_mut() {
+                    *p += 1;
+                }
+            }
+            let expected: Vector<i32> = input.clone().into_iter().map(|i| i+1).collect();
+            assert_eq!(expected, vec);
+        }
+
+        #[test]
+        fn focus(ref input in vector(i32::ANY, 0..10000)) {
+            let mut vec = input.clone();
+            {
+                let mut focus = vec.focus_mut();
+                for i in 0..input.len() {
+                    let p = focus.index_mut(i);
+                    *p += 1;
+                }
+            }
+            let expected: Vector<i32> = input.clone().into_iter().map(|i| i+1).collect();
+            assert_eq!(expected, vec);
+        }
+
+        #[test]
+        fn focus_mut_split(ref input in vector(i32::ANY, 0..10000)) {
+            let mut vec = input.clone();
+
+            fn split_down(focus: FocusMut<'_, i32>) {
+                let len = focus.len();
+                if len < 8 {
+                    for p in focus {
+                        *p += 1;
+                    }
+                } else {
+                    let (left, right) = focus.split_at(len / 2);
+                    split_down(left);
+                    split_down(right);
+                }
+            }
+
+            split_down(vec.focus_mut());
+
+            let expected: Vector<i32> = input.clone().into_iter().map(|i| i+1).collect();
+            assert_eq!(expected, vec);
+        }
+
+        #[test]
+        fn chunks(ref input in vector(i32::ANY, 0..10000)) {
+            let output: Vector<_> = input.chunks().flat_map(|a|a).cloned().collect();
+            assert_eq!(input, &output);
+            let rev_in: Vector<_> = input.iter().rev().cloned().collect();
+            let rev_out: Vector<_> = input.chunks().rev().map(|c| c.iter().rev()).flat_map(|a|a).cloned().collect();
+            assert_eq!(rev_in, rev_out);
+        }
+
+        #[test]
+        fn chunks_mut(ref mut input_src in vector(i32::ANY, 0..10000)) {
+            let mut input = input_src.clone();
+            #[allow(clippy::map_clone)]
+            let output: Vector<_> = input.chunks_mut().flat_map(|a| a).map(|v| *v).collect();
+            assert_eq!(input, output);
+            let rev_in: Vector<_> = input.iter().rev().cloned().collect();
+            let rev_out: Vector<_> = input.chunks_mut().rev().map(|c| c.iter().rev()).flat_map(|a|a).cloned().collect();
+            assert_eq!(rev_in, rev_out);
+        }
+
+        // The following two tests are very slow and there are unit tests above
+        // which test for regression of issue #55.  It would still be good to
+        // run them occasionally.
+
+        // #[test]
+        // fn issue55_back(count in 0..10000, slice_at in usize::ANY) {
+        //     let count = count as usize;
+        //     let slice_at = slice_at % count;
+        //     let mut l = Vector::unit(0);
+        //     for _ in 0..count {
+        //         let mut tmp = Vector::unit(0);
+        //         tmp.append(l);
+        //         l = tmp;
+        //     }
+        //     let len = l.len();
+        //     l.slice(slice_at..len);
+        // }
+
+        // #[test]
+        // fn issue55_fwd(count in 0..10000, slice_at in usize::ANY) {
+        //     let count = count as usize;
+        //     let slice_at = slice_at % count;
+        //     let mut l = Vector::new();
+        //     for i in 0..count {
+        //         l.append(Vector::unit(i));
+        //     }
+        //     assert_eq!(Some(&slice_at), l.get(slice_at));
+        // }
+    }
+}
diff -Nru cargo-0.32.0/vendor/itoa/.cargo_vcs_info.json cargo-0.33.0/vendor/itoa/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/itoa/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/itoa/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "caec2745c6f2755a9e698ff73c2c4e7bfcdc2111"
-  }
-}
diff -Nru cargo-0.32.0/vendor/itoa/.travis.yml cargo-0.33.0/vendor/itoa/.travis.yml
--- cargo-0.32.0/vendor/itoa/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/itoa/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-sudo: false
-language: rust
-
-matrix:
-  include:
-    - rust: stable
-      - FEATURES="i128"
-    - rust: beta
-      - FEATURES="i128"
-    - rust: nightly
-      env:
-      - FEATURES="i128"
-      - BUILD_BENCH="true"
-    - rust: 1.0.0
-      script: cargo build
-    - rust: 1.20.0
-      script: cargo test
-
-script:
-  - cargo build --verbose --features "$FEATURES"
-  - cargo test --verbose --features "$FEATURES"
-  - cargo build --verbose --no-default-features --features "$FEATURES"
-  - cargo test --verbose --no-default-features --features "$FEATURES"
-  - if [ "$BUILD_BENCH" == "true" ]; then cargo bench --verbose --no-run --features "$FEATURES"; fi
-
diff -Nru cargo-0.32.0/vendor/jobserver/.appveyor.yml cargo-0.33.0/vendor/jobserver/.appveyor.yml
--- cargo-0.32.0/vendor/jobserver/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/jobserver/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-environment:
-  matrix:
-    - TARGET: x86_64-pc-windows-msvc
-      MAKE: mingw32-make
-
-install:
-  # Install rust, x86_64-pc-windows-msvc host
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo test
diff -Nru cargo-0.32.0/vendor/jobserver/.cargo_vcs_info.json cargo-0.33.0/vendor/jobserver/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/jobserver/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/jobserver/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "c7e283e85c2f00b99e81f8ec07120409b7420eb2"
-  }
-}
diff -Nru cargo-0.32.0/vendor/jobserver/.travis.yml cargo-0.33.0/vendor/jobserver/.travis.yml
--- cargo-0.32.0/vendor/jobserver/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/jobserver/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-language: rust
-rust: stable
-
-matrix:
-  include:
-    - os: osx
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      after_success:
-        - travis-cargo doc-upload
-
-sudo: false
-script:
-  - cargo test
-  - cargo doc --no-deps
-env:
-  global:
-    secure: "u4sfTRgvuqtiwil/a5RMjNFKdUJl0fr8MM73c934I4nDuIPQ+v1ZIj/ehclHXED+vT3M5h0Ois+HWBn/626vVZCuCUBqeC96qB7K+tqJlzpxGgukF9Ps2q7nh14NBxsTQ3HBJbrxdi6qaozAaa3BLPh6pLCBBgfofsbaeikV6ogosI0ZeYDwwEA7dc7yVKWwuMDFnxeqEqkdC9SLc4dsSuFAYWs3w00EU6sukG7ISv1e5fluZtJgNxbMe5RUCa2/lsDtmrWpkHSagcfhbWqb5LZ0ZZE+v6/Z9ASlHEOt462p4ZnkTgVgRw9/QcV75KN/tHI4hrXOU55VkEBzZqlc1Fyr+xeIpghNel8HEnLpde8B+XbCxCzGORPntCjVjfIn++wxK7ce30hslBsT75UJPrTnsBPr5rPahX8i0K6R8Xc2i7qMd5p2NTDs51MWpnjNgAGFj/1WS7t638i+gkia9ficfNRXDlMCNDC8F24r5huB6G4EKWYyCLYdMZHNaKO1XCVMTeRh2EQpLILkT8BFVZN1ttGUZ1BhMsZ1U4pCgta7phRZkBiov7uomPHMUX+fn0rmh58Z2Rodbvdzdx4fVRCebBgqxh25We2ByWRyAHfEF0Cw91A8bs1u1ssdta8UXqrb9d6oKDPCDIO/v+mzd6KXN2d5bTExo0aLs8qMC3Q="
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/lazycell/.cargo_vcs_info.json cargo-0.33.0/vendor/lazycell/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/lazycell/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lazycell/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "db9289a32df4ba3b1de8c383b68b342be4a8a1ba"
-  }
-}
diff -Nru cargo-0.32.0/vendor/lazy_static/.cargo_vcs_info.json cargo-0.33.0/vendor/lazy_static/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/lazy_static/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lazy_static/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "b4b2b16aaa79dd7548e288455a0dbe4065bf4e1a"
-  }
-}
diff -Nru cargo-0.32.0/vendor/libc/.cargo-checksum.json cargo-0.33.0/vendor/libc/.cargo-checksum.json
--- cargo-0.32.0/vendor/libc/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"}
\ No newline at end of file
+{"files":{},"package":"e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/libc/Cargo.toml cargo-0.33.0/vendor/libc/Cargo.toml
--- cargo-0.32.0/vendor/libc/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "libc"
-version = "0.2.45"
+version = "0.2.48"
 authors = ["The Rust Project Developers"]
 build = "build.rs"
 exclude = ["/ci/*", "/.travis.yml", "/appveyor.yml"]
diff -Nru cargo-0.32.0/vendor/libc/.cargo_vcs_info.json cargo-0.33.0/vendor/libc/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/libc/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "f5636fc618f8e16968b3178196d73c94ad9f7b05"
-  }
-}
diff -Nru cargo-0.32.0/vendor/libc/.cirrus.yml cargo-0.33.0/vendor/libc/.cirrus.yml
--- cargo-0.32.0/vendor/libc/.cirrus.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/.cirrus.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-freebsd_instance:
-  image: freebsd-11-1-release-amd64
-
-task:
-  # This name gets reported as a build status in GitHub
-  name: stable x86_64-unknown-freebsd
-  setup_script:
-    - pkg install -y curl
-    - curl https://sh.rustup.rs -sSf --output rustup.sh
-    - sh rustup.sh -y
-  test_script:
-    - . $HOME/.cargo/env
-    - cd libc-test
-    - cargo test
diff -Nru cargo-0.32.0/vendor/libc/README.md cargo-0.33.0/vendor/libc/README.md
--- cargo-0.32.0/vendor/libc/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -5,11 +5,11 @@
 
 [![Build Status](https://travis-ci.org/rust-lang/libc.svg?branch=master)](https://travis-ci.org/rust-lang/libc)
 [![Build status](https://ci.appveyor.com/api/projects/status/github/rust-lang/libc?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/libc)
+[![Build Status](https://api.cirrus-ci.com/github/rust-lang/libc.svg)](https://cirrus-ci.com/github/rust-lang/libc)
 [![Latest version](https://img.shields.io/crates/v/libc.svg)](https://crates.io/crates/libc)
 [![Documentation](https://docs.rs/libc/badge.svg)](https://docs.rs/libc)
 ![License](https://img.shields.io/crates/l/libc.svg)
 
-
 ## Usage
 
 First, add the following to your `Cargo.toml`:
diff -Nru cargo-0.32.0/vendor/libc/src/dox.rs cargo-0.33.0/vendor/libc/src/dox.rs
--- cargo-0.32.0/vendor/libc/src/dox.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/dox.rs	2019-02-06 04:11:58.000000000 +0000
@@ -52,6 +52,11 @@
     #[lang = "sized"]
     pub trait Sized {}
 
+    #[lang = "receiver"]
+    pub trait Receiver {}
+    impl<T: ?Sized> Receiver for &T {}
+    impl<T: ?Sized> Receiver for &mut T {}
+
     macro_rules! each_int {
         ($mac:ident) => {
             $mac!(u8);
diff -Nru cargo-0.32.0/vendor/libc/src/redox/mod.rs cargo-0.33.0/vendor/libc/src/redox/mod.rs
--- cargo-0.32.0/vendor/libc/src/redox/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/redox/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,4 +1,3 @@
-
 pub type int8_t = i8;
 pub type int16_t = i16;
 pub type int32_t = i32;
@@ -31,18 +30,66 @@
 pub type c_long = i64;
 pub type c_ulong = u64;
 
-pub type wchar_t = i16;
+pub type wchar_t = i32;
+pub type wint_t = u32;
+pub type wctype_t = i64;
 
+pub type regoff_t = size_t;
 pub type off_t = c_long;
-pub type mode_t = u16;
-pub type time_t = i64;
-pub type pid_t = usize;
-pub type gid_t = usize;
-pub type uid_t = usize;
+pub type mode_t = c_int;
+pub type time_t = c_long;
+pub type pid_t = c_int;
+pub type id_t = c_uint;
+pub type gid_t = c_int;
+pub type uid_t = c_int;
+pub type dev_t = c_long;
+pub type ino_t = c_ulong;
+pub type nlink_t = c_ulong;
+pub type blksize_t = c_long;
+pub type blkcnt_t = c_ulong;
+
+pub type fsblkcnt_t = c_ulong;
+pub type fsfilcnt_t = c_ulong;
+
+pub type useconds_t = c_uint;
+pub type suseconds_t = c_int;
+
+pub type clock_t = c_long;
+pub type clockid_t = c_int;
+pub type timer_t = *mut c_void;
 
-pub type suseconds_t = i64;
+pub type nfds_t = c_ulong;
 
 s! {
+    pub struct fd_set {
+        fds_bits: [::c_ulong; FD_SETSIZE / ULONG_SIZE],
+    }
+
+    pub struct pollfd {
+        pub fd: ::c_int,
+        pub events: ::c_short,
+        pub revents: ::c_short,
+    }
+
+    pub struct stat {
+        pub st_dev: ::dev_t,
+        pub st_ino: ::ino_t,
+        pub st_nlink: ::nlink_t,
+        pub st_mode: ::mode_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        pub st_size: ::off_t,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt_t,
+
+        pub st_atime: ::timespec,
+        pub st_mtime: ::timespec,
+        pub st_ctime: ::timespec,
+
+        _pad: [c_char; 24],
+    }
+
     pub struct timeval {
         pub tv_sec: time_t,
         pub tv_usec: suseconds_t,
@@ -64,6 +111,27 @@
 pub const EXIT_FAILURE: ::c_int = 1;
 pub const EXIT_SUCCESS: ::c_int = 0;
 
+pub const FD_SETSIZE: usize = 1024;
+
+pub const MAP_SHARED: ::c_int = 1;
+pub const MAP_PRIVATE: ::c_int = 2;
+pub const MAP_ANONYMOUS: ::c_int = 4;
+pub const MAP_ANON: ::c_int = MAP_ANONYMOUS;
+
+pub const MAP_FAILED: *mut ::c_void = !0 as *mut ::c_void;
+
+pub const POLLIN: ::c_short = 0x001;
+pub const POLLPRI: ::c_short = 0x002;
+pub const POLLOUT: ::c_short = 0x004;
+pub const POLLERR: ::c_short = 0x008;
+pub const POLLHUP: ::c_short = 0x010;
+pub const POLLNVAL: ::c_short = 0x020;
+
+pub const PROT_NONE: ::c_int = 0;
+pub const PROT_EXEC: ::c_int = 1;
+pub const PROT_WRITE: ::c_int = 2;
+pub const PROT_READ: ::c_int = 4;
+
 pub const S_ISUID: ::c_int = 0x800;
 pub const S_ISGID: ::c_int = 0x400;
 pub const S_ISVTX: ::c_int = 0x200;
@@ -98,6 +166,8 @@
 pub const F_GETFL: ::c_int = 3;
 pub const F_SETFL: ::c_int = 4;
 
+pub const FD_CLOEXEC: ::c_int =   0x0100_0000;
+
 pub const O_RDONLY: ::c_int =     0x0001_0000;
 pub const O_WRONLY: ::c_int =     0x0002_0000;
 pub const O_RDWR: ::c_int =       0x0003_0000;
@@ -152,6 +222,17 @@
 pub enum FILE {}
 pub enum fpos_t {} // TODO: fill this out with a struct
 
+// intentionally not public, only used for fd_set
+cfg_if! {
+    if #[cfg(target_pointer_width = "32")] {
+        const ULONG_SIZE: usize = 32;
+    } else if #[cfg(target_pointer_width = "64")] {
+        const ULONG_SIZE: usize = 64;
+    } else {
+        // Unknown target_pointer_width
+    }
+}
+
 extern {
     pub fn isalnum(c: c_int) -> c_int;
     pub fn isalpha(c: c_int) -> c_int;
@@ -262,9 +343,22 @@
     pub fn close(fd: ::c_int) -> ::c_int;
     pub fn fchown(fd: ::c_int, uid: ::uid_t, gid: ::gid_t) -> ::c_int;
     pub fn fcntl(fd: ::c_int, cmd: ::c_int, ...) -> ::c_int;
+    pub fn fstat(fd: ::c_int, buf: *mut stat) -> ::c_int;
+    pub fn fsync(fd: ::c_int) -> ::c_int;
     pub fn gethostname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn getpid() -> pid_t;
     pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
+    pub fn mmap(addr: *mut ::c_void,
+         len: ::size_t,
+         prot: ::c_int,
+         flags: ::c_int,
+         fd: ::c_int,
+         offset: off_t)
+         -> *mut ::c_void;
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int)
+                    -> ::c_int;
+    pub fn munmap(addr: *mut ::c_void, len: ::size_t) -> ::c_int;
+    pub fn poll(fds: *mut pollfd, nfds: nfds_t, timeout: ::c_int) -> ::c_int;
     pub fn read(fd: ::c_int, buf: *mut ::c_void, count: ::size_t) -> ::ssize_t;
     pub fn setenv(name: *const c_char, val: *const c_char, overwrite: ::c_int)
                   -> ::c_int;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/apple/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/apple/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/apple/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/apple/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,6 +1,7 @@
 //! Apple (ios/darwin)-specific definitions
 //!
 //! This covers *-apple-* triples currently
+use dox::mem;
 
 pub type c_char = i8;
 pub type clock_t = c_ulong;
@@ -1570,11 +1571,16 @@
 pub const SOCK_SEQPACKET: ::c_int = 5;
 pub const IP_TTL: ::c_int = 4;
 pub const IP_HDRINCL: ::c_int = 2;
+pub const IP_RECVDSTADDR: ::c_int = 7;
 pub const IP_ADD_MEMBERSHIP: ::c_int = 12;
 pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
+pub const IP_RECVIF: ::c_int = 20;
 pub const IP_PKTINFO: ::c_int = 26;
+pub const IP_RECVTOS: ::c_int = 27;
 pub const IPV6_JOIN_GROUP: ::c_int = 12;
 pub const IPV6_LEAVE_GROUP: ::c_int = 13;
+pub const IPV6_RECVTCLASS: ::c_int = 35;
+pub const IPV6_TCLASS: ::c_int = 36;
 pub const IPV6_PKTINFO: ::c_int = 46;
 pub const IPV6_RECVPKTINFO: ::c_int = 61;
 
@@ -1914,6 +1920,13 @@
 pub const CRTSCTS: ::tcflag_t = 0x00030000;
 
 pub const NI_MAXHOST: ::socklen_t = 1025;
+pub const NI_MAXSERV: ::socklen_t = 32;
+pub const NI_NOFQDN: ::c_int = 0x00000001;
+pub const NI_NUMERICHOST: ::c_int = 0x00000002;
+pub const NI_NAMEREQD: ::c_int = 0x00000004;
+pub const NI_NUMERICSERV: ::c_int = 0x00000008;
+pub const NI_NUMERICSCOPE: ::c_int = 0x00000100;
+pub const NI_DGRAM: ::c_int = 0x00000010;
 
 pub const Q_GETQUOTA: ::c_int = 0x300;
 pub const Q_SETQUOTA: ::c_int = 0x400;
@@ -2147,6 +2160,19 @@
 
 pub const SEM_FAILED: *mut sem_t = -1isize as *mut ::sem_t;
 
+pub const AI_PASSIVE: ::c_int = 0x00000001;
+pub const AI_CANONNAME: ::c_int = 0x00000002;
+pub const AI_NUMERICHOST: ::c_int = 0x00000004;
+pub const AI_NUMERICSERV: ::c_int = 0x00001000;
+pub const AI_MASK: ::c_int = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST |
+                             AI_NUMERICSERV | AI_ADDRCONFIG;
+pub const AI_ALL: ::c_int = 0x00000100;
+pub const AI_V4MAPPED_CFG: ::c_int = 0x00000200;
+pub const AI_ADDRCONFIG: ::c_int = 0x00000400;
+pub const AI_V4MAPPED: ::c_int = 0x00000800;
+pub const AI_DEFAULT: ::c_int = AI_V4MAPPED_CFG | AI_ADDRCONFIG;
+pub const AI_UNUSABLE: ::c_int = 0x10000000;
+
 pub const SIGEV_NONE: ::c_int = 0;
 pub const SIGEV_SIGNAL: ::c_int = 1;
 pub const SIGEV_THREAD: ::c_int = 3;
@@ -2358,7 +2384,45 @@
 pub const SF_APPEND:        ::c_uint = 0x00040000;
 pub const UF_HIDDEN:        ::c_uint = 0x00008000;
 
+fn __DARWIN_ALIGN32(p: usize) -> usize {
+    const __DARWIN_ALIGNBYTES32: usize = mem::size_of::<u32>() - 1;
+    p + __DARWIN_ALIGNBYTES32 & !__DARWIN_ALIGNBYTES32
+}
+
 f! {
+    pub fn CMSG_NXTHDR(mhdr: *const ::msghdr,
+                       cmsg: *const ::cmsghdr) -> *mut ::cmsghdr {
+        if cmsg.is_null() {
+            return ::CMSG_FIRSTHDR(mhdr);
+        };
+        let cmsg_len = (*cmsg).cmsg_len as usize;
+        let next = cmsg as usize + __DARWIN_ALIGN32(cmsg_len as usize)
+            + __DARWIN_ALIGN32(mem::size_of::<::cmsghdr>());
+        let max = (*mhdr).msg_control as usize
+                   + (*mhdr).msg_controllen as usize;
+        if next > max {
+            0 as *mut ::cmsghdr
+        } else {
+            next as *mut ::cmsghdr
+        }
+    }
+
+    pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
+        (cmsg as *mut ::c_uchar)
+            .offset(__DARWIN_ALIGN32(mem::size_of::<::cmsghdr>()) as isize)
+    }
+
+    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+        (__DARWIN_ALIGN32(mem::size_of::<::cmsghdr>())
+            + __DARWIN_ALIGN32(length as usize))
+            as ::c_uint
+    }
+
+    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
+        __DARWIN_ALIGN32(mem::size_of::<::cmsghdr>() + length as usize)
+            as ::c_uint
+    }
+
     pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
         status >> 8
     }
@@ -2634,6 +2698,7 @@
         fd: ::c_int,
         newfd: ::c_int,
     ) -> ::c_int;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -210,6 +210,12 @@
         pub sdl_rcf: ::c_ushort,
         pub sdl_route: [::c_ushort; 16],
     }
+
+    pub struct stack_t {
+        pub ss_sp: *mut ::c_char,
+        pub ss_size: ::size_t,
+        pub ss_flags: ::c_int,
+    }
 }
 
 pub const RAND_MAX: ::c_int = 0x7fff_ffff;
@@ -782,6 +788,39 @@
 pub const SF_CACHE:     ::c_ulong = 0x00800000;
 pub const SF_XLINK:     ::c_ulong = 0x01000000;
 
+fn _CMSG_ALIGN(n: usize) -> usize {
+    (n + 3) & !3
+}
+
+f! {
+    pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
+        (cmsg as *mut ::c_uchar)
+            .offset(_CMSG_ALIGN(mem::size_of::<::cmsghdr>()) as isize)
+    }
+
+    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
+        _CMSG_ALIGN(mem::size_of::<::cmsghdr>()) + length as usize
+    }
+
+    pub fn CMSG_NXTHDR(mhdr: *const ::msghdr, cmsg: *const ::cmsghdr)
+        -> *mut ::cmsghdr
+    {
+        let next = cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len)
+            + _CMSG_ALIGN(mem::size_of::<::cmsghdr>());
+        let max = (*mhdr).msg_control as usize
+            + (*mhdr).msg_controllen as usize;
+        if next <= max {
+            (cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len)) as *mut ::cmsghdr
+        } else {
+            0 as *mut ::cmsghdr
+        }
+    }
+
+    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+        _CMSG_ALIGN(mem::size_of::<::cmsghdr>()) + _CMSG_ALIGN(length as usize)
+    }
+}
+
 extern {
     pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int)
                     -> ::c_int;
@@ -801,4 +840,5 @@
 
     pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
     pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type time_t = i64;
@@ -29,4 +31,7 @@
     }
 }
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_longlong>() - 1;
 pub const MAP_32BIT: ::c_int = 0x00080000;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 pub type fflags_t = u32;
 pub type clock_t = i32;
 pub type ino_t = u32;
@@ -182,6 +184,12 @@
         pub sdl_slen: ::c_uchar,
         pub sdl_data: [::c_char; 46],
     }
+
+    pub struct stack_t {
+        pub ss_sp: *mut ::c_void,
+        pub ss_size: ::size_t,
+        pub ss_flags: ::c_int,
+    }
 }
 
 pub const SIGEV_THREAD_ID: ::c_int = 4;
@@ -447,6 +455,19 @@
 pub const TIOCM_DCD: ::c_int = 0x40;
 pub const H4DISC: ::c_int = 0x7;
 
+pub const FIONCLEX: ::c_ulong = 0x20006602;
+pub const FIONREAD: ::c_ulong = 0x4004667f;
+pub const FIOASYNC: ::c_ulong = 0x8004667d;
+pub const FIOSETOWN: ::c_ulong = 0x8004667c;
+pub const FIOGETOWN: ::c_ulong = 0x4004667b;
+pub const FIODTYPE: ::c_ulong = 0x4004667a;
+pub const FIOGETLBA: ::c_ulong = 0x40046679;
+pub const FIODGNAME: ::c_ulong = 0x80106678;
+pub const FIONWRITE: ::c_ulong = 0x40046677;
+pub const FIONSPACE: ::c_ulong = 0x40046676;
+pub const FIOSEEKDATA: ::c_ulong = 0xc0086661;
+pub const FIOSEEKHOLE: ::c_ulong = 0xc0086662;
+
 pub const JAIL_API_VERSION: u32 = 2;
 pub const JAIL_CREATE: ::c_int = 0x01;
 pub const JAIL_UPDATE: ::c_int = 0x02;
@@ -803,6 +824,7 @@
 pub const TCP_PCAP_IN: ::c_int = 4096;
 
 pub const IP_BINDANY: ::c_int = 24;
+pub const IP_RECVTOS: ::c_int = 68;
 
 pub const PF_SLOW: ::c_int = AF_SLOW;
 pub const PF_SCLUSTER: ::c_int = AF_SCLUSTER;
@@ -948,6 +970,48 @@
 pub const UF_HIDDEN:    ::c_ulong = 0x00008000;
 pub const SF_SNAPSHOT:  ::c_ulong = 0x00200000;
 
+fn _ALIGN(p: usize) -> usize {
+    (p + _ALIGNBYTES) & !_ALIGNBYTES
+}
+
+f! {
+    pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
+        (cmsg as *mut ::c_uchar)
+            .offset(_ALIGN(mem::size_of::<::cmsghdr>()) as isize)
+    }
+
+    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
+        _ALIGN(mem::size_of::<::cmsghdr>()) as ::c_uint + length
+    }
+
+    pub fn CMSG_NXTHDR(mhdr: *const ::msghdr, cmsg: *const ::cmsghdr)
+        -> *mut ::cmsghdr
+    {
+        if cmsg.is_null() {
+            return ::CMSG_FIRSTHDR(mhdr);
+        };
+        let next = cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize)
+            + _ALIGN(mem::size_of::<::cmsghdr>());
+        let max = (*mhdr).msg_control as usize
+            + (*mhdr).msg_controllen as usize;
+        if next > max {
+            0 as *mut ::cmsghdr
+        } else {
+            (cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize))
+                as *mut ::cmsghdr
+        }
+    }
+
+    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+        (_ALIGN(mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))
+            as ::c_uint
+    }
+
+    pub fn uname(buf: *mut ::utsname) -> ::c_int {
+        __xuname(256, buf as *mut ::c_void)
+    }
+}
+
 extern {
     pub fn __error() -> *mut ::c_int;
 
@@ -1134,6 +1198,7 @@
     pub fn fstatfs(fd: ::c_int, buf: *mut statfs) -> ::c_int;
 
     pub fn dup3(src: ::c_int, dst: ::c_int, flags: ::c_int) -> ::c_int;
+    pub fn __xuname(nmln: ::c_int, buf: *mut ::c_void) -> ::c_int;
 }
 
 #[link(name = "util")]
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type time_t = i64;
@@ -29,4 +31,7 @@
     }
 }
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
 pub const MAP_32BIT: ::c_int = 0x00080000;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type time_t = i32;
@@ -29,3 +31,7 @@
         __unused: [u8; 8],
     }
 }
+
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/freebsdlike/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/freebsdlike/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -82,13 +82,6 @@
         pub sa_mask: sigset_t,
     }
 
-    pub struct stack_t {
-        // In FreeBSD 11 and later, ss_sp is actually a void*
-        pub ss_sp: *mut ::c_char,
-        pub ss_size: ::size_t,
-        pub ss_flags: ::c_int,
-    }
-
     pub struct sched_param {
         pub sched_priority: ::c_int,
     }
@@ -664,10 +657,13 @@
 pub const IP_SENDSRCADDR: ::c_int = IP_RECVDSTADDR;
 pub const IP_ADD_MEMBERSHIP: ::c_int = 12;
 pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
+pub const IP_RECVIF: ::c_int = 20;
 pub const IPV6_JOIN_GROUP: ::c_int = 12;
 pub const IPV6_LEAVE_GROUP: ::c_int = 13;
 pub const IPV6_RECVPKTINFO: ::c_int = 36;
 pub const IPV6_PKTINFO: ::c_int = 46;
+pub const IPV6_RECVTCLASS: ::c_int = 57;
+pub const IPV6_TCLASS: ::c_int = 61;
 
 pub const TCP_NOPUSH:    ::c_int = 4;
 pub const TCP_NOOPT:     ::c_int = 8;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -57,7 +57,9 @@
         pub ifa_addr: *mut ::sockaddr,
         pub ifa_netmask: *mut ::sockaddr,
         pub ifa_dstaddr: *mut ::sockaddr,
-        pub ifa_data: *mut ::c_void
+        pub ifa_data: *mut ::c_void,
+        #[cfg(target_os = "netbsd")]
+        pub ifa_addrflags: ::c_uint
     }
 
     pub struct fd_set {
@@ -179,6 +181,7 @@
 pub const SIG_BLOCK: ::c_int = 0x1;
 pub const SIG_UNBLOCK: ::c_int = 0x2;
 
+pub const IP_TOS: ::c_int = 3;
 pub const IP_MULTICAST_IF: ::c_int = 9;
 pub const IP_MULTICAST_TTL: ::c_int = 10;
 pub const IP_MULTICAST_LOOP: ::c_int = 11;
@@ -189,6 +192,12 @@
 pub const IPV6_MULTICAST_LOOP: ::c_int = 11;
 pub const IPV6_V6ONLY: ::c_int = 27;
 
+pub const IPTOS_ECN_NOTECT: u8 = 0x00;
+pub const IPTOS_ECN_MASK: u8 = 0x03;
+pub const IPTOS_ECN_ECT1: u8 = 0x01;
+pub const IPTOS_ECN_ECT0: u8 = 0x02;
+pub const IPTOS_ECN_CE: u8 = 0x03;
+
 pub const ST_RDONLY: ::c_ulong = 1;
 
 pub const SCM_RIGHTS: ::c_int = 0x01;
@@ -333,43 +342,14 @@
 pub const POLLWRBAND: ::c_short = 0x100;
 
 f! {
-    pub fn CMSG_FIRSTHDR(mhdr: *const msghdr) -> *mut cmsghdr {
-        if (*mhdr).msg_controllen as usize >= mem::size_of::<cmsghdr>() {
-            (*mhdr).msg_control as *mut cmsghdr
-        } else {
-            0 as *mut cmsghdr
-        }
-    }
-
-    pub fn CMSG_NXTHDR(mhdr: *const msghdr,
-                       cmsg: *const cmsghdr) -> *mut cmsghdr {
-        if cmsg.is_null() {
-            return CMSG_FIRSTHDR(mhdr);
-        };
-        let pad = mem::align_of::<cmsghdr>() - 1;
-        let next = cmsg as usize + (*cmsg).cmsg_len as usize + pad & !pad;
-        let max = (*mhdr).msg_control as usize
-            + (*mhdr).msg_controllen as usize;
-        if next < max {
-            next as *mut cmsghdr
+    pub fn CMSG_FIRSTHDR(mhdr: *const ::msghdr) -> *mut ::cmsghdr {
+        if (*mhdr).msg_controllen as usize >= mem::size_of::<::cmsghdr>() {
+            (*mhdr).msg_control as *mut ::cmsghdr
         } else {
-            0 as *mut cmsghdr
+            0 as *mut ::cmsghdr
         }
     }
 
-    pub fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut ::c_uchar {
-        cmsg.offset(1) as *mut ::c_uchar
-    }
-
-    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
-        let pad = mem::align_of::<cmsghdr>() as ::c_uint - 1;
-        mem::size_of::<cmsghdr>() as ::c_uint + ((length + pad) & !pad)
-    }
-
-    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
-        mem::size_of::<cmsghdr>() as ::c_uint + length
-    }
-
     pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
         let bits = mem::size_of_val(&(*set).fds_bits[0]) * 8;
         let fd = fd as usize;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 pub type time_t = i64;
 pub type mode_t = u32;
 pub type nlink_t = ::uint32_t;
@@ -430,6 +432,8 @@
 pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
 pub const IPV6_RECVPKTINFO: ::c_int = 36;
 pub const IPV6_PKTINFO: ::c_int = 46;
+pub const IPV6_RECVTCLASS: ::c_int = 57;
+pub const IPV6_TCLASS: ::c_int = 61;
 
 pub const SOL_SOCKET: ::c_int = 0xffff;
 pub const SO_DEBUG: ::c_int = 0x01;
@@ -591,7 +595,43 @@
 
 pub const TIMER_ABSTIME: ::c_int = 1;
 
+fn _ALIGN(p: usize) -> usize {
+    (p + _ALIGNBYTES) & !_ALIGNBYTES
+}
+
 f! {
+    pub fn CMSG_DATA(cmsg: *const ::cmsghdr) -> *mut ::c_uchar {
+        (cmsg as *mut ::c_uchar)
+            .offset(_ALIGN(mem::size_of::<::cmsghdr>()) as isize)
+    }
+
+    pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
+        _ALIGN(mem::size_of::<::cmsghdr>()) as ::c_uint + length
+    }
+
+    pub fn CMSG_NXTHDR(mhdr: *const ::msghdr, cmsg: *const ::cmsghdr)
+        -> *mut ::cmsghdr
+    {
+        if cmsg.is_null() {
+            return ::CMSG_FIRSTHDR(mhdr);
+        };
+        let next = cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize)
+            + _ALIGN(mem::size_of::<::cmsghdr>());
+        let max = (*mhdr).msg_control as usize
+            + (*mhdr).msg_controllen as usize;
+        if next > max {
+            0 as *mut ::cmsghdr
+        } else {
+            (cmsg as usize + _ALIGN((*cmsg).cmsg_len as usize))
+                as *mut ::cmsghdr
+        }
+    }
+
+    pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
+        (_ALIGN(mem::size_of::<::cmsghdr>()) + _ALIGN(length as usize))
+            as ::c_uint
+    }
+
     pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
         status >> 8
     }
@@ -669,11 +709,9 @@
                         groups: *mut ::gid_t,
                         ngroups: *mut ::c_int) -> ::c_int;
     pub fn initgroups(name: *const ::c_char, basegid: ::gid_t) -> ::c_int;
-    pub fn fexecve(fd: ::c_int, argv: *const *const ::c_char,
-                   envp: *const *const ::c_char)
-                   -> ::c_int;
     pub fn getdomainname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn setdomainname(name: *const ::c_char, len: ::size_t) -> ::c_int;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/aarch64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/aarch64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/aarch64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/aarch64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 use PT_FIRSTMACH;
 
 pub type c_long = i64;
@@ -5,6 +7,10 @@
 pub type c_char = u8;
 pub type __cpu_simple_lock_nv_t = ::c_uchar;
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_int>() - 1;
+
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
 pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/arm.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/arm.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/arm.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/arm.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 use PT_FIRSTMACH;
 
 pub type c_long = i32;
@@ -5,6 +7,10 @@
 pub type c_char = u8;
 pub type __cpu_simple_lock_nv_t = ::c_int;
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_longlong>() - 1;
+
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
 pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 3;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -393,6 +393,9 @@
 pub const F_SETNOSIGPIPE: ::c_int = 14;
 pub const F_MAXFD: ::c_int = 11;
 
+pub const IP_RECVDSTADDR: ::c_int = 7;
+pub const IP_SENDSRCADDR: ::c_int = IP_RECVDSTADDR;
+pub const IP_RECVIF: ::c_int = 20;
 pub const IP_PKTINFO: ::c_int = 25;
 pub const IP_RECVPKTINFO: ::c_int = 26;
 pub const IPV6_JOIN_GROUP: ::c_int = 12;
@@ -523,15 +526,16 @@
 pub const AF_IEEE80211: ::c_int = 32;
 pub const AF_MPLS: ::c_int = 33;
 pub const AF_ROUTE: ::c_int = 34;
-pub const AF_MAX: ::c_int = 35;
+pub const AF_MAX: ::c_int = 36;
 
 pub const NET_MAXID: ::c_int = AF_MAX;
 pub const NET_RT_DUMP: ::c_int = 1;
 pub const NET_RT_FLAGS: ::c_int = 2;
-pub const NET_RT_OOIFLIST: ::c_int = 3;
-pub const NET_RT_OIFLIST: ::c_int = 4;
-pub const NET_RT_IFLIST: ::c_int = 5;
-pub const NET_RT_MAXID: ::c_int = 6;
+pub const NET_RT_OOOIFLIST: ::c_int = 3;
+pub const NET_RT_OOIFLIST: ::c_int = 4;
+pub const NET_RT_OIFLIST: ::c_int = 5;
+pub const NET_RT_IFLIST: ::c_int = 6;
+pub const NET_RT_MAXID: ::c_int = 7;
 
 pub const PF_OROUTE: ::c_int = AF_OROUTE;
 pub const PF_ARP: ::c_int = AF_ARP;
@@ -984,6 +988,20 @@
 pub const SOCK_CLOEXEC: ::c_int = 0x10000000;
 pub const SOCK_NONBLOCK: ::c_int = 0x20000000;
 
+pub const FIONCLEX: ::c_ulong = 0x20006602;
+// Uncomment on next NetBSD release
+// pub const FIOSEEKDATA: ::c_ulong = 0xc0086661;
+// pub const FIOSEEKHOLE: ::c_ulong = 0xc0086662;
+pub const FIONREAD: ::c_ulong = 0x4004667f;
+pub const FIOASYNC: ::c_ulong = 0x8004667d;
+pub const FIOSETOWN: ::c_ulong = 0x8004667c;
+pub const FIOGETOWN: ::c_ulong = 0x4004667b;
+pub const OFIOGETBMAP: ::c_ulong = 0xc004667a;
+pub const FIOGETBMAP: ::c_ulong = 0xc008667a;
+pub const FIONWRITE: ::c_ulong = 0x40046679;
+pub const FIONSPACE: ::c_ulong = 0x40046678;
+pub const FIBMAP: ::c_ulong = 0xc008667a;
+
 pub const SIGSTKSZ : ::size_t = 40960;
 
 pub const PT_DUMPCORE: ::c_int = 12;
@@ -1022,6 +1040,7 @@
     }
 }
 
+#[link(name = "rt")]
 extern {
     pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
     pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
@@ -1034,7 +1053,9 @@
     pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
     pub fn lio_listio(mode: ::c_int, aiocb_list: *const *mut aiocb,
                       nitems: ::c_int, sevp: *mut sigevent) -> ::c_int;
+}
 
+extern {
     pub fn chflags(path: *const ::c_char, flags: ::c_ulong) -> ::c_int;
     pub fn fchflags(fd: ::c_int, flags: ::c_ulong) -> ::c_int;
     pub fn lchflags(path: *const ::c_char, flags: ::c_ulong) -> ::c_int;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/powerpc.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/powerpc.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/powerpc.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/powerpc.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 use PT_FIRSTMACH;
 
 pub type c_long = i32;
@@ -5,6 +7,10 @@
 pub type c_char = u8;
 pub type __cpu_simple_lock_nv_t = ::c_int;
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_double>() - 1;
+
 pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/sparc64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/sparc64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/sparc64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/sparc64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2,3 +2,7 @@
 pub type c_ulong = u64;
 pub type c_char = i8;
 pub type __cpu_simple_lock_nv_t = ::c_uchar;
+
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = 0xf;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86_64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,5 @@
+use dox::mem;
+
 use PT_FIRSTMACH;
 
 pub type c_long = i64;
@@ -5,6 +7,10 @@
 pub type c_char = i8;
 pub type __cpu_simple_lock_nv_t = ::c_uchar;
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
+
 pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/netbsd/x86.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,4 +1,10 @@
+use dox::mem;
+
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type c_char = i8;
 pub type __cpu_simple_lock_nv_t = ::c_uchar;
+
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_int>() - 1;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/mod.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -319,6 +319,7 @@
 
 pub const IP_RECVDSTADDR: ::c_int = 7;
 pub const IP_SENDSRCADDR: ::c_int = IP_RECVDSTADDR;
+pub const IP_RECVIF: ::c_int = 30;
 
 // sys/netinet/in.h
 pub const TCP_MD5SIG: ::c_int = 0x04;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,9 @@
+use dox::mem;
+
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = u8;
+
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,9 +1,15 @@
+use dox::mem;
+
 use PT_FIRSTMACH;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type c_char = i8;
 
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_long>() - 1;
+
 pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
 pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
 pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs
--- cargo-0.32.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,9 @@
+use dox::mem;
+
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type c_char = i8;
+
+// should be pub(crate), but that requires Rust 1.18.0
+#[doc(hidden)]
+pub const _ALIGNBYTES: usize = mem::size_of::<::c_int>() - 1;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/haiku/mod.rs cargo-0.33.0/vendor/libc/src/unix/haiku/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/haiku/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/haiku/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1242,6 +1242,7 @@
                    termp: *mut termios,
                    winp: *mut ::winsize) -> ::pid_t;
     pub fn sethostname(name: *const ::c_char, len: ::size_t) -> ::c_int;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/unix/hermit/mod.rs cargo-0.33.0/vendor/libc/src/unix/hermit/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/hermit/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/hermit/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -727,6 +727,7 @@
         -> ::c_int;
 
     pub fn setgroups(ngroups: ::c_int, grouplist: *const ::gid_t) -> ::c_int;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/unix/mod.rs cargo-0.33.0/vendor/libc/src/unix/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -972,7 +972,6 @@
     #[cfg_attr(target_os = "freebsd", link_name = "mknod@FBSD_1.0")]
     pub fn mknod(pathname: *const ::c_char, mode: ::mode_t,
                  dev: ::dev_t) -> ::c_int;
-    pub fn uname(buf: *mut ::utsname) -> ::c_int;
     pub fn gethostname(name: *mut ::c_char, len: ::size_t) -> ::c_int;
     pub fn getservbyname(name: *const ::c_char,
                          proto: *const ::c_char) -> *mut servent;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/newlib/mod.rs cargo-0.33.0/vendor/libc/src/unix/newlib/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/newlib/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/newlib/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -728,6 +728,7 @@
                link_name = "popen$UNIX2003")]
     pub fn popen(command: *const c_char,
                  mode: *const c_char) -> *mut ::FILE;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/android/mod.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/android/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/android/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/android/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -666,6 +666,8 @@
 pub const SO_PEEK_OFF: ::c_int = 42;
 pub const SO_BUSY_POLL: ::c_int = 46;
 
+pub const IPTOS_ECN_NOTECT: u8 = 0x00;
+
 pub const O_ACCMODE: ::c_int = 3;
 pub const O_APPEND: ::c_int = 1024;
 pub const O_CREAT: ::c_int = 64;
@@ -1056,6 +1058,7 @@
 
 pub const MFD_CLOEXEC: ::c_uint = 0x0001;
 pub const MFD_ALLOW_SEALING: ::c_uint = 0x0002;
+pub const MFD_HUGETLB: ::c_uint = 0x0004;
 
 // linux/netfilter.h
 pub const NF_DROP: ::c_int = 0;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/mips/mod.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/mips/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/mips/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/mips/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -537,6 +537,9 @@
 
 pub const EFD_NONBLOCK: ::c_int = 0x80;
 
+pub const F_RDLCK: ::c_int = 0;
+pub const F_WRLCK: ::c_int = 1;
+pub const F_UNLCK: ::c_int = 2;
 pub const F_GETLK: ::c_int = 14;
 pub const F_GETOWN: ::c_int = 23;
 pub const F_SETOWN: ::c_int = 24;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/mod.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1320,6 +1320,7 @@
 
 pub const MFD_CLOEXEC: ::c_uint = 0x0001;
 pub const MFD_ALLOW_SEALING: ::c_uint = 0x0002;
+pub const MFD_HUGETLB: ::c_uint = 0x0004;
 
 // these are used in the p_type field of Elf32_Phdr and Elf64_Phdr, which has
 // the type Elf32Word and Elf64Word respectively. Luckily, both of those are u32
@@ -1611,6 +1612,8 @@
 pub const IPTOS_TOS_MASK: u8 = 0x1E;
 pub const IPTOS_PREC_MASK: u8 = 0xE0;
 
+pub const IPTOS_ECN_NOT_ECT: u8 = 0x00;
+
 pub const RTF_UP: ::c_ushort = 0x0001;
 pub const RTF_GATEWAY: ::c_ushort = 0x0002;
 
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/other/b32/x86.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/other/b32/x86.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/other/b32/x86.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/other/b32/x86.rs	2019-02-06 04:11:58.000000000 +0000
@@ -758,6 +758,27 @@
 pub const UESP: ::c_int = 15;
 pub const SS: ::c_int = 16;
 
+// offsets in mcontext_t.gregs from sys/ucontext.h
+pub const REG_GS: ::c_int = 0;
+pub const REG_FS: ::c_int = 1;
+pub const REG_ES: ::c_int = 2;
+pub const REG_DS: ::c_int = 3;
+pub const REG_EDI: ::c_int = 4;
+pub const REG_ESI: ::c_int = 5;
+pub const REG_EBP: ::c_int = 6;
+pub const REG_ESP: ::c_int = 7;
+pub const REG_EBX: ::c_int = 8;
+pub const REG_EDX: ::c_int = 9;
+pub const REG_ECX: ::c_int = 10;
+pub const REG_EAX: ::c_int = 11;
+pub const REG_TRAPNO: ::c_int = 12;
+pub const REG_ERR: ::c_int = 13;
+pub const REG_EIP: ::c_int = 14;
+pub const REG_CS: ::c_int = 15;
+pub const REG_EFL: ::c_int = 16;
+pub const REG_UESP: ::c_int = 17;
+pub const REG_SS: ::c_int = 18;
+
 extern {
     pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;
     pub fn setcontext(ucp: *const ucontext_t) -> ::c_int;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/other/b64/x86_64.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/other/b64/x86_64.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/other/b64/x86_64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/other/b64/x86_64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -644,6 +644,31 @@
 pub const FS: ::c_int = 25;
 pub const GS: ::c_int = 26;
 
+// offsets in mcontext_t.gregs from sys/ucontext.h
+pub const REG_R8: ::c_int = 0;
+pub const REG_R9: ::c_int = 1;
+pub const REG_R10: ::c_int = 2;
+pub const REG_R11: ::c_int = 3;
+pub const REG_R12: ::c_int = 4;
+pub const REG_R13: ::c_int = 5;
+pub const REG_R14: ::c_int = 6;
+pub const REG_R15: ::c_int = 7;
+pub const REG_RDI: ::c_int = 8;
+pub const REG_RSI: ::c_int = 9;
+pub const REG_RBP: ::c_int = 10;
+pub const REG_RBX: ::c_int = 11;
+pub const REG_RDX: ::c_int = 12;
+pub const REG_RAX: ::c_int = 13;
+pub const REG_RCX: ::c_int = 14;
+pub const REG_RSP: ::c_int = 15;
+pub const REG_RIP: ::c_int = 16;
+pub const REG_EFL: ::c_int = 17;
+pub const REG_CSGSFS: ::c_int = 18;
+pub const REG_ERR: ::c_int = 19;
+pub const REG_TRAPNO: ::c_int = 20;
+pub const REG_OLDMASK: ::c_int = 21;
+pub const REG_CR2: ::c_int = 22;
+
 extern {
     pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;
     pub fn setcontext(ucp: *const ucontext_t) -> ::c_int;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/s390x.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/s390x.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/linux/s390x.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/linux/s390x.rs	2019-02-06 04:11:58.000000000 +0000
@@ -791,6 +791,9 @@
 
 pub const EFD_NONBLOCK: ::c_int = 0x800;
 
+pub const F_RDLCK: ::c_int = 0;
+pub const F_WRLCK: ::c_int = 1;
+pub const F_UNLCK: ::c_int = 2;
 pub const F_GETLK: ::c_int = 5;
 pub const F_GETOWN: ::c_int = 9;
 pub const F_SETOWN: ::c_int = 8;
diff -Nru cargo-0.32.0/vendor/libc/src/unix/notbsd/mod.rs cargo-0.33.0/vendor/libc/src/unix/notbsd/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/notbsd/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/notbsd/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -623,9 +623,11 @@
 pub const IP_MULTICAST_IF: ::c_int = 32;
 pub const IP_MULTICAST_TTL: ::c_int = 33;
 pub const IP_MULTICAST_LOOP: ::c_int = 34;
+pub const IP_TOS: ::c_int = 1;
 pub const IP_TTL: ::c_int = 2;
 pub const IP_HDRINCL: ::c_int = 3;
 pub const IP_PKTINFO: ::c_int = 8;
+pub const IP_RECVTOS: ::c_int = 13;
 pub const IP_ADD_MEMBERSHIP: ::c_int = 35;
 pub const IP_DROP_MEMBERSHIP: ::c_int = 36;
 pub const IP_TRANSPARENT: ::c_int = 19;
@@ -638,6 +640,8 @@
 pub const IPV6_V6ONLY: ::c_int = 26;
 pub const IPV6_RECVPKTINFO: ::c_int = 49;
 pub const IPV6_PKTINFO: ::c_int = 50;
+pub const IPV6_RECVTCLASS: ::c_int = 66;
+pub const IPV6_TCLASS: ::c_int = 67;
 
 pub const TCP_NODELAY: ::c_int = 1;
 pub const TCP_MAXSEG: ::c_int = 2;
@@ -874,6 +878,11 @@
 pub const IPTOS_PREC_PRIORITY: u8 = 0x20;
 pub const IPTOS_PREC_ROUTINE: u8 = 0x00;
 
+pub const IPTOS_ECN_MASK: u8 = 0x03;
+pub const IPTOS_ECN_ECT1: u8 = 0x01;
+pub const IPTOS_ECN_ECT0: u8 = 0x02;
+pub const IPTOS_ECN_CE: u8 = 0x03;
+
 pub const IPOPT_COPY: u8 = 0x80;
 pub const IPOPT_CLASS_MASK: u8 = 0x60;
 pub const IPOPT_NUMBER_MASK: u8 = 0x1f;
@@ -1087,6 +1096,10 @@
     pub fn IPOPT_NUMBER(o: u8) -> u8 {
         o & IPOPT_NUMBER_MASK
     }
+
+    pub fn IPTOS_ECN(x: u8) -> u8 {
+        x & ::IPTOS_ECN_MASK
+    }
 }
 
 extern {
@@ -1229,6 +1242,7 @@
                    flags: ::c_int) -> ::ssize_t;
     pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int)
                    -> ::ssize_t;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/unix/solaris/mod.rs cargo-0.33.0/vendor/libc/src/unix/solaris/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/solaris/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/solaris/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1466,4 +1466,5 @@
                  mode: *const c_char) -> *mut ::FILE;
 
     pub fn dup3(src: ::c_int, dst: ::c_int, flags: ::c_int) -> ::c_int;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
diff -Nru cargo-0.32.0/vendor/libc/src/unix/uclibc/mod.rs cargo-0.33.0/vendor/libc/src/unix/uclibc/mod.rs
--- cargo-0.32.0/vendor/libc/src/unix/uclibc/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/unix/uclibc/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1953,6 +1953,7 @@
                link_name = "popen$UNIX2003")]
     pub fn popen(command: *const c_char,
                  mode: *const c_char) -> *mut ::FILE;
+    pub fn uname(buf: *mut ::utsname) -> ::c_int;
 }
 
 cfg_if! {
diff -Nru cargo-0.32.0/vendor/libc/src/windows/gnu.rs cargo-0.33.0/vendor/libc/src/windows/gnu.rs
--- cargo-0.32.0/vendor/libc/src/windows/gnu.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/windows/gnu.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,8 +1,13 @@
 pub const L_tmpnam: ::c_uint = 14;
 pub const TMP_MAX: ::c_uint = 0x7fff;
 
+// stdio file descriptor numbers
+pub const STDIN_FILENO: ::c_int = 0;
+pub const STDOUT_FILENO: ::c_int = 1;
+pub const STDERR_FILENO: ::c_int = 2;
+
 extern {
     pub fn strcasecmp(s1: *const ::c_char, s2: *const ::c_char) -> ::c_int;
     pub fn strncasecmp(s1: *const ::c_char, s2: *const ::c_char,
-                    n: ::size_t) -> ::c_int;
+                       n: ::size_t) -> ::c_int;
 }
diff -Nru cargo-0.32.0/vendor/libc/src/windows/mod.rs cargo-0.33.0/vendor/libc/src/windows/mod.rs
--- cargo-0.32.0/vendor/libc/src/windows/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/windows/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -27,6 +27,7 @@
 pub type intptr_t = isize;
 pub type uintptr_t = usize;
 pub type ssize_t = isize;
+pub type sighandler_t = usize;
 
 pub type c_char = i8;
 pub type c_long = i32;
@@ -49,6 +50,8 @@
 pub enum timezone {}
 pub type time64_t = i64;
 
+pub type SOCKET = ::uintptr_t;
+
 s! {
     // note this is the struct called stat64 in Windows. Not stat, nor stati64.
     pub struct stat {
@@ -72,15 +75,15 @@
     }
 
     pub struct tm {
-        tm_sec: ::c_int,
-        tm_min: ::c_int,
-        tm_hour: ::c_int,
-        tm_mday: ::c_int,
-        tm_mon: ::c_int,
-        tm_year: ::c_int,
-        tm_wday: ::c_int,
-        tm_yday: ::c_int,
-        tm_isdst: ::c_int,
+        pub tm_sec: ::c_int,
+        pub tm_min: ::c_int,
+        pub tm_hour: ::c_int,
+        pub tm_mday: ::c_int,
+        pub tm_mon: ::c_int,
+        pub tm_year: ::c_int,
+        pub tm_wday: ::c_int,
+        pub tm_yday: ::c_int,
+        pub tm_isdst: ::c_int,
     }
 
     pub struct timeval {
@@ -92,6 +95,11 @@
         pub tv_sec: time_t,
         pub tv_nsec: c_long,
     }
+
+    pub struct sockaddr {
+        pub sa_family: c_ushort,
+        pub sa_data: [c_char; 14],
+    }
 }
 
 pub const INT_MIN: c_int = -2147483648;
@@ -177,6 +185,16 @@
 pub const EILSEQ: ::c_int = 42;
 pub const STRUNCATE: ::c_int = 80;
 
+// signal codes
+pub const SIGINT: ::c_int = 2;
+pub const SIGILL: ::c_int = 4;
+pub const SIGFPE: ::c_int = 8;
+pub const SIGSEGV: ::c_int = 11;
+pub const SIGTERM: ::c_int = 15;
+pub const SIGABRT: ::c_int = 22;
+pub const NSIG: ::c_int = 23;
+pub const SIG_ERR: ::c_int = -1;
+
 // inline comment below appeases style checker
 #[cfg(all(target_env = "msvc", feature = "rustc-dep-of-std"))] // " if "
 #[link(name = "msvcrt", cfg(not(target_feature = "crt-static")))]
@@ -287,6 +305,9 @@
     pub fn rand() -> c_int;
     pub fn srand(seed: c_uint);
 
+    pub fn signal(signum: c_int, handler: sighandler_t) -> sighandler_t;
+    pub fn raise(signum: c_int) -> c_int;
+
     #[link_name = "_chmod"]
     pub fn chmod(path: *const c_char, mode: ::c_int) -> ::c_int;
     #[link_name = "_wchmod"]
@@ -369,6 +390,34 @@
                       locale: *const wchar_t) -> *mut wchar_t;
 }
 
+extern "system" {
+    pub fn listen(s: SOCKET, backlog: ::c_int) -> ::c_int;
+    pub fn accept(s: SOCKET, addr: *mut ::sockaddr,
+                  addrlen: *mut ::c_int) -> SOCKET;
+    pub fn bind(s: SOCKET, name: *const ::sockaddr,
+                namelen: ::c_int) -> ::c_int;
+    pub fn connect(s: SOCKET, name: *const ::sockaddr,
+                   namelen: ::c_int) -> ::c_int;
+    pub fn getpeername(s: SOCKET, name: *mut ::sockaddr,
+                       nameln: *mut ::c_int) -> ::c_int;
+    pub fn getsockname(s: SOCKET, name: *mut ::sockaddr,
+                       nameln: *mut ::c_int) -> ::c_int;
+    pub fn getsockopt(s: SOCKET, level: ::c_int, optname: ::c_int,
+                      optval: *mut ::c_char,
+                      optlen: *mut ::c_int) -> ::c_int;
+    pub fn recvfrom(s: SOCKET, buf: *mut  ::c_char, len: ::c_int,
+                    flags: ::c_int, from: *mut ::sockaddr,
+                    fromlen: *mut ::c_int) -> ::c_int;
+    pub fn sendto(s: SOCKET, buf: *const  ::c_char, len: ::c_int,
+                  flags: ::c_int, to: *const ::sockaddr,
+                  tolen: ::c_int) -> ::c_int;
+    pub fn setsockopt(s: SOCKET, level: ::c_int, optname: ::c_int,
+                      optval: *const  ::c_char,
+                      optlen: ::c_int) -> ::c_int;
+    pub fn socket(af: ::c_int, socket_type: ::c_int,
+                  protocol: ::c_int) -> SOCKET;
+}
+
 cfg_if! {
     if #[cfg(core_cvoid)] {
         pub use core::ffi::c_void;
diff -Nru cargo-0.32.0/vendor/libc/src/windows/msvc.rs cargo-0.33.0/vendor/libc/src/windows/msvc.rs
--- cargo-0.32.0/vendor/libc/src/windows/msvc.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libc/src/windows/msvc.rs	2019-02-06 04:11:58.000000000 +0000
@@ -7,4 +7,4 @@
     #[link_name = "_strnicmp"]
     pub fn strnicmp(s1: *const ::c_char, s2: *const ::c_char,
                     n: ::size_t) -> ::c_int;
-}
\ No newline at end of file
+}
diff -Nru cargo-0.32.0/vendor/libgit2-sys/.cargo-checksum.json cargo-0.33.0/vendor/libgit2-sys/.cargo-checksum.json
--- cargo-0.32.0/vendor/libgit2-sys/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libgit2-sys/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"4916b5addc78ec36cc309acfcdf0b9f9d97ab7b84083118b248709c5b7029356"}
\ No newline at end of file
+{"files":{},"package":"48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/libgit2-sys/Cargo.toml cargo-0.33.0/vendor/libgit2-sys/Cargo.toml
--- cargo-0.32.0/vendor/libgit2-sys/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libgit2-sys/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "libgit2-sys"
-version = "0.7.10"
+version = "0.7.11"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 build = "build.rs"
 links = "git2"
diff -Nru cargo-0.32.0/vendor/libgit2-sys/lib.rs cargo-0.33.0/vendor/libgit2-sys/lib.rs
--- cargo-0.32.0/vendor/libgit2-sys/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libgit2-sys/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -79,6 +79,7 @@
 pub enum git_diff {}
 pub enum git_diff_stats {}
 pub enum git_patch {}
+pub enum git_rebase {}
 pub enum git_reflog {}
 pub enum git_reflog_entry {}
 pub enum git_describe_result {}
@@ -1557,6 +1558,36 @@
 
 pub type git_odb_foreach_cb = extern fn(id: *const git_oid, payload: *mut c_void) -> c_int;
 
+pub const GIT_REBASE_NO_OPERATION: usize = usize::max_value();
+
+#[repr(C)]
+pub struct git_rebase_options {
+    pub version: c_uint,
+    pub quiet: c_int,
+    pub inmemory: c_int,
+    pub rewrite_notes_ref: *const c_char,
+    pub merge_options: git_merge_options,
+    pub checkout_options: git_checkout_options,
+}
+
+git_enum! {
+    pub enum git_rebase_operation_t {
+        GIT_REBASE_OPERATION_PICK = 0,
+        GIT_REBASE_OPERATION_REWORD,
+        GIT_REBASE_OPERATION_EDIT,
+        GIT_REBASE_OPERATION_SQUASH,
+        GIT_REBASE_OPERATION_FIXUP,
+        GIT_REBASE_OPERATION_EXEC,
+    }
+}
+
+#[repr(C)]
+pub struct git_rebase_operation {
+    pub kind: git_rebase_operation_t,
+    pub id: git_oid,
+    pub exec: *const c_char,
+}
+
 extern {
     // threads
     pub fn git_libgit2_init() -> c_int;
@@ -2959,6 +2990,30 @@
     pub fn git_refdb_set_backend(refdb: *mut git_refdb, backend: *mut git_refdb_backend) -> c_int;
     pub fn git_refdb_compress(refdb: *mut git_refdb) -> c_int;
     pub fn git_refdb_free(refdb: *mut git_refdb);
+
+    // rebase
+    pub fn git_rebase_init_options(opts: *mut git_rebase_options, version: c_uint) -> c_int;
+    pub fn git_rebase_init(out: *mut *mut git_rebase,
+                           repo: *mut git_repository,
+                           branch: *const git_annotated_commit,
+                           upstream: *const git_annotated_commit,
+                           onto: *const git_annotated_commit,
+                           opts: *const git_rebase_options) -> c_int;
+    pub fn git_rebase_open(out: *mut *mut git_rebase, repo: *mut git_repository, opts: *const git_rebase_options) -> c_int;
+    pub fn git_rebase_operation_entrycount(rebase: *mut git_rebase) -> size_t;
+    pub fn git_rebase_operation_current(rebase: *mut git_rebase) -> size_t;
+    pub fn git_rebase_operation_byindex(rebase: *mut git_rebase, idx: size_t) -> *mut git_rebase_operation;
+    pub fn git_rebase_next(operation: *mut *mut git_rebase_operation, rebase: *mut git_rebase) -> c_int;
+    pub fn git_rebase_inmemory_index(index: *mut *mut git_index, rebase: *mut git_rebase) -> c_int;
+    pub fn git_rebase_commit(id: *mut git_oid,
+                             rebase: *mut git_rebase,
+                             author: *const git_signature,
+                             committer: *const git_signature,
+                             message_encoding: *const c_char,
+                             message: *const c_char) -> c_int;
+    pub fn git_rebase_abort(rebase: *mut git_rebase) -> c_int;
+    pub fn git_rebase_finish(rebase: *mut git_rebase, signature: *const git_signature) -> c_int;
+    pub fn git_rebase_free(rebase: *mut git_rebase);
 }
 
 pub fn init() {
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.appveyor.yml cargo-0.33.0/vendor/libnghttp2-sys/.appveyor.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-environment:
-  matrix:
-  - TARGET: i686-pc-windows-msvc
-  - TARGET: x86_64-pc-windows-msvc
-
-install:
-  # Install rust, x86_64-pc-windows-msvc host
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  # Install the target we're compiling for
-  - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
-  - rustc -vV
-  - cargo -vV
-  - git submodule update --init
-
-build: false
-
-test_script:
-  - cargo test --target %TARGET%
-  - cargo run --manifest-path systest/Cargo.toml
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/build.rs cargo-0.33.0/vendor/libnghttp2-sys/build.rs
--- cargo-0.32.0/vendor/libnghttp2-sys/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,83 +1,7 @@
-extern crate cc;
+extern crate pkg_config;
 
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-
-const VERSION: &str = "1.33.90";
-
-fn main() {
-    let target = env::var("TARGET").unwrap();
-    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    let ver = fs::read_to_string("nghttp2/lib/includes/nghttp2/nghttp2ver.h.in")
-        .unwrap()
-        .replace("@PACKAGE_VERSION@", VERSION)
-        .replace("@PACKAGE_VERSION_NUM@", "0x01214a");
-
-    let install = out_dir.join("i");
-    let include = install.join("include");
-    let lib = install.join("lib");
-    let pkgconfig = lib.join("pkgconfig");
-    fs::create_dir_all(include.join("nghttp2")).unwrap();
-    fs::create_dir_all(&pkgconfig).unwrap();
-    fs::write(include.join("nghttp2/nghttp2ver.h"), ver).unwrap();
-
-    let mut cfg = cc::Build::new();
-    cfg.include("nghttp2/lib/includes")
-       .include(&include)
-       .file("nghttp2/lib/nghttp2_buf.c")
-       .file("nghttp2/lib/nghttp2_callbacks.c")
-       .file("nghttp2/lib/nghttp2_debug.c")
-       .file("nghttp2/lib/nghttp2_frame.c")
-       .file("nghttp2/lib/nghttp2_hd.c")
-       .file("nghttp2/lib/nghttp2_hd_huffman.c")
-       .file("nghttp2/lib/nghttp2_hd_huffman_data.c")
-       .file("nghttp2/lib/nghttp2_helper.c")
-       .file("nghttp2/lib/nghttp2_http.c")
-       .file("nghttp2/lib/nghttp2_map.c")
-       .file("nghttp2/lib/nghttp2_mem.c")
-       .file("nghttp2/lib/nghttp2_npn.c")
-       .file("nghttp2/lib/nghttp2_option.c")
-       .file("nghttp2/lib/nghttp2_outbound_item.c")
-       .file("nghttp2/lib/nghttp2_pq.c")
-       .file("nghttp2/lib/nghttp2_priority_spec.c")
-       .file("nghttp2/lib/nghttp2_queue.c")
-       .file("nghttp2/lib/nghttp2_rcbuf.c")
-       .file("nghttp2/lib/nghttp2_session.c")
-       .file("nghttp2/lib/nghttp2_stream.c")
-       .file("nghttp2/lib/nghttp2_submit.c")
-       .file("nghttp2/lib/nghttp2_version.c")
-       .warnings(false)
-       .define("NGHTTP2_STATICLIB", None)
-       .define("HAVE_NETINET_IN", None)
-       .out_dir(&lib);
-
-    if target.contains("windows") {
-        // Apparently MSVC doesn't have `ssize_t` defined as a type
-        if target.contains("msvc") {
-            match &env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap()[..] {
-                "64" => { cfg.define("ssize_t", "int64_t"); }
-                "32" => { cfg.define("ssize_t", "int32_t"); }
-                s => panic!("unknown pointer size: {}", s),
-            }
-        }
-    } else {
-       cfg.define("HAVE_ARPA_INET_H", None);
+pub fn main() {
+    if pkg_config::probe_library("libnghttp2").is_ok() {
+        return;
     }
-    cfg.compile("nghttp2");
-
-    println!("cargo:root={}", install.display());
-
-    let pc = fs::read_to_string("nghttp2/lib/libnghttp2.pc.in")
-        .unwrap()
-        .replace("@prefix@", install.to_str().unwrap())
-        .replace("@exec_prefix@", "")
-        .replace("@libdir@", lib.to_str().unwrap())
-        .replace("@includedir@", include.to_str().unwrap())
-        .replace("@VERSION@", VERSION);
-    fs::write(pkgconfig.join("libnghttp2.pc"), pc).unwrap();
-    fs::copy(
-        "nghttp2/lib/includes/nghttp2/nghttp2.h",
-        include.join("nghttp2/nghttp2.h"),
-    ).unwrap();
 }
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/build.rs.orig cargo-0.33.0/vendor/libnghttp2-sys/build.rs.orig
--- cargo-0.32.0/vendor/libnghttp2-sys/build.rs.orig	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/build.rs.orig	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,83 @@
+extern crate cc;
+
+use std::env;
+use std::fs;
+use std::path::PathBuf;
+
+const VERSION: &str = "1.33.90";
+
+fn main() {
+    let target = env::var("TARGET").unwrap();
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+    let ver = fs::read_to_string("nghttp2/lib/includes/nghttp2/nghttp2ver.h.in")
+        .unwrap()
+        .replace("@PACKAGE_VERSION@", VERSION)
+        .replace("@PACKAGE_VERSION_NUM@", "0x01214a");
+
+    let install = out_dir.join("i");
+    let include = install.join("include");
+    let lib = install.join("lib");
+    let pkgconfig = lib.join("pkgconfig");
+    fs::create_dir_all(include.join("nghttp2")).unwrap();
+    fs::create_dir_all(&pkgconfig).unwrap();
+    fs::write(include.join("nghttp2/nghttp2ver.h"), ver).unwrap();
+
+    let mut cfg = cc::Build::new();
+    cfg.include("nghttp2/lib/includes")
+       .include(&include)
+       .file("nghttp2/lib/nghttp2_buf.c")
+       .file("nghttp2/lib/nghttp2_callbacks.c")
+       .file("nghttp2/lib/nghttp2_debug.c")
+       .file("nghttp2/lib/nghttp2_frame.c")
+       .file("nghttp2/lib/nghttp2_hd.c")
+       .file("nghttp2/lib/nghttp2_hd_huffman.c")
+       .file("nghttp2/lib/nghttp2_hd_huffman_data.c")
+       .file("nghttp2/lib/nghttp2_helper.c")
+       .file("nghttp2/lib/nghttp2_http.c")
+       .file("nghttp2/lib/nghttp2_map.c")
+       .file("nghttp2/lib/nghttp2_mem.c")
+       .file("nghttp2/lib/nghttp2_npn.c")
+       .file("nghttp2/lib/nghttp2_option.c")
+       .file("nghttp2/lib/nghttp2_outbound_item.c")
+       .file("nghttp2/lib/nghttp2_pq.c")
+       .file("nghttp2/lib/nghttp2_priority_spec.c")
+       .file("nghttp2/lib/nghttp2_queue.c")
+       .file("nghttp2/lib/nghttp2_rcbuf.c")
+       .file("nghttp2/lib/nghttp2_session.c")
+       .file("nghttp2/lib/nghttp2_stream.c")
+       .file("nghttp2/lib/nghttp2_submit.c")
+       .file("nghttp2/lib/nghttp2_version.c")
+       .warnings(false)
+       .define("NGHTTP2_STATICLIB", None)
+       .define("HAVE_NETINET_IN", None)
+       .out_dir(&lib);
+
+    if target.contains("windows") {
+        // Apparently MSVC doesn't have `ssize_t` defined as a type
+        if target.contains("msvc") {
+            match &env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap()[..] {
+                "64" => { cfg.define("ssize_t", "int64_t"); }
+                "32" => { cfg.define("ssize_t", "int32_t"); }
+                s => panic!("unknown pointer size: {}", s),
+            }
+        }
+    } else {
+       cfg.define("HAVE_ARPA_INET_H", None);
+    }
+    cfg.compile("nghttp2");
+
+    println!("cargo:root={}", install.display());
+
+    let pc = fs::read_to_string("nghttp2/lib/libnghttp2.pc.in")
+        .unwrap()
+        .replace("@prefix@", install.to_str().unwrap())
+        .replace("@exec_prefix@", "")
+        .replace("@libdir@", lib.to_str().unwrap())
+        .replace("@includedir@", include.to_str().unwrap())
+        .replace("@VERSION@", VERSION);
+    fs::write(pkgconfig.join("libnghttp2.pc"), pc).unwrap();
+    fs::copy(
+        "nghttp2/lib/includes/nghttp2/nghttp2.h",
+        include.join("nghttp2/nghttp2.h"),
+    ).unwrap();
+}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/Cargo.toml cargo-0.33.0/vendor/libnghttp2-sys/Cargo.toml
--- cargo-0.32.0/vendor/libnghttp2-sys/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -25,5 +25,5 @@
 doctest = false
 [dependencies.libc]
 version = "0.2"
-[build-dependencies.cc]
-version = "1.0.24"
+[build-dependencies.pkg-config]
+version = "0.3"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/debian/patches/series cargo-0.33.0/vendor/libnghttp2-sys/debian/patches/series
--- cargo-0.32.0/vendor/libnghttp2-sys/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+use-system-lib.patch
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/debian/patches/use-system-lib.patch cargo-0.33.0/vendor/libnghttp2-sys/debian/patches/use-system-lib.patch
--- cargo-0.32.0/vendor/libnghttp2-sys/debian/patches/use-system-lib.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/debian/patches/use-system-lib.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/Cargo.toml	2018-12-07 21:23:58.793977939 -0800
++++ b/Cargo.toml	2018-12-07 21:24:35.522546433 -0800
+@@ -25,5 +25,5 @@
+ doctest = false
+ [dependencies.libc]
+ version = "0.2"
+-[build-dependencies.cc]
+-version = "1.0.24"
++[build-dependencies.pkg-config]
++version = "0.3"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.gitmodules cargo-0.33.0/vendor/libnghttp2-sys/.gitmodules
--- cargo-0.32.0/vendor/libnghttp2-sys/.gitmodules	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.gitmodules	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[submodule "nghttp2"]
-	path = nghttp2
-	url = https://github.com/nghttp2/nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/android-config cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/android-config
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/android-config	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/android-config	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# nghttp2 - HTTP/2 C Library
-#
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-if [ -z "$ANDROID_HOME" ]; then
-    echo 'No $ANDROID_HOME specified.'
-    exit 1
-fi
-PREFIX="$ANDROID_HOME"/usr/local
-TOOLCHAIN="$ANDROID_HOME"/toolchain
-PATH="$TOOLCHAIN"/bin:"$PATH"
-
-./configure \
-    --disable-shared \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --with-xml-prefix="$PREFIX" \
-    --without-libxml2 \
-    --disable-python-bindings \
-    --disable-examples \
-    --disable-threads \
-    CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
-    CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
-    CPPFLAGS="-fPIE -I$PREFIX/include" \
-    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-fPIE -pie -L$PREFIX/lib"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/android-make cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/android-make
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/android-make	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/android-make	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# nghttp2 - HTTP/2 C Library
-#
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-if [ -z "$ANDROID_HOME" ]; then
-    echo 'No $ANDROID_HOME specified.'
-    exit 1
-fi
-TOOLCHAIN=$ANDROID_HOME/toolchain
-PATH=$TOOLCHAIN/bin:$PATH
-
-make "$@"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/appveyor.yml cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/appveyor.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-# Notes:
-#   - Minimal appveyor.yml file is an empty file. All sections are optional.
-#   - Indent each level of configuration with 2 spaces. Do not use tabs!
-#   - All section names are case-sensitive.
-#   - Section names should be unique on each level.
-
-#---------------------------------#
-#      general configuration      #
-#---------------------------------#
-
-# version format
-#version: 0.10.{build}
-
-# branches to build
-branches:
-  # blacklist
-  except:
-    - gh-pages
-
-# Do not build on tags (GitHub only)
-skip_tags: true
-
-#---------------------------------#
-#    environment configuration    #
-#---------------------------------#
-
-os: Windows Server 2012
-
-# scripts that run after cloning repository
-install:
-  # install Win-Flex-Bison
-  #- cmd: cinst winflexbison -y
-
-#---------------------------------#
-#       build configuration       #
-#---------------------------------#
-
-# scripts to run before build
-before_build:
-  - cmd: cmake .
-
-# scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)
-# before_package:
-
-# scripts to run after build
-# after_build:
-
-# to run your custom scripts instead of automatic MSBuild
-build_script:
-  - cmd: cmake --build .
-
-# to disable automatic builds
-# build: off
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/author.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/author.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/author.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/author.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-
-# script to extract commit author's name from standard input.  The
-# input should be <AUTHOR>:<EMAIL>, one per line.
-# This script expects the input is created by git-log command:
-#
-#   git log --format=%aN:%aE
-#
-# This script removes duplicates based on email address, breaking a
-# tie with longer author name.  Among the all author names extract the
-# previous step, we remove duplicate by case-insensitive match.
-#
-# So we can do this in one line:
-#
-#   git log --format=%aN:%aE | sort | uniq | ./author.py > authors
-
-import sys
-
-edict = {}
-
-for line in sys.stdin:
-    author, email = line.strip().split(':', 1)
-    if email in edict:
-        an = edict[email]
-        if len(an) < len(author) or an > author:
-            sys.stderr.write(
-                'eliminated {} in favor of {}\n'.format(an, author))
-            edict[email] = author
-        else:
-            sys.stderr.write(
-                'eliminated {} in favor of {}\n'.format(author, an))
-    else:
-        edict[email] = author
-
-names = list(sorted(edict.values()))
-
-ndict = {}
-
-for name in names:
-    lowname = name.lower()
-    if lowname in ndict:
-        an = ndict[lowname]
-        if an > name:
-            sys.stderr.write('eliminated {} in favor of {}\n'.format(an, name))
-            ndict[lowname] = name
-        else:
-            sys.stderr.write('eliminated {} in favor of {}\n'.format(name, an))
-    else:
-        ndict[lowname] = name
-
-for name in sorted(ndict.values()):
-    print name
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/AUTHORS cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/AUTHORS
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/AUTHORS	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/AUTHORS	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-nghttp2 project was started as a fork of spdylay project [1].  Both
-projects were started by Tatsuhiro Tsujikawa, who is still the main
-author of these projects.  Meanwhile, we have many contributions, and
-we are not here without them.  We sincerely thank you to all who made
-a contribution.  Here is the all individuals/organizations who
-contributed to nghttp2 and spdylay project at which we forked.  These
-names are retrieved from git commit log.  If you have made a
-contribution, but you are missing in the list, please let us know via
-github issues [2].
-
-[1] https://github.com/tatsuhiro-t/spdylay
-[2] https://github.com/nghttp2/nghttp2/issues
-
---------
-
-187j3x1
-Alek Storm
-Alex Nalivko
-Alexandros Konstantinakis-Karmis
-Alexis La Goutte
-Amir Pakdel
-Anders Bakken
-Andreas Pohl
-Andy Davies
-Angus Gratton
-Anna Henningsen
-Ant Bryan
-Benedikt Christoph Wolters
-Benjamin Peterson
-Bernard Spil
-Brian Card
-Brian Suh
-Daniel Evers
-Daniel Stenberg
-Dave Reisner
-David Beitey
-David Weekly
-Dmitriy Vetutnev
-Dylan Plecki
-Etienne Cimon
-Fabian Möller
-Fabian Wiesel
-Gabi Davar
-Gitai
-Google Inc.
-Jacob Champion
-Jan-E
-Janusz Dziemidowicz
-Jay Satiro
-Jianqing Wang
-Jim Morrison
-José F. Calcerrada
-Kamil Dudka
-Kazuho Oku
-Kenny (kang-yen) Peng
-Kenny Peng
-Kit Chan
-Kyle Schomp
-LazyHamster
-Lucas Pardue
-MATSUMOTO Ryosuke
-Marc Bachmann
-Matt Rudary
-Matt Way
-Mike Conlen
-Mike Frysinger
-Mike Lothian
-Nicholas Hurley
-Nora Shoemaker
-Peeyush Aggarwal
-Peter Wu
-Piotr Sikora
-Raul Gutierrez Segales
-Remo E
-Reza Tavakoli
-Rick Lei
-Ross Smith II
-Scott Mitchell
-Sebastiaan Deckers
-Simone Basso
-Soham Sinha
-Stefan Eissing
-Stephen Ludin
-Sunpoet Po-Chuan Hsieh
-Svante Signell
-Syohei YOSHIDA
-Tapanito
-Tatsuhiko Kubo
-Tatsuhiro Tsujikawa
-Tobias Geerinckx-Rice
-Tom Harwood
-Tomasz Buchert
-Tomasz Torcz
-Vernon Tang
-Viacheslav Biriukov
-Viktor Szakats
-Viktor Szépe
-Wenfeng Liu
-Xiaoguang Sun
-Zhuoyun Wei
-acesso
-ayanamist
-bxshi
-clemahieu
-dalf
-es
-fangdingjun
-jwchoi
-kumagi
-lstefani
-makovich
-mod-h2-dev
-moparisthebest
-snnn
-yuuki-kodama
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/.clang-format cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/.clang-format
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/.clang-format	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/.clang-format	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
----
-Language:        Cpp
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     80
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '$'
-IndentCaseLabels: false
-IndentPPDirectives: AfterHash
-IndentWidth:     2
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-RawStringFormats:
-  - Delimiter:       pb
-    Language:        TextProto
-    BasedOnStyle:    google
-ReflowComments:  true
-SortIncludes:    false
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        8
-UseTab:          Never
-...
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/ExtractValidFlags.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/ExtractValidFlags.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/ExtractValidFlags.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/ExtractValidFlags.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# Convenience function that checks the availability of certain
-# C or C++ compiler flags and returns valid ones as a string.
-
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-
-function(extract_valid_c_flags varname)
-  set(valid_flags)
-  foreach(flag IN LISTS ARGN)
-    string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
-    set(flag_var "C_FLAG_${flag_var}")
-    check_c_compiler_flag("${flag}" "${flag_var}")
-    if(${flag_var})
-      set(valid_flags "${valid_flags} ${flag}")
-    endif()
-  endforeach()
-  set(${varname} "${valid_flags}" PARENT_SCOPE)
-endfunction()
-
-function(extract_valid_cxx_flags varname)
-  set(valid_flags)
-  foreach(flag IN LISTS ARGN)
-    string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
-    set(flag_var "CXX_FLAG_${flag_var}")
-    check_cxx_compiler_flag("${flag}" "${flag_var}")
-    if(${flag_var})
-      set(valid_flags "${valid_flags} ${flag}")
-    endif()
-  endforeach()
-  set(${varname} "${valid_flags}" PARENT_SCOPE)
-endfunction()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCUnit.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCUnit.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCUnit.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCUnit.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# - Try to find cunit
-# Once done this will define
-#  CUNIT_FOUND        - System has cunit
-#  CUNIT_INCLUDE_DIRS - The cunit include directories
-#  CUNIT_LIBRARIES    - The libraries needed to use cunit
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_CUNIT QUIET cunit)
-
-find_path(CUNIT_INCLUDE_DIR
-  NAMES CUnit/CUnit.h
-  HINTS ${PC_CUNIT_INCLUDE_DIRS}
-)
-find_library(CUNIT_LIBRARY
-  NAMES cunit
-  HINTS ${PC_CUNIT_LIBRARY_DIRS}
-)
-
-if(CUNIT_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+CU_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${CUNIT_INCLUDE_DIR}/CUnit/CUnit.h"
-    CUNIT_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    CUNIT_VERSION "${CUNIT_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set CUNIT_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(CUnit REQUIRED_VARS
-                                  CUNIT_LIBRARY CUNIT_INCLUDE_DIR
-                                  VERSION_VAR CUNIT_VERSION)
-
-if(CUNIT_FOUND)
-  set(CUNIT_LIBRARIES     ${CUNIT_LIBRARY})
-  set(CUNIT_INCLUDE_DIRS  ${CUNIT_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCython.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCython.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCython.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindCython.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-# Find the Cython compiler.
-#
-# This code sets the following variables:
-#
-#  CYTHON_EXECUTABLE
-#
-# See also UseCython.cmake
-
-#=============================================================================
-# Copyright 2011 Kitware, 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.
-#=============================================================================
-
-# Use the Cython executable that lives next to the Python executable
-# if it is a local installation.
-find_package( PythonInterp )
-if( PYTHONINTERP_FOUND )
-  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    HINTS ${_python_path}
-    )
-else()
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    )
-endif()
-
-
-include( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
-
-mark_as_advanced( CYTHON_EXECUTABLE )
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJansson.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJansson.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJansson.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJansson.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# - Try to find jansson
-# Once done this will define
-#  JANSSON_FOUND        - System has jansson
-#  JANSSON_INCLUDE_DIRS - The jansson include directories
-#  JANSSON_LIBRARIES    - The libraries needed to use jansson
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_JANSSON QUIET jansson)
-
-find_path(JANSSON_INCLUDE_DIR
-  NAMES jansson.h
-  HINTS ${PC_JANSSON_INCLUDE_DIRS}
-)
-find_library(JANSSON_LIBRARY
-  NAMES jansson
-  HINTS ${PC_JANSSON_LIBRARY_DIRS}
-)
-
-if(JANSSON_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+JANSSON_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${JANSSON_INCLUDE_DIR}/jansson.h"
-    JANSSON_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    JANSSON_VERSION "${JANSSON_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set JANSSON_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Jansson REQUIRED_VARS
-                                  JANSSON_LIBRARY JANSSON_INCLUDE_DIR
-                                  VERSION_VAR JANSSON_VERSION)
-
-if(JANSSON_FOUND)
-  set(JANSSON_LIBRARIES     ${JANSSON_LIBRARY})
-  set(JANSSON_INCLUDE_DIRS  ${JANSSON_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJemalloc.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJemalloc.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJemalloc.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindJemalloc.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# - Try to find jemalloc
-# Once done this will define
-#  JEMALLOC_FOUND        - System has jemalloc
-#  JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
-#  JEMALLOC_LIBRARIES    - The libraries needed to use jemalloc
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
-
-find_path(JEMALLOC_INCLUDE_DIR
-  NAMES jemalloc/jemalloc.h
-  HINTS ${PC_JEMALLOC_INCLUDE_DIRS}
-)
-find_library(JEMALLOC_LIBRARY
-  NAMES jemalloc
-  HINTS ${PC_JEMALLOC_LIBRARY_DIRS}
-)
-
-if(JEMALLOC_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${JEMALLOC_INCLUDE_DIR}/jemalloc/jemalloc.h"
-    JEMALLOC_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    JEMALLOC_VERSION "${JEMALLOC_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Jemalloc REQUIRED_VARS
-                                  JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR
-                                  VERSION_VAR JEMALLOC_VERSION)
-
-if(JEMALLOC_FOUND)
-  set(JEMALLOC_LIBRARIES    ${JEMALLOC_LIBRARY})
-  set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibcares.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibcares.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibcares.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibcares.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# - Try to find libcares
-# Once done this will define
-#  LIBCARES_FOUND        - System has libcares
-#  LIBCARES_INCLUDE_DIRS - The libcares include directories
-#  LIBCARES_LIBRARIES    - The libraries needed to use libcares
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBCARES QUIET libcares)
-
-find_path(LIBCARES_INCLUDE_DIR
-  NAMES ares.h
-  HINTS ${PC_LIBCARES_INCLUDE_DIRS}
-)
-find_library(LIBCARES_LIBRARY
-  NAMES cares
-  HINTS ${PC_LIBCARES_LIBRARY_DIRS}
-)
-
-if(LIBCARES_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${LIBCARES_INCLUDE_DIR}/ares_version.h"
-    LIBCARES_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    LIBCARES_VERSION "${LIBCARES_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBCARES_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Libcares REQUIRED_VARS
-                                  LIBCARES_LIBRARY LIBCARES_INCLUDE_DIR
-                                  VERSION_VAR LIBCARES_VERSION)
-
-if(LIBCARES_FOUND)
-  set(LIBCARES_LIBRARIES     ${LIBCARES_LIBRARY})
-  set(LIBCARES_INCLUDE_DIRS  ${LIBCARES_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(LIBCARES_INCLUDE_DIR LIBCARES_LIBRARY)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibev.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibev.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibev.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibev.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# - Try to find libev
-# Once done this will define
-#  LIBEV_FOUND        - System has libev
-#  LIBEV_INCLUDE_DIRS - The libev include directories
-#  LIBEV_LIBRARIES    - The libraries needed to use libev
-
-find_path(LIBEV_INCLUDE_DIR
-  NAMES ev.h
-)
-find_library(LIBEV_LIBRARY
-  NAMES ev
-)
-
-if(LIBEV_INCLUDE_DIR)
-  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
-    LIBEV_VERSION_MAJOR REGEX "^#define[ \t]+EV_VERSION_MAJOR[ \t]+[0-9]+")
-  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
-    LIBEV_VERSION_MINOR REGEX "^#define[ \t]+EV_VERSION_MINOR[ \t]+[0-9]+")
-  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MAJOR "${LIBEV_VERSION_MAJOR}")
-  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MINOR "${LIBEV_VERSION_MINOR}")
-  set(LIBEV_VERSION "${LIBEV_VERSION_MAJOR}.${LIBEV_VERSION_MINOR}")
-  unset(LIBEV_VERSION_MINOR)
-  unset(LIBEV_VERSION_MAJOR)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBEV_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Libev REQUIRED_VARS
-                                  LIBEV_LIBRARY LIBEV_INCLUDE_DIR
-                                  VERSION_VAR LIBEV_VERSION)
-
-if(LIBEV_FOUND)
-  set(LIBEV_LIBRARIES     ${LIBEV_LIBRARY})
-  set(LIBEV_INCLUDE_DIRS  ${LIBEV_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(LIBEV_INCLUDE_DIR LIBEV_LIBRARY)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibevent.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibevent.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibevent.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindLibevent.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-# - Try to find libevent
-#.rst
-# FindLibevent
-# ------------
-#
-# Find Libevent include directories and libraries. Invoke as::
-#
-#   find_package(Libevent
-#     [version] [EXACT]   # Minimum or exact version
-#     [REQUIRED]          # Fail if Libevent is not found
-#     [COMPONENT <C>...]) # Libraries to look for
-#
-# Valid components are one or more of:: libevent core extra pthreads openssl.
-# Note that 'libevent' contains both core and extra. You must specify one of
-# them for the other components.
-#
-# This module will define the following variables::
-#
-#  LIBEVENT_FOUND        - True if headers and requested libraries were found
-#  LIBEVENT_INCLUDE_DIRS - Libevent include directories
-#  LIBEVENT_LIBRARIES    - Libevent libraries to be linked
-#  LIBEVENT_<C>_FOUND    - Component <C> was found (<C> is uppercase)
-#  LIBEVENT_<C>_LIBRARY  - Library to be linked for Libevent component <C>.
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBEVENT QUIET libevent)
-
-# Look for the Libevent 2.0 or 1.4 headers
-find_path(LIBEVENT_INCLUDE_DIR
-  NAMES
-    event2/event-config.h
-    event-config.h
-  HINTS
-    ${PC_LIBEVENT_INCLUDE_DIRS}
-)
-
-if(LIBEVENT_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+_EVENT_VERSION[ \t]+\"([^\"]+)\".*")
-  if(EXISTS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h")
-    # Libevent 2.0
-    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h"
-      LIBEVENT_VERSION REGEX "${_version_regex}")
-  else()
-    # Libevent 1.4
-    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event-config.h"
-      LIBEVENT_VERSION REGEX "${_version_regex}")
-  endif()
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    LIBEVENT_VERSION "${LIBEVENT_VERSION}")
-  unset(_version_regex)
-endif()
-
-set(_LIBEVENT_REQUIRED_VARS)
-foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
-  set(_LIBEVENT_LIBNAME libevent)
-  # Note: compare two variables to avoid a CMP0054 policy warning
-  if(COMPONENT STREQUAL _LIBEVENT_LIBNAME)
-    set(_LIBEVENT_LIBNAME event)
-  else()
-    set(_LIBEVENT_LIBNAME "event_${COMPONENT}")
-  endif()
-  string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
-  find_library(LIBEVENT_${COMPONENT_UPPER}_LIBRARY
-    NAMES ${_LIBEVENT_LIBNAME}
-    HINTS ${PC_LIBEVENT_LIBRARY_DIRS}
-  )
-  if(LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
-    set(Libevent_${COMPONENT}_FOUND 1)
-  endif()
-  list(APPEND _LIBEVENT_REQUIRED_VARS LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
-endforeach()
-unset(_LIBEVENT_LIBNAME)
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBEVENT_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Libevent REQUIRED_VARS
-                                  ${_LIBEVENT_REQUIRED_VARS}
-                                  LIBEVENT_INCLUDE_DIR
-                                  VERSION_VAR LIBEVENT_VERSION
-                                  HANDLE_COMPONENTS)
-
-if(LIBEVENT_FOUND)
-  set(LIBEVENT_INCLUDE_DIRS  ${LIBEVENT_INCLUDE_DIR})
-  set(LIBEVENT_LIBRARIES)
-  foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
-    string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
-    list(APPEND LIBEVENT_LIBRARIES ${LIBEVENT_${COMPONENT_UPPER}_LIBRARY})
-    set(LIBEVENT_${COMPONENT_UPPER}_FOUND ${Libevent_${COMPONENT}_FOUND})
-  endforeach()
-endif()
-
-mark_as_advanced(LIBEVENT_INCLUDE_DIR ${_LIBEVENT_REQUIRED_VARS})
-unset(_LIBEVENT_REQUIRED_VARS)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindSpdylay.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindSpdylay.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/FindSpdylay.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/FindSpdylay.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# - Try to find spdylay
-# Once done this will define
-#  SPDYLAY_FOUND        - System has spdylay
-#  SPDYLAY_INCLUDE_DIRS - The spdylay include directories
-#  SPDYLAY_LIBRARIES    - The libraries needed to use spdylay
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_SPDYLAY QUIET libspdylay)
-
-find_path(SPDYLAY_INCLUDE_DIR
-  NAMES spdylay/spdylay.h
-  HINTS ${PC_SPDYLAY_INCLUDE_DIRS}
-)
-find_library(SPDYLAY_LIBRARY
-  NAMES spdylay
-  HINTS ${PC_SPDYLAY_LIBRARY_DIRS}
-)
-
-if(SPDYLAY_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+SPDYLAY_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${SPDYLAY_INCLUDE_DIR}/spdylay/spdylayver.h"
-    SPDYLAY_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    SPDYLAY_VERSION "${SPDYLAY_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set SPDYLAY_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Spdylay REQUIRED_VARS
-                                  SPDYLAY_LIBRARY SPDYLAY_INCLUDE_DIR
-                                  VERSION_VAR SPDYLAY_VERSION)
-
-if(SPDYLAY_FOUND)
-  set(SPDYLAY_LIBRARIES     ${SPDYLAY_LIBRARY})
-  set(SPDYLAY_INCLUDE_DIRS  ${SPDYLAY_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(SPDYLAY_INCLUDE_DIR SPDYLAY_LIBRARY)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/Version.cmake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/Version.cmake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmake/Version.cmake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmake/Version.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# Converts a version such as 1.2.255 to 0x0102ff
-function(HexVersion version_hex_var major minor patch)
-  math(EXPR version_dec "${major} * 256 * 256 + ${minor} * 256 + ${patch}")
-  set(version_hex "0x")
-  foreach(i RANGE 5 0 -1)
-    math(EXPR num "(${version_dec} >> (4 * ${i})) & 15")
-    string(SUBSTRING "0123456789abcdef" ${num} 1 num_hex)
-    set(version_hex "${version_hex}${num_hex}")
-  endforeach()
-  set(${version_hex_var} "${version_hex}" PARENT_SCOPE)
-endfunction()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmakeconfig.h.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmakeconfig.h.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/cmakeconfig.h.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/cmakeconfig.h.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/* Hint to the compiler that a function never returns */
-#define NGHTTP2_NORETURN @HINT_NORETURN@
-
-/* Define to `int' if <sys/types.h> does not define. */
-#cmakedefine ssize_t @ssize_t@
-
-/* Define to 1 if you have the `std::map::emplace`. */
-#cmakedefine HAVE_STD_MAP_EMPLACE 1
-
-/* Define to 1 if you have `libjansson` library. */
-#cmakedefine HAVE_JANSSON 1
-
-/* Define to 1 if you have `libxml2` library. */
-#cmakedefine HAVE_LIBXML2 1
-
-/* Define to 1 if you have `spdylay` library. */
-#cmakedefine HAVE_SPDYLAY 1
-
-/* Define to 1 if you have `mruby` library. */
-#cmakedefine HAVE_MRUBY 1
-
-/* Define to 1 if you have `neverbleed` library. */
-#cmakedefine HAVE_NEVERBLEED 1
-
-/* sizeof(int *) */
-#cmakedefine SIZEOF_INT_P   @SIZEOF_INT_P@
-
-/* sizeof(time_t) */
-#cmakedefine SIZEOF_TIME_T  @SIZEOF_TIME_T@
-
-/* Define to 1 if you have the `_Exit` function. */
-#cmakedefine HAVE__EXIT 1
-
-/* Define to 1 if you have the `accept4` function. */
-#cmakedefine HAVE_ACCEPT4 1
-
-/* Define to 1 if you have the `mkostemp` function. */
-#cmakedefine HAVE_MKOSTEMP 1
-
-/* Define to 1 if you have the `initgroups` function. */
-#cmakedefine01 HAVE_DECL_INITGROUPS
-
-/* Define to 1 to enable debug output. */
-#cmakedefine DEBUGBUILD 1
-
-/* Define to 1 if you want to disable threads. */
-#cmakedefine NOTHREADS 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#cmakedefine HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#cmakedefine HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#cmakedefine HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#cmakedefine HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#cmakedefine HAVE_PWD_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#cmakedefine HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#cmakedefine HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H 1
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,517 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-#
-# Copyright (c) 2012, 2013, 2014, 2015 Tatsuhiro Tsujikawa
-# Copyright (c) 2016 Peter Wu <peter@lekensteyn.nl>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-cmake_minimum_required(VERSION 3.0)
-# XXX using 1.8.90 instead of 1.9.0-DEV
-project(nghttp2 VERSION 1.33.90)
-
-# See versioning rule:
-#  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-set(LT_CURRENT  31)
-set(LT_REVISION 0)
-set(LT_AGE      17)
-
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
-include(Version)
-
-math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}")
-set(LT_VERSION "${LT_SOVERSION}.${LT_AGE}.${LT_REVISION}")
-set(PACKAGE_VERSION     "${PROJECT_VERSION}")
-HexVersion(PACKAGE_VERSION_NUM ${PROJECT_VERSION_MAJOR} ${PROJECT_VERSION_MINOR} ${PROJECT_VERSION_PATCH})
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the build type" FORCE)
-
-  # Include "None" as option to disable any additional (optimization) flags,
-  # relying on just CMAKE_C_FLAGS and CMAKE_CXX_FLAGS (which are empty by
-  # default). These strings are presented in cmake-gui.
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
-
-include(GNUInstallDirs)
-
-# For Python bindings and documentation
-# (Must be called before PythonLibs for matching versions.)
-find_package(PythonInterp)
-
-# Auto-detection of features that can be toggled
-find_package(OpenSSL 1.0.1)
-find_package(Libev 4.11)
-find_package(Libcares 1.7.5)
-find_package(ZLIB 1.2.3)
-if(OPENSSL_FOUND AND LIBEV_FOUND AND ZLIB_FOUND)
-  set(ENABLE_APP_DEFAULT ON)
-else()
-  set(ENABLE_APP_DEFAULT OFF)
-endif()
-find_package(Jansson  2.5)
-set(ENABLE_HPACK_TOOLS_DEFAULT ${JANSSON_FOUND})
-# 2.0.8 is required because we use evconnlistener_set_error_cb()
-find_package(Libevent 2.0.8 COMPONENTS libevent openssl)
-set(ENABLE_EXAMPLES_DEFAULT ${LIBEVENT_OPENSSL_FOUND})
-find_package(Cython)
-find_package(PythonLibs)
-if(CYTHON_FOUND AND PYTHONLIBS_FOUND)
-  set(ENABLE_PYTHON_BINDINGS_DEFAULT ON)
-else()
-  set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
-endif()
-
-find_package(LibXml2 2.6.26)
-set(WITH_LIBXML2_DEFAULT    ${LIBXML2_FOUND})
-find_package(Jemalloc)
-set(WITH_JEMALLOC_DEFAULT   ${JEMALLOC_FOUND})
-find_package(Spdylay 1.3.2)
-set(WITH_SPDYLAY_DEFAULT    ${SPDYLAY_FOUND})
-
-include(CMakeOptions.txt)
-
-if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES OR
-  ENABLE_PYTHON_BINDINGS))
-  # Remember when disabled options are disabled for later diagnostics.
-  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 1)
-else()
-  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 0)
-endif()
-if(ENABLE_LIB_ONLY)
-  set(ENABLE_APP            OFF)
-  set(ENABLE_HPACK_TOOLS    OFF)
-  set(ENABLE_EXAMPLES       OFF)
-  set(ENABLE_PYTHON_BINDINGS OFF)
-endif()
-
-# Do not disable assertions based on CMAKE_BUILD_TYPE.
-foreach(_build_type "Release" "MinSizeRel" "RelWithDebInfo")
-  foreach(_lang C CXX)
-    string(TOUPPER "CMAKE_${_lang}_FLAGS_${_build_type}" _var)
-    string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " " ${_var} "${${_var}}")
-  endforeach()
-endforeach()
-
-if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  set(HINT_NORETURN       "__attribute__((noreturn))")
-else()
-  set(HINT_NORETURN)
-endif()
-
-include(ExtractValidFlags)
-foreach(_cxx1x_flag -std=c++11 -std=c++0x)
-  extract_valid_cxx_flags(_cxx1x_flag_supported ${_cxx1x_flag})
-  if(_cxx1x_flag_supported)
-    set(CXX1XCXXFLAGS ${_cxx1x_flag})
-    break()
-  endif()
-endforeach()
-
-include(CMakePushCheckState)
-include(CheckCXXSourceCompiles)
-cmake_push_check_state()
-set(CMAKE_REQUIRED_DEFINITIONS "${CXX1XCXXFLAGS}")
-# Check that std::future is available.
-check_cxx_source_compiles("
-#include <vector>
-#include <future>
-int main() { std::vector<std::future<int>> v; }" HAVE_STD_FUTURE)
-# Check that std::map::emplace is available for g++-4.7.
-check_cxx_source_compiles("
-#include <map>
-int main() { std::map<int, int>().emplace(1, 2); }" HAVE_STD_MAP_EMPLACE)
-cmake_pop_check_state()
-
-
-# Checks for libraries.
-# Additional libraries required for programs under src directory.
-set(APP_LIBRARIES)
-
-if(ENABLE_PYTHON_BINDINGS)
-  if(NOT (CYTHON_FOUND AND PYTHONLIBS_FOUND))
-    message(FATAL_ERROR "python bindings were requested "
-      "(ENABLE_PYTHON_BINDINGS=1) but dependencies are not met.")
-  endif()
-  if(NOT PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING)
-    message(FATAL_ERROR
-      "Python executable and library must have the same version!"
-      " Found Python ${PYTHON_VERSION_STRING} and"
-      " PythonLibs ${PYTHONLIBS_VERSION_STRING}"
-    )
-  endif()
-endif()
-
-set(CMAKE_THREAD_PREFER_PTHREAD 1)
-find_package(Threads)
-if(CMAKE_USE_PTHREADS_INIT)
-  list(APPEND APP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-endif()
-# XXX android and C++, is this still needed in cmake?
-# case "$host" in
-#   *android*)
-#     android_build=yes
-#     # android does not need -pthread, but needs followng 3 libs for C++
-#     APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
-
-# dl: openssl requires libdl when it is statically linked.
-# XXX shouldn't ${CMAKE_DL_LIBS} be appended to OPENSSL_LIBRARIES instead of
-# APP_LIBRARIES if it is really specific to OpenSSL?
-
-find_package(CUnit 2.1)
-enable_testing()
-set(HAVE_CUNIT      ${CUNIT_FOUND})
-if(HAVE_CUNIT)
-  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-endif()
-
-# openssl (for src)
-set(HAVE_OPENSSL    ${OPENSSL_FOUND})
-if(OPENSSL_FOUND)
-  set(OPENSSL_INCLUDE_DIRS  ${OPENSSL_INCLUDE_DIR})
-else()
-  set(OPENSSL_INCLUDE_DIRS  "")
-  set(OPENSSL_LIBRARIES     "")
-endif()
-# libev (for src)
-set(HAVE_LIBEV      ${LIBEV_FOUND})
-set(HAVE_ZLIB       ${ZLIB_FOUND})
-set(HAVE_LIBEVENT_OPENSSL ${LIBEVENT_FOUND})
-if(LIBEVENT_FOUND)
-  # Must both link the core and openssl libraries.
-  set(LIBEVENT_OPENSSL_LIBRARIES ${LIBEVENT_LIBRARIES})
-endif()
-# libc-ares (for src)
-set(HAVE_LIBCARES   ${LIBCARES_FOUND})
-if(LIBCARES_FOUND)
-  set(LIBCARES_INCLUDE_DIRS ${LIBCARES_INCLUDE_DIR})
-else()
-  set(LIBCARES_INCLUDE_DIRS "")
-  set(LIBCARES_LIBRARIES    "")
-endif()
-# jansson (for src/nghttp, src/deflatehd and src/inflatehd)
-set(HAVE_JANSSON    ${JANSSON_FOUND})
-# libxml2 (for src/nghttp)
-set(HAVE_LIBXML2    ${LIBXML2_FOUND})
-if(LIBXML2_FOUND)
-  set(LIBXML2_INCLUDE_DIRS  ${LIBXML2_INCLUDE_DIR})
-else()
-  set(LIBXML2_INCLUDE_DIRS  "")
-  set(LIBXML2_LIBRARIES     "")
-endif()
-# jemalloc
-set(HAVE_JEMALLOC   ${JEMALLOC_FOUND})
-# spdylay (for src/nghttpx and src/h2load)
-set(HAVE_SPDYLAY    ${SPDYLAY_FOUND})
-
-if(ENABLE_ASIO_LIB)
-  find_package(Boost 1.54.0 REQUIRED system thread)
-endif()
-
-# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL and libev
-if(ENABLE_APP AND NOT (ZLIB_FOUND AND OPENSSL_FOUND AND LIBEV_FOUND))
-  message(FATAL_ERROR "Applications were requested (ENABLE_APP=1) but dependencies are not met.")
-endif()
-
-# HPACK tools requires jansson
-if(ENABLE_HPACK_TOOLS AND NOT HAVE_JANSSON)
-  message(FATAL_ERROR "HPACK tools were requested (ENABLE_HPACK_TOOLS=1) but dependencies are not met.")
-endif()
-
-# C++ library libnghttp2_asio
-if(ENABLE_EXAMPLES AND NOT (OPENSSL_FOUND AND LIBEVENT_OPENSSL_FOUND))
-  message(FATAL_ERROR "examples were requested (ENABLE_EXAMPLES=1) but dependencies are not met.")
-endif()
-
-# third-party http-parser only be built when needed
-if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_ASIO_LIB)
-  set(ENABLE_THIRD_PARTY 1)
-  # mruby (for src/nghttpx)
-  set(HAVE_MRUBY      ${WITH_MRUBY})
-  set(HAVE_NEVERBLEED ${WITH_NEVERBLEED})
-else()
-  set(HAVE_MRUBY 0)
-  set(HAVE_NEVERBLEED 0)
-endif()
-
-# Checks for header files.
-include(CheckIncludeFile)
-check_include_file("arpa/inet.h"    HAVE_ARPA_INET_H)
-check_include_file("fcntl.h"        HAVE_FCNTL_H)
-check_include_file("inttypes.h"     HAVE_INTTYPES_H)
-check_include_file("limits.h"       HAVE_LIMITS_H)
-check_include_file("netdb.h"        HAVE_NETDB_H)
-check_include_file("netinet/in.h"   HAVE_NETINET_IN_H)
-check_include_file("pwd.h"          HAVE_PWD_H)
-check_include_file("sys/socket.h"   HAVE_SYS_SOCKET_H)
-check_include_file("sys/time.h"     HAVE_SYS_TIME_H)
-check_include_file("syslog.h"       HAVE_SYSLOG_H)
-check_include_file("time.h"         HAVE_TIME_H)
-check_include_file("unistd.h"       HAVE_UNISTD_H)
-
-include(CheckTypeSize)
-# Checks for typedefs, structures, and compiler characteristics.
-# AC_TYPE_SIZE_T
-check_type_size("ssize_t" SIZEOF_SSIZE_T)
-if(SIZEOF_SSIZE_T STREQUAL "")
-  # ssize_t is a signed type in POSIX storing at least -1.
-  # Set it to "int" to match the behavior of AC_TYPE_SSIZE_T (autotools).
-  set(ssize_t int)
-endif()
-# AC_TYPE_UINT8_T
-# AC_TYPE_UINT16_T
-# AC_TYPE_UINT32_T
-# AC_TYPE_UINT64_T
-# AC_TYPE_INT8_T
-# AC_TYPE_INT16_T
-# AC_TYPE_INT32_T
-# AC_TYPE_INT64_T
-# AC_TYPE_OFF_T
-# AC_TYPE_PID_T
-# AC_TYPE_UID_T
-# XXX To support inline for crappy compilers, see https://cmake.org/Wiki/CMakeTestInline
-# AC_C_INLINE
-# XXX is AC_SYS_LARGEFILE still needed for modern systems?
-# add_definitions(-D_FILE_OFFSET_BITS=64)
-
-include(CheckStructHasMember)
-check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_STRUCT_TM_TM_GMTOFF)
-
-# Check size of pointer to decide we need 8 bytes alignment adjustment.
-check_type_size("int *"   SIZEOF_INT_P)
-check_type_size("time_t"  SIZEOF_TIME_T)
-
-# Checks for library functions.
-include(CheckFunctionExists)
-check_function_exists(_Exit     HAVE__EXIT)
-check_function_exists(accept4   HAVE_ACCEPT4)
-check_function_exists(mkostemp  HAVE_MKOSTEMP)
-
-include(CheckSymbolExists)
-# XXX does this correctly detect initgroups (un)availability on cygwin?
-check_symbol_exists(initgroups grp.h HAVE_DECL_INITGROUPS)
-if(NOT HAVE_DECL_INITGROUPS AND HAVE_UNISTD_H)
-  # FreeBSD declares initgroups() in unistd.h
-  check_symbol_exists(initgroups unistd.h HAVE_DECL_INITGROUPS2)
-  if(HAVE_DECL_INITGROUPS2)
-    set(HAVE_DECL_INITGROUPS 1)
-  endif()
-endif()
-
-set(WARNCFLAGS)
-set(WARNCXXFLAGS)
-if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
-  if(ENABLE_WERROR)
-    set(WARNCFLAGS    /WX)
-    set(WARNCXXFLAGS  /WX)
-  endif()
-else()
-  if(ENABLE_WERROR)
-    extract_valid_c_flags(WARNCFLAGS    -Werror)
-    extract_valid_c_flags(WARNCXXFLAGS  -Werror)
-  endif()
-
-  # For C compiler
-  extract_valid_c_flags(WARNCFLAGS
-    -Wall
-    -Wextra
-    -Wmissing-prototypes
-    -Wstrict-prototypes
-    -Wmissing-declarations
-    -Wpointer-arith
-    -Wdeclaration-after-statement
-    -Wformat-security
-    -Wwrite-strings
-    -Wshadow
-    -Winline
-    -Wnested-externs
-    -Wfloat-equal
-    -Wundef
-    -Wendif-labels
-    -Wempty-body
-    -Wcast-align
-    -Wclobbered
-    -Wvla
-    -Wpragmas
-    -Wunreachable-code
-    -Waddress
-    -Wattributes
-    -Wdiv-by-zero
-    -Wshorten-64-to-32
-
-    -Wconversion
-    -Wextended-offsetof
-    -Wformat-nonliteral
-    -Wlanguage-extension-token
-    -Wmissing-field-initializers
-    -Wmissing-noreturn
-    -Wmissing-variable-declarations
-    # Not used because we cannot change public structs
-    # -Wpadded
-    -Wsign-conversion
-    # Not used because this basically disallows default case
-    # -Wswitch-enum
-    -Wunreachable-code-break
-    -Wunused-macros
-    -Wunused-parameter
-    -Wredundant-decls
-    # Only work with Clang for the moment
-    -Wheader-guard
-    # This is required because we pass format string as "const char*.
-    -Wno-format-nonliteral
-  )
-
-  extract_valid_cxx_flags(WARNCXXFLAGS
-    # For C++ compiler
-    -Wall
-    -Wformat-security
-  )
-endif()
-
-if(ENABLE_DEBUG)
-  set(DEBUGBUILD 1)
-endif()
-
-# Some platform does not have working std::future.  We disable
-# threading for those platforms.
-if(NOT ENABLE_THREADS OR NOT HAVE_STD_FUTURE)
-  set(NOTHREADS 1)
-endif()
-
-add_definitions(-DHAVE_CONFIG_H)
-configure_file(cmakeconfig.h.in config.h)
-# autotools-compatible names
-# Sphinx expects relative paths in the .rst files. Use the fact that the files
-# below are all one directory level deep.
-file(RELATIVE_PATH top_srcdir   "${CMAKE_CURRENT_BINARY_DIR}/dir" "${CMAKE_CURRENT_SOURCE_DIR}")
-file(RELATIVE_PATH top_builddir "${CMAKE_CURRENT_BINARY_DIR}/dir" "${CMAKE_CURRENT_BINARY_DIR}")
-set(abs_top_srcdir  "${CMAKE_CURRENT_SOURCE_DIR}")
-set(abs_top_builddir "${CMAKE_CURRENT_BINARY_DIR}")
-# libnghttp2.pc (pkg-config file)
-set(prefix          "${CMAKE_INSTALL_PREFIX}")
-set(exec_prefix     "${CMAKE_INSTALL_PREFIX}")
-set(libdir          "${CMAKE_INSTALL_FULL_LIBDIR}")
-set(includedir      "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-set(VERSION         "${PACKAGE_VERSION}")
-# For init scripts and systemd service file (in contrib/)
-set(bindir          "${CMAKE_INSTALL_FULL_BINDIR}")
-set(sbindir         "${CMAKE_INSTALL_FULL_SBINDIR}")
-foreach(name
-   lib/libnghttp2.pc
-   lib/includes/nghttp2/nghttp2ver.h
-   src/libnghttp2_asio.pc
-   python/setup.py
-   integration-tests/config.go
-   integration-tests/setenv
-   doc/conf.py
-   doc/index.rst
-   doc/package_README.rst
-   doc/tutorial-client.rst
-   doc/tutorial-server.rst
-   doc/tutorial-hpack.rst
-   doc/nghttpx-howto.rst
-   doc/h2load-howto.rst
-   doc/libnghttp2_asio.rst
-   doc/python-apiref.rst
-   doc/building-android-binary.rst
-   doc/nghttp2.h.rst
-   doc/nghttp2ver.h.rst
-   doc/asio_http2.h.rst
-   doc/asio_http2_server.h.rst
-   doc/asio_http2_client.h.rst
-   doc/contribute.rst
-)
-  configure_file("${name}.in" "${name}" @ONLY)
-endforeach()
-
-include_directories(
-  "${CMAKE_CURRENT_BINARY_DIR}" # for config.h
-)
-# For use in src/CMakeLists.txt
-set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
-
-install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-
-add_subdirectory(lib)
-#add_subdirectory(lib/includes)
-add_subdirectory(third-party)
-add_subdirectory(src)
-#add_subdirectory(src/includes)
-add_subdirectory(examples)
-add_subdirectory(python)
-add_subdirectory(tests)
-#add_subdirectory(tests/testdata)
-add_subdirectory(integration-tests)
-add_subdirectory(doc)
-add_subdirectory(contrib)
-add_subdirectory(script)
-
-
-string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
-message(STATUS "summary of build options:
-
-    Package version: ${VERSION}
-    Library version: ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}
-    Install prefix:  ${CMAKE_INSTALL_PREFIX}
-    Target system:   ${CMAKE_SYSTEM_NAME}
-    Compiler:
-      Build type:     ${CMAKE_BUILD_TYPE}
-      C compiler:     ${CMAKE_C_COMPILER}
-      CFLAGS:         ${CMAKE_C_FLAGS_${_build_type}} ${CMAKE_C_FLAGS}
-      C++ compiler:   ${CMAKE_CXX_COMPILER}
-      CXXFLAGS:       ${CMAKE_CXX_FLAGS_${_build_type}} ${CMAKE_CXX_FLAGS}
-      WARNCFLAGS:     ${WARNCFLAGS}
-      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
-    Python:
-      Python:         ${PYTHON_EXECUTABLE}
-      PYTHON_VERSION: ${PYTHON_VERSION_STRING}
-      Library version:${PYTHONLIBS_VERSION_STRING}
-      Cython:         ${CYTHON_EXECUTABLE}
-    Test:
-      CUnit:          ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}')
-      Failmalloc:     ${ENABLE_FAILMALLOC}
-    Libs:
-      OpenSSL:        ${HAVE_OPENSSL} (LIBS='${OPENSSL_LIBRARIES}')
-      Libxml2:        ${HAVE_LIBXML2} (LIBS='${LIBXML2_LIBRARIES}')
-      Libev:          ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}')
-      Libc-ares:      ${HAVE_LIBCARES} (LIBS='${LIBCARES_LIBRARIES}')
-      Libevent(SSL):  ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}')
-      Spdylay:        ${HAVE_SPDYLAY} (LIBS='${SPDYLAY_LIBRARIES}')
-      Jansson:        ${HAVE_JANSSON} (LIBS='${JANSSON_LIBRARIES}')
-      Jemalloc:       ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}')
-      Zlib:           ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}')
-      Boost::System:  ${Boost_SYSTEM_LIBRARY}
-      Boost::Thread:  ${Boost_THREAD_LIBRARY}
-    Third-party:
-      http-parser:    ${ENABLE_THIRD_PARTY}
-      MRuby:          ${HAVE_MRUBY}
-      Neverbleed:     ${HAVE_NEVERBLEED}
-    Features:
-      Applications:   ${ENABLE_APP}
-      HPACK tools:    ${ENABLE_HPACK_TOOLS}
-      Libnghttp2_asio:${ENABLE_ASIO_LIB}
-      Examples:       ${ENABLE_EXAMPLES}
-      Python bindings:${ENABLE_PYTHON_BINDINGS}
-      Threading:      ${ENABLE_THREADS}
-")
-if(ENABLE_LIB_ONLY_DISABLED_OTHERS)
-  message("Only the library will be built. To build other components "
-    "(such as applications and examples), set ENABLE_LIB_ONLY=OFF.")
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/CMakeOptions.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/CMakeOptions.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/CMakeOptions.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/CMakeOptions.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Features that can be enabled for cmake (see CMakeLists.txt)
-
-option(ENABLE_WERROR    "Turn on compile time warnings")
-option(ENABLE_DEBUG     "Turn on debug output")
-option(ENABLE_THREADS   "Turn on threading in apps" ON)
-option(ENABLE_APP       "Build applications (nghttp, nghttpd, nghttpx and h2load)"
-  ${ENABLE_APP_DEFAULT})
-option(ENABLE_HPACK_TOOLS "Build HPACK tools"
-  ${ENABLE_HPACK_TOOLS_DEFAULT})
-option(ENABLE_ASIO_LIB  "Build C++ libnghttp2_asio library")
-option(ENABLE_EXAMPLES  "Build examples"
-  ${ENABLE_EXAMPLES_DEFAULT})
-option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
-  ${ENABLE_PYTHON_BINDINGS_DEFAULT})
-option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
-option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
-option(ENABLE_STATIC_LIB "Build libnghttp2 in static mode also")
-
-option(WITH_LIBXML2     "Use libxml2"
-  ${WITH_LIBXML2_DEFAULT})
-option(WITH_JEMALLOC    "Use jemalloc"
-  ${WITH_JEMALLOC_DEFAULT})
-option(WITH_SPDYLAY     "Use spdylay"
-  ${WITH_SPDYLAY_DEFAULT})
-option(WITH_MRUBY       "Use mruby")
-option(WITH_NEVERBLEED  "Use neverbleed")
-
-# vim: ft=cmake:
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/configure.ac cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/configure.ac
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/configure.ac	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/configure.ac	1970-01-01 00:00:00.000000000 +0000
@@ -1,926 +0,0 @@
-dnl nghttp2 - HTTP/2 C Library
-
-dnl Copyright (c) 2012, 2013, 2014, 2015 Tatsuhiro Tsujikawa
-
-dnl Permission is hereby granted, free of charge, to any person obtaining
-dnl a copy of this software and associated documentation files (the
-dnl "Software"), to deal in the Software without restriction, including
-dnl without limitation the rights to use, copy, modify, merge, publish,
-dnl distribute, sublicense, and/or sell copies of the Software, and to
-dnl permit persons to whom the Software is furnished to do so, subject to
-dnl the following conditions:
-
-dnl The above copyright notice and this permission notice shall be
-dnl included in all copies or substantial portions of the Software.
-
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-dnl EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-dnl LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-dnl Do not change user variables!
-dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
-
-AC_PREREQ(2.61)
-AC_INIT([nghttp2], [1.34.0-DEV], [t-tujikawa@users.sourceforge.net])
-AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AC_USE_SYSTEM_EXTENSIONS
-
-LT_PREREQ([2.2.6])
-LT_INIT()
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE([subdir-objects])
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl See versioning rule:
-dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST(LT_CURRENT, 31)
-AC_SUBST(LT_REVISION, 0)
-AC_SUBST(LT_AGE, 17)
-
-major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
-minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
-patch=`echo $PACKAGE_VERSION |cut -d. -f3 | cut -d- -f1 | sed -e "s/[^0-9]//g"`
-
-PACKAGE_VERSION_NUM=`printf "0x%02x%02x%02x" "$major" "$minor" "$patch"`
-
-AC_SUBST(PACKAGE_VERSION_NUM)
-
-dnl Checks for command-line options
-AC_ARG_ENABLE([werror],
-    [AS_HELP_STRING([--enable-werror],
-                    [Turn on compile time warnings])],
-    [werror=$enableval], [werror=no])
-
-AC_ARG_ENABLE([debug],
-    [AS_HELP_STRING([--enable-debug],
-                    [Turn on debug output])],
-    [debug=$enableval], [debug=no])
-
-AC_ARG_ENABLE([threads],
-    [AS_HELP_STRING([--disable-threads],
-                    [Turn off threading in apps])],
-    [threads=$enableval], [threads=yes])
-
-AC_ARG_ENABLE([app],
-    [AS_HELP_STRING([--enable-app],
-                    [Build applications (nghttp, nghttpd, nghttpx and h2load) [default=check]])],
-    [request_app=$enableval], [request_app=check])
-
-AC_ARG_ENABLE([hpack-tools],
-    [AS_HELP_STRING([--enable-hpack-tools],
-                    [Build HPACK tools [default=check]])],
-    [request_hpack_tools=$enableval], [request_hpack_tools=check])
-
-AC_ARG_ENABLE([asio-lib],
-    [AS_HELP_STRING([--enable-asio-lib],
-                    [Build C++ libnghttp2_asio library [default=no]])],
-    [request_asio_lib=$enableval], [request_asio_lib=no])
-
-AC_ARG_ENABLE([examples],
-    [AS_HELP_STRING([--enable-examples],
-                    [Build examples [default=check]])],
-    [request_examples=$enableval], [request_examples=check])
-
-AC_ARG_ENABLE([python-bindings],
-    [AS_HELP_STRING([--enable-python-bindings],
-                    [Build Python bindings [default=check]])],
-    [request_python_bindings=$enableval], [request_python_bindings=check])
-
-AC_ARG_ENABLE([failmalloc],
-    [AS_HELP_STRING([--disable-failmalloc],
-                    [Do not build failmalloc test program])],
-    [request_failmalloc=$enableval], [request_failmalloc=yes])
-
-AC_ARG_ENABLE([lib-only],
-    [AS_HELP_STRING([--enable-lib-only],
-                    [Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools --disable-python-bindings])],
-    [request_lib_only=$enableval], [request_lib_only=no])
-
-AC_ARG_WITH([libxml2],
-    [AS_HELP_STRING([--with-libxml2],
-                    [Use libxml2 [default=check]])],
-    [request_libxml2=$withval], [request_libxml2=check])
-
-AC_ARG_WITH([jemalloc],
-    [AS_HELP_STRING([--with-jemalloc],
-                    [Use jemalloc [default=check]])],
-    [request_jemalloc=$withval], [request_jemalloc=check])
-
-AC_ARG_WITH([systemd],
-    [AS_HELP_STRING([--with-systemd],
-                    [Enable systemd support in nghttpx [default=check]])],
-    [request_systemd=$withval], [request_systemd=check])
-
-AC_ARG_WITH([mruby],
-    [AS_HELP_STRING([--with-mruby],
-                    [Use mruby [default=no]])],
-    [request_mruby=$withval], [request_mruby=no])
-
-AC_ARG_WITH([neverbleed],
-    [AS_HELP_STRING([--with-neverbleed],
-                    [Use neverbleed [default=no]])],
-    [request_neverbleed=$withval], [request_neverbleed=no])
-
-AC_ARG_WITH([cython],
-    [AS_HELP_STRING([--with-cython=PATH],
-                    [Use cython in given PATH])],
-    [cython_path=$withval], [])
-
-dnl Define variables
-AC_ARG_VAR([CYTHON], [the Cython executable])
-
-dnl Checks for programs
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-
-PKG_PROG_PKG_CONFIG([0.20])
-
-AM_PATH_PYTHON([2.7],, [:])
-
-if [test "x$request_lib_only" = "xyes"]; then
-  request_app=no
-  request_hpack_tools=no
-  request_examples=no
-  request_python_bindings=no
-fi
-
-if [test "x$request_python_bindings" != "xno"]; then
-  AX_PYTHON_DEVEL([>= '2.7'])
-fi
-
-if test "x${cython_path}" = "x"; then
-  AC_CHECK_PROGS([CYTHON], [cython.py cython])
-else
-  CYTHON=${cython_path}
-  AC_SUBST([CYTHON])
-fi
-
-if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
-  AC_DEFINE([NGHTTP2_NORETURN], [__attribute__((noreturn))], [Hint to the compiler that a function never return])
-else
-  AC_DEFINE([NGHTTP2_NORETURN], , [Hint to the compiler that a function never return])
-fi
-
-save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-
-AX_CXX_COMPILE_STDCXX_11([noext], [optional])
-
-CXX1XCXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$save_CXXFLAGS"
-AC_SUBST([CXX1XCXXFLAGS])
-
-AC_LANG_PUSH(C++)
-
-save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $CXX1XCXXFLAGS"
-
-# Check that std::future is available.
-AC_MSG_CHECKING([whether std::future is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
-#include <vector>
-#include <future>
-]],
-[[
-std::vector<std::future<int>> v;
-]])],
-    [AC_DEFINE([HAVE_STD_FUTURE], [1],
-               [Define to 1 if you have the `std::future`.])
-     have_std_future=yes
-     AC_MSG_RESULT([yes])],
-    [have_std_future=no
-     AC_MSG_RESULT([no])])
-
-# Check that std::map::emplace is available for g++-4.7.
-AC_MSG_CHECKING([whether std::map::emplace is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
-#include <map>
-]],
-[[
-std::map<int, int>().emplace(1, 2);
-]])],
-    [AC_DEFINE([HAVE_STD_MAP_EMPLACE], [1],
-               [Define to 1 if you have the `std::map::emplace`.])
-     have_std_map_emplace=yes
-     AC_MSG_RESULT([yes])],
-    [have_std_map_emplace=no
-     AC_MSG_RESULT([no])])
-
-# Check that std::atomic_* overloads for std::shared_ptr are
-# available.
-AC_MSG_CHECKING([whether std::atomic_* overloads for std::shared_ptr are available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
-#include <memory>
-]],
-[[
-auto a = std::make_shared<int>(1000000007);
-auto p = std::atomic_load(&a);
-++*p;
-std::atomic_store(&a, p);
-]])],
-    [AC_DEFINE([HAVE_ATOMIC_STD_SHARED_PTR], [1],
-               [Define to 1 if you have the std::atomic_* overloads for std::shared_ptr.])
-     have_atomic_std_shared_ptr=yes
-     AC_MSG_RESULT([yes])],
-    [have_atomic_std_shared_ptr=no
-     AC_MSG_RESULT([no])])
-
-# Check that thread_local storage specifier is available
-AC_MSG_CHECKING([whether thread_local storage class specifier is available.])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-,
-[[
-thread_local int a = 0;
-(void)a;
-]])],
-    [AC_DEFINE([HAVE_THREAD_LOCAL], [1],
-               [Define to 1 if you have thread_local storage specifier.])
-     have_thread_local=yes
-     AC_MSG_RESULT([yes])],
-    [have_Thread_local=no
-     AC_MSG_RESULT([no])])
-
-CXXFLAGS=$save_CXXFLAGS
-
-AC_LANG_POP()
-
-# Checks for libraries.
-
-# Additional libraries required for tests.
-TESTLDADD=
-
-# Additional libraries required for programs under src directory.
-APPLDFLAGS=
-
-case "$host_os" in
-  *android*)
-    android_build=yes
-    # android does not need -pthread, but needs followng 3 libs for C++
-    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
-    ;;
-  *)
-    PTHREAD_LDFLAGS="-pthread"
-    APPLDFLAGS="$APPLDFLAGS $PTHREAD_LDFLAGS"
-    ;;
-esac
-
-case "$host_os" in
-  *solaris*)
-    APPLDFLAGS="$APPLDFLAGS -lsocket -lnsl"
-    ;;
-esac
-
-# zlib
-PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
-
-if test "x${have_zlib}" = "xno"; then
-  AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
-fi
-
-# dl: openssl requires libdl when it is statically linked.
-case "${host_os}" in
-  *bsd*)
-    # dlopen is in libc on *BSD
-    ;;
-  *)
-    save_LIBS=$LIBS
-    AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], [])
-    LIBS=$save_LIBS
-    ;;
-esac
-
-# cunit
-PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
-# If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
-# do this because Debian (Ubuntu) lacks pkg-config file for cunit.
-if test "x${have_cunit}" = "xno"; then
-  AC_MSG_WARN([${CUNIT_PKG_ERRORS}])
-  AC_CHECK_LIB([cunit], [CU_initialize_registry],
-               [have_cunit=yes], [have_cunit=no])
-  if test "x${have_cunit}" = "xyes"; then
-    CUNIT_LIBS="-lcunit"
-    CUNIT_CFLAGS=""
-    AC_SUBST([CUNIT_LIBS])
-    AC_SUBST([CUNIT_CFLAGS])
-  fi
-fi
-if test "x${have_cunit}" = "xyes"; then
-  # cunit in Mac OS X requires ncurses. Note that in Mac OS X, test
-  # program can be built without -lncurses, but it emits runtime
-  # error.
-  case "${build}" in
-    *-apple-darwin*)
-      CUNIT_LIBS="$CUNIT_LIBS -lncurses"
-      AC_SUBST([CUNIT_LIBS])
-      ;;
-  esac
-fi
-
-AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
-
-# libev (for src)
-# libev does not have pkg-config file.  Check it in an old way.
-save_LIBS=$LIBS
-# android requires -lm for floor
-AC_CHECK_LIB([ev], [ev_time], [have_libev=yes], [have_libev=no], [-lm])
-if test "x${have_libev}" = "xyes"; then
-  AC_CHECK_HEADER([ev.h], [have_libev=yes], [have_libev=no])
-  if test "x${have_libev}" = "xyes"; then
-    LIBEV_LIBS=-lev
-    LIBEV_CFLAGS=
-    AC_SUBST([LIBEV_LIBS])
-    AC_SUBST([LIBEV_CFLAGS])
-  fi
-fi
-LIBS=$save_LIBS
-
-# openssl (for src)
-PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
-                  [have_openssl=yes], [have_openssl=no])
-if test "x${have_openssl}" = "xno"; then
-  AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
-fi
-
-# c-ares (for src)
-PKG_CHECK_MODULES([LIBCARES], [libcares >= 1.7.5], [have_libcares=yes],
-                  [have_libcares=no])
-if test "x${have_libcares}" = "xno"; then
-  AC_MSG_NOTICE($LIBCARES_PKG_ERRORS)
-fi
-
-# libevent_openssl (for examples)
-# 2.0.8 is required because we use evconnlistener_set_error_cb()
-PKG_CHECK_MODULES([LIBEVENT_OPENSSL], [libevent_openssl >= 2.0.8],
-                  [have_libevent_openssl=yes], [have_libevent_openssl=no])
-if test "x${have_libevent_openssl}" = "xno"; then
-  AC_MSG_NOTICE($LIBEVENT_OPENSSL_PKG_ERRORS)
-fi
-
-# jansson (for src/nghttp, src/deflatehd and src/inflatehd)
-PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5],
-                  [have_jansson=yes], [have_jansson=no])
-if test "x${have_jansson}" = "xyes"; then
-  AC_DEFINE([HAVE_JANSSON], [1],
-            [Define to 1 if you have `libjansson` library.])
-else
-  AC_MSG_NOTICE($JANSSON_PKG_ERRORS)
-fi
-
-
-#  libsystemd (for src/nghttpx)
-have_libsystemd=no
-if test "x${request_systemd}" != "xno"; then
-  PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [have_libsystemd=yes],
-                    [have_libsystemd=no])
-  if test "x${have_libsystemd}" = "xyes"; then
-    AC_DEFINE([HAVE_LIBSYSTEMD], [1],
-              [Define to 1 if you have `libsystemd` library.])
-  else
-    AC_MSG_NOTICE($SYSTEMD_PKG_ERRORS)
-  fi
-fi
-
-if test "x${request_systemd}" = "xyes" &&
-   test "x${have_libsystemd}" != "xyes"; then
-  AC_MSG_ERROR([systemd was requested (--with-systemd) but not found])
-fi
-
-# libxml2 (for src/nghttp)
-PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.26],
-                  [have_libxml2=yes], [have_libxml2=no])
-if test "x${have_libxml2}" = "xyes"; then
-  AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have `libxml2` library.])
-else
-  AC_MSG_NOTICE($LIBXML2_PKG_ERRORS)
-fi
-
-if test "x${request_libxml2}" = "xyes" &&
-   test "x${have_libxml2}" != "xyes"; then
-  AC_MSG_ERROR([libxml2 was requested (--with-libxml2) but not found])
-fi
-
-AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ])
-
-# jemalloc
-have_jemalloc=no
-if test "x${request_jemalloc}" != "xno"; then
-  save_LIBS=$LIBS
-  AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
-                 [$PTHREAD_LDFLAGS])
-
-  if test "x${have_jemalloc}" = "xyes"; then
-    jemalloc_libs=${ac_cv_search_malloc_stats_print}
-  else
-    # On Darwin, malloc_stats_print is je_malloc_stats_print
-    AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
-                   [$PTHREAD_LDFLAGS])
-
-    if test "x${have_jemalloc}" = "xyes"; then
-      jemalloc_libs=${ac_cv_search_je_malloc_stats_print}
-    fi
-  fi
-
-  LIBS=$save_LIBS
-
-  if test "x${have_jemalloc}" = "xyes" &&
-     test "x${jemalloc_libs}" != "xnone required"; then
-    JEMALLOC_LIBS=${jemalloc_libs}
-    AC_SUBST([JEMALLOC_LIBS])
-  fi
-fi
-
-if test "x${request_jemalloc}" = "xyes" &&
-   test "x${have_jemalloc}" != "xyes"; then
-  AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found])
-fi
-
-# Check Boost Asio library
-have_asio_lib=no
-
-if test "x${request_asio_lib}" = "xyes"; then
-  AX_BOOST_BASE([1.54.0], [have_boost_base=yes], [have_boost_base=no])
-
-  if test "x${have_boost_base}" = "xyes"; then
-    AX_BOOST_ASIO()
-    AX_BOOST_SYSTEM()
-    AX_BOOST_THREAD()
-
-    if test "x${ax_cv_boost_asio}" = "xyes" &&
-       test "x${ax_cv_boost_system}" = "xyes" &&
-       test "x${ax_cv_boost_thread}" = "xyes"; then
-      have_asio_lib=yes
-    fi
-  fi
-fi
-
-# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL,
-# libev, and libc-ares.
-enable_app=no
-if test "x${request_app}" != "xno" &&
-   test "x${have_zlib}" = "xyes" &&
-   test "x${have_openssl}" = "xyes" &&
-   test "x${have_libev}" = "xyes" &&
-   test "x${have_libcares}" = "xyes"; then
-  enable_app=yes
-fi
-
-if test "x${request_app}" = "xyes" &&
-   test "x${enable_app}" != "xyes"; then
-  AC_MSG_ERROR([applications were requested (--enable-app) but dependencies are not met.])
-fi
-
-AM_CONDITIONAL([ENABLE_APP], [ test "x${enable_app}" = "xyes" ])
-
-enable_hpack_tools=no
-# HPACK tools requires jansson
-if test "x${request_hpack_tools}" != "xno" &&
-   test "x${have_jansson}" = "xyes"; then
-  enable_hpack_tools=yes
-fi
-
-if test "x${request_hpack_tools}" = "xyes" &&
-   test "x${enable_hpack_tools}" != "xyes"; then
-  AC_MSG_ERROR([HPACK tools were requested (--enable-hpack-tools) but dependencies are not met.])
-fi
-
-AM_CONDITIONAL([ENABLE_HPACK_TOOLS], [ test "x${enable_hpack_tools}" = "xyes" ])
-
-# C++ library libnghttp2_asio
-
-enable_asio_lib=no
-if test "x${request_asio_lib}" != "xno" &&
-   test "x${have_asio_lib}" = "xyes"; then
-  enable_asio_lib=yes
-fi
-
-AM_CONDITIONAL([ENABLE_ASIO_LIB], [ test "x${enable_asio_lib}" = "xyes" ])
-
-# The example programs depend on OpenSSL and libevent_openssl
-enable_examples=no
-if test "x${request_examples}" != "xno" &&
-   test "x${have_openssl}" = "xyes" &&
-   test "x${have_libevent_openssl}" = "xyes"; then
-  enable_examples=yes
-fi
-
-if test "x${request_examples}" = "xyes" &&
-   test "x${enable_examples}" != "xyes"; then
-  AC_MSG_ERROR([examples were requested (--enable-examples) but dependencies are not met.])
-fi
-
-AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
-
-# third-party only be built when needed
-
-enable_third_party=no
-have_mruby=no
-have_neverbleed=no
-if test "x${enable_examples}" = "xyes" ||
-   test "x${enable_app}" = "xyes" ||
-   test "x${enable_hpack_tools}" = "xyes" ||
-   test "x${enable_asio_lib}" = "xyes"; then
-  enable_third_party=yes
-
-  # mruby (for src/nghttpx)
-  if test "x${request_mruby}" = "xyes"; then
-    # We are going to build mruby
-    have_mruby=yes
-    AC_DEFINE([HAVE_MRUBY], [1], [Define to 1 if you have `mruby` library.])
-    LIBMRUBY_LIBS="-lmruby -lm"
-    LIBMRUBY_CFLAGS=
-    AC_SUBST([LIBMRUBY_LIBS])
-    AC_SUBST([LIBMRUBY_CFLAGS])
-  fi
-
-  # neverbleed (for src/nghttpx)
-  if test "x${request_neverbleed}" = "xyes"; then
-    have_neverbleed=yes
-    AC_DEFINE([HAVE_NEVERBLEED], [1], [Define to 1 if you have `neverbleed` library.])
-  fi
-fi
-
-AM_CONDITIONAL([ENABLE_THIRD_PARTY], [ test "x${enable_third_party}" = "xyes" ])
-AM_CONDITIONAL([HAVE_MRUBY], [test "x${have_mruby}" = "xyes"])
-AM_CONDITIONAL([HAVE_NEVERBLEED], [test "x${have_neverbleed}" = "xyes"])
-
-# Python bindings
-enable_python_bindings=no
-if test "x${request_python_bindings}" != "xno" &&
-   test "x${CYTHON}" != "x" &&
-   test "x${PYTHON}" != "x:" &&
-   test "x${have_python_dev}" = "xyes"; then
-  enable_python_bindings=yes
-fi
-
-if test "x${request_python_bindings}" = "xyes" &&
-   test "x${enable_python_bindings}" != "xyes"; then
-  AC_MSG_ERROR([python bindings were requested (--enable-python-bindings) but dependencies are not met.])
-fi
-
-AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS],
-               [test "x${enable_python_bindings}" = "xyes"])
-
-# Produce cython conditional, so that we can distribute generated C
-# source
-AM_CONDITIONAL([HAVE_CYTHON], [test "x${CYTHON}" != "x"])
-
-# failmalloc tests
-enable_failmalloc=no
-if test "x${request_failmalloc}" = "xyes"; then
-  enable_failmalloc=yes
-fi
-
-AM_CONDITIONAL([ENABLE_FAILMALLOC], [ test "x${enable_failmalloc}" = "xyes" ])
-
-# Checks for header files.
-AC_HEADER_ASSERT
-AC_CHECK_HEADERS([ \
-  arpa/inet.h \
-  fcntl.h \
-  inttypes.h \
-  limits.h \
-  netdb.h \
-  netinet/in.h \
-  pwd.h \
-  stddef.h \
-  stdint.h \
-  stdlib.h \
-  string.h \
-  sys/socket.h \
-  sys/time.h \
-  syslog.h \
-  time.h \
-  unistd.h \
-])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_UID_T
-AC_CHECK_TYPES([ptrdiff_t])
-AC_C_BIGENDIAN
-AC_C_INLINE
-AC_SYS_LARGEFILE
-
-AC_CHECK_MEMBER([struct tm.tm_gmtoff], [have_struct_tm_tm_gmtoff=yes],
-                [have_struct_tm_tm_gmtoff=no], [[#include <time.h>]])
-
-AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
-                [AC_DEFINE([HAVE_SOCKADDR_IN_SIN_LEN],[1],
-                  [Define to 1 if struct sockaddr_in has sin_len member.])],
-                [],
-                [[
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-]])
-
-AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len],
-                [AC_DEFINE([HAVE_SOCKADDR_IN6_SIN6_LEN],[1],
-                  [Define to 1 if struct sockaddr_in6 has sin6_len member.])],
-                [],
-                [[
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-]])
-
-if test "x$have_struct_tm_tm_gmtoff" = "xyes"; then
-  AC_DEFINE([HAVE_STRUCT_TM_TM_GMTOFF], [1],
-            [Define to 1 if you have `struct tm.tm_gmtoff` member.])
-fi
-
-# Check size of pointer to decide we need 8 bytes alignment
-# adjustment.
-AC_CHECK_SIZEOF([int *])
-
-AC_CHECK_SIZEOF([time_t])
-
-# Checks for library functions.
-
-# Don't check malloc, since it does not play nicely with C++ stdlib
-# AC_FUNC_MALLOC
-
-AC_FUNC_CHOWN
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
-# Don't check realloc, since LeakSanitizer detects memory leak during check
-# AC_FUNC_REALLOC
-AC_FUNC_STRERROR_R
-AC_FUNC_STRNLEN
-
-AC_CHECK_FUNCS([ \
-  _Exit \
-  accept4 \
-  dup2 \
-  getcwd \
-  getpwnam \
-  localtime_r \
-  memchr \
-  memmove \
-  memset \
-  mkostemp \
-  socket \
-  sqrt \
-  strchr \
-  strdup \
-  strerror \
-  strndup \
-  strstr \
-  strtol \
-  strtoul \
-  timegm \
-])
-
-# timerfd_create was added in linux kernel 2.6.25
-
-AC_CHECK_FUNC([timerfd_create],
-              [have_timerfd_create=yes], [have_timerfd_create=no])
-
-# For cygwin: we can link initgroups, so AC_CHECK_FUNCS succeeds, but
-# cygwin disables initgroups due to feature test macro magic with our
-# configuration.  FreeBSD declares initgroups() in unistd.h.
-AC_CHECK_DECLS([initgroups], [], [], [[
-  #ifdef HAVE_UNISTD_H
-  # include <unistd.h>
-  #endif
-  #include <grp.h>
-]])
-
-save_CFLAGS=$CFLAGS
-save_CXXFLAGS=$CXXFLAGS
-
-CFLAGS=
-CXXFLAGS=
-
-if test "x$werror" != "xno"; then
-    # For C compiler
-    AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
-    AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
-    AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [CFLAGS="$CFLAGS -Wmissing-prototypes"])
-    AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [CFLAGS="$CFLAGS -Wmissing-declarations"])
-    AX_CHECK_COMPILE_FLAG([-Wpointer-arith], [CFLAGS="$CFLAGS -Wpointer-arith"])
-    AX_CHECK_COMPILE_FLAG([-Wdeclaration-after-statement], [CFLAGS="$CFLAGS -Wdeclaration-after-statement"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CFLAGS="$CFLAGS -Wformat-security"])
-    AX_CHECK_COMPILE_FLAG([-Wwrite-strings], [CFLAGS="$CFLAGS -Wwrite-strings"])
-    AX_CHECK_COMPILE_FLAG([-Wshadow], [CFLAGS="$CFLAGS -Wshadow"])
-    AX_CHECK_COMPILE_FLAG([-Winline], [CFLAGS="$CFLAGS -Winline"])
-    AX_CHECK_COMPILE_FLAG([-Wnested-externs], [CFLAGS="$CFLAGS -Wnested-externs"])
-    AX_CHECK_COMPILE_FLAG([-Wfloat-equal], [CFLAGS="$CFLAGS -Wfloat-equal"])
-    AX_CHECK_COMPILE_FLAG([-Wundef], [CFLAGS="$CFLAGS -Wundef"])
-    AX_CHECK_COMPILE_FLAG([-Wendif-labels], [CFLAGS="$CFLAGS -Wendif-labels"])
-    AX_CHECK_COMPILE_FLAG([-Wempty-body], [CFLAGS="$CFLAGS -Wempty-body"])
-    AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"])
-    AX_CHECK_COMPILE_FLAG([-Wclobbered], [CFLAGS="$CFLAGS -Wclobbered"])
-    AX_CHECK_COMPILE_FLAG([-Wvla], [CFLAGS="$CFLAGS -Wvla"])
-    AX_CHECK_COMPILE_FLAG([-Wpragmas], [CFLAGS="$CFLAGS -Wpragmas"])
-    AX_CHECK_COMPILE_FLAG([-Wunreachable-code], [CFLAGS="$CFLAGS -Wunreachable-code"])
-    AX_CHECK_COMPILE_FLAG([-Waddress], [CFLAGS="$CFLAGS -Waddress"])
-    AX_CHECK_COMPILE_FLAG([-Wattributes], [CFLAGS="$CFLAGS -Wattributes"])
-    AX_CHECK_COMPILE_FLAG([-Wdiv-by-zero], [CFLAGS="$CFLAGS -Wdiv-by-zero"])
-    AX_CHECK_COMPILE_FLAG([-Wshorten-64-to-32], [CFLAGS="$CFLAGS -Wshorten-64-to-32"])
-
-    AX_CHECK_COMPILE_FLAG([-Wconversion], [CFLAGS="$CFLAGS -Wconversion"])
-    AX_CHECK_COMPILE_FLAG([-Wextended-offsetof], [CFLAGS="$CFLAGS -Wextended-offsetof"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [CFLAGS="$CFLAGS -Wformat-nonliteral"])
-    AX_CHECK_COMPILE_FLAG([-Wlanguage-extension-token], [CFLAGS="$CFLAGS -Wlanguage-extension-token"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-field-initializers], [CFLAGS="$CFLAGS -Wmissing-field-initializers"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-noreturn], [CFLAGS="$CFLAGS -Wmissing-noreturn"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-variable-declarations], [CFLAGS="$CFLAGS -Wmissing-variable-declarations"])
-    # Not used because we cannot change public structs
-    # AX_CHECK_COMPILE_FLAG([-Wpadded], [CFLAGS="$CFLAGS -Wpadded"])
-    AX_CHECK_COMPILE_FLAG([-Wsign-conversion], [CFLAGS="$CFLAGS -Wsign-conversion"])
-    # Not used because this basically disallows default case
-    # AX_CHECK_COMPILE_FLAG([-Wswitch-enum], [CFLAGS="$CFLAGS -Wswitch-enum"])
-    AX_CHECK_COMPILE_FLAG([-Wunreachable-code-break], [CFLAGS="$CFLAGS -Wunreachable-code-break"])
-    AX_CHECK_COMPILE_FLAG([-Wunused-macros], [CFLAGS="$CFLAGS -Wunused-macros"])
-    AX_CHECK_COMPILE_FLAG([-Wunused-parameter], [CFLAGS="$CFLAGS -Wunused-parameter"])
-    AX_CHECK_COMPILE_FLAG([-Wredundant-decls], [CFLAGS="$CFLAGS -Wredundant-decls"])
-    # Only work with Clang for the moment
-    AX_CHECK_COMPILE_FLAG([-Wheader-guard], [CFLAGS="$CFLAGS -Wheader-guard"])
-    AX_CHECK_COMPILE_FLAG([-Wsometimes-uninitialized], [CFLAGS="$CFLAGS -Wsometimes-uninitialized"])
-
-    # This is required because we pass format string as "const char*.
-    AX_CHECK_COMPILE_FLAG([-Wno-format-nonliteral], [CFLAGS="$CFLAGS -Wno-format-nonliteral"])
-
-    # For C++ compiler
-    AC_LANG_PUSH(C++)
-    AX_CHECK_COMPILE_FLAG([-Wall], [CXXFLAGS="$CXXFLAGS -Wall"])
-    AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CXXFLAGS="$CXXFLAGS -Wformat-security"])
-    AX_CHECK_COMPILE_FLAG([-Wsometimes-uninitialized], [CXXFLAGS="$CXXFLAGS -Wsometimes-uninitialized"])
-    # Disable noexcept-type warning of g++-7.  This is not harmful as
-    # long as all source files are compiled with the same compiler.
-    AX_CHECK_COMPILE_FLAG([-Wno-noexcept-type], [CXXFLAGS="$CXXFLAGS -Wno-noexcept-type"])
-    AC_LANG_POP()
-fi
-
-WARNCFLAGS=$CFLAGS
-WARNCXXFLAGS=$CXXFLAGS
-
-CFLAGS=$save_CFLAGS
-CXXFLAGS=$save_CXXFLAGS
-
-AC_SUBST([WARNCFLAGS])
-AC_SUBST([WARNCXXFLAGS])
-
-EXTRACFLAG=
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [EXTRACFLAG="-fvisibility=hidden"])
-
-AC_SUBST([EXTRACFLAG])
-
-if test "x$debug" != "xno"; then
-    AC_DEFINE([DEBUGBUILD], [1], [Define to 1 to enable debug output.])
-fi
-
-enable_threads=yes
-# Some platform does not have working std::future.  We disable
-# threading for those platforms.
-if test "x$threads" != "xyes" ||
-   test "x$have_std_future" != "xyes"; then
-    enable_threads=no
-    AC_DEFINE([NOTHREADS], [1], [Define to 1 if you want to disable threads.])
-fi
-
-# propagate $enable_static to tests/Makefile.am
-AM_CONDITIONAL([ENABLE_STATIC], [test "x$enable_static" = "xyes"])
-
-AC_SUBST([TESTLDADD])
-AC_SUBST([APPLDFLAGS])
-
-AC_CONFIG_FILES([
-  Makefile
-  lib/Makefile
-  lib/libnghttp2.pc
-  lib/includes/Makefile
-  lib/includes/nghttp2/nghttp2ver.h
-  tests/Makefile
-  tests/testdata/Makefile
-  third-party/Makefile
-  src/Makefile
-  src/includes/Makefile
-  src/libnghttp2_asio.pc
-  examples/Makefile
-  python/Makefile
-  python/setup.py
-  integration-tests/Makefile
-  integration-tests/config.go
-  integration-tests/setenv
-  doc/Makefile
-  doc/conf.py
-  doc/index.rst
-  doc/package_README.rst
-  doc/tutorial-client.rst
-  doc/tutorial-server.rst
-  doc/tutorial-hpack.rst
-  doc/nghttpx-howto.rst
-  doc/h2load-howto.rst
-  doc/libnghttp2_asio.rst
-  doc/python-apiref.rst
-  doc/building-android-binary.rst
-  doc/nghttp2.h.rst
-  doc/nghttp2ver.h.rst
-  doc/asio_http2.h.rst
-  doc/asio_http2_server.h.rst
-  doc/asio_http2_client.h.rst
-  doc/contribute.rst
-  contrib/Makefile
-  script/Makefile
-])
-AC_OUTPUT
-
-AC_MSG_NOTICE([summary of build options:
-
-    Package version: ${VERSION}
-    Library version: $LT_CURRENT:$LT_REVISION:$LT_AGE
-    Install prefix:  ${prefix}
-    System types:
-      Build:         ${build}
-      Host:          ${host}
-      Target:        ${target}
-    Compiler:
-      C compiler:     ${CC}
-      CFLAGS:         ${CFLAGS}
-      LDFLAGS:        ${LDFLAGS}
-      C++ compiler:   ${CXX}
-      CXXFLAGS:       ${CXXFLAGS}
-      CXXCPP:         ${CXXCPP}
-      C preprocessor: ${CPP}
-      CPPFLAGS:       ${CPPFLAGS}
-      WARNCFLAGS:     ${WARNCFLAGS}
-      WARNCXXFLAGS:   ${WARNCXXFLAGS}
-      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
-      EXTRACFLAG:     ${EXTRACFLAG}
-      LIBS:           ${LIBS}
-    Library:
-      Shared:         ${enable_shared}
-      Static:         ${enable_static}
-    Python:
-      Python:         ${PYTHON}
-      PYTHON_VERSION: ${PYTHON_VERSION}
-      pyexecdir:      ${pyexecdir}
-      Python-dev:     ${have_python_dev}
-      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-      PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
-      Cython:         ${CYTHON}
-    Test:
-      CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
-      Failmalloc:     ${enable_failmalloc}
-    Libs:
-      OpenSSL:        ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
-      Libxml2:        ${have_libxml2} (CFLAGS='${LIBXML2_CPPFLAGS}' LIBS='${LIBXML2_LIBS}')
-      Libev:          ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
-      Libc-ares       ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
-      Libevent(SSL):  ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
-      Jansson:        ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
-      Jemalloc:       ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
-      Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
-      Systemd:        ${have_libsystemd} (CFLAGS='${SYSTEMD_CFLAGS}' LIBS='${SYSTEMD_LIBS}')
-      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
-      Boost LDFLAGS:  ${BOOST_LDFLAGS}
-      Boost::ASIO:    ${BOOST_ASIO_LIB}
-      Boost::System:  ${BOOST_SYSTEM_LIB}
-      Boost::Thread:  ${BOOST_THREAD_LIB}
-    Third-party:
-      http-parser:    ${enable_third_party}
-      MRuby:          ${have_mruby} (CFLAGS='${LIBMRUBY_CFLAGS}' LIBS='${LIBMRUBY_LIBS}')
-      Neverbleed:     ${have_neverbleed}
-    Features:
-      Applications:   ${enable_app}
-      HPACK tools:    ${enable_hpack_tools}
-      Libnghttp2_asio:${enable_asio_lib}
-      Examples:       ${enable_examples}
-      Python bindings:${enable_python_bindings}
-      Threading:      ${enable_threads}
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-set(CONFIGFILES
-  nghttpx-init
-  nghttpx.service
-  nghttpx-upstart.conf
-)
-
-# Note that the execute permissions of nghttpx-init is preserved
-foreach(name IN LISTS CONFIGFILES)
-  configure_file("${name}.in" "${name}" @ONLY)
-endforeach()
-
-# set(EXTRA_DIST ${CONFIGFILES} nghttpx-logrotate tlsticketupdate.go)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	$(configfiles:%=%.in) \
-	nghttpx-logrotate \
-	tlsticketupdate.go
-
-edit = sed -e 's|@bindir[@]|$(bindir)|g'
-
-nghttpx-init: $(srcdir)/nghttpx-init.in
-	rm -f $@ $@.tmp
-	$(edit) $< > $@.tmp
-	chmod +x $@.tmp
-	mv $@.tmp $@
-
-nghttpx.service: $(srcdir)/nghttpx.service.in
-	$(edit) $< > $@
-
-nghttpx-upstart.conf: $(srcdir)/nghttpx-upstart.conf.in
-	$(edit) $< > $@
-
-$(configfiles): Makefile
-
-all-local: $(configfiles)
-
-clean-local:
-	-rm -f nghttpx-init.tmp $(configfiles)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-init.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-init.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-init.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-init.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nghttpx
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nghttpx initscript
-# Description:       nghttpx initscript
-### END INIT INFO
-
-# Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-#
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="HTTP/2 reverse proxy"
-NAME=nghttpx
-# Depending on the configuration, binary may be located under @sbindir@
-DAEMON=@bindir@/$NAME
-PIDFILE=/var/run/$NAME.pid
-DAEMON_ARGS="--conf /etc/nghttpx/nghttpx.conf --pid-file=$PIDFILE --daemon"
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	#start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	#[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  upgrade)
-	log_daemon_msg "Upgrading $DESC" "$NAME"
-	oldpid=`pidofproc -p $PIDFILE $NAME`
-	case "$?" in
-		0)
-			log_progress_msg "Sending SIGUSR2 to $oldpid..."
-			kill -USR2 $oldpid
-			log_progress_msg "Waiting for new binary..."
-			for i in 1 2 3 4 5 ; do
-				sleep 1
-				newpid=`pidofproc -p $PIDFILE $NAME`
-				if [ "$newpid" != "$oldpid" ] ; then
-					break
-				fi
-			done
-			if [ "$newpid" != "$oldpid" ] ; then
-				log_progress_msg "Sending SIGQUIT to $oldpid..."
-				kill -QUIT $oldpid
-				log_end_msg 0
-			else
-				log_progress_msg "New binary failed to start"
-				log_end_msg 1
-			fi
-			;;
-		*)
-			log_progress_msg "pidofproc() failed"
-			log_end_msg 1
-		;;
-	esac
-	;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload|upgrade}" >&2
-	exit 3
-	;;
-esac
-
-:
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-logrotate cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-logrotate
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-logrotate	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-logrotate	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/var/log/nghttpx/*.log {
-  weekly
-  rotate 52
-  missingok
-  compress
-  delaycompress
-  notifempty
-  postrotate
-    [ -s /var/run/nghttpx.pid ] && kill -USR1 `cat /var/run/nghttpx.pid` 2> /dev/null || true
-  endscript
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx.service.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx.service.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx.service.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx.service.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-[Unit]
-Description=HTTP/2 proxy
-Documentation=man:nghttpx
-After=network.target
-
-[Service]
-Type=notify
-ExecStart=@bindir@/nghttpx --conf=/etc/nghttpx/nghttpx.conf
-ExecReload=/bin/kill --signal HUP $MAINPID
-KillSignal=SIGQUIT
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=full
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-upstart.conf.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-upstart.conf.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-upstart.conf.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/nghttpx-upstart.conf.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# vim: ft=upstart:
-
-description "HTTP/2 reverse proxy"
-
-start on runlevel [2]
-stop on runlevel [016]
-
-exec @bindir@/nghttpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/tlsticketupdate.go cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/tlsticketupdate.go
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/tlsticketupdate.go	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/tlsticketupdate.go	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-//
-// nghttp2 - HTTP/2 C Library
-//
-// Copyright (c) 2015 Tatsuhiro Tsujikawa
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-package main
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/binary"
-	"flag"
-	"fmt"
-	"github.com/bradfitz/gomemcache/memcache"
-	"log"
-	"time"
-)
-
-func makeKey(len int) []byte {
-	b := make([]byte, len)
-	if _, err := rand.Read(b); err != nil {
-		log.Fatalf("rand.Read: %v", err)
-	}
-	return b
-}
-
-func main() {
-	var host = flag.String("host", "127.0.0.1", "memcached host")
-	var port = flag.Int("port", 11211, "memcached port")
-	var cipher = flag.String("cipher", "aes-128-cbc", "cipher for TLS ticket encryption")
-	var interval = flag.Int("interval", 3600, "interval to update TLS ticket keys")
-
-	flag.Parse()
-
-	var keylen int
-	switch *cipher {
-	case "aes-128-cbc":
-		keylen = 48
-	case "aes-256-cbc":
-		keylen = 80
-	default:
-		log.Fatalf("cipher: unknown cipher %v", cipher)
-	}
-
-	mc := memcache.New(fmt.Sprintf("%v:%v", *host, *port))
-
-	keys := [][]byte{
-		makeKey(keylen), // current encryption key
-		makeKey(keylen), // next encryption key; now decryption only
-	}
-
-	for {
-		buf := new(bytes.Buffer)
-		if err := binary.Write(buf, binary.BigEndian, uint32(1)); err != nil {
-			log.Fatalf("failed to write version: %v", err)
-		}
-
-		for _, key := range keys {
-			if err := binary.Write(buf, binary.BigEndian, uint16(keylen)); err != nil {
-				log.Fatalf("failed to write length: %v", err)
-			}
-			if _, err := buf.Write(key); err != nil {
-				log.Fatalf("buf.Write: %v", err)
-			}
-		}
-
-		mc.Set(&memcache.Item{
-			Key:        "nghttpx:tls-ticket-key",
-			Value:      buf.Bytes(),
-			Expiration: int32((*interval) + 300),
-		})
-
-		select {
-		case <-time.After(time.Duration(*interval) * time.Second):
-		}
-
-		// rotate keys.  the last key is now encryption key.
-		// generate new key and append it to the last, so that
-		// we can at least decrypt TLS ticket encrypted by new
-		// key on the host which does not get new key yet.
-		// keep at most past 11 keys as decryption only key
-		n := len(keys) + 1
-		if n > 13 {
-			n = 13
-		}
-		newKeys := make([][]byte, n)
-		newKeys[0] = keys[len(keys)-1]
-		copy(newKeys[1:], keys[0:n-2])
-		newKeys[n-1] = makeKey(keylen)
-
-		keys = newKeys
-	}
-
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/usr.sbin.nghttpx cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/usr.sbin.nghttpx
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/contrib/usr.sbin.nghttpx	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/contrib/usr.sbin.nghttpx	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <tunables/global>
-
-/usr/sbin/nghttpx {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/openssl>
-
-  capability setgid,
-  capability setuid,
-
-  /usr/sbin/nghttpx rmix,      # allow to run itself
-  /etc/nghttpx/nghttpx.conf r, # allow to read the config file
-  /etc/ssl/** r,               # give access to ssl keys
-
-  /{,var/}run/nghttpx.pid lw,  # allow to store a pid file
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/CONTRIBUTION cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/CONTRIBUTION
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/CONTRIBUTION	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/CONTRIBUTION	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-[The text below was composed based on 1.2. License section of
-curl/libcurl project.]
-
-When contributing with code, you agree to put your changes and new
-code under the same license nghttp2 is already using unless stated and
-agreed otherwise.
-
-When changing existing source code, you do not alter the copyright of
-the original file(s).  The copyright will still be owned by the
-original creator(s) or those who have been assigned copyright by the
-original author(s).
-
-By submitting a patch to the nghttp2 project, you are assumed to have
-the right to the code and to be allowed by your employer or whatever
-to hand over that patch/code to us.  We will credit you for your
-changes as far as possible, to give credit but also to keep a trace
-back to who made what changes.  Please always provide us with your
-full real name when contributing!
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/COPYING cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/COPYING
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/COPYING	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/COPYING	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-The MIT License
-
-Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
-Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_client.h.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_client.h.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_client.h.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_client.h.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-asio_http2_client.h
-===================
-
-.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2_client.h
-   :language: cpp
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2.h.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2.h.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2.h.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2.h.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-asio_http2.h
-============
-
-.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2.h
-   :language: cpp
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_server.h.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_server.h.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_server.h.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/asio_http2_server.h.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-asio_http2_server.h
-===================
-
-.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2_server.h
-   :language: cpp
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/h2load cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/h2load
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/h2load	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/h2load	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-_h2load()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--connection-window-bits --clients --verbose --ciphers --rate --no-tls-proto --header-table-size --requests --base-uri --h1 --threads --npn-list --rate-period --data --version --connection-inactivity-timeout --timing-script-file --encoder-header-table-size --max-concurrent-streams --connection-active-timeout --input-file --help --window-bits --warm-up-time --duration --header ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _h2load h2load
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/make_bash_completion.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/make_bash_completion.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/make_bash_completion.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/make_bash_completion.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-from __future__ import print_function
-import subprocess
-import io
-import re
-import sys
-import os.path
-
-class Option:
-    def __init__(self, long_opt, short_opt):
-        self.long_opt = long_opt
-        self.short_opt = short_opt
-
-def get_all_options(cmd):
-    opt_pattern = re.compile(r'  (?:(-.), )?(--[^\s\[=]+)(\[)?')
-    proc = subprocess.Popen([cmd, "--help"], stdout=subprocess.PIPE)
-    stdoutdata, _ = proc.communicate()
-    cur_option = None
-    opts = {}
-    for line in io.StringIO(stdoutdata.decode('utf-8')):
-        match = opt_pattern.match(line)
-        if not match:
-            continue
-        long_opt = match.group(2)
-        short_opt = match.group(1)
-        opts[long_opt] = Option(long_opt, short_opt)
-
-    return opts
-
-def output_case(out, name, opts):
-    out.write('''\
-_{name}()
-{{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${{COMP_WORDBREAKS//=}}
-
-    cmd=${{COMP_WORDS[0]}}
-    _get_comp_words_by_ref cur prev
-'''.format(name=name))
-
-    # Complete option name.
-    out.write('''\
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '\
-''')
-    for opt in opts.values():
-        out.write(opt.long_opt)
-        out.write(' ')
-
-    out.write('''\
-' -- "$cur" ) )
-            ;;
-''')
-    # If no option found for completion then complete with files.
-    out.write('''\
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}}
-complete -F _{name} {name}
-'''.format(name=name))
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        print("Generates bash_completion using `/path/to/cmd --help'")
-        print("Usage: make_bash_completion.py /path/to/cmd")
-        exit(1)
-    name = os.path.basename(sys.argv[1])
-    opts = get_all_options(sys.argv[1])
-    output_case(sys.stdout, name, opts)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttp cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttp
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttp	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttp	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-_nghttp()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--no-push --verbose --no-dep --get-assets --har --header-table-size --multiply --encoder-header-table-size --padding --hexdump --max-concurrent-streams --continuation --connection-window-bits --peer-max-concurrent-streams --timeout --data --no-content-length --version --color --cert --upgrade --remote-name --trailer --weight --help --key --null-out --window-bits --expect-continue --stat --no-verify-peer --header ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _nghttp nghttp
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpd cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpd
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpd	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpd	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-_nghttpd()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--htdocs --verbose --daemon --echo-upload --error-gzip --push --header-table-size --encoder-header-table-size --padding --hexdump --max-concurrent-streams --no-tls --connection-window-bits --mime-types-file --no-content-length --workers --version --color --early-response --dh-param-file --trailer --address --window-bits --verify-client --help ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _nghttpd nghttpd
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpx cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpx
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpx	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/bash_completion/nghttpx	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-_nghttpx()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--worker-read-rate --include --frontend-http2-dump-response-header --tls-ticket-key-file --verify-client-cacert --max-response-header-fields --backend-http2-window-size --frontend-keep-alive-timeout --backend-request-buffer --max-request-header-fields --backend-connect-timeout --tls-max-proto-version --conf --dns-lookup-timeout --backend-http2-max-concurrent-streams --worker-write-burst --npn-list --dns-max-try --fetch-ocsp-response-file --no-via --tls-session-cache-memcached-cert-file --no-http2-cipher-black-list --mruby-file --add-forwarded --client-no-http2-cipher-black-list --stream-read-timeout --client-ciphers --ocsp-update-interval --forwarded-for --accesslog-syslog --dns-cache-timeout --frontend-http2-read-timeout --listener-disable-timeout --ciphers --client-psk-secrets --strip-incoming-x-forwarded-for --no-server-rewrite --private-key-passwd-file --backend-keep-alive-timeout --backend-http-proxy-uri --frontend-max-requests --rlimit-nofile --no-strip-incoming-x-forwarded-proto --tls-ticket-key-memcached-cert-file --no-verify-ocsp --forwarded-by --tls-session-cache-memcached-private-key-file --error-page --ocsp-startup --backend-write-timeout --tls-dyn-rec-warmup-threshold --tls-ticket-key-memcached-max-retry --frontend-http2-window-size --http2-no-cookie-crumbling --worker-read-burst --dh-param-file --accesslog-format --errorlog-syslog --redirect-https-port --request-header-field-buffer --api-max-request-body --frontend-http2-decoder-dynamic-table-size --errorlog-file --frontend-http2-max-concurrent-streams --psk-secrets --frontend-write-timeout --tls-ticket-key-cipher --read-burst --no-add-x-forwarded-proto --backend --server-name --insecure --backend-max-backoff --log-level --host-rewrite --tls-ticket-key-memcached-interval --frontend-http2-setting-timeout --frontend-http2-connection-window-size --worker-frontend-connections --syslog-facility --fastopen --no-location-rewrite --single-thread --tls-session-cache-memcached --no-ocsp --backend-response-buffer --tls-min-proto-version --workers --add-x-forwarded-for --no-server-push --worker-write-rate --add-request-header --backend-http2-settings-timeout --subcert --ignore-per-pattern-mruby-error --ecdh-curves --no-kqueue --help --frontend-frame-debug --tls-sct-dir --pid-file --frontend-http2-dump-request-header --daemon --write-rate --altsvc --backend-http2-decoder-dynamic-table-size --user --verify-client-tolerate-expired --frontend-read-timeout --tls-ticket-key-memcached-max-fail --backlog --write-burst --backend-connections-per-host --response-header-field-buffer --tls-ticket-key-memcached-address-family --padding --tls-session-cache-memcached-address-family --stream-write-timeout --cacert --tls-ticket-key-memcached-private-key-file --accesslog-write-early --backend-address-family --backend-http2-connection-window-size --version --add-response-header --backend-read-timeout --frontend-http2-optimize-window-size --frontend --accesslog-file --http2-proxy --backend-http2-encoder-dynamic-table-size --client-private-key-file --single-process --client-cert-file --tls-ticket-key-memcached --tls-dyn-rec-idle-timeout --frontend-http2-optimize-write-buffer-size --verify-client --frontend-http2-encoder-dynamic-table-size --read-rate --backend-connections-per-frontend --strip-incoming-forwarded ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _nghttpx nghttpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/building-android-binary.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/building-android-binary.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/building-android-binary.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/building-android-binary.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/building-android-binary.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,353 +0,0 @@
-# Generated documents
-set(APIDOCS
-  macros.rst
-  enums.rst
-  types.rst
-  nghttp2_check_header_name.rst
-  nghttp2_check_header_value.rst
-  nghttp2_hd_deflate_bound.rst
-  nghttp2_hd_deflate_change_table_size.rst
-  nghttp2_hd_deflate_del.rst
-  nghttp2_hd_deflate_get_dynamic_table_size.rst
-  nghttp2_hd_deflate_get_max_dynamic_table_size.rst
-  nghttp2_hd_deflate_get_num_table_entries.rst
-  nghttp2_hd_deflate_get_table_entry.rst
-  nghttp2_hd_deflate_hd.rst
-  nghttp2_hd_deflate_hd_vec.rst
-  nghttp2_hd_deflate_new.rst
-  nghttp2_hd_deflate_new2.rst
-  nghttp2_hd_inflate_change_table_size.rst
-  nghttp2_hd_inflate_del.rst
-  nghttp2_hd_inflate_end_headers.rst
-  nghttp2_hd_inflate_get_dynamic_table_size.rst
-  nghttp2_hd_inflate_get_max_dynamic_table_size.rst
-  nghttp2_hd_inflate_get_num_table_entries.rst
-  nghttp2_hd_inflate_get_table_entry.rst
-  nghttp2_hd_inflate_hd.rst
-  nghttp2_hd_inflate_hd2.rst
-  nghttp2_hd_inflate_new.rst
-  nghttp2_hd_inflate_new2.rst
-  nghttp2_http2_strerror.rst
-  nghttp2_is_fatal.rst
-  nghttp2_nv_compare_name.rst
-  nghttp2_option_del.rst
-  nghttp2_option_new.rst
-  nghttp2_option_set_builtin_recv_extension_type.rst
-  nghttp2_option_set_max_deflate_dynamic_table_size.rst
-  nghttp2_option_set_max_reserved_remote_streams.rst
-  nghttp2_option_set_max_send_header_block_length.rst
-  nghttp2_option_set_no_auto_ping_ack.rst
-  nghttp2_option_set_no_auto_window_update.rst
-  nghttp2_option_set_no_http_messaging.rst
-  nghttp2_option_set_no_recv_client_magic.rst
-  nghttp2_option_set_peer_max_concurrent_streams.rst
-  nghttp2_option_set_user_recv_extension_type.rst
-  nghttp2_pack_settings_payload.rst
-  nghttp2_priority_spec_check_default.rst
-  nghttp2_priority_spec_default_init.rst
-  nghttp2_priority_spec_init.rst
-  nghttp2_rcbuf_decref.rst
-  nghttp2_rcbuf_get_buf.rst
-  nghttp2_rcbuf_incref.rst
-  nghttp2_rcbuf_is_static.rst
-  nghttp2_select_next_protocol.rst
-  nghttp2_session_callbacks_del.rst
-  nghttp2_session_callbacks_new.rst
-  nghttp2_session_callbacks_set_before_frame_send_callback.rst
-  nghttp2_session_callbacks_set_data_source_read_length_callback.rst
-  nghttp2_session_callbacks_set_error_callback.rst
-  nghttp2_session_callbacks_set_on_begin_frame_callback.rst
-  nghttp2_session_callbacks_set_on_begin_headers_callback.rst
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst
-  nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst
-  nghttp2_session_callbacks_set_on_frame_not_send_callback.rst
-  nghttp2_session_callbacks_set_on_frame_recv_callback.rst
-  nghttp2_session_callbacks_set_on_frame_send_callback.rst
-  nghttp2_session_callbacks_set_on_header_callback.rst
-  nghttp2_session_callbacks_set_on_header_callback2.rst
-  nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst
-  nghttp2_session_callbacks_set_on_invalid_header_callback.rst
-  nghttp2_session_callbacks_set_on_invalid_header_callback2.rst
-  nghttp2_session_callbacks_set_on_stream_close_callback.rst
-  nghttp2_session_callbacks_set_pack_extension_callback.rst
-  nghttp2_session_callbacks_set_recv_callback.rst
-  nghttp2_session_callbacks_set_select_padding_callback.rst
-  nghttp2_session_callbacks_set_send_callback.rst
-  nghttp2_session_callbacks_set_send_data_callback.rst
-  nghttp2_session_callbacks_set_unpack_extension_callback.rst
-  nghttp2_session_change_stream_priority.rst
-  nghttp2_session_check_request_allowed.rst
-  nghttp2_session_check_server_session.rst
-  nghttp2_session_client_new.rst
-  nghttp2_session_client_new2.rst
-  nghttp2_session_client_new3.rst
-  nghttp2_session_consume.rst
-  nghttp2_session_consume_connection.rst
-  nghttp2_session_consume_stream.rst
-  nghttp2_session_create_idle_stream.rst
-  nghttp2_session_del.rst
-  nghttp2_session_find_stream.rst
-  nghttp2_session_get_effective_local_window_size.rst
-  nghttp2_session_get_effective_recv_data_length.rst
-  nghttp2_session_get_hd_deflate_dynamic_table_size.rst
-  nghttp2_session_get_hd_inflate_dynamic_table_size.rst
-  nghttp2_session_get_last_proc_stream_id.rst
-  nghttp2_session_get_local_settings.rst
-  nghttp2_session_get_local_window_size.rst
-  nghttp2_session_get_next_stream_id.rst
-  nghttp2_session_get_outbound_queue_size.rst
-  nghttp2_session_get_remote_settings.rst
-  nghttp2_session_get_remote_window_size.rst
-  nghttp2_session_get_root_stream.rst
-  nghttp2_session_get_stream_effective_local_window_size.rst
-  nghttp2_session_get_stream_effective_recv_data_length.rst
-  nghttp2_session_get_stream_local_close.rst
-  nghttp2_session_get_stream_local_window_size.rst
-  nghttp2_session_get_stream_remote_close.rst
-  nghttp2_session_get_stream_remote_window_size.rst
-  nghttp2_session_get_stream_user_data.rst
-  nghttp2_session_mem_recv.rst
-  nghttp2_session_mem_send.rst
-  nghttp2_session_recv.rst
-  nghttp2_session_resume_data.rst
-  nghttp2_session_send.rst
-  nghttp2_session_server_new.rst
-  nghttp2_session_server_new2.rst
-  nghttp2_session_server_new3.rst
-  nghttp2_session_set_local_window_size.rst
-  nghttp2_session_set_next_stream_id.rst
-  nghttp2_session_set_stream_user_data.rst
-  nghttp2_session_terminate_session.rst
-  nghttp2_session_terminate_session2.rst
-  nghttp2_session_upgrade.rst
-  nghttp2_session_upgrade2.rst
-  nghttp2_session_want_read.rst
-  nghttp2_session_want_write.rst
-  nghttp2_set_debug_vprintf_callback.rst
-  nghttp2_stream_get_first_child.rst
-  nghttp2_stream_get_next_sibling.rst
-  nghttp2_stream_get_parent.rst
-  nghttp2_stream_get_previous_sibling.rst
-  nghttp2_stream_get_state.rst
-  nghttp2_stream_get_sum_dependency_weight.rst
-  nghttp2_stream_get_weight.rst
-  nghttp2_strerror.rst
-  nghttp2_submit_altsvc.rst
-  nghttp2_submit_data.rst
-  nghttp2_submit_extension.rst
-  nghttp2_submit_goaway.rst
-  nghttp2_submit_headers.rst
-  nghttp2_submit_ping.rst
-  nghttp2_submit_priority.rst
-  nghttp2_submit_push_promise.rst
-  nghttp2_submit_request.rst
-  nghttp2_submit_response.rst
-  nghttp2_submit_rst_stream.rst
-  nghttp2_submit_settings.rst
-  nghttp2_submit_shutdown_notice.rst
-  nghttp2_submit_trailer.rst
-  nghttp2_submit_window_update.rst
-  nghttp2_version.rst
-)
-
-set(MAN_PAGES
-  nghttp.1
-  nghttpd.1
-  nghttpx.1
-  h2load.1
-)
-
-# Other .rst files from the source tree that need to be copied
-# XXX move them to sources/ and create .in files?
-set(RST_FILES
-  README.rst
-  programmers-guide.rst
-  nghttp.1.rst
-  nghttpd.1.rst
-  nghttpx.1.rst
-  h2load.1.rst
-)
-
-# XXX unused for now
-set(EXTRA_DIST
-  mkapiref.py
-  ${RST_FILES}
-  ${APIDOCS}
-  sources/index.rst
-  sources/tutorial-client.rst
-  sources/tutorial-server.rst
-  sources/tutorial-hpack.rst
-  sources/nghttpx-howto.rst
-  sources/h2load-howto.rst
-  sources/libnghttp2_asio.rst
-  sources/python-apiref.rst
-  sources/building-android-binary.rst
-  sources/contribute.rst
-  _exts/sphinxcontrib/LICENSE.rubydomain
-  _exts/sphinxcontrib/__init__.py
-  _exts/sphinxcontrib/rubydomain.py
-  _themes/sphinx_rtd_theme/__init__.py
-  _themes/sphinx_rtd_theme/breadcrumbs.html
-  _themes/sphinx_rtd_theme/footer.html
-  _themes/sphinx_rtd_theme/layout.html
-  _themes/sphinx_rtd_theme/layout_old.html
-  _themes/sphinx_rtd_theme/search.html
-  _themes/sphinx_rtd_theme/searchbox.html
-  _themes/sphinx_rtd_theme/static/css/badge_only.css
-  _themes/sphinx_rtd_theme/static/css/theme.css
-  _themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
-  _themes/sphinx_rtd_theme/static/js/theme.js
-  _themes/sphinx_rtd_theme/theme.conf
-  _themes/sphinx_rtd_theme/versions.html
-  ${MAN_PAGES}
-  bash_completion/nghttp
-  bash_completion/nghttpd
-  bash_completion/nghttpx
-  bash_completion/h2load
-)
-
-# Based on Makefile for Sphinx documentation
-
-# You can set these variables from the command line.
-set(SPHINXOPTS)
-set(SPHINXBUILD sphinx-build)
-set(PAPER)
-set(BUILDDIR    manual)
-
-# Internal variables.
-set(PAPEROPT_a4     -D latex_paper_size=a4)
-set(PAPEROPT_letter -D latex_paper_size=letter)
-set(ALLSPHINXOPTS   -d ${BUILDDIR}/doctrees ${PAPEROPT_${PAPER}} ${SPHINXOPTS} .)
-
-# "Please use `make <target>' where <target> is one of"
-# "  html       to make standalone HTML files"
-# "  dirhtml    to make HTML files named index.html in directories"
-# "  singlehtml to make a single large HTML file"
-# "  pickle     to make pickle files"
-# "  json       to make JSON files"
-# "  htmlhelp   to make HTML files and a HTML help project"
-# "  qthelp     to make HTML files and a qthelp project"
-# "  devhelp    to make HTML files and a Devhelp project"
-# "  epub       to make an epub"
-# "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-# "  latexpdf   to make LaTeX files and run them through pdflatex"
-# "  text       to make text files"
-# "  man        to make manual pages"
-# "  changes    to make an overview of all changed/added/deprecated items"
-# "  linkcheck  to check all external links for integrity"
-# "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-
-# Copy files for out-of-tree builds
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-  set(RST_BUILD_FILES)
-  foreach(rstfile IN LISTS RST_FILES)
-    set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${rstfile}")
-    add_custom_command(OUTPUT "${outfile}"
-      COMMAND ${CMAKE_COMMAND} -E copy
-              "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}" "${outfile}"
-      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}"
-    )
-    list(APPEND RST_BUILD_FILES "${outfile}")
-  endforeach()
-else()
-  set(RST_BUILD_FILES "${RST_FILES}")
-endif()
-
-set(apiref_SOURCES
-  ${CMAKE_BINARY_DIR}/lib/includes/nghttp2/nghttp2ver.h
-  ${CMAKE_SOURCE_DIR}/lib/includes/nghttp2/nghttp2.h
-)
-# Generates apiref.rst and other files
-add_custom_command(
-  OUTPUT
-    apiref.rst
-    ${APIDOCS}
-  COMMAND
-    "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mkapiref.py"
-    apiref.rst macros.rst enums.rst types.rst .
-    ${apiref_SOURCES}
-  DEPENDS
-    ${RST_BUILD_FILES}
-    ${apiref_SOURCES}
-)
-
-
-
-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILDDIR}")
-
-# Invokes sphinx-build and prints the given messages when completed
-function(sphinxbuild builder)
-  set(echo_commands)
-  foreach(message IN LISTS ARGN)
-    list(APPEND echo_commands COMMAND ${CMAKE_COMMAND} -E echo "${message}")
-  endforeach()
-  add_custom_target(${builder}
-    COMMAND "${SPHINXBUILD}" -b ${builder} ${ALLSPHINXOPTS} "${BUILDDIR}/${builder}"
-    COMMAND ${CMAKE_COMMAND} -E echo
-    ${echo_commands}
-    VERBATIM
-    DEPENDS apiref.rst
-  )
-endfunction()
-
-foreach(builder html dirhtml singlehtml)
-  sphinxbuild(${builder}
-    "Build finished. The HTML pages are in ${BUILDDIR}/${builder}.")
-endforeach()
-sphinxbuild(pickle  "Build finished; now you can process the pickle files.")
-sphinxbuild(json    "Build finished; now you can process the JSON files.")
-sphinxbuild(htmlhelp
-  "Build finished; now you can run HTML Help Workshop with the"
-  ".hhp project file in ${BUILDDIR}/htmlhelp."
-)
-sphinxbuild(qthelp
-  "Build finished; now you can run \"qcollectiongenerator\" with the"
-  ".qhcp project file in ${BUILDDIR}/qthelp, like this:"
-  "# qcollectiongenerator ${BUILDDIR}/qthelp/nghttp2.qhcp"
-  "To view the help file:"
-  "# assistant -collectionFile ${BUILDDIR}/qthelp/nghttp2.qhc"
-)
-sphinxbuild(devhelp
-  "Build finished."
-  "To view the help file:"
-  "# mkdir -p ~/.local/share/devhelp/nghttp2"
-  "# ln -s ${BUILDDIR}/devhelp ~/.local/share/devhelp/nghttp2"
-  "# devhelp"
-)
-sphinxbuild(epub    "Build finished. The epub file is in ${BUILDDIR}/epub.")
-sphinxbuild(latex
-  "Build finished; the LaTeX files are in ${BUILDDIR}/latex."
-  "Run `make' in that directory to run these through (pdf)latex"
-  "(use `make latexpdf' here to do that automatically)."
-)
-
-# Invoke the Makefile generated by sphinx
-add_custom_target(latexpdf
-  COMMAND ${CMAKE_COMMAND} -E echo "Running LaTeX files through pdflatex..."
-  COMMAND make -C "${BUILDDIR}/latex" all-pdf
-  COMMAND ${CMAKE_COMMAND} -E echo "pdflatex finished; the PDF files are in ${BUILDDIR}/latex."
-  DEPENDS latex
-)
-
-sphinxbuild(text    "Build finished. The text files are in ${BUILDDIR}/text.")
-sphinxbuild(man     "Build finished. The manual pages are in ${BUILDDIR}/man.")
-sphinxbuild(changes "The overview file is in ${BUILDDIR}/changes.")
-sphinxbuild(linkcheck
-  "Link check complete; look for any errors in the above output"
-  "or in ${BUILDDIR}/linkcheck/output.txt."
-)
-sphinxbuild(doctest
-  "Testing of doctests in the sources finished, look at the"
-  "results in ${BUILDDIR}/doctest/output.txt."
-)
-
-foreach(_man_page IN LISTS MAN_PAGES)
-  install(FILES ${_man_page}
-    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-  )
-endforeach()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/conf.py.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/conf.py.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/conf.py.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/conf.py.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,252 +0,0 @@
-# -*- coding: utf-8 -*-
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#
-# nghttp2 documentation build configuration file, created by
-# sphinx-quickstart on Sun Mar 11 22:57:49 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-sys.path.append(os.path.abspath('@top_srcdir@/doc/_exts'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinxcontrib.rubydomain']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['@top_srcdir@/_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'nghttp2'
-copyright = u'2012, 2015, 2016, Tatsuhiro Tsujikawa'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '@PACKAGE_VERSION@'
-# The full version, including alpha/beta/rc tags.
-release = '@PACKAGE_VERSION@'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['manual', 'README.rst', '*-header.rst', 'sources']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-default_role = 'c:func'
-primary_domain = 'c'
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The default language to highlight source code in. The default is 'python'.
-highlight_language = 'c'
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'sphinx_rtd_theme'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ['@top_srcdir@/doc/_themes']
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = False
-
-# Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    '**': ['menu.html', 'localtoc.html', 'relations.html', 'sourcelink.html',
-           'searchbox.html']
-    }
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-html_show_sourcelink = False
-html_copy_source = False
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'nghttp2doc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'nghttp2.tex', u'nghttp2 Documentation',
-   u'Tatsuhiro Tsujikawa', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('nghttp.1', 'nghttp', u'HTTP/2 client', [u'Tatsuhiro Tsujikawa'], 1),
-    ('nghttpd.1', 'nghttpd', u'HTTP/2 server', [u'Tatsuhiro Tsujikawa'], 1),
-    ('nghttpx.1', 'nghttpx', u'HTTP/2 proxy', [u'Tatsuhiro Tsujikawa'], 1),
-    ('h2load.1', 'h2load', u'HTTP/2 benchmarking tool',
-     [u'Tatsuhiro Tsujikawa'], 1)
-]
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/contribute.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/contribute.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/contribute.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/contribute.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/contribute.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/docutils.conf cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/docutils.conf
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/docutils.conf	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/docutils.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[parsers]
-smart_quotes=no
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/__init__.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/__init__.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/__init__.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/__init__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinxcontrib
-    ~~~~~~~~~~~~~
-
-    This package is a namespace package that contains all extensions
-    distributed in the ``sphinx-contrib`` distribution.
-
-    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-__import__('pkg_resources').declare_namespace(__name__)
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/LICENSE.rubydomain cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/LICENSE.rubydomain
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/LICENSE.rubydomain	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/LICENSE.rubydomain	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-If not otherwise noted, the extensions in this package are licensed
-under the following license.
-
-Copyright (c) 2010 by the contributors (see AUTHORS file).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/rubydomain.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/rubydomain.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/rubydomain.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_exts/sphinxcontrib/rubydomain.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,703 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinx.domains.ruby
-    ~~~~~~~~~~~~~~~~~~~
-
-    The Ruby domain.
-
-    :copyright: Copyright 2010 by SHIBUKAWA Yoshiki
-    :license: BSD, see LICENSE for details.
-"""
-
-import re
-
-from docutils import nodes
-from docutils.parsers.rst import directives
-from docutils.parsers.rst import Directive
-
-from sphinx import addnodes
-from sphinx import version_info
-from sphinx.roles import XRefRole
-from sphinx.locale import l_, _
-from sphinx.domains import Domain, ObjType, Index
-from sphinx.directives import ObjectDescription
-from sphinx.util.nodes import make_refnode
-from sphinx.util.docfields import Field, GroupedField, TypedField
-
-# REs for Ruby signatures
-rb_sig_re = re.compile(
-    r'''^ ([\w.]*\.)?            # class name(s)
-          (\$?\w+\??!?)  \s*     # thing name
-          (?: \((.*)\)           # optional: arguments
-           (?:\s* -> \s* (.*))?  #           return annotation
-          )? $                   # and nothing more
-          ''', re.VERBOSE)
-
-rb_paramlist_re = re.compile(r'([\[\],])')  # split at '[', ']' and ','
-
-separators = {
-  'method':'#', 'attr_reader':'#', 'attr_writer':'#', 'attr_accessor':'#',
-  'function':'.', 'classmethod':'.', 'class':'::', 'module':'::',
-  'global':'', 'const':'::'}
-
-rb_separator = re.compile(r"(?:\w+)?(?:::)?(?:\.)?(?:#)?")
-
-
-def _iteritems(d):
-
-    for k in d:
-        yield k, d[k]
-
-
-def ruby_rsplit(fullname):
-    items = [item for item in rb_separator.findall(fullname)]
-    return ''.join(items[:-2]), items[-1]
-
-
-class RubyObject(ObjectDescription):
-    """
-    Description of a general Ruby object.
-    """
-    option_spec = {
-        'noindex': directives.flag,
-        'module': directives.unchanged,
-    }
-
-    doc_field_types = [
-        TypedField('parameter', label=l_('Parameters'),
-                   names=('param', 'parameter', 'arg', 'argument'),
-                   typerolename='obj', typenames=('paramtype', 'type')),
-        TypedField('variable', label=l_('Variables'), rolename='obj',
-                   names=('var', 'ivar', 'cvar'),
-                   typerolename='obj', typenames=('vartype',)),
-        GroupedField('exceptions', label=l_('Raises'), rolename='exc',
-                     names=('raises', 'raise', 'exception', 'except'),
-                     can_collapse=True),
-        Field('returnvalue', label=l_('Returns'), has_arg=False,
-              names=('returns', 'return')),
-        Field('returntype', label=l_('Return type'), has_arg=False,
-              names=('rtype',)),
-    ]
-
-    def get_signature_prefix(self, sig):
-        """
-        May return a prefix to put before the object name in the signature.
-        """
-        return ''
-
-    def needs_arglist(self):
-        """
-        May return true if an empty argument list is to be generated even if
-        the document contains none.
-        """
-        return False
-
-    def handle_signature(self, sig, signode):
-        """
-        Transform a Ruby signature into RST nodes.
-        Returns (fully qualified name of the thing, classname if any).
-
-        If inside a class, the current class name is handled intelligently:
-        * it is stripped from the displayed name if present
-        * it is added to the full name (return value) if not present
-        """
-        m = rb_sig_re.match(sig)
-        if m is None:
-            raise ValueError
-        name_prefix, name, arglist, retann = m.groups()
-        if not name_prefix:
-            name_prefix = ""
-        # determine module and class name (if applicable), as well as full name
-        modname = self.options.get(
-            'module', self.env.temp_data.get('rb:module'))
-        classname = self.env.temp_data.get('rb:class')
-        if self.objtype == 'global':
-            add_module = False
-            modname = None
-            classname = None
-            fullname = name
-        elif classname:
-            add_module = False
-            if name_prefix and name_prefix.startswith(classname):
-                fullname = name_prefix + name
-                # class name is given again in the signature
-                name_prefix = name_prefix[len(classname):].lstrip('.')
-            else:
-                separator = separators[self.objtype]
-                fullname = classname + separator + name_prefix + name
-        else:
-            add_module = True
-            if name_prefix:
-                classname = name_prefix.rstrip('.')
-                fullname = name_prefix + name
-            else:
-                classname = ''
-                fullname = name
-
-        signode['module'] = modname
-        signode['class'] = self.class_name = classname
-        signode['fullname'] = fullname
-
-        sig_prefix = self.get_signature_prefix(sig)
-        if sig_prefix:
-            signode += addnodes.desc_annotation(sig_prefix, sig_prefix)
-
-        if name_prefix:
-            signode += addnodes.desc_addname(name_prefix, name_prefix)
-        # exceptions are a special case, since they are documented in the
-        # 'exceptions' module.
-        elif add_module and self.env.config.add_module_names:
-            if self.objtype == 'global':
-                nodetext = ''
-                signode += addnodes.desc_addname(nodetext, nodetext)
-            else:
-                modname = self.options.get(
-                    'module', self.env.temp_data.get('rb:module'))
-                if modname and modname != 'exceptions':
-                    nodetext = modname + separators[self.objtype]
-                    signode += addnodes.desc_addname(nodetext, nodetext)
-
-        signode += addnodes.desc_name(name, name)
-        if not arglist:
-            if self.needs_arglist():
-                # for callables, add an empty parameter list
-                signode += addnodes.desc_parameterlist()
-            if retann:
-                signode += addnodes.desc_returns(retann, retann)
-            return fullname, name_prefix
-        signode += addnodes.desc_parameterlist()
-
-        stack = [signode[-1]]
-        for token in rb_paramlist_re.split(arglist):
-            if token == '[':
-                opt = addnodes.desc_optional()
-                stack[-1] += opt
-                stack.append(opt)
-            elif token == ']':
-                try:
-                    stack.pop()
-                except IndexError:
-                    raise ValueError
-            elif not token or token == ',' or token.isspace():
-                pass
-            else:
-                token = token.strip()
-                stack[-1] += addnodes.desc_parameter(token, token)
-        if len(stack) != 1:
-            raise ValueError
-        if retann:
-            signode += addnodes.desc_returns(retann, retann)
-        return fullname, name_prefix
-
-    def get_index_text(self, modname, name):
-        """
-        Return the text for the index entry of the object.
-        """
-        raise NotImplementedError('must be implemented in subclasses')
-
-    def _is_class_member(self):
-        return self.objtype.endswith('method') or self.objtype.startswith('attr')
-
-    def add_target_and_index(self, name_cls, sig, signode):
-        if self.objtype == 'global':
-            modname = ''
-        else:
-            modname = self.options.get(
-                'module', self.env.temp_data.get('rb:module'))
-        separator = separators[self.objtype]
-        if self._is_class_member():
-            if signode['class']:
-                prefix = modname and modname + '::' or ''
-            else:
-                prefix = modname and modname + separator or ''
-        else:
-            prefix = modname and modname + separator or ''
-        fullname = prefix + name_cls[0]
-        # note target
-        if fullname not in self.state.document.ids:
-            signode['names'].append(fullname)
-            signode['ids'].append(fullname)
-            signode['first'] = (not self.names)
-            self.state.document.note_explicit_target(signode)
-            objects = self.env.domaindata['rb']['objects']
-            if fullname in objects:
-                self.env.warn(
-                    self.env.docname,
-                    'duplicate object description of %s, ' % fullname +
-                    'other instance in ' +
-                    self.env.doc2path(objects[fullname][0]),
-                    self.lineno)
-            objects[fullname] = (self.env.docname, self.objtype)
-
-        indextext = self.get_index_text(modname, name_cls)
-        if indextext:
-            self.indexnode['entries'].append(
-                _make_index('single', indextext, fullname, fullname))
-
-    def before_content(self):
-        # needed for automatic qualification of members (reset in subclasses)
-        self.clsname_set = False
-
-    def after_content(self):
-        if self.clsname_set:
-            self.env.temp_data['rb:class'] = None
-
-
-class RubyModulelevel(RubyObject):
-    """
-    Description of an object on module level (functions, data).
-    """
-
-    def needs_arglist(self):
-        return self.objtype == 'function'
-
-    def get_index_text(self, modname, name_cls):
-        if self.objtype == 'function':
-            if not modname:
-                return _('%s() (global function)') % name_cls[0]
-            return _('%s() (module function in %s)') % (name_cls[0], modname)
-        else:
-            return ''
-
-
-class RubyGloballevel(RubyObject):
-    """
-    Description of an object on module level (functions, data).
-    """
-
-    def get_index_text(self, modname, name_cls):
-        if self.objtype == 'global':
-            return _('%s (global variable)') % name_cls[0]
-        else:
-            return ''
-
-
-class RubyEverywhere(RubyObject):
-    """
-    Description of a class member (methods, attributes).
-    """
-
-    def needs_arglist(self):
-        return self.objtype == 'method'
-
-    def get_index_text(self, modname, name_cls):
-        name, cls = name_cls
-        add_modules = self.env.config.add_module_names
-        if self.objtype == 'method':
-            try:
-                clsname, methname = ruby_rsplit(name)
-            except ValueError:
-                if modname:
-                    return _('%s() (in module %s)') % (name, modname)
-                else:
-                    return '%s()' % name
-            if modname and add_modules:
-                return _('%s() (%s::%s method)') % (methname, modname,
-                                                          clsname)
-            else:
-                return _('%s() (%s method)') % (methname, clsname)
-        else:
-            return ''
-
-
-class RubyClasslike(RubyObject):
-    """
-    Description of a class-like object (classes, exceptions).
-    """
-
-    def get_signature_prefix(self, sig):
-        return self.objtype + ' '
-
-    def get_index_text(self, modname, name_cls):
-        if self.objtype == 'class':
-            if not modname:
-                return _('%s (class)') % name_cls[0]
-            return _('%s (class in %s)') % (name_cls[0], modname)
-        elif self.objtype == 'exception':
-            return name_cls[0]
-        else:
-            return ''
-
-    def before_content(self):
-        RubyObject.before_content(self)
-        if self.names:
-            self.env.temp_data['rb:class'] = self.names[0][0]
-            self.clsname_set = True
-
-
-class RubyClassmember(RubyObject):
-    """
-    Description of a class member (methods, attributes).
-    """
-
-    def needs_arglist(self):
-        return self.objtype.endswith('method')
-
-    def get_signature_prefix(self, sig):
-        if self.objtype == 'classmethod':
-            return "classmethod %s." % self.class_name
-        elif self.objtype == 'attr_reader':
-            return "attribute [R] "
-        elif self.objtype == 'attr_writer':
-            return "attribute [W] "
-        elif self.objtype == 'attr_accessor':
-            return "attribute [R/W] "
-        return ''
-
-    def get_index_text(self, modname, name_cls):
-        name, cls = name_cls
-        add_modules = self.env.config.add_module_names
-        if self.objtype == 'classmethod':
-            try:
-                clsname, methname = ruby_rsplit(name)
-            except ValueError:
-                return '%s()' % name
-            if modname:
-                return _('%s() (%s.%s class method)') % (methname, modname,
-                                                         clsname)
-            else:
-                return _('%s() (%s class method)') % (methname, clsname)
-        elif self.objtype.startswith('attr'):
-            try:
-                clsname, attrname = ruby_rsplit(name)
-            except ValueError:
-                return name
-            if modname and add_modules:
-                return _('%s (%s.%s attribute)') % (attrname, modname, clsname)
-            else:
-                return _('%s (%s attribute)') % (attrname, clsname)
-        else:
-            return ''
-
-    def before_content(self):
-        RubyObject.before_content(self)
-        lastname = self.names and self.names[-1][1]
-        if lastname and not self.env.temp_data.get('rb:class'):
-            self.env.temp_data['rb:class'] = lastname.strip('.')
-            self.clsname_set = True
-
-
-class RubyModule(Directive):
-    """
-    Directive to mark description of a new module.
-    """
-
-    has_content = False
-    required_arguments = 1
-    optional_arguments = 0
-    final_argument_whitespace = False
-    option_spec = {
-        'platform': lambda x: x,
-        'synopsis': lambda x: x,
-        'noindex': directives.flag,
-        'deprecated': directives.flag,
-    }
-
-    def run(self):
-        env = self.state.document.settings.env
-        modname = self.arguments[0].strip()
-        noindex = 'noindex' in self.options
-        env.temp_data['rb:module'] = modname
-        env.domaindata['rb']['modules'][modname] = \
-            (env.docname, self.options.get('synopsis', ''),
-             self.options.get('platform', ''), 'deprecated' in self.options)
-        targetnode = nodes.target('', '', ids=['module-' + modname], ismod=True)
-        self.state.document.note_explicit_target(targetnode)
-        ret = [targetnode]
-        # XXX this behavior of the module directive is a mess...
-        if 'platform' in self.options:
-            platform = self.options['platform']
-            node = nodes.paragraph()
-            node += nodes.emphasis('', _('Platforms: '))
-            node += nodes.Text(platform, platform)
-            ret.append(node)
-        # the synopsis isn't printed; in fact, it is only used in the
-        # modindex currently
-        if not noindex:
-            indextext = _('%s (module)') % modname
-            inode = addnodes.index(entries=[_make_index(
-                'single', indextext, 'module-' + modname, modname)])
-            ret.append(inode)
-        return ret
-
-def _make_index(entrytype, entryname, target, ignored, key=None):
-    # Sphinx 1.4 introduced backward incompatible changes, it now
-    # requires 5 tuples.  Last one is categorization key.  See
-    # http://www.sphinx-doc.org/en/stable/extdev/nodes.html#sphinx.addnodes.index
-    if version_info >= (1, 4, 0, '', 0):
-        return (entrytype, entryname, target, ignored, key)
-    else:
-        return (entrytype, entryname, target, ignored)
-
-class RubyCurrentModule(Directive):
-    """
-    This directive is just to tell Sphinx that we're documenting
-    stuff in module foo, but links to module foo won't lead here.
-    """
-
-    has_content = False
-    required_arguments = 1
-    optional_arguments = 0
-    final_argument_whitespace = False
-    option_spec = {}
-
-    def run(self):
-        env = self.state.document.settings.env
-        modname = self.arguments[0].strip()
-        if modname == 'None':
-            env.temp_data['rb:module'] = None
-        else:
-            env.temp_data['rb:module'] = modname
-        return []
-
-
-class RubyXRefRole(XRefRole):
-    def process_link(self, env, refnode, has_explicit_title, title, target):
-        if not has_explicit_title:
-            title = title.lstrip('.')   # only has a meaning for the target
-            title = title.lstrip('#')
-            if title.startswith("::"):
-                title = title[2:]
-            target = target.lstrip('~') # only has a meaning for the title
-            # if the first character is a tilde, don't display the module/class
-            # parts of the contents
-            if title[0:1] == '~':
-                m = re.search(r"(?:\.)?(?:#)?(?:::)?(.*)\Z", title)
-                if m:
-                    title = m.group(1)
-        if not title.startswith("$"):
-            refnode['rb:module'] = env.temp_data.get('rb:module')
-            refnode['rb:class'] = env.temp_data.get('rb:class')
-        # if the first character is a dot, search more specific namespaces first
-        # else search builtins first
-        if target[0:1] == '.':
-            target = target[1:]
-            refnode['refspecific'] = True
-        return title, target
-
-
-class RubyModuleIndex(Index):
-    """
-    Index subclass to provide the Ruby module index.
-    """
-
-    name = 'modindex'
-    localname = l_('Ruby Module Index')
-    shortname = l_('modules')
-
-    def generate(self, docnames=None):
-        content = {}
-        # list of prefixes to ignore
-        ignores = self.domain.env.config['modindex_common_prefix']
-        ignores = sorted(ignores, key=len, reverse=True)
-        # list of all modules, sorted by module name
-        modules = sorted(_iteritems(self.domain.data['modules']),
-                         key=lambda x: x[0].lower())
-        # sort out collapsable modules
-        prev_modname = ''
-        num_toplevels = 0
-        for modname, (docname, synopsis, platforms, deprecated) in modules:
-            if docnames and docname not in docnames:
-                continue
-
-            for ignore in ignores:
-                if modname.startswith(ignore):
-                    modname = modname[len(ignore):]
-                    stripped = ignore
-                    break
-            else:
-                stripped = ''
-
-            # we stripped the whole module name?
-            if not modname:
-                modname, stripped = stripped, ''
-
-            entries = content.setdefault(modname[0].lower(), [])
-
-            package = modname.split('::')[0]
-            if package != modname:
-                # it's a submodule
-                if prev_modname == package:
-                    # first submodule - make parent a group head
-                    entries[-1][1] = 1
-                elif not prev_modname.startswith(package):
-                    # submodule without parent in list, add dummy entry
-                    entries.append([stripped + package, 1, '', '', '', '', ''])
-                subtype = 2
-            else:
-                num_toplevels += 1
-                subtype = 0
-
-            qualifier = deprecated and _('Deprecated') or ''
-            entries.append([stripped + modname, subtype, docname,
-                            'module-' + stripped + modname, platforms,
-                            qualifier, synopsis])
-            prev_modname = modname
-
-        # apply heuristics when to collapse modindex at page load:
-        # only collapse if number of toplevel modules is larger than
-        # number of submodules
-        collapse = len(modules) - num_toplevels < num_toplevels
-
-        # sort by first letter
-        content = sorted(_iteritems(content))
-
-        return content, collapse
-
-
-class RubyDomain(Domain):
-    """Ruby language domain."""
-    name = 'rb'
-    label = 'Ruby'
-    object_types = {
-        'function':        ObjType(l_('function'),         'func', 'obj'),
-        'global':          ObjType(l_('global variable'),  'global', 'obj'),
-        'method':          ObjType(l_('method'),           'meth', 'obj'),
-        'class':           ObjType(l_('class'),            'class', 'obj'),
-        'exception':       ObjType(l_('exception'),        'exc', 'obj'),
-        'classmethod':     ObjType(l_('class method'),     'meth', 'obj'),
-        'attr_reader':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_writer':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_accessor':   ObjType(l_('attribute'),        'attr', 'obj'),
-        'const':           ObjType(l_('const'),            'const', 'obj'),
-        'module':          ObjType(l_('module'),           'mod', 'obj'),
-    }
-
-    directives = {
-        'function':        RubyModulelevel,
-        'global':          RubyGloballevel,
-        'method':          RubyEverywhere,
-        'const':           RubyEverywhere,
-        'class':           RubyClasslike,
-        'exception':       RubyClasslike,
-        'classmethod':     RubyClassmember,
-        'attr_reader':     RubyClassmember,
-        'attr_writer':     RubyClassmember,
-        'attr_accessor':   RubyClassmember,
-        'module':          RubyModule,
-        'currentmodule':   RubyCurrentModule,
-    }
-
-    roles = {
-        'func':  RubyXRefRole(fix_parens=False),
-        'global':RubyXRefRole(),
-        'class': RubyXRefRole(),
-        'exc':   RubyXRefRole(),
-        'meth':  RubyXRefRole(fix_parens=False),
-        'attr':  RubyXRefRole(),
-        'const': RubyXRefRole(),
-        'mod':   RubyXRefRole(),
-        'obj':   RubyXRefRole(),
-    }
-    initial_data = {
-        'objects': {},  # fullname -> docname, objtype
-        'modules': {},  # modname -> docname, synopsis, platform, deprecated
-    }
-    indices = [
-        RubyModuleIndex,
-    ]
-
-    def clear_doc(self, docname):
-        for fullname, (fn, _) in list(self.data['objects'].items()):
-            if fn == docname:
-                del self.data['objects'][fullname]
-        for modname, (fn, _, _, _) in list(self.data['modules'].items()):
-            if fn == docname:
-                del self.data['modules'][modname]
-
-    def find_obj(self, env, modname, classname, name, type, searchorder=0):
-        """
-        Find a Ruby object for "name", perhaps using the given module and/or
-        classname.
-        """
-        # skip parens
-        if name[-2:] == '()':
-            name = name[:-2]
-
-        if not name:
-            return None, None
-
-        objects = self.data['objects']
-
-        newname = None
-        if searchorder == 1:
-            if modname and classname and \
-                     modname + '::' + classname + '#' + name in objects:
-                newname = modname + '::' + classname + '#' + name
-            elif modname and classname and \
-                     modname + '::' + classname + '.' + name in objects:
-                newname = modname + '::' + classname + '.' + name
-            elif modname and modname + '::' + name in objects:
-                newname = modname + '::' + name
-            elif modname and modname + '#' + name in objects:
-                newname = modname + '#' + name
-            elif modname and modname + '.' + name in objects:
-                newname = modname + '.' + name
-            elif classname and classname + '.' + name in objects:
-                newname = classname + '.' + name
-            elif classname and classname + '#' + name in objects:
-                newname = classname + '#' + name
-            elif name in objects:
-                newname = name
-        else:
-            if name in objects:
-                newname = name
-            elif classname and classname + '.' + name in objects:
-                newname = classname + '.' + name
-            elif classname and classname + '#' + name in objects:
-                newname = classname + '#' + name
-            elif modname and modname + '::' + name in objects:
-                newname = modname + '::' + name
-            elif modname and modname + '#' + name in objects:
-                newname = modname + '#' + name
-            elif modname and modname + '.' + name in objects:
-                newname = modname + '.' + name
-            elif modname and classname and \
-                     modname + '::' + classname + '#' + name in objects:
-                newname = modname + '::' + classname + '#' + name
-            elif modname and classname and \
-                     modname + '::' + classname + '.' + name in objects:
-                newname = modname + '::' + classname + '.' + name
-            # special case: object methods
-            elif type in ('func', 'meth') and '.' not in name and \
-                 'object.' + name in objects:
-                newname = 'object.' + name
-        if newname is None:
-            return None, None
-        return newname, objects[newname]
-
-    def resolve_xref(self, env, fromdocname, builder,
-                     typ, target, node, contnode):
-        if (typ == 'mod' or
-            typ == 'obj' and target in self.data['modules']):
-            docname, synopsis, platform, deprecated = \
-                self.data['modules'].get(target, ('','','', ''))
-            if not docname:
-                return None
-            else:
-                title = '%s%s%s' % ((platform and '(%s) ' % platform),
-                                    synopsis,
-                                    (deprecated and ' (deprecated)' or ''))
-                return make_refnode(builder, fromdocname, docname,
-                                    'module-' + target, contnode, title)
-        else:
-            modname = node.get('rb:module')
-            clsname = node.get('rb:class')
-            searchorder = node.hasattr('refspecific') and 1 or 0
-            name, obj = self.find_obj(env, modname, clsname,
-                                      target, typ, searchorder)
-            if not obj:
-                return None
-            else:
-                return make_refnode(builder, fromdocname, obj[0], name,
-                                    contnode, name)
-
-    def get_objects(self):
-        for modname, info in _iteritems(self.data['modules']):
-            yield (modname, modname, 'module', info[0], 'module-' + modname, 0)
-        for refname, (docname, type) in _iteritems(self.data['objects']):
-            yield (refname, refname, type, docname, refname, 1)
-
-
-def setup(app):
-    app.add_domain(RubyDomain)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,456 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "H2LOAD" "1" "Sep 02, 2018" "1.33.0" "nghttp2"
-.SH NAME
-h2load \- HTTP/2 benchmarking tool
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-\fBh2load\fP [OPTIONS]... [URI]...
-.SH DESCRIPTION
-.sp
-benchmarking tool for HTTP/2 server
-.INDENT 0.0
-.TP
-.B <URI>
-Specify URI to access.   Multiple URIs can be specified.
-URIs are used  in this order for each  client.  All URIs
-are used, then  first URI is used and then  2nd URI, and
-so  on.  The  scheme, host  and port  in the  subsequent
-URIs, if present,  are ignored.  Those in  the first URI
-are used solely.  Definition of a base URI overrides all
-scheme, host or port values.
-.UNINDENT
-.SH OPTIONS
-.INDENT 0.0
-.TP
-.B \-n, \-\-requests=<N>
-Number of  requests across all  clients.  If it  is used
-with \fI\%\-\-timing\-script\-file\fP option,  this option specifies
-the number of requests  each client performs rather than
-the number of requests  across all clients.  This option
-is ignored if timing\-based  benchmarking is enabled (see
-\fI\%\-\-duration\fP option).
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-c, \-\-clients=<N>
-Number  of concurrent  clients.   With  \fI\%\-r\fP option,  this
-specifies the maximum number of connections to be made.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-t, \-\-threads=<N>
-Number of native threads.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-i, \-\-input\-file=<PATH>
-Path of a file with multiple URIs are separated by EOLs.
-This option will disable URIs getting from command\-line.
-If \(aq\-\(aq is given as <PATH>, URIs will be read from stdin.
-URIs are used  in this order for each  client.  All URIs
-are used, then  first URI is used and then  2nd URI, and
-so  on.  The  scheme, host  and port  in the  subsequent
-URIs, if present,  are ignored.  Those in  the first URI
-are used solely.  Definition of a base URI overrides all
-scheme, host or port values.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-m, \-\-max\-concurrent\-streams=<N>
-Max  concurrent  streams  to issue  per  session.   When
-http/1.1  is used,  this  specifies the  number of  HTTP
-pipelining requests in\-flight.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-w, \-\-window\-bits=<N>
-Sets the stream level initial window size to (2**<N>)\-1.
-.sp
-Default: \fB30\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-W, \-\-connection\-window\-bits=<N>
-Sets  the  connection  level   initial  window  size  to
-(2**<N>)\-1.
-.sp
-Default: \fB30\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-H, \-\-header=<HEADER>
-Add/Override a header to the requests.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ciphers=<SUITE>
-Set allowed  cipher list.  The  format of the  string is
-described in OpenSSL ciphers(1).
-.sp
-Default: \fBECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:ECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-SHA384:ECDHE\-RSA\-AES256\-SHA384:ECDHE\-ECDSA\-AES128\-SHA256:ECDHE\-RSA\-AES128\-SHA256\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-p, \-\-no\-tls\-proto=<PROTOID>
-Specify ALPN identifier of the  protocol to be used when
-accessing http URI without SSL/TLS.
-Available protocols: h2c and http/1.1
-.sp
-Default: \fBh2c\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-d, \-\-data=<PATH>
-Post FILE to  server.  The request method  is changed to
-POST.   For  http/1.1 connection,  if  \fI\%\-d\fP  is used,  the
-maximum number of in\-flight pipelined requests is set to
-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-r, \-\-rate=<N>
-Specifies  the  fixed  rate  at  which  connections  are
-created.   The   rate  must   be  a   positive  integer,
-representing the  number of  connections to be  made per
-rate period.   The maximum  number of connections  to be
-made  is  given  in  \fI\%\-c\fP   option.   This  rate  will  be
-distributed among  threads as  evenly as  possible.  For
-example,  with   \fI\%\-t\fP2  and   \fI\%\-r\fP4,  each  thread   gets  2
-connections per period.  When the rate is 0, the program
-will run  as it  normally does, creating  connections at
-whatever variable rate it  wants.  The default value for
-this option is 0.  \fI\%\-r\fP and \fI\%\-D\fP are mutually exclusive.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-rate\-period=<DURATION>
-Specifies the time  period between creating connections.
-The period  must be a positive  number, representing the
-length of the period in time.  This option is ignored if
-the rate option is not used.  The default value for this
-option is 1s.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-D, \-\-duration=<N>
-Specifies the main duration for the measurements in case
-of timing\-based  benchmarking.  \fI\%\-D\fP  and \fI\%\-r\fP  are mutually
-exclusive.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-warm\-up\-time=<DURATION>
-Specifies the  time  period  before  starting the actual
-measurements, in  case  of  timing\-based benchmarking.
-Needs to provided along with \fI\%\-D\fP option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-T, \-\-connection\-active\-timeout=<DURATION>
-Specifies  the maximum  time that  h2load is  willing to
-keep a  connection open,  regardless of the  activity on
-said connection.  <DURATION> must be a positive integer,
-specifying the amount of time  to wait.  When no timeout
-value is  set (either  active or inactive),  h2load will
-keep  a  connection  open indefinitely,  waiting  for  a
-response.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-N, \-\-connection\-inactivity\-timeout=<DURATION>
-Specifies the amount  of time that h2load  is willing to
-wait to see activity  on a given connection.  <DURATION>
-must  be a  positive integer,  specifying the  amount of
-time  to wait.   When no  timeout value  is set  (either
-active or inactive), h2load  will keep a connection open
-indefinitely, waiting for a response.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-timing\-script\-file=<PATH>
-Path of a file containing one or more lines separated by
-EOLs.  Each script line is composed of two tab\-separated
-fields.  The first field represents the time offset from
-the start of execution, expressed as a positive value of
-milliseconds  with microsecond  resolution.  The  second
-field represents the URI.  This option will disable URIs
-getting from  command\-line.  If \(aq\-\(aq is  given as <PATH>,
-script lines will be read  from stdin.  Script lines are
-used in order for each client.   If \fI\%\-n\fP is given, it must
-be less  than or  equal to the  number of  script lines,
-larger values are clamped to the number of script lines.
-If \fI\%\-n\fP is not given,  the number of requests will default
-to the  number of  script lines.   The scheme,  host and
-port defined in  the first URI are  used solely.  Values
-contained  in  other  URIs,  if  present,  are  ignored.
-Definition of a  base URI overrides all  scheme, host or
-port values.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-B, \-\-base\-uri=(<URI>|unix:<PATH>)
-Specify URI from which the scheme, host and port will be
-used  for  all requests.   The  base  URI overrides  all
-values  defined either  at  the command  line or  inside
-input files.  If argument  starts with "unix:", then the
-rest  of the  argument will  be treated  as UNIX  domain
-socket path.   The connection is made  through that path
-instead of TCP.   In this case, scheme  is inferred from
-the first  URI appeared  in the  command line  or inside
-input files as usual.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-npn\-list=<LIST>
-Comma delimited list of  ALPN protocol identifier sorted
-in the  order of preference.  That  means most desirable
-protocol comes  first.  This  is used  in both  ALPN and
-NPN.  The parameter must be  delimited by a single comma
-only  and any  white spaces  are  treated as  a part  of
-protocol string.
-.sp
-Default: \fBh2,h2\-16,h2\-14,http/1.1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-h1
-Short        hand         for        \fI\%\-\-npn\-list\fP=http/1.1
-\fI\%\-\-no\-tls\-proto\fP=http/1.1,    which   effectively    force
-http/1.1 for both http and https URI.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-header\-table\-size=<SIZE>
-Specify decoder header table size.
-.sp
-Default: \fB4K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-encoder\-header\-table\-size=<SIZE>
-Specify encoder header table size.  The decoder (server)
-specifies  the maximum  dynamic table  size it  accepts.
-Then the negotiated dynamic table size is the minimum of
-this option value and the value which server specified.
-.sp
-Default: \fB4K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-v, \-\-verbose
-Output debug information.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Display version information and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Display this help and exit.
-.UNINDENT
-.sp
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-.sp
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-.SH OUTPUT
-.INDENT 0.0
-.TP
-.B requests
-.INDENT 7.0
-.TP
-.B total
-The number of requests h2load was instructed to make.
-.TP
-.B started
-The number of requests h2load has started.
-.TP
-.B done
-The number of requests completed.
-.TP
-.B succeeded
-The number of requests completed successfully.  Only HTTP status
-code 2xx or3xx are considered as success.
-.TP
-.B failed
-The number of requests failed, including HTTP level failures
-(non\-successful HTTP status code).
-.TP
-.B errored
-The number of requests failed, except for HTTP level failures.
-This is the subset of the number reported in \fBfailed\fP and most
-likely the network level failures or stream was reset by
-RST_STREAM.
-.TP
-.B timeout
-The number of requests whose connection timed out before they were
-completed.   This  is  the  subset   of  the  number  reported  in
-\fBerrored\fP\&.
-.UNINDENT
-.TP
-.B status codes
-The number of status code h2load received.
-.TP
-.B traffic
-.INDENT 7.0
-.TP
-.B total
-The number of bytes received from the server "on the wire".  If
-requests were made via TLS, this value is the number of decrypted
-bytes.
-.TP
-.B headers
-The  number  of response  header  bytes  from the  server  without
-decompression.  The  \fBspace savings\fP shows efficiency  of header
-compression.  Let \fBdecompressed(headers)\fP to the number of bytes
-used for header fields after decompression.  The \fBspace savings\fP
-is calculated  by (1 \- \fBheaders\fP  / \fBdecompressed(headers)\fP) *
-100.  For HTTP/1.1, this is usually  0.00%, since it does not have
-header compression.  For HTTP/2, it shows some insightful numbers.
-.TP
-.B data
-The number of response body bytes received from the server.
-.UNINDENT
-.TP
-.B time for request
-.INDENT 7.0
-.TP
-.B min
-The minimum time taken for request and response.
-.TP
-.B max
-The maximum time taken for request and response.
-.TP
-.B mean
-The mean time taken for request and response.
-.TP
-.B sd
-The standard deviation of the time taken for request and response.
-.TP
-.B +/\- sd
-The fraction of the number of requests within standard deviation
-range (mean +/\- sd) against total number of successful requests.
-.UNINDENT
-.TP
-.B time for connect
-.INDENT 7.0
-.TP
-.B min
-The minimum time taken to connect to a server.
-.TP
-.B max
-The maximum time taken to connect to a server.
-.TP
-.B mean
-The mean time taken to connect to a server.
-.TP
-.B sd
-The standard deviation of the time taken to connect to a server.
-.TP
-.B +/\- sd
-The  fraction  of  the   number  of  connections  within  standard
-deviation range (mean  +/\- sd) against total  number of successful
-connections.
-.UNINDENT
-.TP
-.B time for 1st byte (of (decrypted in case of TLS) application data)
-.INDENT 7.0
-.TP
-.B min
-The minimum time taken to get 1st byte from a server.
-.TP
-.B max
-The maximum time taken to get 1st byte from a server.
-.TP
-.B mean
-The mean time taken to get 1st byte from a server.
-.TP
-.B sd
-The standard deviation of the time taken to get 1st byte from a
-server.
-.TP
-.B +/\- sd
-The fraction of the number of connections within standard
-deviation range (mean +/\- sd) against total number of successful
-connections.
-.UNINDENT
-.TP
-.B req/s
-.INDENT 7.0
-.TP
-.B min
-The minimum request per second among all clients.
-.TP
-.B max
-The maximum request per second among all clients.
-.TP
-.B mean
-The mean request per second among all clients.
-.TP
-.B sd
-The standard deviation of request per second among all clients.
-server.
-.TP
-.B +/\- sd
-The fraction of the number of connections within standard
-deviation range (mean +/\- sd) against total number of successful
-connections.
-.UNINDENT
-.UNINDENT
-.SH FLOW CONTROL
-.sp
-h2load sets large flow control window by default, and effectively
-disables flow control to avoid under utilization of server
-performance.  To set smaller flow control window, use \fI\%\-w\fP and
-\fI\%\-W\fP options.  For example, use \fB\-w16 \-W16\fP to set default
-window size described in HTTP/2 protocol specification.
-.SH SEE ALSO
-.sp
-\fBnghttp(1)\fP, \fBnghttpd(1)\fP, \fBnghttpx(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.1.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: h2load
-
-h2load(1)
-=========
-
-SYNOPSIS
---------
-
-**h2load** [OPTIONS]... [URI]...
-
-DESCRIPTION
------------
-
-benchmarking tool for HTTP/2 server
-
-.. describe:: <URI>
-
-    Specify URI to access.   Multiple URIs can be specified.
-    URIs are used  in this order for each  client.  All URIs
-    are used, then  first URI is used and then  2nd URI, and
-    so  on.  The  scheme, host  and port  in the  subsequent
-    URIs, if present,  are ignored.  Those in  the first URI
-    are used solely.  Definition of a base URI overrides all
-    scheme, host or port values.
-
-OPTIONS
--------
-
-.. option:: -n, --requests=<N>
-
-    Number of  requests across all  clients.  If it  is used
-    with :option:`--timing-script-file` option,  this option specifies
-    the number of requests  each client performs rather than
-    the number of requests  across all clients.  This option
-    is ignored if timing-based  benchmarking is enabled (see
-    :option:`--duration` option).
-
-    Default: ``1``
-
-.. option:: -c, --clients=<N>
-
-    Number  of concurrent  clients.   With  :option:`-r` option,  this
-    specifies the maximum number of connections to be made.
-
-    Default: ``1``
-
-.. option:: -t, --threads=<N>
-
-    Number of native threads.
-
-    Default: ``1``
-
-.. option:: -i, --input-file=<PATH>
-
-    Path of a file with multiple URIs are separated by EOLs.
-    This option will disable URIs getting from command-line.
-    If '-' is given as <PATH>, URIs will be read from stdin.
-    URIs are used  in this order for each  client.  All URIs
-    are used, then  first URI is used and then  2nd URI, and
-    so  on.  The  scheme, host  and port  in the  subsequent
-    URIs, if present,  are ignored.  Those in  the first URI
-    are used solely.  Definition of a base URI overrides all
-    scheme, host or port values.
-
-.. option:: -m, --max-concurrent-streams=<N>
-
-    Max  concurrent  streams  to issue  per  session.   When
-    http/1.1  is used,  this  specifies the  number of  HTTP
-    pipelining requests in-flight.
-
-    Default: ``1``
-
-.. option:: -w, --window-bits=<N>
-
-    Sets the stream level initial window size to (2\*\*<N>)-1.
-
-    Default: ``30``
-
-.. option:: -W, --connection-window-bits=<N>
-
-    Sets  the  connection  level   initial  window  size  to
-    (2\*\*<N>)-1.
-
-    Default: ``30``
-
-.. option:: -H, --header=<HEADER>
-
-    Add/Override a header to the requests.
-
-.. option:: --ciphers=<SUITE>
-
-    Set allowed  cipher list.  The  format of the  string is
-    described in OpenSSL ciphers(1).
-
-    Default: ``ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256``
-
-.. option:: -p, --no-tls-proto=<PROTOID>
-
-    Specify ALPN identifier of the  protocol to be used when
-    accessing http URI without SSL/TLS.
-    Available protocols: h2c and http/1.1
-
-    Default: ``h2c``
-
-.. option:: -d, --data=<PATH>
-
-    Post FILE to  server.  The request method  is changed to
-    POST.   For  http/1.1 connection,  if  :option:`-d`  is used,  the
-    maximum number of in-flight pipelined requests is set to
-    1.
-
-.. option:: -r, --rate=<N>
-
-    Specifies  the  fixed  rate  at  which  connections  are
-    created.   The   rate  must   be  a   positive  integer,
-    representing the  number of  connections to be  made per
-    rate period.   The maximum  number of connections  to be
-    made  is  given  in  :option:`-c`   option.   This  rate  will  be
-    distributed among  threads as  evenly as  possible.  For
-    example,  with   :option:`-t`\2  and   :option:`-r`\4,  each  thread   gets  2
-    connections per period.  When the rate is 0, the program
-    will run  as it  normally does, creating  connections at
-    whatever variable rate it  wants.  The default value for
-    this option is 0.  :option:`-r` and :option:`\-D` are mutually exclusive.
-
-.. option:: --rate-period=<DURATION>
-
-    Specifies the time  period between creating connections.
-    The period  must be a positive  number, representing the
-    length of the period in time.  This option is ignored if
-    the rate option is not used.  The default value for this
-    option is 1s.
-
-.. option:: -D, --duration=<N>
-
-    Specifies the main duration for the measurements in case
-    of timing-based  benchmarking.  :option:`-D`  and :option:`\-r`  are mutually
-    exclusive.
-
-.. option:: --warm-up-time=<DURATION>
-
-    Specifies the  time  period  before  starting the actual
-    measurements, in  case  of  timing-based benchmarking.
-    Needs to provided along with :option:`-D` option.
-
-.. option:: -T, --connection-active-timeout=<DURATION>
-
-    Specifies  the maximum  time that  h2load is  willing to
-    keep a  connection open,  regardless of the  activity on
-    said connection.  <DURATION> must be a positive integer,
-    specifying the amount of time  to wait.  When no timeout
-    value is  set (either  active or inactive),  h2load will
-    keep  a  connection  open indefinitely,  waiting  for  a
-    response.
-
-.. option:: -N, --connection-inactivity-timeout=<DURATION>
-
-    Specifies the amount  of time that h2load  is willing to
-    wait to see activity  on a given connection.  <DURATION>
-    must  be a  positive integer,  specifying the  amount of
-    time  to wait.   When no  timeout value  is set  (either
-    active or inactive), h2load  will keep a connection open
-    indefinitely, waiting for a response.
-
-.. option:: --timing-script-file=<PATH>
-
-    Path of a file containing one or more lines separated by
-    EOLs.  Each script line is composed of two tab-separated
-    fields.  The first field represents the time offset from
-    the start of execution, expressed as a positive value of
-    milliseconds  with microsecond  resolution.  The  second
-    field represents the URI.  This option will disable URIs
-    getting from  command-line.  If '-' is  given as <PATH>,
-    script lines will be read  from stdin.  Script lines are
-    used in order for each client.   If :option:`-n` is given, it must
-    be less  than or  equal to the  number of  script lines,
-    larger values are clamped to the number of script lines.
-    If :option:`-n` is not given,  the number of requests will default
-    to the  number of  script lines.   The scheme,  host and
-    port defined in  the first URI are  used solely.  Values
-    contained  in  other  URIs,  if  present,  are  ignored.
-    Definition of a  base URI overrides all  scheme, host or
-    port values.
-
-.. option:: -B, --base-uri=(<URI>|unix:<PATH>)
-
-    Specify URI from which the scheme, host and port will be
-    used  for  all requests.   The  base  URI overrides  all
-    values  defined either  at  the command  line or  inside
-    input files.  If argument  starts with "unix:", then the
-    rest  of the  argument will  be treated  as UNIX  domain
-    socket path.   The connection is made  through that path
-    instead of TCP.   In this case, scheme  is inferred from
-    the first  URI appeared  in the  command line  or inside
-    input files as usual.
-
-.. option:: --npn-list=<LIST>
-
-    Comma delimited list of  ALPN protocol identifier sorted
-    in the  order of preference.  That  means most desirable
-    protocol comes  first.  This  is used  in both  ALPN and
-    NPN.  The parameter must be  delimited by a single comma
-    only  and any  white spaces  are  treated as  a part  of
-    protocol string.
-
-    Default: ``h2,h2-16,h2-14,http/1.1``
-
-.. option:: --h1
-
-    Short        hand         for        :option:`--npn-list`\=http/1.1
-    :option:`--no-tls-proto`\=http/1.1,    which   effectively    force
-    http/1.1 for both http and https URI.
-
-.. option:: --header-table-size=<SIZE>
-
-    Specify decoder header table size.
-
-    Default: ``4K``
-
-.. option:: --encoder-header-table-size=<SIZE>
-
-    Specify encoder header table size.  The decoder (server)
-    specifies  the maximum  dynamic table  size it  accepts.
-    Then the negotiated dynamic table size is the minimum of
-    this option value and the value which server specified.
-
-    Default: ``4K``
-
-.. option:: -v, --verbose
-
-    Output debug information.
-
-.. option:: --version
-
-    Display version information and exit.
-
-.. option:: -h, --help
-
-    Display this help and exit.
-
-
-
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-
-.. _h2load-1-output:
-
-OUTPUT
-------
-
-requests
-  total
-    The number of requests h2load was instructed to make.
-  started
-    The number of requests h2load has started.
-  done
-    The number of requests completed.
-  succeeded
-    The number of requests completed successfully.  Only HTTP status
-    code 2xx or3xx are considered as success.
-  failed
-    The number of requests failed, including HTTP level failures
-    (non-successful HTTP status code).
-  errored
-    The number of requests failed, except for HTTP level failures.
-    This is the subset of the number reported in ``failed`` and most
-    likely the network level failures or stream was reset by
-    RST_STREAM.
-  timeout
-    The number of requests whose connection timed out before they were
-    completed.   This  is  the  subset   of  the  number  reported  in
-    ``errored``.
-
-status codes
-  The number of status code h2load received.
-
-traffic
-  total
-    The number of bytes received from the server "on the wire".  If
-    requests were made via TLS, this value is the number of decrypted
-    bytes.
-  headers
-    The  number  of response  header  bytes  from the  server  without
-    decompression.  The  ``space savings`` shows efficiency  of header
-    compression.  Let ``decompressed(headers)`` to the number of bytes
-    used for header fields after decompression.  The ``space savings``
-    is calculated  by (1 - ``headers``  / ``decompressed(headers)``) *
-    100.  For HTTP/1.1, this is usually  0.00%, since it does not have
-    header compression.  For HTTP/2, it shows some insightful numbers.
-  data
-    The number of response body bytes received from the server.
-
-time for request
-  min
-    The minimum time taken for request and response.
-  max
-    The maximum time taken for request and response.
-  mean
-    The mean time taken for request and response.
-  sd
-    The standard deviation of the time taken for request and response.
-  +/- sd
-    The fraction of the number of requests within standard deviation
-    range (mean +/- sd) against total number of successful requests.
-
-time for connect
-  min
-    The minimum time taken to connect to a server.
-  max
-    The maximum time taken to connect to a server.
-  mean
-    The mean time taken to connect to a server.
-  sd
-    The standard deviation of the time taken to connect to a server.
-  +/- sd
-    The  fraction  of  the   number  of  connections  within  standard
-    deviation range (mean  +/- sd) against total  number of successful
-    connections.
-
-time for 1st byte (of (decrypted in case of TLS) application data)
-  min
-    The minimum time taken to get 1st byte from a server.
-  max
-    The maximum time taken to get 1st byte from a server.
-  mean
-    The mean time taken to get 1st byte from a server.
-  sd
-    The standard deviation of the time taken to get 1st byte from a
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-req/s
-  min
-    The minimum request per second among all clients.
-  max
-    The maximum request per second among all clients.
-  mean
-    The mean request per second among all clients.
-  sd
-    The standard deviation of request per second among all clients.
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-FLOW CONTROL
-------------
-
-h2load sets large flow control window by default, and effectively
-disables flow control to avoid under utilization of server
-performance.  To set smaller flow control window, use :option:`-w` and
-:option:`-W` options.  For example, use ``-w16 -W16`` to set default
-window size described in HTTP/2 protocol specification.
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.h2r cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.h2r
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.h2r	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load.h2r	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-.. _h2load-1-output:
-
-OUTPUT
-------
-
-requests
-  total
-    The number of requests h2load was instructed to make.
-  started
-    The number of requests h2load has started.
-  done
-    The number of requests completed.
-  succeeded
-    The number of requests completed successfully.  Only HTTP status
-    code 2xx or3xx are considered as success.
-  failed
-    The number of requests failed, including HTTP level failures
-    (non-successful HTTP status code).
-  errored
-    The number of requests failed, except for HTTP level failures.
-    This is the subset of the number reported in ``failed`` and most
-    likely the network level failures or stream was reset by
-    RST_STREAM.
-  timeout
-    The number of requests whose connection timed out before they were
-    completed.   This  is  the  subset   of  the  number  reported  in
-    ``errored``.
-
-status codes
-  The number of status code h2load received.
-
-traffic
-  total
-    The number of bytes received from the server "on the wire".  If
-    requests were made via TLS, this value is the number of decrypted
-    bytes.
-  headers
-    The  number  of response  header  bytes  from the  server  without
-    decompression.  The  ``space savings`` shows efficiency  of header
-    compression.  Let ``decompressed(headers)`` to the number of bytes
-    used for header fields after decompression.  The ``space savings``
-    is calculated  by (1 - ``headers``  / ``decompressed(headers)``) *
-    100.  For HTTP/1.1, this is usually  0.00%, since it does not have
-    header compression.  For HTTP/2, it shows some insightful numbers.
-  data
-    The number of response body bytes received from the server.
-
-time for request
-  min
-    The minimum time taken for request and response.
-  max
-    The maximum time taken for request and response.
-  mean
-    The mean time taken for request and response.
-  sd
-    The standard deviation of the time taken for request and response.
-  +/- sd
-    The fraction of the number of requests within standard deviation
-    range (mean +/- sd) against total number of successful requests.
-
-time for connect
-  min
-    The minimum time taken to connect to a server.
-  max
-    The maximum time taken to connect to a server.
-  mean
-    The mean time taken to connect to a server.
-  sd
-    The standard deviation of the time taken to connect to a server.
-  +/- sd
-    The  fraction  of  the   number  of  connections  within  standard
-    deviation range (mean  +/- sd) against total  number of successful
-    connections.
-
-time for 1st byte (of (decrypted in case of TLS) application data)
-  min
-    The minimum time taken to get 1st byte from a server.
-  max
-    The maximum time taken to get 1st byte from a server.
-  mean
-    The mean time taken to get 1st byte from a server.
-  sd
-    The standard deviation of the time taken to get 1st byte from a
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-req/s
-  min
-    The minimum request per second among all clients.
-  max
-    The maximum request per second among all clients.
-  mean
-    The mean request per second among all clients.
-  sd
-    The standard deviation of request per second among all clients.
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-FLOW CONTROL
-------------
-
-h2load sets large flow control window by default, and effectively
-disables flow control to avoid under utilization of server
-performance.  To set smaller flow control window, use :option:`-w` and
-:option:`-W` options.  For example, use ``-w16 -W16`` to set default
-window size described in HTTP/2 protocol specification.
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load-howto.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load-howto.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/h2load-howto.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/h2load-howto.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/h2load-howto.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/index.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/index.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/index.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/index.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/index.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/libnghttp2_asio.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/libnghttp2_asio.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/libnghttp2_asio.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/libnghttp2_asio.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/libnghttp2_asio.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/make.bat cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/make.bat
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/make.bat	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/make.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\nghttp2.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\nghttp2.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-man_MANS = nghttp.1 nghttpd.1 nghttpx.1 h2load.1
-
-APIDOCS= \
-	macros.rst \
-	enums.rst \
-	types.rst \
-	nghttp2_check_header_name.rst \
-	nghttp2_check_header_value.rst \
-	nghttp2_hd_deflate_bound.rst \
-	nghttp2_hd_deflate_change_table_size.rst \
-	nghttp2_hd_deflate_del.rst \
-	nghttp2_hd_deflate_get_dynamic_table_size.rst \
-	nghttp2_hd_deflate_get_max_dynamic_table_size.rst \
-	nghttp2_hd_deflate_get_num_table_entries.rst \
-	nghttp2_hd_deflate_get_table_entry.rst \
-	nghttp2_hd_deflate_hd.rst \
-	nghttp2_hd_deflate_hd_vec.rst \
-	nghttp2_hd_deflate_new.rst \
-	nghttp2_hd_deflate_new2.rst \
-	nghttp2_hd_inflate_change_table_size.rst \
-	nghttp2_hd_inflate_del.rst \
-	nghttp2_hd_inflate_end_headers.rst \
-	nghttp2_hd_inflate_get_dynamic_table_size.rst \
-	nghttp2_hd_inflate_get_max_dynamic_table_size.rst \
-	nghttp2_hd_inflate_get_num_table_entries.rst \
-	nghttp2_hd_inflate_get_table_entry.rst \
-	nghttp2_hd_inflate_hd.rst \
-	nghttp2_hd_inflate_hd2.rst \
-	nghttp2_hd_inflate_new.rst \
-	nghttp2_hd_inflate_new2.rst \
-	nghttp2_http2_strerror.rst \
-	nghttp2_is_fatal.rst \
-	nghttp2_nv_compare_name.rst \
-	nghttp2_option_del.rst \
-	nghttp2_option_new.rst \
-	nghttp2_option_set_builtin_recv_extension_type.rst \
-	nghttp2_option_set_max_deflate_dynamic_table_size.rst \
-	nghttp2_option_set_max_reserved_remote_streams.rst \
-	nghttp2_option_set_max_send_header_block_length.rst \
-	nghttp2_option_set_no_auto_ping_ack.rst \
-	nghttp2_option_set_no_auto_window_update.rst \
-	nghttp2_option_set_no_closed_streams.rst \
-	nghttp2_option_set_no_http_messaging.rst \
-	nghttp2_option_set_no_recv_client_magic.rst \
-	nghttp2_option_set_peer_max_concurrent_streams.rst \
-	nghttp2_option_set_user_recv_extension_type.rst \
-	nghttp2_pack_settings_payload.rst \
-	nghttp2_priority_spec_check_default.rst \
-	nghttp2_priority_spec_default_init.rst \
-	nghttp2_priority_spec_init.rst \
-	nghttp2_rcbuf_decref.rst \
-	nghttp2_rcbuf_get_buf.rst \
-	nghttp2_rcbuf_incref.rst \
-	nghttp2_rcbuf_is_static.rst \
-	nghttp2_select_next_protocol.rst \
-	nghttp2_session_callbacks_del.rst \
-	nghttp2_session_callbacks_new.rst \
-	nghttp2_session_callbacks_set_before_frame_send_callback.rst \
-	nghttp2_session_callbacks_set_data_source_read_length_callback.rst \
-	nghttp2_session_callbacks_set_error_callback.rst \
-	nghttp2_session_callbacks_set_error_callback2.rst \
-	nghttp2_session_callbacks_set_on_begin_frame_callback.rst \
-	nghttp2_session_callbacks_set_on_begin_headers_callback.rst \
-	nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_frame_not_send_callback.rst \
-	nghttp2_session_callbacks_set_on_frame_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_frame_send_callback.rst \
-	nghttp2_session_callbacks_set_on_header_callback.rst \
-	nghttp2_session_callbacks_set_on_header_callback2.rst \
-	nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_invalid_header_callback.rst \
-	nghttp2_session_callbacks_set_on_invalid_header_callback2.rst \
-	nghttp2_session_callbacks_set_on_stream_close_callback.rst \
-	nghttp2_session_callbacks_set_pack_extension_callback.rst \
-	nghttp2_session_callbacks_set_recv_callback.rst \
-	nghttp2_session_callbacks_set_select_padding_callback.rst \
-	nghttp2_session_callbacks_set_send_callback.rst \
-	nghttp2_session_callbacks_set_send_data_callback.rst \
-	nghttp2_session_callbacks_set_unpack_extension_callback.rst \
-	nghttp2_session_change_stream_priority.rst \
-	nghttp2_session_check_request_allowed.rst \
-	nghttp2_session_check_server_session.rst \
-	nghttp2_session_client_new.rst \
-	nghttp2_session_client_new2.rst \
-	nghttp2_session_client_new3.rst \
-	nghttp2_session_consume.rst \
-	nghttp2_session_consume_connection.rst \
-	nghttp2_session_consume_stream.rst \
-	nghttp2_session_create_idle_stream.rst \
-	nghttp2_session_del.rst \
-	nghttp2_session_find_stream.rst \
-	nghttp2_session_get_effective_local_window_size.rst \
-	nghttp2_session_get_effective_recv_data_length.rst \
-	nghttp2_session_get_hd_deflate_dynamic_table_size.rst \
-	nghttp2_session_get_hd_inflate_dynamic_table_size.rst \
-	nghttp2_session_get_last_proc_stream_id.rst \
-	nghttp2_session_get_local_settings.rst \
-	nghttp2_session_get_local_window_size.rst \
-	nghttp2_session_get_next_stream_id.rst \
-	nghttp2_session_get_outbound_queue_size.rst \
-	nghttp2_session_get_remote_settings.rst \
-	nghttp2_session_get_remote_window_size.rst \
-	nghttp2_session_get_root_stream.rst \
-	nghttp2_session_get_stream_effective_local_window_size.rst \
-	nghttp2_session_get_stream_effective_recv_data_length.rst \
-	nghttp2_session_get_stream_local_close.rst \
-	nghttp2_session_get_stream_local_window_size.rst \
-	nghttp2_session_get_stream_remote_close.rst \
-	nghttp2_session_get_stream_remote_window_size.rst \
-	nghttp2_session_get_stream_user_data.rst \
-	nghttp2_session_mem_recv.rst \
-	nghttp2_session_mem_send.rst \
-	nghttp2_session_recv.rst \
-	nghttp2_session_resume_data.rst \
-	nghttp2_session_send.rst \
-	nghttp2_session_server_new.rst \
-	nghttp2_session_server_new2.rst \
-	nghttp2_session_server_new3.rst \
-	nghttp2_session_set_local_window_size.rst \
-	nghttp2_session_set_next_stream_id.rst \
-	nghttp2_session_set_stream_user_data.rst \
-	nghttp2_session_set_user_data.rst \
-	nghttp2_session_terminate_session.rst \
-	nghttp2_session_terminate_session2.rst \
-	nghttp2_session_upgrade.rst \
-	nghttp2_session_upgrade2.rst \
-	nghttp2_session_want_read.rst \
-	nghttp2_session_want_write.rst \
-	nghttp2_set_debug_vprintf_callback.rst \
-	nghttp2_stream_get_first_child.rst \
-	nghttp2_stream_get_next_sibling.rst \
-	nghttp2_stream_get_parent.rst \
-	nghttp2_stream_get_previous_sibling.rst \
-	nghttp2_stream_get_state.rst \
-	nghttp2_stream_get_sum_dependency_weight.rst \
-	nghttp2_stream_get_weight.rst \
-	nghttp2_strerror.rst \
-	nghttp2_submit_altsvc.rst \
-	nghttp2_submit_data.rst \
-	nghttp2_submit_extension.rst \
-	nghttp2_submit_goaway.rst \
-	nghttp2_submit_headers.rst \
-	nghttp2_submit_origin.rst \
-	nghttp2_submit_ping.rst \
-	nghttp2_submit_priority.rst \
-	nghttp2_submit_push_promise.rst \
-	nghttp2_submit_request.rst \
-	nghttp2_submit_response.rst \
-	nghttp2_submit_rst_stream.rst \
-	nghttp2_submit_settings.rst \
-	nghttp2_submit_shutdown_notice.rst \
-	nghttp2_submit_trailer.rst \
-	nghttp2_submit_window_update.rst \
-	nghttp2_version.rst
-
-RST_FILES = \
-	README.rst \
-	programmers-guide.rst \
-	nghttp.1.rst \
-	nghttpd.1.rst \
-	nghttpx.1.rst \
-	h2load.1.rst
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	mkapiref.py \
-	$(RST_FILES) \
-	$(APIDOCS) \
-	sources/index.rst \
-	sources/tutorial-client.rst \
-	sources/tutorial-server.rst \
-	sources/tutorial-hpack.rst \
-	sources/nghttpx-howto.rst \
-	sources/h2load-howto.rst \
-	sources/libnghttp2_asio.rst \
-	sources/python-apiref.rst \
-	sources/building-android-binary.rst \
-	sources/contribute.rst \
-	_exts/sphinxcontrib/LICENSE.rubydomain \
-	_exts/sphinxcontrib/__init__.py \
-	_exts/sphinxcontrib/rubydomain.py \
-	_themes/sphinx_rtd_theme/__init__.py \
-	_themes/sphinx_rtd_theme/breadcrumbs.html \
-	_themes/sphinx_rtd_theme/footer.html \
-	_themes/sphinx_rtd_theme/layout.html \
-	_themes/sphinx_rtd_theme/layout_old.html \
-	_themes/sphinx_rtd_theme/search.html \
-	_themes/sphinx_rtd_theme/searchbox.html \
-	_themes/sphinx_rtd_theme/static/css/badge_only.css \
-	_themes/sphinx_rtd_theme/static/css/theme.css \
-	_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff \
-	_themes/sphinx_rtd_theme/static/js/theme.js \
-	_themes/sphinx_rtd_theme/theme.conf \
-	_themes/sphinx_rtd_theme/versions.html \
-	$(man_MANS) \
-	bash_completion/nghttp \
-	bash_completion/nghttpd \
-	bash_completion/nghttpx \
-	bash_completion/h2load
-
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = manual
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-apiref.rst: \
-	$(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
-	$(top_srcdir)/lib/includes/nghttp2/nghttp2.h
-	for i in $(RST_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
-	$(PYTHON) $(top_srcdir)/doc/mkapiref.py \
-	apiref.rst macros.rst enums.rst types.rst . $^
-
-$(APIDOCS): apiref.rst
-
-clean-local:
-	if [ $(srcdir) != $(builddir) ]; then for i in $(RST_FILES); do rm -f $(builddir)/$$i; done fi
-	-rm -f apiref.rst
-	-rm -f $(APIDOCS)
-	-rm -rf $(BUILDDIR)/*
-
-html-local: apiref.rst
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/nghttp2.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/nghttp2.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/nghttp2"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/nghttp2"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man: apiref.rst
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/mkapiref.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/mkapiref.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/mkapiref.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/mkapiref.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# Generates API reference from C source code.
-
-from __future__ import unicode_literals
-from __future__ import print_function # At least python 2.6 is required
-import re, sys, argparse, os.path
-
-class FunctionDoc:
-    def __init__(self, name, content, domain):
-        self.name = name
-        self.content = content
-        self.domain = domain
-        if self.domain == 'function':
-            self.funcname = re.search(r'(nghttp2_[^ )]+)\(', self.name).group(1)
-
-    def write(self, out):
-        out.write('.. {}:: {}\n'.format(self.domain, self.name))
-        out.write('\n')
-        for line in self.content:
-            out.write('    {}\n'.format(line))
-
-class StructDoc:
-    def __init__(self, name, content, members, member_domain):
-        self.name = name
-        self.content = content
-        self.members = members
-        self.member_domain = member_domain
-
-    def write(self, out):
-        if self.name:
-            out.write('.. type:: {}\n'.format(self.name))
-            out.write('\n')
-            for line in self.content:
-                out.write('    {}\n'.format(line))
-            out.write('\n')
-            for name, content in self.members:
-                out.write('    .. {}:: {}\n'.format(self.member_domain, name))
-                out.write('\n')
-                for line in content:
-                    out.write('        {}\n'.format(line))
-            out.write('\n')
-
-class MacroDoc:
-    def __init__(self, name, content):
-        self.name = name
-        self.content = content
-
-    def write(self, out):
-        out.write('''.. macro:: {}\n'''.format(self.name))
-        out.write('\n')
-        for line in self.content:
-            out.write('    {}\n'.format(line))
-
-def make_api_ref(infiles):
-    macros = []
-    enums = []
-    types = []
-    functions = []
-    for infile in infiles:
-        while True:
-            line = infile.readline()
-            if not line:
-                break
-            elif line == '/**\n':
-                line = infile.readline()
-                doctype = line.split()[1]
-                if doctype == '@function':
-                    functions.append(process_function('function', infile))
-                elif doctype == '@functypedef':
-                    types.append(process_function('type', infile))
-                elif doctype == '@struct' or doctype == '@union':
-                    types.append(process_struct(infile))
-                elif doctype == '@enum':
-                    enums.append(process_enum(infile))
-                elif doctype == '@macro':
-                    macros.append(process_macro(infile))
-    return macros, enums, types, functions
-
-    alldocs = [('Macros', macros),
-               ('Enums', enums),
-               ('Types (structs, unions and typedefs)', types),
-               ('Functions', functions)]
-
-def output(
-        indexfile, macrosfile, enumsfile, typesfile, funcsdir,
-        macros, enums, types, functions):
-    indexfile.write('''
-API Reference
-=============
-
-.. toctree::
-   :maxdepth: 1
-
-   macros
-   enums
-   types
-''')
-
-    for doc in functions:
-        indexfile.write('   {}\n'.format(doc.funcname))
-
-    macrosfile.write('''
-Macros
-======
-''')
-    for doc in macros:
-        doc.write(macrosfile)
-
-    enumsfile.write('''
-Enums
-=====
-''')
-    for doc in enums:
-        doc.write(enumsfile)
-
-    typesfile.write('''
-Types (structs, unions and typedefs)
-====================================
-''')
-    for doc in types:
-        doc.write(typesfile)
-
-    for doc in functions:
-        with open(os.path.join(funcsdir, doc.funcname + '.rst'), 'w') as f:
-            f.write('''
-{funcname}
-{secul}
-
-Synopsis
---------
-
-*#include <nghttp2/nghttp2.h>*
-
-'''.format(funcname=doc.funcname, secul='='*len(doc.funcname)))
-            doc.write(f)
-
-def process_macro(infile):
-    content = read_content(infile)
-    line = infile.readline()
-    macro_name = line.split()[1]
-    return MacroDoc(macro_name, content)
-
-def process_enum(infile):
-    members = []
-    enum_name = None
-    content = read_content(infile)
-    while True:
-        line = infile.readline()
-        if not line:
-            break
-        elif re.match(r'\s*/\*\*\n', line):
-            member_content = read_content(infile)
-            line = infile.readline()
-            items = line.split()
-            member_name = items[0]
-            if len(items) >= 3:
-                member_content.insert(0, '(``{}``) '\
-                                      .format(' '.join(items[2:]).rstrip(',')))
-            members.append((member_name, member_content))
-        elif line.startswith('}'):
-            enum_name = line.rstrip().split()[1]
-            enum_name = re.sub(r';$', '', enum_name)
-            break
-    return StructDoc(enum_name, content, members, 'macro')
-
-def process_struct(infile):
-    members = []
-    struct_name = None
-    content = read_content(infile)
-    while True:
-        line = infile.readline()
-        if not line:
-            break
-        elif re.match(r'\s*/\*\*\n', line):
-            member_content = read_content(infile)
-            line = infile.readline()
-            member_name = line.rstrip().rstrip(';')
-            members.append((member_name, member_content))
-        elif line.startswith('}') or\
-                (line.startswith('typedef ') and line.endswith(';\n')):
-            if line.startswith('}'):
-                index = 1
-            else:
-                index = 3
-            struct_name = line.rstrip().split()[index]
-            struct_name = re.sub(r';$', '', struct_name)
-            break
-    return StructDoc(struct_name, content, members, 'member')
-
-def process_function(domain, infile):
-    content = read_content(infile)
-    func_proto = []
-    while True:
-        line = infile.readline()
-        if not line:
-            break
-        elif line == '\n':
-            break
-        else:
-            func_proto.append(line)
-    func_proto = ''.join(func_proto)
-    func_proto = re.sub(r';\n$', '', func_proto)
-    func_proto = re.sub(r'\s+', ' ', func_proto)
-    func_proto = re.sub(r'NGHTTP2_EXTERN ', '', func_proto)
-    return FunctionDoc(func_proto, content, domain)
-
-def read_content(infile):
-    content = []
-    while True:
-        line = infile.readline()
-        if not line:
-            break
-        if re.match(r'\s*\*/\n', line):
-            break
-        else:
-            content.append(transform_content(line.rstrip()))
-    return content
-
-def arg_repl(matchobj):
-    return '*{}*'.format(matchobj.group(1).replace('*', '\\*'))
-
-def transform_content(content):
-    content = re.sub(r'^\s+\* ?', '', content)
-    content = re.sub(r'\|([^\s|]+)\|', arg_repl, content)
-    content = re.sub(r':enum:', ':macro:', content)
-    return content
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="Generate API reference")
-    parser.add_argument('index', type=argparse.FileType('w'),
-                        help='index output file')
-    parser.add_argument('macros', type=argparse.FileType('w'),
-                        help='macros section output file.  The filename should be macros.rst')
-    parser.add_argument('enums', type=argparse.FileType('w'),
-                        help='enums section output file.  The filename should be enums.rst')
-    parser.add_argument('types', type=argparse.FileType('w'),
-                        help='types section output file.  The filename should be types.rst')
-    parser.add_argument('funcsdir',
-                        help='functions doc output dir')
-    parser.add_argument('files', nargs='+', type=argparse.FileType('r'),
-                        help='source file')
-    args = parser.parse_args()
-    macros = []
-    enums = []
-    types = []
-    funcs = []
-    for infile in args.files:
-        m, e, t, f = make_api_ref(args.files)
-        macros.extend(m)
-        enums.extend(e)
-        types.extend(t)
-        funcs.extend(f)
-    funcs.sort(key=lambda x: x.funcname)
-    output(
-        args.index, args.macros, args.enums, args.types, args.funcsdir,
-        macros, enums, types, funcs)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,326 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "NGHTTP" "1" "Sep 02, 2018" "1.33.0" "nghttp2"
-.SH NAME
-nghttp \- HTTP/2 client
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-\fBnghttp\fP [OPTIONS]... <URI>...
-.SH DESCRIPTION
-.sp
-HTTP/2 client
-.INDENT 0.0
-.TP
-.B <URI>
-Specify URI to access.
-.UNINDENT
-.SH OPTIONS
-.INDENT 0.0
-.TP
-.B \-v, \-\-verbose
-Print   debug   information   such  as   reception   and
-transmission of frames and name/value pairs.  Specifying
-this option multiple times increases verbosity.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-n, \-\-null\-out
-Discard downloaded data.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-O, \-\-remote\-name
-Save  download  data  in  the  current  directory.   The
-filename is  derived from  URI.  If  URI ends  with \(aq\fI/\fP\(aq,
-\(aqindex.html\(aq  is used  as a  filename.  Not  implemented
-yet.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-t, \-\-timeout=<DURATION>
-Timeout each request after <DURATION>.  Set 0 to disable
-timeout.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-w, \-\-window\-bits=<N>
-Sets the stream level initial window size to 2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-W, \-\-connection\-window\-bits=<N>
-Sets  the  connection  level   initial  window  size  to
-2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-a, \-\-get\-assets
-Download assets  such as stylesheets, images  and script
-files linked  from the downloaded resource.   Only links
-whose  origins are  the same  with the  linking resource
-will be downloaded.   nghttp prioritizes resources using
-HTTP/2 dependency  based priority.  The  priority order,
-from highest to lowest,  is html itself, css, javascript
-and images.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-s, \-\-stat
-Print statistics.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-H, \-\-header=<HEADER>
-Add a header to the requests.  Example: \fI\%\-H\fP\(aq:method: PUT\(aq
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-trailer=<HEADER>
-Add a trailer header to the requests.  <HEADER> must not
-include pseudo header field  (header field name starting
-with \(aq:\(aq).  To  send trailer, one must use  \fI\%\-d\fP option to
-send request body.  Example: \fI\%\-\-trailer\fP \(aqfoo: bar\(aq.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-cert=<CERT>
-Use  the specified  client certificate  file.  The  file
-must be in PEM format.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-key=<KEY>
-Use the  client private key  file.  The file must  be in
-PEM format.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-d, \-\-data=<PATH>
-Post FILE to server. If \(aq\-\(aq  is given, data will be read
-from stdin.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-m, \-\-multiply=<N>
-Request each URI <N> times.  By default, same URI is not
-requested twice.  This option disables it too.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-u, \-\-upgrade
-Perform HTTP Upgrade for HTTP/2.  This option is ignored
-if the request URI has https scheme.  If \fI\%\-d\fP is used, the
-HTTP upgrade request is performed with OPTIONS method.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-p, \-\-weight=<WEIGHT>
-Sets  weight of  given  URI.  This  option  can be  used
-multiple times, and  N\-th \fI\%\-p\fP option sets  weight of N\-th
-URI in the command line.  If  the number of \fI\%\-p\fP option is
-less than the number of URI, the last \fI\%\-p\fP option value is
-repeated.  If there is no \fI\%\-p\fP option, default weight, 16,
-is assumed.  The valid value range is
-[1, 256], inclusive.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-M, \-\-peer\-max\-concurrent\-streams=<N>
-Use  <N>  as  SETTINGS_MAX_CONCURRENT_STREAMS  value  of
-remote endpoint as if it  is received in SETTINGS frame.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-c, \-\-header\-table\-size=<SIZE>
-Specify decoder  header table  size.  If this  option is
-used  multiple times,  and the  minimum value  among the
-given values except  for last one is  strictly less than
-the last  value, that minimum  value is set  in SETTINGS
-frame  payload  before  the   last  value,  to  simulate
-multiple header table size change.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-encoder\-header\-table\-size=<SIZE>
-Specify encoder header table size.  The decoder (server)
-specifies  the maximum  dynamic table  size it  accepts.
-Then the negotiated dynamic table size is the minimum of
-this option value and the value which server specified.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-b, \-\-padding=<N>
-Add at  most <N>  bytes to a  frame payload  as padding.
-Specify 0 to disable padding.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-r, \-\-har=<PATH>
-Output HTTP  transactions <PATH> in HAR  format.  If \(aq\-\(aq
-is given, data is written to stdout.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-color
-Force colored log output.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-continuation
-Send large header to test CONTINUATION.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-content\-length
-Don\(aqt send content\-length header field.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-dep
-Don\(aqt send dependency based priority hint to server.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-hexdump
-Display the  incoming traffic in  hexadecimal (Canonical
-hex+ASCII display).  If SSL/TLS  is used, decrypted data
-are used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-push
-Disable server push.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-max\-concurrent\-streams=<N>
-The  number of  concurrent  pushed  streams this  client
-accepts.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-expect\-continue
-Perform an Expect/Continue handshake:  wait to send DATA
-(up to  a short  timeout)  until the server sends  a 100
-Continue interim response. This option is ignored unless
-combined with the \fI\%\-d\fP option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-y, \-\-no\-verify\-peer
-Suppress  warning  on  server  certificate  verification
-failure.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Display version information and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Display this help and exit.
-.UNINDENT
-.sp
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-.sp
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-.SH DEPENDENCY BASED PRIORITY
-.sp
-nghttp sends priority hints to server by default unless
-\fI\%\-\-no\-dep\fP is used.  nghttp mimics the way Firefox employs to
-manages dependency using idle streams.  We follows the behaviour of
-Firefox Nightly as of April, 2015, and nghttp\(aqs behaviour is very
-static and could be different from Firefox in detail.  But reproducing
-the same behaviour of Firefox is not our goal.  The goal is provide
-the easy way to test out the dependency priority in server
-implementation.
-.sp
-When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
-tree:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-         +\-\-\-\-\-+
-         |id=0 |
-         +\-\-\-\-\-+
-        ^   ^   ^
- w=201 /    |    \e w=1
-      /     |     \e
-     / w=101|      \e
- +\-\-\-\-\-+ +\-\-\-\-\-+ +\-\-\-\-\-+
- |id=3 | |id=5 | |id=7 |
- +\-\-\-\-\-+ +\-\-\-\-\-+ +\-\-\-\-\-+
-    ^               ^
-w=1 |           w=1 |
-    |               |
- +\-\-\-\-\-+         +\-\-\-\-\-+
- |id=11|         |id=9 |
- +\-\-\-\-\-+         +\-\-\-\-\-+
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-In the above figure, \fBid\fP means stream ID, and \fBw\fP means weight.
-The stream 0 is non\-existence stream, and forms the root of the tree.
-The stream 7 and 9 are not used for now.
-.sp
-The URIs given in the command\-line depend on stream 11 with the weight
-given in \fI\%\-p\fP option, which defaults to 16.
-.sp
-If \fI\%\-a\fP option is used, nghttp parses the resource pointed by
-URI given in command\-line as html, and extracts resource links from
-it.  When requesting those resources, nghttp uses dependency according
-to its resource type.
-.sp
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
-element depend on stream 5 with the weight 2.  The mages depend on
-stream 11 with the weight 12.  The other resources (e.g., icon) depend
-on stream 11 with the weight 2.
-.SH SEE ALSO
-.sp
-\fBnghttpd(1)\fP, \fBnghttpx(1)\fP, \fBh2load(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.1.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: nghttp
-
-nghttp(1)
-=========
-
-SYNOPSIS
---------
-
-**nghttp** [OPTIONS]... <URI>...
-
-DESCRIPTION
------------
-
-HTTP/2 client
-
-.. describe:: <URI>
-
-    Specify URI to access.
-
-OPTIONS
--------
-
-.. option:: -v, --verbose
-
-    Print   debug   information   such  as   reception   and
-    transmission of frames and name/value pairs.  Specifying
-    this option multiple times increases verbosity.
-
-.. option:: -n, --null-out
-
-    Discard downloaded data.
-
-.. option:: -O, --remote-name
-
-    Save  download  data  in  the  current  directory.   The
-    filename is  derived from  URI.  If  URI ends  with '*/*',
-    'index.html'  is used  as a  filename.  Not  implemented
-    yet.
-
-.. option:: -t, --timeout=<DURATION>
-
-    Timeout each request after <DURATION>.  Set 0 to disable
-    timeout.
-
-.. option:: -w, --window-bits=<N>
-
-    Sets the stream level initial window size to 2\*\*<N>-1.
-
-.. option:: -W, --connection-window-bits=<N>
-
-    Sets  the  connection  level   initial  window  size  to
-    2\*\*<N>-1.
-
-.. option:: -a, --get-assets
-
-    Download assets  such as stylesheets, images  and script
-    files linked  from the downloaded resource.   Only links
-    whose  origins are  the same  with the  linking resource
-    will be downloaded.   nghttp prioritizes resources using
-    HTTP/2 dependency  based priority.  The  priority order,
-    from highest to lowest,  is html itself, css, javascript
-    and images.
-
-.. option:: -s, --stat
-
-    Print statistics.
-
-.. option:: -H, --header=<HEADER>
-
-    Add a header to the requests.  Example: :option:`-H`\':method: PUT'
-
-.. option:: --trailer=<HEADER>
-
-    Add a trailer header to the requests.  <HEADER> must not
-    include pseudo header field  (header field name starting
-    with ':').  To  send trailer, one must use  :option:`-d` option to
-    send request body.  Example: :option:`--trailer` 'foo: bar'.
-
-.. option:: --cert=<CERT>
-
-    Use  the specified  client certificate  file.  The  file
-    must be in PEM format.
-
-.. option:: --key=<KEY>
-
-    Use the  client private key  file.  The file must  be in
-    PEM format.
-
-.. option:: -d, --data=<PATH>
-
-    Post FILE to server. If '-'  is given, data will be read
-    from stdin.
-
-.. option:: -m, --multiply=<N>
-
-    Request each URI <N> times.  By default, same URI is not
-    requested twice.  This option disables it too.
-
-.. option:: -u, --upgrade
-
-    Perform HTTP Upgrade for HTTP/2.  This option is ignored
-    if the request URI has https scheme.  If :option:`-d` is used, the
-    HTTP upgrade request is performed with OPTIONS method.
-
-.. option:: -p, --weight=<WEIGHT>
-
-    Sets  weight of  given  URI.  This  option  can be  used
-    multiple times, and  N-th :option:`-p` option sets  weight of N-th
-    URI in the command line.  If  the number of :option:`-p` option is
-    less than the number of URI, the last :option:`-p` option value is
-    repeated.  If there is no :option:`-p` option, default weight, 16,
-    is assumed.  The valid value range is
-    [1, 256], inclusive.
-
-.. option:: -M, --peer-max-concurrent-streams=<N>
-
-    Use  <N>  as  SETTINGS_MAX_CONCURRENT_STREAMS  value  of
-    remote endpoint as if it  is received in SETTINGS frame.
-
-    Default: ``100``
-
-.. option:: -c, --header-table-size=<SIZE>
-
-    Specify decoder  header table  size.  If this  option is
-    used  multiple times,  and the  minimum value  among the
-    given values except  for last one is  strictly less than
-    the last  value, that minimum  value is set  in SETTINGS
-    frame  payload  before  the   last  value,  to  simulate
-    multiple header table size change.
-
-.. option:: --encoder-header-table-size=<SIZE>
-
-    Specify encoder header table size.  The decoder (server)
-    specifies  the maximum  dynamic table  size it  accepts.
-    Then the negotiated dynamic table size is the minimum of
-    this option value and the value which server specified.
-
-.. option:: -b, --padding=<N>
-
-    Add at  most <N>  bytes to a  frame payload  as padding.
-    Specify 0 to disable padding.
-
-.. option:: -r, --har=<PATH>
-
-    Output HTTP  transactions <PATH> in HAR  format.  If '-'
-    is given, data is written to stdout.
-
-.. option:: --color
-
-    Force colored log output.
-
-.. option:: --continuation
-
-    Send large header to test CONTINUATION.
-
-.. option:: --no-content-length
-
-    Don't send content-length header field.
-
-.. option:: --no-dep
-
-    Don't send dependency based priority hint to server.
-
-.. option:: --hexdump
-
-    Display the  incoming traffic in  hexadecimal (Canonical
-    hex+ASCII display).  If SSL/TLS  is used, decrypted data
-    are used.
-
-.. option:: --no-push
-
-    Disable server push.
-
-.. option:: --max-concurrent-streams=<N>
-
-    The  number of  concurrent  pushed  streams this  client
-    accepts.
-
-.. option:: --expect-continue
-
-    Perform an Expect/Continue handshake:  wait to send DATA
-    (up to  a short  timeout)  until the server sends  a 100
-    Continue interim response. This option is ignored unless
-    combined with the :option:`-d` option.
-
-.. option:: -y, --no-verify-peer
-
-    Suppress  warning  on  server  certificate  verification
-    failure.
-
-.. option:: --version
-
-    Display version information and exit.
-
-.. option:: -h, --help
-
-    Display this help and exit.
-
-
-
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-
-DEPENDENCY BASED PRIORITY
--------------------------
-
-nghttp sends priority hints to server by default unless
-:option:`--no-dep` is used.  nghttp mimics the way Firefox employs to
-manages dependency using idle streams.  We follows the behaviour of
-Firefox Nightly as of April, 2015, and nghttp's behaviour is very
-static and could be different from Firefox in detail.  But reproducing
-the same behaviour of Firefox is not our goal.  The goal is provide
-the easy way to test out the dependency priority in server
-implementation.
-
-When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
-tree:
-
-.. code-block:: text
-
-                      +-----+
-                      |id=0 |
-                      +-----+
-                     ^   ^   ^
-              w=201 /    |    \ w=1
-                   /     |     \
-                  / w=101|      \
-              +-----+ +-----+ +-----+
-              |id=3 | |id=5 | |id=7 |
-              +-----+ +-----+ +-----+
-                 ^               ^
-             w=1 |           w=1 |
-                 |               |
-              +-----+         +-----+
-              |id=11|         |id=9 |
-              +-----+         +-----+
-
-In the above figure, ``id`` means stream ID, and ``w`` means weight.
-The stream 0 is non-existence stream, and forms the root of the tree.
-The stream 7 and 9 are not used for now.
-
-The URIs given in the command-line depend on stream 11 with the weight
-given in :option:`-p` option, which defaults to 16.
-
-If :option:`-a` option is used, nghttp parses the resource pointed by
-URI given in command-line as html, and extracts resource links from
-it.  When requesting those resources, nghttp uses dependency according
-to its resource type.
-
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
-element depend on stream 5 with the weight 2.  The mages depend on
-stream 11 with the weight 12.  The other resources (e.g., icon) depend
-on stream 11 with the weight 2.
-
-SEE ALSO
---------
-
-:manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2.h.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2.h.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2.h.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2.h.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-nghttp2.h
-=========
-
-.. literalinclude:: @top_srcdir@/lib/includes/nghttp2/nghttp2.h
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2ver.h.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2ver.h.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2ver.h.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp2ver.h.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-nghttp2ver.h
-============
-
-.. literalinclude:: @top_builddir@/lib/includes/nghttp2/nghttp2ver.h
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "NGHTTPD" "1" "Sep 02, 2018" "1.33.0" "nghttp2"
-.SH NAME
-nghttpd \- HTTP/2 server
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-\fBnghttpd\fP [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]
-.SH DESCRIPTION
-.sp
-HTTP/2 server
-.INDENT 0.0
-.TP
-.B <PORT>
-Specify listening port number.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B <PRIVATE_KEY>
-Set  path  to  server\(aqs private  key.   Required  unless
-\fI\%\-\-no\-tls\fP is specified.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B <CERT>
-Set  path  to  server\(aqs  certificate.   Required  unless
-\fI\%\-\-no\-tls\fP is specified.
-.UNINDENT
-.SH OPTIONS
-.INDENT 0.0
-.TP
-.B \-a, \-\-address=<ADDR>
-The address to bind to.  If not specified the default IP
-address determined by getaddrinfo is used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-D, \-\-daemon
-Run in a background.  If \fI\%\-D\fP is used, the current working
-directory is  changed to \(aq\fI/\fP\(aq.  Therefore  if this option
-is used, \fI\%\-d\fP option must be specified.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-V, \-\-verify\-client
-The server  sends a client certificate  request.  If the
-client did  not return  a certificate, the  handshake is
-terminated.   Currently,  this  option just  requests  a
-client certificate and does not verify it.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-d, \-\-htdocs=<PATH>
-Specify document root.  If this option is not specified,
-the document root is the current working directory.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-v, \-\-verbose
-Print debug information  such as reception/ transmission
-of frames and name/value pairs.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-tls
-Disable SSL/TLS.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-c, \-\-header\-table\-size=<SIZE>
-Specify decoder header table size.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-encoder\-header\-table\-size=<SIZE>
-Specify encoder header table size.  The decoder (client)
-specifies  the maximum  dynamic table  size it  accepts.
-Then the negotiated dynamic table size is the minimum of
-this option value and the value which client specified.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-color
-Force colored log output.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-p, \-\-push=<PATH>=<PUSH_PATH,...>
-Push  resources <PUSH_PATH>s  when <PATH>  is requested.
-This option  can be used repeatedly  to specify multiple
-push  configurations.    <PATH>  and   <PUSH_PATH>s  are
-relative  to   document  root.   See   \fI\%\-\-htdocs\fP  option.
-Example: \fI\%\-p\fP/=/foo.png \fI\%\-p\fP/doc=/bar.css
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-b, \-\-padding=<N>
-Add at  most <N>  bytes to a  frame payload  as padding.
-Specify 0 to disable padding.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-m, \-\-max\-concurrent\-streams=<N>
-Set the maximum number of  the concurrent streams in one
-HTTP/2 session.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-n, \-\-workers=<N>
-Set the number of worker threads.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-e, \-\-error\-gzip
-Make error response gzipped.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-w, \-\-window\-bits=<N>
-Sets the stream level initial window size to 2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-W, \-\-connection\-window\-bits=<N>
-Sets  the  connection  level   initial  window  size  to
-2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-dh\-param\-file=<PATH>
-Path to file that contains  DH parameters in PEM format.
-Without  this   option,  DHE   cipher  suites   are  not
-available.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-early\-response
-Start sending response when request HEADERS is received,
-rather than complete request is received.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-trailer=<HEADER>
-Add a trailer  header to a response.   <HEADER> must not
-include pseudo header field  (header field name starting
-with \(aq:\(aq).  The  trailer is sent only if  a response has
-body part.  Example: \fI\%\-\-trailer\fP \(aqfoo: bar\(aq.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-hexdump
-Display the  incoming traffic in  hexadecimal (Canonical
-hex+ASCII display).  If SSL/TLS  is used, decrypted data
-are used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-echo\-upload
-Send back uploaded content if method is POST or PUT.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-mime\-types\-file=<PATH>
-Path  to file  that contains  MIME media  types and  the
-extensions that represent them.
-.sp
-Default: \fB/etc/mime.types\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-content\-length
-Don\(aqt send content\-length header field.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Display version information and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Display this help and exit.
-.UNINDENT
-.sp
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-.SH SEE ALSO
-.sp
-\fBnghttp(1)\fP, \fBnghttpx(1)\fP, \fBh2load(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.1.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: nghttpd
-
-nghttpd(1)
-==========
-
-SYNOPSIS
---------
-
-**nghttpd** [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]
-
-DESCRIPTION
------------
-
-HTTP/2 server
-
-.. describe:: <PORT>
-
-    Specify listening port number.
-
-.. describe:: <PRIVATE_KEY>
-
-    
-    Set  path  to  server's private  key.   Required  unless
-    :option:`--no-tls` is specified.
-
-.. describe:: <CERT>
-
-    Set  path  to  server's  certificate.   Required  unless
-    :option:`--no-tls` is specified.
-
-OPTIONS
--------
-
-.. option:: -a, --address=<ADDR>
-
-    The address to bind to.  If not specified the default IP
-    address determined by getaddrinfo is used.
-
-.. option:: -D, --daemon
-
-    Run in a background.  If :option:`-D` is used, the current working
-    directory is  changed to '*/*'.  Therefore  if this option
-    is used, :option:`-d` option must be specified.
-
-.. option:: -V, --verify-client
-
-    The server  sends a client certificate  request.  If the
-    client did  not return  a certificate, the  handshake is
-    terminated.   Currently,  this  option just  requests  a
-    client certificate and does not verify it.
-
-.. option:: -d, --htdocs=<PATH>
-
-    Specify document root.  If this option is not specified,
-    the document root is the current working directory.
-
-.. option:: -v, --verbose
-
-    Print debug information  such as reception/ transmission
-    of frames and name/value pairs.
-
-.. option:: --no-tls
-
-    Disable SSL/TLS.
-
-.. option:: -c, --header-table-size=<SIZE>
-
-    Specify decoder header table size.
-
-.. option:: --encoder-header-table-size=<SIZE>
-
-    Specify encoder header table size.  The decoder (client)
-    specifies  the maximum  dynamic table  size it  accepts.
-    Then the negotiated dynamic table size is the minimum of
-    this option value and the value which client specified.
-
-.. option:: --color
-
-    Force colored log output.
-
-.. option:: -p, --push=<PATH>=<PUSH_PATH,...>
-
-    Push  resources <PUSH_PATH>s  when <PATH>  is requested.
-    This option  can be used repeatedly  to specify multiple
-    push  configurations.    <PATH>  and   <PUSH_PATH>s  are
-    relative  to   document  root.   See   :option:`--htdocs`  option.
-    Example: :option:`-p`\/=/foo.png :option:`-p`\/doc=/bar.css
-
-.. option:: -b, --padding=<N>
-
-    Add at  most <N>  bytes to a  frame payload  as padding.
-    Specify 0 to disable padding.
-
-.. option:: -m, --max-concurrent-streams=<N>
-
-    Set the maximum number of  the concurrent streams in one
-    HTTP/2 session.
-
-    Default: ``100``
-
-.. option:: -n, --workers=<N>
-
-    Set the number of worker threads.
-
-    Default: ``1``
-
-.. option:: -e, --error-gzip
-
-    Make error response gzipped.
-
-.. option:: -w, --window-bits=<N>
-
-    Sets the stream level initial window size to 2\*\*<N>-1.
-
-.. option:: -W, --connection-window-bits=<N>
-
-    Sets  the  connection  level   initial  window  size  to
-    2\*\*<N>-1.
-
-.. option:: --dh-param-file=<PATH>
-
-    Path to file that contains  DH parameters in PEM format.
-    Without  this   option,  DHE   cipher  suites   are  not
-    available.
-
-.. option:: --early-response
-
-    Start sending response when request HEADERS is received,
-    rather than complete request is received.
-
-.. option:: --trailer=<HEADER>
-
-    Add a trailer  header to a response.   <HEADER> must not
-    include pseudo header field  (header field name starting
-    with ':').  The  trailer is sent only if  a response has
-    body part.  Example: :option:`--trailer` 'foo: bar'.
-
-.. option:: --hexdump
-
-    Display the  incoming traffic in  hexadecimal (Canonical
-    hex+ASCII display).  If SSL/TLS  is used, decrypted data
-    are used.
-
-.. option:: --echo-upload
-
-    Send back uploaded content if method is POST or PUT.
-
-.. option:: --mime-types-file=<PATH>
-
-    Path  to file  that contains  MIME media  types and  the
-    extensions that represent them.
-
-    Default: ``/etc/mime.types``
-
-.. option:: --no-content-length
-
-    Don't send content-length header field.
-
-.. option:: --version
-
-    Display version information and exit.
-
-.. option:: -h, --help
-
-    Display this help and exit.
-
-
-
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.h2r cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.h2r
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.h2r	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpd.h2r	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.h2r cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.h2r
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.h2r	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttp.h2r	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-DEPENDENCY BASED PRIORITY
--------------------------
-
-nghttp sends priority hints to server by default unless
-:option:`--no-dep` is used.  nghttp mimics the way Firefox employs to
-manages dependency using idle streams.  We follows the behaviour of
-Firefox Nightly as of April, 2015, and nghttp's behaviour is very
-static and could be different from Firefox in detail.  But reproducing
-the same behaviour of Firefox is not our goal.  The goal is provide
-the easy way to test out the dependency priority in server
-implementation.
-
-When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
-tree:
-
-.. code-block:: text
-
-                      +-----+
-                      |id=0 |
-                      +-----+
-                     ^   ^   ^
-              w=201 /    |    \ w=1
-                   /     |     \
-                  / w=101|      \
-              +-----+ +-----+ +-----+
-              |id=3 | |id=5 | |id=7 |
-              +-----+ +-----+ +-----+
-                 ^               ^
-             w=1 |           w=1 |
-                 |               |
-              +-----+         +-----+
-              |id=11|         |id=9 |
-              +-----+         +-----+
-
-In the above figure, ``id`` means stream ID, and ``w`` means weight.
-The stream 0 is non-existence stream, and forms the root of the tree.
-The stream 7 and 9 are not used for now.
-
-The URIs given in the command-line depend on stream 11 with the weight
-given in :option:`-p` option, which defaults to 16.
-
-If :option:`-a` option is used, nghttp parses the resource pointed by
-URI given in command-line as html, and extracts resource links from
-it.  When requesting those resources, nghttp uses dependency according
-to its resource type.
-
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
-element depend on stream 5 with the weight 2.  The mages depend on
-stream 11 with the weight 12.  The other resources (e.g., icon) depend
-on stream 11 with the weight 2.
-
-SEE ALSO
---------
-
-:manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,2415 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "NGHTTPX" "1" "Sep 02, 2018" "1.33.0" "nghttp2"
-.SH NAME
-nghttpx \- HTTP/2 proxy
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-\fBnghttpx\fP [OPTIONS]... [<PRIVATE_KEY> <CERT>]
-.SH DESCRIPTION
-.sp
-A reverse proxy for HTTP/2, and HTTP/1.
-.INDENT 0.0
-.TP
-.B <PRIVATE_KEY>
-Set  path  to  server\(aqs private  key.   Required  unless
-"no\-tls" parameter is used in \fI\%\-\-frontend\fP option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B <CERT>
-Set  path  to  server\(aqs  certificate.   Required  unless
-"no\-tls"  parameter is  used in  \fI\%\-\-frontend\fP option.   To
-make OCSP stapling work, this must be an absolute path.
-.UNINDENT
-.SH OPTIONS
-.sp
-The options are categorized into several groups.
-.SS Connections
-.INDENT 0.0
-.TP
-.B \-b, \-\-backend=(<HOST>,<PORT>|unix:<PATH>)[;[<PATTERN>[:...]][[;<PARAM>]...]
-Set  backend  host  and   port.   The  multiple  backend
-addresses are  accepted by repeating this  option.  UNIX
-domain socket  can be  specified by prefixing  path name
-with "unix:" (e.g., unix:/var/run/backend.sock).
-.sp
-Optionally, if <PATTERN>s are given, the backend address
-is  only  used  if  request matches  the  pattern.   The
-pattern  matching is  closely  designed  to ServeMux  in
-net/http package of  Go programming language.  <PATTERN>
-consists of  path, host +  path or just host.   The path
-must start  with "\fI/\fP".  If  it ends with "\fI/\fP",  it matches
-all  request path  in  its subtree.   To  deal with  the
-request  to the  directory without  trailing slash,  the
-path which ends  with "\fI/\fP" also matches  the request path
-which  only  lacks  trailing  \(aq\fI/\fP\(aq  (e.g.,  path  "\fI/foo/\fP"
-matches request path  "\fI/foo\fP").  If it does  not end with
-"\fI/\fP", it  performs exact match against  the request path.
-If  host  is given,  it  performs  a match  against  the
-request host.   For a  request received on  the frontend
-listener with  "sni\-fwd" parameter enabled, SNI  host is
-used instead of a request host.  If host alone is given,
-"\fI/\fP" is  appended to it,  so that it matches  all request
-paths  under the  host  (e.g., specifying  "nghttp2.org"
-equals  to "nghttp2.org/").   CONNECT method  is treated
-specially.  It  does not have  path, and we  don\(aqt allow
-empty path.  To workaround  this, we assume that CONNECT
-method has "\fI/\fP" as path.
-.sp
-Patterns with  host take  precedence over  patterns with
-just path.   Then, longer patterns take  precedence over
-shorter ones.
-.sp
-Host  can  include "*"  in  the  left most  position  to
-indicate  wildcard match  (only suffix  match is  done).
-The "*" must match at least one character.  For example,
-host    pattern    "*.nghttp2.org"    matches    against
-"www.nghttp2.org"  and  "git.ngttp2.org", but  does  not
-match  against  "nghttp2.org".   The exact  hosts  match
-takes precedence over the wildcard hosts match.
-.sp
-If path  part ends with  "*", it is treated  as wildcard
-path.  The  wildcard path  behaves differently  from the
-normal path.  For normal path,  match is made around the
-boundary of path component  separator,"\fI/\fP".  On the other
-hand, the wildcard  path does not take  into account the
-path component  separator.  All paths which  include the
-wildcard  path  without  last  "*" as  prefix,  and  are
-strictly longer than wildcard  path without last "*" are
-matched.  "*"  must match  at least one  character.  For
-example,  the   pattern  "\fI/foo*\fP"  matches   "\fI/foo/\fP"  and
-"\fI/foobar\fP".  But it does not match "\fI/foo\fP", or "\fI/fo\fP".
-.sp
-If <PATTERN> is omitted or  empty string, "\fI/\fP" is used as
-pattern,  which  matches  all request  paths  (catch\-all
-pattern).  The catch\-all backend must be given.
-.sp
-When doing  a match, nghttpx made  some normalization to
-pattern, request host and path.  For host part, they are
-converted to lower case.  For path part, percent\-encoded
-unreserved characters  defined in RFC 3986  are decoded,
-and any  dot\-segments (".."  and ".")   are resolved and
-removed.
-.sp
-For   example,   \fI\%\-b\fP\(aq127.0.0.1,8080;nghttp2.org/httpbin/\(aq
-matches the  request host "nghttp2.org" and  the request
-path "\fI/httpbin/get\fP", but does not match the request host
-"nghttp2.org" and the request path "\fI/index.html\fP".
-.sp
-The  multiple <PATTERN>s  can  be specified,  delimiting
-them            by           ":".             Specifying
-\fI\%\-b\fP\(aq127.0.0.1,8080;nghttp2.org:www.nghttp2.org\(aq  has  the
-same  effect  to specify  \fI\%\-b\fP\(aq127.0.0.1,8080;nghttp2.org\(aq
-and \fI\%\-b\fP\(aq127.0.0.1,8080;www.nghttp2.org\(aq.
-.sp
-The backend addresses sharing same <PATTERN> are grouped
-together forming  load balancing  group.
-.sp
-Several parameters <PARAM> are accepted after <PATTERN>.
-The  parameters are  delimited  by  ";".  The  available
-parameters       are:      "proto=<PROTO>",       "tls",
-"sni=<SNI_HOST>",         "fall=<N>",        "rise=<N>",
-"affinity=<METHOD>",    "dns",    "redirect\-if\-not\-tls",
-"upgrade\-scheme",  and  "mruby=<PATH>".   The  parameter
-consists of keyword, and  optionally followed by "=" and
-value.  For  example, the parameter  "proto=h2" consists
-of the  keyword "proto"  and value "h2".   The parameter
-"tls" consists of the keyword "tls" without value.  Each
-parameter is described as follows.
-.sp
-The backend application protocol  can be specified using
-optional  "proto"   parameter,  and   in  the   form  of
-"proto=<PROTO>".  <PROTO> should be one of the following
-list  without  quotes:  "h2", "http/1.1".   The  default
-value of <PROTO> is  "http/1.1".  Note that usually "h2"
-refers to HTTP/2  over TLS.  But in this  option, it may
-mean HTTP/2  over cleartext TCP unless  "tls" keyword is
-used (see below).
-.sp
-TLS  can   be  enabled  by  specifying   optional  "tls"
-parameter.  TLS is not enabled by default.
-.sp
-With "sni=<SNI_HOST>" parameter, it can override the TLS
-SNI  field  value  with  given  <SNI_HOST>.   This  will
-default to the backend <HOST> name
-.sp
-The  feature  to detect  whether  backend  is online  or
-offline can be enabled  using optional "fall" and "rise"
-parameters.   Using  "fall=<N>"  parameter,  if  nghttpx
-cannot connect  to a  this backend <N>  times in  a row,
-this  backend  is  assumed  to be  offline,  and  it  is
-excluded from load balancing.  If <N> is 0, this backend
-never  be excluded  from load  balancing whatever  times
-nghttpx cannot connect  to it, and this  is the default.
-There is  also "rise=<N>" parameter.  After  backend was
-excluded from load balancing group, nghttpx periodically
-attempts to make a connection to the failed backend, and
-if the  connection is made  successfully <N> times  in a
-row, the backend is assumed to  be online, and it is now
-eligible  for load  balancing target.   If <N>  is 0,  a
-backend  is permanently  offline, once  it goes  in that
-state, and this is the default behaviour.
-.sp
-The     session     affinity    is     enabled     using
-"affinity=<METHOD>"  parameter.   If  "ip" is  given  in
-<METHOD>, client  IP based session affinity  is enabled.
-If "cookie"  is given in <METHOD>,  cookie based session
-affinity is  enabled.  If  "none" is given  in <METHOD>,
-session affinity  is disabled, and this  is the default.
-The session  affinity is  enabled per <PATTERN>.   If at
-least  one backend  has  "affinity"  parameter, and  its
-<METHOD> is not "none",  session affinity is enabled for
-all backend  servers sharing the same  <PATTERN>.  It is
-advised  to  set  "affinity" parameter  to  all  backend
-explicitly if session affinity  is desired.  The session
-affinity  may   break  if   one  of  the   backend  gets
-unreachable,  or   backend  settings  are   reloaded  or
-replaced by API.
-.sp
-If   "affinity=cookie"    is   used,    the   additional
-configuration                is                required.
-"affinity\-cookie\-name=<NAME>" must be  used to specify a
-name     of     cookie      to     use.      Optionally,
-"affinity\-cookie\-path=<PATH>" can  be used to  specify a
-path   which   cookie    is   applied.    The   optional
-"affinity\-cookie\-secure=<SECURE>"  controls  the  Secure
-attribute of a cookie.  The default value is "auto", and
-the Secure attribute is  determined by a request scheme.
-If a request scheme is "https", then Secure attribute is
-set.  Otherwise, it  is not set.  If  <SECURE> is "yes",
-the  Secure attribute  is  always set.   If <SECURE>  is
-"no", the Secure attribute is always omitted.
-.sp
-By default, name resolution of backend host name is done
-at  start  up,  or reloading  configuration.   If  "dns"
-parameter   is  given,   name  resolution   takes  place
-dynamically.  This is useful  if backend address changes
-frequently.   If  "dns"  is given,  name  resolution  of
-backend   host   name   at  start   up,   or   reloading
-configuration is skipped.
-.sp
-If "redirect\-if\-not\-tls" parameter  is used, the matched
-backend  requires   that  frontend  connection   is  TLS
-encrypted.  If it isn\(aqt, nghttpx responds to the request
-with 308  status code, and  https URI the  client should
-use instead  is included in Location  header field.  The
-port number in  redirect URI is 443 by  default, and can
-be  changed using  \fI\%\-\-redirect\-https\-port\fP option.   If at
-least one  backend has  "redirect\-if\-not\-tls" parameter,
-this feature is enabled  for all backend servers sharing
-the   same   <PATTERN>.    It    is   advised   to   set
-"redirect\-if\-no\-tls"    parameter   to    all   backends
-explicitly if this feature is desired.
-.sp
-If "upgrade\-scheme"  parameter is used along  with "tls"
-parameter, HTTP/2 :scheme pseudo header field is changed
-to "https" from "http" when forwarding a request to this
-particular backend.  This is  a workaround for a backend
-server  which  requires  "https" :scheme  pseudo  header
-field on TLS encrypted connection.
-.sp
-"mruby=<PATH>"  parameter  specifies  a  path  to  mruby
-script  file  which  is  invoked when  this  pattern  is
-matched.  All backends which share the same pattern must
-have the same mruby path.
-.sp
-Since ";" and ":" are  used as delimiter, <PATTERN> must
-not  contain these  characters.  Since  ";" has  special
-meaning in shell, the option value must be quoted.
-.sp
-Default: \fB127.0.0.1,80\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-f, \-\-frontend=(<HOST>,<PORT>|unix:<PATH>)[[;<PARAM>]...]
-Set  frontend  host and  port.   If  <HOST> is  \(aq*\(aq,  it
-assumes  all addresses  including  both  IPv4 and  IPv6.
-UNIX domain  socket can  be specified by  prefixing path
-name  with  "unix:" (e.g.,  unix:/var/run/nghttpx.sock).
-This  option can  be used  multiple times  to listen  to
-multiple addresses.
-.sp
-This option  can take  0 or  more parameters,  which are
-described  below.   Note   that  "api"  and  "healthmon"
-parameters are mutually exclusive.
-.sp
-Optionally, TLS  can be disabled by  specifying "no\-tls"
-parameter.  TLS is enabled by default.
-.sp
-If "sni\-fwd" parameter is  used, when performing a match
-to select a backend server,  SNI host name received from
-the client  is used  instead of  the request  host.  See
-\fI\%\-\-backend\fP option about the pattern match.
-.sp
-To  make this  frontend as  API endpoint,  specify "api"
-parameter.   This   is  disabled  by  default.    It  is
-important  to  limit the  access  to  the API  frontend.
-Otherwise, someone  may change  the backend  server, and
-break your services,  or expose confidential information
-to the outside the world.
-.sp
-To  make  this  frontend  as  health  monitor  endpoint,
-specify  "healthmon"  parameter.   This is  disabled  by
-default.  Any  requests which come through  this address
-are replied with 200 HTTP status, without no body.
-.sp
-To  accept   PROXY  protocol   version  1   on  frontend
-connection,  specify  "proxyproto" parameter.   This  is
-disabled by default.
-.sp
-Default: \fB*,3000\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backlog=<N>
-Set listen backlog size.
-.sp
-Default: \fB65536\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-address\-family=(auto|IPv4|IPv6)
-Specify  address  family  of  backend  connections.   If
-"auto" is given, both IPv4  and IPv6 are considered.  If
-"IPv4" is  given, only  IPv4 address is  considered.  If
-"IPv6" is given, only IPv6 address is considered.
-.sp
-Default: \fBauto\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http\-proxy\-uri=<URI>
-Specify      proxy       URI      in       the      form
-\fI\%http:/\fP/[<USER>:<PASS>@]<PROXY>:<PORT>.    If   a   proxy
-requires  authentication,  specify  <USER>  and  <PASS>.
-Note that  they must be properly  percent\-encoded.  This
-proxy  is used  when the  backend connection  is HTTP/2.
-First,  make  a CONNECT  request  to  the proxy  and  it
-connects  to the  backend  on behalf  of nghttpx.   This
-forms  tunnel.   After  that, nghttpx  performs  SSL/TLS
-handshake with  the downstream through the  tunnel.  The
-timeouts when connecting and  making CONNECT request can
-be     specified    by     \fI\%\-\-backend\-read\-timeout\fP    and
-\fI\%\-\-backend\-write\-timeout\fP options.
-.UNINDENT
-.SS Performance
-.INDENT 0.0
-.TP
-.B \-n, \-\-workers=<N>
-Set the number of worker threads.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-single\-thread
-Run everything in one  thread inside the worker process.
-This   feature   is   provided  for   better   debugging
-experience,  or  for  the platforms  which  lack  thread
-support.   If  threading  is disabled,  this  option  is
-always enabled.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-read\-rate=<SIZE>
-Set maximum  average read  rate on  frontend connection.
-Setting 0 to this option means read rate is unlimited.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-read\-burst=<SIZE>
-Set  maximum read  burst  size  on frontend  connection.
-Setting  0  to this  option  means  read burst  size  is
-unlimited.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-write\-rate=<SIZE>
-Set maximum  average write rate on  frontend connection.
-Setting 0 to this option means write rate is unlimited.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-write\-burst=<SIZE>
-Set  maximum write  burst size  on frontend  connection.
-Setting  0 to  this  option means  write  burst size  is
-unlimited.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-worker\-read\-rate=<SIZE>
-Set maximum average read rate on frontend connection per
-worker.  Setting  0 to  this option  means read  rate is
-unlimited.  Not implemented yet.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-worker\-read\-burst=<SIZE>
-Set maximum  read burst size on  frontend connection per
-worker.  Setting 0 to this  option means read burst size
-is unlimited.  Not implemented yet.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-worker\-write\-rate=<SIZE>
-Set maximum  average write  rate on  frontend connection
-per worker.  Setting  0 to this option  means write rate
-is unlimited.  Not implemented yet.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-worker\-write\-burst=<SIZE>
-Set maximum write burst  size on frontend connection per
-worker.  Setting 0 to this option means write burst size
-is unlimited.  Not implemented yet.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-worker\-frontend\-connections=<N>
-Set maximum number  of simultaneous connections frontend
-accepts.  Setting 0 means unlimited.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-connections\-per\-host=<N>
-Set  maximum number  of  backend concurrent  connections
-(and/or  streams in  case  of HTTP/2)  per origin  host.
-This option  is meaningful when \fI\%\-\-http2\-proxy\fP  option is
-used.   The  origin  host  is  determined  by  authority
-portion of  request URI (or :authority  header field for
-HTTP/2).   To  limit  the   number  of  connections  per
-frontend        for       default        mode,       use
-\fI\%\-\-backend\-connections\-per\-frontend\fP\&.
-.sp
-Default: \fB8\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-connections\-per\-frontend=<N>
-Set  maximum number  of  backend concurrent  connections
-(and/or streams  in case of HTTP/2)  per frontend.  This
-option  is   only  used  for  default   mode.   0  means
-unlimited.  To limit the  number of connections per host
-with          \fI\%\-\-http2\-proxy\fP         option,          use
-\fI\%\-\-backend\-connections\-per\-host\fP\&.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-rlimit\-nofile=<N>
-Set maximum number of open files (RLIMIT_NOFILE) to <N>.
-If 0 is given, nghttpx does not set the limit.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-request\-buffer=<SIZE>
-Set buffer size used to store backend request.
-.sp
-Default: \fB16K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-response\-buffer=<SIZE>
-Set buffer size used to store backend response.
-.sp
-Default: \fB128K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-fastopen=<N>
-Enables  "TCP Fast  Open" for  the listening  socket and
-limits the  maximum length for the  queue of connections
-that have not yet completed the three\-way handshake.  If
-value is 0 then fast open is disabled.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-kqueue
-Don\(aqt use  kqueue.  This  option is only  applicable for
-the platforms  which have kqueue.  For  other platforms,
-this option will be simply ignored.
-.UNINDENT
-.SS Timeout
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-read\-timeout=<DURATION>
-Specify read timeout for HTTP/2 frontend connection.
-.sp
-Default: \fB3m\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-read\-timeout=<DURATION>
-Specify read timeout for HTTP/1.1 frontend connection.
-.sp
-Default: \fB1m\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-write\-timeout=<DURATION>
-Specify write timeout for all frontend connections.
-.sp
-Default: \fB30s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-keep\-alive\-timeout=<DURATION>
-Specify   keep\-alive   timeout   for   frontend   HTTP/1
-connection.
-.sp
-Default: \fB1m\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-stream\-read\-timeout=<DURATION>
-Specify  read timeout  for HTTP/2  streams.  0  means no
-timeout.
-.sp
-Default: \fB0\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-stream\-write\-timeout=<DURATION>
-Specify write  timeout for  HTTP/2 streams.  0  means no
-timeout.
-.sp
-Default: \fB1m\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-read\-timeout=<DURATION>
-Specify read timeout for backend connection.
-.sp
-Default: \fB1m\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-write\-timeout=<DURATION>
-Specify write timeout for backend connection.
-.sp
-Default: \fB30s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-connect\-timeout=<DURATION>
-Specify  timeout before  establishing TCP  connection to
-backend.
-.sp
-Default: \fB30s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-keep\-alive\-timeout=<DURATION>
-Specify   keep\-alive   timeout    for   backend   HTTP/1
-connection.
-.sp
-Default: \fB2s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-listener\-disable\-timeout=<DURATION>
-After accepting  connection failed,  connection listener
-is disabled  for a given  amount of time.   Specifying 0
-disables this feature.
-.sp
-Default: \fB30s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-setting\-timeout=<DURATION>
-Specify  timeout before  SETTINGS ACK  is received  from
-client.
-.sp
-Default: \fB10s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http2\-settings\-timeout=<DURATION>
-Specify  timeout before  SETTINGS ACK  is received  from
-backend server.
-.sp
-Default: \fB10s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-max\-backoff=<DURATION>
-Specify  maximum backoff  interval.  This  is used  when
-doing health  check against offline backend  (see "fail"
-parameter  in \fI\%\-\-backend\fP  option).   It is  also used  to
-limit  the  maximum   interval  to  temporarily  disable
-backend  when nghttpx  failed to  connect to  it.  These
-intervals are calculated  using exponential backoff, and
-consecutive failed attempts increase the interval.  This
-option caps its maximum value.
-.sp
-Default: \fB2m\fP
-.UNINDENT
-.SS SSL/TLS
-.INDENT 0.0
-.TP
-.B \-\-ciphers=<SUITE>
-Set allowed  cipher list  for frontend  connection.  The
-format of the string is described in OpenSSL ciphers(1).
-.sp
-Default: \fBECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:ECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-SHA384:ECDHE\-RSA\-AES256\-SHA384:ECDHE\-ECDSA\-AES128\-SHA256:ECDHE\-RSA\-AES128\-SHA256\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-client\-ciphers=<SUITE>
-Set  allowed cipher  list for  backend connection.   The
-format of the string is described in OpenSSL ciphers(1).
-.sp
-Default: \fBECDHE\-ECDSA\-AES256\-GCM\-SHA384:ECDHE\-RSA\-AES256\-GCM\-SHA384:ECDHE\-ECDSA\-CHACHA20\-POLY1305:ECDHE\-RSA\-CHACHA20\-POLY1305:ECDHE\-ECDSA\-AES128\-GCM\-SHA256:ECDHE\-RSA\-AES128\-GCM\-SHA256:ECDHE\-ECDSA\-AES256\-SHA384:ECDHE\-RSA\-AES256\-SHA384:ECDHE\-ECDSA\-AES128\-SHA256:ECDHE\-RSA\-AES128\-SHA256\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ecdh\-curves=<LIST>
-Set  supported  curve  list  for  frontend  connections.
-<LIST> is a  colon separated list of curve  NID or names
-in the preference order.  The supported curves depend on
-the  linked  OpenSSL  library.  This  function  requires
-OpenSSL >= 1.0.2.
-.sp
-Default: \fBX25519:P\-256:P\-384:P\-521\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-k, \-\-insecure
-Don\(aqt  verify backend  server\(aqs  certificate  if TLS  is
-enabled for backend connections.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-cacert=<PATH>
-Set path to trusted CA  certificate file.  It is used in
-backend  TLS connections  to verify  peer\(aqs certificate.
-It is also used to  verify OCSP response from the script
-set by \fI\%\-\-fetch\-ocsp\-response\-file\fP\&.  The  file must be in
-PEM format.   It can contain multiple  certificates.  If
-the  linked OpenSSL  is configured  to load  system wide
-certificates, they  are loaded at startup  regardless of
-this option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-private\-key\-passwd\-file=<PATH>
-Path  to file  that contains  password for  the server\(aqs
-private key.   If none is  given and the private  key is
-password protected it\(aqll be requested interactively.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-subcert=<KEYPATH>:<CERTPATH>[[;<PARAM>]...]
-Specify  additional certificate  and  private key  file.
-nghttpx will  choose certificates based on  the hostname
-indicated by client using TLS SNI extension.  If nghttpx
-is  built with  OpenSSL  >= 1.0.2,  the shared  elliptic
-curves (e.g., P\-256) between  client and server are also
-taken into  consideration.  This allows nghttpx  to send
-ECDSA certificate  to modern clients, while  sending RSA
-based certificate to older  clients.  This option can be
-used  multiple  times.   To  make  OCSP  stapling  work,
-<CERTPATH> must be absolute path.
-.sp
-Additional parameter  can be specified in  <PARAM>.  The
-available <PARAM> is "sct\-dir=<DIR>".
-.sp
-"sct\-dir=<DIR>"  specifies the  path to  directory which
-contains        *.sct        files        for        TLS
-signed_certificate_timestamp extension (RFC 6962).  This
-feature   requires   OpenSSL   >=   1.0.2.    See   also
-\fI\%\-\-tls\-sct\-dir\fP option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-dh\-param\-file=<PATH>
-Path to file that contains  DH parameters in PEM format.
-Without  this   option,  DHE   cipher  suites   are  not
-available.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-npn\-list=<LIST>
-Comma delimited list of  ALPN protocol identifier sorted
-in the  order of preference.  That  means most desirable
-protocol comes  first.  This  is used  in both  ALPN and
-NPN.  The parameter must be  delimited by a single comma
-only  and any  white spaces  are  treated as  a part  of
-protocol string.
-.sp
-Default: \fBh2,h2\-16,h2\-14,http/1.1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-verify\-client
-Require and verify client certificate.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-verify\-client\-cacert=<PATH>
-Path  to file  that contains  CA certificates  to verify
-client certificate.  The file must be in PEM format.  It
-can contain multiple certificates.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-verify\-client\-tolerate\-expired
-Accept  expired  client  certificate.   Operator  should
-handle  the expired  client  certificate  by some  means
-(e.g.,  mruby  script).   Otherwise, this  option  might
-cause a security risk.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-client\-private\-key\-file=<PATH>
-Path to  file that contains  client private key  used in
-backend client authentication.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-client\-cert\-file=<PATH>
-Path to  file that  contains client certificate  used in
-backend client authentication.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-min\-proto\-version=<VER>
-Specify minimum SSL/TLS protocol.   The name matching is
-done in  case\-insensitive manner.  The  versions between
-\fI\%\-\-tls\-min\-proto\-version\fP and  \fI\%\-\-tls\-max\-proto\-version\fP are
-enabled.  If the protocol list advertised by client does
-not  overlap  this range,  you  will  receive the  error
-message "unknown protocol".  If a protocol version lower
-than TLSv1.2 is specified, make sure that the compatible
-ciphers are  included in \fI\%\-\-ciphers\fP option.   The default
-cipher  list  only   includes  ciphers  compatible  with
-TLSv1.2 or above.  The available versions are:
-TLSv1.2, TLSv1.1, and TLSv1.0
-.sp
-Default: \fBTLSv1.2\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-max\-proto\-version=<VER>
-Specify maximum SSL/TLS protocol.   The name matching is
-done in  case\-insensitive manner.  The  versions between
-\fI\%\-\-tls\-min\-proto\-version\fP and  \fI\%\-\-tls\-max\-proto\-version\fP are
-enabled.  If the protocol list advertised by client does
-not  overlap  this range,  you  will  receive the  error
-message "unknown protocol".  The available versions are:
-TLSv1.2, TLSv1.1, and TLSv1.0
-.sp
-Default: \fBTLSv1.2\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-file=<PATH>
-Path to file that contains  random data to construct TLS
-session ticket  parameters.  If aes\-128\-cbc is  given in
-\fI\%\-\-tls\-ticket\-key\-cipher\fP, the  file must  contain exactly
-48    bytes.     If     aes\-256\-cbc    is    given    in
-\fI\%\-\-tls\-ticket\-key\-cipher\fP, the  file must  contain exactly
-80  bytes.   This  options  can be  used  repeatedly  to
-specify  multiple ticket  parameters.  If  several files
-are given,  only the  first key is  used to  encrypt TLS
-session  tickets.  Other  keys are  accepted but  server
-will  issue new  session  ticket with  first key.   This
-allows  session  key  rotation.  Please  note  that  key
-rotation  does  not  occur automatically.   User  should
-rearrange  files or  change options  values and  restart
-nghttpx gracefully.   If opening  or reading  given file
-fails, all loaded  keys are discarded and  it is treated
-as if none  of this option is given.  If  this option is
-not given or an error  occurred while opening or reading
-a file,  key is  generated every  1 hour  internally and
-they are  valid for  12 hours.   This is  recommended if
-ticket  key sharing  between  nghttpx  instances is  not
-required.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached=<HOST>,<PORT>[;tls]
-Specify address  of memcached  server to get  TLS ticket
-keys for  session resumption.   This enables  shared TLS
-ticket key between  multiple nghttpx instances.  nghttpx
-does not set TLS ticket  key to memcached.  The external
-ticket key generator is required.  nghttpx just gets TLS
-ticket  keys  from  memcached, and  use  them,  possibly
-replacing current set  of keys.  It is up  to extern TLS
-ticket  key generator  to rotate  keys frequently.   See
-"TLS SESSION  TICKET RESUMPTION" section in  manual page
-to know the data format in memcached entry.  Optionally,
-memcached  connection  can  be  encrypted  with  TLS  by
-specifying "tls" parameter.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached\-address\-family=(auto|IPv4|IPv6)
-Specify address  family of memcached connections  to get
-TLS ticket keys.  If "auto" is given, both IPv4 and IPv6
-are considered.   If "IPv4" is given,  only IPv4 address
-is considered.  If "IPv6" is given, only IPv6 address is
-considered.
-.sp
-Default: \fBauto\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached\-interval=<DURATION>
-Set interval to get TLS ticket keys from memcached.
-.sp
-Default: \fB10m\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached\-max\-retry=<N>
-Set  maximum   number  of  consecutive   retries  before
-abandoning TLS ticket key  retrieval.  If this number is
-reached,  the  attempt  is considered  as  failure,  and
-"failure" count  is incremented by 1,  which contributed
-to            the            value            controlled
-\fI\%\-\-tls\-ticket\-key\-memcached\-max\-fail\fP option.
-.sp
-Default: \fB3\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached\-max\-fail=<N>
-Set  maximum   number  of  consecutive   failure  before
-disabling TLS ticket until next scheduled key retrieval.
-.sp
-Default: \fB2\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-cipher=<CIPHER>
-Specify cipher  to encrypt TLS session  ticket.  Specify
-either   aes\-128\-cbc   or  aes\-256\-cbc.    By   default,
-aes\-128\-cbc is used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached\-cert\-file=<PATH>
-Path to client certificate  for memcached connections to
-get TLS ticket keys.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-ticket\-key\-memcached\-private\-key\-file=<PATH>
-Path to client private  key for memcached connections to
-get TLS ticket keys.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-fetch\-ocsp\-response\-file=<PATH>
-Path to  fetch\-ocsp\-response script file.  It  should be
-absolute path.
-.sp
-Default: \fB/usr/local/share/nghttp2/fetch\-ocsp\-response\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ocsp\-update\-interval=<DURATION>
-Set interval to update OCSP response cache.
-.sp
-Default: \fB4h\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ocsp\-startup
-Start  accepting connections  after initial  attempts to
-get OCSP responses  finish.  It does not  matter some of
-the  attempts  fail.  This  feature  is  useful if  OCSP
-responses   must    be   available    before   accepting
-connections.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-verify\-ocsp
-nghttpx does not verify OCSP response.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-ocsp
-Disable OCSP stapling.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-session\-cache\-memcached=<HOST>,<PORT>[;tls]
-Specify  address of  memcached server  to store  session
-cache.   This  enables   shared  session  cache  between
-multiple   nghttpx  instances.    Optionally,  memcached
-connection can be encrypted with TLS by specifying "tls"
-parameter.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-session\-cache\-memcached\-address\-family=(auto|IPv4|IPv6)
-Specify address family of memcached connections to store
-session cache.  If  "auto" is given, both  IPv4 and IPv6
-are considered.   If "IPv4" is given,  only IPv4 address
-is considered.  If "IPv6" is given, only IPv6 address is
-considered.
-.sp
-Default: \fBauto\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-session\-cache\-memcached\-cert\-file=<PATH>
-Path to client certificate  for memcached connections to
-store session cache.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-session\-cache\-memcached\-private\-key\-file=<PATH>
-Path to client private  key for memcached connections to
-store session cache.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-dyn\-rec\-warmup\-threshold=<SIZE>
-Specify the  threshold size for TLS  dynamic record size
-behaviour.  During  a TLS  session, after  the threshold
-number of bytes  have been written, the  TLS record size
-will be increased to the maximum allowed (16K).  The max
-record size will  continue to be used on  the active TLS
-session.  After  \fI\%\-\-tls\-dyn\-rec\-idle\-timeout\fP has elapsed,
-the record size is reduced  to 1300 bytes.  Specify 0 to
-always use  the maximum record size,  regardless of idle
-period.   This  behaviour  applies   to  all  TLS  based
-frontends, and TLS HTTP/2 backends.
-.sp
-Default: \fB1M\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-dyn\-rec\-idle\-timeout=<DURATION>
-Specify TLS dynamic record  size behaviour timeout.  See
-\fI\%\-\-tls\-dyn\-rec\-warmup\-threshold\fP  for   more  information.
-This behaviour  applies to all TLS  based frontends, and
-TLS HTTP/2 backends.
-.sp
-Default: \fB1s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-http2\-cipher\-black\-list
-Allow  black  listed  cipher suite  on  frontend  HTTP/2
-connection.                                          See
-\fI\%https://tools.ietf.org/html/rfc7540#appendix\-A\fP  for  the
-complete HTTP/2 cipher suites black list.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-client\-no\-http2\-cipher\-black\-list
-Allow  black  listed  cipher  suite  on  backend  HTTP/2
-connection.                                          See
-\fI\%https://tools.ietf.org/html/rfc7540#appendix\-A\fP  for  the
-complete HTTP/2 cipher suites black list.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-tls\-sct\-dir=<DIR>
-Specifies the  directory where  *.sct files  exist.  All
-*.sct   files   in  <DIR>   are   read,   and  sent   as
-extension_data of  TLS signed_certificate_timestamp (RFC
-6962)  to  client.   These   *.sct  files  are  for  the
-certificate   specified   in   positional   command\-line
-argument <CERT>, or  certificate option in configuration
-file.   For   additional  certificates,   use  \fI\%\-\-subcert\fP
-option.  This option requires OpenSSL >= 1.0.2.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-psk\-secrets=<PATH>
-Read list of PSK identity and secrets from <PATH>.  This
-is used for frontend connection.  The each line of input
-file  is  formatted  as  <identity>:<hex\-secret>,  where
-<identity> is  PSK identity, and <hex\-secret>  is secret
-in hex.  An  empty line, and line which  starts with \(aq#\(aq
-are skipped.  The default  enabled cipher list might not
-contain any PSK cipher suite.  In that case, desired PSK
-cipher suites  must be  enabled using  \fI\%\-\-ciphers\fP option.
-The  desired PSK  cipher suite  may be  black listed  by
-HTTP/2.   To  use  those   cipher  suites  with  HTTP/2,
-consider  to  use  \fI\%\-\-no\-http2\-cipher\-black\-list\fP  option.
-But be aware its implications.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-client\-psk\-secrets=<PATH>
-Read PSK identity and secrets from <PATH>.  This is used
-for backend connection.  The each  line of input file is
-formatted  as <identity>:<hex\-secret>,  where <identity>
-is PSK identity, and <hex\-secret>  is secret in hex.  An
-empty line, and line which  starts with \(aq#\(aq are skipped.
-The first identity and  secret pair encountered is used.
-The default  enabled cipher  list might not  contain any
-PSK  cipher suite.   In  that case,  desired PSK  cipher
-suites  must be  enabled using  \fI\%\-\-client\-ciphers\fP option.
-The  desired PSK  cipher suite  may be  black listed  by
-HTTP/2.   To  use  those   cipher  suites  with  HTTP/2,
-consider   to  use   \fI\%\-\-client\-no\-http2\-cipher\-black\-list\fP
-option.  But be aware its implications.
-.UNINDENT
-.SS HTTP/2
-.INDENT 0.0
-.TP
-.B \-c, \-\-frontend\-http2\-max\-concurrent\-streams=<N>
-Set the maximum number of  the concurrent streams in one
-frontend HTTP/2 session.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http2\-max\-concurrent\-streams=<N>
-Set the maximum number of  the concurrent streams in one
-backend  HTTP/2 session.   This sets  maximum number  of
-concurrent opened pushed streams.  The maximum number of
-concurrent requests are set by a remote server.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-window\-size=<SIZE>
-Sets  the  per\-stream  initial  window  size  of  HTTP/2
-frontend connection.
-.sp
-Default: \fB65535\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-connection\-window\-size=<SIZE>
-Sets the  per\-connection window size of  HTTP/2 frontend
-connection.
-.sp
-Default: \fB65535\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http2\-window\-size=<SIZE>
-Sets  the   initial  window   size  of   HTTP/2  backend
-connection.
-.sp
-Default: \fB65535\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http2\-connection\-window\-size=<SIZE>
-Sets the  per\-connection window  size of  HTTP/2 backend
-connection.
-.sp
-Default: \fB2147483647\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-http2\-no\-cookie\-crumbling
-Don\(aqt crumble cookie header field.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-padding=<N>
-Add  at most  <N> bytes  to  a HTTP/2  frame payload  as
-padding.  Specify 0 to  disable padding.  This option is
-meant for debugging purpose  and not intended to enhance
-protocol security.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-server\-push
-Disable HTTP/2 server push.  Server push is supported by
-default mode and HTTP/2  frontend via Link header field.
-It is  also supported if  both frontend and  backend are
-HTTP/2 in default mode.  In  this case, server push from
-backend session is relayed  to frontend, and server push
-via Link header field is also supported.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-optimize\-write\-buffer\-size
-(Experimental) Enable write  buffer size optimization in
-frontend HTTP/2 TLS  connection.  This optimization aims
-to reduce  write buffer  size so  that it  only contains
-bytes  which can  send immediately.   This makes  server
-more responsive to prioritized HTTP/2 stream because the
-buffering  of lower  priority stream  is reduced.   This
-option is only effective on recent Linux platform.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-optimize\-window\-size
-(Experimental)   Automatically  tune   connection  level
-window size of frontend  HTTP/2 TLS connection.  If this
-feature is  enabled, connection window size  starts with
-the   default  window   size,   65535  bytes.    nghttpx
-automatically  adjusts connection  window size  based on
-TCP receiving  window size.  The maximum  window size is
-capped      by      the     value      specified      by
-\fI\%\-\-frontend\-http2\-connection\-window\-size\fP\&.     Since   the
-stream is subject to stream level window size, it should
-be adjusted using \fI\%\-\-frontend\-http2\-window\-size\fP option as
-well.   This option  is only  effective on  recent Linux
-platform.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-encoder\-dynamic\-table\-size=<SIZE>
-Specify the maximum dynamic  table size of HPACK encoder
-in the frontend HTTP/2 connection.  The decoder (client)
-specifies  the maximum  dynamic table  size it  accepts.
-Then the negotiated dynamic table size is the minimum of
-this option value and the value which client specified.
-.sp
-Default: \fB4K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-decoder\-dynamic\-table\-size=<SIZE>
-Specify the maximum dynamic  table size of HPACK decoder
-in the frontend HTTP/2 connection.
-.sp
-Default: \fB4K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http2\-encoder\-dynamic\-table\-size=<SIZE>
-Specify the maximum dynamic  table size of HPACK encoder
-in the backend HTTP/2 connection.  The decoder (backend)
-specifies  the maximum  dynamic table  size it  accepts.
-Then the negotiated dynamic table size is the minimum of
-this option value and the value which backend specified.
-.sp
-Default: \fB4K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-backend\-http2\-decoder\-dynamic\-table\-size=<SIZE>
-Specify the maximum dynamic  table size of HPACK decoder
-in the backend HTTP/2 connection.
-.sp
-Default: \fB4K\fP
-.UNINDENT
-.SS Mode
-.INDENT 0.0
-.TP
-.B (default mode)
-Accept  HTTP/2,  and  HTTP/1.1 over  SSL/TLS.   "no\-tls"
-parameter is  used in  \fI\%\-\-frontend\fP option,  accept HTTP/2
-and HTTP/1.1 over cleartext  TCP.  The incoming HTTP/1.1
-connection  can  be  upgraded  to  HTTP/2  through  HTTP
-Upgrade.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-s, \-\-http2\-proxy
-Like default mode, but enable forward proxy.  This is so
-called HTTP/2 proxy mode.
-.UNINDENT
-.SS Logging
-.INDENT 0.0
-.TP
-.B \-L, \-\-log\-level=<LEVEL>
-Set the severity  level of log output.   <LEVEL> must be
-one of INFO, NOTICE, WARN, ERROR and FATAL.
-.sp
-Default: \fBNOTICE\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-accesslog\-file=<PATH>
-Set path to write access log.  To reopen file, send USR1
-signal to nghttpx.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-accesslog\-syslog
-Send  access log  to syslog.   If this  option is  used,
-\fI\%\-\-accesslog\-file\fP option is ignored.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-accesslog\-format=<FORMAT>
-Specify  format  string  for access  log.   The  default
-format is combined format.   The following variables are
-available:
-.INDENT 7.0
-.IP \(bu 2
-$remote_addr: client IP address.
-.IP \(bu 2
-$time_local: local time in Common Log format.
-.IP \(bu 2
-$time_iso8601: local time in ISO 8601 format.
-.IP \(bu 2
-$request: HTTP request line.
-.IP \(bu 2
-$status: HTTP response status code.
-.IP \(bu 2
-$body_bytes_sent: the  number of bytes sent  to client
-as response body.
-.IP \(bu 2
-$http_<VAR>: value of HTTP  request header <VAR> where
-\(aq_\(aq in <VAR> is replaced with \(aq\-\(aq.
-.IP \(bu 2
-$remote_port: client  port.
-.IP \(bu 2
-$server_port: server port.
-.IP \(bu 2
-$request_time: request processing time in seconds with
-milliseconds resolution.
-.IP \(bu 2
-$pid: PID of the running process.
-.IP \(bu 2
-$alpn: ALPN identifier of the protocol which generates
-the response.   For HTTP/1,  ALPN is  always http/1.1,
-regardless of minor version.
-.IP \(bu 2
-$tls_cipher: cipher used for SSL/TLS connection.
-.IP \(bu 2
-$tls_client_fingerprint_sha256: SHA\-256 fingerprint of
-client certificate.
-.IP \(bu 2
-$tls_client_fingerprint_sha1:  SHA\-1   fingerprint  of
-client certificate.
-.IP \(bu 2
-$tls_client_subject_name:   subject  name   in  client
-certificate.
-.IP \(bu 2
-$tls_client_issuer_name:   issuer   name   in   client
-certificate.
-.IP \(bu 2
-$tls_client_serial:    serial    number   in    client
-certificate.
-.IP \(bu 2
-$tls_protocol: protocol for SSL/TLS connection.
-.IP \(bu 2
-$tls_session_id: session ID for SSL/TLS connection.
-.IP \(bu 2
-$tls_session_reused:  "r"   if  SSL/TLS   session  was
-reused.  Otherwise, "."
-.IP \(bu 2
-$tls_sni: SNI server name for SSL/TLS connection.
-.IP \(bu 2
-$backend_host:  backend  host   used  to  fulfill  the
-request.  "\-" if backend host is not available.
-.IP \(bu 2
-$backend_port:  backend  port   used  to  fulfill  the
-request.  "\-" if backend host is not available.
-.UNINDENT
-.sp
-The  variable  can  be  enclosed  by  "{"  and  "}"  for
-disambiguation (e.g., ${remote_addr}).
-.sp
-Default: \fB$remote_addr \- \- [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-accesslog\-write\-early
-Write  access  log  when   response  header  fields  are
-received   from  backend   rather   than  when   request
-transaction finishes.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-errorlog\-file=<PATH>
-Set path to write error  log.  To reopen file, send USR1
-signal  to nghttpx.   stderr will  be redirected  to the
-error log file unless \fI\%\-\-errorlog\-syslog\fP is used.
-.sp
-Default: \fB/dev/stderr\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-errorlog\-syslog
-Send  error log  to  syslog.  If  this  option is  used,
-\fI\%\-\-errorlog\-file\fP option is ignored.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-syslog\-facility=<FACILITY>
-Set syslog facility to <FACILITY>.
-.sp
-Default: \fBdaemon\fP
-.UNINDENT
-.SS HTTP
-.INDENT 0.0
-.TP
-.B \-\-add\-x\-forwarded\-for
-Append  X\-Forwarded\-For header  field to  the downstream
-request.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-strip\-incoming\-x\-forwarded\-for
-Strip X\-Forwarded\-For  header field from  inbound client
-requests.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-add\-x\-forwarded\-proto
-Don\(aqt append  additional X\-Forwarded\-Proto  header field
-to  the   backend  request.   If  inbound   client  sets
-X\-Forwarded\-Proto,                                   and
-\fI\%\-\-no\-strip\-incoming\-x\-forwarded\-proto\fP  option  is  used,
-they are passed to the backend.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-strip\-incoming\-x\-forwarded\-proto
-Don\(aqt strip X\-Forwarded\-Proto  header field from inbound
-client requests.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-add\-forwarded=<LIST>
-Append RFC  7239 Forwarded header field  with parameters
-specified in comma delimited list <LIST>.  The supported
-parameters  are "by",  "for", "host",  and "proto".   By
-default,  the value  of  "by" and  "for" parameters  are
-obfuscated     string.     See     \fI\%\-\-forwarded\-by\fP    and
-\fI\%\-\-forwarded\-for\fP options respectively.  Note that nghttpx
-does  not  translate non\-standard  X\-Forwarded\-*  header
-fields into Forwarded header field, and vice versa.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-strip\-incoming\-forwarded
-Strip  Forwarded   header  field  from   inbound  client
-requests.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-forwarded\-by=(obfuscated|ip|<VALUE>)
-Specify the parameter value sent out with "by" parameter
-of Forwarded  header field.   If "obfuscated"  is given,
-the string is randomly generated at startup.  If "ip" is
-given,   the  interface   address  of   the  connection,
-including port number, is  sent with "by" parameter.  In
-case of UNIX domain  socket, "localhost" is used instead
-of address and  port.  User can also  specify the static
-obfuscated string.  The limitation is that it must start
-with   "_",  and   only   consists   of  character   set
-[A\-Za\-z0\-9._\-], as described in RFC 7239.
-.sp
-Default: \fBobfuscated\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-forwarded\-for=(obfuscated|ip)
-Specify  the   parameter  value  sent  out   with  "for"
-parameter of Forwarded header field.  If "obfuscated" is
-given, the string is  randomly generated for each client
-connection.  If "ip" is given, the remote client address
-of  the connection,  without port  number, is  sent with
-"for"  parameter.   In  case   of  UNIX  domain  socket,
-"localhost" is used instead of address.
-.sp
-Default: \fBobfuscated\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-via
-Don\(aqt append to  Via header field.  If  Via header field
-is received, it is left unaltered.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-location\-rewrite
-Don\(aqt  rewrite location  header field  in default  mode.
-When \fI\%\-\-http2\-proxy\fP  is used, location header  field will
-not be altered regardless of this option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-host\-rewrite
-Rewrite  host and  :authority header  fields in  default
-mode.  When  \fI\%\-\-http2\-proxy\fP is  used, these  headers will
-not be altered regardless of this option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-altsvc=<PROTOID,PORT[,HOST,[ORIGIN]]>
-Specify   protocol  ID,   port,  host   and  origin   of
-alternative service.  <HOST>  and <ORIGIN> are optional.
-They  are advertised  in  alt\-svc header  field only  in
-HTTP/1.1  frontend.  This  option can  be used  multiple
-times   to   specify  multiple   alternative   services.
-Example: \fI\%\-\-altsvc\fP=h2,443
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-add\-request\-header=<HEADER>
-Specify additional header field to add to request header
-set.  This  option just  appends header field  and won\(aqt
-replace anything  already set.  This option  can be used
-several  times   to  specify  multiple   header  fields.
-Example: \fI\%\-\-add\-request\-header\fP="foo: bar"
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-add\-response\-header=<HEADER>
-Specify  additional  header  field to  add  to  response
-header set.   This option just appends  header field and
-won\(aqt replace anything already  set.  This option can be
-used several  times to  specify multiple  header fields.
-Example: \fI\%\-\-add\-response\-header\fP="foo: bar"
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-request\-header\-field\-buffer=<SIZE>
-Set maximum buffer size for incoming HTTP request header
-field list.  This is the sum of header name and value in
-bytes.   If  trailer  fields  exist,  they  are  counted
-towards this number.
-.sp
-Default: \fB64K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-max\-request\-header\-fields=<N>
-Set  maximum  number  of incoming  HTTP  request  header
-fields.   If  trailer  fields exist,  they  are  counted
-towards this number.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-response\-header\-field\-buffer=<SIZE>
-Set  maximum  buffer  size for  incoming  HTTP  response
-header field list.   This is the sum of  header name and
-value  in  bytes.  If  trailer  fields  exist, they  are
-counted towards this number.
-.sp
-Default: \fB64K\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-max\-response\-header\-fields=<N>
-Set  maximum number  of  incoming  HTTP response  header
-fields.   If  trailer  fields exist,  they  are  counted
-towards this number.
-.sp
-Default: \fB500\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-error\-page=(<CODE>|*)=<PATH>
-Set file path  to custom error page  served when nghttpx
-originally  generates  HTTP  error status  code  <CODE>.
-<CODE> must be greater than or equal to 400, and at most
-599.  If "*"  is used instead of <CODE>,  it matches all
-HTTP  status  code.  If  error  status  code comes  from
-backend server, the custom error pages are not used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-server\-name=<NAME>
-Change server response header field value to <NAME>.
-.sp
-Default: \fBnghttpx\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-server\-rewrite
-Don\(aqt rewrite server header field in default mode.  When
-\fI\%\-\-http2\-proxy\fP is used, these headers will not be altered
-regardless of this option.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-redirect\-https\-port=<PORT>
-Specify the port number which appears in Location header
-field  when  redirect  to  HTTPS  URI  is  made  due  to
-"redirect\-if\-not\-tls" parameter in \fI\%\-\-backend\fP option.
-.sp
-Default: \fB443\fP
-.UNINDENT
-.SS API
-.INDENT 0.0
-.TP
-.B \-\-api\-max\-request\-body=<SIZE>
-Set the maximum size of request body for API request.
-.sp
-Default: \fB32M\fP
-.UNINDENT
-.SS DNS
-.INDENT 0.0
-.TP
-.B \-\-dns\-cache\-timeout=<DURATION>
-Set duration that cached DNS results remain valid.  Note
-that nghttpx caches the unsuccessful results as well.
-.sp
-Default: \fB10s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-dns\-lookup\-timeout=<DURATION>
-Set timeout that  DNS server is given to  respond to the
-initial  DNS  query.  For  the  2nd  and later  queries,
-server is  given time based  on this timeout, and  it is
-scaled linearly.
-.sp
-Default: \fB5s\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-dns\-max\-try=<N>
-Set the number of DNS query before nghttpx gives up name
-lookup.
-.sp
-Default: \fB2\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-max\-requests=<N>
-The number  of requests that single  frontend connection
-can process.  For HTTP/2, this  is the number of streams
-in  one  HTTP/2 connection.   For  HTTP/1,  this is  the
-number of keep alive requests.  This is hint to nghttpx,
-and it  may allow additional few  requests.  The default
-value is unlimited.
-.UNINDENT
-.SS Debug
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-dump\-request\-header=<PATH>
-Dumps request headers received by HTTP/2 frontend to the
-file denoted  in <PATH>.  The  output is done  in HTTP/1
-header field format and each header block is followed by
-an empty line.  This option  is not thread safe and MUST
-NOT be used with option \fI\%\-n\fP<N>, where <N> >= 2.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-frontend\-http2\-dump\-response\-header=<PATH>
-Dumps response headers sent  from HTTP/2 frontend to the
-file denoted  in <PATH>.  The  output is done  in HTTP/1
-header field format and each header block is followed by
-an empty line.  This option  is not thread safe and MUST
-NOT be used with option \fI\%\-n\fP<N>, where <N> >= 2.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-o, \-\-frontend\-frame\-debug
-Print HTTP/2 frames in  frontend to stderr.  This option
-is  not thread  safe and  MUST NOT  be used  with option
-\fI\%\-n\fP=N, where N >= 2.
-.UNINDENT
-.SS Process
-.INDENT 0.0
-.TP
-.B \-D, \-\-daemon
-Run in a background.  If \fI\%\-D\fP is used, the current working
-directory is changed to \(aq\fI/\fP\(aq.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-pid\-file=<PATH>
-Set path to save PID of this program.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-user=<USER>
-Run this program as <USER>.   This option is intended to
-be used to drop root privileges.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-single\-process
-Run this program in a  single process mode for debugging
-purpose.  Without this option,  nghttpx creates at least
-2  processes:  master  and worker  processes.   If  this
-option is  used, master  and worker  are unified  into a
-single process.  nghttpx still spawns additional process
-if neverbleed is used.  In  the single process mode, the
-signal handling feature is disabled.
-.UNINDENT
-.SS Scripting
-.INDENT 0.0
-.TP
-.B \-\-mruby\-file=<PATH>
-Set mruby script file
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ignore\-per\-pattern\-mruby\-error
-Ignore mruby compile error  for per\-pattern mruby script
-file.  If error  occurred, it is treated as  if no mruby
-file were specified for the pattern.
-.UNINDENT
-.SS Misc
-.INDENT 0.0
-.TP
-.B \-\-conf=<PATH>
-Load  configuration  from   <PATH>.   Please  note  that
-nghttpx always  tries to read the  default configuration
-file if \fI\%\-\-conf\fP is not given.
-.sp
-Default: \fB/etc/nghttpx/nghttpx.conf\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-include=<PATH>
-Load additional configurations from <PATH>.  File <PATH>
-is  read  when  configuration  parser  encountered  this
-option.  This option can be used multiple times, or even
-recursively.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-v, \-\-version
-Print version and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Print this help and exit.
-.UNINDENT
-.sp
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-.sp
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-.SH FILES
-.INDENT 0.0
-.TP
-.B \fI/etc/nghttpx/nghttpx.conf\fP
-The default configuration file path nghttpx searches at startup.
-The configuration file path can be changed using \fI\%\-\-conf\fP
-option.
-.sp
-Those lines which are staring \fB#\fP are treated as comment.
-.sp
-The option name in the configuration file is the long command\-line
-option name with leading \fB\-\-\fP stripped (e.g., \fBfrontend\fP).  Put
-\fB=\fP between option name and value.  Don\(aqt put extra leading or
-trailing spaces.
-.sp
-When specifying arguments including characters which have special
-meaning to a shell, we usually use quotes so that shell does not
-interpret them.  When writing this configuration file, quotes for
-this purpose must not be used.  For example, specify additional
-request header field, do this:
-.INDENT 7.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-add\-request\-header=foo: bar
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-instead of:
-.INDENT 7.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-add\-request\-header="foo: bar"
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-The options which do not take argument in the command\-line \fItake\fP
-argument in the configuration file.  Specify \fByes\fP as an argument
-(e.g., \fBhttp2\-proxy=yes\fP).  If other string is given, it is
-ignored.
-.sp
-To specify private key and certificate file which are given as
-positional arguments in command\-line, use \fBprivate\-key\-file\fP and
-\fBcertificate\-file\fP\&.
-.sp
-\fI\%\-\-conf\fP option cannot be used in the configuration file and
-will be ignored if specified.
-.TP
-.B Error log
-Error log is written to stderr by default.  It can be configured
-using \fI\%\-\-errorlog\-file\fP\&.  The format of log message is as
-follows:
-.sp
-<datetime> <master\-pid> <current\-pid> <thread\-id> <level> (<filename>:<line>) <msg>
-.INDENT 7.0
-.TP
-.B <datetime>
-It is a combination of date and time when the log is written.  It
-is in ISO 8601 format.
-.TP
-.B <master\-pid>
-It is a master process ID.
-.TP
-.B <current\-pid>
-It is a process ID which writes this log.
-.TP
-.B <thread\-id>
-It is a thread ID which writes this log.  It would be unique
-within <current\-pid>.
-.TP
-.B <filename> and <line>
-They are source file name, and line number which produce this log.
-.TP
-.B <msg>
-It is a log message body.
-.UNINDENT
-.UNINDENT
-.SH SIGNALS
-.INDENT 0.0
-.TP
-.B SIGQUIT
-Shutdown gracefully.  First accept pending connections and stop
-accepting connection.  After all connections are handled, nghttpx
-exits.
-.TP
-.B SIGHUP
-Reload configuration file given in \fI\%\-\-conf\fP\&.
-.TP
-.B SIGUSR1
-Reopen log files.
-.UNINDENT
-.sp
-SIGUSR2
-.INDENT 0.0
-.INDENT 3.5
-Fork and execute nghttpx.  It will execute the binary in the same
-path with same command\-line arguments and environment variables.  As
-of nghttpx version 1.20.0, the new master process sends SIGQUIT to
-the original master process when it is ready to serve requests.  For
-the earlier versions of nghttpx, user has to send SIGQUIT to the
-original master process.
-.sp
-The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former
-is usually used to execute new binary, and the master process is
-newly spawned.  On the other hand, the latter just reloads
-configuration file, and the same master process continues to exist.
-.UNINDENT
-.UNINDENT
-.sp
-\fBNOTE:\fP
-.INDENT 0.0
-.INDENT 3.5
-nghttpx consists of multiple processes: one process for processing
-these signals, and another one for processing requests.  The former
-spawns the latter.  The former is called master process, and the
-latter is called worker process.  If neverbleed is enabled, the
-worker process spawns neverbleed daemon process which does RSA key
-processing.  The above signal must be sent to the master process.
-If the other processes received one of them, it is ignored.  This
-behaviour of these processes may change in the future release.  In
-other words, in the future release, the processes other than master
-process may terminate upon the reception of these signals.
-Therefore these signals should not be sent to the processes other
-than master process.
-.UNINDENT
-.UNINDENT
-.SH SERVER PUSH
-.sp
-nghttpx supports HTTP/2 server push in default mode with Link header
-field.  nghttpx looks for Link header field (\fI\%RFC 5988\fP) in response headers from
-backend server and extracts URI\-reference with parameter
-\fBrel=preload\fP (see \fI\%preload\fP)
-and pushes those URIs to the frontend client. Here is a sample Link
-header field to initiate server push:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-Link: </fonts/font.woff>; rel=preload
-Link: </css/theme.css>; rel=preload
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Currently, the following restriction is applied for server push:
-.INDENT 0.0
-.IP 1. 3
-The associated stream must have method "GET" or "POST".  The
-associated stream\(aqs status code must be 200.
-.UNINDENT
-.sp
-This limitation may be loosened in the future release.
-.sp
-nghttpx also supports server push if both frontend and backend are
-HTTP/2 in default mode.  In this case, in addition to server push via
-Link header field, server push from backend is forwarded to frontend
-HTTP/2 session.
-.sp
-HTTP/2 server push will be disabled if \fI\%\-\-http2\-proxy\fP is
-used.
-.SH UNIX DOMAIN SOCKET
-.sp
-nghttpx supports UNIX domain socket with a filename for both frontend
-and backend connections.
-.sp
-Please note that current nghttpx implementation does not delete a
-socket with a filename.  And on start up, if nghttpx detects that the
-specified socket already exists in the file system, nghttpx first
-deletes it.  However, if SIGUSR2 is used to execute new binary and
-both old and new configurations use same filename, new binary does not
-delete the socket and continues to use it.
-.SH OCSP STAPLING
-.sp
-OCSP query is done using external Python script
-\fBfetch\-ocsp\-response\fP, which has been originally developed in Perl
-as part of h2o project (\fI\%https://github.com/h2o/h2o\fP), and was
-translated into Python.
-.sp
-The script file is usually installed under
-\fB$(prefix)/share/nghttp2/\fP directory.  The actual path to script can
-be customized using \fI\%\-\-fetch\-ocsp\-response\-file\fP option.
-.sp
-If OCSP query is failed, previous OCSP response, if any, is continued
-to be used.
-.sp
-\fI\%\-\-fetch\-ocsp\-response\-file\fP option provides wide range of
-possibility to manage OCSP response.  It can take an arbitrary script
-or executable.  The requirement is that it supports the command\-line
-interface of \fBfetch\-ocsp\-response\fP script, and it must return a
-valid DER encoded OCSP response on success.  It must return exit code
-0 on success, and 75 for temporary error, and the other error code for
-generic failure.  For large cluster of servers, it is not efficient
-for each server to perform OCSP query using \fBfetch\-ocsp\-response\fP\&.
-Instead, you can retrieve OCSP response in some way, and store it in a
-disk or a shared database.  Then specify a program in
-\fI\%\-\-fetch\-ocsp\-response\-file\fP to fetch it from those stores.
-This could provide a way to share the OCSP response between fleet of
-servers, and also any OCSP query strategy can be applied which may be
-beyond the ability of nghttpx itself or \fBfetch\-ocsp\-response\fP
-script.
-.SH TLS SESSION RESUMPTION
-.sp
-nghttpx supports TLS session resumption through both session ID and
-session ticket.
-.SS SESSION ID RESUMPTION
-.sp
-By default, session ID is shared by all worker threads.
-.sp
-If \fI\%\-\-tls\-session\-cache\-memcached\fP is given, nghttpx will
-insert serialized session data to memcached with
-\fBnghttpx:tls\-session\-cache:\fP + lowercase hex string of session ID
-as a memcached entry key, with expiry time 12 hours.  Session timeout
-is set to 12 hours.
-.sp
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use \fBtls\fP keyword in
-\fI\%\-\-tls\-session\-cache\-memcached\fP option.
-.SS TLS SESSION TICKET RESUMPTION
-.sp
-By default, session ticket is shared by all worker threads.  The
-automatic key rotation is also enabled by default.  Every an hour, new
-encryption key is generated, and previous encryption key becomes
-decryption only key.  We set session timeout to 12 hours, and thus we
-keep at most 12 keys.
-.sp
-If \fI\%\-\-tls\-ticket\-key\-memcached\fP is given, encryption keys are
-retrieved from memcached.  nghttpx just reads keys from memcached; one
-has to deploy key generator program to update keys frequently (e.g.,
-every 1 hour).  The example key generator tlsticketupdate.go is
-available under contrib directory in nghttp2 archive.  The memcached
-entry key is \fBnghttpx:tls\-ticket\-key\fP\&.  The data format stored in
-memcached is the binary format described below:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
-| VERSION (4)  |LEN (2)|KEY(48 or 80) ...
-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
-               ^                        |
-               |                        |
-               +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
-               (LEN, KEY) pair can be repeated
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-All numbers in the above figure is bytes.  All integer fields are
-network byte order.
-.sp
-First 4 bytes integer VERSION field, which must be 1.  The 2 bytes
-integer LEN field gives the length of following KEY field, which
-contains key.  If \fI\%\-\-tls\-ticket\-key\-cipher\fP=aes\-128\-cbc is
-used, LEN must be 48.  If
-\fI\%\-\-tls\-ticket\-key\-cipher\fP=aes\-256\-cbc is used, LEN must be
-80.  LEN and KEY pair can be repeated multiple times to store multiple
-keys.  The key appeared first is used as encryption key.  All the
-remaining keys are used as decryption only.
-.sp
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use \fBtls\fP keyword in
-\fI\%\-\-tls\-ticket\-key\-memcached\fP option.
-.sp
-If \fI\%\-\-tls\-ticket\-key\-file\fP is given, encryption key is read
-from the given file.  In this case, nghttpx does not rotate key
-automatically.  To rotate key, one has to restart nghttpx (see
-SIGNALS).
-.SH CERTIFICATE TRANSPARENCY
-.sp
-nghttpx supports TLS \fBsigned_certificate_timestamp\fP extension (\fI\%RFC
-6962\fP).  The relevant options
-are \fI\%\-\-tls\-sct\-dir\fP and \fBsct\-dir\fP parameter in
-\fI\%\-\-subcert\fP\&.  They takes a directory, and nghttpx reads all
-files whose extension is \fB\&.sct\fP under the directory.  The \fB*.sct\fP
-files are encoded as \fBSignedCertificateTimestamp\fP struct described
-in \fI\%section 3.2 of RFC 69662\fP\&.  This format is
-the same one used by \fI\%nginx\-ct\fP and \fI\%mod_ssl_ct\fP\&.
-\fI\%ct\-submit\fP can be
-used to submit certificates to log servers, and obtain the
-\fBSignedCertificateTimestamp\fP struct which can be used with nghttpx.
-.SH MRUBY SCRIPTING
-.sp
-\fBWARNING:\fP
-.INDENT 0.0
-.INDENT 3.5
-The current mruby extension API is experimental and not frozen.  The
-API is subject to change in the future release.
-.UNINDENT
-.UNINDENT
-.sp
-\fBWARNING:\fP
-.INDENT 0.0
-.INDENT 3.5
-Almost all string value returned from method, or attribute is a
-fresh new mruby string, which involves memory allocation, and
-copies.  Therefore, it is strongly recommended to store a return
-value in a local variable, and use it, instead of calling method or
-accessing attribute repeatedly.
-.UNINDENT
-.UNINDENT
-.sp
-nghttpx allows users to extend its capability using mruby scripts.
-nghttpx has 2 hook points to execute mruby script: request phase and
-response phase.  The request phase hook is invoked after all request
-header fields are received from client.  The response phase hook is
-invoked after all response header fields are received from backend
-server.  These hooks allows users to modify header fields, or common
-HTTP variables, like authority or request path, and even return custom
-response without forwarding request to backend servers.
-.sp
-There are 2 levels of mruby script invocations: global and
-per\-pattern.  The global mruby script is set by \fI\%\-\-mruby\-file\fP
-option and is called for all requests.  The per\-pattern mruby script
-is set by "mruby" parameter in \fI\%\-b\fP option.  It is invoked for
-a request which matches the particular pattern.  The order of hook
-invocation is: global request phase hook, per\-pattern request phase
-hook, per\-pattern response phase hook, and finally global response
-phase hook.  If a hook returns a response, any later hooks are not
-invoked.  The global request hook is invoked before the pattern
-matching is made and changing request path may affect the pattern
-matching.
-.sp
-Please note that request and response hooks of per\-pattern mruby
-script for a single request might not come from the same script.  This
-might happen after a request hook is executed, backend failed for some
-reason, and at the same time, backend configuration is replaced by API
-request, and then the request uses new configuration on retry.  The
-response hook from new configuration, if it is specified, will be
-invoked.
-.sp
-The all mruby script will be evaluated once per thread on startup, and
-it must instantiate object and evaluate it as the return value (e.g.,
-\fBApp.new\fP).  This object is called app object.  If app object
-defines \fBon_req\fP method, it is called with \fI\%Nghttpx::Env\fP
-object on request hook.  Similarly, if app object defines \fBon_resp\fP
-method, it is called with \fI\%Nghttpx::Env\fP object on response
-hook.  For each method invocation, user can can access
-\fI\%Nghttpx::Request\fP and \fI\%Nghttpx::Response\fP objects
-via \fI\%Nghttpx::Env#req\fP and \fI\%Nghttpx::Env#resp\fP
-respectively.
-.INDENT 0.0
-.TP
-.B Nghttpx::REQUEST_PHASE
-Constant to represent request phase.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B Nghttpx::RESPONSE_PHASE
-Constant to represent response phase.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B class Nghttpx::Env
-Object to represent current request specific context.
-.INDENT 7.0
-.TP
-.B attribute [R] req
-Return \fI\%Request\fP object.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] resp
-Return \fI\%Response\fP object.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] ctx
-Return Ruby hash object.  It persists until request finishes.
-So values set in request phase hook can be retrieved in
-response phase hook.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] phase
-Return the current phase.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] remote_addr
-Return IP address of a remote client.  If connection is made
-via UNIX domain socket, this returns the string "localhost".
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] server_addr
-Return address of server that accepted the connection.  This
-is a string which specified in \fI\%\-\-frontend\fP option,
-excluding port number, and not a resolved IP address.  For
-UNIX domain socket, this is a path to UNIX domain socket.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] server_port
-Return port number of the server frontend which accepted the
-connection from client.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_used
-Return true if TLS is used on the connection.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_sni
-Return the TLS SNI value which client sent in this connection.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_fingerprint_sha256
-Return the SHA\-256 fingerprint of a client certificate.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_fingerprint_sha1
-Return the SHA\-1 fingerprint of a client certificate.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_issuer_name
-Return the issuer name of a client certificate.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_subject_name
-Return the subject name of a client certificate.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_serial
-Return the serial number of a client certificate.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_not_before
-Return the start date of a client certificate in seconds since
-the epoch.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_client_not_after
-Return the end date of a client certificate in seconds since
-the epoch.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_cipher
-Return a TLS cipher negotiated in this connection.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_protocol
-Return a TLS protocol version negotiated in this connection.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_session_id
-Return a session ID for this connection in hex string.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] tls_session_reused
-Return true if, and only if a SSL/TLS session is reused.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] alpn
-Return ALPN identifier negotiated in this connection.
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
-.B class Nghttpx::Request
-Object to represent request from client.  The modification to
-Request object is allowed only in request phase hook.
-.INDENT 7.0
-.TP
-.B attribute [R] http_version_major
-Return HTTP major version.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] http_version_minor
-Return HTTP minor version.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R/W] method
-HTTP method.  On assignment, copy of given value is assigned.
-We don\(aqt accept arbitrary method name.  We will document them
-later, but well known methods, like GET, PUT and POST, are all
-supported.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R/W] authority
-Authority (i.e., example.org), including optional port
-component .  On assignment, copy of given value is assigned.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R/W] scheme
-Scheme (i.e., http, https).  On assignment, copy of given
-value is assigned.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R/W] path
-Request path, including query component (i.e., /index.html).
-On assignment, copy of given value is assigned.  The path does
-not include authority component of URI.  This may include
-query component.  nghttpx makes certain normalization for
-path.  It decodes percent\-encoding for unreserved characters
-(see \fI\%https://tools.ietf.org/html/rfc3986#section\-2.3\fP), and
-resolves ".." and ".".  But it may leave characters which
-should be percent\-encoded as is. So be careful when comparing
-path against desired string.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] headers
-Return Ruby hash containing copy of request header fields.
-Changing values in returned hash does not change request
-header fields actually used in request processing.  Use
-\fI\%Nghttpx::Request#add_header\fP or
-\fI\%Nghttpx::Request#set_header\fP to change request
-header fields.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B add_header(key, value)
-Add header entry associated with key.  The value can be single
-string or array of string.  It does not replace any existing
-values associated with key.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B set_header(key, value)
-Set header entry associated with key.  The value can be single
-string or array of string.  It replaces any existing values
-associated with key.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B clear_headers()
-Clear all existing request header fields.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B push(uri)
-Initiate to push resource identified by \fIuri\fP\&.  Only HTTP/2
-protocol supports this feature.  For the other protocols, this
-method is noop.  \fIuri\fP can be absolute URI, absolute path or
-relative path to the current request.  For absolute or
-relative path, scheme and authority are inherited from the
-current request.  Currently, method is always GET.  nghttpx
-will issue request to backend servers to fulfill this request.
-The request and response phase hooks will be called for pushed
-resource as well.
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
-.B class Nghttpx::Response
-Object to represent response from backend server.
-.INDENT 7.0
-.TP
-.B attribute [R] http_version_major
-Return HTTP major version.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] http_version_minor
-Return HTTP minor version.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R/W] status
-HTTP status code.  It must be in the range [200, 999],
-inclusive.  The non\-final status code is not supported in
-mruby scripting at the moment.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B attribute [R] headers
-Return Ruby hash containing copy of response header fields.
-Changing values in returned hash does not change response
-header fields actually used in response processing.  Use
-\fI\%Nghttpx::Response#add_header\fP or
-\fI\%Nghttpx::Response#set_header\fP to change response
-header fields.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B add_header(key, value)
-Add header entry associated with key.  The value can be single
-string or array of string.  It does not replace any existing
-values associated with key.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B set_header(key, value)
-Set header entry associated with key.  The value can be single
-string or array of string.  It replaces any existing values
-associated with key.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B clear_headers()
-Clear all existing response header fields.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B return(body)
-Return custom response \fIbody\fP to a client.  When this method
-is called in request phase hook, the request is not forwarded
-to the backend, and response phase hook for this request will
-not be invoked.  When this method is called in response phase
-hook, response from backend server is canceled and discarded.
-The status code and response header fields should be set
-before using this method.  To set status code, use
-\fI\%Nghttpx::Response#status\fP\&.  If status code is not
-set, 200 is used.  To set response header fields,
-\fI\%Nghttpx::Response#add_header\fP and
-\fI\%Nghttpx::Response#set_header\fP\&.  When this method is
-invoked in response phase hook, the response headers are
-filled with the ones received from backend server.  To send
-completely custom header fields, first call
-\fI\%Nghttpx::Response#clear_headers\fP to erase all
-existing header fields, and then add required header fields.
-It is an error to call this method twice for a given request.
-.UNINDENT
-.INDENT 7.0
-.TP
-.B send_info(status, headers)
-Send non\-final (informational) response to a client.  \fIstatus\fP
-must be in the range [100, 199], inclusive.  \fIheaders\fP is a
-hash containing response header fields.  Its key must be a
-string, and the associated value must be either string or
-array of strings.  Since this is not a final response, even if
-this method is invoked, request is still forwarded to a
-backend unless \fI\%Nghttpx::Response#return\fP is called.
-This method can be called multiple times.  It cannot be called
-after \fI\%Nghttpx::Response#return\fP is called.
-.UNINDENT
-.UNINDENT
-.SS MRUBY EXAMPLES
-.sp
-Modify request path:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-class App
-  def on_req(env)
-    env.req.path = "/apps#{env.req.path}"
-  end
-end
-
-App.new
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Don\(aqt forget to instantiate and evaluate object at the last line.
-.sp
-Restrict permission of viewing a content to a specific client
-addresses:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-class App
-  def on_req(env)
-    allowed_clients = ["127.0.0.1", "::1"]
-
-    if env.req.path.start_with?("/log/") &&
-       !allowed_clients.include?(env.remote_addr) then
-      env.resp.status = 404
-      env.resp.return "permission denied"
-    end
-  end
-end
-
-App.new
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SH API ENDPOINTS
-.sp
-nghttpx exposes API endpoints to manipulate it via HTTP based API.  By
-default, API endpoint is disabled.  To enable it, add a dedicated
-frontend for API using \fI\%\-\-frontend\fP option with "api"
-parameter.  All requests which come from this frontend address, will
-be treated as API request.
-.sp
-The response is normally JSON dictionary, and at least includes the
-following keys:
-.INDENT 0.0
-.TP
-.B status
-The status of the request processing.  The following values are
-defined:
-.INDENT 7.0
-.TP
-.B Success
-The request was successful.
-.TP
-.B Failure
-The request was failed.  No change has been made.
-.UNINDENT
-.TP
-.B code
-HTTP status code
-.UNINDENT
-.sp
-Additionally, depending on the API endpoint, \fBdata\fP key may be
-present, and its value contains the API endpoint specific data.
-.sp
-We wrote "normally", since nghttpx may return ordinal HTML response in
-some cases where the error has occurred before reaching API endpoint
-(e.g., header field is too large).
-.sp
-The following section describes available API endpoints.
-.SS POST /api/v1beta1/backendconfig
-.sp
-This API replaces the current backend server settings with the
-requested ones.  The request method should be POST, but PUT is also
-acceptable.  The request body must be nghttpx configuration file
-format.  For configuration file format, see \fI\%FILES\fP section.  The
-line separator inside the request body must be single LF (0x0A).
-Currently, only \fI\%backend\fP option is parsed, the
-others are simply ignored.  The semantics of this API is replace the
-current backend with the backend options in request body.  Describe
-the desired set of backend severs, and nghttpx makes it happen.  If
-there is no \fI\%backend\fP option is found in request
-body, the current set of backend is replaced with the \fI\%backend\fP option\(aqs default value, which is \fB127.0.0.1,80\fP\&.
-.sp
-The replacement is done instantly without breaking existing
-connections or requests.  It also avoids any process creation as is
-the case with hot swapping with signals.
-.sp
-The one limitation is that only numeric IP address is allowed in
-\fI\%backend\fP in request body unless "dns" parameter
-is used while non numeric hostname is allowed in command\-line or
-configuration file is read using \fI\%\-\-conf\fP\&.
-.SS GET /api/v1beta1/configrevision
-.sp
-This API returns configuration revision of the current nghttpx.  The
-configuration revision is opaque string, and it changes after each
-reloading by SIGHUP.  With this API, an external application knows
-that whether nghttpx has finished reloading its configuration by
-comparing the configuration revisions between before and after
-reloading.  It is recommended to disable persistent (keep\-alive)
-connection for this purpose in order to avoid to send a request using
-the reused connection which may bound to an old process.
-.sp
-This API returns response including \fBdata\fP key.  Its value is JSON
-object, and it contains at least the following key:
-.INDENT 0.0
-.TP
-.B configRevision
-The configuration revision of the current nghttpx
-.UNINDENT
-.SH SEE ALSO
-.sp
-\fBnghttp(1)\fP, \fBnghttpd(1)\fP, \fBh2load(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.1.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,2201 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: nghttpx
-
-nghttpx(1)
-==========
-
-SYNOPSIS
---------
-
-**nghttpx** [OPTIONS]... [<PRIVATE_KEY> <CERT>]
-
-DESCRIPTION
------------
-
-A reverse proxy for HTTP/2, and HTTP/1.
-
-.. describe:: <PRIVATE_KEY>
-
-    
-    Set  path  to  server's private  key.   Required  unless
-    "no-tls" parameter is used in :option:`--frontend` option.
-
-.. describe:: <CERT>
-
-    Set  path  to  server's  certificate.   Required  unless
-    "no-tls"  parameter is  used in  :option:`--frontend` option.   To
-    make OCSP stapling work, this must be an absolute path.
-
-
-OPTIONS
--------
-
-The options are categorized into several groups.
-
-Connections
-~~~~~~~~~~~
-
-.. option:: -b, --backend=(<HOST>,<PORT>|unix:<PATH>)[;[<PATTERN>[:...]][[;<PARAM>]...]
-
-
-    Set  backend  host  and   port.   The  multiple  backend
-    addresses are  accepted by repeating this  option.  UNIX
-    domain socket  can be  specified by prefixing  path name
-    with "unix:" (e.g., unix:/var/run/backend.sock).
-
-    Optionally, if <PATTERN>s are given, the backend address
-    is  only  used  if  request matches  the  pattern.   The
-    pattern  matching is  closely  designed  to ServeMux  in
-    net/http package of  Go programming language.  <PATTERN>
-    consists of  path, host +  path or just host.   The path
-    must start  with "*/*".  If  it ends with "*/*",  it matches
-    all  request path  in  its subtree.   To  deal with  the
-    request  to the  directory without  trailing slash,  the
-    path which ends  with "*/*" also matches  the request path
-    which  only  lacks  trailing  '*/*'  (e.g.,  path  "*/foo/*"
-    matches request path  "*/foo*").  If it does  not end with
-    "*/*", it  performs exact match against  the request path.
-    If  host  is given,  it  performs  a match  against  the
-    request host.   For a  request received on  the frontend
-    listener with  "sni-fwd" parameter enabled, SNI  host is
-    used instead of a request host.  If host alone is given,
-    "*/*" is  appended to it,  so that it matches  all request
-    paths  under the  host  (e.g., specifying  "nghttp2.org"
-    equals  to "nghttp2.org/").   CONNECT method  is treated
-    specially.  It  does not have  path, and we  don't allow
-    empty path.  To workaround  this, we assume that CONNECT
-    method has "*/*" as path.
-
-    Patterns with  host take  precedence over  patterns with
-    just path.   Then, longer patterns take  precedence over
-    shorter ones.
-
-    Host  can  include "\*"  in  the  left most  position  to
-    indicate  wildcard match  (only suffix  match is  done).
-    The "\*" must match at least one character.  For example,
-    host    pattern    "\*.nghttp2.org"    matches    against
-    "www.nghttp2.org"  and  "git.ngttp2.org", but  does  not
-    match  against  "nghttp2.org".   The exact  hosts  match
-    takes precedence over the wildcard hosts match.
-
-    If path  part ends with  "\*", it is treated  as wildcard
-    path.  The  wildcard path  behaves differently  from the
-    normal path.  For normal path,  match is made around the
-    boundary of path component  separator,"*/*".  On the other
-    hand, the wildcard  path does not take  into account the
-    path component  separator.  All paths which  include the
-    wildcard  path  without  last  "\*" as  prefix,  and  are
-    strictly longer than wildcard  path without last "\*" are
-    matched.  "\*"  must match  at least one  character.  For
-    example,  the   pattern  "*/foo\**"  matches   "*/foo/*"  and
-    "*/foobar*".  But it does not match "*/foo*", or "*/fo*".
-
-    If <PATTERN> is omitted or  empty string, "*/*" is used as
-    pattern,  which  matches  all request  paths  (catch-all
-    pattern).  The catch-all backend must be given.
-
-    When doing  a match, nghttpx made  some normalization to
-    pattern, request host and path.  For host part, they are
-    converted to lower case.  For path part, percent-encoded
-    unreserved characters  defined in RFC 3986  are decoded,
-    and any  dot-segments (".."  and ".")   are resolved and
-    removed.
-
-    For   example,   :option:`-b`\'127.0.0.1,8080;nghttp2.org/httpbin/'
-    matches the  request host "nghttp2.org" and  the request
-    path "*/httpbin/get*", but does not match the request host
-    "nghttp2.org" and the request path "*/index.html*".
-
-    The  multiple <PATTERN>s  can  be specified,  delimiting
-    them            by           ":".             Specifying
-    :option:`-b`\'127.0.0.1,8080;nghttp2.org:www.nghttp2.org'  has  the
-    same  effect  to specify  :option:`-b`\'127.0.0.1,8080;nghttp2.org'
-    and :option:`-b`\'127.0.0.1,8080;www.nghttp2.org'.
-
-    The backend addresses sharing same <PATTERN> are grouped
-    together forming  load balancing  group.
-
-    Several parameters <PARAM> are accepted after <PATTERN>.
-    The  parameters are  delimited  by  ";".  The  available
-    parameters       are:      "proto=<PROTO>",       "tls",
-    "sni=<SNI_HOST>",         "fall=<N>",        "rise=<N>",
-    "affinity=<METHOD>",    "dns",    "redirect-if-not-tls",
-    "upgrade-scheme",  and  "mruby=<PATH>".   The  parameter
-    consists of keyword, and  optionally followed by "=" and
-    value.  For  example, the parameter  "proto=h2" consists
-    of the  keyword "proto"  and value "h2".   The parameter
-    "tls" consists of the keyword "tls" without value.  Each
-    parameter is described as follows.
-
-    The backend application protocol  can be specified using
-    optional  "proto"   parameter,  and   in  the   form  of
-    "proto=<PROTO>".  <PROTO> should be one of the following
-    list  without  quotes:  "h2", "http/1.1".   The  default
-    value of <PROTO> is  "http/1.1".  Note that usually "h2"
-    refers to HTTP/2  over TLS.  But in this  option, it may
-    mean HTTP/2  over cleartext TCP unless  "tls" keyword is
-    used (see below).
-
-    TLS  can   be  enabled  by  specifying   optional  "tls"
-    parameter.  TLS is not enabled by default.
-
-    With "sni=<SNI_HOST>" parameter, it can override the TLS
-    SNI  field  value  with  given  <SNI_HOST>.   This  will
-    default to the backend <HOST> name
-
-    The  feature  to detect  whether  backend  is online  or
-    offline can be enabled  using optional "fall" and "rise"
-    parameters.   Using  "fall=<N>"  parameter,  if  nghttpx
-    cannot connect  to a  this backend <N>  times in  a row,
-    this  backend  is  assumed  to be  offline,  and  it  is
-    excluded from load balancing.  If <N> is 0, this backend
-    never  be excluded  from load  balancing whatever  times
-    nghttpx cannot connect  to it, and this  is the default.
-    There is  also "rise=<N>" parameter.  After  backend was
-    excluded from load balancing group, nghttpx periodically
-    attempts to make a connection to the failed backend, and
-    if the  connection is made  successfully <N> times  in a
-    row, the backend is assumed to  be online, and it is now
-    eligible  for load  balancing target.   If <N>  is 0,  a
-    backend  is permanently  offline, once  it goes  in that
-    state, and this is the default behaviour.
-
-    The     session     affinity    is     enabled     using
-    "affinity=<METHOD>"  parameter.   If  "ip" is  given  in
-    <METHOD>, client  IP based session affinity  is enabled.
-    If "cookie"  is given in <METHOD>,  cookie based session
-    affinity is  enabled.  If  "none" is given  in <METHOD>,
-    session affinity  is disabled, and this  is the default.
-    The session  affinity is  enabled per <PATTERN>.   If at
-    least  one backend  has  "affinity"  parameter, and  its
-    <METHOD> is not "none",  session affinity is enabled for
-    all backend  servers sharing the same  <PATTERN>.  It is
-    advised  to  set  "affinity" parameter  to  all  backend
-    explicitly if session affinity  is desired.  The session
-    affinity  may   break  if   one  of  the   backend  gets
-    unreachable,  or   backend  settings  are   reloaded  or
-    replaced by API.
-
-    If   "affinity=cookie"    is   used,    the   additional
-    configuration                is                required.
-    "affinity-cookie-name=<NAME>" must be  used to specify a
-    name     of     cookie      to     use.      Optionally,
-    "affinity-cookie-path=<PATH>" can  be used to  specify a
-    path   which   cookie    is   applied.    The   optional
-    "affinity-cookie-secure=<SECURE>"  controls  the  Secure
-    attribute of a cookie.  The default value is "auto", and
-    the Secure attribute is  determined by a request scheme.
-    If a request scheme is "https", then Secure attribute is
-    set.  Otherwise, it  is not set.  If  <SECURE> is "yes",
-    the  Secure attribute  is  always set.   If <SECURE>  is
-    "no", the Secure attribute is always omitted.
-
-    By default, name resolution of backend host name is done
-    at  start  up,  or reloading  configuration.   If  "dns"
-    parameter   is  given,   name  resolution   takes  place
-    dynamically.  This is useful  if backend address changes
-    frequently.   If  "dns"  is given,  name  resolution  of
-    backend   host   name   at  start   up,   or   reloading
-    configuration is skipped.
-
-    If "redirect-if-not-tls" parameter  is used, the matched
-    backend  requires   that  frontend  connection   is  TLS
-    encrypted.  If it isn't, nghttpx responds to the request
-    with 308  status code, and  https URI the  client should
-    use instead  is included in Location  header field.  The
-    port number in  redirect URI is 443 by  default, and can
-    be  changed using  :option:`--redirect-https-port` option.   If at
-    least one  backend has  "redirect-if-not-tls" parameter,
-    this feature is enabled  for all backend servers sharing
-    the   same   <PATTERN>.    It    is   advised   to   set
-    "redirect-if-no-tls"    parameter   to    all   backends
-    explicitly if this feature is desired.
-
-    If "upgrade-scheme"  parameter is used along  with "tls"
-    parameter, HTTP/2 :scheme pseudo header field is changed
-    to "https" from "http" when forwarding a request to this
-    particular backend.  This is  a workaround for a backend
-    server  which  requires  "https" :scheme  pseudo  header
-    field on TLS encrypted connection.
-
-    "mruby=<PATH>"  parameter  specifies  a  path  to  mruby
-    script  file  which  is  invoked when  this  pattern  is
-    matched.  All backends which share the same pattern must
-    have the same mruby path.
-
-    Since ";" and ":" are  used as delimiter, <PATTERN> must
-    not  contain these  characters.  Since  ";" has  special
-    meaning in shell, the option value must be quoted.
-
-
-    Default: ``127.0.0.1,80``
-
-.. option:: -f, --frontend=(<HOST>,<PORT>|unix:<PATH>)[[;<PARAM>]...]
-
-    Set  frontend  host and  port.   If  <HOST> is  '\*',  it
-    assumes  all addresses  including  both  IPv4 and  IPv6.
-    UNIX domain  socket can  be specified by  prefixing path
-    name  with  "unix:" (e.g.,  unix:/var/run/nghttpx.sock).
-    This  option can  be used  multiple times  to listen  to
-    multiple addresses.
-
-    This option  can take  0 or  more parameters,  which are
-    described  below.   Note   that  "api"  and  "healthmon"
-    parameters are mutually exclusive.
-
-    Optionally, TLS  can be disabled by  specifying "no-tls"
-    parameter.  TLS is enabled by default.
-
-    If "sni-fwd" parameter is  used, when performing a match
-    to select a backend server,  SNI host name received from
-    the client  is used  instead of  the request  host.  See
-    :option:`--backend` option about the pattern match.
-
-    To  make this  frontend as  API endpoint,  specify "api"
-    parameter.   This   is  disabled  by  default.    It  is
-    important  to  limit the  access  to  the API  frontend.
-    Otherwise, someone  may change  the backend  server, and
-    break your services,  or expose confidential information
-    to the outside the world.
-
-    To  make  this  frontend  as  health  monitor  endpoint,
-    specify  "healthmon"  parameter.   This is  disabled  by
-    default.  Any  requests which come through  this address
-    are replied with 200 HTTP status, without no body.
-
-    To  accept   PROXY  protocol   version  1   on  frontend
-    connection,  specify  "proxyproto" parameter.   This  is
-    disabled by default.
-
-
-    Default: ``*,3000``
-
-.. option:: --backlog=<N>
-
-    Set listen backlog size.
-
-    Default: ``65536``
-
-.. option:: --backend-address-family=(auto|IPv4|IPv6)
-
-    Specify  address  family  of  backend  connections.   If
-    "auto" is given, both IPv4  and IPv6 are considered.  If
-    "IPv4" is  given, only  IPv4 address is  considered.  If
-    "IPv6" is given, only IPv6 address is considered.
-
-    Default: ``auto``
-
-.. option:: --backend-http-proxy-uri=<URI>
-
-    Specify      proxy       URI      in       the      form
-    http://[<USER>:<PASS>@]<PROXY>:<PORT>.    If   a   proxy
-    requires  authentication,  specify  <USER>  and  <PASS>.
-    Note that  they must be properly  percent-encoded.  This
-    proxy  is used  when the  backend connection  is HTTP/2.
-    First,  make  a CONNECT  request  to  the proxy  and  it
-    connects  to the  backend  on behalf  of nghttpx.   This
-    forms  tunnel.   After  that, nghttpx  performs  SSL/TLS
-    handshake with  the downstream through the  tunnel.  The
-    timeouts when connecting and  making CONNECT request can
-    be     specified    by     :option:`--backend-read-timeout`    and
-    :option:`--backend-write-timeout` options.
-
-
-Performance
-~~~~~~~~~~~
-
-.. option:: -n, --workers=<N>
-
-    Set the number of worker threads.
-
-    Default: ``1``
-
-.. option:: --single-thread
-
-    Run everything in one  thread inside the worker process.
-    This   feature   is   provided  for   better   debugging
-    experience,  or  for  the platforms  which  lack  thread
-    support.   If  threading  is disabled,  this  option  is
-    always enabled.
-
-.. option:: --read-rate=<SIZE>
-
-    Set maximum  average read  rate on  frontend connection.
-    Setting 0 to this option means read rate is unlimited.
-
-    Default: ``0``
-
-.. option:: --read-burst=<SIZE>
-
-    Set  maximum read  burst  size  on frontend  connection.
-    Setting  0  to this  option  means  read burst  size  is
-    unlimited.
-
-    Default: ``0``
-
-.. option:: --write-rate=<SIZE>
-
-    Set maximum  average write rate on  frontend connection.
-    Setting 0 to this option means write rate is unlimited.
-
-    Default: ``0``
-
-.. option:: --write-burst=<SIZE>
-
-    Set  maximum write  burst size  on frontend  connection.
-    Setting  0 to  this  option means  write  burst size  is
-    unlimited.
-
-    Default: ``0``
-
-.. option:: --worker-read-rate=<SIZE>
-
-    Set maximum average read rate on frontend connection per
-    worker.  Setting  0 to  this option  means read  rate is
-    unlimited.  Not implemented yet.
-
-    Default: ``0``
-
-.. option:: --worker-read-burst=<SIZE>
-
-    Set maximum  read burst size on  frontend connection per
-    worker.  Setting 0 to this  option means read burst size
-    is unlimited.  Not implemented yet.
-
-    Default: ``0``
-
-.. option:: --worker-write-rate=<SIZE>
-
-    Set maximum  average write  rate on  frontend connection
-    per worker.  Setting  0 to this option  means write rate
-    is unlimited.  Not implemented yet.
-
-    Default: ``0``
-
-.. option:: --worker-write-burst=<SIZE>
-
-    Set maximum write burst  size on frontend connection per
-    worker.  Setting 0 to this option means write burst size
-    is unlimited.  Not implemented yet.
-
-    Default: ``0``
-
-.. option:: --worker-frontend-connections=<N>
-
-    Set maximum number  of simultaneous connections frontend
-    accepts.  Setting 0 means unlimited.
-
-    Default: ``0``
-
-.. option:: --backend-connections-per-host=<N>
-
-    Set  maximum number  of  backend concurrent  connections
-    (and/or  streams in  case  of HTTP/2)  per origin  host.
-    This option  is meaningful when :option:`--http2-proxy`  option is
-    used.   The  origin  host  is  determined  by  authority
-    portion of  request URI (or :authority  header field for
-    HTTP/2).   To  limit  the   number  of  connections  per
-    frontend        for       default        mode,       use
-    :option:`--backend-connections-per-frontend`\.
-
-    Default: ``8``
-
-.. option:: --backend-connections-per-frontend=<N>
-
-    Set  maximum number  of  backend concurrent  connections
-    (and/or streams  in case of HTTP/2)  per frontend.  This
-    option  is   only  used  for  default   mode.   0  means
-    unlimited.  To limit the  number of connections per host
-    with          :option:`--http2-proxy`         option,          use
-    :option:`--backend-connections-per-host`\.
-
-    Default: ``0``
-
-.. option:: --rlimit-nofile=<N>
-
-    Set maximum number of open files (RLIMIT_NOFILE) to <N>.
-    If 0 is given, nghttpx does not set the limit.
-
-    Default: ``0``
-
-.. option:: --backend-request-buffer=<SIZE>
-
-    Set buffer size used to store backend request.
-
-    Default: ``16K``
-
-.. option:: --backend-response-buffer=<SIZE>
-
-    Set buffer size used to store backend response.
-
-    Default: ``128K``
-
-.. option:: --fastopen=<N>
-
-    Enables  "TCP Fast  Open" for  the listening  socket and
-    limits the  maximum length for the  queue of connections
-    that have not yet completed the three-way handshake.  If
-    value is 0 then fast open is disabled.
-
-    Default: ``0``
-
-.. option:: --no-kqueue
-
-    Don't use  kqueue.  This  option is only  applicable for
-    the platforms  which have kqueue.  For  other platforms,
-    this option will be simply ignored.
-
-
-Timeout
-~~~~~~~
-
-.. option:: --frontend-http2-read-timeout=<DURATION>
-
-    Specify read timeout for HTTP/2 frontend connection.
-
-    Default: ``3m``
-
-.. option:: --frontend-read-timeout=<DURATION>
-
-    Specify read timeout for HTTP/1.1 frontend connection.
-
-    Default: ``1m``
-
-.. option:: --frontend-write-timeout=<DURATION>
-
-    Specify write timeout for all frontend connections.
-
-    Default: ``30s``
-
-.. option:: --frontend-keep-alive-timeout=<DURATION>
-
-    Specify   keep-alive   timeout   for   frontend   HTTP/1
-    connection.
-
-    Default: ``1m``
-
-.. option:: --stream-read-timeout=<DURATION>
-
-    Specify  read timeout  for HTTP/2  streams.  0  means no
-    timeout.
-
-    Default: ``0``
-
-.. option:: --stream-write-timeout=<DURATION>
-
-    Specify write  timeout for  HTTP/2 streams.  0  means no
-    timeout.
-
-    Default: ``1m``
-
-.. option:: --backend-read-timeout=<DURATION>
-
-    Specify read timeout for backend connection.
-
-    Default: ``1m``
-
-.. option:: --backend-write-timeout=<DURATION>
-
-    Specify write timeout for backend connection.
-
-    Default: ``30s``
-
-.. option:: --backend-connect-timeout=<DURATION>
-
-    Specify  timeout before  establishing TCP  connection to
-    backend.
-
-    Default: ``30s``
-
-.. option:: --backend-keep-alive-timeout=<DURATION>
-
-    Specify   keep-alive   timeout    for   backend   HTTP/1
-    connection.
-
-    Default: ``2s``
-
-.. option:: --listener-disable-timeout=<DURATION>
-
-    After accepting  connection failed,  connection listener
-    is disabled  for a given  amount of time.   Specifying 0
-    disables this feature.
-
-    Default: ``30s``
-
-.. option:: --frontend-http2-setting-timeout=<DURATION>
-
-    Specify  timeout before  SETTINGS ACK  is received  from
-    client.
-
-    Default: ``10s``
-
-.. option:: --backend-http2-settings-timeout=<DURATION>
-
-    Specify  timeout before  SETTINGS ACK  is received  from
-    backend server.
-
-    Default: ``10s``
-
-.. option:: --backend-max-backoff=<DURATION>
-
-    Specify  maximum backoff  interval.  This  is used  when
-    doing health  check against offline backend  (see "fail"
-    parameter  in :option:`--backend`  option).   It is  also used  to
-    limit  the  maximum   interval  to  temporarily  disable
-    backend  when nghttpx  failed to  connect to  it.  These
-    intervals are calculated  using exponential backoff, and
-    consecutive failed attempts increase the interval.  This
-    option caps its maximum value.
-
-    Default: ``2m``
-
-
-SSL/TLS
-~~~~~~~
-
-.. option:: --ciphers=<SUITE>
-
-    Set allowed  cipher list  for frontend  connection.  The
-    format of the string is described in OpenSSL ciphers(1).
-
-    Default: ``ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256``
-
-.. option:: --client-ciphers=<SUITE>
-
-    Set  allowed cipher  list for  backend connection.   The
-    format of the string is described in OpenSSL ciphers(1).
-
-    Default: ``ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256``
-
-.. option:: --ecdh-curves=<LIST>
-
-    Set  supported  curve  list  for  frontend  connections.
-    <LIST> is a  colon separated list of curve  NID or names
-    in the preference order.  The supported curves depend on
-    the  linked  OpenSSL  library.  This  function  requires
-    OpenSSL >= 1.0.2.
-
-    Default: ``X25519:P-256:P-384:P-521``
-
-.. option:: -k, --insecure
-
-    Don't  verify backend  server's  certificate  if TLS  is
-    enabled for backend connections.
-
-.. option:: --cacert=<PATH>
-
-    Set path to trusted CA  certificate file.  It is used in
-    backend  TLS connections  to verify  peer's certificate.
-    It is also used to  verify OCSP response from the script
-    set by :option:`--fetch-ocsp-response-file`\.  The  file must be in
-    PEM format.   It can contain multiple  certificates.  If
-    the  linked OpenSSL  is configured  to load  system wide
-    certificates, they  are loaded at startup  regardless of
-    this option.
-
-.. option:: --private-key-passwd-file=<PATH>
-
-    Path  to file  that contains  password for  the server's
-    private key.   If none is  given and the private  key is
-    password protected it'll be requested interactively.
-
-.. option:: --subcert=<KEYPATH>:<CERTPATH>[[;<PARAM>]...]
-
-    Specify  additional certificate  and  private key  file.
-    nghttpx will  choose certificates based on  the hostname
-    indicated by client using TLS SNI extension.  If nghttpx
-    is  built with  OpenSSL  >= 1.0.2,  the shared  elliptic
-    curves (e.g., P-256) between  client and server are also
-    taken into  consideration.  This allows nghttpx  to send
-    ECDSA certificate  to modern clients, while  sending RSA
-    based certificate to older  clients.  This option can be
-    used  multiple  times.   To  make  OCSP  stapling  work,
-    <CERTPATH> must be absolute path.
-
-    Additional parameter  can be specified in  <PARAM>.  The
-    available <PARAM> is "sct-dir=<DIR>".
-
-    "sct-dir=<DIR>"  specifies the  path to  directory which
-    contains        \*.sct        files        for        TLS
-    signed_certificate_timestamp extension (RFC 6962).  This
-    feature   requires   OpenSSL   >=   1.0.2.    See   also
-    :option:`--tls-sct-dir` option.
-
-.. option:: --dh-param-file=<PATH>
-
-    Path to file that contains  DH parameters in PEM format.
-    Without  this   option,  DHE   cipher  suites   are  not
-    available.
-
-.. option:: --npn-list=<LIST>
-
-    Comma delimited list of  ALPN protocol identifier sorted
-    in the  order of preference.  That  means most desirable
-    protocol comes  first.  This  is used  in both  ALPN and
-    NPN.  The parameter must be  delimited by a single comma
-    only  and any  white spaces  are  treated as  a part  of
-    protocol string.
-
-    Default: ``h2,h2-16,h2-14,http/1.1``
-
-.. option:: --verify-client
-
-    Require and verify client certificate.
-
-.. option:: --verify-client-cacert=<PATH>
-
-    Path  to file  that contains  CA certificates  to verify
-    client certificate.  The file must be in PEM format.  It
-    can contain multiple certificates.
-
-.. option:: --verify-client-tolerate-expired
-
-    Accept  expired  client  certificate.   Operator  should
-    handle  the expired  client  certificate  by some  means
-    (e.g.,  mruby  script).   Otherwise, this  option  might
-    cause a security risk.
-
-.. option:: --client-private-key-file=<PATH>
-
-    Path to  file that contains  client private key  used in
-    backend client authentication.
-
-.. option:: --client-cert-file=<PATH>
-
-    Path to  file that  contains client certificate  used in
-    backend client authentication.
-
-.. option:: --tls-min-proto-version=<VER>
-
-    Specify minimum SSL/TLS protocol.   The name matching is
-    done in  case-insensitive manner.  The  versions between
-    :option:`--tls-min-proto-version` and  :option:`\--tls-max-proto-version` are
-    enabled.  If the protocol list advertised by client does
-    not  overlap  this range,  you  will  receive the  error
-    message "unknown protocol".  If a protocol version lower
-    than TLSv1.2 is specified, make sure that the compatible
-    ciphers are  included in :option:`--ciphers` option.   The default
-    cipher  list  only   includes  ciphers  compatible  with
-    TLSv1.2 or above.  The available versions are:
-    TLSv1.2, TLSv1.1, and TLSv1.0
-
-    Default: ``TLSv1.2``
-
-.. option:: --tls-max-proto-version=<VER>
-
-    Specify maximum SSL/TLS protocol.   The name matching is
-    done in  case-insensitive manner.  The  versions between
-    :option:`--tls-min-proto-version` and  :option:`\--tls-max-proto-version` are
-    enabled.  If the protocol list advertised by client does
-    not  overlap  this range,  you  will  receive the  error
-    message "unknown protocol".  The available versions are:
-    TLSv1.2, TLSv1.1, and TLSv1.0
-
-    Default: ``TLSv1.2``
-
-.. option:: --tls-ticket-key-file=<PATH>
-
-    Path to file that contains  random data to construct TLS
-    session ticket  parameters.  If aes-128-cbc is  given in
-    :option:`--tls-ticket-key-cipher`\, the  file must  contain exactly
-    48    bytes.     If     aes-256-cbc    is    given    in
-    :option:`--tls-ticket-key-cipher`\, the  file must  contain exactly
-    80  bytes.   This  options  can be  used  repeatedly  to
-    specify  multiple ticket  parameters.  If  several files
-    are given,  only the  first key is  used to  encrypt TLS
-    session  tickets.  Other  keys are  accepted but  server
-    will  issue new  session  ticket with  first key.   This
-    allows  session  key  rotation.  Please  note  that  key
-    rotation  does  not  occur automatically.   User  should
-    rearrange  files or  change options  values and  restart
-    nghttpx gracefully.   If opening  or reading  given file
-    fails, all loaded  keys are discarded and  it is treated
-    as if none  of this option is given.  If  this option is
-    not given or an error  occurred while opening or reading
-    a file,  key is  generated every  1 hour  internally and
-    they are  valid for  12 hours.   This is  recommended if
-    ticket  key sharing  between  nghttpx  instances is  not
-    required.
-
-.. option:: --tls-ticket-key-memcached=<HOST>,<PORT>[;tls]
-
-    Specify address  of memcached  server to get  TLS ticket
-    keys for  session resumption.   This enables  shared TLS
-    ticket key between  multiple nghttpx instances.  nghttpx
-    does not set TLS ticket  key to memcached.  The external
-    ticket key generator is required.  nghttpx just gets TLS
-    ticket  keys  from  memcached, and  use  them,  possibly
-    replacing current set  of keys.  It is up  to extern TLS
-    ticket  key generator  to rotate  keys frequently.   See
-    "TLS SESSION  TICKET RESUMPTION" section in  manual page
-    to know the data format in memcached entry.  Optionally,
-    memcached  connection  can  be  encrypted  with  TLS  by
-    specifying "tls" parameter.
-
-.. option:: --tls-ticket-key-memcached-address-family=(auto|IPv4|IPv6)
-
-    Specify address  family of memcached connections  to get
-    TLS ticket keys.  If "auto" is given, both IPv4 and IPv6
-    are considered.   If "IPv4" is given,  only IPv4 address
-    is considered.  If "IPv6" is given, only IPv6 address is
-    considered.
-
-    Default: ``auto``
-
-.. option:: --tls-ticket-key-memcached-interval=<DURATION>
-
-    Set interval to get TLS ticket keys from memcached.
-
-    Default: ``10m``
-
-.. option:: --tls-ticket-key-memcached-max-retry=<N>
-
-    Set  maximum   number  of  consecutive   retries  before
-    abandoning TLS ticket key  retrieval.  If this number is
-    reached,  the  attempt  is considered  as  failure,  and
-    "failure" count  is incremented by 1,  which contributed
-    to            the            value            controlled
-    :option:`--tls-ticket-key-memcached-max-fail` option.
-
-    Default: ``3``
-
-.. option:: --tls-ticket-key-memcached-max-fail=<N>
-
-    Set  maximum   number  of  consecutive   failure  before
-    disabling TLS ticket until next scheduled key retrieval.
-
-    Default: ``2``
-
-.. option:: --tls-ticket-key-cipher=<CIPHER>
-
-    Specify cipher  to encrypt TLS session  ticket.  Specify
-    either   aes-128-cbc   or  aes-256-cbc.    By   default,
-    aes-128-cbc is used.
-
-.. option:: --tls-ticket-key-memcached-cert-file=<PATH>
-
-    Path to client certificate  for memcached connections to
-    get TLS ticket keys.
-
-.. option:: --tls-ticket-key-memcached-private-key-file=<PATH>
-
-    Path to client private  key for memcached connections to
-    get TLS ticket keys.
-
-.. option:: --fetch-ocsp-response-file=<PATH>
-
-    Path to  fetch-ocsp-response script file.  It  should be
-    absolute path.
-
-    Default: ``/usr/local/share/nghttp2/fetch-ocsp-response``
-
-.. option:: --ocsp-update-interval=<DURATION>
-
-    Set interval to update OCSP response cache.
-
-    Default: ``4h``
-
-.. option:: --ocsp-startup
-
-    Start  accepting connections  after initial  attempts to
-    get OCSP responses  finish.  It does not  matter some of
-    the  attempts  fail.  This  feature  is  useful if  OCSP
-    responses   must    be   available    before   accepting
-    connections.
-
-.. option:: --no-verify-ocsp
-
-    nghttpx does not verify OCSP response.
-
-.. option:: --no-ocsp
-
-    Disable OCSP stapling.
-
-.. option:: --tls-session-cache-memcached=<HOST>,<PORT>[;tls]
-
-    Specify  address of  memcached server  to store  session
-    cache.   This  enables   shared  session  cache  between
-    multiple   nghttpx  instances.    Optionally,  memcached
-    connection can be encrypted with TLS by specifying "tls"
-    parameter.
-
-.. option:: --tls-session-cache-memcached-address-family=(auto|IPv4|IPv6)
-
-    Specify address family of memcached connections to store
-    session cache.  If  "auto" is given, both  IPv4 and IPv6
-    are considered.   If "IPv4" is given,  only IPv4 address
-    is considered.  If "IPv6" is given, only IPv6 address is
-    considered.
-
-    Default: ``auto``
-
-.. option:: --tls-session-cache-memcached-cert-file=<PATH>
-
-    Path to client certificate  for memcached connections to
-    store session cache.
-
-.. option:: --tls-session-cache-memcached-private-key-file=<PATH>
-
-    Path to client private  key for memcached connections to
-    store session cache.
-
-.. option:: --tls-dyn-rec-warmup-threshold=<SIZE>
-
-    Specify the  threshold size for TLS  dynamic record size
-    behaviour.  During  a TLS  session, after  the threshold
-    number of bytes  have been written, the  TLS record size
-    will be increased to the maximum allowed (16K).  The max
-    record size will  continue to be used on  the active TLS
-    session.  After  :option:`--tls-dyn-rec-idle-timeout` has elapsed,
-    the record size is reduced  to 1300 bytes.  Specify 0 to
-    always use  the maximum record size,  regardless of idle
-    period.   This  behaviour  applies   to  all  TLS  based
-    frontends, and TLS HTTP/2 backends.
-
-    Default: ``1M``
-
-.. option:: --tls-dyn-rec-idle-timeout=<DURATION>
-
-    Specify TLS dynamic record  size behaviour timeout.  See
-    :option:`--tls-dyn-rec-warmup-threshold`  for   more  information.
-    This behaviour  applies to all TLS  based frontends, and
-    TLS HTTP/2 backends.
-
-    Default: ``1s``
-
-.. option:: --no-http2-cipher-black-list
-
-    Allow  black  listed  cipher suite  on  frontend  HTTP/2
-    connection.                                          See
-    https://tools.ietf.org/html/rfc7540#appendix-A  for  the
-    complete HTTP/2 cipher suites black list.
-
-.. option:: --client-no-http2-cipher-black-list
-
-    Allow  black  listed  cipher  suite  on  backend  HTTP/2
-    connection.                                          See
-    https://tools.ietf.org/html/rfc7540#appendix-A  for  the
-    complete HTTP/2 cipher suites black list.
-
-.. option:: --tls-sct-dir=<DIR>
-
-    Specifies the  directory where  \*.sct files  exist.  All
-    \*.sct   files   in  <DIR>   are   read,   and  sent   as
-    extension_data of  TLS signed_certificate_timestamp (RFC
-    6962)  to  client.   These   \*.sct  files  are  for  the
-    certificate   specified   in   positional   command-line
-    argument <CERT>, or  certificate option in configuration
-    file.   For   additional  certificates,   use  :option:`--subcert`
-    option.  This option requires OpenSSL >= 1.0.2.
-
-.. option:: --psk-secrets=<PATH>
-
-    Read list of PSK identity and secrets from <PATH>.  This
-    is used for frontend connection.  The each line of input
-    file  is  formatted  as  <identity>:<hex-secret>,  where
-    <identity> is  PSK identity, and <hex-secret>  is secret
-    in hex.  An  empty line, and line which  starts with '#'
-    are skipped.  The default  enabled cipher list might not
-    contain any PSK cipher suite.  In that case, desired PSK
-    cipher suites  must be  enabled using  :option:`--ciphers` option.
-    The  desired PSK  cipher suite  may be  black listed  by
-    HTTP/2.   To  use  those   cipher  suites  with  HTTP/2,
-    consider  to  use  :option:`--no-http2-cipher-black-list`  option.
-    But be aware its implications.
-
-.. option:: --client-psk-secrets=<PATH>
-
-    Read PSK identity and secrets from <PATH>.  This is used
-    for backend connection.  The each  line of input file is
-    formatted  as <identity>:<hex-secret>,  where <identity>
-    is PSK identity, and <hex-secret>  is secret in hex.  An
-    empty line, and line which  starts with '#' are skipped.
-    The first identity and  secret pair encountered is used.
-    The default  enabled cipher  list might not  contain any
-    PSK  cipher suite.   In  that case,  desired PSK  cipher
-    suites  must be  enabled using  :option:`--client-ciphers` option.
-    The  desired PSK  cipher suite  may be  black listed  by
-    HTTP/2.   To  use  those   cipher  suites  with  HTTP/2,
-    consider   to  use   :option:`--client-no-http2-cipher-black-list`
-    option.  But be aware its implications.
-
-
-HTTP/2
-~~~~~~
-
-.. option:: -c, --frontend-http2-max-concurrent-streams=<N>
-
-    Set the maximum number of  the concurrent streams in one
-    frontend HTTP/2 session.
-
-    Default: ``100``
-
-.. option:: --backend-http2-max-concurrent-streams=<N>
-
-    Set the maximum number of  the concurrent streams in one
-    backend  HTTP/2 session.   This sets  maximum number  of
-    concurrent opened pushed streams.  The maximum number of
-    concurrent requests are set by a remote server.
-
-    Default: ``100``
-
-.. option:: --frontend-http2-window-size=<SIZE>
-
-    Sets  the  per-stream  initial  window  size  of  HTTP/2
-    frontend connection.
-
-    Default: ``65535``
-
-.. option:: --frontend-http2-connection-window-size=<SIZE>
-
-    Sets the  per-connection window size of  HTTP/2 frontend
-    connection.
-
-    Default: ``65535``
-
-.. option:: --backend-http2-window-size=<SIZE>
-
-    Sets  the   initial  window   size  of   HTTP/2  backend
-    connection.
-
-    Default: ``65535``
-
-.. option:: --backend-http2-connection-window-size=<SIZE>
-
-    Sets the  per-connection window  size of  HTTP/2 backend
-    connection.
-
-    Default: ``2147483647``
-
-.. option:: --http2-no-cookie-crumbling
-
-    Don't crumble cookie header field.
-
-.. option:: --padding=<N>
-
-    Add  at most  <N> bytes  to  a HTTP/2  frame payload  as
-    padding.  Specify 0 to  disable padding.  This option is
-    meant for debugging purpose  and not intended to enhance
-    protocol security.
-
-.. option:: --no-server-push
-
-    Disable HTTP/2 server push.  Server push is supported by
-    default mode and HTTP/2  frontend via Link header field.
-    It is  also supported if  both frontend and  backend are
-    HTTP/2 in default mode.  In  this case, server push from
-    backend session is relayed  to frontend, and server push
-    via Link header field is also supported.
-
-.. option:: --frontend-http2-optimize-write-buffer-size
-
-    (Experimental) Enable write  buffer size optimization in
-    frontend HTTP/2 TLS  connection.  This optimization aims
-    to reduce  write buffer  size so  that it  only contains
-    bytes  which can  send immediately.   This makes  server
-    more responsive to prioritized HTTP/2 stream because the
-    buffering  of lower  priority stream  is reduced.   This
-    option is only effective on recent Linux platform.
-
-.. option:: --frontend-http2-optimize-window-size
-
-    (Experimental)   Automatically  tune   connection  level
-    window size of frontend  HTTP/2 TLS connection.  If this
-    feature is  enabled, connection window size  starts with
-    the   default  window   size,   65535  bytes.    nghttpx
-    automatically  adjusts connection  window size  based on
-    TCP receiving  window size.  The maximum  window size is
-    capped      by      the     value      specified      by
-    :option:`--frontend-http2-connection-window-size`\.     Since   the
-    stream is subject to stream level window size, it should
-    be adjusted using :option:`--frontend-http2-window-size` option as
-    well.   This option  is only  effective on  recent Linux
-    platform.
-
-.. option:: --frontend-http2-encoder-dynamic-table-size=<SIZE>
-
-    Specify the maximum dynamic  table size of HPACK encoder
-    in the frontend HTTP/2 connection.  The decoder (client)
-    specifies  the maximum  dynamic table  size it  accepts.
-    Then the negotiated dynamic table size is the minimum of
-    this option value and the value which client specified.
-
-    Default: ``4K``
-
-.. option:: --frontend-http2-decoder-dynamic-table-size=<SIZE>
-
-    Specify the maximum dynamic  table size of HPACK decoder
-    in the frontend HTTP/2 connection.
-
-    Default: ``4K``
-
-.. option:: --backend-http2-encoder-dynamic-table-size=<SIZE>
-
-    Specify the maximum dynamic  table size of HPACK encoder
-    in the backend HTTP/2 connection.  The decoder (backend)
-    specifies  the maximum  dynamic table  size it  accepts.
-    Then the negotiated dynamic table size is the minimum of
-    this option value and the value which backend specified.
-
-    Default: ``4K``
-
-.. option:: --backend-http2-decoder-dynamic-table-size=<SIZE>
-
-    Specify the maximum dynamic  table size of HPACK decoder
-    in the backend HTTP/2 connection.
-
-    Default: ``4K``
-
-
-Mode
-~~~~
-
-.. describe:: (default mode)
-
-    
-    Accept  HTTP/2,  and  HTTP/1.1 over  SSL/TLS.   "no-tls"
-    parameter is  used in  :option:`--frontend` option,  accept HTTP/2
-    and HTTP/1.1 over cleartext  TCP.  The incoming HTTP/1.1
-    connection  can  be  upgraded  to  HTTP/2  through  HTTP
-    Upgrade.
-
-.. option:: -s, --http2-proxy
-
-    Like default mode, but enable forward proxy.  This is so
-    called HTTP/2 proxy mode.
-
-
-Logging
-~~~~~~~
-
-.. option:: -L, --log-level=<LEVEL>
-
-    Set the severity  level of log output.   <LEVEL> must be
-    one of INFO, NOTICE, WARN, ERROR and FATAL.
-
-    Default: ``NOTICE``
-
-.. option:: --accesslog-file=<PATH>
-
-    Set path to write access log.  To reopen file, send USR1
-    signal to nghttpx.
-
-.. option:: --accesslog-syslog
-
-    Send  access log  to syslog.   If this  option is  used,
-    :option:`--accesslog-file` option is ignored.
-
-.. option:: --accesslog-format=<FORMAT>
-
-    Specify  format  string  for access  log.   The  default
-    format is combined format.   The following variables are
-    available:
-
-    * $remote_addr: client IP address.
-    * $time_local: local time in Common Log format.
-    * $time_iso8601: local time in ISO 8601 format.
-    * $request: HTTP request line.
-    * $status: HTTP response status code.
-    * $body_bytes_sent: the  number of bytes sent  to client
-      as response body.
-    * $http_<VAR>: value of HTTP  request header <VAR> where
-      '_' in <VAR> is replaced with '-'.
-    * $remote_port: client  port.
-    * $server_port: server port.
-    * $request_time: request processing time in seconds with
-      milliseconds resolution.
-    * $pid: PID of the running process.
-    * $alpn: ALPN identifier of the protocol which generates
-      the response.   For HTTP/1,  ALPN is  always http/1.1,
-      regardless of minor version.
-    * $tls_cipher: cipher used for SSL/TLS connection.
-    * $tls_client_fingerprint_sha256: SHA-256 fingerprint of
-      client certificate.
-    * $tls_client_fingerprint_sha1:  SHA-1   fingerprint  of
-      client certificate.
-    * $tls_client_subject_name:   subject  name   in  client
-      certificate.
-    * $tls_client_issuer_name:   issuer   name   in   client
-      certificate.
-    * $tls_client_serial:    serial    number   in    client
-      certificate.
-    * $tls_protocol: protocol for SSL/TLS connection.
-    * $tls_session_id: session ID for SSL/TLS connection.
-    * $tls_session_reused:  "r"   if  SSL/TLS   session  was
-      reused.  Otherwise, "."
-    * $tls_sni: SNI server name for SSL/TLS connection.
-    * $backend_host:  backend  host   used  to  fulfill  the
-      request.  "-" if backend host is not available.
-    * $backend_port:  backend  port   used  to  fulfill  the
-      request.  "-" if backend host is not available.
-
-    The  variable  can  be  enclosed  by  "{"  and  "}"  for
-    disambiguation (e.g., ${remote_addr}).
-
-
-    Default: ``$remote_addr - - [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"``
-
-.. option:: --accesslog-write-early
-
-    Write  access  log  when   response  header  fields  are
-    received   from  backend   rather   than  when   request
-    transaction finishes.
-
-.. option:: --errorlog-file=<PATH>
-
-    Set path to write error  log.  To reopen file, send USR1
-    signal  to nghttpx.   stderr will  be redirected  to the
-    error log file unless :option:`--errorlog-syslog` is used.
-
-    Default: ``/dev/stderr``
-
-.. option:: --errorlog-syslog
-
-    Send  error log  to  syslog.  If  this  option is  used,
-    :option:`--errorlog-file` option is ignored.
-
-.. option:: --syslog-facility=<FACILITY>
-
-    Set syslog facility to <FACILITY>.
-
-    Default: ``daemon``
-
-
-HTTP
-~~~~
-
-.. option:: --add-x-forwarded-for
-
-    Append  X-Forwarded-For header  field to  the downstream
-    request.
-
-.. option:: --strip-incoming-x-forwarded-for
-
-    Strip X-Forwarded-For  header field from  inbound client
-    requests.
-
-.. option:: --no-add-x-forwarded-proto
-
-    Don't append  additional X-Forwarded-Proto  header field
-    to  the   backend  request.   If  inbound   client  sets
-    X-Forwarded-Proto,                                   and
-    :option:`--no-strip-incoming-x-forwarded-proto`  option  is  used,
-    they are passed to the backend.
-
-.. option:: --no-strip-incoming-x-forwarded-proto
-
-    Don't strip X-Forwarded-Proto  header field from inbound
-    client requests.
-
-.. option:: --add-forwarded=<LIST>
-
-    Append RFC  7239 Forwarded header field  with parameters
-    specified in comma delimited list <LIST>.  The supported
-    parameters  are "by",  "for", "host",  and "proto".   By
-    default,  the value  of  "by" and  "for" parameters  are
-    obfuscated     string.     See     :option:`--forwarded-by`    and
-    :option:`--forwarded-for` options respectively.  Note that nghttpx
-    does  not  translate non-standard  X-Forwarded-\*  header
-    fields into Forwarded header field, and vice versa.
-
-.. option:: --strip-incoming-forwarded
-
-    Strip  Forwarded   header  field  from   inbound  client
-    requests.
-
-.. option:: --forwarded-by=(obfuscated|ip|<VALUE>)
-
-    Specify the parameter value sent out with "by" parameter
-    of Forwarded  header field.   If "obfuscated"  is given,
-    the string is randomly generated at startup.  If "ip" is
-    given,   the  interface   address  of   the  connection,
-    including port number, is  sent with "by" parameter.  In
-    case of UNIX domain  socket, "localhost" is used instead
-    of address and  port.  User can also  specify the static
-    obfuscated string.  The limitation is that it must start
-    with   "_",  and   only   consists   of  character   set
-    [A-Za-z0-9._-], as described in RFC 7239.
-
-    Default: ``obfuscated``
-
-.. option:: --forwarded-for=(obfuscated|ip)
-
-    Specify  the   parameter  value  sent  out   with  "for"
-    parameter of Forwarded header field.  If "obfuscated" is
-    given, the string is  randomly generated for each client
-    connection.  If "ip" is given, the remote client address
-    of  the connection,  without port  number, is  sent with
-    "for"  parameter.   In  case   of  UNIX  domain  socket,
-    "localhost" is used instead of address.
-
-    Default: ``obfuscated``
-
-.. option:: --no-via
-
-    Don't append to  Via header field.  If  Via header field
-    is received, it is left unaltered.
-
-.. option:: --no-location-rewrite
-
-    Don't  rewrite location  header field  in default  mode.
-    When :option:`--http2-proxy`  is used, location header  field will
-    not be altered regardless of this option.
-
-.. option:: --host-rewrite
-
-    Rewrite  host and  :authority header  fields in  default
-    mode.  When  :option:`--http2-proxy` is  used, these  headers will
-    not be altered regardless of this option.
-
-.. option:: --altsvc=<PROTOID,PORT[,HOST,[ORIGIN]]>
-
-    Specify   protocol  ID,   port,  host   and  origin   of
-    alternative service.  <HOST>  and <ORIGIN> are optional.
-    They  are advertised  in  alt-svc header  field only  in
-    HTTP/1.1  frontend.  This  option can  be used  multiple
-    times   to   specify  multiple   alternative   services.
-    Example: :option:`--altsvc`\=h2,443
-
-.. option:: --add-request-header=<HEADER>
-
-    Specify additional header field to add to request header
-    set.  This  option just  appends header field  and won't
-    replace anything  already set.  This option  can be used
-    several  times   to  specify  multiple   header  fields.
-    Example: :option:`--add-request-header`\="foo: bar"
-
-.. option:: --add-response-header=<HEADER>
-
-    Specify  additional  header  field to  add  to  response
-    header set.   This option just appends  header field and
-    won't replace anything already  set.  This option can be
-    used several  times to  specify multiple  header fields.
-    Example: :option:`--add-response-header`\="foo: bar"
-
-.. option:: --request-header-field-buffer=<SIZE>
-
-    Set maximum buffer size for incoming HTTP request header
-    field list.  This is the sum of header name and value in
-    bytes.   If  trailer  fields  exist,  they  are  counted
-    towards this number.
-
-    Default: ``64K``
-
-.. option:: --max-request-header-fields=<N>
-
-    Set  maximum  number  of incoming  HTTP  request  header
-    fields.   If  trailer  fields exist,  they  are  counted
-    towards this number.
-
-    Default: ``100``
-
-.. option:: --response-header-field-buffer=<SIZE>
-
-    Set  maximum  buffer  size for  incoming  HTTP  response
-    header field list.   This is the sum of  header name and
-    value  in  bytes.  If  trailer  fields  exist, they  are
-    counted towards this number.
-
-    Default: ``64K``
-
-.. option:: --max-response-header-fields=<N>
-
-    Set  maximum number  of  incoming  HTTP response  header
-    fields.   If  trailer  fields exist,  they  are  counted
-    towards this number.
-
-    Default: ``500``
-
-.. option:: --error-page=(<CODE>|*)=<PATH>
-
-    Set file path  to custom error page  served when nghttpx
-    originally  generates  HTTP  error status  code  <CODE>.
-    <CODE> must be greater than or equal to 400, and at most
-    599.  If "\*"  is used instead of <CODE>,  it matches all
-    HTTP  status  code.  If  error  status  code comes  from
-    backend server, the custom error pages are not used.
-
-.. option:: --server-name=<NAME>
-
-    Change server response header field value to <NAME>.
-
-    Default: ``nghttpx``
-
-.. option:: --no-server-rewrite
-
-    Don't rewrite server header field in default mode.  When
-    :option:`--http2-proxy` is used, these headers will not be altered
-    regardless of this option.
-
-.. option:: --redirect-https-port=<PORT>
-
-    Specify the port number which appears in Location header
-    field  when  redirect  to  HTTPS  URI  is  made  due  to
-    "redirect-if-not-tls" parameter in :option:`--backend` option.
-
-    Default: ``443``
-
-
-API
-~~~
-
-.. option:: --api-max-request-body=<SIZE>
-
-    Set the maximum size of request body for API request.
-
-    Default: ``32M``
-
-
-DNS
-~~~
-
-.. option:: --dns-cache-timeout=<DURATION>
-
-    Set duration that cached DNS results remain valid.  Note
-    that nghttpx caches the unsuccessful results as well.
-
-    Default: ``10s``
-
-.. option:: --dns-lookup-timeout=<DURATION>
-
-    Set timeout that  DNS server is given to  respond to the
-    initial  DNS  query.  For  the  2nd  and later  queries,
-    server is  given time based  on this timeout, and  it is
-    scaled linearly.
-
-    Default: ``5s``
-
-.. option:: --dns-max-try=<N>
-
-    Set the number of DNS query before nghttpx gives up name
-    lookup.
-
-    Default: ``2``
-
-.. option:: --frontend-max-requests=<N>
-
-    The number  of requests that single  frontend connection
-    can process.  For HTTP/2, this  is the number of streams
-    in  one  HTTP/2 connection.   For  HTTP/1,  this is  the
-    number of keep alive requests.  This is hint to nghttpx,
-    and it  may allow additional few  requests.  The default
-    value is unlimited.
-
-
-Debug
-~~~~~
-
-.. option:: --frontend-http2-dump-request-header=<PATH>
-
-    Dumps request headers received by HTTP/2 frontend to the
-    file denoted  in <PATH>.  The  output is done  in HTTP/1
-    header field format and each header block is followed by
-    an empty line.  This option  is not thread safe and MUST
-    NOT be used with option :option:`-n`\<N>, where <N> >= 2.
-
-.. option:: --frontend-http2-dump-response-header=<PATH>
-
-    Dumps response headers sent  from HTTP/2 frontend to the
-    file denoted  in <PATH>.  The  output is done  in HTTP/1
-    header field format and each header block is followed by
-    an empty line.  This option  is not thread safe and MUST
-    NOT be used with option :option:`-n`\<N>, where <N> >= 2.
-
-.. option:: -o, --frontend-frame-debug
-
-    Print HTTP/2 frames in  frontend to stderr.  This option
-    is  not thread  safe and  MUST NOT  be used  with option
-    :option:`-n`\=N, where N >= 2.
-
-
-Process
-~~~~~~~
-
-.. option:: -D, --daemon
-
-    Run in a background.  If :option:`-D` is used, the current working
-    directory is changed to '*/*'.
-
-.. option:: --pid-file=<PATH>
-
-    Set path to save PID of this program.
-
-.. option:: --user=<USER>
-
-    Run this program as <USER>.   This option is intended to
-    be used to drop root privileges.
-
-.. option:: --single-process
-
-    Run this program in a  single process mode for debugging
-    purpose.  Without this option,  nghttpx creates at least
-    2  processes:  master  and worker  processes.   If  this
-    option is  used, master  and worker  are unified  into a
-    single process.  nghttpx still spawns additional process
-    if neverbleed is used.  In  the single process mode, the
-    signal handling feature is disabled.
-
-
-Scripting
-~~~~~~~~~
-
-.. option:: --mruby-file=<PATH>
-
-    Set mruby script file
-
-.. option:: --ignore-per-pattern-mruby-error
-
-    Ignore mruby compile error  for per-pattern mruby script
-    file.  If error  occurred, it is treated as  if no mruby
-    file were specified for the pattern.
-
-
-Misc
-~~~~
-
-.. option:: --conf=<PATH>
-
-    Load  configuration  from   <PATH>.   Please  note  that
-    nghttpx always  tries to read the  default configuration
-    file if :option:`--conf` is not given.
-
-    Default: ``/etc/nghttpx/nghttpx.conf``
-
-.. option:: --include=<PATH>
-
-    Load additional configurations from <PATH>.  File <PATH>
-    is  read  when  configuration  parser  encountered  this
-    option.  This option can be used multiple times, or even
-    recursively.
-
-.. option:: -v, --version
-
-    Print version and exit.
-
-.. option:: -h, --help
-
-    Print this help and exit.
-
-
-
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-
-FILES
------
-
-*/etc/nghttpx/nghttpx.conf*
-  The default configuration file path nghttpx searches at startup.
-  The configuration file path can be changed using :option:`--conf`
-  option.
-
-  Those lines which are staring ``#`` are treated as comment.
-
-  The option name in the configuration file is the long command-line
-  option name with leading ``--`` stripped (e.g., ``frontend``).  Put
-  ``=`` between option name and value.  Don't put extra leading or
-  trailing spaces.
-
-  When specifying arguments including characters which have special
-  meaning to a shell, we usually use quotes so that shell does not
-  interpret them.  When writing this configuration file, quotes for
-  this purpose must not be used.  For example, specify additional
-  request header field, do this:
-
-  .. code-block:: text
-
-    add-request-header=foo: bar
-
-  instead of:
-
-  .. code-block:: text
-
-    add-request-header="foo: bar"
-
-  The options which do not take argument in the command-line *take*
-  argument in the configuration file.  Specify ``yes`` as an argument
-  (e.g., ``http2-proxy=yes``).  If other string is given, it is
-  ignored.
-
-  To specify private key and certificate file which are given as
-  positional arguments in command-line, use ``private-key-file`` and
-  ``certificate-file``.
-
-  :option:`--conf` option cannot be used in the configuration file and
-  will be ignored if specified.
-
-Error log
-  Error log is written to stderr by default.  It can be configured
-  using :option:`--errorlog-file`.  The format of log message is as
-  follows:
-
-  <datetime> <master-pid> <current-pid> <thread-id> <level> (<filename>:<line>) <msg>
-
-  <datetime>
-    It is a combination of date and time when the log is written.  It
-    is in ISO 8601 format.
-
-  <master-pid>
-    It is a master process ID.
-
-  <current-pid>
-    It is a process ID which writes this log.
-
-  <thread-id>
-    It is a thread ID which writes this log.  It would be unique
-    within <current-pid>.
-
-  <filename> and <line>
-    They are source file name, and line number which produce this log.
-
-  <msg>
-    It is a log message body.
-
-SIGNALS
--------
-
-SIGQUIT
-  Shutdown gracefully.  First accept pending connections and stop
-  accepting connection.  After all connections are handled, nghttpx
-  exits.
-
-SIGHUP
-  Reload configuration file given in :option:`--conf`.
-
-SIGUSR1
-  Reopen log files.
-
-SIGUSR2
-
-  Fork and execute nghttpx.  It will execute the binary in the same
-  path with same command-line arguments and environment variables.  As
-  of nghttpx version 1.20.0, the new master process sends SIGQUIT to
-  the original master process when it is ready to serve requests.  For
-  the earlier versions of nghttpx, user has to send SIGQUIT to the
-  original master process.
-
-  The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former
-  is usually used to execute new binary, and the master process is
-  newly spawned.  On the other hand, the latter just reloads
-  configuration file, and the same master process continues to exist.
-
-.. note::
-
-  nghttpx consists of multiple processes: one process for processing
-  these signals, and another one for processing requests.  The former
-  spawns the latter.  The former is called master process, and the
-  latter is called worker process.  If neverbleed is enabled, the
-  worker process spawns neverbleed daemon process which does RSA key
-  processing.  The above signal must be sent to the master process.
-  If the other processes received one of them, it is ignored.  This
-  behaviour of these processes may change in the future release.  In
-  other words, in the future release, the processes other than master
-  process may terminate upon the reception of these signals.
-  Therefore these signals should not be sent to the processes other
-  than master process.
-
-SERVER PUSH
------------
-
-nghttpx supports HTTP/2 server push in default mode with Link header
-field.  nghttpx looks for Link header field (`RFC 5988
-<http://tools.ietf.org/html/rfc5988>`_) in response headers from
-backend server and extracts URI-reference with parameter
-``rel=preload`` (see `preload
-<http://w3c.github.io/preload/#interoperability-with-http-link-header>`_)
-and pushes those URIs to the frontend client. Here is a sample Link
-header field to initiate server push:
-
-.. code-block:: text
-
-  Link: </fonts/font.woff>; rel=preload
-  Link: </css/theme.css>; rel=preload
-
-Currently, the following restriction is applied for server push:
-
-1. The associated stream must have method "GET" or "POST".  The
-   associated stream's status code must be 200.
-
-This limitation may be loosened in the future release.
-
-nghttpx also supports server push if both frontend and backend are
-HTTP/2 in default mode.  In this case, in addition to server push via
-Link header field, server push from backend is forwarded to frontend
-HTTP/2 session.
-
-HTTP/2 server push will be disabled if :option:`--http2-proxy` is
-used.
-
-UNIX DOMAIN SOCKET
-------------------
-
-nghttpx supports UNIX domain socket with a filename for both frontend
-and backend connections.
-
-Please note that current nghttpx implementation does not delete a
-socket with a filename.  And on start up, if nghttpx detects that the
-specified socket already exists in the file system, nghttpx first
-deletes it.  However, if SIGUSR2 is used to execute new binary and
-both old and new configurations use same filename, new binary does not
-delete the socket and continues to use it.
-
-OCSP STAPLING
--------------
-
-OCSP query is done using external Python script
-``fetch-ocsp-response``, which has been originally developed in Perl
-as part of h2o project (https://github.com/h2o/h2o), and was
-translated into Python.
-
-The script file is usually installed under
-``$(prefix)/share/nghttp2/`` directory.  The actual path to script can
-be customized using :option:`--fetch-ocsp-response-file` option.
-
-If OCSP query is failed, previous OCSP response, if any, is continued
-to be used.
-
-:option:`--fetch-ocsp-response-file` option provides wide range of
-possibility to manage OCSP response.  It can take an arbitrary script
-or executable.  The requirement is that it supports the command-line
-interface of ``fetch-ocsp-response`` script, and it must return a
-valid DER encoded OCSP response on success.  It must return exit code
-0 on success, and 75 for temporary error, and the other error code for
-generic failure.  For large cluster of servers, it is not efficient
-for each server to perform OCSP query using ``fetch-ocsp-response``.
-Instead, you can retrieve OCSP response in some way, and store it in a
-disk or a shared database.  Then specify a program in
-:option:`--fetch-ocsp-response-file` to fetch it from those stores.
-This could provide a way to share the OCSP response between fleet of
-servers, and also any OCSP query strategy can be applied which may be
-beyond the ability of nghttpx itself or ``fetch-ocsp-response``
-script.
-
-TLS SESSION RESUMPTION
-----------------------
-
-nghttpx supports TLS session resumption through both session ID and
-session ticket.
-
-SESSION ID RESUMPTION
-~~~~~~~~~~~~~~~~~~~~~
-
-By default, session ID is shared by all worker threads.
-
-If :option:`--tls-session-cache-memcached` is given, nghttpx will
-insert serialized session data to memcached with
-``nghttpx:tls-session-cache:`` + lowercase hex string of session ID
-as a memcached entry key, with expiry time 12 hours.  Session timeout
-is set to 12 hours.
-
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use ``tls`` keyword in
-:option:`--tls-session-cache-memcached` option.
-
-TLS SESSION TICKET RESUMPTION
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, session ticket is shared by all worker threads.  The
-automatic key rotation is also enabled by default.  Every an hour, new
-encryption key is generated, and previous encryption key becomes
-decryption only key.  We set session timeout to 12 hours, and thus we
-keep at most 12 keys.
-
-If :option:`--tls-ticket-key-memcached` is given, encryption keys are
-retrieved from memcached.  nghttpx just reads keys from memcached; one
-has to deploy key generator program to update keys frequently (e.g.,
-every 1 hour).  The example key generator tlsticketupdate.go is
-available under contrib directory in nghttp2 archive.  The memcached
-entry key is ``nghttpx:tls-ticket-key``.  The data format stored in
-memcached is the binary format described below:
-
-.. code-block:: text
-
-    +--------------+-------+----------------+
-    | VERSION (4)  |LEN (2)|KEY(48 or 80) ...
-    +--------------+-------+----------------+
-                   ^                        |
-		   |                        |
-		   +------------------------+
-                   (LEN, KEY) pair can be repeated
-
-All numbers in the above figure is bytes.  All integer fields are
-network byte order.
-
-First 4 bytes integer VERSION field, which must be 1.  The 2 bytes
-integer LEN field gives the length of following KEY field, which
-contains key.  If :option:`--tls-ticket-key-cipher`\=aes-128-cbc is
-used, LEN must be 48.  If
-:option:`--tls-ticket-key-cipher`\=aes-256-cbc is used, LEN must be
-80.  LEN and KEY pair can be repeated multiple times to store multiple
-keys.  The key appeared first is used as encryption key.  All the
-remaining keys are used as decryption only.
-
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use ``tls`` keyword in
-:option:`--tls-ticket-key-memcached` option.
-
-If :option:`--tls-ticket-key-file` is given, encryption key is read
-from the given file.  In this case, nghttpx does not rotate key
-automatically.  To rotate key, one has to restart nghttpx (see
-SIGNALS).
-
-CERTIFICATE TRANSPARENCY
-------------------------
-
-nghttpx supports TLS ``signed_certificate_timestamp`` extension (`RFC
-6962 <https://tools.ietf.org/html/rfc6962>`_).  The relevant options
-are :option:`--tls-sct-dir` and ``sct-dir`` parameter in
-:option:`--subcert`.  They takes a directory, and nghttpx reads all
-files whose extension is ``.sct`` under the directory.  The ``*.sct``
-files are encoded as ``SignedCertificateTimestamp`` struct described
-in `section 3.2 of RFC 69662
-<https://tools.ietf.org/html/rfc6962#section-3.2>`_.  This format is
-the same one used by `nginx-ct
-<https://github.com/grahamedgecombe/nginx-ct>`_ and `mod_ssl_ct
-<https://httpd.apache.org/docs/trunk/mod/mod_ssl_ct.html>`_.
-`ct-submit <https://github.com/grahamedgecombe/ct-submit>`_ can be
-used to submit certificates to log servers, and obtain the
-``SignedCertificateTimestamp`` struct which can be used with nghttpx.
-
-MRUBY SCRIPTING
----------------
-
-.. warning::
-
-  The current mruby extension API is experimental and not frozen.  The
-  API is subject to change in the future release.
-
-.. warning::
-
-  Almost all string value returned from method, or attribute is a
-  fresh new mruby string, which involves memory allocation, and
-  copies.  Therefore, it is strongly recommended to store a return
-  value in a local variable, and use it, instead of calling method or
-  accessing attribute repeatedly.
-
-nghttpx allows users to extend its capability using mruby scripts.
-nghttpx has 2 hook points to execute mruby script: request phase and
-response phase.  The request phase hook is invoked after all request
-header fields are received from client.  The response phase hook is
-invoked after all response header fields are received from backend
-server.  These hooks allows users to modify header fields, or common
-HTTP variables, like authority or request path, and even return custom
-response without forwarding request to backend servers.
-
-There are 2 levels of mruby script invocations: global and
-per-pattern.  The global mruby script is set by :option:`--mruby-file`
-option and is called for all requests.  The per-pattern mruby script
-is set by "mruby" parameter in :option:`-b` option.  It is invoked for
-a request which matches the particular pattern.  The order of hook
-invocation is: global request phase hook, per-pattern request phase
-hook, per-pattern response phase hook, and finally global response
-phase hook.  If a hook returns a response, any later hooks are not
-invoked.  The global request hook is invoked before the pattern
-matching is made and changing request path may affect the pattern
-matching.
-
-Please note that request and response hooks of per-pattern mruby
-script for a single request might not come from the same script.  This
-might happen after a request hook is executed, backend failed for some
-reason, and at the same time, backend configuration is replaced by API
-request, and then the request uses new configuration on retry.  The
-response hook from new configuration, if it is specified, will be
-invoked.
-
-The all mruby script will be evaluated once per thread on startup, and
-it must instantiate object and evaluate it as the return value (e.g.,
-``App.new``).  This object is called app object.  If app object
-defines ``on_req`` method, it is called with :rb:class:`Nghttpx::Env`
-object on request hook.  Similarly, if app object defines ``on_resp``
-method, it is called with :rb:class:`Nghttpx::Env` object on response
-hook.  For each method invocation, user can can access
-:rb:class:`Nghttpx::Request` and :rb:class:`Nghttpx::Response` objects
-via :rb:attr:`Nghttpx::Env#req` and :rb:attr:`Nghttpx::Env#resp`
-respectively.
-
-.. rb:module:: Nghttpx
-
-.. rb:const:: REQUEST_PHASE
-
-    Constant to represent request phase.
-
-.. rb:const:: RESPONSE_PHASE
-
-    Constant to represent response phase.
-
-.. rb:class:: Env
-
-    Object to represent current request specific context.
-
-    .. rb:attr_reader:: req
-
-        Return :rb:class:`Request` object.
-
-    .. rb:attr_reader:: resp
-
-        Return :rb:class:`Response` object.
-
-    .. rb:attr_reader:: ctx
-
-        Return Ruby hash object.  It persists until request finishes.
-        So values set in request phase hook can be retrieved in
-        response phase hook.
-
-    .. rb:attr_reader:: phase
-
-        Return the current phase.
-
-    .. rb:attr_reader:: remote_addr
-
-        Return IP address of a remote client.  If connection is made
-        via UNIX domain socket, this returns the string "localhost".
-
-    .. rb:attr_reader:: server_addr
-
-        Return address of server that accepted the connection.  This
-	is a string which specified in :option:`--frontend` option,
-	excluding port number, and not a resolved IP address.  For
-	UNIX domain socket, this is a path to UNIX domain socket.
-
-    .. rb:attr_reader:: server_port
-
-        Return port number of the server frontend which accepted the
-        connection from client.
-
-    .. rb:attr_reader:: tls_used
-
-        Return true if TLS is used on the connection.
-
-    .. rb:attr_reader:: tls_sni
-
-        Return the TLS SNI value which client sent in this connection.
-
-    .. rb:attr_reader:: tls_client_fingerprint_sha256
-
-        Return the SHA-256 fingerprint of a client certificate.
-
-    .. rb:attr_reader:: tls_client_fingerprint_sha1
-
-        Return the SHA-1 fingerprint of a client certificate.
-
-    .. rb:attr_reader:: tls_client_issuer_name
-
-        Return the issuer name of a client certificate.
-
-    .. rb:attr_reader:: tls_client_subject_name
-
-        Return the subject name of a client certificate.
-
-    .. rb:attr_reader:: tls_client_serial
-
-        Return the serial number of a client certificate.
-
-    .. rb:attr_reader:: tls_client_not_before
-
-        Return the start date of a client certificate in seconds since
-        the epoch.
-
-    .. rb:attr_reader:: tls_client_not_after
-
-        Return the end date of a client certificate in seconds since
-        the epoch.
-
-    .. rb:attr_reader:: tls_cipher
-
-        Return a TLS cipher negotiated in this connection.
-
-    .. rb:attr_reader:: tls_protocol
-
-        Return a TLS protocol version negotiated in this connection.
-
-    .. rb:attr_reader:: tls_session_id
-
-        Return a session ID for this connection in hex string.
-
-    .. rb:attr_reader:: tls_session_reused
-
-        Return true if, and only if a SSL/TLS session is reused.
-
-    .. rb:attr_reader:: alpn
-
-        Return ALPN identifier negotiated in this connection.
-
-.. rb:class:: Request
-
-    Object to represent request from client.  The modification to
-    Request object is allowed only in request phase hook.
-
-    .. rb:attr_reader:: http_version_major
-
-        Return HTTP major version.
-
-    .. rb:attr_reader:: http_version_minor
-
-        Return HTTP minor version.
-
-    .. rb:attr_accessor:: method
-
-        HTTP method.  On assignment, copy of given value is assigned.
-        We don't accept arbitrary method name.  We will document them
-        later, but well known methods, like GET, PUT and POST, are all
-        supported.
-
-    .. rb:attr_accessor:: authority
-
-        Authority (i.e., example.org), including optional port
-        component .  On assignment, copy of given value is assigned.
-
-    .. rb:attr_accessor:: scheme
-
-        Scheme (i.e., http, https).  On assignment, copy of given
-        value is assigned.
-
-    .. rb:attr_accessor:: path
-
-        Request path, including query component (i.e., /index.html).
-        On assignment, copy of given value is assigned.  The path does
-        not include authority component of URI.  This may include
-        query component.  nghttpx makes certain normalization for
-        path.  It decodes percent-encoding for unreserved characters
-        (see https://tools.ietf.org/html/rfc3986#section-2.3), and
-        resolves ".." and ".".  But it may leave characters which
-        should be percent-encoded as is. So be careful when comparing
-        path against desired string.
-
-    .. rb:attr_reader:: headers
-
-        Return Ruby hash containing copy of request header fields.
-        Changing values in returned hash does not change request
-        header fields actually used in request processing.  Use
-        :rb:meth:`Nghttpx::Request#add_header` or
-        :rb:meth:`Nghttpx::Request#set_header` to change request
-        header fields.
-
-    .. rb:method:: add_header(key, value)
-
-        Add header entry associated with key.  The value can be single
-        string or array of string.  It does not replace any existing
-        values associated with key.
-
-    .. rb:method:: set_header(key, value)
-
-        Set header entry associated with key.  The value can be single
-        string or array of string.  It replaces any existing values
-        associated with key.
-
-    .. rb:method:: clear_headers
-
-        Clear all existing request header fields.
-
-    .. rb:method:: push(uri)
-
-        Initiate to push resource identified by *uri*.  Only HTTP/2
-        protocol supports this feature.  For the other protocols, this
-        method is noop.  *uri* can be absolute URI, absolute path or
-        relative path to the current request.  For absolute or
-        relative path, scheme and authority are inherited from the
-        current request.  Currently, method is always GET.  nghttpx
-        will issue request to backend servers to fulfill this request.
-        The request and response phase hooks will be called for pushed
-        resource as well.
-
-.. rb:class:: Response
-
-    Object to represent response from backend server.
-
-    .. rb:attr_reader:: http_version_major
-
-        Return HTTP major version.
-
-    .. rb:attr_reader:: http_version_minor
-
-        Return HTTP minor version.
-
-    .. rb:attr_accessor:: status
-
-        HTTP status code.  It must be in the range [200, 999],
-        inclusive.  The non-final status code is not supported in
-        mruby scripting at the moment.
-
-    .. rb:attr_reader:: headers
-
-        Return Ruby hash containing copy of response header fields.
-        Changing values in returned hash does not change response
-        header fields actually used in response processing.  Use
-        :rb:meth:`Nghttpx::Response#add_header` or
-        :rb:meth:`Nghttpx::Response#set_header` to change response
-        header fields.
-
-    .. rb:method:: add_header(key, value)
-
-        Add header entry associated with key.  The value can be single
-        string or array of string.  It does not replace any existing
-        values associated with key.
-
-    .. rb:method:: set_header(key, value)
-
-        Set header entry associated with key.  The value can be single
-        string or array of string.  It replaces any existing values
-        associated with key.
-
-    .. rb:method:: clear_headers
-
-        Clear all existing response header fields.
-
-    .. rb:method:: return(body)
-
-        Return custom response *body* to a client.  When this method
-        is called in request phase hook, the request is not forwarded
-        to the backend, and response phase hook for this request will
-        not be invoked.  When this method is called in response phase
-        hook, response from backend server is canceled and discarded.
-        The status code and response header fields should be set
-        before using this method.  To set status code, use
-        :rb:attr:`Nghttpx::Response#status`.  If status code is not
-        set, 200 is used.  To set response header fields,
-        :rb:meth:`Nghttpx::Response#add_header` and
-        :rb:meth:`Nghttpx::Response#set_header`.  When this method is
-        invoked in response phase hook, the response headers are
-        filled with the ones received from backend server.  To send
-        completely custom header fields, first call
-        :rb:meth:`Nghttpx::Response#clear_headers` to erase all
-        existing header fields, and then add required header fields.
-        It is an error to call this method twice for a given request.
-
-    .. rb:method:: send_info(status, headers)
-
-        Send non-final (informational) response to a client.  *status*
-        must be in the range [100, 199], inclusive.  *headers* is a
-        hash containing response header fields.  Its key must be a
-        string, and the associated value must be either string or
-        array of strings.  Since this is not a final response, even if
-        this method is invoked, request is still forwarded to a
-        backend unless :rb:meth:`Nghttpx::Response#return` is called.
-        This method can be called multiple times.  It cannot be called
-        after :rb:meth:`Nghttpx::Response#return` is called.
-
-MRUBY EXAMPLES
-~~~~~~~~~~~~~~
-
-Modify request path:
-
-.. code-block:: ruby
-
-    class App
-      def on_req(env)
-        env.req.path = "/apps#{env.req.path}"
-      end
-    end
-
-    App.new
-
-Don't forget to instantiate and evaluate object at the last line.
-
-Restrict permission of viewing a content to a specific client
-addresses:
-
-.. code-block:: ruby
-
-    class App
-      def on_req(env)
-        allowed_clients = ["127.0.0.1", "::1"]
-
-        if env.req.path.start_with?("/log/") &&
-           !allowed_clients.include?(env.remote_addr) then
-          env.resp.status = 404
-          env.resp.return "permission denied"
-        end
-      end
-    end
-
-    App.new
-
-API ENDPOINTS
--------------
-
-nghttpx exposes API endpoints to manipulate it via HTTP based API.  By
-default, API endpoint is disabled.  To enable it, add a dedicated
-frontend for API using :option:`--frontend` option with "api"
-parameter.  All requests which come from this frontend address, will
-be treated as API request.
-
-The response is normally JSON dictionary, and at least includes the
-following keys:
-
-status
-  The status of the request processing.  The following values are
-  defined:
-
-  Success
-    The request was successful.
-
-  Failure
-    The request was failed.  No change has been made.
-
-code
-  HTTP status code
-
-Additionally, depending on the API endpoint, ``data`` key may be
-present, and its value contains the API endpoint specific data.
-
-We wrote "normally", since nghttpx may return ordinal HTML response in
-some cases where the error has occurred before reaching API endpoint
-(e.g., header field is too large).
-
-The following section describes available API endpoints.
-
-POST /api/v1beta1/backendconfig
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This API replaces the current backend server settings with the
-requested ones.  The request method should be POST, but PUT is also
-acceptable.  The request body must be nghttpx configuration file
-format.  For configuration file format, see `FILES`_ section.  The
-line separator inside the request body must be single LF (0x0A).
-Currently, only :option:`backend <--backend>` option is parsed, the
-others are simply ignored.  The semantics of this API is replace the
-current backend with the backend options in request body.  Describe
-the desired set of backend severs, and nghttpx makes it happen.  If
-there is no :option:`backend <--backend>` option is found in request
-body, the current set of backend is replaced with the :option:`backend
-<--backend>` option's default value, which is ``127.0.0.1,80``.
-
-The replacement is done instantly without breaking existing
-connections or requests.  It also avoids any process creation as is
-the case with hot swapping with signals.
-
-The one limitation is that only numeric IP address is allowed in
-:option:`backend <--backend>` in request body unless "dns" parameter
-is used while non numeric hostname is allowed in command-line or
-configuration file is read using :option:`--conf`.
-
-GET /api/v1beta1/configrevision
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This API returns configuration revision of the current nghttpx.  The
-configuration revision is opaque string, and it changes after each
-reloading by SIGHUP.  With this API, an external application knows
-that whether nghttpx has finished reloading its configuration by
-comparing the configuration revisions between before and after
-reloading.  It is recommended to disable persistent (keep-alive)
-connection for this purpose in order to avoid to send a request using
-the reused connection which may bound to an old process.
-
-This API returns response including ``data`` key.  Its value is JSON
-object, and it contains at least the following key:
-
-configRevision
-  The configuration revision of the current nghttpx
-
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`h2load(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.h2r cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.h2r
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.h2r	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx.h2r	1970-01-01 00:00:00.000000000 +0000
@@ -1,719 +0,0 @@
-FILES
------
-
-*/etc/nghttpx/nghttpx.conf*
-  The default configuration file path nghttpx searches at startup.
-  The configuration file path can be changed using :option:`--conf`
-  option.
-
-  Those lines which are staring ``#`` are treated as comment.
-
-  The option name in the configuration file is the long command-line
-  option name with leading ``--`` stripped (e.g., ``frontend``).  Put
-  ``=`` between option name and value.  Don't put extra leading or
-  trailing spaces.
-
-  When specifying arguments including characters which have special
-  meaning to a shell, we usually use quotes so that shell does not
-  interpret them.  When writing this configuration file, quotes for
-  this purpose must not be used.  For example, specify additional
-  request header field, do this:
-
-  .. code-block:: text
-
-    add-request-header=foo: bar
-
-  instead of:
-
-  .. code-block:: text
-
-    add-request-header="foo: bar"
-
-  The options which do not take argument in the command-line *take*
-  argument in the configuration file.  Specify ``yes`` as an argument
-  (e.g., ``http2-proxy=yes``).  If other string is given, it is
-  ignored.
-
-  To specify private key and certificate file which are given as
-  positional arguments in command-line, use ``private-key-file`` and
-  ``certificate-file``.
-
-  :option:`--conf` option cannot be used in the configuration file and
-  will be ignored if specified.
-
-Error log
-  Error log is written to stderr by default.  It can be configured
-  using :option:`--errorlog-file`.  The format of log message is as
-  follows:
-
-  <datetime> <master-pid> <current-pid> <thread-id> <level> (<filename>:<line>) <msg>
-
-  <datetime>
-    It is a combination of date and time when the log is written.  It
-    is in ISO 8601 format.
-
-  <master-pid>
-    It is a master process ID.
-
-  <current-pid>
-    It is a process ID which writes this log.
-
-  <thread-id>
-    It is a thread ID which writes this log.  It would be unique
-    within <current-pid>.
-
-  <filename> and <line>
-    They are source file name, and line number which produce this log.
-
-  <msg>
-    It is a log message body.
-
-SIGNALS
--------
-
-SIGQUIT
-  Shutdown gracefully.  First accept pending connections and stop
-  accepting connection.  After all connections are handled, nghttpx
-  exits.
-
-SIGHUP
-  Reload configuration file given in :option:`--conf`.
-
-SIGUSR1
-  Reopen log files.
-
-SIGUSR2
-
-  Fork and execute nghttpx.  It will execute the binary in the same
-  path with same command-line arguments and environment variables.  As
-  of nghttpx version 1.20.0, the new master process sends SIGQUIT to
-  the original master process when it is ready to serve requests.  For
-  the earlier versions of nghttpx, user has to send SIGQUIT to the
-  original master process.
-
-  The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former
-  is usually used to execute new binary, and the master process is
-  newly spawned.  On the other hand, the latter just reloads
-  configuration file, and the same master process continues to exist.
-
-.. note::
-
-  nghttpx consists of multiple processes: one process for processing
-  these signals, and another one for processing requests.  The former
-  spawns the latter.  The former is called master process, and the
-  latter is called worker process.  If neverbleed is enabled, the
-  worker process spawns neverbleed daemon process which does RSA key
-  processing.  The above signal must be sent to the master process.
-  If the other processes received one of them, it is ignored.  This
-  behaviour of these processes may change in the future release.  In
-  other words, in the future release, the processes other than master
-  process may terminate upon the reception of these signals.
-  Therefore these signals should not be sent to the processes other
-  than master process.
-
-SERVER PUSH
------------
-
-nghttpx supports HTTP/2 server push in default mode with Link header
-field.  nghttpx looks for Link header field (`RFC 5988
-<http://tools.ietf.org/html/rfc5988>`_) in response headers from
-backend server and extracts URI-reference with parameter
-``rel=preload`` (see `preload
-<http://w3c.github.io/preload/#interoperability-with-http-link-header>`_)
-and pushes those URIs to the frontend client. Here is a sample Link
-header field to initiate server push:
-
-.. code-block:: text
-
-  Link: </fonts/font.woff>; rel=preload
-  Link: </css/theme.css>; rel=preload
-
-Currently, the following restriction is applied for server push:
-
-1. The associated stream must have method "GET" or "POST".  The
-   associated stream's status code must be 200.
-
-This limitation may be loosened in the future release.
-
-nghttpx also supports server push if both frontend and backend are
-HTTP/2 in default mode.  In this case, in addition to server push via
-Link header field, server push from backend is forwarded to frontend
-HTTP/2 session.
-
-HTTP/2 server push will be disabled if :option:`--http2-proxy` is
-used.
-
-UNIX DOMAIN SOCKET
-------------------
-
-nghttpx supports UNIX domain socket with a filename for both frontend
-and backend connections.
-
-Please note that current nghttpx implementation does not delete a
-socket with a filename.  And on start up, if nghttpx detects that the
-specified socket already exists in the file system, nghttpx first
-deletes it.  However, if SIGUSR2 is used to execute new binary and
-both old and new configurations use same filename, new binary does not
-delete the socket and continues to use it.
-
-OCSP STAPLING
--------------
-
-OCSP query is done using external Python script
-``fetch-ocsp-response``, which has been originally developed in Perl
-as part of h2o project (https://github.com/h2o/h2o), and was
-translated into Python.
-
-The script file is usually installed under
-``$(prefix)/share/nghttp2/`` directory.  The actual path to script can
-be customized using :option:`--fetch-ocsp-response-file` option.
-
-If OCSP query is failed, previous OCSP response, if any, is continued
-to be used.
-
-:option:`--fetch-ocsp-response-file` option provides wide range of
-possibility to manage OCSP response.  It can take an arbitrary script
-or executable.  The requirement is that it supports the command-line
-interface of ``fetch-ocsp-response`` script, and it must return a
-valid DER encoded OCSP response on success.  It must return exit code
-0 on success, and 75 for temporary error, and the other error code for
-generic failure.  For large cluster of servers, it is not efficient
-for each server to perform OCSP query using ``fetch-ocsp-response``.
-Instead, you can retrieve OCSP response in some way, and store it in a
-disk or a shared database.  Then specify a program in
-:option:`--fetch-ocsp-response-file` to fetch it from those stores.
-This could provide a way to share the OCSP response between fleet of
-servers, and also any OCSP query strategy can be applied which may be
-beyond the ability of nghttpx itself or ``fetch-ocsp-response``
-script.
-
-TLS SESSION RESUMPTION
-----------------------
-
-nghttpx supports TLS session resumption through both session ID and
-session ticket.
-
-SESSION ID RESUMPTION
-~~~~~~~~~~~~~~~~~~~~~
-
-By default, session ID is shared by all worker threads.
-
-If :option:`--tls-session-cache-memcached` is given, nghttpx will
-insert serialized session data to memcached with
-``nghttpx:tls-session-cache:`` + lowercase hex string of session ID
-as a memcached entry key, with expiry time 12 hours.  Session timeout
-is set to 12 hours.
-
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use ``tls`` keyword in
-:option:`--tls-session-cache-memcached` option.
-
-TLS SESSION TICKET RESUMPTION
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, session ticket is shared by all worker threads.  The
-automatic key rotation is also enabled by default.  Every an hour, new
-encryption key is generated, and previous encryption key becomes
-decryption only key.  We set session timeout to 12 hours, and thus we
-keep at most 12 keys.
-
-If :option:`--tls-ticket-key-memcached` is given, encryption keys are
-retrieved from memcached.  nghttpx just reads keys from memcached; one
-has to deploy key generator program to update keys frequently (e.g.,
-every 1 hour).  The example key generator tlsticketupdate.go is
-available under contrib directory in nghttp2 archive.  The memcached
-entry key is ``nghttpx:tls-ticket-key``.  The data format stored in
-memcached is the binary format described below:
-
-.. code-block:: text
-
-    +--------------+-------+----------------+
-    | VERSION (4)  |LEN (2)|KEY(48 or 80) ...
-    +--------------+-------+----------------+
-                   ^                        |
-		   |                        |
-		   +------------------------+
-                   (LEN, KEY) pair can be repeated
-
-All numbers in the above figure is bytes.  All integer fields are
-network byte order.
-
-First 4 bytes integer VERSION field, which must be 1.  The 2 bytes
-integer LEN field gives the length of following KEY field, which
-contains key.  If :option:`--tls-ticket-key-cipher`\=aes-128-cbc is
-used, LEN must be 48.  If
-:option:`--tls-ticket-key-cipher`\=aes-256-cbc is used, LEN must be
-80.  LEN and KEY pair can be repeated multiple times to store multiple
-keys.  The key appeared first is used as encryption key.  All the
-remaining keys are used as decryption only.
-
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use ``tls`` keyword in
-:option:`--tls-ticket-key-memcached` option.
-
-If :option:`--tls-ticket-key-file` is given, encryption key is read
-from the given file.  In this case, nghttpx does not rotate key
-automatically.  To rotate key, one has to restart nghttpx (see
-SIGNALS).
-
-CERTIFICATE TRANSPARENCY
-------------------------
-
-nghttpx supports TLS ``signed_certificate_timestamp`` extension (`RFC
-6962 <https://tools.ietf.org/html/rfc6962>`_).  The relevant options
-are :option:`--tls-sct-dir` and ``sct-dir`` parameter in
-:option:`--subcert`.  They takes a directory, and nghttpx reads all
-files whose extension is ``.sct`` under the directory.  The ``*.sct``
-files are encoded as ``SignedCertificateTimestamp`` struct described
-in `section 3.2 of RFC 69662
-<https://tools.ietf.org/html/rfc6962#section-3.2>`_.  This format is
-the same one used by `nginx-ct
-<https://github.com/grahamedgecombe/nginx-ct>`_ and `mod_ssl_ct
-<https://httpd.apache.org/docs/trunk/mod/mod_ssl_ct.html>`_.
-`ct-submit <https://github.com/grahamedgecombe/ct-submit>`_ can be
-used to submit certificates to log servers, and obtain the
-``SignedCertificateTimestamp`` struct which can be used with nghttpx.
-
-MRUBY SCRIPTING
----------------
-
-.. warning::
-
-  The current mruby extension API is experimental and not frozen.  The
-  API is subject to change in the future release.
-
-.. warning::
-
-  Almost all string value returned from method, or attribute is a
-  fresh new mruby string, which involves memory allocation, and
-  copies.  Therefore, it is strongly recommended to store a return
-  value in a local variable, and use it, instead of calling method or
-  accessing attribute repeatedly.
-
-nghttpx allows users to extend its capability using mruby scripts.
-nghttpx has 2 hook points to execute mruby script: request phase and
-response phase.  The request phase hook is invoked after all request
-header fields are received from client.  The response phase hook is
-invoked after all response header fields are received from backend
-server.  These hooks allows users to modify header fields, or common
-HTTP variables, like authority or request path, and even return custom
-response without forwarding request to backend servers.
-
-There are 2 levels of mruby script invocations: global and
-per-pattern.  The global mruby script is set by :option:`--mruby-file`
-option and is called for all requests.  The per-pattern mruby script
-is set by "mruby" parameter in :option:`-b` option.  It is invoked for
-a request which matches the particular pattern.  The order of hook
-invocation is: global request phase hook, per-pattern request phase
-hook, per-pattern response phase hook, and finally global response
-phase hook.  If a hook returns a response, any later hooks are not
-invoked.  The global request hook is invoked before the pattern
-matching is made and changing request path may affect the pattern
-matching.
-
-Please note that request and response hooks of per-pattern mruby
-script for a single request might not come from the same script.  This
-might happen after a request hook is executed, backend failed for some
-reason, and at the same time, backend configuration is replaced by API
-request, and then the request uses new configuration on retry.  The
-response hook from new configuration, if it is specified, will be
-invoked.
-
-The all mruby script will be evaluated once per thread on startup, and
-it must instantiate object and evaluate it as the return value (e.g.,
-``App.new``).  This object is called app object.  If app object
-defines ``on_req`` method, it is called with :rb:class:`Nghttpx::Env`
-object on request hook.  Similarly, if app object defines ``on_resp``
-method, it is called with :rb:class:`Nghttpx::Env` object on response
-hook.  For each method invocation, user can can access
-:rb:class:`Nghttpx::Request` and :rb:class:`Nghttpx::Response` objects
-via :rb:attr:`Nghttpx::Env#req` and :rb:attr:`Nghttpx::Env#resp`
-respectively.
-
-.. rb:module:: Nghttpx
-
-.. rb:const:: REQUEST_PHASE
-
-    Constant to represent request phase.
-
-.. rb:const:: RESPONSE_PHASE
-
-    Constant to represent response phase.
-
-.. rb:class:: Env
-
-    Object to represent current request specific context.
-
-    .. rb:attr_reader:: req
-
-        Return :rb:class:`Request` object.
-
-    .. rb:attr_reader:: resp
-
-        Return :rb:class:`Response` object.
-
-    .. rb:attr_reader:: ctx
-
-        Return Ruby hash object.  It persists until request finishes.
-        So values set in request phase hook can be retrieved in
-        response phase hook.
-
-    .. rb:attr_reader:: phase
-
-        Return the current phase.
-
-    .. rb:attr_reader:: remote_addr
-
-        Return IP address of a remote client.  If connection is made
-        via UNIX domain socket, this returns the string "localhost".
-
-    .. rb:attr_reader:: server_addr
-
-        Return address of server that accepted the connection.  This
-	is a string which specified in :option:`--frontend` option,
-	excluding port number, and not a resolved IP address.  For
-	UNIX domain socket, this is a path to UNIX domain socket.
-
-    .. rb:attr_reader:: server_port
-
-        Return port number of the server frontend which accepted the
-        connection from client.
-
-    .. rb:attr_reader:: tls_used
-
-        Return true if TLS is used on the connection.
-
-    .. rb:attr_reader:: tls_sni
-
-        Return the TLS SNI value which client sent in this connection.
-
-    .. rb:attr_reader:: tls_client_fingerprint_sha256
-
-        Return the SHA-256 fingerprint of a client certificate.
-
-    .. rb:attr_reader:: tls_client_fingerprint_sha1
-
-        Return the SHA-1 fingerprint of a client certificate.
-
-    .. rb:attr_reader:: tls_client_issuer_name
-
-        Return the issuer name of a client certificate.
-
-    .. rb:attr_reader:: tls_client_subject_name
-
-        Return the subject name of a client certificate.
-
-    .. rb:attr_reader:: tls_client_serial
-
-        Return the serial number of a client certificate.
-
-    .. rb:attr_reader:: tls_client_not_before
-
-        Return the start date of a client certificate in seconds since
-        the epoch.
-
-    .. rb:attr_reader:: tls_client_not_after
-
-        Return the end date of a client certificate in seconds since
-        the epoch.
-
-    .. rb:attr_reader:: tls_cipher
-
-        Return a TLS cipher negotiated in this connection.
-
-    .. rb:attr_reader:: tls_protocol
-
-        Return a TLS protocol version negotiated in this connection.
-
-    .. rb:attr_reader:: tls_session_id
-
-        Return a session ID for this connection in hex string.
-
-    .. rb:attr_reader:: tls_session_reused
-
-        Return true if, and only if a SSL/TLS session is reused.
-
-    .. rb:attr_reader:: alpn
-
-        Return ALPN identifier negotiated in this connection.
-
-    .. rb:attr_reader:: tls_handshake_finished
-
-        Return true if SSL/TLS handshake has finished.  If it returns
-        false in the request phase hook, the request is received in
-        TLSv1.3 early data (0-RTT) and might be vulnerable to the
-        replay attack.  nghttpx will send Early-Data header field to
-        backend servers to indicate this.
-
-.. rb:class:: Request
-
-    Object to represent request from client.  The modification to
-    Request object is allowed only in request phase hook.
-
-    .. rb:attr_reader:: http_version_major
-
-        Return HTTP major version.
-
-    .. rb:attr_reader:: http_version_minor
-
-        Return HTTP minor version.
-
-    .. rb:attr_accessor:: method
-
-        HTTP method.  On assignment, copy of given value is assigned.
-        We don't accept arbitrary method name.  We will document them
-        later, but well known methods, like GET, PUT and POST, are all
-        supported.
-
-    .. rb:attr_accessor:: authority
-
-        Authority (i.e., example.org), including optional port
-        component .  On assignment, copy of given value is assigned.
-
-    .. rb:attr_accessor:: scheme
-
-        Scheme (i.e., http, https).  On assignment, copy of given
-        value is assigned.
-
-    .. rb:attr_accessor:: path
-
-        Request path, including query component (i.e., /index.html).
-        On assignment, copy of given value is assigned.  The path does
-        not include authority component of URI.  This may include
-        query component.  nghttpx makes certain normalization for
-        path.  It decodes percent-encoding for unreserved characters
-        (see https://tools.ietf.org/html/rfc3986#section-2.3), and
-        resolves ".." and ".".  But it may leave characters which
-        should be percent-encoded as is. So be careful when comparing
-        path against desired string.
-
-    .. rb:attr_reader:: headers
-
-        Return Ruby hash containing copy of request header fields.
-        Changing values in returned hash does not change request
-        header fields actually used in request processing.  Use
-        :rb:meth:`Nghttpx::Request#add_header` or
-        :rb:meth:`Nghttpx::Request#set_header` to change request
-        header fields.
-
-    .. rb:method:: add_header(key, value)
-
-        Add header entry associated with key.  The value can be single
-        string or array of string.  It does not replace any existing
-        values associated with key.
-
-    .. rb:method:: set_header(key, value)
-
-        Set header entry associated with key.  The value can be single
-        string or array of string.  It replaces any existing values
-        associated with key.
-
-    .. rb:method:: clear_headers
-
-        Clear all existing request header fields.
-
-    .. rb:method:: push(uri)
-
-        Initiate to push resource identified by *uri*.  Only HTTP/2
-        protocol supports this feature.  For the other protocols, this
-        method is noop.  *uri* can be absolute URI, absolute path or
-        relative path to the current request.  For absolute or
-        relative path, scheme and authority are inherited from the
-        current request.  Currently, method is always GET.  nghttpx
-        will issue request to backend servers to fulfill this request.
-        The request and response phase hooks will be called for pushed
-        resource as well.
-
-.. rb:class:: Response
-
-    Object to represent response from backend server.
-
-    .. rb:attr_reader:: http_version_major
-
-        Return HTTP major version.
-
-    .. rb:attr_reader:: http_version_minor
-
-        Return HTTP minor version.
-
-    .. rb:attr_accessor:: status
-
-        HTTP status code.  It must be in the range [200, 999],
-        inclusive.  The non-final status code is not supported in
-        mruby scripting at the moment.
-
-    .. rb:attr_reader:: headers
-
-        Return Ruby hash containing copy of response header fields.
-        Changing values in returned hash does not change response
-        header fields actually used in response processing.  Use
-        :rb:meth:`Nghttpx::Response#add_header` or
-        :rb:meth:`Nghttpx::Response#set_header` to change response
-        header fields.
-
-    .. rb:method:: add_header(key, value)
-
-        Add header entry associated with key.  The value can be single
-        string or array of string.  It does not replace any existing
-        values associated with key.
-
-    .. rb:method:: set_header(key, value)
-
-        Set header entry associated with key.  The value can be single
-        string or array of string.  It replaces any existing values
-        associated with key.
-
-    .. rb:method:: clear_headers
-
-        Clear all existing response header fields.
-
-    .. rb:method:: return(body)
-
-        Return custom response *body* to a client.  When this method
-        is called in request phase hook, the request is not forwarded
-        to the backend, and response phase hook for this request will
-        not be invoked.  When this method is called in response phase
-        hook, response from backend server is canceled and discarded.
-        The status code and response header fields should be set
-        before using this method.  To set status code, use
-        :rb:attr:`Nghttpx::Response#status`.  If status code is not
-        set, 200 is used.  To set response header fields,
-        :rb:meth:`Nghttpx::Response#add_header` and
-        :rb:meth:`Nghttpx::Response#set_header`.  When this method is
-        invoked in response phase hook, the response headers are
-        filled with the ones received from backend server.  To send
-        completely custom header fields, first call
-        :rb:meth:`Nghttpx::Response#clear_headers` to erase all
-        existing header fields, and then add required header fields.
-        It is an error to call this method twice for a given request.
-
-    .. rb:method:: send_info(status, headers)
-
-        Send non-final (informational) response to a client.  *status*
-        must be in the range [100, 199], inclusive.  *headers* is a
-        hash containing response header fields.  Its key must be a
-        string, and the associated value must be either string or
-        array of strings.  Since this is not a final response, even if
-        this method is invoked, request is still forwarded to a
-        backend unless :rb:meth:`Nghttpx::Response#return` is called.
-        This method can be called multiple times.  It cannot be called
-        after :rb:meth:`Nghttpx::Response#return` is called.
-
-MRUBY EXAMPLES
-~~~~~~~~~~~~~~
-
-Modify request path:
-
-.. code-block:: ruby
-
-    class App
-      def on_req(env)
-        env.req.path = "/apps#{env.req.path}"
-      end
-    end
-
-    App.new
-
-Don't forget to instantiate and evaluate object at the last line.
-
-Restrict permission of viewing a content to a specific client
-addresses:
-
-.. code-block:: ruby
-
-    class App
-      def on_req(env)
-        allowed_clients = ["127.0.0.1", "::1"]
-
-        if env.req.path.start_with?("/log/") &&
-           !allowed_clients.include?(env.remote_addr) then
-          env.resp.status = 404
-          env.resp.return "permission denied"
-        end
-      end
-    end
-
-    App.new
-
-API ENDPOINTS
--------------
-
-nghttpx exposes API endpoints to manipulate it via HTTP based API.  By
-default, API endpoint is disabled.  To enable it, add a dedicated
-frontend for API using :option:`--frontend` option with "api"
-parameter.  All requests which come from this frontend address, will
-be treated as API request.
-
-The response is normally JSON dictionary, and at least includes the
-following keys:
-
-status
-  The status of the request processing.  The following values are
-  defined:
-
-  Success
-    The request was successful.
-
-  Failure
-    The request was failed.  No change has been made.
-
-code
-  HTTP status code
-
-Additionally, depending on the API endpoint, ``data`` key may be
-present, and its value contains the API endpoint specific data.
-
-We wrote "normally", since nghttpx may return ordinal HTML response in
-some cases where the error has occurred before reaching API endpoint
-(e.g., header field is too large).
-
-The following section describes available API endpoints.
-
-POST /api/v1beta1/backendconfig
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This API replaces the current backend server settings with the
-requested ones.  The request method should be POST, but PUT is also
-acceptable.  The request body must be nghttpx configuration file
-format.  For configuration file format, see `FILES`_ section.  The
-line separator inside the request body must be single LF (0x0A).
-Currently, only :option:`backend <--backend>` option is parsed, the
-others are simply ignored.  The semantics of this API is replace the
-current backend with the backend options in request body.  Describe
-the desired set of backend severs, and nghttpx makes it happen.  If
-there is no :option:`backend <--backend>` option is found in request
-body, the current set of backend is replaced with the :option:`backend
-<--backend>` option's default value, which is ``127.0.0.1,80``.
-
-The replacement is done instantly without breaking existing
-connections or requests.  It also avoids any process creation as is
-the case with hot swapping with signals.
-
-The one limitation is that only numeric IP address is allowed in
-:option:`backend <--backend>` in request body unless "dns" parameter
-is used while non numeric hostname is allowed in command-line or
-configuration file is read using :option:`--conf`.
-
-GET /api/v1beta1/configrevision
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This API returns configuration revision of the current nghttpx.  The
-configuration revision is opaque string, and it changes after each
-reloading by SIGHUP.  With this API, an external application knows
-that whether nghttpx has finished reloading its configuration by
-comparing the configuration revisions between before and after
-reloading.  It is recommended to disable persistent (keep-alive)
-connection for this purpose in order to avoid to send a request using
-the reused connection which may bound to an old process.
-
-This API returns response including ``data`` key.  Its value is JSON
-object, and it contains at least the following key:
-
-configRevision
-  The configuration revision of the current nghttpx
-
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`h2load(1)`
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx-howto.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx-howto.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx-howto.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/nghttpx-howto.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/nghttpx-howto.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/package_README.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/package_README.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/package_README.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/package_README.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/README.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/programmers-guide.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/programmers-guide.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/programmers-guide.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/programmers-guide.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,481 +0,0 @@
-Programmers' Guide
-==================
-
-Architecture
-------------
-
-The most notable point in nghttp2 library architecture is it does not
-perform any I/O.  nghttp2 only performs HTTP/2 protocol stuff based on
-input byte strings.  It will calls callback functions set by
-applications while processing input.  The output of nghttp2 is just
-byte string.  An application is responsible to send these output to
-the remote peer.  The callback functions may be called while producing
-output.
-
-Not doing I/O makes embedding nghttp2 library in the existing code
-base very easy.  Usually, the existing applications have its own I/O
-event loops.  It is very hard to use nghttp2 in that situation if
-nghttp2 does its own I/O.  It also makes light weight language wrapper
-for nghttp2 easy with the same reason.  The down side is that an
-application author has to write more code to write complete
-application using nghttp2.  This is especially true for simple "toy"
-application.  For the real applications, however, this is not the
-case.  This is because you probably want to support HTTP/1 which
-nghttp2 does not provide, and to do that, you will need to write your
-own HTTP/1 stack or use existing third-party library, and bind them
-together with nghttp2 and I/O event loop.  In this point, not
-performing I/O in nghttp2 has more point than doing it.
-
-The primary object that an application uses is :type:`nghttp2_session`
-object, which is opaque struct and its details are hidden in order to
-ensure the upgrading its internal architecture without breaking the
-backward compatibility.  An application can set callbacks to
-:type:`nghttp2_session` object through the dedicated object and
-functions, and it also interacts with it via many API function calls.
-
-An application can create as many :type:`nghttp2_session` object as it
-wants.  But single :type:`nghttp2_session` object must be used by a
-single thread at the same time.  This is not so hard to enforce since
-most event-based architecture applications use is single thread per
-core, and handling one connection I/O is done by single thread.
-
-To feed input to :type:`nghttp2_session` object, one can use
-`nghttp2_session_recv()` or `nghttp2_session_mem_recv()` functions.
-They behave similarly, and the difference is that
-`nghttp2_session_recv()` will use :type:`nghttp2_read_callback` to get
-input.  On the other hand, `nghttp2_session_mem_recv()` will take
-input as its parameter.  If in doubt, use `nghttp2_session_mem_recv()`
-since it is simpler, and could be faster since it avoids calling
-callback function.
-
-To get output from :type:`nghttp2_session` object, one can use
-`nghttp2_session_send()` or `nghttp2_session_mem_send()`.  The
-difference between them is that the former uses
-:type:`nghttp2_send_callback` to pass output to an application.  On
-the other hand, the latter returns the output to the caller.  If in
-doubt, use `nghttp2_session_mem_send()` since it is simpler.  But
-`nghttp2_session_send()` might be easier to use if the output buffer
-an application has is fixed sized.
-
-In general, an application should call `nghttp2_session_mem_send()`
-when it gets input from underlying connection.  Since there is great
-chance to get something pushed into transmission queue while the call
-of `nghttp2_session_mem_send()`, it is recommended to call
-`nghttp2_session_mem_recv()` after `nghttp2_session_mem_send()`.
-
-There is a question when we are safe to close HTTP/2 session without
-waiting for the closure of underlying connection.  We offer 2 API
-calls for this: `nghttp2_session_want_read()` and
-`nghttp2_session_want_write()`.  If they both return 0, application
-can destroy :type:`nghttp2_session`, and then close the underlying
-connection.  But make sure that the buffered output has been
-transmitted to the peer before closing the connection when
-`nghttp2_session_mem_send()` is used, since
-`nghttp2_session_want_write()` does not take into account the
-transmission of the buffered data outside of :type:`nghttp2_session`.
-
-Includes
---------
-
-To use the public APIs, include ``nghttp2/nghttp2.h``::
-
-    #include <nghttp2/nghttp2.h>
-
-The header files are also available online: :doc:`nghttp2.h` and
-:doc:`nghttp2ver.h`.
-
-Remarks
--------
-
-Do not call `nghttp2_session_send()`, `nghttp2_session_mem_send()`,
-`nghttp2_session_recv()` or `nghttp2_session_mem_recv()` from the
-nghttp2 callback functions directly or indirectly. It will lead to the
-crash.  You can submit requests or frames in the callbacks then call
-these functions outside the callbacks.
-
-`nghttp2_session_send()` and `nghttp2_session_mem_send()` send first
-24 bytes of client magic string (MAGIC)
-(:macro:`NGHTTP2_CLIENT_MAGIC`) on client configuration.  The
-applications are responsible to send SETTINGS frame as part of
-connection preface using `nghttp2_submit_settings()`.  Similarly,
-`nghttp2_session_recv()` and `nghttp2_session_mem_recv()` consume
-MAGIC on server configuration unless
-`nghttp2_option_set_no_recv_client_magic()` is used with nonzero
-option value.
-
-.. _http-messaging:
-
-HTTP Messaging
---------------
-
-By default, nghttp2 library checks HTTP messaging rules described in
-`HTTP/2 specification, section 8
-<https://tools.ietf.org/html/draft-ietf-httpbis-http2-17#section-8>`_.
-Everything described in that section is not validated however.  We
-briefly describe what the library does in this area.  In the following
-description, without loss of generality we omit CONTINUATION frame
-since they must follow HEADERS frame and are processed atomically.  In
-other words, they are just one big HEADERS frame.  To disable these
-validations, use `nghttp2_option_set_no_http_messaging()`.  Please
-note that disabling this feature does not change the fundamental
-client and server model of HTTP.  That is, even if the validation is
-disabled, only client can send requests.
-
-For HTTP request, including those carried by PUSH_PROMISE, HTTP
-message starts with one HEADERS frame containing request headers.  It
-is followed by zero or more DATA frames containing request body, which
-is followed by zero or one HEADERS containing trailer headers.  The
-request headers must include ":scheme", ":method" and ":path" pseudo
-header fields unless ":method" is not "CONNECT".  ":authority" is
-optional, but nghttp2 requires either ":authority" or "Host" header
-field must be present.  If ":method" is "CONNECT", the request headers
-must include ":method" and ":authority" and must omit ":scheme" and
-":path".
-
-For HTTP response, HTTP message starts with zero or more HEADERS
-frames containing non-final response (status code 1xx).  They are
-followed by one HEADERS frame containing final response headers
-(non-1xx).  It is followed by zero or more DATA frames containing
-response body, which is followed by zero or one HEADERS containing
-trailer headers.  The non-final and final response headers must
-contain ":status" pseudo header field containing 3 digits only.
-
-All request and response headers must include exactly one valid value
-for each pseudo header field.  Additionally nghttp2 requires all
-request headers must not include more than one "Host" header field.
-
-HTTP/2 prohibits connection-specific header fields.  The following
-header fields must not appear: "Connection", "Keep-Alive",
-"Proxy-Connection", "Transfer-Encoding" and "Upgrade".  Additionally,
-"TE" header field must not include any value other than "trailers".
-
-Each header field name and value must obey the field-name and
-field-value production rules described in `RFC 7230, section
-3.2. <https://tools.ietf.org/html/rfc7230#section-3.2>`_.
-Additionally, all field name must be lower cased.  The invalid header
-fields are treated as stream error, and that stream is reset.  If
-application wants to treat these headers in their own way, use
-`nghttp2_on_invalid_header_callback
-<https://nghttp2.org/documentation/types.html#c.nghttp2_on_invalid_header_callback>`_.
-
-For "http" or "https" URIs, ":path" pseudo header fields must start
-with "/".  The only exception is OPTIONS request, in that case, "*" is
-allowed in ":path" pseudo header field to represent system-wide
-OPTIONS request.
-
-With the above validations, nghttp2 library guarantees that header
-field name passed to `nghttp2_on_header_callback()` is not empty.
-Also required pseudo headers are all present and not empty.
-
-nghttp2 enforces "Content-Length" validation as well.  All request or
-response headers must not contain more than one "Content-Length"
-header field.  If "Content-Length" header field is present, it must be
-parsed as 64 bit signed integer.  The sum of data length in the
-following DATA frames must match with the number in "Content-Length"
-header field if it is present (this does not include padding bytes).
-
-RFC 7230 says that server must not send "Content-Length" in any
-response with 1xx, and 204 status code.  It also says that
-"Content-Length" is not allowed in any response with 200 status code
-to a CONNECT request.  nghttp2 enforces them as well.
-
-Any deviation results in stream error of type PROTOCOL_ERROR.  If
-error is found in PUSH_PROMISE frame, stream error is raised against
-promised stream.
-
-The order of transmission of the HTTP/2 frames
-----------------------------------------------
-
-This section describes the internals of libnghttp2 about the
-scheduling of transmission of HTTP/2 frames.  This is pretty much
-internal stuff, so the details could change in the future versions of
-the library.
-
-libnghttp2 categorizes HTTP/2 frames into 4 categories: urgent,
-regular, syn_stream, and data in the order of higher priority.
-
-The urgent category includes PING and SETTINGS.  They are sent with
-highest priority.  The order inside the category is FIFO.
-
-The regular category includes frames other than PING, SETTINGS, DATA,
-and HEADERS which does not create stream (which counts toward
-concurrent stream limit).  The order inside the category is FIFO.
-
-The syn_stream category includes HEADERS frame which creates stream,
-that counts toward the concurrent stream limit.
-
-The data category includes DATA frame, and the scheduling among DATA
-frames are determined by HTTP/2 dependency tree.
-
-If the application wants to send frames in the specific order, and the
-default transmission order does not fit, it has to schedule frames by
-itself using the callbacks (e.g.,
-:type:`nghttp2_on_frame_send_callback`).
-
-RST_STREAM has special side effect when it is submitted by
-`nghttp2_submit_rst_stream()`.  It cancels all pending HEADERS and
-DATA frames whose stream ID matches the one in the RST_STREAM frame.
-This may cause unexpected behaviour for the application in some cases.
-For example, suppose that application wants to send RST_STREAM after
-sending response HEADERS and DATA.  Because of the reason we mentioned
-above, the following code does not work:
-
-.. code-block:: c
-
-    nghttp2_submit_response(...)
-    nghttp2_submit_rst_stream(...)
-
-RST_STREAM cancels HEADERS (and DATA), and just RST_STREAM is sent.
-The correct way is use :type:`nghttp2_on_frame_send_callback`, and
-after HEADERS and DATA frames are sent, issue
-`nghttp2_submit_rst_stream()`.  FYI,
-:type:`nghttp2_on_frame_not_send_callback` tells you why frames are
-not sent.
-
-Implement user defined HTTP/2 non-critical extensions
------------------------------------------------------
-
-As of nghttp2 v1.8.0, we have added HTTP/2 non-critical extension
-framework, which lets application send and receive user defined custom
-HTTP/2 non-critical extension frames.  nghttp2 also offers built-in
-functionality to send and receive official HTTP/2 extension frames
-(e.g., ALTSVC frame).  For these built-in handler, refer to the next
-section.
-
-To send extension frame, use `nghttp2_submit_extension()`, and
-implement :type:`nghttp2_pack_extension_callback`.  The callback
-implements how to encode data into wire format.  The callback must be
-set to :type:`nghttp2_session_callbacks` using
-`nghttp2_session_callbacks_set_pack_extension_callback()`.
-
-For example, we will illustrate how to send `ALTSVC
-<https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-14>`_ frame.
-
-.. code-block:: c
-
-    typedef struct {
-      const char *origin;
-      const char *field;
-    } alt_svc;
-
-    ssize_t pack_extension_callback(nghttp2_session *session, uint8_t *buf,
-                                    size_t len, const nghttp2_frame *frame,
-                                    void *user_data) {
-      const alt_svc *altsvc = (const alt_svc *)frame->ext.payload;
-      size_t originlen = strlen(altsvc->origin);
-      size_t fieldlen = strlen(altsvc->field);
-
-      uint8_t *p;
-
-      if (len < 2 + originlen + fieldlen || originlen > 0xffff) {
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      p = buf;
-      *p++ = originlen >> 8;
-      *p++ = originlen & 0xff;
-      memcpy(p, altsvc->origin, originlen);
-      p += originlen;
-      memcpy(p, altsvc->field, fieldlen);
-      p += fieldlen;
-
-      return p - buf;
-    }
-
-This implements :type:`nghttp2_pack_extension_callback`.  We have to
-set this callback to :type:`nghttp2_session_callbacks`:
-
-.. code-block:: c
-
-    nghttp2_session_callbacks_set_pack_extension_callback(
-        callbacks, pack_extension_callback);
-
-To send ALTSVC frame, call `nghttp2_submit_extension()`:
-
-.. code-block:: c
-
-  static const alt_svc altsvc = {"example.com", "h2=\":8000\""};
-
-  nghttp2_submit_extension(session, 0xa, NGHTTP2_FLAG_NONE, 0,
-                           (void *)&altsvc);
-
-Notice that ALTSVC is use frame type ``0xa``.
-
-To receive extension frames, implement 2 callbacks:
-:type:`nghttp2_unpack_extension_callback` and
-:type:`nghttp2_on_extension_chunk_recv_callback`.
-:type:`nghttp2_unpack_extension_callback` implements the way how to
-decode wire format.  :type:`nghttp2_on_extension_chunk_recv_callback`
-implements how to buffer the incoming extension payload.  These
-callbacks must be set using
-`nghttp2_session_callbacks_set_unpack_extension_callback()` and
-`nghttp2_session_callbacks_set_on_extension_chunk_recv_callback()`
-respectively.  The application also must tell the library which
-extension frame type it is willing to receive using
-`nghttp2_option_set_user_recv_extension_type()`.  Note that the
-application has to create :type:`nghttp2_option` object for that
-purpose, and initialize session with it.
-
-We use ALTSVC again to illustrate how to receive extension frames.  We
-use different ``alt_svc`` struct than the previous one.
-
-First implement 2 callbacks.  We store incoming ALTSVC payload to
-global variable ``altsvc_buffer``.  Don't do this in production code
-since this is not thread safe:
-
-.. code-block:: c
-
-    typedef struct {
-      const uint8_t *origin;
-      size_t originlen;
-      const uint8_t *field;
-      size_t fieldlen;
-    } alt_svc;
-
-    /* buffers incoming ALTSVC payload */
-    uint8_t altsvc_buffer[4096];
-    /* The length of byte written to altsvc_buffer */
-    size_t altsvc_bufferlen = 0;
-
-    int on_extension_chunk_recv_callback(nghttp2_session *session,
-                                         const nghttp2_frame_hd *hd,
-                                         const uint8_t *data, size_t len,
-                                         void *user_data) {
-      if (sizeof(altsvc_buffer) < altsvc_bufferlen + len) {
-        altsvc_bufferlen = 0;
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      memcpy(altsvc_buffer + altsvc_bufferlen, data, len);
-      altsvc_bufferlen += len;
-
-      return 0;
-    }
-
-    int unpack_extension_callback(nghttp2_session *session, void **payload,
-                                  const nghttp2_frame_hd *hd, void *user_data) {
-      uint8_t *origin, *field;
-      size_t originlen, fieldlen;
-      uint8_t *p, *end;
-      alt_svc *altsvc;
-
-      if (altsvc_bufferlen < 2) {
-        altsvc_bufferlen = 0;
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      p = altsvc_buffer;
-      end = altsvc_buffer + altsvc_bufferlen;
-
-      originlen = ((*p) << 8) + *(p + 1);
-      p += 2;
-
-      if (p + originlen > end) {
-        altsvc_bufferlen = 0;
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      origin = p;
-      field = p + originlen;
-      fieldlen = end - field;
-
-      altsvc = (alt_svc *)malloc(sizeof(alt_svc));
-      altsvc->origin = origin;
-      altsvc->originlen = originlen;
-      altsvc->field = field;
-      altsvc->fieldlen = fieldlen;
-
-      *payload = altsvc;
-
-      altsvc_bufferlen = 0;
-
-      return 0;
-    }
-
-Set these callbacks to :type:`nghttp2_session_callbacks`:
-
-.. code-block:: c
-
-    nghttp2_session_callbacks_set_on_extension_chunk_recv_callback(
-        callbacks, on_extension_chunk_recv_callback);
-
-    nghttp2_session_callbacks_set_unpack_extension_callback(
-        callbacks, unpack_extension_callback);
-
-
-In ``unpack_extension_callback`` above, we set unpacked ``alt_svc``
-object to ``*payload``.  nghttp2 library then, calls
-:type:`nghttp2_on_frame_recv_callback`, and ``*payload`` will be
-available as ``frame->ext.payload``:
-
-.. code-block:: c
-
-    int on_frame_recv_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, void *user_data) {
-
-      switch (frame->hd.type) {
-      ...
-      case 0xa: {
-        alt_svc *altsvc = (alt_svc *)frame->ext.payload;
-        fprintf(stderr, "ALTSVC frame received\n");
-        fprintf(stderr, " origin: %.*s\n", (int)altsvc->originlen, altsvc->origin);
-        fprintf(stderr, " field : %.*s\n", (int)altsvc->fieldlen, altsvc->field);
-        free(altsvc);
-        break;
-      }
-      }
-
-      return 0;
-    }
-
-Finally, application should set the extension frame types it is
-willing to receive:
-
-.. code-block:: c
-
-    nghttp2_option_set_user_recv_extension_type(option, 0xa);
-
-The :type:`nghttp2_option` must be set to :type:`nghttp2_session` on
-its creation:
-
-.. code-block:: c
-
-    nghttp2_session_client_new2(&session, callbacks, user_data, option);
-
-How to use built-in HTTP/2 extension frame handlers
----------------------------------------------------
-
-In the previous section, we talked about the user defined HTTP/2
-extension frames.  In this section, we talk about HTTP/2 extension
-frame support built into nghttp2 library.
-
-As of this writing, nghttp2 supports ALTSVC extension frame.  To send
-ALTSVC frame, use `nghttp2_submit_altsvc()` function.
-
-To receive ALTSVC frame through built-in functionality, application
-has to use `nghttp2_option_set_builtin_recv_extension_type()` to
-indicate the willingness of receiving ALTSVC frame:
-
-.. code-block:: c
-
-    nghttp2_option_set_builtin_recv_extension_type(option, NGHTTP2_ALTSVC);
-
-This is very similar to the case when we used to receive user defined
-frames.
-
-If the same frame type is set using
-`nghttp2_option_set_builtin_recv_extension_type()` and
-`nghttp2_option_set_user_recv_extension_type()`, the latter takes
-precedence.  Application can implement its own frame handler rather
-than using built-in handler.
-
-The :type:`nghttp2_option` must be set to :type:`nghttp2_session` on
-its creation, like so:
-
-.. code-block:: c
-
-    nghttp2_session_client_new2(&session, callbacks, user_data, option);
-
-When ALTSVC is received, :type:`nghttp2_on_frame_recv_callback` will
-be called as usual.
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/python-apiref.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/python-apiref.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/python-apiref.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/python-apiref.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/python-apiref.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/README.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/README.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/README.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-nghttp2 Documentation
-=====================
-
-The documentation of nghttp2 is generated using Sphinx.  This
-directory contains the source files to be processed by Sphinx.  The
-source file for API reference is generated using a script called
-``mkapiref.py`` from the nghttp2 C source code.
-
-Generating API reference
-------------------------
-
-As described earlier, we use ``mkapiref.py`` to generate rst formatted
-text of API reference from C source code.  The ``mkapiref.py`` is not
-so flexible and it requires that C source code is formatted in rather
-strict rules.
-
-To generate API reference, just run ``make html``. It runs
-``mkapiref.py`` and then run Sphinx to build the entire document.
-
-The ``mkapiref.py`` reads C source code and searches the comment block
-starts with ``/**``. In other words, it only processes the comment
-block starting ``/**``. The comment block must end with ``*/``. The
-``mkapiref.py`` requires that which type of the object this comment
-block refers to.  To specify the type of the object, the next line
-must contain the so-called action keyword.  Currently, the following
-action keywords are supported: ``@function``, ``@functypedef``,
-``@enum``, ``@struct`` and ``@union``. The following sections
-describes each action keyword.
-
-@function
-#########
-
-``@function`` is used to refer to the function.  The comment block is
-used for the document for the function.  After the script sees the end
-of the comment block, it consumes the lines as the function
-declaration until the line which ends with ``;`` is encountered.
-
-In Sphinx doc, usually the function argument is formatted like
-``*this*``.  But in C, ``*`` is used for dereferencing a pointer and
-we must escape ``*`` with a back slash. To avoid this, we format the
-argument like ``|this|``. The ``mkapiref.py`` translates it with
-``*this*``, as escaping ``*`` inside ``|`` and ``|`` as necessary.
-Note that this shadows the substitution feature of Sphinx.
-
-The example follows::
-
-    /**
-     * @function
-     *
-     * Submits PING frame to the |session|.
-     */
-    int nghttp2_submit_ping(nghttp2_session *session);
-
-
-@functypedef
-############
-
-``@functypedef`` is used to refer to the typedef of the function
-pointer. The formatting rule is pretty much the same with
-``@function``, but this outputs ``type`` domain, rather than
-``function`` domain.
-
-The example follows::
-
-    /**
-     * @functypedef
-     *
-     * Callback function invoked when |session| wants to send data to
-     * remote peer.
-     */
-    typedef ssize_t (*nghttp2_send_callback)
-    (nghttp2_session *session,
-     const uint8_t *data, size_t length, int flags, void *user_data);
-
-@enum
-#####
-
-``@enum`` is used to refer to the enum.  Currently, only enum typedefs
-are supported.  The comment block is used for the document for the
-enum type itself. To document each values, put comment block starting
-with the line ``/**`` and ending with the ``*/`` just before the enum
-value.  When the line starts with ``}`` is encountered, the
-``mkapiref.py`` extracts strings next to ``}`` as the name of enum.
-
-At the time of this writing, Sphinx does not support enum type. So we
-use ``type`` domain for enum it self and ``macro`` domain for each
-value. To refer to the enum value, use ``:enum:`` pseudo role. The
-``mkapiref.py`` replaces it with ``:macro:``. By doing this, when
-Sphinx will support enum officially, we can replace ``:enum:`` with
-the official role easily.
-
-The example follows::
-
-    /**
-     * @enum
-     * Error codes used in the nghttp2 library.
-     */
-    typedef enum {
-      /**
-       * Invalid argument passed.
-       */
-      NGHTTP2_ERR_INVALID_ARGUMENT = -501,
-      /**
-       * Zlib error.
-       */
-      NGHTTP2_ERR_ZLIB = -502,
-    } nghttp2_error;
-
-@struct
-#######
-
-``@struct`` is used to refer to the struct. Currently, only struct
-typedefs are supported. The comment block is used for the document for
-the struct type itself.To document each member, put comment block
-starting with the line ``/**`` and ending with the ``*/`` just before
-the member.  When the line starts with ``}`` is encountered, the
-``mkapiref.py`` extracts strings next to ``}`` as the name of struct.
-The block-less typedef is also supported. In this case, typedef
-declaration must be all in one line and the ``mkapiref.py`` uses last
-word as the name of struct.
-
-Some examples follow::
-    
-    /**
-     * @struct
-     * The control frame header.
-     */
-    typedef struct {
-      /**
-       * SPDY protocol version.
-       */
-      uint16_t version;
-      /**
-       * The type of this control frame.
-       */
-      uint16_t type;
-      /**
-       * The control frame flags.
-       */
-      uint8_t flags;
-      /**
-       * The length field of this control frame.
-       */
-      int32_t length;
-    } nghttp2_ctrl_hd;
-        
-    /**
-     * @struct
-     *
-     * The primary structure to hold the resources needed for a SPDY
-     * session. The details of this structure is hidden from the public
-     * API.
-     */
-    typedef struct nghttp2_session nghttp2_session;
-
-@union
-######
-
-``@union`` is used to refer to the union. Currently, ``@union`` is an
-alias of ``@struct``.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/building-android-binary.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/building-android-binary.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/building-android-binary.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/building-android-binary.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-Building Android binary
-=======================
-
-In this article, we briefly describe how to build Android binary using
-`Android NDK <https://developer.android.com/ndk/index.html>`_
-cross-compiler on Debian Linux.
-
-The easiest way to build android binary is use Dockerfile.android.
-See Dockerfile.android for more details.  If you cannot use
-Dockerfile.android for whatever reason, continue to read the rest of
-this article.
-
-We offer ``android-config`` and ``android-make`` scripts to make the
-build easier.  To make these script work, NDK toolchain must be
-installed in the following way.  First, let us introduce
-``ANDROID_HOME`` environment variable.  We need to install toolchain
-under ``$ANDROID_HOME/toolchain``.  An user can freely choose the path
-for ``ANDROID_HOME``.  For example, to install toolchain under
-``$ANDROID_HOME/toolchain``, do this in the the directory where NDK is
-unpacked:
-
-.. code-block:: text
-
-    $ build/tools/make_standalone_toolchain.py \
-      --arch arm --api 16 --stl gnustl \
-      --install-dir $ANDROID_HOME/toolchain
-
-The API level (``--api``) is not important here because we don't use
-Android specific C/C++ API.
-
-The dependent libraries, such as OpenSSL, libev, and c-ares should be
-built with the toolchain and installed under
-``$ANDROID_HOME/usr/local``.  We recommend to build these libraries as
-static library to make the deployment easier.  libxml2 support is
-currently disabled.
-
-Although zlib comes with Android NDK, it seems not to be a part of
-public API, so we have to built it for our own.  That also provides us
-proper .pc file as a bonus.
-
-Before running ``android-config`` and ``android-make``,
-``ANDROID_HOME`` environment variable must be set to point to the
-correct path.  Also add ``$ANDROID_HOME/toolchain/bin`` to ``PATH``:
-
-.. code-block:: text
-
-    $ export PATH=$PATH:$ANDROID_HOME/toolchain/bin
-
-To configure OpenSSL, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi-
-    ./Configure --prefix=$PREFIX android
-
-And run ``make install_sw`` to build and install without
-documentation.
-
-We cannot compile libev without modification.  Apply `this patch
-<https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed>`_ before
-configuring libev.  This patch is for libev-4.19.  After applying the
-patch, to configure libev, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    ./configure \
-        --host=arm-linux-androideabi \
-        --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-        --prefix=$PREFIX \
-        --disable-shared \
-        --enable-static \
-        CPPFLAGS=-I$PREFIX/include \
-        LDFLAGS=-L$PREFIX/lib
-
-And run ``make install`` to build and install.
-
-To configure c-ares, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh -e
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    ./configure \
-        --host=arm-linux-androideabi \
-        --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-        --prefix=$PREFIX \
-        --disable-shared
-
-To configure zlib, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh -e
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    HOST=arm-linux-androideabi
-
-    CC=$HOST-gcc \
-    AR=$HOST-ar \
-    LD=$HOST-ld \
-    RANLIB=$HOST-ranlib \
-    STRIP=$HOST-strip \
-    ./configure \
-        --prefix=$PREFIX \
-        --libdir=$PREFIX/lib \
-        --includedir=$PREFIX/include \
-        --static
-
-And run ``make install`` to build and install.
-
-After prerequisite libraries are prepared, run ``android-config`` and
-then ``android-make`` to compile nghttp2 source files.
-
-If all went well, application binaries, such as nghttpx, are created
-under src directory.  Strip debugging information from the binary
-using the following command:
-
-.. code-block:: text
-
-    $ arm-linux-androideabi-strip src/nghttpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/contribute.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/contribute.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/contribute.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/contribute.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-Contribution Guidelines
-=======================
-
-[This text was composed based on 1.2. License section of curl/libcurl
-project.]
-
-When contributing with code, you agree to put your changes and new
-code under the same license nghttp2 is already using unless stated and
-agreed otherwise.
-
-When changing existing source code, you do not alter the copyright of
-the original file(s).  The copyright will still be owned by the
-original creator(s) or those who have been assigned copyright by the
-original author(s).
-
-By submitting a patch to the nghttp2 project, you are assumed to have
-the right to the code and to be allowed by your employer or whatever
-to hand over that patch/code to us.  We will credit you for your
-changes as far as possible, to give credit but also to keep a trace
-back to who made what changes.  Please always provide us with your
-full real name when contributing!
-
-Coding style
-------------
-
-We use clang-format to format source code consistently.  The
-clang-format configuration file .clang-format is located at the root
-directory.  Since clang-format produces slightly different results
-between versions, we currently use clang-format-6.0.
-
-To detect any violation to the coding style, we recommend to setup git
-pre-commit hook to check coding style of the changes you introduced.
-The pre-commit file is located at the root directory.  Copy it under
-.git/hooks and make sure that it is executable.  The pre-commit script
-uses clang-format-diff.py to detect any style errors.  If it is not in
-your PATH or it exists under different name (e.g.,
-clang-format-diff-6.0 in debian), either add it to PATH variable or
-add git option ``clangformatdiff.binary`` to point to the script.
-
-For emacs users, integrating clang-format to emacs is very easy.
-clang-format.el should come with clang distribution.  If it is not
-found, download it from `here
-<https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format/clang-format.el>`_.
-And add these lines to your .emacs file:
-
-.. code-block:: lisp
-
-    ;; From
-    ;; https://code.google.com/p/chromium/wiki/Emacs#Use_Google's_C++_style!
-    (load "/<path/to>/clang-format.el")
-    (add-hook 'c-mode-common-hook
-         (function (lambda () (local-set-key (kbd "TAB")
-                                             'clang-format-region))))
-
-You can find other editor integration in
-http://clang.llvm.org/docs/ClangFormat.html.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/h2load-howto.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/h2load-howto.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/h2load-howto.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/h2load-howto.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-.. program:: h2load
-
-h2load - HTTP/2 benchmarking tool - HOW-TO
-==========================================
-
-:doc:`h2load.1` is benchmarking tool for HTTP/2 and HTTP/1.1.  It
-supports SSL/TLS and clear text for all supported protocols.
-
-Compiling from source
----------------------
-
-h2load is compiled alongside nghttp2 and requires that the
-``--enable-app`` flag is passed to ``./configure`` and `required
-dependencies <https://github.com/nghttp2/nghttp2#requirements>`_ are
-available during compilation. For details on compiling, see `nghttp2:
-Building from Git
-<https://github.com/nghttp2/nghttp2#building-from-git>`_.
-
-Basic Usage
------------
-
-In order to set benchmark settings, specify following 3 options.
-
-:option:`-n`
-    The number of total requests.  Default: 1
-
-:option:`-c`
-    The number of concurrent clients.  Default: 1
-
-:option:`-m`
-   The max concurrent streams to issue per client.  Default: 1
-
-For SSL/TLS connection, the protocol will be negotiated via ALPN/NPN.
-You can set specific protocols in :option:`--npn-list` option.  For
-cleartext connection, the default protocol is HTTP/2.  To change the
-protocol in cleartext connection, use :option:`--no-tls-proto` option.
-For convenience, :option:`--h1` option forces HTTP/1.1 for both
-cleartext and SSL/TLS connections.
-
-Here is a command-line to perform benchmark to URI \https://localhost
-using total 100000 requests, 100 concurrent clients and 10 max
-concurrent streams:
-
-.. code-block:: text
-
-    $ h2load -n100000 -c100 -m10 https://localhost
-
-The benchmarking result looks like this:
-
-.. code-block:: text
-
-    finished in 7.08s, 141164.80 req/s, 555.33MB/s
-    requests: 1000000 total, 1000000 started, 1000000 done, 1000000 succeeded, 0 failed, 0 errored, 0 timeout
-    status codes: 1000000 2xx, 0 3xx, 0 4xx, 0 5xx
-    traffic: 4125025824 bytes total, 11023424 bytes headers (space savings 93.07%), 4096000000 bytes data
-                         min         max         mean         sd        +/- sd
-    time for request:    15.31ms    146.85ms     69.78ms      9.26ms    92.43%
-    time for connect:     1.08ms     25.04ms     10.71ms      9.80ms    64.00%
-    time to 1st byte:    25.36ms    184.96ms     79.11ms     53.97ms    78.00%
-    req/s (client)  :    1412.04     1447.84     1426.52       10.57    63.00%
-
-See the h2load manual page :ref:`h2load-1-output` section for the
-explanation of the above numbers.
-
-Timing-based load-testing
--------------------------
-
-As of v1.26.0, h2load supports timing-based load-testing.  This method
-performs load-testing in terms of a given duration instead of a
-pre-defined number of requests. The new option :option:`--duration`
-specifies how long the load-testing takes. For example,
-``--duration=10`` makes h2load perform load-testing against a server
-for 10 seconds. You can also specify a “warming-up” period with
-:option:`--warm-up-time`. If :option:`--duration` is used,
-:option:`-n` option is ignored.
-
-The following command performs load-testing for 10 seconds after 5
-seconds warming up period:
-
-.. code-block:: text
-
-    $ h2load -c100 -m100 --duration=10 --warm-up-time=5 https://localhost
-
-Flow Control
-------------
-
-HTTP/2 has flow control and it may affect benchmarking results.  By
-default, h2load uses large enough flow control window, which
-effectively disables flow control.  To adjust receiver flow control
-window size, there are following options:
-
-:option:`-w`
-   Sets  the stream  level  initial  window size  to
-   (2**<N>)-1.
-
-:option:`-W`
-   Sets the connection level  initial window size to
-   (2**<N>)-1.
-
-Multi-Threading
----------------
-
-Sometimes benchmarking client itself becomes a bottleneck.  To remedy
-this situation, use :option:`-t` option to specify the number of native
-thread to use.
-
-:option:`-t`
-    The number of native threads. Default: 1
-
-Selecting protocol for clear text
----------------------------------
-
-By default, if \http:// URI is given, HTTP/2 protocol is used.  To
-change the protocol to use for clear text, use :option:`-p` option.
-
-Multiple URIs
--------------
-
-If multiple URIs are specified, they are used in round robin manner.
-
-.. note::
-
-    Please note that h2load uses scheme, host and port in the first URI
-    and ignores those parts in the rest of the URIs.
-
-UNIX domain socket
-------------------
-
-To request against UNIX domain socket, use :option:`--base-uri`, and
-specify ``unix:`` followed by the path to UNIX domain socket.  For
-example, if UNIX domain socket is ``/tmp/nghttpx.sock``, use
-``--base-uri=unix:/tmp/nghttpx.sock``.  h2load uses scheme, host and
-port in the first URI in command-line or input file.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/index.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/index.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/index.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/index.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-.. nghttp2 documentation master file, created by
-   sphinx-quickstart on Sun Mar 11 22:57:49 2012.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-nghttp2 - HTTP/2 C Library
-============================
-
-This is an implementation of Hypertext Transfer Protocol version 2.
-
-The project is hosted at `github.com/nghttp2/nghttp2
-<https://github.com/nghttp2/nghttp2>`_.
-
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-   package_README
-   contribute
-   building-android-binary
-   tutorial-client
-   tutorial-server
-   tutorial-hpack
-   nghttp.1
-   nghttpd.1
-   nghttpx.1
-   h2load.1
-   nghttpx-howto
-   h2load-howto
-   programmers-guide
-   apiref
-   libnghttp2_asio
-   python-apiref
-   nghttp2.h
-   nghttp2ver.h
-   asio_http2_server.h
-   asio_http2_client.h
-   asio_http2.h
-   Source <https://github.com/nghttp2/nghttp2>
-   Issues <https://github.com/nghttp2/nghttp2/issues>
-   nghttp2.org <https://nghttp2.org/>
-
-Released Versions
-=================
-
-https://github.com/nghttp2/nghttp2/releases
-
-Resources
----------
-
-* HTTP/2 https://tools.ietf.org/html/rfc7540
-* HPACK https://tools.ietf.org/html/rfc7541
-* HTTP Alternative Services https://tools.ietf.org/html/rfc7838
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/libnghttp2_asio.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/libnghttp2_asio.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/libnghttp2_asio.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/libnghttp2_asio.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,433 +0,0 @@
-libnghttp2_asio: High level HTTP/2 C++ library
-==============================================
-
-libnghttp2_asio is C++ library built on top of libnghttp2 and provides
-high level abstraction API to build HTTP/2 applications.  It depends
-on Boost::ASIO library and OpenSSL.  Currently libnghttp2_asio
-provides server and client side API.
-
-libnghttp2_asio is not built by default.  Use ``--enable-asio-lib``
-configure flag to build libnghttp2_asio.  The required Boost libraries
-are:
-
-* Boost::Asio
-* Boost::System
-* Boost::Thread
-
-We have 3 header files for this library:
-
-* :doc:`asio_http2_server.h`
-* :doc:`asio_http2_client.h`
-* :doc:`asio_http2.h`
-
-asio_http2.h is included from the other two files.
-
-To build a program with libnghttp2_asio, link to the following
-libraries::
-
-    -lnghttp2_asio -lboost_system
-
-If ``boost::asio::ssl`` is used in application code, OpenSSL is also
-required in link line::
-
-    -lnghttp2_asio -lboost_system -lssl -lcrypto
-
-Server API
-----------
-
-To use server API, first include following header file:
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_server.h>
-
-Also take a look at that header file :doc:`asio_http2_server.h`.
-
-Server API is designed to build HTTP/2 server very easily to utilize
-C++11 anonymous function and closure.  The bare minimum example of
-HTTP/2 server looks like this:
-
-.. code-block:: cpp
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      http2 server;
-
-      server.handle("/", [](const request &req, const response &res) {
-        res.write_head(200);
-        res.end("hello, world\n");
-      });
-
-      if (server.listen_and_serve(ec, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-First we instantiate ``nghttp2::asio_http2::server::http2`` object.
-``nghttp2::asio_http2::server::http2::handle`` function registers
-pattern and its handler function.  In this example, we register "/" as
-pattern, which matches all requests.  Then call
-``nghttp2::asio_http2::server::http2::listen_and_serve`` function with
-address and port to listen to.
-
-The ``req`` and ``res`` represent HTTP request and response
-respectively.  ``nghttp2::asio_http2_::server::response::write_head``
-constructs HTTP response header fields.  The first argument is HTTP
-status code, in the above example, which is 200.  The second argument,
-which is omitted in the above example, is additional header fields to
-send.
-
-``nghttp2::asio_http2::server::response::end`` sends response body.
-In the above example, we send string "hello, world".
-
-The life time of req and res object ends after the callback set by
-``nghttp2::asio_http2::server::response::on_close`` function.
-Application must not use those objects after this call.
-
-Serving static files and enabling SSL/TLS
-+++++++++++++++++++++++++++++++++++++++++
-
-In this example, we serve a couple of static files and also enable
-SSL/TLS.
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_server.h>
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-
-      tls.use_private_key_file("server.key", boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file("server.crt");
-
-      configure_tls_context_easy(ec, tls);
-
-      http2 server;
-
-      server.handle("/index.html", [](const request &req, const response &res) {
-        res.write_head(200);
-        res.end(file_generator("index.html"));
-      });
-
-      if (server.listen_and_serve(ec, tls, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-We first create ``boost::asio::ssl::context`` object and set path to
-private key file and certificate file.
-``nghttp2::asio_http2::server::configure_tls_context_easy`` function
-configures SSL/TLS context object for HTTP/2 server use, including NPN
-callbacks.
-
-In the above example, if request path is "/index.html", we serve
-index.html file in the current working directory.
-``nghttp2::asio_http2::server::response::end`` has overload to take
-function of type ``nghttp2::asio_http2::generator_cb`` and application
-pass its implementation to generate response body.  For the
-convenience, libnghttp2_asio library provides
-``nghttp2::asio_http2::file_generator`` function to generate function
-to server static file.  If other resource is requested, server
-automatically responds with 404 status code.
-
-Server push
-+++++++++++
-
-Server push is also supported.
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_server.h>
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-
-      tls.use_private_key_file("server.key", boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file("server.crt");
-
-      configure_tls_context_easy(ec, tls);
-
-      http2 server;
-
-      std::string style_css = "h1 { color: green; }";
-
-      server.handle("/", [&style_css](const request &req, const response &res) {
-        boost::system::error_code ec;
-        auto push = res.push(ec, "GET", "/style.css");
-        push->write_head(200);
-        push->end(style_css);
-
-        res.write_head(200);
-        res.end(R"(
-    <!DOCTYPE html><html lang="en">
-    <title>HTTP/2 FTW</title><body>
-    <link href="/style.css" rel="stylesheet" type="text/css">
-    <h1>This should be green</h1>
-    </body></html>
-    )");
-      });
-
-      server.handle("/style.css",
-                    [&style_css](const request &req, const response &res) {
-        res.write_head(200);
-        res.end(style_css);
-      });
-
-      if (server.listen_and_serve(ec, tls, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-When client requested any resource other than "/style.css", we push
-"/style.css".  To push resource, call
-``nghttp2::asio_http2::server::response::push`` function with desired
-method and path.  It returns another response object and use its
-functions to send push response.
-
-Enable multi-threading
-++++++++++++++++++++++
-
-Enabling multi-threading is very easy.  Just call
-``nghttp2::asio_http2::server::http2::num_threads`` function with the
-desired number of threads:
-
-.. code-block:: cpp
-
-    http2 server;
-
-    // Use 4 native threads
-    server.num_threads(4);
-
-Client API
-----------
-
-To use client API, first include following header file:
-
-.. code-block:: cpp
-
-    #include <nghttp2/asio_http2_client.h>
-
-Also take a look at that header file :doc:`asio_http2_client.h`.
-
-Here is the sample client code to access HTTP/2 server and print out
-response header fields and response body to the console screen:
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      // connect to localhost:3000
-      session sess(io_service, "localhost", "3000");
-
-      sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
-	boost::system::error_code ec;
-
-	auto req = sess.submit(ec, "GET", "http://localhost:3000/");
-
-	req->on_response([](const response &res) {
-	  // print status code and response header fields.
-	  std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-	  for (auto &kv : res.header()) {
-	    std::cerr << kv.first << ": " << kv.second.value << "\n";
-	  }
-	  std::cerr << std::endl;
-
-	  res.on_data([](const uint8_t *data, std::size_t len) {
-	    std::cerr.write(reinterpret_cast<const char *>(data), len);
-	    std::cerr << std::endl;
-	  });
-	});
-
-	req->on_close([&sess](uint32_t error_code) {
-	  // shutdown session after first request was done.
-	  sess.shutdown();
-	});
-      });
-
-      sess.on_error([](const boost::system::error_code &ec) {
-	std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-``nghttp2::asio_http2::client::session`` object takes
-``boost::asio::io_service`` object and remote server address.  When
-connection is made, the callback function passed to
-``nghttp2::asio_http2::client::on_connect`` is invoked with connected
-address as its parameter.  After this callback call, use
-``nghttp2::asio_http2::session::submit`` to send request to the
-server.  You can submit multiple requests at once without waiting for
-the completion of previous request.
-
-The life time of req and res object ends after the callback set by
-``nghttp2::asio_http2::server::request::on_close`` function.
-Application must not use those objects after this call.
-
-Normally, client does not stop even after all requests are done unless
-connection is lost.  To stop client, call
-``nghttp2::asio_http2::server::session::shutdown()``.
-
-Receive server push and enable SSL/TLS
-++++++++++++++++++++++++++++++++++++++
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-      tls.set_default_verify_paths();
-      // disabled to make development easier...
-      // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
-      configure_tls_context(ec, tls);
-
-      // connect to localhost:3000
-      session sess(io_service, tls, "localhost", "3000");
-
-      sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
-	boost::system::error_code ec;
-
-	auto req = sess.submit(ec, "GET", "http://localhost:3000/");
-
-	req->on_response([&sess](const response &res) {
-	  std::cerr << "response received!" << std::endl;
-	  res.on_data([&sess](const uint8_t *data, std::size_t len) {
-	    std::cerr.write(reinterpret_cast<const char *>(data), len);
-	    std::cerr << std::endl;
-	  });
-	});
-
-	req->on_push([](const request &push) {
-	  std::cerr << "push request received!" << std::endl;
-	  push.on_response([](const response &res) {
-	    std::cerr << "push response received!" << std::endl;
-	    res.on_data([](const uint8_t *data, std::size_t len) {
-	      std::cerr.write(reinterpret_cast<const char *>(data), len);
-	      std::cerr << std::endl;
-	    });
-	  });
-	});
-      });
-
-      sess.on_error([](const boost::system::error_code &ec) {
-	std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-The above sample code demonstrates how to enable SSL/TLS and receive
-server push.  Currently,
-``nghttp2::asio_http2::client::configure_tls_context`` function setups
-NPN callbacks for SSL/TLS context for HTTP/2 use.
-
-To receive server push, use
-``nghttp2::asio_http2::client::request::on_push`` function to set
-callback function which is invoked when server push request is
-arrived.  The callback function takes
-``nghttp2::asio_http2::client::request`` object, which contains the
-pushed request.  To get server push response, set callback using
-``nghttp2::asio_http2::client::request::on_response``.
-
-As stated in the previous section, client does not stop automatically
-as long as HTTP/2 session is fine and connection is alive.  We don't
-call ``nghttp2::asio_http2::client::session::shutdown`` in this
-example, so the program does not terminate after all responses are
-received.  Hit Ctrl-C to terminate the program.
-
-Multiple concurrent requests
-++++++++++++++++++++++++++++
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      // connect to localhost:3000
-      session sess(io_service, "localhost", "3000");
-
-      sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
-	boost::system::error_code ec;
-
-	auto printer = [](const response &res) {
-	  res.on_data([](const uint8_t *data, std::size_t len) {
-	    std::cerr.write(reinterpret_cast<const char *>(data), len);
-	    std::cerr << std::endl;
-	  });
-	};
-
-	std::size_t num = 3;
-	auto count = std::make_shared<int>(num);
-
-	for (std::size_t i = 0; i < num; ++i) {
-	  auto req = sess.submit(ec, "GET",
-				 "http://localhost:3000/" + std::to_string(i + 1));
-
-	  req->on_response(printer);
-	  req->on_close([&sess, count](uint32_t error_code) {
-	    if (--*count == 0) {
-	      // shutdown session after |num| requests were done.
-	      sess.shutdown();
-	    }
-	  });
-	}
-      });
-
-      sess.on_error([](const boost::system::error_code &ec) {
-	std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-Here is the sample to send 3 requests at once.  Depending on the
-server settings, these requests are processed out-of-order.  In this
-example, we have a trick to shutdown session after all requests were
-done.  We made ``count`` object which is shared pointer to int and is
-initialized to 3.  On each request closure (the invocation of the
-callback set by ``nghttp2::asio_http2::client::request::on_close``),
-we decrement the count.  If count becomes 0, we are sure that all
-requests have been done and initiate shutdown.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/nghttpx-howto.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/nghttpx-howto.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/nghttpx-howto.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/nghttpx-howto.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,543 +0,0 @@
-.. program:: nghttpx
-
-nghttpx - HTTP/2 proxy - HOW-TO
-===============================
-
-:doc:`nghttpx.1` is a proxy translating protocols between HTTP/2 and
-other protocols (e.g., HTTP/1).  It operates in several modes and each
-mode may require additional programs to work with.  This article
-describes each operation mode and explains the intended use-cases.  It
-also covers some useful options later.
-
-Default mode
-------------
-
-If nghttpx is invoked without :option:`--http2-proxy`, it operates in
-default mode.  In this mode, it works as reverse proxy (gateway) for
-both HTTP/2 and HTTP/1 clients to backend servers.  This is also known
-as "HTTP/2 router".
-
-By default, frontend connection is encrypted using SSL/TLS.  So
-server's private key and certificate must be supplied to the command
-line (or through configuration file).  In this case, the frontend
-protocol selection will be done via ALPN or NPN.
-
-To turn off encryption on frontend connection, use ``no-tls`` keyword
-in :option:`--frontend` option.  HTTP/2 and HTTP/1 are available on
-the frontend, and an HTTP/1 connection can be upgraded to HTTP/2 using
-HTTP Upgrade.  Starting HTTP/2 connection by sending HTTP/2 connection
-preface is also supported.
-
-nghttpx can listen on multiple frontend addresses.  This is achieved
-by using multiple :option:`--frontend` options.  For each frontend
-address, TLS can be enabled or disabled.
-
-By default, backend connections are not encrypted.  To enable TLS
-encryption on backend connections, use ``tls`` keyword in
-:option:`--backend` option.  Using patterns and ``proto`` keyword in
-:option:`--backend` option, backend application protocol can be
-specified per host/request path pattern.  It means that you can use
-both HTTP/2 and HTTP/1 in backend connections at the same time.  Note
-that default backend protocol is HTTP/1.1.  To use HTTP/2 in backend,
-you have to specify ``h2`` in ``proto`` keyword in :option:`--backend`
-explicitly.
-
-The backend is supposed to be a Web server.  For example, to make
-nghttpx listen to encrypted HTTP/2 requests at port 8443, and a
-backend Web server is configured to listen to HTTP requests at port
-8080 on the same host, run nghttpx command-line like this:
-
-.. code-block:: text
-
-    $ nghttpx -f0.0.0.0,8443 -b127.0.0.1,8080 /path/to/server.key /path/to/server.crt
-
-Then an HTTP/2 enabled client can access the nghttpx server using HTTP/2.  For
-example, you can send a GET request using nghttp:
-
-.. code-block:: text
-
-    $ nghttp -nv https://localhost:8443/
-
-HTTP/2 proxy mode
------------------
-
-If nghttpx is invoked with :option:`--http2-proxy` (or its shorthand
-:option:`-s`) option, it operates in HTTP/2 proxy mode.  The supported
-protocols in frontend and backend connections are the same as in `default
-mode`_.  The difference is that this mode acts like a forward proxy and
-assumes the backend is an HTTP proxy server (e.g., Squid, Apache Traffic
-Server).  HTTP/1 requests must include an absolute URI in request line.
-
-By default, the frontend connection is encrypted.  So this mode is
-also called secure proxy.
-
-To turn off encryption on the frontend connection, use ``no-tls`` keyword
-in :option:`--frontend` option.
-
-The backend must be an HTTP proxy server.  nghttpx supports multiple
-backend server addresses.  It translates incoming requests to HTTP
-request to backend server.  The backend server performs real proxy
-work for each request, for example, dispatching requests to the origin
-server and caching contents.
-
-The backend connection is not encrypted by default.  To enable
-encryption, use ``tls`` keyword in :option:`--backend` option.  The
-default backend protocol is HTTP/1.1.  To use HTTP/2 in backend
-connection, use :option:`--backend` option, and specify ``h2`` in
-``proto`` keyword explicitly.
-
-For example, to make nghttpx listen to encrypted HTTP/2 requests at
-port 8443, and a backend HTTP proxy server is configured to listen to
-HTTP/1 requests at port 8080 on the same host, run nghttpx command-line
-like this:
-
-.. code-block:: text
-
-    $ nghttpx -s -f'*,8443' -b127.0.0.1,8080 /path/to/server.key /path/to/server.crt
-
-At the time of this writing, Firefox 41 and Chromium v46 can use
-nghttpx as HTTP/2 proxy.
-
-To make Firefox or Chromium use nghttpx as HTTP/2 proxy, user has to
-create proxy.pac script file like this:
-
-.. code-block:: javascript
-
-    function FindProxyForURL(url, host) {
-        return "HTTPS SERVERADDR:PORT";
-    }
-
-``SERVERADDR`` and ``PORT`` is the hostname/address and port of the
-machine nghttpx is running.  Please note that both Firefox and
-Chromium require valid certificate for secure proxy.
-
-For Firefox, open Preference window and select Advanced then click
-Network tab.  Clicking Connection Settings button will show the
-dialog.  Select "Automatic proxy configuration URL" and enter the path
-to proxy.pac file, something like this:
-
-.. code-block:: text
-
-    file:///path/to/proxy.pac
-
-For Chromium, use following command-line:
-
-.. code-block:: text
-
-    $ google-chrome --proxy-pac-url=file:///path/to/proxy.pac --use-npn
-
-As HTTP/1 proxy server, Squid may work as out-of-box.  Traffic server
-requires to be configured as forward proxy.  Here is the minimum
-configuration items to edit:
-
-.. code-block:: text
-
-    CONFIG proxy.config.reverse_proxy.enabled INT 0
-    CONFIG proxy.config.url_remap.remap_required INT 0
-
-Consult Traffic server `documentation
-<http://trafficserver.readthedocs.org/en/latest/admin-guide/configuration/transparent-forward-proxying.en.html>`_
-to know how to configure traffic server as forward proxy and its
-security implications.
-
-ALPN support
-------------
-
-ALPN support requires OpenSSL >= 1.0.2.
-
-Disable frontend SSL/TLS
-------------------------
-
-The frontend connections are encrypted with SSL/TLS by default.  To
-turn off SSL/TLS, use ``no-tls`` keyword in :option:`--frontend`
-option.  If this option is used, the private key and certificate are
-not required to run nghttpx.
-
-Enable backend SSL/TLS
-----------------------
-
-The backend connections are not encrypted by default.  To enable
-SSL/TLS encryption, use ``tls`` keyword in :option:`--backend` option.
-
-Enable SSL/TLS on memcached connection
---------------------------------------
-
-By default, memcached connection is not encrypted.  To enable
-encryption, use ``tls`` keyword in
-:option:`--tls-ticket-key-memcached` for TLS ticket key, and
-:option:`--tls-session-cache-memcached` for TLS session cache.
-
-Specifying additional server certificates
------------------------------------------
-
-nghttpx accepts additional server private key and certificate pairs
-using :option:`--subcert` option.  It can be used multiple times.
-
-Specifying additional CA certificate
-------------------------------------
-
-By default, nghttpx tries to read CA certificate from system.  But
-depending on the system you use, this may fail or is not supported.
-To specify CA certificate manually, use :option:`--cacert` option.
-The specified file must be PEM format and can contain multiple
-certificates.
-
-By default, nghttpx validates server's certificate.  If you want to
-turn off this validation, knowing this is really insecure and what you
-are doing, you can use :option:`--insecure` option to disable
-certificate validation.
-
-Read/write rate limit
----------------------
-
-nghttpx supports transfer rate limiting on frontend connections.  You
-can do rate limit per frontend connection for reading and writing
-individually.
-
-To perform rate limit for reading, use :option:`--read-rate` and
-:option:`--read-burst` options.  For writing, use
-:option:`--write-rate` and :option:`--write-burst`.
-
-Please note that rate limit is performed on top of TCP and nothing to
-do with HTTP/2 flow control.
-
-Rewriting location header field
--------------------------------
-
-nghttpx automatically rewrites location response header field if the
-following all conditions satisfy:
-
-* In the default mode (:option:`--http2-proxy` is not used)
-* :option:`--no-location-rewrite` is not used
-* URI in location header field is an absolute URI
-* URI in location header field includes non empty host component.
-* host (without port) in URI in location header field must match the
-  host appearing in ``:authority`` or ``host`` header field.
-
-When rewrite happens, URI scheme is replaced with the ones used in
-frontend, and authority is replaced with which appears in
-``:authority``, or ``host`` request header field.  ``:authority``
-header field has precedence over ``host``.
-
-Hot swapping
-------------
-
-nghttpx supports hot swapping using signals.  The hot swapping in
-nghttpx is multi step process.  First send USR2 signal to nghttpx
-process.  It will do fork and execute new executable, using same
-command-line arguments and environment variables.
-
-As of nghttpx version 1.20.0, that is all you have to do.  The new
-master process sends QUIT signal to the original process, when it is
-ready to serve requests, to shut it down gracefully.
-
-For earlier versions of nghttpx, you have to do one more thing.  At
-this point, both current and new processes can accept requests.  To
-gracefully shutdown current process, send QUIT signal to current
-nghttpx process.  When all existing frontend connections are done, the
-current process will exit.  At this point, only new nghttpx process
-exists and serves incoming requests.
-
-If you want to just reload configuration file without executing new
-binary, send SIGHUP to nghttpx master process.
-
-Re-opening log files
---------------------
-
-When rotating log files, it is desirable to re-open log files after
-log rotation daemon renamed existing log files.  To tell nghttpx to
-re-open log files, send USR1 signal to nghttpx process.  It will
-re-open files specified by :option:`--accesslog-file` and
-:option:`--errorlog-file` options.
-
-Multiple frontend addresses
----------------------------
-
-nghttpx can listen on multiple frontend addresses.  To specify them,
-just use :option:`--frontend` (or its shorthand :option:`-f`) option
-repeatedly.  TLS can be enabled or disabled per frontend address
-basis.  For example, to listen on port 443 with TLS enabled, and on
-port 80 without TLS:
-
-.. code-block:: text
-
-   frontend=*,443
-   frontend=*,80;no-tls
-
-
-Multiple backend addresses
---------------------------
-
-nghttpx supports multiple backend addresses.  To specify them, just
-use :option:`--backend` (or its shorthand :option:`-b`) option
-repeatedly.  For example, to use ``192.168.0.10:8080`` and
-``192.168.0.11:8080``, use command-line like this:
-``-b192.168.0.10,8080 -b192.168.0.11,8080``.  In configuration file,
-this looks like:
-
-.. code-block:: text
-
-   backend=192.168.0.10,8080
-   backend=192.168.0.11,8008
-
-nghttpx can route request to different backend according to request
-host and path.  For example, to route request destined to host
-``doc.example.com`` to backend server ``docserv:3000``, you can write
-like so:
-
-.. code-block:: text
-
-   backend=docserv,3000;doc.example.com/
-
-When you write this option in command-line, you should enclose
-argument with single or double quotes, since the character ``;`` has a
-special meaning in shell.
-
-To route, request to request path ``/foo`` to backend server
-``[::1]:8080``, you can write like so:
-
-.. code-block:: text
-
-   backend=::1,8080;/foo
-
-If the last character of path pattern is ``/``, all request paths
-which start with that pattern match:
-
-.. code-block:: text
-
-   backend=::1,8080;/bar/
-
-The request path ``/bar/buzz`` matches the ``/bar/``.
-
-You can use ``*`` at the end of the path pattern to make it wildcard
-pattern.  ``*`` must match at least one character:
-
-.. code-block:: text
-
-   backend=::1,8080;/sample*
-
-The request path ``/sample1/foo`` matches the ``/sample*`` pattern.
-
-Of course, you can specify both host and request path at the same
-time:
-
-.. code-block:: text
-
-   backend=192.168.0.10,8080;example.com/foo
-
-We can use ``*`` in the left most position of host to achieve wildcard
-suffix match.  If ``*`` is the left most character, then the remaining
-string should match the request host suffix.  ``*`` must match at
-least one character.  For example, ``*.example.com`` matches
-``www.example.com`` and ``dev.example.com``, and does not match
-``example.com`` and ``nghttp2.org``.  The exact match (without ``*``)
-always takes precedence over wildcard match.
-
-One important thing you have to remember is that we have to specify
-default routing pattern for so called "catch all" pattern.  To write
-"catch all" pattern, just specify backend server address, without
-pattern.
-
-Usually, host is the value of ``Host`` header field.  In HTTP/2, the
-value of ``:authority`` pseudo header field is used.
-
-When you write multiple backend addresses sharing the same routing
-pattern, they are used as load balancing.  For example, to use 2
-servers ``serv1:3000`` and ``serv2:3000`` for request host
-``example.com`` and path ``/myservice``, you can write like so:
-
-.. code-block:: text
-
-   backend=serv1,3000;example.com/myservice
-   backend=serv2,3000;example.com/myservice
-
-You can also specify backend application protocol in
-:option:`--backend` option using ``proto`` keyword after pattern.
-Utilizing this allows ngttpx to route certain request to HTTP/2, other
-requests to HTTP/1.  For example, to route requests to ``/ws/`` in
-backend HTTP/1.1 connection, and use backend HTTP/2 for other
-requests, do this:
-
-.. code-block:: text
-
-   backend=serv1,3000;/;proto=h2
-   backend=serv1,3000;/ws/;proto=http/1.1
-
-The default backend protocol is HTTP/1.1.
-
-TLS can be enabled per pattern basis:
-
-.. code-block:: text
-
-   backend=serv1,8443;/;proto=h2;tls
-   backend=serv2,8080;/ws/;proto=http/1.1
-
-In the above case, connection to serv1 will be encrypted by TLS.  On
-the other hand, connection to serv2 will not be encrypted by TLS.
-
-Dynamic hostname lookup
------------------------
-
-By default, nghttpx performs backend hostname lookup at start up, or
-configuration reload, and keeps using them in its entire session.  To
-make nghttpx perform hostname lookup dynamically, use ``dns``
-parameter in :option:`--backend` option, like so:
-
-.. code-block:: text
-
-   backend=foo.example.com,80;;dns
-
-nghttpx will cache resolved addresses for certain period of time.  To
-change this cache period, use :option:`--dns-cache-timeout`.
-
-Enable PROXY protocol
----------------------
-
-PROXY protocol can be enabled per frontend.  In order to enable PROXY
-protocol, use ``proxyproto`` parameter in :option:`--frontend` option,
-like so:
-
-.. code-block:: text
-
-   frontend=*,443;proxyproto
-
-Session affinity
-----------------
-
-Two kinds of session affinity are available: client IP, and HTTP
-Cookie.
-
-To enable client IP based affinity, specify ``affinity=ip`` parameter
-in :option:`--backend` option.  If PROXY protocol is enabled, then an
-address obtained from PROXY protocol is taken into consideration.
-
-To enable HTTP Cookie based affinity, specify ``affinity=cookie``
-parameter, and specify a name of cookie in ``affinity-cookie-name``
-parameter.  Optionally, a Path attribute can be specified in
-``affinity-cookie-path`` parameter:
-
-.. code-block:: text
-
-   backend=127.0.0.1,3000;;affinity=cookie;affinity-cookie-name=nghttpxlb;affinity-cookie-path=/
-
-Secure attribute of cookie is set if client connection is protected by
-TLS.
-
-PSK cipher suites
------------------
-
-nghttpx supports pre-shared key (PSK) cipher suites for both frontend
-and backend TLS connections.  For frontend connection, use
-:option:`--psk-secrets` option to specify a file which contains PSK
-identity and secrets.  The format of the file is
-``<identity>:<hex-secret>``, where ``<identity>`` is PSK identity, and
-``<hex-secret>`` is PSK secret in hex, like so:
-
-.. code-block:: text
-
-   client1:9567800e065e078085c241d54a01c6c3f24b3bab71a606600f4c6ad2c134f3b9
-   client2:b1376c3f8f6dcf7c886c5bdcceecd1e6f1d708622b6ddd21bda26ebd0c0bca99
-
-nghttpx server accepts any of the identity and secret pairs in the
-file.  The default cipher suite list does not contain PSK cipher
-suites.  In order to use PSK, PSK cipher suite must be enabled by
-using :option:`--ciphers` option.  The desired PSK cipher suite may be
-listed in `HTTP/2 cipher black list
-<https://tools.ietf.org/html/rfc7540#appendix-A>`_.  In order to use
-such PSK cipher suite with HTTP/2, disable HTTP/2 cipher black list by
-using :option:`--no-http2-cipher-black-list` option.  But you should
-understand its implications.
-
-At the time of writing, even if only PSK cipher suites are specified
-in :option:`--ciphers` option, certificate and private key are still
-required.
-
-For backend connection, use :option:`--client-psk-secrets` option to
-specify a file which contains single PSK identity and secret.  The
-format is the same as the file used by :option:`--psk-secrets`
-described above, but only first identity and secret pair is solely
-used, like so:
-
-.. code-block:: text
-
-   client2:b1376c3f8f6dcf7c886c5bdcceecd1e6f1d708622b6ddd21bda26ebd0c0bca99
-
-The default cipher suite list does not contain PSK cipher suites.  In
-order to use PSK, PSK cipher suite must be enabled by using
-:option:`--client-ciphers` option.  The desired PSK cipher suite may
-be listed in `HTTP/2 cipher black list
-<https://tools.ietf.org/html/rfc7540#appendix-A>`_.  In order to use
-such PSK cipher suite with HTTP/2, disable HTTP/2 cipher black list by
-using :option:`--client-no-http2-cipher-black-list` option.  But you
-should understand its implications.
-
-Migration from nghttpx v1.18.x or earlier
------------------------------------------
-
-As of nghttpx v1.19.0, :option:`--ciphers` option only changes cipher
-list for frontend TLS connection.  In order to change cipher list for
-backend connection, use :option:`--client-ciphers` option.
-
-Similarly, :option:`--no-http2-cipher-black-list` option only disables
-HTTP/2 cipher black list for frontend connection.  In order to disable
-HTTP/2 cipher black list for backend connection, use
-:option:`--client-no-http2-cipher-black-list` option.
-
-``--accept-proxy-protocol`` option was deprecated.  Instead, use
-``proxyproto`` parameter in :option:`--frontend` option to enable
-PROXY protocol support per frontend.
-
-Migration from nghttpx v1.8.0 or earlier
-----------------------------------------
-
-As of nghttpx 1.9.0, ``--frontend-no-tls`` and ``--backend-no-tls``
-have been removed.
-
-To disable encryption on frontend connection, use ``no-tls`` keyword
-in :option:`--frontend` potion:
-
-.. code-block:: text
-
-   frontend=*,3000;no-tls
-
-The TLS encryption is now disabled on backend connection in all modes
-by default.  To enable encryption on backend connection, use ``tls``
-keyword in :option:`--backend` option:
-
-.. code-block:: text
-
-   backend=127.0.0.1,8080;tls
-
-As of nghttpx 1.9.0, ``--http2-bridge``, ``--client`` and
-``--client-proxy`` options have been removed.  These functionality can
-be used using combinations of options.
-
-Use following option instead of ``--http2-bridge``:
-
-.. code-block:: text
-
-   backend=<ADDR>,<PORT>;;proto=h2;tls
-
-Use following options instead of ``--client``:
-
-.. code-block:: text
-
-   frontend=<ADDR>,<PORT>;no-tls
-   backend=<ADDR>,<PORT>;;proto=h2;tls
-
-Use following options instead of ``--client-proxy``:
-
-.. code-block:: text
-
-   http2-proxy=yes
-   frontend=<ADDR>,<PORT>;no-tls
-   backend=<ADDR>,<PORT>;;proto=h2;tls
-
-We also removed ``--backend-http2-connections-per-worker`` option.  It
-was present because previously the number of backend h2 connection was
-statically configured, and defaulted to 1.  Now the number of backend
-h2 connection is increased on demand.  We know the maximum number of
-concurrent streams per connection.  When we push as many request as
-the maximum concurrency to the one connection, we create another new
-connection so that we can distribute load and avoid delay the request
-processing.  This is done automatically without any configuration.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/python-apiref.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/python-apiref.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/python-apiref.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/python-apiref.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,439 +0,0 @@
-Python API Reference
-====================
-
-.. py:module:: nghttp2
-
-nghttp2 offers some high level Python API to C library.  The bindings
-currently provide HPACK compressor and decompressor classes and HTTP/2
-server class.
-
-The extension module is called ``nghttp2``.
-
-``make`` will build the bindings.  The target Python version is
-determined by configure script.  If the detected Python version is not
-what you expect, specify a path to Python executable in ``PYTHON``
-variable as an argument to configure script (e.g., ``./configure
-PYTHON=/usr/bin/python3.5``).
-
-HPACK API
----------
-
-.. py:class:: HDDeflater(hd_table_bufsize_max=DEFLATE_MAX_HEADER_TABLE_SIZE)
-
-   This class is used to perform header compression.  The
-   *hd_table_bufsize_max* limits the usage of header table in the
-   given amount of bytes.  The default value is
-   :py:data:`DEFLATE_MAX_HEADER_TABLE_SIZE`.  This is necessary
-   because the deflater and inflater share the same amount of header
-   table and the inflater decides that number.  The deflater may not
-   want to use all header table size because of limited memory
-   availability.  In that case, *hd_table_bufsize_max* can be used to
-   cap the upper limit of table size whatever the header table size is
-   chosen by the inflater.
-
-   .. py:method:: deflate(headers)
-
-      Deflates the *headers*. The *headers* must be sequence of tuple
-      of name/value pair, which are byte strings (not unicode string).
-
-      This method returns the deflated header block in byte string.
-      Raises the exception if any error occurs.
-
-   .. py:method:: set_no_refset(no_refset)
-
-      Tells the deflater not to use reference set if *no_refset* is
-      evaluated to ``True``.  If that happens, on each subsequent
-      invocation of :py:meth:`deflate()`, deflater will clear up
-      refersent set.
-
-   .. py:method:: change_table_size(hd_table_bufsize_max)
-
-      Changes header table size to *hd_table_bufsize_max* byte.  if
-      *hd_table_bufsize_max* is strictly larger than
-      ``hd_table_bufsize_max`` given in constructor,
-      ``hd_table_bufsize_max`` is used as header table size instead.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: get_hd_table()
-
-      Returns copy of current dynamic header table.
-
-The following example shows how to deflate header name/value pairs:
-
-.. code-block:: python
-
-   import binascii, nghttp2
-
-   deflater = nghttp2.HDDeflater()
-
-   res = deflater.deflate([(b'foo', b'bar'),
-                           (b'baz', b'buz')])
-
-   print(binascii.b2a_hex(res))
-
-
-.. py:class:: HDInflater()
-
-   This class is used to perform header decompression.
-
-   .. py:method:: inflate(data)
-
-      Inflates the deflated header block *data*. The *data* must be
-      byte string.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: change_table_size(hd_table_bufsize_max)
-
-      Changes header table size to *hd_table_bufsize_max* byte.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: get_hd_table()
-
-      Returns copy of current dynamic header table.
-
-The following example shows how to inflate deflated header block:
-
-.. code-block:: python
-
-   deflater = nghttp2.HDDeflater()
-
-   data = deflater.deflate([(b'foo', b'bar'),
-                            (b'baz', b'buz')])
-
-   inflater = nghttp2.HDInflater()
-
-   hdrs = inflater.inflate(data)
-
-   print(hdrs)
-
-
-.. py:function:: print_hd_table(hdtable)
-
-   Convenient function to print *hdtable* to the standard output.  The
-   *hdtable* is the one retrieved by
-   :py:meth:`HDDeflater.get_hd_table()` or
-   :py:meth:`HDInflater.get_hd_table()`.  This function does not work
-   if header name/value cannot be decoded using UTF-8 encoding.
-
-   In output, ``s=N`` means the entry occupies ``N`` bytes in header
-   table.  If ``r=y``, then the entry is in the reference set.
-
-.. py:data:: DEFAULT_HEADER_TABLE_SIZE
-
-   The default header table size, which is 4096 as per HTTP/2
-   specification.
-
-.. py:data:: DEFLATE_MAX_HEADER_TABLE_SIZE
-
-   The default header table size for deflater.  The initial value
-   is 4096.
-
-HTTP/2 servers
---------------
-
-.. note::
-
-   We use :py:mod:`asyncio` for HTTP/2 server classes, and ALPN.
-   Therefore, Python 3.5 or later is required to use these objects.
-   To explicitly configure nghttp2 build to use Python 3.5, specify
-   the ``PYTHON`` variable to the path to Python 3.5 executable when
-   invoking configure script like this:
-
-   .. code-block:: text
-
-       $ ./configure PYTHON=/usr/bin/python3.5
-
-.. py:class:: HTTP2Server(address, RequestHandlerClass, ssl=None)
-
-   This class builds on top of the :py:mod:`asyncio` event loop.  On
-   construction, *RequestHandlerClass* must be given, which must be a
-   subclass of :py:class:`BaseRequestHandler` class.
-
-   The *address* must be a tuple of hostname/IP address and port to
-   bind.  If hostname/IP address is ``None``, all interfaces are
-   assumed.
-
-   To enable SSL/TLS, specify instance of :py:class:`ssl.SSLContext`
-   in *ssl*.  Before passing *ssl* to
-   :py:func:`BaseEventLoop.create_server`, ALPN protocol identifiers
-   are set using :py:meth:`ssl.SSLContext.set_npn_protocols`.
-
-   To disable SSL/TLS, omit *ssl* or specify ``None``.
-
-   .. py:method:: serve_forever()
-
-      Runs server and processes incoming requests forever.
-
-.. py:class:: BaseRequestHandler(http2, stream_id)
-
-   The class is used to handle the single HTTP/2 stream.  By default,
-   it does not nothing.  It must be subclassed to handle each event
-   callback method.
-
-   The first callback method invoked is :py:meth:`on_headers()`. It is
-   called when HEADERS frame, which includes request header fields, is
-   arrived.
-
-   If request has request body, :py:meth:`on_data()` is invoked for
-   each chunk of received data chunk.
-
-   When whole request is received, :py:meth:`on_request_done()` is
-   invoked.
-
-   When stream is closed, :py:meth:`on_close()` is called.
-
-   The application can send response using :py:meth:`send_response()`
-   method.  It can be used in :py:meth:`on_headers()`,
-   :py:meth:`on_data()` or :py:meth:`on_request_done()`.
-
-   The application can push resource using :py:meth:`push()` method.
-   It must be used before :py:meth:`send_response()` call.
-
-   A :py:class:`BaseRequestHandler` has the following instance
-   variables:
-
-   .. py:attribute:: client_address
-
-      Contains a tuple of the form ``(host, port)`` referring to the
-      client's address.
-
-   .. py:attribute:: stream_id
-
-      Stream ID of this stream
-
-   .. py:attribute:: scheme
-
-      Scheme of the request URI.  This is a value of ``:scheme``
-      header field.
-
-   .. py:attribute:: method
-
-      Method of this stream.  This is a value of ``:method`` header
-      field.
-
-   .. py:attribute:: host
-
-      This is a value of ``:authority`` or ``host`` header field.
-
-   .. py:attribute:: path
-
-      This is a value of ``:path`` header field.
-
-   .. py:attribute:: headers
-
-      Request header fields.
-
-   A :py:class:`BaseRequestHandler` has the following methods:
-
-   .. py:method:: on_headers()
-
-      Called when request HEADERS is arrived.  By default, this method
-      does nothing.
-
-   .. py:method:: on_data(data)
-
-      Called when a chunk of request body *data* is arrived.  This
-      method will be called multiple times until all data are
-      received.  By default, this method does nothing.
-
-   .. py:method:: on_request_done()
-
-      Called when whole request was received.  By default, this method
-      does nothing.
-
-   .. py:method:: on_close(error_code)
-
-      Called when stream is about to close.  The *error_code*
-      indicates the reason of closure.  If it is ``0``, the stream is
-      going to close without error.
-
-   .. py:method:: send_response(status=200, headers=None, body=None)
-
-      Send response.  The *status* is HTTP status code.  The *headers*
-      is additional response headers.  The *:status* header field will
-      be appended by the library.  The *body* is the response body.
-      It could be ``None`` if response body is empty.  Or it must be
-      instance of either ``str``, ``bytes``, :py:class:`io.IOBase` or
-      callable, called body generator, which takes one parameter,
-      size.  The body generator generates response body.  It can pause
-      generation of response so that it can wait for slow backend data
-      generation.  When invoked, it should return tuple, byte string
-      at most size length and flag.  The flag is either
-      :py:data:`DATA_OK`, :py:data:`DATA_EOF` or
-      :py:data:`DATA_DEFERRED`.  For non-empty byte string and it is
-      not the last chunk of response, :py:data:`DATA_OK` must be
-      returned as flag.  If this is the last chunk of the response
-      (byte string could be ``None``), :py:data:`DATA_EOF` must be
-      returned as flag.  If there is no data available right now, but
-      additional data are anticipated, return tuple (``None``,
-      :py:data:`DATA_DEFERRED`).  When data arrived, call
-      :py:meth:`resume()` and restart response body transmission.
-
-      Only the body generator can pause response body generation;
-      instance of :py:class:`io.IOBase` must not block.
-
-      If instance of ``str`` is specified as *body*, it will be
-      encoded using UTF-8.
-
-      The *headers* is a list of tuple of the form ``(name,
-      value)``. The ``name`` and ``value`` can be either byte string
-      or unicode string.  In the latter case, they will be encoded
-      using UTF-8.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: push(path, method='GET', request_headers=None, status=200, headers=None, body=None)
-
-      Push a specified resource.  The *path* is a path portion of
-      request URI for this resource.  The *method* is a method to
-      access this resource.  The *request_headers* is additional
-      request headers to access this resource.  The ``:scheme``,
-      ``:method``, ``:authority`` and ``:path`` are appended by the
-      library.  The ``:scheme`` and ``:authority`` are inherited from
-      request header fields of the associated stream.
-
-      The *status* is HTTP status code.  The *headers* is additional
-      response headers.  The ``:status`` header field is appended by
-      the library.  The *body* is the response body.  It has the same
-      semantics of *body* parameter of :py:meth:`send_response()`.
-
-      The headers and request_headers are a list of tuple of the form
-      ``(name, value)``. The ``name`` and ``value`` can be either byte
-      string or unicode string.  In the latter case, they will be
-      encoded using UTF-8.
-
-      Returns an instance of ``RequestHandlerClass`` specified in
-      :py:class:`HTTP2Server` constructor for the pushed resource.
-
-      Raises the exception if any error occurs.
-
-   .. py:method:: resume()
-
-      Signals the restarting of response body transmission paused by
-      ``DATA_DEFERRED`` from the body generator (see
-      :py:meth:`send_response()` about the body generator).  It is not
-      an error calling this method while response body transmission is
-      not paused.
-
-.. py:data:: DATA_OK
-
-   ``DATA_OK`` indicates non empty data is generated from body generator.
-
-.. py:data:: DATA_EOF
-
-   ``DATA_EOF`` indicates the end of response body.
-
-.. py:data:: DATA_DEFERRED
-
-   ``DATA_DEFERRED`` indicates that data are not available right now
-   and response should be paused.
-
-The following example illustrates :py:class:`HTTP2Server` and
-:py:class:`BaseRequestHandler` usage:
-
-.. code-block:: python
-
-    #!/usr/bin/env python
-
-    import io, ssl
-
-    import nghttp2
-
-    class Handler(nghttp2.BaseRequestHandler):
-
-        def on_headers(self):
-            self.push(path='/css/style.css',
-                      request_headers = [('content-type', 'text/css')],
-                      status=200,
-                      body='body{margin:0;}')
-
-            self.send_response(status=200,
-                               headers = [('content-type', 'text/plain')],
-                               body=io.BytesIO(b'nghttp2-python FTW'))
-
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
-    ctx.load_cert_chain('server.crt', 'server.key')
-
-    # give None to ssl to make the server non-SSL/TLS
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
-    server.serve_forever()
-
-The following example illustrates HTTP/2 server using asynchronous
-response body generation.  This is simplified reverse proxy:
-
-.. code-block:: python
-
-    #!/usr/bin/env python
-
-    import ssl
-    import os
-    import urllib
-    import asyncio
-    import io
-
-    import nghttp2
-
-    @asyncio.coroutine
-    def get_http_header(handler, url):
-        url = urllib.parse.urlsplit(url)
-        ssl = url.scheme == 'https'
-        if url.port == None:
-            if url.scheme == 'https':
-                port = 443
-            else:
-                port = 80
-        else:
-            port = url.port
-
-        connect = asyncio.open_connection(url.hostname, port, ssl=ssl)
-        reader, writer = yield from connect
-        req = 'GET {path} HTTP/1.0\r\n\r\n'.format(path=url.path or '/')
-        writer.write(req.encode('utf-8'))
-        # skip response header fields
-        while True:
-            line = yield from reader.readline()
-            line = line.rstrip()
-            if not line:
-                break
-        # read body
-        while True:
-            b = yield from reader.read(4096)
-            if not b:
-                break
-            handler.buf.write(b)
-        writer.close()
-        handler.buf.seek(0)
-        handler.eof = True
-        handler.resume()
-
-    class Body:
-        def __init__(self, handler):
-            self.handler = handler
-            self.handler.eof = False
-            self.handler.buf = io.BytesIO()
-
-        def generate(self, n):
-            buf = self.handler.buf
-            data = buf.read1(n)
-            if not data and not self.handler.eof:
-                return None, nghttp2.DATA_DEFERRED
-            return data, nghttp2.DATA_EOF if self.handler.eof else nghttp2.DATA_OK
-
-    class Handler(nghttp2.BaseRequestHandler):
-
-        def on_headers(self):
-            body = Body(self)
-            asyncio.async(get_http_header(
-                self, 'http://localhost' + self.path.decode('utf-8')))
-            self.send_response(status=200, body=body.generate)
-
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
-    ctx.load_cert_chain('server.crt', 'server.key')
-
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
-    server.serve_forever()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-client.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-client.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-client.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-client.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,498 +0,0 @@
-Tutorial: HTTP/2 client
-=========================
-
-In this tutorial, we are going to write a very primitive HTTP/2
-client. The complete source code, `libevent-client.c`_, is attached at
-the end of this page.  It also resides in the examples directory in
-the archive or repository.
-
-This simple client takes a single HTTPS URI and retrieves the resource
-at the URI. The synopsis is:
-
-.. code-block:: text
-
-    $ libevent-client HTTPS_URI
-
-We use libevent in this tutorial to handle networking I/O.  Please
-note that nghttp2 itself does not depend on libevent.
-
-The client starts with some libevent and OpenSSL setup in the
-``main()`` and ``run()`` functions. This setup isn't specific to
-nghttp2, but one thing you should look at is setup of the NPN
-callback.  The NPN callback is used by the client to select the next
-application protocol over TLS. In this tutorial, we use the
-`nghttp2_select_next_protocol()` helper function to select the HTTP/2
-protocol the library supports::
-
-    static int select_next_proto_cb(SSL *ssl _U_, unsigned char **out,
-                                    unsigned char *outlen, const unsigned char *in,
-                                    unsigned int inlen, void *arg _U_) {
-      if (nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
-        errx(1, "Server did not advertise " NGHTTP2_PROTO_VERSION_ID);
-      }
-      return SSL_TLSEXT_ERR_OK;
-    }
-
-If you are following TLS related RFC, you know that NPN is not the
-standardized way to negotiate HTTP/2.  NPN itself is not event
-published as RFC.  The standard way to negotiate HTTP/2 is ALPN,
-Application-Layer Protocol Negotiation Extension, defined in `RFC 7301
-<https://tools.ietf.org/html/rfc7301>`_.  The one caveat of ALPN is
-that OpenSSL >= 1.0.2 is required.  We use macro to enable/disable
-ALPN support depending on OpenSSL version.  OpenSSL's ALPN
-implementation does not require callback function like the above.  But
-we have to instruct OpenSSL SSL_CTX to use ALPN, which we'll talk
-about soon.
-
-The callback is added to the SSL_CTX object using
-``SSL_CTX_set_next_proto_select_cb()``::
-
-    static SSL_CTX *create_ssl_ctx(void) {
-      SSL_CTX *ssl_ctx;
-      ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-      if (!ssl_ctx) {
-        errx(1, "Could not create SSL/TLS context: %s",
-             ERR_error_string(ERR_get_error(), NULL));
-      }
-      SSL_CTX_set_options(ssl_ctx,
-                          SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                              SSL_OP_NO_COMPRESSION |
-                              SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-      SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, NULL);
-
-    #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-      SSL_CTX_set_alpn_protos(ssl_ctx, (const unsigned char *)"\x02h2", 3);
-    #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-      return ssl_ctx;
-    }
-
-Here we see ``SSL_CTX_get_alpn_protos()`` function call.  We instructs
-OpenSSL to notify the server that we support h2, ALPN identifier for
-HTTP/2.
-
-The example client defines a couple of structs:
-
-We define and use a ``http2_session_data`` structure to store data
-related to the HTTP/2 session::
-
-    typedef struct {
-      nghttp2_session *session;
-      struct evdns_base *dnsbase;
-      struct bufferevent *bev;
-      http2_stream_data *stream_data;
-    } http2_session_data;
-
-Since this program only handles one URI, it uses only one stream. We
-store the single stream's data in a ``http2_stream_data`` structure
-and the ``stream_data`` points to it. The ``http2_stream_data``
-structure is defined as follows::
-
-    typedef struct {
-      /* The NULL-terminated URI string to retrieve. */
-      const char *uri;
-      /* Parsed result of the |uri| */
-      struct http_parser_url *u;
-      /* The authority portion of the |uri|, not NULL-terminated */
-      char *authority;
-      /* The path portion of the |uri|, including query, not
-         NULL-terminated */
-      char *path;
-      /* The length of the |authority| */
-      size_t authoritylen;
-      /* The length of the |path| */
-      size_t pathlen;
-      /* The stream ID of this stream */
-      int32_t stream_id;
-    } http2_stream_data;
-
-We create and initialize these structures in
-``create_http2_session_data()`` and ``create_http2_stream_data()``
-respectively.
-
-``initiate_connection()`` is called to start the connection to the
-remote server. It's defined as::
-
-    static void initiate_connection(struct event_base *evbase, SSL_CTX *ssl_ctx,
-                                    const char *host, uint16_t port,
-                                    http2_session_data *session_data) {
-      int rv;
-      struct bufferevent *bev;
-      SSL *ssl;
-
-      ssl = create_ssl(ssl_ctx);
-      bev = bufferevent_openssl_socket_new(
-          evbase, -1, ssl, BUFFEREVENT_SSL_CONNECTING,
-          BEV_OPT_DEFER_CALLBACKS | BEV_OPT_CLOSE_ON_FREE);
-      bufferevent_enable(bev, EV_READ | EV_WRITE);
-      bufferevent_setcb(bev, readcb, writecb, eventcb, session_data);
-      rv = bufferevent_socket_connect_hostname(bev, session_data->dnsbase,
-                                               AF_UNSPEC, host, port);
-
-      if (rv != 0) {
-        errx(1, "Could not connect to the remote host %s", host);
-      }
-      session_data->bev = bev;
-    }
-
-``initiate_connection()`` creates a bufferevent for the connection and
-sets up three callbacks: ``readcb``, ``writecb``, and ``eventcb``.
-
-The ``eventcb()`` is invoked by the libevent event loop when an event
-(e.g. connection has been established, timeout, etc.) occurs on the
-underlying network socket::
-
-    static void eventcb(struct bufferevent *bev, short events, void *ptr) {
-      http2_session_data *session_data = (http2_session_data *)ptr;
-      if (events & BEV_EVENT_CONNECTED) {
-        int fd = bufferevent_getfd(bev);
-        int val = 1;
-        const unsigned char *alpn = NULL;
-        unsigned int alpnlen = 0;
-        SSL *ssl;
-
-        fprintf(stderr, "Connected\n");
-
-        ssl = bufferevent_openssl_get_ssl(session_data->bev);
-
-        SSL_get0_next_proto_negotiated(ssl, &alpn, &alpnlen);
-    #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-        if (alpn == NULL) {
-          SSL_get0_alpn_selected(ssl, &alpn, &alpnlen);
-        }
-    #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-        if (alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) {
-          fprintf(stderr, "h2 is not negotiated\n");
-          delete_http2_session_data(session_data);
-          return;
-        }
-
-        setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
-        initialize_nghttp2_session(session_data);
-        send_client_connection_header(session_data);
-        submit_request(session_data);
-        if (session_send(session_data) != 0) {
-          delete_http2_session_data(session_data);
-        }
-        return;
-      }
-      if (events & BEV_EVENT_EOF) {
-        warnx("Disconnected from the remote host");
-      } else if (events & BEV_EVENT_ERROR) {
-        warnx("Network error");
-      } else if (events & BEV_EVENT_TIMEOUT) {
-        warnx("Timeout");
-      }
-      delete_http2_session_data(session_data);
-    }
-
-Here we validate that HTTP/2 is negotiated, and if not, drop
-connection.
-
-For ``BEV_EVENT_EOF``, ``BEV_EVENT_ERROR``, and ``BEV_EVENT_TIMEOUT``
-events, we just simply tear down the connection.
-
-The ``BEV_EVENT_CONNECTED`` event is invoked when the SSL/TLS
-handshake has completed successfully. After this we're ready to begin
-communicating via HTTP/2.
-
-The ``initialize_nghttp2_session()`` function initializes the nghttp2
-session object and several callbacks::
-
-    static void initialize_nghttp2_session(http2_session_data *session_data) {
-      nghttp2_session_callbacks *callbacks;
-
-      nghttp2_session_callbacks_new(&callbacks);
-
-      nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
-
-      nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                           on_frame_recv_callback);
-
-      nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-          callbacks, on_data_chunk_recv_callback);
-
-      nghttp2_session_callbacks_set_on_stream_close_callback(
-          callbacks, on_stream_close_callback);
-
-      nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                       on_header_callback);
-
-      nghttp2_session_callbacks_set_on_begin_headers_callback(
-          callbacks, on_begin_headers_callback);
-
-      nghttp2_session_client_new(&session_data->session, callbacks, session_data);
-
-      nghttp2_session_callbacks_del(callbacks);
-    }
-
-Since we are creating a client, we use `nghttp2_session_client_new()`
-to initialize the nghttp2 session object.  The callbacks setup are
-explained later.
-
-The `delete_http2_session_data()` function destroys ``session_data``
-and frees its bufferevent, so the underlying connection is closed. It
-also calls `nghttp2_session_del()` to delete the nghttp2 session
-object.
-
-A HTTP/2 connection begins by sending the client connection preface,
-which is a 24 byte magic byte string (:macro:`NGHTTP2_CLIENT_MAGIC`),
-followed by a SETTINGS frame. The 24 byte magic string is sent
-automatically by nghttp2. We send the SETTINGS frame in
-``send_client_connection_header()``::
-
-    static void send_client_connection_header(http2_session_data *session_data) {
-      nghttp2_settings_entry iv[1] = {
-          {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
-      int rv;
-
-      /* client 24 bytes magic string will be sent by nghttp2 library */
-      rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
-                                   ARRLEN(iv));
-      if (rv != 0) {
-        errx(1, "Could not submit SETTINGS: %s", nghttp2_strerror(rv));
-      }
-    }
-
-Here we specify SETTINGS_MAX_CONCURRENT_STREAMS as 100. This is not
-needed for this tiny example program, it just demonstrates use of the
-SETTINGS frame. To queue the SETTINGS frame for transmission, we call
-`nghttp2_submit_settings()`. Note that `nghttp2_submit_settings()`
-only queues the frame for transmission, and doesn't actually send it.
-All ``nghttp2_submit_*()`` family functions have this property. To
-actually send the frame, `nghttp2_session_send()` has to be called,
-which is described (and called) later.
-
-After the transmission of the client connection header, we enqueue the
-HTTP request in the ``submit_request()`` function::
-
-    static void submit_request(http2_session_data *session_data) {
-      int32_t stream_id;
-      http2_stream_data *stream_data = session_data->stream_data;
-      const char *uri = stream_data->uri;
-      const struct http_parser_url *u = stream_data->u;
-      nghttp2_nv hdrs[] = {
-          MAKE_NV2(":method", "GET"),
-          MAKE_NV(":scheme", &uri[u->field_data[UF_SCHEMA].off],
-                  u->field_data[UF_SCHEMA].len),
-          MAKE_NV(":authority", stream_data->authority, stream_data->authoritylen),
-          MAKE_NV(":path", stream_data->path, stream_data->pathlen)};
-      fprintf(stderr, "Request headers:\n");
-      print_headers(stderr, hdrs, ARRLEN(hdrs));
-      stream_id = nghttp2_submit_request(session_data->session, NULL, hdrs,
-                                         ARRLEN(hdrs), NULL, stream_data);
-      if (stream_id < 0) {
-        errx(1, "Could not submit HTTP request: %s", nghttp2_strerror(stream_id));
-      }
-
-      stream_data->stream_id = stream_id;
-    }
-
-We build the HTTP request header fields in ``hdrs``, which is an array
-of :type:`nghttp2_nv`. There are four header fields to be sent:
-``:method``, ``:scheme``, ``:authority``, and ``:path``. To queue the
-HTTP request, we call `nghttp2_submit_request()`. The ``stream_data``
-is passed via the *stream_user_data* parameter, which is helpfully
-later passed back to callback functions.
-
-`nghttp2_submit_request()` returns the newly assigned stream ID for
-the request.
-
-The next bufferevent callback is ``readcb()``, which is invoked when
-data is available to read from the bufferevent input buffer::
-
-    static void readcb(struct bufferevent *bev, void *ptr) {
-      http2_session_data *session_data = (http2_session_data *)ptr;
-      ssize_t readlen;
-      struct evbuffer *input = bufferevent_get_input(bev);
-      size_t datalen = evbuffer_get_length(input);
-      unsigned char *data = evbuffer_pullup(input, -1);
-
-      readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
-      if (readlen < 0) {
-        warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
-        delete_http2_session_data(session_data);
-        return;
-      }
-      if (evbuffer_drain(input, (size_t)readlen) != 0) {
-        warnx("Fatal error: evbuffer_drain failed");
-        delete_http2_session_data(session_data);
-        return;
-      }
-      if (session_send(session_data) != 0) {
-        delete_http2_session_data(session_data);
-        return;
-      }
-    }
-
-In this function we feed all unprocessed, received data to the nghttp2
-session object using the `nghttp2_session_mem_recv()` function.
-`nghttp2_session_mem_recv()` processes the received data and may
-invoke nghttp2 callbacks and queue frames for transmission.  Since
-there may be pending frames for transmission, we call immediately
-``session_send()`` to send them.  ``session_send()`` is defined as
-follows::
-
-    static int session_send(http2_session_data *session_data) {
-      int rv;
-
-      rv = nghttp2_session_send(session_data->session);
-      if (rv != 0) {
-        warnx("Fatal error: %s", nghttp2_strerror(rv));
-        return -1;
-      }
-      return 0;
-    }
-
-The `nghttp2_session_send()` function serializes pending frames into
-wire format and calls the ``send_callback()`` function to send them.
-``send_callback()`` has type :type:`nghttp2_send_callback` and is
-defined as::
-
-    static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
-                                 size_t length, int flags _U_, void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      struct bufferevent *bev = session_data->bev;
-      bufferevent_write(bev, data, length);
-      return (ssize_t)length;
-    }
-
-Since we use bufferevent to abstract network I/O, we just write the
-data to the bufferevent object. Note that `nghttp2_session_send()`
-continues to write all frames queued so far. If we were writing the
-data to the non-blocking socket directly using the ``write()`` system
-call, we'd soon receive an ``EAGAIN`` or ``EWOULDBLOCK`` error, since
-sockets have a limited send buffer. If that happens, it's possible to
-return :macro:`NGHTTP2_ERR_WOULDBLOCK` to signal the nghttp2 library
-to stop sending further data. When writing to a bufferevent, you
-should regulate the amount of data written, to avoid possible huge
-memory consumption. In this example client however we don't implement
-a limit. To see how to regulate the amount of buffered data, see the
-``send_callback()`` in the server tutorial.
-
-The third bufferevent callback is ``writecb()``, which is invoked when
-all data written in the bufferevent output buffer has been sent::
-
-    static void writecb(struct bufferevent *bev _U_, void *ptr) {
-      http2_session_data *session_data = (http2_session_data *)ptr;
-      if (nghttp2_session_want_read(session_data->session) == 0 &&
-          nghttp2_session_want_write(session_data->session) == 0 &&
-          evbuffer_get_length(bufferevent_get_output(session_data->bev)) == 0) {
-        delete_http2_session_data(session_data);
-      }
-    }
-
-As described earlier, we just write off all data in `send_callback()`,
-so there is no data to write in this function. All we have to do is
-check if the connection should be dropped or not. The nghttp2 session
-object keeps track of reception and transmission of GOAWAY frames and
-other error conditions. Using this information, the nghttp2 session
-object can state whether the connection should be dropped or not.
-More specifically, when both `nghttp2_session_want_read()` and
-`nghttp2_session_want_write()` return 0, the connection is no-longer
-required and can be closed. Since we're using bufferevent and its
-deferred callback option, the bufferevent output buffer may still
-contain pending data when the ``writecb()`` is called. To handle this
-situation, we also check whether the output buffer is empty or not. If
-all of these conditions are met, then we drop the connection.
-
-Now let's look at the remaining nghttp2 callbacks setup in the
-``initialize_nghttp2_setup()`` function.
-
-A server responds to the request by first sending a HEADERS frame.
-The HEADERS frame consists of response header name/value pairs, and
-the ``on_header_callback()`` is called for each name/value pair::
-
-    static int on_header_callback(nghttp2_session *session _U_,
-                                  const nghttp2_frame *frame, const uint8_t *name,
-                                  size_t namelen, const uint8_t *value,
-                                  size_t valuelen, uint8_t flags _U_,
-                                  void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      switch (frame->hd.type) {
-      case NGHTTP2_HEADERS:
-        if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-            session_data->stream_data->stream_id == frame->hd.stream_id) {
-          /* Print response headers for the initiated request. */
-          print_header(stderr, name, namelen, value, valuelen);
-          break;
-        }
-      }
-      return 0;
-    }
-
-In this tutorial, we just print the name/value pairs on stdout.
-
-After the HEADERS frame has been fully received (and thus all response
-header name/value pairs have been received), the
-``on_frame_recv_callback()`` function is called::
-
-    static int on_frame_recv_callback(nghttp2_session *session _U_,
-                                      const nghttp2_frame *frame, void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      switch (frame->hd.type) {
-      case NGHTTP2_HEADERS:
-        if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-            session_data->stream_data->stream_id == frame->hd.stream_id) {
-          fprintf(stderr, "All headers received\n");
-        }
-        break;
-      }
-      return 0;
-    }
-
-``on_frame_recv_callback()`` is called for other frame types too.
-
-In this tutorial, we are just interested in the HTTP response HEADERS
-frame. We check the frame type and its category (it should be
-:macro:`NGHTTP2_HCAT_RESPONSE` for HTTP response HEADERS). We also
-check its stream ID.
-
-Next, zero or more DATA frames can be received. The
-``on_data_chunk_recv_callback()`` function is invoked when a chunk of
-data is received from the remote peer::
-
-    static int on_data_chunk_recv_callback(nghttp2_session *session _U_,
-                                           uint8_t flags _U_, int32_t stream_id,
-                                           const uint8_t *data, size_t len,
-                                           void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      if (session_data->stream_data->stream_id == stream_id) {
-        fwrite(data, len, 1, stdout);
-      }
-      return 0;
-    }
-
-In our case, a chunk of data is HTTP response body. After checking the
-stream ID, we just write the received data to stdout. Note the output
-in the terminal may be corrupted if the response body contains some
-binary data.
-
-The ``on_stream_close_callback()`` function is invoked when the stream
-is about to close::
-
-    static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                        nghttp2_error_code error_code,
-                                        void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      int rv;
-
-      if (session_data->stream_data->stream_id == stream_id) {
-        fprintf(stderr, "Stream %d closed with error_code=%d\n", stream_id,
-                error_code);
-        rv = nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
-        if (rv != 0) {
-          return NGHTTP2_ERR_CALLBACK_FAILURE;
-        }
-      }
-      return 0;
-    }
-
-If the stream ID matches the one we initiated, it means that its
-stream is going to be closed. Since we have finished receiving
-resource we wanted (or the stream was reset by RST_STREAM from the
-remote peer), we call `nghttp2_session_terminate_session()` to
-commence closure of the HTTP/2 session gracefully. If you have
-some data associated for the stream to be closed, you may delete it
-here.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-hpack.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-hpack.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-hpack.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-hpack.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-Tutorial: HPACK API
-===================
-
-In this tutorial, we describe basic use of nghttp2's HPACK API.  We
-briefly describe the APIs for deflating and inflating header fields.
-The full example of using these APIs, `deflate.c`_, is attached at the
-end of this page. It also resides in the examples directory in the
-archive or repository.
-
-Deflating (encoding) headers
-----------------------------
-
-First we need to initialize a :type:`nghttp2_hd_deflater` object using
-the `nghttp2_hd_deflate_new()` function::
-
-    int nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
-                               size_t deflate_hd_table_bufsize_max);
-
-This function allocates a :type:`nghttp2_hd_deflater` object,
-initializes it, and assigns its pointer to ``*deflater_ptr``. The
-*deflate_hd_table_bufsize_max* is the upper bound of header table size
-the deflater will use.  This will limit the memory usage by the
-deflater object for the dynamic header table.  If in doubt, just
-specify 4096 here, which is the default upper bound of dynamic header
-table buffer size.
-
-To encode header fields, use the `nghttp2_hd_deflate_hd()` function::
-
-    ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
-                                  uint8_t *buf, size_t buflen,
-                                  const nghttp2_nv *nva, size_t nvlen);
-
-The *deflater* is the deflater object initialized by
-`nghttp2_hd_deflate_new()` described above. The encoded byte string is
-written to the buffer *buf*, which has length *buflen*.  The *nva* is
-a pointer to an array of headers fields, each of type
-:type:`nghttp2_nv`.  *nvlen* is the number of header fields which
-*nva* contains.
-
-It is important to initialize and assign all members of
-:type:`nghttp2_nv`. For security sensitive header fields (such as
-cookies), set the :macro:`NGHTTP2_NV_FLAG_NO_INDEX` flag in
-:member:`nghttp2_nv.flags`.  Setting this flag prevents recovery of
-sensitive header fields by compression based attacks: This is achieved
-by not inserting the header field into the dynamic header table.
-
-`nghttp2_hd_deflate_hd()` processes all headers given in *nva*.  The
-*nva* must include all request or response header fields to be sent in
-one HEADERS (or optionally following (multiple) CONTINUATION
-frame(s)).  The *buf* must have enough space to store the encoded
-result, otherwise the function will fail.  To estimate the upper bound
-of the encoded result length, use `nghttp2_hd_deflate_bound()`::
-
-    size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
-                                    const nghttp2_nv *nva, size_t nvlen);
-
-Pass this function the same parameters (*deflater*, *nva*, and
-*nvlen*) which will be passed to `nghttp2_hd_deflate_hd()`.
-
-Subsequent calls to `nghttp2_hd_deflate_hd()` will use the current
-encoder state and perform differential encoding, which yields HPAC's
-fundamental compression gain.
-
-If `nghttp2_hd_deflate_hd()` fails, the failure is fatal and any
-further calls with the same deflater object will fail.  Thus it's very
-important to use `nghttp2_hd_deflate_bound()` to determine the
-required size of the output buffer.
-
-To delete a :type:`nghttp2_hd_deflater` object, use the
-`nghttp2_hd_deflate_del()` function.
-
-Inflating (decoding) headers
-----------------------------
-
-A :type:`nghttp2_hd_inflater` object is used to inflate compressed
-header data.  To initialize the object, use
-`nghttp2_hd_inflate_new()`::
-
-    int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr);
-
-To inflate header data, use `nghttp2_hd_inflate_hd2()`::
-
-    ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
-                                   nghttp2_nv *nv_out, int *inflate_flags,
-                                   const uint8_t *in, size_t inlen,
-                                   int in_final);
-
-`nghttp2_hd_inflate_hd2()` reads a stream of bytes and outputs a
-single header field at a time. Multiple calls are normally required to
-read a full stream of bytes and output all of the header fields.
-
-The *inflater* is the inflater object initialized above.  The *nv_out*
-is a pointer to a :type:`nghttp2_nv` into which one header field may
-be stored.  The *in* is a pointer to input data, and *inlen* is its
-length.  The caller is not required to specify the whole deflated
-header data via *in* at once: Instead it can call this function
-multiple times as additional data bytes become available.  If
-*in_final* is nonzero, it tells the function that the passed data is
-the final sequence of deflated header data.
-
-The *inflate_flags* is an output parameter; on success the function
-sets it to a bitset of flags.  It will be described later.
-
-This function returns when each header field is inflated.  When this
-happens, the function sets the :macro:`NGHTTP2_HD_INFLATE_EMIT` flag
-in *inflate_flags*, and a header field is stored in *nv_out*.  The
-return value indicates the number of bytes read from *in* processed so
-far, which may be less than *inlen*.  The caller should call the
-function repeatedly until all bytes are processed. Processed bytes
-should be removed from *in*, and *inlen* should be adjusted
-appropriately.
-
-If *in_final* is nonzero and all given data was processed, the
-function sets the :macro:`NGHTTP2_HD_INFLATE_FINAL` flag in
-*inflate_flags*.  When you see this flag set, call the
-`nghttp2_hd_inflate_end_headers()` function.
-
-If *in_final* is zero and the :macro:`NGHTTP2_HD_INFLATE_EMIT` flag is
-not set, it indicates that all given data was processed.  The caller
-is required to pass additional data.
-
-Example usage of `nghttp2_hd_inflate_hd2()` is shown in the
-`inflate_header_block()` function in `deflate.c`_.
-
-Finally, to delete a :type:`nghttp2_hd_inflater` object, use
-`nghttp2_hd_inflate_del()`.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-server.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-server.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-server.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/sources/tutorial-server.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,625 +0,0 @@
-Tutorial: HTTP/2 server
-=========================
-
-In this tutorial, we are going to write a single-threaded, event-based
-HTTP/2 web server, which supports HTTPS only. It can handle concurrent
-multiple requests, but only the GET method is supported. The complete
-source code, `libevent-server.c`_, is attached at the end of this
-page.  The source also resides in the examples directory in the
-archive or repository.
-
-This simple server takes 3 arguments: The port number to listen on,
-the path to your SSL/TLS private key file, and the path to your
-certificate file.  The synopsis is:
-
-.. code-block:: text
-
-    $ libevent-server PORT /path/to/server.key /path/to/server.crt
-
-We use libevent in this tutorial to handle networking I/O.  Please
-note that nghttp2 itself does not depend on libevent.
-
-The server starts with some libevent and OpenSSL setup in the
-``main()`` and ``run()`` functions. This setup isn't specific to
-nghttp2, but one thing you should look at is setup of the NPN
-callback. The NPN callback is used by the server to advertise which
-application protocols the server supports to a client.  In this
-example program, when creating the ``SSL_CTX`` object, we store the
-application protocol name in the wire format of NPN in a statically
-allocated buffer. This is safe because we only create one ``SSL_CTX``
-object in the program's entire lifetime.
-
-If you are following TLS related RFC, you know that NPN is not the
-standardized way to negotiate HTTP/2.  NPN itself is not even
-published as RFC.  The standard way to negotiate HTTP/2 is ALPN,
-Application-Layer Protocol Negotiation Extension, defined in `RFC 7301
-<https://tools.ietf.org/html/rfc7301>`_.  The one caveat of ALPN is
-that OpenSSL >= 1.0.2 is required.  We use macro to enable/disable
-ALPN support depending on OpenSSL version.  In ALPN, client sends the
-list of supported application protocols, and server selects one of
-them.  We provide the callback for it::
-
-    static unsigned char next_proto_list[256];
-    static size_t next_proto_list_len;
-
-    static int next_proto_cb(SSL *s _U_, const unsigned char **data,
-                             unsigned int *len, void *arg _U_) {
-      *data = next_proto_list;
-      *len = (unsigned int)next_proto_list_len;
-      return SSL_TLSEXT_ERR_OK;
-    }
-
-    #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    static int alpn_select_proto_cb(SSL *ssl _U_, const unsigned char **out,
-                                    unsigned char *outlen, const unsigned char *in,
-                                    unsigned int inlen, void *arg _U_) {
-      int rv;
-
-      rv = nghttp2_select_next_protocol((unsigned char **)out, outlen, in, inlen);
-
-      if (rv != 1) {
-        return SSL_TLSEXT_ERR_NOACK;
-      }
-
-      return SSL_TLSEXT_ERR_OK;
-    }
-    #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-    static SSL_CTX *create_ssl_ctx(const char *key_file, const char *cert_file) {
-      SSL_CTX *ssl_ctx;
-      EC_KEY *ecdh;
-
-      ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-
-      ...
-
-      next_proto_list[0] = NGHTTP2_PROTO_VERSION_ID_LEN;
-      memcpy(&next_proto_list[1], NGHTTP2_PROTO_VERSION_ID,
-             NGHTTP2_PROTO_VERSION_ID_LEN);
-      next_proto_list_len = 1 + NGHTTP2_PROTO_VERSION_ID_LEN;
-
-      SSL_CTX_set_next_protos_advertised_cb(ssl_ctx, next_proto_cb, NULL);
-
-    #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-      SSL_CTX_set_alpn_select_cb(ssl_ctx, alpn_select_proto_cb, NULL);
-    #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-      return ssl_ctx;
-    }
-
-The wire format of NPN is a sequence of length prefixed strings, with
-exactly one byte used to specify the length of each protocol
-identifier.  In this tutorial, we advertise the specific HTTP/2
-protocol version the current nghttp2 library supports, which is
-exported in the identifier :macro:`NGHTTP2_PROTO_VERSION_ID`. The
-``next_proto_cb()`` function is the server-side NPN callback. In the
-OpenSSL implementation, we just assign the pointer to the NPN buffers
-we filled in earlier. The NPN callback function is set to the
-``SSL_CTX`` object using ``SSL_CTX_set_next_protos_advertised_cb()``.
-
-In ``alpn_select_proto_cb()``, we use `nghttp2_select_next_protocol()`
-to select application protocol.  The `nghttp2_select_next_protocol()`
-returns 1 only if it selected h2 (ALPN identifier for HTTP/2), and out
-parameters were assigned accordingly.
-
-Next, let's take a look at the main structures used by the example
-application:
-
-We use the ``app_context`` structure to store application-wide data::
-
-    struct app_context {
-      SSL_CTX *ssl_ctx;
-      struct event_base *evbase;
-    };
-
-We use the ``http2_session_data`` structure to store session-level
-(which corresponds to one HTTP/2 connection) data::
-
-    typedef struct http2_session_data {
-      struct http2_stream_data root;
-      struct bufferevent *bev;
-      app_context *app_ctx;
-      nghttp2_session *session;
-      char *client_addr;
-    } http2_session_data;
-
-We use the ``http2_stream_data`` structure to store stream-level data::
-
-    typedef struct http2_stream_data {
-      struct http2_stream_data *prev, *next;
-      char *request_path;
-      int32_t stream_id;
-      int fd;
-    } http2_stream_data;
-
-A single HTTP/2 session can have multiple streams.  To manage them, we
-use a doubly linked list:  The first element of this list is pointed
-to by the ``root->next`` in ``http2_session_data``.  Initially,
-``root->next`` is ``NULL``.
-
-libevent's bufferevent structure is used to perform network I/O, with
-the pointer to the bufferevent stored in the ``http2_session_data``
-structure.  Note that the bufferevent object is kept in
-``http2_session_data`` and not in ``http2_stream_data``. This is
-because ``http2_stream_data`` is just a logical stream multiplexed
-over the single connection managed by the bufferevent in
-``http2_session_data``.
-
-We first create a listener object to accept incoming connections.
-libevent's ``struct evconnlistener`` is used for this purpose::
-
-    static void start_listen(struct event_base *evbase, const char *service,
-                             app_context *app_ctx) {
-      int rv;
-      struct addrinfo hints;
-      struct addrinfo *res, *rp;
-
-      memset(&hints, 0, sizeof(hints));
-      hints.ai_family = AF_UNSPEC;
-      hints.ai_socktype = SOCK_STREAM;
-      hints.ai_flags = AI_PASSIVE;
-    #ifdef AI_ADDRCONFIG
-      hints.ai_flags |= AI_ADDRCONFIG;
-    #endif /* AI_ADDRCONFIG */
-
-      rv = getaddrinfo(NULL, service, &hints, &res);
-      if (rv != 0) {
-        errx(1, NULL);
-      }
-      for (rp = res; rp; rp = rp->ai_next) {
-        struct evconnlistener *listener;
-        listener = evconnlistener_new_bind(
-            evbase, acceptcb, app_ctx, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
-            16, rp->ai_addr, (int)rp->ai_addrlen);
-        if (listener) {
-          freeaddrinfo(res);
-
-          return;
-        }
-      }
-      errx(1, "Could not start listener");
-    }
-
-We specify the ``acceptcb`` callback, which is called when a new connection is
-accepted::
-
-    static void acceptcb(struct evconnlistener *listener _U_, int fd,
-                         struct sockaddr *addr, int addrlen, void *arg) {
-      app_context *app_ctx = (app_context *)arg;
-      http2_session_data *session_data;
-
-      session_data = create_http2_session_data(app_ctx, fd, addr, addrlen);
-
-      bufferevent_setcb(session_data->bev, readcb, writecb, eventcb, session_data);
-    }
-
-Here we create the ``http2_session_data`` object. The connection's
-bufferevent is initialized at the same time. We specify three
-callbacks for the bufferevent: ``readcb``, ``writecb``, and
-``eventcb``.
-
-The ``eventcb()`` callback is invoked by the libevent event loop when an event
-(e.g. connection has been established, timeout, etc.) occurs on the
-underlying network socket::
-
-    static void eventcb(struct bufferevent *bev _U_, short events, void *ptr) {
-      http2_session_data *session_data = (http2_session_data *)ptr;
-      if (events & BEV_EVENT_CONNECTED) {
-        const unsigned char *alpn = NULL;
-        unsigned int alpnlen = 0;
-        SSL *ssl;
-
-        fprintf(stderr, "%s connected\n", session_data->client_addr);
-
-        ssl = bufferevent_openssl_get_ssl(session_data->bev);
-
-        SSL_get0_next_proto_negotiated(ssl, &alpn, &alpnlen);
-    #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-        if (alpn == NULL) {
-          SSL_get0_alpn_selected(ssl, &alpn, &alpnlen);
-        }
-    #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-        if (alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) {
-          fprintf(stderr, "%s h2 is not negotiated\n", session_data->client_addr);
-          delete_http2_session_data(session_data);
-          return;
-        }
-
-        initialize_nghttp2_session(session_data);
-
-        if (send_server_connection_header(session_data) != 0 ||
-            session_send(session_data) != 0) {
-          delete_http2_session_data(session_data);
-          return;
-        }
-
-        return;
-      }
-      if (events & BEV_EVENT_EOF) {
-        fprintf(stderr, "%s EOF\n", session_data->client_addr);
-      } else if (events & BEV_EVENT_ERROR) {
-        fprintf(stderr, "%s network error\n", session_data->client_addr);
-      } else if (events & BEV_EVENT_TIMEOUT) {
-        fprintf(stderr, "%s timeout\n", session_data->client_addr);
-      }
-      delete_http2_session_data(session_data);
-    }
-
-Here we validate that HTTP/2 is negotiated, and if not, drop
-connection.
-
-For the ``BEV_EVENT_EOF``, ``BEV_EVENT_ERROR``, and
-``BEV_EVENT_TIMEOUT`` events, we just simply tear down the connection.
-The ``delete_http2_session_data()`` function destroys the
-``http2_session_data`` object and its associated bufferevent member.
-As a result, the underlying connection is closed.
-
-The
-``BEV_EVENT_CONNECTED`` event is invoked when SSL/TLS handshake has
-completed successfully. After this we are ready to begin communicating
-via HTTP/2.
-
-The ``initialize_nghttp2_session()`` function initializes the nghttp2
-session object and several callbacks::
-
-    static void initialize_nghttp2_session(http2_session_data *session_data) {
-      nghttp2_session_callbacks *callbacks;
-
-      nghttp2_session_callbacks_new(&callbacks);
-
-      nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
-
-      nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                           on_frame_recv_callback);
-
-      nghttp2_session_callbacks_set_on_stream_close_callback(
-          callbacks, on_stream_close_callback);
-
-      nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                       on_header_callback);
-
-      nghttp2_session_callbacks_set_on_begin_headers_callback(
-          callbacks, on_begin_headers_callback);
-
-      nghttp2_session_server_new(&session_data->session, callbacks, session_data);
-
-      nghttp2_session_callbacks_del(callbacks);
-    }
-
-Since we are creating a server, we use `nghttp2_session_server_new()`
-to initialize the nghttp2 session object.  We also setup 5 callbacks
-for the nghttp2 session, these are explained later.
-
-The server now begins by sending the server connection preface, which
-always consists of a SETTINGS frame.
-``send_server_connection_header()`` configures and submits it::
-
-    static int send_server_connection_header(http2_session_data *session_data) {
-      nghttp2_settings_entry iv[1] = {
-          {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
-      int rv;
-
-      rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
-                                   ARRLEN(iv));
-      if (rv != 0) {
-        warnx("Fatal error: %s", nghttp2_strerror(rv));
-        return -1;
-      }
-      return 0;
-    }
-
-In the example SETTINGS frame we've set
-SETTINGS_MAX_CONCURRENT_STREAMS to 100. `nghttp2_submit_settings()`
-is used to queue the frame for transmission, but note it only queues
-the frame for transmission, and doesn't actually send it. All
-functions in the ``nghttp2_submit_*()`` family have this property. To
-actually send the frame, `nghttp2_session_send()` should be used, as
-described later.
-
-Since bufferevent may buffer more than the first 24 bytes from the client, we
-have to process them here since libevent won't invoke callback functions for
-this pending data. To process the received data, we call the
-``session_recv()`` function::
-
-    static int session_recv(http2_session_data *session_data) {
-      ssize_t readlen;
-      struct evbuffer *input = bufferevent_get_input(session_data->bev);
-      size_t datalen = evbuffer_get_length(input);
-      unsigned char *data = evbuffer_pullup(input, -1);
-
-      readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
-      if (readlen < 0) {
-        warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
-        return -1;
-      }
-      if (evbuffer_drain(input, (size_t)readlen) != 0) {
-        warnx("Fatal error: evbuffer_drain failed");
-        return -1;
-      }
-      if (session_send(session_data) != 0) {
-        return -1;
-      }
-      return 0;
-    }
-
-In this function, we feed all unprocessed but already received data to
-the nghttp2 session object using the `nghttp2_session_mem_recv()`
-function. The `nghttp2_session_mem_recv()` function processes the data
-and may both invoke the previously setup callbacks and also queue
-outgoing frames. To send any pending outgoing frames, we immediately
-call ``session_send()``.
-
-The ``session_send()`` function is defined as follows::
-
-    static int session_send(http2_session_data *session_data) {
-      int rv;
-      rv = nghttp2_session_send(session_data->session);
-      if (rv != 0) {
-        warnx("Fatal error: %s", nghttp2_strerror(rv));
-        return -1;
-      }
-      return 0;
-    }
-
-The `nghttp2_session_send()` function serializes the frame into wire
-format and calls the ``send_callback()``, which is of type
-:type:`nghttp2_send_callback`.  The ``send_callback()`` is defined as
-follows::
-
-    static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
-                                 size_t length, int flags _U_, void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      struct bufferevent *bev = session_data->bev;
-      /* Avoid excessive buffering in server side. */
-      if (evbuffer_get_length(bufferevent_get_output(session_data->bev)) >=
-          OUTPUT_WOULDBLOCK_THRESHOLD) {
-        return NGHTTP2_ERR_WOULDBLOCK;
-      }
-      bufferevent_write(bev, data, length);
-      return (ssize_t)length;
-    }
-
-Since we use bufferevent to abstract network I/O, we just write the
-data to the bufferevent object. Note that `nghttp2_session_send()`
-continues to write all frames queued so far. If we were writing the
-data to a non-blocking socket directly using the ``write()`` system
-call in the ``send_callback()``, we'd soon receive an  ``EAGAIN`` or
-``EWOULDBLOCK`` error since sockets have a limited send buffer. If
-that happens, it's possible to return :macro:`NGHTTP2_ERR_WOULDBLOCK`
-to signal the nghttp2 library to stop sending further data. But here,
-when writing to the bufferevent, we have to regulate the amount data
-to buffered ourselves to avoid using huge amounts of memory. To
-achieve this, we check the size of the output buffer and if it reaches
-more than or equal to ``OUTPUT_WOULDBLOCK_THRESHOLD`` bytes, we stop
-writing data and return :macro:`NGHTTP2_ERR_WOULDBLOCK`.
-
-The next bufferevent callback is ``readcb()``, which is invoked when
-data is available to read in the bufferevent input buffer::
-
-    static void readcb(struct bufferevent *bev _U_, void *ptr) {
-      http2_session_data *session_data = (http2_session_data *)ptr;
-      if (session_recv(session_data) != 0) {
-        delete_http2_session_data(session_data);
-        return;
-      }
-    }
-
-In this function, we just call ``session_recv()`` to process incoming
-data.
-
-The third bufferevent callback is ``writecb()``, which is invoked when all
-data in the bufferevent output buffer has been sent::
-
-    static void writecb(struct bufferevent *bev, void *ptr) {
-      http2_session_data *session_data = (http2_session_data *)ptr;
-      if (evbuffer_get_length(bufferevent_get_output(bev)) > 0) {
-        return;
-      }
-      if (nghttp2_session_want_read(session_data->session) == 0 &&
-          nghttp2_session_want_write(session_data->session) == 0) {
-        delete_http2_session_data(session_data);
-        return;
-      }
-      if (session_send(session_data) != 0) {
-        delete_http2_session_data(session_data);
-        return;
-      }
-    }
-
-First we check whether we should drop the connection or not. The
-nghttp2 session object keeps track of reception and transmission of
-GOAWAY frames and other error conditions as well. Using this
-information, the nghttp2 session object can state whether the
-connection should be dropped or not. More specifically, if both
-`nghttp2_session_want_read()` and `nghttp2_session_want_write()`
-return 0, the connection is no-longer required and can be closed.
-Since we are using bufferevent and its deferred callback option, the
-bufferevent output buffer may still contain pending data when the
-``writecb()`` is called. To handle this, we check whether the output
-buffer is empty or not. If all of these conditions are met, we drop
-connection.
-
-Otherwise, we call ``session_send()`` to process the pending output
-data. Remember that in ``send_callback()``, we must not write all data to
-bufferevent to avoid excessive buffering. We continue processing pending data
-when the output buffer becomes empty.
-
-We have already described the nghttp2 callback ``send_callback()``.  Let's
-learn about the remaining nghttp2 callbacks setup in
-``initialize_nghttp2_setup()`` function.
-
-The ``on_begin_headers_callback()`` function is invoked when the reception of
-a header block in HEADERS or PUSH_PROMISE frame is started::
-
-    static int on_begin_headers_callback(nghttp2_session *session,
-                                         const nghttp2_frame *frame,
-                                         void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      http2_stream_data *stream_data;
-
-      if (frame->hd.type != NGHTTP2_HEADERS ||
-          frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-        return 0;
-      }
-      stream_data = create_http2_stream_data(session_data, frame->hd.stream_id);
-      nghttp2_session_set_stream_user_data(session, frame->hd.stream_id,
-                                           stream_data);
-      return 0;
-    }
-
-We are only interested in the HEADERS frame in this function. Since
-the HEADERS frame has several roles in the HTTP/2 protocol, we check
-that it is a request HEADERS, which opens new stream. If the frame is
-a request HEADERS, we create a ``http2_stream_data`` object to store
-the stream related data. We associate the created
-``http2_stream_data`` object with the stream in the nghttp2 session
-object using `nghttp2_set_stream_user_data()`. The
-``http2_stream_data`` object can later be easily retrieved from the
-stream, without searching through the doubly linked list.
-
-In this example server, we want to serve files relative to the current working
-directory in which the program was invoked. Each header name/value pair is
-emitted via ``on_header_callback`` function, which is called after
-``on_begin_headers_callback()``::
-
-    static int on_header_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, const uint8_t *name,
-                                  size_t namelen, const uint8_t *value,
-                                  size_t valuelen, uint8_t flags _U_,
-                                  void *user_data _U_) {
-      http2_stream_data *stream_data;
-      const char PATH[] = ":path";
-      switch (frame->hd.type) {
-      case NGHTTP2_HEADERS:
-        if (frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-          break;
-        }
-        stream_data =
-            nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-        if (!stream_data || stream_data->request_path) {
-          break;
-        }
-        if (namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) {
-          size_t j;
-          for (j = 0; j < valuelen && value[j] != '?'; ++j)
-            ;
-          stream_data->request_path = percent_decode(value, j);
-        }
-        break;
-      }
-      return 0;
-    }
-
-We search for the ``:path`` header field among the request headers and
-store the requested path in the ``http2_stream_data`` object. In this
-example program, we ignore the ``:method`` header field and always
-treat the request as a GET request.
-
-The ``on_frame_recv_callback()`` function is invoked when a frame is
-fully received::
-
-    static int on_frame_recv_callback(nghttp2_session *session,
-                                      const nghttp2_frame *frame, void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      http2_stream_data *stream_data;
-      switch (frame->hd.type) {
-      case NGHTTP2_DATA:
-      case NGHTTP2_HEADERS:
-        /* Check that the client request has finished */
-        if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-          stream_data =
-              nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-          /* For DATA and HEADERS frame, this callback may be called after
-             on_stream_close_callback. Check that stream still alive. */
-          if (!stream_data) {
-            return 0;
-          }
-          return on_request_recv(session, session_data, stream_data);
-        }
-        break;
-      default:
-        break;
-      }
-      return 0;
-    }
-
-First we retrieve the ``http2_stream_data`` object associated with the
-stream in ``on_begin_headers_callback()`` using
-`nghttp2_session_get_stream_user_data()`. If the requested path
-cannot be served for some reason (e.g. file is not found), we send a
-404 response using ``error_reply()``.  Otherwise, we open
-the requested file and send its content. We send the header field
-``:status`` as a single response header.
-
-Sending the file content is performed by the ``send_response()`` function::
-
-    static int send_response(nghttp2_session *session, int32_t stream_id,
-                             nghttp2_nv *nva, size_t nvlen, int fd) {
-      int rv;
-      nghttp2_data_provider data_prd;
-      data_prd.source.fd = fd;
-      data_prd.read_callback = file_read_callback;
-
-      rv = nghttp2_submit_response(session, stream_id, nva, nvlen, &data_prd);
-      if (rv != 0) {
-        warnx("Fatal error: %s", nghttp2_strerror(rv));
-        return -1;
-      }
-      return 0;
-    }
-
-nghttp2 uses the :type:`nghttp2_data_provider` structure to send the
-entity body to the remote peer. The ``source`` member of this
-structure is a union, which can be either a void pointer or an int
-(which is intended to be used as file descriptor). In this example
-server, we use it as a file descriptor. We also set the
-``file_read_callback()`` callback function to read the contents of the
-file::
-
-    static ssize_t file_read_callback(nghttp2_session *session _U_,
-                                      int32_t stream_id _U_, uint8_t *buf,
-                                      size_t length, uint32_t *data_flags,
-                                      nghttp2_data_source *source,
-                                      void *user_data _U_) {
-      int fd = source->fd;
-      ssize_t r;
-      while ((r = read(fd, buf, length)) == -1 && errno == EINTR)
-        ;
-      if (r == -1) {
-        return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-      }
-      if (r == 0) {
-        *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-      }
-      return r;
-    }
-
-If an error occurs while reading the file, we return
-:macro:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  This tells the
-library to send RST_STREAM to the stream.  When all data has been
-read, the :macro:`NGHTTP2_DATA_FLAG_EOF` flag is set to signal nghttp2
-that we have finished reading the file.
-
-The `nghttp2_submit_response()` function is used to send the response to the
-remote peer.
-
-The ``on_stream_close_callback()`` function is invoked when the stream
-is about to close::
-
-    static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                        uint32_t error_code _U_, void *user_data) {
-      http2_session_data *session_data = (http2_session_data *)user_data;
-      http2_stream_data *stream_data;
-
-      stream_data = nghttp2_session_get_stream_user_data(session, stream_id);
-      if (!stream_data) {
-        return 0;
-      }
-      remove_stream(session_data, stream_data);
-      delete_http2_stream_data(stream_data);
-      return 0;
-    }
-
-Lastly, we destroy the ``http2_stream_data`` object in this function,
-since the stream is about to close and we no longer need the object.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/breadcrumbs.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/breadcrumbs.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/breadcrumbs.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/breadcrumbs.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
-
-{% if page_source_suffix %} 
-{% set suffix = page_source_suffix %}
-{% else %}
-{% set suffix = source_suffix %}
-{% endif %}
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
-      {% for doc in parents %}
-        <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-      {% endfor %}
-    <li>{{ title }}</li>
-    <li class="wy-breadcrumbs-aside">
-      {% if pagename != "search" %}
-        {% if display_github %}
-          <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> Edit on GitHub</a>
-        {% elif display_bitbucket %}
-          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
-        {% elif show_source and source_url_prefix %}
-          <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">View page source</a>
-        {% elif show_source and has_source and sourcename %}
-          <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
-        {% endif %}
-      {% endif %}
-    </li>
-  </ul>
-  <hr/>
-</div>
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/footer.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/footer.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/footer.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/footer.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-<footer>
-  {% if next or prev %}
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      {% endif %}
-    </div>
-  {% endif %}
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-
-    {%- if build_id and build_url %}
-      {% trans build_url=build_url, build_id=build_id %}
-        <span class="build">
-          Build
-          <a href="{{ build_url }}">{{ build_id }}</a>.
-        </span>
-      {% endtrans %}
-    {%- elif commit %}
-      {% trans commit=commit %}
-        <span class="commit">
-          Revision <code>{{ commit }}</code>.
-        </span>
-      {% endtrans %}
-    {%- elif last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-
-    </p>
-  </div>
-
-  {%- if show_sphinx %}
-  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
-  {%- endif %}
-
-  {%- block extrafooter %} {% endblock %}
-
-</footer>
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/__init__.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/__init__.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/__init__.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/__init__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-"""Sphinx ReadTheDocs theme.
-
-From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
-
-"""
-import os
-
-VERSION = (0, 1, 9)
-
-__version__ = ".".join(str(v) for v in VERSION)
-__version_full__ = __version__
-
-
-def get_html_theme_path():
-    """Return list of HTML theme paths."""
-    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-    return cur_dir
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-{# TEMPLATE VAR SETTINGS #}
-{%- set url_root = pathto('', 1) %}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  {{ metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {% block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {% endblock %}
-
-  {# FAVICON #}
-  {% if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-  {% endif %}
-
-  {# CSS #}
-
-  {# OPENSEARCH #}
-  {% if not embedded %}
-    {% if use_opensearch %}
-      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {% endif %}
-
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  {% endif %}
-
-  {% for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
-
-  {% for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
-
-  {%- block linktags %}
-    {%- if hasdoc('about') %}
-        <link rel="author" title="{{ _('About these documents') }}"
-              href="{{ pathto('about') }}"/>
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-        <link rel="index" title="{{ _('Index') }}"
-              href="{{ pathto('genindex') }}"/>
-    {%- endif %}
-    {%- if hasdoc('search') %}
-        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
-    {%- if parents %}
-        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
-    {%- endif %}
-    {%- if next %}
-        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
-    {%- endif %}
-    {%- if prev %}
-        <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}"/>
-    {%- endif %}
-  {%- endblock %}
-  {%- block extrahead %} {% endblock %}
-
-  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
-  <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  {% block extrabody %} {% endblock %}
-  <div class="wy-grid-for-nav">
-
-    {# SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          {% block sidebartitle %}
-
-          {% if logo and theme_logo_only %}
-            <a href="{{ pathto(master_doc) }}">
-          {% else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-          {% endif %}
-
-          {% if logo %}
-            {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
-          {% endif %}
-          </a>
-
-          {% if theme_display_version %}
-            {%- set nav_version = version %}
-            {% if READTHEDOCS and current_version %}
-              {%- set nav_version = current_version %}
-            {% endif %}
-            {% if nav_version %}
-              <div class="version">
-                {{ nav_version }}
-              </div>
-            {% endif %}
-          {% endif %}
-
-          {% include "searchbox.html" %}
-
-          {% endblock %}
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          {% block menu %}
-            {% set toctree = toctree(maxdepth=4, collapse=theme_collapse_navigation, includehidden=True) %}
-            {% if toctree %}
-                {{ toctree }}
-            {% else %}
-                <!-- Local TOC -->
-                <div class="local-toc">{{ toc }}</div>
-            {% endif %}
-          {% endblock %}
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="{{ pathto(master_doc) }}">{{ project }}</a>
-      </nav>
-
-
-      {# PAGE CONTENT #}
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          {% include "breadcrumbs.html" %}
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            {% block body %}{% endblock %}
-           </div>
-          </div>
-          {% include "footer.html" %}
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  {% include "versions.html" %}
-
-  {% if not embedded %}
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'{{ url_root }}',
-            VERSION:'{{ release|e }}',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-            HAS_SOURCE:  {{ has_source|lower }}
-        };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-  {% endif %}
-
-  {# STICKY NAVIGATION #}
-  {% if theme_sticky_navigation %}
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-  {% endif %}
-
-  {%- block footer %} {% endblock %}
-
-</body>
-</html>
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout_old.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout_old.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout_old.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/layout_old.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-{#
-    basic/layout.html
-    ~~~~~~~~~~~~~~~~~
-
-    Master layout template for Sphinx themes.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-{%- endblock %}
-{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
-                         (sidebars != []) %}
-{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-{%- macro relbar() %}
-    <div class="related">
-      <h3>{{ _('Navigation') }}</h3>
-      <ul>
-        {%- for rellink in rellinks %}
-        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
-          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
-             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
-        {%- endfor %}
-        {%- block rootrellink %}
-        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
-        {%- endblock %}
-        {%- for parent in parents %}
-          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
-        {%- endfor %}
-        {%- block relbaritems %} {% endblock %}
-      </ul>
-    </div>
-{%- endmacro %}
-
-{%- macro sidebar() %}
-      {%- if render_sidebar %}
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-          {%- block sidebarlogo %}
-          {%- if logo %}
-            <p class="logo"><a href="{{ pathto(master_doc) }}">
-              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
-            </a></p>
-          {%- endif %}
-          {%- endblock %}
-          {%- if sidebars != None %}
-            {#- new style sidebar: explicitly include/exclude templates #}
-            {%- for sidebartemplate in sidebars %}
-            {%- include sidebartemplate %}
-            {%- endfor %}
-          {%- else %}
-            {#- old style sidebars: using blocks -- should be deprecated #}
-            {%- block sidebartoc %}
-            {%- include "localtoc.html" %}
-            {%- endblock %}
-            {%- block sidebarrel %}
-            {%- include "relations.html" %}
-            {%- endblock %}
-            {%- block sidebarsourcelink %}
-            {%- include "sourcelink.html" %}
-            {%- endblock %}
-            {%- if customsidebar %}
-            {%- include customsidebar %}
-            {%- endif %}
-            {%- block sidebarsearch %}
-            {%- include "searchbox.html" %}
-            {%- endblock %}
-          {%- endif %}
-        </div>
-      </div>
-      {%- endif %}
-{%- endmacro %}
-
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro css() %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
-    {{ metatags }}
-    {%- block htmltitle %}
-    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-    {%- endblock %}
-    {{ css() }}
-    {%- if not embedded %}
-    {{ script() }}
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-    {%- if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-    {%- endif %}
-    {%- endif %}
-{%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
-    {%- if parents %}
-    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-{%- endblock %}
-{%- block extrahead %} {% endblock %}
-  </head>
-  <body>
-{%- block header %}{% endblock %}
-
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-
-{%- block content %}
-  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-
-    <div class="document">
-  {%- block document %}
-      <div class="documentwrapper">
-      {%- if render_sidebar %}
-        <div class="bodywrapper">
-      {%- endif %}
-          <div class="body">
-            {% block body %} {% endblock %}
-          </div>
-      {%- if render_sidebar %}
-        </div>
-      {%- endif %}
-      </div>
-  {%- endblock %}
-
-  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-      <div class="clearer"></div>
-    </div>
-{%- endblock %}
-
-{%- block relbar2 %}{{ relbar() }}{% endblock %}
-
-{%- block footer %}
-    <div class="footer">
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-    {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-    {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
-    {%- endif %}
-    </div>
-    <p>asdf asdf asdf asdf 22</p>
-{%- endblock %}
-  </body>
-</html>
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/searchbox.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/searchbox.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/searchbox.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/searchbox.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-{%- if builder != 'singlehtml' %}
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-{%- endif %}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/search.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/search.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/search.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/search.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-{#
-    basic/search.html
-    ~~~~~~~~~~~~~~~~~
-
-    Template for the search page.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- extends "layout.html" %}
-{% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block footer %}
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-  </script>
-  {# this is used when loading the search index using $.ajax fails,
-     such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
-  {{ super() }}
-{% endblock %}
-{% block body %}
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      {% trans %}Please activate JavaScript to enable the search
-      functionality.{% endtrans %}
-    </p>
-  </div>
-  </noscript>
-
-  {% if search_performed %}
-    <h2>{{ _('Search Results') }}</h2>
-    {% if not search_results %}
-      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
-    {% endif %}
-  {% endif %}
-  <div id="search-results">
-  {% if search_results %}
-    <ul>
-    {% for href, caption, context in search_results %}
-      <li>
-        <a href="{{ pathto(item.href) }}">{{ caption }}</a>
-        <p class="context">{{ context|e }}</p>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  </div>
-{% endblock %}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
-/*# sourceMappingURL=badge_only.css.map */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "CAyDA,SAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI,EC1Gb,SAkBC,EAjBC,UAAW,ECFJ,UAAW,EDGlB,UAAW,EAHqC,KAAM,EAItD,SAAU,EAJsD,KAAM,EAapE,EAAG,EAAE,qCAAwB,EAC7B,EAAG,EAAE,0PAAyE,ECZpF,SAAU,EACR,MAAO,EAAE,WAAY,EACrB,UAAW,EAAE,UAAW,EACxB,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,KAAM,EACnB,UAAW,EAAE,AAAC,EACd,cAAe,EAAE,MAAO,EAG1B,IAAK,EACH,MAAO,EAAE,WAAY,EACrB,cAAe,EAAE,MAAO,EAIxB,KAAG,EACD,MAAO,EAAE,WAAY,EACvB,sCAAiB,EAGf,IAAK,EAAE,MAAY,EAEvB,KAAM,EACJ,cAAe,EAAE,GAAI,EACrB,UAAW,EAAE,EAAG,EAChB,UAAW,EAAE,KAAM,EAEjB,YAAG,EACD,IAAK,EAAE,IAAI,EACb,oDAAiB,EAGf,aAAc,EAAE,OAAQ,EAG9B,cAAe,EACb,MAAO,EAAE,EAAO,EAElB,gBAAiB,EACf,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,kBAAmB,EACjB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,qBAAsB,EACpB,MAAO,EAAE,EAAO,EAElB,uBAAwB,EACtB,MAAO,EAAE,EAAO,ECnElB,YAAa,EACX,OAAQ,EAAE,IAAK,EACf,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,AAAC,EACP,IAAK,EC6E+B,IAAK,ED5EzC,IAAK,EEoC+B,MAAyB,EFnC7D,SAAU,EAAE,MAAkC,EAC9C,SAAU,EAAE,iBAAiC,EAC7C,UAAW,EE+CyB,sDAAM,EF9C1C,MAAO,EC+E6B,EAAG,ED9EvC,cAAC,EACC,IAAK,EE+B6B,MAAK,EF9BvC,cAAe,EAAE,GAAI,EACvB,6BAAgB,EACd,MAAO,EAAE,GAAI,EACf,iCAAoB,EAClB,MAAO,EAAE,GAAqB,EAC9B,eAAgB,EAAE,MAAkC,EACpD,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,IAAK,EACjB,QAAS,EAAE,EAAG,EACd,KAAM,EAAE,MAAO,EACf,IAAK,EEX6B,MAAM,EL4F1C,IAAK,EAAE,AAAC,EACR,iFAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,uCAAO,EACL,IAAK,EAAE,GAAI,EGrFX,qCAAG,EACD,IAAK,EEgB2B,MAAyB,EFf3D,0CAAQ,EACN,IAAK,EAAE,GAAI,EACb,4CAAU,EACR,IAAK,EAAE,GAAI,EACb,iDAAiB,EACf,eAAgB,ECQgB,MAAI,EDPpC,IAAK,EEI2B,GAAM,EFHxC,wDAAwB,EACtB,eAAgB,EEmBgB,MAAO,EFlBvC,IAAK,ECzB2B,GAAI,ED0BxC,yCAA8B,EAC5B,MAAO,EAAE,IAAK,EAChB,gCAAmB,EACjB,QAAS,EAAE,EAAG,EACd,MAAO,EAAE,GAAqB,EAC9B,IAAK,EEP6B,GAAY,EFQ9C,MAAO,EAAE,GAAI,EACb,mCAAE,EACA,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,KAAM,EACd,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,gBAA6C,EAC3D,mCAAE,EACA,MAAO,EAAE,WAAY,EACrB,KAAM,EAAE,AAAC,EACT,qCAAC,EACC,MAAO,EAAE,WAAY,EACrB,MAAO,EAAE,EAAqB,EAC9B,IAAK,EEfyB,MAAyB,EFgB7D,sBAAW,EACT,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,IAAK,EAAE,GAAI,EACX,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,QAAS,ECkByB,IAAK,EDjBvC,iCAAU,EACR,IAAK,EAAE,GAAI,EACb,+BAAQ,EACN,IAAK,EAAE,GAAI,EACb,oDAA+B,EAC7B,SAAU,EAAE,IAAK,EACjB,6DAAQ,EACN,IAAK,EAAE,GAAI,EACb,+DAAU,EACR,IAAK,EAAE,GAAI,EACf,2CAAoB,EAClB,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,UAAW,EAAE,GAAI,EACjB,MAAO,EAAE,IAAuB,EAChC,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,KAAM,EGhDpB,mCAAsB,EHmDxB,YAAa,EACX,IAAK,EAAE,EAAG,EACV,MAAO,EAAE,GAAI,EACb,kBAAO,EACL,MAAO,EAAE,IAAK,EAClB,EAAG,EACD,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI",
-"sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
-"names": [],
-"file": "badge_only.css"
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,.rst-content code,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,.rst-content .toctree-wrapper p.caption,h3{orphans:3;widows:3}h2,.rst-content .toctree-wrapper p.caption,h3{page-break-after:avoid}}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}/*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.2.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.2.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:0.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.wy-menu-vertical li span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.rst-content .pull-left.admonition-title,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content dl dt .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.rst-content code.download span.pull-left:first-child,.pull-left.icon{margin-right:.3em}.fa.pull-right,.wy-menu-vertical li span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.rst-content .pull-right.admonition-title,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content dl dt .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.rst-content code.download span.pull-right:first-child,.pull-right.icon{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-remove:before,.fa-close:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.wy-dropdown .caret:before,.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:""}.fa-meanpath:before{content:""}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context{font-family:inherit}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before{font-family:"FontAwesome";display:inline-block;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa,a .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink,a .rst-content p.caption .headerlink,.rst-content p.caption a .headerlink,a .rst-content tt.download span:first-child,.rst-content tt.download a span:first-child,a .rst-content code.download span:first-child,.rst-content code.download a span:first-child,a .icon{display:inline-block;text-decoration:inherit}.btn .fa,.btn .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .btn span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.btn .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.btn .rst-content p.caption .headerlink,.rst-content p.caption .btn .headerlink,.btn .rst-content tt.download span:first-child,.rst-content tt.download .btn span:first-child,.btn .rst-content code.download span:first-child,.rst-content code.download .btn span:first-child,.btn .icon,.nav .fa,.nav .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand,.nav .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink,.nav .rst-content p.caption .headerlink,.rst-content p.caption .nav .headerlink,.nav .rst-content tt.download span:first-child,.rst-content tt.download .nav span:first-child,.nav .rst-content code.download span:first-child,.rst-content code.download .nav span:first-child,.nav .icon{display:inline}.btn .fa.fa-large,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.btn .rst-content .fa-large.admonition-title,.rst-content .btn .fa-large.admonition-title,.btn .rst-content h1 .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.btn .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .btn .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .btn span.fa-large:first-child,.btn .rst-content code.download span.fa-large:first-child,.rst-content code.download .btn span.fa-large:first-child,.btn .fa-large.icon,.nav .fa.fa-large,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand,.nav .rst-content .fa-large.admonition-title,.rst-content .nav .fa-large.admonition-title,.nav .rst-content h1 .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.nav .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.nav .rst-content code.download span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.nav .fa-large.icon{line-height:0.9em}.btn .fa.fa-spin,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.btn .rst-content .fa-spin.admonition-title,.rst-content .btn .fa-spin.admonition-title,.btn .rst-content h1 .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.btn .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .btn .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .btn span.fa-spin:first-child,.btn .rst-content code.download span.fa-spin:first-child,.rst-content code.download .btn span.fa-spin:first-child,.btn .fa-spin.icon,.nav .fa.fa-spin,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand,.nav .rst-content .fa-spin.admonition-title,.rst-content .nav .fa-spin.admonition-title,.nav .rst-content h1 .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.nav .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.nav .rst-content code.download span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.nav .fa-spin.icon{display:inline-block}.btn.fa:before,.wy-menu-vertical li span.btn.toctree-expand:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.rst-content code.download span.btn:first-child:before,.btn.icon:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.fa:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.rst-content code.download span.btn:first-child:hover:before,.btn.icon:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.rst-content tt.download .btn-mini span:first-child:before,.btn-mini .rst-content code.download span:first-child:before,.rst-content code.download .btn-mini span:first-child:before,.btn-mini .icon:before{font-size:14px;vertical-align:-15%}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:#6ab0de;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.admonition-todo{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso,.rst-content .admonition-todo{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .admonition-todo .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .admonition-todo .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso,.rst-content .wy-alert-info.admonition-todo{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title,.rst-content .wy-alert-info.admonition-todo .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.admonition-todo{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.admonition-todo .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.admonition-todo{background:#f3f6f6}.wy-alert.wy-alert-neutral .wy-alert-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .admonition-title{color:#404040;background:#e1e4e5}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.admonition-todo a{color:#2980B9}.wy-alert p:last-child,.rst-content .note p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.rst-content .seealso p:last-child,.rst-content .admonition-todo p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0px;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all 0.3s ease-in;-moz-transition:all 0.3s ease-in;transition:all 0.3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27AE60}.wy-tray-container li.wy-tray-item-info{background:#2980B9}.wy-tray-container li.wy-tray-item-warning{background:#E67E22}.wy-tray-container li.wy-tray-item-danger{background:#E74C3C}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width: 768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);background-color:#27AE60;text-decoration:none;font-weight:normal;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset,0px -2px 0px 0px rgba(0,0,0,0.1) inset;outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:0px -1px 0px 0px rgba(0,0,0,0.05) inset,0px 2px 0px 0px rgba(0,0,0,0.1) inset;padding:8px 12px 6px 12px}.btn:visited{color:#fff}.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980B9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-neutral:visited{color:#404040 !important}.btn-success{background-color:#27AE60 !important}.btn-success:hover{background-color:#295 !important}.btn-danger{background-color:#E74C3C !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#E67E22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f !important}.btn-link{background-color:transparent !important;color:#2980B9;box-shadow:none;border-color:transparent !important}.btn-link:hover{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:active{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:visited{color:#9B59B6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980B9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980B9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#E74C3C}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full input[type="text"],.wy-control-group .wy-form-full input[type="password"],.wy-control-group .wy-form-full input[type="email"],.wy-control-group .wy-form-full input[type="url"],.wy-control-group .wy-form-full input[type="date"],.wy-control-group .wy-form-full input[type="month"],.wy-control-group .wy-form-full input[type="time"],.wy-control-group .wy-form-full input[type="datetime"],.wy-control-group .wy-form-full input[type="datetime-local"],.wy-control-group .wy-form-full input[type="week"],.wy-control-group .wy-form-full input[type="number"],.wy-control-group .wy-form-full input[type="search"],.wy-control-group .wy-form-full input[type="tel"],.wy-control-group .wy-form-full input[type="color"],.wy-control-group .wy-form-halves input[type="text"],.wy-control-group .wy-form-halves input[type="password"],.wy-control-group .wy-form-halves input[type="email"],.wy-control-group .wy-form-halves input[type="url"],.wy-control-group .wy-form-halves input[type="date"],.wy-control-group .wy-form-halves input[type="month"],.wy-control-group .wy-form-halves input[type="time"],.wy-control-group .wy-form-halves input[type="datetime"],.wy-control-group .wy-form-halves input[type="datetime-local"],.wy-control-group .wy-form-halves input[type="week"],.wy-control-group .wy-form-halves input[type="number"],.wy-control-group .wy-form-halves input[type="search"],.wy-control-group .wy-form-halves input[type="tel"],.wy-control-group .wy-form-halves input[type="color"],.wy-control-group .wy-form-thirds input[type="text"],.wy-control-group .wy-form-thirds input[type="password"],.wy-control-group .wy-form-thirds input[type="email"],.wy-control-group .wy-form-thirds input[type="url"],.wy-control-group .wy-form-thirds input[type="date"],.wy-control-group .wy-form-thirds input[type="month"],.wy-control-group .wy-form-thirds input[type="time"],.wy-control-group .wy-form-thirds input[type="datetime"],.wy-control-group .wy-form-thirds input[type="datetime-local"],.wy-control-group .wy-form-thirds input[type="week"],.wy-control-group .wy-form-thirds input[type="number"],.wy-control-group .wy-form-thirds input[type="search"],.wy-control-group .wy-form-thirds input[type="tel"],.wy-control-group .wy-form-thirds input[type="color"]{width:100%}.wy-control-group .wy-form-full{float:left;display:block;margin-right:2.35765%;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child{margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n+1){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child{margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control{margin:6px 0 0 0;font-size:90%}.wy-control-no-input{display:inline-block;margin:6px 0 0 0;font-size:90%}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:0.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#333}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#E74C3C;border:1px solid #E74C3C}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#E74C3C}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#E74C3C}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fafafa}input[type="radio"][disabled],input[type="checkbox"][disabled]{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{width:36px;height:12px;margin:12px 0;position:relative;border-radius:4px;background:#ccc;cursor:pointer;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:before{position:absolute;content:"";display:block;width:18px;height:18px;border-radius:4px;background:#999;left:-3px;top:-3px;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:after{content:"false";position:absolute;left:48px;display:block;font-size:12px;color:#ccc}.wy-switch.active{background:#1e8449}.wy-switch.active:before{left:24px;background:#27AE60}.wy-switch.active:after{content:"true"}.wy-switch.disabled,.wy-switch.active.disabled{cursor:not-allowed}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#E74C3C}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 1px #E74C3C}.wy-control-group.wy-control-group-error textarea{border:solid 1px #E74C3C}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27AE60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#E74C3C}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#E67E22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980B9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px}.wy-table td p:last-child,.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child{margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980B9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9B59B6}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#E67E22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980B9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27AE60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#E74C3C !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}h1,h2,.rst-content .toctree-wrapper p.caption,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2,.rst-content .toctree-wrapper p.caption{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}code,.rst-content tt,.rst-content code{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;color:#E74C3C;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li,article ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li p:last-child,.rst-content .section ul li p:last-child,.rst-content .toctree-wrapper ul li p:last-child,article ul li p:last-child{margin-bottom:0}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul,article ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,article ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,article ul li li li{list-style:square}.wy-plain-list-disc li ol li,.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,article ul li ol li{list-style:decimal}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li,article ol li{list-style:decimal;margin-left:24px}.wy-plain-list-decimal li p:last-child,.rst-content .section ol li p:last-child,.rst-content ol.arabic li p:last-child,article ol li p:last-child{margin-bottom:0}.wy-plain-list-decimal li ul,.rst-content .section ol li ul,.rst-content ol.arabic li ul,article ol li ul{margin-bottom:0}.wy-plain-list-decimal li ul li,.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,article ol li ul li{list-style:disc}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9B59B6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],pre.literal-block div[class^='highlight'],.rst-content .literal-block div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}div[class^='highlight'] td.code{width:100%}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;display:block;overflow:auto;color:#404040}@media print{.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#ffc;margin:0 -12px;padding:0 12px;display:block}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#EAF2F5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs li code,.wy-breadcrumbs li .rst-content tt,.rst-content .wy-breadcrumbs li tt{padding:5px;border:none;background:none}.wy-breadcrumbs li code.literal,.wy-breadcrumbs li .rst-content tt.literal,.rst-content .wy-breadcrumbs li tt.literal{color:#404040}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical{width:300px}.wy-menu-vertical header,.wy-menu-vertical p.caption{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;margin-bottom:0;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#555;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li code,.wy-menu-vertical li .rst-content tt,.rst-content .wy-menu-vertical li tt{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:0.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.on a:hover span.toctree-expand,.wy-menu-vertical li.current>a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand{display:block;font-size:0.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current li.toctree-l2>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>ul{display:none}.wy-menu-vertical li.toctree-l1.current li.toctree-l2.current>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3.current>ul{display:block}.wy-menu-vertical li.toctree-l2.current>a{background:#c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{display:block;background:#c9c9c9;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3{font-size:0.9em}.wy-menu-vertical li.toctree-l3.current>a{background:#bdbdbd;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{display:block;background:#bdbdbd;padding:0.4045em 5.663em;border-top:none;border-bottom:none}.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.toctree-l4{font-size:0.9em}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical .local-toc li ul{display:block}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#b3b3b3}.wy-menu-vertical a:active{background-color:#2980B9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{display:block;width:300px;padding:0.809em;margin-bottom:0.809em;z-index:200;background-color:#2980B9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-side-nav-search>a img.logo,.wy-side-nav-search .wy-dropdown>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search>a.icon img.logo,.wy-side-nav-search .wy-dropdown>a.icon img.logo{margin-top:0.85em}.wy-side-nav-search>div.version{margin-top:-0.4045em;margin-bottom:0.809em;font-weight:normal;color:rgba(255,255,255,0.3)}.wy-nav .wy-menu-vertical header{color:#2980B9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980B9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:hidden;min-height:100%;background:#343131;z-index:200}.wy-side-scroll{width:320px;position:relative;overflow-x:hidden;overflow-y:scroll;height:100%}.wy-nav-top{display:none;background:#2980B9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer;padding-top:inherit}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}footer p{margin-bottom:12px}footer span.commit code,footer span.commit .rst-content tt,.rst-content footer span.commit tt{padding:0px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:1em;background:none;border:none;color:#999}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-side-scroll{width:auto}.wy-side-nav-search{width:auto}.wy-menu.wy-menu-vertical{width:auto}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,footer,.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}.rst-content img{max-width:100%;height:auto !important}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure p.caption{font-style:italic}.rst-content div.figure.align-center{text-align:center}.rst-content .section>img,.rst-content .section>a>img{margin-bottom:24px}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last,.rst-content .admonition-todo .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .line-block{margin-left:24px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto;display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content .toctree-wrapper p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content .toctree-wrapper p.caption .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content p.caption .headerlink:after{visibility:visible;content:"";font-family:FontAwesome;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content .toctree-wrapper p.caption:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink,.rst-content p.caption:hover .headerlink{display:inline-block}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#F1C40F;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:super;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:#999}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.docutils.citation tt,.rst-content table.docutils.citation code,.rst-content table.docutils.footnote tt,.rst-content table.docutils.footnote code{color:#555}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none;padding-top:5px}.rst-content table.field-list td>strong{display:inline-block;margin-top:3px}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left;padding-left:0}.rst-content tt,.rst-content tt,.rst-content code{color:#000;padding:2px 5px}.rst-content tt big,.rst-content tt em,.rst-content tt big,.rst-content code big,.rst-content tt em,.rst-content code em{font-size:100% !important;line-height:normal}.rst-content tt.literal,.rst-content tt.literal,.rst-content code.literal{color:#E74C3C}.rst-content tt.xref,a .rst-content tt,.rst-content tt.xref,.rst-content code.xref,a .rst-content tt,a .rst-content code{font-weight:bold;color:#404040}.rst-content a tt,.rst-content a tt,.rst-content a code{color:#2980B9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:inline-block;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980B9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:#555}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) code{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) code.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27AE60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:bold}.rst-content tt.download,.rst-content code.download{background:inherit;padding:inherit;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{margin-right:4px}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}.math{text-align:center}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:400;src:local("Inconsolata"),local("Inconsolata-Regular"),url(../fonts/Inconsolata-Regular.ttf) format("truetype")}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:700;src:local("Inconsolata Bold"),local("Inconsolata-Bold"),url(../fonts/Inconsolata-Bold.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:400;src:local("Lato Regular"),local("Lato-Regular"),url(../fonts/Lato-Regular.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:700;src:local("Lato Bold"),local("Lato-Bold"),url(../fonts/Lato-Bold.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:400;src:local("Roboto Slab Regular"),local("RobotoSlab-Regular"),url(../fonts/RobotoSlab-Regular.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:700;src:local("Roboto Slab Bold"),local("RobotoSlab-Bold"),url(../fonts/RobotoSlab-Bold.ttf) format("truetype")}
-/*# sourceMappingURL=theme.css.map */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "CACE,AAAE,ECQI,iBAAoB,EDPJ,SAAU,ECY1B,cAAiB,EDZD,SAAU,EC2B1B,SAAY,ED3BI,SAAU,EEFlC,uEAAiF,EAC/E,MAAO,EAAE,IAAK,EAEhB,iBAAoB,EAClB,MAAO,EAAE,WAAY,EACrB,OAAQ,EAAE,KAAM,EAChB,IAAK,EAAE,AAAC,EAEV,oBAAqB,EACnB,MAAO,EAAE,GAAI,EAEf,OAAQ,EACN,MAAO,EAAE,GAAI,EAEf,AAAC,EDLO,iBAAoB,ECMd,SAAU,EDDhB,cAAiB,ECCX,SAAU,EDchB,SAAY,ECdN,SAAU,EAExB,GAAI,EACF,QAAS,EAAE,GAAI,EACf,uBAAwB,EAAE,GAAI,EAC9B,mBAAoB,EAAE,GAAI,EAE5B,GAAI,EACF,KAAM,EAAE,AAAC,EAEX,eAAiB,EACf,MAAO,EAAE,AAAC,EAEZ,UAAW,EACT,YAAa,EAAE,SAAU,EAE3B,OAAS,EACP,UAAW,EAAE,GAAI,EAEnB,SAAU,EACR,KAAM,EAAE,AAAC,EAEX,EAAG,EACD,SAAU,EAAE,KAAM,EAGpB,EAAG,EACD,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAI,EACX,cAAe,EAAE,GAAI,EAEvB,GAAI,EACF,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAI,EACX,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,GAAI,EAEnB,kDAAoB,EAClB,UAAW,EAAE,cAAS,EACtB,WAAY,EAAE,sBAAa,EAC3B,QAAS,EAAE,EAAG,EAEhB,EAAG,EACD,UAAW,EAAE,EAAG,EAElB,AAAC,EACC,KAAM,EAAE,GAAI,EAEd,eAAiB,EACf,MAAO,EAAE,CAAE,EACX,MAAO,EAAE,GAAI,EAEf,IAAK,EACH,QAAS,EAAE,EAAG,EAEhB,MAAQ,EACN,QAAS,EAAE,EAAG,EACd,UAAW,EAAE,AAAC,EACd,OAAQ,EAAE,OAAQ,EAClB,aAAc,EAAE,OAAQ,EAE1B,EAAG,EACD,EAAG,EAAE,KAAM,EAEb,EAAG,EACD,KAAM,EAAE,MAAO,EAEjB,OAAU,EACR,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,GAAI,EAChB,eAAgB,EAAE,GAAI,EAExB,CAAE,EACA,SAAU,EAAE,GAAI,EAElB,CAAE,EACA,KAAM,EAAE,AAAC,EAEX,EAAG,EACD,KAAM,EAAE,AAAC,EACT,qBAAsB,EAAE,MAAO,EAC/B,aAAc,EAAE,KAAM,EACtB,QAAS,EAAE,GAAI,EAEjB,aAAc,EACZ,OAAQ,EAAE,KAAM,EAElB,KAAM,EACJ,KAAM,EAAE,AAAC,EAEX,GAAI,EACF,KAAM,EAAE,AAAC,EAEX,OAAQ,EACN,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EAEZ,IAAK,EACH,KAAM,EAAE,MAAO,EAEjB,KAAM,EACJ,KAAM,EAAE,AAAC,EACT,WAAY,EAAE,GAAI,EAClB,MAAO,EAAE,AAAC,EACV,UAAW,EAAE,KAAM,EAErB,2BAA+B,EAC7B,QAAS,EAAE,GAAI,EACf,KAAM,EAAE,AAAC,EACT,aAAc,EAAE,OAAQ,EACxB,cAAe,EAAE,KAAM,EAEzB,WAAa,EACX,UAAW,EAAE,KAAM,EAErB,mEAAuE,EACrE,KAAM,EAAE,MAAO,EACf,iBAAkB,EAAE,KAAM,EAC1B,QAAS,EAAE,MAAO,EAEpB,+BAAiC,EAC/B,KAAM,EAAE,MAAO,EAEjB,yCAA2C,EACzC,SAAU,EAAE,SAAU,EACtB,MAAO,EAAE,AAAC,EACV,KAAM,EAAE,GAAI,EACZ,MAAO,EAAE,GAAI,EAEf,mBAAoB,EAClB,iBAAkB,EAAE,QAAS,EAC7B,cAAe,EAAE,UAAW,EAC5B,iBAAkB,EAAE,UAAW,EAC/B,SAAU,EAAE,UAAW,EAEzB,iGAAmG,EACjG,iBAAkB,EAAE,GAAI,EAE1B,+CAAiD,EAC/C,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EAEZ,OAAQ,EACN,OAAQ,EAAE,GAAI,EACd,aAAc,EAAE,EAAG,EACnB,KAAM,EAAE,OAAQ,EAElB,IAAK,EACH,cAAe,EAAE,OAAQ,EACzB,aAAc,EAAE,AAAC,EAEnB,CAAE,EACA,aAAc,EAAE,EAAG,EAErB,WAAY,EACV,KAAM,EAAE,MAAO,EACf,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAK,EACZ,MAAO,EAAE,MAAO,EAElB,EAAG,EACD,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,AAAC,EACT,UAAW,EAAE,KAAM,EACnB,OAAQ,EAAE,KAAM,EAChB,eAAgB,EAAE,UAAW,EAC7B,gBAAiB,EAAE,QAAS,EAC5B,SAAU,EAAE,GAAI,EAChB,QAAS,EAAE,EAAG,EACd,WAAY,EAAE,AAAC,EAEjB,KAAM,EACJ,MAAO,EAAE,GAAI,EAEf,MAAO,EACL,MAAO,EAAE,cAAe,EACxB,SAAU,EAAE,KAAM,EAEpB,cAAe,EACb,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,YAAa,EACnB,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,GAAI,EACZ,OAAQ,EAAE,KAAM,EAChB,MAAO,EAAE,AAAC,EACV,OAAQ,EAAE,OAAQ,EAClB,IAAK,EAAE,EAAG,EAEZ,+DAAiE,EAC/D,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,KAAM,EAAE,AAAC,EACT,OAAQ,EAAE,MAAO,EACjB,OAAQ,EAAE,KAAM,EAChB,IAAK,EAAE,GAAI,EAEb,SAAU,EACR,SAAU,EAAE,KAAM,EAEpB,QAAS,EACP,OAAQ,EAAE,OAAQ,EAEpB,QAAU,EACR,QAAS,EAAE,GAAI,EAEjB,WAAY,EACV,gBAAmB,EACjB,SAAU,EAAE,cAAe,EAC7B,AAAC,EACC,SAAU,EAAE,cAAe,EAC3B,UAAW,EAAE,cAAe,EAC5B,KAAM,EAAE,cAAe,EACvB,SAAU,EAAE,cAAe,EAC7B,UAAY,EACV,cAAe,EAAE,QAAS,EAC5B,0DAA6D,EAC3D,MAAO,EAAE,CAAE,EACb,aAAe,EACb,gBAAiB,EAAE,IAAK,EAC1B,IAAK,EACH,MAAO,EAAE,iBAAkB,EAC7B,KAAO,EACL,gBAAiB,EAAE,IAAK,EAC1B,EAAG,EACD,QAAS,EAAE,cAAe,QAE1B,KAAM,EAAE,IAAK,EAEf,8CAAS,EACP,MAAO,EAAE,AAAC,EACV,KAAM,EAAE,AAAC,EACX,4CAAM,EACJ,eAAgB,EAAE,IAAK,GChM3B,ykDAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI;;;GC1Gf,UAUC,CATC,WAAW,CAAE,aAAa,CAC1B,GAAG,CAAE,+CAAgE,CACrE,GAAG,CAAE,sSAAmG,CAKxG,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CCTpB,kfAAmB,CACjB,OAAO,CAAE,YAAY,CACrB,IAAI,CAAE,uCAAuC,CAC7C,SAAS,CAAE,OAAO,CAClB,cAAc,CAAE,IAAI,CACpB,sBAAsB,CAAE,WAAW,CACnC,uBAAuB,CAAE,SAAS,CCLpC,MAAsB,CACpB,SAAS,CAAE,SAAS,CACpB,WAAW,CAAE,MAAS,CACtB,cAAc,CAAE,IAAI,CAEtB,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CCVtC,MAAsB,CACpB,KAAK,CAAE,SAAW,CAClB,UAAU,CAAE,MAAM,CCDpB,MAAsB,CACpB,YAAY,CAAE,CAAC,CACf,WAAW,CCIU,SAAS,CDH9B,eAAe,CAAE,IAAI,CACrB,SAAK,CAAE,QAAQ,CAAE,QAAQ,CAE3B,MAAsB,CACpB,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,UAAa,CACnB,KAAK,CCHgB,SAAS,CDI9B,GAAG,CAAE,SAAU,CACf,UAAU,CAAE,MAAM,CAClB,YAAuB,CACrB,IAAI,CAAE,UAA0B,CEbpC,UAA0B,CACxB,OAAO,CAAE,gBAAgB,CACzB,MAAM,CAAE,iBAA4B,CACpC,aAAa,CAAE,IAAI,CAGrB,WAAY,CAAE,KAAK,CAAE,KAAK,CAC1B,UAAW,CAAE,KAAK,CAAE,IAAI,CAGtB,kpBAAY,CAAE,YAAY,CAAE,IAAI,CAChC,kqBAAa,CAAE,WAAW,CAAE,IAAI,CCXlC,QAAwB,CACtB,iBAAiB,CAAE,0BAA0B,CACrC,SAAS,CAAE,0BAA0B,CAG/C,0BASC,CARC,EAAG,CACD,iBAAiB,CAAE,YAAY,CACvB,SAAS,CAAE,YAAY,CAEjC,IAAK,CACH,iBAAiB,CAAE,cAAc,CACzB,SAAS,CAAE,cAAc,EAIrC,kBASC,CARC,EAAG,CACD,iBAAiB,CAAE,YAAY,CACvB,SAAS,CAAE,YAAY,CAEjC,IAAK,CACH,iBAAiB,CAAE,cAAc,CACzB,SAAS,CAAE,cAAc,ECvBrC,aAA8B,CCU5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,aAAgB,CAC/B,aAAa,CAAE,aAAgB,CAC3B,SAAS,CAAE,aAAgB,CDZrC,cAA8B,CCS5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,cAAgB,CAC/B,aAAa,CAAE,cAAgB,CAC3B,SAAS,CAAE,cAAgB,CDXrC,cAA8B,CCQ5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,cAAgB,CAC/B,aAAa,CAAE,cAAgB,CAC3B,SAAS,CAAE,cAAgB,CDTrC,mBAAmC,CCajC,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,YAAoB,CACnC,aAAa,CAAE,YAAoB,CAC/B,SAAS,CAAE,YAAoB,CDfzC,iBAAmC,CCYjC,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,YAAoB,CACnC,aAAa,CAAE,YAAoB,CAC/B,SAAS,CAAE,YAAoB,CDVzC,+GAIuC,CACrC,MAAM,CAAE,IAAI,CEfd,SAAyB,CACvB,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,YAAY,CACrB,KAAK,CAAE,GAAG,CACV,MAAM,CAAE,GAAG,CACX,WAAW,CAAE,GAAG,CAChB,cAAc,CAAE,MAAM,CAExB,yBAAyD,CACvD,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,UAAU,CAAE,MAAM,CAEpB,YAA4B,CAAE,WAAW,CAAE,OAAO,CAClD,YAA4B,CAAE,SAAS,CAAE,GAAG,CAC5C,WAA2B,CAAE,KAAK,CLXZ,IAAI,CML1B,gBAAgC,CAAE,OAAO,CNwP1B,GAAO,CMvPtB,gBAAgC,CAAE,OAAO,CNkV1B,GAAO,CMjVtB,qCAAiC,CAAE,OAAO,CNyZ1B,GAAO,CMxZvB,qBAAqC,CAAE,OAAO,CN2K1B,GAAO,CM1K3B,gBAAgC,CAAE,OAAO,CNqQ1B,GAAO,CMpQtB,eAA+B,CAAE,OAAO,CNkc1B,GAAO,CMjcrB,iBAAiC,CAAE,OAAO,CNsc1B,GAAO,CMrcvB,eAA+B,CAAE,OAAO,CN0gB1B,GAAO,CMzgBrB,eAA+B,CAAE,OAAO,CN+M1B,GAAO,CM9MrB,mBAAmC,CAAE,OAAO,CN8d1B,GAAO,CM7dzB,aAA6B,CAAE,OAAO,CN4d1B,GAAO,CM3dnB,kBAAkC,CAAE,OAAO,CN6d1B,GAAO,CM5dxB,gBAAgC,CAAE,OAAO,CN+F1B,GAAO,CM9FtB,mDAEgC,CAAE,OAAO,CNge1B,GAAO,CM/dtB,sBAAsC,CAAE,OAAO,CN6Y1B,GAAO,CM5Y5B,uBAAuC,CAAE,OAAO,CN2Y1B,GAAO,CM1Y7B,oBAAoC,CAAE,OAAO,CNqW1B,GAAO,CMpW1B,iBAAiC,CAAE,OAAO,CNwZ1B,GAAO,CMvZvB,8BAC8B,CAAE,OAAO,CNmH1B,GAAO,CMlHpB,kBAAkC,CAAE,OAAO,CNoe1B,GAAO,CMnexB,iCAA+B,CAAE,OAAO,CNqP1B,GAAO,CMpPrB,iBAAiC,CAAE,OAAO,CNmL1B,GAAO,CMlLvB,kBAAkC,CAAE,OAAO,CNqG1B,GAAO,CMpGxB,eAA+B,CAAE,OAAO,CNqX1B,GAAO,CMpXrB,uHAAmC,CAAE,OAAO,CNyI1B,GAAO,CMxIzB,8BAA8C,CAAE,OAAO,CNG1B,GAAO,CMFpC,4BAA4C,CAAE,OAAO,CNK1B,GAAO,CMJlC,gBAAgC,CAAE,OAAO,CNmP1B,GAAO,CMlPtB,wBAAwC,CAAE,OAAO,CNkV1B,GAAO,CMjV9B,yCACiC,CAAE,OAAO,CNyW1B,GAAO,CMxWvB,kBAAkC,CAAE,OAAO,CNoW1B,GAAO,CMnWxB,mBAAmC,CAAE,OAAO,CNiR1B,GAAO,CMhRzB,eAA+B,CAAE,OAAO,CNoR1B,GAAO,CMnRrB,eAA+B,CAAE,OAAO,CNsL1B,GAAO,CMrLrB,qBAAqC,CAAE,OAAO,CNkO1B,GAAO,CMjO3B,qBAAqC,CAAE,OAAO,CNkf1B,GAAO,CMjf3B,sBAAsC,CAAE,OAAO,CNgf1B,GAAO,CM/e5B,oBAAoC,CAAE,OAAO,CNif1B,GAAO,CMhf1B,iBAAiC,CAAE,OAAO,CNiV1B,GAAO,CMhVvB,kBAAkC,CAAE,OAAO,CNU1B,GAAO,CMTxB,cAA8B,CAAE,OAAO,CNkb1B,GAAO,CMjbpB,eAA+B,CAAE,OAAO,CNkb1B,GAAO,CMjbrB,iCAA+B,CAAE,OAAO,CNyB1B,GAAO,CMxBrB,mBAAmC,CAAE,OAAO,CNyB1B,GAAO,CMxBzB,gBAAgC,CAAE,OAAO,CNwU1B,GAAO,CMvUtB,iBAAiC,CAAE,OAAO,CNqC1B,GAAO,CMpCvB,eAA+B,CAAE,OAAO,CNoL1B,GAAO,CMnLrB,eAA+B,CAAE,OAAO,CNiB1B,GAAO,CMhBrB,iBAAiC,CAAE,OAAO,CNqO1B,GAAO,CMpOvB,sBAAsC,CAAE,OAAO,CN+a1B,GAAO,CM9a5B,qBAAqC,CAAE,OAAO,CN+a1B,GAAO,CM9a3B,qBAAqC,CAAE,OAAO,CN3C1B,GAAO,CM4C3B,uBAAuC,CAAE,OAAO,CN9C1B,GAAO,CM+C7B,sBAAsC,CAAE,OAAO,CN5C1B,GAAO,CM6C5B,wBAAwC,CAAE,OAAO,CN/C1B,GAAO,CMgD9B,eAA+B,CAAE,OAAO,CNwP1B,GAAO,CMvPrB,oCACkC,CAAE,OAAO,CN0R1B,GAAO,CMzRxB,iBAAiC,CAAE,OAAO,CNoN1B,GAAO,CMnNvB,uBAAuC,CAAE,OAAO,CNqd1B,GAAO,CMpd7B,sDAEoC,CAAE,OAAO,CNsS1B,GAAO,CMrS1B,iBAAiC,CAAE,OAAO,CN+R1B,GAAO,CM9RvB,qBAAqC,CAAE,OAAO,CN+P1B,GAAO,CM9P3B,iBAAiC,CAAE,OAAO,CN7D1B,GAAO,CM8DvB,eAA+B,CAAE,OAAO,CN4a1B,GAAO,CM3arB,0CAC0C,CAAE,OAAO,CN4R1B,GAAO,CM3RhC,yBAAyC,CAAE,OAAO,CN2V1B,GAAO,CM1V/B,yBAAyC,CAAE,OAAO,CNqC1B,GAAO,CMpC/B,iBAAiC,CAAE,OAAO,CNlC1B,GAAO,CMmCvB,wBAAwC,CAAE,OAAO,CNmY1B,GAAO,CMlY9B,wBAAwC,CAAE,OAAO,CNkH1B,GAAO,CMjH9B,mBAAmC,CAAE,OAAO,CN9B1B,GAAO,CM+BzB,eAA+B,CAAE,OAAO,CNgS1B,GAAO,CM/RrB,gBAAgC,CAAE,OAAO,CN+Q1B,GAAO,CM9QtB,eAA+B,CAAE,OAAO,CNiY1B,GAAO,CMhYrB,kBAAkC,CAAE,OAAO,CNqJ1B,GAAO,CMpJxB,uBAAuC,CAAE,OAAO,CN6G1B,GAAO,CM5G7B,uBAAuC,CAAE,OAAO,CN4X1B,GAAO,CM3X7B,gBAAgC,CAAE,OAAO,CNoF1B,GAAO,CMnFtB,uBAAuC,CAAE,OAAO,CN+B1B,GAAO,CM9B7B,wBAAwC,CAAE,OAAO,CN+B1B,GAAO,CM9B9B,sBAAsC,CAAE,OAAO,CN4R1B,GAAO,CM3R5B,uBAAuC,CAAE,OAAO,CNkP1B,GAAO,CMjP7B,8FAAuC,CAAE,OAAO,CNsZ1B,GAAO,CMrZ7B,+FAAuC,CAAE,OAAO,CNiB1B,GAAO,CMhB7B,0BAA0C,CAAE,OAAO,CNiS1B,GAAO,CMhShC,sBAAsC,CAAE,OAAO,CNuL1B,GAAO,CMtL5B,qBAAqC,CAAE,OAAO,CNuD1B,GAAO,CMtD3B,yBAAyC,CAAE,OAAO,CNkZ1B,GAAO,CMjZ/B,yBAAyC,CAAE,OAAO,CNa1B,GAAO,CMZ/B,cAA8B,CAAE,OAAO,CNhD1B,GAAO,CMiDpB,qBAAqC,CAAE,OAAO,CN5D1B,GAAO,CM6D3B,sBAAsC,CAAE,OAAO,CN5D1B,GAAO,CM6D5B,mBAAmC,CAAE,OAAO,CN5D1B,GAAO,CM6DzB,qBAAqC,CAAE,OAAO,CNhE1B,GAAO,CMiE3B,wCACgC,CAAE,OAAO,CNyT1B,GAAO,CMxTtB,iBAAiC,CAAE,OAAO,CN+E1B,GAAO,CM9EvB,mBAAmC,CAAE,OAAO,CNuC1B,GAAO,CMtCzB,eAA+B,CAAE,OAAO,CNyQ1B,GAAO,CMxQrB,gBAAgC,CAAE,OAAO,CN+N1B,GAAO,CM9NtB,mBAAmC,CAAE,OAAO,CN/D1B,GAAO,CMgEzB,gNAA6C,CAAE,OAAO,CNwE1B,GAAO,CMvEnC,eAA+B,CAAE,OAAO,CNmI1B,GAAO,CMlIrB,eAA+B,CAAE,OAAO,CNqL1B,GAAO,CMpLrB,iCAA+B,CAAE,OAAO,CNyG1B,GAAO,CMxGrB,cAA8B,CAAE,OAAO,CNyE1B,GAAO,CMxEpB,oBAAoC,CAAE,OAAO,CNyE1B,GAAO,CMxE1B,kDAC+C,CAAE,OAAO,CNkE1B,GAAO,CMjErC,gBAAgC,CAAE,OAAO,CNyP1B,GAAO,CMxPtB,mBAAmC,CAAE,OAAO,CNlC1B,GAAO,CMmCzB,iBAAiC,CAAE,OAAO,CN0Q1B,GAAO,CMzQvB,kBAAkC,CAAE,OAAO,CNmB1B,GAAO,CMlBxB,iBAAiC,CAAE,OAAO,CNqM1B,GAAO,CMpMvB,qBAAqC,CAAE,OAAO,CNH1B,GAAO,CMI3B,uBAAuC,CAAE,OAAO,CNP1B,GAAO,CMQ7B,kBAAkC,CAAE,OAAO,CNiR1B,GAAO,CMhRxB,wBAAwC,CAAE,OAAO,CN2S1B,GAAO,CM1S9B,iBAAiC,CAAE,OAAO,CNoG1B,GAAO,CMnGvB,sBAAsC,CAAE,OAAO,CNqG1B,GAAO,CMpG5B,mBAAmC,CAAE,OAAO,CNpF1B,GAAO,CMqFzB,mBAAmC,CAAE,OAAO,CNtF1B,GAAO,CMuFzB,2CACoC,CAAE,OAAO,CNhF1B,GAAO,CMiF1B,yBAAyC,CAAE,OAAO,CNkY1B,GAAO,CMjY/B,0BAA0C,CAAE,OAAO,CNyD1B,GAAO,CMxDhC,uBAAuC,CAAE,OAAO,CN/C1B,GAAO,CMgD7B,cAA8B,CAAE,OAAO,CNsJ1B,GAAO,CMrJpB,gCAC+B,CAAE,OAAO,CNA1B,GAAO,CMCrB,mBAAmC,CAAE,OAAO,CNG1B,GAAO,CMFzB,sBAAsC,CAAE,OAAO,CNiW1B,GAAO,CMhW5B,wBAAwC,CAAE,OAAO,CN+V1B,GAAO,CM9V9B,oBAAoC,CAAE,OAAO,CN2T1B,GAAO,CM1T1B,kBAAkC,CAAE,OAAO,CN4H1B,GAAO,CM3HxB,mBAAmC,CAAE,OAAO,CN2R1B,GAAO,CM1RzB,0BAA0C,CAAE,OAAO,CNiK1B,GAAO,CMhKhC,qBAAqC,CAAE,OAAO,CNwV1B,GAAO,CMvV3B,wBAAwC,CAAE,OAAO,CNsC1B,GAAO,CMrC9B,kBAAkC,CAAE,OAAO,CNsR1B,GAAO,CMrRxB,iBAAiC,CAAE,OAAO,CNyW1B,GAAO,CMxWvB,wBAAwC,CAAE,OAAO,CNiG1B,GAAO,CMhG9B,iBAAiC,CAAE,OAAO,CNyX1B,GAAO,CMxXvB,kBAAkC,CAAE,OAAO,CN+I1B,GAAO,CM9IxB,gBAAgC,CAAE,OAAO,CN6M1B,GAAO,CM5MtB,mBAAmC,CAAE,OAAO,CN2S1B,GAAO,CM1SzB,qBAAqC,CAAE,OAAO,CNjF1B,GAAO,CMkF3B,uBAAuC,CAAE,OAAO,CN2M1B,GAAO,CM1M7B,kBAAkC,CAAE,OAAO,CNyW1B,GAAO,CMxWxB,mBAAmC,CAAE,OAAO,CNgC1B,GAAO,CM/BzB,qCAAiC,CAAE,OAAO,CNsF1B,GAAO,CMrFvB,iBAAiC,CAAE,OAAO,CN6W1B,GAAO,CM5WvB,sBAAsC,CAAE,OAAO,CNb1B,GAAO,CMc5B,cAA8B,CAAE,OAAO,CNmP1B,GAAO,CMlPpB,gBAAgC,CAAE,OAAO,CNoG1B,GAAO,CMnGtB,mBAAmC,CAAE,OAAO,CNpF1B,GAAO,CMqFzB,eAA+B,CAAE,OAAO,CN1G1B,GAAO,CM2GrB,sBAAsC,CAAE,OAAO,CN7D1B,GAAO,CM8D5B,uBAAuC,CAAE,OAAO,CN8F1B,GAAO,CM7F7B,sBAAsC,CAAE,OAAO,CN4F1B,GAAO,CM3F5B,oBAAoC,CAAE,OAAO,CN6F1B,GAAO,CM5F1B,sBAAsC,CAAE,OAAO,CNyF1B,GAAO,CMxF5B,2DAA4C,CAAE,OAAO,CN5I1B,GAAO,CM6IlC,6DAA6C,CAAE,OAAO,CNxI1B,GAAO,CMyInC,0BAA0C,CAAE,OAAO,CNxI1B,GAAO,CMyIhC,4BAA4C,CAAE,OAAO,CNhJ1B,GAAO,CMiJlC,gBAAgC,CAAE,OAAO,CN2E1B,GAAO,CM1EtB,iBAAiC,CAAE,OAAO,CNqX1B,GAAO,CMpXvB,gBAAgC,CAAE,OAAO,CNgT1B,GAAO,CM/StB,iBAAiC,CAAE,OAAO,CNuC1B,GAAO,CMtCvB,oBAAoC,CAAE,OAAO,CNxG1B,GAAO,CMyG1B,qBAAqC,CAAE,OAAO,CNzI1B,GAAO,CM0I3B,iCACgC,CAAE,OAAO,CN8V1B,GAAO,CM7VtB,kDAC+B,CAAE,OAAO,CNwH1B,GAAO,CMvHrB,gBAAgC,CAAE,OAAO,CNxD1B,GAAO,CMyDtB,gBAAgC,CAAE,OAAO,CNsC1B,GAAO,CMrCtB,kCACmC,CAAE,OAAO,CN+N1B,GAAO,CM9NzB,kCACkC,CAAE,OAAO,CNyB1B,GAAO,CMxBxB,oBAAoC,CAAE,OAAO,CN8J1B,GAAO,CM7J1B,mCACmC,CAAE,OAAO,CNiC1B,GAAO,CMhCzB,iBAAiC,CAAE,OAAO,CNkQ1B,GAAO,CMjQvB,qDAE+B,CAAE,OAAO,CN9I1B,GAAO,CM+IrB,kBAAkC,CAAE,OAAO,CNiH1B,GAAO,CMhHxB,kBAAkC,CAAE,OAAO,CN+G1B,GAAO,CM9GxB,wBAAwC,CAAE,OAAO,CN4Q1B,GAAO,CM3Q9B,oBAAoC,CAAE,OAAO,CNgU1B,GAAO,CM/T1B,gBAAgC,CAAE,OAAO,CNkR1B,GAAO,CMjRtB,gBAAgC,CAAE,OAAO,CNmH1B,GAAO,CMlHtB,gBAAgC,CAAE,OAAO,CNmT1B,GAAO,CMlTtB,oBAAoC,CAAE,OAAO,CNgK1B,GAAO,CM/J1B,2BAA2C,CAAE,OAAO,CNgK1B,GAAO,CM/JjC,6BAA6C,CAAE,OAAO,CN8C1B,GAAO,CM7CnC,sBAAsC,CAAE,OAAO,CN4C1B,GAAO,CM3C5B,gBAAgC,CAAE,OAAO,CNgI1B,GAAO,CM/HtB,wEAAqC,CAAE,OAAO,CNxH1B,GAAO,CMyH3B,mBAAmC,CAAE,OAAO,CNlH1B,GAAO,CMmHzB,qBAAqC,CAAE,OAAO,CNzH1B,GAAO,CM0H3B,sBAAsC,CAAE,OAAO,CNzH1B,GAAO,CM0H5B,kBAAkC,CAAE,OAAO,CN3E1B,GAAO,CM4ExB,mCAC+B,CAAE,OAAO,CN4N1B,GAAO,CM3NrB,yCACoC,CAAE,OAAO,CNgO1B,GAAO,CM/N1B,sCACmC,CAAE,OAAO,CN6N1B,GAAO,CM5NzB,mBAAmC,CAAE,OAAO,CN/C1B,GAAO,CMgDzB,mBAAmC,CAAE,OAAO,CNmF1B,GAAO,CMlFzB,sCAC+B,CAAE,OAAO,CN0S1B,GAAO,CMzSrB,iCACgC,CAAE,OAAO,CNW1B,GAAO,CMVtB,0CACqC,CAAE,OAAO,CN0P1B,GAAO,CMzP3B,oBAAoC,CAAE,OAAO,CNxF1B,GAAO,CMyF1B,qBAAqC,CAAE,OAAO,CNvF1B,GAAO,CMwF3B,gCAC+B,CAAE,OAAO,CNlK1B,GAAO,CMmKrB,kBAAkC,CAAE,OAAO,CNoM1B,GAAO,CMnMxB,mBAAmC,CAAE,OAAO,CN8R1B,GAAO,CM7RzB,qCACoC,CAAE,OAAO,CN9G1B,GAAO,CM+G1B,sBAAsC,CAAE,OAAO,CNiE1B,GAAO,CMhE5B,mBAAmC,CAAE,OAAO,CN1D1B,GAAO,CM2DzB,yBAAyC,CAAE,OAAO,CN7G1B,GAAO,CM8G/B,uBAAuC,CAAE,OAAO,CN7G1B,GAAO,CM8G7B,kBAAkC,CAAE,OAAO,CNkS1B,GAAO,CMjSxB,sBAAsC,CAAE,OAAO,CNgO1B,GAAO,CM/N5B,mBAAmC,CAAE,OAAO,CNqO1B,GAAO,CMpOzB,iBAAiC,CAAE,OAAO,CNxL1B,GAAO,CMyLvB,iBAAiC,CAAE,OAAO,CN7G1B,GAAO,CM8GvB,kBAAkC,CAAE,OAAO,CN3F1B,GAAO,CM4FxB,sBAAsC,CAAE,OAAO,CNpC1B,GAAO,CMqC5B,qBAAqC,CAAE,OAAO,CNzK1B,GAAO,CM0K3B,qBAAqC,CAAE,OAAO,CNqB1B,GAAO,CMpB3B,oBAAoC,CAAE,OAAO,CN3O1B,GAAO,CM4O1B,iBAAiC,CAAE,OAAO,CN4E1B,GAAO,CM3EvB,sBAAsC,CAAE,OAAO,CNxD1B,GAAO,CMyD5B,eAA+B,CAAE,OAAO,CNrM1B,GAAO,CMsMrB,mBAAmC,CAAE,OAAO,CNG1B,GAAO,CMFzB,sBAAsC,CAAE,OAAO,CNuH1B,GAAO,CMtH5B,4BAA4C,CAAE,OAAO,CN5O1B,GAAO,CM6OlC,6BAA6C,CAAE,OAAO,CN5O1B,GAAO,CM6OnC,0BAA0C,CAAE,OAAO,CN5O1B,GAAO,CM6OhC,4BAA4C,CAAE,OAAO,CNhP1B,GAAO,CMiPlC,qBAAqC,CAAE,OAAO,CN5O1B,GAAO,CM6O3B,sBAAsC,CAAE,OAAO,CN5O1B,GAAO,CM6O5B,mBAAmC,CAAE,OAAO,CN5O1B,GAAO,CM6OzB,qBAAqC,CAAE,OAAO,CNhP1B,GAAO,CMiP3B,kBAAkC,CAAE,OAAO,CNxG1B,GAAO,CMyGxB,iBAAiC,CAAE,OAAO,CNyB1B,GAAO,CMxBvB,iBAAiC,CAAE,OAAO,CNmN1B,GAAO,CMlNvB,yCACiC,CAAE,OAAO,CNmE1B,GAAO,CMlEvB,mBAAmC,CAAE,OAAO,CNlJ1B,GAAO,CMmJzB,qBAAqC,CAAE,OAAO,CNiH1B,GAAO,CMhH3B,sBAAsC,CAAE,OAAO,CNiH1B,GAAO,CMhH5B,kBAAkC,CAAE,OAAO,CNiL1B,GAAO,CMhLxB,iBAAiC,CAAE,OAAO,CNvJ1B,GAAO,CMwJvB,sCACgC,CAAE,OAAO,CNyH1B,GAAO,CMxHtB,qBAAqC,CAAE,OAAO,CN9B1B,GAAO,CM+B3B,mBAAmC,CAAE,OAAO,CNjD1B,GAAO,CMkDzB,wBAAwC,CAAE,OAAO,CNhD1B,GAAO,CMiD9B,kBAAkC,CAAE,OAAO,CN2J1B,GAAO,CM1JxB,kBAAkC,CAAE,OAAO,CN9C1B,GAAO,CM+CxB,gBAAgC,CAAE,OAAO,CN+C1B,GAAO,CM9CtB,kBAAkC,CAAE,OAAO,CN9C1B,GAAO,CM+CxB,qBAAqC,CAAE,OAAO,CNI1B,GAAO,CMH3B,iBAAiC,CAAE,OAAO,CN9D1B,GAAO,CM+DvB,yBAAyC,CAAE,OAAO,CNhE1B,GAAO,CMiE/B,mBAAmC,CAAE,OAAO,CNsM1B,GAAO,CMrMzB,eAA+B,CAAE,OAAO,CN1J1B,GAAO,CM2JrB,8CACoC,CAAE,OAAO,CN4G1B,GAAO,CM3G1B,2EAEsC,CAAE,OAAO,CNwK1B,GAAO,CMvK5B,yBAAyC,CAAE,OAAO,CNmB1B,GAAO,CMlB/B,eAA+B,CAAE,OAAO,CNjJ1B,GAAO,CMkJrB,oBAAoC,CAAE,OAAO,CNjK1B,GAAO,CMkK1B,yCACuC,CAAE,OAAO,CN9L1B,GAAO,CM+L7B,mBAAmC,CAAE,OAAO,CNmF1B,GAAO,CMlFzB,eAA+B,CAAE,OAAO,CNvB1B,GAAO,CMwBrB,sBAAsC,CAAE,OAAO,CNvH1B,GAAO,CMwH5B,sBAAsC,CAAE,OAAO,CN6K1B,GAAO,CM5K5B,oBAAoC,CAAE,OAAO,CNyK1B,GAAO,CMxK1B,iBAAiC,CAAE,OAAO,CN9H1B,GAAO,CM+HvB,uBAAuC,CAAE,OAAO,CN0E1B,GAAO,CMzE7B,qBAAqC,CAAE,OAAO,CNwB1B,GAAO,CMvB3B,2BAA2C,CAAE,OAAO,CNwB1B,GAAO,CMvBjC,iBAAiC,CAAE,OAAO,CNqH1B,GAAO,CMpHvB,qBAAqC,CAAE,OAAO,CN9N1B,GAAO,CM+N3B,4BAA4C,CAAE,OAAO,CN1F1B,GAAO,CM2FlC,iBAAiC,CAAE,OAAO,CN2F1B,GAAO,CM1FvB,iBAAiC,CAAE,OAAO,CNc1B,GAAO,CMbvB,8BAA8C,CAAE,OAAO,CNtM1B,GAAO,CMuMpC,+BAA+C,CAAE,OAAO,CNtM1B,GAAO,CMuMrC,4BAA4C,CAAE,OAAO,CNtM1B,GAAO,CMuMlC,8BAA8C,CAAE,OAAO,CN1M1B,GAAO,CM2MpC,gBAAgC,CAAE,OAAO,CN7C1B,GAAO,CM8CtB,eAA+B,CAAE,OAAO,CNtK1B,GAAO,CMuKrB,iBAAiC,CAAE,OAAO,CN9S1B,GAAO,CM+SvB,qBAAqC,CAAE,OAAO,CN+M1B,GAAO,CM9M3B,mBAAmC,CAAE,OAAO,CN/O1B,GAAO,CMgPzB,qBAAqC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ3B,qBAAqC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ3B,qBAAqC,CAAE,OAAO,CNmF1B,GAAO,CMlF3B,sBAAsC,CAAE,OAAO,CN6C1B,GAAO,CM5C5B,iBAAiC,CAAE,OAAO,CN0K1B,GAAO,CMzKvB,uBAAuC,CAAE,OAAO,CNO1B,GAAO,CMN7B,wIAAyC,CAAE,OAAO,CNO1B,GAAO,CMN/B,mBAAmC,CAAE,OAAO,CN/B1B,GAAO,CMgCzB,qBAAqC,CAAE,OAAO,CNjC1B,GAAO,CMkC3B,uBAAuC,CAAE,OAAO,CN3N1B,GAAO,CM4N7B,wBAAwC,CAAE,OAAO,CNyB1B,GAAO,CMxB9B,+BAA+C,CAAE,OAAO,CNlJ1B,GAAO,CMmJrC,uBAAuC,CAAE,OAAO,CNuF1B,GAAO,CMtF7B,kBAAkC,CAAE,OAAO,CN9L1B,GAAO,CM+LxB,qDAC8C,CAAE,OAAO,CNnP1B,GAAO,CMoPpC,iDAC4C,CAAE,OAAO,CNlP1B,GAAO,CMmPlC,uDAC+C,CAAE,OAAO,CNrP1B,GAAO,CMsPrC,8BAC8B,CAAE,OAAO,CNpK1B,GAAO,CMqKpB,cAA8B,CAAE,OAAO,CNzG1B,GAAO,CM0GpB,gCAC8B,CAAE,OAAO,CNwL1B,GAAO,CMvLpB,+BAC8B,CAAE,OAAO,CNrE1B,GAAO,CMsEpB,2DAG8B,CAAE,OAAO,CNnE1B,GAAO,CMoEpB,iDAE8B,CAAE,OAAO,CNqD1B,GAAO,CMpDpB,6BAC8B,CAAE,OAAO,CNpE1B,GAAO,CMqEpB,iCAC8B,CAAE,OAAO,CN1R1B,GAAO,CM2RpB,eAA+B,CAAE,OAAO,CNlK1B,GAAO,CMmKrB,oBAAoC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ1B,yBAAyC,CAAE,OAAO,CN4E1B,GAAO,CM3E/B,0BAA0C,CAAE,OAAO,CN4E1B,GAAO,CM3EhC,0BAA0C,CAAE,OAAO,CN4E1B,GAAO,CM3EhC,2BAA2C,CAAE,OAAO,CN4E1B,GAAO,CM3EjC,2BAA2C,CAAE,OAAO,CN+E1B,GAAO,CM9EjC,4BAA4C,CAAE,OAAO,CN+E1B,GAAO,CM9ElC,oBAAoC,CAAE,OAAO,CN+H1B,GAAO,CM9H1B,sBAAsC,CAAE,OAAO,CN2H1B,GAAO,CM1H5B,yBAAyC,CAAE,OAAO,CN4L1B,GAAO,CM3L/B,kBAAkC,CAAE,OAAO,CNyL1B,GAAO,CMxLxB,eAA+B,CAAE,OAAO,CNmL1B,GAAO,CMlLrB,sBAAsC,CAAE,OAAO,CNmL1B,GAAO,CMlL5B,uBAAuC,CAAE,OAAO,CNuL1B,GAAO,CMtL7B,kBAAkC,CAAE,OAAO,CN/M1B,GAAO,CMgNxB,yBAAyC,CAAE,OAAO,CNgF1B,GAAO,CM/E/B,oBAAoC,CAAE,OAAO,CNjG1B,GAAO,CMkG1B,iBAAiC,CAAE,OAAO,CNxJ1B,GAAO,CMyJvB,cAA8B,CAAE,OAAO,CNhX1B,GAAO,CMiXpB,2CAAoC,CAAE,OAAO,CNzT1B,GAAO,CM0T1B,2BAA2C,CAAE,OAAO,CNzT1B,GAAO,CM0TjC,iBAAiC,CAAE,OAAO,CNqI1B,GAAO,CMpIvB,wBAAwC,CAAE,OAAO,CNqI1B,GAAO,CMpI9B,0BAA0C,CAAE,OAAO,CNrE1B,GAAO,CMsEhC,wBAAwC,CAAE,OAAO,CNnE1B,GAAO,CMoE9B,0BAA0C,CAAE,OAAO,CNtE1B,GAAO,CMuEhC,2BAA2C,CAAE,OAAO,CNtE1B,GAAO,CMuEjC,gBAAgC,CAAE,OAAO,CNxW1B,GAAO,CMyWtB,kBAAkC,CAAE,OAAO,CN8J1B,GAAO,CM7JxB,kBAAkC,CAAE,OAAO,CNpX1B,GAAO,CMqXxB,gBAAgC,CAAE,OAAO,CNnF1B,GAAO,CMoFtB,mBAAmC,CAAE,OAAO,CNjO1B,GAAO,CMkOzB,gBAAgC,CAAE,OAAO,CNsC1B,GAAO,CMrCtB,qBAAqC,CAAE,OAAO,CNhK1B,GAAO,CMiK3B,iBAAiC,CAAE,OAAO,CNmH1B,GAAO,CMlHvB,iBAAiC,CAAE,OAAO,CNxM1B,GAAO,CMyMvB,eAA+B,CAAE,OAAO,CNzE1B,GAAO,CM0ErB,iBAAiC,CAAE,OAAO,CNrJ1B,GAAO,CMsJvB,gBAAgC,CAAE,OAAO,CN2E1B,GAAO,CM1EtB,iBAAiC,CAAE,OAAO,CN7D1B,GAAO,CM8DvB,kBAAkC,CAAE,OAAO,CNpX1B,GAAO,CMqXxB,cAA8B,CAAE,OAAO,CNpU1B,GAAO,CMqUpB,aAA6B,CAAE,OAAO,CNsI1B,GAAO,CMrInB,gBAAgC,CAAE,OAAO,CN2I1B,GAAO,CM1ItB,iBAAiC,CAAE,OAAO,CNX1B,GAAO,CMYvB,oBAAoC,CAAE,OAAO,CN5D1B,GAAO,CM6D1B,yBAAyC,CAAE,OAAO,CNgD1B,GAAO,CM/C/B,+BAA+C,CAAE,OAAO,CNrX1B,GAAO,CMsXrC,8BAA8C,CAAE,OAAO,CNvX1B,GAAO,CMwXpC,qDAC8C,CAAE,OAAO,CN5T1B,GAAO,CM6TpC,uBAAuC,CAAE,OAAO,CNvP1B,GAAO,CMwP7B,qBAAqC,CAAE,OAAO,CNoI1B,GAAO,CMnI3B,uBAAuC,CAAE,OAAO,CNyH1B,GAAO,CMxH7B,sCAC8B,CAAE,OAAO,CNiG1B,GAAO,CMhGpB,wEAAwC,CAAE,OAAO,CNzC1B,GAAO,CM0C9B,wBAAwC,CAAE,OAAO,CN+B1B,GAAO,CM9B9B,gBAAgC,CAAE,OAAO,CNa1B,GAAO,CMZtB,0BAA0C,CAAE,OAAO,CNnP1B,GAAO,CMoPhC,oBAAoC,CAAE,OAAO,CNgI1B,GAAO,CM/H1B,iBAAiC,CAAE,OAAO,CN9E1B,GAAO,CM+EvB,4DAEqC,CAAE,OAAO,CNmG1B,GAAO,CMlG3B,iDACyC,CAAE,OAAO,CN3K1B,GAAO,CM4K/B,gBAAgC,CAAE,OAAO,CN6H1B,GAAO,CM5HtB,iBAAiC,CAAE,OAAO,CNjL1B,GAAO,CMkLvB,iBAAiC,CAAE,OAAO,CNxC1B,GAAO,CMyCvB,wBAAwC,CAAE,OAAO,CNxC1B,GAAO,CMyC9B,6BAA6C,CAAE,OAAO,CNuC1B,GAAO,CMtCnC,sBAAsC,CAAE,OAAO,CNqC1B,GAAO,CMpC5B,oBAAoC,CAAE,OAAO,CNlR1B,GAAO,CMmR1B,eAA+B,CAAE,OAAO,CNhR1B,GAAO,CMiRrB,qBAAqC,CAAE,OAAO,CNxE1B,GAAO,CMyE3B,yBAAyC,CAAE,OAAO,CNxE1B,GAAO,CMyE/B,iBAAiC,CAAE,OAAO,CN7Q1B,GAAO,CM8QvB,iBAAiC,CAAE,OAAO,CN3J1B,GAAO,CM4JvB,mBAAmC,CAAE,OAAO,CNtJ1B,GAAO,CMuJzB,cAA8B,CAAE,OAAO,CNtP1B,GAAO,CMuPpB,mBAAmC,CAAE,OAAO,CN3W1B,GAAO,CM4WzB,gBAAgC,CAAE,OAAO,CNjU1B,GAAO,CMkUtB,cAA8B,CAAE,OAAO,CN1F1B,GAAO,CM2FpB,gBAAgC,CAAE,OAAO,CNM1B,GAAO,CMLtB,eAA+B,CAAE,OAAO,CNrS1B,GAAO,CMsSrB,gBAAgC,CAAE,OAAO,CNrS1B,GAAO,CMsStB,kBAAkC,CAAE,OAAO,CNtY1B,GAAO,CMuYxB,yBAAyC,CAAE,OAAO,CNtY1B,GAAO,CMuY/B,gBAAgC,CAAE,OAAO,CNa1B,GAAO,CMZtB,uBAAuC,CAAE,OAAO,CNa1B,GAAO,CMZ7B,kBAAkC,CAAE,OAAO,CN/D1B,GAAO,CMgExB,oCAC8B,CAAE,OAAO,CN5W1B,GAAO,CM6WpB,8BAC+B,CAAE,OAAO,CN2B1B,GAAO,CM1BrB,eAA+B,CAAE,OAAO,CNoD1B,GAAO,CMnDrB,kBAAkC,CAAE,OAAO,CNN1B,GAAO,CMOxB,qBAAqC,CAAE,OAAO,CNzS1B,GAAO,CM0S3B,qBAAqC,CAAE,OAAO,CNZ1B,GAAO,CMa3B,mBAAmC,CAAE,OAAO,CN/S1B,GAAO,CMgTzB,qBAAqC,CAAE,OAAO,CNhQ1B,GAAO,CMiQ3B,sBAAsC,CAAE,OAAO,CNzP1B,GAAO,CM0P5B,uBAAuC,CAAE,OAAO,CNtQ1B,GAAO,CMuQ7B,4BAA4C,CAAE,OAAO,CNhQ1B,GAAO,CMiQlC,yEAEuC,CAAE,OAAO,CNzQ1B,GAAO,CM0Q7B,+CACyC,CAAE,OAAO,CN/Q1B,GAAO,CMgR/B,+CACuC,CAAE,OAAO,CNhR1B,GAAO,CMiR7B,+CACuC,CAAE,OAAO,CNrQ1B,GAAO,CMsQ7B,sBAAsC,CAAE,OAAO,CNlR1B,GAAO,CMmR5B,eAA+B,CAAE,OAAO,CN4D1B,GAAO,CM3DrB,kBAAkC,CAAE,OAAO,CNrV1B,GAAO,CMsVxB,mBAAmC,CAAE,OAAO,CNhM1B,GAAO,CMiMzB,uGAIoC,CAAE,OAAO,CNtL1B,GAAO,CMuL1B,yBAAyC,CAAE,OAAO,CNvW1B,GAAO,CMwW/B,8BACgC,CAAE,OAAO,CNlG1B,GAAO,CMmGtB,+BACiC,CAAE,OAAO,CN1T1B,GAAO,CM2TvB,qBAAqC,CAAE,OAAO,CNpP1B,GAAO,CMqP3B,cAA8B,CAAE,OAAO,CNtP1B,GAAO,CMuPpB,sBAAsC,CAAE,OAAO,CNxO1B,GAAO,CMyO5B,wBAAwC,CAAE,OAAO,CNR1B,GAAO,CMS9B,aAA6B,CAAE,OAAO,CNjH1B,GAAO,CMkHnB,mCACiC,CAAE,OAAO,CNiD1B,GAAO,CMhDvB,sCACsC,CAAE,OAAO,CNrJ1B,GAAO,CMsJ5B,0CACwC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ9B,kBAAkC,CAAE,OAAO,CNvO1B,GAAO,CMwOxB,sBAAsC,CAAE,OAAO,CNvX1B,GAAO,CMwX5B,iBAAiC,CAAE,OAAO,CN7O1B,GAAO,CM8OvB,oBAAoC,CAAE,OAAO,CNxJ1B,GAAO,CMyJ1B,kBAAkC,CAAE,OAAO,CNvE1B,GAAO,CMwExB,oBAAoC,CAAE,OAAO,CNtF1B,GAAO,CMuF1B,2BAA2C,CAAE,OAAO,CNtF1B,GAAO,CMuFjC,eAA+B,CAAE,OAAO,CNnb1B,GAAO,CMobrB,4CACmC,CAAE,OAAO,CNjR1B,GAAO,CMkRzB,cAA8B,CAAE,OAAO,CNI1B,GAAO,CMHpB,qBAAqC,CAAE,OAAO,CN9b1B,GAAO,CM+b3B,eAA+B,CAAE,OAAO,CN5I1B,GAAO,CM6IrB,qBAAqC,CAAE,OAAO,CN/E1B,GAAO,CMgF3B,iBAAiC,CAAE,OAAO,CNI1B,GAAO,CMHvB,eAA+B,CAAE,OAAO,CNuC1B,GAAO,CMtCrB,sBAAsC,CAAE,OAAO,CN7K1B,GAAO,CM8K5B,eAA+B,CAAE,OAAO,CN6B1B,GAAO,CM5BrB,qBAAqC,CAAE,OAAO,CNjb1B,GAAO,CMkb3B,iBAAiC,CAAE,OAAO,CNpK1B,GAAO,CMqKvB,wBAAwC,CAAE,OAAO,CNzQ1B,GAAO,CM0Q9B,kBAAkC,CAAE,OAAO,CNha1B,GAAO,CMiaxB,wBAAwC,CAAE,OAAO,CNpa1B,GAAO,CMqa9B,sBAAsC,CAAE,OAAO,CNta1B,GAAO,CMua5B,kBAAkC,CAAE,OAAO,CNxa1B,GAAO,CMyaxB,oBAAoC,CAAE,OAAO,CNta1B,GAAO,CMua1B,oBAAoC,CAAE,OAAO,CNta1B,GAAO,CMua1B,qBAAqC,CAAE,OAAO,CNjd1B,GAAO,CMkd3B,uBAAuC,CAAE,OAAO,CNjd1B,GAAO,CMkd7B,gBAAgC,CAAE,OAAO,CNtB1B,GAAO,CMuBtB,oBAAoC,CAAE,OAAO,CN9X1B,GAAO,CM+X1B,aAA6B,CAAE,OAAO,CNne1B,GAAO,CMoenB,qBAAqC,CAAE,OAAO,CNtV1B,GAAO,CMuV3B,sBAAsC,CAAE,OAAO,CN1L1B,GAAO,CM2L5B,wBAAwC,CAAE,OAAO,CNpd1B,GAAO,CMqd9B,qBAAqC,CAAE,OAAO,CNzf1B,GAAO,CM0f3B,oBAAoC,CAAE,OAAO,CN7K1B,GAAO,CM8K1B,qBAAqC,CAAE,OAAO,CNzO1B,GAAO,CM0O3B,iBAAiC,CAAE,OAAO,CNtP1B,GAAO,CMuPvB,wBAAwC,CAAE,OAAO,CNtP1B,GAAO,CMuP9B,qBAAqC,CAAE,OAAO,CNrC1B,GAAO,CMsC3B,oBAAoC,CAAE,OAAO,CNrC1B,GAAO,CMsC1B,kBAAkC,CAAE,OAAO,CN9d1B,GAAO,CM+dxB,cAA8B,CAAE,OAAO,CN5c1B,GAAO,CM6cpB,kBAAkC,CAAE,OAAO,CNtQ1B,GAAO,CMuQxB,oBAAoC,CAAE,OAAO,CN9gB1B,GAAO,CM+gB1B,aAA6B,CAAE,OAAO,CN/b1B,GAAO,CMgcnB,kDAE8B,CAAE,OAAO,CNpR1B,GAAO,CMqRpB,mBAAmC,CAAE,OAAO,CN/N1B,GAAO,COtUzB,swBAAK,CACH,WAAW,CAAE,OAAO,CACpB,y5BAAQ,CACN,WAAW,CC+BuB,aAAa,CD9B/C,OAAO,CAAE,YAAY,CACrB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,CAAC,CACd,eAAe,CAAE,OAAO,CAM5B,86BAAkB,CAChB,OAAO,CAAE,YAAY,CACrB,eAAe,CAAE,OAAO,CAGxB,muEAAgB,CACd,OAAO,CAAE,MAAM,CACf,2wEAAuB,CACrB,WAAW,CAAE,KAAI,CACnB,utEAAsB,CACpB,OAAO,CAAE,YAAY,CAE3B,2iBAA2B,CACzB,OAAO,CAAE,GAAE,CfpBL,kBAAoB,CAAE,qBAAM,CAK5B,eAAiB,CAAE,qBAAM,CAezB,UAAY,CAAE,qBAAM,CeE5B,+nBAAiC,CAC/B,OAAO,CAAE,CAAC,CAGV,mtCAAuB,CACrB,SAAS,CAAE,IAAI,CACf,cAAc,CAAE,IAAI,CEpBxB,0PAAS,CACP,OAAO,CAAE,IAAqB,CAC9B,WAAW,CDayB,IAAI,CCZxC,aAAa,CDYuB,IAAI,CCXxC,UAAU,CAAE,OAAmB,CAEjC,8CAAe,CACb,KAAK,CCY+B,IAAM,CDX1C,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CCS+B,IAAM,CDR1C,UAAU,CAAE,OAAkB,CAC9B,MAAM,CAAE,KAAsB,CAC9B,OAAO,CAAE,QAA2C,CACpD,aAAa,CAAE,IAAqB,CAEtC,0ZAAyB,CACvB,UAAU,CAAE,OAAkB,CAC9B,mxCAAe,CACb,UAAU,CAAE,OAAiB,CACjC,kYAA0B,CACxB,UAAU,CAAE,OAAmB,CAC/B,ouCAAe,CACb,UAAU,CAAE,OAAoB,CAEpC,sYAAuB,CACrB,UAAU,CAAE,OAAmB,CAC/B,yuCAAe,CACb,UAAU,CAAE,OAAkB,CAElC,mZAA0B,CACxB,UAAU,CAAE,OAAuB,CACnC,swCAAe,CACb,UAAU,CAAE,OAAqB,CAErC,scAA0B,CACxB,UAAU,CCL0B,OAAmB,CDMvD,42CAAe,CACb,KAAK,CCvB6B,OAAW,CDwB7C,UAAU,CCNwB,OAAmB,CDOvD,8dAAC,CACC,KAAK,CChB6B,OAAK,CDkB3C,sZAAsB,CACpB,aAAa,CAAE,CAAC,CAsBlB,kBAAkB,CAChB,QAAQ,CAAE,KAAK,CACf,MAAM,CAAE,GAAG,CACX,IAAI,CAAE,CAAC,CACP,OAAO,CDG6B,GAAG,CCFvC,qBAAE,CACA,OAAO,CAAE,KAAK,CACd,KAAK,CDT6B,KAAK,CCUvC,UAAU,CAAE,WAAW,CACvB,KAAK,CCxD6B,IAAM,CDyDxC,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,2BAA0B,CACtC,OAAO,CAAE,MAAmB,CAC5B,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,CAAC,CACT,WAAW,CAAE,IAAI,CACjB,QAAQ,CAAE,MAAM,CjB3FZ,kBAAoB,CAAE,gBAAM,CAK5B,eAAiB,CAAE,gBAAM,CAezB,UAAY,CAAE,gBAAM,CiByExB,0CAAsB,CACpB,UAAU,CC5FsB,OAAM,CD6FxC,uCAAmB,CACjB,UAAU,CC/DsB,OAAK,CDgEvC,0CAAsB,CACpB,UAAU,CDnFsB,OAAO,CCoFzC,yCAAqB,CACnB,UAAU,CDtEsB,OAAI,CCuEtC,wBAAI,CACF,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,IAAI,CEhFd,oCAAsB,CFmFxB,kBAAkB,CAChB,MAAM,CAAE,IAAI,CACZ,GAAG,CAAE,CAAC,CACN,KAAK,CAAE,IAAI,CACX,qBAAE,CACA,KAAK,CAAE,IAAI,EG3FjB,MAAM,CACJ,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,QAAQ,CACxB,eAAe,CAAE,MAAM,CACvB,MAAM,CAAE,OAAO,CACf,WAAW,CAAE,MAAM,CACnB,kBAAkB,CAAE,MAAM,CAC1B,SAAS,CAAE,OAAO,CACpB,gDAAiD,CAC/C,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACZ,gBAAgB,CACd,MAAM,CAAE,OAAO,CAEjB,IAAI,CAEF,OAAO,CAAE,YAAY,CACrB,aAAa,CAAE,GAAG,CAClB,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,MAAM,CAAE,OAAO,CACf,SAAS,CAAE,IAAI,CACf,OAAO,CAAE,iBAA6F,CACtG,KAAK,CFlB+B,IAAM,CEmB1C,MAAM,CAAE,yBAAyB,CACjC,gBAAgB,CF7CoB,OAAM,CE8C1C,eAAe,CAAE,IAAI,CACrB,WAAW,CAAE,MAAM,CACnB,WAAW,CFJyB,uDAAM,CEK1C,UAAU,CAAE,mFAA8C,CAC1D,YAAY,CAAE,KAAK,CACnB,cAAc,CAAE,MAAM,CACtB,QAAQ,CAAE,MAAM,CAChB,IAAI,CAAE,CAAC,CACP,iBAAiB,CAAE,IAAI,CpBxDjB,mBAAoB,CoByDb,IAAI,CpBpDX,gBAAiB,CoBoDV,IAAI,CpB/CX,eAAgB,CoB+CT,IAAI,CpBrCX,WAAY,CoBqCL,IAAI,CpBzDX,kBAAoB,CAAE,eAAM,CAK5B,eAAiB,CAAE,eAAM,CAezB,UAAY,CAAE,eAAM,CoByC5B,UAAU,CACR,UAAU,CAAE,OAAwB,CACpC,KAAK,CFpC+B,IAAM,CEuC1C,UAAO,CACL,UAAU,CAAE,OAAqC,CACjD,KAAK,CFzC6B,IAAM,CE0C1C,UAAO,CACL,UAAU,CAAE,OAAqC,CACjD,OAAO,CAAE,CAAC,CACZ,WAAQ,CACN,UAAU,CAAE,6EAAyC,CACrD,OAAO,CAAE,iBAA6F,CACxG,YAAS,CACP,KAAK,CFjD6B,IAAM,CEkD1C,aAAU,CACR,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAEpB,aAAa,CACX,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAChB,4DAA0B,CACxB,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAI,CACb,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAGpB,sBAAsB,CACpB,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,CAAC,CAEX,UAAU,CACR,SAAS,CAAE,GAAG,CAEhB,SAAS,CACP,gBAAgB,CAAE,kBAAgB,CAClC,eAAO,CACL,gBAAgB,CAAE,kBAA6B,CAEnD,YAAY,CACV,gBAAgB,CAAE,kBAA2C,CAC7D,KAAK,CAAE,kBAAsB,CAC7B,kBAAO,CACL,gBAAgB,CAAE,kBAAuD,CACzE,KAAK,CF/F6B,OAAW,CEgG/C,oBAAS,CACP,KAAK,CAAE,kBAAsB,CAEjC,YAAY,CACV,gBAAgB,CAAE,kBAAiB,CACnC,kBAAO,CACL,gBAAgB,CAAE,eAA6B,CAEnD,WAAW,CACT,gBAAgB,CAAE,kBAAe,CACjC,iBAAO,CACL,gBAAgB,CAAE,kBAA4B,CAElD,YAAY,CACV,gBAAgB,CAAE,kBAAkB,CACpC,kBAAO,CACL,gBAAgB,CAAE,kBAA+B,CACrD,WAAW,CACT,gBAAgB,CJvIoB,IAAI,CIwIxC,iBAAO,CACL,gBAAgB,CAAE,kBAAoC,CAE1D,SAAS,CACP,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CF9G+B,OAAK,CE+GzC,UAAU,CAAE,IAAI,CAChB,YAAY,CAAE,sBAAsB,CACpC,eAAO,CACL,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CAAE,kBAAoC,CAC3C,UAAU,CAAE,IAAI,CAClB,gBAAQ,CACN,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CAAE,kBAAoC,CAC3C,UAAU,CAAE,IAAI,CAClB,iBAAS,CACP,KAAK,CFzH6B,OAAO,CE2H7C,mCAAoC,CAClC,cAAc,CAAE,MAAM,CAExB,aAAa,CACX,aAAa,CJ1IuB,IAAI,CduExC,KAAK,CAAE,CAAC,CACR,wCAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,mBAAO,CACL,KAAK,CAAE,IAAI,CmB3Ff,YAAY,CACV,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,YAAY,CAIvB,qCAAqC,CACnC,OAAO,CAAE,KAAK,CAChB,iBAAiB,CACf,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,CAAC,CACP,OAAO,CAAE,IAAI,CACb,KAAK,CAAE,IAAI,CACX,GAAG,CAAE,IAAI,CACT,SAAS,CAAE,IAAI,CACf,UAAU,CHQ0B,OAAyB,CGP7D,OAAO,CLmD6B,GAAG,CKlDvC,MAAM,CAAE,iBAAgC,CACxC,UAAU,CAAE,2BAA0B,CACtC,OAAO,CAAE,IAAqB,CAC9B,sBAAQ,CACN,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,KAAK,CHT6B,OAAW,CGU7C,WAAW,CAAE,MAAM,CACnB,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,MAAuB,CAChC,MAAM,CAAE,OAAO,CACf,4BAAO,CACL,UAAU,CHLsB,OAAK,CGMrC,KAAK,CHZ2B,IAAM,CGa1C,4BAAY,CACV,UAAU,CAAE,iBAAgC,CAC5C,MAAM,CAAE,KAAuB,CACjC,2BAAW,CACT,cAAc,CAAE,IAAqB,CACrC,gDAAoB,CAClB,KAAK,CAAE,IAAI,CACf,mCAAmB,CACjB,UAAU,CAAE,OAA4B,CACxC,cAAc,CAAE,SAAS,CACzB,WAAW,CAAE,GAAG,CAChB,SAAS,CAAE,GAAG,CACd,yCAAO,CACL,UAAU,CAAE,OAA4B,CAC1C,wCAAI,CACF,KAAK,CH5B2B,IAAM,CG8B5C,6CAA6C,CAC3C,MAAM,CAAE,IAAI,CACZ,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,IAAI,CACV,KAAK,CAAE,CAAC,CAGR,iDAAiB,CACf,UAAU,CHjCwB,OAAyB,CGkC3D,UAAU,CAAE,GAAG,CACjB,mDAAmB,CACjB,OAAO,CAAE,QAA2C,CACpD,yDAAO,CACL,UAAU,CHrCsB,OAAK,CGsCrC,KAAK,CH5C2B,IAAM,CG8C5C,+CAA+C,CAC7C,KAAK,CAAE,CAAC,CACR,IAAI,CAAE,IAAI,CACV,UAAU,CAAE,KAAK,CAGjB,yBAAQ,CACN,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,iBAA0B,CACzC,WAAW,CAAE,qBAAqB,CAClC,YAAY,CAAE,qBAAqB,CACnC,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,KAAK,CACd,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,GAAG,CACT,WAAW,CAAE,IAAI,CACnB,gDAA+B,CAC7B,IAAI,CAAE,IAAI,CCtEZ,uBAAM,CACJ,OAAO,CAAE,KAAK,CAEhB,gIAA+C,CAC7C,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,MAAM,CAChB,KAAK,CAAE,CAAC,CACR,cAAc,CAAE,MAAM,CAItB,wCAAO,CACL,OAAO,CAAE,YAAY,CACrB,cAAc,CAAE,MAAM,CACtB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,YAA+C,CACvD,KAAK,CAAE,IAAI,CACf,4BAAW,CACT,KAAK,CAAE,IAAI,CACX,kCAAK,CACH,OAAO,CAAE,KAAK,CAChB,mCAAM,CACJ,UAAU,CAAE,GAAqB,CAEvC,QAAQ,CACN,MAAM,CAAE,CAAC,CACT,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACZ,MAAM,CACJ,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACV,WAAW,CAAE,MAAM,CACnB,aAAa,CN/BuB,IAAI,CMgCxC,SAAS,CAAE,IAAI,CACf,YAAY,CAAE,IAAI,CACpB,KAAK,CACH,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,cAAa,CACrB,KAAK,CNR+B,IAAU,CMS9C,SAAS,CAAE,GAAG,CAEhB,qBAAuB,CACrB,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,QAAQ,CACxB,eAAe,CAAE,MAAM,CAGzB,iBAAiB,CACf,aAAa,CNhDuB,IAAI,CduExC,KAAK,CAAE,CAAC,CqBrGR,SAAS,CCCC,IAAQ,CDChB,WAAI,CAAE,IAAI,CACV,YAAK,CAAE,IAAI,CrBkGb,KAAK,CAAE,CAAC,CACR,gDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,uBAAO,CACL,KAAK,CAAE,IAAI,CALb,gDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,uBAAO,CACL,KAAK,CAAE,IAAI,CoBzBf,uDAAyD,CACvD,OAAO,CAAE,IAAI,CACb,KAAK,CN/C+B,OAAI,CMoDxC,mGAA+C,CAC7C,cAAc,CAAE,IAAqB,CACrC,wHAAM,CACJ,KAAK,CAAE,IAAI,CAEX,0tEAAqP,CACnP,KAAK,CAAE,IAAI,CACnB,+BAA+B,CGlF3B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,IAAuC,CCnB5C,YAAoB,CAAE,CAAC,CDqBzB,0CAAa,CACX,YAAoB,CAAE,CAAC,CHgE/B,iCAAiC,CGtF7B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,SAAuC,CAE9C,4CAAa,CACX,YAAoB,CAAE,CAAC,CCA7B,iDAAwB,CACtB,YAAoB,CAAE,CAAC,CAEvB,mDAA0B,CACxB,KAAK,CALY,IAAkC,CJqEzD,iCAAiC,CG1F7B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,SAAuC,CAE9C,4CAAa,CACX,YAAoB,CAAE,CAAC,CCA7B,iDAAwB,CACtB,YAAoB,CAAE,CAAC,CAEvB,mDAA0B,CACxB,KAAK,CALY,IAAkC,CJ0EzD,uDAAuD,CACrD,MAAM,CAAE,SAA2B,CACnC,SAAS,CAAE,GAAG,CAEhB,oBAAoB,CAClB,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,SAA2B,CACnC,SAAS,CAAE,GAAG,CAOZ,osBAAqP,CACnP,KAAK,CAAE,IAAI,CAIjB,uBAAuB,CACrB,OAAO,CAAE,YAAY,CACrB,YAAY,CAAE,KAAK,CACnB,KAAK,CAAE,IAAI,CACX,cAAc,CAAE,MAAM,CACtB,SAAS,CAAE,GAAG,CAEhB,gBAAgB,CACd,OAAO,CAAE,KAAK,CACd,KAAK,CJxH+B,IAAW,CIyH/C,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,QAAO,CACnB,UAAU,CAAE,MAAM,CAClB,kBAAC,CACC,SAAS,CAAE,OAAO,CAClB,UAAU,CAAE,MAAM,CAClB,aAAa,CAAE,GAAqB,CACtC,6BAAY,CACV,aAAa,CAAE,CAAC,CA4DpB,KAAK,CACH,WAAW,CAAE,MAAM,CAGnB,6DAAmD,CACjD,kBAAkB,CAAE,MAAM,CAC1B,MAAM,CAAE,OAAO,CACf,WAAW,CJhKuB,uDAAM,CIiKxC,SAAS,CAAE,OAAO,CACpB,gSAAqP,CACnP,kBAAkB,CAAE,IAAI,CACxB,OAAO,CAAE,GAAqB,CAC9B,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,cAA6B,CACrC,SAAS,CAAE,GAAG,CACd,WAAW,CJxKuB,uDAAM,CIyKxC,UAAU,CAAE,oBAAmC,CAC/C,aAAa,CAAE,CAAC,CtBxNZ,kBAAoB,CAAE,kBAAM,CAK5B,eAAiB,CAAE,kBAAM,CAezB,UAAY,CAAE,kBAAM,CsBuM1B,4BAAwB,CACtB,OAAO,CAAE,iBAAkB,CAC7B,eAAW,CACT,MAAM,CAAE,OAAO,CACjB,0CAAmC,CtB/N7B,kBAAoB,CsBgOZ,UAAU,CtB3NlB,eAAiB,CsB2NT,UAAU,CtB5MlB,UAAY,CsB4MJ,UAAU,CACtB,OAAO,CAAE,CAAC,CACV,YAAY,CAAE,QAAO,CACrB,OAAO,CAAE,IAAI,CACb,MAAM,CAAE,IAAI,CACd,oBAAgB,CtBrOV,kBAAoB,CsBsOZ,UAAU,CtBjOlB,eAAiB,CsBiOT,UAAU,CtBlNlB,UAAY,CsBkNJ,UAAU,CACtB,kGAA6D,CAC3D,kBAAkB,CAAE,IAAI,CAC5B,oXAAyU,CACvU,OAAO,CAAE,CAAC,CACV,OAAO,CAAE,cAAc,CACvB,YAAY,CNxLsB,IAAU,CMyL9C,oBAAgB,CACd,YAAY,CAAE,eAA8B,CAC9C,+EAAqE,CACnE,OAAO,CAAE,gBAAsB,CAC/B,OAAO,CAAE,gBAAgB,CAC3B,4aAAiY,CAC/X,MAAM,CAAE,WAAW,CACnB,gBAAgB,CAAE,OAAmC,CAEzD,+DAAiE,CAC/D,KAAK,CNzN+B,OAAI,CM0NxC,MAAM,CAAE,iBAAc,CACxB,iFAAmF,CACjF,YAAY,CN5NwB,OAAI,CM8NxC,yHAA+G,CAC7G,aAAa,CN/NqB,OAAI,CMiO1C,oBAAoB,CAClB,OAAO,CAAE,IAAqB,CAC9B,SAAS,CAAE,IAAI,CAKjB,QAAQ,CACN,QAAQ,CAAE,IAAI,CACd,cAAc,CAAE,GAAG,CACnB,KAAK,CAAE,IAAI,CACX,WAAW,CJ5NyB,uDAAM,CI6N5C,eAAgB,CACd,OAAO,CAAE,aAAgB,CACzB,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,cAA6B,CACrC,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,oBAAmC,CtBhRzC,kBAAoB,CAAE,kBAAM,CAK5B,eAAiB,CAAE,kBAAM,CAezB,UAAY,CAAE,kBAAM,CsB+P5B,MAAM,CACJ,MAAM,CAAE,cAA6B,CACrC,gBAAgB,CJ1PoB,IAAM,CI2P1C,gBAAW,CACT,MAAM,CAAE,IAAI,CAChB,2BAA4B,CAC1B,OAAO,CAAE,CAAC,CACZ,uFAA2F,CACzF,MAAM,CAAE,WAAW,CACnB,gBAAgB,CAAE,OAAmC,CAKrD,8DAAuD,CACrD,MAAM,CAAE,WAAW,CACvB,sBAAuB,CACrB,MAAM,CAAE,KAAuB,CAE/B,KAAK,CJ/Q+B,OAAW,CIgR/C,OAAO,CAAE,KAAK,CACd,kCAAK,CACH,cAAc,CAAE,QAAQ,CAI5B,uBAAuB,CACrB,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,MAAM,CAChB,KAAK,CAAE,CAAC,CACR,cAAc,CAAE,MAAM,CAuBxB,iCAAkC,CAChC,WAAW,CAAE,MAAM,CACnB,OAAO,CAAE,GAAqB,CAC9B,qEAAiB,CACf,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,YAAY,CACrB,SAAS,CAAE,GAAG,CACd,gBAAgB,CJzSkB,OAAmB,CI0SrD,MAAM,CAAE,cAA6B,CACrC,KAAK,CJxU6B,IAAW,CI0UjD,kCAAkC,CAChC,WAAW,CAAE,CAAC,CAChB,kCAAkC,CAChC,YAAY,CAAE,CAAC,CAcjB,UAAU,CACR,KAAK,CAAE,IAAuB,CAC9B,MAAM,CAAE,IAAqB,CAC7B,MAAM,CAAE,MAAwB,CAChC,QAAQ,CAAE,QAAQ,CAClB,aAAa,CAAE,GAAG,CAClB,UAAU,CNrW0B,IAAI,CMsWxC,MAAM,CAAE,OAAO,CtB5WT,kBAAoB,CAAE,oBAAM,CAK5B,eAAiB,CAAE,oBAAM,CAezB,UAAY,CAAE,oBAAM,CsB0V1B,iBAAQ,CACN,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,EAAE,CACX,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,aAAa,CAAE,GAAG,CAClB,UAAU,CJ3WwB,IAAW,CI4W7C,IAAI,CAAE,IAAI,CACV,GAAG,CAAE,IAAI,CtBvXL,kBAAoB,CAAE,oBAAM,CAK5B,eAAiB,CAAE,oBAAM,CAezB,UAAY,CAAE,oBAAM,CsBqW1B,gBAAO,CACL,OAAO,CAAE,OAAO,CAChB,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,IAAqB,CAC3B,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,IAAI,CACf,KAAK,CNzX6B,IAAI,CM0X1C,iBAAiB,CACf,UAAU,CAAE,OAAmB,CAC/B,wBAAQ,CACN,IAAI,CN5W8B,IAAI,CM6WtC,UAAU,CJlYwB,OAAM,CImY1C,uBAAO,CACL,OAAO,CAAE,MAAM,CAEnB,8CAA+C,CAC7C,MAAM,CAAE,WAAW,CAiDnB,wGAAyB,CACvB,KAAK,CN7Z6B,OAAI,CM+ZtC,81BAAqP,CACnP,MAAM,CAAE,iBAAc,CAC1B,iDAAQ,CACN,MAAM,CAAE,iBAAc,CAE1B,mBAAmB,CACjB,WAAW,CAAE,MAAM,CACnB,qCAAiB,CACf,OAAO,CAAE,aAAgB,CACzB,OAAO,CAAE,YAAY,CACrB,SAAS,CAAE,GAAG,CAClB,gEAAgE,CAC9D,KAAK,CJvc+B,OAAM,CI0c5C,+DAA+D,CAC7D,KAAK,CN/a+B,OAAI,CMkb1C,gEAAgE,CAC9D,KAAK,CNlc+B,OAAO,CMqc7C,6DAA6D,CAC3D,KAAK,CJpb+B,OAAK,CI0b3C,UAAU,CtB3dF,iBAAoB,CAAE,aAAM,CAK5B,cAAiB,CAAE,aAAM,CAKzB,aAAgB,CAAE,aAAM,CAKxB,YAAe,CAAE,aAAM,CAKvB,SAAY,CAAE,aAAM,CsByc5B,WAAW,CtB7dH,iBAAoB,CAAE,cAAM,CAK5B,cAAiB,CAAE,cAAM,CAKzB,aAAgB,CAAE,cAAM,CAKxB,YAAe,CAAE,cAAM,CAKvB,SAAY,CAAE,cAAM,CsB2c5B,WAAW,CtB/dH,iBAAoB,CAAE,cAAM,CAK5B,cAAiB,CAAE,cAAM,CAKzB,aAAgB,CAAE,cAAM,CAKxB,YAAe,CAAE,cAAM,CAKvB,SAAY,CAAE,cAAM,CsB6c5B,OAAO,CtBjeC,iBAAoB,CAAE,UAAM,CAK5B,cAAiB,CAAE,UAAM,CAKzB,aAAgB,CAAE,UAAM,CAKxB,YAAe,CAAE,UAAM,CAKvB,SAAY,CAAE,UAAM,CsB+c1B,iBAAW,CtBneL,iBAAoB,CsBoeL,wBAAwB,CtB/dvC,cAAiB,CsB+dF,wBAAwB,CtB1dvC,aAAgB,CsB0dD,wBAAwB,CtBrdvC,YAAe,CsBqdA,wBAAwB,CtBhdvC,SAAY,CsBgdG,wBAAwB,CAC7C,kBAAY,CtBreN,iBAAoB,CsBseL,yBAAyB,CtBjexC,cAAiB,CsBieF,yBAAyB,CtB5dxC,aAAgB,CsB4dD,yBAAyB,CtBvdxC,YAAe,CsBudA,yBAAyB,CtBldxC,SAAY,CsBkdG,yBAAyB,CAC9C,kBAAY,CtBveN,iBAAoB,CsBweL,yBAAyB,CtBnexC,cAAiB,CsBmeF,yBAAyB,CtB9dxC,aAAgB,CsB8dD,yBAAyB,CtBzdxC,YAAe,CsBydA,yBAAyB,CtBpdxC,SAAY,CsBodG,yBAAyB,CAEhD,yCAAyC,CAErC,8BAAqB,CACnB,MAAM,CAAE,SAAS,CAEjB,8ZAAqP,CACnP,aAAa,CAAE,KAAK,CACpB,OAAO,CAAE,KAAK,CAClB,cAAK,CACH,aAAa,CAAE,KAAK,CACpB,OAAO,CAAE,KAAK,CAEhB,kYAAqO,CACnO,aAAa,CAAE,CAAC,CAElB,wCAAuB,CACrB,aAAa,CAAE,KAAK,CACpB,UAAU,CAAE,IAAI,CAChB,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACb,4BAAW,CACT,MAAM,CAAE,WAAW,CACvB,iEAAmE,CACjE,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,KAAuB,EH5ehC,oCAAsB,CQhC1B,YAAY,CAER,OAAO,CAAE,IAAI,ER8Bb,oCAAsB,CQ5B1B,YAAY,CAER,OAAO,CAAE,IAAI,EAEjB,WAAW,CACT,KAAK,CAAE,IAAI,CAEb,YAAY,CACV,KAAK,CAAE,KAAK,CAEd,WAAW,CACT,KAAK,CAAE,IAAI,CC4Cb,mEAAS,CACP,eAAe,CAAE,QAAQ,CACzB,cAAc,CAAE,CAAC,CACjB,WAAW,CAAE,IAAI,CACjB,aAAa,CZ/BuB,IAAI,CYgCxC,2FAAO,CACL,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,6BAAkB,CACxB,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,MAAM,CACpB,yJAAM,CACJ,SAAS,CZjByB,GAAG,CYkBrC,MAAM,CAAE,CAAC,CACT,QAAQ,CAAE,OAAO,CACjB,OAAO,CZnB2B,QAAmC,CYoBvE,iOAA8B,CAC5B,iBAAiB,CAAE,CAAC,CACtB,qFAAK,CACH,KAAK,CAAE,IAAI,CACX,UAAU,CAAE,IAAI,CAChB,cAAc,CAAE,MAAM,CACtB,WAAW,CAAE,MAAM,CACnB,8FAAE,CACA,WAAW,CZnDqB,IAAI,CYoDpC,aAAa,CAAE,iBAA6B,CAChD,4EAAE,CACA,gBAAgB,CAAE,WAAW,CAC7B,cAAc,CAAE,MAAM,CAE1B,kFAAc,CACZ,WAAW,CAAE,IAAuB,CACpC,mHAAY,CACV,aAAa,CAAE,CAAC,CACpB,4HAA4B,CAC1B,KAAK,CAAE,EAAE,CACT,aAAa,CAAE,CAAC,CAChB,uXAA0C,CACxC,MAAM,CAAE,CAAC,CAEb,mBAAmB,CACjB,KAAK,CVjE+B,IAAY,CUkEhD,SAAS,CAAE,GAAG,CAChB,kBAAkB,CAChB,KAAK,CVpE+B,IAAY,CUqEhD,SAAS,CAAE,GAAG,CAIhB,2HAAyD,CACvD,gBAAgB,CV5DoB,OAAmB,CU8DzD,gBAAgB,CACd,gBAAgB,CV/DoB,OAAmB,CUoEzD,kDAAsB,CACpB,MAAM,CAAE,iBAA6B,CACrC,wDAAE,CACA,aAAa,CAAE,iBAA6B,CAC5C,WAAW,CAAE,iBAA6B,CAC5C,gGAAwB,CACtB,mBAAmB,CAAE,CAAC,CAE1B,kBAAkB,CAChB,MAAM,CAAE,iBAA6B,CAGrC,0BAAE,CACA,aAAa,CAAE,iBAA6B,CAC9C,8CAAwB,CACtB,mBAAmB,CAAE,CAAC,CAGxB,2CAAwB,CACtB,mBAAmB,CAAE,CAAC,CACxB,+CAAM,CACJ,YAAY,CAAE,SAAS,CACvB,aAAa,CAAE,iBAA6B,CAC9C,2CAAwB,CACtB,mBAAmB,CAAE,CAAC,CAG1B,oBAAoB,CAClB,aAAa,CZhHuB,IAAI,CYiHxC,SAAS,CAAE,IAAI,CACf,QAAQ,CAAE,IAAI,CACd,0BAAK,CACH,aAAa,CAAE,YAAY,CAC3B,2DAAM,CACJ,WAAW,CAAE,MAAM,CCzIzB,CAAC,CACC,KAAK,CX4B+B,OAAK,CW3BzC,eAAe,CAAE,IAAI,CACrB,MAAM,CAAE,OAAO,CACf,OAAO,CACL,KAAK,CbgD6B,OAAwB,Ca/C5D,SAAS,CACP,KAAK,CXuB6B,OAAO,CWG7C,IAAI,CACF,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,MAAM,CAEpB,IAAI,CACF,WAAW,CXIyB,uDAAM,CWH1C,WAAW,CAAE,MAAM,CACnB,KAAK,CXrB+B,OAAW,CWsB/C,UAAU,CAAE,IAAI,CAChB,UAAU,CAAE,MAAM,CAClB,UAAU,CbnD0B,OAAO,CaqD7C,aAAa,CACX,UAAU,CAAE,IAAI,CAElB,eAAe,CACb,UAAU,CAAE,MAAM,CAEpB,cAAc,CACZ,UAAU,CAAE,KAAK,CAEnB,cAAc,CACZ,SAAS,CAAE,IAAI,CAEjB,eAAe,CACb,SAAS,CAAE,IAAI,CAEjB,oBAAqB,CACnB,SAAS,CAAE,GAAG,CAEhB,eAAe,CACb,eAAe,CAAE,YAAY,CAE/B,gBAAgB,CACd,KAAK,CAAE,kBAAkB,CAC3B,uBAAuB,CACrB,KAAK,CAAE,kBAAgC,CACzC,aAAa,CACX,KAAK,CAAE,kBAAgB,CACzB,oBAAoB,CAClB,KAAK,CAAE,kBAA8B,CACvC,gBAAgB,CACd,KAAK,CAAE,kBAAiB,CAC1B,uBAAuB,CACrB,KAAK,CAAE,kBAA+B,CACxC,eAAe,CACb,KAAK,CAAE,kBAAe,CACxB,sBAAsB,CACpB,KAAK,CAAE,kBAA6B,CACtC,gBAAgB,CACd,KAAK,CAAE,kBAAsB,CAC/B,uBAAuB,CACrB,KAAK,CAAE,kBAAoC,CAkB7C,gEAAyB,CACvB,UAAU,CAAE,CAAC,CACb,WAAW,CAAE,GAAG,CAChB,WAAW,CX/DyB,0DAAa,CWiEnD,CAAC,CACC,WAAW,Cb1FyB,IAAI,Ca2FxC,MAAM,CAAE,CAAC,CACT,SAAS,Cb/F2B,IAAI,CagGxC,aAAa,Cb7FuB,IAAI,Ca+F1C,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,0CAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,CAAC,CACT,UAAU,CAAE,iBAA6B,CACzC,MAAM,CAAE,MAAmB,CAC3B,OAAO,CAAE,CAAC,CAEZ,sCAAI,CACF,WAAW,CAAE,MAAM,CACnB,SAAS,CAAE,IAAI,CACf,UAAU,CXxH0B,IAAM,CWyH1C,MAAM,CAAE,iBAAiC,CACzC,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,KAAK,CACd,WAAW,CXtGyB,wMAAQ,CWuG5C,KAAK,Cb1H+B,OAAI,Ca2HxC,UAAU,CAAE,IAAI,CAChB,0CAAY,CACV,SAAS,CAAE,GAAG,CAmClB,wFAAmB,CACjB,UAAU,CAAE,IAAI,CAChB,WAAW,CbzKyB,IAAI,Ca0KxC,aAAa,Cb1KuB,IAAI,Ca2KxC,oGAAE,CACA,UAAU,CAAE,IAAI,CAChB,WAAW,Cb7KuB,IAAI,Ca8KtC,wJAAY,CACV,aAAa,CAAE,CAAC,CAClB,gHAAE,CACA,aAAa,CAAE,CAAC,CAClB,gHAAE,CACA,UAAU,CAAE,MAAM,CAClB,4HAAE,CACA,UAAU,CAAE,MAAM,CACtB,4HAAK,CACH,UAAU,CAAE,OAAO,CAEzB,iFAAsB,CACpB,UAAU,CAAE,OAAO,CACnB,WAAW,Cb3LyB,IAAI,Ca4LxC,aAAa,Cb5LuB,IAAI,Ca6LxC,6FAAE,CACA,UAAU,CAAE,OAAO,CACnB,WAAW,Cb/LuB,IAAI,CagMtC,iJAAY,CACV,aAAa,CAAE,CAAC,CAClB,yGAAE,CACA,aAAa,CAAE,CAAC,CAChB,qHAAE,CACA,UAAU,CAAE,IAAI,CCrOxB,kBAAkB,CAChB,MAAM,CAAE,iBAA6B,CACrC,aAAa,CAAE,IAAI,CACnB,OAAO,Cd6B6B,IAAI,Cc5BxC,WAAW,CAAE,IAAqB,CAClC,WAAW,CAAE,GAAG,CAChB,UAAU,CZ8B0B,IAAM,CY7B1C,QAAQ,CAAE,QAAQ,CAClB,wBAAO,CACL,OAAO,CAAE,SAAS,CAClB,QAAQ,CAAE,QAAQ,CAClB,GAAG,CAAE,GAAG,CACR,IAAI,CAAE,GAAG,CACT,UAAU,CZ8BwB,OAAO,CY7BzC,KAAK,CAAE,IAAoB,CAC3B,OAAO,CAAE,QAA2C,CACtD,2CAA0B,CACxB,MAAM,CAAE,iBAA6B,CACrC,aAAa,CdcqB,IAAI,CcZ1C,+GAAmC,CACjC,MAAM,CAAE,iBAA6B,CACrC,OAAO,CAAE,GAAG,CACZ,UAAU,CAAE,IAAI,CAChB,UAAU,CZY0B,IAAM,CYV1C,MAAM,CAAE,YAAyB,CACjC,gLAAuB,CACrB,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,CAAC,CAEb,+BAA+B,CAC7B,KAAK,CAAE,IAAI,CACb,cAAc,CACZ,YAAY,CAAE,iBAA0C,CACxD,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,SAA2C,CACpD,WAAW,CZoByB,wMAAQ,CYnB5C,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,GAAG,CAChB,KAAK,CdI+B,OAAwB,CcH9D,2BAA2B,CACzB,WAAW,CAAE,GAAG,CAChB,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,SAA2C,CACpD,WAAW,CZYyB,wMAAQ,CYX5C,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,GAAG,CAChB,OAAO,CAAE,KAAK,CACd,QAAQ,CAAE,IAAI,CACd,KAAK,CZnB+B,OAAW,CYuBjD,YAAY,CACV,2IAAgE,CAC9D,WAAW,CAAE,QAAQ,ECzDzB,IAAI,CACF,gBAAgB,CAAE,IAAO,CACzB,MAAM,CAAE,OAAO,CACf,OAAO,CAAE,MAAM,CACf,OAAO,CAAE,KAAK,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,IAAI,CACF,KAAK,CAAE,OAAO,CACd,gBAAgB,CAAE,OAAO,CAC3B,EAAE,CACA,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACjB,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,MAAM,CACJ,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,GAAG,CACD,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,MAAM,CACJ,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,MAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,MAAM,CACf,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACX,gBAAgB,CAAE,OAAO,CCjJ3B,kBAAkB,CAChB,OAAO,CAAE,YAAY,CACrB,uCAAsB,CACpB,KAAK,CAAE,KAAK,CACd,oBAAC,CACC,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,GAAG,CACZ,gCAAa,CACX,YAAY,CAAE,CAAC,CACnB,6FAAI,CACF,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,IAAI,CAChB,qHAAS,CACP,KAAK,CdkB2B,OAAW,CcjBjD,qBAAqB,CACnB,aAAa,CAAE,CAAC,CAChB,KAAK,CdkB+B,OAAW,CcjB/C,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,YAAY,CbanB,oCAAsB,CaTxB,qBAAqB,CACnB,OAAO,CAAE,IAAI,CACf,uCAAuC,CACrC,OAAO,CAAE,IAAI,EAEjB,YAAY,CACV,uCAAuC,CACrC,OAAO,CAAE,IAAI,EC9BjB,SAAS,CACP,QAAQ,CAAE,KAAK,CACf,GAAG,CCAO,OAAO,CDGjB,gBAAO,CACL,eAAe,CAAE,IAAI,CAEzB,cAAc,C/B+FZ,KAAK,CAAE,CAAC,CACR,0CAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,oBAAO,CACL,KAAK,CAAE,IAAI,C+BnGb,mCAAM,CACJ,OAAO,CAAE,YAAY,CACvB,uBAAQ,CACN,UAAU,CAAE,qBAAoB,CAEhC,6BAAa,CACX,WAAW,CAAE,iBAAyB,CACxC,8BAAc,CACZ,YAAY,CAAE,iBAAyB,CAC3C,gBAAC,CACC,MAAM,CAAE,IAAmB,CAC3B,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAmB,CAChC,OAAO,CAAE,MAAiB,CAE9B,iBAAiB,CACf,KAAK,CjBuD+B,KAAK,CiBtDzC,oDAAiB,CACf,MAAM,CAAE,IAAmB,CAC3B,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAmB,CAChC,OAAO,CAAE,SAAS,CAClB,aAAa,CAAE,CAAC,CAChB,OAAO,CAAE,KAAK,CACd,WAAW,CAAE,IAAI,CACjB,cAAc,CAAE,SAAS,CACzB,SAAS,CAAE,GAAG,CACd,KAAK,CfZ6B,IAAK,CeavC,WAAW,CAAE,MAAM,CAErB,oBAAE,CACA,aAAa,CAAE,CAAC,CAEhB,+BAAY,CACV,UAAU,CAAE,iBAAyB,CACvC,kCAAe,CACb,aAAa,CAAE,iBAAyB,CAC1C,4BAAS,CACP,UAAU,CAAE,OAA4C,CACxD,8BAAC,CACC,KAAK,CfhByB,IAAY,CeiB1C,YAAY,CAAE,iBAAsD,CACpE,OAAO,CAAE,gBAAyB,CAClC,oCAAO,CACL,UAAU,CAAE,OAA4C,CAC9D,mGAAI,CACF,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,OAAO,CACnB,KAAK,CAAE,OAAO,CACd,YAAY,CAAE,CAAC,CACf,aAAa,CAAE,CAAC,CAElB,wCAAmB,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,WAAW,CAAE,MAAM,CAGnB,SAAS,CAAE,KAAI,CACf,WAAW,CAAE,KAAK,CAClB,KAAK,CAAE,OAA8B,CAGzC,wDAAuB,CACrB,KAAK,Cf1C6B,OAAW,Ce2C7C,OAAO,CAAE,gBAAmB,CAC5B,WAAW,CAAE,IAAI,CACjB,QAAQ,CAAE,QAAQ,CAClB,UAAU,CfrCwB,OAAyB,CesC3D,MAAM,CAAE,IAAI,CACZ,aAAa,CAAE,iBAAsD,CACrE,UAAU,CAAE,iBAAsD,CAClE,YAAY,CAAE,YAAY,CAE1B,oEAAO,CACL,UAAU,Cf5CsB,OAAyB,Ce6CzD,4GAAmB,CACjB,KAAK,CfrDyB,IAAY,CesD9C,gGAAmB,CAGjB,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,KAAI,CACf,WAAW,CAAE,KAAK,CAClB,KAAK,CAAE,IAA8B,CAIvC,iHAAI,CACF,OAAO,CAAE,IAAI,CACf,iIAAc,CACZ,OAAO,CAAE,KAAK,CAGd,yCAAG,CACD,UAAU,CAAE,OAA4C,CACxD,OAAO,CAAE,gBAAyB,CACpC,uDAAiB,CACf,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,OAA4C,CACxD,OAAO,CAAE,gBAAyB,CACtC,2DAA2B,CACzB,KAAK,Cf9E2B,IAAY,Ce+E9C,mDAAmB,CACjB,KAAK,CAAE,OAA4C,CACvD,+BAAa,CACX,SAAS,CAAE,KAAI,CAEb,yCAAG,CACD,UAAU,CAAE,OAA4C,CACxD,OAAO,CAAE,gBAAyB,CACpC,uDAAiB,CACf,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,OAA4C,CACxD,OAAO,CAAE,gBAAyB,CAClC,UAAU,CAAE,IAAI,CAChB,aAAa,CAAE,IAAI,CACvB,2DAA2B,CACzB,KAAK,Cf9F2B,IAAY,Ce+F9C,mDAAmB,CACjB,KAAK,CAAE,OAA4C,CACvD,+BAAa,CACX,SAAS,CAAE,KAAI,CAEjB,+BAAa,CACX,OAAO,CAAE,KAAK,CAChB,uBAAK,CACH,aAAa,CAAE,CAAC,CAChB,OAAO,CAAE,IAAI,CAEb,kCAAK,CACH,OAAO,CAAE,KAAK,CAClB,4BAAU,CACR,aAAa,CAAE,CAAC,CAChB,KAAK,Cf7G6B,OAAW,Ce8G7C,WAAW,CAAE,MAAM,CACrB,mBAAC,CACC,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,gBAAmB,CAC5B,OAAO,CAAE,KAAK,CACd,QAAQ,CAAE,QAAQ,CAClB,SAAS,CAAE,GAAG,CACd,KAAK,CftH6B,OAAW,CeuH7C,yBAAO,CACL,gBAAgB,CAAE,OAAoC,CACtD,MAAM,CAAE,OAAO,CACf,6CAAmB,CACjB,KAAK,Cf3HyB,OAAW,Ce4H7C,0BAAQ,CACN,gBAAgB,CftHgB,OAAK,CeuHrC,MAAM,CAAE,OAAO,CACf,KAAK,Cf9H2B,IAAM,Ce+HtC,8CAAmB,CACjB,KAAK,CfhIyB,IAAM,CekI5C,mBAAmB,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CjBvF+B,KAAK,CiBwFzC,OAAO,CAAE,OAAW,CACpB,aAAa,CAAE,OAAW,CAC1B,OAAO,CjBrF6B,GAAG,CiBsFvC,gBAAgB,CflIoB,OAAK,CemIzC,UAAU,CAAE,MAAM,CAClB,OAAO,CAAE,OAAW,CACpB,OAAO,CAAE,KAAK,CACd,KAAK,CfvI+B,OAAyB,CewI7D,aAAa,CAAE,OAAW,CAC1B,oCAAgB,CACd,KAAK,CAAE,IAAI,CACX,aAAa,CAAE,IAAI,CACnB,OAAO,CAAE,QAAQ,CACjB,YAAY,CAAE,OAAuB,CACvC,uBAAG,CACD,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,sBAA0B,CAClC,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,gBAAgB,CflJkB,OAAK,CemJvC,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,IAAI,CACrB,wDAAqB,CACnB,KAAK,CfvJ6B,OAAyB,CewJ3D,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,OAA2C,CACpD,aAAa,CAAE,OAAW,CAE1B,oEAAO,CACL,UAAU,CAAE,qBAAoB,CAClC,0EAAQ,CACN,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,MAAM,CACd,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,aAAa,CAAE,CAAC,CAChB,SAAS,CAAE,IAAI,CACf,UAAU,CAAE,WAAa,CAEzB,oFAAQ,CACN,UAAU,CAAE,MAAM,CACxB,+BAAa,CACX,UAAU,CAAE,SAAkB,CAC9B,aAAa,CAAE,OAAW,CAC1B,WAAW,CAAE,MAAM,CACnB,KAAK,CAAE,qBAAoB,CAI7B,gCAAM,CACJ,KAAK,CfnL6B,OAAK,CeoLzC,2BAAC,CACC,KAAK,Cf5L6B,OAAW,Ce6L7C,iCAAO,CACL,gBAAgB,CfvLgB,OAAK,CewLrC,KAAK,Cf9L2B,IAAM,CegM5C,gBAAgB,CjC3NR,kBAAoB,CAAE,gBAAM,CAK5B,eAAiB,CAAE,gBAAM,CAezB,UAAY,CAAE,gBAAM,CiCyM1B,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,CAAC,CACV,KAAK,CAAE,IAAI,CACX,OAAO,CAAE,CAAC,CACV,4BAAa,CACX,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,OAAO,CAAE,CAAC,CACZ,0BAAW,CACT,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,KAAK,CACX,OAAO,CAAE,CAAC,CACZ,2BAAY,CACV,KAAK,CAAE,KAAK,CACZ,IAAI,CAAE,IAAI,CACV,OAAO,CAAE,CAAC,CAGd,gBAAgB,CACd,UAAU,CAAE,qBAAuC,CACnD,gBAAgB,CAAE,2uCAA2uC,CAC7vC,eAAe,CAAE,SAAsB,CAEzC,gBAAgB,CACd,QAAQ,CAAE,QAAQ,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CAEd,YAAY,CACV,QAAQ,CAAE,KAAK,CACf,GAAG,CAAE,CAAC,CACN,MAAM,CAAE,CAAC,CACT,IAAI,CAAE,CAAC,CACP,cAAc,CAAE,GAAG,CACnB,KAAK,CjBvL+B,KAAK,CiBwLzC,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,IAAI,CAChB,UAAU,CfrO0B,OAAsB,CesO1D,OAAO,CjBvL6B,GAAG,CiByLzC,eAAe,CACb,KAAK,CAAE,KAAyB,CAChC,QAAQ,CAAE,QAAQ,CAClB,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,MAAM,CAClB,MAAM,CAAE,IAAI,CAEd,WAAW,CACT,OAAO,CAAE,IAAI,CACb,UAAU,Cf9O0B,OAAK,Ce+OzC,KAAK,CfrP+B,IAAM,CesP1C,OAAO,CAAE,gBAAuB,CAChC,QAAQ,CAAE,QAAQ,CAClB,WAAW,CAAE,IAAI,CACjB,UAAU,CAAE,MAAM,CAClB,SAAS,CAAE,IAAI,C/BvLf,KAAK,CAAE,CAAC,CACR,oCAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,iBAAO,CACL,KAAK,CAAE,IAAI,C+BmLb,aAAC,CACC,KAAK,Cf7P6B,IAAM,Ce8PxC,WAAW,CAAE,IAAI,CAEnB,eAAG,CACD,YAAY,CAAE,IAAqB,CACnC,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,gBAAgB,Cf9PkB,OAAK,Ce+PvC,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,IAAI,CACrB,aAAC,CACC,SAAS,CAAE,IAAI,CACf,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,OAAO,CAEnB,oBAAoB,CAClB,WAAW,CjBhOyB,KAAK,CiBiOzC,UAAU,CfzQ0B,OAAyB,Ce0Q7D,UAAU,CAAE,IAAI,CAElB,eAAe,CACb,OAAO,CAAE,eAAmB,CAC5B,MAAM,CAAE,IAAI,CACZ,SAAS,CAAE,KAAK,CAChB,MAAM,CAAE,IAAI,CAEd,aAAa,CACX,QAAQ,CAAE,KAAK,CACf,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,eAAc,CAC1B,OAAO,CAAE,IAAI,CACb,OAAO,CAAE,GAAkB,CAC3B,gBAAI,CACF,OAAO,CAAE,KAAK,CAClB,MAAM,CACJ,KAAK,CflT+B,IAAW,CemT/C,QAAC,CACC,aAAa,CAAE,IAAqB,CACtC,6FAAgB,CACd,OAAO,CAAE,GAAG,CACZ,WAAW,CfhRuB,wMAAQ,CeiR1C,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,IAAI,CACZ,KAAK,Cf3T6B,IAAW,Ce6TjD,mBAAmB,C/BzOjB,KAAK,CAAE,CAAC,CACR,oDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,yBAAO,CACL,KAAK,CAAE,IAAI,C+BuOb,0BAAU,CACR,aAAa,CjBrTqB,IAAI,CiBsTtC,aAAa,CAAE,iBAA6B,CAC5C,cAAc,CjBvToB,IAAI,CiBwTxC,sCAAsB,CACpB,UAAU,CAAE,iBAA6B,CACzC,WAAW,CjB1TuB,IAAI,CiB2TxC,4BAAY,CACV,SAAS,CAAE,IAAI,CACf,aAAa,CAAE,IAAqB,CACpC,OAAO,CAAE,YAAY,CACvB,wBAAQ,CACN,KAAK,Cf9T6B,IAAY,Ce+T9C,SAAS,CAAE,GAAG,CdjUd,oCAAsB,CcqUxB,gBAAgB,CACd,UAAU,Cf7TwB,OAAyB,Ce8T7D,WAAW,CACT,OAAO,CAAE,KAAK,CAChB,YAAY,CAER,IAAI,CAAE,MAAmB,CAG3B,kBAAO,CACL,KAAK,CAAE,GAAG,CACV,IAAI,CAAE,CAAC,CACX,eAAe,CACb,KAAK,CAAE,IAAI,CACb,mBAAmB,CACjB,KAAK,CAAE,IAAI,CACb,yBAAyB,CACvB,KAAK,CAAE,IAAI,CACb,oBAAoB,CAClB,WAAW,CAAE,CAAC,CACd,oCAAe,CACb,OAAO,CCxXD,OAAO,CDyXf,0BAAO,CACL,QAAQ,CAAE,KAAK,CACf,SAAS,CAAE,IAAI,CACf,IAAI,CAAE,GAAG,CACT,GAAG,CAAE,CAAC,CACN,MAAM,CAAE,IAAI,CACZ,QAAQ,CAAE,MAAM,EdjWlB,qCAAsB,CcoWxB,oBAAoB,CAClB,UAAU,CAAE,gBAAe,CAC7B,eAAe,CACb,MAAM,CAAE,CAAC,CACT,UAAU,Cf/VwB,OAAyB,EeiW/D,YAAY,CACV,iCAAmC,CACjC,OAAO,CAAE,IAAI,CACf,oBAAoB,CAClB,WAAW,CAAE,CAAC,EE9YlB,aAAa,CACX,QAAQ,CAAE,KAAK,CACf,MAAM,CAAE,CAAC,CACT,IAAI,CAAE,CAAC,CACP,KAAK,CnB6E+B,KAAK,CmB5EzC,KAAK,CjBoC+B,OAAyB,CiBnC7D,UAAU,CAAE,OAAkC,CAC9C,UAAU,CAAE,kBAAiC,CAC7C,WAAW,CjB+CyB,uDAAM,CiB9C1C,OAAO,CnB+E6B,GAAG,CmB9EvC,eAAC,CACC,KAAK,CjB+B6B,OAAK,CiB9BvC,eAAe,CAAE,IAAI,CACvB,8BAAgB,CACd,OAAO,CAAE,IAAI,CACf,kCAAoB,CAClB,OAAO,CAAE,IAAqB,CAC9B,gBAAgB,CAAE,OAAkC,CACpD,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,KAAK,CACjB,SAAS,CAAE,GAAG,CACd,MAAM,CAAE,OAAO,CACf,KAAK,CjBX6B,OAAM,ChB4F1C,KAAK,CAAE,CAAC,CACR,kFAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,wCAAO,CACL,KAAK,CAAE,IAAI,CiCrFX,uqDAAG,CACD,KAAK,CjBgB2B,OAAyB,CiBf3D,yFAAQ,CACN,KAAK,CAAE,IAAI,CACb,6CAAU,CACR,KAAK,CAAE,IAAI,CACb,kDAAiB,CACf,gBAAgB,CnBQgB,OAAI,CmBPpC,KAAK,CjBI2B,IAAM,CiBHxC,yDAAwB,CACtB,gBAAgB,CjBmBgB,OAAO,CiBlBvC,KAAK,CnBzB2B,IAAI,CmB0BxC,0CAA8B,CAC5B,OAAO,CAAE,KAAK,CAChB,iCAAmB,CACjB,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,IAAqB,CAC9B,KAAK,CjBP6B,IAAY,CiBQ9C,OAAO,CAAE,IAAI,CACb,oCAAE,CACA,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,CAAC,CACT,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,CAAC,CACV,UAAU,CAAE,iBAA6C,CAC3D,oCAAE,CACA,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,CAAC,CACT,sCAAC,CACC,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,GAAqB,CAC9B,KAAK,CjBfyB,OAAyB,CiBgB7D,uBAAW,CACT,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,IAAI,CACV,MAAM,CAAE,IAAI,CACZ,SAAS,CnBkByB,KAAK,CmBjBvC,kCAAU,CACR,KAAK,CAAE,IAAI,CACb,mEAAQ,CACN,KAAK,CAAE,IAAI,CACb,qDAA+B,CAC7B,UAAU,CAAE,KAAK,CACjB,+HAAQ,CACN,KAAK,CAAE,IAAI,CACb,gEAAU,CACR,KAAK,CAAE,IAAI,CACf,4CAAoB,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAuB,CAChC,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,MAAM,ChBhDpB,oCAAsB,CgBmDxB,aAAa,CACX,KAAK,CAAE,GAAG,CACV,OAAO,CAAE,IAAI,CACb,mBAAO,CACL,OAAO,CAAE,KAAK,CAClB,GAAG,CACD,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,ECzEd,gBAAG,CACD,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,eAAe,CAEzB,uBAAU,CACR,aAAa,CpBUqB,IAAI,CoBTtC,iCAAS,CACP,UAAU,CAAE,MAAM,CAEtB,oCAAuB,CACrB,UAAU,CAAE,MAAM,CAGpB,qDAAoC,CAClC,aAAa,CpBCqB,IAAI,CoBUxC,uBAAU,CACR,WAAW,CpBXuB,IAAI,CoBYtC,WAAW,CpBZuB,IAAI,CoBatC,aAAa,CpBbqB,IAAI,CoBmBtC,kTAAK,CACH,aAAa,CAAE,CAAC,CAKlB,qCAAQ,CACN,YAAY,CAAE,GAAG,CAUrB,8BAAiB,CACf,YAAY,CAAE,eAAc,CAC5B,mEAAM,CACJ,UAAU,CAAE,sBAAsB,CAClC,YAAY,CAAE,0BAAyB,CAG3C,0EAAiD,CAC/C,UAAU,CAAE,WAAW,CACzB,0EAAiD,CAC/C,UAAU,CAAE,WAAW,CAGzB,qDAA4B,CAC1B,aAAa,CAAE,IAAqB,CACtC,wBAAW,CACT,WAAW,CpBpDuB,IAAI,CoBuDxC,yBAAY,CACV,WAAW,CAAE,IAAI,CACjB,aAAa,CAAE,IAAqB,CACtC,yBAAY,CACV,KAAK,ClB3D6B,OAAW,CkB4D/C,yBAAY,CACV,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,iBAA2C,CACrD,wBAAW,CACT,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,iBAA2C,CACrD,0BAAa,CACX,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,KAAK,CAMd,6RAAW,CACT,OAAO,CAAE,IAAI,CACb,UAAU,CAAE,MAAM,CAClB,SAAS,CAAE,IAAI,CAEf,mVAAO,CACL,UAAU,CAAE,OAAO,CACnB,OAAO,CAAE,GAAO,CAChB,WAAW,CAAE,WAAW,CACxB,OAAO,CAAE,YAAY,CACzB,mVAAmB,CACjB,OAAO,CAAE,YAAY,CAGzB,qBAAQ,CACN,KAAK,CAAE,KAAK,CACZ,KAAK,CAAE,GAAG,CACV,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,aAAuC,CAC/C,OAAO,CpB7F2B,IAAI,CoB8FtC,UAAU,ClB9EwB,OAAmB,CkB+ErD,MAAM,CAAE,iBAA+B,CAEvC,yEAAS,CACP,SAAS,CAAE,GAAG,CAChB,2BAAK,CACH,aAAa,CAAE,CAAC,CAClB,oCAAc,CACZ,OAAO,CAAE,KAAK,CACd,WAAW,ClB/EqB,0DAAa,CkBgF7C,WAAW,CAAE,IAAI,CACjB,UAAU,ClBvFsB,OAAmB,CkBwFnD,OAAO,CAAE,QAA2C,CACpD,MAAM,CAAE,KAAkB,CAC1B,aAAa,CpB5GmB,IAAI,CoB6GpC,SAAS,CAAE,IAAI,CAEnB,yBAAY,CACV,UAAU,ClB3FwB,OAAO,CkB4FzC,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAuB,CAGlC,iEAAwC,CACtC,cAAc,CAAE,KAAK,CACrB,SAAS,CAAE,GAAG,CAIhB,yEAAgD,CAC9C,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,IAAI,CACZ,KAAK,ClB5I6B,IAAW,CkB6I7C,+JAAM,CACJ,MAAM,CAAE,IAAI,CACZ,gBAAgB,CAAE,sBAAsB,CACxC,WAAW,CAAE,MAAM,CACrB,2FAAQ,CACN,YAAY,CAAE,CAAC,CACf,aAAa,CAAE,CAAC,CAChB,cAAc,CAAE,GAAG,CACrB,mKAAI,CACF,KAAK,ClBhJ2B,IAAK,CkBuJzC,6BAAgB,CAEd,MAAM,CAAE,IAAI,CACZ,gCAAE,CACA,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,GAAG,CAClB,uCAAW,CACT,OAAO,CAAE,YAAY,CACrB,UAAU,CAAE,GAAG,CACjB,yCAAW,CACT,aAAa,CAAE,IAAI,CACnB,UAAU,CAAE,IAAI,CAChB,WAAW,CAAE,MAAM,CACrB,yCAAW,CACT,UAAU,CAAE,IAAI,CAChB,YAAY,CAAE,CAAC,CAGnB,iDAAQ,CAEN,KAAK,CpB1L6B,IAAI,CoB2LtC,OAAO,CAAE,OAAO,CAChB,wHAAO,CACL,SAAS,CAAE,eAAe,CAC1B,WAAW,CAAE,MAAM,CAErB,yEAAS,CACP,KAAK,CpBpK2B,OAAI,CoBqKtC,wHAAW,CACT,WAAW,CAAE,IAAI,CACjB,KAAK,ClB9K2B,OAAW,CkBgL/C,uDAAY,CACV,KAAK,ClBvK6B,OAAK,CkBwKzC,eAAE,CACA,aAAa,CpBnLqB,IAAI,CoBoLtC,kBAAE,CACA,WAAW,CAAE,IAAI,CAEnB,6EAAgB,CACd,aAAa,CAAE,eAAgC,CAEjD,kBAAE,CACA,MAAM,CAAE,aAA4C,CAMxD,8BAAiB,CACf,aAAa,CpBlMqB,IAAI,CoBoMtC,iCAAE,CACA,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,KAAuB,CAC/B,SAAS,CAAE,GAAG,CACd,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,OAA0B,CACtC,KAAK,ClBhM2B,OAAK,CkBiMrC,UAAU,CAAE,iBAAoC,CAChD,OAAO,CAAE,GAAqB,CAC9B,QAAQ,CAAE,QAAQ,CAClB,wCAAQ,CACN,KAAK,CAAE,OAA0B,CACnC,6CAAW,CACT,KAAK,ClBjNyB,OAAW,CkBkNzC,SAAS,CAAE,eAAe,CAE9B,oCAAK,CACH,aAAa,CAAE,GAAqB,CACpC,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,cAAuB,CACpC,UAAU,CAAE,OAAa,CACzB,KAAK,ClBhO2B,IAAK,CkBiOrC,gDAAW,CACT,KAAK,ClB3NyB,OAAW,CkB4NzC,SAAS,CAAE,eAAe,CAC9B,6CAAc,CACZ,UAAU,CAAE,CAAC,CAEf,uGAAQ,CACN,WAAW,CAAE,IAAI,CACjB,oRAA2B,CACzB,gBAAgB,CAAE,WAAW,CAC7B,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,CAAC,CACV,SAAS,CAAE,eAAe,CAC5B,kIAAU,CACR,WAAW,CAAE,IAAI,CAErB,wCAAS,CACP,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,KAAK,CACd,KAAK,CpBnQ2B,IAAI,CoBoQpC,WAAW,CAAE,IAAI,CACnB,wCAAS,CACP,OAAO,CAAE,YAAY,CACrB,aAAa,CAAE,GAAG,CAEtB,uDAA8B,CAC5B,OAAO,CAAE,YAAY,CACrB,KAAK,ClB1Q6B,OAAM,CkB2QxC,SAAS,CAAE,GAAG,CACd,YAAY,CpBvPsB,IAAI,CoBwPxC,2BAAc,CACZ,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,KAAK,CACd,qBAAQ,CACN,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,IAAI,CAEnB,mDAAa,CACX,UAAU,CAAE,OAAO,CACnB,OAAO,CAAE,OAAO,CAChB,WAAW,CAAE,OAAO,CACpB,SAAS,CAAE,OAAO,CAClB,KAAK,CAAE,OAAO,CACd,MAAM,CAAE,OAAO,CACf,WAAW,CAAE,OAAO,CAIlB,mGAAQ,CACN,YAAY,CAAE,GAAG,CjB3QrB,oCAAsB,CiBgRtB,qBAAQ,CACN,KAAK,CAAE,IAAI,ECjTjB,wBAAwB,CACtB,KAAK,CnB+B+B,OAAW,CmB7BjD,KAAK,CACH,UAAU,CAAE,MAAM,YCHlB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,0GAAoB,YAGzB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,yGAAyB,YAG9B,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,6FAAqB,YAG1B,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,oFAAkB,YAGvB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,gHAA4B,YAGjC,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,uGAAyB",
-"sources": ["../../../bower_components/neat/app/assets/stylesheets/grid/_grid.scss","../../../bower_components/bourbon/dist/addons/_prefixer.scss","../../../bower_components/wyrm/sass/wyrm_core/_reset.sass","../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/font-awesome/scss/_path.scss","../../../bower_components/font-awesome/scss/_core.scss","../../../bower_components/font-awesome/scss/_larger.scss","../../../bower_components/font-awesome/scss/_fixed-width.scss","../../../bower_components/font-awesome/scss/_list.scss","../../../bower_components/font-awesome/scss/_variables.scss","../../../bower_components/font-awesome/scss/_bordered-pulled.scss","../../../bower_components/font-awesome/scss/_spinning.scss","../../../bower_components/font-awesome/scss/_rotated-flipped.scss","../../../bower_components/font-awesome/scss/_mixins.scss","../../../bower_components/font-awesome/scss/_stacked.scss","../../../bower_components/font-awesome/scss/_icons.scss","../../../bower_components/wyrm/sass/wyrm_core/_font_icon_defaults.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../bower_components/wyrm/sass/wyrm_core/_alert.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss","../../../bower_components/wyrm/sass/wyrm_core/_button.sass","../../../bower_components/wyrm/sass/wyrm_core/_dropdown.sass","../../../bower_components/wyrm/sass/wyrm_core/_form.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_outer-container.scss","../../../bower_components/neat/app/assets/stylesheets/settings/_grid.scss","../../../bower_components/neat/app/assets/stylesheets/grid/_span-columns.scss","../../../bower_components/wyrm/sass/wyrm_core/_neat_extra.sass","../../../bower_components/wyrm/sass/wyrm_core/_generic.sass","../../../bower_components/wyrm/sass/wyrm_core/_table.sass","../../../bower_components/wyrm/sass/wyrm_core/_type.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments_light.sass","../../../sass/_theme_breadcrumbs.sass","../../../sass/_theme_layout.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_private.scss","../../../sass/_theme_badge.sass","../../../sass/_theme_rst.sass","../../../sass/_theme_mathjax.sass","../../../sass/_theme_font_local.sass"],
-"names": [],
-"file": "theme.css"
-}
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot differ
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,520 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#xd8;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" horiz-adv-x="1537" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" horiz-adv-x="1537" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
-<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
-<glyph unicode="&#xf1a1;" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />
-<glyph unicode="&#xf1a2;" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />
-<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
-<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
-<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
-<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
-<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
-<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
-<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
-<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1bd;" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />
-<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
-<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
-<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
-<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
-<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-<glyph unicode="&#xf1d4;" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
-<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
-<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
-<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1ed;" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
-<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-<glyph unicode="&#xf20d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf20e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf differ
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/modernizr.min.js cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/modernizr.min.js
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/modernizr.min.js	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/modernizr.min.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-mq-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function D(a){j.cssText=a}function E(a,b){return D(n.join(a+";")+(b||""))}function F(a,b){return typeof a===b}function G(a,b){return!!~(""+a).indexOf(b)}function H(a,b){for(var d in a){var e=a[d];if(!G(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function I(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:F(f,"function")?f.bind(d||b):f}return!1}function J(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return F(b,"string")||F(b,"undefined")?H(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),I(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return y("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},A=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=F(e[d],"function"),F(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),B={}.hasOwnProperty,C;!F(B,"undefined")&&!F(B.call,"undefined")?C=function(a,b){return B.call(a,b)}:C=function(a,b){return b in a&&F(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return J("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!F(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!J("indexedDB",a)},s.hashchange=function(){return A("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return D("background-color:rgba(150,255,150,.5)"),G(j.backgroundColor,"rgba")},s.hsla=function(){return D("background-color:hsla(120,40%,100%,.5)"),G(j.backgroundColor,"rgba")||G(j.backgroundColor,"hsla")},s.multiplebgs=function(){return D("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return J("backgroundSize")},s.borderimage=function(){return J("borderImage")},s.borderradius=function(){return J("borderRadius")},s.boxshadow=function(){return J("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return E("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return J("animationName")},s.csscolumns=function(){return J("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return D((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),G(j.backgroundImage,"gradient")},s.cssreflections=function(){return J("boxReflect")},s.csstransforms=function(){return!!J("transform")},s.csstransforms3d=function(){var a=!!J("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return J("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var L in s)C(s,L)&&(x=L.toLowerCase(),e[x]=s[L](),v.push((e[x]?"":"no-")+x));return e.input||K(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)C(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},D(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.mq=z,e.hasEvent=A,e.testProp=function(a){return H([a])},e.testAllProps=J,e.testStyles=y,e.prefixed=function(a,b,c){return b?J(a,b,c):J(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/theme.js cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/theme.js
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/theme.js	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/static/js/theme.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"sphinx-rtd-theme":[function(require,module,exports){
-var jQuery = (typeof(window) != 'undefined') ? window.jQuery : require('jquery');
-
-// Sphinx theme nav state
-function ThemeNav () {
-
-    var nav = {
-        navBar: null,
-        win: null,
-        winScroll: false,
-        winResize: false,
-        linkScroll: false,
-        winPosition: 0,
-        winHeight: null,
-        docHeight: null,
-        isRunning: false
-    };
-
-    nav.enable = function () {
-        var self = this;
-
-        if (!self.isRunning) {
-            self.isRunning = true;
-            jQuery(function ($) {
-                self.init($);
-
-                self.reset();
-                self.win.on('hashchange', self.reset);
-
-                // Set scroll monitor
-                self.win.on('scroll', function () {
-                    if (!self.linkScroll) {
-                        self.winScroll = true;
-                    }
-                });
-                setInterval(function () { if (self.winScroll) self.onScroll(); }, 25);
-
-                // Set resize monitor
-                self.win.on('resize', function () {
-                    self.winResize = true;
-                });
-                setInterval(function () { if (self.winResize) self.onResize(); }, 25);
-                self.onResize();
-            });
-        };
-    };
-
-    nav.init = function ($) {
-        var doc = $(document),
-            self = this;
-
-        this.navBar = $('div.wy-side-scroll:first');
-        this.win = $(window);
-
-        // Set up javascript UX bits
-        $(document)
-            // Shift nav in mobile when clicking the menu.
-            .on('click', "[data-toggle='wy-nav-top']", function() {
-                $("[data-toggle='wy-nav-shift']").toggleClass("shift");
-                $("[data-toggle='rst-versions']").toggleClass("shift");
-            })
-
-            // Nav menu link click operations
-            .on('click', ".wy-menu-vertical .current ul li a", function() {
-                var target = $(this);
-                // Close menu when you click a link.
-                $("[data-toggle='wy-nav-shift']").removeClass("shift");
-                $("[data-toggle='rst-versions']").toggleClass("shift");
-                // Handle dynamic display of l3 and l4 nav lists
-                self.toggleCurrent(target);
-                self.hashChange();
-            })
-            .on('click', "[data-toggle='rst-current-version']", function() {
-                $("[data-toggle='rst-versions']").toggleClass("shift-up");
-            })
-
-        // Make tables responsive
-        $("table.docutils:not(.field-list)")
-            .wrap("<div class='wy-table-responsive'></div>");
-
-        // Add expand links to all parents of nested ul
-        $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () {
-            var link = $(this);
-                expand = $('<span class="toctree-expand"></span>');
-            expand.on('click', function (ev) {
-                self.toggleCurrent(link);
-                ev.stopPropagation();
-                return false;
-            });
-            link.prepend(expand);
-        });
-    };
-
-    nav.reset = function () {
-        // Get anchor from URL and open up nested nav
-        var anchor = encodeURI(window.location.hash);
-        if (anchor) {
-            try {
-                var link = $('.wy-menu-vertical')
-                    .find('[href="' + anchor + '"]');
-                $('.wy-menu-vertical li.toctree-l1 li.current')
-                    .removeClass('current');
-                link.closest('li.toctree-l2').addClass('current');
-                link.closest('li.toctree-l3').addClass('current');
-                link.closest('li.toctree-l4').addClass('current');
-            }
-            catch (err) {
-                console.log("Error expanding nav for anchor", err);
-            }
-        }
-    };
-
-    nav.onScroll = function () {
-        this.winScroll = false;
-        var newWinPosition = this.win.scrollTop(),
-            winBottom = newWinPosition + this.winHeight,
-            navPosition = this.navBar.scrollTop(),
-            newNavPosition = navPosition + (newWinPosition - this.winPosition);
-        if (newWinPosition < 0 || winBottom > this.docHeight) {
-            return;
-        }
-        this.navBar.scrollTop(newNavPosition);
-        this.winPosition = newWinPosition;
-    };
-
-    nav.onResize = function () {
-        this.winResize = false;
-        this.winHeight = this.win.height();
-        this.docHeight = $(document).height();
-    };
-
-    nav.hashChange = function () {
-        this.linkScroll = true;
-        this.win.one('hashchange', function () {
-            this.linkScroll = false;
-        });
-    };
-
-    nav.toggleCurrent = function (elem) {
-        var parent_li = elem.closest('li');
-        parent_li.siblings('li.current').removeClass('current');
-        parent_li.siblings().find('li.current').removeClass('current');
-        parent_li.find('> ul li.current').removeClass('current');
-        parent_li.toggleClass('current');
-    }
-
-    return nav;
-};
-
-module.exports.ThemeNav = ThemeNav();
-
-if (typeof(window) != 'undefined') {
-    window.SphinxRtdTheme = { StickyNav: module.exports.ThemeNav };
-}
-
-},{"jquery":"jquery"}]},{},["sphinx-rtd-theme"]);
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/theme.conf cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/theme.conf
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/theme.conf	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/theme.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = css/theme.css
-
-[options]
-typekit_id = hiw1hhg
-analytics_id = 
-sticky_navigation = False
-logo_only =
-collapse_navigation = False
-display_version = True
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/versions.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/versions.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/versions.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/_themes/sphinx_rtd_theme/versions.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-{% if READTHEDOCS %}
-{# Add rst-badge after rst-versions for small badge style. #}
-  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="fa fa-book"> Read the Docs</span>
-      v: {{ current_version }}
-      <span class="fa fa-caret-down"></span>
-    </span>
-    <div class="rst-other-versions">
-      <dl>
-        <dt>Versions</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>Downloads</dt>
-        {% for type, url in downloads %}
-          <dd><a href="{{ url }}">{{ type }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>On Read the Docs</dt>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">Project Home</a>
-          </dd>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">Builds</a>
-          </dd>
-      </dl>
-      <hr/>
-      Free document hosting provided by <a href="http://www.readthedocs.org">Read the Docs</a>.
-
-    </div>
-  </div>
-{% endif %}
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-client.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-client.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-client.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-client.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/tutorial-client.rst
-
-libevent-client.c
------------------
-
-.. literalinclude:: @top_srcdir@/examples/libevent-client.c
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-hpack.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-hpack.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-hpack.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-hpack.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/tutorial-hpack.rst
-
-deflate.c
----------
-
-.. literalinclude:: @top_srcdir@/examples/deflate.c
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-server.rst.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-server.rst.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-server.rst.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/doc/tutorial-server.rst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/tutorial-server.rst
-
-libevent-server.c
------------------
-
-.. literalinclude:: @top_srcdir@/examples/libevent-server.c
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/Dockerfile.android cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/Dockerfile.android
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/Dockerfile.android	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/Dockerfile.android	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-# vim: ft=dockerfile:
-# Dockerfile to build nghttp2 android binary
-#
-# $ sudo docker build -t nghttp2-android - < Dockerfile.android
-#
-# After successful build, android binaries are located under
-# /root/build/nghttp2.  You can copy the binary using docker cp.  For
-# example, to copy nghttpx binary to host file system location
-# /path/to/dest, do this:
-#
-# $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
-
-
-# Only use standalone-toolchain for reduce size
-FROM ubuntu:xenial
-MAINTAINER Tatsuhiro Tsujikawa
-ENV ANDROID_HOME /root
-ENV TOOLCHAIN $ANDROID_HOME/toolchain
-ENV PATH $TOOLCHAIN/bin:$PATH
-
-ENV NDK_VERSION r14b
-
-WORKDIR /root
-RUN apt-get update && \
-    apt-get install -y unzip make binutils autoconf \
-      automake autotools-dev libtool pkg-config git \
-      curl dpkg-dev libxml2-dev genisoimage libc6-i386 \
-      lib32stdc++6 python&& \
-    rm -rf /var/cache/apk/*
-
-# Install toolchain
-RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip && \
-   unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip && \
-   rm android-ndk-$NDK_VERSION-linux-x86_64.zip && \
-   mkdir -p $ANDROID_HOME/toolchain && \
-   $ANDROID_HOME/android-ndk-$NDK_VERSION/build/tools/make-standalone-toolchain.sh \
-       --install-dir=$ANDROID_HOME/toolchain \
-       --toolchain=arm-linux-androideabi-4.9 \
-       --force && \
-   rm -r android-ndk-$NDK_VERSION
-
-ENV PREFIX /root/usr/local
-
-# Setup version of libraries
-ENV OPENSSL_VERSION 1.0.2d
-ENV SPDYLAY_VERSION v1.4.0
-ENV LIBEV_VERSION 4.19
-ENV ZLIB_VERSION 1.2.8
-ENV CARES_VERSION 1.13.0
-ENV NGHTTP2_VERSION v1.24.0
-
-WORKDIR /root/build
-RUN git clone https://github.com/tatsuhiro-t/spdylay -b $SPDYLAY_VERSION --depth 1
-WORKDIR /root/build/spdylay
-RUN autoreconf -i && \
-    ./configure \
-    --disable-shared \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --prefix=$PREFIX \
-    --without-libxml2 \
-    --disable-src \
-    --disable-examples \
-    CPPFLAGS="-I$PREFIX/include" \
-    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-L$PREFIX/lib" && \
-    make install
-
-WORKDIR /root/build
-RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && \
-    tar xf openssl-$OPENSSL_VERSION.tar.gz && \
-    rm openssl-$OPENSSL_VERSION.tar.gz
-
-WORKDIR /root/build/openssl-$OPENSSL_VERSION
-RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
-    ./Configure --prefix=$PREFIX android && \
-    make && make install_sw
-
-WORKDIR /root/build
-RUN curl -L -O http://dist.schmorp.de/libev/Attic/libev-$LIBEV_VERSION.tar.gz && \
-    curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
-    tar xf libev-$LIBEV_VERSION.tar.gz && \
-    rm libev-$LIBEV_VERSION.tar.gz
-
-WORKDIR /root/build/libev-$LIBEV_VERSION
-RUN patch -p1 < ../libev-4.19-android.patch && \
-    ./configure \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --prefix=$PREFIX \
-    --disable-shared \
-    --enable-static \
-    CPPFLAGS=-I$PREFIX/include \
-    LDFLAGS=-L$PREFIX/lib && \
-    make install
-
-WORKDIR /root/build
-RUN curl -L -O https://downloads.sourceforge.net/project/libpng/zlib/$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz && \
-    tar xf zlib-$ZLIB_VERSION.tar.gz && \
-    rm zlib-$ZLIB_VERSION.tar.gz
-
-WORKDIR /root/build/zlib-$ZLIB_VERSION
-RUN HOST=arm-linux-androideabi \
-    CC=$HOST-gcc \
-    AR=$HOST-ar \
-    LD=$HOST-ld \
-    RANLIB=$HOST-ranlib \
-    STRIP=$HOST-strip \
-    ./configure \
-    --prefix=$PREFIX \
-    --libdir=$PREFIX/lib \
-    --includedir=$PREFIX/include \
-    --static && \
-    make install
-
-
-WORKDIR /root/build
-RUN curl -L -O https://c-ares.haxx.se/download/c-ares-$CARES_VERSION.tar.gz && \
-    tar xf c-ares-$CARES_VERSION.tar.gz && \
-    rm c-ares-$CARES_VERSION.tar.gz
-
-WORKDIR /root/build/c-ares-$CARES_VERSION
-RUN ./configure \
-      --host=arm-linux-androideabi \
-      --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-      --prefix=$PREFIX \
-      --disable-shared && \
-    make install
-
-WORKDIR /root/build
-RUN git clone https://github.com/nghttp2/nghttp2 -b $NGHTTP2_VERSION --depth 1
-WORKDIR /root/build/nghttp2
-RUN autoreconf -i && \
-    ./configure \
-    --enable-app \
-    --disable-shared \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --with-xml-prefix="$PREFIX" \
-    --without-libxml2 \
-    --disable-python-bindings \
-    --disable-examples \
-    --disable-threads \
-      CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
-      CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
-      CPPFLAGS="-fPIE -I$PREFIX/include" \
-      PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-      LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
-    make && \
-    arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl2.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl2.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl2.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl2.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <iostream>
-#include <string>
-
-#include <nghttp2/asio_http2_client.h>
-
-using boost::asio::ip::tcp;
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::client;
-
-void print_header(const header_map &h) {
-  for (auto &kv : h) {
-    std::cerr << kv.first << ": " << kv.second.value << "\n";
-  }
-  std::cerr << std::endl;
-}
-
-void print_header(const response &res) {
-  std::cerr << "HTTP/2 " << res.status_code() << "\n";
-  print_header(res.header());
-}
-
-void print_header(const request &req) {
-  auto &uri = req.uri();
-  std::cerr << req.method() << " " << uri.scheme << "://" << uri.host
-            << uri.path;
-  if (!uri.raw_query.empty()) {
-    std::cerr << "?" << uri.raw_query;
-  }
-  std::cerr << " HTTP/2\n";
-  print_header(req.header());
-}
-
-int main(int argc, char *argv[]) {
-  try {
-    if (argc < 2) {
-      std::cerr << "Usage: asio-cl URI" << std::endl;
-      return 1;
-    }
-    boost::system::error_code ec;
-    boost::asio::io_service io_service;
-
-    std::string uri = argv[1];
-    std::string scheme, host, service;
-
-    if (host_service_from_uri(ec, scheme, host, service, uri)) {
-      std::cerr << "error: bad URI: " << ec.message() << std::endl;
-      return 1;
-    }
-
-    boost::asio::ssl::context tls_ctx(boost::asio::ssl::context::sslv23);
-    tls_ctx.set_default_verify_paths();
-    // disabled to make development easier...
-    // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
-    configure_tls_context(ec, tls_ctx);
-
-    auto sess = scheme == "https" ? session(io_service, tls_ctx, host, service)
-                                  : session(io_service, host, service);
-
-    sess.on_connect([&sess, &uri](tcp::resolver::iterator endpoint_it) {
-      std::cerr << "connected to " << (*endpoint_it).endpoint() << std::endl;
-      boost::system::error_code ec;
-      auto req = sess.submit(ec, "GET", uri, {{"cookie", {"foo=bar", true}}});
-      if (ec) {
-        std::cerr << "error: " << ec.message() << std::endl;
-        return;
-      }
-
-      req->on_response([](const response &res) {
-        std::cerr << "response header was received" << std::endl;
-        print_header(res);
-
-        res.on_data([](const uint8_t *data, std::size_t len) {
-          std::cerr.write(reinterpret_cast<const char *>(data), len);
-          std::cerr << std::endl;
-        });
-      });
-
-      req->on_close([](uint32_t error_code) {
-        std::cerr << "request done with error_code=" << error_code << std::endl;
-      });
-
-      req->on_push([](const request &push_req) {
-        std::cerr << "push request was received" << std::endl;
-
-        print_header(push_req);
-
-        push_req.on_response([](const response &res) {
-          std::cerr << "push response header was received" << std::endl;
-
-          res.on_data([](const uint8_t *data, std::size_t len) {
-            std::cerr.write(reinterpret_cast<const char *>(data), len);
-            std::cerr << std::endl;
-          });
-        });
-      });
-    });
-
-    sess.on_error([](const boost::system::error_code &ec) {
-      std::cerr << "error: " << ec.message() << std::endl;
-    });
-
-    io_service.run();
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-cl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <iostream>
-
-#include <nghttp2/asio_http2_client.h>
-
-using boost::asio::ip::tcp;
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::client;
-
-int main(int argc, char *argv[]) {
-  try {
-    if (argc < 2) {
-      std::cerr << "Usage: asio-cl URI" << std::endl;
-      return 1;
-    }
-    boost::system::error_code ec;
-    boost::asio::io_service io_service;
-
-    std::string uri = argv[1];
-    std::string scheme, host, service;
-
-    if (host_service_from_uri(ec, scheme, host, service, uri)) {
-      std::cerr << "error: bad URI: " << ec.message() << std::endl;
-      return 1;
-    }
-
-    boost::asio::ssl::context tls_ctx(boost::asio::ssl::context::sslv23);
-    tls_ctx.set_default_verify_paths();
-    // disabled to make development easier...
-    // tls_ctx.set_verify_mode(boost::asio::ssl::verify_peer);
-    configure_tls_context(ec, tls_ctx);
-
-    auto sess = scheme == "https" ? session(io_service, tls_ctx, host, service)
-                                  : session(io_service, host, service);
-
-    sess.on_connect([&sess, &uri](tcp::resolver::iterator endpoint_it) {
-      boost::system::error_code ec;
-      auto req = sess.submit(ec, "GET", uri);
-
-      if (ec) {
-        std::cerr << "error: " << ec.message() << std::endl;
-        return;
-      }
-
-      req->on_response([](const response &res) {
-        std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-        for (auto &kv : res.header()) {
-          std::cerr << kv.first << ": " << kv.second.value << "\n";
-        }
-        std::cerr << std::endl;
-
-        res.on_data([](const uint8_t *data, std::size_t len) {
-          std::cerr.write(reinterpret_cast<const char *>(data), len);
-          std::cerr << std::endl;
-        });
-      });
-
-      req->on_close([&sess](uint32_t error_code) { sess.shutdown(); });
-    });
-
-    sess.on_error([](const boost::system::error_code &ec) {
-      std::cerr << "error: " << ec.message() << std::endl;
-    });
-
-    io_service.run();
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv2.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv2.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv2.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv2.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// main.cpp
-// ~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#include <iostream>
-#include <string>
-
-#include <nghttp2/asio_http2_server.h>
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::server;
-
-int main(int argc, char *argv[]) {
-  try {
-    // Check command line arguments.
-    if (argc < 5) {
-      std::cerr << "Usage: asio-sv2 <address> <port> <threads> <doc-root> "
-                << "[<private-key-file> <cert-file>]\n";
-      return 1;
-    }
-
-    boost::system::error_code ec;
-
-    std::string addr = argv[1];
-    std::string port = argv[2];
-    std::size_t num_threads = std::stoi(argv[3]);
-    std::string docroot = argv[4];
-
-    http2 server;
-
-    server.num_threads(num_threads);
-
-    server.handle("/", [&docroot](const request &req, const response &res) {
-      auto path = percent_decode(req.uri().path);
-      if (!check_path(path)) {
-        res.write_head(404);
-        res.end();
-        return;
-      }
-
-      if (path == "/") {
-        path = "/index.html";
-      }
-
-      path = docroot + path;
-      auto fd = open(path.c_str(), O_RDONLY);
-      if (fd == -1) {
-        res.write_head(404);
-        res.end();
-        return;
-      }
-
-      auto header = header_map();
-
-      struct stat stbuf;
-      if (stat(path.c_str(), &stbuf) == 0) {
-        header.emplace("content-length",
-                       header_value{std::to_string(stbuf.st_size)});
-        header.emplace("last-modified",
-                       header_value{http_date(stbuf.st_mtime)});
-      }
-      res.write_head(200, std::move(header));
-      res.end(file_generator_from_fd(fd));
-    });
-
-    if (argc >= 7) {
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-      tls.use_private_key_file(argv[5], boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file(argv[6]);
-
-      configure_tls_context_easy(ec, tls);
-
-      if (server.listen_and_serve(ec, tls, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    } else {
-      if (server.listen_and_serve(ec, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/asio-sv.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// main.cpp
-// ~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include <iostream>
-#include <string>
-
-#include <nghttp2/asio_http2_server.h>
-
-using namespace nghttp2::asio_http2;
-using namespace nghttp2::asio_http2::server;
-
-int main(int argc, char *argv[]) {
-  try {
-    // Check command line arguments.
-    if (argc < 4) {
-      std::cerr
-          << "Usage: asio-sv <address> <port> <threads> [<private-key-file> "
-          << "<cert-file>]\n";
-      return 1;
-    }
-
-    boost::system::error_code ec;
-
-    std::string addr = argv[1];
-    std::string port = argv[2];
-    std::size_t num_threads = std::stoi(argv[3]);
-
-    http2 server;
-
-    server.num_threads(num_threads);
-
-    server.handle("/", [](const request &req, const response &res) {
-      res.write_head(200, {{"foo", {"bar"}}});
-      res.end("hello, world\n");
-    });
-    server.handle("/secret/", [](const request &req, const response &res) {
-      res.write_head(200);
-      res.end("under construction!\n");
-    });
-    server.handle("/push", [](const request &req, const response &res) {
-      boost::system::error_code ec;
-      auto push = res.push(ec, "GET", "/push/1");
-      if (!ec) {
-        push->write_head(200);
-        push->end("server push FTW!\n");
-      }
-
-      res.write_head(200);
-      res.end("you'll receive server push!\n");
-    });
-    server.handle("/delay", [](const request &req, const response &res) {
-      res.write_head(200);
-
-      auto timer = std::make_shared<boost::asio::deadline_timer>(
-          res.io_service(), boost::posix_time::seconds(3));
-      auto closed = std::make_shared<bool>();
-
-      res.on_close([timer, closed](uint32_t error_code) {
-        timer->cancel();
-        *closed = true;
-      });
-
-      timer->async_wait([&res, closed](const boost::system::error_code &ec) {
-        if (ec || *closed) {
-          return;
-        }
-
-        res.end("finally!\n");
-      });
-    });
-    server.handle("/trailer", [](const request &req, const response &res) {
-      // send trailer part.
-      res.write_head(200, {{"trailers", {"digest"}}});
-
-      std::string body = "nghttp2 FTW!\n";
-      auto left = std::make_shared<size_t>(body.size());
-
-      res.end([&res, body, left](uint8_t *dst, std::size_t len,
-                                 uint32_t *data_flags) {
-        auto n = std::min(len, *left);
-        std::copy_n(body.c_str() + (body.size() - *left), n, dst);
-        *left -= n;
-        if (*left == 0) {
-          *data_flags |=
-              NGHTTP2_DATA_FLAG_EOF | NGHTTP2_DATA_FLAG_NO_END_STREAM;
-          // RFC 3230 Instance Digests in HTTP.  The digest value is
-          // SHA-256 message digest of body.
-          res.write_trailer(
-              {{"digest",
-                {"SHA-256=qqXqskW7F3ueBSvmZRCiSwl2ym4HRO0M/pvQCBlSDis="}}});
-        }
-        return n;
-      });
-    });
-
-    if (argc >= 6) {
-      boost::asio::ssl::context tls(boost::asio::ssl::context::sslv23);
-      tls.use_private_key_file(argv[4], boost::asio::ssl::context::pem);
-      tls.use_certificate_chain_file(argv[5]);
-
-      configure_tls_context_easy(ec, tls);
-
-      if (server.listen_and_serve(ec, tls, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    } else {
-      if (server.listen_and_serve(ec, addr, port)) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-  } catch (std::exception &e) {
-    std::cerr << "exception: " << e.what() << "\n";
-  }
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/client.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/client.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/client.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/client.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,727 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/*
- * This program is written to show how to use nghttp2 API in C and
- * intentionally made simple.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <inttypes.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif /* HAVE_NETDB_H */
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
-#include <netinet/tcp.h>
-#include <poll.h>
-#include <signal.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <errno.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/conf.h>
-
-enum { IO_NONE, WANT_READ, WANT_WRITE };
-
-#define MAKE_NV(NAME, VALUE)                                                   \
-  {                                                                            \
-    (uint8_t *)NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1,    \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-#define MAKE_NV_CS(NAME, VALUE)                                                \
-  {                                                                            \
-    (uint8_t *)NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, strlen(VALUE),        \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-struct Connection {
-  SSL *ssl;
-  nghttp2_session *session;
-  /* WANT_READ if SSL/TLS connection needs more input; or WANT_WRITE
-     if it needs more output; or IO_NONE. This is necessary because
-     SSL/TLS re-negotiation is possible at any time. nghttp2 API
-     offers similar functions like nghttp2_session_want_read() and
-     nghttp2_session_want_write() but they do not take into account
-     SSL/TSL connection. */
-  int want_io;
-};
-
-struct Request {
-  char *host;
-  /* In this program, path contains query component as well. */
-  char *path;
-  /* This is the concatenation of host and port with ":" in
-     between. */
-  char *hostport;
-  /* Stream ID for this request. */
-  int32_t stream_id;
-  uint16_t port;
-};
-
-struct URI {
-  const char *host;
-  /* In this program, path contains query component as well. */
-  const char *path;
-  size_t pathlen;
-  const char *hostport;
-  size_t hostlen;
-  size_t hostportlen;
-  uint16_t port;
-};
-
-/*
- * Returns copy of string |s| with the length |len|. The returned
- * string is NULL-terminated.
- */
-static char *strcopy(const char *s, size_t len) {
-  char *dst;
-  dst = malloc(len + 1);
-  memcpy(dst, s, len);
-  dst[len] = '\0';
-  return dst;
-}
-
-/*
- * Prints error message |msg| and exit.
- */
-NGHTTP2_NORETURN
-static void die(const char *msg) {
-  fprintf(stderr, "FATAL: %s\n", msg);
-  exit(EXIT_FAILURE);
-}
-
-/*
- * Prints error containing the function name |func| and message |msg|
- * and exit.
- */
-NGHTTP2_NORETURN
-static void dief(const char *func, const char *msg) {
-  fprintf(stderr, "FATAL: %s: %s\n", func, msg);
-  exit(EXIT_FAILURE);
-}
-
-/*
- * Prints error containing the function name |func| and error code
- * |error_code| and exit.
- */
-NGHTTP2_NORETURN
-static void diec(const char *func, int error_code) {
-  fprintf(stderr, "FATAL: %s: error_code=%d, msg=%s\n", func, error_code,
-          nghttp2_strerror(error_code));
-  exit(EXIT_FAILURE);
-}
-
-/*
- * The implementation of nghttp2_send_callback type. Here we write
- * |data| with size |length| to the network and return the number of
- * bytes actually written. See the documentation of
- * nghttp2_send_callback for the details.
- */
-static ssize_t send_callback(nghttp2_session *session, const uint8_t *data,
-                             size_t length, int flags, void *user_data) {
-  struct Connection *connection;
-  int rv;
-  (void)session;
-  (void)flags;
-
-  connection = (struct Connection *)user_data;
-  connection->want_io = IO_NONE;
-  ERR_clear_error();
-  rv = SSL_write(connection->ssl, data, (int)length);
-  if (rv <= 0) {
-    int err = SSL_get_error(connection->ssl, rv);
-    if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
-      connection->want_io =
-          (err == SSL_ERROR_WANT_READ ? WANT_READ : WANT_WRITE);
-      rv = NGHTTP2_ERR_WOULDBLOCK;
-    } else {
-      rv = NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return rv;
-}
-
-/*
- * The implementation of nghttp2_recv_callback type. Here we read data
- * from the network and write them in |buf|. The capacity of |buf| is
- * |length| bytes. Returns the number of bytes stored in |buf|. See
- * the documentation of nghttp2_recv_callback for the details.
- */
-static ssize_t recv_callback(nghttp2_session *session, uint8_t *buf,
-                             size_t length, int flags, void *user_data) {
-  struct Connection *connection;
-  int rv;
-  (void)session;
-  (void)flags;
-
-  connection = (struct Connection *)user_data;
-  connection->want_io = IO_NONE;
-  ERR_clear_error();
-  rv = SSL_read(connection->ssl, buf, (int)length);
-  if (rv < 0) {
-    int err = SSL_get_error(connection->ssl, rv);
-    if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
-      connection->want_io =
-          (err == SSL_ERROR_WANT_READ ? WANT_READ : WANT_WRITE);
-      rv = NGHTTP2_ERR_WOULDBLOCK;
-    } else {
-      rv = NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  } else if (rv == 0) {
-    rv = NGHTTP2_ERR_EOF;
-  }
-  return rv;
-}
-
-static int on_frame_send_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data) {
-  size_t i;
-  (void)user_data;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    if (nghttp2_session_get_stream_user_data(session, frame->hd.stream_id)) {
-      const nghttp2_nv *nva = frame->headers.nva;
-      printf("[INFO] C ----------------------------> S (HEADERS)\n");
-      for (i = 0; i < frame->headers.nvlen; ++i) {
-        fwrite(nva[i].name, 1, nva[i].namelen, stdout);
-        printf(": ");
-        fwrite(nva[i].value, 1, nva[i].valuelen, stdout);
-        printf("\n");
-      }
-    }
-    break;
-  case NGHTTP2_RST_STREAM:
-    printf("[INFO] C ----------------------------> S (RST_STREAM)\n");
-    break;
-  case NGHTTP2_GOAWAY:
-    printf("[INFO] C ----------------------------> S (GOAWAY)\n");
-    break;
-  }
-  return 0;
-}
-
-static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data) {
-  size_t i;
-  (void)user_data;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE) {
-      const nghttp2_nv *nva = frame->headers.nva;
-      struct Request *req;
-      req = nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-      if (req) {
-        printf("[INFO] C <---------------------------- S (HEADERS)\n");
-        for (i = 0; i < frame->headers.nvlen; ++i) {
-          fwrite(nva[i].name, 1, nva[i].namelen, stdout);
-          printf(": ");
-          fwrite(nva[i].value, 1, nva[i].valuelen, stdout);
-          printf("\n");
-        }
-      }
-    }
-    break;
-  case NGHTTP2_RST_STREAM:
-    printf("[INFO] C <---------------------------- S (RST_STREAM)\n");
-    break;
-  case NGHTTP2_GOAWAY:
-    printf("[INFO] C <---------------------------- S (GOAWAY)\n");
-    break;
-  }
-  return 0;
-}
-
-/*
- * The implementation of nghttp2_on_stream_close_callback type. We use
- * this function to know the response is fully received. Since we just
- * fetch 1 resource in this program, after reception of the response,
- * we submit GOAWAY and close the session.
- */
-static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                    uint32_t error_code, void *user_data) {
-  struct Request *req;
-  (void)error_code;
-  (void)user_data;
-
-  req = nghttp2_session_get_stream_user_data(session, stream_id);
-  if (req) {
-    int rv;
-    rv = nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
-
-    if (rv != 0) {
-      diec("nghttp2_session_terminate_session", rv);
-    }
-  }
-  return 0;
-}
-
-/*
- * The implementation of nghttp2_on_data_chunk_recv_callback type. We
- * use this function to print the received response body.
- */
-static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id, const uint8_t *data,
-                                       size_t len, void *user_data) {
-  struct Request *req;
-  (void)flags;
-  (void)user_data;
-
-  req = nghttp2_session_get_stream_user_data(session, stream_id);
-  if (req) {
-    printf("[INFO] C <---------------------------- S (DATA chunk)\n"
-           "%lu bytes\n",
-           (unsigned long int)len);
-    fwrite(data, 1, len, stdout);
-    printf("\n");
-  }
-  return 0;
-}
-
-/*
- * Setup callback functions. nghttp2 API offers many callback
- * functions, but most of them are optional. The send_callback is
- * always required. Since we use nghttp2_session_recv(), the
- * recv_callback is also required.
- */
-static void setup_nghttp2_callbacks(nghttp2_session_callbacks *callbacks) {
-  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
-
-  nghttp2_session_callbacks_set_recv_callback(callbacks, recv_callback);
-
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-}
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-/*
- * Callback function for TLS NPN. Since this program only supports
- * HTTP/2 protocol, if server does not offer HTTP/2 the nghttp2
- * library supports, we terminate program.
- */
-static int select_next_proto_cb(SSL *ssl, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  int rv;
-  (void)ssl;
-  (void)arg;
-
-  /* nghttp2_select_next_protocol() selects HTTP/2 protocol the
-     nghttp2 library supports. */
-  rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
-  if (rv <= 0) {
-    die("Server did not advertise HTTP/2 protocol");
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-
-/*
- * Setup SSL/TLS context.
- */
-static void init_ssl_ctx(SSL_CTX *ssl_ctx) {
-  /* Disable SSLv2 and enable all workarounds for buggy servers */
-  SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
-  SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
-  SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
-  /* Set NPN callback */
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, NULL);
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-}
-
-static void ssl_handshake(SSL *ssl, int fd) {
-  int rv;
-  if (SSL_set_fd(ssl, fd) == 0) {
-    dief("SSL_set_fd", ERR_error_string(ERR_get_error(), NULL));
-  }
-  ERR_clear_error();
-  rv = SSL_connect(ssl);
-  if (rv <= 0) {
-    dief("SSL_connect", ERR_error_string(ERR_get_error(), NULL));
-  }
-}
-
-/*
- * Connects to the host |host| and port |port|.  This function returns
- * the file descriptor of the client socket.
- */
-static int connect_to(const char *host, uint16_t port) {
-  struct addrinfo hints;
-  int fd = -1;
-  int rv;
-  char service[NI_MAXSERV];
-  struct addrinfo *res, *rp;
-  snprintf(service, sizeof(service), "%u", port);
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  rv = getaddrinfo(host, service, &hints, &res);
-  if (rv != 0) {
-    dief("getaddrinfo", gai_strerror(rv));
-  }
-  for (rp = res; rp; rp = rp->ai_next) {
-    fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if (fd == -1) {
-      continue;
-    }
-    while ((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 &&
-           errno == EINTR)
-      ;
-    if (rv == 0) {
-      break;
-    }
-    close(fd);
-    fd = -1;
-  }
-  freeaddrinfo(res);
-  return fd;
-}
-
-static void make_non_block(int fd) {
-  int flags, rv;
-  while ((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR)
-    ;
-  if (flags == -1) {
-    dief("fcntl", strerror(errno));
-  }
-  while ((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR)
-    ;
-  if (rv == -1) {
-    dief("fcntl", strerror(errno));
-  }
-}
-
-static void set_tcp_nodelay(int fd) {
-  int val = 1;
-  int rv;
-  rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val));
-  if (rv == -1) {
-    dief("setsockopt", strerror(errno));
-  }
-}
-
-/*
- * Update |pollfd| based on the state of |connection|.
- */
-static void ctl_poll(struct pollfd *pollfd, struct Connection *connection) {
-  pollfd->events = 0;
-  if (nghttp2_session_want_read(connection->session) ||
-      connection->want_io == WANT_READ) {
-    pollfd->events |= POLLIN;
-  }
-  if (nghttp2_session_want_write(connection->session) ||
-      connection->want_io == WANT_WRITE) {
-    pollfd->events |= POLLOUT;
-  }
-}
-
-/*
- * Submits the request |req| to the connection |connection|.  This
- * function does not send packets; just append the request to the
- * internal queue in |connection->session|.
- */
-static void submit_request(struct Connection *connection, struct Request *req) {
-  int32_t stream_id;
-  /* Make sure that the last item is NULL */
-  const nghttp2_nv nva[] = {MAKE_NV(":method", "GET"),
-                            MAKE_NV_CS(":path", req->path),
-                            MAKE_NV(":scheme", "https"),
-                            MAKE_NV_CS(":authority", req->hostport),
-                            MAKE_NV("accept", "*/*"),
-                            MAKE_NV("user-agent", "nghttp2/" NGHTTP2_VERSION)};
-
-  stream_id = nghttp2_submit_request(connection->session, NULL, nva,
-                                     sizeof(nva) / sizeof(nva[0]), NULL, req);
-
-  if (stream_id < 0) {
-    diec("nghttp2_submit_request", stream_id);
-  }
-
-  req->stream_id = stream_id;
-  printf("[INFO] Stream ID = %d\n", stream_id);
-}
-
-/*
- * Performs the network I/O.
- */
-static void exec_io(struct Connection *connection) {
-  int rv;
-  rv = nghttp2_session_recv(connection->session);
-  if (rv != 0) {
-    diec("nghttp2_session_recv", rv);
-  }
-  rv = nghttp2_session_send(connection->session);
-  if (rv != 0) {
-    diec("nghttp2_session_send", rv);
-  }
-}
-
-static void request_init(struct Request *req, const struct URI *uri) {
-  req->host = strcopy(uri->host, uri->hostlen);
-  req->port = uri->port;
-  req->path = strcopy(uri->path, uri->pathlen);
-  req->hostport = strcopy(uri->hostport, uri->hostportlen);
-  req->stream_id = -1;
-}
-
-static void request_free(struct Request *req) {
-  free(req->host);
-  free(req->path);
-  free(req->hostport);
-}
-
-/*
- * Fetches the resource denoted by |uri|.
- */
-static void fetch_uri(const struct URI *uri) {
-  nghttp2_session_callbacks *callbacks;
-  int fd;
-  SSL_CTX *ssl_ctx;
-  SSL *ssl;
-  struct Request req;
-  struct Connection connection;
-  int rv;
-  nfds_t npollfds = 1;
-  struct pollfd pollfds[1];
-
-  request_init(&req, uri);
-
-  /* Establish connection and setup SSL */
-  fd = connect_to(req.host, req.port);
-  if (fd == -1) {
-    die("Could not open file descriptor");
-  }
-  ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if (ssl_ctx == NULL) {
-    dief("SSL_CTX_new", ERR_error_string(ERR_get_error(), NULL));
-  }
-  init_ssl_ctx(ssl_ctx);
-  ssl = SSL_new(ssl_ctx);
-  if (ssl == NULL) {
-    dief("SSL_new", ERR_error_string(ERR_get_error(), NULL));
-  }
-  /* To simplify the program, we perform SSL/TLS handshake in blocking
-     I/O. */
-  ssl_handshake(ssl, fd);
-
-  connection.ssl = ssl;
-  connection.want_io = IO_NONE;
-
-  /* Here make file descriptor non-block */
-  make_non_block(fd);
-  set_tcp_nodelay(fd);
-
-  printf("[INFO] SSL/TLS handshake completed\n");
-
-  rv = nghttp2_session_callbacks_new(&callbacks);
-
-  if (rv != 0) {
-    diec("nghttp2_session_callbacks_new", rv);
-  }
-
-  setup_nghttp2_callbacks(callbacks);
-
-  rv = nghttp2_session_client_new(&connection.session, callbacks, &connection);
-
-  nghttp2_session_callbacks_del(callbacks);
-
-  if (rv != 0) {
-    diec("nghttp2_session_client_new", rv);
-  }
-
-  rv = nghttp2_submit_settings(connection.session, NGHTTP2_FLAG_NONE, NULL, 0);
-
-  if (rv != 0) {
-    diec("nghttp2_submit_settings", rv);
-  }
-
-  /* Submit the HTTP request to the outbound queue. */
-  submit_request(&connection, &req);
-
-  pollfds[0].fd = fd;
-  ctl_poll(pollfds, &connection);
-
-  /* Event loop */
-  while (nghttp2_session_want_read(connection.session) ||
-         nghttp2_session_want_write(connection.session)) {
-    int nfds = poll(pollfds, npollfds, -1);
-    if (nfds == -1) {
-      dief("poll", strerror(errno));
-    }
-    if (pollfds[0].revents & (POLLIN | POLLOUT)) {
-      exec_io(&connection);
-    }
-    if ((pollfds[0].revents & POLLHUP) || (pollfds[0].revents & POLLERR)) {
-      die("Connection error");
-    }
-    ctl_poll(pollfds, &connection);
-  }
-
-  /* Resource cleanup */
-  nghttp2_session_del(connection.session);
-  SSL_shutdown(ssl);
-  SSL_free(ssl);
-  SSL_CTX_free(ssl_ctx);
-  shutdown(fd, SHUT_WR);
-  close(fd);
-  request_free(&req);
-}
-
-static int parse_uri(struct URI *res, const char *uri) {
-  /* We only interested in https */
-  size_t len, i, offset;
-  int ipv6addr = 0;
-  memset(res, 0, sizeof(struct URI));
-  len = strlen(uri);
-  if (len < 9 || memcmp("https://", uri, 8) != 0) {
-    return -1;
-  }
-  offset = 8;
-  res->host = res->hostport = &uri[offset];
-  res->hostlen = 0;
-  if (uri[offset] == '[') {
-    /* IPv6 literal address */
-    ++offset;
-    ++res->host;
-    ipv6addr = 1;
-    for (i = offset; i < len; ++i) {
-      if (uri[i] == ']') {
-        res->hostlen = i - offset;
-        offset = i + 1;
-        break;
-      }
-    }
-  } else {
-    const char delims[] = ":/?#";
-    for (i = offset; i < len; ++i) {
-      if (strchr(delims, uri[i]) != NULL) {
-        break;
-      }
-    }
-    res->hostlen = i - offset;
-    offset = i;
-  }
-  if (res->hostlen == 0) {
-    return -1;
-  }
-  /* Assuming https */
-  res->port = 443;
-  if (offset < len) {
-    if (uri[offset] == ':') {
-      /* port */
-      const char delims[] = "/?#";
-      int port = 0;
-      ++offset;
-      for (i = offset; i < len; ++i) {
-        if (strchr(delims, uri[i]) != NULL) {
-          break;
-        }
-        if ('0' <= uri[i] && uri[i] <= '9') {
-          port *= 10;
-          port += uri[i] - '0';
-          if (port > 65535) {
-            return -1;
-          }
-        } else {
-          return -1;
-        }
-      }
-      if (port == 0) {
-        return -1;
-      }
-      offset = i;
-      res->port = (uint16_t)port;
-    }
-  }
-  res->hostportlen = (size_t)(uri + offset + ipv6addr - res->host);
-  for (i = offset; i < len; ++i) {
-    if (uri[i] == '#') {
-      break;
-    }
-  }
-  if (i - offset == 0) {
-    res->path = "/";
-    res->pathlen = 1;
-  } else {
-    res->path = &uri[offset];
-    res->pathlen = i - offset;
-  }
-  return 0;
-}
-
-int main(int argc, char **argv) {
-  struct URI uri;
-  struct sigaction act;
-  int rv;
-
-  if (argc < 2) {
-    die("Specify a https URI");
-  }
-
-  memset(&act, 0, sizeof(struct sigaction));
-  act.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &act, 0);
-
-  SSL_load_error_strings();
-  SSL_library_init();
-
-  rv = parse_uri(&uri, argv[1]);
-  if (rv != 0) {
-    die("parse_uri failed");
-  }
-  fetch_uri(&uri);
-  return EXIT_SUCCESS;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-if(ENABLE_EXAMPLES)
-  file(GLOB c_sources *.c)
-  set_source_files_properties(${c_sources} PROPERTIES
-    COMPILE_FLAGS "${WARNCFLAGS}")
-  file(GLOB cxx_sources *.cc)
-  set_source_files_properties(${cxx_sources} PROPERTIES
-    COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}")
-
-  include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    "${CMAKE_CURRENT_SOURCE_DIR}/../third-party"
-
-    ${LIBEVENT_INCLUDE_DIRS}
-    ${OPENSSL_INCLUDE_DIRS}
-  )
-
-  link_libraries(
-    nghttp2
-    ${LIBEVENT_OPENSSL_LIBRARIES}
-    ${OPENSSL_LIBRARIES}
-    ${APP_LIBRARIES}
-  )
-
-  add_executable(client           client.c $<TARGET_OBJECTS:http-parser>)
-  add_executable(libevent-client  libevent-client.c $<TARGET_OBJECTS:http-parser>)
-  add_executable(libevent-server  libevent-server.c $<TARGET_OBJECTS:http-parser>)
-  add_executable(deflate          deflate.c $<TARGET_OBJECTS:http-parser>)
-
-  if(ENABLE_ASIO_LIB)
-    foreach(name asio-sv asio-sv2 asio-cl asio-cl2)
-      add_executable(${name} ${name}.cc $<TARGET_OBJECTS:http-parser>)
-      target_include_directories(${name} PRIVATE
-        ${OPENSSL_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-      )
-      target_link_libraries(${name}
-        nghttp2
-        nghttp2_asio
-        ${JEMALLOC_LIBRARIES}
-        ${OPENSSL_LIBRARIES}
-        ${Boost_LIBRARIES}
-        ${APP_LIBRARIES}
-      )
-    endforeach()
-  endif()
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/deflate.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/deflate.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/deflate.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/deflate.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* !HAVE_CONFIG_H */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <nghttp2/nghttp2.h>
-
-#define MAKE_NV(K, V)                                                          \
-  {                                                                            \
-    (uint8_t *)K, (uint8_t *)V, sizeof(K) - 1, sizeof(V) - 1,                  \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-static void deflate(nghttp2_hd_deflater *deflater,
-                    nghttp2_hd_inflater *inflater, const nghttp2_nv *const nva,
-                    size_t nvlen);
-
-static int inflate_header_block(nghttp2_hd_inflater *inflater, uint8_t *in,
-                                size_t inlen, int final);
-
-int main() {
-  int rv;
-  nghttp2_hd_deflater *deflater;
-  nghttp2_hd_inflater *inflater;
-  /* Define 1st header set.  This is looks like a HTTP request. */
-  nghttp2_nv nva1[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "example.org"),
-      MAKE_NV(":path", "/"), MAKE_NV("user-agent", "libnghttp2"),
-      MAKE_NV("accept-encoding", "gzip, deflate")};
-  /* Define 2nd header set */
-  nghttp2_nv nva2[] = {MAKE_NV(":scheme", "https"),
-                       MAKE_NV(":authority", "example.org"),
-                       MAKE_NV(":path", "/stylesheet/style.css"),
-                       MAKE_NV("user-agent", "libnghttp2"),
-                       MAKE_NV("accept-encoding", "gzip, deflate"),
-                       MAKE_NV("referer", "https://example.org")};
-
-  rv = nghttp2_hd_deflate_new(&deflater, 4096);
-
-  if (rv != 0) {
-    fprintf(stderr, "nghttp2_hd_deflate_init failed with error: %s\n",
-            nghttp2_strerror(rv));
-    exit(EXIT_FAILURE);
-  }
-
-  rv = nghttp2_hd_inflate_new(&inflater);
-
-  if (rv != 0) {
-    fprintf(stderr, "nghttp2_hd_inflate_init failed with error: %s\n",
-            nghttp2_strerror(rv));
-    exit(EXIT_FAILURE);
-  }
-
-  /* Encode and decode 1st header set */
-  deflate(deflater, inflater, nva1, sizeof(nva1) / sizeof(nva1[0]));
-
-  /* Encode and decode 2nd header set, using differential encoding
-     using state after encoding 1st header set. */
-  deflate(deflater, inflater, nva2, sizeof(nva2) / sizeof(nva2[0]));
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-
-  return 0;
-}
-
-static void deflate(nghttp2_hd_deflater *deflater,
-                    nghttp2_hd_inflater *inflater, const nghttp2_nv *const nva,
-                    size_t nvlen) {
-  ssize_t rv;
-  uint8_t *buf;
-  size_t buflen;
-  size_t outlen;
-  size_t i;
-  size_t sum;
-
-  sum = 0;
-
-  for (i = 0; i < nvlen; ++i) {
-    sum += nva[i].namelen + nva[i].valuelen;
-  }
-
-  printf("Input (%zu byte(s)):\n\n", sum);
-
-  for (i = 0; i < nvlen; ++i) {
-    fwrite(nva[i].name, 1, nva[i].namelen, stdout);
-    printf(": ");
-    fwrite(nva[i].value, 1, nva[i].valuelen, stdout);
-    printf("\n");
-  }
-
-  buflen = nghttp2_hd_deflate_bound(deflater, nva, nvlen);
-  buf = malloc(buflen);
-
-  rv = nghttp2_hd_deflate_hd(deflater, buf, buflen, nva, nvlen);
-
-  if (rv < 0) {
-    fprintf(stderr, "nghttp2_hd_deflate_hd() failed with error: %s\n",
-            nghttp2_strerror((int)rv));
-
-    free(buf);
-
-    exit(EXIT_FAILURE);
-  }
-
-  outlen = (size_t)rv;
-
-  printf("\nDeflate (%zu byte(s), ratio %.02f):\n\n", outlen,
-         sum == 0 ? 0 : (double)outlen / (double)sum);
-
-  for (i = 0; i < outlen; ++i) {
-    if ((i & 0x0fu) == 0) {
-      printf("%08zX: ", i);
-    }
-
-    printf("%02X ", buf[i]);
-
-    if (((i + 1) & 0x0fu) == 0) {
-      printf("\n");
-    }
-  }
-
-  printf("\n\nInflate:\n\n");
-
-  /* We pass 1 to final parameter, because buf contains whole deflated
-     header data. */
-  rv = inflate_header_block(inflater, buf, outlen, 1);
-
-  if (rv != 0) {
-    free(buf);
-
-    exit(EXIT_FAILURE);
-  }
-
-  printf("\n-----------------------------------------------------------"
-         "--------------------\n");
-
-  free(buf);
-}
-
-int inflate_header_block(nghttp2_hd_inflater *inflater, uint8_t *in,
-                         size_t inlen, int final) {
-  ssize_t rv;
-
-  for (;;) {
-    nghttp2_nv nv;
-    int inflate_flags = 0;
-    size_t proclen;
-
-    rv = nghttp2_hd_inflate_hd(inflater, &nv, &inflate_flags, in, inlen, final);
-
-    if (rv < 0) {
-      fprintf(stderr, "inflate failed with error code %zd", rv);
-      return -1;
-    }
-
-    proclen = (size_t)rv;
-
-    in += proclen;
-    inlen -= proclen;
-
-    if (inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
-      fwrite(nv.name, 1, nv.namelen, stderr);
-      fprintf(stderr, ": ");
-      fwrite(nv.value, 1, nv.valuelen, stderr);
-      fprintf(stderr, "\n");
-    }
-
-    if (inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
-      nghttp2_hd_inflate_end_headers(inflater);
-      break;
-    }
-
-    if ((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 && inlen == 0) {
-      break;
-    }
-  }
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-client.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-client.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-client.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-client.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,625 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef __sgi
-#  include <string.h>
-#  define errx(exitcode, format, args...)                                      \
-    {                                                                          \
-      warnx(format, ##args);                                                   \
-      exit(exitcode);                                                          \
-    }
-#  define warnx(format, args...) fprintf(stderr, format "\n", ##args)
-char *strndup(const char *s, size_t size);
-#endif
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
-#include <netinet/tcp.h>
-#ifndef __sgi
-#  include <err.h>
-#endif
-#include <signal.h>
-#include <string.h>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/conf.h>
-
-#include <event.h>
-#include <event2/event.h>
-#include <event2/bufferevent_ssl.h>
-#include <event2/dns.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "http-parser/http_parser.h"
-
-#define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
-
-typedef struct {
-  /* The NULL-terminated URI string to retrieve. */
-  const char *uri;
-  /* Parsed result of the |uri| */
-  struct http_parser_url *u;
-  /* The authority portion of the |uri|, not NULL-terminated */
-  char *authority;
-  /* The path portion of the |uri|, including query, not
-     NULL-terminated */
-  char *path;
-  /* The length of the |authority| */
-  size_t authoritylen;
-  /* The length of the |path| */
-  size_t pathlen;
-  /* The stream ID of this stream */
-  int32_t stream_id;
-} http2_stream_data;
-
-typedef struct {
-  nghttp2_session *session;
-  struct evdns_base *dnsbase;
-  struct bufferevent *bev;
-  http2_stream_data *stream_data;
-} http2_session_data;
-
-static http2_stream_data *create_http2_stream_data(const char *uri,
-                                                   struct http_parser_url *u) {
-  /* MAX 5 digits (max 65535) + 1 ':' + 1 NULL (because of snprintf) */
-  size_t extra = 7;
-  http2_stream_data *stream_data = malloc(sizeof(http2_stream_data));
-
-  stream_data->uri = uri;
-  stream_data->u = u;
-  stream_data->stream_id = -1;
-
-  stream_data->authoritylen = u->field_data[UF_HOST].len;
-  stream_data->authority = malloc(stream_data->authoritylen + extra);
-  memcpy(stream_data->authority, &uri[u->field_data[UF_HOST].off],
-         u->field_data[UF_HOST].len);
-  if (u->field_set & (1 << UF_PORT)) {
-    stream_data->authoritylen +=
-        (size_t)snprintf(stream_data->authority + u->field_data[UF_HOST].len,
-                         extra, ":%u", u->port);
-  }
-
-  /* If we don't have path in URI, we use "/" as path. */
-  stream_data->pathlen = 1;
-  if (u->field_set & (1 << UF_PATH)) {
-    stream_data->pathlen = u->field_data[UF_PATH].len;
-  }
-  if (u->field_set & (1 << UF_QUERY)) {
-    /* +1 for '?' character */
-    stream_data->pathlen += (size_t)(u->field_data[UF_QUERY].len + 1);
-  }
-
-  stream_data->path = malloc(stream_data->pathlen);
-  if (u->field_set & (1 << UF_PATH)) {
-    memcpy(stream_data->path, &uri[u->field_data[UF_PATH].off],
-           u->field_data[UF_PATH].len);
-  } else {
-    stream_data->path[0] = '/';
-  }
-  if (u->field_set & (1 << UF_QUERY)) {
-    stream_data->path[stream_data->pathlen - u->field_data[UF_QUERY].len - 1] =
-        '?';
-    memcpy(stream_data->path + stream_data->pathlen -
-               u->field_data[UF_QUERY].len,
-           &uri[u->field_data[UF_QUERY].off], u->field_data[UF_QUERY].len);
-  }
-
-  return stream_data;
-}
-
-static void delete_http2_stream_data(http2_stream_data *stream_data) {
-  free(stream_data->path);
-  free(stream_data->authority);
-  free(stream_data);
-}
-
-/* Initializes |session_data| */
-static http2_session_data *
-create_http2_session_data(struct event_base *evbase) {
-  http2_session_data *session_data = malloc(sizeof(http2_session_data));
-
-  memset(session_data, 0, sizeof(http2_session_data));
-  session_data->dnsbase = evdns_base_new(evbase, 1);
-  return session_data;
-}
-
-static void delete_http2_session_data(http2_session_data *session_data) {
-  SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev);
-
-  if (ssl) {
-    SSL_shutdown(ssl);
-  }
-  bufferevent_free(session_data->bev);
-  session_data->bev = NULL;
-  evdns_base_free(session_data->dnsbase, 1);
-  session_data->dnsbase = NULL;
-  nghttp2_session_del(session_data->session);
-  session_data->session = NULL;
-  if (session_data->stream_data) {
-    delete_http2_stream_data(session_data->stream_data);
-    session_data->stream_data = NULL;
-  }
-  free(session_data);
-}
-
-static void print_header(FILE *f, const uint8_t *name, size_t namelen,
-                         const uint8_t *value, size_t valuelen) {
-  fwrite(name, 1, namelen, f);
-  fprintf(f, ": ");
-  fwrite(value, 1, valuelen, f);
-  fprintf(f, "\n");
-}
-
-/* Print HTTP headers to |f|. Please note that this function does not
-   take into account that header name and value are sequence of
-   octets, therefore they may contain non-printable characters. */
-static void print_headers(FILE *f, nghttp2_nv *nva, size_t nvlen) {
-  size_t i;
-  for (i = 0; i < nvlen; ++i) {
-    print_header(f, nva[i].name, nva[i].namelen, nva[i].value, nva[i].valuelen);
-  }
-  fprintf(f, "\n");
-}
-
-/* nghttp2_send_callback. Here we transmit the |data|, |length| bytes,
-   to the network. Because we are using libevent bufferevent, we just
-   write those bytes into bufferevent buffer. */
-static ssize_t send_callback(nghttp2_session *session, const uint8_t *data,
-                             size_t length, int flags, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  struct bufferevent *bev = session_data->bev;
-  (void)session;
-  (void)flags;
-
-  bufferevent_write(bev, data, length);
-  return (ssize_t)length;
-}
-
-/* nghttp2_on_header_callback: Called when nghttp2 library emits
-   single header name/value pair. */
-static int on_header_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, const uint8_t *name,
-                              size_t namelen, const uint8_t *value,
-                              size_t valuelen, uint8_t flags, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  (void)session;
-  (void)flags;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-        session_data->stream_data->stream_id == frame->hd.stream_id) {
-      /* Print response headers for the initiated request. */
-      print_header(stderr, name, namelen, value, valuelen);
-      break;
-    }
-  }
-  return 0;
-}
-
-/* nghttp2_on_begin_headers_callback: Called when nghttp2 library gets
-   started to receive header block. */
-static int on_begin_headers_callback(nghttp2_session *session,
-                                     const nghttp2_frame *frame,
-                                     void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  (void)session;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-        session_data->stream_data->stream_id == frame->hd.stream_id) {
-      fprintf(stderr, "Response headers for stream ID=%d:\n",
-              frame->hd.stream_id);
-    }
-    break;
-  }
-  return 0;
-}
-
-/* nghttp2_on_frame_recv_callback: Called when nghttp2 library
-   received a complete frame from the remote peer. */
-static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  (void)session;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-        session_data->stream_data->stream_id == frame->hd.stream_id) {
-      fprintf(stderr, "All headers received\n");
-    }
-    break;
-  }
-  return 0;
-}
-
-/* nghttp2_on_data_chunk_recv_callback: Called when DATA frame is
-   received from the remote peer. In this implementation, if the frame
-   is meant to the stream we initiated, print the received data in
-   stdout, so that the user can redirect its output to the file
-   easily. */
-static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id, const uint8_t *data,
-                                       size_t len, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  (void)session;
-  (void)flags;
-
-  if (session_data->stream_data->stream_id == stream_id) {
-    fwrite(data, 1, len, stdout);
-  }
-  return 0;
-}
-
-/* nghttp2_on_stream_close_callback: Called when a stream is about to
-   closed. This example program only deals with 1 HTTP request (1
-   stream), if it is closed, we send GOAWAY and tear down the
-   session */
-static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                    uint32_t error_code, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  int rv;
-
-  if (session_data->stream_data->stream_id == stream_id) {
-    fprintf(stderr, "Stream %d closed with error_code=%u\n", stream_id,
-            error_code);
-    rv = nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-/* NPN TLS extension client callback. We check that server advertised
-   the HTTP/2 protocol the nghttp2 library supports. If not, exit
-   the program. */
-static int select_next_proto_cb(SSL *ssl, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  (void)ssl;
-  (void)arg;
-
-  if (nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
-    errx(1, "Server did not advertise " NGHTTP2_PROTO_VERSION_ID);
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-
-/* Create SSL_CTX. */
-static SSL_CTX *create_ssl_ctx(void) {
-  SSL_CTX *ssl_ctx;
-  ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if (!ssl_ctx) {
-    errx(1, "Could not create SSL/TLS context: %s",
-         ERR_error_string(ERR_get_error(), NULL));
-  }
-  SSL_CTX_set_options(ssl_ctx,
-                      SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                          SSL_OP_NO_COMPRESSION |
-                          SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, NULL);
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  SSL_CTX_set_alpn_protos(ssl_ctx, (const unsigned char *)"\x02h2", 3);
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-
-  return ssl_ctx;
-}
-
-/* Create SSL object */
-static SSL *create_ssl(SSL_CTX *ssl_ctx) {
-  SSL *ssl;
-  ssl = SSL_new(ssl_ctx);
-  if (!ssl) {
-    errx(1, "Could not create SSL/TLS session object: %s",
-         ERR_error_string(ERR_get_error(), NULL));
-  }
-  return ssl;
-}
-
-static void initialize_nghttp2_session(http2_session_data *session_data) {
-  nghttp2_session_callbacks *callbacks;
-
-  nghttp2_session_callbacks_new(&callbacks);
-
-  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-
-  nghttp2_session_client_new(&session_data->session, callbacks, session_data);
-
-  nghttp2_session_callbacks_del(callbacks);
-}
-
-static void send_client_connection_header(http2_session_data *session_data) {
-  nghttp2_settings_entry iv[1] = {
-      {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
-  int rv;
-
-  /* client 24 bytes magic string will be sent by nghttp2 library */
-  rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
-                               ARRLEN(iv));
-  if (rv != 0) {
-    errx(1, "Could not submit SETTINGS: %s", nghttp2_strerror(rv));
-  }
-}
-
-#define MAKE_NV(NAME, VALUE, VALUELEN)                                         \
-  {                                                                            \
-    (uint8_t *)NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, VALUELEN,             \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-#define MAKE_NV2(NAME, VALUE)                                                  \
-  {                                                                            \
-    (uint8_t *)NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1,    \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-/* Send HTTP request to the remote peer */
-static void submit_request(http2_session_data *session_data) {
-  int32_t stream_id;
-  http2_stream_data *stream_data = session_data->stream_data;
-  const char *uri = stream_data->uri;
-  const struct http_parser_url *u = stream_data->u;
-  nghttp2_nv hdrs[] = {
-      MAKE_NV2(":method", "GET"),
-      MAKE_NV(":scheme", &uri[u->field_data[UF_SCHEMA].off],
-              u->field_data[UF_SCHEMA].len),
-      MAKE_NV(":authority", stream_data->authority, stream_data->authoritylen),
-      MAKE_NV(":path", stream_data->path, stream_data->pathlen)};
-  fprintf(stderr, "Request headers:\n");
-  print_headers(stderr, hdrs, ARRLEN(hdrs));
-  stream_id = nghttp2_submit_request(session_data->session, NULL, hdrs,
-                                     ARRLEN(hdrs), NULL, stream_data);
-  if (stream_id < 0) {
-    errx(1, "Could not submit HTTP request: %s", nghttp2_strerror(stream_id));
-  }
-
-  stream_data->stream_id = stream_id;
-}
-
-/* Serialize the frame and send (or buffer) the data to
-   bufferevent. */
-static int session_send(http2_session_data *session_data) {
-  int rv;
-
-  rv = nghttp2_session_send(session_data->session);
-  if (rv != 0) {
-    warnx("Fatal error: %s", nghttp2_strerror(rv));
-    return -1;
-  }
-  return 0;
-}
-
-/* readcb for bufferevent. Here we get the data from the input buffer
-   of bufferevent and feed them to nghttp2 library. This may invoke
-   nghttp2 callbacks. It may also queues the frame in nghttp2 session
-   context. To send them, we call session_send() in the end. */
-static void readcb(struct bufferevent *bev, void *ptr) {
-  http2_session_data *session_data = (http2_session_data *)ptr;
-  ssize_t readlen;
-  struct evbuffer *input = bufferevent_get_input(bev);
-  size_t datalen = evbuffer_get_length(input);
-  unsigned char *data = evbuffer_pullup(input, -1);
-
-  readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
-  if (readlen < 0) {
-    warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
-    delete_http2_session_data(session_data);
-    return;
-  }
-  if (evbuffer_drain(input, (size_t)readlen) != 0) {
-    warnx("Fatal error: evbuffer_drain failed");
-    delete_http2_session_data(session_data);
-    return;
-  }
-  if (session_send(session_data) != 0) {
-    delete_http2_session_data(session_data);
-    return;
-  }
-}
-
-/* writecb for bufferevent. To greaceful shutdown after sending or
-   receiving GOAWAY, we check the some conditions on the nghttp2
-   library and output buffer of bufferevent. If it indicates we have
-   no business to this session, tear down the connection. */
-static void writecb(struct bufferevent *bev, void *ptr) {
-  http2_session_data *session_data = (http2_session_data *)ptr;
-  (void)bev;
-
-  if (nghttp2_session_want_read(session_data->session) == 0 &&
-      nghttp2_session_want_write(session_data->session) == 0 &&
-      evbuffer_get_length(bufferevent_get_output(session_data->bev)) == 0) {
-    delete_http2_session_data(session_data);
-  }
-}
-
-/* eventcb for bufferevent. For the purpose of simplicity and
-   readability of the example program, we omitted the certificate and
-   peer verification. After SSL/TLS handshake is over, initialize
-   nghttp2 library session, and send client connection header. Then
-   send HTTP request. */
-static void eventcb(struct bufferevent *bev, short events, void *ptr) {
-  http2_session_data *session_data = (http2_session_data *)ptr;
-  if (events & BEV_EVENT_CONNECTED) {
-    int fd = bufferevent_getfd(bev);
-    int val = 1;
-    const unsigned char *alpn = NULL;
-    unsigned int alpnlen = 0;
-    SSL *ssl;
-
-    fprintf(stderr, "Connected\n");
-
-    ssl = bufferevent_openssl_get_ssl(session_data->bev);
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_get0_next_proto_negotiated(ssl, &alpn, &alpnlen);
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    if (alpn == NULL) {
-      SSL_get0_alpn_selected(ssl, &alpn, &alpnlen);
-    }
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-
-    if (alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) {
-      fprintf(stderr, "h2 is not negotiated\n");
-      delete_http2_session_data(session_data);
-      return;
-    }
-
-    setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
-    initialize_nghttp2_session(session_data);
-    send_client_connection_header(session_data);
-    submit_request(session_data);
-    if (session_send(session_data) != 0) {
-      delete_http2_session_data(session_data);
-    }
-    return;
-  }
-  if (events & BEV_EVENT_EOF) {
-    warnx("Disconnected from the remote host");
-  } else if (events & BEV_EVENT_ERROR) {
-    warnx("Network error");
-  } else if (events & BEV_EVENT_TIMEOUT) {
-    warnx("Timeout");
-  }
-  delete_http2_session_data(session_data);
-}
-
-/* Start connecting to the remote peer |host:port| */
-static void initiate_connection(struct event_base *evbase, SSL_CTX *ssl_ctx,
-                                const char *host, uint16_t port,
-                                http2_session_data *session_data) {
-  int rv;
-  struct bufferevent *bev;
-  SSL *ssl;
-
-  ssl = create_ssl(ssl_ctx);
-  bev = bufferevent_openssl_socket_new(
-      evbase, -1, ssl, BUFFEREVENT_SSL_CONNECTING,
-      BEV_OPT_DEFER_CALLBACKS | BEV_OPT_CLOSE_ON_FREE);
-  bufferevent_enable(bev, EV_READ | EV_WRITE);
-  bufferevent_setcb(bev, readcb, writecb, eventcb, session_data);
-  rv = bufferevent_socket_connect_hostname(bev, session_data->dnsbase,
-                                           AF_UNSPEC, host, port);
-
-  if (rv != 0) {
-    errx(1, "Could not connect to the remote host %s", host);
-  }
-  session_data->bev = bev;
-}
-
-/* Get resource denoted by the |uri|. The debug and error messages are
-   printed in stderr, while the response body is printed in stdout. */
-static void run(const char *uri) {
-  struct http_parser_url u;
-  char *host;
-  uint16_t port;
-  int rv;
-  SSL_CTX *ssl_ctx;
-  struct event_base *evbase;
-  http2_session_data *session_data;
-
-  /* Parse the |uri| and stores its components in |u| */
-  rv = http_parser_parse_url(uri, strlen(uri), 0, &u);
-  if (rv != 0) {
-    errx(1, "Could not parse URI %s", uri);
-  }
-  host = strndup(&uri[u.field_data[UF_HOST].off], u.field_data[UF_HOST].len);
-  if (!(u.field_set & (1 << UF_PORT))) {
-    port = 443;
-  } else {
-    port = u.port;
-  }
-
-  ssl_ctx = create_ssl_ctx();
-
-  evbase = event_base_new();
-
-  session_data = create_http2_session_data(evbase);
-  session_data->stream_data = create_http2_stream_data(uri, &u);
-
-  initiate_connection(evbase, ssl_ctx, host, port, session_data);
-  free(host);
-  host = NULL;
-
-  event_base_loop(evbase, 0);
-
-  event_base_free(evbase);
-  SSL_CTX_free(ssl_ctx);
-}
-
-int main(int argc, char **argv) {
-  struct sigaction act;
-
-  if (argc < 2) {
-    fprintf(stderr, "Usage: libevent-client HTTPS_URI\n");
-    exit(EXIT_FAILURE);
-  }
-
-  memset(&act, 0, sizeof(struct sigaction));
-  act.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &act, NULL);
-
-  SSL_load_error_strings();
-  SSL_library_init();
-
-  run(argv[1]);
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-server.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-server.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-server.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/libevent-server.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,817 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef __sgi
-#  define errx(exitcode, format, args...)                                      \
-    {                                                                          \
-      warnx(format, ##args);                                                   \
-      exit(exitcode);                                                          \
-    }
-#  define warn(format, args...) warnx(format ": %s", ##args, strerror(errno))
-#  define warnx(format, args...) fprintf(stderr, format "\n", ##args)
-#endif
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif /* HAVE_NETDB_H */
-#include <signal.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <ctype.h>
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
-#include <netinet/tcp.h>
-#ifndef __sgi
-#  include <err.h>
-#endif
-#include <string.h>
-#include <errno.h>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/conf.h>
-
-#include <event.h>
-#include <event2/event.h>
-#include <event2/bufferevent_ssl.h>
-#include <event2/listener.h>
-
-#include <nghttp2/nghttp2.h>
-
-#define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16)
-
-#define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
-
-#define MAKE_NV(NAME, VALUE)                                                   \
-  {                                                                            \
-    (uint8_t *)NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1,    \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-struct app_context;
-typedef struct app_context app_context;
-
-typedef struct http2_stream_data {
-  struct http2_stream_data *prev, *next;
-  char *request_path;
-  int32_t stream_id;
-  int fd;
-} http2_stream_data;
-
-typedef struct http2_session_data {
-  struct http2_stream_data root;
-  struct bufferevent *bev;
-  app_context *app_ctx;
-  nghttp2_session *session;
-  char *client_addr;
-} http2_session_data;
-
-struct app_context {
-  SSL_CTX *ssl_ctx;
-  struct event_base *evbase;
-};
-
-static unsigned char next_proto_list[256];
-static size_t next_proto_list_len;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-static int next_proto_cb(SSL *ssl, const unsigned char **data,
-                         unsigned int *len, void *arg) {
-  (void)ssl;
-  (void)arg;
-
-  *data = next_proto_list;
-  *len = (unsigned int)next_proto_list_len;
-  return SSL_TLSEXT_ERR_OK;
-}
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-static int alpn_select_proto_cb(SSL *ssl, const unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  int rv;
-  (void)ssl;
-  (void)arg;
-
-  rv = nghttp2_select_next_protocol((unsigned char **)out, outlen, in, inlen);
-
-  if (rv != 1) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-
-  return SSL_TLSEXT_ERR_OK;
-}
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-
-/* Create SSL_CTX. */
-static SSL_CTX *create_ssl_ctx(const char *key_file, const char *cert_file) {
-  SSL_CTX *ssl_ctx;
-  EC_KEY *ecdh;
-
-  ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-  if (!ssl_ctx) {
-    errx(1, "Could not create SSL/TLS context: %s",
-         ERR_error_string(ERR_get_error(), NULL));
-  }
-  SSL_CTX_set_options(ssl_ctx,
-                      SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                          SSL_OP_NO_COMPRESSION |
-                          SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-  ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-  if (!ecdh) {
-    errx(1, "EC_KEY_new_by_curv_name failed: %s",
-         ERR_error_string(ERR_get_error(), NULL));
-  }
-  SSL_CTX_set_tmp_ecdh(ssl_ctx, ecdh);
-  EC_KEY_free(ecdh);
-
-  if (SSL_CTX_use_PrivateKey_file(ssl_ctx, key_file, SSL_FILETYPE_PEM) != 1) {
-    errx(1, "Could not read private key file %s", key_file);
-  }
-  if (SSL_CTX_use_certificate_chain_file(ssl_ctx, cert_file) != 1) {
-    errx(1, "Could not read certificate file %s", cert_file);
-  }
-
-  next_proto_list[0] = NGHTTP2_PROTO_VERSION_ID_LEN;
-  memcpy(&next_proto_list[1], NGHTTP2_PROTO_VERSION_ID,
-         NGHTTP2_PROTO_VERSION_ID_LEN);
-  next_proto_list_len = 1 + NGHTTP2_PROTO_VERSION_ID_LEN;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_protos_advertised_cb(ssl_ctx, next_proto_cb, NULL);
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  SSL_CTX_set_alpn_select_cb(ssl_ctx, alpn_select_proto_cb, NULL);
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-
-  return ssl_ctx;
-}
-
-/* Create SSL object */
-static SSL *create_ssl(SSL_CTX *ssl_ctx) {
-  SSL *ssl;
-  ssl = SSL_new(ssl_ctx);
-  if (!ssl) {
-    errx(1, "Could not create SSL/TLS session object: %s",
-         ERR_error_string(ERR_get_error(), NULL));
-  }
-  return ssl;
-}
-
-static void add_stream(http2_session_data *session_data,
-                       http2_stream_data *stream_data) {
-  stream_data->next = session_data->root.next;
-  session_data->root.next = stream_data;
-  stream_data->prev = &session_data->root;
-  if (stream_data->next) {
-    stream_data->next->prev = stream_data;
-  }
-}
-
-static void remove_stream(http2_session_data *session_data,
-                          http2_stream_data *stream_data) {
-  (void)session_data;
-
-  stream_data->prev->next = stream_data->next;
-  if (stream_data->next) {
-    stream_data->next->prev = stream_data->prev;
-  }
-}
-
-static http2_stream_data *
-create_http2_stream_data(http2_session_data *session_data, int32_t stream_id) {
-  http2_stream_data *stream_data;
-  stream_data = malloc(sizeof(http2_stream_data));
-  memset(stream_data, 0, sizeof(http2_stream_data));
-  stream_data->stream_id = stream_id;
-  stream_data->fd = -1;
-
-  add_stream(session_data, stream_data);
-  return stream_data;
-}
-
-static void delete_http2_stream_data(http2_stream_data *stream_data) {
-  if (stream_data->fd != -1) {
-    close(stream_data->fd);
-  }
-  free(stream_data->request_path);
-  free(stream_data);
-}
-
-static http2_session_data *create_http2_session_data(app_context *app_ctx,
-                                                     int fd,
-                                                     struct sockaddr *addr,
-                                                     int addrlen) {
-  int rv;
-  http2_session_data *session_data;
-  SSL *ssl;
-  char host[NI_MAXHOST];
-  int val = 1;
-
-  ssl = create_ssl(app_ctx->ssl_ctx);
-  session_data = malloc(sizeof(http2_session_data));
-  memset(session_data, 0, sizeof(http2_session_data));
-  session_data->app_ctx = app_ctx;
-  setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
-  session_data->bev = bufferevent_openssl_socket_new(
-      app_ctx->evbase, fd, ssl, BUFFEREVENT_SSL_ACCEPTING,
-      BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);
-  bufferevent_enable(session_data->bev, EV_READ | EV_WRITE);
-  rv = getnameinfo(addr, (socklen_t)addrlen, host, sizeof(host), NULL, 0,
-                   NI_NUMERICHOST);
-  if (rv != 0) {
-    session_data->client_addr = strdup("(unknown)");
-  } else {
-    session_data->client_addr = strdup(host);
-  }
-
-  return session_data;
-}
-
-static void delete_http2_session_data(http2_session_data *session_data) {
-  http2_stream_data *stream_data;
-  SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev);
-  fprintf(stderr, "%s disconnected\n", session_data->client_addr);
-  if (ssl) {
-    SSL_shutdown(ssl);
-  }
-  bufferevent_free(session_data->bev);
-  nghttp2_session_del(session_data->session);
-  for (stream_data = session_data->root.next; stream_data;) {
-    http2_stream_data *next = stream_data->next;
-    delete_http2_stream_data(stream_data);
-    stream_data = next;
-  }
-  free(session_data->client_addr);
-  free(session_data);
-}
-
-/* Serialize the frame and send (or buffer) the data to
-   bufferevent. */
-static int session_send(http2_session_data *session_data) {
-  int rv;
-  rv = nghttp2_session_send(session_data->session);
-  if (rv != 0) {
-    warnx("Fatal error: %s", nghttp2_strerror(rv));
-    return -1;
-  }
-  return 0;
-}
-
-/* Read the data in the bufferevent and feed them into nghttp2 library
-   function. Invocation of nghttp2_session_mem_recv() may make
-   additional pending frames, so call session_send() at the end of the
-   function. */
-static int session_recv(http2_session_data *session_data) {
-  ssize_t readlen;
-  struct evbuffer *input = bufferevent_get_input(session_data->bev);
-  size_t datalen = evbuffer_get_length(input);
-  unsigned char *data = evbuffer_pullup(input, -1);
-
-  readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
-  if (readlen < 0) {
-    warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
-    return -1;
-  }
-  if (evbuffer_drain(input, (size_t)readlen) != 0) {
-    warnx("Fatal error: evbuffer_drain failed");
-    return -1;
-  }
-  if (session_send(session_data) != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-static ssize_t send_callback(nghttp2_session *session, const uint8_t *data,
-                             size_t length, int flags, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  struct bufferevent *bev = session_data->bev;
-  (void)session;
-  (void)flags;
-
-  /* Avoid excessive buffering in server side. */
-  if (evbuffer_get_length(bufferevent_get_output(session_data->bev)) >=
-      OUTPUT_WOULDBLOCK_THRESHOLD) {
-    return NGHTTP2_ERR_WOULDBLOCK;
-  }
-  bufferevent_write(bev, data, length);
-  return (ssize_t)length;
-}
-
-/* Returns nonzero if the string |s| ends with the substring |sub| */
-static int ends_with(const char *s, const char *sub) {
-  size_t slen = strlen(s);
-  size_t sublen = strlen(sub);
-  if (slen < sublen) {
-    return 0;
-  }
-  return memcmp(s + slen - sublen, sub, sublen) == 0;
-}
-
-/* Returns int value of hex string character |c| */
-static uint8_t hex_to_uint(uint8_t c) {
-  if ('0' <= c && c <= '9') {
-    return (uint8_t)(c - '0');
-  }
-  if ('A' <= c && c <= 'F') {
-    return (uint8_t)(c - 'A' + 10);
-  }
-  if ('a' <= c && c <= 'f') {
-    return (uint8_t)(c - 'a' + 10);
-  }
-  return 0;
-}
-
-/* Decodes percent-encoded byte string |value| with length |valuelen|
-   and returns the decoded byte string in allocated buffer. The return
-   value is NULL terminated. The caller must free the returned
-   string. */
-static char *percent_decode(const uint8_t *value, size_t valuelen) {
-  char *res;
-
-  res = malloc(valuelen + 1);
-  if (valuelen > 3) {
-    size_t i, j;
-    for (i = 0, j = 0; i < valuelen - 2;) {
-      if (value[i] != '%' || !isxdigit(value[i + 1]) ||
-          !isxdigit(value[i + 2])) {
-        res[j++] = (char)value[i++];
-        continue;
-      }
-      res[j++] =
-          (char)((hex_to_uint(value[i + 1]) << 4) + hex_to_uint(value[i + 2]));
-      i += 3;
-    }
-    memcpy(&res[j], &value[i], 2);
-    res[j + 2] = '\0';
-  } else {
-    memcpy(res, value, valuelen);
-    res[valuelen] = '\0';
-  }
-  return res;
-}
-
-static ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
-                                  uint8_t *buf, size_t length,
-                                  uint32_t *data_flags,
-                                  nghttp2_data_source *source,
-                                  void *user_data) {
-  int fd = source->fd;
-  ssize_t r;
-  (void)session;
-  (void)stream_id;
-  (void)user_data;
-
-  while ((r = read(fd, buf, length)) == -1 && errno == EINTR)
-    ;
-  if (r == -1) {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-  if (r == 0) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-  }
-  return r;
-}
-
-static int send_response(nghttp2_session *session, int32_t stream_id,
-                         nghttp2_nv *nva, size_t nvlen, int fd) {
-  int rv;
-  nghttp2_data_provider data_prd;
-  data_prd.source.fd = fd;
-  data_prd.read_callback = file_read_callback;
-
-  rv = nghttp2_submit_response(session, stream_id, nva, nvlen, &data_prd);
-  if (rv != 0) {
-    warnx("Fatal error: %s", nghttp2_strerror(rv));
-    return -1;
-  }
-  return 0;
-}
-
-static const char ERROR_HTML[] = "<html><head><title>404</title></head>"
-                                 "<body><h1>404 Not Found</h1></body></html>";
-
-static int error_reply(nghttp2_session *session,
-                       http2_stream_data *stream_data) {
-  int rv;
-  ssize_t writelen;
-  int pipefd[2];
-  nghttp2_nv hdrs[] = {MAKE_NV(":status", "404")};
-
-  rv = pipe(pipefd);
-  if (rv != 0) {
-    warn("Could not create pipe");
-    rv = nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                   stream_data->stream_id,
-                                   NGHTTP2_INTERNAL_ERROR);
-    if (rv != 0) {
-      warnx("Fatal error: %s", nghttp2_strerror(rv));
-      return -1;
-    }
-    return 0;
-  }
-
-  writelen = write(pipefd[1], ERROR_HTML, sizeof(ERROR_HTML) - 1);
-  close(pipefd[1]);
-
-  if (writelen != sizeof(ERROR_HTML) - 1) {
-    close(pipefd[0]);
-    return -1;
-  }
-
-  stream_data->fd = pipefd[0];
-
-  if (send_response(session, stream_data->stream_id, hdrs, ARRLEN(hdrs),
-                    pipefd[0]) != 0) {
-    close(pipefd[0]);
-    return -1;
-  }
-  return 0;
-}
-
-/* nghttp2_on_header_callback: Called when nghttp2 library emits
-   single header name/value pair. */
-static int on_header_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, const uint8_t *name,
-                              size_t namelen, const uint8_t *value,
-                              size_t valuelen, uint8_t flags, void *user_data) {
-  http2_stream_data *stream_data;
-  const char PATH[] = ":path";
-  (void)flags;
-  (void)user_data;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    if (frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-      break;
-    }
-    stream_data =
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-    if (!stream_data || stream_data->request_path) {
-      break;
-    }
-    if (namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) {
-      size_t j;
-      for (j = 0; j < valuelen && value[j] != '?'; ++j)
-        ;
-      stream_data->request_path = percent_decode(value, j);
-    }
-    break;
-  }
-  return 0;
-}
-
-static int on_begin_headers_callback(nghttp2_session *session,
-                                     const nghttp2_frame *frame,
-                                     void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  http2_stream_data *stream_data;
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-  stream_data = create_http2_stream_data(session_data, frame->hd.stream_id);
-  nghttp2_session_set_stream_user_data(session, frame->hd.stream_id,
-                                       stream_data);
-  return 0;
-}
-
-/* Minimum check for directory traversal. Returns nonzero if it is
-   safe. */
-static int check_path(const char *path) {
-  /* We don't like '\' in url. */
-  return path[0] && path[0] == '/' && strchr(path, '\\') == NULL &&
-         strstr(path, "/../") == NULL && strstr(path, "/./") == NULL &&
-         !ends_with(path, "/..") && !ends_with(path, "/.");
-}
-
-static int on_request_recv(nghttp2_session *session,
-                           http2_session_data *session_data,
-                           http2_stream_data *stream_data) {
-  int fd;
-  nghttp2_nv hdrs[] = {MAKE_NV(":status", "200")};
-  char *rel_path;
-
-  if (!stream_data->request_path) {
-    if (error_reply(session, stream_data) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-    return 0;
-  }
-  fprintf(stderr, "%s GET %s\n", session_data->client_addr,
-          stream_data->request_path);
-  if (!check_path(stream_data->request_path)) {
-    if (error_reply(session, stream_data) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-    return 0;
-  }
-  for (rel_path = stream_data->request_path; *rel_path == '/'; ++rel_path)
-    ;
-  fd = open(rel_path, O_RDONLY);
-  if (fd == -1) {
-    if (error_reply(session, stream_data) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-    return 0;
-  }
-  stream_data->fd = fd;
-
-  if (send_response(session, stream_data->stream_id, hdrs, ARRLEN(hdrs), fd) !=
-      0) {
-    close(fd);
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-  return 0;
-}
-
-static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  http2_stream_data *stream_data;
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-  case NGHTTP2_HEADERS:
-    /* Check that the client request has finished */
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      stream_data =
-          nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-      /* For DATA and HEADERS frame, this callback may be called after
-         on_stream_close_callback. Check that stream still alive. */
-      if (!stream_data) {
-        return 0;
-      }
-      return on_request_recv(session, session_data, stream_data);
-    }
-    break;
-  default:
-    break;
-  }
-  return 0;
-}
-
-static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                    uint32_t error_code, void *user_data) {
-  http2_session_data *session_data = (http2_session_data *)user_data;
-  http2_stream_data *stream_data;
-  (void)error_code;
-
-  stream_data = nghttp2_session_get_stream_user_data(session, stream_id);
-  if (!stream_data) {
-    return 0;
-  }
-  remove_stream(session_data, stream_data);
-  delete_http2_stream_data(stream_data);
-  return 0;
-}
-
-static void initialize_nghttp2_session(http2_session_data *session_data) {
-  nghttp2_session_callbacks *callbacks;
-
-  nghttp2_session_callbacks_new(&callbacks);
-
-  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-
-  nghttp2_session_server_new(&session_data->session, callbacks, session_data);
-
-  nghttp2_session_callbacks_del(callbacks);
-}
-
-/* Send HTTP/2 client connection header, which includes 24 bytes
-   magic octets and SETTINGS frame */
-static int send_server_connection_header(http2_session_data *session_data) {
-  nghttp2_settings_entry iv[1] = {
-      {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
-  int rv;
-
-  rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
-                               ARRLEN(iv));
-  if (rv != 0) {
-    warnx("Fatal error: %s", nghttp2_strerror(rv));
-    return -1;
-  }
-  return 0;
-}
-
-/* readcb for bufferevent after client connection header was
-   checked. */
-static void readcb(struct bufferevent *bev, void *ptr) {
-  http2_session_data *session_data = (http2_session_data *)ptr;
-  (void)bev;
-
-  if (session_recv(session_data) != 0) {
-    delete_http2_session_data(session_data);
-    return;
-  }
-}
-
-/* writecb for bufferevent. To greaceful shutdown after sending or
-   receiving GOAWAY, we check the some conditions on the nghttp2
-   library and output buffer of bufferevent. If it indicates we have
-   no business to this session, tear down the connection. If the
-   connection is not going to shutdown, we call session_send() to
-   process pending data in the output buffer. This is necessary
-   because we have a threshold on the buffer size to avoid too much
-   buffering. See send_callback(). */
-static void writecb(struct bufferevent *bev, void *ptr) {
-  http2_session_data *session_data = (http2_session_data *)ptr;
-  if (evbuffer_get_length(bufferevent_get_output(bev)) > 0) {
-    return;
-  }
-  if (nghttp2_session_want_read(session_data->session) == 0 &&
-      nghttp2_session_want_write(session_data->session) == 0) {
-    delete_http2_session_data(session_data);
-    return;
-  }
-  if (session_send(session_data) != 0) {
-    delete_http2_session_data(session_data);
-    return;
-  }
-}
-
-/* eventcb for bufferevent */
-static void eventcb(struct bufferevent *bev, short events, void *ptr) {
-  http2_session_data *session_data = (http2_session_data *)ptr;
-  if (events & BEV_EVENT_CONNECTED) {
-    const unsigned char *alpn = NULL;
-    unsigned int alpnlen = 0;
-    SSL *ssl;
-    (void)bev;
-
-    fprintf(stderr, "%s connected\n", session_data->client_addr);
-
-    ssl = bufferevent_openssl_get_ssl(session_data->bev);
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_get0_next_proto_negotiated(ssl, &alpn, &alpnlen);
-#endif /* !OPENSSL_NO_NEXTPROTONEG */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    if (alpn == NULL) {
-      SSL_get0_alpn_selected(ssl, &alpn, &alpnlen);
-    }
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-
-    if (alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) {
-      fprintf(stderr, "%s h2 is not negotiated\n", session_data->client_addr);
-      delete_http2_session_data(session_data);
-      return;
-    }
-
-    initialize_nghttp2_session(session_data);
-
-    if (send_server_connection_header(session_data) != 0 ||
-        session_send(session_data) != 0) {
-      delete_http2_session_data(session_data);
-      return;
-    }
-
-    return;
-  }
-  if (events & BEV_EVENT_EOF) {
-    fprintf(stderr, "%s EOF\n", session_data->client_addr);
-  } else if (events & BEV_EVENT_ERROR) {
-    fprintf(stderr, "%s network error\n", session_data->client_addr);
-  } else if (events & BEV_EVENT_TIMEOUT) {
-    fprintf(stderr, "%s timeout\n", session_data->client_addr);
-  }
-  delete_http2_session_data(session_data);
-}
-
-/* callback for evconnlistener */
-static void acceptcb(struct evconnlistener *listener, int fd,
-                     struct sockaddr *addr, int addrlen, void *arg) {
-  app_context *app_ctx = (app_context *)arg;
-  http2_session_data *session_data;
-  (void)listener;
-
-  session_data = create_http2_session_data(app_ctx, fd, addr, addrlen);
-
-  bufferevent_setcb(session_data->bev, readcb, writecb, eventcb, session_data);
-}
-
-static void start_listen(struct event_base *evbase, const char *service,
-                         app_context *app_ctx) {
-  int rv;
-  struct addrinfo hints;
-  struct addrinfo *res, *rp;
-
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-  hints.ai_flags |= AI_ADDRCONFIG;
-#endif /* AI_ADDRCONFIG */
-
-  rv = getaddrinfo(NULL, service, &hints, &res);
-  if (rv != 0) {
-    errx(1, "Could not resolve server address");
-  }
-  for (rp = res; rp; rp = rp->ai_next) {
-    struct evconnlistener *listener;
-    listener = evconnlistener_new_bind(
-        evbase, acceptcb, app_ctx, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
-        16, rp->ai_addr, (int)rp->ai_addrlen);
-    if (listener) {
-      freeaddrinfo(res);
-
-      return;
-    }
-  }
-  errx(1, "Could not start listener");
-}
-
-static void initialize_app_context(app_context *app_ctx, SSL_CTX *ssl_ctx,
-                                   struct event_base *evbase) {
-  memset(app_ctx, 0, sizeof(app_context));
-  app_ctx->ssl_ctx = ssl_ctx;
-  app_ctx->evbase = evbase;
-}
-
-static void run(const char *service, const char *key_file,
-                const char *cert_file) {
-  SSL_CTX *ssl_ctx;
-  app_context app_ctx;
-  struct event_base *evbase;
-
-  ssl_ctx = create_ssl_ctx(key_file, cert_file);
-  evbase = event_base_new();
-  initialize_app_context(&app_ctx, ssl_ctx, evbase);
-  start_listen(evbase, service, &app_ctx);
-
-  event_base_loop(evbase, 0);
-
-  event_base_free(evbase);
-  SSL_CTX_free(ssl_ctx);
-}
-
-int main(int argc, char **argv) {
-  struct sigaction act;
-
-  if (argc < 4) {
-    fprintf(stderr, "Usage: libevent-server PORT KEY_FILE CERT_FILE\n");
-    exit(EXIT_FAILURE);
-  }
-
-  memset(&act, 0, sizeof(struct sigaction));
-  act.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &act, NULL);
-
-  SSL_load_error_strings();
-  SSL_library_init();
-
-  run(argv[1], argv[2], argv[3]);
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/examples/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/examples/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-EXTRA_DIST = CMakeLists.txt
-
-if ENABLE_EXAMPLES
-
-AM_CFLAGS = $(WARNCFLAGS)
-AM_CXXFLAGS = $(WARNCXXFLAGS) $(CXX1XCXXFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/lib/includes \
-	-I$(top_builddir)/lib/includes \
-	-I$(top_srcdir)/src/includes \
-	-I$(top_srcdir)/third-party \
-	@LIBEVENT_OPENSSL_CFLAGS@ \
-	@OPENSSL_CFLAGS@ \
-	@DEFS@
-LDADD = $(top_builddir)/lib/libnghttp2.la \
-	$(top_builddir)/third-party/libhttp-parser.la \
-	@LIBEVENT_OPENSSL_LIBS@ \
-	@OPENSSL_LIBS@ \
-	@APPLDFLAGS@
-
-noinst_PROGRAMS = client libevent-client libevent-server deflate
-
-client_SOURCES = client.c
-
-libevent_client_SOURCES = libevent-client.c
-
-libevent_server_SOURCES = libevent-server.c
-
-deflate_SOURCES = deflate.c
-
-if ENABLE_ASIO_LIB
-
-noinst_PROGRAMS += asio-sv asio-sv2 asio-cl asio-cl2
-
-# AM_CPPFLAGS must be placed first, so that header file (e.g.,
-# nghttp2/nghttp2.h) in this package is used rather than installed
-# one.
-ASIOCPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \
-	$(top_builddir)/src/libnghttp2_asio.la @JEMALLOC_LIBS@ \
-	$(top_builddir)/third-party/libhttp-parser.la \
-	@OPENSSL_LIBS@ \
-	${BOOST_LDFLAGS} \
-	${BOOST_ASIO_LIB} \
-	${BOOST_THREAD_LIB} \
-	${BOOST_SYSTEM_LIB} \
-	@APPLDFLAGS@
-
-asio_sv_SOURCES = asio-sv.cc
-asio_sv_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_sv_LDADD = ${ASIOLDADD}
-
-asio_sv2_SOURCES = asio-sv2.cc
-asio_sv2_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_sv2_LDADD = ${ASIOLDADD}
-
-asio_cl_SOURCES = asio-cl.cc
-asio_cl_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_cl_LDADD = ${ASIOLDADD}
-
-asio_cl2_SOURCES = asio-cl2.cc
-asio_cl2_CPPFLAGS = ${ASIOCPPFLAGS}
-asio_cl2_LDADD = ${ASIOLDADD}
-
-endif # ENABLE_ASIO_LIB
-
-endif # ENABLE_EXAMPLES
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fedora/spdylay.spec cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fedora/spdylay.spec
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fedora/spdylay.spec	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fedora/spdylay.spec	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-Prefix: %{_usr}
-Name: spdylay
-Version: 0.3.7
-Release: 1%{?dist}
-Summary: The experimental SPDY protocol version 2 and 3 implementation in C
-
-Group: System Environment/Libraries
-License: MIT
-URL: http://sourceforge.net/projects/spdylay/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: pkgconfig >= 0.20, zlib >= 1.2.3, gcc, gcc-c++, make
-BuildRequires: openssl-devel, CUnit-devel
-
-#Requires:
-
-%description
-This is an experimental implementation of Google's SPDY protocol in C.
-This library provides SPDY version 2 and 3 framing layer implementation. It does not
-perform any I/O operations. When the library needs them, it calls the callback functions
-provided by the application. It also does not include any event polling mechanism,
-so the application can freely choose the way of handling events. This library code does
-not depend on any particular SSL library (except for example programs which depend on
-OpenSSL 1.0.1 or later).
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-%prep
-%setup -q
-
-%build
-autoreconf -i
-%{__automake}
-%{__autoconf}
-%configure --disable-static --enable-examples --disable-xmltest
-%{__make} %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc
-%{_libdir}/*.so.*
-%exclude %{_libdir}/*.la
-%{_bindir}/shrpx
-%{_bindir}/spdycat
-%{_bindir}/spdyd
-
-%files devel
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-
-%changelog
-* Sat Oct 27 2012 Raul Gutierrez Segales <rgs@itevenworks.net> 0.3.7-DEV
-- Initial RPM release.
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/025ca25c8427361ea5498e4c3ba49d20eac5b4332f7b75b8f74bfba5e43f59f8 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/025ca25c8427361ea5498e4c3ba49d20eac5b4332f7b75b8f74bfba5e43f59f8 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0276779c73bddcebc63b863c23a338b4c827bf6164640ff20a2d64d45a6b3f5a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0276779c73bddcebc63b863c23a338b4c827bf6164640ff20a2d64d45a6b3f5a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0428d1e3b2364efcc93ffd8fcfff43b378a92c7da44268b9dda2bf32a1178c66 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0428d1e3b2364efcc93ffd8fcfff43b378a92c7da44268b9dda2bf32a1178c66 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/06bc5f79b7e68e005bd4382bd3a6c6b1b6005c5f7d5783e99baf2f8f7432d71a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/06bc5f79b7e68e005bd4382bd3a6c6b1b6005c5f7d5783e99baf2f8f7432d71a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/09f76550ec065944a5d1d52f5d07b1dd87de1f651f80ef82c2815b0248b7dccd and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/09f76550ec065944a5d1d52f5d07b1dd87de1f651f80ef82c2815b0248b7dccd differ
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0b39d9df6e1721030667980a41547272ad42377149edcf130b2bf0b76804c61f cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0b39d9df6e1721030667980a41547272ad42377149edcf130b2bf0b76804c61f
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0b39d9df6e1721030667980a41547272ad42377149edcf130b2bf0b76804c61f	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0b39d9df6e1721030667980a41547272ad42377149edcf130b2bf0b76804c61f	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-INVALID CONNECTION PREFACE
-
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0bb4365b02c05540936f9606ca725770a731e73c2144c7b81953dcc4b4f73c32 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0bb4365b02c05540936f9606ca725770a731e73c2144c7b81953dcc4b4f73c32 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0d577f6eb853e987b8fdab6ca4615a351ab74bfc75eb0d227acbef6a35bcae39 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0d577f6eb853e987b8fdab6ca4615a351ab74bfc75eb0d227acbef6a35bcae39 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0df702020c019dd33d0643c5a2b9a9637d325c8f38b4cc6d3f808b5b2a4169a9 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0df702020c019dd33d0643c5a2b9a9637d325c8f38b4cc6d3f808b5b2a4169a9 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0f8054152149c73e64c9f3e83f97e6585c8a51ec2413e7a2e8dfcc444082a5c5 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/0f8054152149c73e64c9f3e83f97e6585c8a51ec2413e7a2e8dfcc444082a5c5 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/105f72bc9184bf47a857ed84e8c2f917946ec7ef3f4720535478b41e097a798a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/105f72bc9184bf47a857ed84e8c2f917946ec7ef3f4720535478b41e097a798a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1368ed7160cc4115e31a8a158af429421570e7363a3b75441edc5d740513b0dc and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1368ed7160cc4115e31a8a158af429421570e7363a3b75441edc5d740513b0dc differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1402c49b963994284b0d429edfac603133e0144dba08836f90b1ae164b328800 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1402c49b963994284b0d429edfac603133e0144dba08836f90b1ae164b328800 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1468c2cddae629788f6957847b76c09921e984796f6dc482859b119cf4879300 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1468c2cddae629788f6957847b76c09921e984796f6dc482859b119cf4879300 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/14f66ce296f03e52f039f4fad189d3d70aebe70ecb14ffb1ffe2cd5fc5d1e5f0 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/14f66ce296f03e52f039f4fad189d3d70aebe70ecb14ffb1ffe2cd5fc5d1e5f0 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/17caaf734401d2d25d09a65432789b45aff588c606536e93824b89739a6d07ab and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/17caaf734401d2d25d09a65432789b45aff588c606536e93824b89739a6d07ab differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/195b4a74a62fabc877052454d935ebc543f4d1305e318ccd2ff407517636bed8 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/195b4a74a62fabc877052454d935ebc543f4d1305e318ccd2ff407517636bed8 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1960fc215485486f3e8ab97f853954e6f11c1f4754ccd83b1603b808878cfa76 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1960fc215485486f3e8ab97f853954e6f11c1f4754ccd83b1603b808878cfa76 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1a56272611761f0687dfb0ea37c900f13f429b750c87e6175b234b881bda6248 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1a56272611761f0687dfb0ea37c900f13f429b750c87e6175b234b881bda6248 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1d31cd88fae35f2329e201983d11256d2432fcdeb55bfba9634aa88e3794adc6 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1d31cd88fae35f2329e201983d11256d2432fcdeb55bfba9634aa88e3794adc6 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1e27187b10c02fe7e151818ddd0722f69830ac04975ddb5a9d83cdc406cbb678 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1e27187b10c02fe7e151818ddd0722f69830ac04975ddb5a9d83cdc406cbb678 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1ecace234d8542fbaab35c7c55330e80d8121a0cff19633a56eba8f2182a59df and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1ecace234d8542fbaab35c7c55330e80d8121a0cff19633a56eba8f2182a59df differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1f4f3a16f5ad0425e0b38601339096b80a382afa1083a19c4deab11be847502f and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/1f4f3a16f5ad0425e0b38601339096b80a382afa1083a19c4deab11be847502f differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/203a798d4b658be744fe34042038692eaede4d2c1f9e05a27f2410a6e0230132 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/203a798d4b658be744fe34042038692eaede4d2c1f9e05a27f2410a6e0230132 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/21904e842e90becb56ff9748ae962bb543dd5ca188dabc30897726f87403fbce and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/21904e842e90becb56ff9748ae962bb543dd5ca188dabc30897726f87403fbce differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/23df7e0419240a9709b55af68a89c9750332ae5063e36401eae150ce63188fe0 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/23df7e0419240a9709b55af68a89c9750332ae5063e36401eae150ce63188fe0 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/245ba702520fa32cf41d994f5d37e4111fe6203bac35b220d50362d5e986aa91 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/245ba702520fa32cf41d994f5d37e4111fe6203bac35b220d50362d5e986aa91 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/274faf343feb9cb44079316401fee50c647552c99c0550ebfd7a3b736e8db9e5 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/274faf343feb9cb44079316401fee50c647552c99c0550ebfd7a3b736e8db9e5 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/2b042a1dfa3aeed6af58c58a4336f1386633bac75dea2c4b64c02541e7320933 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/2b042a1dfa3aeed6af58c58a4336f1386633bac75dea2c4b64c02541e7320933 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/2d8ec606661a9f12960893aab9a74dd392cbdae104307e8512e5e4113739e93a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/2d8ec606661a9f12960893aab9a74dd392cbdae104307e8512e5e4113739e93a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/2e0c8a3ce53e8e3711f781b480efaf9e2526f4ae87c5f5a585d68d6f7f7da13c and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/2e0c8a3ce53e8e3711f781b480efaf9e2526f4ae87c5f5a585d68d6f7f7da13c differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/315e6acba7d715333d0865a8dfc0cd0e7aef8a1f5f420eae3d39067ad78df17d and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/315e6acba7d715333d0865a8dfc0cd0e7aef8a1f5f420eae3d39067ad78df17d differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/3376a2cdde0b98759f14490881328f80b5d3c942de3b1304a0382923ce896f8f and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/3376a2cdde0b98759f14490881328f80b5d3c942de3b1304a0382923ce896f8f differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/35c2719913a19f197fb6484a34c3574da63554ff06f52377b73a9cfc24eb02ca and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/35c2719913a19f197fb6484a34c3574da63554ff06f52377b73a9cfc24eb02ca differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/35ddf0611cd98d025f6a625e7e4a102ba74721a04dfa1811e0968e9a4966d92c and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/35ddf0611cd98d025f6a625e7e4a102ba74721a04dfa1811e0968e9a4966d92c differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/37e9eab291d6bca69510354e1d029cbbbb6113071b2bb13fc9646b5a0447d2cf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/37e9eab291d6bca69510354e1d029cbbbb6113071b2bb13fc9646b5a0447d2cf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/381c81f5e4d1b02de39c4f99f21e9793f6ffc82ae0ef6917a8611e8879e05941 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/381c81f5e4d1b02de39c4f99f21e9793f6ffc82ae0ef6917a8611e8879e05941 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/38ac32c81952cc832ade7aea13b0740f76898ccbb1da25f2281da76e50c1d04a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/38ac32c81952cc832ade7aea13b0740f76898ccbb1da25f2281da76e50c1d04a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/3e297dd8fcdb50a751c397a505d84e76374b064aa5c71aab33bd9650c9a9d801 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/3e297dd8fcdb50a751c397a505d84e76374b064aa5c71aab33bd9650c9a9d801 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/3e5a57c30a97d3f06a3181f4baf3996053b8572da5f2deee3a636c3bc8dfcc60 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/3e5a57c30a97d3f06a3181f4baf3996053b8572da5f2deee3a636c3bc8dfcc60 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/420b9790375f59a6e8c326391023a0981789c2351817996e0c253bfed708ad82 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/420b9790375f59a6e8c326391023a0981789c2351817996e0c253bfed708ad82 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/43df3c3af62ddd1393269ffcf964f1897063e81da79c971e8af8c1fefa3e3cab and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/43df3c3af62ddd1393269ffcf964f1897063e81da79c971e8af8c1fefa3e3cab differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/443f39c99e1c9ca1908b54153c480754054a57777f22a00d377d745d78e9d193 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/443f39c99e1c9ca1908b54153c480754054a57777f22a00d377d745d78e9d193 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/44f3fc1504a14e693fde420da94f77bf4a44e4e741420291491343f7ae4ecc16 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/44f3fc1504a14e693fde420da94f77bf4a44e4e741420291491343f7ae4ecc16 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4528e6beb34f695f4df8ddbb7ac85f76a91229d9ba675fc9e09fe12f4a497937 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4528e6beb34f695f4df8ddbb7ac85f76a91229d9ba675fc9e09fe12f4a497937 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4534032d57020d2910641561a9f9da021f0fe52ebdbb148ee776ced87bac9b13 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4534032d57020d2910641561a9f9da021f0fe52ebdbb148ee776ced87bac9b13 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/47c5e9b339f9e7f1dccad5c9f51f211183795660ec81a6bdb5614031d39ebe3a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/47c5e9b339f9e7f1dccad5c9f51f211183795660ec81a6bdb5614031d39ebe3a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/48ca2b3f63206aa8f774c3cb33958a806a1debf3d9ccf7b09c2d31256498cda6 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/48ca2b3f63206aa8f774c3cb33958a806a1debf3d9ccf7b09c2d31256498cda6 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4ddbb54259df7ee7ecbdf9f8b4a0e8f7756b9846f2e2add8dd0df825296d993e and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4ddbb54259df7ee7ecbdf9f8b4a0e8f7756b9846f2e2add8dd0df825296d993e differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4e612f3c1dfa468d94bbc3bde202c732b06a9b5f6bc5471c879fa56ec2daa4aa and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/4e612f3c1dfa468d94bbc3bde202c732b06a9b5f6bc5471c879fa56ec2daa4aa differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/55860c89ef796d41b06b3c0fe60a3e6f90709c6a0e7063a8b4057dafa57c878a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/55860c89ef796d41b06b3c0fe60a3e6f90709c6a0e7063a8b4057dafa57c878a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5748e7a24e8d9ecb43de7d1e14519f10d8c669a5a2602fc948bc9a80e6114b63 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5748e7a24e8d9ecb43de7d1e14519f10d8c669a5a2602fc948bc9a80e6114b63 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5a13c8e09802e07fd3ceee625307fe48ef29bc66641c4f80ed4593bf8b773f88 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5a13c8e09802e07fd3ceee625307fe48ef29bc66641c4f80ed4593bf8b773f88 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5aa30337198b482522a55c90554c93278034ebacc24792509a32aeba466df4e8 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5aa30337198b482522a55c90554c93278034ebacc24792509a32aeba466df4e8 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5f3ff3c345ade163ba1ba889d60c1995b7fab68ded6ab052814008d990862c23 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5f3ff3c345ade163ba1ba889d60c1995b7fab68ded6ab052814008d990862c23 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5f88a17509a8843ab761bc8cbcfe1a511670ae1a4a434f3d483f942738933a3e and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/5f88a17509a8843ab761bc8cbcfe1a511670ae1a4a434f3d483f942738933a3e differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/60a288333ea7f01d380f2661d387692063ce2ae73b3e5401b716326967b4ce0c and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/60a288333ea7f01d380f2661d387692063ce2ae73b3e5401b716326967b4ce0c differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/63ae750f5fe9469664b6f79cb48c502c3bfc4cb0a950aeba998a72ea6a3d5b2d and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/63ae750f5fe9469664b6f79cb48c502c3bfc4cb0a950aeba998a72ea6a3d5b2d differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/67abeaacb21769a9fb521efa7ebdc8d9ff3443ad5892d75dd6d4f7d541713d33 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/67abeaacb21769a9fb521efa7ebdc8d9ff3443ad5892d75dd6d4f7d541713d33 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/6e3b8913d874a18ec3ab9f74d4fab435b7738e1a14d0754fb79229c4bda9f604 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/6e3b8913d874a18ec3ab9f74d4fab435b7738e1a14d0754fb79229c4bda9f604 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/6fe31187ce1a64bffb0b31ee59618a2ebd483812410e9f8ae5a92fb72ef70885 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/6fe31187ce1a64bffb0b31ee59618a2ebd483812410e9f8ae5a92fb72ef70885 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/71d3c74882a100eaa5aaf9f62659d3b26bcbb8f2055f1add504f599f9051f61e and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/71d3c74882a100eaa5aaf9f62659d3b26bcbb8f2055f1add504f599f9051f61e differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7232f506e00bee175a3df8d33933fae10c67e501d6cea8e73ce76f4363d0bbea and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7232f506e00bee175a3df8d33933fae10c67e501d6cea8e73ce76f4363d0bbea differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7425039321dcbecb1a1ef28849f277f914a889a54d44c1f2566b6ddd5bc83b4f and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7425039321dcbecb1a1ef28849f277f914a889a54d44c1f2566b6ddd5bc83b4f differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7487341c630472c46a534223da1173666aaeae9788b144fa2c723204d55cc0a2 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7487341c630472c46a534223da1173666aaeae9788b144fa2c723204d55cc0a2 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/79207f7d09b6145f3dbfcb9e19835f34e56c7927fda22859e960f5f13bc847a0 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/79207f7d09b6145f3dbfcb9e19835f34e56c7927fda22859e960f5f13bc847a0 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7a1e1268d329e5f71ebdf74677a6c1a118994d7534d1fb08d631898d67372f5a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7a1e1268d329e5f71ebdf74677a6c1a118994d7534d1fb08d631898d67372f5a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7c954b010232be9461483803e3e553623d4fc382324d8b8ba53ebf83f0457707 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7c954b010232be9461483803e3e553623d4fc382324d8b8ba53ebf83f0457707 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7ce8914993956b04baafaad0668e5c26a87a1c4cf70a6566aa0f199fe3c1dc18 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7ce8914993956b04baafaad0668e5c26a87a1c4cf70a6566aa0f199fe3c1dc18 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7d230ff71bac867a9820e75328f893972df210ab75cdb67f620b370ee5cddf45 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/7d230ff71bac867a9820e75328f893972df210ab75cdb67f620b370ee5cddf45 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/85a985b9011e356e11a24c2d0a01173ea80ccc584b659947b64ffefddab7fada and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/85a985b9011e356e11a24c2d0a01173ea80ccc584b659947b64ffefddab7fada differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/8b165b8b94a9d120edf139fbd63cb6b161131d5722f201f2f4ba0984b46a3ca5 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/8b165b8b94a9d120edf139fbd63cb6b161131d5722f201f2f4ba0984b46a3ca5 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/8f5fd3dd5c0eb40ceb409c0f7d85086319d4177524fad58dc01743434765902a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/8f5fd3dd5c0eb40ceb409c0f7d85086319d4177524fad58dc01743434765902a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9223480b7c4b0d1cb95eb33a7a52dc7494b53a0f8a93fbc1816c6c4f347780b0 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9223480b7c4b0d1cb95eb33a7a52dc7494b53a0f8a93fbc1816c6c4f347780b0 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9248ee16c602d45651b0045e9cc4e407fc62ce5688e1c6636f482ea02314c357 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9248ee16c602d45651b0045e9cc4e407fc62ce5688e1c6636f482ea02314c357 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/979b96b7806f61081a48ff556bfbdb3e1c74e04f7d2cf88eab49b0fd89845453 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/979b96b7806f61081a48ff556bfbdb3e1c74e04f7d2cf88eab49b0fd89845453 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/97f2f674b859ff1adb2e9548550f07fa8818d1ee8edae39ca50f516a57a12edb and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/97f2f674b859ff1adb2e9548550f07fa8818d1ee8edae39ca50f516a57a12edb differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9984490c02b1604423a8679caf527d5f10667e0a38790f28f32af61efa930eef and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9984490c02b1604423a8679caf527d5f10667e0a38790f28f32af61efa930eef differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9a648e49f93b60cf578c87d187c8acb61d3a638bc30568bdcc6be30fd9defd43 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9a648e49f93b60cf578c87d187c8acb61d3a638bc30568bdcc6be30fd9defd43 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9af5c7a8538fb02b0a836b88a40d0b144f11ee98624e3686c0f43684e34e6838 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9af5c7a8538fb02b0a836b88a40d0b144f11ee98624e3686c0f43684e34e6838 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9b24f66bc7c47e677e40f8b07b2fd54985ef27c99670bed582ce904569b95702 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9b24f66bc7c47e677e40f8b07b2fd54985ef27c99670bed582ce904569b95702 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9fc2eee916b1cfb002a487c37e73af29a0fbb29e47bf36839a762bb26fea3ec7 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9fc2eee916b1cfb002a487c37e73af29a0fbb29e47bf36839a762bb26fea3ec7 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9ff0fc476b3d27f5dc9803d38ef10be0d08b5e096630308f0d6f57a6f8ee5d88 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/9ff0fc476b3d27f5dc9803d38ef10be0d08b5e096630308f0d6f57a6f8ee5d88 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/a46866d1875d0c06ec3ead73ecca531ef0dc92a67a233ebc8d1e2fff79f50a07 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/a46866d1875d0c06ec3ead73ecca531ef0dc92a67a233ebc8d1e2fff79f50a07 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/a71bcbf6a6668aa019d38cc3527d5ecf2f4e538dfedddf34ff484e29d6fd26d1 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/a71bcbf6a6668aa019d38cc3527d5ecf2f4e538dfedddf34ff484e29d6fd26d1 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ad0d3509e08424d21d87c64a0969b588dc9281ea98fd744acd9b8bd1daf72225 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ad0d3509e08424d21d87c64a0969b588dc9281ea98fd744acd9b8bd1daf72225 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/adaa168d63fe063455c1e0c304c9c9ba6b43e13849235339710d6b5f941e80a1 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/adaa168d63fe063455c1e0c304c9c9ba6b43e13849235339710d6b5f941e80a1 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/aee251ccb027a2676ad1261b48d08b52752a41633279ff2e9e474eebf508250f and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/aee251ccb027a2676ad1261b48d08b52752a41633279ff2e9e474eebf508250f differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/b5b546cf87a6d23c6f6ee0e44db5b90a4bb23e0558873f159bf09140782989d8 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/b5b546cf87a6d23c6f6ee0e44db5b90a4bb23e0558873f159bf09140782989d8 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/b8fffa51391680139ea773ff40a58a1f24e9b1a8c530823d7d12053ec4aabd76 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/b8fffa51391680139ea773ff40a58a1f24e9b1a8c530823d7d12053ec4aabd76 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/b904fd3aa656603b26572deb105290328add76123b4a99ad4e78189e1337ae1b and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/b904fd3aa656603b26572deb105290328add76123b4a99ad4e78189e1337ae1b differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/bbda8e26f356aa635f7774ec483a4b493668ca1448948c62f641d176838306d5 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/bbda8e26f356aa635f7774ec483a4b493668ca1448948c62f641d176838306d5 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/bc35711cdc43b868c59515211893e7681fef6da4b623392d402fb40736dc1beb and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/bc35711cdc43b868c59515211893e7681fef6da4b623392d402fb40736dc1beb differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/bd25bb84dd44c7e09d9e723016c49cc2a868a1bfc007528138a28ea1c0abfda7 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/bd25bb84dd44c7e09d9e723016c49cc2a868a1bfc007528138a28ea1c0abfda7 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c23df1d03e3c1039692ea3d9897e41ceb2add1ebdec0937a64321c536eef71f7 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c23df1d03e3c1039692ea3d9897e41ceb2add1ebdec0937a64321c536eef71f7 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c2e6cf1692ef3a4bc88af94bb9e6c9011855bbf954c273f45eb3ea97bb491c9a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c2e6cf1692ef3a4bc88af94bb9e6c9011855bbf954c273f45eb3ea97bb491c9a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c3b0ea2a8874777b9805018c177382ab3278a019935fa50b3e0d7971c28c40d9 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c3b0ea2a8874777b9805018c177382ab3278a019935fa50b3e0d7971c28c40d9 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c9dfe97833473610816085c5a009696cd5f659f85fc10ef76dc140851ffcc423 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/c9dfe97833473610816085c5a009696cd5f659f85fc10ef76dc140851ffcc423 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ca19cba772c047e5e1f229e5de18d06d885b50be9136778b4937437f0d70738d and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ca19cba772c047e5e1f229e5de18d06d885b50be9136778b4937437f0d70738d differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ca6e1239c11d08940c991f77470859ccb4ec9fa5e8c30de7b40521d620b87a1e and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ca6e1239c11d08940c991f77470859ccb4ec9fa5e8c30de7b40521d620b87a1e differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cb09d2148ae1c8b054cdbafcf3f3e41e75bae978dcfc8886981479d723fc44e9 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cb09d2148ae1c8b054cdbafcf3f3e41e75bae978dcfc8886981479d723fc44e9 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cd35ff680e23f67fe52b722a88c9537bee642b8a7a8a388cb4952f3bf60e64cc and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cd35ff680e23f67fe52b722a88c9537bee642b8a7a8a388cb4952f3bf60e64cc differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cd6d3880ee87c6b716749cb9a30f8faa658ee49f6ce90f3e34df70560a0477ad and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cd6d3880ee87c6b716749cb9a30f8faa658ee49f6ce90f3e34df70560a0477ad differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cd7b24cfe10fc4346a91f04b1a0d0e22054f76bf704db8e19d73cb9bf792a89b and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cd7b24cfe10fc4346a91f04b1a0d0e22054f76bf704db8e19d73cb9bf792a89b differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cea2c4c70f94e90c4c4a6b63f7c212d2465936090c06ba4db92071a3c247ca11 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/cea2c4c70f94e90c4c4a6b63f7c212d2465936090c06ba4db92071a3c247ca11 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d26a0d653a01c6bf9403e0bc0fa5ea05ea4dd7b163e8d85287b19ff257a88ea7 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d26a0d653a01c6bf9403e0bc0fa5ea05ea4dd7b163e8d85287b19ff257a88ea7 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d3dec3f7485c6c3f8b8949db68bd212ef16a7f1f41047e290d14f9cd6dae91a0 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d3dec3f7485c6c3f8b8949db68bd212ef16a7f1f41047e290d14f9cd6dae91a0 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d43f2a0606841580986981ec0bec10473e79c9097bfd8fd81d1a239f146f31d3 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d43f2a0606841580986981ec0bec10473e79c9097bfd8fd81d1a239f146f31d3 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d4d5fe38e4bafa733182eb5aaad19a6ff59c8316908b20d3c94cdc29a92964e6 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d4d5fe38e4bafa733182eb5aaad19a6ff59c8316908b20d3c94cdc29a92964e6 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d69256403d5d27244080b8b53931aa6bfd4ce95771c748372626414d5c37e105 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d69256403d5d27244080b8b53931aa6bfd4ce95771c748372626414d5c37e105 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d9b617f62de41c1cb02ff91cef9c3f753d440c75efa489a952fdcd314d27ee1d and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/d9b617f62de41c1cb02ff91cef9c3f753d440c75efa489a952fdcd314d27ee1d differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/dc57f64202486572ef99d4ff4970fb339f440867ebedf02eaab75fb555e293cf and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/dc57f64202486572ef99d4ff4970fb339f440867ebedf02eaab75fb555e293cf differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e11a6036e2c0bde71f3eabac3f98734af2cdcfe3ebb6e02dcce9b7f4c4bcc99a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e11a6036e2c0bde71f3eabac3f98734af2cdcfe3ebb6e02dcce9b7f4c4bcc99a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e26ce028366bb4ff566972a945b7fd0035f6dba48d886160fdf1974aae8dee65 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e26ce028366bb4ff566972a945b7fd0035f6dba48d886160fdf1974aae8dee65 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e35a4d079adfe4d399f026c711940e4917d5dae3dc2723a034f44d2b53a34a11 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e35a4d079adfe4d399f026c711940e4917d5dae3dc2723a034f44d2b53a34a11 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e3666122dbe804ac609c0ae717a9e6aa8bb2842953e4528230a5bcfc3a59c120 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e3666122dbe804ac609c0ae717a9e6aa8bb2842953e4528230a5bcfc3a59c120 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e59961f75a4cfe33bc4ce9290f938c5bc247c440a2e572ab18021c8223c55bc7 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e59961f75a4cfe33bc4ce9290f938c5bc247c440a2e572ab18021c8223c55bc7 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e7b11cf0762255ad6741aa3d6e269f8b4bc785089040be666f480464cb13b4df and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e7b11cf0762255ad6741aa3d6e269f8b4bc785089040be666f480464cb13b4df differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e89af554621f1ce6262d47a68efea1d8d304ae595a094ebc955bceb6d06ed629 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e89af554621f1ce6262d47a68efea1d8d304ae595a094ebc955bceb6d06ed629 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e9d399b6dc6b7d18bac97e5556875ab6df561f1ca718f1fc716a929d3c706f14 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/e9d399b6dc6b7d18bac97e5556875ab6df561f1ca718f1fc716a929d3c706f14 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/eb733425f0fc1f0cf7f74e1c1ef87680a96a1aca613180110df26259eb36c433 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/eb733425f0fc1f0cf7f74e1c1ef87680a96a1aca613180110df26259eb36c433 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ec399d3511fa4a30df9b3c51637a357cc1c84d30e3d48bccc9b97564c8a60b73 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ec399d3511fa4a30df9b3c51637a357cc1c84d30e3d48bccc9b97564c8a60b73 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ef73cbf3d98059b13b30db1089ad6af12beea18f895be6f18d42962721d6e3ee and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ef73cbf3d98059b13b30db1089ad6af12beea18f895be6f18d42962721d6e3ee differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/efc0f664cf2ebac4e05e6acac77778fe630b278f167321a46d861ac8ad56fd76 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/efc0f664cf2ebac4e05e6acac77778fe630b278f167321a46d861ac8ad56fd76 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f139f9c20bcdc6bbe0301c98bdd719b37b4a98fe3b1414b583ddb5dc17f62e3a and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f139f9c20bcdc6bbe0301c98bdd719b37b4a98fe3b1414b583ddb5dc17f62e3a differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f5318eb5ea6dcdf630a2ab157dbfa122f6de9b6f4e5a3a036c17f32da3030877 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f5318eb5ea6dcdf630a2ab157dbfa122f6de9b6f4e5a3a036c17f32da3030877 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f5f4973e9e8fb6fb8834a612a9b8b0419fbae7c0934dda22e61f11556918f1cc and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f5f4973e9e8fb6fb8834a612a9b8b0419fbae7c0934dda22e61f11556918f1cc differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f932da1aefb3b8d9918f46bd936130b0d06332ab062a48f41b206ce696428e03 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/f932da1aefb3b8d9918f46bd936130b0d06332ab062a48f41b206ce696428e03 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fbfa931f27b0173613b0e04af58d8bba7df12c1cd15c404d95680df6fc1cb89e and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fbfa931f27b0173613b0e04af58d8bba7df12c1cd15c404d95680df6fc1cb89e differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fc30ab2ea532f953350f0de7ff3c0422328c131f4642d30a4c88bdf43bcd8d98 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fc30ab2ea532f953350f0de7ff3c0422328c131f4642d30a4c88bdf43bcd8d98 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fc7e85c3af87f3c0b482cb57fde916a7d8db293427159f3b31bbc23b6b285116 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fc7e85c3af87f3c0b482cb57fde916a7d8db293427159f3b31bbc23b6b285116 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fcfcfe84724a9b7c7c8277057b557ab044d24130bd360fe087e9f55bef2cadc6 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/fcfcfe84724a9b7c7c8277057b557ab044d24130bd360fe087e9f55bef2cadc6 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ff00f50eada19c5354a579ef7f1af5952ecb2df2423022dd5483d8fede26d6e5 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/h2spec/ff00f50eada19c5354a579ef7f1af5952ecb2df2423022dd5483d8fede26d6e5 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/nghttp/9c8ed8981065d28ce8a5a04ac6fc7a87ffaf9f9c6ce4323e6e0fefaabb2393cb and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/nghttp/9c8ed8981065d28ce8a5a04ac6fc7a87ffaf9f9c6ce4323e6e0fefaabb2393cb differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/nghttp/d53b58a8685030918fda36a704db43cdfec99fc1b9de83c195227161f4bdb911 and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/nghttp/d53b58a8685030918fda36a704db43cdfec99fc1b9de83c195227161f4bdb911 differ
Binary files /tmp/tmpxSnnCT/47WtSR7QwD/cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/nghttp/f0a8cacb9f31b53d237628084e3946d556086c9991cce7962e9e69a3eed406aa and /tmp/tmpxSnnCT/W94FlceePk/cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/corpus/nghttp/f0a8cacb9f31b53d237628084e3946d556086c9991cce7962e9e69a3eed406aa differ
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/fuzz_target.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/fuzz_target.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/fuzz_target.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/fuzz_target.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-#include <nghttp2/nghttp2.h>
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_header_callback2(nghttp2_session *session, const nghttp2_frame *frame,
-                        nghttp2_rcbuf *name, nghttp2_rcbuf *value,
-                        uint8_t flags, void *user_data) {
-  return 0;
-}
-} // namespace
-
-namespace {
-int before_frame_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, void *user_data) {
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  return 0;
-}
-} // namespace
-
-namespace {
-void send_pending(nghttp2_session *session) {
-  for (;;) {
-    const uint8_t *data;
-    auto n = nghttp2_session_mem_send(session, &data);
-    if (n == 0) {
-      return;
-    }
-  }
-}
-} // namespace
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks *callbacks;
-
-  nghttp2_session_callbacks_new(&callbacks);
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-  nghttp2_session_callbacks_set_on_header_callback2(callbacks,
-                                                    on_header_callback2);
-  nghttp2_session_callbacks_set_before_frame_send_callback(
-      callbacks, before_frame_send_callback);
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-
-  nghttp2_session_server_new(&session, callbacks, nullptr);
-  nghttp2_session_callbacks_del(callbacks);
-
-  nghttp2_settings_entry iv{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100};
-  nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
-  send_pending(session);
-  nghttp2_session_mem_recv(session, data, size);
-  send_pending(session);
-
-  nghttp2_session_del(session);
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/README.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/README.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/fuzz/README.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/fuzz/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Fuzzer
-======
-
-This directory contains fuzzer target mainly written to integrate
-nghttp2 into `oss-fuzz <https://github.com/google/oss-fuzz>`_.
-
-fuzz_target.cc contains an entry point of fuzzer.  corpus directory
-contains initial data for fuzzer.
-
-The file name of initial data under corpus is the lower-cased hex
-string of SHA-256 hash of its own content.
-
-corpus/h2spec contains input data which was recorded when we ran
-`h2spec <https://github.com/summerwind/h2spec>`_ against nghttpd.
-
-corpus/nghttp contains input data which was recorded when we ran
-nghttp against nghttpd with some varying command line options of
-nghttp.
-
-
-To build fuzz_target.cc, make sure that libnghttp2 is built with
-following compiler/linker flags:
-
-.. code-block:: text
-
-    CPPFLAGS="-fsanitize-coverage=edge -fsanitize=address"
-    LDFLAGS="-fsanitize-coverage=edge -fsanitize=address"
-
-Then, fuzz_target.cc can be built using the following command:
-
-.. code-block:: text
-
-    $ clang++ -fsanitize-coverage=edge -fsanitize=address -I../lib/includes -std=c++11 fuzz_target.cc ../lib/.libs/libnghttp2.a  /usr/lib/llvm-3.9/lib/libFuzzer.a -o nghttp2_fuzzer
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genauthoritychartbl.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genauthoritychartbl.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genauthoritychartbl.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genauthoritychartbl.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-def name(i):
-    if i < 0x21:
-        return \
-            ['NUL ', 'SOH ', 'STX ', 'ETX ', 'EOT ', 'ENQ ', 'ACK ', 'BEL ',
-             'BS  ', 'HT  ', 'LF  ', 'VT  ', 'FF  ', 'CR  ', 'SO  ', 'SI  ',
-             'DLE ', 'DC1 ', 'DC2 ', 'DC3 ', 'DC4 ', 'NAK ', 'SYN ', 'ETB ',
-             'CAN ', 'EM  ', 'SUB ', 'ESC ', 'FS  ', 'GS  ', 'RS  ', 'US  ',
-             'SPC '][i]
-    elif i == 0x7f:
-        return 'DEL '
-
-for i in range(256):
-    if chr(i) in [
-        "-", ".", "_", "~",
-        "!", "$", "&", "'", "(", ")",
-        "*", "+", ",", ";", "=",
-        "%", "@", ":", "[", "]"] or\
-        ('0' <= chr(i) and chr(i) <= '9') or \
-        ('A' <= chr(i) and chr(i) <= 'Z') or \
-        ('a' <= chr(i) and chr(i) <= 'z'):
-        sys.stdout.write('1 /* {}    */, '.format(chr(i)))
-    elif (0x21 <= i and i < 0x7f):
-        sys.stdout.write('0 /* {}    */, '.format(chr(i)))
-    elif 0x80 <= i:
-        sys.stdout.write('0 /* {} */, '.format(hex(i)))
-    else:
-        sys.stdout.write('0 /* {} */, '.format(name(i)))
-    if (i + 1)%4 == 0:
-        sys.stdout.write('\n')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gendowncasetbl.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gendowncasetbl.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gendowncasetbl.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gendowncasetbl.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-def name(i):
-    if i < 0x20:
-        return \
-            ['NUL ', 'SOH ', 'STX ', 'ETX ', 'EOT ', 'ENQ ', 'ACK ', 'BEL ',
-             'BS  ', 'HT  ', 'LF  ', 'VT  ', 'FF  ', 'CR  ', 'SO  ', 'SI  ',
-             'DLE ', 'DC1 ', 'DC2 ', 'DC3 ', 'DC4 ', 'NAK ', 'SYN ', 'ETB ',
-             'CAN ', 'EM  ', 'SUB ', 'ESC ', 'FS  ', 'GS  ', 'RS  ', 'US  '][i]
-    elif i == 0x7f:
-        return 'DEL '
-
-for i in range(256):
-    if chr(i) == ' ':
-        sys.stdout.write('{} /* SPC  */, '.format(i))
-    elif chr(i) == '\t':
-        sys.stdout.write('{} /* HT   */, '.format(i))
-    elif 'A' <= chr(i) and chr(i) <= 'Z':
-        sys.stdout.write('{} /* {}    */, '.format(i - ord('A') + ord('a'), chr(i)))
-    elif (0x21 <= i and i < 0x7f):
-        sys.stdout.write('{} /* {}    */, '.format(i, chr(i)))
-    elif 0x80 <= i:
-        sys.stdout.write('{} /* {} */, '.format(i, hex(i)))
-    elif 0 == i:
-        sys.stdout.write('{} /* NUL  */, '.format(i))
-    else:
-        sys.stdout.write('{} /* {} */, '.format(i, name(i)))
-    if (i + 1)%4 == 0:
-        sys.stdout.write('\n')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genheaderfunc.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genheaderfunc.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genheaderfunc.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genheaderfunc.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-
-from gentokenlookup import gentokenlookup
-
-HEADERS = [
-    ':authority',
-    ':method',
-    ':path',
-    ':scheme',
-    ':status',
-    ':host', # for spdy
-    'expect',
-    'host',
-    'if-modified-since',
-    "te",
-    "cookie",
-    "http2-settings",
-    "server",
-    "via",
-    "forwarded",
-    "x-forwarded-for",
-    "x-forwarded-proto",
-    "alt-svc",
-    "content-length",
-    "location",
-    "trailer",
-    "link",
-    "accept-encoding",
-    "accept-language",
-    "cache-control",
-    "user-agent",
-    "date",
-    "content-type",
-    "early-data",
-    # disallowed h1 headers
-    'connection',
-    'keep-alive',
-    'proxy-connection',
-    'transfer-encoding',
-    'upgrade'
-]
-
-if __name__ == '__main__':
-    gentokenlookup(HEADERS, 'HD')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genlibtokenlookup.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genlibtokenlookup.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genlibtokenlookup.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genlibtokenlookup.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-#!/usr/bin/env python
-
-HEADERS = [
-    (':authority', 0),
-    (':method', 1),
-    (':method', 2),
-    (':path', 3),
-    (':path', 4),
-    (':scheme', 5),
-    (':scheme', 6),
-    (':status', 7),
-    (':status', 8),
-    (':status', 9),
-    (':status', 10),
-    (':status', 11),
-    (':status', 12),
-    (':status', 13),
-    ('accept-charset', 14),
-    ('accept-encoding', 15),
-    ('accept-language', 16),
-    ('accept-ranges', 17),
-    ('accept', 18),
-    ('access-control-allow-origin', 19),
-    ('age', 20),
-    ('allow', 21),
-    ('authorization', 22),
-    ('cache-control', 23),
-    ('content-disposition', 24),
-    ('content-encoding', 25),
-    ('content-language', 26),
-    ('content-length', 27),
-    ('content-location', 28),
-    ('content-range', 29),
-    ('content-type', 30),
-    ('cookie', 31),
-    ('date', 32),
-    ('etag', 33),
-    ('expect', 34),
-    ('expires', 35),
-    ('from', 36),
-    ('host', 37),
-    ('if-match', 38),
-    ('if-modified-since', 39),
-    ('if-none-match', 40),
-    ('if-range', 41),
-    ('if-unmodified-since', 42),
-    ('last-modified', 43),
-    ('link', 44),
-    ('location', 45),
-    ('max-forwards', 46),
-    ('proxy-authenticate', 47),
-    ('proxy-authorization', 48),
-    ('range', 49),
-    ('referer', 50),
-    ('refresh', 51),
-    ('retry-after', 52),
-    ('server', 53),
-    ('set-cookie', 54),
-    ('strict-transport-security', 55),
-    ('transfer-encoding', 56),
-    ('user-agent', 57),
-    ('vary', 58),
-    ('via', 59),
-    ('www-authenticate', 60),
-    ('te', None),
-    ('connection', None),
-    ('keep-alive',None),
-    ('proxy-connection', None),
-    ('upgrade', None),
-]
-
-def to_enum_hd(k):
-    res = 'NGHTTP2_TOKEN_'
-    for c in k.upper():
-        if c == ':' or c == '-':
-            res += '_'
-            continue
-        res += c
-    return res
-
-def build_header(headers):
-    res = {}
-    for k, _ in headers:
-        size = len(k)
-        if size not in res:
-            res[size] = {}
-        ent = res[size]
-        c = k[-1]
-        if c not in ent:
-            ent[c] = []
-        if k not in ent[c]:
-            ent[c].append(k)
-
-    return res
-
-def gen_enum():
-    name = ''
-    print 'typedef enum {'
-    for k, token in HEADERS:
-        if token is None:
-            print '  {},'.format(to_enum_hd(k))
-        else:
-            if name != k:
-                name = k
-                print '  {} = {},'.format(to_enum_hd(k), token)
-    print '} nghttp2_token;'
-
-def gen_index_header():
-    print '''\
-static int32_t lookup_token(const uint8_t *name, size_t namelen) {
-  switch (namelen) {'''
-    b = build_header(HEADERS)
-    for size in sorted(b.keys()):
-        ents = b[size]
-        print '''\
-  case {}:'''.format(size)
-        print '''\
-    switch (name[{}]) {{'''.format(size - 1)
-        for c in sorted(ents.keys()):
-            headers = sorted(ents[c])
-            print '''\
-    case '{}':'''.format(c)
-            for k in headers:
-                print '''\
-      if (memeq("{}", name, {})) {{
-        return {};
-      }}'''.format(k[:-1], size - 1, to_enum_hd(k))
-            print '''\
-      break;'''
-        print '''\
-    }
-    break;'''
-    print '''\
-  }
-  return -1;
-}'''
-
-if __name__ == '__main__':
-    gen_enum()
-    print ''
-    gen_index_header()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genmethodfunc.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genmethodfunc.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genmethodfunc.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genmethodfunc.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-from __future__ import unicode_literals
-from io import StringIO
-
-from gentokenlookup import gentokenlookup
-
-# copied from http-parser/http_parser.h, and stripped trailing spaces
-# and backslashes.
-SRC = '''
-  XX(0,  DELETE,      DELETE)
-  XX(1,  GET,         GET)
-  XX(2,  HEAD,        HEAD)
-  XX(3,  POST,        POST)
-  XX(4,  PUT,         PUT)
-  /* pathological */
-  XX(5,  CONNECT,     CONNECT)
-  XX(6,  OPTIONS,     OPTIONS)
-  XX(7,  TRACE,       TRACE)
-  /* webdav */
-  XX(8,  COPY,        COPY)
-  XX(9,  LOCK,        LOCK)
-  XX(10, MKCOL,       MKCOL)
-  XX(11, MOVE,        MOVE)
-  XX(12, PROPFIND,    PROPFIND)
-  XX(13, PROPPATCH,   PROPPATCH)
-  XX(14, SEARCH,      SEARCH)
-  XX(15, UNLOCK,      UNLOCK)
-  /* subversion */
-  XX(16, REPORT,      REPORT)
-  XX(17, MKACTIVITY,  MKACTIVITY)
-  XX(18, CHECKOUT,    CHECKOUT)
-  XX(19, MERGE,       MERGE)
-  /* upnp */
-  XX(20, MSEARCH,     M-SEARCH)
-  XX(21, NOTIFY,      NOTIFY)
-  XX(22, SUBSCRIBE,   SUBSCRIBE)
-  XX(23, UNSUBSCRIBE, UNSUBSCRIBE)
-  /* RFC-5789 */
-  XX(24, PATCH,       PATCH)
-  XX(25, PURGE,       PURGE)
-  /* CalDAV */
-  XX(26, MKCALENDAR,  MKCALENDAR)
-'''
-
-if __name__ == '__main__':
-    methods = []
-    for line in StringIO(SRC):
-        line = line.strip()
-        if not line.startswith('XX'):
-            continue
-        _, m, _ = line.split(',', 2)
-        methods.append(m.strip())
-    gentokenlookup(methods, 'HTTP')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gennghttpxfun.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gennghttpxfun.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gennghttpxfun.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gennghttpxfun.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-#!/usr/bin/env python
-
-from gentokenlookup import gentokenlookup
-
-OPTIONS = [
-    "private-key-file",
-    "private-key-passwd-file",
-    "certificate-file",
-    "dh-param-file",
-    "subcert",
-    "backend",
-    "frontend",
-    "workers",
-    "http2-max-concurrent-streams",
-    "log-level",
-    "daemon",
-    "http2-proxy",
-    "http2-bridge",
-    "client-proxy",
-    "add-x-forwarded-for",
-    "strip-incoming-x-forwarded-for",
-    "no-via",
-    "frontend-http2-read-timeout",
-    "frontend-read-timeout",
-    "frontend-write-timeout",
-    "backend-read-timeout",
-    "backend-write-timeout",
-    "stream-read-timeout",
-    "stream-write-timeout",
-    "accesslog-file",
-    "accesslog-syslog",
-    "accesslog-format",
-    "errorlog-file",
-    "errorlog-syslog",
-    "backend-keep-alive-timeout",
-    "frontend-http2-window-bits",
-    "backend-http2-window-bits",
-    "frontend-http2-connection-window-bits",
-    "backend-http2-connection-window-bits",
-    "frontend-no-tls",
-    "backend-no-tls",
-    "backend-tls-sni-field",
-    "pid-file",
-    "user",
-    "syslog-facility",
-    "backlog",
-    "ciphers",
-    "client",
-    "insecure",
-    "cacert",
-    "backend-ipv4",
-    "backend-ipv6",
-    "backend-http-proxy-uri",
-    "read-rate",
-    "read-burst",
-    "write-rate",
-    "write-burst",
-    "worker-read-rate",
-    "worker-read-burst",
-    "worker-write-rate",
-    "worker-write-burst",
-    "npn-list",
-    "tls-proto-list",
-    "verify-client",
-    "verify-client-cacert",
-    "client-private-key-file",
-    "client-cert-file",
-    "frontend-http2-dump-request-header",
-    "frontend-http2-dump-response-header",
-    "http2-no-cookie-crumbling",
-    "frontend-frame-debug",
-    "padding",
-    "altsvc",
-    "add-request-header",
-    "add-response-header",
-    "worker-frontend-connections",
-    "no-location-rewrite",
-    "no-host-rewrite",
-    "backend-http1-connections-per-host",
-    "backend-http1-connections-per-frontend",
-    "listener-disable-timeout",
-    "tls-ticket-key-file",
-    "rlimit-nofile",
-    "backend-request-buffer",
-    "backend-response-buffer",
-    "no-server-push",
-    "backend-http2-connections-per-worker",
-    "fetch-ocsp-response-file",
-    "ocsp-update-interval",
-    "no-ocsp",
-    "include",
-    "tls-ticket-key-cipher",
-    "host-rewrite",
-    "tls-session-cache-memcached",
-    "tls-session-cache-memcached-tls",
-    "tls-ticket-key-memcached",
-    "tls-ticket-key-memcached-interval",
-    "tls-ticket-key-memcached-max-retry",
-    "tls-ticket-key-memcached-max-fail",
-    "mruby-file",
-    "accept-proxy-protocol",
-    "conf",
-    "fastopen",
-    "tls-dyn-rec-warmup-threshold",
-    "tls-dyn-rec-idle-timeout",
-    "add-forwarded",
-    "strip-incoming-forwarded",
-    "forwarded-by",
-    "forwarded-for",
-    "response-header-field-buffer",
-    "max-response-header-fields",
-    "request-header-field-buffer",
-    "max-request-header-fields",
-    "header-field-buffer",
-    "max-header-fields",
-    "no-http2-cipher-black-list",
-    "backend-http1-tls",
-    "tls-session-cache-memcached-cert-file",
-    "tls-session-cache-memcached-private-key-file",
-    "tls-session-cache-memcached-address-family",
-    "tls-ticket-key-memcached-tls",
-    "tls-ticket-key-memcached-cert-file",
-    "tls-ticket-key-memcached-private-key-file",
-    "tls-ticket-key-memcached-address-family",
-    "backend-address-family",
-    "frontend-http2-max-concurrent-streams",
-    "backend-http2-max-concurrent-streams",
-    "backend-connections-per-frontend",
-    "backend-tls",
-    "backend-connections-per-host",
-    "error-page",
-    "no-kqueue",
-    "frontend-http2-settings-timeout",
-    "backend-http2-settings-timeout",
-    "api-max-request-body",
-    "backend-max-backoff",
-    "server-name",
-    "no-server-rewrite",
-    "frontend-http2-optimize-write-buffer-size",
-    "frontend-http2-optimize-window-size",
-    "frontend-http2-window-size",
-    "frontend-http2-connection-window-size",
-    "backend-http2-window-size",
-    "backend-http2-connection-window-size",
-    "frontend-http2-encoder-dynamic-table-size",
-    "frontend-http2-decoder-dynamic-table-size",
-    "backend-http2-encoder-dynamic-table-size",
-    "backend-http2-decoder-dynamic-table-size",
-    "ecdh-curves",
-    "tls-sct-dir",
-    "backend-connect-timeout",
-    "dns-cache-timeout",
-    "dns-lookup-timeout",
-    "dns-max-try",
-    "frontend-keep-alive-timeout",
-    "psk-secrets",
-    "client-psk-secrets",
-    "client-no-http2-cipher-black-list",
-    "client-ciphers",
-    "accesslog-write-early",
-    "tls-min-proto-version",
-    "tls-max-proto-version",
-    "redirect-https-port",
-    "frontend-max-requests",
-    "single-thread",
-    "single-process",
-    "no-add-x-forwarded-proto",
-    "no-strip-incoming-x-forwarded-proto",
-    "ocsp-startup",
-    "no-verify-ocsp",
-    "verify-client-tolerate-expired",
-    "ignore-per-pattern-mruby-error",
-    "tls-no-postpone-early-data",
-    "tls-max-early-data",
-    "tls13-ciphers",
-    "tls13-client-ciphers",
-    "no-strip-incoming-early-data",
-]
-
-LOGVARS = [
-    "remote_addr",
-    "time_local",
-    "time_iso8601",
-    "request",
-    "status",
-    "body_bytes_sent",
-    "remote_port",
-    "server_port",
-    "request_time",
-    "pid",
-    "alpn",
-    "ssl_cipher",
-    "ssl_protocol",
-    "ssl_session_id",
-    "ssl_session_reused",
-    "tls_cipher",
-    "tls_protocol",
-    "tls_session_id",
-    "tls_session_reused",
-    "tls_sni",
-    "tls_client_fingerprint_sha256",
-    "tls_client_fingerprint_sha1",
-    "tls_client_subject_name",
-    "tls_client_issuer_name",
-    "tls_client_serial",
-    "backend_host",
-    "backend_port",
-]
-
-if __name__ == '__main__':
-    gentokenlookup(OPTIONS, 'SHRPX_OPTID', value_type='char', comp_fun='util::strieq_l')
-    gentokenlookup(LOGVARS, 'SHRPX_LOGF', value_type='char', comp_fun='util::strieq_l', return_type='LogFragmentType', fail_value='SHRPX_LOGF_NONE')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gennmchartbl.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gennmchartbl.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gennmchartbl.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gennmchartbl.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-def name(i):
-    if i < 0x21:
-        return \
-            ['NUL ', 'SOH ', 'STX ', 'ETX ', 'EOT ', 'ENQ ', 'ACK ', 'BEL ',
-             'BS  ', 'HT  ', 'LF  ', 'VT  ', 'FF  ', 'CR  ', 'SO  ', 'SI  ',
-             'DLE ', 'DC1 ', 'DC2 ', 'DC3 ', 'DC4 ', 'NAK ', 'SYN ', 'ETB ',
-             'CAN ', 'EM  ', 'SUB ', 'ESC ', 'FS  ', 'GS  ', 'RS  ', 'US  ',
-             'SPC '][i]
-    elif i == 0x7f:
-        return 'DEL '
-
-for i in range(256):
-    if chr(i) in ["!" , "#" , "$" , "%" , "&" , "'" , "*",
-                  "+" , "-" , "." , "^" , "_" , "`" , "|" , "~"] or\
-        ('0' <= chr(i) and chr(i) <= '9') or \
-        ('a' <= chr(i) and chr(i) <= 'z'):
-        sys.stdout.write('1 /* {}    */, '.format(chr(i)))
-    elif (0x21 <= i and i < 0x7f):
-        sys.stdout.write('0 /* {}    */, '.format(chr(i)))
-    elif 0x80 <= i:
-        sys.stdout.write('0 /* {} */, '.format(hex(i)))
-    else:
-        sys.stdout.write('0 /* {} */, '.format(name(i)))
-    if (i + 1)%4 == 0:
-        sys.stdout.write('\n')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gentokenlookup.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gentokenlookup.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/gentokenlookup.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/gentokenlookup.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-
-def to_enum_hd(k, prefix):
-    res = prefix + '_'
-    for c in k.upper():
-        if c == ':' or c == '-':
-            res += '_'
-            continue
-        res += c
-    return res
-
-def build_header(headers):
-    res = {}
-    for k in headers:
-        size = len(k)
-        if size not in res:
-            res[size] = {}
-        ent = res[size]
-        c = k[-1]
-        if c not in ent:
-            ent[c] = []
-        ent[c].append(k)
-
-    return res
-
-def gen_enum(tokens, prefix):
-    print '''\
-enum {'''
-    for k in sorted(tokens):
-        print '''\
-  {},'''.format(to_enum_hd(k, prefix))
-    print '''\
-  {}_MAXIDX,
-}};'''.format(prefix)
-
-def gen_index_header(tokens, prefix, value_type, comp_fun, return_type, fail_value):
-    print '''\
-{} lookup_token(const {} *name, size_t namelen) {{
-  switch (namelen) {{'''.format(return_type, value_type)
-    b = build_header(tokens)
-    for size in sorted(b.keys()):
-        ents = b[size]
-        print '''\
-  case {}:'''.format(size)
-        print '''\
-    switch (name[{}]) {{'''.format(size - 1)
-        for c in sorted(ents.keys()):
-            headers = sorted(ents[c])
-            print '''\
-    case '{}':'''.format(c)
-            for k in headers:
-                print '''\
-      if ({}("{}", name, {})) {{
-        return {};
-      }}'''.format(comp_fun, k[:-1], size - 1, to_enum_hd(k, prefix))
-            print '''\
-      break;'''
-        print '''\
-    }
-    break;'''
-    print '''\
-  }}
-  return {};
-}}'''.format(fail_value)
-
-def gentokenlookup(tokens, prefix, value_type='uint8_t', comp_fun='util::streq_l', return_type='int', fail_value='-1'):
-    gen_enum(tokens, prefix)
-    print ''
-    gen_index_header(tokens, prefix, value_type, comp_fun, return_type, fail_value)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genvchartbl.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genvchartbl.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/genvchartbl.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/genvchartbl.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-def name(i):
-    if i < 0x20:
-        return \
-            ['NUL ', 'SOH ', 'STX ', 'ETX ', 'EOT ', 'ENQ ', 'ACK ', 'BEL ',
-             'BS  ', 'HT  ', 'LF  ', 'VT  ', 'FF  ', 'CR  ', 'SO  ', 'SI  ',
-             'DLE ', 'DC1 ', 'DC2 ', 'DC3 ', 'DC4 ', 'NAK ', 'SYN ', 'ETB ',
-             'CAN ', 'EM  ', 'SUB ', 'ESC ', 'FS  ', 'GS  ', 'RS  ', 'US  '][i]
-    elif i == 0x7f:
-        return 'DEL '
-
-for i in range(256):
-    if chr(i) == ' ':
-        sys.stdout.write('1 /* SPC  */, ')
-    elif chr(i) == '\t':
-        sys.stdout.write('1 /* HT   */, ')
-    elif (0x21 <= i and i < 0x7f):
-        sys.stdout.write('1 /* {}    */, '.format(chr(i)))
-    elif 0x80 <= i:
-        sys.stdout.write('1 /* {} */, '.format(hex(i)))
-    elif 0 == i:
-        sys.stdout.write('1 /* NUL  */, ')
-    else:
-        sys.stdout.write('0 /* {} */, '.format(name(i)))
-    if (i + 1)%4 == 0:
-        sys.stdout.write('\n')
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/git-clang-format cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/git-clang-format
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/git-clang-format	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/git-clang-format	1970-01-01 00:00:00.000000000 +0000
@@ -1,484 +0,0 @@
-#!/usr/bin/env python
-#
-#===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===#
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-#===------------------------------------------------------------------------===#
-
-r"""                                                                             
-clang-format git integration                                                     
-============================                                                     
-                                                                                 
-This file provides a clang-format integration for git. Put it somewhere in your  
-path and ensure that it is executable. Then, "git clang-format" will invoke      
-clang-format on the changes in current files or a specific commit.               
-                                                                                 
-For further details, run:                                                        
-git clang-format -h                                                              
-                                                                                 
-Requires Python 2.7                                                              
-"""               
-
-import argparse
-import collections
-import contextlib
-import errno
-import os
-import re
-import subprocess
-import sys
-
-usage = 'git clang-format [OPTIONS] [<commit>] [--] [<file>...]'
-
-desc = '''
-Run clang-format on all lines that differ between the working directory
-and <commit>, which defaults to HEAD.  Changes are only applied to the working
-directory.
-
-The following git-config settings set the default of the corresponding option:
-  clangFormat.binary
-  clangFormat.commit
-  clangFormat.extension
-  clangFormat.style
-'''
-
-# Name of the temporary index file in which save the output of clang-format.
-# This file is created within the .git directory.
-temp_index_basename = 'clang-format-index'
-
-
-Range = collections.namedtuple('Range', 'start, count')
-
-
-def main():
-  config = load_git_config()
-
-  # In order to keep '--' yet allow options after positionals, we need to
-  # check for '--' ourselves.  (Setting nargs='*' throws away the '--', while
-  # nargs=argparse.REMAINDER disallows options after positionals.)
-  argv = sys.argv[1:]
-  try:
-    idx = argv.index('--')
-  except ValueError:
-    dash_dash = []
-  else:
-    dash_dash = argv[idx:]
-    argv = argv[:idx]
-
-  default_extensions = ','.join([
-      # From clang/lib/Frontend/FrontendOptions.cpp, all lower case
-      'c', 'h',  # C
-      'm',  # ObjC
-      'mm',  # ObjC++
-      'cc', 'cp', 'cpp', 'c++', 'cxx', 'hpp',  # C++
-      # Other languages that clang-format supports
-      'proto', 'protodevel',  # Protocol Buffers
-      'js',  # JavaScript
-      ])
-
-  p = argparse.ArgumentParser(
-    usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
-    description=desc)
-  p.add_argument('--binary',
-                 default=config.get('clangformat.binary', 'clang-format'),
-                 help='path to clang-format'),
-  p.add_argument('--commit',
-                 default=config.get('clangformat.commit', 'HEAD'),
-                 help='default commit to use if none is specified'),
-  p.add_argument('--diff', action='store_true',
-                 help='print a diff instead of applying the changes')
-  p.add_argument('--extensions',
-                 default=config.get('clangformat.extensions',
-                                    default_extensions),
-                 help=('comma-separated list of file extensions to format, '
-                       'excluding the period and case-insensitive')),
-  p.add_argument('-f', '--force', action='store_true',
-                 help='allow changes to unstaged files')
-  p.add_argument('-p', '--patch', action='store_true',
-                 help='select hunks interactively')
-  p.add_argument('-q', '--quiet', action='count', default=0,
-                 help='print less information')
-  p.add_argument('--style',
-                 default=config.get('clangformat.style', None),
-                 help='passed to clang-format'),
-  p.add_argument('-v', '--verbose', action='count', default=0,
-                 help='print extra information')
-  # We gather all the remaining positional arguments into 'args' since we need
-  # to use some heuristics to determine whether or not <commit> was present.
-  # However, to print pretty messages, we make use of metavar and help.
-  p.add_argument('args', nargs='*', metavar='<commit>',
-                 help='revision from which to compute the diff')
-  p.add_argument('ignored', nargs='*', metavar='<file>...',
-                 help='if specified, only consider differences in these files')
-  opts = p.parse_args(argv)
-
-  opts.verbose -= opts.quiet
-  del opts.quiet
-
-  commit, files = interpret_args(opts.args, dash_dash, opts.commit)
-  changed_lines = compute_diff_and_extract_lines(commit, files)
-  if opts.verbose >= 1:
-    ignored_files = set(changed_lines)
-  filter_by_extension(changed_lines, opts.extensions.lower().split(','))
-  if opts.verbose >= 1:
-    ignored_files.difference_update(changed_lines)
-    if ignored_files:
-      print 'Ignoring changes in the following files (wrong extension):'
-      for filename in ignored_files:
-        print '   ', filename
-    if changed_lines:
-      print 'Running clang-format on the following files:'
-      for filename in changed_lines:
-        print '   ', filename
-  if not changed_lines:
-    print 'no modified files to format'
-    return
-  # The computed diff outputs absolute paths, so we must cd before accessing
-  # those files.
-  cd_to_toplevel()
-  old_tree = create_tree_from_workdir(changed_lines)
-  new_tree = run_clang_format_and_save_to_tree(changed_lines,
-                                               binary=opts.binary,
-                                               style=opts.style)
-  if opts.verbose >= 1:
-    print 'old tree:', old_tree
-    print 'new tree:', new_tree
-  if old_tree == new_tree:
-    if opts.verbose >= 0:
-      print 'clang-format did not modify any files'
-  elif opts.diff:
-    print_diff(old_tree, new_tree)
-  else:
-    changed_files = apply_changes(old_tree, new_tree, force=opts.force,
-                                  patch_mode=opts.patch)
-    if (opts.verbose >= 0 and not opts.patch) or opts.verbose >= 1:
-      print 'changed files:'
-      for filename in changed_files:
-        print '   ', filename
-
-
-def load_git_config(non_string_options=None):
-  """Return the git configuration as a dictionary.
-
-  All options are assumed to be strings unless in `non_string_options`, in which
-  is a dictionary mapping option name (in lower case) to either "--bool" or
-  "--int"."""
-  if non_string_options is None:
-    non_string_options = {}
-  out = {}
-  for entry in run('git', 'config', '--list', '--null').split('\0'):
-    if entry:
-      name, value = entry.split('\n', 1)
-      if name in non_string_options:
-        value = run('git', 'config', non_string_options[name], name)
-      out[name] = value
-  return out
-
-
-def interpret_args(args, dash_dash, default_commit):
-  """Interpret `args` as "[commit] [--] [files...]" and return (commit, files).
-
-  It is assumed that "--" and everything that follows has been removed from
-  args and placed in `dash_dash`.
-
-  If "--" is present (i.e., `dash_dash` is non-empty), the argument to its
-  left (if present) is taken as commit.  Otherwise, the first argument is
-  checked if it is a commit or a file.  If commit is not given,
-  `default_commit` is used."""
-  if dash_dash:
-    if len(args) == 0:
-      commit = default_commit
-    elif len(args) > 1:
-      die('at most one commit allowed; %d given' % len(args))
-    else:
-      commit = args[0]
-    object_type = get_object_type(commit)
-    if object_type not in ('commit', 'tag'):
-      if object_type is None:
-        die("'%s' is not a commit" % commit)
-      else:
-        die("'%s' is a %s, but a commit was expected" % (commit, object_type))
-    files = dash_dash[1:]
-  elif args:
-    if disambiguate_revision(args[0]):
-      commit = args[0]
-      files = args[1:]
-    else:
-      commit = default_commit
-      files = args
-  else:
-    commit = default_commit
-    files = []
-  return commit, files
-
-
-def disambiguate_revision(value):
-  """Returns True if `value` is a revision, False if it is a file, or dies."""
-  # If `value` is ambiguous (neither a commit nor a file), the following
-  # command will die with an appropriate error message.
-  run('git', 'rev-parse', value, verbose=False)
-  object_type = get_object_type(value)
-  if object_type is None:
-    return False
-  if object_type in ('commit', 'tag'):
-    return True
-  die('`%s` is a %s, but a commit or filename was expected' %
-      (value, object_type))
-
-
-def get_object_type(value):
-  """Returns a string description of an object's type, or None if it is not
-  a valid git object."""
-  cmd = ['git', 'cat-file', '-t', value]
-  p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  stdout, stderr = p.communicate()
-  if p.returncode != 0:
-    return None
-  return stdout.strip()
-
-
-def compute_diff_and_extract_lines(commit, files):
-  """Calls compute_diff() followed by extract_lines()."""
-  diff_process = compute_diff(commit, files)
-  changed_lines = extract_lines(diff_process.stdout)
-  diff_process.stdout.close()
-  diff_process.wait()
-  if diff_process.returncode != 0:
-    # Assume error was already printed to stderr.
-    sys.exit(2)
-  return changed_lines
-
-
-def compute_diff(commit, files):
-  """Return a subprocess object producing the diff from `commit`.
-
-  The return value's `stdin` file object will produce a patch with the
-  differences between the working directory and `commit`, filtered on `files`
-  (if non-empty).  Zero context lines are used in the patch."""
-  cmd = ['git', 'diff-index', '-p', '-U0', commit, '--']
-  cmd.extend(files)
-  p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-  p.stdin.close()
-  return p
-
-
-def extract_lines(patch_file):
-  """Extract the changed lines in `patch_file`.
-
-  The return value is a dictionary mapping filename to a list of (start_line,
-  line_count) pairs.
-
-  The input must have been produced with ``-U0``, meaning unidiff format with
-  zero lines of context.  The return value is a dict mapping filename to a
-  list of line `Range`s."""
-  matches = {}
-  for line in patch_file:
-    match = re.search(r'^\+\+\+\ [^/]+/(.*)', line)
-    if match:
-      filename = match.group(1).rstrip('\r\n')
-    match = re.search(r'^@@ -[0-9,]+ \+(\d+)(,(\d+))?', line)
-    if match:
-      start_line = int(match.group(1))
-      line_count = 1
-      if match.group(3):
-        line_count = int(match.group(3))
-      if line_count > 0:
-        matches.setdefault(filename, []).append(Range(start_line, line_count))
-  return matches
-
-
-def filter_by_extension(dictionary, allowed_extensions):
-  """Delete every key in `dictionary` that doesn't have an allowed extension.
-
-  `allowed_extensions` must be a collection of lowercase file extensions,
-  excluding the period."""
-  allowed_extensions = frozenset(allowed_extensions)
-  for filename in dictionary.keys():
-    base_ext = filename.rsplit('.', 1)
-    if len(base_ext) == 1 or base_ext[1].lower() not in allowed_extensions:
-      del dictionary[filename]
-
-
-def cd_to_toplevel():
-  """Change to the top level of the git repository."""
-  toplevel = run('git', 'rev-parse', '--show-toplevel')
-  os.chdir(toplevel)
-
-
-def create_tree_from_workdir(filenames):
-  """Create a new git tree with the given files from the working directory.
-
-  Returns the object ID (SHA-1) of the created tree."""
-  return create_tree(filenames, '--stdin')
-
-
-def run_clang_format_and_save_to_tree(changed_lines, binary='clang-format',
-                                      style=None):
-  """Run clang-format on each file and save the result to a git tree.
-
-  Returns the object ID (SHA-1) of the created tree."""
-  def index_info_generator():
-    for filename, line_ranges in changed_lines.iteritems():
-      mode = oct(os.stat(filename).st_mode)
-      blob_id = clang_format_to_blob(filename, line_ranges, binary=binary,
-                                     style=style)
-      yield '%s %s\t%s' % (mode, blob_id, filename)
-  return create_tree(index_info_generator(), '--index-info')
-
-
-def create_tree(input_lines, mode):
-  """Create a tree object from the given input.
-
-  If mode is '--stdin', it must be a list of filenames.  If mode is
-  '--index-info' is must be a list of values suitable for "git update-index
-  --index-info", such as "<mode> <SP> <sha1> <TAB> <filename>".  Any other mode
-  is invalid."""
-  assert mode in ('--stdin', '--index-info')
-  cmd = ['git', 'update-index', '--add', '-z', mode]
-  with temporary_index_file():
-    p = subprocess.Popen(cmd, stdin=subprocess.PIPE)
-    for line in input_lines:
-      p.stdin.write('%s\0' % line)
-    p.stdin.close()
-    if p.wait() != 0:
-      die('`%s` failed' % ' '.join(cmd))
-    tree_id = run('git', 'write-tree')
-    return tree_id
-
-
-def clang_format_to_blob(filename, line_ranges, binary='clang-format',
-                         style=None):
-  """Run clang-format on the given file and save the result to a git blob.
-
-  Returns the object ID (SHA-1) of the created blob."""
-  clang_format_cmd = [binary, filename]
-  if style:
-    clang_format_cmd.extend(['-style='+style])
-  clang_format_cmd.extend([
-      '-lines=%s:%s' % (start_line, start_line+line_count-1)
-      for start_line, line_count in line_ranges])
-  try:
-    clang_format = subprocess.Popen(clang_format_cmd, stdin=subprocess.PIPE,
-                                    stdout=subprocess.PIPE)
-  except OSError as e:
-    if e.errno == errno.ENOENT:
-      die('cannot find executable "%s"' % binary)
-    else:
-      raise
-  clang_format.stdin.close()
-  hash_object_cmd = ['git', 'hash-object', '-w', '--path='+filename, '--stdin']
-  hash_object = subprocess.Popen(hash_object_cmd, stdin=clang_format.stdout,
-                                 stdout=subprocess.PIPE)
-  clang_format.stdout.close()
-  stdout = hash_object.communicate()[0]
-  if hash_object.returncode != 0:
-    die('`%s` failed' % ' '.join(hash_object_cmd))
-  if clang_format.wait() != 0:
-    die('`%s` failed' % ' '.join(clang_format_cmd))
-  return stdout.rstrip('\r\n')
-
-
-@contextlib.contextmanager
-def temporary_index_file(tree=None):
-  """Context manager for setting GIT_INDEX_FILE to a temporary file and deleting
-  the file afterward."""
-  index_path = create_temporary_index(tree)
-  old_index_path = os.environ.get('GIT_INDEX_FILE')
-  os.environ['GIT_INDEX_FILE'] = index_path
-  try:
-    yield
-  finally:
-    if old_index_path is None:
-      del os.environ['GIT_INDEX_FILE']
-    else:
-      os.environ['GIT_INDEX_FILE'] = old_index_path
-    os.remove(index_path)
-
-
-def create_temporary_index(tree=None):
-  """Create a temporary index file and return the created file's path.
-
-  If `tree` is not None, use that as the tree to read in.  Otherwise, an
-  empty index is created."""
-  gitdir = run('git', 'rev-parse', '--git-dir')
-  path = os.path.join(gitdir, temp_index_basename)
-  if tree is None:
-    tree = '--empty'
-  run('git', 'read-tree', '--index-output='+path, tree)
-  return path
-
-
-def print_diff(old_tree, new_tree):
-  """Print the diff between the two trees to stdout."""
-  # We use the porcelain 'diff' and not plumbing 'diff-tree' because the output
-  # is expected to be viewed by the user, and only the former does nice things
-  # like color and pagination.
-  subprocess.check_call(['git', 'diff', old_tree, new_tree, '--'])
-
-
-def apply_changes(old_tree, new_tree, force=False, patch_mode=False):
-  """Apply the changes in `new_tree` to the working directory.
-
-  Bails if there are local changes in those files and not `force`.  If
-  `patch_mode`, runs `git checkout --patch` to select hunks interactively."""
-  changed_files = run('git', 'diff-tree', '-r', '-z', '--name-only', old_tree,
-                      new_tree).rstrip('\0').split('\0')
-  if not force:
-    unstaged_files = run('git', 'diff-files', '--name-status', *changed_files)
-    if unstaged_files:
-      print >>sys.stderr, ('The following files would be modified but '
-                           'have unstaged changes:')
-      print >>sys.stderr, unstaged_files
-      print >>sys.stderr, 'Please commit, stage, or stash them first.'
-      sys.exit(2)
-  if patch_mode:
-    # In patch mode, we could just as well create an index from the new tree
-    # and checkout from that, but then the user will be presented with a
-    # message saying "Discard ... from worktree".  Instead, we use the old
-    # tree as the index and checkout from new_tree, which gives the slightly
-    # better message, "Apply ... to index and worktree".  This is not quite
-    # right, since it won't be applied to the user's index, but oh well.
-    with temporary_index_file(old_tree):
-      subprocess.check_call(['git', 'checkout', '--patch', new_tree])
-    index_tree = old_tree
-  else:
-    with temporary_index_file(new_tree):
-      run('git', 'checkout-index', '-a', '-f')
-  return changed_files
-
-
-def run(*args, **kwargs):
-  stdin = kwargs.pop('stdin', '')
-  verbose = kwargs.pop('verbose', True)
-  strip = kwargs.pop('strip', True)
-  for name in kwargs:
-    raise TypeError("run() got an unexpected keyword argument '%s'" % name)
-  p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                       stdin=subprocess.PIPE)
-  stdout, stderr = p.communicate(input=stdin)
-  if p.returncode == 0:
-    if stderr:
-      if verbose:
-        print >>sys.stderr, '`%s` printed to stderr:' % ' '.join(args)
-      print >>sys.stderr, stderr.rstrip()
-    if strip:
-      stdout = stdout.rstrip('\r\n')
-    return stdout
-  if verbose:
-    print >>sys.stderr, '`%s` returned %s' % (' '.join(args), p.returncode)
-  if stderr:
-    print >>sys.stderr, stderr.rstrip()
-  sys.exit(2)
-
-
-def die(message):
-  print >>sys.stderr, 'error:', message
-  sys.exit(2)
-
-
-if __name__ == '__main__':
-  main()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/.gitmodules cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/.gitmodules
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/.gitmodules	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/.gitmodules	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[submodule "third-party/mruby"]
-	path = third-party/mruby
-	url = https://github.com/mruby/mruby
-[submodule "third-party/neverbleed"]
-	path = third-party/neverbleed
-	url = https://github.com/h2o/neverbleed.git
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/help2rst.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/help2rst.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/help2rst.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/help2rst.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# script to produce rst file from program's help output.
-
-from __future__ import unicode_literals
-from __future__ import print_function
-import sys
-import re
-import argparse
-
-arg_indent = ' ' * 14
-
-def help2man(infile):
-    # We assume that first line is usage line like this:
-    #
-    # Usage: nghttp [OPTIONS]... URI...
-    #
-    # The second line is description of the command.  Multiple lines
-    # are permitted.  The blank line signals the end of this section.
-    # After that, we parses positional and optional arguments.
-    #
-    # The positional argument is enclosed with < and >:
-    #
-    # <PRIVATE_KEY>
-    #
-    # We may describe default behavior without any options by encoding
-    # ( and ):
-    #
-    # (default mode)
-    #
-    # "Options:" is treated specially and produces "OPTIONS" section.
-    # We allow subsection under OPTIONS.  Lines not starting with (, <
-    # and Options: are treated as subsection name and produces section
-    # one level down:
-    #
-    # TLS/SSL:
-    #
-    # The above is an example of subsection.
-    #
-    # The description of arguments must be indented by len(arg_indent)
-    # characters.  The default value should be placed in separate line
-    # and should be start with "Default: " after indentation.
-
-    line = infile.readline().strip()
-    m = re.match(r'^Usage: (.*)', line)
-    if not m:
-        print('usage line is invalid.  Expected following lines:')
-        print('Usage: cmdname ...')
-        sys.exit(1)
-    synopsis = m.group(1).split(' ', 1)
-    if len(synopsis) == 2:
-        cmdname, args = synopsis
-    else:
-        cmdname, args = synopsis[0], ''
-
-    description = []
-    for line in infile:
-        line = line.strip()
-        if not line:
-            break
-        description.append(line)
-
-    print('''
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: {cmdname}
-
-{cmdname}(1)
-{cmdnameunderline}
-
-SYNOPSIS
---------
-
-**{cmdname}** {args}
-
-DESCRIPTION
------------
-
-{description}
-'''.format(cmdname=cmdname, args=args,
-           cmdnameunderline='=' * (len(cmdname) + 3),
-           synopsis=synopsis, description=format_text('\n'.join(description))))
-
-    in_arg = False
-    in_footer = False
-
-    for line in infile:
-        line = line.rstrip()
-
-        if not line.strip() and in_arg:
-            print()
-            continue
-        if line.startswith('   ') and in_arg:
-            if not line.startswith(arg_indent):
-                sys.stderr.write('warning: argument description is not indented correctly.  We need {} spaces as indentation.\n'.format(len(arg_indent)))
-            print('{}'.format(format_arg_text(line[len(arg_indent):])))
-            continue
-
-        if in_arg:
-            print()
-            in_arg = False
-
-        if line == '--':
-            in_footer = True
-            continue
-
-        if in_footer:
-            print(line.strip())
-            continue
-
-        if line == 'Options:':
-            print('OPTIONS')
-            print('-------')
-            print()
-            continue
-
-        if line.startswith('  <'):
-            # positional argument
-            m = re.match(r'^(?:\s+)([a-zA-Z0-9-_<>]+)(.*)', line)
-            argname, rest = m.group(1), m.group(2)
-            print('.. describe:: {}'.format(argname))
-            print()
-            print('{}'.format(format_arg_text(rest.strip())))
-            in_arg = True
-            continue
-
-        if line.startswith('  ('):
-            # positional argument
-            m = re.match(r'^(?:\s+)(\([a-zA-Z0-9-_<> ]+\))(.*)', line)
-            argname, rest = m.group(1), m.group(2)
-            print('.. describe:: {}'.format(argname))
-            print()
-            print('{}'.format(format_arg_text(rest.strip())))
-            in_arg = True
-            continue
-
-        if line.startswith('  -'):
-            # optional argument
-            m = re.match(
-                r'^(?:\s+)(-\S+?(?:, -\S+?)*)($| .*)',
-                line)
-            argname, rest = m.group(1), m.group(2)
-            print('.. option:: {}'.format(argname))
-            print()
-            rest = rest.strip()
-            if len(rest):
-                print('{}'.format(format_arg_text(rest)))
-            in_arg = True
-            continue
-
-        if not line.startswith(' ') and line.endswith(':'):
-            # subsection
-            subsec = line.strip()[:-1]
-            print('{}'.format(subsec))
-            print('{}'.format('~' * len(subsec)))
-            print()
-            continue
-
-        print(line.strip())
-
-def format_text(text):
-    # escape *, but don't escape * if it is used as bullet list.
-    m = re.match(r'^\s*\*\s+', text)
-    if m:
-        text = text[:len(m.group(0))] + re.sub(r'\*', r'\*', text[len(m.group(0)):])
-    else:
-        text = re.sub(r'\*', r'\*', text)
-    # markup option reference
-    text = re.sub(r'(^|\s)(-[a-zA-Z0-9]|--[a-zA-Z0-9-]+)',
-                  r'\1:option:`\2`', text)
-    # sphinx does not like markup like ':option:`-f`='.  We need
-    # backslash between ` and =.
-    text = re.sub(r'(:option:`.*?`)(\S)', r'\1\\\2', text)
-    # file path should be italic
-    text = re.sub(r'(^|\s|\'|")(/[^\s\'"]*)', r'\1*\2*', text)
-    return text
-
-def format_arg_text(text):
-    if text.strip().startswith('Default: '):
-        return '\n    ' + re.sub(r'^(\s*Default: )(.*)$', r'\1``\2``', text)
-    return '    {}'.format(format_text(text))
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='Produces rst document from help output.')
-    parser.add_argument('-i', '--include', metavar='FILE',
-                        help='include content of <FILE> as verbatim.  It should be ReST formatted text.')
-    args = parser.parse_args()
-    help2man(sys.stdin)
-    if args.include:
-        print()
-        with open(args.include) as f:
-            sys.stdout.write(f.read())
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.crt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.crt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.crt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.crt	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhzCCAm+gAwIBAgIJANfuEldiquMNMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEzARBgNVBAMMCmFsdC1kb21haW4wHhcNMTUwMTI1MDYy
-NTQxWhcNMjUwMTIyMDYyNTQxWjBaMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29t
-ZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRMwEQYD
-VQQDDAphbHQtZG9tYWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0IwhDOGDipGrJQ9IoRSzPdkU/Ii4aJgGKHlXminym42X0VI3IW61RLvOHRlHVmVH
-JQjFuDo2x+y81t9NlDg3HGUbSpzOzpm6StiutB7c4hreT5G4r0YKya1ugiemN0+p
-qjIPJWm2jVnf448eZvUKRKEQ9W0MLZjiNjVGKrKlwo7fIlXg4N3+YixLYffAT1NV
-d1T6V5jzlbruj15gK2nGjMQ9D1h1t9vTbTxY+mtk72aX0Y64IE6pPBWLFSSH8ozU
-idDoL3AZwz2Jker+ALKK8CM4uho/RPpyW1C06HH+HLdH2MqEjDOROde/Nzxm668O
-gK/JWGIEyUqYiUXx0yhFxwIDAQABo1AwTjAdBgNVHQ4EFgQU/Y0GDN2uPjbyePcu
-95ZvYEK/gHIwHwYDVR0jBBgwFoAU/Y0GDN2uPjbyePcu95ZvYEK/gHIwDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAodD6LVCzL3wfsZ6TxTzf9TfgIdbj
-ilL3SEMT/xnfTXT3SLYScTRqQIAI29Y7dOLMq89p4hY2wmeUEhBUAz+y9G2JVr8o
-6EbxXrQpWgNJogELqoNnMdrDxB5RsmDDKEJ/rLjDfSkjWbK7B2PZsqVTDgjekCFw
-u6FqTIjn/O1O/L5tjwxwxjHmQod/maFCvXoDOVBuwdHnkp298tqlvsHfHO8m++Wj
-+XYB8plMIjpeTh9v4w9Jc4QZ59lK/3Tt4qaENeQrMEubKSY/Zen7L2bzhk+cChWT
-GSGz9uNXieoZaH79D0wnyZaSZ5Ds4ActMevnGg3iYXuzuFqx8Pungn74Vg==
------END CERTIFICATE-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.key cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.key
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.key	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/alt-server.key	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDQjCEM4YOKkasl
-D0ihFLM92RT8iLhomAYoeVeaKfKbjZfRUjchbrVEu84dGUdWZUclCMW4OjbH7LzW
-302UODccZRtKnM7OmbpK2K60HtziGt5PkbivRgrJrW6CJ6Y3T6mqMg8labaNWd/j
-jx5m9QpEoRD1bQwtmOI2NUYqsqXCjt8iVeDg3f5iLEth98BPU1V3VPpXmPOVuu6P
-XmAracaMxD0PWHW329NtPFj6a2TvZpfRjrggTqk8FYsVJIfyjNSJ0OgvcBnDPYmR
-6v4AsorwIzi6Gj9E+nJbULTocf4ct0fYyoSMM5E51783PGbrrw6Ar8lYYgTJSpiJ
-RfHTKEXHAgMBAAECggEBALTrjFSXY72YB+h7rN+JjMIwDIPUvF6I3HbKZhQpJf6K
-xNVkRM2tNHavku0tm/S4ohLf3F+pqRKiL2Udjjjy1+S7VgTRqpwTQ0lhV5aNW8SP
-2KMg4R61XfB+k+s4KHu9kYxEJ12mqydPe+r3o0FgfYryTDsOYk1AX6b1aqzqFOGF
-7GaqLALSbKU59tcJJ1SZNBbpIKFUrAT9nZt9dW02/foqP5bzUk43Yjw48xmLwegc
-bMXXcpZhNZSktltvwRw7Q4Foc9kuRlMdTAnAD9PnMCcZwicS/YeVVF6Rz4fGviKv
-7/kPHQ7g4YpFktVDzuZ5xw6GDVFeJ6uGMVUX8+EePvkCgYEA+/nrcn82nFHCxm8Q
-0iiUhi/AoXjZg+O5Ytaje9O/YNoX+c4ywe13h0+TXKH79O0KfTwXeJyDgPZbAIFV
-9oURellRYUzKDafnBHis2f+Ywn6GqHL5e2X30ZxIp1GK46pcvne1YuvJhgGmiVay
-vd7sRx09OKU124dG22rIFCis6asCgYEA0+CsA6LrEwQ/aPJYASY3VHNO/WoAOnPg
-Cwsg+02XWsPEwP//lNmpanz8TUm2URS063ZK8bx7t3ejvDgBdsRwwjiMlDp7XTUU
-3Zk+mhCV2qkMi02aKemvz29bDhmh5JoH7W3IwsXtJYO0yZDYrDR3ioiKRccioPoE
-b/Nq781sEFUCgYEA4xqx9xRpaCLY5nicNI6WrwrDF8YQZisNn+PMnYKP7v8itOgA
-H4GkRbSXINpueKZc2dsbXH3UmJtyEdaAYBw3UIrIKmZHhl9afFE3mZQhXssjGxfl
-fC6/WZD+eq+n+uJFjPXf6jSSAdHjA828dB1D4CSeVTuyexZF6uUnR+QRVNkCgYEA
-i+pb7XLSpZYygY03zFp+Q0h6KyKqz+7hTqmkuA8/GfMZpRHop1UtaWLsAeXhfZ2c
-87kEOKptUHSzLYIWhWWnyLorK1+LQ7vf8Y5XJso5C1KDNCKk4XSuYt94U9FddWa6
-QXI0F1s5BYL6Cfma++0R2+va08Vy+rbf40XtojoXWJkCgYEA0hMQSCvok7is27nQ
-G80KXfmghU2eEB7zif3T00/fwJycxEbmnNeof+SKmhdY4ZgqTscfOxlQPflV/eqB
-xs4GnFDDeM0F8KH0BimOXxr7sJPFCg22PCCQQcRtM/KoU+ip/kNmTfwrsC0xMFPU
-HD8M1JCZF2eLMekXXP3cB0U4sUs=
------END PRIVATE KEY-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-set(GO_FILES
-  nghttpx_http1_test.go
-  nghttpx_http2_test.go
-  server_tester.go
-)
-
-# XXX unused
-set(EXTRA_DIST
-  ${GO_FILES}
-  server.key
-  server.crt
-  alt-server.key
-  alt-server.crt
-  setenv
-  req-set-header.rb
-  resp-set-header.rb
-  req-return.rb
-  resp-return.rb
-)
-
-add_custom_target(itprep
-  COMMAND go get -d -v golang.org/x/net/http2
-  COMMAND go get -d -v github.com/tatsuhiro-t/go-nghttp2
-  COMMAND go get -d -v golang.org/x/net/websocket
-)
-
-# 'go test' requires both config.go and the test files in the same directory.
-# For out-of-tree builds, config.go is normally not placed next to the source
-# files, so copy the tests to the build directory as a workaround.
-set(GO_BUILD_FILES)
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-  foreach(gofile IN LISTS GO_FILES)
-    set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${gofile}")
-    add_custom_command(OUTPUT "${outfile}"
-      COMMAND ${CMAKE_COMMAND} -E copy
-              "${CMAKE_CURRENT_SOURCE_DIR}/${gofile}" "${outfile}"
-      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${gofile}"
-    )
-    list(APPEND GO_BUILD_FILES "${outfile}")
-  endforeach()
-endif()
-
-add_custom_target(it
-  COMMAND sh setenv go test -v
-  DEPENDS ${GO_BUILD_FILES}
-)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/config.go.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/config.go.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/config.go.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/config.go.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-package nghttp2
-
-const (
-	buildDir = "@top_builddir@"
-	sourceDir = "@top_srcdir@"
-)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2015 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-GO_FILES = \
-	nghttpx_http1_test.go \
-	nghttpx_http2_test.go \
-	server_tester.go
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	$(GO_FILES) \
-	server.key \
-	server.crt \
-	alt-server.key \
-	alt-server.crt \
-	setenv \
-	req-set-header.rb \
-	resp-set-header.rb \
-	req-return.rb \
-	resp-return.rb
-
-itprep:
-	go get -d -v golang.org/x/net/http2
-	go get -d -v github.com/tatsuhiro-t/go-nghttp2
-	go get -d -v golang.org/x/net/websocket
-
-it:
-	for i in $(GO_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
-	sh setenv go test -v
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http1_test.go cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http1_test.go
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http1_test.go	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http1_test.go	1970-01-01 00:00:00.000000000 +0000
@@ -1,1144 +0,0 @@
-package nghttp2
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/websocket"
-	"io"
-	"net/http"
-	"regexp"
-	"syscall"
-	"testing"
-	"time"
-)
-
-// TestH1H1PlainGET tests whether simple HTTP/1 GET request works.
-func TestH1H1PlainGET(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1PlainGET",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	want := 200
-	if got := res.status; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1PlainGETClose tests whether simple HTTP/1 GET request with
-// Connetion: close request header field works.
-func TestH1H1PlainGETClose(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1PlainGETClose",
-		header: []hpack.HeaderField{
-			pair("Connection", "close"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	want := 200
-	if got := res.status; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1InvalidMethod tests that server rejects invalid method with
-// 501 status code
-func TestH1H1InvalidMethod(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name:   "TestH1H1InvalidMethod",
-		method: "get",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 501; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1MultipleRequestCL tests that server rejects request which
-// contains multiple Content-Length header fields.
-func TestH1H1MultipleRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, fmt.Sprintf(`GET / HTTP/1.1
-Host: %v
-Test-Case: TestH1H1MultipleRequestCL
-Content-Length: 0
-Content-Length: 0
-
-`, st.authority)); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	want := 400
-	if got := resp.StatusCode; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// // TestH1H1ConnectFailure tests that server handles the situation that
-// // connection attempt to HTTP/1 backend failed.
-// func TestH1H1ConnectFailure(t *testing.T) {
-// 	st := newServerTester(nil, t, noopHandler)
-// 	defer st.Close()
-
-// 	// shutdown backend server to simulate backend connect failure
-// 	st.ts.Close()
-
-// 	res, err := st.http1(requestParam{
-// 		name: "TestH1H1ConnectFailure",
-// 	})
-// 	if err != nil {
-// 		t.Fatalf("Error st.http1() = %v", err)
-// 	}
-// 	want := 503
-// 	if got := res.status; got != want {
-// 		t.Errorf("status: %v; want %v", got, want)
-// 	}
-// }
-
-// TestH1H1AffinityCookie tests that affinity cookie is sent back in
-// cleartext http.
-func TestH1H1AffinityCookie(t *testing.T) {
-	st := newServerTester([]string{"--affinity-cookie"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1AffinityCookie",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	const pattern = `affinity=[0-9a-f]{8}; Path=/foo/bar`
-	validCookie := regexp.MustCompile(pattern)
-	if got := res.header.Get("Set-Cookie"); !validCookie.MatchString(got) {
-		t.Errorf("Set-Cookie: %v; want pattern %v", got, pattern)
-	}
-}
-
-// TestH1H1AffinityCookieTLS tests that affinity cookie is sent back
-// in https.
-func TestH1H1AffinityCookieTLS(t *testing.T) {
-	st := newServerTesterTLS([]string{"--alpn-h1", "--affinity-cookie"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1AffinityCookieTLS",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	const pattern = `affinity=[0-9a-f]{8}; Path=/foo/bar; Secure`
-	validCookie := regexp.MustCompile(pattern)
-	if got := res.header.Get("Set-Cookie"); !validCookie.MatchString(got) {
-		t.Errorf("Set-Cookie: %v; want pattern %v", got, pattern)
-	}
-}
-
-// TestH1H1GracefulShutdown tests graceful shutdown.
-func TestH1H1GracefulShutdown(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1GracefulShutdown-1",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-
-	st.cmd.Process.Signal(syscall.SIGQUIT)
-	time.Sleep(150 * time.Millisecond)
-
-	res, err = st.http1(requestParam{
-		name: "TestH1H1GracefulShutdown-2",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-
-	if got, want := res.connClose, true; got != want {
-		t.Errorf("res.connClose: %v; want %v", got, want)
-	}
-
-	want := io.EOF
-	b := make([]byte, 256)
-	if _, err := st.conn.Read(b); err == nil || err != want {
-		t.Errorf("st.conn.Read(): %v; want %v", err, want)
-	}
-}
-
-// TestH1H1HostRewrite tests that server rewrites Host header field
-func TestH1H1HostRewrite(t *testing.T) {
-	st := newServerTester([]string{"--host-rewrite"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1HostRewrite",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1BadHost tests that server rejects request including bad
-// characters in host header field.
-func TestH1H1BadHost(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET / HTTP/1.1\r\nTest-Case: TestH1H1HBadHost\r\nHost: foo\"bar\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-	if got, want := resp.StatusCode, 400; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1BadAuthority tests that server rejects request including
-// bad characters in authority component of requset URI.
-func TestH1H1BadAuthority(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET http://foo\"bar/ HTTP/1.1\r\nTest-Case: TestH1H1HBadAuthority\r\nHost: foobar\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-	if got, want := resp.StatusCode, 400; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1BadScheme tests that server rejects request including
-// bad characters in scheme component of requset URI.
-func TestH1H1BadScheme(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET http*://example.com/ HTTP/1.1\r\nTest-Case: TestH1H1HBadScheme\r\nHost: example.com\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-	if got, want := resp.StatusCode, 400; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HTTP10 tests that server can accept HTTP/1.0 request
-// without Host header field
-func TestH1H1HTTP10(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H1HTTP10\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	if got, want := resp.StatusCode, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HTTP10NoHostRewrite tests that server generates host header
-// field using actual backend server even if --no-http-rewrite is
-// used.
-func TestH1H1HTTP10NoHostRewrite(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H1HTTP10NoHostRewrite\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	if got, want := resp.StatusCode, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1RequestTrailer tests request trailer part is forwarded to
-// backend.
-func TestH1H1RequestTrailer(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		buf := make([]byte, 4096)
-		for {
-			_, err := r.Body.Read(buf)
-			if err == io.EOF {
-				break
-			}
-			if err != nil {
-				t.Fatalf("r.Body.Read() = %v", err)
-			}
-		}
-		if got, want := r.Trailer.Get("foo"), "bar"; got != want {
-			t.Errorf("r.Trailer.Get(foo): %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1RequestTrailer",
-		body: []byte("1"),
-		trailer: []hpack.HeaderField{
-			pair("foo", "bar"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HeaderFieldBufferPath tests that request with request path
-// larger than configured buffer size is rejected.
-func TestH1H1HeaderFieldBufferPath(t *testing.T) {
-	// The value 100 is chosen so that sum of header fields bytes
-	// does not exceed it.  We use > 100 bytes URI to exceed this
-	// limit.
-	st := newServerTester([]string{"--request-header-field-buffer=100"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1HeaderFieldBufferPath",
-		path: "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 431; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HeaderFieldBuffer tests that request with header fields
-// larger than configured buffer size is rejected.
-func TestH1H1HeaderFieldBuffer(t *testing.T) {
-	st := newServerTester([]string{"--request-header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1HeaderFieldBuffer",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 431; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HeaderFields tests that request with header fields more
-// than configured number is rejected.
-func TestH1H1HeaderFields(t *testing.T) {
-	st := newServerTester([]string{"--max-request-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1HeaderFields",
-		header: []hpack.HeaderField{
-			// Add extra header field to ensure that
-			// header field limit exceeds
-			pair("Connection", "close"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 431; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1Websocket tests that HTTP Upgrade to WebSocket works.
-func TestH1H1Websocket(t *testing.T) {
-	st := newServerTesterHandler(nil, t, websocket.Handler(func(ws *websocket.Conn) {
-		io.Copy(ws, ws)
-	}))
-	defer st.Close()
-
-	content := []byte("hello world")
-	res, err := st.websocket(requestParam{
-		name: "TestH1H1Websocket",
-		body: content,
-	})
-	if err != nil {
-		t.Fatalf("Error st.websocket() = %v", err)
-	}
-	if got, want := res.body, content; !bytes.Equal(got, want) {
-		t.Errorf("echo: %q; want %q", got, want)
-	}
-}
-
-// TestH1H1ReqPhaseSetHeader tests mruby request phase hook
-// modifies request header fields.
-func TestH1H1ReqPhaseSetHeader(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
-			t.Errorf("User-Agent = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1ReqPhaseSetHeader",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1ReqPhaseReturn tests mruby request phase hook returns
-// custom response.
-func TestH1H1ReqPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1ReqPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "20"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from req"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1RespPhaseSetHeader tests mruby response phase hook modifies
-// response header fields.
-func TestH1H1RespPhaseSetHeader(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1RespPhaseSetHeader",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	if got, want := res.header.Get("alpha"), "bravo"; got != want {
-		t.Errorf("alpha = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1RespPhaseReturn tests mruby response phase hook returns
-// custom response.
-func TestH1H1RespPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1RespPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "21"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from resp"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HTTPSRedirect tests that the request to the backend which
-// requires TLS is redirected to https URI.
-func TestH1H1HTTPSRedirect(t *testing.T) {
-	st := newServerTester([]string{"--redirect-if-not-tls"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H1HTTPSRedirect",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 308; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("location"), "https://127.0.0.1/"; got != want {
-		t.Errorf("location: %v; want %v", got, want)
-	}
-}
-
-// TestH1H1HTTPSRedirectPort tests that the request to the backend
-// which requires TLS is redirected to https URI with given port.
-func TestH1H1HTTPSRedirectPort(t *testing.T) {
-	st := newServerTester([]string{"--redirect-if-not-tls", "--redirect-https-port=8443"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		path: "/foo?bar",
-		name: "TestH1H1HTTPSRedirectPort",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 308; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("location"), "https://127.0.0.1:8443/foo?bar"; got != want {
-		t.Errorf("location: %v; want %v", got, want)
-	}
-}
-
-// // TestH1H2ConnectFailure tests that server handles the situation that
-// // connection attempt to HTTP/2 backend failed.
-// func TestH1H2ConnectFailure(t *testing.T) {
-// 	st := newServerTester([]string{"--http2-bridge"}, t, noopHandler)
-// 	defer st.Close()
-
-// 	// simulate backend connect attempt failure
-// 	st.ts.Close()
-
-// 	res, err := st.http1(requestParam{
-// 		name: "TestH1H2ConnectFailure",
-// 	})
-// 	if err != nil {
-// 		t.Fatalf("Error st.http1() = %v", err)
-// 	}
-// 	want := 503
-// 	if got := res.status; got != want {
-// 		t.Errorf("status: %v; want %v", got, want)
-// 	}
-// }
-
-// TestH1H2NoHost tests that server rejects request without Host
-// header field for HTTP/2 backend.
-func TestH1H2NoHost(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
-	defer st.Close()
-
-	// without Host header field, we expect 400 response
-	if _, err := io.WriteString(st.conn, "GET / HTTP/1.1\r\nTest-Case: TestH1H2NoHost\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	want := 400
-	if got := resp.StatusCode; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2HTTP10 tests that server can accept HTTP/1.0 request
-// without Host header field
-func TestH1H2HTTP10(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H2HTTP10\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	if got, want := resp.StatusCode, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2HTTP10NoHostRewrite tests that server generates host header
-// field using actual backend server even if --no-http-rewrite is
-// used.
-func TestH1H2HTTP10NoHostRewrite(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, "GET / HTTP/1.0\r\nTest-Case: TestH1H2HTTP10NoHostRewrite\r\n\r\n"); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	if got, want := resp.StatusCode, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := resp.Header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2CrumbleCookie tests that Cookies are crumbled and assembled
-// when forwarding to HTTP/2 backend link.  go-nghttp2 server
-// concatenates crumbled Cookies automatically, so this test is not
-// much effective now.
-func TestH1H2CrumbleCookie(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Cookie"), "alpha; bravo; charlie"; got != want {
-			t.Errorf("Cookie: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2CrumbleCookie",
-		header: []hpack.HeaderField{
-			pair("Cookie", "alpha; bravo; charlie"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2GenerateVia tests that server generates Via header field to and
-// from backend server.
-func TestH1H2GenerateVia(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "1.1 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2GenerateVia",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.header.Get("Via"), "2 nghttpx"; got != want {
-		t.Errorf("Via: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2AppendVia tests that server adds value to existing Via
-// header field to and from backend server.
-func TestH1H2AppendVia(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo, 1.1 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2AppendVia",
-		header: []hpack.HeaderField{
-			pair("via", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.header.Get("Via"), "bar, 2 nghttpx"; got != want {
-		t.Errorf("Via: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2NoVia tests that server does not add value to existing Via
-// header field to and from backend server.
-func TestH1H2NoVia(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--no-via"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2NoVia",
-		header: []hpack.HeaderField{
-			pair("via", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.header.Get("Via"), "bar"; got != want {
-		t.Errorf("Via: %v; want %v", got, want)
-	}
-}
-
-// TestH1H2ReqPhaseReturn tests mruby request phase hook returns
-// custom response.
-func TestH1H2ReqPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2ReqPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "20"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from req"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH1H2RespPhaseReturn tests mruby response phase hook returns
-// custom response.
-func TestH1H2RespPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2RespPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "21"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from resp"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH1H2TE tests that "te: trailers" header is forwarded to HTTP/2
-// backend server by stripping other encodings.
-func TestH1H2TE(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("te"), "trailers"; got != want {
-			t.Errorf("te: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1H2TE",
-		header: []hpack.HeaderField{
-			pair("te", "foo,trailers,bar"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH1APIBackendconfig exercise backendconfig API endpoint routine
-// for successful case.
-func TestH1APIBackendconfig(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name:   "TestH1APIBackendconfig",
-		path:   "/api/v1beta1/backendconfig",
-		method: "PUT",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Success"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 200; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH1APIBackendconfigQuery exercise backendconfig API endpoint
-// routine with query.
-func TestH1APIBackendconfigQuery(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name:   "TestH1APIBackendconfigQuery",
-		path:   "/api/v1beta1/backendconfig?foo=bar",
-		method: "PUT",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Success"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 200; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH1APIBackendconfigBadMethod exercise backendconfig API endpoint
-// routine with bad method.
-func TestH1APIBackendconfigBadMethod(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name:   "TestH1APIBackendconfigBadMethod",
-		path:   "/api/v1beta1/backendconfig",
-		method: "GET",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 405; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Failure"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 405; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH1APIConfigrevision tests configrevision API.
-func TestH1APIConfigrevision(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name:   "TestH1APIConfigrevision",
-		path:   "/api/v1beta1/configrevision",
-		method: "GET",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want = %v", got, want)
-	}
-
-	var apiResp APIResponse
-	d := json.NewDecoder(bytes.NewBuffer(res.body))
-	d.UseNumber()
-	err = d.Decode(&apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshalling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Success"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 200; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Data["configRevision"], json.Number("0"); got != want {
-		t.Errorf(`apiResp.Data["configRevision"]: %v %t; want %v`, got, got, want)
-	}
-}
-
-// TestH1APINotFound exercise backendconfig API endpoint routine when
-// API endpoint is not found.
-func TestH1APINotFound(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name:   "TestH1APINotFound",
-		path:   "/api/notfound",
-		method: "GET",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 404; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Failure"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 404; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH1Healthmon tests health monitor endpoint.
-func TestH1Healthmon(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3011;healthmon;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3011)
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH1Healthmon",
-		path: "/alpha/bravo",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH1ResponseBeforeRequestEnd tests the situation where response
-// ends before request body finishes.
-func TestH1ResponseBeforeRequestEnd(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("request should not be forwarded")
-	})
-	defer st.Close()
-
-	if _, err := io.WriteString(st.conn, fmt.Sprintf(`POST / HTTP/1.1
-Host: %v
-Test-Case: TestH1ResponseBeforeRequestEnd
-Content-Length: 1000000
-
-`, st.authority)); err != nil {
-		t.Fatalf("Error io.WriteString() = %v", err)
-	}
-
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), nil)
-	if err != nil {
-		t.Fatalf("Error http.ReadResponse() = %v", err)
-	}
-
-	if got, want := resp.StatusCode, 404; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http2_test.go cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http2_test.go
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http2_test.go	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/nghttpx_http2_test.go	1970-01-01 00:00:00.000000000 +0000
@@ -1,2610 +0,0 @@
-package nghttp2
-
-import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"regexp"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-)
-
-// TestH2H1PlainGET tests whether simple HTTP/2 GET request works.
-func TestH2H1PlainGET(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1PlainGET",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	want := 200
-	if res.status != want {
-		t.Errorf("status = %v; want %v", res.status, want)
-	}
-}
-
-// TestH2H1AddXfp tests that server appends :scheme to the existing
-// x-forwarded-proto header field.
-func TestH2H1AddXfp(t *testing.T) {
-	st := newServerTester([]string{"--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo, http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1NoAddXfp tests that server does not append :scheme to the
-// existing x-forwarded-proto header field.
-func TestH2H1NoAddXfp(t *testing.T) {
-	st := newServerTester([]string{"--no-add-x-forwarded-proto", "--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1NoAddXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1StripXfp tests that server strips incoming
-// x-forwarded-proto header field.
-func TestH2H1StripXfp(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1StripXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1StripNoAddXfp tests that server strips incoming
-// x-forwarded-proto header field, and does not add another.
-func TestH2H1StripNoAddXfp(t *testing.T) {
-	st := newServerTester([]string{"--no-add-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header["X-Forwarded-Proto"]; found {
-			t.Errorf("X-Forwarded-Proto = %q; want nothing", got)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1StripNoAddXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddXff tests that server generates X-Forwarded-For header
-// field when forwarding request to backend.
-func TestH2H1AddXff(t *testing.T) {
-	st := newServerTester([]string{"--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddXff",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddXff2 tests that server appends X-Forwarded-For header
-// field to existing one when forwarding request to backend.
-func TestH2H1AddXff2(t *testing.T) {
-	st := newServerTester([]string{"--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "host, 127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddXff2",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-for", "host"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1StripXff tests that --strip-incoming-x-forwarded-for
-// option.
-func TestH2H1StripXff(t *testing.T) {
-	st := newServerTester([]string{"--strip-incoming-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if xff, found := r.Header["X-Forwarded-For"]; found {
-			t.Errorf("X-Forwarded-For = %v; want nothing", xff)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1StripXff",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-for", "host"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1StripAddXff tests that --strip-incoming-x-forwarded-for and
-// --add-x-forwarded-for options.
-func TestH2H1StripAddXff(t *testing.T) {
-	args := []string{
-		"--strip-incoming-x-forwarded-for",
-		"--add-x-forwarded-for",
-	}
-	st := newServerTester(args, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1StripAddXff",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-for", "host"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddForwardedObfuscated tests that server generates
-// Forwarded header field with obfuscated "by" and "for" parameters.
-func TestH2H1AddForwardedObfuscated(t *testing.T) {
-	st := newServerTester([]string{"--add-forwarded=by,for,host,proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := fmt.Sprintf(`by=_[^;]+;for=_[^;]+;host="127\.0\.0\.1:%v";proto=http`, serverPort)
-		validFwd := regexp.MustCompile(pattern)
-		got := r.Header.Get("Forwarded")
-
-		if !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddForwardedObfuscated",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddForwardedByIP tests that server generates Forwarded header
-// field with IP address in "by" parameter.
-func TestH2H1AddForwardedByIP(t *testing.T) {
-	st := newServerTester([]string{"--add-forwarded=by,for", "--forwarded-by=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := fmt.Sprintf(`by="127\.0\.0\.1:%v";for=_[^;]+`, serverPort)
-		validFwd := regexp.MustCompile(pattern)
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddForwardedByIP",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddForwardedForIP tests that server generates Forwarded header
-// field with IP address in "for" parameters.
-func TestH2H1AddForwardedForIP(t *testing.T) {
-	st := newServerTester([]string{"--add-forwarded=by,for,host,proto", "--forwarded-by=_alpha", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		want := fmt.Sprintf(`by=_alpha;for=127.0.0.1;host="127.0.0.1:%v";proto=http`, serverPort)
-		if got := r.Header.Get("Forwarded"); got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddForwardedForIP",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddForwardedMerge tests that server generates Forwarded
-// header field with IP address in "by" and "for" parameters.  The
-// generated values must be appended to the existing value.
-func TestH2H1AddForwardedMerge(t *testing.T) {
-	st := newServerTester([]string{"--add-forwarded=proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Forwarded"), `host=foo, proto=http`; got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddForwardedMerge",
-		header: []hpack.HeaderField{
-			pair("forwarded", "host=foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddForwardedStrip tests that server generates Forwarded
-// header field with IP address in "by" and "for" parameters.  The
-// generated values must not include the existing value.
-func TestH2H1AddForwardedStrip(t *testing.T) {
-	st := newServerTester([]string{"--strip-incoming-forwarded", "--add-forwarded=proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Forwarded"), `proto=http`; got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddForwardedStrip",
-		header: []hpack.HeaderField{
-			pair("forwarded", "host=foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1StripForwarded tests that server strips incoming Forwarded
-// header field.
-func TestH2H1StripForwarded(t *testing.T) {
-	st := newServerTester([]string{"--strip-incoming-forwarded"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header["Forwarded"]; found {
-			t.Errorf("Forwarded = %v; want nothing", got)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1StripForwarded",
-		header: []hpack.HeaderField{
-			pair("forwarded", "host=foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AddForwardedStatic tests that server generates Forwarded
-// header field with the given static obfuscated string for "by"
-// parameter.
-func TestH2H1AddForwardedStatic(t *testing.T) {
-	st := newServerTester([]string{"--add-forwarded=by,for", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := `by=_alpha;for=_[^;]+`
-		validFwd := regexp.MustCompile(pattern)
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AddForwardedStatic",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1GenerateVia tests that server generates Via header field to and
-// from backend server.
-func TestH2H1GenerateVia(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "2 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1GenerateVia",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.header.Get("Via"), "1.1 nghttpx"; got != want {
-		t.Errorf("Via: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AppendVia tests that server adds value to existing Via
-// header field to and from backend server.
-func TestH2H1AppendVia(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo, 2 nghttpx"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AppendVia",
-		header: []hpack.HeaderField{
-			pair("via", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.header.Get("Via"), "bar, 1.1 nghttpx"; got != want {
-		t.Errorf("Via: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1NoVia tests that server does not add value to existing Via
-// header field to and from backend server.
-func TestH2H1NoVia(t *testing.T) {
-	st := newServerTester([]string{"--no-via"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Via"), "foo"; got != want {
-			t.Errorf("Via: %v; want %v", got, want)
-		}
-		w.Header().Add("Via", "bar")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1NoVia",
-		header: []hpack.HeaderField{
-			pair("via", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.header.Get("Via"), "bar"; got != want {
-		t.Errorf("Via: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1HostRewrite tests that server rewrites host header field
-func TestH2H1HostRewrite(t *testing.T) {
-	st := newServerTester([]string{"--host-rewrite"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1HostRewrite",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1NoHostRewrite tests that server does not rewrite host
-// header field
-func TestH2H1NoHostRewrite(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1NoHostRewrite",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("request-host"), st.frontendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1BadRequestCL tests that server rejects request whose
-// content-length header field value does not match its request body
-// size.
-func TestH2H1BadRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	// we set content-length: 1024, but the actual request body is
-	// 3 bytes.
-	res, err := st.http2(requestParam{
-		name:   "TestH2H1BadRequestCL",
-		method: "POST",
-		header: []hpack.HeaderField{
-			pair("content-length", "1024"),
-		},
-		body: []byte("foo"),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	want := http2.ErrCodeProtocol
-	if res.errCode != want {
-		t.Errorf("res.errCode = %v; want %v", res.errCode, want)
-	}
-}
-
-// TestH2H1BadResponseCL tests that server returns error when
-// content-length response header field value does not match its
-// response body size.
-func TestH2H1BadResponseCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		// we set content-length: 1024, but only send 3 bytes.
-		w.Header().Add("Content-Length", "1024")
-		w.Write([]byte("foo"))
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1BadResponseCL",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	want := http2.ErrCodeProtocol
-	if res.errCode != want {
-		t.Errorf("res.errCode = %v; want %v", res.errCode, want)
-	}
-}
-
-// TestH2H1LocationRewrite tests location header field rewriting
-// works.
-func TestH2H1LocationRewrite(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		// TODO we cannot get st.ts's port number here.. 8443
-		// is just a place holder.  We ignore it on rewrite.
-		w.Header().Add("Location", "http://127.0.0.1:8443/p/q?a=b#fragment")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1LocationRewrite",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	want := fmt.Sprintf("http://127.0.0.1:%v/p/q?a=b#fragment", serverPort)
-	if got := res.header.Get("Location"); got != want {
-		t.Errorf("Location: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ChunkedRequestBody tests that chunked request body works.
-func TestH2H1ChunkedRequestBody(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		want := "[chunked]"
-		if got := fmt.Sprint(r.TransferEncoding); got != want {
-			t.Errorf("Transfer-Encoding: %v; want %v", got, want)
-		}
-		body, err := ioutil.ReadAll(r.Body)
-		if err != nil {
-			t.Fatalf("Error reading r.body: %v", err)
-		}
-		want = "foo"
-		if got := string(body); got != want {
-			t.Errorf("body: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H1ChunkedRequestBody",
-		method: "POST",
-		body:   []byte("foo"),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1MultipleRequestCL tests that server rejects request with
-// multiple Content-Length request header fields.
-func TestH2H1MultipleRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1MultipleRequestCL",
-		header: []hpack.HeaderField{
-			pair("content-length", "1"),
-			pair("content-length", "1"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeProtocol; got != want {
-		t.Errorf("res.errCode: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1InvalidRequestCL tests that server rejects request with
-// Content-Length which cannot be parsed as a number.
-func TestH2H1InvalidRequestCL(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward bad request")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1InvalidRequestCL",
-		header: []hpack.HeaderField{
-			pair("content-length", ""),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeProtocol; got != want {
-		t.Errorf("res.errCode: %v; want %v", got, want)
-	}
-}
-
-// // TestH2H1ConnectFailure tests that server handles the situation that
-// // connection attempt to HTTP/1 backend failed.
-// func TestH2H1ConnectFailure(t *testing.T) {
-// 	st := newServerTester(nil, t, noopHandler)
-// 	defer st.Close()
-
-// 	// shutdown backend server to simulate backend connect failure
-// 	st.ts.Close()
-
-// 	res, err := st.http2(requestParam{
-// 		name: "TestH2H1ConnectFailure",
-// 	})
-// 	if err != nil {
-// 		t.Fatalf("Error st.http2() = %v", err)
-// 	}
-// 	want := 503
-// 	if got := res.status; got != want {
-// 		t.Errorf("status: %v; want %v", got, want)
-// 	}
-// }
-
-// TestH2H1InvalidMethod tests that server rejects invalid method with
-// 501.
-func TestH2H1InvalidMethod(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H1InvalidMethod",
-		method: "get",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 501; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1BadAuthority tests that server rejects request including
-// bad characters in :authority header field.
-func TestH2H1BadAuthority(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:      "TestH2H1BadAuthority",
-		authority: `foo\bar`,
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeProtocol; got != want {
-		t.Errorf("res.errCode: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1BadScheme tests that server rejects request including
-// bad characters in :scheme header field.
-func TestH2H1BadScheme(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Errorf("server should not forward this request")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H1BadScheme",
-		scheme: "http*",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeProtocol; got != want {
-		t.Errorf("res.errCode: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AssembleCookies tests that crumbled cookies in HTTP/2
-// request is assembled into 1 when forwarding to HTTP/1 backend link.
-func TestH2H1AssembleCookies(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("Cookie"), "alpha; bravo; charlie"; got != want {
-			t.Errorf("Cookie: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AssembleCookies",
-		header: []hpack.HeaderField{
-			pair("cookie", "alpha"),
-			pair("cookie", "bravo"),
-			pair("cookie", "charlie"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1TETrailers tests that server accepts TE request header
-// field if it has trailers only.
-func TestH2H1TETrailers(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1TETrailers",
-		header: []hpack.HeaderField{
-			pair("te", "trailers"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1TEGzip tests that server resets stream if TE request header
-// field contains gzip.
-func TestH2H1TEGzip(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("server should not forward bad request")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1TEGzip",
-		header: []hpack.HeaderField{
-			pair("te", "gzip"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeProtocol; got != want {
-		t.Errorf("res.errCode = %v; want %v", res.errCode, want)
-	}
-}
-
-// TestH2H1SNI tests server's TLS SNI extension feature.  It must
-// choose appropriate certificate depending on the indicated
-// server_name from client.
-func TestH2H1SNI(t *testing.T) {
-	st := newServerTesterTLSConfig([]string{"--subcert=" + testDir + "/alt-server.key:" + testDir + "/alt-server.crt"}, t, noopHandler, &tls.Config{
-		ServerName: "alt-domain",
-	})
-	defer st.Close()
-
-	tlsConn := st.conn.(*tls.Conn)
-	connState := tlsConn.ConnectionState()
-	cert := connState.PeerCertificates[0]
-
-	if got, want := cert.Subject.CommonName, "alt-domain"; got != want {
-		t.Errorf("CommonName: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1TLSXfp tests nghttpx sends x-forwarded-proto header field
-// with http value since :scheme is http, even if the frontend
-// connection is encrypted.
-func TestH2H1TLSXfp(t *testing.T) {
-	st := newServerTesterTLS(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("x-forwarded-proto"), "http"; got != want {
-			t.Errorf("x-forwarded-proto: want %v; got %v", want, got)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1TLSXfp",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ServerPush tests server push using Link header field from
-// backend server.
-func TestH2H1ServerPush(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		// only resources marked as rel=preload are pushed
-		if !strings.HasPrefix(r.URL.Path, "/css/") {
-			w.Header().Add("Link", "</css/main.css>; rel=preload, </foo>, </css/theme.css>; rel=preload")
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ServerPush",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-	if got, want := len(res.pushResponse), 2; got != want {
-		t.Fatalf("len(res.pushResponse): %v; want %v", got, want)
-	}
-	mainCSS := res.pushResponse[0]
-	if got, want := mainCSS.status, 200; got != want {
-		t.Errorf("mainCSS.status: %v; want %v", got, want)
-	}
-	themeCSS := res.pushResponse[1]
-	if got, want := themeCSS.status, 200; got != want {
-		t.Errorf("themeCSS.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1RequestTrailer tests request trailer part is forwarded to
-// backend.
-func TestH2H1RequestTrailer(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		buf := make([]byte, 4096)
-		for {
-			_, err := r.Body.Read(buf)
-			if err == io.EOF {
-				break
-			}
-			if err != nil {
-				t.Fatalf("r.Body.Read() = %v", err)
-			}
-		}
-		if got, want := r.Trailer.Get("foo"), "bar"; got != want {
-			t.Errorf("r.Trailer.Get(foo): %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1RequestTrailer",
-		body: []byte("1"),
-		trailer: []hpack.HeaderField{
-			pair("foo", "bar"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1HeaderFieldBuffer tests that request with header fields
-// larger than configured buffer size is rejected.
-func TestH2H1HeaderFieldBuffer(t *testing.T) {
-	st := newServerTester([]string{"--request-header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1HeaderFieldBuffer",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 431; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1HeaderFields tests that request with header fields more
-// than configured number is rejected.
-func TestH2H1HeaderFields(t *testing.T) {
-	st := newServerTester([]string{"--max-request-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("execution path should not be here")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1HeaderFields",
-		// we have at least 4 pseudo-header fields sent, and
-		// that ensures that buffer limit exceeds.
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 431; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ReqPhaseSetHeader tests mruby request phase hook
-// modifies request header fields.
-func TestH2H1ReqPhaseSetHeader(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
-			t.Errorf("User-Agent = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ReqPhaseSetHeader",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ReqPhaseReturn tests mruby request phase hook returns
-// custom response.
-func TestH2H1ReqPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ReqPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "20"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from req"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1RespPhaseSetHeader tests mruby response phase hook modifies
-// response header fields.
-func TestH2H1RespPhaseSetHeader(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1RespPhaseSetHeader",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	if got, want := res.header.Get("alpha"), "bravo"; got != want {
-		t.Errorf("alpha = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1RespPhaseReturn tests mruby response phase hook returns
-// custom response.
-func TestH2H1RespPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1RespPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "21"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from resp"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1Upgrade tests HTTP Upgrade to HTTP/2
-func TestH2H1Upgrade(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {})
-	defer st.Close()
-
-	res, err := st.http1(requestParam{
-		name: "TestH2H1Upgrade",
-		header: []hpack.HeaderField{
-			pair("Connection", "Upgrade, HTTP2-Settings"),
-			pair("Upgrade", "h2c"),
-			pair("HTTP2-Settings", "AAMAAABkAAQAAP__"),
-		},
-	})
-
-	if err != nil {
-		t.Fatalf("Error st.http1() = %v", err)
-	}
-
-	if got, want := res.status, 101; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	res, err = st.http2(requestParam{
-		httpUpgrade: true,
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ProxyProtocolV1ForwardedForObfuscated tests that Forwarded
-// header field includes obfuscated address even if PROXY protocol
-// version 1 containing TCP4 entry is accepted.
-func TestH2H1ProxyProtocolV1ForwardedForObfuscated(t *testing.T) {
-	pattern := fmt.Sprintf(`^for=_[^;]+$`)
-	validFwd := regexp.MustCompile(pattern)
-	st := newServerTester([]string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=obfuscated"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded: %v; want pattern %v", got, pattern)
-		}
-	})
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n"))
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1ForwardedForObfuscated",
-	})
-
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ProxyProtocolV1TCP4 tests PROXY protocol version 1
-// containing TCP4 entry is accepted and X-Forwarded-For contains
-// advertised src address.
-func TestH2H1ProxyProtocolV1TCP4(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), "for=192.168.0.2"; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP4 192.168.0.2 192.168.0.100 12345 8080\r\n"))
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1TCP4",
-	})
-
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ProxyProtocolV1TCP6 tests PROXY protocol version 1
-// containing TCP6 entry is accepted and X-Forwarded-For contains
-// advertised src address.
-func TestH2H1ProxyProtocolV1TCP6(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("X-Forwarded-For"), "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; got != want {
-			t.Errorf("X-Forwarded-For: %v; want %v", got, want)
-		}
-		if got, want := r.Header.Get("Forwarded"), `for="[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"`; got != want {
-			t.Errorf("Forwarded: %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 2001:0db8:85a3:0000:0000:8a2e:0370:7334 ::1 12345 8080\r\n"))
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1TCP6",
-	})
-
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ProxyProtocolV1Unknown tests PROXY protocol version 1
-// containing UNKNOWN entry is accepted.
-func TestH2H1ProxyProtocolV1Unknown(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol", "--add-x-forwarded-for", "--add-forwarded=for", "--forwarded-for=ip"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, notWant := r.Header.Get("X-Forwarded-For"), "192.168.0.2"; got == notWant {
-			t.Errorf("X-Forwarded-For: %v; want something else", got)
-		}
-		if got, notWant := r.Header.Get("Forwarded"), "for=192.168.0.2"; got == notWant {
-			t.Errorf("Forwarded: %v; want something else", got)
-		}
-	})
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY UNKNOWN 192.168.0.2 192.168.0.100 12345 8080\r\n"))
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1Unknown",
-	})
-
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ProxyProtocolV1JustUnknown tests PROXY protocol version 1
-// containing only "PROXY UNKNOWN" is accepted.
-func TestH2H1ProxyProtocolV1JustUnknown(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol", "--add-x-forwarded-for"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY UNKNOWN\r\n"))
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1JustUnknown",
-	})
-
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1ProxyProtocolV1TooLongLine tests PROXY protocol version 1
-// line longer than 107 bytes must be rejected
-func TestH2H1ProxyProtocolV1TooLongLine(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol", "--add-x-forwarded-for"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY UNKNOWN ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535 655350\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1TooLongLine",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1BadLineEnd tests that PROXY protocol version
-// 1 line ending without \r\n should be rejected.
-func TestH2H1ProxyProtocolV1BadLineEnd(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 12345 8080\r \n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1BadLineEnd",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1NoEnd tests that PROXY protocol version 1
-// line containing no \r\n should be rejected.
-func TestH2H1ProxyProtocolV1NoEnd(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 12345 8080"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1NoEnd",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1EmbeddedNULL tests that PROXY protocol
-// version 1 line containing NULL character should be rejected.
-func TestH2H1ProxyProtocolV1EmbeddedNULL(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	b := []byte("PROXY TCP6 ::1*foo ::1 12345 8080\r\n")
-	b[14] = 0
-	st.conn.Write(b)
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1EmbeddedNULL",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1MissingSrcPort tests that PROXY protocol
-// version 1 line without src port should be rejected.
-func TestH2H1ProxyProtocolV1MissingSrcPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1  8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1MissingSrcPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1MissingDstPort tests that PROXY protocol
-// version 1 line without dst port should be rejected.
-func TestH2H1ProxyProtocolV1MissingDstPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 12345 \r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1MissingDstPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1InvalidSrcPort tests that PROXY protocol
-// containing invalid src port should be rejected.
-func TestH2H1ProxyProtocolV1InvalidSrcPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 123x 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1InvalidSrcPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1InvalidDstPort tests that PROXY protocol
-// containing invalid dst port should be rejected.
-func TestH2H1ProxyProtocolV1InvalidDstPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 123456 80x\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1InvalidDstPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1LeadingZeroPort tests that PROXY protocol
-// version 1 line with non zero port with leading zero should be
-// rejected.
-func TestH2H1ProxyProtocolV1LeadingZeroPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 03000 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1LeadingZeroPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1TooLargeSrcPort tests that PROXY protocol
-// containing too large src port should be rejected.
-func TestH2H1ProxyProtocolV1TooLargeSrcPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 65536 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1TooLargeSrcPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1TooLargeDstPort tests that PROXY protocol
-// containing too large dst port should be rejected.
-func TestH2H1ProxyProtocolV1TooLargeDstPort(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 ::1 12345 65536\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1TooLargeDstPort",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1InvalidSrcAddr tests that PROXY protocol
-// containing invalid src addr should be rejected.
-func TestH2H1ProxyProtocolV1InvalidSrcAddr(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 192.168.0.1 ::1 12345 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1InvalidSrcAddr",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1InvalidDstAddr tests that PROXY protocol
-// containing invalid dst addr should be rejected.
-func TestH2H1ProxyProtocolV1InvalidDstAddr(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY TCP6 ::1 192.168.0.1 12345 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1InvalidDstAddr",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1InvalidProtoFamily tests that PROXY protocol
-// containing invalid protocol family should be rejected.
-func TestH2H1ProxyProtocolV1InvalidProtoFamily(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PROXY UNIX ::1 ::1 12345 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1InvalidProtoFamily",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ProxyProtocolV1InvalidID tests that PROXY protocol
-// containing invalid PROXY protocol version 1 ID should be rejected.
-func TestH2H1ProxyProtocolV1InvalidID(t *testing.T) {
-	st := newServerTester([]string{"--accept-proxy-protocol"}, t, noopHandler)
-	defer st.Close()
-
-	st.conn.Write([]byte("PR0XY TCP6 ::1 ::1 12345 8080\r\n"))
-
-	_, err := st.http2(requestParam{
-		name: "TestH2H1ProxyProtocolV1InvalidID",
-	})
-
-	if err == nil {
-		t.Fatalf("connection was not terminated")
-	}
-}
-
-// TestH2H1ExternalDNS tests that DNS resolution using external DNS
-// with HTTP/1 backend works.
-func TestH2H1ExternalDNS(t *testing.T) {
-	st := newServerTester([]string{"--external-dns"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1ExternalDNS",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1DNS tests that DNS resolution without external DNS with
-// HTTP/1 backend works.
-func TestH2H1DNS(t *testing.T) {
-	st := newServerTester([]string{"--dns"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1DNS",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1HTTPSRedirect tests that the request to the backend which
-// requires TLS is redirected to https URI.
-func TestH2H1HTTPSRedirect(t *testing.T) {
-	st := newServerTester([]string{"--redirect-if-not-tls"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1HTTPSRedirect",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 308; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("location"), "https://127.0.0.1/"; got != want {
-		t.Errorf("location: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1HTTPSRedirectPort tests that the request to the backend
-// which requires TLS is redirected to https URI with given port.
-func TestH2H1HTTPSRedirectPort(t *testing.T) {
-	st := newServerTester([]string{"--redirect-if-not-tls", "--redirect-https-port=8443"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		path: "/foo?bar",
-		name: "TestH2H1HTTPSRedirectPort",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 308; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("location"), "https://127.0.0.1:8443/foo?bar"; got != want {
-		t.Errorf("location: %v; want %v", got, want)
-	}
-}
-
-// TestH2H1Code204 tests that 204 response without content-length, and
-// transfer-encoding is valid.
-func TestH2H1Code204(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1Code204",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 204; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1Code204CL0 tests that 204 response with content-length: 0
-// is allowed.
-func TestH2H1Code204CL0(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 204\r\nContent-Length: 0\r\n\r\n")
-		bufrw.Flush()
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1Code204CL0",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 204; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	if got, found := res.header["Content-Length"]; found {
-		t.Errorf("Content-Length = %v, want nothing", got)
-	}
-}
-
-// TestH2H1Code204CLNonzero tests that 204 response with nonzero
-// content-length is not allowed.
-func TestH2H1Code204CLNonzero(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 204\r\nContent-Length: 1\r\n\r\n")
-		bufrw.Flush()
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1Code204CLNonzero",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 502; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1Code204TE tests that 204 response with transfer-encoding is
-// not allowed.
-func TestH2H1Code204TE(t *testing.T) {
-	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
-		hj, ok := w.(http.Hijacker)
-		if !ok {
-			http.Error(w, "Could not hijack the connection", http.StatusInternalServerError)
-			return
-		}
-		conn, bufrw, err := hj.Hijack()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer conn.Close()
-		bufrw.WriteString("HTTP/1.1 204\r\nTransfer-Encoding: chunked\r\n\r\n")
-		bufrw.Flush()
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1Code204TE",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 502; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H1AffinityCookie tests that affinity cookie is sent back in
-// cleartext http.
-func TestH2H1AffinityCookie(t *testing.T) {
-	st := newServerTester([]string{"--affinity-cookie"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H1AffinityCookie",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	const pattern = `affinity=[0-9a-f]{8}; Path=/foo/bar`
-	validCookie := regexp.MustCompile(pattern)
-	if got := res.header.Get("Set-Cookie"); !validCookie.MatchString(got) {
-		t.Errorf("Set-Cookie: %v; want pattern %v", got, pattern)
-	}
-}
-
-// TestH2H1AffinityCookieTLS tests that affinity cookie is sent back
-// in https.
-func TestH2H1AffinityCookieTLS(t *testing.T) {
-	st := newServerTesterTLS([]string{"--affinity-cookie"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H1AffinityCookieTLS",
-		scheme: "https",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	const pattern = `affinity=[0-9a-f]{8}; Path=/foo/bar; Secure`
-	validCookie := regexp.MustCompile(pattern)
-	if got := res.header.Get("Set-Cookie"); !validCookie.MatchString(got) {
-		t.Errorf("Set-Cookie: %v; want pattern %v", got, pattern)
-	}
-}
-
-// TestH2H1GracefulShutdown tests graceful shutdown.
-func TestH2H1GracefulShutdown(t *testing.T) {
-	st := newServerTester(nil, t, noopHandler)
-	defer st.Close()
-
-	fmt.Fprint(st.conn, "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n")
-	if err := st.fr.WriteSettings(); err != nil {
-		t.Fatalf("st.fr.WriteSettings(): %v", err)
-	}
-
-	header := []hpack.HeaderField{
-		pair(":method", "GET"),
-		pair(":scheme", "http"),
-		pair(":authority", st.authority),
-		pair(":path", "/"),
-	}
-
-	for _, h := range header {
-		_ = st.enc.WriteField(h)
-	}
-
-	if err := st.fr.WriteHeaders(http2.HeadersFrameParam{
-		StreamID:      1,
-		EndStream:     false,
-		EndHeaders:    true,
-		BlockFragment: st.headerBlkBuf.Bytes(),
-	}); err != nil {
-		t.Fatalf("st.fr.WriteHeaders(): %v", err)
-	}
-
-	// send SIGQUIT signal to nghttpx to perform graceful shutdown
-	st.cmd.Process.Signal(syscall.SIGQUIT)
-	time.Sleep(150 * time.Millisecond)
-
-	// after signal, finish request body
-	if err := st.fr.WriteData(1, true, nil); err != nil {
-		t.Fatalf("st.fr.WriteData(): %v", err)
-	}
-
-	numGoAway := 0
-
-	for {
-		fr, err := st.readFrame()
-		if err != nil {
-			if err == io.EOF {
-				want := 2
-				if got := numGoAway; got != want {
-					t.Fatalf("numGoAway: %v; want %v", got, want)
-				}
-				return
-			}
-			t.Fatalf("st.readFrame(): %v", err)
-		}
-		switch f := fr.(type) {
-		case *http2.GoAwayFrame:
-			numGoAway += 1
-			want := http2.ErrCodeNo
-			if got := f.ErrCode; got != want {
-				t.Fatalf("f.ErrCode(%v): %v; want %v", numGoAway, got, want)
-			}
-			switch numGoAway {
-			case 1:
-				want := (uint32(1) << 31) - 1
-				if got := f.LastStreamID; got != want {
-					t.Fatalf("f.LastStreamID(%v): %v; want %v", numGoAway, got, want)
-				}
-			case 2:
-				want := uint32(1)
-				if got := f.LastStreamID; got != want {
-					t.Fatalf("f.LastStreamID(%v): %v; want %v", numGoAway, got, want)
-				}
-			case 3:
-				t.Fatalf("too many GOAWAYs received")
-			}
-		}
-	}
-}
-
-// TestH2H2MultipleResponseCL tests that server returns error if
-// multiple Content-Length response header fields are received.
-func TestH2H2MultipleResponseCL(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("content-length", "1")
-		w.Header().Add("content-length", "1")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2MultipleResponseCL",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeInternal; got != want {
-		t.Errorf("res.errCode: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2InvalidResponseCL tests that server returns error if
-// Content-Length response header field value cannot be parsed as a
-// number.
-func TestH2H2InvalidResponseCL(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("content-length", "")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2InvalidResponseCL",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.errCode, http2.ErrCodeInternal; got != want {
-		t.Errorf("res.errCode: %v; want %v", got, want)
-	}
-}
-
-// // TestH2H2ConnectFailure tests that server handles the situation that
-// // connection attempt to HTTP/2 backend failed.
-// func TestH2H2ConnectFailure(t *testing.T) {
-// 	st := newServerTester([]string{"--http2-bridge"}, t, noopHandler)
-// 	defer st.Close()
-
-// 	// simulate backend connect attempt failure
-// 	st.ts.Close()
-
-// 	res, err := st.http2(requestParam{
-// 		name: "TestH2H2ConnectFailure",
-// 	})
-// 	if err != nil {
-// 		t.Fatalf("Error st.http2() = %v", err)
-// 	}
-// 	want := 503
-// 	if got := res.status; got != want {
-// 		t.Errorf("status: %v; want %v", got, want)
-// 	}
-// }
-
-// TestH2H2HostRewrite tests that server rewrites host header field
-func TestH2H2HostRewrite(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--host-rewrite"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2HostRewrite",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("request-host"), st.backendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2NoHostRewrite tests that server does not rewrite host
-// header field
-func TestH2H2NoHostRewrite(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("request-host", r.Host)
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2NoHostRewrite",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-	if got, want := res.header.Get("request-host"), st.frontendHost; got != want {
-		t.Errorf("request-host: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2TLSXfp tests nghttpx sends x-forwarded-proto header field
-// with http value since :scheme is http, even if the frontend
-// connection is encrypted.
-func TestH2H2TLSXfp(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, want := r.Header.Get("x-forwarded-proto"), "http"; got != want {
-			t.Errorf("x-forwarded-proto: want %v; got %v", want, got)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2TLSXfp",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2AddXfp tests that server appends :scheme to the existing
-// x-forwarded-proto header field.
-func TestH2H2AddXfp(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo, http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2AddXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2NoAddXfp tests that server does not append :scheme to the
-// existing x-forwarded-proto header field.
-func TestH2H2NoAddXfp(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--no-add-x-forwarded-proto", "--no-strip-incoming-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "foo"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2NoAddXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2StripXfp tests that server strips incoming
-// x-forwarded-proto header field.
-func TestH2H2StripXfp(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xfp := r.Header.Get("X-Forwarded-Proto")
-		if got, want := xfp, "http"; got != want {
-			t.Errorf("X-Forwarded-Proto = %q; want %q", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2StripXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2StripNoAddXfp tests that server strips incoming
-// x-forwarded-proto header field, and does not add another.
-func TestH2H2StripNoAddXfp(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--no-add-x-forwarded-proto"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header["X-Forwarded-Proto"]; found {
-			t.Errorf("X-Forwarded-Proto = %q; want nothing", got)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2StripNoAddXfp",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-proto", "foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2AddXff tests that server generates X-Forwarded-For header
-// field when forwarding request to backend.
-func TestH2H2AddXff(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2AddXff",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2AddXff2 tests that server appends X-Forwarded-For header
-// field to existing one when forwarding request to backend.
-func TestH2H2AddXff2(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "host, 127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2AddXff2",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-for", "host"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2StripXff tests that --strip-incoming-x-forwarded-for
-// option.
-func TestH2H2StripXff(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--strip-incoming-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if xff, found := r.Header["X-Forwarded-For"]; found {
-			t.Errorf("X-Forwarded-For = %v; want nothing", xff)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2StripXff",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-for", "host"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2StripAddXff tests that --strip-incoming-x-forwarded-for and
-// --add-x-forwarded-for options.
-func TestH2H2StripAddXff(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--strip-incoming-x-forwarded-for", "--add-x-forwarded-for"}, t, func(w http.ResponseWriter, r *http.Request) {
-		xff := r.Header.Get("X-Forwarded-For")
-		want := "127.0.0.1"
-		if xff != want {
-			t.Errorf("X-Forwarded-For = %v; want %v", xff, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2StripAddXff",
-		header: []hpack.HeaderField{
-			pair("x-forwarded-for", "host"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2AddForwarded tests that server generates Forwarded header
-// field using static obfuscated "by" parameter.
-func TestH2H2AddForwarded(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--add-forwarded=by,for,host,proto", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		pattern := fmt.Sprintf(`by=_alpha;for=_[^;]+;host="127\.0\.0\.1:%v";proto=https`, serverPort)
-		validFwd := regexp.MustCompile(pattern)
-		if got := r.Header.Get("Forwarded"); !validFwd.MatchString(got) {
-			t.Errorf("Forwarded = %v; want pattern %v", got, pattern)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H2AddForwarded",
-		scheme: "https",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2AddForwardedMerge tests that server generates Forwarded
-// header field using static obfuscated "by" parameter, and
-// existing Forwarded header field.
-func TestH2H2AddForwardedMerge(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--add-forwarded=by,host,proto", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		want := fmt.Sprintf(`host=foo, by=_alpha;host="127.0.0.1:%v";proto=https`, serverPort)
-		if got := r.Header.Get("Forwarded"); got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H2AddForwardedMerge",
-		scheme: "https",
-		header: []hpack.HeaderField{
-			pair("forwarded", "host=foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2AddForwardedStrip tests that server generates Forwarded
-// header field using static obfuscated "by" parameter, and
-// existing Forwarded header field stripped.
-func TestH2H2AddForwardedStrip(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--strip-incoming-forwarded", "--add-forwarded=by,host,proto", "--forwarded-by=_alpha"}, t, func(w http.ResponseWriter, r *http.Request) {
-		want := fmt.Sprintf(`by=_alpha;host="127.0.0.1:%v";proto=https`, serverPort)
-		if got := r.Header.Get("Forwarded"); got != want {
-			t.Errorf("Forwarded = %v; want %v", got, want)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H2AddForwardedStrip",
-		scheme: "https",
-		header: []hpack.HeaderField{
-			pair("forwarded", "host=foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2StripForwarded tests that server strips incoming Forwarded
-// header field.
-func TestH2H2StripForwarded(t *testing.T) {
-	st := newServerTesterTLS([]string{"--http2-bridge", "--strip-incoming-forwarded"}, t, func(w http.ResponseWriter, r *http.Request) {
-		if got, found := r.Header["Forwarded"]; found {
-			t.Errorf("Forwarded = %v; want nothing", got)
-		}
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2H2StripForwarded",
-		scheme: "https",
-		header: []hpack.HeaderField{
-			pair("forwarded", "host=foo"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status: %v; want %v", got, want)
-	}
-}
-
-// TestH2H2ReqPhaseReturn tests mruby request phase hook returns
-// custom response.
-func TestH2H2ReqPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2ReqPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "20"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from req"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2RespPhaseReturn tests mruby response phase hook returns
-// custom response.
-func TestH2H2RespPhaseReturn(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2RespPhaseReturn",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 404; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-
-	hdtests := []struct {
-		k, v string
-	}{
-		{"content-length", "21"},
-		{"from", "mruby"},
-	}
-	for _, tt := range hdtests {
-		if got, want := res.header.Get(tt.k), tt.v; got != want {
-			t.Errorf("%v = %v; want %v", tt.k, got, want)
-		}
-	}
-
-	if got, want := string(res.body), "Hello World from resp"; got != want {
-		t.Errorf("body = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2ExternalDNS tests that DNS resolution using external DNS
-// with HTTP/2 backend works.
-func TestH2H2ExternalDNS(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--external-dns"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2ExternalDNS",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2DNS tests that DNS resolution without external DNS with
-// HTTP/2 backend works.
-func TestH2H2DNS(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge", "--dns"}, t, noopHandler)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2DNS",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 200; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2H2Code204 tests that 204 response without content-length, and
-// transfer-encoding is valid.
-func TestH2H2Code204(t *testing.T) {
-	st := newServerTester([]string{"--http2-bridge"}, t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusNoContent)
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2H2Code204",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-
-	if got, want := res.status, 204; got != want {
-		t.Errorf("status = %v; want %v", got, want)
-	}
-}
-
-// TestH2APIBackendconfig exercise backendconfig API endpoint routine
-// for successful case.
-func TestH2APIBackendconfig(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2APIBackendconfig",
-		path:   "/api/v1beta1/backendconfig",
-		method: "PUT",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Success"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 200; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH2APIBackendconfigQuery exercise backendconfig API endpoint
-// routine with query.
-func TestH2APIBackendconfigQuery(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2APIBackendconfigQuery",
-		path:   "/api/v1beta1/backendconfig?foo=bar",
-		method: "PUT",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Success"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 200; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH2APIBackendconfigBadMethod exercise backendconfig API endpoint
-// routine with bad method.
-func TestH2APIBackendconfigBadMethod(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2APIBackendconfigBadMethod",
-		path:   "/api/v1beta1/backendconfig",
-		method: "GET",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 405; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Failure"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 405; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH2APIConfigrevision tests configrevision API.
-func TestH2APIConfigrevision(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2APIConfigrevision",
-		path:   "/api/v1beta1/configrevision",
-		method: "GET",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want = %v", got, want)
-	}
-
-	var apiResp APIResponse
-	d := json.NewDecoder(bytes.NewBuffer(res.body))
-	d.UseNumber()
-	err = d.Decode(&apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshalling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Success"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 200; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Data["configRevision"], json.Number("0"); got != want {
-		t.Errorf(`apiResp.Data["configRevision"]: %v %t; want %v`, got, got, want)
-	}
-}
-
-// TestH2APINotFound exercise backendconfig API endpoint routine when
-// API endpoint is not found.
-func TestH2APINotFound(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3010;api;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3010)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:   "TestH2APINotFound",
-		path:   "/api/notfound",
-		method: "GET",
-		body: []byte(`# comment
-backend=127.0.0.1,3011
-
-`),
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 404; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-
-	var apiResp APIResponse
-	err = json.Unmarshal(res.body, &apiResp)
-	if err != nil {
-		t.Fatalf("Error unmarshaling API response: %v", err)
-	}
-	if got, want := apiResp.Status, "Failure"; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-	if got, want := apiResp.Code, 404; got != want {
-		t.Errorf("apiResp.Status: %v; want %v", got, want)
-	}
-}
-
-// TestH2Healthmon tests health monitor endpoint.
-func TestH2Healthmon(t *testing.T) {
-	st := newServerTesterConnectPort([]string{"-f127.0.0.1,3011;healthmon;no-tls"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatalf("request should not be forwarded")
-	}, 3011)
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name: "TestH2Healthmon",
-		path: "/alpha/bravo",
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 200; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
-
-// TestH2ResponseBeforeRequestEnd tests the situation where response
-// ends before request body finishes.
-func TestH2ResponseBeforeRequestEnd(t *testing.T) {
-	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
-		t.Fatal("request should not be forwarded")
-	})
-	defer st.Close()
-
-	res, err := st.http2(requestParam{
-		name:        "TestH2ResponseBeforeRequestEnd",
-		noEndStream: true,
-	})
-	if err != nil {
-		t.Fatalf("Error st.http2() = %v", err)
-	}
-	if got, want := res.status, 404; got != want {
-		t.Errorf("res.status: %v; want %v", got, want)
-	}
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-return.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-return.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-return.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-return.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-class App
-  def on_req(env)
-    resp = env.resp
-
-    resp.clear_headers
-    resp.status = 404
-    resp.add_header "from", "mruby"
-    resp.return "Hello World from req"
-  end
-end
-
-App.new
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-set-header.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-set-header.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-set-header.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/req-set-header.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-class App
-  def on_req(env)
-    env.req.set_header "User-Agent", "mruby"
-  end
-end
-
-App.new
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-return.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-return.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-return.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-return.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-class App
-  def on_resp(env)
-    resp = env.resp
-
-    resp.clear_headers
-    resp.status = 404
-    resp.add_header "from", "mruby"
-    resp.return "Hello World from resp"
-  end
-end
-
-App.new
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-set-header.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-set-header.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-set-header.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/resp-set-header.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-class App
-  def on_resp(env)
-    env.resp.set_header "Alpha", "bravo"
-  end
-end
-
-App.new
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.crt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.crt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.crt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.crt	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJAOvIx8xIxgyOMA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMMCTEyNy4wLjAuMTAeFw0xNTAxMjMxMjI0
-MjdaFw0yNTAxMjAxMjI0MjdaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21l
-LVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
-BAMMCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuI
-QZRI/iBaxPTjTWGemt8tCEfzZWxuIW3hY/gIhwJDfH2SbourBh1s9vqcqhBq5vmo
-kdfVQXAnNLjIG1uhWmcHuNnKrE5hU82N6i9RsmuM5TQRvhsamHri4G+EXJMu9GqF
-Mso8g7MWpRSGKf+8gfjAVNwfCHFiu8oBcMmy3l54MFHgRLSveAMhiPB0e3Xlnpr5
-2bS/oGTx5ynwPgBpEn2FrpT4Z/aLCLzJ/ysgNH8BXEh7n/v7xM3vd5grqB039rd5
-JoxlWvp+4XpzKp5upaqmOcVUq4pDSFUQ3w6C+v33Z3OK6Qaon7GMxLv3Us3b7PZ3
-1CLoWJR2o3OSnUfO/gUCAwEAAaNQME4wHQYDVR0OBBYEFLc5JWPUUVx4GJesogMV
-w2Rz0L3yMB8GA1UdIwQYMBaAFLc5JWPUUVx4GJesogMVw2Rz0L3yMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAP/cJWpM+GEjmVYHFacKTdbXBMox2Xn
-QY2NLm00WPOGvKnO7czMFfX/pEmiq71kD45rLLfbaJP205QpxqiAIvhFhuq50Co7
-sTDtwcDTPLX9H7Ugjt4sTMPiwC14uVXFfoT/J46zMjXwP00qKyfszc2tkIgHfrTl
-h4M1hkdfmMximir/Ii7TdYYJ3oGS8tdcYb6D4DZwAljKmxF6iUOwFCUgpTmqDBT5
-irXY8D27DzuNN5Pg07rwAlwXLCzrJE10UtO4MmRVXwpzmoaRQD4/tna6bZzdetvs
-gPdGP6W1o0q85gullieMJWeKyQA/wasoE7fypn4pHAdTZm/vH+v7GHg=
------END CERTIFICATE-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.key cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.key
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.key	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server.key	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLiEGUSP4gWsT0
-401hnprfLQhH82VsbiFt4WP4CIcCQ3x9km6LqwYdbPb6nKoQaub5qJHX1UFwJzS4
-yBtboVpnB7jZyqxOYVPNjeovUbJrjOU0Eb4bGph64uBvhFyTLvRqhTLKPIOzFqUU
-hin/vIH4wFTcHwhxYrvKAXDJst5eeDBR4ES0r3gDIYjwdHt15Z6a+dm0v6Bk8ecp
-8D4AaRJ9ha6U+Gf2iwi8yf8rIDR/AVxIe5/7+8TN73eYK6gdN/a3eSaMZVr6fuF6
-cyqebqWqpjnFVKuKQ0hVEN8Ogvr992dziukGqJ+xjMS791LN2+z2d9Qi6FiUdqNz
-kp1Hzv4FAgMBAAECggEACG26GYP0Ui6wHVwUZkiFLVzWDPS9bIIbDEvbMfhYbvWQ
-gDrCLTKF7E4I5FP8jvV+XzRl5cRFE3nsKwLObzr9XWrqcsp73DsXl1mbKx58/ws0
-qrVZZBHz4pLmrHeUxduZ75dYhRuAcLgtWe48awTJdR2x5fO7C8cE89afbxrjLpJE
-tVyiw6vVB0GfWTZodxtAFMTX1KVm4bTngXfg0NF1FBNHAX3Cm6t4YCE41hKSc0IQ
-Jr3C4e9uj8poze1B17k79bGB8HNMbbc8Ws0sdbxi5xnY+HUA/mYQrmGXo8sdqiYC
-EYCMqPm3iJrCmmpHukGf2Vt9k1aLlJ+lxOclSwFO+QKBgQDoRmoprfdmU20LyxYH
-eVeVqggqmhNohwnuhIvOAyrWGUkbDsssqx2Vv82z0WHAAkwEvQ984UzaYWCCL3m3
-+JzpF2dz6aKhXIaYnXBlk3STMGUCDT5ysPvsin9z/unzkffh3vrbDBARGFYWG18x
-eUyTDOVVeTZNHUJXGjRyiftCkwKBgQDgUkR6dHU4ciSt7Y0UkyAgtZ7POR41T05L
-bcxbjJeqm6qlj+oP9WUk7JxeSEFUbrMiROABLPPqTwmGo4xrDRx/e7WrqN6QBKC+
-Y8CfalrKRb0np60x7Mxx0kbmHp5cwv9QDKznKViOYSgKxFrOFZyMAEXQdZ3FvjXF
-OQWrw86kBwKBgQDXuxa9MWO3uUJtkqkaNfw/+FVvY/0kt09lJdxHci+l/IQmyl2w
-Vhm7TRK7sXvtfvSl7gblgMgFiC2/nGKbmR/7ag5e3R98aVhlhMywuvyp/GfEORLI
-KVNChfwMezVFUUx+j8BEFHcTuZuzGqcWZ0fUyER0V4k0pDlKdv9BZqBkWwKBgCdP
-o3qGQCilMDJex/OMGPxCd9M+4kFbZZAobMC6cbXPU+dxwgYL7i67XGfVZ8WBJNlj
-kpICK7irIzM6JBh6krzwlBTCIkbA2N6kopQNUl3SPOTfKKXwJp/nxs77HKuK7K09
-m2tjPoatFhRU9sjY1rdeMN3oTr7hp5CpfonsZaEvAoGAEPsZcDd4N9ap5bgaeDy9
-NOfLsIyaxT5k6moRIiy83QPihvCuECP16+r6M5tiSfgt/PtCimdjhRiqXzIHNRhh
-Nfsv13vUtZgt8cYXuTdI4a8feKI7Q4876ME8Qp3WM5/UNZWq6/sWCuZFqbXUhqM0
-mwNEi5Zddzf8VsSL2gCraQg=
------END PRIVATE KEY-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server_tester.go cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server_tester.go
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server_tester.go	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/server_tester.go	1970-01-01 00:00:00.000000000 +0000
@@ -1,671 +0,0 @@
-package nghttp2
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"github.com/tatsuhiro-t/go-nghttp2"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/websocket"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"os/exec"
-	"sort"
-	"strconv"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-)
-
-const (
-	serverBin  = buildDir + "/src/nghttpx"
-	serverPort = 3009
-	testDir    = sourceDir + "/integration-tests"
-	logDir     = buildDir + "/integration-tests"
-)
-
-func pair(name, value string) hpack.HeaderField {
-	return hpack.HeaderField{
-		Name:  name,
-		Value: value,
-	}
-}
-
-type serverTester struct {
-	args          []string  // command-line arguments
-	cmd           *exec.Cmd // test frontend server process, which is test subject
-	url           string    // test frontend server URL
-	t             *testing.T
-	ts            *httptest.Server // backend server
-	frontendHost  string           // frontend server host
-	backendHost   string           // backend server host
-	conn          net.Conn         // connection to frontend server
-	h2PrefaceSent bool             // HTTP/2 preface was sent in conn
-	nextStreamID  uint32           // next stream ID
-	fr            *http2.Framer    // HTTP/2 framer
-	headerBlkBuf  bytes.Buffer     // buffer to store encoded header block
-	enc           *hpack.Encoder   // HTTP/2 HPACK encoder
-	header        http.Header      // received header fields
-	dec           *hpack.Decoder   // HTTP/2 HPACK decoder
-	authority     string           // server's host:port
-	frCh          chan http2.Frame // used for incoming HTTP/2 frame
-	errCh         chan error
-}
-
-// newServerTester creates test context for plain TCP frontend
-// connection.
-func newServerTester(args []string, t *testing.T, handler http.HandlerFunc) *serverTester {
-	return newServerTesterInternal(args, t, handler, false, serverPort, nil)
-}
-
-func newServerTesterConnectPort(args []string, t *testing.T, handler http.HandlerFunc, port int) *serverTester {
-	return newServerTesterInternal(args, t, handler, false, port, nil)
-}
-
-func newServerTesterHandler(args []string, t *testing.T, handler http.Handler) *serverTester {
-	return newServerTesterInternal(args, t, handler, false, serverPort, nil)
-}
-
-// newServerTester creates test context for TLS frontend connection.
-func newServerTesterTLS(args []string, t *testing.T, handler http.HandlerFunc) *serverTester {
-	return newServerTesterInternal(args, t, handler, true, serverPort, nil)
-}
-
-func newServerTesterTLSConnectPort(args []string, t *testing.T, handler http.HandlerFunc, port int) *serverTester {
-	return newServerTesterInternal(args, t, handler, true, port, nil)
-}
-
-// newServerTester creates test context for TLS frontend connection
-// with given clientConfig
-func newServerTesterTLSConfig(args []string, t *testing.T, handler http.HandlerFunc, clientConfig *tls.Config) *serverTester {
-	return newServerTesterInternal(args, t, handler, true, serverPort, clientConfig)
-}
-
-// newServerTesterInternal creates test context.  If frontendTLS is
-// true, set up TLS frontend connection.  connectPort is the server
-// side port where client connection is made.
-func newServerTesterInternal(src_args []string, t *testing.T, handler http.Handler, frontendTLS bool, connectPort int, clientConfig *tls.Config) *serverTester {
-	ts := httptest.NewUnstartedServer(handler)
-
-	args := []string{}
-
-	var backendTLS, dns, externalDNS, acceptProxyProtocol, redirectIfNotTLS, affinityCookie, alpnH1 bool
-
-	for _, k := range src_args {
-		switch k {
-		case "--http2-bridge":
-			backendTLS = true
-		case "--dns":
-			dns = true
-		case "--external-dns":
-			dns = true
-			externalDNS = true
-		case "--accept-proxy-protocol":
-			acceptProxyProtocol = true
-		case "--redirect-if-not-tls":
-			redirectIfNotTLS = true
-		case "--affinity-cookie":
-			affinityCookie = true
-		case "--alpn-h1":
-			alpnH1 = true
-		default:
-			args = append(args, k)
-		}
-	}
-	if backendTLS {
-		nghttp2.ConfigureServer(ts.Config, &nghttp2.Server{})
-		// According to httptest/server.go, we have to set
-		// NextProtos separately for ts.TLS.  NextProtos set
-		// in nghttp2.ConfigureServer is effectively ignored.
-		ts.TLS = new(tls.Config)
-		ts.TLS.NextProtos = append(ts.TLS.NextProtos, "h2")
-		ts.StartTLS()
-		args = append(args, "-k")
-	} else {
-		ts.Start()
-	}
-	scheme := "http"
-	if frontendTLS {
-		scheme = "https"
-		args = append(args, testDir+"/server.key", testDir+"/server.crt")
-	}
-
-	backendURL, err := url.Parse(ts.URL)
-	if err != nil {
-		t.Fatalf("Error parsing URL from httptest.Server: %v", err)
-	}
-
-	// URL.Host looks like "127.0.0.1:8080", but we want
-	// "127.0.0.1,8080"
-	b := "-b"
-	if !externalDNS {
-		b += fmt.Sprintf("%v;", strings.Replace(backendURL.Host, ":", ",", -1))
-	} else {
-		sep := strings.LastIndex(backendURL.Host, ":")
-		if sep == -1 {
-			t.Fatalf("backendURL.Host %v does not contain separator ':'", backendURL.Host)
-		}
-		// We use awesome service nip.io.
-		b += fmt.Sprintf("%v.nip.io,%v;", backendURL.Host[:sep], backendURL.Host[sep+1:])
-	}
-
-	if backendTLS {
-		b += ";proto=h2;tls"
-	}
-	if dns {
-		b += ";dns"
-	}
-
-	if redirectIfNotTLS {
-		b += ";redirect-if-not-tls"
-	}
-
-	if affinityCookie {
-		b += ";affinity=cookie;affinity-cookie-name=affinity;affinity-cookie-path=/foo/bar"
-	}
-
-	noTLS := ";no-tls"
-	if frontendTLS {
-		noTLS = ""
-	}
-
-	var proxyProto string
-	if acceptProxyProtocol {
-		proxyProto = ";proxyproto"
-	}
-
-	args = append(args, fmt.Sprintf("-f127.0.0.1,%v%v%v", serverPort, noTLS, proxyProto), b,
-		"--errorlog-file="+logDir+"/log.txt", "-LINFO")
-
-	authority := fmt.Sprintf("127.0.0.1:%v", connectPort)
-
-	st := &serverTester{
-		cmd:          exec.Command(serverBin, args...),
-		t:            t,
-		ts:           ts,
-		url:          fmt.Sprintf("%v://%v", scheme, authority),
-		frontendHost: fmt.Sprintf("127.0.0.1:%v", serverPort),
-		backendHost:  backendURL.Host,
-		nextStreamID: 1,
-		authority:    authority,
-		frCh:         make(chan http2.Frame),
-		errCh:        make(chan error),
-	}
-
-	st.cmd.Stdout = os.Stdout
-	st.cmd.Stderr = os.Stderr
-
-	if err := st.cmd.Start(); err != nil {
-		st.t.Fatalf("Error starting %v: %v", serverBin, err)
-	}
-
-	retry := 0
-	for {
-		time.Sleep(50 * time.Millisecond)
-
-		var conn net.Conn
-		var err error
-		if frontendTLS {
-			var tlsConfig *tls.Config
-			if clientConfig == nil {
-				tlsConfig = new(tls.Config)
-			} else {
-				tlsConfig = clientConfig
-			}
-			tlsConfig.InsecureSkipVerify = true
-			if alpnH1 {
-				tlsConfig.NextProtos = []string{"http/1.1"}
-			} else {
-				tlsConfig.NextProtos = []string{"h2"}
-			}
-			conn, err = tls.Dial("tcp", authority, tlsConfig)
-		} else {
-			conn, err = net.Dial("tcp", authority)
-		}
-		if err != nil {
-			retry += 1
-			if retry >= 100 {
-				st.Close()
-				st.t.Fatalf("Error server is not responding too long; server command-line arguments may be invalid")
-			}
-			continue
-		}
-		if frontendTLS {
-			tlsConn := conn.(*tls.Conn)
-			cs := tlsConn.ConnectionState()
-			if !cs.NegotiatedProtocolIsMutual {
-				st.Close()
-				st.t.Fatalf("Error negotiated next protocol is not mutual")
-			}
-		}
-		st.conn = conn
-		break
-	}
-
-	st.fr = http2.NewFramer(st.conn, st.conn)
-	st.enc = hpack.NewEncoder(&st.headerBlkBuf)
-	st.dec = hpack.NewDecoder(4096, func(f hpack.HeaderField) {
-		st.header.Add(f.Name, f.Value)
-	})
-
-	return st
-}
-
-func (st *serverTester) Close() {
-	if st.conn != nil {
-		st.conn.Close()
-	}
-	if st.cmd != nil {
-		done := make(chan struct{})
-		go func() {
-			st.cmd.Wait()
-			close(done)
-		}()
-
-		st.cmd.Process.Signal(syscall.SIGQUIT)
-
-		select {
-		case <-done:
-		case <-time.After(10 * time.Second):
-			st.cmd.Process.Kill()
-			<-done
-		}
-	}
-	if st.ts != nil {
-		st.ts.Close()
-	}
-}
-
-func (st *serverTester) readFrame() (http2.Frame, error) {
-	go func() {
-		f, err := st.fr.ReadFrame()
-		if err != nil {
-			st.errCh <- err
-			return
-		}
-		st.frCh <- f
-	}()
-
-	select {
-	case f := <-st.frCh:
-		return f, nil
-	case err := <-st.errCh:
-		return nil, err
-	case <-time.After(5 * time.Second):
-		return nil, errors.New("timeout waiting for frame")
-	}
-}
-
-type requestParam struct {
-	name        string              // name for this request to identify the request in log easily
-	streamID    uint32              // stream ID, automatically assigned if 0
-	method      string              // method, defaults to GET
-	scheme      string              // scheme, defaults to http
-	authority   string              // authority, defaults to backend server address
-	path        string              // path, defaults to /
-	header      []hpack.HeaderField // additional request header fields
-	body        []byte              // request body
-	trailer     []hpack.HeaderField // trailer part
-	httpUpgrade bool                // true if upgraded to HTTP/2 through HTTP Upgrade
-	noEndStream bool                // true if END_STREAM should not be sent
-}
-
-// wrapper for request body to set trailer part
-type chunkedBodyReader struct {
-	trailer        []hpack.HeaderField
-	trailerWritten bool
-	body           io.Reader
-	req            *http.Request
-}
-
-func (cbr *chunkedBodyReader) Read(p []byte) (n int, err error) {
-	// document says that we have to set http.Request.Trailer
-	// after request was sent and before body returns EOF.
-	if !cbr.trailerWritten {
-		cbr.trailerWritten = true
-		for _, h := range cbr.trailer {
-			cbr.req.Trailer.Set(h.Name, h.Value)
-		}
-	}
-	return cbr.body.Read(p)
-}
-
-func (st *serverTester) websocket(rp requestParam) (*serverResponse, error) {
-	urlstring := st.url + "/echo"
-
-	config, err := websocket.NewConfig(urlstring, st.url)
-	if err != nil {
-		st.t.Fatalf("websocket.NewConfig(%q, %q) returned error: %v", urlstring, st.url, err)
-	}
-
-	config.Header.Add("Test-Case", rp.name)
-	for _, h := range rp.header {
-		config.Header.Add(h.Name, h.Value)
-	}
-
-	ws, err := websocket.NewClient(config, st.conn)
-	if err != nil {
-		st.t.Fatalf("Error creating websocket client: %v", err)
-	}
-
-	if _, err := ws.Write(rp.body); err != nil {
-		st.t.Fatalf("ws.Write() returned error: %v", err)
-	}
-
-	msg := make([]byte, 1024)
-	var n int
-	if n, err = ws.Read(msg); err != nil {
-		st.t.Fatalf("ws.Read() returned error: %v", err)
-	}
-
-	res := &serverResponse{
-		body: msg[:n],
-	}
-
-	return res, nil
-}
-
-func (st *serverTester) http1(rp requestParam) (*serverResponse, error) {
-	method := "GET"
-	if rp.method != "" {
-		method = rp.method
-	}
-
-	var body io.Reader
-	var cbr *chunkedBodyReader
-	if rp.body != nil {
-		body = bytes.NewBuffer(rp.body)
-		if len(rp.trailer) != 0 {
-			cbr = &chunkedBodyReader{
-				trailer: rp.trailer,
-				body:    body,
-			}
-			body = cbr
-		}
-	}
-
-	reqURL := st.url
-
-	if rp.path != "" {
-		u, err := url.Parse(st.url)
-		if err != nil {
-			st.t.Fatalf("Error parsing URL from st.url %v: %v", st.url, err)
-		}
-		u.Path = ""
-		u.RawQuery = ""
-		reqURL = u.String() + rp.path
-	}
-
-	req, err := http.NewRequest(method, reqURL, body)
-	if err != nil {
-		return nil, err
-	}
-	for _, h := range rp.header {
-		req.Header.Add(h.Name, h.Value)
-	}
-	req.Header.Add("Test-Case", rp.name)
-	if cbr != nil {
-		cbr.req = req
-		// this makes request use chunked encoding
-		req.ContentLength = -1
-		req.Trailer = make(http.Header)
-		for _, h := range cbr.trailer {
-			req.Trailer.Set(h.Name, "")
-		}
-	}
-	if err := req.Write(st.conn); err != nil {
-		return nil, err
-	}
-	resp, err := http.ReadResponse(bufio.NewReader(st.conn), req)
-	if err != nil {
-		return nil, err
-	}
-	respBody, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	resp.Body.Close()
-
-	res := &serverResponse{
-		status:    resp.StatusCode,
-		header:    resp.Header,
-		body:      respBody,
-		connClose: resp.Close,
-	}
-
-	return res, nil
-}
-
-func (st *serverTester) http2(rp requestParam) (*serverResponse, error) {
-	st.headerBlkBuf.Reset()
-	st.header = make(http.Header)
-
-	var id uint32
-	if rp.streamID != 0 {
-		id = rp.streamID
-		if id >= st.nextStreamID && id%2 == 1 {
-			st.nextStreamID = id + 2
-		}
-	} else {
-		id = st.nextStreamID
-		st.nextStreamID += 2
-	}
-
-	if !st.h2PrefaceSent {
-		st.h2PrefaceSent = true
-		fmt.Fprint(st.conn, "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n")
-		if err := st.fr.WriteSettings(); err != nil {
-			return nil, err
-		}
-	}
-
-	res := &serverResponse{
-		streamID: id,
-	}
-
-	streams := make(map[uint32]*serverResponse)
-	streams[id] = res
-
-	if !rp.httpUpgrade {
-		method := "GET"
-		if rp.method != "" {
-			method = rp.method
-		}
-		_ = st.enc.WriteField(pair(":method", method))
-
-		scheme := "http"
-		if rp.scheme != "" {
-			scheme = rp.scheme
-		}
-		_ = st.enc.WriteField(pair(":scheme", scheme))
-
-		authority := st.authority
-		if rp.authority != "" {
-			authority = rp.authority
-		}
-		_ = st.enc.WriteField(pair(":authority", authority))
-
-		path := "/"
-		if rp.path != "" {
-			path = rp.path
-		}
-		_ = st.enc.WriteField(pair(":path", path))
-
-		_ = st.enc.WriteField(pair("test-case", rp.name))
-
-		for _, h := range rp.header {
-			_ = st.enc.WriteField(h)
-		}
-
-		err := st.fr.WriteHeaders(http2.HeadersFrameParam{
-			StreamID:      id,
-			EndStream:     len(rp.body) == 0 && len(rp.trailer) == 0 && !rp.noEndStream,
-			EndHeaders:    true,
-			BlockFragment: st.headerBlkBuf.Bytes(),
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rp.body) != 0 {
-			// TODO we assume rp.body fits in 1 frame
-			if err := st.fr.WriteData(id, len(rp.trailer) == 0 && !rp.noEndStream, rp.body); err != nil {
-				return nil, err
-			}
-		}
-
-		if len(rp.trailer) != 0 {
-			st.headerBlkBuf.Reset()
-			for _, h := range rp.trailer {
-				_ = st.enc.WriteField(h)
-			}
-			err := st.fr.WriteHeaders(http2.HeadersFrameParam{
-				StreamID:      id,
-				EndStream:     true,
-				EndHeaders:    true,
-				BlockFragment: st.headerBlkBuf.Bytes(),
-			})
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-loop:
-	for {
-		fr, err := st.readFrame()
-		if err != nil {
-			return res, err
-		}
-		switch f := fr.(type) {
-		case *http2.HeadersFrame:
-			_, err := st.dec.Write(f.HeaderBlockFragment())
-			if err != nil {
-				return res, err
-			}
-			sr, ok := streams[f.FrameHeader.StreamID]
-			if !ok {
-				st.header = make(http.Header)
-				break
-			}
-			sr.header = cloneHeader(st.header)
-			var status int
-			status, err = strconv.Atoi(sr.header.Get(":status"))
-			if err != nil {
-				return res, fmt.Errorf("Error parsing status code: %v", err)
-			}
-			sr.status = status
-			if f.StreamEnded() {
-				if streamEnded(res, streams, sr) {
-					break loop
-				}
-			}
-		case *http2.PushPromiseFrame:
-			_, err := st.dec.Write(f.HeaderBlockFragment())
-			if err != nil {
-				return res, err
-			}
-			sr := &serverResponse{
-				streamID:  f.PromiseID,
-				reqHeader: cloneHeader(st.header),
-			}
-			streams[sr.streamID] = sr
-		case *http2.DataFrame:
-			sr, ok := streams[f.FrameHeader.StreamID]
-			if !ok {
-				break
-			}
-			sr.body = append(sr.body, f.Data()...)
-			if f.StreamEnded() {
-				if streamEnded(res, streams, sr) {
-					break loop
-				}
-			}
-		case *http2.RSTStreamFrame:
-			sr, ok := streams[f.FrameHeader.StreamID]
-			if !ok {
-				break
-			}
-			sr.errCode = f.ErrCode
-			if streamEnded(res, streams, sr) {
-				break loop
-			}
-		case *http2.GoAwayFrame:
-			if f.ErrCode == http2.ErrCodeNo {
-				break
-			}
-			res.errCode = f.ErrCode
-			res.connErr = true
-			break loop
-		case *http2.SettingsFrame:
-			if f.IsAck() {
-				break
-			}
-			if err := st.fr.WriteSettingsAck(); err != nil {
-				return res, err
-			}
-		}
-	}
-	sort.Sort(ByStreamID(res.pushResponse))
-	return res, nil
-}
-
-func streamEnded(mainSr *serverResponse, streams map[uint32]*serverResponse, sr *serverResponse) bool {
-	delete(streams, sr.streamID)
-	if mainSr.streamID != sr.streamID {
-		mainSr.pushResponse = append(mainSr.pushResponse, sr)
-	}
-	return len(streams) == 0
-}
-
-type serverResponse struct {
-	status            int                  // HTTP status code
-	header            http.Header          // response header fields
-	body              []byte               // response body
-	streamID          uint32               // stream ID in HTTP/2
-	errCode           http2.ErrCode        // error code received in HTTP/2 RST_STREAM or GOAWAY
-	connErr           bool                 // true if HTTP/2 connection error
-	connClose         bool                 // Connection: close is included in response header in HTTP/1 test
-	reqHeader         http.Header          // http request header, currently only sotres pushed request header
-	pushResponse      []*serverResponse    // pushed response
-}
-
-type ByStreamID []*serverResponse
-
-func (b ByStreamID) Len() int {
-	return len(b)
-}
-
-func (b ByStreamID) Swap(i, j int) {
-	b[i], b[j] = b[j], b[i]
-}
-
-func (b ByStreamID) Less(i, j int) bool {
-	return b[i].streamID < b[j].streamID
-}
-
-func cloneHeader(h http.Header) http.Header {
-	h2 := make(http.Header, len(h))
-	for k, vv := range h {
-		vv2 := make([]string, len(vv))
-		copy(vv2, vv)
-		h2[k] = vv2
-	}
-	return h2
-}
-
-func noopHandler(w http.ResponseWriter, r *http.Request) {}
-
-type APIResponse struct {
-	Status string                 `json:"status,omitempty"`
-	Code   int                    `json:"code,omitempty"`
-	Data   map[string]interface{} `json:"data,omitempty"`
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/setenv.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/setenv.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/integration-tests/setenv.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/integration-tests/setenv.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-libdir="@abs_top_builddir@/lib"
-if [ -d "$libdir/.libs" ]; then
-    libdir="$libdir/.libs"
-fi
-
-export CGO_CFLAGS="-I@abs_top_srcdir@/lib/includes -I@abs_top_builddir@/lib/includes"
-export CGO_LDFLAGS="-L$libdir"
-export LD_LIBRARY_PATH="$libdir"
-export GODEBUG=cgocheck=0
-"$@"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-add_subdirectory(includes)
-
-include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}/includes"
-  "${CMAKE_CURRENT_BINARY_DIR}/includes"
-)
-
-add_definitions(-DBUILDING_NGHTTP2)
-
-set(NGHTTP2_SOURCES
-  nghttp2_pq.c nghttp2_map.c nghttp2_queue.c
-  nghttp2_frame.c
-  nghttp2_buf.c
-  nghttp2_stream.c nghttp2_outbound_item.c
-  nghttp2_session.c nghttp2_submit.c
-  nghttp2_helper.c
-  nghttp2_npn.c
-  nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c
-  nghttp2_version.c
-  nghttp2_priority_spec.c
-  nghttp2_option.c
-  nghttp2_callbacks.c
-  nghttp2_mem.c
-  nghttp2_http.c
-  nghttp2_rcbuf.c
-  nghttp2_debug.c
-)
-
-set(NGHTTP2_RES "")
-
-if(WIN32)
-  configure_file(
-    version.rc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-    @ONLY)
-
-  set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-endif()
-
-# Public shared library
-add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
-set_target_properties(nghttp2 PROPERTIES
-  COMPILE_FLAGS "${WARNCFLAGS}"
-  VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
-  C_VISIBILITY_PRESET hidden
-)
-target_include_directories(nghttp2 INTERFACE
-    "${CMAKE_CURRENT_BINARY_DIR}/includes"
-    "${CMAKE_CURRENT_SOURCE_DIR}/includes"
-    )
-
-if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
-  # Static library (for unittests because of symbol visibility)
-  add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})
-  set_target_properties(nghttp2_static PROPERTIES
-    COMPILE_FLAGS "${WARNCFLAGS}"
-    VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
-    ARCHIVE_OUTPUT_NAME nghttp2
-  )
-  target_compile_definitions(nghttp2_static PUBLIC "-DNGHTTP2_STATICLIB")
-  if(ENABLE_STATIC_LIB)
-    install(TARGETS nghttp2_static
-      DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-  endif()
-endif()
-
-install(TARGETS nghttp2
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-install(FILES
-    nghttp2/nghttp2.h
-    "${CMAKE_CURRENT_BINARY_DIR}/nghttp2/nghttp2ver.h"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/nghttp2")
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-EXTRA_DIST = CMakeLists.txt
-
-nobase_include_HEADERS = nghttp2/nghttp2.h nghttp2/nghttp2ver.h
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,5452 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013, 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_H
-#define NGHTTP2_H
-
-/* Define WIN32 when build target is Win32 API (borrowed from
-   libcurl) */
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-#if defined(_MSC_VER) && (_MSC_VER < 1800)
-/* MSVC < 2013 does not have inttypes.h because it is not C99
-   compliant.  See compiler macros and version number in
-   https://sourceforge.net/p/predef/wiki/Compilers/ */
-#  include <stdint.h>
-#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
-#  include <inttypes.h>
-#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
-#include <sys/types.h>
-#include <stdarg.h>
-
-#include <nghttp2/nghttp2ver.h>
-
-#ifdef NGHTTP2_STATICLIB
-#  define NGHTTP2_EXTERN
-#elif defined(WIN32)
-#  ifdef BUILDING_NGHTTP2
-#    define NGHTTP2_EXTERN __declspec(dllexport)
-#  else /* !BUILDING_NGHTTP2 */
-#    define NGHTTP2_EXTERN __declspec(dllimport)
-#  endif /* !BUILDING_NGHTTP2 */
-#else    /* !defined(WIN32) */
-#  ifdef BUILDING_NGHTTP2
-#    define NGHTTP2_EXTERN __attribute__((visibility("default")))
-#  else /* !BUILDING_NGHTTP2 */
-#    define NGHTTP2_EXTERN
-#  endif /* !BUILDING_NGHTTP2 */
-#endif   /* !defined(WIN32) */
-
-/**
- * @macro
- *
- * The protocol version identification string of this library
- * supports.  This identifier is used if HTTP/2 is used over TLS.
- */
-#define NGHTTP2_PROTO_VERSION_ID "h2"
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_PROTO_VERSION_ID`.
- */
-#define NGHTTP2_PROTO_VERSION_ID_LEN 2
-
-/**
- * @macro
- *
- * The serialized form of ALPN protocol identifier this library
- * supports.  Notice that first byte is the length of following
- * protocol identifier.  This is the same wire format of `TLS ALPN
- * extension <https://tools.ietf.org/html/rfc7301>`_.  This is useful
- * to process incoming ALPN tokens in wire format.
- */
-#define NGHTTP2_PROTO_ALPN "\x2h2"
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_PROTO_ALPN`.
- */
-#define NGHTTP2_PROTO_ALPN_LEN (sizeof(NGHTTP2_PROTO_ALPN) - 1)
-
-/**
- * @macro
- *
- * The protocol version identification string of this library
- * supports.  This identifier is used if HTTP/2 is used over cleartext
- * TCP.
- */
-#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID "h2c"
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_CLEARTEXT_PROTO_VERSION_ID`.
- */
-#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN 3
-
-struct nghttp2_session;
-/**
- * @struct
- *
- * The primary structure to hold the resources needed for a HTTP/2
- * session.  The details of this structure are intentionally hidden
- * from the public API.
- */
-typedef struct nghttp2_session nghttp2_session;
-
-/**
- * @macro
- *
- * The age of :type:`nghttp2_info`
- */
-#define NGHTTP2_VERSION_AGE 1
-
-/**
- * @struct
- *
- * This struct is what `nghttp2_version()` returns.  It holds
- * information about the particular nghttp2 version.
- */
-typedef struct {
-  /**
-   * Age of this struct.  This instance of nghttp2 sets it to
-   * :macro:`NGHTTP2_VERSION_AGE` but a future version may bump it and
-   * add more struct fields at the bottom
-   */
-  int age;
-  /**
-   * the :macro:`NGHTTP2_VERSION_NUM` number (since age ==1)
-   */
-  int version_num;
-  /**
-   * points to the :macro:`NGHTTP2_VERSION` string (since age ==1)
-   */
-  const char *version_str;
-  /**
-   * points to the :macro:`NGHTTP2_PROTO_VERSION_ID` string this
-   * instance implements (since age ==1)
-   */
-  const char *proto_str;
-  /* -------- the above fields all exist when age == 1 */
-} nghttp2_info;
-
-/**
- * @macro
- *
- * The default weight of stream dependency.
- */
-#define NGHTTP2_DEFAULT_WEIGHT 16
-
-/**
- * @macro
- *
- * The maximum weight of stream dependency.
- */
-#define NGHTTP2_MAX_WEIGHT 256
-
-/**
- * @macro
- *
- * The minimum weight of stream dependency.
- */
-#define NGHTTP2_MIN_WEIGHT 1
-
-/**
- * @macro
- *
- * The maximum window size
- */
-#define NGHTTP2_MAX_WINDOW_SIZE ((int32_t)((1U << 31) - 1))
-
-/**
- * @macro
- *
- * The initial window size for stream level flow control.
- */
-#define NGHTTP2_INITIAL_WINDOW_SIZE ((1 << 16) - 1)
-/**
- * @macro
- *
- * The initial window size for connection level flow control.
- */
-#define NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE ((1 << 16) - 1)
-
-/**
- * @macro
- *
- * The default header table size.
- */
-#define NGHTTP2_DEFAULT_HEADER_TABLE_SIZE (1 << 12)
-
-/**
- * @macro
- *
- * The client magic string, which is the first 24 bytes byte string of
- * client connection preface.
- */
-#define NGHTTP2_CLIENT_MAGIC "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_CLIENT_MAGIC`.
- */
-#define NGHTTP2_CLIENT_MAGIC_LEN 24
-
-/**
- * @enum
- *
- * Error codes used in this library.  The code range is [-999, -500],
- * inclusive. The following values are defined:
- */
-typedef enum {
-  /**
-   * Invalid argument passed.
-   */
-  NGHTTP2_ERR_INVALID_ARGUMENT = -501,
-  /**
-   * Out of buffer space.
-   */
-  NGHTTP2_ERR_BUFFER_ERROR = -502,
-  /**
-   * The specified protocol version is not supported.
-   */
-  NGHTTP2_ERR_UNSUPPORTED_VERSION = -503,
-  /**
-   * Used as a return value from :type:`nghttp2_send_callback`,
-   * :type:`nghttp2_recv_callback` and
-   * :type:`nghttp2_send_data_callback` to indicate that the operation
-   * would block.
-   */
-  NGHTTP2_ERR_WOULDBLOCK = -504,
-  /**
-   * General protocol error
-   */
-  NGHTTP2_ERR_PROTO = -505,
-  /**
-   * The frame is invalid.
-   */
-  NGHTTP2_ERR_INVALID_FRAME = -506,
-  /**
-   * The peer performed a shutdown on the connection.
-   */
-  NGHTTP2_ERR_EOF = -507,
-  /**
-   * Used as a return value from
-   * :func:`nghttp2_data_source_read_callback` to indicate that data
-   * transfer is postponed.  See
-   * :func:`nghttp2_data_source_read_callback` for details.
-   */
-  NGHTTP2_ERR_DEFERRED = -508,
-  /**
-   * Stream ID has reached the maximum value.  Therefore no stream ID
-   * is available.
-   */
-  NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE = -509,
-  /**
-   * The stream is already closed; or the stream ID is invalid.
-   */
-  NGHTTP2_ERR_STREAM_CLOSED = -510,
-  /**
-   * RST_STREAM has been added to the outbound queue.  The stream is
-   * in closing state.
-   */
-  NGHTTP2_ERR_STREAM_CLOSING = -511,
-  /**
-   * The transmission is not allowed for this stream (e.g., a frame
-   * with END_STREAM flag set has already sent).
-   */
-  NGHTTP2_ERR_STREAM_SHUT_WR = -512,
-  /**
-   * The stream ID is invalid.
-   */
-  NGHTTP2_ERR_INVALID_STREAM_ID = -513,
-  /**
-   * The state of the stream is not valid (e.g., DATA cannot be sent
-   * to the stream if response HEADERS has not been sent).
-   */
-  NGHTTP2_ERR_INVALID_STREAM_STATE = -514,
-  /**
-   * Another DATA frame has already been deferred.
-   */
-  NGHTTP2_ERR_DEFERRED_DATA_EXIST = -515,
-  /**
-   * Starting new stream is not allowed (e.g., GOAWAY has been sent
-   * and/or received).
-   */
-  NGHTTP2_ERR_START_STREAM_NOT_ALLOWED = -516,
-  /**
-   * GOAWAY has already been sent.
-   */
-  NGHTTP2_ERR_GOAWAY_ALREADY_SENT = -517,
-  /**
-   * The received frame contains the invalid header block (e.g., There
-   * are duplicate header names; or the header names are not encoded
-   * in US-ASCII character set and not lower cased; or the header name
-   * is zero-length string; or the header value contains multiple
-   * in-sequence NUL bytes).
-   */
-  NGHTTP2_ERR_INVALID_HEADER_BLOCK = -518,
-  /**
-   * Indicates that the context is not suitable to perform the
-   * requested operation.
-   */
-  NGHTTP2_ERR_INVALID_STATE = -519,
-  /**
-   * The user callback function failed due to the temporal error.
-   */
-  NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE = -521,
-  /**
-   * The length of the frame is invalid, either too large or too small.
-   */
-  NGHTTP2_ERR_FRAME_SIZE_ERROR = -522,
-  /**
-   * Header block inflate/deflate error.
-   */
-  NGHTTP2_ERR_HEADER_COMP = -523,
-  /**
-   * Flow control error
-   */
-  NGHTTP2_ERR_FLOW_CONTROL = -524,
-  /**
-   * Insufficient buffer size given to function.
-   */
-  NGHTTP2_ERR_INSUFF_BUFSIZE = -525,
-  /**
-   * Callback was paused by the application
-   */
-  NGHTTP2_ERR_PAUSE = -526,
-  /**
-   * There are too many in-flight SETTING frame and no more
-   * transmission of SETTINGS is allowed.
-   */
-  NGHTTP2_ERR_TOO_MANY_INFLIGHT_SETTINGS = -527,
-  /**
-   * The server push is disabled.
-   */
-  NGHTTP2_ERR_PUSH_DISABLED = -528,
-  /**
-   * DATA or HEADERS frame for a given stream has been already
-   * submitted and has not been fully processed yet.  Application
-   * should wait for the transmission of the previously submitted
-   * frame before submitting another.
-   */
-  NGHTTP2_ERR_DATA_EXIST = -529,
-  /**
-   * The current session is closing due to a connection error or
-   * `nghttp2_session_terminate_session()` is called.
-   */
-  NGHTTP2_ERR_SESSION_CLOSING = -530,
-  /**
-   * Invalid HTTP header field was received and stream is going to be
-   * closed.
-   */
-  NGHTTP2_ERR_HTTP_HEADER = -531,
-  /**
-   * Violation in HTTP messaging rule.
-   */
-  NGHTTP2_ERR_HTTP_MESSAGING = -532,
-  /**
-   * Stream was refused.
-   */
-  NGHTTP2_ERR_REFUSED_STREAM = -533,
-  /**
-   * Unexpected internal error, but recovered.
-   */
-  NGHTTP2_ERR_INTERNAL = -534,
-  /**
-   * Indicates that a processing was canceled.
-   */
-  NGHTTP2_ERR_CANCEL = -535,
-  /**
-   * When a local endpoint expects to receive SETTINGS frame, it
-   * receives an other type of frame.
-   */
-  NGHTTP2_ERR_SETTINGS_EXPECTED = -536,
-  /**
-   * The errors < :enum:`NGHTTP2_ERR_FATAL` mean that the library is
-   * under unexpected condition and processing was terminated (e.g.,
-   * out of memory).  If application receives this error code, it must
-   * stop using that :type:`nghttp2_session` object and only allowed
-   * operation for that object is deallocate it using
-   * `nghttp2_session_del()`.
-   */
-  NGHTTP2_ERR_FATAL = -900,
-  /**
-   * Out of memory.  This is a fatal error.
-   */
-  NGHTTP2_ERR_NOMEM = -901,
-  /**
-   * The user callback function failed.  This is a fatal error.
-   */
-  NGHTTP2_ERR_CALLBACK_FAILURE = -902,
-  /**
-   * Invalid client magic (see :macro:`NGHTTP2_CLIENT_MAGIC`) was
-   * received and further processing is not possible.
-   */
-  NGHTTP2_ERR_BAD_CLIENT_MAGIC = -903,
-  /**
-   * Possible flooding by peer was detected in this HTTP/2 session.
-   * Flooding is measured by how many PING and SETTINGS frames with
-   * ACK flag set are queued for transmission.  These frames are
-   * response for the peer initiated frames, and peer can cause memory
-   * exhaustion on server side to send these frames forever and does
-   * not read network.
-   */
-  NGHTTP2_ERR_FLOODED = -904
-} nghttp2_error;
-
-/**
- * @struct
- *
- * The object representing single contiguous buffer.
- */
-typedef struct {
-  /**
-   * The pointer to the buffer.
-   */
-  uint8_t *base;
-  /**
-   * The length of the buffer.
-   */
-  size_t len;
-} nghttp2_vec;
-
-struct nghttp2_rcbuf;
-
-/**
- * @struct
- *
- * The object representing reference counted buffer.  The details of
- * this structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_rcbuf nghttp2_rcbuf;
-
-/**
- * @function
- *
- * Increments the reference count of |rcbuf| by 1.
- */
-NGHTTP2_EXTERN void nghttp2_rcbuf_incref(nghttp2_rcbuf *rcbuf);
-
-/**
- * @function
- *
- * Decrements the reference count of |rcbuf| by 1.  If the reference
- * count becomes zero, the object pointed by |rcbuf| will be freed.
- * In this case, application must not use |rcbuf| again.
- */
-NGHTTP2_EXTERN void nghttp2_rcbuf_decref(nghttp2_rcbuf *rcbuf);
-
-/**
- * @function
- *
- * Returns the underlying buffer managed by |rcbuf|.
- */
-NGHTTP2_EXTERN nghttp2_vec nghttp2_rcbuf_get_buf(nghttp2_rcbuf *rcbuf);
-
-/**
- * @function
- *
- * Returns nonzero if the underlying buffer is statically allocated,
- * and 0 otherwise. This can be useful for language bindings that wish
- * to avoid creating duplicate strings for these buffers.
- */
-NGHTTP2_EXTERN int nghttp2_rcbuf_is_static(const nghttp2_rcbuf *rcbuf);
-
-/**
- * @enum
- *
- * The flags for header field name/value pair.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_NV_FLAG_NONE = 0,
-  /**
-   * Indicates that this name/value pair must not be indexed ("Literal
-   * Header Field never Indexed" representation must be used in HPACK
-   * encoding).  Other implementation calls this bit as "sensitive".
-   */
-  NGHTTP2_NV_FLAG_NO_INDEX = 0x01,
-  /**
-   * This flag is set solely by application.  If this flag is set, the
-   * library does not make a copy of header field name.  This could
-   * improve performance.
-   */
-  NGHTTP2_NV_FLAG_NO_COPY_NAME = 0x02,
-  /**
-   * This flag is set solely by application.  If this flag is set, the
-   * library does not make a copy of header field value.  This could
-   * improve performance.
-   */
-  NGHTTP2_NV_FLAG_NO_COPY_VALUE = 0x04
-} nghttp2_nv_flag;
-
-/**
- * @struct
- *
- * The name/value pair, which mainly used to represent header fields.
- */
-typedef struct {
-  /**
-   * The |name| byte string.  If this struct is presented from library
-   * (e.g., :type:`nghttp2_on_frame_recv_callback`), |name| is
-   * guaranteed to be NULL-terminated.  For some callbacks
-   * (:type:`nghttp2_before_frame_send_callback`,
-   * :type:`nghttp2_on_frame_send_callback`, and
-   * :type:`nghttp2_on_frame_not_send_callback`), it may not be
-   * NULL-terminated if header field is passed from application with
-   * the flag :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME`).  When application
-   * is constructing this struct, |name| is not required to be
-   * NULL-terminated.
-   */
-  uint8_t *name;
-  /**
-   * The |value| byte string.  If this struct is presented from
-   * library (e.g., :type:`nghttp2_on_frame_recv_callback`), |value|
-   * is guaranteed to be NULL-terminated.  For some callbacks
-   * (:type:`nghttp2_before_frame_send_callback`,
-   * :type:`nghttp2_on_frame_send_callback`, and
-   * :type:`nghttp2_on_frame_not_send_callback`), it may not be
-   * NULL-terminated if header field is passed from application with
-   * the flag :enum:`NGHTTP2_NV_FLAG_NO_COPY_VALUE`).  When
-   * application is constructing this struct, |value| is not required
-   * to be NULL-terminated.
-   */
-  uint8_t *value;
-  /**
-   * The length of the |name|, excluding terminating NULL.
-   */
-  size_t namelen;
-  /**
-   * The length of the |value|, excluding terminating NULL.
-   */
-  size_t valuelen;
-  /**
-   * Bitwise OR of one or more of :type:`nghttp2_nv_flag`.
-   */
-  uint8_t flags;
-} nghttp2_nv;
-
-/**
- * @enum
- *
- * The frame types in HTTP/2 specification.
- */
-typedef enum {
-  /**
-   * The DATA frame.
-   */
-  NGHTTP2_DATA = 0,
-  /**
-   * The HEADERS frame.
-   */
-  NGHTTP2_HEADERS = 0x01,
-  /**
-   * The PRIORITY frame.
-   */
-  NGHTTP2_PRIORITY = 0x02,
-  /**
-   * The RST_STREAM frame.
-   */
-  NGHTTP2_RST_STREAM = 0x03,
-  /**
-   * The SETTINGS frame.
-   */
-  NGHTTP2_SETTINGS = 0x04,
-  /**
-   * The PUSH_PROMISE frame.
-   */
-  NGHTTP2_PUSH_PROMISE = 0x05,
-  /**
-   * The PING frame.
-   */
-  NGHTTP2_PING = 0x06,
-  /**
-   * The GOAWAY frame.
-   */
-  NGHTTP2_GOAWAY = 0x07,
-  /**
-   * The WINDOW_UPDATE frame.
-   */
-  NGHTTP2_WINDOW_UPDATE = 0x08,
-  /**
-   * The CONTINUATION frame.  This frame type won't be passed to any
-   * callbacks because the library processes this frame type and its
-   * preceding HEADERS/PUSH_PROMISE as a single frame.
-   */
-  NGHTTP2_CONTINUATION = 0x09,
-  /**
-   * The ALTSVC frame, which is defined in `RFC 7383
-   * <https://tools.ietf.org/html/rfc7838#section-4>`_.
-   */
-  NGHTTP2_ALTSVC = 0x0a,
-  /**
-   * The ORIGIN frame, which is defined by `RFC 8336
-   * <https://tools.ietf.org/html/rfc8336>`_.
-   */
-  NGHTTP2_ORIGIN = 0x0c
-} nghttp2_frame_type;
-
-/**
- * @enum
- *
- * The flags for HTTP/2 frames.  This enum defines all flags for all
- * frames.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_FLAG_NONE = 0,
-  /**
-   * The END_STREAM flag.
-   */
-  NGHTTP2_FLAG_END_STREAM = 0x01,
-  /**
-   * The END_HEADERS flag.
-   */
-  NGHTTP2_FLAG_END_HEADERS = 0x04,
-  /**
-   * The ACK flag.
-   */
-  NGHTTP2_FLAG_ACK = 0x01,
-  /**
-   * The PADDED flag.
-   */
-  NGHTTP2_FLAG_PADDED = 0x08,
-  /**
-   * The PRIORITY flag.
-   */
-  NGHTTP2_FLAG_PRIORITY = 0x20
-} nghttp2_flag;
-
-/**
- * @enum
- * The SETTINGS ID.
- */
-typedef enum {
-  /**
-   * SETTINGS_HEADER_TABLE_SIZE
-   */
-  NGHTTP2_SETTINGS_HEADER_TABLE_SIZE = 0x01,
-  /**
-   * SETTINGS_ENABLE_PUSH
-   */
-  NGHTTP2_SETTINGS_ENABLE_PUSH = 0x02,
-  /**
-   * SETTINGS_MAX_CONCURRENT_STREAMS
-   */
-  NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 0x03,
-  /**
-   * SETTINGS_INITIAL_WINDOW_SIZE
-   */
-  NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 0x04,
-  /**
-   * SETTINGS_MAX_FRAME_SIZE
-   */
-  NGHTTP2_SETTINGS_MAX_FRAME_SIZE = 0x05,
-  /**
-   * SETTINGS_MAX_HEADER_LIST_SIZE
-   */
-  NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 0x06
-} nghttp2_settings_id;
-/* Note: If we add SETTINGS, update the capacity of
-   NGHTTP2_INBOUND_NUM_IV as well */
-
-/**
- * @macro
- *
- * .. warning::
- *
- *   Deprecated.  The initial max concurrent streams is 0xffffffffu.
- *
- * Default maximum number of incoming concurrent streams.  Use
- * `nghttp2_submit_settings()` with
- * :enum:`NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS` to change the
- * maximum number of incoming concurrent streams.
- *
- * .. note::
- *
- *   The maximum number of outgoing concurrent streams is 100 by
- *   default.
- */
-#define NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)
-
-/**
- * @enum
- * The status codes for the RST_STREAM and GOAWAY frames.
- */
-typedef enum {
-  /**
-   * No errors.
-   */
-  NGHTTP2_NO_ERROR = 0x00,
-  /**
-   * PROTOCOL_ERROR
-   */
-  NGHTTP2_PROTOCOL_ERROR = 0x01,
-  /**
-   * INTERNAL_ERROR
-   */
-  NGHTTP2_INTERNAL_ERROR = 0x02,
-  /**
-   * FLOW_CONTROL_ERROR
-   */
-  NGHTTP2_FLOW_CONTROL_ERROR = 0x03,
-  /**
-   * SETTINGS_TIMEOUT
-   */
-  NGHTTP2_SETTINGS_TIMEOUT = 0x04,
-  /**
-   * STREAM_CLOSED
-   */
-  NGHTTP2_STREAM_CLOSED = 0x05,
-  /**
-   * FRAME_SIZE_ERROR
-   */
-  NGHTTP2_FRAME_SIZE_ERROR = 0x06,
-  /**
-   * REFUSED_STREAM
-   */
-  NGHTTP2_REFUSED_STREAM = 0x07,
-  /**
-   * CANCEL
-   */
-  NGHTTP2_CANCEL = 0x08,
-  /**
-   * COMPRESSION_ERROR
-   */
-  NGHTTP2_COMPRESSION_ERROR = 0x09,
-  /**
-   * CONNECT_ERROR
-   */
-  NGHTTP2_CONNECT_ERROR = 0x0a,
-  /**
-   * ENHANCE_YOUR_CALM
-   */
-  NGHTTP2_ENHANCE_YOUR_CALM = 0x0b,
-  /**
-   * INADEQUATE_SECURITY
-   */
-  NGHTTP2_INADEQUATE_SECURITY = 0x0c,
-  /**
-   * HTTP_1_1_REQUIRED
-   */
-  NGHTTP2_HTTP_1_1_REQUIRED = 0x0d
-} nghttp2_error_code;
-
-/**
- * @struct
- * The frame header.
- */
-typedef struct {
-  /**
-   * The length field of this frame, excluding frame header.
-   */
-  size_t length;
-  /**
-   * The stream identifier (aka, stream ID)
-   */
-  int32_t stream_id;
-  /**
-   * The type of this frame.  See `nghttp2_frame_type`.
-   */
-  uint8_t type;
-  /**
-   * The flags.
-   */
-  uint8_t flags;
-  /**
-   * Reserved bit in frame header.  Currently, this is always set to 0
-   * and application should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_frame_hd;
-
-/**
- * @union
- *
- * This union represents the some kind of data source passed to
- * :type:`nghttp2_data_source_read_callback`.
- */
-typedef union {
-  /**
-   * The integer field, suitable for a file descriptor.
-   */
-  int fd;
-  /**
-   * The pointer to an arbitrary object.
-   */
-  void *ptr;
-} nghttp2_data_source;
-
-/**
- * @enum
- *
- * The flags used to set in |data_flags| output parameter in
- * :type:`nghttp2_data_source_read_callback`.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_DATA_FLAG_NONE = 0,
-  /**
-   * Indicates EOF was sensed.
-   */
-  NGHTTP2_DATA_FLAG_EOF = 0x01,
-  /**
-   * Indicates that END_STREAM flag must not be set even if
-   * NGHTTP2_DATA_FLAG_EOF is set.  Usually this flag is used to send
-   * trailer fields with `nghttp2_submit_request()` or
-   * `nghttp2_submit_response()`.
-   */
-  NGHTTP2_DATA_FLAG_NO_END_STREAM = 0x02,
-  /**
-   * Indicates that application will send complete DATA frame in
-   * :type:`nghttp2_send_data_callback`.
-   */
-  NGHTTP2_DATA_FLAG_NO_COPY = 0x04
-} nghttp2_data_flag;
-
-/**
- * @functypedef
- *
- * Callback function invoked when the library wants to read data from
- * the |source|.  The read data is sent in the stream |stream_id|.
- * The implementation of this function must read at most |length|
- * bytes of data from |source| (or possibly other places) and store
- * them in |buf| and return number of data stored in |buf|.  If EOF is
- * reached, set :enum:`NGHTTP2_DATA_FLAG_EOF` flag in |*data_flags|.
- *
- * Sometime it is desirable to avoid copying data into |buf| and let
- * application to send data directly.  To achieve this, set
- * :enum:`NGHTTP2_DATA_FLAG_NO_COPY` to |*data_flags| (and possibly
- * other flags, just like when we do copy), and return the number of
- * bytes to send without copying data into |buf|.  The library, seeing
- * :enum:`NGHTTP2_DATA_FLAG_NO_COPY`, will invoke
- * :type:`nghttp2_send_data_callback`.  The application must send
- * complete DATA frame in that callback.
- *
- * If this callback is set by `nghttp2_submit_request()`,
- * `nghttp2_submit_response()` or `nghttp2_submit_headers()` and
- * `nghttp2_submit_data()` with flag parameter
- * :enum:`NGHTTP2_FLAG_END_STREAM` set, and
- * :enum:`NGHTTP2_DATA_FLAG_EOF` flag is set to |*data_flags|, DATA
- * frame will have END_STREAM flag set.  Usually, this is expected
- * behaviour and all are fine.  One exception is send trailer fields.
- * You cannot send trailer fields after sending frame with END_STREAM
- * set.  To avoid this problem, one can set
- * :enum:`NGHTTP2_DATA_FLAG_NO_END_STREAM` along with
- * :enum:`NGHTTP2_DATA_FLAG_EOF` to signal the library not to set
- * END_STREAM in DATA frame.  Then application can use
- * `nghttp2_submit_trailer()` to send trailer fields.
- * `nghttp2_submit_trailer()` can be called inside this callback.
- *
- * If the application wants to postpone DATA frames (e.g.,
- * asynchronous I/O, or reading data blocks for long time), it is
- * achieved by returning :enum:`NGHTTP2_ERR_DEFERRED` without reading
- * any data in this invocation.  The library removes DATA frame from
- * the outgoing queue temporarily.  To move back deferred DATA frame
- * to outgoing queue, call `nghttp2_session_resume_data()`.
- *
- * By default, |length| is limited to 16KiB at maximum.  If peer
- * allows larger frames, application can enlarge transmission buffer
- * size.  See :type:`nghttp2_data_source_read_length_callback` for
- * more details.
- *
- * If the application just wants to return from
- * `nghttp2_session_send()` or `nghttp2_session_mem_send()` without
- * sending anything, return :enum:`NGHTTP2_ERR_PAUSE`.
- *
- * In case of error, there are 2 choices. Returning
- * :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will close the stream
- * by issuing RST_STREAM with :enum:`NGHTTP2_INTERNAL_ERROR`.  If a
- * different error code is desirable, use
- * `nghttp2_submit_rst_stream()` with a desired error code and then
- * return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  Returning
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` will signal the entire session
- * failure.
- */
-typedef ssize_t (*nghttp2_data_source_read_callback)(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data);
-
-/**
- * @struct
- *
- * This struct represents the data source and the way to read a chunk
- * of data from it.
- */
-typedef struct {
-  /**
-   * The data source.
-   */
-  nghttp2_data_source source;
-  /**
-   * The callback function to read a chunk of data from the |source|.
-   */
-  nghttp2_data_source_read_callback read_callback;
-} nghttp2_data_provider;
-
-/**
- * @struct
- *
- * The DATA frame.  The received data is delivered via
- * :type:`nghttp2_on_data_chunk_recv_callback`.
- */
-typedef struct {
-  nghttp2_frame_hd hd;
-  /**
-   * The length of the padding in this frame.  This includes PAD_HIGH
-   * and PAD_LOW.
-   */
-  size_t padlen;
-} nghttp2_data;
-
-/**
- * @enum
- *
- * The category of HEADERS, which indicates the role of the frame.  In
- * HTTP/2 spec, request, response, push response and other arbitrary
- * headers (e.g., trailer fields) are all called just HEADERS.  To
- * give the application the role of incoming HEADERS frame, we define
- * several categories.
- */
-typedef enum {
-  /**
-   * The HEADERS frame is opening new stream, which is analogous to
-   * SYN_STREAM in SPDY.
-   */
-  NGHTTP2_HCAT_REQUEST = 0,
-  /**
-   * The HEADERS frame is the first response headers, which is
-   * analogous to SYN_REPLY in SPDY.
-   */
-  NGHTTP2_HCAT_RESPONSE = 1,
-  /**
-   * The HEADERS frame is the first headers sent against reserved
-   * stream.
-   */
-  NGHTTP2_HCAT_PUSH_RESPONSE = 2,
-  /**
-   * The HEADERS frame which does not apply for the above categories,
-   * which is analogous to HEADERS in SPDY.  If non-final response
-   * (e.g., status 1xx) is used, final response HEADERS frame will be
-   * categorized here.
-   */
-  NGHTTP2_HCAT_HEADERS = 3
-} nghttp2_headers_category;
-
-/**
- * @struct
- *
- * The structure to specify stream dependency.
- */
-typedef struct {
-  /**
-   * The stream ID of the stream to depend on.  Specifying 0 makes
-   * stream not depend any other stream.
-   */
-  int32_t stream_id;
-  /**
-   * The weight of this dependency.
-   */
-  int32_t weight;
-  /**
-   * nonzero means exclusive dependency
-   */
-  uint8_t exclusive;
-} nghttp2_priority_spec;
-
-/**
- * @struct
- *
- * The HEADERS frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The length of the padding in this frame.  This includes PAD_HIGH
-   * and PAD_LOW.
-   */
-  size_t padlen;
-  /**
-   * The priority specification
-   */
-  nghttp2_priority_spec pri_spec;
-  /**
-   * The name/value pairs.
-   */
-  nghttp2_nv *nva;
-  /**
-   * The number of name/value pairs in |nva|.
-   */
-  size_t nvlen;
-  /**
-   * The category of this HEADERS frame.
-   */
-  nghttp2_headers_category cat;
-} nghttp2_headers;
-
-/**
- * @struct
- *
- * The PRIORITY frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The priority specification.
-   */
-  nghttp2_priority_spec pri_spec;
-} nghttp2_priority;
-
-/**
- * @struct
- *
- * The RST_STREAM frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The error code.  See :type:`nghttp2_error_code`.
-   */
-  uint32_t error_code;
-} nghttp2_rst_stream;
-
-/**
- * @struct
- *
- * The SETTINGS ID/Value pair.  It has the following members:
- */
-typedef struct {
-  /**
-   * The SETTINGS ID.  See :type:`nghttp2_settings_id`.
-   */
-  int32_t settings_id;
-  /**
-   * The value of this entry.
-   */
-  uint32_t value;
-} nghttp2_settings_entry;
-
-/**
- * @struct
- *
- * The SETTINGS frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The number of SETTINGS ID/Value pairs in |iv|.
-   */
-  size_t niv;
-  /**
-   * The pointer to the array of SETTINGS ID/Value pair.
-   */
-  nghttp2_settings_entry *iv;
-} nghttp2_settings;
-
-/**
- * @struct
- *
- * The PUSH_PROMISE frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The length of the padding in this frame.  This includes PAD_HIGH
-   * and PAD_LOW.
-   */
-  size_t padlen;
-  /**
-   * The name/value pairs.
-   */
-  nghttp2_nv *nva;
-  /**
-   * The number of name/value pairs in |nva|.
-   */
-  size_t nvlen;
-  /**
-   * The promised stream ID
-   */
-  int32_t promised_stream_id;
-  /**
-   * Reserved bit.  Currently this is always set to 0 and application
-   * should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_push_promise;
-
-/**
- * @struct
- *
- * The PING frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The opaque data
-   */
-  uint8_t opaque_data[8];
-} nghttp2_ping;
-
-/**
- * @struct
- *
- * The GOAWAY frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The last stream stream ID.
-   */
-  int32_t last_stream_id;
-  /**
-   * The error code.  See :type:`nghttp2_error_code`.
-   */
-  uint32_t error_code;
-  /**
-   * The additional debug data
-   */
-  uint8_t *opaque_data;
-  /**
-   * The length of |opaque_data| member.
-   */
-  size_t opaque_data_len;
-  /**
-   * Reserved bit.  Currently this is always set to 0 and application
-   * should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_goaway;
-
-/**
- * @struct
- *
- * The WINDOW_UPDATE frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The window size increment.
-   */
-  int32_t window_size_increment;
-  /**
-   * Reserved bit.  Currently this is always set to 0 and application
-   * should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_window_update;
-
-/**
- * @struct
- *
- * The extension frame.  It has following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The pointer to extension payload.  The exact pointer type is
-   * determined by hd.type.
-   *
-   * Currently, no extension is supported.  This is a place holder for
-   * the future extensions.
-   */
-  void *payload;
-} nghttp2_extension;
-
-/**
- * @union
- *
- * This union includes all frames to pass them to various function
- * calls as nghttp2_frame type.  The CONTINUATION frame is omitted
- * from here because the library deals with it internally.
- */
-typedef union {
-  /**
-   * The frame header, which is convenient to inspect frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The DATA frame.
-   */
-  nghttp2_data data;
-  /**
-   * The HEADERS frame.
-   */
-  nghttp2_headers headers;
-  /**
-   * The PRIORITY frame.
-   */
-  nghttp2_priority priority;
-  /**
-   * The RST_STREAM frame.
-   */
-  nghttp2_rst_stream rst_stream;
-  /**
-   * The SETTINGS frame.
-   */
-  nghttp2_settings settings;
-  /**
-   * The PUSH_PROMISE frame.
-   */
-  nghttp2_push_promise push_promise;
-  /**
-   * The PING frame.
-   */
-  nghttp2_ping ping;
-  /**
-   * The GOAWAY frame.
-   */
-  nghttp2_goaway goaway;
-  /**
-   * The WINDOW_UPDATE frame.
-   */
-  nghttp2_window_update window_update;
-  /**
-   * The extension frame.
-   */
-  nghttp2_extension ext;
-} nghttp2_frame;
-
-/**
- * @functypedef
- *
- * Callback function invoked when |session| wants to send data to the
- * remote peer.  The implementation of this function must send at most
- * |length| bytes of data stored in |data|.  The |flags| is currently
- * not used and always 0. It must return the number of bytes sent if
- * it succeeds.  If it cannot send any single byte without blocking,
- * it must return :enum:`NGHTTP2_ERR_WOULDBLOCK`.  For other errors,
- * it must return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * This callback is required if the application uses
- * `nghttp2_session_send()` to send data to the remote endpoint.  If
- * the application uses solely `nghttp2_session_mem_send()` instead,
- * this callback function is unnecessary.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_send_callback()`.
- *
- * .. note::
- *
- *   The |length| may be very small.  If that is the case, and
- *   application disables Nagle algorithm (``TCP_NODELAY``), then just
- *   writing |data| to the network stack leads to very small packet,
- *   and it is very inefficient.  An application should be responsible
- *   to buffer up small chunks of data as necessary to avoid this
- *   situation.
- */
-typedef ssize_t (*nghttp2_send_callback)(nghttp2_session *session,
-                                         const uint8_t *data, size_t length,
-                                         int flags, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when :enum:`NGHTTP2_DATA_FLAG_NO_COPY` is
- * used in :type:`nghttp2_data_source_read_callback` to send complete
- * DATA frame.
- *
- * The |frame| is a DATA frame to send.  The |framehd| is the
- * serialized frame header (9 bytes). The |length| is the length of
- * application data to send (this does not include padding).  The
- * |source| is the same pointer passed to
- * :type:`nghttp2_data_source_read_callback`.
- *
- * The application first must send frame header |framehd| of length 9
- * bytes.  If ``frame->data.padlen > 0``, send 1 byte of value
- * ``frame->data.padlen - 1``.  Then send exactly |length| bytes of
- * application data.  Finally, if ``frame->data.padlen > 1``, send
- * ``frame->data.padlen - 1`` bytes of zero as padding.
- *
- * The application has to send complete DATA frame in this callback.
- * If all data were written successfully, return 0.
- *
- * If it cannot send any data at all, just return
- * :enum:`NGHTTP2_ERR_WOULDBLOCK`; the library will call this callback
- * with the same parameters later (It is recommended to send complete
- * DATA frame at once in this function to deal with error; if partial
- * frame data has already sent, it is impossible to send another data
- * in that state, and all we can do is tear down connection).  When
- * data is fully processed, but application wants to make
- * `nghttp2_session_mem_send()` or `nghttp2_session_send()` return
- * immediately without processing next frames, return
- * :enum:`NGHTTP2_ERR_PAUSE`.  If application decided to reset this
- * stream, return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`, then
- * the library will send RST_STREAM with INTERNAL_ERROR as error code.
- * The application can also return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`, which will result in
- * connection closure.  Returning any other value is treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
- */
-typedef int (*nghttp2_send_data_callback)(nghttp2_session *session,
-                                          nghttp2_frame *frame,
-                                          const uint8_t *framehd, size_t length,
-                                          nghttp2_data_source *source,
-                                          void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when |session| wants to receive data from
- * the remote peer.  The implementation of this function must read at
- * most |length| bytes of data and store it in |buf|.  The |flags| is
- * currently not used and always 0.  It must return the number of
- * bytes written in |buf| if it succeeds.  If it cannot read any
- * single byte without blocking, it must return
- * :enum:`NGHTTP2_ERR_WOULDBLOCK`.  If it gets EOF before it reads any
- * single byte, it must return :enum:`NGHTTP2_ERR_EOF`.  For other
- * errors, it must return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- * Returning 0 is treated as :enum:`NGHTTP2_ERR_WOULDBLOCK`.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * This callback is required if the application uses
- * `nghttp2_session_recv()` to receive data from the remote endpoint.
- * If the application uses solely `nghttp2_session_mem_recv()`
- * instead, this callback function is unnecessary.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_recv_callback()`.
- */
-typedef ssize_t (*nghttp2_recv_callback)(nghttp2_session *session, uint8_t *buf,
-                                         size_t length, int flags,
-                                         void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when a frame is received.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
- * member of their data structure are always ``NULL`` and 0
- * respectively.  The header name/value pairs are emitted via
- * :type:`nghttp2_on_header_callback`.
- *
- * For HEADERS, PUSH_PROMISE and DATA frames, this callback may be
- * called after stream is closed (see
- * :type:`nghttp2_on_stream_close_callback`).  The application should
- * check that stream is still alive using its own stream management or
- * :func:`nghttp2_session_get_stream_user_data()`.
- *
- * Only HEADERS and DATA frame can signal the end of incoming data.
- * If ``frame->hd.flags & NGHTTP2_FLAG_END_STREAM`` is nonzero, the
- * |frame| is the last frame from the remote peer in this stream.
- *
- * This callback won't be called for CONTINUATION frames.
- * HEADERS/PUSH_PROMISE + CONTINUATIONs are treated as single frame.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero value is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_frame_recv_callback()`.
- */
-typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
-                                              const nghttp2_frame *frame,
-                                              void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
- * received.  The error is indicated by the |lib_error_code|, which is
- * one of the values defined in :type:`nghttp2_error`.  When this
- * callback function is invoked, the library automatically submits
- * either RST_STREAM or GOAWAY frame.  The |user_data| pointer is the
- * third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
- * member of their data structure are always ``NULL`` and 0
- * respectively.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`.
- */
-typedef int (*nghttp2_on_invalid_frame_recv_callback)(
-    nghttp2_session *session, const nghttp2_frame *frame, int lib_error_code,
-    void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a chunk of data in DATA frame is
- * received.  The |stream_id| is the stream ID this DATA frame belongs
- * to.  The |flags| is the flags of DATA frame which this data chunk
- * is contained.  ``(flags & NGHTTP2_FLAG_END_STREAM) != 0`` does not
- * necessarily mean this chunk of data is the last one in the stream.
- * You should use :type:`nghttp2_on_frame_recv_callback` to know all
- * data frames are received.  The |user_data| pointer is the third
- * argument passed in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * If the application uses `nghttp2_session_mem_recv()`, it can return
- * :enum:`NGHTTP2_ERR_PAUSE` to make `nghttp2_session_mem_recv()`
- * return without processing further input bytes.  The memory by
- * pointed by the |data| is retained until
- * `nghttp2_session_mem_recv()` or `nghttp2_session_recv()` is called.
- * The application must retain the input bytes which was used to
- * produce the |data| parameter, because it may refer to the memory
- * region included in the input bytes.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error, and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_data_chunk_recv_callback()`.
- */
-typedef int (*nghttp2_on_data_chunk_recv_callback)(nghttp2_session *session,
-                                                   uint8_t flags,
-                                                   int32_t stream_id,
-                                                   const uint8_t *data,
-                                                   size_t len, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked just before the non-DATA frame |frame| is
- * sent.  The |user_data| pointer is the third argument passed in to
- * the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * The implementation of this function must return 0 if it succeeds.
- * It can also return :enum:`NGHTTP2_ERR_CANCEL` to cancel the
- * transmission of the given frame.
- *
- * If there is a fatal error while executing this callback, the
- * implementation should return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`,
- * which makes `nghttp2_session_send()` and
- * `nghttp2_session_mem_send()` functions immediately return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * If the other value is returned, it is treated as if
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned.  But the
- * implementation should not rely on this since the library may define
- * new return value to extend its capability.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_before_frame_send_callback()`.
- */
-typedef int (*nghttp2_before_frame_send_callback)(nghttp2_session *session,
-                                                  const nghttp2_frame *frame,
-                                                  void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked after the frame |frame| is sent.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_frame_send_callback()`.
- */
-typedef int (*nghttp2_on_frame_send_callback)(nghttp2_session *session,
-                                              const nghttp2_frame *frame,
-                                              void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked after the non-DATA frame |frame| is not
- * sent because of the error.  The error is indicated by the
- * |lib_error_code|, which is one of the values defined in
- * :type:`nghttp2_error`.  The |user_data| pointer is the third
- * argument passed in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * `nghttp2_session_get_stream_user_data()` can be used to get
- * associated data.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_frame_not_send_callback()`.
- */
-typedef int (*nghttp2_on_frame_not_send_callback)(nghttp2_session *session,
-                                                  const nghttp2_frame *frame,
-                                                  int lib_error_code,
-                                                  void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the stream |stream_id| is closed.
- * The reason of closure is indicated by the |error_code|.  The
- * |error_code| is usually one of :enum:`nghttp2_error_code`, but that
- * is not guaranteed.  The stream_user_data, which was specified in
- * `nghttp2_submit_request()` or `nghttp2_submit_headers()`, is still
- * available in this function.  The |user_data| pointer is the third
- * argument passed in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * This function is also called for a stream in reserved state.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()`, `nghttp2_session_mem_recv()`,
- * `nghttp2_session_send()`, and `nghttp2_session_mem_send()`
- * functions immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_stream_close_callback()`.
- */
-typedef int (*nghttp2_on_stream_close_callback)(nghttp2_session *session,
-                                                int32_t stream_id,
-                                                uint32_t error_code,
-                                                void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the reception of header block in
- * HEADERS or PUSH_PROMISE is started.  Each header name/value pair
- * will be emitted by :type:`nghttp2_on_header_callback`.
- *
- * The ``frame->hd.flags`` may not have
- * :enum:`NGHTTP2_FLAG_END_HEADERS` flag set, which indicates that one
- * or more CONTINUATION frames are involved.  But the application does
- * not need to care about that because the header name/value pairs are
- * emitted transparently regardless of CONTINUATION frames.
- *
- * The server applications probably create an object to store
- * information about new stream if ``frame->hd.type ==
- * NGHTTP2_HEADERS`` and ``frame->headers.cat ==
- * NGHTTP2_HCAT_REQUEST``.  If |session| is configured as server side,
- * ``frame->headers.cat`` is either ``NGHTTP2_HCAT_REQUEST``
- * containing request headers or ``NGHTTP2_HCAT_HEADERS`` containing
- * trailer fields and never get PUSH_PROMISE in this callback.
- *
- * For the client applications, ``frame->hd.type`` is either
- * ``NGHTTP2_HEADERS`` or ``NGHTTP2_PUSH_PROMISE``.  In case of
- * ``NGHTTP2_HEADERS``, ``frame->headers.cat ==
- * NGHTTP2_HCAT_RESPONSE`` means that it is the first response
- * headers, but it may be non-final response which is indicated by 1xx
- * status code.  In this case, there may be zero or more HEADERS frame
- * with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS`` which has
- * non-final response code and finally client gets exactly one HEADERS
- * frame with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS``
- * containing final response headers (non-1xx status code).  The
- * trailer fields also has ``frame->headers.cat ==
- * NGHTTP2_HCAT_HEADERS`` which does not contain any status code.
- *
- * Returning :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will close
- * the stream (promised stream if frame is PUSH_PROMISE) by issuing
- * RST_STREAM with :enum:`NGHTTP2_INTERNAL_ERROR`.  In this case,
- * :type:`nghttp2_on_header_callback` and
- * :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
- * different error code is desirable, use
- * `nghttp2_submit_rst_stream()` with a desired error code and then
- * return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  Again, use
- * ``frame->push_promise.promised_stream_id`` as stream_id parameter
- * in `nghttp2_submit_rst_stream()` if frame is PUSH_PROMISE.
- *
- * The implementation of this function must return 0 if it succeeds.
- * It can return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` to
- * reset the stream (promised stream if frame is PUSH_PROMISE).  For
- * critical errors, it must return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other value is
- * returned, it is treated as if :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
- * is returned.  If :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
- * `nghttp2_session_mem_recv()` function will immediately return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_begin_headers_callback()`.
- */
-typedef int (*nghttp2_on_begin_headers_callback)(nghttp2_session *session,
-                                                 const nghttp2_frame *frame,
-                                                 void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a header name/value pair is received
- * for the |frame|.  The |name| of length |namelen| is header name.
- * The |value| of length |valuelen| is header value.  The |flags| is
- * bitwise OR of one or more of :type:`nghttp2_nv_flag`.
- *
- * If :enum:`NGHTTP2_NV_FLAG_NO_INDEX` is set in |flags|, the receiver
- * must not index this name/value pair when forwarding it to the next
- * hop.  More specifically, "Literal Header Field never Indexed"
- * representation must be used in HPACK encoding.
- *
- * When this callback is invoked, ``frame->hd.type`` is either
- * :enum:`NGHTTP2_HEADERS` or :enum:`NGHTTP2_PUSH_PROMISE`.  After all
- * header name/value pairs are processed with this callback, and no
- * error has been detected, :type:`nghttp2_on_frame_recv_callback`
- * will be invoked.  If there is an error in decompression,
- * :type:`nghttp2_on_frame_recv_callback` for the |frame| will not be
- * invoked.
- *
- * Both |name| and |value| are guaranteed to be NULL-terminated.  The
- * |namelen| and |valuelen| do not include terminal NULL.  If
- * `nghttp2_option_set_no_http_messaging()` is used with nonzero
- * value, NULL character may be included in |name| or |value| before
- * terminating NULL.
- *
- * Please note that unless `nghttp2_option_set_no_http_messaging()` is
- * used, nghttp2 library does perform validation against the |name|
- * and the |value| using `nghttp2_check_header_name()` and
- * `nghttp2_check_header_value()`.  In addition to this, nghttp2
- * performs validation based on HTTP Messaging rule, which is briefly
- * explained in :ref:`http-messaging` section.
- *
- * If the application uses `nghttp2_session_mem_recv()`, it can return
- * :enum:`NGHTTP2_ERR_PAUSE` to make `nghttp2_session_mem_recv()`
- * return without processing further input bytes.  The memory pointed
- * by |frame|, |name| and |value| parameters are retained until
- * `nghttp2_session_mem_recv()` or `nghttp2_session_recv()` is called.
- * The application must retain the input bytes which was used to
- * produce these parameters, because it may refer to the memory region
- * included in the input bytes.
- *
- * Returning :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will close
- * the stream (promised stream if frame is PUSH_PROMISE) by issuing
- * RST_STREAM with :enum:`NGHTTP2_INTERNAL_ERROR`.  In this case,
- * :type:`nghttp2_on_header_callback` and
- * :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
- * different error code is desirable, use
- * `nghttp2_submit_rst_stream()` with a desired error code and then
- * return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  Again, use
- * ``frame->push_promise.promised_stream_id`` as stream_id parameter
- * in `nghttp2_submit_rst_stream()` if frame is PUSH_PROMISE.
- *
- * The implementation of this function must return 0 if it succeeds.
- * It may return :enum:`NGHTTP2_ERR_PAUSE` or
- * :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  For other critical
- * failures, it must return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If
- * the other nonzero value is returned, it is treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_header_callback()`.
- *
- * .. warning::
- *
- *   Application should properly limit the total buffer size to store
- *   incoming header fields.  Without it, peer may send large number
- *   of header fields or large header fields to cause out of memory in
- *   local endpoint.  Due to how HPACK works, peer can do this
- *   effectively without using much memory on their own.
- */
-typedef int (*nghttp2_on_header_callback)(nghttp2_session *session,
-                                          const nghttp2_frame *frame,
-                                          const uint8_t *name, size_t namelen,
-                                          const uint8_t *value, size_t valuelen,
-                                          uint8_t flags, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a header name/value pair is received
- * for the |frame|.  The |name| is header name.  The |value| is header
- * value.  The |flags| is bitwise OR of one or more of
- * :type:`nghttp2_nv_flag`.
- *
- * This callback behaves like :type:`nghttp2_on_header_callback`,
- * except that |name| and |value| are stored in reference counted
- * buffer.  If application wishes to keep these references without
- * copying them, use `nghttp2_rcbuf_incref()` to increment their
- * reference count.  It is the application's responsibility to call
- * `nghttp2_rcbuf_decref()` if they called `nghttp2_rcbuf_incref()` so
- * as not to leak memory.  If the |session| is created by
- * `nghttp2_session_server_new3()` or `nghttp2_session_client_new3()`,
- * the function to free memory is the one belongs to the mem
- * parameter.  As long as this free function alives, |name| and
- * |value| can live after |session| was destroyed.
- */
-typedef int (*nghttp2_on_header_callback2)(nghttp2_session *session,
-                                           const nghttp2_frame *frame,
-                                           nghttp2_rcbuf *name,
-                                           nghttp2_rcbuf *value, uint8_t flags,
-                                           void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a invalid header name/value pair is
- * received for the |frame|.
- *
- * The parameter and behaviour are similar to
- * :type:`nghttp2_on_header_callback`.  The difference is that this
- * callback is only invoked when a invalid header name/value pair is
- * received which is treated as stream error if this callback is not
- * set.  Only invalid regular header field are passed to this
- * callback.  In other words, invalid pseudo header field is not
- * passed to this callback.  Also header fields which includes upper
- * cased latter are also treated as error without passing them to this
- * callback.
- *
- * This callback is only considered if HTTP messaging validation is
- * turned on (which is on by default, see
- * `nghttp2_option_set_no_http_messaging()`).
- *
- * With this callback, application inspects the incoming invalid
- * field, and it also can reset stream from this callback by returning
- * :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By default, the
- * error code is :enum:`NGHTTP2_PROTOCOL_ERROR`.  To change the error
- * code, call `nghttp2_submit_rst_stream()` with the error code of
- * choice in addition to returning
- * :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- *
- * If 0 is returned, the header field is ignored, and the stream is
- * not reset.
- */
-typedef int (*nghttp2_on_invalid_header_callback)(
-    nghttp2_session *session, const nghttp2_frame *frame, const uint8_t *name,
-    size_t namelen, const uint8_t *value, size_t valuelen, uint8_t flags,
-    void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a invalid header name/value pair is
- * received for the |frame|.
- *
- * The parameter and behaviour are similar to
- * :type:`nghttp2_on_header_callback2`.  The difference is that this
- * callback is only invoked when a invalid header name/value pair is
- * received which is silently ignored if this callback is not set.
- * Only invalid regular header field are passed to this callback.  In
- * other words, invalid pseudo header field is not passed to this
- * callback.  Also header fields which includes upper cased latter are
- * also treated as error without passing them to this callback.
- *
- * This callback is only considered if HTTP messaging validation is
- * turned on (which is on by default, see
- * `nghttp2_option_set_no_http_messaging()`).
- *
- * With this callback, application inspects the incoming invalid
- * field, and it also can reset stream from this callback by returning
- * :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By default, the
- * error code is :enum:`NGHTTP2_INTERNAL_ERROR`.  To change the error
- * code, call `nghttp2_submit_rst_stream()` with the error code of
- * choice in addition to returning
- * :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- */
-typedef int (*nghttp2_on_invalid_header_callback2)(
-    nghttp2_session *session, const nghttp2_frame *frame, nghttp2_rcbuf *name,
-    nghttp2_rcbuf *value, uint8_t flags, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the library asks application how
- * many padding bytes are required for the transmission of the
- * |frame|.  The application must choose the total length of payload
- * including padded bytes in range [frame->hd.length, max_payloadlen],
- * inclusive.  Choosing number not in this range will be treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  Returning
- * ``frame->hd.length`` means no padding is added.  Returning
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` will make
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_select_padding_callback()`.
- */
-typedef ssize_t (*nghttp2_select_padding_callback)(nghttp2_session *session,
-                                                   const nghttp2_frame *frame,
-                                                   size_t max_payloadlen,
-                                                   void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library wants to get max length of
- * data to send data to the remote peer.  The implementation of this
- * function should return a value in the following range.  [1,
- * min(|session_remote_window_size|, |stream_remote_window_size|,
- * |remote_max_frame_size|)].  If a value greater than this range is
- * returned than the max allow value will be used.  Returning a value
- * smaller than this range is treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  The |frame_type| is provided
- * for future extensibility and identifies the type of frame (see
- * :type:`nghttp2_frame_type`) for which to get the length for.
- * Currently supported frame types are: :enum:`NGHTTP2_DATA`.
- *
- * This callback can be used to control the length in bytes for which
- * :type:`nghttp2_data_source_read_callback` is allowed to send to the
- * remote endpoint.  This callback is optional.  Returning
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` will signal the entire session
- * failure.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_data_source_read_length_callback()`.
- */
-typedef ssize_t (*nghttp2_data_source_read_length_callback)(
-    nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
-    int32_t session_remote_window_size, int32_t stream_remote_window_size,
-    uint32_t remote_max_frame_size, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a frame header is received.  The
- * |hd| points to received frame header.
- *
- * Unlike :type:`nghttp2_on_frame_recv_callback`, this callback will
- * also be called when frame header of CONTINUATION frame is received.
- *
- * If both :type:`nghttp2_on_begin_frame_callback` and
- * :type:`nghttp2_on_begin_headers_callback` are set and HEADERS or
- * PUSH_PROMISE is received, :type:`nghttp2_on_begin_frame_callback`
- * will be called first.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero value is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_begin_frame_callback()`.
- */
-typedef int (*nghttp2_on_begin_frame_callback)(nghttp2_session *session,
-                                               const nghttp2_frame_hd *hd,
-                                               void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when chunk of extension frame payload is
- * received.  The |hd| points to frame header.  The received
- * chunk is |data| of length |len|.
- *
- * The implementation of this function must return 0 if it succeeds.
- *
- * To abort processing this extension frame, return
- * :enum:`NGHTTP2_ERR_CANCEL`.
- *
- * If fatal error occurred, application should return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If the
- * other values are returned, currently they are treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- */
-typedef int (*nghttp2_on_extension_chunk_recv_callback)(
-    nghttp2_session *session, const nghttp2_frame_hd *hd, const uint8_t *data,
-    size_t len, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library asks the application to
- * unpack extension payload from its wire format.  The extension
- * payload has been passed to the application using
- * :type:`nghttp2_on_extension_chunk_recv_callback`.  The frame header
- * is already unpacked by the library and provided as |hd|.
- *
- * To receive extension frames, the application must tell desired
- * extension frame type to the library using
- * `nghttp2_option_set_user_recv_extension_type()`.
- *
- * The implementation of this function may store the pointer to the
- * created object as a result of unpacking in |*payload|, and returns
- * 0.  The pointer stored in |*payload| is opaque to the library, and
- * the library does not own its pointer.  |*payload| is initialized as
- * ``NULL``.  The |*payload| is available as ``frame->ext.payload`` in
- * :type:`nghttp2_on_frame_recv_callback`.  Therefore if application
- * can free that memory inside :type:`nghttp2_on_frame_recv_callback`
- * callback.  Of course, application has a liberty not ot use
- * |*payload|, and do its own mechanism to process extension frames.
- *
- * To abort processing this extension frame, return
- * :enum:`NGHTTP2_ERR_CANCEL`.
- *
- * If fatal error occurred, application should return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If the
- * other values are returned, currently they are treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- */
-typedef int (*nghttp2_unpack_extension_callback)(nghttp2_session *session,
-                                                 void **payload,
-                                                 const nghttp2_frame_hd *hd,
-                                                 void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library asks the application to pack
- * extension payload in its wire format.  The frame header will be
- * packed by library.  Application must pack payload only.
- * ``frame->ext.payload`` is the object passed to
- * `nghttp2_submit_extension()` as payload parameter.  Application
- * must pack extension payload to the |buf| of its capacity |len|
- * bytes.  The |len| is at least 16KiB.
- *
- * The implementation of this function should return the number of
- * bytes written into |buf| when it succeeds.
- *
- * To abort processing this extension frame, return
- * :enum:`NGHTTP2_ERR_CANCEL`, and
- * :type:`nghttp2_on_frame_not_send_callback` will be invoked.
- *
- * If fatal error occurred, application should return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If the
- * other values are returned, currently they are treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If the return value is
- * strictly larger than |len|, it is treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
- */
-typedef ssize_t (*nghttp2_pack_extension_callback)(nghttp2_session *session,
-                                                   uint8_t *buf, size_t len,
-                                                   const nghttp2_frame *frame,
-                                                   void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library provides the error message
- * intended for human consumption.  This callback is solely for
- * debugging purpose.  The |msg| is typically NULL-terminated string
- * of length |len|.  |len| does not include the sentinel NULL
- * character.
- *
- * This function is deprecated.  The new application should use
- * :type:`nghttp2_error_callback2`.
- *
- * The format of error message may change between nghttp2 library
- * versions.  The application should not depend on the particular
- * format.
- *
- * Normally, application should return 0 from this callback.  If fatal
- * error occurred while doing something in this callback, application
- * should return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * library will return immediately with return value
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if nonzero value
- * is returned from this callback, they are treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`, but application should not
- * rely on this details.
- */
-typedef int (*nghttp2_error_callback)(nghttp2_session *session, const char *msg,
-                                      size_t len, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library provides the error code, and
- * message.  This callback is solely for debugging purpose.
- * |lib_error_code| is one of error code defined in
- * :enum:`nghttp2_error`.  The |msg| is typically NULL-terminated
- * string of length |len|, and intended for human consumption.  |len|
- * does not include the sentinel NULL character.
- *
- * The format of error message may change between nghttp2 library
- * versions.  The application should not depend on the particular
- * format.
- *
- * Normally, application should return 0 from this callback.  If fatal
- * error occurred while doing something in this callback, application
- * should return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * library will return immediately with return value
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if nonzero value
- * is returned from this callback, they are treated as
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`, but application should not
- * rely on this details.
- */
-typedef int (*nghttp2_error_callback2)(nghttp2_session *session,
-                                       int lib_error_code, const char *msg,
-                                       size_t len, void *user_data);
-
-struct nghttp2_session_callbacks;
-
-/**
- * @struct
- *
- * Callback functions for :type:`nghttp2_session`.  The details of
- * this structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_session_callbacks nghttp2_session_callbacks;
-
-/**
- * @function
- *
- * Initializes |*callbacks_ptr| with NULL values.
- *
- * The initialized object can be used when initializing multiple
- * :type:`nghttp2_session` objects.
- *
- * When the application finished using this object, it can use
- * `nghttp2_session_callbacks_del()` to free its memory.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_callbacks_new(nghttp2_session_callbacks **callbacks_ptr);
-
-/**
- * @function
- *
- * Frees any resources allocated for |callbacks|.  If |callbacks| is
- * ``NULL``, this function does nothing.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks);
-
-/**
- * @function
- *
- * Sets callback function invoked when a session wants to send data to
- * the remote peer.  This callback is not necessary if the application
- * uses solely `nghttp2_session_mem_send()` to serialize data to
- * transmit.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_send_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the a session wants to receive
- * data from the remote peer.  This callback is not necessary if the
- * application uses solely `nghttp2_session_mem_recv()` to process
- * received data.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_recv_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_recv_callback recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when a frame is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_recv_callback on_frame_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
- * received.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a chunk of data in DATA frame
- * is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked before a non-DATA frame is sent.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_before_frame_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_before_frame_send_callback before_frame_send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked after a frame is sent.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_send_callback on_frame_send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a non-DATA frame is not sent
- * because of an error.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_not_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_not_send_callback on_frame_not_send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the stream is closed.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_stream_close_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_stream_close_callback on_stream_close_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the reception of header block
- * in HEADERS or PUSH_PROMISE is started.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_begin_headers_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_begin_headers_callback on_begin_headers_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a header name/value pair is
- * received.  If both
- * `nghttp2_session_callbacks_set_on_header_callback()` and
- * `nghttp2_session_callbacks_set_on_header_callback2()` are used to
- * set callbacks, the latter has the precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_header_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_header_callback on_header_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a header name/value pair is
- * received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_header_callback2(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_header_callback2 on_header_callback2);
-
-/**
- * @function
- *
- * Sets callback function invoked when a invalid header name/value
- * pair is received.  If both
- * `nghttp2_session_callbacks_set_on_invalid_header_callback()` and
- * `nghttp2_session_callbacks_set_on_invalid_header_callback2()` are
- * used to set callbacks, the latter takes the precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_invalid_header_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_header_callback on_invalid_header_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a invalid header name/value
- * pair is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_invalid_header_callback2(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_header_callback2 on_invalid_header_callback2);
-
-/**
- * @function
- *
- * Sets callback function invoked when the library asks application
- * how many padding bytes are required for the transmission of the
- * given frame.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_select_padding_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_select_padding_callback select_padding_callback);
-
-/**
- * @function
- *
- * Sets callback function determine the length allowed in
- * :type:`nghttp2_data_source_read_callback`.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_set_data_source_read_length_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_data_source_read_length_callback data_source_read_length_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a frame header is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_begin_frame_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_begin_frame_callback on_begin_frame_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when
- * :enum:`NGHTTP2_DATA_FLAG_NO_COPY` is used in
- * :type:`nghttp2_data_source_read_callback` to avoid data copy.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_send_data_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_send_data_callback send_data_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the library asks the
- * application to pack extension frame payload in wire format.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_pack_extension_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_pack_extension_callback pack_extension_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the library asks the
- * application to unpack extension frame payload from wire format.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_unpack_extension_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_unpack_extension_callback unpack_extension_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when chunk of extension frame
- * payload is received.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_set_on_extension_chunk_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_extension_chunk_recv_callback on_extension_chunk_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when library tells error message to
- * the application.
- *
- * This function is deprecated.  The new application should use
- * `nghttp2_session_callbacks_set_error_callback2()`.
- *
- * If both :type:`nghttp2_error_callback` and
- * :type:`nghttp2_error_callback2` are set, the latter takes
- * precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_error_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_error_callback error_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when library tells error code, and
- * message to the application.
- *
- * If both :type:`nghttp2_error_callback` and
- * :type:`nghttp2_error_callback2` are set, the latter takes
- * precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_error_callback2(
-    nghttp2_session_callbacks *cbs, nghttp2_error_callback2 error_callback2);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace malloc().  The |mem_user_data|
- * is the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void *(*nghttp2_malloc)(size_t size, void *mem_user_data);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace free().  The |mem_user_data| is
- * the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void (*nghttp2_free)(void *ptr, void *mem_user_data);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace calloc().  The |mem_user_data|
- * is the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void *(*nghttp2_calloc)(size_t nmemb, size_t size, void *mem_user_data);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace realloc().  The |mem_user_data|
- * is the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void *(*nghttp2_realloc)(void *ptr, size_t size, void *mem_user_data);
-
-/**
- * @struct
- *
- * Custom memory allocator functions and user defined pointer.  The
- * |mem_user_data| member is passed to each allocator function.  This
- * can be used, for example, to achieve per-session memory pool.
- *
- * In the following example code, ``my_malloc``, ``my_free``,
- * ``my_calloc`` and ``my_realloc`` are the replacement of the
- * standard allocators ``malloc``, ``free``, ``calloc`` and
- * ``realloc`` respectively::
- *
- *     void *my_malloc_cb(size_t size, void *mem_user_data) {
- *       return my_malloc(size);
- *     }
- *
- *     void my_free_cb(void *ptr, void *mem_user_data) { my_free(ptr); }
- *
- *     void *my_calloc_cb(size_t nmemb, size_t size, void *mem_user_data) {
- *       return my_calloc(nmemb, size);
- *     }
- *
- *     void *my_realloc_cb(void *ptr, size_t size, void *mem_user_data) {
- *       return my_realloc(ptr, size);
- *     }
- *
- *     void session_new() {
- *       nghttp2_session *session;
- *       nghttp2_session_callbacks *callbacks;
- *       nghttp2_mem mem = {NULL, my_malloc_cb, my_free_cb, my_calloc_cb,
- *                          my_realloc_cb};
- *
- *       ...
- *
- *       nghttp2_session_client_new3(&session, callbacks, NULL, NULL, &mem);
- *
- *       ...
- *     }
- */
-typedef struct {
-  /**
-   * An arbitrary user supplied data.  This is passed to each
-   * allocator function.
-   */
-  void *mem_user_data;
-  /**
-   * Custom allocator function to replace malloc().
-   */
-  nghttp2_malloc malloc;
-  /**
-   * Custom allocator function to replace free().
-   */
-  nghttp2_free free;
-  /**
-   * Custom allocator function to replace calloc().
-   */
-  nghttp2_calloc calloc;
-  /**
-   * Custom allocator function to replace realloc().
-   */
-  nghttp2_realloc realloc;
-} nghttp2_mem;
-
-struct nghttp2_option;
-
-/**
- * @struct
- *
- * Configuration options for :type:`nghttp2_session`.  The details of
- * this structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_option nghttp2_option;
-
-/**
- * @function
- *
- * Initializes |*option_ptr| with default values.
- *
- * When the application finished using this object, it can use
- * `nghttp2_option_del()` to free its memory.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_option_new(nghttp2_option **option_ptr);
-
-/**
- * @function
- *
- * Frees any resources allocated for |option|.  If |option| is
- * ``NULL``, this function does nothing.
- */
-NGHTTP2_EXTERN void nghttp2_option_del(nghttp2_option *option);
-
-/**
- * @function
- *
- * This option prevents the library from sending WINDOW_UPDATE for a
- * connection automatically.  If this option is set to nonzero, the
- * library won't send WINDOW_UPDATE for DATA until application calls
- * `nghttp2_session_consume()` to indicate the consumed amount of
- * data.  Don't use `nghttp2_submit_window_update()` for this purpose.
- * By default, this option is set to zero.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_no_auto_window_update(nghttp2_option *option, int val);
-
-/**
- * @function
- *
- * This option sets the SETTINGS_MAX_CONCURRENT_STREAMS value of
- * remote endpoint as if it is received in SETTINGS frame.  Without
- * specifying this option, the maximum number of outgoing concurrent
- * streams is initially limited to 100 to avoid issues when the local
- * endpoint submits lots of requests before receiving initial SETTINGS
- * frame from the remote endpoint, since sending them at once to the
- * remote endpoint could lead to rejection of some of the requests.
- * This value will be overwritten when the local endpoint receives
- * initial SETTINGS frame from the remote endpoint, either to the
- * value advertised in SETTINGS_MAX_CONCURRENT_STREAMS or to the
- * default value (unlimited) if none was advertised.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
-                                               uint32_t val);
-
-/**
- * @function
- *
- * By default, nghttp2 library, if configured as server, requires
- * first 24 bytes of client magic byte string (MAGIC).  In most cases,
- * this will simplify the implementation of server.  But sometimes
- * server may want to detect the application protocol based on first
- * few bytes on clear text communication.
- *
- * If this option is used with nonzero |val|, nghttp2 library does not
- * handle MAGIC.  It still checks following SETTINGS frame.  This
- * means that applications should deal with MAGIC by themselves.
- *
- * If this option is not used or used with zero value, if MAGIC does
- * not match :macro:`NGHTTP2_CLIENT_MAGIC`, `nghttp2_session_recv()`
- * and `nghttp2_session_mem_recv()` will return error
- * :enum:`NGHTTP2_ERR_BAD_CLIENT_MAGIC`, which is fatal error.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val);
-
-/**
- * @function
- *
- * By default, nghttp2 library enforces subset of HTTP Messaging rules
- * described in `HTTP/2 specification, section 8
- * <https://tools.ietf.org/html/rfc7540#section-8>`_.  See
- * :ref:`http-messaging` section for details.  For those applications
- * who use nghttp2 library as non-HTTP use, give nonzero to |val| to
- * disable this enforcement.  Please note that disabling this feature
- * does not change the fundamental client and server model of HTTP.
- * That is, even if the validation is disabled, only client can send
- * requests.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_no_http_messaging(nghttp2_option *option,
-                                                         int val);
-
-/**
- * @function
- *
- * RFC 7540 does not enforce any limit on the number of incoming
- * reserved streams (in RFC 7540 terms, streams in reserved (remote)
- * state).  This only affects client side, since only server can push
- * streams.  Malicious server can push arbitrary number of streams,
- * and make client's memory exhausted.  This option can set the
- * maximum number of such incoming streams to avoid possible memory
- * exhaustion.  If this option is set, and pushed streams are
- * automatically closed on reception, without calling user provided
- * callback, if they exceed the given limit.  The default value is
- * 200.  If session is configured as server side, this option has no
- * effect.  Server can control the number of streams to push.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_max_reserved_remote_streams(nghttp2_option *option,
-                                               uint32_t val);
-
-/**
- * @function
- *
- * Sets extension frame type the application is willing to handle with
- * user defined callbacks (see
- * :type:`nghttp2_on_extension_chunk_recv_callback` and
- * :type:`nghttp2_unpack_extension_callback`).  The |type| is
- * extension frame type, and must be strictly greater than 0x9.
- * Otherwise, this function does nothing.  The application can call
- * this function multiple times to set more than one frame type to
- * receive.  The application does not have to call this function if it
- * just sends extension frames.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_user_recv_extension_type(nghttp2_option *option,
-                                            uint8_t type);
-
-/**
- * @function
- *
- * Sets extension frame type the application is willing to receive
- * using builtin handler.  The |type| is the extension frame type to
- * receive, and must be strictly greater than 0x9.  Otherwise, this
- * function does nothing.  The application can call this function
- * multiple times to set more than one frame type to receive.  The
- * application does not have to call this function if it just sends
- * extension frames.
- *
- * If same frame type is passed to both
- * `nghttp2_option_set_builtin_recv_extension_type()` and
- * `nghttp2_option_set_user_recv_extension_type()`, the latter takes
- * precedence.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_builtin_recv_extension_type(nghttp2_option *option,
-                                               uint8_t type);
-
-/**
- * @function
- *
- * This option prevents the library from sending PING frame with ACK
- * flag set automatically when PING frame without ACK flag set is
- * received.  If this option is set to nonzero, the library won't send
- * PING frame with ACK flag set in the response for incoming PING
- * frame.  The application can send PING frame with ACK flag set using
- * `nghttp2_submit_ping()` with :enum:`NGHTTP2_FLAG_ACK` as flags
- * parameter.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_no_auto_ping_ack(nghttp2_option *option,
-                                                        int val);
-
-/**
- * @function
- *
- * This option sets the maximum length of header block (a set of
- * header fields per one HEADERS frame) to send.  The length of a
- * given set of header fields is calculated using
- * `nghttp2_hd_deflate_bound()`.  The default value is 64KiB.  If
- * application attempts to send header fields larger than this limit,
- * the transmission of the frame fails with error code
- * :enum:`NGHTTP2_ERR_FRAME_SIZE_ERROR`.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_max_send_header_block_length(nghttp2_option *option,
-                                                size_t val);
-
-/**
- * @function
- *
- * This option sets the maximum dynamic table size for deflating
- * header fields.  The default value is 4KiB.  In HTTP/2, receiver of
- * deflated header block can specify maximum dynamic table size.  The
- * actual maximum size is the minimum of the size receiver specified
- * and this option value.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_max_deflate_dynamic_table_size(nghttp2_option *option,
-                                                  size_t val);
-
-/**
- * @function
- *
- * This option prevents the library from retaining closed streams to
- * maintain the priority tree.  If this option is set to nonzero,
- * applications can discard closed stream completely to save memory.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_no_closed_streams(nghttp2_option *option,
-                                                         int val);
-
-/**
- * @function
- *
- * Initializes |*session_ptr| for client use.  The all members of
- * |callbacks| are copied to |*session_ptr|.  Therefore |*session_ptr|
- * does not store |callbacks|.  The |user_data| is an arbitrary user
- * supplied data, which will be passed to the callback functions.
- *
- * The :type:`nghttp2_send_callback` must be specified.  If the
- * application code uses `nghttp2_session_recv()`, the
- * :type:`nghttp2_recv_callback` must be specified.  The other members
- * of |callbacks| can be ``NULL``.
- *
- * If this function fails, |*session_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_client_new(nghttp2_session **session_ptr,
-                           const nghttp2_session_callbacks *callbacks,
-                           void *user_data);
-
-/**
- * @function
- *
- * Initializes |*session_ptr| for server use.  The all members of
- * |callbacks| are copied to |*session_ptr|. Therefore |*session_ptr|
- * does not store |callbacks|.  The |user_data| is an arbitrary user
- * supplied data, which will be passed to the callback functions.
- *
- * The :type:`nghttp2_send_callback` must be specified.  If the
- * application code uses `nghttp2_session_recv()`, the
- * :type:`nghttp2_recv_callback` must be specified.  The other members
- * of |callbacks| can be ``NULL``.
- *
- * If this function fails, |*session_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_server_new(nghttp2_session **session_ptr,
-                           const nghttp2_session_callbacks *callbacks,
-                           void *user_data);
-
-/**
- * @function
- *
- * Like `nghttp2_session_client_new()`, but with additional options
- * specified in the |option|.
- *
- * The |option| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_client_new()`.
- *
- * This function does not take ownership |option|.  The application is
- * responsible for freeing |option| if it finishes using the object.
- *
- * The library code does not refer to |option| after this function
- * returns.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_client_new2(nghttp2_session **session_ptr,
-                            const nghttp2_session_callbacks *callbacks,
-                            void *user_data, const nghttp2_option *option);
-
-/**
- * @function
- *
- * Like `nghttp2_session_server_new()`, but with additional options
- * specified in the |option|.
- *
- * The |option| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_server_new()`.
- *
- * This function does not take ownership |option|.  The application is
- * responsible for freeing |option| if it finishes using the object.
- *
- * The library code does not refer to |option| after this function
- * returns.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_server_new2(nghttp2_session **session_ptr,
-                            const nghttp2_session_callbacks *callbacks,
-                            void *user_data, const nghttp2_option *option);
-
-/**
- * @function
- *
- * Like `nghttp2_session_client_new2()`, but with additional custom
- * memory allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_client_new2()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_client_new3(
-    nghttp2_session **session_ptr, const nghttp2_session_callbacks *callbacks,
-    void *user_data, const nghttp2_option *option, nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Like `nghttp2_session_server_new2()`, but with additional custom
- * memory allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_server_new2()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_server_new3(
-    nghttp2_session **session_ptr, const nghttp2_session_callbacks *callbacks,
-    void *user_data, const nghttp2_option *option, nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Frees any resources allocated for |session|.  If |session| is
- * ``NULL``, this function does nothing.
- */
-NGHTTP2_EXTERN void nghttp2_session_del(nghttp2_session *session);
-
-/**
- * @function
- *
- * Sends pending frames to the remote peer.
- *
- * This function retrieves the highest prioritized frame from the
- * outbound queue and sends it to the remote peer.  It does this as
- * many as possible until the user callback
- * :type:`nghttp2_send_callback` returns
- * :enum:`NGHTTP2_ERR_WOULDBLOCK` or the outbound queue becomes empty.
- * This function calls several callback functions which are passed
- * when initializing the |session|.  Here is the simple time chart
- * which tells when each callback is invoked:
- *
- * 1. Get the next frame to send from outbound queue.
- *
- * 2. Prepare transmission of the frame.
- *
- * 3. If the control frame cannot be sent because some preconditions
- *    are not met (e.g., request HEADERS cannot be sent after GOAWAY),
- *    :type:`nghttp2_on_frame_not_send_callback` is invoked.  Abort
- *    the following steps.
- *
- * 4. If the frame is HEADERS, PUSH_PROMISE or DATA,
- *    :type:`nghttp2_select_padding_callback` is invoked.
- *
- * 5. If the frame is request HEADERS, the stream is opened here.
- *
- * 6. :type:`nghttp2_before_frame_send_callback` is invoked.
- *
- * 7. If :enum:`NGHTTP2_ERR_CANCEL` is returned from
- *    :type:`nghttp2_before_frame_send_callback`, the current frame
- *    transmission is canceled, and
- *    :type:`nghttp2_on_frame_not_send_callback` is invoked.  Abort
- *    the following steps.
- *
- * 8. :type:`nghttp2_send_callback` is invoked one or more times to
- *    send the frame.
- *
- * 9. :type:`nghttp2_on_frame_send_callback` is invoked.
- *
- * 10. If the transmission of the frame triggers closure of the
- *     stream, the stream is closed and
- *     :type:`nghttp2_on_stream_close_callback` is invoked.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
- *     The callback function failed.
- */
-NGHTTP2_EXTERN int nghttp2_session_send(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the serialized data to send.
- *
- * This function behaves like `nghttp2_session_send()` except that it
- * does not use :type:`nghttp2_send_callback` to transmit data.
- * Instead, it assigns the pointer to the serialized data to the
- * |*data_ptr| and returns its length.  The other callbacks are called
- * in the same way as they are in `nghttp2_session_send()`.
- *
- * If no data is available to send, this function returns 0.
- *
- * This function may not return all serialized data in one invocation.
- * To get all data, call this function repeatedly until it returns 0
- * or one of negative error codes.
- *
- * The assigned |*data_ptr| is valid until the next call of
- * `nghttp2_session_mem_send()` or `nghttp2_session_send()`.
- *
- * The caller must send all data before sending the next chunk of
- * data.
- *
- * This function returns the length of the data pointed by the
- * |*data_ptr| if it succeeds, or one of the following negative error
- * codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- *
- * .. note::
- *
- *   This function may produce very small byte string.  If that is the
- *   case, and application disables Nagle algorithm (``TCP_NODELAY``),
- *   then writing this small chunk leads to very small packet, and it
- *   is very inefficient.  An application should be responsible to
- *   buffer up small chunks of data as necessary to avoid this
- *   situation.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_session_mem_send(nghttp2_session *session,
-                                                const uint8_t **data_ptr);
-
-/**
- * @function
- *
- * Receives frames from the remote peer.
- *
- * This function receives as many frames as possible until the user
- * callback :type:`nghttp2_recv_callback` returns
- * :enum:`NGHTTP2_ERR_WOULDBLOCK`.  This function calls several
- * callback functions which are passed when initializing the
- * |session|.  Here is the simple time chart which tells when each
- * callback is invoked:
- *
- * 1. :type:`nghttp2_recv_callback` is invoked one or more times to
- *    receive frame header.
- *
- * 2. When frame header is received,
- *    :type:`nghttp2_on_begin_frame_callback` is invoked.
- *
- * 3. If the frame is DATA frame:
- *
- *    1. :type:`nghttp2_recv_callback` is invoked to receive DATA
- *       payload. For each chunk of data,
- *       :type:`nghttp2_on_data_chunk_recv_callback` is invoked.
- *
- *    2. If one DATA frame is completely received,
- *       :type:`nghttp2_on_frame_recv_callback` is invoked.  If the
- *       reception of the frame triggers the closure of the stream,
- *       :type:`nghttp2_on_stream_close_callback` is invoked.
- *
- * 4. If the frame is the control frame:
- *
- *    1. :type:`nghttp2_recv_callback` is invoked one or more times to
- *       receive whole frame.
- *
- *    2. If the received frame is valid, then following actions are
- *       taken.  If the frame is either HEADERS or PUSH_PROMISE,
- *       :type:`nghttp2_on_begin_headers_callback` is invoked.  Then
- *       :type:`nghttp2_on_header_callback` is invoked for each header
- *       name/value pair.  For invalid header field,
- *       :type:`nghttp2_on_invalid_header_callback` is called.  After
- *       all name/value pairs are emitted successfully,
- *       :type:`nghttp2_on_frame_recv_callback` is invoked.  For other
- *       frames, :type:`nghttp2_on_frame_recv_callback` is invoked.
- *       If the reception of the frame triggers the closure of the
- *       stream, :type:`nghttp2_on_stream_close_callback` is invoked.
- *
- *    3. If the received frame is unpacked but is interpreted as
- *       invalid, :type:`nghttp2_on_invalid_frame_recv_callback` is
- *       invoked.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_EOF`
- *     The remote peer did shutdown on the connection.
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
- *     The callback function failed.
- * :enum:`NGHTTP2_ERR_BAD_CLIENT_MAGIC`
- *     Invalid client magic was detected.  This error only returns
- *     when |session| was configured as server and
- *     `nghttp2_option_set_no_recv_client_magic()` is not used with
- *     nonzero value.
- * :enum:`NGHTTP2_ERR_FLOODED`
- *     Flooding was detected in this HTTP/2 session, and it must be
- *     closed.  This is most likely caused by misbehaviour of peer.
- */
-NGHTTP2_EXTERN int nghttp2_session_recv(nghttp2_session *session);
-
-/**
- * @function
- *
- * Processes data |in| as an input from the remote endpoint.  The
- * |inlen| indicates the number of bytes in the |in|.
- *
- * This function behaves like `nghttp2_session_recv()` except that it
- * does not use :type:`nghttp2_recv_callback` to receive data; the
- * |in| is the only data for the invocation of this function.  If all
- * bytes are processed, this function returns.  The other callbacks
- * are called in the same way as they are in `nghttp2_session_recv()`.
- *
- * In the current implementation, this function always tries to
- * processes all input data unless either an error occurs or
- * :enum:`NGHTTP2_ERR_PAUSE` is returned from
- * :type:`nghttp2_on_header_callback` or
- * :type:`nghttp2_on_data_chunk_recv_callback`.  If
- * :enum:`NGHTTP2_ERR_PAUSE` is used, the return value includes the
- * number of bytes which was used to produce the data or frame for the
- * callback.
- *
- * This function returns the number of processed bytes, or one of the
- * following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
- *     The callback function failed.
- * :enum:`NGHTTP2_ERR_BAD_CLIENT_MAGIC`
- *     Invalid client magic was detected.  This error only returns
- *     when |session| was configured as server and
- *     `nghttp2_option_set_no_recv_client_magic()` is not used with
- *     nonzero value.
- * :enum:`NGHTTP2_ERR_FLOODED`
- *     Flooding was detected in this HTTP/2 session, and it must be
- *     closed.  This is most likely caused by misbehaviour of peer.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
-                                                const uint8_t *in,
-                                                size_t inlen);
-
-/**
- * @function
- *
- * Puts back previously deferred DATA frame in the stream |stream_id|
- * to the outbound queue.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The stream does not exist; or no deferred data exist.
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_resume_data(nghttp2_session *session,
-                                               int32_t stream_id);
-
-/**
- * @function
- *
- * Returns nonzero value if |session| wants to receive data from the
- * remote peer.
- *
- * If both `nghttp2_session_want_read()` and
- * `nghttp2_session_want_write()` return 0, the application should
- * drop the connection.
- */
-NGHTTP2_EXTERN int nghttp2_session_want_read(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns nonzero value if |session| wants to send data to the remote
- * peer.
- *
- * If both `nghttp2_session_want_read()` and
- * `nghttp2_session_want_write()` return 0, the application should
- * drop the connection.
- */
-NGHTTP2_EXTERN int nghttp2_session_want_write(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns stream_user_data for the stream |stream_id|.  The
- * stream_user_data is provided by `nghttp2_submit_request()`,
- * `nghttp2_submit_headers()` or
- * `nghttp2_session_set_stream_user_data()`.  Unless it is set using
- * `nghttp2_session_set_stream_user_data()`, if the stream is
- * initiated by the remote endpoint, stream_user_data is always
- * ``NULL``.  If the stream does not exist, this function returns
- * ``NULL``.
- */
-NGHTTP2_EXTERN void *
-nghttp2_session_get_stream_user_data(nghttp2_session *session,
-                                     int32_t stream_id);
-
-/**
- * @function
- *
- * Sets the |stream_user_data| to the stream denoted by the
- * |stream_id|.  If a stream user data is already set to the stream,
- * it is replaced with the |stream_user_data|.  It is valid to specify
- * ``NULL`` in the |stream_user_data|, which nullifies the associated
- * data pointer.
- *
- * It is valid to set the |stream_user_data| to the stream reserved by
- * PUSH_PROMISE frame.
- *
- * This function returns 0 if it succeeds, or one of following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The stream does not exist
- */
-NGHTTP2_EXTERN int
-nghttp2_session_set_stream_user_data(nghttp2_session *session,
-                                     int32_t stream_id, void *stream_user_data);
-
-/**
- * @function
- *
- * Sets |user_data| to |session|, overwriting the existing user data
- * specified in `nghttp2_session_client_new()`, or
- * `nghttp2_session_server_new()`.
- */
-NGHTTP2_EXTERN void nghttp2_session_set_user_data(nghttp2_session *session,
-                                                  void *user_data);
-
-/**
- * @function
- *
- * Returns the number of frames in the outbound queue.  This does not
- * include the deferred DATA frames.
- */
-NGHTTP2_EXTERN size_t
-nghttp2_session_get_outbound_queue_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the number of DATA payload in bytes received without
- * WINDOW_UPDATE transmission for the stream |stream_id|.  The local
- * (receive) window size can be adjusted by
- * `nghttp2_submit_window_update()`.  This function takes into account
- * that and returns effective data length.  In particular, if the
- * local window size is reduced by submitting negative
- * window_size_increment with `nghttp2_submit_window_update()`, this
- * function returns the number of bytes less than actually received.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_effective_recv_data_length(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the local (receive) window size for the stream |stream_id|.
- * The local window size can be adjusted by
- * `nghttp2_submit_window_update()`.  This function takes into account
- * that and returns effective window size.
- *
- * This function does not take into account the amount of received
- * data from the remote endpoint.  Use
- * `nghttp2_session_get_stream_local_window_size()` to know the amount
- * of data the remote endpoint can send without receiving stream level
- * WINDOW_UPDATE frame.  Note that each stream is still subject to the
- * connection level flow control.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_effective_local_window_size(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the amount of flow-controlled payload (e.g., DATA) that the
- * remote endpoint can send without receiving stream level
- * WINDOW_UPDATE frame.  It is also subject to the connection level
- * flow control.  So the actual amount of data to send is
- * min(`nghttp2_session_get_stream_local_window_size()`,
- * `nghttp2_session_get_local_window_size()`).
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_local_window_size(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the number of DATA payload in bytes received without
- * WINDOW_UPDATE transmission for a connection.  The local (receive)
- * window size can be adjusted by `nghttp2_submit_window_update()`.
- * This function takes into account that and returns effective data
- * length.  In particular, if the local window size is reduced by
- * submitting negative window_size_increment with
- * `nghttp2_submit_window_update()`, this function returns the number
- * of bytes less than actually received.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_effective_recv_data_length(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the local (receive) window size for a connection.  The
- * local window size can be adjusted by
- * `nghttp2_submit_window_update()`.  This function takes into account
- * that and returns effective window size.
- *
- * This function does not take into account the amount of received
- * data from the remote endpoint.  Use
- * `nghttp2_session_get_local_window_size()` to know the amount of
- * data the remote endpoint can send without receiving
- * connection-level WINDOW_UPDATE frame.  Note that each stream is
- * still subject to the stream level flow control.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_effective_local_window_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the amount of flow-controlled payload (e.g., DATA) that the
- * remote endpoint can send without receiving connection level
- * WINDOW_UPDATE frame.  Note that each stream is still subject to the
- * stream level flow control (see
- * `nghttp2_session_get_stream_local_window_size()`).
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_local_window_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the remote window size for a given stream |stream_id|.
- *
- * This is the amount of flow-controlled payload (e.g., DATA) that the
- * local endpoint can send without stream level WINDOW_UPDATE.  There
- * is also connection level flow control, so the effective size of
- * payload that the local endpoint can actually send is
- * min(`nghttp2_session_get_stream_remote_window_size()`,
- * `nghttp2_session_get_remote_window_size()`).
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_remote_window_size(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the remote window size for a connection.
- *
- * This function always succeeds.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_remote_window_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns 1 if local peer half closed the given stream |stream_id|.
- * Returns 0 if it did not.  Returns -1 if no such stream exists.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_get_stream_local_close(nghttp2_session *session,
-                                       int32_t stream_id);
-
-/**
- * @function
- *
- * Returns 1 if remote peer half closed the given stream |stream_id|.
- * Returns 0 if it did not.  Returns -1 if no such stream exists.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_get_stream_remote_close(nghttp2_session *session,
-                                        int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the current dynamic table size of HPACK inflater, including
- * the overhead 32 bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN size_t
-nghttp2_session_get_hd_inflate_dynamic_table_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the current dynamic table size of HPACK deflater including
- * the overhead 32 bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN size_t
-nghttp2_session_get_hd_deflate_dynamic_table_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Signals the session so that the connection should be terminated.
- *
- * The last stream ID is the minimum value between the stream ID of a
- * stream for which :type:`nghttp2_on_frame_recv_callback` was called
- * most recently and the last stream ID we have sent to the peer
- * previously.
- *
- * The |error_code| is the error code of this GOAWAY frame.  The
- * pre-defined error code is one of :enum:`nghttp2_error_code`.
- *
- * After the transmission, both `nghttp2_session_want_read()` and
- * `nghttp2_session_want_write()` return 0.
- *
- * This function should be called when the connection should be
- * terminated after sending GOAWAY.  If the remaining streams should
- * be processed after GOAWAY, use `nghttp2_submit_goaway()` instead.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_terminate_session(nghttp2_session *session,
-                                                     uint32_t error_code);
-
-/**
- * @function
- *
- * Signals the session so that the connection should be terminated.
- *
- * This function behaves like `nghttp2_session_terminate_session()`,
- * but the last stream ID can be specified by the application for fine
- * grained control of stream.  The HTTP/2 specification does not allow
- * last_stream_id to be increased.  So the actual value sent as
- * last_stream_id is the minimum value between the given
- * |last_stream_id| and the last_stream_id we have previously sent to
- * the peer.
- *
- * The |last_stream_id| is peer's stream ID or 0.  So if |session| is
- * initialized as client, |last_stream_id| must be even or 0.  If
- * |session| is initialized as server, |last_stream_id| must be odd or
- * 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |last_stream_id| is invalid.
- */
-NGHTTP2_EXTERN int nghttp2_session_terminate_session2(nghttp2_session *session,
-                                                      int32_t last_stream_id,
-                                                      uint32_t error_code);
-
-/**
- * @function
- *
- * Signals to the client that the server started graceful shutdown
- * procedure.
- *
- * This function is only usable for server.  If this function is
- * called with client side session, this function returns
- * :enum:`NGHTTP2_ERR_INVALID_STATE`.
- *
- * To gracefully shutdown HTTP/2 session, server should call this
- * function to send GOAWAY with last_stream_id (1u << 31) - 1.  And
- * after some delay (e.g., 1 RTT), send another GOAWAY with the stream
- * ID that the server has some processing using
- * `nghttp2_submit_goaway()`.  See also
- * `nghttp2_session_get_last_proc_stream_id()`.
- *
- * Unlike `nghttp2_submit_goaway()`, this function just sends GOAWAY
- * and does nothing more.  This is a mere indication to the client
- * that session shutdown is imminent.  The application should call
- * `nghttp2_submit_goaway()` with appropriate last_stream_id after
- * this call.
- *
- * If one or more GOAWAY frame have been already sent by either
- * `nghttp2_submit_goaway()` or `nghttp2_session_terminate_session()`,
- * this function has no effect.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     The |session| is initialized as client.
- */
-NGHTTP2_EXTERN int nghttp2_submit_shutdown_notice(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the value of SETTINGS |id| notified by a remote endpoint.
- * The |id| must be one of values defined in
- * :enum:`nghttp2_settings_id`.
- */
-NGHTTP2_EXTERN uint32_t nghttp2_session_get_remote_settings(
-    nghttp2_session *session, nghttp2_settings_id id);
-
-/**
- * @function
- *
- * Returns the value of SETTINGS |id| of local endpoint acknowledged
- * by the remote endpoint.  The |id| must be one of the values defined
- * in :enum:`nghttp2_settings_id`.
- */
-NGHTTP2_EXTERN uint32_t nghttp2_session_get_local_settings(
-    nghttp2_session *session, nghttp2_settings_id id);
-
-/**
- * @function
- *
- * Tells the |session| that next stream ID is |next_stream_id|.  The
- * |next_stream_id| must be equal or greater than the value returned
- * by `nghttp2_session_get_next_stream_id()`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |next_stream_id| is strictly less than the value
- *     `nghttp2_session_get_next_stream_id()` returns; or
- *     |next_stream_id| is invalid (e.g., even integer for client, or
- *     odd integer for server).
- */
-NGHTTP2_EXTERN int nghttp2_session_set_next_stream_id(nghttp2_session *session,
-                                                      int32_t next_stream_id);
-
-/**
- * @function
- *
- * Returns the next outgoing stream ID.  Notice that return type is
- * uint32_t.  If we run out of stream ID for this session, this
- * function returns 1 << 31.
- */
-NGHTTP2_EXTERN uint32_t
-nghttp2_session_get_next_stream_id(nghttp2_session *session);
-
-/**
- * @function
- *
- * Tells the |session| that |size| bytes for a stream denoted by
- * |stream_id| were consumed by application and are ready to
- * WINDOW_UPDATE.  The consumed bytes are counted towards both
- * connection and stream level WINDOW_UPDATE (see
- * `nghttp2_session_consume_connection()` and
- * `nghttp2_session_consume_stream()` to update consumption
- * independently).  This function is intended to be used without
- * automatic window update (see
- * `nghttp2_option_set_no_auto_window_update()`).
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     Automatic WINDOW_UPDATE is not disabled.
- */
-NGHTTP2_EXTERN int nghttp2_session_consume(nghttp2_session *session,
-                                           int32_t stream_id, size_t size);
-
-/**
- * @function
- *
- * Like `nghttp2_session_consume()`, but this only tells library that
- * |size| bytes were consumed only for connection level.  Note that
- * HTTP/2 maintains connection and stream level flow control windows
- * independently.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     Automatic WINDOW_UPDATE is not disabled.
- */
-NGHTTP2_EXTERN int nghttp2_session_consume_connection(nghttp2_session *session,
-                                                      size_t size);
-
-/**
- * @function
- *
- * Like `nghttp2_session_consume()`, but this only tells library that
- * |size| bytes were consumed only for stream denoted by |stream_id|.
- * Note that HTTP/2 maintains connection and stream level flow control
- * windows independently.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     Automatic WINDOW_UPDATE is not disabled.
- */
-NGHTTP2_EXTERN int nghttp2_session_consume_stream(nghttp2_session *session,
-                                                  int32_t stream_id,
-                                                  size_t size);
-
-/**
- * @function
- *
- * Changes priority of existing stream denoted by |stream_id|.  The
- * new priority specification is |pri_spec|.
- *
- * The priority is changed silently and instantly, and no PRIORITY
- * frame will be sent to notify the peer of this change.  This
- * function may be useful for server to change the priority of pushed
- * stream.
- *
- * If |session| is initialized as server, and ``pri_spec->stream_id``
- * points to the idle stream, the idle stream is created if it does
- * not exist.  The created idle stream will depend on root stream
- * (stream 0) with weight 16.
- *
- * Otherwise, if stream denoted by ``pri_spec->stream_id`` is not
- * found, we use default priority instead of given |pri_spec|.  That
- * is make stream depend on root stream with weight 16.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     Attempted to depend on itself; or no stream exist for the given
- *     |stream_id|; or |stream_id| is 0
- */
-NGHTTP2_EXTERN int
-nghttp2_session_change_stream_priority(nghttp2_session *session,
-                                       int32_t stream_id,
-                                       const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Creates idle stream with the given |stream_id|, and priority
- * |pri_spec|.
- *
- * The stream creation is done without sending PRIORITY frame, which
- * means that peer does not know about the existence of this idle
- * stream in the local endpoint.
- *
- * RFC 7540 does not disallow the use of creation of idle stream with
- * odd or even stream ID regardless of client or server.  So this
- * function can create odd or even stream ID regardless of client or
- * server.  But probably it is a bit safer to use the stream ID the
- * local endpoint can initiate (in other words, use odd stream ID for
- * client, and even stream ID for server), to avoid potential
- * collision from peer's instruction.  Also we can use
- * `nghttp2_session_set_next_stream_id()` to avoid to open created
- * idle streams accidentally if we follow this recommendation.
- *
- * If |session| is initialized as server, and ``pri_spec->stream_id``
- * points to the idle stream, the idle stream is created if it does
- * not exist.  The created idle stream will depend on root stream
- * (stream 0) with weight 16.
- *
- * Otherwise, if stream denoted by ``pri_spec->stream_id`` is not
- * found, we use default priority instead of given |pri_spec|.  That
- * is make stream depend on root stream with weight 16.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     Attempted to depend on itself; or stream denoted by |stream_id|
- *     already exists; or |stream_id| cannot be used to create idle
- *     stream (in other words, local endpoint has already opened
- *     stream ID greater than or equal to the given stream ID; or
- *     |stream_id| is 0
- */
-NGHTTP2_EXTERN int
-nghttp2_session_create_idle_stream(nghttp2_session *session, int32_t stream_id,
-                                   const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Performs post-process of HTTP Upgrade request.  This function can
- * be called from both client and server, but the behavior is very
- * different in each other.
- *
- * .. warning::
- *
- *   This function is deprecated in favor of
- *   `nghttp2_session_upgrade2()`, because this function lacks the
- *   parameter to tell the library the request method used in the
- *   original HTTP request.  This information is required for client
- *   to validate actual response body length against content-length
- *   header field (see `nghttp2_option_set_no_http_messaging()`).  If
- *   HEAD is used in request, the length of response body must be 0
- *   regardless of value included in content-length header field.
- *
- * If called from client side, the |settings_payload| must be the
- * value sent in ``HTTP2-Settings`` header field and must be decoded
- * by base64url decoder.  The |settings_payloadlen| is the length of
- * |settings_payload|.  The |settings_payload| is unpacked and its
- * setting values will be submitted using `nghttp2_submit_settings()`.
- * This means that the client application code does not need to submit
- * SETTINGS by itself.  The stream with stream ID=1 is opened and the
- * |stream_user_data| is used for its stream_user_data.  The opened
- * stream becomes half-closed (local) state.
- *
- * If called from server side, the |settings_payload| must be the
- * value received in ``HTTP2-Settings`` header field and must be
- * decoded by base64url decoder.  The |settings_payloadlen| is the
- * length of |settings_payload|.  It is treated as if the SETTINGS
- * frame with that payload is received.  Thus, callback functions for
- * the reception of SETTINGS frame will be invoked.  The stream with
- * stream ID=1 is opened.  The |stream_user_data| is ignored.  The
- * opened stream becomes half-closed (remote).
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |settings_payload| is badly formed.
- * :enum:`NGHTTP2_ERR_PROTO`
- *     The stream ID 1 is already used or closed; or is not available.
- */
-NGHTTP2_EXTERN int nghttp2_session_upgrade(nghttp2_session *session,
-                                           const uint8_t *settings_payload,
-                                           size_t settings_payloadlen,
-                                           void *stream_user_data);
-
-/**
- * @function
- *
- * Performs post-process of HTTP Upgrade request.  This function can
- * be called from both client and server, but the behavior is very
- * different in each other.
- *
- * If called from client side, the |settings_payload| must be the
- * value sent in ``HTTP2-Settings`` header field and must be decoded
- * by base64url decoder.  The |settings_payloadlen| is the length of
- * |settings_payload|.  The |settings_payload| is unpacked and its
- * setting values will be submitted using `nghttp2_submit_settings()`.
- * This means that the client application code does not need to submit
- * SETTINGS by itself.  The stream with stream ID=1 is opened and the
- * |stream_user_data| is used for its stream_user_data.  The opened
- * stream becomes half-closed (local) state.
- *
- * If called from server side, the |settings_payload| must be the
- * value received in ``HTTP2-Settings`` header field and must be
- * decoded by base64url decoder.  The |settings_payloadlen| is the
- * length of |settings_payload|.  It is treated as if the SETTINGS
- * frame with that payload is received.  Thus, callback functions for
- * the reception of SETTINGS frame will be invoked.  The stream with
- * stream ID=1 is opened.  The |stream_user_data| is ignored.  The
- * opened stream becomes half-closed (remote).
- *
- * If the request method is HEAD, pass nonzero value to
- * |head_request|.  Otherwise, pass 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |settings_payload| is badly formed.
- * :enum:`NGHTTP2_ERR_PROTO`
- *     The stream ID 1 is already used or closed; or is not available.
- */
-NGHTTP2_EXTERN int nghttp2_session_upgrade2(nghttp2_session *session,
-                                            const uint8_t *settings_payload,
-                                            size_t settings_payloadlen,
-                                            int head_request,
-                                            void *stream_user_data);
-
-/**
- * @function
- *
- * Serializes the SETTINGS values |iv| in the |buf|.  The size of the
- * |buf| is specified by |buflen|.  The number of entries in the |iv|
- * array is given by |niv|.  The required space in |buf| for the |niv|
- * entries is ``6*niv`` bytes and if the given buffer is too small, an
- * error is returned.  This function is used mainly for creating a
- * SETTINGS payload to be sent with the ``HTTP2-Settings`` header
- * field in an HTTP Upgrade request.  The data written in |buf| is NOT
- * base64url encoded and the application is responsible for encoding.
- *
- * This function returns the number of bytes written in |buf|, or one
- * of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |iv| contains duplicate settings ID or invalid value.
- *
- * :enum:`NGHTTP2_ERR_INSUFF_BUFSIZE`
- *     The provided |buflen| size is too small to hold the output.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_pack_settings_payload(
-    uint8_t *buf, size_t buflen, const nghttp2_settings_entry *iv, size_t niv);
-
-/**
- * @function
- *
- * Returns string describing the |lib_error_code|.  The
- * |lib_error_code| must be one of the :enum:`nghttp2_error`.
- */
-NGHTTP2_EXTERN const char *nghttp2_strerror(int lib_error_code);
-
-/**
- * @function
- *
- * Returns string representation of HTTP/2 error code |error_code|
- * (e.g., ``PROTOCOL_ERROR`` is returned if ``error_code ==
- * NGHTTP2_PROTOCOL_ERROR``).  If string representation is unknown for
- * given |error_code|, this function returns string ``unknown``.
- */
-NGHTTP2_EXTERN const char *nghttp2_http2_strerror(uint32_t error_code);
-
-/**
- * @function
- *
- * Initializes |pri_spec| with the |stream_id| of the stream to depend
- * on with |weight| and its exclusive flag.  If |exclusive| is
- * nonzero, exclusive flag is set.
- *
- * The |weight| must be in [:enum:`NGHTTP2_MIN_WEIGHT`,
- * :enum:`NGHTTP2_MAX_WEIGHT`], inclusive.
- */
-NGHTTP2_EXTERN void nghttp2_priority_spec_init(nghttp2_priority_spec *pri_spec,
-                                               int32_t stream_id,
-                                               int32_t weight, int exclusive);
-
-/**
- * @function
- *
- * Initializes |pri_spec| with the default values.  The default values
- * are: stream_id = 0, weight = :macro:`NGHTTP2_DEFAULT_WEIGHT` and
- * exclusive = 0.
- */
-NGHTTP2_EXTERN void
-nghttp2_priority_spec_default_init(nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Returns nonzero if the |pri_spec| is filled with default values.
- */
-NGHTTP2_EXTERN int
-nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Submits HEADERS frame and optionally one or more DATA frames.
- *
- * The |pri_spec| is priority specification of this request.  ``NULL``
- * means the default priority (see
- * `nghttp2_priority_spec_default_init()`).  To specify the priority,
- * use `nghttp2_priority_spec_init()`.  If |pri_spec| is not ``NULL``,
- * this function will copy its data members.
- *
- * The ``pri_spec->weight`` must be in [:enum:`NGHTTP2_MIN_WEIGHT`,
- * :enum:`NGHTTP2_MAX_WEIGHT`], inclusive.  If ``pri_spec->weight`` is
- * strictly less than :enum:`NGHTTP2_MIN_WEIGHT`, it becomes
- * :enum:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
- * :enum:`NGHTTP2_MAX_WEIGHT`, it becomes :enum:`NGHTTP2_MAX_WEIGHT`.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set, header field name
- * and value are not copied respectively.  With
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME`, application is responsible to
- * pass header field name in lowercase.  The application should
- * maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * HTTP/2 specification has requirement about header fields in the
- * request HEADERS.  See the specification for more details.
- *
- * If |data_prd| is not ``NULL``, it provides data which will be sent
- * in subsequent DATA frames.  In this case, a method that allows
- * request message bodies
- * (https://tools.ietf.org/html/rfc7231#section-4) must be specified
- * with ``:method`` key in |nva| (e.g. ``POST``).  This function does
- * not take ownership of the |data_prd|.  The function copies the
- * members of the |data_prd|.  If |data_prd| is ``NULL``, HEADERS have
- * END_STREAM set.  The |stream_user_data| is data associated to the
- * stream opened by this request and can be an arbitrary pointer,
- * which can be retrieved later by
- * `nghttp2_session_get_stream_user_data()`.
- *
- * This function returns assigned stream ID if it succeeds, or one of
- * the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
- *     No stream ID is available because maximum stream ID was
- *     reached.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     Trying to depend on itself (new stream ID equals
- *     ``pri_spec->stream_id``).
- * :enum:`NGHTTP2_ERR_PROTO`
- *     The |session| is server session.
- *
- * .. warning::
- *
- *   This function returns assigned stream ID if it succeeds.  But
- *   that stream is not created yet.  The application must not submit
- *   frame to that stream ID before
- *   :type:`nghttp2_before_frame_send_callback` is called for this
- *   frame.  This means `nghttp2_session_get_stream_user_data()` does
- *   not work before the callback.  But
- *   `nghttp2_session_set_stream_user_data()` handles this situation
- *   specially, and it can set data to a stream during this period.
- *
- */
-NGHTTP2_EXTERN int32_t nghttp2_submit_request(
-    nghttp2_session *session, const nghttp2_priority_spec *pri_spec,
-    const nghttp2_nv *nva, size_t nvlen, const nghttp2_data_provider *data_prd,
-    void *stream_user_data);
-
-/**
- * @function
- *
- * Submits response HEADERS frame and optionally one or more DATA
- * frames against the stream |stream_id|.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set, header field name
- * and value are not copied respectively.  With
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME`, application is responsible to
- * pass header field name in lowercase.  The application should
- * maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * HTTP/2 specification has requirement about header fields in the
- * response HEADERS.  See the specification for more details.
- *
- * If |data_prd| is not ``NULL``, it provides data which will be sent
- * in subsequent DATA frames.  This function does not take ownership
- * of the |data_prd|.  The function copies the members of the
- * |data_prd|.  If |data_prd| is ``NULL``, HEADERS will have
- * END_STREAM flag set.
- *
- * This method can be used as normal HTTP response and push response.
- * When pushing a resource using this function, the |session| must be
- * configured using `nghttp2_session_server_new()` or its variants and
- * the target stream denoted by the |stream_id| must be reserved using
- * `nghttp2_submit_push_promise()`.
- *
- * To send non-final response headers (e.g., HTTP status 101), don't
- * use this function because this function half-closes the outbound
- * stream.  Instead, use `nghttp2_submit_headers()` for this purpose.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`NGHTTP2_ERR_DATA_EXIST`
- *     DATA or HEADERS has been already submitted and not fully
- *     processed yet.  Normally, this does not happen, but when
- *     application wrongly calls `nghttp2_submit_response()` twice,
- *     this may happen.
- * :enum:`NGHTTP2_ERR_PROTO`
- *     The |session| is client session.
- *
- * .. warning::
- *
- *   Calling this function twice for the same stream ID may lead to
- *   program crash.  It is generally considered to a programming error
- *   to commit response twice.
- */
-NGHTTP2_EXTERN int
-nghttp2_submit_response(nghttp2_session *session, int32_t stream_id,
-                        const nghttp2_nv *nva, size_t nvlen,
-                        const nghttp2_data_provider *data_prd);
-
-/**
- * @function
- *
- * Submits trailer fields HEADERS against the stream |stream_id|.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application must not include pseudo-header
- * fields (headers whose names starts with ":") in |nva|.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set, header field name
- * and value are not copied respectively.  With
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME`, application is responsible to
- * pass header field name in lowercase.  The application should
- * maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * For server, trailer fields must follow response HEADERS or response
- * DATA without END_STREAM flat set.  The library does not enforce
- * this requirement, and applications should do this for themselves.
- * If `nghttp2_submit_trailer()` is called before any response HEADERS
- * submission (usually by `nghttp2_submit_response()`), the content of
- * |nva| will be sent as response headers, which will result in error.
- *
- * This function has the same effect with `nghttp2_submit_headers()`,
- * with flags = :enum:`NGHTTP2_FLAG_END_STREAM` and both pri_spec and
- * stream_user_data to NULL.
- *
- * To submit trailer fields after `nghttp2_submit_response()` is
- * called, the application has to specify
- * :type:`nghttp2_data_provider` to `nghttp2_submit_response()`.
- * Inside of :type:`nghttp2_data_source_read_callback`, when setting
- * :enum:`NGHTTP2_DATA_FLAG_EOF`, also set
- * :enum:`NGHTTP2_DATA_FLAG_NO_END_STREAM`.  After that, the
- * application can send trailer fields using
- * `nghttp2_submit_trailer()`.  `nghttp2_submit_trailer()` can be used
- * inside :type:`nghttp2_data_source_read_callback`.
- *
- * This function returns 0 if it succeeds and |stream_id| is -1.
- * Otherwise, this function returns 0 if it succeeds, or one of the
- * following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- */
-NGHTTP2_EXTERN int nghttp2_submit_trailer(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          const nghttp2_nv *nva, size_t nvlen);
-
-/**
- * @function
- *
- * Submits HEADERS frame. The |flags| is bitwise OR of the
- * following values:
- *
- * * :enum:`NGHTTP2_FLAG_END_STREAM`
- *
- * If |flags| includes :enum:`NGHTTP2_FLAG_END_STREAM`, this frame has
- * END_STREAM flag set.
- *
- * The library handles the CONTINUATION frame internally and it
- * correctly sets END_HEADERS to the last sequence of the PUSH_PROMISE
- * or CONTINUATION frame.
- *
- * If the |stream_id| is -1, this frame is assumed as request (i.e.,
- * request HEADERS frame which opens new stream).  In this case, the
- * assigned stream ID will be returned.  Otherwise, specify stream ID
- * in |stream_id|.
- *
- * The |pri_spec| is priority specification of this request.  ``NULL``
- * means the default priority (see
- * `nghttp2_priority_spec_default_init()`).  To specify the priority,
- * use `nghttp2_priority_spec_init()`.  If |pri_spec| is not ``NULL``,
- * this function will copy its data members.
- *
- * The ``pri_spec->weight`` must be in [:enum:`NGHTTP2_MIN_WEIGHT`,
- * :enum:`NGHTTP2_MAX_WEIGHT`], inclusive.  If ``pri_spec->weight`` is
- * strictly less than :enum:`NGHTTP2_MIN_WEIGHT`, it becomes
- * :enum:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
- * :enum:`NGHTTP2_MAX_WEIGHT`, it becomes :enum:`NGHTTP2_MAX_WEIGHT`.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set, header field name
- * and value are not copied respectively.  With
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME`, application is responsible to
- * pass header field name in lowercase.  The application should
- * maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * The |stream_user_data| is a pointer to an arbitrary data which is
- * associated to the stream this frame will open.  Therefore it is
- * only used if this frame opens streams, in other words, it changes
- * stream state from idle or reserved to open.
- *
- * This function is low-level in a sense that the application code can
- * specify flags directly.  For usual HTTP request,
- * `nghttp2_submit_request()` is useful.  Likewise, for HTTP response,
- * prefer `nghttp2_submit_response()`.
- *
- * This function returns newly assigned stream ID if it succeeds and
- * |stream_id| is -1.  Otherwise, this function returns 0 if it
- * succeeds, or one of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
- *     No stream ID is available because maximum stream ID was
- *     reached.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0; or trying to depend on itself (stream ID
- *     equals ``pri_spec->stream_id``).
- * :enum:`NGHTTP2_ERR_DATA_EXIST`
- *     DATA or HEADERS has been already submitted and not fully
- *     processed yet.  This happens if stream denoted by |stream_id|
- *     is in reserved state.
- * :enum:`NGHTTP2_ERR_PROTO`
- *     The |stream_id| is -1, and |session| is server session.
- *
- * .. warning::
- *
- *   This function returns assigned stream ID if it succeeds and
- *   |stream_id| is -1.  But that stream is not opened yet.  The
- *   application must not submit frame to that stream ID before
- *   :type:`nghttp2_before_frame_send_callback` is called for this
- *   frame.
- *
- */
-NGHTTP2_EXTERN int32_t nghttp2_submit_headers(
-    nghttp2_session *session, uint8_t flags, int32_t stream_id,
-    const nghttp2_priority_spec *pri_spec, const nghttp2_nv *nva, size_t nvlen,
-    void *stream_user_data);
-
-/**
- * @function
- *
- * Submits one or more DATA frames to the stream |stream_id|.  The
- * data to be sent are provided by |data_prd|.  If |flags| contains
- * :enum:`NGHTTP2_FLAG_END_STREAM`, the last DATA frame has END_STREAM
- * flag set.
- *
- * This function does not take ownership of the |data_prd|.  The
- * function copies the members of the |data_prd|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_DATA_EXIST`
- *     DATA or HEADERS has been already submitted and not fully
- *     processed yet.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`NGHTTP2_ERR_STREAM_CLOSED`
- *     The stream was already closed; or the |stream_id| is invalid.
- *
- * .. note::
- *
- *   Currently, only one DATA or HEADERS is allowed for a stream at a
- *   time.  Submitting these frames more than once before first DATA
- *   or HEADERS is finished results in :enum:`NGHTTP2_ERR_DATA_EXIST`
- *   error code.  The earliest callback which tells that previous
- *   frame is done is :type:`nghttp2_on_frame_send_callback`.  In side
- *   that callback, new data can be submitted using
- *   `nghttp2_submit_data()`.  Of course, all data except for last one
- *   must not have :enum:`NGHTTP2_FLAG_END_STREAM` flag set in
- *   |flags|.  This sounds a bit complicated, and we recommend to use
- *   `nghttp2_submit_request()` and `nghttp2_submit_response()` to
- *   avoid this cascading issue.  The experience shows that for HTTP
- *   use, these two functions are enough to implement both client and
- *   server.
- */
-NGHTTP2_EXTERN int nghttp2_submit_data(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id,
-                                       const nghttp2_data_provider *data_prd);
-
-/**
- * @function
- *
- * Submits PRIORITY frame to change the priority of stream |stream_id|
- * to the priority specification |pri_spec|.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * The |pri_spec| is priority specification of this request.  ``NULL``
- * is not allowed for this function. To specify the priority, use
- * `nghttp2_priority_spec_init()`.  This function will copy its data
- * members.
- *
- * The ``pri_spec->weight`` must be in [:enum:`NGHTTP2_MIN_WEIGHT`,
- * :enum:`NGHTTP2_MAX_WEIGHT`], inclusive.  If ``pri_spec->weight`` is
- * strictly less than :enum:`NGHTTP2_MIN_WEIGHT`, it becomes
- * :enum:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
- * :enum:`NGHTTP2_MAX_WEIGHT`, it becomes :enum:`NGHTTP2_MAX_WEIGHT`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0; or the |pri_spec| is NULL; or trying to
- *     depend on itself.
- */
-NGHTTP2_EXTERN int
-nghttp2_submit_priority(nghttp2_session *session, uint8_t flags,
-                        int32_t stream_id,
-                        const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Submits RST_STREAM frame to cancel/reject the stream |stream_id|
- * with the error code |error_code|.
- *
- * The pre-defined error code is one of :enum:`nghttp2_error_code`.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- */
-NGHTTP2_EXTERN int nghttp2_submit_rst_stream(nghttp2_session *session,
-                                             uint8_t flags, int32_t stream_id,
-                                             uint32_t error_code);
-
-/**
- * @function
- *
- * Stores local settings and submits SETTINGS frame.  The |iv| is the
- * pointer to the array of :type:`nghttp2_settings_entry`.  The |niv|
- * indicates the number of :type:`nghttp2_settings_entry`.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * This function does not take ownership of the |iv|.  This function
- * copies all the elements in the |iv|.
- *
- * While updating individual stream's local window size, if the window
- * size becomes strictly larger than NGHTTP2_MAX_WINDOW_SIZE,
- * RST_STREAM is issued against such a stream.
- *
- * SETTINGS with :enum:`NGHTTP2_FLAG_ACK` is automatically submitted
- * by the library and application could not send it at its will.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |iv| contains invalid value (e.g., initial window size
- *     strictly greater than (1 << 31) - 1.
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_submit_settings(nghttp2_session *session,
-                                           uint8_t flags,
-                                           const nghttp2_settings_entry *iv,
-                                           size_t niv);
-
-/**
- * @function
- *
- * Submits PUSH_PROMISE frame.
- *
- * The |flags| is currently ignored.  The library handles the
- * CONTINUATION frame internally and it correctly sets END_HEADERS to
- * the last sequence of the PUSH_PROMISE or CONTINUATION frame.
- *
- * The |stream_id| must be client initiated stream ID.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set, header field name
- * and value are not copied respectively.  With
- * :enum:`NGHTTP2_NV_FLAG_NO_COPY_NAME`, application is responsible to
- * pass header field name in lowercase.  The application should
- * maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * The |promised_stream_user_data| is a pointer to an arbitrary data
- * which is associated to the promised stream this frame will open and
- * make it in reserved state.  It is available using
- * `nghttp2_session_get_stream_user_data()`.  The application can
- * access it in :type:`nghttp2_before_frame_send_callback` and
- * :type:`nghttp2_on_frame_send_callback` of this frame.
- *
- * The client side is not allowed to use this function.
- *
- * To submit response headers and data, use
- * `nghttp2_submit_response()`.
- *
- * This function returns assigned promised stream ID if it succeeds,
- * or one of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_PROTO`
- *     This function was invoked when |session| is initialized as
- *     client.
- * :enum:`NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
- *     No stream ID is available because maximum stream ID was
- *     reached.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0; The |stream_id| does not designate stream
- *     that peer initiated.
- * :enum:`NGHTTP2_ERR_STREAM_CLOSED`
- *     The stream was already closed; or the |stream_id| is invalid.
- *
- * .. warning::
- *
- *   This function returns assigned promised stream ID if it succeeds.
- *   As of 1.16.0, stream object for pushed resource is created when
- *   this function succeeds.  In that case, the application can submit
- *   push response for the promised frame.
- *
- *   In 1.15.0 or prior versions, pushed stream is not opened yet when
- *   this function succeeds.  The application must not submit frame to
- *   that stream ID before :type:`nghttp2_before_frame_send_callback`
- *   is called for this frame.
- *
- */
-NGHTTP2_EXTERN int32_t nghttp2_submit_push_promise(
-    nghttp2_session *session, uint8_t flags, int32_t stream_id,
-    const nghttp2_nv *nva, size_t nvlen, void *promised_stream_user_data);
-
-/**
- * @function
- *
- * Submits PING frame.  You don't have to send PING back when you
- * received PING frame.  The library automatically submits PING frame
- * in this case.
- *
- * The |flags| is bitwise OR of 0 or more of the following value.
- *
- * * :enum:`NGHTTP2_FLAG_ACK`
- *
- * Unless `nghttp2_option_set_no_auto_ping_ack()` is used, the |flags|
- * should be :enum:`NGHTTP2_FLAG_NONE`.
- *
- * If the |opaque_data| is non ``NULL``, then it should point to the 8
- * bytes array of memory to specify opaque data to send with PING
- * frame.  If the |opaque_data| is ``NULL``, zero-cleared 8 bytes will
- * be sent as opaque data.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_submit_ping(nghttp2_session *session, uint8_t flags,
-                                       const uint8_t *opaque_data);
-
-/**
- * @function
- *
- * Submits GOAWAY frame with the last stream ID |last_stream_id| and
- * the error code |error_code|.
- *
- * The pre-defined error code is one of :enum:`nghttp2_error_code`.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * The |last_stream_id| is peer's stream ID or 0.  So if |session| is
- * initialized as client, |last_stream_id| must be even or 0.  If
- * |session| is initialized as server, |last_stream_id| must be odd or
- * 0.
- *
- * The HTTP/2 specification says last_stream_id must not be increased
- * from the value previously sent.  So the actual value sent as
- * last_stream_id is the minimum value between the given
- * |last_stream_id| and the last_stream_id previously sent to the
- * peer.
- *
- * If the |opaque_data| is not ``NULL`` and |opaque_data_len| is not
- * zero, those data will be sent as additional debug data.  The
- * library makes a copy of the memory region pointed by |opaque_data|
- * with the length |opaque_data_len|, so the caller does not need to
- * keep this memory after the return of this function.  If the
- * |opaque_data_len| is 0, the |opaque_data| could be ``NULL``.
- *
- * After successful transmission of GOAWAY, following things happen.
- * All incoming streams having strictly more than |last_stream_id| are
- * closed.  All incoming HEADERS which starts new stream are simply
- * ignored.  After all active streams are handled, both
- * `nghttp2_session_want_read()` and `nghttp2_session_want_write()`
- * return 0 and the application can close session.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |opaque_data_len| is too large; the |last_stream_id| is
- *     invalid.
- */
-NGHTTP2_EXTERN int nghttp2_submit_goaway(nghttp2_session *session,
-                                         uint8_t flags, int32_t last_stream_id,
-                                         uint32_t error_code,
-                                         const uint8_t *opaque_data,
-                                         size_t opaque_data_len);
-
-/**
- * @function
- *
- * Returns the last stream ID of a stream for which
- * :type:`nghttp2_on_frame_recv_callback` was invoked most recently.
- * The returned value can be used as last_stream_id parameter for
- * `nghttp2_submit_goaway()` and
- * `nghttp2_session_terminate_session2()`.
- *
- * This function always succeeds.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_last_proc_stream_id(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns nonzero if new request can be sent from local endpoint.
- *
- * This function return 0 if request is not allowed for this session.
- * There are several reasons why request is not allowed.  Some of the
- * reasons are: session is server; stream ID has been spent; GOAWAY
- * has been sent or received.
- *
- * The application can call `nghttp2_submit_request()` without
- * consulting this function.  In that case, `nghttp2_submit_request()`
- * may return error.  Or, request is failed to sent, and
- * :type:`nghttp2_on_stream_close_callback` is called.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_check_request_allowed(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns nonzero if |session| is initialized as server side session.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_check_server_session(nghttp2_session *session);
-
-/**
- * @function
- *
- * Submits WINDOW_UPDATE frame.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * The |stream_id| is the stream ID to send this WINDOW_UPDATE.  To
- * send connection level WINDOW_UPDATE, specify 0 to |stream_id|.
- *
- * If the |window_size_increment| is positive, the WINDOW_UPDATE with
- * that value as window_size_increment is queued.  If the
- * |window_size_increment| is larger than the received bytes from the
- * remote endpoint, the local window size is increased by that
- * difference.  If the sole purpose is to increase the local window
- * size, consider to use `nghttp2_session_set_local_window_size()`.
- *
- * If the |window_size_increment| is negative, the local window size
- * is decreased by -|window_size_increment|.  If automatic
- * WINDOW_UPDATE is enabled
- * (`nghttp2_option_set_no_auto_window_update()`), and the library
- * decided that the WINDOW_UPDATE should be submitted, then
- * WINDOW_UPDATE is queued with the current received bytes count.  If
- * the sole purpose is to decrease the local window size, consider to
- * use `nghttp2_session_set_local_window_size()`.
- *
- * If the |window_size_increment| is 0, the function does nothing and
- * returns 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_FLOW_CONTROL`
- *     The local window size overflow or gets negative.
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_submit_window_update(nghttp2_session *session,
-                                                uint8_t flags,
-                                                int32_t stream_id,
-                                                int32_t window_size_increment);
-
-/**
- * @function
- *
- * Set local window size (local endpoints's window size) to the given
- * |window_size| for the given stream denoted by |stream_id|.  To
- * change connection level window size, specify 0 to |stream_id|.  To
- * increase window size, this function may submit WINDOW_UPDATE frame
- * to transmission queue.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * This sounds similar to `nghttp2_submit_window_update()`, but there
- * are 2 differences.  The first difference is that this function
- * takes the absolute value of window size to set, rather than the
- * delta.  To change the window size, this may be easier to use since
- * the application just declares the intended window size, rather than
- * calculating delta.  The second difference is that
- * `nghttp2_submit_window_update()` affects the received bytes count
- * which has not acked yet.  By the specification of
- * `nghttp2_submit_window_update()`, to strictly increase the local
- * window size, we have to submit delta including all received bytes
- * count, which might not be desirable in some cases.  On the other
- * hand, this function does not affect the received bytes count.  It
- * just sets the local window size to the given value.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is negative.
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_set_local_window_size(nghttp2_session *session, uint8_t flags,
-                                      int32_t stream_id, int32_t window_size);
-
-/**
- * @function
- *
- * Submits extension frame.
- *
- * Application can pass arbitrary frame flags and stream ID in |flags|
- * and |stream_id| respectively.  The |payload| is opaque pointer, and
- * it can be accessible though ``frame->ext.payload`` in
- * :type:`nghttp2_pack_extension_callback`.  The library will not own
- * passed |payload| pointer.
- *
- * The application must set :type:`nghttp2_pack_extension_callback`
- * using `nghttp2_session_callbacks_set_pack_extension_callback()`.
- *
- * The application should retain the memory pointed by |payload| until
- * the transmission of extension frame is done (which is indicated by
- * :type:`nghttp2_on_frame_send_callback`), or transmission fails
- * (which is indicated by :type:`nghttp2_on_frame_not_send_callback`).
- * If application does not touch this memory region after packing it
- * into a wire format, application can free it inside
- * :type:`nghttp2_pack_extension_callback`.
- *
- * The standard HTTP/2 frame cannot be sent with this function, so
- * |type| must be strictly grater than 0x9.  Otherwise, this function
- * will fail with error code :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     If :type:`nghttp2_pack_extension_callback` is not set.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     If  |type| specifies  standard  HTTP/2 frame  type.  The  frame
- *     types  in the  rage [0x0,  0x9], both  inclusive, are  standard
- *     HTTP/2 frame type, and cannot be sent using this function.
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory
- */
-NGHTTP2_EXTERN int nghttp2_submit_extension(nghttp2_session *session,
-                                            uint8_t type, uint8_t flags,
-                                            int32_t stream_id, void *payload);
-
-/**
- * @struct
- *
- * The payload of ALTSVC frame.  ALTSVC frame is a non-critical
- * extension to HTTP/2.  If this frame is received, and
- * `nghttp2_option_set_user_recv_extension_type()` is not set, and
- * `nghttp2_option_set_builtin_recv_extension_type()` is set for
- * :enum:`NGHTTP2_ALTSVC`, ``nghttp2_extension.payload`` will point to
- * this struct.
- *
- * It has the following members:
- */
-typedef struct {
-  /**
-   * The pointer to origin which this alternative service is
-   * associated with.  This is not necessarily NULL-terminated.
-   */
-  uint8_t *origin;
-  /**
-   * The length of the |origin|.
-   */
-  size_t origin_len;
-  /**
-   * The pointer to Alt-Svc field value contained in ALTSVC frame.
-   * This is not necessarily NULL-terminated.
-   */
-  uint8_t *field_value;
-  /**
-   * The length of the |field_value|.
-   */
-  size_t field_value_len;
-} nghttp2_ext_altsvc;
-
-/**
- * @function
- *
- * Submits ALTSVC frame.
- *
- * ALTSVC frame is a non-critical extension to HTTP/2, and defined in
- * `RFC 7383 <https://tools.ietf.org/html/rfc7838#section-4>`_.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * The |origin| points to the origin this alternative service is
- * associated with.  The |origin_len| is the length of the origin.  If
- * |stream_id| is 0, the origin must be specified.  If |stream_id| is
- * not zero, the origin must be empty (in other words, |origin_len|
- * must be 0).
- *
- * The ALTSVC frame is only usable from server side.  If this function
- * is invoked with client side session, this function returns
- * :enum:`NGHTTP2_ERR_INVALID_STATE`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     The function is called from client side session
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The sum of |origin_len| and |field_value_len| is larger than
- *     16382; or |origin_len| is 0 while |stream_id| is 0; or
- *     |origin_len| is not 0 while |stream_id| is not 0.
- */
-NGHTTP2_EXTERN int nghttp2_submit_altsvc(nghttp2_session *session,
-                                         uint8_t flags, int32_t stream_id,
-                                         const uint8_t *origin,
-                                         size_t origin_len,
-                                         const uint8_t *field_value,
-                                         size_t field_value_len);
-
-/**
- * @struct
- *
- * The single entry of an origin.
- */
-typedef struct {
-  /**
-   * The pointer to origin.  No validation is made against this field
-   * by the library.  This is not necessarily NULL-terminated.
-   */
-  uint8_t *origin;
-  /**
-   * The length of the |origin|.
-   */
-  size_t origin_len;
-} nghttp2_origin_entry;
-
-/**
- * @struct
- *
- * The payload of ORIGIN frame.  ORIGIN frame is a non-critical
- * extension to HTTP/2 and defined by `RFC 8336
- * <https://tools.ietf.org/html/rfc8336>`_.
- *
- * If this frame is received, and
- * `nghttp2_option_set_user_recv_extension_type()` is not set, and
- * `nghttp2_option_set_builtin_recv_extension_type()` is set for
- * :enum:`NGHTTP2_ORIGIN`, ``nghttp2_extension.payload`` will point to
- * this struct.
- *
- * It has the following members:
- */
-typedef struct {
-  /**
-   * The number of origins contained in |ov|.
-   */
-  size_t nov;
-  /**
-   * The pointer to the array of origins contained in ORIGIN frame.
-   */
-  nghttp2_origin_entry *ov;
-} nghttp2_ext_origin;
-
-/**
- * @function
- *
- * Submits ORIGIN frame.
- *
- * ORIGIN frame is a non-critical extension to HTTP/2 and defined by
- * `RFC 8336 <https://tools.ietf.org/html/rfc8336>`_.
- *
- * The |flags| is currently ignored and should be
- * :enum:`NGHTTP2_FLAG_NONE`.
- *
- * The |ov| points to the array of origins.  The |nov| specifies the
- * number of origins included in |ov|.  This function creates copies
- * of all elements in |ov|.
- *
- * The ORIGIN frame is only usable by a server.  If this function is
- * invoked with client side session, this function returns
- * :enum:`NGHTTP2_ERR_INVALID_STATE`.
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     The function is called from client side session.
- * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
- *     There are too many origins, or an origin is too large to fit
- *     into a default frame payload.
- */
-NGHTTP2_EXTERN int nghttp2_submit_origin(nghttp2_session *session,
-                                         uint8_t flags,
-                                         const nghttp2_origin_entry *ov,
-                                         size_t nov);
-
-/**
- * @function
- *
- * Compares ``lhs->name`` of length ``lhs->namelen`` bytes and
- * ``rhs->name`` of length ``rhs->namelen`` bytes.  Returns negative
- * integer if ``lhs->name`` is found to be less than ``rhs->name``; or
- * returns positive integer if ``lhs->name`` is found to be greater
- * than ``rhs->name``; or returns 0 otherwise.
- */
-NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs,
-                                           const nghttp2_nv *rhs);
-
-/**
- * @function
- *
- * A helper function for dealing with NPN in client side or ALPN in
- * server side.  The |in| contains peer's protocol list in preferable
- * order.  The format of |in| is length-prefixed and not
- * null-terminated.  For example, ``h2`` and
- * ``http/1.1`` stored in |in| like this::
- *
- *     in[0] = 2
- *     in[1..2] = "h2"
- *     in[3] = 8
- *     in[4..11] = "http/1.1"
- *     inlen = 12
- *
- * The selection algorithm is as follows:
- *
- * 1. If peer's list contains HTTP/2 protocol the library supports,
- *    it is selected and returns 1. The following step is not taken.
- *
- * 2. If peer's list contains ``http/1.1``, this function selects
- *    ``http/1.1`` and returns 0.  The following step is not taken.
- *
- * 3. This function selects nothing and returns -1 (So called
- *    non-overlap case).  In this case, |out| and |outlen| are left
- *    untouched.
- *
- * Selecting ``h2`` means that ``h2`` is written into |*out| and its
- * length (which is 2) is assigned to |*outlen|.
- *
- * For ALPN, refer to https://tools.ietf.org/html/rfc7301
- *
- * See http://technotes.googlecode.com/git/nextprotoneg.html for more
- * details about NPN.
- *
- * For NPN, to use this method you should do something like::
- *
- *     static int select_next_proto_cb(SSL* ssl,
- *                                     unsigned char **out,
- *                                     unsigned char *outlen,
- *                                     const unsigned char *in,
- *                                     unsigned int inlen,
- *                                     void *arg)
- *     {
- *         int rv;
- *         rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
- *         if (rv == -1) {
- *             return SSL_TLSEXT_ERR_NOACK;
- *         }
- *         if (rv == 1) {
- *             ((MyType*)arg)->http2_selected = 1;
- *         }
- *         return SSL_TLSEXT_ERR_OK;
- *     }
- *     ...
- *     SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, my_obj);
- *
- */
-NGHTTP2_EXTERN int nghttp2_select_next_protocol(unsigned char **out,
-                                                unsigned char *outlen,
-                                                const unsigned char *in,
-                                                unsigned int inlen);
-
-/**
- * @function
- *
- * Returns a pointer to a nghttp2_info struct with version information
- * about the run-time library in use.  The |least_version| argument
- * can be set to a 24 bit numerical value for the least accepted
- * version number and if the condition is not met, this function will
- * return a ``NULL``.  Pass in 0 to skip the version checking.
- */
-NGHTTP2_EXTERN nghttp2_info *nghttp2_version(int least_version);
-
-/**
- * @function
- *
- * Returns nonzero if the :type:`nghttp2_error` library error code
- * |lib_error| is fatal.
- */
-NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error_code);
-
-/**
- * @function
- *
- * Returns nonzero if HTTP header field name |name| of length |len| is
- * valid according to http://tools.ietf.org/html/rfc7230#section-3.2
- *
- * Because this is a header field name in HTTP2, the upper cased alphabet
- * is treated as error.
- */
-NGHTTP2_EXTERN int nghttp2_check_header_name(const uint8_t *name, size_t len);
-
-/**
- * @function
- *
- * Returns nonzero if HTTP header field value |value| of length |len|
- * is valid according to
- * http://tools.ietf.org/html/rfc7230#section-3.2
- */
-NGHTTP2_EXTERN int nghttp2_check_header_value(const uint8_t *value, size_t len);
-
-/* HPACK API */
-
-struct nghttp2_hd_deflater;
-
-/**
- * @struct
- *
- * HPACK deflater object.
- */
-typedef struct nghttp2_hd_deflater nghttp2_hd_deflater;
-
-/**
- * @function
- *
- * Initializes |*deflater_ptr| for deflating name/values pairs.
- *
- * The |max_deflate_dynamic_table_size| is the upper bound of header
- * table size the deflater will use.
- *
- * If this function fails, |*deflater_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
-                       size_t max_deflate_dynamic_table_size);
-
-/**
- * @function
- *
- * Like `nghttp2_hd_deflate_new()`, but with additional custom memory
- * allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_hd_deflate_new()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_deflate_new2(nghttp2_hd_deflater **deflater_ptr,
-                        size_t max_deflate_dynamic_table_size,
-                        nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Deallocates any resources allocated for |deflater|.
- */
-NGHTTP2_EXTERN void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater);
-
-/**
- * @function
- *
- * Changes header table size of the |deflater| to
- * |settings_max_dynamic_table_size| bytes.  This may trigger eviction
- * in the dynamic table.
- *
- * The |settings_max_dynamic_table_size| should be the value received
- * in SETTINGS_HEADER_TABLE_SIZE.
- *
- * The deflater never uses more memory than
- * ``max_deflate_dynamic_table_size`` bytes specified in
- * `nghttp2_hd_deflate_new()`.  Therefore, if
- * |settings_max_dynamic_table_size| >
- * ``max_deflate_dynamic_table_size``, resulting maximum table size
- * becomes ``max_deflate_dynamic_table_size``.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_deflate_change_table_size(nghttp2_hd_deflater *deflater,
-                                     size_t settings_max_dynamic_table_size);
-
-/**
- * @function
- *
- * Deflates the |nva|, which has the |nvlen| name/value pairs, into
- * the |buf| of length |buflen|.
- *
- * If |buf| is not large enough to store the deflated header block,
- * this function fails with :enum:`NGHTTP2_ERR_INSUFF_BUFSIZE`.  The
- * caller should use `nghttp2_hd_deflate_bound()` to know the upper
- * bound of buffer size required to deflate given header name/value
- * pairs.
- *
- * Once this function fails, subsequent call of this function always
- * returns :enum:`NGHTTP2_ERR_HEADER_COMP`.
- *
- * After this function returns, it is safe to delete the |nva|.
- *
- * This function returns the number of bytes written to |buf| if it
- * succeeds, or one of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_HEADER_COMP`
- *     Deflation process has failed.
- * :enum:`NGHTTP2_ERR_INSUFF_BUFSIZE`
- *     The provided |buflen| size is too small to hold the output.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
-                                             uint8_t *buf, size_t buflen,
-                                             const nghttp2_nv *nva,
-                                             size_t nvlen);
-
-/**
- * @function
- *
- * Deflates the |nva|, which has the |nvlen| name/value pairs, into
- * the |veclen| size of buf vector |vec|.  The each size of buffer
- * must be set in len field of :type:`nghttp2_vec`.  If and only if
- * one chunk is filled up completely, next chunk will be used.  If
- * |vec| is not large enough to store the deflated header block, this
- * function fails with :enum:`NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
- * should use `nghttp2_hd_deflate_bound()` to know the upper bound of
- * buffer size required to deflate given header name/value pairs.
- *
- * Once this function fails, subsequent call of this function always
- * returns :enum:`NGHTTP2_ERR_HEADER_COMP`.
- *
- * After this function returns, it is safe to delete the |nva|.
- *
- * This function returns the number of bytes written to |vec| if it
- * succeeds, or one of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_HEADER_COMP`
- *     Deflation process has failed.
- * :enum:`NGHTTP2_ERR_INSUFF_BUFSIZE`
- *     The provided |buflen| size is too small to hold the output.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_deflate_hd_vec(nghttp2_hd_deflater *deflater,
-                                                 const nghttp2_vec *vec,
-                                                 size_t veclen,
-                                                 const nghttp2_nv *nva,
-                                                 size_t nvlen);
-
-/**
- * @function
- *
- * Returns an upper bound on the compressed size after deflation of
- * |nva| of length |nvlen|.
- */
-NGHTTP2_EXTERN size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
-                                               const nghttp2_nv *nva,
-                                               size_t nvlen);
-
-/**
- * @function
- *
- * Returns the number of entries that header table of |deflater|
- * contains.  This is the sum of the number of static table and
- * dynamic table, so the return value is at least 61.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_deflate_get_num_table_entries(nghttp2_hd_deflater *deflater);
-
-/**
- * @function
- *
- * Returns the table entry denoted by |idx| from header table of
- * |deflater|.  The |idx| is 1-based, and idx=1 returns first entry of
- * static table.  idx=62 returns first entry of dynamic table if it
- * exists.  Specifying idx=0 is error, and this function returns NULL.
- * If |idx| is strictly greater than the number of entries the tables
- * contain, this function returns NULL.
- */
-NGHTTP2_EXTERN
-const nghttp2_nv *
-nghttp2_hd_deflate_get_table_entry(nghttp2_hd_deflater *deflater, size_t idx);
-
-/**
- * @function
- *
- * Returns the used dynamic table size, including the overhead 32
- * bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_deflate_get_dynamic_table_size(nghttp2_hd_deflater *deflater);
-
-/**
- * @function
- *
- * Returns the maximum dynamic table size.
- */
-NGHTTP2_EXTERN
-size_t
-nghttp2_hd_deflate_get_max_dynamic_table_size(nghttp2_hd_deflater *deflater);
-
-struct nghttp2_hd_inflater;
-
-/**
- * @struct
- *
- * HPACK inflater object.
- */
-typedef struct nghttp2_hd_inflater nghttp2_hd_inflater;
-
-/**
- * @function
- *
- * Initializes |*inflater_ptr| for inflating name/values pairs.
- *
- * If this function fails, |*inflater_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr);
-
-/**
- * @function
- *
- * Like `nghttp2_hd_inflate_new()`, but with additional custom memory
- * allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_hd_inflate_new()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- */
-NGHTTP2_EXTERN int nghttp2_hd_inflate_new2(nghttp2_hd_inflater **inflater_ptr,
-                                           nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Deallocates any resources allocated for |inflater|.
- */
-NGHTTP2_EXTERN void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Changes header table size in the |inflater|.  This may trigger
- * eviction in the dynamic table.
- *
- * The |settings_max_dynamic_table_size| should be the value
- * transmitted in SETTINGS_HEADER_TABLE_SIZE.
- *
- * This function must not be called while header block is being
- * inflated.  In other words, this function must be called after
- * initialization of |inflater|, but before calling
- * `nghttp2_hd_inflate_hd2()`, or after
- * `nghttp2_hd_inflate_end_headers()`.  Otherwise,
- * `NGHTTP2_ERR_INVALID_STATE` was returned.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_INVALID_STATE`
- *     The function is called while header block is being inflated.
- *     Probably, application missed to call
- *     `nghttp2_hd_inflate_end_headers()`.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_inflate_change_table_size(nghttp2_hd_inflater *inflater,
-                                     size_t settings_max_dynamic_table_size);
-
-/**
- * @enum
- *
- * The flags for header inflation.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_HD_INFLATE_NONE = 0,
-  /**
-   * Indicates all headers were inflated.
-   */
-  NGHTTP2_HD_INFLATE_FINAL = 0x01,
-  /**
-   * Indicates a header was emitted.
-   */
-  NGHTTP2_HD_INFLATE_EMIT = 0x02
-} nghttp2_hd_inflate_flag;
-
-/**
- * @function
- *
- * .. warning::
- *
- *   Deprecated.  Use `nghttp2_hd_inflate_hd2()` instead.
- *
- * Inflates name/value block stored in |in| with length |inlen|.  This
- * function performs decompression.  For each successful emission of
- * header name/value pair, :enum:`NGHTTP2_HD_INFLATE_EMIT` is set in
- * |*inflate_flags| and name/value pair is assigned to the |nv_out|
- * and the function returns.  The caller must not free the members of
- * |nv_out|.
- *
- * The |nv_out| may include pointers to the memory region in the |in|.
- * The caller must retain the |in| while the |nv_out| is used.
- *
- * The application should call this function repeatedly until the
- * ``(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL`` is nonzero and
- * return value is non-negative.  This means the all input values are
- * processed successfully.  Then the application must call
- * `nghttp2_hd_inflate_end_headers()` to prepare for the next header
- * block input.
- *
- * The caller can feed complete compressed header block.  It also can
- * feed it in several chunks.  The caller must set |in_final| to
- * nonzero if the given input is the last block of the compressed
- * header.
- *
- * This function returns the number of bytes processed if it succeeds,
- * or one of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_HEADER_COMP`
- *     Inflation process has failed.
- * :enum:`NGHTTP2_ERR_BUFFER_ERROR`
- *     The header field name or value is too large.
- *
- * Example follows::
- *
- *     int inflate_header_block(nghttp2_hd_inflater *hd_inflater,
- *                              uint8_t *in, size_t inlen, int final)
- *     {
- *         ssize_t rv;
- *
- *         for(;;) {
- *             nghttp2_nv nv;
- *             int inflate_flags = 0;
- *
- *             rv = nghttp2_hd_inflate_hd(hd_inflater, &nv, &inflate_flags,
- *                                        in, inlen, final);
- *
- *             if(rv < 0) {
- *                 fprintf(stderr, "inflate failed with error code %zd", rv);
- *                 return -1;
- *             }
- *
- *             in += rv;
- *             inlen -= rv;
- *
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
- *                 fwrite(nv.name, nv.namelen, 1, stderr);
- *                 fprintf(stderr, ": ");
- *                 fwrite(nv.value, nv.valuelen, 1, stderr);
- *                 fprintf(stderr, "\n");
- *             }
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
- *                 nghttp2_hd_inflate_end_headers(hd_inflater);
- *                 break;
- *             }
- *             if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
- *                inlen == 0) {
- *                break;
- *             }
- *         }
- *
- *         return 0;
- *     }
- *
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater,
-                                             nghttp2_nv *nv_out,
-                                             int *inflate_flags, uint8_t *in,
-                                             size_t inlen, int in_final);
-
-/**
- * @function
- *
- * Inflates name/value block stored in |in| with length |inlen|.  This
- * function performs decompression.  For each successful emission of
- * header name/value pair, :enum:`NGHTTP2_HD_INFLATE_EMIT` is set in
- * |*inflate_flags| and name/value pair is assigned to the |nv_out|
- * and the function returns.  The caller must not free the members of
- * |nv_out|.
- *
- * The |nv_out| may include pointers to the memory region in the |in|.
- * The caller must retain the |in| while the |nv_out| is used.
- *
- * The application should call this function repeatedly until the
- * ``(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL`` is nonzero and
- * return value is non-negative.  If that happens, all given input
- * data (|inlen| bytes) are processed successfully.  Then the
- * application must call `nghttp2_hd_inflate_end_headers()` to prepare
- * for the next header block input.
- *
- * In other words, if |in_final| is nonzero, and this function returns
- * |inlen|, you can assert that :enum:`NGHTTP2_HD_INFLATE_FINAL` is
- * set in |*inflate_flags|.
- *
- * The caller can feed complete compressed header block.  It also can
- * feed it in several chunks.  The caller must set |in_final| to
- * nonzero if the given input is the last block of the compressed
- * header.
- *
- * This function returns the number of bytes processed if it succeeds,
- * or one of the following negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`NGHTTP2_ERR_HEADER_COMP`
- *     Inflation process has failed.
- * :enum:`NGHTTP2_ERR_BUFFER_ERROR`
- *     The header field name or value is too large.
- *
- * Example follows::
- *
- *     int inflate_header_block(nghttp2_hd_inflater *hd_inflater,
- *                              uint8_t *in, size_t inlen, int final)
- *     {
- *         ssize_t rv;
- *
- *         for(;;) {
- *             nghttp2_nv nv;
- *             int inflate_flags = 0;
- *
- *             rv = nghttp2_hd_inflate_hd2(hd_inflater, &nv, &inflate_flags,
- *                                         in, inlen, final);
- *
- *             if(rv < 0) {
- *                 fprintf(stderr, "inflate failed with error code %zd", rv);
- *                 return -1;
- *             }
- *
- *             in += rv;
- *             inlen -= rv;
- *
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
- *                 fwrite(nv.name, nv.namelen, 1, stderr);
- *                 fprintf(stderr, ": ");
- *                 fwrite(nv.value, nv.valuelen, 1, stderr);
- *                 fprintf(stderr, "\n");
- *             }
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
- *                 nghttp2_hd_inflate_end_headers(hd_inflater);
- *                 break;
- *             }
- *             if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
- *                inlen == 0) {
- *                break;
- *             }
- *         }
- *
- *         return 0;
- *     }
- *
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
-                                              nghttp2_nv *nv_out,
-                                              int *inflate_flags,
-                                              const uint8_t *in, size_t inlen,
-                                              int in_final);
-
-/**
- * @function
- *
- * Signals the end of decompression for one header block.
- *
- * This function returns 0 if it succeeds. Currently this function
- * always succeeds.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Returns the number of entries that header table of |inflater|
- * contains.  This is the sum of the number of static table and
- * dynamic table, so the return value is at least 61.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_inflate_get_num_table_entries(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Returns the table entry denoted by |idx| from header table of
- * |inflater|.  The |idx| is 1-based, and idx=1 returns first entry of
- * static table.  idx=62 returns first entry of dynamic table if it
- * exists.  Specifying idx=0 is error, and this function returns NULL.
- * If |idx| is strictly greater than the number of entries the tables
- * contain, this function returns NULL.
- */
-NGHTTP2_EXTERN
-const nghttp2_nv *
-nghttp2_hd_inflate_get_table_entry(nghttp2_hd_inflater *inflater, size_t idx);
-
-/**
- * @function
- *
- * Returns the used dynamic table size, including the overhead 32
- * bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_inflate_get_dynamic_table_size(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Returns the maximum dynamic table size.
- */
-NGHTTP2_EXTERN
-size_t
-nghttp2_hd_inflate_get_max_dynamic_table_size(nghttp2_hd_inflater *inflater);
-
-struct nghttp2_stream;
-
-/**
- * @struct
- *
- * The structure to represent HTTP/2 stream.  The details of this
- * structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_stream nghttp2_stream;
-
-/**
- * @function
- *
- * Returns pointer to :type:`nghttp2_stream` object denoted by
- * |stream_id|.  If stream was not found, returns NULL.
- *
- * Returns imaginary root stream (see
- * `nghttp2_session_get_root_stream()`) if 0 is given in |stream_id|.
- *
- * Unless |stream_id| == 0, the returned pointer is valid until next
- * call of `nghttp2_session_send()`, `nghttp2_session_mem_send()`,
- * `nghttp2_session_recv()`, and `nghttp2_session_mem_recv()`.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_session_find_stream(nghttp2_session *session, int32_t stream_id);
-
-/**
- * @enum
- *
- * State of stream as described in RFC 7540.
- */
-typedef enum {
-  /**
-   * idle state.
-   */
-  NGHTTP2_STREAM_STATE_IDLE = 1,
-  /**
-   * open state.
-   */
-  NGHTTP2_STREAM_STATE_OPEN,
-  /**
-   * reserved (local) state.
-   */
-  NGHTTP2_STREAM_STATE_RESERVED_LOCAL,
-  /**
-   * reserved (remote) state.
-   */
-  NGHTTP2_STREAM_STATE_RESERVED_REMOTE,
-  /**
-   * half closed (local) state.
-   */
-  NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL,
-  /**
-   * half closed (remote) state.
-   */
-  NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE,
-  /**
-   * closed state.
-   */
-  NGHTTP2_STREAM_STATE_CLOSED
-} nghttp2_stream_proto_state;
-
-/**
- * @function
- *
- * Returns state of |stream|.  The root stream retrieved by
- * `nghttp2_session_get_root_stream()` will have stream state
- * :enum:`NGHTTP2_STREAM_STATE_IDLE`.
- */
-NGHTTP2_EXTERN nghttp2_stream_proto_state
-nghttp2_stream_get_state(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns root of dependency tree, which is imaginary stream with
- * stream ID 0.  The returned pointer is valid until |session| is
- * freed by `nghttp2_session_del()`.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_session_get_root_stream(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the parent stream of |stream| in dependency tree.  Returns
- * NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_parent(nghttp2_stream *stream);
-
-NGHTTP2_EXTERN int32_t nghttp2_stream_get_stream_id(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the next sibling stream of |stream| in dependency tree.
- * Returns NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_next_sibling(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the previous sibling stream of |stream| in dependency tree.
- * Returns NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_previous_sibling(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the first child stream of |stream| in dependency tree.
- * Returns NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_first_child(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns dependency weight to the parent stream of |stream|.
- */
-NGHTTP2_EXTERN int32_t nghttp2_stream_get_weight(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the sum of the weight for |stream|'s children.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_stream_get_sum_dependency_weight(nghttp2_stream *stream);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the library outputs debug logging.
- * The function is called with arguments suitable for ``vfprintf(3)``
- *
- * The debug output is only enabled if the library is built with
- * ``DEBUGBUILD`` macro defined.
- */
-typedef void (*nghttp2_debug_vprintf_callback)(const char *format,
-                                               va_list args);
-
-/**
- * @function
- *
- * Sets a debug output callback called by the library when built with
- * ``DEBUGBUILD`` macro defined.  If this option is not used, debug
- * log is written into standard error output.
- *
- * For builds without ``DEBUGBUILD`` macro defined, this function is
- * noop.
- *
- * Note that building with ``DEBUGBUILD`` may cause significant
- * performance penalty to libnghttp2 because of extra processing.  It
- * should be used for debugging purpose only.
- *
- * .. Warning::
- *
- *   Building with ``DEBUGBUILD`` may cause significant performance
- *   penalty to libnghttp2 because of extra processing.  It should be
- *   used for debugging purpose only.  We write this two times because
- *   this is important.
- */
-NGHTTP2_EXTERN void nghttp2_set_debug_vprintf_callback(
-    nghttp2_debug_vprintf_callback debug_vprintf_callback);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NGHTTP2_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2ver.h.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2ver.h.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2ver.h.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/includes/nghttp2/nghttp2ver.h.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2VER_H
-#define NGHTTP2VER_H
-
-/**
- * @macro
- * Version number of the nghttp2 library release
- */
-#define NGHTTP2_VERSION "@PACKAGE_VERSION@"
-
-/**
- * @macro
- * Numerical representation of the version number of the nghttp2 library
- * release. This is a 24 bit number with 8 bits for major number, 8 bits
- * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
- */
-#define NGHTTP2_VERSION_NUM @PACKAGE_VERSION_NUM@
-
-#endif /* NGHTTP2VER_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/libnghttp2.pc.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/libnghttp2.pc.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/libnghttp2.pc.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/libnghttp2.pc.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libnghttp2
-Description: HTTP/2 C library
-URL: https://github.com/tatsuhiro-t/nghttp2
-Version: @VERSION@
-Libs: -L${libdir} -lnghttp2
-Cflags: -I${includedir}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = includes
-
-EXTRA_DIST = Makefile.msvc CMakeLists.txt version.rc.in
-
-AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
-AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
-	@DEFS@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnghttp2.pc
-DISTCLEANFILES = $(pkgconfig_DATA)
-
-lib_LTLIBRARIES = libnghttp2.la
-
-OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
-	nghttp2_frame.c \
-	nghttp2_buf.c \
-	nghttp2_stream.c nghttp2_outbound_item.c \
-	nghttp2_session.c nghttp2_submit.c \
-	nghttp2_helper.c \
-	nghttp2_npn.c \
-	nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c \
-	nghttp2_version.c \
-	nghttp2_priority_spec.c \
-	nghttp2_option.c \
-	nghttp2_callbacks.c \
-	nghttp2_mem.c \
-	nghttp2_http.c \
-	nghttp2_rcbuf.c \
-	nghttp2_debug.c
-
-HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
-	nghttp2_frame.h \
-	nghttp2_buf.h \
-	nghttp2_session.h nghttp2_helper.h nghttp2_stream.h nghttp2_int.h \
-	nghttp2_npn.h \
-	nghttp2_submit.h nghttp2_outbound_item.h \
-	nghttp2_net.h \
-	nghttp2_hd.h nghttp2_hd_huffman.h \
-	nghttp2_priority_spec.h \
-	nghttp2_option.h \
-	nghttp2_callbacks.h \
-	nghttp2_mem.h \
-	nghttp2_http.h \
-	nghttp2_rcbuf.h \
-	nghttp2_debug.h
-
-libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
-libnghttp2_la_LDFLAGS = -no-undefined \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.msvc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.msvc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.msvc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/Makefile.msvc	1970-01-01 00:00:00.000000000 +0000
@@ -1,286 +0,0 @@
-#
-# GNU Makefile for nghttp2 / MSVC.
-#
-# By G. Vanem <gvanem@yahoo.no> 2013
-# Updated 3/2015 by Remo Eichenberger @remoe
-# The MIT License apply.
-#
-
-#
-# Choose your weapons:
-#  Set 'USE_CYTHON=1' to build and install the 'nghttp2.pyd' Python extension.
-#
-THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-
-USE_CYTHON := 0
-#USE_CYTHON := 1
-
-_VERSION	:= $(shell grep AC_INIT ../configure.ac | cut -d'[' -f3 | sed -e 's/-DEV//g' -e 's/], //g')
-_VERSION   	:= $(subst ., ,$(_VERSION))
-VER_MAJOR  	:= $(word 1,$(_VERSION))
-VER_MINOR  	:= $(word 2,$(_VERSION))
-VER_MICRO   := $(word 3,$(_VERSION))
-VERSION     := $(VER_MAJOR).$(VER_MINOR).$(VER_MICRO)
-VERSION_NUM := (($(VER_MAJOR) << 16) + ($(VER_MINOR) << 8) + $(VER_MICRO))
-
-GENERATED   := 'Generated by $(realpath Makefile.MSVC)'
-
-OBJ_DIR := MSVC_obj
-#SUFFIX :=-vc90-mt-x86
-
-#
-# Where to copy nghttp2.dll + lib + headers to.
-# Note: 'make install' is not in default targets. Do it explicitly.
-#
-TARGET_DIR  ?= ../_VC_ROOT
-VC_ROOT     := $(abspath $(TARGET_DIR))
-INSTALL_BIN := $(VC_ROOT)/bin
-INSTALL_LIB := $(VC_ROOT)/lib
-INSTALL_HDR := $(VC_ROOT)/include
-DLL_R	:= $(OBJ_DIR)/nghttp2$(SUFFIX).dll
-DLL_D	:= $(OBJ_DIR)/nghttp2d$(SUFFIX).dll
-LIB_R	:= $(OBJ_DIR)/nghttp2-static.lib
-LIB_D	:= $(OBJ_DIR)/nghttp2d-static.lib
-IMP_R	:= $(OBJ_DIR)/nghttp2.lib
-IMP_D	:= $(OBJ_DIR)/nghttp2d.lib
-
-#
-# Build for DEBUG-model and RELEASE at the same time.
-#
-TARGETS := $(LIB_R) $(DLL_R) $(IMP_R) \
-          $(LIB_D) $(DLL_D) $(IMP_D)
-
-EXT_LIBS = 
-
-NGHTTP2_PDB_R := $(OBJ_DIR)/nghttp2.pdb
-NGHTTP2_PDB_D := $(OBJ_DIR)/nghttp2d.pdb
-
-CC       = cl
-LD		 := link
-AR		 := lib
-#CC       := icl
-#LD		 := xilink
-#AR		 := xilib
-RC		 := rc
-CFLAGS   := -I./includes -Dssize_t=long
-
-CFLAGS_R := -nologo -MD  -W3 -Z7 -DBUILDING_NGHTTP2
-CFLAGS_D := -nologo -MDd -W3 -Z7 -DBUILDING_NGHTTP2 \
-           -Ot -D_DEBUG -GF -RTCs -RTCu # -RTCc -GS
-
-LDFLAGS := -nologo -MAP -debug -incremental:no -opt:ref,icf -MANIFEST # -verbose
-
-
-NGHTTP2_SRC := nghttp2_pq.c \
-  nghttp2_map.c \
-  nghttp2_queue.c \
-  nghttp2_frame.c \
-  nghttp2_buf.c \
-  nghttp2_stream.c \
-  nghttp2_outbound_item.c \
-  nghttp2_session.c \
-  nghttp2_submit.c \
-  nghttp2_helper.c \
-  nghttp2_npn.c \
-  nghttp2_hd.c \
-  nghttp2_hd_huffman.c \
-  nghttp2_hd_huffman_data.c \
-  nghttp2_version.c \
-  nghttp2_priority_spec.c \
-  nghttp2_option.c \
-  nghttp2_callbacks.c \
-  nghttp2_mem.c \
-  nghttp2_http.c \
-  nghttp2_rcbuf.c
-
-NGHTTP2_OBJ_R := $(addprefix $(OBJ_DIR)/r_, $(notdir $(NGHTTP2_SRC:.c=.obj)))
-NGHTTP2_OBJ_D := $(addprefix $(OBJ_DIR)/d_, $(notdir $(NGHTTP2_SRC:.c=.obj)))
-
-.PHONY: all intro test_ver install copy_headers_and_libs \
-	install_nghttp2_pyd_0 install_nghttp2_pyd_1 \
-	build_nghttp2_pyd_0 build_nghttp2_pyd_1 \
-	clean_nghttp2_pyd_0 clean_nghttp2_pyd_1
-
-
-all: intro includes/nghttp2/nghttp2ver.h $(OBJ_DIR) $(TARGETS) build_nghttp2_pyd_$(USE_CYTHON)
-	@echo 'Welcome to NgHTTP2 (release + debug).'
-	@echo 'Do a "make -f Makefile.MSVC install" at own risk!'
-
-intro:
-	@echo 'Building NgHTTP (MSVC) ver. "$(VERSION)".'
-
-test_ver:
-	@echo '$$(VERSION):   "$(VERSION)".'
-	@echo '$$(_VERSION):  "$(_VERSION)".'
-	@echo '$$(VER_MAJOR): "$(VER_MAJOR)".'
-	@echo '$$(VER_MINOR): "$(VER_MINOR)".'
-	@echo '$$(VER_MICRO): "$(VER_MICRO)".'
-
-$(OBJ_DIR):
-	- mkdir $(OBJ_DIR)
-
-install: includes/nghttp2/nghttp2.h includes/nghttp2/nghttp2ver.h \
-         $(TARGETS) \
-         copy_headers_and_libs install_nghttp2_pyd_$(USE_CYTHON) 
-
-#
-# This MUST be done before using the 'install_nghttp2_pyd_1' rule.
-#
-copy_headers_and_libs:
-	- mkdir -p $(INSTALL_HDR)/nghttp2 $(INSTALL_BIN) $(INSTALL_LIB)
-	cp --update $(addprefix includes/nghttp2/, nghttp2.h nghttp2ver.h)     $(INSTALL_HDR)/nghttp2
-	cp --update $(DLL_R) $(DLL_D) $(NGHTTP2_PDB_R) $(NGHTTP2_PDB_D) $(INSTALL_BIN)
-	cp --update $(IMP_R) $(IMP_D) $(LIB_R) $(LIB_D) $(INSTALL_LIB)
-	@echo
-
-$(LIB_R): $(NGHTTP2_OBJ_R)
-	$(AR) -nologo -out:$@ $^
-	@echo
-
-$(LIB_D): $(NGHTTP2_OBJ_D)
-	$(AR) -nologo -out:$@ $^
-	@echo
-
-
-$(IMP_R): $(DLL_R)
-
-$(DLL_R): $(NGHTTP2_OBJ_R) $(OBJ_DIR)/r_nghttp2.res 
-	$(LD) $(LDFLAGS) -dll -out:$@ -implib:$(IMP_R) $(NGHTTP2_OBJ_R) -PDB:$(NGHTTP2_PDB_R) $(OBJ_DIR)/r_nghttp2.res $(EXT_LIBS)
-	mt -nologo -manifest $@.manifest -outputresource:$@\;2
-	@echo
-
-$(IMP_D): $(DLL_D)
-	
-$(DLL_D): $(NGHTTP2_OBJ_D) $(OBJ_DIR)/d_nghttp2.res 
-	$(LD) $(LDFLAGS) -dll -out:$@ -implib:$(IMP_D) $(NGHTTP2_OBJ_D) -PDB:$(NGHTTP2_PDB_D) $(OBJ_DIR)/d_nghttp2.res $(EXT_LIBS)
-	mt -nologo -manifest $@.manifest -outputresource:$@\;2
-	@echo
-
-
-WIN_OBJDIR:=$(shell cygpath -w $(abspath $(OBJ_DIR)))
-WIN_OBJDIR:=$(subst \,/,$(WIN_OBJDIR))
-
-../python/setup.py: ../python/setup.py.in $(THIS_MAKEFILE)
-	cd ../python ; \
-	echo '# $(GENERATED). DO NOT EDIT.' > setup.py ; \
-	sed -e 's/@top_srcdir@/../'   \
-	    -e 's%@top_builddir@%$(WIN_OBJDIR)%' \
-	    -e 's/@PACKAGE_VERSION@/$(VERSION)/' setup.py.in >> setup.py ;
-
-build_nghttp2_pyd_0: ;
-
-build_nghttp2_pyd_1: $(addprefix ../python/, setup.py nghttp2.pyx)
-	cd ../python ; \
-	python setup.py build_ext -i -f bdist_wininst
-
-install_nghttp2_pyd_0: ;
-		
-install_nghttp2_pyd_1: $(addprefix ../python/, setup.py nghttp2.pyx)
-	cd ../python ; \
-	pip install .
-
-clean_nghttp2_pyd_0: ;
-
-clean_nghttp2_pyd_1:
-	cd ../python ; \
-	rm -fR build dist
-
-$(OBJ_DIR)/r_%.obj: %.c $(THIS_MAKEFILE)
-	$(CC) $(CFLAGS_R) $(CFLAGS) -Fo$@ -c $<
-	@echo
-
-$(OBJ_DIR)/d_%.obj: %.c $(THIS_MAKEFILE)
-	$(CC) $(CFLAGS_D) $(CFLAGS) -Fo$@ -c $<
-	@echo
-
-$(OBJ_DIR)/r_nghttp2.res: $(OBJ_DIR)/nghttp2.rc $(THIS_MAKEFILE)
-	$(RC) -D_RELEASE -Fo $@ $<
-	@echo
-
-$(OBJ_DIR)/d_nghttp2.res: $(OBJ_DIR)/nghttp2.rc $(THIS_MAKEFILE)
-	$(RC) -D_DEBUG -Fo $@ $<
-	@echo
-
-includes/nghttp2/nghttp2ver.h: includes/nghttp2/nghttp2ver.h.in $(THIS_MAKEFILE)
-	sed < includes/nghttp2/nghttp2ver.h.in     \
-	     -e 's/@PACKAGE_VERSION@/$(VERSION)/g' \
-	     -e 's/@PACKAGE_VERSION_NUM@/$(VERSION_NUM)/g' > $@
-	touch --reference=includes/nghttp2/nghttp2ver.h.in $@
-
-
-define RES_FILE
-  #include <winver.h>
-
-  VS_VERSION_INFO VERSIONINFO
-    FILEVERSION    $(VER_MAJOR), $(VER_MINOR), $(VER_MICRO), 0
-    PRODUCTVERSION $(VER_MAJOR), $(VER_MINOR), $(VER_MICRO), 0
-    FILEFLAGSMASK  0x3fL
-    FILEOS         0x40004L
-    FILETYPE       0x2L
-    FILESUBTYPE    0x0L
-  #ifdef _DEBUG
-    #define        VER_STR  "$(VERSION).0 (MSVC debug)"
-    #define        DBG      "d"
-    FILEFLAGS      0x1L
-  #else
-    #define        VER_STR  "$(VERSION).0 (MSVC release)"
-    #define        DBG      ""
-    FILEFLAGS      0x0L
-  #endif
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904b0"
-      BEGIN
-        VALUE "CompanyName",      "http://tatsuhiro-t.github.io/nghttp2/"
-        VALUE "FileDescription",  "nghttp2; HTTP/2 C library"
-        VALUE "FileVersion",      VER_STR
-        VALUE "InternalName",     "nghttp2" DBG
-        VALUE "LegalCopyright",   "The MIT License"
-        VALUE "LegalTrademarks",  ""
-        VALUE "OriginalFilename", "nghttp2" DBG ".dll"
-        VALUE "ProductName",      "NGHTTP2."
-        VALUE "ProductVersion",   VER_STR
-      END
-    END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1200
-  END
-  END
-endef
-
-export RES_FILE
-
-$(OBJ_DIR)/nghttp2.rc: Makefile.MSVC
-	@echo 'Generating $@...'
-	@echo ' /* $(GENERATED). DO NOT EDIT.' > $@
-	@echo '  */'                          >> $@
-	@echo "$$RES_FILE"                    >> $@
-
-clean:
-	rm -f $(OBJ_DIR)/* includes/nghttp2/nghttp2ver.h
-	@echo
-
-vclean realclean: clean clean_nghttp2_pyd_$(USE_CYTHON)
-	- rm -rf $(OBJ_DIR)
-	- rm -f .depend.MSVC
-
-#
-# Use gcc to generated the dependencies. No MSVC specific args please!
-#
-REPLACE_R = 's/\(.*\)\.o: /\n$$(OBJ_DIR)\/r_\1.obj: /'
-REPLACE_D = 's/\(.*\)\.o: /\n$$(OBJ_DIR)\/d_\1.obj: /'
-
-depend: includes/nghttp2/nghttp2ver.h
-	@echo '# $(GENERATED). DO NOT EDIT.' > .depend.MSVC
-	gcc -MM $(CFLAGS) $(NGHTTP2_SRC)    >> .depend.tmp
-	@echo '#'                           >> .depend.MSVC
-	@echo '# Release lib objects:'      >> .depend.MSVC
-	sed -e $(REPLACE_R) .depend.tmp     >> .depend.MSVC
-	@echo '#'                           >> .depend.MSVC
-	@echo '# Debug lib objects:'        >> .depend.MSVC
-	sed -e $(REPLACE_D) .depend.tmp     >> .depend.MSVC
-	rm -f .depend.tmp
-
--include .depend.MSVC
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,525 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_buf.h"
-
-#include <stdio.h>
-
-#include "nghttp2_helper.h"
-#include "nghttp2_debug.h"
-
-void nghttp2_buf_init(nghttp2_buf *buf) {
-  buf->begin = NULL;
-  buf->end = NULL;
-  buf->pos = NULL;
-  buf->last = NULL;
-  buf->mark = NULL;
-}
-
-int nghttp2_buf_init2(nghttp2_buf *buf, size_t initial, nghttp2_mem *mem) {
-  nghttp2_buf_init(buf);
-  return nghttp2_buf_reserve(buf, initial, mem);
-}
-
-void nghttp2_buf_free(nghttp2_buf *buf, nghttp2_mem *mem) {
-  if (buf == NULL) {
-    return;
-  }
-
-  nghttp2_mem_free(mem, buf->begin);
-  buf->begin = NULL;
-}
-
-int nghttp2_buf_reserve(nghttp2_buf *buf, size_t new_cap, nghttp2_mem *mem) {
-  uint8_t *ptr;
-  size_t cap;
-
-  cap = nghttp2_buf_cap(buf);
-
-  if (cap >= new_cap) {
-    return 0;
-  }
-
-  new_cap = nghttp2_max(new_cap, cap * 2);
-
-  ptr = nghttp2_mem_realloc(mem, buf->begin, new_cap);
-  if (ptr == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  buf->pos = ptr + (buf->pos - buf->begin);
-  buf->last = ptr + (buf->last - buf->begin);
-  buf->mark = ptr + (buf->mark - buf->begin);
-  buf->begin = ptr;
-  buf->end = ptr + new_cap;
-
-  return 0;
-}
-
-void nghttp2_buf_reset(nghttp2_buf *buf) {
-  buf->pos = buf->last = buf->mark = buf->begin;
-}
-
-void nghttp2_buf_wrap_init(nghttp2_buf *buf, uint8_t *begin, size_t len) {
-  buf->begin = buf->pos = buf->last = buf->mark = begin;
-  buf->end = begin + len;
-}
-
-static int buf_chain_new(nghttp2_buf_chain **chain, size_t chunk_length,
-                         nghttp2_mem *mem) {
-  int rv;
-
-  *chain = nghttp2_mem_malloc(mem, sizeof(nghttp2_buf_chain));
-  if (*chain == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  (*chain)->next = NULL;
-
-  rv = nghttp2_buf_init2(&(*chain)->buf, chunk_length, mem);
-  if (rv != 0) {
-    nghttp2_mem_free(mem, *chain);
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  return 0;
-}
-
-static void buf_chain_del(nghttp2_buf_chain *chain, nghttp2_mem *mem) {
-  nghttp2_buf_free(&chain->buf, mem);
-  nghttp2_mem_free(mem, chain);
-}
-
-int nghttp2_bufs_init(nghttp2_bufs *bufs, size_t chunk_length, size_t max_chunk,
-                      nghttp2_mem *mem) {
-  return nghttp2_bufs_init2(bufs, chunk_length, max_chunk, 0, mem);
-}
-
-int nghttp2_bufs_init2(nghttp2_bufs *bufs, size_t chunk_length,
-                       size_t max_chunk, size_t offset, nghttp2_mem *mem) {
-  return nghttp2_bufs_init3(bufs, chunk_length, max_chunk, max_chunk, offset,
-                            mem);
-}
-
-int nghttp2_bufs_init3(nghttp2_bufs *bufs, size_t chunk_length,
-                       size_t max_chunk, size_t chunk_keep, size_t offset,
-                       nghttp2_mem *mem) {
-  int rv;
-  nghttp2_buf_chain *chain;
-
-  if (chunk_keep == 0 || max_chunk < chunk_keep || chunk_length < offset) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  rv = buf_chain_new(&chain, chunk_length, mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  bufs->mem = mem;
-  bufs->offset = offset;
-
-  bufs->head = chain;
-  bufs->cur = bufs->head;
-
-  nghttp2_buf_shift_right(&bufs->cur->buf, offset);
-
-  bufs->chunk_length = chunk_length;
-  bufs->chunk_used = 1;
-  bufs->max_chunk = max_chunk;
-  bufs->chunk_keep = chunk_keep;
-
-  return 0;
-}
-
-int nghttp2_bufs_realloc(nghttp2_bufs *bufs, size_t chunk_length) {
-  int rv;
-  nghttp2_buf_chain *chain;
-
-  if (chunk_length < bufs->offset) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  rv = buf_chain_new(&chain, chunk_length, bufs->mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  nghttp2_bufs_free(bufs);
-
-  bufs->head = chain;
-  bufs->cur = bufs->head;
-
-  nghttp2_buf_shift_right(&bufs->cur->buf, bufs->offset);
-
-  bufs->chunk_length = chunk_length;
-  bufs->chunk_used = 1;
-
-  return 0;
-}
-
-void nghttp2_bufs_free(nghttp2_bufs *bufs) {
-  nghttp2_buf_chain *chain, *next_chain;
-
-  if (bufs == NULL) {
-    return;
-  }
-
-  for (chain = bufs->head; chain;) {
-    next_chain = chain->next;
-
-    buf_chain_del(chain, bufs->mem);
-
-    chain = next_chain;
-  }
-
-  bufs->head = NULL;
-}
-
-int nghttp2_bufs_wrap_init(nghttp2_bufs *bufs, uint8_t *begin, size_t len,
-                           nghttp2_mem *mem) {
-  nghttp2_buf_chain *chain;
-
-  chain = nghttp2_mem_malloc(mem, sizeof(nghttp2_buf_chain));
-  if (chain == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  chain->next = NULL;
-
-  nghttp2_buf_wrap_init(&chain->buf, begin, len);
-
-  bufs->mem = mem;
-  bufs->offset = 0;
-
-  bufs->head = chain;
-  bufs->cur = bufs->head;
-
-  bufs->chunk_length = len;
-  bufs->chunk_used = 1;
-  bufs->max_chunk = 1;
-  bufs->chunk_keep = 1;
-
-  return 0;
-}
-
-int nghttp2_bufs_wrap_init2(nghttp2_bufs *bufs, const nghttp2_vec *vec,
-                            size_t veclen, nghttp2_mem *mem) {
-  size_t i = 0;
-  nghttp2_buf_chain *cur_chain;
-  nghttp2_buf_chain *head_chain;
-  nghttp2_buf_chain **dst_chain = &head_chain;
-
-  if (veclen == 0) {
-    return nghttp2_bufs_wrap_init(bufs, NULL, 0, mem);
-  }
-
-  head_chain = nghttp2_mem_malloc(mem, sizeof(nghttp2_buf_chain) * veclen);
-  if (head_chain == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  for (i = 0; i < veclen; ++i) {
-    cur_chain = &head_chain[i];
-    cur_chain->next = NULL;
-    nghttp2_buf_wrap_init(&cur_chain->buf, vec[i].base, vec[i].len);
-
-    *dst_chain = cur_chain;
-    dst_chain = &cur_chain->next;
-  }
-
-  bufs->mem = mem;
-  bufs->offset = 0;
-
-  bufs->head = head_chain;
-  bufs->cur = bufs->head;
-
-  /* We don't use chunk_length since no allocation is expected. */
-  bufs->chunk_length = 0;
-  bufs->chunk_used = veclen;
-  bufs->max_chunk = veclen;
-  bufs->chunk_keep = veclen;
-
-  return 0;
-}
-
-void nghttp2_bufs_wrap_free(nghttp2_bufs *bufs) {
-  if (bufs == NULL) {
-    return;
-  }
-
-  if (bufs->head) {
-    nghttp2_mem_free(bufs->mem, bufs->head);
-  }
-}
-
-void nghttp2_bufs_seek_last_present(nghttp2_bufs *bufs) {
-  nghttp2_buf_chain *ci;
-
-  for (ci = bufs->cur; ci; ci = ci->next) {
-    if (nghttp2_buf_len(&ci->buf) == 0) {
-      return;
-    } else {
-      bufs->cur = ci;
-    }
-  }
-}
-
-size_t nghttp2_bufs_len(nghttp2_bufs *bufs) {
-  nghttp2_buf_chain *ci;
-  size_t len;
-
-  len = 0;
-  for (ci = bufs->head; ci; ci = ci->next) {
-    len += nghttp2_buf_len(&ci->buf);
-  }
-
-  return len;
-}
-
-static int bufs_alloc_chain(nghttp2_bufs *bufs) {
-  int rv;
-  nghttp2_buf_chain *chain;
-
-  if (bufs->cur->next) {
-    bufs->cur = bufs->cur->next;
-
-    return 0;
-  }
-
-  if (bufs->max_chunk == bufs->chunk_used) {
-    return NGHTTP2_ERR_BUFFER_ERROR;
-  }
-
-  rv = buf_chain_new(&chain, bufs->chunk_length, bufs->mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  DEBUGF("new buffer %zu bytes allocated for bufs %p, used %zu\n",
-         bufs->chunk_length, bufs, bufs->chunk_used);
-
-  ++bufs->chunk_used;
-
-  bufs->cur->next = chain;
-  bufs->cur = chain;
-
-  nghttp2_buf_shift_right(&bufs->cur->buf, bufs->offset);
-
-  return 0;
-}
-
-int nghttp2_bufs_add(nghttp2_bufs *bufs, const void *data, size_t len) {
-  int rv;
-  size_t nwrite;
-  nghttp2_buf *buf;
-  const uint8_t *p;
-
-  p = data;
-
-  while (len) {
-    buf = &bufs->cur->buf;
-
-    nwrite = nghttp2_min(nghttp2_buf_avail(buf), len);
-    if (nwrite == 0) {
-      rv = bufs_alloc_chain(bufs);
-      if (rv != 0) {
-        return rv;
-      }
-      continue;
-    }
-
-    buf->last = nghttp2_cpymem(buf->last, p, nwrite);
-    p += nwrite;
-    len -= nwrite;
-  }
-
-  return 0;
-}
-
-static int bufs_ensure_addb(nghttp2_bufs *bufs) {
-  int rv;
-  nghttp2_buf *buf;
-
-  buf = &bufs->cur->buf;
-
-  if (nghttp2_buf_avail(buf) > 0) {
-    return 0;
-  }
-
-  rv = bufs_alloc_chain(bufs);
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_bufs_addb(nghttp2_bufs *bufs, uint8_t b) {
-  int rv;
-
-  rv = bufs_ensure_addb(bufs);
-  if (rv != 0) {
-    return rv;
-  }
-
-  *bufs->cur->buf.last++ = b;
-
-  return 0;
-}
-
-int nghttp2_bufs_addb_hold(nghttp2_bufs *bufs, uint8_t b) {
-  int rv;
-
-  rv = bufs_ensure_addb(bufs);
-  if (rv != 0) {
-    return rv;
-  }
-
-  *bufs->cur->buf.last = b;
-
-  return 0;
-}
-
-int nghttp2_bufs_orb(nghttp2_bufs *bufs, uint8_t b) {
-  int rv;
-
-  rv = bufs_ensure_addb(bufs);
-  if (rv != 0) {
-    return rv;
-  }
-
-  *bufs->cur->buf.last++ |= b;
-
-  return 0;
-}
-
-int nghttp2_bufs_orb_hold(nghttp2_bufs *bufs, uint8_t b) {
-  int rv;
-
-  rv = bufs_ensure_addb(bufs);
-  if (rv != 0) {
-    return rv;
-  }
-
-  *bufs->cur->buf.last |= b;
-
-  return 0;
-}
-
-ssize_t nghttp2_bufs_remove(nghttp2_bufs *bufs, uint8_t **out) {
-  size_t len;
-  nghttp2_buf_chain *chain;
-  nghttp2_buf *buf;
-  uint8_t *res;
-  nghttp2_buf resbuf;
-
-  len = 0;
-
-  for (chain = bufs->head; chain; chain = chain->next) {
-    len += nghttp2_buf_len(&chain->buf);
-  }
-
-  if (len == 0) {
-    res = NULL;
-    return 0;
-  }
-
-  res = nghttp2_mem_malloc(bufs->mem, len);
-  if (res == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_buf_wrap_init(&resbuf, res, len);
-
-  for (chain = bufs->head; chain; chain = chain->next) {
-    buf = &chain->buf;
-    resbuf.last = nghttp2_cpymem(resbuf.last, buf->pos, nghttp2_buf_len(buf));
-  }
-
-  *out = res;
-
-  return (ssize_t)len;
-}
-
-size_t nghttp2_bufs_remove_copy(nghttp2_bufs *bufs, uint8_t *out) {
-  size_t len;
-  nghttp2_buf_chain *chain;
-  nghttp2_buf *buf;
-  nghttp2_buf resbuf;
-
-  len = nghttp2_bufs_len(bufs);
-
-  nghttp2_buf_wrap_init(&resbuf, out, len);
-
-  for (chain = bufs->head; chain; chain = chain->next) {
-    buf = &chain->buf;
-    resbuf.last = nghttp2_cpymem(resbuf.last, buf->pos, nghttp2_buf_len(buf));
-  }
-
-  return len;
-}
-
-void nghttp2_bufs_reset(nghttp2_bufs *bufs) {
-  nghttp2_buf_chain *chain, *ci;
-  size_t k;
-
-  k = bufs->chunk_keep;
-
-  for (ci = bufs->head; ci; ci = ci->next) {
-    nghttp2_buf_reset(&ci->buf);
-    nghttp2_buf_shift_right(&ci->buf, bufs->offset);
-
-    if (--k == 0) {
-      break;
-    }
-  }
-
-  if (ci) {
-    chain = ci->next;
-    ci->next = NULL;
-
-    for (ci = chain; ci;) {
-      chain = ci->next;
-
-      buf_chain_del(ci, bufs->mem);
-
-      ci = chain;
-    }
-
-    bufs->chunk_used = bufs->chunk_keep;
-  }
-
-  bufs->cur = bufs->head;
-}
-
-int nghttp2_bufs_advance(nghttp2_bufs *bufs) { return bufs_alloc_chain(bufs); }
-
-int nghttp2_bufs_next_present(nghttp2_bufs *bufs) {
-  nghttp2_buf_chain *chain;
-
-  chain = bufs->cur->next;
-
-  return chain && nghttp2_buf_len(&chain->buf);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_buf.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,412 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_BUF_H
-#define NGHTTP2_BUF_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-#include "nghttp2_int.h"
-#include "nghttp2_mem.h"
-
-typedef struct {
-  /* This points to the beginning of the buffer. The effective range
-     of buffer is [begin, end). */
-  uint8_t *begin;
-  /* This points to the memory one byte beyond the end of the
-     buffer. */
-  uint8_t *end;
-  /* The position indicator for effective start of the buffer. pos <=
-     last must be hold. */
-  uint8_t *pos;
-  /* The position indicator for effective one beyond of the end of the
-     buffer. last <= end must be hold. */
-  uint8_t *last;
-  /* Mark arbitrary position in buffer [begin, end) */
-  uint8_t *mark;
-} nghttp2_buf;
-
-#define nghttp2_buf_len(BUF) ((size_t)((BUF)->last - (BUF)->pos))
-#define nghttp2_buf_avail(BUF) ((size_t)((BUF)->end - (BUF)->last))
-#define nghttp2_buf_mark_avail(BUF) ((size_t)((BUF)->mark - (BUF)->last))
-#define nghttp2_buf_cap(BUF) ((size_t)((BUF)->end - (BUF)->begin))
-
-#define nghttp2_buf_pos_offset(BUF) ((size_t)((BUF)->pos - (BUF)->begin))
-#define nghttp2_buf_last_offset(BUF) ((size_t)((BUF)->last - (BUF)->begin))
-
-#define nghttp2_buf_shift_right(BUF, AMT)                                      \
-  do {                                                                         \
-    (BUF)->pos += AMT;                                                         \
-    (BUF)->last += AMT;                                                        \
-  } while (0)
-
-#define nghttp2_buf_shift_left(BUF, AMT)                                       \
-  do {                                                                         \
-    (BUF)->pos -= AMT;                                                         \
-    (BUF)->last -= AMT;                                                        \
-  } while (0)
-
-/*
- * Initializes the |buf|. No memory is allocated in this function. Use
- * nghttp2_buf_reserve() to allocate memory.
- */
-void nghttp2_buf_init(nghttp2_buf *buf);
-
-/*
- * Initializes the |buf| and allocates at least |initial| bytes of
- * memory.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_buf_init2(nghttp2_buf *buf, size_t initial, nghttp2_mem *mem);
-
-/*
- * Frees buffer in |buf|.
- */
-void nghttp2_buf_free(nghttp2_buf *buf, nghttp2_mem *mem);
-
-/*
- * Extends buffer so that nghttp2_buf_cap() returns at least
- * |new_cap|. If extensions took place, buffer pointers in |buf| will
- * change.
- *
- * This function returns 0 if it succeeds, or one of the followings
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_buf_reserve(nghttp2_buf *buf, size_t new_cap, nghttp2_mem *mem);
-
-/*
- * Resets pos, last, mark member of |buf| to buf->begin.
- */
-void nghttp2_buf_reset(nghttp2_buf *buf);
-
-/*
- * Initializes |buf| using supplied buffer |begin| of length
- * |len|. Semantically, the application should not call *_reserve() or
- * nghttp2_free() functions for |buf|.
- */
-void nghttp2_buf_wrap_init(nghttp2_buf *buf, uint8_t *begin, size_t len);
-
-struct nghttp2_buf_chain;
-
-typedef struct nghttp2_buf_chain nghttp2_buf_chain;
-
-/* Chains 2 buffers */
-struct nghttp2_buf_chain {
-  /* Points to the subsequent buffer. NULL if there is no such
-     buffer. */
-  nghttp2_buf_chain *next;
-  nghttp2_buf buf;
-};
-
-typedef struct {
-  /* Points to the first buffer */
-  nghttp2_buf_chain *head;
-  /* Buffer pointer where write occurs. */
-  nghttp2_buf_chain *cur;
-  /* Memory allocator */
-  nghttp2_mem *mem;
-  /* The buffer capacity of each buf.  This field may be 0 if
-     nghttp2_bufs is initialized by nghttp2_bufs_wrap_init* family
-     functions. */
-  size_t chunk_length;
-  /* The maximum number of nghttp2_buf_chain */
-  size_t max_chunk;
-  /* The number of nghttp2_buf_chain allocated */
-  size_t chunk_used;
-  /* The number of nghttp2_buf_chain to keep on reset */
-  size_t chunk_keep;
-  /* pos offset from begin in each buffers. On initialization and
-     reset, buf->pos and buf->last are positioned at buf->begin +
-     offset. */
-  size_t offset;
-} nghttp2_bufs;
-
-/*
- * This is the same as calling nghttp2_bufs_init2 with the given
- * arguments and offset = 0.
- */
-int nghttp2_bufs_init(nghttp2_bufs *bufs, size_t chunk_length, size_t max_chunk,
-                      nghttp2_mem *mem);
-
-/*
- * This is the same as calling nghttp2_bufs_init3 with the given
- * arguments and chunk_keep = max_chunk.
- */
-int nghttp2_bufs_init2(nghttp2_bufs *bufs, size_t chunk_length,
-                       size_t max_chunk, size_t offset, nghttp2_mem *mem);
-
-/*
- * Initializes |bufs|. Each buffer size is given in the
- * |chunk_length|.  The maximum number of buffers is given in the
- * |max_chunk|.  On reset, first |chunk_keep| buffers are kept and
- * remaining buffers are deleted.  Each buffer will have bufs->pos and
- * bufs->last shifted to left by |offset| bytes on creation and reset.
- *
- * This function allocates first buffer.  bufs->head and bufs->cur
- * will point to the first buffer after this call.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     chunk_keep is 0; or max_chunk < chunk_keep; or offset is too
- *     long.
- */
-int nghttp2_bufs_init3(nghttp2_bufs *bufs, size_t chunk_length,
-                       size_t max_chunk, size_t chunk_keep, size_t offset,
-                       nghttp2_mem *mem);
-
-/*
- * Frees any related resources to the |bufs|.
- */
-void nghttp2_bufs_free(nghttp2_bufs *bufs);
-
-/*
- * Initializes |bufs| using supplied buffer |begin| of length |len|.
- * The first buffer bufs->head uses buffer |begin|.  The buffer size
- * is fixed and no extra chunk buffer is allocated.  In other
- * words, max_chunk = chunk_keep = 1.  To free the resource allocated
- * for |bufs|, use nghttp2_bufs_wrap_free().
- *
- * Don't use the function which performs allocation, such as
- * nghttp2_bufs_realloc().
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_bufs_wrap_init(nghttp2_bufs *bufs, uint8_t *begin, size_t len,
-                           nghttp2_mem *mem);
-
-/*
- * Initializes |bufs| using supplied |veclen| size of buf vector
- * |vec|.  The number of buffers is fixed and no extra chunk buffer is
- * allocated.  In other words, max_chunk = chunk_keep = |in_len|.  To
- * free the resource allocated for |bufs|, use
- * nghttp2_bufs_wrap_free().
- *
- * Don't use the function which performs allocation, such as
- * nghttp2_bufs_realloc().
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_bufs_wrap_init2(nghttp2_bufs *bufs, const nghttp2_vec *vec,
-                            size_t veclen, nghttp2_mem *mem);
-
-/*
- * Frees any related resource to the |bufs|.  This function does not
- * free supplied buffer provided in nghttp2_bufs_wrap_init().
- */
-void nghttp2_bufs_wrap_free(nghttp2_bufs *bufs);
-
-/*
- * Reallocates internal buffer using |chunk_length|.  The max_chunk,
- * chunk_keep and offset do not change.  After successful allocation
- * of new buffer, previous buffers are deallocated without copying
- * anything into new buffers.  chunk_used is reset to 1.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     chunk_length < offset
- */
-int nghttp2_bufs_realloc(nghttp2_bufs *bufs, size_t chunk_length);
-
-/*
- * Appends the |data| of length |len| to the |bufs|. The write starts
- * at bufs->cur->buf.last. A new buffers will be allocated to store
- * all data.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_BUFFER_ERROR
- *     Out of buffer space.
- */
-int nghttp2_bufs_add(nghttp2_bufs *bufs, const void *data, size_t len);
-
-/*
- * Appends a single byte |b| to the |bufs|. The write starts at
- * bufs->cur->buf.last. A new buffers will be allocated to store all
- * data.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_BUFFER_ERROR
- *     Out of buffer space.
- */
-int nghttp2_bufs_addb(nghttp2_bufs *bufs, uint8_t b);
-
-/*
- * Behaves like nghttp2_bufs_addb(), but this does not update
- * buf->last pointer.
- */
-int nghttp2_bufs_addb_hold(nghttp2_bufs *bufs, uint8_t b);
-
-#define nghttp2_bufs_fast_addb(BUFS, B)                                        \
-  do {                                                                         \
-    *(BUFS)->cur->buf.last++ = B;                                              \
-  } while (0)
-
-#define nghttp2_bufs_fast_addb_hold(BUFS, B)                                   \
-  do {                                                                         \
-    *(BUFS)->cur->buf.last = B;                                                \
-  } while (0)
-
-/*
- * Performs bitwise-OR of |b| at bufs->cur->buf.last. A new buffers
- * will be allocated if necessary.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_BUFFER_ERROR
- *     Out of buffer space.
- */
-int nghttp2_bufs_orb(nghttp2_bufs *bufs, uint8_t b);
-
-/*
- * Behaves like nghttp2_bufs_orb(), but does not update buf->last
- * pointer.
- */
-int nghttp2_bufs_orb_hold(nghttp2_bufs *bufs, uint8_t b);
-
-#define nghttp2_bufs_fast_orb(BUFS, B)                                         \
-  do {                                                                         \
-    uint8_t **p = &(BUFS)->cur->buf.last;                                      \
-    **p = (uint8_t)(**p | (B));                                                \
-    ++(*p);                                                                    \
-  } while (0)
-
-#define nghttp2_bufs_fast_orb_hold(BUFS, B)                                    \
-  do {                                                                         \
-    uint8_t *p = (BUFS)->cur->buf.last;                                        \
-    *p = (uint8_t)(*p | (B));                                                  \
-  } while (0)
-
-/*
- * Copies all data stored in |bufs| to the contiguous buffer.  This
- * function allocates the contiguous memory to store all data in
- * |bufs| and assigns it to |*out|.
- *
- * The contents of |bufs| is left unchanged.
- *
- * This function returns the length of copied data and assigns the
- * pointer to copied data to |*out| if it succeeds, or one of the
- * following negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-ssize_t nghttp2_bufs_remove(nghttp2_bufs *bufs, uint8_t **out);
-
-/*
- * Copies all data stored in |bufs| to |out|.  This function assumes
- * that the buffer space pointed by |out| has at least
- * nghttp2_bufs(bufs) bytes.
- *
- * The contents of |bufs| is left unchanged.
- *
- * This function returns the length of copied data.
- */
-size_t nghttp2_bufs_remove_copy(nghttp2_bufs *bufs, uint8_t *out);
-
-/*
- * Resets |bufs| and makes the buffers empty.
- */
-void nghttp2_bufs_reset(nghttp2_bufs *bufs);
-
-/*
- * Moves bufs->cur to bufs->cur->next.  If resulting bufs->cur is
- * NULL, this function allocates new buffers and bufs->cur points to
- * it.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- * NGHTTP2_ERR_BUFFER_ERROR
- *     Out of buffer space.
- */
-int nghttp2_bufs_advance(nghttp2_bufs *bufs);
-
-/* Sets bufs->cur to bufs->head */
-#define nghttp2_bufs_rewind(BUFS)                                              \
-  do {                                                                         \
-    (BUFS)->cur = (BUFS)->head;                                                \
-  } while (0)
-
-/*
- * Move bufs->cur, from the current position, using next member, to
- * the last buf which has nghttp2_buf_len(buf) > 0 without seeing buf
- * which satisfies nghttp2_buf_len(buf) == 0.  If
- * nghttp2_buf_len(&bufs->cur->buf) == 0 or bufs->cur->next is NULL,
- * bufs->cur is unchanged.
- */
-void nghttp2_bufs_seek_last_present(nghttp2_bufs *bufs);
-
-/*
- * Returns nonzero if bufs->cur->next is not empty.
- */
-int nghttp2_bufs_next_present(nghttp2_bufs *bufs);
-
-#define nghttp2_bufs_cur_avail(BUFS) nghttp2_buf_avail(&(BUFS)->cur->buf)
-
-/*
- * Returns the total buffer length of |bufs|.
- */
-size_t nghttp2_bufs_len(nghttp2_bufs *bufs);
-
-#endif /* NGHTTP2_BUF_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_callbacks.h"
-
-#include <stdlib.h>
-
-int nghttp2_session_callbacks_new(nghttp2_session_callbacks **callbacks_ptr) {
-  *callbacks_ptr = calloc(1, sizeof(nghttp2_session_callbacks));
-
-  if (*callbacks_ptr == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  return 0;
-}
-
-void nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks) {
-  free(callbacks);
-}
-
-void nghttp2_session_callbacks_set_send_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback) {
-  cbs->send_callback = send_callback;
-}
-
-void nghttp2_session_callbacks_set_recv_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_recv_callback recv_callback) {
-  cbs->recv_callback = recv_callback;
-}
-
-void nghttp2_session_callbacks_set_on_frame_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_recv_callback on_frame_recv_callback) {
-  cbs->on_frame_recv_callback = on_frame_recv_callback;
-}
-
-void nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback) {
-  cbs->on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-}
-
-void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback) {
-  cbs->on_data_chunk_recv_callback = on_data_chunk_recv_callback;
-}
-
-void nghttp2_session_callbacks_set_before_frame_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_before_frame_send_callback before_frame_send_callback) {
-  cbs->before_frame_send_callback = before_frame_send_callback;
-}
-
-void nghttp2_session_callbacks_set_on_frame_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_send_callback on_frame_send_callback) {
-  cbs->on_frame_send_callback = on_frame_send_callback;
-}
-
-void nghttp2_session_callbacks_set_on_frame_not_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_not_send_callback on_frame_not_send_callback) {
-  cbs->on_frame_not_send_callback = on_frame_not_send_callback;
-}
-
-void nghttp2_session_callbacks_set_on_stream_close_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_stream_close_callback on_stream_close_callback) {
-  cbs->on_stream_close_callback = on_stream_close_callback;
-}
-
-void nghttp2_session_callbacks_set_on_begin_headers_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_begin_headers_callback on_begin_headers_callback) {
-  cbs->on_begin_headers_callback = on_begin_headers_callback;
-}
-
-void nghttp2_session_callbacks_set_on_header_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_header_callback on_header_callback) {
-  cbs->on_header_callback = on_header_callback;
-}
-
-void nghttp2_session_callbacks_set_on_header_callback2(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_header_callback2 on_header_callback2) {
-  cbs->on_header_callback2 = on_header_callback2;
-}
-
-void nghttp2_session_callbacks_set_on_invalid_header_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_header_callback on_invalid_header_callback) {
-  cbs->on_invalid_header_callback = on_invalid_header_callback;
-}
-
-void nghttp2_session_callbacks_set_on_invalid_header_callback2(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_header_callback2 on_invalid_header_callback2) {
-  cbs->on_invalid_header_callback2 = on_invalid_header_callback2;
-}
-
-void nghttp2_session_callbacks_set_select_padding_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_select_padding_callback select_padding_callback) {
-  cbs->select_padding_callback = select_padding_callback;
-}
-
-void nghttp2_session_callbacks_set_data_source_read_length_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_data_source_read_length_callback data_source_read_length_callback) {
-  cbs->read_length_callback = data_source_read_length_callback;
-}
-
-void nghttp2_session_callbacks_set_on_begin_frame_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_begin_frame_callback on_begin_frame_callback) {
-  cbs->on_begin_frame_callback = on_begin_frame_callback;
-}
-
-void nghttp2_session_callbacks_set_send_data_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_send_data_callback send_data_callback) {
-  cbs->send_data_callback = send_data_callback;
-}
-
-void nghttp2_session_callbacks_set_pack_extension_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_pack_extension_callback pack_extension_callback) {
-  cbs->pack_extension_callback = pack_extension_callback;
-}
-
-void nghttp2_session_callbacks_set_unpack_extension_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_unpack_extension_callback unpack_extension_callback) {
-  cbs->unpack_extension_callback = unpack_extension_callback;
-}
-
-void nghttp2_session_callbacks_set_on_extension_chunk_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_extension_chunk_recv_callback on_extension_chunk_recv_callback) {
-  cbs->on_extension_chunk_recv_callback = on_extension_chunk_recv_callback;
-}
-
-void nghttp2_session_callbacks_set_error_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_error_callback error_callback) {
-  cbs->error_callback = error_callback;
-}
-
-void nghttp2_session_callbacks_set_error_callback2(
-    nghttp2_session_callbacks *cbs, nghttp2_error_callback2 error_callback2) {
-  cbs->error_callback2 = error_callback2;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_callbacks.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_CALLBACKS_H
-#define NGHTTP2_CALLBACKS_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-/*
- * Callback functions.
- */
-struct nghttp2_session_callbacks {
-  /**
-   * Callback function invoked when the session wants to send data to
-   * the remote peer.  This callback is not necessary if the
-   * application uses solely `nghttp2_session_mem_send()` to serialize
-   * data to transmit.
-   */
-  nghttp2_send_callback send_callback;
-  /**
-   * Callback function invoked when the session wants to receive data
-   * from the remote peer.  This callback is not necessary if the
-   * application uses solely `nghttp2_session_mem_recv()` to process
-   * received data.
-   */
-  nghttp2_recv_callback recv_callback;
-  /**
-   * Callback function invoked by `nghttp2_session_recv()` when a
-   * frame is received.
-   */
-  nghttp2_on_frame_recv_callback on_frame_recv_callback;
-  /**
-   * Callback function invoked by `nghttp2_session_recv()` when an
-   * invalid non-DATA frame is received.
-   */
-  nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback;
-  /**
-   * Callback function invoked when a chunk of data in DATA frame is
-   * received.
-   */
-  nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback;
-  /**
-   * Callback function invoked before a non-DATA frame is sent.
-   */
-  nghttp2_before_frame_send_callback before_frame_send_callback;
-  /**
-   * Callback function invoked after a frame is sent.
-   */
-  nghttp2_on_frame_send_callback on_frame_send_callback;
-  /**
-   * The callback function invoked when a non-DATA frame is not sent
-   * because of an error.
-   */
-  nghttp2_on_frame_not_send_callback on_frame_not_send_callback;
-  /**
-   * Callback function invoked when the stream is closed.
-   */
-  nghttp2_on_stream_close_callback on_stream_close_callback;
-  /**
-   * Callback function invoked when the reception of header block in
-   * HEADERS or PUSH_PROMISE is started.
-   */
-  nghttp2_on_begin_headers_callback on_begin_headers_callback;
-  /**
-   * Callback function invoked when a header name/value pair is
-   * received.
-   */
-  nghttp2_on_header_callback on_header_callback;
-  nghttp2_on_header_callback2 on_header_callback2;
-  /**
-   * Callback function invoked when a invalid header name/value pair
-   * is received which is silently ignored if these callbacks are not
-   * set.
-   */
-  nghttp2_on_invalid_header_callback on_invalid_header_callback;
-  nghttp2_on_invalid_header_callback2 on_invalid_header_callback2;
-  /**
-   * Callback function invoked when the library asks application how
-   * many padding bytes are required for the transmission of the given
-   * frame.
-   */
-  nghttp2_select_padding_callback select_padding_callback;
-  /**
-   * The callback function used to determine the length allowed in
-   * `nghttp2_data_source_read_callback()`
-   */
-  nghttp2_data_source_read_length_callback read_length_callback;
-  /**
-   * Sets callback function invoked when a frame header is received.
-   */
-  nghttp2_on_begin_frame_callback on_begin_frame_callback;
-  nghttp2_send_data_callback send_data_callback;
-  nghttp2_pack_extension_callback pack_extension_callback;
-  nghttp2_unpack_extension_callback unpack_extension_callback;
-  nghttp2_on_extension_chunk_recv_callback on_extension_chunk_recv_callback;
-  nghttp2_error_callback error_callback;
-  nghttp2_error_callback2 error_callback2;
-};
-
-#endif /* NGHTTP2_CALLBACKS_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_debug.h"
-
-#include <stdio.h>
-
-#ifdef DEBUGBUILD
-
-static void nghttp2_default_debug_vfprintf_callback(const char *fmt,
-                                                    va_list args) {
-  vfprintf(stderr, fmt, args);
-}
-
-static nghttp2_debug_vprintf_callback static_debug_vprintf_callback =
-    nghttp2_default_debug_vfprintf_callback;
-
-void nghttp2_debug_vprintf(const char *format, ...) {
-  if (static_debug_vprintf_callback) {
-    va_list args;
-    va_start(args, format);
-    static_debug_vprintf_callback(format, args);
-    va_end(args);
-  }
-}
-
-void nghttp2_set_debug_vprintf_callback(
-    nghttp2_debug_vprintf_callback debug_vprintf_callback) {
-  static_debug_vprintf_callback = debug_vprintf_callback;
-}
-
-#else /* !DEBUGBUILD */
-
-void nghttp2_set_debug_vprintf_callback(
-    nghttp2_debug_vprintf_callback debug_vprintf_callback) {
-  (void)debug_vprintf_callback;
-}
-
-#endif /* !DEBUGBUILD */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_debug.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_DEBUG_H
-#define NGHTTP2_DEBUG_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-#ifdef DEBUGBUILD
-#  define DEBUGF(...) nghttp2_debug_vprintf(__VA_ARGS__)
-void nghttp2_debug_vprintf(const char *format, ...);
-#else
-#  define DEBUGF(...)                                                          \
-    do {                                                                       \
-    } while (0)
-#endif
-
-#endif /* NGHTTP2_DEBUG_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1129 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_frame.h"
-
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "nghttp2_helper.h"
-#include "nghttp2_net.h"
-#include "nghttp2_priority_spec.h"
-#include "nghttp2_debug.h"
-
-void nghttp2_frame_pack_frame_hd(uint8_t *buf, const nghttp2_frame_hd *hd) {
-  nghttp2_put_uint32be(&buf[0], (uint32_t)(hd->length << 8));
-  buf[3] = hd->type;
-  buf[4] = hd->flags;
-  nghttp2_put_uint32be(&buf[5], (uint32_t)hd->stream_id);
-  /* ignore hd->reserved for now */
-}
-
-void nghttp2_frame_unpack_frame_hd(nghttp2_frame_hd *hd, const uint8_t *buf) {
-  hd->length = nghttp2_get_uint32(&buf[0]) >> 8;
-  hd->type = buf[3];
-  hd->flags = buf[4];
-  hd->stream_id = nghttp2_get_uint32(&buf[5]) & NGHTTP2_STREAM_ID_MASK;
-  hd->reserved = 0;
-}
-
-void nghttp2_frame_hd_init(nghttp2_frame_hd *hd, size_t length, uint8_t type,
-                           uint8_t flags, int32_t stream_id) {
-  hd->length = length;
-  hd->type = type;
-  hd->flags = flags;
-  hd->stream_id = stream_id;
-  hd->reserved = 0;
-}
-
-void nghttp2_frame_headers_init(nghttp2_headers *frame, uint8_t flags,
-                                int32_t stream_id, nghttp2_headers_category cat,
-                                const nghttp2_priority_spec *pri_spec,
-                                nghttp2_nv *nva, size_t nvlen) {
-  nghttp2_frame_hd_init(&frame->hd, 0, NGHTTP2_HEADERS, flags, stream_id);
-  frame->padlen = 0;
-  frame->nva = nva;
-  frame->nvlen = nvlen;
-  frame->cat = cat;
-
-  if (pri_spec) {
-    frame->pri_spec = *pri_spec;
-  } else {
-    nghttp2_priority_spec_default_init(&frame->pri_spec);
-  }
-}
-
-void nghttp2_frame_headers_free(nghttp2_headers *frame, nghttp2_mem *mem) {
-  nghttp2_nv_array_del(frame->nva, mem);
-}
-
-void nghttp2_frame_priority_init(nghttp2_priority *frame, int32_t stream_id,
-                                 const nghttp2_priority_spec *pri_spec) {
-  nghttp2_frame_hd_init(&frame->hd, NGHTTP2_PRIORITY_SPECLEN, NGHTTP2_PRIORITY,
-                        NGHTTP2_FLAG_NONE, stream_id);
-  frame->pri_spec = *pri_spec;
-}
-
-void nghttp2_frame_priority_free(nghttp2_priority *frame) { (void)frame; }
-
-void nghttp2_frame_rst_stream_init(nghttp2_rst_stream *frame, int32_t stream_id,
-                                   uint32_t error_code) {
-  nghttp2_frame_hd_init(&frame->hd, 4, NGHTTP2_RST_STREAM, NGHTTP2_FLAG_NONE,
-                        stream_id);
-  frame->error_code = error_code;
-}
-
-void nghttp2_frame_rst_stream_free(nghttp2_rst_stream *frame) { (void)frame; }
-
-void nghttp2_frame_settings_init(nghttp2_settings *frame, uint8_t flags,
-                                 nghttp2_settings_entry *iv, size_t niv) {
-  nghttp2_frame_hd_init(&frame->hd, niv * NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH,
-                        NGHTTP2_SETTINGS, flags, 0);
-  frame->niv = niv;
-  frame->iv = iv;
-}
-
-void nghttp2_frame_settings_free(nghttp2_settings *frame, nghttp2_mem *mem) {
-  nghttp2_mem_free(mem, frame->iv);
-}
-
-void nghttp2_frame_push_promise_init(nghttp2_push_promise *frame, uint8_t flags,
-                                     int32_t stream_id,
-                                     int32_t promised_stream_id,
-                                     nghttp2_nv *nva, size_t nvlen) {
-  nghttp2_frame_hd_init(&frame->hd, 0, NGHTTP2_PUSH_PROMISE, flags, stream_id);
-  frame->padlen = 0;
-  frame->nva = nva;
-  frame->nvlen = nvlen;
-  frame->promised_stream_id = promised_stream_id;
-  frame->reserved = 0;
-}
-
-void nghttp2_frame_push_promise_free(nghttp2_push_promise *frame,
-                                     nghttp2_mem *mem) {
-  nghttp2_nv_array_del(frame->nva, mem);
-}
-
-void nghttp2_frame_ping_init(nghttp2_ping *frame, uint8_t flags,
-                             const uint8_t *opaque_data) {
-  nghttp2_frame_hd_init(&frame->hd, 8, NGHTTP2_PING, flags, 0);
-  if (opaque_data) {
-    memcpy(frame->opaque_data, opaque_data, sizeof(frame->opaque_data));
-  } else {
-    memset(frame->opaque_data, 0, sizeof(frame->opaque_data));
-  }
-}
-
-void nghttp2_frame_ping_free(nghttp2_ping *frame) { (void)frame; }
-
-void nghttp2_frame_goaway_init(nghttp2_goaway *frame, int32_t last_stream_id,
-                               uint32_t error_code, uint8_t *opaque_data,
-                               size_t opaque_data_len) {
-  nghttp2_frame_hd_init(&frame->hd, 8 + opaque_data_len, NGHTTP2_GOAWAY,
-                        NGHTTP2_FLAG_NONE, 0);
-  frame->last_stream_id = last_stream_id;
-  frame->error_code = error_code;
-  frame->opaque_data = opaque_data;
-  frame->opaque_data_len = opaque_data_len;
-  frame->reserved = 0;
-}
-
-void nghttp2_frame_goaway_free(nghttp2_goaway *frame, nghttp2_mem *mem) {
-  nghttp2_mem_free(mem, frame->opaque_data);
-}
-
-void nghttp2_frame_window_update_init(nghttp2_window_update *frame,
-                                      uint8_t flags, int32_t stream_id,
-                                      int32_t window_size_increment) {
-  nghttp2_frame_hd_init(&frame->hd, 4, NGHTTP2_WINDOW_UPDATE, flags, stream_id);
-  frame->window_size_increment = window_size_increment;
-  frame->reserved = 0;
-}
-
-void nghttp2_frame_window_update_free(nghttp2_window_update *frame) {
-  (void)frame;
-}
-
-size_t nghttp2_frame_trail_padlen(nghttp2_frame *frame, size_t padlen) {
-  /* We have iframe->padlen == 0, but iframe->frame.hd.flags may have
-     NGHTTP2_FLAG_PADDED set.  This happens when receiving
-     CONTINUATION frame, since we don't reset flags after HEADERS was
-     received. */
-  if (padlen == 0) {
-    return 0;
-  }
-  return padlen - ((frame->hd.flags & NGHTTP2_FLAG_PADDED) > 0);
-}
-
-void nghttp2_frame_data_init(nghttp2_data *frame, uint8_t flags,
-                             int32_t stream_id) {
-  /* At this moment, the length of DATA frame is unknown */
-  nghttp2_frame_hd_init(&frame->hd, 0, NGHTTP2_DATA, flags, stream_id);
-  frame->padlen = 0;
-}
-
-void nghttp2_frame_data_free(nghttp2_data *frame) { (void)frame; }
-
-void nghttp2_frame_extension_init(nghttp2_extension *frame, uint8_t type,
-                                  uint8_t flags, int32_t stream_id,
-                                  void *payload) {
-  nghttp2_frame_hd_init(&frame->hd, 0, type, flags, stream_id);
-  frame->payload = payload;
-}
-
-void nghttp2_frame_extension_free(nghttp2_extension *frame) { (void)frame; }
-
-void nghttp2_frame_altsvc_init(nghttp2_extension *frame, int32_t stream_id,
-                               uint8_t *origin, size_t origin_len,
-                               uint8_t *field_value, size_t field_value_len) {
-  nghttp2_ext_altsvc *altsvc;
-
-  nghttp2_frame_hd_init(&frame->hd, 2 + origin_len + field_value_len,
-                        NGHTTP2_ALTSVC, NGHTTP2_FLAG_NONE, stream_id);
-
-  altsvc = frame->payload;
-  altsvc->origin = origin;
-  altsvc->origin_len = origin_len;
-  altsvc->field_value = field_value;
-  altsvc->field_value_len = field_value_len;
-}
-
-void nghttp2_frame_altsvc_free(nghttp2_extension *frame, nghttp2_mem *mem) {
-  nghttp2_ext_altsvc *altsvc;
-
-  altsvc = frame->payload;
-  if (altsvc == NULL) {
-    return;
-  }
-  /* We use the same buffer for altsvc->origin and
-     altsvc->field_value. */
-  nghttp2_mem_free(mem, altsvc->origin);
-}
-
-void nghttp2_frame_origin_init(nghttp2_extension *frame,
-                               nghttp2_origin_entry *ov, size_t nov) {
-  nghttp2_ext_origin *origin;
-  size_t payloadlen = 0;
-  size_t i;
-
-  for (i = 0; i < nov; ++i) {
-    payloadlen += 2 + ov[i].origin_len;
-  }
-
-  nghttp2_frame_hd_init(&frame->hd, payloadlen, NGHTTP2_ORIGIN,
-                        NGHTTP2_FLAG_NONE, 0);
-
-  origin = frame->payload;
-  origin->ov = ov;
-  origin->nov = nov;
-}
-
-void nghttp2_frame_origin_free(nghttp2_extension *frame, nghttp2_mem *mem) {
-  nghttp2_ext_origin *origin;
-
-  origin = frame->payload;
-  if (origin == NULL) {
-    return;
-  }
-  /* We use the same buffer for all resources pointed by the field of
-     origin directly or indirectly. */
-  nghttp2_mem_free(mem, origin->ov);
-}
-
-size_t nghttp2_frame_priority_len(uint8_t flags) {
-  if (flags & NGHTTP2_FLAG_PRIORITY) {
-    return NGHTTP2_PRIORITY_SPECLEN;
-  }
-
-  return 0;
-}
-
-size_t nghttp2_frame_headers_payload_nv_offset(nghttp2_headers *frame) {
-  return nghttp2_frame_priority_len(frame->hd.flags);
-}
-
-/*
- * Call this function after payload was serialized, but not before
- * changing buf->pos and serializing frame header.
- *
- * This function assumes bufs->cur points to the last buf chain of the
- * frame(s).
- *
- * This function serializes frame header for HEADERS/PUSH_PROMISE and
- * handles their successive CONTINUATION frames.
- *
- * We don't process any padding here.
- */
-static int frame_pack_headers_shared(nghttp2_bufs *bufs,
-                                     nghttp2_frame_hd *frame_hd) {
-  nghttp2_buf *buf;
-  nghttp2_buf_chain *ci, *ce;
-  nghttp2_frame_hd hd;
-
-  buf = &bufs->head->buf;
-
-  hd = *frame_hd;
-  hd.length = nghttp2_buf_len(buf);
-
-  DEBUGF("send: HEADERS/PUSH_PROMISE, payloadlen=%zu\n", hd.length);
-
-  /* We have multiple frame buffers, which means one or more
-     CONTINUATION frame is involved. Remove END_HEADERS flag from the
-     first frame. */
-  if (bufs->head != bufs->cur) {
-    hd.flags = (uint8_t)(hd.flags & ~NGHTTP2_FLAG_END_HEADERS);
-  }
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-  nghttp2_frame_pack_frame_hd(buf->pos, &hd);
-
-  if (bufs->head != bufs->cur) {
-    /* 2nd and later frames are CONTINUATION frames. */
-    hd.type = NGHTTP2_CONTINUATION;
-    /* We don't have no flags except for last CONTINUATION */
-    hd.flags = NGHTTP2_FLAG_NONE;
-
-    ce = bufs->cur;
-
-    for (ci = bufs->head->next; ci != ce; ci = ci->next) {
-      buf = &ci->buf;
-
-      hd.length = nghttp2_buf_len(buf);
-
-      DEBUGF("send: int CONTINUATION, payloadlen=%zu\n", hd.length);
-
-      buf->pos -= NGHTTP2_FRAME_HDLEN;
-      nghttp2_frame_pack_frame_hd(buf->pos, &hd);
-    }
-
-    buf = &ci->buf;
-    hd.length = nghttp2_buf_len(buf);
-    /* Set END_HEADERS flag for last CONTINUATION */
-    hd.flags = NGHTTP2_FLAG_END_HEADERS;
-
-    DEBUGF("send: last CONTINUATION, payloadlen=%zu\n", hd.length);
-
-    buf->pos -= NGHTTP2_FRAME_HDLEN;
-    nghttp2_frame_pack_frame_hd(buf->pos, &hd);
-  }
-
-  return 0;
-}
-
-int nghttp2_frame_pack_headers(nghttp2_bufs *bufs, nghttp2_headers *frame,
-                               nghttp2_hd_deflater *deflater) {
-  size_t nv_offset;
-  int rv;
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  nv_offset = nghttp2_frame_headers_payload_nv_offset(frame);
-
-  buf = &bufs->cur->buf;
-
-  buf->pos += nv_offset;
-  buf->last = buf->pos;
-
-  /* This call will adjust buf->last to the correct position */
-  rv = nghttp2_hd_deflate_hd_bufs(deflater, bufs, frame->nva, frame->nvlen);
-
-  if (rv == NGHTTP2_ERR_BUFFER_ERROR) {
-    rv = NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  buf->pos -= nv_offset;
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  if (frame->hd.flags & NGHTTP2_FLAG_PRIORITY) {
-    nghttp2_frame_pack_priority_spec(buf->pos, &frame->pri_spec);
-  }
-
-  frame->padlen = 0;
-  frame->hd.length = nghttp2_bufs_len(bufs);
-
-  return frame_pack_headers_shared(bufs, &frame->hd);
-}
-
-void nghttp2_frame_pack_priority_spec(uint8_t *buf,
-                                      const nghttp2_priority_spec *pri_spec) {
-  nghttp2_put_uint32be(buf, (uint32_t)pri_spec->stream_id);
-  if (pri_spec->exclusive) {
-    buf[0] |= 0x80;
-  }
-  buf[4] = (uint8_t)(pri_spec->weight - 1);
-}
-
-void nghttp2_frame_unpack_priority_spec(nghttp2_priority_spec *pri_spec,
-                                        const uint8_t *payload) {
-  int32_t dep_stream_id;
-  uint8_t exclusive;
-  int32_t weight;
-
-  dep_stream_id = nghttp2_get_uint32(payload) & NGHTTP2_STREAM_ID_MASK;
-  exclusive = (payload[0] & 0x80) > 0;
-  weight = payload[4] + 1;
-
-  nghttp2_priority_spec_init(pri_spec, dep_stream_id, weight, exclusive);
-}
-
-int nghttp2_frame_unpack_headers_payload(nghttp2_headers *frame,
-                                         const uint8_t *payload) {
-  if (frame->hd.flags & NGHTTP2_FLAG_PRIORITY) {
-    nghttp2_frame_unpack_priority_spec(&frame->pri_spec, payload);
-  } else {
-    nghttp2_priority_spec_default_init(&frame->pri_spec);
-  }
-
-  frame->nva = NULL;
-  frame->nvlen = 0;
-
-  return 0;
-}
-
-int nghttp2_frame_pack_priority(nghttp2_bufs *bufs, nghttp2_priority *frame) {
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->head->buf;
-
-  assert(nghttp2_buf_avail(buf) >= NGHTTP2_PRIORITY_SPECLEN);
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  nghttp2_frame_pack_priority_spec(buf->last, &frame->pri_spec);
-
-  buf->last += NGHTTP2_PRIORITY_SPECLEN;
-
-  return 0;
-}
-
-void nghttp2_frame_unpack_priority_payload(nghttp2_priority *frame,
-                                           const uint8_t *payload) {
-  nghttp2_frame_unpack_priority_spec(&frame->pri_spec, payload);
-}
-
-int nghttp2_frame_pack_rst_stream(nghttp2_bufs *bufs,
-                                  nghttp2_rst_stream *frame) {
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->head->buf;
-
-  assert(nghttp2_buf_avail(buf) >= 4);
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  nghttp2_put_uint32be(buf->last, frame->error_code);
-  buf->last += 4;
-
-  return 0;
-}
-
-void nghttp2_frame_unpack_rst_stream_payload(nghttp2_rst_stream *frame,
-                                             const uint8_t *payload) {
-  frame->error_code = nghttp2_get_uint32(payload);
-}
-
-int nghttp2_frame_pack_settings(nghttp2_bufs *bufs, nghttp2_settings *frame) {
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->head->buf;
-
-  if (nghttp2_buf_avail(buf) < frame->hd.length) {
-    return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-  }
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  buf->last +=
-      nghttp2_frame_pack_settings_payload(buf->last, frame->iv, frame->niv);
-
-  return 0;
-}
-
-size_t nghttp2_frame_pack_settings_payload(uint8_t *buf,
-                                           const nghttp2_settings_entry *iv,
-                                           size_t niv) {
-  size_t i;
-  for (i = 0; i < niv; ++i, buf += NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH) {
-    nghttp2_put_uint16be(buf, (uint16_t)iv[i].settings_id);
-    nghttp2_put_uint32be(buf + 2, iv[i].value);
-  }
-  return NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH * niv;
-}
-
-void nghttp2_frame_unpack_settings_payload(nghttp2_settings *frame,
-                                           nghttp2_settings_entry *iv,
-                                           size_t niv) {
-  frame->iv = iv;
-  frame->niv = niv;
-}
-
-void nghttp2_frame_unpack_settings_entry(nghttp2_settings_entry *iv,
-                                         const uint8_t *payload) {
-  iv->settings_id = nghttp2_get_uint16(&payload[0]);
-  iv->value = nghttp2_get_uint32(&payload[2]);
-}
-
-int nghttp2_frame_unpack_settings_payload2(nghttp2_settings_entry **iv_ptr,
-                                           size_t *niv_ptr,
-                                           const uint8_t *payload,
-                                           size_t payloadlen,
-                                           nghttp2_mem *mem) {
-  size_t i;
-
-  *niv_ptr = payloadlen / NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH;
-
-  if (*niv_ptr == 0) {
-    *iv_ptr = NULL;
-
-    return 0;
-  }
-
-  *iv_ptr =
-      nghttp2_mem_malloc(mem, (*niv_ptr) * sizeof(nghttp2_settings_entry));
-
-  if (*iv_ptr == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  for (i = 0; i < *niv_ptr; ++i) {
-    size_t off = i * NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH;
-    nghttp2_frame_unpack_settings_entry(&(*iv_ptr)[i], &payload[off]);
-  }
-
-  return 0;
-}
-
-int nghttp2_frame_pack_push_promise(nghttp2_bufs *bufs,
-                                    nghttp2_push_promise *frame,
-                                    nghttp2_hd_deflater *deflater) {
-  size_t nv_offset = 4;
-  int rv;
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->cur->buf;
-
-  buf->pos += nv_offset;
-  buf->last = buf->pos;
-
-  /* This call will adjust buf->last to the correct position */
-  rv = nghttp2_hd_deflate_hd_bufs(deflater, bufs, frame->nva, frame->nvlen);
-
-  if (rv == NGHTTP2_ERR_BUFFER_ERROR) {
-    rv = NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  buf->pos -= nv_offset;
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  nghttp2_put_uint32be(buf->pos, (uint32_t)frame->promised_stream_id);
-
-  frame->padlen = 0;
-  frame->hd.length = nghttp2_bufs_len(bufs);
-
-  return frame_pack_headers_shared(bufs, &frame->hd);
-}
-
-int nghttp2_frame_unpack_push_promise_payload(nghttp2_push_promise *frame,
-                                              const uint8_t *payload) {
-  frame->promised_stream_id =
-      nghttp2_get_uint32(payload) & NGHTTP2_STREAM_ID_MASK;
-  frame->nva = NULL;
-  frame->nvlen = 0;
-  return 0;
-}
-
-int nghttp2_frame_pack_ping(nghttp2_bufs *bufs, nghttp2_ping *frame) {
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->head->buf;
-
-  assert(nghttp2_buf_avail(buf) >= 8);
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  buf->last =
-      nghttp2_cpymem(buf->last, frame->opaque_data, sizeof(frame->opaque_data));
-
-  return 0;
-}
-
-void nghttp2_frame_unpack_ping_payload(nghttp2_ping *frame,
-                                       const uint8_t *payload) {
-  memcpy(frame->opaque_data, payload, sizeof(frame->opaque_data));
-}
-
-int nghttp2_frame_pack_goaway(nghttp2_bufs *bufs, nghttp2_goaway *frame) {
-  int rv;
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->head->buf;
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  nghttp2_put_uint32be(buf->last, (uint32_t)frame->last_stream_id);
-  buf->last += 4;
-
-  nghttp2_put_uint32be(buf->last, frame->error_code);
-  buf->last += 4;
-
-  rv = nghttp2_bufs_add(bufs, frame->opaque_data, frame->opaque_data_len);
-
-  if (rv == NGHTTP2_ERR_BUFFER_ERROR) {
-    return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-  }
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-void nghttp2_frame_unpack_goaway_payload(nghttp2_goaway *frame,
-                                         const uint8_t *payload,
-                                         uint8_t *var_gift_payload,
-                                         size_t var_gift_payloadlen) {
-  frame->last_stream_id = nghttp2_get_uint32(payload) & NGHTTP2_STREAM_ID_MASK;
-  frame->error_code = nghttp2_get_uint32(payload + 4);
-
-  frame->opaque_data = var_gift_payload;
-  frame->opaque_data_len = var_gift_payloadlen;
-}
-
-int nghttp2_frame_unpack_goaway_payload2(nghttp2_goaway *frame,
-                                         const uint8_t *payload,
-                                         size_t payloadlen, nghttp2_mem *mem) {
-  uint8_t *var_gift_payload;
-  size_t var_gift_payloadlen;
-
-  if (payloadlen > 8) {
-    var_gift_payloadlen = payloadlen - 8;
-  } else {
-    var_gift_payloadlen = 0;
-  }
-
-  payloadlen -= var_gift_payloadlen;
-
-  if (!var_gift_payloadlen) {
-    var_gift_payload = NULL;
-  } else {
-    var_gift_payload = nghttp2_mem_malloc(mem, var_gift_payloadlen);
-
-    if (var_gift_payload == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-
-    memcpy(var_gift_payload, payload + 8, var_gift_payloadlen);
-  }
-
-  nghttp2_frame_unpack_goaway_payload(frame, payload, var_gift_payload,
-                                      var_gift_payloadlen);
-
-  return 0;
-}
-
-int nghttp2_frame_pack_window_update(nghttp2_bufs *bufs,
-                                     nghttp2_window_update *frame) {
-  nghttp2_buf *buf;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->head->buf;
-
-  assert(nghttp2_buf_avail(buf) >= 4);
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  nghttp2_put_uint32be(buf->last, (uint32_t)frame->window_size_increment);
-  buf->last += 4;
-
-  return 0;
-}
-
-void nghttp2_frame_unpack_window_update_payload(nghttp2_window_update *frame,
-                                                const uint8_t *payload) {
-  frame->window_size_increment =
-      nghttp2_get_uint32(payload) & NGHTTP2_WINDOW_SIZE_INCREMENT_MASK;
-}
-
-int nghttp2_frame_pack_altsvc(nghttp2_bufs *bufs, nghttp2_extension *frame) {
-  int rv;
-  nghttp2_buf *buf;
-  nghttp2_ext_altsvc *altsvc;
-
-  /* This is required with --disable-assert. */
-  (void)rv;
-
-  altsvc = frame->payload;
-
-  buf = &bufs->head->buf;
-
-  assert(nghttp2_buf_avail(buf) >=
-         2 + altsvc->origin_len + altsvc->field_value_len);
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  nghttp2_put_uint16be(buf->last, (uint16_t)altsvc->origin_len);
-  buf->last += 2;
-
-  rv = nghttp2_bufs_add(bufs, altsvc->origin, altsvc->origin_len);
-
-  assert(rv == 0);
-
-  rv = nghttp2_bufs_add(bufs, altsvc->field_value, altsvc->field_value_len);
-
-  assert(rv == 0);
-
-  return 0;
-}
-
-void nghttp2_frame_unpack_altsvc_payload(nghttp2_extension *frame,
-                                         size_t origin_len, uint8_t *payload,
-                                         size_t payloadlen) {
-  nghttp2_ext_altsvc *altsvc;
-  uint8_t *p;
-
-  altsvc = frame->payload;
-  p = payload;
-
-  altsvc->origin = p;
-
-  p += origin_len;
-
-  altsvc->origin_len = origin_len;
-
-  altsvc->field_value = p;
-  altsvc->field_value_len = (size_t)(payload + payloadlen - p);
-}
-
-int nghttp2_frame_unpack_altsvc_payload2(nghttp2_extension *frame,
-                                         const uint8_t *payload,
-                                         size_t payloadlen, nghttp2_mem *mem) {
-  uint8_t *buf;
-  size_t origin_len;
-
-  if (payloadlen < 2) {
-    return NGHTTP2_FRAME_SIZE_ERROR;
-  }
-
-  origin_len = nghttp2_get_uint16(payload);
-
-  buf = nghttp2_mem_malloc(mem, payloadlen - 2);
-  if (!buf) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_cpymem(buf, payload + 2, payloadlen - 2);
-
-  nghttp2_frame_unpack_altsvc_payload(frame, origin_len, buf, payloadlen - 2);
-
-  return 0;
-}
-
-int nghttp2_frame_pack_origin(nghttp2_bufs *bufs, nghttp2_extension *frame) {
-  nghttp2_buf *buf;
-  nghttp2_ext_origin *origin;
-  nghttp2_origin_entry *orig;
-  size_t i;
-
-  origin = frame->payload;
-
-  buf = &bufs->head->buf;
-
-  if (nghttp2_buf_avail(buf) < frame->hd.length) {
-    return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-  }
-
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  for (i = 0; i < origin->nov; ++i) {
-    orig = &origin->ov[i];
-    nghttp2_put_uint16be(buf->last, (uint16_t)orig->origin_len);
-    buf->last += 2;
-    buf->last = nghttp2_cpymem(buf->last, orig->origin, orig->origin_len);
-  }
-
-  assert(nghttp2_buf_len(buf) == NGHTTP2_FRAME_HDLEN + frame->hd.length);
-
-  return 0;
-}
-
-int nghttp2_frame_unpack_origin_payload(nghttp2_extension *frame,
-                                        const uint8_t *payload,
-                                        size_t payloadlen, nghttp2_mem *mem) {
-  nghttp2_ext_origin *origin;
-  const uint8_t *p, *end;
-  uint8_t *dst;
-  size_t originlen;
-  nghttp2_origin_entry *ov;
-  size_t nov = 0;
-  size_t len = 0;
-
-  origin = frame->payload;
-  p = payload;
-  end = p + payloadlen;
-
-  for (; p != end;) {
-    if (end - p < 2) {
-      return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-    }
-    originlen = nghttp2_get_uint16(p);
-    p += 2;
-    if (originlen == 0) {
-      continue;
-    }
-    if (originlen > (size_t)(end - p)) {
-      return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-    }
-    p += originlen;
-    /* 1 for terminal NULL */
-    len += originlen + 1;
-    ++nov;
-  }
-
-  if (nov == 0) {
-    origin->ov = NULL;
-    origin->nov = 0;
-
-    return 0;
-  }
-
-  len += nov * sizeof(nghttp2_origin_entry);
-
-  ov = nghttp2_mem_malloc(mem, len);
-  if (ov == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  origin->ov = ov;
-  origin->nov = nov;
-
-  dst = (uint8_t *)ov + nov * sizeof(nghttp2_origin_entry);
-  p = payload;
-
-  for (; p != end;) {
-    originlen = nghttp2_get_uint16(p);
-    p += 2;
-    if (originlen == 0) {
-      continue;
-    }
-    ov->origin = dst;
-    ov->origin_len = originlen;
-    dst = nghttp2_cpymem(dst, p, originlen);
-    *dst++ = '\0';
-    p += originlen;
-    ++ov;
-  }
-
-  return 0;
-}
-
-nghttp2_settings_entry *nghttp2_frame_iv_copy(const nghttp2_settings_entry *iv,
-                                              size_t niv, nghttp2_mem *mem) {
-  nghttp2_settings_entry *iv_copy;
-  size_t len = niv * sizeof(nghttp2_settings_entry);
-
-  if (len == 0) {
-    return NULL;
-  }
-
-  iv_copy = nghttp2_mem_malloc(mem, len);
-
-  if (iv_copy == NULL) {
-    return NULL;
-  }
-
-  memcpy(iv_copy, iv, len);
-
-  return iv_copy;
-}
-
-int nghttp2_nv_equal(const nghttp2_nv *a, const nghttp2_nv *b) {
-  return a->namelen == b->namelen && a->valuelen == b->valuelen &&
-         memcmp(a->name, b->name, a->namelen) == 0 &&
-         memcmp(a->value, b->value, a->valuelen) == 0;
-}
-
-void nghttp2_nv_array_del(nghttp2_nv *nva, nghttp2_mem *mem) {
-  nghttp2_mem_free(mem, nva);
-}
-
-static int bytes_compar(const uint8_t *a, size_t alen, const uint8_t *b,
-                        size_t blen) {
-  int rv;
-
-  if (alen == blen) {
-    return memcmp(a, b, alen);
-  }
-
-  if (alen < blen) {
-    rv = memcmp(a, b, alen);
-
-    if (rv == 0) {
-      return -1;
-    }
-
-    return rv;
-  }
-
-  rv = memcmp(a, b, blen);
-
-  if (rv == 0) {
-    return 1;
-  }
-
-  return rv;
-}
-
-int nghttp2_nv_compare_name(const nghttp2_nv *lhs, const nghttp2_nv *rhs) {
-  return bytes_compar(lhs->name, lhs->namelen, rhs->name, rhs->namelen);
-}
-
-static int nv_compar(const void *lhs, const void *rhs) {
-  const nghttp2_nv *a = (const nghttp2_nv *)lhs;
-  const nghttp2_nv *b = (const nghttp2_nv *)rhs;
-  int rv;
-
-  rv = bytes_compar(a->name, a->namelen, b->name, b->namelen);
-
-  if (rv == 0) {
-    return bytes_compar(a->value, a->valuelen, b->value, b->valuelen);
-  }
-
-  return rv;
-}
-
-void nghttp2_nv_array_sort(nghttp2_nv *nva, size_t nvlen) {
-  qsort(nva, nvlen, sizeof(nghttp2_nv), nv_compar);
-}
-
-int nghttp2_nv_array_copy(nghttp2_nv **nva_ptr, const nghttp2_nv *nva,
-                          size_t nvlen, nghttp2_mem *mem) {
-  size_t i;
-  uint8_t *data = NULL;
-  size_t buflen = 0;
-  nghttp2_nv *p;
-
-  if (nvlen == 0) {
-    *nva_ptr = NULL;
-
-    return 0;
-  }
-
-  for (i = 0; i < nvlen; ++i) {
-    /* + 1 for null-termination */
-    if ((nva[i].flags & NGHTTP2_NV_FLAG_NO_COPY_NAME) == 0) {
-      buflen += nva[i].namelen + 1;
-    }
-    if ((nva[i].flags & NGHTTP2_NV_FLAG_NO_COPY_VALUE) == 0) {
-      buflen += nva[i].valuelen + 1;
-    }
-  }
-
-  buflen += sizeof(nghttp2_nv) * nvlen;
-
-  *nva_ptr = nghttp2_mem_malloc(mem, buflen);
-
-  if (*nva_ptr == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  p = *nva_ptr;
-  data = (uint8_t *)(*nva_ptr) + sizeof(nghttp2_nv) * nvlen;
-
-  for (i = 0; i < nvlen; ++i) {
-    p->flags = nva[i].flags;
-
-    if (nva[i].flags & NGHTTP2_NV_FLAG_NO_COPY_NAME) {
-      p->name = nva[i].name;
-      p->namelen = nva[i].namelen;
-    } else {
-      if (nva[i].namelen) {
-        memcpy(data, nva[i].name, nva[i].namelen);
-      }
-      p->name = data;
-      p->namelen = nva[i].namelen;
-      data[p->namelen] = '\0';
-      nghttp2_downcase(p->name, p->namelen);
-      data += nva[i].namelen + 1;
-    }
-
-    if (nva[i].flags & NGHTTP2_NV_FLAG_NO_COPY_VALUE) {
-      p->value = nva[i].value;
-      p->valuelen = nva[i].valuelen;
-    } else {
-      if (nva[i].valuelen) {
-        memcpy(data, nva[i].value, nva[i].valuelen);
-      }
-      p->value = data;
-      p->valuelen = nva[i].valuelen;
-      data[p->valuelen] = '\0';
-      data += nva[i].valuelen + 1;
-    }
-
-    ++p;
-  }
-  return 0;
-}
-
-int nghttp2_iv_check(const nghttp2_settings_entry *iv, size_t niv) {
-  size_t i;
-  for (i = 0; i < niv; ++i) {
-    switch (iv[i].settings_id) {
-    case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-      break;
-    case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-      break;
-    case NGHTTP2_SETTINGS_ENABLE_PUSH:
-      if (iv[i].value != 0 && iv[i].value != 1) {
-        return 0;
-      }
-      break;
-    case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-      if (iv[i].value > (uint32_t)NGHTTP2_MAX_WINDOW_SIZE) {
-        return 0;
-      }
-      break;
-    case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-      if (iv[i].value < NGHTTP2_MAX_FRAME_SIZE_MIN ||
-          iv[i].value > NGHTTP2_MAX_FRAME_SIZE_MAX) {
-        return 0;
-      }
-      break;
-    case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-      break;
-    }
-  }
-  return 1;
-}
-
-static void frame_set_pad(nghttp2_buf *buf, size_t padlen, int framehd_only) {
-  size_t trail_padlen;
-  size_t newlen;
-
-  DEBUGF("send: padlen=%zu, shift left 1 bytes\n", padlen);
-
-  memmove(buf->pos - 1, buf->pos, NGHTTP2_FRAME_HDLEN);
-
-  --buf->pos;
-
-  buf->pos[4] |= NGHTTP2_FLAG_PADDED;
-
-  newlen = (nghttp2_get_uint32(buf->pos) >> 8) + padlen;
-  nghttp2_put_uint32be(buf->pos, (uint32_t)((newlen << 8) + buf->pos[3]));
-
-  if (framehd_only) {
-    return;
-  }
-
-  trail_padlen = padlen - 1;
-  buf->pos[NGHTTP2_FRAME_HDLEN] = (uint8_t)trail_padlen;
-
-  /* zero out padding */
-  memset(buf->last, 0, trail_padlen);
-  /* extend buffers trail_padlen bytes, since we ate previous padlen -
-     trail_padlen byte(s) */
-  buf->last += trail_padlen;
-}
-
-int nghttp2_frame_add_pad(nghttp2_bufs *bufs, nghttp2_frame_hd *hd,
-                          size_t padlen, int framehd_only) {
-  nghttp2_buf *buf;
-
-  if (padlen == 0) {
-    DEBUGF("send: padlen = 0, nothing to do\n");
-
-    return 0;
-  }
-
-  /*
-   * We have arranged bufs like this:
-   *
-   *  0                   1                   2                   3
-   *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-   * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   * | |Frame header     | Frame payload...                          :
-   * +-+-----------------+-------------------------------------------+
-   * | |Frame header     | Frame payload...                          :
-   * +-+-----------------+-------------------------------------------+
-   * | |Frame header     | Frame payload...                          :
-   * +-+-----------------+-------------------------------------------+
-   *
-   * We arranged padding so that it is included in the first frame
-   * completely.  For padded frame, we are going to adjust buf->pos of
-   * frame which includes padding and serialize (memmove) frame header
-   * in the correct position.  Also extends buf->last to include
-   * padding.
-   */
-
-  buf = &bufs->head->buf;
-
-  assert(nghttp2_buf_avail(buf) >= padlen - 1);
-
-  frame_set_pad(buf, padlen, framehd_only);
-
-  hd->length += padlen;
-  hd->flags |= NGHTTP2_FLAG_PADDED;
-
-  DEBUGF("send: final payloadlen=%zu, padlen=%zu\n", hd->length, padlen);
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_frame.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,624 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_FRAME_H
-#define NGHTTP2_FRAME_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_hd.h"
-#include "nghttp2_buf.h"
-
-#define NGHTTP2_STREAM_ID_MASK ((1u << 31) - 1)
-#define NGHTTP2_PRI_GROUP_ID_MASK ((1u << 31) - 1)
-#define NGHTTP2_PRIORITY_MASK ((1u << 31) - 1)
-#define NGHTTP2_WINDOW_SIZE_INCREMENT_MASK ((1u << 31) - 1)
-#define NGHTTP2_SETTINGS_ID_MASK ((1 << 24) - 1)
-
-/* The number of bytes of frame header. */
-#define NGHTTP2_FRAME_HDLEN 9
-
-#define NGHTTP2_MAX_FRAME_SIZE_MAX ((1 << 24) - 1)
-#define NGHTTP2_MAX_FRAME_SIZE_MIN (1 << 14)
-
-#define NGHTTP2_MAX_PAYLOADLEN 16384
-/* The one frame buffer length for tranmission.  We may use several of
-   them to support CONTINUATION.  To account for Pad Length field, we
-   allocate extra 1 byte, which saves extra large memcopying. */
-#define NGHTTP2_FRAMEBUF_CHUNKLEN                                              \
-  (NGHTTP2_FRAME_HDLEN + 1 + NGHTTP2_MAX_PAYLOADLEN)
-
-/* The default length of DATA frame payload. */
-#define NGHTTP2_DATA_PAYLOADLEN NGHTTP2_MAX_FRAME_SIZE_MIN
-
-/* Maximum headers block size to send, calculated using
-   nghttp2_hd_deflate_bound().  This is the default value, and can be
-   overridden by nghttp2_option_set_max_send_header_block_size(). */
-#define NGHTTP2_MAX_HEADERSLEN 65536
-
-/* The number of bytes for each SETTINGS entry */
-#define NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH 6
-
-/* Length of priority related fields in HEADERS/PRIORITY frames */
-#define NGHTTP2_PRIORITY_SPECLEN 5
-
-/* Maximum length of padding in bytes. */
-#define NGHTTP2_MAX_PADLEN 256
-
-/* Union of extension frame payload */
-typedef union {
-  nghttp2_ext_altsvc altsvc;
-  nghttp2_ext_origin origin;
-} nghttp2_ext_frame_payload;
-
-void nghttp2_frame_pack_frame_hd(uint8_t *buf, const nghttp2_frame_hd *hd);
-
-void nghttp2_frame_unpack_frame_hd(nghttp2_frame_hd *hd, const uint8_t *buf);
-
-/**
- * Initializes frame header |hd| with given parameters.  Reserved bit
- * is set to 0.
- */
-void nghttp2_frame_hd_init(nghttp2_frame_hd *hd, size_t length, uint8_t type,
-                           uint8_t flags, int32_t stream_id);
-
-/**
- * Returns the number of priority field depending on the |flags|.  If
- * |flags| has neither NGHTTP2_FLAG_PRIORITY_GROUP nor
- * NGHTTP2_FLAG_PRIORITY_DEPENDENCY set, return 0.
- */
-size_t nghttp2_frame_priority_len(uint8_t flags);
-
-/**
- * Packs the |pri_spec| in |buf|.  This function assumes |buf| has
- * enough space for serialization.
- */
-void nghttp2_frame_pack_priority_spec(uint8_t *buf,
-                                      const nghttp2_priority_spec *pri_spec);
-
-/**
- * Unpacks the priority specification from payload |payload| of length
- * |payloadlen| to |pri_spec|.  The |flags| is used to determine what
- * kind of priority specification is in |payload|.  This function
- * assumes the |payload| contains whole priority specification.
- */
-void nghttp2_frame_unpack_priority_spec(nghttp2_priority_spec *pri_spec,
-                                        const uint8_t *payload);
-
-/*
- * Returns the offset from the HEADERS frame payload where the
- * compressed header block starts. The frame payload does not include
- * frame header.
- */
-size_t nghttp2_frame_headers_payload_nv_offset(nghttp2_headers *frame);
-
-/*
- * Packs HEADERS frame |frame| in wire format and store it in |bufs|.
- * This function expands |bufs| as necessary to store frame.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * frame->hd.length is assigned after length is determined during
- * packing process.  CONTINUATION frames are also serialized in this
- * function. This function does not handle padding.
- *
- * This function returns 0 if it succeeds, or returns one of the
- * following negative error codes:
- *
- * NGHTTP2_ERR_HEADER_COMP
- *     The deflate operation failed.
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_frame_pack_headers(nghttp2_bufs *bufs, nghttp2_headers *frame,
-                               nghttp2_hd_deflater *deflater);
-
-/*
- * Unpacks HEADERS frame byte sequence into |frame|.  This function
- * only unapcks bytes that come before name/value header block and
- * after possible Pad Length field.
- *
- * This function always succeeds and returns 0.
- */
-int nghttp2_frame_unpack_headers_payload(nghttp2_headers *frame,
-                                         const uint8_t *payload);
-
-/*
- * Packs PRIORITY frame |frame| in wire format and store it in
- * |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function always succeeds and returns 0.
- */
-int nghttp2_frame_pack_priority(nghttp2_bufs *bufs, nghttp2_priority *frame);
-
-/*
- * Unpacks PRIORITY wire format into |frame|.
- */
-void nghttp2_frame_unpack_priority_payload(nghttp2_priority *frame,
-                                           const uint8_t *payload);
-
-/*
- * Packs RST_STREAM frame |frame| in wire frame format and store it in
- * |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function always succeeds and returns 0.
- */
-int nghttp2_frame_pack_rst_stream(nghttp2_bufs *bufs,
-                                  nghttp2_rst_stream *frame);
-
-/*
- * Unpacks RST_STREAM frame byte sequence into |frame|.
- */
-void nghttp2_frame_unpack_rst_stream_payload(nghttp2_rst_stream *frame,
-                                             const uint8_t *payload);
-
-/*
- * Packs SETTINGS frame |frame| in wire format and store it in
- * |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function returns 0 if it succeeds, or returns one of the
- * following negative error codes:
- *
- * NGHTTP2_ERR_FRAME_SIZE_ERROR
- *     The length of the frame is too large.
- */
-int nghttp2_frame_pack_settings(nghttp2_bufs *bufs, nghttp2_settings *frame);
-
-/*
- * Packs the |iv|, which includes |niv| entries, in the |buf|,
- * assuming the |buf| has at least 8 * |niv| bytes.
- *
- * Returns the number of bytes written into the |buf|.
- */
-size_t nghttp2_frame_pack_settings_payload(uint8_t *buf,
-                                           const nghttp2_settings_entry *iv,
-                                           size_t niv);
-
-void nghttp2_frame_unpack_settings_entry(nghttp2_settings_entry *iv,
-                                         const uint8_t *payload);
-
-/*
- * Initializes payload of frame->settings.  The |frame| takes
- * ownership of |iv|.
- */
-void nghttp2_frame_unpack_settings_payload(nghttp2_settings *frame,
-                                           nghttp2_settings_entry *iv,
-                                           size_t niv);
-
-/*
- * Unpacks SETTINGS payload into |*iv_ptr|. The number of entries are
- * assigned to the |*niv_ptr|. This function allocates enough memory
- * to store the result in |*iv_ptr|. The caller is responsible to free
- * |*iv_ptr| after its use.
- *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_frame_unpack_settings_payload2(nghttp2_settings_entry **iv_ptr,
-                                           size_t *niv_ptr,
-                                           const uint8_t *payload,
-                                           size_t payloadlen, nghttp2_mem *mem);
-
-/*
- * Packs PUSH_PROMISE frame |frame| in wire format and store it in
- * |bufs|.  This function expands |bufs| as necessary to store
- * frame.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * frame->hd.length is assigned after length is determined during
- * packing process.  CONTINUATION frames are also serialized in this
- * function. This function does not handle padding.
- *
- * This function returns 0 if it succeeds, or returns one of the
- * following negative error codes:
- *
- * NGHTTP2_ERR_HEADER_COMP
- *     The deflate operation failed.
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_frame_pack_push_promise(nghttp2_bufs *bufs,
-                                    nghttp2_push_promise *frame,
-                                    nghttp2_hd_deflater *deflater);
-
-/*
- * Unpacks PUSH_PROMISE frame byte sequence into |frame|.  This
- * function only unapcks bytes that come before name/value header
- * block and after possible Pad Length field.
- *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_PROTO
- *     TODO END_HEADERS flag is not set
- */
-int nghttp2_frame_unpack_push_promise_payload(nghttp2_push_promise *frame,
-                                              const uint8_t *payload);
-
-/*
- * Packs PING frame |frame| in wire format and store it in
- * |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function always succeeds and returns 0.
- */
-int nghttp2_frame_pack_ping(nghttp2_bufs *bufs, nghttp2_ping *frame);
-
-/*
- * Unpacks PING wire format into |frame|.
- */
-void nghttp2_frame_unpack_ping_payload(nghttp2_ping *frame,
-                                       const uint8_t *payload);
-
-/*
- * Packs GOAWAY frame |frame| in wire format and store it in |bufs|.
- * This function expands |bufs| as necessary to store frame.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_FRAME_SIZE_ERROR
- *     The length of the frame is too large.
- */
-int nghttp2_frame_pack_goaway(nghttp2_bufs *bufs, nghttp2_goaway *frame);
-
-/*
- * Unpacks GOAWAY wire format into |frame|.  The |payload| of length
- * |payloadlen| contains first 8 bytes of payload.  The
- * |var_gift_payload| of length |var_gift_payloadlen| contains
- * remaining payload and its buffer is gifted to the function and then
- * |frame|.  The |var_gift_payloadlen| must be freed by
- * nghttp2_frame_goaway_free().
- */
-void nghttp2_frame_unpack_goaway_payload(nghttp2_goaway *frame,
-                                         const uint8_t *payload,
-                                         uint8_t *var_gift_payload,
-                                         size_t var_gift_payloadlen);
-
-/*
- * Unpacks GOAWAY wire format into |frame|.  This function only exists
- * for unit test.  After allocating buffer for debug data, this
- * function internally calls nghttp2_frame_unpack_goaway_payload().
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_frame_unpack_goaway_payload2(nghttp2_goaway *frame,
-                                         const uint8_t *payload,
-                                         size_t payloadlen, nghttp2_mem *mem);
-
-/*
- * Packs WINDOW_UPDATE frame |frame| in wire frame format and store it
- * in |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function always succeeds and returns 0.
- */
-int nghttp2_frame_pack_window_update(nghttp2_bufs *bufs,
-                                     nghttp2_window_update *frame);
-
-/*
- * Unpacks WINDOW_UPDATE frame byte sequence into |frame|.
- */
-void nghttp2_frame_unpack_window_update_payload(nghttp2_window_update *frame,
-                                                const uint8_t *payload);
-
-/*
- * Packs ALTSVC frame |frame| in wire frame format and store it in
- * |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function always succeeds and returns 0.
- */
-int nghttp2_frame_pack_altsvc(nghttp2_bufs *bufs, nghttp2_extension *ext);
-
-/*
- * Unpacks ALTSVC wire format into |frame|.  The |payload| of
- * |payloadlen| bytes contains frame payload.  This function assumes
- * that frame->payload points to the nghttp2_ext_altsvc object.
- *
- * This function always succeeds and returns 0.
- */
-void nghttp2_frame_unpack_altsvc_payload(nghttp2_extension *frame,
-                                         size_t origin_len, uint8_t *payload,
-                                         size_t payloadlen);
-
-/*
- * Unpacks ALTSVC wire format into |frame|.  This function only exists
- * for unit test.  After allocating buffer for fields, this function
- * internally calls nghttp2_frame_unpack_altsvc_payload().
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_FRAME_SIZE_ERROR
- *     The payload is too small.
- */
-int nghttp2_frame_unpack_altsvc_payload2(nghttp2_extension *frame,
-                                         const uint8_t *payload,
-                                         size_t payloadlen, nghttp2_mem *mem);
-
-/*
- * Packs ORIGIN frame |frame| in wire frame format and store it in
- * |bufs|.
- *
- * The caller must make sure that nghttp2_bufs_reset(bufs) is called
- * before calling this function.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_FRAME_SIZE_ERROR
- *     The length of the frame is too large.
- */
-int nghttp2_frame_pack_origin(nghttp2_bufs *bufs, nghttp2_extension *ext);
-
-/*
- * Unpacks ORIGIN wire format into |frame|.  The |payload| of length
- * |payloadlen| contains the frame payload.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_FRAME_SIZE_ERROR
- *     The payload is too small.
- */
-int nghttp2_frame_unpack_origin_payload(nghttp2_extension *frame,
-                                        const uint8_t *payload,
-                                        size_t payloadlen, nghttp2_mem *mem);
-/*
- * Initializes HEADERS frame |frame| with given values.  |frame| takes
- * ownership of |nva|, so caller must not free it. If |stream_id| is
- * not assigned yet, it must be -1.
- */
-void nghttp2_frame_headers_init(nghttp2_headers *frame, uint8_t flags,
-                                int32_t stream_id, nghttp2_headers_category cat,
-                                const nghttp2_priority_spec *pri_spec,
-                                nghttp2_nv *nva, size_t nvlen);
-
-void nghttp2_frame_headers_free(nghttp2_headers *frame, nghttp2_mem *mem);
-
-void nghttp2_frame_priority_init(nghttp2_priority *frame, int32_t stream_id,
-                                 const nghttp2_priority_spec *pri_spec);
-
-void nghttp2_frame_priority_free(nghttp2_priority *frame);
-
-void nghttp2_frame_rst_stream_init(nghttp2_rst_stream *frame, int32_t stream_id,
-                                   uint32_t error_code);
-
-void nghttp2_frame_rst_stream_free(nghttp2_rst_stream *frame);
-
-/*
- * Initializes PUSH_PROMISE frame |frame| with given values.  |frame|
- * takes ownership of |nva|, so caller must not free it.
- */
-void nghttp2_frame_push_promise_init(nghttp2_push_promise *frame, uint8_t flags,
-                                     int32_t stream_id,
-                                     int32_t promised_stream_id,
-                                     nghttp2_nv *nva, size_t nvlen);
-
-void nghttp2_frame_push_promise_free(nghttp2_push_promise *frame,
-                                     nghttp2_mem *mem);
-
-/*
- * Initializes SETTINGS frame |frame| with given values. |frame| takes
- * ownership of |iv|, so caller must not free it. The |flags| are
- * bitwise-OR of one or more of nghttp2_settings_flag.
- */
-void nghttp2_frame_settings_init(nghttp2_settings *frame, uint8_t flags,
-                                 nghttp2_settings_entry *iv, size_t niv);
-
-void nghttp2_frame_settings_free(nghttp2_settings *frame, nghttp2_mem *mem);
-
-/*
- * Initializes PING frame |frame| with given values. If the
- * |opqeue_data| is not NULL, it must point to 8 bytes memory region
- * of data. The data pointed by |opaque_data| is copied. It can be
- * NULL. In this case, 8 bytes NULL is used.
- */
-void nghttp2_frame_ping_init(nghttp2_ping *frame, uint8_t flags,
-                             const uint8_t *opque_data);
-
-void nghttp2_frame_ping_free(nghttp2_ping *frame);
-
-/*
- * Initializes GOAWAY frame |frame| with given values. On success,
- * this function takes ownership of |opaque_data|, so caller must not
- * free it. If the |opaque_data_len| is 0, opaque_data could be NULL.
- */
-void nghttp2_frame_goaway_init(nghttp2_goaway *frame, int32_t last_stream_id,
-                               uint32_t error_code, uint8_t *opaque_data,
-                               size_t opaque_data_len);
-
-void nghttp2_frame_goaway_free(nghttp2_goaway *frame, nghttp2_mem *mem);
-
-void nghttp2_frame_window_update_init(nghttp2_window_update *frame,
-                                      uint8_t flags, int32_t stream_id,
-                                      int32_t window_size_increment);
-
-void nghttp2_frame_window_update_free(nghttp2_window_update *frame);
-
-void nghttp2_frame_extension_init(nghttp2_extension *frame, uint8_t type,
-                                  uint8_t flags, int32_t stream_id,
-                                  void *payload);
-
-void nghttp2_frame_extension_free(nghttp2_extension *frame);
-
-/*
- * Initializes ALTSVC frame |frame| with given values.  This function
- * assumes that frame->payload points to nghttp2_ext_altsvc object.
- * Also |origin| and |field_value| are allocated in single buffer,
- * starting |origin|.  On success, this function takes ownership of
- * |origin|, so caller must not free it.
- */
-void nghttp2_frame_altsvc_init(nghttp2_extension *frame, int32_t stream_id,
-                               uint8_t *origin, size_t origin_len,
-                               uint8_t *field_value, size_t field_value_len);
-
-/*
- * Frees up resources under |frame|.  This function does not free
- * nghttp2_ext_altsvc object pointed by frame->payload.  This function
- * only frees origin pointed by nghttp2_ext_altsvc.origin.  Therefore,
- * other fields must be allocated in the same buffer with origin.
- */
-void nghttp2_frame_altsvc_free(nghttp2_extension *frame, nghttp2_mem *mem);
-
-/*
- * Initializes ORIGIN frame |frame| with given values.  This function
- * assumes that frame->payload points to nghttp2_ext_origin object.
- * Also |ov| and the memory pointed by the field of its elements are
- * allocated in single buffer, starting with |ov|.  On success, this
- * function takes ownership of |ov|, so caller must not free it.
- */
-void nghttp2_frame_origin_init(nghttp2_extension *frame,
-                               nghttp2_origin_entry *ov, size_t nov);
-
-/*
- * Frees up resources under |frame|.  This function does not free
- * nghttp2_ext_origin object pointed by frame->payload.  This function
- * only frees nghttp2_ext_origin.ov.  Therefore, other fields must be
- * allocated in the same buffer with ov.
- */
-void nghttp2_frame_origin_free(nghttp2_extension *frame, nghttp2_mem *mem);
-
-/*
- * Returns the number of padding bytes after payload.  The total
- * padding length is given in the |padlen|.  The returned value does
- * not include the Pad Length field.  If |padlen| is 0, this function
- * returns 0, regardless of frame->hd.flags.
- */
-size_t nghttp2_frame_trail_padlen(nghttp2_frame *frame, size_t padlen);
-
-void nghttp2_frame_data_init(nghttp2_data *frame, uint8_t flags,
-                             int32_t stream_id);
-
-void nghttp2_frame_data_free(nghttp2_data *frame);
-
-/*
- * Makes copy of |iv| and return the copy. The |niv| is the number of
- * entries in |iv|. This function returns the pointer to the copy if
- * it succeeds, or NULL.
- */
-nghttp2_settings_entry *nghttp2_frame_iv_copy(const nghttp2_settings_entry *iv,
-                                              size_t niv, nghttp2_mem *mem);
-
-/*
- * Sorts the |nva| in ascending order of name and value. If names are
- * equivalent, sort them by value.
- */
-void nghttp2_nv_array_sort(nghttp2_nv *nva, size_t nvlen);
-
-/*
- * Copies name/value pairs from |nva|, which contains |nvlen| pairs,
- * to |*nva_ptr|, which is dynamically allocated so that all items can
- * be stored.  The resultant name and value in nghttp2_nv are
- * guaranteed to be NULL-terminated even if the input is not
- * null-terminated.
- *
- * The |*nva_ptr| must be freed using nghttp2_nv_array_del().
- *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_nv_array_copy(nghttp2_nv **nva_ptr, const nghttp2_nv *nva,
-                          size_t nvlen, nghttp2_mem *mem);
-
-/*
- * Returns nonzero if the name/value pair |a| equals to |b|. The name
- * is compared in case-sensitive, because we ensure that this function
- * is called after the name is lower-cased.
- */
-int nghttp2_nv_equal(const nghttp2_nv *a, const nghttp2_nv *b);
-
-/*
- * Frees |nva|.
- */
-void nghttp2_nv_array_del(nghttp2_nv *nva, nghttp2_mem *mem);
-
-/*
- * Checks that the |iv|, which includes |niv| entries, does not have
- * invalid values.
- *
- * This function returns nonzero if it succeeds, or 0.
- */
-int nghttp2_iv_check(const nghttp2_settings_entry *iv, size_t niv);
-
-/*
- * Sets Pad Length field and flags and adjusts frame header position
- * of each buffers in |bufs|.  The number of padding is given in the
- * |padlen| including Pad Length field.  The |hd| is the frame header
- * for the serialized data.  This function fills zeros padding region
- * unless framehd_only is nonzero.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_FRAME_SIZE_ERROR
- *     The length of the resulting frame is too large.
- */
-int nghttp2_frame_add_pad(nghttp2_bufs *bufs, nghttp2_frame_hd *hd,
-                          size_t padlen, int framehd_only);
-
-#endif /* NGHTTP2_FRAME_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2336 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_hd.h"
-
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-
-#include "nghttp2_helper.h"
-#include "nghttp2_int.h"
-#include "nghttp2_debug.h"
-
-/* Make scalar initialization form of nghttp2_hd_entry */
-#define MAKE_STATIC_ENT(N, V, T, H)                                            \
-  {                                                                            \
-    {NULL, NULL, (uint8_t *)(N), sizeof((N)) - 1, -1},                         \
-        {NULL, NULL, (uint8_t *)(V), sizeof((V)) - 1, -1},                     \
-        {(uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0}, \
-        T, H                                                                   \
-  }
-
-/* Generated by mkstatictbl.py */
-/* 3rd parameter is nghttp2_token value for header field name.  We use
-   first enum value if same header names are repeated (e.g.,
-   :status). */
-static nghttp2_hd_static_entry static_table[] = {
-    MAKE_STATIC_ENT(":authority", "", 0, 3153725150u),
-    MAKE_STATIC_ENT(":method", "GET", 1, 695666056u),
-    MAKE_STATIC_ENT(":method", "POST", 1, 695666056u),
-    MAKE_STATIC_ENT(":path", "/", 3, 3292848686u),
-    MAKE_STATIC_ENT(":path", "/index.html", 3, 3292848686u),
-    MAKE_STATIC_ENT(":scheme", "http", 5, 2510477674u),
-    MAKE_STATIC_ENT(":scheme", "https", 5, 2510477674u),
-    MAKE_STATIC_ENT(":status", "200", 7, 4000288983u),
-    MAKE_STATIC_ENT(":status", "204", 7, 4000288983u),
-    MAKE_STATIC_ENT(":status", "206", 7, 4000288983u),
-    MAKE_STATIC_ENT(":status", "304", 7, 4000288983u),
-    MAKE_STATIC_ENT(":status", "400", 7, 4000288983u),
-    MAKE_STATIC_ENT(":status", "404", 7, 4000288983u),
-    MAKE_STATIC_ENT(":status", "500", 7, 4000288983u),
-    MAKE_STATIC_ENT("accept-charset", "", 14, 3664010344u),
-    MAKE_STATIC_ENT("accept-encoding", "gzip, deflate", 15, 3379649177u),
-    MAKE_STATIC_ENT("accept-language", "", 16, 1979086614u),
-    MAKE_STATIC_ENT("accept-ranges", "", 17, 1713753958u),
-    MAKE_STATIC_ENT("accept", "", 18, 136609321u),
-    MAKE_STATIC_ENT("access-control-allow-origin", "", 19, 2710797292u),
-    MAKE_STATIC_ENT("age", "", 20, 742476188u),
-    MAKE_STATIC_ENT("allow", "", 21, 2930878514u),
-    MAKE_STATIC_ENT("authorization", "", 22, 2436257726u),
-    MAKE_STATIC_ENT("cache-control", "", 23, 1355326669u),
-    MAKE_STATIC_ENT("content-disposition", "", 24, 3889184348u),
-    MAKE_STATIC_ENT("content-encoding", "", 25, 65203592u),
-    MAKE_STATIC_ENT("content-language", "", 26, 24973587u),
-    MAKE_STATIC_ENT("content-length", "", 27, 1308181789u),
-    MAKE_STATIC_ENT("content-location", "", 28, 2302364718u),
-    MAKE_STATIC_ENT("content-range", "", 29, 3555523146u),
-    MAKE_STATIC_ENT("content-type", "", 30, 4244048277u),
-    MAKE_STATIC_ENT("cookie", "", 31, 2007449791u),
-    MAKE_STATIC_ENT("date", "", 32, 3564297305u),
-    MAKE_STATIC_ENT("etag", "", 33, 113792960u),
-    MAKE_STATIC_ENT("expect", "", 34, 2530896728u),
-    MAKE_STATIC_ENT("expires", "", 35, 1049544579u),
-    MAKE_STATIC_ENT("from", "", 36, 2513272949u),
-    MAKE_STATIC_ENT("host", "", 37, 2952701295u),
-    MAKE_STATIC_ENT("if-match", "", 38, 3597694698u),
-    MAKE_STATIC_ENT("if-modified-since", "", 39, 2213050793u),
-    MAKE_STATIC_ENT("if-none-match", "", 40, 2536202615u),
-    MAKE_STATIC_ENT("if-range", "", 41, 2340978238u),
-    MAKE_STATIC_ENT("if-unmodified-since", "", 42, 3794814858u),
-    MAKE_STATIC_ENT("last-modified", "", 43, 3226950251u),
-    MAKE_STATIC_ENT("link", "", 44, 232457833u),
-    MAKE_STATIC_ENT("location", "", 45, 200649126u),
-    MAKE_STATIC_ENT("max-forwards", "", 46, 1826162134u),
-    MAKE_STATIC_ENT("proxy-authenticate", "", 47, 2709445359u),
-    MAKE_STATIC_ENT("proxy-authorization", "", 48, 2686392507u),
-    MAKE_STATIC_ENT("range", "", 49, 4208725202u),
-    MAKE_STATIC_ENT("referer", "", 50, 3969579366u),
-    MAKE_STATIC_ENT("refresh", "", 51, 3572655668u),
-    MAKE_STATIC_ENT("retry-after", "", 52, 3336180598u),
-    MAKE_STATIC_ENT("server", "", 53, 1085029842u),
-    MAKE_STATIC_ENT("set-cookie", "", 54, 1848371000u),
-    MAKE_STATIC_ENT("strict-transport-security", "", 55, 4138147361u),
-    MAKE_STATIC_ENT("transfer-encoding", "", 56, 3719590988u),
-    MAKE_STATIC_ENT("user-agent", "", 57, 606444526u),
-    MAKE_STATIC_ENT("vary", "", 58, 1085005381u),
-    MAKE_STATIC_ENT("via", "", 59, 1762798611u),
-    MAKE_STATIC_ENT("www-authenticate", "", 60, 779865858u),
-};
-
-static int memeq(const void *s1, const void *s2, size_t n) {
-  return memcmp(s1, s2, n) == 0;
-}
-
-/*
- * This function was generated by genlibtokenlookup.py.  Inspired by
- * h2o header lookup.  https://github.com/h2o/h2o
- */
-static int32_t lookup_token(const uint8_t *name, size_t namelen) {
-  switch (namelen) {
-  case 2:
-    switch (name[1]) {
-    case 'e':
-      if (memeq("t", name, 1)) {
-        return NGHTTP2_TOKEN_TE;
-      }
-      break;
-    }
-    break;
-  case 3:
-    switch (name[2]) {
-    case 'a':
-      if (memeq("vi", name, 2)) {
-        return NGHTTP2_TOKEN_VIA;
-      }
-      break;
-    case 'e':
-      if (memeq("ag", name, 2)) {
-        return NGHTTP2_TOKEN_AGE;
-      }
-      break;
-    }
-    break;
-  case 4:
-    switch (name[3]) {
-    case 'e':
-      if (memeq("dat", name, 3)) {
-        return NGHTTP2_TOKEN_DATE;
-      }
-      break;
-    case 'g':
-      if (memeq("eta", name, 3)) {
-        return NGHTTP2_TOKEN_ETAG;
-      }
-      break;
-    case 'k':
-      if (memeq("lin", name, 3)) {
-        return NGHTTP2_TOKEN_LINK;
-      }
-      break;
-    case 'm':
-      if (memeq("fro", name, 3)) {
-        return NGHTTP2_TOKEN_FROM;
-      }
-      break;
-    case 't':
-      if (memeq("hos", name, 3)) {
-        return NGHTTP2_TOKEN_HOST;
-      }
-      break;
-    case 'y':
-      if (memeq("var", name, 3)) {
-        return NGHTTP2_TOKEN_VARY;
-      }
-      break;
-    }
-    break;
-  case 5:
-    switch (name[4]) {
-    case 'e':
-      if (memeq("rang", name, 4)) {
-        return NGHTTP2_TOKEN_RANGE;
-      }
-      break;
-    case 'h':
-      if (memeq(":pat", name, 4)) {
-        return NGHTTP2_TOKEN__PATH;
-      }
-      break;
-    case 'w':
-      if (memeq("allo", name, 4)) {
-        return NGHTTP2_TOKEN_ALLOW;
-      }
-      break;
-    }
-    break;
-  case 6:
-    switch (name[5]) {
-    case 'e':
-      if (memeq("cooki", name, 5)) {
-        return NGHTTP2_TOKEN_COOKIE;
-      }
-      break;
-    case 'r':
-      if (memeq("serve", name, 5)) {
-        return NGHTTP2_TOKEN_SERVER;
-      }
-      break;
-    case 't':
-      if (memeq("accep", name, 5)) {
-        return NGHTTP2_TOKEN_ACCEPT;
-      }
-      if (memeq("expec", name, 5)) {
-        return NGHTTP2_TOKEN_EXPECT;
-      }
-      break;
-    }
-    break;
-  case 7:
-    switch (name[6]) {
-    case 'd':
-      if (memeq(":metho", name, 6)) {
-        return NGHTTP2_TOKEN__METHOD;
-      }
-      break;
-    case 'e':
-      if (memeq(":schem", name, 6)) {
-        return NGHTTP2_TOKEN__SCHEME;
-      }
-      if (memeq("upgrad", name, 6)) {
-        return NGHTTP2_TOKEN_UPGRADE;
-      }
-      break;
-    case 'h':
-      if (memeq("refres", name, 6)) {
-        return NGHTTP2_TOKEN_REFRESH;
-      }
-      break;
-    case 'r':
-      if (memeq("refere", name, 6)) {
-        return NGHTTP2_TOKEN_REFERER;
-      }
-      break;
-    case 's':
-      if (memeq(":statu", name, 6)) {
-        return NGHTTP2_TOKEN__STATUS;
-      }
-      if (memeq("expire", name, 6)) {
-        return NGHTTP2_TOKEN_EXPIRES;
-      }
-      break;
-    }
-    break;
-  case 8:
-    switch (name[7]) {
-    case 'e':
-      if (memeq("if-rang", name, 7)) {
-        return NGHTTP2_TOKEN_IF_RANGE;
-      }
-      break;
-    case 'h':
-      if (memeq("if-matc", name, 7)) {
-        return NGHTTP2_TOKEN_IF_MATCH;
-      }
-      break;
-    case 'n':
-      if (memeq("locatio", name, 7)) {
-        return NGHTTP2_TOKEN_LOCATION;
-      }
-      break;
-    }
-    break;
-  case 10:
-    switch (name[9]) {
-    case 'e':
-      if (memeq("keep-aliv", name, 9)) {
-        return NGHTTP2_TOKEN_KEEP_ALIVE;
-      }
-      if (memeq("set-cooki", name, 9)) {
-        return NGHTTP2_TOKEN_SET_COOKIE;
-      }
-      break;
-    case 'n':
-      if (memeq("connectio", name, 9)) {
-        return NGHTTP2_TOKEN_CONNECTION;
-      }
-      break;
-    case 't':
-      if (memeq("user-agen", name, 9)) {
-        return NGHTTP2_TOKEN_USER_AGENT;
-      }
-      break;
-    case 'y':
-      if (memeq(":authorit", name, 9)) {
-        return NGHTTP2_TOKEN__AUTHORITY;
-      }
-      break;
-    }
-    break;
-  case 11:
-    switch (name[10]) {
-    case 'r':
-      if (memeq("retry-afte", name, 10)) {
-        return NGHTTP2_TOKEN_RETRY_AFTER;
-      }
-      break;
-    }
-    break;
-  case 12:
-    switch (name[11]) {
-    case 'e':
-      if (memeq("content-typ", name, 11)) {
-        return NGHTTP2_TOKEN_CONTENT_TYPE;
-      }
-      break;
-    case 's':
-      if (memeq("max-forward", name, 11)) {
-        return NGHTTP2_TOKEN_MAX_FORWARDS;
-      }
-      break;
-    }
-    break;
-  case 13:
-    switch (name[12]) {
-    case 'd':
-      if (memeq("last-modifie", name, 12)) {
-        return NGHTTP2_TOKEN_LAST_MODIFIED;
-      }
-      break;
-    case 'e':
-      if (memeq("content-rang", name, 12)) {
-        return NGHTTP2_TOKEN_CONTENT_RANGE;
-      }
-      break;
-    case 'h':
-      if (memeq("if-none-matc", name, 12)) {
-        return NGHTTP2_TOKEN_IF_NONE_MATCH;
-      }
-      break;
-    case 'l':
-      if (memeq("cache-contro", name, 12)) {
-        return NGHTTP2_TOKEN_CACHE_CONTROL;
-      }
-      break;
-    case 'n':
-      if (memeq("authorizatio", name, 12)) {
-        return NGHTTP2_TOKEN_AUTHORIZATION;
-      }
-      break;
-    case 's':
-      if (memeq("accept-range", name, 12)) {
-        return NGHTTP2_TOKEN_ACCEPT_RANGES;
-      }
-      break;
-    }
-    break;
-  case 14:
-    switch (name[13]) {
-    case 'h':
-      if (memeq("content-lengt", name, 13)) {
-        return NGHTTP2_TOKEN_CONTENT_LENGTH;
-      }
-      break;
-    case 't':
-      if (memeq("accept-charse", name, 13)) {
-        return NGHTTP2_TOKEN_ACCEPT_CHARSET;
-      }
-      break;
-    }
-    break;
-  case 15:
-    switch (name[14]) {
-    case 'e':
-      if (memeq("accept-languag", name, 14)) {
-        return NGHTTP2_TOKEN_ACCEPT_LANGUAGE;
-      }
-      break;
-    case 'g':
-      if (memeq("accept-encodin", name, 14)) {
-        return NGHTTP2_TOKEN_ACCEPT_ENCODING;
-      }
-      break;
-    }
-    break;
-  case 16:
-    switch (name[15]) {
-    case 'e':
-      if (memeq("content-languag", name, 15)) {
-        return NGHTTP2_TOKEN_CONTENT_LANGUAGE;
-      }
-      if (memeq("www-authenticat", name, 15)) {
-        return NGHTTP2_TOKEN_WWW_AUTHENTICATE;
-      }
-      break;
-    case 'g':
-      if (memeq("content-encodin", name, 15)) {
-        return NGHTTP2_TOKEN_CONTENT_ENCODING;
-      }
-      break;
-    case 'n':
-      if (memeq("content-locatio", name, 15)) {
-        return NGHTTP2_TOKEN_CONTENT_LOCATION;
-      }
-      if (memeq("proxy-connectio", name, 15)) {
-        return NGHTTP2_TOKEN_PROXY_CONNECTION;
-      }
-      break;
-    }
-    break;
-  case 17:
-    switch (name[16]) {
-    case 'e':
-      if (memeq("if-modified-sinc", name, 16)) {
-        return NGHTTP2_TOKEN_IF_MODIFIED_SINCE;
-      }
-      break;
-    case 'g':
-      if (memeq("transfer-encodin", name, 16)) {
-        return NGHTTP2_TOKEN_TRANSFER_ENCODING;
-      }
-      break;
-    }
-    break;
-  case 18:
-    switch (name[17]) {
-    case 'e':
-      if (memeq("proxy-authenticat", name, 17)) {
-        return NGHTTP2_TOKEN_PROXY_AUTHENTICATE;
-      }
-      break;
-    }
-    break;
-  case 19:
-    switch (name[18]) {
-    case 'e':
-      if (memeq("if-unmodified-sinc", name, 18)) {
-        return NGHTTP2_TOKEN_IF_UNMODIFIED_SINCE;
-      }
-      break;
-    case 'n':
-      if (memeq("content-dispositio", name, 18)) {
-        return NGHTTP2_TOKEN_CONTENT_DISPOSITION;
-      }
-      if (memeq("proxy-authorizatio", name, 18)) {
-        return NGHTTP2_TOKEN_PROXY_AUTHORIZATION;
-      }
-      break;
-    }
-    break;
-  case 25:
-    switch (name[24]) {
-    case 'y':
-      if (memeq("strict-transport-securit", name, 24)) {
-        return NGHTTP2_TOKEN_STRICT_TRANSPORT_SECURITY;
-      }
-      break;
-    }
-    break;
-  case 27:
-    switch (name[26]) {
-    case 'n':
-      if (memeq("access-control-allow-origi", name, 26)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_ORIGIN;
-      }
-      break;
-    }
-    break;
-  }
-  return -1;
-}
-
-void nghttp2_hd_entry_init(nghttp2_hd_entry *ent, nghttp2_hd_nv *nv) {
-  ent->nv = *nv;
-  ent->cnv.name = nv->name->base;
-  ent->cnv.namelen = nv->name->len;
-  ent->cnv.value = nv->value->base;
-  ent->cnv.valuelen = nv->value->len;
-  ent->cnv.flags = nv->flags;
-  ent->next = NULL;
-  ent->hash = 0;
-
-  nghttp2_rcbuf_incref(ent->nv.name);
-  nghttp2_rcbuf_incref(ent->nv.value);
-}
-
-void nghttp2_hd_entry_free(nghttp2_hd_entry *ent) {
-  nghttp2_rcbuf_decref(ent->nv.value);
-  nghttp2_rcbuf_decref(ent->nv.name);
-}
-
-static int name_eq(const nghttp2_hd_nv *a, const nghttp2_nv *b) {
-  return a->name->len == b->namelen &&
-         memeq(a->name->base, b->name, b->namelen);
-}
-
-static int value_eq(const nghttp2_hd_nv *a, const nghttp2_nv *b) {
-  return a->value->len == b->valuelen &&
-         memeq(a->value->base, b->value, b->valuelen);
-}
-
-static uint32_t name_hash(const nghttp2_nv *nv) {
-  /* 32 bit FNV-1a: http://isthe.com/chongo/tech/comp/fnv/ */
-  uint32_t h = 2166136261u;
-  size_t i;
-
-  for (i = 0; i < nv->namelen; ++i) {
-    h ^= nv->name[i];
-    h += (h << 1) + (h << 4) + (h << 7) + (h << 8) + (h << 24);
-  }
-
-  return h;
-}
-
-static void hd_map_init(nghttp2_hd_map *map) {
-  memset(map, 0, sizeof(nghttp2_hd_map));
-}
-
-static void hd_map_insert(nghttp2_hd_map *map, nghttp2_hd_entry *ent) {
-  nghttp2_hd_entry **bucket;
-
-  bucket = &map->table[ent->hash & (HD_MAP_SIZE - 1)];
-
-  if (*bucket == NULL) {
-    *bucket = ent;
-    return;
-  }
-
-  /* lower index is linked near the root */
-  ent->next = *bucket;
-  *bucket = ent;
-}
-
-static nghttp2_hd_entry *hd_map_find(nghttp2_hd_map *map, int *exact_match,
-                                     const nghttp2_nv *nv, int32_t token,
-                                     uint32_t hash, int name_only) {
-  nghttp2_hd_entry *p;
-  nghttp2_hd_entry *res = NULL;
-
-  *exact_match = 0;
-
-  for (p = map->table[hash & (HD_MAP_SIZE - 1)]; p; p = p->next) {
-    if (token != p->nv.token ||
-        (token == -1 && (hash != p->hash || !name_eq(&p->nv, nv)))) {
-      continue;
-    }
-    if (!res) {
-      res = p;
-      if (name_only) {
-        break;
-      }
-    }
-    if (value_eq(&p->nv, nv)) {
-      res = p;
-      *exact_match = 1;
-      break;
-    }
-  }
-
-  return res;
-}
-
-static void hd_map_remove(nghttp2_hd_map *map, nghttp2_hd_entry *ent) {
-  nghttp2_hd_entry **dst;
-
-  dst = &map->table[ent->hash & (HD_MAP_SIZE - 1)];
-
-  for (; *dst; dst = &(*dst)->next) {
-    if (*dst != ent) {
-      continue;
-    }
-
-    *dst = ent->next;
-    ent->next = NULL;
-    return;
-  }
-}
-
-static int hd_ringbuf_init(nghttp2_hd_ringbuf *ringbuf, size_t bufsize,
-                           nghttp2_mem *mem) {
-  size_t size;
-  for (size = 1; size < bufsize; size <<= 1)
-    ;
-  ringbuf->buffer = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry *) * size);
-  if (ringbuf->buffer == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-  ringbuf->mask = size - 1;
-  ringbuf->first = 0;
-  ringbuf->len = 0;
-  return 0;
-}
-
-static nghttp2_hd_entry *hd_ringbuf_get(nghttp2_hd_ringbuf *ringbuf,
-                                        size_t idx) {
-  assert(idx < ringbuf->len);
-  return ringbuf->buffer[(ringbuf->first + idx) & ringbuf->mask];
-}
-
-static int hd_ringbuf_reserve(nghttp2_hd_ringbuf *ringbuf, size_t bufsize,
-                              nghttp2_mem *mem) {
-  size_t i;
-  size_t size;
-  nghttp2_hd_entry **buffer;
-
-  if (ringbuf->mask + 1 >= bufsize) {
-    return 0;
-  }
-  for (size = 1; size < bufsize; size <<= 1)
-    ;
-  buffer = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry *) * size);
-  if (buffer == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-  for (i = 0; i < ringbuf->len; ++i) {
-    buffer[i] = hd_ringbuf_get(ringbuf, i);
-  }
-  nghttp2_mem_free(mem, ringbuf->buffer);
-  ringbuf->buffer = buffer;
-  ringbuf->mask = size - 1;
-  ringbuf->first = 0;
-  return 0;
-}
-
-static void hd_ringbuf_free(nghttp2_hd_ringbuf *ringbuf, nghttp2_mem *mem) {
-  size_t i;
-  if (ringbuf == NULL) {
-    return;
-  }
-  for (i = 0; i < ringbuf->len; ++i) {
-    nghttp2_hd_entry *ent = hd_ringbuf_get(ringbuf, i);
-
-    nghttp2_hd_entry_free(ent);
-    nghttp2_mem_free(mem, ent);
-  }
-  nghttp2_mem_free(mem, ringbuf->buffer);
-}
-
-static int hd_ringbuf_push_front(nghttp2_hd_ringbuf *ringbuf,
-                                 nghttp2_hd_entry *ent, nghttp2_mem *mem) {
-  int rv;
-
-  rv = hd_ringbuf_reserve(ringbuf, ringbuf->len + 1, mem);
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  ringbuf->buffer[--ringbuf->first & ringbuf->mask] = ent;
-  ++ringbuf->len;
-
-  return 0;
-}
-
-static void hd_ringbuf_pop_back(nghttp2_hd_ringbuf *ringbuf) {
-  assert(ringbuf->len > 0);
-  --ringbuf->len;
-}
-
-static int hd_context_init(nghttp2_hd_context *context, nghttp2_mem *mem) {
-  int rv;
-  context->mem = mem;
-  context->bad = 0;
-  context->hd_table_bufsize_max = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
-  rv = hd_ringbuf_init(
-      &context->hd_table,
-      context->hd_table_bufsize_max / NGHTTP2_HD_ENTRY_OVERHEAD, mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  context->hd_table_bufsize = 0;
-  context->next_seq = 0;
-
-  return 0;
-}
-
-static void hd_context_free(nghttp2_hd_context *context) {
-  hd_ringbuf_free(&context->hd_table, context->mem);
-}
-
-int nghttp2_hd_deflate_init(nghttp2_hd_deflater *deflater, nghttp2_mem *mem) {
-  return nghttp2_hd_deflate_init2(
-      deflater, NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE, mem);
-}
-
-int nghttp2_hd_deflate_init2(nghttp2_hd_deflater *deflater,
-                             size_t max_deflate_dynamic_table_size,
-                             nghttp2_mem *mem) {
-  int rv;
-  rv = hd_context_init(&deflater->ctx, mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  hd_map_init(&deflater->map);
-
-  if (max_deflate_dynamic_table_size < NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE) {
-    deflater->notify_table_size_change = 1;
-    deflater->ctx.hd_table_bufsize_max = max_deflate_dynamic_table_size;
-  } else {
-    deflater->notify_table_size_change = 0;
-  }
-
-  deflater->deflate_hd_table_bufsize_max = max_deflate_dynamic_table_size;
-  deflater->min_hd_table_bufsize_max = UINT32_MAX;
-
-  return 0;
-}
-
-int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater, nghttp2_mem *mem) {
-  int rv;
-
-  rv = hd_context_init(&inflater->ctx, mem);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  inflater->settings_hd_table_bufsize_max = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
-  inflater->min_hd_table_bufsize_max = UINT32_MAX;
-
-  inflater->nv_name_keep = NULL;
-  inflater->nv_value_keep = NULL;
-
-  inflater->opcode = NGHTTP2_HD_OPCODE_NONE;
-  inflater->state = NGHTTP2_HD_STATE_INFLATE_START;
-
-  nghttp2_buf_init(&inflater->namebuf);
-  nghttp2_buf_init(&inflater->valuebuf);
-
-  inflater->namercbuf = NULL;
-  inflater->valuercbuf = NULL;
-
-  inflater->huffman_encoded = 0;
-  inflater->index = 0;
-  inflater->left = 0;
-  inflater->shift = 0;
-  inflater->index_required = 0;
-  inflater->no_index = 0;
-
-  return 0;
-
-fail:
-  return rv;
-}
-
-static void hd_inflate_keep_free(nghttp2_hd_inflater *inflater) {
-  nghttp2_rcbuf_decref(inflater->nv_value_keep);
-  nghttp2_rcbuf_decref(inflater->nv_name_keep);
-
-  inflater->nv_value_keep = NULL;
-  inflater->nv_name_keep = NULL;
-}
-
-void nghttp2_hd_deflate_free(nghttp2_hd_deflater *deflater) {
-  hd_context_free(&deflater->ctx);
-}
-
-void nghttp2_hd_inflate_free(nghttp2_hd_inflater *inflater) {
-  hd_inflate_keep_free(inflater);
-
-  nghttp2_rcbuf_decref(inflater->valuercbuf);
-  nghttp2_rcbuf_decref(inflater->namercbuf);
-
-  hd_context_free(&inflater->ctx);
-}
-
-static size_t entry_room(size_t namelen, size_t valuelen) {
-  return NGHTTP2_HD_ENTRY_OVERHEAD + namelen + valuelen;
-}
-
-static void emit_header(nghttp2_hd_nv *nv_out, nghttp2_hd_nv *nv) {
-  DEBUGF("inflatehd: header emission: %s: %s\n", nv->name->base,
-         nv->value->base);
-  /* ent->ref may be 0. This happens if the encoder emits literal
-     block larger than header table capacity with indexing. */
-  *nv_out = *nv;
-}
-
-static size_t count_encoded_length(size_t n, size_t prefix) {
-  size_t k = (size_t)((1 << prefix) - 1);
-  size_t len = 0;
-
-  if (n < k) {
-    return 1;
-  }
-
-  n -= k;
-  ++len;
-
-  for (; n >= 128; n >>= 7, ++len)
-    ;
-
-  return len + 1;
-}
-
-static size_t encode_length(uint8_t *buf, size_t n, size_t prefix) {
-  size_t k = (size_t)((1 << prefix) - 1);
-  uint8_t *begin = buf;
-
-  *buf = (uint8_t)(*buf & ~k);
-
-  if (n < k) {
-    *buf = (uint8_t)(*buf | n);
-    return 1;
-  }
-
-  *buf = (uint8_t)(*buf | k);
-  ++buf;
-
-  n -= k;
-
-  for (; n >= 128; n >>= 7) {
-    *buf++ = (uint8_t)((1 << 7) | (n & 0x7f));
-  }
-
-  *buf++ = (uint8_t)n;
-
-  return (size_t)(buf - begin);
-}
-
-/*
- * Decodes |prefix| prefixed integer stored from |in|.  The |last|
- * represents the 1 beyond the last of the valid contiguous memory
- * region from |in|.  The decoded integer must be less than or equal
- * to UINT32_MAX.
- *
- * If the |initial| is nonzero, it is used as a initial value, this
- * function assumes the |in| starts with intermediate data.
- *
- * An entire integer is decoded successfully, decoded, the |*fin| is
- * set to nonzero.
- *
- * This function stores the decoded integer in |*res| if it succeed,
- * including partial decoding (in this case, number of shift to make
- * in the next call will be stored in |*shift_ptr|) and returns number
- * of bytes processed, or returns -1, indicating decoding error.
- */
-static ssize_t decode_length(uint32_t *res, size_t *shift_ptr, int *fin,
-                             uint32_t initial, size_t shift, const uint8_t *in,
-                             const uint8_t *last, size_t prefix) {
-  uint32_t k = (uint8_t)((1 << prefix) - 1);
-  uint32_t n = initial;
-  const uint8_t *start = in;
-
-  *shift_ptr = 0;
-  *fin = 0;
-
-  if (n == 0) {
-    if ((*in & k) != k) {
-      *res = (*in) & k;
-      *fin = 1;
-      return 1;
-    }
-
-    n = k;
-
-    if (++in == last) {
-      *res = n;
-      return (ssize_t)(in - start);
-    }
-  }
-
-  for (; in != last; ++in, shift += 7) {
-    uint32_t add = *in & 0x7f;
-
-    if (shift >= 32) {
-      DEBUGF("inflate: shift exponent overflow\n");
-      return -1;
-    }
-
-    if ((UINT32_MAX >> shift) < add) {
-      DEBUGF("inflate: integer overflow on shift\n");
-      return -1;
-    }
-
-    add <<= shift;
-
-    if (UINT32_MAX - add < n) {
-      DEBUGF("inflate: integer overflow on addition\n");
-      return -1;
-    }
-
-    n += add;
-
-    if ((*in & (1 << 7)) == 0) {
-      break;
-    }
-  }
-
-  *shift_ptr = shift;
-
-  if (in == last) {
-    *res = n;
-    return (ssize_t)(in - start);
-  }
-
-  *res = n;
-  *fin = 1;
-  return (ssize_t)(in + 1 - start);
-}
-
-static int emit_table_size(nghttp2_bufs *bufs, size_t table_size) {
-  int rv;
-  uint8_t *bufp;
-  size_t blocklen;
-  uint8_t sb[16];
-
-  DEBUGF("deflatehd: emit table_size=%zu\n", table_size);
-
-  blocklen = count_encoded_length(table_size, 5);
-
-  if (sizeof(sb) < blocklen) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  bufp = sb;
-
-  *bufp = 0x20u;
-
-  encode_length(bufp, table_size, 5);
-
-  rv = nghttp2_bufs_add(bufs, sb, blocklen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-static int emit_indexed_block(nghttp2_bufs *bufs, size_t idx) {
-  int rv;
-  size_t blocklen;
-  uint8_t sb[16];
-  uint8_t *bufp;
-
-  blocklen = count_encoded_length(idx + 1, 7);
-
-  DEBUGF("deflatehd: emit indexed index=%zu, %zu bytes\n", idx, blocklen);
-
-  if (sizeof(sb) < blocklen) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  bufp = sb;
-  *bufp = 0x80u;
-  encode_length(bufp, idx + 1, 7);
-
-  rv = nghttp2_bufs_add(bufs, sb, blocklen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-static int emit_string(nghttp2_bufs *bufs, const uint8_t *str, size_t len) {
-  int rv;
-  uint8_t sb[16];
-  uint8_t *bufp;
-  size_t blocklen;
-  size_t enclen;
-  int huffman = 0;
-
-  enclen = nghttp2_hd_huff_encode_count(str, len);
-
-  if (enclen < len) {
-    huffman = 1;
-  } else {
-    enclen = len;
-  }
-
-  blocklen = count_encoded_length(enclen, 7);
-
-  DEBUGF("deflatehd: emit string str=%.*s, length=%zu, huffman=%d, "
-         "encoded_length=%zu\n",
-         (int)len, (const char *)str, len, huffman, enclen);
-
-  if (sizeof(sb) < blocklen) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  bufp = sb;
-  *bufp = huffman ? 1 << 7 : 0;
-  encode_length(bufp, enclen, 7);
-
-  rv = nghttp2_bufs_add(bufs, sb, blocklen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  if (huffman) {
-    rv = nghttp2_hd_huff_encode(bufs, str, len);
-  } else {
-    assert(enclen == len);
-    rv = nghttp2_bufs_add(bufs, str, len);
-  }
-
-  return rv;
-}
-
-static uint8_t pack_first_byte(int indexing_mode) {
-  switch (indexing_mode) {
-  case NGHTTP2_HD_WITH_INDEXING:
-    return 0x40u;
-  case NGHTTP2_HD_WITHOUT_INDEXING:
-    return 0;
-  case NGHTTP2_HD_NEVER_INDEXING:
-    return 0x10u;
-  default:
-    assert(0);
-  }
-  /* This is required to compile with android NDK r10d +
-     --enable-werror */
-  return 0;
-}
-
-static int emit_indname_block(nghttp2_bufs *bufs, size_t idx,
-                              const nghttp2_nv *nv, int indexing_mode) {
-  int rv;
-  uint8_t *bufp;
-  size_t blocklen;
-  uint8_t sb[16];
-  size_t prefixlen;
-
-  if (indexing_mode == NGHTTP2_HD_WITH_INDEXING) {
-    prefixlen = 6;
-  } else {
-    prefixlen = 4;
-  }
-
-  DEBUGF("deflatehd: emit indname index=%zu, valuelen=%zu, indexing_mode=%d\n",
-         idx, nv->valuelen, indexing_mode);
-
-  blocklen = count_encoded_length(idx + 1, prefixlen);
-
-  if (sizeof(sb) < blocklen) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  bufp = sb;
-
-  *bufp = pack_first_byte(indexing_mode);
-
-  encode_length(bufp, idx + 1, prefixlen);
-
-  rv = nghttp2_bufs_add(bufs, sb, blocklen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  rv = emit_string(bufs, nv->value, nv->valuelen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-static int emit_newname_block(nghttp2_bufs *bufs, const nghttp2_nv *nv,
-                              int indexing_mode) {
-  int rv;
-
-  DEBUGF(
-      "deflatehd: emit newname namelen=%zu, valuelen=%zu, indexing_mode=%d\n",
-      nv->namelen, nv->valuelen, indexing_mode);
-
-  rv = nghttp2_bufs_addb(bufs, pack_first_byte(indexing_mode));
-  if (rv != 0) {
-    return rv;
-  }
-
-  rv = emit_string(bufs, nv->name, nv->namelen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  rv = emit_string(bufs, nv->value, nv->valuelen);
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-static int add_hd_table_incremental(nghttp2_hd_context *context,
-                                    nghttp2_hd_nv *nv, nghttp2_hd_map *map,
-                                    uint32_t hash) {
-  int rv;
-  nghttp2_hd_entry *new_ent;
-  size_t room;
-  nghttp2_mem *mem;
-
-  mem = context->mem;
-  room = entry_room(nv->name->len, nv->value->len);
-
-  while (context->hd_table_bufsize + room > context->hd_table_bufsize_max &&
-         context->hd_table.len > 0) {
-
-    size_t idx = context->hd_table.len - 1;
-    nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, idx);
-
-    context->hd_table_bufsize -=
-        entry_room(ent->nv.name->len, ent->nv.value->len);
-
-    DEBUGF("hpack: remove item from header table: %s: %s\n",
-           (char *)ent->nv.name->base, (char *)ent->nv.value->base);
-
-    hd_ringbuf_pop_back(&context->hd_table);
-    if (map) {
-      hd_map_remove(map, ent);
-    }
-
-    nghttp2_hd_entry_free(ent);
-    nghttp2_mem_free(mem, ent);
-  }
-
-  if (room > context->hd_table_bufsize_max) {
-    /* The entry taking more than NGHTTP2_HD_MAX_BUFFER_SIZE is
-       immediately evicted.  So we don't allocate memory for it. */
-    return 0;
-  }
-
-  new_ent = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry));
-  if (new_ent == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_hd_entry_init(new_ent, nv);
-
-  rv = hd_ringbuf_push_front(&context->hd_table, new_ent, mem);
-
-  if (rv != 0) {
-    nghttp2_hd_entry_free(new_ent);
-    nghttp2_mem_free(mem, new_ent);
-
-    return rv;
-  }
-
-  new_ent->seq = context->next_seq++;
-  new_ent->hash = hash;
-
-  if (map) {
-    hd_map_insert(map, new_ent);
-  }
-
-  context->hd_table_bufsize += room;
-
-  return 0;
-}
-
-typedef struct {
-  ssize_t index;
-  /* Nonzero if both name and value are matched. */
-  int name_value_match;
-} search_result;
-
-static search_result search_static_table(const nghttp2_nv *nv, int32_t token,
-                                         int name_only) {
-  search_result res = {token, 0};
-  int i;
-  nghttp2_hd_static_entry *ent;
-
-  if (name_only) {
-    return res;
-  }
-
-  for (i = token;
-       i <= NGHTTP2_TOKEN_WWW_AUTHENTICATE && static_table[i].token == token;
-       ++i) {
-    ent = &static_table[i];
-    if (ent->value.len == nv->valuelen &&
-        memcmp(ent->value.base, nv->value, nv->valuelen) == 0) {
-      res.index = i;
-      res.name_value_match = 1;
-      return res;
-    }
-  }
-  return res;
-}
-
-static search_result search_hd_table(nghttp2_hd_context *context,
-                                     const nghttp2_nv *nv, int32_t token,
-                                     int indexing_mode, nghttp2_hd_map *map,
-                                     uint32_t hash) {
-  search_result res = {-1, 0};
-  nghttp2_hd_entry *ent;
-  int exact_match;
-  int name_only = indexing_mode == NGHTTP2_HD_NEVER_INDEXING;
-
-  exact_match = 0;
-  ent = hd_map_find(map, &exact_match, nv, token, hash, name_only);
-
-  if (!exact_match && token >= 0 && token <= NGHTTP2_TOKEN_WWW_AUTHENTICATE) {
-    return search_static_table(nv, token, name_only);
-  }
-
-  if (ent == NULL) {
-    return res;
-  }
-
-  res.index =
-      (ssize_t)(context->next_seq - 1 - ent->seq + NGHTTP2_STATIC_TABLE_LENGTH);
-  res.name_value_match = exact_match;
-
-  return res;
-}
-
-static void hd_context_shrink_table_size(nghttp2_hd_context *context,
-                                         nghttp2_hd_map *map) {
-  nghttp2_mem *mem;
-
-  mem = context->mem;
-
-  while (context->hd_table_bufsize > context->hd_table_bufsize_max &&
-         context->hd_table.len > 0) {
-    size_t idx = context->hd_table.len - 1;
-    nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, idx);
-    context->hd_table_bufsize -=
-        entry_room(ent->nv.name->len, ent->nv.value->len);
-    hd_ringbuf_pop_back(&context->hd_table);
-    if (map) {
-      hd_map_remove(map, ent);
-    }
-
-    nghttp2_hd_entry_free(ent);
-    nghttp2_mem_free(mem, ent);
-  }
-}
-
-int nghttp2_hd_deflate_change_table_size(
-    nghttp2_hd_deflater *deflater, size_t settings_max_dynamic_table_size) {
-  size_t next_bufsize = nghttp2_min(settings_max_dynamic_table_size,
-                                    deflater->deflate_hd_table_bufsize_max);
-
-  deflater->ctx.hd_table_bufsize_max = next_bufsize;
-
-  deflater->min_hd_table_bufsize_max =
-      nghttp2_min(deflater->min_hd_table_bufsize_max, next_bufsize);
-
-  deflater->notify_table_size_change = 1;
-
-  hd_context_shrink_table_size(&deflater->ctx, &deflater->map);
-  return 0;
-}
-
-int nghttp2_hd_inflate_change_table_size(
-    nghttp2_hd_inflater *inflater, size_t settings_max_dynamic_table_size) {
-  switch (inflater->state) {
-  case NGHTTP2_HD_STATE_EXPECT_TABLE_SIZE:
-  case NGHTTP2_HD_STATE_INFLATE_START:
-    break;
-  default:
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  /* It seems that encoder is not required to send dynamic table size
-     update if the table size is not changed after applying
-     SETTINGS_HEADER_TABLE_SIZE.  RFC 7541 is ambiguous here, but this
-     is the intention of the editor.  If new maximum table size is
-     strictly smaller than the current negotiated maximum size,
-     encoder must send dynamic table size update.  In other cases, we
-     cannot expect it to do so. */
-  if (inflater->ctx.hd_table_bufsize_max > settings_max_dynamic_table_size) {
-    inflater->state = NGHTTP2_HD_STATE_EXPECT_TABLE_SIZE;
-    /* Remember minimum value, and validate that encoder sends the
-       value less than or equal to this. */
-    inflater->min_hd_table_bufsize_max = settings_max_dynamic_table_size;
-  }
-
-  inflater->settings_hd_table_bufsize_max = settings_max_dynamic_table_size;
-
-  inflater->ctx.hd_table_bufsize_max = settings_max_dynamic_table_size;
-
-  hd_context_shrink_table_size(&inflater->ctx, NULL);
-  return 0;
-}
-
-#define INDEX_RANGE_VALID(context, idx)                                        \
-  ((idx) < (context)->hd_table.len + NGHTTP2_STATIC_TABLE_LENGTH)
-
-static size_t get_max_index(nghttp2_hd_context *context) {
-  return context->hd_table.len + NGHTTP2_STATIC_TABLE_LENGTH;
-}
-
-nghttp2_hd_nv nghttp2_hd_table_get(nghttp2_hd_context *context, size_t idx) {
-  assert(INDEX_RANGE_VALID(context, idx));
-  if (idx >= NGHTTP2_STATIC_TABLE_LENGTH) {
-    return hd_ringbuf_get(&context->hd_table, idx - NGHTTP2_STATIC_TABLE_LENGTH)
-        ->nv;
-  } else {
-    nghttp2_hd_static_entry *ent = &static_table[idx];
-    nghttp2_hd_nv nv = {&ent->name, &ent->value, ent->token,
-                        NGHTTP2_NV_FLAG_NONE};
-    return nv;
-  }
-}
-
-static const nghttp2_nv *nghttp2_hd_table_get2(nghttp2_hd_context *context,
-                                               size_t idx) {
-  assert(INDEX_RANGE_VALID(context, idx));
-  if (idx >= NGHTTP2_STATIC_TABLE_LENGTH) {
-    return &hd_ringbuf_get(&context->hd_table,
-                           idx - NGHTTP2_STATIC_TABLE_LENGTH)
-                ->cnv;
-  }
-
-  return &static_table[idx].cnv;
-}
-
-static int hd_deflate_decide_indexing(nghttp2_hd_deflater *deflater,
-                                      const nghttp2_nv *nv, int32_t token) {
-  if (token == NGHTTP2_TOKEN__PATH || token == NGHTTP2_TOKEN_AGE ||
-      token == NGHTTP2_TOKEN_CONTENT_LENGTH || token == NGHTTP2_TOKEN_ETAG ||
-      token == NGHTTP2_TOKEN_IF_MODIFIED_SINCE ||
-      token == NGHTTP2_TOKEN_IF_NONE_MATCH || token == NGHTTP2_TOKEN_LOCATION ||
-      token == NGHTTP2_TOKEN_SET_COOKIE ||
-      entry_room(nv->namelen, nv->valuelen) >
-          deflater->ctx.hd_table_bufsize_max * 3 / 4) {
-    return NGHTTP2_HD_WITHOUT_INDEXING;
-  }
-
-  return NGHTTP2_HD_WITH_INDEXING;
-}
-
-static int deflate_nv(nghttp2_hd_deflater *deflater, nghttp2_bufs *bufs,
-                      const nghttp2_nv *nv) {
-  int rv;
-  search_result res;
-  ssize_t idx;
-  int indexing_mode;
-  int32_t token;
-  nghttp2_mem *mem;
-  uint32_t hash = 0;
-
-  DEBUGF("deflatehd: deflating %.*s: %.*s\n", (int)nv->namelen, nv->name,
-         (int)nv->valuelen, nv->value);
-
-  mem = deflater->ctx.mem;
-
-  token = lookup_token(nv->name, nv->namelen);
-  if (token == -1) {
-    hash = name_hash(nv);
-  } else if (token <= NGHTTP2_TOKEN_WWW_AUTHENTICATE) {
-    hash = static_table[token].hash;
-  }
-
-  /* Don't index authorization header field since it may contain low
-     entropy secret data (e.g., id/password).  Also cookie header
-     field with less than 20 bytes value is also never indexed.  This
-     is the same criteria used in Firefox codebase. */
-  indexing_mode =
-      token == NGHTTP2_TOKEN_AUTHORIZATION ||
-              (token == NGHTTP2_TOKEN_COOKIE && nv->valuelen < 20) ||
-              (nv->flags & NGHTTP2_NV_FLAG_NO_INDEX)
-          ? NGHTTP2_HD_NEVER_INDEXING
-          : hd_deflate_decide_indexing(deflater, nv, token);
-
-  res = search_hd_table(&deflater->ctx, nv, token, indexing_mode,
-                        &deflater->map, hash);
-
-  idx = res.index;
-
-  if (res.name_value_match) {
-
-    DEBUGF("deflatehd: name/value match index=%zd\n", idx);
-
-    rv = emit_indexed_block(bufs, (size_t)idx);
-    if (rv != 0) {
-      return rv;
-    }
-
-    return 0;
-  }
-
-  if (res.index != -1) {
-    DEBUGF("deflatehd: name match index=%zd\n", res.index);
-  }
-
-  if (indexing_mode == NGHTTP2_HD_WITH_INDEXING) {
-    nghttp2_hd_nv hd_nv;
-
-    if (idx != -1 && idx < (ssize_t)NGHTTP2_STATIC_TABLE_LENGTH) {
-      hd_nv.name = nghttp2_hd_table_get(&deflater->ctx, (size_t)idx).name;
-      nghttp2_rcbuf_incref(hd_nv.name);
-    } else {
-      rv = nghttp2_rcbuf_new2(&hd_nv.name, nv->name, nv->namelen, mem);
-      if (rv != 0) {
-        return rv;
-      }
-    }
-
-    rv = nghttp2_rcbuf_new2(&hd_nv.value, nv->value, nv->valuelen, mem);
-
-    if (rv != 0) {
-      nghttp2_rcbuf_decref(hd_nv.name);
-      return rv;
-    }
-
-    hd_nv.token = token;
-    hd_nv.flags = NGHTTP2_NV_FLAG_NONE;
-
-    rv = add_hd_table_incremental(&deflater->ctx, &hd_nv, &deflater->map, hash);
-
-    nghttp2_rcbuf_decref(hd_nv.value);
-    nghttp2_rcbuf_decref(hd_nv.name);
-
-    if (rv != 0) {
-      return NGHTTP2_ERR_HEADER_COMP;
-    }
-  }
-  if (idx == -1) {
-    rv = emit_newname_block(bufs, nv, indexing_mode);
-  } else {
-    rv = emit_indname_block(bufs, (size_t)idx, nv, indexing_mode);
-  }
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_hd_deflate_hd_bufs(nghttp2_hd_deflater *deflater,
-                               nghttp2_bufs *bufs, const nghttp2_nv *nv,
-                               size_t nvlen) {
-  size_t i;
-  int rv = 0;
-
-  if (deflater->ctx.bad) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  if (deflater->notify_table_size_change) {
-    size_t min_hd_table_bufsize_max;
-
-    min_hd_table_bufsize_max = deflater->min_hd_table_bufsize_max;
-
-    deflater->notify_table_size_change = 0;
-    deflater->min_hd_table_bufsize_max = UINT32_MAX;
-
-    if (deflater->ctx.hd_table_bufsize_max > min_hd_table_bufsize_max) {
-
-      rv = emit_table_size(bufs, min_hd_table_bufsize_max);
-
-      if (rv != 0) {
-        goto fail;
-      }
-    }
-
-    rv = emit_table_size(bufs, deflater->ctx.hd_table_bufsize_max);
-
-    if (rv != 0) {
-      goto fail;
-    }
-  }
-
-  for (i = 0; i < nvlen; ++i) {
-    rv = deflate_nv(deflater, bufs, &nv[i]);
-    if (rv != 0) {
-      goto fail;
-    }
-  }
-
-  DEBUGF("deflatehd: all input name/value pairs were deflated\n");
-
-  return 0;
-fail:
-  DEBUGF("deflatehd: error return %d\n", rv);
-
-  deflater->ctx.bad = 1;
-  return rv;
-}
-
-ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater, uint8_t *buf,
-                              size_t buflen, const nghttp2_nv *nv,
-                              size_t nvlen) {
-  nghttp2_bufs bufs;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = deflater->ctx.mem;
-
-  rv = nghttp2_bufs_wrap_init(&bufs, buf, buflen, mem);
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  rv = nghttp2_hd_deflate_hd_bufs(deflater, &bufs, nv, nvlen);
-
-  buflen = nghttp2_bufs_len(&bufs);
-
-  nghttp2_bufs_wrap_free(&bufs);
-
-  if (rv == NGHTTP2_ERR_BUFFER_ERROR) {
-    return NGHTTP2_ERR_INSUFF_BUFSIZE;
-  }
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  return (ssize_t)buflen;
-}
-
-ssize_t nghttp2_hd_deflate_hd_vec(nghttp2_hd_deflater *deflater,
-                                  const nghttp2_vec *vec, size_t veclen,
-                                  const nghttp2_nv *nv, size_t nvlen) {
-  nghttp2_bufs bufs;
-  int rv;
-  nghttp2_mem *mem;
-  size_t buflen;
-
-  mem = deflater->ctx.mem;
-
-  rv = nghttp2_bufs_wrap_init2(&bufs, vec, veclen, mem);
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  rv = nghttp2_hd_deflate_hd_bufs(deflater, &bufs, nv, nvlen);
-
-  buflen = nghttp2_bufs_len(&bufs);
-
-  nghttp2_bufs_wrap_free(&bufs);
-
-  if (rv == NGHTTP2_ERR_BUFFER_ERROR) {
-    return NGHTTP2_ERR_INSUFF_BUFSIZE;
-  }
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  return (ssize_t)buflen;
-}
-
-size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
-                                const nghttp2_nv *nva, size_t nvlen) {
-  size_t n = 0;
-  size_t i;
-  (void)deflater;
-
-  /* Possible Maximum Header Table Size Change.  Encoding (1u << 31) -
-     1 using 4 bit prefix requires 6 bytes.  We may emit this at most
-     twice. */
-  n += 12;
-
-  /* Use Literal Header Field without indexing - New Name, since it is
-     most space consuming format.  Also we choose the less one between
-     non-huffman and huffman, so using literal byte count is
-     sufficient for upper bound.
-
-     Encoding (1u << 31) - 1 using 7 bit prefix requires 6 bytes.  We
-     need 2 of this for |nvlen| header fields. */
-  n += 6 * 2 * nvlen;
-
-  for (i = 0; i < nvlen; ++i) {
-    n += nva[i].namelen + nva[i].valuelen;
-  }
-
-  return n;
-}
-
-int nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
-                           size_t deflate_hd_table_bufsize_max) {
-  return nghttp2_hd_deflate_new2(deflater_ptr, deflate_hd_table_bufsize_max,
-                                 NULL);
-}
-
-int nghttp2_hd_deflate_new2(nghttp2_hd_deflater **deflater_ptr,
-                            size_t deflate_hd_table_bufsize_max,
-                            nghttp2_mem *mem) {
-  int rv;
-  nghttp2_hd_deflater *deflater;
-
-  if (mem == NULL) {
-    mem = nghttp2_mem_default();
-  }
-
-  deflater = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_deflater));
-
-  if (deflater == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  rv = nghttp2_hd_deflate_init2(deflater, deflate_hd_table_bufsize_max, mem);
-
-  if (rv != 0) {
-    nghttp2_mem_free(mem, deflater);
-
-    return rv;
-  }
-
-  *deflater_ptr = deflater;
-
-  return 0;
-}
-
-void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater) {
-  nghttp2_mem *mem;
-
-  mem = deflater->ctx.mem;
-
-  nghttp2_hd_deflate_free(deflater);
-
-  nghttp2_mem_free(mem, deflater);
-}
-
-static void hd_inflate_set_huffman_encoded(nghttp2_hd_inflater *inflater,
-                                           const uint8_t *in) {
-  inflater->huffman_encoded = (*in & (1 << 7)) != 0;
-}
-
-/*
- * Decodes the integer from the range [in, last).  The result is
- * assigned to |inflater->left|.  If the |inflater->left| is 0, then
- * it performs variable integer decoding from scratch. Otherwise, it
- * uses the |inflater->left| as the initial value and continues to
- * decode assuming that [in, last) begins with intermediary sequence.
- *
- * This function returns the number of bytes read if it succeeds, or
- * one of the following negative error codes:
- *
- * NGHTTP2_ERR_HEADER_COMP
- *   Integer decoding failed
- */
-static ssize_t hd_inflate_read_len(nghttp2_hd_inflater *inflater, int *rfin,
-                                   const uint8_t *in, const uint8_t *last,
-                                   size_t prefix, size_t maxlen) {
-  ssize_t rv;
-  uint32_t out;
-
-  *rfin = 0;
-
-  rv = decode_length(&out, &inflater->shift, rfin, (uint32_t)inflater->left,
-                     inflater->shift, in, last, prefix);
-
-  if (rv == -1) {
-    DEBUGF("inflatehd: integer decoding failed\n");
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  if (out > maxlen) {
-    DEBUGF("inflatehd: integer exceeded the maximum value %zu\n", maxlen);
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  inflater->left = out;
-
-  DEBUGF("inflatehd: decoded integer is %u\n", out);
-
-  return rv;
-}
-
-/*
- * Reads |inflater->left| bytes from the range [in, last) and performs
- * huffman decoding against them and pushes the result into the
- * |buffer|.
- *
- * This function returns the number of bytes read if it succeeds, or
- * one of the following negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- * NGHTTP2_ERR_HEADER_COMP
- *   Huffman decoding failed
- */
-static ssize_t hd_inflate_read_huff(nghttp2_hd_inflater *inflater,
-                                    nghttp2_buf *buf, const uint8_t *in,
-                                    const uint8_t *last) {
-  ssize_t readlen;
-  int fin = 0;
-  if ((size_t)(last - in) >= inflater->left) {
-    last = in + inflater->left;
-    fin = 1;
-  }
-  readlen = nghttp2_hd_huff_decode(&inflater->huff_decode_ctx, buf, in,
-                                   (size_t)(last - in), fin);
-
-  if (readlen < 0) {
-    DEBUGF("inflatehd: huffman decoding failed\n");
-    return readlen;
-  }
-  inflater->left -= (size_t)readlen;
-  return readlen;
-}
-
-/*
- * Reads |inflater->left| bytes from the range [in, last) and copies
- * them into the |buffer|.
- *
- * This function returns the number of bytes read if it succeeds, or
- * one of the following negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- * NGHTTP2_ERR_HEADER_COMP
- *   Header decompression failed
- */
-static ssize_t hd_inflate_read(nghttp2_hd_inflater *inflater, nghttp2_buf *buf,
-                               const uint8_t *in, const uint8_t *last) {
-  size_t len = nghttp2_min((size_t)(last - in), inflater->left);
-
-  buf->last = nghttp2_cpymem(buf->last, in, len);
-
-  inflater->left -= len;
-  return (ssize_t)len;
-}
-
-/*
- * Finalize indexed header representation reception.  The referenced
- * header is always emitted, and |*nv_out| is filled with that value.
- */
-static void hd_inflate_commit_indexed(nghttp2_hd_inflater *inflater,
-                                      nghttp2_hd_nv *nv_out) {
-  nghttp2_hd_nv nv = nghttp2_hd_table_get(&inflater->ctx, inflater->index);
-
-  emit_header(nv_out, &nv);
-}
-
-/*
- * Finalize literal header representation - new name- reception. If
- * header is emitted, |*nv_out| is filled with that value and 0 is
- * returned.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-static int hd_inflate_commit_newname(nghttp2_hd_inflater *inflater,
-                                     nghttp2_hd_nv *nv_out) {
-  nghttp2_hd_nv nv;
-  int rv;
-
-  if (inflater->no_index) {
-    nv.flags = NGHTTP2_NV_FLAG_NO_INDEX;
-  } else {
-    nv.flags = NGHTTP2_NV_FLAG_NONE;
-  }
-
-  nv.name = inflater->namercbuf;
-  nv.value = inflater->valuercbuf;
-  nv.token = lookup_token(inflater->namercbuf->base, inflater->namercbuf->len);
-
-  if (inflater->index_required) {
-    rv = add_hd_table_incremental(&inflater->ctx, &nv, NULL, 0);
-
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  emit_header(nv_out, &nv);
-
-  inflater->nv_name_keep = nv.name;
-  inflater->nv_value_keep = nv.value;
-
-  inflater->namercbuf = NULL;
-  inflater->valuercbuf = NULL;
-
-  return 0;
-}
-
-/*
- * Finalize literal header representation - indexed name-
- * reception. If header is emitted, |*nv_out| is filled with that
- * value and 0 is returned.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-static int hd_inflate_commit_indname(nghttp2_hd_inflater *inflater,
-                                     nghttp2_hd_nv *nv_out) {
-  nghttp2_hd_nv nv;
-  int rv;
-
-  nv = nghttp2_hd_table_get(&inflater->ctx, inflater->index);
-
-  if (inflater->no_index) {
-    nv.flags = NGHTTP2_NV_FLAG_NO_INDEX;
-  } else {
-    nv.flags = NGHTTP2_NV_FLAG_NONE;
-  }
-
-  nghttp2_rcbuf_incref(nv.name);
-
-  nv.value = inflater->valuercbuf;
-
-  if (inflater->index_required) {
-    rv = add_hd_table_incremental(&inflater->ctx, &nv, NULL, 0);
-    if (rv != 0) {
-      nghttp2_rcbuf_decref(nv.name);
-      return NGHTTP2_ERR_NOMEM;
-    }
-  }
-
-  emit_header(nv_out, &nv);
-
-  inflater->nv_name_keep = nv.name;
-  inflater->nv_value_keep = nv.value;
-
-  inflater->valuercbuf = NULL;
-
-  return 0;
-}
-
-ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater, nghttp2_nv *nv_out,
-                              int *inflate_flags, uint8_t *in, size_t inlen,
-                              int in_final) {
-  return nghttp2_hd_inflate_hd2(inflater, nv_out, inflate_flags, in, inlen,
-                                in_final);
-}
-
-ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
-                               nghttp2_nv *nv_out, int *inflate_flags,
-                               const uint8_t *in, size_t inlen, int in_final) {
-  ssize_t rv;
-  nghttp2_hd_nv hd_nv;
-
-  rv = nghttp2_hd_inflate_hd_nv(inflater, &hd_nv, inflate_flags, in, inlen,
-                                in_final);
-
-  if (rv < 0) {
-    return rv;
-  }
-
-  if (*inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
-    nv_out->name = hd_nv.name->base;
-    nv_out->namelen = hd_nv.name->len;
-
-    nv_out->value = hd_nv.value->base;
-    nv_out->valuelen = hd_nv.value->len;
-
-    nv_out->flags = hd_nv.flags;
-  }
-
-  return rv;
-}
-
-ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
-                                 nghttp2_hd_nv *nv_out, int *inflate_flags,
-                                 const uint8_t *in, size_t inlen,
-                                 int in_final) {
-  ssize_t rv = 0;
-  const uint8_t *first = in;
-  const uint8_t *last = in + inlen;
-  int rfin = 0;
-  int busy = 0;
-  nghttp2_mem *mem;
-
-  mem = inflater->ctx.mem;
-
-  if (inflater->ctx.bad) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-
-  DEBUGF("inflatehd: start state=%d\n", inflater->state);
-  hd_inflate_keep_free(inflater);
-  *inflate_flags = NGHTTP2_HD_INFLATE_NONE;
-  for (; in != last || busy;) {
-    busy = 0;
-    switch (inflater->state) {
-    case NGHTTP2_HD_STATE_EXPECT_TABLE_SIZE:
-      if ((*in & 0xe0u) != 0x20u) {
-        DEBUGF("inflatehd: header table size change was expected, but saw "
-               "0x%02x as first byte",
-               *in);
-        rv = NGHTTP2_ERR_HEADER_COMP;
-        goto fail;
-      }
-    /* fall through */
-    case NGHTTP2_HD_STATE_INFLATE_START:
-    case NGHTTP2_HD_STATE_OPCODE:
-      if ((*in & 0xe0u) == 0x20u) {
-        DEBUGF("inflatehd: header table size change\n");
-        if (inflater->state == NGHTTP2_HD_STATE_OPCODE) {
-          DEBUGF("inflatehd: header table size change must appear at the head "
-                 "of header block\n");
-          rv = NGHTTP2_ERR_HEADER_COMP;
-          goto fail;
-        }
-        inflater->opcode = NGHTTP2_HD_OPCODE_INDEXED;
-        inflater->state = NGHTTP2_HD_STATE_READ_TABLE_SIZE;
-      } else if (*in & 0x80u) {
-        DEBUGF("inflatehd: indexed repr\n");
-        inflater->opcode = NGHTTP2_HD_OPCODE_INDEXED;
-        inflater->state = NGHTTP2_HD_STATE_READ_INDEX;
-      } else {
-        if (*in == 0x40u || *in == 0 || *in == 0x10u) {
-          DEBUGF("inflatehd: literal header repr - new name\n");
-          inflater->opcode = NGHTTP2_HD_OPCODE_NEWNAME;
-          inflater->state = NGHTTP2_HD_STATE_NEWNAME_CHECK_NAMELEN;
-        } else {
-          DEBUGF("inflatehd: literal header repr - indexed name\n");
-          inflater->opcode = NGHTTP2_HD_OPCODE_INDNAME;
-          inflater->state = NGHTTP2_HD_STATE_READ_INDEX;
-        }
-        inflater->index_required = (*in & 0x40) != 0;
-        inflater->no_index = (*in & 0xf0u) == 0x10u;
-        DEBUGF("inflatehd: indexing required=%d, no_index=%d\n",
-               inflater->index_required, inflater->no_index);
-        if (inflater->opcode == NGHTTP2_HD_OPCODE_NEWNAME) {
-          ++in;
-        }
-      }
-      inflater->left = 0;
-      inflater->shift = 0;
-      break;
-    case NGHTTP2_HD_STATE_READ_TABLE_SIZE:
-      rfin = 0;
-      rv = hd_inflate_read_len(
-          inflater, &rfin, in, last, 5,
-          nghttp2_min(inflater->min_hd_table_bufsize_max,
-                      inflater->settings_hd_table_bufsize_max));
-      if (rv < 0) {
-        goto fail;
-      }
-      in += rv;
-      if (!rfin) {
-        goto almost_ok;
-      }
-      DEBUGF("inflatehd: table_size=%zu\n", inflater->left);
-      inflater->min_hd_table_bufsize_max = UINT32_MAX;
-      inflater->ctx.hd_table_bufsize_max = inflater->left;
-      hd_context_shrink_table_size(&inflater->ctx, NULL);
-      inflater->state = NGHTTP2_HD_STATE_INFLATE_START;
-      break;
-    case NGHTTP2_HD_STATE_READ_INDEX: {
-      size_t prefixlen;
-
-      if (inflater->opcode == NGHTTP2_HD_OPCODE_INDEXED) {
-        prefixlen = 7;
-      } else if (inflater->index_required) {
-        prefixlen = 6;
-      } else {
-        prefixlen = 4;
-      }
-
-      rfin = 0;
-      rv = hd_inflate_read_len(inflater, &rfin, in, last, prefixlen,
-                               get_max_index(&inflater->ctx));
-      if (rv < 0) {
-        goto fail;
-      }
-
-      in += rv;
-
-      if (!rfin) {
-        goto almost_ok;
-      }
-
-      if (inflater->left == 0) {
-        rv = NGHTTP2_ERR_HEADER_COMP;
-        goto fail;
-      }
-
-      DEBUGF("inflatehd: index=%zu\n", inflater->left);
-      if (inflater->opcode == NGHTTP2_HD_OPCODE_INDEXED) {
-        inflater->index = inflater->left;
-        --inflater->index;
-
-        hd_inflate_commit_indexed(inflater, nv_out);
-
-        inflater->state = NGHTTP2_HD_STATE_OPCODE;
-        *inflate_flags |= NGHTTP2_HD_INFLATE_EMIT;
-        return (ssize_t)(in - first);
-      } else {
-        inflater->index = inflater->left;
-        --inflater->index;
-
-        inflater->state = NGHTTP2_HD_STATE_CHECK_VALUELEN;
-      }
-      break;
-    }
-    case NGHTTP2_HD_STATE_NEWNAME_CHECK_NAMELEN:
-      hd_inflate_set_huffman_encoded(inflater, in);
-      inflater->state = NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN;
-      inflater->left = 0;
-      inflater->shift = 0;
-      DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
-    /* Fall through */
-    case NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN:
-      rfin = 0;
-      rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
-      if (rv < 0) {
-        goto fail;
-      }
-      in += rv;
-      if (!rfin) {
-        DEBUGF("inflatehd: integer not fully decoded. current=%zu\n",
-               inflater->left);
-
-        goto almost_ok;
-      }
-
-      if (inflater->huffman_encoded) {
-        nghttp2_hd_huff_decode_context_init(&inflater->huff_decode_ctx);
-
-        inflater->state = NGHTTP2_HD_STATE_NEWNAME_READ_NAMEHUFF;
-
-        rv = nghttp2_rcbuf_new(&inflater->namercbuf, inflater->left * 2 + 1,
-                               mem);
-      } else {
-        inflater->state = NGHTTP2_HD_STATE_NEWNAME_READ_NAME;
-        rv = nghttp2_rcbuf_new(&inflater->namercbuf, inflater->left + 1, mem);
-      }
-
-      if (rv != 0) {
-        goto fail;
-      }
-
-      nghttp2_buf_wrap_init(&inflater->namebuf, inflater->namercbuf->base,
-                            inflater->namercbuf->len);
-
-      break;
-    case NGHTTP2_HD_STATE_NEWNAME_READ_NAMEHUFF:
-      rv = hd_inflate_read_huff(inflater, &inflater->namebuf, in, last);
-      if (rv < 0) {
-        goto fail;
-      }
-
-      in += rv;
-
-      DEBUGF("inflatehd: %zd bytes read\n", rv);
-
-      if (inflater->left) {
-        DEBUGF("inflatehd: still %zu bytes to go\n", inflater->left);
-
-        goto almost_ok;
-      }
-
-      *inflater->namebuf.last = '\0';
-      inflater->namercbuf->len = nghttp2_buf_len(&inflater->namebuf);
-
-      inflater->state = NGHTTP2_HD_STATE_CHECK_VALUELEN;
-
-      break;
-    case NGHTTP2_HD_STATE_NEWNAME_READ_NAME:
-      rv = hd_inflate_read(inflater, &inflater->namebuf, in, last);
-      if (rv < 0) {
-        goto fail;
-      }
-
-      in += rv;
-
-      DEBUGF("inflatehd: %zd bytes read\n", rv);
-      if (inflater->left) {
-        DEBUGF("inflatehd: still %zu bytes to go\n", inflater->left);
-
-        goto almost_ok;
-      }
-
-      *inflater->namebuf.last = '\0';
-      inflater->namercbuf->len = nghttp2_buf_len(&inflater->namebuf);
-
-      inflater->state = NGHTTP2_HD_STATE_CHECK_VALUELEN;
-
-      break;
-    case NGHTTP2_HD_STATE_CHECK_VALUELEN:
-      hd_inflate_set_huffman_encoded(inflater, in);
-      inflater->state = NGHTTP2_HD_STATE_READ_VALUELEN;
-      inflater->left = 0;
-      inflater->shift = 0;
-      DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
-    /* Fall through */
-    case NGHTTP2_HD_STATE_READ_VALUELEN:
-      rfin = 0;
-      rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
-      if (rv < 0) {
-        goto fail;
-      }
-
-      in += rv;
-
-      if (!rfin) {
-        goto almost_ok;
-      }
-
-      DEBUGF("inflatehd: valuelen=%zu\n", inflater->left);
-
-      if (inflater->huffman_encoded) {
-        nghttp2_hd_huff_decode_context_init(&inflater->huff_decode_ctx);
-
-        inflater->state = NGHTTP2_HD_STATE_READ_VALUEHUFF;
-
-        rv = nghttp2_rcbuf_new(&inflater->valuercbuf, inflater->left * 2 + 1,
-                               mem);
-      } else {
-        inflater->state = NGHTTP2_HD_STATE_READ_VALUE;
-
-        rv = nghttp2_rcbuf_new(&inflater->valuercbuf, inflater->left + 1, mem);
-      }
-
-      if (rv != 0) {
-        goto fail;
-      }
-
-      nghttp2_buf_wrap_init(&inflater->valuebuf, inflater->valuercbuf->base,
-                            inflater->valuercbuf->len);
-
-      busy = 1;
-
-      break;
-    case NGHTTP2_HD_STATE_READ_VALUEHUFF:
-      rv = hd_inflate_read_huff(inflater, &inflater->valuebuf, in, last);
-      if (rv < 0) {
-        goto fail;
-      }
-
-      in += rv;
-
-      DEBUGF("inflatehd: %zd bytes read\n", rv);
-
-      if (inflater->left) {
-        DEBUGF("inflatehd: still %zu bytes to go\n", inflater->left);
-
-        goto almost_ok;
-      }
-
-      *inflater->valuebuf.last = '\0';
-      inflater->valuercbuf->len = nghttp2_buf_len(&inflater->valuebuf);
-
-      if (inflater->opcode == NGHTTP2_HD_OPCODE_NEWNAME) {
-        rv = hd_inflate_commit_newname(inflater, nv_out);
-      } else {
-        rv = hd_inflate_commit_indname(inflater, nv_out);
-      }
-
-      if (rv != 0) {
-        goto fail;
-      }
-
-      inflater->state = NGHTTP2_HD_STATE_OPCODE;
-      *inflate_flags |= NGHTTP2_HD_INFLATE_EMIT;
-
-      return (ssize_t)(in - first);
-    case NGHTTP2_HD_STATE_READ_VALUE:
-      rv = hd_inflate_read(inflater, &inflater->valuebuf, in, last);
-      if (rv < 0) {
-        DEBUGF("inflatehd: value read failure %zd: %s\n", rv,
-               nghttp2_strerror((int)rv));
-        goto fail;
-      }
-
-      in += rv;
-
-      DEBUGF("inflatehd: %zd bytes read\n", rv);
-
-      if (inflater->left) {
-        DEBUGF("inflatehd: still %zu bytes to go\n", inflater->left);
-        goto almost_ok;
-      }
-
-      *inflater->valuebuf.last = '\0';
-      inflater->valuercbuf->len = nghttp2_buf_len(&inflater->valuebuf);
-
-      if (inflater->opcode == NGHTTP2_HD_OPCODE_NEWNAME) {
-        rv = hd_inflate_commit_newname(inflater, nv_out);
-      } else {
-        rv = hd_inflate_commit_indname(inflater, nv_out);
-      }
-
-      if (rv != 0) {
-        goto fail;
-      }
-
-      inflater->state = NGHTTP2_HD_STATE_OPCODE;
-      *inflate_flags |= NGHTTP2_HD_INFLATE_EMIT;
-
-      return (ssize_t)(in - first);
-    }
-  }
-
-  assert(in == last);
-
-  DEBUGF("inflatehd: all input bytes were processed\n");
-
-  if (in_final) {
-    DEBUGF("inflatehd: in_final set\n");
-
-    if (inflater->state != NGHTTP2_HD_STATE_OPCODE &&
-        inflater->state != NGHTTP2_HD_STATE_INFLATE_START) {
-      DEBUGF("inflatehd: unacceptable state=%d\n", inflater->state);
-      rv = NGHTTP2_ERR_HEADER_COMP;
-
-      goto fail;
-    }
-    *inflate_flags |= NGHTTP2_HD_INFLATE_FINAL;
-  }
-  return (ssize_t)(in - first);
-
-almost_ok:
-  if (in_final) {
-    DEBUGF("inflatehd: input ended prematurely\n");
-
-    rv = NGHTTP2_ERR_HEADER_COMP;
-
-    goto fail;
-  }
-  return (ssize_t)(in - first);
-
-fail:
-  DEBUGF("inflatehd: error return %zd\n", rv);
-
-  inflater->ctx.bad = 1;
-  return rv;
-}
-
-int nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater) {
-  hd_inflate_keep_free(inflater);
-  inflater->state = NGHTTP2_HD_STATE_INFLATE_START;
-  return 0;
-}
-
-int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr) {
-  return nghttp2_hd_inflate_new2(inflater_ptr, NULL);
-}
-
-int nghttp2_hd_inflate_new2(nghttp2_hd_inflater **inflater_ptr,
-                            nghttp2_mem *mem) {
-  int rv;
-  nghttp2_hd_inflater *inflater;
-
-  if (mem == NULL) {
-    mem = nghttp2_mem_default();
-  }
-
-  inflater = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_inflater));
-
-  if (inflater == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  rv = nghttp2_hd_inflate_init(inflater, mem);
-
-  if (rv != 0) {
-    nghttp2_mem_free(mem, inflater);
-
-    return rv;
-  }
-
-  *inflater_ptr = inflater;
-
-  return 0;
-}
-
-void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater) {
-  nghttp2_mem *mem;
-
-  mem = inflater->ctx.mem;
-  nghttp2_hd_inflate_free(inflater);
-
-  nghttp2_mem_free(mem, inflater);
-}
-
-int nghttp2_hd_emit_indname_block(nghttp2_bufs *bufs, size_t idx,
-                                  nghttp2_nv *nv, int indexing_mode) {
-
-  return emit_indname_block(bufs, idx, nv, indexing_mode);
-}
-
-int nghttp2_hd_emit_newname_block(nghttp2_bufs *bufs, nghttp2_nv *nv,
-                                  int indexing_mode) {
-  return emit_newname_block(bufs, nv, indexing_mode);
-}
-
-int nghttp2_hd_emit_table_size(nghttp2_bufs *bufs, size_t table_size) {
-  return emit_table_size(bufs, table_size);
-}
-
-ssize_t nghttp2_hd_decode_length(uint32_t *res, size_t *shift_ptr, int *fin,
-                                 uint32_t initial, size_t shift, uint8_t *in,
-                                 uint8_t *last, size_t prefix) {
-  return decode_length(res, shift_ptr, fin, initial, shift, in, last, prefix);
-}
-
-static const nghttp2_nv *hd_get_table_entry(nghttp2_hd_context *context,
-                                            size_t idx) {
-  if (idx == 0) {
-    return NULL;
-  }
-
-  --idx;
-
-  if (!INDEX_RANGE_VALID(context, idx)) {
-    return NULL;
-  }
-
-  return nghttp2_hd_table_get2(context, idx);
-}
-
-size_t nghttp2_hd_deflate_get_num_table_entries(nghttp2_hd_deflater *deflater) {
-  return get_max_index(&deflater->ctx);
-}
-
-const nghttp2_nv *
-nghttp2_hd_deflate_get_table_entry(nghttp2_hd_deflater *deflater, size_t idx) {
-  return hd_get_table_entry(&deflater->ctx, idx);
-}
-
-size_t
-nghttp2_hd_deflate_get_dynamic_table_size(nghttp2_hd_deflater *deflater) {
-  return deflater->ctx.hd_table_bufsize;
-}
-
-size_t
-nghttp2_hd_deflate_get_max_dynamic_table_size(nghttp2_hd_deflater *deflater) {
-  return deflater->ctx.hd_table_bufsize_max;
-}
-
-size_t nghttp2_hd_inflate_get_num_table_entries(nghttp2_hd_inflater *inflater) {
-  return get_max_index(&inflater->ctx);
-}
-
-const nghttp2_nv *
-nghttp2_hd_inflate_get_table_entry(nghttp2_hd_inflater *inflater, size_t idx) {
-  return hd_get_table_entry(&inflater->ctx, idx);
-}
-
-size_t
-nghttp2_hd_inflate_get_dynamic_table_size(nghttp2_hd_inflater *inflater) {
-  return inflater->ctx.hd_table_bufsize;
-}
-
-size_t
-nghttp2_hd_inflate_get_max_dynamic_table_size(nghttp2_hd_inflater *inflater) {
-  return inflater->ctx.hd_table_bufsize_max;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,432 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_HD_H
-#define NGHTTP2_HD_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-#include "nghttp2_hd_huffman.h"
-#include "nghttp2_buf.h"
-#include "nghttp2_mem.h"
-#include "nghttp2_rcbuf.h"
-
-#define NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE NGHTTP2_DEFAULT_HEADER_TABLE_SIZE
-#define NGHTTP2_HD_ENTRY_OVERHEAD 32
-
-/* The maximum length of one name/value pair.  This is the sum of the
-   length of name and value.  This is not specified by the spec. We
-   just chose the arbitrary size */
-#define NGHTTP2_HD_MAX_NV 65536
-
-/* Default size of maximum table buffer size for encoder. Even if
-   remote decoder notifies larger buffer size for its decoding,
-   encoder only uses the memory up to this value. */
-#define NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE (1 << 12)
-
-/* Exported for unit test */
-#define NGHTTP2_STATIC_TABLE_LENGTH 61
-
-/* Generated by genlibtokenlookup.py */
-typedef enum {
-  NGHTTP2_TOKEN__AUTHORITY = 0,
-  NGHTTP2_TOKEN__METHOD = 1,
-  NGHTTP2_TOKEN__PATH = 3,
-  NGHTTP2_TOKEN__SCHEME = 5,
-  NGHTTP2_TOKEN__STATUS = 7,
-  NGHTTP2_TOKEN_ACCEPT_CHARSET = 14,
-  NGHTTP2_TOKEN_ACCEPT_ENCODING = 15,
-  NGHTTP2_TOKEN_ACCEPT_LANGUAGE = 16,
-  NGHTTP2_TOKEN_ACCEPT_RANGES = 17,
-  NGHTTP2_TOKEN_ACCEPT = 18,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_ORIGIN = 19,
-  NGHTTP2_TOKEN_AGE = 20,
-  NGHTTP2_TOKEN_ALLOW = 21,
-  NGHTTP2_TOKEN_AUTHORIZATION = 22,
-  NGHTTP2_TOKEN_CACHE_CONTROL = 23,
-  NGHTTP2_TOKEN_CONTENT_DISPOSITION = 24,
-  NGHTTP2_TOKEN_CONTENT_ENCODING = 25,
-  NGHTTP2_TOKEN_CONTENT_LANGUAGE = 26,
-  NGHTTP2_TOKEN_CONTENT_LENGTH = 27,
-  NGHTTP2_TOKEN_CONTENT_LOCATION = 28,
-  NGHTTP2_TOKEN_CONTENT_RANGE = 29,
-  NGHTTP2_TOKEN_CONTENT_TYPE = 30,
-  NGHTTP2_TOKEN_COOKIE = 31,
-  NGHTTP2_TOKEN_DATE = 32,
-  NGHTTP2_TOKEN_ETAG = 33,
-  NGHTTP2_TOKEN_EXPECT = 34,
-  NGHTTP2_TOKEN_EXPIRES = 35,
-  NGHTTP2_TOKEN_FROM = 36,
-  NGHTTP2_TOKEN_HOST = 37,
-  NGHTTP2_TOKEN_IF_MATCH = 38,
-  NGHTTP2_TOKEN_IF_MODIFIED_SINCE = 39,
-  NGHTTP2_TOKEN_IF_NONE_MATCH = 40,
-  NGHTTP2_TOKEN_IF_RANGE = 41,
-  NGHTTP2_TOKEN_IF_UNMODIFIED_SINCE = 42,
-  NGHTTP2_TOKEN_LAST_MODIFIED = 43,
-  NGHTTP2_TOKEN_LINK = 44,
-  NGHTTP2_TOKEN_LOCATION = 45,
-  NGHTTP2_TOKEN_MAX_FORWARDS = 46,
-  NGHTTP2_TOKEN_PROXY_AUTHENTICATE = 47,
-  NGHTTP2_TOKEN_PROXY_AUTHORIZATION = 48,
-  NGHTTP2_TOKEN_RANGE = 49,
-  NGHTTP2_TOKEN_REFERER = 50,
-  NGHTTP2_TOKEN_REFRESH = 51,
-  NGHTTP2_TOKEN_RETRY_AFTER = 52,
-  NGHTTP2_TOKEN_SERVER = 53,
-  NGHTTP2_TOKEN_SET_COOKIE = 54,
-  NGHTTP2_TOKEN_STRICT_TRANSPORT_SECURITY = 55,
-  NGHTTP2_TOKEN_TRANSFER_ENCODING = 56,
-  NGHTTP2_TOKEN_USER_AGENT = 57,
-  NGHTTP2_TOKEN_VARY = 58,
-  NGHTTP2_TOKEN_VIA = 59,
-  NGHTTP2_TOKEN_WWW_AUTHENTICATE = 60,
-  NGHTTP2_TOKEN_TE,
-  NGHTTP2_TOKEN_CONNECTION,
-  NGHTTP2_TOKEN_KEEP_ALIVE,
-  NGHTTP2_TOKEN_PROXY_CONNECTION,
-  NGHTTP2_TOKEN_UPGRADE,
-} nghttp2_token;
-
-struct nghttp2_hd_entry;
-typedef struct nghttp2_hd_entry nghttp2_hd_entry;
-
-typedef struct {
-  /* The buffer containing header field name.  NULL-termination is
-     guaranteed. */
-  nghttp2_rcbuf *name;
-  /* The buffer containing header field value.  NULL-termination is
-     guaranteed. */
-  nghttp2_rcbuf *value;
-  /* nghttp2_token value for name.  It could be -1 if we have no token
-     for that header field name. */
-  int32_t token;
-  /* Bitwise OR of one or more of nghttp2_nv_flag. */
-  uint8_t flags;
-} nghttp2_hd_nv;
-
-struct nghttp2_hd_entry {
-  /* The header field name/value pair */
-  nghttp2_hd_nv nv;
-  /* This is solely for nghttp2_hd_{deflate,inflate}_get_table_entry
-     APIs to keep backward compatibility. */
-  nghttp2_nv cnv;
-  /* The next entry which shares same bucket in hash table. */
-  nghttp2_hd_entry *next;
-  /* The sequence number.  We will increment it by one whenever we
-     store nghttp2_hd_entry to dynamic header table. */
-  uint32_t seq;
-  /* The hash value for header name (nv.name). */
-  uint32_t hash;
-};
-
-/* The entry used for static header table. */
-typedef struct {
-  nghttp2_rcbuf name;
-  nghttp2_rcbuf value;
-  nghttp2_nv cnv;
-  int32_t token;
-  uint32_t hash;
-} nghttp2_hd_static_entry;
-
-typedef struct {
-  nghttp2_hd_entry **buffer;
-  size_t mask;
-  size_t first;
-  size_t len;
-} nghttp2_hd_ringbuf;
-
-typedef enum {
-  NGHTTP2_HD_OPCODE_NONE,
-  NGHTTP2_HD_OPCODE_INDEXED,
-  NGHTTP2_HD_OPCODE_NEWNAME,
-  NGHTTP2_HD_OPCODE_INDNAME
-} nghttp2_hd_opcode;
-
-typedef enum {
-  NGHTTP2_HD_STATE_EXPECT_TABLE_SIZE,
-  NGHTTP2_HD_STATE_INFLATE_START,
-  NGHTTP2_HD_STATE_OPCODE,
-  NGHTTP2_HD_STATE_READ_TABLE_SIZE,
-  NGHTTP2_HD_STATE_READ_INDEX,
-  NGHTTP2_HD_STATE_NEWNAME_CHECK_NAMELEN,
-  NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN,
-  NGHTTP2_HD_STATE_NEWNAME_READ_NAMEHUFF,
-  NGHTTP2_HD_STATE_NEWNAME_READ_NAME,
-  NGHTTP2_HD_STATE_CHECK_VALUELEN,
-  NGHTTP2_HD_STATE_READ_VALUELEN,
-  NGHTTP2_HD_STATE_READ_VALUEHUFF,
-  NGHTTP2_HD_STATE_READ_VALUE
-} nghttp2_hd_inflate_state;
-
-typedef enum {
-  NGHTTP2_HD_WITH_INDEXING,
-  NGHTTP2_HD_WITHOUT_INDEXING,
-  NGHTTP2_HD_NEVER_INDEXING
-} nghttp2_hd_indexing_mode;
-
-typedef struct {
-  /* dynamic header table */
-  nghttp2_hd_ringbuf hd_table;
-  /* Memory allocator */
-  nghttp2_mem *mem;
-  /* Abstract buffer size of hd_table as described in the spec. This
-     is the sum of length of name/value in hd_table +
-     NGHTTP2_HD_ENTRY_OVERHEAD bytes overhead per each entry. */
-  size_t hd_table_bufsize;
-  /* The effective header table size. */
-  size_t hd_table_bufsize_max;
-  /* Next sequence number for nghttp2_hd_entry */
-  uint32_t next_seq;
-  /* If inflate/deflate error occurred, this value is set to 1 and
-     further invocation of inflate/deflate will fail with
-     NGHTTP2_ERR_HEADER_COMP. */
-  uint8_t bad;
-} nghttp2_hd_context;
-
-#define HD_MAP_SIZE 128
-
-typedef struct {
-  nghttp2_hd_entry *table[HD_MAP_SIZE];
-} nghttp2_hd_map;
-
-struct nghttp2_hd_deflater {
-  nghttp2_hd_context ctx;
-  nghttp2_hd_map map;
-  /* The upper limit of the header table size the deflater accepts. */
-  size_t deflate_hd_table_bufsize_max;
-  /* Minimum header table size notified in the next context update */
-  size_t min_hd_table_bufsize_max;
-  /* If nonzero, send header table size using encoding context update
-     in the next deflate process */
-  uint8_t notify_table_size_change;
-};
-
-struct nghttp2_hd_inflater {
-  nghttp2_hd_context ctx;
-  /* Stores current state of huffman decoding */
-  nghttp2_hd_huff_decode_context huff_decode_ctx;
-  /* header buffer */
-  nghttp2_buf namebuf, valuebuf;
-  nghttp2_rcbuf *namercbuf, *valuercbuf;
-  /* Pointer to the name/value pair which are used in the current
-     header emission. */
-  nghttp2_rcbuf *nv_name_keep, *nv_value_keep;
-  /* The number of bytes to read */
-  size_t left;
-  /* The index in indexed repr or indexed name */
-  size_t index;
-  /* The maximum header table size the inflater supports. This is the
-     same value transmitted in SETTINGS_HEADER_TABLE_SIZE */
-  size_t settings_hd_table_bufsize_max;
-  /* Minimum header table size set by nghttp2_hd_inflate_change_table_size */
-  size_t min_hd_table_bufsize_max;
-  /* The number of next shift to decode integer */
-  size_t shift;
-  nghttp2_hd_opcode opcode;
-  nghttp2_hd_inflate_state state;
-  /* nonzero if string is huffman encoded */
-  uint8_t huffman_encoded;
-  /* nonzero if deflater requires that current entry is indexed */
-  uint8_t index_required;
-  /* nonzero if deflater requires that current entry must not be
-     indexed */
-  uint8_t no_index;
-};
-
-/*
- * Initializes the |ent| members.  The reference counts of nv->name
- * and nv->value are increased by one for each.
- */
-void nghttp2_hd_entry_init(nghttp2_hd_entry *ent, nghttp2_hd_nv *nv);
-
-/*
- * This function decreases the reference counts of nv->name and
- * nv->value.
- */
-void nghttp2_hd_entry_free(nghttp2_hd_entry *ent);
-
-/*
- * Initializes |deflater| for deflating name/values pairs.
- *
- * The encoder only uses up to
- * NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE bytes for header table
- * even if the larger value is specified later in
- * nghttp2_hd_change_table_size().
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_hd_deflate_init(nghttp2_hd_deflater *deflater, nghttp2_mem *mem);
-
-/*
- * Initializes |deflater| for deflating name/values pairs.
- *
- * The encoder only uses up to |max_deflate_dynamic_table_size| bytes
- * for header table even if the larger value is specified later in
- * nghttp2_hd_change_table_size().
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_hd_deflate_init2(nghttp2_hd_deflater *deflater,
-                             size_t max_deflate_dynamic_table_size,
-                             nghttp2_mem *mem);
-
-/*
- * Deallocates any resources allocated for |deflater|.
- */
-void nghttp2_hd_deflate_free(nghttp2_hd_deflater *deflater);
-
-/*
- * Deflates the |nva|, which has the |nvlen| name/value pairs, into
- * the |bufs|.
- *
- * This function expands |bufs| as necessary to store the result. If
- * buffers is full and the process still requires more space, this
- * function fails and returns NGHTTP2_ERR_HEADER_COMP.
- *
- * After this function returns, it is safe to delete the |nva|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_HEADER_COMP
- *     Deflation process has failed.
- * NGHTTP2_ERR_BUFFER_ERROR
- *     Out of buffer space.
- */
-int nghttp2_hd_deflate_hd_bufs(nghttp2_hd_deflater *deflater,
-                               nghttp2_bufs *bufs, const nghttp2_nv *nva,
-                               size_t nvlen);
-
-/*
- * Initializes |inflater| for inflating name/values pairs.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater, nghttp2_mem *mem);
-
-/*
- * Deallocates any resources allocated for |inflater|.
- */
-void nghttp2_hd_inflate_free(nghttp2_hd_inflater *inflater);
-
-/*
- * Similar to nghttp2_hd_inflate_hd(), but this takes nghttp2_hd_nv
- * instead of nghttp2_nv as output parameter |nv_out|.  Other than
- * that return values and semantics are the same as
- * nghttp2_hd_inflate_hd().
- */
-ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
-                                 nghttp2_hd_nv *nv_out, int *inflate_flags,
-                                 const uint8_t *in, size_t inlen, int in_final);
-
-/* For unittesting purpose */
-int nghttp2_hd_emit_indname_block(nghttp2_bufs *bufs, size_t index,
-                                  nghttp2_nv *nv, int indexing_mode);
-
-/* For unittesting purpose */
-int nghttp2_hd_emit_newname_block(nghttp2_bufs *bufs, nghttp2_nv *nv,
-                                  int indexing_mode);
-
-/* For unittesting purpose */
-int nghttp2_hd_emit_table_size(nghttp2_bufs *bufs, size_t table_size);
-
-/* For unittesting purpose */
-nghttp2_hd_nv nghttp2_hd_table_get(nghttp2_hd_context *context, size_t index);
-
-/* For unittesting purpose */
-ssize_t nghttp2_hd_decode_length(uint32_t *res, size_t *shift_ptr, int *fin,
-                                 uint32_t initial, size_t shift, uint8_t *in,
-                                 uint8_t *last, size_t prefix);
-
-/* Huffman encoding/decoding functions */
-
-/*
- * Counts the required bytes to encode |src| with length |len|.
- *
- * This function returns the number of required bytes to encode given
- * data, including padding of prefix of terminal symbol code. This
- * function always succeeds.
- */
-size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len);
-
-/*
- * Encodes the given data |src| with length |srclen| to the |bufs|.
- * This function expands extra buffers in |bufs| if necessary.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_BUFFER_ERROR
- *     Out of buffer space.
- */
-int nghttp2_hd_huff_encode(nghttp2_bufs *bufs, const uint8_t *src,
-                           size_t srclen);
-
-void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx);
-
-/*
- * Decodes the given data |src| with length |srclen|.  The |ctx| must
- * be initialized by nghttp2_hd_huff_decode_context_init(). The result
- * will be written to |buf|.  This function assumes that |buf| has the
- * enough room to store the decoded byte string.
- *
- * The caller must set the |fin| to nonzero if the given input is the
- * final block.
- *
- * This function returns the number of read bytes from the |in|.
- *
- * If this function fails, it returns one of the following negative
- * return codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_HEADER_COMP
- *     Decoding process has failed.
- */
-ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
-                               nghttp2_buf *buf, const uint8_t *src,
-                               size_t srclen, int fin);
-
-#endif /* NGHTTP2_HD_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,231 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_hd_huffman.h"
-
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-
-#include "nghttp2_hd.h"
-
-/*
- * Encodes huffman code |sym| into |*dest_ptr|, whose least |rembits|
- * bits are not filled yet.  The |rembits| must be in range [1, 8],
- * inclusive.  At the end of the process, the |*dest_ptr| is updated
- * and points where next output should be placed. The number of
- * unfilled bits in the pointed location is returned.
- */
-static ssize_t huff_encode_sym(nghttp2_bufs *bufs, size_t *avail_ptr,
-                               size_t rembits, const nghttp2_huff_sym *sym) {
-  int rv;
-  size_t nbits = sym->nbits;
-  uint32_t code = sym->code;
-
-  /* We assume that sym->nbits <= 32 */
-  if (rembits > nbits) {
-    nghttp2_bufs_fast_orb_hold(bufs, (uint8_t)(code << (rembits - nbits)));
-    return (ssize_t)(rembits - nbits);
-  }
-
-  if (rembits == nbits) {
-    nghttp2_bufs_fast_orb(bufs, (uint8_t)code);
-    --*avail_ptr;
-    return 8;
-  }
-
-  nghttp2_bufs_fast_orb(bufs, (uint8_t)(code >> (nbits - rembits)));
-  --*avail_ptr;
-
-  nbits -= rembits;
-  if (nbits & 0x7) {
-    /* align code to MSB byte boundary */
-    code <<= 8 - (nbits & 0x7);
-  }
-
-  if (*avail_ptr < (nbits + 7) / 8) {
-    /* slow path */
-    if (nbits > 24) {
-      rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 24));
-      if (rv != 0) {
-        return rv;
-      }
-      nbits -= 8;
-    }
-    if (nbits > 16) {
-      rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 16));
-      if (rv != 0) {
-        return rv;
-      }
-      nbits -= 8;
-    }
-    if (nbits > 8) {
-      rv = nghttp2_bufs_addb(bufs, (uint8_t)(code >> 8));
-      if (rv != 0) {
-        return rv;
-      }
-      nbits -= 8;
-    }
-    if (nbits == 8) {
-      rv = nghttp2_bufs_addb(bufs, (uint8_t)code);
-      if (rv != 0) {
-        return rv;
-      }
-      *avail_ptr = nghttp2_bufs_cur_avail(bufs);
-      return 8;
-    }
-
-    rv = nghttp2_bufs_addb_hold(bufs, (uint8_t)code);
-    if (rv != 0) {
-      return rv;
-    }
-    *avail_ptr = nghttp2_bufs_cur_avail(bufs);
-    return (ssize_t)(8 - nbits);
-  }
-
-  /* fast path, since most code is less than 8 */
-  if (nbits < 8) {
-    nghttp2_bufs_fast_addb_hold(bufs, (uint8_t)code);
-    *avail_ptr = nghttp2_bufs_cur_avail(bufs);
-    return (ssize_t)(8 - nbits);
-  }
-
-  /* handle longer code path */
-  if (nbits > 24) {
-    nghttp2_bufs_fast_addb(bufs, (uint8_t)(code >> 24));
-    nbits -= 8;
-  }
-
-  if (nbits > 16) {
-    nghttp2_bufs_fast_addb(bufs, (uint8_t)(code >> 16));
-    nbits -= 8;
-  }
-
-  if (nbits > 8) {
-    nghttp2_bufs_fast_addb(bufs, (uint8_t)(code >> 8));
-    nbits -= 8;
-  }
-
-  if (nbits == 8) {
-    nghttp2_bufs_fast_addb(bufs, (uint8_t)code);
-    *avail_ptr = nghttp2_bufs_cur_avail(bufs);
-    return 8;
-  }
-
-  nghttp2_bufs_fast_addb_hold(bufs, (uint8_t)code);
-  *avail_ptr = nghttp2_bufs_cur_avail(bufs);
-  return (ssize_t)(8 - nbits);
-}
-
-size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len) {
-  size_t i;
-  size_t nbits = 0;
-
-  for (i = 0; i < len; ++i) {
-    nbits += huff_sym_table[src[i]].nbits;
-  }
-  /* pad the prefix of EOS (256) */
-  return (nbits + 7) / 8;
-}
-
-int nghttp2_hd_huff_encode(nghttp2_bufs *bufs, const uint8_t *src,
-                           size_t srclen) {
-  int rv;
-  ssize_t rembits = 8;
-  size_t i;
-  size_t avail;
-
-  avail = nghttp2_bufs_cur_avail(bufs);
-
-  for (i = 0; i < srclen; ++i) {
-    const nghttp2_huff_sym *sym = &huff_sym_table[src[i]];
-    if (rembits == 8) {
-      if (avail) {
-        nghttp2_bufs_fast_addb_hold(bufs, 0);
-      } else {
-        rv = nghttp2_bufs_addb_hold(bufs, 0);
-        if (rv != 0) {
-          return rv;
-        }
-        avail = nghttp2_bufs_cur_avail(bufs);
-      }
-    }
-    rembits = huff_encode_sym(bufs, &avail, (size_t)rembits, sym);
-    if (rembits < 0) {
-      return (int)rembits;
-    }
-  }
-  /* 256 is special terminal symbol, pad with its prefix */
-  if (rembits < 8) {
-    /* if rembits < 8, we should have at least 1 buffer space
-       available */
-    const nghttp2_huff_sym *sym = &huff_sym_table[256];
-    assert(avail);
-    /* Caution we no longer adjust avail here */
-    nghttp2_bufs_fast_orb(
-        bufs, (uint8_t)(sym->code >> (sym->nbits - (size_t)rembits)));
-  }
-
-  return 0;
-}
-
-void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx) {
-  ctx->state = 0;
-  ctx->accept = 1;
-}
-
-ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
-                               nghttp2_buf *buf, const uint8_t *src,
-                               size_t srclen, int final) {
-  size_t i;
-
-  /* We use the decoding algorithm described in
-     http://graphics.ics.uci.edu/pub/Prefix.pdf */
-  for (i = 0; i < srclen; ++i) {
-    const nghttp2_huff_decode *t;
-
-    t = &huff_decode_table[ctx->state][src[i] >> 4];
-    if (t->flags & NGHTTP2_HUFF_FAIL) {
-      return NGHTTP2_ERR_HEADER_COMP;
-    }
-    if (t->flags & NGHTTP2_HUFF_SYM) {
-      *buf->last++ = t->sym;
-    }
-
-    t = &huff_decode_table[t->state][src[i] & 0xf];
-    if (t->flags & NGHTTP2_HUFF_FAIL) {
-      return NGHTTP2_ERR_HEADER_COMP;
-    }
-    if (t->flags & NGHTTP2_HUFF_SYM) {
-      *buf->last++ = t->sym;
-    }
-
-    ctx->state = t->state;
-    ctx->accept = (t->flags & NGHTTP2_HUFF_ACCEPTED) != 0;
-  }
-  if (final && !ctx->accept) {
-    return NGHTTP2_ERR_HEADER_COMP;
-  }
-  return (ssize_t)i;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman_data.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman_data.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman_data.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman_data.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4961 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_hd_huffman.h"
-
-/* Generated by mkhufftbl.py */
-
-const nghttp2_huff_sym huff_sym_table[] = {
-    {13, 0x1ff8u},    {23, 0x7fffd8u},   {28, 0xfffffe2u},  {28, 0xfffffe3u},
-    {28, 0xfffffe4u}, {28, 0xfffffe5u},  {28, 0xfffffe6u},  {28, 0xfffffe7u},
-    {28, 0xfffffe8u}, {24, 0xffffeau},   {30, 0x3ffffffcu}, {28, 0xfffffe9u},
-    {28, 0xfffffeau}, {30, 0x3ffffffdu}, {28, 0xfffffebu},  {28, 0xfffffecu},
-    {28, 0xfffffedu}, {28, 0xfffffeeu},  {28, 0xfffffefu},  {28, 0xffffff0u},
-    {28, 0xffffff1u}, {28, 0xffffff2u},  {30, 0x3ffffffeu}, {28, 0xffffff3u},
-    {28, 0xffffff4u}, {28, 0xffffff5u},  {28, 0xffffff6u},  {28, 0xffffff7u},
-    {28, 0xffffff8u}, {28, 0xffffff9u},  {28, 0xffffffau},  {28, 0xffffffbu},
-    {6, 0x14u},       {10, 0x3f8u},      {10, 0x3f9u},      {12, 0xffau},
-    {13, 0x1ff9u},    {6, 0x15u},        {8, 0xf8u},        {11, 0x7fau},
-    {10, 0x3fau},     {10, 0x3fbu},      {8, 0xf9u},        {11, 0x7fbu},
-    {8, 0xfau},       {6, 0x16u},        {6, 0x17u},        {6, 0x18u},
-    {5, 0x0u},        {5, 0x1u},         {5, 0x2u},         {6, 0x19u},
-    {6, 0x1au},       {6, 0x1bu},        {6, 0x1cu},        {6, 0x1du},
-    {6, 0x1eu},       {6, 0x1fu},        {7, 0x5cu},        {8, 0xfbu},
-    {15, 0x7ffcu},    {6, 0x20u},        {12, 0xffbu},      {10, 0x3fcu},
-    {13, 0x1ffau},    {6, 0x21u},        {7, 0x5du},        {7, 0x5eu},
-    {7, 0x5fu},       {7, 0x60u},        {7, 0x61u},        {7, 0x62u},
-    {7, 0x63u},       {7, 0x64u},        {7, 0x65u},        {7, 0x66u},
-    {7, 0x67u},       {7, 0x68u},        {7, 0x69u},        {7, 0x6au},
-    {7, 0x6bu},       {7, 0x6cu},        {7, 0x6du},        {7, 0x6eu},
-    {7, 0x6fu},       {7, 0x70u},        {7, 0x71u},        {7, 0x72u},
-    {8, 0xfcu},       {7, 0x73u},        {8, 0xfdu},        {13, 0x1ffbu},
-    {19, 0x7fff0u},   {13, 0x1ffcu},     {14, 0x3ffcu},     {6, 0x22u},
-    {15, 0x7ffdu},    {5, 0x3u},         {6, 0x23u},        {5, 0x4u},
-    {6, 0x24u},       {5, 0x5u},         {6, 0x25u},        {6, 0x26u},
-    {6, 0x27u},       {5, 0x6u},         {7, 0x74u},        {7, 0x75u},
-    {6, 0x28u},       {6, 0x29u},        {6, 0x2au},        {5, 0x7u},
-    {6, 0x2bu},       {7, 0x76u},        {6, 0x2cu},        {5, 0x8u},
-    {5, 0x9u},        {6, 0x2du},        {7, 0x77u},        {7, 0x78u},
-    {7, 0x79u},       {7, 0x7au},        {7, 0x7bu},        {15, 0x7ffeu},
-    {11, 0x7fcu},     {14, 0x3ffdu},     {13, 0x1ffdu},     {28, 0xffffffcu},
-    {20, 0xfffe6u},   {22, 0x3fffd2u},   {20, 0xfffe7u},    {20, 0xfffe8u},
-    {22, 0x3fffd3u},  {22, 0x3fffd4u},   {22, 0x3fffd5u},   {23, 0x7fffd9u},
-    {22, 0x3fffd6u},  {23, 0x7fffdau},   {23, 0x7fffdbu},   {23, 0x7fffdcu},
-    {23, 0x7fffddu},  {23, 0x7fffdeu},   {24, 0xffffebu},   {23, 0x7fffdfu},
-    {24, 0xffffecu},  {24, 0xffffedu},   {22, 0x3fffd7u},   {23, 0x7fffe0u},
-    {24, 0xffffeeu},  {23, 0x7fffe1u},   {23, 0x7fffe2u},   {23, 0x7fffe3u},
-    {23, 0x7fffe4u},  {21, 0x1fffdcu},   {22, 0x3fffd8u},   {23, 0x7fffe5u},
-    {22, 0x3fffd9u},  {23, 0x7fffe6u},   {23, 0x7fffe7u},   {24, 0xffffefu},
-    {22, 0x3fffdau},  {21, 0x1fffddu},   {20, 0xfffe9u},    {22, 0x3fffdbu},
-    {22, 0x3fffdcu},  {23, 0x7fffe8u},   {23, 0x7fffe9u},   {21, 0x1fffdeu},
-    {23, 0x7fffeau},  {22, 0x3fffddu},   {22, 0x3fffdeu},   {24, 0xfffff0u},
-    {21, 0x1fffdfu},  {22, 0x3fffdfu},   {23, 0x7fffebu},   {23, 0x7fffecu},
-    {21, 0x1fffe0u},  {21, 0x1fffe1u},   {22, 0x3fffe0u},   {21, 0x1fffe2u},
-    {23, 0x7fffedu},  {22, 0x3fffe1u},   {23, 0x7fffeeu},   {23, 0x7fffefu},
-    {20, 0xfffeau},   {22, 0x3fffe2u},   {22, 0x3fffe3u},   {22, 0x3fffe4u},
-    {23, 0x7ffff0u},  {22, 0x3fffe5u},   {22, 0x3fffe6u},   {23, 0x7ffff1u},
-    {26, 0x3ffffe0u}, {26, 0x3ffffe1u},  {20, 0xfffebu},    {19, 0x7fff1u},
-    {22, 0x3fffe7u},  {23, 0x7ffff2u},   {22, 0x3fffe8u},   {25, 0x1ffffecu},
-    {26, 0x3ffffe2u}, {26, 0x3ffffe3u},  {26, 0x3ffffe4u},  {27, 0x7ffffdeu},
-    {27, 0x7ffffdfu}, {26, 0x3ffffe5u},  {24, 0xfffff1u},   {25, 0x1ffffedu},
-    {19, 0x7fff2u},   {21, 0x1fffe3u},   {26, 0x3ffffe6u},  {27, 0x7ffffe0u},
-    {27, 0x7ffffe1u}, {26, 0x3ffffe7u},  {27, 0x7ffffe2u},  {24, 0xfffff2u},
-    {21, 0x1fffe4u},  {21, 0x1fffe5u},   {26, 0x3ffffe8u},  {26, 0x3ffffe9u},
-    {28, 0xffffffdu}, {27, 0x7ffffe3u},  {27, 0x7ffffe4u},  {27, 0x7ffffe5u},
-    {20, 0xfffecu},   {24, 0xfffff3u},   {20, 0xfffedu},    {21, 0x1fffe6u},
-    {22, 0x3fffe9u},  {21, 0x1fffe7u},   {21, 0x1fffe8u},   {23, 0x7ffff3u},
-    {22, 0x3fffeau},  {22, 0x3fffebu},   {25, 0x1ffffeeu},  {25, 0x1ffffefu},
-    {24, 0xfffff4u},  {24, 0xfffff5u},   {26, 0x3ffffeau},  {23, 0x7ffff4u},
-    {26, 0x3ffffebu}, {27, 0x7ffffe6u},  {26, 0x3ffffecu},  {26, 0x3ffffedu},
-    {27, 0x7ffffe7u}, {27, 0x7ffffe8u},  {27, 0x7ffffe9u},  {27, 0x7ffffeau},
-    {27, 0x7ffffebu}, {28, 0xffffffeu},  {27, 0x7ffffecu},  {27, 0x7ffffedu},
-    {27, 0x7ffffeeu}, {27, 0x7ffffefu},  {27, 0x7fffff0u},  {26, 0x3ffffeeu},
-    {30, 0x3fffffffu}};
-
-const nghttp2_huff_decode huff_decode_table[][16] = {
-    /* 0 */
-    {
-        {4, 0x00, 0},
-        {5, 0x00, 0},
-        {7, 0x00, 0},
-        {8, 0x00, 0},
-        {11, 0x00, 0},
-        {12, 0x00, 0},
-        {16, 0x00, 0},
-        {19, 0x00, 0},
-        {25, 0x00, 0},
-        {28, 0x00, 0},
-        {32, 0x00, 0},
-        {35, 0x00, 0},
-        {42, 0x00, 0},
-        {49, 0x00, 0},
-        {57, 0x00, 0},
-        {64, 0x01, 0},
-    },
-    /* 1 */
-    {
-        {0, 0x03, 48},
-        {0, 0x03, 49},
-        {0, 0x03, 50},
-        {0, 0x03, 97},
-        {0, 0x03, 99},
-        {0, 0x03, 101},
-        {0, 0x03, 105},
-        {0, 0x03, 111},
-        {0, 0x03, 115},
-        {0, 0x03, 116},
-        {13, 0x00, 0},
-        {14, 0x00, 0},
-        {17, 0x00, 0},
-        {18, 0x00, 0},
-        {20, 0x00, 0},
-        {21, 0x00, 0},
-    },
-    /* 2 */
-    {
-        {1, 0x02, 48},
-        {22, 0x03, 48},
-        {1, 0x02, 49},
-        {22, 0x03, 49},
-        {1, 0x02, 50},
-        {22, 0x03, 50},
-        {1, 0x02, 97},
-        {22, 0x03, 97},
-        {1, 0x02, 99},
-        {22, 0x03, 99},
-        {1, 0x02, 101},
-        {22, 0x03, 101},
-        {1, 0x02, 105},
-        {22, 0x03, 105},
-        {1, 0x02, 111},
-        {22, 0x03, 111},
-    },
-    /* 3 */
-    {
-        {2, 0x02, 48},
-        {9, 0x02, 48},
-        {23, 0x02, 48},
-        {40, 0x03, 48},
-        {2, 0x02, 49},
-        {9, 0x02, 49},
-        {23, 0x02, 49},
-        {40, 0x03, 49},
-        {2, 0x02, 50},
-        {9, 0x02, 50},
-        {23, 0x02, 50},
-        {40, 0x03, 50},
-        {2, 0x02, 97},
-        {9, 0x02, 97},
-        {23, 0x02, 97},
-        {40, 0x03, 97},
-    },
-    /* 4 */
-    {
-        {3, 0x02, 48},
-        {6, 0x02, 48},
-        {10, 0x02, 48},
-        {15, 0x02, 48},
-        {24, 0x02, 48},
-        {31, 0x02, 48},
-        {41, 0x02, 48},
-        {56, 0x03, 48},
-        {3, 0x02, 49},
-        {6, 0x02, 49},
-        {10, 0x02, 49},
-        {15, 0x02, 49},
-        {24, 0x02, 49},
-        {31, 0x02, 49},
-        {41, 0x02, 49},
-        {56, 0x03, 49},
-    },
-    /* 5 */
-    {
-        {3, 0x02, 50},
-        {6, 0x02, 50},
-        {10, 0x02, 50},
-        {15, 0x02, 50},
-        {24, 0x02, 50},
-        {31, 0x02, 50},
-        {41, 0x02, 50},
-        {56, 0x03, 50},
-        {3, 0x02, 97},
-        {6, 0x02, 97},
-        {10, 0x02, 97},
-        {15, 0x02, 97},
-        {24, 0x02, 97},
-        {31, 0x02, 97},
-        {41, 0x02, 97},
-        {56, 0x03, 97},
-    },
-    /* 6 */
-    {
-        {2, 0x02, 99},
-        {9, 0x02, 99},
-        {23, 0x02, 99},
-        {40, 0x03, 99},
-        {2, 0x02, 101},
-        {9, 0x02, 101},
-        {23, 0x02, 101},
-        {40, 0x03, 101},
-        {2, 0x02, 105},
-        {9, 0x02, 105},
-        {23, 0x02, 105},
-        {40, 0x03, 105},
-        {2, 0x02, 111},
-        {9, 0x02, 111},
-        {23, 0x02, 111},
-        {40, 0x03, 111},
-    },
-    /* 7 */
-    {
-        {3, 0x02, 99},
-        {6, 0x02, 99},
-        {10, 0x02, 99},
-        {15, 0x02, 99},
-        {24, 0x02, 99},
-        {31, 0x02, 99},
-        {41, 0x02, 99},
-        {56, 0x03, 99},
-        {3, 0x02, 101},
-        {6, 0x02, 101},
-        {10, 0x02, 101},
-        {15, 0x02, 101},
-        {24, 0x02, 101},
-        {31, 0x02, 101},
-        {41, 0x02, 101},
-        {56, 0x03, 101},
-    },
-    /* 8 */
-    {
-        {3, 0x02, 105},
-        {6, 0x02, 105},
-        {10, 0x02, 105},
-        {15, 0x02, 105},
-        {24, 0x02, 105},
-        {31, 0x02, 105},
-        {41, 0x02, 105},
-        {56, 0x03, 105},
-        {3, 0x02, 111},
-        {6, 0x02, 111},
-        {10, 0x02, 111},
-        {15, 0x02, 111},
-        {24, 0x02, 111},
-        {31, 0x02, 111},
-        {41, 0x02, 111},
-        {56, 0x03, 111},
-    },
-    /* 9 */
-    {
-        {1, 0x02, 115},
-        {22, 0x03, 115},
-        {1, 0x02, 116},
-        {22, 0x03, 116},
-        {0, 0x03, 32},
-        {0, 0x03, 37},
-        {0, 0x03, 45},
-        {0, 0x03, 46},
-        {0, 0x03, 47},
-        {0, 0x03, 51},
-        {0, 0x03, 52},
-        {0, 0x03, 53},
-        {0, 0x03, 54},
-        {0, 0x03, 55},
-        {0, 0x03, 56},
-        {0, 0x03, 57},
-    },
-    /* 10 */
-    {
-        {2, 0x02, 115},
-        {9, 0x02, 115},
-        {23, 0x02, 115},
-        {40, 0x03, 115},
-        {2, 0x02, 116},
-        {9, 0x02, 116},
-        {23, 0x02, 116},
-        {40, 0x03, 116},
-        {1, 0x02, 32},
-        {22, 0x03, 32},
-        {1, 0x02, 37},
-        {22, 0x03, 37},
-        {1, 0x02, 45},
-        {22, 0x03, 45},
-        {1, 0x02, 46},
-        {22, 0x03, 46},
-    },
-    /* 11 */
-    {
-        {3, 0x02, 115},
-        {6, 0x02, 115},
-        {10, 0x02, 115},
-        {15, 0x02, 115},
-        {24, 0x02, 115},
-        {31, 0x02, 115},
-        {41, 0x02, 115},
-        {56, 0x03, 115},
-        {3, 0x02, 116},
-        {6, 0x02, 116},
-        {10, 0x02, 116},
-        {15, 0x02, 116},
-        {24, 0x02, 116},
-        {31, 0x02, 116},
-        {41, 0x02, 116},
-        {56, 0x03, 116},
-    },
-    /* 12 */
-    {
-        {2, 0x02, 32},
-        {9, 0x02, 32},
-        {23, 0x02, 32},
-        {40, 0x03, 32},
-        {2, 0x02, 37},
-        {9, 0x02, 37},
-        {23, 0x02, 37},
-        {40, 0x03, 37},
-        {2, 0x02, 45},
-        {9, 0x02, 45},
-        {23, 0x02, 45},
-        {40, 0x03, 45},
-        {2, 0x02, 46},
-        {9, 0x02, 46},
-        {23, 0x02, 46},
-        {40, 0x03, 46},
-    },
-    /* 13 */
-    {
-        {3, 0x02, 32},
-        {6, 0x02, 32},
-        {10, 0x02, 32},
-        {15, 0x02, 32},
-        {24, 0x02, 32},
-        {31, 0x02, 32},
-        {41, 0x02, 32},
-        {56, 0x03, 32},
-        {3, 0x02, 37},
-        {6, 0x02, 37},
-        {10, 0x02, 37},
-        {15, 0x02, 37},
-        {24, 0x02, 37},
-        {31, 0x02, 37},
-        {41, 0x02, 37},
-        {56, 0x03, 37},
-    },
-    /* 14 */
-    {
-        {3, 0x02, 45},
-        {6, 0x02, 45},
-        {10, 0x02, 45},
-        {15, 0x02, 45},
-        {24, 0x02, 45},
-        {31, 0x02, 45},
-        {41, 0x02, 45},
-        {56, 0x03, 45},
-        {3, 0x02, 46},
-        {6, 0x02, 46},
-        {10, 0x02, 46},
-        {15, 0x02, 46},
-        {24, 0x02, 46},
-        {31, 0x02, 46},
-        {41, 0x02, 46},
-        {56, 0x03, 46},
-    },
-    /* 15 */
-    {
-        {1, 0x02, 47},
-        {22, 0x03, 47},
-        {1, 0x02, 51},
-        {22, 0x03, 51},
-        {1, 0x02, 52},
-        {22, 0x03, 52},
-        {1, 0x02, 53},
-        {22, 0x03, 53},
-        {1, 0x02, 54},
-        {22, 0x03, 54},
-        {1, 0x02, 55},
-        {22, 0x03, 55},
-        {1, 0x02, 56},
-        {22, 0x03, 56},
-        {1, 0x02, 57},
-        {22, 0x03, 57},
-    },
-    /* 16 */
-    {
-        {2, 0x02, 47},
-        {9, 0x02, 47},
-        {23, 0x02, 47},
-        {40, 0x03, 47},
-        {2, 0x02, 51},
-        {9, 0x02, 51},
-        {23, 0x02, 51},
-        {40, 0x03, 51},
-        {2, 0x02, 52},
-        {9, 0x02, 52},
-        {23, 0x02, 52},
-        {40, 0x03, 52},
-        {2, 0x02, 53},
-        {9, 0x02, 53},
-        {23, 0x02, 53},
-        {40, 0x03, 53},
-    },
-    /* 17 */
-    {
-        {3, 0x02, 47},
-        {6, 0x02, 47},
-        {10, 0x02, 47},
-        {15, 0x02, 47},
-        {24, 0x02, 47},
-        {31, 0x02, 47},
-        {41, 0x02, 47},
-        {56, 0x03, 47},
-        {3, 0x02, 51},
-        {6, 0x02, 51},
-        {10, 0x02, 51},
-        {15, 0x02, 51},
-        {24, 0x02, 51},
-        {31, 0x02, 51},
-        {41, 0x02, 51},
-        {56, 0x03, 51},
-    },
-    /* 18 */
-    {
-        {3, 0x02, 52},
-        {6, 0x02, 52},
-        {10, 0x02, 52},
-        {15, 0x02, 52},
-        {24, 0x02, 52},
-        {31, 0x02, 52},
-        {41, 0x02, 52},
-        {56, 0x03, 52},
-        {3, 0x02, 53},
-        {6, 0x02, 53},
-        {10, 0x02, 53},
-        {15, 0x02, 53},
-        {24, 0x02, 53},
-        {31, 0x02, 53},
-        {41, 0x02, 53},
-        {56, 0x03, 53},
-    },
-    /* 19 */
-    {
-        {2, 0x02, 54},
-        {9, 0x02, 54},
-        {23, 0x02, 54},
-        {40, 0x03, 54},
-        {2, 0x02, 55},
-        {9, 0x02, 55},
-        {23, 0x02, 55},
-        {40, 0x03, 55},
-        {2, 0x02, 56},
-        {9, 0x02, 56},
-        {23, 0x02, 56},
-        {40, 0x03, 56},
-        {2, 0x02, 57},
-        {9, 0x02, 57},
-        {23, 0x02, 57},
-        {40, 0x03, 57},
-    },
-    /* 20 */
-    {
-        {3, 0x02, 54},
-        {6, 0x02, 54},
-        {10, 0x02, 54},
-        {15, 0x02, 54},
-        {24, 0x02, 54},
-        {31, 0x02, 54},
-        {41, 0x02, 54},
-        {56, 0x03, 54},
-        {3, 0x02, 55},
-        {6, 0x02, 55},
-        {10, 0x02, 55},
-        {15, 0x02, 55},
-        {24, 0x02, 55},
-        {31, 0x02, 55},
-        {41, 0x02, 55},
-        {56, 0x03, 55},
-    },
-    /* 21 */
-    {
-        {3, 0x02, 56},
-        {6, 0x02, 56},
-        {10, 0x02, 56},
-        {15, 0x02, 56},
-        {24, 0x02, 56},
-        {31, 0x02, 56},
-        {41, 0x02, 56},
-        {56, 0x03, 56},
-        {3, 0x02, 57},
-        {6, 0x02, 57},
-        {10, 0x02, 57},
-        {15, 0x02, 57},
-        {24, 0x02, 57},
-        {31, 0x02, 57},
-        {41, 0x02, 57},
-        {56, 0x03, 57},
-    },
-    /* 22 */
-    {
-        {26, 0x00, 0},
-        {27, 0x00, 0},
-        {29, 0x00, 0},
-        {30, 0x00, 0},
-        {33, 0x00, 0},
-        {34, 0x00, 0},
-        {36, 0x00, 0},
-        {37, 0x00, 0},
-        {43, 0x00, 0},
-        {46, 0x00, 0},
-        {50, 0x00, 0},
-        {53, 0x00, 0},
-        {58, 0x00, 0},
-        {61, 0x00, 0},
-        {65, 0x00, 0},
-        {68, 0x01, 0},
-    },
-    /* 23 */
-    {
-        {0, 0x03, 61},
-        {0, 0x03, 65},
-        {0, 0x03, 95},
-        {0, 0x03, 98},
-        {0, 0x03, 100},
-        {0, 0x03, 102},
-        {0, 0x03, 103},
-        {0, 0x03, 104},
-        {0, 0x03, 108},
-        {0, 0x03, 109},
-        {0, 0x03, 110},
-        {0, 0x03, 112},
-        {0, 0x03, 114},
-        {0, 0x03, 117},
-        {38, 0x00, 0},
-        {39, 0x00, 0},
-    },
-    /* 24 */
-    {
-        {1, 0x02, 61},
-        {22, 0x03, 61},
-        {1, 0x02, 65},
-        {22, 0x03, 65},
-        {1, 0x02, 95},
-        {22, 0x03, 95},
-        {1, 0x02, 98},
-        {22, 0x03, 98},
-        {1, 0x02, 100},
-        {22, 0x03, 100},
-        {1, 0x02, 102},
-        {22, 0x03, 102},
-        {1, 0x02, 103},
-        {22, 0x03, 103},
-        {1, 0x02, 104},
-        {22, 0x03, 104},
-    },
-    /* 25 */
-    {
-        {2, 0x02, 61},
-        {9, 0x02, 61},
-        {23, 0x02, 61},
-        {40, 0x03, 61},
-        {2, 0x02, 65},
-        {9, 0x02, 65},
-        {23, 0x02, 65},
-        {40, 0x03, 65},
-        {2, 0x02, 95},
-        {9, 0x02, 95},
-        {23, 0x02, 95},
-        {40, 0x03, 95},
-        {2, 0x02, 98},
-        {9, 0x02, 98},
-        {23, 0x02, 98},
-        {40, 0x03, 98},
-    },
-    /* 26 */
-    {
-        {3, 0x02, 61},
-        {6, 0x02, 61},
-        {10, 0x02, 61},
-        {15, 0x02, 61},
-        {24, 0x02, 61},
-        {31, 0x02, 61},
-        {41, 0x02, 61},
-        {56, 0x03, 61},
-        {3, 0x02, 65},
-        {6, 0x02, 65},
-        {10, 0x02, 65},
-        {15, 0x02, 65},
-        {24, 0x02, 65},
-        {31, 0x02, 65},
-        {41, 0x02, 65},
-        {56, 0x03, 65},
-    },
-    /* 27 */
-    {
-        {3, 0x02, 95},
-        {6, 0x02, 95},
-        {10, 0x02, 95},
-        {15, 0x02, 95},
-        {24, 0x02, 95},
-        {31, 0x02, 95},
-        {41, 0x02, 95},
-        {56, 0x03, 95},
-        {3, 0x02, 98},
-        {6, 0x02, 98},
-        {10, 0x02, 98},
-        {15, 0x02, 98},
-        {24, 0x02, 98},
-        {31, 0x02, 98},
-        {41, 0x02, 98},
-        {56, 0x03, 98},
-    },
-    /* 28 */
-    {
-        {2, 0x02, 100},
-        {9, 0x02, 100},
-        {23, 0x02, 100},
-        {40, 0x03, 100},
-        {2, 0x02, 102},
-        {9, 0x02, 102},
-        {23, 0x02, 102},
-        {40, 0x03, 102},
-        {2, 0x02, 103},
-        {9, 0x02, 103},
-        {23, 0x02, 103},
-        {40, 0x03, 103},
-        {2, 0x02, 104},
-        {9, 0x02, 104},
-        {23, 0x02, 104},
-        {40, 0x03, 104},
-    },
-    /* 29 */
-    {
-        {3, 0x02, 100},
-        {6, 0x02, 100},
-        {10, 0x02, 100},
-        {15, 0x02, 100},
-        {24, 0x02, 100},
-        {31, 0x02, 100},
-        {41, 0x02, 100},
-        {56, 0x03, 100},
-        {3, 0x02, 102},
-        {6, 0x02, 102},
-        {10, 0x02, 102},
-        {15, 0x02, 102},
-        {24, 0x02, 102},
-        {31, 0x02, 102},
-        {41, 0x02, 102},
-        {56, 0x03, 102},
-    },
-    /* 30 */
-    {
-        {3, 0x02, 103},
-        {6, 0x02, 103},
-        {10, 0x02, 103},
-        {15, 0x02, 103},
-        {24, 0x02, 103},
-        {31, 0x02, 103},
-        {41, 0x02, 103},
-        {56, 0x03, 103},
-        {3, 0x02, 104},
-        {6, 0x02, 104},
-        {10, 0x02, 104},
-        {15, 0x02, 104},
-        {24, 0x02, 104},
-        {31, 0x02, 104},
-        {41, 0x02, 104},
-        {56, 0x03, 104},
-    },
-    /* 31 */
-    {
-        {1, 0x02, 108},
-        {22, 0x03, 108},
-        {1, 0x02, 109},
-        {22, 0x03, 109},
-        {1, 0x02, 110},
-        {22, 0x03, 110},
-        {1, 0x02, 112},
-        {22, 0x03, 112},
-        {1, 0x02, 114},
-        {22, 0x03, 114},
-        {1, 0x02, 117},
-        {22, 0x03, 117},
-        {0, 0x03, 58},
-        {0, 0x03, 66},
-        {0, 0x03, 67},
-        {0, 0x03, 68},
-    },
-    /* 32 */
-    {
-        {2, 0x02, 108},
-        {9, 0x02, 108},
-        {23, 0x02, 108},
-        {40, 0x03, 108},
-        {2, 0x02, 109},
-        {9, 0x02, 109},
-        {23, 0x02, 109},
-        {40, 0x03, 109},
-        {2, 0x02, 110},
-        {9, 0x02, 110},
-        {23, 0x02, 110},
-        {40, 0x03, 110},
-        {2, 0x02, 112},
-        {9, 0x02, 112},
-        {23, 0x02, 112},
-        {40, 0x03, 112},
-    },
-    /* 33 */
-    {
-        {3, 0x02, 108},
-        {6, 0x02, 108},
-        {10, 0x02, 108},
-        {15, 0x02, 108},
-        {24, 0x02, 108},
-        {31, 0x02, 108},
-        {41, 0x02, 108},
-        {56, 0x03, 108},
-        {3, 0x02, 109},
-        {6, 0x02, 109},
-        {10, 0x02, 109},
-        {15, 0x02, 109},
-        {24, 0x02, 109},
-        {31, 0x02, 109},
-        {41, 0x02, 109},
-        {56, 0x03, 109},
-    },
-    /* 34 */
-    {
-        {3, 0x02, 110},
-        {6, 0x02, 110},
-        {10, 0x02, 110},
-        {15, 0x02, 110},
-        {24, 0x02, 110},
-        {31, 0x02, 110},
-        {41, 0x02, 110},
-        {56, 0x03, 110},
-        {3, 0x02, 112},
-        {6, 0x02, 112},
-        {10, 0x02, 112},
-        {15, 0x02, 112},
-        {24, 0x02, 112},
-        {31, 0x02, 112},
-        {41, 0x02, 112},
-        {56, 0x03, 112},
-    },
-    /* 35 */
-    {
-        {2, 0x02, 114},
-        {9, 0x02, 114},
-        {23, 0x02, 114},
-        {40, 0x03, 114},
-        {2, 0x02, 117},
-        {9, 0x02, 117},
-        {23, 0x02, 117},
-        {40, 0x03, 117},
-        {1, 0x02, 58},
-        {22, 0x03, 58},
-        {1, 0x02, 66},
-        {22, 0x03, 66},
-        {1, 0x02, 67},
-        {22, 0x03, 67},
-        {1, 0x02, 68},
-        {22, 0x03, 68},
-    },
-    /* 36 */
-    {
-        {3, 0x02, 114},
-        {6, 0x02, 114},
-        {10, 0x02, 114},
-        {15, 0x02, 114},
-        {24, 0x02, 114},
-        {31, 0x02, 114},
-        {41, 0x02, 114},
-        {56, 0x03, 114},
-        {3, 0x02, 117},
-        {6, 0x02, 117},
-        {10, 0x02, 117},
-        {15, 0x02, 117},
-        {24, 0x02, 117},
-        {31, 0x02, 117},
-        {41, 0x02, 117},
-        {56, 0x03, 117},
-    },
-    /* 37 */
-    {
-        {2, 0x02, 58},
-        {9, 0x02, 58},
-        {23, 0x02, 58},
-        {40, 0x03, 58},
-        {2, 0x02, 66},
-        {9, 0x02, 66},
-        {23, 0x02, 66},
-        {40, 0x03, 66},
-        {2, 0x02, 67},
-        {9, 0x02, 67},
-        {23, 0x02, 67},
-        {40, 0x03, 67},
-        {2, 0x02, 68},
-        {9, 0x02, 68},
-        {23, 0x02, 68},
-        {40, 0x03, 68},
-    },
-    /* 38 */
-    {
-        {3, 0x02, 58},
-        {6, 0x02, 58},
-        {10, 0x02, 58},
-        {15, 0x02, 58},
-        {24, 0x02, 58},
-        {31, 0x02, 58},
-        {41, 0x02, 58},
-        {56, 0x03, 58},
-        {3, 0x02, 66},
-        {6, 0x02, 66},
-        {10, 0x02, 66},
-        {15, 0x02, 66},
-        {24, 0x02, 66},
-        {31, 0x02, 66},
-        {41, 0x02, 66},
-        {56, 0x03, 66},
-    },
-    /* 39 */
-    {
-        {3, 0x02, 67},
-        {6, 0x02, 67},
-        {10, 0x02, 67},
-        {15, 0x02, 67},
-        {24, 0x02, 67},
-        {31, 0x02, 67},
-        {41, 0x02, 67},
-        {56, 0x03, 67},
-        {3, 0x02, 68},
-        {6, 0x02, 68},
-        {10, 0x02, 68},
-        {15, 0x02, 68},
-        {24, 0x02, 68},
-        {31, 0x02, 68},
-        {41, 0x02, 68},
-        {56, 0x03, 68},
-    },
-    /* 40 */
-    {
-        {44, 0x00, 0},
-        {45, 0x00, 0},
-        {47, 0x00, 0},
-        {48, 0x00, 0},
-        {51, 0x00, 0},
-        {52, 0x00, 0},
-        {54, 0x00, 0},
-        {55, 0x00, 0},
-        {59, 0x00, 0},
-        {60, 0x00, 0},
-        {62, 0x00, 0},
-        {63, 0x00, 0},
-        {66, 0x00, 0},
-        {67, 0x00, 0},
-        {69, 0x00, 0},
-        {72, 0x01, 0},
-    },
-    /* 41 */
-    {
-        {0, 0x03, 69},
-        {0, 0x03, 70},
-        {0, 0x03, 71},
-        {0, 0x03, 72},
-        {0, 0x03, 73},
-        {0, 0x03, 74},
-        {0, 0x03, 75},
-        {0, 0x03, 76},
-        {0, 0x03, 77},
-        {0, 0x03, 78},
-        {0, 0x03, 79},
-        {0, 0x03, 80},
-        {0, 0x03, 81},
-        {0, 0x03, 82},
-        {0, 0x03, 83},
-        {0, 0x03, 84},
-    },
-    /* 42 */
-    {
-        {1, 0x02, 69},
-        {22, 0x03, 69},
-        {1, 0x02, 70},
-        {22, 0x03, 70},
-        {1, 0x02, 71},
-        {22, 0x03, 71},
-        {1, 0x02, 72},
-        {22, 0x03, 72},
-        {1, 0x02, 73},
-        {22, 0x03, 73},
-        {1, 0x02, 74},
-        {22, 0x03, 74},
-        {1, 0x02, 75},
-        {22, 0x03, 75},
-        {1, 0x02, 76},
-        {22, 0x03, 76},
-    },
-    /* 43 */
-    {
-        {2, 0x02, 69},
-        {9, 0x02, 69},
-        {23, 0x02, 69},
-        {40, 0x03, 69},
-        {2, 0x02, 70},
-        {9, 0x02, 70},
-        {23, 0x02, 70},
-        {40, 0x03, 70},
-        {2, 0x02, 71},
-        {9, 0x02, 71},
-        {23, 0x02, 71},
-        {40, 0x03, 71},
-        {2, 0x02, 72},
-        {9, 0x02, 72},
-        {23, 0x02, 72},
-        {40, 0x03, 72},
-    },
-    /* 44 */
-    {
-        {3, 0x02, 69},
-        {6, 0x02, 69},
-        {10, 0x02, 69},
-        {15, 0x02, 69},
-        {24, 0x02, 69},
-        {31, 0x02, 69},
-        {41, 0x02, 69},
-        {56, 0x03, 69},
-        {3, 0x02, 70},
-        {6, 0x02, 70},
-        {10, 0x02, 70},
-        {15, 0x02, 70},
-        {24, 0x02, 70},
-        {31, 0x02, 70},
-        {41, 0x02, 70},
-        {56, 0x03, 70},
-    },
-    /* 45 */
-    {
-        {3, 0x02, 71},
-        {6, 0x02, 71},
-        {10, 0x02, 71},
-        {15, 0x02, 71},
-        {24, 0x02, 71},
-        {31, 0x02, 71},
-        {41, 0x02, 71},
-        {56, 0x03, 71},
-        {3, 0x02, 72},
-        {6, 0x02, 72},
-        {10, 0x02, 72},
-        {15, 0x02, 72},
-        {24, 0x02, 72},
-        {31, 0x02, 72},
-        {41, 0x02, 72},
-        {56, 0x03, 72},
-    },
-    /* 46 */
-    {
-        {2, 0x02, 73},
-        {9, 0x02, 73},
-        {23, 0x02, 73},
-        {40, 0x03, 73},
-        {2, 0x02, 74},
-        {9, 0x02, 74},
-        {23, 0x02, 74},
-        {40, 0x03, 74},
-        {2, 0x02, 75},
-        {9, 0x02, 75},
-        {23, 0x02, 75},
-        {40, 0x03, 75},
-        {2, 0x02, 76},
-        {9, 0x02, 76},
-        {23, 0x02, 76},
-        {40, 0x03, 76},
-    },
-    /* 47 */
-    {
-        {3, 0x02, 73},
-        {6, 0x02, 73},
-        {10, 0x02, 73},
-        {15, 0x02, 73},
-        {24, 0x02, 73},
-        {31, 0x02, 73},
-        {41, 0x02, 73},
-        {56, 0x03, 73},
-        {3, 0x02, 74},
-        {6, 0x02, 74},
-        {10, 0x02, 74},
-        {15, 0x02, 74},
-        {24, 0x02, 74},
-        {31, 0x02, 74},
-        {41, 0x02, 74},
-        {56, 0x03, 74},
-    },
-    /* 48 */
-    {
-        {3, 0x02, 75},
-        {6, 0x02, 75},
-        {10, 0x02, 75},
-        {15, 0x02, 75},
-        {24, 0x02, 75},
-        {31, 0x02, 75},
-        {41, 0x02, 75},
-        {56, 0x03, 75},
-        {3, 0x02, 76},
-        {6, 0x02, 76},
-        {10, 0x02, 76},
-        {15, 0x02, 76},
-        {24, 0x02, 76},
-        {31, 0x02, 76},
-        {41, 0x02, 76},
-        {56, 0x03, 76},
-    },
-    /* 49 */
-    {
-        {1, 0x02, 77},
-        {22, 0x03, 77},
-        {1, 0x02, 78},
-        {22, 0x03, 78},
-        {1, 0x02, 79},
-        {22, 0x03, 79},
-        {1, 0x02, 80},
-        {22, 0x03, 80},
-        {1, 0x02, 81},
-        {22, 0x03, 81},
-        {1, 0x02, 82},
-        {22, 0x03, 82},
-        {1, 0x02, 83},
-        {22, 0x03, 83},
-        {1, 0x02, 84},
-        {22, 0x03, 84},
-    },
-    /* 50 */
-    {
-        {2, 0x02, 77},
-        {9, 0x02, 77},
-        {23, 0x02, 77},
-        {40, 0x03, 77},
-        {2, 0x02, 78},
-        {9, 0x02, 78},
-        {23, 0x02, 78},
-        {40, 0x03, 78},
-        {2, 0x02, 79},
-        {9, 0x02, 79},
-        {23, 0x02, 79},
-        {40, 0x03, 79},
-        {2, 0x02, 80},
-        {9, 0x02, 80},
-        {23, 0x02, 80},
-        {40, 0x03, 80},
-    },
-    /* 51 */
-    {
-        {3, 0x02, 77},
-        {6, 0x02, 77},
-        {10, 0x02, 77},
-        {15, 0x02, 77},
-        {24, 0x02, 77},
-        {31, 0x02, 77},
-        {41, 0x02, 77},
-        {56, 0x03, 77},
-        {3, 0x02, 78},
-        {6, 0x02, 78},
-        {10, 0x02, 78},
-        {15, 0x02, 78},
-        {24, 0x02, 78},
-        {31, 0x02, 78},
-        {41, 0x02, 78},
-        {56, 0x03, 78},
-    },
-    /* 52 */
-    {
-        {3, 0x02, 79},
-        {6, 0x02, 79},
-        {10, 0x02, 79},
-        {15, 0x02, 79},
-        {24, 0x02, 79},
-        {31, 0x02, 79},
-        {41, 0x02, 79},
-        {56, 0x03, 79},
-        {3, 0x02, 80},
-        {6, 0x02, 80},
-        {10, 0x02, 80},
-        {15, 0x02, 80},
-        {24, 0x02, 80},
-        {31, 0x02, 80},
-        {41, 0x02, 80},
-        {56, 0x03, 80},
-    },
-    /* 53 */
-    {
-        {2, 0x02, 81},
-        {9, 0x02, 81},
-        {23, 0x02, 81},
-        {40, 0x03, 81},
-        {2, 0x02, 82},
-        {9, 0x02, 82},
-        {23, 0x02, 82},
-        {40, 0x03, 82},
-        {2, 0x02, 83},
-        {9, 0x02, 83},
-        {23, 0x02, 83},
-        {40, 0x03, 83},
-        {2, 0x02, 84},
-        {9, 0x02, 84},
-        {23, 0x02, 84},
-        {40, 0x03, 84},
-    },
-    /* 54 */
-    {
-        {3, 0x02, 81},
-        {6, 0x02, 81},
-        {10, 0x02, 81},
-        {15, 0x02, 81},
-        {24, 0x02, 81},
-        {31, 0x02, 81},
-        {41, 0x02, 81},
-        {56, 0x03, 81},
-        {3, 0x02, 82},
-        {6, 0x02, 82},
-        {10, 0x02, 82},
-        {15, 0x02, 82},
-        {24, 0x02, 82},
-        {31, 0x02, 82},
-        {41, 0x02, 82},
-        {56, 0x03, 82},
-    },
-    /* 55 */
-    {
-        {3, 0x02, 83},
-        {6, 0x02, 83},
-        {10, 0x02, 83},
-        {15, 0x02, 83},
-        {24, 0x02, 83},
-        {31, 0x02, 83},
-        {41, 0x02, 83},
-        {56, 0x03, 83},
-        {3, 0x02, 84},
-        {6, 0x02, 84},
-        {10, 0x02, 84},
-        {15, 0x02, 84},
-        {24, 0x02, 84},
-        {31, 0x02, 84},
-        {41, 0x02, 84},
-        {56, 0x03, 84},
-    },
-    /* 56 */
-    {
-        {0, 0x03, 85},
-        {0, 0x03, 86},
-        {0, 0x03, 87},
-        {0, 0x03, 89},
-        {0, 0x03, 106},
-        {0, 0x03, 107},
-        {0, 0x03, 113},
-        {0, 0x03, 118},
-        {0, 0x03, 119},
-        {0, 0x03, 120},
-        {0, 0x03, 121},
-        {0, 0x03, 122},
-        {70, 0x00, 0},
-        {71, 0x00, 0},
-        {73, 0x00, 0},
-        {74, 0x01, 0},
-    },
-    /* 57 */
-    {
-        {1, 0x02, 85},
-        {22, 0x03, 85},
-        {1, 0x02, 86},
-        {22, 0x03, 86},
-        {1, 0x02, 87},
-        {22, 0x03, 87},
-        {1, 0x02, 89},
-        {22, 0x03, 89},
-        {1, 0x02, 106},
-        {22, 0x03, 106},
-        {1, 0x02, 107},
-        {22, 0x03, 107},
-        {1, 0x02, 113},
-        {22, 0x03, 113},
-        {1, 0x02, 118},
-        {22, 0x03, 118},
-    },
-    /* 58 */
-    {
-        {2, 0x02, 85},
-        {9, 0x02, 85},
-        {23, 0x02, 85},
-        {40, 0x03, 85},
-        {2, 0x02, 86},
-        {9, 0x02, 86},
-        {23, 0x02, 86},
-        {40, 0x03, 86},
-        {2, 0x02, 87},
-        {9, 0x02, 87},
-        {23, 0x02, 87},
-        {40, 0x03, 87},
-        {2, 0x02, 89},
-        {9, 0x02, 89},
-        {23, 0x02, 89},
-        {40, 0x03, 89},
-    },
-    /* 59 */
-    {
-        {3, 0x02, 85},
-        {6, 0x02, 85},
-        {10, 0x02, 85},
-        {15, 0x02, 85},
-        {24, 0x02, 85},
-        {31, 0x02, 85},
-        {41, 0x02, 85},
-        {56, 0x03, 85},
-        {3, 0x02, 86},
-        {6, 0x02, 86},
-        {10, 0x02, 86},
-        {15, 0x02, 86},
-        {24, 0x02, 86},
-        {31, 0x02, 86},
-        {41, 0x02, 86},
-        {56, 0x03, 86},
-    },
-    /* 60 */
-    {
-        {3, 0x02, 87},
-        {6, 0x02, 87},
-        {10, 0x02, 87},
-        {15, 0x02, 87},
-        {24, 0x02, 87},
-        {31, 0x02, 87},
-        {41, 0x02, 87},
-        {56, 0x03, 87},
-        {3, 0x02, 89},
-        {6, 0x02, 89},
-        {10, 0x02, 89},
-        {15, 0x02, 89},
-        {24, 0x02, 89},
-        {31, 0x02, 89},
-        {41, 0x02, 89},
-        {56, 0x03, 89},
-    },
-    /* 61 */
-    {
-        {2, 0x02, 106},
-        {9, 0x02, 106},
-        {23, 0x02, 106},
-        {40, 0x03, 106},
-        {2, 0x02, 107},
-        {9, 0x02, 107},
-        {23, 0x02, 107},
-        {40, 0x03, 107},
-        {2, 0x02, 113},
-        {9, 0x02, 113},
-        {23, 0x02, 113},
-        {40, 0x03, 113},
-        {2, 0x02, 118},
-        {9, 0x02, 118},
-        {23, 0x02, 118},
-        {40, 0x03, 118},
-    },
-    /* 62 */
-    {
-        {3, 0x02, 106},
-        {6, 0x02, 106},
-        {10, 0x02, 106},
-        {15, 0x02, 106},
-        {24, 0x02, 106},
-        {31, 0x02, 106},
-        {41, 0x02, 106},
-        {56, 0x03, 106},
-        {3, 0x02, 107},
-        {6, 0x02, 107},
-        {10, 0x02, 107},
-        {15, 0x02, 107},
-        {24, 0x02, 107},
-        {31, 0x02, 107},
-        {41, 0x02, 107},
-        {56, 0x03, 107},
-    },
-    /* 63 */
-    {
-        {3, 0x02, 113},
-        {6, 0x02, 113},
-        {10, 0x02, 113},
-        {15, 0x02, 113},
-        {24, 0x02, 113},
-        {31, 0x02, 113},
-        {41, 0x02, 113},
-        {56, 0x03, 113},
-        {3, 0x02, 118},
-        {6, 0x02, 118},
-        {10, 0x02, 118},
-        {15, 0x02, 118},
-        {24, 0x02, 118},
-        {31, 0x02, 118},
-        {41, 0x02, 118},
-        {56, 0x03, 118},
-    },
-    /* 64 */
-    {
-        {1, 0x02, 119},
-        {22, 0x03, 119},
-        {1, 0x02, 120},
-        {22, 0x03, 120},
-        {1, 0x02, 121},
-        {22, 0x03, 121},
-        {1, 0x02, 122},
-        {22, 0x03, 122},
-        {0, 0x03, 38},
-        {0, 0x03, 42},
-        {0, 0x03, 44},
-        {0, 0x03, 59},
-        {0, 0x03, 88},
-        {0, 0x03, 90},
-        {75, 0x00, 0},
-        {78, 0x00, 0},
-    },
-    /* 65 */
-    {
-        {2, 0x02, 119},
-        {9, 0x02, 119},
-        {23, 0x02, 119},
-        {40, 0x03, 119},
-        {2, 0x02, 120},
-        {9, 0x02, 120},
-        {23, 0x02, 120},
-        {40, 0x03, 120},
-        {2, 0x02, 121},
-        {9, 0x02, 121},
-        {23, 0x02, 121},
-        {40, 0x03, 121},
-        {2, 0x02, 122},
-        {9, 0x02, 122},
-        {23, 0x02, 122},
-        {40, 0x03, 122},
-    },
-    /* 66 */
-    {
-        {3, 0x02, 119},
-        {6, 0x02, 119},
-        {10, 0x02, 119},
-        {15, 0x02, 119},
-        {24, 0x02, 119},
-        {31, 0x02, 119},
-        {41, 0x02, 119},
-        {56, 0x03, 119},
-        {3, 0x02, 120},
-        {6, 0x02, 120},
-        {10, 0x02, 120},
-        {15, 0x02, 120},
-        {24, 0x02, 120},
-        {31, 0x02, 120},
-        {41, 0x02, 120},
-        {56, 0x03, 120},
-    },
-    /* 67 */
-    {
-        {3, 0x02, 121},
-        {6, 0x02, 121},
-        {10, 0x02, 121},
-        {15, 0x02, 121},
-        {24, 0x02, 121},
-        {31, 0x02, 121},
-        {41, 0x02, 121},
-        {56, 0x03, 121},
-        {3, 0x02, 122},
-        {6, 0x02, 122},
-        {10, 0x02, 122},
-        {15, 0x02, 122},
-        {24, 0x02, 122},
-        {31, 0x02, 122},
-        {41, 0x02, 122},
-        {56, 0x03, 122},
-    },
-    /* 68 */
-    {
-        {1, 0x02, 38},
-        {22, 0x03, 38},
-        {1, 0x02, 42},
-        {22, 0x03, 42},
-        {1, 0x02, 44},
-        {22, 0x03, 44},
-        {1, 0x02, 59},
-        {22, 0x03, 59},
-        {1, 0x02, 88},
-        {22, 0x03, 88},
-        {1, 0x02, 90},
-        {22, 0x03, 90},
-        {76, 0x00, 0},
-        {77, 0x00, 0},
-        {79, 0x00, 0},
-        {81, 0x00, 0},
-    },
-    /* 69 */
-    {
-        {2, 0x02, 38},
-        {9, 0x02, 38},
-        {23, 0x02, 38},
-        {40, 0x03, 38},
-        {2, 0x02, 42},
-        {9, 0x02, 42},
-        {23, 0x02, 42},
-        {40, 0x03, 42},
-        {2, 0x02, 44},
-        {9, 0x02, 44},
-        {23, 0x02, 44},
-        {40, 0x03, 44},
-        {2, 0x02, 59},
-        {9, 0x02, 59},
-        {23, 0x02, 59},
-        {40, 0x03, 59},
-    },
-    /* 70 */
-    {
-        {3, 0x02, 38},
-        {6, 0x02, 38},
-        {10, 0x02, 38},
-        {15, 0x02, 38},
-        {24, 0x02, 38},
-        {31, 0x02, 38},
-        {41, 0x02, 38},
-        {56, 0x03, 38},
-        {3, 0x02, 42},
-        {6, 0x02, 42},
-        {10, 0x02, 42},
-        {15, 0x02, 42},
-        {24, 0x02, 42},
-        {31, 0x02, 42},
-        {41, 0x02, 42},
-        {56, 0x03, 42},
-    },
-    /* 71 */
-    {
-        {3, 0x02, 44},
-        {6, 0x02, 44},
-        {10, 0x02, 44},
-        {15, 0x02, 44},
-        {24, 0x02, 44},
-        {31, 0x02, 44},
-        {41, 0x02, 44},
-        {56, 0x03, 44},
-        {3, 0x02, 59},
-        {6, 0x02, 59},
-        {10, 0x02, 59},
-        {15, 0x02, 59},
-        {24, 0x02, 59},
-        {31, 0x02, 59},
-        {41, 0x02, 59},
-        {56, 0x03, 59},
-    },
-    /* 72 */
-    {
-        {2, 0x02, 88},
-        {9, 0x02, 88},
-        {23, 0x02, 88},
-        {40, 0x03, 88},
-        {2, 0x02, 90},
-        {9, 0x02, 90},
-        {23, 0x02, 90},
-        {40, 0x03, 90},
-        {0, 0x03, 33},
-        {0, 0x03, 34},
-        {0, 0x03, 40},
-        {0, 0x03, 41},
-        {0, 0x03, 63},
-        {80, 0x00, 0},
-        {82, 0x00, 0},
-        {84, 0x00, 0},
-    },
-    /* 73 */
-    {
-        {3, 0x02, 88},
-        {6, 0x02, 88},
-        {10, 0x02, 88},
-        {15, 0x02, 88},
-        {24, 0x02, 88},
-        {31, 0x02, 88},
-        {41, 0x02, 88},
-        {56, 0x03, 88},
-        {3, 0x02, 90},
-        {6, 0x02, 90},
-        {10, 0x02, 90},
-        {15, 0x02, 90},
-        {24, 0x02, 90},
-        {31, 0x02, 90},
-        {41, 0x02, 90},
-        {56, 0x03, 90},
-    },
-    /* 74 */
-    {
-        {1, 0x02, 33},
-        {22, 0x03, 33},
-        {1, 0x02, 34},
-        {22, 0x03, 34},
-        {1, 0x02, 40},
-        {22, 0x03, 40},
-        {1, 0x02, 41},
-        {22, 0x03, 41},
-        {1, 0x02, 63},
-        {22, 0x03, 63},
-        {0, 0x03, 39},
-        {0, 0x03, 43},
-        {0, 0x03, 124},
-        {83, 0x00, 0},
-        {85, 0x00, 0},
-        {88, 0x00, 0},
-    },
-    /* 75 */
-    {
-        {2, 0x02, 33},
-        {9, 0x02, 33},
-        {23, 0x02, 33},
-        {40, 0x03, 33},
-        {2, 0x02, 34},
-        {9, 0x02, 34},
-        {23, 0x02, 34},
-        {40, 0x03, 34},
-        {2, 0x02, 40},
-        {9, 0x02, 40},
-        {23, 0x02, 40},
-        {40, 0x03, 40},
-        {2, 0x02, 41},
-        {9, 0x02, 41},
-        {23, 0x02, 41},
-        {40, 0x03, 41},
-    },
-    /* 76 */
-    {
-        {3, 0x02, 33},
-        {6, 0x02, 33},
-        {10, 0x02, 33},
-        {15, 0x02, 33},
-        {24, 0x02, 33},
-        {31, 0x02, 33},
-        {41, 0x02, 33},
-        {56, 0x03, 33},
-        {3, 0x02, 34},
-        {6, 0x02, 34},
-        {10, 0x02, 34},
-        {15, 0x02, 34},
-        {24, 0x02, 34},
-        {31, 0x02, 34},
-        {41, 0x02, 34},
-        {56, 0x03, 34},
-    },
-    /* 77 */
-    {
-        {3, 0x02, 40},
-        {6, 0x02, 40},
-        {10, 0x02, 40},
-        {15, 0x02, 40},
-        {24, 0x02, 40},
-        {31, 0x02, 40},
-        {41, 0x02, 40},
-        {56, 0x03, 40},
-        {3, 0x02, 41},
-        {6, 0x02, 41},
-        {10, 0x02, 41},
-        {15, 0x02, 41},
-        {24, 0x02, 41},
-        {31, 0x02, 41},
-        {41, 0x02, 41},
-        {56, 0x03, 41},
-    },
-    /* 78 */
-    {
-        {2, 0x02, 63},
-        {9, 0x02, 63},
-        {23, 0x02, 63},
-        {40, 0x03, 63},
-        {1, 0x02, 39},
-        {22, 0x03, 39},
-        {1, 0x02, 43},
-        {22, 0x03, 43},
-        {1, 0x02, 124},
-        {22, 0x03, 124},
-        {0, 0x03, 35},
-        {0, 0x03, 62},
-        {86, 0x00, 0},
-        {87, 0x00, 0},
-        {89, 0x00, 0},
-        {90, 0x00, 0},
-    },
-    /* 79 */
-    {
-        {3, 0x02, 63},
-        {6, 0x02, 63},
-        {10, 0x02, 63},
-        {15, 0x02, 63},
-        {24, 0x02, 63},
-        {31, 0x02, 63},
-        {41, 0x02, 63},
-        {56, 0x03, 63},
-        {2, 0x02, 39},
-        {9, 0x02, 39},
-        {23, 0x02, 39},
-        {40, 0x03, 39},
-        {2, 0x02, 43},
-        {9, 0x02, 43},
-        {23, 0x02, 43},
-        {40, 0x03, 43},
-    },
-    /* 80 */
-    {
-        {3, 0x02, 39},
-        {6, 0x02, 39},
-        {10, 0x02, 39},
-        {15, 0x02, 39},
-        {24, 0x02, 39},
-        {31, 0x02, 39},
-        {41, 0x02, 39},
-        {56, 0x03, 39},
-        {3, 0x02, 43},
-        {6, 0x02, 43},
-        {10, 0x02, 43},
-        {15, 0x02, 43},
-        {24, 0x02, 43},
-        {31, 0x02, 43},
-        {41, 0x02, 43},
-        {56, 0x03, 43},
-    },
-    /* 81 */
-    {
-        {2, 0x02, 124},
-        {9, 0x02, 124},
-        {23, 0x02, 124},
-        {40, 0x03, 124},
-        {1, 0x02, 35},
-        {22, 0x03, 35},
-        {1, 0x02, 62},
-        {22, 0x03, 62},
-        {0, 0x03, 0},
-        {0, 0x03, 36},
-        {0, 0x03, 64},
-        {0, 0x03, 91},
-        {0, 0x03, 93},
-        {0, 0x03, 126},
-        {91, 0x00, 0},
-        {92, 0x00, 0},
-    },
-    /* 82 */
-    {
-        {3, 0x02, 124},
-        {6, 0x02, 124},
-        {10, 0x02, 124},
-        {15, 0x02, 124},
-        {24, 0x02, 124},
-        {31, 0x02, 124},
-        {41, 0x02, 124},
-        {56, 0x03, 124},
-        {2, 0x02, 35},
-        {9, 0x02, 35},
-        {23, 0x02, 35},
-        {40, 0x03, 35},
-        {2, 0x02, 62},
-        {9, 0x02, 62},
-        {23, 0x02, 62},
-        {40, 0x03, 62},
-    },
-    /* 83 */
-    {
-        {3, 0x02, 35},
-        {6, 0x02, 35},
-        {10, 0x02, 35},
-        {15, 0x02, 35},
-        {24, 0x02, 35},
-        {31, 0x02, 35},
-        {41, 0x02, 35},
-        {56, 0x03, 35},
-        {3, 0x02, 62},
-        {6, 0x02, 62},
-        {10, 0x02, 62},
-        {15, 0x02, 62},
-        {24, 0x02, 62},
-        {31, 0x02, 62},
-        {41, 0x02, 62},
-        {56, 0x03, 62},
-    },
-    /* 84 */
-    {
-        {1, 0x02, 0},
-        {22, 0x03, 0},
-        {1, 0x02, 36},
-        {22, 0x03, 36},
-        {1, 0x02, 64},
-        {22, 0x03, 64},
-        {1, 0x02, 91},
-        {22, 0x03, 91},
-        {1, 0x02, 93},
-        {22, 0x03, 93},
-        {1, 0x02, 126},
-        {22, 0x03, 126},
-        {0, 0x03, 94},
-        {0, 0x03, 125},
-        {93, 0x00, 0},
-        {94, 0x00, 0},
-    },
-    /* 85 */
-    {
-        {2, 0x02, 0},
-        {9, 0x02, 0},
-        {23, 0x02, 0},
-        {40, 0x03, 0},
-        {2, 0x02, 36},
-        {9, 0x02, 36},
-        {23, 0x02, 36},
-        {40, 0x03, 36},
-        {2, 0x02, 64},
-        {9, 0x02, 64},
-        {23, 0x02, 64},
-        {40, 0x03, 64},
-        {2, 0x02, 91},
-        {9, 0x02, 91},
-        {23, 0x02, 91},
-        {40, 0x03, 91},
-    },
-    /* 86 */
-    {
-        {3, 0x02, 0},
-        {6, 0x02, 0},
-        {10, 0x02, 0},
-        {15, 0x02, 0},
-        {24, 0x02, 0},
-        {31, 0x02, 0},
-        {41, 0x02, 0},
-        {56, 0x03, 0},
-        {3, 0x02, 36},
-        {6, 0x02, 36},
-        {10, 0x02, 36},
-        {15, 0x02, 36},
-        {24, 0x02, 36},
-        {31, 0x02, 36},
-        {41, 0x02, 36},
-        {56, 0x03, 36},
-    },
-    /* 87 */
-    {
-        {3, 0x02, 64},
-        {6, 0x02, 64},
-        {10, 0x02, 64},
-        {15, 0x02, 64},
-        {24, 0x02, 64},
-        {31, 0x02, 64},
-        {41, 0x02, 64},
-        {56, 0x03, 64},
-        {3, 0x02, 91},
-        {6, 0x02, 91},
-        {10, 0x02, 91},
-        {15, 0x02, 91},
-        {24, 0x02, 91},
-        {31, 0x02, 91},
-        {41, 0x02, 91},
-        {56, 0x03, 91},
-    },
-    /* 88 */
-    {
-        {2, 0x02, 93},
-        {9, 0x02, 93},
-        {23, 0x02, 93},
-        {40, 0x03, 93},
-        {2, 0x02, 126},
-        {9, 0x02, 126},
-        {23, 0x02, 126},
-        {40, 0x03, 126},
-        {1, 0x02, 94},
-        {22, 0x03, 94},
-        {1, 0x02, 125},
-        {22, 0x03, 125},
-        {0, 0x03, 60},
-        {0, 0x03, 96},
-        {0, 0x03, 123},
-        {95, 0x00, 0},
-    },
-    /* 89 */
-    {
-        {3, 0x02, 93},
-        {6, 0x02, 93},
-        {10, 0x02, 93},
-        {15, 0x02, 93},
-        {24, 0x02, 93},
-        {31, 0x02, 93},
-        {41, 0x02, 93},
-        {56, 0x03, 93},
-        {3, 0x02, 126},
-        {6, 0x02, 126},
-        {10, 0x02, 126},
-        {15, 0x02, 126},
-        {24, 0x02, 126},
-        {31, 0x02, 126},
-        {41, 0x02, 126},
-        {56, 0x03, 126},
-    },
-    /* 90 */
-    {
-        {2, 0x02, 94},
-        {9, 0x02, 94},
-        {23, 0x02, 94},
-        {40, 0x03, 94},
-        {2, 0x02, 125},
-        {9, 0x02, 125},
-        {23, 0x02, 125},
-        {40, 0x03, 125},
-        {1, 0x02, 60},
-        {22, 0x03, 60},
-        {1, 0x02, 96},
-        {22, 0x03, 96},
-        {1, 0x02, 123},
-        {22, 0x03, 123},
-        {96, 0x00, 0},
-        {110, 0x00, 0},
-    },
-    /* 91 */
-    {
-        {3, 0x02, 94},
-        {6, 0x02, 94},
-        {10, 0x02, 94},
-        {15, 0x02, 94},
-        {24, 0x02, 94},
-        {31, 0x02, 94},
-        {41, 0x02, 94},
-        {56, 0x03, 94},
-        {3, 0x02, 125},
-        {6, 0x02, 125},
-        {10, 0x02, 125},
-        {15, 0x02, 125},
-        {24, 0x02, 125},
-        {31, 0x02, 125},
-        {41, 0x02, 125},
-        {56, 0x03, 125},
-    },
-    /* 92 */
-    {
-        {2, 0x02, 60},
-        {9, 0x02, 60},
-        {23, 0x02, 60},
-        {40, 0x03, 60},
-        {2, 0x02, 96},
-        {9, 0x02, 96},
-        {23, 0x02, 96},
-        {40, 0x03, 96},
-        {2, 0x02, 123},
-        {9, 0x02, 123},
-        {23, 0x02, 123},
-        {40, 0x03, 123},
-        {97, 0x00, 0},
-        {101, 0x00, 0},
-        {111, 0x00, 0},
-        {133, 0x00, 0},
-    },
-    /* 93 */
-    {
-        {3, 0x02, 60},
-        {6, 0x02, 60},
-        {10, 0x02, 60},
-        {15, 0x02, 60},
-        {24, 0x02, 60},
-        {31, 0x02, 60},
-        {41, 0x02, 60},
-        {56, 0x03, 60},
-        {3, 0x02, 96},
-        {6, 0x02, 96},
-        {10, 0x02, 96},
-        {15, 0x02, 96},
-        {24, 0x02, 96},
-        {31, 0x02, 96},
-        {41, 0x02, 96},
-        {56, 0x03, 96},
-    },
-    /* 94 */
-    {
-        {3, 0x02, 123},
-        {6, 0x02, 123},
-        {10, 0x02, 123},
-        {15, 0x02, 123},
-        {24, 0x02, 123},
-        {31, 0x02, 123},
-        {41, 0x02, 123},
-        {56, 0x03, 123},
-        {98, 0x00, 0},
-        {99, 0x00, 0},
-        {102, 0x00, 0},
-        {105, 0x00, 0},
-        {112, 0x00, 0},
-        {119, 0x00, 0},
-        {134, 0x00, 0},
-        {153, 0x00, 0},
-    },
-    /* 95 */
-    {
-        {0, 0x03, 92},
-        {0, 0x03, 195},
-        {0, 0x03, 208},
-        {100, 0x00, 0},
-        {103, 0x00, 0},
-        {104, 0x00, 0},
-        {106, 0x00, 0},
-        {107, 0x00, 0},
-        {113, 0x00, 0},
-        {116, 0x00, 0},
-        {120, 0x00, 0},
-        {126, 0x00, 0},
-        {135, 0x00, 0},
-        {142, 0x00, 0},
-        {154, 0x00, 0},
-        {169, 0x00, 0},
-    },
-    /* 96 */
-    {
-        {1, 0x02, 92},
-        {22, 0x03, 92},
-        {1, 0x02, 195},
-        {22, 0x03, 195},
-        {1, 0x02, 208},
-        {22, 0x03, 208},
-        {0, 0x03, 128},
-        {0, 0x03, 130},
-        {0, 0x03, 131},
-        {0, 0x03, 162},
-        {0, 0x03, 184},
-        {0, 0x03, 194},
-        {0, 0x03, 224},
-        {0, 0x03, 226},
-        {108, 0x00, 0},
-        {109, 0x00, 0},
-    },
-    /* 97 */
-    {
-        {2, 0x02, 92},
-        {9, 0x02, 92},
-        {23, 0x02, 92},
-        {40, 0x03, 92},
-        {2, 0x02, 195},
-        {9, 0x02, 195},
-        {23, 0x02, 195},
-        {40, 0x03, 195},
-        {2, 0x02, 208},
-        {9, 0x02, 208},
-        {23, 0x02, 208},
-        {40, 0x03, 208},
-        {1, 0x02, 128},
-        {22, 0x03, 128},
-        {1, 0x02, 130},
-        {22, 0x03, 130},
-    },
-    /* 98 */
-    {
-        {3, 0x02, 92},
-        {6, 0x02, 92},
-        {10, 0x02, 92},
-        {15, 0x02, 92},
-        {24, 0x02, 92},
-        {31, 0x02, 92},
-        {41, 0x02, 92},
-        {56, 0x03, 92},
-        {3, 0x02, 195},
-        {6, 0x02, 195},
-        {10, 0x02, 195},
-        {15, 0x02, 195},
-        {24, 0x02, 195},
-        {31, 0x02, 195},
-        {41, 0x02, 195},
-        {56, 0x03, 195},
-    },
-    /* 99 */
-    {
-        {3, 0x02, 208},
-        {6, 0x02, 208},
-        {10, 0x02, 208},
-        {15, 0x02, 208},
-        {24, 0x02, 208},
-        {31, 0x02, 208},
-        {41, 0x02, 208},
-        {56, 0x03, 208},
-        {2, 0x02, 128},
-        {9, 0x02, 128},
-        {23, 0x02, 128},
-        {40, 0x03, 128},
-        {2, 0x02, 130},
-        {9, 0x02, 130},
-        {23, 0x02, 130},
-        {40, 0x03, 130},
-    },
-    /* 100 */
-    {
-        {3, 0x02, 128},
-        {6, 0x02, 128},
-        {10, 0x02, 128},
-        {15, 0x02, 128},
-        {24, 0x02, 128},
-        {31, 0x02, 128},
-        {41, 0x02, 128},
-        {56, 0x03, 128},
-        {3, 0x02, 130},
-        {6, 0x02, 130},
-        {10, 0x02, 130},
-        {15, 0x02, 130},
-        {24, 0x02, 130},
-        {31, 0x02, 130},
-        {41, 0x02, 130},
-        {56, 0x03, 130},
-    },
-    /* 101 */
-    {
-        {1, 0x02, 131},
-        {22, 0x03, 131},
-        {1, 0x02, 162},
-        {22, 0x03, 162},
-        {1, 0x02, 184},
-        {22, 0x03, 184},
-        {1, 0x02, 194},
-        {22, 0x03, 194},
-        {1, 0x02, 224},
-        {22, 0x03, 224},
-        {1, 0x02, 226},
-        {22, 0x03, 226},
-        {0, 0x03, 153},
-        {0, 0x03, 161},
-        {0, 0x03, 167},
-        {0, 0x03, 172},
-    },
-    /* 102 */
-    {
-        {2, 0x02, 131},
-        {9, 0x02, 131},
-        {23, 0x02, 131},
-        {40, 0x03, 131},
-        {2, 0x02, 162},
-        {9, 0x02, 162},
-        {23, 0x02, 162},
-        {40, 0x03, 162},
-        {2, 0x02, 184},
-        {9, 0x02, 184},
-        {23, 0x02, 184},
-        {40, 0x03, 184},
-        {2, 0x02, 194},
-        {9, 0x02, 194},
-        {23, 0x02, 194},
-        {40, 0x03, 194},
-    },
-    /* 103 */
-    {
-        {3, 0x02, 131},
-        {6, 0x02, 131},
-        {10, 0x02, 131},
-        {15, 0x02, 131},
-        {24, 0x02, 131},
-        {31, 0x02, 131},
-        {41, 0x02, 131},
-        {56, 0x03, 131},
-        {3, 0x02, 162},
-        {6, 0x02, 162},
-        {10, 0x02, 162},
-        {15, 0x02, 162},
-        {24, 0x02, 162},
-        {31, 0x02, 162},
-        {41, 0x02, 162},
-        {56, 0x03, 162},
-    },
-    /* 104 */
-    {
-        {3, 0x02, 184},
-        {6, 0x02, 184},
-        {10, 0x02, 184},
-        {15, 0x02, 184},
-        {24, 0x02, 184},
-        {31, 0x02, 184},
-        {41, 0x02, 184},
-        {56, 0x03, 184},
-        {3, 0x02, 194},
-        {6, 0x02, 194},
-        {10, 0x02, 194},
-        {15, 0x02, 194},
-        {24, 0x02, 194},
-        {31, 0x02, 194},
-        {41, 0x02, 194},
-        {56, 0x03, 194},
-    },
-    /* 105 */
-    {
-        {2, 0x02, 224},
-        {9, 0x02, 224},
-        {23, 0x02, 224},
-        {40, 0x03, 224},
-        {2, 0x02, 226},
-        {9, 0x02, 226},
-        {23, 0x02, 226},
-        {40, 0x03, 226},
-        {1, 0x02, 153},
-        {22, 0x03, 153},
-        {1, 0x02, 161},
-        {22, 0x03, 161},
-        {1, 0x02, 167},
-        {22, 0x03, 167},
-        {1, 0x02, 172},
-        {22, 0x03, 172},
-    },
-    /* 106 */
-    {
-        {3, 0x02, 224},
-        {6, 0x02, 224},
-        {10, 0x02, 224},
-        {15, 0x02, 224},
-        {24, 0x02, 224},
-        {31, 0x02, 224},
-        {41, 0x02, 224},
-        {56, 0x03, 224},
-        {3, 0x02, 226},
-        {6, 0x02, 226},
-        {10, 0x02, 226},
-        {15, 0x02, 226},
-        {24, 0x02, 226},
-        {31, 0x02, 226},
-        {41, 0x02, 226},
-        {56, 0x03, 226},
-    },
-    /* 107 */
-    {
-        {2, 0x02, 153},
-        {9, 0x02, 153},
-        {23, 0x02, 153},
-        {40, 0x03, 153},
-        {2, 0x02, 161},
-        {9, 0x02, 161},
-        {23, 0x02, 161},
-        {40, 0x03, 161},
-        {2, 0x02, 167},
-        {9, 0x02, 167},
-        {23, 0x02, 167},
-        {40, 0x03, 167},
-        {2, 0x02, 172},
-        {9, 0x02, 172},
-        {23, 0x02, 172},
-        {40, 0x03, 172},
-    },
-    /* 108 */
-    {
-        {3, 0x02, 153},
-        {6, 0x02, 153},
-        {10, 0x02, 153},
-        {15, 0x02, 153},
-        {24, 0x02, 153},
-        {31, 0x02, 153},
-        {41, 0x02, 153},
-        {56, 0x03, 153},
-        {3, 0x02, 161},
-        {6, 0x02, 161},
-        {10, 0x02, 161},
-        {15, 0x02, 161},
-        {24, 0x02, 161},
-        {31, 0x02, 161},
-        {41, 0x02, 161},
-        {56, 0x03, 161},
-    },
-    /* 109 */
-    {
-        {3, 0x02, 167},
-        {6, 0x02, 167},
-        {10, 0x02, 167},
-        {15, 0x02, 167},
-        {24, 0x02, 167},
-        {31, 0x02, 167},
-        {41, 0x02, 167},
-        {56, 0x03, 167},
-        {3, 0x02, 172},
-        {6, 0x02, 172},
-        {10, 0x02, 172},
-        {15, 0x02, 172},
-        {24, 0x02, 172},
-        {31, 0x02, 172},
-        {41, 0x02, 172},
-        {56, 0x03, 172},
-    },
-    /* 110 */
-    {
-        {114, 0x00, 0},
-        {115, 0x00, 0},
-        {117, 0x00, 0},
-        {118, 0x00, 0},
-        {121, 0x00, 0},
-        {123, 0x00, 0},
-        {127, 0x00, 0},
-        {130, 0x00, 0},
-        {136, 0x00, 0},
-        {139, 0x00, 0},
-        {143, 0x00, 0},
-        {146, 0x00, 0},
-        {155, 0x00, 0},
-        {162, 0x00, 0},
-        {170, 0x00, 0},
-        {180, 0x00, 0},
-    },
-    /* 111 */
-    {
-        {0, 0x03, 176},
-        {0, 0x03, 177},
-        {0, 0x03, 179},
-        {0, 0x03, 209},
-        {0, 0x03, 216},
-        {0, 0x03, 217},
-        {0, 0x03, 227},
-        {0, 0x03, 229},
-        {0, 0x03, 230},
-        {122, 0x00, 0},
-        {124, 0x00, 0},
-        {125, 0x00, 0},
-        {128, 0x00, 0},
-        {129, 0x00, 0},
-        {131, 0x00, 0},
-        {132, 0x00, 0},
-    },
-    /* 112 */
-    {
-        {1, 0x02, 176},
-        {22, 0x03, 176},
-        {1, 0x02, 177},
-        {22, 0x03, 177},
-        {1, 0x02, 179},
-        {22, 0x03, 179},
-        {1, 0x02, 209},
-        {22, 0x03, 209},
-        {1, 0x02, 216},
-        {22, 0x03, 216},
-        {1, 0x02, 217},
-        {22, 0x03, 217},
-        {1, 0x02, 227},
-        {22, 0x03, 227},
-        {1, 0x02, 229},
-        {22, 0x03, 229},
-    },
-    /* 113 */
-    {
-        {2, 0x02, 176},
-        {9, 0x02, 176},
-        {23, 0x02, 176},
-        {40, 0x03, 176},
-        {2, 0x02, 177},
-        {9, 0x02, 177},
-        {23, 0x02, 177},
-        {40, 0x03, 177},
-        {2, 0x02, 179},
-        {9, 0x02, 179},
-        {23, 0x02, 179},
-        {40, 0x03, 179},
-        {2, 0x02, 209},
-        {9, 0x02, 209},
-        {23, 0x02, 209},
-        {40, 0x03, 209},
-    },
-    /* 114 */
-    {
-        {3, 0x02, 176},
-        {6, 0x02, 176},
-        {10, 0x02, 176},
-        {15, 0x02, 176},
-        {24, 0x02, 176},
-        {31, 0x02, 176},
-        {41, 0x02, 176},
-        {56, 0x03, 176},
-        {3, 0x02, 177},
-        {6, 0x02, 177},
-        {10, 0x02, 177},
-        {15, 0x02, 177},
-        {24, 0x02, 177},
-        {31, 0x02, 177},
-        {41, 0x02, 177},
-        {56, 0x03, 177},
-    },
-    /* 115 */
-    {
-        {3, 0x02, 179},
-        {6, 0x02, 179},
-        {10, 0x02, 179},
-        {15, 0x02, 179},
-        {24, 0x02, 179},
-        {31, 0x02, 179},
-        {41, 0x02, 179},
-        {56, 0x03, 179},
-        {3, 0x02, 209},
-        {6, 0x02, 209},
-        {10, 0x02, 209},
-        {15, 0x02, 209},
-        {24, 0x02, 209},
-        {31, 0x02, 209},
-        {41, 0x02, 209},
-        {56, 0x03, 209},
-    },
-    /* 116 */
-    {
-        {2, 0x02, 216},
-        {9, 0x02, 216},
-        {23, 0x02, 216},
-        {40, 0x03, 216},
-        {2, 0x02, 217},
-        {9, 0x02, 217},
-        {23, 0x02, 217},
-        {40, 0x03, 217},
-        {2, 0x02, 227},
-        {9, 0x02, 227},
-        {23, 0x02, 227},
-        {40, 0x03, 227},
-        {2, 0x02, 229},
-        {9, 0x02, 229},
-        {23, 0x02, 229},
-        {40, 0x03, 229},
-    },
-    /* 117 */
-    {
-        {3, 0x02, 216},
-        {6, 0x02, 216},
-        {10, 0x02, 216},
-        {15, 0x02, 216},
-        {24, 0x02, 216},
-        {31, 0x02, 216},
-        {41, 0x02, 216},
-        {56, 0x03, 216},
-        {3, 0x02, 217},
-        {6, 0x02, 217},
-        {10, 0x02, 217},
-        {15, 0x02, 217},
-        {24, 0x02, 217},
-        {31, 0x02, 217},
-        {41, 0x02, 217},
-        {56, 0x03, 217},
-    },
-    /* 118 */
-    {
-        {3, 0x02, 227},
-        {6, 0x02, 227},
-        {10, 0x02, 227},
-        {15, 0x02, 227},
-        {24, 0x02, 227},
-        {31, 0x02, 227},
-        {41, 0x02, 227},
-        {56, 0x03, 227},
-        {3, 0x02, 229},
-        {6, 0x02, 229},
-        {10, 0x02, 229},
-        {15, 0x02, 229},
-        {24, 0x02, 229},
-        {31, 0x02, 229},
-        {41, 0x02, 229},
-        {56, 0x03, 229},
-    },
-    /* 119 */
-    {
-        {1, 0x02, 230},
-        {22, 0x03, 230},
-        {0, 0x03, 129},
-        {0, 0x03, 132},
-        {0, 0x03, 133},
-        {0, 0x03, 134},
-        {0, 0x03, 136},
-        {0, 0x03, 146},
-        {0, 0x03, 154},
-        {0, 0x03, 156},
-        {0, 0x03, 160},
-        {0, 0x03, 163},
-        {0, 0x03, 164},
-        {0, 0x03, 169},
-        {0, 0x03, 170},
-        {0, 0x03, 173},
-    },
-    /* 120 */
-    {
-        {2, 0x02, 230},
-        {9, 0x02, 230},
-        {23, 0x02, 230},
-        {40, 0x03, 230},
-        {1, 0x02, 129},
-        {22, 0x03, 129},
-        {1, 0x02, 132},
-        {22, 0x03, 132},
-        {1, 0x02, 133},
-        {22, 0x03, 133},
-        {1, 0x02, 134},
-        {22, 0x03, 134},
-        {1, 0x02, 136},
-        {22, 0x03, 136},
-        {1, 0x02, 146},
-        {22, 0x03, 146},
-    },
-    /* 121 */
-    {
-        {3, 0x02, 230},
-        {6, 0x02, 230},
-        {10, 0x02, 230},
-        {15, 0x02, 230},
-        {24, 0x02, 230},
-        {31, 0x02, 230},
-        {41, 0x02, 230},
-        {56, 0x03, 230},
-        {2, 0x02, 129},
-        {9, 0x02, 129},
-        {23, 0x02, 129},
-        {40, 0x03, 129},
-        {2, 0x02, 132},
-        {9, 0x02, 132},
-        {23, 0x02, 132},
-        {40, 0x03, 132},
-    },
-    /* 122 */
-    {
-        {3, 0x02, 129},
-        {6, 0x02, 129},
-        {10, 0x02, 129},
-        {15, 0x02, 129},
-        {24, 0x02, 129},
-        {31, 0x02, 129},
-        {41, 0x02, 129},
-        {56, 0x03, 129},
-        {3, 0x02, 132},
-        {6, 0x02, 132},
-        {10, 0x02, 132},
-        {15, 0x02, 132},
-        {24, 0x02, 132},
-        {31, 0x02, 132},
-        {41, 0x02, 132},
-        {56, 0x03, 132},
-    },
-    /* 123 */
-    {
-        {2, 0x02, 133},
-        {9, 0x02, 133},
-        {23, 0x02, 133},
-        {40, 0x03, 133},
-        {2, 0x02, 134},
-        {9, 0x02, 134},
-        {23, 0x02, 134},
-        {40, 0x03, 134},
-        {2, 0x02, 136},
-        {9, 0x02, 136},
-        {23, 0x02, 136},
-        {40, 0x03, 136},
-        {2, 0x02, 146},
-        {9, 0x02, 146},
-        {23, 0x02, 146},
-        {40, 0x03, 146},
-    },
-    /* 124 */
-    {
-        {3, 0x02, 133},
-        {6, 0x02, 133},
-        {10, 0x02, 133},
-        {15, 0x02, 133},
-        {24, 0x02, 133},
-        {31, 0x02, 133},
-        {41, 0x02, 133},
-        {56, 0x03, 133},
-        {3, 0x02, 134},
-        {6, 0x02, 134},
-        {10, 0x02, 134},
-        {15, 0x02, 134},
-        {24, 0x02, 134},
-        {31, 0x02, 134},
-        {41, 0x02, 134},
-        {56, 0x03, 134},
-    },
-    /* 125 */
-    {
-        {3, 0x02, 136},
-        {6, 0x02, 136},
-        {10, 0x02, 136},
-        {15, 0x02, 136},
-        {24, 0x02, 136},
-        {31, 0x02, 136},
-        {41, 0x02, 136},
-        {56, 0x03, 136},
-        {3, 0x02, 146},
-        {6, 0x02, 146},
-        {10, 0x02, 146},
-        {15, 0x02, 146},
-        {24, 0x02, 146},
-        {31, 0x02, 146},
-        {41, 0x02, 146},
-        {56, 0x03, 146},
-    },
-    /* 126 */
-    {
-        {1, 0x02, 154},
-        {22, 0x03, 154},
-        {1, 0x02, 156},
-        {22, 0x03, 156},
-        {1, 0x02, 160},
-        {22, 0x03, 160},
-        {1, 0x02, 163},
-        {22, 0x03, 163},
-        {1, 0x02, 164},
-        {22, 0x03, 164},
-        {1, 0x02, 169},
-        {22, 0x03, 169},
-        {1, 0x02, 170},
-        {22, 0x03, 170},
-        {1, 0x02, 173},
-        {22, 0x03, 173},
-    },
-    /* 127 */
-    {
-        {2, 0x02, 154},
-        {9, 0x02, 154},
-        {23, 0x02, 154},
-        {40, 0x03, 154},
-        {2, 0x02, 156},
-        {9, 0x02, 156},
-        {23, 0x02, 156},
-        {40, 0x03, 156},
-        {2, 0x02, 160},
-        {9, 0x02, 160},
-        {23, 0x02, 160},
-        {40, 0x03, 160},
-        {2, 0x02, 163},
-        {9, 0x02, 163},
-        {23, 0x02, 163},
-        {40, 0x03, 163},
-    },
-    /* 128 */
-    {
-        {3, 0x02, 154},
-        {6, 0x02, 154},
-        {10, 0x02, 154},
-        {15, 0x02, 154},
-        {24, 0x02, 154},
-        {31, 0x02, 154},
-        {41, 0x02, 154},
-        {56, 0x03, 154},
-        {3, 0x02, 156},
-        {6, 0x02, 156},
-        {10, 0x02, 156},
-        {15, 0x02, 156},
-        {24, 0x02, 156},
-        {31, 0x02, 156},
-        {41, 0x02, 156},
-        {56, 0x03, 156},
-    },
-    /* 129 */
-    {
-        {3, 0x02, 160},
-        {6, 0x02, 160},
-        {10, 0x02, 160},
-        {15, 0x02, 160},
-        {24, 0x02, 160},
-        {31, 0x02, 160},
-        {41, 0x02, 160},
-        {56, 0x03, 160},
-        {3, 0x02, 163},
-        {6, 0x02, 163},
-        {10, 0x02, 163},
-        {15, 0x02, 163},
-        {24, 0x02, 163},
-        {31, 0x02, 163},
-        {41, 0x02, 163},
-        {56, 0x03, 163},
-    },
-    /* 130 */
-    {
-        {2, 0x02, 164},
-        {9, 0x02, 164},
-        {23, 0x02, 164},
-        {40, 0x03, 164},
-        {2, 0x02, 169},
-        {9, 0x02, 169},
-        {23, 0x02, 169},
-        {40, 0x03, 169},
-        {2, 0x02, 170},
-        {9, 0x02, 170},
-        {23, 0x02, 170},
-        {40, 0x03, 170},
-        {2, 0x02, 173},
-        {9, 0x02, 173},
-        {23, 0x02, 173},
-        {40, 0x03, 173},
-    },
-    /* 131 */
-    {
-        {3, 0x02, 164},
-        {6, 0x02, 164},
-        {10, 0x02, 164},
-        {15, 0x02, 164},
-        {24, 0x02, 164},
-        {31, 0x02, 164},
-        {41, 0x02, 164},
-        {56, 0x03, 164},
-        {3, 0x02, 169},
-        {6, 0x02, 169},
-        {10, 0x02, 169},
-        {15, 0x02, 169},
-        {24, 0x02, 169},
-        {31, 0x02, 169},
-        {41, 0x02, 169},
-        {56, 0x03, 169},
-    },
-    /* 132 */
-    {
-        {3, 0x02, 170},
-        {6, 0x02, 170},
-        {10, 0x02, 170},
-        {15, 0x02, 170},
-        {24, 0x02, 170},
-        {31, 0x02, 170},
-        {41, 0x02, 170},
-        {56, 0x03, 170},
-        {3, 0x02, 173},
-        {6, 0x02, 173},
-        {10, 0x02, 173},
-        {15, 0x02, 173},
-        {24, 0x02, 173},
-        {31, 0x02, 173},
-        {41, 0x02, 173},
-        {56, 0x03, 173},
-    },
-    /* 133 */
-    {
-        {137, 0x00, 0},
-        {138, 0x00, 0},
-        {140, 0x00, 0},
-        {141, 0x00, 0},
-        {144, 0x00, 0},
-        {145, 0x00, 0},
-        {147, 0x00, 0},
-        {150, 0x00, 0},
-        {156, 0x00, 0},
-        {159, 0x00, 0},
-        {163, 0x00, 0},
-        {166, 0x00, 0},
-        {171, 0x00, 0},
-        {174, 0x00, 0},
-        {181, 0x00, 0},
-        {190, 0x00, 0},
-    },
-    /* 134 */
-    {
-        {0, 0x03, 178},
-        {0, 0x03, 181},
-        {0, 0x03, 185},
-        {0, 0x03, 186},
-        {0, 0x03, 187},
-        {0, 0x03, 189},
-        {0, 0x03, 190},
-        {0, 0x03, 196},
-        {0, 0x03, 198},
-        {0, 0x03, 228},
-        {0, 0x03, 232},
-        {0, 0x03, 233},
-        {148, 0x00, 0},
-        {149, 0x00, 0},
-        {151, 0x00, 0},
-        {152, 0x00, 0},
-    },
-    /* 135 */
-    {
-        {1, 0x02, 178},
-        {22, 0x03, 178},
-        {1, 0x02, 181},
-        {22, 0x03, 181},
-        {1, 0x02, 185},
-        {22, 0x03, 185},
-        {1, 0x02, 186},
-        {22, 0x03, 186},
-        {1, 0x02, 187},
-        {22, 0x03, 187},
-        {1, 0x02, 189},
-        {22, 0x03, 189},
-        {1, 0x02, 190},
-        {22, 0x03, 190},
-        {1, 0x02, 196},
-        {22, 0x03, 196},
-    },
-    /* 136 */
-    {
-        {2, 0x02, 178},
-        {9, 0x02, 178},
-        {23, 0x02, 178},
-        {40, 0x03, 178},
-        {2, 0x02, 181},
-        {9, 0x02, 181},
-        {23, 0x02, 181},
-        {40, 0x03, 181},
-        {2, 0x02, 185},
-        {9, 0x02, 185},
-        {23, 0x02, 185},
-        {40, 0x03, 185},
-        {2, 0x02, 186},
-        {9, 0x02, 186},
-        {23, 0x02, 186},
-        {40, 0x03, 186},
-    },
-    /* 137 */
-    {
-        {3, 0x02, 178},
-        {6, 0x02, 178},
-        {10, 0x02, 178},
-        {15, 0x02, 178},
-        {24, 0x02, 178},
-        {31, 0x02, 178},
-        {41, 0x02, 178},
-        {56, 0x03, 178},
-        {3, 0x02, 181},
-        {6, 0x02, 181},
-        {10, 0x02, 181},
-        {15, 0x02, 181},
-        {24, 0x02, 181},
-        {31, 0x02, 181},
-        {41, 0x02, 181},
-        {56, 0x03, 181},
-    },
-    /* 138 */
-    {
-        {3, 0x02, 185},
-        {6, 0x02, 185},
-        {10, 0x02, 185},
-        {15, 0x02, 185},
-        {24, 0x02, 185},
-        {31, 0x02, 185},
-        {41, 0x02, 185},
-        {56, 0x03, 185},
-        {3, 0x02, 186},
-        {6, 0x02, 186},
-        {10, 0x02, 186},
-        {15, 0x02, 186},
-        {24, 0x02, 186},
-        {31, 0x02, 186},
-        {41, 0x02, 186},
-        {56, 0x03, 186},
-    },
-    /* 139 */
-    {
-        {2, 0x02, 187},
-        {9, 0x02, 187},
-        {23, 0x02, 187},
-        {40, 0x03, 187},
-        {2, 0x02, 189},
-        {9, 0x02, 189},
-        {23, 0x02, 189},
-        {40, 0x03, 189},
-        {2, 0x02, 190},
-        {9, 0x02, 190},
-        {23, 0x02, 190},
-        {40, 0x03, 190},
-        {2, 0x02, 196},
-        {9, 0x02, 196},
-        {23, 0x02, 196},
-        {40, 0x03, 196},
-    },
-    /* 140 */
-    {
-        {3, 0x02, 187},
-        {6, 0x02, 187},
-        {10, 0x02, 187},
-        {15, 0x02, 187},
-        {24, 0x02, 187},
-        {31, 0x02, 187},
-        {41, 0x02, 187},
-        {56, 0x03, 187},
-        {3, 0x02, 189},
-        {6, 0x02, 189},
-        {10, 0x02, 189},
-        {15, 0x02, 189},
-        {24, 0x02, 189},
-        {31, 0x02, 189},
-        {41, 0x02, 189},
-        {56, 0x03, 189},
-    },
-    /* 141 */
-    {
-        {3, 0x02, 190},
-        {6, 0x02, 190},
-        {10, 0x02, 190},
-        {15, 0x02, 190},
-        {24, 0x02, 190},
-        {31, 0x02, 190},
-        {41, 0x02, 190},
-        {56, 0x03, 190},
-        {3, 0x02, 196},
-        {6, 0x02, 196},
-        {10, 0x02, 196},
-        {15, 0x02, 196},
-        {24, 0x02, 196},
-        {31, 0x02, 196},
-        {41, 0x02, 196},
-        {56, 0x03, 196},
-    },
-    /* 142 */
-    {
-        {1, 0x02, 198},
-        {22, 0x03, 198},
-        {1, 0x02, 228},
-        {22, 0x03, 228},
-        {1, 0x02, 232},
-        {22, 0x03, 232},
-        {1, 0x02, 233},
-        {22, 0x03, 233},
-        {0, 0x03, 1},
-        {0, 0x03, 135},
-        {0, 0x03, 137},
-        {0, 0x03, 138},
-        {0, 0x03, 139},
-        {0, 0x03, 140},
-        {0, 0x03, 141},
-        {0, 0x03, 143},
-    },
-    /* 143 */
-    {
-        {2, 0x02, 198},
-        {9, 0x02, 198},
-        {23, 0x02, 198},
-        {40, 0x03, 198},
-        {2, 0x02, 228},
-        {9, 0x02, 228},
-        {23, 0x02, 228},
-        {40, 0x03, 228},
-        {2, 0x02, 232},
-        {9, 0x02, 232},
-        {23, 0x02, 232},
-        {40, 0x03, 232},
-        {2, 0x02, 233},
-        {9, 0x02, 233},
-        {23, 0x02, 233},
-        {40, 0x03, 233},
-    },
-    /* 144 */
-    {
-        {3, 0x02, 198},
-        {6, 0x02, 198},
-        {10, 0x02, 198},
-        {15, 0x02, 198},
-        {24, 0x02, 198},
-        {31, 0x02, 198},
-        {41, 0x02, 198},
-        {56, 0x03, 198},
-        {3, 0x02, 228},
-        {6, 0x02, 228},
-        {10, 0x02, 228},
-        {15, 0x02, 228},
-        {24, 0x02, 228},
-        {31, 0x02, 228},
-        {41, 0x02, 228},
-        {56, 0x03, 228},
-    },
-    /* 145 */
-    {
-        {3, 0x02, 232},
-        {6, 0x02, 232},
-        {10, 0x02, 232},
-        {15, 0x02, 232},
-        {24, 0x02, 232},
-        {31, 0x02, 232},
-        {41, 0x02, 232},
-        {56, 0x03, 232},
-        {3, 0x02, 233},
-        {6, 0x02, 233},
-        {10, 0x02, 233},
-        {15, 0x02, 233},
-        {24, 0x02, 233},
-        {31, 0x02, 233},
-        {41, 0x02, 233},
-        {56, 0x03, 233},
-    },
-    /* 146 */
-    {
-        {1, 0x02, 1},
-        {22, 0x03, 1},
-        {1, 0x02, 135},
-        {22, 0x03, 135},
-        {1, 0x02, 137},
-        {22, 0x03, 137},
-        {1, 0x02, 138},
-        {22, 0x03, 138},
-        {1, 0x02, 139},
-        {22, 0x03, 139},
-        {1, 0x02, 140},
-        {22, 0x03, 140},
-        {1, 0x02, 141},
-        {22, 0x03, 141},
-        {1, 0x02, 143},
-        {22, 0x03, 143},
-    },
-    /* 147 */
-    {
-        {2, 0x02, 1},
-        {9, 0x02, 1},
-        {23, 0x02, 1},
-        {40, 0x03, 1},
-        {2, 0x02, 135},
-        {9, 0x02, 135},
-        {23, 0x02, 135},
-        {40, 0x03, 135},
-        {2, 0x02, 137},
-        {9, 0x02, 137},
-        {23, 0x02, 137},
-        {40, 0x03, 137},
-        {2, 0x02, 138},
-        {9, 0x02, 138},
-        {23, 0x02, 138},
-        {40, 0x03, 138},
-    },
-    /* 148 */
-    {
-        {3, 0x02, 1},
-        {6, 0x02, 1},
-        {10, 0x02, 1},
-        {15, 0x02, 1},
-        {24, 0x02, 1},
-        {31, 0x02, 1},
-        {41, 0x02, 1},
-        {56, 0x03, 1},
-        {3, 0x02, 135},
-        {6, 0x02, 135},
-        {10, 0x02, 135},
-        {15, 0x02, 135},
-        {24, 0x02, 135},
-        {31, 0x02, 135},
-        {41, 0x02, 135},
-        {56, 0x03, 135},
-    },
-    /* 149 */
-    {
-        {3, 0x02, 137},
-        {6, 0x02, 137},
-        {10, 0x02, 137},
-        {15, 0x02, 137},
-        {24, 0x02, 137},
-        {31, 0x02, 137},
-        {41, 0x02, 137},
-        {56, 0x03, 137},
-        {3, 0x02, 138},
-        {6, 0x02, 138},
-        {10, 0x02, 138},
-        {15, 0x02, 138},
-        {24, 0x02, 138},
-        {31, 0x02, 138},
-        {41, 0x02, 138},
-        {56, 0x03, 138},
-    },
-    /* 150 */
-    {
-        {2, 0x02, 139},
-        {9, 0x02, 139},
-        {23, 0x02, 139},
-        {40, 0x03, 139},
-        {2, 0x02, 140},
-        {9, 0x02, 140},
-        {23, 0x02, 140},
-        {40, 0x03, 140},
-        {2, 0x02, 141},
-        {9, 0x02, 141},
-        {23, 0x02, 141},
-        {40, 0x03, 141},
-        {2, 0x02, 143},
-        {9, 0x02, 143},
-        {23, 0x02, 143},
-        {40, 0x03, 143},
-    },
-    /* 151 */
-    {
-        {3, 0x02, 139},
-        {6, 0x02, 139},
-        {10, 0x02, 139},
-        {15, 0x02, 139},
-        {24, 0x02, 139},
-        {31, 0x02, 139},
-        {41, 0x02, 139},
-        {56, 0x03, 139},
-        {3, 0x02, 140},
-        {6, 0x02, 140},
-        {10, 0x02, 140},
-        {15, 0x02, 140},
-        {24, 0x02, 140},
-        {31, 0x02, 140},
-        {41, 0x02, 140},
-        {56, 0x03, 140},
-    },
-    /* 152 */
-    {
-        {3, 0x02, 141},
-        {6, 0x02, 141},
-        {10, 0x02, 141},
-        {15, 0x02, 141},
-        {24, 0x02, 141},
-        {31, 0x02, 141},
-        {41, 0x02, 141},
-        {56, 0x03, 141},
-        {3, 0x02, 143},
-        {6, 0x02, 143},
-        {10, 0x02, 143},
-        {15, 0x02, 143},
-        {24, 0x02, 143},
-        {31, 0x02, 143},
-        {41, 0x02, 143},
-        {56, 0x03, 143},
-    },
-    /* 153 */
-    {
-        {157, 0x00, 0},
-        {158, 0x00, 0},
-        {160, 0x00, 0},
-        {161, 0x00, 0},
-        {164, 0x00, 0},
-        {165, 0x00, 0},
-        {167, 0x00, 0},
-        {168, 0x00, 0},
-        {172, 0x00, 0},
-        {173, 0x00, 0},
-        {175, 0x00, 0},
-        {177, 0x00, 0},
-        {182, 0x00, 0},
-        {185, 0x00, 0},
-        {191, 0x00, 0},
-        {207, 0x00, 0},
-    },
-    /* 154 */
-    {
-        {0, 0x03, 147},
-        {0, 0x03, 149},
-        {0, 0x03, 150},
-        {0, 0x03, 151},
-        {0, 0x03, 152},
-        {0, 0x03, 155},
-        {0, 0x03, 157},
-        {0, 0x03, 158},
-        {0, 0x03, 165},
-        {0, 0x03, 166},
-        {0, 0x03, 168},
-        {0, 0x03, 174},
-        {0, 0x03, 175},
-        {0, 0x03, 180},
-        {0, 0x03, 182},
-        {0, 0x03, 183},
-    },
-    /* 155 */
-    {
-        {1, 0x02, 147},
-        {22, 0x03, 147},
-        {1, 0x02, 149},
-        {22, 0x03, 149},
-        {1, 0x02, 150},
-        {22, 0x03, 150},
-        {1, 0x02, 151},
-        {22, 0x03, 151},
-        {1, 0x02, 152},
-        {22, 0x03, 152},
-        {1, 0x02, 155},
-        {22, 0x03, 155},
-        {1, 0x02, 157},
-        {22, 0x03, 157},
-        {1, 0x02, 158},
-        {22, 0x03, 158},
-    },
-    /* 156 */
-    {
-        {2, 0x02, 147},
-        {9, 0x02, 147},
-        {23, 0x02, 147},
-        {40, 0x03, 147},
-        {2, 0x02, 149},
-        {9, 0x02, 149},
-        {23, 0x02, 149},
-        {40, 0x03, 149},
-        {2, 0x02, 150},
-        {9, 0x02, 150},
-        {23, 0x02, 150},
-        {40, 0x03, 150},
-        {2, 0x02, 151},
-        {9, 0x02, 151},
-        {23, 0x02, 151},
-        {40, 0x03, 151},
-    },
-    /* 157 */
-    {
-        {3, 0x02, 147},
-        {6, 0x02, 147},
-        {10, 0x02, 147},
-        {15, 0x02, 147},
-        {24, 0x02, 147},
-        {31, 0x02, 147},
-        {41, 0x02, 147},
-        {56, 0x03, 147},
-        {3, 0x02, 149},
-        {6, 0x02, 149},
-        {10, 0x02, 149},
-        {15, 0x02, 149},
-        {24, 0x02, 149},
-        {31, 0x02, 149},
-        {41, 0x02, 149},
-        {56, 0x03, 149},
-    },
-    /* 158 */
-    {
-        {3, 0x02, 150},
-        {6, 0x02, 150},
-        {10, 0x02, 150},
-        {15, 0x02, 150},
-        {24, 0x02, 150},
-        {31, 0x02, 150},
-        {41, 0x02, 150},
-        {56, 0x03, 150},
-        {3, 0x02, 151},
-        {6, 0x02, 151},
-        {10, 0x02, 151},
-        {15, 0x02, 151},
-        {24, 0x02, 151},
-        {31, 0x02, 151},
-        {41, 0x02, 151},
-        {56, 0x03, 151},
-    },
-    /* 159 */
-    {
-        {2, 0x02, 152},
-        {9, 0x02, 152},
-        {23, 0x02, 152},
-        {40, 0x03, 152},
-        {2, 0x02, 155},
-        {9, 0x02, 155},
-        {23, 0x02, 155},
-        {40, 0x03, 155},
-        {2, 0x02, 157},
-        {9, 0x02, 157},
-        {23, 0x02, 157},
-        {40, 0x03, 157},
-        {2, 0x02, 158},
-        {9, 0x02, 158},
-        {23, 0x02, 158},
-        {40, 0x03, 158},
-    },
-    /* 160 */
-    {
-        {3, 0x02, 152},
-        {6, 0x02, 152},
-        {10, 0x02, 152},
-        {15, 0x02, 152},
-        {24, 0x02, 152},
-        {31, 0x02, 152},
-        {41, 0x02, 152},
-        {56, 0x03, 152},
-        {3, 0x02, 155},
-        {6, 0x02, 155},
-        {10, 0x02, 155},
-        {15, 0x02, 155},
-        {24, 0x02, 155},
-        {31, 0x02, 155},
-        {41, 0x02, 155},
-        {56, 0x03, 155},
-    },
-    /* 161 */
-    {
-        {3, 0x02, 157},
-        {6, 0x02, 157},
-        {10, 0x02, 157},
-        {15, 0x02, 157},
-        {24, 0x02, 157},
-        {31, 0x02, 157},
-        {41, 0x02, 157},
-        {56, 0x03, 157},
-        {3, 0x02, 158},
-        {6, 0x02, 158},
-        {10, 0x02, 158},
-        {15, 0x02, 158},
-        {24, 0x02, 158},
-        {31, 0x02, 158},
-        {41, 0x02, 158},
-        {56, 0x03, 158},
-    },
-    /* 162 */
-    {
-        {1, 0x02, 165},
-        {22, 0x03, 165},
-        {1, 0x02, 166},
-        {22, 0x03, 166},
-        {1, 0x02, 168},
-        {22, 0x03, 168},
-        {1, 0x02, 174},
-        {22, 0x03, 174},
-        {1, 0x02, 175},
-        {22, 0x03, 175},
-        {1, 0x02, 180},
-        {22, 0x03, 180},
-        {1, 0x02, 182},
-        {22, 0x03, 182},
-        {1, 0x02, 183},
-        {22, 0x03, 183},
-    },
-    /* 163 */
-    {
-        {2, 0x02, 165},
-        {9, 0x02, 165},
-        {23, 0x02, 165},
-        {40, 0x03, 165},
-        {2, 0x02, 166},
-        {9, 0x02, 166},
-        {23, 0x02, 166},
-        {40, 0x03, 166},
-        {2, 0x02, 168},
-        {9, 0x02, 168},
-        {23, 0x02, 168},
-        {40, 0x03, 168},
-        {2, 0x02, 174},
-        {9, 0x02, 174},
-        {23, 0x02, 174},
-        {40, 0x03, 174},
-    },
-    /* 164 */
-    {
-        {3, 0x02, 165},
-        {6, 0x02, 165},
-        {10, 0x02, 165},
-        {15, 0x02, 165},
-        {24, 0x02, 165},
-        {31, 0x02, 165},
-        {41, 0x02, 165},
-        {56, 0x03, 165},
-        {3, 0x02, 166},
-        {6, 0x02, 166},
-        {10, 0x02, 166},
-        {15, 0x02, 166},
-        {24, 0x02, 166},
-        {31, 0x02, 166},
-        {41, 0x02, 166},
-        {56, 0x03, 166},
-    },
-    /* 165 */
-    {
-        {3, 0x02, 168},
-        {6, 0x02, 168},
-        {10, 0x02, 168},
-        {15, 0x02, 168},
-        {24, 0x02, 168},
-        {31, 0x02, 168},
-        {41, 0x02, 168},
-        {56, 0x03, 168},
-        {3, 0x02, 174},
-        {6, 0x02, 174},
-        {10, 0x02, 174},
-        {15, 0x02, 174},
-        {24, 0x02, 174},
-        {31, 0x02, 174},
-        {41, 0x02, 174},
-        {56, 0x03, 174},
-    },
-    /* 166 */
-    {
-        {2, 0x02, 175},
-        {9, 0x02, 175},
-        {23, 0x02, 175},
-        {40, 0x03, 175},
-        {2, 0x02, 180},
-        {9, 0x02, 180},
-        {23, 0x02, 180},
-        {40, 0x03, 180},
-        {2, 0x02, 182},
-        {9, 0x02, 182},
-        {23, 0x02, 182},
-        {40, 0x03, 182},
-        {2, 0x02, 183},
-        {9, 0x02, 183},
-        {23, 0x02, 183},
-        {40, 0x03, 183},
-    },
-    /* 167 */
-    {
-        {3, 0x02, 175},
-        {6, 0x02, 175},
-        {10, 0x02, 175},
-        {15, 0x02, 175},
-        {24, 0x02, 175},
-        {31, 0x02, 175},
-        {41, 0x02, 175},
-        {56, 0x03, 175},
-        {3, 0x02, 180},
-        {6, 0x02, 180},
-        {10, 0x02, 180},
-        {15, 0x02, 180},
-        {24, 0x02, 180},
-        {31, 0x02, 180},
-        {41, 0x02, 180},
-        {56, 0x03, 180},
-    },
-    /* 168 */
-    {
-        {3, 0x02, 182},
-        {6, 0x02, 182},
-        {10, 0x02, 182},
-        {15, 0x02, 182},
-        {24, 0x02, 182},
-        {31, 0x02, 182},
-        {41, 0x02, 182},
-        {56, 0x03, 182},
-        {3, 0x02, 183},
-        {6, 0x02, 183},
-        {10, 0x02, 183},
-        {15, 0x02, 183},
-        {24, 0x02, 183},
-        {31, 0x02, 183},
-        {41, 0x02, 183},
-        {56, 0x03, 183},
-    },
-    /* 169 */
-    {
-        {0, 0x03, 188},
-        {0, 0x03, 191},
-        {0, 0x03, 197},
-        {0, 0x03, 231},
-        {0, 0x03, 239},
-        {176, 0x00, 0},
-        {178, 0x00, 0},
-        {179, 0x00, 0},
-        {183, 0x00, 0},
-        {184, 0x00, 0},
-        {186, 0x00, 0},
-        {187, 0x00, 0},
-        {192, 0x00, 0},
-        {199, 0x00, 0},
-        {208, 0x00, 0},
-        {223, 0x00, 0},
-    },
-    /* 170 */
-    {
-        {1, 0x02, 188},
-        {22, 0x03, 188},
-        {1, 0x02, 191},
-        {22, 0x03, 191},
-        {1, 0x02, 197},
-        {22, 0x03, 197},
-        {1, 0x02, 231},
-        {22, 0x03, 231},
-        {1, 0x02, 239},
-        {22, 0x03, 239},
-        {0, 0x03, 9},
-        {0, 0x03, 142},
-        {0, 0x03, 144},
-        {0, 0x03, 145},
-        {0, 0x03, 148},
-        {0, 0x03, 159},
-    },
-    /* 171 */
-    {
-        {2, 0x02, 188},
-        {9, 0x02, 188},
-        {23, 0x02, 188},
-        {40, 0x03, 188},
-        {2, 0x02, 191},
-        {9, 0x02, 191},
-        {23, 0x02, 191},
-        {40, 0x03, 191},
-        {2, 0x02, 197},
-        {9, 0x02, 197},
-        {23, 0x02, 197},
-        {40, 0x03, 197},
-        {2, 0x02, 231},
-        {9, 0x02, 231},
-        {23, 0x02, 231},
-        {40, 0x03, 231},
-    },
-    /* 172 */
-    {
-        {3, 0x02, 188},
-        {6, 0x02, 188},
-        {10, 0x02, 188},
-        {15, 0x02, 188},
-        {24, 0x02, 188},
-        {31, 0x02, 188},
-        {41, 0x02, 188},
-        {56, 0x03, 188},
-        {3, 0x02, 191},
-        {6, 0x02, 191},
-        {10, 0x02, 191},
-        {15, 0x02, 191},
-        {24, 0x02, 191},
-        {31, 0x02, 191},
-        {41, 0x02, 191},
-        {56, 0x03, 191},
-    },
-    /* 173 */
-    {
-        {3, 0x02, 197},
-        {6, 0x02, 197},
-        {10, 0x02, 197},
-        {15, 0x02, 197},
-        {24, 0x02, 197},
-        {31, 0x02, 197},
-        {41, 0x02, 197},
-        {56, 0x03, 197},
-        {3, 0x02, 231},
-        {6, 0x02, 231},
-        {10, 0x02, 231},
-        {15, 0x02, 231},
-        {24, 0x02, 231},
-        {31, 0x02, 231},
-        {41, 0x02, 231},
-        {56, 0x03, 231},
-    },
-    /* 174 */
-    {
-        {2, 0x02, 239},
-        {9, 0x02, 239},
-        {23, 0x02, 239},
-        {40, 0x03, 239},
-        {1, 0x02, 9},
-        {22, 0x03, 9},
-        {1, 0x02, 142},
-        {22, 0x03, 142},
-        {1, 0x02, 144},
-        {22, 0x03, 144},
-        {1, 0x02, 145},
-        {22, 0x03, 145},
-        {1, 0x02, 148},
-        {22, 0x03, 148},
-        {1, 0x02, 159},
-        {22, 0x03, 159},
-    },
-    /* 175 */
-    {
-        {3, 0x02, 239},
-        {6, 0x02, 239},
-        {10, 0x02, 239},
-        {15, 0x02, 239},
-        {24, 0x02, 239},
-        {31, 0x02, 239},
-        {41, 0x02, 239},
-        {56, 0x03, 239},
-        {2, 0x02, 9},
-        {9, 0x02, 9},
-        {23, 0x02, 9},
-        {40, 0x03, 9},
-        {2, 0x02, 142},
-        {9, 0x02, 142},
-        {23, 0x02, 142},
-        {40, 0x03, 142},
-    },
-    /* 176 */
-    {
-        {3, 0x02, 9},
-        {6, 0x02, 9},
-        {10, 0x02, 9},
-        {15, 0x02, 9},
-        {24, 0x02, 9},
-        {31, 0x02, 9},
-        {41, 0x02, 9},
-        {56, 0x03, 9},
-        {3, 0x02, 142},
-        {6, 0x02, 142},
-        {10, 0x02, 142},
-        {15, 0x02, 142},
-        {24, 0x02, 142},
-        {31, 0x02, 142},
-        {41, 0x02, 142},
-        {56, 0x03, 142},
-    },
-    /* 177 */
-    {
-        {2, 0x02, 144},
-        {9, 0x02, 144},
-        {23, 0x02, 144},
-        {40, 0x03, 144},
-        {2, 0x02, 145},
-        {9, 0x02, 145},
-        {23, 0x02, 145},
-        {40, 0x03, 145},
-        {2, 0x02, 148},
-        {9, 0x02, 148},
-        {23, 0x02, 148},
-        {40, 0x03, 148},
-        {2, 0x02, 159},
-        {9, 0x02, 159},
-        {23, 0x02, 159},
-        {40, 0x03, 159},
-    },
-    /* 178 */
-    {
-        {3, 0x02, 144},
-        {6, 0x02, 144},
-        {10, 0x02, 144},
-        {15, 0x02, 144},
-        {24, 0x02, 144},
-        {31, 0x02, 144},
-        {41, 0x02, 144},
-        {56, 0x03, 144},
-        {3, 0x02, 145},
-        {6, 0x02, 145},
-        {10, 0x02, 145},
-        {15, 0x02, 145},
-        {24, 0x02, 145},
-        {31, 0x02, 145},
-        {41, 0x02, 145},
-        {56, 0x03, 145},
-    },
-    /* 179 */
-    {
-        {3, 0x02, 148},
-        {6, 0x02, 148},
-        {10, 0x02, 148},
-        {15, 0x02, 148},
-        {24, 0x02, 148},
-        {31, 0x02, 148},
-        {41, 0x02, 148},
-        {56, 0x03, 148},
-        {3, 0x02, 159},
-        {6, 0x02, 159},
-        {10, 0x02, 159},
-        {15, 0x02, 159},
-        {24, 0x02, 159},
-        {31, 0x02, 159},
-        {41, 0x02, 159},
-        {56, 0x03, 159},
-    },
-    /* 180 */
-    {
-        {0, 0x03, 171},
-        {0, 0x03, 206},
-        {0, 0x03, 215},
-        {0, 0x03, 225},
-        {0, 0x03, 236},
-        {0, 0x03, 237},
-        {188, 0x00, 0},
-        {189, 0x00, 0},
-        {193, 0x00, 0},
-        {196, 0x00, 0},
-        {200, 0x00, 0},
-        {203, 0x00, 0},
-        {209, 0x00, 0},
-        {216, 0x00, 0},
-        {224, 0x00, 0},
-        {238, 0x00, 0},
-    },
-    /* 181 */
-    {
-        {1, 0x02, 171},
-        {22, 0x03, 171},
-        {1, 0x02, 206},
-        {22, 0x03, 206},
-        {1, 0x02, 215},
-        {22, 0x03, 215},
-        {1, 0x02, 225},
-        {22, 0x03, 225},
-        {1, 0x02, 236},
-        {22, 0x03, 236},
-        {1, 0x02, 237},
-        {22, 0x03, 237},
-        {0, 0x03, 199},
-        {0, 0x03, 207},
-        {0, 0x03, 234},
-        {0, 0x03, 235},
-    },
-    /* 182 */
-    {
-        {2, 0x02, 171},
-        {9, 0x02, 171},
-        {23, 0x02, 171},
-        {40, 0x03, 171},
-        {2, 0x02, 206},
-        {9, 0x02, 206},
-        {23, 0x02, 206},
-        {40, 0x03, 206},
-        {2, 0x02, 215},
-        {9, 0x02, 215},
-        {23, 0x02, 215},
-        {40, 0x03, 215},
-        {2, 0x02, 225},
-        {9, 0x02, 225},
-        {23, 0x02, 225},
-        {40, 0x03, 225},
-    },
-    /* 183 */
-    {
-        {3, 0x02, 171},
-        {6, 0x02, 171},
-        {10, 0x02, 171},
-        {15, 0x02, 171},
-        {24, 0x02, 171},
-        {31, 0x02, 171},
-        {41, 0x02, 171},
-        {56, 0x03, 171},
-        {3, 0x02, 206},
-        {6, 0x02, 206},
-        {10, 0x02, 206},
-        {15, 0x02, 206},
-        {24, 0x02, 206},
-        {31, 0x02, 206},
-        {41, 0x02, 206},
-        {56, 0x03, 206},
-    },
-    /* 184 */
-    {
-        {3, 0x02, 215},
-        {6, 0x02, 215},
-        {10, 0x02, 215},
-        {15, 0x02, 215},
-        {24, 0x02, 215},
-        {31, 0x02, 215},
-        {41, 0x02, 215},
-        {56, 0x03, 215},
-        {3, 0x02, 225},
-        {6, 0x02, 225},
-        {10, 0x02, 225},
-        {15, 0x02, 225},
-        {24, 0x02, 225},
-        {31, 0x02, 225},
-        {41, 0x02, 225},
-        {56, 0x03, 225},
-    },
-    /* 185 */
-    {
-        {2, 0x02, 236},
-        {9, 0x02, 236},
-        {23, 0x02, 236},
-        {40, 0x03, 236},
-        {2, 0x02, 237},
-        {9, 0x02, 237},
-        {23, 0x02, 237},
-        {40, 0x03, 237},
-        {1, 0x02, 199},
-        {22, 0x03, 199},
-        {1, 0x02, 207},
-        {22, 0x03, 207},
-        {1, 0x02, 234},
-        {22, 0x03, 234},
-        {1, 0x02, 235},
-        {22, 0x03, 235},
-    },
-    /* 186 */
-    {
-        {3, 0x02, 236},
-        {6, 0x02, 236},
-        {10, 0x02, 236},
-        {15, 0x02, 236},
-        {24, 0x02, 236},
-        {31, 0x02, 236},
-        {41, 0x02, 236},
-        {56, 0x03, 236},
-        {3, 0x02, 237},
-        {6, 0x02, 237},
-        {10, 0x02, 237},
-        {15, 0x02, 237},
-        {24, 0x02, 237},
-        {31, 0x02, 237},
-        {41, 0x02, 237},
-        {56, 0x03, 237},
-    },
-    /* 187 */
-    {
-        {2, 0x02, 199},
-        {9, 0x02, 199},
-        {23, 0x02, 199},
-        {40, 0x03, 199},
-        {2, 0x02, 207},
-        {9, 0x02, 207},
-        {23, 0x02, 207},
-        {40, 0x03, 207},
-        {2, 0x02, 234},
-        {9, 0x02, 234},
-        {23, 0x02, 234},
-        {40, 0x03, 234},
-        {2, 0x02, 235},
-        {9, 0x02, 235},
-        {23, 0x02, 235},
-        {40, 0x03, 235},
-    },
-    /* 188 */
-    {
-        {3, 0x02, 199},
-        {6, 0x02, 199},
-        {10, 0x02, 199},
-        {15, 0x02, 199},
-        {24, 0x02, 199},
-        {31, 0x02, 199},
-        {41, 0x02, 199},
-        {56, 0x03, 199},
-        {3, 0x02, 207},
-        {6, 0x02, 207},
-        {10, 0x02, 207},
-        {15, 0x02, 207},
-        {24, 0x02, 207},
-        {31, 0x02, 207},
-        {41, 0x02, 207},
-        {56, 0x03, 207},
-    },
-    /* 189 */
-    {
-        {3, 0x02, 234},
-        {6, 0x02, 234},
-        {10, 0x02, 234},
-        {15, 0x02, 234},
-        {24, 0x02, 234},
-        {31, 0x02, 234},
-        {41, 0x02, 234},
-        {56, 0x03, 234},
-        {3, 0x02, 235},
-        {6, 0x02, 235},
-        {10, 0x02, 235},
-        {15, 0x02, 235},
-        {24, 0x02, 235},
-        {31, 0x02, 235},
-        {41, 0x02, 235},
-        {56, 0x03, 235},
-    },
-    /* 190 */
-    {
-        {194, 0x00, 0},
-        {195, 0x00, 0},
-        {197, 0x00, 0},
-        {198, 0x00, 0},
-        {201, 0x00, 0},
-        {202, 0x00, 0},
-        {204, 0x00, 0},
-        {205, 0x00, 0},
-        {210, 0x00, 0},
-        {213, 0x00, 0},
-        {217, 0x00, 0},
-        {220, 0x00, 0},
-        {225, 0x00, 0},
-        {231, 0x00, 0},
-        {239, 0x00, 0},
-        {246, 0x00, 0},
-    },
-    /* 191 */
-    {
-        {0, 0x03, 192},
-        {0, 0x03, 193},
-        {0, 0x03, 200},
-        {0, 0x03, 201},
-        {0, 0x03, 202},
-        {0, 0x03, 205},
-        {0, 0x03, 210},
-        {0, 0x03, 213},
-        {0, 0x03, 218},
-        {0, 0x03, 219},
-        {0, 0x03, 238},
-        {0, 0x03, 240},
-        {0, 0x03, 242},
-        {0, 0x03, 243},
-        {0, 0x03, 255},
-        {206, 0x00, 0},
-    },
-    /* 192 */
-    {
-        {1, 0x02, 192},
-        {22, 0x03, 192},
-        {1, 0x02, 193},
-        {22, 0x03, 193},
-        {1, 0x02, 200},
-        {22, 0x03, 200},
-        {1, 0x02, 201},
-        {22, 0x03, 201},
-        {1, 0x02, 202},
-        {22, 0x03, 202},
-        {1, 0x02, 205},
-        {22, 0x03, 205},
-        {1, 0x02, 210},
-        {22, 0x03, 210},
-        {1, 0x02, 213},
-        {22, 0x03, 213},
-    },
-    /* 193 */
-    {
-        {2, 0x02, 192},
-        {9, 0x02, 192},
-        {23, 0x02, 192},
-        {40, 0x03, 192},
-        {2, 0x02, 193},
-        {9, 0x02, 193},
-        {23, 0x02, 193},
-        {40, 0x03, 193},
-        {2, 0x02, 200},
-        {9, 0x02, 200},
-        {23, 0x02, 200},
-        {40, 0x03, 200},
-        {2, 0x02, 201},
-        {9, 0x02, 201},
-        {23, 0x02, 201},
-        {40, 0x03, 201},
-    },
-    /* 194 */
-    {
-        {3, 0x02, 192},
-        {6, 0x02, 192},
-        {10, 0x02, 192},
-        {15, 0x02, 192},
-        {24, 0x02, 192},
-        {31, 0x02, 192},
-        {41, 0x02, 192},
-        {56, 0x03, 192},
-        {3, 0x02, 193},
-        {6, 0x02, 193},
-        {10, 0x02, 193},
-        {15, 0x02, 193},
-        {24, 0x02, 193},
-        {31, 0x02, 193},
-        {41, 0x02, 193},
-        {56, 0x03, 193},
-    },
-    /* 195 */
-    {
-        {3, 0x02, 200},
-        {6, 0x02, 200},
-        {10, 0x02, 200},
-        {15, 0x02, 200},
-        {24, 0x02, 200},
-        {31, 0x02, 200},
-        {41, 0x02, 200},
-        {56, 0x03, 200},
-        {3, 0x02, 201},
-        {6, 0x02, 201},
-        {10, 0x02, 201},
-        {15, 0x02, 201},
-        {24, 0x02, 201},
-        {31, 0x02, 201},
-        {41, 0x02, 201},
-        {56, 0x03, 201},
-    },
-    /* 196 */
-    {
-        {2, 0x02, 202},
-        {9, 0x02, 202},
-        {23, 0x02, 202},
-        {40, 0x03, 202},
-        {2, 0x02, 205},
-        {9, 0x02, 205},
-        {23, 0x02, 205},
-        {40, 0x03, 205},
-        {2, 0x02, 210},
-        {9, 0x02, 210},
-        {23, 0x02, 210},
-        {40, 0x03, 210},
-        {2, 0x02, 213},
-        {9, 0x02, 213},
-        {23, 0x02, 213},
-        {40, 0x03, 213},
-    },
-    /* 197 */
-    {
-        {3, 0x02, 202},
-        {6, 0x02, 202},
-        {10, 0x02, 202},
-        {15, 0x02, 202},
-        {24, 0x02, 202},
-        {31, 0x02, 202},
-        {41, 0x02, 202},
-        {56, 0x03, 202},
-        {3, 0x02, 205},
-        {6, 0x02, 205},
-        {10, 0x02, 205},
-        {15, 0x02, 205},
-        {24, 0x02, 205},
-        {31, 0x02, 205},
-        {41, 0x02, 205},
-        {56, 0x03, 205},
-    },
-    /* 198 */
-    {
-        {3, 0x02, 210},
-        {6, 0x02, 210},
-        {10, 0x02, 210},
-        {15, 0x02, 210},
-        {24, 0x02, 210},
-        {31, 0x02, 210},
-        {41, 0x02, 210},
-        {56, 0x03, 210},
-        {3, 0x02, 213},
-        {6, 0x02, 213},
-        {10, 0x02, 213},
-        {15, 0x02, 213},
-        {24, 0x02, 213},
-        {31, 0x02, 213},
-        {41, 0x02, 213},
-        {56, 0x03, 213},
-    },
-    /* 199 */
-    {
-        {1, 0x02, 218},
-        {22, 0x03, 218},
-        {1, 0x02, 219},
-        {22, 0x03, 219},
-        {1, 0x02, 238},
-        {22, 0x03, 238},
-        {1, 0x02, 240},
-        {22, 0x03, 240},
-        {1, 0x02, 242},
-        {22, 0x03, 242},
-        {1, 0x02, 243},
-        {22, 0x03, 243},
-        {1, 0x02, 255},
-        {22, 0x03, 255},
-        {0, 0x03, 203},
-        {0, 0x03, 204},
-    },
-    /* 200 */
-    {
-        {2, 0x02, 218},
-        {9, 0x02, 218},
-        {23, 0x02, 218},
-        {40, 0x03, 218},
-        {2, 0x02, 219},
-        {9, 0x02, 219},
-        {23, 0x02, 219},
-        {40, 0x03, 219},
-        {2, 0x02, 238},
-        {9, 0x02, 238},
-        {23, 0x02, 238},
-        {40, 0x03, 238},
-        {2, 0x02, 240},
-        {9, 0x02, 240},
-        {23, 0x02, 240},
-        {40, 0x03, 240},
-    },
-    /* 201 */
-    {
-        {3, 0x02, 218},
-        {6, 0x02, 218},
-        {10, 0x02, 218},
-        {15, 0x02, 218},
-        {24, 0x02, 218},
-        {31, 0x02, 218},
-        {41, 0x02, 218},
-        {56, 0x03, 218},
-        {3, 0x02, 219},
-        {6, 0x02, 219},
-        {10, 0x02, 219},
-        {15, 0x02, 219},
-        {24, 0x02, 219},
-        {31, 0x02, 219},
-        {41, 0x02, 219},
-        {56, 0x03, 219},
-    },
-    /* 202 */
-    {
-        {3, 0x02, 238},
-        {6, 0x02, 238},
-        {10, 0x02, 238},
-        {15, 0x02, 238},
-        {24, 0x02, 238},
-        {31, 0x02, 238},
-        {41, 0x02, 238},
-        {56, 0x03, 238},
-        {3, 0x02, 240},
-        {6, 0x02, 240},
-        {10, 0x02, 240},
-        {15, 0x02, 240},
-        {24, 0x02, 240},
-        {31, 0x02, 240},
-        {41, 0x02, 240},
-        {56, 0x03, 240},
-    },
-    /* 203 */
-    {
-        {2, 0x02, 242},
-        {9, 0x02, 242},
-        {23, 0x02, 242},
-        {40, 0x03, 242},
-        {2, 0x02, 243},
-        {9, 0x02, 243},
-        {23, 0x02, 243},
-        {40, 0x03, 243},
-        {2, 0x02, 255},
-        {9, 0x02, 255},
-        {23, 0x02, 255},
-        {40, 0x03, 255},
-        {1, 0x02, 203},
-        {22, 0x03, 203},
-        {1, 0x02, 204},
-        {22, 0x03, 204},
-    },
-    /* 204 */
-    {
-        {3, 0x02, 242},
-        {6, 0x02, 242},
-        {10, 0x02, 242},
-        {15, 0x02, 242},
-        {24, 0x02, 242},
-        {31, 0x02, 242},
-        {41, 0x02, 242},
-        {56, 0x03, 242},
-        {3, 0x02, 243},
-        {6, 0x02, 243},
-        {10, 0x02, 243},
-        {15, 0x02, 243},
-        {24, 0x02, 243},
-        {31, 0x02, 243},
-        {41, 0x02, 243},
-        {56, 0x03, 243},
-    },
-    /* 205 */
-    {
-        {3, 0x02, 255},
-        {6, 0x02, 255},
-        {10, 0x02, 255},
-        {15, 0x02, 255},
-        {24, 0x02, 255},
-        {31, 0x02, 255},
-        {41, 0x02, 255},
-        {56, 0x03, 255},
-        {2, 0x02, 203},
-        {9, 0x02, 203},
-        {23, 0x02, 203},
-        {40, 0x03, 203},
-        {2, 0x02, 204},
-        {9, 0x02, 204},
-        {23, 0x02, 204},
-        {40, 0x03, 204},
-    },
-    /* 206 */
-    {
-        {3, 0x02, 203},
-        {6, 0x02, 203},
-        {10, 0x02, 203},
-        {15, 0x02, 203},
-        {24, 0x02, 203},
-        {31, 0x02, 203},
-        {41, 0x02, 203},
-        {56, 0x03, 203},
-        {3, 0x02, 204},
-        {6, 0x02, 204},
-        {10, 0x02, 204},
-        {15, 0x02, 204},
-        {24, 0x02, 204},
-        {31, 0x02, 204},
-        {41, 0x02, 204},
-        {56, 0x03, 204},
-    },
-    /* 207 */
-    {
-        {211, 0x00, 0},
-        {212, 0x00, 0},
-        {214, 0x00, 0},
-        {215, 0x00, 0},
-        {218, 0x00, 0},
-        {219, 0x00, 0},
-        {221, 0x00, 0},
-        {222, 0x00, 0},
-        {226, 0x00, 0},
-        {228, 0x00, 0},
-        {232, 0x00, 0},
-        {235, 0x00, 0},
-        {240, 0x00, 0},
-        {243, 0x00, 0},
-        {247, 0x00, 0},
-        {250, 0x00, 0},
-    },
-    /* 208 */
-    {
-        {0, 0x03, 211},
-        {0, 0x03, 212},
-        {0, 0x03, 214},
-        {0, 0x03, 221},
-        {0, 0x03, 222},
-        {0, 0x03, 223},
-        {0, 0x03, 241},
-        {0, 0x03, 244},
-        {0, 0x03, 245},
-        {0, 0x03, 246},
-        {0, 0x03, 247},
-        {0, 0x03, 248},
-        {0, 0x03, 250},
-        {0, 0x03, 251},
-        {0, 0x03, 252},
-        {0, 0x03, 253},
-    },
-    /* 209 */
-    {
-        {1, 0x02, 211},
-        {22, 0x03, 211},
-        {1, 0x02, 212},
-        {22, 0x03, 212},
-        {1, 0x02, 214},
-        {22, 0x03, 214},
-        {1, 0x02, 221},
-        {22, 0x03, 221},
-        {1, 0x02, 222},
-        {22, 0x03, 222},
-        {1, 0x02, 223},
-        {22, 0x03, 223},
-        {1, 0x02, 241},
-        {22, 0x03, 241},
-        {1, 0x02, 244},
-        {22, 0x03, 244},
-    },
-    /* 210 */
-    {
-        {2, 0x02, 211},
-        {9, 0x02, 211},
-        {23, 0x02, 211},
-        {40, 0x03, 211},
-        {2, 0x02, 212},
-        {9, 0x02, 212},
-        {23, 0x02, 212},
-        {40, 0x03, 212},
-        {2, 0x02, 214},
-        {9, 0x02, 214},
-        {23, 0x02, 214},
-        {40, 0x03, 214},
-        {2, 0x02, 221},
-        {9, 0x02, 221},
-        {23, 0x02, 221},
-        {40, 0x03, 221},
-    },
-    /* 211 */
-    {
-        {3, 0x02, 211},
-        {6, 0x02, 211},
-        {10, 0x02, 211},
-        {15, 0x02, 211},
-        {24, 0x02, 211},
-        {31, 0x02, 211},
-        {41, 0x02, 211},
-        {56, 0x03, 211},
-        {3, 0x02, 212},
-        {6, 0x02, 212},
-        {10, 0x02, 212},
-        {15, 0x02, 212},
-        {24, 0x02, 212},
-        {31, 0x02, 212},
-        {41, 0x02, 212},
-        {56, 0x03, 212},
-    },
-    /* 212 */
-    {
-        {3, 0x02, 214},
-        {6, 0x02, 214},
-        {10, 0x02, 214},
-        {15, 0x02, 214},
-        {24, 0x02, 214},
-        {31, 0x02, 214},
-        {41, 0x02, 214},
-        {56, 0x03, 214},
-        {3, 0x02, 221},
-        {6, 0x02, 221},
-        {10, 0x02, 221},
-        {15, 0x02, 221},
-        {24, 0x02, 221},
-        {31, 0x02, 221},
-        {41, 0x02, 221},
-        {56, 0x03, 221},
-    },
-    /* 213 */
-    {
-        {2, 0x02, 222},
-        {9, 0x02, 222},
-        {23, 0x02, 222},
-        {40, 0x03, 222},
-        {2, 0x02, 223},
-        {9, 0x02, 223},
-        {23, 0x02, 223},
-        {40, 0x03, 223},
-        {2, 0x02, 241},
-        {9, 0x02, 241},
-        {23, 0x02, 241},
-        {40, 0x03, 241},
-        {2, 0x02, 244},
-        {9, 0x02, 244},
-        {23, 0x02, 244},
-        {40, 0x03, 244},
-    },
-    /* 214 */
-    {
-        {3, 0x02, 222},
-        {6, 0x02, 222},
-        {10, 0x02, 222},
-        {15, 0x02, 222},
-        {24, 0x02, 222},
-        {31, 0x02, 222},
-        {41, 0x02, 222},
-        {56, 0x03, 222},
-        {3, 0x02, 223},
-        {6, 0x02, 223},
-        {10, 0x02, 223},
-        {15, 0x02, 223},
-        {24, 0x02, 223},
-        {31, 0x02, 223},
-        {41, 0x02, 223},
-        {56, 0x03, 223},
-    },
-    /* 215 */
-    {
-        {3, 0x02, 241},
-        {6, 0x02, 241},
-        {10, 0x02, 241},
-        {15, 0x02, 241},
-        {24, 0x02, 241},
-        {31, 0x02, 241},
-        {41, 0x02, 241},
-        {56, 0x03, 241},
-        {3, 0x02, 244},
-        {6, 0x02, 244},
-        {10, 0x02, 244},
-        {15, 0x02, 244},
-        {24, 0x02, 244},
-        {31, 0x02, 244},
-        {41, 0x02, 244},
-        {56, 0x03, 244},
-    },
-    /* 216 */
-    {
-        {1, 0x02, 245},
-        {22, 0x03, 245},
-        {1, 0x02, 246},
-        {22, 0x03, 246},
-        {1, 0x02, 247},
-        {22, 0x03, 247},
-        {1, 0x02, 248},
-        {22, 0x03, 248},
-        {1, 0x02, 250},
-        {22, 0x03, 250},
-        {1, 0x02, 251},
-        {22, 0x03, 251},
-        {1, 0x02, 252},
-        {22, 0x03, 252},
-        {1, 0x02, 253},
-        {22, 0x03, 253},
-    },
-    /* 217 */
-    {
-        {2, 0x02, 245},
-        {9, 0x02, 245},
-        {23, 0x02, 245},
-        {40, 0x03, 245},
-        {2, 0x02, 246},
-        {9, 0x02, 246},
-        {23, 0x02, 246},
-        {40, 0x03, 246},
-        {2, 0x02, 247},
-        {9, 0x02, 247},
-        {23, 0x02, 247},
-        {40, 0x03, 247},
-        {2, 0x02, 248},
-        {9, 0x02, 248},
-        {23, 0x02, 248},
-        {40, 0x03, 248},
-    },
-    /* 218 */
-    {
-        {3, 0x02, 245},
-        {6, 0x02, 245},
-        {10, 0x02, 245},
-        {15, 0x02, 245},
-        {24, 0x02, 245},
-        {31, 0x02, 245},
-        {41, 0x02, 245},
-        {56, 0x03, 245},
-        {3, 0x02, 246},
-        {6, 0x02, 246},
-        {10, 0x02, 246},
-        {15, 0x02, 246},
-        {24, 0x02, 246},
-        {31, 0x02, 246},
-        {41, 0x02, 246},
-        {56, 0x03, 246},
-    },
-    /* 219 */
-    {
-        {3, 0x02, 247},
-        {6, 0x02, 247},
-        {10, 0x02, 247},
-        {15, 0x02, 247},
-        {24, 0x02, 247},
-        {31, 0x02, 247},
-        {41, 0x02, 247},
-        {56, 0x03, 247},
-        {3, 0x02, 248},
-        {6, 0x02, 248},
-        {10, 0x02, 248},
-        {15, 0x02, 248},
-        {24, 0x02, 248},
-        {31, 0x02, 248},
-        {41, 0x02, 248},
-        {56, 0x03, 248},
-    },
-    /* 220 */
-    {
-        {2, 0x02, 250},
-        {9, 0x02, 250},
-        {23, 0x02, 250},
-        {40, 0x03, 250},
-        {2, 0x02, 251},
-        {9, 0x02, 251},
-        {23, 0x02, 251},
-        {40, 0x03, 251},
-        {2, 0x02, 252},
-        {9, 0x02, 252},
-        {23, 0x02, 252},
-        {40, 0x03, 252},
-        {2, 0x02, 253},
-        {9, 0x02, 253},
-        {23, 0x02, 253},
-        {40, 0x03, 253},
-    },
-    /* 221 */
-    {
-        {3, 0x02, 250},
-        {6, 0x02, 250},
-        {10, 0x02, 250},
-        {15, 0x02, 250},
-        {24, 0x02, 250},
-        {31, 0x02, 250},
-        {41, 0x02, 250},
-        {56, 0x03, 250},
-        {3, 0x02, 251},
-        {6, 0x02, 251},
-        {10, 0x02, 251},
-        {15, 0x02, 251},
-        {24, 0x02, 251},
-        {31, 0x02, 251},
-        {41, 0x02, 251},
-        {56, 0x03, 251},
-    },
-    /* 222 */
-    {
-        {3, 0x02, 252},
-        {6, 0x02, 252},
-        {10, 0x02, 252},
-        {15, 0x02, 252},
-        {24, 0x02, 252},
-        {31, 0x02, 252},
-        {41, 0x02, 252},
-        {56, 0x03, 252},
-        {3, 0x02, 253},
-        {6, 0x02, 253},
-        {10, 0x02, 253},
-        {15, 0x02, 253},
-        {24, 0x02, 253},
-        {31, 0x02, 253},
-        {41, 0x02, 253},
-        {56, 0x03, 253},
-    },
-    /* 223 */
-    {
-        {0, 0x03, 254},
-        {227, 0x00, 0},
-        {229, 0x00, 0},
-        {230, 0x00, 0},
-        {233, 0x00, 0},
-        {234, 0x00, 0},
-        {236, 0x00, 0},
-        {237, 0x00, 0},
-        {241, 0x00, 0},
-        {242, 0x00, 0},
-        {244, 0x00, 0},
-        {245, 0x00, 0},
-        {248, 0x00, 0},
-        {249, 0x00, 0},
-        {251, 0x00, 0},
-        {252, 0x00, 0},
-    },
-    /* 224 */
-    {
-        {1, 0x02, 254},
-        {22, 0x03, 254},
-        {0, 0x03, 2},
-        {0, 0x03, 3},
-        {0, 0x03, 4},
-        {0, 0x03, 5},
-        {0, 0x03, 6},
-        {0, 0x03, 7},
-        {0, 0x03, 8},
-        {0, 0x03, 11},
-        {0, 0x03, 12},
-        {0, 0x03, 14},
-        {0, 0x03, 15},
-        {0, 0x03, 16},
-        {0, 0x03, 17},
-        {0, 0x03, 18},
-    },
-    /* 225 */
-    {
-        {2, 0x02, 254},
-        {9, 0x02, 254},
-        {23, 0x02, 254},
-        {40, 0x03, 254},
-        {1, 0x02, 2},
-        {22, 0x03, 2},
-        {1, 0x02, 3},
-        {22, 0x03, 3},
-        {1, 0x02, 4},
-        {22, 0x03, 4},
-        {1, 0x02, 5},
-        {22, 0x03, 5},
-        {1, 0x02, 6},
-        {22, 0x03, 6},
-        {1, 0x02, 7},
-        {22, 0x03, 7},
-    },
-    /* 226 */
-    {
-        {3, 0x02, 254},
-        {6, 0x02, 254},
-        {10, 0x02, 254},
-        {15, 0x02, 254},
-        {24, 0x02, 254},
-        {31, 0x02, 254},
-        {41, 0x02, 254},
-        {56, 0x03, 254},
-        {2, 0x02, 2},
-        {9, 0x02, 2},
-        {23, 0x02, 2},
-        {40, 0x03, 2},
-        {2, 0x02, 3},
-        {9, 0x02, 3},
-        {23, 0x02, 3},
-        {40, 0x03, 3},
-    },
-    /* 227 */
-    {
-        {3, 0x02, 2},
-        {6, 0x02, 2},
-        {10, 0x02, 2},
-        {15, 0x02, 2},
-        {24, 0x02, 2},
-        {31, 0x02, 2},
-        {41, 0x02, 2},
-        {56, 0x03, 2},
-        {3, 0x02, 3},
-        {6, 0x02, 3},
-        {10, 0x02, 3},
-        {15, 0x02, 3},
-        {24, 0x02, 3},
-        {31, 0x02, 3},
-        {41, 0x02, 3},
-        {56, 0x03, 3},
-    },
-    /* 228 */
-    {
-        {2, 0x02, 4},
-        {9, 0x02, 4},
-        {23, 0x02, 4},
-        {40, 0x03, 4},
-        {2, 0x02, 5},
-        {9, 0x02, 5},
-        {23, 0x02, 5},
-        {40, 0x03, 5},
-        {2, 0x02, 6},
-        {9, 0x02, 6},
-        {23, 0x02, 6},
-        {40, 0x03, 6},
-        {2, 0x02, 7},
-        {9, 0x02, 7},
-        {23, 0x02, 7},
-        {40, 0x03, 7},
-    },
-    /* 229 */
-    {
-        {3, 0x02, 4},
-        {6, 0x02, 4},
-        {10, 0x02, 4},
-        {15, 0x02, 4},
-        {24, 0x02, 4},
-        {31, 0x02, 4},
-        {41, 0x02, 4},
-        {56, 0x03, 4},
-        {3, 0x02, 5},
-        {6, 0x02, 5},
-        {10, 0x02, 5},
-        {15, 0x02, 5},
-        {24, 0x02, 5},
-        {31, 0x02, 5},
-        {41, 0x02, 5},
-        {56, 0x03, 5},
-    },
-    /* 230 */
-    {
-        {3, 0x02, 6},
-        {6, 0x02, 6},
-        {10, 0x02, 6},
-        {15, 0x02, 6},
-        {24, 0x02, 6},
-        {31, 0x02, 6},
-        {41, 0x02, 6},
-        {56, 0x03, 6},
-        {3, 0x02, 7},
-        {6, 0x02, 7},
-        {10, 0x02, 7},
-        {15, 0x02, 7},
-        {24, 0x02, 7},
-        {31, 0x02, 7},
-        {41, 0x02, 7},
-        {56, 0x03, 7},
-    },
-    /* 231 */
-    {
-        {1, 0x02, 8},
-        {22, 0x03, 8},
-        {1, 0x02, 11},
-        {22, 0x03, 11},
-        {1, 0x02, 12},
-        {22, 0x03, 12},
-        {1, 0x02, 14},
-        {22, 0x03, 14},
-        {1, 0x02, 15},
-        {22, 0x03, 15},
-        {1, 0x02, 16},
-        {22, 0x03, 16},
-        {1, 0x02, 17},
-        {22, 0x03, 17},
-        {1, 0x02, 18},
-        {22, 0x03, 18},
-    },
-    /* 232 */
-    {
-        {2, 0x02, 8},
-        {9, 0x02, 8},
-        {23, 0x02, 8},
-        {40, 0x03, 8},
-        {2, 0x02, 11},
-        {9, 0x02, 11},
-        {23, 0x02, 11},
-        {40, 0x03, 11},
-        {2, 0x02, 12},
-        {9, 0x02, 12},
-        {23, 0x02, 12},
-        {40, 0x03, 12},
-        {2, 0x02, 14},
-        {9, 0x02, 14},
-        {23, 0x02, 14},
-        {40, 0x03, 14},
-    },
-    /* 233 */
-    {
-        {3, 0x02, 8},
-        {6, 0x02, 8},
-        {10, 0x02, 8},
-        {15, 0x02, 8},
-        {24, 0x02, 8},
-        {31, 0x02, 8},
-        {41, 0x02, 8},
-        {56, 0x03, 8},
-        {3, 0x02, 11},
-        {6, 0x02, 11},
-        {10, 0x02, 11},
-        {15, 0x02, 11},
-        {24, 0x02, 11},
-        {31, 0x02, 11},
-        {41, 0x02, 11},
-        {56, 0x03, 11},
-    },
-    /* 234 */
-    {
-        {3, 0x02, 12},
-        {6, 0x02, 12},
-        {10, 0x02, 12},
-        {15, 0x02, 12},
-        {24, 0x02, 12},
-        {31, 0x02, 12},
-        {41, 0x02, 12},
-        {56, 0x03, 12},
-        {3, 0x02, 14},
-        {6, 0x02, 14},
-        {10, 0x02, 14},
-        {15, 0x02, 14},
-        {24, 0x02, 14},
-        {31, 0x02, 14},
-        {41, 0x02, 14},
-        {56, 0x03, 14},
-    },
-    /* 235 */
-    {
-        {2, 0x02, 15},
-        {9, 0x02, 15},
-        {23, 0x02, 15},
-        {40, 0x03, 15},
-        {2, 0x02, 16},
-        {9, 0x02, 16},
-        {23, 0x02, 16},
-        {40, 0x03, 16},
-        {2, 0x02, 17},
-        {9, 0x02, 17},
-        {23, 0x02, 17},
-        {40, 0x03, 17},
-        {2, 0x02, 18},
-        {9, 0x02, 18},
-        {23, 0x02, 18},
-        {40, 0x03, 18},
-    },
-    /* 236 */
-    {
-        {3, 0x02, 15},
-        {6, 0x02, 15},
-        {10, 0x02, 15},
-        {15, 0x02, 15},
-        {24, 0x02, 15},
-        {31, 0x02, 15},
-        {41, 0x02, 15},
-        {56, 0x03, 15},
-        {3, 0x02, 16},
-        {6, 0x02, 16},
-        {10, 0x02, 16},
-        {15, 0x02, 16},
-        {24, 0x02, 16},
-        {31, 0x02, 16},
-        {41, 0x02, 16},
-        {56, 0x03, 16},
-    },
-    /* 237 */
-    {
-        {3, 0x02, 17},
-        {6, 0x02, 17},
-        {10, 0x02, 17},
-        {15, 0x02, 17},
-        {24, 0x02, 17},
-        {31, 0x02, 17},
-        {41, 0x02, 17},
-        {56, 0x03, 17},
-        {3, 0x02, 18},
-        {6, 0x02, 18},
-        {10, 0x02, 18},
-        {15, 0x02, 18},
-        {24, 0x02, 18},
-        {31, 0x02, 18},
-        {41, 0x02, 18},
-        {56, 0x03, 18},
-    },
-    /* 238 */
-    {
-        {0, 0x03, 19},
-        {0, 0x03, 20},
-        {0, 0x03, 21},
-        {0, 0x03, 23},
-        {0, 0x03, 24},
-        {0, 0x03, 25},
-        {0, 0x03, 26},
-        {0, 0x03, 27},
-        {0, 0x03, 28},
-        {0, 0x03, 29},
-        {0, 0x03, 30},
-        {0, 0x03, 31},
-        {0, 0x03, 127},
-        {0, 0x03, 220},
-        {0, 0x03, 249},
-        {253, 0x00, 0},
-    },
-    /* 239 */
-    {
-        {1, 0x02, 19},
-        {22, 0x03, 19},
-        {1, 0x02, 20},
-        {22, 0x03, 20},
-        {1, 0x02, 21},
-        {22, 0x03, 21},
-        {1, 0x02, 23},
-        {22, 0x03, 23},
-        {1, 0x02, 24},
-        {22, 0x03, 24},
-        {1, 0x02, 25},
-        {22, 0x03, 25},
-        {1, 0x02, 26},
-        {22, 0x03, 26},
-        {1, 0x02, 27},
-        {22, 0x03, 27},
-    },
-    /* 240 */
-    {
-        {2, 0x02, 19},
-        {9, 0x02, 19},
-        {23, 0x02, 19},
-        {40, 0x03, 19},
-        {2, 0x02, 20},
-        {9, 0x02, 20},
-        {23, 0x02, 20},
-        {40, 0x03, 20},
-        {2, 0x02, 21},
-        {9, 0x02, 21},
-        {23, 0x02, 21},
-        {40, 0x03, 21},
-        {2, 0x02, 23},
-        {9, 0x02, 23},
-        {23, 0x02, 23},
-        {40, 0x03, 23},
-    },
-    /* 241 */
-    {
-        {3, 0x02, 19},
-        {6, 0x02, 19},
-        {10, 0x02, 19},
-        {15, 0x02, 19},
-        {24, 0x02, 19},
-        {31, 0x02, 19},
-        {41, 0x02, 19},
-        {56, 0x03, 19},
-        {3, 0x02, 20},
-        {6, 0x02, 20},
-        {10, 0x02, 20},
-        {15, 0x02, 20},
-        {24, 0x02, 20},
-        {31, 0x02, 20},
-        {41, 0x02, 20},
-        {56, 0x03, 20},
-    },
-    /* 242 */
-    {
-        {3, 0x02, 21},
-        {6, 0x02, 21},
-        {10, 0x02, 21},
-        {15, 0x02, 21},
-        {24, 0x02, 21},
-        {31, 0x02, 21},
-        {41, 0x02, 21},
-        {56, 0x03, 21},
-        {3, 0x02, 23},
-        {6, 0x02, 23},
-        {10, 0x02, 23},
-        {15, 0x02, 23},
-        {24, 0x02, 23},
-        {31, 0x02, 23},
-        {41, 0x02, 23},
-        {56, 0x03, 23},
-    },
-    /* 243 */
-    {
-        {2, 0x02, 24},
-        {9, 0x02, 24},
-        {23, 0x02, 24},
-        {40, 0x03, 24},
-        {2, 0x02, 25},
-        {9, 0x02, 25},
-        {23, 0x02, 25},
-        {40, 0x03, 25},
-        {2, 0x02, 26},
-        {9, 0x02, 26},
-        {23, 0x02, 26},
-        {40, 0x03, 26},
-        {2, 0x02, 27},
-        {9, 0x02, 27},
-        {23, 0x02, 27},
-        {40, 0x03, 27},
-    },
-    /* 244 */
-    {
-        {3, 0x02, 24},
-        {6, 0x02, 24},
-        {10, 0x02, 24},
-        {15, 0x02, 24},
-        {24, 0x02, 24},
-        {31, 0x02, 24},
-        {41, 0x02, 24},
-        {56, 0x03, 24},
-        {3, 0x02, 25},
-        {6, 0x02, 25},
-        {10, 0x02, 25},
-        {15, 0x02, 25},
-        {24, 0x02, 25},
-        {31, 0x02, 25},
-        {41, 0x02, 25},
-        {56, 0x03, 25},
-    },
-    /* 245 */
-    {
-        {3, 0x02, 26},
-        {6, 0x02, 26},
-        {10, 0x02, 26},
-        {15, 0x02, 26},
-        {24, 0x02, 26},
-        {31, 0x02, 26},
-        {41, 0x02, 26},
-        {56, 0x03, 26},
-        {3, 0x02, 27},
-        {6, 0x02, 27},
-        {10, 0x02, 27},
-        {15, 0x02, 27},
-        {24, 0x02, 27},
-        {31, 0x02, 27},
-        {41, 0x02, 27},
-        {56, 0x03, 27},
-    },
-    /* 246 */
-    {
-        {1, 0x02, 28},
-        {22, 0x03, 28},
-        {1, 0x02, 29},
-        {22, 0x03, 29},
-        {1, 0x02, 30},
-        {22, 0x03, 30},
-        {1, 0x02, 31},
-        {22, 0x03, 31},
-        {1, 0x02, 127},
-        {22, 0x03, 127},
-        {1, 0x02, 220},
-        {22, 0x03, 220},
-        {1, 0x02, 249},
-        {22, 0x03, 249},
-        {254, 0x00, 0},
-        {255, 0x00, 0},
-    },
-    /* 247 */
-    {
-        {2, 0x02, 28},
-        {9, 0x02, 28},
-        {23, 0x02, 28},
-        {40, 0x03, 28},
-        {2, 0x02, 29},
-        {9, 0x02, 29},
-        {23, 0x02, 29},
-        {40, 0x03, 29},
-        {2, 0x02, 30},
-        {9, 0x02, 30},
-        {23, 0x02, 30},
-        {40, 0x03, 30},
-        {2, 0x02, 31},
-        {9, 0x02, 31},
-        {23, 0x02, 31},
-        {40, 0x03, 31},
-    },
-    /* 248 */
-    {
-        {3, 0x02, 28},
-        {6, 0x02, 28},
-        {10, 0x02, 28},
-        {15, 0x02, 28},
-        {24, 0x02, 28},
-        {31, 0x02, 28},
-        {41, 0x02, 28},
-        {56, 0x03, 28},
-        {3, 0x02, 29},
-        {6, 0x02, 29},
-        {10, 0x02, 29},
-        {15, 0x02, 29},
-        {24, 0x02, 29},
-        {31, 0x02, 29},
-        {41, 0x02, 29},
-        {56, 0x03, 29},
-    },
-    /* 249 */
-    {
-        {3, 0x02, 30},
-        {6, 0x02, 30},
-        {10, 0x02, 30},
-        {15, 0x02, 30},
-        {24, 0x02, 30},
-        {31, 0x02, 30},
-        {41, 0x02, 30},
-        {56, 0x03, 30},
-        {3, 0x02, 31},
-        {6, 0x02, 31},
-        {10, 0x02, 31},
-        {15, 0x02, 31},
-        {24, 0x02, 31},
-        {31, 0x02, 31},
-        {41, 0x02, 31},
-        {56, 0x03, 31},
-    },
-    /* 250 */
-    {
-        {2, 0x02, 127},
-        {9, 0x02, 127},
-        {23, 0x02, 127},
-        {40, 0x03, 127},
-        {2, 0x02, 220},
-        {9, 0x02, 220},
-        {23, 0x02, 220},
-        {40, 0x03, 220},
-        {2, 0x02, 249},
-        {9, 0x02, 249},
-        {23, 0x02, 249},
-        {40, 0x03, 249},
-        {0, 0x03, 10},
-        {0, 0x03, 13},
-        {0, 0x03, 22},
-        {0, 0x04, 0},
-    },
-    /* 251 */
-    {
-        {3, 0x02, 127},
-        {6, 0x02, 127},
-        {10, 0x02, 127},
-        {15, 0x02, 127},
-        {24, 0x02, 127},
-        {31, 0x02, 127},
-        {41, 0x02, 127},
-        {56, 0x03, 127},
-        {3, 0x02, 220},
-        {6, 0x02, 220},
-        {10, 0x02, 220},
-        {15, 0x02, 220},
-        {24, 0x02, 220},
-        {31, 0x02, 220},
-        {41, 0x02, 220},
-        {56, 0x03, 220},
-    },
-    /* 252 */
-    {
-        {3, 0x02, 249},
-        {6, 0x02, 249},
-        {10, 0x02, 249},
-        {15, 0x02, 249},
-        {24, 0x02, 249},
-        {31, 0x02, 249},
-        {41, 0x02, 249},
-        {56, 0x03, 249},
-        {1, 0x02, 10},
-        {22, 0x03, 10},
-        {1, 0x02, 13},
-        {22, 0x03, 13},
-        {1, 0x02, 22},
-        {22, 0x03, 22},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-    },
-    /* 253 */
-    {
-        {2, 0x02, 10},
-        {9, 0x02, 10},
-        {23, 0x02, 10},
-        {40, 0x03, 10},
-        {2, 0x02, 13},
-        {9, 0x02, 13},
-        {23, 0x02, 13},
-        {40, 0x03, 13},
-        {2, 0x02, 22},
-        {9, 0x02, 22},
-        {23, 0x02, 22},
-        {40, 0x03, 22},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-    },
-    /* 254 */
-    {
-        {3, 0x02, 10},
-        {6, 0x02, 10},
-        {10, 0x02, 10},
-        {15, 0x02, 10},
-        {24, 0x02, 10},
-        {31, 0x02, 10},
-        {41, 0x02, 10},
-        {56, 0x03, 10},
-        {3, 0x02, 13},
-        {6, 0x02, 13},
-        {10, 0x02, 13},
-        {15, 0x02, 13},
-        {24, 0x02, 13},
-        {31, 0x02, 13},
-        {41, 0x02, 13},
-        {56, 0x03, 13},
-    },
-    /* 255 */
-    {
-        {3, 0x02, 22},
-        {6, 0x02, 22},
-        {10, 0x02, 22},
-        {15, 0x02, 22},
-        {24, 0x02, 22},
-        {31, 0x02, 22},
-        {41, 0x02, 22},
-        {56, 0x03, 22},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-        {0, 0x04, 0},
-    },
-};
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_hd_huffman.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_HD_HUFFMAN_H
-#define NGHTTP2_HD_HUFFMAN_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-typedef enum {
-  /* FSA accepts this state as the end of huffman encoding
-     sequence. */
-  NGHTTP2_HUFF_ACCEPTED = 1,
-  /* This state emits symbol */
-  NGHTTP2_HUFF_SYM = (1 << 1),
-  /* If state machine reaches this state, decoding fails. */
-  NGHTTP2_HUFF_FAIL = (1 << 2)
-} nghttp2_huff_decode_flag;
-
-typedef struct {
-  /* huffman decoding state, which is actually the node ID of internal
-     huffman tree.  We have 257 leaf nodes, but they are identical to
-     root node other than emitting a symbol, so we have 256 internal
-     nodes [1..255], inclusive. */
-  uint8_t state;
-  /* bitwise OR of zero or more of the nghttp2_huff_decode_flag */
-  uint8_t flags;
-  /* symbol if NGHTTP2_HUFF_SYM flag set */
-  uint8_t sym;
-} nghttp2_huff_decode;
-
-typedef nghttp2_huff_decode huff_decode_table_type[16];
-
-typedef struct {
-  /* Current huffman decoding state. We stripped leaf nodes, so the
-     value range is [0..255], inclusive. */
-  uint8_t state;
-  /* nonzero if we can say that the decoding process succeeds at this
-     state */
-  uint8_t accept;
-} nghttp2_hd_huff_decode_context;
-
-typedef struct {
-  /* The number of bits in this code */
-  uint32_t nbits;
-  /* Huffman code aligned to LSB */
-  uint32_t code;
-} nghttp2_huff_sym;
-
-extern const nghttp2_huff_sym huff_sym_table[];
-extern const nghttp2_huff_decode huff_decode_table[][16];
-
-#endif /* NGHTTP2_HD_HUFFMAN_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,551 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_helper.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "nghttp2_net.h"
-
-void nghttp2_put_uint16be(uint8_t *buf, uint16_t n) {
-  uint16_t x = htons(n);
-  memcpy(buf, &x, sizeof(uint16_t));
-}
-
-void nghttp2_put_uint32be(uint8_t *buf, uint32_t n) {
-  uint32_t x = htonl(n);
-  memcpy(buf, &x, sizeof(uint32_t));
-}
-
-uint16_t nghttp2_get_uint16(const uint8_t *data) {
-  uint16_t n;
-  memcpy(&n, data, sizeof(uint16_t));
-  return ntohs(n);
-}
-
-uint32_t nghttp2_get_uint32(const uint8_t *data) {
-  uint32_t n;
-  memcpy(&n, data, sizeof(uint32_t));
-  return ntohl(n);
-}
-
-/* Generated by gendowncasetbl.py */
-static const uint8_t DOWNCASE_TBL[] = {
-    0 /* NUL  */,   1 /* SOH  */,   2 /* STX  */,   3 /* ETX  */,
-    4 /* EOT  */,   5 /* ENQ  */,   6 /* ACK  */,   7 /* BEL  */,
-    8 /* BS   */,   9 /* HT   */,   10 /* LF   */,  11 /* VT   */,
-    12 /* FF   */,  13 /* CR   */,  14 /* SO   */,  15 /* SI   */,
-    16 /* DLE  */,  17 /* DC1  */,  18 /* DC2  */,  19 /* DC3  */,
-    20 /* DC4  */,  21 /* NAK  */,  22 /* SYN  */,  23 /* ETB  */,
-    24 /* CAN  */,  25 /* EM   */,  26 /* SUB  */,  27 /* ESC  */,
-    28 /* FS   */,  29 /* GS   */,  30 /* RS   */,  31 /* US   */,
-    32 /* SPC  */,  33 /* !    */,  34 /* "    */,  35 /* #    */,
-    36 /* $    */,  37 /* %    */,  38 /* &    */,  39 /* '    */,
-    40 /* (    */,  41 /* )    */,  42 /* *    */,  43 /* +    */,
-    44 /* ,    */,  45 /* -    */,  46 /* .    */,  47 /* /    */,
-    48 /* 0    */,  49 /* 1    */,  50 /* 2    */,  51 /* 3    */,
-    52 /* 4    */,  53 /* 5    */,  54 /* 6    */,  55 /* 7    */,
-    56 /* 8    */,  57 /* 9    */,  58 /* :    */,  59 /* ;    */,
-    60 /* <    */,  61 /* =    */,  62 /* >    */,  63 /* ?    */,
-    64 /* @    */,  97 /* A    */,  98 /* B    */,  99 /* C    */,
-    100 /* D    */, 101 /* E    */, 102 /* F    */, 103 /* G    */,
-    104 /* H    */, 105 /* I    */, 106 /* J    */, 107 /* K    */,
-    108 /* L    */, 109 /* M    */, 110 /* N    */, 111 /* O    */,
-    112 /* P    */, 113 /* Q    */, 114 /* R    */, 115 /* S    */,
-    116 /* T    */, 117 /* U    */, 118 /* V    */, 119 /* W    */,
-    120 /* X    */, 121 /* Y    */, 122 /* Z    */, 91 /* [    */,
-    92 /* \    */,  93 /* ]    */,  94 /* ^    */,  95 /* _    */,
-    96 /* `    */,  97 /* a    */,  98 /* b    */,  99 /* c    */,
-    100 /* d    */, 101 /* e    */, 102 /* f    */, 103 /* g    */,
-    104 /* h    */, 105 /* i    */, 106 /* j    */, 107 /* k    */,
-    108 /* l    */, 109 /* m    */, 110 /* n    */, 111 /* o    */,
-    112 /* p    */, 113 /* q    */, 114 /* r    */, 115 /* s    */,
-    116 /* t    */, 117 /* u    */, 118 /* v    */, 119 /* w    */,
-    120 /* x    */, 121 /* y    */, 122 /* z    */, 123 /* {    */,
-    124 /* |    */, 125 /* }    */, 126 /* ~    */, 127 /* DEL  */,
-    128 /* 0x80 */, 129 /* 0x81 */, 130 /* 0x82 */, 131 /* 0x83 */,
-    132 /* 0x84 */, 133 /* 0x85 */, 134 /* 0x86 */, 135 /* 0x87 */,
-    136 /* 0x88 */, 137 /* 0x89 */, 138 /* 0x8a */, 139 /* 0x8b */,
-    140 /* 0x8c */, 141 /* 0x8d */, 142 /* 0x8e */, 143 /* 0x8f */,
-    144 /* 0x90 */, 145 /* 0x91 */, 146 /* 0x92 */, 147 /* 0x93 */,
-    148 /* 0x94 */, 149 /* 0x95 */, 150 /* 0x96 */, 151 /* 0x97 */,
-    152 /* 0x98 */, 153 /* 0x99 */, 154 /* 0x9a */, 155 /* 0x9b */,
-    156 /* 0x9c */, 157 /* 0x9d */, 158 /* 0x9e */, 159 /* 0x9f */,
-    160 /* 0xa0 */, 161 /* 0xa1 */, 162 /* 0xa2 */, 163 /* 0xa3 */,
-    164 /* 0xa4 */, 165 /* 0xa5 */, 166 /* 0xa6 */, 167 /* 0xa7 */,
-    168 /* 0xa8 */, 169 /* 0xa9 */, 170 /* 0xaa */, 171 /* 0xab */,
-    172 /* 0xac */, 173 /* 0xad */, 174 /* 0xae */, 175 /* 0xaf */,
-    176 /* 0xb0 */, 177 /* 0xb1 */, 178 /* 0xb2 */, 179 /* 0xb3 */,
-    180 /* 0xb4 */, 181 /* 0xb5 */, 182 /* 0xb6 */, 183 /* 0xb7 */,
-    184 /* 0xb8 */, 185 /* 0xb9 */, 186 /* 0xba */, 187 /* 0xbb */,
-    188 /* 0xbc */, 189 /* 0xbd */, 190 /* 0xbe */, 191 /* 0xbf */,
-    192 /* 0xc0 */, 193 /* 0xc1 */, 194 /* 0xc2 */, 195 /* 0xc3 */,
-    196 /* 0xc4 */, 197 /* 0xc5 */, 198 /* 0xc6 */, 199 /* 0xc7 */,
-    200 /* 0xc8 */, 201 /* 0xc9 */, 202 /* 0xca */, 203 /* 0xcb */,
-    204 /* 0xcc */, 205 /* 0xcd */, 206 /* 0xce */, 207 /* 0xcf */,
-    208 /* 0xd0 */, 209 /* 0xd1 */, 210 /* 0xd2 */, 211 /* 0xd3 */,
-    212 /* 0xd4 */, 213 /* 0xd5 */, 214 /* 0xd6 */, 215 /* 0xd7 */,
-    216 /* 0xd8 */, 217 /* 0xd9 */, 218 /* 0xda */, 219 /* 0xdb */,
-    220 /* 0xdc */, 221 /* 0xdd */, 222 /* 0xde */, 223 /* 0xdf */,
-    224 /* 0xe0 */, 225 /* 0xe1 */, 226 /* 0xe2 */, 227 /* 0xe3 */,
-    228 /* 0xe4 */, 229 /* 0xe5 */, 230 /* 0xe6 */, 231 /* 0xe7 */,
-    232 /* 0xe8 */, 233 /* 0xe9 */, 234 /* 0xea */, 235 /* 0xeb */,
-    236 /* 0xec */, 237 /* 0xed */, 238 /* 0xee */, 239 /* 0xef */,
-    240 /* 0xf0 */, 241 /* 0xf1 */, 242 /* 0xf2 */, 243 /* 0xf3 */,
-    244 /* 0xf4 */, 245 /* 0xf5 */, 246 /* 0xf6 */, 247 /* 0xf7 */,
-    248 /* 0xf8 */, 249 /* 0xf9 */, 250 /* 0xfa */, 251 /* 0xfb */,
-    252 /* 0xfc */, 253 /* 0xfd */, 254 /* 0xfe */, 255 /* 0xff */,
-};
-
-void nghttp2_downcase(uint8_t *s, size_t len) {
-  size_t i;
-  for (i = 0; i < len; ++i) {
-    s[i] = DOWNCASE_TBL[s[i]];
-  }
-}
-
-/*
- *   local_window_size
- *   ^  *
- *   |  *    recv_window_size
- *   |  *  * ^
- *   |  *  * |
- *  0+++++++++
- *   |  *  *   \
- *   |  *  *   | This rage is hidden in flow control.  But it must be
- *   v  *  *   / kept in order to restore it when window size is enlarged.
- *   recv_reduction
- *   (+ for negative direction)
- *
- *   recv_window_size could be negative if we decrease
- *   local_window_size more than recv_window_size:
- *
- *   local_window_size
- *   ^  *
- *   |  *
- *   |  *
- *   0++++++++
- *   |  *    ^ recv_window_size (negative)
- *   |  *    |
- *   v  *  *
- *   recv_reduction
- */
-int nghttp2_adjust_local_window_size(int32_t *local_window_size_ptr,
-                                     int32_t *recv_window_size_ptr,
-                                     int32_t *recv_reduction_ptr,
-                                     int32_t *delta_ptr) {
-  if (*delta_ptr > 0) {
-    int32_t recv_reduction_delta;
-    int32_t delta;
-    int32_t new_recv_window_size =
-        nghttp2_max(0, *recv_window_size_ptr) - *delta_ptr;
-
-    if (new_recv_window_size >= 0) {
-      *recv_window_size_ptr = new_recv_window_size;
-      return 0;
-    }
-
-    delta = -new_recv_window_size;
-
-    /* The delta size is strictly more than received bytes. Increase
-       local_window_size by that difference |delta|. */
-    if (*local_window_size_ptr > NGHTTP2_MAX_WINDOW_SIZE - delta) {
-      return NGHTTP2_ERR_FLOW_CONTROL;
-    }
-    *local_window_size_ptr += delta;
-    /* If there is recv_reduction due to earlier window_size
-       reduction, we have to adjust it too. */
-    recv_reduction_delta = nghttp2_min(*recv_reduction_ptr, delta);
-    *recv_reduction_ptr -= recv_reduction_delta;
-    if (*recv_window_size_ptr < 0) {
-      *recv_window_size_ptr += recv_reduction_delta;
-    } else {
-      /* If *recv_window_size_ptr > 0, then those bytes are going to
-         be returned to the remote peer (by WINDOW_UPDATE with the
-         adjusted *delta_ptr), so it is effectively 0 now.  We set to
-         *recv_reduction_delta, because caller does not take into
-         account it in *delta_ptr. */
-      *recv_window_size_ptr = recv_reduction_delta;
-    }
-    /* recv_reduction_delta must be paid from *delta_ptr, since it was
-       added in window size reduction (see below). */
-    *delta_ptr -= recv_reduction_delta;
-
-    return 0;
-  }
-
-  if (*local_window_size_ptr + *delta_ptr < 0 ||
-      *recv_window_size_ptr < INT32_MIN - *delta_ptr ||
-      *recv_reduction_ptr > INT32_MAX + *delta_ptr) {
-    return NGHTTP2_ERR_FLOW_CONTROL;
-  }
-  /* Decreasing local window size. Note that we achieve this without
-     noticing to the remote peer. To do this, we cut
-     recv_window_size by -delta. This means that we don't send
-     WINDOW_UPDATE for -delta bytes. */
-  *local_window_size_ptr += *delta_ptr;
-  *recv_window_size_ptr += *delta_ptr;
-  *recv_reduction_ptr -= *delta_ptr;
-  *delta_ptr = 0;
-
-  return 0;
-}
-
-int nghttp2_increase_local_window_size(int32_t *local_window_size_ptr,
-                                       int32_t *recv_window_size_ptr,
-                                       int32_t *recv_reduction_ptr,
-                                       int32_t *delta_ptr) {
-  int32_t recv_reduction_delta;
-  int32_t delta;
-
-  delta = *delta_ptr;
-
-  assert(delta >= 0);
-
-  /* The delta size is strictly more than received bytes. Increase
-     local_window_size by that difference |delta|. */
-  if (*local_window_size_ptr > NGHTTP2_MAX_WINDOW_SIZE - delta) {
-    return NGHTTP2_ERR_FLOW_CONTROL;
-  }
-
-  *local_window_size_ptr += delta;
-  /* If there is recv_reduction due to earlier window_size
-     reduction, we have to adjust it too. */
-  recv_reduction_delta = nghttp2_min(*recv_reduction_ptr, delta);
-  *recv_reduction_ptr -= recv_reduction_delta;
-
-  *recv_window_size_ptr += recv_reduction_delta;
-
-  /* recv_reduction_delta must be paid from *delta_ptr, since it was
-     added in window size reduction (see below). */
-  *delta_ptr -= recv_reduction_delta;
-
-  return 0;
-}
-
-int nghttp2_should_send_window_update(int32_t local_window_size,
-                                      int32_t recv_window_size) {
-  return recv_window_size > 0 && recv_window_size >= local_window_size / 2;
-}
-
-const char *nghttp2_strerror(int error_code) {
-  switch (error_code) {
-  case 0:
-    return "Success";
-  case NGHTTP2_ERR_INVALID_ARGUMENT:
-    return "Invalid argument";
-  case NGHTTP2_ERR_BUFFER_ERROR:
-    return "Out of buffer space";
-  case NGHTTP2_ERR_UNSUPPORTED_VERSION:
-    return "Unsupported SPDY version";
-  case NGHTTP2_ERR_WOULDBLOCK:
-    return "Operation would block";
-  case NGHTTP2_ERR_PROTO:
-    return "Protocol error";
-  case NGHTTP2_ERR_INVALID_FRAME:
-    return "Invalid frame octets";
-  case NGHTTP2_ERR_EOF:
-    return "EOF";
-  case NGHTTP2_ERR_DEFERRED:
-    return "Data transfer deferred";
-  case NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE:
-    return "No more Stream ID available";
-  case NGHTTP2_ERR_STREAM_CLOSED:
-    return "Stream was already closed or invalid";
-  case NGHTTP2_ERR_STREAM_CLOSING:
-    return "Stream is closing";
-  case NGHTTP2_ERR_STREAM_SHUT_WR:
-    return "The transmission is not allowed for this stream";
-  case NGHTTP2_ERR_INVALID_STREAM_ID:
-    return "Stream ID is invalid";
-  case NGHTTP2_ERR_INVALID_STREAM_STATE:
-    return "Invalid stream state";
-  case NGHTTP2_ERR_DEFERRED_DATA_EXIST:
-    return "Another DATA frame has already been deferred";
-  case NGHTTP2_ERR_START_STREAM_NOT_ALLOWED:
-    return "request HEADERS is not allowed";
-  case NGHTTP2_ERR_GOAWAY_ALREADY_SENT:
-    return "GOAWAY has already been sent";
-  case NGHTTP2_ERR_INVALID_HEADER_BLOCK:
-    return "Invalid header block";
-  case NGHTTP2_ERR_INVALID_STATE:
-    return "Invalid state";
-  case NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE:
-    return "The user callback function failed due to the temporal error";
-  case NGHTTP2_ERR_FRAME_SIZE_ERROR:
-    return "The length of the frame is invalid";
-  case NGHTTP2_ERR_HEADER_COMP:
-    return "Header compression/decompression error";
-  case NGHTTP2_ERR_FLOW_CONTROL:
-    return "Flow control error";
-  case NGHTTP2_ERR_INSUFF_BUFSIZE:
-    return "Insufficient buffer size given to function";
-  case NGHTTP2_ERR_PAUSE:
-    return "Callback was paused by the application";
-  case NGHTTP2_ERR_TOO_MANY_INFLIGHT_SETTINGS:
-    return "Too many inflight SETTINGS";
-  case NGHTTP2_ERR_PUSH_DISABLED:
-    return "Server push is disabled by peer";
-  case NGHTTP2_ERR_DATA_EXIST:
-    return "DATA or HEADERS frame has already been submitted for the stream";
-  case NGHTTP2_ERR_SESSION_CLOSING:
-    return "The current session is closing";
-  case NGHTTP2_ERR_HTTP_HEADER:
-    return "Invalid HTTP header field was received";
-  case NGHTTP2_ERR_HTTP_MESSAGING:
-    return "Violation in HTTP messaging rule";
-  case NGHTTP2_ERR_REFUSED_STREAM:
-    return "Stream was refused";
-  case NGHTTP2_ERR_INTERNAL:
-    return "Internal error";
-  case NGHTTP2_ERR_CANCEL:
-    return "Cancel";
-  case NGHTTP2_ERR_SETTINGS_EXPECTED:
-    return "When a local endpoint expects to receive SETTINGS frame, it "
-           "receives an other type of frame";
-  case NGHTTP2_ERR_NOMEM:
-    return "Out of memory";
-  case NGHTTP2_ERR_CALLBACK_FAILURE:
-    return "The user callback function failed";
-  case NGHTTP2_ERR_BAD_CLIENT_MAGIC:
-    return "Received bad client magic byte string";
-  case NGHTTP2_ERR_FLOODED:
-    return "Flooding was detected in this HTTP/2 session, and it must be "
-           "closed";
-  default:
-    return "Unknown error code";
-  }
-}
-
-/* Generated by gennmchartbl.py */
-static int VALID_HD_NAME_CHARS[] = {
-    0 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */,
-    0 /* EOT  */, 0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */,
-    0 /* BS   */, 0 /* HT   */, 0 /* LF   */, 0 /* VT   */,
-    0 /* FF   */, 0 /* CR   */, 0 /* SO   */, 0 /* SI   */,
-    0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
-    0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */,
-    0 /* CAN  */, 0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */,
-    0 /* FS   */, 0 /* GS   */, 0 /* RS   */, 0 /* US   */,
-    0 /* SPC  */, 1 /* !    */, 0 /* "    */, 1 /* #    */,
-    1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
-    0 /* (    */, 0 /* )    */, 1 /* *    */, 1 /* +    */,
-    0 /* ,    */, 1 /* -    */, 1 /* .    */, 0 /* /    */,
-    1 /* 0    */, 1 /* 1    */, 1 /* 2    */, 1 /* 3    */,
-    1 /* 4    */, 1 /* 5    */, 1 /* 6    */, 1 /* 7    */,
-    1 /* 8    */, 1 /* 9    */, 0 /* :    */, 0 /* ;    */,
-    0 /* <    */, 0 /* =    */, 0 /* >    */, 0 /* ?    */,
-    0 /* @    */, 0 /* A    */, 0 /* B    */, 0 /* C    */,
-    0 /* D    */, 0 /* E    */, 0 /* F    */, 0 /* G    */,
-    0 /* H    */, 0 /* I    */, 0 /* J    */, 0 /* K    */,
-    0 /* L    */, 0 /* M    */, 0 /* N    */, 0 /* O    */,
-    0 /* P    */, 0 /* Q    */, 0 /* R    */, 0 /* S    */,
-    0 /* T    */, 0 /* U    */, 0 /* V    */, 0 /* W    */,
-    0 /* X    */, 0 /* Y    */, 0 /* Z    */, 0 /* [    */,
-    0 /* \    */, 0 /* ]    */, 1 /* ^    */, 1 /* _    */,
-    1 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
-    1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */,
-    1 /* h    */, 1 /* i    */, 1 /* j    */, 1 /* k    */,
-    1 /* l    */, 1 /* m    */, 1 /* n    */, 1 /* o    */,
-    1 /* p    */, 1 /* q    */, 1 /* r    */, 1 /* s    */,
-    1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
-    1 /* x    */, 1 /* y    */, 1 /* z    */, 0 /* {    */,
-    1 /* |    */, 0 /* }    */, 1 /* ~    */, 0 /* DEL  */,
-    0 /* 0x80 */, 0 /* 0x81 */, 0 /* 0x82 */, 0 /* 0x83 */,
-    0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */, 0 /* 0x87 */,
-    0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
-    0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */,
-    0 /* 0x90 */, 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */,
-    0 /* 0x94 */, 0 /* 0x95 */, 0 /* 0x96 */, 0 /* 0x97 */,
-    0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */, 0 /* 0x9b */,
-    0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
-    0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */,
-    0 /* 0xa4 */, 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */,
-    0 /* 0xa8 */, 0 /* 0xa9 */, 0 /* 0xaa */, 0 /* 0xab */,
-    0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */, 0 /* 0xaf */,
-    0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
-    0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */,
-    0 /* 0xb8 */, 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */,
-    0 /* 0xbc */, 0 /* 0xbd */, 0 /* 0xbe */, 0 /* 0xbf */,
-    0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */, 0 /* 0xc3 */,
-    0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
-    0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */,
-    0 /* 0xcc */, 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */,
-    0 /* 0xd0 */, 0 /* 0xd1 */, 0 /* 0xd2 */, 0 /* 0xd3 */,
-    0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */, 0 /* 0xd7 */,
-    0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
-    0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */,
-    0 /* 0xe0 */, 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */,
-    0 /* 0xe4 */, 0 /* 0xe5 */, 0 /* 0xe6 */, 0 /* 0xe7 */,
-    0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */, 0 /* 0xeb */,
-    0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
-    0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */,
-    0 /* 0xf4 */, 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */,
-    0 /* 0xf8 */, 0 /* 0xf9 */, 0 /* 0xfa */, 0 /* 0xfb */,
-    0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */, 0 /* 0xff */
-};
-
-int nghttp2_check_header_name(const uint8_t *name, size_t len) {
-  const uint8_t *last;
-  if (len == 0) {
-    return 0;
-  }
-  if (*name == ':') {
-    if (len == 1) {
-      return 0;
-    }
-    ++name;
-    --len;
-  }
-  for (last = name + len; name != last; ++name) {
-    if (!VALID_HD_NAME_CHARS[*name]) {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-/* Generated by genvchartbl.py */
-static int VALID_HD_VALUE_CHARS[] = {
-    0 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */,
-    0 /* EOT  */, 0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */,
-    0 /* BS   */, 1 /* HT   */, 0 /* LF   */, 0 /* VT   */,
-    0 /* FF   */, 0 /* CR   */, 0 /* SO   */, 0 /* SI   */,
-    0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
-    0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */,
-    0 /* CAN  */, 0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */,
-    0 /* FS   */, 0 /* GS   */, 0 /* RS   */, 0 /* US   */,
-    1 /* SPC  */, 1 /* !    */, 1 /* "    */, 1 /* #    */,
-    1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
-    1 /* (    */, 1 /* )    */, 1 /* *    */, 1 /* +    */,
-    1 /* ,    */, 1 /* -    */, 1 /* .    */, 1 /* /    */,
-    1 /* 0    */, 1 /* 1    */, 1 /* 2    */, 1 /* 3    */,
-    1 /* 4    */, 1 /* 5    */, 1 /* 6    */, 1 /* 7    */,
-    1 /* 8    */, 1 /* 9    */, 1 /* :    */, 1 /* ;    */,
-    1 /* <    */, 1 /* =    */, 1 /* >    */, 1 /* ?    */,
-    1 /* @    */, 1 /* A    */, 1 /* B    */, 1 /* C    */,
-    1 /* D    */, 1 /* E    */, 1 /* F    */, 1 /* G    */,
-    1 /* H    */, 1 /* I    */, 1 /* J    */, 1 /* K    */,
-    1 /* L    */, 1 /* M    */, 1 /* N    */, 1 /* O    */,
-    1 /* P    */, 1 /* Q    */, 1 /* R    */, 1 /* S    */,
-    1 /* T    */, 1 /* U    */, 1 /* V    */, 1 /* W    */,
-    1 /* X    */, 1 /* Y    */, 1 /* Z    */, 1 /* [    */,
-    1 /* \    */, 1 /* ]    */, 1 /* ^    */, 1 /* _    */,
-    1 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
-    1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */,
-    1 /* h    */, 1 /* i    */, 1 /* j    */, 1 /* k    */,
-    1 /* l    */, 1 /* m    */, 1 /* n    */, 1 /* o    */,
-    1 /* p    */, 1 /* q    */, 1 /* r    */, 1 /* s    */,
-    1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
-    1 /* x    */, 1 /* y    */, 1 /* z    */, 1 /* {    */,
-    1 /* |    */, 1 /* }    */, 1 /* ~    */, 0 /* DEL  */,
-    1 /* 0x80 */, 1 /* 0x81 */, 1 /* 0x82 */, 1 /* 0x83 */,
-    1 /* 0x84 */, 1 /* 0x85 */, 1 /* 0x86 */, 1 /* 0x87 */,
-    1 /* 0x88 */, 1 /* 0x89 */, 1 /* 0x8a */, 1 /* 0x8b */,
-    1 /* 0x8c */, 1 /* 0x8d */, 1 /* 0x8e */, 1 /* 0x8f */,
-    1 /* 0x90 */, 1 /* 0x91 */, 1 /* 0x92 */, 1 /* 0x93 */,
-    1 /* 0x94 */, 1 /* 0x95 */, 1 /* 0x96 */, 1 /* 0x97 */,
-    1 /* 0x98 */, 1 /* 0x99 */, 1 /* 0x9a */, 1 /* 0x9b */,
-    1 /* 0x9c */, 1 /* 0x9d */, 1 /* 0x9e */, 1 /* 0x9f */,
-    1 /* 0xa0 */, 1 /* 0xa1 */, 1 /* 0xa2 */, 1 /* 0xa3 */,
-    1 /* 0xa4 */, 1 /* 0xa5 */, 1 /* 0xa6 */, 1 /* 0xa7 */,
-    1 /* 0xa8 */, 1 /* 0xa9 */, 1 /* 0xaa */, 1 /* 0xab */,
-    1 /* 0xac */, 1 /* 0xad */, 1 /* 0xae */, 1 /* 0xaf */,
-    1 /* 0xb0 */, 1 /* 0xb1 */, 1 /* 0xb2 */, 1 /* 0xb3 */,
-    1 /* 0xb4 */, 1 /* 0xb5 */, 1 /* 0xb6 */, 1 /* 0xb7 */,
-    1 /* 0xb8 */, 1 /* 0xb9 */, 1 /* 0xba */, 1 /* 0xbb */,
-    1 /* 0xbc */, 1 /* 0xbd */, 1 /* 0xbe */, 1 /* 0xbf */,
-    1 /* 0xc0 */, 1 /* 0xc1 */, 1 /* 0xc2 */, 1 /* 0xc3 */,
-    1 /* 0xc4 */, 1 /* 0xc5 */, 1 /* 0xc6 */, 1 /* 0xc7 */,
-    1 /* 0xc8 */, 1 /* 0xc9 */, 1 /* 0xca */, 1 /* 0xcb */,
-    1 /* 0xcc */, 1 /* 0xcd */, 1 /* 0xce */, 1 /* 0xcf */,
-    1 /* 0xd0 */, 1 /* 0xd1 */, 1 /* 0xd2 */, 1 /* 0xd3 */,
-    1 /* 0xd4 */, 1 /* 0xd5 */, 1 /* 0xd6 */, 1 /* 0xd7 */,
-    1 /* 0xd8 */, 1 /* 0xd9 */, 1 /* 0xda */, 1 /* 0xdb */,
-    1 /* 0xdc */, 1 /* 0xdd */, 1 /* 0xde */, 1 /* 0xdf */,
-    1 /* 0xe0 */, 1 /* 0xe1 */, 1 /* 0xe2 */, 1 /* 0xe3 */,
-    1 /* 0xe4 */, 1 /* 0xe5 */, 1 /* 0xe6 */, 1 /* 0xe7 */,
-    1 /* 0xe8 */, 1 /* 0xe9 */, 1 /* 0xea */, 1 /* 0xeb */,
-    1 /* 0xec */, 1 /* 0xed */, 1 /* 0xee */, 1 /* 0xef */,
-    1 /* 0xf0 */, 1 /* 0xf1 */, 1 /* 0xf2 */, 1 /* 0xf3 */,
-    1 /* 0xf4 */, 1 /* 0xf5 */, 1 /* 0xf6 */, 1 /* 0xf7 */,
-    1 /* 0xf8 */, 1 /* 0xf9 */, 1 /* 0xfa */, 1 /* 0xfb */,
-    1 /* 0xfc */, 1 /* 0xfd */, 1 /* 0xfe */, 1 /* 0xff */
-};
-
-int nghttp2_check_header_value(const uint8_t *value, size_t len) {
-  const uint8_t *last;
-  for (last = value + len; value != last; ++value) {
-    if (!VALID_HD_VALUE_CHARS[*value]) {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-uint8_t *nghttp2_cpymem(uint8_t *dest, const void *src, size_t len) {
-  if (len == 0) {
-    return dest;
-  }
-
-  memcpy(dest, src, len);
-
-  return dest + len;
-}
-
-const char *nghttp2_http2_strerror(uint32_t error_code) {
-  switch (error_code) {
-  case NGHTTP2_NO_ERROR:
-    return "NO_ERROR";
-  case NGHTTP2_PROTOCOL_ERROR:
-    return "PROTOCOL_ERROR";
-  case NGHTTP2_INTERNAL_ERROR:
-    return "INTERNAL_ERROR";
-  case NGHTTP2_FLOW_CONTROL_ERROR:
-    return "FLOW_CONTROL_ERROR";
-  case NGHTTP2_SETTINGS_TIMEOUT:
-    return "SETTINGS_TIMEOUT";
-  case NGHTTP2_STREAM_CLOSED:
-    return "STREAM_CLOSED";
-  case NGHTTP2_FRAME_SIZE_ERROR:
-    return "FRAME_SIZE_ERROR";
-  case NGHTTP2_REFUSED_STREAM:
-    return "REFUSED_STREAM";
-  case NGHTTP2_CANCEL:
-    return "CANCEL";
-  case NGHTTP2_COMPRESSION_ERROR:
-    return "COMPRESSION_ERROR";
-  case NGHTTP2_CONNECT_ERROR:
-    return "CONNECT_ERROR";
-  case NGHTTP2_ENHANCE_YOUR_CALM:
-    return "ENHANCE_YOUR_CALM";
-  case NGHTTP2_INADEQUATE_SECURITY:
-    return "INADEQUATE_SECURITY";
-  case NGHTTP2_HTTP_1_1_REQUIRED:
-    return "HTTP_1_1_REQUIRED";
-  default:
-    return "unknown";
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_helper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_HELPER_H
-#define NGHTTP2_HELPER_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <string.h>
-#include <stddef.h>
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_mem.h"
-
-#define nghttp2_min(A, B) ((A) < (B) ? (A) : (B))
-#define nghttp2_max(A, B) ((A) > (B) ? (A) : (B))
-
-#define lstreq(A, B, N) ((sizeof((A)) - 1) == (N) && memcmp((A), (B), (N)) == 0)
-
-#define nghttp2_struct_of(ptr, type, member)                                   \
-  ((type *)(void *)((char *)(ptr)-offsetof(type, member)))
-
-/*
- * Copies 2 byte unsigned integer |n| in host byte order to |buf| in
- * network byte order.
- */
-void nghttp2_put_uint16be(uint8_t *buf, uint16_t n);
-
-/*
- * Copies 4 byte unsigned integer |n| in host byte order to |buf| in
- * network byte order.
- */
-void nghttp2_put_uint32be(uint8_t *buf, uint32_t n);
-
-/*
- * Retrieves 2 byte unsigned integer stored in |data| in network byte
- * order and returns it in host byte order.
- */
-uint16_t nghttp2_get_uint16(const uint8_t *data);
-
-/*
- * Retrieves 4 byte unsigned integer stored in |data| in network byte
- * order and returns it in host byte order.
- */
-uint32_t nghttp2_get_uint32(const uint8_t *data);
-
-void nghttp2_downcase(uint8_t *s, size_t len);
-
-/*
- * Adjusts |*local_window_size_ptr|, |*recv_window_size_ptr|,
- * |*recv_reduction_ptr| with |*delta_ptr| which is the
- * WINDOW_UPDATE's window_size_increment sent from local side. If
- * |delta| is strictly larger than |*recv_window_size_ptr|,
- * |*local_window_size_ptr| is increased by delta -
- * *recv_window_size_ptr. If |delta| is negative,
- * |*local_window_size_ptr| is decreased by delta.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_FLOW_CONTROL
- *     local_window_size overflow or gets negative.
- */
-int nghttp2_adjust_local_window_size(int32_t *local_window_size_ptr,
-                                     int32_t *recv_window_size_ptr,
-                                     int32_t *recv_reduction_ptr,
-                                     int32_t *delta_ptr);
-
-/*
- * This function works like nghttp2_adjust_local_window_size().  The
- * difference is that this function assumes *delta_ptr >= 0, and
- * *recv_window_size_ptr is not decreased by *delta_ptr.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_FLOW_CONTROL
- *     local_window_size overflow or gets negative.
- */
-int nghttp2_increase_local_window_size(int32_t *local_window_size_ptr,
-                                       int32_t *recv_window_size_ptr,
-                                       int32_t *recv_reduction_ptr,
-                                       int32_t *delta_ptr);
-
-/*
- * Returns non-zero if the function decided that WINDOW_UPDATE should
- * be sent.
- */
-int nghttp2_should_send_window_update(int32_t local_window_size,
-                                      int32_t recv_window_size);
-
-/*
- * Copies the buffer |src| of length |len| to the destination pointed
- * by the |dest|, assuming that the |dest| is at lest |len| bytes long
- * . Returns dest + len.
- */
-uint8_t *nghttp2_cpymem(uint8_t *dest, const void *src, size_t len);
-
-#endif /* NGHTTP2_HELPER_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,596 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_http.h"
-
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-
-#include "nghttp2_hd.h"
-#include "nghttp2_helper.h"
-
-static uint8_t downcase(uint8_t c) {
-  return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;
-}
-
-static int memieq(const void *a, const void *b, size_t n) {
-  size_t i;
-  const uint8_t *aa = a, *bb = b;
-
-  for (i = 0; i < n; ++i) {
-    if (downcase(aa[i]) != downcase(bb[i])) {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-#define lstrieq(A, B, N) ((sizeof((A)) - 1) == (N) && memieq((A), (B), (N)))
-
-static int64_t parse_uint(const uint8_t *s, size_t len) {
-  int64_t n = 0;
-  size_t i;
-  if (len == 0) {
-    return -1;
-  }
-  for (i = 0; i < len; ++i) {
-    if ('0' <= s[i] && s[i] <= '9') {
-      if (n > INT64_MAX / 10) {
-        return -1;
-      }
-      n *= 10;
-      if (n > INT64_MAX - (s[i] - '0')) {
-        return -1;
-      }
-      n += s[i] - '0';
-      continue;
-    }
-    return -1;
-  }
-  return n;
-}
-
-static int lws(const uint8_t *s, size_t n) {
-  size_t i;
-  for (i = 0; i < n; ++i) {
-    if (s[i] != ' ' && s[i] != '\t') {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-static int check_pseudo_header(nghttp2_stream *stream, const nghttp2_hd_nv *nv,
-                               int flag) {
-  if (stream->http_flags & flag) {
-    return 0;
-  }
-  if (lws(nv->value->base, nv->value->len)) {
-    return 0;
-  }
-  stream->http_flags = (uint16_t)(stream->http_flags | flag);
-  return 1;
-}
-
-static int expect_response_body(nghttp2_stream *stream) {
-  return (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_HEAD) == 0 &&
-         stream->status_code / 100 != 1 && stream->status_code != 304 &&
-         stream->status_code != 204;
-}
-
-/* For "http" or "https" URIs, OPTIONS request may have "*" in :path
-   header field to represent system-wide OPTIONS request.  Otherwise,
-   :path header field value must start with "/".  This function must
-   be called after ":method" header field was received.  This function
-   returns nonzero if path is valid.*/
-static int check_path(nghttp2_stream *stream) {
-  return (stream->http_flags & NGHTTP2_HTTP_FLAG_SCHEME_HTTP) == 0 ||
-         ((stream->http_flags & NGHTTP2_HTTP_FLAG_PATH_REGULAR) ||
-          ((stream->http_flags & NGHTTP2_HTTP_FLAG_METH_OPTIONS) &&
-           (stream->http_flags & NGHTTP2_HTTP_FLAG_PATH_ASTERISK)));
-}
-
-static int http_request_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
-                                  int trailer) {
-  if (nv->name->base[0] == ':') {
-    if (trailer ||
-        (stream->http_flags & NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-  }
-
-  switch (nv->token) {
-  case NGHTTP2_TOKEN__AUTHORITY:
-    if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__AUTHORITY)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  case NGHTTP2_TOKEN__METHOD:
-    if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__METHOD)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    switch (nv->value->len) {
-    case 4:
-      if (lstreq("HEAD", nv->value->base, nv->value->len)) {
-        stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_HEAD;
-      }
-      break;
-    case 7:
-      switch (nv->value->base[6]) {
-      case 'T':
-        if (lstreq("CONNECT", nv->value->base, nv->value->len)) {
-          if (stream->stream_id % 2 == 0) {
-            /* we won't allow CONNECT for push */
-            return NGHTTP2_ERR_HTTP_HEADER;
-          }
-          stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_CONNECT;
-          if (stream->http_flags &
-              (NGHTTP2_HTTP_FLAG__PATH | NGHTTP2_HTTP_FLAG__SCHEME)) {
-            return NGHTTP2_ERR_HTTP_HEADER;
-          }
-        }
-        break;
-      case 'S':
-        if (lstreq("OPTIONS", nv->value->base, nv->value->len)) {
-          stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_OPTIONS;
-        }
-        break;
-      }
-      break;
-    }
-    break;
-  case NGHTTP2_TOKEN__PATH:
-    if (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__PATH)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    if (nv->value->base[0] == '/') {
-      stream->http_flags |= NGHTTP2_HTTP_FLAG_PATH_REGULAR;
-    } else if (nv->value->len == 1 && nv->value->base[0] == '*') {
-      stream->http_flags |= NGHTTP2_HTTP_FLAG_PATH_ASTERISK;
-    }
-    break;
-  case NGHTTP2_TOKEN__SCHEME:
-    if (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__SCHEME)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    if ((nv->value->len == 4 && memieq("http", nv->value->base, 4)) ||
-        (nv->value->len == 5 && memieq("https", nv->value->base, 5))) {
-      stream->http_flags |= NGHTTP2_HTTP_FLAG_SCHEME_HTTP;
-    }
-    break;
-  case NGHTTP2_TOKEN_HOST:
-    if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG_HOST)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  case NGHTTP2_TOKEN_CONTENT_LENGTH: {
-    if (stream->content_length != -1) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    stream->content_length = parse_uint(nv->value->base, nv->value->len);
-    if (stream->content_length == -1) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  }
-  /* disallowed header fields */
-  case NGHTTP2_TOKEN_CONNECTION:
-  case NGHTTP2_TOKEN_KEEP_ALIVE:
-  case NGHTTP2_TOKEN_PROXY_CONNECTION:
-  case NGHTTP2_TOKEN_TRANSFER_ENCODING:
-  case NGHTTP2_TOKEN_UPGRADE:
-    return NGHTTP2_ERR_HTTP_HEADER;
-  case NGHTTP2_TOKEN_TE:
-    if (!lstrieq("trailers", nv->value->base, nv->value->len)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  default:
-    if (nv->name->base[0] == ':') {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-  }
-
-  if (nv->name->base[0] != ':') {
-    stream->http_flags |= NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED;
-  }
-
-  return 0;
-}
-
-static int http_response_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
-                                   int trailer) {
-  if (nv->name->base[0] == ':') {
-    if (trailer ||
-        (stream->http_flags & NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-  }
-
-  switch (nv->token) {
-  case NGHTTP2_TOKEN__STATUS: {
-    if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__STATUS)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    if (nv->value->len != 3) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    stream->status_code = (int16_t)parse_uint(nv->value->base, nv->value->len);
-    if (stream->status_code == -1 || stream->status_code == 101) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  }
-  case NGHTTP2_TOKEN_CONTENT_LENGTH: {
-    if (stream->status_code == 204) {
-      /* content-length header field in 204 response is prohibited by
-         RFC 7230.  But some widely used servers send content-length:
-         0.  Until they get fixed, we ignore it. */
-      if (stream->content_length != -1) {
-        /* Found multiple content-length field */
-        return NGHTTP2_ERR_HTTP_HEADER;
-      }
-      if (!lstrieq("0", nv->value->base, nv->value->len)) {
-        return NGHTTP2_ERR_HTTP_HEADER;
-      }
-      stream->content_length = 0;
-      return NGHTTP2_ERR_REMOVE_HTTP_HEADER;
-    }
-    if (stream->status_code / 100 == 1 ||
-        (stream->status_code == 200 &&
-         (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT))) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    if (stream->content_length != -1) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    stream->content_length = parse_uint(nv->value->base, nv->value->len);
-    if (stream->content_length == -1) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  }
-  /* disallowed header fields */
-  case NGHTTP2_TOKEN_CONNECTION:
-  case NGHTTP2_TOKEN_KEEP_ALIVE:
-  case NGHTTP2_TOKEN_PROXY_CONNECTION:
-  case NGHTTP2_TOKEN_TRANSFER_ENCODING:
-  case NGHTTP2_TOKEN_UPGRADE:
-    return NGHTTP2_ERR_HTTP_HEADER;
-  case NGHTTP2_TOKEN_TE:
-    if (!lstrieq("trailers", nv->value->base, nv->value->len)) {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    break;
-  default:
-    if (nv->name->base[0] == ':') {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-  }
-
-  if (nv->name->base[0] != ':') {
-    stream->http_flags |= NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED;
-  }
-
-  return 0;
-}
-
-/* Generated by genauthroitychartbl.py */
-static char VALID_AUTHORITY_CHARS[] = {
-    0 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */,
-    0 /* EOT  */, 0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */,
-    0 /* BS   */, 0 /* HT   */, 0 /* LF   */, 0 /* VT   */,
-    0 /* FF   */, 0 /* CR   */, 0 /* SO   */, 0 /* SI   */,
-    0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
-    0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */,
-    0 /* CAN  */, 0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */,
-    0 /* FS   */, 0 /* GS   */, 0 /* RS   */, 0 /* US   */,
-    0 /* SPC  */, 1 /* !    */, 0 /* "    */, 0 /* #    */,
-    1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
-    1 /* (    */, 1 /* )    */, 1 /* *    */, 1 /* +    */,
-    1 /* ,    */, 1 /* -    */, 1 /* .    */, 0 /* /    */,
-    1 /* 0    */, 1 /* 1    */, 1 /* 2    */, 1 /* 3    */,
-    1 /* 4    */, 1 /* 5    */, 1 /* 6    */, 1 /* 7    */,
-    1 /* 8    */, 1 /* 9    */, 1 /* :    */, 1 /* ;    */,
-    0 /* <    */, 1 /* =    */, 0 /* >    */, 0 /* ?    */,
-    1 /* @    */, 1 /* A    */, 1 /* B    */, 1 /* C    */,
-    1 /* D    */, 1 /* E    */, 1 /* F    */, 1 /* G    */,
-    1 /* H    */, 1 /* I    */, 1 /* J    */, 1 /* K    */,
-    1 /* L    */, 1 /* M    */, 1 /* N    */, 1 /* O    */,
-    1 /* P    */, 1 /* Q    */, 1 /* R    */, 1 /* S    */,
-    1 /* T    */, 1 /* U    */, 1 /* V    */, 1 /* W    */,
-    1 /* X    */, 1 /* Y    */, 1 /* Z    */, 1 /* [    */,
-    0 /* \    */, 1 /* ]    */, 0 /* ^    */, 1 /* _    */,
-    0 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
-    1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */,
-    1 /* h    */, 1 /* i    */, 1 /* j    */, 1 /* k    */,
-    1 /* l    */, 1 /* m    */, 1 /* n    */, 1 /* o    */,
-    1 /* p    */, 1 /* q    */, 1 /* r    */, 1 /* s    */,
-    1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
-    1 /* x    */, 1 /* y    */, 1 /* z    */, 0 /* {    */,
-    0 /* |    */, 0 /* }    */, 1 /* ~    */, 0 /* DEL  */,
-    0 /* 0x80 */, 0 /* 0x81 */, 0 /* 0x82 */, 0 /* 0x83 */,
-    0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */, 0 /* 0x87 */,
-    0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
-    0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */,
-    0 /* 0x90 */, 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */,
-    0 /* 0x94 */, 0 /* 0x95 */, 0 /* 0x96 */, 0 /* 0x97 */,
-    0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */, 0 /* 0x9b */,
-    0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
-    0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */,
-    0 /* 0xa4 */, 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */,
-    0 /* 0xa8 */, 0 /* 0xa9 */, 0 /* 0xaa */, 0 /* 0xab */,
-    0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */, 0 /* 0xaf */,
-    0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
-    0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */,
-    0 /* 0xb8 */, 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */,
-    0 /* 0xbc */, 0 /* 0xbd */, 0 /* 0xbe */, 0 /* 0xbf */,
-    0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */, 0 /* 0xc3 */,
-    0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
-    0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */,
-    0 /* 0xcc */, 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */,
-    0 /* 0xd0 */, 0 /* 0xd1 */, 0 /* 0xd2 */, 0 /* 0xd3 */,
-    0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */, 0 /* 0xd7 */,
-    0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
-    0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */,
-    0 /* 0xe0 */, 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */,
-    0 /* 0xe4 */, 0 /* 0xe5 */, 0 /* 0xe6 */, 0 /* 0xe7 */,
-    0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */, 0 /* 0xeb */,
-    0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
-    0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */,
-    0 /* 0xf4 */, 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */,
-    0 /* 0xf8 */, 0 /* 0xf9 */, 0 /* 0xfa */, 0 /* 0xfb */,
-    0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */, 0 /* 0xff */
-};
-
-static int check_authority(const uint8_t *value, size_t len) {
-  const uint8_t *last;
-  for (last = value + len; value != last; ++value) {
-    if (!VALID_AUTHORITY_CHARS[*value]) {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-static int check_scheme(const uint8_t *value, size_t len) {
-  const uint8_t *last;
-  if (len == 0) {
-    return 0;
-  }
-
-  if (!(('A' <= *value && *value <= 'Z') || ('a' <= *value && *value <= 'z'))) {
-    return 0;
-  }
-
-  last = value + len;
-  ++value;
-
-  for (; value != last; ++value) {
-    if (!(('A' <= *value && *value <= 'Z') ||
-          ('a' <= *value && *value <= 'z') ||
-          ('0' <= *value && *value <= '9') || *value == '+' || *value == '-' ||
-          *value == '.')) {
-      return 0;
-    }
-  }
-  return 1;
-}
-
-int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
-                           nghttp2_frame *frame, nghttp2_hd_nv *nv,
-                           int trailer) {
-  int rv;
-
-  /* We are strict for pseudo header field.  One bad character should
-     lead to fail.  OTOH, we should be a bit forgiving for regular
-     headers, since existing public internet has so much illegal
-     headers floating around and if we kill the stream because of
-     this, we may disrupt many web sites and/or libraries.  So we
-     become conservative here, and just ignore those illegal regular
-     headers. */
-  if (!nghttp2_check_header_name(nv->name->base, nv->name->len)) {
-    size_t i;
-    if (nv->name->len > 0 && nv->name->base[0] == ':') {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    /* header field name must be lower-cased without exception */
-    for (i = 0; i < nv->name->len; ++i) {
-      uint8_t c = nv->name->base[i];
-      if ('A' <= c && c <= 'Z') {
-        return NGHTTP2_ERR_HTTP_HEADER;
-      }
-    }
-    /* When ignoring regular headers, we set this flag so that we
-       still enforce header field ordering rule for pseudo header
-       fields. */
-    stream->http_flags |= NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED;
-    return NGHTTP2_ERR_IGN_HTTP_HEADER;
-  }
-
-  if (nv->token == NGHTTP2_TOKEN__AUTHORITY ||
-      nv->token == NGHTTP2_TOKEN_HOST) {
-    rv = check_authority(nv->value->base, nv->value->len);
-  } else if (nv->token == NGHTTP2_TOKEN__SCHEME) {
-    rv = check_scheme(nv->value->base, nv->value->len);
-  } else {
-    rv = nghttp2_check_header_value(nv->value->base, nv->value->len);
-  }
-
-  if (rv == 0) {
-    assert(nv->name->len > 0);
-    if (nv->name->base[0] == ':') {
-      return NGHTTP2_ERR_HTTP_HEADER;
-    }
-    /* When ignoring regular headers, we set this flag so that we
-       still enforce header field ordering rule for pseudo header
-       fields. */
-    stream->http_flags |= NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED;
-    return NGHTTP2_ERR_IGN_HTTP_HEADER;
-  }
-
-  if (session->server || frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-    return http_request_on_header(stream, nv, trailer);
-  }
-
-  return http_response_on_header(stream, nv, trailer);
-}
-
-int nghttp2_http_on_request_headers(nghttp2_stream *stream,
-                                    nghttp2_frame *frame) {
-  if (stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT) {
-    if ((stream->http_flags & NGHTTP2_HTTP_FLAG__AUTHORITY) == 0) {
-      return -1;
-    }
-    stream->content_length = -1;
-  } else {
-    if ((stream->http_flags & NGHTTP2_HTTP_FLAG_REQ_HEADERS) !=
-            NGHTTP2_HTTP_FLAG_REQ_HEADERS ||
-        (stream->http_flags &
-         (NGHTTP2_HTTP_FLAG__AUTHORITY | NGHTTP2_HTTP_FLAG_HOST)) == 0) {
-      return -1;
-    }
-    if (!check_path(stream)) {
-      return -1;
-    }
-  }
-
-  if (frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-    /* we are going to reuse data fields for upcoming response.  Clear
-       them now, except for method flags. */
-    stream->http_flags &= NGHTTP2_HTTP_FLAG_METH_ALL;
-    stream->content_length = -1;
-  }
-
-  return 0;
-}
-
-int nghttp2_http_on_response_headers(nghttp2_stream *stream) {
-  if ((stream->http_flags & NGHTTP2_HTTP_FLAG__STATUS) == 0) {
-    return -1;
-  }
-
-  if (stream->status_code / 100 == 1) {
-    /* non-final response */
-    stream->http_flags =
-        (uint16_t)((stream->http_flags & NGHTTP2_HTTP_FLAG_METH_ALL) |
-                   NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE);
-    stream->content_length = -1;
-    stream->status_code = -1;
-    return 0;
-  }
-
-  stream->http_flags =
-      (uint16_t)(stream->http_flags & ~NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE);
-
-  if (!expect_response_body(stream)) {
-    stream->content_length = 0;
-  } else if (stream->http_flags & (NGHTTP2_HTTP_FLAG_METH_CONNECT |
-                                   NGHTTP2_HTTP_FLAG_METH_UPGRADE_WORKAROUND)) {
-    stream->content_length = -1;
-  }
-
-  return 0;
-}
-
-int nghttp2_http_on_trailer_headers(nghttp2_stream *stream,
-                                    nghttp2_frame *frame) {
-  (void)stream;
-
-  if ((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int nghttp2_http_on_remote_end_stream(nghttp2_stream *stream) {
-  if (stream->http_flags & NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE) {
-    return -1;
-  }
-
-  if (stream->content_length != -1 &&
-      stream->content_length != stream->recv_content_length) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int nghttp2_http_on_data_chunk(nghttp2_stream *stream, size_t n) {
-  stream->recv_content_length += (int64_t)n;
-
-  if ((stream->http_flags & NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE) ||
-      (stream->content_length != -1 &&
-       stream->recv_content_length > stream->content_length)) {
-    return -1;
-  }
-
-  return 0;
-}
-
-void nghttp2_http_record_request_method(nghttp2_stream *stream,
-                                        nghttp2_frame *frame) {
-  const nghttp2_nv *nva;
-  size_t nvlen;
-  size_t i;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    nva = frame->headers.nva;
-    nvlen = frame->headers.nvlen;
-    break;
-  case NGHTTP2_PUSH_PROMISE:
-    nva = frame->push_promise.nva;
-    nvlen = frame->push_promise.nvlen;
-    break;
-  default:
-    return;
-  }
-
-  /* TODO we should do this strictly. */
-  for (i = 0; i < nvlen; ++i) {
-    const nghttp2_nv *nv = &nva[i];
-    if (!(nv->namelen == 7 && nv->name[6] == 'd' &&
-          memcmp(":metho", nv->name, nv->namelen - 1) == 0)) {
-      continue;
-    }
-    if (lstreq("CONNECT", nv->value, nv->valuelen)) {
-      stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_CONNECT;
-      return;
-    }
-    if (lstreq("HEAD", nv->value, nv->valuelen)) {
-      stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_HEAD;
-      return;
-    }
-    return;
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_http.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_HTTP_H
-#define NGHTTP2_HTTP_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_session.h"
-#include "nghttp2_stream.h"
-
-/*
- * This function is called when HTTP header field |nv| in |frame| is
- * received for |stream|.  This function will validate |nv| against
- * the current state of stream.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_HTTP_HEADER
- *     Invalid HTTP header field was received.
- * NGHTTP2_ERR_IGN_HTTP_HEADER
- *     Invalid HTTP header field was received but it can be treated as
- *     if it was not received because of compatibility reasons.
- */
-int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
-                           nghttp2_frame *frame, nghttp2_hd_nv *nv,
-                           int trailer);
-
-/*
- * This function is called when request header is received.  This
- * function performs validation and returns 0 if it succeeds, or -1.
- */
-int nghttp2_http_on_request_headers(nghttp2_stream *stream,
-                                    nghttp2_frame *frame);
-
-/*
- * This function is called when response header is received.  This
- * function performs validation and returns 0 if it succeeds, or -1.
- */
-int nghttp2_http_on_response_headers(nghttp2_stream *stream);
-
-/*
- * This function is called trailer header (for both request and
- * response) is received.  This function performs validation and
- * returns 0 if it succeeds, or -1.
- */
-int nghttp2_http_on_trailer_headers(nghttp2_stream *stream,
-                                    nghttp2_frame *frame);
-
-/*
- * This function is called when END_STREAM flag is seen in incoming
- * frame.  This function performs validation and returns 0 if it
- * succeeds, or -1.
- */
-int nghttp2_http_on_remote_end_stream(nghttp2_stream *stream);
-
-/*
- * This function is called when chunk of data is received.  This
- * function performs validation and returns 0 if it succeeds, or -1.
- */
-int nghttp2_http_on_data_chunk(nghttp2_stream *stream, size_t n);
-
-/*
- * This function inspects header field in |frame| and records its
- * method in stream->http_flags.  If frame->hd.type is neither
- * NGHTTP2_HEADERS nor NGHTTP2_PUSH_PROMISE, this function does
- * nothing.
- */
-void nghttp2_http_record_request_method(nghttp2_stream *stream,
-                                        nghttp2_frame *frame);
-
-#endif /* NGHTTP2_HTTP_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_int.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_int.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_int.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_int.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_INT_H
-#define NGHTTP2_INT_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-/* Macros, types and constants for internal use */
-
-/* "less" function, return nonzero if |lhs| is less than |rhs|. */
-typedef int (*nghttp2_less)(const void *lhs, const void *rhs);
-
-/* Internal error code. They must be in the range [-499, -100],
-   inclusive. */
-typedef enum {
-  NGHTTP2_ERR_CREDENTIAL_PENDING = -101,
-  NGHTTP2_ERR_IGN_HEADER_BLOCK = -103,
-  NGHTTP2_ERR_IGN_PAYLOAD = -104,
-  /*
-   * Invalid HTTP header field was received but it can be treated as
-   * if it was not received because of compatibility reasons.
-   */
-  NGHTTP2_ERR_IGN_HTTP_HEADER = -105,
-  /*
-   * Invalid HTTP header field was received, and it is ignored.
-   * Unlike NGHTTP2_ERR_IGN_HTTP_HEADER, this does not invoke
-   * nghttp2_on_invalid_header_callback.
-   */
-  NGHTTP2_ERR_REMOVE_HTTP_HEADER = -106
-} nghttp2_internal_error;
-
-#endif /* NGHTTP2_INT_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,189 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_map.h"
-
-#include <string.h>
-
-#define INITIAL_TABLE_LENGTH 256
-
-int nghttp2_map_init(nghttp2_map *map, nghttp2_mem *mem) {
-  map->mem = mem;
-  map->tablelen = INITIAL_TABLE_LENGTH;
-  map->table =
-      nghttp2_mem_calloc(mem, map->tablelen, sizeof(nghttp2_map_entry *));
-  if (map->table == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  map->size = 0;
-
-  return 0;
-}
-
-void nghttp2_map_free(nghttp2_map *map) {
-  nghttp2_mem_free(map->mem, map->table);
-}
-
-void nghttp2_map_each_free(nghttp2_map *map,
-                           int (*func)(nghttp2_map_entry *entry, void *ptr),
-                           void *ptr) {
-  uint32_t i;
-  for (i = 0; i < map->tablelen; ++i) {
-    nghttp2_map_entry *entry;
-    for (entry = map->table[i]; entry;) {
-      nghttp2_map_entry *next = entry->next;
-      func(entry, ptr);
-      entry = next;
-    }
-    map->table[i] = NULL;
-  }
-}
-
-int nghttp2_map_each(nghttp2_map *map,
-                     int (*func)(nghttp2_map_entry *entry, void *ptr),
-                     void *ptr) {
-  int rv;
-  uint32_t i;
-  for (i = 0; i < map->tablelen; ++i) {
-    nghttp2_map_entry *entry;
-    for (entry = map->table[i]; entry; entry = entry->next) {
-      rv = func(entry, ptr);
-      if (rv != 0) {
-        return rv;
-      }
-    }
-  }
-  return 0;
-}
-
-void nghttp2_map_entry_init(nghttp2_map_entry *entry, key_type key) {
-  entry->key = key;
-  entry->next = NULL;
-}
-
-/* Same hash function in android HashMap source code. */
-/* The |mod| must be power of 2 */
-static uint32_t hash(int32_t key, uint32_t mod) {
-  uint32_t h = (uint32_t)key;
-  h ^= (h >> 20) ^ (h >> 12);
-  h ^= (h >> 7) ^ (h >> 4);
-  return h & (mod - 1);
-}
-
-static int insert(nghttp2_map_entry **table, uint32_t tablelen,
-                  nghttp2_map_entry *entry) {
-  uint32_t h = hash(entry->key, tablelen);
-  if (table[h] == NULL) {
-    table[h] = entry;
-  } else {
-    nghttp2_map_entry *p;
-    /* We won't allow duplicated key, so check it out. */
-    for (p = table[h]; p; p = p->next) {
-      if (p->key == entry->key) {
-        return NGHTTP2_ERR_INVALID_ARGUMENT;
-      }
-    }
-    entry->next = table[h];
-    table[h] = entry;
-  }
-  return 0;
-}
-
-/* new_tablelen must be power of 2 */
-static int resize(nghttp2_map *map, uint32_t new_tablelen) {
-  uint32_t i;
-  nghttp2_map_entry **new_table;
-
-  new_table =
-      nghttp2_mem_calloc(map->mem, new_tablelen, sizeof(nghttp2_map_entry *));
-  if (new_table == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  for (i = 0; i < map->tablelen; ++i) {
-    nghttp2_map_entry *entry;
-    for (entry = map->table[i]; entry;) {
-      nghttp2_map_entry *next = entry->next;
-      entry->next = NULL;
-      /* This function must succeed */
-      insert(new_table, new_tablelen, entry);
-      entry = next;
-    }
-  }
-  nghttp2_mem_free(map->mem, map->table);
-  map->tablelen = new_tablelen;
-  map->table = new_table;
-
-  return 0;
-}
-
-int nghttp2_map_insert(nghttp2_map *map, nghttp2_map_entry *new_entry) {
-  int rv;
-  /* Load factor is 0.75 */
-  if ((map->size + 1) * 4 > map->tablelen * 3) {
-    rv = resize(map, map->tablelen * 2);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-  rv = insert(map->table, map->tablelen, new_entry);
-  if (rv != 0) {
-    return rv;
-  }
-  ++map->size;
-  return 0;
-}
-
-nghttp2_map_entry *nghttp2_map_find(nghttp2_map *map, key_type key) {
-  uint32_t h;
-  nghttp2_map_entry *entry;
-  h = hash(key, map->tablelen);
-  for (entry = map->table[h]; entry; entry = entry->next) {
-    if (entry->key == key) {
-      return entry;
-    }
-  }
-  return NULL;
-}
-
-int nghttp2_map_remove(nghttp2_map *map, key_type key) {
-  uint32_t h;
-  nghttp2_map_entry **dst;
-
-  h = hash(key, map->tablelen);
-
-  for (dst = &map->table[h]; *dst; dst = &(*dst)->next) {
-    if ((*dst)->key != key) {
-      continue;
-    }
-
-    *dst = (*dst)->next;
-    --map->size;
-    return 0;
-  }
-  return NGHTTP2_ERR_INVALID_ARGUMENT;
-}
-
-size_t nghttp2_map_size(nghttp2_map *map) { return map->size; }
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_map.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_MAP_H
-#define NGHTTP2_MAP_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_int.h"
-#include "nghttp2_mem.h"
-
-/* Implementation of unordered map */
-
-typedef int32_t key_type;
-
-typedef struct nghttp2_map_entry {
-  struct nghttp2_map_entry *next;
-  key_type key;
-#if SIZEOF_INT_P == 4
-  /* we requires 8 bytes aligment */
-  int64_t pad;
-#endif
-} nghttp2_map_entry;
-
-typedef struct {
-  nghttp2_map_entry **table;
-  nghttp2_mem *mem;
-  size_t size;
-  uint32_t tablelen;
-} nghttp2_map;
-
-/*
- * Initializes the map |map|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-int nghttp2_map_init(nghttp2_map *map, nghttp2_mem *mem);
-
-/*
- * Deallocates any resources allocated for |map|. The stored entries
- * are not freed by this function. Use nghttp2_map_each_free() to free
- * each entries.
- */
-void nghttp2_map_free(nghttp2_map *map);
-
-/*
- * Deallocates each entries using |func| function and any resources
- * allocated for |map|. The |func| function is responsible for freeing
- * given the |entry| object. The |ptr| will be passed to the |func| as
- * send argument. The return value of the |func| will be ignored.
- */
-void nghttp2_map_each_free(nghttp2_map *map,
-                           int (*func)(nghttp2_map_entry *entry, void *ptr),
-                           void *ptr);
-
-/*
- * Initializes the |entry| with the |key|. All entries to be inserted
- * to the map must be initialized with this function.
- */
-void nghttp2_map_entry_init(nghttp2_map_entry *entry, key_type key);
-
-/*
- * Inserts the new |entry| with the key |entry->key| to the map |map|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The item associated by |key| already exists.
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-int nghttp2_map_insert(nghttp2_map *map, nghttp2_map_entry *entry);
-
-/*
- * Returns the entry associated by the key |key|.  If there is no such
- * entry, this function returns NULL.
- */
-nghttp2_map_entry *nghttp2_map_find(nghttp2_map *map, key_type key);
-
-/*
- * Removes the entry associated by the key |key| from the |map|.  The
- * removed entry is not freed by this function.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The entry associated by |key| does not exist.
- */
-int nghttp2_map_remove(nghttp2_map *map, key_type key);
-
-/*
- * Returns the number of items stored in the map |map|.
- */
-size_t nghttp2_map_size(nghttp2_map *map);
-
-/*
- * Applies the function |func| to each entry in the |map| with the
- * optional user supplied pointer |ptr|.
- *
- * If the |func| returns 0, this function calls the |func| with the
- * next entry. If the |func| returns nonzero, it will not call the
- * |func| for further entries and return the return value of the
- * |func| immediately.  Thus, this function returns 0 if all the
- * invocations of the |func| return 0, or nonzero value which the last
- * invocation of |func| returns.
- *
- * Don't use this function to free each entry. Use
- * nghttp2_map_each_free() instead.
- */
-int nghttp2_map_each(nghttp2_map *map,
-                     int (*func)(nghttp2_map_entry *entry, void *ptr),
-                     void *ptr);
-
-#endif /* NGHTTP2_MAP_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_mem.h"
-
-static void *default_malloc(size_t size, void *mem_user_data) {
-  (void)mem_user_data;
-
-  return malloc(size);
-}
-
-static void default_free(void *ptr, void *mem_user_data) {
-  (void)mem_user_data;
-
-  free(ptr);
-}
-
-static void *default_calloc(size_t nmemb, size_t size, void *mem_user_data) {
-  (void)mem_user_data;
-
-  return calloc(nmemb, size);
-}
-
-static void *default_realloc(void *ptr, size_t size, void *mem_user_data) {
-  (void)mem_user_data;
-
-  return realloc(ptr, size);
-}
-
-static nghttp2_mem mem_default = {NULL, default_malloc, default_free,
-                                  default_calloc, default_realloc};
-
-nghttp2_mem *nghttp2_mem_default(void) { return &mem_default; }
-
-void *nghttp2_mem_malloc(nghttp2_mem *mem, size_t size) {
-  return mem->malloc(size, mem->mem_user_data);
-}
-
-void nghttp2_mem_free(nghttp2_mem *mem, void *ptr) {
-  mem->free(ptr, mem->mem_user_data);
-}
-
-void nghttp2_mem_free2(nghttp2_free free_func, void *ptr, void *mem_user_data) {
-  free_func(ptr, mem_user_data);
-}
-
-void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size) {
-  return mem->calloc(nmemb, size, mem->mem_user_data);
-}
-
-void *nghttp2_mem_realloc(nghttp2_mem *mem, void *ptr, size_t size) {
-  return mem->realloc(ptr, size, mem->mem_user_data);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_mem.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_MEM_H
-#define NGHTTP2_MEM_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-/* The default, system standard memory allocator */
-nghttp2_mem *nghttp2_mem_default(void);
-
-/* Convenient wrapper functions to call allocator function in
-   |mem|. */
-void *nghttp2_mem_malloc(nghttp2_mem *mem, size_t size);
-void nghttp2_mem_free(nghttp2_mem *mem, void *ptr);
-void nghttp2_mem_free2(nghttp2_free free_func, void *ptr, void *mem_user_data);
-void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size);
-void *nghttp2_mem_realloc(nghttp2_mem *mem, void *ptr, size_t size);
-
-#endif /* NGHTTP2_MEM_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_net.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_net.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_net.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_net.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_NET_H
-#define NGHTTP2_NET_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif /* HAVE_ARPA_INET_H */
-
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
-
-#include <nghttp2/nghttp2.h>
-
-#if defined(WIN32)
-/* Windows requires ws2_32 library for ntonl family functions.  We
-   define inline functions for those function so that we don't have
-   dependeny on that lib. */
-
-#  ifdef _MSC_VER
-#    define STIN static __inline
-#  else
-#    define STIN static inline
-#  endif
-
-STIN uint32_t htonl(uint32_t hostlong) {
-  uint32_t res;
-  unsigned char *p = (unsigned char *)&res;
-  *p++ = hostlong >> 24;
-  *p++ = (hostlong >> 16) & 0xffu;
-  *p++ = (hostlong >> 8) & 0xffu;
-  *p = hostlong & 0xffu;
-  return res;
-}
-
-STIN uint16_t htons(uint16_t hostshort) {
-  uint16_t res;
-  unsigned char *p = (unsigned char *)&res;
-  *p++ = hostshort >> 8;
-  *p = hostshort & 0xffu;
-  return res;
-}
-
-STIN uint32_t ntohl(uint32_t netlong) {
-  uint32_t res;
-  unsigned char *p = (unsigned char *)&netlong;
-  res = *p++ << 24;
-  res += *p++ << 16;
-  res += *p++ << 8;
-  res += *p;
-  return res;
-}
-
-STIN uint16_t ntohs(uint16_t netshort) {
-  uint16_t res;
-  unsigned char *p = (unsigned char *)&netshort;
-  res = *p++ << 8;
-  res += *p;
-  return res;
-}
-
-#endif /* WIN32 */
-
-#endif /* NGHTTP2_NET_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_npn.h"
-
-#include <string.h>
-
-static int select_next_protocol(unsigned char **out, unsigned char *outlen,
-                                const unsigned char *in, unsigned int inlen,
-                                const char *key, unsigned int keylen) {
-  unsigned int i;
-  for (i = 0; i + keylen <= inlen; i += (unsigned int)(in[i] + 1)) {
-    if (memcmp(&in[i], key, keylen) == 0) {
-      *out = (unsigned char *)&in[i + 1];
-      *outlen = in[i];
-      return 0;
-    }
-  }
-  return -1;
-}
-
-#define NGHTTP2_HTTP_1_1_ALPN "\x8http/1.1"
-#define NGHTTP2_HTTP_1_1_ALPN_LEN (sizeof(NGHTTP2_HTTP_1_1_ALPN) - 1)
-
-int nghttp2_select_next_protocol(unsigned char **out, unsigned char *outlen,
-                                 const unsigned char *in, unsigned int inlen) {
-  if (select_next_protocol(out, outlen, in, inlen, NGHTTP2_PROTO_ALPN,
-                           NGHTTP2_PROTO_ALPN_LEN) == 0) {
-    return 1;
-  }
-  if (select_next_protocol(out, outlen, in, inlen, NGHTTP2_HTTP_1_1_ALPN,
-                           NGHTTP2_HTTP_1_1_ALPN_LEN) == 0) {
-    return 0;
-  }
-  return -1;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_npn.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_NPN_H
-#define NGHTTP2_NPN_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-#endif /* NGHTTP2_NPN_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_option.h"
-
-#include "nghttp2_session.h"
-
-int nghttp2_option_new(nghttp2_option **option_ptr) {
-  *option_ptr = calloc(1, sizeof(nghttp2_option));
-
-  if (*option_ptr == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  return 0;
-}
-
-void nghttp2_option_del(nghttp2_option *option) { free(option); }
-
-void nghttp2_option_set_no_auto_window_update(nghttp2_option *option, int val) {
-  option->opt_set_mask |= NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE;
-  option->no_auto_window_update = val;
-}
-
-void nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
-                                                    uint32_t val) {
-  option->opt_set_mask |= NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS;
-  option->peer_max_concurrent_streams = val;
-}
-
-void nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val) {
-  option->opt_set_mask |= NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC;
-  option->no_recv_client_magic = val;
-}
-
-void nghttp2_option_set_no_http_messaging(nghttp2_option *option, int val) {
-  option->opt_set_mask |= NGHTTP2_OPT_NO_HTTP_MESSAGING;
-  option->no_http_messaging = val;
-}
-
-void nghttp2_option_set_max_reserved_remote_streams(nghttp2_option *option,
-                                                    uint32_t val) {
-  option->opt_set_mask |= NGHTTP2_OPT_MAX_RESERVED_REMOTE_STREAMS;
-  option->max_reserved_remote_streams = val;
-}
-
-static void set_ext_type(uint8_t *ext_types, uint8_t type) {
-  ext_types[type / 8] = (uint8_t)(ext_types[type / 8] | (1 << (type & 0x7)));
-}
-
-void nghttp2_option_set_user_recv_extension_type(nghttp2_option *option,
-                                                 uint8_t type) {
-  if (type < 10) {
-    return;
-  }
-
-  option->opt_set_mask |= NGHTTP2_OPT_USER_RECV_EXT_TYPES;
-  set_ext_type(option->user_recv_ext_types, type);
-}
-
-void nghttp2_option_set_builtin_recv_extension_type(nghttp2_option *option,
-                                                    uint8_t type) {
-  switch (type) {
-  case NGHTTP2_ALTSVC:
-    option->opt_set_mask |= NGHTTP2_OPT_BUILTIN_RECV_EXT_TYPES;
-    option->builtin_recv_ext_types |= NGHTTP2_TYPEMASK_ALTSVC;
-    return;
-  case NGHTTP2_ORIGIN:
-    option->opt_set_mask |= NGHTTP2_OPT_BUILTIN_RECV_EXT_TYPES;
-    option->builtin_recv_ext_types |= NGHTTP2_TYPEMASK_ORIGIN;
-    return;
-  default:
-    return;
-  }
-}
-
-void nghttp2_option_set_no_auto_ping_ack(nghttp2_option *option, int val) {
-  option->opt_set_mask |= NGHTTP2_OPT_NO_AUTO_PING_ACK;
-  option->no_auto_ping_ack = val;
-}
-
-void nghttp2_option_set_max_send_header_block_length(nghttp2_option *option,
-                                                     size_t val) {
-  option->opt_set_mask |= NGHTTP2_OPT_MAX_SEND_HEADER_BLOCK_LENGTH;
-  option->max_send_header_block_length = val;
-}
-
-void nghttp2_option_set_max_deflate_dynamic_table_size(nghttp2_option *option,
-                                                       size_t val) {
-  option->opt_set_mask |= NGHTTP2_OPT_MAX_DEFLATE_DYNAMIC_TABLE_SIZE;
-  option->max_deflate_dynamic_table_size = val;
-}
-
-void nghttp2_option_set_no_closed_streams(nghttp2_option *option, int val) {
-  option->opt_set_mask |= NGHTTP2_OPT_NO_CLOSED_STREAMS;
-  option->no_closed_streams = val;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_option.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_OPTION_H
-#define NGHTTP2_OPTION_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-/**
- * Configuration options
- */
-typedef enum {
-  /**
-   * This option prevents the library from sending WINDOW_UPDATE for a
-   * connection automatically.  If this option is set to nonzero, the
-   * library won't send WINDOW_UPDATE for DATA until application calls
-   * nghttp2_session_consume() to indicate the amount of consumed
-   * DATA.  By default, this option is set to zero.
-   */
-  NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE = 1,
-  /**
-   * This option sets the SETTINGS_MAX_CONCURRENT_STREAMS value of
-   * remote endpoint as if it is received in SETTINGS frame. Without
-   * specifying this option, before the local endpoint receives
-   * SETTINGS_MAX_CONCURRENT_STREAMS in SETTINGS frame from remote
-   * endpoint, SETTINGS_MAX_CONCURRENT_STREAMS is unlimited. This may
-   * cause problem if local endpoint submits lots of requests
-   * initially and sending them at once to the remote peer may lead to
-   * the rejection of some requests. Specifying this option to the
-   * sensible value, say 100, may avoid this kind of issue. This value
-   * will be overwritten if the local endpoint receives
-   * SETTINGS_MAX_CONCURRENT_STREAMS from the remote endpoint.
-   */
-  NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS = 1 << 1,
-  NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC = 1 << 2,
-  NGHTTP2_OPT_NO_HTTP_MESSAGING = 1 << 3,
-  NGHTTP2_OPT_MAX_RESERVED_REMOTE_STREAMS = 1 << 4,
-  NGHTTP2_OPT_USER_RECV_EXT_TYPES = 1 << 5,
-  NGHTTP2_OPT_NO_AUTO_PING_ACK = 1 << 6,
-  NGHTTP2_OPT_BUILTIN_RECV_EXT_TYPES = 1 << 7,
-  NGHTTP2_OPT_MAX_SEND_HEADER_BLOCK_LENGTH = 1 << 8,
-  NGHTTP2_OPT_MAX_DEFLATE_DYNAMIC_TABLE_SIZE = 1 << 9,
-  NGHTTP2_OPT_NO_CLOSED_STREAMS = 1 << 10,
-} nghttp2_option_flag;
-
-/**
- * Struct to store option values for nghttp2_session.
- */
-struct nghttp2_option {
-  /**
-   * NGHTTP2_OPT_MAX_SEND_HEADER_BLOCK_LENGTH
-   */
-  size_t max_send_header_block_length;
-  /**
-   * NGHTTP2_OPT_MAX_DEFLATE_DYNAMIC_TABLE_SIZE
-   */
-  size_t max_deflate_dynamic_table_size;
-  /**
-   * Bitwise OR of nghttp2_option_flag to determine that which fields
-   * are specified.
-   */
-  uint32_t opt_set_mask;
-  /**
-   * NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS
-   */
-  uint32_t peer_max_concurrent_streams;
-  /**
-   * NGHTTP2_OPT_MAX_RESERVED_REMOTE_STREAMS
-   */
-  uint32_t max_reserved_remote_streams;
-  /**
-   * NGHTTP2_OPT_BUILTIN_RECV_EXT_TYPES
-   */
-  uint32_t builtin_recv_ext_types;
-  /**
-   * NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE
-   */
-  int no_auto_window_update;
-  /**
-   * NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC
-   */
-  int no_recv_client_magic;
-  /**
-   * NGHTTP2_OPT_NO_HTTP_MESSAGING
-   */
-  int no_http_messaging;
-  /**
-   * NGHTTP2_OPT_NO_AUTO_PING_ACK
-   */
-  int no_auto_ping_ack;
-  /**
-   * NGHTTP2_OPT_NO_CLOSED_STREAMS
-   */
-  int no_closed_streams;
-  /**
-   * NGHTTP2_OPT_USER_RECV_EXT_TYPES
-   */
-  uint8_t user_recv_ext_types[32];
-};
-
-#endif /* NGHTTP2_OPTION_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_outbound_item.h"
-
-#include <assert.h>
-#include <string.h>
-
-void nghttp2_outbound_item_init(nghttp2_outbound_item *item) {
-  item->cycle = 0;
-  item->qnext = NULL;
-  item->queued = 0;
-
-  memset(&item->aux_data, 0, sizeof(nghttp2_aux_data));
-}
-
-void nghttp2_outbound_item_free(nghttp2_outbound_item *item, nghttp2_mem *mem) {
-  nghttp2_frame *frame;
-
-  if (item == NULL) {
-    return;
-  }
-
-  frame = &item->frame;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-    nghttp2_frame_data_free(&frame->data);
-    break;
-  case NGHTTP2_HEADERS:
-    nghttp2_frame_headers_free(&frame->headers, mem);
-    break;
-  case NGHTTP2_PRIORITY:
-    nghttp2_frame_priority_free(&frame->priority);
-    break;
-  case NGHTTP2_RST_STREAM:
-    nghttp2_frame_rst_stream_free(&frame->rst_stream);
-    break;
-  case NGHTTP2_SETTINGS:
-    nghttp2_frame_settings_free(&frame->settings, mem);
-    break;
-  case NGHTTP2_PUSH_PROMISE:
-    nghttp2_frame_push_promise_free(&frame->push_promise, mem);
-    break;
-  case NGHTTP2_PING:
-    nghttp2_frame_ping_free(&frame->ping);
-    break;
-  case NGHTTP2_GOAWAY:
-    nghttp2_frame_goaway_free(&frame->goaway, mem);
-    break;
-  case NGHTTP2_WINDOW_UPDATE:
-    nghttp2_frame_window_update_free(&frame->window_update);
-    break;
-  default: {
-    nghttp2_ext_aux_data *aux_data;
-
-    aux_data = &item->aux_data.ext;
-
-    if (aux_data->builtin == 0) {
-      nghttp2_frame_extension_free(&frame->ext);
-      break;
-    }
-
-    switch (frame->hd.type) {
-    case NGHTTP2_ALTSVC:
-      nghttp2_frame_altsvc_free(&frame->ext, mem);
-      break;
-    case NGHTTP2_ORIGIN:
-      nghttp2_frame_origin_free(&frame->ext, mem);
-      break;
-    default:
-      assert(0);
-      break;
-    }
-  }
-  }
-}
-
-void nghttp2_outbound_queue_init(nghttp2_outbound_queue *q) {
-  q->head = q->tail = NULL;
-  q->n = 0;
-}
-
-void nghttp2_outbound_queue_push(nghttp2_outbound_queue *q,
-                                 nghttp2_outbound_item *item) {
-  if (q->tail) {
-    q->tail = q->tail->qnext = item;
-  } else {
-    q->head = q->tail = item;
-  }
-  ++q->n;
-}
-
-void nghttp2_outbound_queue_pop(nghttp2_outbound_queue *q) {
-  nghttp2_outbound_item *item;
-  if (!q->head) {
-    return;
-  }
-  item = q->head;
-  q->head = q->head->qnext;
-  item->qnext = NULL;
-  if (!q->head) {
-    q->tail = NULL;
-  }
-  --q->n;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_outbound_item.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,166 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_OUTBOUND_ITEM_H
-#define NGHTTP2_OUTBOUND_ITEM_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_frame.h"
-#include "nghttp2_mem.h"
-
-/* struct used for HEADERS and PUSH_PROMISE frame */
-typedef struct {
-  nghttp2_data_provider data_prd;
-  void *stream_user_data;
-  /* error code when request HEADERS is canceled by RST_STREAM while
-     it is in queue. */
-  uint32_t error_code;
-  /* nonzero if request HEADERS is canceled.  The error code is stored
-     in |error_code|. */
-  uint8_t canceled;
-} nghttp2_headers_aux_data;
-
-/* struct used for DATA frame */
-typedef struct {
-  /**
-   * The data to be sent for this DATA frame.
-   */
-  nghttp2_data_provider data_prd;
-  /**
-   * The flags of DATA frame.  We use separate flags here and
-   * nghttp2_data frame.  The latter contains flags actually sent to
-   * peer.  This |flags| may contain NGHTTP2_FLAG_END_STREAM and only
-   * when |eof| becomes nonzero, flags in nghttp2_data has
-   * NGHTTP2_FLAG_END_STREAM set.
-   */
-  uint8_t flags;
-  /**
-   * The flag to indicate whether EOF was reached or not. Initially
-   * |eof| is 0. It becomes 1 after all data were read.
-   */
-  uint8_t eof;
-  /**
-   * The flag to indicate that NGHTTP2_DATA_FLAG_NO_COPY is used.
-   */
-  uint8_t no_copy;
-} nghttp2_data_aux_data;
-
-typedef enum {
-  NGHTTP2_GOAWAY_AUX_NONE = 0x0,
-  /* indicates that session should be terminated after the
-     transmission of this frame. */
-  NGHTTP2_GOAWAY_AUX_TERM_ON_SEND = 0x1,
-  /* indicates that this GOAWAY is just a notification for graceful
-     shutdown.  No nghttp2_session.goaway_flags should be updated on
-     the reaction to this frame. */
-  NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE = 0x2
-} nghttp2_goaway_aux_flag;
-
-/* struct used for GOAWAY frame */
-typedef struct {
-  /* bitwise-OR of one or more of nghttp2_goaway_aux_flag. */
-  uint8_t flags;
-} nghttp2_goaway_aux_data;
-
-/* struct used for extension frame */
-typedef struct {
-  /* nonzero if this extension frame is serialized by library
-     function, instead of user-defined callbacks. */
-  uint8_t builtin;
-} nghttp2_ext_aux_data;
-
-/* Additional data which cannot be stored in nghttp2_frame struct */
-typedef union {
-  nghttp2_data_aux_data data;
-  nghttp2_headers_aux_data headers;
-  nghttp2_goaway_aux_data goaway;
-  nghttp2_ext_aux_data ext;
-} nghttp2_aux_data;
-
-struct nghttp2_outbound_item;
-typedef struct nghttp2_outbound_item nghttp2_outbound_item;
-
-struct nghttp2_outbound_item {
-  nghttp2_frame frame;
-  /* Storage for extension frame payload.  frame->ext.payload points
-     to this structure to avoid frequent memory allocation. */
-  nghttp2_ext_frame_payload ext_frame_payload;
-  nghttp2_aux_data aux_data;
-  /* The priority used in priority comparion.  Smaller is served
-     earlier.  For PING, SETTINGS and non-DATA frames (excluding
-     response HEADERS frame) have dedicated cycle value defined above.
-     For DATA frame, cycle is computed by taking into account of
-     effective weight and frame payload length previously sent, so
-     that the amount of transmission is distributed across streams
-     proportional to effective weight (inside a tree). */
-  uint64_t cycle;
-  nghttp2_outbound_item *qnext;
-  /* nonzero if this object is queued, except for DATA or HEADERS
-     which are attached to stream as item. */
-  uint8_t queued;
-};
-
-/*
- * Initializes |item|.  No memory allocation is done in this function.
- * Don't call nghttp2_outbound_item_free() until frame member is
- * initialized.
- */
-void nghttp2_outbound_item_init(nghttp2_outbound_item *item);
-
-/*
- * Deallocates resource for |item|. If |item| is NULL, this function
- * does nothing.
- */
-void nghttp2_outbound_item_free(nghttp2_outbound_item *item, nghttp2_mem *mem);
-
-/*
- * queue for nghttp2_outbound_item.
- */
-typedef struct {
-  nghttp2_outbound_item *head, *tail;
-  /* number of items in this queue. */
-  size_t n;
-} nghttp2_outbound_queue;
-
-void nghttp2_outbound_queue_init(nghttp2_outbound_queue *q);
-
-/* Pushes |item| into |q| */
-void nghttp2_outbound_queue_push(nghttp2_outbound_queue *q,
-                                 nghttp2_outbound_item *item);
-
-/* Pops |item| at the top from |q|.  If |q| is empty, nothing
-   happens. */
-void nghttp2_outbound_queue_pop(nghttp2_outbound_queue *q);
-
-/* Returns the top item. */
-#define nghttp2_outbound_queue_top(Q) ((Q)->head)
-
-/* Returns the size of the queue */
-#define nghttp2_outbound_queue_size(Q) ((Q)->n)
-
-#endif /* NGHTTP2_OUTBOUND_ITEM_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_pq.h"
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "nghttp2_helper.h"
-
-int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_less less, nghttp2_mem *mem) {
-  pq->mem = mem;
-  pq->capacity = 0;
-  pq->q = NULL;
-  pq->length = 0;
-  pq->less = less;
-  return 0;
-}
-
-void nghttp2_pq_free(nghttp2_pq *pq) {
-  nghttp2_mem_free(pq->mem, pq->q);
-  pq->q = NULL;
-}
-
-static void swap(nghttp2_pq *pq, size_t i, size_t j) {
-  nghttp2_pq_entry *a = pq->q[i];
-  nghttp2_pq_entry *b = pq->q[j];
-
-  pq->q[i] = b;
-  b->index = i;
-  pq->q[j] = a;
-  a->index = j;
-}
-
-static void bubble_up(nghttp2_pq *pq, size_t index) {
-  size_t parent;
-  while (index != 0) {
-    parent = (index - 1) / 2;
-    if (!pq->less(pq->q[index], pq->q[parent])) {
-      return;
-    }
-    swap(pq, parent, index);
-    index = parent;
-  }
-}
-
-int nghttp2_pq_push(nghttp2_pq *pq, nghttp2_pq_entry *item) {
-  if (pq->capacity <= pq->length) {
-    void *nq;
-    size_t ncapacity;
-
-    ncapacity = nghttp2_max(4, (pq->capacity * 2));
-
-    nq = nghttp2_mem_realloc(pq->mem, pq->q,
-                             ncapacity * sizeof(nghttp2_pq_entry *));
-    if (nq == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-    pq->capacity = ncapacity;
-    pq->q = nq;
-  }
-  pq->q[pq->length] = item;
-  item->index = pq->length;
-  ++pq->length;
-  bubble_up(pq, pq->length - 1);
-  return 0;
-}
-
-nghttp2_pq_entry *nghttp2_pq_top(nghttp2_pq *pq) {
-  if (pq->length == 0) {
-    return NULL;
-  } else {
-    return pq->q[0];
-  }
-}
-
-static void bubble_down(nghttp2_pq *pq, size_t index) {
-  size_t i, j, minindex;
-  for (;;) {
-    j = index * 2 + 1;
-    minindex = index;
-    for (i = 0; i < 2; ++i, ++j) {
-      if (j >= pq->length) {
-        break;
-      }
-      if (pq->less(pq->q[j], pq->q[minindex])) {
-        minindex = j;
-      }
-    }
-    if (minindex == index) {
-      return;
-    }
-    swap(pq, index, minindex);
-    index = minindex;
-  }
-}
-
-void nghttp2_pq_pop(nghttp2_pq *pq) {
-  if (pq->length > 0) {
-    pq->q[0] = pq->q[pq->length - 1];
-    pq->q[0]->index = 0;
-    --pq->length;
-    bubble_down(pq, 0);
-  }
-}
-
-void nghttp2_pq_remove(nghttp2_pq *pq, nghttp2_pq_entry *item) {
-  assert(pq->q[item->index] == item);
-
-  if (item->index == 0) {
-    nghttp2_pq_pop(pq);
-    return;
-  }
-
-  if (item->index == pq->length - 1) {
-    --pq->length;
-    return;
-  }
-
-  pq->q[item->index] = pq->q[pq->length - 1];
-  pq->q[item->index]->index = item->index;
-  --pq->length;
-
-  if (pq->less(item, pq->q[item->index])) {
-    bubble_down(pq, item->index);
-  } else {
-    bubble_up(pq, item->index);
-  }
-}
-
-int nghttp2_pq_empty(nghttp2_pq *pq) { return pq->length == 0; }
-
-size_t nghttp2_pq_size(nghttp2_pq *pq) { return pq->length; }
-
-void nghttp2_pq_update(nghttp2_pq *pq, nghttp2_pq_item_cb fun, void *arg) {
-  size_t i;
-  int rv = 0;
-  if (pq->length == 0) {
-    return;
-  }
-  for (i = 0; i < pq->length; ++i) {
-    rv |= (*fun)(pq->q[i], arg);
-  }
-  if (rv) {
-    for (i = pq->length; i > 0; --i) {
-      bubble_down(pq, i - 1);
-    }
-  }
-}
-
-int nghttp2_pq_each(nghttp2_pq *pq, nghttp2_pq_item_cb fun, void *arg) {
-  size_t i;
-
-  if (pq->length == 0) {
-    return 0;
-  }
-  for (i = 0; i < pq->length; ++i) {
-    if ((*fun)(pq->q[i], arg)) {
-      return 1;
-    }
-  }
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_pq.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_PQ_H
-#define NGHTTP2_PQ_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_int.h"
-#include "nghttp2_mem.h"
-
-/* Implementation of priority queue */
-
-typedef struct {
-  size_t index;
-} nghttp2_pq_entry;
-
-typedef struct {
-  /* The pointer to the pointer to the item stored */
-  nghttp2_pq_entry **q;
-  /* Memory allocator */
-  nghttp2_mem *mem;
-  /* The number of items stored */
-  size_t length;
-  /* The maximum number of items this pq can store. This is
-     automatically extended when length is reached to this value. */
-  size_t capacity;
-  /* The less function between items */
-  nghttp2_less less;
-} nghttp2_pq;
-
-/*
- * Initializes priority queue |pq| with compare function |cmp|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_less less, nghttp2_mem *mem);
-
-/*
- * Deallocates any resources allocated for |pq|.  The stored items are
- * not freed by this function.
- */
-void nghttp2_pq_free(nghttp2_pq *pq);
-
-/*
- * Adds |item| to the priority queue |pq|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_pq_push(nghttp2_pq *pq, nghttp2_pq_entry *item);
-
-/*
- * Returns item at the top of the queue |pq|. If the queue is empty,
- * this function returns NULL.
- */
-nghttp2_pq_entry *nghttp2_pq_top(nghttp2_pq *pq);
-
-/*
- * Pops item at the top of the queue |pq|. The popped item is not
- * freed by this function.
- */
-void nghttp2_pq_pop(nghttp2_pq *pq);
-
-/*
- * Returns nonzero if the queue |pq| is empty.
- */
-int nghttp2_pq_empty(nghttp2_pq *pq);
-
-/*
- * Returns the number of items in the queue |pq|.
- */
-size_t nghttp2_pq_size(nghttp2_pq *pq);
-
-typedef int (*nghttp2_pq_item_cb)(nghttp2_pq_entry *item, void *arg);
-
-/*
- * Updates each item in |pq| using function |fun| and re-construct
- * priority queue. The |fun| must return non-zero if it modifies the
- * item in a way that it affects ordering in the priority queue. The
- * |arg| is passed to the 2nd parameter of |fun|.
- */
-void nghttp2_pq_update(nghttp2_pq *pq, nghttp2_pq_item_cb fun, void *arg);
-
-/*
- * Applys |fun| to each item in |pq|.  The |arg| is passed as arg
- * parameter to callback function.  This function must not change the
- * ordering key.  If the return value from callback is nonzero, this
- * function returns 1 immediately without iterating remaining items.
- * Otherwise this function returns 0.
- */
-int nghttp2_pq_each(nghttp2_pq *pq, nghttp2_pq_item_cb fun, void *arg);
-
-/*
- * Removes |item| from priority queue.
- */
-void nghttp2_pq_remove(nghttp2_pq *pq, nghttp2_pq_entry *item);
-
-#endif /* NGHTTP2_PQ_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_priority_spec.h"
-
-void nghttp2_priority_spec_init(nghttp2_priority_spec *pri_spec,
-                                int32_t stream_id, int32_t weight,
-                                int exclusive) {
-  pri_spec->stream_id = stream_id;
-  pri_spec->weight = weight;
-  pri_spec->exclusive = exclusive != 0;
-}
-
-void nghttp2_priority_spec_default_init(nghttp2_priority_spec *pri_spec) {
-  pri_spec->stream_id = 0;
-  pri_spec->weight = NGHTTP2_DEFAULT_WEIGHT;
-  pri_spec->exclusive = 0;
-}
-
-int nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec) {
-  return pri_spec->stream_id == 0 &&
-         pri_spec->weight == NGHTTP2_DEFAULT_WEIGHT && pri_spec->exclusive == 0;
-}
-
-void nghttp2_priority_spec_normalize_weight(nghttp2_priority_spec *pri_spec) {
-  if (pri_spec->weight < NGHTTP2_MIN_WEIGHT) {
-    pri_spec->weight = NGHTTP2_MIN_WEIGHT;
-  } else if (pri_spec->weight > NGHTTP2_MAX_WEIGHT) {
-    pri_spec->weight = NGHTTP2_MAX_WEIGHT;
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_priority_spec.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_PRIORITY_SPEC_H
-#define NGHTTP2_PRIORITY_SPEC_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-/*
- * This function normalizes pri_spec->weight if it is out of range.
- * If pri_spec->weight is less than NGHTTP2_MIN_WEIGHT, it is set to
- * NGHTTP2_MIN_WEIGHT.  If pri_spec->weight is larger than
- * NGHTTP2_MAX_WEIGHT, it is set to NGHTTP2_MAX_WEIGHT.
- */
-void nghttp2_priority_spec_normalize_weight(nghttp2_priority_spec *pri_spec);
-
-#endif /* NGHTTP2_PRIORITY_SPEC_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_queue.h"
-
-#include <string.h>
-#include <assert.h>
-
-void nghttp2_queue_init(nghttp2_queue *queue) {
-  queue->front = queue->back = NULL;
-}
-
-void nghttp2_queue_free(nghttp2_queue *queue) {
-  if (!queue) {
-    return;
-  } else {
-    nghttp2_queue_cell *p = queue->front;
-    while (p) {
-      nghttp2_queue_cell *next = p->next;
-      free(p);
-      p = next;
-    }
-  }
-}
-
-int nghttp2_queue_push(nghttp2_queue *queue, void *data) {
-  nghttp2_queue_cell *new_cell =
-      (nghttp2_queue_cell *)malloc(sizeof(nghttp2_queue_cell));
-  if (!new_cell) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-  new_cell->data = data;
-  new_cell->next = NULL;
-  if (queue->back) {
-    queue->back->next = new_cell;
-    queue->back = new_cell;
-
-  } else {
-    queue->front = queue->back = new_cell;
-  }
-  return 0;
-}
-
-void nghttp2_queue_pop(nghttp2_queue *queue) {
-  nghttp2_queue_cell *front = queue->front;
-  assert(front);
-  queue->front = front->next;
-  if (front == queue->back) {
-    queue->back = NULL;
-  }
-  free(front);
-}
-
-void *nghttp2_queue_front(nghttp2_queue *queue) {
-  assert(queue->front);
-  return queue->front->data;
-}
-
-void *nghttp2_queue_back(nghttp2_queue *queue) {
-  assert(queue->back);
-  return queue->back->data;
-}
-
-int nghttp2_queue_empty(nghttp2_queue *queue) { return queue->front == NULL; }
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_queue.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_QUEUE_H
-#define NGHTTP2_QUEUE_H
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-typedef struct nghttp2_queue_cell {
-  void *data;
-  struct nghttp2_queue_cell *next;
-} nghttp2_queue_cell;
-
-typedef struct {
-  nghttp2_queue_cell *front, *back;
-} nghttp2_queue;
-
-void nghttp2_queue_init(nghttp2_queue *queue);
-void nghttp2_queue_free(nghttp2_queue *queue);
-int nghttp2_queue_push(nghttp2_queue *queue, void *data);
-void nghttp2_queue_pop(nghttp2_queue *queue);
-void *nghttp2_queue_front(nghttp2_queue *queue);
-void *nghttp2_queue_back(nghttp2_queue *queue);
-int nghttp2_queue_empty(nghttp2_queue *queue);
-
-#endif /* NGHTTP2_QUEUE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_rcbuf.h"
-
-#include <string.h>
-#include <assert.h>
-
-#include "nghttp2_mem.h"
-#include "nghttp2_helper.h"
-
-int nghttp2_rcbuf_new(nghttp2_rcbuf **rcbuf_ptr, size_t size,
-                      nghttp2_mem *mem) {
-  uint8_t *p;
-
-  p = nghttp2_mem_malloc(mem, sizeof(nghttp2_rcbuf) + size);
-  if (p == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  *rcbuf_ptr = (void *)p;
-
-  (*rcbuf_ptr)->mem_user_data = mem->mem_user_data;
-  (*rcbuf_ptr)->free = mem->free;
-  (*rcbuf_ptr)->base = p + sizeof(nghttp2_rcbuf);
-  (*rcbuf_ptr)->len = size;
-  (*rcbuf_ptr)->ref = 1;
-
-  return 0;
-}
-
-int nghttp2_rcbuf_new2(nghttp2_rcbuf **rcbuf_ptr, const uint8_t *src,
-                       size_t srclen, nghttp2_mem *mem) {
-  int rv;
-
-  rv = nghttp2_rcbuf_new(rcbuf_ptr, srclen + 1, mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  (*rcbuf_ptr)->len = srclen;
-  *nghttp2_cpymem((*rcbuf_ptr)->base, src, srclen) = '\0';
-
-  return 0;
-}
-
-/*
- * Frees |rcbuf| itself, regardless of its reference cout.
- */
-void nghttp2_rcbuf_del(nghttp2_rcbuf *rcbuf) {
-  nghttp2_mem_free2(rcbuf->free, rcbuf, rcbuf->mem_user_data);
-}
-
-void nghttp2_rcbuf_incref(nghttp2_rcbuf *rcbuf) {
-  if (rcbuf->ref == -1) {
-    return;
-  }
-
-  ++rcbuf->ref;
-}
-
-void nghttp2_rcbuf_decref(nghttp2_rcbuf *rcbuf) {
-  if (rcbuf == NULL || rcbuf->ref == -1) {
-    return;
-  }
-
-  assert(rcbuf->ref > 0);
-
-  if (--rcbuf->ref == 0) {
-    nghttp2_rcbuf_del(rcbuf);
-  }
-}
-
-nghttp2_vec nghttp2_rcbuf_get_buf(nghttp2_rcbuf *rcbuf) {
-  nghttp2_vec res = {rcbuf->base, rcbuf->len};
-  return res;
-}
-
-int nghttp2_rcbuf_is_static(const nghttp2_rcbuf *rcbuf) {
-  return rcbuf->ref == -1;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_rcbuf.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_RCBUF_H
-#define NGHTTP2_RCBUF_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-struct nghttp2_rcbuf {
-  /* custom memory allocator belongs to the mem parameter when
-     creating this object. */
-  void *mem_user_data;
-  nghttp2_free free;
-  /* The pointer to the underlying buffer */
-  uint8_t *base;
-  /* Size of buffer pointed by |base|. */
-  size_t len;
-  /* Reference count */
-  int32_t ref;
-};
-
-/*
- * Allocates nghttp2_rcbuf object with |size| as initial buffer size.
- * When the function succeeds, the reference count becomes 1.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM:
- *     Out of memory.
- */
-int nghttp2_rcbuf_new(nghttp2_rcbuf **rcbuf_ptr, size_t size, nghttp2_mem *mem);
-
-/*
- * Like nghttp2_rcbuf_new(), but initializes the buffer with |src| of
- * length |srclen|.  This function allocates additional byte at the
- * end and puts '\0' into it, so that the resulting buffer could be
- * used as NULL-terminated string.  Still (*rcbuf_ptr)->len equals to
- * |srclen|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM:
- *     Out of memory.
- */
-int nghttp2_rcbuf_new2(nghttp2_rcbuf **rcbuf_ptr, const uint8_t *src,
-                       size_t srclen, nghttp2_mem *mem);
-
-/*
- * Frees |rcbuf| itself, regardless of its reference cout.
- */
-void nghttp2_rcbuf_del(nghttp2_rcbuf *rcbuf);
-
-#endif /* NGHTTP2_RCBUF_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,7734 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_session.h"
-
-#include <string.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <assert.h>
-#include <stdarg.h>
-
-#include "nghttp2_helper.h"
-#include "nghttp2_net.h"
-#include "nghttp2_priority_spec.h"
-#include "nghttp2_option.h"
-#include "nghttp2_http.h"
-#include "nghttp2_pq.h"
-#include "nghttp2_debug.h"
-
-/*
- * Returns non-zero if the number of outgoing opened streams is larger
- * than or equal to
- * remote_settings.max_concurrent_streams.
- */
-static int
-session_is_outgoing_concurrent_streams_max(nghttp2_session *session) {
-  return session->remote_settings.max_concurrent_streams <=
-         session->num_outgoing_streams;
-}
-
-/*
- * Returns non-zero if the number of incoming opened streams is larger
- * than or equal to
- * local_settings.max_concurrent_streams.
- */
-static int
-session_is_incoming_concurrent_streams_max(nghttp2_session *session) {
-  return session->local_settings.max_concurrent_streams <=
-         session->num_incoming_streams;
-}
-
-/*
- * Returns non-zero if the number of incoming opened streams is larger
- * than or equal to
- * session->pending_local_max_concurrent_stream.
- */
-static int
-session_is_incoming_concurrent_streams_pending_max(nghttp2_session *session) {
-  return session->pending_local_max_concurrent_stream <=
-         session->num_incoming_streams;
-}
-
-/*
- * Returns non-zero if |lib_error| is non-fatal error.
- */
-static int is_non_fatal(int lib_error_code) {
-  return lib_error_code < 0 && lib_error_code > NGHTTP2_ERR_FATAL;
-}
-
-int nghttp2_is_fatal(int lib_error_code) {
-  return lib_error_code < NGHTTP2_ERR_FATAL;
-}
-
-static int session_enforce_http_messaging(nghttp2_session *session) {
-  return (session->opt_flags & NGHTTP2_OPTMASK_NO_HTTP_MESSAGING) == 0;
-}
-
-/*
- * Returns nonzero if |frame| is trailer headers.
- */
-static int session_trailer_headers(nghttp2_session *session,
-                                   nghttp2_stream *stream,
-                                   nghttp2_frame *frame) {
-  if (!stream || frame->hd.type != NGHTTP2_HEADERS) {
-    return 0;
-  }
-  if (session->server) {
-    return frame->headers.cat == NGHTTP2_HCAT_HEADERS;
-  }
-
-  return frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-         (stream->http_flags & NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE) == 0;
-}
-
-/* Returns nonzero if the |stream| is in reserved(remote) state */
-static int state_reserved_remote(nghttp2_session *session,
-                                 nghttp2_stream *stream) {
-  return stream->state == NGHTTP2_STREAM_RESERVED &&
-         !nghttp2_session_is_my_stream_id(session, stream->stream_id);
-}
-
-/* Returns nonzero if the |stream| is in reserved(local) state */
-static int state_reserved_local(nghttp2_session *session,
-                                nghttp2_stream *stream) {
-  return stream->state == NGHTTP2_STREAM_RESERVED &&
-         nghttp2_session_is_my_stream_id(session, stream->stream_id);
-}
-
-/*
- * Checks whether received stream_id is valid.  This function returns
- * 1 if it succeeds, or 0.
- */
-static int session_is_new_peer_stream_id(nghttp2_session *session,
-                                         int32_t stream_id) {
-  return stream_id != 0 &&
-         !nghttp2_session_is_my_stream_id(session, stream_id) &&
-         session->last_recv_stream_id < stream_id;
-}
-
-static int session_detect_idle_stream(nghttp2_session *session,
-                                      int32_t stream_id) {
-  /* Assume that stream object with stream_id does not exist */
-  if (nghttp2_session_is_my_stream_id(session, stream_id)) {
-    if (session->last_sent_stream_id < stream_id) {
-      return 1;
-    }
-    return 0;
-  }
-  if (session_is_new_peer_stream_id(session, stream_id)) {
-    return 1;
-  }
-  return 0;
-}
-
-static int check_ext_type_set(const uint8_t *ext_types, uint8_t type) {
-  return (ext_types[type / 8] & (1 << (type & 0x7))) > 0;
-}
-
-static int session_call_error_callback(nghttp2_session *session,
-                                       int lib_error_code, const char *fmt,
-                                       ...) {
-  size_t bufsize;
-  va_list ap;
-  char *buf;
-  int rv;
-  nghttp2_mem *mem;
-
-  if (!session->callbacks.error_callback &&
-      !session->callbacks.error_callback2) {
-    return 0;
-  }
-
-  mem = &session->mem;
-
-  va_start(ap, fmt);
-  rv = vsnprintf(NULL, 0, fmt, ap);
-  va_end(ap);
-
-  if (rv < 0) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  bufsize = (size_t)(rv + 1);
-
-  buf = nghttp2_mem_malloc(mem, bufsize);
-  if (buf == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  va_start(ap, fmt);
-  rv = vsnprintf(buf, bufsize, fmt, ap);
-  va_end(ap);
-
-  if (rv < 0) {
-    nghttp2_mem_free(mem, buf);
-    /* vsnprintf may return error because of various things we can
-       imagine, but typically we don't want to drop session just for
-       debug callback. */
-    DEBUGF("error_callback: vsnprintf failed. The template was %s\n", fmt);
-    return 0;
-  }
-
-  if (session->callbacks.error_callback2) {
-    rv = session->callbacks.error_callback2(session, lib_error_code, buf,
-                                            (size_t)rv, session->user_data);
-  } else {
-    rv = session->callbacks.error_callback(session, buf, (size_t)rv,
-                                           session->user_data);
-  }
-
-  nghttp2_mem_free(mem, buf);
-
-  if (rv != 0) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  return 0;
-}
-
-static int session_terminate_session(nghttp2_session *session,
-                                     int32_t last_stream_id,
-                                     uint32_t error_code, const char *reason) {
-  int rv;
-  const uint8_t *debug_data;
-  size_t debug_datalen;
-
-  if (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND) {
-    return 0;
-  }
-
-  /* Ignore all incoming frames because we are going to tear down the
-     session. */
-  session->iframe.state = NGHTTP2_IB_IGN_ALL;
-
-  if (reason == NULL) {
-    debug_data = NULL;
-    debug_datalen = 0;
-  } else {
-    debug_data = (const uint8_t *)reason;
-    debug_datalen = strlen(reason);
-  }
-
-  rv = nghttp2_session_add_goaway(session, last_stream_id, error_code,
-                                  debug_data, debug_datalen,
-                                  NGHTTP2_GOAWAY_AUX_TERM_ON_SEND);
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  session->goaway_flags |= NGHTTP2_GOAWAY_TERM_ON_SEND;
-
-  return 0;
-}
-
-int nghttp2_session_terminate_session(nghttp2_session *session,
-                                      uint32_t error_code) {
-  return session_terminate_session(session, session->last_proc_stream_id,
-                                   error_code, NULL);
-}
-
-int nghttp2_session_terminate_session2(nghttp2_session *session,
-                                       int32_t last_stream_id,
-                                       uint32_t error_code) {
-  return session_terminate_session(session, last_stream_id, error_code, NULL);
-}
-
-int nghttp2_session_terminate_session_with_reason(nghttp2_session *session,
-                                                  uint32_t error_code,
-                                                  const char *reason) {
-  return session_terminate_session(session, session->last_proc_stream_id,
-                                   error_code, reason);
-}
-
-int nghttp2_session_is_my_stream_id(nghttp2_session *session,
-                                    int32_t stream_id) {
-  int rem;
-  if (stream_id == 0) {
-    return 0;
-  }
-  rem = stream_id & 0x1;
-  if (session->server) {
-    return rem == 0;
-  }
-  return rem == 1;
-}
-
-nghttp2_stream *nghttp2_session_get_stream(nghttp2_session *session,
-                                           int32_t stream_id) {
-  nghttp2_stream *stream;
-
-  stream = (nghttp2_stream *)nghttp2_map_find(&session->streams, stream_id);
-
-  if (stream == NULL || (stream->flags & NGHTTP2_STREAM_FLAG_CLOSED) ||
-      stream->state == NGHTTP2_STREAM_IDLE) {
-    return NULL;
-  }
-
-  return stream;
-}
-
-nghttp2_stream *nghttp2_session_get_stream_raw(nghttp2_session *session,
-                                               int32_t stream_id) {
-  return (nghttp2_stream *)nghttp2_map_find(&session->streams, stream_id);
-}
-
-static void session_inbound_frame_reset(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_mem *mem = &session->mem;
-  /* A bit risky code, since if this function is called from
-     nghttp2_session_new(), we rely on the fact that
-     iframe->frame.hd.type is 0, so that no free is performed. */
-  switch (iframe->frame.hd.type) {
-  case NGHTTP2_DATA:
-    break;
-  case NGHTTP2_HEADERS:
-    nghttp2_frame_headers_free(&iframe->frame.headers, mem);
-    break;
-  case NGHTTP2_PRIORITY:
-    nghttp2_frame_priority_free(&iframe->frame.priority);
-    break;
-  case NGHTTP2_RST_STREAM:
-    nghttp2_frame_rst_stream_free(&iframe->frame.rst_stream);
-    break;
-  case NGHTTP2_SETTINGS:
-    nghttp2_frame_settings_free(&iframe->frame.settings, mem);
-
-    nghttp2_mem_free(mem, iframe->iv);
-
-    iframe->iv = NULL;
-    iframe->niv = 0;
-    iframe->max_niv = 0;
-
-    break;
-  case NGHTTP2_PUSH_PROMISE:
-    nghttp2_frame_push_promise_free(&iframe->frame.push_promise, mem);
-    break;
-  case NGHTTP2_PING:
-    nghttp2_frame_ping_free(&iframe->frame.ping);
-    break;
-  case NGHTTP2_GOAWAY:
-    nghttp2_frame_goaway_free(&iframe->frame.goaway, mem);
-    break;
-  case NGHTTP2_WINDOW_UPDATE:
-    nghttp2_frame_window_update_free(&iframe->frame.window_update);
-    break;
-  default:
-    /* extension frame */
-    if (check_ext_type_set(session->user_recv_ext_types,
-                           iframe->frame.hd.type)) {
-      nghttp2_frame_extension_free(&iframe->frame.ext);
-    } else {
-      switch (iframe->frame.hd.type) {
-      case NGHTTP2_ALTSVC:
-        if ((session->builtin_recv_ext_types & NGHTTP2_TYPEMASK_ALTSVC) == 0) {
-          break;
-        }
-        nghttp2_frame_altsvc_free(&iframe->frame.ext, mem);
-        break;
-      case NGHTTP2_ORIGIN:
-        if ((session->builtin_recv_ext_types & NGHTTP2_TYPEMASK_ORIGIN) == 0) {
-          break;
-        }
-        nghttp2_frame_origin_free(&iframe->frame.ext, mem);
-        break;
-      }
-    }
-
-    break;
-  }
-
-  memset(&iframe->frame, 0, sizeof(nghttp2_frame));
-  memset(&iframe->ext_frame_payload, 0, sizeof(nghttp2_ext_frame_payload));
-
-  iframe->state = NGHTTP2_IB_READ_HEAD;
-
-  nghttp2_buf_wrap_init(&iframe->sbuf, iframe->raw_sbuf,
-                        sizeof(iframe->raw_sbuf));
-  iframe->sbuf.mark += NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_buf_free(&iframe->lbuf, mem);
-  nghttp2_buf_wrap_init(&iframe->lbuf, NULL, 0);
-
-  iframe->raw_lbuf = NULL;
-
-  iframe->payloadleft = 0;
-  iframe->padlen = 0;
-}
-
-static void init_settings(nghttp2_settings_storage *settings) {
-  settings->header_table_size = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
-  settings->enable_push = 1;
-  settings->max_concurrent_streams = NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS;
-  settings->initial_window_size = NGHTTP2_INITIAL_WINDOW_SIZE;
-  settings->max_frame_size = NGHTTP2_MAX_FRAME_SIZE_MIN;
-  settings->max_header_list_size = UINT32_MAX;
-}
-
-static void active_outbound_item_reset(nghttp2_active_outbound_item *aob,
-                                       nghttp2_mem *mem) {
-  DEBUGF("send: reset nghttp2_active_outbound_item\n");
-  DEBUGF("send: aob->item = %p\n", aob->item);
-  nghttp2_outbound_item_free(aob->item, mem);
-  nghttp2_mem_free(mem, aob->item);
-  aob->item = NULL;
-  nghttp2_bufs_reset(&aob->framebufs);
-  aob->state = NGHTTP2_OB_POP_ITEM;
-}
-
-int nghttp2_enable_strict_preface = 1;
-
-static int session_new(nghttp2_session **session_ptr,
-                       const nghttp2_session_callbacks *callbacks,
-                       void *user_data, int server,
-                       const nghttp2_option *option, nghttp2_mem *mem) {
-  int rv;
-  size_t nbuffer;
-  size_t max_deflate_dynamic_table_size =
-      NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE;
-
-  if (mem == NULL) {
-    mem = nghttp2_mem_default();
-  }
-
-  *session_ptr = nghttp2_mem_calloc(mem, 1, sizeof(nghttp2_session));
-  if (*session_ptr == NULL) {
-    rv = NGHTTP2_ERR_NOMEM;
-    goto fail_session;
-  }
-
-  (*session_ptr)->mem = *mem;
-  mem = &(*session_ptr)->mem;
-
-  /* next_stream_id is initialized in either
-     nghttp2_session_client_new2 or nghttp2_session_server_new2 */
-
-  nghttp2_stream_init(&(*session_ptr)->root, 0, NGHTTP2_STREAM_FLAG_NONE,
-                      NGHTTP2_STREAM_IDLE, NGHTTP2_DEFAULT_WEIGHT, 0, 0, NULL,
-                      mem);
-
-  (*session_ptr)->remote_window_size = NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE;
-  (*session_ptr)->recv_window_size = 0;
-  (*session_ptr)->consumed_size = 0;
-  (*session_ptr)->recv_reduction = 0;
-  (*session_ptr)->local_window_size = NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE;
-
-  (*session_ptr)->goaway_flags = NGHTTP2_GOAWAY_NONE;
-  (*session_ptr)->local_last_stream_id = (1u << 31) - 1;
-  (*session_ptr)->remote_last_stream_id = (1u << 31) - 1;
-
-  (*session_ptr)->pending_local_max_concurrent_stream =
-      NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS;
-  (*session_ptr)->pending_enable_push = 1;
-
-  if (server) {
-    (*session_ptr)->server = 1;
-  }
-
-  init_settings(&(*session_ptr)->remote_settings);
-  init_settings(&(*session_ptr)->local_settings);
-
-  (*session_ptr)->max_incoming_reserved_streams =
-      NGHTTP2_MAX_INCOMING_RESERVED_STREAMS;
-
-  /* Limit max outgoing concurrent streams to sensible value */
-  (*session_ptr)->remote_settings.max_concurrent_streams = 100;
-
-  (*session_ptr)->max_send_header_block_length = NGHTTP2_MAX_HEADERSLEN;
-
-  if (option) {
-    if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE) &&
-        option->no_auto_window_update) {
-
-      (*session_ptr)->opt_flags |= NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE;
-    }
-
-    if (option->opt_set_mask & NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS) {
-
-      (*session_ptr)->remote_settings.max_concurrent_streams =
-          option->peer_max_concurrent_streams;
-    }
-
-    if (option->opt_set_mask & NGHTTP2_OPT_MAX_RESERVED_REMOTE_STREAMS) {
-
-      (*session_ptr)->max_incoming_reserved_streams =
-          option->max_reserved_remote_streams;
-    }
-
-    if ((option->opt_set_mask & NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC) &&
-        option->no_recv_client_magic) {
-
-      (*session_ptr)->opt_flags |= NGHTTP2_OPTMASK_NO_RECV_CLIENT_MAGIC;
-    }
-
-    if ((option->opt_set_mask & NGHTTP2_OPT_NO_HTTP_MESSAGING) &&
-        option->no_http_messaging) {
-
-      (*session_ptr)->opt_flags |= NGHTTP2_OPTMASK_NO_HTTP_MESSAGING;
-    }
-
-    if (option->opt_set_mask & NGHTTP2_OPT_USER_RECV_EXT_TYPES) {
-      memcpy((*session_ptr)->user_recv_ext_types, option->user_recv_ext_types,
-             sizeof((*session_ptr)->user_recv_ext_types));
-    }
-
-    if (option->opt_set_mask & NGHTTP2_OPT_BUILTIN_RECV_EXT_TYPES) {
-      (*session_ptr)->builtin_recv_ext_types = option->builtin_recv_ext_types;
-    }
-
-    if ((option->opt_set_mask & NGHTTP2_OPT_NO_AUTO_PING_ACK) &&
-        option->no_auto_ping_ack) {
-      (*session_ptr)->opt_flags |= NGHTTP2_OPTMASK_NO_AUTO_PING_ACK;
-    }
-
-    if (option->opt_set_mask & NGHTTP2_OPT_MAX_SEND_HEADER_BLOCK_LENGTH) {
-      (*session_ptr)->max_send_header_block_length =
-          option->max_send_header_block_length;
-    }
-
-    if (option->opt_set_mask & NGHTTP2_OPT_MAX_DEFLATE_DYNAMIC_TABLE_SIZE) {
-      max_deflate_dynamic_table_size = option->max_deflate_dynamic_table_size;
-    }
-
-    if ((option->opt_set_mask & NGHTTP2_OPT_NO_CLOSED_STREAMS) &&
-        option->no_closed_streams) {
-      (*session_ptr)->opt_flags |= NGHTTP2_OPTMASK_NO_CLOSED_STREAMS;
-    }
-  }
-
-  rv = nghttp2_hd_deflate_init2(&(*session_ptr)->hd_deflater,
-                                max_deflate_dynamic_table_size, mem);
-  if (rv != 0) {
-    goto fail_hd_deflater;
-  }
-  rv = nghttp2_hd_inflate_init(&(*session_ptr)->hd_inflater, mem);
-  if (rv != 0) {
-    goto fail_hd_inflater;
-  }
-  rv = nghttp2_map_init(&(*session_ptr)->streams, mem);
-  if (rv != 0) {
-    goto fail_map;
-  }
-
-  nbuffer = ((*session_ptr)->max_send_header_block_length +
-             NGHTTP2_FRAMEBUF_CHUNKLEN - 1) /
-            NGHTTP2_FRAMEBUF_CHUNKLEN;
-
-  if (nbuffer == 0) {
-    nbuffer = 1;
-  }
-
-  /* 1 for Pad Field. */
-  rv = nghttp2_bufs_init3(&(*session_ptr)->aob.framebufs,
-                          NGHTTP2_FRAMEBUF_CHUNKLEN, nbuffer, 1,
-                          NGHTTP2_FRAME_HDLEN + 1, mem);
-  if (rv != 0) {
-    goto fail_aob_framebuf;
-  }
-
-  active_outbound_item_reset(&(*session_ptr)->aob, mem);
-
-  (*session_ptr)->callbacks = *callbacks;
-  (*session_ptr)->user_data = user_data;
-
-  session_inbound_frame_reset(*session_ptr);
-
-  if (nghttp2_enable_strict_preface) {
-    nghttp2_inbound_frame *iframe = &(*session_ptr)->iframe;
-
-    if (server && ((*session_ptr)->opt_flags &
-                   NGHTTP2_OPTMASK_NO_RECV_CLIENT_MAGIC) == 0) {
-      iframe->state = NGHTTP2_IB_READ_CLIENT_MAGIC;
-      iframe->payloadleft = NGHTTP2_CLIENT_MAGIC_LEN;
-    } else {
-      iframe->state = NGHTTP2_IB_READ_FIRST_SETTINGS;
-    }
-
-    if (!server) {
-      (*session_ptr)->aob.state = NGHTTP2_OB_SEND_CLIENT_MAGIC;
-      nghttp2_bufs_add(&(*session_ptr)->aob.framebufs, NGHTTP2_CLIENT_MAGIC,
-                       NGHTTP2_CLIENT_MAGIC_LEN);
-    }
-  }
-
-  return 0;
-
-fail_aob_framebuf:
-  nghttp2_map_free(&(*session_ptr)->streams);
-fail_map:
-  nghttp2_hd_inflate_free(&(*session_ptr)->hd_inflater);
-fail_hd_inflater:
-  nghttp2_hd_deflate_free(&(*session_ptr)->hd_deflater);
-fail_hd_deflater:
-  nghttp2_mem_free(mem, *session_ptr);
-fail_session:
-  return rv;
-}
-
-int nghttp2_session_client_new(nghttp2_session **session_ptr,
-                               const nghttp2_session_callbacks *callbacks,
-                               void *user_data) {
-  return nghttp2_session_client_new3(session_ptr, callbacks, user_data, NULL,
-                                     NULL);
-}
-
-int nghttp2_session_client_new2(nghttp2_session **session_ptr,
-                                const nghttp2_session_callbacks *callbacks,
-                                void *user_data, const nghttp2_option *option) {
-  return nghttp2_session_client_new3(session_ptr, callbacks, user_data, option,
-                                     NULL);
-}
-
-int nghttp2_session_client_new3(nghttp2_session **session_ptr,
-                                const nghttp2_session_callbacks *callbacks,
-                                void *user_data, const nghttp2_option *option,
-                                nghttp2_mem *mem) {
-  int rv;
-  nghttp2_session *session;
-
-  rv = session_new(&session, callbacks, user_data, 0, option, mem);
-
-  if (rv != 0) {
-    return rv;
-  }
-  /* IDs for use in client */
-  session->next_stream_id = 1;
-
-  *session_ptr = session;
-
-  return 0;
-}
-
-int nghttp2_session_server_new(nghttp2_session **session_ptr,
-                               const nghttp2_session_callbacks *callbacks,
-                               void *user_data) {
-  return nghttp2_session_server_new3(session_ptr, callbacks, user_data, NULL,
-                                     NULL);
-}
-
-int nghttp2_session_server_new2(nghttp2_session **session_ptr,
-                                const nghttp2_session_callbacks *callbacks,
-                                void *user_data, const nghttp2_option *option) {
-  return nghttp2_session_server_new3(session_ptr, callbacks, user_data, option,
-                                     NULL);
-}
-
-int nghttp2_session_server_new3(nghttp2_session **session_ptr,
-                                const nghttp2_session_callbacks *callbacks,
-                                void *user_data, const nghttp2_option *option,
-                                nghttp2_mem *mem) {
-  int rv;
-  nghttp2_session *session;
-
-  rv = session_new(&session, callbacks, user_data, 1, option, mem);
-
-  if (rv != 0) {
-    return rv;
-  }
-  /* IDs for use in client */
-  session->next_stream_id = 2;
-
-  *session_ptr = session;
-
-  return 0;
-}
-
-static int free_streams(nghttp2_map_entry *entry, void *ptr) {
-  nghttp2_session *session;
-  nghttp2_stream *stream;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  session = (nghttp2_session *)ptr;
-  mem = &session->mem;
-  stream = (nghttp2_stream *)entry;
-  item = stream->item;
-
-  if (item && !item->queued && item != session->aob.item) {
-    nghttp2_outbound_item_free(item, mem);
-    nghttp2_mem_free(mem, item);
-  }
-
-  nghttp2_stream_free(stream);
-  nghttp2_mem_free(mem, stream);
-
-  return 0;
-}
-
-static void ob_q_free(nghttp2_outbound_queue *q, nghttp2_mem *mem) {
-  nghttp2_outbound_item *item, *next;
-  for (item = q->head; item;) {
-    next = item->qnext;
-    nghttp2_outbound_item_free(item, mem);
-    nghttp2_mem_free(mem, item);
-    item = next;
-  }
-}
-
-static int inflight_settings_new(nghttp2_inflight_settings **settings_ptr,
-                                 const nghttp2_settings_entry *iv, size_t niv,
-                                 nghttp2_mem *mem) {
-  *settings_ptr = nghttp2_mem_malloc(mem, sizeof(nghttp2_inflight_settings));
-  if (!*settings_ptr) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  if (niv > 0) {
-    (*settings_ptr)->iv = nghttp2_frame_iv_copy(iv, niv, mem);
-    if (!(*settings_ptr)->iv) {
-      nghttp2_mem_free(mem, *settings_ptr);
-      return NGHTTP2_ERR_NOMEM;
-    }
-  } else {
-    (*settings_ptr)->iv = NULL;
-  }
-
-  (*settings_ptr)->niv = niv;
-  (*settings_ptr)->next = NULL;
-
-  return 0;
-}
-
-static void inflight_settings_del(nghttp2_inflight_settings *settings,
-                                  nghttp2_mem *mem) {
-  if (!settings) {
-    return;
-  }
-
-  nghttp2_mem_free(mem, settings->iv);
-  nghttp2_mem_free(mem, settings);
-}
-
-void nghttp2_session_del(nghttp2_session *session) {
-  nghttp2_mem *mem;
-  nghttp2_inflight_settings *settings;
-
-  if (session == NULL) {
-    return;
-  }
-
-  mem = &session->mem;
-
-  for (settings = session->inflight_settings_head; settings;) {
-    nghttp2_inflight_settings *next = settings->next;
-    inflight_settings_del(settings, mem);
-    settings = next;
-  }
-
-  nghttp2_stream_free(&session->root);
-
-  /* Have to free streams first, so that we can check
-     stream->item->queued */
-  nghttp2_map_each_free(&session->streams, free_streams, session);
-  nghttp2_map_free(&session->streams);
-
-  ob_q_free(&session->ob_urgent, mem);
-  ob_q_free(&session->ob_reg, mem);
-  ob_q_free(&session->ob_syn, mem);
-
-  active_outbound_item_reset(&session->aob, mem);
-  session_inbound_frame_reset(session);
-  nghttp2_hd_deflate_free(&session->hd_deflater);
-  nghttp2_hd_inflate_free(&session->hd_inflater);
-  nghttp2_bufs_free(&session->aob.framebufs);
-  nghttp2_mem_free(mem, session);
-}
-
-int nghttp2_session_reprioritize_stream(
-    nghttp2_session *session, nghttp2_stream *stream,
-    const nghttp2_priority_spec *pri_spec_in) {
-  int rv;
-  nghttp2_stream *dep_stream = NULL;
-  nghttp2_priority_spec pri_spec_default;
-  const nghttp2_priority_spec *pri_spec = pri_spec_in;
-
-  assert(pri_spec->stream_id != stream->stream_id);
-
-  if (!nghttp2_stream_in_dep_tree(stream)) {
-    return 0;
-  }
-
-  if (pri_spec->stream_id != 0) {
-    dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
-
-    if (!dep_stream &&
-        session_detect_idle_stream(session, pri_spec->stream_id)) {
-
-      nghttp2_priority_spec_default_init(&pri_spec_default);
-
-      dep_stream = nghttp2_session_open_stream(
-          session, pri_spec->stream_id, NGHTTP2_FLAG_NONE, &pri_spec_default,
-          NGHTTP2_STREAM_IDLE, NULL);
-
-      if (dep_stream == NULL) {
-        return NGHTTP2_ERR_NOMEM;
-      }
-    } else if (!dep_stream || !nghttp2_stream_in_dep_tree(dep_stream)) {
-      nghttp2_priority_spec_default_init(&pri_spec_default);
-      pri_spec = &pri_spec_default;
-    }
-  }
-
-  if (pri_spec->stream_id == 0) {
-    dep_stream = &session->root;
-  } else if (nghttp2_stream_dep_find_ancestor(dep_stream, stream)) {
-    DEBUGF("stream: cycle detected, dep_stream(%p)=%d stream(%p)=%d\n",
-           dep_stream, dep_stream->stream_id, stream, stream->stream_id);
-
-    nghttp2_stream_dep_remove_subtree(dep_stream);
-    rv = nghttp2_stream_dep_add_subtree(stream->dep_prev, dep_stream);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  assert(dep_stream);
-
-  if (dep_stream == stream->dep_prev && !pri_spec->exclusive) {
-    /* This is minor optimization when just weight is changed. */
-    nghttp2_stream_change_weight(stream, pri_spec->weight);
-
-    return 0;
-  }
-
-  nghttp2_stream_dep_remove_subtree(stream);
-
-  /* We have to update weight after removing stream from tree */
-  stream->weight = pri_spec->weight;
-
-  if (pri_spec->exclusive) {
-    rv = nghttp2_stream_dep_insert_subtree(dep_stream, stream);
-  } else {
-    rv = nghttp2_stream_dep_add_subtree(dep_stream, stream);
-  }
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_add_item(nghttp2_session *session,
-                             nghttp2_outbound_item *item) {
-  /* TODO Return error if stream is not found for the frame requiring
-     stream presence. */
-  int rv = 0;
-  nghttp2_stream *stream;
-  nghttp2_frame *frame;
-
-  frame = &item->frame;
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-    if (!stream) {
-      return NGHTTP2_ERR_STREAM_CLOSED;
-    }
-
-    if (stream->item) {
-      return NGHTTP2_ERR_DATA_EXIST;
-    }
-
-    rv = nghttp2_stream_attach_item(stream, item);
-
-    if (rv != 0) {
-      return rv;
-    }
-
-    return 0;
-  case NGHTTP2_HEADERS:
-    /* We push request HEADERS and push response HEADERS to
-       dedicated queue because their transmission is affected by
-       SETTINGS_MAX_CONCURRENT_STREAMS */
-    /* TODO If 2 HEADERS are submitted for reserved stream, then
-       both of them are queued into ob_syn, which is not
-       desirable. */
-    if (frame->headers.cat == NGHTTP2_HCAT_REQUEST ||
-        (stream && stream->state == NGHTTP2_STREAM_RESERVED)) {
-      nghttp2_outbound_queue_push(&session->ob_syn, item);
-      item->queued = 1;
-      return 0;
-      ;
-    }
-
-    nghttp2_outbound_queue_push(&session->ob_reg, item);
-    item->queued = 1;
-    return 0;
-  case NGHTTP2_SETTINGS:
-  case NGHTTP2_PING:
-    nghttp2_outbound_queue_push(&session->ob_urgent, item);
-    item->queued = 1;
-    return 0;
-  case NGHTTP2_RST_STREAM:
-    if (stream) {
-      stream->state = NGHTTP2_STREAM_CLOSING;
-    }
-    nghttp2_outbound_queue_push(&session->ob_reg, item);
-    item->queued = 1;
-    return 0;
-  case NGHTTP2_PUSH_PROMISE: {
-    nghttp2_headers_aux_data *aux_data;
-    nghttp2_priority_spec pri_spec;
-
-    aux_data = &item->aux_data.headers;
-
-    if (!stream) {
-      return NGHTTP2_ERR_STREAM_CLOSED;
-    }
-
-    nghttp2_priority_spec_init(&pri_spec, stream->stream_id,
-                               NGHTTP2_DEFAULT_WEIGHT, 0);
-
-    if (!nghttp2_session_open_stream(
-            session, frame->push_promise.promised_stream_id,
-            NGHTTP2_STREAM_FLAG_NONE, &pri_spec, NGHTTP2_STREAM_RESERVED,
-            aux_data->stream_user_data)) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-
-    /* We don't have to call nghttp2_session_adjust_closed_stream()
-       here, since stream->stream_id is local stream_id, and it does
-       not affect closed stream count. */
-
-    nghttp2_outbound_queue_push(&session->ob_reg, item);
-    item->queued = 1;
-
-    return 0;
-  }
-  case NGHTTP2_WINDOW_UPDATE:
-    if (stream) {
-      stream->window_update_queued = 1;
-    } else if (frame->hd.stream_id == 0) {
-      session->window_update_queued = 1;
-    }
-    nghttp2_outbound_queue_push(&session->ob_reg, item);
-    item->queued = 1;
-    return 0;
-  default:
-    nghttp2_outbound_queue_push(&session->ob_reg, item);
-    item->queued = 1;
-    return 0;
-  }
-}
-
-int nghttp2_session_add_rst_stream(nghttp2_session *session, int32_t stream_id,
-                                   uint32_t error_code) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream && stream->state == NGHTTP2_STREAM_CLOSING) {
-    return 0;
-  }
-
-  /* Cancel pending request HEADERS in ob_syn if this RST_STREAM
-     refers to that stream. */
-  if (!session->server && nghttp2_session_is_my_stream_id(session, stream_id) &&
-      nghttp2_outbound_queue_top(&session->ob_syn)) {
-    nghttp2_headers_aux_data *aux_data;
-    nghttp2_frame *headers_frame;
-
-    headers_frame = &nghttp2_outbound_queue_top(&session->ob_syn)->frame;
-    assert(headers_frame->hd.type == NGHTTP2_HEADERS);
-
-    if (headers_frame->hd.stream_id <= stream_id &&
-        (uint32_t)stream_id < session->next_stream_id) {
-
-      for (item = session->ob_syn.head; item; item = item->qnext) {
-        aux_data = &item->aux_data.headers;
-
-        if (item->frame.hd.stream_id < stream_id) {
-          continue;
-        }
-
-        /* stream_id in ob_syn queue must be strictly increasing.  If
-           we found larger ID, then we can break here. */
-        if (item->frame.hd.stream_id > stream_id || aux_data->canceled) {
-          break;
-        }
-
-        aux_data->error_code = error_code;
-        aux_data->canceled = 1;
-
-        return 0;
-      }
-    }
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_rst_stream_init(&frame->rst_stream, stream_id, error_code);
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    nghttp2_frame_rst_stream_free(&frame->rst_stream);
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-  return 0;
-}
-
-nghttp2_stream *nghttp2_session_open_stream(nghttp2_session *session,
-                                            int32_t stream_id, uint8_t flags,
-                                            nghttp2_priority_spec *pri_spec_in,
-                                            nghttp2_stream_state initial_state,
-                                            void *stream_user_data) {
-  int rv;
-  nghttp2_stream *stream;
-  nghttp2_stream *dep_stream = NULL;
-  int stream_alloc = 0;
-  nghttp2_priority_spec pri_spec_default;
-  nghttp2_priority_spec *pri_spec = pri_spec_in;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-  stream = nghttp2_session_get_stream_raw(session, stream_id);
-
-  if (stream) {
-    assert(stream->state == NGHTTP2_STREAM_IDLE);
-    assert(nghttp2_stream_in_dep_tree(stream));
-    nghttp2_session_detach_idle_stream(session, stream);
-    rv = nghttp2_stream_dep_remove(stream);
-    if (rv != 0) {
-      return NULL;
-    }
-  } else {
-    stream = nghttp2_mem_malloc(mem, sizeof(nghttp2_stream));
-    if (stream == NULL) {
-      return NULL;
-    }
-
-    stream_alloc = 1;
-  }
-
-  if (pri_spec->stream_id != 0) {
-    dep_stream = nghttp2_session_get_stream_raw(session, pri_spec->stream_id);
-
-    if (!dep_stream &&
-        session_detect_idle_stream(session, pri_spec->stream_id)) {
-      /* Depends on idle stream, which does not exist in memory.
-         Assign default priority for it. */
-      nghttp2_priority_spec_default_init(&pri_spec_default);
-
-      dep_stream = nghttp2_session_open_stream(
-          session, pri_spec->stream_id, NGHTTP2_FLAG_NONE, &pri_spec_default,
-          NGHTTP2_STREAM_IDLE, NULL);
-
-      if (dep_stream == NULL) {
-        if (stream_alloc) {
-          nghttp2_mem_free(mem, stream);
-        }
-
-        return NULL;
-      }
-    } else if (!dep_stream || !nghttp2_stream_in_dep_tree(dep_stream)) {
-      /* If dep_stream is not part of dependency tree, stream will get
-         default priority.  This handles the case when
-         pri_spec->stream_id == stream_id.  This happens because we
-         don't check pri_spec->stream_id against new stream ID in
-         nghttp2_submit_request.  This also handles the case when idle
-         stream created by PRIORITY frame was opened.  Somehow we
-         first remove the idle stream from dependency tree.  This is
-         done to simplify code base, but ideally we should retain old
-         dependency.  But I'm not sure this adds values. */
-      nghttp2_priority_spec_default_init(&pri_spec_default);
-      pri_spec = &pri_spec_default;
-    }
-  }
-
-  if (initial_state == NGHTTP2_STREAM_RESERVED) {
-    flags |= NGHTTP2_STREAM_FLAG_PUSH;
-  }
-
-  if (stream_alloc) {
-    nghttp2_stream_init(stream, stream_id, flags, initial_state,
-                        pri_spec->weight,
-                        (int32_t)session->remote_settings.initial_window_size,
-                        (int32_t)session->local_settings.initial_window_size,
-                        stream_user_data, mem);
-
-    rv = nghttp2_map_insert(&session->streams, &stream->map_entry);
-    if (rv != 0) {
-      nghttp2_stream_free(stream);
-      nghttp2_mem_free(mem, stream);
-      return NULL;
-    }
-  } else {
-    stream->flags = flags;
-    stream->state = initial_state;
-    stream->weight = pri_spec->weight;
-    stream->stream_user_data = stream_user_data;
-  }
-
-  switch (initial_state) {
-  case NGHTTP2_STREAM_RESERVED:
-    if (nghttp2_session_is_my_stream_id(session, stream_id)) {
-      /* reserved (local) */
-      nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-    } else {
-      /* reserved (remote) */
-      nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-      ++session->num_incoming_reserved_streams;
-    }
-    /* Reserved stream does not count in the concurrent streams
-       limit. That is one of the DOS vector. */
-    break;
-  case NGHTTP2_STREAM_IDLE:
-    /* Idle stream does not count toward the concurrent streams limit.
-       This is used as anchor node in dependency tree. */
-    nghttp2_session_keep_idle_stream(session, stream);
-    break;
-  default:
-    if (nghttp2_session_is_my_stream_id(session, stream_id)) {
-      ++session->num_outgoing_streams;
-    } else {
-      ++session->num_incoming_streams;
-    }
-  }
-
-  if (pri_spec->stream_id == 0) {
-    dep_stream = &session->root;
-  }
-
-  assert(dep_stream);
-
-  if (pri_spec->exclusive) {
-    rv = nghttp2_stream_dep_insert(dep_stream, stream);
-    if (rv != 0) {
-      return NULL;
-    }
-  } else {
-    nghttp2_stream_dep_add(dep_stream, stream);
-  }
-
-  return stream;
-}
-
-int nghttp2_session_close_stream(nghttp2_session *session, int32_t stream_id,
-                                 uint32_t error_code) {
-  int rv;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-  int is_my_stream_id;
-
-  mem = &session->mem;
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  if (!stream) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  DEBUGF("stream: stream(%p)=%d close\n", stream, stream->stream_id);
-
-  if (stream->item) {
-    nghttp2_outbound_item *item;
-
-    item = stream->item;
-
-    rv = nghttp2_stream_detach_item(stream);
-
-    if (rv != 0) {
-      return rv;
-    }
-
-    /* If item is queued, it will be deleted when it is popped
-       (nghttp2_session_prep_frame() will fail).  If session->aob.item
-       points to this item, let active_outbound_item_reset()
-       free the item. */
-    if (!item->queued && item != session->aob.item) {
-      nghttp2_outbound_item_free(item, mem);
-      nghttp2_mem_free(mem, item);
-    }
-  }
-
-  /* We call on_stream_close_callback even if stream->state is
-     NGHTTP2_STREAM_INITIAL. This will happen while sending request
-     HEADERS, a local endpoint receives RST_STREAM for that stream. It
-     may be PROTOCOL_ERROR, but without notifying stream closure will
-     hang the stream in a local endpoint.
-  */
-
-  if (session->callbacks.on_stream_close_callback) {
-    if (session->callbacks.on_stream_close_callback(
-            session, stream_id, error_code, session->user_data) != 0) {
-
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-
-  is_my_stream_id = nghttp2_session_is_my_stream_id(session, stream_id);
-
-  /* pushed streams which is not opened yet is not counted toward max
-     concurrent limits */
-  if ((stream->flags & NGHTTP2_STREAM_FLAG_PUSH)) {
-    if (!is_my_stream_id) {
-      --session->num_incoming_reserved_streams;
-    }
-  } else {
-    if (is_my_stream_id) {
-      --session->num_outgoing_streams;
-    } else {
-      --session->num_incoming_streams;
-    }
-  }
-
-  /* Closes both directions just in case they are not closed yet */
-  stream->flags |= NGHTTP2_STREAM_FLAG_CLOSED;
-
-  if ((session->opt_flags & NGHTTP2_OPTMASK_NO_CLOSED_STREAMS) == 0 &&
-      session->server && !is_my_stream_id &&
-      nghttp2_stream_in_dep_tree(stream)) {
-    /* On server side, retain stream at most MAX_CONCURRENT_STREAMS
-       combined with the current active incoming streams to make
-       dependency tree work better. */
-    nghttp2_session_keep_closed_stream(session, stream);
-  } else {
-    rv = nghttp2_session_destroy_stream(session, stream);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  return 0;
-}
-
-int nghttp2_session_destroy_stream(nghttp2_session *session,
-                                   nghttp2_stream *stream) {
-  nghttp2_mem *mem;
-  int rv;
-
-  DEBUGF("stream: destroy closed stream(%p)=%d\n", stream, stream->stream_id);
-
-  mem = &session->mem;
-
-  if (nghttp2_stream_in_dep_tree(stream)) {
-    rv = nghttp2_stream_dep_remove(stream);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  nghttp2_map_remove(&session->streams, stream->stream_id);
-  nghttp2_stream_free(stream);
-  nghttp2_mem_free(mem, stream);
-
-  return 0;
-}
-
-void nghttp2_session_keep_closed_stream(nghttp2_session *session,
-                                        nghttp2_stream *stream) {
-  DEBUGF("stream: keep closed stream(%p)=%d, state=%d\n", stream,
-         stream->stream_id, stream->state);
-
-  if (session->closed_stream_tail) {
-    session->closed_stream_tail->closed_next = stream;
-    stream->closed_prev = session->closed_stream_tail;
-  } else {
-    session->closed_stream_head = stream;
-  }
-  session->closed_stream_tail = stream;
-
-  ++session->num_closed_streams;
-}
-
-void nghttp2_session_keep_idle_stream(nghttp2_session *session,
-                                      nghttp2_stream *stream) {
-  DEBUGF("stream: keep idle stream(%p)=%d, state=%d\n", stream,
-         stream->stream_id, stream->state);
-
-  if (session->idle_stream_tail) {
-    session->idle_stream_tail->closed_next = stream;
-    stream->closed_prev = session->idle_stream_tail;
-  } else {
-    session->idle_stream_head = stream;
-  }
-  session->idle_stream_tail = stream;
-
-  ++session->num_idle_streams;
-}
-
-void nghttp2_session_detach_idle_stream(nghttp2_session *session,
-                                        nghttp2_stream *stream) {
-  nghttp2_stream *prev_stream, *next_stream;
-
-  DEBUGF("stream: detach idle stream(%p)=%d, state=%d\n", stream,
-         stream->stream_id, stream->state);
-
-  prev_stream = stream->closed_prev;
-  next_stream = stream->closed_next;
-
-  if (prev_stream) {
-    prev_stream->closed_next = next_stream;
-  } else {
-    session->idle_stream_head = next_stream;
-  }
-
-  if (next_stream) {
-    next_stream->closed_prev = prev_stream;
-  } else {
-    session->idle_stream_tail = prev_stream;
-  }
-
-  stream->closed_prev = NULL;
-  stream->closed_next = NULL;
-
-  --session->num_idle_streams;
-}
-
-int nghttp2_session_adjust_closed_stream(nghttp2_session *session) {
-  size_t num_stream_max;
-  int rv;
-
-  if (session->local_settings.max_concurrent_streams ==
-      NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS) {
-    num_stream_max = session->pending_local_max_concurrent_stream;
-  } else {
-    num_stream_max = session->local_settings.max_concurrent_streams;
-  }
-
-  DEBUGF("stream: adjusting kept closed streams num_closed_streams=%zu, "
-         "num_incoming_streams=%zu, max_concurrent_streams=%zu\n",
-         session->num_closed_streams, session->num_incoming_streams,
-         num_stream_max);
-
-  while (session->num_closed_streams > 0 &&
-         session->num_closed_streams + session->num_incoming_streams >
-             num_stream_max) {
-    nghttp2_stream *head_stream;
-    nghttp2_stream *next;
-
-    head_stream = session->closed_stream_head;
-
-    assert(head_stream);
-
-    next = head_stream->closed_next;
-
-    rv = nghttp2_session_destroy_stream(session, head_stream);
-    if (rv != 0) {
-      return rv;
-    }
-
-    /* head_stream is now freed */
-
-    session->closed_stream_head = next;
-
-    if (session->closed_stream_head) {
-      session->closed_stream_head->closed_prev = NULL;
-    } else {
-      session->closed_stream_tail = NULL;
-    }
-
-    --session->num_closed_streams;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_adjust_idle_stream(nghttp2_session *session) {
-  size_t max;
-  int rv;
-
-  /* Make minimum number of idle streams 16, and maximum 100, which
-     are arbitrary chosen numbers. */
-  max = nghttp2_min(
-      100, nghttp2_max(
-               16, nghttp2_min(session->local_settings.max_concurrent_streams,
-                               session->pending_local_max_concurrent_stream)));
-
-  DEBUGF("stream: adjusting kept idle streams num_idle_streams=%zu, max=%zu\n",
-         session->num_idle_streams, max);
-
-  while (session->num_idle_streams > max) {
-    nghttp2_stream *head;
-    nghttp2_stream *next;
-
-    head = session->idle_stream_head;
-    assert(head);
-
-    next = head->closed_next;
-
-    rv = nghttp2_session_destroy_stream(session, head);
-    if (rv != 0) {
-      return rv;
-    }
-
-    /* head is now destroyed */
-
-    session->idle_stream_head = next;
-
-    if (session->idle_stream_head) {
-      session->idle_stream_head->closed_prev = NULL;
-    } else {
-      session->idle_stream_tail = NULL;
-    }
-
-    --session->num_idle_streams;
-  }
-
-  return 0;
-}
-
-/*
- * Closes stream with stream ID |stream_id| if both transmission and
- * reception of the stream were disallowed. The |error_code| indicates
- * the reason of the closure.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *   The stream is not found.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *   The callback function failed.
- */
-int nghttp2_session_close_stream_if_shut_rdwr(nghttp2_session *session,
-                                              nghttp2_stream *stream) {
-  if ((stream->shut_flags & NGHTTP2_SHUT_RDWR) == NGHTTP2_SHUT_RDWR) {
-    return nghttp2_session_close_stream(session, stream->stream_id,
-                                        NGHTTP2_NO_ERROR);
-  }
-  return 0;
-}
-
-/*
- * Returns nonzero if local endpoint allows reception of new stream
- * from remote.
- */
-static int session_allow_incoming_new_stream(nghttp2_session *session) {
-  return (session->goaway_flags &
-          (NGHTTP2_GOAWAY_TERM_ON_SEND | NGHTTP2_GOAWAY_SENT)) == 0;
-}
-
-/*
- * This function returns nonzero if session is closing.
- */
-static int session_is_closing(nghttp2_session *session) {
-  return (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND) != 0 ||
-         (nghttp2_session_want_read(session) == 0 &&
-          nghttp2_session_want_write(session) == 0);
-}
-
-/*
- * Check that we can send a frame to the |stream|. This function
- * returns 0 if we can send a frame to the |frame|, or one of the
- * following negative error codes:
- *
- * NGHTTP2_ERR_STREAM_CLOSED
- *   The stream is already closed.
- * NGHTTP2_ERR_STREAM_SHUT_WR
- *   The stream is half-closed for transmission.
- * NGHTTP2_ERR_SESSION_CLOSING
- *   This session is closing.
- */
-static int session_predicate_for_stream_send(nghttp2_session *session,
-                                             nghttp2_stream *stream) {
-  if (stream == NULL) {
-    return NGHTTP2_ERR_STREAM_CLOSED;
-  }
-  if (session_is_closing(session)) {
-    return NGHTTP2_ERR_SESSION_CLOSING;
-  }
-  if (stream->shut_flags & NGHTTP2_SHUT_WR) {
-    return NGHTTP2_ERR_STREAM_SHUT_WR;
-  }
-  return 0;
-}
-
-int nghttp2_session_check_request_allowed(nghttp2_session *session) {
-  return !session->server && session->next_stream_id <= INT32_MAX &&
-         (session->goaway_flags & NGHTTP2_GOAWAY_RECV) == 0 &&
-         !session_is_closing(session);
-}
-
-/*
- * This function checks request HEADERS frame, which opens stream, can
- * be sent at this time.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_START_STREAM_NOT_ALLOWED
- *     New stream cannot be created because of GOAWAY: session is
- *     going down or received last_stream_id is strictly less than
- *     frame->hd.stream_id.
- * NGHTTP2_ERR_STREAM_CLOSING
- *     request HEADERS was canceled by RST_STREAM while it is in queue.
- */
-static int session_predicate_request_headers_send(nghttp2_session *session,
-                                                  nghttp2_outbound_item *item) {
-  if (item->aux_data.headers.canceled) {
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  }
-  /* If we are terminating session (NGHTTP2_GOAWAY_TERM_ON_SEND),
-     GOAWAY was received from peer, or session is about to close, new
-     request is not allowed. */
-  if ((session->goaway_flags & NGHTTP2_GOAWAY_RECV) ||
-      session_is_closing(session)) {
-    return NGHTTP2_ERR_START_STREAM_NOT_ALLOWED;
-  }
-  return 0;
-}
-
-/*
- * This function checks HEADERS, which is the first frame from the
- * server, with the |stream| can be sent at this time.  The |stream|
- * can be NULL.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_STREAM_CLOSED
- *     The stream is already closed or does not exist.
- * NGHTTP2_ERR_STREAM_SHUT_WR
- *     The transmission is not allowed for this stream (e.g., a frame
- *     with END_STREAM flag set has already sent)
- * NGHTTP2_ERR_INVALID_STREAM_ID
- *     The stream ID is invalid.
- * NGHTTP2_ERR_STREAM_CLOSING
- *     RST_STREAM was queued for this stream.
- * NGHTTP2_ERR_INVALID_STREAM_STATE
- *     The state of the stream is not valid.
- * NGHTTP2_ERR_SESSION_CLOSING
- *     This session is closing.
- * NGHTTP2_ERR_PROTO
- *     Client side attempted to send response.
- */
-static int session_predicate_response_headers_send(nghttp2_session *session,
-                                                   nghttp2_stream *stream) {
-  int rv;
-  rv = session_predicate_for_stream_send(session, stream);
-  if (rv != 0) {
-    return rv;
-  }
-  assert(stream);
-  if (!session->server) {
-    return NGHTTP2_ERR_PROTO;
-  }
-  if (nghttp2_session_is_my_stream_id(session, stream->stream_id)) {
-    return NGHTTP2_ERR_INVALID_STREAM_ID;
-  }
-  switch (stream->state) {
-  case NGHTTP2_STREAM_OPENING:
-    return 0;
-  case NGHTTP2_STREAM_CLOSING:
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  default:
-    return NGHTTP2_ERR_INVALID_STREAM_STATE;
-  }
-}
-
-/*
- * This function checks HEADERS for reserved stream can be sent. The
- * |stream| must be reserved state and the |session| is server side.
- * The |stream| can be NULL.
- *
- * This function returns 0 if it succeeds, or one of the following
- * error codes:
- *
- * NGHTTP2_ERR_STREAM_CLOSED
- *   The stream is already closed.
- * NGHTTP2_ERR_STREAM_SHUT_WR
- *   The stream is half-closed for transmission.
- * NGHTTP2_ERR_PROTO
- *   The stream is not reserved state
- * NGHTTP2_ERR_STREAM_CLOSED
- *   RST_STREAM was queued for this stream.
- * NGHTTP2_ERR_SESSION_CLOSING
- *   This session is closing.
- * NGHTTP2_ERR_START_STREAM_NOT_ALLOWED
- *   New stream cannot be created because GOAWAY is already sent or
- *   received.
- * NGHTTP2_ERR_PROTO
- *   Client side attempted to send push response.
- */
-static int
-session_predicate_push_response_headers_send(nghttp2_session *session,
-                                             nghttp2_stream *stream) {
-  int rv;
-  /* TODO Should disallow HEADERS if GOAWAY has already been issued? */
-  rv = session_predicate_for_stream_send(session, stream);
-  if (rv != 0) {
-    return rv;
-  }
-  assert(stream);
-  if (!session->server) {
-    return NGHTTP2_ERR_PROTO;
-  }
-  if (stream->state != NGHTTP2_STREAM_RESERVED) {
-    return NGHTTP2_ERR_PROTO;
-  }
-  if (session->goaway_flags & NGHTTP2_GOAWAY_RECV) {
-    return NGHTTP2_ERR_START_STREAM_NOT_ALLOWED;
-  }
-  return 0;
-}
-
-/*
- * This function checks HEADERS, which is neither stream-opening nor
- * first response header, with the |stream| can be sent at this time.
- * The |stream| can be NULL.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_STREAM_CLOSED
- *     The stream is already closed or does not exist.
- * NGHTTP2_ERR_STREAM_SHUT_WR
- *     The transmission is not allowed for this stream (e.g., a frame
- *     with END_STREAM flag set has already sent)
- * NGHTTP2_ERR_STREAM_CLOSING
- *     RST_STREAM was queued for this stream.
- * NGHTTP2_ERR_INVALID_STREAM_STATE
- *     The state of the stream is not valid.
- * NGHTTP2_ERR_SESSION_CLOSING
- *   This session is closing.
- */
-static int session_predicate_headers_send(nghttp2_session *session,
-                                          nghttp2_stream *stream) {
-  int rv;
-  rv = session_predicate_for_stream_send(session, stream);
-  if (rv != 0) {
-    return rv;
-  }
-  assert(stream);
-
-  switch (stream->state) {
-  case NGHTTP2_STREAM_OPENED:
-    return 0;
-  case NGHTTP2_STREAM_CLOSING:
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  default:
-    if (nghttp2_session_is_my_stream_id(session, stream->stream_id)) {
-      return 0;
-    }
-    return NGHTTP2_ERR_INVALID_STREAM_STATE;
-  }
-}
-
-/*
- * This function checks PUSH_PROMISE frame |frame| with the |stream|
- * can be sent at this time.  The |stream| can be NULL.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_START_STREAM_NOT_ALLOWED
- *     New stream cannot be created because GOAWAY is already sent or
- *     received.
- * NGHTTP2_ERR_PROTO
- *     The client side attempts to send PUSH_PROMISE, or the server
- *     sends PUSH_PROMISE for the stream not initiated by the client.
- * NGHTTP2_ERR_STREAM_CLOSED
- *     The stream is already closed or does not exist.
- * NGHTTP2_ERR_STREAM_CLOSING
- *     RST_STREAM was queued for this stream.
- * NGHTTP2_ERR_STREAM_SHUT_WR
- *     The transmission is not allowed for this stream (e.g., a frame
- *     with END_STREAM flag set has already sent)
- * NGHTTP2_ERR_PUSH_DISABLED
- *     The remote peer disabled reception of PUSH_PROMISE.
- * NGHTTP2_ERR_SESSION_CLOSING
- *   This session is closing.
- */
-static int session_predicate_push_promise_send(nghttp2_session *session,
-                                               nghttp2_stream *stream) {
-  int rv;
-
-  if (!session->server) {
-    return NGHTTP2_ERR_PROTO;
-  }
-
-  rv = session_predicate_for_stream_send(session, stream);
-  if (rv != 0) {
-    return rv;
-  }
-
-  assert(stream);
-
-  if (session->remote_settings.enable_push == 0) {
-    return NGHTTP2_ERR_PUSH_DISABLED;
-  }
-  if (stream->state == NGHTTP2_STREAM_CLOSING) {
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  }
-  if (session->goaway_flags & NGHTTP2_GOAWAY_RECV) {
-    return NGHTTP2_ERR_START_STREAM_NOT_ALLOWED;
-  }
-  return 0;
-}
-
-/*
- * This function checks WINDOW_UPDATE with the stream ID |stream_id|
- * can be sent at this time. Note that END_STREAM flag of the previous
- * frame does not affect the transmission of the WINDOW_UPDATE frame.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_STREAM_CLOSED
- *     The stream is already closed or does not exist.
- * NGHTTP2_ERR_STREAM_CLOSING
- *     RST_STREAM was queued for this stream.
- * NGHTTP2_ERR_INVALID_STREAM_STATE
- *     The state of the stream is not valid.
- * NGHTTP2_ERR_SESSION_CLOSING
- *   This session is closing.
- */
-static int session_predicate_window_update_send(nghttp2_session *session,
-                                                int32_t stream_id) {
-  nghttp2_stream *stream;
-
-  if (session_is_closing(session)) {
-    return NGHTTP2_ERR_SESSION_CLOSING;
-  }
-
-  if (stream_id == 0) {
-    /* Connection-level window update */
-    return 0;
-  }
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL) {
-    return NGHTTP2_ERR_STREAM_CLOSED;
-  }
-  if (stream->state == NGHTTP2_STREAM_CLOSING) {
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  }
-  if (state_reserved_local(session, stream)) {
-    return NGHTTP2_ERR_INVALID_STREAM_STATE;
-  }
-  return 0;
-}
-
-static int session_predicate_altsvc_send(nghttp2_session *session,
-                                         int32_t stream_id) {
-  nghttp2_stream *stream;
-
-  if (session_is_closing(session)) {
-    return NGHTTP2_ERR_SESSION_CLOSING;
-  }
-
-  if (stream_id == 0) {
-    return 0;
-  }
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL) {
-    return NGHTTP2_ERR_STREAM_CLOSED;
-  }
-  if (stream->state == NGHTTP2_STREAM_CLOSING) {
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  }
-
-  return 0;
-}
-
-static int session_predicate_origin_send(nghttp2_session *session) {
-  if (session_is_closing(session)) {
-    return NGHTTP2_ERR_SESSION_CLOSING;
-  }
-  return 0;
-}
-
-/* Take into account settings max frame size and both connection-level
-   flow control here */
-static ssize_t
-nghttp2_session_enforce_flow_control_limits(nghttp2_session *session,
-                                            nghttp2_stream *stream,
-                                            ssize_t requested_window_size) {
-  DEBUGF("send: remote windowsize connection=%d, remote maxframsize=%u, "
-         "stream(id %d)=%d\n",
-         session->remote_window_size, session->remote_settings.max_frame_size,
-         stream->stream_id, stream->remote_window_size);
-
-  return nghttp2_min(nghttp2_min(nghttp2_min(requested_window_size,
-                                             stream->remote_window_size),
-                                 session->remote_window_size),
-                     (int32_t)session->remote_settings.max_frame_size);
-}
-
-/*
- * Returns the maximum length of next data read. If the
- * connection-level and/or stream-wise flow control are enabled, the
- * return value takes into account those current window sizes. The remote
- * settings for max frame size is also taken into account.
- */
-static size_t nghttp2_session_next_data_read(nghttp2_session *session,
-                                             nghttp2_stream *stream) {
-  ssize_t window_size;
-
-  window_size = nghttp2_session_enforce_flow_control_limits(
-      session, stream, NGHTTP2_DATA_PAYLOADLEN);
-
-  DEBUGF("send: available window=%zd\n", window_size);
-
-  return window_size > 0 ? (size_t)window_size : 0;
-}
-
-/*
- * This function checks DATA with the |stream| can be sent at this
- * time.  The |stream| can be NULL.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_STREAM_CLOSED
- *     The stream is already closed or does not exist.
- * NGHTTP2_ERR_STREAM_SHUT_WR
- *     The transmission is not allowed for this stream (e.g., a frame
- *     with END_STREAM flag set has already sent)
- * NGHTTP2_ERR_STREAM_CLOSING
- *     RST_STREAM was queued for this stream.
- * NGHTTP2_ERR_INVALID_STREAM_STATE
- *     The state of the stream is not valid.
- * NGHTTP2_ERR_SESSION_CLOSING
- *   This session is closing.
- */
-static int nghttp2_session_predicate_data_send(nghttp2_session *session,
-                                               nghttp2_stream *stream) {
-  int rv;
-  rv = session_predicate_for_stream_send(session, stream);
-  if (rv != 0) {
-    return rv;
-  }
-  assert(stream);
-  if (nghttp2_session_is_my_stream_id(session, stream->stream_id)) {
-    /* Request body data */
-    /* If stream->state is NGHTTP2_STREAM_CLOSING, RST_STREAM was
-       queued but not yet sent. In this case, we won't send DATA
-       frames. */
-    if (stream->state == NGHTTP2_STREAM_CLOSING) {
-      return NGHTTP2_ERR_STREAM_CLOSING;
-    }
-    if (stream->state == NGHTTP2_STREAM_RESERVED) {
-      return NGHTTP2_ERR_INVALID_STREAM_STATE;
-    }
-    return 0;
-  }
-  /* Response body data */
-  if (stream->state == NGHTTP2_STREAM_OPENED) {
-    return 0;
-  }
-  if (stream->state == NGHTTP2_STREAM_CLOSING) {
-    return NGHTTP2_ERR_STREAM_CLOSING;
-  }
-  return NGHTTP2_ERR_INVALID_STREAM_STATE;
-}
-
-static ssize_t session_call_select_padding(nghttp2_session *session,
-                                           const nghttp2_frame *frame,
-                                           size_t max_payloadlen) {
-  ssize_t rv;
-
-  if (frame->hd.length >= max_payloadlen) {
-    return (ssize_t)frame->hd.length;
-  }
-
-  if (session->callbacks.select_padding_callback) {
-    size_t max_paddedlen;
-
-    max_paddedlen =
-        nghttp2_min(frame->hd.length + NGHTTP2_MAX_PADLEN, max_payloadlen);
-
-    rv = session->callbacks.select_padding_callback(
-        session, frame, max_paddedlen, session->user_data);
-    if (rv < (ssize_t)frame->hd.length || rv > (ssize_t)max_paddedlen) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-    return rv;
-  }
-  return (ssize_t)frame->hd.length;
-}
-
-/* Add padding to HEADERS or PUSH_PROMISE. We use
-   frame->headers.padlen in this function to use the fact that
-   frame->push_promise has also padlen in the same position. */
-static int session_headers_add_pad(nghttp2_session *session,
-                                   nghttp2_frame *frame) {
-  int rv;
-  ssize_t padded_payloadlen;
-  nghttp2_active_outbound_item *aob;
-  nghttp2_bufs *framebufs;
-  size_t padlen;
-  size_t max_payloadlen;
-
-  aob = &session->aob;
-  framebufs = &aob->framebufs;
-
-  max_payloadlen = nghttp2_min(NGHTTP2_MAX_PAYLOADLEN,
-                               frame->hd.length + NGHTTP2_MAX_PADLEN);
-
-  padded_payloadlen =
-      session_call_select_padding(session, frame, max_payloadlen);
-
-  if (nghttp2_is_fatal((int)padded_payloadlen)) {
-    return (int)padded_payloadlen;
-  }
-
-  padlen = (size_t)padded_payloadlen - frame->hd.length;
-
-  DEBUGF("send: padding selected: payloadlen=%zd, padlen=%zu\n",
-         padded_payloadlen, padlen);
-
-  rv = nghttp2_frame_add_pad(framebufs, &frame->hd, padlen, 0);
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  frame->headers.padlen = padlen;
-
-  return 0;
-}
-
-static size_t session_estimate_headers_payload(nghttp2_session *session,
-                                               const nghttp2_nv *nva,
-                                               size_t nvlen,
-                                               size_t additional) {
-  return nghttp2_hd_deflate_bound(&session->hd_deflater, nva, nvlen) +
-         additional;
-}
-
-static int session_pack_extension(nghttp2_session *session, nghttp2_bufs *bufs,
-                                  nghttp2_frame *frame) {
-  ssize_t rv;
-  nghttp2_buf *buf;
-  size_t buflen;
-  size_t framelen;
-
-  assert(session->callbacks.pack_extension_callback);
-
-  buf = &bufs->head->buf;
-  buflen = nghttp2_min(nghttp2_buf_avail(buf), NGHTTP2_MAX_PAYLOADLEN);
-
-  rv = session->callbacks.pack_extension_callback(session, buf->last, buflen,
-                                                  frame, session->user_data);
-  if (rv == NGHTTP2_ERR_CANCEL) {
-    return (int)rv;
-  }
-
-  if (rv < 0 || (size_t)rv > buflen) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  framelen = (size_t)rv;
-
-  frame->hd.length = framelen;
-
-  assert(buf->pos == buf->last);
-  buf->last += framelen;
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  return 0;
-}
-
-/*
- * This function serializes frame for transmission.
- *
- * This function returns 0 if it succeeds, or one of negative error
- * codes, including both fatal and non-fatal ones.
- */
-static int session_prep_frame(nghttp2_session *session,
-                              nghttp2_outbound_item *item) {
-  int rv;
-  nghttp2_frame *frame;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-  frame = &item->frame;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    size_t next_readmax;
-    nghttp2_stream *stream;
-
-    stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-
-    if (stream) {
-      assert(stream->item == item);
-    }
-
-    rv = nghttp2_session_predicate_data_send(session, stream);
-    if (rv != 0) {
-      // If stream was already closed, nghttp2_session_get_stream()
-      // returns NULL, but item is still attached to the stream.
-      // Search stream including closed again.
-      stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
-      if (stream) {
-        int rv2;
-
-        rv2 = nghttp2_stream_detach_item(stream);
-
-        if (nghttp2_is_fatal(rv2)) {
-          return rv2;
-        }
-      }
-
-      return rv;
-    }
-    /* Assuming stream is not NULL */
-    assert(stream);
-    next_readmax = nghttp2_session_next_data_read(session, stream);
-
-    if (next_readmax == 0) {
-
-      /* This must be true since we only pop DATA frame item from
-         queue when session->remote_window_size > 0 */
-      assert(session->remote_window_size > 0);
-
-      rv = nghttp2_stream_defer_item(stream,
-                                     NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      session->aob.item = NULL;
-      active_outbound_item_reset(&session->aob, mem);
-      return NGHTTP2_ERR_DEFERRED;
-    }
-
-    rv = nghttp2_session_pack_data(session, &session->aob.framebufs,
-                                   next_readmax, frame, &item->aux_data.data,
-                                   stream);
-    if (rv == NGHTTP2_ERR_PAUSE) {
-      return rv;
-    }
-    if (rv == NGHTTP2_ERR_DEFERRED) {
-      rv = nghttp2_stream_defer_item(stream, NGHTTP2_STREAM_FLAG_DEFERRED_USER);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      session->aob.item = NULL;
-      active_outbound_item_reset(&session->aob, mem);
-      return NGHTTP2_ERR_DEFERRED;
-    }
-    if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-      rv = nghttp2_stream_detach_item(stream);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      rv = nghttp2_session_add_rst_stream(session, frame->hd.stream_id,
-                                          NGHTTP2_INTERNAL_ERROR);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-    if (rv != 0) {
-      int rv2;
-
-      rv2 = nghttp2_stream_detach_item(stream);
-
-      if (nghttp2_is_fatal(rv2)) {
-        return rv2;
-      }
-
-      return rv;
-    }
-    return 0;
-  }
-  case NGHTTP2_HEADERS: {
-    nghttp2_headers_aux_data *aux_data;
-    size_t estimated_payloadlen;
-
-    aux_data = &item->aux_data.headers;
-
-    if (frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-      /* initial HEADERS, which opens stream */
-      nghttp2_stream *stream;
-
-      stream = nghttp2_session_open_stream(
-          session, frame->hd.stream_id, NGHTTP2_STREAM_FLAG_NONE,
-          &frame->headers.pri_spec, NGHTTP2_STREAM_INITIAL,
-          aux_data->stream_user_data);
-
-      if (stream == NULL) {
-        return NGHTTP2_ERR_NOMEM;
-      }
-
-      /* We don't call nghttp2_session_adjust_closed_stream() here,
-         since we don't keep closed stream in client side */
-
-      rv = session_predicate_request_headers_send(session, item);
-      if (rv != 0) {
-        return rv;
-      }
-
-      if (session_enforce_http_messaging(session)) {
-        nghttp2_http_record_request_method(stream, frame);
-      }
-    } else {
-      nghttp2_stream *stream;
-
-      stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-
-      if (stream && stream->state == NGHTTP2_STREAM_RESERVED) {
-        rv = session_predicate_push_response_headers_send(session, stream);
-        if (rv == 0) {
-          frame->headers.cat = NGHTTP2_HCAT_PUSH_RESPONSE;
-
-          if (aux_data->stream_user_data) {
-            stream->stream_user_data = aux_data->stream_user_data;
-          }
-        }
-      } else if (session_predicate_response_headers_send(session, stream) ==
-                 0) {
-        frame->headers.cat = NGHTTP2_HCAT_RESPONSE;
-        rv = 0;
-      } else {
-        frame->headers.cat = NGHTTP2_HCAT_HEADERS;
-
-        rv = session_predicate_headers_send(session, stream);
-      }
-
-      if (rv != 0) {
-        return rv;
-      }
-    }
-
-    estimated_payloadlen = session_estimate_headers_payload(
-        session, frame->headers.nva, frame->headers.nvlen,
-        NGHTTP2_PRIORITY_SPECLEN);
-
-    if (estimated_payloadlen > session->max_send_header_block_length) {
-      return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-    }
-
-    rv = nghttp2_frame_pack_headers(&session->aob.framebufs, &frame->headers,
-                                    &session->hd_deflater);
-
-    if (rv != 0) {
-      return rv;
-    }
-
-    DEBUGF("send: before padding, HEADERS serialized in %zd bytes\n",
-           nghttp2_bufs_len(&session->aob.framebufs));
-
-    rv = session_headers_add_pad(session, frame);
-
-    if (rv != 0) {
-      return rv;
-    }
-
-    DEBUGF("send: HEADERS finally serialized in %zd bytes\n",
-           nghttp2_bufs_len(&session->aob.framebufs));
-
-    if (frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-      assert(session->last_sent_stream_id < frame->hd.stream_id);
-      session->last_sent_stream_id = frame->hd.stream_id;
-    }
-
-    return 0;
-  }
-  case NGHTTP2_PRIORITY: {
-    if (session_is_closing(session)) {
-      return NGHTTP2_ERR_SESSION_CLOSING;
-    }
-    /* PRIORITY frame can be sent at any time and to any stream
-       ID. */
-    nghttp2_frame_pack_priority(&session->aob.framebufs, &frame->priority);
-
-    /* Peer can send PRIORITY frame against idle stream to create
-       "anchor" in dependency tree.  Only client can do this in
-       nghttp2.  In nghttp2, only server retains non-active (closed
-       or idle) streams in memory, so we don't open stream here. */
-    return 0;
-  }
-  case NGHTTP2_RST_STREAM:
-    if (session_is_closing(session)) {
-      return NGHTTP2_ERR_SESSION_CLOSING;
-    }
-    nghttp2_frame_pack_rst_stream(&session->aob.framebufs, &frame->rst_stream);
-    return 0;
-  case NGHTTP2_SETTINGS: {
-    if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
-      assert(session->obq_flood_counter_ > 0);
-      --session->obq_flood_counter_;
-      /* When session is about to close, don't send SETTINGS ACK.
-         We are required to send SETTINGS without ACK though; for
-         example, we have to send SETTINGS as a part of connection
-         preface. */
-      if (session_is_closing(session)) {
-        return NGHTTP2_ERR_SESSION_CLOSING;
-      }
-    }
-
-    rv = nghttp2_frame_pack_settings(&session->aob.framebufs, &frame->settings);
-    if (rv != 0) {
-      return rv;
-    }
-    return 0;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    nghttp2_stream *stream;
-    size_t estimated_payloadlen;
-
-    /* stream could be NULL if associated stream was already
-       closed. */
-    stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-
-    /* predicate should fail if stream is NULL. */
-    rv = session_predicate_push_promise_send(session, stream);
-    if (rv != 0) {
-      return rv;
-    }
-
-    assert(stream);
-
-    estimated_payloadlen = session_estimate_headers_payload(
-        session, frame->push_promise.nva, frame->push_promise.nvlen, 0);
-
-    if (estimated_payloadlen > session->max_send_header_block_length) {
-      return NGHTTP2_ERR_FRAME_SIZE_ERROR;
-    }
-
-    rv = nghttp2_frame_pack_push_promise(
-        &session->aob.framebufs, &frame->push_promise, &session->hd_deflater);
-    if (rv != 0) {
-      return rv;
-    }
-    rv = session_headers_add_pad(session, frame);
-    if (rv != 0) {
-      return rv;
-    }
-
-    assert(session->last_sent_stream_id + 2 <=
-           frame->push_promise.promised_stream_id);
-    session->last_sent_stream_id = frame->push_promise.promised_stream_id;
-
-    return 0;
-  }
-  case NGHTTP2_PING:
-    if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
-      assert(session->obq_flood_counter_ > 0);
-      --session->obq_flood_counter_;
-    }
-    /* PING frame is allowed to be sent unless termination GOAWAY is
-       sent */
-    if (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND) {
-      return NGHTTP2_ERR_SESSION_CLOSING;
-    }
-    nghttp2_frame_pack_ping(&session->aob.framebufs, &frame->ping);
-    return 0;
-  case NGHTTP2_GOAWAY:
-    rv = nghttp2_frame_pack_goaway(&session->aob.framebufs, &frame->goaway);
-    if (rv != 0) {
-      return rv;
-    }
-    session->local_last_stream_id = frame->goaway.last_stream_id;
-
-    return 0;
-  case NGHTTP2_WINDOW_UPDATE:
-    rv = session_predicate_window_update_send(session, frame->hd.stream_id);
-    if (rv != 0) {
-      return rv;
-    }
-    nghttp2_frame_pack_window_update(&session->aob.framebufs,
-                                     &frame->window_update);
-    return 0;
-  case NGHTTP2_CONTINUATION:
-    /* We never handle CONTINUATION here. */
-    assert(0);
-    return 0;
-  default: {
-    nghttp2_ext_aux_data *aux_data;
-
-    /* extension frame */
-
-    aux_data = &item->aux_data.ext;
-
-    if (aux_data->builtin == 0) {
-      if (session_is_closing(session)) {
-        return NGHTTP2_ERR_SESSION_CLOSING;
-      }
-
-      return session_pack_extension(session, &session->aob.framebufs, frame);
-    }
-
-    switch (frame->hd.type) {
-    case NGHTTP2_ALTSVC:
-      rv = session_predicate_altsvc_send(session, frame->hd.stream_id);
-      if (rv != 0) {
-        return rv;
-      }
-
-      nghttp2_frame_pack_altsvc(&session->aob.framebufs, &frame->ext);
-
-      return 0;
-    case NGHTTP2_ORIGIN:
-      rv = session_predicate_origin_send(session);
-      if (rv != 0) {
-        return rv;
-      }
-
-      rv = nghttp2_frame_pack_origin(&session->aob.framebufs, &frame->ext);
-      if (rv != 0) {
-        return rv;
-      }
-
-      return 0;
-    default:
-      /* Unreachable here */
-      assert(0);
-      return 0;
-    }
-  }
-  }
-}
-
-nghttp2_outbound_item *
-nghttp2_session_get_next_ob_item(nghttp2_session *session) {
-  if (nghttp2_outbound_queue_top(&session->ob_urgent)) {
-    return nghttp2_outbound_queue_top(&session->ob_urgent);
-  }
-
-  if (nghttp2_outbound_queue_top(&session->ob_reg)) {
-    return nghttp2_outbound_queue_top(&session->ob_reg);
-  }
-
-  if (!session_is_outgoing_concurrent_streams_max(session)) {
-    if (nghttp2_outbound_queue_top(&session->ob_syn)) {
-      return nghttp2_outbound_queue_top(&session->ob_syn);
-    }
-  }
-
-  if (session->remote_window_size > 0) {
-    return nghttp2_stream_next_outbound_item(&session->root);
-  }
-
-  return NULL;
-}
-
-nghttp2_outbound_item *
-nghttp2_session_pop_next_ob_item(nghttp2_session *session) {
-  nghttp2_outbound_item *item;
-
-  item = nghttp2_outbound_queue_top(&session->ob_urgent);
-  if (item) {
-    nghttp2_outbound_queue_pop(&session->ob_urgent);
-    item->queued = 0;
-    return item;
-  }
-
-  item = nghttp2_outbound_queue_top(&session->ob_reg);
-  if (item) {
-    nghttp2_outbound_queue_pop(&session->ob_reg);
-    item->queued = 0;
-    return item;
-  }
-
-  if (!session_is_outgoing_concurrent_streams_max(session)) {
-    item = nghttp2_outbound_queue_top(&session->ob_syn);
-    if (item) {
-      nghttp2_outbound_queue_pop(&session->ob_syn);
-      item->queued = 0;
-      return item;
-    }
-  }
-
-  if (session->remote_window_size > 0) {
-    return nghttp2_stream_next_outbound_item(&session->root);
-  }
-
-  return NULL;
-}
-
-static int session_call_before_frame_send(nghttp2_session *session,
-                                          nghttp2_frame *frame) {
-  int rv;
-  if (session->callbacks.before_frame_send_callback) {
-    rv = session->callbacks.before_frame_send_callback(session, frame,
-                                                       session->user_data);
-    if (rv == NGHTTP2_ERR_CANCEL) {
-      return rv;
-    }
-
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-static int session_call_on_frame_send(nghttp2_session *session,
-                                      nghttp2_frame *frame) {
-  int rv;
-  if (session->callbacks.on_frame_send_callback) {
-    rv = session->callbacks.on_frame_send_callback(session, frame,
-                                                   session->user_data);
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-static int find_stream_on_goaway_func(nghttp2_map_entry *entry, void *ptr) {
-  nghttp2_close_stream_on_goaway_arg *arg;
-  nghttp2_stream *stream;
-
-  arg = (nghttp2_close_stream_on_goaway_arg *)ptr;
-  stream = (nghttp2_stream *)entry;
-
-  if (nghttp2_session_is_my_stream_id(arg->session, stream->stream_id)) {
-    if (arg->incoming) {
-      return 0;
-    }
-  } else if (!arg->incoming) {
-    return 0;
-  }
-
-  if (stream->state != NGHTTP2_STREAM_IDLE &&
-      (stream->flags & NGHTTP2_STREAM_FLAG_CLOSED) == 0 &&
-      stream->stream_id > arg->last_stream_id) {
-    /* We are collecting streams to close because we cannot call
-       nghttp2_session_close_stream() inside nghttp2_map_each().
-       Reuse closed_next member.. bad choice? */
-    assert(stream->closed_next == NULL);
-    assert(stream->closed_prev == NULL);
-
-    if (arg->head) {
-      stream->closed_next = arg->head;
-      arg->head = stream;
-    } else {
-      arg->head = stream;
-    }
-  }
-
-  return 0;
-}
-
-/* Closes non-idle and non-closed streams whose stream ID >
-   last_stream_id.  If incoming is nonzero, we are going to close
-   incoming streams.  Otherwise, close outgoing streams. */
-static int session_close_stream_on_goaway(nghttp2_session *session,
-                                          int32_t last_stream_id,
-                                          int incoming) {
-  int rv;
-  nghttp2_stream *stream, *next_stream;
-  nghttp2_close_stream_on_goaway_arg arg = {session, NULL, last_stream_id,
-                                            incoming};
-
-  rv = nghttp2_map_each(&session->streams, find_stream_on_goaway_func, &arg);
-  assert(rv == 0);
-
-  stream = arg.head;
-  while (stream) {
-    next_stream = stream->closed_next;
-    stream->closed_next = NULL;
-    rv = nghttp2_session_close_stream(session, stream->stream_id,
-                                      NGHTTP2_REFUSED_STREAM);
-
-    /* stream may be deleted here */
-
-    stream = next_stream;
-
-    if (nghttp2_is_fatal(rv)) {
-      /* Clean up closed_next member just in case */
-      while (stream) {
-        next_stream = stream->closed_next;
-        stream->closed_next = NULL;
-        stream = next_stream;
-      }
-      return rv;
-    }
-  }
-
-  return 0;
-}
-
-static void reschedule_stream(nghttp2_stream *stream) {
-  stream->last_writelen = stream->item->frame.hd.length;
-
-  nghttp2_stream_reschedule(stream);
-}
-
-static int session_update_stream_consumed_size(nghttp2_session *session,
-                                               nghttp2_stream *stream,
-                                               size_t delta_size);
-
-static int session_update_connection_consumed_size(nghttp2_session *session,
-                                                   size_t delta_size);
-
-static int session_update_recv_connection_window_size(nghttp2_session *session,
-                                                      size_t delta_size);
-
-static int session_update_recv_stream_window_size(nghttp2_session *session,
-                                                  nghttp2_stream *stream,
-                                                  size_t delta_size,
-                                                  int send_window_update);
-
-/*
- * Called after a frame is sent.  This function runs
- * on_frame_send_callback and handles stream closure upon END_STREAM
- * or RST_STREAM.  This function does not reset session->aob.  It is a
- * responsibility of session_after_frame_sent2.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-static int session_after_frame_sent1(nghttp2_session *session) {
-  int rv;
-  nghttp2_active_outbound_item *aob = &session->aob;
-  nghttp2_outbound_item *item = aob->item;
-  nghttp2_bufs *framebufs = &aob->framebufs;
-  nghttp2_frame *frame;
-  nghttp2_stream *stream;
-
-  frame = &item->frame;
-
-  if (frame->hd.type == NGHTTP2_DATA) {
-    nghttp2_data_aux_data *aux_data;
-
-    aux_data = &item->aux_data.data;
-
-    stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-    /* We update flow control window after a frame was completely
-       sent. This is possible because we choose payload length not to
-       exceed the window */
-    session->remote_window_size -= (int32_t)frame->hd.length;
-    if (stream) {
-      stream->remote_window_size -= (int32_t)frame->hd.length;
-    }
-
-    if (stream && aux_data->eof) {
-      rv = nghttp2_stream_detach_item(stream);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      /* Call on_frame_send_callback after
-         nghttp2_stream_detach_item(), so that application can issue
-         nghttp2_submit_data() in the callback. */
-      if (session->callbacks.on_frame_send_callback) {
-        rv = session_call_on_frame_send(session, frame);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-      }
-
-      if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-        int stream_closed;
-
-        stream_closed =
-            (stream->shut_flags & NGHTTP2_SHUT_RDWR) == NGHTTP2_SHUT_RDWR;
-
-        nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-
-        rv = nghttp2_session_close_stream_if_shut_rdwr(session, stream);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-        /* stream may be NULL if it was closed */
-        if (stream_closed) {
-          stream = NULL;
-        }
-      }
-      return 0;
-    }
-
-    if (session->callbacks.on_frame_send_callback) {
-      rv = session_call_on_frame_send(session, frame);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-    }
-
-    return 0;
-  }
-
-  /* non-DATA frame */
-
-  if (frame->hd.type == NGHTTP2_HEADERS ||
-      frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-    if (nghttp2_bufs_next_present(framebufs)) {
-      DEBUGF("send: CONTINUATION exists, just return\n");
-      return 0;
-    }
-  }
-  rv = session_call_on_frame_send(session, frame);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    nghttp2_headers_aux_data *aux_data;
-
-    stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-    if (!stream) {
-      return 0;
-    }
-
-    switch (frame->headers.cat) {
-    case NGHTTP2_HCAT_REQUEST: {
-      stream->state = NGHTTP2_STREAM_OPENING;
-      if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-        nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-      }
-      rv = nghttp2_session_close_stream_if_shut_rdwr(session, stream);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-      /* We assume aux_data is a pointer to nghttp2_headers_aux_data */
-      aux_data = &item->aux_data.headers;
-      if (aux_data->data_prd.read_callback) {
-        /* nghttp2_submit_data() makes a copy of aux_data->data_prd */
-        rv = nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM,
-                                 frame->hd.stream_id, &aux_data->data_prd);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-        /* TODO nghttp2_submit_data() may fail if stream has already
-           DATA frame item.  We might have to handle it here. */
-      }
-      return 0;
-    }
-    case NGHTTP2_HCAT_PUSH_RESPONSE:
-      stream->flags = (uint8_t)(stream->flags & ~NGHTTP2_STREAM_FLAG_PUSH);
-      ++session->num_outgoing_streams;
-    /* Fall through */
-    case NGHTTP2_HCAT_RESPONSE:
-      stream->state = NGHTTP2_STREAM_OPENED;
-    /* Fall through */
-    case NGHTTP2_HCAT_HEADERS:
-      if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-        nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-      }
-      rv = nghttp2_session_close_stream_if_shut_rdwr(session, stream);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-      /* We assume aux_data is a pointer to nghttp2_headers_aux_data */
-      aux_data = &item->aux_data.headers;
-      if (aux_data->data_prd.read_callback) {
-        rv = nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM,
-                                 frame->hd.stream_id, &aux_data->data_prd);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-        /* TODO nghttp2_submit_data() may fail if stream has already
-           DATA frame item.  We might have to handle it here. */
-      }
-      return 0;
-    default:
-      /* Unreachable */
-      assert(0);
-      return 0;
-    }
-  }
-  case NGHTTP2_PRIORITY:
-    if (session->server) {
-      return 0;
-      ;
-    }
-
-    stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
-
-    if (!stream) {
-      if (!session_detect_idle_stream(session, frame->hd.stream_id)) {
-        return 0;
-      }
-
-      stream = nghttp2_session_open_stream(
-          session, frame->hd.stream_id, NGHTTP2_FLAG_NONE,
-          &frame->priority.pri_spec, NGHTTP2_STREAM_IDLE, NULL);
-      if (!stream) {
-        return NGHTTP2_ERR_NOMEM;
-      }
-    } else {
-      rv = nghttp2_session_reprioritize_stream(session, stream,
-                                               &frame->priority.pri_spec);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-    }
-
-    rv = nghttp2_session_adjust_idle_stream(session);
-
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-
-    return 0;
-  case NGHTTP2_RST_STREAM:
-    rv = nghttp2_session_close_stream(session, frame->hd.stream_id,
-                                      frame->rst_stream.error_code);
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-    return 0;
-  case NGHTTP2_GOAWAY: {
-    nghttp2_goaway_aux_data *aux_data;
-
-    aux_data = &item->aux_data.goaway;
-
-    if ((aux_data->flags & NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE) == 0) {
-
-      if (aux_data->flags & NGHTTP2_GOAWAY_AUX_TERM_ON_SEND) {
-        session->goaway_flags |= NGHTTP2_GOAWAY_TERM_SENT;
-      }
-
-      session->goaway_flags |= NGHTTP2_GOAWAY_SENT;
-
-      rv = session_close_stream_on_goaway(session, frame->goaway.last_stream_id,
-                                          1);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-    }
-
-    return 0;
-  }
-  case NGHTTP2_WINDOW_UPDATE:
-    if (frame->hd.stream_id == 0) {
-      session->window_update_queued = 0;
-      if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
-        rv = session_update_connection_consumed_size(session, 0);
-      } else {
-        rv = session_update_recv_connection_window_size(session, 0);
-      }
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      return 0;
-    }
-
-    stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-    if (!stream) {
-      return 0;
-    }
-
-    stream->window_update_queued = 0;
-
-    /* We don't have to send WINDOW_UPDATE if END_STREAM from peer
-       is seen. */
-    if (stream->shut_flags & NGHTTP2_SHUT_RD) {
-      return 0;
-    }
-
-    if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
-      rv = session_update_stream_consumed_size(session, stream, 0);
-    } else {
-      rv = session_update_recv_stream_window_size(session, stream, 0, 1);
-    }
-
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-
-    return 0;
-  default:
-    return 0;
-  }
-}
-
-/*
- * Called after a frame is sent and session_after_frame_sent1.  This
- * function is responsible to reset session->aob.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-static int session_after_frame_sent2(nghttp2_session *session) {
-  int rv;
-  nghttp2_active_outbound_item *aob = &session->aob;
-  nghttp2_outbound_item *item = aob->item;
-  nghttp2_bufs *framebufs = &aob->framebufs;
-  nghttp2_frame *frame;
-  nghttp2_mem *mem;
-  nghttp2_stream *stream;
-  nghttp2_data_aux_data *aux_data;
-
-  mem = &session->mem;
-  frame = &item->frame;
-
-  if (frame->hd.type != NGHTTP2_DATA) {
-
-    if (frame->hd.type == NGHTTP2_HEADERS ||
-        frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-
-      if (nghttp2_bufs_next_present(framebufs)) {
-        framebufs->cur = framebufs->cur->next;
-
-        DEBUGF("send: next CONTINUATION frame, %zu bytes\n",
-               nghttp2_buf_len(&framebufs->cur->buf));
-
-        return 0;
-      }
-    }
-
-    active_outbound_item_reset(&session->aob, mem);
-
-    return 0;
-  }
-
-  /* DATA frame */
-
-  aux_data = &item->aux_data.data;
-
-  /* On EOF, we have already detached data.  Please note that
-     application may issue nghttp2_submit_data() in
-     on_frame_send_callback (call from session_after_frame_sent1),
-     which attach data to stream.  We don't want to detach it. */
-  if (aux_data->eof) {
-    active_outbound_item_reset(aob, mem);
-
-    return 0;
-  }
-
-  /* Reset no_copy here because next write may not use this. */
-  aux_data->no_copy = 0;
-
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-
-  /* If session is closed or RST_STREAM was queued, we won't send
-     further data. */
-  if (nghttp2_session_predicate_data_send(session, stream) != 0) {
-    if (stream) {
-      rv = nghttp2_stream_detach_item(stream);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-    }
-
-    active_outbound_item_reset(aob, mem);
-
-    return 0;
-  }
-
-  aob->item = NULL;
-  active_outbound_item_reset(&session->aob, mem);
-
-  return 0;
-}
-
-static int session_call_send_data(nghttp2_session *session,
-                                  nghttp2_outbound_item *item,
-                                  nghttp2_bufs *framebufs) {
-  int rv;
-  nghttp2_buf *buf;
-  size_t length;
-  nghttp2_frame *frame;
-  nghttp2_data_aux_data *aux_data;
-
-  buf = &framebufs->cur->buf;
-  frame = &item->frame;
-  length = frame->hd.length - frame->data.padlen;
-  aux_data = &item->aux_data.data;
-
-  rv = session->callbacks.send_data_callback(session, frame, buf->pos, length,
-                                             &aux_data->data_prd.source,
-                                             session->user_data);
-
-  switch (rv) {
-  case 0:
-  case NGHTTP2_ERR_WOULDBLOCK:
-  case NGHTTP2_ERR_PAUSE:
-  case NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE:
-    return rv;
-  default:
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-}
-
-static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
-                                                 const uint8_t **data_ptr,
-                                                 int fast_cb) {
-  int rv;
-  nghttp2_active_outbound_item *aob;
-  nghttp2_bufs *framebufs;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-  aob = &session->aob;
-  framebufs = &aob->framebufs;
-
-  /* We may have idle streams more than we expect (e.g.,
-     nghttp2_session_change_stream_priority() or
-     nghttp2_session_create_idle_stream()).  Adjust them here. */
-  rv = nghttp2_session_adjust_idle_stream(session);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  for (;;) {
-    switch (aob->state) {
-    case NGHTTP2_OB_POP_ITEM: {
-      nghttp2_outbound_item *item;
-
-      item = nghttp2_session_pop_next_ob_item(session);
-      if (item == NULL) {
-        return 0;
-      }
-
-      rv = session_prep_frame(session, item);
-      if (rv == NGHTTP2_ERR_PAUSE) {
-        return 0;
-      }
-      if (rv == NGHTTP2_ERR_DEFERRED) {
-        DEBUGF("send: frame transmission deferred\n");
-        break;
-      }
-      if (rv < 0) {
-        int32_t opened_stream_id = 0;
-        uint32_t error_code = NGHTTP2_INTERNAL_ERROR;
-
-        DEBUGF("send: frame preparation failed with %s\n",
-               nghttp2_strerror(rv));
-        /* TODO If the error comes from compressor, the connection
-           must be closed. */
-        if (item->frame.hd.type != NGHTTP2_DATA &&
-            session->callbacks.on_frame_not_send_callback && is_non_fatal(rv)) {
-          nghttp2_frame *frame = &item->frame;
-          /* The library is responsible for the transmission of
-             WINDOW_UPDATE frame, so we don't call error callback for
-             it. */
-          if (frame->hd.type != NGHTTP2_WINDOW_UPDATE &&
-              session->callbacks.on_frame_not_send_callback(
-                  session, frame, rv, session->user_data) != 0) {
-
-            nghttp2_outbound_item_free(item, mem);
-            nghttp2_mem_free(mem, item);
-
-            return NGHTTP2_ERR_CALLBACK_FAILURE;
-          }
-        }
-        /* We have to close stream opened by failed request HEADERS
-           or PUSH_PROMISE. */
-        switch (item->frame.hd.type) {
-        case NGHTTP2_HEADERS:
-          if (item->frame.headers.cat == NGHTTP2_HCAT_REQUEST) {
-            opened_stream_id = item->frame.hd.stream_id;
-            if (item->aux_data.headers.canceled) {
-              error_code = item->aux_data.headers.error_code;
-            } else {
-              /* Set error_code to REFUSED_STREAM so that application
-                 can send request again. */
-              error_code = NGHTTP2_REFUSED_STREAM;
-            }
-          }
-          break;
-        case NGHTTP2_PUSH_PROMISE:
-          opened_stream_id = item->frame.push_promise.promised_stream_id;
-          break;
-        }
-        if (opened_stream_id) {
-          /* careful not to override rv */
-          int rv2;
-          rv2 = nghttp2_session_close_stream(session, opened_stream_id,
-                                             error_code);
-
-          if (nghttp2_is_fatal(rv2)) {
-            return rv2;
-          }
-        }
-
-        nghttp2_outbound_item_free(item, mem);
-        nghttp2_mem_free(mem, item);
-        active_outbound_item_reset(aob, mem);
-
-        if (rv == NGHTTP2_ERR_HEADER_COMP) {
-          /* If header compression error occurred, should terminiate
-             connection. */
-          rv = nghttp2_session_terminate_session(session,
-                                                 NGHTTP2_INTERNAL_ERROR);
-        }
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-        break;
-      }
-
-      aob->item = item;
-
-      nghttp2_bufs_rewind(framebufs);
-
-      if (item->frame.hd.type != NGHTTP2_DATA) {
-        nghttp2_frame *frame;
-
-        frame = &item->frame;
-
-        DEBUGF("send: next frame: payloadlen=%zu, type=%u, flags=0x%02x, "
-               "stream_id=%d\n",
-               frame->hd.length, frame->hd.type, frame->hd.flags,
-               frame->hd.stream_id);
-
-        rv = session_call_before_frame_send(session, frame);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (rv == NGHTTP2_ERR_CANCEL) {
-          int32_t opened_stream_id = 0;
-          uint32_t error_code = NGHTTP2_INTERNAL_ERROR;
-
-          if (session->callbacks.on_frame_not_send_callback) {
-            if (session->callbacks.on_frame_not_send_callback(
-                    session, frame, rv, session->user_data) != 0) {
-              return NGHTTP2_ERR_CALLBACK_FAILURE;
-            }
-          }
-
-          /* We have to close stream opened by canceled request
-             HEADERS or PUSH_PROMISE. */
-          switch (item->frame.hd.type) {
-          case NGHTTP2_HEADERS:
-            if (item->frame.headers.cat == NGHTTP2_HCAT_REQUEST) {
-              opened_stream_id = item->frame.hd.stream_id;
-              /* We don't have to check
-                 item->aux_data.headers.canceled since it has already
-                 been checked. */
-              /* Set error_code to REFUSED_STREAM so that application
-                 can send request again. */
-              error_code = NGHTTP2_REFUSED_STREAM;
-            }
-            break;
-          case NGHTTP2_PUSH_PROMISE:
-            opened_stream_id = item->frame.push_promise.promised_stream_id;
-            break;
-          }
-          if (opened_stream_id) {
-            /* careful not to override rv */
-            int rv2;
-            rv2 = nghttp2_session_close_stream(session, opened_stream_id,
-                                               error_code);
-
-            if (nghttp2_is_fatal(rv2)) {
-              return rv2;
-            }
-          }
-
-          active_outbound_item_reset(aob, mem);
-
-          break;
-        }
-      } else {
-        DEBUGF("send: next frame: DATA\n");
-
-        if (item->aux_data.data.no_copy) {
-          aob->state = NGHTTP2_OB_SEND_NO_COPY;
-          break;
-        }
-      }
-
-      DEBUGF("send: start transmitting frame type=%u, length=%zd\n",
-             framebufs->cur->buf.pos[3],
-             framebufs->cur->buf.last - framebufs->cur->buf.pos);
-
-      aob->state = NGHTTP2_OB_SEND_DATA;
-
-      break;
-    }
-    case NGHTTP2_OB_SEND_DATA: {
-      size_t datalen;
-      nghttp2_buf *buf;
-
-      buf = &framebufs->cur->buf;
-
-      if (buf->pos == buf->last) {
-        DEBUGF("send: end transmission of a frame\n");
-
-        /* Frame has completely sent */
-        if (fast_cb) {
-          rv = session_after_frame_sent2(session);
-        } else {
-          rv = session_after_frame_sent1(session);
-          if (rv < 0) {
-            /* FATAL */
-            assert(nghttp2_is_fatal(rv));
-            return rv;
-          }
-          rv = session_after_frame_sent2(session);
-        }
-        if (rv < 0) {
-          /* FATAL */
-          assert(nghttp2_is_fatal(rv));
-          return rv;
-        }
-        /* We have already adjusted the next state */
-        break;
-      }
-
-      *data_ptr = buf->pos;
-      datalen = nghttp2_buf_len(buf);
-
-      /* We increment the offset here. If send_callback does not send
-         everything, we will adjust it. */
-      buf->pos += datalen;
-
-      return (ssize_t)datalen;
-    }
-    case NGHTTP2_OB_SEND_NO_COPY: {
-      nghttp2_stream *stream;
-      nghttp2_frame *frame;
-      int pause;
-
-      DEBUGF("send: no copy DATA\n");
-
-      frame = &aob->item->frame;
-
-      stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-      if (stream == NULL) {
-        DEBUGF("send: no copy DATA cancelled because stream was closed\n");
-
-        active_outbound_item_reset(aob, mem);
-
-        break;
-      }
-
-      rv = session_call_send_data(session, aob->item, framebufs);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-        rv = nghttp2_stream_detach_item(stream);
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        rv = nghttp2_session_add_rst_stream(session, frame->hd.stream_id,
-                                            NGHTTP2_INTERNAL_ERROR);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        active_outbound_item_reset(aob, mem);
-
-        break;
-      }
-
-      if (rv == NGHTTP2_ERR_WOULDBLOCK) {
-        return 0;
-      }
-
-      pause = (rv == NGHTTP2_ERR_PAUSE);
-
-      rv = session_after_frame_sent1(session);
-      if (rv < 0) {
-        assert(nghttp2_is_fatal(rv));
-        return rv;
-      }
-      rv = session_after_frame_sent2(session);
-      if (rv < 0) {
-        assert(nghttp2_is_fatal(rv));
-        return rv;
-      }
-
-      /* We have already adjusted the next state */
-
-      if (pause) {
-        return 0;
-      }
-
-      break;
-    }
-    case NGHTTP2_OB_SEND_CLIENT_MAGIC: {
-      size_t datalen;
-      nghttp2_buf *buf;
-
-      buf = &framebufs->cur->buf;
-
-      if (buf->pos == buf->last) {
-        DEBUGF("send: end transmission of client magic\n");
-        active_outbound_item_reset(aob, mem);
-        break;
-      }
-
-      *data_ptr = buf->pos;
-      datalen = nghttp2_buf_len(buf);
-
-      buf->pos += datalen;
-
-      return (ssize_t)datalen;
-    }
-    }
-  }
-}
-
-ssize_t nghttp2_session_mem_send(nghttp2_session *session,
-                                 const uint8_t **data_ptr) {
-  int rv;
-  ssize_t len;
-
-  *data_ptr = NULL;
-
-  len = nghttp2_session_mem_send_internal(session, data_ptr, 1);
-  if (len <= 0) {
-    return len;
-  }
-
-  if (session->aob.item) {
-    /* We have to call session_after_frame_sent1 here to handle stream
-       closure upon transmission of frames.  Otherwise, END_STREAM may
-       be reached to client before we call nghttp2_session_mem_send
-       again and we may get exceeding number of incoming streams. */
-    rv = session_after_frame_sent1(session);
-    if (rv < 0) {
-      assert(nghttp2_is_fatal(rv));
-      return (ssize_t)rv;
-    }
-  }
-
-  return len;
-}
-
-int nghttp2_session_send(nghttp2_session *session) {
-  const uint8_t *data = NULL;
-  ssize_t datalen;
-  ssize_t sentlen;
-  nghttp2_bufs *framebufs;
-
-  framebufs = &session->aob.framebufs;
-
-  for (;;) {
-    datalen = nghttp2_session_mem_send_internal(session, &data, 0);
-    if (datalen <= 0) {
-      return (int)datalen;
-    }
-    sentlen = session->callbacks.send_callback(session, data, (size_t)datalen,
-                                               0, session->user_data);
-    if (sentlen < 0) {
-      if (sentlen == NGHTTP2_ERR_WOULDBLOCK) {
-        /* Transmission canceled. Rewind the offset */
-        framebufs->cur->buf.pos -= datalen;
-
-        return 0;
-      }
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-    /* Rewind the offset to the amount of unsent bytes */
-    framebufs->cur->buf.pos -= datalen - sentlen;
-  }
-}
-
-static ssize_t session_recv(nghttp2_session *session, uint8_t *buf,
-                            size_t len) {
-  ssize_t rv;
-  rv = session->callbacks.recv_callback(session, buf, len, 0,
-                                        session->user_data);
-  if (rv > 0) {
-    if ((size_t)rv > len) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  } else if (rv < 0 && rv != NGHTTP2_ERR_WOULDBLOCK && rv != NGHTTP2_ERR_EOF) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-  return rv;
-}
-
-static int session_call_on_begin_frame(nghttp2_session *session,
-                                       const nghttp2_frame_hd *hd) {
-  int rv;
-
-  if (session->callbacks.on_begin_frame_callback) {
-
-    rv = session->callbacks.on_begin_frame_callback(session, hd,
-                                                    session->user_data);
-
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-
-  return 0;
-}
-
-static int session_call_on_frame_received(nghttp2_session *session,
-                                          nghttp2_frame *frame) {
-  int rv;
-  if (session->callbacks.on_frame_recv_callback) {
-    rv = session->callbacks.on_frame_recv_callback(session, frame,
-                                                   session->user_data);
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-static int session_call_on_begin_headers(nghttp2_session *session,
-                                         nghttp2_frame *frame) {
-  int rv;
-  DEBUGF("recv: call on_begin_headers callback stream_id=%d\n",
-         frame->hd.stream_id);
-  if (session->callbacks.on_begin_headers_callback) {
-    rv = session->callbacks.on_begin_headers_callback(session, frame,
-                                                      session->user_data);
-    if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-      return rv;
-    }
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-static int session_call_on_header(nghttp2_session *session,
-                                  const nghttp2_frame *frame,
-                                  const nghttp2_hd_nv *nv) {
-  int rv = 0;
-  if (session->callbacks.on_header_callback2) {
-    rv = session->callbacks.on_header_callback2(
-        session, frame, nv->name, nv->value, nv->flags, session->user_data);
-  } else if (session->callbacks.on_header_callback) {
-    rv = session->callbacks.on_header_callback(
-        session, frame, nv->name->base, nv->name->len, nv->value->base,
-        nv->value->len, nv->flags, session->user_data);
-  }
-
-  if (rv == NGHTTP2_ERR_PAUSE || rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-    return rv;
-  }
-  if (rv != 0) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  return 0;
-}
-
-static int session_call_on_invalid_header(nghttp2_session *session,
-                                          const nghttp2_frame *frame,
-                                          const nghttp2_hd_nv *nv) {
-  int rv;
-  if (session->callbacks.on_invalid_header_callback2) {
-    rv = session->callbacks.on_invalid_header_callback2(
-        session, frame, nv->name, nv->value, nv->flags, session->user_data);
-  } else if (session->callbacks.on_invalid_header_callback) {
-    rv = session->callbacks.on_invalid_header_callback(
-        session, frame, nv->name->base, nv->name->len, nv->value->base,
-        nv->value->len, nv->flags, session->user_data);
-  } else {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-
-  if (rv == NGHTTP2_ERR_PAUSE || rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-    return rv;
-  }
-  if (rv != 0) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  return 0;
-}
-
-static int
-session_call_on_extension_chunk_recv_callback(nghttp2_session *session,
-                                              const uint8_t *data, size_t len) {
-  int rv;
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  if (session->callbacks.on_extension_chunk_recv_callback) {
-    rv = session->callbacks.on_extension_chunk_recv_callback(
-        session, &frame->hd, data, len, session->user_data);
-    if (rv == NGHTTP2_ERR_CANCEL) {
-      return rv;
-    }
-    if (rv != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-
-  return 0;
-}
-
-static int session_call_unpack_extension_callback(nghttp2_session *session) {
-  int rv;
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-  void *payload = NULL;
-
-  rv = session->callbacks.unpack_extension_callback(
-      session, &payload, &frame->hd, session->user_data);
-  if (rv == NGHTTP2_ERR_CANCEL) {
-    return rv;
-  }
-  if (rv != 0) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  frame->ext.payload = payload;
-
-  return 0;
-}
-
-/*
- * Handles frame size error.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *   Out of memory.
- */
-static int session_handle_frame_size_error(nghttp2_session *session) {
-  /* TODO Currently no callback is called for this error, because we
-     call this callback before reading any payload */
-  return nghttp2_session_terminate_session(session, NGHTTP2_FRAME_SIZE_ERROR);
-}
-
-static uint32_t get_error_code_from_lib_error_code(int lib_error_code) {
-  switch (lib_error_code) {
-  case NGHTTP2_ERR_STREAM_CLOSED:
-    return NGHTTP2_STREAM_CLOSED;
-  case NGHTTP2_ERR_HEADER_COMP:
-    return NGHTTP2_COMPRESSION_ERROR;
-  case NGHTTP2_ERR_FRAME_SIZE_ERROR:
-    return NGHTTP2_FRAME_SIZE_ERROR;
-  case NGHTTP2_ERR_FLOW_CONTROL:
-    return NGHTTP2_FLOW_CONTROL_ERROR;
-  case NGHTTP2_ERR_REFUSED_STREAM:
-    return NGHTTP2_REFUSED_STREAM;
-  case NGHTTP2_ERR_PROTO:
-  case NGHTTP2_ERR_HTTP_HEADER:
-  case NGHTTP2_ERR_HTTP_MESSAGING:
-    return NGHTTP2_PROTOCOL_ERROR;
-  default:
-    return NGHTTP2_INTERNAL_ERROR;
-  }
-}
-
-/*
- * Calls on_invalid_frame_recv_callback if it is set to |session|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *   User defined callback function fails.
- */
-static int session_call_on_invalid_frame_recv_callback(nghttp2_session *session,
-                                                       nghttp2_frame *frame,
-                                                       int lib_error_code) {
-  if (session->callbacks.on_invalid_frame_recv_callback) {
-    if (session->callbacks.on_invalid_frame_recv_callback(
-            session, frame, lib_error_code, session->user_data) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-static int session_handle_invalid_stream2(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_frame *frame,
-                                          int lib_error_code) {
-  int rv;
-  rv = nghttp2_session_add_rst_stream(
-      session, stream_id, get_error_code_from_lib_error_code(lib_error_code));
-  if (rv != 0) {
-    return rv;
-  }
-  if (session->callbacks.on_invalid_frame_recv_callback) {
-    if (session->callbacks.on_invalid_frame_recv_callback(
-            session, frame, lib_error_code, session->user_data) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return 0;
-}
-
-static int session_handle_invalid_stream(nghttp2_session *session,
-                                         nghttp2_frame *frame,
-                                         int lib_error_code) {
-  return session_handle_invalid_stream2(session, frame->hd.stream_id, frame,
-                                        lib_error_code);
-}
-
-static int session_inflate_handle_invalid_stream(nghttp2_session *session,
-                                                 nghttp2_frame *frame,
-                                                 int lib_error_code) {
-  int rv;
-  rv = session_handle_invalid_stream(session, frame, lib_error_code);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-  return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-}
-
-/*
- * Handles invalid frame which causes connection error.
- */
-static int session_handle_invalid_connection(nghttp2_session *session,
-                                             nghttp2_frame *frame,
-                                             int lib_error_code,
-                                             const char *reason) {
-  if (session->callbacks.on_invalid_frame_recv_callback) {
-    if (session->callbacks.on_invalid_frame_recv_callback(
-            session, frame, lib_error_code, session->user_data) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-  return nghttp2_session_terminate_session_with_reason(
-      session, get_error_code_from_lib_error_code(lib_error_code), reason);
-}
-
-static int session_inflate_handle_invalid_connection(nghttp2_session *session,
-                                                     nghttp2_frame *frame,
-                                                     int lib_error_code,
-                                                     const char *reason) {
-  int rv;
-  rv =
-      session_handle_invalid_connection(session, frame, lib_error_code, reason);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-  return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-}
-
-/*
- * Inflates header block in the memory pointed by |in| with |inlen|
- * bytes. If this function returns NGHTTP2_ERR_PAUSE, the caller must
- * call this function again, until it returns 0 or one of negative
- * error code.  If |call_header_cb| is zero, the on_header_callback
- * are not invoked and the function never return NGHTTP2_ERR_PAUSE. If
- * the given |in| is the last chunk of header block, the |final| must
- * be nonzero. If header block is successfully processed (which is
- * indicated by the return value 0, NGHTTP2_ERR_PAUSE or
- * NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE), the number of processed
- * input bytes is assigned to the |*readlen_ptr|.
- *
- * This function return 0 if it succeeds, or one of the negative error
- * codes:
- *
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- * NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE
- *     The callback returns this error code, indicating that this
- *     stream should be RST_STREAMed.
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_PAUSE
- *     The callback function returned NGHTTP2_ERR_PAUSE
- * NGHTTP2_ERR_HEADER_COMP
- *     Header decompression failed
- */
-static int inflate_header_block(nghttp2_session *session, nghttp2_frame *frame,
-                                size_t *readlen_ptr, uint8_t *in, size_t inlen,
-                                int final, int call_header_cb) {
-  ssize_t proclen;
-  int rv;
-  int inflate_flags;
-  nghttp2_hd_nv nv;
-  nghttp2_stream *stream;
-  nghttp2_stream *subject_stream;
-  int trailer = 0;
-
-  *readlen_ptr = 0;
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-
-  if (frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-    subject_stream = nghttp2_session_get_stream(
-        session, frame->push_promise.promised_stream_id);
-  } else {
-    subject_stream = stream;
-    trailer = session_trailer_headers(session, stream, frame);
-  }
-
-  DEBUGF("recv: decoding header block %zu bytes\n", inlen);
-  for (;;) {
-    inflate_flags = 0;
-    proclen = nghttp2_hd_inflate_hd_nv(&session->hd_inflater, &nv,
-                                       &inflate_flags, in, inlen, final);
-    if (nghttp2_is_fatal((int)proclen)) {
-      return (int)proclen;
-    }
-    if (proclen < 0) {
-      if (session->iframe.state == NGHTTP2_IB_READ_HEADER_BLOCK) {
-        if (subject_stream && subject_stream->state != NGHTTP2_STREAM_CLOSING) {
-          /* Adding RST_STREAM here is very important. It prevents
-             from invoking subsequent callbacks for the same stream
-             ID. */
-          rv = nghttp2_session_add_rst_stream(
-              session, subject_stream->stream_id, NGHTTP2_COMPRESSION_ERROR);
-
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-        }
-      }
-      rv =
-          nghttp2_session_terminate_session(session, NGHTTP2_COMPRESSION_ERROR);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      return NGHTTP2_ERR_HEADER_COMP;
-    }
-    in += proclen;
-    inlen -= (size_t)proclen;
-    *readlen_ptr += (size_t)proclen;
-
-    DEBUGF("recv: proclen=%zd\n", proclen);
-
-    if (call_header_cb && (inflate_flags & NGHTTP2_HD_INFLATE_EMIT)) {
-      rv = 0;
-      if (subject_stream && session_enforce_http_messaging(session)) {
-        rv = nghttp2_http_on_header(session, subject_stream, frame, &nv,
-                                    trailer);
-
-        if (rv == NGHTTP2_ERR_IGN_HTTP_HEADER) {
-          /* Don't overwrite rv here */
-          int rv2;
-
-          rv2 = session_call_on_invalid_header(session, frame, &nv);
-          if (rv2 == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-            rv = NGHTTP2_ERR_HTTP_HEADER;
-          } else {
-            if (rv2 != 0) {
-              return rv2;
-            }
-
-            /* header is ignored */
-            DEBUGF("recv: HTTP ignored: type=%u, id=%d, header %.*s: %.*s\n",
-                   frame->hd.type, frame->hd.stream_id, (int)nv.name->len,
-                   nv.name->base, (int)nv.value->len, nv.value->base);
-
-            rv2 = session_call_error_callback(
-                session, NGHTTP2_ERR_HTTP_HEADER,
-                "Ignoring received invalid HTTP header field: frame type: "
-                "%u, stream: %d, name: [%.*s], value: [%.*s]",
-                frame->hd.type, frame->hd.stream_id, (int)nv.name->len,
-                nv.name->base, (int)nv.value->len, nv.value->base);
-
-            if (nghttp2_is_fatal(rv2)) {
-              return rv2;
-            }
-          }
-        }
-
-        if (rv == NGHTTP2_ERR_HTTP_HEADER) {
-          DEBUGF("recv: HTTP error: type=%u, id=%d, header %.*s: %.*s\n",
-                 frame->hd.type, frame->hd.stream_id, (int)nv.name->len,
-                 nv.name->base, (int)nv.value->len, nv.value->base);
-
-          rv = session_call_error_callback(
-              session, NGHTTP2_ERR_HTTP_HEADER,
-              "Invalid HTTP header field was received: frame type: "
-              "%u, stream: %d, name: [%.*s], value: [%.*s]",
-              frame->hd.type, frame->hd.stream_id, (int)nv.name->len,
-              nv.name->base, (int)nv.value->len, nv.value->base);
-
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-
-          rv =
-              session_handle_invalid_stream2(session, subject_stream->stream_id,
-                                             frame, NGHTTP2_ERR_HTTP_HEADER);
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-        }
-      }
-      if (rv == 0) {
-        rv = session_call_on_header(session, frame, &nv);
-        /* This handles NGHTTP2_ERR_PAUSE and
-           NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE as well */
-        if (rv != 0) {
-          return rv;
-        }
-      }
-    }
-    if (inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
-      nghttp2_hd_inflate_end_headers(&session->hd_inflater);
-      break;
-    }
-    if ((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 && inlen == 0) {
-      break;
-    }
-  }
-  return 0;
-}
-
-/*
- * Call this function when HEADERS frame was completely received.
- *
- * This function returns 0 if it succeeds, or one of negative error
- * codes:
- *
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-static int session_end_stream_headers_received(nghttp2_session *session,
-                                               nghttp2_frame *frame,
-                                               nghttp2_stream *stream) {
-  int rv;
-  if ((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
-    return 0;
-  }
-
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-  rv = nghttp2_session_close_stream_if_shut_rdwr(session, stream);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  return 0;
-}
-
-static int session_after_header_block_received(nghttp2_session *session) {
-  int rv = 0;
-  int call_cb = 1;
-  nghttp2_frame *frame = &session->iframe.frame;
-  nghttp2_stream *stream;
-
-  /* We don't call on_frame_recv_callback if stream has been closed
-     already or being closed. */
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-  if (!stream || stream->state == NGHTTP2_STREAM_CLOSING) {
-    return 0;
-  }
-
-  if (session_enforce_http_messaging(session)) {
-    if (frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-      nghttp2_stream *subject_stream;
-
-      subject_stream = nghttp2_session_get_stream(
-          session, frame->push_promise.promised_stream_id);
-      if (subject_stream) {
-        rv = nghttp2_http_on_request_headers(subject_stream, frame);
-      }
-    } else {
-      assert(frame->hd.type == NGHTTP2_HEADERS);
-      switch (frame->headers.cat) {
-      case NGHTTP2_HCAT_REQUEST:
-        rv = nghttp2_http_on_request_headers(stream, frame);
-        break;
-      case NGHTTP2_HCAT_RESPONSE:
-      case NGHTTP2_HCAT_PUSH_RESPONSE:
-        rv = nghttp2_http_on_response_headers(stream);
-        break;
-      case NGHTTP2_HCAT_HEADERS:
-        if (stream->http_flags & NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE) {
-          assert(!session->server);
-          rv = nghttp2_http_on_response_headers(stream);
-        } else {
-          rv = nghttp2_http_on_trailer_headers(stream, frame);
-        }
-        break;
-      default:
-        assert(0);
-      }
-      if (rv == 0 && (frame->hd.flags & NGHTTP2_FLAG_END_STREAM)) {
-        rv = nghttp2_http_on_remote_end_stream(stream);
-      }
-    }
-    if (rv != 0) {
-      int32_t stream_id;
-
-      if (frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-        stream_id = frame->push_promise.promised_stream_id;
-      } else {
-        stream_id = frame->hd.stream_id;
-      }
-
-      call_cb = 0;
-
-      rv = session_handle_invalid_stream2(session, stream_id, frame,
-                                          NGHTTP2_ERR_HTTP_MESSAGING);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-    }
-  }
-
-  if (call_cb) {
-    rv = session_call_on_frame_received(session, frame);
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  }
-
-  if (frame->hd.type != NGHTTP2_HEADERS) {
-    return 0;
-  }
-
-  return session_end_stream_headers_received(session, frame, stream);
-}
-
-int nghttp2_session_on_request_headers_received(nghttp2_session *session,
-                                                nghttp2_frame *frame) {
-  int rv = 0;
-  nghttp2_stream *stream;
-  if (frame->hd.stream_id == 0) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "request HEADERS: stream_id == 0");
-  }
-
-  /* If client receives idle stream from server, it is invalid
-     regardless stream ID is even or odd.  This is because client is
-     not expected to receive request from server. */
-  if (!session->server) {
-    if (session_detect_idle_stream(session, frame->hd.stream_id)) {
-      return session_inflate_handle_invalid_connection(
-          session, frame, NGHTTP2_ERR_PROTO,
-          "request HEADERS: client received request");
-    }
-
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-
-  assert(session->server);
-
-  if (!session_is_new_peer_stream_id(session, frame->hd.stream_id)) {
-    if (frame->hd.stream_id == 0 ||
-        nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) {
-      return session_inflate_handle_invalid_connection(
-          session, frame, NGHTTP2_ERR_PROTO,
-          "request HEADERS: invalid stream_id");
-    }
-
-    /* RFC 7540 says if an endpoint receives a HEADERS with invalid
-     * stream ID (e.g, numerically smaller than previous), it MUST
-     * issue connection error with error code PROTOCOL_ERROR.  It is a
-     * bit hard to detect this, since we cannot remember all streams
-     * we observed so far.
-     *
-     * You might imagine this is really easy.  But no.  HTTP/2 is
-     * asynchronous protocol, and usually client and server do not
-     * share the complete picture of open/closed stream status.  For
-     * example, after server sends RST_STREAM for a stream, client may
-     * send trailer HEADERS for that stream.  If naive server detects
-     * that, and issued connection error, then it is a bug of server
-     * implementation since client is not wrong if it did not get
-     * RST_STREAM when it issued trailer HEADERS.
-     *
-     * At the moment, we are very conservative here.  We only use
-     * connection error if stream ID refers idle stream, or we are
-     * sure that stream is half-closed(remote) or closed.  Otherwise
-     * we just ignore HEADERS for now.
-     */
-    stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
-    if (stream && (stream->shut_flags & NGHTTP2_SHUT_RD)) {
-      return session_inflate_handle_invalid_connection(
-          session, frame, NGHTTP2_ERR_STREAM_CLOSED, "HEADERS: stream closed");
-    }
-
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-  session->last_recv_stream_id = frame->hd.stream_id;
-
-  if (session_is_incoming_concurrent_streams_max(session)) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "request HEADERS: max concurrent streams exceeded");
-  }
-
-  if (!session_allow_incoming_new_stream(session)) {
-    /* We just ignore stream after GOAWAY was sent */
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-
-  if (frame->headers.pri_spec.stream_id == frame->hd.stream_id) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "request HEADERS: depend on itself");
-  }
-
-  if (session_is_incoming_concurrent_streams_pending_max(session)) {
-    return session_inflate_handle_invalid_stream(session, frame,
-                                                 NGHTTP2_ERR_REFUSED_STREAM);
-  }
-
-  stream = nghttp2_session_open_stream(
-      session, frame->hd.stream_id, NGHTTP2_STREAM_FLAG_NONE,
-      &frame->headers.pri_spec, NGHTTP2_STREAM_OPENING, NULL);
-  if (!stream) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  rv = nghttp2_session_adjust_closed_stream(session);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  session->last_proc_stream_id = session->last_recv_stream_id;
-
-  rv = session_call_on_begin_headers(session, frame);
-  if (rv != 0) {
-    return rv;
-  }
-  return 0;
-}
-
-int nghttp2_session_on_response_headers_received(nghttp2_session *session,
-                                                 nghttp2_frame *frame,
-                                                 nghttp2_stream *stream) {
-  int rv;
-  /* This function is only called if stream->state ==
-     NGHTTP2_STREAM_OPENING and stream_id is local side initiated. */
-  assert(stream->state == NGHTTP2_STREAM_OPENING &&
-         nghttp2_session_is_my_stream_id(session, frame->hd.stream_id));
-  if (frame->hd.stream_id == 0) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "response HEADERS: stream_id == 0");
-  }
-  if (stream->shut_flags & NGHTTP2_SHUT_RD) {
-    /* half closed (remote): from the spec:
-
-       If an endpoint receives additional frames for a stream that is
-       in this state it MUST respond with a stream error (Section
-       5.4.2) of type STREAM_CLOSED.
-
-       We go further, and make it connection error.
-    */
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_STREAM_CLOSED, "HEADERS: stream closed");
-  }
-  stream->state = NGHTTP2_STREAM_OPENED;
-  rv = session_call_on_begin_headers(session, frame);
-  if (rv != 0) {
-    return rv;
-  }
-  return 0;
-}
-
-int nghttp2_session_on_push_response_headers_received(nghttp2_session *session,
-                                                      nghttp2_frame *frame,
-                                                      nghttp2_stream *stream) {
-  int rv = 0;
-  assert(stream->state == NGHTTP2_STREAM_RESERVED);
-  if (frame->hd.stream_id == 0) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "push response HEADERS: stream_id == 0");
-  }
-
-  if (session->server) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "HEADERS: no HEADERS allowed from client in reserved state");
-  }
-
-  if (session_is_incoming_concurrent_streams_max(session)) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "push response HEADERS: max concurrent streams exceeded");
-  }
-
-  if (!session_allow_incoming_new_stream(session)) {
-    /* We don't accept new stream after GOAWAY was sent. */
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-
-  if (session_is_incoming_concurrent_streams_pending_max(session)) {
-    return session_inflate_handle_invalid_stream(session, frame,
-                                                 NGHTTP2_ERR_REFUSED_STREAM);
-  }
-
-  nghttp2_stream_promise_fulfilled(stream);
-  if (!nghttp2_session_is_my_stream_id(session, stream->stream_id)) {
-    --session->num_incoming_reserved_streams;
-  }
-  ++session->num_incoming_streams;
-  rv = session_call_on_begin_headers(session, frame);
-  if (rv != 0) {
-    return rv;
-  }
-  return 0;
-}
-
-int nghttp2_session_on_headers_received(nghttp2_session *session,
-                                        nghttp2_frame *frame,
-                                        nghttp2_stream *stream) {
-  int rv = 0;
-  if (frame->hd.stream_id == 0) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "HEADERS: stream_id == 0");
-  }
-  if ((stream->shut_flags & NGHTTP2_SHUT_RD)) {
-    /* half closed (remote): from the spec:
-
-       If an endpoint receives additional frames for a stream that is
-       in this state it MUST respond with a stream error (Section
-       5.4.2) of type STREAM_CLOSED.
-
-       we go further, and make it connection error.
-    */
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_STREAM_CLOSED, "HEADERS: stream closed");
-  }
-  if (nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) {
-    if (stream->state == NGHTTP2_STREAM_OPENED) {
-      rv = session_call_on_begin_headers(session, frame);
-      if (rv != 0) {
-        return rv;
-      }
-      return 0;
-    }
-
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-  /* If this is remote peer initiated stream, it is OK unless it
-     has sent END_STREAM frame already. But if stream is in
-     NGHTTP2_STREAM_CLOSING, we discard the frame. This is a race
-     condition. */
-  if (stream->state != NGHTTP2_STREAM_CLOSING) {
-    rv = session_call_on_begin_headers(session, frame);
-    if (rv != 0) {
-      return rv;
-    }
-    return 0;
-  }
-  return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-}
-
-static int session_process_headers_frame(nghttp2_session *session) {
-  int rv;
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-  nghttp2_stream *stream;
-
-  rv = nghttp2_frame_unpack_headers_payload(&frame->headers, iframe->sbuf.pos);
-
-  if (rv != 0) {
-    return nghttp2_session_terminate_session_with_reason(
-        session, NGHTTP2_PROTOCOL_ERROR, "HEADERS: could not unpack");
-  }
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-  if (!stream) {
-    frame->headers.cat = NGHTTP2_HCAT_REQUEST;
-    return nghttp2_session_on_request_headers_received(session, frame);
-  }
-
-  if (stream->state == NGHTTP2_STREAM_RESERVED) {
-    frame->headers.cat = NGHTTP2_HCAT_PUSH_RESPONSE;
-    return nghttp2_session_on_push_response_headers_received(session, frame,
-                                                             stream);
-  }
-
-  if (stream->state == NGHTTP2_STREAM_OPENING &&
-      nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) {
-    frame->headers.cat = NGHTTP2_HCAT_RESPONSE;
-    return nghttp2_session_on_response_headers_received(session, frame, stream);
-  }
-
-  frame->headers.cat = NGHTTP2_HCAT_HEADERS;
-  return nghttp2_session_on_headers_received(session, frame, stream);
-}
-
-int nghttp2_session_on_priority_received(nghttp2_session *session,
-                                         nghttp2_frame *frame) {
-  int rv;
-  nghttp2_stream *stream;
-
-  if (frame->hd.stream_id == 0) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "PRIORITY: stream_id == 0");
-  }
-
-  if (frame->priority.pri_spec.stream_id == frame->hd.stream_id) {
-    return nghttp2_session_terminate_session_with_reason(
-        session, NGHTTP2_PROTOCOL_ERROR, "depend on itself");
-  }
-
-  if (!session->server) {
-    /* Re-prioritization works only in server */
-    return session_call_on_frame_received(session, frame);
-  }
-
-  stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
-
-  if (!stream) {
-    /* PRIORITY against idle stream can create anchor node in
-       dependency tree. */
-    if (!session_detect_idle_stream(session, frame->hd.stream_id)) {
-      return 0;
-    }
-
-    stream = nghttp2_session_open_stream(
-        session, frame->hd.stream_id, NGHTTP2_STREAM_FLAG_NONE,
-        &frame->priority.pri_spec, NGHTTP2_STREAM_IDLE, NULL);
-
-    if (stream == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-
-    rv = nghttp2_session_adjust_idle_stream(session);
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  } else {
-    rv = nghttp2_session_reprioritize_stream(session, stream,
-                                             &frame->priority.pri_spec);
-
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-
-    rv = nghttp2_session_adjust_idle_stream(session);
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  }
-
-  return session_call_on_frame_received(session, frame);
-}
-
-static int session_process_priority_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  nghttp2_frame_unpack_priority_payload(&frame->priority, iframe->sbuf.pos);
-
-  return nghttp2_session_on_priority_received(session, frame);
-}
-
-int nghttp2_session_on_rst_stream_received(nghttp2_session *session,
-                                           nghttp2_frame *frame) {
-  int rv;
-  nghttp2_stream *stream;
-  if (frame->hd.stream_id == 0) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "RST_STREAM: stream_id == 0");
-  }
-
-  if (session_detect_idle_stream(session, frame->hd.stream_id)) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "RST_STREAM: stream in idle");
-  }
-
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-  if (stream) {
-    /* We may use stream->shut_flags for strict error checking. */
-    nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-  }
-
-  rv = session_call_on_frame_received(session, frame);
-  if (rv != 0) {
-    return rv;
-  }
-  rv = nghttp2_session_close_stream(session, frame->hd.stream_id,
-                                    frame->rst_stream.error_code);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-  return 0;
-}
-
-static int session_process_rst_stream_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  nghttp2_frame_unpack_rst_stream_payload(&frame->rst_stream, iframe->sbuf.pos);
-
-  return nghttp2_session_on_rst_stream_received(session, frame);
-}
-
-static int update_remote_initial_window_size_func(nghttp2_map_entry *entry,
-                                                  void *ptr) {
-  int rv;
-  nghttp2_update_window_size_arg *arg;
-  nghttp2_stream *stream;
-
-  arg = (nghttp2_update_window_size_arg *)ptr;
-  stream = (nghttp2_stream *)entry;
-
-  rv = nghttp2_stream_update_remote_initial_window_size(
-      stream, arg->new_window_size, arg->old_window_size);
-  if (rv != 0) {
-    return nghttp2_session_add_rst_stream(arg->session, stream->stream_id,
-                                          NGHTTP2_FLOW_CONTROL_ERROR);
-  }
-
-  /* If window size gets positive, push deferred DATA frame to
-     outbound queue. */
-  if (stream->remote_window_size > 0 &&
-      nghttp2_stream_check_deferred_by_flow_control(stream)) {
-
-    rv = nghttp2_stream_resume_deferred_item(
-        stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
-
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  }
-  return 0;
-}
-
-/*
- * Updates the remote initial window size of all active streams.  If
- * error occurs, all streams may not be updated.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-static int
-session_update_remote_initial_window_size(nghttp2_session *session,
-                                          int32_t new_initial_window_size) {
-  nghttp2_update_window_size_arg arg;
-
-  arg.session = session;
-  arg.new_window_size = new_initial_window_size;
-  arg.old_window_size = (int32_t)session->remote_settings.initial_window_size;
-
-  return nghttp2_map_each(&session->streams,
-                          update_remote_initial_window_size_func, &arg);
-}
-
-static int update_local_initial_window_size_func(nghttp2_map_entry *entry,
-                                                 void *ptr) {
-  int rv;
-  nghttp2_update_window_size_arg *arg;
-  nghttp2_stream *stream;
-  arg = (nghttp2_update_window_size_arg *)ptr;
-  stream = (nghttp2_stream *)entry;
-  rv = nghttp2_stream_update_local_initial_window_size(
-      stream, arg->new_window_size, arg->old_window_size);
-  if (rv != 0) {
-    return nghttp2_session_add_rst_stream(arg->session, stream->stream_id,
-                                          NGHTTP2_FLOW_CONTROL_ERROR);
-  }
-  if (!(arg->session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) &&
-      stream->window_update_queued == 0 &&
-      nghttp2_should_send_window_update(stream->local_window_size,
-                                        stream->recv_window_size)) {
-
-    rv = nghttp2_session_add_window_update(arg->session, NGHTTP2_FLAG_NONE,
-                                           stream->stream_id,
-                                           stream->recv_window_size);
-    if (rv != 0) {
-      return rv;
-    }
-
-    stream->recv_window_size = 0;
-  }
-  return 0;
-}
-
-/*
- * Updates the local initial window size of all active streams.  If
- * error occurs, all streams may not be updated.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-static int
-session_update_local_initial_window_size(nghttp2_session *session,
-                                         int32_t new_initial_window_size,
-                                         int32_t old_initial_window_size) {
-  nghttp2_update_window_size_arg arg;
-  arg.session = session;
-  arg.new_window_size = new_initial_window_size;
-  arg.old_window_size = old_initial_window_size;
-  return nghttp2_map_each(&session->streams,
-                          update_local_initial_window_size_func, &arg);
-}
-
-/*
- * Apply SETTINGS values |iv| having |niv| elements to the local
- * settings.  We assumes that all values in |iv| is correct, since we
- * validated them in nghttp2_session_add_settings() already.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_HEADER_COMP
- *     The header table size is out of range
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_session_update_local_settings(nghttp2_session *session,
-                                          nghttp2_settings_entry *iv,
-                                          size_t niv) {
-  int rv;
-  size_t i;
-  int32_t new_initial_window_size = -1;
-  uint32_t header_table_size = 0;
-  uint32_t min_header_table_size = UINT32_MAX;
-  uint8_t header_table_size_seen = 0;
-  /* For NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, use the value last
-     seen.  For NGHTTP2_SETTINGS_HEADER_TABLE_SIZE, use both minimum
-     value and last seen value. */
-  for (i = 0; i < niv; ++i) {
-    switch (iv[i].settings_id) {
-    case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-      header_table_size_seen = 1;
-      header_table_size = iv[i].value;
-      min_header_table_size = nghttp2_min(min_header_table_size, iv[i].value);
-      break;
-    case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-      new_initial_window_size = (int32_t)iv[i].value;
-      break;
-    }
-  }
-  if (header_table_size_seen) {
-    if (min_header_table_size < header_table_size) {
-      rv = nghttp2_hd_inflate_change_table_size(&session->hd_inflater,
-                                                min_header_table_size);
-      if (rv != 0) {
-        return rv;
-      }
-    }
-
-    rv = nghttp2_hd_inflate_change_table_size(&session->hd_inflater,
-                                              header_table_size);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-  if (new_initial_window_size != -1) {
-    rv = session_update_local_initial_window_size(
-        session, new_initial_window_size,
-        (int32_t)session->local_settings.initial_window_size);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  for (i = 0; i < niv; ++i) {
-    switch (iv[i].settings_id) {
-    case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-      session->local_settings.header_table_size = iv[i].value;
-      break;
-    case NGHTTP2_SETTINGS_ENABLE_PUSH:
-      session->local_settings.enable_push = iv[i].value;
-      break;
-    case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-      session->local_settings.max_concurrent_streams = iv[i].value;
-      break;
-    case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-      session->local_settings.initial_window_size = iv[i].value;
-      break;
-    case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-      session->local_settings.max_frame_size = iv[i].value;
-      break;
-    case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-      session->local_settings.max_header_list_size = iv[i].value;
-      break;
-    }
-  }
-
-  return 0;
-}
-
-int nghttp2_session_on_settings_received(nghttp2_session *session,
-                                         nghttp2_frame *frame, int noack) {
-  int rv;
-  size_t i;
-  nghttp2_mem *mem;
-  nghttp2_inflight_settings *settings;
-
-  mem = &session->mem;
-
-  if (frame->hd.stream_id != 0) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "SETTINGS: stream_id != 0");
-  }
-  if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
-    if (frame->settings.niv != 0) {
-      return session_handle_invalid_connection(
-          session, frame, NGHTTP2_ERR_FRAME_SIZE_ERROR,
-          "SETTINGS: ACK and payload != 0");
-    }
-
-    settings = session->inflight_settings_head;
-
-    if (!settings) {
-      return session_handle_invalid_connection(
-          session, frame, NGHTTP2_ERR_PROTO, "SETTINGS: unexpected ACK");
-    }
-
-    rv = nghttp2_session_update_local_settings(session, settings->iv,
-                                               settings->niv);
-
-    session->inflight_settings_head = settings->next;
-
-    inflight_settings_del(settings, mem);
-
-    if (rv != 0) {
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-      return session_handle_invalid_connection(session, frame, rv, NULL);
-    }
-    return session_call_on_frame_received(session, frame);
-  }
-
-  if (!session->remote_settings_received) {
-    session->remote_settings.max_concurrent_streams =
-        NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS;
-    session->remote_settings_received = 1;
-  }
-
-  for (i = 0; i < frame->settings.niv; ++i) {
-    nghttp2_settings_entry *entry = &frame->settings.iv[i];
-
-    switch (entry->settings_id) {
-    case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-
-      rv = nghttp2_hd_deflate_change_table_size(&session->hd_deflater,
-                                                entry->value);
-      if (rv != 0) {
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        } else {
-          return session_handle_invalid_connection(
-              session, frame, NGHTTP2_ERR_HEADER_COMP, NULL);
-        }
-      }
-
-      session->remote_settings.header_table_size = entry->value;
-
-      break;
-    case NGHTTP2_SETTINGS_ENABLE_PUSH:
-
-      if (entry->value != 0 && entry->value != 1) {
-        return session_handle_invalid_connection(
-            session, frame, NGHTTP2_ERR_PROTO,
-            "SETTINGS: invalid SETTINGS_ENBLE_PUSH");
-      }
-
-      if (!session->server && entry->value != 0) {
-        return session_handle_invalid_connection(
-            session, frame, NGHTTP2_ERR_PROTO,
-            "SETTINGS: server attempted to enable push");
-      }
-
-      session->remote_settings.enable_push = entry->value;
-
-      break;
-    case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-
-      session->remote_settings.max_concurrent_streams = entry->value;
-
-      break;
-    case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-
-      /* Update the initial window size of the all active streams */
-      /* Check that initial_window_size < (1u << 31) */
-      if (entry->value > NGHTTP2_MAX_WINDOW_SIZE) {
-        return session_handle_invalid_connection(
-            session, frame, NGHTTP2_ERR_FLOW_CONTROL,
-            "SETTINGS: too large SETTINGS_INITIAL_WINDOW_SIZE");
-      }
-
-      rv = session_update_remote_initial_window_size(session,
-                                                     (int32_t)entry->value);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (rv != 0) {
-        return session_handle_invalid_connection(
-            session, frame, NGHTTP2_ERR_FLOW_CONTROL, NULL);
-      }
-
-      session->remote_settings.initial_window_size = entry->value;
-
-      break;
-    case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-
-      if (entry->value < NGHTTP2_MAX_FRAME_SIZE_MIN ||
-          entry->value > NGHTTP2_MAX_FRAME_SIZE_MAX) {
-        return session_handle_invalid_connection(
-            session, frame, NGHTTP2_ERR_PROTO,
-            "SETTINGS: invalid SETTINGS_MAX_FRAME_SIZE");
-      }
-
-      session->remote_settings.max_frame_size = entry->value;
-
-      break;
-    case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-
-      session->remote_settings.max_header_list_size = entry->value;
-
-      break;
-    }
-  }
-
-  if (!noack && !session_is_closing(session)) {
-    rv = nghttp2_session_add_settings(session, NGHTTP2_FLAG_ACK, NULL, 0);
-
-    if (rv != 0) {
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      return session_handle_invalid_connection(session, frame,
-                                               NGHTTP2_ERR_INTERNAL, NULL);
-    }
-  }
-
-  return session_call_on_frame_received(session, frame);
-}
-
-static int session_process_settings_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-  size_t i;
-  nghttp2_settings_entry min_header_size_entry;
-
-  if (iframe->max_niv) {
-    min_header_size_entry = iframe->iv[iframe->max_niv - 1];
-
-    if (min_header_size_entry.value < UINT32_MAX) {
-      /* If we have less value, then we must have
-         SETTINGS_HEADER_TABLE_SIZE in i < iframe->niv */
-      for (i = 0; i < iframe->niv; ++i) {
-        if (iframe->iv[i].settings_id == NGHTTP2_SETTINGS_HEADER_TABLE_SIZE) {
-          break;
-        }
-      }
-
-      assert(i < iframe->niv);
-
-      if (min_header_size_entry.value != iframe->iv[i].value) {
-        iframe->iv[iframe->niv++] = iframe->iv[i];
-        iframe->iv[i] = min_header_size_entry;
-      }
-    }
-  }
-
-  nghttp2_frame_unpack_settings_payload(&frame->settings, iframe->iv,
-                                        iframe->niv);
-
-  iframe->iv = NULL;
-  iframe->niv = 0;
-  iframe->max_niv = 0;
-
-  return nghttp2_session_on_settings_received(session, frame, 0 /* ACK */);
-}
-
-int nghttp2_session_on_push_promise_received(nghttp2_session *session,
-                                             nghttp2_frame *frame) {
-  int rv;
-  nghttp2_stream *stream;
-  nghttp2_stream *promised_stream;
-  nghttp2_priority_spec pri_spec;
-
-  if (frame->hd.stream_id == 0) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: stream_id == 0");
-  }
-  if (session->server || session->local_settings.enable_push == 0) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: push disabled");
-  }
-
-  if (!nghttp2_session_is_my_stream_id(session, frame->hd.stream_id)) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: invalid stream_id");
-  }
-
-  if (!session_allow_incoming_new_stream(session)) {
-    /* We just discard PUSH_PROMISE after GOAWAY was sent */
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-
-  if (!session_is_new_peer_stream_id(session,
-                                     frame->push_promise.promised_stream_id)) {
-    /* The spec says if an endpoint receives a PUSH_PROMISE with
-       illegal stream ID is subject to a connection error of type
-       PROTOCOL_ERROR. */
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "PUSH_PROMISE: invalid promised_stream_id");
-  }
-
-  if (session_detect_idle_stream(session, frame->hd.stream_id)) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "PUSH_PROMISE: stream in idle");
-  }
-
-  session->last_recv_stream_id = frame->push_promise.promised_stream_id;
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-  if (!stream || stream->state == NGHTTP2_STREAM_CLOSING ||
-      !session->pending_enable_push ||
-      session->num_incoming_reserved_streams >=
-          session->max_incoming_reserved_streams) {
-    /* Currently, client does not retain closed stream, so we don't
-       check NGHTTP2_SHUT_RD condition here. */
-
-    rv = nghttp2_session_add_rst_stream(
-        session, frame->push_promise.promised_stream_id, NGHTTP2_CANCEL);
-    if (rv != 0) {
-      return rv;
-    }
-    return NGHTTP2_ERR_IGN_HEADER_BLOCK;
-  }
-
-  if (stream->shut_flags & NGHTTP2_SHUT_RD) {
-    return session_inflate_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_STREAM_CLOSED,
-        "PUSH_PROMISE: stream closed");
-  }
-
-  nghttp2_priority_spec_init(&pri_spec, stream->stream_id,
-                             NGHTTP2_DEFAULT_WEIGHT, 0);
-
-  promised_stream = nghttp2_session_open_stream(
-      session, frame->push_promise.promised_stream_id, NGHTTP2_STREAM_FLAG_NONE,
-      &pri_spec, NGHTTP2_STREAM_RESERVED, NULL);
-
-  if (!promised_stream) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  /* We don't call nghttp2_session_adjust_closed_stream(), since we
-     don't keep closed stream in client side */
-
-  session->last_proc_stream_id = session->last_recv_stream_id;
-  rv = session_call_on_begin_headers(session, frame);
-  if (rv != 0) {
-    return rv;
-  }
-  return 0;
-}
-
-static int session_process_push_promise_frame(nghttp2_session *session) {
-  int rv;
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  rv = nghttp2_frame_unpack_push_promise_payload(&frame->push_promise,
-                                                 iframe->sbuf.pos);
-
-  if (rv != 0) {
-    return nghttp2_session_terminate_session_with_reason(
-        session, NGHTTP2_PROTOCOL_ERROR, "PUSH_PROMISE: could not unpack");
-  }
-
-  return nghttp2_session_on_push_promise_received(session, frame);
-}
-
-int nghttp2_session_on_ping_received(nghttp2_session *session,
-                                     nghttp2_frame *frame) {
-  int rv = 0;
-  if (frame->hd.stream_id != 0) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "PING: stream_id != 0");
-  }
-  if ((session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_PING_ACK) == 0 &&
-      (frame->hd.flags & NGHTTP2_FLAG_ACK) == 0 &&
-      !session_is_closing(session)) {
-    /* Peer sent ping, so ping it back */
-    rv = nghttp2_session_add_ping(session, NGHTTP2_FLAG_ACK,
-                                  frame->ping.opaque_data);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-  return session_call_on_frame_received(session, frame);
-}
-
-static int session_process_ping_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  nghttp2_frame_unpack_ping_payload(&frame->ping, iframe->sbuf.pos);
-
-  return nghttp2_session_on_ping_received(session, frame);
-}
-
-int nghttp2_session_on_goaway_received(nghttp2_session *session,
-                                       nghttp2_frame *frame) {
-  int rv;
-
-  if (frame->hd.stream_id != 0) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "GOAWAY: stream_id != 0");
-  }
-  /* Spec says Endpoints MUST NOT increase the value they send in the
-     last stream identifier. */
-  if ((frame->goaway.last_stream_id > 0 &&
-       !nghttp2_session_is_my_stream_id(session,
-                                        frame->goaway.last_stream_id)) ||
-      session->remote_last_stream_id < frame->goaway.last_stream_id) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "GOAWAY: invalid last_stream_id");
-  }
-
-  session->goaway_flags |= NGHTTP2_GOAWAY_RECV;
-
-  session->remote_last_stream_id = frame->goaway.last_stream_id;
-
-  rv = session_call_on_frame_received(session, frame);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  return session_close_stream_on_goaway(session, frame->goaway.last_stream_id,
-                                        0);
-}
-
-static int session_process_goaway_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  nghttp2_frame_unpack_goaway_payload(&frame->goaway, iframe->sbuf.pos,
-                                      iframe->lbuf.pos,
-                                      nghttp2_buf_len(&iframe->lbuf));
-
-  nghttp2_buf_wrap_init(&iframe->lbuf, NULL, 0);
-
-  return nghttp2_session_on_goaway_received(session, frame);
-}
-
-static int
-session_on_connection_window_update_received(nghttp2_session *session,
-                                             nghttp2_frame *frame) {
-  /* Handle connection-level flow control */
-  if (frame->window_update.window_size_increment == 0) {
-    return session_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "WINDOW_UPDATE: window_size_increment == 0");
-  }
-
-  if (NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment <
-      session->remote_window_size) {
-    return session_handle_invalid_connection(session, frame,
-                                             NGHTTP2_ERR_FLOW_CONTROL, NULL);
-  }
-  session->remote_window_size += frame->window_update.window_size_increment;
-
-  return session_call_on_frame_received(session, frame);
-}
-
-static int session_on_stream_window_update_received(nghttp2_session *session,
-                                                    nghttp2_frame *frame) {
-  int rv;
-  nghttp2_stream *stream;
-
-  if (session_detect_idle_stream(session, frame->hd.stream_id)) {
-    return session_handle_invalid_connection(session, frame, NGHTTP2_ERR_PROTO,
-                                             "WINDOW_UPDATE to idle stream");
-  }
-
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-  if (!stream) {
-    return 0;
-  }
-  if (state_reserved_remote(session, stream)) {
-    return session_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO, "WINDOW_UPADATE to reserved stream");
-  }
-  if (frame->window_update.window_size_increment == 0) {
-    return session_handle_invalid_connection(
-        session, frame, NGHTTP2_ERR_PROTO,
-        "WINDOW_UPDATE: window_size_increment == 0");
-  }
-  if (NGHTTP2_MAX_WINDOW_SIZE - frame->window_update.window_size_increment <
-      stream->remote_window_size) {
-    return session_handle_invalid_stream(session, frame,
-                                         NGHTTP2_ERR_FLOW_CONTROL);
-  }
-  stream->remote_window_size += frame->window_update.window_size_increment;
-
-  if (stream->remote_window_size > 0 &&
-      nghttp2_stream_check_deferred_by_flow_control(stream)) {
-
-    rv = nghttp2_stream_resume_deferred_item(
-        stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
-
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  }
-  return session_call_on_frame_received(session, frame);
-}
-
-int nghttp2_session_on_window_update_received(nghttp2_session *session,
-                                              nghttp2_frame *frame) {
-  if (frame->hd.stream_id == 0) {
-    return session_on_connection_window_update_received(session, frame);
-  } else {
-    return session_on_stream_window_update_received(session, frame);
-  }
-}
-
-static int session_process_window_update_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  nghttp2_frame_unpack_window_update_payload(&frame->window_update,
-                                             iframe->sbuf.pos);
-
-  return nghttp2_session_on_window_update_received(session, frame);
-}
-
-int nghttp2_session_on_altsvc_received(nghttp2_session *session,
-                                       nghttp2_frame *frame) {
-  nghttp2_ext_altsvc *altsvc;
-  nghttp2_stream *stream;
-
-  altsvc = frame->ext.payload;
-
-  /* session->server case has been excluded */
-
-  if (frame->hd.stream_id == 0) {
-    if (altsvc->origin_len == 0) {
-      return session_call_on_invalid_frame_recv_callback(session, frame,
-                                                         NGHTTP2_ERR_PROTO);
-    }
-  } else {
-    if (altsvc->origin_len > 0) {
-      return session_call_on_invalid_frame_recv_callback(session, frame,
-                                                         NGHTTP2_ERR_PROTO);
-    }
-
-    stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-    if (!stream) {
-      return 0;
-    }
-
-    if (stream->state == NGHTTP2_STREAM_CLOSING) {
-      return 0;
-    }
-  }
-
-  if (altsvc->field_value_len == 0) {
-    return session_call_on_invalid_frame_recv_callback(session, frame,
-                                                       NGHTTP2_ERR_PROTO);
-  }
-
-  return session_call_on_frame_received(session, frame);
-}
-
-int nghttp2_session_on_origin_received(nghttp2_session *session,
-                                       nghttp2_frame *frame) {
-  return session_call_on_frame_received(session, frame);
-}
-
-static int session_process_altsvc_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  nghttp2_frame_unpack_altsvc_payload(
-      &frame->ext, nghttp2_get_uint16(iframe->sbuf.pos), iframe->lbuf.pos,
-      nghttp2_buf_len(&iframe->lbuf));
-
-  /* nghttp2_frame_unpack_altsvc_payload steals buffer from
-     iframe->lbuf */
-  nghttp2_buf_wrap_init(&iframe->lbuf, NULL, 0);
-
-  return nghttp2_session_on_altsvc_received(session, frame);
-}
-
-static int session_process_origin_frame(nghttp2_session *session) {
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-  nghttp2_mem *mem = &session->mem;
-  int rv;
-
-  rv = nghttp2_frame_unpack_origin_payload(&frame->ext, iframe->lbuf.pos,
-                                           nghttp2_buf_len(&iframe->lbuf), mem);
-  if (rv != 0) {
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-    /* Ignore ORIGIN frame which cannot be parsed. */
-    return 0;
-  }
-
-  return nghttp2_session_on_origin_received(session, frame);
-}
-
-static int session_process_extension_frame(nghttp2_session *session) {
-  int rv;
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  nghttp2_frame *frame = &iframe->frame;
-
-  rv = session_call_unpack_extension_callback(session);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  /* This handles the case where rv == NGHTTP2_ERR_CANCEL as well */
-  if (rv != 0) {
-    return 0;
-  }
-
-  return session_call_on_frame_received(session, frame);
-}
-
-int nghttp2_session_on_data_received(nghttp2_session *session,
-                                     nghttp2_frame *frame) {
-  int rv = 0;
-  int call_cb = 1;
-  nghttp2_stream *stream;
-
-  /* We don't call on_frame_recv_callback if stream has been closed
-     already or being closed. */
-  stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
-  if (!stream || stream->state == NGHTTP2_STREAM_CLOSING) {
-    /* This should be treated as stream error, but it results in lots
-       of RST_STREAM. So just ignore frame against nonexistent stream
-       for now. */
-    return 0;
-  }
-
-  if (session_enforce_http_messaging(session) &&
-      (frame->hd.flags & NGHTTP2_FLAG_END_STREAM)) {
-    if (nghttp2_http_on_remote_end_stream(stream) != 0) {
-      call_cb = 0;
-      rv = nghttp2_session_add_rst_stream(session, stream->stream_id,
-                                          NGHTTP2_PROTOCOL_ERROR);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-    }
-  }
-
-  if (call_cb) {
-    rv = session_call_on_frame_received(session, frame);
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  }
-
-  if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-    nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-    rv = nghttp2_session_close_stream_if_shut_rdwr(session, stream);
-    if (nghttp2_is_fatal(rv)) {
-      return rv;
-    }
-  }
-  return 0;
-}
-
-/* For errors, this function only returns FATAL error. */
-static int session_process_data_frame(nghttp2_session *session) {
-  int rv;
-  nghttp2_frame *public_data_frame = &session->iframe.frame;
-  rv = nghttp2_session_on_data_received(session, public_data_frame);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-  return 0;
-}
-
-/*
- * Now we have SETTINGS synchronization, flow control error can be
- * detected strictly. If DATA frame is received with length > 0 and
- * current received window size + delta length is strictly larger than
- * local window size, it is subject to FLOW_CONTROL_ERROR, so return
- * -1. Note that local_window_size is calculated after SETTINGS ACK is
- * received from peer, so peer must honor this limit. If the resulting
- * recv_window_size is strictly larger than NGHTTP2_MAX_WINDOW_SIZE,
- * return -1 too.
- */
-static int adjust_recv_window_size(int32_t *recv_window_size_ptr, size_t delta,
-                                   int32_t local_window_size) {
-  if (*recv_window_size_ptr > local_window_size - (int32_t)delta ||
-      *recv_window_size_ptr > NGHTTP2_MAX_WINDOW_SIZE - (int32_t)delta) {
-    return -1;
-  }
-  *recv_window_size_ptr += (int32_t)delta;
-  return 0;
-}
-
-/*
- * Accumulates received bytes |delta_size| for stream-level flow
- * control and decides whether to send WINDOW_UPDATE to that stream.
- * If NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is set, WINDOW_UPDATE will not
- * be sent.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-static int session_update_recv_stream_window_size(nghttp2_session *session,
-                                                  nghttp2_stream *stream,
-                                                  size_t delta_size,
-                                                  int send_window_update) {
-  int rv;
-  rv = adjust_recv_window_size(&stream->recv_window_size, delta_size,
-                               stream->local_window_size);
-  if (rv != 0) {
-    return nghttp2_session_add_rst_stream(session, stream->stream_id,
-                                          NGHTTP2_FLOW_CONTROL_ERROR);
-  }
-  /* We don't have to send WINDOW_UPDATE if the data received is the
-     last chunk in the incoming stream. */
-  /* We have to use local_settings here because it is the constraint
-     the remote endpoint should honor. */
-  if (send_window_update &&
-      !(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) &&
-      stream->window_update_queued == 0 &&
-      nghttp2_should_send_window_update(stream->local_window_size,
-                                        stream->recv_window_size)) {
-    rv = nghttp2_session_add_window_update(session, NGHTTP2_FLAG_NONE,
-                                           stream->stream_id,
-                                           stream->recv_window_size);
-    if (rv != 0) {
-      return rv;
-    }
-
-    stream->recv_window_size = 0;
-  }
-  return 0;
-}
-
-/*
- * Accumulates received bytes |delta_size| for connection-level flow
- * control and decides whether to send WINDOW_UPDATE to the
- * connection.  If NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is set,
- * WINDOW_UPDATE will not be sent.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-static int session_update_recv_connection_window_size(nghttp2_session *session,
-                                                      size_t delta_size) {
-  int rv;
-  rv = adjust_recv_window_size(&session->recv_window_size, delta_size,
-                               session->local_window_size);
-  if (rv != 0) {
-    return nghttp2_session_terminate_session(session,
-                                             NGHTTP2_FLOW_CONTROL_ERROR);
-  }
-  if (!(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) &&
-      session->window_update_queued == 0 &&
-      nghttp2_should_send_window_update(session->local_window_size,
-                                        session->recv_window_size)) {
-    /* Use stream ID 0 to update connection-level flow control
-       window */
-    rv = nghttp2_session_add_window_update(session, NGHTTP2_FLAG_NONE, 0,
-                                           session->recv_window_size);
-    if (rv != 0) {
-      return rv;
-    }
-
-    session->recv_window_size = 0;
-  }
-  return 0;
-}
-
-static int session_update_consumed_size(nghttp2_session *session,
-                                        int32_t *consumed_size_ptr,
-                                        int32_t *recv_window_size_ptr,
-                                        uint8_t window_update_queued,
-                                        int32_t stream_id, size_t delta_size,
-                                        int32_t local_window_size) {
-  int32_t recv_size;
-  int rv;
-
-  if ((size_t)*consumed_size_ptr > NGHTTP2_MAX_WINDOW_SIZE - delta_size) {
-    return nghttp2_session_terminate_session(session,
-                                             NGHTTP2_FLOW_CONTROL_ERROR);
-  }
-
-  *consumed_size_ptr += (int32_t)delta_size;
-
-  if (window_update_queued == 0) {
-    /* recv_window_size may be smaller than consumed_size, because it
-       may be decreased by negative value with
-       nghttp2_submit_window_update(). */
-    recv_size = nghttp2_min(*consumed_size_ptr, *recv_window_size_ptr);
-
-    if (nghttp2_should_send_window_update(local_window_size, recv_size)) {
-      rv = nghttp2_session_add_window_update(session, NGHTTP2_FLAG_NONE,
-                                             stream_id, recv_size);
-
-      if (rv != 0) {
-        return rv;
-      }
-
-      *recv_window_size_ptr -= recv_size;
-      *consumed_size_ptr -= recv_size;
-    }
-  }
-
-  return 0;
-}
-
-static int session_update_stream_consumed_size(nghttp2_session *session,
-                                               nghttp2_stream *stream,
-                                               size_t delta_size) {
-  return session_update_consumed_size(
-      session, &stream->consumed_size, &stream->recv_window_size,
-      stream->window_update_queued, stream->stream_id, delta_size,
-      stream->local_window_size);
-}
-
-static int session_update_connection_consumed_size(nghttp2_session *session,
-                                                   size_t delta_size) {
-  return session_update_consumed_size(
-      session, &session->consumed_size, &session->recv_window_size,
-      session->window_update_queued, 0, delta_size, session->local_window_size);
-}
-
-/*
- * Checks that we can receive the DATA frame for stream, which is
- * indicated by |session->iframe.frame.hd.stream_id|. If it is a
- * connection error situation, GOAWAY frame will be issued by this
- * function.
- *
- * If the DATA frame is allowed, returns 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_IGN_PAYLOAD
- *   The reception of DATA frame is connection error; or should be
- *   ignored.
- * NGHTTP2_ERR_NOMEM
- *   Out of memory.
- */
-static int session_on_data_received_fail_fast(nghttp2_session *session) {
-  int rv;
-  nghttp2_stream *stream;
-  nghttp2_inbound_frame *iframe;
-  int32_t stream_id;
-  const char *failure_reason;
-  uint32_t error_code = NGHTTP2_PROTOCOL_ERROR;
-
-  iframe = &session->iframe;
-  stream_id = iframe->frame.hd.stream_id;
-
-  if (stream_id == 0) {
-    /* The spec says that if a DATA frame is received whose stream ID
-       is 0, the recipient MUST respond with a connection error of
-       type PROTOCOL_ERROR. */
-    failure_reason = "DATA: stream_id == 0";
-    goto fail;
-  }
-
-  if (session_detect_idle_stream(session, stream_id)) {
-    failure_reason = "DATA: stream in idle";
-    error_code = NGHTTP2_PROTOCOL_ERROR;
-    goto fail;
-  }
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (!stream) {
-    stream = nghttp2_session_get_stream_raw(session, stream_id);
-    if (stream && (stream->shut_flags & NGHTTP2_SHUT_RD)) {
-      failure_reason = "DATA: stream closed";
-      error_code = NGHTTP2_STREAM_CLOSED;
-      goto fail;
-    }
-
-    return NGHTTP2_ERR_IGN_PAYLOAD;
-  }
-  if (stream->shut_flags & NGHTTP2_SHUT_RD) {
-    failure_reason = "DATA: stream in half-closed(remote)";
-    error_code = NGHTTP2_STREAM_CLOSED;
-    goto fail;
-  }
-
-  if (nghttp2_session_is_my_stream_id(session, stream_id)) {
-    if (stream->state == NGHTTP2_STREAM_CLOSING) {
-      return NGHTTP2_ERR_IGN_PAYLOAD;
-    }
-    if (stream->state != NGHTTP2_STREAM_OPENED) {
-      failure_reason = "DATA: stream not opened";
-      goto fail;
-    }
-    return 0;
-  }
-  if (stream->state == NGHTTP2_STREAM_RESERVED) {
-    failure_reason = "DATA: stream in reserved";
-    goto fail;
-  }
-  if (stream->state == NGHTTP2_STREAM_CLOSING) {
-    return NGHTTP2_ERR_IGN_PAYLOAD;
-  }
-  return 0;
-fail:
-  rv = nghttp2_session_terminate_session_with_reason(session, error_code,
-                                                     failure_reason);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-  return NGHTTP2_ERR_IGN_PAYLOAD;
-}
-
-static size_t inbound_frame_payload_readlen(nghttp2_inbound_frame *iframe,
-                                            const uint8_t *in,
-                                            const uint8_t *last) {
-  return nghttp2_min((size_t)(last - in), iframe->payloadleft);
-}
-
-/*
- * Resets iframe->sbuf and advance its mark pointer by |left| bytes.
- */
-static void inbound_frame_set_mark(nghttp2_inbound_frame *iframe, size_t left) {
-  nghttp2_buf_reset(&iframe->sbuf);
-  iframe->sbuf.mark += left;
-}
-
-static size_t inbound_frame_buf_read(nghttp2_inbound_frame *iframe,
-                                     const uint8_t *in, const uint8_t *last) {
-  size_t readlen;
-
-  readlen =
-      nghttp2_min((size_t)(last - in), nghttp2_buf_mark_avail(&iframe->sbuf));
-
-  iframe->sbuf.last = nghttp2_cpymem(iframe->sbuf.last, in, readlen);
-
-  return readlen;
-}
-
-/*
- * Unpacks SETTINGS entry in iframe->sbuf.
- */
-static void inbound_frame_set_settings_entry(nghttp2_inbound_frame *iframe) {
-  nghttp2_settings_entry iv;
-  nghttp2_settings_entry *min_header_table_size_entry;
-  size_t i;
-
-  nghttp2_frame_unpack_settings_entry(&iv, iframe->sbuf.pos);
-
-  switch (iv.settings_id) {
-  case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-  case NGHTTP2_SETTINGS_ENABLE_PUSH:
-  case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-  case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-  case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-  case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-    break;
-  default:
-    DEBUGF("recv: unknown settings id=0x%02x\n", iv.settings_id);
-
-    iframe->iv[iframe->niv++] = iv;
-
-    return;
-  }
-
-  for (i = 0; i < iframe->niv; ++i) {
-    if (iframe->iv[i].settings_id == iv.settings_id) {
-      iframe->iv[i] = iv;
-      break;
-    }
-  }
-
-  if (i == iframe->niv) {
-    iframe->iv[iframe->niv++] = iv;
-  }
-
-  if (iv.settings_id == NGHTTP2_SETTINGS_HEADER_TABLE_SIZE) {
-    /* Keep track of minimum value of SETTINGS_HEADER_TABLE_SIZE */
-    min_header_table_size_entry = &iframe->iv[iframe->max_niv - 1];
-
-    if (iv.value < min_header_table_size_entry->value) {
-      min_header_table_size_entry->value = iv.value;
-    }
-  }
-}
-
-/*
- * Checks PADDED flags and set iframe->sbuf to read them accordingly.
- * If padding is set, this function returns 1.  If no padding is set,
- * this function returns 0.  On error, returns -1.
- */
-static int inbound_frame_handle_pad(nghttp2_inbound_frame *iframe,
-                                    nghttp2_frame_hd *hd) {
-  if (hd->flags & NGHTTP2_FLAG_PADDED) {
-    if (hd->length < 1) {
-      return -1;
-    }
-    inbound_frame_set_mark(iframe, 1);
-    return 1;
-  }
-  DEBUGF("recv: no padding in payload\n");
-  return 0;
-}
-
-/*
- * Computes number of padding based on flags. This function returns
- * the calculated length if it succeeds, or -1.
- */
-static ssize_t inbound_frame_compute_pad(nghttp2_inbound_frame *iframe) {
-  size_t padlen;
-
-  /* 1 for Pad Length field */
-  padlen = (size_t)(iframe->sbuf.pos[0] + 1);
-
-  DEBUGF("recv: padlen=%zu\n", padlen);
-
-  /* We cannot use iframe->frame.hd.length because of CONTINUATION */
-  if (padlen - 1 > iframe->payloadleft) {
-    return -1;
-  }
-
-  iframe->padlen = padlen;
-
-  return (ssize_t)padlen;
-}
-
-/*
- * This function returns the effective payload length in the data of
- * length |readlen| when the remaning payload is |payloadleft|. The
- * |payloadleft| does not include |readlen|. If padding was started
- * strictly before this data chunk, this function returns -1.
- */
-static ssize_t inbound_frame_effective_readlen(nghttp2_inbound_frame *iframe,
-                                               size_t payloadleft,
-                                               size_t readlen) {
-  size_t trail_padlen =
-      nghttp2_frame_trail_padlen(&iframe->frame, iframe->padlen);
-
-  if (trail_padlen > payloadleft) {
-    size_t padlen;
-    padlen = trail_padlen - payloadleft;
-    if (readlen < padlen) {
-      return -1;
-    }
-    return (ssize_t)(readlen - padlen);
-  }
-  return (ssize_t)(readlen);
-}
-
-ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
-                                 size_t inlen) {
-  const uint8_t *first = in, *last = in + inlen;
-  nghttp2_inbound_frame *iframe = &session->iframe;
-  size_t readlen;
-  ssize_t padlen;
-  int rv;
-  int busy = 0;
-  nghttp2_frame_hd cont_hd;
-  nghttp2_stream *stream;
-  size_t pri_fieldlen;
-  nghttp2_mem *mem;
-
-  DEBUGF("recv: connection recv_window_size=%d, local_window=%d\n",
-         session->recv_window_size, session->local_window_size);
-
-  mem = &session->mem;
-
-  /* We may have idle streams more than we expect (e.g.,
-     nghttp2_session_change_stream_priority() or
-     nghttp2_session_create_idle_stream()).  Adjust them here. */
-  rv = nghttp2_session_adjust_idle_stream(session);
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  if (!nghttp2_session_want_read(session)) {
-    return (ssize_t)inlen;
-  }
-
-  for (;;) {
-    switch (iframe->state) {
-    case NGHTTP2_IB_READ_CLIENT_MAGIC:
-      readlen = nghttp2_min(inlen, iframe->payloadleft);
-
-      if (memcmp(NGHTTP2_CLIENT_MAGIC + NGHTTP2_CLIENT_MAGIC_LEN -
-                     iframe->payloadleft,
-                 in, readlen) != 0) {
-        return NGHTTP2_ERR_BAD_CLIENT_MAGIC;
-      }
-
-      iframe->payloadleft -= readlen;
-      in += readlen;
-
-      if (iframe->payloadleft == 0) {
-        session_inbound_frame_reset(session);
-        iframe->state = NGHTTP2_IB_READ_FIRST_SETTINGS;
-      }
-
-      break;
-    case NGHTTP2_IB_READ_FIRST_SETTINGS:
-      DEBUGF("recv: [IB_READ_FIRST_SETTINGS]\n");
-
-      readlen = inbound_frame_buf_read(iframe, in, last);
-      in += readlen;
-
-      if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
-        return in - first;
-      }
-
-      if (iframe->sbuf.pos[3] != NGHTTP2_SETTINGS ||
-          (iframe->sbuf.pos[4] & NGHTTP2_FLAG_ACK)) {
-        rv = session_call_error_callback(
-            session, NGHTTP2_ERR_SETTINGS_EXPECTED,
-            "Remote peer returned unexpected data while we expected "
-            "SETTINGS frame.  Perhaps, peer does not support HTTP/2 "
-            "properly.");
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        rv = nghttp2_session_terminate_session_with_reason(
-            session, NGHTTP2_PROTOCOL_ERROR, "SETTINGS expected");
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        return (ssize_t)inlen;
-      }
-
-      iframe->state = NGHTTP2_IB_READ_HEAD;
-
-    /* Fall through */
-    case NGHTTP2_IB_READ_HEAD: {
-      int on_begin_frame_called = 0;
-
-      DEBUGF("recv: [IB_READ_HEAD]\n");
-
-      readlen = inbound_frame_buf_read(iframe, in, last);
-      in += readlen;
-
-      if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
-        return in - first;
-      }
-
-      nghttp2_frame_unpack_frame_hd(&iframe->frame.hd, iframe->sbuf.pos);
-      iframe->payloadleft = iframe->frame.hd.length;
-
-      DEBUGF("recv: payloadlen=%zu, type=%u, flags=0x%02x, stream_id=%d\n",
-             iframe->frame.hd.length, iframe->frame.hd.type,
-             iframe->frame.hd.flags, iframe->frame.hd.stream_id);
-
-      if (iframe->frame.hd.length > session->local_settings.max_frame_size) {
-        DEBUGF("recv: length is too large %zu > %u\n", iframe->frame.hd.length,
-               session->local_settings.max_frame_size);
-
-        rv = nghttp2_session_terminate_session_with_reason(
-            session, NGHTTP2_FRAME_SIZE_ERROR, "too large frame size");
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        return (ssize_t)inlen;
-      }
-
-      switch (iframe->frame.hd.type) {
-      case NGHTTP2_DATA: {
-        DEBUGF("recv: DATA\n");
-
-        iframe->frame.hd.flags &=
-            (NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_PADDED);
-        /* Check stream is open. If it is not open or closing,
-           ignore payload. */
-        busy = 1;
-
-        rv = session_on_data_received_fail_fast(session);
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-        if (rv == NGHTTP2_ERR_IGN_PAYLOAD) {
-          DEBUGF("recv: DATA not allowed stream_id=%d\n",
-                 iframe->frame.hd.stream_id);
-          iframe->state = NGHTTP2_IB_IGN_DATA;
-          break;
-        }
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd);
-        if (rv < 0) {
-          rv = nghttp2_session_terminate_session_with_reason(
-              session, NGHTTP2_PROTOCOL_ERROR,
-              "DATA: insufficient padding space");
-
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          return (ssize_t)inlen;
-        }
-
-        if (rv == 1) {
-          iframe->state = NGHTTP2_IB_READ_PAD_DATA;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_DATA;
-        break;
-      }
-      case NGHTTP2_HEADERS:
-
-        DEBUGF("recv: HEADERS\n");
-
-        iframe->frame.hd.flags &=
-            (NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS |
-             NGHTTP2_FLAG_PADDED | NGHTTP2_FLAG_PRIORITY);
-
-        rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd);
-        if (rv < 0) {
-          rv = nghttp2_session_terminate_session_with_reason(
-              session, NGHTTP2_PROTOCOL_ERROR,
-              "HEADERS: insufficient padding space");
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          return (ssize_t)inlen;
-        }
-
-        if (rv == 1) {
-          iframe->state = NGHTTP2_IB_READ_NBYTE;
-          break;
-        }
-
-        pri_fieldlen = nghttp2_frame_priority_len(iframe->frame.hd.flags);
-
-        if (pri_fieldlen > 0) {
-          if (iframe->payloadleft < pri_fieldlen) {
-            busy = 1;
-            iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-            break;
-          }
-
-          iframe->state = NGHTTP2_IB_READ_NBYTE;
-
-          inbound_frame_set_mark(iframe, pri_fieldlen);
-
-          break;
-        }
-
-        /* Call on_begin_frame_callback here because
-           session_process_headers_frame() may call
-           on_begin_headers_callback */
-        rv = session_call_on_begin_frame(session, &iframe->frame.hd);
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        on_begin_frame_called = 1;
-
-        rv = session_process_headers_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        busy = 1;
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-          rv = nghttp2_session_add_rst_stream(
-              session, iframe->frame.hd.stream_id, NGHTTP2_INTERNAL_ERROR);
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        if (rv == NGHTTP2_ERR_IGN_HEADER_BLOCK) {
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_HEADER_BLOCK;
-
-        break;
-      case NGHTTP2_PRIORITY:
-        DEBUGF("recv: PRIORITY\n");
-
-        iframe->frame.hd.flags = NGHTTP2_FLAG_NONE;
-
-        if (iframe->payloadleft != NGHTTP2_PRIORITY_SPECLEN) {
-          busy = 1;
-
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_NBYTE;
-
-        inbound_frame_set_mark(iframe, NGHTTP2_PRIORITY_SPECLEN);
-
-        break;
-      case NGHTTP2_RST_STREAM:
-      case NGHTTP2_WINDOW_UPDATE:
-#ifdef DEBUGBUILD
-        switch (iframe->frame.hd.type) {
-        case NGHTTP2_RST_STREAM:
-          DEBUGF("recv: RST_STREAM\n");
-          break;
-        case NGHTTP2_WINDOW_UPDATE:
-          DEBUGF("recv: WINDOW_UPDATE\n");
-          break;
-        }
-#endif /* DEBUGBUILD */
-
-        iframe->frame.hd.flags = NGHTTP2_FLAG_NONE;
-
-        if (iframe->payloadleft != 4) {
-          busy = 1;
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_NBYTE;
-
-        inbound_frame_set_mark(iframe, 4);
-
-        break;
-      case NGHTTP2_SETTINGS:
-        DEBUGF("recv: SETTINGS\n");
-
-        iframe->frame.hd.flags &= NGHTTP2_FLAG_ACK;
-
-        if ((iframe->frame.hd.length % NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH) ||
-            ((iframe->frame.hd.flags & NGHTTP2_FLAG_ACK) &&
-             iframe->payloadleft > 0)) {
-          busy = 1;
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_SETTINGS;
-
-        if (iframe->payloadleft) {
-          nghttp2_settings_entry *min_header_table_size_entry;
-
-          /* We allocate iv with additional one entry, to store the
-             minimum header table size. */
-          iframe->max_niv =
-              iframe->frame.hd.length / NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH + 1;
-
-          iframe->iv = nghttp2_mem_malloc(mem, sizeof(nghttp2_settings_entry) *
-                                                   iframe->max_niv);
-
-          if (!iframe->iv) {
-            return NGHTTP2_ERR_NOMEM;
-          }
-
-          min_header_table_size_entry = &iframe->iv[iframe->max_niv - 1];
-          min_header_table_size_entry->settings_id =
-              NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-          min_header_table_size_entry->value = UINT32_MAX;
-
-          inbound_frame_set_mark(iframe, NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH);
-          break;
-        }
-
-        busy = 1;
-
-        inbound_frame_set_mark(iframe, 0);
-
-        break;
-      case NGHTTP2_PUSH_PROMISE:
-        DEBUGF("recv: PUSH_PROMISE\n");
-
-        iframe->frame.hd.flags &=
-            (NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PADDED);
-
-        rv = inbound_frame_handle_pad(iframe, &iframe->frame.hd);
-        if (rv < 0) {
-          rv = nghttp2_session_terminate_session_with_reason(
-              session, NGHTTP2_PROTOCOL_ERROR,
-              "PUSH_PROMISE: insufficient padding space");
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          return (ssize_t)inlen;
-        }
-
-        if (rv == 1) {
-          iframe->state = NGHTTP2_IB_READ_NBYTE;
-          break;
-        }
-
-        if (iframe->payloadleft < 4) {
-          busy = 1;
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_NBYTE;
-
-        inbound_frame_set_mark(iframe, 4);
-
-        break;
-      case NGHTTP2_PING:
-        DEBUGF("recv: PING\n");
-
-        iframe->frame.hd.flags &= NGHTTP2_FLAG_ACK;
-
-        if (iframe->payloadleft != 8) {
-          busy = 1;
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_NBYTE;
-        inbound_frame_set_mark(iframe, 8);
-
-        break;
-      case NGHTTP2_GOAWAY:
-        DEBUGF("recv: GOAWAY\n");
-
-        iframe->frame.hd.flags = NGHTTP2_FLAG_NONE;
-
-        if (iframe->payloadleft < 8) {
-          busy = 1;
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_NBYTE;
-        inbound_frame_set_mark(iframe, 8);
-
-        break;
-      case NGHTTP2_CONTINUATION:
-        DEBUGF("recv: unexpected CONTINUATION\n");
-
-        /* Receiving CONTINUATION in this state are subject to
-           connection error of type PROTOCOL_ERROR */
-        rv = nghttp2_session_terminate_session_with_reason(
-            session, NGHTTP2_PROTOCOL_ERROR, "CONTINUATION: unexpected");
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        return (ssize_t)inlen;
-      default:
-        DEBUGF("recv: extension frame\n");
-
-        if (check_ext_type_set(session->user_recv_ext_types,
-                               iframe->frame.hd.type)) {
-          if (!session->callbacks.unpack_extension_callback) {
-            /* Silently ignore unknown frame type. */
-
-            busy = 1;
-
-            iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-
-            break;
-          }
-
-          busy = 1;
-
-          iframe->state = NGHTTP2_IB_READ_EXTENSION_PAYLOAD;
-
-          break;
-        } else {
-          switch (iframe->frame.hd.type) {
-          case NGHTTP2_ALTSVC:
-            if ((session->builtin_recv_ext_types & NGHTTP2_TYPEMASK_ALTSVC) ==
-                0) {
-              busy = 1;
-              iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-              break;
-            }
-
-            DEBUGF("recv: ALTSVC\n");
-
-            iframe->frame.hd.flags = NGHTTP2_FLAG_NONE;
-            iframe->frame.ext.payload = &iframe->ext_frame_payload.altsvc;
-
-            if (session->server) {
-              busy = 1;
-              iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-              break;
-            }
-
-            if (iframe->payloadleft < 2) {
-              busy = 1;
-              iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-              break;
-            }
-
-            busy = 1;
-
-            iframe->state = NGHTTP2_IB_READ_NBYTE;
-            inbound_frame_set_mark(iframe, 2);
-
-            break;
-          case NGHTTP2_ORIGIN:
-            if (!(session->builtin_recv_ext_types & NGHTTP2_TYPEMASK_ORIGIN)) {
-              busy = 1;
-              iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-              break;
-            }
-
-            DEBUGF("recv: ORIGIN\n");
-
-            iframe->frame.ext.payload = &iframe->ext_frame_payload.origin;
-
-            if (session->server || iframe->frame.hd.stream_id ||
-                (iframe->frame.hd.flags & 0xf0)) {
-              busy = 1;
-              iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-              break;
-            }
-
-            iframe->frame.hd.flags = NGHTTP2_FLAG_NONE;
-
-            if (iframe->payloadleft) {
-              iframe->raw_lbuf = nghttp2_mem_malloc(mem, iframe->payloadleft);
-
-              if (iframe->raw_lbuf == NULL) {
-                return NGHTTP2_ERR_NOMEM;
-              }
-
-              nghttp2_buf_wrap_init(&iframe->lbuf, iframe->raw_lbuf,
-                                    iframe->payloadleft);
-            } else {
-              busy = 1;
-            }
-
-            iframe->state = NGHTTP2_IB_READ_ORIGIN_PAYLOAD;
-
-            break;
-          default:
-            busy = 1;
-
-            iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-
-            break;
-          }
-        }
-      }
-
-      if (!on_begin_frame_called) {
-        switch (iframe->state) {
-        case NGHTTP2_IB_IGN_HEADER_BLOCK:
-        case NGHTTP2_IB_IGN_PAYLOAD:
-        case NGHTTP2_IB_FRAME_SIZE_ERROR:
-        case NGHTTP2_IB_IGN_DATA:
-        case NGHTTP2_IB_IGN_ALL:
-          break;
-        default:
-          rv = session_call_on_begin_frame(session, &iframe->frame.hd);
-
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-        }
-      }
-
-      break;
-    }
-    case NGHTTP2_IB_READ_NBYTE:
-      DEBUGF("recv: [IB_READ_NBYTE]\n");
-
-      readlen = inbound_frame_buf_read(iframe, in, last);
-      in += readlen;
-      iframe->payloadleft -= readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu, left=%zd\n", readlen,
-             iframe->payloadleft, nghttp2_buf_mark_avail(&iframe->sbuf));
-
-      if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
-        return in - first;
-      }
-
-      switch (iframe->frame.hd.type) {
-      case NGHTTP2_HEADERS:
-        if (iframe->padlen == 0 &&
-            (iframe->frame.hd.flags & NGHTTP2_FLAG_PADDED)) {
-          pri_fieldlen = nghttp2_frame_priority_len(iframe->frame.hd.flags);
-          padlen = inbound_frame_compute_pad(iframe);
-          if (padlen < 0 ||
-              (size_t)padlen + pri_fieldlen > 1 + iframe->payloadleft) {
-            rv = nghttp2_session_terminate_session_with_reason(
-                session, NGHTTP2_PROTOCOL_ERROR, "HEADERS: invalid padding");
-            if (nghttp2_is_fatal(rv)) {
-              return rv;
-            }
-            return (ssize_t)inlen;
-          }
-          iframe->frame.headers.padlen = (size_t)padlen;
-
-          if (pri_fieldlen > 0) {
-            if (iframe->payloadleft < pri_fieldlen) {
-              busy = 1;
-              iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-              break;
-            }
-            iframe->state = NGHTTP2_IB_READ_NBYTE;
-            inbound_frame_set_mark(iframe, pri_fieldlen);
-            break;
-          } else {
-            /* Truncate buffers used for padding spec */
-            inbound_frame_set_mark(iframe, 0);
-          }
-        }
-
-        rv = session_process_headers_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        busy = 1;
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-          rv = nghttp2_session_add_rst_stream(
-              session, iframe->frame.hd.stream_id, NGHTTP2_INTERNAL_ERROR);
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        if (rv == NGHTTP2_ERR_IGN_HEADER_BLOCK) {
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_HEADER_BLOCK;
-
-        break;
-      case NGHTTP2_PRIORITY:
-        rv = session_process_priority_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        session_inbound_frame_reset(session);
-
-        break;
-      case NGHTTP2_RST_STREAM:
-        rv = session_process_rst_stream_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        session_inbound_frame_reset(session);
-
-        break;
-      case NGHTTP2_PUSH_PROMISE:
-        if (iframe->padlen == 0 &&
-            (iframe->frame.hd.flags & NGHTTP2_FLAG_PADDED)) {
-          padlen = inbound_frame_compute_pad(iframe);
-          if (padlen < 0 || (size_t)padlen + 4 /* promised stream id */
-                                > 1 + iframe->payloadleft) {
-            rv = nghttp2_session_terminate_session_with_reason(
-                session, NGHTTP2_PROTOCOL_ERROR,
-                "PUSH_PROMISE: invalid padding");
-            if (nghttp2_is_fatal(rv)) {
-              return rv;
-            }
-            return (ssize_t)inlen;
-          }
-
-          iframe->frame.push_promise.padlen = (size_t)padlen;
-
-          if (iframe->payloadleft < 4) {
-            busy = 1;
-            iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-            break;
-          }
-
-          iframe->state = NGHTTP2_IB_READ_NBYTE;
-
-          inbound_frame_set_mark(iframe, 4);
-
-          break;
-        }
-
-        rv = session_process_push_promise_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        busy = 1;
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-          rv = nghttp2_session_add_rst_stream(
-              session, iframe->frame.push_promise.promised_stream_id,
-              NGHTTP2_INTERNAL_ERROR);
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        if (rv == NGHTTP2_ERR_IGN_HEADER_BLOCK) {
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        iframe->state = NGHTTP2_IB_READ_HEADER_BLOCK;
-
-        break;
-      case NGHTTP2_PING:
-        rv = session_process_ping_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        session_inbound_frame_reset(session);
-
-        break;
-      case NGHTTP2_GOAWAY: {
-        size_t debuglen;
-
-        /* 8 is Last-stream-ID + Error Code */
-        debuglen = iframe->frame.hd.length - 8;
-
-        if (debuglen > 0) {
-          iframe->raw_lbuf = nghttp2_mem_malloc(mem, debuglen);
-
-          if (iframe->raw_lbuf == NULL) {
-            return NGHTTP2_ERR_NOMEM;
-          }
-
-          nghttp2_buf_wrap_init(&iframe->lbuf, iframe->raw_lbuf, debuglen);
-        }
-
-        busy = 1;
-
-        iframe->state = NGHTTP2_IB_READ_GOAWAY_DEBUG;
-
-        break;
-      }
-      case NGHTTP2_WINDOW_UPDATE:
-        rv = session_process_window_update_frame(session);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        session_inbound_frame_reset(session);
-
-        break;
-      case NGHTTP2_ALTSVC: {
-        size_t origin_len;
-
-        origin_len = nghttp2_get_uint16(iframe->sbuf.pos);
-
-        DEBUGF("recv: origin_len=%zu\n", origin_len);
-
-        if (origin_len > iframe->payloadleft) {
-          busy = 1;
-          iframe->state = NGHTTP2_IB_FRAME_SIZE_ERROR;
-          break;
-        }
-
-        if (iframe->frame.hd.length > 2) {
-          iframe->raw_lbuf =
-              nghttp2_mem_malloc(mem, iframe->frame.hd.length - 2);
-
-          if (iframe->raw_lbuf == NULL) {
-            return NGHTTP2_ERR_NOMEM;
-          }
-
-          nghttp2_buf_wrap_init(&iframe->lbuf, iframe->raw_lbuf,
-                                iframe->frame.hd.length);
-        }
-
-        busy = 1;
-
-        iframe->state = NGHTTP2_IB_READ_ALTSVC_PAYLOAD;
-
-        break;
-      }
-      default:
-        /* This is unknown frame */
-        session_inbound_frame_reset(session);
-
-        break;
-      }
-      break;
-    case NGHTTP2_IB_READ_HEADER_BLOCK:
-    case NGHTTP2_IB_IGN_HEADER_BLOCK: {
-      ssize_t data_readlen;
-      size_t trail_padlen;
-      int final;
-#ifdef DEBUGBUILD
-      if (iframe->state == NGHTTP2_IB_READ_HEADER_BLOCK) {
-        DEBUGF("recv: [IB_READ_HEADER_BLOCK]\n");
-      } else {
-        DEBUGF("recv: [IB_IGN_HEADER_BLOCK]\n");
-      }
-#endif /* DEBUGBUILD */
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft - readlen);
-
-      data_readlen = inbound_frame_effective_readlen(
-          iframe, iframe->payloadleft - readlen, readlen);
-
-      if (data_readlen == -1) {
-        /* everything is padding */
-        data_readlen = 0;
-      }
-
-      trail_padlen = nghttp2_frame_trail_padlen(&iframe->frame, iframe->padlen);
-
-      final = (iframe->frame.hd.flags & NGHTTP2_FLAG_END_HEADERS) &&
-              iframe->payloadleft - (size_t)data_readlen == trail_padlen;
-
-      if (data_readlen > 0 || (data_readlen == 0 && final)) {
-        size_t hd_proclen = 0;
-
-        DEBUGF("recv: block final=%d\n", final);
-
-        rv =
-            inflate_header_block(session, &iframe->frame, &hd_proclen,
-                                 (uint8_t *)in, (size_t)data_readlen, final,
-                                 iframe->state == NGHTTP2_IB_READ_HEADER_BLOCK);
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        if (rv == NGHTTP2_ERR_PAUSE) {
-          in += hd_proclen;
-          iframe->payloadleft -= hd_proclen;
-
-          return in - first;
-        }
-
-        if (rv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
-          /* The application says no more headers. We decompress the
-             rest of the header block but not invoke on_header_callback
-             and on_frame_recv_callback. */
-          in += hd_proclen;
-          iframe->payloadleft -= hd_proclen;
-
-          /* Use promised stream ID for PUSH_PROMISE */
-          rv = nghttp2_session_add_rst_stream(
-              session,
-              iframe->frame.hd.type == NGHTTP2_PUSH_PROMISE
-                  ? iframe->frame.push_promise.promised_stream_id
-                  : iframe->frame.hd.stream_id,
-              NGHTTP2_INTERNAL_ERROR);
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-          busy = 1;
-          iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-          break;
-        }
-
-        in += readlen;
-        iframe->payloadleft -= readlen;
-
-        if (rv == NGHTTP2_ERR_HEADER_COMP) {
-          /* GOAWAY is already issued */
-          if (iframe->payloadleft == 0) {
-            session_inbound_frame_reset(session);
-          } else {
-            busy = 1;
-            iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-          }
-          break;
-        }
-      } else {
-        in += readlen;
-        iframe->payloadleft -= readlen;
-      }
-
-      if (iframe->payloadleft) {
-        break;
-      }
-
-      if ((iframe->frame.hd.flags & NGHTTP2_FLAG_END_HEADERS) == 0) {
-
-        inbound_frame_set_mark(iframe, NGHTTP2_FRAME_HDLEN);
-
-        iframe->padlen = 0;
-
-        if (iframe->state == NGHTTP2_IB_READ_HEADER_BLOCK) {
-          iframe->state = NGHTTP2_IB_EXPECT_CONTINUATION;
-        } else {
-          iframe->state = NGHTTP2_IB_IGN_CONTINUATION;
-        }
-      } else {
-        if (iframe->state == NGHTTP2_IB_READ_HEADER_BLOCK) {
-          rv = session_after_header_block_received(session);
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-        }
-        session_inbound_frame_reset(session);
-      }
-      break;
-    }
-    case NGHTTP2_IB_IGN_PAYLOAD:
-      DEBUGF("recv: [IB_IGN_PAYLOAD]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-      iframe->payloadleft -= readlen;
-      in += readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (iframe->payloadleft) {
-        break;
-      }
-
-      switch (iframe->frame.hd.type) {
-      case NGHTTP2_HEADERS:
-      case NGHTTP2_PUSH_PROMISE:
-      case NGHTTP2_CONTINUATION:
-        /* Mark inflater bad so that we won't perform further decoding */
-        session->hd_inflater.ctx.bad = 1;
-        break;
-      default:
-        break;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_FRAME_SIZE_ERROR:
-      DEBUGF("recv: [IB_FRAME_SIZE_ERROR]\n");
-
-      rv = session_handle_frame_size_error(session);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      assert(iframe->state == NGHTTP2_IB_IGN_ALL);
-
-      return (ssize_t)inlen;
-    case NGHTTP2_IB_READ_SETTINGS:
-      DEBUGF("recv: [IB_READ_SETTINGS]\n");
-
-      readlen = inbound_frame_buf_read(iframe, in, last);
-      iframe->payloadleft -= readlen;
-      in += readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
-        break;
-      }
-
-      if (readlen > 0) {
-        inbound_frame_set_settings_entry(iframe);
-      }
-      if (iframe->payloadleft) {
-        inbound_frame_set_mark(iframe, NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH);
-        break;
-      }
-
-      rv = session_process_settings_frame(session);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-        return (ssize_t)inlen;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_READ_GOAWAY_DEBUG:
-      DEBUGF("recv: [IB_READ_GOAWAY_DEBUG]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-
-      if (readlen > 0) {
-        iframe->lbuf.last = nghttp2_cpymem(iframe->lbuf.last, in, readlen);
-
-        iframe->payloadleft -= readlen;
-        in += readlen;
-      }
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (iframe->payloadleft) {
-        assert(nghttp2_buf_avail(&iframe->lbuf) > 0);
-
-        break;
-      }
-
-      rv = session_process_goaway_frame(session);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-        return (ssize_t)inlen;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_EXPECT_CONTINUATION:
-    case NGHTTP2_IB_IGN_CONTINUATION:
-#ifdef DEBUGBUILD
-      if (iframe->state == NGHTTP2_IB_EXPECT_CONTINUATION) {
-        fprintf(stderr, "recv: [IB_EXPECT_CONTINUATION]\n");
-      } else {
-        fprintf(stderr, "recv: [IB_IGN_CONTINUATION]\n");
-      }
-#endif /* DEBUGBUILD */
-
-      readlen = inbound_frame_buf_read(iframe, in, last);
-      in += readlen;
-
-      if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
-        return in - first;
-      }
-
-      nghttp2_frame_unpack_frame_hd(&cont_hd, iframe->sbuf.pos);
-      iframe->payloadleft = cont_hd.length;
-
-      DEBUGF("recv: payloadlen=%zu, type=%u, flags=0x%02x, stream_id=%d\n",
-             cont_hd.length, cont_hd.type, cont_hd.flags, cont_hd.stream_id);
-
-      if (cont_hd.type != NGHTTP2_CONTINUATION ||
-          cont_hd.stream_id != iframe->frame.hd.stream_id) {
-        DEBUGF("recv: expected stream_id=%d, type=%d, but got stream_id=%d, "
-               "type=%u\n",
-               iframe->frame.hd.stream_id, NGHTTP2_CONTINUATION,
-               cont_hd.stream_id, cont_hd.type);
-        rv = nghttp2_session_terminate_session_with_reason(
-            session, NGHTTP2_PROTOCOL_ERROR,
-            "unexpected non-CONTINUATION frame or stream_id is invalid");
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        return (ssize_t)inlen;
-      }
-
-      /* CONTINUATION won't bear NGHTTP2_PADDED flag */
-
-      iframe->frame.hd.flags = (uint8_t)(
-          iframe->frame.hd.flags | (cont_hd.flags & NGHTTP2_FLAG_END_HEADERS));
-      iframe->frame.hd.length += cont_hd.length;
-
-      busy = 1;
-
-      if (iframe->state == NGHTTP2_IB_EXPECT_CONTINUATION) {
-        iframe->state = NGHTTP2_IB_READ_HEADER_BLOCK;
-
-        rv = session_call_on_begin_frame(session, &cont_hd);
-
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-      } else {
-        iframe->state = NGHTTP2_IB_IGN_HEADER_BLOCK;
-      }
-
-      break;
-    case NGHTTP2_IB_READ_PAD_DATA:
-      DEBUGF("recv: [IB_READ_PAD_DATA]\n");
-
-      readlen = inbound_frame_buf_read(iframe, in, last);
-      in += readlen;
-      iframe->payloadleft -= readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu, left=%zu\n", readlen,
-             iframe->payloadleft, nghttp2_buf_mark_avail(&iframe->sbuf));
-
-      if (nghttp2_buf_mark_avail(&iframe->sbuf)) {
-        return in - first;
-      }
-
-      /* Pad Length field is subject to flow control */
-      rv = session_update_recv_connection_window_size(session, readlen);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-        return (ssize_t)inlen;
-      }
-
-      /* Pad Length field is consumed immediately */
-      rv =
-          nghttp2_session_consume(session, iframe->frame.hd.stream_id, readlen);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-        return (ssize_t)inlen;
-      }
-
-      stream = nghttp2_session_get_stream(session, iframe->frame.hd.stream_id);
-      if (stream) {
-        rv = session_update_recv_stream_window_size(
-            session, stream, readlen,
-            iframe->payloadleft ||
-                (iframe->frame.hd.flags & NGHTTP2_FLAG_END_STREAM) == 0);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-      }
-
-      busy = 1;
-
-      padlen = inbound_frame_compute_pad(iframe);
-      if (padlen < 0) {
-        rv = nghttp2_session_terminate_session_with_reason(
-            session, NGHTTP2_PROTOCOL_ERROR, "DATA: invalid padding");
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-        return (ssize_t)inlen;
-      }
-
-      iframe->frame.data.padlen = (size_t)padlen;
-
-      iframe->state = NGHTTP2_IB_READ_DATA;
-
-      break;
-    case NGHTTP2_IB_READ_DATA:
-      stream = nghttp2_session_get_stream(session, iframe->frame.hd.stream_id);
-
-      if (!stream) {
-        busy = 1;
-        iframe->state = NGHTTP2_IB_IGN_DATA;
-        break;
-      }
-
-      DEBUGF("recv: [IB_READ_DATA]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-      iframe->payloadleft -= readlen;
-      in += readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (readlen > 0) {
-        ssize_t data_readlen;
-
-        rv = session_update_recv_connection_window_size(session, readlen);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        rv = session_update_recv_stream_window_size(
-            session, stream, readlen,
-            iframe->payloadleft ||
-                (iframe->frame.hd.flags & NGHTTP2_FLAG_END_STREAM) == 0);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        data_readlen = inbound_frame_effective_readlen(
-            iframe, iframe->payloadleft, readlen);
-
-        if (data_readlen == -1) {
-          /* everything is padding */
-          data_readlen = 0;
-        }
-
-        padlen = (ssize_t)readlen - data_readlen;
-
-        if (padlen > 0) {
-          /* Padding is considered as "consumed" immediately */
-          rv = nghttp2_session_consume(session, iframe->frame.hd.stream_id,
-                                       (size_t)padlen);
-
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-
-          if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-            return (ssize_t)inlen;
-          }
-        }
-
-        DEBUGF("recv: data_readlen=%zd\n", data_readlen);
-
-        if (data_readlen > 0) {
-          if (session_enforce_http_messaging(session)) {
-            if (nghttp2_http_on_data_chunk(stream, (size_t)data_readlen) != 0) {
-              if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
-                /* Consume all data for connection immediately here */
-                rv = session_update_connection_consumed_size(
-                    session, (size_t)data_readlen);
-
-                if (nghttp2_is_fatal(rv)) {
-                  return rv;
-                }
-
-                if (iframe->state == NGHTTP2_IB_IGN_DATA) {
-                  return (ssize_t)inlen;
-                }
-              }
-
-              rv = nghttp2_session_add_rst_stream(
-                  session, iframe->frame.hd.stream_id, NGHTTP2_PROTOCOL_ERROR);
-              if (nghttp2_is_fatal(rv)) {
-                return rv;
-              }
-              busy = 1;
-              iframe->state = NGHTTP2_IB_IGN_DATA;
-              break;
-            }
-          }
-          if (session->callbacks.on_data_chunk_recv_callback) {
-            rv = session->callbacks.on_data_chunk_recv_callback(
-                session, iframe->frame.hd.flags, iframe->frame.hd.stream_id,
-                in - readlen, (size_t)data_readlen, session->user_data);
-            if (rv == NGHTTP2_ERR_PAUSE) {
-              return in - first;
-            }
-
-            if (nghttp2_is_fatal(rv)) {
-              return NGHTTP2_ERR_CALLBACK_FAILURE;
-            }
-          }
-        }
-      }
-
-      if (iframe->payloadleft) {
-        break;
-      }
-
-      rv = session_process_data_frame(session);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_IGN_DATA:
-      DEBUGF("recv: [IB_IGN_DATA]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-      iframe->payloadleft -= readlen;
-      in += readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (readlen > 0) {
-        /* Update connection-level flow control window for ignored
-           DATA frame too */
-        rv = session_update_recv_connection_window_size(session, readlen);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-          return (ssize_t)inlen;
-        }
-
-        if (session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE) {
-
-          /* Ignored DATA is considered as "consumed" immediately. */
-          rv = session_update_connection_consumed_size(session, readlen);
-
-          if (nghttp2_is_fatal(rv)) {
-            return rv;
-          }
-
-          if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-            return (ssize_t)inlen;
-          }
-        }
-      }
-
-      if (iframe->payloadleft) {
-        break;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_IGN_ALL:
-      return (ssize_t)inlen;
-    case NGHTTP2_IB_READ_EXTENSION_PAYLOAD:
-      DEBUGF("recv: [IB_READ_EXTENSION_PAYLOAD]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-      iframe->payloadleft -= readlen;
-      in += readlen;
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (readlen > 0) {
-        rv = session_call_on_extension_chunk_recv_callback(
-            session, in - readlen, readlen);
-        if (nghttp2_is_fatal(rv)) {
-          return rv;
-        }
-
-        if (rv != 0) {
-          busy = 1;
-
-          iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
-
-          break;
-        }
-      }
-
-      if (iframe->payloadleft > 0) {
-        break;
-      }
-
-      rv = session_process_extension_frame(session);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_READ_ALTSVC_PAYLOAD:
-      DEBUGF("recv: [IB_READ_ALTSVC_PAYLOAD]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-      if (readlen > 0) {
-        iframe->lbuf.last = nghttp2_cpymem(iframe->lbuf.last, in, readlen);
-
-        iframe->payloadleft -= readlen;
-        in += readlen;
-      }
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (iframe->payloadleft) {
-        assert(nghttp2_buf_avail(&iframe->lbuf) > 0);
-
-        break;
-      }
-
-      rv = session_process_altsvc_frame(session);
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    case NGHTTP2_IB_READ_ORIGIN_PAYLOAD:
-      DEBUGF("recv: [IB_READ_ORIGIN_PAYLOAD]\n");
-
-      readlen = inbound_frame_payload_readlen(iframe, in, last);
-
-      if (readlen > 0) {
-        iframe->lbuf.last = nghttp2_cpymem(iframe->lbuf.last, in, readlen);
-
-        iframe->payloadleft -= readlen;
-        in += readlen;
-      }
-
-      DEBUGF("recv: readlen=%zu, payloadleft=%zu\n", readlen,
-             iframe->payloadleft);
-
-      if (iframe->payloadleft) {
-        assert(nghttp2_buf_avail(&iframe->lbuf) > 0);
-
-        break;
-      }
-
-      rv = session_process_origin_frame(session);
-
-      if (nghttp2_is_fatal(rv)) {
-        return rv;
-      }
-
-      if (iframe->state == NGHTTP2_IB_IGN_ALL) {
-        return (ssize_t)inlen;
-      }
-
-      session_inbound_frame_reset(session);
-
-      break;
-    }
-
-    if (!busy && in == last) {
-      break;
-    }
-
-    busy = 0;
-  }
-
-  assert(in == last);
-
-  return in - first;
-}
-
-int nghttp2_session_recv(nghttp2_session *session) {
-  uint8_t buf[NGHTTP2_INBOUND_BUFFER_LENGTH];
-  while (1) {
-    ssize_t readlen;
-    readlen = session_recv(session, buf, sizeof(buf));
-    if (readlen > 0) {
-      ssize_t proclen = nghttp2_session_mem_recv(session, buf, (size_t)readlen);
-      if (proclen < 0) {
-        return (int)proclen;
-      }
-      assert(proclen == readlen);
-    } else if (readlen == 0 || readlen == NGHTTP2_ERR_WOULDBLOCK) {
-      return 0;
-    } else if (readlen == NGHTTP2_ERR_EOF) {
-      return NGHTTP2_ERR_EOF;
-    } else if (readlen < 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-  }
-}
-
-/*
- * Returns the number of active streams, which includes streams in
- * reserved state.
- */
-static size_t session_get_num_active_streams(nghttp2_session *session) {
-  return nghttp2_map_size(&session->streams) - session->num_closed_streams -
-         session->num_idle_streams;
-}
-
-int nghttp2_session_want_read(nghttp2_session *session) {
-  size_t num_active_streams;
-
-  /* If this flag is set, we don't want to read. The application
-     should drop the connection. */
-  if (session->goaway_flags & NGHTTP2_GOAWAY_TERM_SENT) {
-    return 0;
-  }
-
-  num_active_streams = session_get_num_active_streams(session);
-
-  /* Unless termination GOAWAY is sent or received, we always want to
-     read incoming frames. */
-
-  if (num_active_streams > 0) {
-    return 1;
-  }
-
-  /* If there is no active streams and GOAWAY has been sent or
-     received, we are done with this session. */
-  return (session->goaway_flags &
-          (NGHTTP2_GOAWAY_SENT | NGHTTP2_GOAWAY_RECV)) == 0;
-}
-
-int nghttp2_session_want_write(nghttp2_session *session) {
-  /* If these flag is set, we don't want to write any data. The
-     application should drop the connection. */
-  if (session->goaway_flags & NGHTTP2_GOAWAY_TERM_SENT) {
-    return 0;
-  }
-
-  /*
-   * Unless termination GOAWAY is sent or received, we want to write
-   * frames if there is pending ones. If pending frame is request/push
-   * response HEADERS and concurrent stream limit is reached, we don't
-   * want to write them.
-   */
-  return session->aob.item || nghttp2_outbound_queue_top(&session->ob_urgent) ||
-         nghttp2_outbound_queue_top(&session->ob_reg) ||
-         (!nghttp2_pq_empty(&session->root.obq) &&
-          session->remote_window_size > 0) ||
-         (nghttp2_outbound_queue_top(&session->ob_syn) &&
-          !session_is_outgoing_concurrent_streams_max(session));
-}
-
-int nghttp2_session_add_ping(nghttp2_session *session, uint8_t flags,
-                             const uint8_t *opaque_data) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  if ((flags & NGHTTP2_FLAG_ACK) &&
-      session->obq_flood_counter_ >= NGHTTP2_MAX_OBQ_FLOOD_ITEM) {
-    return NGHTTP2_ERR_FLOODED;
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_ping_init(&frame->ping, flags, opaque_data);
-
-  rv = nghttp2_session_add_item(session, item);
-
-  if (rv != 0) {
-    nghttp2_frame_ping_free(&frame->ping);
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-
-  if (flags & NGHTTP2_FLAG_ACK) {
-    ++session->obq_flood_counter_;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_add_goaway(nghttp2_session *session, int32_t last_stream_id,
-                               uint32_t error_code, const uint8_t *opaque_data,
-                               size_t opaque_data_len, uint8_t aux_flags) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  uint8_t *opaque_data_copy = NULL;
-  nghttp2_goaway_aux_data *aux_data;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  if (nghttp2_session_is_my_stream_id(session, last_stream_id)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (opaque_data_len) {
-    if (opaque_data_len + 8 > NGHTTP2_MAX_PAYLOADLEN) {
-      return NGHTTP2_ERR_INVALID_ARGUMENT;
-    }
-    opaque_data_copy = nghttp2_mem_malloc(mem, opaque_data_len);
-    if (opaque_data_copy == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-    memcpy(opaque_data_copy, opaque_data, opaque_data_len);
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    nghttp2_mem_free(mem, opaque_data_copy);
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  /* last_stream_id must not be increased from the value previously
-     sent */
-  last_stream_id = nghttp2_min(last_stream_id, session->local_last_stream_id);
-
-  nghttp2_frame_goaway_init(&frame->goaway, last_stream_id, error_code,
-                            opaque_data_copy, opaque_data_len);
-
-  aux_data = &item->aux_data.goaway;
-  aux_data->flags = aux_flags;
-
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    nghttp2_frame_goaway_free(&frame->goaway, mem);
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-  return 0;
-}
-
-int nghttp2_session_add_window_update(nghttp2_session *session, uint8_t flags,
-                                      int32_t stream_id,
-                                      int32_t window_size_increment) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_window_update_init(&frame->window_update, flags, stream_id,
-                                   window_size_increment);
-
-  rv = nghttp2_session_add_item(session, item);
-
-  if (rv != 0) {
-    nghttp2_frame_window_update_free(&frame->window_update);
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-  return 0;
-}
-
-static void
-session_append_inflight_settings(nghttp2_session *session,
-                                 nghttp2_inflight_settings *settings) {
-  nghttp2_inflight_settings **i;
-
-  for (i = &session->inflight_settings_head; *i; i = &(*i)->next)
-    ;
-
-  *i = settings;
-}
-
-int nghttp2_session_add_settings(nghttp2_session *session, uint8_t flags,
-                                 const nghttp2_settings_entry *iv, size_t niv) {
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_settings_entry *iv_copy;
-  size_t i;
-  int rv;
-  nghttp2_mem *mem;
-  nghttp2_inflight_settings *inflight_settings = NULL;
-
-  mem = &session->mem;
-
-  if (flags & NGHTTP2_FLAG_ACK) {
-    if (niv != 0) {
-      return NGHTTP2_ERR_INVALID_ARGUMENT;
-    }
-
-    if (session->obq_flood_counter_ >= NGHTTP2_MAX_OBQ_FLOOD_ITEM) {
-      return NGHTTP2_ERR_FLOODED;
-    }
-  }
-
-  if (!nghttp2_iv_check(iv, niv)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  if (niv > 0) {
-    iv_copy = nghttp2_frame_iv_copy(iv, niv, mem);
-    if (iv_copy == NULL) {
-      nghttp2_mem_free(mem, item);
-      return NGHTTP2_ERR_NOMEM;
-    }
-  } else {
-    iv_copy = NULL;
-  }
-
-  if ((flags & NGHTTP2_FLAG_ACK) == 0) {
-    rv = inflight_settings_new(&inflight_settings, iv, niv, mem);
-    if (rv != 0) {
-      assert(nghttp2_is_fatal(rv));
-      nghttp2_mem_free(mem, iv_copy);
-      nghttp2_mem_free(mem, item);
-      return rv;
-    }
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_settings_init(&frame->settings, flags, iv_copy, niv);
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    /* The only expected error is fatal one */
-    assert(nghttp2_is_fatal(rv));
-
-    inflight_settings_del(inflight_settings, mem);
-
-    nghttp2_frame_settings_free(&frame->settings, mem);
-    nghttp2_mem_free(mem, item);
-
-    return rv;
-  }
-
-  if (flags & NGHTTP2_FLAG_ACK) {
-    ++session->obq_flood_counter_;
-  } else {
-    session_append_inflight_settings(session, inflight_settings);
-  }
-
-  /* Extract NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS and ENABLE_PUSH
-     here.  We use it to refuse the incoming stream and PUSH_PROMISE
-     with RST_STREAM. */
-
-  for (i = niv; i > 0; --i) {
-    if (iv[i - 1].settings_id == NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS) {
-      session->pending_local_max_concurrent_stream = iv[i - 1].value;
-      break;
-    }
-  }
-
-  for (i = niv; i > 0; --i) {
-    if (iv[i - 1].settings_id == NGHTTP2_SETTINGS_ENABLE_PUSH) {
-      session->pending_enable_push = (uint8_t)iv[i - 1].value;
-      break;
-    }
-  }
-
-  return 0;
-}
-
-int nghttp2_session_pack_data(nghttp2_session *session, nghttp2_bufs *bufs,
-                              size_t datamax, nghttp2_frame *frame,
-                              nghttp2_data_aux_data *aux_data,
-                              nghttp2_stream *stream) {
-  int rv;
-  uint32_t data_flags;
-  ssize_t payloadlen;
-  ssize_t padded_payloadlen;
-  nghttp2_buf *buf;
-  size_t max_payloadlen;
-
-  assert(bufs->head == bufs->cur);
-
-  buf = &bufs->cur->buf;
-
-  if (session->callbacks.read_length_callback) {
-
-    payloadlen = session->callbacks.read_length_callback(
-        session, frame->hd.type, stream->stream_id, session->remote_window_size,
-        stream->remote_window_size, session->remote_settings.max_frame_size,
-        session->user_data);
-
-    DEBUGF("send: read_length_callback=%zd\n", payloadlen);
-
-    payloadlen = nghttp2_session_enforce_flow_control_limits(session, stream,
-                                                             payloadlen);
-
-    DEBUGF("send: read_length_callback after flow control=%zd\n", payloadlen);
-
-    if (payloadlen <= 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    if ((size_t)payloadlen > nghttp2_buf_avail(buf)) {
-      /* Resize the current buffer(s).  The reason why we do +1 for
-         buffer size is for possible padding field. */
-      rv = nghttp2_bufs_realloc(&session->aob.framebufs,
-                                (size_t)(NGHTTP2_FRAME_HDLEN + 1 + payloadlen));
-
-      if (rv != 0) {
-        DEBUGF("send: realloc buffer failed rv=%d", rv);
-        /* If reallocation failed, old buffers are still in tact.  So
-           use safe limit. */
-        payloadlen = (ssize_t)datamax;
-
-        DEBUGF("send: use safe limit payloadlen=%zd", payloadlen);
-      } else {
-        assert(&session->aob.framebufs == bufs);
-
-        buf = &bufs->cur->buf;
-      }
-    }
-    datamax = (size_t)payloadlen;
-  }
-
-  /* Current max DATA length is less then buffer chunk size */
-  assert(nghttp2_buf_avail(buf) >= datamax);
-
-  data_flags = NGHTTP2_DATA_FLAG_NONE;
-  payloadlen = aux_data->data_prd.read_callback(
-      session, frame->hd.stream_id, buf->pos, datamax, &data_flags,
-      &aux_data->data_prd.source, session->user_data);
-
-  if (payloadlen == NGHTTP2_ERR_DEFERRED ||
-      payloadlen == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE ||
-      payloadlen == NGHTTP2_ERR_PAUSE) {
-    DEBUGF("send: DATA postponed due to %s\n",
-           nghttp2_strerror((int)payloadlen));
-
-    return (int)payloadlen;
-  }
-
-  if (payloadlen < 0 || datamax < (size_t)payloadlen) {
-    /* This is the error code when callback is failed. */
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  buf->last = buf->pos + payloadlen;
-  buf->pos -= NGHTTP2_FRAME_HDLEN;
-
-  /* Clear flags, because this may contain previous flags of previous
-     DATA */
-  frame->hd.flags = NGHTTP2_FLAG_NONE;
-
-  if (data_flags & NGHTTP2_DATA_FLAG_EOF) {
-    aux_data->eof = 1;
-    /* If NGHTTP2_DATA_FLAG_NO_END_STREAM is set, don't set
-       NGHTTP2_FLAG_END_STREAM */
-    if ((aux_data->flags & NGHTTP2_FLAG_END_STREAM) &&
-        (data_flags & NGHTTP2_DATA_FLAG_NO_END_STREAM) == 0) {
-      frame->hd.flags |= NGHTTP2_FLAG_END_STREAM;
-    }
-  }
-
-  if (data_flags & NGHTTP2_DATA_FLAG_NO_COPY) {
-    if (session->callbacks.send_data_callback == NULL) {
-      DEBUGF("NGHTTP2_DATA_FLAG_NO_COPY requires send_data_callback set\n");
-
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-    aux_data->no_copy = 1;
-  }
-
-  frame->hd.length = (size_t)payloadlen;
-  frame->data.padlen = 0;
-
-  max_payloadlen = nghttp2_min(datamax, frame->hd.length + NGHTTP2_MAX_PADLEN);
-
-  padded_payloadlen =
-      session_call_select_padding(session, frame, max_payloadlen);
-
-  if (nghttp2_is_fatal((int)padded_payloadlen)) {
-    return (int)padded_payloadlen;
-  }
-
-  frame->data.padlen = (size_t)(padded_payloadlen - payloadlen);
-
-  nghttp2_frame_pack_frame_hd(buf->pos, &frame->hd);
-
-  rv = nghttp2_frame_add_pad(bufs, &frame->hd, frame->data.padlen,
-                             aux_data->no_copy);
-  if (rv != 0) {
-    return rv;
-  }
-
-  reschedule_stream(stream);
-
-  if (frame->hd.length == 0 && (data_flags & NGHTTP2_DATA_FLAG_EOF) &&
-      (data_flags & NGHTTP2_DATA_FLAG_NO_END_STREAM)) {
-    /* DATA payload length is 0, and DATA frame does not bear
-       END_STREAM.  In this case, there is no point to send 0 length
-       DATA frame. */
-    return NGHTTP2_ERR_CANCEL;
-  }
-
-  return 0;
-}
-
-void *nghttp2_session_get_stream_user_data(nghttp2_session *session,
-                                           int32_t stream_id) {
-  nghttp2_stream *stream;
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream) {
-    return stream->stream_user_data;
-  } else {
-    return NULL;
-  }
-}
-
-int nghttp2_session_set_stream_user_data(nghttp2_session *session,
-                                         int32_t stream_id,
-                                         void *stream_user_data) {
-  nghttp2_stream *stream;
-  nghttp2_frame *frame;
-  nghttp2_outbound_item *item;
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream) {
-    stream->stream_user_data = stream_user_data;
-    return 0;
-  }
-
-  if (session->server || !nghttp2_session_is_my_stream_id(session, stream_id) ||
-      !nghttp2_outbound_queue_top(&session->ob_syn)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  frame = &nghttp2_outbound_queue_top(&session->ob_syn)->frame;
-  assert(frame->hd.type == NGHTTP2_HEADERS);
-
-  if (frame->hd.stream_id > stream_id ||
-      (uint32_t)stream_id >= session->next_stream_id) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  for (item = session->ob_syn.head; item; item = item->qnext) {
-    if (item->frame.hd.stream_id < stream_id) {
-      continue;
-    }
-
-    if (item->frame.hd.stream_id > stream_id) {
-      break;
-    }
-
-    item->aux_data.headers.stream_user_data = stream_user_data;
-    return 0;
-  }
-
-  return NGHTTP2_ERR_INVALID_ARGUMENT;
-}
-
-int nghttp2_session_resume_data(nghttp2_session *session, int32_t stream_id) {
-  int rv;
-  nghttp2_stream *stream;
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL || !nghttp2_stream_check_deferred_item(stream)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  rv = nghttp2_stream_resume_deferred_item(stream,
-                                           NGHTTP2_STREAM_FLAG_DEFERRED_USER);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  return 0;
-}
-
-size_t nghttp2_session_get_outbound_queue_size(nghttp2_session *session) {
-  return nghttp2_outbound_queue_size(&session->ob_urgent) +
-         nghttp2_outbound_queue_size(&session->ob_reg) +
-         nghttp2_outbound_queue_size(&session->ob_syn);
-  /* TODO account for item attached to stream */
-}
-
-int32_t
-nghttp2_session_get_stream_effective_recv_data_length(nghttp2_session *session,
-                                                      int32_t stream_id) {
-  nghttp2_stream *stream;
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL) {
-    return -1;
-  }
-  return stream->recv_window_size < 0 ? 0 : stream->recv_window_size;
-}
-
-int32_t
-nghttp2_session_get_stream_effective_local_window_size(nghttp2_session *session,
-                                                       int32_t stream_id) {
-  nghttp2_stream *stream;
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL) {
-    return -1;
-  }
-  return stream->local_window_size;
-}
-
-int32_t nghttp2_session_get_stream_local_window_size(nghttp2_session *session,
-                                                     int32_t stream_id) {
-  nghttp2_stream *stream;
-  int32_t size;
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL) {
-    return -1;
-  }
-
-  size = stream->local_window_size - stream->recv_window_size;
-
-  /* size could be negative if local endpoint reduced
-     SETTINGS_INITIAL_WINDOW_SIZE */
-  if (size < 0) {
-    return 0;
-  }
-
-  return size;
-}
-
-int32_t
-nghttp2_session_get_effective_recv_data_length(nghttp2_session *session) {
-  return session->recv_window_size < 0 ? 0 : session->recv_window_size;
-}
-
-int32_t
-nghttp2_session_get_effective_local_window_size(nghttp2_session *session) {
-  return session->local_window_size;
-}
-
-int32_t nghttp2_session_get_local_window_size(nghttp2_session *session) {
-  return session->local_window_size - session->recv_window_size;
-}
-
-int32_t nghttp2_session_get_stream_remote_window_size(nghttp2_session *session,
-                                                      int32_t stream_id) {
-  nghttp2_stream *stream;
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-  if (stream == NULL) {
-    return -1;
-  }
-
-  /* stream->remote_window_size can be negative when
-     SETTINGS_INITIAL_WINDOW_SIZE is changed. */
-  return nghttp2_max(0, stream->remote_window_size);
-}
-
-int32_t nghttp2_session_get_remote_window_size(nghttp2_session *session) {
-  return session->remote_window_size;
-}
-
-uint32_t nghttp2_session_get_remote_settings(nghttp2_session *session,
-                                             nghttp2_settings_id id) {
-  switch (id) {
-  case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-    return session->remote_settings.header_table_size;
-  case NGHTTP2_SETTINGS_ENABLE_PUSH:
-    return session->remote_settings.enable_push;
-  case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-    return session->remote_settings.max_concurrent_streams;
-  case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-    return session->remote_settings.initial_window_size;
-  case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-    return session->remote_settings.max_frame_size;
-  case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-    return session->remote_settings.max_header_list_size;
-  }
-
-  assert(0);
-  abort(); /* if NDEBUG is set */
-}
-
-uint32_t nghttp2_session_get_local_settings(nghttp2_session *session,
-                                            nghttp2_settings_id id) {
-  switch (id) {
-  case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-    return session->local_settings.header_table_size;
-  case NGHTTP2_SETTINGS_ENABLE_PUSH:
-    return session->local_settings.enable_push;
-  case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-    return session->local_settings.max_concurrent_streams;
-  case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-    return session->local_settings.initial_window_size;
-  case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-    return session->local_settings.max_frame_size;
-  case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-    return session->local_settings.max_header_list_size;
-  }
-
-  assert(0);
-  abort(); /* if NDEBUG is set */
-}
-
-static int nghttp2_session_upgrade_internal(nghttp2_session *session,
-                                            const uint8_t *settings_payload,
-                                            size_t settings_payloadlen,
-                                            void *stream_user_data) {
-  nghttp2_stream *stream;
-  nghttp2_frame frame;
-  nghttp2_settings_entry *iv;
-  size_t niv;
-  int rv;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  if ((!session->server && session->next_stream_id != 1) ||
-      (session->server && session->last_recv_stream_id >= 1)) {
-    return NGHTTP2_ERR_PROTO;
-  }
-  if (settings_payloadlen % NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-  rv = nghttp2_frame_unpack_settings_payload2(&iv, &niv, settings_payload,
-                                              settings_payloadlen, mem);
-  if (rv != 0) {
-    return rv;
-  }
-
-  if (session->server) {
-    nghttp2_frame_hd_init(&frame.hd, settings_payloadlen, NGHTTP2_SETTINGS,
-                          NGHTTP2_FLAG_NONE, 0);
-    frame.settings.iv = iv;
-    frame.settings.niv = niv;
-    rv = nghttp2_session_on_settings_received(session, &frame, 1 /* No ACK */);
-  } else {
-    rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, niv);
-  }
-  nghttp2_mem_free(mem, iv);
-  if (rv != 0) {
-    return rv;
-  }
-
-  nghttp2_priority_spec_default_init(&pri_spec);
-
-  stream = nghttp2_session_open_stream(
-      session, 1, NGHTTP2_STREAM_FLAG_NONE, &pri_spec, NGHTTP2_STREAM_OPENING,
-      session->server ? NULL : stream_user_data);
-  if (stream == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  /* We don't call nghttp2_session_adjust_closed_stream(), since this
-     should be the first stream open. */
-
-  if (session->server) {
-    nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-    session->last_recv_stream_id = 1;
-    session->last_proc_stream_id = 1;
-  } else {
-    nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-    session->last_sent_stream_id = 1;
-    session->next_stream_id += 2;
-  }
-  return 0;
-}
-
-int nghttp2_session_upgrade(nghttp2_session *session,
-                            const uint8_t *settings_payload,
-                            size_t settings_payloadlen,
-                            void *stream_user_data) {
-  int rv;
-  nghttp2_stream *stream;
-
-  rv = nghttp2_session_upgrade_internal(session, settings_payload,
-                                        settings_payloadlen, stream_user_data);
-  if (rv != 0) {
-    return rv;
-  }
-
-  stream = nghttp2_session_get_stream(session, 1);
-  assert(stream);
-
-  /* We have no information about request header fields when Upgrade
-     was happened.  So we don't know the request method here.  If
-     request method is HEAD, we have a trouble because we may have
-     nonzero content-length header field in response headers, and we
-     will going to check it against the actual DATA frames, but we may
-     get mismatch because HEAD response body must be empty.  Because
-     of this reason, nghttp2_session_upgrade() was deprecated in favor
-     of nghttp2_session_upgrade2(), which has |head_request| parameter
-     to indicate that request method is HEAD or not. */
-  stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_UPGRADE_WORKAROUND;
-  return 0;
-}
-
-int nghttp2_session_upgrade2(nghttp2_session *session,
-                             const uint8_t *settings_payload,
-                             size_t settings_payloadlen, int head_request,
-                             void *stream_user_data) {
-  int rv;
-  nghttp2_stream *stream;
-
-  rv = nghttp2_session_upgrade_internal(session, settings_payload,
-                                        settings_payloadlen, stream_user_data);
-  if (rv != 0) {
-    return rv;
-  }
-
-  stream = nghttp2_session_get_stream(session, 1);
-  assert(stream);
-
-  if (head_request) {
-    stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_HEAD;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_get_stream_local_close(nghttp2_session *session,
-                                           int32_t stream_id) {
-  nghttp2_stream *stream;
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  if (!stream) {
-    return -1;
-  }
-
-  return (stream->shut_flags & NGHTTP2_SHUT_WR) != 0;
-}
-
-int nghttp2_session_get_stream_remote_close(nghttp2_session *session,
-                                            int32_t stream_id) {
-  nghttp2_stream *stream;
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  if (!stream) {
-    return -1;
-  }
-
-  return (stream->shut_flags & NGHTTP2_SHUT_RD) != 0;
-}
-
-int nghttp2_session_consume(nghttp2_session *session, int32_t stream_id,
-                            size_t size) {
-  int rv;
-  nghttp2_stream *stream;
-
-  if (stream_id == 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (!(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE)) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  rv = session_update_connection_consumed_size(session, size);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  if (!stream) {
-    return 0;
-  }
-
-  rv = session_update_stream_consumed_size(session, stream, size);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_consume_connection(nghttp2_session *session, size_t size) {
-  int rv;
-
-  if (!(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE)) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  rv = session_update_connection_consumed_size(session, size);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_consume_stream(nghttp2_session *session, int32_t stream_id,
-                                   size_t size) {
-  int rv;
-  nghttp2_stream *stream;
-
-  if (stream_id == 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (!(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE)) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  if (!stream) {
-    return 0;
-  }
-
-  rv = session_update_stream_consumed_size(session, stream, size);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_session_set_next_stream_id(nghttp2_session *session,
-                                       int32_t next_stream_id) {
-  if (next_stream_id <= 0 ||
-      session->next_stream_id > (uint32_t)next_stream_id) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (session->server) {
-    if (next_stream_id % 2) {
-      return NGHTTP2_ERR_INVALID_ARGUMENT;
-    }
-  } else if (next_stream_id % 2 == 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  session->next_stream_id = (uint32_t)next_stream_id;
-  return 0;
-}
-
-uint32_t nghttp2_session_get_next_stream_id(nghttp2_session *session) {
-  return session->next_stream_id;
-}
-
-int32_t nghttp2_session_get_last_proc_stream_id(nghttp2_session *session) {
-  return session->last_proc_stream_id;
-}
-
-nghttp2_stream *nghttp2_session_find_stream(nghttp2_session *session,
-                                            int32_t stream_id) {
-  if (stream_id == 0) {
-    return &session->root;
-  }
-
-  return nghttp2_session_get_stream_raw(session, stream_id);
-}
-
-nghttp2_stream *nghttp2_session_get_root_stream(nghttp2_session *session) {
-  return &session->root;
-}
-
-int nghttp2_session_check_server_session(nghttp2_session *session) {
-  return session->server;
-}
-
-int nghttp2_session_change_stream_priority(
-    nghttp2_session *session, int32_t stream_id,
-    const nghttp2_priority_spec *pri_spec) {
-  int rv;
-  nghttp2_stream *stream;
-  nghttp2_priority_spec pri_spec_copy;
-
-  if (stream_id == 0 || stream_id == pri_spec->stream_id) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  stream = nghttp2_session_get_stream_raw(session, stream_id);
-  if (!stream) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  pri_spec_copy = *pri_spec;
-  nghttp2_priority_spec_normalize_weight(&pri_spec_copy);
-
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec_copy);
-
-  if (nghttp2_is_fatal(rv)) {
-    return rv;
-  }
-
-  /* We don't intentionally call nghttp2_session_adjust_idle_stream()
-     so that idle stream created by this function, and existing ones
-     are kept for application.  We will adjust number of idle stream
-     in nghttp2_session_mem_send or nghttp2_session_mem_recv is
-     called. */
-  return 0;
-}
-
-int nghttp2_session_create_idle_stream(nghttp2_session *session,
-                                       int32_t stream_id,
-                                       const nghttp2_priority_spec *pri_spec) {
-  nghttp2_stream *stream;
-  nghttp2_priority_spec pri_spec_copy;
-
-  if (stream_id == 0 || stream_id == pri_spec->stream_id ||
-      !session_detect_idle_stream(session, stream_id)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  stream = nghttp2_session_get_stream_raw(session, stream_id);
-  if (stream) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  pri_spec_copy = *pri_spec;
-  nghttp2_priority_spec_normalize_weight(&pri_spec_copy);
-
-  stream =
-      nghttp2_session_open_stream(session, stream_id, NGHTTP2_STREAM_FLAG_NONE,
-                                  &pri_spec_copy, NGHTTP2_STREAM_IDLE, NULL);
-  if (!stream) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  /* We don't intentionally call nghttp2_session_adjust_idle_stream()
-     so that idle stream created by this function, and existing ones
-     are kept for application.  We will adjust number of idle stream
-     in nghttp2_session_mem_send or nghttp2_session_mem_recv is
-     called. */
-  return 0;
-}
-
-size_t
-nghttp2_session_get_hd_inflate_dynamic_table_size(nghttp2_session *session) {
-  return nghttp2_hd_inflate_get_dynamic_table_size(&session->hd_inflater);
-}
-
-size_t
-nghttp2_session_get_hd_deflate_dynamic_table_size(nghttp2_session *session) {
-  return nghttp2_hd_deflate_get_dynamic_table_size(&session->hd_deflater);
-}
-
-void nghttp2_session_set_user_data(nghttp2_session *session, void *user_data) {
-  session->user_data = user_data;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_session.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,896 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_SESSION_H
-#define NGHTTP2_SESSION_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_map.h"
-#include "nghttp2_frame.h"
-#include "nghttp2_hd.h"
-#include "nghttp2_stream.h"
-#include "nghttp2_outbound_item.h"
-#include "nghttp2_int.h"
-#include "nghttp2_buf.h"
-#include "nghttp2_callbacks.h"
-#include "nghttp2_mem.h"
-
-/* The global variable for tests where we want to disable strict
-   preface handling. */
-extern int nghttp2_enable_strict_preface;
-
-/*
- * Option flags.
- */
-typedef enum {
-  NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE = 1 << 0,
-  NGHTTP2_OPTMASK_NO_RECV_CLIENT_MAGIC = 1 << 1,
-  NGHTTP2_OPTMASK_NO_HTTP_MESSAGING = 1 << 2,
-  NGHTTP2_OPTMASK_NO_AUTO_PING_ACK = 1 << 3,
-  NGHTTP2_OPTMASK_NO_CLOSED_STREAMS = 1 << 4
-} nghttp2_optmask;
-
-/*
- * bitmask for built-in type to enable the default handling for that
- * type of the frame.
- */
-typedef enum {
-  NGHTTP2_TYPEMASK_NONE = 0,
-  NGHTTP2_TYPEMASK_ALTSVC = 1 << 0,
-  NGHTTP2_TYPEMASK_ORIGIN = 1 << 1
-} nghttp2_typemask;
-
-typedef enum {
-  NGHTTP2_OB_POP_ITEM,
-  NGHTTP2_OB_SEND_DATA,
-  NGHTTP2_OB_SEND_NO_COPY,
-  NGHTTP2_OB_SEND_CLIENT_MAGIC
-} nghttp2_outbound_state;
-
-typedef struct {
-  nghttp2_outbound_item *item;
-  nghttp2_bufs framebufs;
-  nghttp2_outbound_state state;
-} nghttp2_active_outbound_item;
-
-/* Buffer length for inbound raw byte stream used in
-   nghttp2_session_recv(). */
-#define NGHTTP2_INBOUND_BUFFER_LENGTH 16384
-
-/* The default maximum number of incoming reserved streams */
-#define NGHTTP2_MAX_INCOMING_RESERVED_STREAMS 200
-
-/* Even if we have less SETTINGS_MAX_CONCURRENT_STREAMS than this
-   number, we keep NGHTTP2_MIN_IDLE_STREAMS streams in idle state */
-#define NGHTTP2_MIN_IDLE_STREAMS 16
-
-/* The maximum number of items in outbound queue, which is considered
-   as flooding caused by peer.  All frames are not considered here.
-   We only consider PING + ACK and SETTINGS + ACK.  This is because
-   they both are response to the frame initiated by peer and peer can
-   send as many of them as they want.  If peer does not read network,
-   response frames are stacked up, which leads to memory exhaustion.
-   The value selected here is arbitrary, but safe value and if we have
-   these frames in this number, it is considered suspicious. */
-#define NGHTTP2_MAX_OBQ_FLOOD_ITEM 10000
-
-/* The default value of maximum number of concurrent streams. */
-#define NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS 0xffffffffu
-
-/* Internal state when receiving incoming frame */
-typedef enum {
-  /* Receiving frame header */
-  NGHTTP2_IB_READ_CLIENT_MAGIC,
-  NGHTTP2_IB_READ_FIRST_SETTINGS,
-  NGHTTP2_IB_READ_HEAD,
-  NGHTTP2_IB_READ_NBYTE,
-  NGHTTP2_IB_READ_HEADER_BLOCK,
-  NGHTTP2_IB_IGN_HEADER_BLOCK,
-  NGHTTP2_IB_IGN_PAYLOAD,
-  NGHTTP2_IB_FRAME_SIZE_ERROR,
-  NGHTTP2_IB_READ_SETTINGS,
-  NGHTTP2_IB_READ_GOAWAY_DEBUG,
-  NGHTTP2_IB_EXPECT_CONTINUATION,
-  NGHTTP2_IB_IGN_CONTINUATION,
-  NGHTTP2_IB_READ_PAD_DATA,
-  NGHTTP2_IB_READ_DATA,
-  NGHTTP2_IB_IGN_DATA,
-  NGHTTP2_IB_IGN_ALL,
-  NGHTTP2_IB_READ_ALTSVC_PAYLOAD,
-  NGHTTP2_IB_READ_ORIGIN_PAYLOAD,
-  NGHTTP2_IB_READ_EXTENSION_PAYLOAD
-} nghttp2_inbound_state;
-
-typedef struct {
-  nghttp2_frame frame;
-  /* Storage for extension frame payload.  frame->ext.payload points
-     to this structure to avoid frequent memory allocation. */
-  nghttp2_ext_frame_payload ext_frame_payload;
-  /* The received SETTINGS entry.  For the standard settings entries,
-     we only keep the last seen value.  For
-     SETTINGS_HEADER_TABLE_SIZE, we also keep minimum value in the
-     last index. */
-  nghttp2_settings_entry *iv;
-  /* buffer pointers to small buffer, raw_sbuf */
-  nghttp2_buf sbuf;
-  /* buffer pointers to large buffer, raw_lbuf */
-  nghttp2_buf lbuf;
-  /* Large buffer, malloced on demand */
-  uint8_t *raw_lbuf;
-  /* The number of entry filled in |iv| */
-  size_t niv;
-  /* The number of entries |iv| can store. */
-  size_t max_niv;
-  /* How many bytes we still need to receive for current frame */
-  size_t payloadleft;
-  /* padding length for the current frame */
-  size_t padlen;
-  nghttp2_inbound_state state;
-  /* Small buffer.  Currently the largest contiguous chunk to buffer
-     is frame header.  We buffer part of payload, but they are smaller
-     than frame header. */
-  uint8_t raw_sbuf[NGHTTP2_FRAME_HDLEN];
-} nghttp2_inbound_frame;
-
-typedef struct {
-  uint32_t header_table_size;
-  uint32_t enable_push;
-  uint32_t max_concurrent_streams;
-  uint32_t initial_window_size;
-  uint32_t max_frame_size;
-  uint32_t max_header_list_size;
-} nghttp2_settings_storage;
-
-typedef enum {
-  NGHTTP2_GOAWAY_NONE = 0,
-  /* Flag means that connection should be terminated after sending GOAWAY. */
-  NGHTTP2_GOAWAY_TERM_ON_SEND = 0x1,
-  /* Flag means GOAWAY to terminate session has been sent */
-  NGHTTP2_GOAWAY_TERM_SENT = 0x2,
-  /* Flag means GOAWAY was sent */
-  NGHTTP2_GOAWAY_SENT = 0x4,
-  /* Flag means GOAWAY was received */
-  NGHTTP2_GOAWAY_RECV = 0x8
-} nghttp2_goaway_flag;
-
-/* nghttp2_inflight_settings stores the SETTINGS entries which local
-   endpoint has sent to the remote endpoint, and has not received ACK
-   yet. */
-struct nghttp2_inflight_settings {
-  struct nghttp2_inflight_settings *next;
-  nghttp2_settings_entry *iv;
-  size_t niv;
-};
-
-typedef struct nghttp2_inflight_settings nghttp2_inflight_settings;
-
-struct nghttp2_session {
-  nghttp2_map /* <nghttp2_stream*> */ streams;
-  /* root of dependency tree*/
-  nghttp2_stream root;
-  /* Queue for outbound urgent frames (PING and SETTINGS) */
-  nghttp2_outbound_queue ob_urgent;
-  /* Queue for non-DATA frames */
-  nghttp2_outbound_queue ob_reg;
-  /* Queue for outbound stream-creating HEADERS (request or push
-     response) frame, which are subject to
-     SETTINGS_MAX_CONCURRENT_STREAMS limit. */
-  nghttp2_outbound_queue ob_syn;
-  nghttp2_active_outbound_item aob;
-  nghttp2_inbound_frame iframe;
-  nghttp2_hd_deflater hd_deflater;
-  nghttp2_hd_inflater hd_inflater;
-  nghttp2_session_callbacks callbacks;
-  /* Memory allocator */
-  nghttp2_mem mem;
-  /* Base value when we schedule next DATA frame write.  This is
-     updated when one frame was written. */
-  uint64_t last_cycle;
-  void *user_data;
-  /* Points to the latest incoming closed stream.  NULL if there is no
-     closed stream.  Only used when session is initialized as
-     server. */
-  nghttp2_stream *closed_stream_head;
-  /* Points to the oldest incoming closed stream.  NULL if there is no
-     closed stream.  Only used when session is initialized as
-     server. */
-  nghttp2_stream *closed_stream_tail;
-  /* Points to the latest idle stream.  NULL if there is no idle
-     stream.  Only used when session is initialized as server .*/
-  nghttp2_stream *idle_stream_head;
-  /* Points to the oldest idle stream.  NULL if there is no idle
-     stream.  Only used when session is initialized as erver. */
-  nghttp2_stream *idle_stream_tail;
-  /* Queue of In-flight SETTINGS values.  SETTINGS bearing ACK is not
-     considered as in-flight. */
-  nghttp2_inflight_settings *inflight_settings_head;
-  /* The number of outgoing streams. This will be capped by
-     remote_settings.max_concurrent_streams. */
-  size_t num_outgoing_streams;
-  /* The number of incoming streams. This will be capped by
-     local_settings.max_concurrent_streams. */
-  size_t num_incoming_streams;
-  /* The number of incoming reserved streams.  This is the number of
-     streams in reserved (remote) state.  RFC 7540 does not limit this
-     number.  nghttp2 offers
-     nghttp2_option_set_max_reserved_remote_streams() to achieve this.
-     If it is used, num_incoming_streams is capped by
-     max_incoming_reserved_streams.  Client application should
-     consider to set this because without that server can send
-     arbitrary number of PUSH_PROMISE, and exhaust client's memory. */
-  size_t num_incoming_reserved_streams;
-  /* The maximum number of incoming reserved streams (reserved
-     (remote) state).  RST_STREAM will be sent for the pushed stream
-     which exceeds this limit. */
-  size_t max_incoming_reserved_streams;
-  /* The number of closed streams still kept in |streams| hash.  The
-     closed streams can be accessed through single linked list
-     |closed_stream_head|.  The current implementation only keeps
-     incoming streams and session is initialized as server. */
-  size_t num_closed_streams;
-  /* The number of idle streams kept in |streams| hash.  The idle
-     streams can be accessed through doubly linked list
-     |idle_stream_head|.  The current implementation only keeps idle
-     streams if session is initialized as server. */
-  size_t num_idle_streams;
-  /* The number of bytes allocated for nvbuf */
-  size_t nvbuflen;
-  /* Counter for detecting flooding in outbound queue */
-  size_t obq_flood_counter_;
-  /* The maximum length of header block to send.  Calculated by the
-     same way as nghttp2_hd_deflate_bound() does. */
-  size_t max_send_header_block_length;
-  /* Next Stream ID. Made unsigned int to detect >= (1 << 31). */
-  uint32_t next_stream_id;
-  /* The last stream ID this session initiated.  For client session,
-     this is the last stream ID it has sent.  For server session, it
-     is the last promised stream ID sent in PUSH_PROMISE. */
-  int32_t last_sent_stream_id;
-  /* The largest stream ID received so far */
-  int32_t last_recv_stream_id;
-  /* The largest stream ID which has been processed in some way. This
-     value will be used as last-stream-id when sending GOAWAY
-     frame. */
-  int32_t last_proc_stream_id;
-  /* Counter of unique ID of PING. Wraps when it exceeds
-     NGHTTP2_MAX_UNIQUE_ID */
-  uint32_t next_unique_id;
-  /* This is the last-stream-ID we have sent in GOAWAY */
-  int32_t local_last_stream_id;
-  /* This is the value in GOAWAY frame received from remote endpoint. */
-  int32_t remote_last_stream_id;
-  /* Current sender window size. This value is computed against the
-     current initial window size of remote endpoint. */
-  int32_t remote_window_size;
-  /* Keep track of the number of bytes received without
-     WINDOW_UPDATE. This could be negative after submitting negative
-     value to WINDOW_UPDATE. */
-  int32_t recv_window_size;
-  /* The number of bytes consumed by the application and now is
-     subject to WINDOW_UPDATE.  This is only used when auto
-     WINDOW_UPDATE is turned off. */
-  int32_t consumed_size;
-  /* The amount of recv_window_size cut using submitting negative
-     value to WINDOW_UPDATE */
-  int32_t recv_reduction;
-  /* window size for local flow control. It is initially set to
-     NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE and could be
-     increased/decreased by submitting WINDOW_UPDATE. See
-     nghttp2_submit_window_update(). */
-  int32_t local_window_size;
-  /* This flag is used to indicate that the local endpoint received initial
-     SETTINGS frame from the remote endpoint. */
-  uint8_t remote_settings_received;
-  /* Settings value received from the remote endpoint. */
-  nghttp2_settings_storage remote_settings;
-  /* Settings value of the local endpoint. */
-  nghttp2_settings_storage local_settings;
-  /* Option flags. This is bitwise-OR of 0 or more of nghttp2_optmask. */
-  uint32_t opt_flags;
-  /* Unacked local SETTINGS_MAX_CONCURRENT_STREAMS value. We use this
-     to refuse the incoming stream if it exceeds this value. */
-  uint32_t pending_local_max_concurrent_stream;
-  /* The bitwise OR of zero or more of nghttp2_typemask to indicate
-     that the default handling of extension frame is enabled. */
-  uint32_t builtin_recv_ext_types;
-  /* Unacked local ENABLE_PUSH value.  We use this to refuse
-     PUSH_PROMISE before SETTINGS ACK is received. */
-  uint8_t pending_enable_push;
-  /* Nonzero if the session is server side. */
-  uint8_t server;
-  /* Flags indicating GOAWAY is sent and/or received. The flags are
-     composed by bitwise OR-ing nghttp2_goaway_flag. */
-  uint8_t goaway_flags;
-  /* This flag is used to reduce excessive queuing of WINDOW_UPDATE to
-     this session.  The nonzero does not necessarily mean
-     WINDOW_UPDATE is not queued. */
-  uint8_t window_update_queued;
-  /* Bitfield of extension frame types that application is willing to
-     receive.  To designate the bit of given frame type i, use
-     user_recv_ext_types[i / 8] & (1 << (i & 0x7)).  First 10 frame
-     types are standard frame types and not used in this bitfield.  If
-     bit is set, it indicates that incoming frame with that type is
-     passed to user defined callbacks, otherwise they are ignored. */
-  uint8_t user_recv_ext_types[32];
-};
-
-/* Struct used when updating initial window size of each active
-   stream. */
-typedef struct {
-  nghttp2_session *session;
-  int32_t new_window_size, old_window_size;
-} nghttp2_update_window_size_arg;
-
-typedef struct {
-  nghttp2_session *session;
-  /* linked list of streams to close */
-  nghttp2_stream *head;
-  int32_t last_stream_id;
-  /* nonzero if GOAWAY is sent to peer, which means we are going to
-     close incoming streams.  zero if GOAWAY is received from peer and
-     we are going to close outgoing streams. */
-  int incoming;
-} nghttp2_close_stream_on_goaway_arg;
-
-/* TODO stream timeout etc */
-
-/*
- * Returns nonzero value if |stream_id| is initiated by local
- * endpoint.
- */
-int nghttp2_session_is_my_stream_id(nghttp2_session *session,
-                                    int32_t stream_id);
-
-/*
- * Adds |item| to the outbound queue in |session|.  When this function
- * succeeds, it takes ownership of |item|. So caller must not free it
- * on success.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_STREAM_CLOSED
- *     Stream already closed (DATA and PUSH_PROMISE frame only)
- */
-int nghttp2_session_add_item(nghttp2_session *session,
-                             nghttp2_outbound_item *item);
-
-/*
- * Adds RST_STREAM frame for the stream |stream_id| with the error
- * code |error_code|. This is a convenient function built on top of
- * nghttp2_session_add_frame() to add RST_STREAM easily.
- *
- * This function simply returns 0 without adding RST_STREAM frame if
- * given stream is in NGHTTP2_STREAM_CLOSING state, because multiple
- * RST_STREAM for a stream is redundant.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_session_add_rst_stream(nghttp2_session *session, int32_t stream_id,
-                                   uint32_t error_code);
-
-/*
- * Adds PING frame. This is a convenient functin built on top of
- * nghttp2_session_add_frame() to add PING easily.
- *
- * If the |opaque_data| is not NULL, it must point to 8 bytes memory
- * region of data. The data pointed by |opaque_data| is copied. It can
- * be NULL. In this case, 8 bytes NULL is used.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_FLOODED
- *     There are too many items in outbound queue; this only happens
- *     if NGHTTP2_FLAG_ACK is set in |flags|
- */
-int nghttp2_session_add_ping(nghttp2_session *session, uint8_t flags,
-                             const uint8_t *opaque_data);
-
-/*
- * Adds GOAWAY frame with the last-stream-ID |last_stream_id| and the
- * error code |error_code|. This is a convenient function built on top
- * of nghttp2_session_add_frame() to add GOAWAY easily.  The
- * |aux_flags| are bitwise-OR of one or more of
- * nghttp2_goaway_aux_flag.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The |opaque_data_len| is too large.
- */
-int nghttp2_session_add_goaway(nghttp2_session *session, int32_t last_stream_id,
-                               uint32_t error_code, const uint8_t *opaque_data,
-                               size_t opaque_data_len, uint8_t aux_flags);
-
-/*
- * Adds WINDOW_UPDATE frame with stream ID |stream_id| and
- * window-size-increment |window_size_increment|. This is a convenient
- * function built on top of nghttp2_session_add_frame() to add
- * WINDOW_UPDATE easily.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_session_add_window_update(nghttp2_session *session, uint8_t flags,
-                                      int32_t stream_id,
-                                      int32_t window_size_increment);
-
-/*
- * Adds SETTINGS frame.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_FLOODED
- *     There are too many items in outbound queue; this only happens
- *     if NGHTTP2_FLAG_ACK is set in |flags|
- */
-int nghttp2_session_add_settings(nghttp2_session *session, uint8_t flags,
-                                 const nghttp2_settings_entry *iv, size_t niv);
-
-/*
- * Creates new stream in |session| with stream ID |stream_id|,
- * priority |pri_spec| and flags |flags|.  The |flags| is bitwise OR
- * of nghttp2_stream_flag.  Since this function is called when initial
- * HEADERS is sent or received, these flags are taken from it.  The
- * state of stream is set to |initial_state|. The |stream_user_data|
- * is a pointer to the arbitrary user supplied data to be associated
- * to this stream.
- *
- * If |initial_state| is NGHTTP2_STREAM_RESERVED, this function sets
- * NGHTTP2_STREAM_FLAG_PUSH flag set.
- *
- * This function returns a pointer to created new stream object, or
- * NULL.
- *
- * This function adjusts neither the number of closed streams or idle
- * streams.  The caller should manually call
- * nghttp2_session_adjust_closed_stream() or
- * nghttp2_session_adjust_idle_stream() respectively.
- */
-nghttp2_stream *nghttp2_session_open_stream(nghttp2_session *session,
-                                            int32_t stream_id, uint8_t flags,
-                                            nghttp2_priority_spec *pri_spec,
-                                            nghttp2_stream_state initial_state,
-                                            void *stream_user_data);
-
-/*
- * Closes stream whose stream ID is |stream_id|. The reason of closure
- * is indicated by the |error_code|. When closing the stream,
- * on_stream_close_callback will be called.
- *
- * If the session is initialized as server and |stream| is incoming
- * stream, stream is just marked closed and this function calls
- * nghttp2_session_keep_closed_stream() with |stream|.  Otherwise,
- * |stream| will be deleted from memory.
- *
- * This function returns 0 if it succeeds, or one the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The specified stream does not exist.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-int nghttp2_session_close_stream(nghttp2_session *session, int32_t stream_id,
-                                 uint32_t error_code);
-
-/*
- * Deletes |stream| from memory.  After this function returns, stream
- * cannot be accessed.
- *
- * This function returns 0 if it succeeds, or one the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_session_destroy_stream(nghttp2_session *session,
-                                   nghttp2_stream *stream);
-
-/*
- * Tries to keep incoming closed stream |stream|.  Due to the
- * limitation of maximum number of streams in memory, |stream| is not
- * closed and just deleted from memory (see
- * nghttp2_session_destroy_stream).
- */
-void nghttp2_session_keep_closed_stream(nghttp2_session *session,
-                                        nghttp2_stream *stream);
-
-/*
- * Appends |stream| to linked list |session->idle_stream_head|.  We
- * apply fixed limit for list size.  To fit into that limit, one or
- * more oldest streams are removed from list as necessary.
- */
-void nghttp2_session_keep_idle_stream(nghttp2_session *session,
-                                      nghttp2_stream *stream);
-
-/*
- * Detaches |stream| from idle streams linked list.
- */
-void nghttp2_session_detach_idle_stream(nghttp2_session *session,
-                                        nghttp2_stream *stream);
-
-/*
- * Deletes closed stream to ensure that number of incoming streams
- * including active and closed is in the maximum number of allowed
- * stream.
- *
- * This function returns 0 if it succeeds, or one the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_session_adjust_closed_stream(nghttp2_session *session);
-
-/*
- * Deletes idle stream to ensure that number of idle streams is in
- * certain limit.
- *
- * This function returns 0 if it succeeds, or one the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_session_adjust_idle_stream(nghttp2_session *session);
-
-/*
- * If further receptions and transmissions over the stream |stream_id|
- * are disallowed, close the stream with error code NGHTTP2_NO_ERROR.
- *
- * This function returns 0 if it
- * succeeds, or one of the following negative error codes:
- *
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The specified stream does not exist.
- */
-int nghttp2_session_close_stream_if_shut_rdwr(nghttp2_session *session,
-                                              nghttp2_stream *stream);
-
-int nghttp2_session_on_request_headers_received(nghttp2_session *session,
-                                                nghttp2_frame *frame);
-
-int nghttp2_session_on_response_headers_received(nghttp2_session *session,
-                                                 nghttp2_frame *frame,
-                                                 nghttp2_stream *stream);
-
-int nghttp2_session_on_push_response_headers_received(nghttp2_session *session,
-                                                      nghttp2_frame *frame,
-                                                      nghttp2_stream *stream);
-
-/*
- * Called when HEADERS is received, assuming |frame| is properly
- * initialized.  This function does first validate received frame and
- * then open stream and call callback functions.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_IGN_HEADER_BLOCK
- *     Frame was rejected and header block must be decoded but
- *     result must be ignored.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The read_callback failed
- */
-int nghttp2_session_on_headers_received(nghttp2_session *session,
-                                        nghttp2_frame *frame,
-                                        nghttp2_stream *stream);
-
-/*
- * Called when PRIORITY is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The read_callback failed
- */
-int nghttp2_session_on_priority_received(nghttp2_session *session,
-                                         nghttp2_frame *frame);
-
-/*
- * Called when RST_STREAM is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The read_callback failed
- */
-int nghttp2_session_on_rst_stream_received(nghttp2_session *session,
-                                           nghttp2_frame *frame);
-
-/*
- * Called when SETTINGS is received, assuming |frame| is properly
- * initialized. If |noack| is non-zero, SETTINGS with ACK will not be
- * submitted. If |frame| has NGHTTP2_FLAG_ACK flag set, no SETTINGS
- * with ACK will not be submitted regardless of |noack|.
- *
- * This function returns 0 if it succeeds, or one the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The read_callback failed
- * NGHTTP2_ERR_FLOODED
- *     There are too many items in outbound queue, and this is most
- *     likely caused by misbehaviour of peer.
- */
-int nghttp2_session_on_settings_received(nghttp2_session *session,
-                                         nghttp2_frame *frame, int noack);
-
-/*
- * Called when PUSH_PROMISE is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_IGN_HEADER_BLOCK
- *     Frame was rejected and header block must be decoded but
- *     result must be ignored.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The read_callback failed
- */
-int nghttp2_session_on_push_promise_received(nghttp2_session *session,
-                                             nghttp2_frame *frame);
-
-/*
- * Called when PING is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- * NGHTTP2_ERR_FLOODED
- *     There are too many items in outbound queue, and this is most
- *     likely caused by misbehaviour of peer.
- */
-int nghttp2_session_on_ping_received(nghttp2_session *session,
-                                     nghttp2_frame *frame);
-
-/*
- * Called when GOAWAY is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-int nghttp2_session_on_goaway_received(nghttp2_session *session,
-                                       nghttp2_frame *frame);
-
-/*
- * Called when WINDOW_UPDATE is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-int nghttp2_session_on_window_update_received(nghttp2_session *session,
-                                              nghttp2_frame *frame);
-
-/*
- * Called when ALTSVC is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-int nghttp2_session_on_altsvc_received(nghttp2_session *session,
-                                       nghttp2_frame *frame);
-
-/*
- * Called when ORIGIN is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-int nghttp2_session_on_origin_received(nghttp2_session *session,
-                                       nghttp2_frame *frame);
-
-/*
- * Called when DATA is received, assuming |frame| is properly
- * initialized.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The callback function failed.
- */
-int nghttp2_session_on_data_received(nghttp2_session *session,
-                                     nghttp2_frame *frame);
-
-/*
- * Returns nghttp2_stream* object whose stream ID is |stream_id|.  It
- * could be NULL if such stream does not exist.  This function returns
- * NULL if stream is marked as closed.
- */
-nghttp2_stream *nghttp2_session_get_stream(nghttp2_session *session,
-                                           int32_t stream_id);
-
-/*
- * This function behaves like nghttp2_session_get_stream(), but it
- * returns stream object even if it is marked as closed or in
- * NGHTTP2_STREAM_IDLE state.
- */
-nghttp2_stream *nghttp2_session_get_stream_raw(nghttp2_session *session,
-                                               int32_t stream_id);
-
-/*
- * Packs DATA frame |frame| in wire frame format and stores it in
- * |bufs|.  Payload will be read using |aux_data->data_prd|.  The
- * length of payload is at most |datamax| bytes.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_DEFERRED
- *     The DATA frame is postponed.
- * NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE
- *     The read_callback failed (stream error).
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_CALLBACK_FAILURE
- *     The read_callback failed (session error).
- */
-int nghttp2_session_pack_data(nghttp2_session *session, nghttp2_bufs *bufs,
-                              size_t datamax, nghttp2_frame *frame,
-                              nghttp2_data_aux_data *aux_data,
-                              nghttp2_stream *stream);
-
-/*
- * Pops and returns next item to send.  If there is no such item,
- * returns NULL.  This function takes into account max concurrent
- * streams.  That means if session->ob_syn has item and max concurrent
- * streams is reached, the even if other queues contain items, then
- * this function returns NULL.
- */
-nghttp2_outbound_item *
-nghttp2_session_pop_next_ob_item(nghttp2_session *session);
-
-/*
- * Returns next item to send.  If there is no such item, this function
- * returns NULL.  This function takes into account max concurrent
- * streams.  That means if session->ob_syn has item and max concurrent
- * streams is reached, the even if other queues contain items, then
- * this function returns NULL.
- */
-nghttp2_outbound_item *
-nghttp2_session_get_next_ob_item(nghttp2_session *session);
-
-/*
- * Updates local settings with the |iv|. The number of elements in the
- * array pointed by the |iv| is given by the |niv|.  This function
- * assumes that the all settings_id member in |iv| are in range 1 to
- * NGHTTP2_SETTINGS_MAX, inclusive.
- *
- * While updating individual stream's local window size, if the window
- * size becomes strictly larger than NGHTTP2_MAX_WINDOW_SIZE,
- * RST_STREAM is issued against such a stream.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_session_update_local_settings(nghttp2_session *session,
-                                          nghttp2_settings_entry *iv,
-                                          size_t niv);
-
-/*
- * Re-prioritize |stream|. The new priority specification is
- * |pri_spec|.  Caller must ensure that stream->hd.stream_id !=
- * pri_spec->stream_id.
- *
- * This function does not adjust the number of idle streams.  The
- * caller should call nghttp2_session_adjust_idle_stream() later.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_session_reprioritize_stream(nghttp2_session *session,
-                                        nghttp2_stream *stream,
-                                        const nghttp2_priority_spec *pri_spec);
-
-/*
- * Terminates current |session| with the |error_code|.  The |reason|
- * is NULL-terminated debug string.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The |reason| is too long.
- */
-int nghttp2_session_terminate_session_with_reason(nghttp2_session *session,
-                                                  uint32_t error_code,
-                                                  const char *reason);
-
-#endif /* NGHTTP2_SESSION_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1004 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_stream.h"
-
-#include <assert.h>
-#include <stdio.h>
-
-#include "nghttp2_session.h"
-#include "nghttp2_helper.h"
-#include "nghttp2_debug.h"
-
-/* Maximum distance between any two stream's cycle in the same
-   prirority queue.  Imagine stream A's cycle is A, and stream B's
-   cycle is B, and A < B.  The cycle is unsigned 32 bit integer, it
-   may get overflow.  Because of how we calculate the next cycle
-   value, if B - A is less than or equals to
-   NGHTTP2_MAX_CYCLE_DISTANCE, A and B are in the same scale, in other
-   words, B is really greater than or equal to A.  Otherwise, A is a
-   result of overflow, and it is actually A > B if we consider that
-   fact. */
-#define NGHTTP2_MAX_CYCLE_DISTANCE (16384 * 256 + 255)
-
-static int stream_less(const void *lhsx, const void *rhsx) {
-  const nghttp2_stream *lhs, *rhs;
-
-  lhs = nghttp2_struct_of(lhsx, nghttp2_stream, pq_entry);
-  rhs = nghttp2_struct_of(rhsx, nghttp2_stream, pq_entry);
-
-  if (lhs->cycle == rhs->cycle) {
-    return lhs->seq < rhs->seq;
-  }
-
-  if (lhs->cycle < rhs->cycle) {
-    return rhs->cycle - lhs->cycle <= NGHTTP2_MAX_CYCLE_DISTANCE;
-  }
-
-  return lhs->cycle - rhs->cycle > NGHTTP2_MAX_CYCLE_DISTANCE;
-}
-
-void nghttp2_stream_init(nghttp2_stream *stream, int32_t stream_id,
-                         uint8_t flags, nghttp2_stream_state initial_state,
-                         int32_t weight, int32_t remote_initial_window_size,
-                         int32_t local_initial_window_size,
-                         void *stream_user_data, nghttp2_mem *mem) {
-  nghttp2_map_entry_init(&stream->map_entry, (key_type)stream_id);
-  nghttp2_pq_init(&stream->obq, stream_less, mem);
-
-  stream->stream_id = stream_id;
-  stream->flags = flags;
-  stream->state = initial_state;
-  stream->shut_flags = NGHTTP2_SHUT_NONE;
-  stream->stream_user_data = stream_user_data;
-  stream->item = NULL;
-  stream->remote_window_size = remote_initial_window_size;
-  stream->local_window_size = local_initial_window_size;
-  stream->recv_window_size = 0;
-  stream->consumed_size = 0;
-  stream->recv_reduction = 0;
-  stream->window_update_queued = 0;
-
-  stream->dep_prev = NULL;
-  stream->dep_next = NULL;
-  stream->sib_prev = NULL;
-  stream->sib_next = NULL;
-
-  stream->closed_prev = NULL;
-  stream->closed_next = NULL;
-
-  stream->weight = weight;
-  stream->sum_dep_weight = 0;
-
-  stream->http_flags = NGHTTP2_HTTP_FLAG_NONE;
-  stream->content_length = -1;
-  stream->recv_content_length = 0;
-  stream->status_code = -1;
-
-  stream->queued = 0;
-  stream->descendant_last_cycle = 0;
-  stream->cycle = 0;
-  stream->pending_penalty = 0;
-  stream->descendant_next_seq = 0;
-  stream->seq = 0;
-  stream->last_writelen = 0;
-}
-
-void nghttp2_stream_free(nghttp2_stream *stream) {
-  nghttp2_pq_free(&stream->obq);
-  /* We don't free stream->item.  If it is assigned to aob, then
-     active_outbound_item_reset() will delete it.  Otherwise,
-     nghttp2_stream_close() or session_del() will delete it. */
-}
-
-void nghttp2_stream_shutdown(nghttp2_stream *stream, nghttp2_shut_flag flag) {
-  stream->shut_flags = (uint8_t)(stream->shut_flags | flag);
-}
-
-/*
- * Returns nonzero if |stream| is active.  This function does not take
- * into account its descendants.
- */
-static int stream_active(nghttp2_stream *stream) {
-  return stream->item &&
-         (stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL) == 0;
-}
-
-/*
- * Returns nonzero if |stream| or one of its descendants is active
- */
-static int stream_subtree_active(nghttp2_stream *stream) {
-  return stream_active(stream) || !nghttp2_pq_empty(&stream->obq);
-}
-
-/*
- * Returns next cycle for |stream|.
- */
-static void stream_next_cycle(nghttp2_stream *stream, uint32_t last_cycle) {
-  uint32_t penalty;
-
-  penalty = (uint32_t)stream->last_writelen * NGHTTP2_MAX_WEIGHT +
-            stream->pending_penalty;
-
-  stream->cycle = last_cycle + penalty / (uint32_t)stream->weight;
-  stream->pending_penalty = penalty % (uint32_t)stream->weight;
-}
-
-static int stream_obq_push(nghttp2_stream *dep_stream, nghttp2_stream *stream) {
-  int rv;
-
-  for (; dep_stream && !stream->queued;
-       stream = dep_stream, dep_stream = dep_stream->dep_prev) {
-    stream_next_cycle(stream, dep_stream->descendant_last_cycle);
-    stream->seq = dep_stream->descendant_next_seq++;
-
-    DEBUGF("stream: stream=%d obq push cycle=%d\n", stream->stream_id,
-           stream->cycle);
-
-    DEBUGF("stream: push stream %d to stream %d\n", stream->stream_id,
-           dep_stream->stream_id);
-
-    rv = nghttp2_pq_push(&dep_stream->obq, &stream->pq_entry);
-    if (rv != 0) {
-      return rv;
-    }
-    stream->queued = 1;
-  }
-
-  return 0;
-}
-
-/*
- * Removes |stream| from parent's obq.  If removal of |stream| makes
- * parent's obq empty, and parent is not active, then parent is also
- * removed.  This process is repeated recursively.
- */
-static void stream_obq_remove(nghttp2_stream *stream) {
-  nghttp2_stream *dep_stream;
-
-  dep_stream = stream->dep_prev;
-
-  if (!stream->queued) {
-    return;
-  }
-
-  for (; dep_stream; stream = dep_stream, dep_stream = dep_stream->dep_prev) {
-    DEBUGF("stream: remove stream %d from stream %d\n", stream->stream_id,
-           dep_stream->stream_id);
-
-    nghttp2_pq_remove(&dep_stream->obq, &stream->pq_entry);
-
-    assert(stream->queued);
-
-    stream->queued = 0;
-    stream->cycle = 0;
-    stream->pending_penalty = 0;
-    stream->descendant_last_cycle = 0;
-    stream->last_writelen = 0;
-
-    if (stream_subtree_active(dep_stream)) {
-      return;
-    }
-  }
-}
-
-/*
- * Moves |stream| from |src|'s obq to |dest|'s obq.  Removal from
- * |src|'s obq is just done calling nghttp2_pq_remove(), so it does
- * not recursively remove |src| and ancestors, like
- * stream_obq_remove().
- */
-static int stream_obq_move(nghttp2_stream *dest, nghttp2_stream *src,
-                           nghttp2_stream *stream) {
-  if (!stream->queued) {
-    return 0;
-  }
-
-  DEBUGF("stream: remove stream %d from stream %d (move)\n", stream->stream_id,
-         src->stream_id);
-
-  nghttp2_pq_remove(&src->obq, &stream->pq_entry);
-  stream->queued = 0;
-
-  return stream_obq_push(dest, stream);
-}
-
-void nghttp2_stream_reschedule(nghttp2_stream *stream) {
-  nghttp2_stream *dep_stream;
-
-  assert(stream->queued);
-
-  dep_stream = stream->dep_prev;
-
-  for (; dep_stream; stream = dep_stream, dep_stream = dep_stream->dep_prev) {
-    nghttp2_pq_remove(&dep_stream->obq, &stream->pq_entry);
-
-    stream_next_cycle(stream, dep_stream->descendant_last_cycle);
-    stream->seq = dep_stream->descendant_next_seq++;
-
-    nghttp2_pq_push(&dep_stream->obq, &stream->pq_entry);
-
-    DEBUGF("stream: stream=%d obq resched cycle=%d\n", stream->stream_id,
-           stream->cycle);
-
-    dep_stream->last_writelen = stream->last_writelen;
-  }
-}
-
-void nghttp2_stream_change_weight(nghttp2_stream *stream, int32_t weight) {
-  nghttp2_stream *dep_stream;
-  uint32_t last_cycle;
-  int32_t old_weight;
-  uint32_t wlen_penalty;
-
-  if (stream->weight == weight) {
-    return;
-  }
-
-  old_weight = stream->weight;
-  stream->weight = weight;
-
-  dep_stream = stream->dep_prev;
-
-  if (!dep_stream) {
-    return;
-  }
-
-  dep_stream->sum_dep_weight += weight - old_weight;
-
-  if (!stream->queued) {
-    return;
-  }
-
-  nghttp2_pq_remove(&dep_stream->obq, &stream->pq_entry);
-
-  wlen_penalty = (uint32_t)stream->last_writelen * NGHTTP2_MAX_WEIGHT;
-
-  /* Compute old stream->pending_penalty we used to calculate
-     stream->cycle */
-  stream->pending_penalty =
-      (uint32_t)((stream->pending_penalty + (uint32_t)old_weight -
-                  (wlen_penalty % (uint32_t)old_weight)) %
-                 (uint32_t)old_weight);
-
-  last_cycle = stream->cycle -
-               (wlen_penalty + stream->pending_penalty) / (uint32_t)old_weight;
-
-  /* Now we have old stream->pending_penalty and new stream->weight in
-     place */
-  stream_next_cycle(stream, last_cycle);
-
-  if (stream->cycle < dep_stream->descendant_last_cycle &&
-      (dep_stream->descendant_last_cycle - stream->cycle) <=
-          NGHTTP2_MAX_CYCLE_DISTANCE) {
-    stream->cycle = dep_stream->descendant_last_cycle;
-  }
-
-  /* Continue to use same stream->seq */
-
-  nghttp2_pq_push(&dep_stream->obq, &stream->pq_entry);
-
-  DEBUGF("stream: stream=%d obq resched cycle=%d\n", stream->stream_id,
-         stream->cycle);
-}
-
-static nghttp2_stream *stream_last_sib(nghttp2_stream *stream) {
-  for (; stream->sib_next; stream = stream->sib_next)
-    ;
-
-  return stream;
-}
-
-int32_t nghttp2_stream_dep_distributed_weight(nghttp2_stream *stream,
-                                              int32_t weight) {
-  weight = stream->weight * weight / stream->sum_dep_weight;
-
-  return nghttp2_max(1, weight);
-}
-
-#ifdef STREAM_DEP_DEBUG
-
-static void ensure_inactive(nghttp2_stream *stream) {
-  nghttp2_stream *si;
-
-  if (stream->queued) {
-    fprintf(stderr, "stream(%p)=%d, stream->queued = 1; want 0\n", stream,
-            stream->stream_id);
-    assert(0);
-  }
-
-  if (stream_active(stream)) {
-    fprintf(stderr, "stream(%p)=%d, stream_active(stream) = 1; want 0\n",
-            stream, stream->stream_id);
-    assert(0);
-  }
-
-  if (!nghttp2_pq_empty(&stream->obq)) {
-    fprintf(stderr, "stream(%p)=%d, nghttp2_pq_size() = %zu; want 0\n", stream,
-            stream->stream_id, nghttp2_pq_size(&stream->obq));
-    assert(0);
-  }
-
-  for (si = stream->dep_next; si; si = si->sib_next) {
-    ensure_inactive(si);
-  }
-}
-
-static void check_queued(nghttp2_stream *stream) {
-  nghttp2_stream *si;
-  int queued;
-
-  if (stream->queued) {
-    if (!stream_subtree_active(stream)) {
-      fprintf(stderr,
-              "stream(%p)=%d, stream->queued == 1, but "
-              "stream_active() == %d and nghttp2_pq_size(&stream->obq) = %zu\n",
-              stream, stream->stream_id, stream_active(stream),
-              nghttp2_pq_size(&stream->obq));
-      assert(0);
-    }
-    if (!stream_active(stream)) {
-      queued = 0;
-      for (si = stream->dep_next; si; si = si->sib_next) {
-        if (si->queued) {
-          ++queued;
-        }
-      }
-      if (queued == 0) {
-        fprintf(stderr,
-                "stream(%p)=%d, stream->queued == 1, and "
-                "!stream_active(), but no descendants is queued\n",
-                stream, stream->stream_id);
-        assert(0);
-      }
-    }
-
-    for (si = stream->dep_next; si; si = si->sib_next) {
-      check_queued(si);
-    }
-  } else {
-    if (stream_active(stream) || !nghttp2_pq_empty(&stream->obq)) {
-      fprintf(stderr,
-              "stream(%p) = %d, stream->queued == 0, but "
-              "stream_active(stream) == %d and "
-              "nghttp2_pq_size(&stream->obq) = %zu\n",
-              stream, stream->stream_id, stream_active(stream),
-              nghttp2_pq_size(&stream->obq));
-      assert(0);
-    }
-    for (si = stream->dep_next; si; si = si->sib_next) {
-      ensure_inactive(si);
-    }
-  }
-}
-
-static void check_sum_dep(nghttp2_stream *stream) {
-  nghttp2_stream *si;
-  int32_t n = 0;
-  for (si = stream->dep_next; si; si = si->sib_next) {
-    n += si->weight;
-  }
-  if (n != stream->sum_dep_weight) {
-    fprintf(stderr, "stream(%p)=%d, sum_dep_weight = %d; want %d\n", stream,
-            stream->stream_id, n, stream->sum_dep_weight);
-    assert(0);
-  }
-  for (si = stream->dep_next; si; si = si->sib_next) {
-    check_sum_dep(si);
-  }
-}
-
-static void check_dep_prev(nghttp2_stream *stream) {
-  nghttp2_stream *si;
-  for (si = stream->dep_next; si; si = si->sib_next) {
-    if (si->dep_prev != stream) {
-      fprintf(stderr, "si->dep_prev = %p; want %p\n", si->dep_prev, stream);
-      assert(0);
-    }
-    check_dep_prev(si);
-  }
-}
-
-#endif /* STREAM_DEP_DEBUG */
-
-#ifdef STREAM_DEP_DEBUG
-static void validate_tree(nghttp2_stream *stream) {
-  nghttp2_stream *si;
-
-  if (!stream) {
-    return;
-  }
-
-  for (; stream->dep_prev; stream = stream->dep_prev)
-    ;
-
-  assert(stream->stream_id == 0);
-  assert(!stream->queued);
-
-  fprintf(stderr, "checking...\n");
-  if (nghttp2_pq_empty(&stream->obq)) {
-    fprintf(stderr, "root obq empty\n");
-    for (si = stream->dep_next; si; si = si->sib_next) {
-      ensure_inactive(si);
-    }
-  } else {
-    for (si = stream->dep_next; si; si = si->sib_next) {
-      check_queued(si);
-    }
-  }
-
-  check_sum_dep(stream);
-  check_dep_prev(stream);
-}
-#else  /* !STREAM_DEP_DEBUG */
-static void validate_tree(nghttp2_stream *stream) { (void)stream; }
-#endif /* !STREAM_DEP_DEBUG*/
-
-static int stream_update_dep_on_attach_item(nghttp2_stream *stream) {
-  int rv;
-
-  rv = stream_obq_push(stream->dep_prev, stream);
-  if (rv != 0) {
-    return rv;
-  }
-
-  validate_tree(stream);
-  return 0;
-}
-
-static int stream_update_dep_on_detach_item(nghttp2_stream *stream) {
-  if (nghttp2_pq_empty(&stream->obq)) {
-    stream_obq_remove(stream);
-  }
-
-  validate_tree(stream);
-
-  return 0;
-}
-
-int nghttp2_stream_attach_item(nghttp2_stream *stream,
-                               nghttp2_outbound_item *item) {
-  int rv;
-
-  assert((stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL) == 0);
-  assert(stream->item == NULL);
-
-  DEBUGF("stream: stream=%d attach item=%p\n", stream->stream_id, item);
-
-  stream->item = item;
-
-  rv = stream_update_dep_on_attach_item(stream);
-  if (rv != 0) {
-    /* This may relave stream->queued == 1, but stream->item == NULL.
-       But only consequence of this error is fatal one, and session
-       destruction.  In that execution path, these inconsistency does
-       not matter. */
-    stream->item = NULL;
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_stream_detach_item(nghttp2_stream *stream) {
-  DEBUGF("stream: stream=%d detach item=%p\n", stream->stream_id, stream->item);
-
-  stream->item = NULL;
-  stream->flags = (uint8_t)(stream->flags & ~NGHTTP2_STREAM_FLAG_DEFERRED_ALL);
-
-  return stream_update_dep_on_detach_item(stream);
-}
-
-int nghttp2_stream_defer_item(nghttp2_stream *stream, uint8_t flags) {
-  assert(stream->item);
-
-  DEBUGF("stream: stream=%d defer item=%p cause=%02x\n", stream->stream_id,
-         stream->item, flags);
-
-  stream->flags |= flags;
-
-  return stream_update_dep_on_detach_item(stream);
-}
-
-int nghttp2_stream_resume_deferred_item(nghttp2_stream *stream, uint8_t flags) {
-  assert(stream->item);
-
-  DEBUGF("stream: stream=%d resume item=%p flags=%02x\n", stream->stream_id,
-         stream->item, flags);
-
-  stream->flags = (uint8_t)(stream->flags & ~flags);
-
-  if (stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL) {
-    return 0;
-  }
-
-  return stream_update_dep_on_attach_item(stream);
-}
-
-int nghttp2_stream_check_deferred_item(nghttp2_stream *stream) {
-  return stream->item && (stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL);
-}
-
-int nghttp2_stream_check_deferred_by_flow_control(nghttp2_stream *stream) {
-  return stream->item &&
-         (stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL);
-}
-
-static int update_initial_window_size(int32_t *window_size_ptr,
-                                      int32_t new_initial_window_size,
-                                      int32_t old_initial_window_size) {
-  int64_t new_window_size = (int64_t)(*window_size_ptr) +
-                            new_initial_window_size - old_initial_window_size;
-  if (INT32_MIN > new_window_size ||
-      new_window_size > NGHTTP2_MAX_WINDOW_SIZE) {
-    return -1;
-  }
-  *window_size_ptr = (int32_t)new_window_size;
-  return 0;
-}
-
-int nghttp2_stream_update_remote_initial_window_size(
-    nghttp2_stream *stream, int32_t new_initial_window_size,
-    int32_t old_initial_window_size) {
-  return update_initial_window_size(&stream->remote_window_size,
-                                    new_initial_window_size,
-                                    old_initial_window_size);
-}
-
-int nghttp2_stream_update_local_initial_window_size(
-    nghttp2_stream *stream, int32_t new_initial_window_size,
-    int32_t old_initial_window_size) {
-  return update_initial_window_size(&stream->local_window_size,
-                                    new_initial_window_size,
-                                    old_initial_window_size);
-}
-
-void nghttp2_stream_promise_fulfilled(nghttp2_stream *stream) {
-  stream->state = NGHTTP2_STREAM_OPENED;
-  stream->flags = (uint8_t)(stream->flags & ~NGHTTP2_STREAM_FLAG_PUSH);
-}
-
-int nghttp2_stream_dep_find_ancestor(nghttp2_stream *stream,
-                                     nghttp2_stream *target) {
-  for (; stream; stream = stream->dep_prev) {
-    if (stream == target) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-int nghttp2_stream_dep_insert(nghttp2_stream *dep_stream,
-                              nghttp2_stream *stream) {
-  nghttp2_stream *si;
-  int rv;
-
-  DEBUGF("stream: dep_insert dep_stream(%p)=%d, stream(%p)=%d\n", dep_stream,
-         dep_stream->stream_id, stream, stream->stream_id);
-
-  stream->sum_dep_weight = dep_stream->sum_dep_weight;
-  dep_stream->sum_dep_weight = stream->weight;
-
-  if (dep_stream->dep_next) {
-    for (si = dep_stream->dep_next; si; si = si->sib_next) {
-      si->dep_prev = stream;
-      if (si->queued) {
-        rv = stream_obq_move(stream, dep_stream, si);
-        if (rv != 0) {
-          return rv;
-        }
-      }
-    }
-
-    if (stream_subtree_active(stream)) {
-      rv = stream_obq_push(dep_stream, stream);
-      if (rv != 0) {
-        return rv;
-      }
-    }
-
-    stream->dep_next = dep_stream->dep_next;
-  }
-
-  dep_stream->dep_next = stream;
-  stream->dep_prev = dep_stream;
-
-  validate_tree(stream);
-
-  return 0;
-}
-
-static void set_dep_prev(nghttp2_stream *stream, nghttp2_stream *dep) {
-  for (; stream; stream = stream->sib_next) {
-    stream->dep_prev = dep;
-  }
-}
-
-static void link_dep(nghttp2_stream *dep_stream, nghttp2_stream *stream) {
-  dep_stream->dep_next = stream;
-  if (stream) {
-    stream->dep_prev = dep_stream;
-  }
-}
-
-static void link_sib(nghttp2_stream *a, nghttp2_stream *b) {
-  a->sib_next = b;
-  if (b) {
-    b->sib_prev = a;
-  }
-}
-
-static void insert_link_dep(nghttp2_stream *dep_stream,
-                            nghttp2_stream *stream) {
-  nghttp2_stream *sib_next;
-
-  assert(stream->sib_prev == NULL);
-
-  sib_next = dep_stream->dep_next;
-
-  link_sib(stream, sib_next);
-
-  link_dep(dep_stream, stream);
-}
-
-static void unlink_sib(nghttp2_stream *stream) {
-  nghttp2_stream *prev, *next, *dep_next;
-
-  prev = stream->sib_prev;
-  dep_next = stream->dep_next;
-
-  assert(prev);
-
-  if (dep_next) {
-    /*
-     *  prev--stream(--sib_next--...)
-     *         |
-     *        dep_next
-     */
-
-    link_sib(prev, dep_next);
-
-    set_dep_prev(dep_next, stream->dep_prev);
-
-    if (stream->sib_next) {
-      link_sib(stream_last_sib(dep_next), stream->sib_next);
-    }
-  } else {
-    /*
-     *  prev--stream(--sib_next--...)
-     */
-    next = stream->sib_next;
-
-    prev->sib_next = next;
-
-    if (next) {
-      next->sib_prev = prev;
-    }
-  }
-}
-
-static void unlink_dep(nghttp2_stream *stream) {
-  nghttp2_stream *prev, *next, *dep_next;
-
-  prev = stream->dep_prev;
-  dep_next = stream->dep_next;
-
-  assert(prev);
-
-  if (dep_next) {
-    /*
-     * prev
-     *   |
-     * stream(--sib_next--...)
-     *   |
-     * dep_next
-     */
-    link_dep(prev, dep_next);
-
-    set_dep_prev(dep_next, stream->dep_prev);
-
-    if (stream->sib_next) {
-      link_sib(stream_last_sib(dep_next), stream->sib_next);
-    }
-
-  } else if (stream->sib_next) {
-    /*
-     * prev
-     *   |
-     * stream--sib_next
-     */
-    next = stream->sib_next;
-
-    next->sib_prev = NULL;
-
-    link_dep(prev, next);
-  } else {
-    prev->dep_next = NULL;
-  }
-}
-
-void nghttp2_stream_dep_add(nghttp2_stream *dep_stream,
-                            nghttp2_stream *stream) {
-  DEBUGF("stream: dep_add dep_stream(%p)=%d, stream(%p)=%d\n", dep_stream,
-         dep_stream->stream_id, stream, stream->stream_id);
-
-  dep_stream->sum_dep_weight += stream->weight;
-
-  if (dep_stream->dep_next == NULL) {
-    link_dep(dep_stream, stream);
-  } else {
-    insert_link_dep(dep_stream, stream);
-  }
-
-  validate_tree(stream);
-}
-
-int nghttp2_stream_dep_remove(nghttp2_stream *stream) {
-  nghttp2_stream *dep_prev, *si;
-  int32_t sum_dep_weight_delta;
-  int rv;
-
-  DEBUGF("stream: dep_remove stream(%p)=%d\n", stream, stream->stream_id);
-
-  /* Distribute weight of |stream| to direct descendants */
-  sum_dep_weight_delta = -stream->weight;
-
-  for (si = stream->dep_next; si; si = si->sib_next) {
-    si->weight = nghttp2_stream_dep_distributed_weight(stream, si->weight);
-
-    sum_dep_weight_delta += si->weight;
-
-    if (si->queued) {
-      rv = stream_obq_move(stream->dep_prev, stream, si);
-      if (rv != 0) {
-        return rv;
-      }
-    }
-  }
-
-  assert(stream->dep_prev);
-
-  dep_prev = stream->dep_prev;
-
-  dep_prev->sum_dep_weight += sum_dep_weight_delta;
-
-  if (stream->queued) {
-    stream_obq_remove(stream);
-  }
-
-  if (stream->sib_prev) {
-    unlink_sib(stream);
-  } else {
-    unlink_dep(stream);
-  }
-
-  stream->sum_dep_weight = 0;
-
-  stream->dep_prev = NULL;
-  stream->dep_next = NULL;
-  stream->sib_prev = NULL;
-  stream->sib_next = NULL;
-
-  validate_tree(dep_prev);
-
-  return 0;
-}
-
-int nghttp2_stream_dep_insert_subtree(nghttp2_stream *dep_stream,
-                                      nghttp2_stream *stream) {
-  nghttp2_stream *last_sib;
-  nghttp2_stream *dep_next;
-  nghttp2_stream *si;
-  int rv;
-
-  DEBUGF("stream: dep_insert_subtree dep_stream(%p)=%d stream(%p)=%d\n",
-         dep_stream, dep_stream->stream_id, stream, stream->stream_id);
-
-  stream->sum_dep_weight += dep_stream->sum_dep_weight;
-  dep_stream->sum_dep_weight = stream->weight;
-
-  if (dep_stream->dep_next) {
-    dep_next = dep_stream->dep_next;
-
-    link_dep(dep_stream, stream);
-
-    if (stream->dep_next) {
-      last_sib = stream_last_sib(stream->dep_next);
-
-      link_sib(last_sib, dep_next);
-    } else {
-      link_dep(stream, dep_next);
-    }
-
-    for (si = dep_next; si; si = si->sib_next) {
-      si->dep_prev = stream;
-      if (si->queued) {
-        rv = stream_obq_move(stream, dep_stream, si);
-        if (rv != 0) {
-          return rv;
-        }
-      }
-    }
-  } else {
-    link_dep(dep_stream, stream);
-  }
-
-  if (stream_subtree_active(stream)) {
-    rv = stream_obq_push(dep_stream, stream);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  validate_tree(dep_stream);
-
-  return 0;
-}
-
-int nghttp2_stream_dep_add_subtree(nghttp2_stream *dep_stream,
-                                   nghttp2_stream *stream) {
-  int rv;
-
-  DEBUGF("stream: dep_add_subtree dep_stream(%p)=%d stream(%p)=%d\n",
-         dep_stream, dep_stream->stream_id, stream, stream->stream_id);
-
-  dep_stream->sum_dep_weight += stream->weight;
-
-  if (dep_stream->dep_next) {
-    insert_link_dep(dep_stream, stream);
-  } else {
-    link_dep(dep_stream, stream);
-  }
-
-  if (stream_subtree_active(stream)) {
-    rv = stream_obq_push(dep_stream, stream);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  validate_tree(dep_stream);
-
-  return 0;
-}
-
-void nghttp2_stream_dep_remove_subtree(nghttp2_stream *stream) {
-  nghttp2_stream *next, *dep_prev;
-
-  DEBUGF("stream: dep_remove_subtree stream(%p)=%d\n", stream,
-         stream->stream_id);
-
-  assert(stream->dep_prev);
-
-  dep_prev = stream->dep_prev;
-
-  if (stream->sib_prev) {
-    link_sib(stream->sib_prev, stream->sib_next);
-  } else {
-    next = stream->sib_next;
-
-    link_dep(dep_prev, next);
-
-    if (next) {
-      next->sib_prev = NULL;
-    }
-  }
-
-  dep_prev->sum_dep_weight -= stream->weight;
-
-  if (stream->queued) {
-    stream_obq_remove(stream);
-  }
-
-  validate_tree(dep_prev);
-
-  stream->sib_prev = NULL;
-  stream->sib_next = NULL;
-  stream->dep_prev = NULL;
-}
-
-int nghttp2_stream_in_dep_tree(nghttp2_stream *stream) {
-  return stream->dep_prev || stream->dep_next || stream->sib_prev ||
-         stream->sib_next;
-}
-
-nghttp2_outbound_item *
-nghttp2_stream_next_outbound_item(nghttp2_stream *stream) {
-  nghttp2_pq_entry *ent;
-  nghttp2_stream *si;
-
-  for (;;) {
-    if (stream_active(stream)) {
-      /* Update ascendant's descendant_last_cycle here, so that we can
-         assure that new stream is scheduled based on it. */
-      for (si = stream; si->dep_prev; si = si->dep_prev) {
-        si->dep_prev->descendant_last_cycle = si->cycle;
-      }
-      return stream->item;
-    }
-    ent = nghttp2_pq_top(&stream->obq);
-    if (!ent) {
-      return NULL;
-    }
-    stream = nghttp2_struct_of(ent, nghttp2_stream, pq_entry);
-  }
-}
-
-nghttp2_stream_proto_state nghttp2_stream_get_state(nghttp2_stream *stream) {
-  if (stream->flags & NGHTTP2_STREAM_FLAG_CLOSED) {
-    return NGHTTP2_STREAM_STATE_CLOSED;
-  }
-
-  if (stream->flags & NGHTTP2_STREAM_FLAG_PUSH) {
-    if (stream->shut_flags & NGHTTP2_SHUT_RD) {
-      return NGHTTP2_STREAM_STATE_RESERVED_LOCAL;
-    }
-
-    if (stream->shut_flags & NGHTTP2_SHUT_WR) {
-      return NGHTTP2_STREAM_STATE_RESERVED_REMOTE;
-    }
-  }
-
-  if (stream->shut_flags & NGHTTP2_SHUT_RD) {
-    return NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE;
-  }
-
-  if (stream->shut_flags & NGHTTP2_SHUT_WR) {
-    return NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL;
-  }
-
-  if (stream->state == NGHTTP2_STREAM_IDLE) {
-    return NGHTTP2_STREAM_STATE_IDLE;
-  }
-
-  return NGHTTP2_STREAM_STATE_OPEN;
-}
-
-nghttp2_stream *nghttp2_stream_get_parent(nghttp2_stream *stream) {
-  return stream->dep_prev;
-}
-
-nghttp2_stream *nghttp2_stream_get_next_sibling(nghttp2_stream *stream) {
-  return stream->sib_next;
-}
-
-nghttp2_stream *nghttp2_stream_get_previous_sibling(nghttp2_stream *stream) {
-  return stream->sib_prev;
-}
-
-nghttp2_stream *nghttp2_stream_get_first_child(nghttp2_stream *stream) {
-  return stream->dep_next;
-}
-
-int32_t nghttp2_stream_get_weight(nghttp2_stream *stream) {
-  return stream->weight;
-}
-
-int32_t nghttp2_stream_get_sum_dependency_weight(nghttp2_stream *stream) {
-  return stream->sum_dep_weight;
-}
-
-int32_t nghttp2_stream_get_stream_id(nghttp2_stream *stream) {
-  return stream->stream_id;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_stream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,436 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_STREAM_H
-#define NGHTTP2_STREAM_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-#include "nghttp2_outbound_item.h"
-#include "nghttp2_map.h"
-#include "nghttp2_pq.h"
-#include "nghttp2_int.h"
-
-/*
- * If local peer is stream initiator:
- * NGHTTP2_STREAM_OPENING : upon sending request HEADERS
- * NGHTTP2_STREAM_OPENED : upon receiving response HEADERS
- * NGHTTP2_STREAM_CLOSING : upon queuing RST_STREAM
- *
- * If remote peer is stream initiator:
- * NGHTTP2_STREAM_OPENING : upon receiving request HEADERS
- * NGHTTP2_STREAM_OPENED : upon sending response HEADERS
- * NGHTTP2_STREAM_CLOSING : upon queuing RST_STREAM
- */
-typedef enum {
-  /* Initial state */
-  NGHTTP2_STREAM_INITIAL,
-  /* For stream initiator: request HEADERS has been sent, but response
-     HEADERS has not been received yet.  For receiver: request HEADERS
-     has been received, but it does not send response HEADERS yet. */
-  NGHTTP2_STREAM_OPENING,
-  /* For stream initiator: response HEADERS is received. For receiver:
-     response HEADERS is sent. */
-  NGHTTP2_STREAM_OPENED,
-  /* RST_STREAM is received, but somehow we need to keep stream in
-     memory. */
-  NGHTTP2_STREAM_CLOSING,
-  /* PUSH_PROMISE is received or sent */
-  NGHTTP2_STREAM_RESERVED,
-  /* Stream is created in this state if it is used as anchor in
-     dependency tree. */
-  NGHTTP2_STREAM_IDLE
-} nghttp2_stream_state;
-
-typedef enum {
-  NGHTTP2_SHUT_NONE = 0,
-  /* Indicates further receptions will be disallowed. */
-  NGHTTP2_SHUT_RD = 0x01,
-  /* Indicates further transmissions will be disallowed. */
-  NGHTTP2_SHUT_WR = 0x02,
-  /* Indicates both further receptions and transmissions will be
-     disallowed. */
-  NGHTTP2_SHUT_RDWR = NGHTTP2_SHUT_RD | NGHTTP2_SHUT_WR
-} nghttp2_shut_flag;
-
-typedef enum {
-  NGHTTP2_STREAM_FLAG_NONE = 0,
-  /* Indicates that this stream is pushed stream and not opened
-     yet. */
-  NGHTTP2_STREAM_FLAG_PUSH = 0x01,
-  /* Indicates that this stream was closed */
-  NGHTTP2_STREAM_FLAG_CLOSED = 0x02,
-  /* Indicates the item is deferred due to flow control. */
-  NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL = 0x04,
-  /* Indicates the item is deferred by user callback */
-  NGHTTP2_STREAM_FLAG_DEFERRED_USER = 0x08,
-  /* bitwise OR of NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL and
-     NGHTTP2_STREAM_FLAG_DEFERRED_USER. */
-  NGHTTP2_STREAM_FLAG_DEFERRED_ALL = 0x0c
-
-} nghttp2_stream_flag;
-
-/* HTTP related flags to enforce HTTP semantics */
-typedef enum {
-  NGHTTP2_HTTP_FLAG_NONE = 0,
-  /* header field seen so far */
-  NGHTTP2_HTTP_FLAG__AUTHORITY = 1,
-  NGHTTP2_HTTP_FLAG__PATH = 1 << 1,
-  NGHTTP2_HTTP_FLAG__METHOD = 1 << 2,
-  NGHTTP2_HTTP_FLAG__SCHEME = 1 << 3,
-  /* host is not pseudo header, but we require either host or
-     :authority */
-  NGHTTP2_HTTP_FLAG_HOST = 1 << 4,
-  NGHTTP2_HTTP_FLAG__STATUS = 1 << 5,
-  /* required header fields for HTTP request except for CONNECT
-     method. */
-  NGHTTP2_HTTP_FLAG_REQ_HEADERS = NGHTTP2_HTTP_FLAG__METHOD |
-                                  NGHTTP2_HTTP_FLAG__PATH |
-                                  NGHTTP2_HTTP_FLAG__SCHEME,
-  NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED = 1 << 6,
-  /* HTTP method flags */
-  NGHTTP2_HTTP_FLAG_METH_CONNECT = 1 << 7,
-  NGHTTP2_HTTP_FLAG_METH_HEAD = 1 << 8,
-  NGHTTP2_HTTP_FLAG_METH_OPTIONS = 1 << 9,
-  NGHTTP2_HTTP_FLAG_METH_UPGRADE_WORKAROUND = 1 << 10,
-  NGHTTP2_HTTP_FLAG_METH_ALL = NGHTTP2_HTTP_FLAG_METH_CONNECT |
-                               NGHTTP2_HTTP_FLAG_METH_HEAD |
-                               NGHTTP2_HTTP_FLAG_METH_OPTIONS |
-                               NGHTTP2_HTTP_FLAG_METH_UPGRADE_WORKAROUND,
-  /* :path category */
-  /* path starts with "/" */
-  NGHTTP2_HTTP_FLAG_PATH_REGULAR = 1 << 11,
-  /* path "*" */
-  NGHTTP2_HTTP_FLAG_PATH_ASTERISK = 1 << 12,
-  /* scheme */
-  /* "http" or "https" scheme */
-  NGHTTP2_HTTP_FLAG_SCHEME_HTTP = 1 << 13,
-  /* set if final response is expected */
-  NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE = 1 << 14
-} nghttp2_http_flag;
-
-struct nghttp2_stream {
-  /* Intrusive Map */
-  nghttp2_map_entry map_entry;
-  /* Entry for dep_prev->obq */
-  nghttp2_pq_entry pq_entry;
-  /* Priority Queue storing direct descendant (nghttp2_stream).  Only
-     streams which itself has some data to send, or has a descendant
-     which has some data to sent. */
-  nghttp2_pq obq;
-  /* Content-Length of request/response body.  -1 if unknown. */
-  int64_t content_length;
-  /* Received body so far */
-  int64_t recv_content_length;
-  /* Base last_cycle for direct descendent streams. */
-  uint32_t descendant_last_cycle;
-  /* Next scheduled time to sent item */
-  uint32_t cycle;
-  /* Next seq used for direct descendant streams */
-  uint64_t descendant_next_seq;
-  /* Secondary key for prioritization to break a tie for cycle.  This
-     value is monotonically increased for single parent stream. */
-  uint64_t seq;
-  /* pointers to form dependency tree.  If multiple streams depend on
-     a stream, only one stream (left most) has non-NULL dep_prev which
-     points to the stream it depends on. The remaining streams are
-     linked using sib_prev and sib_next.  The stream which has
-     non-NULL dep_prev always NULL sib_prev.  The right most stream
-     has NULL sib_next.  If this stream is a root of dependency tree,
-     dep_prev and sib_prev are NULL. */
-  nghttp2_stream *dep_prev, *dep_next;
-  nghttp2_stream *sib_prev, *sib_next;
-  /* When stream is kept after closure, it may be kept in doubly
-     linked list pointed by nghttp2_session closed_stream_head.
-     closed_next points to the next stream object if it is the element
-     of the list. */
-  nghttp2_stream *closed_prev, *closed_next;
-  /* The arbitrary data provided by user for this stream. */
-  void *stream_user_data;
-  /* Item to send */
-  nghttp2_outbound_item *item;
-  /* Last written length of frame payload */
-  size_t last_writelen;
-  /* stream ID */
-  int32_t stream_id;
-  /* Current remote window size. This value is computed against the
-     current initial window size of remote endpoint. */
-  int32_t remote_window_size;
-  /* Keep track of the number of bytes received without
-     WINDOW_UPDATE. This could be negative after submitting negative
-     value to WINDOW_UPDATE */
-  int32_t recv_window_size;
-  /* The number of bytes consumed by the application and now is
-     subject to WINDOW_UPDATE.  This is only used when auto
-     WINDOW_UPDATE is turned off. */
-  int32_t consumed_size;
-  /* The amount of recv_window_size cut using submitting negative
-     value to WINDOW_UPDATE */
-  int32_t recv_reduction;
-  /* window size for local flow control. It is initially set to
-     NGHTTP2_INITIAL_WINDOW_SIZE and could be increased/decreased by
-     submitting WINDOW_UPDATE. See nghttp2_submit_window_update(). */
-  int32_t local_window_size;
-  /* weight of this stream */
-  int32_t weight;
-  /* This is unpaid penalty (offset) when calculating cycle. */
-  uint32_t pending_penalty;
-  /* sum of weight of direct descendants */
-  int32_t sum_dep_weight;
-  nghttp2_stream_state state;
-  /* status code from remote server */
-  int16_t status_code;
-  /* Bitwise OR of zero or more nghttp2_http_flag values */
-  uint16_t http_flags;
-  /* This is bitwise-OR of 0 or more of nghttp2_stream_flag. */
-  uint8_t flags;
-  /* Bitwise OR of zero or more nghttp2_shut_flag values */
-  uint8_t shut_flags;
-  /* Nonzero if this stream has been queued to stream pointed by
-     dep_prev.  We maintain the invariant that if a stream is queued,
-     then its ancestors, except for root, are also queued.  This
-     invariant may break in fatal error condition. */
-  uint8_t queued;
-  /* This flag is used to reduce excessive queuing of WINDOW_UPDATE to
-     this stream.  The nonzero does not necessarily mean WINDOW_UPDATE
-     is not queued. */
-  uint8_t window_update_queued;
-};
-
-void nghttp2_stream_init(nghttp2_stream *stream, int32_t stream_id,
-                         uint8_t flags, nghttp2_stream_state initial_state,
-                         int32_t weight, int32_t remote_initial_window_size,
-                         int32_t local_initial_window_size,
-                         void *stream_user_data, nghttp2_mem *mem);
-
-void nghttp2_stream_free(nghttp2_stream *stream);
-
-/*
- * Disallow either further receptions or transmissions, or both.
- * |flag| is bitwise OR of one or more of nghttp2_shut_flag.
- */
-void nghttp2_stream_shutdown(nghttp2_stream *stream, nghttp2_shut_flag flag);
-
-/*
- * Defer |stream->item|.  We won't call this function in the situation
- * where |stream->item| == NULL.  The |flags| is bitwise OR of zero or
- * more of NGHTTP2_STREAM_FLAG_DEFERRED_USER and
- * NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL.  The |flags| indicates
- * the reason of this action.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_defer_item(nghttp2_stream *stream, uint8_t flags);
-
-/*
- * Put back deferred data in this stream to active state.  The |flags|
- * are one or more of bitwise OR of the following values:
- * NGHTTP2_STREAM_FLAG_DEFERRED_USER and
- * NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL and given masks are
- * cleared if they are set.  So even if this function is called, if
- * one of flag is still set, data does not become active.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_resume_deferred_item(nghttp2_stream *stream, uint8_t flags);
-
-/*
- * Returns nonzero if item is deferred by whatever reason.
- */
-int nghttp2_stream_check_deferred_item(nghttp2_stream *stream);
-
-/*
- * Returns nonzero if item is deferred by flow control.
- */
-int nghttp2_stream_check_deferred_by_flow_control(nghttp2_stream *stream);
-
-/*
- * Updates the remote window size with the new value
- * |new_initial_window_size|. The |old_initial_window_size| is used to
- * calculate the current window size.
- *
- * This function returns 0 if it succeeds or -1. The failure is due to
- * overflow.
- */
-int nghttp2_stream_update_remote_initial_window_size(
-    nghttp2_stream *stream, int32_t new_initial_window_size,
-    int32_t old_initial_window_size);
-
-/*
- * Updates the local window size with the new value
- * |new_initial_window_size|. The |old_initial_window_size| is used to
- * calculate the current window size.
- *
- * This function returns 0 if it succeeds or -1. The failure is due to
- * overflow.
- */
-int nghttp2_stream_update_local_initial_window_size(
-    nghttp2_stream *stream, int32_t new_initial_window_size,
-    int32_t old_initial_window_size);
-
-/*
- * Call this function if promised stream |stream| is replied with
- * HEADERS.  This function makes the state of the |stream| to
- * NGHTTP2_STREAM_OPENED.
- */
-void nghttp2_stream_promise_fulfilled(nghttp2_stream *stream);
-
-/*
- * Returns nonzero if |target| is an ancestor of |stream|.
- */
-int nghttp2_stream_dep_find_ancestor(nghttp2_stream *stream,
-                                     nghttp2_stream *target);
-
-/*
- * Computes distributed weight of a stream of the |weight| under the
- * |stream| if |stream| is removed from a dependency tree.
- */
-int32_t nghttp2_stream_dep_distributed_weight(nghttp2_stream *stream,
-                                              int32_t weight);
-
-/*
- * Makes the |stream| depend on the |dep_stream|.  This dependency is
- * exclusive.  All existing direct descendants of |dep_stream| become
- * the descendants of the |stream|.  This function assumes
- * |stream->item| is NULL.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_dep_insert(nghttp2_stream *dep_stream,
-                              nghttp2_stream *stream);
-
-/*
- * Makes the |stream| depend on the |dep_stream|.  This dependency is
- * not exclusive.  This function assumes |stream->item| is NULL.
- */
-void nghttp2_stream_dep_add(nghttp2_stream *dep_stream, nghttp2_stream *stream);
-
-/*
- * Removes the |stream| from the current dependency tree.  This
- * function assumes |stream->item| is NULL.
- */
-int nghttp2_stream_dep_remove(nghttp2_stream *stream);
-
-/*
- * Attaches |item| to |stream|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_attach_item(nghttp2_stream *stream,
-                               nghttp2_outbound_item *item);
-
-/*
- * Detaches |stream->item|.  This function does not free
- * |stream->item|.  The caller must free it.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_detach_item(nghttp2_stream *stream);
-
-/*
- * Makes the |stream| depend on the |dep_stream|.  This dependency is
- * exclusive.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_dep_insert_subtree(nghttp2_stream *dep_stream,
-                                      nghttp2_stream *stream);
-
-/*
- * Makes the |stream| depend on the |dep_stream|.  This dependency is
- * not exclusive.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-int nghttp2_stream_dep_add_subtree(nghttp2_stream *dep_stream,
-                                   nghttp2_stream *stream);
-
-/*
- * Removes subtree whose root stream is |stream|.  The
- * effective_weight of streams in removed subtree is not updated.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory
- */
-void nghttp2_stream_dep_remove_subtree(nghttp2_stream *stream);
-
-/*
- * Returns nonzero if |stream| is in any dependency tree.
- */
-int nghttp2_stream_in_dep_tree(nghttp2_stream *stream);
-
-/*
- * Schedules transmission of |stream|'s item, assuming stream->item is
- * attached, and stream->last_writelen was updated.
- */
-void nghttp2_stream_reschedule(nghttp2_stream *stream);
-
-/*
- * Changes |stream|'s weight to |weight|.  If |stream| is queued, it
- * will be rescheduled based on new weight.
- */
-void nghttp2_stream_change_weight(nghttp2_stream *stream, int32_t weight);
-
-/*
- * Returns a stream which has highest priority, updating
- * descendant_last_cycle of selected stream's ancestors.
- */
-nghttp2_outbound_item *
-nghttp2_stream_next_outbound_item(nghttp2_stream *stream);
-
-#endif /* NGHTTP2_STREAM */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,814 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_submit.h"
-
-#include <string.h>
-#include <assert.h>
-
-#include "nghttp2_session.h"
-#include "nghttp2_frame.h"
-#include "nghttp2_helper.h"
-#include "nghttp2_priority_spec.h"
-
-/*
- * Detects the dependency error, that is stream attempted to depend on
- * itself.  If |stream_id| is -1, we use session->next_stream_id as
- * stream ID.
- *
- * This function returns 0 if it succeeds, or one of the following
- * error codes:
- *
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *   Stream attempted to depend on itself.
- */
-static int detect_self_dependency(nghttp2_session *session, int32_t stream_id,
-                                  const nghttp2_priority_spec *pri_spec) {
-  assert(pri_spec);
-
-  if (stream_id == -1) {
-    if ((int32_t)session->next_stream_id == pri_spec->stream_id) {
-      return NGHTTP2_ERR_INVALID_ARGUMENT;
-    }
-    return 0;
-  }
-
-  if (stream_id == pri_spec->stream_id) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  return 0;
-}
-
-/* This function takes ownership of |nva_copy|. Regardless of the
-   return value, the caller must not free |nva_copy| after this
-   function returns. */
-static int32_t submit_headers_shared(nghttp2_session *session, uint8_t flags,
-                                     int32_t stream_id,
-                                     const nghttp2_priority_spec *pri_spec,
-                                     nghttp2_nv *nva_copy, size_t nvlen,
-                                     const nghttp2_data_provider *data_prd,
-                                     void *stream_user_data) {
-  int rv;
-  uint8_t flags_copy;
-  nghttp2_outbound_item *item = NULL;
-  nghttp2_frame *frame = NULL;
-  nghttp2_headers_category hcat;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    rv = NGHTTP2_ERR_NOMEM;
-    goto fail;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  if (data_prd != NULL && data_prd->read_callback != NULL) {
-    item->aux_data.headers.data_prd = *data_prd;
-  }
-
-  item->aux_data.headers.stream_user_data = stream_user_data;
-
-  flags_copy =
-      (uint8_t)((flags & (NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_PRIORITY)) |
-                NGHTTP2_FLAG_END_HEADERS);
-
-  if (stream_id == -1) {
-    if (session->next_stream_id > INT32_MAX) {
-      rv = NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE;
-      goto fail;
-    }
-
-    stream_id = (int32_t)session->next_stream_id;
-    session->next_stream_id += 2;
-
-    hcat = NGHTTP2_HCAT_REQUEST;
-  } else {
-    /* More specific categorization will be done later. */
-    hcat = NGHTTP2_HCAT_HEADERS;
-  }
-
-  frame = &item->frame;
-
-  nghttp2_frame_headers_init(&frame->headers, flags_copy, stream_id, hcat,
-                             pri_spec, nva_copy, nvlen);
-
-  rv = nghttp2_session_add_item(session, item);
-
-  if (rv != 0) {
-    nghttp2_frame_headers_free(&frame->headers, mem);
-    goto fail2;
-  }
-
-  if (hcat == NGHTTP2_HCAT_REQUEST) {
-    return stream_id;
-  }
-
-  return 0;
-
-fail:
-  /* nghttp2_frame_headers_init() takes ownership of nva_copy. */
-  nghttp2_nv_array_del(nva_copy, mem);
-fail2:
-  nghttp2_mem_free(mem, item);
-
-  return rv;
-}
-
-static int32_t submit_headers_shared_nva(nghttp2_session *session,
-                                         uint8_t flags, int32_t stream_id,
-                                         const nghttp2_priority_spec *pri_spec,
-                                         const nghttp2_nv *nva, size_t nvlen,
-                                         const nghttp2_data_provider *data_prd,
-                                         void *stream_user_data) {
-  int rv;
-  nghttp2_nv *nva_copy;
-  nghttp2_priority_spec copy_pri_spec;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  if (pri_spec) {
-    copy_pri_spec = *pri_spec;
-    nghttp2_priority_spec_normalize_weight(&copy_pri_spec);
-  } else {
-    nghttp2_priority_spec_default_init(&copy_pri_spec);
-  }
-
-  rv = nghttp2_nv_array_copy(&nva_copy, nva, nvlen, mem);
-  if (rv < 0) {
-    return rv;
-  }
-
-  return submit_headers_shared(session, flags, stream_id, &copy_pri_spec,
-                               nva_copy, nvlen, data_prd, stream_user_data);
-}
-
-int nghttp2_submit_trailer(nghttp2_session *session, int32_t stream_id,
-                           const nghttp2_nv *nva, size_t nvlen) {
-  if (stream_id <= 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  return (int)submit_headers_shared_nva(session, NGHTTP2_FLAG_END_STREAM,
-                                        stream_id, NULL, nva, nvlen, NULL,
-                                        NULL);
-}
-
-int32_t nghttp2_submit_headers(nghttp2_session *session, uint8_t flags,
-                               int32_t stream_id,
-                               const nghttp2_priority_spec *pri_spec,
-                               const nghttp2_nv *nva, size_t nvlen,
-                               void *stream_user_data) {
-  int rv;
-
-  if (stream_id == -1) {
-    if (session->server) {
-      return NGHTTP2_ERR_PROTO;
-    }
-  } else if (stream_id <= 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  flags &= NGHTTP2_FLAG_END_STREAM;
-
-  if (pri_spec && !nghttp2_priority_spec_check_default(pri_spec)) {
-    rv = detect_self_dependency(session, stream_id, pri_spec);
-    if (rv != 0) {
-      return rv;
-    }
-
-    flags |= NGHTTP2_FLAG_PRIORITY;
-  } else {
-    pri_spec = NULL;
-  }
-
-  return submit_headers_shared_nva(session, flags, stream_id, pri_spec, nva,
-                                   nvlen, NULL, stream_user_data);
-}
-
-int nghttp2_submit_ping(nghttp2_session *session, uint8_t flags,
-                        const uint8_t *opaque_data) {
-  flags &= NGHTTP2_FLAG_ACK;
-  return nghttp2_session_add_ping(session, flags, opaque_data);
-}
-
-int nghttp2_submit_priority(nghttp2_session *session, uint8_t flags,
-                            int32_t stream_id,
-                            const nghttp2_priority_spec *pri_spec) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_priority_spec copy_pri_spec;
-  nghttp2_mem *mem;
-  (void)flags;
-
-  mem = &session->mem;
-
-  if (stream_id == 0 || pri_spec == NULL) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (stream_id == pri_spec->stream_id) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  copy_pri_spec = *pri_spec;
-
-  nghttp2_priority_spec_normalize_weight(&copy_pri_spec);
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_priority_init(&frame->priority, stream_id, &copy_pri_spec);
-
-  rv = nghttp2_session_add_item(session, item);
-
-  if (rv != 0) {
-    nghttp2_frame_priority_free(&frame->priority);
-    nghttp2_mem_free(mem, item);
-
-    return rv;
-  }
-
-  return 0;
-}
-
-int nghttp2_submit_rst_stream(nghttp2_session *session, uint8_t flags,
-                              int32_t stream_id, uint32_t error_code) {
-  (void)flags;
-
-  if (stream_id == 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  return nghttp2_session_add_rst_stream(session, stream_id, error_code);
-}
-
-int nghttp2_submit_goaway(nghttp2_session *session, uint8_t flags,
-                          int32_t last_stream_id, uint32_t error_code,
-                          const uint8_t *opaque_data, size_t opaque_data_len) {
-  (void)flags;
-
-  if (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND) {
-    return 0;
-  }
-  return nghttp2_session_add_goaway(session, last_stream_id, error_code,
-                                    opaque_data, opaque_data_len,
-                                    NGHTTP2_GOAWAY_AUX_NONE);
-}
-
-int nghttp2_submit_shutdown_notice(nghttp2_session *session) {
-  if (!session->server) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-  if (session->goaway_flags) {
-    return 0;
-  }
-  return nghttp2_session_add_goaway(session, (1u << 31) - 1, NGHTTP2_NO_ERROR,
-                                    NULL, 0,
-                                    NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE);
-}
-
-int nghttp2_submit_settings(nghttp2_session *session, uint8_t flags,
-                            const nghttp2_settings_entry *iv, size_t niv) {
-  (void)flags;
-  return nghttp2_session_add_settings(session, NGHTTP2_FLAG_NONE, iv, niv);
-}
-
-int32_t nghttp2_submit_push_promise(nghttp2_session *session, uint8_t flags,
-                                    int32_t stream_id, const nghttp2_nv *nva,
-                                    size_t nvlen,
-                                    void *promised_stream_user_data) {
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_nv *nva_copy;
-  uint8_t flags_copy;
-  int32_t promised_stream_id;
-  int rv;
-  nghttp2_mem *mem;
-  (void)flags;
-
-  mem = &session->mem;
-
-  if (stream_id <= 0 || nghttp2_session_is_my_stream_id(session, stream_id)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (!session->server) {
-    return NGHTTP2_ERR_PROTO;
-  }
-
-  /* All 32bit signed stream IDs are spent. */
-  if (session->next_stream_id > INT32_MAX) {
-    return NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE;
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  item->aux_data.headers.stream_user_data = promised_stream_user_data;
-
-  frame = &item->frame;
-
-  rv = nghttp2_nv_array_copy(&nva_copy, nva, nvlen, mem);
-  if (rv < 0) {
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-
-  flags_copy = NGHTTP2_FLAG_END_HEADERS;
-
-  promised_stream_id = (int32_t)session->next_stream_id;
-  session->next_stream_id += 2;
-
-  nghttp2_frame_push_promise_init(&frame->push_promise, flags_copy, stream_id,
-                                  promised_stream_id, nva_copy, nvlen);
-
-  rv = nghttp2_session_add_item(session, item);
-
-  if (rv != 0) {
-    nghttp2_frame_push_promise_free(&frame->push_promise, mem);
-    nghttp2_mem_free(mem, item);
-
-    return rv;
-  }
-
-  return promised_stream_id;
-}
-
-int nghttp2_submit_window_update(nghttp2_session *session, uint8_t flags,
-                                 int32_t stream_id,
-                                 int32_t window_size_increment) {
-  int rv;
-  nghttp2_stream *stream = 0;
-  (void)flags;
-
-  if (window_size_increment == 0) {
-    return 0;
-  }
-  if (stream_id == 0) {
-    rv = nghttp2_adjust_local_window_size(
-        &session->local_window_size, &session->recv_window_size,
-        &session->recv_reduction, &window_size_increment);
-    if (rv != 0) {
-      return rv;
-    }
-  } else {
-    stream = nghttp2_session_get_stream(session, stream_id);
-    if (!stream) {
-      return 0;
-    }
-
-    rv = nghttp2_adjust_local_window_size(
-        &stream->local_window_size, &stream->recv_window_size,
-        &stream->recv_reduction, &window_size_increment);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  if (window_size_increment > 0) {
-    if (stream_id == 0) {
-      session->consumed_size =
-          nghttp2_max(0, session->consumed_size - window_size_increment);
-    } else {
-      stream->consumed_size =
-          nghttp2_max(0, stream->consumed_size - window_size_increment);
-    }
-
-    return nghttp2_session_add_window_update(session, 0, stream_id,
-                                             window_size_increment);
-  }
-  return 0;
-}
-
-int nghttp2_session_set_local_window_size(nghttp2_session *session,
-                                          uint8_t flags, int32_t stream_id,
-                                          int32_t window_size) {
-  int32_t window_size_increment;
-  nghttp2_stream *stream;
-  int rv;
-  (void)flags;
-
-  if (window_size < 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (stream_id == 0) {
-    window_size_increment = window_size - session->local_window_size;
-
-    if (window_size_increment == 0) {
-      return 0;
-    }
-
-    if (window_size_increment < 0) {
-      return nghttp2_adjust_local_window_size(
-          &session->local_window_size, &session->recv_window_size,
-          &session->recv_reduction, &window_size_increment);
-    }
-
-    rv = nghttp2_increase_local_window_size(
-        &session->local_window_size, &session->recv_window_size,
-        &session->recv_reduction, &window_size_increment);
-
-    if (rv != 0) {
-      return rv;
-    }
-  } else {
-    stream = nghttp2_session_get_stream(session, stream_id);
-
-    if (stream == NULL) {
-      return 0;
-    }
-
-    window_size_increment = window_size - stream->local_window_size;
-
-    if (window_size_increment == 0) {
-      return 0;
-    }
-
-    if (window_size_increment < 0) {
-      return nghttp2_adjust_local_window_size(
-          &stream->local_window_size, &stream->recv_window_size,
-          &stream->recv_reduction, &window_size_increment);
-    }
-
-    rv = nghttp2_increase_local_window_size(
-        &stream->local_window_size, &stream->recv_window_size,
-        &stream->recv_reduction, &window_size_increment);
-
-    if (rv != 0) {
-      return rv;
-    }
-  }
-
-  if (window_size_increment > 0) {
-    return nghttp2_session_add_window_update(session, 0, stream_id,
-                                             window_size_increment);
-  }
-
-  return 0;
-}
-
-int nghttp2_submit_altsvc(nghttp2_session *session, uint8_t flags,
-                          int32_t stream_id, const uint8_t *origin,
-                          size_t origin_len, const uint8_t *field_value,
-                          size_t field_value_len) {
-  nghttp2_mem *mem;
-  uint8_t *buf, *p;
-  uint8_t *origin_copy;
-  uint8_t *field_value_copy;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_ext_altsvc *altsvc;
-  int rv;
-  (void)flags;
-
-  mem = &session->mem;
-
-  if (!session->server) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  if (2 + origin_len + field_value_len > NGHTTP2_MAX_PAYLOADLEN) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (stream_id == 0) {
-    if (origin_len == 0) {
-      return NGHTTP2_ERR_INVALID_ARGUMENT;
-    }
-  } else if (origin_len != 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  buf = nghttp2_mem_malloc(mem, origin_len + field_value_len + 2);
-  if (buf == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  p = buf;
-
-  origin_copy = p;
-  if (origin_len) {
-    p = nghttp2_cpymem(p, origin, origin_len);
-  }
-  *p++ = '\0';
-
-  field_value_copy = p;
-  if (field_value_len) {
-    p = nghttp2_cpymem(p, field_value, field_value_len);
-  }
-  *p++ = '\0';
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    rv = NGHTTP2_ERR_NOMEM;
-    goto fail_item_malloc;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  item->aux_data.ext.builtin = 1;
-
-  altsvc = &item->ext_frame_payload.altsvc;
-
-  frame = &item->frame;
-  frame->ext.payload = altsvc;
-
-  nghttp2_frame_altsvc_init(&frame->ext, stream_id, origin_copy, origin_len,
-                            field_value_copy, field_value_len);
-
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    nghttp2_frame_altsvc_free(&frame->ext, mem);
-    nghttp2_mem_free(mem, item);
-
-    return rv;
-  }
-
-  return 0;
-
-fail_item_malloc:
-  free(buf);
-
-  return rv;
-}
-
-int nghttp2_submit_origin(nghttp2_session *session, uint8_t flags,
-                          const nghttp2_origin_entry *ov, size_t nov) {
-  nghttp2_mem *mem;
-  uint8_t *p;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_ext_origin *origin;
-  nghttp2_origin_entry *ov_copy;
-  size_t len = 0;
-  size_t i;
-  int rv;
-  (void)flags;
-
-  mem = &session->mem;
-
-  if (!session->server) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  if (nov) {
-    for (i = 0; i < nov; ++i) {
-      len += ov[i].origin_len;
-    }
-
-    if (2 * nov + len > NGHTTP2_MAX_PAYLOADLEN) {
-      return NGHTTP2_ERR_INVALID_ARGUMENT;
-    }
-
-    /* The last nov is added for terminal NULL character. */
-    ov_copy =
-        nghttp2_mem_malloc(mem, nov * sizeof(nghttp2_origin_entry) + len + nov);
-    if (ov_copy == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-
-    p = (uint8_t *)ov_copy + nov * sizeof(nghttp2_origin_entry);
-
-    for (i = 0; i < nov; ++i) {
-      ov_copy[i].origin = p;
-      ov_copy[i].origin_len = ov[i].origin_len;
-      p = nghttp2_cpymem(p, ov[i].origin, ov[i].origin_len);
-      *p++ = '\0';
-    }
-
-    assert((size_t)(p - (uint8_t *)ov_copy) ==
-           nov * sizeof(nghttp2_origin_entry) + len + nov);
-  } else {
-    ov_copy = NULL;
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    rv = NGHTTP2_ERR_NOMEM;
-    goto fail_item_malloc;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  item->aux_data.ext.builtin = 1;
-
-  origin = &item->ext_frame_payload.origin;
-
-  frame = &item->frame;
-  frame->ext.payload = origin;
-
-  nghttp2_frame_origin_init(&frame->ext, ov_copy, nov);
-
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    nghttp2_frame_origin_free(&frame->ext, mem);
-    nghttp2_mem_free(mem, item);
-
-    return rv;
-  }
-
-  return 0;
-
-fail_item_malloc:
-  free(ov_copy);
-
-  return rv;
-}
-
-static uint8_t set_request_flags(const nghttp2_priority_spec *pri_spec,
-                                 const nghttp2_data_provider *data_prd) {
-  uint8_t flags = NGHTTP2_FLAG_NONE;
-  if (data_prd == NULL || data_prd->read_callback == NULL) {
-    flags |= NGHTTP2_FLAG_END_STREAM;
-  }
-
-  if (pri_spec) {
-    flags |= NGHTTP2_FLAG_PRIORITY;
-  }
-
-  return flags;
-}
-
-int32_t nghttp2_submit_request(nghttp2_session *session,
-                               const nghttp2_priority_spec *pri_spec,
-                               const nghttp2_nv *nva, size_t nvlen,
-                               const nghttp2_data_provider *data_prd,
-                               void *stream_user_data) {
-  uint8_t flags;
-  int rv;
-
-  if (session->server) {
-    return NGHTTP2_ERR_PROTO;
-  }
-
-  if (pri_spec && !nghttp2_priority_spec_check_default(pri_spec)) {
-    rv = detect_self_dependency(session, -1, pri_spec);
-    if (rv != 0) {
-      return rv;
-    }
-  } else {
-    pri_spec = NULL;
-  }
-
-  flags = set_request_flags(pri_spec, data_prd);
-
-  return submit_headers_shared_nva(session, flags, -1, pri_spec, nva, nvlen,
-                                   data_prd, stream_user_data);
-}
-
-static uint8_t set_response_flags(const nghttp2_data_provider *data_prd) {
-  uint8_t flags = NGHTTP2_FLAG_NONE;
-  if (data_prd == NULL || data_prd->read_callback == NULL) {
-    flags |= NGHTTP2_FLAG_END_STREAM;
-  }
-  return flags;
-}
-
-int nghttp2_submit_response(nghttp2_session *session, int32_t stream_id,
-                            const nghttp2_nv *nva, size_t nvlen,
-                            const nghttp2_data_provider *data_prd) {
-  uint8_t flags;
-
-  if (stream_id <= 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (!session->server) {
-    return NGHTTP2_ERR_PROTO;
-  }
-
-  flags = set_response_flags(data_prd);
-  return submit_headers_shared_nva(session, flags, stream_id, NULL, nva, nvlen,
-                                   data_prd, NULL);
-}
-
-int nghttp2_submit_data(nghttp2_session *session, uint8_t flags,
-                        int32_t stream_id,
-                        const nghttp2_data_provider *data_prd) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_data_aux_data *aux_data;
-  uint8_t nflags = flags & NGHTTP2_FLAG_END_STREAM;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  if (stream_id == 0) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-  aux_data = &item->aux_data.data;
-  aux_data->data_prd = *data_prd;
-  aux_data->eof = 0;
-  aux_data->flags = nflags;
-
-  /* flags are sent on transmission */
-  nghttp2_frame_data_init(&frame->data, NGHTTP2_FLAG_NONE, stream_id);
-
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    nghttp2_frame_data_free(&frame->data);
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-  return 0;
-}
-
-ssize_t nghttp2_pack_settings_payload(uint8_t *buf, size_t buflen,
-                                      const nghttp2_settings_entry *iv,
-                                      size_t niv) {
-  if (!nghttp2_iv_check(iv, niv)) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (buflen < (niv * NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH)) {
-    return NGHTTP2_ERR_INSUFF_BUFSIZE;
-  }
-
-  return (ssize_t)nghttp2_frame_pack_settings_payload(buf, iv, niv);
-}
-
-int nghttp2_submit_extension(nghttp2_session *session, uint8_t type,
-                             uint8_t flags, int32_t stream_id, void *payload) {
-  int rv;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_mem *mem;
-
-  mem = &session->mem;
-
-  if (type <= NGHTTP2_CONTINUATION) {
-    return NGHTTP2_ERR_INVALID_ARGUMENT;
-  }
-
-  if (!session->callbacks.pack_extension_callback) {
-    return NGHTTP2_ERR_INVALID_STATE;
-  }
-
-  item = nghttp2_mem_malloc(mem, sizeof(nghttp2_outbound_item));
-  if (item == NULL) {
-    return NGHTTP2_ERR_NOMEM;
-  }
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-  nghttp2_frame_extension_init(&frame->ext, type, flags, stream_id, payload);
-
-  rv = nghttp2_session_add_item(session, item);
-  if (rv != 0) {
-    nghttp2_frame_extension_free(&frame->ext);
-    nghttp2_mem_free(mem, item);
-    return rv;
-  }
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_submit.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_SUBMIT_H
-#define NGHTTP2_SUBMIT_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-#endif /* NGHTTP2_SUBMIT_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_version.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_version.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_version.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/nghttp2_version.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-static nghttp2_info version = {NGHTTP2_VERSION_AGE, NGHTTP2_VERSION_NUM,
-                               NGHTTP2_VERSION, NGHTTP2_PROTO_VERSION_ID};
-
-nghttp2_info *nghttp2_version(int least_version) {
-  if (least_version > NGHTTP2_VERSION_NUM)
-    return NULL;
-  return &version;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/version.rc.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/version.rc.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/lib/version.rc.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/lib/version.rc.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-
-FILEVERSION    @PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@, 0
-PRODUCTVERSION @PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@, 0
-FILEFLAGSMASK  0x3fL
-FILEOS         0x40004L
-FILETYPE       0x2L
-FILESUBTYPE    0x0L
-#ifdef _DEBUG
-	#define        VER_STR  "@PROJECT_VERSION@.0 (MSVC debug)"
-	#define        DBG      "d"
-	FILEFLAGS      0x1L
-#else
-	#define        VER_STR  "@PROJECT_VERSION@.0 (MSVC release)"
-	#define        DBG      ""
-	FILEFLAGS      0x0L
-#endif
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-  BLOCK "040904b0"
-  BEGIN
-	VALUE "CompanyName",      "https://nghttp2.org/"
-	VALUE "FileDescription",  "nghttp2; HTTP/2 C library"
-	VALUE "FileVersion",      VER_STR
-	VALUE "InternalName",     "nghttp2" DBG
-	VALUE "LegalCopyright",   "The MIT License"
-	VALUE "LegalTrademarks",  ""
-	VALUE "OriginalFilename", "nghttp2" DBG ".dll"
-	VALUE "ProductName",      "NGHTTP2."
-	VALUE "ProductVersion",   VER_STR
-  END
-END
-BLOCK "VarFileInfo"
-BEGIN
-VALUE "Translation", 0x409, 1200
-END
-END
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/LICENSE cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/LICENSE
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/LICENSE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-See COPYING
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_asio.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_asio.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_asio.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_asio.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_asio.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_ASIO
-#
-# DESCRIPTION
-#
-#   Test for Asio library from the Boost C++ libraries. The macro requires a
-#   preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_ASIO_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_ASIO
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Pete Greenwell <pete@mu.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 16
-
-AC_DEFUN([AX_BOOST_ASIO],
-[
-	AC_ARG_WITH([boost-asio],
-	AS_HELP_STRING([--with-boost-asio@<:@=special-lib@:>@],
-                   [use the ASIO library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-asio=boost_system-gcc41-mt-1_34 ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_asio_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_asio_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::ASIO library is available,
-					   ax_cv_boost_asio,
-        [AC_LANG_PUSH([C++])
-		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @%:@include <boost/asio.hpp>
-											]],
-                                  [[
-
-                                    boost::asio::io_service io;
-                                    boost::system::error_code timer_result;
-                                    boost::asio::deadline_timer t(io);
-                                    t.cancel();
-                                    io.run_one();
-									return 0;
-                                   ]])],
-                             ax_cv_boost_asio=yes, ax_cv_boost_asio=no)
-         AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_asio" = "xyes"; then
-			AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO library is available])
-			BN=boost_system
-			BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_asio_lib" = "x"; then
-				for ax_lib in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.dylib* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_system.*\)\.a.*$;\1;' ` ; do
-				    AC_CHECK_LIB($ax_lib, main, [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break],
-                                 [link_thread="no"])
-				done
-            else
-               for ax_lib in $ax_boost_user_asio_lib $BN-$ax_boost_user_asio_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_asio="yes" break],
-                                   [link_asio="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_asio" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_base.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_base.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_base.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_base.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 25
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-    [use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ])],
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
-        [
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64)
-        libsubdirs="lib64 libx32 lib lib64"
-        ;;
-      ppc64|s390x|sparc64|aarch64|ppc64le)
-        libsubdirs="lib64 lib lib64 ppc64le"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE([AC_CANONICAL_HOST])
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ],[
-        ])
-    AC_LANG_POP([C++])
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ],[
-            ])
-        AC_LANG_POP([C++])
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-        else
-            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse([$3], , :, [$3])
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-        # execute ACTION-IF-FOUND (if present):
-        ifelse([$2], , :, [$2])
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_system.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_system.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_system.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_system.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SYSTEM
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 17
-
-AC_DEFUN([AX_BOOST_SYSTEM],
-[
-	AC_ARG_WITH([boost-system],
-	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
-                   [use the System library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-system=boost_system-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_system_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_system_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::System library is available,
-					   ax_cv_boost_system,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
-                                   [[boost::system::system_category]])],
-                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_system" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                if test "x$link_system" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                   [link_system="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_system" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_thread.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_thread.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_thread.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_boost_thread.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_THREAD
-#
-# DESCRIPTION
-#
-#   Test for Thread library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_THREAD_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_THREAD
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Michael Tindal
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 27
-
-AC_DEFUN([AX_BOOST_THREAD],
-[
-	AC_ARG_WITH([boost-thread],
-	AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
-                   [use the Thread library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-thread=boost_thread-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_thread_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_thread_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::Thread library is available,
-					   ax_cv_boost_thread,
-        [AC_LANG_PUSH([C++])
-			 CXXFLAGS_SAVE=$CXXFLAGS
-
-			 if test "x$host_os" = "xsolaris" ; then
-				 CXXFLAGS="-pthreads $CXXFLAGS"
-			 elif test "x$host_os" = "xmingw32" ; then
-				 CXXFLAGS="-mthreads $CXXFLAGS"
-			 else
-				CXXFLAGS="-pthread $CXXFLAGS"
-			 fi
-			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
-                                   [[boost::thread_group thrds;
-                                   return 0;]])],
-                   ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_thread" = "xyes"; then
-           if test "x$host_os" = "xsolaris" ; then
-			  BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
-		   elif test "x$host_os" = "xmingw32" ; then
-			  BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
-		   else
-			  BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
-		   fi
-
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-                        case "x$host_os" in
-                          *bsd* )
-                               LDFLAGS="-pthread $LDFLAGS"
-                          break;
-                          ;;
-                        esac
-            if test "x$ax_boost_user_thread_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
-                                 [link_thread="no"])
-				done
-                if test "x$link_thread" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
-                                 [link_thread="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
-                                   [link_thread="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the library!)
-            fi
-			if test "x$link_thread" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-                        else
-                           case "x$host_os" in
-                              *bsd* )
-				BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
-                              break;
-                              ;;
-                           esac
-
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_check_compile_flag.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_check_compile_flag.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_check_compile_flag.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_check_compile_flag.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_cxx_compile_stdcxx_11.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_cxx_compile_stdcxx_11.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_cxx_compile_stdcxx_11.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_cxx_compile_stdcxx_11.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXXFLAGS to enable support.
-#
-#   The first argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The second argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline C++11 support is required and that the macro
-#   should error out if no mode with that support is found.  If specified
-#   'optional', then configuration proceeds regardless, after defining
-#   HAVE_CXX11 if and only if a supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 3
-
-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);
-
-    auto d = a;
-])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-  m4_if([$1], [], [],
-        [$1], [ext], [],
-        [$1], [noext], [],
-        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-  ax_cv_cxx_compile_cxx11,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-    [ax_cv_cxx_compile_cxx11=yes],
-    [ax_cv_cxx_compile_cxx11=no])])
-  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$1], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++11 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$1], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=c++11 -std=c++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx11_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-    fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX11=0
-      AC_MSG_NOTICE([No compiler with C++11 support was found])
-    else
-      HAVE_CXX11=1
-      AC_DEFINE(HAVE_CXX11,1,
-                [define if the compiler supports basic C++11 syntax])
-    fi
-
-    AC_SUBST(HAVE_CXX11)
-  fi
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_python_devel.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_python_devel.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/ax_python_devel.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/ax_python_devel.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,344 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PYTHON_DEVEL([version])
-#
-# DESCRIPTION
-#
-#   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
-#   in your configure.ac.
-#
-#   This macro checks for Python and tries to get the include path to
-#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
-#   output variables. It also exports $(PYTHON_EXTRA_LIBS) and
-#   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
-#
-#   You can search for some particular version of Python by passing a
-#   parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
-#   note that you *have* to pass also an operator along with the version to
-#   match, and pay special attention to the single quotes surrounding the
-#   version number. Don't use "PYTHON_VERSION" for this: that environment
-#   variable is declared as precious and thus reserved for the end-user.
-#
-#   This macro should work for all versions of Python >= 2.1.0. As an end
-#   user, you can disable the check for the python version by setting the
-#   PYTHON_NOVERSIONCHECK environment variable to something else than the
-#   empty string.
-#
-#   If you need to use this macro for an older Python version, please
-#   contact the authors. We're always open for feedback.
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2009 Alan W. Irwin
-#   Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2009 Andrew Collier
-#   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
-#   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
-#   Copyright (c) 2013 Daniel Mullner <muellner@math.stanford.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 16
-
-AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
-AC_DEFUN([AX_PYTHON_DEVEL],[
-	#
-	# Allow the use of a (user set) custom python version
-	#
-	AC_ARG_VAR([PYTHON_VERSION],[The installed Python
-		version to use, for example '2.3'. This string
-		will be appended to the Python interpreter
-		canonical name.])
-
-	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-	if test -z "$PYTHON"; then
-	   AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path])
-	   PYTHON_VERSION=""
-           no_python_devel=yes
-	fi
-
-AS_IF([test -z "$no_python_devel"], [
-	#
-	# Check for a version of Python >= 2.1.0
-	#
-	AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-	ac_supports_python_ver=`$PYTHON -c "import sys; \
-		ver = sys.version.split ()[[0]]; \
-		print (ver >= '2.1.0')"`
-	if test "$ac_supports_python_ver" != "True"; then
-		if test -z "$PYTHON_NOVERSIONCHECK"; then
-			AC_MSG_RESULT([no])
-			AC_MSG_WARN([
-This version of the AC@&t@_PYTHON_DEVEL macro
-doesn't work properly with versions of Python before
-2.1.0. You may need to re-run configure, setting the
-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
-PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
-Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
-to something else than an empty string.
-])
-                        no_python_devel=yes
-		else
-			AC_MSG_RESULT([skip at user request])
-		fi
-	else
-		AC_MSG_RESULT([yes])
-	fi
-]) # AS_IF
-
-AS_IF([test -z "$no_python_devel"], [
-	#
-	# if the macro parameter ``version'' is set, honour it
-	#
-	if test -n "$1"; then
-		AC_MSG_CHECKING([for a version of Python $1])
-		ac_supports_python_ver=`$PYTHON -c "import sys; \
-			ver = sys.version.split ()[[0]]; \
-			print (ver $1)"`
-		if test "$ac_supports_python_ver" = "True"; then
-		   AC_MSG_RESULT([yes])
-		else
-			AC_MSG_RESULT([no])
-			AC_MSG_WARN([this package requires Python $1.
-If you have it installed, but it isn't the default Python
-interpreter in your system path, please pass the PYTHON_VERSION
-variable to configure. See ``configure --help'' for reference.
-])
-			PYTHON_VERSION=""
-                        no_python_devel=yes
-		fi
-	fi
-]) # AS_IF
-
-AS_IF([test -z "$no_python_devel"], [
-	#
-	# Check if you have distutils, else fail
-	#
-	AC_MSG_CHECKING([for the distutils Python package])
-	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-	if test -z "$ac_distutils_result"; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		AC_MSG_WARN([cannot import Python module "distutils".
-Please check your Python installation. The error was:
-$ac_distutils_result])
-		PYTHON_VERSION=""
-                no_python_devel=yes
-	fi
-]) # AS_IF
-
-AS_IF([test -z "$no_python_devel"], [
-	#
-	# Check for Python include path
-	#
-	AC_MSG_CHECKING([for Python include path])
-	if test -z "$PYTHON_CPPFLAGS"; then
-		python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc ());"`
-		plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
-		if test -n "${python_path}"; then
-			if test "${plat_python_path}" != "${python_path}"; then
-				python_path="-I$python_path -I$plat_python_path"
-			else
-				python_path="-I$python_path"
-			fi
-		fi
-		PYTHON_CPPFLAGS=$python_path
-	fi
-	AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-	AC_SUBST([PYTHON_CPPFLAGS])
-
-	#
-	# Check for Python library path
-	#
-	AC_MSG_CHECKING([for Python library path])
-	if test -z "$PYTHON_LDFLAGS"; then
-		# (makes two attempts to ensure we've got a version number
-		# from the interpreter)
-		ac_python_version=`cat<<EOD | $PYTHON -
-
-# join all versioning strings, on some systems
-# major/minor numbers could be in different list elements
-from distutils.sysconfig import *
-e = get_config_var('VERSION')
-if e is not None:
-	print(e)
-EOD`
-
-		if test -z "$ac_python_version"; then
-			if test -n "$PYTHON_VERSION"; then
-				ac_python_version=$PYTHON_VERSION
-			else
-				ac_python_version=`$PYTHON -c "import sys; \
-					print (sys.version[[:3]])"`
-			fi
-		fi
-
-		# Make the versioning information available to the compiler
-		AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
-                                   [If available, contains the Python version number currently in use.])
-
-		# First, the library directory:
-		ac_python_libdir=`cat<<EOD | $PYTHON -
-
-# There should be only one
-import distutils.sysconfig
-e = distutils.sysconfig.get_config_var('LIBDIR')
-if e is not None:
-	print (e)
-EOD`
-
-		# Now, for the library:
-		ac_python_library=`cat<<EOD | $PYTHON -
-
-import distutils.sysconfig
-c = distutils.sysconfig.get_config_vars()
-if 'LDVERSION' in c:
-	print ('python'+c[['LDVERSION']])
-else:
-	print ('python'+c[['VERSION']])
-EOD`
-
-		# This small piece shamelessly adapted from PostgreSQL python macro;
-		# credits goes to momjian, I think. I'd like to put the right name
-		# in the credits, if someone can point me in the right direction... ?
-		#
-		if test -n "$ac_python_libdir" -a -n "$ac_python_library"
-		then
-			# use the official shared library
-			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
-			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
-		else
-			# old way: use libpython from python_configdir
-			ac_python_libdir=`$PYTHON -c \
-			  "from distutils.sysconfig import get_python_lib as f; \
-			  import os; \
-			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
-			PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
-		fi
-
-		if test -z "PYTHON_LDFLAGS"; then
-			AC_MSG_WARN([
-  Cannot determine location of your Python DSO. Please check it was installed with
-  dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
-			])
-                        no_python_devel=yes
-		fi
-	fi
-	AC_MSG_RESULT([$PYTHON_LDFLAGS])
-	AC_SUBST([PYTHON_LDFLAGS])
-]) # AS_IF
-
-AS_IF([test -z "$no_python_devel"], [
-	#
-	# Check for site packages
-	#
-	AC_MSG_CHECKING([for Python site-packages path])
-	if test -z "$PYTHON_SITE_PKG"; then
-		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_lib(0,0));"`
-	fi
-	AC_MSG_RESULT([$PYTHON_SITE_PKG])
-	AC_SUBST([PYTHON_SITE_PKG])
-
-	#
-	# libraries which must be linked in when embedding
-	#
-	AC_MSG_CHECKING(python extra libraries)
-	if test -z "$PYTHON_EXTRA_LIBS"; then
-	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-                conf = distutils.sysconfig.get_config_var; \
-                print (conf('LIBS'))"`
-	fi
-	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-	AC_SUBST(PYTHON_EXTRA_LIBS)
-
-	#
-	# linking flags needed when embedding
-	#
-	AC_MSG_CHECKING(python extra linking flags)
-	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-			conf = distutils.sysconfig.get_config_var; \
-			print (conf('LINKFORSHARED'))"`
-	fi
-	AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-
-	#
-	# final check to see if everything compiles alright
-	#
-	AC_MSG_CHECKING([consistency of all components of python development environment])
-	# save current global flags
-	ac_save_LIBS="$LIBS"
-	ac_save_CPPFLAGS="$CPPFLAGS"
-	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
-	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
-	AC_LANG_PUSH([C])
-	AC_LINK_IFELSE([
-		AC_LANG_PROGRAM([[#include <Python.h>]],
-				[[Py_Initialize();]])
-		],[pythonexists=yes],[pythonexists=no])
-	AC_LANG_POP([C])
-	# turn back to default flags
-	CPPFLAGS="$ac_save_CPPFLAGS"
-	LIBS="$ac_save_LIBS"
-
-	AC_MSG_RESULT([$pythonexists])
-
-        if test ! "x$pythonexists" = "xyes"; then
-	   AC_MSG_WARN([
-  Could not link test program to Python. Maybe the main Python library has been
-  installed in some non-standard library path. If so, pass it to configure,
-  via the LDFLAGS environment variable.
-  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
-  ============================================================================
-   ERROR!
-   You probably have to install the development version of the Python package
-   for your distribution.  The exact name of this package varies among them.
-  ============================================================================
-	   ])
-	  PYTHON_VERSION=""
-          no_python_devel=yes
-	fi
-
-	#
-	# all done!
-	#
-]) # AS_IF
-
-AS_IF([test -z "$no_python_devel"],
-      [have_python_dev=yes], [have_python_dev=no])
-
-]) # AS_IF
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/libxml2.m4 cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/libxml2.m4
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/m4/libxml2.m4	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/m4/libxml2.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-# Configure paths for LIBXML2
-# Mike Hommey 2004-06-19
-# use CPPFLAGS instead of CFLAGS
-# Toshio Kuratomi 2001-04-21
-# Adapted from:
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
-dnl
-AC_DEFUN([AM_PATH_XML2],[ 
-AC_ARG_WITH(xml-prefix,
-            [  --with-xml-prefix=PFX   Prefix where libxml is installed (optional)],
-            xml_config_prefix="$withval", xml_config_prefix="")
-AC_ARG_WITH(xml-exec-prefix,
-            [  --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
-            xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
-AC_ARG_ENABLE(xmltest,
-              [  --disable-xmltest       Do not try to compile and run a test LIBXML program],,
-              enable_xmltest=yes)
-
-  if test x$xml_config_exec_prefix != x ; then
-     xml_config_args="$xml_config_args"
-     if test x${XML2_CONFIG+set} != xset ; then
-        XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config
-     fi
-  fi
-  if test x$xml_config_prefix != x ; then
-     xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
-     if test x${XML2_CONFIG+set} != xset ; then
-        XML2_CONFIG=$xml_config_prefix/bin/xml2-config
-     fi
-  fi
-
-  AC_PATH_PROG(XML2_CONFIG, xml2-config, no)
-  min_xml_version=ifelse([$1], ,2.0.0,[$1])
-  AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
-  no_xml=""
-  if test "$XML2_CONFIG" = "no" ; then
-    no_xml=yes
-  else
-    XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
-    XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
-    xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_xmltest" = "xyes" ; then
-      ac_save_CPPFLAGS="$CPPFLAGS"
-      ac_save_LIBS="$LIBS"
-      CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-      LIBS="$XML_LIBS $LIBS"
-dnl
-dnl Now check if the installed libxml is sufficiently new.
-dnl (Also sanity checks the results of xml2-config to some extent)
-dnl
-      rm -f conf.xmltest
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxml/xmlversion.h>
-
-int 
-main()
-{
-  int xml_major_version, xml_minor_version, xml_micro_version;
-  int major, minor, micro;
-  char *tmp_version;
-
-  system("touch conf.xmltest");
-
-  /* Capture xml2-config output via autoconf/configure variables */
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = (char *)strdup("$min_xml_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string from xml2-config\n", "$min_xml_version");
-     exit(1);
-   }
-   free(tmp_version);
-
-   /* Capture the version information from the header files */
-   tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION);
-   if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
-     printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION");
-     exit(1);
-   }
-   free(tmp_version);
-
- /* Compare xml2-config output to the libxml headers */
-  if ((xml_major_version != $xml_config_major_version) ||
-      (xml_minor_version != $xml_config_minor_version) ||
-      (xml_micro_version != $xml_config_micro_version))
-    {
-      printf("*** libxml header files (version %d.%d.%d) do not match\n",
-         xml_major_version, xml_minor_version, xml_micro_version);
-      printf("*** xml2-config (version %d.%d.%d)\n",
-         $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
-      return 1;
-    } 
-/* Compare the headers to the library to make sure we match */
-  /* Less than ideal -- doesn't provide us with return value feedback, 
-   * only exits if there's a serious mismatch between header and library.
-   */
-    LIBXML_TEST_VERSION;
-
-    /* Test that the library is greater than our minimum version */
-    if ((xml_major_version > major) ||
-        ((xml_major_version == major) && (xml_minor_version > minor)) ||
-        ((xml_major_version == major) && (xml_minor_version == minor) &&
-        (xml_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
-               xml_major_version, xml_minor_version, xml_micro_version);
-        printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
-           major, minor, micro);
-        printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the xml2-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
-        printf("*** correct copy of xml2-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-    }
-  return 1;
-}
-],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CPPFLAGS="$ac_save_CPPFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-
-  if test "x$no_xml" = x ; then
-     AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$XML2_CONFIG" = "no" ; then
-       echo "*** The xml2-config script installed by LIBXML could not be found"
-       echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the XML2_CONFIG environment variable to the"
-       echo "*** full path to xml2-config."
-     else
-       if test -f conf.xmltest ; then
-        :
-       else
-          echo "*** Could not run libxml test program, checking why..."
-          CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-          LIBS="$LIBS $XML_LIBS"
-          AC_TRY_LINK([
-#include <libxml/xmlversion.h>
-#include <stdio.h>
-],      [ LIBXML_TEST_VERSION; return 0;],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
-          echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means LIBXML was incorrectly installed"
-          echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
-          echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
-          CPPFLAGS="$ac_save_CPPFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-
-     XML_CPPFLAGS=""
-     XML_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(XML_CPPFLAGS)
-  AC_SUBST(XML_LIBS)
-  rm -f conf.xmltest
-])
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/makebashcompletion cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/makebashcompletion
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/makebashcompletion	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/makebashcompletion	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-BCPATH=doc/bash_completion
-
-for prog in nghttp nghttpd nghttpx h2load; do
-    $BCPATH/make_bash_completion.py src/$prog > $BCPATH/$prog
-done
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib third-party src examples python tests integration-tests \
-	doc contrib script
-
-# Now with python setuptools, make uninstall will leave many files we
-# cannot easily remove (e.g., easy-install.pth).  Disable it for
-# distcheck rule.
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-python-bindings
-
-ACLOCAL_AMFLAGS = -I m4
-
-dist_doc_DATA = README.rst
-
-EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
-	Dockerfile.android \
-	cmakeconfig.h.in \
-	CMakeLists.txt \
-	CMakeOptions.txt \
-	cmake/FindSpdylay.cmake \
-	cmake/ExtractValidFlags.cmake \
-	cmake/FindJemalloc.cmake \
-	cmake/FindLibev.cmake \
-	cmake/FindCUnit.cmake \
-	cmake/Version.cmake \
-	cmake/FindCython.cmake \
-	cmake/FindLibevent.cmake \
-	cmake/FindJansson.cmake \
-	cmake/FindLibcares.cmake
-
-.PHONY: clang-format
-
-# Format source files using clang-format.  Don't format source files
-# under third-party directory since we are not responsible for thier
-# coding style.
-clang-format:
-	CLANGFORMAT=`git config --get clangformat.binary`; \
-	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
-	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
-	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
-	tests/*.{c,h}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/makemanpages cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/makemanpages
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/makemanpages	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/makemanpages	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-for prog in nghttp nghttpd nghttpx h2load; do
-    src/$prog -h | ./help2rst.py -i doc/$prog.h2r > doc/$prog.1.rst
-done
-
-cd doc
-make man
-
-for prog in nghttp nghttpd nghttpx h2load; do
-    cp manual/man/$prog.1 $prog.1
-done
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/makerelease.sh cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/makerelease.sh
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/makerelease.sh	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/makerelease.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-TAG=$1
-PREV_TAG=$2
-
-git checkout refs/tags/$TAG
-git log --pretty=fuller --date=short refs/tags/$PREV_TAG..HEAD > ChangeLog
-
-git submodule update --init
-
-autoreconf -i
-./configure --with-mruby && \
-    make dist-bzip2 && make dist-gzip && make dist-xz || echo "error"
-make distclean
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/mkcipherlist.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/mkcipherlist.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/mkcipherlist.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/mkcipherlist.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,326 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This script read cipher suite list csv file [1] and prints out id
-# and name of black listed cipher suites.  The output is used by
-# src/ssl.cc.
-#
-# [1] http://www.iana.org/assignments/tls-parameters/tls-parameters-4.csv
-# [2] http://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml
-
-from __future__ import unicode_literals
-import re
-import sys
-import csv
-
-# From RFC 7540
-blacklist = [
-    'TLS_NULL_WITH_NULL_NULL',
-    'TLS_RSA_WITH_NULL_MD5',
-    'TLS_RSA_WITH_NULL_SHA',
-    'TLS_RSA_EXPORT_WITH_RC4_40_MD5',
-    'TLS_RSA_WITH_RC4_128_MD5',
-    'TLS_RSA_WITH_RC4_128_SHA',
-    'TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5',
-    'TLS_RSA_WITH_IDEA_CBC_SHA',
-    'TLS_RSA_EXPORT_WITH_DES40_CBC_SHA',
-    'TLS_RSA_WITH_DES_CBC_SHA',
-    'TLS_RSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA',
-    'TLS_DH_DSS_WITH_DES_CBC_SHA',
-    'TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA',
-    'TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA',
-    'TLS_DH_RSA_WITH_DES_CBC_SHA',
-    'TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA',
-    'TLS_DHE_DSS_WITH_DES_CBC_SHA',
-    'TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA',
-    'TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA',
-    'TLS_DHE_RSA_WITH_DES_CBC_SHA',
-    'TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_DH_anon_EXPORT_WITH_RC4_40_MD5',
-    'TLS_DH_anon_WITH_RC4_128_MD5',
-    'TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA',
-    'TLS_DH_anon_WITH_DES_CBC_SHA',
-    'TLS_DH_anon_WITH_3DES_EDE_CBC_SHA',
-    'TLS_KRB5_WITH_DES_CBC_SHA',
-    'TLS_KRB5_WITH_3DES_EDE_CBC_SHA',
-    'TLS_KRB5_WITH_RC4_128_SHA',
-    'TLS_KRB5_WITH_IDEA_CBC_SHA',
-    'TLS_KRB5_WITH_DES_CBC_MD5',
-    'TLS_KRB5_WITH_3DES_EDE_CBC_MD5',
-    'TLS_KRB5_WITH_RC4_128_MD5',
-    'TLS_KRB5_WITH_IDEA_CBC_MD5',
-    'TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA',
-    'TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA',
-    'TLS_KRB5_EXPORT_WITH_RC4_40_SHA',
-    'TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5',
-    'TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5',
-    'TLS_KRB5_EXPORT_WITH_RC4_40_MD5',
-    'TLS_PSK_WITH_NULL_SHA',
-    'TLS_DHE_PSK_WITH_NULL_SHA',
-    'TLS_RSA_PSK_WITH_NULL_SHA',
-    'TLS_RSA_WITH_AES_128_CBC_SHA',
-    'TLS_DH_DSS_WITH_AES_128_CBC_SHA',
-    'TLS_DH_RSA_WITH_AES_128_CBC_SHA',
-    'TLS_DHE_DSS_WITH_AES_128_CBC_SHA',
-    'TLS_DHE_RSA_WITH_AES_128_CBC_SHA',
-    'TLS_DH_anon_WITH_AES_128_CBC_SHA',
-    'TLS_RSA_WITH_AES_256_CBC_SHA',
-    'TLS_DH_DSS_WITH_AES_256_CBC_SHA',
-    'TLS_DH_RSA_WITH_AES_256_CBC_SHA',
-    'TLS_DHE_DSS_WITH_AES_256_CBC_SHA',
-    'TLS_DHE_RSA_WITH_AES_256_CBC_SHA',
-    'TLS_DH_anon_WITH_AES_256_CBC_SHA',
-    'TLS_RSA_WITH_NULL_SHA256',
-    'TLS_RSA_WITH_AES_128_CBC_SHA256',
-    'TLS_RSA_WITH_AES_256_CBC_SHA256',
-    'TLS_DH_DSS_WITH_AES_128_CBC_SHA256',
-    'TLS_DH_RSA_WITH_AES_128_CBC_SHA256',
-    'TLS_DHE_DSS_WITH_AES_128_CBC_SHA256',
-    'TLS_RSA_WITH_CAMELLIA_128_CBC_SHA',
-    'TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA',
-    'TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA',
-    'TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA',
-    'TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA',
-    'TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA',
-    'TLS_DHE_RSA_WITH_AES_128_CBC_SHA256',
-    'TLS_DH_DSS_WITH_AES_256_CBC_SHA256',
-    'TLS_DH_RSA_WITH_AES_256_CBC_SHA256',
-    'TLS_DHE_DSS_WITH_AES_256_CBC_SHA256',
-    'TLS_DHE_RSA_WITH_AES_256_CBC_SHA256',
-    'TLS_DH_anon_WITH_AES_128_CBC_SHA256',
-    'TLS_DH_anon_WITH_AES_256_CBC_SHA256',
-    'TLS_RSA_WITH_CAMELLIA_256_CBC_SHA',
-    'TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA',
-    'TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA',
-    'TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA',
-    'TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA',
-    'TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA',
-    'TLS_PSK_WITH_RC4_128_SHA',
-    'TLS_PSK_WITH_3DES_EDE_CBC_SHA',
-    'TLS_PSK_WITH_AES_128_CBC_SHA',
-    'TLS_PSK_WITH_AES_256_CBC_SHA',
-    'TLS_DHE_PSK_WITH_RC4_128_SHA',
-    'TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA',
-    'TLS_DHE_PSK_WITH_AES_128_CBC_SHA',
-    'TLS_DHE_PSK_WITH_AES_256_CBC_SHA',
-    'TLS_RSA_PSK_WITH_RC4_128_SHA',
-    'TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA',
-    'TLS_RSA_PSK_WITH_AES_128_CBC_SHA',
-    'TLS_RSA_PSK_WITH_AES_256_CBC_SHA',
-    'TLS_RSA_WITH_SEED_CBC_SHA',
-    'TLS_DH_DSS_WITH_SEED_CBC_SHA',
-    'TLS_DH_RSA_WITH_SEED_CBC_SHA',
-    'TLS_DHE_DSS_WITH_SEED_CBC_SHA',
-    'TLS_DHE_RSA_WITH_SEED_CBC_SHA',
-    'TLS_DH_anon_WITH_SEED_CBC_SHA',
-    'TLS_RSA_WITH_AES_128_GCM_SHA256',
-    'TLS_RSA_WITH_AES_256_GCM_SHA384',
-    'TLS_DH_RSA_WITH_AES_128_GCM_SHA256',
-    'TLS_DH_RSA_WITH_AES_256_GCM_SHA384',
-    'TLS_DH_DSS_WITH_AES_128_GCM_SHA256',
-    'TLS_DH_DSS_WITH_AES_256_GCM_SHA384',
-    'TLS_DH_anon_WITH_AES_128_GCM_SHA256',
-    'TLS_DH_anon_WITH_AES_256_GCM_SHA384',
-    'TLS_PSK_WITH_AES_128_GCM_SHA256',
-    'TLS_PSK_WITH_AES_256_GCM_SHA384',
-    'TLS_RSA_PSK_WITH_AES_128_GCM_SHA256',
-    'TLS_RSA_PSK_WITH_AES_256_GCM_SHA384',
-    'TLS_PSK_WITH_AES_128_CBC_SHA256',
-    'TLS_PSK_WITH_AES_256_CBC_SHA384',
-    'TLS_PSK_WITH_NULL_SHA256',
-    'TLS_PSK_WITH_NULL_SHA384',
-    'TLS_DHE_PSK_WITH_AES_128_CBC_SHA256',
-    'TLS_DHE_PSK_WITH_AES_256_CBC_SHA384',
-    'TLS_DHE_PSK_WITH_NULL_SHA256',
-    'TLS_DHE_PSK_WITH_NULL_SHA384',
-    'TLS_RSA_PSK_WITH_AES_128_CBC_SHA256',
-    'TLS_RSA_PSK_WITH_AES_256_CBC_SHA384',
-    'TLS_RSA_PSK_WITH_NULL_SHA256',
-    'TLS_RSA_PSK_WITH_NULL_SHA384',
-    'TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256',
-    'TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256',
-    'TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256',
-    'TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256',
-    'TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256',
-    'TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256',
-    'TLS_EMPTY_RENEGOTIATION_INFO_SCSV',
-    'TLS_ECDH_ECDSA_WITH_NULL_SHA',
-    'TLS_ECDH_ECDSA_WITH_RC4_128_SHA',
-    'TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA',
-    'TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA',
-    'TLS_ECDHE_ECDSA_WITH_NULL_SHA',
-    'TLS_ECDHE_ECDSA_WITH_RC4_128_SHA',
-    'TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA',
-    'TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA',
-    'TLS_ECDH_RSA_WITH_NULL_SHA',
-    'TLS_ECDH_RSA_WITH_RC4_128_SHA',
-    'TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_ECDH_RSA_WITH_AES_128_CBC_SHA',
-    'TLS_ECDH_RSA_WITH_AES_256_CBC_SHA',
-    'TLS_ECDHE_RSA_WITH_NULL_SHA',
-    'TLS_ECDHE_RSA_WITH_RC4_128_SHA',
-    'TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA',
-    'TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA',
-    'TLS_ECDH_anon_WITH_NULL_SHA',
-    'TLS_ECDH_anon_WITH_RC4_128_SHA',
-    'TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA',
-    'TLS_ECDH_anon_WITH_AES_128_CBC_SHA',
-    'TLS_ECDH_anon_WITH_AES_256_CBC_SHA',
-    'TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA',
-    'TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA',
-    'TLS_SRP_SHA_WITH_AES_128_CBC_SHA',
-    'TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA',
-    'TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA',
-    'TLS_SRP_SHA_WITH_AES_256_CBC_SHA',
-    'TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA',
-    'TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA',
-    'TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256',
-    'TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384',
-    'TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256',
-    'TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384',
-    'TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256',
-    'TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384',
-    'TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256',
-    'TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384',
-    'TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256',
-    'TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384',
-    'TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256',
-    'TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384',
-    'TLS_ECDHE_PSK_WITH_RC4_128_SHA',
-    'TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA',
-    'TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA',
-    'TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA',
-    'TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256',
-    'TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384',
-    'TLS_ECDHE_PSK_WITH_NULL_SHA',
-    'TLS_ECDHE_PSK_WITH_NULL_SHA256',
-    'TLS_ECDHE_PSK_WITH_NULL_SHA384',
-    'TLS_RSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_RSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256',
-    'TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384',
-    'TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256',
-    'TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384',
-    'TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_DH_anon_WITH_ARIA_128_CBC_SHA256',
-    'TLS_DH_anon_WITH_ARIA_256_CBC_SHA384',
-    'TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256',
-    'TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384',
-    'TLS_RSA_WITH_ARIA_128_GCM_SHA256',
-    'TLS_RSA_WITH_ARIA_256_GCM_SHA384',
-    'TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256',
-    'TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384',
-    'TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256',
-    'TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384',
-    'TLS_DH_anon_WITH_ARIA_128_GCM_SHA256',
-    'TLS_DH_anon_WITH_ARIA_256_GCM_SHA384',
-    'TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256',
-    'TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384',
-    'TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256',
-    'TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384',
-    'TLS_PSK_WITH_ARIA_128_CBC_SHA256',
-    'TLS_PSK_WITH_ARIA_256_CBC_SHA384',
-    'TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256',
-    'TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384',
-    'TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256',
-    'TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384',
-    'TLS_PSK_WITH_ARIA_128_GCM_SHA256',
-    'TLS_PSK_WITH_ARIA_256_GCM_SHA384',
-    'TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256',
-    'TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384',
-    'TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256',
-    'TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384',
-    'TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256',
-    'TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384',
-    'TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256',
-    'TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384',
-    'TLS_RSA_WITH_AES_128_CCM',
-    'TLS_RSA_WITH_AES_256_CCM',
-    'TLS_RSA_WITH_AES_128_CCM_8',
-    'TLS_RSA_WITH_AES_256_CCM_8',
-    'TLS_PSK_WITH_AES_128_CCM',
-    'TLS_PSK_WITH_AES_256_CCM',
-    'TLS_PSK_WITH_AES_128_CCM_8',
-    'TLS_PSK_WITH_AES_256_CCM_8',
-]
-
-ciphers = []
-found = set()
-for hl, name, _, _ in csv.reader(sys.stdin):
-    if name not in blacklist:
-        continue
-
-    found.add(name)
-
-    high, low = hl.split(',')
-
-    id = high + low[2:] + 'u'
-    ciphers.append((id, name))
-
-print '''\
-enum {'''
-
-for id, name in ciphers:
-    print '{} = {},'.format(name, id)
-
-print '''\
-};
-'''
-
-for id, name in ciphers:
-    print '''\
-case {}:'''.format(name)
-
-if len(found) != len(blacklist):
-    print '{} found out of {}; not all cipher was found: {}'.format(
-        len(found), len(blacklist),
-        found.symmetric_difference(blacklist))
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/mkhufftbl.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/mkhufftbl.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/mkhufftbl.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/mkhufftbl.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,451 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This script reads Huffman Code table [1] and generates symbol table
-# and decoding tables in C language.  The resulting code is used in
-# lib/nghttp2_hd_huffman.h and lib/nghttp2_hd_huffman_data.c
-#
-# [1] http://http2.github.io/http2-spec/compression.html
-
-from __future__ import unicode_literals
-import re
-import sys
-import StringIO
-
-# From [1]
-HUFFMAN_CODE_TABLE = """\
-    (  0)  |11111111|11000                             1ff8  [13]
-    (  1)  |11111111|11111111|1011000                7fffd8  [23]
-    (  2)  |11111111|11111111|11111110|0010         fffffe2  [28]
-    (  3)  |11111111|11111111|11111110|0011         fffffe3  [28]
-    (  4)  |11111111|11111111|11111110|0100         fffffe4  [28]
-    (  5)  |11111111|11111111|11111110|0101         fffffe5  [28]
-    (  6)  |11111111|11111111|11111110|0110         fffffe6  [28]
-    (  7)  |11111111|11111111|11111110|0111         fffffe7  [28]
-    (  8)  |11111111|11111111|11111110|1000         fffffe8  [28]
-    (  9)  |11111111|11111111|11101010               ffffea  [24]
-    ( 10)  |11111111|11111111|11111111|111100      3ffffffc  [30]
-    ( 11)  |11111111|11111111|11111110|1001         fffffe9  [28]
-    ( 12)  |11111111|11111111|11111110|1010         fffffea  [28]
-    ( 13)  |11111111|11111111|11111111|111101      3ffffffd  [30]
-    ( 14)  |11111111|11111111|11111110|1011         fffffeb  [28]
-    ( 15)  |11111111|11111111|11111110|1100         fffffec  [28]
-    ( 16)  |11111111|11111111|11111110|1101         fffffed  [28]
-    ( 17)  |11111111|11111111|11111110|1110         fffffee  [28]
-    ( 18)  |11111111|11111111|11111110|1111         fffffef  [28]
-    ( 19)  |11111111|11111111|11111111|0000         ffffff0  [28]
-    ( 20)  |11111111|11111111|11111111|0001         ffffff1  [28]
-    ( 21)  |11111111|11111111|11111111|0010         ffffff2  [28]
-    ( 22)  |11111111|11111111|11111111|111110      3ffffffe  [30]
-    ( 23)  |11111111|11111111|11111111|0011         ffffff3  [28]
-    ( 24)  |11111111|11111111|11111111|0100         ffffff4  [28]
-    ( 25)  |11111111|11111111|11111111|0101         ffffff5  [28]
-    ( 26)  |11111111|11111111|11111111|0110         ffffff6  [28]
-    ( 27)  |11111111|11111111|11111111|0111         ffffff7  [28]
-    ( 28)  |11111111|11111111|11111111|1000         ffffff8  [28]
-    ( 29)  |11111111|11111111|11111111|1001         ffffff9  [28]
-    ( 30)  |11111111|11111111|11111111|1010         ffffffa  [28]
-    ( 31)  |11111111|11111111|11111111|1011         ffffffb  [28]
-' ' ( 32)  |010100                                       14  [ 6]
-'!' ( 33)  |11111110|00                                 3f8  [10]
-'"' ( 34)  |11111110|01                                 3f9  [10]
-'#' ( 35)  |11111111|1010                               ffa  [12]
-'$' ( 36)  |11111111|11001                             1ff9  [13]
-'%' ( 37)  |010101                                       15  [ 6]
-'&' ( 38)  |11111000                                     f8  [ 8]
-''' ( 39)  |11111111|010                                7fa  [11]
-'(' ( 40)  |11111110|10                                 3fa  [10]
-')' ( 41)  |11111110|11                                 3fb  [10]
-'*' ( 42)  |11111001                                     f9  [ 8]
-'+' ( 43)  |11111111|011                                7fb  [11]
-',' ( 44)  |11111010                                     fa  [ 8]
-'-' ( 45)  |010110                                       16  [ 6]
-'.' ( 46)  |010111                                       17  [ 6]
-'/' ( 47)  |011000                                       18  [ 6]
-'0' ( 48)  |00000                                         0  [ 5]
-'1' ( 49)  |00001                                         1  [ 5]
-'2' ( 50)  |00010                                         2  [ 5]
-'3' ( 51)  |011001                                       19  [ 6]
-'4' ( 52)  |011010                                       1a  [ 6]
-'5' ( 53)  |011011                                       1b  [ 6]
-'6' ( 54)  |011100                                       1c  [ 6]
-'7' ( 55)  |011101                                       1d  [ 6]
-'8' ( 56)  |011110                                       1e  [ 6]
-'9' ( 57)  |011111                                       1f  [ 6]
-':' ( 58)  |1011100                                      5c  [ 7]
-';' ( 59)  |11111011                                     fb  [ 8]
-'<' ( 60)  |11111111|1111100                           7ffc  [15]
-'=' ( 61)  |100000                                       20  [ 6]
-'>' ( 62)  |11111111|1011                               ffb  [12]
-'?' ( 63)  |11111111|00                                 3fc  [10]
-'@' ( 64)  |11111111|11010                             1ffa  [13]
-'A' ( 65)  |100001                                       21  [ 6]
-'B' ( 66)  |1011101                                      5d  [ 7]
-'C' ( 67)  |1011110                                      5e  [ 7]
-'D' ( 68)  |1011111                                      5f  [ 7]
-'E' ( 69)  |1100000                                      60  [ 7]
-'F' ( 70)  |1100001                                      61  [ 7]
-'G' ( 71)  |1100010                                      62  [ 7]
-'H' ( 72)  |1100011                                      63  [ 7]
-'I' ( 73)  |1100100                                      64  [ 7]
-'J' ( 74)  |1100101                                      65  [ 7]
-'K' ( 75)  |1100110                                      66  [ 7]
-'L' ( 76)  |1100111                                      67  [ 7]
-'M' ( 77)  |1101000                                      68  [ 7]
-'N' ( 78)  |1101001                                      69  [ 7]
-'O' ( 79)  |1101010                                      6a  [ 7]
-'P' ( 80)  |1101011                                      6b  [ 7]
-'Q' ( 81)  |1101100                                      6c  [ 7]
-'R' ( 82)  |1101101                                      6d  [ 7]
-'S' ( 83)  |1101110                                      6e  [ 7]
-'T' ( 84)  |1101111                                      6f  [ 7]
-'U' ( 85)  |1110000                                      70  [ 7]
-'V' ( 86)  |1110001                                      71  [ 7]
-'W' ( 87)  |1110010                                      72  [ 7]
-'X' ( 88)  |11111100                                     fc  [ 8]
-'Y' ( 89)  |1110011                                      73  [ 7]
-'Z' ( 90)  |11111101                                     fd  [ 8]
-'[' ( 91)  |11111111|11011                             1ffb  [13]
-'\' ( 92)  |11111111|11111110|000                     7fff0  [19]
-']' ( 93)  |11111111|11100                             1ffc  [13]
-'^' ( 94)  |11111111|111100                            3ffc  [14]
-'_' ( 95)  |100010                                       22  [ 6]
-'`' ( 96)  |11111111|1111101                           7ffd  [15]
-'a' ( 97)  |00011                                         3  [ 5]
-'b' ( 98)  |100011                                       23  [ 6]
-'c' ( 99)  |00100                                         4  [ 5]
-'d' (100)  |100100                                       24  [ 6]
-'e' (101)  |00101                                         5  [ 5]
-'f' (102)  |100101                                       25  [ 6]
-'g' (103)  |100110                                       26  [ 6]
-'h' (104)  |100111                                       27  [ 6]
-'i' (105)  |00110                                         6  [ 5]
-'j' (106)  |1110100                                      74  [ 7]
-'k' (107)  |1110101                                      75  [ 7]
-'l' (108)  |101000                                       28  [ 6]
-'m' (109)  |101001                                       29  [ 6]
-'n' (110)  |101010                                       2a  [ 6]
-'o' (111)  |00111                                         7  [ 5]
-'p' (112)  |101011                                       2b  [ 6]
-'q' (113)  |1110110                                      76  [ 7]
-'r' (114)  |101100                                       2c  [ 6]
-'s' (115)  |01000                                         8  [ 5]
-'t' (116)  |01001                                         9  [ 5]
-'u' (117)  |101101                                       2d  [ 6]
-'v' (118)  |1110111                                      77  [ 7]
-'w' (119)  |1111000                                      78  [ 7]
-'x' (120)  |1111001                                      79  [ 7]
-'y' (121)  |1111010                                      7a  [ 7]
-'z' (122)  |1111011                                      7b  [ 7]
-'{' (123)  |11111111|1111110                           7ffe  [15]
-'|' (124)  |11111111|100                                7fc  [11]
-'}' (125)  |11111111|111101                            3ffd  [14]
-'~' (126)  |11111111|11101                             1ffd  [13]
-    (127)  |11111111|11111111|11111111|1100         ffffffc  [28]
-    (128)  |11111111|11111110|0110                    fffe6  [20]
-    (129)  |11111111|11111111|010010                 3fffd2  [22]
-    (130)  |11111111|11111110|0111                    fffe7  [20]
-    (131)  |11111111|11111110|1000                    fffe8  [20]
-    (132)  |11111111|11111111|010011                 3fffd3  [22]
-    (133)  |11111111|11111111|010100                 3fffd4  [22]
-    (134)  |11111111|11111111|010101                 3fffd5  [22]
-    (135)  |11111111|11111111|1011001                7fffd9  [23]
-    (136)  |11111111|11111111|010110                 3fffd6  [22]
-    (137)  |11111111|11111111|1011010                7fffda  [23]
-    (138)  |11111111|11111111|1011011                7fffdb  [23]
-    (139)  |11111111|11111111|1011100                7fffdc  [23]
-    (140)  |11111111|11111111|1011101                7fffdd  [23]
-    (141)  |11111111|11111111|1011110                7fffde  [23]
-    (142)  |11111111|11111111|11101011               ffffeb  [24]
-    (143)  |11111111|11111111|1011111                7fffdf  [23]
-    (144)  |11111111|11111111|11101100               ffffec  [24]
-    (145)  |11111111|11111111|11101101               ffffed  [24]
-    (146)  |11111111|11111111|010111                 3fffd7  [22]
-    (147)  |11111111|11111111|1100000                7fffe0  [23]
-    (148)  |11111111|11111111|11101110               ffffee  [24]
-    (149)  |11111111|11111111|1100001                7fffe1  [23]
-    (150)  |11111111|11111111|1100010                7fffe2  [23]
-    (151)  |11111111|11111111|1100011                7fffe3  [23]
-    (152)  |11111111|11111111|1100100                7fffe4  [23]
-    (153)  |11111111|11111110|11100                  1fffdc  [21]
-    (154)  |11111111|11111111|011000                 3fffd8  [22]
-    (155)  |11111111|11111111|1100101                7fffe5  [23]
-    (156)  |11111111|11111111|011001                 3fffd9  [22]
-    (157)  |11111111|11111111|1100110                7fffe6  [23]
-    (158)  |11111111|11111111|1100111                7fffe7  [23]
-    (159)  |11111111|11111111|11101111               ffffef  [24]
-    (160)  |11111111|11111111|011010                 3fffda  [22]
-    (161)  |11111111|11111110|11101                  1fffdd  [21]
-    (162)  |11111111|11111110|1001                    fffe9  [20]
-    (163)  |11111111|11111111|011011                 3fffdb  [22]
-    (164)  |11111111|11111111|011100                 3fffdc  [22]
-    (165)  |11111111|11111111|1101000                7fffe8  [23]
-    (166)  |11111111|11111111|1101001                7fffe9  [23]
-    (167)  |11111111|11111110|11110                  1fffde  [21]
-    (168)  |11111111|11111111|1101010                7fffea  [23]
-    (169)  |11111111|11111111|011101                 3fffdd  [22]
-    (170)  |11111111|11111111|011110                 3fffde  [22]
-    (171)  |11111111|11111111|11110000               fffff0  [24]
-    (172)  |11111111|11111110|11111                  1fffdf  [21]
-    (173)  |11111111|11111111|011111                 3fffdf  [22]
-    (174)  |11111111|11111111|1101011                7fffeb  [23]
-    (175)  |11111111|11111111|1101100                7fffec  [23]
-    (176)  |11111111|11111111|00000                  1fffe0  [21]
-    (177)  |11111111|11111111|00001                  1fffe1  [21]
-    (178)  |11111111|11111111|100000                 3fffe0  [22]
-    (179)  |11111111|11111111|00010                  1fffe2  [21]
-    (180)  |11111111|11111111|1101101                7fffed  [23]
-    (181)  |11111111|11111111|100001                 3fffe1  [22]
-    (182)  |11111111|11111111|1101110                7fffee  [23]
-    (183)  |11111111|11111111|1101111                7fffef  [23]
-    (184)  |11111111|11111110|1010                    fffea  [20]
-    (185)  |11111111|11111111|100010                 3fffe2  [22]
-    (186)  |11111111|11111111|100011                 3fffe3  [22]
-    (187)  |11111111|11111111|100100                 3fffe4  [22]
-    (188)  |11111111|11111111|1110000                7ffff0  [23]
-    (189)  |11111111|11111111|100101                 3fffe5  [22]
-    (190)  |11111111|11111111|100110                 3fffe6  [22]
-    (191)  |11111111|11111111|1110001                7ffff1  [23]
-    (192)  |11111111|11111111|11111000|00           3ffffe0  [26]
-    (193)  |11111111|11111111|11111000|01           3ffffe1  [26]
-    (194)  |11111111|11111110|1011                    fffeb  [20]
-    (195)  |11111111|11111110|001                     7fff1  [19]
-    (196)  |11111111|11111111|100111                 3fffe7  [22]
-    (197)  |11111111|11111111|1110010                7ffff2  [23]
-    (198)  |11111111|11111111|101000                 3fffe8  [22]
-    (199)  |11111111|11111111|11110110|0            1ffffec  [25]
-    (200)  |11111111|11111111|11111000|10           3ffffe2  [26]
-    (201)  |11111111|11111111|11111000|11           3ffffe3  [26]
-    (202)  |11111111|11111111|11111001|00           3ffffe4  [26]
-    (203)  |11111111|11111111|11111011|110          7ffffde  [27]
-    (204)  |11111111|11111111|11111011|111          7ffffdf  [27]
-    (205)  |11111111|11111111|11111001|01           3ffffe5  [26]
-    (206)  |11111111|11111111|11110001               fffff1  [24]
-    (207)  |11111111|11111111|11110110|1            1ffffed  [25]
-    (208)  |11111111|11111110|010                     7fff2  [19]
-    (209)  |11111111|11111111|00011                  1fffe3  [21]
-    (210)  |11111111|11111111|11111001|10           3ffffe6  [26]
-    (211)  |11111111|11111111|11111100|000          7ffffe0  [27]
-    (212)  |11111111|11111111|11111100|001          7ffffe1  [27]
-    (213)  |11111111|11111111|11111001|11           3ffffe7  [26]
-    (214)  |11111111|11111111|11111100|010          7ffffe2  [27]
-    (215)  |11111111|11111111|11110010               fffff2  [24]
-    (216)  |11111111|11111111|00100                  1fffe4  [21]
-    (217)  |11111111|11111111|00101                  1fffe5  [21]
-    (218)  |11111111|11111111|11111010|00           3ffffe8  [26]
-    (219)  |11111111|11111111|11111010|01           3ffffe9  [26]
-    (220)  |11111111|11111111|11111111|1101         ffffffd  [28]
-    (221)  |11111111|11111111|11111100|011          7ffffe3  [27]
-    (222)  |11111111|11111111|11111100|100          7ffffe4  [27]
-    (223)  |11111111|11111111|11111100|101          7ffffe5  [27]
-    (224)  |11111111|11111110|1100                    fffec  [20]
-    (225)  |11111111|11111111|11110011               fffff3  [24]
-    (226)  |11111111|11111110|1101                    fffed  [20]
-    (227)  |11111111|11111111|00110                  1fffe6  [21]
-    (228)  |11111111|11111111|101001                 3fffe9  [22]
-    (229)  |11111111|11111111|00111                  1fffe7  [21]
-    (230)  |11111111|11111111|01000                  1fffe8  [21]
-    (231)  |11111111|11111111|1110011                7ffff3  [23]
-    (232)  |11111111|11111111|101010                 3fffea  [22]
-    (233)  |11111111|11111111|101011                 3fffeb  [22]
-    (234)  |11111111|11111111|11110111|0            1ffffee  [25]
-    (235)  |11111111|11111111|11110111|1            1ffffef  [25]
-    (236)  |11111111|11111111|11110100               fffff4  [24]
-    (237)  |11111111|11111111|11110101               fffff5  [24]
-    (238)  |11111111|11111111|11111010|10           3ffffea  [26]
-    (239)  |11111111|11111111|1110100                7ffff4  [23]
-    (240)  |11111111|11111111|11111010|11           3ffffeb  [26]
-    (241)  |11111111|11111111|11111100|110          7ffffe6  [27]
-    (242)  |11111111|11111111|11111011|00           3ffffec  [26]
-    (243)  |11111111|11111111|11111011|01           3ffffed  [26]
-    (244)  |11111111|11111111|11111100|111          7ffffe7  [27]
-    (245)  |11111111|11111111|11111101|000          7ffffe8  [27]
-    (246)  |11111111|11111111|11111101|001          7ffffe9  [27]
-    (247)  |11111111|11111111|11111101|010          7ffffea  [27]
-    (248)  |11111111|11111111|11111101|011          7ffffeb  [27]
-    (249)  |11111111|11111111|11111111|1110         ffffffe  [28]
-    (250)  |11111111|11111111|11111101|100          7ffffec  [27]
-    (251)  |11111111|11111111|11111101|101          7ffffed  [27]
-    (252)  |11111111|11111111|11111101|110          7ffffee  [27]
-    (253)  |11111111|11111111|11111101|111          7ffffef  [27]
-    (254)  |11111111|11111111|11111110|000          7fffff0  [27]
-    (255)  |11111111|11111111|11111011|10           3ffffee  [26]
-EOS (256)  |11111111|11111111|11111111|111111      3fffffff  [30]
-"""
-
-class Node:
-
-    def __init__(self, term = None):
-        self.term = term
-        self.left = None
-        self.right = None
-        self.trans = []
-        self.id = None
-        self.accept = False
-
-class Context:
-
-    def __init__(self):
-        self.next_id_ = 0
-        self.root = Node()
-
-    def next_id(self):
-        id = self.next_id_
-        self.next_id_ += 1
-        return id
-
-def _add(node, sym, bits):
-    if len(bits) == 0:
-        node.term = sym
-        return
-    else:
-        if bits[0] == '0':
-            if node.left is None:
-                node.left = Node()
-            child = node.left
-        else:
-            if node.right is None:
-                node.right = Node()
-            child = node.right
-        _add(child, sym, bits[1:])
-
-def huffman_tree_add(ctx, sym, bits):
-    _add(ctx.root, sym, bits)
-
-def _set_node_id(ctx, node, prefix):
-    if node.term is not None:
-        return
-    if len(prefix) <= 7 and [1] * len(prefix) == prefix:
-        node.accept = True
-    node.id = ctx.next_id()
-    _set_node_id(ctx, node.left, prefix + [0])
-    _set_node_id(ctx, node.right, prefix + [1])
-
-def huffman_tree_set_node_id(ctx):
-    _set_node_id(ctx, ctx.root, [])
-
-def _traverse(node, sym, start_node, root, left):
-    if left == 0:
-        if sym == 256:
-            sym = None
-            node = None
-        start_node.trans.append((node, sym))
-        return
-
-    if node.term is not None:
-        node = root
-
-    def go(node):
-        if node.term is not None:
-            assert sym is None
-            nsym = node.term
-        else:
-            nsym = sym
-
-        _traverse(node, nsym, start_node, root, left - 1)
-
-    go(node.left)
-    go(node.right)
-
-def _build_transition_table(ctx, node):
-    if node is None:
-        return
-    _traverse(node, None, node, ctx.root, 4)
-    _build_transition_table(ctx, node.left)
-    _build_transition_table(ctx, node.right)
-
-def huffman_tree_build_transition_table(ctx):
-    _build_transition_table(ctx, ctx.root)
-
-NGHTTP2_HUFF_ACCEPTED = 1
-NGHTTP2_HUFF_SYM = 1 << 1
-NGHTTP2_HUFF_FAIL = 1 << 2
-
-def _print_transition_table(node):
-    if node.term is not None:
-        return
-    print '/* {} */'.format(node.id)
-    print '{'
-    for nd, sym in node.trans:
-        flags = 0
-        if sym is None:
-            out = 0
-        else:
-            out = sym
-            flags |= NGHTTP2_HUFF_SYM
-        if nd is None:
-            id = 0
-            flags |= NGHTTP2_HUFF_FAIL
-        else:
-            id = nd.id
-            if id is None:
-                # if nd.id is None, it is a leaf node
-                id = 0
-                flags |= NGHTTP2_HUFF_ACCEPTED
-            elif nd.accept:
-                flags |= NGHTTP2_HUFF_ACCEPTED
-        print '  {{{}, 0x{:02x}, {}}},'.format(id, flags, out)
-    print '},'
-    _print_transition_table(node.left)
-    _print_transition_table(node.right)
-
-def huffman_tree_print_transition_table(ctx):
-    _print_transition_table(ctx.root)
-
-if __name__ == '__main__':
-    ctx = Context()
-    symbol_tbl = [(None, 0) for i in range(257)]
-
-    for line in StringIO.StringIO(HUFFMAN_CODE_TABLE):
-        m = re.match(
-            r'.*\(\s*(\d+)\)\s+([|01]+)\s+(\S+)\s+\[\s*(\d+)\].*', line)
-        if m:
-            sym = int(m.group(1))
-            bits = re.sub(r'\|', '', m.group(2))
-            code = m.group(3)
-            nbits = int(m.group(4))
-            if len(code) > 8:
-                raise Error('Code is more than 4 bytes long')
-            assert(len(bits) == nbits)
-            symbol_tbl[sym] = (nbits, code)
-            huffman_tree_add(ctx, sym, bits)
-
-    huffman_tree_set_node_id(ctx)
-    huffman_tree_build_transition_table(ctx)
-
-    print '''\
-typedef struct {
-  uint32_t nbits;
-  uint32_t code;
-} nghttp2_huff_sym;
-'''
-
-    print '''\
-const nghttp2_huff_sym huff_sym_table[] = {'''
-    for i in range(257):
-        print '''\
-  {{ {}, 0x{}u }}{}\
-'''.format(symbol_tbl[i][0], symbol_tbl[i][1], ',' if i < 256 else '')
-    print '};'
-    print ''
-
-    print '''\
-enum {{
-  NGHTTP2_HUFF_ACCEPTED = {},
-  NGHTTP2_HUFF_SYM = {},
-  NGHTTP2_HUFF_FAIL = {},
-}} nghttp2_huff_decode_flag;
-'''.format(NGHTTP2_HUFF_ACCEPTED, NGHTTP2_HUFF_SYM, NGHTTP2_HUFF_FAIL)
-
-    print '''\
-typedef struct {
-  uint8_t state;
-  uint8_t flags;
-  uint8_t sym;
-} nghttp2_huff_decode;
-'''
-
-    print '''\
-const nghttp2_huff_decode huff_decode_table[][16] = {'''
-    huffman_tree_print_transition_table(ctx)
-    print '};'
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/mkstatichdtbl.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/mkstatichdtbl.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/mkstatichdtbl.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/mkstatichdtbl.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# This scripts reads static table entries [1] and generates
-# nghttp2_hd_static_entry table.  This table is used in
-# lib/nghttp2_hd.c.
-#
-# [1] http://http2.github.io/http2-spec/compression.html
-
-from __future__ import unicode_literals
-import re, sys
-
-def hd_map_hash(name):
-  h = 2166136261
-
-  # FNV hash variant: http://isthe.com/chongo/tech/comp/fnv/
-  for c in name:
-    h ^= ord(c)
-    h *= 16777619
-    h &= 0xffffffff
-
-  return h
-
-entries = []
-for line in sys.stdin:
-    m = re.match(r'(\d+)\s+(\S+)\s+(\S.*)?', line)
-    val = m.group(3).strip() if m.group(3) else ''
-    entries.append((int(m.group(1)), m.group(2), val))
-
-print 'static nghttp2_hd_entry static_table[] = {'
-idx = 0
-for i, ent in enumerate(entries):
-    if entries[idx][1] != ent[1]:
-        idx = i
-    print 'MAKE_STATIC_ENT("{}", "{}", {}, {}u),'\
-        .format(ent[1], ent[2], entries[idx][0] - 1, hd_map_hash(ent[1]))
-print '};'
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/nghttpx.conf.sample cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/nghttpx.conf.sample
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/nghttpx.conf.sample	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/nghttpx.conf.sample	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#
-# Sample configuration file for nghttpx.
-#
-# * Line staring '#' is treated as comment.
-#
-# * The option name in the configuration file is the long command-line
-#   option name with leading '--' stripped (e.g., frontend). Put '='
-#   between option name and value. Don't put extra leading or trailing
-#   spaces.
-#
-# * The options which do not take argument in the command-line *take*
-#   argument in the configuration file. Specify 'yes' as argument
-#   (e.g., http2-proxy=yes). If other string is given, it disables the
-#   option.
-#
-# * To specify private key and certificate file, use private-key-file
-#   and certificate-file. See the examples below.
-#
-# * conf option cannot be used in the configuration file. It will be
-#   ignored.
-#
-# Examples:
-#
-# frontend=0.0.0.0,3000
-# backend=127.0.0.1,80
-# private-key-file=/path/to/server.key
-# certificate-file=/path/to/server.crt
-# http2-proxy=no
-# workers=1
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/pre-commit cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/pre-commit
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/pre-commit	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/pre-commit	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-
-CLANGFORMATDIFF=`git config --get clangformatdiff.binary`
-
-if [ -z "$CLANGFORMATDIFF" ]; then
-    CLANGFORMATDIFF=clang-format-diff.py
-fi
-
-errors=`git diff-index --cached --diff-filter=ACMR -p HEAD lib src examples tests | $CLANGFORMATDIFF -p1`
-
-if [ -n "$errors" ]; then
-    echo "$errors"
-    echo "--"
-    echo "[ERROR] We have detected the difference between the code to commit"
-    echo "and clang-format style rules.  Please fix this problem in either:"
-    echo "1) Apply patch above."
-    echo "2) Use clang-format to format lines."
-    echo "3) Reformat these lines manually."
-    echo "Aborting commit."
-    exit 1
-fi
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/proxy.pac.sample cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/proxy.pac.sample
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/proxy.pac.sample	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/proxy.pac.sample	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-function FindProxyForURL(url, host) {
-  // For SPDY proxy
-  return "HTTPS localhost:3000";
-  // For conventional HTTP proxy
-  // return "PROXY localhost:3000";
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/calcratio.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/calcratio.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/calcratio.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/calcratio.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#!/usr/bin/env python
-#
-# This script takes directories which contain the hpack-test-case json
-# files, and calculates the compression ratio in each file and outputs
-# the result in table formatted in rst.
-#
-# The each directory contains the result of various HPACK compressor.
-#
-# The table is laid out so that we can see that how input header set
-# in one json file is compressed in each compressor.
-#
-# For hpack-test-case, see https://github.com/Jxck/hpack-test-case
-#
-import sys, json, os, re
-
-class Stat:
-
-    def __init__(self, complen, srclen):
-        self.complen = complen
-        self.srclen = srclen
-
-def compute_stat(jsdata):
-    complen = 0
-    srclen = 0
-    for item in jsdata['cases']:
-        complen += len(item['wire']) // 2
-        srclen += \
-                  sum([len(list(x.keys())[0]) + len(list(x.values())[0]) \
-                       for x in item['headers']])
-    return Stat(complen, srclen)
-
-def format_result(r):
-    return '{:.02f} ({}/{}) '.format(r.complen/r.srclen, r.complen, r.srclen)
-
-if __name__ == '__main__':
-    entries = [(os.path.basename(re.sub(r'/+$', '', p)), p) \
-               for p in sys.argv[1:]]
-    maxnamelen = 0
-    maxstorynamelen = 0
-    res = {}
-
-    stories = set()
-    for name, ent in entries:
-        files = [p for p in os.listdir(ent) if p.endswith('.json')]
-        res[name] = {}
-        maxnamelen = max(maxnamelen, len(name))
-        for fn in files:
-            stories.add(fn)
-            maxstorynamelen = max(maxstorynamelen, len(fn))
-            with open(os.path.join(ent, fn)) as f:
-                input = f.read()
-            rv = compute_stat(json.loads(input))
-            res[name][fn] = rv
-            maxnamelen = max(maxnamelen, len(format_result(rv)))
-    stories = list(stories)
-    stories.sort()
-
-    storynameformat = '{{:{}}} '.format(maxstorynamelen)
-    nameformat = '{{:{}}} '.format(maxnamelen)
-
-
-    sys.stdout.write('''\
-hpack-test-case compression ratio
-=================================
-
-The each cell has ``X (Y/Z)`` format:
-
-X
-  Y / Z
-Y
-  number of bytes after compression
-Z
-  number of bytes before compression
-
-''')
-
-    def write_border():
-        sys.stdout.write('='*maxstorynamelen)
-        sys.stdout.write(' ')
-        for _ in entries:
-            sys.stdout.write('='*maxnamelen)
-            sys.stdout.write(' ')
-        sys.stdout.write('\n')
-
-    write_border()
-
-    sys.stdout.write(storynameformat.format('story'))
-    for name, _ in entries:
-        sys.stdout.write(nameformat.format(name))
-    sys.stdout.write('\n')
-
-    write_border()
-
-    for story in stories:
-        sys.stdout.write(storynameformat.format(story))
-        srclen = -1
-        for name, _ in entries:
-            stats = res[name]
-            if story not in stats:
-                sys.stdout.write(nameformat.format('N/A'))
-                continue
-            if srclen == -1:
-                srclen = stats[story].srclen
-            elif srclen != stats[story].srclen:
-                raise Exception('Bad srclen')
-            sys.stdout.write(nameformat.format(format_result(stats[story])))
-        sys.stdout.write('\n')
-
-    write_border()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-# EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
-
-if(ENABLE_PYTHON_BINDINGS)
-  add_custom_target(python ALL
-    COMMAND "${PYTHON_EXECUTABLE}" setup.py build
-    VERBATIM
-    DEPENDS nghttp2.c nghttp2
-  )
-
-  configure_file(install-python.cmake.in install-python.cmake ESCAPE_QUOTES @ONLY)
-  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-python.cmake")
-
-  add_custom_command(OUTPUT nghttp2.c
-    COMMAND "${CYTHON_EXECUTABLE}" -o nghttp2.c
-      "${CMAKE_CURRENT_SOURCE_DIR}/nghttp2.pyx"
-    VERBATIM
-    DEPENDS nghttp2.pyx
-  )
-
-  # Instead of calling "setup.py clean --all", this should do...
-  set_directory_properties(PROPERTIES
-    ADDITIONAL_MAKE_CLEAN_FILES "build;python_nghttp2.egg-info"
-  )
-
-## This works also, except that the installation target is missing...
-#  include(UseCython)
-#  cython_add_module(python_nghttp2 nghttp2.pyx)
-#  set_target_properties(python_nghttp2 PROPERTIES
-#    OUTPUT_NAME nghttp2
-#  )
-#  target_include_directories(python_nghttp2 PRIVATE
-#    "${CMAKE_SOURCE_DIR}/lib"
-#    "${CMAKE_SOURCE_DIR}/lib/includes"
-#    "${CMAKE_BINARY_DIR}/lib/includes"
-#  )
-#  target_link_libraries(python_nghttp2
-#    nghttp2
-#  )
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/cnghttp2.pxd cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/cnghttp2.pxd
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/cnghttp2.pxd	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/cnghttp2.pxd	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, int32_t
-
-cdef extern from 'nghttp2/nghttp2.h':
-
-    const char NGHTTP2_PROTO_VERSION_ID[]
-    const char NGHTTP2_CLIENT_CONNECTION_PREFACE[]
-    const size_t NGHTTP2_INITIAL_WINDOW_SIZE
-    const size_t NGHTTP2_DEFAULT_HEADER_TABLE_SIZE
-
-    ctypedef struct nghttp2_session:
-        pass
-
-    ctypedef enum nghttp2_error:
-        NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE
-        NGHTTP2_ERR_DEFERRED
-
-    ctypedef enum nghttp2_flag:
-        NGHTTP2_FLAG_NONE
-        NGHTTP2_FLAG_END_STREAM
-        NGHTTP2_FLAG_ACK
-
-    ctypedef enum nghttp2_error_code:
-        NGHTTP2_NO_ERROR
-        NGHTTP2_PROTOCOL_ERROR
-        NGHTTP2_INTERNAL_ERROR
-        NGHTTP2_SETTINGS_TIMEOUT
-
-    ctypedef enum nghttp2_frame_type:
-        NGHTTP2_DATA
-        NGHTTP2_HEADERS
-        NGHTTP2_RST_STREAM
-        NGHTTP2_SETTINGS
-        NGHTTP2_PUSH_PROMISE
-        NGHTTP2_GOAWAY
-
-    ctypedef enum nghttp2_nv_flag:
-        NGHTTP2_NV_FLAG_NONE
-        NGHTTP2_NV_FLAG_NO_INDEX
-
-    ctypedef struct nghttp2_nv:
-        uint8_t *name
-        uint8_t *value
-        uint16_t namelen
-        uint16_t valuelen
-        uint8_t flags
-
-    ctypedef enum nghttp2_settings_id:
-        SETTINGS_HEADER_TABLE_SIZE
-        NGHTTP2_SETTINGS_HEADER_TABLE_SIZE
-        NGHTTP2_SETTINGS_ENABLE_PUSH
-        NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS
-        NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE
-
-    ctypedef struct nghttp2_settings_entry:
-        int32_t settings_id
-        uint32_t value
-
-    ctypedef struct nghttp2_frame_hd:
-        size_t length
-        int32_t stream_id
-        uint8_t type
-        uint8_t flags
-
-    ctypedef struct nghttp2_data:
-        nghttp2_frame_hd hd
-        size_t padlen
-
-    ctypedef enum nghttp2_headers_category:
-        NGHTTP2_HCAT_REQUEST
-        NGHTTP2_HCAT_RESPONSE
-        NGHTTP2_HCAT_PUSH_RESPONSE
-        NGHTTP2_HCAT_HEADERS
-
-    ctypedef struct nghttp2_headers:
-        nghttp2_frame_hd hd
-        size_t padlen
-        nghttp2_nv *nva
-        size_t nvlen
-        nghttp2_headers_category cat
-        int32_t pri
-
-    ctypedef struct nghttp2_rst_stream:
-        nghttp2_frame_hd hd
-        uint32_t error_code
-
-
-    ctypedef struct nghttp2_push_promise:
-        nghttp2_frame_hd hd
-        nghttp2_nv *nva
-        size_t nvlen
-        int32_t promised_stream_id
-
-    ctypedef struct nghttp2_goaway:
-        nghttp2_frame_hd hd
-        int32_t last_stream_id
-        uint32_t error_code
-        uint8_t *opaque_data
-        size_t opaque_data_len
-
-    ctypedef union nghttp2_frame:
-        nghttp2_frame_hd hd
-        nghttp2_data data
-        nghttp2_headers headers
-        nghttp2_rst_stream rst_stream
-        nghttp2_push_promise push_promise
-        nghttp2_goaway goaway
-
-    ctypedef ssize_t (*nghttp2_send_callback)\
-        (nghttp2_session *session, const uint8_t *data, size_t length,
-         int flags, void *user_data)
-
-    ctypedef int (*nghttp2_on_frame_recv_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_data_chunk_recv_callback)\
-        (nghttp2_session *session, uint8_t flags, int32_t stream_id,
-         const uint8_t *data, size_t length, void *user_data)
-
-    ctypedef int (*nghttp2_before_frame_send_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_stream_close_callback)\
-        (nghttp2_session *session, int32_t stream_id,
-         uint32_t error_code, void *user_data)
-
-    ctypedef int (*nghttp2_on_begin_headers_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_header_callback)\
-        (nghttp2_session *session,
-         const nghttp2_frame *frame,
-         const uint8_t *name, size_t namelen,
-         const uint8_t *value, size_t valuelen,
-         uint8_t flags,
-         void *user_data)
-
-    ctypedef int (*nghttp2_on_frame_send_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-
-    ctypedef int (*nghttp2_on_frame_not_send_callback)\
-        (nghttp2_session *session, const nghttp2_frame *frame,
-         int lib_error_code, void *user_data)
-
-    ctypedef struct nghttp2_session_callbacks:
-        pass
-
-    int nghttp2_session_callbacks_new(
-        nghttp2_session_callbacks **callbacks_ptr)
-
-    void nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks)
-
-    void nghttp2_session_callbacks_set_send_callback(
-        nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback)
-
-    void nghttp2_session_callbacks_set_on_frame_recv_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_frame_recv_callback on_frame_recv_callback)
-
-    void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback)
-
-    void nghttp2_session_callbacks_set_before_frame_send_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_before_frame_send_callback before_frame_send_callback)
-
-    void nghttp2_session_callbacks_set_on_frame_send_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_frame_send_callback on_frame_send_callback)
-
-    void nghttp2_session_callbacks_set_on_frame_not_send_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_frame_not_send_callback on_frame_not_send_callback)
-
-    void nghttp2_session_callbacks_set_on_stream_close_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_stream_close_callback on_stream_close_callback)
-
-    void nghttp2_session_callbacks_set_on_begin_headers_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_begin_headers_callback on_begin_headers_callback)
-
-    void nghttp2_session_callbacks_set_on_header_callback(
-        nghttp2_session_callbacks *cbs,
-        nghttp2_on_header_callback on_header_callback)
-
-    int nghttp2_session_client_new(nghttp2_session **session_ptr,
-                                   const nghttp2_session_callbacks *callbacks,
-                                   void *user_data)
-
-    int nghttp2_session_server_new(nghttp2_session **session_ptr,
-                                   const nghttp2_session_callbacks *callbacks,
-                                   void *user_data)
-
-    void nghttp2_session_del(nghttp2_session *session)
-
-
-    ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
-                                     const uint8_t *data, size_t datalen)
-
-    ssize_t nghttp2_session_mem_send(nghttp2_session *session,
-                                     const uint8_t **data_ptr)
-
-    int nghttp2_session_send(nghttp2_session *session)
-
-    int nghttp2_session_want_read(nghttp2_session *session)
-
-    int nghttp2_session_want_write(nghttp2_session *session)
-
-    ctypedef union nghttp2_data_source:
-        int fd
-        void *ptr
-
-    ctypedef enum nghttp2_data_flag:
-        NGHTTP2_DATA_FLAG_NONE
-        NGHTTP2_DATA_FLAG_EOF
-
-    ctypedef ssize_t (*nghttp2_data_source_read_callback)\
-        (nghttp2_session *session, int32_t stream_id,
-         uint8_t *buf, size_t length, uint32_t *data_flags,
-         nghttp2_data_source *source, void *user_data)
-
-    ctypedef struct nghttp2_data_provider:
-        nghttp2_data_source source
-        nghttp2_data_source_read_callback read_callback
-
-    ctypedef struct nghttp2_priority_spec:
-        int32_t stream_id
-        int32_t weight
-        uint8_t exclusive
-
-    int nghttp2_submit_request(nghttp2_session *session, const nghttp2_priority_spec *pri_spec,
-                               const nghttp2_nv *nva, size_t nvlen,
-                               const nghttp2_data_provider *data_prd,
-                               void *stream_user_data)
-
-    int nghttp2_submit_response(nghttp2_session *session,
-                                int32_t stream_id,
-                                const nghttp2_nv *nva, size_t nvlen,
-                                const nghttp2_data_provider *data_prd)
-
-    int nghttp2_submit_push_promise(nghttp2_session *session, uint8_t flags,
-                                    int32_t stream_id,
-                                    const nghttp2_nv *nva, size_t nvlen,
-                                    void *stream_user_data)
-
-    int nghttp2_submit_settings(nghttp2_session *session, uint8_t flags,
-                                const nghttp2_settings_entry *iv, size_t niv)
-
-    int nghttp2_submit_rst_stream(nghttp2_session *session, uint8_t flags,
-                                  int32_t stream_id,
-                                  uint32_t error_code)
-
-    void* nghttp2_session_get_stream_user_data(nghttp2_session *session,
-                                               uint32_t stream_id)
-
-    int nghttp2_session_set_stream_user_data(nghttp2_session *session,
-                                             uint32_t stream_id,
-                                             void *stream_user_data)
-
-    int nghttp2_session_terminate_session(nghttp2_session *session,
-                                          uint32_t error_code)
-
-    int nghttp2_session_resume_data(nghttp2_session *session,
-                                    int32_t stream_id)
-
-    const char* nghttp2_strerror(int lib_error_code)
-
-    int nghttp2_session_check_server_session(nghttp2_session *session)
-
-    int nghttp2_session_get_stream_remote_close(nghttp2_session *session, int32_t stream_id)
-
-    int nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
-                               size_t deflate_hd_table_bufsize_max)
-
-    void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater)
-
-    int nghttp2_hd_deflate_change_table_size(nghttp2_hd_deflater *deflater,
-                                             size_t hd_table_bufsize_max)
-
-    ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
-                                  uint8_t *buf, size_t buflen,
-                                  const nghttp2_nv *nva, size_t nvlen)
-
-    size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
-                                    const nghttp2_nv *nva, size_t nvlen)
-
-    int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr)
-
-    void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater)
-
-    int nghttp2_hd_inflate_change_table_size(nghttp2_hd_inflater *inflater,
-                                             size_t hd_table_bufsize_max)
-
-    ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
-                                   nghttp2_nv *nv_out, int *inflate_flags,
-                                   const uint8_t *input, size_t inlen,
-                                   int in_final)
-
-    int nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater)
-
-    ctypedef enum nghttp2_hd_inflate_flag:
-        NGHTTP2_HD_INFLATE_EMIT
-        NGHTTP2_HD_INFLATE_FINAL
-
-    ctypedef struct nghttp2_hd_deflater:
-        pass
-
-    ctypedef struct nghttp2_hd_inflater:
-        pass
-
-    size_t nghttp2_hd_deflate_get_num_table_entries(nghttp2_hd_deflater *deflater)
-
-    const nghttp2_nv * nghttp2_hd_deflate_get_table_entry(nghttp2_hd_deflater *deflater, size_t idx)
-
-    size_t nghttp2_hd_inflate_get_num_table_entries(nghttp2_hd_inflater *inflater)
-
-    const nghttp2_nv *nghttp2_hd_inflate_get_table_entry(nghttp2_hd_inflater *inflater, size_t idx)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/hpackcheck.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/hpackcheck.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/hpackcheck.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/hpackcheck.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-#
-# This script reads json files given in the command-line (each file
-# must be written in the format described in
-# https://github.com/Jxck/hpack-test-case). And then it decompresses
-# the sequence of encoded header blocks (which is the value of 'wire'
-# key) and checks that decompressed header set is equal to the input
-# header set (which is the value of 'headers' key). If there is
-# mismatch, exception will be raised.
-#
-import sys, json
-from binascii import a2b_hex
-import nghttp2
-
-def testsuite(testdata):
-    inflater = nghttp2.HDInflater()
-
-    for casenum, item  in enumerate(testdata['cases']):
-        if 'header_table_size' in item:
-            hd_table_size = int(item['header_table_size'])
-            inflater.change_table_size(hd_table_size)
-        compressed = a2b_hex(item['wire'])
-        # sys.stderr.write('#{} WIRE:\n{}\n'.format(casenum+1, item['wire']))
-        # TODO decompressed headers are not necessarily UTF-8 strings
-        hdrs = [(k.decode('utf-8'), v.decode('utf-8')) \
-                for k, v in inflater.inflate(compressed)]
-
-        expected_hdrs = [(list(x.keys())[0],
-                          list(x.values())[0]) for x in item['headers']]
-        if hdrs != expected_hdrs:
-            if 'seqno' in item:
-                seqno = item['seqno']
-            else:
-                seqno = casenum
-
-            sys.stderr.write('FAIL seqno#{}\n'.format(seqno))
-            sys.stderr.write('expected:\n')
-            for k, v in expected_hdrs:
-                sys.stderr.write('{}: {}\n'.format(k, v))
-            sys.stderr.write(', but got:\n')
-            for k, v in hdrs:
-                sys.stderr.write('{}: {}\n'.format(k, v))
-            raise Exception('test failure')
-    sys.stderr.write('PASS\n')
-
-if __name__ == '__main__':
-    for filename in sys.argv[1:]:
-        sys.stderr.write('{}: '.format(filename))
-        with open(filename) as f:
-            input = f.read()
-
-        testdata = json.loads(input)
-
-        testsuite(json.loads(input))
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/hpackmake.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/hpackmake.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/hpackmake.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/hpackmake.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-#
-# This script reads input headers from json file given in the
-# command-line (each file must be written in the format described in
-# https://github.com/Jxck/hpack-test-case but we require only
-# 'headers' data). Then it encodes input header set and write the
-# encoded header block in the same format. The output files are
-# created under 'out' directory in the current directory. It must
-# exist, otherwise the script will fail. The output filename is the
-# same as the input filename.
-#
-import sys, base64, json, os.path, os, argparse, errno
-from binascii import b2a_hex
-import nghttp2
-
-def testsuite(testdata, filename, outdir, table_size, deflate_table_size,
-              simulate_table_size_change):
-    res = {
-        'description': '''\
-Encoded by nghttp2. The basic encoding strategy is described in \
-http://lists.w3.org/Archives/Public/ietf-http-wg/2013JulSep/1135.html \
-We use huffman encoding only if it produces strictly shorter byte string than \
-original. We make some headers not indexing at all, but this does not always \
-result in less bits on the wire.'''
-    }
-    cases = []
-    deflater = nghttp2.HDDeflater(deflate_table_size)
-
-    if table_size != nghttp2.DEFAULT_HEADER_TABLE_SIZE:
-        deflater.change_table_size(table_size)
-
-    num_item = len(testdata['cases'])
-
-    change_points = {}
-    if simulate_table_size_change and num_item > 1:
-        change_points[num_item * 2 // 3] = table_size * 2 // 3
-        change_points[num_item // 3] = table_size // 3
-
-    for casenum, item  in enumerate(testdata['cases']):
-        outitem = {
-            'seqno': casenum,
-            'headers': item['headers']
-        }
-
-        if casenum in change_points:
-            new_table_size = change_points[casenum]
-            deflater.change_table_size(new_table_size)
-            outitem['header_table_size'] = new_table_size
-
-        casenum += 1
-        hdrs = [(list(x.keys())[0].encode('utf-8'),
-                 list(x.values())[0].encode('utf-8')) \
-                for x in item['headers']]
-        outitem['wire'] = b2a_hex(deflater.deflate(hdrs)).decode('utf-8')
-        cases.append(outitem)
-
-    if cases and table_size != nghttp2.DEFAULT_HEADER_TABLE_SIZE:
-        cases[0]['header_table_size'] = table_size
-
-    res['cases'] = cases
-    jsonstr = json.dumps(res, indent=2)
-    with open(os.path.join(outdir, filename), 'w') as f:
-        f.write(jsonstr)
-
-if __name__ == '__main__':
-    ap = argparse.ArgumentParser(description='HPACK test case generator')
-    ap.add_argument('-d', '--dir', help='output directory', default='out')
-    ap.add_argument('-s', '--table-size', help='max header table size',
-                    type=int, default=nghttp2.DEFAULT_HEADER_TABLE_SIZE)
-    ap.add_argument('-S', '--deflate-table-size',
-                    help='max header table size for deflater',
-                    type=int, default=nghttp2.DEFLATE_MAX_HEADER_TABLE_SIZE)
-    ap.add_argument('-c', '--simulate-table-size-change',
-                    help='simulate table size change scenario',
-                    action='store_true')
-
-    ap.add_argument('file', nargs='*', help='input file')
-    args = ap.parse_args()
-    try:
-        os.mkdir(args.dir)
-    except OSError as e:
-        if e.errno != errno.EEXIST:
-            raise e
-    for filename in args.file:
-        sys.stderr.write('{}\n'.format(filename))
-        with open(filename) as f:
-            input = f.read()
-        testsuite(json.loads(input), os.path.basename(filename),
-                  args.dir, args.table_size, args.deflate_table_size,
-                  args.simulate_table_size_change)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/install-python.cmake.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/install-python.cmake.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/install-python.cmake.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/install-python.cmake.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-get_filename_component(rootdir "$ENV{DESTDIR}" ABSOLUTE)
-if(rootdir STREQUAL "")
-  set(rootdir /)
-endif()
-execute_process(
-  COMMAND "@PYTHON_EXECUTABLE@" setup.py install
-    --skip-build
-    --root=${rootdir} --prefix=${CMAKE_INSTALL_PREFIX}
-  WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@"
-)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# This will avoid that setup.py gets deleted before it is executed in
-# clean-local in parallel build.
-.NOTPARALLEL:
-
-EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CMakeLists.txt install-python.cmake.in
-
-if ENABLE_PYTHON_BINDINGS
-
-all-local: nghttp2.c
-	$(PYTHON) setup.py build
-
-install-exec-local:
-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-
-uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
-	rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg
-
-clean-local:
-	$(PYTHON) setup.py clean --all
-	-rm -f $(builddir)/nghttp2.c
-
-.pyx.c:
-	$(CYTHON) -o $@ $<
-
-endif # ENABLE_PYTHON_BINDINGS
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/nghttp2.pyx cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/nghttp2.pyx
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/nghttp2.pyx	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/nghttp2.pyx	1970-01-01 00:00:00.000000000 +0000
@@ -1,1656 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-cimport cnghttp2
-
-from libc.stdlib cimport malloc, free
-from libc.string cimport memcpy, memset
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, int32_t
-import logging
-
-
-DEFAULT_HEADER_TABLE_SIZE = cnghttp2.NGHTTP2_DEFAULT_HEADER_TABLE_SIZE
-DEFLATE_MAX_HEADER_TABLE_SIZE = 4096
-
-HD_ENTRY_OVERHEAD = 32
-
-class HDTableEntry:
-
-    def __init__(self, name, namelen, value, valuelen):
-        self.name = name
-        self.namelen = namelen
-        self.value = value
-        self.valuelen = valuelen
-
-    def space(self):
-        return self.namelen + self.valuelen + HD_ENTRY_OVERHEAD
-
-cdef _get_pybytes(uint8_t *b, uint16_t blen):
-    return b[:blen]
-
-cdef class HDDeflater:
-    '''Performs header compression. The constructor takes
-    |hd_table_bufsize_max| parameter, which limits the usage of header
-    table in the given amount of bytes. This is necessary because the
-    header compressor and decompressor share the same amount of
-    header table and the decompressor decides that number. The
-    compressor may not want to use all header table size because of
-    limited memory availability. In that case, the
-    |hd_table_bufsize_max| can be used to cap the upper limit of table
-    size whatever the header table size is chosen by the decompressor.
-    The default value of |hd_table_bufsize_max| is 4096 bytes.
-
-    The following example shows how to compress request header sets:
-
-        import binascii, nghttp2
-
-        deflater = nghttp2.HDDeflater()
-        res = deflater.deflate([(b'foo', b'bar'),
-                              (b'baz', b'buz')])
-        print(binascii.b2a_hex(res))
-
-    '''
-
-    cdef cnghttp2.nghttp2_hd_deflater *_deflater
-
-    def __cinit__(self, hd_table_bufsize_max = DEFLATE_MAX_HEADER_TABLE_SIZE):
-        rv = cnghttp2.nghttp2_hd_deflate_new(&self._deflater,
-                                             hd_table_bufsize_max)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def __dealloc__(self):
-        cnghttp2.nghttp2_hd_deflate_del(self._deflater)
-
-    def deflate(self, headers):
-        '''Compresses the |headers|. The |headers| must be sequence of tuple
-        of name/value pair, which are sequence of bytes (not unicode
-        string).
-
-        This function returns the encoded header block in byte string.
-        An exception will be raised on error.
-
-        '''
-        cdef cnghttp2.nghttp2_nv *nva = <cnghttp2.nghttp2_nv*>\
-                                        malloc(sizeof(cnghttp2.nghttp2_nv)*\
-                                        len(headers))
-        cdef cnghttp2.nghttp2_nv *nvap = nva
-
-        for k, v in headers:
-            nvap[0].name = k
-            nvap[0].namelen = len(k)
-            nvap[0].value = v
-            nvap[0].valuelen = len(v)
-            nvap[0].flags = cnghttp2.NGHTTP2_NV_FLAG_NONE
-            nvap += 1
-
-        cdef size_t outcap = 0
-        cdef ssize_t rv
-        cdef uint8_t *out
-        cdef size_t outlen
-
-        outlen = cnghttp2.nghttp2_hd_deflate_bound(self._deflater,
-                                                   nva, len(headers))
-
-        out = <uint8_t*>malloc(outlen)
-
-        rv = cnghttp2.nghttp2_hd_deflate_hd(self._deflater, out, outlen,
-                                            nva, len(headers))
-        free(nva)
-
-        if rv < 0:
-            free(out)
-
-            raise Exception(_strerror(rv))
-
-        cdef bytes res
-
-        try:
-            res = out[:rv]
-        finally:
-            free(out)
-
-        return res
-
-    def change_table_size(self, hd_table_bufsize_max):
-        '''Changes header table size to |hd_table_bufsize_max| byte.
-
-        An exception will be raised on error.
-
-        '''
-        cdef int rv
-        rv = cnghttp2.nghttp2_hd_deflate_change_table_size(self._deflater,
-                                                           hd_table_bufsize_max)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def get_hd_table(self):
-        '''Returns copy of current dynamic header table.'''
-        cdef size_t length = cnghttp2.nghttp2_hd_deflate_get_num_table_entries(
-            self._deflater)
-        cdef const cnghttp2.nghttp2_nv *nv
-        res = []
-        for i in range(62, length + 1):
-            nv = cnghttp2.nghttp2_hd_deflate_get_table_entry(self._deflater, i)
-            k = _get_pybytes(nv.name, nv.namelen)
-            v = _get_pybytes(nv.value, nv.valuelen)
-            res.append(HDTableEntry(k, nv.namelen, v, nv.valuelen))
-        return res
-
-cdef class HDInflater:
-    '''Performs header decompression.
-
-    The following example shows how to compress request header sets:
-
-        data = b'0082c5ad82bd0f000362617a0362757a'
-        inflater = nghttp2.HDInflater()
-        hdrs = inflater.inflate(data)
-        print(hdrs)
-
-    '''
-
-    cdef cnghttp2.nghttp2_hd_inflater *_inflater
-
-    def __cinit__(self):
-        rv = cnghttp2.nghttp2_hd_inflate_new(&self._inflater)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def __dealloc__(self):
-        cnghttp2.nghttp2_hd_inflate_del(self._inflater)
-
-    def inflate(self, data):
-        '''Decompresses the compressed header block |data|. The |data| must be
-        byte string (not unicode string).
-
-        '''
-        cdef cnghttp2.nghttp2_nv nv
-        cdef int inflate_flags
-        cdef ssize_t rv
-        cdef uint8_t *buf = data
-        cdef size_t buflen = len(data)
-        res = []
-        while True:
-            inflate_flags = 0
-            rv = cnghttp2.nghttp2_hd_inflate_hd2(self._inflater, &nv,
-                                                 &inflate_flags,
-                                                 buf, buflen, 1)
-            if rv < 0:
-                raise Exception(_strerror(rv))
-            buf += rv
-            buflen -= rv
-            if inflate_flags & cnghttp2.NGHTTP2_HD_INFLATE_EMIT:
-                # may throw
-                res.append((nv.name[:nv.namelen], nv.value[:nv.valuelen]))
-            if inflate_flags & cnghttp2.NGHTTP2_HD_INFLATE_FINAL:
-                break
-
-        cnghttp2.nghttp2_hd_inflate_end_headers(self._inflater)
-        return res
-
-    def change_table_size(self, hd_table_bufsize_max):
-        '''Changes header table size to |hd_table_bufsize_max| byte.
-
-        An exception will be raised on error.
-
-        '''
-        cdef int rv
-        rv = cnghttp2.nghttp2_hd_inflate_change_table_size(self._inflater,
-                                                           hd_table_bufsize_max)
-        if rv != 0:
-            raise Exception(_strerror(rv))
-
-    def get_hd_table(self):
-        '''Returns copy of current dynamic header table.'''
-        cdef size_t length = cnghttp2.nghttp2_hd_inflate_get_num_table_entries(
-            self._inflater)
-        cdef const cnghttp2.nghttp2_nv *nv
-        res = []
-        for i in range(62, length + 1):
-            nv = cnghttp2.nghttp2_hd_inflate_get_table_entry(self._inflater, i)
-            k = _get_pybytes(nv.name, nv.namelen)
-            v = _get_pybytes(nv.value, nv.valuelen)
-            res.append(HDTableEntry(k, nv.namelen, v, nv.valuelen))
-        return res
-
-cdef _strerror(int liberror_code):
-    return cnghttp2.nghttp2_strerror(liberror_code).decode('utf-8')
-
-def print_hd_table(hdtable):
-    '''Convenient function to print |hdtable| to the standard output. This
-    function does not work if header name/value cannot be decoded using
-    UTF-8 encoding.
-
-    s=N means the entry occupies N bytes in header table.
-
-    '''
-    idx = 0
-    for entry in hdtable:
-        idx += 1
-        print('[{}] (s={}) {}: {}'\
-              .format(idx, entry.space(),
-                      entry.name.decode('utf-8'),
-                      entry.value.decode('utf-8')))
-
-try:
-    import socket
-    import io
-    import asyncio
-    import traceback
-    import sys
-    import email.utils
-    import datetime
-    import time
-    import ssl as tls
-    from urllib.parse import urlparse
-except ImportError:
-    asyncio = None
-
-# body generator flags
-DATA_OK = 0
-DATA_EOF = 1
-DATA_DEFERRED = 2
-
-class _ByteIOWrapper:
-
-    def __init__(self, b):
-        self.b = b
-
-    def generate(self, n):
-        data = self.b.read1(n)
-        if not data:
-            return None, DATA_EOF
-        return data, DATA_OK
-
-def wrap_body(body):
-    if body is None:
-        return body
-    elif isinstance(body, str):
-        return _ByteIOWrapper(io.BytesIO(body.encode('utf-8'))).generate
-    elif isinstance(body, bytes):
-        return _ByteIOWrapper(io.BytesIO(body)).generate
-    elif isinstance(body, io.IOBase):
-        return _ByteIOWrapper(body).generate
-    else:
-        # assume that callable in the form f(n) returning tuple byte
-        # string and flag.
-        return body
-
-def negotiated_protocol(ssl_obj):
-    protocol = ssl_obj.selected_alpn_protocol()
-    if protocol:
-        logging.info('alpn, protocol:%s', protocol)
-        return protocol
-
-    protocol = ssl_obj.selected_npn_protocol()
-    if protocol:
-        logging.info('npn, protocol:%s', protocol)
-        return protocol
-
-    return None
-
-def set_application_protocol(ssl_ctx):
-    app_protos = [cnghttp2.NGHTTP2_PROTO_VERSION_ID.decode('utf-8')]
-    ssl_ctx.set_npn_protocols(app_protos)
-    if tls.HAS_ALPN:
-        ssl_ctx.set_alpn_protocols(app_protos)
-
-cdef _get_stream_user_data(cnghttp2.nghttp2_session *session,
-                           int32_t stream_id):
-    cdef void *stream_user_data
-
-    stream_user_data = cnghttp2.nghttp2_session_get_stream_user_data\
-                       (session, stream_id)
-    if stream_user_data == NULL:
-        return None
-
-    return <object>stream_user_data
-
-cdef size_t _make_nva(cnghttp2.nghttp2_nv **nva_ptr, headers):
-    cdef cnghttp2.nghttp2_nv *nva
-    cdef size_t nvlen
-
-    nvlen = len(headers)
-    nva = <cnghttp2.nghttp2_nv*>malloc(sizeof(cnghttp2.nghttp2_nv) * nvlen)
-    for i, (k, v) in enumerate(headers):
-        nva[i].name = k
-        nva[i].namelen = len(k)
-        nva[i].value = v
-        nva[i].valuelen = len(v)
-        nva[i].flags = cnghttp2.NGHTTP2_NV_FLAG_NONE
-
-    nva_ptr[0] = nva
-
-    return nvlen
-
-cdef int server_on_header(cnghttp2.nghttp2_session *session,
-                          const cnghttp2.nghttp2_frame *frame,
-                          const uint8_t *name, size_t namelen,
-                          const uint8_t *value, size_t valuelen,
-                          uint8_t flags,
-                          void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    logging.debug('server_on_header, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    handler = _get_stream_user_data(session, frame.hd.stream_id)
-    return on_header(name, namelen, value, valuelen, flags, handler)
-
-cdef int client_on_header(cnghttp2.nghttp2_session *session,
-                          const cnghttp2.nghttp2_frame *frame,
-                          const uint8_t *name, size_t namelen,
-                          const uint8_t *value, size_t valuelen,
-                          uint8_t flags,
-                          void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    logging.debug('client_on_header, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        handler = _get_stream_user_data(session, frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        handler = _get_stream_user_data(session, frame.push_promise.promised_stream_id)
-
-    return on_header(name, namelen, value, valuelen, flags, handler)
-
-
-cdef int on_header(const uint8_t *name, size_t namelen,
-                          const uint8_t *value, size_t valuelen,
-                          uint8_t flags,
-                          object handler):
-    if not handler:
-        return 0
-
-    key = name[:namelen]
-    values = value[:valuelen].split(b'\x00')
-    if key == b':scheme':
-        handler.scheme = values[0]
-    elif key == b':method':
-        handler.method = values[0]
-    elif key == b':authority' or key == b'host':
-        handler.host = values[0]
-    elif key == b':path':
-        handler.path = values[0]
-    elif key == b':status':
-        handler.status = values[0]
-
-    if key == b'cookie':
-        handler.cookies.extend(values)
-    else:
-        for v in values:
-            handler.headers.append((key, v))
-
-    return 0
-
-cdef int server_on_begin_request_headers(cnghttp2.nghttp2_session *session,
-                                         const cnghttp2.nghttp2_frame *frame,
-                                         void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-
-    handler = http2._make_handler(frame.hd.stream_id)
-    cnghttp2.nghttp2_session_set_stream_user_data(session, frame.hd.stream_id,
-                                                  <void*>handler)
-
-    return 0
-
-cdef int server_on_begin_headers(cnghttp2.nghttp2_session *session,
-                                 const cnghttp2.nghttp2_frame *frame,
-                                 void *user_data):
-    if frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if frame.headers.cat == cnghttp2.NGHTTP2_HCAT_REQUEST:
-            return server_on_begin_request_headers(session, frame, user_data)
-
-    return 0
-
-cdef int server_on_frame_recv(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-    logging.debug('server_on_frame_recv, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_DATA:
-        if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-            if not handler:
-                return 0
-            try:
-                handler.on_request_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if frame.headers.cat == cnghttp2.NGHTTP2_HCAT_REQUEST:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-            if not handler:
-                return 0
-            if handler.cookies:
-                handler.headers.append((b'cookie',
-                                        b'; '.join(handler.cookies)))
-                handler.cookies = None
-            try:
-                handler.on_headers()
-                if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-                    handler.on_request_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK):
-            http2._stop_settings_timer()
-
-    return 0
-
-cdef int on_data_chunk_recv(cnghttp2.nghttp2_session *session,
-                                   uint8_t flags,
-                                   int32_t stream_id, const uint8_t *data,
-                                   size_t length, void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-
-    handler = _get_stream_user_data(session, stream_id)
-    if not handler:
-        return 0
-
-    try:
-        handler.on_data(data[:length])
-    except:
-        sys.stderr.write(traceback.format_exc())
-        return http2._rst_stream(stream_id)
-
-    return 0
-
-cdef int server_on_frame_send(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-    logging.debug('server_on_frame_send, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        # For PUSH_PROMISE, send push response immediately
-        handler = _get_stream_user_data\
-                  (session, frame.push_promise.promised_stream_id)
-        if not handler:
-            return 0
-
-        http2.send_response(handler)
-    elif frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK) != 0:
-            return 0
-        http2._start_settings_timer()
-    elif frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM) and \
-           cnghttp2.nghttp2_session_check_server_session(session):
-            # Send RST_STREAM if remote is not closed yet
-            if cnghttp2.nghttp2_session_get_stream_remote_close(
-                    session, frame.hd.stream_id) == 0:
-                http2._rst_stream(frame.hd.stream_id, cnghttp2.NGHTTP2_NO_ERROR)
-
-cdef int server_on_frame_not_send(cnghttp2.nghttp2_session *session,
-                                  const cnghttp2.nghttp2_frame *frame,
-                                  int lib_error_code,
-                                  void *user_data):
-    cdef http2 = <_HTTP2SessionCore>user_data
-    logging.debug('server_on_frame_not_send, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        # We have to remove handler here. Without this, it is not
-        # removed until session is terminated.
-        handler = _get_stream_user_data\
-                  (session, frame.push_promise.promised_stream_id)
-        if not handler:
-            return 0
-        http2._remove_handler(handler)
-
-cdef int on_stream_close(cnghttp2.nghttp2_session *session,
-                                int32_t stream_id,
-                                uint32_t error_code,
-                                void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    logging.debug('on_stream_close, stream_id:%s', stream_id)
-
-    handler = _get_stream_user_data(session, stream_id)
-    if not handler:
-        return 0
-
-    try:
-        handler.on_close(error_code)
-    except:
-        sys.stderr.write(traceback.format_exc())
-
-    http2._remove_handler(handler)
-
-    return 0
-
-cdef ssize_t data_source_read(cnghttp2.nghttp2_session *session,
-                              int32_t stream_id,
-                              uint8_t *buf, size_t length,
-                              uint32_t *data_flags,
-                              cnghttp2.nghttp2_data_source *source,
-                              void *user_data):
-    cdef http2 = <_HTTP2SessionCoreBase>user_data
-    generator = <object>source.ptr
-
-    http2.enter_callback()
-    try:
-        data, flag = generator(length)
-    except:
-        sys.stderr.write(traceback.format_exc())
-        return cnghttp2.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    finally:
-        http2.leave_callback()
-
-    if flag == DATA_DEFERRED:
-        return cnghttp2.NGHTTP2_ERR_DEFERRED
-
-    if data:
-        nread = len(data)
-        memcpy(buf, <uint8_t*>data, nread)
-    else:
-        nread = 0
-
-    if flag == DATA_EOF:
-        data_flags[0] = cnghttp2.NGHTTP2_DATA_FLAG_EOF
-        if cnghttp2.nghttp2_session_check_server_session(session):
-            # Send RST_STREAM if remote is not closed yet
-            if cnghttp2.nghttp2_session_get_stream_remote_close(
-                    session, stream_id) == 0:
-                http2._rst_stream(stream_id, cnghttp2.NGHTTP2_NO_ERROR)
-    elif flag != DATA_OK:
-        return cnghttp2.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE
-
-    return nread
-
-cdef int client_on_begin_headers(cnghttp2.nghttp2_session *session,
-                                 const cnghttp2.nghttp2_frame *frame,
-                                 void *user_data):
-    cdef http2 = <_HTTP2ClientSessionCore>user_data
-
-    if frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        # Generate a temporary handler until the headers are all received
-        push_handler = BaseResponseHandler()
-        http2._add_handler(push_handler, frame.push_promise.promised_stream_id)
-        cnghttp2.nghttp2_session_set_stream_user_data(session, frame.push_promise.promised_stream_id,
-                                                      <void*>push_handler)
-
-    return 0
-
-cdef int client_on_frame_recv(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2ClientSessionCore>user_data
-    logging.debug('client_on_frame_recv, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_DATA:
-        if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-            if not handler:
-                return 0
-            try:
-                handler.on_response_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_HEADERS:
-        if frame.headers.cat == cnghttp2.NGHTTP2_HCAT_RESPONSE or frame.headers.cat == cnghttp2.NGHTTP2_HCAT_PUSH_RESPONSE:
-            handler = _get_stream_user_data(session, frame.hd.stream_id)
-
-            if not handler:
-                return 0
-            # TODO handle 1xx non-final response
-            if handler.cookies:
-                handler.headers.append((b'cookie',
-                                        b'; '.join(handler.cookies)))
-                handler.cookies = None
-            try:
-                handler.on_headers()
-                if frame.hd.flags & cnghttp2.NGHTTP2_FLAG_END_STREAM:
-                    handler.on_response_done()
-            except:
-                sys.stderr.write(traceback.format_exc())
-                return http2._rst_stream(frame.hd.stream_id)
-    elif frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK):
-            http2._stop_settings_timer()
-    elif frame.hd.type == cnghttp2.NGHTTP2_PUSH_PROMISE:
-        handler = _get_stream_user_data(session, frame.hd.stream_id)
-        if not handler:
-            return 0
-        # Get the temporary push_handler which now should have all of the header data
-        push_handler = _get_stream_user_data(session, frame.push_promise.promised_stream_id)
-        if not push_handler:
-            return 0
-        # Remove the temporary handler
-        http2._remove_handler(push_handler)
-        cnghttp2.nghttp2_session_set_stream_user_data(session, frame.push_promise.promised_stream_id,
-                                                      <void*>NULL)
-
-        try:
-            handler.on_push_promise(push_handler)
-        except:
-            sys.stderr.write(traceback.format_exc())
-            return http2._rst_stream(frame.hd.stream_id)
-
-    return 0
-
-cdef int client_on_frame_send(cnghttp2.nghttp2_session *session,
-                              const cnghttp2.nghttp2_frame *frame,
-                              void *user_data):
-    cdef http2 = <_HTTP2ClientSessionCore>user_data
-    logging.debug('client_on_frame_send, type:%s, stream_id:%s', frame.hd.type, frame.hd.stream_id)
-
-    if frame.hd.type == cnghttp2.NGHTTP2_SETTINGS:
-        if (frame.hd.flags & cnghttp2.NGHTTP2_FLAG_ACK) != 0:
-            return 0
-        http2._start_settings_timer()
-
-cdef class _HTTP2SessionCoreBase:
-    cdef cnghttp2.nghttp2_session *session
-    cdef transport
-    cdef handler_class
-    cdef handlers
-    cdef settings_timer
-    cdef inside_callback
-
-    def __cinit__(self, transport, handler_class=None):
-        self.session = NULL
-        self.transport = transport
-        self.handler_class = handler_class
-        self.handlers = set()
-        self.settings_timer = None
-        self.inside_callback = False
-
-    def __dealloc__(self):
-        cnghttp2.nghttp2_session_del(self.session)
-
-    def data_received(self, data):
-        cdef ssize_t rv
-
-        rv = cnghttp2.nghttp2_session_mem_recv(self.session, data, len(data))
-        if rv < 0:
-            raise Exception('nghttp2_session_mem_recv failed: {}'.format\
-                            (_strerror(rv)))
-        self.send_data()
-
-    OUTBUF_MAX = 65535
-    SETTINGS_TIMEOUT = 5.0
-
-    def send_data(self):
-        cdef ssize_t outbuflen
-        cdef const uint8_t *outbuf
-
-        while True:
-            if self.transport.get_write_buffer_size() > self.OUTBUF_MAX:
-                break
-            outbuflen = cnghttp2.nghttp2_session_mem_send(self.session, &outbuf)
-            if outbuflen == 0:
-                break
-            if outbuflen < 0:
-                raise Exception('nghttp2_session_mem_send faild: {}'.format\
-                                (_strerror(outbuflen)))
-            self.transport.write(outbuf[:outbuflen])
-
-        if self.transport.get_write_buffer_size() == 0 and \
-           cnghttp2.nghttp2_session_want_read(self.session) == 0 and \
-           cnghttp2.nghttp2_session_want_write(self.session) == 0:
-            self.transport.close()
-
-    def resume(self, stream_id):
-        cnghttp2.nghttp2_session_resume_data(self.session, stream_id)
-        if not self.inside_callback:
-            self.send_data()
-
-    def enter_callback(self):
-        self.inside_callback = True
-
-    def leave_callback(self):
-        self.inside_callback = False
-
-    def _make_handler(self, stream_id):
-        logging.debug('_make_handler, stream_id:%s', stream_id)
-        handler = self.handler_class(self, stream_id)
-        self.handlers.add(handler)
-        return handler
-
-    def _remove_handler(self, handler):
-        logging.debug('_remove_handler, stream_id:%s', handler.stream_id)
-        self.handlers.remove(handler)
-
-    def _add_handler(self, handler, stream_id):
-        logging.debug('_add_handler, stream_id:%s', stream_id)
-        handler.stream_id = stream_id
-        handler.http2 = self
-        handler.remote_address = self._get_remote_address()
-        handler.client_certificate = self._get_client_certificate()
-        self.handlers.add(handler)
-
-    def _rst_stream(self, stream_id,
-                   error_code=cnghttp2.NGHTTP2_INTERNAL_ERROR):
-        cdef int rv
-
-        rv = cnghttp2.nghttp2_submit_rst_stream\
-             (self.session, cnghttp2.NGHTTP2_FLAG_NONE,
-              stream_id, error_code)
-
-        return rv
-
-    def _get_remote_address(self):
-        return self.transport.get_extra_info('peername')
-
-    def _get_client_certificate(self):
-        sock = self.transport.get_extra_info('socket')
-        try:
-            return sock.getpeercert()
-        except AttributeError:
-            return None
-
-    def _start_settings_timer(self):
-        loop = asyncio.get_event_loop()
-        self.settings_timer = loop.call_later(self.SETTINGS_TIMEOUT,
-                                              self._settings_timeout)
-
-    def _stop_settings_timer(self):
-        if self.settings_timer:
-            self.settings_timer.cancel()
-            self.settings_timer = None
-
-    def _settings_timeout(self):
-        cdef int rv
-
-        logging.debug('_settings_timeout')
-
-        self.settings_timer = None
-
-        rv = cnghttp2.nghttp2_session_terminate_session\
-             (self.session, cnghttp2.NGHTTP2_SETTINGS_TIMEOUT)
-        try:
-            self.send_data()
-        except Exception as err:
-            sys.stderr.write(traceback.format_exc())
-            self.transport.close()
-            return
-
-    def _log_request(self, handler):
-        now = datetime.datetime.now()
-        tv = time.mktime(now.timetuple())
-        datestr = email.utils.formatdate(timeval=tv, localtime=False,
-                                        usegmt=True)
-        try:
-            method = handler.method.decode('utf-8')
-        except:
-            method = handler.method
-        try:
-            path = handler.path.decode('utf-8')
-        except:
-            path = handler.path
-        logging.info('%s - - [%s] "%s %s HTTP/2" %s - %s', handler.remote_address[0],
-                          datestr, method, path, handler.status,
-                          'P' if handler.pushed else '-')
-
-    def close(self):
-        rv = cnghttp2.nghttp2_session_terminate_session\
-             (self.session, cnghttp2.NGHTTP2_NO_ERROR)
-        try:
-            self.send_data()
-        except Exception as err:
-            sys.stderr.write(traceback.format_exc())
-            self.transport.close()
-            return
-
-cdef class _HTTP2SessionCore(_HTTP2SessionCoreBase):
-    def __cinit__(self, *args, **kwargs):
-        cdef cnghttp2.nghttp2_session_callbacks *callbacks
-        cdef cnghttp2.nghttp2_settings_entry iv[2]
-        cdef int rv
-
-        super(_HTTP2SessionCore, self).__init__(*args, **kwargs)
-
-        rv = cnghttp2.nghttp2_session_callbacks_new(&callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_callbacks_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        cnghttp2.nghttp2_session_callbacks_set_on_header_callback(
-            callbacks, server_on_header)
-        cnghttp2.nghttp2_session_callbacks_set_on_begin_headers_callback(
-            callbacks, server_on_begin_headers)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_recv_callback(
-            callbacks, server_on_frame_recv)
-        cnghttp2.nghttp2_session_callbacks_set_on_stream_close_callback(
-            callbacks, on_stream_close)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_send_callback(
-            callbacks, server_on_frame_send)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_not_send_callback(
-            callbacks, server_on_frame_not_send)
-        cnghttp2.nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-            callbacks, on_data_chunk_recv)
-
-        rv = cnghttp2.nghttp2_session_server_new(&self.session, callbacks,
-                                                 <void*>self)
-
-        cnghttp2.nghttp2_session_callbacks_del(callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_server_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        iv[0].settings_id = cnghttp2.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS
-        iv[0].value = 100
-        iv[1].settings_id = cnghttp2.NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE
-        iv[1].value = cnghttp2.NGHTTP2_INITIAL_WINDOW_SIZE
-
-        rv = cnghttp2.nghttp2_submit_settings(self.session,
-                                              cnghttp2.NGHTTP2_FLAG_NONE,
-                                              iv, sizeof(iv) / sizeof(iv[0]))
-
-        if rv != 0:
-            raise Exception('nghttp2_submit_settings failed: {}'.format\
-                            (_strerror(rv)))
-
-    def send_response(self, handler):
-        cdef cnghttp2.nghttp2_data_provider prd
-        cdef cnghttp2.nghttp2_data_provider *prd_ptr
-        cdef cnghttp2.nghttp2_nv *nva
-        cdef size_t nvlen
-        cdef int rv
-
-        logging.debug('send_response, stream_id:%s', handler.stream_id)
-
-        nva = NULL
-        nvlen = _make_nva(&nva, handler.response_headers)
-
-        if handler.response_body:
-            prd.source.ptr = <void*>handler.response_body
-            prd.read_callback = data_source_read
-            prd_ptr = &prd
-        else:
-            prd_ptr = NULL
-
-        rv = cnghttp2.nghttp2_submit_response(self.session, handler.stream_id,
-                                              nva, nvlen, prd_ptr)
-
-        free(nva)
-
-        if rv != 0:
-            # TODO Ignore return value
-            self._rst_stream(handler.stream_id)
-            raise Exception('nghttp2_submit_response failed: {}'.format\
-                            (_strerror(rv)))
-
-        self._log_request(handler)
-
-    def push(self, handler, promised_handler):
-        cdef cnghttp2.nghttp2_nv *nva
-        cdef size_t nvlen
-        cdef int32_t promised_stream_id
-
-        self.handlers.add(promised_handler)
-
-        nva = NULL
-        nvlen = _make_nva(&nva, promised_handler.headers)
-
-        promised_stream_id = cnghttp2.nghttp2_submit_push_promise\
-                             (self.session,
-                              cnghttp2.NGHTTP2_FLAG_NONE,
-                              handler.stream_id,
-                              nva, nvlen,
-                              <void*>promised_handler)
-        if promised_stream_id < 0:
-            raise Exception('nghttp2_submit_push_promise failed: {}'.format\
-                            (_strerror(promised_stream_id)))
-
-        promised_handler.stream_id = promised_stream_id
-
-        logging.debug('push, stream_id:%s', promised_stream_id)
-
-        return promised_handler
-
-    def connection_lost(self):
-        self._stop_settings_timer()
-
-        for handler in self.handlers:
-            handler.on_close(cnghttp2.NGHTTP2_INTERNAL_ERROR)
-        self.handlers = set()
-
-cdef class _HTTP2ClientSessionCore(_HTTP2SessionCoreBase):
-    def __cinit__(self, *args, **kwargs):
-        cdef cnghttp2.nghttp2_session_callbacks *callbacks
-        cdef cnghttp2.nghttp2_settings_entry iv[2]
-        cdef int rv
-
-        super(_HTTP2ClientSessionCore, self).__init__(*args, **kwargs)
-
-        rv = cnghttp2.nghttp2_session_callbacks_new(&callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_callbacks_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        cnghttp2.nghttp2_session_callbacks_set_on_header_callback(
-            callbacks, client_on_header)
-        cnghttp2.nghttp2_session_callbacks_set_on_begin_headers_callback(
-            callbacks, client_on_begin_headers)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_recv_callback(
-            callbacks, client_on_frame_recv)
-        cnghttp2.nghttp2_session_callbacks_set_on_stream_close_callback(
-            callbacks, on_stream_close)
-        cnghttp2.nghttp2_session_callbacks_set_on_frame_send_callback(
-            callbacks, client_on_frame_send)
-        cnghttp2.nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-            callbacks, on_data_chunk_recv)
-
-        rv = cnghttp2.nghttp2_session_client_new(&self.session, callbacks,
-                                                 <void*>self)
-
-        cnghttp2.nghttp2_session_callbacks_del(callbacks)
-
-        if rv != 0:
-            raise Exception('nghttp2_session_client_new failed: {}'.format\
-                            (_strerror(rv)))
-
-        iv[0].settings_id = cnghttp2.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS
-        iv[0].value = 100
-        iv[1].settings_id = cnghttp2.NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE
-        iv[1].value = cnghttp2.NGHTTP2_INITIAL_WINDOW_SIZE
-
-        rv = cnghttp2.nghttp2_submit_settings(self.session,
-                                              cnghttp2.NGHTTP2_FLAG_NONE,
-                                              iv, sizeof(iv) / sizeof(iv[0]))
-
-        if rv != 0:
-            raise Exception('nghttp2_submit_settings failed: {}'.format\
-                            (_strerror(rv)))
-
-    def send_request(self, method, scheme, host, path, headers, body, handler):
-        cdef cnghttp2.nghttp2_data_provider prd
-        cdef cnghttp2.nghttp2_data_provider *prd_ptr
-        cdef cnghttp2.nghttp2_priority_spec *pri_ptr
-        cdef cnghttp2.nghttp2_nv *nva
-        cdef size_t nvlen
-        cdef int32_t stream_id
-
-        body = wrap_body(body)
-
-        custom_headers = _encode_headers(headers)
-        headers = [
-            (b':method', method.encode('utf-8')),
-            (b':scheme', scheme.encode('utf-8')),
-            (b':authority', host.encode('utf-8')),
-            (b':path', path.encode('utf-8'))
-        ]
-        headers.extend(custom_headers)
-
-        nva = NULL
-        nvlen = _make_nva(&nva, headers)
-
-        if body:
-            prd.source.ptr = <void*>body
-            prd.read_callback = data_source_read
-            prd_ptr = &prd
-        else:
-            prd_ptr = NULL
-
-        # TODO: Enable priorities
-        pri_ptr = NULL
-
-        stream_id = cnghttp2.nghttp2_submit_request\
-                             (self.session, pri_ptr,
-                              nva, nvlen, prd_ptr,
-                              <void*>handler)
-        free(nva)
-
-        if stream_id < 0:
-            raise Exception('nghttp2_submit_request failed: {}'.format\
-                            (_strerror(stream_id)))
-
-        logging.debug('request, stream_id:%s', stream_id)
-
-        self._add_handler(handler, stream_id)
-        cnghttp2.nghttp2_session_set_stream_user_data(self.session, stream_id,
-                                                  <void*>handler)
-
-        return handler
-
-    def push(self, push_promise, handler):
-        if handler:
-            # push_promise accepted, fill in the handler with the stored
-            # headers from the push_promise
-            handler.status = push_promise.status
-            handler.scheme = push_promise.scheme
-            handler.method = push_promise.method
-            handler.host = push_promise.host
-            handler.path = push_promise.path
-            handler.cookies = push_promise.cookies
-            handler.stream_id = push_promise.stream_id
-            handler.http2 = self
-            handler.pushed = True
-
-            self._add_handler(handler, handler.stream_id)
-
-            cnghttp2.nghttp2_session_set_stream_user_data(self.session, handler.stream_id,
-                                                      <void*>handler)
-        else:
-            # push_promise rejected, reset the stream
-            self._rst_stream(push_promise.stream_id,
-                              error_code=cnghttp2.NGHTTP2_NO_ERROR)
-
-if asyncio:
-
-    class BaseRequestHandler:
-
-        """HTTP/2 request (stream) handler base class.
-
-        The class is used to handle the HTTP/2 stream. By default, it does
-        not nothing. It must be subclassed to handle each event callback
-        method.
-
-        The first callback method invoked is on_headers(). It is called
-        when HEADERS frame, which includes request header fields, is
-        arrived.
-
-        If request has request body, on_data(data) is invoked for each
-        chunk of received data.
-
-        When whole request is received, on_request_done() is invoked.
-
-        When stream is closed, on_close(error_code) is called.
-
-        The application can send response using send_response() method. It
-        can be used in on_headers(), on_data() or on_request_done().
-
-        The application can push resource using push() method. It must be
-        used before send_response() call.
-
-        The following instance variables are available:
-
-        client_address
-          Contains a tuple of the form (host, port) referring to the client's
-          address.
-
-        client_certificate
-          May contain the client certifcate in its non-binary form
-
-        stream_id
-          Stream ID of this stream
-
-        scheme
-          Scheme of the request URI. This is a value of :scheme header field.
-
-        method
-          Method of this stream. This is a value of :method header field.
-
-        host
-          This is a value of :authority or host header field.
-
-        path
-          This is a value of :path header field.
-
-        headers
-          Request header fields
-
-        """
-
-        def __init__(self, http2, stream_id):
-            self.headers = []
-            self.cookies = []
-            # Stream ID. For promised stream, it is initially -1.
-            self.stream_id = stream_id
-            self.http2 = http2
-            # address of the client
-            self.remote_address = self.http2._get_remote_address()
-            # certificate of the client
-            self._client_certificate = self.http2._get_client_certificate()
-            # :scheme header field in request
-            self.scheme = None
-            # :method header field in request
-            self.method = None
-            # :authority or host header field in request
-            self.host = None
-            # :path header field in request
-            self.path = None
-            # HTTP status
-            self.status = None
-            # True if this is a handler for pushed resource
-            self.pushed = False
-
-        @property
-        def client_address(self):
-            return self.remote_address
-
-        @property
-        def client_certificate(self):
-            return self._client_certificate
-
-        def on_headers(self):
-
-            '''Called when request HEADERS is arrived.
-
-            '''
-            pass
-
-        def on_data(self, data):
-
-            '''Called when a chunk of request body is arrived. This method
-            will be called multiple times until all data are received.
-
-            '''
-            pass
-
-        def on_request_done(self):
-
-            '''Called when whole request was received
-
-            '''
-            pass
-
-        def on_close(self, error_code):
-
-            '''Called when stream is about to close.
-
-            '''
-            pass
-
-        def send_response(self, status=200, headers=None, body=None):
-
-            '''Send response. The status is HTTP status code. The headers is
-            additional response headers. The :status header field is
-            appended by the library. The body is the response body. It
-            could be None if response body is empty. Or it must be
-            instance of either str, bytes, io.IOBase or callable,
-            called body generator, which takes one parameter,
-            size. The body generator generates response body. It can
-            pause generation of response so that it can wait for slow
-            backend data generation. When invoked, it should return
-            tuple, byte string and flag. The flag is either DATA_OK,
-            DATA_EOF and DATA_DEFERRED. For non-empty byte string and
-            it is not the last chunk of response, DATA_OK is returned
-            as flag.  If this is the last chunk of the response (byte
-            string is possibly None), DATA_EOF must be returned as
-            flag.  If there is no data available right now, but
-            additional data are anticipated, return tuple (None,
-            DATA_DEFERRD).  When data arrived, call resume() and
-            restart response body transmission.
-
-            Only the body generator can pause response body
-            generation; instance of io.IOBase must not block.
-
-            If instance of str is specified as body, it is encoded
-            using UTF-8.
-
-            The headers is a list of tuple of the form (name,
-            value). The name and value can be either unicode string or
-            byte string.
-
-            On error, exception will be thrown.
-
-            '''
-            if self.status is not None:
-                raise Exception('response has already been sent')
-
-            if not status:
-                raise Exception('status must not be empty')
-
-            body = wrap_body(body)
-
-            self._set_response_prop(status, headers, body)
-            self.http2.send_response(self)
-
-        def push(self, path, method='GET', request_headers=None,
-                 status=200, headers=None, body=None):
-
-            '''Push a resource. The path is a path portion of request URI
-            for this
-            resource. The method is a method to access this
-            resource. The request_headers is additional request
-            headers to access this resource. The :scheme, :method,
-            :authority and :path are appended by the library. The
-            :scheme and :authority are inherited from the request (not
-            request_headers parameter).
-
-            The status is HTTP status code. The headers is additional
-            response headers. The :status header field is appended by
-            the library. The body is the response body. It has the
-            same semantics of body parameter of send_response().
-
-            The headers and request_headers are a list of tuple of the
-            form (name, value). The name and value can be either
-            unicode string or byte string.
-
-            On error, exception will be thrown.
-
-            '''
-            if not status:
-                raise Exception('status must not be empty')
-
-            if not method:
-                raise Exception('method must not be empty')
-
-            if not path:
-                raise Exception('path must not be empty')
-
-            body = wrap_body(body)
-
-            promised_handler = self.http2._make_handler(-1)
-            promised_handler.pushed = True
-            promised_handler.scheme = self.scheme
-            promised_handler.method = method.encode('utf-8')
-            promised_handler.host = self.host
-            promised_handler.path = path.encode('utf-8')
-            promised_handler._set_response_prop(status, headers, body)
-
-            headers = [
-                (b':method', promised_handler.method),
-                (b':scheme', promised_handler.scheme),
-                (b':authority', promised_handler.host),
-                (b':path', promised_handler.path)
-            ]
-            headers.extend(_encode_headers(request_headers))
-
-            promised_handler.headers = headers
-
-            return self.http2.push(self, promised_handler)
-
-        def _set_response_prop(self, status, headers, body):
-            self.status = status
-
-            if headers is None:
-                headers = []
-
-            self.response_headers = [(b':status', str(status).encode('utf-8'))]
-            self.response_headers.extend(_encode_headers(headers))
-
-            self.response_body = body
-
-        def resume(self):
-            self.http2.resume(self.stream_id)
-
-    def _encode_headers(headers):
-        if not headers:
-            return []
-        return [(k if isinstance(k, bytes) else k.encode('utf-8'),
-                 v if isinstance(v, bytes) else v.encode('utf-8')) \
-                for k, v in headers]
-
-    class _HTTP2Session(asyncio.Protocol):
-
-        def __init__(self, RequestHandlerClass):
-            asyncio.Protocol.__init__(self)
-            self.RequestHandlerClass = RequestHandlerClass
-            self.http2 = None
-
-        def connection_made(self, transport):
-            address = transport.get_extra_info('peername')
-            logging.info('connection_made, address:%s, port:%s', address[0], address[1])
-
-            self.transport = transport
-            sock = self.transport.get_extra_info('socket')
-            try:
-                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-            except OSError as e:
-                logging.info('failed to set tcp-nodelay: %s', str(e))
-            ssl_ctx = self.transport.get_extra_info('sslcontext')
-            if ssl_ctx:
-                ssl_obj = self.transport.get_extra_info('ssl_object')
-                protocol = negotiated_protocol(ssl_obj)
-                if protocol is None or protocol.encode('utf-8') != \
-                   cnghttp2.NGHTTP2_PROTO_VERSION_ID:
-                    self.transport.abort()
-                    return
-            try:
-                self.http2 = _HTTP2SessionCore\
-                             (self.transport,
-                              self.RequestHandlerClass)
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.abort()
-                return
-
-
-        def connection_lost(self, exc):
-            logging.info('connection_lost')
-            if self.http2:
-                self.http2.connection_lost()
-                self.http2 = None
-
-        def data_received(self, data):
-            try:
-                self.http2.data_received(data)
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def resume_writing(self):
-            try:
-                self.http2.send_data()
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-    class HTTP2Server:
-
-        '''HTTP/2 server.
-
-        This class builds on top of the asyncio event loop. On
-        construction, RequestHandlerClass must be given, which must be a
-        subclass of BaseRequestHandler class.
-
-        '''
-        def __init__(self, address, RequestHandlerClass, ssl=None):
-
-            '''address is a tuple of the listening address and port (e.g.,
-            ('127.0.0.1', 8080)). RequestHandlerClass must be a subclass
-            of BaseRequestHandler class to handle a HTTP/2 stream.  The
-            ssl can be ssl.SSLContext instance. If it is not None, the
-            resulting server is SSL/TLS capable.
-
-            '''
-            def session_factory():
-                return _HTTP2Session(RequestHandlerClass)
-
-            self.loop = asyncio.get_event_loop()
-
-            if ssl:
-                set_application_protocol(ssl)
-
-            coro = self.loop.create_server(session_factory,
-                                           host=address[0], port=address[1],
-                                           ssl=ssl)
-            self.server = self.loop.run_until_complete(coro)
-            logging.info('listen, address:%s, port:%s', address[0], address[1])
-
-        def serve_forever(self):
-            try:
-                self.loop.run_forever()
-            finally:
-                self.server.close()
-                self.loop.close()
-
-
-
-    class BaseResponseHandler:
-
-        """HTTP/2 response (stream) handler base class.
-
-        The class is used to handle the HTTP/2 stream. By default, it does
-        not nothing. It must be subclassed to handle each event callback
-        method.
-
-        The first callback method invoked is on_headers(). It is called
-        when HEADERS frame, which includes response header fields, is
-        arrived.
-
-        If response has a body, on_data(data) is invoked for each
-        chunk of received data.
-
-        When whole response is received, on_response_done() is invoked.
-
-        When stream is closed or underlying connection is lost,
-        on_close(error_code) is called.
-
-        The application can send follow up requests using HTTP2Client.send_request() method.
-
-        The application can handle push resource using on_push_promise() method.
-
-        The following instance variables are available:
-
-        server_address
-          Contains a tuple of the form (host, port) referring to the server's
-          address.
-
-        stream_id
-          Stream ID of this stream
-
-        scheme
-          Scheme of the request URI. This is a value of :scheme header field.
-
-        method
-          Method of this stream. This is a value of :method header field.
-
-        host
-          This is a value of :authority or host header field.
-
-        path
-          This is a value of :path header field.
-
-        headers
-          Response header fields.  There is a special exception.  If this
-          object is passed to push_promise(), this instance variable contains
-          pushed request header fields.
-
-        """
-
-        def __init__(self, http2=None, stream_id=-1):
-            self.headers = []
-            self.cookies = []
-            # Stream ID. For promised stream, it is initially -1.
-            self.stream_id = stream_id
-            self.http2 = http2
-            # address of the server
-            self.remote_address = None
-            # :scheme header field in request
-            self.scheme = None
-            # :method header field in request
-            self.method = None
-            # :authority or host header field in request
-            self.host = None
-            # :path header field in request
-            self.path = None
-            # HTTP status
-            self.status = None
-            # True if this is a handler for pushed resource
-            self.pushed = False
-
-        @property
-        def server_address(self):
-            return self.remote_address
-
-        def on_headers(self):
-
-            '''Called when response HEADERS is arrived.
-
-            '''
-            pass
-
-        def on_data(self, data):
-
-            '''Called when a chunk of response body is arrived. This method
-            will be called multiple times until all data are received.
-
-            '''
-            pass
-
-        def on_response_done(self):
-
-            '''Called when whole response was received
-
-            '''
-            pass
-
-        def on_close(self, error_code):
-
-            '''Called when stream is about to close.
-
-            '''
-            pass
-
-        def on_push_promise(self, push_promise):
-
-            '''Called when a push is promised. Default behavior is to
-            cancel the push. If application overrides this method,
-            it should call either accept_push or reject_push.
-
-            '''
-            self.reject_push(push_promise)
-
-        def reject_push(self, push_promise):
-
-            '''Convenience method equivalent to calling accept_push
-            with a falsy value.
-
-            '''
-            self.http2.push(push_promise, None)
-
-        def accept_push(self, push_promise, handler=None):
-
-            '''Accept a push_promise and provider a handler for the
-            new stream. If a falsy value is supplied for the handler,
-            the push is rejected.
-
-            '''
-            self.http2.push(push_promise, handler)
-
-        def resume(self):
-            self.http2.resume(self.stream_id)
-
-    class _HTTP2ClientSession(asyncio.Protocol):
-
-        def __init__(self, client):
-            asyncio.Protocol.__init__(self)
-            self.http2 = None
-            self.pending = []
-            self.client = client
-
-        def connection_made(self, transport):
-            address = transport.get_extra_info('peername')
-            logging.info('connection_made, address:%s, port:%s', address[0], address[1])
-
-            self.transport = transport
-            sock = self.transport.get_extra_info('socket')
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-            ssl_ctx = self.transport.get_extra_info('sslcontext')
-            if ssl_ctx:
-                ssl_obj = self.transport.get_extra_info('ssl_object')
-                protocol = negotiated_protocol(ssl_obj)
-                if protocol is None or protocol.encode('utf-8') != \
-                   cnghttp2.NGHTTP2_PROTO_VERSION_ID:
-                    self.transport.abort()
-
-            self.http2 = _HTTP2ClientSessionCore(self.transport)
-
-	    # Clear pending requests
-            send_pending = self.pending
-            self.pending = []
-            for method,scheme,host,path,headers,body,handler in send_pending:
-                self.send_request(method=method, scheme=scheme, host=host, path=path,\
-                                  headers=headers, body=body, handler=handler)
-            self.http2.send_data()
-
-        def connection_lost(self, exc):
-            logging.info('connection_lost')
-            if self.http2:
-                self.http2 = None
-            self.client.close()
-
-        def data_received(self, data):
-            try:
-                self.http2.data_received(data)
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def resume_writing(self):
-            try:
-                self.http2.send_data()
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def send_request(self, method, scheme, host, path, headers, body, handler):
-            try:
-		# Waiting until connection established
-                if not self.http2:
-                    self.pending.append([method, scheme, host, path, headers, body, handler])
-                    return
-
-                self.http2.send_request(method=method, scheme=scheme, host=host, path=path,\
-                                        headers=headers, body=body, handler=handler)
-                self.http2.send_data()
-            except Exception as err:
-                sys.stderr.write(traceback.format_exc())
-                self.transport.close()
-                return
-
-        def close(self):
-            if self.http2:
-                self.http2.close()
-
-
-    class HTTP2Client:
-
-        '''HTTP/2 client.
-
-        This class builds on top of the asyncio event loop.
-
-        '''
-        def __init__(self, address, loop=None, ssl=None):
-
-            '''address is a tuple of the connect address and port (e.g.,
-            ('127.0.0.1', 8080)). The ssl can be ssl.SSLContext instance.
-            If it is not None, the resulting client is SSL/TLS capable.
-            '''
-
-            self.address = address
-            self.session = _HTTP2ClientSession(self)
-            def session_factory():
-                return self.session
-
-            if ssl:
-                set_application_protocol(ssl)
-
-            self.loop = loop
-            if not self.loop:
-                self.loop = asyncio.get_event_loop()
-
-            coro = self.loop.create_connection(session_factory,
-                                           host=address[0], port=address[1],
-                                           ssl=ssl)
-
-            if ssl:
-                self.scheme = 'https'
-            else:
-                self.scheme = 'http'
-
-            self.transport,_ = self.loop.run_until_complete(coro)
-            logging.info('connect, address:%s, port:%s', self.address[0], self.address[1])
-
-        @property
-        def io_loop(self):
-            return self.loop
-
-        def close(self):
-            self.session.close()
-
-        def send_request(self, method='GET', url='/', headers=None, body=None, handler=None):
-            url = urlparse(url)
-            scheme = url.scheme if url.scheme else self.scheme
-            host = url.netloc if url.netloc else self.address[0]+':'+str(self.address[1])
-            path = url.path
-            if url.params:
-                path += ';'+url.params
-            if url.query:
-                path += '?'+url.query
-            if url.fragment:
-                path += '#'+url.fragment
-
-            self.session.send_request(method=method, scheme=scheme, host=host, path=path,\
-                                      headers=headers, body=body, handler=handler)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/setup.py.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/setup.py.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/setup.py.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/setup.py.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-from setuptools import setup, Extension
-
-LIBS = ['nghttp2']
-
-setup(
-    name = 'python-nghttp2',
-    description = 'Python HTTP/2 library on top of nghttp2',
-    author = 'Tatsuhiro Tsujikawa',
-    version = '@PACKAGE_VERSION@',
-    author_email = 'tatsuhiro.t@gmail.com',
-    url = 'https://nghttp2.org/',
-    keywords = [],
-    ext_modules = [Extension("nghttp2",
-                             ["nghttp2.c"],
-                             include_dirs=['@top_srcdir@/lib',
-                                           '@top_srcdir@/lib/includes',
-                                           '@top_builddir@/lib/includes'],
-                             library_dirs=['@top_builddir@/lib/.libs',
-                                           '@top_builddir@/lib',
-                                           '@top_builddir@'],
-                             libraries=LIBS)],
-    long_description='TBD'
-    )
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/wsgi.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/wsgi.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/python/wsgi.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/python/wsgi.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-# nghttp2 - HTTP/2.0 C Library
-
-# Copyright (c) 2013 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import io
-import sys
-from urllib.parse import urlparse
-
-import nghttp2
-
-def _dance_decode(b):
-    # TODO faster than looping through and mod-128'ing all unicode points?
-    return b.decode('utf-8').encode('latin1').decode('latin1')
-
-class WSGIContainer(nghttp2.BaseRequestHandler):
-
-    _BASE_ENVIRON = {
-        'wsgi.version': (1,0),
-        'wsgi.url_scheme': 'http', # FIXME
-        'wsgi.multithread': True, # TODO I think?
-        'wsgi.multiprocess': False, # TODO no idea
-        'wsgi.run_once': True, # TODO now I'm just guessing
-        'wsgi.errors': sys.stderr, # TODO will work for testing - is this even used by any frameworks?
-    }
-
-    def __init__(self, app, *args, **kwargs):
-        super(WSGIContainer, self).__init__(*args, **kwargs)
-        self.app = app
-        self.chunks = []
-
-    def on_data(self, chunk):
-        self.chunks.append(chunk)
-
-    def on_request_done(self):
-        environ = WSGIContainer._BASE_ENVIRON.copy()
-        parsed = urlparse(self.path)
-
-        environ['wsgi.input'] = io.BytesIO(b''.join(self.chunks))
-
-        for name, value in self.headers:
-            mangled_name = b'HTTP_' + name.replace(b'-', b'_').upper()
-            environ[_dance_decode(mangled_name)] = _dance_decode(value)
-
-        environ.update(dict(
-            REQUEST_METHOD=_dance_decode(self.method),
-            # TODO SCRIPT_NAME? like APPLICATION_ROOT in Flask...
-            PATH_INFO=_dance_decode(parsed.path),
-            QUERY_STRING=_dance_decode(parsed.query),
-            CONTENT_TYPE=environ.get('HTTP_CONTENT_TYPE', ''),
-            CONTENT_LENGTH=environ.get('HTTP_CONTENT_LENGTH', ''),
-            SERVER_NAME=_dance_decode(self.host),
-            SERVER_PORT='', # FIXME probably requires changes in nghttp2
-            SERVER_PROTOCOL='HTTP/2.0',
-        ))
-
-        response_status = [None]
-        response_headers = [None]
-        response_chunks = []
-
-        def start_response(status, headers, exc_info=None):
-            if response_status[0] is not None:
-                raise AssertionError('Response already started')
-            exc_info = None # avoid dangling circular ref - TODO is this necessary? borrowed from snippet in WSGI spec
-
-            response_status[0] = status
-            response_headers[0] = headers
-            # TODO handle exc_info
-
-            return lambda chunk: response_chunks.append(chunk)
-
-        # TODO technically, this breaks the WSGI spec by buffering the status,
-        # headers, and body until all are completely output from the app before
-        # writing the response, but it looks like nghttp2 doesn't support any
-        # other way for now
-
-        # TODO disallow yielding/returning before start_response is called
-        response_chunks.extend(self.app(environ, start_response))
-        response_body = b''.join(response_chunks)
-
-        # TODO automatically set content-length if not provided
-        self.send_response(
-            status=response_status[0],
-            headers=response_headers[0],
-            body=response_body,
-        )
-
-def wsgi_app(app):
-    return lambda *args, **kwargs: WSGIContainer(app, *args, **kwargs)
-
-
-if __name__ == '__main__':
-    import ssl
-    from werkzeug.testapp import test_app
-
-    ssl_ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ssl_ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2
-    ssl_ctx.load_cert_chain('server.crt', 'server.key')
-
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), wsgi_app(test_app),
-                                 ssl=ssl_ctx)
-    server.serve_forever()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/README cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/README
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/README	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/README	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-See README.rst
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/README.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/README.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/README.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,1585 +0,0 @@
-nghttp2 - HTTP/2 C Library
-==========================
-
-This is an implementation of the Hypertext Transfer Protocol version 2
-in C.
-
-The framing layer of HTTP/2 is implemented as a reusable C library.
-On top of that, we have implemented an HTTP/2 client, server and
-proxy.  We have also developed load test and benchmarking tools for
-HTTP/2.
-
-An HPACK encoder and decoder are available as a public API.
-
-An experimental high level C++ library is also available.
-
-We have Python bindings of this library, but we do not have full
-code coverage yet.
-
-Development Status
-------------------
-
-We have implemented `RFC 7540 <https://tools.ietf.org/html/rfc7540>`_
-HTTP/2 and `RFC 7541 <https://tools.ietf.org/html/rfc7541>`_ HPACK -
-Header Compression for HTTP/2
-
-The nghttp2 code base was forked from the spdylay
-(https://github.com/tatsuhiro-t/spdylay) project.
-
-Public Test Server
-------------------
-
-The following endpoints are available to try out our nghttp2
-implementation.
-
-* https://nghttp2.org/ (TLS + ALPN/NPN)
-
-  This endpoint supports ``h2``, ``h2-16``, ``h2-14``, and
-  ``http/1.1`` via ALPN/NPN and requires TLSv1.2 for HTTP/2
-  connection.
-
-* http://nghttp2.org/ (HTTP Upgrade and HTTP/2 Direct)
-
-  ``h2c`` and ``http/1.1``.
-
-Requirements
-------------
-
-The following package is required to build the libnghttp2 library:
-
-* pkg-config >= 0.20
-
-To build and run the unit test programs, the following package is
-required:
-
-* cunit >= 2.1
-
-To build the documentation, you need to install:
-
-* sphinx (http://sphinx-doc.org/)
-
-If you need libnghttp2 (C library) only, then the above packages are
-all you need.  Use ``--enable-lib-only`` to ensure that only
-libnghttp2 is built.  This avoids potential build error related to
-building bundled applications.
-
-To build and run the application programs (``nghttp``, ``nghttpd``,
-``nghttpx`` and ``h2load``) in the ``src`` directory, the following packages
-are required:
-
-* OpenSSL >= 1.0.1
-* libev >= 4.11
-* zlib >= 1.2.3
-* libc-ares >= 1.7.5
-
-ALPN support requires OpenSSL >= 1.0.2 (released 22 January 2015).
-LibreSSL >= 2.2.0 can be used instead of OpenSSL, but OpenSSL has more
-features than LibreSSL at the time of this writing.
-
-To enable ``-a`` option (getting linked assets from the downloaded
-resource) in ``nghttp``, the following package is required:
-
-* libxml2 >= 2.6.26
-
-To enable systemd support in nghttpx, the following package is
-required:
-
-* libsystemd-dev >= 209
-
-The HPACK tools require the following package:
-
-* jansson >= 2.5
-
-To build sources under the examples directory, libevent is required:
-
-* libevent-openssl >= 2.0.8
-
-To mitigate heap fragmentation in long running server programs
-(``nghttpd`` and ``nghttpx``), jemalloc is recommended:
-
-* jemalloc
-
-  .. note::
-
-     Alpine Linux currently does not support malloc replacement
-     due to musl limitations. See details in issue `#762 <https://github.com/nghttp2/nghttp2/issues/762>`_.
-
-libnghttp2_asio C++ library requires the following packages:
-
-* libboost-dev >= 1.54.0
-* libboost-thread-dev >= 1.54.0
-
-The Python bindings require the following packages:
-
-* cython >= 0.19
-* python >= 2.7
-* python-setuptools
-
-If you are using Ubuntu 16.04 LTS (Xenial Xerus) or Debian 8 (jessie)
-and above, run the following to install the required packages:
-
-.. code-block:: text
-
-    sudo apt-get install g++ make binutils autoconf automake autotools-dev libtool pkg-config \
-      zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev \
-      libc-ares-dev libjemalloc-dev libsystemd-dev \
-      cython python3-dev python-setuptools
-
-To enable mruby support for nghttpx, `mruby
-<https://github.com/mruby/mruby>`_ is required.  We need to build
-mruby with C++ ABI explicitly turned on, and probably need other
-mrgems, mruby is manged by git submodule under third-party/mruby
-directory.  Currently, mruby support for nghttpx is disabled by
-default.  To enable mruby support, use ``--with-mruby`` configure
-option.  Note that at the time of this writing, libmruby-dev and mruby
-packages in Debian/Ubuntu are not usable for nghttp2, since they do
-not enable C++ ABI.  To build mruby, the following packages are
-required:
-
-* ruby
-* bison
-
-nghttpx supports `neverbleed <https://github.com/h2o/neverbleed>`_,
-privilege separation engine for OpenSSL / LibreSSL.  In short, it
-minimizes the risk of private key leakage when serious bug like
-Heartbleed is exploited.  The neverbleed is disabled by default.  To
-enable it, use ``--with-neverbleed`` configure option.
-
-In order to compile the source code, gcc >= 4.8.3 or clang >= 3.4 is
-required.
-
-.. note::
-
-   To enable mruby support in nghttpx, and use ``--with-mruby``
-   configure option.
-
-.. note::
-
-   Mac OS X users may need the ``--disable-threads`` configure option to
-   disable multi-threading in nghttpd, nghttpx and h2load to prevent
-   them from crashing. A patch is welcome to make multi threading work
-   on Mac OS X platform.
-
-.. note::
-
-   To compile the associated applications (nghttp, nghttpd, nghttpx
-   and h2load), you must use the ``--enable-app`` configure option and
-   ensure that the specified requirements above are met.  Normally,
-   configure script checks required dependencies to build these
-   applications, and enable ``--enable-app`` automatically, so you
-   don't have to use it explicitly.  But if you found that
-   applications were not built, then using ``--enable-app`` may find
-   that cause, such as the missing dependency.
-
-.. note::
-
-   In order to detect third party libraries, pkg-config is used
-   (however we don't use pkg-config for some libraries (e.g., libev)).
-   By default, pkg-config searches ``*.pc`` file in the standard
-   locations (e.g., /usr/lib/pkgconfig).  If it is necessary to use
-   ``*.pc`` file in the custom location, specify paths to
-   ``PKG_CONFIG_PATH`` environment variable, and pass it to configure
-   script, like so:
-
-   .. code-block:: text
-
-       $ ./configure PKG_CONFIG_PATH=/path/to/pkgconfig
-
-   For pkg-config managed libraries, ``*_CFLAG`` and ``*_LIBS``
-   environment variables are defined (e.g., ``OPENSSL_CFLAGS``,
-   ``OPENSSL_LIBS``).  Specifying non-empty string to these variables
-   completely overrides pkg-config.  In other words, if they are
-   specified, pkg-config is not used for detection, and user is
-   responsible to specify the correct values to these variables.  For
-   complete list of these variables, run ``./configure -h``.
-
-Building nghttp2 from release tar archive
------------------------------------------
-
-The nghttp2 project regularly releases tar archives which includes
-nghttp2 source code, and generated build files.  They can be
-downloaded from `Releases
-<https://github.com/nghttp2/nghttp2/releases>`_ page.
-
-Building nghttp2 from git requires autotools development packages.
-Building from tar archives does not require them, and thus it is much
-easier.  The usual build step is as follows:
-
-.. code-block:: text
-
-    $ tar xf nghttp2-X.Y.Z.tar.bz2
-    $ cd nghttp2-X.Y.Z
-    $ ./configure
-    $ make
-
-Building from git
------------------
-
-Building from git is easy, but please be sure that at least autoconf 2.68 is
-used:
-
-.. code-block:: text
-
-    $ git submodule update --init
-    $ autoreconf -i
-    $ automake
-    $ autoconf
-    $ ./configure
-    $ make
-
-Notes for building on Windows (MSVC)
-------------------------------------
-
-The easiest way to build native Windows nghttp2 dll is use `cmake
-<https://cmake.org/>`_.  The free version of `Visual C++ Build Tools
-<http://landinghub.visualstudio.com/visual-cpp-build-tools>`_ works
-fine.
-
-1. Install cmake for windows
-2. Open "Visual C++ ... Native Build Tool Command Prompt", and inside
-   nghttp2 directly, run ``cmake``.
-3. Then run ``cmake --build`` to build library.
-4. nghttp2.dll, nghttp2.lib, nghttp2.exp are placed under lib directory.
-
-Note that the above steps most likely produce nghttp2 library only.
-No bundled applications are compiled.
-
-Notes for building on Windows (Mingw/Cygwin)
---------------------------------------------
-
-Under Mingw environment, you can only compile the library, it's
-``libnghttp2-X.dll`` and ``libnghttp2.a``.
-
-If you want to compile the applications(``h2load``, ``nghttp``,
-``nghttpx``, ``nghttpd``), you need to use the Cygwin environment.
-
-Under Cygwin environment, to compile the applications you need to
-compile and install the libev first.
-
-Secondly, you need to undefine the macro ``__STRICT_ANSI__``, if you
-not, the functions ``fdopen``, ``fileno`` and ``strptime`` will not
-available.
-
-the sample command like this:
-
-.. code-block:: text
-
-    $ export CFLAGS="-U__STRICT_ANSI__ -I$libev_PREFIX/include -L$libev_PREFIX/lib"
-    $ export CXXFLAGS=$CFLAGS
-    $ ./configure
-    $ make
-
-If you want to compile the applications under ``examples/``, you need
-to remove or rename the ``event.h`` from libev's installation, because
-it conflicts with libevent's installation.
-
-Notes for installation on Linux systems
---------------------------------------------
-After installing nghttp2 tool suite with ``make install`` one might experience a similar error:
-
-.. code-block:: text
-
-    nghttpx: error while loading shared libraries: libnghttp2.so.14: cannot open shared object file: No such file or directory
-
-This means that the tool is unable to locate the ``libnghttp2.so`` shared library.
-
-To update the shared library cache run ``sudo ldconfig``.
-
-Building the documentation
---------------------------
-
-.. note::
-
-   Documentation is still incomplete.
-
-To build the documentation, run:
-
-.. code-block:: text
-
-    $ make html
-
-The documents will be generated under ``doc/manual/html/``.
-
-The generated documents will not be installed with ``make install``.
-
-The online documentation is available at
-https://nghttp2.org/documentation/
-
-Unit tests
-----------
-
-Unit tests are done by simply running ``make check``.
-
-Integration tests
------------------
-
-We have the integration tests for the nghttpx proxy server.  The tests are
-written in the `Go programming language <http://golang.org/>`_ and uses
-its testing framework.  We depend on the following libraries:
-
-* golang.org/x/net/http2
-* golang.org/x/net/websocket
-* https://github.com/tatsuhiro-t/go-nghttp2
-
-To download the above packages, after settings ``GOPATH``, run the
-following command under ``integration-tests`` directory:
-
-.. code-block:: text
-
-    $ make itprep
-
-To run the tests, run the following command under
-``integration-tests`` directory:
-
-.. code-block:: text
-
-    $ make it
-
-Inside the tests, we use port 3009 to run the test subject server.
-
-Migration from v0.7.15 or earlier
----------------------------------
-
-nghttp2 v1.0.0 introduced several backward incompatible changes.  In
-this section, we describe these changes and how to migrate to v1.0.0.
-
-ALPN protocol ID is now ``h2`` and ``h2c``
-++++++++++++++++++++++++++++++++++++++++++
-
-Previously we announced ``h2-14`` and ``h2c-14``.  v1.0.0 implements
-final protocol version, and we changed ALPN ID to ``h2`` and ``h2c``.
-The macros ``NGHTTP2_PROTO_VERSION_ID``,
-``NGHTTP2_PROTO_VERSION_ID_LEN``,
-``NGHTTP2_CLEARTEXT_PROTO_VERSION_ID``, and
-``NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN`` have been updated to
-reflect this change.
-
-Basically, existing applications do not have to do anything, just
-recompiling is enough for this change.
-
-Use word "client magic" where we use "client connection preface"
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-We use "client connection preface" to mean first 24 bytes of client
-connection preface.  This is technically not correct, since client
-connection preface is composed of 24 bytes client magic byte string
-followed by SETTINGS frame.  For clarification, we call "client magic"
-for this 24 bytes byte string and updated API.
-
-* ``NGHTTP2_CLIENT_CONNECTION_PREFACE`` was replaced with
-  ``NGHTTP2_CLIENT_MAGIC``.
-* ``NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN`` was replaced with
-  ``NGHTTP2_CLIENT_MAGIC_LEN``.
-* ``NGHTTP2_BAD_PREFACE`` was renamed as ``NGHTTP2_BAD_CLIENT_MAGIC``
-
-The already deprecated ``NGHTTP2_CLIENT_CONNECTION_HEADER`` and
-``NGHTTP2_CLIENT_CONNECTION_HEADER_LEN`` were removed.
-
-If application uses these macros, just replace old ones with new ones.
-Since v1.0.0, client magic is sent by library (see next subsection),
-so client application may just remove these macro use.
-
-Client magic is sent by library
-+++++++++++++++++++++++++++++++
-
-Previously nghttp2 library did not send client magic, which is first
-24 bytes byte string of client connection preface, and client
-applications have to send it by themselves.  Since v1.0.0, client
-magic is sent by library via first call of ``nghttp2_session_send()``
-or ``nghttp2_session_mem_send()``.
-
-The client applications which send client magic must remove the
-relevant code.
-
-Remove HTTP Alternative Services (Alt-Svc) related code
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Alt-Svc specification is not finalized yet.  To make our API stable,
-we have decided to remove all Alt-Svc related API from nghttp2.
-
-* ``NGHTTP2_EXT_ALTSVC`` was removed.
-* ``nghttp2_ext_altsvc`` was removed.
-
-We have already removed the functionality of Alt-Svc in v0.7 series
-and they have been essentially noop.  The application using these
-macro and struct, remove those lines.
-
-Use nghttp2_error in nghttp2_on_invalid_frame_recv_callback
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Previously ``nghttp2_on_invalid_frame_recv_cb_called`` took the
-``error_code``, defined in ``nghttp2_error_code``, as parameter.  But
-they are not detailed enough to debug.  Therefore, we decided to use
-more detailed ``nghttp2_error`` values instead.
-
-The application using this callback should update the callback
-signature.  If it treats ``error_code`` as HTTP/2 error code, update
-the code so that it is treated as ``nghttp2_error``.
-
-Receive client magic by default
-+++++++++++++++++++++++++++++++
-
-Previously nghttp2 did not process client magic (24 bytes byte
-string).  To make it deal with it, we had to use
-``nghttp2_option_set_recv_client_preface()``.  Since v1.0.0, nghttp2
-processes client magic by default and
-``nghttp2_option_set_recv_client_preface()`` was removed.
-
-Some application may want to disable this behaviour, so we added
-``nghttp2_option_set_no_recv_client_magic()`` to achieve this.
-
-The application using ``nghttp2_option_set_recv_client_preface()``
-with nonzero value, just remove it.
-
-The application using ``nghttp2_option_set_recv_client_preface()``
-with zero value or not using it must use
-``nghttp2_option_set_no_recv_client_magic()`` with nonzero value.
-
-Client, Server and Proxy programs
----------------------------------
-
-The ``src`` directory contains the HTTP/2 client, server and proxy programs.
-
-nghttp - client
-+++++++++++++++
-
-``nghttp`` is a HTTP/2 client.  It can connect to the HTTP/2 server
-with prior knowledge, HTTP Upgrade and NPN/ALPN TLS extension.
-
-It has verbose output mode for framing information.  Here is sample
-output from ``nghttp`` client:
-
-.. code-block:: text
-
-    $ nghttp -nv https://nghttp2.org
-    [  0.190] Connected
-    The negotiated protocol: h2
-    [  0.212] recv SETTINGS frame <length=12, flags=0x00, stream_id=0>
-	      (niv=2)
-	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
-	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
-    [  0.212] send SETTINGS frame <length=12, flags=0x00, stream_id=0>
-	      (niv=2)
-	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
-	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
-    [  0.212] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
-	      ; ACK
-	      (niv=0)
-    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=3>
-	      (dep_stream_id=0, weight=201, exclusive=0)
-    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=5>
-	      (dep_stream_id=0, weight=101, exclusive=0)
-    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=7>
-	      (dep_stream_id=0, weight=1, exclusive=0)
-    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=9>
-	      (dep_stream_id=7, weight=1, exclusive=0)
-    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=11>
-	      (dep_stream_id=3, weight=1, exclusive=0)
-    [  0.212] send HEADERS frame <length=39, flags=0x25, stream_id=13>
-	      ; END_STREAM | END_HEADERS | PRIORITY
-	      (padlen=0, dep_stream_id=11, weight=16, exclusive=0)
-	      ; Open new stream
-	      :method: GET
-	      :path: /
-	      :scheme: https
-	      :authority: nghttp2.org
-	      accept: */*
-	      accept-encoding: gzip, deflate
-	      user-agent: nghttp2/1.0.1-DEV
-    [  0.221] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
-	      ; ACK
-	      (niv=0)
-    [  0.221] recv (stream_id=13) :method: GET
-    [  0.221] recv (stream_id=13) :scheme: https
-    [  0.221] recv (stream_id=13) :path: /stylesheets/screen.css
-    [  0.221] recv (stream_id=13) :authority: nghttp2.org
-    [  0.221] recv (stream_id=13) accept-encoding: gzip, deflate
-    [  0.222] recv (stream_id=13) user-agent: nghttp2/1.0.1-DEV
-    [  0.222] recv PUSH_PROMISE frame <length=50, flags=0x04, stream_id=13>
-	      ; END_HEADERS
-	      (padlen=0, promised_stream_id=2)
-    [  0.222] recv (stream_id=13) :status: 200
-    [  0.222] recv (stream_id=13) date: Thu, 21 May 2015 16:38:14 GMT
-    [  0.222] recv (stream_id=13) content-type: text/html
-    [  0.222] recv (stream_id=13) last-modified: Fri, 15 May 2015 15:38:06 GMT
-    [  0.222] recv (stream_id=13) etag: W/"555612de-19f6"
-    [  0.222] recv (stream_id=13) link: </stylesheets/screen.css>; rel=preload; as=stylesheet
-    [  0.222] recv (stream_id=13) content-encoding: gzip
-    [  0.222] recv (stream_id=13) server: nghttpx nghttp2/1.0.1-DEV
-    [  0.222] recv (stream_id=13) via: 1.1 nghttpx
-    [  0.222] recv (stream_id=13) strict-transport-security: max-age=31536000
-    [  0.222] recv HEADERS frame <length=166, flags=0x04, stream_id=13>
-	      ; END_HEADERS
-	      (padlen=0)
-	      ; First response header
-    [  0.222] recv DATA frame <length=2601, flags=0x01, stream_id=13>
-	      ; END_STREAM
-    [  0.222] recv (stream_id=2) :status: 200
-    [  0.222] recv (stream_id=2) date: Thu, 21 May 2015 16:38:14 GMT
-    [  0.222] recv (stream_id=2) content-type: text/css
-    [  0.222] recv (stream_id=2) last-modified: Fri, 15 May 2015 15:38:06 GMT
-    [  0.222] recv (stream_id=2) etag: W/"555612de-9845"
-    [  0.222] recv (stream_id=2) content-encoding: gzip
-    [  0.222] recv (stream_id=2) server: nghttpx nghttp2/1.0.1-DEV
-    [  0.222] recv (stream_id=2) via: 1.1 nghttpx
-    [  0.222] recv (stream_id=2) strict-transport-security: max-age=31536000
-    [  0.222] recv HEADERS frame <length=32, flags=0x04, stream_id=2>
-	      ; END_HEADERS
-	      (padlen=0)
-	      ; First push response header
-    [  0.228] recv DATA frame <length=8715, flags=0x01, stream_id=2>
-	      ; END_STREAM
-    [  0.228] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
-	      (last_stream_id=2, error_code=NO_ERROR(0x00), opaque_data(0)=[])
-
-The HTTP Upgrade is performed like so:
-
-.. code-block:: text
-
-    $ nghttp -nvu http://nghttp2.org
-    [  0.011] Connected
-    [  0.011] HTTP Upgrade request
-    GET / HTTP/1.1
-    Host: nghttp2.org
-    Connection: Upgrade, HTTP2-Settings
-    Upgrade: h2c
-    HTTP2-Settings: AAMAAABkAAQAAP__
-    Accept: */*
-    User-Agent: nghttp2/1.0.1-DEV
-
-
-    [  0.018] HTTP Upgrade response
-    HTTP/1.1 101 Switching Protocols
-    Connection: Upgrade
-    Upgrade: h2c
-
-
-    [  0.018] HTTP Upgrade success
-    [  0.018] recv SETTINGS frame <length=12, flags=0x00, stream_id=0>
-	      (niv=2)
-	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
-	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
-    [  0.018] send SETTINGS frame <length=12, flags=0x00, stream_id=0>
-	      (niv=2)
-	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
-	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
-    [  0.018] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
-	      ; ACK
-	      (niv=0)
-    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=3>
-	      (dep_stream_id=0, weight=201, exclusive=0)
-    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=5>
-	      (dep_stream_id=0, weight=101, exclusive=0)
-    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=7>
-	      (dep_stream_id=0, weight=1, exclusive=0)
-    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=9>
-	      (dep_stream_id=7, weight=1, exclusive=0)
-    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=11>
-	      (dep_stream_id=3, weight=1, exclusive=0)
-    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=1>
-	      (dep_stream_id=11, weight=16, exclusive=0)
-    [  0.019] recv (stream_id=1) :method: GET
-    [  0.019] recv (stream_id=1) :scheme: http
-    [  0.019] recv (stream_id=1) :path: /stylesheets/screen.css
-    [  0.019] recv (stream_id=1) host: nghttp2.org
-    [  0.019] recv (stream_id=1) user-agent: nghttp2/1.0.1-DEV
-    [  0.019] recv PUSH_PROMISE frame <length=49, flags=0x04, stream_id=1>
-	      ; END_HEADERS
-	      (padlen=0, promised_stream_id=2)
-    [  0.019] recv (stream_id=1) :status: 200
-    [  0.019] recv (stream_id=1) date: Thu, 21 May 2015 16:39:16 GMT
-    [  0.019] recv (stream_id=1) content-type: text/html
-    [  0.019] recv (stream_id=1) content-length: 6646
-    [  0.019] recv (stream_id=1) last-modified: Fri, 15 May 2015 15:38:06 GMT
-    [  0.019] recv (stream_id=1) etag: "555612de-19f6"
-    [  0.019] recv (stream_id=1) link: </stylesheets/screen.css>; rel=preload; as=stylesheet
-    [  0.019] recv (stream_id=1) accept-ranges: bytes
-    [  0.019] recv (stream_id=1) server: nghttpx nghttp2/1.0.1-DEV
-    [  0.019] recv (stream_id=1) via: 1.1 nghttpx
-    [  0.019] recv HEADERS frame <length=157, flags=0x04, stream_id=1>
-	      ; END_HEADERS
-	      (padlen=0)
-	      ; First response header
-    [  0.019] recv DATA frame <length=6646, flags=0x01, stream_id=1>
-	      ; END_STREAM
-    [  0.019] recv (stream_id=2) :status: 200
-    [  0.019] recv (stream_id=2) date: Thu, 21 May 2015 16:39:16 GMT
-    [  0.019] recv (stream_id=2) content-type: text/css
-    [  0.019] recv (stream_id=2) content-length: 38981
-    [  0.019] recv (stream_id=2) last-modified: Fri, 15 May 2015 15:38:06 GMT
-    [  0.019] recv (stream_id=2) etag: "555612de-9845"
-    [  0.019] recv (stream_id=2) accept-ranges: bytes
-    [  0.019] recv (stream_id=2) server: nghttpx nghttp2/1.0.1-DEV
-    [  0.019] recv (stream_id=2) via: 1.1 nghttpx
-    [  0.019] recv HEADERS frame <length=36, flags=0x04, stream_id=2>
-	      ; END_HEADERS
-	      (padlen=0)
-	      ; First push response header
-    [  0.026] recv DATA frame <length=16384, flags=0x00, stream_id=2>
-    [  0.027] recv DATA frame <length=7952, flags=0x00, stream_id=2>
-    [  0.027] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=0>
-	      (window_size_increment=33343)
-    [  0.032] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=2>
-	      (window_size_increment=33707)
-    [  0.032] recv DATA frame <length=14645, flags=0x01, stream_id=2>
-	      ; END_STREAM
-    [  0.032] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
-	      ; ACK
-	      (niv=0)
-    [  0.032] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
-	      (last_stream_id=2, error_code=NO_ERROR(0x00), opaque_data(0)=[])
-
-Using the ``-s`` option, ``nghttp`` prints out some timing information for
-requests, sorted by completion time:
-
-.. code-block:: text
-
-    $ nghttp -nas https://nghttp2.org/
-    ***** Statistics *****
-
-    Request timing:
-      responseEnd: the  time  when  last  byte of  response  was  received
-                   relative to connectEnd
-     requestStart: the time  just before  first byte  of request  was sent
-                   relative  to connectEnd.   If  '*' is  shown, this  was
-                   pushed by server.
-          process: responseEnd - requestStart
-             code: HTTP status code
-             size: number  of  bytes  received as  response  body  without
-                   inflation.
-              URI: request URI
-
-    see http://www.w3.org/TR/resource-timing/#processing-model
-
-    sorted by 'complete'
-
-    id  responseEnd requestStart  process code size request path
-     13    +37.19ms       +280us  36.91ms  200   2K /
-      2    +72.65ms *   +36.38ms  36.26ms  200   8K /stylesheets/screen.css
-     17    +77.43ms     +38.67ms  38.75ms  200   3K /javascripts/octopress.js
-     15    +78.12ms     +38.66ms  39.46ms  200   3K /javascripts/modernizr-2.0.js
-
-Using the ``-r`` option, ``nghttp`` writes more detailed timing data to
-the given file in HAR format.
-
-nghttpd - server
-++++++++++++++++
-
-``nghttpd`` is a multi-threaded static web server.
-
-By default, it uses SSL/TLS connection.  Use ``--no-tls`` option to
-disable it.
-
-``nghttpd`` only accepts HTTP/2 connections via NPN/ALPN or direct
-HTTP/2 connections.  No HTTP Upgrade is supported.
-
-The ``-p`` option allows users to configure server push.
-
-Just like ``nghttp``, it has a verbose output mode for framing
-information.  Here is sample output from ``nghttpd``:
-
-.. code-block:: text
-
-    $ nghttpd --no-tls -v 8080
-    IPv4: listen 0.0.0.0:8080
-    IPv6: listen :::8080
-    [id=1] [  1.521] send SETTINGS frame <length=6, flags=0x00, stream_id=0>
-              (niv=1)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
-    [id=1] [  1.521] recv SETTINGS frame <length=12, flags=0x00, stream_id=0>
-              (niv=2)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
-              [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
-    [id=1] [  1.521] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
-              ; ACK
-              (niv=0)
-    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=3>
-              (dep_stream_id=0, weight=201, exclusive=0)
-    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=5>
-              (dep_stream_id=0, weight=101, exclusive=0)
-    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=7>
-              (dep_stream_id=0, weight=1, exclusive=0)
-    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=9>
-              (dep_stream_id=7, weight=1, exclusive=0)
-    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=11>
-              (dep_stream_id=3, weight=1, exclusive=0)
-    [id=1] [  1.521] recv (stream_id=13) :method: GET
-    [id=1] [  1.521] recv (stream_id=13) :path: /
-    [id=1] [  1.521] recv (stream_id=13) :scheme: http
-    [id=1] [  1.521] recv (stream_id=13) :authority: localhost:8080
-    [id=1] [  1.521] recv (stream_id=13) accept: */*
-    [id=1] [  1.521] recv (stream_id=13) accept-encoding: gzip, deflate
-    [id=1] [  1.521] recv (stream_id=13) user-agent: nghttp2/1.0.0-DEV
-    [id=1] [  1.521] recv HEADERS frame <length=41, flags=0x25, stream_id=13>
-              ; END_STREAM | END_HEADERS | PRIORITY
-              (padlen=0, dep_stream_id=11, weight=16, exclusive=0)
-              ; Open new stream
-    [id=1] [  1.521] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
-              ; ACK
-              (niv=0)
-    [id=1] [  1.521] send HEADERS frame <length=86, flags=0x04, stream_id=13>
-              ; END_HEADERS
-              (padlen=0)
-              ; First response header
-              :status: 200
-              server: nghttpd nghttp2/1.0.0-DEV
-              content-length: 10
-              cache-control: max-age=3600
-              date: Fri, 15 May 2015 14:49:04 GMT
-              last-modified: Tue, 30 Sep 2014 12:40:52 GMT
-    [id=1] [  1.522] send DATA frame <length=10, flags=0x01, stream_id=13>
-              ; END_STREAM
-    [id=1] [  1.522] stream_id=13 closed
-    [id=1] [  1.522] recv GOAWAY frame <length=8, flags=0x00, stream_id=0>
-              (last_stream_id=0, error_code=NO_ERROR(0x00), opaque_data(0)=[])
-    [id=1] [  1.522] closed
-
-nghttpx - proxy
-+++++++++++++++
-
-``nghttpx`` is a multi-threaded reverse proxy for HTTP/2, and
-HTTP/1.1, and powers http://nghttp2.org and supports HTTP/2 server
-push.
-
-We reworked ``nghttpx`` command-line interface, and as a result, there
-are several incompatibles from 1.8.0 or earlier.  This is necessary to
-extend its capability, and secure the further feature enhancements in
-the future release.  Please read `Migration from nghttpx v1.8.0 or
-earlier
-<https://nghttp2.org/documentation/nghttpx-howto.html#migration-from-nghttpx-v1-8-0-or-earlier>`_
-to know how to migrate from earlier releases.
-
-``nghttpx`` implements `important performance-oriented features
-<https://istlsfastyet.com/#server-performance>`_ in TLS, such as
-session IDs, session tickets (with automatic key rotation), OCSP
-stapling, dynamic record sizing, ALPN/NPN, forward secrecy and HTTP/2.
-``nghttpx`` also offers the functionality to share session cache and
-ticket keys among multiple ``nghttpx`` instances via memcached.
-
-``nghttpx`` has 2 operation modes:
-
-================== ================ ================ =============
-Mode option        Frontend         Backend          Note
-================== ================ ================ =============
-default mode       HTTP/2, HTTP/1.1 HTTP/1.1, HTTP/2 Reverse proxy
-``--http2-proxy``  HTTP/2, HTTP/1.1 HTTP/1.1, HTTP/2 Forward proxy
-================== ================ ================ =============
-
-The interesting mode at the moment is the default mode.  It works like
-a reverse proxy and listens for HTTP/2, and HTTP/1.1 and can be
-deployed as a SSL/TLS terminator for existing web server.
-
-In all modes, the frontend connections are encrypted by SSL/TLS by
-default.  To disable encryption, use the ``no-tls`` keyword in
-``--frontend`` option.  If encryption is disabled, incoming HTTP/1.1
-connections can be upgraded to HTTP/2 through HTTP Upgrade.  On the
-other hard, backend connections are not encrypted by default.  To
-encrypt backend connections, use ``tls`` keyword in ``--backend``
-option.
-
-``nghttpx`` supports a configuration file.  See the ``--conf`` option and
-sample configuration file ``nghttpx.conf.sample``.
-
-In the default mode, ``nghttpx`` works as reverse proxy to the backend
-server:
-
-.. code-block:: text
-
-    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/1.1, HTTP/2) --> Web Server
-                                    [reverse proxy]
-
-With the ``--http2-proxy`` option, it works as forward proxy, and it
-is so called secure HTTP/2 proxy:
-
-.. code-block:: text
-
-    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
-                                     [secure proxy]          (e.g., Squid, ATS)
-
-The ``Client`` in the above example needs to be configured to use
-``nghttpx`` as secure proxy.
-
-At the time of this writing, both Chrome and Firefox support secure
-HTTP/2 proxy.  One way to configure Chrome to use a secure proxy is to
-create a proxy.pac script like this:
-
-.. code-block:: javascript
-
-    function FindProxyForURL(url, host) {
-        return "HTTPS SERVERADDR:PORT";
-    }
-
-``SERVERADDR`` and ``PORT`` is the hostname/address and port of the
-machine nghttpx is running on.  Please note that Chrome requires a valid
-certificate for secure proxy.
-
-Then run Chrome with the following arguments:
-
-.. code-block:: text
-
-    $ google-chrome --proxy-pac-url=file:///path/to/proxy.pac --use-npn
-
-The backend HTTP/2 connections can be tunneled through an HTTP proxy.
-The proxy is specified using ``--backend-http-proxy-uri``.  The
-following figure illustrates how nghttpx talks to the outside HTTP/2
-proxy through an HTTP proxy:
-
-.. code-block:: text
-
-    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --
-
-            --===================---> HTTP/2 Proxy
-              (HTTP proxy tunnel)     (e.g., nghttpx -s)
-
-Benchmarking tool
------------------
-
-The ``h2load`` program is a benchmarking tool for HTTP/2.  The UI of
-``h2load`` is heavily inspired by ``weighttp``
-(https://github.com/lighttpd/weighttp).  The typical usage is as
-follows:
-
-.. code-block:: text
-
-    $ h2load -n100000 -c100 -m100 https://localhost:8443/
-    starting benchmark...
-    spawning thread #0: 100 concurrent clients, 100000 total requests
-    Protocol: TLSv1.2
-    Cipher: ECDHE-RSA-AES128-GCM-SHA256
-    Server Temp Key: ECDH P-256 256 bits
-    progress: 10% done
-    progress: 20% done
-    progress: 30% done
-    progress: 40% done
-    progress: 50% done
-    progress: 60% done
-    progress: 70% done
-    progress: 80% done
-    progress: 90% done
-    progress: 100% done
-
-    finished in 771.26ms, 129658 req/s, 4.71MB/s
-    requests: 100000 total, 100000 started, 100000 done, 100000 succeeded, 0 failed, 0 errored
-    status codes: 100000 2xx, 0 3xx, 0 4xx, 0 5xx
-    traffic: 3812300 bytes total, 1009900 bytes headers, 1000000 bytes data
-                         min         max         mean         sd        +/- sd
-    time for request:    25.12ms    124.55ms     51.07ms     15.36ms    84.87%
-    time for connect:   208.94ms    254.67ms    241.38ms      7.95ms    63.00%
-    time to 1st byte:   209.11ms    254.80ms    241.51ms      7.94ms    63.00%
-
-The above example issued total 100,000 requests, using 100 concurrent
-clients (in other words, 100 HTTP/2 sessions), and a maximum of 100 streams
-per client.  With the ``-t`` option, ``h2load`` will use multiple native
-threads to avoid saturating a single core on client side.
-
-.. warning::
-
-   **Don't use this tool against publicly available servers.** That is
-   considered a DOS attack.  Please only use it against your private
-   servers.
-
-HPACK tools
------------
-
-The ``src`` directory contains the HPACK tools.  The ``deflatehd`` program is a
-command-line header compression tool.  The ``inflatehd`` program is a
-command-line header decompression tool.  Both tools read input from
-stdin and write output to stdout.  Errors are written to stderr.
-They take JSON as input and output.  We  (mostly) use the same JSON data
-format described at https://github.com/http2jp/hpack-test-case.
-
-deflatehd - header compressor
-+++++++++++++++++++++++++++++
-
-The ``deflatehd`` program reads JSON data or HTTP/1-style header fields from
-stdin and outputs compressed header block in JSON.
-
-For the JSON input, the root JSON object must include a ``cases`` key.
-Its value has to include the sequence of input header set.  They share
-the same compression context and are processed in the order they
-appear.  Each item in the sequence is a JSON object and it must
-include a ``headers`` key.  Its value is an array of JSON objects,
-which includes exactly one name/value pair.
-
-Example:
-
-.. code-block:: json
-
-    {
-      "cases":
-      [
-        {
-          "headers": [
-            { ":method": "GET" },
-            { ":path": "/" }
-          ]
-        },
-        {
-          "headers": [
-            { ":method": "POST" },
-            { ":path": "/" }
-          ]
-        }
-      ]
-    }
-
-
-With the ``-t`` option, the program can accept more familiar HTTP/1 style
-header field blocks.  Each header set is delimited by an empty line:
-
-Example:
-
-.. code-block:: text
-
-    :method: GET
-    :scheme: https
-    :path: /
-
-    :method: POST
-    user-agent: nghttp2
-
-The output is in JSON object.  It should include a ``cases`` key and its
-value is an array of JSON objects, which has at least the following keys:
-
-seq
-    The index of header set in the input.
-
-input_length
-    The sum of the length of the name/value pairs in the input.
-
-output_length
-    The length of the compressed header block.
-
-percentage_of_original_size
-    ``output_length`` / ``input_length`` * 100
-
-wire
-    The compressed header block as a hex string.
-
-headers
-    The input header set.
-
-header_table_size
-    The header table size adjusted before deflating the header set.
-
-Examples:
-
-.. code-block:: json
-
-    {
-      "cases":
-      [
-        {
-          "seq": 0,
-          "input_length": 66,
-          "output_length": 20,
-          "percentage_of_original_size": 30.303030303030305,
-          "wire": "01881f3468e5891afcbf83868a3d856659c62e3f",
-          "headers": [
-            {
-              ":authority": "example.org"
-            },
-            {
-              ":method": "GET"
-            },
-            {
-              ":path": "/"
-            },
-            {
-              ":scheme": "https"
-            },
-            {
-              "user-agent": "nghttp2"
-            }
-          ],
-          "header_table_size": 4096
-        }
-        ,
-        {
-          "seq": 1,
-          "input_length": 74,
-          "output_length": 10,
-          "percentage_of_original_size": 13.513513513513514,
-          "wire": "88448504252dd5918485",
-          "headers": [
-            {
-              ":authority": "example.org"
-            },
-            {
-              ":method": "POST"
-            },
-            {
-              ":path": "/account"
-            },
-            {
-              ":scheme": "https"
-            },
-            {
-              "user-agent": "nghttp2"
-            }
-          ],
-          "header_table_size": 4096
-        }
-      ]
-    }
-
-
-The output can be used as the input for ``inflatehd`` and
-``deflatehd``.
-
-With the ``-d`` option, the extra ``header_table`` key is added and its
-associated value includes the state of dynamic header table after the
-corresponding header set was processed.  The value includes at least
-the following keys:
-
-entries
-    The entry in the header table.  If ``referenced`` is ``true``, it
-    is in the reference set.  The ``size`` includes the overhead (32
-    bytes).  The ``index`` corresponds to the index of header table.
-    The ``name`` is the header field name and the ``value`` is the
-    header field value.
-
-size
-    The sum of the spaces entries occupied, this includes the
-    entry overhead.
-
-max_size
-    The maximum header table size.
-
-deflate_size
-    The sum of the spaces entries occupied within
-    ``max_deflate_size``.
-
-max_deflate_size
-    The maximum header table size the encoder uses.  This can be smaller
-    than ``max_size``.  In this case, the encoder only uses up to first
-    ``max_deflate_size`` buffer.  Since the header table size is still
-    ``max_size``, the encoder has to keep track of entries outside the
-    ``max_deflate_size`` but inside the ``max_size`` and make sure
-    that they are no longer referenced.
-
-Example:
-
-.. code-block:: json
-
-    {
-      "cases":
-      [
-        {
-          "seq": 0,
-          "input_length": 66,
-          "output_length": 20,
-          "percentage_of_original_size": 30.303030303030305,
-          "wire": "01881f3468e5891afcbf83868a3d856659c62e3f",
-          "headers": [
-            {
-              ":authority": "example.org"
-            },
-            {
-              ":method": "GET"
-            },
-            {
-              ":path": "/"
-            },
-            {
-              ":scheme": "https"
-            },
-            {
-              "user-agent": "nghttp2"
-            }
-          ],
-          "header_table_size": 4096,
-          "header_table": {
-            "entries": [
-              {
-                "index": 1,
-                "name": "user-agent",
-                "value": "nghttp2",
-                "referenced": true,
-                "size": 49
-              },
-              {
-                "index": 2,
-                "name": ":scheme",
-                "value": "https",
-                "referenced": true,
-                "size": 44
-              },
-              {
-                "index": 3,
-                "name": ":path",
-                "value": "/",
-                "referenced": true,
-                "size": 38
-              },
-              {
-                "index": 4,
-                "name": ":method",
-                "value": "GET",
-                "referenced": true,
-                "size": 42
-              },
-              {
-                "index": 5,
-                "name": ":authority",
-                "value": "example.org",
-                "referenced": true,
-                "size": 53
-              }
-            ],
-            "size": 226,
-            "max_size": 4096,
-            "deflate_size": 226,
-            "max_deflate_size": 4096
-          }
-        }
-        ,
-        {
-          "seq": 1,
-          "input_length": 74,
-          "output_length": 10,
-          "percentage_of_original_size": 13.513513513513514,
-          "wire": "88448504252dd5918485",
-          "headers": [
-            {
-              ":authority": "example.org"
-            },
-            {
-              ":method": "POST"
-            },
-            {
-              ":path": "/account"
-            },
-            {
-              ":scheme": "https"
-            },
-            {
-              "user-agent": "nghttp2"
-            }
-          ],
-          "header_table_size": 4096,
-          "header_table": {
-            "entries": [
-              {
-                "index": 1,
-                "name": ":method",
-                "value": "POST",
-                "referenced": true,
-                "size": 43
-              },
-              {
-                "index": 2,
-                "name": "user-agent",
-                "value": "nghttp2",
-                "referenced": true,
-                "size": 49
-              },
-              {
-                "index": 3,
-                "name": ":scheme",
-                "value": "https",
-                "referenced": true,
-                "size": 44
-              },
-              {
-                "index": 4,
-                "name": ":path",
-                "value": "/",
-                "referenced": false,
-                "size": 38
-              },
-              {
-                "index": 5,
-                "name": ":method",
-                "value": "GET",
-                "referenced": false,
-                "size": 42
-              },
-              {
-                "index": 6,
-                "name": ":authority",
-                "value": "example.org",
-                "referenced": true,
-                "size": 53
-              }
-            ],
-            "size": 269,
-            "max_size": 4096,
-            "deflate_size": 269,
-            "max_deflate_size": 4096
-          }
-        }
-      ]
-    }
-
-inflatehd - header decompressor
-+++++++++++++++++++++++++++++++
-
-The ``inflatehd`` program reads JSON data from stdin and outputs decompressed
-name/value pairs in JSON.
-
-The root JSON object must include the ``cases`` key.  Its value has to
-include the sequence of compressed header blocks.  They share the same
-compression context and are processed in the order they appear.  Each
-item in the sequence is a JSON object and it must have at least a
-``wire`` key.  Its value is a compressed header block as a hex string.
-
-Example:
-
-.. code-block:: json
-
-    {
-      "cases":
-      [
-        { "wire": "8285" },
-        { "wire": "8583" }
-      ]
-    }
-
-The output is a JSON object.  It should include a ``cases`` key and its
-value is an array of JSON objects, which has at least following keys:
-
-seq
-    The index of the header set in the input.
-
-headers
-    A JSON array that includes decompressed name/value pairs.
-
-wire
-    The compressed header block as a hex string.
-
-header_table_size
-    The header table size adjusted before inflating compressed header
-    block.
-
-Example:
-
-.. code-block:: json
-
-    {
-      "cases":
-      [
-        {
-          "seq": 0,
-          "wire": "01881f3468e5891afcbf83868a3d856659c62e3f",
-          "headers": [
-            {
-              ":authority": "example.org"
-            },
-            {
-              ":method": "GET"
-            },
-            {
-              ":path": "/"
-            },
-            {
-              ":scheme": "https"
-            },
-            {
-              "user-agent": "nghttp2"
-            }
-          ],
-          "header_table_size": 4096
-        }
-        ,
-        {
-          "seq": 1,
-          "wire": "88448504252dd5918485",
-          "headers": [
-            {
-              ":method": "POST"
-            },
-            {
-              ":path": "/account"
-            },
-            {
-              "user-agent": "nghttp2"
-            },
-            {
-              ":scheme": "https"
-            },
-            {
-              ":authority": "example.org"
-            }
-          ],
-          "header_table_size": 4096
-        }
-      ]
-    }
-
-The output can be used as the input for ``deflatehd`` and
-``inflatehd``.
-
-With the ``-d`` option, the extra ``header_table`` key is added and its
-associated value includes the state of the dynamic header table after the
-corresponding header set was processed.  The format is the same as
-``deflatehd``.
-
-libnghttp2_asio: High level HTTP/2 C++ library
-----------------------------------------------
-
-libnghttp2_asio is C++ library built on top of libnghttp2 and provides
-high level abstraction API to build HTTP/2 applications.  It depends
-on the Boost::ASIO library and OpenSSL.  Currently libnghttp2_asio
-provides both client and server APIs.
-
-libnghttp2_asio is not built by default.  Use the ``--enable-asio-lib``
-configure flag to build libnghttp2_asio.  The required Boost libraries
-are:
-
-* Boost::Asio
-* Boost::System
-* Boost::Thread
-
-The server API is designed to build an HTTP/2 server very easily to utilize
-C++11 anonymous functions and closures.  The bare minimum example of
-an HTTP/2 server looks like this:
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_server.h>
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::server;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      http2 server;
-
-      server.handle("/", [](const request &req, const response &res) {
-        res.write_head(200);
-        res.end("hello, world\n");
-      });
-
-      if (server.listen_and_serve(ec, "localhost", "3000")) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      }
-    }
-
-Here is sample code to use the client API:
-
-.. code-block:: cpp
-
-    #include <iostream>
-
-    #include <nghttp2/asio_http2_client.h>
-
-    using boost::asio::ip::tcp;
-
-    using namespace nghttp2::asio_http2;
-    using namespace nghttp2::asio_http2::client;
-
-    int main(int argc, char *argv[]) {
-      boost::system::error_code ec;
-      boost::asio::io_service io_service;
-
-      // connect to localhost:3000
-      session sess(io_service, "localhost", "3000");
-
-      sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
-        boost::system::error_code ec;
-
-        auto req = sess.submit(ec, "GET", "http://localhost:3000/");
-
-        req->on_response([](const response &res) {
-          // print status code and response header fields.
-          std::cerr << "HTTP/2 " << res.status_code() << std::endl;
-          for (auto &kv : res.header()) {
-            std::cerr << kv.first << ": " << kv.second.value << "\n";
-          }
-          std::cerr << std::endl;
-
-          res.on_data([](const uint8_t *data, std::size_t len) {
-            std::cerr.write(reinterpret_cast<const char *>(data), len);
-            std::cerr << std::endl;
-          });
-        });
-
-        req->on_close([&sess](uint32_t error_code) {
-          // shutdown session after first request was done.
-          sess.shutdown();
-        });
-      });
-
-      sess.on_error([](const boost::system::error_code &ec) {
-        std::cerr << "error: " << ec.message() << std::endl;
-      });
-
-      io_service.run();
-    }
-
-For more details, see the documentation of libnghttp2_asio.
-
-Python bindings
----------------
-
-The ``python`` directory contains nghttp2 Python bindings.  The
-bindings currently provide HPACK compressor and decompressor classes
-and an HTTP/2 server.
-
-The extension module is called ``nghttp2``.
-
-``make`` will build the bindings and target Python version is
-determined by the ``configure`` script.  If the detected Python version is not
-what you expect, specify a path to Python executable in a ``PYTHON``
-variable as an argument to configure script (e.g., ``./configure
-PYTHON=/usr/bin/python3.5``).
-
-The following example code illustrates basic usage of the HPACK compressor
-and decompressor in Python:
-
-.. code-block:: python
-
-    import binascii
-    import nghttp2
-
-    deflater = nghttp2.HDDeflater()
-    inflater = nghttp2.HDInflater()
-
-    data = deflater.deflate([(b'foo', b'bar'),
-                             (b'baz', b'buz')])
-    print(binascii.b2a_hex(data))
-
-    hdrs = inflater.inflate(data)
-    print(hdrs)
-
-The ``nghttp2.HTTP2Server`` class builds on top of the asyncio event
-loop.  On construction, *RequestHandlerClass* must be given, which
-must be a subclass of ``nghttp2.BaseRequestHandler`` class.
-
-The ``BaseRequestHandler`` class is used to handle the HTTP/2 stream.
-By default, it does nothing.  It must be subclassed to handle each
-event callback method.
-
-The first callback method invoked is ``on_headers()``.  It is called
-when HEADERS frame, which includes the request header fields, has arrived.
-
-If the request has a request body, ``on_data(data)`` is invoked for each
-chunk of received data.
-
-Once the entire request is received, ``on_request_done()`` is invoked.
-
-When the stream is closed, ``on_close(error_code)`` is called.
-
-The application can send a response using ``send_response()`` method.
-It can be used in ``on_headers()``, ``on_data()`` or
-``on_request_done()``.
-
-The application can push resources using the ``push()`` method.  It must be
-used before the ``send_response()`` call.
-
-The following instance variables are available:
-
-client_address
-    Contains a tuple of the form (host, port) referring to the
-    client's address.
-
-stream_id
-    Stream ID of this stream.
-
-scheme
-    Scheme of the request URI.  This is a value of :scheme header
-    field.
-
-method
-    Method of this stream.  This is a value of :method header field.
-
-host
-    This is a value of :authority or host header field.
-
-path
-    This is a value of :path header field.
-
-The following example illustrates the HTTP2Server and
-BaseRequestHandler usage:
-
-.. code-block:: python
-
-    #!/usr/bin/env python
-
-    import io, ssl
-    import nghttp2
-
-    class Handler(nghttp2.BaseRequestHandler):
-
-        def on_headers(self):
-            self.push(path='/css/bootstrap.css',
-                      request_headers = [('content-length', '3')],
-                      status=200,
-                      body='foo')
-
-            self.push(path='/js/bootstrap.js',
-                      method='GET',
-                      request_headers = [('content-length', '10')],
-                      status=200,
-                      body='foobarbuzz')
-
-            self.send_response(status=200,
-                               headers = [('content-type', 'text/plain')],
-                               body=io.BytesIO(b'nghttp2-python FTW'))
-
-    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2
-    ctx.load_cert_chain('server.crt', 'server.key')
-
-    # give None to ssl to make the server non-SSL/TLS
-    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
-    server.serve_forever()
-
-Contribution
-------------
-
-[This text was composed based on 1.2. License section of curl/libcurl
-project.]
-
-When contributing with code, you agree to put your changes and new
-code under the same license nghttp2 is already using unless stated and
-agreed otherwise.
-
-When changing existing source code, do not alter the copyright of
-the original file(s).  The copyright will still be owned by the
-original creator(s) or those who have been assigned copyright by the
-original author(s).
-
-By submitting a patch to the nghttp2 project, you (or your employer, as
-the case may be) agree to assign the copyright of your submission to us.
-.. the above really needs to be reworded to pass legal muster.
-We will credit you for your
-changes as far as possible, to give credit but also to keep a trace
-back to who made what changes.  Please always provide us with your
-full real name when contributing!
-
-See `Contribution Guidelines
-<https://nghttp2.org/documentation/contribute.html>`_ for more
-details.
-
-Reporting vulnerability
------------------------
-
-If you find a vulnerability in our software, please send the email to
-"tatsuhiro.t at gmail dot com" about its details instead of submitting
-issues on github issue page.  It is a standard practice not to
-disclose vulnerability information publicly until a fixed version is
-released, or mitigation is worked out.
-
-In the future, we may setup a dedicated mail address for this purpose.
-
-Release schedule
-----------------
-
-In general, we follow `Semantic Versioning <http://semver.org/>`_.  We
-release MINOR version update every month, and usually we ship it
-around 25th day of every month.
-
-We may release PATCH releases between the regular releases, mainly for
-severe security bug fixes.
-
-We have no plan to break API compatibility changes involving soname
-bump, so MAJOR version will stay 1 for the foreseeable future.
-
-License
--------
-
-The MIT License
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/releasechk cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/releasechk
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/releasechk	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/releasechk	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-autoreconf -i
-git submodule update --init
-./configure --with-mruby --with-neverbleed --enable-asio-lib
-make -j8 distcheck DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --enable-asio-lib --enable-werror"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# EXTRA_DIST = README.rst
-install(
-  PROGRAMS fetch-ocsp-response
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}"
-)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/fetch-ocsp-response cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/fetch-ocsp-response
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/fetch-ocsp-response	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/fetch-ocsp-response	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2015 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# This program was translated from the program originally developed by
-# h2o project (https://github.com/h2o/h2o), written in Perl.  It had
-# the following copyright notice:
-
-# Copyright (c) 2015 DeNA Co., Ltd.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-from __future__ import unicode_literals
-import argparse
-import io
-import os
-import os.path
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-
-# make this program work for both Python 3 and Python 2.
-try:
-    from urllib.parse import urlparse
-    stdout_bwrite = sys.stdout.buffer.write
-except ImportError:
-    from urlparse import urlparse
-    stdout_bwrite = sys.stdout.write
-
-
-def die(msg):
-    sys.stderr.write(msg)
-    sys.stderr.write('\n')
-    sys.exit(255)
-
-
-def tempfail(msg):
-    sys.stderr.write(msg)
-    sys.stderr.write('\n')
-    sys.exit(os.EX_TEMPFAIL)
-
-
-def run_openssl(args, allow_tempfail=False):
-    buf = io.BytesIO()
-    try:
-        p = subprocess.Popen(args, stdout=subprocess.PIPE)
-    except Exception as e:
-        die('failed to invoke {}:{}'.format(args, e))
-    try:
-        while True:
-            data = p.stdout.read()
-            if len(data) == 0:
-                break
-            buf.write(data)
-        if p.wait() != 0:
-            raise Exception('nonzero return code {}'.format(p.returncode))
-        return buf.getvalue()
-    except Exception as e:
-        msg = 'OpenSSL exitted abnormally: {}:{}'.format(args, e)
-        tempfail(msg) if allow_tempfail else die(msg)
-
-
-def read_file(path):
-    with open(path, 'rb') as f:
-        return f.read()
-
-
-def write_file(path, data):
-    with open(path, 'wb') as f:
-        f.write(data)
-
-
-def detect_openssl_version(cmd):
-    return run_openssl([cmd, 'version']).decode('utf-8').strip()
-
-
-def extract_ocsp_uri(cmd, cert_fn):
-    # obtain ocsp uri
-    ocsp_uri = run_openssl(
-        [cmd, 'x509', '-in', cert_fn, '-noout',
-         '-ocsp_uri']).decode('utf-8').strip()
-
-    if not re.match(r'^https?://', ocsp_uri):
-        die('failed to extract ocsp URI from {}'.format(cert_fn))
-
-    return ocsp_uri
-
-
-def save_issuer_certificate(issuer_fn, cert_fn):
-    # save issuer certificate
-    chain = read_file(cert_fn).decode('utf-8')
-    m = re.match(
-        r'.*?-----END CERTIFICATE-----.*?(-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----)',
-        chain, re.DOTALL)
-    if not m:
-        die('--issuer option was not used, and failed to extract issuer certificate from the certificate')
-    write_file(issuer_fn, (m.group(1) + '\n').encode('utf-8'))
-
-
-def send_and_receive_ocsp(respder_fn, cmd, cert_fn, issuer_fn, ocsp_uri,
-                          ocsp_host, openssl_version):
-    # obtain response (without verification)
-    sys.stderr.write('sending OCSP request to {}\n'.format(ocsp_uri))
-    args = [
-        cmd, 'ocsp', '-issuer', issuer_fn, '-cert', cert_fn, '-url', ocsp_uri,
-        '-noverify', '-respout', respder_fn
-    ]
-    ver = openssl_version.lower()
-    if ver.startswith('openssl 1.0.') or ver.startswith('libressl '):
-        args.extend(['-header', 'Host', ocsp_host])
-    resp = run_openssl(args, allow_tempfail=True)
-    return resp.decode('utf-8')
-
-
-def verify_response(cmd, tempdir, issuer_fn, respder_fn):
-    # verify the response
-    sys.stderr.write('verifying the response signature\n')
-
-    verify_fn = os.path.join(tempdir, 'verify.out')
-
-    # try from exotic options
-    allextra = [
-        # for comodo
-        ['-VAfile', issuer_fn],
-        # these options are only available in OpenSSL >= 1.0.2
-        ['-partial_chain', '-trusted_first', '-CAfile', issuer_fn],
-        # for OpenSSL <= 1.0.1
-        ['-CAfile', issuer_fn],
-    ]
-
-    for extra in allextra:
-        with open(verify_fn, 'w+b') as f:
-            args = [cmd, 'ocsp', '-respin', respder_fn]
-            args.extend(extra)
-            p = subprocess.Popen(args, stdout=f, stderr=f)
-            if p.wait() == 0:
-                # OpenSSL <= 1.0.1, openssl ocsp still returns exit
-                # code 0 even if verification was failed.  So check
-                # the error message in stderr output.
-                f.seek(0)
-                if f.read().decode('utf-8').find(
-                        'Response Verify Failure') != -1:
-                    continue
-                sys.stderr.write('verify OK (used: {})\n'.format(extra))
-                return True
-
-    sys.stderr.write(read_file(verify_fn).decode('utf-8'))
-    return False
-
-
-def fetch_ocsp_response(cmd, cert_fn, tempdir, issuer_fn=None):
-    openssl_version = detect_openssl_version(cmd)
-
-    sys.stderr.write(
-        'fetch-ocsp-response (using {})\n'.format(openssl_version))
-
-    ocsp_uri = extract_ocsp_uri(cmd, cert_fn)
-    ocsp_host = urlparse(ocsp_uri).netloc
-
-    if not issuer_fn:
-        issuer_fn = os.path.join(tempdir, 'issuer.crt')
-        save_issuer_certificate(issuer_fn, cert_fn)
-
-    respder_fn = os.path.join(tempdir, 'resp.der')
-    resp = send_and_receive_ocsp(
-        respder_fn, cmd, cert_fn, issuer_fn, ocsp_uri, ocsp_host,
-        openssl_version)
-
-    sys.stderr.write('{}\n'.format(resp))
-
-    # OpenSSL 1.0.2 still returns exit code 0 even if ocsp responder
-    # returned error status (e.g., trylater(3))
-    if resp.find('Responder Error:') != -1:
-        raise Exception('responder returned error')
-
-    if not verify_response(cmd, tempdir, issuer_fn, respder_fn):
-        tempfail('failed to verify the response')
-
-    # success
-    res = read_file(respder_fn)
-    stdout_bwrite(res)
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description=
-        '''The command issues an OCSP request for given server certificate, verifies the response and prints the resulting DER.''',
-        epilog=
-        '''The command exits 0 if successful, or 75 (EX_TEMPFAIL) on temporary error.  Other exit codes may be returned in case of hard errors.''')
-    parser.add_argument(
-        '--issuer',
-        metavar='FILE',
-        help=
-        'issuer certificate (if omitted, is extracted from the certificate chain)')
-    parser.add_argument('--openssl',
-                        metavar='CMD',
-                        help='openssl command to use (default: "openssl")',
-                        default='openssl')
-    parser.add_argument('certificate',
-                        help='path to certificate file to validate')
-    args = parser.parse_args()
-
-    tempdir = None
-    try:
-        # Python3.2 has tempfile.TemporaryDirectory, which has nice
-        # feature to delete its tree by cleanup() function.  We have
-        # to support Python2.7, so we have to do this manually.
-        tempdir = tempfile.mkdtemp()
-        fetch_ocsp_response(args.openssl, args.certificate, tempdir,
-                            args.issuer)
-    finally:
-        if tempdir:
-            shutil.rmtree(tempdir)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2015 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-EXTRA_DIST = README.rst CMakeLists.txt
-dist_pkgdata_SCRIPTS = fetch-ocsp-response
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/README.rst cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/README.rst
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/script/README.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/script/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-fetch-ocsp-response is a Python script which performs OCSP query and
-get response.  It uses openssl command under the hood.  nghttpx uses
-it to enable OCSP stapling feature.
-
-fetch-ocsp-response is a translation from original fetch-ocsp-response
-written in Perl and which has been developed as part of h2o project
-(https://github.com/h2o/h2o).
-
-fetch-ocsp-response is usually installed under $(pkgdatadir), which is
-$(prefix)/share/nghttp2.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/allocator.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/allocator.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/allocator.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/allocator.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,278 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ALLOCATOR_H
-#define ALLOCATOR_H
-
-#include "nghttp2_config.h"
-
-#ifndef _WIN32
-#  include <sys/uio.h>
-#endif // !_WIN32
-
-#include <cassert>
-
-#include "template.h"
-
-namespace nghttp2 {
-
-struct MemBlock {
-  // The next MemBlock to chain them.  This is for book keeping
-  // purpose to free them later.
-  MemBlock *next;
-  // begin is the pointer to the beginning of buffer.  last is the
-  // location of next write.  end is the one beyond of the end of the
-  // buffer.
-  uint8_t *begin, *last, *end;
-};
-
-// BlockAllocator allocates memory block with given size at once, and
-// cuts the region from it when allocation is requested.  If the
-// requested size is larger than given threshold (plus small internal
-// overhead), it will be allocated in a distinct buffer on demand.
-// The |isolation_threshold| must be less than or equal to
-// |block_size|.
-struct BlockAllocator {
-  BlockAllocator(size_t block_size, size_t isolation_threshold)
-      : retain(nullptr),
-        head(nullptr),
-        block_size(block_size),
-        isolation_threshold(std::min(block_size, isolation_threshold)) {
-    assert(isolation_threshold <= block_size);
-  }
-
-  ~BlockAllocator() { reset(); }
-
-  BlockAllocator(BlockAllocator &&other) noexcept
-      : retain(other.retain),
-        head(other.head),
-        block_size(other.block_size),
-        isolation_threshold(other.isolation_threshold) {
-    other.retain = nullptr;
-    other.head = nullptr;
-  }
-
-  BlockAllocator &operator=(BlockAllocator &&other) noexcept {
-    reset();
-
-    retain = other.retain;
-    head = other.head;
-    block_size = other.block_size;
-    isolation_threshold = other.isolation_threshold;
-
-    other.retain = nullptr;
-    other.head = nullptr;
-
-    return *this;
-  }
-
-  BlockAllocator(const BlockAllocator &) = delete;
-  BlockAllocator &operator=(const BlockAllocator &) = delete;
-
-  void reset() {
-    for (auto mb = retain; mb;) {
-      auto next = mb->next;
-      delete[] reinterpret_cast<uint8_t *>(mb);
-      mb = next;
-    }
-
-    retain = nullptr;
-    head = nullptr;
-  }
-
-  MemBlock *alloc_mem_block(size_t size) {
-    auto block = new uint8_t[sizeof(MemBlock) + size];
-    auto mb = reinterpret_cast<MemBlock *>(block);
-
-    mb->next = retain;
-    mb->begin = mb->last = block + sizeof(MemBlock);
-    mb->end = mb->begin + size;
-    retain = mb;
-    return mb;
-  }
-
-  void *alloc(size_t size) {
-    if (size + sizeof(size_t) >= isolation_threshold) {
-      auto len = std::max(static_cast<size_t>(16), size);
-      // We will store the allocated size in size_t field.
-      auto mb = alloc_mem_block(len + sizeof(size_t));
-      auto sp = reinterpret_cast<size_t *>(mb->begin);
-      *sp = len;
-      mb->last = mb->end;
-      return mb->begin + sizeof(size_t);
-    }
-
-    if (!head ||
-        head->end - head->last < static_cast<ssize_t>(size + sizeof(size_t))) {
-      head = alloc_mem_block(block_size);
-    }
-
-    // We will store the allocated size in size_t field.
-    auto res = head->last + sizeof(size_t);
-    auto sp = reinterpret_cast<size_t *>(head->last);
-    *sp = size;
-
-    head->last = reinterpret_cast<uint8_t *>(
-        (reinterpret_cast<intptr_t>(res + size) + 0xf) & ~0xf);
-
-    return res;
-  }
-
-  // Returns allocated size for memory pointed by |ptr|.  We assume
-  // that |ptr| was returned from alloc() or realloc().
-  size_t get_alloc_length(void *ptr) {
-    return *reinterpret_cast<size_t *>(static_cast<uint8_t *>(ptr) -
-                                       sizeof(size_t));
-  }
-
-  // Allocates memory of at least |size| bytes.  If |ptr| is nullptr,
-  // this is equivalent to alloc(size).  If |ptr| is not nullptr,
-  // obtain the allocated size for |ptr|, assuming that |ptr| was
-  // returned from alloc() or realloc().  If the allocated size is
-  // greater than or equal to size, |ptr| is returned.  Otherwise,
-  // allocates at least |size| bytes of memory, and the original
-  // content pointed by |ptr| is copied to the newly allocated memory.
-  void *realloc(void *ptr, size_t size) {
-    if (!ptr) {
-      return alloc(size);
-    }
-    auto alloclen = get_alloc_length(ptr);
-    auto p = reinterpret_cast<uint8_t *>(ptr);
-    if (size <= alloclen) {
-      return ptr;
-    }
-
-    auto nalloclen = std::max(size + 1, alloclen * 2);
-
-    auto res = alloc(nalloclen);
-    std::copy_n(p, alloclen, static_cast<uint8_t *>(res));
-
-    return res;
-  }
-
-  // This holds live memory block to free them in dtor.
-  MemBlock *retain;
-  // Current memory block to use.
-  MemBlock *head;
-  // size of single memory block
-  size_t block_size;
-  // if allocation greater or equal to isolation_threshold bytes is
-  // requested, allocate dedicated block.
-  size_t isolation_threshold;
-};
-
-// Makes a copy of |src|.  The resulting string will be
-// NULL-terminated.
-template <typename BlockAllocator>
-StringRef make_string_ref(BlockAllocator &alloc, const StringRef &src) {
-  auto dst = static_cast<uint8_t *>(alloc.alloc(src.size() + 1));
-  auto p = dst;
-  p = std::copy(std::begin(src), std::end(src), p);
-  *p = '\0';
-  return StringRef{dst, src.size()};
-}
-
-// private function used in concat_string_ref.  this is the base
-// function of concat_string_ref_count().
-inline size_t concat_string_ref_count(size_t acc) { return acc; }
-
-// private function used in concat_string_ref.  This function counts
-// the sum of length of given arguments.  The calculated length is
-// accumulated, and passed to the next function.
-template <typename... Args>
-size_t concat_string_ref_count(size_t acc, const StringRef &value,
-                               Args &&... args) {
-  return concat_string_ref_count(acc + value.size(),
-                                 std::forward<Args>(args)...);
-}
-
-// private function used in concat_string_ref.  this is the base
-// function of concat_string_ref_copy().
-inline uint8_t *concat_string_ref_copy(uint8_t *p) { return p; }
-
-// private function used in concat_string_ref.  This function copies
-// given strings into |p|.  |p| is incremented by the copied length,
-// and returned.  In the end, return value points to the location one
-// beyond the last byte written.
-template <typename... Args>
-uint8_t *concat_string_ref_copy(uint8_t *p, const StringRef &value,
-                                Args &&... args) {
-  p = std::copy(std::begin(value), std::end(value), p);
-  return concat_string_ref_copy(p, std::forward<Args>(args)...);
-}
-
-// Returns the string which is the concatenation of |args| in the
-// given order.  The resulting string will be NULL-terminated.
-template <typename BlockAllocator, typename... Args>
-StringRef concat_string_ref(BlockAllocator &alloc, Args &&... args) {
-  size_t len = concat_string_ref_count(0, std::forward<Args>(args)...);
-  auto dst = static_cast<uint8_t *>(alloc.alloc(len + 1));
-  auto p = dst;
-  p = concat_string_ref_copy(p, std::forward<Args>(args)...);
-  *p = '\0';
-  return StringRef{dst, len};
-}
-
-// Returns the string which is the concatenation of |value| and |args|
-// in the given order.  The resulting string will be NULL-terminated.
-// This function assumes that the pointer value value.c_str() was
-// obtained from alloc.alloc() or alloc.realloc(), and attempts to use
-// unused memory region by using alloc.realloc().  If value is empty,
-// then just call concat_string_ref().
-template <typename BlockAllocator, typename... Args>
-StringRef realloc_concat_string_ref(BlockAllocator &alloc,
-                                    const StringRef &value, Args &&... args) {
-  if (value.empty()) {
-    return concat_string_ref(alloc, std::forward<Args>(args)...);
-  }
-
-  auto len =
-      value.size() + concat_string_ref_count(0, std::forward<Args>(args)...);
-  auto dst = static_cast<uint8_t *>(
-      alloc.realloc(const_cast<uint8_t *>(value.byte()), len + 1));
-  auto p = dst + value.size();
-  p = concat_string_ref_copy(p, std::forward<Args>(args)...);
-  *p = '\0';
-
-  return StringRef{dst, len};
-}
-
-struct ByteRef {
-  // The pointer to the beginning of the buffer.
-  uint8_t *base;
-  // The length of the buffer.
-  size_t len;
-};
-
-// Makes a buffer with given size.  The resulting byte string might
-// not be NULL-terminated.
-template <typename BlockAllocator>
-ByteRef make_byte_ref(BlockAllocator &alloc, size_t size) {
-  auto dst = static_cast<uint8_t *>(alloc.alloc(size));
-  return {dst, size};
-}
-
-} // namespace nghttp2
-
-#endif // ALLOCATOR_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,506 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#include <netinet/tcp.h>
-#include <poll.h>
-
-#include <cassert>
-#include <cstdio>
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-#include <string>
-#include <iostream>
-#include <string>
-#include <set>
-#include <iomanip>
-#include <fstream>
-
-#include <zlib.h>
-
-#include "app_helper.h"
-#include "util.h"
-#include "http2.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace {
-const char *strsettingsid(int32_t id) {
-  switch (id) {
-  case NGHTTP2_SETTINGS_HEADER_TABLE_SIZE:
-    return "SETTINGS_HEADER_TABLE_SIZE";
-  case NGHTTP2_SETTINGS_ENABLE_PUSH:
-    return "SETTINGS_ENABLE_PUSH";
-  case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
-    return "SETTINGS_MAX_CONCURRENT_STREAMS";
-  case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
-    return "SETTINGS_INITIAL_WINDOW_SIZE";
-  case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
-    return "SETTINGS_MAX_FRAME_SIZE";
-  case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
-    return "SETTINGS_MAX_HEADER_LIST_SIZE";
-  default:
-    return "UNKNOWN";
-  }
-}
-} // namespace
-
-namespace {
-std::string strframetype(uint8_t type) {
-  switch (type) {
-  case NGHTTP2_DATA:
-    return "DATA";
-  case NGHTTP2_HEADERS:
-    return "HEADERS";
-  case NGHTTP2_PRIORITY:
-    return "PRIORITY";
-  case NGHTTP2_RST_STREAM:
-    return "RST_STREAM";
-  case NGHTTP2_SETTINGS:
-    return "SETTINGS";
-  case NGHTTP2_PUSH_PROMISE:
-    return "PUSH_PROMISE";
-  case NGHTTP2_PING:
-    return "PING";
-  case NGHTTP2_GOAWAY:
-    return "GOAWAY";
-  case NGHTTP2_WINDOW_UPDATE:
-    return "WINDOW_UPDATE";
-  case NGHTTP2_ALTSVC:
-    return "ALTSVC";
-  case NGHTTP2_ORIGIN:
-    return "ORIGIN";
-  }
-
-  std::string s = "extension(0x";
-  s += util::format_hex(&type, 1);
-  s += ')';
-
-  return s;
-};
-} // namespace
-
-namespace {
-bool color_output = false;
-} // namespace
-
-void set_color_output(bool f) { color_output = f; }
-
-namespace {
-FILE *outfile = stdout;
-} // namespace
-
-void set_output(FILE *file) { outfile = file; }
-
-namespace {
-void print_frame_attr_indent() { fprintf(outfile, "          "); }
-} // namespace
-
-namespace {
-const char *ansi_esc(const char *code) { return color_output ? code : ""; }
-} // namespace
-
-namespace {
-const char *ansi_escend() { return color_output ? "\033[0m" : ""; }
-} // namespace
-
-namespace {
-void print_nv(nghttp2_nv *nv) {
-  fprintf(outfile, "%s%s%s: %s\n", ansi_esc("\033[1;34m"), nv->name,
-          ansi_escend(), nv->value);
-}
-} // namespace
-namespace {
-void print_nv(nghttp2_nv *nva, size_t nvlen) {
-  auto end = nva + nvlen;
-  for (; nva != end; ++nva) {
-    print_frame_attr_indent();
-
-    print_nv(nva);
-  }
-}
-} // namespace
-
-void print_timer() {
-  auto millis = get_timer();
-  fprintf(outfile, "%s[%3ld.%03ld]%s", ansi_esc("\033[33m"),
-          (long int)(millis.count() / 1000), (long int)(millis.count() % 1000),
-          ansi_escend());
-}
-
-namespace {
-void print_frame_hd(const nghttp2_frame_hd &hd) {
-  fprintf(outfile, "<length=%zu, flags=0x%02x, stream_id=%d>\n", hd.length,
-          hd.flags, hd.stream_id);
-}
-} // namespace
-
-namespace {
-void print_flags(const nghttp2_frame_hd &hd) {
-  std::string s;
-  switch (hd.type) {
-  case NGHTTP2_DATA:
-    if (hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      s += "END_STREAM";
-    }
-    if (hd.flags & NGHTTP2_FLAG_PADDED) {
-      if (!s.empty()) {
-        s += " | ";
-      }
-      s += "PADDED";
-    }
-    break;
-  case NGHTTP2_HEADERS:
-    if (hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      s += "END_STREAM";
-    }
-    if (hd.flags & NGHTTP2_FLAG_END_HEADERS) {
-      if (!s.empty()) {
-        s += " | ";
-      }
-      s += "END_HEADERS";
-    }
-    if (hd.flags & NGHTTP2_FLAG_PADDED) {
-      if (!s.empty()) {
-        s += " | ";
-      }
-      s += "PADDED";
-    }
-    if (hd.flags & NGHTTP2_FLAG_PRIORITY) {
-      if (!s.empty()) {
-        s += " | ";
-      }
-      s += "PRIORITY";
-    }
-
-    break;
-  case NGHTTP2_PRIORITY:
-    break;
-  case NGHTTP2_SETTINGS:
-    if (hd.flags & NGHTTP2_FLAG_ACK) {
-      s += "ACK";
-    }
-    break;
-  case NGHTTP2_PUSH_PROMISE:
-    if (hd.flags & NGHTTP2_FLAG_END_HEADERS) {
-      s += "END_HEADERS";
-    }
-    if (hd.flags & NGHTTP2_FLAG_PADDED) {
-      if (!s.empty()) {
-        s += " | ";
-      }
-      s += "PADDED";
-    }
-    break;
-  case NGHTTP2_PING:
-    if (hd.flags & NGHTTP2_FLAG_ACK) {
-      s += "ACK";
-    }
-    break;
-  }
-  fprintf(outfile, "; %s\n", s.c_str());
-}
-} // namespace
-
-enum print_type { PRINT_SEND, PRINT_RECV };
-
-namespace {
-const char *frame_name_ansi_esc(print_type ptype) {
-  return ansi_esc(ptype == PRINT_SEND ? "\033[1;35m" : "\033[1;36m");
-}
-} // namespace
-
-namespace {
-void print_frame(print_type ptype, const nghttp2_frame *frame) {
-  fprintf(outfile, "%s%s%s frame ", frame_name_ansi_esc(ptype),
-          strframetype(frame->hd.type).c_str(), ansi_escend());
-  print_frame_hd(frame->hd);
-  if (frame->hd.flags) {
-    print_frame_attr_indent();
-    print_flags(frame->hd);
-  }
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-    if (frame->data.padlen > 0) {
-      print_frame_attr_indent();
-      fprintf(outfile, "(padlen=%zu)\n", frame->data.padlen);
-    }
-    break;
-  case NGHTTP2_HEADERS:
-    print_frame_attr_indent();
-    fprintf(outfile, "(padlen=%zu", frame->headers.padlen);
-    if (frame->hd.flags & NGHTTP2_FLAG_PRIORITY) {
-      fprintf(outfile, ", dep_stream_id=%d, weight=%u, exclusive=%d",
-              frame->headers.pri_spec.stream_id, frame->headers.pri_spec.weight,
-              frame->headers.pri_spec.exclusive);
-    }
-    fprintf(outfile, ")\n");
-    switch (frame->headers.cat) {
-    case NGHTTP2_HCAT_REQUEST:
-      print_frame_attr_indent();
-      fprintf(outfile, "; Open new stream\n");
-      break;
-    case NGHTTP2_HCAT_RESPONSE:
-      print_frame_attr_indent();
-      fprintf(outfile, "; First response header\n");
-      break;
-    case NGHTTP2_HCAT_PUSH_RESPONSE:
-      print_frame_attr_indent();
-      fprintf(outfile, "; First push response header\n");
-      break;
-    default:
-      break;
-    }
-    print_nv(frame->headers.nva, frame->headers.nvlen);
-    break;
-  case NGHTTP2_PRIORITY:
-    print_frame_attr_indent();
-
-    fprintf(outfile, "(dep_stream_id=%d, weight=%u, exclusive=%d)\n",
-            frame->priority.pri_spec.stream_id, frame->priority.pri_spec.weight,
-            frame->priority.pri_spec.exclusive);
-
-    break;
-  case NGHTTP2_RST_STREAM:
-    print_frame_attr_indent();
-    fprintf(outfile, "(error_code=%s(0x%02x))\n",
-            nghttp2_http2_strerror(frame->rst_stream.error_code),
-            frame->rst_stream.error_code);
-    break;
-  case NGHTTP2_SETTINGS:
-    print_frame_attr_indent();
-    fprintf(outfile, "(niv=%lu)\n",
-            static_cast<unsigned long>(frame->settings.niv));
-    for (size_t i = 0; i < frame->settings.niv; ++i) {
-      print_frame_attr_indent();
-      fprintf(outfile, "[%s(0x%02x):%u]\n",
-              strsettingsid(frame->settings.iv[i].settings_id),
-              frame->settings.iv[i].settings_id, frame->settings.iv[i].value);
-    }
-    break;
-  case NGHTTP2_PUSH_PROMISE:
-    print_frame_attr_indent();
-    fprintf(outfile, "(padlen=%zu, promised_stream_id=%d)\n",
-            frame->push_promise.padlen, frame->push_promise.promised_stream_id);
-    print_nv(frame->push_promise.nva, frame->push_promise.nvlen);
-    break;
-  case NGHTTP2_PING:
-    print_frame_attr_indent();
-    fprintf(outfile, "(opaque_data=%s)\n",
-            util::format_hex(frame->ping.opaque_data, 8).c_str());
-    break;
-  case NGHTTP2_GOAWAY:
-    print_frame_attr_indent();
-    fprintf(outfile,
-            "(last_stream_id=%d, error_code=%s(0x%02x), "
-            "opaque_data(%u)=[%s])\n",
-            frame->goaway.last_stream_id,
-            nghttp2_http2_strerror(frame->goaway.error_code),
-            frame->goaway.error_code,
-            static_cast<unsigned int>(frame->goaway.opaque_data_len),
-            util::ascii_dump(frame->goaway.opaque_data,
-                             frame->goaway.opaque_data_len)
-                .c_str());
-    break;
-  case NGHTTP2_WINDOW_UPDATE:
-    print_frame_attr_indent();
-    fprintf(outfile, "(window_size_increment=%d)\n",
-            frame->window_update.window_size_increment);
-    break;
-  case NGHTTP2_ALTSVC: {
-    auto altsvc = static_cast<nghttp2_ext_altsvc *>(frame->ext.payload);
-    print_frame_attr_indent();
-    fprintf(outfile, "(origin=[%.*s], altsvc_field_value=[%.*s])\n",
-            static_cast<int>(altsvc->origin_len), altsvc->origin,
-            static_cast<int>(altsvc->field_value_len), altsvc->field_value);
-    break;
-  }
-  case NGHTTP2_ORIGIN: {
-    auto origin = static_cast<nghttp2_ext_origin *>(frame->ext.payload);
-    for (size_t i = 0; i < origin->nov; ++i) {
-      auto ent = &origin->ov[i];
-      print_frame_attr_indent();
-      fprintf(outfile, "[%.*s]\n", (int)ent->origin_len, ent->origin);
-    }
-    break;
-  }
-  default:
-    break;
-  }
-}
-} // namespace
-
-int verbose_on_header_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, const uint8_t *name,
-                               size_t namelen, const uint8_t *value,
-                               size_t valuelen, uint8_t flags,
-                               void *user_data) {
-  nghttp2_nv nv = {const_cast<uint8_t *>(name), const_cast<uint8_t *>(value),
-                   namelen, valuelen};
-
-  print_timer();
-  fprintf(outfile, " recv (stream_id=%d", frame->hd.stream_id);
-  if (flags & NGHTTP2_NV_FLAG_NO_INDEX) {
-    fprintf(outfile, ", sensitive");
-  }
-  fprintf(outfile, ") ");
-
-  print_nv(&nv);
-  fflush(outfile);
-
-  return 0;
-}
-
-int verbose_on_frame_recv_callback(nghttp2_session *session,
-                                   const nghttp2_frame *frame,
-                                   void *user_data) {
-  print_timer();
-  fprintf(outfile, " recv ");
-  print_frame(PRINT_RECV, frame);
-  fflush(outfile);
-  return 0;
-}
-
-int verbose_on_invalid_frame_recv_callback(nghttp2_session *session,
-                                           const nghttp2_frame *frame,
-                                           int lib_error_code,
-                                           void *user_data) {
-  print_timer();
-  fprintf(outfile, " [INVALID; error=%s] recv ",
-          nghttp2_strerror(lib_error_code));
-  print_frame(PRINT_RECV, frame);
-  fflush(outfile);
-  return 0;
-}
-
-int verbose_on_frame_send_callback(nghttp2_session *session,
-                                   const nghttp2_frame *frame,
-                                   void *user_data) {
-  print_timer();
-  fprintf(outfile, " send ");
-  print_frame(PRINT_SEND, frame);
-  fflush(outfile);
-  return 0;
-}
-
-int verbose_on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                        int32_t stream_id, const uint8_t *data,
-                                        size_t len, void *user_data) {
-  print_timer();
-  auto srecv =
-      nghttp2_session_get_stream_effective_recv_data_length(session, stream_id);
-  auto crecv = nghttp2_session_get_effective_recv_data_length(session);
-
-  fprintf(outfile,
-          " recv (stream_id=%d, length=%zu, srecv=%d, crecv=%d) DATA\n",
-          stream_id, len, srecv, crecv);
-  fflush(outfile);
-
-  return 0;
-}
-
-int verbose_error_callback(nghttp2_session *session, int lib_error_code,
-                           const char *msg, size_t len, void *user_data) {
-  print_timer();
-  fprintf(outfile, " [ERROR] %.*s\n", (int)len, msg);
-  fflush(outfile);
-
-  return 0;
-}
-
-namespace {
-std::chrono::steady_clock::time_point base_tv;
-} // namespace
-
-void reset_timer() { base_tv = std::chrono::steady_clock::now(); }
-
-std::chrono::milliseconds get_timer() {
-  return time_delta(std::chrono::steady_clock::now(), base_tv);
-}
-
-std::chrono::steady_clock::time_point get_time() {
-  return std::chrono::steady_clock::now();
-}
-
-ssize_t deflate_data(uint8_t *out, size_t outlen, const uint8_t *in,
-                     size_t inlen) {
-  int rv;
-  z_stream zst;
-  uint8_t temp_out[8_k];
-  auto temp_outlen = sizeof(temp_out);
-
-  zst.next_in = Z_NULL;
-  zst.zalloc = Z_NULL;
-  zst.zfree = Z_NULL;
-  zst.opaque = Z_NULL;
-
-  rv = deflateInit2(&zst, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 9,
-                    Z_DEFAULT_STRATEGY);
-
-  if (rv != Z_OK) {
-    return -1;
-  }
-
-  zst.avail_in = inlen;
-  zst.next_in = (uint8_t *)in;
-  zst.avail_out = temp_outlen;
-  zst.next_out = temp_out;
-
-  rv = deflate(&zst, Z_FINISH);
-
-  deflateEnd(&zst);
-
-  if (rv != Z_STREAM_END) {
-    return -1;
-  }
-
-  temp_outlen -= zst.avail_out;
-
-  if (temp_outlen > outlen) {
-    return -1;
-  }
-
-  memcpy(out, temp_out, temp_outlen);
-
-  return temp_outlen;
-}
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/app_helper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef APP_HELPER_H
-#define APP_HELPER_H
-
-#include "nghttp2_config.h"
-
-#include <cinttypes>
-#include <cstdlib>
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif // HAVE_SYS_TIME_H
-#include <poll.h>
-
-#include <map>
-#include <chrono>
-
-#include <nghttp2/nghttp2.h>
-
-namespace nghttp2 {
-
-int verbose_on_header_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, const uint8_t *name,
-                               size_t namelen, const uint8_t *value,
-                               size_t valuelen, uint8_t flags, void *user_data);
-
-int verbose_on_frame_recv_callback(nghttp2_session *session,
-                                   const nghttp2_frame *frame, void *user_data);
-
-int verbose_on_invalid_frame_recv_callback(nghttp2_session *session,
-                                           const nghttp2_frame *frame,
-                                           int lib_error_code, void *user_data);
-
-int verbose_on_frame_send_callback(nghttp2_session *session,
-                                   const nghttp2_frame *frame, void *user_data);
-
-int verbose_on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                        int32_t stream_id, const uint8_t *data,
-                                        size_t len, void *user_data);
-
-int verbose_error_callback(nghttp2_session *session, int lib_error_code,
-                           const char *msg, size_t len, void *user_data);
-
-// Returns difference between |a| and |b| in milliseconds, assuming
-// |a| is more recent than |b|.
-template <typename TimePoint>
-std::chrono::milliseconds time_delta(const TimePoint &a, const TimePoint &b) {
-  return std::chrono::duration_cast<std::chrono::milliseconds>(a - b);
-}
-
-// Resets timer
-void reset_timer();
-
-// Returns the duration since timer reset.
-std::chrono::milliseconds get_timer();
-
-// Returns current time point.
-std::chrono::steady_clock::time_point get_time();
-
-void print_timer();
-
-// Setting true will print characters with ANSI color escape codes
-// when printing HTTP2 frames. This function changes a static
-// variable.
-void set_color_output(bool f);
-
-// Set output file when printing HTTP2 frames. By default, stdout is
-// used.
-void set_output(FILE *file);
-
-ssize_t deflate_data(uint8_t *out, size_t outlen, const uint8_t *in,
-                     size_t inlen);
-
-} // namespace nghttp2
-
-#endif // APP_HELPER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "asio_client_request_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-request::request() : impl_(make_unique<request_impl>()) {}
-
-request::~request() {}
-
-void request::write_trailer(header_map h) const {
-  impl_->write_trailer(std::move(h));
-}
-
-void request::cancel(uint32_t error_code) const { impl_->cancel(error_code); }
-
-void request::on_response(response_cb cb) const {
-  impl_->on_response(std::move(cb));
-}
-
-void request::on_push(request_cb cb) const { impl_->on_push(std::move(cb)); }
-
-void request::on_close(close_cb cb) const { impl_->on_close(std::move(cb)); }
-
-const uri_ref &request::uri() const { return impl_->uri(); }
-
-const std::string &request::method() const { return impl_->method(); }
-
-const header_map &request::header() const { return impl_->header(); }
-
-void request::resume() const { impl_->resume(); }
-
-request_impl &request::impl() const { return *impl_; }
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_request_impl.h"
-
-#include "asio_client_stream.h"
-#include "asio_client_session_impl.h"
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-request_impl::request_impl() : strm_(nullptr), header_buffer_size_(0) {}
-
-void request_impl::write_trailer(header_map h) {
-  auto sess = strm_->session();
-  sess->write_trailer(*strm_, std::move(h));
-}
-
-void request_impl::cancel(uint32_t error_code) {
-  auto sess = strm_->session();
-  sess->cancel(*strm_, error_code);
-}
-
-void request_impl::on_response(response_cb cb) { response_cb_ = std::move(cb); }
-
-void request_impl::call_on_response(response &res) {
-  if (response_cb_) {
-    response_cb_(res);
-  }
-}
-
-void request_impl::on_push(request_cb cb) { push_request_cb_ = std::move(cb); }
-
-void request_impl::call_on_push(request &push_req) {
-  if (push_request_cb_) {
-    push_request_cb_(push_req);
-  }
-};
-
-void request_impl::on_close(close_cb cb) { close_cb_ = std::move(cb); }
-
-void request_impl::call_on_close(uint32_t error_code) {
-  if (close_cb_) {
-    close_cb_(error_code);
-  }
-}
-
-void request_impl::on_read(generator_cb cb) { generator_cb_ = std::move(cb); }
-
-generator_cb::result_type request_impl::call_on_read(uint8_t *buf,
-                                                     std::size_t len,
-                                                     uint32_t *data_flags) {
-  if (generator_cb_) {
-    return generator_cb_(buf, len, data_flags);
-  }
-
-  *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-  return 0;
-}
-
-void request_impl::resume() {
-  auto sess = strm_->session();
-  sess->resume(*strm_);
-}
-
-void request_impl::header(header_map h) { header_ = std::move(h); }
-
-header_map &request_impl::header() { return header_; }
-
-const header_map &request_impl::header() const { return header_; }
-
-void request_impl::stream(class stream *strm) { strm_ = strm; }
-
-void request_impl::uri(uri_ref uri) { uri_ = std::move(uri); }
-
-const uri_ref &request_impl::uri() const { return uri_; }
-
-uri_ref &request_impl::uri() { return uri_; }
-
-void request_impl::method(std::string s) { method_ = std::move(s); }
-
-const std::string &request_impl::method() const { return method_; }
-
-size_t request_impl::header_buffer_size() const { return header_buffer_size_; }
-
-void request_impl::update_header_buffer_size(size_t len) {
-  header_buffer_size_ += len;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_request_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_REQUEST_IMPL_H
-#define ASIO_CLIENT_REQUEST_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class response;
-class stream;
-
-class request_impl {
-public:
-  request_impl();
-
-  request_impl(const request_impl &) = delete;
-  request_impl &operator=(const request_impl &) = delete;
-
-  void write_trailer(header_map h);
-
-  void cancel(uint32_t error_code);
-
-  void on_response(response_cb cb);
-  void call_on_response(response &res);
-
-  void on_push(request_cb cb);
-  void call_on_push(request &push_req);
-
-  void on_close(close_cb cb);
-  void call_on_close(uint32_t error_code);
-
-  void on_read(generator_cb cb);
-  generator_cb::result_type call_on_read(uint8_t *buf, std::size_t len,
-                                         uint32_t *data_flags);
-
-  void resume();
-
-  void header(header_map h);
-  header_map &header();
-  const header_map &header() const;
-
-  void stream(class stream *strm);
-
-  void uri(uri_ref uri);
-  const uri_ref &uri() const;
-  uri_ref &uri();
-
-  void method(std::string s);
-  const std::string &method() const;
-
-  size_t header_buffer_size() const;
-  void update_header_buffer_size(size_t len);
-
-private:
-  header_map header_;
-  response_cb response_cb_;
-  request_cb push_request_cb_;
-  close_cb close_cb_;
-  generator_cb generator_cb_;
-  class stream *strm_;
-  uri_ref uri_;
-  std::string method_;
-  size_t header_buffer_size_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_REQUEST_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "asio_client_response_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-response::response() : impl_(make_unique<response_impl>()) {}
-
-response::~response() {}
-
-void response::on_data(data_cb cb) const { impl_->on_data(std::move(cb)); }
-
-int response::status_code() const { return impl_->status_code(); }
-
-int64_t response::content_length() const { return impl_->content_length(); }
-
-const header_map &response::header() const { return impl_->header(); }
-
-response_impl &response::impl() const { return *impl_; }
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_response_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-response_impl::response_impl()
-    : content_length_(-1), header_buffer_size_(0), status_code_(0) {}
-
-void response_impl::on_data(data_cb cb) { data_cb_ = std::move(cb); }
-
-void response_impl::call_on_data(const uint8_t *data, std::size_t len) {
-  if (data_cb_) {
-    data_cb_(data, len);
-  }
-}
-
-void response_impl::status_code(int sc) { status_code_ = sc; }
-
-int response_impl::status_code() const { return status_code_; }
-
-void response_impl::content_length(int64_t n) { content_length_ = n; }
-
-int64_t response_impl::content_length() const { return content_length_; }
-
-header_map &response_impl::header() { return header_; }
-
-const header_map &response_impl::header() const { return header_; }
-
-size_t response_impl::header_buffer_size() const { return header_buffer_size_; }
-
-void response_impl::update_header_buffer_size(size_t len) {
-  header_buffer_size_ += len;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_response_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_RESPONSE_IMPL_H
-#define ASIO_CLIENT_RESPONSE_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class response_impl {
-public:
-  response_impl();
-
-  response_impl(const response_impl &) = delete;
-  response_impl &operator=(const response_impl &) = delete;
-
-  void on_data(data_cb cb);
-
-  void call_on_data(const uint8_t *data, std::size_t len);
-
-  void status_code(int sc);
-  int status_code() const;
-
-  void content_length(int64_t n);
-  int64_t content_length() const;
-
-  header_map &header();
-  const header_map &header() const;
-
-  size_t header_buffer_size() const;
-  void update_header_buffer_size(size_t len);
-
-private:
-  data_cb data_cb_;
-
-  header_map header_;
-
-  int64_t content_length_;
-  size_t header_buffer_size_;
-  int status_code_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_RESPONSE_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "asio_client_session_tcp_impl.h"
-#include "asio_client_session_tls_impl.h"
-#include "asio_common.h"
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-using boost::asio::ip::tcp;
-
-session::session(boost::asio::io_service &io_service, const std::string &host,
-                 const std::string &service)
-    : impl_(std::make_shared<session_tcp_impl>(
-          io_service, host, service, boost::posix_time::seconds(60))) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 const boost::asio::ip::tcp::endpoint &local_endpoint,
-                 const std::string &host, const std::string &service)
-    : impl_(std::make_shared<session_tcp_impl>(
-          io_service, local_endpoint, host, service,
-          boost::posix_time::seconds(60))) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service, const std::string &host,
-                 const std::string &service,
-                 const boost::posix_time::time_duration &connect_timeout)
-    : impl_(std::make_shared<session_tcp_impl>(io_service, host, service,
-                                               connect_timeout)) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 const boost::asio::ip::tcp::endpoint &local_endpoint,
-                 const std::string &host, const std::string &service,
-                 const boost::posix_time::time_duration &connect_timeout)
-    : impl_(std::make_shared<session_tcp_impl>(io_service, local_endpoint, host,
-                                               service, connect_timeout)) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 boost::asio::ssl::context &tls_ctx, const std::string &host,
-                 const std::string &service)
-    : impl_(std::make_shared<session_tls_impl>(
-          io_service, tls_ctx, host, service, boost::posix_time::seconds(60))) {
-  impl_->start_resolve(host, service);
-}
-
-session::session(boost::asio::io_service &io_service,
-                 boost::asio::ssl::context &tls_ctx, const std::string &host,
-                 const std::string &service,
-                 const boost::posix_time::time_duration &connect_timeout)
-    : impl_(std::make_shared<session_tls_impl>(io_service, tls_ctx, host,
-                                               service, connect_timeout)) {
-  impl_->start_resolve(host, service);
-}
-
-session::~session() {}
-
-session::session(session &&other) noexcept : impl_(std::move(other.impl_)) {}
-
-session &session::operator=(session &&other) noexcept {
-  if (this == &other) {
-    return *this;
-  }
-
-  impl_ = std::move(other.impl_);
-  return *this;
-}
-
-void session::on_connect(connect_cb cb) const {
-  impl_->on_connect(std::move(cb));
-}
-
-void session::on_error(error_cb cb) const { impl_->on_error(std::move(cb)); }
-
-void session::shutdown() const { impl_->shutdown(); }
-
-boost::asio::io_service &session::io_service() const {
-  return impl_->io_service();
-}
-
-const request *session::submit(boost::system::error_code &ec,
-                               const std::string &method,
-                               const std::string &uri, header_map h,
-                               priority_spec prio) const {
-  return impl_->submit(ec, method, uri, generator_cb(), std::move(h),
-                       std::move(prio));
-}
-
-const request *session::submit(boost::system::error_code &ec,
-                               const std::string &method,
-                               const std::string &uri, std::string data,
-                               header_map h, priority_spec prio) const {
-  return impl_->submit(ec, method, uri, string_generator(std::move(data)),
-                       std::move(h), std::move(prio));
-}
-
-const request *session::submit(boost::system::error_code &ec,
-                               const std::string &method,
-                               const std::string &uri, generator_cb cb,
-                               header_map h, priority_spec prio) const {
-  return impl_->submit(ec, method, uri, std::move(cb), std::move(h),
-                       std::move(prio));
-}
-
-void session::read_timeout(const boost::posix_time::time_duration &t) {
-  impl_->read_timeout(t);
-}
-
-priority_spec::priority_spec(const int32_t stream_id, const int32_t weight,
-                             const bool exclusive)
-    : valid_(true) {
-  nghttp2_priority_spec_init(&spec_, stream_id, weight, exclusive);
-}
-
-const nghttp2_priority_spec *priority_spec::get() const {
-  if (!valid_) {
-    return nullptr;
-  }
-
-  return &spec_;
-}
-
-const bool priority_spec::valid() const { return valid_; }
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,759 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_session_impl.h"
-
-#include <iostream>
-
-#include "asio_client_stream.h"
-#include "asio_client_request_impl.h"
-#include "asio_client_response_impl.h"
-#include "asio_common.h"
-#include "template.h"
-#include "util.h"
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-session_impl::session_impl(
-    boost::asio::io_service &io_service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : wblen_(0),
-      io_service_(io_service),
-      resolver_(io_service),
-      deadline_(io_service),
-      connect_timeout_(connect_timeout),
-      read_timeout_(boost::posix_time::seconds(60)),
-      ping_(io_service),
-      session_(nullptr),
-      data_pending_(nullptr),
-      data_pendinglen_(0),
-      writing_(false),
-      inside_callback_(false),
-      stopped_(false) {}
-
-session_impl::~session_impl() {
-  // finish up all active stream
-  for (auto &p : streams_) {
-    auto &strm = p.second;
-    auto &req = strm->request().impl();
-    req.call_on_close(NGHTTP2_INTERNAL_ERROR);
-  }
-
-  nghttp2_session_del(session_);
-}
-
-void session_impl::start_resolve(const std::string &host,
-                                 const std::string &service) {
-  deadline_.expires_from_now(connect_timeout_);
-
-  auto self = shared_from_this();
-
-  resolver_.async_resolve({host, service},
-                          [self](const boost::system::error_code &ec,
-                                 tcp::resolver::iterator endpoint_it) {
-                            if (ec) {
-                              self->not_connected(ec);
-                              return;
-                            }
-
-                            self->start_connect(endpoint_it);
-                          });
-
-  deadline_.async_wait(std::bind(&session_impl::handle_deadline, self));
-}
-
-void session_impl::handle_deadline() {
-  if (stopped_) {
-    return;
-  }
-
-  if (deadline_.expires_at() <=
-      boost::asio::deadline_timer::traits_type::now()) {
-    call_error_cb(boost::asio::error::timed_out);
-    stop();
-    deadline_.expires_at(boost::posix_time::pos_infin);
-    return;
-  }
-
-  deadline_.async_wait(
-      std::bind(&session_impl::handle_deadline, this->shared_from_this()));
-}
-
-void handle_ping2(const boost::system::error_code &ec, int) {}
-
-void session_impl::start_ping() {
-  ping_.expires_from_now(boost::posix_time::seconds(30));
-  ping_.async_wait(std::bind(&session_impl::handle_ping, shared_from_this(),
-                             std::placeholders::_1));
-}
-
-void session_impl::handle_ping(const boost::system::error_code &ec) {
-  if (stopped_ || ec == boost::asio::error::operation_aborted ||
-      !streams_.empty()) {
-    return;
-  }
-
-  nghttp2_submit_ping(session_, NGHTTP2_FLAG_NONE, nullptr);
-
-  signal_write();
-
-  start_ping();
-}
-
-void session_impl::connected(tcp::resolver::iterator endpoint_it) {
-  if (!setup_session()) {
-    return;
-  }
-
-  socket().set_option(boost::asio::ip::tcp::no_delay(true));
-
-  do_write();
-  do_read();
-
-  start_ping();
-
-  auto &connect_cb = on_connect();
-  if (connect_cb) {
-    connect_cb(endpoint_it);
-  }
-}
-
-void session_impl::not_connected(const boost::system::error_code &ec) {
-  call_error_cb(ec);
-  stop();
-}
-
-void session_impl::on_connect(connect_cb cb) { connect_cb_ = std::move(cb); }
-
-void session_impl::on_error(error_cb cb) { error_cb_ = std::move(cb); }
-
-const connect_cb &session_impl::on_connect() const { return connect_cb_; }
-
-const error_cb &session_impl::on_error() const { return error_cb_; }
-
-void session_impl::call_error_cb(const boost::system::error_code &ec) {
-  if (stopped_) {
-    return;
-  }
-  auto &error_cb = on_error();
-  if (!error_cb) {
-    return;
-  }
-  error_cb(ec);
-}
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  if (frame->hd.type != NGHTTP2_PUSH_PROMISE) {
-    return 0;
-  }
-
-  auto sess = static_cast<session_impl *>(user_data);
-  sess->create_push_stream(frame->push_promise.promised_stream_id);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_header_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                       const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen, uint8_t flags,
-                       void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  stream *strm;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    strm = sess->find_stream(frame->hd.stream_id);
-    if (!strm) {
-      return 0;
-    }
-
-    // ignore trailers
-    if (frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-        !strm->expect_final_response()) {
-      return 0;
-    }
-
-    auto token = http2::lookup_token(name, namelen);
-
-    auto &res = strm->response().impl();
-    if (token == http2::HD__STATUS) {
-      res.status_code(util::parse_uint(value, valuelen));
-    } else {
-      if (res.header_buffer_size() + namelen + valuelen > 64_k) {
-        nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                  frame->hd.stream_id, NGHTTP2_INTERNAL_ERROR);
-        break;
-      }
-      res.update_header_buffer_size(namelen + valuelen);
-
-      if (token == http2::HD_CONTENT_LENGTH) {
-        res.content_length(util::parse_uint(value, valuelen));
-      }
-
-      res.header().emplace(
-          std::string(name, name + namelen),
-          header_value{std::string(value, value + valuelen),
-                       (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0});
-    }
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    strm = sess->find_stream(frame->push_promise.promised_stream_id);
-    if (!strm) {
-      return 0;
-    }
-
-    auto &req = strm->request().impl();
-    auto &uri = req.uri();
-
-    switch (http2::lookup_token(name, namelen)) {
-    case http2::HD__METHOD:
-      req.method(std::string(value, value + valuelen));
-      break;
-    case http2::HD__SCHEME:
-      uri.scheme.assign(value, value + valuelen);
-      break;
-    case http2::HD__PATH:
-      split_path(uri, value, value + valuelen);
-      break;
-    case http2::HD__AUTHORITY:
-      uri.host.assign(value, value + valuelen);
-      break;
-    case http2::HD_HOST:
-      if (uri.host.empty()) {
-        uri.host.assign(value, value + valuelen);
-      }
-    // fall through
-    default:
-      if (req.header_buffer_size() + namelen + valuelen > 64_k) {
-        nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                  frame->hd.stream_id, NGHTTP2_INTERNAL_ERROR);
-        break;
-      }
-      req.update_header_buffer_size(namelen + valuelen);
-
-      req.header().emplace(
-          std::string(name, name + namelen),
-          header_value{std::string(value, value + valuelen),
-                       (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0});
-    }
-
-    break;
-  }
-  default:
-    return 0;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  auto strm = sess->find_stream(frame->hd.stream_id);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    if (!strm) {
-      return 0;
-    }
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->response().impl().call_on_data(nullptr, 0);
-    }
-    break;
-  }
-  case NGHTTP2_HEADERS: {
-    if (!strm) {
-      return 0;
-    }
-
-    // ignore trailers
-    if (frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-        !strm->expect_final_response()) {
-      return 0;
-    }
-
-    if (strm->expect_final_response()) {
-      // wait for final response
-      return 0;
-    }
-
-    auto &req = strm->request().impl();
-    req.call_on_response(strm->response());
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->response().impl().call_on_data(nullptr, 0);
-    }
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    if (!strm) {
-      return 0;
-    }
-
-    auto push_strm = sess->find_stream(frame->push_promise.promised_stream_id);
-    if (!push_strm) {
-      return 0;
-    }
-
-    strm->request().impl().call_on_push(push_strm->request());
-
-    break;
-  }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  auto strm = sess->find_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  auto &res = strm->response().impl();
-  res.call_on_data(data, len);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto sess = static_cast<session_impl *>(user_data);
-  auto strm = sess->pop_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  strm->request().impl().call_on_close(error_code);
-
-  return 0;
-}
-} // namespace
-
-bool session_impl::setup_session() {
-  nghttp2_session_callbacks *callbacks;
-  nghttp2_session_callbacks_new(&callbacks);
-  auto cb_del = defer(nghttp2_session_callbacks_del, callbacks);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  auto rv = nghttp2_session_client_new(&session_, callbacks, this);
-  if (rv != 0) {
-    call_error_cb(make_error_code(static_cast<nghttp2_error>(rv)));
-    return false;
-  }
-
-  const uint32_t window_size = 256_m;
-
-  std::array<nghttp2_settings_entry, 2> iv{
-      {{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100},
-       // typically client is just a *sink* and just process data as
-       // much as possible.  Use large window size by default.
-       {NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, window_size}}};
-  nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, iv.data(), iv.size());
-  // increase connection window size up to window_size
-  nghttp2_session_set_local_window_size(session_, NGHTTP2_FLAG_NONE, 0,
-                                        window_size);
-  return true;
-}
-
-int session_impl::write_trailer(stream &strm, header_map h) {
-  int rv;
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(h.size());
-  for (auto &hd : h) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  rv = nghttp2_submit_trailer(session_, strm.stream_id(), nva.data(),
-                              nva.size());
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-void session_impl::cancel(stream &strm, uint32_t error_code) {
-  if (stopped_) {
-    return;
-  }
-
-  nghttp2_submit_rst_stream(session_, NGHTTP2_FLAG_NONE, strm.stream_id(),
-                            error_code);
-  signal_write();
-}
-
-void session_impl::resume(stream &strm) {
-  if (stopped_) {
-    return;
-  }
-
-  nghttp2_session_resume_data(session_, strm.stream_id());
-  signal_write();
-}
-
-stream *session_impl::find_stream(int32_t stream_id) {
-  auto it = streams_.find(stream_id);
-  if (it == std::end(streams_)) {
-    return nullptr;
-  }
-  return (*it).second.get();
-}
-
-std::unique_ptr<stream> session_impl::pop_stream(int32_t stream_id) {
-  auto it = streams_.find(stream_id);
-  if (it == std::end(streams_)) {
-    return nullptr;
-  }
-  auto strm = std::move((*it).second);
-  streams_.erase(it);
-  if (streams_.empty()) {
-    start_ping();
-  }
-  return strm;
-}
-
-stream *session_impl::create_push_stream(int32_t stream_id) {
-  auto strm = create_stream();
-  strm->stream_id(stream_id);
-  auto p = streams_.emplace(stream_id, std::move(strm));
-  assert(p.second);
-  ping_.cancel();
-  return (*p.first).second.get();
-}
-
-std::unique_ptr<stream> session_impl::create_stream() {
-  return make_unique<stream>(this);
-}
-
-const request *session_impl::submit(boost::system::error_code &ec,
-                                    const std::string &method,
-                                    const std::string &uri, generator_cb cb,
-                                    header_map h, priority_spec prio) {
-  ec.clear();
-
-  if (stopped_) {
-    ec = make_error_code(static_cast<nghttp2_error>(NGHTTP2_INTERNAL_ERROR));
-    return nullptr;
-  }
-
-  http_parser_url u{};
-  // TODO Handle CONNECT method
-  if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return nullptr;
-  }
-
-  if ((u.field_set & (1 << UF_SCHEMA)) == 0 ||
-      (u.field_set & (1 << UF_HOST)) == 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return nullptr;
-  }
-
-  auto strm = create_stream();
-  auto &req = strm->request().impl();
-  auto &uref = req.uri();
-
-  http2::copy_url_component(uref.scheme, &u, UF_SCHEMA, uri.c_str());
-  http2::copy_url_component(uref.host, &u, UF_HOST, uri.c_str());
-  http2::copy_url_component(uref.raw_path, &u, UF_PATH, uri.c_str());
-  http2::copy_url_component(uref.raw_query, &u, UF_QUERY, uri.c_str());
-
-  if (util::ipv6_numeric_addr(uref.host.c_str())) {
-    uref.host = "[" + uref.host;
-    uref.host += ']';
-  }
-  if (u.field_set & (1 << UF_PORT)) {
-    uref.host += ':';
-    uref.host += util::utos(u.port);
-  }
-
-  if (uref.raw_path.empty()) {
-    uref.raw_path = "/";
-  }
-
-  uref.path = percent_decode(uref.raw_path);
-
-  auto path = uref.raw_path;
-  if (u.field_set & (1 << UF_QUERY)) {
-    path += '?';
-    path += uref.raw_query;
-  }
-
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(4 + h.size());
-  nva.push_back(http2::make_nv_ls(":method", method));
-  nva.push_back(http2::make_nv_ls(":scheme", uref.scheme));
-  nva.push_back(http2::make_nv_ls(":path", path));
-  nva.push_back(http2::make_nv_ls(":authority", uref.host));
-  for (auto &kv : h) {
-    nva.push_back(
-        http2::make_nv(kv.first, kv.second.value, kv.second.sensitive));
-  }
-
-  req.header(std::move(h));
-
-  nghttp2_data_provider *prdptr = nullptr;
-  nghttp2_data_provider prd;
-
-  if (cb) {
-    strm->request().impl().on_read(std::move(cb));
-    prd.source.ptr = strm.get();
-    prd.read_callback = [](nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source,
-                           void *user_data) -> ssize_t {
-      auto strm = static_cast<stream *>(source->ptr);
-      return strm->request().impl().call_on_read(buf, length, data_flags);
-    };
-    prdptr = &prd;
-  }
-
-  auto stream_id = nghttp2_submit_request(session_, prio.get(), nva.data(),
-                                          nva.size(), prdptr, strm.get());
-  if (stream_id < 0) {
-    ec = make_error_code(static_cast<nghttp2_error>(stream_id));
-    return nullptr;
-  }
-
-  signal_write();
-
-  strm->stream_id(stream_id);
-
-  auto p = streams_.emplace(stream_id, std::move(strm));
-  assert(p.second);
-  ping_.cancel();
-  return &(*p.first).second->request();
-}
-
-void session_impl::shutdown() {
-  if (stopped_) {
-    return;
-  }
-
-  nghttp2_session_terminate_session(session_, NGHTTP2_NO_ERROR);
-  signal_write();
-}
-
-boost::asio::io_service &session_impl::io_service() { return io_service_; }
-
-void session_impl::signal_write() {
-  if (!inside_callback_) {
-    do_write();
-  }
-}
-
-bool session_impl::should_stop() const {
-  return !writing_ && !nghttp2_session_want_read(session_) &&
-         !nghttp2_session_want_write(session_);
-}
-
-namespace {
-struct callback_guard {
-  callback_guard(session_impl &sess) : sess(sess) { sess.enter_callback(); }
-  ~callback_guard() { sess.leave_callback(); }
-
-  session_impl &sess;
-};
-} // namespace
-
-void session_impl::enter_callback() {
-  assert(!inside_callback_);
-  inside_callback_ = true;
-}
-
-void session_impl::leave_callback() {
-  assert(inside_callback_);
-  inside_callback_ = false;
-}
-
-void session_impl::do_read() {
-  if (stopped_) {
-    return;
-  }
-
-  deadline_.expires_from_now(read_timeout_);
-
-  auto self = this->shared_from_this();
-
-  read_socket([self](const boost::system::error_code &ec,
-                     std::size_t bytes_transferred) {
-    if (ec) {
-      if (!self->should_stop()) {
-        self->call_error_cb(ec);
-      }
-      self->stop();
-      return;
-    }
-
-    {
-      callback_guard cg(*self);
-
-      auto rv = nghttp2_session_mem_recv(self->session_, self->rb_.data(),
-                                         bytes_transferred);
-
-      if (rv != static_cast<ssize_t>(bytes_transferred)) {
-        self->call_error_cb(make_error_code(
-            static_cast<nghttp2_error>(rv < 0 ? rv : NGHTTP2_ERR_PROTO)));
-        self->stop();
-        return;
-      }
-    }
-
-    self->do_write();
-
-    if (self->should_stop()) {
-      self->stop();
-      return;
-    }
-
-    self->do_read();
-  });
-}
-
-void session_impl::do_write() {
-  if (stopped_) {
-    return;
-  }
-
-  if (writing_) {
-    return;
-  }
-
-  if (data_pending_) {
-    std::copy_n(data_pending_, data_pendinglen_, std::begin(wb_) + wblen_);
-
-    wblen_ += data_pendinglen_;
-
-    data_pending_ = nullptr;
-    data_pendinglen_ = 0;
-  }
-
-  {
-    callback_guard cg(*this);
-
-    for (;;) {
-      const uint8_t *data;
-      auto n = nghttp2_session_mem_send(session_, &data);
-      if (n < 0) {
-        call_error_cb(make_error_code(static_cast<nghttp2_error>(n)));
-        stop();
-        return;
-      }
-
-      if (n == 0) {
-        break;
-      }
-
-      if (wblen_ + n > wb_.size()) {
-        data_pending_ = data;
-        data_pendinglen_ = n;
-
-        break;
-      }
-
-      std::copy_n(data, n, std::begin(wb_) + wblen_);
-
-      wblen_ += n;
-    }
-  }
-
-  if (wblen_ == 0) {
-    if (should_stop()) {
-      stop();
-    }
-    return;
-  }
-
-  writing_ = true;
-
-  // Reset read deadline here, because normally client is sending
-  // something, it does not expect timeout while doing it.
-  deadline_.expires_from_now(read_timeout_);
-
-  auto self = this->shared_from_this();
-
-  write_socket([self](const boost::system::error_code &ec, std::size_t n) {
-    if (ec) {
-      self->call_error_cb(ec);
-      self->stop();
-      return;
-    }
-
-    self->wblen_ = 0;
-    self->writing_ = false;
-
-    self->do_write();
-  });
-}
-
-void session_impl::stop() {
-  if (stopped_) {
-    return;
-  }
-
-  shutdown_socket();
-  deadline_.cancel();
-  ping_.cancel();
-  stopped_ = true;
-}
-
-bool session_impl::stopped() const { return stopped_; }
-
-void session_impl::read_timeout(const boost::posix_time::time_duration &t) {
-  read_timeout_ = t;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_SESSION_IMPL_H
-#define ASIO_CLIENT_SESSION_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <boost/array.hpp>
-
-#include <nghttp2/asio_http2_client.h>
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class stream;
-
-using boost::asio::ip::tcp;
-
-class session_impl : public std::enable_shared_from_this<session_impl> {
-public:
-  session_impl(boost::asio::io_service &io_service,
-               const boost::posix_time::time_duration &connect_timeout);
-  virtual ~session_impl();
-
-  void start_resolve(const std::string &host, const std::string &service);
-
-  void connected(tcp::resolver::iterator endpoint_it);
-  void not_connected(const boost::system::error_code &ec);
-
-  void on_connect(connect_cb cb);
-  void on_error(error_cb cb);
-
-  const connect_cb &on_connect() const;
-  const error_cb &on_error() const;
-
-  int write_trailer(stream &strm, header_map h);
-
-  void cancel(stream &strm, uint32_t error_code);
-  void resume(stream &strm);
-
-  std::unique_ptr<stream> create_stream();
-  std::unique_ptr<stream> pop_stream(int32_t stream_id);
-  stream *create_push_stream(int32_t stream_id);
-  stream *find_stream(int32_t stream_id);
-
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        generator_cb cb, header_map h, priority_spec spec);
-
-  virtual void start_connect(tcp::resolver::iterator endpoint_it) = 0;
-  virtual tcp::socket &socket() = 0;
-  virtual void read_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h) = 0;
-  virtual void write_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h) = 0;
-  virtual void shutdown_socket() = 0;
-
-  void shutdown();
-
-  boost::asio::io_service &io_service();
-
-  void signal_write();
-
-  void enter_callback();
-  void leave_callback();
-
-  void do_read();
-  void do_write();
-
-  void read_timeout(const boost::posix_time::time_duration &t);
-
-  void stop();
-  bool stopped() const;
-
-protected:
-  boost::array<uint8_t, 8_k> rb_;
-  boost::array<uint8_t, 64_k> wb_;
-  std::size_t wblen_;
-
-private:
-  bool should_stop() const;
-  bool setup_session();
-  void call_error_cb(const boost::system::error_code &ec);
-  void handle_deadline();
-  void start_ping();
-  void handle_ping(const boost::system::error_code &ec);
-
-  boost::asio::io_service &io_service_;
-  tcp::resolver resolver_;
-
-  std::map<int32_t, std::unique_ptr<stream>> streams_;
-
-  connect_cb connect_cb_;
-  error_cb error_cb_;
-
-  boost::asio::deadline_timer deadline_;
-  boost::posix_time::time_duration connect_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-
-  boost::asio::deadline_timer ping_;
-
-  nghttp2_session *session_;
-
-  const uint8_t *data_pending_;
-  std::size_t data_pendinglen_;
-
-  bool writing_;
-  bool inside_callback_;
-  bool stopped_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_SESSION_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_session_tcp_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-session_tcp_impl::session_tcp_impl(
-    boost::asio::io_service &io_service, const std::string &host,
-    const std::string &service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : session_impl(io_service, connect_timeout), socket_(io_service) {}
-
-session_tcp_impl::session_tcp_impl(
-    boost::asio::io_service &io_service,
-    const boost::asio::ip::tcp::endpoint &local_endpoint,
-    const std::string &host, const std::string &service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : session_impl(io_service, connect_timeout), socket_(io_service) {
-  socket_.open(local_endpoint.protocol());
-  boost::asio::socket_base::reuse_address option(true);
-  socket_.set_option(option);
-  socket_.bind(local_endpoint);
-}
-
-session_tcp_impl::~session_tcp_impl() {}
-
-void session_tcp_impl::start_connect(tcp::resolver::iterator endpoint_it) {
-  auto self = shared_from_this();
-  socket_.async_connect(
-      *endpoint_it, [self, endpoint_it](const boost::system::error_code &ec) {
-        if (self->stopped()) {
-          return;
-        }
-
-        if (ec) {
-          self->not_connected(ec);
-          return;
-        }
-
-        self->connected(endpoint_it);
-      });
-}
-
-tcp::socket &session_tcp_impl::socket() { return socket_; }
-
-void session_tcp_impl::read_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  socket_.async_read_some(boost::asio::buffer(rb_), h);
-}
-
-void session_tcp_impl::write_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  boost::asio::async_write(socket_, boost::asio::buffer(wb_, wblen_), h);
-}
-
-void session_tcp_impl::shutdown_socket() {
-  boost::system::error_code ignored_ec;
-  socket_.close(ignored_ec);
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tcp_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_SESSION_TCP_IMPL_H
-#define ASIO_CLIENT_SESSION_TCP_IMPL_H
-
-#include "asio_client_session_impl.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-using boost::asio::ip::tcp;
-
-class session_tcp_impl : public session_impl {
-public:
-  session_tcp_impl(boost::asio::io_service &io_service, const std::string &host,
-                   const std::string &service,
-                   const boost::posix_time::time_duration &connect_timeout);
-  session_tcp_impl(boost::asio::io_service &io_service,
-                   const boost::asio::ip::tcp::endpoint &local_endpoint,
-                   const std::string &host, const std::string &service,
-                   const boost::posix_time::time_duration &connect_timeout);
-  virtual ~session_tcp_impl();
-
-  virtual void start_connect(tcp::resolver::iterator endpoint_it);
-  virtual tcp::socket &socket();
-  virtual void read_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void write_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void shutdown_socket();
-
-private:
-  tcp::socket socket_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_SESSION_TCP_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_session_tls_impl.h"
-#include "asio_common.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-session_tls_impl::session_tls_impl(
-    boost::asio::io_service &io_service, boost::asio::ssl::context &tls_ctx,
-    const std::string &host, const std::string &service,
-    const boost::posix_time::time_duration &connect_timeout)
-    : session_impl(io_service, connect_timeout), socket_(io_service, tls_ctx) {
-  // this callback setting is no effect is
-  // ssl::context::set_verify_mode(boost::asio::ssl::verify_peer) is
-  // not used, which is what we want.
-  socket_.set_verify_callback(boost::asio::ssl::rfc2818_verification(host));
-  auto ssl = socket_.native_handle();
-  if (!util::numeric_host(host.c_str())) {
-    SSL_set_tlsext_host_name(ssl, host.c_str());
-  }
-}
-
-session_tls_impl::~session_tls_impl() {}
-
-void session_tls_impl::start_connect(tcp::resolver::iterator endpoint_it) {
-  auto self = std::static_pointer_cast<session_tls_impl>(shared_from_this());
-  boost::asio::async_connect(
-      socket(), endpoint_it,
-      [self](const boost::system::error_code &ec,
-             tcp::resolver::iterator endpoint_it) {
-        if (self->stopped()) {
-          return;
-        }
-
-        if (ec) {
-          self->not_connected(ec);
-          return;
-        }
-
-        self->socket_.async_handshake(
-            boost::asio::ssl::stream_base::client,
-            [self, endpoint_it](const boost::system::error_code &ec) {
-              if (self->stopped()) {
-                return;
-              }
-
-              if (ec) {
-                self->not_connected(ec);
-                return;
-              }
-
-              if (!tls_h2_negotiated(self->socket_)) {
-                self->not_connected(make_error_code(
-                    NGHTTP2_ASIO_ERR_TLS_NO_APP_PROTO_NEGOTIATED));
-                return;
-              }
-
-              self->connected(endpoint_it);
-            });
-      });
-}
-
-tcp::socket &session_tls_impl::socket() { return socket_.next_layer(); }
-
-void session_tls_impl::read_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  socket_.async_read_some(boost::asio::buffer(rb_), h);
-}
-
-void session_tls_impl::write_socket(
-    std::function<void(const boost::system::error_code &ec, std::size_t n)> h) {
-  boost::asio::async_write(socket_, boost::asio::buffer(wb_, wblen_), h);
-}
-
-void session_tls_impl::shutdown_socket() {
-  boost::system::error_code ignored_ec;
-  socket_.lowest_layer().close(ignored_ec);
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_session_tls_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_SESSION_TLS_IMPL_H
-#define ASIO_CLIENT_SESSION_TLS_IMPL_H
-
-#include "asio_client_session_impl.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-using boost::asio::ip::tcp;
-
-using ssl_socket = boost::asio::ssl::stream<tcp::socket>;
-
-class session_tls_impl : public session_impl {
-public:
-  session_tls_impl(boost::asio::io_service &io_service,
-                   boost::asio::ssl::context &tls_ctx, const std::string &host,
-                   const std::string &service,
-                   const boost::posix_time::time_duration &connect_timeout);
-  virtual ~session_tls_impl();
-
-  virtual void start_connect(tcp::resolver::iterator endpoint_it);
-  virtual tcp::socket &socket();
-  virtual void read_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void write_socket(
-      std::function<void(const boost::system::error_code &ec, std::size_t n)>
-          h);
-  virtual void shutdown_socket();
-
-private:
-  ssl_socket socket_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_SESSION_TLS_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_stream.h"
-
-#include "asio_client_request_impl.h"
-#include "asio_client_response_impl.h"
-#include "asio_client_session_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-stream::stream(session_impl *sess) : sess_(sess), stream_id_(0) {
-  request_.impl().stream(this);
-}
-
-void stream::stream_id(int32_t stream_id) { stream_id_ = stream_id; }
-
-int32_t stream::stream_id() const { return stream_id_; }
-
-class request &stream::request() {
-  return request_;
-}
-
-class response &stream::response() {
-  return response_;
-}
-
-session_impl *stream::session() const { return sess_; }
-
-bool stream::expect_final_response() const {
-  return response_.status_code() / 100 == 1;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_stream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_STREAM_H
-#define ASIO_CLIENT_STREAM_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-class request;
-class response;
-class session_impl;
-
-class stream {
-public:
-  stream(session_impl *sess);
-
-  stream(const stream &) = delete;
-  stream &operator=(const stream &) = delete;
-
-  void stream_id(int32_t stream_id);
-  int32_t stream_id() const;
-
-  class request &request();
-  class response &response();
-
-  session_impl *session() const;
-
-  bool expect_final_response() const;
-
-private:
-  nghttp2::asio_http2::client::request request_;
-  nghttp2::asio_http2::client::response response_;
-  session_impl *sess_;
-  uint32_t stream_id_;
-};
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_CLIENT_STREAM_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_client_tls_context.h"
-
-#include <openssl/ssl.h>
-
-#include <boost/asio/ssl.hpp>
-
-#include "tls.h"
-#include "util.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace client {
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-int client_select_next_proto_cb(SSL *ssl, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  if (!util::select_h2(const_cast<const unsigned char **>(out), outlen, in,
-                       inlen)) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-boost::system::error_code
-configure_tls_context(boost::system::error_code &ec,
-                      boost::asio::ssl::context &tls_ctx) {
-  ec.clear();
-
-  auto ctx = tls_ctx.native_handle();
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_proto_select_cb(ctx, client_select_next_proto_cb, nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  auto proto_list = util::get_default_alpn();
-
-  SSL_CTX_set_alpn_protos(ctx, proto_list.data(), proto_list.size());
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  return ec;
-}
-
-} // namespace client
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_client_tls_context.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_CLIENT_TLS_CONTEXT_H
-#define ASIO_CLIENT_TLS_CONTEXT_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_client.h>
-
-#endif // ASIO_CLIENT_TLS_CONTEXT_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_common.h"
-
-#include <fcntl.h>
-#include <memory>
-
-#include "util.h"
-#include "template.h"
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-
-class nghttp2_category_impl : public boost::system::error_category {
-public:
-  const char *name() const noexcept { return "nghttp2"; }
-  std::string message(int ev) const { return nghttp2_strerror(ev); }
-};
-
-const boost::system::error_category &nghttp2_category() noexcept {
-  static nghttp2_category_impl cat;
-  return cat;
-}
-
-boost::system::error_code make_error_code(nghttp2_error ev) {
-  return boost::system::error_code(static_cast<int>(ev), nghttp2_category());
-}
-
-class nghttp2_asio_category_impl : public boost::system::error_category {
-public:
-  const char *name() const noexcept { return "nghttp2_asio"; }
-  std::string message(int ev) const {
-    switch (ev) {
-    case NGHTTP2_ASIO_ERR_NO_ERROR:
-      return "no error";
-    case NGHTTP2_ASIO_ERR_TLS_NO_APP_PROTO_NEGOTIATED:
-      return "tls: no application protocol negotiated";
-    default:
-      return "unknown";
-    }
-  }
-};
-
-const boost::system::error_category &nghttp2_asio_category() noexcept {
-  static nghttp2_asio_category_impl cat;
-  return cat;
-}
-
-boost::system::error_code make_error_code(nghttp2_asio_error ev) {
-  return boost::system::error_code(static_cast<int>(ev),
-                                   nghttp2_asio_category());
-}
-
-generator_cb string_generator(std::string data) {
-  auto strio = std::make_shared<std::pair<std::string, size_t>>(std::move(data),
-                                                                data.size());
-  return [strio](uint8_t *buf, size_t len, uint32_t *data_flags) {
-    auto &data = strio->first;
-    auto &left = strio->second;
-    auto n = std::min(len, left);
-    std::copy_n(data.c_str() + data.size() - left, n, buf);
-    left -= n;
-    if (left == 0) {
-      *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-    }
-    return n;
-  };
-}
-
-generator_cb deferred_generator() {
-  return [](uint8_t *buf, size_t len, uint32_t *data_flags) {
-    return NGHTTP2_ERR_DEFERRED;
-  };
-}
-
-template <typename F, typename... T>
-std::shared_ptr<Defer<F, T...>> defer_shared(F &&f, T &&... t) {
-  return std::make_shared<Defer<F, T...>>(std::forward<F>(f),
-                                          std::forward<T>(t)...);
-}
-
-generator_cb file_generator(const std::string &path) {
-  auto fd = open(path.c_str(), O_RDONLY);
-  if (fd == -1) {
-    return generator_cb();
-  }
-
-  return file_generator_from_fd(fd);
-}
-
-generator_cb file_generator_from_fd(int fd) {
-  auto d = defer_shared(close, fd);
-
-  return [fd, d](uint8_t *buf, size_t len,
-                 uint32_t *data_flags) -> generator_cb::result_type {
-    ssize_t n;
-    while ((n = read(fd, buf, len)) == -1 && errno == EINTR)
-      ;
-
-    if (n == -1) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    if (n == 0) {
-      *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-    }
-
-    return n;
-  };
-}
-
-bool check_path(const std::string &path) { return util::check_path(path); }
-
-std::string percent_decode(const std::string &s) {
-  return util::percent_decode(std::begin(s), std::end(s));
-}
-
-std::string http_date(int64_t t) { return util::http_date(t); }
-
-boost::system::error_code host_service_from_uri(boost::system::error_code &ec,
-                                                std::string &scheme,
-                                                std::string &host,
-                                                std::string &service,
-                                                const std::string &uri) {
-  ec.clear();
-
-  http_parser_url u{};
-  if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return ec;
-  }
-
-  if ((u.field_set & (1 << UF_SCHEMA)) == 0 ||
-      (u.field_set & (1 << UF_HOST)) == 0) {
-    ec = make_error_code(boost::system::errc::invalid_argument);
-    return ec;
-  }
-
-  http2::copy_url_component(scheme, &u, UF_SCHEMA, uri.c_str());
-  http2::copy_url_component(host, &u, UF_HOST, uri.c_str());
-
-  if (u.field_set & (1 << UF_PORT)) {
-    http2::copy_url_component(service, &u, UF_PORT, uri.c_str());
-  } else {
-    service = scheme;
-  }
-
-  return ec;
-}
-
-bool tls_h2_negotiated(ssl_socket &socket) {
-  auto ssl = socket.native_handle();
-
-  const unsigned char *next_proto = nullptr;
-  unsigned int next_proto_len = 0;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_get0_next_proto_negotiated(ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (next_proto == nullptr) {
-    SSL_get0_alpn_selected(ssl, &next_proto, &next_proto_len);
-  }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  if (next_proto == nullptr) {
-    return false;
-  }
-
-  return util::check_h2_is_selected(StringRef{next_proto, next_proto_len});
-}
-
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_COMMON_H
-#define ASIO_COMMON_H
-
-#include "nghttp2_config.h"
-
-#include <string>
-
-#include <nghttp2/asio_http2.h>
-
-#include "util.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-boost::system::error_code make_error_code(nghttp2_error ev);
-
-boost::system::error_code make_error_code(nghttp2_asio_error ev);
-
-generator_cb string_generator(std::string data);
-
-// Returns generator_cb, which just returns NGHTTP2_ERR_DEFERRED
-generator_cb deferred_generator();
-
-template <typename InputIt>
-void split_path(uri_ref &dst, InputIt first, InputIt last) {
-  auto path_last = std::find(first, last, '?');
-  InputIt query_first;
-  if (path_last == last) {
-    query_first = path_last = last;
-  } else {
-    query_first = path_last + 1;
-  }
-  dst.path = util::percent_decode(first, path_last);
-  dst.raw_path.assign(first, path_last);
-  dst.raw_query.assign(query_first, last);
-}
-
-using boost::asio::ip::tcp;
-
-using ssl_socket = boost::asio::ssl::stream<tcp::socket>;
-
-bool tls_h2_negotiated(ssl_socket &socket);
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_COMMON_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// io_service_pool.cpp
-// ~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-#include "asio_io_service_pool.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-io_service_pool::io_service_pool(std::size_t pool_size) : next_io_service_(0) {
-  if (pool_size == 0) {
-    throw std::runtime_error("io_service_pool size is 0");
-  }
-
-  // Give all the io_services work to do so that their run() functions will not
-  // exit until they are explicitly stopped.
-  for (std::size_t i = 0; i < pool_size; ++i) {
-    auto io_service = std::make_shared<boost::asio::io_service>();
-    auto work = std::make_shared<boost::asio::io_service::work>(*io_service);
-    io_services_.push_back(io_service);
-    work_.push_back(work);
-  }
-}
-
-void io_service_pool::run(bool asynchronous) {
-  // Create a pool of threads to run all of the io_services.
-  for (std::size_t i = 0; i < io_services_.size(); ++i) {
-    futures_.push_back(std::async(std::launch::async,
-                                  (size_t(boost::asio::io_service::*)(void)) &
-                                      boost::asio::io_service::run,
-                                  io_services_[i]));
-  }
-
-  if (!asynchronous) {
-    join();
-  }
-}
-
-void io_service_pool::join() {
-  // Wait for all threads in the pool to exit.
-  for (auto &fut : futures_) {
-    fut.get();
-  }
-}
-
-void io_service_pool::force_stop() {
-  // Explicitly stop all io_services.
-  for (auto &iosv : io_services_) {
-    iosv->stop();
-  }
-}
-
-void io_service_pool::stop() {
-  // Destroy all work objects to signals end of work
-  work_.clear();
-}
-
-boost::asio::io_service &io_service_pool::get_io_service() {
-  // Use a round-robin scheme to choose the next io_service to use.
-  auto &io_service = *io_services_[next_io_service_];
-  ++next_io_service_;
-  if (next_io_service_ == io_services_.size()) {
-    next_io_service_ = 0;
-  }
-  return io_service;
-}
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-io_service_pool::io_services() const {
-  return io_services_;
-}
-
-} // namespace asio_http2
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_io_service_pool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// io_service_pool.hpp
-// ~~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_IO_SERVICE_POOL_H
-#define ASIO_IO_SERVICE_POOL_H
-
-#include "nghttp2_config.h"
-
-#include <vector>
-#include <memory>
-#include <future>
-
-#include <boost/noncopyable.hpp>
-#include <boost/thread.hpp>
-
-#include <nghttp2/asio_http2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-/// A pool of io_service objects.
-class io_service_pool : private boost::noncopyable {
-public:
-  /// Construct the io_service pool.
-  explicit io_service_pool(std::size_t pool_size);
-
-  /// Run all io_service objects in the pool.
-  void run(bool asynchronous = false);
-
-  /// Stop all io_service objects in the pool.
-  void force_stop();
-
-  /// Destroy all work objects to signals end of work
-  void stop();
-
-  /// Join on all io_service objects in the pool.
-  void join();
-
-  /// Get an io_service to use.
-  boost::asio::io_service &get_io_service();
-
-  /// Get access to all io_service objects.
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-private:
-  /// The pool of io_services.
-  std::vector<std::shared_ptr<boost::asio::io_service>> io_services_;
-
-  /// The work that keeps the io_services running.
-  std::vector<std::shared_ptr<boost::asio::io_service::work>> work_;
-
-  /// The next io_service to use for a connection.
-  std::size_t next_io_service_;
-
-  /// Futures to all the io_service objects
-  std::vector<std::future<std::size_t>> futures_;
-};
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_IO_SERVICE_POOL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// server.cpp
-// ~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include "asio_server.h"
-
-#include "asio_server_connection.h"
-#include "asio_common.h"
-#include "util.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-server::server(std::size_t io_service_pool_size,
-               const boost::posix_time::time_duration &tls_handshake_timeout,
-               const boost::posix_time::time_duration &read_timeout)
-    : io_service_pool_(io_service_pool_size),
-      tls_handshake_timeout_(tls_handshake_timeout),
-      read_timeout_(read_timeout) {}
-
-boost::system::error_code
-server::listen_and_serve(boost::system::error_code &ec,
-                         boost::asio::ssl::context *tls_context,
-                         const std::string &address, const std::string &port,
-                         int backlog, serve_mux &mux, bool asynchronous) {
-  ec.clear();
-
-  if (bind_and_listen(ec, address, port, backlog)) {
-    return ec;
-  }
-
-  for (auto &acceptor : acceptors_) {
-    if (tls_context) {
-      start_accept(*tls_context, acceptor, mux);
-    } else {
-      start_accept(acceptor, mux);
-    }
-  }
-
-  io_service_pool_.run(asynchronous);
-
-  return ec;
-}
-
-boost::system::error_code server::bind_and_listen(boost::system::error_code &ec,
-                                                  const std::string &address,
-                                                  const std::string &port,
-                                                  int backlog) {
-  // Open the acceptor with the option to reuse the address (i.e.
-  // SO_REUSEADDR).
-  tcp::resolver resolver(io_service_pool_.get_io_service());
-  tcp::resolver::query query(address, port);
-  auto it = resolver.resolve(query, ec);
-  if (ec) {
-    return ec;
-  }
-
-  for (; it != tcp::resolver::iterator(); ++it) {
-    tcp::endpoint endpoint = *it;
-    auto acceptor = tcp::acceptor(io_service_pool_.get_io_service());
-
-    if (acceptor.open(endpoint.protocol(), ec)) {
-      continue;
-    }
-
-    acceptor.set_option(tcp::acceptor::reuse_address(true));
-
-    if (acceptor.bind(endpoint, ec)) {
-      continue;
-    }
-
-    if (acceptor.listen(
-            backlog == -1 ? boost::asio::socket_base::max_connections : backlog,
-            ec)) {
-      continue;
-    }
-
-    acceptors_.push_back(std::move(acceptor));
-  }
-
-  if (acceptors_.empty()) {
-    return ec;
-  }
-
-  // ec could have some errors since we may have failed to bind some
-  // interfaces.
-  ec.clear();
-
-  return ec;
-}
-
-void server::start_accept(boost::asio::ssl::context &tls_context,
-                          tcp::acceptor &acceptor, serve_mux &mux) {
-
-  if (!acceptor.is_open()) {
-    return;
-  }
-
-  auto new_connection = std::make_shared<connection<ssl_socket>>(
-      mux, tls_handshake_timeout_, read_timeout_,
-      io_service_pool_.get_io_service(), tls_context);
-
-  acceptor.async_accept(
-      new_connection->socket().lowest_layer(),
-      [this, &tls_context, &acceptor, &mux,
-       new_connection](const boost::system::error_code &e) {
-        if (!e) {
-          new_connection->socket().lowest_layer().set_option(
-              tcp::no_delay(true));
-          new_connection->start_tls_handshake_deadline();
-          new_connection->socket().async_handshake(
-              boost::asio::ssl::stream_base::server,
-              [new_connection](const boost::system::error_code &e) {
-                if (e) {
-                  new_connection->stop();
-                  return;
-                }
-
-                if (!tls_h2_negotiated(new_connection->socket())) {
-                  new_connection->stop();
-                  return;
-                }
-
-                new_connection->start();
-              });
-        }
-
-        start_accept(tls_context, acceptor, mux);
-      });
-}
-
-void server::start_accept(tcp::acceptor &acceptor, serve_mux &mux) {
-
-  if (!acceptor.is_open()) {
-    return;
-  }
-
-  auto new_connection = std::make_shared<connection<tcp::socket>>(
-      mux, tls_handshake_timeout_, read_timeout_,
-      io_service_pool_.get_io_service());
-
-  acceptor.async_accept(
-      new_connection->socket(), [this, &acceptor, &mux, new_connection](
-                                    const boost::system::error_code &e) {
-        if (!e) {
-          new_connection->socket().set_option(tcp::no_delay(true));
-          new_connection->start_read_deadline();
-          new_connection->start();
-        }
-        if (acceptor.is_open()) {
-          start_accept(acceptor, mux);
-        }
-      });
-}
-
-void server::stop() {
-  for (auto &acceptor : acceptors_) {
-    acceptor.close();
-  }
-  io_service_pool_.stop();
-}
-
-void server::join() { io_service_pool_.join(); }
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-server::io_services() const {
-  return io_service_pool_.io_services();
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,246 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// connection.hpp
-// ~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_SERVER_CONNECTION_H
-#define ASIO_SERVER_CONNECTION_H
-
-#include "nghttp2_config.h"
-
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-#include <boost/array.hpp>
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_http2_handler.h"
-#include "asio_server_serve_mux.h"
-#include "util.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-/// Represents a single connection from a client.
-template <typename socket_type>
-class connection : public std::enable_shared_from_this<connection<socket_type>>,
-                   private boost::noncopyable {
-public:
-  /// Construct a connection with the given io_service.
-  template <typename... SocketArgs>
-  explicit connection(
-      serve_mux &mux,
-      const boost::posix_time::time_duration &tls_handshake_timeout,
-      const boost::posix_time::time_duration &read_timeout,
-      SocketArgs &&... args)
-      : socket_(std::forward<SocketArgs>(args)...),
-        mux_(mux),
-        deadline_(socket_.get_io_service()),
-        tls_handshake_timeout_(tls_handshake_timeout),
-        read_timeout_(read_timeout),
-        writing_(false),
-        stopped_(false) {}
-
-  /// Start the first asynchronous operation for the connection.
-  void start() {
-    boost::system::error_code ec;
-
-    handler_ = std::make_shared<http2_handler>(
-        socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
-        [this]() { do_write(); }, mux_);
-    if (handler_->start() != 0) {
-      stop();
-      return;
-    }
-    do_read();
-  }
-
-  socket_type &socket() { return socket_; }
-
-  void start_tls_handshake_deadline() {
-    deadline_.expires_from_now(tls_handshake_timeout_);
-    deadline_.async_wait(
-        std::bind(&connection::handle_deadline, this->shared_from_this()));
-  }
-
-  void start_read_deadline() {
-    deadline_.expires_from_now(read_timeout_);
-    deadline_.async_wait(
-        std::bind(&connection::handle_deadline, this->shared_from_this()));
-  }
-
-  void handle_deadline() {
-    if (stopped_) {
-      return;
-    }
-
-    if (deadline_.expires_at() <=
-        boost::asio::deadline_timer::traits_type::now()) {
-      stop();
-      deadline_.expires_at(boost::posix_time::pos_infin);
-      return;
-    }
-
-    deadline_.async_wait(
-        std::bind(&connection::handle_deadline, this->shared_from_this()));
-  }
-
-  void do_read() {
-    auto self = this->shared_from_this();
-
-    deadline_.expires_from_now(read_timeout_);
-
-    socket_.async_read_some(
-        boost::asio::buffer(buffer_),
-        [this, self](const boost::system::error_code &e,
-                     std::size_t bytes_transferred) {
-          if (e) {
-            stop();
-            return;
-          }
-
-          if (handler_->on_read(buffer_, bytes_transferred) != 0) {
-            stop();
-            return;
-          }
-
-          do_write();
-
-          if (!writing_ && handler_->should_stop()) {
-            stop();
-            return;
-          }
-
-          do_read();
-
-          // If an error occurs then no new asynchronous operations are
-          // started. This means that all shared_ptr references to the
-          // connection object will disappear and the object will be
-          // destroyed automatically after this handler returns. The
-          // connection class's destructor closes the socket.
-        });
-  }
-
-  void do_write() {
-    auto self = this->shared_from_this();
-
-    if (writing_) {
-      return;
-    }
-
-    int rv;
-    std::size_t nwrite;
-
-    rv = handler_->on_write(outbuf_, nwrite);
-
-    if (rv != 0) {
-      stop();
-      return;
-    }
-
-    if (nwrite == 0) {
-      if (handler_->should_stop()) {
-        stop();
-      }
-      return;
-    }
-
-    writing_ = true;
-
-    // Reset read deadline here, because normally client is sending
-    // something, it does not expect timeout while doing it.
-    deadline_.expires_from_now(read_timeout_);
-
-    boost::asio::async_write(
-        socket_, boost::asio::buffer(outbuf_, nwrite),
-        [this, self](const boost::system::error_code &e, std::size_t) {
-          if (e) {
-            stop();
-            return;
-          }
-
-          writing_ = false;
-
-          do_write();
-        });
-
-    // No new asynchronous operations are started. This means that all
-    // shared_ptr references to the connection object will disappear and
-    // the object will be destroyed automatically after this handler
-    // returns. The connection class's destructor closes the socket.
-  }
-
-  void stop() {
-    if (stopped_) {
-      return;
-    }
-
-    stopped_ = true;
-    boost::system::error_code ignored_ec;
-    socket_.lowest_layer().close(ignored_ec);
-    deadline_.cancel();
-  }
-
-private:
-  socket_type socket_;
-
-  serve_mux &mux_;
-
-  std::shared_ptr<http2_handler> handler_;
-
-  /// Buffer for incoming data.
-  boost::array<uint8_t, 8_k> buffer_;
-
-  boost::array<uint8_t, 64_k> outbuf_;
-
-  boost::asio::deadline_timer deadline_;
-  boost::posix_time::time_duration tls_handshake_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-
-  bool writing_;
-  bool stopped_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-// We wrote this code based on the original code which has the
-// following license:
-//
-// server.hpp
-// ~~~~~~~~~~
-//
-// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_SERVER_H
-#define ASIO_SERVER_H
-
-#include "nghttp2_config.h"
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_io_service_pool.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class serve_mux;
-
-using boost::asio::ip::tcp;
-
-using ssl_socket = boost::asio::ssl::stream<tcp::socket>;
-
-class server : private boost::noncopyable {
-public:
-  explicit server(std::size_t io_service_pool_size,
-                  const boost::posix_time::time_duration &tls_handshake_timeout,
-                  const boost::posix_time::time_duration &read_timeout);
-
-  boost::system::error_code
-  listen_and_serve(boost::system::error_code &ec,
-                   boost::asio::ssl::context *tls_context,
-                   const std::string &address, const std::string &port,
-                   int backlog, serve_mux &mux, bool asynchronous = false);
-  void join();
-  void stop();
-
-  /// Get access to all io_service objects.
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-private:
-  /// Initiate an asynchronous accept operation.
-  void start_accept(tcp::acceptor &acceptor, serve_mux &mux);
-  /// Same as above but with tls_context
-  void start_accept(boost::asio::ssl::context &tls_context,
-                    tcp::acceptor &acceptor, serve_mux &mux);
-
-  /// Resolves address and bind socket to the resolved addresses.
-  boost::system::error_code bind_and_listen(boost::system::error_code &ec,
-                                            const std::string &address,
-                                            const std::string &port,
-                                            int backlog);
-
-  /// The pool of io_service objects used to perform asynchronous
-  /// operations.
-  io_service_pool io_service_pool_;
-
-  /// Acceptor used to listen for incoming connections.
-  std::vector<tcp::acceptor> acceptors_;
-
-  std::unique_ptr<boost::asio::ssl::context> ssl_ctx_;
-
-  boost::posix_time::time_duration tls_handshake_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_http2_impl.h"
-#include "asio_server.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-http2::http2() : impl_(make_unique<http2_impl>()) {}
-
-http2::~http2() {}
-
-http2::http2(http2 &&other) noexcept : impl_(std::move(other.impl_)) {}
-
-http2 &http2::operator=(http2 &&other) noexcept {
-  if (this == &other) {
-    return *this;
-  }
-
-  impl_ = std::move(other.impl_);
-
-  return *this;
-}
-
-boost::system::error_code http2::listen_and_serve(boost::system::error_code &ec,
-                                                  const std::string &address,
-                                                  const std::string &port,
-                                                  bool asynchronous) {
-  return impl_->listen_and_serve(ec, nullptr, address, port, asynchronous);
-}
-
-boost::system::error_code http2::listen_and_serve(
-    boost::system::error_code &ec, boost::asio::ssl::context &tls_context,
-    const std::string &address, const std::string &port, bool asynchronous) {
-  return impl_->listen_and_serve(ec, &tls_context, address, port, asynchronous);
-}
-
-void http2::num_threads(size_t num_threads) { impl_->num_threads(num_threads); }
-
-void http2::backlog(int backlog) { impl_->backlog(backlog); }
-
-void http2::tls_handshake_timeout(const boost::posix_time::time_duration &t) {
-  impl_->tls_handshake_timeout(t);
-}
-
-void http2::read_timeout(const boost::posix_time::time_duration &t) {
-  impl_->read_timeout(t);
-}
-
-bool http2::handle(std::string pattern, request_cb cb) {
-  return impl_->handle(std::move(pattern), std::move(cb));
-}
-
-void http2::stop() { impl_->stop(); }
-
-void http2::join() { return impl_->join(); }
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-http2::io_services() const {
-  return impl_->io_services();
-}
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,496 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_http2_handler.h"
-
-#include <iostream>
-
-#include "asio_common.h"
-#include "asio_server_serve_mux.h"
-#include "asio_server_stream.h"
-#include "asio_server_request_impl.h"
-#include "asio_server_response_impl.h"
-#include "http2.h"
-#include "util.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-namespace {
-int stream_error(nghttp2_session *session, int32_t stream_id,
-                 uint32_t error_code) {
-  return nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, stream_id,
-                                   error_code);
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  handler->create_stream(frame->hd.stream_id);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_header_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                       const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen, uint8_t flags,
-                       void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-  auto stream_id = frame->hd.stream_id;
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto strm = handler->find_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  auto &req = strm->request().impl();
-  auto &uref = req.uri();
-
-  switch (nghttp2::http2::lookup_token(name, namelen)) {
-  case nghttp2::http2::HD__METHOD:
-    req.method(std::string(value, value + valuelen));
-    break;
-  case nghttp2::http2::HD__SCHEME:
-    uref.scheme.assign(value, value + valuelen);
-    break;
-  case nghttp2::http2::HD__AUTHORITY:
-    uref.host.assign(value, value + valuelen);
-    break;
-  case nghttp2::http2::HD__PATH:
-    split_path(uref, value, value + valuelen);
-    break;
-  case nghttp2::http2::HD_HOST:
-    if (uref.host.empty()) {
-      uref.host.assign(value, value + valuelen);
-    }
-  // fall through
-  default:
-    if (req.header_buffer_size() + namelen + valuelen > 64_k) {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, frame->hd.stream_id,
-                                NGHTTP2_INTERNAL_ERROR);
-      break;
-    }
-    req.update_header_buffer_size(namelen + valuelen);
-
-    req.header().emplace(std::string(name, name + namelen),
-                         header_value{std::string(value, value + valuelen),
-                                      (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0});
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-  auto strm = handler->find_stream(frame->hd.stream_id);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-    if (!strm) {
-      break;
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->request().impl().call_on_data(nullptr, 0);
-    }
-
-    break;
-  case NGHTTP2_HEADERS: {
-    if (!strm || frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-      break;
-    }
-
-    auto &req = strm->request().impl();
-    req.remote_endpoint(handler->remote_endpoint());
-
-    handler->call_on_request(*strm);
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      strm->request().impl().call_on_data(nullptr, 0);
-    }
-
-    break;
-  }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-  auto strm = handler->find_stream(stream_id);
-
-  if (!strm) {
-    return 0;
-  }
-
-  strm->request().impl().call_on_data(data, len);
-
-  return 0;
-}
-
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-
-  auto strm = handler->find_stream(stream_id);
-  if (!strm) {
-    return 0;
-  }
-
-  strm->response().impl().call_on_close(error_code);
-
-  handler->close_stream(stream_id);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto handler = static_cast<http2_handler *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_PUSH_PROMISE) {
-    return 0;
-  }
-
-  auto strm = handler->find_stream(frame->push_promise.promised_stream_id);
-
-  if (!strm) {
-    return 0;
-  }
-
-  auto &res = strm->response().impl();
-  res.push_promise_sent();
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_not_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, int lib_error_code,
-                               void *user_data) {
-  if (frame->hd.type != NGHTTP2_HEADERS) {
-    return 0;
-  }
-
-  // Issue RST_STREAM so that stream does not hang around.
-  nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, frame->hd.stream_id,
-                            NGHTTP2_INTERNAL_ERROR);
-
-  return 0;
-}
-} // namespace
-
-http2_handler::http2_handler(boost::asio::io_service &io_service,
-                             boost::asio::ip::tcp::endpoint ep,
-                             connection_write writefun, serve_mux &mux)
-    : writefun_(writefun),
-      mux_(mux),
-      io_service_(io_service),
-      remote_ep_(ep),
-      session_(nullptr),
-      buf_(nullptr),
-      buflen_(0),
-      inside_callback_(false),
-      write_signaled_(false),
-      tstamp_cached_(time(nullptr)),
-      formatted_date_(util::http_date(tstamp_cached_)) {}
-
-http2_handler::~http2_handler() {
-  for (auto &p : streams_) {
-    auto &strm = p.second;
-    strm->response().impl().call_on_close(NGHTTP2_INTERNAL_ERROR);
-  }
-
-  nghttp2_session_del(session_);
-}
-
-const std::string &http2_handler::http_date() {
-  auto t = time(nullptr);
-  if (t != tstamp_cached_) {
-    tstamp_cached_ = t;
-    formatted_date_ = util::http_date(t);
-  }
-  return formatted_date_;
-}
-
-int http2_handler::start() {
-  int rv;
-
-  nghttp2_session_callbacks *callbacks;
-  rv = nghttp2_session_callbacks_new(&callbacks);
-  if (rv != 0) {
-    return -1;
-  }
-
-  auto cb_del = defer(nghttp2_session_callbacks_del, callbacks);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-  nghttp2_session_callbacks_set_on_frame_not_send_callback(
-      callbacks, on_frame_not_send_callback);
-
-  rv = nghttp2_session_server_new(&session_, callbacks, this);
-  if (rv != 0) {
-    return -1;
-  }
-
-  nghttp2_settings_entry ent{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100};
-  nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, &ent, 1);
-
-  return 0;
-}
-
-stream *http2_handler::create_stream(int32_t stream_id) {
-  auto p = streams_.emplace(stream_id, make_unique<stream>(this, stream_id));
-  assert(p.second);
-  return (*p.first).second.get();
-}
-
-void http2_handler::close_stream(int32_t stream_id) {
-  streams_.erase(stream_id);
-}
-
-stream *http2_handler::find_stream(int32_t stream_id) {
-  auto i = streams_.find(stream_id);
-  if (i == std::end(streams_)) {
-    return nullptr;
-  }
-
-  return (*i).second.get();
-}
-
-void http2_handler::call_on_request(stream &strm) {
-  auto cb = mux_.handler(strm.request().impl());
-  cb(strm.request(), strm.response());
-}
-
-bool http2_handler::should_stop() const {
-  return !nghttp2_session_want_read(session_) &&
-         !nghttp2_session_want_write(session_);
-}
-
-int http2_handler::start_response(stream &strm) {
-  int rv;
-
-  auto &res = strm.response().impl();
-  auto &header = res.header();
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(2 + header.size());
-  auto status = util::utos(res.status_code());
-  auto date = http_date();
-  nva.push_back(nghttp2::http2::make_nv_ls(":status", status));
-  nva.push_back(nghttp2::http2::make_nv_ls("date", date));
-  for (auto &hd : header) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  nghttp2_data_provider *prd_ptr = nullptr, prd;
-  auto &req = strm.request().impl();
-  if (::nghttp2::http2::expect_response_body(req.method(), res.status_code())) {
-    prd.source.ptr = &strm;
-    prd.read_callback = [](nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source,
-                           void *user_data) -> ssize_t {
-      auto &strm = *static_cast<stream *>(source->ptr);
-      return strm.response().impl().call_read(buf, length, data_flags);
-    };
-    prd_ptr = &prd;
-  }
-  rv = nghttp2_submit_response(session_, strm.get_stream_id(), nva.data(),
-                               nva.size(), prd_ptr);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-int http2_handler::submit_trailer(stream &strm, header_map h) {
-  int rv;
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(h.size());
-  for (auto &hd : h) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  rv = nghttp2_submit_trailer(session_, strm.get_stream_id(), nva.data(),
-                              nva.size());
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-void http2_handler::enter_callback() {
-  assert(!inside_callback_);
-  inside_callback_ = true;
-}
-
-void http2_handler::leave_callback() {
-  assert(inside_callback_);
-  inside_callback_ = false;
-}
-
-void http2_handler::stream_error(int32_t stream_id, uint32_t error_code) {
-  ::nghttp2::asio_http2::server::stream_error(session_, stream_id, error_code);
-  signal_write();
-}
-
-void http2_handler::signal_write() {
-  if (!inside_callback_ && !write_signaled_) {
-    write_signaled_ = true;
-    auto self = shared_from_this();
-    io_service_.post([self]() { self->initiate_write(); });
-  }
-}
-
-void http2_handler::initiate_write() {
-  write_signaled_ = false;
-  writefun_();
-}
-
-void http2_handler::resume(stream &strm) {
-  nghttp2_session_resume_data(session_, strm.get_stream_id());
-  signal_write();
-}
-
-response *http2_handler::push_promise(boost::system::error_code &ec,
-                                      stream &strm, std::string method,
-                                      std::string raw_path_query,
-                                      header_map h) {
-  int rv;
-
-  ec.clear();
-
-  auto &req = strm.request().impl();
-
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(4 + h.size());
-  nva.push_back(nghttp2::http2::make_nv_ls(":method", method));
-  nva.push_back(nghttp2::http2::make_nv_ls(":scheme", req.uri().scheme));
-  nva.push_back(nghttp2::http2::make_nv_ls(":authority", req.uri().host));
-  nva.push_back(nghttp2::http2::make_nv_ls(":path", raw_path_query));
-
-  for (auto &hd : h) {
-    nva.push_back(nghttp2::http2::make_nv(hd.first, hd.second.value,
-                                          hd.second.sensitive));
-  }
-
-  rv = nghttp2_submit_push_promise(session_, NGHTTP2_FLAG_NONE,
-                                   strm.get_stream_id(), nva.data(), nva.size(),
-                                   nullptr);
-
-  if (rv < 0) {
-    ec = make_error_code(static_cast<nghttp2_error>(rv));
-    return nullptr;
-  }
-
-  auto promised_strm = create_stream(rv);
-  auto &promised_req = promised_strm->request().impl();
-  promised_req.header(std::move(h));
-  promised_req.method(std::move(method));
-
-  auto &uref = promised_req.uri();
-  uref.scheme = req.uri().scheme;
-  uref.host = req.uri().host;
-  split_path(uref, std::begin(raw_path_query), std::end(raw_path_query));
-
-  auto &promised_res = promised_strm->response().impl();
-  promised_res.pushed(true);
-
-  signal_write();
-
-  return &promised_strm->response();
-}
-
-boost::asio::io_service &http2_handler::io_service() { return io_service_; }
-
-const boost::asio::ip::tcp::endpoint &http2_handler::remote_endpoint() {
-  return remote_ep_;
-}
-
-callback_guard::callback_guard(http2_handler &h) : handler(h) {
-  handler.enter_callback();
-}
-
-callback_guard::~callback_guard() { handler.leave_callback(); }
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_handler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_HTTP2_HANDLER_H
-#define ASIO_SERVER_HTTP2_HANDLER_H
-
-#include "nghttp2_config.h"
-
-#include <map>
-#include <functional>
-#include <string>
-
-#include <boost/array.hpp>
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class http2_handler;
-class stream;
-class serve_mux;
-
-struct callback_guard {
-  callback_guard(http2_handler &h);
-  ~callback_guard();
-  http2_handler &handler;
-};
-
-using connection_write = std::function<void(void)>;
-
-class http2_handler : public std::enable_shared_from_this<http2_handler> {
-public:
-  http2_handler(boost::asio::io_service &io_service,
-                boost::asio::ip::tcp::endpoint ep, connection_write writefun,
-                serve_mux &mux);
-
-  ~http2_handler();
-
-  int start();
-
-  stream *create_stream(int32_t stream_id);
-  void close_stream(int32_t stream_id);
-  stream *find_stream(int32_t stream_id);
-
-  void call_on_request(stream &s);
-
-  bool should_stop() const;
-
-  int start_response(stream &s);
-
-  int submit_trailer(stream &s, header_map h);
-
-  void stream_error(int32_t stream_id, uint32_t error_code);
-
-  void initiate_write();
-
-  void enter_callback();
-  void leave_callback();
-
-  void resume(stream &s);
-
-  response *push_promise(boost::system::error_code &ec, stream &s,
-                         std::string method, std::string raw_path_query,
-                         header_map h);
-
-  void signal_write();
-
-  boost::asio::io_service &io_service();
-
-  const boost::asio::ip::tcp::endpoint &remote_endpoint();
-
-  const std::string &http_date();
-
-  template <size_t N>
-  int on_read(const boost::array<uint8_t, N> &buffer, std::size_t len) {
-    callback_guard cg(*this);
-
-    int rv;
-
-    rv = nghttp2_session_mem_recv(session_, buffer.data(), len);
-
-    if (rv < 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-
-  template <size_t N>
-  int on_write(boost::array<uint8_t, N> &buffer, std::size_t &len) {
-    callback_guard cg(*this);
-
-    len = 0;
-
-    if (buf_) {
-      std::copy_n(buf_, buflen_, std::begin(buffer));
-
-      len += buflen_;
-
-      buf_ = nullptr;
-      buflen_ = 0;
-    }
-
-    for (;;) {
-      const uint8_t *data;
-      auto nread = nghttp2_session_mem_send(session_, &data);
-      if (nread < 0) {
-        return -1;
-      }
-
-      if (nread == 0) {
-        break;
-      }
-
-      if (len + nread > buffer.size()) {
-        buf_ = data;
-        buflen_ = nread;
-
-        break;
-      }
-
-      std::copy_n(data, nread, std::begin(buffer) + len);
-
-      len += nread;
-    }
-
-    return 0;
-  }
-
-private:
-  std::map<int32_t, std::shared_ptr<stream>> streams_;
-  connection_write writefun_;
-  serve_mux &mux_;
-  boost::asio::io_service &io_service_;
-  boost::asio::ip::tcp::endpoint remote_ep_;
-  nghttp2_session *session_;
-  const uint8_t *buf_;
-  std::size_t buflen_;
-  bool inside_callback_;
-  // true if we have pending on_write call.  This avoids repeated call
-  // of io_service::post.
-  bool write_signaled_;
-  time_t tstamp_cached_;
-  std::string formatted_date_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_HTTP2_HANDLER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_http2_impl.h"
-
-#include <openssl/ssl.h>
-
-#include "asio_server.h"
-#include "util.h"
-#include "tls.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-http2_impl::http2_impl()
-    : num_threads_(1),
-      backlog_(-1),
-      tls_handshake_timeout_(boost::posix_time::seconds(60)),
-      read_timeout_(boost::posix_time::seconds(60)) {}
-
-boost::system::error_code http2_impl::listen_and_serve(
-    boost::system::error_code &ec, boost::asio::ssl::context *tls_context,
-    const std::string &address, const std::string &port, bool asynchronous) {
-  server_.reset(
-      new server(num_threads_, tls_handshake_timeout_, read_timeout_));
-  return server_->listen_and_serve(ec, tls_context, address, port, backlog_,
-                                   mux_, asynchronous);
-}
-
-void http2_impl::num_threads(size_t num_threads) { num_threads_ = num_threads; }
-
-void http2_impl::backlog(int backlog) { backlog_ = backlog; }
-
-void http2_impl::tls_handshake_timeout(
-    const boost::posix_time::time_duration &t) {
-  tls_handshake_timeout_ = t;
-}
-
-void http2_impl::read_timeout(const boost::posix_time::time_duration &t) {
-  read_timeout_ = t;
-}
-
-bool http2_impl::handle(std::string pattern, request_cb cb) {
-  return mux_.handle(std::move(pattern), std::move(cb));
-}
-
-void http2_impl::stop() { return server_->stop(); }
-
-void http2_impl::join() { return server_->join(); }
-
-const std::vector<std::shared_ptr<boost::asio::io_service>> &
-http2_impl::io_services() const {
-  return server_->io_services();
-}
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_http2_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_HTTP2_IMPL_H
-#define ASIO_SERVER_HTTP2_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_serve_mux.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class server;
-
-class http2_impl {
-public:
-  http2_impl();
-  boost::system::error_code listen_and_serve(
-      boost::system::error_code &ec, boost::asio::ssl::context *tls_context,
-      const std::string &address, const std::string &port, bool asynchronous);
-  void num_threads(size_t num_threads);
-  void backlog(int backlog);
-  void tls_handshake_timeout(const boost::posix_time::time_duration &t);
-  void read_timeout(const boost::posix_time::time_duration &t);
-  bool handle(std::string pattern, request_cb cb);
-  void stop();
-  void join();
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-private:
-  std::unique_ptr<server> server_;
-  std::size_t num_threads_;
-  int backlog_;
-  serve_mux mux_;
-  boost::posix_time::time_duration tls_handshake_timeout_;
-  boost::posix_time::time_duration read_timeout_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_HTTP2_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_request_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-request::request() : impl_(make_unique<request_impl>()) {}
-
-request::~request() {}
-
-const header_map &request::header() const { return impl_->header(); }
-
-const std::string &request::method() const { return impl_->method(); }
-
-const uri_ref &request::uri() const { return impl_->uri(); }
-
-void request::on_data(data_cb cb) const {
-  return impl_->on_data(std::move(cb));
-}
-
-request_impl &request::impl() const { return *impl_; }
-
-const boost::asio::ip::tcp::endpoint &request::remote_endpoint() const {
-  return impl_->remote_endpoint();
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_request_handler.h"
-
-#include "util.h"
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-namespace {
-std::string create_html(int status_code) {
-  BlockAllocator balloc(1024, 1024);
-  std::string res;
-  res.reserve(512);
-  auto status_string = ::nghttp2::http2::stringify_status(balloc, status_code);
-  auto reason_phrase = ::nghttp2::http2::get_reason_phrase(status_code);
-  res += R"(<!DOCTYPE html><html lang="en"><title>)";
-  res += status_string;
-  res += ' ';
-  res += reason_phrase;
-  res += "</title><body><h1>";
-  res += status_string;
-  res += ' ';
-  res += reason_phrase;
-  res += "</h1></body></html>";
-  return res;
-}
-} // namespace
-
-request_cb redirect_handler(int status_code, std::string uri) {
-  return [status_code, uri](const request &req, const response &res) {
-    header_map h;
-    h.emplace("location", header_value{std::move(uri)});
-    std::string html;
-    if (req.method() == "GET") {
-      html = create_html(status_code);
-    }
-    h.emplace("content-length", header_value{util::utos(html.size())});
-
-    res.write_head(status_code, std::move(h));
-    res.end(std::move(html));
-  };
-}
-
-request_cb status_handler(int status_code) {
-  return [status_code](const request &req, const response &res) {
-    if (!::nghttp2::http2::expect_response_body(status_code)) {
-      res.write_head(status_code);
-      res.end();
-      return;
-    }
-    // we supply content-length for HEAD request, but body will not be
-    // sent.
-    auto html = create_html(status_code);
-    header_map h;
-    h.emplace("content-length", header_value{util::utos(html.size())});
-    h.emplace("content-type", header_value{"text/html; charset=utf-8"});
-
-    res.write_head(status_code, std::move(h));
-    res.end(std::move(html));
-  };
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_handler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_REQUEST_HANDLER_H
-#define ASIO_SERVER_REQUEST_HANDLER_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#endif // ASIO_SERVER_REQUEST_HANDLER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_request_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-request_impl::request_impl() : strm_(nullptr), header_buffer_size_(0) {}
-
-const header_map &request_impl::header() const { return header_; }
-
-const std::string &request_impl::method() const { return method_; }
-
-const uri_ref &request_impl::uri() const { return uri_; }
-
-uri_ref &request_impl::uri() { return uri_; }
-
-void request_impl::header(header_map h) { header_ = std::move(h); }
-
-header_map &request_impl::header() { return header_; }
-
-void request_impl::method(std::string arg) { method_ = std::move(arg); }
-
-void request_impl::on_data(data_cb cb) { on_data_cb_ = std::move(cb); }
-
-void request_impl::stream(class stream *s) { strm_ = s; }
-
-void request_impl::call_on_data(const uint8_t *data, std::size_t len) {
-  if (on_data_cb_) {
-    on_data_cb_(data, len);
-  }
-}
-
-const boost::asio::ip::tcp::endpoint &request_impl::remote_endpoint() const {
-  return remote_ep_;
-}
-
-void request_impl::remote_endpoint(boost::asio::ip::tcp::endpoint ep) {
-  remote_ep_ = std::move(ep);
-}
-
-size_t request_impl::header_buffer_size() const { return header_buffer_size_; }
-
-void request_impl::update_header_buffer_size(size_t len) {
-  header_buffer_size_ += len;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_request_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_REQUEST_IMPL_H
-#define ASIO_SERVER_REQUEST_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-#include <boost/asio/ip/tcp.hpp>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class stream;
-
-class request_impl {
-public:
-  request_impl();
-
-  void header(header_map h);
-  const header_map &header() const;
-  header_map &header();
-
-  void method(std::string method);
-  const std::string &method() const;
-
-  const uri_ref &uri() const;
-  uri_ref &uri();
-
-  void on_data(data_cb cb);
-
-  void stream(class stream *s);
-  void call_on_data(const uint8_t *data, std::size_t len);
-
-  const boost::asio::ip::tcp::endpoint &remote_endpoint() const;
-  void remote_endpoint(boost::asio::ip::tcp::endpoint ep);
-
-  size_t header_buffer_size() const;
-  void update_header_buffer_size(size_t len);
-
-private:
-  class stream *strm_;
-  header_map header_;
-  std::string method_;
-  uri_ref uri_;
-  data_cb on_data_cb_;
-  boost::asio::ip::tcp::endpoint remote_ep_;
-  size_t header_buffer_size_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_REQUEST_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#include "asio_server_response_impl.h"
-
-#include "template.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-response::response() : impl_(make_unique<response_impl>()) {}
-
-response::~response() {}
-
-void response::write_head(unsigned int status_code, header_map h) const {
-  impl_->write_head(status_code, std::move(h));
-}
-
-void response::end(std::string data) const { impl_->end(std::move(data)); }
-
-void response::end(generator_cb cb) const { impl_->end(std::move(cb)); }
-
-void response::write_trailer(header_map h) const {
-  impl_->write_trailer(std::move(h));
-}
-
-void response::on_close(close_cb cb) const { impl_->on_close(std::move(cb)); }
-
-void response::cancel(uint32_t error_code) const { impl_->cancel(error_code); }
-
-const response *response::push(boost::system::error_code &ec,
-                               std::string method, std::string path,
-                               header_map h) const {
-  return impl_->push(ec, std::move(method), std::move(path), std::move(h));
-}
-
-void response::resume() const { impl_->resume(); }
-
-unsigned int response::status_code() const { return impl_->status_code(); }
-
-boost::asio::io_service &response::io_service() const {
-  return impl_->io_service();
-}
-
-response_impl &response::impl() const { return *impl_; }
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,166 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_response_impl.h"
-
-#include "asio_server_stream.h"
-#include "asio_server_request_impl.h"
-#include "asio_server_http2_handler.h"
-#include "asio_common.h"
-
-#include "http2.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-response_impl::response_impl()
-    : strm_(nullptr),
-      generator_cb_(deferred_generator()),
-      status_code_(200),
-      state_(response_state::INITIAL),
-      pushed_(false),
-      push_promise_sent_(false) {}
-
-unsigned int response_impl::status_code() const { return status_code_; }
-
-void response_impl::write_head(unsigned int status_code, header_map h) {
-  if (state_ != response_state::INITIAL) {
-    return;
-  }
-
-  status_code_ = status_code;
-  header_ = std::move(h);
-
-  state_ = response_state::HEADER_DONE;
-
-  if (pushed_ && !push_promise_sent_) {
-    return;
-  }
-
-  start_response();
-}
-
-void response_impl::end(std::string data) {
-  end(string_generator(std::move(data)));
-}
-
-void response_impl::end(generator_cb cb) {
-  if (state_ == response_state::BODY_STARTED) {
-    return;
-  }
-
-  generator_cb_ = std::move(cb);
-
-  if (state_ == response_state::INITIAL) {
-    write_head(status_code_);
-  } else {
-    // generator_cb is changed, start writing in case it is deferred.
-    auto handler = strm_->handler();
-    handler->resume(*strm_);
-  }
-
-  state_ = response_state::BODY_STARTED;
-}
-
-void response_impl::write_trailer(header_map h) {
-  auto handler = strm_->handler();
-  handler->submit_trailer(*strm_, std::move(h));
-}
-
-void response_impl::start_response() {
-  auto handler = strm_->handler();
-
-  auto &req = strm_->request().impl();
-
-  if (!::nghttp2::http2::expect_response_body(req.method(), status_code_)) {
-    state_ = response_state::BODY_STARTED;
-  }
-
-  if (handler->start_response(*strm_) != 0) {
-    handler->stream_error(strm_->get_stream_id(), NGHTTP2_INTERNAL_ERROR);
-    return;
-  }
-}
-
-void response_impl::on_close(close_cb cb) { close_cb_ = std::move(cb); }
-
-void response_impl::call_on_close(uint32_t error_code) {
-  if (close_cb_) {
-    close_cb_(error_code);
-  }
-}
-
-void response_impl::cancel(uint32_t error_code) {
-  auto handler = strm_->handler();
-  handler->stream_error(strm_->get_stream_id(), error_code);
-}
-
-response *response_impl::push(boost::system::error_code &ec, std::string method,
-                              std::string raw_path_query, header_map h) const {
-  auto handler = strm_->handler();
-  return handler->push_promise(ec, *strm_, std::move(method),
-                               std::move(raw_path_query), std::move(h));
-}
-
-void response_impl::resume() {
-  auto handler = strm_->handler();
-  handler->resume(*strm_);
-}
-
-boost::asio::io_service &response_impl::io_service() {
-  return strm_->handler()->io_service();
-}
-
-void response_impl::pushed(bool f) { pushed_ = f; }
-
-void response_impl::push_promise_sent() {
-  if (push_promise_sent_) {
-    return;
-  }
-  push_promise_sent_ = true;
-  if (state_ == response_state::INITIAL) {
-    return;
-  }
-  start_response();
-}
-
-const header_map &response_impl::header() const { return header_; }
-
-void response_impl::stream(class stream *s) { strm_ = s; }
-
-generator_cb::result_type
-response_impl::call_read(uint8_t *data, std::size_t len, uint32_t *data_flags) {
-  if (generator_cb_) {
-    return generator_cb_(data, len, data_flags);
-  }
-
-  *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-  return 0;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_response_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_RESPONSE_IMPL_H
-#define ASIO_SERVER_RESPONSE_IMPL_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class stream;
-
-enum class response_state {
-  INITIAL,
-  // response_impl::write_head() was called
-  HEADER_DONE,
-  // response_impl::end() was called
-  BODY_STARTED,
-};
-
-class response_impl {
-public:
-  response_impl();
-  void write_head(unsigned int status_code, header_map h = header_map{});
-  void end(std::string data = "");
-  void end(generator_cb cb);
-  void write_trailer(header_map h);
-  void on_close(close_cb cb);
-  void resume();
-
-  void cancel(uint32_t error_code);
-
-  response *push(boost::system::error_code &ec, std::string method,
-                 std::string raw_path_query, header_map) const;
-
-  boost::asio::io_service &io_service();
-
-  void start_response();
-
-  unsigned int status_code() const;
-  const header_map &header() const;
-  void pushed(bool f);
-  void push_promise_sent();
-  void stream(class stream *s);
-  generator_cb::result_type call_read(uint8_t *data, std::size_t len,
-                                      uint32_t *data_flags);
-  void call_on_close(uint32_t error_code);
-
-private:
-  class stream *strm_;
-  header_map header_;
-  generator_cb generator_cb_;
-  close_cb close_cb_;
-  unsigned int status_code_;
-  response_state state_;
-  // true if this is pushed stream's response
-  bool pushed_;
-  // true if PUSH_PROMISE is sent if this is response of a pushed
-  // stream
-  bool push_promise_sent_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_RESPONSE_IMPL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_serve_mux.h"
-
-#include "asio_server_request_impl.h"
-#include "asio_server_request_handler.h"
-#include "util.h"
-#include "http2.h"
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-bool serve_mux::handle(std::string pattern, request_cb cb) {
-  if (pattern.empty() || !cb) {
-    return false;
-  }
-
-  auto it = mux_.find(pattern);
-  if (it != std::end(mux_) && (*it).second.user_defined) {
-    return false;
-  }
-
-  // if pattern ends with '/' (e.g., /foo/), add implicit permanent
-  // redirect for '/foo'.
-  if (pattern.size() >= 2 && pattern.back() == '/') {
-    auto redirect_pattern = pattern.substr(0, pattern.size() - 1);
-    auto it = mux_.find(redirect_pattern);
-    if (it == std::end(mux_) || !(*it).second.user_defined) {
-      std::string path;
-      if (pattern[0] == '/') {
-        path = pattern;
-      } else {
-        // skip host part
-        path = pattern.substr(pattern.find('/'));
-      }
-      if (it == std::end(mux_)) {
-        mux_.emplace(std::move(redirect_pattern),
-                     handler_entry{false,
-                                   redirect_handler(301, std::move(path)),
-                                   pattern});
-      } else {
-        (*it).second = handler_entry{
-            false, redirect_handler(301, std::move(path)), pattern};
-      }
-    }
-  }
-  mux_.emplace(pattern, handler_entry{true, std::move(cb), pattern});
-
-  return true;
-}
-
-request_cb serve_mux::handler(request_impl &req) const {
-  auto &path = req.uri().path;
-  if (req.method() != "CONNECT") {
-    auto clean_path = ::nghttp2::http2::path_join(StringRef{}, StringRef{},
-                                                  StringRef{path}, StringRef{});
-    if (clean_path != path) {
-      auto new_uri = util::percent_encode_path(clean_path);
-      auto &uref = req.uri();
-      if (!uref.raw_query.empty()) {
-        new_uri += '?';
-        new_uri += uref.raw_query;
-      }
-
-      return redirect_handler(301, std::move(new_uri));
-    }
-  }
-  auto &host = req.uri().host;
-
-  auto cb = match(host + path);
-  if (cb) {
-    return cb;
-  }
-  cb = match(path);
-  if (cb) {
-    return cb;
-  }
-  return status_handler(404);
-}
-
-namespace {
-bool path_match(const std::string &pattern, const std::string &path) {
-  if (pattern.back() != '/') {
-    return pattern == path;
-  }
-  return util::starts_with(path, pattern);
-}
-} // namespace
-
-request_cb serve_mux::match(const std::string &path) const {
-  const handler_entry *ent = nullptr;
-  size_t best = 0;
-  for (auto &kv : mux_) {
-    auto &pattern = kv.first;
-    if (!path_match(pattern, path)) {
-      continue;
-    }
-    if (!ent || best < pattern.size()) {
-      best = pattern.size();
-      ent = &kv.second;
-    }
-  }
-  if (ent) {
-    return ent->cb;
-  }
-  return request_cb();
-}
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_serve_mux.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_SERVE_MUX_H
-#define ASIO_SERVER_SERVE_MUX_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class request_impl;
-
-// port from go's ServeMux
-
-struct handler_entry {
-  bool user_defined;
-  request_cb cb;
-  std::string pattern;
-};
-
-class serve_mux {
-public:
-  bool handle(std::string pattern, request_cb cb);
-  request_cb handler(request_impl &req) const;
-  request_cb match(const std::string &path) const;
-
-private:
-  std::map<std::string, handler_entry> mux_;
-};
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_SERVE_MUX_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_stream.h"
-
-#include "asio_server_http2_handler.h"
-#include "asio_server_request_impl.h"
-#include "asio_server_response_impl.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-stream::stream(http2_handler *h, int32_t stream_id)
-    : handler_(h), stream_id_(stream_id) {
-  request_.impl().stream(this);
-  response_.impl().stream(this);
-}
-
-int32_t stream::get_stream_id() const { return stream_id_; }
-
-class request &stream::request() {
-  return request_;
-}
-
-class response &stream::response() {
-  return response_;
-}
-
-http2_handler *stream::handler() const { return handler_; }
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_stream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_STREAM_H
-#define ASIO_SERVER_STREAM_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-class http2_handler;
-
-class stream {
-public:
-  stream(http2_handler *h, int32_t stream_id);
-
-  int32_t get_stream_id() const;
-  class request &request();
-  class response &response();
-
-  http2_handler *handler() const;
-
-private:
-  http2_handler *handler_;
-  class request request_;
-  class response response_;
-  int32_t stream_id_;
-};
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
-
-#endif // ASIO_SERVER_STREAM_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "asio_server_tls_context.h"
-
-#include <openssl/ssl.h>
-
-#include <boost/asio/ssl.hpp>
-
-#include "tls.h"
-#include "util.h"
-
-namespace nghttp2 {
-namespace asio_http2 {
-namespace server {
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-std::vector<unsigned char> &get_alpn_token() {
-  static auto alpn_token = util::get_default_alpn();
-  return alpn_token;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-namespace {
-int alpn_select_proto_cb(SSL *ssl, const unsigned char **out,
-                         unsigned char *outlen, const unsigned char *in,
-                         unsigned int inlen, void *arg) {
-  if (!util::select_h2(out, outlen, in, inlen)) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-boost::system::error_code
-configure_tls_context_easy(boost::system::error_code &ec,
-                           boost::asio::ssl::context &tls_context) {
-  ec.clear();
-
-  auto ctx = tls_context.native_handle();
-
-  auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                  SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-                  SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION |
-                  SSL_OP_SINGLE_ECDH_USE | SSL_OP_NO_TICKET |
-                  SSL_OP_CIPHER_SERVER_PREFERENCE;
-
-  SSL_CTX_set_options(ctx, ssl_opts);
-  SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
-  SSL_CTX_set_mode(ctx, SSL_MODE_RELEASE_BUFFERS);
-
-  SSL_CTX_set_cipher_list(ctx, tls::DEFAULT_CIPHER_LIST);
-
-#ifndef OPENSSL_NO_EC
-  auto ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-  if (ecdh) {
-    SSL_CTX_set_tmp_ecdh(ctx, ecdh);
-    EC_KEY_free(ecdh);
-  }
-#endif /* OPENSSL_NO_EC */
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_protos_advertised_cb(
-      ctx,
-      [](SSL *s, const unsigned char **data, unsigned int *len, void *arg) {
-        auto &token = get_alpn_token();
-
-        *data = token.data();
-        *len = token.size();
-
-        return SSL_TLSEXT_ERR_OK;
-      },
-      nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  // ALPN selection callback
-  SSL_CTX_set_alpn_select_cb(ctx, alpn_select_proto_cb, nullptr);
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  return ec;
-}
-
-} // namespace server
-} // namespace asio_http2
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/asio_server_tls_context.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_SERVER_TLS_CONTEXT_H
-#define ASIO_SERVER_TLS_CONTEXT_H
-
-#include "nghttp2_config.h"
-
-#include <nghttp2/asio_http2_server.h>
-
-#endif // ASIO_SERVER_TLS_CONTEXT_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/base64.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/base64.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/base64.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/base64.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef BASE64_H
-#define BASE64_H
-
-#include "nghttp2_config.h"
-
-#include <string>
-
-#include "template.h"
-#include "allocator.h"
-
-namespace nghttp2 {
-
-namespace base64 {
-
-template <typename InputIt> std::string encode(InputIt first, InputIt last) {
-  static constexpr char CHAR_TABLE[] = {
-      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/',
-  };
-  std::string res;
-  size_t len = last - first;
-  if (len == 0) {
-    return res;
-  }
-  size_t r = len % 3;
-  res.resize((len + 2) / 3 * 4);
-  auto j = last - r;
-  auto p = std::begin(res);
-  while (first != j) {
-    uint32_t n = static_cast<uint8_t>(*first++) << 16;
-    n += static_cast<uint8_t>(*first++) << 8;
-    n += static_cast<uint8_t>(*first++);
-    *p++ = CHAR_TABLE[n >> 18];
-    *p++ = CHAR_TABLE[(n >> 12) & 0x3fu];
-    *p++ = CHAR_TABLE[(n >> 6) & 0x3fu];
-    *p++ = CHAR_TABLE[n & 0x3fu];
-  }
-
-  if (r == 2) {
-    uint32_t n = static_cast<uint8_t>(*first++) << 16;
-    n += static_cast<uint8_t>(*first++) << 8;
-    *p++ = CHAR_TABLE[n >> 18];
-    *p++ = CHAR_TABLE[(n >> 12) & 0x3fu];
-    *p++ = CHAR_TABLE[(n >> 6) & 0x3fu];
-    *p++ = '=';
-  } else if (r == 1) {
-    uint32_t n = static_cast<uint8_t>(*first++) << 16;
-    *p++ = CHAR_TABLE[n >> 18];
-    *p++ = CHAR_TABLE[(n >> 12) & 0x3fu];
-    *p++ = '=';
-    *p++ = '=';
-  }
-  return res;
-}
-
-template <typename InputIt>
-InputIt next_decode_input(InputIt first, InputIt last, const int *tbl) {
-  for (; first != last; ++first) {
-    if (tbl[static_cast<size_t>(*first)] != -1 || *first == '=') {
-      break;
-    }
-  }
-  return first;
-}
-
-template <typename InputIt, typename OutputIt>
-OutputIt decode(InputIt first, InputIt last, OutputIt d_first) {
-  static constexpr int INDEX_TABLE[] = {
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57,
-      58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 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, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
-      37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1};
-  assert(std::distance(first, last) % 4 == 0);
-  auto p = d_first;
-  for (; first != last;) {
-    uint32_t n = 0;
-    for (int i = 1; i <= 4; ++i, ++first) {
-      auto idx = INDEX_TABLE[static_cast<size_t>(*first)];
-      if (idx == -1) {
-        if (i <= 2) {
-          return d_first;
-        }
-        if (i == 3) {
-          if (*first == '=' && *(first + 1) == '=' && first + 2 == last) {
-            *p++ = n >> 16;
-            return p;
-          }
-          return d_first;
-        }
-        if (*first == '=' && first + 1 == last) {
-          *p++ = n >> 16;
-          *p++ = n >> 8 & 0xffu;
-          return p;
-        }
-        return d_first;
-      }
-
-      n += idx << (24 - i * 6);
-    }
-
-    *p++ = n >> 16;
-    *p++ = n >> 8 & 0xffu;
-    *p++ = n & 0xffu;
-  }
-
-  return p;
-}
-
-template <typename InputIt> std::string decode(InputIt first, InputIt last) {
-  auto len = std::distance(first, last);
-  if (len % 4 != 0) {
-    return "";
-  }
-  std::string res;
-  res.resize(len / 4 * 3);
-
-  res.erase(decode(first, last, std::begin(res)), std::end(res));
-
-  return res;
-}
-
-template <typename InputIt>
-StringRef decode(BlockAllocator &balloc, InputIt first, InputIt last) {
-  auto len = std::distance(first, last);
-  if (len % 4 != 0) {
-    return StringRef::from_lit("");
-  }
-  auto iov = make_byte_ref(balloc, len / 4 * 3 + 1);
-  auto p = iov.base;
-
-  p = decode(first, last, p);
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-} // namespace base64
-
-} // namespace nghttp2
-
-#endif // BASE64_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "base64_test.h"
-
-#include <cstring>
-#include <iostream>
-
-#include <CUnit/CUnit.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "base64.h"
-
-namespace nghttp2 {
-
-void test_base64_encode(void) {
-  {
-    std::string in = "\xff";
-    auto out = base64::encode(std::begin(in), std::end(in));
-    CU_ASSERT("/w==" == out);
-  }
-  {
-    std::string in = "\xff\xfe";
-    auto out = base64::encode(std::begin(in), std::end(in));
-    CU_ASSERT("//4=" == out);
-  }
-  {
-    std::string in = "\xff\xfe\xfd";
-    auto out = base64::encode(std::begin(in), std::end(in));
-    CU_ASSERT("//79" == out);
-  }
-  {
-    std::string in = "\xff\xfe\xfd\xfc";
-    auto out = base64::encode(std::begin(in), std::end(in));
-    CU_ASSERT("//79/A==" == out);
-  }
-}
-
-void test_base64_decode(void) {
-  BlockAllocator balloc(4096, 4096);
-  {
-    std::string in = "/w==";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("\xff" == out);
-    CU_ASSERT("\xff" == base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    std::string in = "//4=";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("\xff\xfe" == out);
-    CU_ASSERT("\xff\xfe" ==
-              base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    std::string in = "//79";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("\xff\xfe\xfd" == out);
-    CU_ASSERT("\xff\xfe\xfd" ==
-              base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    std::string in = "//79/A==";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("\xff\xfe\xfd\xfc" == out);
-    CU_ASSERT("\xff\xfe\xfd\xfc" ==
-              base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    // we check the number of valid input must be multiples of 4
-    std::string in = "//79=";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("" == out);
-    CU_ASSERT("" == base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    // ending invalid character at the boundary of multiples of 4 is
-    // bad
-    std::string in = "bmdodHRw\n";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("" == out);
-    CU_ASSERT("" == base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    // after seeing '=', subsequent input must be also '='.
-    std::string in = "//79/A=A";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("" == out);
-    CU_ASSERT("" == base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-  {
-    // additional '=' at the end is bad
-    std::string in = "//79/A======";
-    auto out = base64::decode(std::begin(in), std::end(in));
-    CU_ASSERT("" == out);
-    CU_ASSERT("" == base64::decode(balloc, std::begin(in), std::end(in)));
-  }
-}
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/base64_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef BASE64_TEST_H
-#define BASE64_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace nghttp2 {
-
-void test_base64_encode(void);
-void test_base64_decode(void);
-
-} // namespace nghttp2
-
-#endif // BASE64_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/buffer.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/buffer.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/buffer.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/buffer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef BUFFER_H
-#define BUFFER_H
-
-#include "nghttp2_config.h"
-
-#include <cstring>
-#include <algorithm>
-#include <array>
-
-namespace nghttp2 {
-
-template <size_t N> struct Buffer {
-  Buffer() : pos(std::begin(buf)), last(pos) {}
-  // Returns the number of bytes to read.
-  size_t rleft() const { return last - pos; }
-  // Returns the number of bytes this buffer can store.
-  size_t wleft() const { return std::end(buf) - last; }
-  // Writes up to min(wleft(), |count|) bytes from buffer pointed by
-  // |src|.  Returns number of bytes written.
-  size_t write(const void *src, size_t count) {
-    count = std::min(count, wleft());
-    auto p = static_cast<const uint8_t *>(src);
-    last = std::copy_n(p, count, last);
-    return count;
-  }
-  size_t write(size_t count) {
-    count = std::min(count, wleft());
-    last += count;
-    return count;
-  }
-  // Drains min(rleft(), |count|) bytes from start of the buffer.
-  size_t drain(size_t count) {
-    count = std::min(count, rleft());
-    pos += count;
-    return count;
-  }
-  size_t drain_reset(size_t count) {
-    count = std::min(count, rleft());
-    std::copy(pos + count, last, std::begin(buf));
-    last = std::begin(buf) + (last - (pos + count));
-    pos = std::begin(buf);
-    return count;
-  }
-  void reset() { pos = last = std::begin(buf); }
-  uint8_t *begin() { return std::begin(buf); }
-  uint8_t &operator[](size_t n) { return buf[n]; }
-  const uint8_t &operator[](size_t n) const { return buf[n]; }
-  std::array<uint8_t, N> buf;
-  uint8_t *pos, *last;
-};
-
-} // namespace nghttp2
-
-#endif // BUFFER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "buffer_test.h"
-
-#include <cstring>
-#include <iostream>
-#include <tuple>
-
-#include <CUnit/CUnit.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "buffer.h"
-
-namespace nghttp2 {
-
-void test_buffer_write(void) {
-  Buffer<16> b;
-  CU_ASSERT(0 == b.rleft());
-  CU_ASSERT(16 == b.wleft());
-
-  b.write("012", 3);
-
-  CU_ASSERT(3 == b.rleft());
-  CU_ASSERT(13 == b.wleft());
-  CU_ASSERT(b.pos == std::begin(b.buf));
-
-  b.drain(3);
-
-  CU_ASSERT(0 == b.rleft());
-  CU_ASSERT(13 == b.wleft());
-  CU_ASSERT(3 == b.pos - std::begin(b.buf));
-
-  auto n = b.write("0123456789ABCDEF", 16);
-
-  CU_ASSERT(n == 13);
-
-  CU_ASSERT(13 == b.rleft());
-  CU_ASSERT(0 == b.wleft());
-  CU_ASSERT(3 == b.pos - std::begin(b.buf));
-  CU_ASSERT(0 == memcmp(b.pos, "0123456789ABC", 13));
-
-  b.reset();
-
-  CU_ASSERT(0 == b.rleft());
-  CU_ASSERT(16 == b.wleft());
-  CU_ASSERT(b.pos == std::begin(b.buf));
-
-  b.write(5);
-
-  CU_ASSERT(5 == b.rleft());
-  CU_ASSERT(11 == b.wleft());
-  CU_ASSERT(b.pos == std::begin(b.buf));
-}
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/buffer_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef BUFFER_TEST_H
-#define BUFFER_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace nghttp2 {
-
-void test_buffer_write(void);
-
-} // namespace nghttp2
-
-#endif // BUFFER_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca-config.json cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca-config.json
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca-config.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca-config.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-{
-    "signing": {
-	"default": {
-	    "expiry": "87600h"
-	},
-	"profiles": {
-	    "server": {
-		"expiry": "87600h",
-		"usages": [
-		    "signing",
-		    "key encipherment",
-		    "server auth"
-		]
-	    }
-	}
-    }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICwjCCAaoCAQAwXjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
-ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMOY2Eu
-bmdodHRwMi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWRWQX
-xBJTBb8dX0QVE9IyiI5WZjAHy+ooO1PR3owWIoAzz9gkVSra4qVTJ2BPgg8Ts8BO
-9VwiPca0v1fM+Gxypg79LRjuxzJMTZUA+a3P5K09Z/bBnUhBHT0eucNNzjgq9gZm
-l58FmQP1SNuYn1rVmYmMmIyveFOcoT+zFnb50yycxlc3zbZx9ofJM35PT5PLDm8E
-FugIOxnPGZ/70UUgMk2zc0vfhxHwRlGGl9p6Bqkfxu04n4P5FnaSDsT9hiQZxLo2
-h29ONJQUIUelaMcJ9MWGf+jAEgCigJ1aiuHp1zxDvaUCh3A0tdLy64+A+ozmzgLP
-nubtmCzg6KU2Yh1rAgMBAAGgHzAdBgkqhkiG9w0BCQ4xEDAOMAwGA1UdEwQFMAMB
-Af8wDQYJKoZIhvcNAQELBQADggEBACI5v8GbOXKv38h9/tuGEwJ9uxpYEljgGt8h
-QL5lwfEifh/7A8b39b9JEzWk5hnMRCOb8J6Jc3/6nmVgtKkQ+Mceupqpwsp1gT/v
-uUoAkJE03Iuja9zLhHmy74oZ7LWOQrZ1T7Z0eGQ+5u+LBZiPKnKxmkLCQoUPTbc4
-NQ9BbKhr8OaoJ4DDvJnszcL7to6kih7SkdoNZsq4zB0/ai/cPhvoVgkYfbLH2++D
-Tcs7TqU2L7gKzqXUtHeAKM2y81ewL7QTrcYzgiW86s3NmquxZG5pq0mjD+P4BYLc
-MOdnCxKbBuE/1R29pa6+JKgc46jOa2yRgv5+8rXkkpu53Ke3FGc=
------END CERTIFICATE REQUEST-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr.json cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr.json
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.csr.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-{
-    "CN": "ca.nghttp2.org",
-    "key": {
-	"algo": "rsa",
-	"size": 2048
-    },
-    "ca": {
-	"expiry": "87600h"
-    },
-    "names": [
-	{
-	    "C": "AU",
-	    "ST": "Some-State",
-	    "O": "Internet Widgits Pty Ltd"
-	}
-    ]
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org-key.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org-key.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org-key.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org-key.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA1kVkF8QSUwW/HV9EFRPSMoiOVmYwB8vqKDtT0d6MFiKAM8/Y
-JFUq2uKlUydgT4IPE7PATvVcIj3GtL9XzPhscqYO/S0Y7scyTE2VAPmtz+StPWf2
-wZ1IQR09HrnDTc44KvYGZpefBZkD9UjbmJ9a1ZmJjJiMr3hTnKE/sxZ2+dMsnMZX
-N822cfaHyTN+T0+Tyw5vBBboCDsZzxmf+9FFIDJNs3NL34cR8EZRhpfaegapH8bt
-OJ+D+RZ2kg7E/YYkGcS6NodvTjSUFCFHpWjHCfTFhn/owBIAooCdWorh6dc8Q72l
-AodwNLXS8uuPgPqM5s4Cz57m7Zgs4OilNmIdawIDAQABAoIBAQCwqLtygLye6KD+
-RXorapEmCsJX5553/x6Klwdvg+25ni5XCWjp47IWj0DBQzi7tL5bfxrxvod8z7QR
-d6SbIMLA77px8Ima7G7CzEAqcrBkM+TFOP8P+G4HCWVH/N5SOtDCUt9KHH4Grna9
-95jdx5yreRAX8/oh/bHp9GRBcicbpwYMVWOnjTE2seEUYQOpdpYdP4bOPUvAju0l
-mwmy2/dDGmbibktN3sdHEhDodKu+Znv7nFZo0jzhlyoXse653WcvaQeZZYuojvSe
-Sr92DvPp7UaYrb4KvT7ujXiPavSV2m/4EmGtyqevUf2dZ6sfMXZjmXsjWz9txhWp
-4BgbHyHRAoGBAPqyuNj2CDD3FE7N3Hxyba8d+ZtsVUNawjq2gwOvT9NLsMstOGyH
-OCc1v4W6Sq4w1wo4nIJyY8kNZwtReaTHOPZlDgBhVvk/x8eLBu+QTMRyocRt1LoD
-8HyKxWSAnYTtCh/GUEQ37amIqvOJ5GNL+25WDzevLa5kMYWG743uxEupAoGBANrN
-c/fVxepvP0GISlLpL3aZCFGAjMrq3xUYcf/w4wPoMq6AdpIPeRVBmJ1/Uqw1FkV8
-NRKJNPE2YcMuv8iMeQlacoPd34KT9ob80EYVlMwAkeC0NK+FfiM/UteR0wB49gmi
-ugX9YlJytOP9aUgPvEGT6l+XtgGC44W1TQWe62zzAoGBAKZenNU+0UjNb6isbToZ
-Jjkkh1Vhm2PLg0I7hM6ZNTxf6r+rDtrXEajTvnocmxrmRo796r+W8immv09/jl6P
-53l8rsIJ1xIqBYai+MNa29cyy6/zw0x++MVtwnlj8SUZubJEhVgAVbRAglKEnBBZ
-iE48xnSJyKMG0uZuGePzJEmhAoGBAIOHJcNBumum3DuklikpC+MbMyjrQbdpYRjp
-TP4x7AWZO34ysxQyQPNKL1feBfCHKRA0DiNKX4zwx+vw2lDQQKIiwNwMMCPqljOn
-HfxDVOMdJJQTP+iTMrQ1iLMVceXC0QQR0glvu/8b/SlgWD19WAmDxUwZgst9xw/F
-YLuUQKmJAoGAREeTugd4hc0U/YV/BQQjSCLhl11EtVry/oQMHj8KZpIJhP7tj8lw
-hSE0+z04oMhiTeq55PYKQkTo5l6V4PW0zfpEwlKEEm0erab1G9Ddh7us47XFcKLl
-Rmk192EVZ0lQuzftsYv7dzRLiAR7yDFXwD1ELIK/uPkwBtu7wtHlq+M=
------END RSA PRIVATE KEY-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ca.nghttp2.org.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrTCCApWgAwIBAgIUe4dvx8haIjsT3ZpNCMrl62Xk6E0wDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoT
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMOY2EubmdodHRwMi5v
-cmcwHhcNMTYwNjI1MDkzMzAwWhcNMjYwNjIzMDkzMzAwWjBeMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMRcwFQYDVQQDEw5jYS5uZ2h0dHAyLm9yZzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANZFZBfEElMFvx1fRBUT0jKIjlZmMAfL6ig7U9He
-jBYigDPP2CRVKtripVMnYE+CDxOzwE71XCI9xrS/V8z4bHKmDv0tGO7HMkxNlQD5
-rc/krT1n9sGdSEEdPR65w03OOCr2BmaXnwWZA/VI25ifWtWZiYyYjK94U5yhP7MW
-dvnTLJzGVzfNtnH2h8kzfk9Pk8sObwQW6Ag7Gc8Zn/vRRSAyTbNzS9+HEfBGUYaX
-2noGqR/G7Tifg/kWdpIOxP2GJBnEujaHb040lBQhR6Voxwn0xYZ/6MASAKKAnVqK
-4enXPEO9pQKHcDS10vLrj4D6jObOAs+e5u2YLODopTZiHWsCAwEAAaNjMGEwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNA5xVR1Zcax
-RJL9VC6pzuLmvduGMB8GA1UdIwQYMBaAFNA5xVR1ZcaxRJL9VC6pzuLmvduGMA0G
-CSqGSIb3DQEBCwUAA4IBAQCmdVfn/hUyEdvkKG7svg5d8o6BENOj8695KtWmzJjK
-zxH8J5Vy3mn89XrHQ+BOYXCDPyhs0aDS8aq3Z+HY0n9z1oAicyGzlVwZQQNX3YId
-Y2vcf7qu/2ATm/1S+mebE1/EXMUlWISKKUYXjggCwFgjDhH87Ai+A8MKScVdmqgL
-Hf+fRSzH3ToW7BCXlRl5bPAq2g+v1ALYc8wU9cT1MYm4dqAXh870LGFyUpaSWmFr
-TtX1DXBTgLp62syNlDthAvGigYFDtCa4cDM2vdTD9wpec2V9EKpfVqiRDDuYjUVX
-UXl27MvkNWnEBKCIoNv5abWXpZVG2zQdEMmUOkVuAXUC
------END CERTIFICATE-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-add_subdirectory(includes)
-
-file(GLOB c_sources *.c)
-set_source_files_properties(${c_sources} PROPERTIES
-  COMPILE_FLAGS "${WARNCFLAGS}")
-file(GLOB cxx_sources *.cc)
-set_source_files_properties(${cxx_sources} PROPERTIES
-  COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}")
-
-include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}/includes"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../third-party"
-
-  ${JEMALLOC_INCLUDE_DIRS}
-  ${SPDYLAY_INCLUDE_DIRS}
-  ${LIBXML2_INCLUDE_DIRS}
-  ${LIBEV_INCLUDE_DIRS}
-  ${OPENSSL_INCLUDE_DIRS}
-  ${LIBCARES_INCLUDE_DIRS}
-  ${JANSSON_INCLUDE_DIRS}
-  ${ZLIB_INCLUDE_DIRS}
-)
-
-# XXX per-target?
-link_libraries(
-  nghttp2
-  ${JEMALLOC_LIBRARIES}
-  ${SPDYLAY_LIBRARIES}
-  ${LIBXML2_LIBRARIES}
-  ${LIBEV_LIBRARIES}
-  ${OPENSSL_LIBRARIES}
-  ${LIBCARES_LIBRARIES}
-  ${JANSSON_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${APP_LIBRARIES}
-)
-
-if(ENABLE_APP)
-  set(HELPER_OBJECTS
-    util.cc
-    http2.cc timegm.c app_helper.cc nghttp2_gzip.c
-  )
-
-  # nghttp client
-  set(NGHTTP_SOURCES
-    ${HELPER_OBJECTS}
-    nghttp.cc
-    tls.cc
-  )
-  if(HAVE_LIBXML2)
-    list(APPEND NGHTTP_SOURCES HtmlParser.cc)
-  endif()
-
-  # nghttpd
-  set(NGHTTPD_SOURCES
-    ${HELPER_OBJECTS}
-    nghttpd.cc
-    tls.cc
-    HttpServer.cc
-  )
-
-  # h2load
-  set(H2LOAD_SOURCES
-    util.cc
-    http2.cc h2load.cc
-    timegm.c
-    tls.cc
-    h2load_http2_session.cc
-    h2load_http1_session.cc
-  )
-  if(HAVE_SPDYLAY)
-    list(APPEND H2LOAD_SOURCES
-      h2load_spdy_session.cc
-    )
-  endif()
-
-
-  # Common libnhttpx sources (used for nghttpx and unit tests)
-  set(NGHTTPX_SRCS
-    util.cc http2.cc timegm.c
-    app_helper.cc
-    tls.cc
-    shrpx_config.cc
-    shrpx_accept_handler.cc
-    shrpx_connection_handler.cc
-    shrpx_client_handler.cc
-    shrpx_http2_upstream.cc
-    shrpx_https_upstream.cc
-    shrpx_downstream.cc
-    shrpx_downstream_connection.cc
-    shrpx_http_downstream_connection.cc
-    shrpx_http2_downstream_connection.cc
-    shrpx_http2_session.cc
-    shrpx_downstream_queue.cc
-    shrpx_log.cc
-    shrpx_http.cc
-    shrpx_io_control.cc
-    shrpx_tls.cc
-    shrpx_worker.cc
-    shrpx_log_config.cc
-    shrpx_connect_blocker.cc
-    shrpx_live_check.cc
-    shrpx_downstream_connection_pool.cc
-    shrpx_rate_limit.cc
-    shrpx_connection.cc
-    shrpx_memcached_dispatcher.cc
-    shrpx_memcached_connection.cc
-    shrpx_worker_process.cc
-    shrpx_signal.cc
-    shrpx_router.cc
-    shrpx_api_downstream_connection.cc
-    shrpx_health_monitor_downstream_connection.cc
-    shrpx_exec.cc
-    shrpx_dns_resolver.cc
-    shrpx_dual_dns_resolver.cc
-    shrpx_dns_tracker.cc
-    xsi_strerror.c
-  )
-  if(HAVE_SPDYLAY)
-    list(APPEND NGHTTPX_SRCS
-      shrpx_spdy_upstream.cc
-    )
-  endif()
-  if(HAVE_MRUBY)
-    list(APPEND NGHTTPX_SRCS
-      shrpx_mruby.cc
-      shrpx_mruby_module.cc
-      shrpx_mruby_module_env.cc
-      shrpx_mruby_module_request.cc
-      shrpx_mruby_module_response.cc
-    )
-  endif()
-  add_library(nghttpx_static STATIC ${NGHTTPX_SRCS})
-  set_target_properties(nghttpx_static PROPERTIES ARCHIVE_OUTPUT_NAME nghttpx)
-
-  set(NGHTTPX-bin_SOURCES
-    shrpx.cc
-  )
-
-  if(HAVE_MRUBY)
-    target_link_libraries(nghttpx_static mruby-lib)
-  endif()
-
-  if(HAVE_NEVERBLEED)
-    target_link_libraries(nghttpx_static neverbleed)
-  endif()
-
-
-  if(HAVE_CUNIT)
-    set(NGHTTPX_UNITTEST_SOURCES
-      shrpx-unittest.cc
-      shrpx_tls_test.cc
-      shrpx_downstream_test.cc
-      shrpx_config_test.cc
-      shrpx_worker_test.cc
-      shrpx_http_test.cc
-      shrpx_router_test.cc
-      http2_test.cc
-      util_test.cc
-      nghttp2_gzip_test.c
-      nghttp2_gzip.c
-      buffer_test.cc
-      memchunk_test.cc
-      template_test.cc
-      base64_test.cc
-    )
-    add_executable(nghttpx-unittest EXCLUDE_FROM_ALL
-      ${NGHTTPX_UNITTEST_SOURCES}
-      $<TARGET_OBJECTS:http-parser>
-    )
-    target_include_directories(nghttpx-unittest PRIVATE ${CUNIT_INCLUDE_DIRS})
-    target_compile_definitions(nghttpx-unittest
-      PRIVATE "-DNGHTTP2_SRC_DIR=\"${CMAKE_SOURCE_DIR}/src\""
-    )
-    target_link_libraries(nghttpx-unittest nghttpx_static ${CUNIT_LIBRARIES})
-    if(HAVE_MRUBY)
-      target_link_libraries(nghttpx-unittest mruby-lib)
-    endif()
-    if(HAVE_NEVERBLEED)
-      target_link_libraries(nghttpx-unittest neverbleed)
-    endif()
-
-    add_test(nghttpx-unittest nghttpx-unittest)
-    add_dependencies(check nghttpx-unittest)
-  endif()
-
-  add_executable(nghttp   ${NGHTTP_SOURCES}   $<TARGET_OBJECTS:http-parser>)
-  add_executable(nghttpd  ${NGHTTPD_SOURCES}  $<TARGET_OBJECTS:http-parser>)
-  add_executable(nghttpx  ${NGHTTPX-bin_SOURCES} $<TARGET_OBJECTS:http-parser>)
-  target_compile_definitions(nghttpx PRIVATE "-DPKGDATADIR=\"${PKGDATADIR}\"")
-  target_link_libraries(nghttpx nghttpx_static)
-  add_executable(h2load   ${H2LOAD_SOURCES}   $<TARGET_OBJECTS:http-parser>)
-
-  install(TARGETS nghttp nghttpd nghttpx h2load
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-endif()
-
-if(ENABLE_HPACK_TOOLS)
-  set(inflatehd_SOURCES
-    inflatehd.cc
-    comp_helper.c
-  )
-  set(deflatehd_SOURCES
-    deflatehd.cc
-    comp_helper.c
-  )
-  add_executable(inflatehd ${inflatehd_SOURCES})
-  add_executable(deflatehd ${deflatehd_SOURCES})
-  install(TARGETS inflatehd deflatehd
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-endif()
-
-if(ENABLE_ASIO_LIB)
-  set(NGHTTP2_ASIO_SOURCES
-    util.cc http2.cc
-    tls.cc
-    timegm.c
-    asio_common.cc
-    asio_io_service_pool.cc
-    asio_server_http2.cc
-    asio_server_http2_impl.cc
-    asio_server.cc
-    asio_server_http2_handler.cc
-    asio_server_request.cc
-    asio_server_request_impl.cc
-    asio_server_response.cc
-    asio_server_response_impl.cc
-    asio_server_stream.cc
-    asio_server_serve_mux.cc
-    asio_server_request_handler.cc
-    asio_server_tls_context.cc
-    asio_client_session.cc
-    asio_client_session_impl.cc
-    asio_client_session_tcp_impl.cc
-    asio_client_session_tls_impl.cc
-    asio_client_response.cc
-    asio_client_response_impl.cc
-    asio_client_request.cc
-    asio_client_request_impl.cc
-    asio_client_stream.cc
-    asio_client_tls_context.cc
-  )
-
-  add_library(nghttp2_asio SHARED
-     ${NGHTTP2_ASIO_SOURCES}
-     $<TARGET_OBJECTS:http-parser>
-  )
-  target_include_directories(nghttp2_asio PRIVATE
-    ${OPENSSL_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-  )
-  target_include_directories(nghttp2_asio INTERFACE
-    "${CMAKE_CURRENT_BINARY_DIR}/../lib/includes"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../lib/includes"
-    "${CMAKE_CURRENT_SOURCE_DIR}/includes"
-  )
-  target_link_libraries(nghttp2_asio
-    nghttp2
-    ${OPENSSL_LIBRARIES}
-    ${Boost_LIBRARIES}
-  )
-  set_target_properties(nghttp2_asio PROPERTIES
-    VERSION 1.0.0 SOVERSION 1)
-
-  install(TARGETS nghttp2_asio
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2_asio.pc"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "comp_helper.h"
-#include <string.h>
-
-static void dump_val(json_t *jent, const char *key, uint8_t *val, size_t len) {
-  json_object_set_new(jent, key, json_pack("s#", val, len));
-}
-
-#define NGHTTP2_HD_ENTRY_OVERHEAD 32
-
-json_t *dump_deflate_header_table(nghttp2_hd_deflater *deflater) {
-  json_t *obj, *entries;
-  size_t i;
-  size_t len = nghttp2_hd_deflate_get_num_table_entries(deflater);
-
-  obj = json_object();
-  entries = json_array();
-  /* The first index of dynamic table is 62 */
-  for (i = 62; i <= len; ++i) {
-    const nghttp2_nv *nv = nghttp2_hd_deflate_get_table_entry(deflater, i);
-    json_t *outent = json_object();
-    json_object_set_new(outent, "index", json_integer((json_int_t)i));
-    dump_val(outent, "name", nv->name, nv->namelen);
-    dump_val(outent, "value", nv->value, nv->valuelen);
-    json_object_set_new(outent, "size",
-                        json_integer((json_int_t)(nv->namelen + nv->valuelen +
-                                                  NGHTTP2_HD_ENTRY_OVERHEAD)));
-    json_array_append_new(entries, outent);
-  }
-  json_object_set_new(obj, "entries", entries);
-  json_object_set_new(
-      obj, "size",
-      json_integer(
-          (json_int_t)nghttp2_hd_deflate_get_dynamic_table_size(deflater)));
-  json_object_set_new(
-      obj, "max_size",
-      json_integer(
-          (json_int_t)nghttp2_hd_deflate_get_max_dynamic_table_size(deflater)));
-
-  return obj;
-}
-
-json_t *dump_inflate_header_table(nghttp2_hd_inflater *inflater) {
-  json_t *obj, *entries;
-  size_t i;
-  size_t len = nghttp2_hd_inflate_get_num_table_entries(inflater);
-
-  obj = json_object();
-  entries = json_array();
-  /* The first index of dynamic table is 62 */
-  for (i = 62; i <= len; ++i) {
-    const nghttp2_nv *nv = nghttp2_hd_inflate_get_table_entry(inflater, i);
-    json_t *outent = json_object();
-    json_object_set_new(outent, "index", json_integer((json_int_t)i));
-    dump_val(outent, "name", nv->name, nv->namelen);
-    dump_val(outent, "value", nv->value, nv->valuelen);
-    json_object_set_new(outent, "size",
-                        json_integer((json_int_t)(nv->namelen + nv->valuelen +
-                                                  NGHTTP2_HD_ENTRY_OVERHEAD)));
-    json_array_append_new(entries, outent);
-  }
-  json_object_set_new(obj, "entries", entries);
-  json_object_set_new(
-      obj, "size",
-      json_integer(
-          (json_int_t)nghttp2_hd_inflate_get_dynamic_table_size(inflater)));
-  json_object_set_new(
-      obj, "max_size",
-      json_integer(
-          (json_int_t)nghttp2_hd_inflate_get_max_dynamic_table_size(inflater)));
-
-  return obj;
-}
-
-json_t *dump_header(const uint8_t *name, size_t namelen, const uint8_t *value,
-                    size_t valuelen) {
-  json_t *nv_pair = json_object();
-  char *cname = malloc(namelen + 1);
-  if (cname == NULL) {
-    return NULL;
-  }
-  memcpy(cname, name, namelen);
-  cname[namelen] = '\0';
-  json_object_set_new(nv_pair, cname, json_pack("s#", value, valuelen));
-  free(cname);
-  return nv_pair;
-}
-
-json_t *dump_headers(const nghttp2_nv *nva, size_t nvlen) {
-  json_t *headers;
-  size_t i;
-
-  headers = json_array();
-  for (i = 0; i < nvlen; ++i) {
-    json_array_append_new(headers, dump_header(nva[i].name, nva[i].namelen,
-                                               nva[i].value, nva[i].valuelen));
-  }
-  return headers;
-}
-
-void output_json_header(void) {
-  printf("{\n"
-         "  \"cases\":\n"
-         "  [\n");
-}
-
-void output_json_footer(void) {
-  printf("  ]\n"
-         "}\n");
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/comp_helper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_COMP_HELPER_H
-#define NGHTTP2_COMP_HELPER_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <jansson.h>
-
-#include <nghttp2/nghttp2.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-json_t *dump_deflate_header_table(nghttp2_hd_deflater *deflater);
-
-json_t *dump_inflate_header_table(nghttp2_hd_inflater *inflater);
-
-json_t *dump_header(const uint8_t *name, size_t namelen, const uint8_t *value,
-                    size_t vlauelen);
-
-json_t *dump_headers(const nghttp2_nv *nva, size_t nvlen);
-
-void output_json_header(void);
-
-void output_json_footer(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NGHTTP2_COMP_HELPER_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/deflatehd.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/deflatehd.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/deflatehd.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/deflatehd.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <getopt.h>
-
-#include <cstdio>
-#include <cstring>
-#include <cassert>
-#include <cerrno>
-#include <cstdlib>
-#include <vector>
-#include <iostream>
-
-#include <jansson.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "template.h"
-#include "comp_helper.h"
-
-namespace nghttp2 {
-
-typedef struct {
-  size_t table_size;
-  size_t deflate_table_size;
-  int http1text;
-  int dump_header_table;
-} deflate_config;
-
-static deflate_config config;
-
-static size_t input_sum;
-static size_t output_sum;
-
-static char to_hex_digit(uint8_t n) {
-  if (n > 9) {
-    return n - 10 + 'a';
-  }
-  return n + '0';
-}
-
-static void to_hex(char *dest, const uint8_t *src, size_t len) {
-  size_t i;
-  for (i = 0; i < len; ++i) {
-    *dest++ = to_hex_digit(src[i] >> 4);
-    *dest++ = to_hex_digit(src[i] & 0xf);
-  }
-}
-
-static void output_to_json(nghttp2_hd_deflater *deflater, const uint8_t *buf,
-                           size_t buflen, size_t inputlen,
-                           const std::vector<nghttp2_nv> &nva, int seq) {
-  auto hex = std::vector<char>(buflen * 2);
-  auto obj = json_object();
-  auto comp_ratio = inputlen == 0 ? 0.0 : (double)buflen / inputlen * 100;
-
-  json_object_set_new(obj, "seq", json_integer(seq));
-  json_object_set_new(obj, "input_length", json_integer(inputlen));
-  json_object_set_new(obj, "output_length", json_integer(buflen));
-  json_object_set_new(obj, "percentage_of_original_size",
-                      json_real(comp_ratio));
-
-  if (buflen == 0) {
-    json_object_set_new(obj, "wire", json_string(""));
-  } else {
-    to_hex(hex.data(), buf, buflen);
-    json_object_set_new(obj, "wire", json_pack("s#", hex.data(), hex.size()));
-  }
-  json_object_set_new(obj, "headers", dump_headers(nva.data(), nva.size()));
-  if (seq == 0) {
-    // We only change the header table size only once at the beginning
-    json_object_set_new(obj, "header_table_size",
-                        json_integer(config.table_size));
-  }
-  if (config.dump_header_table) {
-    json_object_set_new(obj, "header_table",
-                        dump_deflate_header_table(deflater));
-  }
-  json_dumpf(obj, stdout, JSON_PRESERVE_ORDER | JSON_INDENT(2));
-  printf("\n");
-  json_decref(obj);
-}
-
-static void deflate_hd(nghttp2_hd_deflater *deflater,
-                       const std::vector<nghttp2_nv> &nva, size_t inputlen,
-                       int seq) {
-  ssize_t rv;
-  std::array<uint8_t, 64_k> buf;
-
-  rv = nghttp2_hd_deflate_hd(deflater, buf.data(), buf.size(),
-                             (nghttp2_nv *)nva.data(), nva.size());
-  if (rv < 0) {
-    fprintf(stderr, "deflate failed with error code %zd at %d\n", rv, seq);
-    exit(EXIT_FAILURE);
-  }
-
-  input_sum += inputlen;
-  output_sum += rv;
-
-  output_to_json(deflater, buf.data(), rv, inputlen, nva, seq);
-}
-
-static int deflate_hd_json(json_t *obj, nghttp2_hd_deflater *deflater,
-                           int seq) {
-  size_t inputlen = 0;
-
-  auto js = json_object_get(obj, "headers");
-  if (js == nullptr) {
-    fprintf(stderr, "'headers' key is missing at %d\n", seq);
-    return -1;
-  }
-  if (!json_is_array(js)) {
-    fprintf(stderr, "The value of 'headers' key must be an array at %d\n", seq);
-    return -1;
-  }
-
-  auto len = json_array_size(js);
-  auto nva = std::vector<nghttp2_nv>(len);
-
-  for (size_t i = 0; i < len; ++i) {
-    auto nv_pair = json_array_get(js, i);
-    const char *name;
-    json_t *value;
-
-    if (!json_is_object(nv_pair) || json_object_size(nv_pair) != 1) {
-      fprintf(stderr, "bad formatted name/value pair object at %d\n", seq);
-      return -1;
-    }
-
-    json_object_foreach(nv_pair, name, value) {
-      nva[i].name = (uint8_t *)name;
-      nva[i].namelen = strlen(name);
-
-      if (!json_is_string(value)) {
-        fprintf(stderr, "value is not string at %d\n", seq);
-        return -1;
-      }
-
-      nva[i].value = (uint8_t *)json_string_value(value);
-      nva[i].valuelen = strlen(json_string_value(value));
-
-      nva[i].flags = NGHTTP2_NV_FLAG_NONE;
-    }
-
-    inputlen += nva[i].namelen + nva[i].valuelen;
-  }
-
-  deflate_hd(deflater, nva, inputlen, seq);
-
-  return 0;
-}
-
-static nghttp2_hd_deflater *init_deflater() {
-  nghttp2_hd_deflater *deflater;
-  nghttp2_hd_deflate_new(&deflater, config.deflate_table_size);
-  if (config.table_size != NGHTTP2_DEFAULT_HEADER_TABLE_SIZE) {
-    nghttp2_hd_deflate_change_table_size(deflater, config.table_size);
-  }
-  return deflater;
-}
-
-static void deinit_deflater(nghttp2_hd_deflater *deflater) {
-  nghttp2_hd_deflate_del(deflater);
-}
-
-static int perform(void) {
-  json_error_t error;
-
-  auto json = json_loadf(stdin, 0, &error);
-
-  if (json == nullptr) {
-    fprintf(stderr, "JSON loading failed\n");
-    exit(EXIT_FAILURE);
-  }
-
-  auto cases = json_object_get(json, "cases");
-
-  if (cases == nullptr) {
-    fprintf(stderr, "Missing 'cases' key in root object\n");
-    exit(EXIT_FAILURE);
-  }
-
-  if (!json_is_array(cases)) {
-    fprintf(stderr, "'cases' must be JSON array\n");
-    exit(EXIT_FAILURE);
-  }
-
-  auto deflater = init_deflater();
-  output_json_header();
-  auto len = json_array_size(cases);
-
-  for (size_t i = 0; i < len; ++i) {
-    auto obj = json_array_get(cases, i);
-    if (!json_is_object(obj)) {
-      fprintf(stderr, "Unexpected JSON type at %zu. It should be object.\n", i);
-      continue;
-    }
-    if (deflate_hd_json(obj, deflater, i) != 0) {
-      continue;
-    }
-    if (i + 1 < len) {
-      printf(",\n");
-    }
-  }
-  output_json_footer();
-  deinit_deflater(deflater);
-  json_decref(json);
-  return 0;
-}
-
-static int perform_from_http1text(void) {
-  char line[1 << 14];
-  int seq = 0;
-
-  auto deflater = init_deflater();
-  output_json_header();
-  for (;;) {
-    std::vector<nghttp2_nv> nva;
-    int end = 0;
-    size_t inputlen = 0;
-
-    for (;;) {
-      char *rv = fgets(line, sizeof(line), stdin);
-      char *val, *val_end;
-      if (rv == nullptr) {
-        end = 1;
-        break;
-      } else if (line[0] == '\n') {
-        break;
-      }
-
-      nva.emplace_back();
-      auto &nv = nva.back();
-
-      val = strchr(line + 1, ':');
-      if (val == nullptr) {
-        fprintf(stderr, "Bad HTTP/1 header field format at %d.\n", seq);
-        exit(EXIT_FAILURE);
-      }
-      *val = '\0';
-      ++val;
-      for (; *val && (*val == ' ' || *val == '\t'); ++val)
-        ;
-      for (val_end = val; *val_end && (*val_end != '\r' && *val_end != '\n');
-           ++val_end)
-        ;
-      *val_end = '\0';
-
-      nv.namelen = strlen(line);
-      nv.valuelen = strlen(val);
-      nv.name = (uint8_t *)strdup(line);
-      nv.value = (uint8_t *)strdup(val);
-      nv.flags = NGHTTP2_NV_FLAG_NONE;
-
-      inputlen += nv.namelen + nv.valuelen;
-    }
-
-    if (!end) {
-      if (seq > 0) {
-        printf(",\n");
-      }
-      deflate_hd(deflater, nva, inputlen, seq);
-    }
-
-    for (auto &nv : nva) {
-      free(nv.name);
-      free(nv.value);
-    }
-
-    if (end)
-      break;
-    ++seq;
-  }
-  output_json_footer();
-  deinit_deflater(deflater);
-  return 0;
-}
-
-static void print_help(void) {
-  std::cout << R"(HPACK HTTP/2 header encoder
-Usage: deflatehd [OPTIONS] < INPUT
-
-Reads JSON data  or HTTP/1-style header fields from  stdin and outputs
-deflated header block in JSON array.
-
-For the JSON  input, the root JSON object must  contain "context" key,
-which  indicates  which  compression  context   is  used.   If  it  is
-"request", request  compression context is used.   Otherwise, response
-compression context  is used.  The  value of "cases" key  contains the
-sequence of input header set.  They share the same compression context
-and are processed in the order they appear.  Each item in the sequence
-is a JSON object  and it must have at least  "headers" key.  Its value
-is an array of a JSON object containing exactly one name/value pair.
-
-Example:
-{
-  "context": "request",
-  "cases":
-  [
-    {
-      "headers": [
-        { ":method": "GET" },
-        { ":path": "/" }
-      ]
-    },
-    {
-      "headers": [
-        { ":method": "POST" },
-        { ":path": "/" }
-      ]
-    }
-  ]
-}
-
-With  -t option,  the program  can accept  more familiar  HTTP/1 style
-header field  block.  Each header  set must  be followed by  one empty
-line:
-
-Example:
-
-:method: GET
-:scheme: https
-:path: /
-
-:method: POST
-user-agent: nghttp2
-
-The output of this program can be used as input for inflatehd.
-
-OPTIONS:
-    -t, --http1text   Use  HTTP/1 style  header field  text as  input.
-                      Each  header set  is delimited  by single  empty
-                      line.
-    -s, --table-size=<N>
-                      Set   dynamic   table   size.   In   the   HPACK
-                      specification,   this   value  is   denoted   by
-                      SETTINGS_HEADER_TABLE_SIZE.
-                      Default: 4096
-    -S, --deflate-table-size=<N>
-                      Use  first  N  bytes  of  dynamic  header  table
-                      buffer.
-                      Default: 4096
-    -d, --dump-header-table
-                      Output dynamic header table.)"
-            << std::endl;
-}
-
-constexpr static struct option long_options[] = {
-    {"http1text", no_argument, nullptr, 't'},
-    {"table-size", required_argument, nullptr, 's'},
-    {"deflate-table-size", required_argument, nullptr, 'S'},
-    {"dump-header-table", no_argument, nullptr, 'd'},
-    {nullptr, 0, nullptr, 0}};
-
-int main(int argc, char **argv) {
-  char *end;
-
-  config.table_size = 4_k;
-  config.deflate_table_size = 4_k;
-  config.http1text = 0;
-  config.dump_header_table = 0;
-  while (1) {
-    int option_index = 0;
-    int c = getopt_long(argc, argv, "S:dhs:t", long_options, &option_index);
-    if (c == -1) {
-      break;
-    }
-    switch (c) {
-    case 'h':
-      print_help();
-      exit(EXIT_SUCCESS);
-    case 't':
-      // --http1text
-      config.http1text = 1;
-      break;
-    case 's':
-      // --table-size
-      errno = 0;
-      config.table_size = strtoul(optarg, &end, 10);
-      if (errno == ERANGE || *end != '\0') {
-        fprintf(stderr, "-s: Bad option value\n");
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'S':
-      // --deflate-table-size
-      errno = 0;
-      config.deflate_table_size = strtoul(optarg, &end, 10);
-      if (errno == ERANGE || *end != '\0') {
-        fprintf(stderr, "-S: Bad option value\n");
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'd':
-      // --dump-header-table
-      config.dump_header_table = 1;
-      break;
-    case '?':
-      exit(EXIT_FAILURE);
-    default:
-      break;
-    }
-  }
-  if (config.http1text) {
-    perform_from_http1text();
-  } else {
-    perform();
-  }
-
-  auto comp_ratio = input_sum == 0 ? 0.0 : (double)output_sum / input_sum;
-
-  fprintf(stderr, "Overall: input=%zu output=%zu ratio=%.02f\n", input_sum,
-          output_sum, comp_ratio);
-  return 0;
-}
-
-} // namespace nghttp2
-
-int main(int argc, char **argv) {
-  return nghttp2::run_app(nghttp2::main, argc, argv);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2739 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "h2load.h"
-
-#include <getopt.h>
-#include <signal.h>
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#include <netinet/tcp.h>
-#include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-
-#include <cstdio>
-#include <cassert>
-#include <cstdlib>
-#include <iostream>
-#include <iomanip>
-#include <fstream>
-#include <chrono>
-#include <thread>
-#include <future>
-#include <random>
-
-#include <openssl/err.h>
-
-#include "http-parser/http_parser.h"
-
-#include "h2load_http1_session.h"
-#include "h2load_http2_session.h"
-#include "tls.h"
-#include "http2.h"
-#include "util.h"
-#include "template.h"
-
-#ifndef O_BINARY
-#  define O_BINARY (0)
-#endif // O_BINARY
-
-using namespace nghttp2;
-
-namespace h2load {
-
-namespace {
-bool recorded(const std::chrono::steady_clock::time_point &t) {
-  return std::chrono::steady_clock::duration::zero() != t.time_since_epoch();
-}
-} // namespace
-
-Config::Config()
-    : ciphers(tls::DEFAULT_CIPHER_LIST),
-      data_length(-1),
-      addrs(nullptr),
-      nreqs(1),
-      nclients(1),
-      nthreads(1),
-      max_concurrent_streams(1),
-      window_bits(30),
-      connection_window_bits(30),
-      rate(0),
-      rate_period(1.0),
-      duration(0.0),
-      warm_up_time(0.0),
-      conn_active_timeout(0.),
-      conn_inactivity_timeout(0.),
-      no_tls_proto(PROTO_HTTP2),
-      header_table_size(4_k),
-      encoder_header_table_size(4_k),
-      data_fd(-1),
-      port(0),
-      default_port(0),
-      verbose(false),
-      timing_script(false),
-      base_uri_unix(false),
-      unix_addr{} {}
-
-Config::~Config() {
-  if (addrs) {
-    if (base_uri_unix) {
-      delete addrs;
-    } else {
-      freeaddrinfo(addrs);
-    }
-  }
-
-  if (data_fd != -1) {
-    close(data_fd);
-  }
-}
-
-bool Config::is_rate_mode() const { return (this->rate != 0); }
-bool Config::is_timing_based_mode() const { return (this->duration > 0); }
-bool Config::has_base_uri() const { return (!this->base_uri.empty()); }
-Config config;
-
-namespace {
-constexpr size_t MAX_SAMPLES = 1000000;
-} // namespace
-
-Stats::Stats(size_t req_todo, size_t nclients)
-    : req_todo(req_todo),
-      req_started(0),
-      req_done(0),
-      req_success(0),
-      req_status_success(0),
-      req_failed(0),
-      req_error(0),
-      req_timedout(0),
-      bytes_total(0),
-      bytes_head(0),
-      bytes_head_decomp(0),
-      bytes_body(0),
-      status() {}
-
-Stream::Stream() : req_stat{}, status_success(-1) {}
-
-namespace {
-std::random_device rd;
-} // namespace
-
-namespace {
-std::mt19937 gen(rd());
-} // namespace
-
-namespace {
-void sampling_init(Sampling &smp, size_t max_samples) {
-  smp.n = 0;
-  smp.max_samples = max_samples;
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto client = static_cast<Client *>(w->data);
-  client->restart_timeout();
-  auto rv = client->do_write();
-  if (rv == Client::ERR_CONNECT_FAIL) {
-    client->disconnect();
-    // Try next address
-    client->current_addr = nullptr;
-    rv = client->connect();
-    if (rv != 0) {
-      client->fail();
-      client->worker->free_client(client);
-      delete client;
-      return;
-    }
-    return;
-  }
-  if (rv != 0) {
-    client->fail();
-    client->worker->free_client(client);
-    delete client;
-  }
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto client = static_cast<Client *>(w->data);
-  client->restart_timeout();
-  if (client->do_read() != 0) {
-    if (client->try_again_or_fail() == 0) {
-      return;
-    }
-    client->worker->free_client(client);
-    delete client;
-    return;
-  }
-  writecb(loop, &client->wev, revents);
-  // client->disconnect() and client->fail() may be called
-}
-} // namespace
-
-namespace {
-// Called every rate_period when rate mode is being used
-void rate_period_timeout_w_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-  auto nclients_per_second = worker->rate;
-  auto conns_remaining = worker->nclients - worker->nconns_made;
-  auto nclients = std::min(nclients_per_second, conns_remaining);
-
-  for (size_t i = 0; i < nclients; ++i) {
-    auto req_todo = worker->nreqs_per_client;
-    if (worker->nreqs_rem > 0) {
-      ++req_todo;
-      --worker->nreqs_rem;
-    }
-    auto client =
-        make_unique<Client>(worker->next_client_id++, worker, req_todo);
-
-    ++worker->nconns_made;
-
-    if (client->connect() != 0) {
-      std::cerr << "client could not connect to host" << std::endl;
-      client->fail();
-    } else {
-      if (worker->config->is_timing_based_mode()) {
-        worker->clients.push_back(client.release());
-      } else {
-        client.release();
-      }
-    }
-    worker->report_rate_progress();
-  }
-  if (!worker->config->is_timing_based_mode()) {
-    if (worker->nconns_made >= worker->nclients) {
-      ev_timer_stop(worker->loop, w);
-    }
-  } else {
-    // To check whether all created clients are pushed correctly
-    assert(worker->nclients == worker->clients.size());
-  }
-}
-} // namespace
-
-namespace {
-// Called when the duration for infinite number of requests are over
-void duration_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-
-  worker->current_phase = Phase::DURATION_OVER;
-
-  std::cout << "Main benchmark duration is over for thread #" << worker->id
-            << ". Stopping all clients." << std::endl;
-  worker->stop_all_clients();
-  std::cout << "Stopped all clients for thread #" << worker->id << std::endl;
-}
-} // namespace
-
-namespace {
-// Called when the warmup duration for infinite number of requests are over
-void warmup_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-
-  std::cout << "Warm-up phase is over for thread #" << worker->id << "."
-            << std::endl;
-  std::cout << "Main benchmark duration is started for thread #" << worker->id
-            << "." << std::endl;
-  assert(worker->stats.req_started == 0);
-  assert(worker->stats.req_done == 0);
-
-  for (auto client : worker->clients) {
-    if (client) {
-      assert(client->req_todo == 0);
-      assert(client->req_left == 1);
-      assert(client->req_inflight == 0);
-      assert(client->req_started == 0);
-      assert(client->req_done == 0);
-
-      client->record_client_start_time();
-      client->clear_connect_times();
-      client->record_connect_start_time();
-    }
-  }
-
-  worker->current_phase = Phase::MAIN_DURATION;
-
-  ev_timer_start(worker->loop, &worker->duration_watcher);
-}
-} // namespace
-
-namespace {
-// Called when an a connection has been inactive for a set period of time
-// or a fixed amount of time after all requests have been made on a
-// connection
-void conn_timeout_cb(EV_P_ ev_timer *w, int revents) {
-  auto client = static_cast<Client *>(w->data);
-
-  ev_timer_stop(client->worker->loop, &client->conn_inactivity_watcher);
-  ev_timer_stop(client->worker->loop, &client->conn_active_watcher);
-
-  if (util::check_socket_connected(client->fd)) {
-    client->timeout();
-  }
-}
-} // namespace
-
-namespace {
-bool check_stop_client_request_timeout(Client *client, ev_timer *w) {
-  if (client->req_left == 0) {
-    // no more requests to make, stop timer
-    ev_timer_stop(client->worker->loop, w);
-    return true;
-  }
-
-  return false;
-}
-} // namespace
-
-namespace {
-void client_request_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto client = static_cast<Client *>(w->data);
-
-  if (client->streams.size() >= (size_t)config.max_concurrent_streams) {
-    ev_timer_stop(client->worker->loop, w);
-    return;
-  }
-
-  if (client->submit_request() != 0) {
-    ev_timer_stop(client->worker->loop, w);
-    client->process_request_failure();
-    return;
-  }
-  client->signal_write();
-
-  if (check_stop_client_request_timeout(client, w)) {
-    return;
-  }
-
-  ev_tstamp duration =
-      config.timings[client->reqidx] - config.timings[client->reqidx - 1];
-
-  while (duration < 1e-9) {
-    if (client->submit_request() != 0) {
-      ev_timer_stop(client->worker->loop, w);
-      client->process_request_failure();
-      return;
-    }
-    client->signal_write();
-    if (check_stop_client_request_timeout(client, w)) {
-      return;
-    }
-
-    duration =
-        config.timings[client->reqidx] - config.timings[client->reqidx - 1];
-  }
-
-  client->request_timeout_watcher.repeat = duration;
-  ev_timer_again(client->worker->loop, &client->request_timeout_watcher);
-}
-} // namespace
-
-Client::Client(uint32_t id, Worker *worker, size_t req_todo)
-    : wb(&worker->mcpool),
-      cstat{},
-      worker(worker),
-      ssl(nullptr),
-      next_addr(config.addrs),
-      current_addr(nullptr),
-      reqidx(0),
-      state(CLIENT_IDLE),
-      req_todo(req_todo),
-      req_left(req_todo),
-      req_inflight(0),
-      req_started(0),
-      req_done(0),
-      id(id),
-      fd(-1),
-      new_connection_requested(false),
-      final(false) {
-  if (req_todo == 0) { // this means infinite number of requests are to be made
-    // This ensures that number of requests are unbounded
-    // Just a positive number is fine, we chose the first positive number
-    req_left = 1;
-  }
-  ev_io_init(&wev, writecb, 0, EV_WRITE);
-  ev_io_init(&rev, readcb, 0, EV_READ);
-
-  wev.data = this;
-  rev.data = this;
-
-  ev_timer_init(&conn_inactivity_watcher, conn_timeout_cb, 0.,
-                worker->config->conn_inactivity_timeout);
-  conn_inactivity_watcher.data = this;
-
-  ev_timer_init(&conn_active_watcher, conn_timeout_cb,
-                worker->config->conn_active_timeout, 0.);
-  conn_active_watcher.data = this;
-
-  ev_timer_init(&request_timeout_watcher, client_request_timeout_cb, 0., 0.);
-  request_timeout_watcher.data = this;
-}
-
-Client::~Client() {
-  disconnect();
-
-  if (ssl) {
-    SSL_free(ssl);
-  }
-
-  worker->sample_client_stat(&cstat);
-  ++worker->client_smp.n;
-}
-
-int Client::do_read() { return readfn(*this); }
-int Client::do_write() { return writefn(*this); }
-
-int Client::make_socket(addrinfo *addr) {
-  fd = util::create_nonblock_socket(addr->ai_family);
-  if (fd == -1) {
-    return -1;
-  }
-  if (config.scheme == "https") {
-    if (!ssl) {
-      ssl = SSL_new(worker->ssl_ctx);
-    }
-
-    auto config = worker->config;
-
-    if (!util::numeric_host(config->host.c_str())) {
-      SSL_set_tlsext_host_name(ssl, config->host.c_str());
-    }
-
-    SSL_set_fd(ssl, fd);
-    SSL_set_connect_state(ssl);
-  }
-
-  auto rv = ::connect(fd, addr->ai_addr, addr->ai_addrlen);
-  if (rv != 0 && errno != EINPROGRESS) {
-    if (ssl) {
-      SSL_free(ssl);
-      ssl = nullptr;
-    }
-    close(fd);
-    fd = -1;
-    return -1;
-  }
-  return 0;
-}
-
-int Client::connect() {
-  int rv;
-
-  if (!worker->config->is_timing_based_mode() ||
-      worker->current_phase == Phase::MAIN_DURATION) {
-    record_client_start_time();
-    clear_connect_times();
-    record_connect_start_time();
-  } else if (worker->current_phase == Phase::INITIAL_IDLE) {
-    worker->current_phase = Phase::WARM_UP;
-    std::cout << "Warm-up started for thread #" << worker->id << "."
-              << std::endl;
-    ev_timer_start(worker->loop, &worker->warmup_watcher);
-  }
-
-  if (worker->config->conn_inactivity_timeout > 0.) {
-    ev_timer_again(worker->loop, &conn_inactivity_watcher);
-  }
-
-  if (current_addr) {
-    rv = make_socket(current_addr);
-    if (rv == -1) {
-      return -1;
-    }
-  } else {
-    addrinfo *addr = nullptr;
-    while (next_addr) {
-      addr = next_addr;
-      next_addr = next_addr->ai_next;
-      rv = make_socket(addr);
-      if (rv == 0) {
-        break;
-      }
-    }
-
-    if (fd == -1) {
-      return -1;
-    }
-
-    assert(addr);
-
-    current_addr = addr;
-  }
-
-  writefn = &Client::connected;
-
-  ev_io_set(&rev, fd, EV_READ);
-  ev_io_set(&wev, fd, EV_WRITE);
-
-  ev_io_start(worker->loop, &wev);
-
-  return 0;
-}
-
-void Client::timeout() {
-  process_timedout_streams();
-
-  disconnect();
-}
-
-void Client::restart_timeout() {
-  if (worker->config->conn_inactivity_timeout > 0.) {
-    ev_timer_again(worker->loop, &conn_inactivity_watcher);
-  }
-}
-
-int Client::try_again_or_fail() {
-  disconnect();
-
-  if (new_connection_requested) {
-    new_connection_requested = false;
-
-    if (req_left) {
-
-      if (worker->current_phase == Phase::MAIN_DURATION) {
-        // At the moment, we don't have a facility to re-start request
-        // already in in-flight.  Make them fail.
-        worker->stats.req_failed += req_inflight;
-        worker->stats.req_error += req_inflight;
-
-        req_inflight = 0;
-      }
-
-      // Keep using current address
-      if (connect() == 0) {
-        return 0;
-      }
-      std::cerr << "client could not connect to host" << std::endl;
-    }
-  }
-
-  process_abandoned_streams();
-
-  return -1;
-}
-
-void Client::fail() {
-  disconnect();
-
-  process_abandoned_streams();
-}
-
-void Client::disconnect() {
-  record_client_end_time();
-
-  ev_timer_stop(worker->loop, &conn_inactivity_watcher);
-  ev_timer_stop(worker->loop, &conn_active_watcher);
-  ev_timer_stop(worker->loop, &request_timeout_watcher);
-  streams.clear();
-  session.reset();
-  wb.reset();
-  state = CLIENT_IDLE;
-  ev_io_stop(worker->loop, &wev);
-  ev_io_stop(worker->loop, &rev);
-  if (ssl) {
-    SSL_set_shutdown(ssl, SSL_get_shutdown(ssl) | SSL_RECEIVED_SHUTDOWN);
-    ERR_clear_error();
-
-    if (SSL_shutdown(ssl) != 1) {
-      SSL_free(ssl);
-      ssl = nullptr;
-    }
-  }
-  if (fd != -1) {
-    shutdown(fd, SHUT_WR);
-    close(fd);
-    fd = -1;
-  }
-
-  final = false;
-}
-
-int Client::submit_request() {
-  if (session->submit_request() != 0) {
-    return -1;
-  }
-
-  if (worker->current_phase != Phase::MAIN_DURATION) {
-    return 0;
-  }
-
-  ++worker->stats.req_started;
-  ++req_started;
-  ++req_inflight;
-  if (!worker->config->is_timing_based_mode()) {
-    --req_left;
-  }
-  // if an active timeout is set and this is the last request to be submitted
-  // on this connection, start the active timeout.
-  if (worker->config->conn_active_timeout > 0. && req_left == 0) {
-    ev_timer_start(worker->loop, &conn_active_watcher);
-  }
-
-  return 0;
-}
-
-void Client::process_timedout_streams() {
-  if (worker->current_phase != Phase::MAIN_DURATION) {
-    return;
-  }
-
-  for (auto &p : streams) {
-    auto &req_stat = p.second.req_stat;
-    if (!req_stat.completed) {
-      req_stat.stream_close_time = std::chrono::steady_clock::now();
-    }
-  }
-
-  worker->stats.req_timedout += req_inflight;
-
-  process_abandoned_streams();
-}
-
-void Client::process_abandoned_streams() {
-  if (worker->current_phase != Phase::MAIN_DURATION) {
-    return;
-  }
-
-  auto req_abandoned = req_inflight + req_left;
-
-  worker->stats.req_failed += req_abandoned;
-  worker->stats.req_error += req_abandoned;
-
-  req_inflight = 0;
-  req_left = 0;
-}
-
-void Client::process_request_failure() {
-  if (worker->current_phase != Phase::MAIN_DURATION) {
-    return;
-  }
-
-  worker->stats.req_failed += req_left;
-  worker->stats.req_error += req_left;
-
-  req_left = 0;
-
-  if (req_inflight == 0) {
-    terminate_session();
-  }
-  std::cout << "Process Request Failure:" << worker->stats.req_failed
-            << std::endl;
-}
-
-namespace {
-void print_server_tmp_key(SSL *ssl) {
-// libressl does not have SSL_get_server_tmp_key
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_get_server_tmp_key)
-  EVP_PKEY *key;
-
-  if (!SSL_get_server_tmp_key(ssl, &key)) {
-    return;
-  }
-
-  auto key_del = defer(EVP_PKEY_free, key);
-
-  std::cout << "Server Temp Key: ";
-
-  auto pkey_id = EVP_PKEY_id(key);
-  switch (pkey_id) {
-  case EVP_PKEY_RSA:
-    std::cout << "RSA " << EVP_PKEY_bits(key) << " bits" << std::endl;
-    break;
-  case EVP_PKEY_DH:
-    std::cout << "DH " << EVP_PKEY_bits(key) << " bits" << std::endl;
-    break;
-  case EVP_PKEY_EC: {
-    auto ec = EVP_PKEY_get1_EC_KEY(key);
-    auto ec_del = defer(EC_KEY_free, ec);
-    auto nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
-    auto cname = EC_curve_nid2nist(nid);
-    if (!cname) {
-      cname = OBJ_nid2sn(nid);
-    }
-
-    std::cout << "ECDH " << cname << " " << EVP_PKEY_bits(key) << " bits"
-              << std::endl;
-    break;
-  }
-  default:
-    std::cout << OBJ_nid2sn(pkey_id) << " " << EVP_PKEY_bits(key) << " bits"
-              << std::endl;
-    break;
-  }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-}
-} // namespace
-
-void Client::report_tls_info() {
-  if (worker->id == 0 && !worker->tls_info_report_done) {
-    worker->tls_info_report_done = true;
-    auto cipher = SSL_get_current_cipher(ssl);
-    std::cout << "TLS Protocol: " << tls::get_tls_protocol(ssl) << "\n"
-              << "Cipher: " << SSL_CIPHER_get_name(cipher) << std::endl;
-    print_server_tmp_key(ssl);
-  }
-}
-
-void Client::report_app_info() {
-  if (worker->id == 0 && !worker->app_info_report_done) {
-    worker->app_info_report_done = true;
-    std::cout << "Application protocol: " << selected_proto << std::endl;
-  }
-}
-
-void Client::terminate_session() {
-  session->terminate();
-  // http1 session needs writecb to tear down session.
-  signal_write();
-}
-
-void Client::on_request(int32_t stream_id) { streams[stream_id] = Stream(); }
-
-void Client::on_header(int32_t stream_id, const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen) {
-  auto itr = streams.find(stream_id);
-  if (itr == std::end(streams)) {
-    return;
-  }
-  auto &stream = (*itr).second;
-
-  if (worker->current_phase != Phase::MAIN_DURATION) {
-    // If the stream is for warm-up phase, then mark as a success
-    // But we do not update the count for 2xx, 3xx, etc status codes
-    // Same has been done in on_status_code function
-    stream.status_success = 1;
-    return;
-  }
-
-  if (stream.status_success == -1 && namelen == 7 &&
-      util::streq_l(":status", name, namelen)) {
-    int status = 0;
-    for (size_t i = 0; i < valuelen; ++i) {
-      if ('0' <= value[i] && value[i] <= '9') {
-        status *= 10;
-        status += value[i] - '0';
-        if (status > 999) {
-          stream.status_success = 0;
-          return;
-        }
-      } else {
-        break;
-      }
-    }
-
-    if (status >= 200 && status < 300) {
-      ++worker->stats.status[2];
-      stream.status_success = 1;
-    } else if (status < 400) {
-      ++worker->stats.status[3];
-      stream.status_success = 1;
-    } else if (status < 600) {
-      ++worker->stats.status[status / 100];
-      stream.status_success = 0;
-    } else {
-      stream.status_success = 0;
-    }
-  }
-}
-
-void Client::on_status_code(int32_t stream_id, uint16_t status) {
-  auto itr = streams.find(stream_id);
-  if (itr == std::end(streams)) {
-    return;
-  }
-  auto &stream = (*itr).second;
-
-  if (worker->current_phase != Phase::MAIN_DURATION) {
-    stream.status_success = 1;
-    return;
-  }
-
-  if (status >= 200 && status < 300) {
-    ++worker->stats.status[2];
-    stream.status_success = 1;
-  } else if (status < 400) {
-    ++worker->stats.status[3];
-    stream.status_success = 1;
-  } else if (status < 600) {
-    ++worker->stats.status[status / 100];
-    stream.status_success = 0;
-  } else {
-    stream.status_success = 0;
-  }
-}
-
-void Client::on_stream_close(int32_t stream_id, bool success, bool final) {
-  if (worker->current_phase == Phase::MAIN_DURATION) {
-    if (req_inflight > 0) {
-      --req_inflight;
-    }
-    auto req_stat = get_req_stat(stream_id);
-    if (!req_stat) {
-      return;
-    }
-
-    req_stat->stream_close_time = std::chrono::steady_clock::now();
-    if (success) {
-      req_stat->completed = true;
-      ++worker->stats.req_success;
-      ++cstat.req_success;
-
-      if (streams[stream_id].status_success == 1) {
-        ++worker->stats.req_status_success;
-      } else {
-        ++worker->stats.req_failed;
-      }
-
-      worker->sample_req_stat(req_stat);
-
-      // Count up in successful cases only
-      ++worker->request_times_smp.n;
-    } else {
-      ++worker->stats.req_failed;
-      ++worker->stats.req_error;
-    }
-    ++worker->stats.req_done;
-    ++req_done;
-  }
-
-  worker->report_progress();
-  streams.erase(stream_id);
-  if (req_left == 0 && req_inflight == 0) {
-    terminate_session();
-    return;
-  }
-
-  if (!final && req_left > 0) {
-    if (config.timing_script) {
-      if (!ev_is_active(&request_timeout_watcher)) {
-        ev_feed_event(worker->loop, &request_timeout_watcher, EV_TIMER);
-      }
-    } else if (submit_request() != 0) {
-      process_request_failure();
-    }
-  }
-}
-
-RequestStat *Client::get_req_stat(int32_t stream_id) {
-  auto it = streams.find(stream_id);
-  if (it == std::end(streams)) {
-    return nullptr;
-  }
-
-  return &(*it).second.req_stat;
-}
-
-int Client::connection_made() {
-  if (ssl) {
-    report_tls_info();
-
-    const unsigned char *next_proto = nullptr;
-    unsigned int next_proto_len;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_get0_next_proto_negotiated(ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    if (next_proto == nullptr) {
-      SSL_get0_alpn_selected(ssl, &next_proto, &next_proto_len);
-    }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-    if (next_proto) {
-      auto proto = StringRef{next_proto, next_proto_len};
-      if (util::check_h2_is_selected(proto)) {
-        session = make_unique<Http2Session>(this);
-      } else if (util::streq(NGHTTP2_H1_1, proto)) {
-        session = make_unique<Http1Session>(this);
-      }
-
-      // Just assign next_proto to selected_proto anyway to show the
-      // negotiation result.
-      selected_proto = proto.str();
-    } else {
-      std::cout << "No protocol negotiated. Fallback behaviour may be activated"
-                << std::endl;
-
-      for (const auto &proto : config.npn_list) {
-        if (util::streq(NGHTTP2_H1_1_ALPN, StringRef{proto})) {
-          std::cout
-              << "Server does not support NPN/ALPN. Falling back to HTTP/1.1."
-              << std::endl;
-          session = make_unique<Http1Session>(this);
-          selected_proto = NGHTTP2_H1_1.str();
-          break;
-        }
-      }
-    }
-
-    if (!selected_proto.empty()) {
-      report_app_info();
-    }
-
-    if (!session) {
-      std::cout
-          << "No supported protocol was negotiated. Supported protocols were:"
-          << std::endl;
-      for (const auto &proto : config.npn_list) {
-        std::cout << proto.substr(1) << std::endl;
-      }
-      disconnect();
-      return -1;
-    }
-  } else {
-    switch (config.no_tls_proto) {
-    case Config::PROTO_HTTP2:
-      session = make_unique<Http2Session>(this);
-      selected_proto = NGHTTP2_CLEARTEXT_PROTO_VERSION_ID;
-      break;
-    case Config::PROTO_HTTP1_1:
-      session = make_unique<Http1Session>(this);
-      selected_proto = NGHTTP2_H1_1.str();
-      break;
-    default:
-      // unreachable
-      assert(0);
-    }
-
-    report_app_info();
-  }
-
-  state = CLIENT_CONNECTED;
-
-  session->on_connect();
-
-  record_connect_time();
-
-  if (!config.timing_script) {
-    auto nreq = config.is_timing_based_mode()
-                    ? std::max(req_left, session->max_concurrent_streams())
-                    : std::min(req_left, session->max_concurrent_streams());
-    for (; nreq > 0; --nreq) {
-      if (submit_request() != 0) {
-        process_request_failure();
-        break;
-      }
-    }
-  } else {
-
-    ev_tstamp duration = config.timings[reqidx];
-
-    while (duration < 1e-9) {
-      if (submit_request() != 0) {
-        process_request_failure();
-        break;
-      }
-      duration = config.timings[reqidx];
-      if (reqidx == 0) {
-        // if reqidx wraps around back to 0, we uses up all lines and
-        // should break
-        break;
-      }
-    }
-
-    if (duration >= 1e-9) {
-      // double check since we may have break due to reqidx wraps
-      // around back to 0
-      request_timeout_watcher.repeat = duration;
-      ev_timer_again(worker->loop, &request_timeout_watcher);
-    }
-  }
-  signal_write();
-
-  return 0;
-}
-
-int Client::on_read(const uint8_t *data, size_t len) {
-  auto rv = session->on_read(data, len);
-  if (rv != 0) {
-    return -1;
-  }
-  if (worker->current_phase == Phase::MAIN_DURATION) {
-    worker->stats.bytes_total += len;
-  }
-  signal_write();
-  return 0;
-}
-
-int Client::on_write() {
-  if (wb.rleft() >= BACKOFF_WRITE_BUFFER_THRES) {
-    return 0;
-  }
-
-  if (session->on_write() != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int Client::read_clear() {
-  uint8_t buf[8_k];
-
-  for (;;) {
-    ssize_t nread;
-    while ((nread = read(fd, buf, sizeof(buf))) == -1 && errno == EINTR)
-      ;
-    if (nread == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        return 0;
-      }
-      return -1;
-    }
-
-    if (nread == 0) {
-      return -1;
-    }
-
-    if (on_read(buf, nread) != 0) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-int Client::write_clear() {
-  std::array<struct iovec, 2> iov;
-
-  for (;;) {
-    if (on_write() != 0) {
-      return -1;
-    }
-
-    auto iovcnt = wb.riovec(iov.data(), iov.size());
-
-    if (iovcnt == 0) {
-      break;
-    }
-
-    ssize_t nwrite;
-    while ((nwrite = writev(fd, iov.data(), iovcnt)) == -1 && errno == EINTR)
-      ;
-
-    if (nwrite == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        ev_io_start(worker->loop, &wev);
-        return 0;
-      }
-      return -1;
-    }
-
-    wb.drain(nwrite);
-  }
-
-  ev_io_stop(worker->loop, &wev);
-
-  return 0;
-}
-
-int Client::connected() {
-  if (!util::check_socket_connected(fd)) {
-    return ERR_CONNECT_FAIL;
-  }
-  ev_io_start(worker->loop, &rev);
-  ev_io_stop(worker->loop, &wev);
-
-  if (ssl) {
-    readfn = &Client::tls_handshake;
-    writefn = &Client::tls_handshake;
-
-    return do_write();
-  }
-
-  readfn = &Client::read_clear;
-  writefn = &Client::write_clear;
-
-  if (connection_made() != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int Client::tls_handshake() {
-  ERR_clear_error();
-
-  auto rv = SSL_do_handshake(ssl);
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(ssl, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      ev_io_stop(worker->loop, &wev);
-      return 0;
-    case SSL_ERROR_WANT_WRITE:
-      ev_io_start(worker->loop, &wev);
-      return 0;
-    default:
-      return -1;
-    }
-  }
-
-  ev_io_stop(worker->loop, &wev);
-
-  readfn = &Client::read_tls;
-  writefn = &Client::write_tls;
-
-  if (connection_made() != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int Client::read_tls() {
-  uint8_t buf[8_k];
-
-  ERR_clear_error();
-
-  for (;;) {
-    auto rv = SSL_read(ssl, buf, sizeof(buf));
-
-    if (rv <= 0) {
-      auto err = SSL_get_error(ssl, rv);
-      switch (err) {
-      case SSL_ERROR_WANT_READ:
-        return 0;
-      case SSL_ERROR_WANT_WRITE:
-        // renegotiation started
-        return -1;
-      default:
-        return -1;
-      }
-    }
-
-    if (on_read(buf, rv) != 0) {
-      return -1;
-    }
-  }
-}
-
-int Client::write_tls() {
-  ERR_clear_error();
-
-  struct iovec iov;
-
-  for (;;) {
-    if (on_write() != 0) {
-      return -1;
-    }
-
-    auto iovcnt = wb.riovec(&iov, 1);
-
-    if (iovcnt == 0) {
-      break;
-    }
-
-    auto rv = SSL_write(ssl, iov.iov_base, iov.iov_len);
-
-    if (rv <= 0) {
-      auto err = SSL_get_error(ssl, rv);
-      switch (err) {
-      case SSL_ERROR_WANT_READ:
-        // renegotiation started
-        return -1;
-      case SSL_ERROR_WANT_WRITE:
-        ev_io_start(worker->loop, &wev);
-        return 0;
-      default:
-        return -1;
-      }
-    }
-
-    wb.drain(rv);
-  }
-
-  ev_io_stop(worker->loop, &wev);
-
-  return 0;
-}
-
-void Client::record_request_time(RequestStat *req_stat) {
-  req_stat->request_time = std::chrono::steady_clock::now();
-}
-
-void Client::record_connect_start_time() {
-  cstat.connect_start_time = std::chrono::steady_clock::now();
-}
-
-void Client::record_connect_time() {
-  cstat.connect_time = std::chrono::steady_clock::now();
-}
-
-void Client::record_ttfb() {
-  if (recorded(cstat.ttfb)) {
-    return;
-  }
-
-  cstat.ttfb = std::chrono::steady_clock::now();
-}
-
-void Client::clear_connect_times() {
-  cstat.connect_start_time = std::chrono::steady_clock::time_point();
-  cstat.connect_time = std::chrono::steady_clock::time_point();
-  cstat.ttfb = std::chrono::steady_clock::time_point();
-}
-
-void Client::record_client_start_time() {
-  // Record start time only once at the very first connection is going
-  // to be made.
-  if (recorded(cstat.client_start_time)) {
-    return;
-  }
-
-  cstat.client_start_time = std::chrono::steady_clock::now();
-}
-
-void Client::record_client_end_time() {
-  // Unlike client_start_time, we overwrite client_end_time.  This
-  // handles multiple connect/disconnect for HTTP/1.1 benchmark.
-  cstat.client_end_time = std::chrono::steady_clock::now();
-}
-
-void Client::signal_write() { ev_io_start(worker->loop, &wev); }
-
-void Client::try_new_connection() { new_connection_requested = true; }
-
-namespace {
-int get_ev_loop_flags() {
-  if (ev_supported_backends() & ~ev_recommended_backends() & EVBACKEND_KQUEUE) {
-    return ev_recommended_backends() | EVBACKEND_KQUEUE;
-  }
-
-  return 0;
-}
-} // namespace
-
-Worker::Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t req_todo, size_t nclients,
-               size_t rate, size_t max_samples, Config *config)
-    : stats(req_todo, nclients),
-      loop(ev_loop_new(get_ev_loop_flags())),
-      ssl_ctx(ssl_ctx),
-      config(config),
-      id(id),
-      tls_info_report_done(false),
-      app_info_report_done(false),
-      nconns_made(0),
-      nclients(nclients),
-      nreqs_per_client(req_todo / nclients),
-      nreqs_rem(req_todo % nclients),
-      rate(rate),
-      max_samples(max_samples),
-      next_client_id(0) {
-  if (!config->is_rate_mode() && !config->is_timing_based_mode()) {
-    progress_interval = std::max(static_cast<size_t>(1), req_todo / 10);
-  } else {
-    progress_interval = std::max(static_cast<size_t>(1), nclients / 10);
-  }
-
-  // Below timeout is not needed in case of timing-based benchmarking
-  // create timer that will go off every rate_period
-  ev_timer_init(&timeout_watcher, rate_period_timeout_w_cb, 0.,
-                config->rate_period);
-  timeout_watcher.data = this;
-
-  if (config->is_timing_based_mode()) {
-    stats.req_stats.reserve(std::max(req_todo, max_samples));
-    stats.client_stats.reserve(std::max(nclients, max_samples));
-  } else {
-    stats.req_stats.reserve(std::min(req_todo, max_samples));
-    stats.client_stats.reserve(std::min(nclients, max_samples));
-  }
-
-  sampling_init(request_times_smp, max_samples);
-  sampling_init(client_smp, max_samples);
-
-  ev_timer_init(&duration_watcher, duration_timeout_cb, config->duration, 0.);
-  duration_watcher.data = this;
-
-  ev_timer_init(&warmup_watcher, warmup_timeout_cb, config->warm_up_time, 0.);
-  warmup_watcher.data = this;
-
-  if (config->is_timing_based_mode()) {
-    current_phase = Phase::INITIAL_IDLE;
-  } else {
-    current_phase = Phase::MAIN_DURATION;
-  }
-}
-
-Worker::~Worker() {
-  ev_timer_stop(loop, &timeout_watcher);
-  ev_timer_stop(loop, &duration_watcher);
-  ev_timer_stop(loop, &warmup_watcher);
-  ev_loop_destroy(loop);
-}
-
-void Worker::stop_all_clients() {
-  for (auto client : clients) {
-    if (client && client->session) {
-      client->terminate_session();
-    }
-  }
-}
-
-void Worker::free_client(Client *deleted_client) {
-  for (auto &client : clients) {
-    if (client == deleted_client) {
-      client->req_todo = client->req_done;
-      stats.req_todo += client->req_todo;
-      auto index = &client - &clients[0];
-      clients[index] = NULL;
-      return;
-    }
-  }
-}
-
-void Worker::run() {
-  if (!config->is_rate_mode() && !config->is_timing_based_mode()) {
-    for (size_t i = 0; i < nclients; ++i) {
-      auto req_todo = nreqs_per_client;
-      if (nreqs_rem > 0) {
-        ++req_todo;
-        --nreqs_rem;
-      }
-
-      auto client = make_unique<Client>(next_client_id++, this, req_todo);
-      if (client->connect() != 0) {
-        std::cerr << "client could not connect to host" << std::endl;
-        client->fail();
-      } else {
-        client.release();
-      }
-    }
-  } else if (config->is_rate_mode()) {
-    ev_timer_again(loop, &timeout_watcher);
-
-    // call callback so that we don't waste the first rate_period
-    rate_period_timeout_w_cb(loop, &timeout_watcher, 0);
-  } else {
-    // call the callback to start for one single time
-    rate_period_timeout_w_cb(loop, &timeout_watcher, 0);
-  }
-  ev_run(loop, 0);
-}
-
-namespace {
-template <typename Stats, typename Stat>
-void sample(Sampling &smp, Stats &stats, Stat *s) {
-  ++smp.n;
-  if (stats.size() < smp.max_samples) {
-    stats.push_back(*s);
-    return;
-  }
-  auto d = std::uniform_int_distribution<unsigned long>(0, smp.n - 1);
-  auto i = d(gen);
-  if (i < smp.max_samples) {
-    stats[i] = *s;
-  }
-}
-} // namespace
-
-void Worker::sample_req_stat(RequestStat *req_stat) {
-  sample(request_times_smp, stats.req_stats, req_stat);
-}
-
-void Worker::sample_client_stat(ClientStat *cstat) {
-  sample(client_smp, stats.client_stats, cstat);
-}
-
-void Worker::report_progress() {
-  if (id != 0 || config->is_rate_mode() || stats.req_done % progress_interval ||
-      config->is_timing_based_mode()) {
-    return;
-  }
-
-  std::cout << "progress: " << stats.req_done * 100 / stats.req_todo << "% done"
-            << std::endl;
-}
-
-void Worker::report_rate_progress() {
-  if (id != 0 || nconns_made % progress_interval) {
-    return;
-  }
-
-  std::cout << "progress: " << nconns_made * 100 / nclients
-            << "% of clients started" << std::endl;
-}
-
-namespace {
-// Returns percentage of number of samples within mean +/- sd.
-double within_sd(const std::vector<double> &samples, double mean, double sd) {
-  if (samples.size() == 0) {
-    return 0.0;
-  }
-  auto lower = mean - sd;
-  auto upper = mean + sd;
-  auto m = std::count_if(
-      std::begin(samples), std::end(samples),
-      [&lower, &upper](double t) { return lower <= t && t <= upper; });
-  return (m / static_cast<double>(samples.size())) * 100;
-}
-} // namespace
-
-namespace {
-// Computes statistics using |samples|. The min, max, mean, sd, and
-// percentage of number of samples within mean +/- sd are computed.
-// If |sampling| is true, this computes sample variance.  Otherwise,
-// population variance.
-SDStat compute_time_stat(const std::vector<double> &samples,
-                         bool sampling = false) {
-  if (samples.empty()) {
-    return {0.0, 0.0, 0.0, 0.0, 0.0};
-  }
-  // standard deviation calculated using Rapid calculation method:
-  // https://en.wikipedia.org/wiki/Standard_deviation#Rapid_calculation_methods
-  double a = 0, q = 0;
-  size_t n = 0;
-  double sum = 0;
-  auto res = SDStat{std::numeric_limits<double>::max(),
-                    std::numeric_limits<double>::min()};
-  for (const auto &t : samples) {
-    ++n;
-    res.min = std::min(res.min, t);
-    res.max = std::max(res.max, t);
-    sum += t;
-
-    auto na = a + (t - a) / n;
-    q += (t - a) * (t - na);
-    a = na;
-  }
-
-  assert(n > 0);
-  res.mean = sum / n;
-  res.sd = sqrt(q / (sampling && n > 1 ? n - 1 : n));
-  res.within_sd = within_sd(samples, res.mean, res.sd);
-
-  return res;
-}
-} // namespace
-
-namespace {
-SDStats
-process_time_stats(const std::vector<std::unique_ptr<Worker>> &workers) {
-  auto request_times_sampling = false;
-  auto client_times_sampling = false;
-  size_t nrequest_times = 0;
-  size_t nclient_times = 0;
-  for (const auto &w : workers) {
-    nrequest_times += w->stats.req_stats.size();
-    request_times_sampling = w->request_times_smp.n > w->stats.req_stats.size();
-
-    nclient_times += w->stats.client_stats.size();
-    client_times_sampling = w->client_smp.n > w->stats.client_stats.size();
-  }
-
-  std::vector<double> request_times;
-  request_times.reserve(nrequest_times);
-
-  std::vector<double> connect_times, ttfb_times, rps_values;
-  connect_times.reserve(nclient_times);
-  ttfb_times.reserve(nclient_times);
-  rps_values.reserve(nclient_times);
-
-  for (const auto &w : workers) {
-    for (const auto &req_stat : w->stats.req_stats) {
-      if (!req_stat.completed) {
-        continue;
-      }
-      request_times.push_back(
-          std::chrono::duration_cast<std::chrono::duration<double>>(
-              req_stat.stream_close_time - req_stat.request_time)
-              .count());
-    }
-
-    const auto &stat = w->stats;
-
-    for (const auto &cstat : stat.client_stats) {
-      if (recorded(cstat.client_start_time) &&
-          recorded(cstat.client_end_time)) {
-        auto t = std::chrono::duration_cast<std::chrono::duration<double>>(
-                     cstat.client_end_time - cstat.client_start_time)
-                     .count();
-        if (t > 1e-9) {
-          rps_values.push_back(cstat.req_success / t);
-        }
-      }
-
-      // We will get connect event before FFTB.
-      if (!recorded(cstat.connect_start_time) ||
-          !recorded(cstat.connect_time)) {
-        continue;
-      }
-
-      connect_times.push_back(
-          std::chrono::duration_cast<std::chrono::duration<double>>(
-              cstat.connect_time - cstat.connect_start_time)
-              .count());
-
-      if (!recorded(cstat.ttfb)) {
-        continue;
-      }
-
-      ttfb_times.push_back(
-          std::chrono::duration_cast<std::chrono::duration<double>>(
-              cstat.ttfb - cstat.connect_start_time)
-              .count());
-    }
-  }
-
-  return {compute_time_stat(request_times, request_times_sampling),
-          compute_time_stat(connect_times, client_times_sampling),
-          compute_time_stat(ttfb_times, client_times_sampling),
-          compute_time_stat(rps_values, client_times_sampling)};
-}
-} // namespace
-
-namespace {
-void resolve_host() {
-  if (config.base_uri_unix) {
-    auto res = make_unique<addrinfo>();
-    res->ai_family = config.unix_addr.sun_family;
-    res->ai_socktype = SOCK_STREAM;
-    res->ai_addrlen = sizeof(config.unix_addr);
-    res->ai_addr =
-        static_cast<struct sockaddr *>(static_cast<void *>(&config.unix_addr));
-
-    config.addrs = res.release();
-    return;
-  };
-
-  int rv;
-  addrinfo hints{}, *res;
-
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-  hints.ai_flags = AI_ADDRCONFIG;
-
-  rv = getaddrinfo(config.host.c_str(), util::utos(config.port).c_str(), &hints,
-                   &res);
-  if (rv != 0) {
-    std::cerr << "getaddrinfo() failed: " << gai_strerror(rv) << std::endl;
-    exit(EXIT_FAILURE);
-  }
-  if (res == nullptr) {
-    std::cerr << "No address returned" << std::endl;
-    exit(EXIT_FAILURE);
-  }
-  config.addrs = res;
-}
-} // namespace
-
-namespace {
-std::string get_reqline(const char *uri, const http_parser_url &u) {
-  std::string reqline;
-
-  if (util::has_uri_field(u, UF_PATH)) {
-    reqline = util::get_uri_field(uri, u, UF_PATH).str();
-  } else {
-    reqline = "/";
-  }
-
-  if (util::has_uri_field(u, UF_QUERY)) {
-    reqline += '?';
-    reqline += util::get_uri_field(uri, u, UF_QUERY);
-  }
-
-  return reqline;
-}
-} // namespace
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-int client_select_next_proto_cb(SSL *ssl, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  if (util::select_protocol(const_cast<const unsigned char **>(out), outlen, in,
-                            inlen, config.npn_list)) {
-    return SSL_TLSEXT_ERR_OK;
-  }
-
-  // OpenSSL will terminate handshake with fatal alert if we return
-  // NOACK.  So there is no way to fallback.
-  return SSL_TLSEXT_ERR_NOACK;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-namespace {
-constexpr char UNIX_PATH_PREFIX[] = "unix:";
-} // namespace
-
-namespace {
-bool parse_base_uri(const StringRef &base_uri) {
-  http_parser_url u{};
-  if (http_parser_parse_url(base_uri.c_str(), base_uri.size(), 0, &u) != 0 ||
-      !util::has_uri_field(u, UF_SCHEMA) || !util::has_uri_field(u, UF_HOST)) {
-    return false;
-  }
-
-  config.scheme = util::get_uri_field(base_uri.c_str(), u, UF_SCHEMA).str();
-  config.host = util::get_uri_field(base_uri.c_str(), u, UF_HOST).str();
-  config.default_port = util::get_default_port(base_uri.c_str(), u);
-  if (util::has_uri_field(u, UF_PORT)) {
-    config.port = u.port;
-  } else {
-    config.port = config.default_port;
-  }
-
-  return true;
-}
-} // namespace
-namespace {
-// Use std::vector<std::string>::iterator explicitly, without that,
-// http_parser_url u{} fails with clang-3.4.
-std::vector<std::string> parse_uris(std::vector<std::string>::iterator first,
-                                    std::vector<std::string>::iterator last) {
-  std::vector<std::string> reqlines;
-
-  if (first == last) {
-    std::cerr << "no URI available" << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (!config.has_base_uri()) {
-
-    if (!parse_base_uri(StringRef{*first})) {
-      std::cerr << "invalid URI: " << *first << std::endl;
-      exit(EXIT_FAILURE);
-    }
-
-    config.base_uri = *first;
-  }
-
-  for (; first != last; ++first) {
-    http_parser_url u{};
-
-    auto uri = (*first).c_str();
-
-    if (http_parser_parse_url(uri, (*first).size(), 0, &u) != 0) {
-      std::cerr << "invalid URI: " << uri << std::endl;
-      exit(EXIT_FAILURE);
-    }
-
-    reqlines.push_back(get_reqline(uri, u));
-  }
-
-  return reqlines;
-}
-} // namespace
-
-namespace {
-std::vector<std::string> read_uri_from_file(std::istream &infile) {
-  std::vector<std::string> uris;
-  std::string line_uri;
-  while (std::getline(infile, line_uri)) {
-    uris.push_back(line_uri);
-  }
-
-  return uris;
-}
-} // namespace
-
-namespace {
-void read_script_from_file(std::istream &infile,
-                           std::vector<ev_tstamp> &timings,
-                           std::vector<std::string> &uris) {
-  std::string script_line;
-  int line_count = 0;
-  while (std::getline(infile, script_line)) {
-    line_count++;
-    if (script_line.empty()) {
-      std::cerr << "Empty line detected at line " << line_count
-                << ". Ignoring and continuing." << std::endl;
-      continue;
-    }
-
-    std::size_t pos = script_line.find("\t");
-    if (pos == std::string::npos) {
-      std::cerr << "Invalid line format detected, no tab character at line "
-                << line_count << ". \n\t" << script_line << std::endl;
-      exit(EXIT_FAILURE);
-    }
-
-    const char *start = script_line.c_str();
-    char *end;
-    auto v = std::strtod(start, &end);
-
-    errno = 0;
-    if (v < 0.0 || !std::isfinite(v) || end == start || errno != 0) {
-      auto error = errno;
-      std::cerr << "Time value error at line " << line_count << ". \n\t"
-                << "value = " << script_line.substr(0, pos) << std::endl;
-      if (error != 0) {
-        std::cerr << "\t" << strerror(error) << std::endl;
-      }
-      exit(EXIT_FAILURE);
-    }
-
-    timings.push_back(v / 1000.0);
-    uris.push_back(script_line.substr(pos + 1, script_line.size()));
-  }
-}
-} // namespace
-
-namespace {
-std::unique_ptr<Worker> create_worker(uint32_t id, SSL_CTX *ssl_ctx,
-                                      size_t nreqs, size_t nclients,
-                                      size_t rate, size_t max_samples) {
-  std::stringstream rate_report;
-  if (config.is_rate_mode() && nclients > rate) {
-    rate_report << "Up to " << rate << " client(s) will be created every "
-                << util::duration_str(config.rate_period) << " ";
-  }
-
-  if (config.is_timing_based_mode()) {
-    std::cout << "spawning thread #" << id << ": " << nclients
-              << " total client(s). Timing-based test with "
-              << config.warm_up_time << "s of warm-up time and "
-              << config.duration << "s of main duration for measurements."
-              << std::endl;
-  } else {
-    std::cout << "spawning thread #" << id << ": " << nclients
-              << " total client(s). " << rate_report.str() << nreqs
-              << " total requests" << std::endl;
-  }
-
-  if (config.is_rate_mode()) {
-    return make_unique<Worker>(id, ssl_ctx, nreqs, nclients, rate, max_samples,
-                               &config);
-  } else {
-    // Here rate is same as client because the rate_timeout callback
-    // will be called only once
-    return make_unique<Worker>(id, ssl_ctx, nreqs, nclients, nclients,
-                               max_samples, &config);
-  }
-}
-} // namespace
-
-namespace {
-int parse_header_table_size(uint32_t &dst, const char *opt,
-                            const char *optarg) {
-  auto n = util::parse_uint_with_unit(optarg);
-  if (n == -1) {
-    std::cerr << "--" << opt << ": Bad option value: " << optarg << std::endl;
-    return -1;
-  }
-  if (n > std::numeric_limits<uint32_t>::max()) {
-    std::cerr << "--" << opt
-              << ": Value too large.  It should be less than or equal to "
-              << std::numeric_limits<uint32_t>::max() << std::endl;
-    return -1;
-  }
-
-  dst = n;
-
-  return 0;
-}
-} // namespace
-
-namespace {
-void print_version(std::ostream &out) {
-  out << "h2load nghttp2/" NGHTTP2_VERSION << std::endl;
-}
-} // namespace
-
-namespace {
-void print_usage(std::ostream &out) {
-  out << R"(Usage: h2load [OPTIONS]... [URI]...
-benchmarking tool for HTTP/2 server)"
-      << std::endl;
-}
-} // namespace
-
-namespace {
-constexpr char DEFAULT_NPN_LIST[] = "h2,h2-16,h2-14,http/1.1";
-} // namespace
-
-namespace {
-void print_help(std::ostream &out) {
-  print_usage(out);
-
-  auto config = Config();
-
-  out << R"(
-  <URI>       Specify URI to access.   Multiple URIs can be specified.
-              URIs are used  in this order for each  client.  All URIs
-              are used, then  first URI is used and then  2nd URI, and
-              so  on.  The  scheme, host  and port  in the  subsequent
-              URIs, if present,  are ignored.  Those in  the first URI
-              are used solely.  Definition of a base URI overrides all
-              scheme, host or port values.
-Options:
-  -n, --requests=<N>
-              Number of  requests across all  clients.  If it  is used
-              with --timing-script-file option,  this option specifies
-              the number of requests  each client performs rather than
-              the number of requests  across all clients.  This option
-              is ignored if timing-based  benchmarking is enabled (see
-              --duration option).
-              Default: )"
-      << config.nreqs << R"(
-  -c, --clients=<N>
-              Number  of concurrent  clients.   With  -r option,  this
-              specifies the maximum number of connections to be made.
-              Default: )"
-      << config.nclients << R"(
-  -t, --threads=<N>
-              Number of native threads.
-              Default: )"
-      << config.nthreads << R"(
-  -i, --input-file=<PATH>
-              Path of a file with multiple URIs are separated by EOLs.
-              This option will disable URIs getting from command-line.
-              If '-' is given as <PATH>, URIs will be read from stdin.
-              URIs are used  in this order for each  client.  All URIs
-              are used, then  first URI is used and then  2nd URI, and
-              so  on.  The  scheme, host  and port  in the  subsequent
-              URIs, if present,  are ignored.  Those in  the first URI
-              are used solely.  Definition of a base URI overrides all
-              scheme, host or port values.
-  -m, --max-concurrent-streams=<N>
-              Max  concurrent  streams  to issue  per  session.   When
-              http/1.1  is used,  this  specifies the  number of  HTTP
-              pipelining requests in-flight.
-              Default: 1
-  -w, --window-bits=<N>
-              Sets the stream level initial window size to (2**<N>)-1.
-              Default: )"
-      << config.window_bits << R"(
-  -W, --connection-window-bits=<N>
-              Sets  the  connection  level   initial  window  size  to
-              (2**<N>)-1.
-              Default: )"
-      << config.connection_window_bits << R"(
-  -H, --header=<HEADER>
-              Add/Override a header to the requests.
-  --ciphers=<SUITE>
-              Set allowed  cipher list.  The  format of the  string is
-              described in OpenSSL ciphers(1).
-              Default: )"
-      << config.ciphers << R"(
-  -p, --no-tls-proto=<PROTOID>
-              Specify ALPN identifier of the  protocol to be used when
-              accessing http URI without SSL/TLS.
-              Available protocols: )"
-      << NGHTTP2_CLEARTEXT_PROTO_VERSION_ID << R"( and )" << NGHTTP2_H1_1 << R"(
-              Default: )"
-      << NGHTTP2_CLEARTEXT_PROTO_VERSION_ID << R"(
-  -d, --data=<PATH>
-              Post FILE to  server.  The request method  is changed to
-              POST.   For  http/1.1 connection,  if  -d  is used,  the
-              maximum number of in-flight pipelined requests is set to
-              1.
-  -r, --rate=<N>
-              Specifies  the  fixed  rate  at  which  connections  are
-              created.   The   rate  must   be  a   positive  integer,
-              representing the  number of  connections to be  made per
-              rate period.   The maximum  number of connections  to be
-              made  is  given  in  -c   option.   This  rate  will  be
-              distributed among  threads as  evenly as  possible.  For
-              example,  with   -t2  and   -r4,  each  thread   gets  2
-              connections per period.  When the rate is 0, the program
-              will run  as it  normally does, creating  connections at
-              whatever variable rate it  wants.  The default value for
-              this option is 0.  -r and -D are mutually exclusive.
-  --rate-period=<DURATION>
-              Specifies the time  period between creating connections.
-              The period  must be a positive  number, representing the
-              length of the period in time.  This option is ignored if
-              the rate option is not used.  The default value for this
-              option is 1s.
-  -D, --duration=<N>
-              Specifies the main duration for the measurements in case
-              of timing-based  benchmarking.  -D  and -r  are mutually
-              exclusive.
-  --warm-up-time=<DURATION>
-              Specifies the  time  period  before  starting the actual
-              measurements, in  case  of  timing-based benchmarking.
-              Needs to provided along with -D option.
-  -T, --connection-active-timeout=<DURATION>
-              Specifies  the maximum  time that  h2load is  willing to
-              keep a  connection open,  regardless of the  activity on
-              said connection.  <DURATION> must be a positive integer,
-              specifying the amount of time  to wait.  When no timeout
-              value is  set (either  active or inactive),  h2load will
-              keep  a  connection  open indefinitely,  waiting  for  a
-              response.
-  -N, --connection-inactivity-timeout=<DURATION>
-              Specifies the amount  of time that h2load  is willing to
-              wait to see activity  on a given connection.  <DURATION>
-              must  be a  positive integer,  specifying the  amount of
-              time  to wait.   When no  timeout value  is set  (either
-              active or inactive), h2load  will keep a connection open
-              indefinitely, waiting for a response.
-  --timing-script-file=<PATH>
-              Path of a file containing one or more lines separated by
-              EOLs.  Each script line is composed of two tab-separated
-              fields.  The first field represents the time offset from
-              the start of execution, expressed as a positive value of
-              milliseconds  with microsecond  resolution.  The  second
-              field represents the URI.  This option will disable URIs
-              getting from  command-line.  If '-' is  given as <PATH>,
-              script lines will be read  from stdin.  Script lines are
-              used in order for each client.   If -n is given, it must
-              be less  than or  equal to the  number of  script lines,
-              larger values are clamped to the number of script lines.
-              If -n is not given,  the number of requests will default
-              to the  number of  script lines.   The scheme,  host and
-              port defined in  the first URI are  used solely.  Values
-              contained  in  other  URIs,  if  present,  are  ignored.
-              Definition of a  base URI overrides all  scheme, host or
-              port values.
-  -B, --base-uri=(<URI>|unix:<PATH>)
-              Specify URI from which the scheme, host and port will be
-              used  for  all requests.   The  base  URI overrides  all
-              values  defined either  at  the command  line or  inside
-              input files.  If argument  starts with "unix:", then the
-              rest  of the  argument will  be treated  as UNIX  domain
-              socket path.   The connection is made  through that path
-              instead of TCP.   In this case, scheme  is inferred from
-              the first  URI appeared  in the  command line  or inside
-              input files as usual.
-  --npn-list=<LIST>
-              Comma delimited list of  ALPN protocol identifier sorted
-              in the  order of preference.  That  means most desirable
-              protocol comes  first.  This  is used  in both  ALPN and
-              NPN.  The parameter must be  delimited by a single comma
-              only  and any  white spaces  are  treated as  a part  of
-              protocol string.
-              Default: )"
-      << DEFAULT_NPN_LIST << R"(
-  --h1        Short        hand         for        --npn-list=http/1.1
-              --no-tls-proto=http/1.1,    which   effectively    force
-              http/1.1 for both http and https URI.
-  --header-table-size=<SIZE>
-              Specify decoder header table size.
-              Default: )"
-      << util::utos_unit(config.header_table_size) << R"(
-  --encoder-header-table-size=<SIZE>
-              Specify encoder header table size.  The decoder (server)
-              specifies  the maximum  dynamic table  size it  accepts.
-              Then the negotiated dynamic table size is the minimum of
-              this option value and the value which server specified.
-              Default: )"
-      << util::utos_unit(config.encoder_header_table_size) << R"(
-  -v, --verbose
-              Output debug information.
-  --version   Display version information and exit.
-  -h, --help  Display this help and exit.
-
---
-
-  The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-  10 * 1024).  Units are K, M and G (powers of 1024).
-
-  The <DURATION> argument is an integer and an optional unit (e.g., 1s
-  is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-  (hours, minutes, seconds and milliseconds, respectively).  If a unit
-  is omitted, a second is used as unit.)"
-      << std::endl;
-}
-} // namespace
-
-int main(int argc, char **argv) {
-  tls::libssl_init();
-
-#ifndef NOTHREADS
-  tls::LibsslGlobalLock lock;
-#endif // NOTHREADS
-
-  std::string datafile;
-  bool nreqs_set_manually = false;
-  while (1) {
-    static int flag = 0;
-    constexpr static option long_options[] = {
-        {"requests", required_argument, nullptr, 'n'},
-        {"clients", required_argument, nullptr, 'c'},
-        {"data", required_argument, nullptr, 'd'},
-        {"threads", required_argument, nullptr, 't'},
-        {"max-concurrent-streams", required_argument, nullptr, 'm'},
-        {"window-bits", required_argument, nullptr, 'w'},
-        {"connection-window-bits", required_argument, nullptr, 'W'},
-        {"input-file", required_argument, nullptr, 'i'},
-        {"header", required_argument, nullptr, 'H'},
-        {"no-tls-proto", required_argument, nullptr, 'p'},
-        {"verbose", no_argument, nullptr, 'v'},
-        {"help", no_argument, nullptr, 'h'},
-        {"version", no_argument, &flag, 1},
-        {"ciphers", required_argument, &flag, 2},
-        {"rate", required_argument, nullptr, 'r'},
-        {"connection-active-timeout", required_argument, nullptr, 'T'},
-        {"connection-inactivity-timeout", required_argument, nullptr, 'N'},
-        {"duration", required_argument, nullptr, 'D'},
-        {"timing-script-file", required_argument, &flag, 3},
-        {"base-uri", required_argument, nullptr, 'B'},
-        {"npn-list", required_argument, &flag, 4},
-        {"rate-period", required_argument, &flag, 5},
-        {"h1", no_argument, &flag, 6},
-        {"header-table-size", required_argument, &flag, 7},
-        {"encoder-header-table-size", required_argument, &flag, 8},
-        {"warm-up-time", required_argument, &flag, 9},
-        {nullptr, 0, nullptr, 0}};
-    int option_index = 0;
-    auto c = getopt_long(argc, argv,
-                         "hvW:c:d:m:n:p:t:w:H:i:r:T:N:D:B:", long_options,
-                         &option_index);
-    if (c == -1) {
-      break;
-    }
-    switch (c) {
-    case 'n':
-      config.nreqs = strtoul(optarg, nullptr, 10);
-      nreqs_set_manually = true;
-      break;
-    case 'c':
-      config.nclients = strtoul(optarg, nullptr, 10);
-      break;
-    case 'd':
-      datafile = optarg;
-      break;
-    case 't':
-#ifdef NOTHREADS
-      std::cerr << "-t: WARNING: Threading disabled at build time, "
-                << "no threads created." << std::endl;
-#else
-      config.nthreads = strtoul(optarg, nullptr, 10);
-#endif // NOTHREADS
-      break;
-    case 'm':
-      config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
-      break;
-    case 'w':
-    case 'W': {
-      errno = 0;
-      char *endptr = nullptr;
-      auto n = strtoul(optarg, &endptr, 10);
-      if (errno == 0 && *endptr == '\0' && n < 31) {
-        if (c == 'w') {
-          config.window_bits = n;
-        } else {
-          config.connection_window_bits = n;
-        }
-      } else {
-        std::cerr << "-" << static_cast<char>(c)
-                  << ": specify the integer in the range [0, 30], inclusive"
-                  << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    }
-    case 'H': {
-      char *header = optarg;
-      // Skip first possible ':' in the header name
-      char *value = strchr(optarg + 1, ':');
-      if (!value || (header[0] == ':' && header + 1 == value)) {
-        std::cerr << "-H: invalid header: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      *value = 0;
-      value++;
-      while (isspace(*value)) {
-        value++;
-      }
-      if (*value == 0) {
-        // This could also be a valid case for suppressing a header
-        // similar to curl
-        std::cerr << "-H: invalid header - value missing: " << optarg
-                  << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      // Note that there is no processing currently to handle multiple
-      // message-header fields with the same field name
-      config.custom_headers.emplace_back(header, value);
-      util::inp_strlower(config.custom_headers.back().name);
-      break;
-    }
-    case 'i':
-      config.ifile = optarg;
-      break;
-    case 'p': {
-      auto proto = StringRef{optarg};
-      if (util::strieq(StringRef::from_lit(NGHTTP2_CLEARTEXT_PROTO_VERSION_ID),
-                       proto)) {
-        config.no_tls_proto = Config::PROTO_HTTP2;
-      } else if (util::strieq(NGHTTP2_H1_1, proto)) {
-        config.no_tls_proto = Config::PROTO_HTTP1_1;
-      } else {
-        std::cerr << "-p: unsupported protocol " << proto << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    }
-    case 'r':
-      config.rate = strtoul(optarg, nullptr, 10);
-      if (config.rate == 0) {
-        std::cerr << "-r: the rate at which connections are made "
-                  << "must be positive." << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'T':
-      config.conn_active_timeout = util::parse_duration_with_unit(optarg);
-      if (!std::isfinite(config.conn_active_timeout)) {
-        std::cerr << "-T: bad value for the conn_active_timeout wait time: "
-                  << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'N':
-      config.conn_inactivity_timeout = util::parse_duration_with_unit(optarg);
-      if (!std::isfinite(config.conn_inactivity_timeout)) {
-        std::cerr << "-N: bad value for the conn_inactivity_timeout wait time: "
-                  << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'B': {
-      auto arg = StringRef{optarg};
-      config.base_uri = "";
-      config.base_uri_unix = false;
-
-      if (util::istarts_with_l(arg, UNIX_PATH_PREFIX)) {
-        // UNIX domain socket path
-        sockaddr_un un;
-
-        auto path = StringRef{std::begin(arg) + str_size(UNIX_PATH_PREFIX),
-                              std::end(arg)};
-
-        if (path.size() == 0 || path.size() + 1 > sizeof(un.sun_path)) {
-          std::cerr << "--base-uri: invalid UNIX domain socket path: " << arg
-                    << std::endl;
-          exit(EXIT_FAILURE);
-        }
-
-        config.base_uri_unix = true;
-
-        auto &unix_addr = config.unix_addr;
-        std::copy(std::begin(path), std::end(path), unix_addr.sun_path);
-        unix_addr.sun_path[path.size()] = '\0';
-        unix_addr.sun_family = AF_UNIX;
-
-        break;
-      }
-
-      if (!parse_base_uri(arg)) {
-        std::cerr << "--base-uri: invalid base URI: " << arg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-
-      config.base_uri = arg.str();
-      break;
-    }
-    case 'D':
-      config.duration = strtoul(optarg, nullptr, 10);
-      if (config.duration == 0) {
-        std::cerr << "-D: the main duration for timing-based benchmarking "
-                  << "must be positive." << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'v':
-      config.verbose = true;
-      break;
-    case 'h':
-      print_help(std::cout);
-      exit(EXIT_SUCCESS);
-    case '?':
-      util::show_candidates(argv[optind - 1], long_options);
-      exit(EXIT_FAILURE);
-    case 0:
-      switch (flag) {
-      case 1:
-        // version option
-        print_version(std::cout);
-        exit(EXIT_SUCCESS);
-      case 2:
-        // ciphers option
-        config.ciphers = optarg;
-        break;
-      case 3:
-        // timing-script option
-        config.ifile = optarg;
-        config.timing_script = true;
-        break;
-      case 4:
-        // npn-list option
-        config.npn_list = util::parse_config_str_list(StringRef{optarg});
-        break;
-      case 5:
-        // rate-period
-        config.rate_period = util::parse_duration_with_unit(optarg);
-        if (!std::isfinite(config.rate_period)) {
-          std::cerr << "--rate-period: value error " << optarg << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        break;
-      case 6:
-        // --h1
-        config.npn_list =
-            util::parse_config_str_list(StringRef::from_lit("http/1.1"));
-        config.no_tls_proto = Config::PROTO_HTTP1_1;
-        break;
-      case 7:
-        // --header-table-size
-        if (parse_header_table_size(config.header_table_size,
-                                    "header-table-size", optarg) != 0) {
-          exit(EXIT_FAILURE);
-        }
-        break;
-      case 8:
-        // --encoder-header-table-size
-        if (parse_header_table_size(config.encoder_header_table_size,
-                                    "encoder-header-table-size", optarg) != 0) {
-          exit(EXIT_FAILURE);
-        }
-        break;
-      case 9:
-        // --warm-up-time
-        config.warm_up_time = util::parse_duration_with_unit(optarg);
-        if (!std::isfinite(config.warm_up_time)) {
-          std::cerr << "--warm-up-time: value error " << optarg << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        break;
-      }
-      break;
-    default:
-      break;
-    }
-  }
-
-  if (argc == optind) {
-    if (config.ifile.empty()) {
-      std::cerr << "no URI or input file given" << std::endl;
-      exit(EXIT_FAILURE);
-    }
-  }
-
-  if (config.nclients == 0) {
-    std::cerr << "-c: the number of clients must be strictly greater than 0."
-              << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.npn_list.empty()) {
-    config.npn_list =
-        util::parse_config_str_list(StringRef::from_lit(DEFAULT_NPN_LIST));
-  }
-
-  // serialize the APLN tokens
-  for (auto &proto : config.npn_list) {
-    proto.insert(proto.begin(), static_cast<unsigned char>(proto.size()));
-  }
-
-  std::vector<std::string> reqlines;
-
-  if (config.ifile.empty()) {
-    std::vector<std::string> uris;
-    std::copy(&argv[optind], &argv[argc], std::back_inserter(uris));
-    reqlines = parse_uris(std::begin(uris), std::end(uris));
-  } else {
-    std::vector<std::string> uris;
-    if (!config.timing_script) {
-      if (config.ifile == "-") {
-        uris = read_uri_from_file(std::cin);
-      } else {
-        std::ifstream infile(config.ifile);
-        if (!infile) {
-          std::cerr << "cannot read input file: " << config.ifile << std::endl;
-          exit(EXIT_FAILURE);
-        }
-
-        uris = read_uri_from_file(infile);
-      }
-    } else {
-      if (config.ifile == "-") {
-        read_script_from_file(std::cin, config.timings, uris);
-      } else {
-        std::ifstream infile(config.ifile);
-        if (!infile) {
-          std::cerr << "cannot read input file: " << config.ifile << std::endl;
-          exit(EXIT_FAILURE);
-        }
-
-        read_script_from_file(infile, config.timings, uris);
-      }
-
-      if (nreqs_set_manually) {
-        if (config.nreqs > uris.size()) {
-          std::cerr << "-n: the number of requests must be less than or equal "
-                       "to the number of timing script entries. Setting number "
-                       "of requests to "
-                    << uris.size() << std::endl;
-
-          config.nreqs = uris.size();
-        }
-      } else {
-        config.nreqs = uris.size();
-      }
-    }
-
-    reqlines = parse_uris(std::begin(uris), std::end(uris));
-  }
-
-  if (reqlines.empty()) {
-    std::cerr << "No URI given" << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.is_timing_based_mode() && config.is_rate_mode()) {
-    std::cerr << "-r, -D: they are mutually exclusive." << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.nreqs == 0 && !config.is_timing_based_mode()) {
-    std::cerr << "-n: the number of requests must be strictly greater than 0 "
-                 "if timing-based test is not being run."
-              << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.max_concurrent_streams == 0) {
-    std::cerr << "-m: the max concurrent streams must be strictly greater "
-              << "than 0." << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.nthreads == 0) {
-    std::cerr << "-t: the number of threads must be strictly greater than 0."
-              << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.nthreads > std::thread::hardware_concurrency()) {
-    std::cerr << "-t: warning: the number of threads is greater than hardware "
-              << "cores." << std::endl;
-  }
-
-  // With timing script, we don't distribute config.nreqs to each
-  // client or thread.
-  if (!config.timing_script && config.nreqs < config.nclients &&
-      !config.is_timing_based_mode()) {
-    std::cerr << "-n, -c: the number of requests must be greater than or "
-              << "equal to the clients." << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.nclients < config.nthreads) {
-    std::cerr << "-c, -t: the number of clients must be greater than or equal "
-              << "to the number of threads." << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (config.is_timing_based_mode()) {
-    config.nreqs = 0;
-  }
-
-  if (config.is_rate_mode()) {
-    if (config.rate < config.nthreads) {
-      std::cerr << "-r, -t: the connection rate must be greater than or equal "
-                << "to the number of threads." << std::endl;
-      exit(EXIT_FAILURE);
-    }
-
-    if (config.rate > config.nclients) {
-      std::cerr << "-r, -c: the connection rate must be smaller than or equal "
-                   "to the number of clients."
-                << std::endl;
-      exit(EXIT_FAILURE);
-    }
-  }
-
-  if (!datafile.empty()) {
-    config.data_fd = open(datafile.c_str(), O_RDONLY | O_BINARY);
-    if (config.data_fd == -1) {
-      std::cerr << "-d: Could not open file " << datafile << std::endl;
-      exit(EXIT_FAILURE);
-    }
-    struct stat data_stat;
-    if (fstat(config.data_fd, &data_stat) == -1) {
-      std::cerr << "-d: Could not stat file " << datafile << std::endl;
-      exit(EXIT_FAILURE);
-    }
-    config.data_length = data_stat.st_size;
-  }
-
-  struct sigaction act {};
-  act.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &act, nullptr);
-
-  auto ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if (!ssl_ctx) {
-    std::cerr << "Failed to create SSL_CTX: "
-              << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                  SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-                  SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
-
-  SSL_CTX_set_options(ssl_ctx, ssl_opts);
-  SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
-  SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
-
-  if (nghttp2::tls::ssl_ctx_set_proto_versions(
-          ssl_ctx, nghttp2::tls::NGHTTP2_TLS_MIN_VERSION,
-          nghttp2::tls::NGHTTP2_TLS_MAX_VERSION) != 0) {
-    std::cerr << "Could not set TLS versions" << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  if (SSL_CTX_set_cipher_list(ssl_ctx, config.ciphers.c_str()) == 0) {
-    std::cerr << "SSL_CTX_set_cipher_list with " << config.ciphers
-              << " failed: " << ERR_error_string(ERR_get_error(), nullptr)
-              << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_proto_select_cb(ssl_ctx, client_select_next_proto_cb,
-                                   nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  std::vector<unsigned char> proto_list;
-  for (const auto &proto : config.npn_list) {
-    std::copy_n(proto.c_str(), proto.size(), std::back_inserter(proto_list));
-  }
-
-  SSL_CTX_set_alpn_protos(ssl_ctx, proto_list.data(), proto_list.size());
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  std::string user_agent = "h2load nghttp2/" NGHTTP2_VERSION;
-  Headers shared_nva;
-  shared_nva.emplace_back(":scheme", config.scheme);
-  if (config.port != config.default_port) {
-    shared_nva.emplace_back(":authority",
-                            config.host + ":" + util::utos(config.port));
-  } else {
-    shared_nva.emplace_back(":authority", config.host);
-  }
-  shared_nva.emplace_back(":method", config.data_fd == -1 ? "GET" : "POST");
-  shared_nva.emplace_back("user-agent", user_agent);
-
-  // list overridalbe headers
-  auto override_hdrs = make_array<std::string>(":authority", ":host", ":method",
-                                               ":scheme", "user-agent");
-
-  for (auto &kv : config.custom_headers) {
-    if (std::find(std::begin(override_hdrs), std::end(override_hdrs),
-                  kv.name) != std::end(override_hdrs)) {
-      // override header
-      for (auto &nv : shared_nva) {
-        if ((nv.name == ":authority" && kv.name == ":host") ||
-            (nv.name == kv.name)) {
-          nv.value = kv.value;
-        }
-      }
-    } else {
-      // add additional headers
-      shared_nva.push_back(kv);
-    }
-  }
-
-  std::string content_length_str;
-  if (config.data_fd != -1) {
-    content_length_str = util::utos(config.data_length);
-  }
-
-  auto method_it =
-      std::find_if(std::begin(shared_nva), std::end(shared_nva),
-                   [](const Header &nv) { return nv.name == ":method"; });
-  assert(method_it != std::end(shared_nva));
-
-  config.h1reqs.reserve(reqlines.size());
-  config.nva.reserve(reqlines.size());
-
-  for (auto &req : reqlines) {
-    // For HTTP/1.1
-    auto h1req = (*method_it).value;
-    h1req += ' ';
-    h1req += req;
-    h1req += " HTTP/1.1\r\n";
-    for (auto &nv : shared_nva) {
-      if (nv.name == ":authority") {
-        h1req += "Host: ";
-        h1req += nv.value;
-        h1req += "\r\n";
-        continue;
-      }
-      if (nv.name[0] == ':') {
-        continue;
-      }
-      h1req += nv.name;
-      h1req += ": ";
-      h1req += nv.value;
-      h1req += "\r\n";
-    }
-
-    if (!content_length_str.empty()) {
-      h1req += "Content-Length: ";
-      h1req += content_length_str;
-      h1req += "\r\n";
-    }
-    h1req += "\r\n";
-
-    config.h1reqs.push_back(std::move(h1req));
-
-    // For nghttp2
-    std::vector<nghttp2_nv> nva;
-    // 2 for :path, and possible content-length
-    nva.reserve(2 + shared_nva.size());
-
-    nva.push_back(http2::make_nv_ls(":path", req));
-
-    for (auto &nv : shared_nva) {
-      nva.push_back(http2::make_nv(nv.name, nv.value, false));
-    }
-
-    if (!content_length_str.empty()) {
-      nva.push_back(http2::make_nv(StringRef::from_lit("content-length"),
-                                   StringRef{content_length_str}));
-    }
-
-    config.nva.push_back(std::move(nva));
-  }
-
-  // Don't DOS our server!
-  if (config.host == "nghttp2.org") {
-    std::cerr << "Using h2load against public server " << config.host
-              << " should be prohibited." << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  resolve_host();
-
-  std::cout << "starting benchmark..." << std::endl;
-
-  std::vector<std::unique_ptr<Worker>> workers;
-  workers.reserve(config.nthreads);
-
-#ifndef NOTHREADS
-  size_t nreqs_per_thread = 0;
-  ssize_t nreqs_rem = 0;
-
-  if (!config.timing_script) {
-    nreqs_per_thread = config.nreqs / config.nthreads;
-    nreqs_rem = config.nreqs % config.nthreads;
-  }
-
-  size_t nclients_per_thread = config.nclients / config.nthreads;
-  ssize_t nclients_rem = config.nclients % config.nthreads;
-
-  size_t rate_per_thread = config.rate / config.nthreads;
-  ssize_t rate_per_thread_rem = config.rate % config.nthreads;
-
-  size_t max_samples_per_thread =
-      std::max(static_cast<size_t>(256), MAX_SAMPLES / config.nthreads);
-
-  std::mutex mu;
-  std::condition_variable cv;
-  auto ready = false;
-
-  std::vector<std::future<void>> futures;
-  for (size_t i = 0; i < config.nthreads; ++i) {
-    auto rate = rate_per_thread;
-    if (rate_per_thread_rem > 0) {
-      --rate_per_thread_rem;
-      ++rate;
-    }
-    auto nclients = nclients_per_thread;
-    if (nclients_rem > 0) {
-      --nclients_rem;
-      ++nclients;
-    }
-
-    size_t nreqs;
-    if (config.timing_script) {
-      // With timing script, each client issues config.nreqs requests.
-      // We divide nreqs by number of clients in Worker ctor to
-      // distribute requests to those clients evenly, so multiply
-      // config.nreqs here by config.nclients.
-      nreqs = config.nreqs * nclients;
-    } else {
-      nreqs = nreqs_per_thread;
-      if (nreqs_rem > 0) {
-        --nreqs_rem;
-        ++nreqs;
-      }
-    }
-
-    workers.push_back(create_worker(i, ssl_ctx, nreqs, nclients, rate,
-                                    max_samples_per_thread));
-    auto &worker = workers.back();
-    futures.push_back(
-        std::async(std::launch::async, [&worker, &mu, &cv, &ready]() {
-          {
-            std::unique_lock<std::mutex> ulk(mu);
-            cv.wait(ulk, [&ready] { return ready; });
-          }
-          worker->run();
-        }));
-  }
-
-  {
-    std::lock_guard<std::mutex> lg(mu);
-    ready = true;
-    cv.notify_all();
-  }
-
-  auto start = std::chrono::steady_clock::now();
-
-  for (auto &fut : futures) {
-    fut.get();
-  }
-
-#else  // NOTHREADS
-  auto rate = config.rate;
-  auto nclients = config.nclients;
-  auto nreqs =
-      config.timing_script ? config.nreqs * config.nclients : config.nreqs;
-
-  workers.push_back(
-      create_worker(0, ssl_ctx, nreqs, nclients, rate, MAX_SAMPLES));
-
-  auto start = std::chrono::steady_clock::now();
-
-  workers.back()->run();
-#endif // NOTHREADS
-
-  auto end = std::chrono::steady_clock::now();
-  auto duration =
-      std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-
-  Stats stats(0, 0);
-  for (const auto &w : workers) {
-    const auto &s = w->stats;
-
-    stats.req_todo += s.req_todo;
-    stats.req_started += s.req_started;
-    stats.req_done += s.req_done;
-    stats.req_timedout += s.req_timedout;
-    stats.req_success += s.req_success;
-    stats.req_status_success += s.req_status_success;
-    stats.req_failed += s.req_failed;
-    stats.req_error += s.req_error;
-    stats.bytes_total += s.bytes_total;
-    stats.bytes_head += s.bytes_head;
-    stats.bytes_head_decomp += s.bytes_head_decomp;
-    stats.bytes_body += s.bytes_body;
-
-    for (size_t i = 0; i < stats.status.size(); ++i) {
-      stats.status[i] += s.status[i];
-    }
-  }
-
-  auto ts = process_time_stats(workers);
-
-  // Requests which have not been issued due to connection errors, are
-  // counted towards req_failed and req_error.
-  auto req_not_issued =
-      (stats.req_todo - stats.req_status_success - stats.req_failed);
-  stats.req_failed += req_not_issued;
-  stats.req_error += req_not_issued;
-
-  // UI is heavily inspired by weighttp[1] and wrk[2]
-  //
-  // [1] https://github.com/lighttpd/weighttp
-  // [2] https://github.com/wg/wrk
-  double rps = 0;
-  int64_t bps = 0;
-  if (duration.count() > 0) {
-    if (config.is_timing_based_mode()) {
-      // we only want to consider the main duration if warm-up is given
-      rps = stats.req_success / config.duration;
-      bps = stats.bytes_total / config.duration;
-    } else {
-      auto secd = std::chrono::duration_cast<
-          std::chrono::duration<double, std::chrono::seconds::period>>(
-          duration);
-      rps = stats.req_success / secd.count();
-      bps = stats.bytes_total / secd.count();
-    }
-  }
-
-  double header_space_savings = 0.;
-  if (stats.bytes_head_decomp > 0) {
-    header_space_savings =
-        1. - static_cast<double>(stats.bytes_head) / stats.bytes_head_decomp;
-  }
-
-  std::cout << std::fixed << std::setprecision(2) << R"(
-finished in )"
-            << util::format_duration(duration) << ", " << rps << " req/s, "
-            << util::utos_funit(bps) << R"(B/s
-requests: )" << stats.req_todo
-            << " total, " << stats.req_started << " started, " << stats.req_done
-            << " done, " << stats.req_status_success << " succeeded, "
-            << stats.req_failed << " failed, " << stats.req_error
-            << " errored, " << stats.req_timedout << R"( timeout
-status codes: )"
-            << stats.status[2] << " 2xx, " << stats.status[3] << " 3xx, "
-            << stats.status[4] << " 4xx, " << stats.status[5] << R"( 5xx
-traffic: )" << util::utos_funit(stats.bytes_total)
-            << "B (" << stats.bytes_total << ") total, "
-            << util::utos_funit(stats.bytes_head) << "B (" << stats.bytes_head
-            << ") headers (space savings " << header_space_savings * 100
-            << "%), " << util::utos_funit(stats.bytes_body) << "B ("
-            << stats.bytes_body << R"() data
-                     min         max         mean         sd        +/- sd
-time for request: )"
-            << std::setw(10) << util::format_duration(ts.request.min) << "  "
-            << std::setw(10) << util::format_duration(ts.request.max) << "  "
-            << std::setw(10) << util::format_duration(ts.request.mean) << "  "
-            << std::setw(10) << util::format_duration(ts.request.sd)
-            << std::setw(9) << util::dtos(ts.request.within_sd) << "%"
-            << "\ntime for connect: " << std::setw(10)
-            << util::format_duration(ts.connect.min) << "  " << std::setw(10)
-            << util::format_duration(ts.connect.max) << "  " << std::setw(10)
-            << util::format_duration(ts.connect.mean) << "  " << std::setw(10)
-            << util::format_duration(ts.connect.sd) << std::setw(9)
-            << util::dtos(ts.connect.within_sd) << "%"
-            << "\ntime to 1st byte: " << std::setw(10)
-            << util::format_duration(ts.ttfb.min) << "  " << std::setw(10)
-            << util::format_duration(ts.ttfb.max) << "  " << std::setw(10)
-            << util::format_duration(ts.ttfb.mean) << "  " << std::setw(10)
-            << util::format_duration(ts.ttfb.sd) << std::setw(9)
-            << util::dtos(ts.ttfb.within_sd) << "%"
-            << "\nreq/s           : " << std::setw(10) << ts.rps.min << "  "
-            << std::setw(10) << ts.rps.max << "  " << std::setw(10)
-            << ts.rps.mean << "  " << std::setw(10) << ts.rps.sd << std::setw(9)
-            << util::dtos(ts.rps.within_sd) << "%" << std::endl;
-
-  SSL_CTX_free(ssl_ctx);
-
-  return 0;
-}
-
-} // namespace h2load
-
-int main(int argc, char **argv) { return h2load::main(argc, argv); }
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,401 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef H2LOAD_H
-#define H2LOAD_H
-
-#include "nghttp2_config.h"
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#include <sys/un.h>
-
-#include <vector>
-#include <string>
-#include <unordered_map>
-#include <memory>
-#include <chrono>
-#include <array>
-
-#include <nghttp2/nghttp2.h>
-
-#include <ev.h>
-
-#include <openssl/ssl.h>
-
-#include "http2.h"
-#include "memchunk.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace h2load {
-
-constexpr auto BACKOFF_WRITE_BUFFER_THRES = 16_k;
-
-class Session;
-struct Worker;
-
-struct Config {
-  std::vector<std::vector<nghttp2_nv>> nva;
-  std::vector<std::string> h1reqs;
-  std::vector<ev_tstamp> timings;
-  nghttp2::Headers custom_headers;
-  std::string scheme;
-  std::string host;
-  std::string ifile;
-  std::string ciphers;
-  // length of upload data
-  int64_t data_length;
-  addrinfo *addrs;
-  size_t nreqs;
-  size_t nclients;
-  size_t nthreads;
-  // The maximum number of concurrent streams per session.
-  ssize_t max_concurrent_streams;
-  size_t window_bits;
-  size_t connection_window_bits;
-  // rate at which connections should be made
-  size_t rate;
-  ev_tstamp rate_period;
-  // amount of time for main measurements in timing-based test
-  ev_tstamp duration;
-  // amount of time to wait before starting measurements in timing-based test
-  ev_tstamp warm_up_time;
-  // amount of time to wait for activity on a given connection
-  ev_tstamp conn_active_timeout;
-  // amount of time to wait after the last request is made on a connection
-  ev_tstamp conn_inactivity_timeout;
-  enum { PROTO_HTTP2, PROTO_HTTP1_1 } no_tls_proto;
-  uint32_t header_table_size;
-  uint32_t encoder_header_table_size;
-  // file descriptor for upload data
-  int data_fd;
-  uint16_t port;
-  uint16_t default_port;
-  bool verbose;
-  bool timing_script;
-  std::string base_uri;
-  // true if UNIX domain socket is used.  In this case, base_uri is
-  // not used in usual way.
-  bool base_uri_unix;
-  // used when UNIX domain socket is used (base_uri_unix is true).
-  sockaddr_un unix_addr;
-  // list of supported NPN/ALPN protocol strings in the order of
-  // preference.
-  std::vector<std::string> npn_list;
-
-  Config();
-  ~Config();
-
-  bool is_rate_mode() const;
-  bool is_timing_based_mode() const;
-  bool has_base_uri() const;
-};
-
-struct RequestStat {
-  // time point when request was sent
-  std::chrono::steady_clock::time_point request_time;
-  // time point when stream was closed
-  std::chrono::steady_clock::time_point stream_close_time;
-  // upload data length sent so far
-  int64_t data_offset;
-  // true if stream was successfully closed.  This means stream was
-  // not reset, but it does not mean HTTP level error (e.g., 404).
-  bool completed;
-};
-
-struct ClientStat {
-  // time client started (i.e., first connect starts)
-  std::chrono::steady_clock::time_point client_start_time;
-  // time client end (i.e., client somehow processed all requests it
-  // is responsible for, and disconnected)
-  std::chrono::steady_clock::time_point client_end_time;
-  // The number of requests completed successful, but not necessarily
-  // means successful HTTP status code.
-  size_t req_success;
-
-  // The following 3 numbers are overwritten each time when connection
-  // is made.
-
-  // time connect starts
-  std::chrono::steady_clock::time_point connect_start_time;
-  // time to connect
-  std::chrono::steady_clock::time_point connect_time;
-  // time to first byte (TTFB)
-  std::chrono::steady_clock::time_point ttfb;
-};
-
-struct SDStat {
-  // min, max, mean and sd (standard deviation)
-  double min, max, mean, sd;
-  // percentage of samples inside mean -/+ sd
-  double within_sd;
-};
-
-struct SDStats {
-  // time for request
-  SDStat request;
-  // time for connect
-  SDStat connect;
-  // time to first byte (TTFB)
-  SDStat ttfb;
-  // request per second for each client
-  SDStat rps;
-};
-
-struct Stats {
-  Stats(size_t req_todo, size_t nclients);
-  // The total number of requests
-  size_t req_todo;
-  // The number of requests issued so far
-  size_t req_started;
-  // The number of requests finished
-  size_t req_done;
-  // The number of requests completed successful, but not necessarily
-  // means successful HTTP status code.
-  size_t req_success;
-  // The number of requests marked as success.  HTTP status code is
-  // also considered as success. This is subset of req_done.
-  size_t req_status_success;
-  // The number of requests failed. This is subset of req_done.
-  size_t req_failed;
-  // The number of requests failed due to network errors. This is
-  // subset of req_failed.
-  size_t req_error;
-  // The number of requests that failed due to timeout.
-  size_t req_timedout;
-  // The number of bytes received on the "wire". If SSL/TLS is used,
-  // this is the number of decrypted bytes the application received.
-  int64_t bytes_total;
-  // The number of bytes received for header fields.  This is
-  // compressed version.
-  int64_t bytes_head;
-  // The number of bytes received for header fields after they are
-  // decompressed.
-  int64_t bytes_head_decomp;
-  // The number of bytes received in DATA frame.
-  int64_t bytes_body;
-  // The number of each HTTP status category, status[i] is status code
-  // in the range [i*100, (i+1)*100).
-  std::array<size_t, 6> status;
-  // The statistics per request
-  std::vector<RequestStat> req_stats;
-  // THe statistics per client
-  std::vector<ClientStat> client_stats;
-};
-
-enum ClientState { CLIENT_IDLE, CLIENT_CONNECTED };
-
-// This type tells whether the client is in warmup phase or not or is over
-enum class Phase {
-  INITIAL_IDLE,  // Initial idle state before warm-up phase
-  WARM_UP,       // Warm up phase when no measurements are done
-  MAIN_DURATION, // Main measurement phase; if timing-based
-                 // test is not run, this is the default phase
-  DURATION_OVER  // This phase occurs after the measurements are over
-};
-
-struct Client;
-
-// We use reservoir sampling method
-struct Sampling {
-  // maximum number of samples
-  size_t max_samples;
-  // number of samples seen, including discarded samples.
-  size_t n;
-};
-
-struct Worker {
-  MemchunkPool mcpool;
-  Stats stats;
-  Sampling request_times_smp;
-  Sampling client_smp;
-  struct ev_loop *loop;
-  SSL_CTX *ssl_ctx;
-  Config *config;
-  size_t progress_interval;
-  uint32_t id;
-  bool tls_info_report_done;
-  bool app_info_report_done;
-  size_t nconns_made;
-  // number of clients this worker handles
-  size_t nclients;
-  // number of requests each client issues
-  size_t nreqs_per_client;
-  // at most nreqs_rem clients get an extra request
-  size_t nreqs_rem;
-  size_t rate;
-  // maximum number of samples in this worker thread
-  size_t max_samples;
-  ev_timer timeout_watcher;
-  // The next client ID this worker assigns
-  uint32_t next_client_id;
-  // Keeps track of the current phase (for timing-based experiment) for the
-  // worker
-  Phase current_phase;
-  // We need to keep track of the clients in order to stop them when needed
-  std::vector<Client *> clients;
-  // This is only active when there is not a bounded number of requests
-  // specified
-  ev_timer duration_watcher;
-  ev_timer warmup_watcher;
-
-  Worker(uint32_t id, SSL_CTX *ssl_ctx, size_t nreq_todo, size_t nclients,
-         size_t rate, size_t max_samples, Config *config);
-  ~Worker();
-  Worker(Worker &&o) = default;
-  void run();
-  void sample_req_stat(RequestStat *req_stat);
-  void sample_client_stat(ClientStat *cstat);
-  void report_progress();
-  void report_rate_progress();
-  // This function calls the destructors of all the clients.
-  void stop_all_clients();
-  // This function frees a client from the list of clients for this Worker.
-  void free_client(Client *);
-};
-
-struct Stream {
-  RequestStat req_stat;
-  int status_success;
-  Stream();
-};
-
-struct Client {
-  DefaultMemchunks wb;
-  std::unordered_map<int32_t, Stream> streams;
-  ClientStat cstat;
-  std::unique_ptr<Session> session;
-  ev_io wev;
-  ev_io rev;
-  std::function<int(Client &)> readfn, writefn;
-  Worker *worker;
-  SSL *ssl;
-  ev_timer request_timeout_watcher;
-  addrinfo *next_addr;
-  // Address for the current address.  When try_new_connection() is
-  // used and current_addr is not nullptr, it is used instead of
-  // trying next address though next_addr.  To try new address, set
-  // nullptr to current_addr before calling connect().
-  addrinfo *current_addr;
-  size_t reqidx;
-  ClientState state;
-  // The number of requests this client has to issue.
-  size_t req_todo;
-  // The number of requests left to issue
-  size_t req_left;
-  // The number of requests currently have started, but not abandoned
-  // or finished.
-  size_t req_inflight;
-  // The number of requests this client has issued so far.
-  size_t req_started;
-  // The number of requests this client has done so far.
-  size_t req_done;
-  // The client id per worker
-  uint32_t id;
-  int fd;
-  ev_timer conn_active_watcher;
-  ev_timer conn_inactivity_watcher;
-  std::string selected_proto;
-  bool new_connection_requested;
-  // true if the current connection will be closed, and no more new
-  // request cannot be processed.
-  bool final;
-
-  enum { ERR_CONNECT_FAIL = -100 };
-
-  Client(uint32_t id, Worker *worker, size_t req_todo);
-  ~Client();
-  int make_socket(addrinfo *addr);
-  int connect();
-  void disconnect();
-  void fail();
-  // Call this function when do_read() returns -1.  This function
-  // tries to connect to the remote host again if it is requested.  If
-  // so, this function returns 0, and this object should be retained.
-  // Otherwise, this function returns -1, and this object should be
-  // deleted.
-  int try_again_or_fail();
-  void timeout();
-  void restart_timeout();
-  int submit_request();
-  void process_request_failure();
-  void process_timedout_streams();
-  void process_abandoned_streams();
-  void report_tls_info();
-  void report_app_info();
-  void terminate_session();
-  // Asks client to create new connection, instead of just fail.
-  void try_new_connection();
-
-  int do_read();
-  int do_write();
-
-  // low-level I/O callback functions called by do_read/do_write
-  int connected();
-  int read_clear();
-  int write_clear();
-  int tls_handshake();
-  int read_tls();
-  int write_tls();
-
-  int on_read(const uint8_t *data, size_t len);
-  int on_write();
-
-  int connection_made();
-
-  void on_request(int32_t stream_id);
-  void on_header(int32_t stream_id, const uint8_t *name, size_t namelen,
-                 const uint8_t *value, size_t valuelen);
-  void on_status_code(int32_t stream_id, uint16_t status);
-  // |success| == true means that the request/response was exchanged
-  // |successfully, but it does not mean response carried successful
-  // |HTTP status code.
-  void on_stream_close(int32_t stream_id, bool success, bool final = false);
-  // Returns RequestStat for |stream_id|.  This function must be
-  // called after on_request(stream_id), and before
-  // on_stream_close(stream_id, ...).  Otherwise, this will return
-  // nullptr.
-  RequestStat *get_req_stat(int32_t stream_id);
-
-  void record_request_time(RequestStat *req_stat);
-  void record_connect_start_time();
-  void record_connect_time();
-  void record_ttfb();
-  void clear_connect_times();
-  void record_client_start_time();
-  void record_client_end_time();
-
-  void signal_write();
-};
-
-} // namespace h2load
-
-#endif // H2LOAD_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 British Broadcasting Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "h2load_http1_session.h"
-
-#include <cassert>
-#include <cerrno>
-
-#include "h2load.h"
-#include "util.h"
-#include "template.h"
-
-#include <iostream>
-#include <fstream>
-
-#include "http-parser/http_parser.h"
-
-using namespace nghttp2;
-
-namespace h2load {
-
-Http1Session::Http1Session(Client *client)
-    : stream_req_counter_(1),
-      stream_resp_counter_(1),
-      client_(client),
-      htp_(),
-      complete_(false) {
-  http_parser_init(&htp_, HTTP_RESPONSE);
-  htp_.data = this;
-}
-
-Http1Session::~Http1Session() {}
-
-namespace {
-// HTTP response message begin
-int htp_msg_begincb(http_parser *htp) {
-  auto session = static_cast<Http1Session *>(htp->data);
-
-  if (session->stream_resp_counter_ > session->stream_req_counter_) {
-    return -1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// HTTP response status code
-int htp_statuscb(http_parser *htp, const char *at, size_t length) {
-  auto session = static_cast<Http1Session *>(htp->data);
-  auto client = session->get_client();
-  client->on_status_code(session->stream_resp_counter_, htp->status_code);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// HTTP response message complete
-int htp_msg_completecb(http_parser *htp) {
-  auto session = static_cast<Http1Session *>(htp->data);
-  auto client = session->get_client();
-
-  client->final = http_should_keep_alive(htp) == 0;
-  auto req_stat = client->get_req_stat(session->stream_resp_counter_);
-
-  assert(req_stat);
-
-  auto config = client->worker->config;
-  if (req_stat->data_offset >= config->data_length) {
-    client->on_stream_close(session->stream_resp_counter_, true, client->final);
-  }
-
-  session->stream_resp_counter_ += 2;
-
-  if (client->final) {
-    session->stream_req_counter_ = session->stream_resp_counter_;
-
-    http_parser_pause(htp, 1);
-    // Connection is going down.  If we have still request to do,
-    // create new connection and keep on doing the job.
-    if (client->req_left) {
-      client->try_new_connection();
-    }
-
-    return 0;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdr_keycb(http_parser *htp, const char *data, size_t len) {
-  auto session = static_cast<Http1Session *>(htp->data);
-  auto client = session->get_client();
-
-  client->worker->stats.bytes_head += len;
-  client->worker->stats.bytes_head_decomp += len;
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdr_valcb(http_parser *htp, const char *data, size_t len) {
-  auto session = static_cast<Http1Session *>(htp->data);
-  auto client = session->get_client();
-
-  client->worker->stats.bytes_head += len;
-  client->worker->stats.bytes_head_decomp += len;
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_body_cb(http_parser *htp, const char *data, size_t len) {
-  auto session = static_cast<Http1Session *>(htp->data);
-  auto client = session->get_client();
-
-  client->record_ttfb();
-  client->worker->stats.bytes_body += len;
-
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr http_parser_settings htp_hooks = {
-    htp_msg_begincb,   // http_cb      on_message_begin;
-    nullptr,           // http_data_cb on_url;
-    htp_statuscb,      // http_data_cb on_status;
-    htp_hdr_keycb,     // http_data_cb on_header_field;
-    htp_hdr_valcb,     // http_data_cb on_header_value;
-    nullptr,           // http_cb      on_headers_complete;
-    htp_body_cb,       // http_data_cb on_body;
-    htp_msg_completecb // http_cb      on_message_complete;
-};
-} // namespace
-
-void Http1Session::on_connect() { client_->signal_write(); }
-
-int Http1Session::submit_request() {
-  auto config = client_->worker->config;
-  const auto &req = config->h1reqs[client_->reqidx];
-  client_->reqidx++;
-
-  if (client_->reqidx == config->h1reqs.size()) {
-    client_->reqidx = 0;
-  }
-
-  client_->on_request(stream_req_counter_);
-
-  auto req_stat = client_->get_req_stat(stream_req_counter_);
-
-  client_->record_request_time(req_stat);
-  client_->wb.append(req);
-
-  if (config->data_fd == -1 || config->data_length == 0) {
-    // increment for next request
-    stream_req_counter_ += 2;
-
-    return 0;
-  }
-
-  return on_write();
-}
-
-int Http1Session::on_read(const uint8_t *data, size_t len) {
-  auto nread = http_parser_execute(&htp_, &htp_hooks,
-                                   reinterpret_cast<const char *>(data), len);
-
-  if (client_->worker->config->verbose) {
-    std::cout.write(reinterpret_cast<const char *>(data), nread);
-  }
-
-  auto htperr = HTTP_PARSER_ERRNO(&htp_);
-
-  if (htperr == HPE_PAUSED) {
-    // pause is done only when connection: close is requested
-    return -1;
-  }
-
-  if (htperr != HPE_OK) {
-    std::cerr << "[ERROR] HTTP parse error: "
-              << "(" << http_errno_name(htperr) << ") "
-              << http_errno_description(htperr) << std::endl;
-    return -1;
-  }
-
-  return 0;
-}
-
-int Http1Session::on_write() {
-  if (complete_) {
-    return -1;
-  }
-
-  auto config = client_->worker->config;
-  auto req_stat = client_->get_req_stat(stream_req_counter_);
-  if (!req_stat) {
-    return 0;
-  }
-
-  if (req_stat->data_offset < config->data_length) {
-    auto req_stat = client_->get_req_stat(stream_req_counter_);
-    auto &wb = client_->wb;
-
-    // TODO unfortunately, wb has no interface to use with read(2)
-    // family functions.
-    std::array<uint8_t, 16_k> buf;
-
-    ssize_t nread;
-    while ((nread = pread(config->data_fd, buf.data(), buf.size(),
-                          req_stat->data_offset)) == -1 &&
-           errno == EINTR)
-      ;
-
-    if (nread == -1) {
-      return -1;
-    }
-
-    req_stat->data_offset += nread;
-
-    wb.append(buf.data(), nread);
-
-    if (client_->worker->config->verbose) {
-      std::cout << "[send " << nread << " byte(s)]" << std::endl;
-    }
-
-    if (req_stat->data_offset == config->data_length) {
-      // increment for next request
-      stream_req_counter_ += 2;
-
-      if (stream_resp_counter_ == stream_req_counter_) {
-        // Response has already been received
-        client_->on_stream_close(stream_resp_counter_ - 2, true,
-                                 client_->final);
-      }
-    }
-  }
-
-  return 0;
-}
-
-void Http1Session::terminate() { complete_ = true; }
-
-Client *Http1Session::get_client() { return client_; }
-
-size_t Http1Session::max_concurrent_streams() {
-  auto config = client_->worker->config;
-
-  return config->data_fd == -1 ? config->max_concurrent_streams : 1;
-}
-
-} // namespace h2load
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http1_session.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 British Broadcasting Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef H2LOAD_HTTP1_SESSION_H
-#define H2LOAD_HTTP1_SESSION_H
-
-#include "h2load_session.h"
-
-#include <nghttp2/nghttp2.h>
-
-namespace h2load {
-
-struct Client;
-
-class Http1Session : public Session {
-public:
-  Http1Session(Client *client);
-  virtual ~Http1Session();
-  virtual void on_connect();
-  virtual int submit_request();
-  virtual int on_read(const uint8_t *data, size_t len);
-  virtual int on_write();
-  virtual void terminate();
-  virtual size_t max_concurrent_streams();
-  Client *get_client();
-  int32_t stream_req_counter_;
-  int32_t stream_resp_counter_;
-
-private:
-  Client *client_;
-  http_parser htp_;
-  bool complete_;
-};
-
-} // namespace h2load
-
-#endif // H2LOAD_HTTP1_SESSION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,328 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "h2load_http2_session.h"
-
-#include <cassert>
-#include <cerrno>
-#include <iostream>
-
-#include "h2load.h"
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace h2load {
-
-Http2Session::Http2Session(Client *client)
-    : client_(client), session_(nullptr) {}
-
-Http2Session::~Http2Session() { nghttp2_session_del(session_); }
-
-namespace {
-int on_header_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                       const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen, uint8_t flags,
-                       void *user_data) {
-  auto client = static_cast<Client *>(user_data);
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_RESPONSE) {
-    return 0;
-  }
-  client->on_header(frame->hd.stream_id, name, namelen, value, valuelen);
-  client->worker->stats.bytes_head_decomp += namelen + valuelen;
-
-  if (client->worker->config->verbose) {
-    std::cout << "[stream_id=" << frame->hd.stream_id << "] ";
-    std::cout.write(reinterpret_cast<const char *>(name), namelen);
-    std::cout << ": ";
-    std::cout.write(reinterpret_cast<const char *>(value), valuelen);
-    std::cout << "\n";
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto client = static_cast<Client *>(user_data);
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_RESPONSE) {
-    return 0;
-  }
-  client->worker->stats.bytes_head +=
-      frame->hd.length - frame->headers.padlen -
-      ((frame->hd.flags & NGHTTP2_FLAG_PRIORITY) ? 5 : 0);
-  if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-    client->record_ttfb();
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto client = static_cast<Client *>(user_data);
-  client->record_ttfb();
-  client->worker->stats.bytes_body += len;
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto client = static_cast<Client *>(user_data);
-  client->on_stream_close(stream_id, error_code == NGHTTP2_NO_ERROR);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_not_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, int lib_error_code,
-                               void *user_data) {
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto client = static_cast<Client *>(user_data);
-  // request was not sent.  Mark it as error.
-  client->on_stream_close(frame->hd.stream_id, false);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int before_frame_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, void *user_data) {
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto client = static_cast<Client *>(user_data);
-  auto req_stat = client->get_req_stat(frame->hd.stream_id);
-  assert(req_stat);
-  client->record_request_time(req_stat);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source, void *user_data) {
-  auto client = static_cast<Client *>(user_data);
-  auto config = client->worker->config;
-  auto req_stat = client->get_req_stat(stream_id);
-  assert(req_stat);
-  ssize_t nread;
-  while ((nread = pread(config->data_fd, buf, length, req_stat->data_offset)) ==
-             -1 &&
-         errno == EINTR)
-    ;
-
-  if (nread == -1) {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-
-  req_stat->data_offset += nread;
-
-  if (req_stat->data_offset == config->data_length) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-    return nread;
-  }
-
-  if (req_stat->data_offset > config->data_length || nread == 0) {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-
-  return nread;
-}
-
-} // namespace
-
-namespace {
-ssize_t send_callback(nghttp2_session *session, const uint8_t *data,
-                      size_t length, int flags, void *user_data) {
-  auto client = static_cast<Client *>(user_data);
-  auto &wb = client->wb;
-
-  if (wb.rleft() >= BACKOFF_WRITE_BUFFER_THRES) {
-    return NGHTTP2_ERR_WOULDBLOCK;
-  }
-
-  return wb.append(data, length);
-}
-} // namespace
-
-void Http2Session::on_connect() {
-  int rv;
-
-  // This is required with --disable-assert.
-  (void)rv;
-
-  nghttp2_session_callbacks *callbacks;
-
-  nghttp2_session_callbacks_new(&callbacks);
-
-  auto callbacks_deleter = defer(nghttp2_session_callbacks_del, callbacks);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-
-  nghttp2_session_callbacks_set_on_frame_not_send_callback(
-      callbacks, on_frame_not_send_callback);
-
-  nghttp2_session_callbacks_set_before_frame_send_callback(
-      callbacks, before_frame_send_callback);
-
-  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
-
-  nghttp2_option *opt;
-
-  rv = nghttp2_option_new(&opt);
-  assert(rv == 0);
-
-  auto config = client_->worker->config;
-
-  if (config->encoder_header_table_size != NGHTTP2_DEFAULT_HEADER_TABLE_SIZE) {
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        opt, config->encoder_header_table_size);
-  }
-
-  nghttp2_session_client_new2(&session_, callbacks, client_, opt);
-
-  nghttp2_option_del(opt);
-
-  std::array<nghttp2_settings_entry, 3> iv;
-  size_t niv = 2;
-  iv[0].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-  iv[0].value = 0;
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = (1 << config->window_bits) - 1;
-
-  if (config->header_table_size != NGHTTP2_DEFAULT_HEADER_TABLE_SIZE) {
-    iv[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-    iv[niv].value = config->header_table_size;
-    ++niv;
-  }
-
-  rv = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, iv.data(), niv);
-
-  assert(rv == 0);
-
-  auto connection_window = (1 << config->connection_window_bits) - 1;
-  nghttp2_session_set_local_window_size(session_, NGHTTP2_FLAG_NONE, 0,
-                                        connection_window);
-
-  client_->signal_write();
-}
-
-int Http2Session::submit_request() {
-  if (nghttp2_session_check_request_allowed(session_) == 0) {
-    return -1;
-  }
-
-  auto config = client_->worker->config;
-  auto &nva = config->nva[client_->reqidx++];
-
-  if (client_->reqidx == config->nva.size()) {
-    client_->reqidx = 0;
-  }
-
-  nghttp2_data_provider prd{{0}, file_read_callback};
-
-  auto stream_id =
-      nghttp2_submit_request(session_, nullptr, nva.data(), nva.size(),
-                             config->data_fd == -1 ? nullptr : &prd, nullptr);
-  if (stream_id < 0) {
-    return -1;
-  }
-
-  client_->on_request(stream_id);
-
-  return 0;
-}
-
-int Http2Session::on_read(const uint8_t *data, size_t len) {
-  auto rv = nghttp2_session_mem_recv(session_, data, len);
-  if (rv < 0) {
-    return -1;
-  }
-
-  assert(static_cast<size_t>(rv) == len);
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && client_->wb.rleft() == 0) {
-    return -1;
-  }
-
-  client_->signal_write();
-
-  return 0;
-}
-
-int Http2Session::on_write() {
-  auto rv = nghttp2_session_send(session_);
-  if (rv != 0) {
-    return -1;
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && client_->wb.rleft() == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-void Http2Session::terminate() {
-  nghttp2_session_terminate_session(session_, NGHTTP2_NO_ERROR);
-}
-
-size_t Http2Session::max_concurrent_streams() {
-  return (size_t)client_->worker->config->max_concurrent_streams;
-}
-
-} // namespace h2load
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_http2_session.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef H2LOAD_HTTP2_SESSION_H
-#define H2LOAD_HTTP2_SESSION_H
-
-#include "h2load_session.h"
-
-#include <nghttp2/nghttp2.h>
-
-namespace h2load {
-
-struct Client;
-
-class Http2Session : public Session {
-public:
-  Http2Session(Client *client);
-  virtual ~Http2Session();
-  virtual void on_connect();
-  virtual int submit_request();
-  virtual int on_read(const uint8_t *data, size_t len);
-  virtual int on_write();
-  virtual void terminate();
-  virtual size_t max_concurrent_streams();
-
-private:
-  Client *client_;
-  nghttp2_session *session_;
-};
-
-} // namespace h2load
-
-#endif // H2LOAD_HTTP2_SESSION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_session.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_session.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/h2load_session.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/h2load_session.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef H2LOAD_SESSION_H
-#define H2LOAD_SESSION_H
-
-#include "nghttp2_config.h"
-
-#include <sys/types.h>
-
-#include <cinttypes>
-
-#include "h2load.h"
-
-namespace h2load {
-
-class Session {
-public:
-  virtual ~Session() {}
-  // Called when the connection was made.
-  virtual void on_connect() = 0;
-  // Called when one request must be issued.
-  virtual int submit_request() = 0;
-  // Called when incoming bytes are available. The subclass has to
-  // return the number of bytes read.
-  virtual int on_read(const uint8_t *data, size_t len) = 0;
-  // Called when write is available. Returns 0 on success, otherwise
-  // return -1.
-  virtual int on_write() = 0;
-  // Called when the underlying session must be terminated.
-  virtual void terminate() = 0;
-  // Return the maximum concurrency per connection
-  virtual size_t max_concurrent_streams() = 0;
-};
-
-} // namespace h2load
-
-#endif // H2LOAD_SESSION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "HtmlParser.h"
-
-#include <libxml/uri.h>
-
-#include "util.h"
-
-namespace nghttp2 {
-
-ParserData::ParserData(const std::string &base_uri)
-    : base_uri(base_uri), inside_head(0) {}
-
-HtmlParser::HtmlParser(const std::string &base_uri)
-    : base_uri_(base_uri), parser_ctx_(nullptr), parser_data_(base_uri) {}
-
-HtmlParser::~HtmlParser() { htmlFreeParserCtxt(parser_ctx_); }
-
-namespace {
-StringRef get_attr(const xmlChar **attrs, const StringRef &name) {
-  if (attrs == nullptr) {
-    return StringRef{};
-  }
-  for (; *attrs; attrs += 2) {
-    if (util::strieq(StringRef{attrs[0], strlen(reinterpret_cast<const char *>(
-                                             attrs[0]))},
-                     name)) {
-      return StringRef{attrs[1],
-                       strlen(reinterpret_cast<const char *>(attrs[1]))};
-    }
-  }
-  return StringRef{};
-}
-} // namespace
-
-namespace {
-ResourceType
-get_resource_type_for_preload_as(const StringRef &attribute_value) {
-  if (util::strieq_l("image", attribute_value)) {
-    return REQ_IMG;
-  } else if (util::strieq_l("style", attribute_value)) {
-    return REQ_CSS;
-  } else if (util::strieq_l("script", attribute_value)) {
-    return REQ_UNBLOCK_JS;
-  } else {
-    return REQ_OTHERS;
-  }
-}
-} // namespace
-
-namespace {
-void add_link(ParserData *parser_data, const StringRef &uri,
-              ResourceType res_type) {
-  auto u = xmlBuildURI(
-      reinterpret_cast<const xmlChar *>(uri.c_str()),
-      reinterpret_cast<const xmlChar *>(parser_data->base_uri.c_str()));
-  if (u) {
-    parser_data->links.push_back(
-        std::make_pair(reinterpret_cast<char *>(u), res_type));
-    free(u);
-  }
-}
-} // namespace
-
-namespace {
-void start_element_func(void *user_data, const xmlChar *src_name,
-                        const xmlChar **attrs) {
-  auto parser_data = static_cast<ParserData *>(user_data);
-  auto name =
-      StringRef{src_name, strlen(reinterpret_cast<const char *>(src_name))};
-  if (util::strieq_l("head", name)) {
-    ++parser_data->inside_head;
-  }
-  if (util::strieq_l("link", name)) {
-    auto rel_attr = get_attr(attrs, StringRef::from_lit("rel"));
-    auto href_attr = get_attr(attrs, StringRef::from_lit("href"));
-    if (rel_attr.empty() || href_attr.empty()) {
-      return;
-    }
-    if (util::strieq_l("shortcut icon", rel_attr)) {
-      add_link(parser_data, href_attr, REQ_OTHERS);
-    } else if (util::strieq_l("stylesheet", rel_attr)) {
-      add_link(parser_data, href_attr, REQ_CSS);
-    } else if (util::strieq_l("preload", rel_attr)) {
-      auto as_attr = get_attr(attrs, StringRef::from_lit("as"));
-      if (as_attr.empty()) {
-        return;
-      }
-      add_link(parser_data, href_attr,
-               get_resource_type_for_preload_as(as_attr));
-    }
-  } else if (util::strieq_l("img", name)) {
-    auto src_attr = get_attr(attrs, StringRef::from_lit("src"));
-    if (src_attr.empty()) {
-      return;
-    }
-    add_link(parser_data, src_attr, REQ_IMG);
-  } else if (util::strieq_l("script", name)) {
-    auto src_attr = get_attr(attrs, StringRef::from_lit("src"));
-    if (src_attr.empty()) {
-      return;
-    }
-    if (parser_data->inside_head) {
-      add_link(parser_data, src_attr, REQ_JS);
-    } else {
-      add_link(parser_data, src_attr, REQ_UNBLOCK_JS);
-    }
-  }
-}
-} // namespace
-
-namespace {
-void end_element_func(void *user_data, const xmlChar *name) {
-  auto parser_data = static_cast<ParserData *>(user_data);
-  if (util::strieq_l(
-          "head",
-          StringRef{name, strlen(reinterpret_cast<const char *>(name))})) {
-    --parser_data->inside_head;
-  }
-}
-} // namespace
-
-namespace {
-xmlSAXHandler saxHandler = {
-    nullptr,             // internalSubsetSAXFunc
-    nullptr,             // isStandaloneSAXFunc
-    nullptr,             // hasInternalSubsetSAXFunc
-    nullptr,             // hasExternalSubsetSAXFunc
-    nullptr,             // resolveEntitySAXFunc
-    nullptr,             // getEntitySAXFunc
-    nullptr,             // entityDeclSAXFunc
-    nullptr,             // notationDeclSAXFunc
-    nullptr,             // attributeDeclSAXFunc
-    nullptr,             // elementDeclSAXFunc
-    nullptr,             // unparsedEntityDeclSAXFunc
-    nullptr,             // setDocumentLocatorSAXFunc
-    nullptr,             // startDocumentSAXFunc
-    nullptr,             // endDocumentSAXFunc
-    &start_element_func, // startElementSAXFunc
-    &end_element_func,   // endElementSAXFunc
-    nullptr,             // referenceSAXFunc
-    nullptr,             // charactersSAXFunc
-    nullptr,             // ignorableWhitespaceSAXFunc
-    nullptr,             // processingInstructionSAXFunc
-    nullptr,             // commentSAXFunc
-    nullptr,             // warningSAXFunc
-    nullptr,             // errorSAXFunc
-    nullptr,             // fatalErrorSAXFunc
-    nullptr,             // getParameterEntitySAXFunc
-    nullptr,             // cdataBlockSAXFunc
-    nullptr,             // externalSubsetSAXFunc
-    0,                   // unsigned int initialized
-    nullptr,             // void * _private
-    nullptr,             // startElementNsSAX2Func
-    nullptr,             // endElementNsSAX2Func
-    nullptr,             // xmlStructuredErrorFunc
-};
-} // namespace
-
-int HtmlParser::parse_chunk(const char *chunk, size_t size, int fin) {
-  if (!parser_ctx_) {
-    parser_ctx_ =
-        htmlCreatePushParserCtxt(&saxHandler, &parser_data_, chunk, size,
-                                 base_uri_.c_str(), XML_CHAR_ENCODING_NONE);
-    if (!parser_ctx_) {
-      return -1;
-    } else {
-      if (fin) {
-        return parse_chunk_internal(nullptr, 0, fin);
-      } else {
-        return 0;
-      }
-    }
-  } else {
-    return parse_chunk_internal(chunk, size, fin);
-  }
-}
-
-int HtmlParser::parse_chunk_internal(const char *chunk, size_t size, int fin) {
-  int rv = htmlParseChunk(parser_ctx_, chunk, size, fin);
-  if (rv == 0) {
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
-const std::vector<std::pair<std::string, ResourceType>> &
-HtmlParser::get_links() const {
-  return parser_data_.links;
-}
-
-void HtmlParser::clear_links() { parser_data_.links.clear(); }
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HtmlParser.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef HTML_PARSER_H
-#define HTML_PARSER_H
-
-#include "nghttp2_config.h"
-
-#include <vector>
-#include <string>
-
-#ifdef HAVE_LIBXML2
-
-#  include <libxml/HTMLparser.h>
-
-#endif // HAVE_LIBXML2
-
-namespace nghttp2 {
-
-enum ResourceType {
-  REQ_CSS = 1,
-  REQ_JS,
-  REQ_UNBLOCK_JS,
-  REQ_IMG,
-  REQ_OTHERS,
-};
-
-struct ParserData {
-  std::string base_uri;
-  std::vector<std::pair<std::string, ResourceType>> links;
-  // > 0 if we are inside "head" element.
-  int inside_head;
-  ParserData(const std::string &base_uri);
-};
-
-#ifdef HAVE_LIBXML2
-
-class HtmlParser {
-public:
-  HtmlParser(const std::string &base_uri);
-  ~HtmlParser();
-  int parse_chunk(const char *chunk, size_t size, int fin);
-  const std::vector<std::pair<std::string, ResourceType>> &get_links() const;
-  void clear_links();
-
-private:
-  int parse_chunk_internal(const char *chunk, size_t size, int fin);
-
-  std::string base_uri_;
-  htmlParserCtxtPtr parser_ctx_;
-  ParserData parser_data_;
-};
-
-#else // !HAVE_LIBXML2
-
-class HtmlParser {
-public:
-  HtmlParser(const std::string &base_uri) {}
-  int parse_chunk(const char *chunk, size_t size, int fin) { return 0; }
-  const std::vector<std::pair<std::string, ResourceType>> &get_links() const {
-    return links_;
-  }
-  void clear_links() {}
-
-private:
-  std::vector<std::pair<std::string, ResourceType>> links_;
-};
-
-#endif // !HAVE_LIBXML2
-
-} // namespace nghttp2
-
-#endif // HTML_PARSER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1834 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "http2.h"
-
-#include "util.h"
-
-namespace nghttp2 {
-
-namespace http2 {
-
-StringRef get_reason_phrase(unsigned int status_code) {
-  switch (status_code) {
-  case 100:
-    return StringRef::from_lit("Continue");
-  case 101:
-    return StringRef::from_lit("Switching Protocols");
-  case 103:
-    return StringRef::from_lit("Early Hints");
-  case 200:
-    return StringRef::from_lit("OK");
-  case 201:
-    return StringRef::from_lit("Created");
-  case 202:
-    return StringRef::from_lit("Accepted");
-  case 203:
-    return StringRef::from_lit("Non-Authoritative Information");
-  case 204:
-    return StringRef::from_lit("No Content");
-  case 205:
-    return StringRef::from_lit("Reset Content");
-  case 206:
-    return StringRef::from_lit("Partial Content");
-  case 300:
-    return StringRef::from_lit("Multiple Choices");
-  case 301:
-    return StringRef::from_lit("Moved Permanently");
-  case 302:
-    return StringRef::from_lit("Found");
-  case 303:
-    return StringRef::from_lit("See Other");
-  case 304:
-    return StringRef::from_lit("Not Modified");
-  case 305:
-    return StringRef::from_lit("Use Proxy");
-  // case 306: return StringRef::from_lit("(Unused)");
-  case 307:
-    return StringRef::from_lit("Temporary Redirect");
-  case 308:
-    return StringRef::from_lit("Permanent Redirect");
-  case 400:
-    return StringRef::from_lit("Bad Request");
-  case 401:
-    return StringRef::from_lit("Unauthorized");
-  case 402:
-    return StringRef::from_lit("Payment Required");
-  case 403:
-    return StringRef::from_lit("Forbidden");
-  case 404:
-    return StringRef::from_lit("Not Found");
-  case 405:
-    return StringRef::from_lit("Method Not Allowed");
-  case 406:
-    return StringRef::from_lit("Not Acceptable");
-  case 407:
-    return StringRef::from_lit("Proxy Authentication Required");
-  case 408:
-    return StringRef::from_lit("Request Timeout");
-  case 409:
-    return StringRef::from_lit("Conflict");
-  case 410:
-    return StringRef::from_lit("Gone");
-  case 411:
-    return StringRef::from_lit("Length Required");
-  case 412:
-    return StringRef::from_lit("Precondition Failed");
-  case 413:
-    return StringRef::from_lit("Payload Too Large");
-  case 414:
-    return StringRef::from_lit("URI Too Long");
-  case 415:
-    return StringRef::from_lit("Unsupported Media Type");
-  case 416:
-    return StringRef::from_lit("Requested Range Not Satisfiable");
-  case 417:
-    return StringRef::from_lit("Expectation Failed");
-  case 421:
-    return StringRef::from_lit("Misdirected Request");
-  case 425:
-    // https://tools.ietf.org/html/draft-ietf-httpbis-replay-02
-    return StringRef::from_lit("Too Early");
-  case 426:
-    return StringRef::from_lit("Upgrade Required");
-  case 428:
-    return StringRef::from_lit("Precondition Required");
-  case 429:
-    return StringRef::from_lit("Too Many Requests");
-  case 431:
-    return StringRef::from_lit("Request Header Fields Too Large");
-  case 451:
-    return StringRef::from_lit("Unavailable For Legal Reasons");
-  case 500:
-    return StringRef::from_lit("Internal Server Error");
-  case 501:
-    return StringRef::from_lit("Not Implemented");
-  case 502:
-    return StringRef::from_lit("Bad Gateway");
-  case 503:
-    return StringRef::from_lit("Service Unavailable");
-  case 504:
-    return StringRef::from_lit("Gateway Timeout");
-  case 505:
-    return StringRef::from_lit("HTTP Version Not Supported");
-  case 511:
-    return StringRef::from_lit("Network Authentication Required");
-  default:
-    return StringRef{};
-  }
-}
-
-StringRef stringify_status(BlockAllocator &balloc, unsigned int status_code) {
-  switch (status_code) {
-  case 100:
-    return StringRef::from_lit("100");
-  case 101:
-    return StringRef::from_lit("101");
-  case 103:
-    return StringRef::from_lit("103");
-  case 200:
-    return StringRef::from_lit("200");
-  case 201:
-    return StringRef::from_lit("201");
-  case 202:
-    return StringRef::from_lit("202");
-  case 203:
-    return StringRef::from_lit("203");
-  case 204:
-    return StringRef::from_lit("204");
-  case 205:
-    return StringRef::from_lit("205");
-  case 206:
-    return StringRef::from_lit("206");
-  case 300:
-    return StringRef::from_lit("300");
-  case 301:
-    return StringRef::from_lit("301");
-  case 302:
-    return StringRef::from_lit("302");
-  case 303:
-    return StringRef::from_lit("303");
-  case 304:
-    return StringRef::from_lit("304");
-  case 305:
-    return StringRef::from_lit("305");
-  // case 306: return StringRef::from_lit("306");
-  case 307:
-    return StringRef::from_lit("307");
-  case 308:
-    return StringRef::from_lit("308");
-  case 400:
-    return StringRef::from_lit("400");
-  case 401:
-    return StringRef::from_lit("401");
-  case 402:
-    return StringRef::from_lit("402");
-  case 403:
-    return StringRef::from_lit("403");
-  case 404:
-    return StringRef::from_lit("404");
-  case 405:
-    return StringRef::from_lit("405");
-  case 406:
-    return StringRef::from_lit("406");
-  case 407:
-    return StringRef::from_lit("407");
-  case 408:
-    return StringRef::from_lit("408");
-  case 409:
-    return StringRef::from_lit("409");
-  case 410:
-    return StringRef::from_lit("410");
-  case 411:
-    return StringRef::from_lit("411");
-  case 412:
-    return StringRef::from_lit("412");
-  case 413:
-    return StringRef::from_lit("413");
-  case 414:
-    return StringRef::from_lit("414");
-  case 415:
-    return StringRef::from_lit("415");
-  case 416:
-    return StringRef::from_lit("416");
-  case 417:
-    return StringRef::from_lit("417");
-  case 421:
-    return StringRef::from_lit("421");
-  case 426:
-    return StringRef::from_lit("426");
-  case 428:
-    return StringRef::from_lit("428");
-  case 429:
-    return StringRef::from_lit("429");
-  case 431:
-    return StringRef::from_lit("431");
-  case 451:
-    return StringRef::from_lit("451");
-  case 500:
-    return StringRef::from_lit("500");
-  case 501:
-    return StringRef::from_lit("501");
-  case 502:
-    return StringRef::from_lit("502");
-  case 503:
-    return StringRef::from_lit("503");
-  case 504:
-    return StringRef::from_lit("504");
-  case 505:
-    return StringRef::from_lit("505");
-  case 511:
-    return StringRef::from_lit("511");
-  default:
-    return util::make_string_ref_uint(balloc, status_code);
-  }
-}
-
-void capitalize(DefaultMemchunks *buf, const StringRef &s) {
-  buf->append(util::upcase(s[0]));
-  for (size_t i = 1; i < s.size(); ++i) {
-    if (s[i - 1] == '-') {
-      buf->append(util::upcase(s[i]));
-    } else {
-      buf->append(s[i]);
-    }
-  }
-}
-
-bool lws(const char *value) {
-  for (; *value; ++value) {
-    switch (*value) {
-    case '\t':
-    case ' ':
-      continue;
-    default:
-      return false;
-    }
-  }
-  return true;
-}
-
-void copy_url_component(std::string &dest, const http_parser_url *u, int field,
-                        const char *url) {
-  if (u->field_set & (1 << field)) {
-    dest.assign(url + u->field_data[field].off, u->field_data[field].len);
-  }
-}
-
-Headers::value_type to_header(const uint8_t *name, size_t namelen,
-                              const uint8_t *value, size_t valuelen,
-                              bool no_index, int32_t token) {
-  return Header(std::string(reinterpret_cast<const char *>(name), namelen),
-                std::string(reinterpret_cast<const char *>(value), valuelen),
-                no_index, token);
-}
-
-void add_header(Headers &nva, const uint8_t *name, size_t namelen,
-                const uint8_t *value, size_t valuelen, bool no_index,
-                int32_t token) {
-  if (valuelen > 0) {
-    size_t i, j;
-    for (i = 0; i < valuelen && (value[i] == ' ' || value[i] == '\t'); ++i)
-      ;
-    for (j = valuelen - 1; j > i && (value[j] == ' ' || value[j] == '\t'); --j)
-      ;
-    value += i;
-    valuelen -= i + (valuelen - j - 1);
-  }
-  nva.push_back(to_header(name, namelen, value, valuelen, no_index, token));
-}
-
-const Headers::value_type *get_header(const Headers &nva, const char *name) {
-  const Headers::value_type *res = nullptr;
-  for (auto &nv : nva) {
-    if (nv.name == name) {
-      res = &nv;
-    }
-  }
-  return res;
-}
-
-bool non_empty_value(const HeaderRefs::value_type *nv) {
-  return nv && !nv->value.empty();
-}
-
-namespace {
-nghttp2_nv make_nv_internal(const std::string &name, const std::string &value,
-                            bool no_index, uint8_t nv_flags) {
-  uint8_t flags;
-
-  flags =
-      nv_flags | (no_index ? NGHTTP2_NV_FLAG_NO_INDEX : NGHTTP2_NV_FLAG_NONE);
-
-  return {(uint8_t *)name.c_str(), (uint8_t *)value.c_str(), name.size(),
-          value.size(), flags};
-}
-} // namespace
-
-namespace {
-nghttp2_nv make_nv_internal(const StringRef &name, const StringRef &value,
-                            bool no_index, uint8_t nv_flags) {
-  uint8_t flags;
-
-  flags =
-      nv_flags | (no_index ? NGHTTP2_NV_FLAG_NO_INDEX : NGHTTP2_NV_FLAG_NONE);
-
-  return {(uint8_t *)name.c_str(), (uint8_t *)value.c_str(), name.size(),
-          value.size(), flags};
-}
-} // namespace
-
-nghttp2_nv make_nv(const std::string &name, const std::string &value,
-                   bool no_index) {
-  return make_nv_internal(name, value, no_index, NGHTTP2_NV_FLAG_NONE);
-}
-
-nghttp2_nv make_nv(const StringRef &name, const StringRef &value,
-                   bool no_index) {
-  return make_nv_internal(name, value, no_index, NGHTTP2_NV_FLAG_NONE);
-}
-
-nghttp2_nv make_nv_nocopy(const std::string &name, const std::string &value,
-                          bool no_index) {
-  return make_nv_internal(name, value, no_index,
-                          NGHTTP2_NV_FLAG_NO_COPY_NAME |
-                              NGHTTP2_NV_FLAG_NO_COPY_VALUE);
-}
-
-nghttp2_nv make_nv_nocopy(const StringRef &name, const StringRef &value,
-                          bool no_index) {
-  return make_nv_internal(name, value, no_index,
-                          NGHTTP2_NV_FLAG_NO_COPY_NAME |
-                              NGHTTP2_NV_FLAG_NO_COPY_VALUE);
-}
-
-namespace {
-void copy_headers_to_nva_internal(std::vector<nghttp2_nv> &nva,
-                                  const HeaderRefs &headers, uint8_t nv_flags,
-                                  uint32_t flags) {
-  auto it_forwarded = std::end(headers);
-  auto it_xff = std::end(headers);
-  auto it_xfp = std::end(headers);
-  auto it_via = std::end(headers);
-
-  for (auto it = std::begin(headers); it != std::end(headers); ++it) {
-    auto kv = &(*it);
-    if (kv->name.empty() || kv->name[0] == ':') {
-      continue;
-    }
-    switch (kv->token) {
-    case HD_COOKIE:
-    case HD_CONNECTION:
-    case HD_HOST:
-    case HD_HTTP2_SETTINGS:
-    case HD_KEEP_ALIVE:
-    case HD_PROXY_CONNECTION:
-    case HD_SERVER:
-    case HD_TE:
-    case HD_TRANSFER_ENCODING:
-    case HD_UPGRADE:
-      continue;
-    case HD_EARLY_DATA:
-      if (flags & HDOP_STRIP_EARLY_DATA) {
-        continue;
-      }
-      break;
-    case HD_FORWARDED:
-      if (flags & HDOP_STRIP_FORWARDED) {
-        continue;
-      }
-
-      if (it_forwarded == std::end(headers)) {
-        it_forwarded = it;
-        continue;
-      }
-
-      kv = &(*it_forwarded);
-      it_forwarded = it;
-      break;
-    case HD_X_FORWARDED_FOR:
-      if (flags & HDOP_STRIP_X_FORWARDED_FOR) {
-        continue;
-      }
-
-      if (it_xff == std::end(headers)) {
-        it_xff = it;
-        continue;
-      }
-
-      kv = &(*it_xff);
-      it_xff = it;
-      break;
-    case HD_X_FORWARDED_PROTO:
-      if (flags & HDOP_STRIP_X_FORWARDED_PROTO) {
-        continue;
-      }
-
-      if (it_xfp == std::end(headers)) {
-        it_xfp = it;
-        continue;
-      }
-
-      kv = &(*it_xfp);
-      it_xfp = it;
-      break;
-    case HD_VIA:
-      if (flags & HDOP_STRIP_VIA) {
-        continue;
-      }
-
-      if (it_via == std::end(headers)) {
-        it_via = it;
-        continue;
-      }
-
-      kv = &(*it_via);
-      it_via = it;
-      break;
-    }
-    nva.push_back(
-        make_nv_internal(kv->name, kv->value, kv->no_index, nv_flags));
-  }
-}
-} // namespace
-
-void copy_headers_to_nva(std::vector<nghttp2_nv> &nva,
-                         const HeaderRefs &headers, uint32_t flags) {
-  copy_headers_to_nva_internal(nva, headers, NGHTTP2_NV_FLAG_NONE, flags);
-}
-
-void copy_headers_to_nva_nocopy(std::vector<nghttp2_nv> &nva,
-                                const HeaderRefs &headers, uint32_t flags) {
-  copy_headers_to_nva_internal(
-      nva, headers,
-      NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE, flags);
-}
-
-void build_http1_headers_from_headers(DefaultMemchunks *buf,
-                                      const HeaderRefs &headers,
-                                      uint32_t flags) {
-  auto it_forwarded = std::end(headers);
-  auto it_xff = std::end(headers);
-  auto it_xfp = std::end(headers);
-  auto it_via = std::end(headers);
-
-  for (auto it = std::begin(headers); it != std::end(headers); ++it) {
-    auto kv = &(*it);
-    if (kv->name.empty() || kv->name[0] == ':') {
-      continue;
-    }
-    switch (kv->token) {
-    case HD_CONNECTION:
-    case HD_COOKIE:
-    case HD_HOST:
-    case HD_HTTP2_SETTINGS:
-    case HD_KEEP_ALIVE:
-    case HD_PROXY_CONNECTION:
-    case HD_SERVER:
-    case HD_UPGRADE:
-      continue;
-    case HD_EARLY_DATA:
-      if (flags & HDOP_STRIP_EARLY_DATA) {
-        continue;
-      }
-      break;
-    case HD_FORWARDED:
-      if (flags & HDOP_STRIP_FORWARDED) {
-        continue;
-      }
-
-      if (it_forwarded == std::end(headers)) {
-        it_forwarded = it;
-        continue;
-      }
-
-      kv = &(*it_forwarded);
-      it_forwarded = it;
-      break;
-    case HD_X_FORWARDED_FOR:
-      if (flags & HDOP_STRIP_X_FORWARDED_FOR) {
-        continue;
-      }
-
-      if (it_xff == std::end(headers)) {
-        it_xff = it;
-        continue;
-      }
-
-      kv = &(*it_xff);
-      it_xff = it;
-      break;
-    case HD_X_FORWARDED_PROTO:
-      if (flags & HDOP_STRIP_X_FORWARDED_PROTO) {
-        continue;
-      }
-
-      if (it_xfp == std::end(headers)) {
-        it_xfp = it;
-        continue;
-      }
-
-      kv = &(*it_xfp);
-      it_xfp = it;
-      break;
-    case HD_VIA:
-      if (flags & HDOP_STRIP_VIA) {
-        continue;
-      }
-
-      if (it_via == std::end(headers)) {
-        it_via = it;
-        continue;
-      }
-
-      kv = &(*it_via);
-      it_via = it;
-      break;
-    }
-    capitalize(buf, kv->name);
-    buf->append(": ");
-    buf->append(kv->value);
-    buf->append("\r\n");
-  }
-}
-
-int32_t determine_window_update_transmission(nghttp2_session *session,
-                                             int32_t stream_id) {
-  int32_t recv_length, window_size;
-  if (stream_id == 0) {
-    recv_length = nghttp2_session_get_effective_recv_data_length(session);
-    window_size = nghttp2_session_get_effective_local_window_size(session);
-  } else {
-    recv_length = nghttp2_session_get_stream_effective_recv_data_length(
-        session, stream_id);
-    window_size = nghttp2_session_get_stream_effective_local_window_size(
-        session, stream_id);
-  }
-  if (recv_length != -1 && window_size != -1) {
-    if (recv_length >= window_size / 2) {
-      return recv_length;
-    }
-  }
-  return -1;
-}
-
-void dump_nv(FILE *out, const char **nv) {
-  for (size_t i = 0; nv[i]; i += 2) {
-    fprintf(out, "%s: %s\n", nv[i], nv[i + 1]);
-  }
-  fputc('\n', out);
-  fflush(out);
-}
-
-void dump_nv(FILE *out, const nghttp2_nv *nva, size_t nvlen) {
-  auto end = nva + nvlen;
-  for (; nva != end; ++nva) {
-    fprintf(out, "%s: %s\n", nva->name, nva->value);
-  }
-  fputc('\n', out);
-  fflush(out);
-}
-
-void dump_nv(FILE *out, const Headers &nva) {
-  for (auto &nv : nva) {
-    fprintf(out, "%s: %s\n", nv.name.c_str(), nv.value.c_str());
-  }
-  fputc('\n', out);
-  fflush(out);
-}
-
-void dump_nv(FILE *out, const HeaderRefs &nva) {
-  for (auto &nv : nva) {
-    fprintf(out, "%s: %s\n", nv.name.c_str(), nv.value.c_str());
-  }
-  fputc('\n', out);
-  fflush(out);
-}
-
-void erase_header(HeaderRef *hd) {
-  hd->name = StringRef{};
-  hd->token = -1;
-}
-
-StringRef rewrite_location_uri(BlockAllocator &balloc, const StringRef &uri,
-                               const http_parser_url &u,
-                               const StringRef &match_host,
-                               const StringRef &request_authority,
-                               const StringRef &upstream_scheme) {
-  // We just rewrite scheme and authority.
-  if ((u.field_set & (1 << UF_HOST)) == 0) {
-    return StringRef{};
-  }
-  auto field = &u.field_data[UF_HOST];
-  if (!util::starts_with(std::begin(match_host), std::end(match_host),
-                         &uri[field->off], &uri[field->off] + field->len) ||
-      (match_host.size() != field->len && match_host[field->len] != ':')) {
-    return StringRef{};
-  }
-
-  auto len = 0;
-  if (!request_authority.empty()) {
-    len += upstream_scheme.size() + str_size("://") + request_authority.size();
-  }
-
-  if (u.field_set & (1 << UF_PATH)) {
-    field = &u.field_data[UF_PATH];
-    len += field->len;
-  }
-
-  if (u.field_set & (1 << UF_QUERY)) {
-    field = &u.field_data[UF_QUERY];
-    len += 1 + field->len;
-  }
-
-  if (u.field_set & (1 << UF_FRAGMENT)) {
-    field = &u.field_data[UF_FRAGMENT];
-    len += 1 + field->len;
-  }
-
-  auto iov = make_byte_ref(balloc, len + 1);
-  auto p = iov.base;
-
-  if (!request_authority.empty()) {
-    p = std::copy(std::begin(upstream_scheme), std::end(upstream_scheme), p);
-    p = util::copy_lit(p, "://");
-    p = std::copy(std::begin(request_authority), std::end(request_authority),
-                  p);
-  }
-  if (u.field_set & (1 << UF_PATH)) {
-    field = &u.field_data[UF_PATH];
-    p = std::copy_n(&uri[field->off], field->len, p);
-  }
-  if (u.field_set & (1 << UF_QUERY)) {
-    field = &u.field_data[UF_QUERY];
-    *p++ = '?';
-    p = std::copy_n(&uri[field->off], field->len, p);
-  }
-  if (u.field_set & (1 << UF_FRAGMENT)) {
-    field = &u.field_data[UF_FRAGMENT];
-    *p++ = '#';
-    p = std::copy_n(&uri[field->off], field->len, p);
-  }
-
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-int check_nv(const uint8_t *name, size_t namelen, const uint8_t *value,
-             size_t valuelen) {
-  if (!nghttp2_check_header_name(name, namelen)) {
-    return 0;
-  }
-  if (!nghttp2_check_header_value(value, valuelen)) {
-    return 0;
-  }
-  return 1;
-}
-
-int parse_http_status_code(const StringRef &src) {
-  if (src.size() != 3) {
-    return -1;
-  }
-
-  int status = 0;
-  for (auto c : src) {
-    if (!isdigit(c)) {
-      return -1;
-    }
-    status *= 10;
-    status += c - '0';
-  }
-
-  if (status < 100) {
-    return -1;
-  }
-
-  return status;
-}
-
-int lookup_token(const StringRef &name) {
-  return lookup_token(name.byte(), name.size());
-}
-
-// This function was generated by genheaderfunc.py.  Inspired by h2o
-// header lookup.  https://github.com/h2o/h2o
-int lookup_token(const uint8_t *name, size_t namelen) {
-  switch (namelen) {
-  case 2:
-    switch (name[1]) {
-    case 'e':
-      if (util::streq_l("t", name, 1)) {
-        return HD_TE;
-      }
-      break;
-    }
-    break;
-  case 3:
-    switch (name[2]) {
-    case 'a':
-      if (util::streq_l("vi", name, 2)) {
-        return HD_VIA;
-      }
-      break;
-    }
-    break;
-  case 4:
-    switch (name[3]) {
-    case 'e':
-      if (util::streq_l("dat", name, 3)) {
-        return HD_DATE;
-      }
-      break;
-    case 'k':
-      if (util::streq_l("lin", name, 3)) {
-        return HD_LINK;
-      }
-      break;
-    case 't':
-      if (util::streq_l("hos", name, 3)) {
-        return HD_HOST;
-      }
-      break;
-    }
-    break;
-  case 5:
-    switch (name[4]) {
-    case 'h':
-      if (util::streq_l(":pat", name, 4)) {
-        return HD__PATH;
-      }
-      break;
-    case 't':
-      if (util::streq_l(":hos", name, 4)) {
-        return HD__HOST;
-      }
-      break;
-    }
-    break;
-  case 6:
-    switch (name[5]) {
-    case 'e':
-      if (util::streq_l("cooki", name, 5)) {
-        return HD_COOKIE;
-      }
-      break;
-    case 'r':
-      if (util::streq_l("serve", name, 5)) {
-        return HD_SERVER;
-      }
-      break;
-    case 't':
-      if (util::streq_l("expec", name, 5)) {
-        return HD_EXPECT;
-      }
-      break;
-    }
-    break;
-  case 7:
-    switch (name[6]) {
-    case 'c':
-      if (util::streq_l("alt-sv", name, 6)) {
-        return HD_ALT_SVC;
-      }
-      break;
-    case 'd':
-      if (util::streq_l(":metho", name, 6)) {
-        return HD__METHOD;
-      }
-      break;
-    case 'e':
-      if (util::streq_l(":schem", name, 6)) {
-        return HD__SCHEME;
-      }
-      if (util::streq_l("upgrad", name, 6)) {
-        return HD_UPGRADE;
-      }
-      break;
-    case 'r':
-      if (util::streq_l("traile", name, 6)) {
-        return HD_TRAILER;
-      }
-      break;
-    case 's':
-      if (util::streq_l(":statu", name, 6)) {
-        return HD__STATUS;
-      }
-      break;
-    }
-    break;
-  case 8:
-    switch (name[7]) {
-    case 'n':
-      if (util::streq_l("locatio", name, 7)) {
-        return HD_LOCATION;
-      }
-      break;
-    }
-    break;
-  case 9:
-    switch (name[8]) {
-    case 'd':
-      if (util::streq_l("forwarde", name, 8)) {
-        return HD_FORWARDED;
-      }
-      break;
-    }
-    break;
-  case 10:
-    switch (name[9]) {
-    case 'a':
-      if (util::streq_l("early-dat", name, 9)) {
-        return HD_EARLY_DATA;
-      }
-      break;
-    case 'e':
-      if (util::streq_l("keep-aliv", name, 9)) {
-        return HD_KEEP_ALIVE;
-      }
-      break;
-    case 'n':
-      if (util::streq_l("connectio", name, 9)) {
-        return HD_CONNECTION;
-      }
-      break;
-    case 't':
-      if (util::streq_l("user-agen", name, 9)) {
-        return HD_USER_AGENT;
-      }
-      break;
-    case 'y':
-      if (util::streq_l(":authorit", name, 9)) {
-        return HD__AUTHORITY;
-      }
-      break;
-    }
-    break;
-  case 12:
-    switch (name[11]) {
-    case 'e':
-      if (util::streq_l("content-typ", name, 11)) {
-        return HD_CONTENT_TYPE;
-      }
-      break;
-    }
-    break;
-  case 13:
-    switch (name[12]) {
-    case 'l':
-      if (util::streq_l("cache-contro", name, 12)) {
-        return HD_CACHE_CONTROL;
-      }
-      break;
-    }
-    break;
-  case 14:
-    switch (name[13]) {
-    case 'h':
-      if (util::streq_l("content-lengt", name, 13)) {
-        return HD_CONTENT_LENGTH;
-      }
-      break;
-    case 's':
-      if (util::streq_l("http2-setting", name, 13)) {
-        return HD_HTTP2_SETTINGS;
-      }
-      break;
-    }
-    break;
-  case 15:
-    switch (name[14]) {
-    case 'e':
-      if (util::streq_l("accept-languag", name, 14)) {
-        return HD_ACCEPT_LANGUAGE;
-      }
-      break;
-    case 'g':
-      if (util::streq_l("accept-encodin", name, 14)) {
-        return HD_ACCEPT_ENCODING;
-      }
-      break;
-    case 'r':
-      if (util::streq_l("x-forwarded-fo", name, 14)) {
-        return HD_X_FORWARDED_FOR;
-      }
-      break;
-    }
-    break;
-  case 16:
-    switch (name[15]) {
-    case 'n':
-      if (util::streq_l("proxy-connectio", name, 15)) {
-        return HD_PROXY_CONNECTION;
-      }
-      break;
-    }
-    break;
-  case 17:
-    switch (name[16]) {
-    case 'e':
-      if (util::streq_l("if-modified-sinc", name, 16)) {
-        return HD_IF_MODIFIED_SINCE;
-      }
-      break;
-    case 'g':
-      if (util::streq_l("transfer-encodin", name, 16)) {
-        return HD_TRANSFER_ENCODING;
-      }
-      break;
-    case 'o':
-      if (util::streq_l("x-forwarded-prot", name, 16)) {
-        return HD_X_FORWARDED_PROTO;
-      }
-      break;
-    }
-    break;
-  }
-  return -1;
-}
-
-void init_hdidx(HeaderIndex &hdidx) {
-  std::fill(std::begin(hdidx), std::end(hdidx), -1);
-}
-
-void index_header(HeaderIndex &hdidx, int32_t token, size_t idx) {
-  if (token == -1) {
-    return;
-  }
-  assert(token < HD_MAXIDX);
-  hdidx[token] = idx;
-}
-
-const Headers::value_type *get_header(const HeaderIndex &hdidx, int32_t token,
-                                      const Headers &nva) {
-  auto i = hdidx[token];
-  if (i == -1) {
-    return nullptr;
-  }
-  return &nva[i];
-}
-
-Headers::value_type *get_header(const HeaderIndex &hdidx, int32_t token,
-                                Headers &nva) {
-  auto i = hdidx[token];
-  if (i == -1) {
-    return nullptr;
-  }
-  return &nva[i];
-}
-
-namespace {
-template <typename InputIt> InputIt skip_lws(InputIt first, InputIt last) {
-  for (; first != last; ++first) {
-    switch (*first) {
-    case ' ':
-    case '\t':
-      continue;
-    default:
-      return first;
-    }
-  }
-  return first;
-}
-} // namespace
-
-namespace {
-template <typename InputIt>
-InputIt skip_to_next_field(InputIt first, InputIt last) {
-  for (; first != last; ++first) {
-    switch (*first) {
-    case ' ':
-    case '\t':
-    case ',':
-      continue;
-    default:
-      return first;
-    }
-  }
-  return first;
-}
-} // namespace
-
-namespace {
-// Skip to the right dquote ('"'), handling backslash escapes.
-// Returns |last| if input is not terminated with '"'.
-template <typename InputIt>
-InputIt skip_to_right_dquote(InputIt first, InputIt last) {
-  for (; first != last;) {
-    switch (*first) {
-    case '"':
-      return first;
-    case '\\':
-      ++first;
-      if (first == last) {
-        return first;
-      }
-      break;
-    }
-    ++first;
-  }
-  return first;
-}
-} // namespace
-
-namespace {
-// Returns true if link-param does not match pattern |pat| of length
-// |patlen| or it has empty value ("").  |pat| should be parmname
-// followed by "=".
-bool check_link_param_empty(const char *first, const char *last,
-                            const char *pat, size_t patlen) {
-  if (first + patlen <= last) {
-    if (std::equal(pat, pat + patlen, first, util::CaseCmp())) {
-      // we only accept URI if pat is followd by "" (e.g.,
-      // loadpolicy="") here.
-      if (first + patlen + 2 <= last) {
-        if (*(first + patlen) != '"' || *(first + patlen + 1) != '"') {
-          return false;
-        }
-      } else {
-        // here we got invalid production (anchor=") or anchor=?
-        return false;
-      }
-    }
-  }
-  return true;
-}
-} // namespace
-
-namespace {
-// Returns true if link-param consists of only parmname, and it
-// matches string [pat, pat + patlen).
-bool check_link_param_without_value(const char *first, const char *last,
-                                    const char *pat, size_t patlen) {
-  if (first + patlen > last) {
-    return false;
-  }
-
-  if (first + patlen == last) {
-    return std::equal(pat, pat + patlen, first, util::CaseCmp());
-  }
-
-  switch (*(first + patlen)) {
-  case ';':
-  case ',':
-    return std::equal(pat, pat + patlen, first, util::CaseCmp());
-  }
-
-  return false;
-}
-} // namespace
-
-namespace {
-std::pair<LinkHeader, const char *>
-parse_next_link_header_once(const char *first, const char *last) {
-  first = skip_to_next_field(first, last);
-  if (first == last || *first != '<') {
-    return {{StringRef{}}, last};
-  }
-  auto url_first = ++first;
-  first = std::find(first, last, '>');
-  if (first == last) {
-    return {{StringRef{}}, first};
-  }
-  auto url_last = first++;
-  if (first == last) {
-    return {{StringRef{}}, first};
-  }
-  // we expect ';' or ',' here
-  switch (*first) {
-  case ',':
-    return {{StringRef{}}, ++first};
-  case ';':
-    ++first;
-    break;
-  default:
-    return {{StringRef{}}, last};
-  }
-
-  auto ok = false;
-  auto ign = false;
-  for (;;) {
-    first = skip_lws(first, last);
-    if (first == last) {
-      return {{StringRef{}}, first};
-    }
-    // we expect link-param
-
-    if (!ign) {
-      if (!ok) {
-        // rel can take several relations using quoted form.
-        static constexpr char PLP[] = "rel=\"";
-        static constexpr size_t PLPLEN = str_size(PLP);
-
-        static constexpr char PLT[] = "preload";
-        static constexpr size_t PLTLEN = str_size(PLT);
-        if (first + PLPLEN < last && *(first + PLPLEN - 1) == '"' &&
-            std::equal(PLP, PLP + PLPLEN, first, util::CaseCmp())) {
-          // we have to search preload in whitespace separated list:
-          // rel="preload something http://example.org/foo"
-          first += PLPLEN;
-          auto start = first;
-          for (; first != last;) {
-            if (*first != ' ' && *first != '"') {
-              ++first;
-              continue;
-            }
-
-            if (start == first) {
-              return {{StringRef{}}, last};
-            }
-
-            if (!ok && start + PLTLEN == first &&
-                std::equal(PLT, PLT + PLTLEN, start, util::CaseCmp())) {
-              ok = true;
-            }
-
-            if (*first == '"') {
-              break;
-            }
-            first = skip_lws(first, last);
-            start = first;
-          }
-          if (first == last) {
-            return {{StringRef{}}, last};
-          }
-          assert(*first == '"');
-          ++first;
-          if (first == last || *first == ',') {
-            goto almost_done;
-          }
-          if (*first == ';') {
-            ++first;
-            // parse next link-param
-            continue;
-          }
-          return {{StringRef{}}, last};
-        }
-      }
-      // we are only interested in rel=preload parameter.  Others are
-      // simply skipped.
-      static constexpr char PL[] = "rel=preload";
-      static constexpr size_t PLLEN = str_size(PL);
-      if (first + PLLEN == last) {
-        if (std::equal(PL, PL + PLLEN, first, util::CaseCmp())) {
-          // ok = true;
-          // this is the end of sequence
-          return {{{url_first, url_last}}, last};
-        }
-      } else if (first + PLLEN + 1 <= last) {
-        switch (*(first + PLLEN)) {
-        case ',':
-          if (!std::equal(PL, PL + PLLEN, first, util::CaseCmp())) {
-            break;
-          }
-          // ok = true;
-          // skip including ','
-          first += PLLEN + 1;
-          return {{{url_first, url_last}}, first};
-        case ';':
-          if (!std::equal(PL, PL + PLLEN, first, util::CaseCmp())) {
-            break;
-          }
-          ok = true;
-          // skip including ';'
-          first += PLLEN + 1;
-          // continue parse next link-param
-          continue;
-        }
-      }
-      // we have to reject URI if we have nonempty anchor parameter.
-      static constexpr char ANCHOR[] = "anchor=";
-      static constexpr size_t ANCHORLEN = str_size(ANCHOR);
-      if (!ign && !check_link_param_empty(first, last, ANCHOR, ANCHORLEN)) {
-        ign = true;
-      }
-
-      // reject URI if we have non-empty loadpolicy.  This could be
-      // tightened up to just pick up "next" or "insert".
-      static constexpr char LOADPOLICY[] = "loadpolicy=";
-      static constexpr size_t LOADPOLICYLEN = str_size(LOADPOLICY);
-      if (!ign &&
-          !check_link_param_empty(first, last, LOADPOLICY, LOADPOLICYLEN)) {
-        ign = true;
-      }
-
-      // reject URI if we have nopush attribute.
-      static constexpr char NOPUSH[] = "nopush";
-      static constexpr size_t NOPUSHLEN = str_size(NOPUSH);
-      if (!ign &&
-          check_link_param_without_value(first, last, NOPUSH, NOPUSHLEN)) {
-        ign = true;
-      }
-    }
-
-    auto param_first = first;
-    for (; first != last;) {
-      if (util::in_attr_char(*first)) {
-        ++first;
-        continue;
-      }
-      // '*' is only allowed at the end of parameter name and must be
-      // followed by '='
-      if (last - first >= 2 && first != param_first) {
-        if (*first == '*' && *(first + 1) == '=') {
-          ++first;
-          break;
-        }
-      }
-      if (*first == '=' || *first == ';' || *first == ',') {
-        break;
-      }
-      return {{StringRef{}}, last};
-    }
-    if (param_first == first) {
-      // empty parmname
-      return {{StringRef{}}, last};
-    }
-    // link-param without value is acceptable (see link-extension) if
-    // it is not followed by '='
-    if (first == last || *first == ',') {
-      goto almost_done;
-    }
-    if (*first == ';') {
-      ++first;
-      // parse next link-param
-      continue;
-    }
-    // now parsing link-param value
-    assert(*first == '=');
-    ++first;
-    if (first == last) {
-      // empty value is not acceptable
-      return {{StringRef{}}, first};
-    }
-    if (*first == '"') {
-      // quoted-string
-      first = skip_to_right_dquote(first + 1, last);
-      if (first == last) {
-        return {{StringRef{}}, first};
-      }
-      ++first;
-      if (first == last || *first == ',') {
-        goto almost_done;
-      }
-      if (*first == ';') {
-        ++first;
-        // parse next link-param
-        continue;
-      }
-      return {{StringRef{}}, last};
-    }
-    // not quoted-string, skip to next ',' or ';'
-    if (*first == ',' || *first == ';') {
-      // empty value
-      return {{StringRef{}}, last};
-    }
-    for (; first != last; ++first) {
-      if (*first == ',' || *first == ';') {
-        break;
-      }
-    }
-    if (first == last || *first == ',') {
-      goto almost_done;
-    }
-    assert(*first == ';');
-    ++first;
-    // parse next link-param
-  }
-
-almost_done:
-  assert(first == last || *first == ',');
-
-  if (first != last) {
-    ++first;
-  }
-  if (ok && !ign) {
-    return {{{url_first, url_last}}, first};
-  }
-  return {{StringRef{}}, first};
-}
-} // namespace
-
-std::vector<LinkHeader> parse_link_header(const StringRef &src) {
-  std::vector<LinkHeader> res;
-  for (auto first = std::begin(src); first != std::end(src);) {
-    auto rv = parse_next_link_header_once(first, std::end(src));
-    first = rv.second;
-    auto &link = rv.first;
-    if (!link.uri.empty()) {
-      res.push_back(link);
-    }
-  }
-  return res;
-}
-
-std::string path_join(const StringRef &base_path, const StringRef &base_query,
-                      const StringRef &rel_path, const StringRef &rel_query) {
-  BlockAllocator balloc(1024, 1024);
-
-  return path_join(balloc, base_path, base_query, rel_path, rel_query).str();
-}
-
-bool expect_response_body(int status_code) {
-  return status_code / 100 != 1 && status_code != 304 && status_code != 204;
-}
-
-bool expect_response_body(const std::string &method, int status_code) {
-  return method != "HEAD" && expect_response_body(status_code);
-}
-
-bool expect_response_body(int method_token, int status_code) {
-  return method_token != HTTP_HEAD && expect_response_body(status_code);
-}
-
-int lookup_method_token(const StringRef &name) {
-  return lookup_method_token(name.byte(), name.size());
-}
-
-// This function was generated by genmethodfunc.py.
-int lookup_method_token(const uint8_t *name, size_t namelen) {
-  switch (namelen) {
-  case 3:
-    switch (name[2]) {
-    case 'T':
-      if (util::streq_l("GE", name, 2)) {
-        return HTTP_GET;
-      }
-      if (util::streq_l("PU", name, 2)) {
-        return HTTP_PUT;
-      }
-      break;
-    }
-    break;
-  case 4:
-    switch (name[3]) {
-    case 'D':
-      if (util::streq_l("HEA", name, 3)) {
-        return HTTP_HEAD;
-      }
-      break;
-    case 'E':
-      if (util::streq_l("MOV", name, 3)) {
-        return HTTP_MOVE;
-      }
-      break;
-    case 'K':
-      if (util::streq_l("LOC", name, 3)) {
-        return HTTP_LOCK;
-      }
-      break;
-    case 'T':
-      if (util::streq_l("POS", name, 3)) {
-        return HTTP_POST;
-      }
-      break;
-    case 'Y':
-      if (util::streq_l("COP", name, 3)) {
-        return HTTP_COPY;
-      }
-      break;
-    }
-    break;
-  case 5:
-    switch (name[4]) {
-    case 'E':
-      if (util::streq_l("MERG", name, 4)) {
-        return HTTP_MERGE;
-      }
-      if (util::streq_l("PURG", name, 4)) {
-        return HTTP_PURGE;
-      }
-      if (util::streq_l("TRAC", name, 4)) {
-        return HTTP_TRACE;
-      }
-      break;
-    case 'H':
-      if (util::streq_l("PATC", name, 4)) {
-        return HTTP_PATCH;
-      }
-      break;
-    case 'L':
-      if (util::streq_l("MKCO", name, 4)) {
-        return HTTP_MKCOL;
-      }
-      break;
-    }
-    break;
-  case 6:
-    switch (name[5]) {
-    case 'E':
-      if (util::streq_l("DELET", name, 5)) {
-        return HTTP_DELETE;
-      }
-      break;
-    case 'H':
-      if (util::streq_l("SEARC", name, 5)) {
-        return HTTP_SEARCH;
-      }
-      break;
-    case 'K':
-      if (util::streq_l("UNLOC", name, 5)) {
-        return HTTP_UNLOCK;
-      }
-      break;
-    case 'T':
-      if (util::streq_l("REPOR", name, 5)) {
-        return HTTP_REPORT;
-      }
-      break;
-    case 'Y':
-      if (util::streq_l("NOTIF", name, 5)) {
-        return HTTP_NOTIFY;
-      }
-      break;
-    }
-    break;
-  case 7:
-    switch (name[6]) {
-    case 'H':
-      if (util::streq_l("MSEARC", name, 6)) {
-        return HTTP_MSEARCH;
-      }
-      break;
-    case 'S':
-      if (util::streq_l("OPTION", name, 6)) {
-        return HTTP_OPTIONS;
-      }
-      break;
-    case 'T':
-      if (util::streq_l("CONNEC", name, 6)) {
-        return HTTP_CONNECT;
-      }
-      break;
-    }
-    break;
-  case 8:
-    switch (name[7]) {
-    case 'D':
-      if (util::streq_l("PROPFIN", name, 7)) {
-        return HTTP_PROPFIND;
-      }
-      break;
-    case 'T':
-      if (util::streq_l("CHECKOU", name, 7)) {
-        return HTTP_CHECKOUT;
-      }
-      break;
-    }
-    break;
-  case 9:
-    switch (name[8]) {
-    case 'E':
-      if (util::streq_l("SUBSCRIB", name, 8)) {
-        return HTTP_SUBSCRIBE;
-      }
-      break;
-    case 'H':
-      if (util::streq_l("PROPPATC", name, 8)) {
-        return HTTP_PROPPATCH;
-      }
-      break;
-    }
-    break;
-  case 10:
-    switch (name[9]) {
-    case 'R':
-      if (util::streq_l("MKCALENDA", name, 9)) {
-        return HTTP_MKCALENDAR;
-      }
-      break;
-    case 'Y':
-      if (util::streq_l("MKACTIVIT", name, 9)) {
-        return HTTP_MKACTIVITY;
-      }
-      break;
-    }
-    break;
-  case 11:
-    switch (name[10]) {
-    case 'E':
-      if (util::streq_l("UNSUBSCRIB", name, 10)) {
-        return HTTP_UNSUBSCRIBE;
-      }
-      break;
-    }
-    break;
-  }
-  return -1;
-}
-
-StringRef to_method_string(int method_token) {
-  // we happened to use same value for method with http-parser.
-  return StringRef{http_method_str(static_cast<http_method>(method_token))};
-}
-
-StringRef get_pure_path_component(const StringRef &uri) {
-  int rv;
-
-  http_parser_url u{};
-  rv = http_parser_parse_url(uri.c_str(), uri.size(), 0, &u);
-  if (rv != 0) {
-    return StringRef{};
-  }
-
-  if (u.field_set & (1 << UF_PATH)) {
-    auto &f = u.field_data[UF_PATH];
-    return StringRef{uri.c_str() + f.off, f.len};
-  }
-
-  return StringRef::from_lit("/");
-}
-
-int construct_push_component(BlockAllocator &balloc, StringRef &scheme,
-                             StringRef &authority, StringRef &path,
-                             const StringRef &base, const StringRef &uri) {
-  int rv;
-  StringRef rel, relq;
-
-  http_parser_url u{};
-
-  rv = http_parser_parse_url(uri.c_str(), uri.size(), 0, &u);
-
-  if (rv != 0) {
-    if (uri[0] == '/') {
-      return -1;
-    }
-
-    // treat link_url as relative URI.
-    auto end = std::find(std::begin(uri), std::end(uri), '#');
-    auto q = std::find(std::begin(uri), end, '?');
-
-    rel = StringRef{std::begin(uri), q};
-    if (q != end) {
-      relq = StringRef{q + 1, std::end(uri)};
-    }
-  } else {
-    if (u.field_set & (1 << UF_SCHEMA)) {
-      scheme = util::get_uri_field(uri.c_str(), u, UF_SCHEMA);
-    }
-
-    if (u.field_set & (1 << UF_HOST)) {
-      auto auth = util::get_uri_field(uri.c_str(), u, UF_HOST);
-      auto len = auth.size();
-      auto port_exists = u.field_set & (1 << UF_PORT);
-      if (port_exists) {
-        len += 1 + str_size("65535");
-      }
-      auto iov = make_byte_ref(balloc, len + 1);
-      auto p = iov.base;
-      p = std::copy(std::begin(auth), std::end(auth), p);
-      if (port_exists) {
-        *p++ = ':';
-        p = util::utos(p, u.port);
-      }
-      *p = '\0';
-
-      authority = StringRef{iov.base, p};
-    }
-
-    if (u.field_set & (1 << UF_PATH)) {
-      auto &f = u.field_data[UF_PATH];
-      rel = StringRef{uri.c_str() + f.off, f.len};
-    } else {
-      rel = StringRef::from_lit("/");
-    }
-
-    if (u.field_set & (1 << UF_QUERY)) {
-      auto &f = u.field_data[UF_QUERY];
-      relq = StringRef{uri.c_str() + f.off, f.len};
-    }
-  }
-
-  path = http2::path_join(balloc, base, StringRef{}, rel, relq);
-
-  return 0;
-}
-
-namespace {
-template <typename InputIt> InputIt eat_file(InputIt first, InputIt last) {
-  if (first == last) {
-    *first++ = '/';
-    return first;
-  }
-
-  if (*(last - 1) == '/') {
-    return last;
-  }
-
-  auto p = last;
-  for (; p != first && *(p - 1) != '/'; --p)
-    ;
-  if (p == first) {
-    // this should not happened in normal case, where we expect path
-    // starts with '/'
-    *first++ = '/';
-    return first;
-  }
-
-  return p;
-}
-} // namespace
-
-namespace {
-template <typename InputIt> InputIt eat_dir(InputIt first, InputIt last) {
-  auto p = eat_file(first, last);
-
-  --p;
-
-  assert(*p == '/');
-
-  return eat_file(first, p);
-}
-} // namespace
-
-StringRef path_join(BlockAllocator &balloc, const StringRef &base_path,
-                    const StringRef &base_query, const StringRef &rel_path,
-                    const StringRef &rel_query) {
-  auto res = make_byte_ref(
-      balloc, std::max(static_cast<size_t>(1), base_path.size()) +
-                  rel_path.size() + 1 +
-                  std::max(base_query.size(), rel_query.size()) + 1);
-  auto p = res.base;
-
-  if (rel_path.empty()) {
-    if (base_path.empty()) {
-      *p++ = '/';
-    } else {
-      p = std::copy(std::begin(base_path), std::end(base_path), p);
-    }
-    if (rel_query.empty()) {
-      if (!base_query.empty()) {
-        *p++ = '?';
-        p = std::copy(std::begin(base_query), std::end(base_query), p);
-      }
-      *p = '\0';
-      return StringRef{res.base, p};
-    }
-    *p++ = '?';
-    p = std::copy(std::begin(rel_query), std::end(rel_query), p);
-    *p = '\0';
-    return StringRef{res.base, p};
-  }
-
-  auto first = std::begin(rel_path);
-  auto last = std::end(rel_path);
-
-  if (rel_path[0] == '/') {
-    *p++ = '/';
-    ++first;
-    for (; first != last && *first == '/'; ++first)
-      ;
-  } else if (base_path.empty()) {
-    *p++ = '/';
-  } else {
-    p = std::copy(std::begin(base_path), std::end(base_path), p);
-  }
-
-  for (; first != last;) {
-    if (*first == '.') {
-      if (first + 1 == last) {
-        break;
-      }
-      if (*(first + 1) == '/') {
-        first += 2;
-        continue;
-      }
-      if (*(first + 1) == '.') {
-        if (first + 2 == last) {
-          p = eat_dir(res.base, p);
-          break;
-        }
-        if (*(first + 2) == '/') {
-          p = eat_dir(res.base, p);
-          first += 3;
-          continue;
-        }
-      }
-    }
-    if (*(p - 1) != '/') {
-      p = eat_file(res.base, p);
-    }
-    auto slash = std::find(first, last, '/');
-    if (slash == last) {
-      p = std::copy(first, last, p);
-      break;
-    }
-    p = std::copy(first, slash + 1, p);
-    first = slash + 1;
-    for (; first != last && *first == '/'; ++first)
-      ;
-  }
-  if (!rel_query.empty()) {
-    *p++ = '?';
-    p = std::copy(std::begin(rel_query), std::end(rel_query), p);
-  }
-  *p = '\0';
-  return StringRef{res.base, p};
-}
-
-StringRef normalize_path(BlockAllocator &balloc, const StringRef &path,
-                         const StringRef &query) {
-  // First, decode %XX for unreserved characters, then do
-  // http2::path_join
-
-  // We won't find %XX if length is less than 3.
-  if (path.size() < 3 ||
-      std::find(std::begin(path), std::end(path), '%') == std::end(path)) {
-    return path_join(balloc, StringRef{}, StringRef{}, path, query);
-  }
-
-  // includes last terminal NULL.
-  auto result = make_byte_ref(balloc, path.size() + 1);
-  auto p = result.base;
-
-  auto it = std::begin(path);
-  for (; it + 2 < std::end(path);) {
-    if (*it == '%') {
-      if (util::is_hex_digit(*(it + 1)) && util::is_hex_digit(*(it + 2))) {
-        auto c =
-            (util::hex_to_uint(*(it + 1)) << 4) + util::hex_to_uint(*(it + 2));
-        if (util::in_rfc3986_unreserved_chars(c)) {
-          *p++ = c;
-
-          it += 3;
-
-          continue;
-        }
-        *p++ = '%';
-        *p++ = util::upcase(*(it + 1));
-        *p++ = util::upcase(*(it + 2));
-
-        it += 3;
-
-        continue;
-      }
-    }
-    *p++ = *it++;
-  }
-
-  p = std::copy(it, std::end(path), p);
-  *p = '\0';
-
-  return path_join(balloc, StringRef{}, StringRef{}, StringRef{result.base, p},
-                   query);
-}
-
-std::string normalize_path(const StringRef &path, const StringRef &query) {
-  BlockAllocator balloc(1024, 1024);
-
-  return normalize_path(balloc, path, query).str();
-}
-
-StringRef rewrite_clean_path(BlockAllocator &balloc, const StringRef &src) {
-  if (src.empty() || src[0] != '/') {
-    return src;
-  }
-  // probably, not necessary most of the case, but just in case.
-  auto fragment = std::find(std::begin(src), std::end(src), '#');
-  auto raw_query = std::find(std::begin(src), fragment, '?');
-  auto query = raw_query;
-  if (query != fragment) {
-    ++query;
-  }
-  return normalize_path(balloc, StringRef{std::begin(src), raw_query},
-                        StringRef{query, fragment});
-}
-
-StringRef copy_lower(BlockAllocator &balloc, const StringRef &src) {
-  auto iov = make_byte_ref(balloc, src.size() + 1);
-  auto p = iov.base;
-  p = std::copy(std::begin(src), std::end(src), p);
-  *p = '\0';
-  util::inp_strlower(iov.base, p);
-  return StringRef{iov.base, p};
-}
-
-bool contains_trailers(const StringRef &s) {
-  constexpr auto trailers = StringRef::from_lit("trailers");
-
-  for (auto p = std::begin(s), end = std::end(s);; ++p) {
-    p = std::find_if(p, end, [](char c) { return c != ' ' && c != '\t'; });
-    if (p == end || static_cast<size_t>(end - p) < trailers.size()) {
-      return false;
-    }
-    if (util::strieq(trailers, StringRef{p, p + trailers.size()})) {
-      // Make sure that there is no character other than white spaces
-      // before next "," or end of string.
-      p = std::find_if(p + trailers.size(), end,
-                       [](char c) { return c != ' ' && c != '\t'; });
-      if (p == end || *p == ',') {
-        return true;
-      }
-    }
-    // Skip to next ",".
-    p = std::find_if(p, end, [](char c) { return c == ','; });
-    if (p == end) {
-      return false;
-    }
-  }
-}
-
-} // namespace http2
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,428 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef HTTP2_H
-#define HTTP2_H
-
-#include "nghttp2_config.h"
-
-#include <cstdio>
-#include <cstring>
-#include <string>
-#include <vector>
-#include <array>
-
-#include <nghttp2/nghttp2.h>
-
-#include "http-parser/http_parser.h"
-
-#include "util.h"
-#include "memchunk.h"
-#include "template.h"
-#include "allocator.h"
-
-namespace nghttp2 {
-
-struct Header {
-  Header(std::string name, std::string value, bool no_index = false,
-         int32_t token = -1)
-      : name(std::move(name)),
-        value(std::move(value)),
-        token(token),
-        no_index(no_index) {}
-
-  Header() : token(-1), no_index(false) {}
-
-  bool operator==(const Header &other) const {
-    return name == other.name && value == other.value;
-  }
-
-  bool operator<(const Header &rhs) const {
-    return name < rhs.name || (name == rhs.name && value < rhs.value);
-  }
-
-  std::string name;
-  std::string value;
-  int32_t token;
-  bool no_index;
-};
-
-struct HeaderRef {
-  HeaderRef(const StringRef &name, const StringRef &value,
-            bool no_index = false, int32_t token = -1)
-      : name(name), value(value), token(token), no_index(no_index) {}
-
-  HeaderRef() : token(-1), no_index(false) {}
-
-  bool operator==(const HeaderRef &other) const {
-    return name == other.name && value == other.value;
-  }
-
-  bool operator<(const HeaderRef &rhs) const {
-    return name < rhs.name || (name == rhs.name && value < rhs.value);
-  }
-
-  StringRef name;
-  StringRef value;
-  int32_t token;
-  bool no_index;
-};
-
-using Headers = std::vector<Header>;
-using HeaderRefs = std::vector<HeaderRef>;
-
-namespace http2 {
-
-// Returns reason-phrase for given |status code|.  If there is no
-// known reason-phrase for the given code, returns empty string.
-StringRef get_reason_phrase(unsigned int status_code);
-
-// Returns string version of |status_code|. (e.g., "404")
-StringRef stringify_status(BlockAllocator &balloc, unsigned int status_code);
-
-void capitalize(DefaultMemchunks *buf, const StringRef &s);
-
-// Returns true if |value| is LWS
-bool lws(const char *value);
-
-// Copies the |field| component value from |u| and |url| to the
-// |dest|. If |u| does not have |field|, then this function does
-// nothing.
-void copy_url_component(std::string &dest, const http_parser_url *u, int field,
-                        const char *url);
-
-Headers::value_type to_header(const uint8_t *name, size_t namelen,
-                              const uint8_t *value, size_t valuelen,
-                              bool no_index, int32_t token);
-
-// Add name/value pairs to |nva|.  If |no_index| is true, this
-// name/value pair won't be indexed when it is forwarded to the next
-// hop.  This function strips white spaces around |value|.
-void add_header(Headers &nva, const uint8_t *name, size_t namelen,
-                const uint8_t *value, size_t valuelen, bool no_index,
-                int32_t token);
-
-// Returns pointer to the entry in |nva| which has name |name|.  If
-// more than one entries which have the name |name|, last occurrence
-// in |nva| is returned.  If no such entry exist, returns nullptr.
-const Headers::value_type *get_header(const Headers &nva, const char *name);
-
-// Returns true if the value of |nv| is not empty.
-bool non_empty_value(const HeaderRefs::value_type *nv);
-
-// Creates nghttp2_nv using |name| and |value| and returns it. The
-// returned value only references the data pointer to name.c_str() and
-// value.c_str().  If |no_index| is true, nghttp2_nv flags member has
-// NGHTTP2_NV_FLAG_NO_INDEX flag set.
-nghttp2_nv make_nv(const std::string &name, const std::string &value,
-                   bool no_index = false);
-
-nghttp2_nv make_nv(const StringRef &name, const StringRef &value,
-                   bool no_index = false);
-
-nghttp2_nv make_nv_nocopy(const std::string &name, const std::string &value,
-                          bool no_index = false);
-
-nghttp2_nv make_nv_nocopy(const StringRef &name, const StringRef &value,
-                          bool no_index = false);
-
-// Create nghttp2_nv from string literal |name| and |value|.
-template <size_t N, size_t M>
-constexpr nghttp2_nv make_nv_ll(const char (&name)[N], const char (&value)[M]) {
-  return {(uint8_t *)name, (uint8_t *)value, N - 1, M - 1,
-          NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE};
-}
-
-// Create nghttp2_nv from string literal |name| and c-string |value|.
-template <size_t N>
-nghttp2_nv make_nv_lc(const char (&name)[N], const char *value) {
-  return {(uint8_t *)name, (uint8_t *)value, N - 1, strlen(value),
-          NGHTTP2_NV_FLAG_NO_COPY_NAME};
-}
-
-template <size_t N>
-nghttp2_nv make_nv_lc_nocopy(const char (&name)[N], const char *value) {
-  return {(uint8_t *)name, (uint8_t *)value, N - 1, strlen(value),
-          NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE};
-}
-
-// Create nghttp2_nv from string literal |name| and std::string
-// |value|.
-template <size_t N>
-nghttp2_nv make_nv_ls(const char (&name)[N], const std::string &value) {
-  return {(uint8_t *)name, (uint8_t *)value.c_str(), N - 1, value.size(),
-          NGHTTP2_NV_FLAG_NO_COPY_NAME};
-}
-
-template <size_t N>
-nghttp2_nv make_nv_ls_nocopy(const char (&name)[N], const std::string &value) {
-  return {(uint8_t *)name, (uint8_t *)value.c_str(), N - 1, value.size(),
-          NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE};
-}
-
-template <size_t N>
-nghttp2_nv make_nv_ls_nocopy(const char (&name)[N], const StringRef &value) {
-  return {(uint8_t *)name, (uint8_t *)value.c_str(), N - 1, value.size(),
-          NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE};
-}
-
-enum HeaderBuildOp {
-  HDOP_NONE,
-  // Forwarded header fields must be stripped.  If this flag is not
-  // set, all Forwarded header fields other than last one are added.
-  HDOP_STRIP_FORWARDED = 1,
-  // X-Forwarded-For header fields must be stripped.  If this flag is
-  // not set, all X-Forwarded-For header fields other than last one
-  // are added.
-  HDOP_STRIP_X_FORWARDED_FOR = 1 << 1,
-  // X-Forwarded-Proto header fields must be stripped.  If this flag
-  // is not set, all X-Forwarded-Proto header fields other than last
-  // one are added.
-  HDOP_STRIP_X_FORWARDED_PROTO = 1 << 2,
-  // Via header fields must be stripped.  If this flag is not set, all
-  // Via header fields other than last one are added.
-  HDOP_STRIP_VIA = 1 << 3,
-  // Early-Data header fields must be stripped.  If this flag is not
-  // set, all Early-Data header fields are added.
-  HDOP_STRIP_EARLY_DATA = 1 << 4,
-  // Strip above all header fields.
-  HDOP_STRIP_ALL = HDOP_STRIP_FORWARDED | HDOP_STRIP_X_FORWARDED_FOR |
-                   HDOP_STRIP_X_FORWARDED_PROTO | HDOP_STRIP_VIA |
-                   HDOP_STRIP_EARLY_DATA,
-};
-
-// Appends headers in |headers| to |nv|.  |headers| must be indexed
-// before this call (its element's token field is assigned).  Certain
-// headers, including disallowed headers in HTTP/2 spec and headers
-// which require special handling (i.e. via), are not copied.  |flags|
-// is one or more of HeaderBuildOp flags.  They tell function that
-// certain header fields should not be added.
-void copy_headers_to_nva(std::vector<nghttp2_nv> &nva,
-                         const HeaderRefs &headers, uint32_t flags);
-
-// Just like copy_headers_to_nva(), but this adds
-// NGHTTP2_NV_FLAG_NO_COPY_NAME and NGHTTP2_NV_FLAG_NO_COPY_VALUE.
-void copy_headers_to_nva_nocopy(std::vector<nghttp2_nv> &nva,
-                                const HeaderRefs &headers, uint32_t flags);
-
-// Appends HTTP/1.1 style header lines to |buf| from headers in
-// |headers|.  |headers| must be indexed before this call (its
-// element's token field is assigned).  Certain headers, which
-// requires special handling (i.e. via and cookie), are not appended.
-// |flags| is one or more of HeaderBuildOp flags.  They tell function
-// that certain header fields should not be added.
-void build_http1_headers_from_headers(DefaultMemchunks *buf,
-                                      const HeaderRefs &headers,
-                                      uint32_t flags);
-
-// Return positive window_size_increment if WINDOW_UPDATE should be
-// sent for the stream |stream_id|. If |stream_id| == 0, this function
-// determines the necessity of the WINDOW_UPDATE for a connection.
-//
-// If the function determines WINDOW_UPDATE is not necessary at the
-// moment, it returns -1.
-int32_t determine_window_update_transmission(nghttp2_session *session,
-                                             int32_t stream_id);
-
-// Dumps name/value pairs in |nv| to |out|. The |nv| must be
-// terminated by nullptr.
-void dump_nv(FILE *out, const char **nv);
-
-// Dumps name/value pairs in |nva| to |out|.
-void dump_nv(FILE *out, const nghttp2_nv *nva, size_t nvlen);
-
-// Dumps name/value pairs in |nva| to |out|.
-void dump_nv(FILE *out, const Headers &nva);
-
-void dump_nv(FILE *out, const HeaderRefs &nva);
-
-// Ereases header in |hd|.
-void erase_header(HeaderRef *hd);
-
-// Rewrites redirection URI which usually appears in location header
-// field. The |uri| is the URI in the location header field. The |u|
-// stores the result of parsed |uri|. The |request_authority| is the
-// host or :authority header field value in the request. The
-// |upstream_scheme| is either "https" or "http" in the upstream
-// interface.  Rewrite is done only if location header field value
-// contains |match_host| as host excluding port.  The |match_host| and
-// |request_authority| could be different.  If |request_authority| is
-// empty, strip authority.
-//
-// This function returns the new rewritten URI on success. If the
-// location URI is not subject to the rewrite, this function returns
-// empty string.
-StringRef rewrite_location_uri(BlockAllocator &balloc, const StringRef &uri,
-                               const http_parser_url &u,
-                               const StringRef &match_host,
-                               const StringRef &request_authority,
-                               const StringRef &upstream_scheme);
-
-// Checks the header name/value pair using nghttp2_check_header_name()
-// and nghttp2_check_header_value(). If both function returns nonzero,
-// this function returns nonzero.
-int check_nv(const uint8_t *name, size_t namelen, const uint8_t *value,
-             size_t valuelen);
-
-// Returns parsed HTTP status code.  Returns -1 on failure.
-int parse_http_status_code(const StringRef &src);
-
-// Header fields to be indexed, except HD_MAXIDX which is convenient
-// member to get maximum value.
-//
-// generated by genheaderfunc.py
-enum {
-  HD__AUTHORITY,
-  HD__HOST,
-  HD__METHOD,
-  HD__PATH,
-  HD__SCHEME,
-  HD__STATUS,
-  HD_ACCEPT_ENCODING,
-  HD_ACCEPT_LANGUAGE,
-  HD_ALT_SVC,
-  HD_CACHE_CONTROL,
-  HD_CONNECTION,
-  HD_CONTENT_LENGTH,
-  HD_CONTENT_TYPE,
-  HD_COOKIE,
-  HD_DATE,
-  HD_EARLY_DATA,
-  HD_EXPECT,
-  HD_FORWARDED,
-  HD_HOST,
-  HD_HTTP2_SETTINGS,
-  HD_IF_MODIFIED_SINCE,
-  HD_KEEP_ALIVE,
-  HD_LINK,
-  HD_LOCATION,
-  HD_PROXY_CONNECTION,
-  HD_SERVER,
-  HD_TE,
-  HD_TRAILER,
-  HD_TRANSFER_ENCODING,
-  HD_UPGRADE,
-  HD_USER_AGENT,
-  HD_VIA,
-  HD_X_FORWARDED_FOR,
-  HD_X_FORWARDED_PROTO,
-  HD_MAXIDX,
-};
-
-using HeaderIndex = std::array<int16_t, HD_MAXIDX>;
-
-// Looks up header token for header name |name| of length |namelen|.
-// Only headers we are interested in are tokenized.  If header name
-// cannot be tokenized, returns -1.
-int lookup_token(const uint8_t *name, size_t namelen);
-int lookup_token(const StringRef &name);
-
-// Initializes |hdidx|, header index.  The |hdidx| must point to the
-// array containing at least HD_MAXIDX elements.
-void init_hdidx(HeaderIndex &hdidx);
-// Indexes header |token| using index |idx|.
-void index_header(HeaderIndex &hdidx, int32_t token, size_t idx);
-
-// Returns header denoted by |token| using index |hdidx|.
-const Headers::value_type *get_header(const HeaderIndex &hdidx, int32_t token,
-                                      const Headers &nva);
-
-Headers::value_type *get_header(const HeaderIndex &hdidx, int32_t token,
-                                Headers &nva);
-
-struct LinkHeader {
-  // The region of URI.  This might not be NULL-terminated.
-  StringRef uri;
-};
-
-// Returns next URI-reference in Link header field value |src|.  If no
-// URI-reference found after searching all input, returned uri field
-// is empty.  This imply that empty URI-reference is ignored during
-// parsing.
-std::vector<LinkHeader> parse_link_header(const StringRef &src);
-
-// Constructs path by combining base path |base_path| with another
-// path |rel_path|.  The base path and another path can have optional
-// query component.  This function assumes |base_path| is normalized.
-// In other words, it does not contain ".." or "."  path components
-// and starts with "/" if it is not empty.
-std::string path_join(const StringRef &base, const StringRef &base_query,
-                      const StringRef &rel_path, const StringRef &rel_query);
-
-StringRef path_join(BlockAllocator &balloc, const StringRef &base_path,
-                    const StringRef &base_query, const StringRef &rel_path,
-                    const StringRef &rel_query);
-
-// true if response has body, taking into account the request method
-// and status code.
-bool expect_response_body(const std::string &method, int status_code);
-bool expect_response_body(int method_token, int status_code);
-
-// true if response has body, taking into account status code only.
-bool expect_response_body(int status_code);
-
-// Looks up method token for method name |name| of length |namelen|.
-// Only methods defined in http-parser/http-parser.h (http_method) are
-// tokenized.  If method name cannot be tokenized, returns -1.
-int lookup_method_token(const uint8_t *name, size_t namelen);
-int lookup_method_token(const StringRef &name);
-
-// Returns string  representation of |method_token|.  This  is wrapper
-// function over http_method_str  from http-parser.  If |method_token|
-// is not known to http-parser, "<unknown>" is returned.  The returned
-// StringRef is guaranteed to be NULL-terminated.
-StringRef to_method_string(int method_token);
-
-StringRef normalize_path(BlockAllocator &balloc, const StringRef &path,
-                         const StringRef &query);
-
-std::string normalize_path(const StringRef &path, const StringRef &query);
-
-StringRef rewrite_clean_path(BlockAllocator &balloc, const StringRef &src);
-
-// Returns path component of |uri|.  The returned path does not
-// include query component.  This function returns empty string if it
-// fails.
-StringRef get_pure_path_component(const StringRef &uri);
-
-// Deduces scheme, authority and path from given |uri|, and stores
-// them in |scheme|, |authority|, and |path| respectively.  If |uri|
-// is relative path, path resolution takes place using path given in
-// |base| of length |baselen|.  This function returns 0 if it
-// succeeds, or -1.
-int construct_push_component(BlockAllocator &balloc, StringRef &scheme,
-                             StringRef &authority, StringRef &path,
-                             const StringRef &base, const StringRef &uri);
-
-// Copies |src| and return its lower-cased version.
-StringRef copy_lower(BlockAllocator &balloc, const StringRef &src);
-
-// Returns true if te header field value |s| contains "trailers".
-bool contains_trailers(const StringRef &s);
-
-} // namespace http2
-
-} // namespace nghttp2
-
-#endif // HTTP2_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1033 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "http2_test.h"
-
-#include <cassert>
-#include <cstring>
-#include <iostream>
-
-#include <CUnit/CUnit.h>
-
-#include "http-parser/http_parser.h"
-
-#include "http2.h"
-#include "util.h"
-
-using namespace nghttp2;
-
-#define MAKE_NV(K, V)                                                          \
-  {                                                                            \
-    (uint8_t *)K, (uint8_t *)V, sizeof(K) - 1, sizeof(V) - 1,                  \
-        NGHTTP2_NV_FLAG_NONE                                                   \
-  }
-
-namespace shrpx {
-
-namespace {
-void check_nv(const HeaderRef &a, const nghttp2_nv *b) {
-  CU_ASSERT(a.name.size() == b->namelen);
-  CU_ASSERT(a.value.size() == b->valuelen);
-  CU_ASSERT(memcmp(a.name.c_str(), b->name, b->namelen) == 0);
-  CU_ASSERT(memcmp(a.value.c_str(), b->value, b->valuelen) == 0);
-}
-} // namespace
-
-void test_http2_add_header(void) {
-  auto nva = Headers();
-
-  http2::add_header(nva, (const uint8_t *)"alpha", 5, (const uint8_t *)"123", 3,
-                    false, -1);
-  CU_ASSERT(Headers::value_type("alpha", "123") == nva[0]);
-  CU_ASSERT(!nva[0].no_index);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"alpha", 5, (const uint8_t *)"", 0,
-                    true, -1);
-  CU_ASSERT(Headers::value_type("alpha", "") == nva[0]);
-  CU_ASSERT(nva[0].no_index);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)" b", 2,
-                    false, -1);
-  CU_ASSERT(Headers::value_type("a", "b") == nva[0]);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"b ", 2,
-                    false, -1);
-  CU_ASSERT(Headers::value_type("a", "b") == nva[0]);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"  b  ", 5,
-                    false, -1);
-  CU_ASSERT(Headers::value_type("a", "b") == nva[0]);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"  bravo  ",
-                    9, false, -1);
-  CU_ASSERT(Headers::value_type("a", "bravo") == nva[0]);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"    ", 4,
-                    false, -1);
-  CU_ASSERT(Headers::value_type("a", "") == nva[0]);
-
-  nva.clear();
-
-  http2::add_header(nva, (const uint8_t *)"te", 2, (const uint8_t *)"trailers",
-                    8, false, http2::HD_TE);
-  CU_ASSERT(http2::HD_TE == nva[0].token);
-}
-
-void test_http2_get_header(void) {
-  auto nva = Headers{{"alpha", "1"},         {"bravo", "2"}, {"bravo", "3"},
-                     {"charlie", "4"},       {"delta", "5"}, {"echo", "6"},
-                     {"content-length", "7"}};
-  const Headers::value_type *rv;
-  rv = http2::get_header(nva, "delta");
-  CU_ASSERT(rv != nullptr);
-  CU_ASSERT("delta" == rv->name);
-
-  rv = http2::get_header(nva, "bravo");
-  CU_ASSERT(rv != nullptr);
-  CU_ASSERT("bravo" == rv->name);
-
-  rv = http2::get_header(nva, "foxtrot");
-  CU_ASSERT(rv == nullptr);
-
-  http2::HeaderIndex hdidx;
-  http2::init_hdidx(hdidx);
-  hdidx[http2::HD_CONTENT_LENGTH] = 6;
-  rv = http2::get_header(hdidx, http2::HD_CONTENT_LENGTH, nva);
-  CU_ASSERT("content-length" == rv->name);
-}
-
-namespace {
-auto headers = HeaderRefs{
-    {StringRef::from_lit("alpha"), StringRef::from_lit("0"), true},
-    {StringRef::from_lit("bravo"), StringRef::from_lit("1")},
-    {StringRef::from_lit("connection"), StringRef::from_lit("2"), false,
-     http2::HD_CONNECTION},
-    {StringRef::from_lit("connection"), StringRef::from_lit("3"), false,
-     http2::HD_CONNECTION},
-    {StringRef::from_lit("delta"), StringRef::from_lit("4")},
-    {StringRef::from_lit("expect"), StringRef::from_lit("5")},
-    {StringRef::from_lit("foxtrot"), StringRef::from_lit("6")},
-    {StringRef::from_lit("tango"), StringRef::from_lit("7")},
-    {StringRef::from_lit("te"), StringRef::from_lit("8"), false, http2::HD_TE},
-    {StringRef::from_lit("te"), StringRef::from_lit("9"), false, http2::HD_TE},
-    {StringRef::from_lit("x-forwarded-proto"), StringRef::from_lit("10"), false,
-     http2::HD_X_FORWARDED_FOR},
-    {StringRef::from_lit("x-forwarded-proto"), StringRef::from_lit("11"), false,
-     http2::HD_X_FORWARDED_FOR},
-    {StringRef::from_lit("zulu"), StringRef::from_lit("12")}};
-} // namespace
-
-namespace {
-auto headers2 = HeaderRefs{
-    {StringRef::from_lit("x-forwarded-for"), StringRef::from_lit("xff1"), false,
-     http2::HD_X_FORWARDED_FOR},
-    {StringRef::from_lit("x-forwarded-for"), StringRef::from_lit("xff2"), false,
-     http2::HD_X_FORWARDED_FOR},
-    {StringRef::from_lit("x-forwarded-proto"), StringRef::from_lit("xfp1"),
-     false, http2::HD_X_FORWARDED_PROTO},
-    {StringRef::from_lit("x-forwarded-proto"), StringRef::from_lit("xfp2"),
-     false, http2::HD_X_FORWARDED_PROTO},
-    {StringRef::from_lit("forwarded"), StringRef::from_lit("fwd1"), false,
-     http2::HD_FORWARDED},
-    {StringRef::from_lit("forwarded"), StringRef::from_lit("fwd2"), false,
-     http2::HD_FORWARDED},
-    {StringRef::from_lit("via"), StringRef::from_lit("via1"), false,
-     http2::HD_VIA},
-    {StringRef::from_lit("via"), StringRef::from_lit("via2"), false,
-     http2::HD_VIA},
-};
-} // namespace
-
-void test_http2_copy_headers_to_nva(void) {
-  auto ans = std::vector<int>{0, 1, 4, 5, 6, 7, 12};
-  std::vector<nghttp2_nv> nva;
-
-  http2::copy_headers_to_nva_nocopy(nva, headers,
-                                    http2::HDOP_STRIP_X_FORWARDED_FOR);
-  CU_ASSERT(7 == nva.size());
-  for (size_t i = 0; i < ans.size(); ++i) {
-    check_nv(headers[ans[i]], &nva[i]);
-
-    if (ans[i] == 0) {
-      CU_ASSERT((NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE |
-                 NGHTTP2_NV_FLAG_NO_INDEX) == nva[i].flags);
-    } else {
-      CU_ASSERT((NGHTTP2_NV_FLAG_NO_COPY_NAME |
-                 NGHTTP2_NV_FLAG_NO_COPY_VALUE) == nva[i].flags);
-    }
-  }
-
-  nva.clear();
-  http2::copy_headers_to_nva(nva, headers, http2::HDOP_STRIP_X_FORWARDED_FOR);
-  CU_ASSERT(7 == nva.size());
-  for (size_t i = 0; i < ans.size(); ++i) {
-    check_nv(headers[ans[i]], &nva[i]);
-
-    if (ans[i] == 0) {
-      CU_ASSERT(nva[i].flags & NGHTTP2_NV_FLAG_NO_INDEX);
-    } else {
-      CU_ASSERT(NGHTTP2_NV_FLAG_NONE == nva[i].flags);
-    }
-  }
-
-  nva.clear();
-
-  auto ans2 = std::vector<int>{0, 2, 4, 6};
-  http2::copy_headers_to_nva(nva, headers2, http2::HDOP_NONE);
-  CU_ASSERT(ans2.size() == nva.size());
-  for (size_t i = 0; i < ans2.size(); ++i) {
-    check_nv(headers2[ans2[i]], &nva[i]);
-  }
-
-  nva.clear();
-
-  http2::copy_headers_to_nva(nva, headers2, http2::HDOP_STRIP_ALL);
-  CU_ASSERT(nva.empty());
-}
-
-void test_http2_build_http1_headers_from_headers(void) {
-  MemchunkPool pool;
-  DefaultMemchunks buf(&pool);
-  http2::build_http1_headers_from_headers(&buf, headers,
-                                          http2::HDOP_STRIP_X_FORWARDED_FOR);
-  auto hdrs = std::string(buf.head->pos, buf.head->last);
-  CU_ASSERT("Alpha: 0\r\n"
-            "Bravo: 1\r\n"
-            "Delta: 4\r\n"
-            "Expect: 5\r\n"
-            "Foxtrot: 6\r\n"
-            "Tango: 7\r\n"
-            "Te: 8\r\n"
-            "Te: 9\r\n"
-            "Zulu: 12\r\n" == hdrs);
-
-  buf.reset();
-
-  http2::build_http1_headers_from_headers(&buf, headers2, http2::HDOP_NONE);
-  hdrs = std::string(buf.head->pos, buf.head->last);
-  CU_ASSERT("X-Forwarded-For: xff1\r\n"
-            "X-Forwarded-Proto: xfp1\r\n"
-            "Forwarded: fwd1\r\n"
-            "Via: via1\r\n" == hdrs);
-
-  buf.reset();
-
-  http2::build_http1_headers_from_headers(&buf, headers2,
-                                          http2::HDOP_STRIP_ALL);
-  CU_ASSERT(0 == buf.rleft());
-}
-
-void test_http2_lws(void) {
-  CU_ASSERT(!http2::lws("alpha"));
-  CU_ASSERT(http2::lws(" "));
-  CU_ASSERT(http2::lws(""));
-}
-
-namespace {
-void check_rewrite_location_uri(const std::string &want, const std::string &uri,
-                                const std::string &match_host,
-                                const std::string &req_authority,
-                                const std::string &upstream_scheme) {
-  BlockAllocator balloc(4096, 4096);
-  http_parser_url u{};
-  CU_ASSERT(0 == http_parser_parse_url(uri.c_str(), uri.size(), 0, &u));
-  auto got = http2::rewrite_location_uri(
-      balloc, StringRef{uri}, u, StringRef{match_host},
-      StringRef{req_authority}, StringRef{upstream_scheme});
-  CU_ASSERT(want == got);
-}
-} // namespace
-
-void test_http2_rewrite_location_uri(void) {
-  check_rewrite_location_uri("https://localhost:3000/alpha?bravo#charlie",
-                             "http://localhost:3001/alpha?bravo#charlie",
-                             "localhost:3001", "localhost:3000", "https");
-  check_rewrite_location_uri("https://localhost/", "http://localhost:3001/",
-                             "localhost", "localhost", "https");
-  check_rewrite_location_uri("http://localhost/", "http://localhost:3001/",
-                             "localhost", "localhost", "http");
-  check_rewrite_location_uri("http://localhost:443/", "http://localhost:3001/",
-                             "localhost", "localhost:443", "http");
-  check_rewrite_location_uri("https://localhost:80/", "http://localhost:3001/",
-                             "localhost", "localhost:80", "https");
-  check_rewrite_location_uri("", "http://localhost:3001/", "127.0.0.1",
-                             "127.0.0.1", "https");
-  check_rewrite_location_uri("https://localhost:3000/",
-                             "http://localhost:3001/", "localhost",
-                             "localhost:3000", "https");
-  check_rewrite_location_uri("https://localhost:3000/", "http://localhost/",
-                             "localhost", "localhost:3000", "https");
-
-  // match_host != req_authority
-  check_rewrite_location_uri("https://example.org", "http://127.0.0.1:8080",
-                             "127.0.0.1", "example.org", "https");
-  check_rewrite_location_uri("", "http://example.org", "127.0.0.1",
-                             "example.org", "https");
-}
-
-void test_http2_parse_http_status_code(void) {
-  CU_ASSERT(200 == http2::parse_http_status_code(StringRef::from_lit("200")));
-  CU_ASSERT(102 == http2::parse_http_status_code(StringRef::from_lit("102")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("099")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("99")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("-1")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("20a")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef{}));
-}
-
-void test_http2_index_header(void) {
-  http2::HeaderIndex hdidx;
-  http2::init_hdidx(hdidx);
-
-  http2::index_header(hdidx, http2::HD__AUTHORITY, 0);
-  http2::index_header(hdidx, -1, 1);
-
-  CU_ASSERT(0 == hdidx[http2::HD__AUTHORITY]);
-}
-
-void test_http2_lookup_token(void) {
-  CU_ASSERT(http2::HD__AUTHORITY ==
-            http2::lookup_token(StringRef::from_lit(":authority")));
-  CU_ASSERT(-1 == http2::lookup_token(StringRef::from_lit(":authorit")));
-  CU_ASSERT(-1 == http2::lookup_token(StringRef::from_lit(":Authority")));
-  CU_ASSERT(http2::HD_EXPECT ==
-            http2::lookup_token(StringRef::from_lit("expect")));
-}
-
-void test_http2_parse_link_header(void) {
-  {
-    // only URI appears; we don't extract URI unless it bears rel=preload
-    auto res = http2::parse_link_header(StringRef::from_lit("<url>"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // URI url should be extracted
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // With extra link-param.  URI url should be extracted
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload; as=file"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // With extra link-param.  URI url should be extracted
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; as=file; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // With extra link-param and quote-string.  URI url should be
-    // extracted
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; title="foo,bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // With extra link-param and quote-string.  URI url should be
-    // extracted
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; title="foo,bar"; rel=preload)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // ',' after quote-string
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; title="foo,bar", <url2>; rel=preload)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-  }
-  {
-    // Only first URI should be extracted.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload, <url2>"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // Both have rel=preload, so both urls should be extracted
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload, <url2>; rel=preload"));
-    CU_ASSERT(2 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-    CU_ASSERT("url2" == res[1].uri);
-  }
-  {
-    // Second URI uri should be extracted.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>, <url2>;rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-  }
-  {
-    // Error if input ends with ';'
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>;rel=preload;"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Error if link header ends with ';'
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>;rel=preload;, <url>"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // OK if input ends with ','
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>;rel=preload,"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // Multiple repeated ','s between fields is OK
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>,,,<url2>;rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-  }
-  {
-    // Error if url is not enclosed by <>
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("url>;rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Error if url is not enclosed by <>
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url;rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Empty parameter value is not allowed
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>;rel=preload; as="));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Empty parameter value is not allowed
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>;as=;rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Empty parameter value is not allowed
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>;as=, <url>;rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Empty parameter name is not allowed
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; =file; rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Without whitespaces
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>;as=file;rel=preload,<url2>;rel=preload"));
-    CU_ASSERT(2 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-    CU_ASSERT("url2" == res[1].uri);
-  }
-  {
-    // link-extension may have no value
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>; as; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // ext-name-star
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; foo*=bar; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // '*' is not allowed expect for trailing one
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; *=bar; rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // '*' is not allowed expect for trailing one
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; foo*bar=buzz; rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // ext-name-star must be followed by '='
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; foo*; rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // '>' is not followed by ';'
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url> rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // Starting with whitespace is no problem.
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("  <url>; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload is a prefix of bogus rel parameter value
-    auto res =
-        http2::parse_link_header(StringRef::from_lit("<url>; rel=preloadx"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // preload in relation-types list
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list followed by another parameter
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload foo")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list following another parameter
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="foo preload")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list between other parameters
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="foo preload bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list between other parameters
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="foo   preload   bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // no preload in relation-types list
-    auto res =
-        http2::parse_link_header(StringRef::from_lit(R"(<url>; rel="foo")"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // no preload in relation-types list, multiple unrelated elements.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="foo bar")"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // preload in relation-types list, followed by another link-value.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload", <url2>)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list, following another link-value.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>, <url2>; rel="preload")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-  }
-  {
-    // preload in relation-types list, followed by another link-param.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload"; as="font")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list, followed by character other
-    // than ';' or ','
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload".)"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // preload in relation-types list, followed by ';' but it
-    // terminates input
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload";)"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // preload in relation-types list, followed by ',' but it
-    // terminates input
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload",)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // preload in relation-types list but there is preceding white
-    // space.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=" preload")"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // preload in relation-types list but there is trailing white
-    // space.
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel="preload ")"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // backslash escaped characters in quoted-string
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; title="foo\"baz\"bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // anchor="" is acceptable
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; anchor="")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // With anchor="#foo", url should be ignored
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; anchor="#foo")"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // With anchor=f, url should be ignored
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload; anchor=f"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // First url is ignored With anchor="#foo", but url should be
-    // accepted.
-    auto res = http2::parse_link_header(StringRef::from_lit(
-        R"(<url>; rel=preload; anchor="#foo", <url2>; rel=preload)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-  }
-  {
-    // With loadpolicy="next", url should be ignored
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; loadpolicy="next")"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // url should be picked up if empty loadpolicy is specified
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; loadpolicy="")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // case-insensitive match
-    auto res = http2::parse_link_header(
-        StringRef::from_lit(R"(<url>; rel=preload; ANCHOR="#foo", <url2>; )"
-                            R"(REL=PRELOAD, <url3>; REL="foo PRELOAD bar")"));
-    CU_ASSERT(2 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-    CU_ASSERT("url3" == res[1].uri);
-  }
-  {
-    // nopush at the end of input
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload; nopush"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // nopush followed by ';'
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload; nopush; foo"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // nopush followed by ','
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; nopush; rel=preload"));
-    CU_ASSERT(0 == res.size());
-  }
-  {
-    // string whose prefix is nopush
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; nopushyes; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-  {
-    // rel=preload twice
-    auto res = http2::parse_link_header(
-        StringRef::from_lit("<url>; rel=preload; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-  }
-}
-
-void test_http2_path_join(void) {
-  {
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("/");
-    CU_ASSERT("/" == http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("/alpha");
-    CU_ASSERT("/alpha" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // rel ends with trailing '/'
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("/alpha/");
-    CU_ASSERT("/alpha/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // rel contains multiple components
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("/alpha/bravo");
-    CU_ASSERT("/alpha/bravo" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // rel is relative
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("alpha/bravo");
-    CU_ASSERT("/alpha/bravo" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // rel is relative and base ends without /, which means it refers
-    // to file.
-    auto base = StringRef::from_lit("/alpha");
-    auto rel = StringRef::from_lit("bravo/charlie");
-    CU_ASSERT("/bravo/charlie" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // rel contains repeated '/'s
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("/alpha/////bravo/////");
-    CU_ASSERT("/alpha/bravo/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // base ends with '/', so '..' eats 'bravo'
-    auto base = StringRef::from_lit("/alpha/bravo/");
-    auto rel = StringRef::from_lit("../charlie/delta");
-    CU_ASSERT("/alpha/charlie/delta" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // base does not end with '/', so '..' eats 'alpha/bravo'
-    auto base = StringRef::from_lit("/alpha/bravo");
-    auto rel = StringRef::from_lit("../charlie");
-    CU_ASSERT("/charlie" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // 'charlie' is eaten by following '..'
-    auto base = StringRef::from_lit("/alpha/bravo/");
-    auto rel = StringRef::from_lit("../charlie/../delta");
-    CU_ASSERT("/alpha/delta" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // excessive '..' results in '/'
-    auto base = StringRef::from_lit("/alpha/bravo/");
-    auto rel = StringRef::from_lit("../../../");
-    CU_ASSERT("/" == http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // excessive '..'  and  path component
-    auto base = StringRef::from_lit("/alpha/bravo/");
-    auto rel = StringRef::from_lit("../../../charlie");
-    CU_ASSERT("/charlie" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // rel ends with '..'
-    auto base = StringRef::from_lit("/alpha/bravo/");
-    auto rel = StringRef::from_lit("charlie/..");
-    CU_ASSERT("/alpha/bravo/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // base empty and rel contains '..'
-    auto base = StringRef{};
-    auto rel = StringRef::from_lit("charlie/..");
-    CU_ASSERT("/" == http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // '.' is ignored
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("charlie/././././delta");
-    CU_ASSERT("/charlie/delta" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // trailing '.' is ignored
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("charlie/.");
-    CU_ASSERT("/charlie/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // query
-    auto base = StringRef::from_lit("/");
-    auto rel = StringRef::from_lit("/");
-    auto relq = StringRef::from_lit("q");
-    CU_ASSERT("/?q" == http2::path_join(base, StringRef{}, rel, relq));
-  }
-  {
-    // empty rel and query
-    auto base = StringRef::from_lit("/alpha");
-    auto rel = StringRef{};
-    auto relq = StringRef::from_lit("q");
-    CU_ASSERT("/alpha?q" == http2::path_join(base, StringRef{}, rel, relq));
-  }
-  {
-    // both rel and query are empty
-    auto base = StringRef::from_lit("/alpha");
-    auto baseq = StringRef::from_lit("r");
-    auto rel = StringRef{};
-    auto relq = StringRef{};
-    CU_ASSERT("/alpha?r" == http2::path_join(base, baseq, rel, relq));
-  }
-  {
-    // empty base
-    auto base = StringRef{};
-    auto rel = StringRef::from_lit("/alpha");
-    CU_ASSERT("/alpha" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
-  }
-  {
-    // everything is empty
-    CU_ASSERT("/" == http2::path_join(StringRef{}, StringRef{}, StringRef{},
-                                      StringRef{}));
-  }
-  {
-    // only baseq is not empty
-    auto base = StringRef{};
-    auto baseq = StringRef::from_lit("r");
-    auto rel = StringRef{};
-    CU_ASSERT("/?r" == http2::path_join(base, baseq, rel, StringRef{}));
-  }
-  {
-    // path starts with multiple '/'s.
-    auto base = StringRef{};
-    auto baseq = StringRef{};
-    auto rel = StringRef::from_lit("//alpha//bravo");
-    auto relq = StringRef::from_lit("charlie");
-    CU_ASSERT("/alpha/bravo?charlie" ==
-              http2::path_join(base, baseq, rel, relq));
-  }
-}
-
-void test_http2_normalize_path(void) {
-  CU_ASSERT("/alpha/charlie" ==
-            http2::normalize_path(
-                StringRef::from_lit("/alpha/bravo/../charlie"), StringRef{}));
-
-  CU_ASSERT("/alpha" ==
-            http2::normalize_path(StringRef::from_lit("/a%6c%70%68%61"),
-                                  StringRef{}));
-
-  CU_ASSERT(
-      "/alpha%2F%3A" ==
-      http2::normalize_path(StringRef::from_lit("/alpha%2f%3a"), StringRef{}));
-
-  CU_ASSERT("/%2F" ==
-            http2::normalize_path(StringRef::from_lit("%2f"), StringRef{}));
-
-  CU_ASSERT("/%f" ==
-            http2::normalize_path(StringRef::from_lit("%f"), StringRef{}));
-
-  CU_ASSERT("/%" ==
-            http2::normalize_path(StringRef::from_lit("%"), StringRef{}));
-
-  CU_ASSERT("/" == http2::normalize_path(StringRef{}, StringRef{}));
-
-  CU_ASSERT("/alpha?bravo" ==
-            http2::normalize_path(StringRef::from_lit("/alpha"),
-                                  StringRef::from_lit("bravo")));
-}
-
-void test_http2_rewrite_clean_path(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  // unreserved characters
-  CU_ASSERT("/alpha/bravo/" ==
-            http2::rewrite_clean_path(balloc,
-                                      StringRef::from_lit("/alpha/%62ravo/")));
-
-  // percent-encoding is converted to upper case.
-  CU_ASSERT("/delta%3A" == http2::rewrite_clean_path(
-                               balloc, StringRef::from_lit("/delta%3a")));
-
-  // path component is normalized before mathcing
-  CU_ASSERT(
-      "/alpha/bravo/" ==
-      http2::rewrite_clean_path(
-          balloc, StringRef::from_lit("/alpha/charlie/%2e././bravo/delta/..")));
-
-  CU_ASSERT("alpha%3a" ==
-            http2::rewrite_clean_path(balloc, StringRef::from_lit("alpha%3a")));
-
-  CU_ASSERT("" == http2::rewrite_clean_path(balloc, StringRef{}));
-
-  CU_ASSERT(
-      "/alpha?bravo" ==
-      http2::rewrite_clean_path(balloc, StringRef::from_lit("//alpha?bravo")));
-}
-
-void test_http2_get_pure_path_component(void) {
-  CU_ASSERT("/" == http2::get_pure_path_component(StringRef::from_lit("/")));
-
-  CU_ASSERT("/foo" ==
-            http2::get_pure_path_component(StringRef::from_lit("/foo")));
-
-  CU_ASSERT("/bar" == http2::get_pure_path_component(
-                          StringRef::from_lit("https://example.org/bar")));
-
-  CU_ASSERT("/alpha" == http2::get_pure_path_component(StringRef::from_lit(
-                            "https://example.org/alpha?q=a")));
-
-  CU_ASSERT("/bravo" == http2::get_pure_path_component(StringRef::from_lit(
-                            "https://example.org/bravo?q=a#fragment")));
-
-  CU_ASSERT("" ==
-            http2::get_pure_path_component(StringRef::from_lit("\x01\x02")));
-}
-
-void test_http2_construct_push_component(void) {
-  BlockAllocator balloc(4096, 4096);
-  StringRef base, uri;
-  StringRef scheme, authority, path;
-
-  base = StringRef::from_lit("/b/");
-  uri = StringRef::from_lit("https://example.org/foo");
-
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("https" == scheme);
-  CU_ASSERT("example.org" == authority);
-  CU_ASSERT("/foo" == path);
-
-  scheme = StringRef{};
-  authority = StringRef{};
-  path = StringRef{};
-
-  uri = StringRef::from_lit("/foo/bar?q=a");
-
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/foo/bar?q=a" == path);
-
-  scheme = StringRef{};
-  authority = StringRef{};
-  path = StringRef{};
-
-  uri = StringRef::from_lit("foo/../bar?q=a");
-
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/b/bar?q=a" == path);
-
-  scheme = StringRef{};
-  authority = StringRef{};
-  path = StringRef{};
-
-  uri = StringRef{};
-
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/" == path);
-
-  scheme = StringRef{};
-  authority = StringRef{};
-  path = StringRef{};
-
-  uri = StringRef::from_lit("?q=a");
-
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/b/?q=a" == path);
-}
-
-void test_http2_contains_trailers(void) {
-  CU_ASSERT(!http2::contains_trailers(StringRef::from_lit("")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("trailers")));
-  // Match must be case-insensitive.
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("TRAILERS")));
-  CU_ASSERT(!http2::contains_trailers(StringRef::from_lit("trailer")));
-  CU_ASSERT(!http2::contains_trailers(StringRef::from_lit("trailers  3")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("trailers,")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("trailers,foo")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("foo,trailers")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("foo,trailers,bar")));
-  CU_ASSERT(
-      http2::contains_trailers(StringRef::from_lit("foo, trailers ,bar")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit(",trailers")));
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http2_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP2_TEST_H
-#define SHRPX_HTTP2_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_http2_add_header(void);
-void test_http2_get_header(void);
-void test_http2_copy_headers_to_nva(void);
-void test_http2_build_http1_headers_from_headers(void);
-void test_http2_lws(void);
-void test_http2_rewrite_location_uri(void);
-void test_http2_parse_http_status_code(void);
-void test_http2_index_header(void);
-void test_http2_lookup_token(void);
-void test_http2_parse_link_header(void);
-void test_http2_path_join(void);
-void test_http2_normalize_path(void);
-void test_http2_rewrite_clean_path(void);
-void test_http2_get_pure_path_component(void);
-void test_http2_construct_push_component(void);
-void test_http2_contains_trailers(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP2_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http-parser.patch cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http-parser.patch
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/http-parser.patch	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/http-parser.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-commit a143133d43420ef89e4ba0d84c73998863cf9f81
-Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date:   Wed Jul 11 18:46:00 2012 +0900
-
-    Use http_parser for tunneling connection transparently
-
-diff --git a/examples/http-parser/http_parser.c b/examples/http-parser/http_parser.c
-index 0c11eb8..610da57 100644
---- a/examples/http-parser/http_parser.c
-+++ b/examples/http-parser/http_parser.c
-@@ -1627,9 +1627,14 @@ size_t http_parser_execute (http_parser *parser,
- 
-         /* Exit, the rest of the connect is in a different protocol. */
-         if (parser->upgrade) {
--          parser->state = NEW_MESSAGE();
--          CALLBACK_NOTIFY(message_complete);
--          return (p - data) + 1;
-+          /* We want to use http_parser for tunneling connection
-+             transparently */
-+          /* Read body until EOF */
-+          parser->state = s_body_identity_eof;
-+          break;
-+          /* parser->state = NEW_MESSAGE(); */
-+          /* CALLBACK_NOTIFY(message_complete); */
-+          /* return (p - data) + 1; */
-         }
- 
-         if (parser->flags & F_SKIPBODY) {
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2256 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "HttpServer.h"
-
-#include <sys/stat.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#include <netinet/tcp.h>
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif // HAVE_ARPA_INET_H
-
-#include <cassert>
-#include <set>
-#include <iostream>
-#include <thread>
-#include <mutex>
-#include <deque>
-
-#include <openssl/err.h>
-#include <openssl/dh.h>
-
-#include <zlib.h>
-
-#include "app_helper.h"
-#include "http2.h"
-#include "util.h"
-#include "tls.h"
-#include "template.h"
-
-#ifndef O_BINARY
-#  define O_BINARY (0)
-#endif // O_BINARY
-
-namespace nghttp2 {
-
-namespace {
-// TODO could be constexpr
-constexpr auto DEFAULT_HTML = StringRef::from_lit("index.html");
-constexpr auto NGHTTPD_SERVER =
-    StringRef::from_lit("nghttpd nghttp2/" NGHTTP2_VERSION);
-} // namespace
-
-namespace {
-void delete_handler(Http2Handler *handler) {
-  handler->remove_self();
-  delete handler;
-}
-} // namespace
-
-namespace {
-void print_session_id(int64_t id) { std::cout << "[id=" << id << "] "; }
-} // namespace
-
-Config::Config()
-    : mime_types_file("/etc/mime.types"),
-      stream_read_timeout(1_min),
-      stream_write_timeout(1_min),
-      data_ptr(nullptr),
-      padding(0),
-      num_worker(1),
-      max_concurrent_streams(100),
-      header_table_size(-1),
-      encoder_header_table_size(-1),
-      window_bits(-1),
-      connection_window_bits(-1),
-      port(0),
-      verbose(false),
-      daemon(false),
-      verify_client(false),
-      no_tls(false),
-      error_gzip(false),
-      early_response(false),
-      hexdump(false),
-      echo_upload(false),
-      no_content_length(false) {}
-
-Config::~Config() {}
-
-namespace {
-void stream_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  int rv;
-  auto stream = static_cast<Stream *>(w->data);
-  auto hd = stream->handler;
-  auto config = hd->get_config();
-
-  ev_timer_stop(hd->get_loop(), &stream->rtimer);
-  ev_timer_stop(hd->get_loop(), &stream->wtimer);
-
-  if (config->verbose) {
-    print_session_id(hd->session_id());
-    print_timer();
-    std::cout << " timeout stream_id=" << stream->stream_id << std::endl;
-  }
-
-  hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
-
-  rv = hd->on_write();
-  if (rv == -1) {
-    delete_handler(hd);
-  }
-}
-} // namespace
-
-namespace {
-void add_stream_read_timeout(Stream *stream) {
-  auto hd = stream->handler;
-  ev_timer_again(hd->get_loop(), &stream->rtimer);
-}
-} // namespace
-
-namespace {
-void add_stream_read_timeout_if_pending(Stream *stream) {
-  auto hd = stream->handler;
-  if (ev_is_active(&stream->rtimer)) {
-    ev_timer_again(hd->get_loop(), &stream->rtimer);
-  }
-}
-} // namespace
-
-namespace {
-void add_stream_write_timeout(Stream *stream) {
-  auto hd = stream->handler;
-  ev_timer_again(hd->get_loop(), &stream->wtimer);
-}
-} // namespace
-
-namespace {
-void remove_stream_read_timeout(Stream *stream) {
-  auto hd = stream->handler;
-  ev_timer_stop(hd->get_loop(), &stream->rtimer);
-}
-} // namespace
-
-namespace {
-void remove_stream_write_timeout(Stream *stream) {
-  auto hd = stream->handler;
-  ev_timer_stop(hd->get_loop(), &stream->wtimer);
-}
-} // namespace
-
-namespace {
-void fill_callback(nghttp2_session_callbacks *callbacks, const Config *config);
-} // namespace
-
-namespace {
-constexpr ev_tstamp RELEASE_FD_TIMEOUT = 2.;
-} // namespace
-
-namespace {
-void release_fd_cb(struct ev_loop *loop, ev_timer *w, int revents);
-} // namespace
-
-namespace {
-constexpr ev_tstamp FILE_ENTRY_MAX_AGE = 10.;
-} // namespace
-
-namespace {
-constexpr size_t FILE_ENTRY_EVICT_THRES = 2048;
-} // namespace
-
-namespace {
-bool need_validation_file_entry(const FileEntry *ent, ev_tstamp now) {
-  return ent->last_valid + FILE_ENTRY_MAX_AGE < now;
-}
-} // namespace
-
-namespace {
-bool validate_file_entry(FileEntry *ent, ev_tstamp now) {
-  struct stat stbuf;
-  int rv;
-
-  rv = fstat(ent->fd, &stbuf);
-  if (rv != 0) {
-    ent->stale = true;
-    return false;
-  }
-
-  if (stbuf.st_nlink == 0 || ent->mtime != stbuf.st_mtime) {
-    ent->stale = true;
-    return false;
-  }
-
-  ent->mtime = stbuf.st_mtime;
-  ent->last_valid = now;
-
-  return true;
-}
-} // namespace
-
-class Sessions {
-public:
-  Sessions(HttpServer *sv, struct ev_loop *loop, const Config *config,
-           SSL_CTX *ssl_ctx)
-      : sv_(sv),
-        loop_(loop),
-        config_(config),
-        ssl_ctx_(ssl_ctx),
-        callbacks_(nullptr),
-        option_(nullptr),
-        next_session_id_(1),
-        tstamp_cached_(ev_now(loop)),
-        cached_date_(util::http_date(tstamp_cached_)) {
-    nghttp2_session_callbacks_new(&callbacks_);
-
-    fill_callback(callbacks_, config_);
-
-    nghttp2_option_new(&option_);
-
-    if (config_->encoder_header_table_size != -1) {
-      nghttp2_option_set_max_deflate_dynamic_table_size(
-          option_, config_->encoder_header_table_size);
-    }
-
-    ev_timer_init(&release_fd_timer_, release_fd_cb, 0., RELEASE_FD_TIMEOUT);
-    release_fd_timer_.data = this;
-  }
-  ~Sessions() {
-    ev_timer_stop(loop_, &release_fd_timer_);
-    for (auto handler : handlers_) {
-      delete handler;
-    }
-    nghttp2_option_del(option_);
-    nghttp2_session_callbacks_del(callbacks_);
-  }
-  void add_handler(Http2Handler *handler) { handlers_.insert(handler); }
-  void remove_handler(Http2Handler *handler) {
-    handlers_.erase(handler);
-    if (handlers_.empty() && !fd_cache_.empty()) {
-      ev_timer_again(loop_, &release_fd_timer_);
-    }
-  }
-  SSL_CTX *get_ssl_ctx() const { return ssl_ctx_; }
-  SSL *ssl_session_new(int fd) {
-    SSL *ssl = SSL_new(ssl_ctx_);
-    if (!ssl) {
-      std::cerr << "SSL_new() failed" << std::endl;
-      return nullptr;
-    }
-    if (SSL_set_fd(ssl, fd) == 0) {
-      std::cerr << "SSL_set_fd() failed" << std::endl;
-      SSL_free(ssl);
-      return nullptr;
-    }
-    return ssl;
-  }
-  const Config *get_config() const { return config_; }
-  struct ev_loop *get_loop() const {
-    return loop_;
-  }
-  int64_t get_next_session_id() {
-    auto session_id = next_session_id_;
-    if (next_session_id_ == std::numeric_limits<int64_t>::max()) {
-      next_session_id_ = 1;
-    } else {
-      ++next_session_id_;
-    }
-    return session_id;
-  }
-  const nghttp2_session_callbacks *get_callbacks() const { return callbacks_; }
-  const nghttp2_option *get_option() const { return option_; }
-  void accept_connection(int fd) {
-    util::make_socket_nodelay(fd);
-    SSL *ssl = nullptr;
-    if (ssl_ctx_) {
-      ssl = ssl_session_new(fd);
-      if (!ssl) {
-        close(fd);
-        return;
-      }
-    }
-    auto handler =
-        make_unique<Http2Handler>(this, fd, ssl, get_next_session_id());
-    if (!ssl) {
-      if (handler->connection_made() != 0) {
-        return;
-      }
-    }
-    add_handler(handler.release());
-  }
-  void update_cached_date() { cached_date_ = util::http_date(tstamp_cached_); }
-  const std::string &get_cached_date() {
-    auto t = ev_now(loop_);
-    if (t != tstamp_cached_) {
-      tstamp_cached_ = t;
-      update_cached_date();
-    }
-    return cached_date_;
-  }
-  FileEntry *get_cached_fd(const std::string &path) {
-    auto range = fd_cache_.equal_range(path);
-    if (range.first == range.second) {
-      return nullptr;
-    }
-
-    auto now = ev_now(loop_);
-
-    for (auto it = range.first; it != range.second;) {
-      auto &ent = (*it).second;
-      if (ent->stale) {
-        ++it;
-        continue;
-      }
-      if (need_validation_file_entry(ent.get(), now) &&
-          !validate_file_entry(ent.get(), now)) {
-        if (ent->usecount == 0) {
-          fd_cache_lru_.remove(ent.get());
-          close(ent->fd);
-          it = fd_cache_.erase(it);
-          continue;
-        }
-        ++it;
-        continue;
-      }
-
-      fd_cache_lru_.remove(ent.get());
-      fd_cache_lru_.append(ent.get());
-
-      ++ent->usecount;
-      return ent.get();
-    }
-    return nullptr;
-  }
-  FileEntry *cache_fd(const std::string &path, const FileEntry &ent) {
-#ifdef HAVE_STD_MAP_EMPLACE
-    auto rv = fd_cache_.emplace(path, make_unique<FileEntry>(ent));
-#else  // !HAVE_STD_MAP_EMPLACE
-    // for gcc-4.7
-    auto rv =
-        fd_cache_.insert(std::make_pair(path, make_unique<FileEntry>(ent)));
-#endif // !HAVE_STD_MAP_EMPLACE
-    auto &res = (*rv).second;
-    res->it = rv;
-    fd_cache_lru_.append(res.get());
-
-    while (fd_cache_.size() > FILE_ENTRY_EVICT_THRES) {
-      auto ent = fd_cache_lru_.head;
-      if (ent->usecount) {
-        break;
-      }
-      fd_cache_lru_.remove(ent);
-      close(ent->fd);
-      fd_cache_.erase(ent->it);
-    }
-
-    return res.get();
-  }
-  void release_fd(FileEntry *target) {
-    --target->usecount;
-
-    if (target->usecount == 0 && target->stale) {
-      fd_cache_lru_.remove(target);
-      close(target->fd);
-      fd_cache_.erase(target->it);
-      return;
-    }
-
-    // We use timer to close file descriptor and delete the entry from
-    // cache.  The timer will be started when there is no handler.
-  }
-  void release_unused_fd() {
-    for (auto i = std::begin(fd_cache_); i != std::end(fd_cache_);) {
-      auto &ent = (*i).second;
-      if (ent->usecount != 0) {
-        ++i;
-        continue;
-      }
-
-      fd_cache_lru_.remove(ent.get());
-      close(ent->fd);
-      i = fd_cache_.erase(i);
-    }
-  }
-  const HttpServer *get_server() const { return sv_; }
-  bool handlers_empty() const { return handlers_.empty(); }
-
-private:
-  std::set<Http2Handler *> handlers_;
-  // cache for file descriptors to read file.
-  std::multimap<std::string, std::unique_ptr<FileEntry>> fd_cache_;
-  DList<FileEntry> fd_cache_lru_;
-  HttpServer *sv_;
-  struct ev_loop *loop_;
-  const Config *config_;
-  SSL_CTX *ssl_ctx_;
-  nghttp2_session_callbacks *callbacks_;
-  nghttp2_option *option_;
-  ev_timer release_fd_timer_;
-  int64_t next_session_id_;
-  ev_tstamp tstamp_cached_;
-  std::string cached_date_;
-};
-
-namespace {
-void release_fd_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto sessions = static_cast<Sessions *>(w->data);
-
-  ev_timer_stop(loop, w);
-
-  if (!sessions->handlers_empty()) {
-    return;
-  }
-
-  sessions->release_unused_fd();
-}
-} // namespace
-
-Stream::Stream(Http2Handler *handler, int32_t stream_id)
-    : balloc(1024, 1024),
-      header{},
-      handler(handler),
-      file_ent(nullptr),
-      body_length(0),
-      body_offset(0),
-      header_buffer_size(0),
-      stream_id(stream_id),
-      echo_upload(false) {
-  auto config = handler->get_config();
-  ev_timer_init(&rtimer, stream_timeout_cb, 0., config->stream_read_timeout);
-  ev_timer_init(&wtimer, stream_timeout_cb, 0., config->stream_write_timeout);
-  rtimer.data = this;
-  wtimer.data = this;
-}
-
-Stream::~Stream() {
-  if (file_ent != nullptr) {
-    auto sessions = handler->get_sessions();
-    sessions->release_fd(file_ent);
-  }
-
-  auto &rcbuf = header.rcbuf;
-  nghttp2_rcbuf_decref(rcbuf.method);
-  nghttp2_rcbuf_decref(rcbuf.scheme);
-  nghttp2_rcbuf_decref(rcbuf.authority);
-  nghttp2_rcbuf_decref(rcbuf.host);
-  nghttp2_rcbuf_decref(rcbuf.path);
-  nghttp2_rcbuf_decref(rcbuf.ims);
-  nghttp2_rcbuf_decref(rcbuf.expect);
-
-  auto loop = handler->get_loop();
-  ev_timer_stop(loop, &rtimer);
-  ev_timer_stop(loop, &wtimer);
-}
-
-namespace {
-void on_session_closed(Http2Handler *hd, int64_t session_id) {
-  if (hd->get_config()->verbose) {
-    print_session_id(session_id);
-    print_timer();
-    std::cout << " closed" << std::endl;
-  }
-}
-} // namespace
-
-namespace {
-void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  int rv;
-  auto hd = static_cast<Http2Handler *>(w->data);
-  hd->terminate_session(NGHTTP2_SETTINGS_TIMEOUT);
-  rv = hd->on_write();
-  if (rv == -1) {
-    delete_handler(hd);
-  }
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto handler = static_cast<Http2Handler *>(w->data);
-
-  rv = handler->on_read();
-  if (rv == -1) {
-    delete_handler(handler);
-  }
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto handler = static_cast<Http2Handler *>(w->data);
-
-  rv = handler->on_write();
-  if (rv == -1) {
-    delete_handler(handler);
-  }
-}
-} // namespace
-
-Http2Handler::Http2Handler(Sessions *sessions, int fd, SSL *ssl,
-                           int64_t session_id)
-    : session_id_(session_id),
-      session_(nullptr),
-      sessions_(sessions),
-      ssl_(ssl),
-      data_pending_(nullptr),
-      data_pendinglen_(0),
-      fd_(fd) {
-  ev_timer_init(&settings_timerev_, settings_timeout_cb, 10., 0.);
-  ev_io_init(&wev_, writecb, fd, EV_WRITE);
-  ev_io_init(&rev_, readcb, fd, EV_READ);
-
-  settings_timerev_.data = this;
-  wev_.data = this;
-  rev_.data = this;
-
-  auto loop = sessions_->get_loop();
-  ev_io_start(loop, &rev_);
-
-  if (ssl) {
-    SSL_set_accept_state(ssl);
-    read_ = &Http2Handler::tls_handshake;
-    write_ = &Http2Handler::tls_handshake;
-  } else {
-    read_ = &Http2Handler::read_clear;
-    write_ = &Http2Handler::write_clear;
-  }
-}
-
-Http2Handler::~Http2Handler() {
-  on_session_closed(this, session_id_);
-  nghttp2_session_del(session_);
-  if (ssl_) {
-    SSL_set_shutdown(ssl_, SSL_get_shutdown(ssl_) | SSL_RECEIVED_SHUTDOWN);
-    ERR_clear_error();
-    SSL_shutdown(ssl_);
-  }
-  auto loop = sessions_->get_loop();
-  ev_timer_stop(loop, &settings_timerev_);
-  ev_io_stop(loop, &rev_);
-  ev_io_stop(loop, &wev_);
-  if (ssl_) {
-    SSL_free(ssl_);
-  }
-  shutdown(fd_, SHUT_WR);
-  close(fd_);
-}
-
-void Http2Handler::remove_self() { sessions_->remove_handler(this); }
-
-struct ev_loop *Http2Handler::get_loop() const {
-  return sessions_->get_loop();
-}
-
-Http2Handler::WriteBuf *Http2Handler::get_wb() { return &wb_; }
-
-void Http2Handler::start_settings_timer() {
-  ev_timer_start(sessions_->get_loop(), &settings_timerev_);
-}
-
-int Http2Handler::fill_wb() {
-  if (data_pending_) {
-    auto n = std::min(wb_.wleft(), data_pendinglen_);
-    wb_.write(data_pending_, n);
-    if (n < data_pendinglen_) {
-      data_pending_ += n;
-      data_pendinglen_ -= n;
-      return 0;
-    }
-
-    data_pending_ = nullptr;
-    data_pendinglen_ = 0;
-  }
-
-  for (;;) {
-    const uint8_t *data;
-    auto datalen = nghttp2_session_mem_send(session_, &data);
-
-    if (datalen < 0) {
-      std::cerr << "nghttp2_session_mem_send() returned error: "
-                << nghttp2_strerror(datalen) << std::endl;
-      return -1;
-    }
-    if (datalen == 0) {
-      break;
-    }
-    auto n = wb_.write(data, datalen);
-    if (n < static_cast<decltype(n)>(datalen)) {
-      data_pending_ = data + n;
-      data_pendinglen_ = datalen - n;
-      break;
-    }
-  }
-  return 0;
-}
-
-int Http2Handler::read_clear() {
-  int rv;
-  std::array<uint8_t, 8_k> buf;
-
-  for (;;) {
-    ssize_t nread;
-    while ((nread = read(fd_, buf.data(), buf.size())) == -1 && errno == EINTR)
-      ;
-    if (nread == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        break;
-      }
-      return -1;
-    }
-    if (nread == 0) {
-      return -1;
-    }
-
-    if (get_config()->hexdump) {
-      util::hexdump(stdout, buf.data(), nread);
-    }
-
-    rv = nghttp2_session_mem_recv(session_, buf.data(), nread);
-    if (rv < 0) {
-      if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
-        std::cerr << "nghttp2_session_mem_recv() returned error: "
-                  << nghttp2_strerror(rv) << std::endl;
-      }
-      return -1;
-    }
-  }
-
-  return write_(*this);
-}
-
-int Http2Handler::write_clear() {
-  auto loop = sessions_->get_loop();
-  for (;;) {
-    if (wb_.rleft() > 0) {
-      ssize_t nwrite;
-      while ((nwrite = write(fd_, wb_.pos, wb_.rleft())) == -1 &&
-             errno == EINTR)
-        ;
-      if (nwrite == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-          ev_io_start(loop, &wev_);
-          return 0;
-        }
-        return -1;
-      }
-      wb_.drain(nwrite);
-      continue;
-    }
-    wb_.reset();
-    if (fill_wb() != 0) {
-      return -1;
-    }
-    if (wb_.rleft() == 0) {
-      break;
-    }
-  }
-
-  if (wb_.rleft() == 0) {
-    ev_io_stop(loop, &wev_);
-  } else {
-    ev_io_start(loop, &wev_);
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int Http2Handler::tls_handshake() {
-  ev_io_stop(sessions_->get_loop(), &wev_);
-
-  ERR_clear_error();
-
-  auto rv = SSL_do_handshake(ssl_);
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(ssl_, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      return 0;
-    case SSL_ERROR_WANT_WRITE:
-      ev_io_start(sessions_->get_loop(), &wev_);
-      return 0;
-    default:
-      return -1;
-    }
-  }
-
-  if (sessions_->get_config()->verbose) {
-    std::cerr << "SSL/TLS handshake completed" << std::endl;
-  }
-
-  if (verify_npn_result() != 0) {
-    return -1;
-  }
-
-  read_ = &Http2Handler::read_tls;
-  write_ = &Http2Handler::write_tls;
-
-  if (connection_made() != 0) {
-    return -1;
-  }
-
-  if (sessions_->get_config()->verbose) {
-    if (SSL_session_reused(ssl_)) {
-      std::cerr << "SSL/TLS session reused" << std::endl;
-    }
-  }
-
-  return 0;
-}
-
-int Http2Handler::read_tls() {
-  std::array<uint8_t, 8_k> buf;
-
-  ERR_clear_error();
-
-  for (;;) {
-    auto rv = SSL_read(ssl_, buf.data(), buf.size());
-
-    if (rv <= 0) {
-      auto err = SSL_get_error(ssl_, rv);
-      switch (err) {
-      case SSL_ERROR_WANT_READ:
-        goto fin;
-      case SSL_ERROR_WANT_WRITE:
-        // renegotiation started
-        return -1;
-      default:
-        return -1;
-      }
-    }
-
-    auto nread = rv;
-
-    if (get_config()->hexdump) {
-      util::hexdump(stdout, buf.data(), nread);
-    }
-
-    rv = nghttp2_session_mem_recv(session_, buf.data(), nread);
-    if (rv < 0) {
-      if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
-        std::cerr << "nghttp2_session_mem_recv() returned error: "
-                  << nghttp2_strerror(rv) << std::endl;
-      }
-      return -1;
-    }
-  }
-
-fin:
-  return write_(*this);
-}
-
-int Http2Handler::write_tls() {
-  auto loop = sessions_->get_loop();
-
-  ERR_clear_error();
-
-  for (;;) {
-    if (wb_.rleft() > 0) {
-      auto rv = SSL_write(ssl_, wb_.pos, wb_.rleft());
-
-      if (rv <= 0) {
-        auto err = SSL_get_error(ssl_, rv);
-        switch (err) {
-        case SSL_ERROR_WANT_READ:
-          // renegotiation started
-          return -1;
-        case SSL_ERROR_WANT_WRITE:
-          ev_io_start(sessions_->get_loop(), &wev_);
-          return 0;
-        default:
-          return -1;
-        }
-      }
-
-      wb_.drain(rv);
-      continue;
-    }
-    wb_.reset();
-    if (fill_wb() != 0) {
-      return -1;
-    }
-    if (wb_.rleft() == 0) {
-      break;
-    }
-  }
-
-  if (wb_.rleft() == 0) {
-    ev_io_stop(loop, &wev_);
-  } else {
-    ev_io_start(loop, &wev_);
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int Http2Handler::on_read() { return read_(*this); }
-
-int Http2Handler::on_write() { return write_(*this); }
-
-int Http2Handler::connection_made() {
-  int r;
-
-  r = nghttp2_session_server_new2(&session_, sessions_->get_callbacks(), this,
-                                  sessions_->get_option());
-
-  if (r != 0) {
-    return r;
-  }
-
-  auto config = sessions_->get_config();
-  std::array<nghttp2_settings_entry, 4> entry;
-  size_t niv = 1;
-
-  entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  entry[0].value = config->max_concurrent_streams;
-
-  if (config->header_table_size >= 0) {
-    entry[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-    entry[niv].value = config->header_table_size;
-    ++niv;
-  }
-
-  if (config->window_bits != -1) {
-    entry[niv].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-    entry[niv].value = (1 << config->window_bits) - 1;
-    ++niv;
-  }
-
-  r = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, entry.data(), niv);
-  if (r != 0) {
-    return r;
-  }
-
-  if (config->connection_window_bits != -1) {
-    r = nghttp2_session_set_local_window_size(
-        session_, NGHTTP2_FLAG_NONE, 0,
-        (1 << config->connection_window_bits) - 1);
-    if (r != 0) {
-      return r;
-    }
-  }
-
-  if (ssl_ && !nghttp2::tls::check_http2_requirement(ssl_)) {
-    terminate_session(NGHTTP2_INADEQUATE_SECURITY);
-  }
-
-  return on_write();
-}
-
-int Http2Handler::verify_npn_result() {
-  const unsigned char *next_proto = nullptr;
-  unsigned int next_proto_len;
-  // Check the negotiated protocol in NPN or ALPN
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_get0_next_proto_negotiated(ssl_, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-  for (int i = 0; i < 2; ++i) {
-    if (next_proto) {
-      auto proto = StringRef{next_proto, next_proto_len};
-      if (sessions_->get_config()->verbose) {
-        std::cout << "The negotiated protocol: " << proto << std::endl;
-      }
-      if (util::check_h2_is_selected(proto)) {
-        return 0;
-      }
-      break;
-    } else {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-      SSL_get0_alpn_selected(ssl_, &next_proto, &next_proto_len);
-#else  // OPENSSL_VERSION_NUMBER < 0x10002000L
-      break;
-#endif // OPENSSL_VERSION_NUMBER < 0x10002000L
-    }
-  }
-  if (sessions_->get_config()->verbose) {
-    std::cerr << "Client did not advertise HTTP/2 protocol."
-              << " (nghttp2 expects " << NGHTTP2_PROTO_VERSION_ID << ")"
-              << std::endl;
-  }
-  return -1;
-}
-
-int Http2Handler::submit_file_response(const StringRef &status, Stream *stream,
-                                       time_t last_modified, off_t file_length,
-                                       const std::string *content_type,
-                                       nghttp2_data_provider *data_prd) {
-  std::string last_modified_str;
-  auto nva = make_array(http2::make_nv_ls_nocopy(":status", status),
-                        http2::make_nv_ls_nocopy("server", NGHTTPD_SERVER),
-                        http2::make_nv_ll("cache-control", "max-age=3600"),
-                        http2::make_nv_ls("date", sessions_->get_cached_date()),
-                        http2::make_nv_ll("", ""), http2::make_nv_ll("", ""),
-                        http2::make_nv_ll("", ""), http2::make_nv_ll("", ""));
-  size_t nvlen = 4;
-  if (!get_config()->no_content_length) {
-    nva[nvlen++] = http2::make_nv_ls_nocopy(
-        "content-length",
-        util::make_string_ref_uint(stream->balloc, file_length));
-  }
-  if (last_modified != 0) {
-    last_modified_str = util::http_date(last_modified);
-    nva[nvlen++] = http2::make_nv_ls("last-modified", last_modified_str);
-  }
-  if (content_type) {
-    nva[nvlen++] = http2::make_nv_ls("content-type", *content_type);
-  }
-  auto &trailer_names = get_config()->trailer_names;
-  if (!trailer_names.empty()) {
-    nva[nvlen++] = http2::make_nv_ls_nocopy("trailer", trailer_names);
-  }
-  return nghttp2_submit_response(session_, stream->stream_id, nva.data(), nvlen,
-                                 data_prd);
-}
-
-int Http2Handler::submit_response(const StringRef &status, int32_t stream_id,
-                                  const HeaderRefs &headers,
-                                  nghttp2_data_provider *data_prd) {
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(4 + headers.size());
-  nva.push_back(http2::make_nv_ls_nocopy(":status", status));
-  nva.push_back(http2::make_nv_ls_nocopy("server", NGHTTPD_SERVER));
-  nva.push_back(http2::make_nv_ls("date", sessions_->get_cached_date()));
-
-  if (data_prd) {
-    auto &trailer_names = get_config()->trailer_names;
-    if (!trailer_names.empty()) {
-      nva.push_back(http2::make_nv_ls_nocopy("trailer", trailer_names));
-    }
-  }
-
-  for (auto &nv : headers) {
-    nva.push_back(http2::make_nv_nocopy(nv.name, nv.value, nv.no_index));
-  }
-  int r = nghttp2_submit_response(session_, stream_id, nva.data(), nva.size(),
-                                  data_prd);
-  return r;
-}
-
-int Http2Handler::submit_response(const StringRef &status, int32_t stream_id,
-                                  nghttp2_data_provider *data_prd) {
-  auto nva = make_array(http2::make_nv_ls_nocopy(":status", status),
-                        http2::make_nv_ls_nocopy("server", NGHTTPD_SERVER),
-                        http2::make_nv_ls("date", sessions_->get_cached_date()),
-                        http2::make_nv_ll("", ""));
-  size_t nvlen = 3;
-
-  if (data_prd) {
-    auto &trailer_names = get_config()->trailer_names;
-    if (!trailer_names.empty()) {
-      nva[nvlen++] = http2::make_nv_ls_nocopy("trailer", trailer_names);
-    }
-  }
-
-  return nghttp2_submit_response(session_, stream_id, nva.data(), nvlen,
-                                 data_prd);
-}
-
-int Http2Handler::submit_non_final_response(const std::string &status,
-                                            int32_t stream_id) {
-  auto nva = make_array(http2::make_nv_ls(":status", status));
-  return nghttp2_submit_headers(session_, NGHTTP2_FLAG_NONE, stream_id, nullptr,
-                                nva.data(), nva.size(), nullptr);
-}
-
-int Http2Handler::submit_push_promise(Stream *stream,
-                                      const StringRef &push_path) {
-  auto authority = stream->header.authority;
-
-  if (authority.empty()) {
-    authority = stream->header.host;
-  }
-
-  auto scheme = get_config()->no_tls ? StringRef::from_lit("http")
-                                     : StringRef::from_lit("https");
-
-  auto nva = make_array(http2::make_nv_ll(":method", "GET"),
-                        http2::make_nv_ls_nocopy(":path", push_path),
-                        http2::make_nv_ls_nocopy(":scheme", scheme),
-                        http2::make_nv_ls_nocopy(":authority", authority));
-
-  auto promised_stream_id = nghttp2_submit_push_promise(
-      session_, NGHTTP2_FLAG_END_HEADERS, stream->stream_id, nva.data(),
-      nva.size(), nullptr);
-
-  if (promised_stream_id < 0) {
-    return promised_stream_id;
-  }
-
-  auto promised_stream = make_unique<Stream>(this, promised_stream_id);
-
-  auto &promised_header = promised_stream->header;
-  promised_header.method = StringRef::from_lit("GET");
-  promised_header.path = push_path;
-  promised_header.scheme = scheme;
-  promised_header.authority =
-      make_string_ref(promised_stream->balloc, authority);
-
-  add_stream(promised_stream_id, std::move(promised_stream));
-
-  return 0;
-}
-
-int Http2Handler::submit_rst_stream(Stream *stream, uint32_t error_code) {
-  remove_stream_read_timeout(stream);
-  remove_stream_write_timeout(stream);
-
-  return nghttp2_submit_rst_stream(session_, NGHTTP2_FLAG_NONE,
-                                   stream->stream_id, error_code);
-}
-
-void Http2Handler::add_stream(int32_t stream_id,
-                              std::unique_ptr<Stream> stream) {
-  id2stream_[stream_id] = std::move(stream);
-}
-
-void Http2Handler::remove_stream(int32_t stream_id) {
-  id2stream_.erase(stream_id);
-}
-
-Stream *Http2Handler::get_stream(int32_t stream_id) {
-  auto itr = id2stream_.find(stream_id);
-  if (itr == std::end(id2stream_)) {
-    return nullptr;
-  } else {
-    return (*itr).second.get();
-  }
-}
-
-int64_t Http2Handler::session_id() const { return session_id_; }
-
-Sessions *Http2Handler::get_sessions() const { return sessions_; }
-
-const Config *Http2Handler::get_config() const {
-  return sessions_->get_config();
-}
-
-void Http2Handler::remove_settings_timer() {
-  ev_timer_stop(sessions_->get_loop(), &settings_timerev_);
-}
-
-void Http2Handler::terminate_session(uint32_t error_code) {
-  nghttp2_session_terminate_session(session_, error_code);
-}
-
-ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source, void *user_data) {
-  int rv;
-  auto hd = static_cast<Http2Handler *>(user_data);
-  auto stream = hd->get_stream(stream_id);
-
-  auto nread = std::min(stream->body_length - stream->body_offset,
-                        static_cast<int64_t>(length));
-
-  *data_flags |= NGHTTP2_DATA_FLAG_NO_COPY;
-
-  if (nread == 0 || stream->body_length == stream->body_offset + nread) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-    auto config = hd->get_config();
-    if (!config->trailer.empty()) {
-      std::vector<nghttp2_nv> nva;
-      nva.reserve(config->trailer.size());
-      for (auto &kv : config->trailer) {
-        nva.push_back(http2::make_nv(kv.name, kv.value, kv.no_index));
-      }
-      rv = nghttp2_submit_trailer(session, stream_id, nva.data(), nva.size());
-      if (rv != 0) {
-        if (nghttp2_is_fatal(rv)) {
-          return NGHTTP2_ERR_CALLBACK_FAILURE;
-        }
-      } else {
-        *data_flags |= NGHTTP2_DATA_FLAG_NO_END_STREAM;
-      }
-    }
-
-    if (nghttp2_session_get_stream_remote_close(session, stream_id) == 0) {
-      remove_stream_read_timeout(stream);
-      remove_stream_write_timeout(stream);
-
-      hd->submit_rst_stream(stream, NGHTTP2_NO_ERROR);
-    }
-  }
-
-  return nread;
-}
-
-namespace {
-void prepare_status_response(Stream *stream, Http2Handler *hd, int status) {
-  auto sessions = hd->get_sessions();
-  auto status_page = sessions->get_server()->get_status_page(status);
-  auto file_ent = &status_page->file_ent;
-
-  // we don't set stream->file_ent since we don't want to expire it.
-  stream->body_length = file_ent->length;
-  nghttp2_data_provider data_prd;
-  data_prd.source.fd = file_ent->fd;
-  data_prd.read_callback = file_read_callback;
-
-  HeaderRefs headers;
-  headers.reserve(2);
-  headers.emplace_back(StringRef::from_lit("content-type"),
-                       StringRef::from_lit("text/html; charset=UTF-8"));
-  headers.emplace_back(
-      StringRef::from_lit("content-length"),
-      util::make_string_ref_uint(stream->balloc, file_ent->length));
-  hd->submit_response(StringRef{status_page->status}, stream->stream_id,
-                      headers, &data_prd);
-}
-} // namespace
-
-namespace {
-void prepare_echo_response(Stream *stream, Http2Handler *hd) {
-  auto length = lseek(stream->file_ent->fd, 0, SEEK_END);
-  if (length == -1) {
-    hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
-    return;
-  }
-  stream->body_length = length;
-  if (lseek(stream->file_ent->fd, 0, SEEK_SET) == -1) {
-    hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
-    return;
-  }
-  nghttp2_data_provider data_prd;
-  data_prd.source.fd = stream->file_ent->fd;
-  data_prd.read_callback = file_read_callback;
-
-  HeaderRefs headers;
-  headers.emplace_back(StringRef::from_lit("nghttpd-response"),
-                       StringRef::from_lit("echo"));
-  if (!hd->get_config()->no_content_length) {
-    headers.emplace_back(StringRef::from_lit("content-length"),
-                         util::make_string_ref_uint(stream->balloc, length));
-  }
-
-  hd->submit_response(StringRef::from_lit("200"), stream->stream_id, headers,
-                      &data_prd);
-}
-} // namespace
-
-namespace {
-bool prepare_upload_temp_store(Stream *stream, Http2Handler *hd) {
-  auto sessions = hd->get_sessions();
-
-  char tempfn[] = "/tmp/nghttpd.temp.XXXXXX";
-  auto fd = mkstemp(tempfn);
-  if (fd == -1) {
-    return false;
-  }
-  unlink(tempfn);
-  // Ordinary request never start with "echo:".  The length is 0 for
-  // now.  We will update it when we get whole request body.
-  auto path = std::string("echo:") + tempfn;
-  stream->file_ent =
-      sessions->cache_fd(path, FileEntry(path, 0, 0, fd, nullptr, 0, true));
-  stream->echo_upload = true;
-  return true;
-}
-} // namespace
-
-namespace {
-void prepare_redirect_response(Stream *stream, Http2Handler *hd,
-                               const StringRef &path, int status) {
-  auto scheme = stream->header.scheme;
-
-  auto authority = stream->header.authority;
-  if (authority.empty()) {
-    authority = stream->header.host;
-  }
-
-  auto location = concat_string_ref(
-      stream->balloc, scheme, StringRef::from_lit("://"), authority, path);
-
-  auto headers = HeaderRefs{{StringRef::from_lit("location"), location}};
-
-  auto sessions = hd->get_sessions();
-  auto status_page = sessions->get_server()->get_status_page(status);
-
-  hd->submit_response(StringRef{status_page->status}, stream->stream_id,
-                      headers, nullptr);
-}
-} // namespace
-
-namespace {
-void prepare_response(Stream *stream, Http2Handler *hd,
-                      bool allow_push = true) {
-  int rv;
-  auto reqpath = stream->header.path;
-  if (reqpath.empty()) {
-    prepare_status_response(stream, hd, 405);
-    return;
-  }
-
-  auto ims = stream->header.ims;
-
-  time_t last_mod = 0;
-  bool last_mod_found = false;
-  if (!ims.empty()) {
-    last_mod_found = true;
-    last_mod = util::parse_http_date(ims);
-  }
-
-  StringRef raw_path, raw_query;
-  auto query_pos = std::find(std::begin(reqpath), std::end(reqpath), '?');
-  if (query_pos != std::end(reqpath)) {
-    // Do not response to this request to allow clients to test timeouts.
-    if (util::streq_l("nghttpd_do_not_respond_to_req=yes",
-                      StringRef{query_pos, std::end(reqpath)})) {
-      return;
-    }
-    raw_path = StringRef{std::begin(reqpath), query_pos};
-    raw_query = StringRef{query_pos, std::end(reqpath)};
-  } else {
-    raw_path = reqpath;
-  }
-
-  auto sessions = hd->get_sessions();
-
-  StringRef path;
-  if (std::find(std::begin(raw_path), std::end(raw_path), '%') ==
-      std::end(raw_path)) {
-    path = raw_path;
-  } else {
-    path = util::percent_decode(stream->balloc, raw_path);
-  }
-
-  path = http2::path_join(stream->balloc, StringRef{}, StringRef{}, path,
-                          StringRef{});
-
-  if (std::find(std::begin(path), std::end(path), '\\') != std::end(path)) {
-    if (stream->file_ent) {
-      sessions->release_fd(stream->file_ent);
-      stream->file_ent = nullptr;
-    }
-    prepare_status_response(stream, hd, 404);
-    return;
-  }
-
-  if (!hd->get_config()->push.empty()) {
-    auto push_itr = hd->get_config()->push.find(path.str());
-    if (allow_push && push_itr != std::end(hd->get_config()->push)) {
-      for (auto &push_path : (*push_itr).second) {
-        rv = hd->submit_push_promise(stream, StringRef{push_path});
-        if (rv != 0) {
-          std::cerr << "nghttp2_submit_push_promise() returned error: "
-                    << nghttp2_strerror(rv) << std::endl;
-        }
-      }
-    }
-  }
-
-  std::string file_path;
-  {
-    auto len = hd->get_config()->htdocs.size() + path.size();
-
-    auto trailing_slash = path[path.size() - 1] == '/';
-    if (trailing_slash) {
-      len += DEFAULT_HTML.size();
-    }
-
-    file_path.resize(len);
-
-    auto p = &file_path[0];
-
-    auto &htdocs = hd->get_config()->htdocs;
-    p = std::copy(std::begin(htdocs), std::end(htdocs), p);
-    p = std::copy(std::begin(path), std::end(path), p);
-    if (trailing_slash) {
-      std::copy(std::begin(DEFAULT_HTML), std::end(DEFAULT_HTML), p);
-    }
-  }
-
-  if (stream->echo_upload) {
-    assert(stream->file_ent);
-    prepare_echo_response(stream, hd);
-    return;
-  }
-
-  auto file_ent = sessions->get_cached_fd(file_path);
-
-  if (file_ent == nullptr) {
-    int file = open(file_path.c_str(), O_RDONLY | O_BINARY);
-    if (file == -1) {
-      prepare_status_response(stream, hd, 404);
-
-      return;
-    }
-
-    struct stat buf;
-
-    if (fstat(file, &buf) == -1) {
-      close(file);
-      prepare_status_response(stream, hd, 404);
-
-      return;
-    }
-
-    if (buf.st_mode & S_IFDIR) {
-      close(file);
-
-      auto reqpath = concat_string_ref(stream->balloc, raw_path,
-                                       StringRef::from_lit("/"), raw_query);
-
-      prepare_redirect_response(stream, hd, reqpath, 301);
-
-      return;
-    }
-
-    const std::string *content_type = nullptr;
-
-    auto ext = file_path.c_str() + file_path.size() - 1;
-    for (; file_path.c_str() < ext && *ext != '.' && *ext != '/'; --ext)
-      ;
-    if (*ext == '.') {
-      ++ext;
-
-      const auto &mime_types = hd->get_config()->mime_types;
-      auto content_type_itr = mime_types.find(ext);
-      if (content_type_itr != std::end(mime_types)) {
-        content_type = &(*content_type_itr).second;
-      }
-    }
-
-    file_ent = sessions->cache_fd(
-        file_path, FileEntry(file_path, buf.st_size, buf.st_mtime, file,
-                             content_type, ev_now(sessions->get_loop())));
-  }
-
-  stream->file_ent = file_ent;
-
-  if (last_mod_found && file_ent->mtime <= last_mod) {
-    hd->submit_response(StringRef::from_lit("304"), stream->stream_id, nullptr);
-
-    return;
-  }
-
-  auto method = stream->header.method;
-  if (method == StringRef::from_lit("HEAD")) {
-    hd->submit_file_response(StringRef::from_lit("200"), stream,
-                             file_ent->mtime, file_ent->length,
-                             file_ent->content_type, nullptr);
-    return;
-  }
-
-  stream->body_length = file_ent->length;
-
-  nghttp2_data_provider data_prd;
-
-  data_prd.source.fd = file_ent->fd;
-  data_prd.read_callback = file_read_callback;
-
-  hd->submit_file_response(StringRef::from_lit("200"), stream, file_ent->mtime,
-                           file_ent->length, file_ent->content_type, &data_prd);
-}
-} // namespace
-
-namespace {
-int on_header_callback2(nghttp2_session *session, const nghttp2_frame *frame,
-                        nghttp2_rcbuf *name, nghttp2_rcbuf *value,
-                        uint8_t flags, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-
-  auto namebuf = nghttp2_rcbuf_get_buf(name);
-  auto valuebuf = nghttp2_rcbuf_get_buf(value);
-
-  if (hd->get_config()->verbose) {
-    print_session_id(hd->session_id());
-    verbose_on_header_callback(session, frame, namebuf.base, namebuf.len,
-                               valuebuf.base, valuebuf.len, flags, user_data);
-  }
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-  auto stream = hd->get_stream(frame->hd.stream_id);
-  if (!stream) {
-    return 0;
-  }
-
-  if (stream->header_buffer_size + namebuf.len + valuebuf.len > 64_k) {
-    hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
-    return 0;
-  }
-
-  stream->header_buffer_size += namebuf.len + valuebuf.len;
-
-  auto token = http2::lookup_token(namebuf.base, namebuf.len);
-
-  auto &header = stream->header;
-
-  switch (token) {
-  case http2::HD__METHOD:
-    header.method = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.method = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  case http2::HD__SCHEME:
-    header.scheme = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.scheme = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  case http2::HD__AUTHORITY:
-    header.authority = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.authority = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  case http2::HD_HOST:
-    header.host = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.host = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  case http2::HD__PATH:
-    header.path = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.path = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  case http2::HD_IF_MODIFIED_SINCE:
-    header.ims = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.ims = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  case http2::HD_EXPECT:
-    header.expect = StringRef{valuebuf.base, valuebuf.len};
-    header.rcbuf.expect = value;
-    nghttp2_rcbuf_incref(value);
-    break;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto stream = make_unique<Stream>(hd, frame->hd.stream_id);
-
-  add_stream_read_timeout(stream.get());
-
-  hd->add_stream(frame->hd.stream_id, std::move(stream));
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int hd_on_frame_recv_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-  if (hd->get_config()->verbose) {
-    print_session_id(hd->session_id());
-    verbose_on_frame_recv_callback(session, frame, user_data);
-  }
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    // TODO Handle POST
-    auto stream = hd->get_stream(frame->hd.stream_id);
-    if (!stream) {
-      return 0;
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      remove_stream_read_timeout(stream);
-      if (stream->echo_upload || !hd->get_config()->early_response) {
-        prepare_response(stream, hd);
-      }
-    } else {
-      add_stream_read_timeout(stream);
-    }
-
-    break;
-  }
-  case NGHTTP2_HEADERS: {
-    auto stream = hd->get_stream(frame->hd.stream_id);
-    if (!stream) {
-      return 0;
-    }
-
-    if (frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-
-      auto expect100 = stream->header.expect;
-
-      if (util::strieq_l("100-continue", expect100)) {
-        hd->submit_non_final_response("100", frame->hd.stream_id);
-      }
-
-      auto method = stream->header.method;
-      if (hd->get_config()->echo_upload &&
-          (method == StringRef::from_lit("POST") ||
-           method == StringRef::from_lit("PUT"))) {
-        if (!prepare_upload_temp_store(stream, hd)) {
-          hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
-          return 0;
-        }
-      } else if (hd->get_config()->early_response) {
-        prepare_response(stream, hd);
-      }
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      remove_stream_read_timeout(stream);
-      if (stream->echo_upload || !hd->get_config()->early_response) {
-        prepare_response(stream, hd);
-      }
-    } else {
-      add_stream_read_timeout(stream);
-    }
-
-    break;
-  }
-  case NGHTTP2_SETTINGS:
-    if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
-      hd->remove_settings_timer();
-    }
-    break;
-  default:
-    break;
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int hd_on_frame_send_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-
-  if (hd->get_config()->verbose) {
-    print_session_id(hd->session_id());
-    verbose_on_frame_send_callback(session, frame, user_data);
-  }
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-  case NGHTTP2_HEADERS: {
-    auto stream = hd->get_stream(frame->hd.stream_id);
-
-    if (!stream) {
-      return 0;
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      remove_stream_write_timeout(stream);
-    } else if (std::min(nghttp2_session_get_stream_remote_window_size(
-                            session, frame->hd.stream_id),
-                        nghttp2_session_get_remote_window_size(session)) <= 0) {
-      // If stream is blocked by flow control, enable write timeout.
-      add_stream_read_timeout_if_pending(stream);
-      add_stream_write_timeout(stream);
-    } else {
-      add_stream_read_timeout_if_pending(stream);
-      remove_stream_write_timeout(stream);
-    }
-
-    break;
-  }
-  case NGHTTP2_SETTINGS: {
-    if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
-      return 0;
-    }
-
-    hd->start_settings_timer();
-
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    auto promised_stream_id = frame->push_promise.promised_stream_id;
-    auto promised_stream = hd->get_stream(promised_stream_id);
-    auto stream = hd->get_stream(frame->hd.stream_id);
-
-    if (!stream || !promised_stream) {
-      return 0;
-    }
-
-    add_stream_read_timeout_if_pending(stream);
-    add_stream_write_timeout(stream);
-
-    prepare_response(promised_stream, hd, /*allow_push */ false);
-  }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int send_data_callback(nghttp2_session *session, nghttp2_frame *frame,
-                       const uint8_t *framehd, size_t length,
-                       nghttp2_data_source *source, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-  auto wb = hd->get_wb();
-  auto padlen = frame->data.padlen;
-  auto stream = hd->get_stream(frame->hd.stream_id);
-
-  if (wb->wleft() < 9 + length + padlen) {
-    return NGHTTP2_ERR_WOULDBLOCK;
-  }
-
-  int fd = source->fd;
-
-  auto p = wb->last;
-
-  p = std::copy_n(framehd, 9, p);
-
-  if (padlen) {
-    *p++ = padlen - 1;
-  }
-
-  while (length) {
-    ssize_t nread;
-    while ((nread = pread(fd, p, length, stream->body_offset)) == -1 &&
-           errno == EINTR)
-      ;
-
-    if (nread == -1) {
-      remove_stream_read_timeout(stream);
-      remove_stream_write_timeout(stream);
-
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    stream->body_offset += nread;
-    length -= nread;
-    p += nread;
-  }
-
-  if (padlen) {
-    std::fill(p, p + padlen - 1, 0);
-    p += padlen - 1;
-  }
-
-  wb->last = p;
-
-  return 0;
-}
-} // namespace
-
-namespace {
-ssize_t select_padding_callback(nghttp2_session *session,
-                                const nghttp2_frame *frame, size_t max_payload,
-                                void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-  return std::min(max_payload, frame->hd.length + hd->get_config()->padding);
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-  auto stream = hd->get_stream(stream_id);
-
-  if (!stream) {
-    return 0;
-  }
-
-  if (stream->echo_upload) {
-    assert(stream->file_ent);
-    while (len) {
-      ssize_t n;
-      while ((n = write(stream->file_ent->fd, data, len)) == -1 &&
-             errno == EINTR)
-        ;
-      if (n == -1) {
-        hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
-        return 0;
-      }
-      len -= n;
-      data += n;
-    }
-  }
-  // TODO Handle POST
-
-  add_stream_read_timeout(stream);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto hd = static_cast<Http2Handler *>(user_data);
-  hd->remove_stream(stream_id);
-  if (hd->get_config()->verbose) {
-    print_session_id(hd->session_id());
-    print_timer();
-    printf(" stream_id=%d closed\n", stream_id);
-    fflush(stdout);
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-void fill_callback(nghttp2_session_callbacks *callbacks, const Config *config) {
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(
-      callbacks, hd_on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_frame_send_callback(
-      callbacks, hd_on_frame_send_callback);
-
-  if (config->verbose) {
-    nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
-        callbacks, verbose_on_invalid_frame_recv_callback);
-
-    nghttp2_session_callbacks_set_error_callback2(callbacks,
-                                                  verbose_error_callback);
-  }
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback2(callbacks,
-                                                    on_header_callback2);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-
-  nghttp2_session_callbacks_set_send_data_callback(callbacks,
-                                                   send_data_callback);
-
-  if (config->padding) {
-    nghttp2_session_callbacks_set_select_padding_callback(
-        callbacks, select_padding_callback);
-  }
-}
-} // namespace
-
-struct ClientInfo {
-  int fd;
-};
-
-struct Worker {
-  std::unique_ptr<Sessions> sessions;
-  ev_async w;
-  // protects q
-  std::mutex m;
-  std::deque<ClientInfo> q;
-};
-
-namespace {
-void worker_acceptcb(struct ev_loop *loop, ev_async *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-  auto &sessions = worker->sessions;
-
-  std::deque<ClientInfo> q;
-  {
-    std::lock_guard<std::mutex> lock(worker->m);
-    q.swap(worker->q);
-  }
-
-  for (auto c : q) {
-    sessions->accept_connection(c.fd);
-  }
-}
-} // namespace
-
-namespace {
-void run_worker(Worker *worker) {
-  auto loop = worker->sessions->get_loop();
-
-  ev_run(loop, 0);
-}
-} // namespace
-
-namespace {
-int get_ev_loop_flags() {
-  if (ev_supported_backends() & ~ev_recommended_backends() & EVBACKEND_KQUEUE) {
-    return ev_recommended_backends() | EVBACKEND_KQUEUE;
-  }
-
-  return 0;
-}
-} // namespace
-
-class AcceptHandler {
-public:
-  AcceptHandler(HttpServer *sv, Sessions *sessions, const Config *config)
-      : sessions_(sessions), config_(config), next_worker_(0) {
-    if (config_->num_worker == 1) {
-      return;
-    }
-    for (size_t i = 0; i < config_->num_worker; ++i) {
-      if (config_->verbose) {
-        std::cerr << "spawning thread #" << i << std::endl;
-      }
-      auto worker = make_unique<Worker>();
-      auto loop = ev_loop_new(get_ev_loop_flags());
-      worker->sessions =
-          make_unique<Sessions>(sv, loop, config_, sessions_->get_ssl_ctx());
-      ev_async_init(&worker->w, worker_acceptcb);
-      worker->w.data = worker.get();
-      ev_async_start(loop, &worker->w);
-
-      auto t = std::thread(run_worker, worker.get());
-      t.detach();
-      workers_.push_back(std::move(worker));
-    }
-  }
-  void accept_connection(int fd) {
-    if (config_->num_worker == 1) {
-      sessions_->accept_connection(fd);
-      return;
-    }
-
-    // Dispatch client to the one of the worker threads, in a round
-    // robin manner.
-    auto &worker = workers_[next_worker_];
-    if (next_worker_ == config_->num_worker - 1) {
-      next_worker_ = 0;
-    } else {
-      ++next_worker_;
-    }
-    {
-      std::lock_guard<std::mutex> lock(worker->m);
-      worker->q.push_back({fd});
-    }
-    ev_async_send(worker->sessions->get_loop(), &worker->w);
-  }
-
-private:
-  std::vector<std::unique_ptr<Worker>> workers_;
-  Sessions *sessions_;
-  const Config *config_;
-  // In multi threading mode, this points to the next thread that
-  // client will be dispatched.
-  size_t next_worker_;
-};
-
-namespace {
-void acceptcb(struct ev_loop *loop, ev_io *w, int revents);
-} // namespace
-
-class ListenEventHandler {
-public:
-  ListenEventHandler(Sessions *sessions, int fd,
-                     std::shared_ptr<AcceptHandler> acceptor)
-      : acceptor_(acceptor), sessions_(sessions), fd_(fd) {
-    ev_io_init(&w_, acceptcb, fd, EV_READ);
-    w_.data = this;
-    ev_io_start(sessions_->get_loop(), &w_);
-  }
-  void accept_connection() {
-    for (;;) {
-#ifdef HAVE_ACCEPT4
-      auto fd = accept4(fd_, nullptr, nullptr, SOCK_NONBLOCK);
-#else  // !HAVE_ACCEPT4
-      auto fd = accept(fd_, nullptr, nullptr);
-#endif // !HAVE_ACCEPT4
-      if (fd == -1) {
-        break;
-      }
-#ifndef HAVE_ACCEPT4
-      util::make_socket_nonblocking(fd);
-#endif // !HAVE_ACCEPT4
-      acceptor_->accept_connection(fd);
-    }
-  }
-
-private:
-  ev_io w_;
-  std::shared_ptr<AcceptHandler> acceptor_;
-  Sessions *sessions_;
-  int fd_;
-};
-
-namespace {
-void acceptcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto handler = static_cast<ListenEventHandler *>(w->data);
-  handler->accept_connection();
-}
-} // namespace
-
-namespace {
-FileEntry make_status_body(int status, uint16_t port) {
-  BlockAllocator balloc(1024, 1024);
-
-  auto status_string = http2::stringify_status(balloc, status);
-  auto reason_pharase = http2::get_reason_phrase(status);
-
-  std::string body;
-  body = "<html><head><title>";
-  body += status_string;
-  body += ' ';
-  body += reason_pharase;
-  body += "</title></head><body><h1>";
-  body += status_string;
-  body += ' ';
-  body += reason_pharase;
-  body += "</h1><hr><address>";
-  body += NGHTTPD_SERVER;
-  body += " at port ";
-  body += util::utos(port);
-  body += "</address>";
-  body += "</body></html>";
-
-  char tempfn[] = "/tmp/nghttpd.temp.XXXXXX";
-  int fd = mkstemp(tempfn);
-  if (fd == -1) {
-    auto error = errno;
-    std::cerr << "Could not open status response body file: errno=" << error;
-    assert(0);
-  }
-  unlink(tempfn);
-  ssize_t nwrite;
-  while ((nwrite = write(fd, body.c_str(), body.size())) == -1 &&
-         errno == EINTR)
-    ;
-  if (nwrite == -1) {
-    auto error = errno;
-    std::cerr << "Could not write status response body into file: errno="
-              << error;
-    assert(0);
-  }
-
-  return FileEntry(util::utos(status), nwrite, 0, fd, nullptr, 0);
-}
-} // namespace
-
-// index into HttpServer::status_pages_
-enum {
-  IDX_200,
-  IDX_301,
-  IDX_400,
-  IDX_404,
-  IDX_405,
-};
-
-HttpServer::HttpServer(const Config *config) : config_(config) {
-  status_pages_ = std::vector<StatusPage>{
-      {"200", make_status_body(200, config_->port)},
-      {"301", make_status_body(301, config_->port)},
-      {"400", make_status_body(400, config_->port)},
-      {"404", make_status_body(404, config_->port)},
-      {"405", make_status_body(405, config_->port)},
-  };
-}
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
-                  void *arg) {
-  auto next_proto = static_cast<std::vector<unsigned char> *>(arg);
-  *data = next_proto->data();
-  *len = next_proto->size();
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-namespace {
-int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
-  // We don't verify the client certificate. Just request it for the
-  // testing purpose.
-  return 1;
-}
-} // namespace
-
-namespace {
-int start_listen(HttpServer *sv, struct ev_loop *loop, Sessions *sessions,
-                 const Config *config) {
-  int r;
-  bool ok = false;
-  const char *addr = nullptr;
-
-  std::shared_ptr<AcceptHandler> acceptor;
-  auto service = util::utos(config->port);
-
-  addrinfo hints{};
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-  hints.ai_flags |= AI_ADDRCONFIG;
-#endif // AI_ADDRCONFIG
-
-  if (!config->address.empty()) {
-    addr = config->address.c_str();
-  }
-
-  addrinfo *res, *rp;
-  r = getaddrinfo(addr, service.c_str(), &hints, &res);
-  if (r != 0) {
-    std::cerr << "getaddrinfo() failed: " << gai_strerror(r) << std::endl;
-    return -1;
-  }
-
-  for (rp = res; rp; rp = rp->ai_next) {
-    int fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if (fd == -1) {
-      continue;
-    }
-    int val = 1;
-    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val,
-                   static_cast<socklen_t>(sizeof(val))) == -1) {
-      close(fd);
-      continue;
-    }
-    (void)util::make_socket_nonblocking(fd);
-#ifdef IPV6_V6ONLY
-    if (rp->ai_family == AF_INET6) {
-      if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val,
-                     static_cast<socklen_t>(sizeof(val))) == -1) {
-        close(fd);
-        continue;
-      }
-    }
-#endif // IPV6_V6ONLY
-    if (bind(fd, rp->ai_addr, rp->ai_addrlen) == 0 && listen(fd, 1000) == 0) {
-      if (!acceptor) {
-        acceptor = std::make_shared<AcceptHandler>(sv, sessions, config);
-      }
-      new ListenEventHandler(sessions, fd, acceptor);
-
-      if (config->verbose) {
-        std::string s = util::numeric_name(rp->ai_addr, rp->ai_addrlen);
-        std::cout << (rp->ai_family == AF_INET ? "IPv4" : "IPv6") << ": listen "
-                  << s << ":" << config->port << std::endl;
-      }
-      ok = true;
-      continue;
-    } else {
-      std::cerr << strerror(errno) << std::endl;
-    }
-    close(fd);
-  }
-  freeaddrinfo(res);
-
-  if (!ok) {
-    return -1;
-  }
-  return 0;
-}
-} // namespace
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-namespace {
-int alpn_select_proto_cb(SSL *ssl, const unsigned char **out,
-                         unsigned char *outlen, const unsigned char *in,
-                         unsigned int inlen, void *arg) {
-  auto config = static_cast<HttpServer *>(arg)->get_config();
-  if (config->verbose) {
-    std::cout << "[ALPN] client offers:" << std::endl;
-  }
-  if (config->verbose) {
-    for (unsigned int i = 0; i < inlen; i += in[i] + 1) {
-      std::cout << " * ";
-      std::cout.write(reinterpret_cast<const char *>(&in[i + 1]), in[i]);
-      std::cout << std::endl;
-    }
-  }
-  if (!util::select_h2(out, outlen, in, inlen)) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-int HttpServer::run() {
-  SSL_CTX *ssl_ctx = nullptr;
-  std::vector<unsigned char> next_proto;
-
-  if (!config_->no_tls) {
-    ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-    if (!ssl_ctx) {
-      std::cerr << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-      return -1;
-    }
-
-    auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                    SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-                    SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION |
-                    SSL_OP_SINGLE_ECDH_USE | SSL_OP_NO_TICKET |
-                    SSL_OP_CIPHER_SERVER_PREFERENCE;
-
-    SSL_CTX_set_options(ssl_ctx, ssl_opts);
-    SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
-    SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
-
-    if (nghttp2::tls::ssl_ctx_set_proto_versions(
-            ssl_ctx, nghttp2::tls::NGHTTP2_TLS_MIN_VERSION,
-            nghttp2::tls::NGHTTP2_TLS_MAX_VERSION) != 0) {
-      std::cerr << "Could not set TLS versions" << std::endl;
-      return -1;
-    }
-
-    if (SSL_CTX_set_cipher_list(ssl_ctx, tls::DEFAULT_CIPHER_LIST) == 0) {
-      std::cerr << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-      return -1;
-    }
-
-    const unsigned char sid_ctx[] = "nghttpd";
-    SSL_CTX_set_session_id_context(ssl_ctx, sid_ctx, sizeof(sid_ctx) - 1);
-    SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_SERVER);
-
-#ifndef OPENSSL_NO_EC
-
-    // Disabled SSL_CTX_set_ecdh_auto, because computational cost of
-    // chosen curve is much higher than P-256.
-
-    // #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    //     SSL_CTX_set_ecdh_auto(ssl_ctx, 1);
-    // #else // OPENSSL_VERSION_NUBMER < 0x10002000L
-    // Use P-256, which is sufficiently secure at the time of this
-    // writing.
-    auto ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-    if (ecdh == nullptr) {
-      std::cerr << "EC_KEY_new_by_curv_name failed: "
-                << ERR_error_string(ERR_get_error(), nullptr);
-      return -1;
-    }
-    SSL_CTX_set_tmp_ecdh(ssl_ctx, ecdh);
-    EC_KEY_free(ecdh);
-    // #endif // OPENSSL_VERSION_NUBMER < 0x10002000L
-
-#endif // OPENSSL_NO_EC
-
-    if (!config_->dh_param_file.empty()) {
-      // Read DH parameters from file
-      auto bio = BIO_new_file(config_->dh_param_file.c_str(), "r");
-      if (bio == nullptr) {
-        std::cerr << "BIO_new_file() failed: "
-                  << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-        return -1;
-      }
-
-      auto dh = PEM_read_bio_DHparams(bio, nullptr, nullptr, nullptr);
-
-      if (dh == nullptr) {
-        std::cerr << "PEM_read_bio_DHparams() failed: "
-                  << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-        return -1;
-      }
-
-      SSL_CTX_set_tmp_dh(ssl_ctx, dh);
-      DH_free(dh);
-      BIO_free(bio);
-    }
-
-    if (SSL_CTX_use_PrivateKey_file(ssl_ctx, config_->private_key_file.c_str(),
-                                    SSL_FILETYPE_PEM) != 1) {
-      std::cerr << "SSL_CTX_use_PrivateKey_file failed." << std::endl;
-      return -1;
-    }
-    if (SSL_CTX_use_certificate_chain_file(ssl_ctx,
-                                           config_->cert_file.c_str()) != 1) {
-      std::cerr << "SSL_CTX_use_certificate_file failed." << std::endl;
-      return -1;
-    }
-    if (SSL_CTX_check_private_key(ssl_ctx) != 1) {
-      std::cerr << "SSL_CTX_check_private_key failed." << std::endl;
-      return -1;
-    }
-    if (config_->verify_client) {
-      SSL_CTX_set_verify(ssl_ctx,
-                         SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE |
-                             SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                         verify_callback);
-    }
-
-    next_proto = util::get_default_alpn();
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_CTX_set_next_protos_advertised_cb(ssl_ctx, next_proto_cb, &next_proto);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    // ALPN selection callback
-    SSL_CTX_set_alpn_select_cb(ssl_ctx, alpn_select_proto_cb, this);
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-  }
-
-  auto loop = EV_DEFAULT;
-
-  Sessions sessions(this, loop, config_, ssl_ctx);
-  if (start_listen(this, loop, &sessions, config_) != 0) {
-    std::cerr << "Could not listen" << std::endl;
-    if (ssl_ctx) {
-      SSL_CTX_free(ssl_ctx);
-    }
-    return -1;
-  }
-
-  ev_run(loop, 0);
-  return 0;
-}
-
-const Config *HttpServer::get_config() const { return config_; }
-
-const StatusPage *HttpServer::get_status_page(int status) const {
-  switch (status) {
-  case 200:
-    return &status_pages_[IDX_200];
-  case 301:
-    return &status_pages_[IDX_301];
-  case 400:
-    return &status_pages_[IDX_400];
-  case 404:
-    return &status_pages_[IDX_404];
-  case 405:
-    return &status_pages_[IDX_405];
-  default:
-    assert(0);
-  }
-  return nullptr;
-}
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/HttpServer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,250 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef HTTP_SERVER_H
-#define HTTP_SERVER_H
-
-#include "nghttp2_config.h"
-
-#include <sys/types.h>
-
-#include <cinttypes>
-#include <cstdlib>
-
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
-
-#include <openssl/ssl.h>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "http2.h"
-#include "buffer.h"
-#include "template.h"
-#include "allocator.h"
-
-namespace nghttp2 {
-
-struct Config {
-  std::map<std::string, std::vector<std::string>> push;
-  std::map<std::string, std::string> mime_types;
-  Headers trailer;
-  std::string trailer_names;
-  std::string htdocs;
-  std::string host;
-  std::string private_key_file;
-  std::string cert_file;
-  std::string dh_param_file;
-  std::string address;
-  std::string mime_types_file;
-  ev_tstamp stream_read_timeout;
-  ev_tstamp stream_write_timeout;
-  void *data_ptr;
-  size_t padding;
-  size_t num_worker;
-  size_t max_concurrent_streams;
-  ssize_t header_table_size;
-  ssize_t encoder_header_table_size;
-  int window_bits;
-  int connection_window_bits;
-  uint16_t port;
-  bool verbose;
-  bool daemon;
-  bool verify_client;
-  bool no_tls;
-  bool error_gzip;
-  bool early_response;
-  bool hexdump;
-  bool echo_upload;
-  bool no_content_length;
-  Config();
-  ~Config();
-};
-
-class Http2Handler;
-
-struct FileEntry {
-  FileEntry(std::string path, int64_t length, int64_t mtime, int fd,
-            const std::string *content_type, ev_tstamp last_valid,
-            bool stale = false)
-      : path(std::move(path)),
-        length(length),
-        mtime(mtime),
-        last_valid(last_valid),
-        content_type(content_type),
-        dlnext(nullptr),
-        dlprev(nullptr),
-        fd(fd),
-        usecount(1),
-        stale(stale) {}
-  std::string path;
-  std::multimap<std::string, std::unique_ptr<FileEntry>>::iterator it;
-  int64_t length;
-  int64_t mtime;
-  ev_tstamp last_valid;
-  const std::string *content_type;
-  FileEntry *dlnext, *dlprev;
-  int fd;
-  int usecount;
-  bool stale;
-};
-
-struct RequestHeader {
-  StringRef method;
-  StringRef scheme;
-  StringRef authority;
-  StringRef host;
-  StringRef path;
-  StringRef ims;
-  StringRef expect;
-
-  struct {
-    nghttp2_rcbuf *method;
-    nghttp2_rcbuf *scheme;
-    nghttp2_rcbuf *authority;
-    nghttp2_rcbuf *host;
-    nghttp2_rcbuf *path;
-    nghttp2_rcbuf *ims;
-    nghttp2_rcbuf *expect;
-  } rcbuf;
-};
-
-struct Stream {
-  BlockAllocator balloc;
-  RequestHeader header;
-  Http2Handler *handler;
-  FileEntry *file_ent;
-  ev_timer rtimer;
-  ev_timer wtimer;
-  int64_t body_length;
-  int64_t body_offset;
-  // Total amount of bytes (sum of name and value length) used in
-  // headers.
-  size_t header_buffer_size;
-  int32_t stream_id;
-  bool echo_upload;
-  Stream(Http2Handler *handler, int32_t stream_id);
-  ~Stream();
-};
-
-class Sessions;
-
-class Http2Handler {
-public:
-  Http2Handler(Sessions *sessions, int fd, SSL *ssl, int64_t session_id);
-  ~Http2Handler();
-
-  void remove_self();
-  void start_settings_timer();
-  int on_read();
-  int on_write();
-  int connection_made();
-  int verify_npn_result();
-
-  int submit_file_response(const StringRef &status, Stream *stream,
-                           time_t last_modified, off_t file_length,
-                           const std::string *content_type,
-                           nghttp2_data_provider *data_prd);
-
-  int submit_response(const StringRef &status, int32_t stream_id,
-                      nghttp2_data_provider *data_prd);
-
-  int submit_response(const StringRef &status, int32_t stream_id,
-                      const HeaderRefs &headers,
-                      nghttp2_data_provider *data_prd);
-
-  int submit_non_final_response(const std::string &status, int32_t stream_id);
-
-  int submit_push_promise(Stream *stream, const StringRef &push_path);
-
-  int submit_rst_stream(Stream *stream, uint32_t error_code);
-
-  void add_stream(int32_t stream_id, std::unique_ptr<Stream> stream);
-  void remove_stream(int32_t stream_id);
-  Stream *get_stream(int32_t stream_id);
-  int64_t session_id() const;
-  Sessions *get_sessions() const;
-  const Config *get_config() const;
-  void remove_settings_timer();
-  void terminate_session(uint32_t error_code);
-
-  int fill_wb();
-
-  int read_clear();
-  int write_clear();
-  int tls_handshake();
-  int read_tls();
-  int write_tls();
-
-  struct ev_loop *get_loop() const;
-
-  using WriteBuf = Buffer<64_k>;
-
-  WriteBuf *get_wb();
-
-private:
-  ev_io wev_;
-  ev_io rev_;
-  ev_timer settings_timerev_;
-  std::map<int32_t, std::unique_ptr<Stream>> id2stream_;
-  WriteBuf wb_;
-  std::function<int(Http2Handler &)> read_, write_;
-  int64_t session_id_;
-  nghttp2_session *session_;
-  Sessions *sessions_;
-  SSL *ssl_;
-  const uint8_t *data_pending_;
-  size_t data_pendinglen_;
-  int fd_;
-};
-
-struct StatusPage {
-  std::string status;
-  FileEntry file_ent;
-};
-
-class HttpServer {
-public:
-  HttpServer(const Config *config);
-  int listen();
-  int run();
-  const Config *get_config() const;
-  const StatusPage *get_status_page(int status) const;
-
-private:
-  std::vector<StatusPage> status_pages_;
-  const Config *config_;
-};
-
-ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, int *eof,
-                           nghttp2_data_source *source, void *user_data);
-
-} // namespace nghttp2
-
-#endif // HTTP_SERVER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-if(ENABLE_ASIO_LIB)
-  install(FILES
-      nghttp2/asio_http2.h
-      nghttp2/asio_http2_client.h
-      nghttp2/asio_http2_server.h
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/nghttp2")
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-EXTRA_DIST = CMakeLists.txt
-
-if ENABLE_ASIO_LIB
-nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
-	nghttp2/asio_http2_server.h
-endif # ENABLE_ASIO_LIB
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_client.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_client.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_client.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_client.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,252 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_HTTP2_CLIENT_H
-#define ASIO_HTTP2_CLIENT_H
-
-#include <nghttp2/asio_http2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace client {
-
-class response_impl;
-
-class response {
-public:
-  // Application must not call this directly.
-  response();
-  ~response();
-
-  // Sets callback which is invoked when chunk of response body is
-  // received.
-  void on_data(data_cb cb) const;
-
-  // Returns status code.
-  int status_code() const;
-
-  // Returns content-length.  -1 if it is unknown.
-  int64_t content_length() const;
-
-  // Returns the response header fields.  The pusedo header fields,
-  // which start with colon (:), are exluced from this list.
-  const header_map &header() const;
-
-  // Application must not call this directly.
-  response_impl &impl() const;
-
-private:
-  std::unique_ptr<response_impl> impl_;
-};
-
-class request;
-
-using response_cb = std::function<void(const response &)>;
-using request_cb = std::function<void(const request &)>;
-using connect_cb =
-    std::function<void(boost::asio::ip::tcp::resolver::iterator)>;
-
-class request_impl;
-
-class request {
-public:
-  // Application must not call this directly.
-  request();
-  ~request();
-
-  // Sets callback which is invoked when response header is received.
-  void on_response(response_cb cb) const;
-
-  // Sets callback which is invoked when push request header is
-  // received.
-  void on_push(request_cb cb) const;
-
-  // Sets callback which is invoked when this request and response are
-  // finished.  After the invocation of this callback, the application
-  // must not access request and response object.
-  void on_close(close_cb cb) const;
-
-  // Write trailer part.  This must be called after setting both
-  // NGHTTP2_DATA_FLAG_EOF and NGHTTP2_DATA_FLAG_NO_END_STREAM set in
-  // *data_flag parameter in generator_cb passed to session::submit()
-  // function.
-  void write_trailer(header_map h) const;
-
-  // Cancels this request and response with given error code.
-  void cancel(uint32_t error_code = NGHTTP2_INTERNAL_ERROR) const;
-
-  // Resumes deferred uploading.
-  void resume() const;
-
-  // Returns method (e.g., GET).
-  const std::string &method() const;
-
-  // Returns request URI, split into components.
-  const uri_ref &uri() const;
-
-  // Returns request header fields.  The pusedo header fields, which
-  // start with colon (:), are exluced from this list.
-  const header_map &header() const;
-
-  // Application must not call this directly.
-  request_impl &impl() const;
-
-private:
-  std::unique_ptr<request_impl> impl_;
-};
-
-// Wrapper around an nghttp2_priority_spec.
-class priority_spec {
-public:
-  // The default ctor is used only by sentinel values.
-  priority_spec() = default;
-
-  // Create a priority spec with the given priority settings.
-  explicit priority_spec(const int32_t stream_id, const int32_t weight,
-                         const bool exclusive = false);
-
-  // Return a pointer to a valid nghttp2 priority spec, or null.
-  const nghttp2_priority_spec *get() const;
-
-  // Indicates whether or not this spec is valid (i.e. was constructed with
-  // values).
-  const bool valid() const;
-
-private:
-  nghttp2_priority_spec spec_;
-  bool valid_ = false;
-};
-
-class session_impl;
-
-class session {
-public:
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "80") using clear text TCP connection with connect timeout
-  // 60 seconds.
-  session(boost::asio::io_service &io_service, const std::string &host,
-          const std::string &service);
-
-  // Same as previous but with pegged local endpoint
-  session(boost::asio::io_service &io_service,
-          const boost::asio::ip::tcp::endpoint &local_endpoint,
-          const std::string &host, const std::string &service);
-
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "80") using clear text TCP connection with given connect
-  // timeout.
-  session(boost::asio::io_service &io_service, const std::string &host,
-          const std::string &service,
-          const boost::posix_time::time_duration &connect_timeout);
-
-  // Same as previous but with pegged local endpoint
-  session(boost::asio::io_service &io_service,
-          const boost::asio::ip::tcp::endpoint &local_endpoint,
-          const std::string &host, const std::string &service,
-          const boost::posix_time::time_duration &connect_timeout);
-
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "443") using encrypted SSL/TLS connection with connect
-  // timeout 60 seconds.
-  session(boost::asio::io_service &io_service,
-          boost::asio::ssl::context &tls_context, const std::string &host,
-          const std::string &service);
-
-  // Starts HTTP/2 session by connecting to |host| and |service|
-  // (e.g., "443") using encrypted SSL/TLS connection with given
-  // connect timeout.
-  session(boost::asio::io_service &io_service,
-          boost::asio::ssl::context &tls_context, const std::string &host,
-          const std::string &service,
-          const boost::posix_time::time_duration &connect_timeout);
-
-  ~session();
-
-  session(session &&other) noexcept;
-  session &operator=(session &&other) noexcept;
-
-  // Sets callback which is invoked after connection is established.
-  void on_connect(connect_cb cb) const;
-
-  // Sets callback which is invoked there is connection level error
-  // and session is terminated.
-  void on_error(error_cb cb) const;
-
-  // Sets read timeout, which defaults to 60 seconds.
-  void read_timeout(const boost::posix_time::time_duration &t);
-
-  // Shutdowns connection.
-  void shutdown() const;
-
-  // Returns underlying io_service object.
-  boost::asio::io_service &io_service() const;
-
-  // Submits request to server using |method| (e.g., "GET"), |uri|
-  // (e.g., "http://localhost/") and optionally additional header
-  // fields.  This function returns pointer to request object if it
-  // succeeds, or nullptr and |ec| contains error message.
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        header_map h = header_map{},
-                        priority_spec prio = priority_spec()) const;
-
-  // Submits request to server using |method| (e.g., "GET"), |uri|
-  // (e.g., "http://localhost/") and optionally additional header
-  // fields.  The |data| is request body.  This function returns
-  // pointer to request object if it succeeds, or nullptr and |ec|
-  // contains error message.
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        std::string data, header_map h = header_map{},
-                        priority_spec prio = priority_spec()) const;
-
-  // Submits request to server using |method| (e.g., "GET"), |uri|
-  // (e.g., "http://localhost/") and optionally additional header
-  // fields.  The |cb| is used to generate request body.  This
-  // function returns pointer to request object if it succeeds, or
-  // nullptr and |ec| contains error message.
-  const request *submit(boost::system::error_code &ec,
-                        const std::string &method, const std::string &uri,
-                        generator_cb cb, header_map h = header_map{},
-                        priority_spec prio = priority_spec()) const;
-
-private:
-  std::shared_ptr<session_impl> impl_;
-};
-
-// configure |tls_ctx| for client use.  Currently, we just set NPN
-// callback for HTTP/2.
-boost::system::error_code
-configure_tls_context(boost::system::error_code &ec,
-                      boost::asio::ssl::context &tls_ctx);
-
-} // namespace client
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_HTTP2_CLIENT_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_HTTP2_H
-#define ASIO_HTTP2_H
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
-#include <functional>
-#include <map>
-
-#include <boost/system/error_code.hpp>
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-
-#include <nghttp2/nghttp2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-struct header_value {
-  // header field value
-  std::string value;
-  // true if the header field value is sensitive information, such as
-  // authorization information or short length secret cookies.  If
-  // true, those header fields are not indexed by HPACK (but still
-  // huffman-encoded), which results in lesser compression.
-  bool sensitive;
-};
-
-// header fields.  The header field name must be lower-cased.
-using header_map = std::multimap<std::string, header_value>;
-
-const boost::system::error_category &nghttp2_category() noexcept;
-
-struct uri_ref {
-  std::string scheme;
-  std::string host;
-  // form after percent-encoding decoded
-  std::string path;
-  // original path, percent-encoded
-  std::string raw_path;
-  // original query, percent-encoded
-  std::string raw_query;
-  std::string fragment;
-};
-
-// Callback function when data is arrived.  EOF is indicated by
-// passing 0 to the second parameter.
-typedef std::function<void(const uint8_t *, std::size_t)> data_cb;
-typedef std::function<void(void)> void_cb;
-typedef std::function<void(const boost::system::error_code &ec)> error_cb;
-// Callback function when request and response are finished.  The
-// parameter indicates the cause of closure.
-typedef std::function<void(uint32_t)> close_cb;
-
-// Callback function to generate response body.  This function has the
-// same semantics with nghttp2_data_source_read_callback.  Just source
-// and user_data parameters are removed.
-//
-// Basically, write at most |len| bytes to |data| and returns the
-// number of bytes written.  If there is no data left to send, set
-// NGHTTP2_DATA_FLAG_EOF to *data_flags (e.g., *data_flags |=
-// NGHTTP2_DATA_FLAG_EOF).  If there is still data to send but they
-// are not available right now, return NGHTTP2_ERR_DEFERRED.  In case
-// of the error and request/response must be closed, return
-// NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE.
-typedef std::function<ssize_t(uint8_t *buf, std::size_t len,
-                              uint32_t *data_flags)>
-    generator_cb;
-
-// Convenient function to create function to read file denoted by
-// |path|.  This can be passed to response::end().
-generator_cb file_generator(const std::string &path);
-
-// Like file_generator(const std::string&), but it takes opened file
-// descriptor.  The passed descriptor will be closed when returned
-// function object is destroyed.
-generator_cb file_generator_from_fd(int fd);
-
-// Validates path so that it does not contain directory traversal
-// vector.  Returns true if path is safe.  The |path| must start with
-// "/" otherwise returns false.  This function should be called after
-// percent-decode was performed.
-bool check_path(const std::string &path);
-
-// Performs percent-decode against string |s|.
-std::string percent_decode(const std::string &s);
-
-// Returns HTTP date representation of current posix time |t|.
-std::string http_date(int64_t t);
-
-// Parses |uri| and extract scheme, host and service.  The service is
-// port component of URI (e.g., "8443") if available, otherwise it is
-// scheme (e.g., "https").
-boost::system::error_code host_service_from_uri(boost::system::error_code &ec,
-                                                std::string &scheme,
-                                                std::string &host,
-                                                std::string &service,
-                                                const std::string &uri);
-
-enum nghttp2_asio_error {
-  NGHTTP2_ASIO_ERR_NO_ERROR = 0,
-  NGHTTP2_ASIO_ERR_TLS_NO_APP_PROTO_NEGOTIATED = 1,
-};
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-namespace boost {
-
-namespace system {
-
-template <> struct is_error_code_enum<nghttp2_error> {
-  BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-template <> struct is_error_code_enum<nghttp2::asio_http2::nghttp2_asio_error> {
-  BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-} // namespace system
-
-} // namespace boost
-
-#endif // ASIO_HTTP2_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_server.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_server.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_server.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/includes/nghttp2/asio_http2_server.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef ASIO_HTTP2_SERVER_H
-#define ASIO_HTTP2_SERVER_H
-
-#include <nghttp2/asio_http2.h>
-
-namespace nghttp2 {
-
-namespace asio_http2 {
-
-namespace server {
-
-class request_impl;
-class response_impl;
-
-class request {
-public:
-  // Application must not call this directly.
-  request();
-  ~request();
-
-  // Returns request header fields.  The pusedo header fields, which
-  // start with colon (:), are exluced from this list.
-  const header_map &header() const;
-
-  // Returns method (e.g., GET).
-  const std::string &method() const;
-
-  // Returns request URI, split into components.
-  const uri_ref &uri() const;
-
-  // Sets callback which is invoked when chunk of request body is
-  // received.
-  void on_data(data_cb cb) const;
-
-  // Application must not call this directly.
-  request_impl &impl() const;
-
-  // Returns the remote endpoint of the request
-  const boost::asio::ip::tcp::endpoint &remote_endpoint() const;
-
-private:
-  std::unique_ptr<request_impl> impl_;
-};
-
-class response {
-public:
-  // Application must not call this directly.
-  response();
-  ~response();
-
-  // Write response header using |status_code| (e.g., 200) and
-  // additional header fields in |h|.
-  void write_head(unsigned int status_code, header_map h = header_map{}) const;
-
-  // Sends |data| as request body.  No further call of end() is
-  // allowed.
-  void end(std::string data = "") const;
-
-  // Sets callback as a generator of the response body.  No further
-  // call of end() is allowed.
-  void end(generator_cb cb) const;
-
-  // Write trailer part.  This must be called after setting both
-  // NGHTTP2_DATA_FLAG_EOF and NGHTTP2_DATA_FLAG_NO_END_STREAM set in
-  // *data_flag parameter in generator_cb passed to end() function.
-  void write_trailer(header_map h) const;
-
-  // Sets callback which is invoked when this request and response are
-  // finished.  After the invocation of this callback, the application
-  // must not access request and response object.
-  void on_close(close_cb cb) const;
-
-  // Cancels this request and response with given error code.
-  void cancel(uint32_t error_code = NGHTTP2_INTERNAL_ERROR) const;
-
-  // Resumes deferred response.
-  void resume() const;
-
-  // Pushes resource denoted by |raw_path_query| using |method|.  The
-  // additional header fields can be given in |h|.  This function
-  // returns pointer to response object for promised stream, otherwise
-  // nullptr and error code is filled in |ec|.  Be aware that the
-  // header field name given in |h| must be lower-cased.
-  const response *push(boost::system::error_code &ec, std::string method,
-                       std::string raw_path_query,
-                       header_map h = header_map{}) const;
-
-  // Returns status code.
-  unsigned int status_code() const;
-
-  // Returns boost::asio::io_service this response is running on.
-  boost::asio::io_service &io_service() const;
-
-  // Application must not call this directly.
-  response_impl &impl() const;
-
-private:
-  std::unique_ptr<response_impl> impl_;
-};
-
-// This is so called request callback.  Called every time request is
-// received.  The life time of |request| and |response| objects end
-// when callback set by response::on_close() is called.  After that,
-// the application must not access to those objects.
-typedef std::function<void(const request &, const response &)> request_cb;
-
-class http2_impl;
-
-class http2 {
-public:
-  http2();
-  ~http2();
-
-  http2(http2 &&other) noexcept;
-  http2 &operator=(http2 &&other) noexcept;
-
-  // Starts listening connection on given address and port and serves
-  // incoming requests in cleartext TCP connection.  If |asynchronous|
-  // is false, this function blocks forever unless there is an error.
-  // If it is true, after server has started, this function returns
-  // immediately, and the caller should call join() to shutdown server
-  // gracefully.
-  boost::system::error_code listen_and_serve(boost::system::error_code &ec,
-                                             const std::string &address,
-                                             const std::string &port,
-                                             bool asynchronous = false);
-
-  // Starts listening connection on given address and port and serves
-  // incoming requests in SSL/TLS encrypted connection.  For
-  // |asynchronous| parameter, see cleartext version
-  // |listen_and_serve|.
-  boost::system::error_code
-  listen_and_serve(boost::system::error_code &ec,
-                   boost::asio::ssl::context &tls_context,
-                   const std::string &address, const std::string &port,
-                   bool asynchronous = false);
-
-  // Registers request handler |cb| with path pattern |pattern|.  This
-  // function will fail and returns false if same pattern has been
-  // already registered or |pattern| is empty string.  Otherwise
-  // returns true.  The pattern match rule is the same as
-  // net/http/ServeMux in golang.  Quoted from golang manual
-  // (http://golang.org/pkg/net/http/#ServeMux):
-  //
-  //   Patterns name fixed, rooted paths, like "/favicon.ico", or
-  //   rooted subtrees, like "/images/" (note the trailing
-  //   slash). Longer patterns take precedence over shorter ones, so
-  //   that if there are handlers registered for both "/images/" and
-  //   "/images/thumbnails/", the latter handler will be called for
-  //   paths beginning "/images/thumbnails/" and the former will
-  //   receive requests for any other paths in the "/images/" subtree.
-  //
-  //   Note that since a pattern ending in a slash names a rooted
-  //   subtree, the pattern "/" matches all paths not matched by other
-  //   registered patterns, not just the URL with Path == "/".
-  //
-  //   Patterns may optionally begin with a host name, restricting
-  //   matches to URLs on that host only. Host-specific patterns take
-  //   precedence over general patterns, so that a handler might
-  //   register for the two patterns "/codesearch" and
-  //   "codesearch.google.com/" without also taking over requests for
-  //   "http://www.google.com/".
-  //
-  // Just like ServeMux in golang, URL request path is sanitized and
-  // if they contains . or .. elements, they are redirected to an
-  // equivalent .- and ..-free URL.
-  bool handle(std::string pattern, request_cb cb);
-
-  // Sets number of native threads to handle incoming HTTP request.
-  // It defaults to 1.
-  void num_threads(size_t num_threads);
-
-  // Sets the maximum length to which the queue of pending
-  // connections.
-  void backlog(int backlog);
-
-  // Sets TLS handshake timeout, which defaults to 60 seconds.
-  void tls_handshake_timeout(const boost::posix_time::time_duration &t);
-
-  // Sets read timeout, which defaults to 60 seconds.
-  void read_timeout(const boost::posix_time::time_duration &t);
-
-  // Gracefully stop http2 server
-  void stop();
-
-  // Join on http2 server and wait for it to fully stop
-  void join();
-
-  // Get access to the io_service objects.
-  const std::vector<std::shared_ptr<boost::asio::io_service>> &
-  io_services() const;
-
-private:
-  std::unique_ptr<http2_impl> impl_;
-};
-
-// Configures |tls_context| for server use.  This function sets couple
-// of OpenSSL options (disables SSLv2 and SSLv3 and compression) and
-// enables ECDHE ciphers.  NPN callback is also configured.
-boost::system::error_code
-configure_tls_context_easy(boost::system::error_code &ec,
-                           boost::asio::ssl::context &tls_context);
-
-// Returns request handler to do redirect to |uri| using
-// |status_code|.  The |uri| appears in "location" header field as is.
-request_cb redirect_handler(int status_code, std::string uri);
-
-// Returns request handler to reply with given |status_code| and HTML
-// including message about status code.
-request_cb status_handler(int status_code);
-
-} // namespace server
-
-} // namespace asio_http2
-
-} // namespace nghttp2
-
-#endif // ASIO_HTTP2_SERVER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/inflatehd.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/inflatehd.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/inflatehd.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/inflatehd.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,289 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <getopt.h>
-
-#include <cstdio>
-#include <cstring>
-#include <assert.h>
-#include <cerrno>
-#include <cstdlib>
-#include <vector>
-#include <iostream>
-
-#include <jansson.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "template.h"
-#include "comp_helper.h"
-
-namespace nghttp2 {
-
-typedef struct {
-  int dump_header_table;
-} inflate_config;
-
-static inflate_config config;
-
-static uint8_t to_ud(char c) {
-  if (c >= 'A' && c <= 'Z') {
-    return c - 'A' + 10;
-  } else if (c >= 'a' && c <= 'z') {
-    return c - 'a' + 10;
-  } else {
-    return c - '0';
-  }
-}
-
-static void decode_hex(uint8_t *dest, const char *src, size_t len) {
-  size_t i;
-  for (i = 0; i < len; i += 2) {
-    *dest++ = to_ud(src[i]) << 4 | to_ud(src[i + 1]);
-  }
-}
-
-static void to_json(nghttp2_hd_inflater *inflater, json_t *headers,
-                    json_t *wire, int seq, size_t old_settings_table_size) {
-  auto obj = json_object();
-  json_object_set_new(obj, "seq", json_integer(seq));
-  json_object_set(obj, "wire", wire);
-  json_object_set(obj, "headers", headers);
-  auto max_dyn_table_size =
-      nghttp2_hd_inflate_get_max_dynamic_table_size(inflater);
-  if (old_settings_table_size != max_dyn_table_size) {
-    json_object_set_new(obj, "header_table_size",
-                        json_integer(max_dyn_table_size));
-  }
-  if (config.dump_header_table) {
-    json_object_set_new(obj, "header_table",
-                        dump_inflate_header_table(inflater));
-  }
-  json_dumpf(obj, stdout, JSON_INDENT(2) | JSON_PRESERVE_ORDER);
-  json_decref(obj);
-  printf("\n");
-}
-
-static int inflate_hd(json_t *obj, nghttp2_hd_inflater *inflater, int seq) {
-  ssize_t rv;
-  nghttp2_nv nv;
-  int inflate_flags;
-  size_t old_settings_table_size =
-      nghttp2_hd_inflate_get_max_dynamic_table_size(inflater);
-
-  auto wire = json_object_get(obj, "wire");
-
-  if (wire == nullptr) {
-    fprintf(stderr, "'wire' key is missing at %d\n", seq);
-    return -1;
-  }
-
-  if (!json_is_string(wire)) {
-    fprintf(stderr, "'wire' value is not string at %d\n", seq);
-    return -1;
-  }
-
-  auto table_size = json_object_get(obj, "header_table_size");
-
-  if (table_size) {
-    if (!json_is_integer(table_size)) {
-      fprintf(stderr,
-              "The value of 'header_table_size key' is not integer at %d\n",
-              seq);
-      return -1;
-    }
-    rv = nghttp2_hd_inflate_change_table_size(inflater,
-                                              json_integer_value(table_size));
-    if (rv != 0) {
-      fprintf(stderr,
-              "nghttp2_hd_change_table_size() failed with error %s at %d\n",
-              nghttp2_strerror(rv), seq);
-      return -1;
-    }
-  }
-
-  auto inputlen = strlen(json_string_value(wire));
-
-  if (inputlen & 1) {
-    fprintf(stderr, "Badly formatted output value at %d\n", seq);
-    exit(EXIT_FAILURE);
-  }
-
-  auto buflen = inputlen / 2;
-  auto buf = std::vector<uint8_t>(buflen);
-
-  decode_hex(buf.data(), json_string_value(wire), inputlen);
-
-  auto headers = json_array();
-
-  auto p = buf.data();
-  for (;;) {
-    inflate_flags = 0;
-    rv = nghttp2_hd_inflate_hd(inflater, &nv, &inflate_flags, p, buflen, 1);
-    if (rv < 0) {
-      fprintf(stderr, "inflate failed with error code %zd at %d\n", rv, seq);
-      exit(EXIT_FAILURE);
-    }
-    p += rv;
-    buflen -= rv;
-    if (inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
-      json_array_append_new(
-          headers, dump_header(nv.name, nv.namelen, nv.value, nv.valuelen));
-    }
-    if (inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
-      break;
-    }
-  }
-  assert(buflen == 0);
-  nghttp2_hd_inflate_end_headers(inflater);
-  to_json(inflater, headers, wire, seq, old_settings_table_size);
-  json_decref(headers);
-
-  return 0;
-}
-
-static int perform(void) {
-  nghttp2_hd_inflater *inflater = NULL;
-  json_error_t error;
-
-  auto json = json_loadf(stdin, 0, &error);
-
-  if (json == nullptr) {
-    fprintf(stderr, "JSON loading failed\n");
-    exit(EXIT_FAILURE);
-  }
-
-  auto cases = json_object_get(json, "cases");
-
-  if (cases == nullptr) {
-    fprintf(stderr, "Missing 'cases' key in root object\n");
-    exit(EXIT_FAILURE);
-  }
-
-  if (!json_is_array(cases)) {
-    fprintf(stderr, "'cases' must be JSON array\n");
-    exit(EXIT_FAILURE);
-  }
-
-  nghttp2_hd_inflate_new(&inflater);
-  output_json_header();
-  auto len = json_array_size(cases);
-
-  for (size_t i = 0; i < len; ++i) {
-    auto obj = json_array_get(cases, i);
-    if (!json_is_object(obj)) {
-      fprintf(stderr, "Unexpected JSON type at %zu. It should be object.\n", i);
-      continue;
-    }
-    if (inflate_hd(obj, inflater, i) != 0) {
-      continue;
-    }
-    if (i + 1 < len) {
-      printf(",\n");
-    }
-  }
-  output_json_footer();
-  nghttp2_hd_inflate_del(inflater);
-  json_decref(json);
-
-  return 0;
-}
-
-static void print_help(void) {
-  std::cout << R"(HPACK HTTP/2 header decoder
-Usage: inflatehd [OPTIONS] < INPUT
-
-Reads JSON  data from stdin  and outputs inflated name/value  pairs in
-JSON.
-
-The root JSON object must contain "context" key, which indicates which
-compression context is used.  If  it is "request", request compression
-context  is used.   Otherwise, response  compression context  is used.
-The value  of "cases" key  contains the sequence of  compressed header
-block.  They share  the same compression context and  are processed in
-the order they appear.  Each item in the sequence is a JSON object and
-it must  have at least "wire"  key.  Its value is  a string containing
-compressed header block in hex string.
-
-Example:
-
-{
-  "context": "request",
-  "cases":
-  [
-    { "wire": "0284f77778ff" },
-    { "wire": "0185fafd3c3c7f81" }
-  ]
-}
-
-The output of this program can be used as input for deflatehd.
-
-OPTIONS:
-    -d, --dump-header-table
-                      Output dynamic header table.)"
-            << std::endl;
-  ;
-}
-
-constexpr static struct option long_options[] = {
-    {"dump-header-table", no_argument, nullptr, 'd'}, {nullptr, 0, nullptr, 0}};
-
-int main(int argc, char **argv) {
-  config.dump_header_table = 0;
-  while (1) {
-    int option_index = 0;
-    int c = getopt_long(argc, argv, "dh", long_options, &option_index);
-    if (c == -1) {
-      break;
-    }
-    switch (c) {
-    case 'h':
-      print_help();
-      exit(EXIT_SUCCESS);
-    case 'd':
-      // --dump-header-table
-      config.dump_header_table = 1;
-      break;
-    case '?':
-      exit(EXIT_FAILURE);
-    default:
-      break;
-    }
-  }
-  perform();
-  return 0;
-}
-
-} // namespace nghttp2
-
-int main(int argc, char **argv) {
-  return nghttp2::run_app(nghttp2::main, argc, argv);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "libevent_util.h"
-
-#include <cstring>
-#include <algorithm>
-
-namespace nghttp2 {
-
-namespace util {
-
-EvbufferBuffer::EvbufferBuffer()
-    : evbuffer_(nullptr),
-      bucket_(nullptr),
-      buf_(nullptr),
-      bufmax_(0),
-      buflen_(0),
-      limit_(0),
-      writelen_(0) {}
-
-EvbufferBuffer::EvbufferBuffer(evbuffer *evbuffer, uint8_t *buf, size_t bufmax,
-                               ssize_t limit)
-    : evbuffer_(evbuffer),
-      bucket_(limit == -1 ? nullptr : evbuffer_new()),
-      buf_(buf),
-      bufmax_(bufmax),
-      buflen_(0),
-      limit_(limit),
-      writelen_(0) {}
-
-void EvbufferBuffer::reset(evbuffer *evbuffer, uint8_t *buf, size_t bufmax,
-                           ssize_t limit) {
-  evbuffer_ = evbuffer;
-  buf_ = buf;
-  if (limit != -1 && !bucket_) {
-    bucket_ = evbuffer_new();
-  }
-  bufmax_ = bufmax;
-  buflen_ = 0;
-  limit_ = limit;
-  writelen_ = 0;
-}
-
-EvbufferBuffer::~EvbufferBuffer() {
-  if (bucket_) {
-    evbuffer_free(bucket_);
-  }
-}
-
-int EvbufferBuffer::write_buffer() {
-  for (auto pos = buf_, end = buf_ + buflen_; pos < end;) {
-    // To avoid merging chunks in evbuffer, we first add to temporal
-    // buffer bucket_ and then move its chain to evbuffer_.
-    auto nwrite = std::min(end - pos, limit_);
-    auto rv = evbuffer_add(bucket_, pos, nwrite);
-    if (rv == -1) {
-      return -1;
-    }
-    rv = evbuffer_add_buffer(evbuffer_, bucket_);
-    if (rv == -1) {
-      return -1;
-    }
-    pos += nwrite;
-  }
-  return 0;
-}
-
-int EvbufferBuffer::flush() {
-  int rv;
-  if (buflen_ > 0) {
-    if (limit_ == -1) {
-      rv = evbuffer_add(evbuffer_, buf_, buflen_);
-    } else {
-      rv = write_buffer();
-    }
-    if (rv == -1) {
-      return -1;
-    }
-    writelen_ += buflen_;
-    buflen_ = 0;
-  }
-  return 0;
-}
-
-int EvbufferBuffer::add(const uint8_t *data, size_t datalen) {
-  int rv;
-  if (buflen_ + datalen > bufmax_) {
-    if (buflen_ > 0) {
-      if (limit_ == -1) {
-        rv = evbuffer_add(evbuffer_, buf_, buflen_);
-      } else {
-        rv = write_buffer();
-      }
-      if (rv == -1) {
-        return -1;
-      }
-      writelen_ += buflen_;
-      buflen_ = 0;
-    }
-    if (datalen > bufmax_) {
-      if (limit_ == -1) {
-        rv = evbuffer_add(evbuffer_, data, datalen);
-      } else {
-        rv = write_buffer();
-      }
-      if (rv == -1) {
-        return -1;
-      }
-      writelen_ += buflen_;
-      return 0;
-    }
-  }
-  memcpy(buf_ + buflen_, data, datalen);
-  buflen_ += datalen;
-  return 0;
-}
-
-size_t EvbufferBuffer::get_buflen() const { return buflen_; }
-
-size_t EvbufferBuffer::get_writelen() const { return writelen_; }
-
-void bev_enable_unless(bufferevent *bev, int events) {
-  if ((bufferevent_get_enabled(bev) & events) == events) {
-    return;
-  }
-
-  bufferevent_enable(bev, events);
-}
-
-void bev_disable_unless(bufferevent *bev, int events) {
-  if ((bufferevent_get_enabled(bev) & events) == 0) {
-    return;
-  }
-
-  bufferevent_disable(bev, events);
-}
-
-} // namespace util
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/libevent_util.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef LIBEVENT_UTIL_H
-#define LIBEVENT_UTIL_H
-
-#include "nghttp2_config.h"
-
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-
-namespace nghttp2 {
-
-namespace util {
-
-class EvbufferBuffer {
-public:
-  EvbufferBuffer();
-  // If |limit| is not -1, at most min(limit, bufmax) size bytes are
-  // added to evbuffer_.
-  EvbufferBuffer(evbuffer *evbuffer, uint8_t *buf, size_t bufmax,
-                 ssize_t limit = -1);
-  ~EvbufferBuffer();
-  void reset(evbuffer *evbuffer, uint8_t *buf, size_t bufmax,
-             ssize_t limit = -1);
-  int flush();
-  int add(const uint8_t *data, size_t datalen);
-  size_t get_buflen() const;
-  int write_buffer();
-  // Returns the number of written bytes to evbuffer_ so far.  reset()
-  // resets this value to 0.
-  size_t get_writelen() const;
-
-private:
-  evbuffer *evbuffer_;
-  evbuffer *bucket_;
-  uint8_t *buf_;
-  size_t bufmax_;
-  size_t buflen_;
-  ssize_t limit_;
-  size_t writelen_;
-};
-
-// These functions are provided to reduce epoll_ctl syscall.  Avoid
-// calling bufferevent_enable/disable() unless it is required by
-// sniffing current enabled events.
-void bev_enable_unless(bufferevent *bev, int events);
-void bev_disable_unless(bufferevent *bev, int events);
-
-} // namespace util
-
-} // namespace nghttp2
-
-#endif // LIBEVENT_UTIL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/libnghttp2_asio.pc.in cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/libnghttp2_asio.pc.in
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/libnghttp2_asio.pc.in	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/libnghttp2_asio.pc.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libnghttp2_asio
-Description: HTTP/2 C++ library
-URL: https://github.com/tatsuhiro-t/nghttp2
-Version: @VERSION@
-Libs: -L${libdir} -lnghttp2_asio
-Cflags: -I${includedir}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,273 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = includes
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	test.example.com.pem \
-	test.nghttp2.org.pem
-
-bin_PROGRAMS =
-check_PROGRAMS =
-TESTS =
-
-AM_CFLAGS = $(WARNCFLAGS)
-AM_CXXFLAGS = $(WARNCXXFLAGS) $(CXX1XCXXFLAGS)
-AM_CPPFLAGS = \
-	-DPKGDATADIR='"$(pkgdatadir)"' \
-	-I$(top_srcdir)/lib/includes \
-	-I$(top_builddir)/lib/includes \
-	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/src/includes \
-	-I$(top_srcdir)/third-party \
-	@LIBXML2_CFLAGS@ \
-	@LIBEV_CFLAGS@ \
-	@OPENSSL_CFLAGS@ \
-	@LIBCARES_CFLAGS@ \
-	@JANSSON_CFLAGS@ \
-	@ZLIB_CFLAGS@ \
-	@DEFS@
-
-LDADD = $(top_builddir)/lib/libnghttp2.la \
-	$(top_builddir)/third-party/libhttp-parser.la \
-	@JEMALLOC_LIBS@ \
-	@LIBXML2_LIBS@ \
-	@LIBEV_LIBS@ \
-	@OPENSSL_LIBS@ \
-	@LIBCARES_LIBS@ \
-	@SYSTEMD_LIBS@ \
-	@JANSSON_LIBS@ \
-	@ZLIB_LIBS@ \
-	@APPLDFLAGS@
-
-if ENABLE_APP
-
-bin_PROGRAMS += nghttp nghttpd nghttpx
-
-HELPER_OBJECTS = util.cc \
-	http2.cc timegm.c app_helper.cc nghttp2_gzip.c
-HELPER_HFILES = util.h \
-	http2.h timegm.h app_helper.h nghttp2_config.h \
-	nghttp2_gzip.h network.h
-
-HTML_PARSER_OBJECTS =
-HTML_PARSER_HFILES = HtmlParser.h
-
-if HAVE_LIBXML2
-HTML_PARSER_OBJECTS += HtmlParser.cc
-endif # HAVE_LIBXML2
-
-nghttp_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttp.cc nghttp.h \
-	${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES} \
-	tls.cc tls.h
-
-nghttpd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttpd.cc \
-	tls.cc tls.h \
-	HttpServer.cc HttpServer.h
-
-bin_PROGRAMS += h2load
-
-h2load_SOURCES = util.cc util.h \
-	http2.cc http2.h h2load.cc h2load.h \
-	timegm.c timegm.h \
-	tls.cc tls.h \
-	h2load_session.h \
-	h2load_http2_session.cc h2load_http2_session.h \
-	h2load_http1_session.cc h2load_http1_session.h
-
-NGHTTPX_SRCS = \
-	util.cc util.h http2.cc http2.h timegm.c timegm.h base64.h \
-	app_helper.cc app_helper.h \
-	tls.cc tls.h \
-	shrpx_config.cc shrpx_config.h \
-	shrpx_error.h \
-	shrpx_accept_handler.cc shrpx_accept_handler.h \
-	shrpx_connection_handler.cc shrpx_connection_handler.h \
-	shrpx_client_handler.cc shrpx_client_handler.h \
-	shrpx_upstream.h \
-	shrpx_http2_upstream.cc shrpx_http2_upstream.h \
-	shrpx_https_upstream.cc shrpx_https_upstream.h \
-	shrpx_downstream.cc shrpx_downstream.h \
-	shrpx_downstream_connection.cc shrpx_downstream_connection.h \
-	shrpx_http_downstream_connection.cc shrpx_http_downstream_connection.h \
-	shrpx_http2_downstream_connection.cc shrpx_http2_downstream_connection.h \
-	shrpx_http2_session.cc shrpx_http2_session.h \
-	shrpx_downstream_queue.cc shrpx_downstream_queue.h \
-	shrpx_log.cc shrpx_log.h \
-	shrpx_http.cc shrpx_http.h \
-	shrpx_io_control.cc shrpx_io_control.h \
-	shrpx_tls.cc shrpx_tls.h \
-	shrpx_worker.cc shrpx_worker.h \
-	shrpx_log_config.cc shrpx_log_config.h \
-	shrpx_connect_blocker.cc shrpx_connect_blocker.h \
-	shrpx_live_check.cc shrpx_live_check.h \
-	shrpx_downstream_connection_pool.cc shrpx_downstream_connection_pool.h \
-	shrpx_rate_limit.cc shrpx_rate_limit.h \
-	shrpx_connection.cc shrpx_connection.h \
-	shrpx_memcached_dispatcher.cc shrpx_memcached_dispatcher.h \
-	shrpx_memcached_connection.cc shrpx_memcached_connection.h \
-	shrpx_memcached_request.h \
-	shrpx_memcached_result.h \
-	shrpx_worker_process.cc shrpx_worker_process.h \
-	shrpx_process.h \
-	shrpx_signal.cc shrpx_signal.h \
-	shrpx_router.cc shrpx_router.h \
-	shrpx_api_downstream_connection.cc shrpx_api_downstream_connection.h \
-	shrpx_health_monitor_downstream_connection.cc \
-	shrpx_health_monitor_downstream_connection.h \
-	shrpx_exec.cc shrpx_exec.h \
-	shrpx_dns_resolver.cc shrpx_dns_resolver.h \
-	shrpx_dual_dns_resolver.cc shrpx_dual_dns_resolver.h \
-	shrpx_dns_tracker.cc shrpx_dns_tracker.h \
-	buffer.h memchunk.h template.h allocator.h \
-	xsi_strerror.c xsi_strerror.h
-
-if HAVE_MRUBY
-NGHTTPX_SRCS += \
-	shrpx_mruby.cc shrpx_mruby.h \
-	shrpx_mruby_module.cc shrpx_mruby_module.h \
-	shrpx_mruby_module_env.cc shrpx_mruby_module_env.h \
-	shrpx_mruby_module_request.cc shrpx_mruby_module_request.h \
-	shrpx_mruby_module_response.cc shrpx_mruby_module_response.h
-endif # HAVE_MRUBY
-
-noinst_LIBRARIES = libnghttpx.a
-libnghttpx_a_SOURCES = ${NGHTTPX_SRCS}
-libnghttpx_a_CPPFLAGS = ${AM_CPPFLAGS}
-
-nghttpx_SOURCES = shrpx.cc shrpx.h
-nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS}
-nghttpx_LDADD = libnghttpx.a ${LDADD}
-
-if HAVE_MRUBY
-libnghttpx_a_CPPFLAGS += \
-	-I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@
-nghttpx_LDADD += -L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@
-endif # HAVE_MRUBY
-
-if HAVE_NEVERBLEED
-libnghttpx_a_CPPFLAGS += -I${top_srcdir}/third-party/neverbleed
-nghttpx_LDADD += ${top_builddir}/third-party/libneverbleed.la
-endif # HAVE_NEVERBLEED
-
-if HAVE_CUNIT
-check_PROGRAMS += nghttpx-unittest
-nghttpx_unittest_SOURCES = shrpx-unittest.cc \
-	shrpx_tls_test.cc shrpx_tls_test.h \
-	shrpx_downstream_test.cc shrpx_downstream_test.h \
-	shrpx_config_test.cc shrpx_config_test.h \
-	shrpx_worker_test.cc shrpx_worker_test.h \
-	shrpx_http_test.cc shrpx_http_test.h \
-	shrpx_router_test.cc shrpx_router_test.h \
-	http2_test.cc http2_test.h \
-	util_test.cc util_test.h \
-	nghttp2_gzip_test.c nghttp2_gzip_test.h \
-	nghttp2_gzip.c nghttp2_gzip.h \
-	buffer_test.cc buffer_test.h \
-	memchunk_test.cc memchunk_test.h \
-	template_test.cc template_test.h \
-	base64_test.cc base64_test.h
-nghttpx_unittest_CPPFLAGS = ${AM_CPPFLAGS} \
-	-DNGHTTP2_SRC_DIR=\"$(top_srcdir)/src\"
-nghttpx_unittest_LDADD = libnghttpx.a ${LDADD} @CUNIT_LIBS@ @TESTLDADD@
-
-if HAVE_MRUBY
-nghttpx_unittest_CPPFLAGS += \
-	-I${top_srcdir}/third-party/mruby/include @LIBMRUBY_CFLAGS@
-nghttpx_unittest_LDADD += \
-	-L${top_builddir}/third-party/mruby/build/lib @LIBMRUBY_LIBS@
-endif # HAVE_MRUBY
-
-if HAVE_NEVERBLEED
-nghttpx_unittest_CPPFLAGS += -I${top_srcdir}/third-party/neverbleed
-nghttpx_unittest_LDADD += ${top_builddir}/third-party/libneverbleed.la
-endif # HAVE_NEVERBLEED
-
-TESTS += nghttpx-unittest
-endif # HAVE_CUNIT
-
-endif # ENABLE_APP
-
-if ENABLE_HPACK_TOOLS
-
-bin_PROGRAMS += inflatehd deflatehd
-
-HPACK_TOOLS_COMMON_SRCS = comp_helper.c comp_helper.h
-
-inflatehd_SOURCES = inflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
-
-deflatehd_SOURCES = deflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)
-
-endif # ENABLE_HPACK_TOOLS
-
-if ENABLE_ASIO_LIB
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnghttp2_asio.pc
-DISTCLEANFILES = $(pkgconfig_DATA)
-
-lib_LTLIBRARIES = libnghttp2_asio.la
-
-libnghttp2_asio_la_SOURCES = \
-	util.cc util.h http2.cc http2.h \
-	tls.cc tls.h \
-	ssl_compat.h \
-	timegm.c timegm.h \
-	asio_common.cc asio_common.h \
-	asio_io_service_pool.cc asio_io_service_pool.h \
-	asio_server_http2.cc \
-	asio_server_http2_impl.cc asio_server_http2_impl.h \
-	asio_server.cc asio_server.h \
-	asio_server_http2_handler.cc asio_server_http2_handler.h \
-	asio_server_connection.h \
-	asio_server_request.cc \
-	asio_server_request_impl.cc asio_server_request_impl.h \
-	asio_server_response.cc \
-	asio_server_response_impl.cc asio_server_response_impl.h \
-	asio_server_stream.cc asio_server_stream.h \
-	asio_server_serve_mux.cc asio_server_serve_mux.h \
-	asio_server_request_handler.cc asio_server_request_handler.h \
-	asio_server_tls_context.cc asio_server_tls_context.h \
-	asio_client_session.cc \
-	asio_client_session_impl.cc asio_client_session_impl.h \
-	asio_client_session_tcp_impl.cc asio_client_session_tcp_impl.h \
-	asio_client_session_tls_impl.cc asio_client_session_tls_impl.h \
-	asio_client_response.cc \
-	asio_client_response_impl.cc asio_client_response_impl.h \
-	asio_client_request.cc \
-	asio_client_request_impl.cc asio_client_request_impl.h \
-	asio_client_stream.cc asio_client_stream.h \
-	asio_client_tls_context.cc asio_client_tls_context.h
-
-libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-libnghttp2_asio_la_LDFLAGS = -no-undefined -version-info 1:0:0
-libnghttp2_asio_la_LIBADD = \
-	$(top_builddir)/lib/libnghttp2.la \
-	$(top_builddir)/third-party/libhttp-parser.la \
-	@OPENSSL_LIBS@ \
-	${BOOST_LDFLAGS} \
-	${BOOST_ASIO_LIB} \
-	${BOOST_THREAD_LIB} \
-	${BOOST_SYSTEM_LIB}
-
-endif # ENABLE_ASIO_LIB
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/memchunk.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/memchunk.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/memchunk.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/memchunk.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,569 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef MEMCHUNK_H
-#define MEMCHUNK_H
-
-#include "nghttp2_config.h"
-
-#include <limits.h>
-#ifdef _WIN32
-/* Structure for scatter/gather I/O.  */
-struct iovec {
-  void *iov_base; /* Pointer to data.  */
-  size_t iov_len; /* Length of data.  */
-};
-#else // !_WIN32
-#  include <sys/uio.h>
-#endif // !_WIN32
-
-#include <cassert>
-#include <cstring>
-#include <memory>
-#include <array>
-#include <algorithm>
-#include <string>
-
-#include "template.h"
-
-namespace nghttp2 {
-
-#define DEFAULT_WR_IOVCNT 16
-
-#if defined(IOV_MAX) && IOV_MAX < DEFAULT_WR_IOVCNT
-#  define MAX_WR_IOVCNT IOV_MAX
-#else // !defined(IOV_MAX) || IOV_MAX >= DEFAULT_WR_IOVCNT
-#  define MAX_WR_IOVCNT DEFAULT_WR_IOVCNT
-#endif // !defined(IOV_MAX) || IOV_MAX >= DEFAULT_WR_IOVCNT
-
-template <size_t N> struct Memchunk {
-  Memchunk(Memchunk *next_chunk)
-      : pos(std::begin(buf)), last(pos), knext(next_chunk), next(nullptr) {}
-  size_t len() const { return last - pos; }
-  size_t left() const { return std::end(buf) - last; }
-  void reset() { pos = last = std::begin(buf); }
-  std::array<uint8_t, N> buf;
-  uint8_t *pos, *last;
-  Memchunk *knext;
-  Memchunk *next;
-  static const size_t size = N;
-};
-
-template <typename T> struct Pool {
-  Pool() : pool(nullptr), freelist(nullptr), poolsize(0) {}
-  ~Pool() { clear(); }
-  T *get() {
-    if (freelist) {
-      auto m = freelist;
-      freelist = freelist->next;
-      m->next = nullptr;
-      m->reset();
-      return m;
-    }
-
-    pool = new T{pool};
-    poolsize += T::size;
-    return pool;
-  }
-  void recycle(T *m) {
-    m->next = freelist;
-    freelist = m;
-  }
-  void clear() {
-    freelist = nullptr;
-    for (auto p = pool; p;) {
-      auto knext = p->knext;
-      delete p;
-      p = knext;
-    }
-    pool = nullptr;
-    poolsize = 0;
-  }
-  using value_type = T;
-  T *pool;
-  T *freelist;
-  size_t poolsize;
-};
-
-template <typename Memchunk> struct Memchunks {
-  Memchunks(Pool<Memchunk> *pool)
-      : pool(pool), head(nullptr), tail(nullptr), len(0) {}
-  Memchunks(const Memchunks &) = delete;
-  Memchunks(Memchunks &&other) noexcept
-      : pool(other.pool), head(other.head), tail(other.tail), len(other.len) {
-    // keep other.pool
-    other.head = other.tail = nullptr;
-    other.len = 0;
-  }
-  Memchunks &operator=(const Memchunks &) = delete;
-  Memchunks &operator=(Memchunks &&other) noexcept {
-    if (this == &other) {
-      return *this;
-    }
-
-    reset();
-
-    pool = other.pool;
-    head = other.head;
-    tail = other.tail;
-    len = other.len;
-
-    other.head = other.tail = nullptr;
-    other.len = 0;
-
-    return *this;
-  }
-  ~Memchunks() {
-    if (!pool) {
-      return;
-    }
-    for (auto m = head; m;) {
-      auto next = m->next;
-      pool->recycle(m);
-      m = next;
-    }
-  }
-  size_t append(char c) {
-    if (!tail) {
-      head = tail = pool->get();
-    } else if (tail->left() == 0) {
-      tail->next = pool->get();
-      tail = tail->next;
-    }
-    *tail->last++ = c;
-    ++len;
-    return 1;
-  }
-  size_t append(const void *src, size_t count) {
-    if (count == 0) {
-      return 0;
-    }
-
-    auto first = static_cast<const uint8_t *>(src);
-    auto last = first + count;
-
-    if (!tail) {
-      head = tail = pool->get();
-    }
-
-    for (;;) {
-      auto n = std::min(static_cast<size_t>(last - first), tail->left());
-      tail->last = std::copy_n(first, n, tail->last);
-      first += n;
-      len += n;
-      if (first == last) {
-        break;
-      }
-
-      tail->next = pool->get();
-      tail = tail->next;
-    }
-
-    return count;
-  }
-  template <size_t N> size_t append(const char (&s)[N]) {
-    return append(s, N - 1);
-  }
-  size_t append(const std::string &s) { return append(s.c_str(), s.size()); }
-  size_t append(const StringRef &s) { return append(s.c_str(), s.size()); }
-  size_t append(const ImmutableString &s) {
-    return append(s.c_str(), s.size());
-  }
-  size_t remove(void *dest, size_t count) {
-    if (!tail || count == 0) {
-      return 0;
-    }
-
-    auto first = static_cast<uint8_t *>(dest);
-    auto last = first + count;
-
-    auto m = head;
-
-    while (m) {
-      auto next = m->next;
-      auto n = std::min(static_cast<size_t>(last - first), m->len());
-
-      assert(m->len());
-      first = std::copy_n(m->pos, n, first);
-      m->pos += n;
-      len -= n;
-      if (m->len() > 0) {
-        break;
-      }
-      pool->recycle(m);
-      m = next;
-    }
-    head = m;
-    if (head == nullptr) {
-      tail = nullptr;
-    }
-
-    return first - static_cast<uint8_t *>(dest);
-  }
-  size_t remove(Memchunks &dest, size_t count) {
-    if (!tail || count == 0) {
-      return 0;
-    }
-
-    auto left = count;
-    auto m = head;
-
-    while (m) {
-      auto next = m->next;
-      auto n = std::min(left, m->len());
-
-      assert(m->len());
-      dest.append(m->pos, n);
-      m->pos += n;
-      len -= n;
-      left -= n;
-      if (m->len() > 0) {
-        break;
-      }
-      pool->recycle(m);
-      m = next;
-    }
-    head = m;
-    if (head == nullptr) {
-      tail = nullptr;
-    }
-
-    return count - left;
-  }
-  size_t remove(Memchunks &dest) {
-    assert(pool == dest.pool);
-
-    if (head == nullptr) {
-      return 0;
-    }
-
-    auto n = len;
-
-    if (dest.tail == nullptr) {
-      dest.head = head;
-    } else {
-      dest.tail->next = head;
-    }
-
-    dest.tail = tail;
-    dest.len += len;
-
-    head = tail = nullptr;
-    len = 0;
-
-    return n;
-  }
-  size_t drain(size_t count) {
-    auto ndata = count;
-    auto m = head;
-    while (m) {
-      auto next = m->next;
-      auto n = std::min(count, m->len());
-      m->pos += n;
-      count -= n;
-      len -= n;
-      if (m->len() > 0) {
-        break;
-      }
-
-      pool->recycle(m);
-      m = next;
-    }
-    head = m;
-    if (head == nullptr) {
-      tail = nullptr;
-    }
-    return ndata - count;
-  }
-  int riovec(struct iovec *iov, int iovcnt) const {
-    if (!head) {
-      return 0;
-    }
-    auto m = head;
-    int i;
-    for (i = 0; i < iovcnt && m; ++i, m = m->next) {
-      iov[i].iov_base = m->pos;
-      iov[i].iov_len = m->len();
-    }
-    return i;
-  }
-  size_t rleft() const { return len; }
-  void reset() {
-    for (auto m = head; m;) {
-      auto next = m->next;
-      pool->recycle(m);
-      m = next;
-    }
-    len = 0;
-    head = tail = nullptr;
-  }
-
-  Pool<Memchunk> *pool;
-  Memchunk *head, *tail;
-  size_t len;
-};
-
-// Wrapper around Memchunks to offer "peeking" functionality.
-template <typename Memchunk> struct PeekMemchunks {
-  PeekMemchunks(Pool<Memchunk> *pool)
-      : memchunks(pool),
-        cur(nullptr),
-        cur_pos(nullptr),
-        cur_last(nullptr),
-        len(0),
-        peeking(true) {}
-  PeekMemchunks(const PeekMemchunks &) = delete;
-  PeekMemchunks(PeekMemchunks &&other) noexcept
-      : memchunks(std::move(other.memchunks)),
-        cur(other.cur),
-        cur_pos(other.cur_pos),
-        cur_last(other.cur_last),
-        len(other.len),
-        peeking(other.peeking) {
-    other.reset();
-  }
-  PeekMemchunks &operator=(const PeekMemchunks &) = delete;
-  PeekMemchunks &operator=(PeekMemchunks &&other) noexcept {
-    if (this == &other) {
-      return *this;
-    }
-
-    memchunks = std::move(other.memchunks);
-    cur = other.cur;
-    cur_pos = other.cur_pos;
-    cur_last = other.cur_last;
-    len = other.len;
-    peeking = other.peeking;
-
-    other.reset();
-
-    return *this;
-  }
-  size_t append(const void *src, size_t count) {
-    count = memchunks.append(src, count);
-    len += count;
-    return count;
-  }
-  size_t remove(void *dest, size_t count) {
-    if (!peeking) {
-      count = memchunks.remove(dest, count);
-      len -= count;
-      return count;
-    }
-
-    if (count == 0 || len == 0) {
-      return 0;
-    }
-
-    if (!cur) {
-      cur = memchunks.head;
-      cur_pos = cur->pos;
-    }
-
-    // cur_last could be updated in append
-    cur_last = cur->last;
-
-    if (cur_pos == cur_last) {
-      assert(cur->next);
-      cur = cur->next;
-    }
-
-    auto first = static_cast<uint8_t *>(dest);
-    auto last = first + count;
-
-    for (;;) {
-      auto n = std::min(last - first, cur_last - cur_pos);
-
-      first = std::copy_n(cur_pos, n, first);
-      cur_pos += n;
-      len -= n;
-
-      if (first == last) {
-        break;
-      }
-      assert(cur_pos == cur_last);
-      if (!cur->next) {
-        break;
-      }
-      cur = cur->next;
-      cur_pos = cur->pos;
-      cur_last = cur->last;
-    }
-    return first - static_cast<uint8_t *>(dest);
-  }
-  size_t rleft() const { return len; }
-  size_t rleft_buffered() const { return memchunks.rleft(); }
-  void disable_peek(bool drain) {
-    if (!peeking) {
-      return;
-    }
-    if (drain) {
-      auto n = rleft_buffered() - rleft();
-      memchunks.drain(n);
-      assert(len == memchunks.rleft());
-    } else {
-      len = memchunks.rleft();
-    }
-    cur = nullptr;
-    cur_pos = cur_last = nullptr;
-    peeking = false;
-  }
-  void reset() {
-    memchunks.reset();
-    cur = nullptr;
-    cur_pos = cur_last = nullptr;
-    len = 0;
-    peeking = true;
-  }
-  Memchunks<Memchunk> memchunks;
-  // Pointer to the Memchunk currently we are reading/writing.
-  Memchunk *cur;
-  // Region inside cur, we have processed to cur_pos.
-  uint8_t *cur_pos, *cur_last;
-  // This is the length we have left unprocessed.  len <=
-  // memchunk.rleft() must hold.
-  size_t len;
-  // true if peeking is enabled.  Initially it is true.
-  bool peeking;
-};
-
-using Memchunk16K = Memchunk<16_k>;
-using MemchunkPool = Pool<Memchunk16K>;
-using DefaultMemchunks = Memchunks<Memchunk16K>;
-using DefaultPeekMemchunks = PeekMemchunks<Memchunk16K>;
-
-inline int limit_iovec(struct iovec *iov, int iovcnt, size_t max) {
-  if (max == 0) {
-    return 0;
-  }
-  for (int i = 0; i < iovcnt; ++i) {
-    auto d = std::min(max, iov[i].iov_len);
-    iov[i].iov_len = d;
-    max -= d;
-    if (max == 0) {
-      return i + 1;
-    }
-  }
-  return iovcnt;
-}
-
-// MemchunkBuffer is similar to Buffer, but it uses pooled Memchunk
-// for its underlying buffer.
-template <typename Memchunk> struct MemchunkBuffer {
-  MemchunkBuffer(Pool<Memchunk> *pool) : pool(pool), chunk(nullptr) {}
-  MemchunkBuffer(const MemchunkBuffer &) = delete;
-  MemchunkBuffer(MemchunkBuffer &&other) noexcept
-      : pool(other.pool), chunk(other.chunk) {
-    other.chunk = nullptr;
-  }
-  MemchunkBuffer &operator=(const MemchunkBuffer &) = delete;
-  MemchunkBuffer &operator=(MemchunkBuffer &&other) noexcept {
-    if (this == &other) {
-      return *this;
-    }
-
-    pool = other.pool;
-    chunk = other.chunk;
-
-    other.chunk = nullptr;
-
-    return *this;
-  }
-
-  ~MemchunkBuffer() {
-    if (!pool || !chunk) {
-      return;
-    }
-    pool->recycle(chunk);
-  }
-
-  // Ensures that the underlying buffer is allocated.
-  void ensure_chunk() {
-    if (chunk) {
-      return;
-    }
-    chunk = pool->get();
-  }
-
-  // Releases the underlying buffer.
-  void release_chunk() {
-    if (!chunk) {
-      return;
-    }
-    pool->recycle(chunk);
-    chunk = nullptr;
-  }
-
-  // Returns true if the underlying buffer is allocated.
-  bool chunk_avail() const { return chunk != nullptr; }
-
-  // The functions below must be called after the underlying buffer is
-  // allocated (use ensure_chunk).
-
-  // MemchunkBuffer provides the same interface functions with Buffer.
-  // Since we has chunk as a member variable, pos and last are
-  // implemented as wrapper functions.
-
-  uint8_t *pos() const { return chunk->pos; }
-  uint8_t *last() const { return chunk->last; }
-
-  size_t rleft() const { return chunk->len(); }
-  size_t wleft() const { return chunk->left(); }
-  size_t write(const void *src, size_t count) {
-    count = std::min(count, wleft());
-    auto p = static_cast<const uint8_t *>(src);
-    chunk->last = std::copy_n(p, count, chunk->last);
-    return count;
-  }
-  size_t write(size_t count) {
-    count = std::min(count, wleft());
-    chunk->last += count;
-    return count;
-  }
-  size_t drain(size_t count) {
-    count = std::min(count, rleft());
-    chunk->pos += count;
-    return count;
-  }
-  size_t drain_reset(size_t count) {
-    count = std::min(count, rleft());
-    std::copy(chunk->pos + count, chunk->last, std::begin(chunk->buf));
-    chunk->last = std::begin(chunk->buf) + (chunk->last - (chunk->pos + count));
-    chunk->pos = std::begin(chunk->buf);
-    return count;
-  }
-  void reset() { chunk->reset(); }
-  uint8_t *begin() { return std::begin(chunk->buf); }
-  uint8_t &operator[](size_t n) { return chunk->buf[n]; }
-  const uint8_t &operator[](size_t n) const { return chunk->buf[n]; }
-
-  Pool<Memchunk> *pool;
-  Memchunk *chunk;
-};
-
-using DefaultMemchunkBuffer = MemchunkBuffer<Memchunk16K>;
-
-} // namespace nghttp2
-
-#endif // MEMCHUNK_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "memchunk_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "memchunk.h"
-#include "util.h"
-
-namespace nghttp2 {
-
-void test_pool_recycle(void) {
-  MemchunkPool pool;
-
-  CU_ASSERT(!pool.pool);
-  CU_ASSERT(0 == pool.poolsize);
-  CU_ASSERT(nullptr == pool.freelist);
-
-  auto m1 = pool.get();
-
-  CU_ASSERT(m1 == pool.pool);
-  CU_ASSERT(MemchunkPool::value_type::size == pool.poolsize);
-  CU_ASSERT(nullptr == pool.freelist);
-
-  auto m2 = pool.get();
-
-  CU_ASSERT(m2 == pool.pool);
-  CU_ASSERT(2 * MemchunkPool::value_type::size == pool.poolsize);
-  CU_ASSERT(nullptr == pool.freelist);
-  CU_ASSERT(m1 == m2->knext);
-  CU_ASSERT(nullptr == m1->knext);
-
-  auto m3 = pool.get();
-
-  CU_ASSERT(m3 == pool.pool);
-  CU_ASSERT(3 * MemchunkPool::value_type::size == pool.poolsize);
-  CU_ASSERT(nullptr == pool.freelist);
-
-  pool.recycle(m3);
-
-  CU_ASSERT(m3 == pool.pool);
-  CU_ASSERT(3 * MemchunkPool::value_type::size == pool.poolsize);
-  CU_ASSERT(m3 == pool.freelist);
-
-  auto m4 = pool.get();
-
-  CU_ASSERT(m3 == m4);
-  CU_ASSERT(m4 == pool.pool);
-  CU_ASSERT(3 * MemchunkPool::value_type::size == pool.poolsize);
-  CU_ASSERT(nullptr == pool.freelist);
-
-  pool.recycle(m2);
-  pool.recycle(m1);
-
-  CU_ASSERT(m1 == pool.freelist);
-  CU_ASSERT(m2 == m1->next);
-  CU_ASSERT(nullptr == m2->next);
-}
-
-using Memchunk16 = Memchunk<16>;
-using MemchunkPool16 = Pool<Memchunk16>;
-using Memchunks16 = Memchunks<Memchunk16>;
-using PeekMemchunks16 = PeekMemchunks<Memchunk16>;
-
-void test_memchunks_append(void) {
-  MemchunkPool16 pool;
-  Memchunks16 chunks(&pool);
-
-  chunks.append("012");
-
-  auto m = chunks.tail;
-
-  CU_ASSERT(3 == m->len());
-  CU_ASSERT(13 == m->left());
-
-  chunks.append("3456789abcdef@");
-
-  CU_ASSERT(16 == m->len());
-  CU_ASSERT(0 == m->left());
-
-  m = chunks.tail;
-
-  CU_ASSERT(1 == m->len());
-  CU_ASSERT(15 == m->left());
-  CU_ASSERT(17 == chunks.rleft());
-
-  char buf[16];
-  size_t nread;
-
-  nread = chunks.remove(buf, 8);
-
-  CU_ASSERT(8 == nread);
-  CU_ASSERT(0 == memcmp("01234567", buf, nread));
-  CU_ASSERT(9 == chunks.rleft());
-
-  nread = chunks.remove(buf, sizeof(buf));
-
-  CU_ASSERT(9 == nread);
-  CU_ASSERT(0 == memcmp("89abcdef@", buf, nread));
-  CU_ASSERT(0 == chunks.rleft());
-  CU_ASSERT(nullptr == chunks.head);
-  CU_ASSERT(nullptr == chunks.tail);
-  CU_ASSERT(32 == pool.poolsize);
-}
-
-void test_memchunks_drain(void) {
-  MemchunkPool16 pool;
-  Memchunks16 chunks(&pool);
-
-  chunks.append("0123456789");
-
-  size_t nread;
-
-  nread = chunks.drain(3);
-
-  CU_ASSERT(3 == nread);
-
-  char buf[16];
-
-  nread = chunks.remove(buf, sizeof(buf));
-
-  CU_ASSERT(7 == nread);
-  CU_ASSERT(0 == memcmp("3456789", buf, nread));
-}
-
-void test_memchunks_riovec(void) {
-  MemchunkPool16 pool;
-  Memchunks16 chunks(&pool);
-
-  char buf[3 * 16];
-
-  chunks.append(buf, sizeof(buf));
-
-  std::array<struct iovec, 2> iov;
-  auto iovcnt = chunks.riovec(iov.data(), iov.size());
-
-  auto m = chunks.head;
-
-  CU_ASSERT(2 == iovcnt);
-  CU_ASSERT(m->buf.data() == iov[0].iov_base);
-  CU_ASSERT(m->len() == iov[0].iov_len);
-
-  m = m->next;
-
-  CU_ASSERT(m->buf.data() == iov[1].iov_base);
-  CU_ASSERT(m->len() == iov[1].iov_len);
-
-  chunks.drain(2 * 16);
-
-  iovcnt = chunks.riovec(iov.data(), iov.size());
-
-  CU_ASSERT(1 == iovcnt);
-
-  m = chunks.head;
-  CU_ASSERT(m->buf.data() == iov[0].iov_base);
-  CU_ASSERT(m->len() == iov[0].iov_len);
-}
-
-void test_memchunks_recycle(void) {
-  MemchunkPool16 pool;
-  {
-    Memchunks16 chunks(&pool);
-    char buf[32];
-    chunks.append(buf, sizeof(buf));
-  }
-  CU_ASSERT(32 == pool.poolsize);
-  CU_ASSERT(nullptr != pool.freelist);
-
-  auto m = pool.freelist;
-  m = m->next;
-
-  CU_ASSERT(nullptr != m);
-  CU_ASSERT(nullptr == m->next);
-}
-
-void test_memchunks_reset(void) {
-  MemchunkPool16 pool;
-  Memchunks16 chunks(&pool);
-
-  std::array<uint8_t, 32> b{};
-
-  chunks.append(b.data(), b.size());
-
-  CU_ASSERT(32 == chunks.rleft());
-
-  chunks.reset();
-
-  CU_ASSERT(0 == chunks.rleft());
-  CU_ASSERT(nullptr == chunks.head);
-  CU_ASSERT(nullptr == chunks.tail);
-
-  auto m = pool.freelist;
-
-  CU_ASSERT(nullptr != m);
-  CU_ASSERT(nullptr != m->next);
-  CU_ASSERT(nullptr == m->next->next);
-}
-
-void test_peek_memchunks_append(void) {
-  MemchunkPool16 pool;
-  PeekMemchunks16 pchunks(&pool);
-
-  std::array<uint8_t, 32> b{{
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-      '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1',
-  }},
-      d;
-
-  pchunks.append(b.data(), b.size());
-
-  CU_ASSERT(32 == pchunks.rleft());
-  CU_ASSERT(32 == pchunks.rleft_buffered());
-
-  CU_ASSERT(0 == pchunks.remove(nullptr, 0));
-
-  CU_ASSERT(32 == pchunks.rleft());
-  CU_ASSERT(32 == pchunks.rleft_buffered());
-
-  CU_ASSERT(12 == pchunks.remove(d.data(), 12));
-
-  CU_ASSERT(std::equal(std::begin(b), std::begin(b) + 12, std::begin(d)));
-
-  CU_ASSERT(20 == pchunks.rleft());
-  CU_ASSERT(32 == pchunks.rleft_buffered());
-
-  CU_ASSERT(20 == pchunks.remove(d.data(), d.size()));
-
-  CU_ASSERT(std::equal(std::begin(b) + 12, std::end(b), std::begin(d)));
-
-  CU_ASSERT(0 == pchunks.rleft());
-  CU_ASSERT(32 == pchunks.rleft_buffered());
-}
-
-void test_peek_memchunks_disable_peek_drain(void) {
-  MemchunkPool16 pool;
-  PeekMemchunks16 pchunks(&pool);
-
-  std::array<uint8_t, 32> b{{
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-      '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1',
-  }},
-      d;
-
-  pchunks.append(b.data(), b.size());
-
-  CU_ASSERT(12 == pchunks.remove(d.data(), 12));
-
-  pchunks.disable_peek(true);
-
-  CU_ASSERT(!pchunks.peeking);
-  CU_ASSERT(20 == pchunks.rleft());
-  CU_ASSERT(20 == pchunks.rleft_buffered());
-
-  CU_ASSERT(20 == pchunks.remove(d.data(), d.size()));
-
-  CU_ASSERT(std::equal(std::begin(b) + 12, std::end(b), std::begin(d)));
-
-  CU_ASSERT(0 == pchunks.rleft());
-  CU_ASSERT(0 == pchunks.rleft_buffered());
-}
-
-void test_peek_memchunks_disable_peek_no_drain(void) {
-  MemchunkPool16 pool;
-  PeekMemchunks16 pchunks(&pool);
-
-  std::array<uint8_t, 32> b{{
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-      '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1',
-  }},
-      d;
-
-  pchunks.append(b.data(), b.size());
-
-  CU_ASSERT(12 == pchunks.remove(d.data(), 12));
-
-  pchunks.disable_peek(false);
-
-  CU_ASSERT(!pchunks.peeking);
-  CU_ASSERT(32 == pchunks.rleft());
-  CU_ASSERT(32 == pchunks.rleft_buffered());
-
-  CU_ASSERT(32 == pchunks.remove(d.data(), d.size()));
-
-  CU_ASSERT(std::equal(std::begin(b), std::end(b), std::begin(d)));
-
-  CU_ASSERT(0 == pchunks.rleft());
-  CU_ASSERT(0 == pchunks.rleft_buffered());
-}
-
-void test_peek_memchunks_reset(void) {
-  MemchunkPool16 pool;
-  PeekMemchunks16 pchunks(&pool);
-
-  std::array<uint8_t, 32> b{{
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
-      '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1',
-  }},
-      d;
-
-  pchunks.append(b.data(), b.size());
-
-  CU_ASSERT(12 == pchunks.remove(d.data(), 12));
-
-  pchunks.disable_peek(true);
-  pchunks.reset();
-
-  CU_ASSERT(0 == pchunks.rleft());
-  CU_ASSERT(0 == pchunks.rleft_buffered());
-
-  CU_ASSERT(nullptr == pchunks.cur);
-  CU_ASSERT(nullptr == pchunks.cur_pos);
-  CU_ASSERT(nullptr == pchunks.cur_last);
-  CU_ASSERT(pchunks.peeking);
-}
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/memchunk_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef MEMCHUNK_TEST_H
-#define MEMCHUNK_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace nghttp2 {
-
-void test_pool_recycle(void);
-void test_memchunks_append(void);
-void test_memchunks_drain(void);
-void test_memchunks_riovec(void);
-void test_memchunks_recycle(void);
-void test_memchunks_reset(void);
-void test_peek_memchunks_append(void);
-void test_peek_memchunks_disable_peek_drain(void);
-void test_peek_memchunks_disable_peek_no_drain(void);
-void test_peek_memchunks_reset(void);
-
-} // namespace nghttp2
-
-#endif // MEMCHUNK_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/network.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/network.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/network.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/network.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NETWORK_H
-#define NETWORK_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef _WIN32
-#  include <ws2tcpip.h>
-#else // !_WIN32
-#  include <sys/un.h>
-#endif // !_WIN32
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif // HAVE_ARPA_INET_H
-
-namespace nghttp2 {
-
-union sockaddr_union {
-  sockaddr_storage storage;
-  sockaddr sa;
-  sockaddr_in6 in6;
-  sockaddr_in in;
-#ifndef _WIN32
-  sockaddr_un un;
-#endif // !_WIN32
-};
-
-struct Address {
-  size_t len;
-  union sockaddr_union su;
-};
-
-} // namespace nghttp2
-
-#endif // NETWORK_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_config.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_config.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_config.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_CONFIG_H
-#define NGHTTP2_CONFIG_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-#endif // NGHTTP2_CONFIG_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_gzip.h"
-
-#include <assert.h>
-
-int nghttp2_gzip_inflate_new(nghttp2_gzip **inflater_ptr) {
-  int rv;
-  *inflater_ptr = malloc(sizeof(nghttp2_gzip));
-  if (*inflater_ptr == NULL) {
-    return -1;
-  }
-  (*inflater_ptr)->finished = 0;
-  (*inflater_ptr)->zst.next_in = Z_NULL;
-  (*inflater_ptr)->zst.avail_in = 0;
-  (*inflater_ptr)->zst.zalloc = Z_NULL;
-  (*inflater_ptr)->zst.zfree = Z_NULL;
-  (*inflater_ptr)->zst.opaque = Z_NULL;
-  rv = inflateInit2(&(*inflater_ptr)->zst, 47);
-  if (rv != Z_OK) {
-    free(*inflater_ptr);
-    return -1;
-  }
-  return 0;
-}
-
-void nghttp2_gzip_inflate_del(nghttp2_gzip *inflater) {
-  if (inflater != NULL) {
-    inflateEnd(&inflater->zst);
-    free(inflater);
-  }
-}
-
-int nghttp2_gzip_inflate(nghttp2_gzip *inflater, uint8_t *out,
-                         size_t *outlen_ptr, const uint8_t *in,
-                         size_t *inlen_ptr) {
-  int rv;
-  if (inflater->finished) {
-    return -1;
-  }
-  inflater->zst.avail_in = (unsigned int)*inlen_ptr;
-  inflater->zst.next_in = (unsigned char *)in;
-  inflater->zst.avail_out = (unsigned int)*outlen_ptr;
-  inflater->zst.next_out = out;
-
-  rv = inflate(&inflater->zst, Z_NO_FLUSH);
-
-  *inlen_ptr -= inflater->zst.avail_in;
-  *outlen_ptr -= inflater->zst.avail_out;
-  switch (rv) {
-  case Z_STREAM_END:
-    inflater->finished = 1;
-  /* FALL THROUGH */
-  case Z_OK:
-  case Z_BUF_ERROR:
-    return 0;
-  case Z_DATA_ERROR:
-  case Z_STREAM_ERROR:
-  case Z_NEED_DICT:
-  case Z_MEM_ERROR:
-    return -1;
-  default:
-    assert(0);
-    /* We need this for some compilers */
-    return 0;
-  }
-}
-
-int nghttp2_gzip_inflate_finished(nghttp2_gzip *inflater) {
-  return inflater->finished;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_GZIP_H
-
-#  ifdef HAVE_CONFIG_H
-#    include <config.h>
-#  endif /* HAVE_CONFIG_H */
-#  include <zlib.h>
-
-#  include <nghttp2/nghttp2.h>
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-/**
- * @struct
- *
- * The gzip stream to inflate data.
- */
-typedef struct {
-  z_stream zst;
-  int8_t finished;
-} nghttp2_gzip;
-
-/**
- * @function
- *
- * A helper function to set up a per request gzip stream to inflate
- * data.
- *
- * This function returns 0 if it succeeds, or -1.
- */
-int nghttp2_gzip_inflate_new(nghttp2_gzip **inflater_ptr);
-
-/**
- * @function
- *
- * Frees the inflate stream.  The |inflater| may be ``NULL``.
- */
-void nghttp2_gzip_inflate_del(nghttp2_gzip *inflater);
-
-/**
- * @function
- *
- * Inflates data in |in| with the length |*inlen_ptr| and stores the
- * inflated data to |out| which has allocated size at least
- * |*outlen_ptr|.  On return, |*outlen_ptr| is updated to represent
- * the number of data written in |out|.  Similarly, |*inlen_ptr| is
- * updated to represent the number of input bytes processed.
- *
- * This function returns 0 if it succeeds, or -1.
- *
- * The example follows::
- *
- *     void on_data_chunk_recv_callback(nghttp2_session *session,
- *                                      uint8_t flags,
- *                                      int32_t stream_id,
- *                                      const uint8_t *data, size_t len,
- *                                      void *user_data)
- *     {
- *         ...
- *         req = nghttp2_session_get_stream_user_data(session, stream_id);
- *         nghttp2_gzip *inflater = req->inflater;
- *         while(len > 0) {
- *             uint8_t out[MAX_OUTLEN];
- *             size_t outlen = MAX_OUTLEN;
- *             size_t tlen = len;
- *             int rv;
- *             rv = nghttp2_gzip_inflate(inflater, out, &outlen, data, &tlen);
- *             if(rv != 0) {
- *                 nghttp2_submit_rst_stream(session, stream_id,
- *                                           NGHTTP2_INTERNAL_ERROR);
- *                 break;
- *             }
- *             ... Do stuff ...
- *             data += tlen;
- *             len -= tlen;
- *         }
- *         ....
- *     }
- */
-int nghttp2_gzip_inflate(nghttp2_gzip *inflater, uint8_t *out,
-                         size_t *outlen_ptr, const uint8_t *in,
-                         size_t *inlen_ptr);
-
-/**
- * @function
- *
- * Returns nonzero if |inflater| sees the end of deflate stream.
- * After this function returns nonzero, `nghttp2_gzip_inflate()` with
- * |inflater| gets to return error.
- */
-int nghttp2_gzip_inflate_finished(nghttp2_gzip *inflater);
-
-#  ifdef __cplusplus
-}
-#  endif
-
-#endif /* NGHTTP2_GZIP_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_gzip_test.h"
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <CUnit/CUnit.h>
-
-#include <zlib.h>
-
-#include "nghttp2_gzip.h"
-
-static size_t deflate_data(uint8_t *out, size_t outlen, const uint8_t *in,
-                           size_t inlen) {
-  int rv;
-  z_stream zst;
-  zst.next_in = Z_NULL;
-  zst.zalloc = Z_NULL;
-  zst.zfree = Z_NULL;
-  zst.opaque = Z_NULL;
-
-  rv = deflateInit(&zst, Z_DEFAULT_COMPRESSION);
-  CU_ASSERT(rv == Z_OK);
-
-  zst.avail_in = (unsigned int)inlen;
-  zst.next_in = (uint8_t *)in;
-  zst.avail_out = (unsigned int)outlen;
-  zst.next_out = out;
-  rv = deflate(&zst, Z_SYNC_FLUSH);
-  CU_ASSERT(rv == Z_OK);
-
-  deflateEnd(&zst);
-
-  return outlen - zst.avail_out;
-}
-
-static const char input[] =
-    "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND "
-    "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF "
-    "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND "
-    "NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE "
-    "LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION "
-    "OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION "
-    "WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.";
-
-void test_nghttp2_gzip_inflate(void) {
-  nghttp2_gzip *inflater;
-  uint8_t in[4096], out[4096], *inptr;
-  size_t inlen = sizeof(in);
-  size_t inproclen, outproclen;
-  const char *inputptr = input;
-
-  inlen = deflate_data(in, inlen, (const uint8_t *)input, sizeof(input) - 1);
-
-  CU_ASSERT(0 == nghttp2_gzip_inflate_new(&inflater));
-  /* First 16 bytes */
-  inptr = in;
-  inproclen = inlen;
-  outproclen = 16;
-  CU_ASSERT(
-      0 == nghttp2_gzip_inflate(inflater, out, &outproclen, inptr, &inproclen));
-  CU_ASSERT(16 == outproclen);
-  CU_ASSERT(inproclen > 0);
-  CU_ASSERT(0 == memcmp(inputptr, out, outproclen));
-  /* Next 32 bytes */
-  inptr += inproclen;
-  inlen -= inproclen;
-  inproclen = inlen;
-  inputptr += outproclen;
-  outproclen = 32;
-  CU_ASSERT(
-      0 == nghttp2_gzip_inflate(inflater, out, &outproclen, inptr, &inproclen));
-  CU_ASSERT(32 == outproclen);
-  CU_ASSERT(inproclen > 0);
-  CU_ASSERT(0 == memcmp(inputptr, out, outproclen));
-  /* Rest */
-  inptr += inproclen;
-  inlen -= inproclen;
-  inproclen = inlen;
-  inputptr += outproclen;
-  outproclen = sizeof(out);
-  CU_ASSERT(
-      0 == nghttp2_gzip_inflate(inflater, out, &outproclen, inptr, &inproclen));
-  CU_ASSERT(sizeof(input) - 49 == outproclen);
-  CU_ASSERT(inproclen > 0);
-  CU_ASSERT(0 == memcmp(inputptr, out, outproclen));
-
-  inlen -= inproclen;
-  CU_ASSERT(0 == inlen);
-
-  nghttp2_gzip_inflate_del(inflater);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp2_gzip_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_GZIP_TEST_H
-#define NGHTTP2_GZIP_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void test_nghttp2_gzip_inflate(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NGHTTP2_GZIP_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3098 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp.h"
-
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#include <netinet/tcp.h>
-#include <getopt.h>
-
-#include <cassert>
-#include <cstdio>
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <tuple>
-
-#include <openssl/err.h>
-
-#ifdef HAVE_JANSSON
-#  include <jansson.h>
-#endif // HAVE_JANSSON
-
-#include "app_helper.h"
-#include "HtmlParser.h"
-#include "util.h"
-#include "base64.h"
-#include "tls.h"
-#include "template.h"
-#include "ssl_compat.h"
-
-#ifndef O_BINARY
-#  define O_BINARY (0)
-#endif // O_BINARY
-
-namespace nghttp2 {
-
-// The anchor stream nodes when --no-dep is not used.  The stream ID =
-// 1 is excluded since it is used as first stream in upgrade case.  We
-// follows the same dependency anchor nodes as Firefox does.
-struct Anchor {
-  int32_t stream_id;
-  // stream ID this anchor depends on
-  int32_t dep_stream_id;
-  // .. with this weight.
-  int32_t weight;
-};
-
-// This is index into anchors.  Firefox uses ANCHOR_FOLLOWERS for html
-// file.
-enum {
-  ANCHOR_LEADERS,
-  ANCHOR_UNBLOCKED,
-  ANCHOR_BACKGROUND,
-  ANCHOR_SPECULATIVE,
-  ANCHOR_FOLLOWERS,
-};
-
-namespace {
-constexpr auto anchors = std::array<Anchor, 5>{{
-    {3, 0, 201},
-    {5, 0, 101},
-    {7, 0, 1},
-    {9, 7, 1},
-    {11, 3, 1},
-}};
-} // namespace
-
-Config::Config()
-    : header_table_size(-1),
-      min_header_table_size(std::numeric_limits<uint32_t>::max()),
-      encoder_header_table_size(-1),
-      padding(0),
-      max_concurrent_streams(100),
-      peer_max_concurrent_streams(100),
-      multiply(1),
-      timeout(0.),
-      window_bits(-1),
-      connection_window_bits(-1),
-      verbose(0),
-      port_override(0),
-      null_out(false),
-      remote_name(false),
-      get_assets(false),
-      stat(false),
-      upgrade(false),
-      continuation(false),
-      no_content_length(false),
-      no_dep(false),
-      hexdump(false),
-      no_push(false),
-      expect_continue(false),
-      verify_peer(true) {
-  nghttp2_option_new(&http2_option);
-  nghttp2_option_set_peer_max_concurrent_streams(http2_option,
-                                                 peer_max_concurrent_streams);
-  nghttp2_option_set_builtin_recv_extension_type(http2_option, NGHTTP2_ALTSVC);
-  nghttp2_option_set_builtin_recv_extension_type(http2_option, NGHTTP2_ORIGIN);
-}
-
-Config::~Config() { nghttp2_option_del(http2_option); }
-
-namespace {
-Config config;
-} // namespace
-
-namespace {
-void print_protocol_nego_error() {
-  std::cerr << "[ERROR] HTTP/2 protocol was not selected."
-            << " (nghttp2 expects " << NGHTTP2_PROTO_VERSION_ID << ")"
-            << std::endl;
-}
-} // namespace
-
-namespace {
-std::string strip_fragment(const char *raw_uri) {
-  const char *end;
-  for (end = raw_uri; *end && *end != '#'; ++end)
-    ;
-  size_t len = end - raw_uri;
-  return std::string(raw_uri, len);
-}
-} // namespace
-
-Request::Request(const std::string &uri, const http_parser_url &u,
-                 const nghttp2_data_provider *data_prd, int64_t data_length,
-                 const nghttp2_priority_spec &pri_spec, int level)
-    : uri(uri),
-      u(u),
-      pri_spec(pri_spec),
-      data_length(data_length),
-      data_offset(0),
-      response_len(0),
-      inflater(nullptr),
-      data_prd(data_prd),
-      header_buffer_size(0),
-      stream_id(-1),
-      status(0),
-      level(level),
-      expect_final_response(false) {
-  http2::init_hdidx(res_hdidx);
-  http2::init_hdidx(req_hdidx);
-}
-
-Request::~Request() { nghttp2_gzip_inflate_del(inflater); }
-
-void Request::init_inflater() {
-  int rv;
-  // This is required with --disable-assert.
-  (void)rv;
-  rv = nghttp2_gzip_inflate_new(&inflater);
-  assert(rv == 0);
-}
-
-StringRef Request::get_real_scheme() const {
-  return config.scheme_override.empty()
-             ? util::get_uri_field(uri.c_str(), u, UF_SCHEMA)
-             : StringRef{config.scheme_override};
-}
-
-StringRef Request::get_real_host() const {
-  return config.host_override.empty()
-             ? util::get_uri_field(uri.c_str(), u, UF_HOST)
-             : StringRef{config.host_override};
-}
-
-uint16_t Request::get_real_port() const {
-  auto scheme = get_real_scheme();
-  return config.host_override.empty()
-             ? util::has_uri_field(u, UF_PORT) ? u.port
-                                               : scheme == "https" ? 443 : 80
-             : config.port_override == 0 ? scheme == "https" ? 443 : 80
-                                         : config.port_override;
-}
-
-void Request::init_html_parser() {
-  // We crawl HTML using overridden scheme, host, and port.
-  auto scheme = get_real_scheme();
-  auto host = get_real_host();
-  auto port = get_real_port();
-  auto ipv6_lit =
-      std::find(std::begin(host), std::end(host), ':') != std::end(host);
-
-  auto base_uri = scheme.str();
-  base_uri += "://";
-  if (ipv6_lit) {
-    base_uri += '[';
-  }
-  base_uri += host;
-  if (ipv6_lit) {
-    base_uri += ']';
-  }
-  if (!((scheme == "https" && port == 443) ||
-        (scheme == "http" && port == 80))) {
-    base_uri += ':';
-    base_uri += util::utos(port);
-  }
-  base_uri += util::get_uri_field(uri.c_str(), u, UF_PATH);
-  if (util::has_uri_field(u, UF_QUERY)) {
-    base_uri += '?';
-    base_uri += util::get_uri_field(uri.c_str(), u, UF_QUERY);
-  }
-
-  html_parser = make_unique<HtmlParser>(base_uri);
-}
-
-int Request::update_html_parser(const uint8_t *data, size_t len, int fin) {
-  if (!html_parser) {
-    return 0;
-  }
-  return html_parser->parse_chunk(reinterpret_cast<const char *>(data), len,
-                                  fin);
-}
-
-std::string Request::make_reqpath() const {
-  std::string path = util::has_uri_field(u, UF_PATH)
-                         ? util::get_uri_field(uri.c_str(), u, UF_PATH).str()
-                         : "/";
-  if (util::has_uri_field(u, UF_QUERY)) {
-    path += '?';
-    path.append(uri.c_str() + u.field_data[UF_QUERY].off,
-                u.field_data[UF_QUERY].len);
-  }
-  return path;
-}
-
-namespace {
-// Perform special handling |host| if it is IPv6 literal and includes
-// zone ID per RFC 6874.
-std::string decode_host(const StringRef &host) {
-  auto zone_start = std::find(std::begin(host), std::end(host), '%');
-  if (zone_start == std::end(host) ||
-      !util::ipv6_numeric_addr(
-          std::string(std::begin(host), zone_start).c_str())) {
-    return host.str();
-  }
-  // case: ::1%
-  if (zone_start + 1 == std::end(host)) {
-    return StringRef{host.c_str(), host.size() - 1}.str();
-  }
-  // case: ::1%12 or ::1%1
-  if (zone_start + 3 >= std::end(host)) {
-    return host.str();
-  }
-  // If we see "%25", followed by more characters, then decode %25 as
-  // '%'.
-  auto zone_id_src = (*(zone_start + 1) == '2' && *(zone_start + 2) == '5')
-                         ? zone_start + 3
-                         : zone_start + 1;
-  auto zone_id = util::percent_decode(zone_id_src, std::end(host));
-  auto res = std::string(std::begin(host), zone_start + 1);
-  res += zone_id;
-  return res;
-}
-} // namespace
-
-namespace {
-nghttp2_priority_spec resolve_dep(int res_type) {
-  nghttp2_priority_spec pri_spec;
-
-  if (config.no_dep) {
-    nghttp2_priority_spec_default_init(&pri_spec);
-
-    return pri_spec;
-  }
-
-  int32_t anchor_id;
-  int32_t weight;
-  switch (res_type) {
-  case REQ_CSS:
-  case REQ_JS:
-    anchor_id = anchors[ANCHOR_LEADERS].stream_id;
-    weight = 32;
-    break;
-  case REQ_UNBLOCK_JS:
-    anchor_id = anchors[ANCHOR_UNBLOCKED].stream_id;
-    weight = 32;
-    break;
-  case REQ_IMG:
-    anchor_id = anchors[ANCHOR_FOLLOWERS].stream_id;
-    weight = 12;
-    break;
-  default:
-    anchor_id = anchors[ANCHOR_FOLLOWERS].stream_id;
-    weight = 32;
-  }
-
-  nghttp2_priority_spec_init(&pri_spec, anchor_id, weight, 0);
-  return pri_spec;
-}
-} // namespace
-
-bool Request::is_ipv6_literal_addr() const {
-  if (util::has_uri_field(u, UF_HOST)) {
-    return memchr(uri.c_str() + u.field_data[UF_HOST].off, ':',
-                  u.field_data[UF_HOST].len);
-  } else {
-    return false;
-  }
-}
-
-Headers::value_type *Request::get_res_header(int32_t token) {
-  auto idx = res_hdidx[token];
-  if (idx == -1) {
-    return nullptr;
-  }
-  return &res_nva[idx];
-}
-
-Headers::value_type *Request::get_req_header(int32_t token) {
-  auto idx = req_hdidx[token];
-  if (idx == -1) {
-    return nullptr;
-  }
-  return &req_nva[idx];
-}
-
-void Request::record_request_start_time() {
-  timing.state = RequestState::ON_REQUEST;
-  timing.request_start_time = get_time();
-}
-
-void Request::record_response_start_time() {
-  timing.state = RequestState::ON_RESPONSE;
-  timing.response_start_time = get_time();
-}
-
-void Request::record_response_end_time() {
-  timing.state = RequestState::ON_COMPLETE;
-  timing.response_end_time = get_time();
-}
-
-namespace {
-void continue_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto client = static_cast<HttpClient *>(ev_userdata(loop));
-  auto req = static_cast<Request *>(w->data);
-  int error;
-
-  error = nghttp2_submit_data(client->session, NGHTTP2_FLAG_END_STREAM,
-                              req->stream_id, req->data_prd);
-
-  if (error) {
-    std::cerr << "[ERROR] nghttp2_submit_data() returned error: "
-              << nghttp2_strerror(error) << std::endl;
-    nghttp2_submit_rst_stream(client->session, NGHTTP2_FLAG_NONE,
-                              req->stream_id, NGHTTP2_INTERNAL_ERROR);
-  }
-
-  client->signal_write();
-}
-} // namespace
-
-ContinueTimer::ContinueTimer(struct ev_loop *loop, Request *req) : loop(loop) {
-  ev_timer_init(&timer, continue_timeout_cb, 1., 0.);
-  timer.data = req;
-}
-
-ContinueTimer::~ContinueTimer() { stop(); }
-
-void ContinueTimer::start() { ev_timer_start(loop, &timer); }
-
-void ContinueTimer::stop() { ev_timer_stop(loop, &timer); }
-
-void ContinueTimer::dispatch_continue() {
-  // Only dispatch the timeout callback if it hasn't already been called.
-  if (ev_is_active(&timer)) {
-    ev_feed_event(loop, &timer, 0);
-  }
-}
-
-namespace {
-int htp_msg_begincb(http_parser *htp) {
-  if (config.verbose) {
-    print_timer();
-    std::cout << " HTTP Upgrade response" << std::endl;
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_msg_completecb(http_parser *htp) {
-  auto client = static_cast<HttpClient *>(htp->data);
-  client->upgrade_response_status_code = htp->status_code;
-  client->upgrade_response_complete = true;
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr http_parser_settings htp_hooks = {
-    htp_msg_begincb,   // http_cb      on_message_begin;
-    nullptr,           // http_data_cb on_url;
-    nullptr,           // http_data_cb on_status;
-    nullptr,           // http_data_cb on_header_field;
-    nullptr,           // http_data_cb on_header_value;
-    nullptr,           // http_cb      on_headers_complete;
-    nullptr,           // http_data_cb on_body;
-    htp_msg_completecb // http_cb      on_message_complete;
-};
-} // namespace
-
-namespace {
-int submit_request(HttpClient *client, const Headers &headers, Request *req) {
-  auto path = req->make_reqpath();
-  auto scheme = util::get_uri_field(req->uri.c_str(), req->u, UF_SCHEMA);
-  auto build_headers = Headers{{":method", req->data_prd ? "POST" : "GET"},
-                               {":path", path},
-                               {":scheme", scheme.str()},
-                               {":authority", client->hostport},
-                               {"accept", "*/*"},
-                               {"accept-encoding", "gzip, deflate"},
-                               {"user-agent", "nghttp2/" NGHTTP2_VERSION}};
-  bool expect_continue = false;
-
-  if (config.continuation) {
-    for (size_t i = 0; i < 6; ++i) {
-      build_headers.emplace_back("continuation-test-" + util::utos(i + 1),
-                                 std::string(4_k, '-'));
-    }
-  }
-
-  auto num_initial_headers = build_headers.size();
-
-  if (req->data_prd) {
-    if (!config.no_content_length) {
-      build_headers.emplace_back("content-length",
-                                 util::utos(req->data_length));
-    }
-    if (config.expect_continue) {
-      expect_continue = true;
-      build_headers.emplace_back("expect", "100-continue");
-    }
-  }
-
-  for (auto &kv : headers) {
-    size_t i;
-    for (i = 0; i < num_initial_headers; ++i) {
-      if (kv.name == build_headers[i].name) {
-        build_headers[i].value = kv.value;
-        break;
-      }
-    }
-    if (i < num_initial_headers) {
-      continue;
-    }
-
-    build_headers.emplace_back(kv.name, kv.value, kv.no_index);
-  }
-
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(build_headers.size());
-
-  for (auto &kv : build_headers) {
-    nva.push_back(http2::make_nv(kv.name, kv.value, kv.no_index));
-  }
-
-  auto method = http2::get_header(build_headers, ":method");
-  assert(method);
-
-  req->method = method->value;
-
-  std::string trailer_names;
-  if (!config.trailer.empty()) {
-    trailer_names = config.trailer[0].name;
-    for (size_t i = 1; i < config.trailer.size(); ++i) {
-      trailer_names += ", ";
-      trailer_names += config.trailer[i].name;
-    }
-    nva.push_back(http2::make_nv_ls("trailer", trailer_names));
-  }
-
-  int32_t stream_id;
-
-  if (expect_continue) {
-    stream_id = nghttp2_submit_headers(client->session, 0, -1, &req->pri_spec,
-                                       nva.data(), nva.size(), req);
-  } else {
-    stream_id =
-        nghttp2_submit_request(client->session, &req->pri_spec, nva.data(),
-                               nva.size(), req->data_prd, req);
-  }
-
-  if (stream_id < 0) {
-    std::cerr << "[ERROR] nghttp2_submit_"
-              << (expect_continue ? "headers" : "request")
-              << "() returned error: " << nghttp2_strerror(stream_id)
-              << std::endl;
-    return -1;
-  }
-
-  req->stream_id = stream_id;
-  client->request_done(req);
-
-  req->req_nva = std::move(build_headers);
-
-  if (expect_continue) {
-    auto timer = make_unique<ContinueTimer>(client->loop, req);
-    req->continue_timer = std::move(timer);
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto client = static_cast<HttpClient *>(w->data);
-  if (client->do_read() != 0) {
-    client->disconnect();
-  }
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto client = static_cast<HttpClient *>(w->data);
-  auto rv = client->do_write();
-  if (rv == HttpClient::ERR_CONNECT_FAIL) {
-    client->connect_fail();
-    return;
-  }
-  if (rv != 0) {
-    client->disconnect();
-  }
-}
-} // namespace
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto client = static_cast<HttpClient *>(w->data);
-  std::cerr << "[ERROR] Timeout" << std::endl;
-  client->disconnect();
-}
-} // namespace
-
-namespace {
-void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto client = static_cast<HttpClient *>(w->data);
-  ev_timer_stop(loop, w);
-
-  nghttp2_session_terminate_session(client->session, NGHTTP2_SETTINGS_TIMEOUT);
-
-  client->signal_write();
-}
-} // namespace
-
-HttpClient::HttpClient(const nghttp2_session_callbacks *callbacks,
-                       struct ev_loop *loop, SSL_CTX *ssl_ctx)
-    : wb(&mcpool),
-      session(nullptr),
-      callbacks(callbacks),
-      loop(loop),
-      ssl_ctx(ssl_ctx),
-      ssl(nullptr),
-      addrs(nullptr),
-      next_addr(nullptr),
-      cur_addr(nullptr),
-      complete(0),
-      success(0),
-      settings_payloadlen(0),
-      state(ClientState::IDLE),
-      upgrade_response_status_code(0),
-      fd(-1),
-      upgrade_response_complete(false) {
-  ev_io_init(&wev, writecb, 0, EV_WRITE);
-  ev_io_init(&rev, readcb, 0, EV_READ);
-
-  wev.data = this;
-  rev.data = this;
-
-  ev_timer_init(&wt, timeoutcb, 0., config.timeout);
-  ev_timer_init(&rt, timeoutcb, 0., config.timeout);
-
-  wt.data = this;
-  rt.data = this;
-
-  ev_timer_init(&settings_timer, settings_timeout_cb, 0., 10.);
-
-  settings_timer.data = this;
-}
-
-HttpClient::~HttpClient() {
-  disconnect();
-
-  if (addrs) {
-    freeaddrinfo(addrs);
-    addrs = nullptr;
-    next_addr = nullptr;
-  }
-}
-
-bool HttpClient::need_upgrade() const {
-  return config.upgrade && scheme == "http";
-}
-
-int HttpClient::resolve_host(const std::string &host, uint16_t port) {
-  int rv;
-  this->host = host;
-  addrinfo hints{};
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-  hints.ai_flags = AI_ADDRCONFIG;
-  rv = getaddrinfo(host.c_str(), util::utos(port).c_str(), &hints, &addrs);
-  if (rv != 0) {
-    std::cerr << "[ERROR] getaddrinfo() failed: " << gai_strerror(rv)
-              << std::endl;
-    return -1;
-  }
-  if (addrs == nullptr) {
-    std::cerr << "[ERROR] No address returned" << std::endl;
-    return -1;
-  }
-  next_addr = addrs;
-  return 0;
-}
-
-namespace {
-// Just returns 1 to continue handshake.
-int verify_cb(int preverify_ok, X509_STORE_CTX *ctx) { return 1; }
-} // namespace
-
-int HttpClient::initiate_connection() {
-  int rv;
-
-  cur_addr = nullptr;
-  while (next_addr) {
-    cur_addr = next_addr;
-    next_addr = next_addr->ai_next;
-    fd = util::create_nonblock_socket(cur_addr->ai_family);
-    if (fd == -1) {
-      continue;
-    }
-
-    if (ssl_ctx) {
-      // We are establishing TLS connection.
-      ssl = SSL_new(ssl_ctx);
-      if (!ssl) {
-        std::cerr << "[ERROR] SSL_new() failed: "
-                  << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-        return -1;
-      }
-
-      SSL_set_fd(ssl, fd);
-      SSL_set_connect_state(ssl);
-
-      // If the user overrode the :authority or host header, use that
-      // value for the SNI extension
-      const auto &host_string =
-          config.host_override.empty() ? host : config.host_override;
-
-#if LIBRESSL_2_7_API ||                                                        \
-    (!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L) ||             \
-    defined(OPENSSL_IS_BORINGSSL)
-      auto param = SSL_get0_param(ssl);
-      X509_VERIFY_PARAM_set_hostflags(param, 0);
-      X509_VERIFY_PARAM_set1_host(param, host_string.c_str(),
-                                  host_string.size());
-#endif // LIBRESSL_2_7_API || (!LIBRESSL_IN_USE &&
-       // OPENSSL_VERSION_NUMBER >= 0x10002000L) ||
-       // defined(OPENSSL_IS_BORINGSSL)
-      SSL_set_verify(ssl, SSL_VERIFY_PEER, verify_cb);
-
-      if (!util::numeric_host(host_string.c_str())) {
-        SSL_set_tlsext_host_name(ssl, host_string.c_str());
-      }
-    }
-
-    rv = connect(fd, cur_addr->ai_addr, cur_addr->ai_addrlen);
-
-    if (rv != 0 && errno != EINPROGRESS) {
-      if (ssl) {
-        SSL_free(ssl);
-        ssl = nullptr;
-      }
-      close(fd);
-      fd = -1;
-      continue;
-    }
-    break;
-  }
-
-  if (fd == -1) {
-    return -1;
-  }
-
-  writefn = &HttpClient::connected;
-
-  if (need_upgrade()) {
-    on_readfn = &HttpClient::on_upgrade_read;
-    on_writefn = &HttpClient::on_upgrade_connect;
-  } else {
-    on_readfn = &HttpClient::on_read;
-    on_writefn = &HttpClient::on_write;
-  }
-
-  ev_io_set(&rev, fd, EV_READ);
-  ev_io_set(&wev, fd, EV_WRITE);
-
-  ev_io_start(loop, &wev);
-
-  ev_timer_again(loop, &wt);
-
-  return 0;
-}
-
-void HttpClient::disconnect() {
-  state = ClientState::IDLE;
-
-  for (auto req = std::begin(reqvec); req != std::end(reqvec); ++req) {
-    if ((*req)->continue_timer) {
-      (*req)->continue_timer->stop();
-    }
-  }
-
-  ev_timer_stop(loop, &settings_timer);
-
-  ev_timer_stop(loop, &rt);
-  ev_timer_stop(loop, &wt);
-
-  ev_io_stop(loop, &rev);
-  ev_io_stop(loop, &wev);
-
-  nghttp2_session_del(session);
-  session = nullptr;
-
-  if (ssl) {
-    SSL_set_shutdown(ssl, SSL_get_shutdown(ssl) | SSL_RECEIVED_SHUTDOWN);
-    ERR_clear_error();
-    SSL_shutdown(ssl);
-    SSL_free(ssl);
-    ssl = nullptr;
-  }
-
-  if (fd != -1) {
-    shutdown(fd, SHUT_WR);
-    close(fd);
-    fd = -1;
-  }
-}
-
-int HttpClient::read_clear() {
-  ev_timer_again(loop, &rt);
-
-  std::array<uint8_t, 8_k> buf;
-
-  for (;;) {
-    ssize_t nread;
-    while ((nread = read(fd, buf.data(), buf.size())) == -1 && errno == EINTR)
-      ;
-    if (nread == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        return 0;
-      }
-      return -1;
-    }
-
-    if (nread == 0) {
-      return -1;
-    }
-
-    if (on_readfn(*this, buf.data(), nread) != 0) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-int HttpClient::write_clear() {
-  ev_timer_again(loop, &rt);
-
-  std::array<struct iovec, 2> iov;
-
-  for (;;) {
-    if (on_writefn(*this) != 0) {
-      return -1;
-    }
-
-    auto iovcnt = wb.riovec(iov.data(), iov.size());
-
-    if (iovcnt == 0) {
-      break;
-    }
-
-    ssize_t nwrite;
-    while ((nwrite = writev(fd, iov.data(), iovcnt)) == -1 && errno == EINTR)
-      ;
-    if (nwrite == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        ev_io_start(loop, &wev);
-        ev_timer_again(loop, &wt);
-        return 0;
-      }
-      return -1;
-    }
-
-    wb.drain(nwrite);
-  }
-
-  ev_io_stop(loop, &wev);
-  ev_timer_stop(loop, &wt);
-
-  return 0;
-}
-
-int HttpClient::noop() { return 0; }
-
-void HttpClient::connect_fail() {
-  if (state == ClientState::IDLE) {
-    std::cerr << "[ERROR] Could not connect to the address "
-              << util::numeric_name(cur_addr->ai_addr, cur_addr->ai_addrlen)
-              << std::endl;
-  }
-  auto cur_state = state;
-  disconnect();
-  if (cur_state == ClientState::IDLE) {
-    if (initiate_connection() == 0) {
-      std::cerr << "Trying next address "
-                << util::numeric_name(cur_addr->ai_addr, cur_addr->ai_addrlen)
-                << std::endl;
-    }
-  }
-}
-
-int HttpClient::connected() {
-  if (!util::check_socket_connected(fd)) {
-    return ERR_CONNECT_FAIL;
-  }
-
-  if (config.verbose) {
-    print_timer();
-    std::cout << " Connected" << std::endl;
-  }
-
-  state = ClientState::CONNECTED;
-
-  ev_io_start(loop, &rev);
-  ev_io_stop(loop, &wev);
-
-  ev_timer_again(loop, &rt);
-  ev_timer_stop(loop, &wt);
-
-  if (ssl) {
-    readfn = &HttpClient::tls_handshake;
-    writefn = &HttpClient::tls_handshake;
-
-    return do_write();
-  }
-
-  readfn = &HttpClient::read_clear;
-  writefn = &HttpClient::write_clear;
-
-  if (need_upgrade()) {
-    htp = make_unique<http_parser>();
-    http_parser_init(htp.get(), HTTP_RESPONSE);
-    htp->data = this;
-
-    return do_write();
-  }
-
-  if (connection_made() != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-namespace {
-size_t populate_settings(nghttp2_settings_entry *iv) {
-  size_t niv = 2;
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = config.max_concurrent_streams;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  if (config.window_bits != -1) {
-    iv[1].value = (1 << config.window_bits) - 1;
-  } else {
-    iv[1].value = NGHTTP2_INITIAL_WINDOW_SIZE;
-  }
-
-  if (config.header_table_size >= 0) {
-    if (config.min_header_table_size < config.header_table_size) {
-      iv[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-      iv[niv].value = config.min_header_table_size;
-      ++niv;
-    }
-
-    iv[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-    iv[niv].value = config.header_table_size;
-    ++niv;
-  }
-
-  if (config.no_push) {
-    iv[niv].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-    iv[niv].value = 0;
-    ++niv;
-  }
-
-  return niv;
-}
-} // namespace
-
-int HttpClient::on_upgrade_connect() {
-  ssize_t rv;
-  record_connect_end_time();
-  assert(!reqvec.empty());
-  std::array<nghttp2_settings_entry, 16> iv;
-  size_t niv = populate_settings(iv.data());
-  assert(settings_payload.size() >= 8 * niv);
-  rv = nghttp2_pack_settings_payload(settings_payload.data(),
-                                     settings_payload.size(), iv.data(), niv);
-  if (rv < 0) {
-    return -1;
-  }
-  settings_payloadlen = rv;
-  auto token68 =
-      base64::encode(std::begin(settings_payload),
-                     std::begin(settings_payload) + settings_payloadlen);
-  util::to_token68(token68);
-
-  std::string req;
-  if (reqvec[0]->data_prd) {
-    // If the request contains upload data, use OPTIONS * to upgrade
-    req = "OPTIONS *";
-  } else {
-    auto meth = std::find_if(
-        std::begin(config.headers), std::end(config.headers),
-        [](const Header &kv) { return util::streq_l(":method", kv.name); });
-
-    if (meth == std::end(config.headers)) {
-      req = "GET ";
-      reqvec[0]->method = "GET";
-    } else {
-      req = (*meth).value;
-      req += ' ';
-      reqvec[0]->method = (*meth).value;
-    }
-    req += reqvec[0]->make_reqpath();
-  }
-
-  auto headers = Headers{{"host", hostport},
-                         {"connection", "Upgrade, HTTP2-Settings"},
-                         {"upgrade", NGHTTP2_CLEARTEXT_PROTO_VERSION_ID},
-                         {"http2-settings", token68},
-                         {"accept", "*/*"},
-                         {"user-agent", "nghttp2/" NGHTTP2_VERSION}};
-  auto initial_headerslen = headers.size();
-
-  for (auto &kv : config.headers) {
-    size_t i;
-    if (kv.name.empty() || kv.name[0] == ':') {
-      continue;
-    }
-    for (i = 0; i < initial_headerslen; ++i) {
-      if (kv.name == headers[i].name) {
-        headers[i].value = kv.value;
-        break;
-      }
-    }
-    if (i < initial_headerslen) {
-      continue;
-    }
-    headers.emplace_back(kv.name, kv.value, kv.no_index);
-  }
-
-  req += " HTTP/1.1\r\n";
-
-  for (auto &kv : headers) {
-    req += kv.name;
-    req += ": ";
-    req += kv.value;
-    req += "\r\n";
-  }
-  req += "\r\n";
-
-  wb.append(req);
-
-  if (config.verbose) {
-    print_timer();
-    std::cout << " HTTP Upgrade request\n" << req << std::endl;
-  }
-
-  if (!reqvec[0]->data_prd) {
-    // record request time if this is a part of real request.
-    reqvec[0]->record_request_start_time();
-    reqvec[0]->req_nva = std::move(headers);
-  }
-
-  on_writefn = &HttpClient::noop;
-
-  signal_write();
-
-  return 0;
-}
-
-int HttpClient::on_upgrade_read(const uint8_t *data, size_t len) {
-  int rv;
-
-  auto nread = http_parser_execute(htp.get(), &htp_hooks,
-                                   reinterpret_cast<const char *>(data), len);
-
-  if (config.verbose) {
-    std::cout.write(reinterpret_cast<const char *>(data), nread);
-  }
-
-  auto htperr = HTTP_PARSER_ERRNO(htp.get());
-
-  if (htperr != HPE_OK) {
-    std::cerr << "[ERROR] Failed to parse HTTP Upgrade response header: "
-              << "(" << http_errno_name(htperr) << ") "
-              << http_errno_description(htperr) << std::endl;
-    return -1;
-  }
-
-  if (!upgrade_response_complete) {
-    return 0;
-  }
-
-  if (config.verbose) {
-    std::cout << std::endl;
-  }
-
-  if (upgrade_response_status_code != 101) {
-    std::cerr << "[ERROR] HTTP Upgrade failed" << std::endl;
-
-    return -1;
-  }
-
-  if (config.verbose) {
-    print_timer();
-    std::cout << " HTTP Upgrade success" << std::endl;
-  }
-
-  on_readfn = &HttpClient::on_read;
-  on_writefn = &HttpClient::on_write;
-
-  rv = connection_made();
-  if (rv != 0) {
-    return rv;
-  }
-
-  // Read remaining data in the buffer because it is not notified
-  // callback anymore.
-  rv = on_readfn(*this, data + nread, len - nread);
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int HttpClient::do_read() { return readfn(*this); }
-int HttpClient::do_write() { return writefn(*this); }
-
-int HttpClient::connection_made() {
-  int rv;
-
-  if (!need_upgrade()) {
-    record_connect_end_time();
-  }
-
-  if (ssl) {
-    // Check NPN or ALPN result
-    const unsigned char *next_proto = nullptr;
-    unsigned int next_proto_len;
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_get0_next_proto_negotiated(ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-    for (int i = 0; i < 2; ++i) {
-      if (next_proto) {
-        auto proto = StringRef{next_proto, next_proto_len};
-        if (config.verbose) {
-          std::cout << "The negotiated protocol: " << proto << std::endl;
-        }
-        if (!util::check_h2_is_selected(proto)) {
-          next_proto = nullptr;
-        }
-        break;
-      }
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-      SSL_get0_alpn_selected(ssl, &next_proto, &next_proto_len);
-#else  // OPENSSL_VERSION_NUMBER < 0x10002000L
-      break;
-#endif // OPENSSL_VERSION_NUMBER < 0x10002000L
-    }
-    if (!next_proto) {
-      print_protocol_nego_error();
-      return -1;
-    }
-  }
-
-  rv = nghttp2_session_client_new2(&session, callbacks, this,
-                                   config.http2_option);
-
-  if (rv != 0) {
-    return -1;
-  }
-  if (need_upgrade()) {
-    // Adjust stream user-data depending on the existence of upload
-    // data
-    Request *stream_user_data = nullptr;
-    if (!reqvec[0]->data_prd) {
-      stream_user_data = reqvec[0].get();
-    }
-    // If HEAD is used, that is only when user specified it with -H
-    // option.
-    auto head_request = stream_user_data && stream_user_data->method == "HEAD";
-    rv = nghttp2_session_upgrade2(session, settings_payload.data(),
-                                  settings_payloadlen, head_request,
-                                  stream_user_data);
-    if (rv != 0) {
-      std::cerr << "[ERROR] nghttp2_session_upgrade() returned error: "
-                << nghttp2_strerror(rv) << std::endl;
-      return -1;
-    }
-    if (stream_user_data) {
-      stream_user_data->stream_id = 1;
-      request_done(stream_user_data);
-    }
-  }
-  // If upgrade succeeds, the SETTINGS value sent with
-  // HTTP2-Settings header field has already been submitted to
-  // session object.
-  if (!need_upgrade()) {
-    std::array<nghttp2_settings_entry, 16> iv;
-    auto niv = populate_settings(iv.data());
-    rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv.data(), niv);
-    if (rv != 0) {
-      return -1;
-    }
-  }
-  if (!config.no_dep) {
-    // Create anchor stream nodes
-    nghttp2_priority_spec pri_spec;
-
-    for (auto &anchor : anchors) {
-      nghttp2_priority_spec_init(&pri_spec, anchor.dep_stream_id, anchor.weight,
-                                 0);
-      rv = nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, anchor.stream_id,
-                                   &pri_spec);
-      if (rv != 0) {
-        return -1;
-      }
-    }
-
-    rv = nghttp2_session_set_next_stream_id(
-        session, anchors[ANCHOR_FOLLOWERS].stream_id + 2);
-    if (rv != 0) {
-      return -1;
-    }
-
-    if (need_upgrade() && !reqvec[0]->data_prd) {
-      // Amend the priority because we cannot send priority in
-      // HTTP/1.1 Upgrade.
-      auto &anchor = anchors[ANCHOR_FOLLOWERS];
-      nghttp2_priority_spec_init(&pri_spec, anchor.stream_id,
-                                 reqvec[0]->pri_spec.weight, 0);
-
-      rv = nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 1, &pri_spec);
-      if (rv != 0) {
-        return -1;
-      }
-    }
-  } else if (need_upgrade() && !reqvec[0]->data_prd &&
-             reqvec[0]->pri_spec.weight != NGHTTP2_DEFAULT_WEIGHT) {
-    // Amend the priority because we cannot send priority in HTTP/1.1
-    // Upgrade.
-    nghttp2_priority_spec pri_spec;
-
-    nghttp2_priority_spec_init(&pri_spec, 0, reqvec[0]->pri_spec.weight, 0);
-
-    rv = nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 1, &pri_spec);
-    if (rv != 0) {
-      return -1;
-    }
-  }
-
-  ev_timer_again(loop, &settings_timer);
-
-  if (config.connection_window_bits != -1) {
-    int32_t window_size = (1 << config.connection_window_bits) - 1;
-    rv = nghttp2_session_set_local_window_size(session, NGHTTP2_FLAG_NONE, 0,
-                                               window_size);
-    if (rv != 0) {
-      return -1;
-    }
-  }
-  // Adjust first request depending on the existence of the upload
-  // data
-  for (auto i = std::begin(reqvec) + (need_upgrade() && !reqvec[0]->data_prd);
-       i != std::end(reqvec); ++i) {
-    if (submit_request(this, config.headers, (*i).get()) != 0) {
-      return -1;
-    }
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-int HttpClient::on_read(const uint8_t *data, size_t len) {
-  if (config.hexdump) {
-    util::hexdump(stdout, data, len);
-  }
-
-  auto rv = nghttp2_session_mem_recv(session, data, len);
-  if (rv < 0) {
-    std::cerr << "[ERROR] nghttp2_session_mem_recv() returned error: "
-              << nghttp2_strerror(rv) << std::endl;
-    return -1;
-  }
-
-  assert(static_cast<size_t>(rv) == len);
-
-  if (nghttp2_session_want_read(session) == 0 &&
-      nghttp2_session_want_write(session) == 0 && wb.rleft() == 0) {
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-int HttpClient::on_write() {
-  for (;;) {
-    if (wb.rleft() >= 16384) {
-      return 0;
-    }
-
-    const uint8_t *data;
-    auto len = nghttp2_session_mem_send(session, &data);
-    if (len < 0) {
-      std::cerr << "[ERROR] nghttp2_session_send() returned error: "
-                << nghttp2_strerror(len) << std::endl;
-      return -1;
-    }
-
-    if (len == 0) {
-      break;
-    }
-
-    wb.append(data, len);
-  }
-
-  if (nghttp2_session_want_read(session) == 0 &&
-      nghttp2_session_want_write(session) == 0 && wb.rleft() == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int HttpClient::tls_handshake() {
-  ev_timer_again(loop, &rt);
-
-  ERR_clear_error();
-
-  auto rv = SSL_do_handshake(ssl);
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(ssl, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      ev_io_stop(loop, &wev);
-      ev_timer_stop(loop, &wt);
-      return 0;
-    case SSL_ERROR_WANT_WRITE:
-      ev_io_start(loop, &wev);
-      ev_timer_again(loop, &wt);
-      return 0;
-    default:
-      return -1;
-    }
-  }
-
-  ev_io_stop(loop, &wev);
-  ev_timer_stop(loop, &wt);
-
-  readfn = &HttpClient::read_tls;
-  writefn = &HttpClient::write_tls;
-
-  if (config.verify_peer) {
-    auto verify_res = SSL_get_verify_result(ssl);
-    if (verify_res != X509_V_OK) {
-      std::cerr << "[WARNING] Certificate verification failed: "
-                << X509_verify_cert_error_string(verify_res) << std::endl;
-    }
-  }
-
-  if (connection_made() != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int HttpClient::read_tls() {
-  ev_timer_again(loop, &rt);
-
-  ERR_clear_error();
-
-  std::array<uint8_t, 8_k> buf;
-  for (;;) {
-    auto rv = SSL_read(ssl, buf.data(), buf.size());
-
-    if (rv <= 0) {
-      auto err = SSL_get_error(ssl, rv);
-      switch (err) {
-      case SSL_ERROR_WANT_READ:
-        return 0;
-      case SSL_ERROR_WANT_WRITE:
-        // renegotiation started
-        return -1;
-      default:
-        return -1;
-      }
-    }
-
-    if (on_readfn(*this, buf.data(), rv) != 0) {
-      return -1;
-    }
-  }
-}
-
-int HttpClient::write_tls() {
-  ev_timer_again(loop, &rt);
-
-  ERR_clear_error();
-
-  struct iovec iov;
-
-  for (;;) {
-    if (on_writefn(*this) != 0) {
-      return -1;
-    }
-
-    auto iovcnt = wb.riovec(&iov, 1);
-
-    if (iovcnt == 0) {
-      break;
-    }
-
-    auto rv = SSL_write(ssl, iov.iov_base, iov.iov_len);
-
-    if (rv <= 0) {
-      auto err = SSL_get_error(ssl, rv);
-      switch (err) {
-      case SSL_ERROR_WANT_READ:
-        // renegotiation started
-        return -1;
-      case SSL_ERROR_WANT_WRITE:
-        ev_io_start(loop, &wev);
-        ev_timer_again(loop, &wt);
-        return 0;
-      default:
-        return -1;
-      }
-    }
-
-    wb.drain(rv);
-  }
-
-  ev_io_stop(loop, &wev);
-  ev_timer_stop(loop, &wt);
-
-  return 0;
-}
-
-void HttpClient::signal_write() { ev_io_start(loop, &wev); }
-
-bool HttpClient::all_requests_processed() const {
-  return complete == reqvec.size();
-}
-
-void HttpClient::update_hostport() {
-  if (reqvec.empty()) {
-    return;
-  }
-  scheme = util::get_uri_field(reqvec[0]->uri.c_str(), reqvec[0]->u, UF_SCHEMA)
-               .str();
-  std::stringstream ss;
-  if (reqvec[0]->is_ipv6_literal_addr()) {
-    // we may have zone ID, which must start with "%25", or "%".  RFC
-    // 6874 defines "%25" only, and just "%" is allowed for just
-    // convenience to end-user input.
-    auto host =
-        util::get_uri_field(reqvec[0]->uri.c_str(), reqvec[0]->u, UF_HOST);
-    auto end = std::find(std::begin(host), std::end(host), '%');
-    ss << "[";
-    ss.write(host.c_str(), end - std::begin(host));
-    ss << "]";
-  } else {
-    util::write_uri_field(ss, reqvec[0]->uri.c_str(), reqvec[0]->u, UF_HOST);
-  }
-  if (util::has_uri_field(reqvec[0]->u, UF_PORT) &&
-      reqvec[0]->u.port !=
-          util::get_default_port(reqvec[0]->uri.c_str(), reqvec[0]->u)) {
-    ss << ":" << reqvec[0]->u.port;
-  }
-  hostport = ss.str();
-}
-
-bool HttpClient::add_request(const std::string &uri,
-                             const nghttp2_data_provider *data_prd,
-                             int64_t data_length,
-                             const nghttp2_priority_spec &pri_spec, int level) {
-  http_parser_url u{};
-  if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-    return false;
-  }
-  if (path_cache.count(uri)) {
-    return false;
-  }
-
-  if (config.multiply == 1) {
-    path_cache.insert(uri);
-  }
-
-  reqvec.push_back(
-      make_unique<Request>(uri, u, data_prd, data_length, pri_spec, level));
-  return true;
-}
-
-void HttpClient::record_start_time() {
-  timing.system_start_time = std::chrono::system_clock::now();
-  timing.start_time = get_time();
-}
-
-void HttpClient::record_domain_lookup_end_time() {
-  timing.domain_lookup_end_time = get_time();
-}
-
-void HttpClient::record_connect_end_time() {
-  timing.connect_end_time = get_time();
-}
-
-void HttpClient::request_done(Request *req) {
-  if (req->stream_id % 2 == 0) {
-    return;
-  }
-}
-
-#ifdef HAVE_JANSSON
-void HttpClient::output_har(FILE *outfile) {
-  static auto PAGE_ID = "page_0";
-
-  auto root = json_object();
-  auto log = json_object();
-  json_object_set_new(root, "log", log);
-  json_object_set_new(log, "version", json_string("1.2"));
-
-  auto creator = json_object();
-  json_object_set_new(log, "creator", creator);
-
-  json_object_set_new(creator, "name", json_string("nghttp"));
-  json_object_set_new(creator, "version", json_string(NGHTTP2_VERSION));
-
-  auto pages = json_array();
-  json_object_set_new(log, "pages", pages);
-
-  auto page = json_object();
-  json_array_append_new(pages, page);
-
-  json_object_set_new(
-      page, "startedDateTime",
-      json_string(util::format_iso8601(timing.system_start_time).c_str()));
-  json_object_set_new(page, "id", json_string(PAGE_ID));
-  json_object_set_new(page, "title", json_string(""));
-
-  json_object_set_new(page, "pageTimings", json_object());
-
-  auto entries = json_array();
-  json_object_set_new(log, "entries", entries);
-
-  auto dns_delta = std::chrono::duration_cast<std::chrono::microseconds>(
-                       timing.domain_lookup_end_time - timing.start_time)
-                       .count() /
-                   1000.0;
-  auto connect_delta =
-      std::chrono::duration_cast<std::chrono::microseconds>(
-          timing.connect_end_time - timing.domain_lookup_end_time)
-          .count() /
-      1000.0;
-
-  for (size_t i = 0; i < reqvec.size(); ++i) {
-    auto &req = reqvec[i];
-
-    if (req->timing.state != RequestState::ON_COMPLETE) {
-      continue;
-    }
-
-    auto entry = json_object();
-    json_array_append_new(entries, entry);
-
-    auto &req_timing = req->timing;
-    auto request_time =
-        (i == 0) ? timing.system_start_time
-                 : timing.system_start_time +
-                       std::chrono::duration_cast<
-                           std::chrono::system_clock::duration>(
-                           req_timing.request_start_time - timing.start_time);
-
-    auto wait_delta =
-        std::chrono::duration_cast<std::chrono::microseconds>(
-            req_timing.response_start_time - req_timing.request_start_time)
-            .count() /
-        1000.0;
-    auto receive_delta =
-        std::chrono::duration_cast<std::chrono::microseconds>(
-            req_timing.response_end_time - req_timing.response_start_time)
-            .count() /
-        1000.0;
-
-    auto time_sum =
-        std::chrono::duration_cast<std::chrono::microseconds>(
-            (i == 0) ? (req_timing.response_end_time - timing.start_time)
-                     : (req_timing.response_end_time -
-                        req_timing.request_start_time))
-            .count() /
-        1000.0;
-
-    json_object_set_new(
-        entry, "startedDateTime",
-        json_string(util::format_iso8601(request_time).c_str()));
-    json_object_set_new(entry, "time", json_real(time_sum));
-
-    auto pushed = req->stream_id % 2 == 0;
-
-    json_object_set_new(entry, "comment",
-                        json_string(pushed ? "Pushed Object" : ""));
-
-    auto request = json_object();
-    json_object_set_new(entry, "request", request);
-
-    auto req_headers = json_array();
-    json_object_set_new(request, "headers", req_headers);
-
-    for (auto &nv : req->req_nva) {
-      auto hd = json_object();
-      json_array_append_new(req_headers, hd);
-
-      json_object_set_new(hd, "name", json_string(nv.name.c_str()));
-      json_object_set_new(hd, "value", json_string(nv.value.c_str()));
-    }
-
-    json_object_set_new(request, "method", json_string(req->method.c_str()));
-    json_object_set_new(request, "url", json_string(req->uri.c_str()));
-    json_object_set_new(request, "httpVersion", json_string("HTTP/2.0"));
-    json_object_set_new(request, "cookies", json_array());
-    json_object_set_new(request, "queryString", json_array());
-    json_object_set_new(request, "headersSize", json_integer(-1));
-    json_object_set_new(request, "bodySize", json_integer(-1));
-
-    auto response = json_object();
-    json_object_set_new(entry, "response", response);
-
-    auto res_headers = json_array();
-    json_object_set_new(response, "headers", res_headers);
-
-    for (auto &nv : req->res_nva) {
-      auto hd = json_object();
-      json_array_append_new(res_headers, hd);
-
-      json_object_set_new(hd, "name", json_string(nv.name.c_str()));
-      json_object_set_new(hd, "value", json_string(nv.value.c_str()));
-    }
-
-    json_object_set_new(response, "status", json_integer(req->status));
-    json_object_set_new(response, "statusText", json_string(""));
-    json_object_set_new(response, "httpVersion", json_string("HTTP/2.0"));
-    json_object_set_new(response, "cookies", json_array());
-
-    auto content = json_object();
-    json_object_set_new(response, "content", content);
-
-    json_object_set_new(content, "size", json_integer(req->response_len));
-
-    auto content_type_ptr = http2::get_header(req->res_nva, "content-type");
-
-    const char *content_type = "";
-    if (content_type_ptr) {
-      content_type = content_type_ptr->value.c_str();
-    }
-
-    json_object_set_new(content, "mimeType", json_string(content_type));
-
-    json_object_set_new(response, "redirectURL", json_string(""));
-    json_object_set_new(response, "headersSize", json_integer(-1));
-    json_object_set_new(response, "bodySize", json_integer(-1));
-    json_object_set_new(entry, "cache", json_object());
-
-    auto timings = json_object();
-    json_object_set_new(entry, "timings", timings);
-
-    auto dns_timing = (i == 0) ? dns_delta : 0;
-    auto connect_timing = (i == 0) ? connect_delta : 0;
-
-    json_object_set_new(timings, "dns", json_real(dns_timing));
-    json_object_set_new(timings, "connect", json_real(connect_timing));
-
-    json_object_set_new(timings, "blocked", json_real(0.0));
-    json_object_set_new(timings, "send", json_real(0.0));
-    json_object_set_new(timings, "wait", json_real(wait_delta));
-    json_object_set_new(timings, "receive", json_real(receive_delta));
-
-    json_object_set_new(entry, "pageref", json_string(PAGE_ID));
-    json_object_set_new(entry, "connection",
-                        json_string(util::utos(req->stream_id).c_str()));
-  }
-
-  json_dumpf(root, outfile, JSON_PRESERVE_ORDER | JSON_INDENT(2));
-  json_decref(root);
-}
-#endif // HAVE_JANSSON
-
-namespace {
-void update_html_parser(HttpClient *client, Request *req, const uint8_t *data,
-                        size_t len, int fin) {
-  if (!req->html_parser) {
-    return;
-  }
-  req->update_html_parser(data, len, fin);
-
-  auto scheme = req->get_real_scheme();
-  auto host = req->get_real_host();
-  auto port = req->get_real_port();
-
-  for (auto &p : req->html_parser->get_links()) {
-    auto uri = strip_fragment(p.first.c_str());
-    auto res_type = p.second;
-
-    http_parser_url u{};
-    if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-      continue;
-    }
-
-    if (!util::fieldeq(uri.c_str(), u, UF_SCHEMA, scheme) ||
-        !util::fieldeq(uri.c_str(), u, UF_HOST, host)) {
-      continue;
-    }
-
-    auto link_port =
-        util::has_uri_field(u, UF_PORT) ? u.port : scheme == "https" ? 443 : 80;
-
-    if (port != link_port) {
-      continue;
-    }
-
-    // No POST data for assets
-    auto pri_spec = resolve_dep(res_type);
-
-    if (client->add_request(uri, nullptr, 0, pri_spec, req->level + 1)) {
-      submit_request(client, config.headers, client->reqvec.back().get());
-    }
-  }
-  req->html_parser->clear_links();
-}
-} // namespace
-
-namespace {
-HttpClient *get_client(void *user_data) {
-  return static_cast<HttpClient *>(user_data);
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto client = get_client(user_data);
-  auto req = static_cast<Request *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-
-  if (!req) {
-    return 0;
-  }
-
-  if (config.verbose >= 2) {
-    verbose_on_data_chunk_recv_callback(session, flags, stream_id, data, len,
-                                        user_data);
-  }
-
-  req->response_len += len;
-
-  if (req->inflater) {
-    while (len > 0) {
-      const size_t MAX_OUTLEN = 4_k;
-      std::array<uint8_t, MAX_OUTLEN> out;
-      size_t outlen = MAX_OUTLEN;
-      size_t tlen = len;
-      int rv =
-          nghttp2_gzip_inflate(req->inflater, out.data(), &outlen, data, &tlen);
-      if (rv != 0) {
-        nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, stream_id,
-                                  NGHTTP2_INTERNAL_ERROR);
-        break;
-      }
-
-      if (!config.null_out) {
-        std::cout.write(reinterpret_cast<const char *>(out.data()), outlen);
-      }
-
-      update_html_parser(client, req, out.data(), outlen, 0);
-      data += tlen;
-      len -= tlen;
-    }
-
-    return 0;
-  }
-
-  if (!config.null_out) {
-    std::cout.write(reinterpret_cast<const char *>(data), len);
-  }
-
-  update_html_parser(client, req, data, len, 0);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-ssize_t select_padding_callback(nghttp2_session *session,
-                                const nghttp2_frame *frame, size_t max_payload,
-                                void *user_data) {
-  return std::min(max_payload, frame->hd.length + config.padding);
-}
-} // namespace
-
-namespace {
-void check_response_header(nghttp2_session *session, Request *req) {
-  bool gzip = false;
-
-  req->expect_final_response = false;
-
-  auto status_hd = req->get_res_header(http2::HD__STATUS);
-
-  if (!status_hd) {
-    nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, req->stream_id,
-                              NGHTTP2_PROTOCOL_ERROR);
-    return;
-  }
-
-  auto status = http2::parse_http_status_code(StringRef{status_hd->value});
-  if (status == -1) {
-    nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, req->stream_id,
-                              NGHTTP2_PROTOCOL_ERROR);
-    return;
-  }
-
-  req->status = status;
-
-  for (auto &nv : req->res_nva) {
-    if ("content-encoding" == nv.name) {
-      gzip = util::strieq_l("gzip", nv.value) ||
-             util::strieq_l("deflate", nv.value);
-      continue;
-    }
-  }
-
-  if (req->status / 100 == 1) {
-    if (req->continue_timer && (req->status == 100)) {
-      // If the request is waiting for a 100 Continue, complete the handshake.
-      req->continue_timer->dispatch_continue();
-    }
-
-    req->expect_final_response = true;
-    req->status = 0;
-    req->res_nva.clear();
-    http2::init_hdidx(req->res_hdidx);
-    return;
-  } else if (req->continue_timer) {
-    // A final response stops any pending Expect/Continue handshake.
-    req->continue_timer->stop();
-  }
-
-  if (gzip) {
-    if (!req->inflater) {
-      req->init_inflater();
-    }
-  }
-  if (config.get_assets && req->level == 0) {
-    if (!req->html_parser) {
-      req->init_html_parser();
-    }
-  }
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto client = get_client(user_data);
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    auto req = static_cast<Request *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!req) {
-      break;
-    }
-
-    switch (frame->headers.cat) {
-    case NGHTTP2_HCAT_RESPONSE:
-    case NGHTTP2_HCAT_PUSH_RESPONSE:
-      req->record_response_start_time();
-      break;
-    default:
-      break;
-    }
-
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    auto stream_id = frame->push_promise.promised_stream_id;
-    http_parser_url u{};
-    // TODO Set pri and level
-    nghttp2_priority_spec pri_spec;
-
-    nghttp2_priority_spec_default_init(&pri_spec);
-
-    auto req = make_unique<Request>("", u, nullptr, 0, pri_spec);
-    req->stream_id = stream_id;
-
-    nghttp2_session_set_stream_user_data(session, stream_id, req.get());
-
-    client->request_done(req.get());
-    req->record_request_start_time();
-    client->reqvec.push_back(std::move(req));
-
-    break;
-  }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_header_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                       const uint8_t *name, size_t namelen,
-                       const uint8_t *value, size_t valuelen, uint8_t flags,
-                       void *user_data) {
-  if (config.verbose) {
-    verbose_on_header_callback(session, frame, name, namelen, value, valuelen,
-                               flags, user_data);
-  }
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    auto req = static_cast<Request *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-
-    if (!req) {
-      break;
-    }
-
-    /* ignore trailer header */
-    if (frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-        !req->expect_final_response) {
-      break;
-    }
-
-    if (req->header_buffer_size + namelen + valuelen > 64_k) {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, frame->hd.stream_id,
-                                NGHTTP2_INTERNAL_ERROR);
-      return 0;
-    }
-
-    req->header_buffer_size += namelen + valuelen;
-
-    auto token = http2::lookup_token(name, namelen);
-
-    http2::index_header(req->res_hdidx, token, req->res_nva.size());
-    http2::add_header(req->res_nva, name, namelen, value, valuelen,
-                      flags & NGHTTP2_NV_FLAG_NO_INDEX, token);
-    break;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    auto req = static_cast<Request *>(nghttp2_session_get_stream_user_data(
-        session, frame->push_promise.promised_stream_id));
-
-    if (!req) {
-      break;
-    }
-
-    if (req->header_buffer_size + namelen + valuelen > 64_k) {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                frame->push_promise.promised_stream_id,
-                                NGHTTP2_INTERNAL_ERROR);
-      return 0;
-    }
-
-    req->header_buffer_size += namelen + valuelen;
-
-    auto token = http2::lookup_token(name, namelen);
-
-    http2::index_header(req->req_hdidx, token, req->req_nva.size());
-    http2::add_header(req->req_nva, name, namelen, value, valuelen,
-                      flags & NGHTTP2_NV_FLAG_NO_INDEX, token);
-    break;
-  }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback2(nghttp2_session *session,
-                            const nghttp2_frame *frame, void *user_data) {
-  int rv = 0;
-
-  if (config.verbose) {
-    verbose_on_frame_recv_callback(session, frame, user_data);
-  }
-
-  auto client = get_client(user_data);
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    auto req = static_cast<Request *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!req) {
-      return 0;
-      ;
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      req->record_response_end_time();
-      ++client->success;
-    }
-
-    break;
-  }
-  case NGHTTP2_HEADERS: {
-    auto req = static_cast<Request *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    // If this is the HTTP Upgrade with OPTIONS method to avoid POST,
-    // req is nullptr.
-    if (!req) {
-      return 0;
-      ;
-    }
-
-    switch (frame->headers.cat) {
-    case NGHTTP2_HCAT_RESPONSE:
-    case NGHTTP2_HCAT_PUSH_RESPONSE:
-      check_response_header(session, req);
-      break;
-    case NGHTTP2_HCAT_HEADERS:
-      if (req->expect_final_response) {
-        check_response_header(session, req);
-        break;
-      }
-      if ((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
-        nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                  frame->hd.stream_id, NGHTTP2_PROTOCOL_ERROR);
-        return 0;
-      }
-      break;
-    default:
-      assert(0);
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      req->record_response_end_time();
-      ++client->success;
-    }
-
-    break;
-  }
-  case NGHTTP2_SETTINGS:
-    if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
-      break;
-    }
-    ev_timer_stop(client->loop, &client->settings_timer);
-    break;
-  case NGHTTP2_PUSH_PROMISE: {
-    auto req = static_cast<Request *>(nghttp2_session_get_stream_user_data(
-        session, frame->push_promise.promised_stream_id));
-    if (!req) {
-      break;
-    }
-
-    // Reset for response header field reception
-    req->header_buffer_size = 0;
-
-    auto scheme = req->get_req_header(http2::HD__SCHEME);
-    auto authority = req->get_req_header(http2::HD__AUTHORITY);
-    auto path = req->get_req_header(http2::HD__PATH);
-
-    if (!authority) {
-      authority = req->get_req_header(http2::HD_HOST);
-    }
-
-    // libnghttp2 guarantees :scheme, :method, :path and (:authority |
-    // host) exist and non-empty.
-    if (path->value[0] != '/') {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                frame->push_promise.promised_stream_id,
-                                NGHTTP2_PROTOCOL_ERROR);
-      break;
-    }
-    std::string uri = scheme->value;
-    uri += "://";
-    uri += authority->value;
-    uri += path->value;
-    http_parser_url u{};
-    if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                frame->push_promise.promised_stream_id,
-                                NGHTTP2_PROTOCOL_ERROR);
-      break;
-    }
-    req->uri = uri;
-    req->u = u;
-
-    if (client->path_cache.count(uri)) {
-      nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
-                                frame->push_promise.promised_stream_id,
-                                NGHTTP2_CANCEL);
-      break;
-    }
-
-    if (config.multiply == 1) {
-      client->path_cache.insert(uri);
-    }
-
-    break;
-  }
-  }
-  return rv;
-}
-} // namespace
-
-namespace {
-int before_frame_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, void *user_data) {
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-  auto req = static_cast<Request *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  assert(req);
-  req->record_request_start_time();
-  return 0;
-}
-
-} // namespace
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  if (config.verbose) {
-    verbose_on_frame_send_callback(session, frame, user_data);
-  }
-
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto req = static_cast<Request *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!req) {
-    return 0;
-  }
-
-  // If this request is using Expect/Continue, start its ContinueTimer.
-  if (req->continue_timer) {
-    req->continue_timer->start();
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_not_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, int lib_error_code,
-                               void *user_data) {
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-
-  auto req = static_cast<Request *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!req) {
-    return 0;
-  }
-
-  std::cerr << "[ERROR] request " << req->uri
-            << " failed: " << nghttp2_strerror(lib_error_code) << std::endl;
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto client = get_client(user_data);
-  auto req = static_cast<Request *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-
-  if (!req) {
-    return 0;
-  }
-
-  // If this request is using Expect/Continue, stop its ContinueTimer.
-  if (req->continue_timer) {
-    req->continue_timer->stop();
-  }
-
-  update_html_parser(client, req, nullptr, 0, 1);
-  ++client->complete;
-
-  if (client->all_requests_processed()) {
-    nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
-  }
-
-  return 0;
-}
-} // namespace
-
-struct RequestResult {
-  std::chrono::microseconds time;
-};
-
-namespace {
-void print_stats(const HttpClient &client) {
-  std::cout << "***** Statistics *****" << std::endl;
-
-  std::vector<Request *> reqs;
-  reqs.reserve(client.reqvec.size());
-  for (const auto &req : client.reqvec) {
-    if (req->timing.state == RequestState::ON_COMPLETE) {
-      reqs.push_back(req.get());
-    }
-  }
-
-  std::sort(std::begin(reqs), std::end(reqs),
-            [](const Request *lhs, const Request *rhs) {
-              const auto &ltiming = lhs->timing;
-              const auto &rtiming = rhs->timing;
-              return ltiming.response_end_time < rtiming.response_end_time ||
-                     (ltiming.response_end_time == rtiming.response_end_time &&
-                      ltiming.request_start_time < rtiming.request_start_time);
-            });
-
-  std::cout << R"(
-Request timing:
-  responseEnd: the  time  when  last  byte of  response  was  received
-               relative to connectEnd
- requestStart: the time  just before  first byte  of request  was sent
-               relative  to connectEnd.   If  '*' is  shown, this  was
-               pushed by server.
-      process: responseEnd - requestStart
-         code: HTTP status code
-         size: number  of  bytes  received as  response  body  without
-               inflation.
-          URI: request URI
-
-see http://www.w3.org/TR/resource-timing/#processing-model
-
-sorted by 'complete'
-
-id  responseEnd requestStart  process code size request path)"
-            << std::endl;
-
-  const auto &base = client.timing.connect_end_time;
-  for (const auto &req : reqs) {
-    auto response_end = std::chrono::duration_cast<std::chrono::microseconds>(
-        req->timing.response_end_time - base);
-    auto request_start = std::chrono::duration_cast<std::chrono::microseconds>(
-        req->timing.request_start_time - base);
-    auto total = std::chrono::duration_cast<std::chrono::microseconds>(
-        req->timing.response_end_time - req->timing.request_start_time);
-    auto pushed = req->stream_id % 2 == 0;
-
-    std::cout << std::setw(3) << req->stream_id << " " << std::setw(11)
-              << ("+" + util::format_duration(response_end)) << " "
-              << (pushed ? "*" : " ") << std::setw(11)
-              << ("+" + util::format_duration(request_start)) << " "
-              << std::setw(8) << util::format_duration(total) << " "
-              << std::setw(4) << req->status << " " << std::setw(4)
-              << util::utos_unit(req->response_len) << " "
-              << req->make_reqpath() << std::endl;
-  }
-}
-} // namespace
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-int client_select_next_proto_cb(SSL *ssl, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg) {
-  if (config.verbose) {
-    print_timer();
-    std::cout << "[NPN] server offers:" << std::endl;
-  }
-  for (unsigned int i = 0; i < inlen; i += in[i] + 1) {
-    if (config.verbose) {
-      std::cout << "          * ";
-      std::cout.write(reinterpret_cast<const char *>(&in[i + 1]), in[i]);
-      std::cout << std::endl;
-    }
-  }
-  if (!util::select_h2(const_cast<const unsigned char **>(out), outlen, in,
-                       inlen)) {
-    print_protocol_nego_error();
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-namespace {
-int communicate(
-    const std::string &scheme, const std::string &host, uint16_t port,
-    std::vector<
-        std::tuple<std::string, nghttp2_data_provider *, int64_t, int32_t>>
-        requests,
-    const nghttp2_session_callbacks *callbacks) {
-  int result = 0;
-  auto loop = EV_DEFAULT;
-  SSL_CTX *ssl_ctx = nullptr;
-  if (scheme == "https") {
-    ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-    if (!ssl_ctx) {
-      std::cerr << "[ERROR] Failed to create SSL_CTX: "
-                << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-      result = -1;
-      goto fin;
-    }
-
-    auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                    SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-                    SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
-
-    SSL_CTX_set_options(ssl_ctx, ssl_opts);
-    SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
-    SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
-
-    if (SSL_CTX_set_default_verify_paths(ssl_ctx) != 1) {
-      std::cerr << "[WARNING] Could not load system trusted CA certificates: "
-                << ERR_error_string(ERR_get_error(), nullptr) << std::endl;
-    }
-
-    if (nghttp2::tls::ssl_ctx_set_proto_versions(
-            ssl_ctx, nghttp2::tls::NGHTTP2_TLS_MIN_VERSION,
-            nghttp2::tls::NGHTTP2_TLS_MAX_VERSION) != 0) {
-      std::cerr << "[ERROR] Could not set TLS versions" << std::endl;
-      result = -1;
-      goto fin;
-    }
-
-    if (SSL_CTX_set_cipher_list(ssl_ctx, tls::DEFAULT_CIPHER_LIST) == 0) {
-      std::cerr << "[ERROR] " << ERR_error_string(ERR_get_error(), nullptr)
-                << std::endl;
-      result = -1;
-      goto fin;
-    }
-    if (!config.keyfile.empty()) {
-      if (SSL_CTX_use_PrivateKey_file(ssl_ctx, config.keyfile.c_str(),
-                                      SSL_FILETYPE_PEM) != 1) {
-        std::cerr << "[ERROR] " << ERR_error_string(ERR_get_error(), nullptr)
-                  << std::endl;
-        result = -1;
-        goto fin;
-      }
-    }
-    if (!config.certfile.empty()) {
-      if (SSL_CTX_use_certificate_chain_file(ssl_ctx,
-                                             config.certfile.c_str()) != 1) {
-        std::cerr << "[ERROR] " << ERR_error_string(ERR_get_error(), nullptr)
-                  << std::endl;
-        result = -1;
-        goto fin;
-      }
-    }
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_CTX_set_next_proto_select_cb(ssl_ctx, client_select_next_proto_cb,
-                                     nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    auto proto_list = util::get_default_alpn();
-
-    SSL_CTX_set_alpn_protos(ssl_ctx, proto_list.data(), proto_list.size());
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-  }
-  {
-    HttpClient client{callbacks, loop, ssl_ctx};
-
-    int32_t dep_stream_id = 0;
-
-    if (!config.no_dep) {
-      dep_stream_id = anchors[ANCHOR_FOLLOWERS].stream_id;
-    }
-
-    for (auto &req : requests) {
-      nghttp2_priority_spec pri_spec;
-
-      nghttp2_priority_spec_init(&pri_spec, dep_stream_id, std::get<3>(req), 0);
-
-      for (int i = 0; i < config.multiply; ++i) {
-        client.add_request(std::get<0>(req), std::get<1>(req), std::get<2>(req),
-                           pri_spec);
-      }
-    }
-    client.update_hostport();
-
-    client.record_start_time();
-
-    if (client.resolve_host(host, port) != 0) {
-      goto fin;
-    }
-
-    client.record_domain_lookup_end_time();
-
-    if (client.initiate_connection() != 0) {
-      std::cerr << "[ERROR] Could not connect to " << host << ", port " << port
-                << std::endl;
-      goto fin;
-    }
-
-    ev_set_userdata(loop, &client);
-    ev_run(loop, 0);
-    ev_set_userdata(loop, nullptr);
-
-#ifdef HAVE_JANSSON
-    if (!config.harfile.empty()) {
-      FILE *outfile;
-      if (config.harfile == "-") {
-        outfile = stdout;
-      } else {
-        outfile = fopen(config.harfile.c_str(), "wb");
-      }
-
-      if (outfile) {
-        client.output_har(outfile);
-
-        if (outfile != stdout) {
-          fclose(outfile);
-        }
-      } else {
-        std::cerr << "Cannot open file " << config.harfile << ". "
-                  << "har file could not be created." << std::endl;
-      }
-    }
-#endif // HAVE_JANSSON
-
-    if (client.success != client.reqvec.size()) {
-      std::cerr << "Some requests were not processed. total="
-                << client.reqvec.size() << ", processed=" << client.success
-                << std::endl;
-    }
-    if (config.stat) {
-      print_stats(client);
-    }
-  }
-fin:
-  if (ssl_ctx) {
-    SSL_CTX_free(ssl_ctx);
-  }
-  return result;
-}
-} // namespace
-
-namespace {
-ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
-                           uint8_t *buf, size_t length, uint32_t *data_flags,
-                           nghttp2_data_source *source, void *user_data) {
-  int rv;
-  auto req = static_cast<Request *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-  assert(req);
-  int fd = source->fd;
-  ssize_t nread;
-
-  while ((nread = pread(fd, buf, length, req->data_offset)) == -1 &&
-         errno == EINTR)
-    ;
-
-  if (nread == -1) {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-
-  req->data_offset += nread;
-
-  if (req->data_offset == req->data_length) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-    if (!config.trailer.empty()) {
-      std::vector<nghttp2_nv> nva;
-      nva.reserve(config.trailer.size());
-      for (auto &kv : config.trailer) {
-        nva.push_back(http2::make_nv(kv.name, kv.value, kv.no_index));
-      }
-      rv = nghttp2_submit_trailer(session, stream_id, nva.data(), nva.size());
-      if (rv != 0) {
-        if (nghttp2_is_fatal(rv)) {
-          return NGHTTP2_ERR_CALLBACK_FAILURE;
-        }
-      } else {
-        *data_flags |= NGHTTP2_DATA_FLAG_NO_END_STREAM;
-      }
-    }
-
-    return nread;
-  }
-
-  if (req->data_offset > req->data_length || nread == 0) {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-
-  return nread;
-}
-} // namespace
-
-namespace {
-int run(char **uris, int n) {
-  nghttp2_session_callbacks *callbacks;
-
-  nghttp2_session_callbacks_new(&callbacks);
-  auto cbsdel = defer(nghttp2_session_callbacks_del, callbacks);
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback2);
-
-  if (config.verbose) {
-    nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
-        callbacks, verbose_on_invalid_frame_recv_callback);
-
-    nghttp2_session_callbacks_set_error_callback2(callbacks,
-                                                  verbose_error_callback);
-  }
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback(callbacks,
-                                                   on_header_callback);
-
-  nghttp2_session_callbacks_set_before_frame_send_callback(
-      callbacks, before_frame_send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_not_send_callback(
-      callbacks, on_frame_not_send_callback);
-
-  if (config.padding) {
-    nghttp2_session_callbacks_set_select_padding_callback(
-        callbacks, select_padding_callback);
-  }
-
-  std::string prev_scheme;
-  std::string prev_host;
-  uint16_t prev_port = 0;
-  int failures = 0;
-  int data_fd = -1;
-  nghttp2_data_provider data_prd;
-  struct stat data_stat;
-
-  if (!config.datafile.empty()) {
-    if (config.datafile == "-") {
-      if (fstat(0, &data_stat) == 0 &&
-          (data_stat.st_mode & S_IFMT) == S_IFREG) {
-        // use STDIN if it is a regular file
-        data_fd = 0;
-      } else {
-        // copy the contents of STDIN to a temporary file
-        char tempfn[] = "/tmp/nghttp.temp.XXXXXX";
-        data_fd = mkstemp(tempfn);
-        if (data_fd == -1) {
-          std::cerr << "[ERROR] Could not create a temporary file in /tmp"
-                    << std::endl;
-          return 1;
-        }
-        if (unlink(tempfn) != 0) {
-          std::cerr << "[WARNING] failed to unlink temporary file:" << tempfn
-                    << std::endl;
-        }
-        while (1) {
-          std::array<char, 1_k> buf;
-          ssize_t rret, wret;
-          while ((rret = read(0, buf.data(), buf.size())) == -1 &&
-                 errno == EINTR)
-            ;
-          if (rret == 0)
-            break;
-          if (rret == -1) {
-            std::cerr << "[ERROR] I/O error while reading from STDIN"
-                      << std::endl;
-            return 1;
-          }
-          while ((wret = write(data_fd, buf.data(), rret)) == -1 &&
-                 errno == EINTR)
-            ;
-          if (wret != rret) {
-            std::cerr << "[ERROR] I/O error while writing to temporary file"
-                      << std::endl;
-            return 1;
-          }
-        }
-        if (fstat(data_fd, &data_stat) == -1) {
-          close(data_fd);
-          std::cerr << "[ERROR] Could not stat temporary file" << std::endl;
-          return 1;
-        }
-      }
-    } else {
-      data_fd = open(config.datafile.c_str(), O_RDONLY | O_BINARY);
-      if (data_fd == -1) {
-        std::cerr << "[ERROR] Could not open file " << config.datafile
-                  << std::endl;
-        return 1;
-      }
-      if (fstat(data_fd, &data_stat) == -1) {
-        close(data_fd);
-        std::cerr << "[ERROR] Could not stat file " << config.datafile
-                  << std::endl;
-        return 1;
-      }
-    }
-    data_prd.source.fd = data_fd;
-    data_prd.read_callback = file_read_callback;
-  }
-  std::vector<
-      std::tuple<std::string, nghttp2_data_provider *, int64_t, int32_t>>
-      requests;
-
-  size_t next_weight_idx = 0;
-
-  for (int i = 0; i < n; ++i) {
-    http_parser_url u{};
-    auto uri = strip_fragment(uris[i]);
-    if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-      ++next_weight_idx;
-      std::cerr << "[ERROR] Could not parse URI " << uri << std::endl;
-      continue;
-    }
-    if (!util::has_uri_field(u, UF_SCHEMA)) {
-      ++next_weight_idx;
-      std::cerr << "[ERROR] URI " << uri << " does not have scheme part"
-                << std::endl;
-      continue;
-    }
-    auto port = util::has_uri_field(u, UF_PORT)
-                    ? u.port
-                    : util::get_default_port(uri.c_str(), u);
-    auto host = decode_host(util::get_uri_field(uri.c_str(), u, UF_HOST));
-    if (!util::fieldeq(uri.c_str(), u, UF_SCHEMA, prev_scheme.c_str()) ||
-        host != prev_host || port != prev_port) {
-      if (!requests.empty()) {
-        if (communicate(prev_scheme, prev_host, prev_port, std::move(requests),
-                        callbacks) != 0) {
-          ++failures;
-        }
-        requests.clear();
-      }
-      prev_scheme = util::get_uri_field(uri.c_str(), u, UF_SCHEMA).str();
-      prev_host = std::move(host);
-      prev_port = port;
-    }
-    requests.emplace_back(uri, data_fd == -1 ? nullptr : &data_prd,
-                          data_stat.st_size, config.weight[next_weight_idx++]);
-  }
-  if (!requests.empty()) {
-    if (communicate(prev_scheme, prev_host, prev_port, std::move(requests),
-                    callbacks) != 0) {
-      ++failures;
-    }
-  }
-  return failures;
-}
-} // namespace
-
-namespace {
-void print_version(std::ostream &out) {
-  out << "nghttp nghttp2/" NGHTTP2_VERSION << std::endl;
-}
-} // namespace
-
-namespace {
-void print_usage(std::ostream &out) {
-  out << R"(Usage: nghttp [OPTIONS]... <URI>...
-HTTP/2 client)"
-      << std::endl;
-}
-} // namespace
-
-namespace {
-void print_help(std::ostream &out) {
-  print_usage(out);
-  out << R"(
-  <URI>       Specify URI to access.
-Options:
-  -v, --verbose
-              Print   debug   information   such  as   reception   and
-              transmission of frames and name/value pairs.  Specifying
-              this option multiple times increases verbosity.
-  -n, --null-out
-              Discard downloaded data.
-  -O, --remote-name
-              Save  download  data  in  the  current  directory.   The
-              filename is  derived from  URI.  If  URI ends  with '/',
-              'index.html'  is used  as a  filename.  Not  implemented
-              yet.
-  -t, --timeout=<DURATION>
-              Timeout each request after <DURATION>.  Set 0 to disable
-              timeout.
-  -w, --window-bits=<N>
-              Sets the stream level initial window size to 2**<N>-1.
-  -W, --connection-window-bits=<N>
-              Sets  the  connection  level   initial  window  size  to
-              2**<N>-1.
-  -a, --get-assets
-              Download assets  such as stylesheets, images  and script
-              files linked  from the downloaded resource.   Only links
-              whose  origins are  the same  with the  linking resource
-              will be downloaded.   nghttp prioritizes resources using
-              HTTP/2 dependency  based priority.  The  priority order,
-              from highest to lowest,  is html itself, css, javascript
-              and images.
-  -s, --stat  Print statistics.
-  -H, --header=<HEADER>
-              Add a header to the requests.  Example: -H':method: PUT'
-  --trailer=<HEADER>
-              Add a trailer header to the requests.  <HEADER> must not
-              include pseudo header field  (header field name starting
-              with ':').  To  send trailer, one must use  -d option to
-              send request body.  Example: --trailer 'foo: bar'.
-  --cert=<CERT>
-              Use  the specified  client certificate  file.  The  file
-              must be in PEM format.
-  --key=<KEY> Use the  client private key  file.  The file must  be in
-              PEM format.
-  -d, --data=<PATH>
-              Post FILE to server. If '-'  is given, data will be read
-              from stdin.
-  -m, --multiply=<N>
-              Request each URI <N> times.  By default, same URI is not
-              requested twice.  This option disables it too.
-  -u, --upgrade
-              Perform HTTP Upgrade for HTTP/2.  This option is ignored
-              if the request URI has https scheme.  If -d is used, the
-              HTTP upgrade request is performed with OPTIONS method.
-  -p, --weight=<WEIGHT>
-              Sets  weight of  given  URI.  This  option  can be  used
-              multiple times, and  N-th -p option sets  weight of N-th
-              URI in the command line.  If  the number of -p option is
-              less than the number of URI, the last -p option value is
-              repeated.  If there is no -p option, default weight, 16,
-              is assumed.  The valid value range is
-              [)"
-      << NGHTTP2_MIN_WEIGHT << ", " << NGHTTP2_MAX_WEIGHT << R"(], inclusive.
-  -M, --peer-max-concurrent-streams=<N>
-              Use  <N>  as  SETTINGS_MAX_CONCURRENT_STREAMS  value  of
-              remote endpoint as if it  is received in SETTINGS frame.
-              Default: 100
-  -c, --header-table-size=<SIZE>
-              Specify decoder  header table  size.  If this  option is
-              used  multiple times,  and the  minimum value  among the
-              given values except  for last one is  strictly less than
-              the last  value, that minimum  value is set  in SETTINGS
-              frame  payload  before  the   last  value,  to  simulate
-              multiple header table size change.
-  --encoder-header-table-size=<SIZE>
-              Specify encoder header table size.  The decoder (server)
-              specifies  the maximum  dynamic table  size it  accepts.
-              Then the negotiated dynamic table size is the minimum of
-              this option value and the value which server specified.
-  -b, --padding=<N>
-              Add at  most <N>  bytes to a  frame payload  as padding.
-              Specify 0 to disable padding.
-  -r, --har=<PATH>
-              Output HTTP  transactions <PATH> in HAR  format.  If '-'
-              is given, data is written to stdout.
-  --color     Force colored log output.
-  --continuation
-              Send large header to test CONTINUATION.
-  --no-content-length
-              Don't send content-length header field.
-  --no-dep    Don't send dependency based priority hint to server.
-  --hexdump   Display the  incoming traffic in  hexadecimal (Canonical
-              hex+ASCII display).  If SSL/TLS  is used, decrypted data
-              are used.
-  --no-push   Disable server push.
-  --max-concurrent-streams=<N>
-              The  number of  concurrent  pushed  streams this  client
-              accepts.
-  --expect-continue
-              Perform an Expect/Continue handshake:  wait to send DATA
-              (up to  a short  timeout)  until the server sends  a 100
-              Continue interim response. This option is ignored unless
-              combined with the -d option.
-  -y, --no-verify-peer
-              Suppress  warning  on  server  certificate  verification
-              failure.
-  --version   Display version information and exit.
-  -h, --help  Display this help and exit.
-
---
-
-  The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-  10 * 1024).  Units are K, M and G (powers of 1024).
-
-  The <DURATION> argument is an integer and an optional unit (e.g., 1s
-  is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-  (hours, minutes, seconds and milliseconds, respectively).  If a unit
-  is omitted, a second is used as unit.)"
-      << std::endl;
-}
-} // namespace
-
-int main(int argc, char **argv) {
-  tls::libssl_init();
-
-  bool color = false;
-  while (1) {
-    static int flag = 0;
-    constexpr static option long_options[] = {
-        {"verbose", no_argument, nullptr, 'v'},
-        {"null-out", no_argument, nullptr, 'n'},
-        {"remote-name", no_argument, nullptr, 'O'},
-        {"timeout", required_argument, nullptr, 't'},
-        {"window-bits", required_argument, nullptr, 'w'},
-        {"connection-window-bits", required_argument, nullptr, 'W'},
-        {"get-assets", no_argument, nullptr, 'a'},
-        {"stat", no_argument, nullptr, 's'},
-        {"help", no_argument, nullptr, 'h'},
-        {"header", required_argument, nullptr, 'H'},
-        {"data", required_argument, nullptr, 'd'},
-        {"multiply", required_argument, nullptr, 'm'},
-        {"upgrade", no_argument, nullptr, 'u'},
-        {"weight", required_argument, nullptr, 'p'},
-        {"peer-max-concurrent-streams", required_argument, nullptr, 'M'},
-        {"header-table-size", required_argument, nullptr, 'c'},
-        {"padding", required_argument, nullptr, 'b'},
-        {"har", required_argument, nullptr, 'r'},
-        {"no-verify-peer", no_argument, nullptr, 'y'},
-        {"cert", required_argument, &flag, 1},
-        {"key", required_argument, &flag, 2},
-        {"color", no_argument, &flag, 3},
-        {"continuation", no_argument, &flag, 4},
-        {"version", no_argument, &flag, 5},
-        {"no-content-length", no_argument, &flag, 6},
-        {"no-dep", no_argument, &flag, 7},
-        {"trailer", required_argument, &flag, 9},
-        {"hexdump", no_argument, &flag, 10},
-        {"no-push", no_argument, &flag, 11},
-        {"max-concurrent-streams", required_argument, &flag, 12},
-        {"expect-continue", no_argument, &flag, 13},
-        {"encoder-header-table-size", required_argument, &flag, 14},
-        {nullptr, 0, nullptr, 0}};
-    int option_index = 0;
-    int c =
-        getopt_long(argc, argv, "M:Oab:c:d:m:np:r:hH:vst:uw:yW:", long_options,
-                    &option_index);
-    if (c == -1) {
-      break;
-    }
-    switch (c) {
-    case 'M':
-      // peer-max-concurrent-streams option
-      config.peer_max_concurrent_streams = strtoul(optarg, nullptr, 10);
-      break;
-    case 'O':
-      config.remote_name = true;
-      break;
-    case 'h':
-      print_help(std::cout);
-      exit(EXIT_SUCCESS);
-    case 'b':
-      config.padding = strtol(optarg, nullptr, 10);
-      break;
-    case 'n':
-      config.null_out = true;
-      break;
-    case 'p': {
-      errno = 0;
-      auto n = strtoul(optarg, nullptr, 10);
-      if (errno == 0 && NGHTTP2_MIN_WEIGHT <= n && n <= NGHTTP2_MAX_WEIGHT) {
-        config.weight.push_back(n);
-      } else {
-        std::cerr << "-p: specify the integer in the range ["
-                  << NGHTTP2_MIN_WEIGHT << ", " << NGHTTP2_MAX_WEIGHT
-                  << "], inclusive" << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    }
-    case 'r':
-#ifdef HAVE_JANSSON
-      config.harfile = optarg;
-#else  // !HAVE_JANSSON
-      std::cerr << "[WARNING]: -r, --har option is ignored because\n"
-                << "the binary was not compiled with libjansson." << std::endl;
-#endif // !HAVE_JANSSON
-      break;
-    case 'v':
-      ++config.verbose;
-      break;
-    case 't':
-      config.timeout = util::parse_duration_with_unit(optarg);
-      if (config.timeout == std::numeric_limits<double>::infinity()) {
-        std::cerr << "-t: bad timeout value: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    case 'u':
-      config.upgrade = true;
-      break;
-    case 'w':
-    case 'W': {
-      errno = 0;
-      char *endptr = nullptr;
-      unsigned long int n = strtoul(optarg, &endptr, 10);
-      if (errno == 0 && *endptr == '\0' && n < 31) {
-        if (c == 'w') {
-          config.window_bits = n;
-        } else {
-          config.connection_window_bits = n;
-        }
-      } else {
-        std::cerr << "-" << static_cast<char>(c)
-                  << ": specify the integer in the range [0, 30], inclusive"
-                  << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      break;
-    }
-    case 'H': {
-      char *header = optarg;
-      // Skip first possible ':' in the header name
-      char *value = strchr(optarg + 1, ':');
-      if (!value || (header[0] == ':' && header + 1 == value)) {
-        std::cerr << "-H: invalid header: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      *value = 0;
-      value++;
-      while (isspace(*value)) {
-        value++;
-      }
-      if (*value == 0) {
-        // This could also be a valid case for suppressing a header
-        // similar to curl
-        std::cerr << "-H: invalid header - value missing: " << optarg
-                  << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      config.headers.emplace_back(header, value, false);
-      util::inp_strlower(config.headers.back().name);
-      break;
-    }
-    case 'a':
-#ifdef HAVE_LIBXML2
-      config.get_assets = true;
-#else  // !HAVE_LIBXML2
-      std::cerr << "[WARNING]: -a, --get-assets option is ignored because\n"
-                << "the binary was not compiled with libxml2." << std::endl;
-#endif // !HAVE_LIBXML2
-      break;
-    case 's':
-      config.stat = true;
-      break;
-    case 'd':
-      config.datafile = optarg;
-      break;
-    case 'm':
-      config.multiply = strtoul(optarg, nullptr, 10);
-      break;
-    case 'c': {
-      auto n = util::parse_uint_with_unit(optarg);
-      if (n == -1) {
-        std::cerr << "-c: Bad option value: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      if (n > std::numeric_limits<uint32_t>::max()) {
-        std::cerr << "-c: Value too large.  It should be less than or equal to "
-                  << std::numeric_limits<uint32_t>::max() << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      config.header_table_size = n;
-      config.min_header_table_size = std::min(config.min_header_table_size, n);
-      break;
-    }
-    case 'y':
-      config.verify_peer = false;
-      break;
-    case '?':
-      util::show_candidates(argv[optind - 1], long_options);
-      exit(EXIT_FAILURE);
-    case 0:
-      switch (flag) {
-      case 1:
-        // cert option
-        config.certfile = optarg;
-        break;
-      case 2:
-        // key option
-        config.keyfile = optarg;
-        break;
-      case 3:
-        // color option
-        color = true;
-        break;
-      case 4:
-        // continuation option
-        config.continuation = true;
-        break;
-      case 5:
-        // version option
-        print_version(std::cout);
-        exit(EXIT_SUCCESS);
-      case 6:
-        // no-content-length option
-        config.no_content_length = true;
-        break;
-      case 7:
-        // no-dep option
-        config.no_dep = true;
-        break;
-      case 9: {
-        // trailer option
-        auto header = optarg;
-        auto value = strchr(optarg, ':');
-        if (!value) {
-          std::cerr << "--trailer: invalid header: " << optarg << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        *value = 0;
-        value++;
-        while (isspace(*value)) {
-          value++;
-        }
-        if (*value == 0) {
-          // This could also be a valid case for suppressing a header
-          // similar to curl
-          std::cerr << "--trailer: invalid header - value missing: " << optarg
-                    << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        config.trailer.emplace_back(header, value, false);
-        util::inp_strlower(config.trailer.back().name);
-        break;
-      }
-      case 10:
-        // hexdump option
-        config.hexdump = true;
-        break;
-      case 11:
-        // no-push option
-        config.no_push = true;
-        break;
-      case 12:
-        // max-concurrent-streams option
-        config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
-        break;
-      case 13:
-        // expect-continue option
-        config.expect_continue = true;
-        break;
-      case 14: {
-        // encoder-header-table-size option
-        auto n = util::parse_uint_with_unit(optarg);
-        if (n == -1) {
-          std::cerr << "--encoder-header-table-size: Bad option value: "
-                    << optarg << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        if (n > std::numeric_limits<uint32_t>::max()) {
-          std::cerr << "--encoder-header-table-size: Value too large.  It "
-                       "should be less than or equal to "
-                    << std::numeric_limits<uint32_t>::max() << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        config.encoder_header_table_size = n;
-        break;
-      }
-      }
-      break;
-    default:
-      break;
-    }
-  }
-
-  int32_t weight_to_fill;
-  if (config.weight.empty()) {
-    weight_to_fill = NGHTTP2_DEFAULT_WEIGHT;
-  } else {
-    weight_to_fill = config.weight.back();
-  }
-  config.weight.insert(std::end(config.weight), argc - optind, weight_to_fill);
-
-  // Find scheme overridden by extra header fields.
-  auto scheme_it =
-      std::find_if(std::begin(config.headers), std::end(config.headers),
-                   [](const Header &nv) { return nv.name == ":scheme"; });
-  if (scheme_it != std::end(config.headers)) {
-    config.scheme_override = (*scheme_it).value;
-  }
-
-  // Find host and port overridden by extra header fields.
-  auto authority_it =
-      std::find_if(std::begin(config.headers), std::end(config.headers),
-                   [](const Header &nv) { return nv.name == ":authority"; });
-  if (authority_it == std::end(config.headers)) {
-    authority_it =
-        std::find_if(std::begin(config.headers), std::end(config.headers),
-                     [](const Header &nv) { return nv.name == "host"; });
-  }
-
-  if (authority_it != std::end(config.headers)) {
-    // authority_it may looks like "host:port".
-    auto uri = "https://" + (*authority_it).value;
-    http_parser_url u{};
-    if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) != 0) {
-      std::cerr << "[ERROR] Could not parse authority in "
-                << (*authority_it).name << ": " << (*authority_it).value
-                << std::endl;
-      exit(EXIT_FAILURE);
-    }
-
-    config.host_override = util::get_uri_field(uri.c_str(), u, UF_HOST).str();
-    if (util::has_uri_field(u, UF_PORT)) {
-      config.port_override = u.port;
-    }
-  }
-
-  set_color_output(color || isatty(fileno(stdout)));
-
-  nghttp2_option_set_peer_max_concurrent_streams(
-      config.http2_option, config.peer_max_concurrent_streams);
-
-  if (config.encoder_header_table_size != -1) {
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        config.http2_option, config.encoder_header_table_size);
-  }
-
-  struct sigaction act {};
-  act.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &act, nullptr);
-  reset_timer();
-  return run(argv + optind, argc - optind);
-}
-
-} // namespace nghttp2
-
-int main(int argc, char **argv) {
-  return nghttp2::run_app(nghttp2::main, argc, argv);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttpd.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttpd.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttpd.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttpd.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,484 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_config.h"
-
-#ifdef __sgi
-#  define daemon _daemonize
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <signal.h>
-#include <getopt.h>
-
-#include <cstdlib>
-#include <cstring>
-#include <cassert>
-#include <string>
-#include <iostream>
-#include <string>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <nghttp2/nghttp2.h>
-
-#include "app_helper.h"
-#include "HttpServer.h"
-#include "util.h"
-#include "tls.h"
-
-namespace nghttp2 {
-
-namespace {
-int parse_push_config(Config &config, const char *optarg) {
-  const char *eq = strchr(optarg, '=');
-  if (eq == NULL) {
-    return -1;
-  }
-  auto &paths = config.push[std::string(optarg, eq)];
-  auto optarg_end = optarg + strlen(optarg);
-  auto i = eq + 1;
-  for (;;) {
-    const char *j = strchr(i, ',');
-    if (j == NULL) {
-      j = optarg_end;
-    }
-    paths.emplace_back(i, j);
-    if (j == optarg_end) {
-      break;
-    }
-    i = j;
-    ++i;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-void print_version(std::ostream &out) {
-  out << "nghttpd nghttp2/" NGHTTP2_VERSION << std::endl;
-}
-} // namespace
-
-namespace {
-void print_usage(std::ostream &out) {
-  out << "Usage: nghttpd [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]\n"
-      << "HTTP/2 server" << std::endl;
-}
-} // namespace
-
-namespace {
-void print_help(std::ostream &out) {
-  Config config;
-  print_usage(out);
-  out << R"(
-  <PORT>      Specify listening port number.
-  <PRIVATE_KEY>
-              Set  path  to  server's private  key.   Required  unless
-              --no-tls is specified.
-  <CERT>      Set  path  to  server's  certificate.   Required  unless
-              --no-tls is specified.
-Options:
-  -a, --address=<ADDR>
-              The address to bind to.  If not specified the default IP
-              address determined by getaddrinfo is used.
-  -D, --daemon
-              Run in a background.  If -D is used, the current working
-              directory is  changed to '/'.  Therefore  if this option
-              is used, -d option must be specified.
-  -V, --verify-client
-              The server  sends a client certificate  request.  If the
-              client did  not return  a certificate, the  handshake is
-              terminated.   Currently,  this  option just  requests  a
-              client certificate and does not verify it.
-  -d, --htdocs=<PATH>
-              Specify document root.  If this option is not specified,
-              the document root is the current working directory.
-  -v, --verbose
-              Print debug information  such as reception/ transmission
-              of frames and name/value pairs.
-  --no-tls    Disable SSL/TLS.
-  -c, --header-table-size=<SIZE>
-              Specify decoder header table size.
-  --encoder-header-table-size=<SIZE>
-              Specify encoder header table size.  The decoder (client)
-              specifies  the maximum  dynamic table  size it  accepts.
-              Then the negotiated dynamic table size is the minimum of
-              this option value and the value which client specified.
-  --color     Force colored log output.
-  -p, --push=<PATH>=<PUSH_PATH,...>
-              Push  resources <PUSH_PATH>s  when <PATH>  is requested.
-              This option  can be used repeatedly  to specify multiple
-              push  configurations.    <PATH>  and   <PUSH_PATH>s  are
-              relative  to   document  root.   See   --htdocs  option.
-              Example: -p/=/foo.png -p/doc=/bar.css
-  -b, --padding=<N>
-              Add at  most <N>  bytes to a  frame payload  as padding.
-              Specify 0 to disable padding.
-  -m, --max-concurrent-streams=<N>
-              Set the maximum number of  the concurrent streams in one
-              HTTP/2 session.
-              Default: )"
-      << config.max_concurrent_streams << R"(
-  -n, --workers=<N>
-              Set the number of worker threads.
-              Default: 1
-  -e, --error-gzip
-              Make error response gzipped.
-  -w, --window-bits=<N>
-              Sets the stream level initial window size to 2**<N>-1.
-  -W, --connection-window-bits=<N>
-              Sets  the  connection  level   initial  window  size  to
-              2**<N>-1.
-  --dh-param-file=<PATH>
-              Path to file that contains  DH parameters in PEM format.
-              Without  this   option,  DHE   cipher  suites   are  not
-              available.
-  --early-response
-              Start sending response when request HEADERS is received,
-              rather than complete request is received.
-  --trailer=<HEADER>
-              Add a trailer  header to a response.   <HEADER> must not
-              include pseudo header field  (header field name starting
-              with ':').  The  trailer is sent only if  a response has
-              body part.  Example: --trailer 'foo: bar'.
-  --hexdump   Display the  incoming traffic in  hexadecimal (Canonical
-              hex+ASCII display).  If SSL/TLS  is used, decrypted data
-              are used.
-  --echo-upload
-              Send back uploaded content if method is POST or PUT.
-  --mime-types-file=<PATH>
-              Path  to file  that contains  MIME media  types and  the
-              extensions that represent them.
-              Default: )"
-      << config.mime_types_file << R"(
-  --no-content-length
-              Don't send content-length header field.
-  --version   Display version information and exit.
-  -h, --help  Display this help and exit.
-
---
-
-  The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-  10 * 1024).  Units are K, M and G (powers of 1024).)"
-      << std::endl;
-}
-} // namespace
-
-int main(int argc, char **argv) {
-  tls::libssl_init();
-
-#ifndef NOTHREADS
-  tls::LibsslGlobalLock lock;
-#endif // NOTHREADS
-
-  Config config;
-  bool color = false;
-  auto mime_types_file_set_manually = false;
-
-  while (1) {
-    static int flag = 0;
-    constexpr static option long_options[] = {
-        {"address", required_argument, nullptr, 'a'},
-        {"daemon", no_argument, nullptr, 'D'},
-        {"htdocs", required_argument, nullptr, 'd'},
-        {"help", no_argument, nullptr, 'h'},
-        {"verbose", no_argument, nullptr, 'v'},
-        {"verify-client", no_argument, nullptr, 'V'},
-        {"header-table-size", required_argument, nullptr, 'c'},
-        {"push", required_argument, nullptr, 'p'},
-        {"padding", required_argument, nullptr, 'b'},
-        {"max-concurrent-streams", required_argument, nullptr, 'm'},
-        {"workers", required_argument, nullptr, 'n'},
-        {"error-gzip", no_argument, nullptr, 'e'},
-        {"window-bits", required_argument, nullptr, 'w'},
-        {"connection-window-bits", required_argument, nullptr, 'W'},
-        {"no-tls", no_argument, &flag, 1},
-        {"color", no_argument, &flag, 2},
-        {"version", no_argument, &flag, 3},
-        {"dh-param-file", required_argument, &flag, 4},
-        {"early-response", no_argument, &flag, 5},
-        {"trailer", required_argument, &flag, 6},
-        {"hexdump", no_argument, &flag, 7},
-        {"echo-upload", no_argument, &flag, 8},
-        {"mime-types-file", required_argument, &flag, 9},
-        {"no-content-length", no_argument, &flag, 10},
-        {"encoder-header-table-size", required_argument, &flag, 11},
-        {nullptr, 0, nullptr, 0}};
-    int option_index = 0;
-    int c = getopt_long(argc, argv, "DVb:c:d:ehm:n:p:va:w:W:", long_options,
-                        &option_index);
-    if (c == -1) {
-      break;
-    }
-    switch (c) {
-    case 'a':
-      config.address = optarg;
-      break;
-    case 'D':
-      config.daemon = true;
-      break;
-    case 'V':
-      config.verify_client = true;
-      break;
-    case 'b':
-      config.padding = strtol(optarg, nullptr, 10);
-      break;
-    case 'd':
-      config.htdocs = optarg;
-      break;
-    case 'e':
-      config.error_gzip = true;
-      break;
-    case 'm': {
-      // max-concurrent-streams option
-      auto n = util::parse_uint(optarg);
-      if (n == -1) {
-        std::cerr << "-m: invalid argument: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      config.max_concurrent_streams = n;
-      break;
-    }
-    case 'n': {
-#ifdef NOTHREADS
-      std::cerr << "-n: WARNING: Threading disabled at build time, "
-                << "no threads created." << std::endl;
-#else
-      char *end;
-      errno = 0;
-      config.num_worker = strtoul(optarg, &end, 10);
-      if (errno == ERANGE || *end != '\0' || config.num_worker == 0) {
-        std::cerr << "-n: Bad option value: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-#endif // NOTHREADS
-      break;
-    }
-    case 'h':
-      print_help(std::cout);
-      exit(EXIT_SUCCESS);
-    case 'v':
-      config.verbose = true;
-      break;
-    case 'c': {
-      auto n = util::parse_uint_with_unit(optarg);
-      if (n == -1) {
-        std::cerr << "-c: Bad option value: " << optarg << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      if (n > std::numeric_limits<uint32_t>::max()) {
-        std::cerr << "-c: Value too large.  It should be less than or equal to "
-                  << std::numeric_limits<uint32_t>::max() << std::endl;
-        exit(EXIT_FAILURE);
-      }
-      config.header_table_size = n;
-      break;
-    }
-    case 'p':
-      if (parse_push_config(config, optarg) != 0) {
-        std::cerr << "-p: Bad option value: " << optarg << std::endl;
-      }
-      break;
-    case 'w':
-    case 'W': {
-      char *endptr;
-      errno = 0;
-      auto n = strtoul(optarg, &endptr, 10);
-      if (errno != 0 || *endptr != '\0' || n >= 31) {
-        std::cerr << "-" << static_cast<char>(c)
-                  << ": specify the integer in the range [0, 30], inclusive"
-                  << std::endl;
-        exit(EXIT_FAILURE);
-      }
-
-      if (c == 'w') {
-        config.window_bits = n;
-      } else {
-        config.connection_window_bits = n;
-      }
-
-      break;
-    }
-    case '?':
-      util::show_candidates(argv[optind - 1], long_options);
-      exit(EXIT_FAILURE);
-    case 0:
-      switch (flag) {
-      case 1:
-        // no-tls option
-        config.no_tls = true;
-        break;
-      case 2:
-        // color option
-        color = true;
-        break;
-      case 3:
-        // version
-        print_version(std::cout);
-        exit(EXIT_SUCCESS);
-      case 4:
-        // dh-param-file
-        config.dh_param_file = optarg;
-        break;
-      case 5:
-        // early-response
-        config.early_response = true;
-        break;
-      case 6: {
-        // trailer option
-        auto header = optarg;
-        auto value = strchr(optarg, ':');
-        if (!value) {
-          std::cerr << "--trailer: invalid header: " << optarg << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        *value = 0;
-        value++;
-        while (isspace(*value)) {
-          value++;
-        }
-        if (*value == 0) {
-          // This could also be a valid case for suppressing a header
-          // similar to curl
-          std::cerr << "--trailer: invalid header - value missing: " << optarg
-                    << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        config.trailer.emplace_back(header, value, false);
-        util::inp_strlower(config.trailer.back().name);
-        break;
-      }
-      case 7:
-        // hexdump option
-        config.hexdump = true;
-        break;
-      case 8:
-        // echo-upload option
-        config.echo_upload = true;
-        break;
-      case 9:
-        // mime-types-file option
-        mime_types_file_set_manually = true;
-        config.mime_types_file = optarg;
-        break;
-      case 10:
-        // no-content-length option
-        config.no_content_length = true;
-        break;
-      case 11: {
-        // encoder-header-table-size option
-        auto n = util::parse_uint_with_unit(optarg);
-        if (n == -1) {
-          std::cerr << "--encoder-header-table-size: Bad option value: "
-                    << optarg << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        if (n > std::numeric_limits<uint32_t>::max()) {
-          std::cerr << "--encoder-header-table-size: Value too large.  It "
-                       "should be less than or equal to "
-                    << std::numeric_limits<uint32_t>::max() << std::endl;
-          exit(EXIT_FAILURE);
-        }
-        config.encoder_header_table_size = n;
-        break;
-      }
-      }
-      break;
-    default:
-      break;
-    }
-  }
-  if (argc - optind < (config.no_tls ? 1 : 3)) {
-    print_usage(std::cerr);
-    std::cerr << "Too few arguments" << std::endl;
-    exit(EXIT_FAILURE);
-  }
-
-  config.port = strtol(argv[optind++], nullptr, 10);
-
-  if (!config.no_tls) {
-    config.private_key_file = argv[optind++];
-    config.cert_file = argv[optind++];
-  }
-
-  if (config.daemon) {
-    if (config.htdocs.empty()) {
-      print_usage(std::cerr);
-      std::cerr << "-d option must be specified when -D is used." << std::endl;
-      exit(EXIT_FAILURE);
-    }
-#ifdef __sgi
-    if (daemon(0, 0, 0, 0) == -1) {
-#else
-    if (daemon(0, 0) == -1) {
-#endif
-      perror("daemon");
-      exit(EXIT_FAILURE);
-    }
-  }
-  if (config.htdocs.empty()) {
-    config.htdocs = "./";
-  }
-
-  if (util::read_mime_types(config.mime_types,
-                            config.mime_types_file.c_str()) != 0) {
-    if (mime_types_file_set_manually) {
-      std::cerr << "--mime-types-file: Could not open mime types file: "
-                << config.mime_types_file << std::endl;
-    }
-  }
-
-  auto &trailer_names = config.trailer_names;
-  for (auto &h : config.trailer) {
-    trailer_names += h.name;
-    trailer_names += ", ";
-  }
-  if (trailer_names.size() >= 2) {
-    trailer_names.resize(trailer_names.size() - 2);
-  }
-
-  set_color_output(color || isatty(fileno(stdout)));
-
-  struct sigaction act {};
-  act.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &act, nullptr);
-
-  reset_timer();
-
-  HttpServer server(&config);
-  if (server.run() != 0) {
-    exit(EXIT_FAILURE);
-  }
-  return 0;
-}
-
-} // namespace nghttp2
-
-int main(int argc, char **argv) {
-  return nghttp2::run_app(nghttp2::main, argc, argv);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/nghttp.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,308 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP_H
-#define NGHTTP_H
-
-#include "nghttp2_config.h"
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-
-#include <string>
-#include <vector>
-#include <set>
-#include <chrono>
-#include <memory>
-
-#include <openssl/ssl.h>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "http-parser/http_parser.h"
-
-#include "memchunk.h"
-#include "http2.h"
-#include "nghttp2_gzip.h"
-#include "template.h"
-
-namespace nghttp2 {
-
-class HtmlParser;
-
-struct Config {
-  Config();
-  ~Config();
-
-  Headers headers;
-  Headers trailer;
-  std::vector<int32_t> weight;
-  std::string certfile;
-  std::string keyfile;
-  std::string datafile;
-  std::string harfile;
-  std::string scheme_override;
-  std::string host_override;
-  nghttp2_option *http2_option;
-  int64_t header_table_size;
-  int64_t min_header_table_size;
-  int64_t encoder_header_table_size;
-  size_t padding;
-  size_t max_concurrent_streams;
-  ssize_t peer_max_concurrent_streams;
-  int multiply;
-  // milliseconds
-  ev_tstamp timeout;
-  int window_bits;
-  int connection_window_bits;
-  int verbose;
-  uint16_t port_override;
-  bool null_out;
-  bool remote_name;
-  bool get_assets;
-  bool stat;
-  bool upgrade;
-  bool continuation;
-  bool no_content_length;
-  bool no_dep;
-  bool hexdump;
-  bool no_push;
-  bool expect_continue;
-  bool verify_peer;
-};
-
-enum class RequestState { INITIAL, ON_REQUEST, ON_RESPONSE, ON_COMPLETE };
-
-struct RequestTiming {
-  // The point in time when request is started to be sent.
-  // Corresponds to requestStart in Resource Timing TR.
-  std::chrono::steady_clock::time_point request_start_time;
-  // The point in time when first byte of response is received.
-  // Corresponds to responseStart in Resource Timing TR.
-  std::chrono::steady_clock::time_point response_start_time;
-  // The point in time when last byte of response is received.
-  // Corresponds to responseEnd in Resource Timing TR.
-  std::chrono::steady_clock::time_point response_end_time;
-  RequestState state;
-  RequestTiming() : state(RequestState::INITIAL) {}
-};
-
-struct Request; // forward declaration for ContinueTimer
-
-struct ContinueTimer {
-  ContinueTimer(struct ev_loop *loop, Request *req);
-  ~ContinueTimer();
-
-  void start();
-  void stop();
-
-  // Schedules an immediate run of the continue callback on the loop, if the
-  // callback has not already been run
-  void dispatch_continue();
-
-  struct ev_loop *loop;
-  ev_timer timer;
-};
-
-struct Request {
-  // For pushed request, |uri| is empty and |u| is zero-cleared.
-  Request(const std::string &uri, const http_parser_url &u,
-          const nghttp2_data_provider *data_prd, int64_t data_length,
-          const nghttp2_priority_spec &pri_spec, int level = 0);
-  ~Request();
-
-  void init_inflater();
-
-  void init_html_parser();
-  int update_html_parser(const uint8_t *data, size_t len, int fin);
-
-  std::string make_reqpath() const;
-
-  bool is_ipv6_literal_addr() const;
-
-  Headers::value_type *get_res_header(int32_t token);
-  Headers::value_type *get_req_header(int32_t token);
-
-  void record_request_start_time();
-  void record_response_start_time();
-  void record_response_end_time();
-
-  // Returns scheme taking into account overridden scheme.
-  StringRef get_real_scheme() const;
-  // Returns request host, without port, taking into account
-  // overridden host.
-  StringRef get_real_host() const;
-  // Returns request port, taking into account overridden host, port,
-  // and scheme.
-  uint16_t get_real_port() const;
-
-  Headers res_nva;
-  Headers req_nva;
-  std::string method;
-  // URI without fragment
-  std::string uri;
-  http_parser_url u;
-  nghttp2_priority_spec pri_spec;
-  RequestTiming timing;
-  int64_t data_length;
-  int64_t data_offset;
-  // Number of bytes received from server
-  int64_t response_len;
-  nghttp2_gzip *inflater;
-  std::unique_ptr<HtmlParser> html_parser;
-  const nghttp2_data_provider *data_prd;
-  size_t header_buffer_size;
-  int32_t stream_id;
-  int status;
-  // Recursion level: 0: first entity, 1: entity linked from first entity
-  int level;
-  http2::HeaderIndex res_hdidx;
-  // used for incoming PUSH_PROMISE
-  http2::HeaderIndex req_hdidx;
-  bool expect_final_response;
-  // only assigned if this request is using Expect/Continue
-  std::unique_ptr<ContinueTimer> continue_timer;
-};
-
-struct SessionTiming {
-  // The point in time when operation was started.  Corresponds to
-  // startTime in Resource Timing TR, but recorded in system clock time.
-  std::chrono::system_clock::time_point system_start_time;
-  // Same as above, but recorded in steady clock time.
-  std::chrono::steady_clock::time_point start_time;
-  // The point in time when DNS resolution was completed.  Corresponds
-  // to domainLookupEnd in Resource Timing TR.
-  std::chrono::steady_clock::time_point domain_lookup_end_time;
-  // The point in time when connection was established or SSL/TLS
-  // handshake was completed.  Corresponds to connectEnd in Resource
-  // Timing TR.
-  std::chrono::steady_clock::time_point connect_end_time;
-};
-
-enum class ClientState { IDLE, CONNECTED };
-
-struct HttpClient {
-  HttpClient(const nghttp2_session_callbacks *callbacks, struct ev_loop *loop,
-             SSL_CTX *ssl_ctx);
-  ~HttpClient();
-
-  bool need_upgrade() const;
-  int resolve_host(const std::string &host, uint16_t port);
-  int initiate_connection();
-  void disconnect();
-
-  int noop();
-  int read_clear();
-  int write_clear();
-  int connected();
-  int tls_handshake();
-  int read_tls();
-  int write_tls();
-
-  int do_read();
-  int do_write();
-
-  int on_upgrade_connect();
-  int on_upgrade_read(const uint8_t *data, size_t len);
-  int on_read(const uint8_t *data, size_t len);
-  int on_write();
-
-  int connection_made();
-  void connect_fail();
-  void request_done(Request *req);
-
-  void signal_write();
-
-  bool all_requests_processed() const;
-  void update_hostport();
-  bool add_request(const std::string &uri,
-                   const nghttp2_data_provider *data_prd, int64_t data_length,
-                   const nghttp2_priority_spec &pri_spec, int level = 0);
-
-  void record_start_time();
-  void record_domain_lookup_end_time();
-  void record_connect_end_time();
-
-#ifdef HAVE_JANSSON
-  void output_har(FILE *outfile);
-#endif // HAVE_JANSSON
-
-  MemchunkPool mcpool;
-  DefaultMemchunks wb;
-  std::vector<std::unique_ptr<Request>> reqvec;
-  // Insert path already added in reqvec to prevent multiple request
-  // for 1 resource.
-  std::set<std::string> path_cache;
-  std::string scheme;
-  std::string host;
-  std::string hostport;
-  // Used for parse the HTTP upgrade response from server
-  std::unique_ptr<http_parser> htp;
-  SessionTiming timing;
-  ev_io wev;
-  ev_io rev;
-  ev_timer wt;
-  ev_timer rt;
-  ev_timer settings_timer;
-  std::function<int(HttpClient &)> readfn, writefn;
-  std::function<int(HttpClient &, const uint8_t *, size_t)> on_readfn;
-  std::function<int(HttpClient &)> on_writefn;
-  nghttp2_session *session;
-  const nghttp2_session_callbacks *callbacks;
-  struct ev_loop *loop;
-  SSL_CTX *ssl_ctx;
-  SSL *ssl;
-  addrinfo *addrs;
-  addrinfo *next_addr;
-  addrinfo *cur_addr;
-  // The number of completed requests, including failed ones.
-  size_t complete;
-  // The number of requests that local endpoint received END_STREAM
-  // from peer.
-  size_t success;
-  // The length of settings_payload
-  size_t settings_payloadlen;
-  ClientState state;
-  // The HTTP status code of the response message of HTTP Upgrade.
-  unsigned int upgrade_response_status_code;
-  int fd;
-  // true if the response message of HTTP Upgrade request is fully
-  // received. It is not relevant the upgrade succeeds, or not.
-  bool upgrade_response_complete;
-  // SETTINGS payload sent as token68 in HTTP Upgrade
-  std::array<uint8_t, 128> settings_payload;
-
-  enum { ERR_CONNECT_FAIL = -100 };
-};
-
-} // namespace nghttp2
-
-#endif // NGHTTP_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_accept_handler.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include <cerrno>
-
-#include "shrpx_connection_handler.h"
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-#include "util.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-void acceptcb(struct ev_loop *loop, ev_io *w, int revent) {
-  auto h = static_cast<AcceptHandler *>(w->data);
-  h->accept_connection();
-}
-} // namespace
-
-AcceptHandler::AcceptHandler(const UpstreamAddr *faddr, ConnectionHandler *h)
-    : conn_hnr_(h), faddr_(faddr) {
-  ev_io_init(&wev_, acceptcb, faddr_->fd, EV_READ);
-  wev_.data = this;
-  ev_io_start(conn_hnr_->get_loop(), &wev_);
-}
-
-AcceptHandler::~AcceptHandler() {
-  ev_io_stop(conn_hnr_->get_loop(), &wev_);
-  close(faddr_->fd);
-}
-
-void AcceptHandler::accept_connection() {
-  sockaddr_union sockaddr;
-  socklen_t addrlen = sizeof(sockaddr);
-
-#ifdef HAVE_ACCEPT4
-  auto cfd =
-      accept4(faddr_->fd, &sockaddr.sa, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC);
-#else  // !HAVE_ACCEPT4
-  auto cfd = accept(faddr_->fd, &sockaddr.sa, &addrlen);
-#endif // !HAVE_ACCEPT4
-
-  if (cfd == -1) {
-    switch (errno) {
-    case EINTR:
-    case ENETDOWN:
-    case EPROTO:
-    case ENOPROTOOPT:
-    case EHOSTDOWN:
-#ifdef ENONET
-    case ENONET:
-#endif // ENONET
-    case EHOSTUNREACH:
-    case EOPNOTSUPP:
-    case ENETUNREACH:
-      return;
-    case EMFILE:
-    case ENFILE:
-      LOG(WARN) << "acceptor: running out file descriptor; disable acceptor "
-                   "temporarily";
-      conn_hnr_->sleep_acceptor(get_config()->conn.listener.timeout.sleep);
-      return;
-    default:
-      return;
-    }
-  }
-
-#ifndef HAVE_ACCEPT4
-  util::make_socket_nonblocking(cfd);
-  util::make_socket_closeonexec(cfd);
-#endif // !HAVE_ACCEPT4
-
-  conn_hnr_->handle_connection(cfd, &sockaddr.sa, addrlen, faddr_);
-}
-
-void AcceptHandler::enable() { ev_io_start(conn_hnr_->get_loop(), &wev_); }
-
-void AcceptHandler::disable() { ev_io_stop(conn_hnr_->get_loop(), &wev_); }
-
-int AcceptHandler::get_fd() const { return faddr_->fd; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_accept_handler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_ACCEPT_HANDLER_H
-#define SHRPX_ACCEPT_HANDLER_H
-
-#include "shrpx.h"
-
-#include <ev.h>
-
-namespace shrpx {
-
-class ConnectionHandler;
-struct UpstreamAddr;
-
-class AcceptHandler {
-public:
-  AcceptHandler(const UpstreamAddr *faddr, ConnectionHandler *h);
-  ~AcceptHandler();
-  void accept_connection();
-  void enable();
-  void disable();
-  int get_fd() const;
-
-private:
-  ev_io wev_;
-  ConnectionHandler *conn_hnr_;
-  const UpstreamAddr *faddr_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_ACCEPT_HANDLER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,483 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_api_downstream_connection.h"
-
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <cstdlib>
-
-#include "shrpx_client_handler.h"
-#include "shrpx_upstream.h"
-#include "shrpx_downstream.h"
-#include "shrpx_worker.h"
-#include "shrpx_connection_handler.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-namespace {
-// List of API endpoints
-const std::array<APIEndpoint, 2> &apis() {
-  static const auto apis = new std::array<APIEndpoint, 2>{{
-      APIEndpoint{
-          StringRef::from_lit("/api/v1beta1/backendconfig"),
-          true,
-          (1 << API_METHOD_POST) | (1 << API_METHOD_PUT),
-          &APIDownstreamConnection::handle_backendconfig,
-      },
-      APIEndpoint{
-          StringRef::from_lit("/api/v1beta1/configrevision"),
-          true,
-          (1 << API_METHOD_GET),
-          &APIDownstreamConnection::handle_configrevision,
-      },
-  }};
-
-  return *apis;
-}
-} // namespace
-
-namespace {
-// The method string.  This must be same order of APIMethod.
-constexpr StringRef API_METHOD_STRING[] = {
-    StringRef::from_lit("GET"),
-    StringRef::from_lit("POST"),
-    StringRef::from_lit("PUT"),
-};
-} // namespace
-
-APIDownstreamConnection::APIDownstreamConnection(Worker *worker)
-    : worker_(worker), api_(nullptr), fd_(-1), shutdown_read_(false) {}
-
-APIDownstreamConnection::~APIDownstreamConnection() {
-  if (fd_ != -1) {
-    close(fd_);
-  }
-}
-
-int APIDownstreamConnection::attach_downstream(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Attaching to DOWNSTREAM:" << downstream;
-  }
-
-  downstream_ = downstream;
-
-  return 0;
-}
-
-void APIDownstreamConnection::detach_downstream(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Detaching from DOWNSTREAM:" << downstream;
-  }
-  downstream_ = nullptr;
-}
-
-// API status, which is independent from HTTP status code.  But
-// generally, 2xx code for API_SUCCESS, and otherwise API_FAILURE.
-enum {
-  API_SUCCESS,
-  API_FAILURE,
-};
-
-int APIDownstreamConnection::send_reply(unsigned int http_status,
-                                        int api_status, const StringRef &data) {
-  shutdown_read_ = true;
-
-  auto upstream = downstream_->get_upstream();
-
-  auto &resp = downstream_->response();
-
-  resp.http_status = http_status;
-
-  auto &balloc = downstream_->get_block_allocator();
-
-  StringRef api_status_str;
-
-  switch (api_status) {
-  case API_SUCCESS:
-    api_status_str = StringRef::from_lit("Success");
-    break;
-  case API_FAILURE:
-    api_status_str = StringRef::from_lit("Failure");
-    break;
-  default:
-    assert(0);
-  }
-
-  constexpr auto M1 = StringRef::from_lit("{\"status\":\"");
-  constexpr auto M2 = StringRef::from_lit("\",\"code\":");
-  constexpr auto M3 = StringRef::from_lit("}");
-
-  // 3 is the number of digits in http_status, assuming it is 3 digits
-  // number.
-  auto buflen = M1.size() + M2.size() + M3.size() + data.size() +
-                api_status_str.size() + 3;
-
-  auto buf = make_byte_ref(balloc, buflen);
-  auto p = buf.base;
-
-  p = std::copy(std::begin(M1), std::end(M1), p);
-  p = std::copy(std::begin(api_status_str), std::end(api_status_str), p);
-  p = std::copy(std::begin(M2), std::end(M2), p);
-  p = util::utos(p, http_status);
-  p = std::copy(std::begin(data), std::end(data), p);
-  p = std::copy(std::begin(M3), std::end(M3), p);
-
-  buf.len = p - buf.base;
-
-  auto content_length = util::make_string_ref_uint(balloc, buf.len);
-
-  resp.fs.add_header_token(StringRef::from_lit("content-length"),
-                           content_length, false, http2::HD_CONTENT_LENGTH);
-
-  switch (http_status) {
-  case 400:
-  case 405:
-  case 413:
-    resp.fs.add_header_token(StringRef::from_lit("connection"),
-                             StringRef::from_lit("close"), false,
-                             http2::HD_CONNECTION);
-    break;
-  }
-
-  if (upstream->send_reply(downstream_, buf.base, buf.len) != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-namespace {
-const APIEndpoint *lookup_api(const StringRef &path) {
-  switch (path.size()) {
-  case 26:
-    switch (path[25]) {
-    case 'g':
-      if (util::streq_l("/api/v1beta1/backendconfi", std::begin(path), 25)) {
-        return &apis()[0];
-      }
-      break;
-    }
-    break;
-  case 27:
-    switch (path[26]) {
-    case 'n':
-      if (util::streq_l("/api/v1beta1/configrevisio", std::begin(path), 26)) {
-        return &apis()[1];
-      }
-      break;
-    }
-    break;
-  }
-  return nullptr;
-}
-} // namespace
-
-int APIDownstreamConnection::push_request_headers() {
-  auto &req = downstream_->request();
-
-  auto path =
-      StringRef{std::begin(req.path),
-                std::find(std::begin(req.path), std::end(req.path), '?')};
-
-  api_ = lookup_api(path);
-
-  if (!api_) {
-    send_reply(404, API_FAILURE);
-
-    return 0;
-  }
-
-  switch (req.method) {
-  case HTTP_GET:
-    if (!(api_->allowed_methods & (1 << API_METHOD_GET))) {
-      error_method_not_allowed();
-      return 0;
-    }
-    break;
-  case HTTP_POST:
-    if (!(api_->allowed_methods & (1 << API_METHOD_POST))) {
-      error_method_not_allowed();
-      return 0;
-    }
-    break;
-  case HTTP_PUT:
-    if (!(api_->allowed_methods & (1 << API_METHOD_PUT))) {
-      error_method_not_allowed();
-      return 0;
-    }
-    break;
-  default:
-    error_method_not_allowed();
-    return 0;
-  }
-
-  // This works with req.fs.content_length == -1
-  if (req.fs.content_length >
-      static_cast<int64_t>(get_config()->api.max_request_body)) {
-    send_reply(413, API_FAILURE);
-
-    return 0;
-  }
-
-  switch (req.method) {
-  case HTTP_POST:
-  case HTTP_PUT: {
-    char tempname[] = "/tmp/nghttpx-api.XXXXXX";
-#ifdef HAVE_MKOSTEMP
-    fd_ = mkostemp(tempname, O_CLOEXEC);
-#else  // !HAVE_MKOSTEMP
-    fd_ = mkstemp(tempname);
-#endif // !HAVE_MKOSTEMP
-    if (fd_ == -1) {
-      send_reply(500, API_FAILURE);
-
-      return 0;
-    }
-#ifndef HAVE_MKOSTEMP
-    util::make_socket_closeonexec(fd_);
-#endif // HAVE_MKOSTEMP
-    unlink(tempname);
-    break;
-  }
-  }
-
-  downstream_->set_request_header_sent(true);
-  auto src = downstream_->get_blocked_request_buf();
-  auto dest = downstream_->get_request_buf();
-  src->remove(*dest);
-
-  return 0;
-}
-
-int APIDownstreamConnection::error_method_not_allowed() {
-  auto &resp = downstream_->response();
-
-  size_t len = 0;
-  for (uint8_t i = 0; i < API_METHOD_MAX; ++i) {
-    if (api_->allowed_methods & (1 << i)) {
-      // The length of method + ", "
-      len += API_METHOD_STRING[i].size() + 2;
-    }
-  }
-
-  assert(len > 0);
-
-  auto &balloc = downstream_->get_block_allocator();
-
-  auto iov = make_byte_ref(balloc, len + 1);
-  auto p = iov.base;
-  for (uint8_t i = 0; i < API_METHOD_MAX; ++i) {
-    if (api_->allowed_methods & (1 << i)) {
-      auto &s = API_METHOD_STRING[i];
-      p = std::copy(std::begin(s), std::end(s), p);
-      p = std::copy_n(", ", 2, p);
-    }
-  }
-
-  p -= 2;
-  *p = '\0';
-
-  resp.fs.add_header_token(StringRef::from_lit("allow"), StringRef{iov.base, p},
-                           false, -1);
-  return send_reply(405, API_FAILURE);
-}
-
-int APIDownstreamConnection::push_upload_data_chunk(const uint8_t *data,
-                                                    size_t datalen) {
-  if (shutdown_read_ || !api_->require_body) {
-    return 0;
-  }
-
-  auto &req = downstream_->request();
-  auto &apiconf = get_config()->api;
-
-  if (static_cast<size_t>(req.recv_body_length) > apiconf.max_request_body) {
-    send_reply(413, API_FAILURE);
-
-    return 0;
-  }
-
-  ssize_t nwrite;
-  while ((nwrite = write(fd_, data, datalen)) == -1 && errno == EINTR)
-    ;
-  if (nwrite == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not write API request body: errno=" << error;
-    send_reply(500, API_FAILURE);
-
-    return 0;
-  }
-
-  // We don't have to call Upstream::resume_read() here, because
-  // request buffer is effectively unlimited.  Actually, we cannot
-  // call it here since it could recursively call this function again.
-
-  return 0;
-}
-
-int APIDownstreamConnection::end_upload_data() {
-  if (shutdown_read_) {
-    return 0;
-  }
-
-  return api_->handler(*this);
-}
-
-int APIDownstreamConnection::handle_backendconfig() {
-  auto &req = downstream_->request();
-
-  if (req.recv_body_length == 0) {
-    send_reply(200, API_SUCCESS);
-
-    return 0;
-  }
-
-  auto rp = mmap(nullptr, req.recv_body_length, PROT_READ, MAP_SHARED, fd_, 0);
-  if (rp == reinterpret_cast<void *>(-1)) {
-    send_reply(500, API_FAILURE);
-  }
-
-  auto unmapper = defer(munmap, rp, req.recv_body_length);
-
-  Config new_config{};
-  new_config.conn.downstream = std::make_shared<DownstreamConfig>();
-  const auto &downstreamconf = new_config.conn.downstream;
-
-  auto config = get_config();
-  auto &src = config->conn.downstream;
-
-  downstreamconf->timeout = src->timeout;
-  downstreamconf->connections_per_host = src->connections_per_host;
-  downstreamconf->connections_per_frontend = src->connections_per_frontend;
-  downstreamconf->request_buffer_size = src->request_buffer_size;
-  downstreamconf->response_buffer_size = src->response_buffer_size;
-  downstreamconf->family = src->family;
-
-  std::set<StringRef> include_set;
-  std::map<StringRef, size_t> pattern_addr_indexer;
-
-  for (auto first = reinterpret_cast<const uint8_t *>(rp),
-            last = first + req.recv_body_length;
-       first != last;) {
-    auto eol = std::find(first, last, '\n');
-    if (eol == last) {
-      break;
-    }
-
-    if (first == eol || *first == '#') {
-      first = ++eol;
-      continue;
-    }
-
-    auto eq = std::find(first, eol, '=');
-    if (eq == eol) {
-      send_reply(400, API_FAILURE);
-      return 0;
-    }
-
-    auto opt = StringRef{first, eq};
-    auto optval = StringRef{eq + 1, eol};
-
-    auto optid = option_lookup_token(opt.c_str(), opt.size());
-
-    switch (optid) {
-    case SHRPX_OPTID_BACKEND:
-      break;
-    default:
-      first = ++eol;
-      continue;
-    }
-
-    if (parse_config(&new_config, optid, opt, optval, include_set,
-                     pattern_addr_indexer) != 0) {
-      send_reply(400, API_FAILURE);
-      return 0;
-    }
-
-    first = ++eol;
-  }
-
-  auto &tlsconf = config->tls;
-  if (configure_downstream_group(&new_config, config->http2_proxy, true,
-                                 tlsconf) != 0) {
-    send_reply(400, API_FAILURE);
-    return 0;
-  }
-
-  auto conn_handler = worker_->get_connection_handler();
-
-  conn_handler->send_replace_downstream(downstreamconf);
-
-  send_reply(200, API_SUCCESS);
-
-  return 0;
-}
-
-int APIDownstreamConnection::handle_configrevision() {
-  auto config = get_config();
-  auto &balloc = downstream_->get_block_allocator();
-
-  // Construct the following string:
-  //   ,
-  //   "data":{
-  //     "configRevision": N
-  //   }
-  auto data = concat_string_ref(
-      balloc, StringRef::from_lit(R"(,"data":{"configRevision":)"),
-      util::make_string_ref_uint(balloc, config->config_revision),
-      StringRef::from_lit("}"));
-
-  send_reply(200, API_SUCCESS, data);
-
-  return 0;
-}
-
-void APIDownstreamConnection::pause_read(IOCtrlReason reason) {}
-
-int APIDownstreamConnection::resume_read(IOCtrlReason reason, size_t consumed) {
-  return 0;
-}
-
-void APIDownstreamConnection::force_resume_read() {}
-
-int APIDownstreamConnection::on_read() { return 0; }
-
-int APIDownstreamConnection::on_write() { return 0; }
-
-void APIDownstreamConnection::on_upstream_change(Upstream *uptream) {}
-
-bool APIDownstreamConnection::poolable() const { return false; }
-
-const std::shared_ptr<DownstreamAddrGroup> &
-APIDownstreamConnection::get_downstream_addr_group() const {
-  static std::shared_ptr<DownstreamAddrGroup> s;
-  return s;
-}
-
-DownstreamAddr *APIDownstreamConnection::get_addr() const { return nullptr; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_api_downstream_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_API_DOWNSTREAM_CONNECTION_H
-#define SHRPX_API_DOWNSTREAM_CONNECTION_H
-
-#include "shrpx_downstream_connection.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Worker;
-
-// If new method is added, don't forget to update API_METHOD_STRING as
-// well.
-enum APIMethod {
-  API_METHOD_GET,
-  API_METHOD_POST,
-  API_METHOD_PUT,
-  API_METHOD_MAX,
-};
-
-class APIDownstreamConnection;
-
-struct APIEndpoint {
-  // Endpoint path.  It must start with "/api/".
-  StringRef path;
-  // true if we evaluate request body.
-  bool require_body;
-  // Allowed methods.  This is bitwise OR of one or more of (1 <<
-  // APIMethod value).
-  uint8_t allowed_methods;
-  std::function<int(APIDownstreamConnection &)> handler;
-};
-
-class APIDownstreamConnection : public DownstreamConnection {
-public:
-  APIDownstreamConnection(Worker *worker);
-  virtual ~APIDownstreamConnection();
-  virtual int attach_downstream(Downstream *downstream);
-  virtual void detach_downstream(Downstream *downstream);
-
-  virtual int push_request_headers();
-  virtual int push_upload_data_chunk(const uint8_t *data, size_t datalen);
-  virtual int end_upload_data();
-
-  virtual void pause_read(IOCtrlReason reason);
-  virtual int resume_read(IOCtrlReason reason, size_t consumed);
-  virtual void force_resume_read();
-
-  virtual int on_read();
-  virtual int on_write();
-
-  virtual void on_upstream_change(Upstream *uptream);
-
-  // true if this object is poolable.
-  virtual bool poolable() const;
-
-  virtual const std::shared_ptr<DownstreamAddrGroup> &
-  get_downstream_addr_group() const;
-  virtual DownstreamAddr *get_addr() const;
-
-  int send_reply(unsigned int http_status, int api_status,
-                 const StringRef &data = StringRef{});
-  int error_method_not_allowed();
-
-  // Handles backendconfig API request.
-  int handle_backendconfig();
-  // Handles configrevision API request.
-  int handle_configrevision();
-
-private:
-  Worker *worker_;
-  // This points to the requested APIEndpoint struct.
-  const APIEndpoint *api_;
-  // The file descriptor for temporary file to store request body.
-  int fd_;
-  // true if we stop reading request body.
-  bool shutdown_read_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_API_DOWNSTREAM_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,4309 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx.h"
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#include <sys/un.h>
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#include <signal.h>
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#include <netinet/tcp.h>
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif // HAVE_ARPA_INET_H
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <getopt.h>
-#ifdef HAVE_SYSLOG_H
-#  include <syslog.h>
-#endif // HAVE_SYSLOG_H
-#ifdef HAVE_LIMITS_H
-#  include <limits.h>
-#endif // HAVE_LIMITS_H
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif // HAVE_SYS_TIME_H
-#include <sys/resource.h>
-#ifdef HAVE_LIBSYSTEMD
-#  include <systemd/sd-daemon.h>
-#endif // HAVE_LIBSYSTEMD
-
-#include <cinttypes>
-#include <limits>
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <initializer_list>
-#include <random>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_config.h"
-#include "shrpx_tls.h"
-#include "shrpx_log_config.h"
-#include "shrpx_worker.h"
-#include "shrpx_http2_upstream.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_worker_process.h"
-#include "shrpx_process.h"
-#include "shrpx_signal.h"
-#include "shrpx_connection.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "app_helper.h"
-#include "tls.h"
-#include "template.h"
-#include "allocator.h"
-#include "ssl_compat.h"
-#include "xsi_strerror.h"
-
-extern char **environ;
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-// Deprecated: Environment variables to tell new binary the listening
-// socket's file descriptors.  They are not close-on-exec.
-constexpr auto ENV_LISTENER4_FD = StringRef::from_lit("NGHTTPX_LISTENER4_FD");
-constexpr auto ENV_LISTENER6_FD = StringRef::from_lit("NGHTTPX_LISTENER6_FD");
-
-// Deprecated: Environment variable to tell new binary the port number
-// the current binary is listening to.
-constexpr auto ENV_PORT = StringRef::from_lit("NGHTTPX_PORT");
-
-// Deprecated: Environment variable to tell new binary the listening
-// socket's file descriptor if frontend listens UNIX domain socket.
-constexpr auto ENV_UNIX_FD = StringRef::from_lit("NGHTTP2_UNIX_FD");
-// Deprecated: Environment variable to tell new binary the UNIX domain
-// socket path.
-constexpr auto ENV_UNIX_PATH = StringRef::from_lit("NGHTTP2_UNIX_PATH");
-
-// Prefix of environment variables to tell new binary the listening
-// socket's file descriptor.  They are not close-on-exec.  For TCP
-// socket, the value must be comma separated 2 parameters: tcp,<FD>.
-// <FD> is file descriptor.  For UNIX domain socket, the value must be
-// comma separated 3 parameters: unix,<FD>,<PATH>.  <FD> is file
-// descriptor.  <PATH> is a path to UNIX domain socket.
-constexpr auto ENV_ACCEPT_PREFIX = StringRef::from_lit("NGHTTPX_ACCEPT_");
-
-// This environment variable contains PID of the original master
-// process, assuming that it created this master process as a result
-// of SIGUSR2.  The new master process is expected to send QUIT signal
-// to the original master process to shut it down gracefully.
-constexpr auto ENV_ORIG_PID = StringRef::from_lit("NGHTTPX_ORIG_PID");
-
-#ifndef _KERNEL_FASTOPEN
-#  define _KERNEL_FASTOPEN
-// conditional define for TCP_FASTOPEN mostly on ubuntu
-#  ifndef TCP_FASTOPEN
-#    define TCP_FASTOPEN 23
-#  endif
-
-// conditional define for SOL_TCP mostly on ubuntu
-#  ifndef SOL_TCP
-#    define SOL_TCP 6
-#  endif
-#endif
-
-// This configuration is fixed at the first startup of the main
-// process, and does not change after subsequent reloadings.
-struct StartupConfig {
-  // This contains all options given in command-line.
-  std::vector<std::pair<StringRef, StringRef>> cmdcfgs;
-  // The current working directory where this process started.
-  char *cwd;
-  // The pointer to original argv (not sure why we have this?)
-  char **original_argv;
-  // The pointer to argv, this is a deep copy of original argv.
-  char **argv;
-  // The number of elements in argv.
-  int argc;
-};
-
-namespace {
-StartupConfig suconfig;
-} // namespace
-
-struct InheritedAddr {
-  // IP address if TCP socket.  Otherwise, UNIX domain socket path.
-  StringRef host;
-  uint16_t port;
-  // true if UNIX domain socket path
-  bool host_unix;
-  int fd;
-  bool used;
-};
-
-namespace {
-void signal_cb(struct ev_loop *loop, ev_signal *w, int revents);
-} // namespace
-
-namespace {
-void worker_process_child_cb(struct ev_loop *loop, ev_child *w, int revents);
-} // namespace
-
-struct WorkerProcess {
-  WorkerProcess(struct ev_loop *loop, pid_t worker_pid, int ipc_fd)
-      : loop(loop), worker_pid(worker_pid), ipc_fd(ipc_fd) {
-    ev_signal_init(&reopen_log_signalev, signal_cb, REOPEN_LOG_SIGNAL);
-    reopen_log_signalev.data = this;
-    ev_signal_start(loop, &reopen_log_signalev);
-
-    ev_signal_init(&exec_binary_signalev, signal_cb, EXEC_BINARY_SIGNAL);
-    exec_binary_signalev.data = this;
-    ev_signal_start(loop, &exec_binary_signalev);
-
-    ev_signal_init(&graceful_shutdown_signalev, signal_cb,
-                   GRACEFUL_SHUTDOWN_SIGNAL);
-    graceful_shutdown_signalev.data = this;
-    ev_signal_start(loop, &graceful_shutdown_signalev);
-
-    ev_signal_init(&reload_signalev, signal_cb, RELOAD_SIGNAL);
-    reload_signalev.data = this;
-    ev_signal_start(loop, &reload_signalev);
-
-    ev_child_init(&worker_process_childev, worker_process_child_cb, worker_pid,
-                  0);
-    worker_process_childev.data = this;
-    ev_child_start(loop, &worker_process_childev);
-  }
-
-  ~WorkerProcess() {
-    shutdown_signal_watchers();
-
-    ev_child_stop(loop, &worker_process_childev);
-
-    if (ipc_fd != -1) {
-      shutdown(ipc_fd, SHUT_WR);
-      close(ipc_fd);
-    }
-  }
-
-  void shutdown_signal_watchers() {
-    ev_signal_stop(loop, &reopen_log_signalev);
-    ev_signal_stop(loop, &exec_binary_signalev);
-    ev_signal_stop(loop, &graceful_shutdown_signalev);
-    ev_signal_stop(loop, &reload_signalev);
-  }
-
-  ev_signal reopen_log_signalev;
-  ev_signal exec_binary_signalev;
-  ev_signal graceful_shutdown_signalev;
-  ev_signal reload_signalev;
-  ev_child worker_process_childev;
-  struct ev_loop *loop;
-  pid_t worker_pid;
-  int ipc_fd;
-};
-
-namespace {
-void reload_config(WorkerProcess *wp);
-} // namespace
-
-namespace {
-std::deque<std::unique_ptr<WorkerProcess>> worker_processes;
-} // namespace
-
-namespace {
-void worker_process_add(std::unique_ptr<WorkerProcess> wp) {
-  worker_processes.push_back(std::move(wp));
-}
-} // namespace
-
-namespace {
-void worker_process_remove(const WorkerProcess *wp) {
-  for (auto it = std::begin(worker_processes); it != std::end(worker_processes);
-       ++it) {
-    auto &s = *it;
-
-    if (s.get() != wp) {
-      continue;
-    }
-
-    worker_processes.erase(it);
-    break;
-  }
-}
-} // namespace
-
-namespace {
-void worker_process_remove_all() {
-  std::deque<std::unique_ptr<WorkerProcess>>().swap(worker_processes);
-}
-} // namespace
-
-namespace {
-// Send signal |signum| to all worker processes, and clears
-// worker_processes.
-void worker_process_kill(int signum) {
-  for (auto &s : worker_processes) {
-    if (s->worker_pid == -1) {
-      continue;
-    }
-    kill(s->worker_pid, signum);
-  }
-  worker_process_remove_all();
-}
-} // namespace
-
-namespace {
-// Returns the last PID of worker process.  Returns -1 if there is no
-// worker process at the moment.
-int worker_process_last_pid() {
-  if (worker_processes.empty()) {
-    return -1;
-  }
-
-  return worker_processes.back()->worker_pid;
-}
-} // namespace
-
-namespace {
-int save_pid() {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  auto config = get_config();
-
-  constexpr auto SUFFIX = StringRef::from_lit(".XXXXXX");
-  auto &pid_file = config->pid_file;
-
-  auto len = config->pid_file.size() + SUFFIX.size();
-  auto buf = make_unique<char[]>(len + 1);
-  auto p = buf.get();
-
-  p = std::copy(std::begin(pid_file), std::end(pid_file), p);
-  p = std::copy(std::begin(SUFFIX), std::end(SUFFIX), p);
-  *p = '\0';
-
-  auto temp_path = buf.get();
-
-  auto fd = mkstemp(temp_path);
-  if (fd == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not save PID to file " << pid_file << ": "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-
-  auto content = util::utos(config->pid) + '\n';
-
-  if (write(fd, content.c_str(), content.size()) == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not save PID to file " << pid_file << ": "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-
-  if (fsync(fd) == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not save PID to file " << pid_file << ": "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-
-  close(fd);
-
-  if (rename(temp_path, pid_file.c_str()) == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not save PID to file " << pid_file << ": "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-    unlink(temp_path);
-
-    return -1;
-  }
-
-  if (config->uid != 0) {
-    if (chown(pid_file.c_str(), config->uid, config->gid) == -1) {
-      auto error = errno;
-      LOG(WARN) << "Changing owner of pid file " << pid_file << " failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-    }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-void shrpx_sd_notifyf(int unset_environment, const char *format, ...) {
-#ifdef HAVE_LIBSYSTEMD
-  va_list args;
-
-  va_start(args, format);
-  sd_notifyf(unset_environment, format, va_arg(args, char *));
-  va_end(args);
-#endif // HAVE_LIBSYSTEMD
-}
-} // namespace
-
-namespace {
-void exec_binary() {
-  int rv;
-  sigset_t oldset;
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
-  LOG(NOTICE) << "Executing new binary";
-
-  shrpx_sd_notifyf(0, "RELOADING=1");
-
-  rv = shrpx_signal_block_all(&oldset);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(ERROR) << "Blocking all signals failed: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-    return;
-  }
-
-  auto pid = fork();
-
-  if (pid != 0) {
-    if (pid == -1) {
-      auto error = errno;
-      LOG(ERROR) << "fork() failed errno=" << error;
-    } else {
-      // update PID tracking information in systemd
-      shrpx_sd_notifyf(0, "MAINPID=%d\n", pid);
-    }
-
-    rv = shrpx_signal_set(&oldset);
-
-    if (rv != 0) {
-      auto error = errno;
-      LOG(FATAL) << "Restoring signal mask failed: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-      exit(EXIT_FAILURE);
-    }
-
-    return;
-  }
-
-  // child process
-
-  shrpx_signal_unset_master_proc_ign_handler();
-
-  rv = shrpx_signal_unblock_all();
-  if (rv != 0) {
-    auto error = errno;
-    LOG(ERROR) << "Unblocking all signals failed: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-    nghttp2_Exit(EXIT_FAILURE);
-  }
-
-  auto exec_path =
-      util::get_exec_path(suconfig.argc, suconfig.argv, suconfig.cwd);
-
-  if (!exec_path) {
-    LOG(ERROR) << "Could not resolve the executable path";
-    nghttp2_Exit(EXIT_FAILURE);
-  }
-
-  auto argv = make_unique<char *[]>(suconfig.argc + 1);
-
-  argv[0] = exec_path;
-  for (int i = 1; i < suconfig.argc; ++i) {
-    argv[i] = suconfig.argv[i];
-  }
-  argv[suconfig.argc] = nullptr;
-
-  size_t envlen = 0;
-  for (char **p = environ; *p; ++p, ++envlen)
-    ;
-
-  auto config = get_config();
-  auto &listenerconf = config->conn.listener;
-
-  // 2 for ENV_ORIG_PID and terminal nullptr.
-  auto envp = make_unique<char *[]>(envlen + listenerconf.addrs.size() + 2);
-  size_t envidx = 0;
-
-  std::vector<ImmutableString> fd_envs;
-  for (size_t i = 0; i < listenerconf.addrs.size(); ++i) {
-    auto &addr = listenerconf.addrs[i];
-    auto s = ENV_ACCEPT_PREFIX.str();
-    s += util::utos(i + 1);
-    s += '=';
-    if (addr.host_unix) {
-      s += "unix,";
-      s += util::utos(addr.fd);
-      s += ',';
-      s += addr.host;
-    } else {
-      s += "tcp,";
-      s += util::utos(addr.fd);
-    }
-
-    fd_envs.emplace_back(s);
-    envp[envidx++] = const_cast<char *>(fd_envs.back().c_str());
-  }
-
-  auto ipc_fd_str = ENV_ORIG_PID.str();
-  ipc_fd_str += '=';
-  ipc_fd_str += util::utos(config->pid);
-  envp[envidx++] = const_cast<char *>(ipc_fd_str.c_str());
-
-  for (size_t i = 0; i < envlen; ++i) {
-    auto env = StringRef{environ[i]};
-    if (util::starts_with(env, ENV_ACCEPT_PREFIX) ||
-        util::starts_with(env, ENV_LISTENER4_FD) ||
-        util::starts_with(env, ENV_LISTENER6_FD) ||
-        util::starts_with(env, ENV_PORT) ||
-        util::starts_with(env, ENV_UNIX_FD) ||
-        util::starts_with(env, ENV_UNIX_PATH) ||
-        util::starts_with(env, ENV_ORIG_PID)) {
-      continue;
-    }
-
-    envp[envidx++] = environ[i];
-  }
-
-  envp[envidx++] = nullptr;
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "cmdline";
-    for (int i = 0; argv[i]; ++i) {
-      LOG(INFO) << i << ": " << argv[i];
-    }
-    LOG(INFO) << "environ";
-    for (int i = 0; envp[i]; ++i) {
-      LOG(INFO) << i << ": " << envp[i];
-    }
-  }
-
-  // restores original stderr
-  restore_original_fds();
-
-  // reloading finished
-  shrpx_sd_notifyf(0, "READY=1");
-
-  if (execve(argv[0], argv.get(), envp.get()) == -1) {
-    auto error = errno;
-    LOG(ERROR) << "execve failed: errno=" << error;
-    nghttp2_Exit(EXIT_FAILURE);
-  }
-}
-} // namespace
-
-namespace {
-void ipc_send(WorkerProcess *wp, uint8_t ipc_event) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  ssize_t nwrite;
-  while ((nwrite = write(wp->ipc_fd, &ipc_event, 1)) == -1 && errno == EINTR)
-    ;
-
-  if (nwrite < 0) {
-    auto error = errno;
-    LOG(ERROR) << "Could not send IPC event to worker process: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return;
-  }
-
-  if (nwrite == 0) {
-    LOG(ERROR) << "Could not send IPC event due to pipe overflow";
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void reopen_log(WorkerProcess *wp) {
-  LOG(NOTICE) << "Reopening log files: master process";
-
-  auto config = get_config();
-  auto &loggingconf = config->logging;
-
-  (void)reopen_log_files(loggingconf);
-  redirect_stderr_to_errorlog(loggingconf);
-  ipc_send(wp, SHRPX_IPC_REOPEN_LOG);
-}
-} // namespace
-
-namespace {
-void signal_cb(struct ev_loop *loop, ev_signal *w, int revents) {
-  auto wp = static_cast<WorkerProcess *>(w->data);
-  if (wp->worker_pid == -1) {
-    ev_break(loop);
-    return;
-  }
-
-  switch (w->signum) {
-  case REOPEN_LOG_SIGNAL:
-    reopen_log(wp);
-    return;
-  case EXEC_BINARY_SIGNAL:
-    exec_binary();
-    return;
-  case GRACEFUL_SHUTDOWN_SIGNAL: {
-    auto &listenerconf = get_config()->conn.listener;
-    for (auto &addr : listenerconf.addrs) {
-      close(addr.fd);
-    }
-    ipc_send(wp, SHRPX_IPC_GRACEFUL_SHUTDOWN);
-    return;
-  }
-  case RELOAD_SIGNAL:
-    reload_config(wp);
-    return;
-  default:
-    worker_process_kill(w->signum);
-    ev_break(loop);
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void worker_process_child_cb(struct ev_loop *loop, ev_child *w, int revents) {
-  auto wp = static_cast<WorkerProcess *>(w->data);
-
-  log_chld(w->rpid, w->rstatus, "Worker process");
-
-  auto pid = wp->worker_pid;
-
-  worker_process_remove(wp);
-
-  if (worker_process_last_pid() == pid) {
-    ev_break(loop);
-  }
-}
-} // namespace
-
-namespace {
-int create_unix_domain_server_socket(UpstreamAddr &faddr,
-                                     std::vector<InheritedAddr> &iaddrs) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  auto found = std::find_if(
-      std::begin(iaddrs), std::end(iaddrs), [&faddr](const InheritedAddr &ia) {
-        return !ia.used && ia.host_unix && ia.host == faddr.host;
-      });
-
-  if (found != std::end(iaddrs)) {
-    LOG(NOTICE) << "Listening on UNIX domain socket " << faddr.host
-                << (faddr.tls ? ", tls" : "");
-    (*found).used = true;
-    faddr.fd = (*found).fd;
-    faddr.hostport = StringRef::from_lit("localhost");
-
-    return 0;
-  }
-
-#ifdef SOCK_NONBLOCK
-  auto fd = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
-  if (fd == -1) {
-    auto error = errno;
-    LOG(FATAL) << "socket() syscall failed: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-#else  // !SOCK_NONBLOCK
-  auto fd = socket(AF_UNIX, SOCK_STREAM, 0);
-  if (fd == -1) {
-    auto error = errno;
-    LOG(FATAL) << "socket() syscall failed: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-  util::make_socket_nonblocking(fd);
-#endif // !SOCK_NONBLOCK
-  int val = 1;
-  if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val,
-                 static_cast<socklen_t>(sizeof(val))) == -1) {
-    auto error = errno;
-    LOG(FATAL) << "Failed to set SO_REUSEADDR option to listener socket: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    close(fd);
-    return -1;
-  }
-
-  sockaddr_union addr;
-  addr.un.sun_family = AF_UNIX;
-  if (faddr.host.size() + 1 > sizeof(addr.un.sun_path)) {
-    LOG(FATAL) << "UNIX domain socket path " << faddr.host << " is too long > "
-               << sizeof(addr.un.sun_path);
-    close(fd);
-    return -1;
-  }
-  // copy path including terminal NULL
-  std::copy_n(faddr.host.c_str(), faddr.host.size() + 1, addr.un.sun_path);
-
-  // unlink (remove) already existing UNIX domain socket path
-  unlink(faddr.host.c_str());
-
-  if (bind(fd, &addr.sa, sizeof(addr.un)) != 0) {
-    auto error = errno;
-    LOG(FATAL) << "Failed to bind UNIX domain socket: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    close(fd);
-    return -1;
-  }
-
-  auto &listenerconf = get_config()->conn.listener;
-
-  if (listen(fd, listenerconf.backlog) != 0) {
-    auto error = errno;
-    LOG(FATAL) << "Failed to listen to UNIX domain socket: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    close(fd);
-    return -1;
-  }
-
-  LOG(NOTICE) << "Listening on UNIX domain socket " << faddr.host
-              << (faddr.tls ? ", tls" : "");
-
-  faddr.fd = fd;
-  faddr.hostport = StringRef::from_lit("localhost");
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int create_tcp_server_socket(UpstreamAddr &faddr,
-                             std::vector<InheritedAddr> &iaddrs) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  int fd = -1;
-  int rv;
-
-  auto &listenerconf = get_config()->conn.listener;
-
-  auto service = util::utos(faddr.port);
-  addrinfo hints{};
-  hints.ai_family = faddr.family;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-  hints.ai_flags |= AI_ADDRCONFIG;
-#endif // AI_ADDRCONFIG
-
-  auto node =
-      faddr.host == StringRef::from_lit("*") ? nullptr : faddr.host.c_str();
-
-  addrinfo *res, *rp;
-  rv = getaddrinfo(node, service.c_str(), &hints, &res);
-#ifdef AI_ADDRCONFIG
-  if (rv != 0) {
-    // Retry without AI_ADDRCONFIG
-    hints.ai_flags &= ~AI_ADDRCONFIG;
-    rv = getaddrinfo(node, service.c_str(), &hints, &res);
-  }
-#endif // AI_ADDRCONFIG
-  if (rv != 0) {
-    LOG(FATAL) << "Unable to get IPv" << (faddr.family == AF_INET ? "4" : "6")
-               << " address for " << faddr.host << ", port " << faddr.port
-               << ": " << gai_strerror(rv);
-    return -1;
-  }
-
-  auto res_d = defer(freeaddrinfo, res);
-
-  std::array<char, NI_MAXHOST> host;
-
-  for (rp = res; rp; rp = rp->ai_next) {
-
-    rv = getnameinfo(rp->ai_addr, rp->ai_addrlen, host.data(), host.size(),
-                     nullptr, 0, NI_NUMERICHOST);
-
-    if (rv != 0) {
-      LOG(WARN) << "getnameinfo() failed: " << gai_strerror(rv);
-      continue;
-    }
-
-    auto found = std::find_if(std::begin(iaddrs), std::end(iaddrs),
-                              [&host, &faddr](const InheritedAddr &ia) {
-                                return !ia.used && !ia.host_unix &&
-                                       ia.host == host.data() &&
-                                       ia.port == faddr.port;
-                              });
-
-    if (found != std::end(iaddrs)) {
-      (*found).used = true;
-      fd = (*found).fd;
-      break;
-    }
-
-#ifdef SOCK_NONBLOCK
-    fd =
-        socket(rp->ai_family, rp->ai_socktype | SOCK_NONBLOCK, rp->ai_protocol);
-    if (fd == -1) {
-      auto error = errno;
-      LOG(WARN) << "socket() syscall failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-      continue;
-    }
-#else  // !SOCK_NONBLOCK
-    fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if (fd == -1) {
-      auto error = errno;
-      LOG(WARN) << "socket() syscall failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-      continue;
-    }
-    util::make_socket_nonblocking(fd);
-#endif // !SOCK_NONBLOCK
-    int val = 1;
-    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val,
-                   static_cast<socklen_t>(sizeof(val))) == -1) {
-      auto error = errno;
-      LOG(WARN) << "Failed to set SO_REUSEADDR option to listener socket: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-      close(fd);
-      continue;
-    }
-
-#ifdef IPV6_V6ONLY
-    if (faddr.family == AF_INET6) {
-      if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val,
-                     static_cast<socklen_t>(sizeof(val))) == -1) {
-        auto error = errno;
-        LOG(WARN) << "Failed to set IPV6_V6ONLY option to listener socket: "
-                  << xsi_strerror(error, errbuf.data(), errbuf.size());
-        close(fd);
-        continue;
-      }
-    }
-#endif // IPV6_V6ONLY
-
-#ifdef TCP_DEFER_ACCEPT
-    val = 3;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &val,
-                   static_cast<socklen_t>(sizeof(val))) == -1) {
-      auto error = errno;
-      LOG(WARN) << "Failed to set TCP_DEFER_ACCEPT option to listener socket: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-    }
-#endif // TCP_DEFER_ACCEPT
-
-    // When we are executing new binary, and the old binary did not
-    // bind privileged port (< 1024) for some reason, binding to those
-    // ports will fail with permission denied error.
-    if (bind(fd, rp->ai_addr, rp->ai_addrlen) == -1) {
-      auto error = errno;
-      LOG(WARN) << "bind() syscall failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-      close(fd);
-      continue;
-    }
-
-    if (listenerconf.fastopen > 0) {
-      val = listenerconf.fastopen;
-      if (setsockopt(fd, SOL_TCP, TCP_FASTOPEN, &val,
-                     static_cast<socklen_t>(sizeof(val))) == -1) {
-        auto error = errno;
-        LOG(WARN) << "Failed to set TCP_FASTOPEN option to listener socket: "
-                  << xsi_strerror(error, errbuf.data(), errbuf.size());
-      }
-    }
-
-    if (listen(fd, listenerconf.backlog) == -1) {
-      auto error = errno;
-      LOG(WARN) << "listen() syscall failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-      close(fd);
-      continue;
-    }
-
-    break;
-  }
-
-  if (!rp) {
-    LOG(FATAL) << "Listening " << (faddr.family == AF_INET ? "IPv4" : "IPv6")
-               << " socket failed";
-
-    return -1;
-  }
-
-  faddr.fd = fd;
-  faddr.hostport = util::make_http_hostport(mod_config()->balloc,
-                                            StringRef{host.data()}, faddr.port);
-
-  LOG(NOTICE) << "Listening on " << faddr.hostport
-              << (faddr.tls ? ", tls" : "");
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Returns array of InheritedAddr constructed from |config|.  This
-// function is intended to be used when reloading configuration, and
-// |config| is usually a current configuration.
-std::vector<InheritedAddr>
-get_inherited_addr_from_config(BlockAllocator &balloc, Config *config) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  int rv;
-
-  auto &listenerconf = config->conn.listener;
-
-  std::vector<InheritedAddr> iaddrs(listenerconf.addrs.size());
-
-  size_t idx = 0;
-  for (auto &addr : listenerconf.addrs) {
-    auto &iaddr = iaddrs[idx++];
-
-    if (addr.host_unix) {
-      iaddr.host = addr.host;
-      iaddr.host_unix = true;
-      iaddr.fd = addr.fd;
-
-      continue;
-    }
-
-    iaddr.port = addr.port;
-    iaddr.fd = addr.fd;
-
-    // We have to getsockname/getnameinfo for fd, since we may have
-    // '*' appear in addr.host, which makes comparison against "real"
-    // address fail.
-
-    sockaddr_union su;
-    socklen_t salen = sizeof(su);
-
-    // We already added entry to iaddrs.  Even if we got errors, we
-    // don't remove it.  This is required because we have to close the
-    // socket if it is not reused.  The empty host name usually does
-    // not match anything.
-
-    if (getsockname(addr.fd, &su.sa, &salen) != 0) {
-      auto error = errno;
-      LOG(WARN) << "getsockname() syscall failed (fd=" << addr.fd
-                << "): " << xsi_strerror(error, errbuf.data(), errbuf.size());
-      continue;
-    }
-
-    std::array<char, NI_MAXHOST> host;
-    rv = getnameinfo(&su.sa, salen, host.data(), host.size(), nullptr, 0,
-                     NI_NUMERICHOST);
-    if (rv != 0) {
-      LOG(WARN) << "getnameinfo() failed (fd=" << addr.fd
-                << "): " << gai_strerror(rv);
-      continue;
-    }
-
-    iaddr.host = make_string_ref(balloc, StringRef{host.data()});
-  }
-
-  return iaddrs;
-}
-} // namespace
-
-namespace {
-// Returns array of InheritedAddr constructed from environment
-// variables.  This function handles the old environment variable
-// names used in 1.7.0 or earlier.
-std::vector<InheritedAddr> get_inherited_addr_from_env(Config *config) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  int rv;
-  std::vector<InheritedAddr> iaddrs;
-
-  {
-    // Upgrade from 1.7.0 or earlier
-    auto portenv = getenv(ENV_PORT.c_str());
-    if (portenv) {
-      size_t i = 1;
-      for (auto env_name : {ENV_LISTENER4_FD, ENV_LISTENER6_FD}) {
-        auto fdenv = getenv(env_name.c_str());
-        if (fdenv) {
-          auto name = ENV_ACCEPT_PREFIX.str();
-          name += util::utos(i);
-          std::string value = "tcp,";
-          value += fdenv;
-          setenv(name.c_str(), value.c_str(), 0);
-          ++i;
-        }
-      }
-    } else {
-      // The return value of getenv may be allocated statically.
-      if (getenv(ENV_UNIX_PATH.c_str()) && getenv(ENV_UNIX_FD.c_str())) {
-        auto name = ENV_ACCEPT_PREFIX.str();
-        name += '1';
-        std::string value = "unix,";
-        value += getenv(ENV_UNIX_FD.c_str());
-        value += ',';
-        value += getenv(ENV_UNIX_PATH.c_str());
-        setenv(name.c_str(), value.c_str(), 0);
-      }
-    }
-  }
-
-  for (size_t i = 1;; ++i) {
-    auto name = ENV_ACCEPT_PREFIX.str();
-    name += util::utos(i);
-    auto env = getenv(name.c_str());
-    if (!env) {
-      break;
-    }
-
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Read env " << name << "=" << env;
-    }
-
-    auto end_type = strchr(env, ',');
-    if (!end_type) {
-      continue;
-    }
-
-    auto type = StringRef(env, end_type);
-    auto value = end_type + 1;
-
-    if (type == StringRef::from_lit("unix")) {
-      auto endfd = strchr(value, ',');
-      if (!endfd) {
-        continue;
-      }
-      auto fd = util::parse_uint(reinterpret_cast<const uint8_t *>(value),
-                                 endfd - value);
-      if (fd == -1) {
-        LOG(WARN) << "Could not parse file descriptor from "
-                  << std::string(value, endfd - value);
-        continue;
-      }
-
-      auto path = endfd + 1;
-      if (strlen(path) == 0) {
-        LOG(WARN) << "Empty UNIX domain socket path (fd=" << fd << ")";
-        close(fd);
-        continue;
-      }
-
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Inherit UNIX domain socket fd=" << fd
-                  << ", path=" << path;
-      }
-
-      InheritedAddr addr{};
-      addr.host = make_string_ref(config->balloc, StringRef{path});
-      addr.host_unix = true;
-      addr.fd = static_cast<int>(fd);
-      iaddrs.push_back(std::move(addr));
-    }
-
-    if (type == StringRef::from_lit("tcp")) {
-      auto fd = util::parse_uint(value);
-      if (fd == -1) {
-        LOG(WARN) << "Could not parse file descriptor from " << value;
-        continue;
-      }
-
-      sockaddr_union su;
-      socklen_t salen = sizeof(su);
-
-      if (getsockname(fd, &su.sa, &salen) != 0) {
-        auto error = errno;
-        LOG(WARN) << "getsockname() syscall failed (fd=" << fd
-                  << "): " << xsi_strerror(error, errbuf.data(), errbuf.size());
-        close(fd);
-        continue;
-      }
-
-      uint16_t port;
-
-      switch (su.storage.ss_family) {
-      case AF_INET:
-        port = ntohs(su.in.sin_port);
-        break;
-      case AF_INET6:
-        port = ntohs(su.in6.sin6_port);
-        break;
-      default:
-        close(fd);
-        continue;
-      }
-
-      std::array<char, NI_MAXHOST> host;
-      rv = getnameinfo(&su.sa, salen, host.data(), host.size(), nullptr, 0,
-                       NI_NUMERICHOST);
-      if (rv != 0) {
-        LOG(WARN) << "getnameinfo() failed (fd=" << fd
-                  << "): " << gai_strerror(rv);
-        close(fd);
-        continue;
-      }
-
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Inherit TCP socket fd=" << fd
-                  << ", address=" << host.data() << ", port=" << port;
-      }
-
-      InheritedAddr addr{};
-      addr.host = make_string_ref(config->balloc, StringRef{host.data()});
-      addr.port = static_cast<uint16_t>(port);
-      addr.fd = static_cast<int>(fd);
-      iaddrs.push_back(std::move(addr));
-      continue;
-    }
-  }
-
-  return iaddrs;
-}
-} // namespace
-
-namespace {
-// Closes all sockets which are not reused.
-void close_unused_inherited_addr(const std::vector<InheritedAddr> &iaddrs) {
-  for (auto &ia : iaddrs) {
-    if (ia.used) {
-      continue;
-    }
-
-    close(ia.fd);
-  }
-}
-} // namespace
-
-namespace {
-// Returns the PID of the original master process from environment
-// variable ENV_ORIG_PID.
-pid_t get_orig_pid_from_env() {
-  auto s = getenv(ENV_ORIG_PID.c_str());
-  if (s == nullptr) {
-    return -1;
-  }
-  return util::parse_uint(s);
-}
-} // namespace
-
-namespace {
-int create_acceptor_socket(Config *config, std::vector<InheritedAddr> &iaddrs) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  auto &listenerconf = config->conn.listener;
-
-  for (auto &addr : listenerconf.addrs) {
-    if (addr.host_unix) {
-      if (create_unix_domain_server_socket(addr, iaddrs) != 0) {
-        return -1;
-      }
-
-      if (config->uid != 0) {
-        // fd is not associated to inode, so we cannot use fchown(2)
-        // here.  https://lkml.org/lkml/2004/11/1/84
-        if (chown(addr.host.c_str(), config->uid, config->gid) == -1) {
-          auto error = errno;
-          LOG(WARN) << "Changing owner of UNIX domain socket " << addr.host
-                    << " failed: "
-                    << xsi_strerror(error, errbuf.data(), errbuf.size());
-        }
-      }
-      continue;
-    }
-
-    if (create_tcp_server_socket(addr, iaddrs) != 0) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int call_daemon() {
-#ifdef __sgi
-  return _daemonize(0, 0, 0, 0);
-#else // !__sgi
-#  ifdef HAVE_LIBSYSTEMD
-  if (sd_booted() && (getenv("NOTIFY_SOCKET") != nullptr)) {
-    LOG(NOTICE) << "Daemonising disabled under systemd";
-    chdir("/");
-    return 0;
-  }
-#  endif // HAVE_LIBSYSTEMD
-  return daemon(0, 0);
-#endif   // !__sgi
-}
-} // namespace
-
-namespace {
-// Opens IPC socket used to communicate with worker proess.  The
-// communication is unidirectional; that is main process sends
-// messages to the worker process.  On success, ipc_fd[0] is for
-// reading, and ipc_fd[1] for writing, just like pipe(2).
-int create_ipc_socket(std::array<int, 2> &ipc_fd) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  int rv;
-
-  rv = pipe(ipc_fd.data());
-  if (rv == -1) {
-    auto error = errno;
-    LOG(WARN) << "Failed to create pipe to communicate worker process: "
-              << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-
-  for (int i = 0; i < 2; ++i) {
-    auto fd = ipc_fd[i];
-    util::make_socket_nonblocking(fd);
-    util::make_socket_closeonexec(fd);
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Creates worker process, and returns PID of worker process.  On
-// success, file descriptor for IPC (send only) is assigned to
-// |main_ipc_fd|.  In child process, we will close file descriptors
-// which are inherited from previous configuration/process, but not
-// used in the current configuration.
-pid_t fork_worker_process(int &main_ipc_fd,
-                          const std::vector<InheritedAddr> &iaddrs) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  int rv;
-  sigset_t oldset;
-
-  std::array<int, 2> ipc_fd;
-
-  rv = create_ipc_socket(ipc_fd);
-  if (rv != 0) {
-    return -1;
-  }
-
-  rv = shrpx_signal_block_all(&oldset);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(ERROR) << "Blocking all signals failed: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-    close(ipc_fd[0]);
-    close(ipc_fd[1]);
-
-    return -1;
-  }
-
-  auto config = get_config();
-
-  pid_t pid = 0;
-
-  if (!config->single_process) {
-    pid = fork();
-  }
-
-  if (pid == 0) {
-    ev_loop_fork(EV_DEFAULT);
-
-    for (auto &addr : config->conn.listener.addrs) {
-      util::make_socket_closeonexec(addr.fd);
-    }
-
-    // Remove all WorkerProcesses to stop any registered watcher on
-    // default loop.
-    worker_process_remove_all();
-
-    close_unused_inherited_addr(iaddrs);
-
-    shrpx_signal_set_worker_proc_ign_handler();
-
-    rv = shrpx_signal_unblock_all();
-    if (rv != 0) {
-      auto error = errno;
-      LOG(FATAL) << "Unblocking all signals failed: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-      if (config->single_process) {
-        exit(EXIT_FAILURE);
-      } else {
-        nghttp2_Exit(EXIT_FAILURE);
-      }
-    }
-
-    if (!config->single_process) {
-      close(ipc_fd[1]);
-    }
-
-    WorkerProcessConfig wpconf{ipc_fd[0]};
-    rv = worker_process_event_loop(&wpconf);
-    if (rv != 0) {
-      LOG(FATAL) << "Worker process returned error";
-
-      if (config->single_process) {
-        exit(EXIT_FAILURE);
-      } else {
-        nghttp2_Exit(EXIT_FAILURE);
-      }
-    }
-
-    LOG(NOTICE) << "Worker process shutting down momentarily";
-
-    // call exit(...) instead of nghttp2_Exit to get leak sanitizer report
-    if (config->single_process) {
-      exit(EXIT_SUCCESS);
-    } else {
-      nghttp2_Exit(EXIT_SUCCESS);
-    }
-  }
-
-  // parent process
-  if (pid == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not spawn worker process: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-  }
-
-  rv = shrpx_signal_set(&oldset);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(FATAL) << "Restoring signal mask failed: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-
-    exit(EXIT_FAILURE);
-  }
-
-  if (pid == -1) {
-    close(ipc_fd[0]);
-    close(ipc_fd[1]);
-
-    return -1;
-  }
-
-  close(ipc_fd[0]);
-
-  main_ipc_fd = ipc_fd[1];
-
-  LOG(NOTICE) << "Worker process [" << pid << "] spawned";
-
-  return pid;
-}
-} // namespace
-
-namespace {
-int event_loop() {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
-  shrpx_signal_set_master_proc_ign_handler();
-
-  auto config = mod_config();
-
-  if (config->daemon) {
-    if (call_daemon() == -1) {
-      auto error = errno;
-      LOG(FATAL) << "Failed to daemonize: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      return -1;
-    }
-
-    // We get new PID after successful daemon().
-    mod_config()->pid = getpid();
-
-    // daemon redirects stderr file descriptor to /dev/null, so we
-    // need this.
-    redirect_stderr_to_errorlog(config->logging);
-  }
-
-  // update systemd PID tracking
-  shrpx_sd_notifyf(0, "MAINPID=%d\n", config->pid);
-
-  {
-    auto iaddrs = get_inherited_addr_from_env(config);
-
-    if (create_acceptor_socket(config, iaddrs) != 0) {
-      return -1;
-    }
-
-    close_unused_inherited_addr(iaddrs);
-  }
-
-  auto orig_pid = get_orig_pid_from_env();
-
-  auto loop = ev_default_loop(config->ev_loop_flags);
-
-  int ipc_fd = 0;
-
-  auto pid = fork_worker_process(ipc_fd, {});
-
-  if (pid == -1) {
-    return -1;
-  }
-
-  worker_process_add(make_unique<WorkerProcess>(loop, pid, ipc_fd));
-
-  // Write PID file when we are ready to accept connection from peer.
-  // This makes easier to write restart script for nghttpx.  Because
-  // when we know that PID file is recreated, it means we can send
-  // QUIT signal to the old process to make it shutdown gracefully.
-  if (!config->pid_file.empty()) {
-    save_pid();
-  }
-
-  // ready to serve requests
-  shrpx_sd_notifyf(0, "READY=1");
-
-  if (orig_pid != -1) {
-    LOG(NOTICE) << "Send QUIT signal to the original master process to tell "
-                   "that we are ready to serve requests.";
-    kill(orig_pid, SIGQUIT);
-  }
-
-  ev_run(loop, 0);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Returns true if regular file or symbolic link |path| exists.
-bool conf_exists(const char *path) {
-  struct stat buf;
-  int rv = stat(path, &buf);
-  return rv == 0 && (buf.st_mode & (S_IFREG | S_IFLNK));
-}
-} // namespace
-
-namespace {
-constexpr auto DEFAULT_NPN_LIST =
-    StringRef::from_lit("h2,h2-16,h2-14,http/1.1");
-} // namespace
-
-namespace {
-constexpr auto DEFAULT_TLS_MIN_PROTO_VERSION = StringRef::from_lit("TLSv1.2");
-#ifdef TLS1_3_VERSION
-constexpr auto DEFAULT_TLS_MAX_PROTO_VERSION = StringRef::from_lit("TLSv1.3");
-#else  // !TLS1_3_VERSION
-constexpr auto DEFAULT_TLS_MAX_PROTO_VERSION = StringRef::from_lit("TLSv1.2");
-#endif // !TLS1_3_VERSION
-} // namespace
-
-namespace {
-constexpr auto DEFAULT_ACCESSLOG_FORMAT = StringRef::from_lit(
-    R"($remote_addr - - [$time_local] )"
-    R"("$request" $status $body_bytes_sent )"
-    R"("$http_referer" "$http_user_agent")");
-} // namespace
-
-namespace {
-void fill_default_config(Config *config) {
-  config->num_worker = 1;
-  config->conf_path = StringRef::from_lit("/etc/nghttpx/nghttpx.conf");
-  config->pid = getpid();
-
-#ifdef NOTHREADS
-  config->single_thread = true;
-#endif // NOTHREADS
-
-  if (ev_supported_backends() & ~ev_recommended_backends() & EVBACKEND_KQUEUE) {
-    config->ev_loop_flags = ev_recommended_backends() | EVBACKEND_KQUEUE;
-  }
-
-  auto &tlsconf = config->tls;
-  {
-    auto &ticketconf = tlsconf.ticket;
-    {
-      auto &memcachedconf = ticketconf.memcached;
-      memcachedconf.max_retry = 3;
-      memcachedconf.max_fail = 2;
-      memcachedconf.interval = 10_min;
-      memcachedconf.family = AF_UNSPEC;
-    }
-
-    auto &session_cacheconf = tlsconf.session_cache;
-    {
-      auto &memcachedconf = session_cacheconf.memcached;
-      memcachedconf.family = AF_UNSPEC;
-    }
-
-    ticketconf.cipher = EVP_aes_128_cbc();
-  }
-
-  {
-    auto &ocspconf = tlsconf.ocsp;
-    // ocsp update interval = 14400 secs = 4 hours, borrowed from h2o
-    ocspconf.update_interval = 4_h;
-    ocspconf.fetch_ocsp_response_file =
-        StringRef::from_lit(PKGDATADIR "/fetch-ocsp-response");
-  }
-
-  {
-    auto &dyn_recconf = tlsconf.dyn_rec;
-    dyn_recconf.warmup_threshold = 1_m;
-    dyn_recconf.idle_timeout = 1_s;
-  }
-
-  tlsconf.session_timeout = std::chrono::hours(12);
-  tlsconf.ciphers = StringRef::from_lit(nghttp2::tls::DEFAULT_CIPHER_LIST);
-  tlsconf.tls13_ciphers =
-      StringRef::from_lit(nghttp2::tls::DEFAULT_TLS13_CIPHER_LIST);
-  tlsconf.client.ciphers =
-      StringRef::from_lit(nghttp2::tls::DEFAULT_CIPHER_LIST);
-  tlsconf.client.tls13_ciphers =
-      StringRef::from_lit(nghttp2::tls::DEFAULT_TLS13_CIPHER_LIST);
-  tlsconf.min_proto_version =
-      tls::proto_version_from_string(DEFAULT_TLS_MIN_PROTO_VERSION);
-  tlsconf.max_proto_version =
-      tls::proto_version_from_string(DEFAULT_TLS_MAX_PROTO_VERSION);
-  tlsconf.max_early_data = 16_k;
-#if OPENSSL_1_1_API || defined(OPENSSL_IS_BORINGSSL)
-  tlsconf.ecdh_curves = StringRef::from_lit("X25519:P-256:P-384:P-521");
-#else  // !OPENSSL_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-  tlsconf.ecdh_curves = StringRef::from_lit("P-256:P-384:P-521");
-#endif // !OPENSSL_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-
-  auto &httpconf = config->http;
-  httpconf.server_name = StringRef::from_lit("nghttpx");
-  httpconf.no_host_rewrite = true;
-  httpconf.request_header_field_buffer = 64_k;
-  httpconf.max_request_header_fields = 100;
-  httpconf.response_header_field_buffer = 64_k;
-  httpconf.max_response_header_fields = 500;
-  httpconf.redirect_https_port = StringRef::from_lit("443");
-  httpconf.max_requests = std::numeric_limits<size_t>::max();
-  httpconf.xfp.add = true;
-  httpconf.xfp.strip_incoming = true;
-  httpconf.early_data.strip_incoming = true;
-
-  auto &http2conf = config->http2;
-  {
-    auto &upstreamconf = http2conf.upstream;
-
-    {
-      auto &timeoutconf = upstreamconf.timeout;
-      timeoutconf.settings = 10_s;
-    }
-
-    // window size for HTTP/2 upstream connection per stream.  2**16-1
-    // = 64KiB-1, which is HTTP/2 default.
-    upstreamconf.window_size = 64_k - 1;
-    // HTTP/2 has connection-level flow control. The default window
-    // size for HTTP/2 is 64KiB - 1.
-    upstreamconf.connection_window_size = 64_k - 1;
-    upstreamconf.max_concurrent_streams = 100;
-
-    upstreamconf.encoder_dynamic_table_size = 4_k;
-    upstreamconf.decoder_dynamic_table_size = 4_k;
-
-    nghttp2_option_new(&upstreamconf.option);
-    nghttp2_option_set_no_auto_window_update(upstreamconf.option, 1);
-    nghttp2_option_set_no_recv_client_magic(upstreamconf.option, 1);
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        upstreamconf.option, upstreamconf.encoder_dynamic_table_size);
-
-    // For API endpoint, we enable automatic window update.  This is
-    // because we are a sink.
-    nghttp2_option_new(&upstreamconf.alt_mode_option);
-    nghttp2_option_set_no_recv_client_magic(upstreamconf.alt_mode_option, 1);
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        upstreamconf.alt_mode_option, upstreamconf.encoder_dynamic_table_size);
-  }
-
-  http2conf.timeout.stream_write = 1_min;
-
-  {
-    auto &downstreamconf = http2conf.downstream;
-
-    {
-      auto &timeoutconf = downstreamconf.timeout;
-      timeoutconf.settings = 10_s;
-    }
-
-    downstreamconf.window_size = 64_k - 1;
-    downstreamconf.connection_window_size = (1u << 31) - 1;
-    downstreamconf.max_concurrent_streams = 100;
-
-    downstreamconf.encoder_dynamic_table_size = 4_k;
-    downstreamconf.decoder_dynamic_table_size = 4_k;
-
-    nghttp2_option_new(&downstreamconf.option);
-    nghttp2_option_set_no_auto_window_update(downstreamconf.option, 1);
-    nghttp2_option_set_peer_max_concurrent_streams(downstreamconf.option, 100);
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        downstreamconf.option, downstreamconf.encoder_dynamic_table_size);
-  }
-
-  auto &loggingconf = config->logging;
-  {
-    auto &accessconf = loggingconf.access;
-    accessconf.format =
-        parse_log_format(config->balloc, DEFAULT_ACCESSLOG_FORMAT);
-
-    auto &errorconf = loggingconf.error;
-    errorconf.file = StringRef::from_lit("/dev/stderr");
-  }
-
-  loggingconf.syslog_facility = LOG_DAEMON;
-
-  auto &connconf = config->conn;
-  {
-    auto &listenerconf = connconf.listener;
-    {
-      // Default accept() backlog
-      listenerconf.backlog = 65536;
-      listenerconf.timeout.sleep = 30_s;
-    }
-  }
-
-  {
-    auto &upstreamconf = connconf.upstream;
-    {
-      auto &timeoutconf = upstreamconf.timeout;
-      // Read timeout for HTTP2 upstream connection
-      timeoutconf.http2_read = 3_min;
-
-      // Read timeout for non-HTTP2 upstream connection
-      timeoutconf.read = 1_min;
-
-      // Write timeout for HTTP2/non-HTTP2 upstream connection
-      timeoutconf.write = 30_s;
-
-      // Keep alive timeout for HTTP/1 upstream connection
-      timeoutconf.idle_read = 1_min;
-    }
-  }
-
-  {
-    connconf.downstream = std::make_shared<DownstreamConfig>();
-    auto &downstreamconf = *connconf.downstream;
-    {
-      auto &timeoutconf = downstreamconf.timeout;
-      // Read/Write timeouts for downstream connection
-      timeoutconf.read = 1_min;
-      timeoutconf.write = 30_s;
-      // Timeout for pooled (idle) connections
-      timeoutconf.idle_read = 2_s;
-      timeoutconf.connect = 30_s;
-      timeoutconf.max_backoff = 120_s;
-    }
-
-    downstreamconf.connections_per_host = 8;
-    downstreamconf.request_buffer_size = 16_k;
-    downstreamconf.response_buffer_size = 128_k;
-    downstreamconf.family = AF_UNSPEC;
-  }
-
-  auto &apiconf = config->api;
-  apiconf.max_request_body = 32_m;
-
-  auto &dnsconf = config->dns;
-  {
-    auto &timeoutconf = dnsconf.timeout;
-    timeoutconf.cache = 10_s;
-    timeoutconf.lookup = 5_s;
-  }
-  dnsconf.max_try = 2;
-}
-
-} // namespace
-
-namespace {
-void print_version(std::ostream &out) {
-  out << "nghttpx nghttp2/" NGHTTP2_VERSION << std::endl;
-}
-} // namespace
-
-namespace {
-void print_usage(std::ostream &out) {
-  out << R"(Usage: nghttpx [OPTIONS]... [<PRIVATE_KEY> <CERT>]
-A reverse proxy for HTTP/2, and HTTP/1.)"
-      << std::endl;
-}
-} // namespace
-
-namespace {
-void print_help(std::ostream &out) {
-  auto config = get_config();
-
-  print_usage(out);
-  out << R"(
-  <PRIVATE_KEY>
-              Set  path  to  server's private  key.   Required  unless
-              "no-tls" parameter is used in --frontend option.
-  <CERT>      Set  path  to  server's  certificate.   Required  unless
-              "no-tls"  parameter is  used in  --frontend option.   To
-              make OCSP stapling work, this must be an absolute path.
-
-Options:
-  The options are categorized into several groups.
-
-Connections:
-  -b, --backend=(<HOST>,<PORT>|unix:<PATH>)[;[<PATTERN>[:...]][[;<PARAM>]...]
-
-              Set  backend  host  and   port.   The  multiple  backend
-              addresses are  accepted by repeating this  option.  UNIX
-              domain socket  can be  specified by prefixing  path name
-              with "unix:" (e.g., unix:/var/run/backend.sock).
-
-              Optionally, if <PATTERN>s are given, the backend address
-              is  only  used  if  request matches  the  pattern.   The
-              pattern  matching is  closely  designed  to ServeMux  in
-              net/http package of  Go programming language.  <PATTERN>
-              consists of  path, host +  path or just host.   The path
-              must start  with "/".  If  it ends with "/",  it matches
-              all  request path  in  its subtree.   To  deal with  the
-              request  to the  directory without  trailing slash,  the
-              path which ends  with "/" also matches  the request path
-              which  only  lacks  trailing  '/'  (e.g.,  path  "/foo/"
-              matches request path  "/foo").  If it does  not end with
-              "/", it  performs exact match against  the request path.
-              If  host  is given,  it  performs  a match  against  the
-              request host.   For a  request received on  the frontend
-              listener with  "sni-fwd" parameter enabled, SNI  host is
-              used instead of a request host.  If host alone is given,
-              "/" is  appended to it,  so that it matches  all request
-              paths  under the  host  (e.g., specifying  "nghttp2.org"
-              equals  to "nghttp2.org/").   CONNECT method  is treated
-              specially.  It  does not have  path, and we  don't allow
-              empty path.  To workaround  this, we assume that CONNECT
-              method has "/" as path.
-
-              Patterns with  host take  precedence over  patterns with
-              just path.   Then, longer patterns take  precedence over
-              shorter ones.
-
-              Host  can  include "*"  in  the  left most  position  to
-              indicate  wildcard match  (only suffix  match is  done).
-              The "*" must match at least one character.  For example,
-              host    pattern    "*.nghttp2.org"    matches    against
-              "www.nghttp2.org"  and  "git.ngttp2.org", but  does  not
-              match  against  "nghttp2.org".   The exact  hosts  match
-              takes precedence over the wildcard hosts match.
-
-              If path  part ends with  "*", it is treated  as wildcard
-              path.  The  wildcard path  behaves differently  from the
-              normal path.  For normal path,  match is made around the
-              boundary of path component  separator,"/".  On the other
-              hand, the wildcard  path does not take  into account the
-              path component  separator.  All paths which  include the
-              wildcard  path  without  last  "*" as  prefix,  and  are
-              strictly longer than wildcard  path without last "*" are
-              matched.  "*"  must match  at least one  character.  For
-              example,  the   pattern  "/foo*"  matches   "/foo/"  and
-              "/foobar".  But it does not match "/foo", or "/fo".
-
-              If <PATTERN> is omitted or  empty string, "/" is used as
-              pattern,  which  matches  all request  paths  (catch-all
-              pattern).  The catch-all backend must be given.
-
-              When doing  a match, nghttpx made  some normalization to
-              pattern, request host and path.  For host part, they are
-              converted to lower case.  For path part, percent-encoded
-              unreserved characters  defined in RFC 3986  are decoded,
-              and any  dot-segments (".."  and ".")   are resolved and
-              removed.
-
-              For   example,   -b'127.0.0.1,8080;nghttp2.org/httpbin/'
-              matches the  request host "nghttp2.org" and  the request
-              path "/httpbin/get", but does not match the request host
-              "nghttp2.org" and the request path "/index.html".
-
-              The  multiple <PATTERN>s  can  be specified,  delimiting
-              them            by           ":".             Specifying
-              -b'127.0.0.1,8080;nghttp2.org:www.nghttp2.org'  has  the
-              same  effect  to specify  -b'127.0.0.1,8080;nghttp2.org'
-              and -b'127.0.0.1,8080;www.nghttp2.org'.
-
-              The backend addresses sharing same <PATTERN> are grouped
-              together forming  load balancing  group.
-
-              Several parameters <PARAM> are accepted after <PATTERN>.
-              The  parameters are  delimited  by  ";".  The  available
-              parameters       are:      "proto=<PROTO>",       "tls",
-              "sni=<SNI_HOST>",         "fall=<N>",        "rise=<N>",
-              "affinity=<METHOD>",    "dns",    "redirect-if-not-tls",
-              "upgrade-scheme",  and  "mruby=<PATH>".   The  parameter
-              consists of keyword, and  optionally followed by "=" and
-              value.  For  example, the parameter  "proto=h2" consists
-              of the  keyword "proto"  and value "h2".   The parameter
-              "tls" consists of the keyword "tls" without value.  Each
-              parameter is described as follows.
-
-              The backend application protocol  can be specified using
-              optional  "proto"   parameter,  and   in  the   form  of
-              "proto=<PROTO>".  <PROTO> should be one of the following
-              list  without  quotes:  "h2", "http/1.1".   The  default
-              value of <PROTO> is  "http/1.1".  Note that usually "h2"
-              refers to HTTP/2  over TLS.  But in this  option, it may
-              mean HTTP/2  over cleartext TCP unless  "tls" keyword is
-              used (see below).
-
-              TLS  can   be  enabled  by  specifying   optional  "tls"
-              parameter.  TLS is not enabled by default.
-
-              With "sni=<SNI_HOST>" parameter, it can override the TLS
-              SNI  field  value  with  given  <SNI_HOST>.   This  will
-              default to the backend <HOST> name
-
-              The  feature  to detect  whether  backend  is online  or
-              offline can be enabled  using optional "fall" and "rise"
-              parameters.   Using  "fall=<N>"  parameter,  if  nghttpx
-              cannot connect  to a  this backend <N>  times in  a row,
-              this  backend  is  assumed  to be  offline,  and  it  is
-              excluded from load balancing.  If <N> is 0, this backend
-              never  be excluded  from load  balancing whatever  times
-              nghttpx cannot connect  to it, and this  is the default.
-              There is  also "rise=<N>" parameter.  After  backend was
-              excluded from load balancing group, nghttpx periodically
-              attempts to make a connection to the failed backend, and
-              if the  connection is made  successfully <N> times  in a
-              row, the backend is assumed to  be online, and it is now
-              eligible  for load  balancing target.   If <N>  is 0,  a
-              backend  is permanently  offline, once  it goes  in that
-              state, and this is the default behaviour.
-
-              The     session     affinity    is     enabled     using
-              "affinity=<METHOD>"  parameter.   If  "ip" is  given  in
-              <METHOD>, client  IP based session affinity  is enabled.
-              If "cookie"  is given in <METHOD>,  cookie based session
-              affinity is  enabled.  If  "none" is given  in <METHOD>,
-              session affinity  is disabled, and this  is the default.
-              The session  affinity is  enabled per <PATTERN>.   If at
-              least  one backend  has  "affinity"  parameter, and  its
-              <METHOD> is not "none",  session affinity is enabled for
-              all backend  servers sharing the same  <PATTERN>.  It is
-              advised  to  set  "affinity" parameter  to  all  backend
-              explicitly if session affinity  is desired.  The session
-              affinity  may   break  if   one  of  the   backend  gets
-              unreachable,  or   backend  settings  are   reloaded  or
-              replaced by API.
-
-              If   "affinity=cookie"    is   used,    the   additional
-              configuration                is                required.
-              "affinity-cookie-name=<NAME>" must be  used to specify a
-              name     of     cookie      to     use.      Optionally,
-              "affinity-cookie-path=<PATH>" can  be used to  specify a
-              path   which   cookie    is   applied.    The   optional
-              "affinity-cookie-secure=<SECURE>"  controls  the  Secure
-              attribute of a cookie.  The default value is "auto", and
-              the Secure attribute is  determined by a request scheme.
-              If a request scheme is "https", then Secure attribute is
-              set.  Otherwise, it  is not set.  If  <SECURE> is "yes",
-              the  Secure attribute  is  always set.   If <SECURE>  is
-              "no", the Secure attribute is always omitted.
-
-              By default, name resolution of backend host name is done
-              at  start  up,  or reloading  configuration.   If  "dns"
-              parameter   is  given,   name  resolution   takes  place
-              dynamically.  This is useful  if backend address changes
-              frequently.   If  "dns"  is given,  name  resolution  of
-              backend   host   name   at  start   up,   or   reloading
-              configuration is skipped.
-
-              If "redirect-if-not-tls" parameter  is used, the matched
-              backend  requires   that  frontend  connection   is  TLS
-              encrypted.  If it isn't, nghttpx responds to the request
-              with 308  status code, and  https URI the  client should
-              use instead  is included in Location  header field.  The
-              port number in  redirect URI is 443 by  default, and can
-              be  changed using  --redirect-https-port option.   If at
-              least one  backend has  "redirect-if-not-tls" parameter,
-              this feature is enabled  for all backend servers sharing
-              the   same   <PATTERN>.    It    is   advised   to   set
-              "redirect-if-no-tls"    parameter   to    all   backends
-              explicitly if this feature is desired.
-
-              If "upgrade-scheme"  parameter is used along  with "tls"
-              parameter, HTTP/2 :scheme pseudo header field is changed
-              to "https" from "http" when forwarding a request to this
-              particular backend.  This is  a workaround for a backend
-              server  which  requires  "https" :scheme  pseudo  header
-              field on TLS encrypted connection.
-
-              "mruby=<PATH>"  parameter  specifies  a  path  to  mruby
-              script  file  which  is  invoked when  this  pattern  is
-              matched.  All backends which share the same pattern must
-              have the same mruby path.
-
-              Since ";" and ":" are  used as delimiter, <PATTERN> must
-              not  contain these  characters.  Since  ";" has  special
-              meaning in shell, the option value must be quoted.
-
-              Default: )"
-      << DEFAULT_DOWNSTREAM_HOST << "," << DEFAULT_DOWNSTREAM_PORT << R"(
-  -f, --frontend=(<HOST>,<PORT>|unix:<PATH>)[[;<PARAM>]...]
-              Set  frontend  host and  port.   If  <HOST> is  '*',  it
-              assumes  all addresses  including  both  IPv4 and  IPv6.
-              UNIX domain  socket can  be specified by  prefixing path
-              name  with  "unix:" (e.g.,  unix:/var/run/nghttpx.sock).
-              This  option can  be used  multiple times  to listen  to
-              multiple addresses.
-
-              This option  can take  0 or  more parameters,  which are
-              described  below.   Note   that  "api"  and  "healthmon"
-              parameters are mutually exclusive.
-
-              Optionally, TLS  can be disabled by  specifying "no-tls"
-              parameter.  TLS is enabled by default.
-
-              If "sni-fwd" parameter is  used, when performing a match
-              to select a backend server,  SNI host name received from
-              the client  is used  instead of  the request  host.  See
-              --backend option about the pattern match.
-
-              To  make this  frontend as  API endpoint,  specify "api"
-              parameter.   This   is  disabled  by  default.    It  is
-              important  to  limit the  access  to  the API  frontend.
-              Otherwise, someone  may change  the backend  server, and
-              break your services,  or expose confidential information
-              to the outside the world.
-
-              To  make  this  frontend  as  health  monitor  endpoint,
-              specify  "healthmon"  parameter.   This is  disabled  by
-              default.  Any  requests which come through  this address
-              are replied with 200 HTTP status, without no body.
-
-              To  accept   PROXY  protocol   version  1   on  frontend
-              connection,  specify  "proxyproto" parameter.   This  is
-              disabled by default.
-
-              Default: *,3000
-  --backlog=<N>
-              Set listen backlog size.
-              Default: )"
-      << config->conn.listener.backlog << R"(
-  --backend-address-family=(auto|IPv4|IPv6)
-              Specify  address  family  of  backend  connections.   If
-              "auto" is given, both IPv4  and IPv6 are considered.  If
-              "IPv4" is  given, only  IPv4 address is  considered.  If
-              "IPv6" is given, only IPv6 address is considered.
-              Default: auto
-  --backend-http-proxy-uri=<URI>
-              Specify      proxy       URI      in       the      form
-              http://[<USER>:<PASS>@]<PROXY>:<PORT>.    If   a   proxy
-              requires  authentication,  specify  <USER>  and  <PASS>.
-              Note that  they must be properly  percent-encoded.  This
-              proxy  is used  when the  backend connection  is HTTP/2.
-              First,  make  a CONNECT  request  to  the proxy  and  it
-              connects  to the  backend  on behalf  of nghttpx.   This
-              forms  tunnel.   After  that, nghttpx  performs  SSL/TLS
-              handshake with  the downstream through the  tunnel.  The
-              timeouts when connecting and  making CONNECT request can
-              be     specified    by     --backend-read-timeout    and
-              --backend-write-timeout options.
-
-Performance:
-  -n, --workers=<N>
-              Set the number of worker threads.
-              Default: )"
-      << config->num_worker << R"(
-  --single-thread
-              Run everything in one  thread inside the worker process.
-              This   feature   is   provided  for   better   debugging
-              experience,  or  for  the platforms  which  lack  thread
-              support.   If  threading  is disabled,  this  option  is
-              always enabled.
-  --read-rate=<SIZE>
-              Set maximum  average read  rate on  frontend connection.
-              Setting 0 to this option means read rate is unlimited.
-              Default: )"
-      << config->conn.upstream.ratelimit.read.rate << R"(
-  --read-burst=<SIZE>
-              Set  maximum read  burst  size  on frontend  connection.
-              Setting  0  to this  option  means  read burst  size  is
-              unlimited.
-              Default: )"
-      << config->conn.upstream.ratelimit.read.burst << R"(
-  --write-rate=<SIZE>
-              Set maximum  average write rate on  frontend connection.
-              Setting 0 to this option means write rate is unlimited.
-              Default: )"
-      << config->conn.upstream.ratelimit.write.rate << R"(
-  --write-burst=<SIZE>
-              Set  maximum write  burst size  on frontend  connection.
-              Setting  0 to  this  option means  write  burst size  is
-              unlimited.
-              Default: )"
-      << config->conn.upstream.ratelimit.write.burst << R"(
-  --worker-read-rate=<SIZE>
-              Set maximum average read rate on frontend connection per
-              worker.  Setting  0 to  this option  means read  rate is
-              unlimited.  Not implemented yet.
-              Default: 0
-  --worker-read-burst=<SIZE>
-              Set maximum  read burst size on  frontend connection per
-              worker.  Setting 0 to this  option means read burst size
-              is unlimited.  Not implemented yet.
-              Default: 0
-  --worker-write-rate=<SIZE>
-              Set maximum  average write  rate on  frontend connection
-              per worker.  Setting  0 to this option  means write rate
-              is unlimited.  Not implemented yet.
-              Default: 0
-  --worker-write-burst=<SIZE>
-              Set maximum write burst  size on frontend connection per
-              worker.  Setting 0 to this option means write burst size
-              is unlimited.  Not implemented yet.
-              Default: 0
-  --worker-frontend-connections=<N>
-              Set maximum number  of simultaneous connections frontend
-              accepts.  Setting 0 means unlimited.
-              Default: )"
-      << config->conn.upstream.worker_connections << R"(
-  --backend-connections-per-host=<N>
-              Set  maximum number  of  backend concurrent  connections
-              (and/or  streams in  case  of HTTP/2)  per origin  host.
-              This option  is meaningful when --http2-proxy  option is
-              used.   The  origin  host  is  determined  by  authority
-              portion of  request URI (or :authority  header field for
-              HTTP/2).   To  limit  the   number  of  connections  per
-              frontend        for       default        mode,       use
-              --backend-connections-per-frontend.
-              Default: )"
-      << config->conn.downstream->connections_per_host << R"(
-  --backend-connections-per-frontend=<N>
-              Set  maximum number  of  backend concurrent  connections
-              (and/or streams  in case of HTTP/2)  per frontend.  This
-              option  is   only  used  for  default   mode.   0  means
-              unlimited.  To limit the  number of connections per host
-              with          --http2-proxy         option,          use
-              --backend-connections-per-host.
-              Default: )"
-      << config->conn.downstream->connections_per_frontend << R"(
-  --rlimit-nofile=<N>
-              Set maximum number of open files (RLIMIT_NOFILE) to <N>.
-              If 0 is given, nghttpx does not set the limit.
-              Default: )"
-      << config->rlimit_nofile << R"(
-  --backend-request-buffer=<SIZE>
-              Set buffer size used to store backend request.
-              Default: )"
-      << util::utos_unit(config->conn.downstream->request_buffer_size) << R"(
-  --backend-response-buffer=<SIZE>
-              Set buffer size used to store backend response.
-              Default: )"
-      << util::utos_unit(config->conn.downstream->response_buffer_size) << R"(
-  --fastopen=<N>
-              Enables  "TCP Fast  Open" for  the listening  socket and
-              limits the  maximum length for the  queue of connections
-              that have not yet completed the three-way handshake.  If
-              value is 0 then fast open is disabled.
-              Default: )"
-      << config->conn.listener.fastopen << R"(
-  --no-kqueue Don't use  kqueue.  This  option is only  applicable for
-              the platforms  which have kqueue.  For  other platforms,
-              this option will be simply ignored.
-
-Timeout:
-  --frontend-http2-read-timeout=<DURATION>
-              Specify read timeout for HTTP/2 frontend connection.
-              Default: )"
-      << util::duration_str(config->conn.upstream.timeout.http2_read) << R"(
-  --frontend-read-timeout=<DURATION>
-              Specify read timeout for HTTP/1.1 frontend connection.
-              Default: )"
-      << util::duration_str(config->conn.upstream.timeout.read) << R"(
-  --frontend-write-timeout=<DURATION>
-              Specify write timeout for all frontend connections.
-              Default: )"
-      << util::duration_str(config->conn.upstream.timeout.write) << R"(
-  --frontend-keep-alive-timeout=<DURATION>
-              Specify   keep-alive   timeout   for   frontend   HTTP/1
-              connection.
-              Default: )"
-      << util::duration_str(config->conn.upstream.timeout.idle_read) << R"(
-  --stream-read-timeout=<DURATION>
-              Specify  read timeout  for HTTP/2  streams.  0  means no
-              timeout.
-              Default: )"
-      << util::duration_str(config->http2.timeout.stream_read) << R"(
-  --stream-write-timeout=<DURATION>
-              Specify write  timeout for  HTTP/2 streams.  0  means no
-              timeout.
-              Default: )"
-      << util::duration_str(config->http2.timeout.stream_write) << R"(
-  --backend-read-timeout=<DURATION>
-              Specify read timeout for backend connection.
-              Default: )"
-      << util::duration_str(config->conn.downstream->timeout.read) << R"(
-  --backend-write-timeout=<DURATION>
-              Specify write timeout for backend connection.
-              Default: )"
-      << util::duration_str(config->conn.downstream->timeout.write) << R"(
-  --backend-connect-timeout=<DURATION>
-              Specify  timeout before  establishing TCP  connection to
-              backend.
-              Default: )"
-      << util::duration_str(config->conn.downstream->timeout.connect) << R"(
-  --backend-keep-alive-timeout=<DURATION>
-              Specify   keep-alive   timeout    for   backend   HTTP/1
-              connection.
-              Default: )"
-      << util::duration_str(config->conn.downstream->timeout.idle_read) << R"(
-  --listener-disable-timeout=<DURATION>
-              After accepting  connection failed,  connection listener
-              is disabled  for a given  amount of time.   Specifying 0
-              disables this feature.
-              Default: )"
-      << util::duration_str(config->conn.listener.timeout.sleep) << R"(
-  --frontend-http2-setting-timeout=<DURATION>
-              Specify  timeout before  SETTINGS ACK  is received  from
-              client.
-              Default: )"
-      << util::duration_str(config->http2.upstream.timeout.settings) << R"(
-  --backend-http2-settings-timeout=<DURATION>
-              Specify  timeout before  SETTINGS ACK  is received  from
-              backend server.
-              Default: )"
-      << util::duration_str(config->http2.downstream.timeout.settings) << R"(
-  --backend-max-backoff=<DURATION>
-              Specify  maximum backoff  interval.  This  is used  when
-              doing health  check against offline backend  (see "fail"
-              parameter  in --backend  option).   It is  also used  to
-              limit  the  maximum   interval  to  temporarily  disable
-              backend  when nghttpx  failed to  connect to  it.  These
-              intervals are calculated  using exponential backoff, and
-              consecutive failed attempts increase the interval.  This
-              option caps its maximum value.
-              Default: )"
-      << util::duration_str(config->conn.downstream->timeout.max_backoff) << R"(
-
-SSL/TLS:
-  --ciphers=<SUITE>
-              Set allowed  cipher list  for frontend  connection.  The
-              format of the string is described in OpenSSL ciphers(1).
-              This option  sets cipher suites for  TLSv1.2 or earlier.
-              Use --tls13-ciphers for TLSv1.3.
-              Default: )"
-      << config->tls.ciphers << R"(
-  --tls13-ciphers=<SUITE>
-              Set allowed  cipher list  for frontend  connection.  The
-              format of the string is described in OpenSSL ciphers(1).
-              This  option  sets  cipher   suites  for  TLSv1.3.   Use
-              --ciphers for TLSv1.2 or earlier.
-              Default: )"
-      << config->tls.tls13_ciphers << R"(
-  --client-ciphers=<SUITE>
-              Set  allowed cipher  list for  backend connection.   The
-              format of the string is described in OpenSSL ciphers(1).
-              This option  sets cipher suites for  TLSv1.2 or earlier.
-              Use --tls13-client-ciphers for TLSv1.3.
-              Default: )"
-      << config->tls.client.ciphers << R"(
-  --tls13-client-ciphers=<SUITE>
-              Set  allowed cipher  list for  backend connection.   The
-              format of the string is described in OpenSSL ciphers(1).
-              This  option  sets  cipher   suites  for  TLSv1.3.   Use
-              --tls13-client-ciphers for TLSv1.2 or earlier.
-              Default: )"
-      << config->tls.client.tls13_ciphers << R"(
-  --ecdh-curves=<LIST>
-              Set  supported  curve  list  for  frontend  connections.
-              <LIST> is a  colon separated list of curve  NID or names
-              in the preference order.  The supported curves depend on
-              the  linked  OpenSSL  library.  This  function  requires
-              OpenSSL >= 1.0.2.
-              Default: )"
-      << config->tls.ecdh_curves << R"(
-  -k, --insecure
-              Don't  verify backend  server's  certificate  if TLS  is
-              enabled for backend connections.
-  --cacert=<PATH>
-              Set path to trusted CA  certificate file.  It is used in
-              backend  TLS connections  to verify  peer's certificate.
-              It is also used to  verify OCSP response from the script
-              set by --fetch-ocsp-response-file.  The  file must be in
-              PEM format.   It can contain multiple  certificates.  If
-              the  linked OpenSSL  is configured  to load  system wide
-              certificates, they  are loaded at startup  regardless of
-              this option.
-  --private-key-passwd-file=<PATH>
-              Path  to file  that contains  password for  the server's
-              private key.   If none is  given and the private  key is
-              password protected it'll be requested interactively.
-  --subcert=<KEYPATH>:<CERTPATH>[[;<PARAM>]...]
-              Specify  additional certificate  and  private key  file.
-              nghttpx will  choose certificates based on  the hostname
-              indicated by client using TLS SNI extension.  If nghttpx
-              is  built with  OpenSSL  >= 1.0.2,  the shared  elliptic
-              curves (e.g., P-256) between  client and server are also
-              taken into  consideration.  This allows nghttpx  to send
-              ECDSA certificate  to modern clients, while  sending RSA
-              based certificate to older  clients.  This option can be
-              used  multiple  times.   To  make  OCSP  stapling  work,
-              <CERTPATH> must be absolute path.
-
-              Additional parameter  can be specified in  <PARAM>.  The
-              available <PARAM> is "sct-dir=<DIR>".
-
-              "sct-dir=<DIR>"  specifies the  path to  directory which
-              contains        *.sct        files        for        TLS
-              signed_certificate_timestamp extension (RFC 6962).  This
-              feature   requires   OpenSSL   >=   1.0.2.    See   also
-              --tls-sct-dir option.
-  --dh-param-file=<PATH>
-              Path to file that contains  DH parameters in PEM format.
-              Without  this   option,  DHE   cipher  suites   are  not
-              available.
-  --npn-list=<LIST>
-              Comma delimited list of  ALPN protocol identifier sorted
-              in the  order of preference.  That  means most desirable
-              protocol comes  first.  This  is used  in both  ALPN and
-              NPN.  The parameter must be  delimited by a single comma
-              only  and any  white spaces  are  treated as  a part  of
-              protocol string.
-              Default: )"
-      << DEFAULT_NPN_LIST
-      << R"(
-  --verify-client
-              Require and verify client certificate.
-  --verify-client-cacert=<PATH>
-              Path  to file  that contains  CA certificates  to verify
-              client certificate.  The file must be in PEM format.  It
-              can contain multiple certificates.
-  --verify-client-tolerate-expired
-              Accept  expired  client  certificate.   Operator  should
-              handle  the expired  client  certificate  by some  means
-              (e.g.,  mruby  script).   Otherwise, this  option  might
-              cause a security risk.
-  --client-private-key-file=<PATH>
-              Path to  file that contains  client private key  used in
-              backend client authentication.
-  --client-cert-file=<PATH>
-              Path to  file that  contains client certificate  used in
-              backend client authentication.
-  --tls-min-proto-version=<VER>
-              Specify minimum SSL/TLS protocol.   The name matching is
-              done in  case-insensitive manner.  The  versions between
-              --tls-min-proto-version and  --tls-max-proto-version are
-              enabled.  If the protocol list advertised by client does
-              not  overlap  this range,  you  will  receive the  error
-              message "unknown protocol".  If a protocol version lower
-              than TLSv1.2 is specified, make sure that the compatible
-              ciphers are  included in --ciphers option.   The default
-              cipher  list  only   includes  ciphers  compatible  with
-              TLSv1.2 or above.  The available versions are:
-              )"
-#ifdef TLS1_3_VERSION
-         "TLSv1.3, "
-#endif // TLS1_3_VERSION
-         "TLSv1.2, TLSv1.1, and TLSv1.0"
-         R"(
-              Default: )"
-      << DEFAULT_TLS_MIN_PROTO_VERSION
-      << R"(
-  --tls-max-proto-version=<VER>
-              Specify maximum SSL/TLS protocol.   The name matching is
-              done in  case-insensitive manner.  The  versions between
-              --tls-min-proto-version and  --tls-max-proto-version are
-              enabled.  If the protocol list advertised by client does
-              not  overlap  this range,  you  will  receive the  error
-              message "unknown protocol".  The available versions are:
-              )"
-#ifdef TLS1_3_VERSION
-         "TLSv1.3, "
-#endif // TLS1_3_VERSION
-         "TLSv1.2, TLSv1.1, and TLSv1.0"
-         R"(
-              Default: )"
-      << DEFAULT_TLS_MAX_PROTO_VERSION << R"(
-  --tls-ticket-key-file=<PATH>
-              Path to file that contains  random data to construct TLS
-              session ticket  parameters.  If aes-128-cbc is  given in
-              --tls-ticket-key-cipher, the  file must  contain exactly
-              48    bytes.     If     aes-256-cbc    is    given    in
-              --tls-ticket-key-cipher, the  file must  contain exactly
-              80  bytes.   This  options  can be  used  repeatedly  to
-              specify  multiple ticket  parameters.  If  several files
-              are given,  only the  first key is  used to  encrypt TLS
-              session  tickets.  Other  keys are  accepted but  server
-              will  issue new  session  ticket with  first key.   This
-              allows  session  key  rotation.  Please  note  that  key
-              rotation  does  not  occur automatically.   User  should
-              rearrange  files or  change options  values and  restart
-              nghttpx gracefully.   If opening  or reading  given file
-              fails, all loaded  keys are discarded and  it is treated
-              as if none  of this option is given.  If  this option is
-              not given or an error  occurred while opening or reading
-              a file,  key is  generated every  1 hour  internally and
-              they are  valid for  12 hours.   This is  recommended if
-              ticket  key sharing  between  nghttpx  instances is  not
-              required.
-  --tls-ticket-key-memcached=<HOST>,<PORT>[;tls]
-              Specify address  of memcached  server to get  TLS ticket
-              keys for  session resumption.   This enables  shared TLS
-              ticket key between  multiple nghttpx instances.  nghttpx
-              does not set TLS ticket  key to memcached.  The external
-              ticket key generator is required.  nghttpx just gets TLS
-              ticket  keys  from  memcached, and  use  them,  possibly
-              replacing current set  of keys.  It is up  to extern TLS
-              ticket  key generator  to rotate  keys frequently.   See
-              "TLS SESSION  TICKET RESUMPTION" section in  manual page
-              to know the data format in memcached entry.  Optionally,
-              memcached  connection  can  be  encrypted  with  TLS  by
-              specifying "tls" parameter.
-  --tls-ticket-key-memcached-address-family=(auto|IPv4|IPv6)
-              Specify address  family of memcached connections  to get
-              TLS ticket keys.  If "auto" is given, both IPv4 and IPv6
-              are considered.   If "IPv4" is given,  only IPv4 address
-              is considered.  If "IPv6" is given, only IPv6 address is
-              considered.
-              Default: auto
-  --tls-ticket-key-memcached-interval=<DURATION>
-              Set interval to get TLS ticket keys from memcached.
-              Default: )"
-      << util::duration_str(config->tls.ticket.memcached.interval) << R"(
-  --tls-ticket-key-memcached-max-retry=<N>
-              Set  maximum   number  of  consecutive   retries  before
-              abandoning TLS ticket key  retrieval.  If this number is
-              reached,  the  attempt  is considered  as  failure,  and
-              "failure" count  is incremented by 1,  which contributed
-              to            the            value            controlled
-              --tls-ticket-key-memcached-max-fail option.
-              Default: )"
-      << config->tls.ticket.memcached.max_retry << R"(
-  --tls-ticket-key-memcached-max-fail=<N>
-              Set  maximum   number  of  consecutive   failure  before
-              disabling TLS ticket until next scheduled key retrieval.
-              Default: )"
-      << config->tls.ticket.memcached.max_fail << R"(
-  --tls-ticket-key-cipher=<CIPHER>
-              Specify cipher  to encrypt TLS session  ticket.  Specify
-              either   aes-128-cbc   or  aes-256-cbc.    By   default,
-              aes-128-cbc is used.
-  --tls-ticket-key-memcached-cert-file=<PATH>
-              Path to client certificate  for memcached connections to
-              get TLS ticket keys.
-  --tls-ticket-key-memcached-private-key-file=<PATH>
-              Path to client private  key for memcached connections to
-              get TLS ticket keys.
-  --fetch-ocsp-response-file=<PATH>
-              Path to  fetch-ocsp-response script file.  It  should be
-              absolute path.
-              Default: )"
-      << config->tls.ocsp.fetch_ocsp_response_file << R"(
-  --ocsp-update-interval=<DURATION>
-              Set interval to update OCSP response cache.
-              Default: )"
-      << util::duration_str(config->tls.ocsp.update_interval) << R"(
-  --ocsp-startup
-              Start  accepting connections  after initial  attempts to
-              get OCSP responses  finish.  It does not  matter some of
-              the  attempts  fail.  This  feature  is  useful if  OCSP
-              responses   must    be   available    before   accepting
-              connections.
-  --no-verify-ocsp
-              nghttpx does not verify OCSP response.
-  --no-ocsp   Disable OCSP stapling.
-  --tls-session-cache-memcached=<HOST>,<PORT>[;tls]
-              Specify  address of  memcached server  to store  session
-              cache.   This  enables   shared  session  cache  between
-              multiple   nghttpx  instances.    Optionally,  memcached
-              connection can be encrypted with TLS by specifying "tls"
-              parameter.
-  --tls-session-cache-memcached-address-family=(auto|IPv4|IPv6)
-              Specify address family of memcached connections to store
-              session cache.  If  "auto" is given, both  IPv4 and IPv6
-              are considered.   If "IPv4" is given,  only IPv4 address
-              is considered.  If "IPv6" is given, only IPv6 address is
-              considered.
-              Default: auto
-  --tls-session-cache-memcached-cert-file=<PATH>
-              Path to client certificate  for memcached connections to
-              store session cache.
-  --tls-session-cache-memcached-private-key-file=<PATH>
-              Path to client private  key for memcached connections to
-              store session cache.
-  --tls-dyn-rec-warmup-threshold=<SIZE>
-              Specify the  threshold size for TLS  dynamic record size
-              behaviour.  During  a TLS  session, after  the threshold
-              number of bytes  have been written, the  TLS record size
-              will be increased to the maximum allowed (16K).  The max
-              record size will  continue to be used on  the active TLS
-              session.  After  --tls-dyn-rec-idle-timeout has elapsed,
-              the record size is reduced  to 1300 bytes.  Specify 0 to
-              always use  the maximum record size,  regardless of idle
-              period.   This  behaviour  applies   to  all  TLS  based
-              frontends, and TLS HTTP/2 backends.
-              Default: )"
-      << util::utos_unit(config->tls.dyn_rec.warmup_threshold) << R"(
-  --tls-dyn-rec-idle-timeout=<DURATION>
-              Specify TLS dynamic record  size behaviour timeout.  See
-              --tls-dyn-rec-warmup-threshold  for   more  information.
-              This behaviour  applies to all TLS  based frontends, and
-              TLS HTTP/2 backends.
-              Default: )"
-      << util::duration_str(config->tls.dyn_rec.idle_timeout) << R"(
-  --no-http2-cipher-black-list
-              Allow  black  listed  cipher suite  on  frontend  HTTP/2
-              connection.                                          See
-              https://tools.ietf.org/html/rfc7540#appendix-A  for  the
-              complete HTTP/2 cipher suites black list.
-  --client-no-http2-cipher-black-list
-              Allow  black  listed  cipher  suite  on  backend  HTTP/2
-              connection.                                          See
-              https://tools.ietf.org/html/rfc7540#appendix-A  for  the
-              complete HTTP/2 cipher suites black list.
-  --tls-sct-dir=<DIR>
-              Specifies the  directory where  *.sct files  exist.  All
-              *.sct   files   in  <DIR>   are   read,   and  sent   as
-              extension_data of  TLS signed_certificate_timestamp (RFC
-              6962)  to  client.   These   *.sct  files  are  for  the
-              certificate   specified   in   positional   command-line
-              argument <CERT>, or  certificate option in configuration
-              file.   For   additional  certificates,   use  --subcert
-              option.  This option requires OpenSSL >= 1.0.2.
-  --psk-secrets=<PATH>
-              Read list of PSK identity and secrets from <PATH>.  This
-              is used for frontend connection.  The each line of input
-              file  is  formatted  as  <identity>:<hex-secret>,  where
-              <identity> is  PSK identity, and <hex-secret>  is secret
-              in hex.  An  empty line, and line which  starts with '#'
-              are skipped.  The default  enabled cipher list might not
-              contain any PSK cipher suite.  In that case, desired PSK
-              cipher suites  must be  enabled using  --ciphers option.
-              The  desired PSK  cipher suite  may be  black listed  by
-              HTTP/2.   To  use  those   cipher  suites  with  HTTP/2,
-              consider  to  use  --no-http2-cipher-black-list  option.
-              But be aware its implications.
-  --client-psk-secrets=<PATH>
-              Read PSK identity and secrets from <PATH>.  This is used
-              for backend connection.  The each  line of input file is
-              formatted  as <identity>:<hex-secret>,  where <identity>
-              is PSK identity, and <hex-secret>  is secret in hex.  An
-              empty line, and line which  starts with '#' are skipped.
-              The first identity and  secret pair encountered is used.
-              The default  enabled cipher  list might not  contain any
-              PSK  cipher suite.   In  that case,  desired PSK  cipher
-              suites  must be  enabled using  --client-ciphers option.
-              The  desired PSK  cipher suite  may be  black listed  by
-              HTTP/2.   To  use  those   cipher  suites  with  HTTP/2,
-              consider   to  use   --client-no-http2-cipher-black-list
-              option.  But be aware its implications.
-  --tls-no-postpone-early-data
-              By default,  nghttpx postpones forwarding  HTTP requests
-              sent in early data, including those sent in partially in
-              it, until TLS handshake finishes.  If all backend server
-              recognizes "Early-Data" header  field, using this option
-              makes nghttpx  not postpone  forwarding request  and get
-              full potential of 0-RTT data.
-  --tls-max-early-data=<SIZE>
-              Sets  the  maximum  amount  of 0-RTT  data  that  server
-              accepts.
-              Default: )"
-      << util::utos_unit(config->tls.max_early_data) << R"(
-
-HTTP/2:
-  -c, --frontend-http2-max-concurrent-streams=<N>
-              Set the maximum number of  the concurrent streams in one
-              frontend HTTP/2 session.
-              Default: )"
-      << config->http2.upstream.max_concurrent_streams << R"(
-  --backend-http2-max-concurrent-streams=<N>
-              Set the maximum number of  the concurrent streams in one
-              backend  HTTP/2 session.   This sets  maximum number  of
-              concurrent opened pushed streams.  The maximum number of
-              concurrent requests are set by a remote server.
-              Default: )"
-      << config->http2.downstream.max_concurrent_streams << R"(
-  --frontend-http2-window-size=<SIZE>
-              Sets  the  per-stream  initial  window  size  of  HTTP/2
-              frontend connection.
-              Default: )"
-      << config->http2.upstream.window_size << R"(
-  --frontend-http2-connection-window-size=<SIZE>
-              Sets the  per-connection window size of  HTTP/2 frontend
-              connection.
-              Default: )"
-      << config->http2.upstream.connection_window_size << R"(
-  --backend-http2-window-size=<SIZE>
-              Sets  the   initial  window   size  of   HTTP/2  backend
-              connection.
-              Default: )"
-      << config->http2.downstream.window_size << R"(
-  --backend-http2-connection-window-size=<SIZE>
-              Sets the  per-connection window  size of  HTTP/2 backend
-              connection.
-              Default: )"
-      << config->http2.downstream.connection_window_size << R"(
-  --http2-no-cookie-crumbling
-              Don't crumble cookie header field.
-  --padding=<N>
-              Add  at most  <N> bytes  to  a HTTP/2  frame payload  as
-              padding.  Specify 0 to  disable padding.  This option is
-              meant for debugging purpose  and not intended to enhance
-              protocol security.
-  --no-server-push
-              Disable HTTP/2 server push.  Server push is supported by
-              default mode and HTTP/2  frontend via Link header field.
-              It is  also supported if  both frontend and  backend are
-              HTTP/2 in default mode.  In  this case, server push from
-              backend session is relayed  to frontend, and server push
-              via Link header field is also supported.
-  --frontend-http2-optimize-write-buffer-size
-              (Experimental) Enable write  buffer size optimization in
-              frontend HTTP/2 TLS  connection.  This optimization aims
-              to reduce  write buffer  size so  that it  only contains
-              bytes  which can  send immediately.   This makes  server
-              more responsive to prioritized HTTP/2 stream because the
-              buffering  of lower  priority stream  is reduced.   This
-              option is only effective on recent Linux platform.
-  --frontend-http2-optimize-window-size
-              (Experimental)   Automatically  tune   connection  level
-              window size of frontend  HTTP/2 TLS connection.  If this
-              feature is  enabled, connection window size  starts with
-              the   default  window   size,   65535  bytes.    nghttpx
-              automatically  adjusts connection  window size  based on
-              TCP receiving  window size.  The maximum  window size is
-              capped      by      the     value      specified      by
-              --frontend-http2-connection-window-size.     Since   the
-              stream is subject to stream level window size, it should
-              be adjusted using --frontend-http2-window-size option as
-              well.   This option  is only  effective on  recent Linux
-              platform.
-  --frontend-http2-encoder-dynamic-table-size=<SIZE>
-              Specify the maximum dynamic  table size of HPACK encoder
-              in the frontend HTTP/2 connection.  The decoder (client)
-              specifies  the maximum  dynamic table  size it  accepts.
-              Then the negotiated dynamic table size is the minimum of
-              this option value and the value which client specified.
-              Default: )"
-      << util::utos_unit(config->http2.upstream.encoder_dynamic_table_size)
-      << R"(
-  --frontend-http2-decoder-dynamic-table-size=<SIZE>
-              Specify the maximum dynamic  table size of HPACK decoder
-              in the frontend HTTP/2 connection.
-              Default: )"
-      << util::utos_unit(config->http2.upstream.decoder_dynamic_table_size)
-      << R"(
-  --backend-http2-encoder-dynamic-table-size=<SIZE>
-              Specify the maximum dynamic  table size of HPACK encoder
-              in the backend HTTP/2 connection.  The decoder (backend)
-              specifies  the maximum  dynamic table  size it  accepts.
-              Then the negotiated dynamic table size is the minimum of
-              this option value and the value which backend specified.
-              Default: )"
-      << util::utos_unit(config->http2.downstream.encoder_dynamic_table_size)
-      << R"(
-  --backend-http2-decoder-dynamic-table-size=<SIZE>
-              Specify the maximum dynamic  table size of HPACK decoder
-              in the backend HTTP/2 connection.
-              Default: )"
-      << util::utos_unit(config->http2.downstream.decoder_dynamic_table_size)
-      << R"(
-
-Mode:
-  (default mode)
-              Accept  HTTP/2,  and  HTTP/1.1 over  SSL/TLS.   "no-tls"
-              parameter is  used in  --frontend option,  accept HTTP/2
-              and HTTP/1.1 over cleartext  TCP.  The incoming HTTP/1.1
-              connection  can  be  upgraded  to  HTTP/2  through  HTTP
-              Upgrade.
-  -s, --http2-proxy
-              Like default mode, but enable forward proxy.  This is so
-              called HTTP/2 proxy mode.
-
-Logging:
-  -L, --log-level=<LEVEL>
-              Set the severity  level of log output.   <LEVEL> must be
-              one of INFO, NOTICE, WARN, ERROR and FATAL.
-              Default: NOTICE
-  --accesslog-file=<PATH>
-              Set path to write access log.  To reopen file, send USR1
-              signal to nghttpx.
-  --accesslog-syslog
-              Send  access log  to syslog.   If this  option is  used,
-              --accesslog-file option is ignored.
-  --accesslog-format=<FORMAT>
-              Specify  format  string  for access  log.   The  default
-              format is combined format.   The following variables are
-              available:
-
-              * $remote_addr: client IP address.
-              * $time_local: local time in Common Log format.
-              * $time_iso8601: local time in ISO 8601 format.
-              * $request: HTTP request line.
-              * $status: HTTP response status code.
-              * $body_bytes_sent: the  number of bytes sent  to client
-                as response body.
-              * $http_<VAR>: value of HTTP  request header <VAR> where
-                '_' in <VAR> is replaced with '-'.
-              * $remote_port: client  port.
-              * $server_port: server port.
-              * $request_time: request processing time in seconds with
-                milliseconds resolution.
-              * $pid: PID of the running process.
-              * $alpn: ALPN identifier of the protocol which generates
-                the response.   For HTTP/1,  ALPN is  always http/1.1,
-                regardless of minor version.
-              * $tls_cipher: cipher used for SSL/TLS connection.
-              * $tls_client_fingerprint_sha256: SHA-256 fingerprint of
-                client certificate.
-              * $tls_client_fingerprint_sha1:  SHA-1   fingerprint  of
-                client certificate.
-              * $tls_client_subject_name:   subject  name   in  client
-                certificate.
-              * $tls_client_issuer_name:   issuer   name   in   client
-                certificate.
-              * $tls_client_serial:    serial    number   in    client
-                certificate.
-              * $tls_protocol: protocol for SSL/TLS connection.
-              * $tls_session_id: session ID for SSL/TLS connection.
-              * $tls_session_reused:  "r"   if  SSL/TLS   session  was
-                reused.  Otherwise, "."
-              * $tls_sni: SNI server name for SSL/TLS connection.
-              * $backend_host:  backend  host   used  to  fulfill  the
-                request.  "-" if backend host is not available.
-              * $backend_port:  backend  port   used  to  fulfill  the
-                request.  "-" if backend host is not available.
-
-              The  variable  can  be  enclosed  by  "{"  and  "}"  for
-              disambiguation (e.g., ${remote_addr}).
-
-              Default: )"
-      << DEFAULT_ACCESSLOG_FORMAT << R"(
-  --accesslog-write-early
-              Write  access  log  when   response  header  fields  are
-              received   from  backend   rather   than  when   request
-              transaction finishes.
-  --errorlog-file=<PATH>
-              Set path to write error  log.  To reopen file, send USR1
-              signal  to nghttpx.   stderr will  be redirected  to the
-              error log file unless --errorlog-syslog is used.
-              Default: )"
-      << config->logging.error.file << R"(
-  --errorlog-syslog
-              Send  error log  to  syslog.  If  this  option is  used,
-              --errorlog-file option is ignored.
-  --syslog-facility=<FACILITY>
-              Set syslog facility to <FACILITY>.
-              Default: )"
-      << str_syslog_facility(config->logging.syslog_facility) << R"(
-
-HTTP:
-  --add-x-forwarded-for
-              Append  X-Forwarded-For header  field to  the downstream
-              request.
-  --strip-incoming-x-forwarded-for
-              Strip X-Forwarded-For  header field from  inbound client
-              requests.
-  --no-add-x-forwarded-proto
-              Don't append  additional X-Forwarded-Proto  header field
-              to  the   backend  request.   If  inbound   client  sets
-              X-Forwarded-Proto,                                   and
-              --no-strip-incoming-x-forwarded-proto  option  is  used,
-              they are passed to the backend.
-  --no-strip-incoming-x-forwarded-proto
-              Don't strip X-Forwarded-Proto  header field from inbound
-              client requests.
-  --add-forwarded=<LIST>
-              Append RFC  7239 Forwarded header field  with parameters
-              specified in comma delimited list <LIST>.  The supported
-              parameters  are "by",  "for", "host",  and "proto".   By
-              default,  the value  of  "by" and  "for" parameters  are
-              obfuscated     string.     See     --forwarded-by    and
-              --forwarded-for options respectively.  Note that nghttpx
-              does  not  translate non-standard  X-Forwarded-*  header
-              fields into Forwarded header field, and vice versa.
-  --strip-incoming-forwarded
-              Strip  Forwarded   header  field  from   inbound  client
-              requests.
-  --forwarded-by=(obfuscated|ip|<VALUE>)
-              Specify the parameter value sent out with "by" parameter
-              of Forwarded  header field.   If "obfuscated"  is given,
-              the string is randomly generated at startup.  If "ip" is
-              given,   the  interface   address  of   the  connection,
-              including port number, is  sent with "by" parameter.  In
-              case of UNIX domain  socket, "localhost" is used instead
-              of address and  port.  User can also  specify the static
-              obfuscated string.  The limitation is that it must start
-              with   "_",  and   only   consists   of  character   set
-              [A-Za-z0-9._-], as described in RFC 7239.
-              Default: obfuscated
-  --forwarded-for=(obfuscated|ip)
-              Specify  the   parameter  value  sent  out   with  "for"
-              parameter of Forwarded header field.  If "obfuscated" is
-              given, the string is  randomly generated for each client
-              connection.  If "ip" is given, the remote client address
-              of  the connection,  without port  number, is  sent with
-              "for"  parameter.   In  case   of  UNIX  domain  socket,
-              "localhost" is used instead of address.
-              Default: obfuscated
-  --no-via    Don't append to  Via header field.  If  Via header field
-              is received, it is left unaltered.
-  --no-strip-incoming-early-data
-              Don't strip Early-Data header  field from inbound client
-              requests.
-  --no-location-rewrite
-              Don't  rewrite location  header field  in default  mode.
-              When --http2-proxy  is used, location header  field will
-              not be altered regardless of this option.
-  --host-rewrite
-              Rewrite  host and  :authority header  fields in  default
-              mode.  When  --http2-proxy is  used, these  headers will
-              not be altered regardless of this option.
-  --altsvc=<PROTOID,PORT[,HOST,[ORIGIN]]>
-              Specify   protocol  ID,   port,  host   and  origin   of
-              alternative service.  <HOST>  and <ORIGIN> are optional.
-              They  are advertised  in  alt-svc header  field only  in
-              HTTP/1.1  frontend.  This  option can  be used  multiple
-              times   to   specify  multiple   alternative   services.
-              Example: --altsvc=h2,443
-  --add-request-header=<HEADER>
-              Specify additional header field to add to request header
-              set.  This  option just  appends header field  and won't
-              replace anything  already set.  This option  can be used
-              several  times   to  specify  multiple   header  fields.
-              Example: --add-request-header="foo: bar"
-  --add-response-header=<HEADER>
-              Specify  additional  header  field to  add  to  response
-              header set.   This option just appends  header field and
-              won't replace anything already  set.  This option can be
-              used several  times to  specify multiple  header fields.
-              Example: --add-response-header="foo: bar"
-  --request-header-field-buffer=<SIZE>
-              Set maximum buffer size for incoming HTTP request header
-              field list.  This is the sum of header name and value in
-              bytes.   If  trailer  fields  exist,  they  are  counted
-              towards this number.
-              Default: )"
-      << util::utos_unit(config->http.request_header_field_buffer) << R"(
-  --max-request-header-fields=<N>
-              Set  maximum  number  of incoming  HTTP  request  header
-              fields.   If  trailer  fields exist,  they  are  counted
-              towards this number.
-              Default: )"
-      << config->http.max_request_header_fields << R"(
-  --response-header-field-buffer=<SIZE>
-              Set  maximum  buffer  size for  incoming  HTTP  response
-              header field list.   This is the sum of  header name and
-              value  in  bytes.  If  trailer  fields  exist, they  are
-              counted towards this number.
-              Default: )"
-      << util::utos_unit(config->http.response_header_field_buffer) << R"(
-  --max-response-header-fields=<N>
-              Set  maximum number  of  incoming  HTTP response  header
-              fields.   If  trailer  fields exist,  they  are  counted
-              towards this number.
-              Default: )"
-      << config->http.max_response_header_fields << R"(
-  --error-page=(<CODE>|*)=<PATH>
-              Set file path  to custom error page  served when nghttpx
-              originally  generates  HTTP  error status  code  <CODE>.
-              <CODE> must be greater than or equal to 400, and at most
-              599.  If "*"  is used instead of <CODE>,  it matches all
-              HTTP  status  code.  If  error  status  code comes  from
-              backend server, the custom error pages are not used.
-  --server-name=<NAME>
-              Change server response header field value to <NAME>.
-              Default: )"
-      << config->http.server_name << R"(
-  --no-server-rewrite
-              Don't rewrite server header field in default mode.  When
-              --http2-proxy is used, these headers will not be altered
-              regardless of this option.
-  --redirect-https-port=<PORT>
-              Specify the port number which appears in Location header
-              field  when  redirect  to  HTTPS  URI  is  made  due  to
-              "redirect-if-not-tls" parameter in --backend option.
-              Default: )"
-      << config->http.redirect_https_port << R"(
-
-API:
-  --api-max-request-body=<SIZE>
-              Set the maximum size of request body for API request.
-              Default: )"
-      << util::utos_unit(config->api.max_request_body) << R"(
-
-DNS:
-  --dns-cache-timeout=<DURATION>
-              Set duration that cached DNS results remain valid.  Note
-              that nghttpx caches the unsuccessful results as well.
-              Default: )"
-      << util::duration_str(config->dns.timeout.cache) << R"(
-  --dns-lookup-timeout=<DURATION>
-              Set timeout that  DNS server is given to  respond to the
-              initial  DNS  query.  For  the  2nd  and later  queries,
-              server is  given time based  on this timeout, and  it is
-              scaled linearly.
-              Default: )"
-      << util::duration_str(config->dns.timeout.lookup) << R"(
-  --dns-max-try=<N>
-              Set the number of DNS query before nghttpx gives up name
-              lookup.
-              Default: )"
-      << config->dns.max_try << R"(
-  --frontend-max-requests=<N>
-              The number  of requests that single  frontend connection
-              can process.  For HTTP/2, this  is the number of streams
-              in  one  HTTP/2 connection.   For  HTTP/1,  this is  the
-              number of keep alive requests.  This is hint to nghttpx,
-              and it  may allow additional few  requests.  The default
-              value is unlimited.
-
-Debug:
-  --frontend-http2-dump-request-header=<PATH>
-              Dumps request headers received by HTTP/2 frontend to the
-              file denoted  in <PATH>.  The  output is done  in HTTP/1
-              header field format and each header block is followed by
-              an empty line.  This option  is not thread safe and MUST
-              NOT be used with option -n<N>, where <N> >= 2.
-  --frontend-http2-dump-response-header=<PATH>
-              Dumps response headers sent  from HTTP/2 frontend to the
-              file denoted  in <PATH>.  The  output is done  in HTTP/1
-              header field format and each header block is followed by
-              an empty line.  This option  is not thread safe and MUST
-              NOT be used with option -n<N>, where <N> >= 2.
-  -o, --frontend-frame-debug
-              Print HTTP/2 frames in  frontend to stderr.  This option
-              is  not thread  safe and  MUST NOT  be used  with option
-              -n=N, where N >= 2.
-
-Process:
-  -D, --daemon
-              Run in a background.  If -D is used, the current working
-              directory is changed to '/'.
-  --pid-file=<PATH>
-              Set path to save PID of this program.
-  --user=<USER>
-              Run this program as <USER>.   This option is intended to
-              be used to drop root privileges.
-  --single-process
-              Run this program in a  single process mode for debugging
-              purpose.  Without this option,  nghttpx creates at least
-              2  processes:  master  and worker  processes.   If  this
-              option is  used, master  and worker  are unified  into a
-              single process.  nghttpx still spawns additional process
-              if neverbleed is used.  In  the single process mode, the
-              signal handling feature is disabled.
-
-Scripting:
-  --mruby-file=<PATH>
-              Set mruby script file
-  --ignore-per-pattern-mruby-error
-              Ignore mruby compile error  for per-pattern mruby script
-              file.  If error  occurred, it is treated as  if no mruby
-              file were specified for the pattern.
-
-Misc:
-  --conf=<PATH>
-              Load  configuration  from   <PATH>.   Please  note  that
-              nghttpx always  tries to read the  default configuration
-              file if --conf is not given.
-              Default: )"
-      << config->conf_path << R"(
-  --include=<PATH>
-              Load additional configurations from <PATH>.  File <PATH>
-              is  read  when  configuration  parser  encountered  this
-              option.  This option can be used multiple times, or even
-              recursively.
-  -v, --version
-              Print version and exit.
-  -h, --help  Print this help and exit.
-
---
-
-  The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-  10 * 1024).  Units are K, M and G (powers of 1024).
-
-  The <DURATION> argument is an integer and an optional unit (e.g., 1s
-  is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-  (hours, minutes, seconds and milliseconds, respectively).  If a unit
-  is omitted, a second is used as unit.)"
-      << std::endl;
-}
-} // namespace
-
-namespace {
-int process_options(Config *config,
-                    std::vector<std::pair<StringRef, StringRef>> &cmdcfgs) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  std::map<StringRef, size_t> pattern_addr_indexer;
-  if (conf_exists(config->conf_path.c_str())) {
-    LOG(NOTICE) << "Loading configuration from " << config->conf_path;
-    std::set<StringRef> include_set;
-    if (load_config(config, config->conf_path.c_str(), include_set,
-                    pattern_addr_indexer) == -1) {
-      LOG(FATAL) << "Failed to load configuration from " << config->conf_path;
-      return -1;
-    }
-    assert(include_set.empty());
-  }
-
-  // Reopen log files using configurations in file
-  reopen_log_files(config->logging);
-
-  {
-    std::set<StringRef> include_set;
-
-    for (auto &p : cmdcfgs) {
-      if (parse_config(config, p.first, p.second, include_set,
-                       pattern_addr_indexer) == -1) {
-        LOG(FATAL) << "Failed to parse command-line argument.";
-        return -1;
-      }
-    }
-
-    assert(include_set.empty());
-  }
-
-  auto &loggingconf = config->logging;
-
-  if (loggingconf.access.syslog || loggingconf.error.syslog) {
-    openlog("nghttpx", LOG_NDELAY | LOG_NOWAIT | LOG_PID,
-            loggingconf.syslog_facility);
-  }
-
-  if (reopen_log_files(config->logging) != 0) {
-    LOG(FATAL) << "Failed to open log file";
-    return -1;
-  }
-
-  redirect_stderr_to_errorlog(loggingconf);
-
-  if (config->uid != 0) {
-    if (log_config()->accesslog_fd != -1 &&
-        fchown(log_config()->accesslog_fd, config->uid, config->gid) == -1) {
-      auto error = errno;
-      LOG(WARN) << "Changing owner of access log file failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-    }
-    if (log_config()->errorlog_fd != -1 &&
-        fchown(log_config()->errorlog_fd, config->uid, config->gid) == -1) {
-      auto error = errno;
-      LOG(WARN) << "Changing owner of error log file failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-    }
-  }
-
-  if (config->single_thread) {
-    LOG(WARN) << "single-thread: Set workers to 1";
-    config->num_worker = 1;
-  }
-
-  auto &http2conf = config->http2;
-  {
-    auto &dumpconf = http2conf.upstream.debug.dump;
-
-    if (!dumpconf.request_header_file.empty()) {
-      auto path = dumpconf.request_header_file.c_str();
-      auto f = open_file_for_write(path);
-
-      if (f == nullptr) {
-        LOG(FATAL) << "Failed to open http2 upstream request header file: "
-                   << path;
-        return -1;
-      }
-
-      dumpconf.request_header = f;
-
-      if (config->uid != 0) {
-        if (chown(path, config->uid, config->gid) == -1) {
-          auto error = errno;
-          LOG(WARN) << "Changing owner of http2 upstream request header file "
-                    << path << " failed: "
-                    << xsi_strerror(error, errbuf.data(), errbuf.size());
-        }
-      }
-    }
-
-    if (!dumpconf.response_header_file.empty()) {
-      auto path = dumpconf.response_header_file.c_str();
-      auto f = open_file_for_write(path);
-
-      if (f == nullptr) {
-        LOG(FATAL) << "Failed to open http2 upstream response header file: "
-                   << path;
-        return -1;
-      }
-
-      dumpconf.response_header = f;
-
-      if (config->uid != 0) {
-        if (chown(path, config->uid, config->gid) == -1) {
-          auto error = errno;
-          LOG(WARN) << "Changing owner of http2 upstream response header file"
-                    << " " << path << " failed: "
-                    << xsi_strerror(error, errbuf.data(), errbuf.size());
-        }
-      }
-    }
-  }
-
-  auto &tlsconf = config->tls;
-
-  if (tlsconf.npn_list.empty()) {
-    tlsconf.npn_list = util::split_str(DEFAULT_NPN_LIST, ',');
-  }
-
-  if (!tlsconf.tls_proto_list.empty()) {
-    tlsconf.tls_proto_mask = tls::create_tls_proto_mask(tlsconf.tls_proto_list);
-  }
-
-  // TODO We depends on the ordering of protocol version macro in
-  // OpenSSL.
-  if (tlsconf.min_proto_version > tlsconf.max_proto_version) {
-    LOG(ERROR) << "tls-max-proto-version must be equal to or larger than "
-                  "tls-min-proto-version";
-    return -1;
-  }
-
-  if (tls::set_alpn_prefs(tlsconf.alpn_prefs, tlsconf.npn_list) != 0) {
-    return -1;
-  }
-
-  tlsconf.bio_method = create_bio_method();
-
-  auto &listenerconf = config->conn.listener;
-  auto &upstreamconf = config->conn.upstream;
-
-  if (listenerconf.addrs.empty()) {
-    UpstreamAddr addr{};
-    addr.host = StringRef::from_lit("*");
-    addr.port = 3000;
-    addr.tls = true;
-    addr.family = AF_INET;
-    listenerconf.addrs.push_back(addr);
-    addr.family = AF_INET6;
-    listenerconf.addrs.push_back(std::move(addr));
-  }
-
-  if (upstreamconf.worker_connections == 0) {
-    upstreamconf.worker_connections = std::numeric_limits<size_t>::max();
-  }
-
-  if (tls::upstream_tls_enabled(config->conn) &&
-      (tlsconf.private_key_file.empty() || tlsconf.cert_file.empty())) {
-    LOG(FATAL) << "TLS private key and certificate files are required.  "
-                  "Specify them in command-line, or in configuration file "
-                  "using private-key-file and certificate-file options.";
-    return -1;
-  }
-
-  if (tls::upstream_tls_enabled(config->conn) && !tlsconf.ocsp.disabled) {
-    struct stat buf;
-    if (stat(tlsconf.ocsp.fetch_ocsp_response_file.c_str(), &buf) != 0) {
-      tlsconf.ocsp.disabled = true;
-      LOG(WARN) << "--fetch-ocsp-response-file: "
-                << tlsconf.ocsp.fetch_ocsp_response_file
-                << " not found.  OCSP stapling has been disabled.";
-    }
-  }
-
-  if (configure_downstream_group(config, config->http2_proxy, false, tlsconf) !=
-      0) {
-    return -1;
-  }
-
-  auto &proxy = config->downstream_http_proxy;
-  if (!proxy.host.empty()) {
-    auto hostport = util::make_hostport(StringRef{proxy.host}, proxy.port);
-    if (resolve_hostname(&proxy.addr, proxy.host.c_str(), proxy.port,
-                         AF_UNSPEC) == -1) {
-      LOG(FATAL) << "Resolving backend HTTP proxy address failed: " << hostport;
-      return -1;
-    }
-    LOG(NOTICE) << "Backend HTTP proxy address: " << hostport << " -> "
-                << util::to_numeric_addr(&proxy.addr);
-  }
-
-  {
-    auto &memcachedconf = tlsconf.session_cache.memcached;
-    if (!memcachedconf.host.empty()) {
-      auto hostport = util::make_hostport(StringRef{memcachedconf.host},
-                                          memcachedconf.port);
-      if (resolve_hostname(&memcachedconf.addr, memcachedconf.host.c_str(),
-                           memcachedconf.port, memcachedconf.family) == -1) {
-        LOG(FATAL)
-            << "Resolving memcached address for TLS session cache failed: "
-            << hostport;
-        return -1;
-      }
-      LOG(NOTICE) << "Memcached address for TLS session cache: " << hostport
-                  << " -> " << util::to_numeric_addr(&memcachedconf.addr);
-      if (memcachedconf.tls) {
-        LOG(NOTICE) << "Connection to memcached for TLS session cache will be "
-                       "encrypted by TLS";
-      }
-    }
-  }
-
-  {
-    auto &memcachedconf = tlsconf.ticket.memcached;
-    if (!memcachedconf.host.empty()) {
-      auto hostport = util::make_hostport(StringRef{memcachedconf.host},
-                                          memcachedconf.port);
-      if (resolve_hostname(&memcachedconf.addr, memcachedconf.host.c_str(),
-                           memcachedconf.port, memcachedconf.family) == -1) {
-        LOG(FATAL) << "Resolving memcached address for TLS ticket key failed: "
-                   << hostport;
-        return -1;
-      }
-      LOG(NOTICE) << "Memcached address for TLS ticket key: " << hostport
-                  << " -> " << util::to_numeric_addr(&memcachedconf.addr);
-      if (memcachedconf.tls) {
-        LOG(NOTICE) << "Connection to memcached for TLS ticket key will be "
-                       "encrypted by TLS";
-      }
-    }
-  }
-
-  if (config->rlimit_nofile) {
-    struct rlimit lim = {static_cast<rlim_t>(config->rlimit_nofile),
-                         static_cast<rlim_t>(config->rlimit_nofile)};
-    if (setrlimit(RLIMIT_NOFILE, &lim) != 0) {
-      auto error = errno;
-      LOG(WARN) << "Setting rlimit-nofile failed: "
-                << xsi_strerror(error, errbuf.data(), errbuf.size());
-    }
-  }
-
-  auto &fwdconf = config->http.forwarded;
-
-  if (fwdconf.by_node_type == FORWARDED_NODE_OBFUSCATED &&
-      fwdconf.by_obfuscated.empty()) {
-    // 2 for '_' and terminal NULL
-    auto iov = make_byte_ref(config->balloc, SHRPX_OBFUSCATED_NODE_LENGTH + 2);
-    auto p = iov.base;
-    *p++ = '_';
-    auto gen = util::make_mt19937();
-    p = util::random_alpha_digit(p, p + SHRPX_OBFUSCATED_NODE_LENGTH, gen);
-    *p = '\0';
-    fwdconf.by_obfuscated = StringRef{iov.base, p};
-  }
-
-  if (config->http2.upstream.debug.frame_debug) {
-    // To make it sync to logging
-    set_output(stderr);
-    if (isatty(fileno(stdout))) {
-      set_color_output(true);
-    }
-    reset_timer();
-  }
-
-  config->http2.upstream.callbacks = create_http2_upstream_callbacks();
-  config->http2.downstream.callbacks = create_http2_downstream_callbacks();
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Closes file descriptor which are opened for listeners in config,
-// and are not inherited from |iaddrs|.
-void close_not_inherited_fd(Config *config,
-                            const std::vector<InheritedAddr> &iaddrs) {
-  auto &listenerconf = config->conn.listener;
-
-  for (auto &addr : listenerconf.addrs) {
-    auto inherited = std::find_if(
-        std::begin(iaddrs), std::end(iaddrs),
-        [&addr](const InheritedAddr &iaddr) { return addr.fd == iaddr.fd; });
-
-    if (inherited != std::end(iaddrs)) {
-      continue;
-    }
-
-    close(addr.fd);
-  }
-}
-} // namespace
-
-namespace {
-void reload_config(WorkerProcess *wp) {
-  int rv;
-
-  LOG(NOTICE) << "Reloading configuration";
-
-  auto cur_config = mod_config();
-  auto new_config = make_unique<Config>();
-
-  fill_default_config(new_config.get());
-
-  new_config->conf_path =
-      make_string_ref(new_config->balloc, cur_config->conf_path);
-  // daemon option is ignored here.
-  new_config->daemon = cur_config->daemon;
-  // loop is reused, and ev_loop_flags gets ignored
-  new_config->ev_loop_flags = cur_config->ev_loop_flags;
-  new_config->config_revision = cur_config->config_revision + 1;
-
-  rv = process_options(new_config.get(), suconfig.cmdcfgs);
-  if (rv != 0) {
-    LOG(ERROR) << "Failed to process new configuration";
-    return;
-  }
-
-  auto iaddrs = get_inherited_addr_from_config(new_config->balloc, cur_config);
-
-  if (create_acceptor_socket(new_config.get(), iaddrs) != 0) {
-    close_not_inherited_fd(new_config.get(), iaddrs);
-    return;
-  }
-
-  // According to libev documentation, flags are ignored since we have
-  // already created first default loop.
-  auto loop = ev_default_loop(new_config->ev_loop_flags);
-
-  int ipc_fd = 0;
-
-  // fork_worker_process and forked child process assumes new
-  // configuration can be obtained from get_config().
-
-  auto old_config = replace_config(std::move(new_config));
-
-  auto pid = fork_worker_process(ipc_fd, iaddrs);
-
-  if (pid == -1) {
-    LOG(ERROR) << "Failed to process new configuration";
-
-    new_config = replace_config(std::move(old_config));
-    close_not_inherited_fd(new_config.get(), iaddrs);
-
-    return;
-  }
-
-  close_unused_inherited_addr(iaddrs);
-
-  // Send last worker process a graceful shutdown notice
-  auto &last_wp = worker_processes.back();
-  ipc_send(last_wp.get(), SHRPX_IPC_GRACEFUL_SHUTDOWN);
-  // We no longer use signals for this worker.
-  last_wp->shutdown_signal_watchers();
-
-  worker_process_add(make_unique<WorkerProcess>(loop, pid, ipc_fd));
-
-  if (!get_config()->pid_file.empty()) {
-    save_pid();
-  }
-}
-} // namespace
-
-int main(int argc, char **argv) {
-  int rv;
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
-  nghttp2::tls::libssl_init();
-
-#ifndef NOTHREADS
-  nghttp2::tls::LibsslGlobalLock lock;
-#endif // NOTHREADS
-
-  Log::set_severity_level(NOTICE);
-  create_config();
-  fill_default_config(mod_config());
-
-  // make copy of stderr
-  store_original_fds();
-
-  // First open log files with default configuration, so that we can
-  // log errors/warnings while reading configuration files.
-  reopen_log_files(get_config()->logging);
-
-  suconfig.original_argv = argv;
-
-  // We have to copy argv, since getopt_long may change its content.
-  suconfig.argc = argc;
-  suconfig.argv = new char *[argc];
-
-  for (int i = 0; i < argc; ++i) {
-    suconfig.argv[i] = strdup(argv[i]);
-    if (suconfig.argv[i] == nullptr) {
-      auto error = errno;
-      LOG(FATAL) << "failed to copy argv: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      exit(EXIT_FAILURE);
-    }
-  }
-
-  suconfig.cwd = getcwd(nullptr, 0);
-  if (suconfig.cwd == nullptr) {
-    auto error = errno;
-    LOG(FATAL) << "failed to get current working directory: errno=" << error;
-    exit(EXIT_FAILURE);
-  }
-
-  auto &cmdcfgs = suconfig.cmdcfgs;
-
-  while (1) {
-    static int flag = 0;
-    static constexpr option long_options[] = {
-        {SHRPX_OPT_DAEMON.c_str(), no_argument, nullptr, 'D'},
-        {SHRPX_OPT_LOG_LEVEL.c_str(), required_argument, nullptr, 'L'},
-        {SHRPX_OPT_BACKEND.c_str(), required_argument, nullptr, 'b'},
-        {SHRPX_OPT_HTTP2_MAX_CONCURRENT_STREAMS.c_str(), required_argument,
-         nullptr, 'c'},
-        {SHRPX_OPT_FRONTEND.c_str(), required_argument, nullptr, 'f'},
-        {"help", no_argument, nullptr, 'h'},
-        {SHRPX_OPT_INSECURE.c_str(), no_argument, nullptr, 'k'},
-        {SHRPX_OPT_WORKERS.c_str(), required_argument, nullptr, 'n'},
-        {SHRPX_OPT_CLIENT_PROXY.c_str(), no_argument, nullptr, 'p'},
-        {SHRPX_OPT_HTTP2_PROXY.c_str(), no_argument, nullptr, 's'},
-        {"version", no_argument, nullptr, 'v'},
-        {SHRPX_OPT_FRONTEND_FRAME_DEBUG.c_str(), no_argument, nullptr, 'o'},
-        {SHRPX_OPT_ADD_X_FORWARDED_FOR.c_str(), no_argument, &flag, 1},
-        {SHRPX_OPT_FRONTEND_HTTP2_READ_TIMEOUT.c_str(), required_argument,
-         &flag, 2},
-        {SHRPX_OPT_FRONTEND_READ_TIMEOUT.c_str(), required_argument, &flag, 3},
-        {SHRPX_OPT_FRONTEND_WRITE_TIMEOUT.c_str(), required_argument, &flag, 4},
-        {SHRPX_OPT_BACKEND_READ_TIMEOUT.c_str(), required_argument, &flag, 5},
-        {SHRPX_OPT_BACKEND_WRITE_TIMEOUT.c_str(), required_argument, &flag, 6},
-        {SHRPX_OPT_ACCESSLOG_FILE.c_str(), required_argument, &flag, 7},
-        {SHRPX_OPT_BACKEND_KEEP_ALIVE_TIMEOUT.c_str(), required_argument, &flag,
-         8},
-        {SHRPX_OPT_FRONTEND_HTTP2_WINDOW_BITS.c_str(), required_argument, &flag,
-         9},
-        {SHRPX_OPT_PID_FILE.c_str(), required_argument, &flag, 10},
-        {SHRPX_OPT_USER.c_str(), required_argument, &flag, 11},
-        {"conf", required_argument, &flag, 12},
-        {SHRPX_OPT_SYSLOG_FACILITY.c_str(), required_argument, &flag, 14},
-        {SHRPX_OPT_BACKLOG.c_str(), required_argument, &flag, 15},
-        {SHRPX_OPT_CIPHERS.c_str(), required_argument, &flag, 16},
-        {SHRPX_OPT_CLIENT.c_str(), no_argument, &flag, 17},
-        {SHRPX_OPT_BACKEND_HTTP2_WINDOW_BITS.c_str(), required_argument, &flag,
-         18},
-        {SHRPX_OPT_CACERT.c_str(), required_argument, &flag, 19},
-        {SHRPX_OPT_BACKEND_IPV4.c_str(), no_argument, &flag, 20},
-        {SHRPX_OPT_BACKEND_IPV6.c_str(), no_argument, &flag, 21},
-        {SHRPX_OPT_PRIVATE_KEY_PASSWD_FILE.c_str(), required_argument, &flag,
-         22},
-        {SHRPX_OPT_NO_VIA.c_str(), no_argument, &flag, 23},
-        {SHRPX_OPT_SUBCERT.c_str(), required_argument, &flag, 24},
-        {SHRPX_OPT_HTTP2_BRIDGE.c_str(), no_argument, &flag, 25},
-        {SHRPX_OPT_BACKEND_HTTP_PROXY_URI.c_str(), required_argument, &flag,
-         26},
-        {SHRPX_OPT_BACKEND_NO_TLS.c_str(), no_argument, &flag, 27},
-        {SHRPX_OPT_OCSP_STARTUP.c_str(), no_argument, &flag, 28},
-        {SHRPX_OPT_FRONTEND_NO_TLS.c_str(), no_argument, &flag, 29},
-        {SHRPX_OPT_NO_VERIFY_OCSP.c_str(), no_argument, &flag, 30},
-        {SHRPX_OPT_BACKEND_TLS_SNI_FIELD.c_str(), required_argument, &flag, 31},
-        {SHRPX_OPT_DH_PARAM_FILE.c_str(), required_argument, &flag, 33},
-        {SHRPX_OPT_READ_RATE.c_str(), required_argument, &flag, 34},
-        {SHRPX_OPT_READ_BURST.c_str(), required_argument, &flag, 35},
-        {SHRPX_OPT_WRITE_RATE.c_str(), required_argument, &flag, 36},
-        {SHRPX_OPT_WRITE_BURST.c_str(), required_argument, &flag, 37},
-        {SHRPX_OPT_NPN_LIST.c_str(), required_argument, &flag, 38},
-        {SHRPX_OPT_VERIFY_CLIENT.c_str(), no_argument, &flag, 39},
-        {SHRPX_OPT_VERIFY_CLIENT_CACERT.c_str(), required_argument, &flag, 40},
-        {SHRPX_OPT_CLIENT_PRIVATE_KEY_FILE.c_str(), required_argument, &flag,
-         41},
-        {SHRPX_OPT_CLIENT_CERT_FILE.c_str(), required_argument, &flag, 42},
-        {SHRPX_OPT_FRONTEND_HTTP2_DUMP_REQUEST_HEADER.c_str(),
-         required_argument, &flag, 43},
-        {SHRPX_OPT_FRONTEND_HTTP2_DUMP_RESPONSE_HEADER.c_str(),
-         required_argument, &flag, 44},
-        {SHRPX_OPT_HTTP2_NO_COOKIE_CRUMBLING.c_str(), no_argument, &flag, 45},
-        {SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS.c_str(),
-         required_argument, &flag, 46},
-        {SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_BITS.c_str(),
-         required_argument, &flag, 47},
-        {SHRPX_OPT_TLS_PROTO_LIST.c_str(), required_argument, &flag, 48},
-        {SHRPX_OPT_PADDING.c_str(), required_argument, &flag, 49},
-        {SHRPX_OPT_WORKER_READ_RATE.c_str(), required_argument, &flag, 50},
-        {SHRPX_OPT_WORKER_READ_BURST.c_str(), required_argument, &flag, 51},
-        {SHRPX_OPT_WORKER_WRITE_RATE.c_str(), required_argument, &flag, 52},
-        {SHRPX_OPT_WORKER_WRITE_BURST.c_str(), required_argument, &flag, 53},
-        {SHRPX_OPT_ALTSVC.c_str(), required_argument, &flag, 54},
-        {SHRPX_OPT_ADD_RESPONSE_HEADER.c_str(), required_argument, &flag, 55},
-        {SHRPX_OPT_WORKER_FRONTEND_CONNECTIONS.c_str(), required_argument,
-         &flag, 56},
-        {SHRPX_OPT_ACCESSLOG_SYSLOG.c_str(), no_argument, &flag, 57},
-        {SHRPX_OPT_ERRORLOG_FILE.c_str(), required_argument, &flag, 58},
-        {SHRPX_OPT_ERRORLOG_SYSLOG.c_str(), no_argument, &flag, 59},
-        {SHRPX_OPT_STREAM_READ_TIMEOUT.c_str(), required_argument, &flag, 60},
-        {SHRPX_OPT_STREAM_WRITE_TIMEOUT.c_str(), required_argument, &flag, 61},
-        {SHRPX_OPT_NO_LOCATION_REWRITE.c_str(), no_argument, &flag, 62},
-        {SHRPX_OPT_BACKEND_HTTP1_CONNECTIONS_PER_HOST.c_str(),
-         required_argument, &flag, 63},
-        {SHRPX_OPT_LISTENER_DISABLE_TIMEOUT.c_str(), required_argument, &flag,
-         64},
-        {SHRPX_OPT_STRIP_INCOMING_X_FORWARDED_FOR.c_str(), no_argument, &flag,
-         65},
-        {SHRPX_OPT_ACCESSLOG_FORMAT.c_str(), required_argument, &flag, 66},
-        {SHRPX_OPT_BACKEND_HTTP1_CONNECTIONS_PER_FRONTEND.c_str(),
-         required_argument, &flag, 67},
-        {SHRPX_OPT_TLS_TICKET_KEY_FILE.c_str(), required_argument, &flag, 68},
-        {SHRPX_OPT_RLIMIT_NOFILE.c_str(), required_argument, &flag, 69},
-        {SHRPX_OPT_BACKEND_RESPONSE_BUFFER.c_str(), required_argument, &flag,
-         71},
-        {SHRPX_OPT_BACKEND_REQUEST_BUFFER.c_str(), required_argument, &flag,
-         72},
-        {SHRPX_OPT_NO_HOST_REWRITE.c_str(), no_argument, &flag, 73},
-        {SHRPX_OPT_NO_SERVER_PUSH.c_str(), no_argument, &flag, 74},
-        {SHRPX_OPT_BACKEND_HTTP2_CONNECTIONS_PER_WORKER.c_str(),
-         required_argument, &flag, 76},
-        {SHRPX_OPT_FETCH_OCSP_RESPONSE_FILE.c_str(), required_argument, &flag,
-         77},
-        {SHRPX_OPT_OCSP_UPDATE_INTERVAL.c_str(), required_argument, &flag, 78},
-        {SHRPX_OPT_NO_OCSP.c_str(), no_argument, &flag, 79},
-        {SHRPX_OPT_HEADER_FIELD_BUFFER.c_str(), required_argument, &flag, 80},
-        {SHRPX_OPT_MAX_HEADER_FIELDS.c_str(), required_argument, &flag, 81},
-        {SHRPX_OPT_ADD_REQUEST_HEADER.c_str(), required_argument, &flag, 82},
-        {SHRPX_OPT_INCLUDE.c_str(), required_argument, &flag, 83},
-        {SHRPX_OPT_TLS_TICKET_KEY_CIPHER.c_str(), required_argument, &flag, 84},
-        {SHRPX_OPT_HOST_REWRITE.c_str(), no_argument, &flag, 85},
-        {SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED.c_str(), required_argument,
-         &flag, 86},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED.c_str(), required_argument, &flag,
-         87},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_INTERVAL.c_str(), required_argument,
-         &flag, 88},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_MAX_RETRY.c_str(),
-         required_argument, &flag, 89},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_MAX_FAIL.c_str(), required_argument,
-         &flag, 90},
-        {SHRPX_OPT_MRUBY_FILE.c_str(), required_argument, &flag, 91},
-        {SHRPX_OPT_ACCEPT_PROXY_PROTOCOL.c_str(), no_argument, &flag, 93},
-        {SHRPX_OPT_FASTOPEN.c_str(), required_argument, &flag, 94},
-        {SHRPX_OPT_TLS_DYN_REC_WARMUP_THRESHOLD.c_str(), required_argument,
-         &flag, 95},
-        {SHRPX_OPT_TLS_DYN_REC_IDLE_TIMEOUT.c_str(), required_argument, &flag,
-         96},
-        {SHRPX_OPT_ADD_FORWARDED.c_str(), required_argument, &flag, 97},
-        {SHRPX_OPT_STRIP_INCOMING_FORWARDED.c_str(), no_argument, &flag, 98},
-        {SHRPX_OPT_FORWARDED_BY.c_str(), required_argument, &flag, 99},
-        {SHRPX_OPT_FORWARDED_FOR.c_str(), required_argument, &flag, 100},
-        {SHRPX_OPT_RESPONSE_HEADER_FIELD_BUFFER.c_str(), required_argument,
-         &flag, 101},
-        {SHRPX_OPT_MAX_RESPONSE_HEADER_FIELDS.c_str(), required_argument, &flag,
-         102},
-        {SHRPX_OPT_NO_HTTP2_CIPHER_BLACK_LIST.c_str(), no_argument, &flag, 103},
-        {SHRPX_OPT_REQUEST_HEADER_FIELD_BUFFER.c_str(), required_argument,
-         &flag, 104},
-        {SHRPX_OPT_MAX_REQUEST_HEADER_FIELDS.c_str(), required_argument, &flag,
-         105},
-        {SHRPX_OPT_BACKEND_HTTP1_TLS.c_str(), no_argument, &flag, 106},
-        {SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_TLS.c_str(), no_argument, &flag,
-         108},
-        {SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_CERT_FILE.c_str(),
-         required_argument, &flag, 109},
-        {SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_PRIVATE_KEY_FILE.c_str(),
-         required_argument, &flag, 110},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_TLS.c_str(), no_argument, &flag,
-         111},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_CERT_FILE.c_str(),
-         required_argument, &flag, 112},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_PRIVATE_KEY_FILE.c_str(),
-         required_argument, &flag, 113},
-        {SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_ADDRESS_FAMILY.c_str(),
-         required_argument, &flag, 114},
-        {SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_ADDRESS_FAMILY.c_str(),
-         required_argument, &flag, 115},
-        {SHRPX_OPT_BACKEND_ADDRESS_FAMILY.c_str(), required_argument, &flag,
-         116},
-        {SHRPX_OPT_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS.c_str(),
-         required_argument, &flag, 117},
-        {SHRPX_OPT_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS.c_str(),
-         required_argument, &flag, 118},
-        {SHRPX_OPT_BACKEND_CONNECTIONS_PER_FRONTEND.c_str(), required_argument,
-         &flag, 119},
-        {SHRPX_OPT_BACKEND_TLS.c_str(), no_argument, &flag, 120},
-        {SHRPX_OPT_BACKEND_CONNECTIONS_PER_HOST.c_str(), required_argument,
-         &flag, 121},
-        {SHRPX_OPT_ERROR_PAGE.c_str(), required_argument, &flag, 122},
-        {SHRPX_OPT_NO_KQUEUE.c_str(), no_argument, &flag, 123},
-        {SHRPX_OPT_FRONTEND_HTTP2_SETTINGS_TIMEOUT.c_str(), required_argument,
-         &flag, 124},
-        {SHRPX_OPT_BACKEND_HTTP2_SETTINGS_TIMEOUT.c_str(), required_argument,
-         &flag, 125},
-        {SHRPX_OPT_API_MAX_REQUEST_BODY.c_str(), required_argument, &flag, 126},
-        {SHRPX_OPT_BACKEND_MAX_BACKOFF.c_str(), required_argument, &flag, 127},
-        {SHRPX_OPT_SERVER_NAME.c_str(), required_argument, &flag, 128},
-        {SHRPX_OPT_NO_SERVER_REWRITE.c_str(), no_argument, &flag, 129},
-        {SHRPX_OPT_FRONTEND_HTTP2_OPTIMIZE_WRITE_BUFFER_SIZE.c_str(),
-         no_argument, &flag, 130},
-        {SHRPX_OPT_FRONTEND_HTTP2_OPTIMIZE_WINDOW_SIZE.c_str(), no_argument,
-         &flag, 131},
-        {SHRPX_OPT_FRONTEND_HTTP2_WINDOW_SIZE.c_str(), required_argument, &flag,
-         132},
-        {SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE.c_str(),
-         required_argument, &flag, 133},
-        {SHRPX_OPT_BACKEND_HTTP2_WINDOW_SIZE.c_str(), required_argument, &flag,
-         134},
-        {SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE.c_str(),
-         required_argument, &flag, 135},
-        {SHRPX_OPT_FRONTEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE.c_str(),
-         required_argument, &flag, 136},
-        {SHRPX_OPT_FRONTEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE.c_str(),
-         required_argument, &flag, 137},
-        {SHRPX_OPT_BACKEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE.c_str(),
-         required_argument, &flag, 138},
-        {SHRPX_OPT_BACKEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE.c_str(),
-         required_argument, &flag, 139},
-        {SHRPX_OPT_ECDH_CURVES.c_str(), required_argument, &flag, 140},
-        {SHRPX_OPT_TLS_SCT_DIR.c_str(), required_argument, &flag, 141},
-        {SHRPX_OPT_BACKEND_CONNECT_TIMEOUT.c_str(), required_argument, &flag,
-         142},
-        {SHRPX_OPT_DNS_CACHE_TIMEOUT.c_str(), required_argument, &flag, 143},
-        {SHRPX_OPT_DNS_LOOKUP_TIMEOUT.c_str(), required_argument, &flag, 144},
-        {SHRPX_OPT_DNS_MAX_TRY.c_str(), required_argument, &flag, 145},
-        {SHRPX_OPT_FRONTEND_KEEP_ALIVE_TIMEOUT.c_str(), required_argument,
-         &flag, 146},
-        {SHRPX_OPT_PSK_SECRETS.c_str(), required_argument, &flag, 147},
-        {SHRPX_OPT_CLIENT_PSK_SECRETS.c_str(), required_argument, &flag, 148},
-        {SHRPX_OPT_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST.c_str(), no_argument,
-         &flag, 149},
-        {SHRPX_OPT_CLIENT_CIPHERS.c_str(), required_argument, &flag, 150},
-        {SHRPX_OPT_ACCESSLOG_WRITE_EARLY.c_str(), no_argument, &flag, 151},
-        {SHRPX_OPT_TLS_MIN_PROTO_VERSION.c_str(), required_argument, &flag,
-         152},
-        {SHRPX_OPT_TLS_MAX_PROTO_VERSION.c_str(), required_argument, &flag,
-         153},
-        {SHRPX_OPT_REDIRECT_HTTPS_PORT.c_str(), required_argument, &flag, 154},
-        {SHRPX_OPT_FRONTEND_MAX_REQUESTS.c_str(), required_argument, &flag,
-         155},
-        {SHRPX_OPT_SINGLE_THREAD.c_str(), no_argument, &flag, 156},
-        {SHRPX_OPT_NO_ADD_X_FORWARDED_PROTO.c_str(), no_argument, &flag, 157},
-        {SHRPX_OPT_NO_STRIP_INCOMING_X_FORWARDED_PROTO.c_str(), no_argument,
-         &flag, 158},
-        {SHRPX_OPT_SINGLE_PROCESS.c_str(), no_argument, &flag, 159},
-        {SHRPX_OPT_VERIFY_CLIENT_TOLERATE_EXPIRED.c_str(), no_argument, &flag,
-         160},
-        {SHRPX_OPT_IGNORE_PER_PATTERN_MRUBY_ERROR.c_str(), no_argument, &flag,
-         161},
-        {SHRPX_OPT_TLS_NO_POSTPONE_EARLY_DATA.c_str(), no_argument, &flag, 162},
-        {SHRPX_OPT_TLS_MAX_EARLY_DATA.c_str(), required_argument, &flag, 163},
-        {SHRPX_OPT_TLS13_CIPHERS.c_str(), required_argument, &flag, 164},
-        {SHRPX_OPT_TLS13_CLIENT_CIPHERS.c_str(), required_argument, &flag, 165},
-        {SHRPX_OPT_NO_STRIP_INCOMING_EARLY_DATA.c_str(), no_argument, &flag,
-         166},
-        {nullptr, 0, nullptr, 0}};
-
-    int option_index = 0;
-    int c = getopt_long(argc, argv, "DL:b:c:f:hkn:opsv", long_options,
-                        &option_index);
-    if (c == -1) {
-      break;
-    }
-    switch (c) {
-    case 'D':
-      cmdcfgs.emplace_back(SHRPX_OPT_DAEMON, StringRef::from_lit("yes"));
-      break;
-    case 'L':
-      cmdcfgs.emplace_back(SHRPX_OPT_LOG_LEVEL, StringRef{optarg});
-      break;
-    case 'b':
-      cmdcfgs.emplace_back(SHRPX_OPT_BACKEND, StringRef{optarg});
-      break;
-    case 'c':
-      cmdcfgs.emplace_back(SHRPX_OPT_HTTP2_MAX_CONCURRENT_STREAMS,
-                           StringRef{optarg});
-      break;
-    case 'f':
-      cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND, StringRef{optarg});
-      break;
-    case 'h':
-      print_help(std::cout);
-      exit(EXIT_SUCCESS);
-    case 'k':
-      cmdcfgs.emplace_back(SHRPX_OPT_INSECURE, StringRef::from_lit("yes"));
-      break;
-    case 'n':
-      cmdcfgs.emplace_back(SHRPX_OPT_WORKERS, StringRef{optarg});
-      break;
-    case 'o':
-      cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_FRAME_DEBUG,
-                           StringRef::from_lit("yes"));
-      break;
-    case 'p':
-      cmdcfgs.emplace_back(SHRPX_OPT_CLIENT_PROXY, StringRef::from_lit("yes"));
-      break;
-    case 's':
-      cmdcfgs.emplace_back(SHRPX_OPT_HTTP2_PROXY, StringRef::from_lit("yes"));
-      break;
-    case 'v':
-      print_version(std::cout);
-      exit(EXIT_SUCCESS);
-    case '?':
-      util::show_candidates(argv[optind - 1], long_options);
-      exit(EXIT_FAILURE);
-    case 0:
-      switch (flag) {
-      case 1:
-        // --add-x-forwarded-for
-        cmdcfgs.emplace_back(SHRPX_OPT_ADD_X_FORWARDED_FOR,
-                             StringRef::from_lit("yes"));
-        break;
-      case 2:
-        // --frontend-http2-read-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_READ_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 3:
-        // --frontend-read-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_READ_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 4:
-        // --frontend-write-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_WRITE_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 5:
-        // --backend-read-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_READ_TIMEOUT, StringRef{optarg});
-        break;
-      case 6:
-        // --backend-write-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_WRITE_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 7:
-        cmdcfgs.emplace_back(SHRPX_OPT_ACCESSLOG_FILE, StringRef{optarg});
-        break;
-      case 8:
-        // --backend-keep-alive-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_KEEP_ALIVE_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 9:
-        // --frontend-http2-window-bits
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_WINDOW_BITS,
-                             StringRef{optarg});
-        break;
-      case 10:
-        cmdcfgs.emplace_back(SHRPX_OPT_PID_FILE, StringRef{optarg});
-        break;
-      case 11:
-        cmdcfgs.emplace_back(SHRPX_OPT_USER, StringRef{optarg});
-        break;
-      case 12:
-        // --conf
-        mod_config()->conf_path =
-            make_string_ref(mod_config()->balloc, StringRef{optarg});
-        break;
-      case 14:
-        // --syslog-facility
-        cmdcfgs.emplace_back(SHRPX_OPT_SYSLOG_FACILITY, StringRef{optarg});
-        break;
-      case 15:
-        // --backlog
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKLOG, StringRef{optarg});
-        break;
-      case 16:
-        // --ciphers
-        cmdcfgs.emplace_back(SHRPX_OPT_CIPHERS, StringRef{optarg});
-        break;
-      case 17:
-        // --client
-        cmdcfgs.emplace_back(SHRPX_OPT_CLIENT, StringRef::from_lit("yes"));
-        break;
-      case 18:
-        // --backend-http2-window-bits
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_WINDOW_BITS,
-                             StringRef{optarg});
-        break;
-      case 19:
-        // --cacert
-        cmdcfgs.emplace_back(SHRPX_OPT_CACERT, StringRef{optarg});
-        break;
-      case 20:
-        // --backend-ipv4
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_IPV4,
-                             StringRef::from_lit("yes"));
-        break;
-      case 21:
-        // --backend-ipv6
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_IPV6,
-                             StringRef::from_lit("yes"));
-        break;
-      case 22:
-        // --private-key-passwd-file
-        cmdcfgs.emplace_back(SHRPX_OPT_PRIVATE_KEY_PASSWD_FILE,
-                             StringRef{optarg});
-        break;
-      case 23:
-        // --no-via
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_VIA, StringRef::from_lit("yes"));
-        break;
-      case 24:
-        // --subcert
-        cmdcfgs.emplace_back(SHRPX_OPT_SUBCERT, StringRef{optarg});
-        break;
-      case 25:
-        // --http2-bridge
-        cmdcfgs.emplace_back(SHRPX_OPT_HTTP2_BRIDGE,
-                             StringRef::from_lit("yes"));
-        break;
-      case 26:
-        // --backend-http-proxy-uri
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP_PROXY_URI,
-                             StringRef{optarg});
-        break;
-      case 27:
-        // --backend-no-tls
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_NO_TLS,
-                             StringRef::from_lit("yes"));
-        break;
-      case 28:
-        // --ocsp-startup
-        cmdcfgs.emplace_back(SHRPX_OPT_OCSP_STARTUP,
-                             StringRef::from_lit("yes"));
-        break;
-      case 29:
-        // --frontend-no-tls
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_NO_TLS,
-                             StringRef::from_lit("yes"));
-        break;
-      case 30:
-        // --no-verify-ocsp
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_VERIFY_OCSP,
-                             StringRef::from_lit("yes"));
-        break;
-      case 31:
-        // --backend-tls-sni-field
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_TLS_SNI_FIELD,
-                             StringRef{optarg});
-        break;
-      case 33:
-        // --dh-param-file
-        cmdcfgs.emplace_back(SHRPX_OPT_DH_PARAM_FILE, StringRef{optarg});
-        break;
-      case 34:
-        // --read-rate
-        cmdcfgs.emplace_back(SHRPX_OPT_READ_RATE, StringRef{optarg});
-        break;
-      case 35:
-        // --read-burst
-        cmdcfgs.emplace_back(SHRPX_OPT_READ_BURST, StringRef{optarg});
-        break;
-      case 36:
-        // --write-rate
-        cmdcfgs.emplace_back(SHRPX_OPT_WRITE_RATE, StringRef{optarg});
-        break;
-      case 37:
-        // --write-burst
-        cmdcfgs.emplace_back(SHRPX_OPT_WRITE_BURST, StringRef{optarg});
-        break;
-      case 38:
-        // --npn-list
-        cmdcfgs.emplace_back(SHRPX_OPT_NPN_LIST, StringRef{optarg});
-        break;
-      case 39:
-        // --verify-client
-        cmdcfgs.emplace_back(SHRPX_OPT_VERIFY_CLIENT,
-                             StringRef::from_lit("yes"));
-        break;
-      case 40:
-        // --verify-client-cacert
-        cmdcfgs.emplace_back(SHRPX_OPT_VERIFY_CLIENT_CACERT, StringRef{optarg});
-        break;
-      case 41:
-        // --client-private-key-file
-        cmdcfgs.emplace_back(SHRPX_OPT_CLIENT_PRIVATE_KEY_FILE,
-                             StringRef{optarg});
-        break;
-      case 42:
-        // --client-cert-file
-        cmdcfgs.emplace_back(SHRPX_OPT_CLIENT_CERT_FILE, StringRef{optarg});
-        break;
-      case 43:
-        // --frontend-http2-dump-request-header
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_DUMP_REQUEST_HEADER,
-                             StringRef{optarg});
-        break;
-      case 44:
-        // --frontend-http2-dump-response-header
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_DUMP_RESPONSE_HEADER,
-                             StringRef{optarg});
-        break;
-      case 45:
-        // --http2-no-cookie-crumbling
-        cmdcfgs.emplace_back(SHRPX_OPT_HTTP2_NO_COOKIE_CRUMBLING,
-                             StringRef::from_lit("yes"));
-        break;
-      case 46:
-        // --frontend-http2-connection-window-bits
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS,
-                             StringRef{optarg});
-        break;
-      case 47:
-        // --backend-http2-connection-window-bits
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_BITS,
-                             StringRef{optarg});
-        break;
-      case 48:
-        // --tls-proto-list
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_PROTO_LIST, StringRef{optarg});
-        break;
-      case 49:
-        // --padding
-        cmdcfgs.emplace_back(SHRPX_OPT_PADDING, StringRef{optarg});
-        break;
-      case 50:
-        // --worker-read-rate
-        cmdcfgs.emplace_back(SHRPX_OPT_WORKER_READ_RATE, StringRef{optarg});
-        break;
-      case 51:
-        // --worker-read-burst
-        cmdcfgs.emplace_back(SHRPX_OPT_WORKER_READ_BURST, StringRef{optarg});
-        break;
-      case 52:
-        // --worker-write-rate
-        cmdcfgs.emplace_back(SHRPX_OPT_WORKER_WRITE_RATE, StringRef{optarg});
-        break;
-      case 53:
-        // --worker-write-burst
-        cmdcfgs.emplace_back(SHRPX_OPT_WORKER_WRITE_BURST, StringRef{optarg});
-        break;
-      case 54:
-        // --altsvc
-        cmdcfgs.emplace_back(SHRPX_OPT_ALTSVC, StringRef{optarg});
-        break;
-      case 55:
-        // --add-response-header
-        cmdcfgs.emplace_back(SHRPX_OPT_ADD_RESPONSE_HEADER, StringRef{optarg});
-        break;
-      case 56:
-        // --worker-frontend-connections
-        cmdcfgs.emplace_back(SHRPX_OPT_WORKER_FRONTEND_CONNECTIONS,
-                             StringRef{optarg});
-        break;
-      case 57:
-        // --accesslog-syslog
-        cmdcfgs.emplace_back(SHRPX_OPT_ACCESSLOG_SYSLOG,
-                             StringRef::from_lit("yes"));
-        break;
-      case 58:
-        // --errorlog-file
-        cmdcfgs.emplace_back(SHRPX_OPT_ERRORLOG_FILE, StringRef{optarg});
-        break;
-      case 59:
-        // --errorlog-syslog
-        cmdcfgs.emplace_back(SHRPX_OPT_ERRORLOG_SYSLOG,
-                             StringRef::from_lit("yes"));
-        break;
-      case 60:
-        // --stream-read-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_STREAM_READ_TIMEOUT, StringRef{optarg});
-        break;
-      case 61:
-        // --stream-write-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_STREAM_WRITE_TIMEOUT, StringRef{optarg});
-        break;
-      case 62:
-        // --no-location-rewrite
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_LOCATION_REWRITE,
-                             StringRef::from_lit("yes"));
-        break;
-      case 63:
-        // --backend-http1-connections-per-host
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP1_CONNECTIONS_PER_HOST,
-                             StringRef{optarg});
-        break;
-      case 64:
-        // --listener-disable-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_LISTENER_DISABLE_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 65:
-        // --strip-incoming-x-forwarded-for
-        cmdcfgs.emplace_back(SHRPX_OPT_STRIP_INCOMING_X_FORWARDED_FOR,
-                             StringRef::from_lit("yes"));
-        break;
-      case 66:
-        // --accesslog-format
-        cmdcfgs.emplace_back(SHRPX_OPT_ACCESSLOG_FORMAT, StringRef{optarg});
-        break;
-      case 67:
-        // --backend-http1-connections-per-frontend
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP1_CONNECTIONS_PER_FRONTEND,
-                             StringRef{optarg});
-        break;
-      case 68:
-        // --tls-ticket-key-file
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_FILE, StringRef{optarg});
-        break;
-      case 69:
-        // --rlimit-nofile
-        cmdcfgs.emplace_back(SHRPX_OPT_RLIMIT_NOFILE, StringRef{optarg});
-        break;
-      case 71:
-        // --backend-response-buffer
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_RESPONSE_BUFFER,
-                             StringRef{optarg});
-        break;
-      case 72:
-        // --backend-request-buffer
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_REQUEST_BUFFER,
-                             StringRef{optarg});
-        break;
-      case 73:
-        // --no-host-rewrite
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_HOST_REWRITE,
-                             StringRef::from_lit("yes"));
-        break;
-      case 74:
-        // --no-server-push
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_SERVER_PUSH,
-                             StringRef::from_lit("yes"));
-        break;
-      case 76:
-        // --backend-http2-connections-per-worker
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_CONNECTIONS_PER_WORKER,
-                             StringRef{optarg});
-        break;
-      case 77:
-        // --fetch-ocsp-response-file
-        cmdcfgs.emplace_back(SHRPX_OPT_FETCH_OCSP_RESPONSE_FILE,
-                             StringRef{optarg});
-        break;
-      case 78:
-        // --ocsp-update-interval
-        cmdcfgs.emplace_back(SHRPX_OPT_OCSP_UPDATE_INTERVAL, StringRef{optarg});
-        break;
-      case 79:
-        // --no-ocsp
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_OCSP, StringRef::from_lit("yes"));
-        break;
-      case 80:
-        // --header-field-buffer
-        cmdcfgs.emplace_back(SHRPX_OPT_HEADER_FIELD_BUFFER, StringRef{optarg});
-        break;
-      case 81:
-        // --max-header-fields
-        cmdcfgs.emplace_back(SHRPX_OPT_MAX_HEADER_FIELDS, StringRef{optarg});
-        break;
-      case 82:
-        // --add-request-header
-        cmdcfgs.emplace_back(SHRPX_OPT_ADD_REQUEST_HEADER, StringRef{optarg});
-        break;
-      case 83:
-        // --include
-        cmdcfgs.emplace_back(SHRPX_OPT_INCLUDE, StringRef{optarg});
-        break;
-      case 84:
-        // --tls-ticket-key-cipher
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_CIPHER,
-                             StringRef{optarg});
-        break;
-      case 85:
-        // --host-rewrite
-        cmdcfgs.emplace_back(SHRPX_OPT_HOST_REWRITE,
-                             StringRef::from_lit("yes"));
-        break;
-      case 86:
-        // --tls-session-cache-memcached
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED,
-                             StringRef{optarg});
-        break;
-      case 87:
-        // --tls-ticket-key-memcached
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED,
-                             StringRef{optarg});
-        break;
-      case 88:
-        // --tls-ticket-key-memcached-interval
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_INTERVAL,
-                             StringRef{optarg});
-        break;
-      case 89:
-        // --tls-ticket-key-memcached-max-retry
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_MAX_RETRY,
-                             StringRef{optarg});
-        break;
-      case 90:
-        // --tls-ticket-key-memcached-max-fail
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_MAX_FAIL,
-                             StringRef{optarg});
-        break;
-      case 91:
-        // --mruby-file
-        cmdcfgs.emplace_back(SHRPX_OPT_MRUBY_FILE, StringRef{optarg});
-        break;
-      case 93:
-        // --accept-proxy-protocol
-        cmdcfgs.emplace_back(SHRPX_OPT_ACCEPT_PROXY_PROTOCOL,
-                             StringRef::from_lit("yes"));
-        break;
-      case 94:
-        // --fastopen
-        cmdcfgs.emplace_back(SHRPX_OPT_FASTOPEN, StringRef{optarg});
-        break;
-      case 95:
-        // --tls-dyn-rec-warmup-threshold
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_DYN_REC_WARMUP_THRESHOLD,
-                             StringRef{optarg});
-        break;
-      case 96:
-        // --tls-dyn-rec-idle-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_DYN_REC_IDLE_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 97:
-        // --add-forwarded
-        cmdcfgs.emplace_back(SHRPX_OPT_ADD_FORWARDED, StringRef{optarg});
-        break;
-      case 98:
-        // --strip-incoming-forwarded
-        cmdcfgs.emplace_back(SHRPX_OPT_STRIP_INCOMING_FORWARDED,
-                             StringRef::from_lit("yes"));
-        break;
-      case 99:
-        // --forwarded-by
-        cmdcfgs.emplace_back(SHRPX_OPT_FORWARDED_BY, StringRef{optarg});
-        break;
-      case 100:
-        // --forwarded-for
-        cmdcfgs.emplace_back(SHRPX_OPT_FORWARDED_FOR, StringRef{optarg});
-        break;
-      case 101:
-        // --response-header-field-buffer
-        cmdcfgs.emplace_back(SHRPX_OPT_RESPONSE_HEADER_FIELD_BUFFER,
-                             StringRef{optarg});
-        break;
-      case 102:
-        // --max-response-header-fields
-        cmdcfgs.emplace_back(SHRPX_OPT_MAX_RESPONSE_HEADER_FIELDS,
-                             StringRef{optarg});
-        break;
-      case 103:
-        // --no-http2-cipher-black-list
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_HTTP2_CIPHER_BLACK_LIST,
-                             StringRef::from_lit("yes"));
-        break;
-      case 104:
-        // --request-header-field-buffer
-        cmdcfgs.emplace_back(SHRPX_OPT_REQUEST_HEADER_FIELD_BUFFER,
-                             StringRef{optarg});
-        break;
-      case 105:
-        // --max-request-header-fields
-        cmdcfgs.emplace_back(SHRPX_OPT_MAX_REQUEST_HEADER_FIELDS,
-                             StringRef{optarg});
-        break;
-      case 106:
-        // --backend-http1-tls
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP1_TLS,
-                             StringRef::from_lit("yes"));
-        break;
-      case 108:
-        // --tls-session-cache-memcached-tls
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_TLS,
-                             StringRef::from_lit("yes"));
-        break;
-      case 109:
-        // --tls-session-cache-memcached-cert-file
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_CERT_FILE,
-                             StringRef{optarg});
-        break;
-      case 110:
-        // --tls-session-cache-memcached-private-key-file
-        cmdcfgs.emplace_back(
-            SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_PRIVATE_KEY_FILE,
-            StringRef{optarg});
-        break;
-      case 111:
-        // --tls-ticket-key-memcached-tls
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_TLS,
-                             StringRef::from_lit("yes"));
-        break;
-      case 112:
-        // --tls-ticket-key-memcached-cert-file
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_CERT_FILE,
-                             StringRef{optarg});
-        break;
-      case 113:
-        // --tls-ticket-key-memcached-private-key-file
-        cmdcfgs.emplace_back(
-            SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_PRIVATE_KEY_FILE,
-            StringRef{optarg});
-        break;
-      case 114:
-        // --tls-ticket-key-memcached-address-family
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_ADDRESS_FAMILY,
-                             StringRef{optarg});
-        break;
-      case 115:
-        // --tls-session-cache-memcached-address-family
-        cmdcfgs.emplace_back(
-            SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_ADDRESS_FAMILY,
-            StringRef{optarg});
-        break;
-      case 116:
-        // --backend-address-family
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_ADDRESS_FAMILY,
-                             StringRef{optarg});
-        break;
-      case 117:
-        // --frontend-http2-max-concurrent-streams
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS,
-                             StringRef{optarg});
-        break;
-      case 118:
-        // --backend-http2-max-concurrent-streams
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS,
-                             StringRef{optarg});
-        break;
-      case 119:
-        // --backend-connections-per-frontend
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_CONNECTIONS_PER_FRONTEND,
-                             StringRef{optarg});
-        break;
-      case 120:
-        // --backend-tls
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_TLS, StringRef::from_lit("yes"));
-        break;
-      case 121:
-        // --backend-connections-per-host
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_CONNECTIONS_PER_HOST,
-                             StringRef{optarg});
-        break;
-      case 122:
-        // --error-page
-        cmdcfgs.emplace_back(SHRPX_OPT_ERROR_PAGE, StringRef{optarg});
-        break;
-      case 123:
-        // --no-kqueue
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_KQUEUE, StringRef::from_lit("yes"));
-        break;
-      case 124:
-        // --frontend-http2-settings-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_SETTINGS_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 125:
-        // --backend-http2-settings-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_SETTINGS_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 126:
-        // --api-max-request-body
-        cmdcfgs.emplace_back(SHRPX_OPT_API_MAX_REQUEST_BODY, StringRef{optarg});
-        break;
-      case 127:
-        // --backend-max-backoff
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_MAX_BACKOFF, StringRef{optarg});
-        break;
-      case 128:
-        // --server-name
-        cmdcfgs.emplace_back(SHRPX_OPT_SERVER_NAME, StringRef{optarg});
-        break;
-      case 129:
-        // --no-server-rewrite
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_SERVER_REWRITE,
-                             StringRef::from_lit("yes"));
-        break;
-      case 130:
-        // --frontend-http2-optimize-write-buffer-size
-        cmdcfgs.emplace_back(
-            SHRPX_OPT_FRONTEND_HTTP2_OPTIMIZE_WRITE_BUFFER_SIZE,
-            StringRef::from_lit("yes"));
-        break;
-      case 131:
-        // --frontend-http2-optimize-window-size
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_OPTIMIZE_WINDOW_SIZE,
-                             StringRef::from_lit("yes"));
-        break;
-      case 132:
-        // --frontend-http2-window-size
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_WINDOW_SIZE,
-                             StringRef{optarg});
-        break;
-      case 133:
-        // --frontend-http2-connection-window-size
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE,
-                             StringRef{optarg});
-        break;
-      case 134:
-        // --backend-http2-window-size
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_WINDOW_SIZE,
-                             StringRef{optarg});
-        break;
-      case 135:
-        // --backend-http2-connection-window-size
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE,
-                             StringRef{optarg});
-        break;
-      case 136:
-        // --frontend-http2-encoder-dynamic-table-size
-        cmdcfgs.emplace_back(
-            SHRPX_OPT_FRONTEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE,
-            StringRef{optarg});
-        break;
-      case 137:
-        // --frontend-http2-decoder-dynamic-table-size
-        cmdcfgs.emplace_back(
-            SHRPX_OPT_FRONTEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE,
-            StringRef{optarg});
-        break;
-      case 138:
-        // --backend-http2-encoder-dynamic-table-size
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE,
-                             StringRef{optarg});
-        break;
-      case 139:
-        // --backend-http2-decoder-dynamic-table-size
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE,
-                             StringRef{optarg});
-        break;
-      case 140:
-        // --ecdh-curves
-        cmdcfgs.emplace_back(SHRPX_OPT_ECDH_CURVES, StringRef{optarg});
-        break;
-      case 141:
-        // --tls-sct-dir
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_SCT_DIR, StringRef{optarg});
-        break;
-      case 142:
-        // --backend-connect-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_BACKEND_CONNECT_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 143:
-        // --dns-cache-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_DNS_CACHE_TIMEOUT, StringRef{optarg});
-        break;
-      case 144:
-        // --dns-lookup-timeou
-        cmdcfgs.emplace_back(SHRPX_OPT_DNS_LOOKUP_TIMEOUT, StringRef{optarg});
-        break;
-      case 145:
-        // --dns-max-try
-        cmdcfgs.emplace_back(SHRPX_OPT_DNS_MAX_TRY, StringRef{optarg});
-        break;
-      case 146:
-        // --frontend-keep-alive-timeout
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_KEEP_ALIVE_TIMEOUT,
-                             StringRef{optarg});
-        break;
-      case 147:
-        // --psk-secrets
-        cmdcfgs.emplace_back(SHRPX_OPT_PSK_SECRETS, StringRef{optarg});
-        break;
-      case 148:
-        // --client-psk-secrets
-        cmdcfgs.emplace_back(SHRPX_OPT_CLIENT_PSK_SECRETS, StringRef{optarg});
-        break;
-      case 149:
-        // --client-no-http2-cipher-black-list
-        cmdcfgs.emplace_back(SHRPX_OPT_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST,
-                             StringRef::from_lit("yes"));
-        break;
-      case 150:
-        // --client-ciphers
-        cmdcfgs.emplace_back(SHRPX_OPT_CLIENT_CIPHERS, StringRef{optarg});
-        break;
-      case 151:
-        // --accesslog-write-early
-        cmdcfgs.emplace_back(SHRPX_OPT_ACCESSLOG_WRITE_EARLY,
-                             StringRef::from_lit("yes"));
-        break;
-      case 152:
-        // --tls-min-proto-version
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_MIN_PROTO_VERSION,
-                             StringRef{optarg});
-        break;
-      case 153:
-        // --tls-max-proto-version
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_MAX_PROTO_VERSION,
-                             StringRef{optarg});
-        break;
-      case 154:
-        // --redirect-https-port
-        cmdcfgs.emplace_back(SHRPX_OPT_REDIRECT_HTTPS_PORT, StringRef{optarg});
-        break;
-      case 155:
-        // --frontend-max-requests
-        cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_MAX_REQUESTS,
-                             StringRef{optarg});
-        break;
-      case 156:
-        // --single-thread
-        cmdcfgs.emplace_back(SHRPX_OPT_SINGLE_THREAD,
-                             StringRef::from_lit("yes"));
-        break;
-      case 157:
-        // --no-add-x-forwarded-proto
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_ADD_X_FORWARDED_PROTO,
-                             StringRef::from_lit("yes"));
-        break;
-      case 158:
-        // --no-strip-incoming-x-forwarded-proto
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_STRIP_INCOMING_X_FORWARDED_PROTO,
-                             StringRef::from_lit("yes"));
-        break;
-      case 159:
-        // --single-process
-        cmdcfgs.emplace_back(SHRPX_OPT_SINGLE_PROCESS,
-                             StringRef::from_lit("yes"));
-        break;
-      case 160:
-        // --verify-client-tolerate-expired
-        cmdcfgs.emplace_back(SHRPX_OPT_VERIFY_CLIENT_TOLERATE_EXPIRED,
-                             StringRef::from_lit("yes"));
-        break;
-      case 161:
-        // --ignore-per-pattern-mruby-error
-        cmdcfgs.emplace_back(SHRPX_OPT_IGNORE_PER_PATTERN_MRUBY_ERROR,
-                             StringRef::from_lit("yes"));
-        break;
-      case 162:
-        // --tls-no-postpone-early-data
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_NO_POSTPONE_EARLY_DATA,
-                             StringRef::from_lit("yes"));
-        break;
-      case 163:
-        // --tls-max-early-data
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS_MAX_EARLY_DATA, StringRef{optarg});
-        break;
-      case 164:
-        // --tls13-ciphers
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS13_CIPHERS, StringRef{optarg});
-        break;
-      case 165:
-        // --tls13-client-ciphers
-        cmdcfgs.emplace_back(SHRPX_OPT_TLS13_CLIENT_CIPHERS, StringRef{optarg});
-        break;
-      case 166:
-        // --no-strip-incoming-early-data
-        cmdcfgs.emplace_back(SHRPX_OPT_NO_STRIP_INCOMING_EARLY_DATA,
-                             StringRef::from_lit("yes"));
-        break;
-      default:
-        break;
-      }
-      break;
-    default:
-      break;
-    }
-  }
-
-  if (argc - optind >= 2) {
-    cmdcfgs.emplace_back(SHRPX_OPT_PRIVATE_KEY_FILE, StringRef{argv[optind++]});
-    cmdcfgs.emplace_back(SHRPX_OPT_CERTIFICATE_FILE, StringRef{argv[optind++]});
-  }
-
-  rv = process_options(mod_config(), cmdcfgs);
-  if (rv != 0) {
-    return -1;
-  }
-
-  if (event_loop() != 0) {
-    return -1;
-  }
-
-  LOG(NOTICE) << "Shutdown momentarily";
-
-  delete_log_config();
-
-  return 0;
-}
-
-} // namespace shrpx
-
-int main(int argc, char **argv) { return run_app(shrpx::main, argc, argv); }
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1526 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_client_handler.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-
-#include <cerrno>
-
-#include "shrpx_upstream.h"
-#include "shrpx_http2_upstream.h"
-#include "shrpx_https_upstream.h"
-#include "shrpx_config.h"
-#include "shrpx_http_downstream_connection.h"
-#include "shrpx_http2_downstream_connection.h"
-#include "shrpx_tls.h"
-#include "shrpx_worker.h"
-#include "shrpx_downstream_connection_pool.h"
-#include "shrpx_downstream.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_api_downstream_connection.h"
-#include "shrpx_health_monitor_downstream_connection.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "template.h"
-#include "tls.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto handler = static_cast<ClientHandler *>(conn->data);
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, handler) << "Time out";
-  }
-
-  delete handler;
-}
-} // namespace
-
-namespace {
-void shutdowncb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto handler = static_cast<ClientHandler *>(w->data);
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, handler) << "Close connection due to TLS renegotiation";
-  }
-
-  delete handler;
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto handler = static_cast<ClientHandler *>(conn->data);
-
-  if (handler->do_read() != 0) {
-    delete handler;
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto handler = static_cast<ClientHandler *>(conn->data);
-
-  if (handler->do_write() != 0) {
-    delete handler;
-    return;
-  }
-}
-} // namespace
-
-int ClientHandler::noop() { return 0; }
-
-int ClientHandler::read_clear() {
-  rb_.ensure_chunk();
-  for (;;) {
-    if (rb_.rleft() && on_read() != 0) {
-      return -1;
-    }
-    if (rb_.rleft() == 0) {
-      rb_.reset();
-    } else if (rb_.wleft() == 0) {
-      conn_.rlimit.stopw();
-      return 0;
-    }
-
-    if (!ev_is_active(&conn_.rev)) {
-      return 0;
-    }
-
-    auto nread = conn_.read_clear(rb_.last(), rb_.wleft());
-
-    if (nread == 0) {
-      if (rb_.rleft() == 0) {
-        rb_.release_chunk();
-      }
-      return 0;
-    }
-
-    if (nread < 0) {
-      return -1;
-    }
-
-    rb_.write(nread);
-  }
-}
-
-int ClientHandler::write_clear() {
-  std::array<iovec, 2> iov;
-
-  for (;;) {
-    if (on_write() != 0) {
-      return -1;
-    }
-
-    auto iovcnt = upstream_->response_riovec(iov.data(), iov.size());
-    if (iovcnt == 0) {
-      break;
-    }
-
-    auto nwrite = conn_.writev_clear(iov.data(), iovcnt);
-    if (nwrite < 0) {
-      return -1;
-    }
-
-    if (nwrite == 0) {
-      return 0;
-    }
-
-    upstream_->response_drain(nwrite);
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int ClientHandler::tls_handshake() {
-  ev_timer_again(conn_.loop, &conn_.rt);
-
-  ERR_clear_error();
-
-  auto rv = conn_.tls_handshake();
-
-  if (rv == SHRPX_ERR_INPROGRESS) {
-    return 0;
-  }
-
-  if (rv < 0) {
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "SSL/TLS handshake completed";
-  }
-
-  if (validate_next_proto() != 0) {
-    return -1;
-  }
-
-  read_ = &ClientHandler::read_tls;
-  write_ = &ClientHandler::write_tls;
-
-  return 0;
-}
-
-int ClientHandler::read_tls() {
-  ERR_clear_error();
-
-  rb_.ensure_chunk();
-
-  for (;;) {
-    // we should process buffered data first before we read EOF.
-    if (rb_.rleft() && on_read() != 0) {
-      return -1;
-    }
-    if (rb_.rleft() == 0) {
-      rb_.reset();
-    } else if (rb_.wleft() == 0) {
-      conn_.rlimit.stopw();
-      return 0;
-    }
-
-    if (!ev_is_active(&conn_.rev)) {
-      return 0;
-    }
-
-    auto nread = conn_.read_tls(rb_.last(), rb_.wleft());
-
-    if (nread == 0) {
-      if (rb_.rleft() == 0) {
-        rb_.release_chunk();
-      }
-      return 0;
-    }
-
-    if (nread < 0) {
-      return -1;
-    }
-
-    rb_.write(nread);
-  }
-}
-
-int ClientHandler::write_tls() {
-  struct iovec iov;
-
-  ERR_clear_error();
-
-  if (on_write() != 0) {
-    return -1;
-  }
-
-  auto iovcnt = upstream_->response_riovec(&iov, 1);
-  if (iovcnt == 0) {
-    conn_.start_tls_write_idle();
-
-    conn_.wlimit.stopw();
-    ev_timer_stop(conn_.loop, &conn_.wt);
-
-    return 0;
-  }
-
-  for (;;) {
-    auto nwrite = conn_.write_tls(iov.iov_base, iov.iov_len);
-    if (nwrite < 0) {
-      return -1;
-    }
-
-    if (nwrite == 0) {
-      return 0;
-    }
-
-    upstream_->response_drain(nwrite);
-
-    iovcnt = upstream_->response_riovec(&iov, 1);
-    if (iovcnt == 0) {
-      return 0;
-    }
-  }
-}
-
-int ClientHandler::upstream_noop() { return 0; }
-
-int ClientHandler::upstream_read() {
-  assert(upstream_);
-  if (upstream_->on_read() != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ClientHandler::upstream_write() {
-  assert(upstream_);
-  if (upstream_->on_write() != 0) {
-    return -1;
-  }
-
-  if (get_should_close_after_write() && upstream_->response_empty()) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int ClientHandler::upstream_http2_connhd_read() {
-  auto nread = std::min(left_connhd_len_, rb_.rleft());
-  if (memcmp(NGHTTP2_CLIENT_MAGIC + NGHTTP2_CLIENT_MAGIC_LEN - left_connhd_len_,
-             rb_.pos(), nread) != 0) {
-    // There is no downgrade path here. Just drop the connection.
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "invalid client connection header";
-    }
-
-    return -1;
-  }
-
-  left_connhd_len_ -= nread;
-  rb_.drain(nread);
-  conn_.rlimit.startw();
-
-  if (left_connhd_len_ == 0) {
-    on_read_ = &ClientHandler::upstream_read;
-    // Run on_read to process data left in buffer since they are not
-    // notified further
-    if (on_read() != 0) {
-      return -1;
-    }
-    return 0;
-  }
-
-  return 0;
-}
-
-int ClientHandler::upstream_http1_connhd_read() {
-  auto nread = std::min(left_connhd_len_, rb_.rleft());
-  if (memcmp(NGHTTP2_CLIENT_MAGIC + NGHTTP2_CLIENT_MAGIC_LEN - left_connhd_len_,
-             rb_.pos(), nread) != 0) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "This is HTTP/1.1 connection, "
-                       << "but may be upgraded to HTTP/2 later.";
-    }
-
-    // Reset header length for later HTTP/2 upgrade
-    left_connhd_len_ = NGHTTP2_CLIENT_MAGIC_LEN;
-    on_read_ = &ClientHandler::upstream_read;
-    on_write_ = &ClientHandler::upstream_write;
-
-    if (on_read() != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-
-  left_connhd_len_ -= nread;
-  rb_.drain(nread);
-  conn_.rlimit.startw();
-
-  if (left_connhd_len_ == 0) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "direct HTTP/2 connection";
-    }
-
-    direct_http2_upgrade();
-    on_read_ = &ClientHandler::upstream_read;
-    on_write_ = &ClientHandler::upstream_write;
-
-    // Run on_read to process data left in buffer since they are not
-    // notified further
-    if (on_read() != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-
-  return 0;
-}
-
-ClientHandler::ClientHandler(Worker *worker, int fd, SSL *ssl,
-                             const StringRef &ipaddr, const StringRef &port,
-                             int family, const UpstreamAddr *faddr)
-    : // We use balloc_ for TLS session ID (64), ipaddr (IPv6) (39),
-      // port (5), forwarded-for (IPv6) (41), alpn (5), proxyproto
-      // ipaddr (15), proxyproto port (5), sni (32, estimated).  we
-      // need terminal NULL byte for each.  We also require 8 bytes
-      // header for each allocation.  We align at 16 bytes boundary,
-      // so the required space is 64 + 48 + 16 + 48 + 16 + 16 + 16 +
-      // 32 + 8 + 8 * 8 = 328.
-      balloc_(512, 512),
-      rb_(worker->get_mcpool()),
-      conn_(worker->get_loop(), fd, ssl, worker->get_mcpool(),
-            get_config()->conn.upstream.timeout.write,
-            get_config()->conn.upstream.timeout.read,
-            get_config()->conn.upstream.ratelimit.write,
-            get_config()->conn.upstream.ratelimit.read, writecb, readcb,
-            timeoutcb, this, get_config()->tls.dyn_rec.warmup_threshold,
-            get_config()->tls.dyn_rec.idle_timeout, PROTO_NONE),
-      ipaddr_(make_string_ref(balloc_, ipaddr)),
-      port_(make_string_ref(balloc_, port)),
-      faddr_(faddr),
-      worker_(worker),
-      left_connhd_len_(NGHTTP2_CLIENT_MAGIC_LEN),
-      affinity_hash_(0),
-      should_close_after_write_(false),
-      affinity_hash_computed_(false) {
-
-  ++worker_->get_worker_stat()->num_connections;
-
-  ev_timer_init(&reneg_shutdown_timer_, shutdowncb, 0., 0.);
-
-  reneg_shutdown_timer_.data = this;
-
-  conn_.rlimit.startw();
-  ev_timer_again(conn_.loop, &conn_.rt);
-
-  auto config = get_config();
-
-  if (faddr_->accept_proxy_protocol ||
-      config->conn.upstream.accept_proxy_protocol) {
-    read_ = &ClientHandler::read_clear;
-    write_ = &ClientHandler::noop;
-    on_read_ = &ClientHandler::proxy_protocol_read;
-    on_write_ = &ClientHandler::upstream_noop;
-  } else {
-    setup_upstream_io_callback();
-  }
-
-  auto &fwdconf = config->http.forwarded;
-
-  if (fwdconf.params & FORWARDED_FOR) {
-    if (fwdconf.for_node_type == FORWARDED_NODE_OBFUSCATED) {
-      // 1 for '_'
-      auto len = SHRPX_OBFUSCATED_NODE_LENGTH + 1;
-      // 1 for terminating NUL.
-      auto buf = make_byte_ref(balloc_, len + 1);
-      auto p = buf.base;
-      *p++ = '_';
-      p = util::random_alpha_digit(p, p + SHRPX_OBFUSCATED_NODE_LENGTH,
-                                   worker_->get_randgen());
-      *p = '\0';
-
-      forwarded_for_ = StringRef{buf.base, p};
-    } else if (!faddr_->accept_proxy_protocol &&
-               !config->conn.upstream.accept_proxy_protocol) {
-      init_forwarded_for(family, ipaddr_);
-    }
-  }
-}
-
-void ClientHandler::init_forwarded_for(int family, const StringRef &ipaddr) {
-  if (family == AF_INET6) {
-    // 2 for '[' and ']'
-    auto len = 2 + ipaddr.size();
-    // 1 for terminating NUL.
-    auto buf = make_byte_ref(balloc_, len + 1);
-    auto p = buf.base;
-    *p++ = '[';
-    p = std::copy(std::begin(ipaddr), std::end(ipaddr), p);
-    *p++ = ']';
-    *p = '\0';
-
-    forwarded_for_ = StringRef{buf.base, p};
-  } else {
-    // family == AF_INET or family == AF_UNIX
-    forwarded_for_ = ipaddr;
-  }
-}
-
-void ClientHandler::setup_upstream_io_callback() {
-  if (conn_.tls.ssl) {
-    conn_.prepare_server_handshake();
-    read_ = write_ = &ClientHandler::tls_handshake;
-    on_read_ = &ClientHandler::upstream_noop;
-    on_write_ = &ClientHandler::upstream_write;
-  } else {
-    // For non-TLS version, first create HttpsUpstream. It may be
-    // upgraded to HTTP/2 through HTTP Upgrade or direct HTTP/2
-    // connection.
-    upstream_ = make_unique<HttpsUpstream>(this);
-    alpn_ = StringRef::from_lit("http/1.1");
-    read_ = &ClientHandler::read_clear;
-    write_ = &ClientHandler::write_clear;
-    on_read_ = &ClientHandler::upstream_http1_connhd_read;
-    on_write_ = &ClientHandler::upstream_noop;
-  }
-}
-
-ClientHandler::~ClientHandler() {
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Deleting";
-  }
-
-  if (upstream_) {
-    upstream_->on_handler_delete();
-  }
-
-  auto worker_stat = worker_->get_worker_stat();
-  --worker_stat->num_connections;
-
-  if (worker_stat->num_connections == 0) {
-    worker_->schedule_clear_mcpool();
-  }
-
-  ev_timer_stop(conn_.loop, &reneg_shutdown_timer_);
-
-  // TODO If backend is http/2, and it is in CONNECTED state, signal
-  // it and make it loopbreak when output is zero.
-  if (worker_->get_graceful_shutdown() && worker_stat->num_connections == 0) {
-    ev_break(conn_.loop);
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Deleted";
-  }
-}
-
-Upstream *ClientHandler::get_upstream() { return upstream_.get(); }
-
-struct ev_loop *ClientHandler::get_loop() const {
-  return conn_.loop;
-}
-
-void ClientHandler::reset_upstream_read_timeout(ev_tstamp t) {
-  conn_.rt.repeat = t;
-  if (ev_is_active(&conn_.rt)) {
-    ev_timer_again(conn_.loop, &conn_.rt);
-  }
-}
-
-void ClientHandler::reset_upstream_write_timeout(ev_tstamp t) {
-  conn_.wt.repeat = t;
-  if (ev_is_active(&conn_.wt)) {
-    ev_timer_again(conn_.loop, &conn_.wt);
-  }
-}
-
-void ClientHandler::repeat_read_timer() {
-  ev_timer_again(conn_.loop, &conn_.rt);
-}
-
-void ClientHandler::stop_read_timer() { ev_timer_stop(conn_.loop, &conn_.rt); }
-
-int ClientHandler::validate_next_proto() {
-  const unsigned char *next_proto = nullptr;
-  unsigned int next_proto_len = 0;
-
-  // First set callback for catch all cases
-  on_read_ = &ClientHandler::upstream_read;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_get0_next_proto_negotiated(conn_.tls.ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (next_proto == nullptr) {
-    SSL_get0_alpn_selected(conn_.tls.ssl, &next_proto, &next_proto_len);
-  }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  StringRef proto;
-
-  if (next_proto) {
-    proto = StringRef{next_proto, next_proto_len};
-
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "The negotiated next protocol: " << proto;
-    }
-  } else {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "No protocol negotiated. Fallback to HTTP/1.1";
-    }
-
-    proto = StringRef::from_lit("http/1.1");
-  }
-
-  if (!tls::in_proto_list(get_config()->tls.npn_list, proto)) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "The negotiated protocol is not supported: " << proto;
-    }
-    return -1;
-  }
-
-  if (util::check_h2_is_selected(proto)) {
-    on_read_ = &ClientHandler::upstream_http2_connhd_read;
-
-    auto http2_upstream = make_unique<Http2Upstream>(this);
-
-    upstream_ = std::move(http2_upstream);
-    alpn_ = make_string_ref(balloc_, proto);
-
-    // At this point, input buffer is already filled with some bytes.
-    // The read callback is not called until new data come. So consume
-    // input buffer here.
-    if (on_read() != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-
-  if (proto == StringRef::from_lit("http/1.1")) {
-    upstream_ = make_unique<HttpsUpstream>(this);
-    alpn_ = StringRef::from_lit("http/1.1");
-
-    // At this point, input buffer is already filled with some bytes.
-    // The read callback is not called until new data come. So consume
-    // input buffer here.
-    if (on_read() != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "The negotiated protocol is not supported";
-  }
-  return -1;
-}
-
-int ClientHandler::do_read() { return read_(*this); }
-int ClientHandler::do_write() { return write_(*this); }
-
-int ClientHandler::on_read() {
-  if (rb_.chunk_avail()) {
-    auto rv = on_read_(*this);
-    if (rv != 0) {
-      return rv;
-    }
-  }
-  conn_.handle_tls_pending_read();
-  return 0;
-}
-int ClientHandler::on_write() { return on_write_(*this); }
-
-const StringRef &ClientHandler::get_ipaddr() const { return ipaddr_; }
-
-bool ClientHandler::get_should_close_after_write() const {
-  return should_close_after_write_;
-}
-
-void ClientHandler::set_should_close_after_write(bool f) {
-  should_close_after_write_ = f;
-}
-
-void ClientHandler::pool_downstream_connection(
-    std::unique_ptr<DownstreamConnection> dconn) {
-  if (!dconn->poolable()) {
-    return;
-  }
-
-  dconn->set_client_handler(nullptr);
-
-  auto &group = dconn->get_downstream_addr_group();
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Pooling downstream connection DCONN:" << dconn.get()
-                     << " in group " << group;
-  }
-
-  auto &shared_addr = group->shared_addr;
-
-  if (shared_addr->affinity.type == AFFINITY_NONE) {
-    auto &dconn_pool = group->shared_addr->dconn_pool;
-    dconn_pool.add_downstream_connection(std::move(dconn));
-
-    return;
-  }
-
-  auto addr = dconn->get_addr();
-  auto &dconn_pool = addr->dconn_pool;
-  dconn_pool->add_downstream_connection(std::move(dconn));
-}
-
-void ClientHandler::remove_downstream_connection(DownstreamConnection *dconn) {
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Removing downstream connection DCONN:" << dconn
-                     << " from pool";
-  }
-  auto &dconn_pool =
-      dconn->get_downstream_addr_group()->shared_addr->dconn_pool;
-  dconn_pool.remove_downstream_connection(dconn);
-}
-
-namespace {
-// Computes 32bits hash for session affinity for IP address |ip|.
-uint32_t compute_affinity_from_ip(const StringRef &ip) {
-  int rv;
-  std::array<uint8_t, 32> buf;
-
-  rv = util::sha256(buf.data(), ip);
-  if (rv != 0) {
-    // Not sure when sha256 failed.  Just fall back to another
-    // function.
-    return util::hash32(ip);
-  }
-
-  return (static_cast<uint32_t>(buf[0]) << 24) |
-         (static_cast<uint32_t>(buf[1]) << 16) |
-         (static_cast<uint32_t>(buf[2]) << 8) | static_cast<uint32_t>(buf[3]);
-}
-} // namespace
-
-Http2Session *ClientHandler::select_http2_session_with_affinity(
-    const std::shared_ptr<DownstreamAddrGroup> &group, DownstreamAddr *addr) {
-  auto &shared_addr = group->shared_addr;
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Selected DownstreamAddr=" << addr
-                     << ", index=" << (addr - shared_addr->addrs.data());
-  }
-
-  for (auto session = addr->http2_extra_freelist.head; session;) {
-    auto next = session->dlnext;
-
-    if (session->max_concurrency_reached(0)) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this)
-            << "Maximum streams have been reached for Http2Session(" << session
-            << ").  Skip it";
-      }
-
-      session->remove_from_freelist();
-      session = next;
-
-      continue;
-    }
-
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "Use Http2Session " << session
-                       << " from http2_extra_freelist";
-    }
-
-    if (session->max_concurrency_reached(1)) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "Maximum streams are reached for Http2Session("
-                         << session << ").";
-      }
-
-      session->remove_from_freelist();
-    }
-    return session;
-  }
-
-  auto session = new Http2Session(conn_.loop, worker_->get_cl_ssl_ctx(),
-                                  worker_, group, addr);
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Create new Http2Session " << session;
-  }
-
-  session->add_to_extra_freelist();
-
-  return session;
-}
-
-namespace {
-// Returns true if load of |lhs| is lighter than that of |rhs|.
-// Currently, we assume that lesser streams means lesser load.
-bool load_lighter(const DownstreamAddr *lhs, const DownstreamAddr *rhs) {
-  return lhs->num_dconn < rhs->num_dconn;
-}
-} // namespace
-
-Http2Session *ClientHandler::select_http2_session(
-    const std::shared_ptr<DownstreamAddrGroup> &group) {
-  auto &shared_addr = group->shared_addr;
-
-  // First count the working backend addresses.
-  size_t min = 0;
-  for (const auto &addr : shared_addr->addrs) {
-    if (addr.proto != PROTO_HTTP2 || addr.connect_blocker->blocked()) {
-      continue;
-    }
-
-    ++min;
-  }
-
-  if (min == 0) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "No working backend address found";
-    }
-
-    return nullptr;
-  }
-
-  auto &http2_avail_freelist = shared_addr->http2_avail_freelist;
-
-  if (http2_avail_freelist.size() >= min) {
-    for (auto session = http2_avail_freelist.head; session;) {
-      auto next = session->dlnext;
-
-      session->remove_from_freelist();
-
-      // session may be in graceful shutdown period now.
-      if (session->max_concurrency_reached(0)) {
-        if (LOG_ENABLED(INFO)) {
-          CLOG(INFO, this)
-              << "Maximum streams have been reached for Http2Session("
-              << session << ").  Skip it";
-        }
-
-        session = next;
-
-        continue;
-      }
-
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "Use Http2Session " << session
-                         << " from http2_avail_freelist";
-      }
-
-      if (session->max_concurrency_reached(1)) {
-        if (LOG_ENABLED(INFO)) {
-          CLOG(INFO, this) << "Maximum streams are reached for Http2Session("
-                           << session << ").";
-        }
-      } else {
-        session->add_to_avail_freelist();
-      }
-      return session;
-    }
-  }
-
-  DownstreamAddr *selected_addr = nullptr;
-
-  for (auto &addr : shared_addr->addrs) {
-    if (addr.in_avail || addr.proto != PROTO_HTTP2 ||
-        (addr.http2_extra_freelist.size() == 0 &&
-         addr.connect_blocker->blocked())) {
-      continue;
-    }
-
-    for (auto session = addr.http2_extra_freelist.head; session;) {
-      auto next = session->dlnext;
-
-      // session may be in graceful shutdown period now.
-      if (session->max_concurrency_reached(0)) {
-        if (LOG_ENABLED(INFO)) {
-          CLOG(INFO, this)
-              << "Maximum streams have been reached for Http2Session("
-              << session << ").  Skip it";
-        }
-
-        session->remove_from_freelist();
-
-        session = next;
-
-        continue;
-      }
-
-      break;
-    }
-
-    if (selected_addr == nullptr || load_lighter(&addr, selected_addr)) {
-      selected_addr = &addr;
-    }
-  }
-
-  assert(selected_addr);
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Selected DownstreamAddr=" << selected_addr
-                     << ", index="
-                     << (selected_addr - shared_addr->addrs.data());
-  }
-
-  if (selected_addr->http2_extra_freelist.size()) {
-    auto session = selected_addr->http2_extra_freelist.head;
-    session->remove_from_freelist();
-
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "Use Http2Session " << session
-                       << " from http2_extra_freelist";
-    }
-
-    if (session->max_concurrency_reached(1)) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "Maximum streams are reached for Http2Session("
-                         << session << ").";
-      }
-    } else {
-      session->add_to_avail_freelist();
-    }
-    return session;
-  }
-
-  auto session = new Http2Session(conn_.loop, worker_->get_cl_ssl_ctx(),
-                                  worker_, group, selected_addr);
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Create new Http2Session " << session;
-  }
-
-  session->add_to_avail_freelist();
-
-  return session;
-}
-
-namespace {
-// The chosen value is small enough for uint32_t, and large enough for
-// the number of backend.
-constexpr uint32_t WEIGHT_MAX = 65536;
-} // namespace
-
-namespace {
-bool pri_less(const WeightedPri &lhs, const WeightedPri &rhs) {
-  if (lhs.cycle < rhs.cycle) {
-    return rhs.cycle - lhs.cycle <= WEIGHT_MAX;
-  }
-
-  return lhs.cycle - rhs.cycle > WEIGHT_MAX;
-}
-} // namespace
-
-namespace {
-uint32_t next_cycle(const WeightedPri &pri) {
-  return pri.cycle + WEIGHT_MAX / std::min(WEIGHT_MAX, pri.weight);
-}
-} // namespace
-
-uint32_t ClientHandler::get_affinity_cookie(Downstream *downstream,
-                                            const StringRef &cookie_name) {
-  auto h = downstream->find_affinity_cookie(cookie_name);
-  if (h) {
-    return h;
-  }
-
-  auto d = std::uniform_int_distribution<uint32_t>(
-      1, std::numeric_limits<uint32_t>::max());
-  auto rh = d(worker_->get_randgen());
-  h = util::hash32(StringRef{reinterpret_cast<uint8_t *>(&rh),
-                             reinterpret_cast<uint8_t *>(&rh) + sizeof(rh)});
-
-  downstream->renew_affinity_cookie(h);
-
-  return h;
-}
-
-std::unique_ptr<DownstreamConnection>
-ClientHandler::get_downstream_connection(int &err, Downstream *downstream,
-                                         shrpx_proto pref_proto) {
-  size_t group_idx;
-  auto &downstreamconf = *worker_->get_downstream_config();
-  auto &routerconf = downstreamconf.router;
-
-  auto catch_all = downstreamconf.addr_group_catch_all;
-  auto &groups = worker_->get_downstream_addr_groups();
-
-  const auto &req = downstream->request();
-
-  err = 0;
-
-  switch (faddr_->alt_mode) {
-  case ALTMODE_API:
-    return make_unique<APIDownstreamConnection>(worker_);
-  case ALTMODE_HEALTHMON:
-    return make_unique<HealthMonitorDownstreamConnection>();
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-
-  // Fast path.  If we have one group, it must be catch-all group.
-  if (groups.size() == 1) {
-    group_idx = 0;
-  } else {
-    StringRef authority;
-    if (faddr_->sni_fwd) {
-      authority = sni_;
-    } else if (!req.authority.empty()) {
-      authority = req.authority;
-    } else {
-      auto h = req.fs.header(http2::HD_HOST);
-      if (h) {
-        authority = h->value;
-      }
-    }
-
-    StringRef path;
-    // CONNECT method does not have path.  But we requires path in
-    // host-path mapping.  As workaround, we assume that path is "/".
-    if (req.method != HTTP_CONNECT) {
-      path = req.path;
-    }
-
-    group_idx = match_downstream_addr_group(routerconf, authority, path, groups,
-                                            catch_all, balloc);
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "Downstream address group_idx: " << group_idx;
-  }
-
-  if (groups[group_idx]->shared_addr->redirect_if_not_tls && !conn_.tls.ssl) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "Downstream address group " << group_idx
-                       << " requires frontend TLS connection.";
-    }
-    err = SHRPX_ERR_TLS_REQUIRED;
-    return nullptr;
-  }
-
-  auto &group = groups[group_idx];
-  auto &shared_addr = group->shared_addr;
-
-  if (shared_addr->affinity.type != AFFINITY_NONE) {
-    uint32_t hash;
-    switch (shared_addr->affinity.type) {
-    case AFFINITY_IP:
-      if (!affinity_hash_computed_) {
-        affinity_hash_ = compute_affinity_from_ip(ipaddr_);
-        affinity_hash_computed_ = true;
-      }
-      hash = affinity_hash_;
-      break;
-    case AFFINITY_COOKIE:
-      hash = get_affinity_cookie(downstream, shared_addr->affinity.cookie.name);
-      break;
-    default:
-      assert(0);
-    }
-
-    const auto &affinity_hash = shared_addr->affinity_hash;
-
-    auto it = std::lower_bound(
-        std::begin(affinity_hash), std::end(affinity_hash), hash,
-        [](const AffinityHash &lhs, uint32_t rhs) { return lhs.hash < rhs; });
-
-    if (it == std::end(affinity_hash)) {
-      it = std::begin(affinity_hash);
-    }
-
-    auto aff_idx =
-        static_cast<size_t>(std::distance(std::begin(affinity_hash), it));
-    auto idx = (*it).idx;
-    auto addr = &shared_addr->addrs[idx];
-
-    if (addr->connect_blocker->blocked()) {
-      size_t i;
-      for (i = aff_idx + 1; i != aff_idx; ++i) {
-        if (i == shared_addr->affinity_hash.size()) {
-          i = 0;
-        }
-        addr = &shared_addr->addrs[shared_addr->affinity_hash[i].idx];
-        if (addr->connect_blocker->blocked() ||
-            (pref_proto != PROTO_NONE && pref_proto != addr->proto)) {
-          continue;
-        }
-        break;
-      }
-      if (i == aff_idx) {
-        err = -1;
-        return nullptr;
-      }
-      aff_idx = i;
-    }
-
-    if (addr->proto == PROTO_HTTP2) {
-      auto http2session = select_http2_session_with_affinity(group, addr);
-
-      auto dconn = make_unique<Http2DownstreamConnection>(http2session);
-
-      dconn->set_client_handler(this);
-
-      return std::move(dconn);
-    }
-
-    auto &dconn_pool = addr->dconn_pool;
-    auto dconn = dconn_pool->pop_downstream_connection();
-
-    if (!dconn) {
-      dconn = make_unique<HttpDownstreamConnection>(group, aff_idx, conn_.loop,
-                                                    worker_);
-    }
-
-    dconn->set_client_handler(this);
-
-    return dconn;
-  }
-
-  auto http1_weight = shared_addr->http1_pri.weight;
-  auto http2_weight = shared_addr->http2_pri.weight;
-
-  auto proto = PROTO_NONE;
-
-  if (pref_proto == PROTO_HTTP1) {
-    if (http1_weight > 0) {
-      proto = PROTO_HTTP1;
-    }
-  } else if (pref_proto == PROTO_HTTP2) {
-    if (http2_weight > 0) {
-      proto = PROTO_HTTP2;
-    }
-  } else if (http1_weight > 0 && http2_weight > 0) {
-    // We only advance cycle if both weight has nonzero to keep its
-    // distance under WEIGHT_MAX.
-    if (pri_less(shared_addr->http1_pri, shared_addr->http2_pri)) {
-      proto = PROTO_HTTP1;
-      shared_addr->http1_pri.cycle = next_cycle(shared_addr->http1_pri);
-    } else {
-      proto = PROTO_HTTP2;
-      shared_addr->http2_pri.cycle = next_cycle(shared_addr->http2_pri);
-    }
-  } else if (http1_weight > 0) {
-    proto = PROTO_HTTP1;
-  } else if (http2_weight > 0) {
-    proto = PROTO_HTTP2;
-  }
-
-  if (proto == PROTO_NONE) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "No working downstream address found";
-    }
-
-    err = -1;
-    return nullptr;
-  }
-
-  if (proto == PROTO_HTTP2) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "Downstream connection pool is empty."
-                       << " Create new one";
-    }
-
-    auto http2session = select_http2_session(group);
-
-    if (http2session == nullptr) {
-      err = -1;
-      return nullptr;
-    }
-
-    auto dconn = make_unique<Http2DownstreamConnection>(http2session);
-
-    dconn->set_client_handler(this);
-
-    return std::move(dconn);
-  }
-
-  auto &dconn_pool = shared_addr->dconn_pool;
-
-  // pool connection must be HTTP/1.1 connection
-  auto dconn = dconn_pool.pop_downstream_connection();
-
-  if (dconn) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "Reuse downstream connection DCONN:" << dconn.get()
-                       << " from pool";
-    }
-  } else {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "Downstream connection pool is empty."
-                       << " Create new one";
-    }
-
-    dconn =
-        make_unique<HttpDownstreamConnection>(group, 0, conn_.loop, worker_);
-  }
-
-  dconn->set_client_handler(this);
-
-  return dconn;
-}
-
-MemchunkPool *ClientHandler::get_mcpool() { return worker_->get_mcpool(); }
-
-SSL *ClientHandler::get_ssl() const { return conn_.tls.ssl; }
-
-void ClientHandler::direct_http2_upgrade() {
-  upstream_ = make_unique<Http2Upstream>(this);
-  alpn_ = StringRef::from_lit(NGHTTP2_CLEARTEXT_PROTO_VERSION_ID);
-  on_read_ = &ClientHandler::upstream_read;
-  write_ = &ClientHandler::write_clear;
-}
-
-int ClientHandler::perform_http2_upgrade(HttpsUpstream *http) {
-  auto upstream = make_unique<Http2Upstream>(this);
-
-  auto output = upstream->get_response_buf();
-
-  // We might have written non-final header in response_buf, in this
-  // case, response_state is still INITIAL.  If this non-final header
-  // and upgrade header fit in output buffer, do upgrade.  Otherwise,
-  // to avoid to send this non-final header as response body in HTTP/2
-  // upstream, fail upgrade.
-  auto downstream = http->get_downstream();
-  auto input = downstream->get_response_buf();
-
-  if (upstream->upgrade_upstream(http) != 0) {
-    return -1;
-  }
-  // http pointer is now owned by upstream.
-  upstream_.release();
-  // TODO We might get other version id in HTTP2-settings, if we
-  // support aliasing for h2, but we just use library default for now.
-  alpn_ = StringRef::from_lit(NGHTTP2_CLEARTEXT_PROTO_VERSION_ID);
-  on_read_ = &ClientHandler::upstream_http2_connhd_read;
-  write_ = &ClientHandler::write_clear;
-
-  input->remove(*output, input->rleft());
-
-  constexpr auto res =
-      StringRef::from_lit("HTTP/1.1 101 Switching Protocols\r\n"
-                          "Connection: Upgrade\r\n"
-                          "Upgrade: " NGHTTP2_CLEARTEXT_PROTO_VERSION_ID "\r\n"
-                          "\r\n");
-
-  output->append(res);
-  upstream_ = std::move(upstream);
-
-  signal_write();
-  return 0;
-}
-
-bool ClientHandler::get_http2_upgrade_allowed() const { return !conn_.tls.ssl; }
-
-StringRef ClientHandler::get_upstream_scheme() const {
-  if (conn_.tls.ssl) {
-    return StringRef::from_lit("https");
-  } else {
-    return StringRef::from_lit("http");
-  }
-}
-
-void ClientHandler::start_immediate_shutdown() {
-  ev_timer_start(conn_.loop, &reneg_shutdown_timer_);
-}
-
-void ClientHandler::write_accesslog(Downstream *downstream) {
-  auto &req = downstream->request();
-
-  auto config = get_config();
-
-  if (!req.tstamp) {
-    auto lgconf = log_config();
-    lgconf->update_tstamp(std::chrono::system_clock::now());
-    req.tstamp = lgconf->tstamp;
-  }
-
-  upstream_accesslog(
-      config->logging.access.format,
-      LogSpec{
-          downstream,
-          ipaddr_,
-          alpn_,
-          sni_,
-          conn_.tls.ssl,
-          std::chrono::high_resolution_clock::now(), // request_end_time
-          port_,
-          faddr_->port,
-          config->pid,
-      });
-}
-
-ClientHandler::ReadBuf *ClientHandler::get_rb() { return &rb_; }
-
-void ClientHandler::signal_write() { conn_.wlimit.startw(); }
-
-RateLimit *ClientHandler::get_rlimit() { return &conn_.rlimit; }
-RateLimit *ClientHandler::get_wlimit() { return &conn_.wlimit; }
-
-ev_io *ClientHandler::get_wev() { return &conn_.wev; }
-
-Worker *ClientHandler::get_worker() const { return worker_; }
-
-namespace {
-ssize_t parse_proxy_line_port(const uint8_t *first, const uint8_t *last) {
-  auto p = first;
-  int32_t port = 0;
-
-  if (p == last) {
-    return -1;
-  }
-
-  if (*p == '0') {
-    if (p + 1 != last && util::is_digit(*(p + 1))) {
-      return -1;
-    }
-    return 1;
-  }
-
-  for (; p != last && util::is_digit(*p); ++p) {
-    port *= 10;
-    port += *p - '0';
-
-    if (port > 65535) {
-      return -1;
-    }
-  }
-
-  return p - first;
-}
-} // namespace
-
-int ClientHandler::on_proxy_protocol_finish() {
-  if (conn_.tls.ssl) {
-    conn_.tls.rbuf.append(rb_.pos(), rb_.rleft());
-    rb_.reset();
-  }
-
-  setup_upstream_io_callback();
-
-  // Run on_read to process data left in buffer since they are not
-  // notified further
-  if (on_read() != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-// http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
-int ClientHandler::proxy_protocol_read() {
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "PROXY-protocol: Started";
-  }
-
-  auto first = rb_.pos();
-
-  // NULL character really destroys functions which expects NULL
-  // terminated string.  We won't expect it in PROXY protocol line, so
-  // find it here.
-  auto chrs = std::array<char, 2>{{'\n', '\0'}};
-
-  constexpr size_t MAX_PROXY_LINELEN = 107;
-
-  auto bufend = rb_.pos() + std::min(MAX_PROXY_LINELEN, rb_.rleft());
-
-  auto end =
-      std::find_first_of(rb_.pos(), bufend, std::begin(chrs), std::end(chrs));
-
-  if (end == bufend || *end == '\0' || end == rb_.pos() || *(end - 1) != '\r') {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: No ending CR LF sequence found";
-    }
-    return -1;
-  }
-
-  --end;
-
-  constexpr auto HEADER = StringRef::from_lit("PROXY ");
-
-  if (static_cast<size_t>(end - rb_.pos()) < HEADER.size()) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: PROXY version 1 ID not found";
-    }
-    return -1;
-  }
-
-  if (!util::streq(HEADER, StringRef{rb_.pos(), HEADER.size()})) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Bad PROXY protocol version 1 ID";
-    }
-    return -1;
-  }
-
-  rb_.drain(HEADER.size());
-
-  int family;
-
-  if (rb_.pos()[0] == 'T') {
-    if (end - rb_.pos() < 5) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "PROXY-protocol-v1: INET protocol family not found";
-      }
-      return -1;
-    }
-
-    if (rb_.pos()[1] != 'C' || rb_.pos()[2] != 'P') {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "PROXY-protocol-v1: Unknown INET protocol family";
-      }
-      return -1;
-    }
-
-    switch (rb_.pos()[3]) {
-    case '4':
-      family = AF_INET;
-      break;
-    case '6':
-      family = AF_INET6;
-      break;
-    default:
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "PROXY-protocol-v1: Unknown INET protocol family";
-      }
-      return -1;
-    }
-
-    rb_.drain(5);
-  } else {
-    if (end - rb_.pos() < 7) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "PROXY-protocol-v1: INET protocol family not found";
-      }
-      return -1;
-    }
-    if (!util::streq_l("UNKNOWN", rb_.pos(), 7)) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, this) << "PROXY-protocol-v1: Unknown INET protocol family";
-      }
-      return -1;
-    }
-
-    rb_.drain(end + 2 - rb_.pos());
-
-    return on_proxy_protocol_finish();
-  }
-
-  // source address
-  auto token_end = std::find(rb_.pos(), end, ' ');
-  if (token_end == end) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Source address not found";
-    }
-    return -1;
-  }
-
-  *token_end = '\0';
-  if (!util::numeric_host(reinterpret_cast<const char *>(rb_.pos()), family)) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Invalid source address";
-    }
-    return -1;
-  }
-
-  auto src_addr = rb_.pos();
-  auto src_addrlen = token_end - rb_.pos();
-
-  rb_.drain(token_end - rb_.pos() + 1);
-
-  // destination address
-  token_end = std::find(rb_.pos(), end, ' ');
-  if (token_end == end) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Destination address not found";
-    }
-    return -1;
-  }
-
-  *token_end = '\0';
-  if (!util::numeric_host(reinterpret_cast<const char *>(rb_.pos()), family)) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Invalid destination address";
-    }
-    return -1;
-  }
-
-  // Currently we don't use destination address
-
-  rb_.drain(token_end - rb_.pos() + 1);
-
-  // source port
-  auto n = parse_proxy_line_port(rb_.pos(), end);
-  if (n <= 0 || *(rb_.pos() + n) != ' ') {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Invalid source port";
-    }
-    return -1;
-  }
-
-  rb_.pos()[n] = '\0';
-  auto src_port = rb_.pos();
-  auto src_portlen = n;
-
-  rb_.drain(n + 1);
-
-  // destination  port
-  n = parse_proxy_line_port(rb_.pos(), end);
-  if (n <= 0 || rb_.pos() + n != end) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, this) << "PROXY-protocol-v1: Invalid destination port";
-    }
-    return -1;
-  }
-
-  // Currently we don't use destination port
-
-  rb_.drain(end + 2 - rb_.pos());
-
-  ipaddr_ =
-      make_string_ref(balloc_, StringRef{src_addr, src_addr + src_addrlen});
-  port_ = make_string_ref(balloc_, StringRef{src_port, src_port + src_portlen});
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, this) << "PROXY-protocol-v1: Finished, " << (rb_.pos() - first)
-                     << " bytes read";
-  }
-
-  auto config = get_config();
-  auto &fwdconf = config->http.forwarded;
-
-  if ((fwdconf.params & FORWARDED_FOR) &&
-      fwdconf.for_node_type == FORWARDED_NODE_IP) {
-    init_forwarded_for(family, ipaddr_);
-  }
-
-  return on_proxy_protocol_finish();
-}
-
-StringRef ClientHandler::get_forwarded_by() const {
-  auto &fwdconf = get_config()->http.forwarded;
-
-  if (fwdconf.by_node_type == FORWARDED_NODE_OBFUSCATED) {
-    return fwdconf.by_obfuscated;
-  }
-
-  return faddr_->hostport;
-}
-
-StringRef ClientHandler::get_forwarded_for() const { return forwarded_for_; }
-
-const UpstreamAddr *ClientHandler::get_upstream_addr() const { return faddr_; }
-
-Connection *ClientHandler::get_connection() { return &conn_; };
-
-void ClientHandler::set_tls_sni(const StringRef &sni) {
-  sni_ = make_string_ref(balloc_, sni);
-}
-
-StringRef ClientHandler::get_tls_sni() const { return sni_; }
-
-StringRef ClientHandler::get_alpn() const { return alpn_; }
-
-BlockAllocator &ClientHandler::get_block_allocator() { return balloc_; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_client_handler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_CLIENT_HANDLER_H
-#define SHRPX_CLIENT_HANDLER_H
-
-#include "shrpx.h"
-
-#include <memory>
-
-#include <ev.h>
-
-#include <openssl/ssl.h>
-
-#include "shrpx_rate_limit.h"
-#include "shrpx_connection.h"
-#include "buffer.h"
-#include "memchunk.h"
-#include "allocator.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Upstream;
-class DownstreamConnection;
-class HttpsUpstream;
-class ConnectBlocker;
-class DownstreamConnectionPool;
-class Worker;
-class Downstream;
-struct WorkerStat;
-struct DownstreamAddrGroup;
-struct DownstreamAddr;
-
-class ClientHandler {
-public:
-  ClientHandler(Worker *worker, int fd, SSL *ssl, const StringRef &ipaddr,
-                const StringRef &port, int family, const UpstreamAddr *faddr);
-  ~ClientHandler();
-
-  int noop();
-  // Performs clear text I/O
-  int read_clear();
-  int write_clear();
-  // Performs TLS handshake
-  int tls_handshake();
-  // Performs TLS I/O
-  int read_tls();
-  int write_tls();
-
-  int upstream_noop();
-  int upstream_read();
-  int upstream_http2_connhd_read();
-  int upstream_http1_connhd_read();
-  int upstream_write();
-
-  int proxy_protocol_read();
-  int on_proxy_protocol_finish();
-
-  // Performs I/O operation.  Internally calls on_read()/on_write().
-  int do_read();
-  int do_write();
-
-  // Processes buffers.  No underlying I/O operation will be done.
-  int on_read();
-  int on_write();
-
-  struct ev_loop *get_loop() const;
-  void reset_upstream_read_timeout(ev_tstamp t);
-  void reset_upstream_write_timeout(ev_tstamp t);
-
-  int validate_next_proto();
-  const StringRef &get_ipaddr() const;
-  bool get_should_close_after_write() const;
-  void set_should_close_after_write(bool f);
-  Upstream *get_upstream();
-
-  void pool_downstream_connection(std::unique_ptr<DownstreamConnection> dconn);
-  void remove_downstream_connection(DownstreamConnection *dconn);
-  // Returns DownstreamConnection object based on request path.  This
-  // function returns non-null DownstreamConnection, and assigns 0 to
-  // |err| if it succeeds, or returns nullptr, and assigns negative
-  // error code to |err|.  If |pref_proto| is not PROTO_NONE, choose
-  // backend whose protocol is |pref_proto|.
-  std::unique_ptr<DownstreamConnection>
-  get_downstream_connection(int &err, Downstream *downstream,
-                            shrpx_proto pref_proto = PROTO_NONE);
-  MemchunkPool *get_mcpool();
-  SSL *get_ssl() const;
-  // Call this function when HTTP/2 connection header is received at
-  // the start of the connection.
-  void direct_http2_upgrade();
-  // Performs HTTP/2 Upgrade from the connection managed by
-  // |http|. If this function fails, the connection must be
-  // terminated. This function returns 0 if it succeeds, or -1.
-  int perform_http2_upgrade(HttpsUpstream *http);
-  bool get_http2_upgrade_allowed() const;
-  // Returns upstream scheme, either "http" or "https"
-  StringRef get_upstream_scheme() const;
-  void start_immediate_shutdown();
-
-  // Writes upstream accesslog using |downstream|.  The |downstream|
-  // must not be nullptr.
-  void write_accesslog(Downstream *downstream);
-
-  Worker *get_worker() const;
-
-  // Initializes forwarded_for_.
-  void init_forwarded_for(int family, const StringRef &ipaddr);
-
-  using ReadBuf = DefaultMemchunkBuffer;
-
-  ReadBuf *get_rb();
-
-  RateLimit *get_rlimit();
-  RateLimit *get_wlimit();
-
-  void signal_write();
-  ev_io *get_wev();
-
-  void setup_upstream_io_callback();
-
-  // Returns string suitable for use in "by" parameter of Forwarded
-  // header field.
-  StringRef get_forwarded_by() const;
-  // Returns string suitable for use in "for" parameter of Forwarded
-  // header field.
-  StringRef get_forwarded_for() const;
-
-  Http2Session *
-  select_http2_session(const std::shared_ptr<DownstreamAddrGroup> &group);
-
-  Http2Session *select_http2_session_with_affinity(
-      const std::shared_ptr<DownstreamAddrGroup> &group, DownstreamAddr *addr);
-
-  // Returns an affinity cookie value for |downstream|.  |cookie_name|
-  // is used to inspect cookie header field in request header fields.
-  uint32_t get_affinity_cookie(Downstream *downstream,
-                               const StringRef &cookie_name);
-
-  const UpstreamAddr *get_upstream_addr() const;
-
-  void repeat_read_timer();
-  void stop_read_timer();
-
-  Connection *get_connection();
-
-  // Stores |sni| which is TLS SNI extension value client sent in this
-  // connection.
-  void set_tls_sni(const StringRef &sni);
-  // Returns TLS SNI extension value client sent in this connection.
-  StringRef get_tls_sni() const;
-
-  // Returns ALPN negotiated in this connection.
-  StringRef get_alpn() const;
-
-  BlockAllocator &get_block_allocator();
-
-private:
-  // Allocator to allocate memory for connection-wide objects.  Make
-  // sure that the allocations must be bounded, and not proportional
-  // to the number of requests.
-  BlockAllocator balloc_;
-  DefaultMemchunkBuffer rb_;
-  Connection conn_;
-  ev_timer reneg_shutdown_timer_;
-  std::unique_ptr<Upstream> upstream_;
-  // IP address of client.  If UNIX domain socket is used, this is
-  // "localhost".
-  StringRef ipaddr_;
-  StringRef port_;
-  // The ALPN identifier negotiated for this connection.
-  StringRef alpn_;
-  // The client address used in "for" parameter of Forwarded header
-  // field.
-  StringRef forwarded_for_;
-  // lowercased TLS SNI which client sent.
-  StringRef sni_;
-  std::function<int(ClientHandler &)> read_, write_;
-  std::function<int(ClientHandler &)> on_read_, on_write_;
-  // Address of frontend listening socket
-  const UpstreamAddr *faddr_;
-  Worker *worker_;
-  // The number of bytes of HTTP/2 client connection header to read
-  size_t left_connhd_len_;
-  // hash for session affinity using client IP
-  uint32_t affinity_hash_;
-  bool should_close_after_write_;
-  // true if affinity_hash_ is computed
-  bool affinity_hash_computed_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_CLIENT_HANDLER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,4106 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_config.h"
-
-#ifdef HAVE_PWD_H
-#  include <pwd.h>
-#endif // HAVE_PWD_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#ifdef HAVE_SYSLOG_H
-#  include <syslog.h>
-#endif // HAVE_SYSLOG_H
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <dirent.h>
-
-#include <cstring>
-#include <cerrno>
-#include <limits>
-#include <fstream>
-
-#include <nghttp2/nghttp2.h>
-
-#include "http-parser/http_parser.h"
-
-#include "shrpx_log.h"
-#include "shrpx_tls.h"
-#include "shrpx_http.h"
-#ifdef HAVE_MRUBY
-#  include "shrpx_mruby.h"
-#endif // HAVE_MRUBY
-#include "util.h"
-#include "base64.h"
-#include "ssl_compat.h"
-#include "xsi_strerror.h"
-
-namespace shrpx {
-
-namespace {
-Config *config;
-} // namespace
-
-constexpr auto SHRPX_UNIX_PATH_PREFIX = StringRef::from_lit("unix:");
-
-const Config *get_config() { return config; }
-
-Config *mod_config() { return config; }
-
-std::unique_ptr<Config> replace_config(std::unique_ptr<Config> another) {
-  auto p = config;
-  config = another.release();
-  return std::unique_ptr<Config>(p);
-}
-
-void create_config() { config = new Config(); }
-
-Config::~Config() {
-  auto &upstreamconf = http2.upstream;
-
-  nghttp2_option_del(upstreamconf.option);
-  nghttp2_option_del(upstreamconf.alt_mode_option);
-  nghttp2_session_callbacks_del(upstreamconf.callbacks);
-
-  auto &downstreamconf = http2.downstream;
-
-  nghttp2_option_del(downstreamconf.option);
-  nghttp2_session_callbacks_del(downstreamconf.callbacks);
-
-  auto &dumpconf = http2.upstream.debug.dump;
-
-  if (dumpconf.request_header) {
-    fclose(dumpconf.request_header);
-  }
-
-  if (dumpconf.response_header) {
-    fclose(dumpconf.response_header);
-  }
-}
-
-TicketKeys::~TicketKeys() {
-  /* Erase keys from memory */
-  for (auto &key : keys) {
-    memset(&key, 0, sizeof(key));
-  }
-}
-
-namespace {
-int split_host_port(char *host, size_t hostlen, uint16_t *port_ptr,
-                    const StringRef &hostport, const StringRef &opt) {
-  // host and port in |hostport| is separated by single ','.
-  auto sep = std::find(std::begin(hostport), std::end(hostport), ',');
-  if (sep == std::end(hostport)) {
-    LOG(ERROR) << opt << ": Invalid host, port: " << hostport;
-    return -1;
-  }
-  size_t len = sep - std::begin(hostport);
-  if (hostlen < len + 1) {
-    LOG(ERROR) << opt << ": Hostname too long: " << hostport;
-    return -1;
-  }
-  std::copy(std::begin(hostport), sep, host);
-  host[len] = '\0';
-
-  auto portstr = StringRef{sep + 1, std::end(hostport)};
-  auto d = util::parse_uint(portstr);
-  if (1 <= d && d <= std::numeric_limits<uint16_t>::max()) {
-    *port_ptr = d;
-    return 0;
-  }
-
-  LOG(ERROR) << opt << ": Port is invalid: " << portstr;
-  return -1;
-}
-} // namespace
-
-namespace {
-bool is_secure(const StringRef &filename) {
-  struct stat buf;
-  int rv = stat(filename.c_str(), &buf);
-  if (rv == 0) {
-    if ((buf.st_mode & S_IRWXU) && !(buf.st_mode & S_IRWXG) &&
-        !(buf.st_mode & S_IRWXO)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-} // namespace
-
-std::unique_ptr<TicketKeys>
-read_tls_ticket_key_file(const std::vector<StringRef> &files,
-                         const EVP_CIPHER *cipher, const EVP_MD *hmac) {
-  auto ticket_keys = make_unique<TicketKeys>();
-  auto &keys = ticket_keys->keys;
-  keys.resize(files.size());
-  auto enc_keylen = EVP_CIPHER_key_length(cipher);
-  auto hmac_keylen = EVP_MD_size(hmac);
-  if (cipher == EVP_aes_128_cbc()) {
-    // backward compatibility, as a legacy of using same file format
-    // with nginx and apache.
-    hmac_keylen = 16;
-  }
-  auto expectedlen = keys[0].data.name.size() + enc_keylen + hmac_keylen;
-  char buf[256];
-  assert(sizeof(buf) >= expectedlen);
-
-  size_t i = 0;
-  for (auto &file : files) {
-    struct stat fst {};
-
-    if (stat(file.c_str(), &fst) == -1) {
-      auto error = errno;
-      LOG(ERROR) << "tls-ticket-key-file: could not stat file " << file
-                 << ", errno=" << error;
-      return nullptr;
-    }
-
-    if (static_cast<size_t>(fst.st_size) != expectedlen) {
-      LOG(ERROR) << "tls-ticket-key-file: the expected file size is "
-                 << expectedlen << ", the actual file size is " << fst.st_size;
-      return nullptr;
-    }
-
-    std::ifstream f(file.c_str());
-    if (!f) {
-      LOG(ERROR) << "tls-ticket-key-file: could not open file " << file;
-      return nullptr;
-    }
-
-    f.read(buf, expectedlen);
-    if (static_cast<size_t>(f.gcount()) != expectedlen) {
-      LOG(ERROR) << "tls-ticket-key-file: want to read " << expectedlen
-                 << " bytes but only read " << f.gcount() << " bytes from "
-                 << file;
-      return nullptr;
-    }
-
-    auto &key = keys[i++];
-    key.cipher = cipher;
-    key.hmac = hmac;
-    key.hmac_keylen = hmac_keylen;
-
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "enc_keylen=" << enc_keylen
-                << ", hmac_keylen=" << key.hmac_keylen;
-    }
-
-    auto p = buf;
-    std::copy_n(p, key.data.name.size(), std::begin(key.data.name));
-    p += key.data.name.size();
-    std::copy_n(p, enc_keylen, std::begin(key.data.enc_key));
-    p += enc_keylen;
-    std::copy_n(p, hmac_keylen, std::begin(key.data.hmac_key));
-
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "session ticket key: " << util::format_hex(key.data.name);
-    }
-  }
-  return ticket_keys;
-}
-
-FILE *open_file_for_write(const char *filename) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
-#if defined O_CLOEXEC
-  auto fd = open(filename, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC,
-                 S_IRUSR | S_IWUSR);
-#else
-  auto fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-
-  // We get race condition if execve is called at the same time.
-  if (fd != -1) {
-    util::make_socket_closeonexec(fd);
-  }
-#endif
-  if (fd == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Failed to open " << filename << " for writing. Cause: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return nullptr;
-  }
-  auto f = fdopen(fd, "wb");
-  if (f == nullptr) {
-    auto error = errno;
-    LOG(ERROR) << "Failed to open " << filename << " for writing. Cause: "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return nullptr;
-  }
-
-  return f;
-}
-
-namespace {
-// Read passwd from |filename|
-std::string read_passwd_from_file(const StringRef &opt,
-                                  const StringRef &filename) {
-  std::string line;
-
-  if (!is_secure(filename)) {
-    LOG(ERROR) << opt << ": Private key passwd file " << filename
-               << " has insecure mode.";
-    return line;
-  }
-
-  std::ifstream in(filename.c_str(), std::ios::binary);
-  if (!in) {
-    LOG(ERROR) << opt << ": Could not open key passwd file " << filename;
-    return line;
-  }
-
-  std::getline(in, line);
-  return line;
-}
-} // namespace
-
-HeaderRefs::value_type parse_header(BlockAllocator &balloc,
-                                    const StringRef &optarg) {
-  auto colon = std::find(std::begin(optarg), std::end(optarg), ':');
-
-  if (colon == std::end(optarg) || colon == std::begin(optarg)) {
-    return {};
-  }
-
-  auto value = colon + 1;
-  for (; *value == '\t' || *value == ' '; ++value)
-    ;
-
-  auto name_iov =
-      make_byte_ref(balloc, std::distance(std::begin(optarg), colon) + 1);
-  auto p = name_iov.base;
-  p = std::copy(std::begin(optarg), colon, p);
-  util::inp_strlower(name_iov.base, p);
-  *p = '\0';
-
-  auto nv =
-      HeaderRef(StringRef{name_iov.base, p},
-                make_string_ref(balloc, StringRef{value, std::end(optarg)}));
-
-  if (!nghttp2_check_header_name(nv.name.byte(), nv.name.size()) ||
-      !nghttp2_check_header_value(nv.value.byte(), nv.value.size())) {
-    return {};
-  }
-
-  return nv;
-}
-
-template <typename T>
-int parse_uint(T *dest, const StringRef &opt, const StringRef &optarg) {
-  auto val = util::parse_uint(optarg);
-  if (val == -1) {
-    LOG(ERROR) << opt << ": bad value.  Specify an integer >= 0.";
-    return -1;
-  }
-
-  *dest = val;
-
-  return 0;
-}
-
-namespace {
-template <typename T>
-int parse_uint_with_unit(T *dest, const StringRef &opt,
-                         const StringRef &optarg) {
-  auto n = util::parse_uint_with_unit(optarg);
-  if (n == -1) {
-    LOG(ERROR) << opt << ": bad value: '" << optarg << "'";
-    return -1;
-  }
-
-  if (static_cast<uint64_t>(std::numeric_limits<T>::max()) <
-      static_cast<uint64_t>(n)) {
-    LOG(ERROR) << opt
-               << ": too large.  The value should be less than or equal to "
-               << std::numeric_limits<T>::max();
-    return -1;
-  }
-
-  *dest = n;
-
-  return 0;
-}
-} // namespace
-
-// Parses |optarg| as signed integer.  This requires |optarg| to be
-// NULL-terminated string.
-template <typename T>
-int parse_int(T *dest, const StringRef &opt, const char *optarg) {
-  char *end = nullptr;
-
-  errno = 0;
-
-  auto val = strtol(optarg, &end, 10);
-
-  if (!optarg[0] || errno != 0 || *end) {
-    LOG(ERROR) << opt << ": bad value.  Specify an integer.";
-    return -1;
-  }
-
-  *dest = val;
-
-  return 0;
-}
-
-namespace {
-// generated by gennghttpxfun.py
-LogFragmentType log_var_lookup_token(const char *name, size_t namelen) {
-  switch (namelen) {
-  case 3:
-    switch (name[2]) {
-    case 'd':
-      if (util::strieq_l("pi", name, 2)) {
-        return SHRPX_LOGF_PID;
-      }
-      break;
-    }
-    break;
-  case 4:
-    switch (name[3]) {
-    case 'n':
-      if (util::strieq_l("alp", name, 3)) {
-        return SHRPX_LOGF_ALPN;
-      }
-      break;
-    }
-    break;
-  case 6:
-    switch (name[5]) {
-    case 's':
-      if (util::strieq_l("statu", name, 5)) {
-        return SHRPX_LOGF_STATUS;
-      }
-      break;
-    }
-    break;
-  case 7:
-    switch (name[6]) {
-    case 'i':
-      if (util::strieq_l("tls_sn", name, 6)) {
-        return SHRPX_LOGF_TLS_SNI;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("reques", name, 6)) {
-        return SHRPX_LOGF_REQUEST;
-      }
-      break;
-    }
-    break;
-  case 10:
-    switch (name[9]) {
-    case 'l':
-      if (util::strieq_l("time_loca", name, 9)) {
-        return SHRPX_LOGF_TIME_LOCAL;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("ssl_ciphe", name, 9)) {
-        return SHRPX_LOGF_SSL_CIPHER;
-      }
-      if (util::strieq_l("tls_ciphe", name, 9)) {
-        return SHRPX_LOGF_TLS_CIPHER;
-      }
-      break;
-    }
-    break;
-  case 11:
-    switch (name[10]) {
-    case 'r':
-      if (util::strieq_l("remote_add", name, 10)) {
-        return SHRPX_LOGF_REMOTE_ADDR;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("remote_por", name, 10)) {
-        return SHRPX_LOGF_REMOTE_PORT;
-      }
-      if (util::strieq_l("server_por", name, 10)) {
-        return SHRPX_LOGF_SERVER_PORT;
-      }
-      break;
-    }
-    break;
-  case 12:
-    switch (name[11]) {
-    case '1':
-      if (util::strieq_l("time_iso860", name, 11)) {
-        return SHRPX_LOGF_TIME_ISO8601;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("request_tim", name, 11)) {
-        return SHRPX_LOGF_REQUEST_TIME;
-      }
-      break;
-    case 'l':
-      if (util::strieq_l("ssl_protoco", name, 11)) {
-        return SHRPX_LOGF_SSL_PROTOCOL;
-      }
-      if (util::strieq_l("tls_protoco", name, 11)) {
-        return SHRPX_LOGF_TLS_PROTOCOL;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend_hos", name, 11)) {
-        return SHRPX_LOGF_BACKEND_HOST;
-      }
-      if (util::strieq_l("backend_por", name, 11)) {
-        return SHRPX_LOGF_BACKEND_PORT;
-      }
-      break;
-    }
-    break;
-  case 14:
-    switch (name[13]) {
-    case 'd':
-      if (util::strieq_l("ssl_session_i", name, 13)) {
-        return SHRPX_LOGF_SSL_SESSION_ID;
-      }
-      if (util::strieq_l("tls_session_i", name, 13)) {
-        return SHRPX_LOGF_TLS_SESSION_ID;
-      }
-      break;
-    }
-    break;
-  case 15:
-    switch (name[14]) {
-    case 't':
-      if (util::strieq_l("body_bytes_sen", name, 14)) {
-        return SHRPX_LOGF_BODY_BYTES_SENT;
-      }
-      break;
-    }
-    break;
-  case 17:
-    switch (name[16]) {
-    case 'l':
-      if (util::strieq_l("tls_client_seria", name, 16)) {
-        return SHRPX_LOGF_TLS_CLIENT_SERIAL;
-      }
-      break;
-    }
-    break;
-  case 18:
-    switch (name[17]) {
-    case 'd':
-      if (util::strieq_l("ssl_session_reuse", name, 17)) {
-        return SHRPX_LOGF_SSL_SESSION_REUSED;
-      }
-      if (util::strieq_l("tls_session_reuse", name, 17)) {
-        return SHRPX_LOGF_TLS_SESSION_REUSED;
-      }
-      break;
-    }
-    break;
-  case 22:
-    switch (name[21]) {
-    case 'e':
-      if (util::strieq_l("tls_client_issuer_nam", name, 21)) {
-        return SHRPX_LOGF_TLS_CLIENT_ISSUER_NAME;
-      }
-      break;
-    }
-    break;
-  case 23:
-    switch (name[22]) {
-    case 'e':
-      if (util::strieq_l("tls_client_subject_nam", name, 22)) {
-        return SHRPX_LOGF_TLS_CLIENT_SUBJECT_NAME;
-      }
-      break;
-    }
-    break;
-  case 27:
-    switch (name[26]) {
-    case '1':
-      if (util::strieq_l("tls_client_fingerprint_sha", name, 26)) {
-        return SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA1;
-      }
-      break;
-    }
-    break;
-  case 29:
-    switch (name[28]) {
-    case '6':
-      if (util::strieq_l("tls_client_fingerprint_sha25", name, 28)) {
-        return SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA256;
-      }
-      break;
-    }
-    break;
-  }
-  return SHRPX_LOGF_NONE;
-}
-} // namespace
-
-namespace {
-bool var_token(char c) {
-  return util::is_alpha(c) || util::is_digit(c) || c == '_';
-}
-} // namespace
-
-std::vector<LogFragment> parse_log_format(BlockAllocator &balloc,
-                                          const StringRef &optarg) {
-  auto literal_start = std::begin(optarg);
-  auto p = literal_start;
-  auto eop = std::end(optarg);
-
-  auto res = std::vector<LogFragment>();
-
-  for (; p != eop;) {
-    if (*p != '$') {
-      ++p;
-      continue;
-    }
-
-    auto var_start = p;
-
-    ++p;
-
-    const char *var_name;
-    size_t var_namelen;
-    if (p != eop && *p == '{') {
-      var_name = ++p;
-      for (; p != eop && var_token(*p); ++p)
-        ;
-
-      if (p == eop || *p != '}') {
-        LOG(WARN) << "Missing '}' after " << StringRef{var_start, p};
-        continue;
-      }
-
-      var_namelen = p - var_name;
-      ++p;
-    } else {
-      var_name = p;
-      for (; p != eop && var_token(*p); ++p)
-        ;
-
-      var_namelen = p - var_name;
-    }
-
-    const char *value = nullptr;
-
-    auto type = log_var_lookup_token(var_name, var_namelen);
-
-    if (type == SHRPX_LOGF_NONE) {
-      if (util::istarts_with_l(StringRef{var_name, var_namelen}, "http_")) {
-        if (util::streq_l("host", StringRef{var_name + str_size("http_"),
-                                            var_namelen - str_size("http_")})) {
-          // Special handling of host header field.  We will use
-          // :authority header field if host header is missing.  This
-          // is a typical case in HTTP/2.
-          type = SHRPX_LOGF_AUTHORITY;
-        } else {
-          type = SHRPX_LOGF_HTTP;
-          value = var_name + str_size("http_");
-        }
-      } else {
-        LOG(WARN) << "Unrecognized log format variable: "
-                  << StringRef{var_name, var_namelen};
-        continue;
-      }
-    }
-
-    if (literal_start < var_start) {
-      res.emplace_back(
-          SHRPX_LOGF_LITERAL,
-          make_string_ref(balloc, StringRef{literal_start, var_start}));
-    }
-
-    literal_start = p;
-
-    if (value == nullptr) {
-      res.emplace_back(type);
-      continue;
-    }
-
-    {
-      auto iov = make_byte_ref(
-          balloc, std::distance(value, var_name + var_namelen) + 1);
-      auto p = iov.base;
-      p = std::copy(value, var_name + var_namelen, p);
-      for (auto cp = iov.base; cp != p; ++cp) {
-        if (*cp == '_') {
-          *cp = '-';
-        }
-      }
-      *p = '\0';
-      res.emplace_back(type, StringRef{iov.base, p});
-    }
-  }
-
-  if (literal_start != eop) {
-    res.emplace_back(SHRPX_LOGF_LITERAL,
-                     make_string_ref(balloc, StringRef{literal_start, eop}));
-  }
-
-  return res;
-}
-
-namespace {
-int parse_address_family(int *dest, const StringRef &opt,
-                         const StringRef &optarg) {
-  if (util::strieq_l("auto", optarg)) {
-    *dest = AF_UNSPEC;
-    return 0;
-  }
-  if (util::strieq_l("IPv4", optarg)) {
-    *dest = AF_INET;
-    return 0;
-  }
-  if (util::strieq_l("IPv6", optarg)) {
-    *dest = AF_INET6;
-    return 0;
-  }
-
-  LOG(ERROR) << opt << ": bad value: '" << optarg << "'";
-  return -1;
-}
-} // namespace
-
-namespace {
-int parse_duration(ev_tstamp *dest, const StringRef &opt,
-                   const StringRef &optarg) {
-  auto t = util::parse_duration_with_unit(optarg);
-  if (t == std::numeric_limits<double>::infinity()) {
-    LOG(ERROR) << opt << ": bad value: '" << optarg << "'";
-    return -1;
-  }
-
-  *dest = t;
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int parse_tls_proto_version(int &dest, const StringRef &opt,
-                            const StringRef &optarg) {
-  auto v = tls::proto_version_from_string(optarg);
-  if (v == -1) {
-    LOG(ERROR) << opt << ": invalid TLS protocol version: " << optarg;
-    return -1;
-  }
-
-  dest = v;
-
-  return 0;
-}
-} // namespace
-
-struct MemcachedConnectionParams {
-  bool tls;
-};
-
-namespace {
-// Parses memcached connection configuration parameter |src_params|,
-// and stores parsed results into |out|.  This function returns 0 if
-// it succeeds, or -1.
-int parse_memcached_connection_params(MemcachedConnectionParams &out,
-                                      const StringRef &src_params,
-                                      const StringRef &opt) {
-  auto last = std::end(src_params);
-  for (auto first = std::begin(src_params); first != last;) {
-    auto end = std::find(first, last, ';');
-    auto param = StringRef{first, end};
-
-    if (util::strieq_l("tls", param)) {
-      out.tls = true;
-    } else if (util::strieq_l("no-tls", param)) {
-      out.tls = false;
-    } else if (!param.empty()) {
-      LOG(ERROR) << opt << ": " << param << ": unknown keyword";
-      return -1;
-    }
-
-    if (end == last) {
-      break;
-    }
-
-    first = end + 1;
-  }
-
-  return 0;
-}
-} // namespace
-
-struct UpstreamParams {
-  int alt_mode;
-  bool tls;
-  bool sni_fwd;
-  bool proxyproto;
-};
-
-namespace {
-// Parses upstream configuration parameter |src_params|, and stores
-// parsed results into |out|.  This function returns 0 if it succeeds,
-// or -1.
-int parse_upstream_params(UpstreamParams &out, const StringRef &src_params) {
-  auto last = std::end(src_params);
-  for (auto first = std::begin(src_params); first != last;) {
-    auto end = std::find(first, last, ';');
-    auto param = StringRef{first, end};
-
-    if (util::strieq_l("tls", param)) {
-      out.tls = true;
-    } else if (util::strieq_l("sni-fwd", param)) {
-      out.sni_fwd = true;
-    } else if (util::strieq_l("no-tls", param)) {
-      out.tls = false;
-    } else if (util::strieq_l("api", param)) {
-      if (out.alt_mode && out.alt_mode != ALTMODE_API) {
-        LOG(ERROR) << "frontend: api and healthmon are mutually exclusive";
-        return -1;
-      }
-      out.alt_mode = ALTMODE_API;
-    } else if (util::strieq_l("healthmon", param)) {
-      if (out.alt_mode && out.alt_mode != ALTMODE_HEALTHMON) {
-        LOG(ERROR) << "frontend: api and healthmon are mutually exclusive";
-        return -1;
-      }
-      out.alt_mode = ALTMODE_HEALTHMON;
-    } else if (util::strieq_l("proxyproto", param)) {
-      out.proxyproto = true;
-    } else if (!param.empty()) {
-      LOG(ERROR) << "frontend: " << param << ": unknown keyword";
-      return -1;
-    }
-
-    if (end == last) {
-      break;
-    }
-
-    first = end + 1;
-  }
-
-  return 0;
-}
-} // namespace
-
-struct DownstreamParams {
-  StringRef sni;
-  StringRef mruby;
-  AffinityConfig affinity;
-  size_t fall;
-  size_t rise;
-  shrpx_proto proto;
-  bool tls;
-  bool dns;
-  bool redirect_if_not_tls;
-  bool upgrade_scheme;
-};
-
-namespace {
-// Parses downstream configuration parameter |src_params|, and stores
-// parsed results into |out|.  This function returns 0 if it succeeds,
-// or -1.
-int parse_downstream_params(DownstreamParams &out,
-                            const StringRef &src_params) {
-  auto last = std::end(src_params);
-  for (auto first = std::begin(src_params); first != last;) {
-    auto end = std::find(first, last, ';');
-    auto param = StringRef{first, end};
-
-    if (util::istarts_with_l(param, "proto=")) {
-      auto protostr = StringRef{first + str_size("proto="), end};
-      if (protostr.empty()) {
-        LOG(ERROR) << "backend: proto: protocol is empty";
-        return -1;
-      }
-
-      if (util::streq_l("h2", std::begin(protostr), protostr.size())) {
-        out.proto = PROTO_HTTP2;
-      } else if (util::streq_l("http/1.1", std::begin(protostr),
-                               protostr.size())) {
-        out.proto = PROTO_HTTP1;
-      } else {
-        LOG(ERROR) << "backend: proto: unknown protocol " << protostr;
-        return -1;
-      }
-    } else if (util::istarts_with_l(param, "fall=")) {
-      auto valstr = StringRef{first + str_size("fall="), end};
-      if (valstr.empty()) {
-        LOG(ERROR) << "backend: fall: non-negative integer is expected";
-        return -1;
-      }
-
-      auto n = util::parse_uint(valstr);
-      if (n == -1) {
-        LOG(ERROR) << "backend: fall: non-negative integer is expected";
-        return -1;
-      }
-
-      out.fall = n;
-    } else if (util::istarts_with_l(param, "rise=")) {
-      auto valstr = StringRef{first + str_size("rise="), end};
-      if (valstr.empty()) {
-        LOG(ERROR) << "backend: rise: non-negative integer is expected";
-        return -1;
-      }
-
-      auto n = util::parse_uint(valstr);
-      if (n == -1) {
-        LOG(ERROR) << "backend: rise: non-negative integer is expected";
-        return -1;
-      }
-
-      out.rise = n;
-    } else if (util::strieq_l("tls", param)) {
-      out.tls = true;
-    } else if (util::strieq_l("no-tls", param)) {
-      out.tls = false;
-    } else if (util::istarts_with_l(param, "sni=")) {
-      out.sni = StringRef{first + str_size("sni="), end};
-    } else if (util::istarts_with_l(param, "affinity=")) {
-      auto valstr = StringRef{first + str_size("affinity="), end};
-      if (util::strieq_l("none", valstr)) {
-        out.affinity.type = AFFINITY_NONE;
-      } else if (util::strieq_l("ip", valstr)) {
-        out.affinity.type = AFFINITY_IP;
-      } else if (util::strieq_l("cookie", valstr)) {
-        out.affinity.type = AFFINITY_COOKIE;
-      } else {
-        LOG(ERROR)
-            << "backend: affinity: value must be one of none, ip, and cookie";
-        return -1;
-      }
-    } else if (util::istarts_with_l(param, "affinity-cookie-name=")) {
-      auto val = StringRef{first + str_size("affinity-cookie-name="), end};
-      if (val.empty()) {
-        LOG(ERROR)
-            << "backend: affinity-cookie-name: non empty string is expected";
-        return -1;
-      }
-      out.affinity.cookie.name = val;
-    } else if (util::istarts_with_l(param, "affinity-cookie-path=")) {
-      out.affinity.cookie.path =
-          StringRef{first + str_size("affinity-cookie-path="), end};
-    } else if (util::istarts_with_l(param, "affinity-cookie-secure=")) {
-      auto valstr = StringRef{first + str_size("affinity-cookie-secure="), end};
-      if (util::strieq_l("auto", valstr)) {
-        out.affinity.cookie.secure = COOKIE_SECURE_AUTO;
-      } else if (util::strieq_l("yes", valstr)) {
-        out.affinity.cookie.secure = COOKIE_SECURE_YES;
-      } else if (util::strieq_l("no", valstr)) {
-        out.affinity.cookie.secure = COOKIE_SECURE_NO;
-      } else {
-        LOG(ERROR) << "backend: affinity-cookie-secure: value must be one of "
-                      "auto, yes, and no";
-        return -1;
-      }
-    } else if (util::strieq_l("dns", param)) {
-      out.dns = true;
-    } else if (util::strieq_l("redirect-if-not-tls", param)) {
-      out.redirect_if_not_tls = true;
-    } else if (util::strieq_l("upgrade-scheme", param)) {
-      out.upgrade_scheme = true;
-    } else if (util::istarts_with_l(param, "mruby=")) {
-      auto valstr = StringRef{first + str_size("mruby="), end};
-      out.mruby = valstr;
-    } else if (!param.empty()) {
-      LOG(ERROR) << "backend: " << param << ": unknown keyword";
-      return -1;
-    }
-
-    if (end == last) {
-      break;
-    }
-
-    first = end + 1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Parses host-path mapping patterns in |src_pattern|, and stores
-// mappings in config.  We will store each host-path pattern found in
-// |src| with |addr|.  |addr| will be copied accordingly.  Also we
-// make a group based on the pattern.  The "/" pattern is considered
-// as catch-all.  We also parse protocol specified in |src_proto|.
-//
-// This function returns 0 if it succeeds, or -1.
-int parse_mapping(Config *config, DownstreamAddrConfig &addr,
-                  std::map<StringRef, size_t> &pattern_addr_indexer,
-                  const StringRef &src_pattern, const StringRef &src_params) {
-  // This returns at least 1 element (it could be empty string).  We
-  // will append '/' to all patterns, so it becomes catch-all pattern.
-  auto mapping = util::split_str(src_pattern, ':');
-  assert(!mapping.empty());
-  auto &downstreamconf = *config->conn.downstream;
-  auto &addr_groups = downstreamconf.addr_groups;
-
-  DownstreamParams params{};
-  params.proto = PROTO_HTTP1;
-
-  if (parse_downstream_params(params, src_params) != 0) {
-    return -1;
-  }
-
-  if (addr.host_unix && params.dns) {
-    LOG(ERROR) << "backend: dns: cannot be used for UNIX domain socket";
-    return -1;
-  }
-
-  if (params.affinity.type == AFFINITY_COOKIE &&
-      params.affinity.cookie.name.empty()) {
-    LOG(ERROR) << "backend: affinity-cookie-name is mandatory if "
-                  "affinity=cookie is specified";
-    return -1;
-  }
-
-  addr.fall = params.fall;
-  addr.rise = params.rise;
-  addr.proto = params.proto;
-  addr.tls = params.tls;
-  addr.sni = make_string_ref(downstreamconf.balloc, params.sni);
-  addr.dns = params.dns;
-  addr.upgrade_scheme = params.upgrade_scheme;
-
-  auto &routerconf = downstreamconf.router;
-  auto &router = routerconf.router;
-  auto &rw_router = routerconf.rev_wildcard_router;
-  auto &wildcard_patterns = routerconf.wildcard_patterns;
-
-  for (const auto &raw_pattern : mapping) {
-    StringRef pattern;
-    auto slash = std::find(std::begin(raw_pattern), std::end(raw_pattern), '/');
-    if (slash == std::end(raw_pattern)) {
-      // This effectively makes empty pattern to "/".  2 for '/' and
-      // terminal NULL character.
-      auto iov = make_byte_ref(downstreamconf.balloc, raw_pattern.size() + 2);
-      auto p = iov.base;
-      p = std::copy(std::begin(raw_pattern), std::end(raw_pattern), p);
-      util::inp_strlower(iov.base, p);
-      *p++ = '/';
-      *p = '\0';
-      pattern = StringRef{iov.base, p};
-    } else {
-      auto path = http2::normalize_path(downstreamconf.balloc,
-                                        StringRef{slash, std::end(raw_pattern)},
-                                        StringRef{});
-      auto iov = make_byte_ref(downstreamconf.balloc,
-                               std::distance(std::begin(raw_pattern), slash) +
-                                   path.size() + 1);
-      auto p = iov.base;
-      p = std::copy(std::begin(raw_pattern), slash, p);
-      util::inp_strlower(iov.base, p);
-      p = std::copy(std::begin(path), std::end(path), p);
-      *p = '\0';
-      pattern = StringRef{iov.base, p};
-    }
-    auto it = pattern_addr_indexer.find(pattern);
-    if (it != std::end(pattern_addr_indexer)) {
-      auto &g = addr_groups[(*it).second];
-      // Last value wins if we have multiple different affinity
-      // value under one group.
-      if (params.affinity.type != AFFINITY_NONE) {
-        if (g.affinity.type == AFFINITY_NONE) {
-          g.affinity.type = params.affinity.type;
-          if (params.affinity.type == AFFINITY_COOKIE) {
-            g.affinity.cookie.name = make_string_ref(
-                downstreamconf.balloc, params.affinity.cookie.name);
-            if (!params.affinity.cookie.path.empty()) {
-              g.affinity.cookie.path = make_string_ref(
-                  downstreamconf.balloc, params.affinity.cookie.path);
-            }
-            g.affinity.cookie.secure = params.affinity.cookie.secure;
-          }
-        } else if (g.affinity.type != params.affinity.type ||
-                   g.affinity.cookie.name != params.affinity.cookie.name ||
-                   g.affinity.cookie.path != params.affinity.cookie.path ||
-                   g.affinity.cookie.secure != params.affinity.cookie.secure) {
-          LOG(ERROR) << "backend: affinity: multiple different affinity "
-                        "configurations found in a single group";
-          return -1;
-        }
-      }
-      // If at least one backend requires frontend TLS connection,
-      // enable it for all backends sharing the same pattern.
-      if (params.redirect_if_not_tls) {
-        g.redirect_if_not_tls = true;
-      }
-      // All backends in the same group must have the same mruby path.
-      // If some backend does not specify mruby file, and there is at
-      // least one backend with mruby file, it is used for all backend
-      // in the group.
-      if (g.mruby_file.empty()) {
-        g.mruby_file = make_string_ref(downstreamconf.balloc, params.mruby);
-      } else if (g.mruby_file != params.mruby) {
-        LOG(ERROR) << "backend: mruby: multiple different mruby file found in "
-                      "a single group";
-        return -1;
-      }
-
-      g.addrs.push_back(addr);
-      continue;
-    }
-
-    auto idx = addr_groups.size();
-    pattern_addr_indexer.emplace(pattern, idx);
-    addr_groups.emplace_back(pattern);
-    auto &g = addr_groups.back();
-    g.addrs.push_back(addr);
-    g.affinity.type = params.affinity.type;
-    if (params.affinity.type == AFFINITY_COOKIE) {
-      g.affinity.cookie.name =
-          make_string_ref(downstreamconf.balloc, params.affinity.cookie.name);
-      if (!params.affinity.cookie.path.empty()) {
-        g.affinity.cookie.path =
-            make_string_ref(downstreamconf.balloc, params.affinity.cookie.path);
-      }
-      g.affinity.cookie.secure = params.affinity.cookie.secure;
-    }
-    g.redirect_if_not_tls = params.redirect_if_not_tls;
-    g.mruby_file = make_string_ref(downstreamconf.balloc, params.mruby);
-
-    if (pattern[0] == '*') {
-      // wildcard pattern
-      auto path_first =
-          std::find(std::begin(g.pattern), std::end(g.pattern), '/');
-
-      auto host = StringRef{std::begin(g.pattern) + 1, path_first};
-      auto path = StringRef{path_first, std::end(g.pattern)};
-
-      auto path_is_wildcard = false;
-      if (path[path.size() - 1] == '*') {
-        path = StringRef{std::begin(path), std::begin(path) + path.size() - 1};
-        path_is_wildcard = true;
-      }
-
-      auto it = std::find_if(
-          std::begin(wildcard_patterns), std::end(wildcard_patterns),
-          [&host](const WildcardPattern &wp) { return wp.host == host; });
-
-      if (it == std::end(wildcard_patterns)) {
-        wildcard_patterns.emplace_back(host);
-
-        auto &router = wildcard_patterns.back().router;
-        router.add_route(path, idx, path_is_wildcard);
-
-        auto iov = make_byte_ref(downstreamconf.balloc, host.size() + 1);
-        auto p = iov.base;
-        p = std::reverse_copy(std::begin(host), std::end(host), p);
-        *p = '\0';
-        auto rev_host = StringRef{iov.base, p};
-
-        rw_router.add_route(rev_host, wildcard_patterns.size() - 1);
-      } else {
-        (*it).router.add_route(path, idx, path_is_wildcard);
-      }
-
-      continue;
-    }
-
-    auto path_is_wildcard = false;
-    if (pattern[pattern.size() - 1] == '*') {
-      pattern = StringRef{std::begin(pattern),
-                          std::begin(pattern) + pattern.size() - 1};
-      path_is_wildcard = true;
-    }
-
-    router.add_route(pattern, idx, path_is_wildcard);
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int parse_forwarded_node_type(const StringRef &optarg) {
-  if (util::strieq_l("obfuscated", optarg)) {
-    return FORWARDED_NODE_OBFUSCATED;
-  }
-
-  if (util::strieq_l("ip", optarg)) {
-    return FORWARDED_NODE_IP;
-  }
-
-  if (optarg.size() < 2 || optarg[0] != '_') {
-    return -1;
-  }
-
-  if (std::find_if_not(std::begin(optarg), std::end(optarg), [](char c) {
-        return util::is_alpha(c) || util::is_digit(c) || c == '.' || c == '_' ||
-               c == '-';
-      }) != std::end(optarg)) {
-    return -1;
-  }
-
-  return FORWARDED_NODE_OBFUSCATED;
-}
-} // namespace
-
-namespace {
-int parse_error_page(std::vector<ErrorPage> &error_pages, const StringRef &opt,
-                     const StringRef &optarg) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
-  auto eq = std::find(std::begin(optarg), std::end(optarg), '=');
-  if (eq == std::end(optarg) || eq + 1 == std::end(optarg)) {
-    LOG(ERROR) << opt << ": bad value: '" << optarg << "'";
-    return -1;
-  }
-
-  auto codestr = StringRef{std::begin(optarg), eq};
-  unsigned int code;
-
-  if (codestr == StringRef::from_lit("*")) {
-    code = 0;
-  } else {
-    auto n = util::parse_uint(codestr);
-
-    if (n == -1 || n < 400 || n > 599) {
-      LOG(ERROR) << opt << ": bad code: '" << codestr << "'";
-      return -1;
-    }
-
-    code = static_cast<unsigned int>(n);
-  }
-
-  auto path = StringRef{eq + 1, std::end(optarg)};
-
-  std::vector<uint8_t> content;
-  auto fd = open(path.c_str(), O_RDONLY);
-  if (fd == -1) {
-    auto error = errno;
-    LOG(ERROR) << opt << ": " << optarg << ": "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-
-  auto fd_closer = defer(close, fd);
-
-  std::array<uint8_t, 4096> buf;
-  for (;;) {
-    auto n = read(fd, buf.data(), buf.size());
-    if (n == -1) {
-      auto error = errno;
-      LOG(ERROR) << opt << ": " << optarg << ": "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      return -1;
-    }
-    if (n == 0) {
-      break;
-    }
-    content.insert(std::end(content), std::begin(buf), std::begin(buf) + n);
-  }
-
-  error_pages.push_back(ErrorPage{std::move(content), code});
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Maximum size of SCT extension payload length.
-constexpr size_t MAX_SCT_EXT_LEN = 16_k;
-} // namespace
-
-struct SubcertParams {
-  StringRef sct_dir;
-};
-
-namespace {
-// Parses subcert parameter |src_params|, and stores parsed results
-// into |out|.  This function returns 0 if it succeeds, or -1.
-int parse_subcert_params(SubcertParams &out, const StringRef &src_params) {
-  auto last = std::end(src_params);
-  for (auto first = std::begin(src_params); first != last;) {
-    auto end = std::find(first, last, ';');
-    auto param = StringRef{first, end};
-
-    if (util::istarts_with_l(param, "sct-dir=")) {
-#if !LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L
-      auto sct_dir =
-          StringRef{std::begin(param) + str_size("sct-dir="), std::end(param)};
-      if (sct_dir.empty()) {
-        LOG(ERROR) << "subcert: " << param << ": empty sct-dir";
-        return -1;
-      }
-      out.sct_dir = sct_dir;
-#else  // !(!LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-      LOG(WARN) << "subcert: sct-dir requires OpenSSL >= 1.0.2";
-#endif // !(!LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-    } else if (!param.empty()) {
-      LOG(ERROR) << "subcert: " << param << ": unknown keyword";
-      return -1;
-    }
-
-    if (end == last) {
-      break;
-    }
-
-    first = end + 1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-// Reads *.sct files from directory denoted by |dir_path|.  |dir_path|
-// must be NULL-terminated string.
-int read_tls_sct_from_dir(std::vector<uint8_t> &dst, const StringRef &opt,
-                          const StringRef &dir_path) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
-  auto dir = opendir(dir_path.c_str());
-  if (dir == nullptr) {
-    auto error = errno;
-    LOG(ERROR) << opt << ": " << dir_path << ": "
-               << xsi_strerror(error, errbuf.data(), errbuf.size());
-    return -1;
-  }
-
-  auto closer = defer(closedir, dir);
-
-  // 2 bytes total length field
-  auto len_idx = std::distance(std::begin(dst), std::end(dst));
-  dst.insert(std::end(dst), 2, 0);
-
-  for (;;) {
-    errno = 0;
-    auto ent = readdir(dir);
-    if (ent == nullptr) {
-      if (errno != 0) {
-        auto error = errno;
-        LOG(ERROR) << opt << ": failed to read directory " << dir_path << ": "
-                   << xsi_strerror(error, errbuf.data(), errbuf.size());
-        return -1;
-      }
-      break;
-    }
-
-    auto name = StringRef{ent->d_name};
-
-    if (name[0] == '.' || !util::iends_with_l(name, ".sct")) {
-      continue;
-    }
-
-    std::string path;
-    path.resize(dir_path.size() + 1 + name.size());
-    {
-      auto p = std::begin(path);
-      p = std::copy(std::begin(dir_path), std::end(dir_path), p);
-      *p++ = '/';
-      std::copy(std::begin(name), std::end(name), p);
-    }
-
-    auto fd = open(path.c_str(), O_RDONLY);
-    if (fd == -1) {
-      auto error = errno;
-      LOG(ERROR) << opt << ": failed to read SCT from " << path << ": "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      return -1;
-    }
-
-    auto closer = defer(close, fd);
-
-    // 2 bytes length field for this SCT.
-    auto len_idx = std::distance(std::begin(dst), std::end(dst));
-    dst.insert(std::end(dst), 2, 0);
-
-    // *.sct file tends to be small; around 110+ bytes.
-    std::array<char, 256> buf;
-    for (;;) {
-      ssize_t nread;
-      while ((nread = read(fd, buf.data(), buf.size())) == -1 && errno == EINTR)
-        ;
-
-      if (nread == -1) {
-        auto error = errno;
-        LOG(ERROR) << opt << ": failed to read SCT data from " << path << ": "
-                   << xsi_strerror(error, errbuf.data(), errbuf.size());
-        return -1;
-      }
-
-      if (nread == 0) {
-        break;
-      }
-
-      dst.insert(std::end(dst), std::begin(buf), std::begin(buf) + nread);
-
-      if (dst.size() > MAX_SCT_EXT_LEN) {
-        LOG(ERROR) << opt << ": the concatenated SCT data from " << dir_path
-                   << " is too large.  Max " << MAX_SCT_EXT_LEN;
-        return -1;
-      }
-    }
-
-    auto len = dst.size() - len_idx - 2;
-
-    if (len == 0) {
-      dst.resize(dst.size() - 2);
-      continue;
-    }
-
-    dst[len_idx] = len >> 8;
-    dst[len_idx + 1] = len;
-  }
-
-  auto len = dst.size() - len_idx - 2;
-
-  if (len == 0) {
-    dst.resize(dst.size() - 2);
-    return 0;
-  }
-
-  dst[len_idx] = len >> 8;
-  dst[len_idx + 1] = len;
-
-  return 0;
-}
-} // namespace
-
-#if !LIBRESSL_LEGACY_API
-namespace {
-// Reads PSK secrets from path, and parses each line.  The result is
-// directly stored into config->tls.psk_secrets.  This function
-// returns 0 if it succeeds, or -1.
-int parse_psk_secrets(Config *config, const StringRef &path) {
-  auto &tlsconf = config->tls;
-
-  std::ifstream f(path.c_str(), std::ios::binary);
-  if (!f) {
-    LOG(ERROR) << SHRPX_OPT_PSK_SECRETS << ": could not open file " << path;
-    return -1;
-  }
-
-  size_t lineno = 0;
-  std::string line;
-  while (std::getline(f, line)) {
-    ++lineno;
-    if (line.empty() || line[0] == '#') {
-      continue;
-    }
-
-    auto sep_it = std::find(std::begin(line), std::end(line), ':');
-    if (sep_it == std::end(line)) {
-      LOG(ERROR) << SHRPX_OPT_PSK_SECRETS
-                 << ": could not fine separator at line " << lineno;
-      return -1;
-    }
-
-    if (sep_it == std::begin(line)) {
-      LOG(ERROR) << SHRPX_OPT_PSK_SECRETS << ": empty identity at line "
-                 << lineno;
-      return -1;
-    }
-
-    if (sep_it + 1 == std::end(line)) {
-      LOG(ERROR) << SHRPX_OPT_PSK_SECRETS << ": empty secret at line "
-                 << lineno;
-      return -1;
-    }
-
-    if (!util::is_hex_string(StringRef{sep_it + 1, std::end(line)})) {
-      LOG(ERROR) << SHRPX_OPT_PSK_SECRETS
-                 << ": secret must be hex string at line " << lineno;
-      return -1;
-    }
-
-    auto identity =
-        make_string_ref(config->balloc, StringRef{std::begin(line), sep_it});
-
-    auto secret =
-        util::decode_hex(config->balloc, StringRef{sep_it + 1, std::end(line)});
-
-    auto rv = tlsconf.psk_secrets.emplace(identity, secret);
-    if (!rv.second) {
-      LOG(ERROR) << SHRPX_OPT_PSK_SECRETS
-                 << ": identity has already been registered at line " << lineno;
-      return -1;
-    }
-  }
-
-  return 0;
-}
-} // namespace
-#endif // !LIBRESSL_LEGACY_API
-
-#if !LIBRESSL_LEGACY_API
-namespace {
-// Reads PSK secrets from path, and parses each line.  The result is
-// directly stored into config->tls.client.psk.  This function returns
-// 0 if it succeeds, or -1.
-int parse_client_psk_secrets(Config *config, const StringRef &path) {
-  auto &tlsconf = config->tls;
-
-  std::ifstream f(path.c_str(), std::ios::binary);
-  if (!f) {
-    LOG(ERROR) << SHRPX_OPT_CLIENT_PSK_SECRETS << ": could not open file "
-               << path;
-    return -1;
-  }
-
-  size_t lineno = 0;
-  std::string line;
-  while (std::getline(f, line)) {
-    ++lineno;
-    if (line.empty() || line[0] == '#') {
-      continue;
-    }
-
-    auto sep_it = std::find(std::begin(line), std::end(line), ':');
-    if (sep_it == std::end(line)) {
-      LOG(ERROR) << SHRPX_OPT_CLIENT_PSK_SECRETS
-                 << ": could not find separator at line " << lineno;
-      return -1;
-    }
-
-    if (sep_it == std::begin(line)) {
-      LOG(ERROR) << SHRPX_OPT_CLIENT_PSK_SECRETS << ": empty identity at line "
-                 << lineno;
-      return -1;
-    }
-
-    if (sep_it + 1 == std::end(line)) {
-      LOG(ERROR) << SHRPX_OPT_CLIENT_PSK_SECRETS << ": empty secret at line "
-                 << lineno;
-      return -1;
-    }
-
-    if (!util::is_hex_string(StringRef{sep_it + 1, std::end(line)})) {
-      LOG(ERROR) << SHRPX_OPT_CLIENT_PSK_SECRETS
-                 << ": secret must be hex string at line " << lineno;
-      return -1;
-    }
-
-    tlsconf.client.psk.identity =
-        make_string_ref(config->balloc, StringRef{std::begin(line), sep_it});
-
-    tlsconf.client.psk.secret =
-        util::decode_hex(config->balloc, StringRef{sep_it + 1, std::end(line)});
-
-    return 0;
-  }
-
-  return 0;
-}
-} // namespace
-#endif // !LIBRESSL_LEGACY_API
-
-// generated by gennghttpxfun.py
-int option_lookup_token(const char *name, size_t namelen) {
-  switch (namelen) {
-  case 4:
-    switch (name[3]) {
-    case 'f':
-      if (util::strieq_l("con", name, 3)) {
-        return SHRPX_OPTID_CONF;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("use", name, 3)) {
-        return SHRPX_OPTID_USER;
-      }
-      break;
-    }
-    break;
-  case 6:
-    switch (name[5]) {
-    case 'a':
-      if (util::strieq_l("no-vi", name, 5)) {
-        return SHRPX_OPTID_NO_VIA;
-      }
-      break;
-    case 'c':
-      if (util::strieq_l("altsv", name, 5)) {
-        return SHRPX_OPTID_ALTSVC;
-      }
-      break;
-    case 'n':
-      if (util::strieq_l("daemo", name, 5)) {
-        return SHRPX_OPTID_DAEMON;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("cacer", name, 5)) {
-        return SHRPX_OPTID_CACERT;
-      }
-      if (util::strieq_l("clien", name, 5)) {
-        return SHRPX_OPTID_CLIENT;
-      }
-      break;
-    }
-    break;
-  case 7:
-    switch (name[6]) {
-    case 'd':
-      if (util::strieq_l("backen", name, 6)) {
-        return SHRPX_OPTID_BACKEND;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("includ", name, 6)) {
-        return SHRPX_OPTID_INCLUDE;
-      }
-      break;
-    case 'g':
-      if (util::strieq_l("backlo", name, 6)) {
-        return SHRPX_OPTID_BACKLOG;
-      }
-      if (util::strieq_l("paddin", name, 6)) {
-        return SHRPX_OPTID_PADDING;
-      }
-      break;
-    case 'p':
-      if (util::strieq_l("no-ocs", name, 6)) {
-        return SHRPX_OPTID_NO_OCSP;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("cipher", name, 6)) {
-        return SHRPX_OPTID_CIPHERS;
-      }
-      if (util::strieq_l("worker", name, 6)) {
-        return SHRPX_OPTID_WORKERS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("subcer", name, 6)) {
-        return SHRPX_OPTID_SUBCERT;
-      }
-      break;
-    }
-    break;
-  case 8:
-    switch (name[7]) {
-    case 'd':
-      if (util::strieq_l("fronten", name, 7)) {
-        return SHRPX_OPTID_FRONTEND;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("insecur", name, 7)) {
-        return SHRPX_OPTID_INSECURE;
-      }
-      if (util::strieq_l("pid-fil", name, 7)) {
-        return SHRPX_OPTID_PID_FILE;
-      }
-      break;
-    case 'n':
-      if (util::strieq_l("fastope", name, 7)) {
-        return SHRPX_OPTID_FASTOPEN;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("npn-lis", name, 7)) {
-        return SHRPX_OPTID_NPN_LIST;
-      }
-      break;
-    }
-    break;
-  case 9:
-    switch (name[8]) {
-    case 'e':
-      if (util::strieq_l("no-kqueu", name, 8)) {
-        return SHRPX_OPTID_NO_KQUEUE;
-      }
-      if (util::strieq_l("read-rat", name, 8)) {
-        return SHRPX_OPTID_READ_RATE;
-      }
-      break;
-    case 'l':
-      if (util::strieq_l("log-leve", name, 8)) {
-        return SHRPX_OPTID_LOG_LEVEL;
-      }
-      break;
-    }
-    break;
-  case 10:
-    switch (name[9]) {
-    case 'e':
-      if (util::strieq_l("error-pag", name, 9)) {
-        return SHRPX_OPTID_ERROR_PAGE;
-      }
-      if (util::strieq_l("mruby-fil", name, 9)) {
-        return SHRPX_OPTID_MRUBY_FILE;
-      }
-      if (util::strieq_l("write-rat", name, 9)) {
-        return SHRPX_OPTID_WRITE_RATE;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("read-burs", name, 9)) {
-        return SHRPX_OPTID_READ_BURST;
-      }
-      break;
-    }
-    break;
-  case 11:
-    switch (name[10]) {
-    case 'e':
-      if (util::strieq_l("server-nam", name, 10)) {
-        return SHRPX_OPTID_SERVER_NAME;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("tls-sct-di", name, 10)) {
-        return SHRPX_OPTID_TLS_SCT_DIR;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("backend-tl", name, 10)) {
-        return SHRPX_OPTID_BACKEND_TLS;
-      }
-      if (util::strieq_l("ecdh-curve", name, 10)) {
-        return SHRPX_OPTID_ECDH_CURVES;
-      }
-      if (util::strieq_l("psk-secret", name, 10)) {
-        return SHRPX_OPTID_PSK_SECRETS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("write-burs", name, 10)) {
-        return SHRPX_OPTID_WRITE_BURST;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("dns-max-tr", name, 10)) {
-        return SHRPX_OPTID_DNS_MAX_TRY;
-      }
-      if (util::strieq_l("http2-prox", name, 10)) {
-        return SHRPX_OPTID_HTTP2_PROXY;
-      }
-      break;
-    }
-    break;
-  case 12:
-    switch (name[11]) {
-    case '4':
-      if (util::strieq_l("backend-ipv", name, 11)) {
-        return SHRPX_OPTID_BACKEND_IPV4;
-      }
-      break;
-    case '6':
-      if (util::strieq_l("backend-ipv", name, 11)) {
-        return SHRPX_OPTID_BACKEND_IPV6;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("host-rewrit", name, 11)) {
-        return SHRPX_OPTID_HOST_REWRITE;
-      }
-      if (util::strieq_l("http2-bridg", name, 11)) {
-        return SHRPX_OPTID_HTTP2_BRIDGE;
-      }
-      break;
-    case 'p':
-      if (util::strieq_l("ocsp-startu", name, 11)) {
-        return SHRPX_OPTID_OCSP_STARTUP;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("client-prox", name, 11)) {
-        return SHRPX_OPTID_CLIENT_PROXY;
-      }
-      if (util::strieq_l("forwarded-b", name, 11)) {
-        return SHRPX_OPTID_FORWARDED_BY;
-      }
-      break;
-    }
-    break;
-  case 13:
-    switch (name[12]) {
-    case 'd':
-      if (util::strieq_l("add-forwarde", name, 12)) {
-        return SHRPX_OPTID_ADD_FORWARDED;
-      }
-      if (util::strieq_l("single-threa", name, 12)) {
-        return SHRPX_OPTID_SINGLE_THREAD;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("dh-param-fil", name, 12)) {
-        return SHRPX_OPTID_DH_PARAM_FILE;
-      }
-      if (util::strieq_l("errorlog-fil", name, 12)) {
-        return SHRPX_OPTID_ERRORLOG_FILE;
-      }
-      if (util::strieq_l("rlimit-nofil", name, 12)) {
-        return SHRPX_OPTID_RLIMIT_NOFILE;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("forwarded-fo", name, 12)) {
-        return SHRPX_OPTID_FORWARDED_FOR;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("tls13-cipher", name, 12)) {
-        return SHRPX_OPTID_TLS13_CIPHERS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("verify-clien", name, 12)) {
-        return SHRPX_OPTID_VERIFY_CLIENT;
-      }
-      break;
-    }
-    break;
-  case 14:
-    switch (name[13]) {
-    case 'e':
-      if (util::strieq_l("accesslog-fil", name, 13)) {
-        return SHRPX_OPTID_ACCESSLOG_FILE;
-      }
-      break;
-    case 'h':
-      if (util::strieq_l("no-server-pus", name, 13)) {
-        return SHRPX_OPTID_NO_SERVER_PUSH;
-      }
-      break;
-    case 'p':
-      if (util::strieq_l("no-verify-ocs", name, 13)) {
-        return SHRPX_OPTID_NO_VERIFY_OCSP;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("backend-no-tl", name, 13)) {
-        return SHRPX_OPTID_BACKEND_NO_TLS;
-      }
-      if (util::strieq_l("client-cipher", name, 13)) {
-        return SHRPX_OPTID_CLIENT_CIPHERS;
-      }
-      if (util::strieq_l("single-proces", name, 13)) {
-        return SHRPX_OPTID_SINGLE_PROCESS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("tls-proto-lis", name, 13)) {
-        return SHRPX_OPTID_TLS_PROTO_LIST;
-      }
-      break;
-    }
-    break;
-  case 15:
-    switch (name[14]) {
-    case 'e':
-      if (util::strieq_l("no-host-rewrit", name, 14)) {
-        return SHRPX_OPTID_NO_HOST_REWRITE;
-      }
-      break;
-    case 'g':
-      if (util::strieq_l("errorlog-syslo", name, 14)) {
-        return SHRPX_OPTID_ERRORLOG_SYSLOG;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("frontend-no-tl", name, 14)) {
-        return SHRPX_OPTID_FRONTEND_NO_TLS;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("syslog-facilit", name, 14)) {
-        return SHRPX_OPTID_SYSLOG_FACILITY;
-      }
-      break;
-    }
-    break;
-  case 16:
-    switch (name[15]) {
-    case 'e':
-      if (util::strieq_l("certificate-fil", name, 15)) {
-        return SHRPX_OPTID_CERTIFICATE_FILE;
-      }
-      if (util::strieq_l("client-cert-fil", name, 15)) {
-        return SHRPX_OPTID_CLIENT_CERT_FILE;
-      }
-      if (util::strieq_l("private-key-fil", name, 15)) {
-        return SHRPX_OPTID_PRIVATE_KEY_FILE;
-      }
-      if (util::strieq_l("worker-read-rat", name, 15)) {
-        return SHRPX_OPTID_WORKER_READ_RATE;
-      }
-      break;
-    case 'g':
-      if (util::strieq_l("accesslog-syslo", name, 15)) {
-        return SHRPX_OPTID_ACCESSLOG_SYSLOG;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("accesslog-forma", name, 15)) {
-        return SHRPX_OPTID_ACCESSLOG_FORMAT;
-      }
-      break;
-    }
-    break;
-  case 17:
-    switch (name[16]) {
-    case 'e':
-      if (util::strieq_l("no-server-rewrit", name, 16)) {
-        return SHRPX_OPTID_NO_SERVER_REWRITE;
-      }
-      if (util::strieq_l("worker-write-rat", name, 16)) {
-        return SHRPX_OPTID_WORKER_WRITE_RATE;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("backend-http1-tl", name, 16)) {
-        return SHRPX_OPTID_BACKEND_HTTP1_TLS;
-      }
-      if (util::strieq_l("max-header-field", name, 16)) {
-        return SHRPX_OPTID_MAX_HEADER_FIELDS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("dns-cache-timeou", name, 16)) {
-        return SHRPX_OPTID_DNS_CACHE_TIMEOUT;
-      }
-      if (util::strieq_l("worker-read-burs", name, 16)) {
-        return SHRPX_OPTID_WORKER_READ_BURST;
-      }
-      break;
-    }
-    break;
-  case 18:
-    switch (name[17]) {
-    case 'a':
-      if (util::strieq_l("tls-max-early-dat", name, 17)) {
-        return SHRPX_OPTID_TLS_MAX_EARLY_DATA;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("add-request-heade", name, 17)) {
-        return SHRPX_OPTID_ADD_REQUEST_HEADER;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("client-psk-secret", name, 17)) {
-        return SHRPX_OPTID_CLIENT_PSK_SECRETS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("dns-lookup-timeou", name, 17)) {
-        return SHRPX_OPTID_DNS_LOOKUP_TIMEOUT;
-      }
-      if (util::strieq_l("worker-write-burs", name, 17)) {
-        return SHRPX_OPTID_WORKER_WRITE_BURST;
-      }
-      break;
-    }
-    break;
-  case 19:
-    switch (name[18]) {
-    case 'e':
-      if (util::strieq_l("no-location-rewrit", name, 18)) {
-        return SHRPX_OPTID_NO_LOCATION_REWRITE;
-      }
-      if (util::strieq_l("tls-ticket-key-fil", name, 18)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_FILE;
-      }
-      break;
-    case 'f':
-      if (util::strieq_l("backend-max-backof", name, 18)) {
-        return SHRPX_OPTID_BACKEND_MAX_BACKOFF;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("add-response-heade", name, 18)) {
-        return SHRPX_OPTID_ADD_RESPONSE_HEADER;
-      }
-      if (util::strieq_l("add-x-forwarded-fo", name, 18)) {
-        return SHRPX_OPTID_ADD_X_FORWARDED_FOR;
-      }
-      if (util::strieq_l("header-field-buffe", name, 18)) {
-        return SHRPX_OPTID_HEADER_FIELD_BUFFER;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("redirect-https-por", name, 18)) {
-        return SHRPX_OPTID_REDIRECT_HTTPS_PORT;
-      }
-      if (util::strieq_l("stream-read-timeou", name, 18)) {
-        return SHRPX_OPTID_STREAM_READ_TIMEOUT;
-      }
-      break;
-    }
-    break;
-  case 20:
-    switch (name[19]) {
-    case 'g':
-      if (util::strieq_l("frontend-frame-debu", name, 19)) {
-        return SHRPX_OPTID_FRONTEND_FRAME_DEBUG;
-      }
-      break;
-    case 'l':
-      if (util::strieq_l("ocsp-update-interva", name, 19)) {
-        return SHRPX_OPTID_OCSP_UPDATE_INTERVAL;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("tls13-client-cipher", name, 19)) {
-        return SHRPX_OPTID_TLS13_CLIENT_CIPHERS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-read-timeou", name, 19)) {
-        return SHRPX_OPTID_BACKEND_READ_TIMEOUT;
-      }
-      if (util::strieq_l("stream-write-timeou", name, 19)) {
-        return SHRPX_OPTID_STREAM_WRITE_TIMEOUT;
-      }
-      if (util::strieq_l("verify-client-cacer", name, 19)) {
-        return SHRPX_OPTID_VERIFY_CLIENT_CACERT;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("api-max-request-bod", name, 19)) {
-        return SHRPX_OPTID_API_MAX_REQUEST_BODY;
-      }
-      break;
-    }
-    break;
-  case 21:
-    switch (name[20]) {
-    case 'd':
-      if (util::strieq_l("backend-tls-sni-fiel", name, 20)) {
-        return SHRPX_OPTID_BACKEND_TLS_SNI_FIELD;
-      }
-      break;
-    case 'l':
-      if (util::strieq_l("accept-proxy-protoco", name, 20)) {
-        return SHRPX_OPTID_ACCEPT_PROXY_PROTOCOL;
-      }
-      break;
-    case 'n':
-      if (util::strieq_l("tls-max-proto-versio", name, 20)) {
-        return SHRPX_OPTID_TLS_MAX_PROTO_VERSION;
-      }
-      if (util::strieq_l("tls-min-proto-versio", name, 20)) {
-        return SHRPX_OPTID_TLS_MIN_PROTO_VERSION;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("tls-ticket-key-ciphe", name, 20)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_CIPHER;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("frontend-max-request", name, 20)) {
-        return SHRPX_OPTID_FRONTEND_MAX_REQUESTS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-write-timeou", name, 20)) {
-        return SHRPX_OPTID_BACKEND_WRITE_TIMEOUT;
-      }
-      if (util::strieq_l("frontend-read-timeou", name, 20)) {
-        return SHRPX_OPTID_FRONTEND_READ_TIMEOUT;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("accesslog-write-earl", name, 20)) {
-        return SHRPX_OPTID_ACCESSLOG_WRITE_EARLY;
-      }
-      break;
-    }
-    break;
-  case 22:
-    switch (name[21]) {
-    case 'i':
-      if (util::strieq_l("backend-http-proxy-ur", name, 21)) {
-        return SHRPX_OPTID_BACKEND_HTTP_PROXY_URI;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("backend-request-buffe", name, 21)) {
-        return SHRPX_OPTID_BACKEND_REQUEST_BUFFER;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("frontend-write-timeou", name, 21)) {
-        return SHRPX_OPTID_FRONTEND_WRITE_TIMEOUT;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("backend-address-famil", name, 21)) {
-        return SHRPX_OPTID_BACKEND_ADDRESS_FAMILY;
-      }
-      break;
-    }
-    break;
-  case 23:
-    switch (name[22]) {
-    case 'e':
-      if (util::strieq_l("client-private-key-fil", name, 22)) {
-        return SHRPX_OPTID_CLIENT_PRIVATE_KEY_FILE;
-      }
-      if (util::strieq_l("private-key-passwd-fil", name, 22)) {
-        return SHRPX_OPTID_PRIVATE_KEY_PASSWD_FILE;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("backend-response-buffe", name, 22)) {
-        return SHRPX_OPTID_BACKEND_RESPONSE_BUFFER;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-connect-timeou", name, 22)) {
-        return SHRPX_OPTID_BACKEND_CONNECT_TIMEOUT;
-      }
-      break;
-    }
-    break;
-  case 24:
-    switch (name[23]) {
-    case 'd':
-      if (util::strieq_l("strip-incoming-forwarde", name, 23)) {
-        return SHRPX_OPTID_STRIP_INCOMING_FORWARDED;
-      }
-      if (util::strieq_l("tls-ticket-key-memcache", name, 23)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("fetch-ocsp-response-fil", name, 23)) {
-        return SHRPX_OPTID_FETCH_OCSP_RESPONSE_FILE;
-      }
-      break;
-    case 'o':
-      if (util::strieq_l("no-add-x-forwarded-prot", name, 23)) {
-        return SHRPX_OPTID_NO_ADD_X_FORWARDED_PROTO;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("listener-disable-timeou", name, 23)) {
-        return SHRPX_OPTID_LISTENER_DISABLE_TIMEOUT;
-      }
-      if (util::strieq_l("tls-dyn-rec-idle-timeou", name, 23)) {
-        return SHRPX_OPTID_TLS_DYN_REC_IDLE_TIMEOUT;
-      }
-      break;
-    }
-    break;
-  case 25:
-    switch (name[24]) {
-    case 'e':
-      if (util::strieq_l("backend-http2-window-siz", name, 24)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_WINDOW_SIZE;
-      }
-      break;
-    case 'g':
-      if (util::strieq_l("http2-no-cookie-crumblin", name, 24)) {
-        return SHRPX_OPTID_HTTP2_NO_COOKIE_CRUMBLING;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("backend-http2-window-bit", name, 24)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_WINDOW_BITS;
-      }
-      if (util::strieq_l("max-request-header-field", name, 24)) {
-        return SHRPX_OPTID_MAX_REQUEST_HEADER_FIELDS;
-      }
-      break;
-    }
-    break;
-  case 26:
-    switch (name[25]) {
-    case 'a':
-      if (util::strieq_l("tls-no-postpone-early-dat", name, 25)) {
-        return SHRPX_OPTID_TLS_NO_POSTPONE_EARLY_DATA;
-      }
-      break;
-    case 'e':
-      if (util::strieq_l("frontend-http2-window-siz", name, 25)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_SIZE;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("frontend-http2-window-bit", name, 25)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_BITS;
-      }
-      if (util::strieq_l("max-response-header-field", name, 25)) {
-        return SHRPX_OPTID_MAX_RESPONSE_HEADER_FIELDS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-keep-alive-timeou", name, 25)) {
-        return SHRPX_OPTID_BACKEND_KEEP_ALIVE_TIMEOUT;
-      }
-      if (util::strieq_l("no-http2-cipher-black-lis", name, 25)) {
-        return SHRPX_OPTID_NO_HTTP2_CIPHER_BLACK_LIST;
-      }
-      break;
-    }
-    break;
-  case 27:
-    switch (name[26]) {
-    case 'd':
-      if (util::strieq_l("tls-session-cache-memcache", name, 26)) {
-        return SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("request-header-field-buffe", name, 26)) {
-        return SHRPX_OPTID_REQUEST_HEADER_FIELD_BUFFER;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("worker-frontend-connection", name, 26)) {
-        return SHRPX_OPTID_WORKER_FRONTEND_CONNECTIONS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("frontend-http2-read-timeou", name, 26)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_READ_TIMEOUT;
-      }
-      if (util::strieq_l("frontend-keep-alive-timeou", name, 26)) {
-        return SHRPX_OPTID_FRONTEND_KEEP_ALIVE_TIMEOUT;
-      }
-      break;
-    }
-    break;
-  case 28:
-    switch (name[27]) {
-    case 'a':
-      if (util::strieq_l("no-strip-incoming-early-dat", name, 27)) {
-        return SHRPX_OPTID_NO_STRIP_INCOMING_EARLY_DATA;
-      }
-      break;
-    case 'd':
-      if (util::strieq_l("tls-dyn-rec-warmup-threshol", name, 27)) {
-        return SHRPX_OPTID_TLS_DYN_REC_WARMUP_THRESHOLD;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("response-header-field-buffe", name, 27)) {
-        return SHRPX_OPTID_RESPONSE_HEADER_FIELD_BUFFER;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("http2-max-concurrent-stream", name, 27)) {
-        return SHRPX_OPTID_HTTP2_MAX_CONCURRENT_STREAMS;
-      }
-      if (util::strieq_l("tls-ticket-key-memcached-tl", name, 27)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_TLS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-connections-per-hos", name, 27)) {
-        return SHRPX_OPTID_BACKEND_CONNECTIONS_PER_HOST;
-      }
-      break;
-    }
-    break;
-  case 30:
-    switch (name[29]) {
-    case 'd':
-      if (util::strieq_l("verify-client-tolerate-expire", name, 29)) {
-        return SHRPX_OPTID_VERIFY_CLIENT_TOLERATE_EXPIRED;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("ignore-per-pattern-mruby-erro", name, 29)) {
-        return SHRPX_OPTID_IGNORE_PER_PATTERN_MRUBY_ERROR;
-      }
-      if (util::strieq_l("strip-incoming-x-forwarded-fo", name, 29)) {
-        return SHRPX_OPTID_STRIP_INCOMING_X_FORWARDED_FOR;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-http2-settings-timeou", name, 29)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_SETTINGS_TIMEOUT;
-      }
-      break;
-    }
-    break;
-  case 31:
-    switch (name[30]) {
-    case 's':
-      if (util::strieq_l("tls-session-cache-memcached-tl", name, 30)) {
-        return SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_TLS;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("frontend-http2-settings-timeou", name, 30)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_SETTINGS_TIMEOUT;
-      }
-      break;
-    }
-    break;
-  case 32:
-    switch (name[31]) {
-    case 'd':
-      if (util::strieq_l("backend-connections-per-fronten", name, 31)) {
-        return SHRPX_OPTID_BACKEND_CONNECTIONS_PER_FRONTEND;
-      }
-      break;
-    }
-    break;
-  case 33:
-    switch (name[32]) {
-    case 'l':
-      if (util::strieq_l("tls-ticket-key-memcached-interva", name, 32)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_INTERVAL;
-      }
-      if (util::strieq_l("tls-ticket-key-memcached-max-fai", name, 32)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_MAX_FAIL;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("client-no-http2-cipher-black-lis", name, 32)) {
-        return SHRPX_OPTID_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST;
-      }
-      break;
-    }
-    break;
-  case 34:
-    switch (name[33]) {
-    case 'e':
-      if (util::strieq_l("tls-ticket-key-memcached-cert-fil", name, 33)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_CERT_FILE;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("frontend-http2-dump-request-heade", name, 33)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_DUMP_REQUEST_HEADER;
-      }
-      break;
-    case 't':
-      if (util::strieq_l("backend-http1-connections-per-hos", name, 33)) {
-        return SHRPX_OPTID_BACKEND_HTTP1_CONNECTIONS_PER_HOST;
-      }
-      break;
-    case 'y':
-      if (util::strieq_l("tls-ticket-key-memcached-max-retr", name, 33)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_MAX_RETRY;
-      }
-      break;
-    }
-    break;
-  case 35:
-    switch (name[34]) {
-    case 'e':
-      if (util::strieq_l("frontend-http2-optimize-window-siz", name, 34)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_OPTIMIZE_WINDOW_SIZE;
-      }
-      break;
-    case 'o':
-      if (util::strieq_l("no-strip-incoming-x-forwarded-prot", name, 34)) {
-        return SHRPX_OPTID_NO_STRIP_INCOMING_X_FORWARDED_PROTO;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("frontend-http2-dump-response-heade", name, 34)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_DUMP_RESPONSE_HEADER;
-      }
-      break;
-    }
-    break;
-  case 36:
-    switch (name[35]) {
-    case 'e':
-      if (util::strieq_l("backend-http2-connection-window-siz", name, 35)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE;
-      }
-      break;
-    case 'r':
-      if (util::strieq_l("backend-http2-connections-per-worke", name, 35)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_CONNECTIONS_PER_WORKER;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("backend-http2-connection-window-bit", name, 35)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_CONNECTION_WINDOW_BITS;
-      }
-      if (util::strieq_l("backend-http2-max-concurrent-stream", name, 35)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS;
-      }
-      break;
-    }
-    break;
-  case 37:
-    switch (name[36]) {
-    case 'e':
-      if (util::strieq_l("frontend-http2-connection-window-siz", name, 36)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE;
-      }
-      if (util::strieq_l("tls-session-cache-memcached-cert-fil", name, 36)) {
-        return SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_CERT_FILE;
-      }
-      break;
-    case 's':
-      if (util::strieq_l("frontend-http2-connection-window-bit", name, 36)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS;
-      }
-      if (util::strieq_l("frontend-http2-max-concurrent-stream", name, 36)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS;
-      }
-      break;
-    }
-    break;
-  case 38:
-    switch (name[37]) {
-    case 'd':
-      if (util::strieq_l("backend-http1-connections-per-fronten", name, 37)) {
-        return SHRPX_OPTID_BACKEND_HTTP1_CONNECTIONS_PER_FRONTEND;
-      }
-      break;
-    }
-    break;
-  case 39:
-    switch (name[38]) {
-    case 'y':
-      if (util::strieq_l("tls-ticket-key-memcached-address-famil", name, 38)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_ADDRESS_FAMILY;
-      }
-      break;
-    }
-    break;
-  case 40:
-    switch (name[39]) {
-    case 'e':
-      if (util::strieq_l("backend-http2-decoder-dynamic-table-siz", name, 39)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE;
-      }
-      if (util::strieq_l("backend-http2-encoder-dynamic-table-siz", name, 39)) {
-        return SHRPX_OPTID_BACKEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE;
-      }
-      break;
-    }
-    break;
-  case 41:
-    switch (name[40]) {
-    case 'e':
-      if (util::strieq_l("frontend-http2-decoder-dynamic-table-siz", name,
-                         40)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE;
-      }
-      if (util::strieq_l("frontend-http2-encoder-dynamic-table-siz", name,
-                         40)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE;
-      }
-      if (util::strieq_l("frontend-http2-optimize-write-buffer-siz", name,
-                         40)) {
-        return SHRPX_OPTID_FRONTEND_HTTP2_OPTIMIZE_WRITE_BUFFER_SIZE;
-      }
-      if (util::strieq_l("tls-ticket-key-memcached-private-key-fil", name,
-                         40)) {
-        return SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_PRIVATE_KEY_FILE;
-      }
-      break;
-    }
-    break;
-  case 42:
-    switch (name[41]) {
-    case 'y':
-      if (util::strieq_l("tls-session-cache-memcached-address-famil", name,
-                         41)) {
-        return SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_ADDRESS_FAMILY;
-      }
-      break;
-    }
-    break;
-  case 44:
-    switch (name[43]) {
-    case 'e':
-      if (util::strieq_l("tls-session-cache-memcached-private-key-fil", name,
-                         43)) {
-        return SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_PRIVATE_KEY_FILE;
-      }
-      break;
-    }
-    break;
-  }
-  return -1;
-}
-
-int parse_config(Config *config, const StringRef &opt, const StringRef &optarg,
-                 std::set<StringRef> &included_set,
-                 std::map<StringRef, size_t> &pattern_addr_indexer) {
-  auto optid = option_lookup_token(opt.c_str(), opt.size());
-  return parse_config(config, optid, opt, optarg, included_set,
-                      pattern_addr_indexer);
-}
-
-int parse_config(Config *config, int optid, const StringRef &opt,
-                 const StringRef &optarg, std::set<StringRef> &included_set,
-                 std::map<StringRef, size_t> &pattern_addr_indexer) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  char host[NI_MAXHOST];
-  uint16_t port;
-
-  switch (optid) {
-  case SHRPX_OPTID_BACKEND: {
-    auto &downstreamconf = *config->conn.downstream;
-    auto addr_end = std::find(std::begin(optarg), std::end(optarg), ';');
-
-    DownstreamAddrConfig addr{};
-    if (util::istarts_with(optarg, SHRPX_UNIX_PATH_PREFIX)) {
-      auto path = std::begin(optarg) + SHRPX_UNIX_PATH_PREFIX.size();
-      addr.host =
-          make_string_ref(downstreamconf.balloc, StringRef{path, addr_end});
-      addr.host_unix = true;
-    } else {
-      if (split_host_port(host, sizeof(host), &port,
-                          StringRef{std::begin(optarg), addr_end}, opt) == -1) {
-        return -1;
-      }
-
-      addr.host = make_string_ref(downstreamconf.balloc, StringRef{host});
-      addr.port = port;
-    }
-
-    auto mapping = addr_end == std::end(optarg) ? addr_end : addr_end + 1;
-    auto mapping_end = std::find(mapping, std::end(optarg), ';');
-
-    auto params =
-        mapping_end == std::end(optarg) ? mapping_end : mapping_end + 1;
-
-    if (parse_mapping(config, addr, pattern_addr_indexer,
-                      StringRef{mapping, mapping_end},
-                      StringRef{params, std::end(optarg)}) != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_FRONTEND: {
-    auto &listenerconf = config->conn.listener;
-    auto &apiconf = config->api;
-
-    auto addr_end = std::find(std::begin(optarg), std::end(optarg), ';');
-    auto src_params = StringRef{addr_end, std::end(optarg)};
-
-    UpstreamParams params{};
-    params.tls = true;
-
-    if (parse_upstream_params(params, src_params) != 0) {
-      return -1;
-    }
-
-    if (params.sni_fwd && !params.tls) {
-      LOG(ERROR) << "frontend: sni_fwd requires tls";
-      return -1;
-    }
-
-    UpstreamAddr addr{};
-    addr.fd = -1;
-    addr.tls = params.tls;
-    addr.sni_fwd = params.sni_fwd;
-    addr.alt_mode = params.alt_mode;
-    addr.accept_proxy_protocol = params.proxyproto;
-
-    if (addr.alt_mode == ALTMODE_API) {
-      apiconf.enabled = true;
-    }
-
-    if (util::istarts_with(optarg, SHRPX_UNIX_PATH_PREFIX)) {
-      auto path = std::begin(optarg) + SHRPX_UNIX_PATH_PREFIX.size();
-      addr.host = make_string_ref(config->balloc, StringRef{path, addr_end});
-      addr.host_unix = true;
-
-      listenerconf.addrs.push_back(std::move(addr));
-
-      return 0;
-    }
-
-    if (split_host_port(host, sizeof(host), &port,
-                        StringRef{std::begin(optarg), addr_end}, opt) == -1) {
-      return -1;
-    }
-
-    addr.host = make_string_ref(config->balloc, StringRef{host});
-    addr.port = port;
-
-    if (util::numeric_host(host, AF_INET)) {
-      addr.family = AF_INET;
-      listenerconf.addrs.push_back(std::move(addr));
-      return 0;
-    }
-
-    if (util::numeric_host(host, AF_INET6)) {
-      addr.family = AF_INET6;
-      listenerconf.addrs.push_back(std::move(addr));
-      return 0;
-    }
-
-    addr.family = AF_INET;
-    listenerconf.addrs.push_back(addr);
-
-    addr.family = AF_INET6;
-    listenerconf.addrs.push_back(std::move(addr));
-
-    return 0;
-  }
-  case SHRPX_OPTID_WORKERS:
-#ifdef NOTHREADS
-    LOG(WARN) << "Threading disabled at build time, no threads created.";
-    return 0;
-#else  // !NOTHREADS
-    return parse_uint(&config->num_worker, opt, optarg);
-#endif // !NOTHREADS
-  case SHRPX_OPTID_HTTP2_MAX_CONCURRENT_STREAMS: {
-    LOG(WARN) << opt << ": deprecated. Use "
-              << SHRPX_OPT_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS << " and "
-              << SHRPX_OPT_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS << " instead.";
-    size_t n;
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-    auto &http2conf = config->http2;
-    http2conf.upstream.max_concurrent_streams = n;
-    http2conf.downstream.max_concurrent_streams = n;
-
-    return 0;
-  }
-  case SHRPX_OPTID_LOG_LEVEL:
-    if (Log::set_severity_level_by_name(optarg) == -1) {
-      LOG(ERROR) << opt << ": Invalid severity level: " << optarg;
-      return -1;
-    }
-
-    return 0;
-  case SHRPX_OPTID_DAEMON:
-    config->daemon = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_HTTP2_PROXY:
-    config->http2_proxy = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_HTTP2_BRIDGE:
-    LOG(ERROR) << opt
-               << ": deprecated.  Use backend=<addr>,<port>;;proto=h2;tls";
-    return -1;
-  case SHRPX_OPTID_CLIENT_PROXY:
-    LOG(ERROR)
-        << opt
-        << ": deprecated.  Use http2-proxy, frontend=<addr>,<port>;no-tls "
-           "and backend=<addr>,<port>;;proto=h2;tls";
-    return -1;
-  case SHRPX_OPTID_ADD_X_FORWARDED_FOR:
-    config->http.xff.add = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_STRIP_INCOMING_X_FORWARDED_FOR:
-    config->http.xff.strip_incoming = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_NO_VIA:
-    config->http.no_via = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_READ_TIMEOUT:
-    return parse_duration(&config->conn.upstream.timeout.http2_read, opt,
-                          optarg);
-  case SHRPX_OPTID_FRONTEND_READ_TIMEOUT:
-    return parse_duration(&config->conn.upstream.timeout.read, opt, optarg);
-  case SHRPX_OPTID_FRONTEND_WRITE_TIMEOUT:
-    return parse_duration(&config->conn.upstream.timeout.write, opt, optarg);
-  case SHRPX_OPTID_BACKEND_READ_TIMEOUT:
-    return parse_duration(&config->conn.downstream->timeout.read, opt, optarg);
-  case SHRPX_OPTID_BACKEND_WRITE_TIMEOUT:
-    return parse_duration(&config->conn.downstream->timeout.write, opt, optarg);
-  case SHRPX_OPTID_BACKEND_CONNECT_TIMEOUT:
-    return parse_duration(&config->conn.downstream->timeout.connect, opt,
-                          optarg);
-  case SHRPX_OPTID_STREAM_READ_TIMEOUT:
-    return parse_duration(&config->http2.timeout.stream_read, opt, optarg);
-  case SHRPX_OPTID_STREAM_WRITE_TIMEOUT:
-    return parse_duration(&config->http2.timeout.stream_write, opt, optarg);
-  case SHRPX_OPTID_ACCESSLOG_FILE:
-    config->logging.access.file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_ACCESSLOG_SYSLOG:
-    config->logging.access.syslog = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_ACCESSLOG_FORMAT:
-    config->logging.access.format = parse_log_format(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_ERRORLOG_FILE:
-    config->logging.error.file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_ERRORLOG_SYSLOG:
-    config->logging.error.syslog = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FASTOPEN:
-    return parse_uint(&config->conn.listener.fastopen, opt, optarg);
-  case SHRPX_OPTID_BACKEND_KEEP_ALIVE_TIMEOUT:
-    return parse_duration(&config->conn.downstream->timeout.idle_read, opt,
-                          optarg);
-  case SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_BITS:
-  case SHRPX_OPTID_BACKEND_HTTP2_WINDOW_BITS: {
-    LOG(WARN) << opt << ": deprecated.  Use "
-              << (optid == SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_BITS
-                      ? SHRPX_OPT_FRONTEND_HTTP2_WINDOW_SIZE
-                      : SHRPX_OPT_BACKEND_HTTP2_WINDOW_SIZE);
-    int32_t *resp;
-
-    if (optid == SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_BITS) {
-      resp = &config->http2.upstream.window_size;
-    } else {
-      resp = &config->http2.downstream.window_size;
-    }
-
-    errno = 0;
-
-    int n;
-
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n >= 31) {
-      LOG(ERROR) << opt
-                 << ": specify the integer in the range [0, 30], inclusive";
-      return -1;
-    }
-
-    // Make 16 bits to the HTTP/2 default 64KiB - 1.  This is the same
-    // behaviour of previous code.
-    *resp = (1 << n) - 1;
-
-    return 0;
-  }
-  case SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS:
-  case SHRPX_OPTID_BACKEND_HTTP2_CONNECTION_WINDOW_BITS: {
-    LOG(WARN) << opt << ": deprecated.  Use "
-              << (optid == SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS
-                      ? SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE
-                      : SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE);
-    int32_t *resp;
-
-    if (optid == SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS) {
-      resp = &config->http2.upstream.connection_window_size;
-    } else {
-      resp = &config->http2.downstream.connection_window_size;
-    }
-
-    errno = 0;
-
-    int n;
-
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n < 16 || n >= 31) {
-      LOG(ERROR) << opt
-                 << ": specify the integer in the range [16, 30], inclusive";
-      return -1;
-    }
-
-    *resp = (1 << n) - 1;
-
-    return 0;
-  }
-  case SHRPX_OPTID_FRONTEND_NO_TLS:
-    LOG(WARN) << opt << ": deprecated.  Use no-tls keyword in "
-              << SHRPX_OPT_FRONTEND;
-    return 0;
-  case SHRPX_OPTID_BACKEND_NO_TLS:
-    LOG(WARN) << opt
-              << ": deprecated.  backend connection is not encrypted by "
-                 "default.  See also "
-              << SHRPX_OPT_BACKEND_TLS;
-    return 0;
-  case SHRPX_OPTID_BACKEND_TLS_SNI_FIELD:
-    LOG(WARN) << opt
-              << ": deprecated.  Use sni keyword in --backend option.  "
-                 "For now, all sni values of all backends are "
-                 "overridden by the given value "
-              << optarg;
-    config->tls.backend_sni_name = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_PID_FILE:
-    config->pid_file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_USER: {
-    auto pwd = getpwnam(optarg.c_str());
-    if (!pwd) {
-      LOG(ERROR) << opt << ": failed to get uid from " << optarg << ": "
-                 << xsi_strerror(errno, errbuf.data(), errbuf.size());
-      return -1;
-    }
-    config->user = make_string_ref(config->balloc, StringRef{pwd->pw_name});
-    config->uid = pwd->pw_uid;
-    config->gid = pwd->pw_gid;
-
-    return 0;
-  }
-  case SHRPX_OPTID_PRIVATE_KEY_FILE:
-    config->tls.private_key_file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_PRIVATE_KEY_PASSWD_FILE: {
-    auto passwd = read_passwd_from_file(opt, optarg);
-    if (passwd.empty()) {
-      LOG(ERROR) << opt << ": Couldn't read key file's passwd from " << optarg;
-      return -1;
-    }
-    config->tls.private_key_passwd =
-        make_string_ref(config->balloc, StringRef{passwd});
-
-    return 0;
-  }
-  case SHRPX_OPTID_CERTIFICATE_FILE:
-    config->tls.cert_file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_DH_PARAM_FILE:
-    config->tls.dh_param_file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_SUBCERT: {
-    auto end_keys = std::find(std::begin(optarg), std::end(optarg), ';');
-    auto src_params = StringRef{end_keys, std::end(optarg)};
-
-    SubcertParams params;
-    if (parse_subcert_params(params, src_params) != 0) {
-      return -1;
-    }
-
-    std::vector<uint8_t> sct_data;
-
-    if (!params.sct_dir.empty()) {
-      // Make sure that dir_path is NULL terminated string.
-      if (read_tls_sct_from_dir(sct_data, opt,
-                                StringRef{params.sct_dir.str()}) != 0) {
-        return -1;
-      }
-    }
-
-    // Private Key file and certificate file separated by ':'.
-    auto sp = std::find(std::begin(optarg), end_keys, ':');
-    if (sp == end_keys) {
-      LOG(ERROR) << opt << ": missing ':' in "
-                 << StringRef{std::begin(optarg), end_keys};
-      return -1;
-    }
-
-    auto private_key_file = StringRef{std::begin(optarg), sp};
-
-    if (private_key_file.empty()) {
-      LOG(ERROR) << opt << ": missing private key file: "
-                 << StringRef{std::begin(optarg), end_keys};
-      return -1;
-    }
-
-    auto cert_file = StringRef{sp + 1, end_keys};
-
-    if (cert_file.empty()) {
-      LOG(ERROR) << opt << ": missing certificate file: "
-                 << StringRef{std::begin(optarg), end_keys};
-      return -1;
-    }
-
-    config->tls.subcerts.emplace_back(
-        make_string_ref(config->balloc, private_key_file),
-        make_string_ref(config->balloc, cert_file), std::move(sct_data));
-
-    return 0;
-  }
-  case SHRPX_OPTID_SYSLOG_FACILITY: {
-    int facility = int_syslog_facility(optarg);
-    if (facility == -1) {
-      LOG(ERROR) << opt << ": Unknown syslog facility: " << optarg;
-      return -1;
-    }
-    config->logging.syslog_facility = facility;
-
-    return 0;
-  }
-  case SHRPX_OPTID_BACKLOG:
-    return parse_uint(&config->conn.listener.backlog, opt, optarg);
-  case SHRPX_OPTID_CIPHERS:
-    config->tls.ciphers = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS13_CIPHERS:
-    config->tls.tls13_ciphers = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_CLIENT:
-    LOG(ERROR) << opt
-               << ": deprecated.  Use frontend=<addr>,<port>;no-tls, "
-                  "backend=<addr>,<port>;;proto=h2;tls";
-    return -1;
-  case SHRPX_OPTID_INSECURE:
-    config->tls.insecure = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_CACERT:
-    config->tls.cacert = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_IPV4:
-    LOG(WARN) << opt
-              << ": deprecated.  Use backend-address-family=IPv4 instead.";
-
-    config->conn.downstream->family = AF_INET;
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_IPV6:
-    LOG(WARN) << opt
-              << ": deprecated.  Use backend-address-family=IPv6 instead.";
-
-    config->conn.downstream->family = AF_INET6;
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP_PROXY_URI: {
-    auto &proxy = config->downstream_http_proxy;
-    // Reset here so that multiple option occurrence does not merge
-    // the results.
-    proxy = {};
-    // parse URI and get hostname, port and optionally userinfo.
-    http_parser_url u{};
-    int rv = http_parser_parse_url(optarg.c_str(), optarg.size(), 0, &u);
-    if (rv == 0) {
-      if (u.field_set & UF_USERINFO) {
-        auto uf = util::get_uri_field(optarg.c_str(), u, UF_USERINFO);
-        // Surprisingly, u.field_set & UF_USERINFO is nonzero even if
-        // userinfo component is empty string.
-        if (!uf.empty()) {
-          proxy.userinfo = util::percent_decode(config->balloc, uf);
-        }
-      }
-      if (u.field_set & UF_HOST) {
-        proxy.host = make_string_ref(
-            config->balloc, util::get_uri_field(optarg.c_str(), u, UF_HOST));
-      } else {
-        LOG(ERROR) << opt << ": no hostname specified";
-        return -1;
-      }
-      if (u.field_set & UF_PORT) {
-        proxy.port = u.port;
-      } else {
-        LOG(ERROR) << opt << ": no port specified";
-        return -1;
-      }
-    } else {
-      LOG(ERROR) << opt << ": parse error";
-      return -1;
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_READ_RATE:
-    return parse_uint_with_unit(&config->conn.upstream.ratelimit.read.rate, opt,
-                                optarg);
-  case SHRPX_OPTID_READ_BURST:
-    return parse_uint_with_unit(&config->conn.upstream.ratelimit.read.burst,
-                                opt, optarg);
-  case SHRPX_OPTID_WRITE_RATE:
-    return parse_uint_with_unit(&config->conn.upstream.ratelimit.write.rate,
-                                opt, optarg);
-  case SHRPX_OPTID_WRITE_BURST:
-    return parse_uint_with_unit(&config->conn.upstream.ratelimit.write.burst,
-                                opt, optarg);
-  case SHRPX_OPTID_WORKER_READ_RATE:
-    LOG(WARN) << opt << ": not implemented yet";
-    return 0;
-  case SHRPX_OPTID_WORKER_READ_BURST:
-    LOG(WARN) << opt << ": not implemented yet";
-    return 0;
-  case SHRPX_OPTID_WORKER_WRITE_RATE:
-    LOG(WARN) << opt << ": not implemented yet";
-    return 0;
-  case SHRPX_OPTID_WORKER_WRITE_BURST:
-    LOG(WARN) << opt << ": not implemented yet";
-    return 0;
-  case SHRPX_OPTID_NPN_LIST: {
-    auto list = util::split_str(optarg, ',');
-    config->tls.npn_list.resize(list.size());
-    for (size_t i = 0; i < list.size(); ++i) {
-      config->tls.npn_list[i] = make_string_ref(config->balloc, list[i]);
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_TLS_PROTO_LIST: {
-    LOG(WARN) << opt
-              << ": deprecated.  Use tls-min-proto-version and "
-                 "tls-max-proto-version instead.";
-    auto list = util::split_str(optarg, ',');
-    config->tls.tls_proto_list.resize(list.size());
-    for (size_t i = 0; i < list.size(); ++i) {
-      config->tls.tls_proto_list[i] = make_string_ref(config->balloc, list[i]);
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_VERIFY_CLIENT:
-    config->tls.client_verify.enabled = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_VERIFY_CLIENT_CACERT:
-    config->tls.client_verify.cacert = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_CLIENT_PRIVATE_KEY_FILE:
-    config->tls.client.private_key_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_CLIENT_CERT_FILE:
-    config->tls.client.cert_file = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_DUMP_REQUEST_HEADER:
-    config->http2.upstream.debug.dump.request_header_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_DUMP_RESPONSE_HEADER:
-    config->http2.upstream.debug.dump.response_header_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_HTTP2_NO_COOKIE_CRUMBLING:
-    config->http2.no_cookie_crumbling = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_FRAME_DEBUG:
-    config->http2.upstream.debug.frame_debug = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_PADDING:
-    return parse_uint(&config->padding, opt, optarg);
-  case SHRPX_OPTID_ALTSVC: {
-    auto tokens = util::split_str(optarg, ',');
-
-    if (tokens.size() < 2) {
-      // Requires at least protocol_id and port
-      LOG(ERROR) << opt << ": too few parameters: " << optarg;
-      return -1;
-    }
-
-    if (tokens.size() > 4) {
-      // We only need protocol_id, port, host and origin
-      LOG(ERROR) << opt << ": too many parameters: " << optarg;
-      return -1;
-    }
-
-    int port;
-
-    if (parse_uint(&port, opt, tokens[1]) != 0) {
-      return -1;
-    }
-
-    if (port < 1 ||
-        port > static_cast<int>(std::numeric_limits<uint16_t>::max())) {
-      LOG(ERROR) << opt << ": port is invalid: " << tokens[1];
-      return -1;
-    }
-
-    AltSvc altsvc{};
-
-    altsvc.protocol_id = make_string_ref(config->balloc, tokens[0]);
-
-    altsvc.port = port;
-    altsvc.service = make_string_ref(config->balloc, tokens[1]);
-
-    if (tokens.size() > 2) {
-      altsvc.host = make_string_ref(config->balloc, tokens[2]);
-
-      if (tokens.size() > 3) {
-        altsvc.origin = make_string_ref(config->balloc, tokens[3]);
-      }
-    }
-
-    config->http.altsvcs.push_back(std::move(altsvc));
-
-    return 0;
-  }
-  case SHRPX_OPTID_ADD_REQUEST_HEADER:
-  case SHRPX_OPTID_ADD_RESPONSE_HEADER: {
-    auto p = parse_header(config->balloc, optarg);
-    if (p.name.empty()) {
-      LOG(ERROR) << opt << ": invalid header field: " << optarg;
-      return -1;
-    }
-    if (optid == SHRPX_OPTID_ADD_REQUEST_HEADER) {
-      config->http.add_request_headers.push_back(std::move(p));
-    } else {
-      config->http.add_response_headers.push_back(std::move(p));
-    }
-    return 0;
-  }
-  case SHRPX_OPTID_WORKER_FRONTEND_CONNECTIONS:
-    return parse_uint(&config->conn.upstream.worker_connections, opt, optarg);
-  case SHRPX_OPTID_NO_LOCATION_REWRITE:
-    config->http.no_location_rewrite = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_NO_HOST_REWRITE:
-    LOG(WARN) << SHRPX_OPT_NO_HOST_REWRITE
-              << ": deprecated.  :authority and host header fields are NOT "
-                 "altered by default.  To rewrite these headers, use "
-                 "--host-rewrite option.";
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP1_CONNECTIONS_PER_HOST:
-    LOG(WARN) << opt
-              << ": deprecated.  Use backend-connections-per-host instead.";
-  // fall through
-  case SHRPX_OPTID_BACKEND_CONNECTIONS_PER_HOST: {
-    int n;
-
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n == 0) {
-      LOG(ERROR) << opt << ": specify an integer strictly more than 0";
-
-      return -1;
-    }
-
-    config->conn.downstream->connections_per_host = n;
-
-    return 0;
-  }
-  case SHRPX_OPTID_BACKEND_HTTP1_CONNECTIONS_PER_FRONTEND:
-    LOG(WARN) << opt << ": deprecated.  Use "
-              << SHRPX_OPT_BACKEND_CONNECTIONS_PER_FRONTEND << " instead.";
-  // fall through
-  case SHRPX_OPTID_BACKEND_CONNECTIONS_PER_FRONTEND:
-    return parse_uint(&config->conn.downstream->connections_per_frontend, opt,
-                      optarg);
-  case SHRPX_OPTID_LISTENER_DISABLE_TIMEOUT:
-    return parse_duration(&config->conn.listener.timeout.sleep, opt, optarg);
-  case SHRPX_OPTID_TLS_TICKET_KEY_FILE:
-    config->tls.ticket.files.emplace_back(
-        make_string_ref(config->balloc, optarg));
-    return 0;
-  case SHRPX_OPTID_RLIMIT_NOFILE: {
-    int n;
-
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n < 0) {
-      LOG(ERROR) << opt << ": specify the integer more than or equal to 0";
-
-      return -1;
-    }
-
-    config->rlimit_nofile = n;
-
-    return 0;
-  }
-  case SHRPX_OPTID_BACKEND_REQUEST_BUFFER:
-  case SHRPX_OPTID_BACKEND_RESPONSE_BUFFER: {
-    size_t n;
-    if (parse_uint_with_unit(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n == 0) {
-      LOG(ERROR) << opt << ": specify an integer strictly more than 0";
-
-      return -1;
-    }
-
-    if (optid == SHRPX_OPTID_BACKEND_REQUEST_BUFFER) {
-      config->conn.downstream->request_buffer_size = n;
-    } else {
-      config->conn.downstream->response_buffer_size = n;
-    }
-
-    return 0;
-  }
-
-  case SHRPX_OPTID_NO_SERVER_PUSH:
-    config->http2.no_server_push = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP2_CONNECTIONS_PER_WORKER:
-    LOG(WARN) << opt << ": deprecated.";
-    return 0;
-  case SHRPX_OPTID_FETCH_OCSP_RESPONSE_FILE:
-    config->tls.ocsp.fetch_ocsp_response_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_OCSP_UPDATE_INTERVAL:
-    return parse_duration(&config->tls.ocsp.update_interval, opt, optarg);
-  case SHRPX_OPTID_NO_OCSP:
-    config->tls.ocsp.disabled = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_HEADER_FIELD_BUFFER:
-    LOG(WARN) << opt
-              << ": deprecated.  Use request-header-field-buffer instead.";
-  // fall through
-  case SHRPX_OPTID_REQUEST_HEADER_FIELD_BUFFER:
-    return parse_uint_with_unit(&config->http.request_header_field_buffer, opt,
-                                optarg);
-  case SHRPX_OPTID_MAX_HEADER_FIELDS:
-    LOG(WARN) << opt << ": deprecated.  Use max-request-header-fields instead.";
-  // fall through
-  case SHRPX_OPTID_MAX_REQUEST_HEADER_FIELDS:
-    return parse_uint(&config->http.max_request_header_fields, opt, optarg);
-  case SHRPX_OPTID_RESPONSE_HEADER_FIELD_BUFFER:
-    return parse_uint_with_unit(&config->http.response_header_field_buffer, opt,
-                                optarg);
-  case SHRPX_OPTID_MAX_RESPONSE_HEADER_FIELDS:
-    return parse_uint(&config->http.max_response_header_fields, opt, optarg);
-  case SHRPX_OPTID_INCLUDE: {
-    if (included_set.count(optarg)) {
-      LOG(ERROR) << opt << ": " << optarg << " has already been included";
-      return -1;
-    }
-
-    included_set.insert(optarg);
-    auto rv =
-        load_config(config, optarg.c_str(), included_set, pattern_addr_indexer);
-    included_set.erase(optarg);
-
-    if (rv != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_TLS_TICKET_KEY_CIPHER:
-    if (util::strieq_l("aes-128-cbc", optarg)) {
-      config->tls.ticket.cipher = EVP_aes_128_cbc();
-    } else if (util::strieq_l("aes-256-cbc", optarg)) {
-      config->tls.ticket.cipher = EVP_aes_256_cbc();
-    } else {
-      LOG(ERROR) << opt
-                 << ": unsupported cipher for ticket encryption: " << optarg;
-      return -1;
-    }
-    config->tls.ticket.cipher_given = true;
-
-    return 0;
-  case SHRPX_OPTID_HOST_REWRITE:
-    config->http.no_host_rewrite = !util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED:
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED: {
-    auto addr_end = std::find(std::begin(optarg), std::end(optarg), ';');
-    auto src_params = StringRef{addr_end, std::end(optarg)};
-
-    MemcachedConnectionParams params{};
-    if (parse_memcached_connection_params(params, src_params, StringRef{opt}) !=
-        0) {
-      return -1;
-    }
-
-    if (split_host_port(host, sizeof(host), &port,
-                        StringRef{std::begin(optarg), addr_end}, opt) == -1) {
-      return -1;
-    }
-
-    switch (optid) {
-    case SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED: {
-      auto &memcachedconf = config->tls.session_cache.memcached;
-      memcachedconf.host = make_string_ref(config->balloc, StringRef{host});
-      memcachedconf.port = port;
-      memcachedconf.tls = params.tls;
-      break;
-    }
-    case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED: {
-      auto &memcachedconf = config->tls.ticket.memcached;
-      memcachedconf.host = make_string_ref(config->balloc, StringRef{host});
-      memcachedconf.port = port;
-      memcachedconf.tls = params.tls;
-      break;
-    }
-    };
-
-    return 0;
-  }
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_INTERVAL:
-    return parse_duration(&config->tls.ticket.memcached.interval, opt, optarg);
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_MAX_RETRY: {
-    int n;
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n > 30) {
-      LOG(ERROR) << opt << ": must be smaller than or equal to 30";
-      return -1;
-    }
-
-    config->tls.ticket.memcached.max_retry = n;
-    return 0;
-  }
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_MAX_FAIL:
-    return parse_uint(&config->tls.ticket.memcached.max_fail, opt, optarg);
-  case SHRPX_OPTID_TLS_DYN_REC_WARMUP_THRESHOLD: {
-    size_t n;
-    if (parse_uint_with_unit(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    config->tls.dyn_rec.warmup_threshold = n;
-
-    return 0;
-  }
-
-  case SHRPX_OPTID_TLS_DYN_REC_IDLE_TIMEOUT:
-    return parse_duration(&config->tls.dyn_rec.idle_timeout, opt, optarg);
-
-  case SHRPX_OPTID_MRUBY_FILE:
-#ifdef HAVE_MRUBY
-    config->mruby_file = make_string_ref(config->balloc, optarg);
-#else  // !HAVE_MRUBY
-    LOG(WARN) << opt
-              << ": ignored because mruby support is disabled at build time.";
-#endif // !HAVE_MRUBY
-    return 0;
-  case SHRPX_OPTID_ACCEPT_PROXY_PROTOCOL:
-    LOG(WARN) << opt << ": deprecated.  Use proxyproto keyword in "
-              << SHRPX_OPT_FRONTEND << " instead.";
-    config->conn.upstream.accept_proxy_protocol = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_ADD_FORWARDED: {
-    auto &fwdconf = config->http.forwarded;
-    fwdconf.params = FORWARDED_NONE;
-    for (const auto &param : util::split_str(optarg, ',')) {
-      if (util::strieq_l("by", param)) {
-        fwdconf.params |= FORWARDED_BY;
-        continue;
-      }
-      if (util::strieq_l("for", param)) {
-        fwdconf.params |= FORWARDED_FOR;
-        continue;
-      }
-      if (util::strieq_l("host", param)) {
-        fwdconf.params |= FORWARDED_HOST;
-        continue;
-      }
-      if (util::strieq_l("proto", param)) {
-        fwdconf.params |= FORWARDED_PROTO;
-        continue;
-      }
-
-      LOG(ERROR) << opt << ": unknown parameter " << optarg;
-
-      return -1;
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_STRIP_INCOMING_FORWARDED:
-    config->http.forwarded.strip_incoming = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FORWARDED_BY:
-  case SHRPX_OPTID_FORWARDED_FOR: {
-    auto type = parse_forwarded_node_type(optarg);
-
-    if (type == -1 ||
-        (optid == SHRPX_OPTID_FORWARDED_FOR && optarg[0] == '_')) {
-      LOG(ERROR) << opt << ": unknown node type or illegal obfuscated string "
-                 << optarg;
-      return -1;
-    }
-
-    auto &fwdconf = config->http.forwarded;
-
-    switch (optid) {
-    case SHRPX_OPTID_FORWARDED_BY:
-      fwdconf.by_node_type = static_cast<shrpx_forwarded_node_type>(type);
-      if (optarg[0] == '_') {
-        fwdconf.by_obfuscated = make_string_ref(config->balloc, optarg);
-      } else {
-        fwdconf.by_obfuscated = StringRef::from_lit("");
-      }
-      break;
-    case SHRPX_OPTID_FORWARDED_FOR:
-      fwdconf.for_node_type = static_cast<shrpx_forwarded_node_type>(type);
-      break;
-    }
-
-    return 0;
-  }
-  case SHRPX_OPTID_NO_HTTP2_CIPHER_BLACK_LIST:
-    config->tls.no_http2_cipher_black_list = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP1_TLS:
-  case SHRPX_OPTID_BACKEND_TLS:
-    LOG(WARN) << opt << ": deprecated.  Use tls keyword in "
-              << SHRPX_OPT_BACKEND << " instead.";
-    return 0;
-  case SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_TLS:
-    LOG(WARN) << opt << ": deprecated.  Use tls keyword in "
-              << SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED;
-    return 0;
-  case SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_CERT_FILE:
-    config->tls.session_cache.memcached.cert_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_PRIVATE_KEY_FILE:
-    config->tls.session_cache.memcached.private_key_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_TLS:
-    LOG(WARN) << opt << ": deprecated.  Use tls keyword in "
-              << SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED;
-    return 0;
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_CERT_FILE:
-    config->tls.ticket.memcached.cert_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_PRIVATE_KEY_FILE:
-    config->tls.ticket.memcached.private_key_file =
-        make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_ADDRESS_FAMILY:
-    return parse_address_family(&config->tls.ticket.memcached.family, opt,
-                                optarg);
-  case SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_ADDRESS_FAMILY:
-    return parse_address_family(&config->tls.session_cache.memcached.family,
-                                opt, optarg);
-  case SHRPX_OPTID_BACKEND_ADDRESS_FAMILY:
-    return parse_address_family(&config->conn.downstream->family, opt, optarg);
-  case SHRPX_OPTID_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS:
-    return parse_uint(&config->http2.upstream.max_concurrent_streams, opt,
-                      optarg);
-  case SHRPX_OPTID_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS:
-    return parse_uint(&config->http2.downstream.max_concurrent_streams, opt,
-                      optarg);
-  case SHRPX_OPTID_ERROR_PAGE:
-    return parse_error_page(config->http.error_pages, opt, optarg);
-  case SHRPX_OPTID_NO_KQUEUE:
-    if ((ev_supported_backends() & EVBACKEND_KQUEUE) == 0) {
-      LOG(WARN) << opt << ": kqueue is not supported on this platform";
-      return 0;
-    }
-
-    config->ev_loop_flags = ev_recommended_backends() & ~EVBACKEND_KQUEUE;
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_SETTINGS_TIMEOUT:
-    return parse_duration(&config->http2.upstream.timeout.settings, opt,
-                          optarg);
-  case SHRPX_OPTID_BACKEND_HTTP2_SETTINGS_TIMEOUT:
-    return parse_duration(&config->http2.downstream.timeout.settings, opt,
-                          optarg);
-  case SHRPX_OPTID_API_MAX_REQUEST_BODY:
-    return parse_uint_with_unit(&config->api.max_request_body, opt, optarg);
-  case SHRPX_OPTID_BACKEND_MAX_BACKOFF:
-    return parse_duration(&config->conn.downstream->timeout.max_backoff, opt,
-                          optarg);
-  case SHRPX_OPTID_SERVER_NAME:
-    config->http.server_name = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_NO_SERVER_REWRITE:
-    config->http.no_server_rewrite = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_OPTIMIZE_WRITE_BUFFER_SIZE:
-    config->http2.upstream.optimize_write_buffer_size =
-        util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_OPTIMIZE_WINDOW_SIZE:
-    config->http2.upstream.optimize_window_size = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_SIZE:
-    if (parse_uint_with_unit(&config->http2.upstream.window_size, opt,
-                             optarg) != 0) {
-      return -1;
-    }
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE:
-    if (parse_uint_with_unit(&config->http2.upstream.connection_window_size,
-                             opt, optarg) != 0) {
-      return -1;
-    }
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP2_WINDOW_SIZE:
-    if (parse_uint_with_unit(&config->http2.downstream.window_size, opt,
-                             optarg) != 0) {
-      return -1;
-    }
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE:
-    if (parse_uint_with_unit(&config->http2.downstream.connection_window_size,
-                             opt, optarg) != 0) {
-      return -1;
-    }
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE:
-    if (parse_uint_with_unit(&config->http2.upstream.encoder_dynamic_table_size,
-                             opt, optarg) != 0) {
-      return -1;
-    }
-
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        config->http2.upstream.option,
-        config->http2.upstream.encoder_dynamic_table_size);
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        config->http2.upstream.alt_mode_option,
-        config->http2.upstream.encoder_dynamic_table_size);
-
-    return 0;
-  case SHRPX_OPTID_FRONTEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE:
-    return parse_uint_with_unit(
-        &config->http2.upstream.decoder_dynamic_table_size, opt, optarg);
-  case SHRPX_OPTID_BACKEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE:
-    if (parse_uint_with_unit(
-            &config->http2.downstream.encoder_dynamic_table_size, opt,
-            optarg) != 0) {
-      return -1;
-    }
-
-    nghttp2_option_set_max_deflate_dynamic_table_size(
-        config->http2.downstream.option,
-        config->http2.downstream.encoder_dynamic_table_size);
-
-    return 0;
-  case SHRPX_OPTID_BACKEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE:
-    return parse_uint_with_unit(
-        &config->http2.downstream.decoder_dynamic_table_size, opt, optarg);
-  case SHRPX_OPTID_ECDH_CURVES:
-#if !LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L
-    config->tls.ecdh_curves = make_string_ref(config->balloc, optarg);
-#else  // !(!LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-    LOG(WARN) << opt << ": This option requires OpenSSL >= 1.0.2";
-#endif // !(!LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-    return 0;
-  case SHRPX_OPTID_TLS_SCT_DIR:
-#if !LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L
-    return read_tls_sct_from_dir(config->tls.sct_data, opt, optarg);
-#else  // !(!LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-    LOG(WARN) << opt << ": This option requires OpenSSL >= 1.0.2";
-    return 0;
-#endif // !(!LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-  case SHRPX_OPTID_DNS_CACHE_TIMEOUT:
-    return parse_duration(&config->dns.timeout.cache, opt, optarg);
-  case SHRPX_OPTID_DNS_LOOKUP_TIMEOUT:
-    return parse_duration(&config->dns.timeout.lookup, opt, optarg);
-  case SHRPX_OPTID_DNS_MAX_TRY: {
-    int n;
-    if (parse_uint(&n, opt, optarg) != 0) {
-      return -1;
-    }
-
-    if (n > 5) {
-      LOG(ERROR) << opt << ": must be smaller than or equal to 5";
-      return -1;
-    }
-
-    config->dns.max_try = n;
-    return 0;
-  }
-  case SHRPX_OPTID_FRONTEND_KEEP_ALIVE_TIMEOUT:
-    return parse_duration(&config->conn.upstream.timeout.idle_read, opt,
-                          optarg);
-  case SHRPX_OPTID_PSK_SECRETS:
-#if !LIBRESSL_LEGACY_API
-    return parse_psk_secrets(config, optarg);
-#else  // LIBRESSL_LEGACY_API
-    LOG(WARN)
-        << opt
-        << ": ignored because underlying TLS library does not support PSK";
-    return 0;
-#endif // LIBRESSL_LEGACY_API
-  case SHRPX_OPTID_CLIENT_PSK_SECRETS:
-#if !LIBRESSL_LEGACY_API
-    return parse_client_psk_secrets(config, optarg);
-#else  // LIBRESSL_LEGACY_API
-    LOG(WARN)
-        << opt
-        << ": ignored because underlying TLS library does not support PSK";
-    return 0;
-#endif // LIBRESSL_LEGACY_API
-  case SHRPX_OPTID_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST:
-    config->tls.client.no_http2_cipher_black_list =
-        util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_CLIENT_CIPHERS:
-    config->tls.client.ciphers = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS13_CLIENT_CIPHERS:
-    config->tls.client.tls13_ciphers = make_string_ref(config->balloc, optarg);
-
-    return 0;
-  case SHRPX_OPTID_ACCESSLOG_WRITE_EARLY:
-    config->logging.access.write_early = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_MIN_PROTO_VERSION:
-    return parse_tls_proto_version(config->tls.min_proto_version, opt, optarg);
-  case SHRPX_OPTID_TLS_MAX_PROTO_VERSION:
-    return parse_tls_proto_version(config->tls.max_proto_version, opt, optarg);
-  case SHRPX_OPTID_REDIRECT_HTTPS_PORT: {
-    auto n = util::parse_uint(optarg);
-    if (n == -1 || n < 0 || n > 65535) {
-      LOG(ERROR) << opt
-                 << ": bad value.  Specify an integer in the range [0, "
-                    "65535], inclusive";
-      return -1;
-    }
-    config->http.redirect_https_port = optarg;
-    return 0;
-  }
-  case SHRPX_OPTID_FRONTEND_MAX_REQUESTS:
-    return parse_uint(&config->http.max_requests, opt, optarg);
-  case SHRPX_OPTID_SINGLE_THREAD:
-    config->single_thread = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_SINGLE_PROCESS:
-    config->single_process = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_NO_ADD_X_FORWARDED_PROTO:
-    config->http.xfp.add = !util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_NO_STRIP_INCOMING_X_FORWARDED_PROTO:
-    config->http.xfp.strip_incoming = !util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_OCSP_STARTUP:
-    config->tls.ocsp.startup = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_NO_VERIFY_OCSP:
-    config->tls.ocsp.no_verify = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_VERIFY_CLIENT_TOLERATE_EXPIRED:
-    config->tls.client_verify.tolerate_expired = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_IGNORE_PER_PATTERN_MRUBY_ERROR:
-    config->ignore_per_pattern_mruby_error = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_NO_POSTPONE_EARLY_DATA:
-    config->tls.no_postpone_early_data = util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_TLS_MAX_EARLY_DATA: {
-    return parse_uint_with_unit(&config->tls.max_early_data, opt, optarg);
-  }
-  case SHRPX_OPTID_NO_STRIP_INCOMING_EARLY_DATA:
-    config->http.early_data.strip_incoming = !util::strieq_l("yes", optarg);
-
-    return 0;
-  case SHRPX_OPTID_CONF:
-    LOG(WARN) << "conf: ignored";
-
-    return 0;
-  }
-
-  LOG(ERROR) << "Unknown option: " << opt;
-
-  return -1;
-}
-
-int load_config(Config *config, const char *filename,
-                std::set<StringRef> &include_set,
-                std::map<StringRef, size_t> &pattern_addr_indexer) {
-  std::ifstream in(filename, std::ios::binary);
-  if (!in) {
-    LOG(ERROR) << "Could not open config file " << filename;
-    return -1;
-  }
-  std::string line;
-  int linenum = 0;
-  while (std::getline(in, line)) {
-    ++linenum;
-    if (line.empty() || line[0] == '#') {
-      continue;
-    }
-    auto eq = std::find(std::begin(line), std::end(line), '=');
-    if (eq == std::end(line)) {
-      LOG(ERROR) << "Bad configuration format in " << filename << " at line "
-                 << linenum;
-      return -1;
-    }
-    *eq = '\0';
-
-    if (parse_config(config, StringRef{std::begin(line), eq},
-                     StringRef{eq + 1, std::end(line)}, include_set,
-                     pattern_addr_indexer) != 0) {
-      return -1;
-    }
-  }
-  return 0;
-}
-
-StringRef str_syslog_facility(int facility) {
-  switch (facility) {
-  case (LOG_AUTH):
-    return StringRef::from_lit("auth");
-#ifdef LOG_AUTHPRIV
-  case (LOG_AUTHPRIV):
-    return StringRef::from_lit("authpriv");
-#endif // LOG_AUTHPRIV
-  case (LOG_CRON):
-    return StringRef::from_lit("cron");
-  case (LOG_DAEMON):
-    return StringRef::from_lit("daemon");
-#ifdef LOG_FTP
-  case (LOG_FTP):
-    return StringRef::from_lit("ftp");
-#endif // LOG_FTP
-  case (LOG_KERN):
-    return StringRef::from_lit("kern");
-  case (LOG_LOCAL0):
-    return StringRef::from_lit("local0");
-  case (LOG_LOCAL1):
-    return StringRef::from_lit("local1");
-  case (LOG_LOCAL2):
-    return StringRef::from_lit("local2");
-  case (LOG_LOCAL3):
-    return StringRef::from_lit("local3");
-  case (LOG_LOCAL4):
-    return StringRef::from_lit("local4");
-  case (LOG_LOCAL5):
-    return StringRef::from_lit("local5");
-  case (LOG_LOCAL6):
-    return StringRef::from_lit("local6");
-  case (LOG_LOCAL7):
-    return StringRef::from_lit("local7");
-  case (LOG_LPR):
-    return StringRef::from_lit("lpr");
-  case (LOG_MAIL):
-    return StringRef::from_lit("mail");
-  case (LOG_SYSLOG):
-    return StringRef::from_lit("syslog");
-  case (LOG_USER):
-    return StringRef::from_lit("user");
-  case (LOG_UUCP):
-    return StringRef::from_lit("uucp");
-  default:
-    return StringRef::from_lit("(unknown)");
-  }
-}
-
-int int_syslog_facility(const StringRef &strfacility) {
-  if (util::strieq_l("auth", strfacility)) {
-    return LOG_AUTH;
-  }
-
-#ifdef LOG_AUTHPRIV
-  if (util::strieq_l("authpriv", strfacility)) {
-    return LOG_AUTHPRIV;
-  }
-#endif // LOG_AUTHPRIV
-
-  if (util::strieq_l("cron", strfacility)) {
-    return LOG_CRON;
-  }
-
-  if (util::strieq_l("daemon", strfacility)) {
-    return LOG_DAEMON;
-  }
-
-#ifdef LOG_FTP
-  if (util::strieq_l("ftp", strfacility)) {
-    return LOG_FTP;
-  }
-#endif // LOG_FTP
-
-  if (util::strieq_l("kern", strfacility)) {
-    return LOG_KERN;
-  }
-
-  if (util::strieq_l("local0", strfacility)) {
-    return LOG_LOCAL0;
-  }
-
-  if (util::strieq_l("local1", strfacility)) {
-    return LOG_LOCAL1;
-  }
-
-  if (util::strieq_l("local2", strfacility)) {
-    return LOG_LOCAL2;
-  }
-
-  if (util::strieq_l("local3", strfacility)) {
-    return LOG_LOCAL3;
-  }
-
-  if (util::strieq_l("local4", strfacility)) {
-    return LOG_LOCAL4;
-  }
-
-  if (util::strieq_l("local5", strfacility)) {
-    return LOG_LOCAL5;
-  }
-
-  if (util::strieq_l("local6", strfacility)) {
-    return LOG_LOCAL6;
-  }
-
-  if (util::strieq_l("local7", strfacility)) {
-    return LOG_LOCAL7;
-  }
-
-  if (util::strieq_l("lpr", strfacility)) {
-    return LOG_LPR;
-  }
-
-  if (util::strieq_l("mail", strfacility)) {
-    return LOG_MAIL;
-  }
-
-  if (util::strieq_l("news", strfacility)) {
-    return LOG_NEWS;
-  }
-
-  if (util::strieq_l("syslog", strfacility)) {
-    return LOG_SYSLOG;
-  }
-
-  if (util::strieq_l("user", strfacility)) {
-    return LOG_USER;
-  }
-
-  if (util::strieq_l("uucp", strfacility)) {
-    return LOG_UUCP;
-  }
-
-  return -1;
-}
-
-StringRef strproto(shrpx_proto proto) {
-  switch (proto) {
-  case PROTO_NONE:
-    return StringRef::from_lit("none");
-  case PROTO_HTTP1:
-    return StringRef::from_lit("http/1.1");
-  case PROTO_HTTP2:
-    return StringRef::from_lit("h2");
-  case PROTO_MEMCACHED:
-    return StringRef::from_lit("memcached");
-  }
-
-  // gcc needs this.
-  assert(0);
-  abort();
-}
-
-namespace {
-// Consistent hashing method described in
-// https://github.com/RJ/ketama.  Generate 160 32-bit hashes per |s|,
-// which is usually backend address.  The each hash is associated to
-// index of backend address.  When all hashes for every backend
-// address are calculated, sort it in ascending order of hash.  To
-// choose the index, compute 32-bit hash based on client IP address,
-// and do lower bound search in the array. The returned index is the
-// backend to use.
-int compute_affinity_hash(std::vector<AffinityHash> &res, size_t idx,
-                          const StringRef &s) {
-  int rv;
-  std::array<uint8_t, 32> buf;
-
-  for (auto i = 0; i < 20; ++i) {
-    auto t = s.str();
-    t += i;
-
-    rv = util::sha256(buf.data(), StringRef{t});
-    if (rv != 0) {
-      return -1;
-    }
-
-    for (int i = 0; i < 8; ++i) {
-      auto h = (static_cast<uint32_t>(buf[4 * i]) << 24) |
-               (static_cast<uint32_t>(buf[4 * i + 1]) << 16) |
-               (static_cast<uint32_t>(buf[4 * i + 2]) << 8) |
-               static_cast<uint32_t>(buf[4 * i + 3]);
-
-      res.emplace_back(idx, h);
-    }
-  }
-
-  return 0;
-}
-} // namespace
-
-// Configures the following member in |config|:
-// conn.downstream_router, conn.downstream.addr_groups,
-// conn.downstream.addr_group_catch_all.
-int configure_downstream_group(Config *config, bool http2_proxy,
-                               bool numeric_addr_only,
-                               const TLSConfig &tlsconf) {
-  int rv;
-
-  auto &downstreamconf = *config->conn.downstream;
-  auto &addr_groups = downstreamconf.addr_groups;
-  auto &routerconf = downstreamconf.router;
-  auto &router = routerconf.router;
-
-  if (addr_groups.empty()) {
-    DownstreamAddrConfig addr{};
-    addr.host = StringRef::from_lit(DEFAULT_DOWNSTREAM_HOST);
-    addr.port = DEFAULT_DOWNSTREAM_PORT;
-    addr.proto = PROTO_HTTP1;
-
-    DownstreamAddrGroupConfig g(StringRef::from_lit("/"));
-    g.addrs.push_back(std::move(addr));
-    router.add_route(g.pattern, addr_groups.size());
-    addr_groups.push_back(std::move(g));
-  }
-
-  // backward compatibility: override all SNI fields with the option
-  // value --backend-tls-sni-field
-  if (!tlsconf.backend_sni_name.empty()) {
-    auto &sni = tlsconf.backend_sni_name;
-    for (auto &addr_group : addr_groups) {
-      for (auto &addr : addr_group.addrs) {
-        addr.sni = sni;
-      }
-    }
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Resolving backend address";
-  }
-
-  ssize_t catch_all_group = -1;
-  for (size_t i = 0; i < addr_groups.size(); ++i) {
-    auto &g = addr_groups[i];
-    if (g.pattern == StringRef::from_lit("/")) {
-      catch_all_group = i;
-    }
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Host-path pattern: group " << i << ": '" << g.pattern
-                << "'";
-      for (auto &addr : g.addrs) {
-        LOG(INFO) << "group " << i << " -> " << addr.host.c_str()
-                  << (addr.host_unix ? "" : ":" + util::utos(addr.port))
-                  << ", proto=" << strproto(addr.proto)
-                  << (addr.tls ? ", tls" : "");
-      }
-    }
-#ifdef HAVE_MRUBY
-    // Try compile mruby script and catch compile error early.
-    if (!g.mruby_file.empty()) {
-      if (mruby::create_mruby_context(g.mruby_file) == nullptr) {
-        LOG(config->ignore_per_pattern_mruby_error ? ERROR : FATAL)
-            << "backend: Could not compile mruby flie for pattern "
-            << g.pattern;
-        if (!config->ignore_per_pattern_mruby_error) {
-          return -1;
-        }
-        g.mruby_file = StringRef{};
-      }
-    }
-#endif // HAVE_MRUBY
-  }
-
-#ifdef HAVE_MRUBY
-  // Try compile mruby script (--mruby-file) here to catch compile
-  // error early.
-  if (!config->mruby_file.empty()) {
-    if (mruby::create_mruby_context(config->mruby_file) == nullptr) {
-      LOG(FATAL) << "mruby-file: Could not compile mruby file";
-      return -1;
-    }
-  }
-#endif // HAVE_MRUBY
-
-  if (catch_all_group == -1) {
-    LOG(FATAL) << "backend: No catch-all backend address is configured";
-    return -1;
-  }
-
-  downstreamconf.addr_group_catch_all = catch_all_group;
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Catch-all pattern is group " << catch_all_group;
-  }
-
-  auto resolve_flags = numeric_addr_only ? AI_NUMERICHOST | AI_NUMERICSERV : 0;
-
-  for (auto &g : addr_groups) {
-    for (auto &addr : g.addrs) {
-
-      if (addr.host_unix) {
-        // for AF_UNIX socket, we use "localhost" as host for backend
-        // hostport.  This is used as Host header field to backend and
-        // not going to be passed to any syscalls.
-        addr.hostport = StringRef::from_lit("localhost");
-
-        auto path = addr.host.c_str();
-        auto pathlen = addr.host.size();
-
-        if (pathlen + 1 > sizeof(addr.addr.su.un.sun_path)) {
-          LOG(FATAL) << "UNIX domain socket path " << path << " is too long > "
-                     << sizeof(addr.addr.su.un.sun_path);
-          return -1;
-        }
-
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "Use UNIX domain socket path " << path
-                    << " for backend connection";
-        }
-
-        addr.addr.su.un.sun_family = AF_UNIX;
-        // copy path including terminal NULL
-        std::copy_n(path, pathlen + 1, addr.addr.su.un.sun_path);
-        addr.addr.len = sizeof(addr.addr.su.un);
-
-        continue;
-      }
-
-      addr.hostport =
-          util::make_http_hostport(downstreamconf.balloc, addr.host, addr.port);
-
-      auto hostport =
-          util::make_hostport(downstreamconf.balloc, addr.host, addr.port);
-
-      if (!addr.dns) {
-        if (resolve_hostname(&addr.addr, addr.host.c_str(), addr.port,
-                             downstreamconf.family, resolve_flags) == -1) {
-          LOG(FATAL) << "Resolving backend address failed: " << hostport;
-          return -1;
-        }
-
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "Resolved backend address: " << hostport << " -> "
-                    << util::to_numeric_addr(&addr.addr);
-        }
-      } else {
-        LOG(INFO) << "Resolving backend address " << hostport
-                  << " takes place dynamically";
-      }
-    }
-
-    if (g.affinity.type != AFFINITY_NONE) {
-      size_t idx = 0;
-      for (auto &addr : g.addrs) {
-        StringRef key;
-        if (addr.dns) {
-          if (addr.host_unix) {
-            key = addr.host;
-          } else {
-            key = addr.hostport;
-          }
-        } else {
-          auto p = reinterpret_cast<uint8_t *>(&addr.addr.su);
-          key = StringRef{p, addr.addr.len};
-        }
-        rv = compute_affinity_hash(g.affinity_hash, idx, key);
-        if (rv != 0) {
-          return -1;
-        }
-
-        ++idx;
-      }
-
-      std::sort(std::begin(g.affinity_hash), std::end(g.affinity_hash),
-                [](const AffinityHash &lhs, const AffinityHash &rhs) {
-                  return lhs.hash < rhs.hash;
-                });
-    }
-  }
-
-  return 0;
-}
-
-int resolve_hostname(Address *addr, const char *hostname, uint16_t port,
-                     int family, int additional_flags) {
-  int rv;
-
-  auto service = util::utos(port);
-
-  addrinfo hints{};
-  hints.ai_family = family;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags |= additional_flags;
-#ifdef AI_ADDRCONFIG
-  hints.ai_flags |= AI_ADDRCONFIG;
-#endif // AI_ADDRCONFIG
-  addrinfo *res;
-
-  rv = getaddrinfo(hostname, service.c_str(), &hints, &res);
-#ifdef AI_ADDRCONFIG
-  if (rv != 0) {
-    // Retry without AI_ADDRCONFIG
-    hints.ai_flags &= ~AI_ADDRCONFIG;
-    rv = getaddrinfo(hostname, service.c_str(), &hints, &res);
-  }
-#endif // AI_ADDRCONFIG
-  if (rv != 0) {
-    LOG(FATAL) << "Unable to resolve address for " << hostname << ": "
-               << gai_strerror(rv);
-    return -1;
-  }
-
-  auto res_d = defer(freeaddrinfo, res);
-
-  char host[NI_MAXHOST];
-  rv = getnameinfo(res->ai_addr, res->ai_addrlen, host, sizeof(host), nullptr,
-                   0, NI_NUMERICHOST);
-  if (rv != 0) {
-    LOG(FATAL) << "Address resolution for " << hostname
-               << " failed: " << gai_strerror(rv);
-
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Address resolution for " << hostname
-              << " succeeded: " << host;
-  }
-
-  memcpy(&addr->su, res->ai_addr, res->ai_addrlen);
-  addr->len = res->ai_addrlen;
-
-  return 0;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1241 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_CONFIG_H
-#define SHRPX_CONFIG_H
-
-#include "shrpx.h"
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#include <sys/un.h>
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif // HAVE_ARPA_INET_H
-#include <cinttypes>
-#include <cstdio>
-#include <vector>
-#include <memory>
-#include <set>
-
-#include <openssl/ssl.h>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_router.h"
-#include "template.h"
-#include "http2.h"
-#include "network.h"
-#include "allocator.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-struct LogFragment;
-class ConnectBlocker;
-class Http2Session;
-
-namespace tls {
-
-class CertLookupTree;
-
-} // namespace tls
-
-constexpr auto SHRPX_OPT_PRIVATE_KEY_FILE =
-    StringRef::from_lit("private-key-file");
-constexpr auto SHRPX_OPT_PRIVATE_KEY_PASSWD_FILE =
-    StringRef::from_lit("private-key-passwd-file");
-constexpr auto SHRPX_OPT_CERTIFICATE_FILE =
-    StringRef::from_lit("certificate-file");
-constexpr auto SHRPX_OPT_DH_PARAM_FILE = StringRef::from_lit("dh-param-file");
-constexpr auto SHRPX_OPT_SUBCERT = StringRef::from_lit("subcert");
-constexpr auto SHRPX_OPT_BACKEND = StringRef::from_lit("backend");
-constexpr auto SHRPX_OPT_FRONTEND = StringRef::from_lit("frontend");
-constexpr auto SHRPX_OPT_WORKERS = StringRef::from_lit("workers");
-constexpr auto SHRPX_OPT_HTTP2_MAX_CONCURRENT_STREAMS =
-    StringRef::from_lit("http2-max-concurrent-streams");
-constexpr auto SHRPX_OPT_LOG_LEVEL = StringRef::from_lit("log-level");
-constexpr auto SHRPX_OPT_DAEMON = StringRef::from_lit("daemon");
-constexpr auto SHRPX_OPT_HTTP2_PROXY = StringRef::from_lit("http2-proxy");
-constexpr auto SHRPX_OPT_HTTP2_BRIDGE = StringRef::from_lit("http2-bridge");
-constexpr auto SHRPX_OPT_CLIENT_PROXY = StringRef::from_lit("client-proxy");
-constexpr auto SHRPX_OPT_ADD_X_FORWARDED_FOR =
-    StringRef::from_lit("add-x-forwarded-for");
-constexpr auto SHRPX_OPT_STRIP_INCOMING_X_FORWARDED_FOR =
-    StringRef::from_lit("strip-incoming-x-forwarded-for");
-constexpr auto SHRPX_OPT_NO_VIA = StringRef::from_lit("no-via");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_READ_TIMEOUT =
-    StringRef::from_lit("frontend-http2-read-timeout");
-constexpr auto SHRPX_OPT_FRONTEND_READ_TIMEOUT =
-    StringRef::from_lit("frontend-read-timeout");
-constexpr auto SHRPX_OPT_FRONTEND_WRITE_TIMEOUT =
-    StringRef::from_lit("frontend-write-timeout");
-constexpr auto SHRPX_OPT_BACKEND_READ_TIMEOUT =
-    StringRef::from_lit("backend-read-timeout");
-constexpr auto SHRPX_OPT_BACKEND_WRITE_TIMEOUT =
-    StringRef::from_lit("backend-write-timeout");
-constexpr auto SHRPX_OPT_STREAM_READ_TIMEOUT =
-    StringRef::from_lit("stream-read-timeout");
-constexpr auto SHRPX_OPT_STREAM_WRITE_TIMEOUT =
-    StringRef::from_lit("stream-write-timeout");
-constexpr auto SHRPX_OPT_ACCESSLOG_FILE = StringRef::from_lit("accesslog-file");
-constexpr auto SHRPX_OPT_ACCESSLOG_SYSLOG =
-    StringRef::from_lit("accesslog-syslog");
-constexpr auto SHRPX_OPT_ACCESSLOG_FORMAT =
-    StringRef::from_lit("accesslog-format");
-constexpr auto SHRPX_OPT_ERRORLOG_FILE = StringRef::from_lit("errorlog-file");
-constexpr auto SHRPX_OPT_ERRORLOG_SYSLOG =
-    StringRef::from_lit("errorlog-syslog");
-constexpr auto SHRPX_OPT_BACKEND_KEEP_ALIVE_TIMEOUT =
-    StringRef::from_lit("backend-keep-alive-timeout");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_WINDOW_BITS =
-    StringRef::from_lit("frontend-http2-window-bits");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_WINDOW_BITS =
-    StringRef::from_lit("backend-http2-window-bits");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS =
-    StringRef::from_lit("frontend-http2-connection-window-bits");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_BITS =
-    StringRef::from_lit("backend-http2-connection-window-bits");
-constexpr auto SHRPX_OPT_FRONTEND_NO_TLS =
-    StringRef::from_lit("frontend-no-tls");
-constexpr auto SHRPX_OPT_BACKEND_NO_TLS = StringRef::from_lit("backend-no-tls");
-constexpr auto SHRPX_OPT_BACKEND_TLS_SNI_FIELD =
-    StringRef::from_lit("backend-tls-sni-field");
-constexpr auto SHRPX_OPT_PID_FILE = StringRef::from_lit("pid-file");
-constexpr auto SHRPX_OPT_USER = StringRef::from_lit("user");
-constexpr auto SHRPX_OPT_SYSLOG_FACILITY =
-    StringRef::from_lit("syslog-facility");
-constexpr auto SHRPX_OPT_BACKLOG = StringRef::from_lit("backlog");
-constexpr auto SHRPX_OPT_CIPHERS = StringRef::from_lit("ciphers");
-constexpr auto SHRPX_OPT_CLIENT = StringRef::from_lit("client");
-constexpr auto SHRPX_OPT_INSECURE = StringRef::from_lit("insecure");
-constexpr auto SHRPX_OPT_CACERT = StringRef::from_lit("cacert");
-constexpr auto SHRPX_OPT_BACKEND_IPV4 = StringRef::from_lit("backend-ipv4");
-constexpr auto SHRPX_OPT_BACKEND_IPV6 = StringRef::from_lit("backend-ipv6");
-constexpr auto SHRPX_OPT_BACKEND_HTTP_PROXY_URI =
-    StringRef::from_lit("backend-http-proxy-uri");
-constexpr auto SHRPX_OPT_READ_RATE = StringRef::from_lit("read-rate");
-constexpr auto SHRPX_OPT_READ_BURST = StringRef::from_lit("read-burst");
-constexpr auto SHRPX_OPT_WRITE_RATE = StringRef::from_lit("write-rate");
-constexpr auto SHRPX_OPT_WRITE_BURST = StringRef::from_lit("write-burst");
-constexpr auto SHRPX_OPT_WORKER_READ_RATE =
-    StringRef::from_lit("worker-read-rate");
-constexpr auto SHRPX_OPT_WORKER_READ_BURST =
-    StringRef::from_lit("worker-read-burst");
-constexpr auto SHRPX_OPT_WORKER_WRITE_RATE =
-    StringRef::from_lit("worker-write-rate");
-constexpr auto SHRPX_OPT_WORKER_WRITE_BURST =
-    StringRef::from_lit("worker-write-burst");
-constexpr auto SHRPX_OPT_NPN_LIST = StringRef::from_lit("npn-list");
-constexpr auto SHRPX_OPT_TLS_PROTO_LIST = StringRef::from_lit("tls-proto-list");
-constexpr auto SHRPX_OPT_VERIFY_CLIENT = StringRef::from_lit("verify-client");
-constexpr auto SHRPX_OPT_VERIFY_CLIENT_CACERT =
-    StringRef::from_lit("verify-client-cacert");
-constexpr auto SHRPX_OPT_CLIENT_PRIVATE_KEY_FILE =
-    StringRef::from_lit("client-private-key-file");
-constexpr auto SHRPX_OPT_CLIENT_CERT_FILE =
-    StringRef::from_lit("client-cert-file");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_DUMP_REQUEST_HEADER =
-    StringRef::from_lit("frontend-http2-dump-request-header");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_DUMP_RESPONSE_HEADER =
-    StringRef::from_lit("frontend-http2-dump-response-header");
-constexpr auto SHRPX_OPT_HTTP2_NO_COOKIE_CRUMBLING =
-    StringRef::from_lit("http2-no-cookie-crumbling");
-constexpr auto SHRPX_OPT_FRONTEND_FRAME_DEBUG =
-    StringRef::from_lit("frontend-frame-debug");
-constexpr auto SHRPX_OPT_PADDING = StringRef::from_lit("padding");
-constexpr auto SHRPX_OPT_ALTSVC = StringRef::from_lit("altsvc");
-constexpr auto SHRPX_OPT_ADD_REQUEST_HEADER =
-    StringRef::from_lit("add-request-header");
-constexpr auto SHRPX_OPT_ADD_RESPONSE_HEADER =
-    StringRef::from_lit("add-response-header");
-constexpr auto SHRPX_OPT_WORKER_FRONTEND_CONNECTIONS =
-    StringRef::from_lit("worker-frontend-connections");
-constexpr auto SHRPX_OPT_NO_LOCATION_REWRITE =
-    StringRef::from_lit("no-location-rewrite");
-constexpr auto SHRPX_OPT_NO_HOST_REWRITE =
-    StringRef::from_lit("no-host-rewrite");
-constexpr auto SHRPX_OPT_BACKEND_HTTP1_CONNECTIONS_PER_HOST =
-    StringRef::from_lit("backend-http1-connections-per-host");
-constexpr auto SHRPX_OPT_BACKEND_HTTP1_CONNECTIONS_PER_FRONTEND =
-    StringRef::from_lit("backend-http1-connections-per-frontend");
-constexpr auto SHRPX_OPT_LISTENER_DISABLE_TIMEOUT =
-    StringRef::from_lit("listener-disable-timeout");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_FILE =
-    StringRef::from_lit("tls-ticket-key-file");
-constexpr auto SHRPX_OPT_RLIMIT_NOFILE = StringRef::from_lit("rlimit-nofile");
-constexpr auto SHRPX_OPT_BACKEND_REQUEST_BUFFER =
-    StringRef::from_lit("backend-request-buffer");
-constexpr auto SHRPX_OPT_BACKEND_RESPONSE_BUFFER =
-    StringRef::from_lit("backend-response-buffer");
-constexpr auto SHRPX_OPT_NO_SERVER_PUSH = StringRef::from_lit("no-server-push");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_CONNECTIONS_PER_WORKER =
-    StringRef::from_lit("backend-http2-connections-per-worker");
-constexpr auto SHRPX_OPT_FETCH_OCSP_RESPONSE_FILE =
-    StringRef::from_lit("fetch-ocsp-response-file");
-constexpr auto SHRPX_OPT_OCSP_UPDATE_INTERVAL =
-    StringRef::from_lit("ocsp-update-interval");
-constexpr auto SHRPX_OPT_NO_OCSP = StringRef::from_lit("no-ocsp");
-constexpr auto SHRPX_OPT_HEADER_FIELD_BUFFER =
-    StringRef::from_lit("header-field-buffer");
-constexpr auto SHRPX_OPT_MAX_HEADER_FIELDS =
-    StringRef::from_lit("max-header-fields");
-constexpr auto SHRPX_OPT_INCLUDE = StringRef::from_lit("include");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_CIPHER =
-    StringRef::from_lit("tls-ticket-key-cipher");
-constexpr auto SHRPX_OPT_HOST_REWRITE = StringRef::from_lit("host-rewrite");
-constexpr auto SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED =
-    StringRef::from_lit("tls-session-cache-memcached");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED =
-    StringRef::from_lit("tls-ticket-key-memcached");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_INTERVAL =
-    StringRef::from_lit("tls-ticket-key-memcached-interval");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_MAX_RETRY =
-    StringRef::from_lit("tls-ticket-key-memcached-max-retry");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_MAX_FAIL =
-    StringRef::from_lit("tls-ticket-key-memcached-max-fail");
-constexpr auto SHRPX_OPT_MRUBY_FILE = StringRef::from_lit("mruby-file");
-constexpr auto SHRPX_OPT_ACCEPT_PROXY_PROTOCOL =
-    StringRef::from_lit("accept-proxy-protocol");
-constexpr auto SHRPX_OPT_FASTOPEN = StringRef::from_lit("fastopen");
-constexpr auto SHRPX_OPT_TLS_DYN_REC_WARMUP_THRESHOLD =
-    StringRef::from_lit("tls-dyn-rec-warmup-threshold");
-constexpr auto SHRPX_OPT_TLS_DYN_REC_IDLE_TIMEOUT =
-    StringRef::from_lit("tls-dyn-rec-idle-timeout");
-constexpr auto SHRPX_OPT_ADD_FORWARDED = StringRef::from_lit("add-forwarded");
-constexpr auto SHRPX_OPT_STRIP_INCOMING_FORWARDED =
-    StringRef::from_lit("strip-incoming-forwarded");
-constexpr auto SHRPX_OPT_FORWARDED_BY = StringRef::from_lit("forwarded-by");
-constexpr auto SHRPX_OPT_FORWARDED_FOR = StringRef::from_lit("forwarded-for");
-constexpr auto SHRPX_OPT_REQUEST_HEADER_FIELD_BUFFER =
-    StringRef::from_lit("request-header-field-buffer");
-constexpr auto SHRPX_OPT_MAX_REQUEST_HEADER_FIELDS =
-    StringRef::from_lit("max-request-header-fields");
-constexpr auto SHRPX_OPT_RESPONSE_HEADER_FIELD_BUFFER =
-    StringRef::from_lit("response-header-field-buffer");
-constexpr auto SHRPX_OPT_MAX_RESPONSE_HEADER_FIELDS =
-    StringRef::from_lit("max-response-header-fields");
-constexpr auto SHRPX_OPT_NO_HTTP2_CIPHER_BLACK_LIST =
-    StringRef::from_lit("no-http2-cipher-black-list");
-constexpr auto SHRPX_OPT_BACKEND_HTTP1_TLS =
-    StringRef::from_lit("backend-http1-tls");
-constexpr auto SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_TLS =
-    StringRef::from_lit("tls-session-cache-memcached-tls");
-constexpr auto SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_CERT_FILE =
-    StringRef::from_lit("tls-session-cache-memcached-cert-file");
-constexpr auto SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_PRIVATE_KEY_FILE =
-    StringRef::from_lit("tls-session-cache-memcached-private-key-file");
-constexpr auto SHRPX_OPT_TLS_SESSION_CACHE_MEMCACHED_ADDRESS_FAMILY =
-    StringRef::from_lit("tls-session-cache-memcached-address-family");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_TLS =
-    StringRef::from_lit("tls-ticket-key-memcached-tls");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_CERT_FILE =
-    StringRef::from_lit("tls-ticket-key-memcached-cert-file");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_PRIVATE_KEY_FILE =
-    StringRef::from_lit("tls-ticket-key-memcached-private-key-file");
-constexpr auto SHRPX_OPT_TLS_TICKET_KEY_MEMCACHED_ADDRESS_FAMILY =
-    StringRef::from_lit("tls-ticket-key-memcached-address-family");
-constexpr auto SHRPX_OPT_BACKEND_ADDRESS_FAMILY =
-    StringRef::from_lit("backend-address-family");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS =
-    StringRef::from_lit("frontend-http2-max-concurrent-streams");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS =
-    StringRef::from_lit("backend-http2-max-concurrent-streams");
-constexpr auto SHRPX_OPT_BACKEND_CONNECTIONS_PER_FRONTEND =
-    StringRef::from_lit("backend-connections-per-frontend");
-constexpr auto SHRPX_OPT_BACKEND_TLS = StringRef::from_lit("backend-tls");
-constexpr auto SHRPX_OPT_BACKEND_CONNECTIONS_PER_HOST =
-    StringRef::from_lit("backend-connections-per-host");
-constexpr auto SHRPX_OPT_ERROR_PAGE = StringRef::from_lit("error-page");
-constexpr auto SHRPX_OPT_NO_KQUEUE = StringRef::from_lit("no-kqueue");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_SETTINGS_TIMEOUT =
-    StringRef::from_lit("frontend-http2-settings-timeout");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_SETTINGS_TIMEOUT =
-    StringRef::from_lit("backend-http2-settings-timeout");
-constexpr auto SHRPX_OPT_API_MAX_REQUEST_BODY =
-    StringRef::from_lit("api-max-request-body");
-constexpr auto SHRPX_OPT_BACKEND_MAX_BACKOFF =
-    StringRef::from_lit("backend-max-backoff");
-constexpr auto SHRPX_OPT_SERVER_NAME = StringRef::from_lit("server-name");
-constexpr auto SHRPX_OPT_NO_SERVER_REWRITE =
-    StringRef::from_lit("no-server-rewrite");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_OPTIMIZE_WRITE_BUFFER_SIZE =
-    StringRef::from_lit("frontend-http2-optimize-write-buffer-size");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_OPTIMIZE_WINDOW_SIZE =
-    StringRef::from_lit("frontend-http2-optimize-window-size");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_WINDOW_SIZE =
-    StringRef::from_lit("frontend-http2-window-size");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE =
-    StringRef::from_lit("frontend-http2-connection-window-size");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_WINDOW_SIZE =
-    StringRef::from_lit("backend-http2-window-size");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE =
-    StringRef::from_lit("backend-http2-connection-window-size");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE =
-    StringRef::from_lit("frontend-http2-encoder-dynamic-table-size");
-constexpr auto SHRPX_OPT_FRONTEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE =
-    StringRef::from_lit("frontend-http2-decoder-dynamic-table-size");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE =
-    StringRef::from_lit("backend-http2-encoder-dynamic-table-size");
-constexpr auto SHRPX_OPT_BACKEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE =
-    StringRef::from_lit("backend-http2-decoder-dynamic-table-size");
-constexpr auto SHRPX_OPT_ECDH_CURVES = StringRef::from_lit("ecdh-curves");
-constexpr auto SHRPX_OPT_TLS_SCT_DIR = StringRef::from_lit("tls-sct-dir");
-constexpr auto SHRPX_OPT_BACKEND_CONNECT_TIMEOUT =
-    StringRef::from_lit("backend-connect-timeout");
-constexpr auto SHRPX_OPT_DNS_CACHE_TIMEOUT =
-    StringRef::from_lit("dns-cache-timeout");
-constexpr auto SHRPX_OPT_DNS_LOOKUP_TIMEOUT =
-    StringRef::from_lit("dns-lookup-timeout");
-constexpr auto SHRPX_OPT_DNS_MAX_TRY = StringRef::from_lit("dns-max-try");
-constexpr auto SHRPX_OPT_FRONTEND_KEEP_ALIVE_TIMEOUT =
-    StringRef::from_lit("frontend-keep-alive-timeout");
-constexpr auto SHRPX_OPT_PSK_SECRETS = StringRef::from_lit("psk-secrets");
-constexpr auto SHRPX_OPT_CLIENT_PSK_SECRETS =
-    StringRef::from_lit("client-psk-secrets");
-constexpr auto SHRPX_OPT_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST =
-    StringRef::from_lit("client-no-http2-cipher-black-list");
-constexpr auto SHRPX_OPT_CLIENT_CIPHERS = StringRef::from_lit("client-ciphers");
-constexpr auto SHRPX_OPT_ACCESSLOG_WRITE_EARLY =
-    StringRef::from_lit("accesslog-write-early");
-constexpr auto SHRPX_OPT_TLS_MIN_PROTO_VERSION =
-    StringRef::from_lit("tls-min-proto-version");
-constexpr auto SHRPX_OPT_TLS_MAX_PROTO_VERSION =
-    StringRef::from_lit("tls-max-proto-version");
-constexpr auto SHRPX_OPT_REDIRECT_HTTPS_PORT =
-    StringRef::from_lit("redirect-https-port");
-constexpr auto SHRPX_OPT_FRONTEND_MAX_REQUESTS =
-    StringRef::from_lit("frontend-max-requests");
-constexpr auto SHRPX_OPT_SINGLE_THREAD = StringRef::from_lit("single-thread");
-constexpr auto SHRPX_OPT_SINGLE_PROCESS = StringRef::from_lit("single-process");
-constexpr auto SHRPX_OPT_NO_ADD_X_FORWARDED_PROTO =
-    StringRef::from_lit("no-add-x-forwarded-proto");
-constexpr auto SHRPX_OPT_NO_STRIP_INCOMING_X_FORWARDED_PROTO =
-    StringRef::from_lit("no-strip-incoming-x-forwarded-proto");
-constexpr auto SHRPX_OPT_OCSP_STARTUP = StringRef::from_lit("ocsp-startup");
-constexpr auto SHRPX_OPT_NO_VERIFY_OCSP = StringRef::from_lit("no-verify-ocsp");
-constexpr auto SHRPX_OPT_VERIFY_CLIENT_TOLERATE_EXPIRED =
-    StringRef::from_lit("verify-client-tolerate-expired");
-constexpr auto SHRPX_OPT_IGNORE_PER_PATTERN_MRUBY_ERROR =
-    StringRef::from_lit("ignore-per-pattern-mruby-error");
-constexpr auto SHRPX_OPT_TLS_NO_POSTPONE_EARLY_DATA =
-    StringRef::from_lit("tls-no-postpone-early-data");
-constexpr auto SHRPX_OPT_TLS_MAX_EARLY_DATA =
-    StringRef::from_lit("tls-max-early-data");
-constexpr auto SHRPX_OPT_TLS13_CIPHERS = StringRef::from_lit("tls13-ciphers");
-constexpr auto SHRPX_OPT_TLS13_CLIENT_CIPHERS =
-    StringRef::from_lit("tls13-client-ciphers");
-constexpr auto SHRPX_OPT_NO_STRIP_INCOMING_EARLY_DATA =
-    StringRef::from_lit("no-strip-incoming-early-data");
-
-constexpr size_t SHRPX_OBFUSCATED_NODE_LENGTH = 8;
-
-constexpr char DEFAULT_DOWNSTREAM_HOST[] = "127.0.0.1";
-constexpr int16_t DEFAULT_DOWNSTREAM_PORT = 80;
-
-enum shrpx_proto { PROTO_NONE, PROTO_HTTP1, PROTO_HTTP2, PROTO_MEMCACHED };
-
-enum shrpx_session_affinity {
-  // No session affinity
-  AFFINITY_NONE,
-  // Client IP affinity
-  AFFINITY_IP,
-  // Cookie based affinity
-  AFFINITY_COOKIE,
-};
-
-enum shrpx_cookie_secure {
-  // Secure attribute of session affinity cookie is determined by the
-  // request scheme.
-  COOKIE_SECURE_AUTO,
-  // Secure attribute of session affinity cookie is always set.
-  COOKIE_SECURE_YES,
-  // Secure attribute of session affinity cookie is always unset.
-  COOKIE_SECURE_NO,
-};
-
-struct AffinityConfig {
-  // Type of session affinity.
-  shrpx_session_affinity type;
-  struct {
-    // Name of a cookie to use.
-    StringRef name;
-    // Path which a cookie is applied to.
-    StringRef path;
-    // Secure attribute
-    shrpx_cookie_secure secure;
-  } cookie;
-};
-
-enum shrpx_forwarded_param {
-  FORWARDED_NONE = 0,
-  FORWARDED_BY = 0x1,
-  FORWARDED_FOR = 0x2,
-  FORWARDED_HOST = 0x4,
-  FORWARDED_PROTO = 0x8,
-};
-
-enum shrpx_forwarded_node_type {
-  FORWARDED_NODE_OBFUSCATED,
-  FORWARDED_NODE_IP,
-};
-
-struct AltSvc {
-  StringRef protocol_id, host, origin, service;
-
-  uint16_t port;
-};
-
-enum UpstreamAltMode {
-  // No alternative mode
-  ALTMODE_NONE,
-  // API processing mode
-  ALTMODE_API,
-  // Health monitor mode
-  ALTMODE_HEALTHMON,
-};
-
-struct UpstreamAddr {
-  // The frontend address (e.g., FQDN, hostname, IP address).  If
-  // |host_unix| is true, this is UNIX domain socket path.  This must
-  // be NULL terminated string.
-  StringRef host;
-  // For TCP socket, this is <IP address>:<PORT>.  For IPv6 address,
-  // address is surrounded by square brackets.  If socket is UNIX
-  // domain socket, this is "localhost".
-  StringRef hostport;
-  // frontend port.  0 if |host_unix| is true.
-  uint16_t port;
-  // For TCP socket, this is either AF_INET or AF_INET6.  For UNIX
-  // domain socket, this is 0.
-  int family;
-  // Alternate mode
-  int alt_mode;
-  // true if |host| contains UNIX domain socket path.
-  bool host_unix;
-  // true if TLS is enabled.
-  bool tls;
-  // true if SNI host should be used as a host when selecting backend
-  // server.
-  bool sni_fwd;
-  // true if client is supposed to send PROXY protocol v1 header.
-  bool accept_proxy_protocol;
-  int fd;
-};
-
-struct DownstreamAddrConfig {
-  // Resolved address if |dns| is false
-  Address addr;
-  // backend address.  If |host_unix| is true, this is UNIX domain
-  // socket path.  This must be NULL terminated string.
-  StringRef host;
-  // <HOST>:<PORT>.  This does not treat 80 and 443 specially.  If
-  // |host_unix| is true, this is "localhost".
-  StringRef hostport;
-  // hostname sent as SNI field
-  StringRef sni;
-  size_t fall;
-  size_t rise;
-  // Application protocol used in this group
-  shrpx_proto proto;
-  // backend port.  0 if |host_unix| is true.
-  uint16_t port;
-  // true if |host| contains UNIX domain socket path.
-  bool host_unix;
-  bool tls;
-  // true if dynamic DNS is enabled
-  bool dns;
-  // true if :scheme pseudo header field should be upgraded to secure
-  // variant (e.g., "https") when forwarding request to a backend
-  // connected by TLS connection.
-  bool upgrade_scheme;
-};
-
-// Mapping hash to idx which is an index into
-// DownstreamAddrGroupConfig::addrs.
-struct AffinityHash {
-  AffinityHash(size_t idx, uint32_t hash) : idx(idx), hash(hash) {}
-
-  size_t idx;
-  uint32_t hash;
-};
-
-struct DownstreamAddrGroupConfig {
-  DownstreamAddrGroupConfig(const StringRef &pattern)
-      : pattern(pattern), affinity{AFFINITY_NONE}, redirect_if_not_tls(false) {}
-
-  StringRef pattern;
-  StringRef mruby_file;
-  std::vector<DownstreamAddrConfig> addrs;
-  // Bunch of session affinity hash.  Only used if affinity ==
-  // AFFINITY_IP.
-  std::vector<AffinityHash> affinity_hash;
-  // Cookie based session affinity configuration.
-  AffinityConfig affinity;
-  // true if this group requires that client connection must be TLS,
-  // and the request must be redirected to https URI.
-  bool redirect_if_not_tls;
-};
-
-struct TicketKey {
-  const EVP_CIPHER *cipher;
-  const EVP_MD *hmac;
-  size_t hmac_keylen;
-  struct {
-    // name of this ticket configuration
-    std::array<uint8_t, 16> name;
-    // encryption key for |cipher|
-    std::array<uint8_t, 32> enc_key;
-    // hmac key for |hmac|
-    std::array<uint8_t, 32> hmac_key;
-  } data;
-};
-
-struct TicketKeys {
-  ~TicketKeys();
-  std::vector<TicketKey> keys;
-};
-
-struct TLSCertificate {
-  TLSCertificate(StringRef private_key_file, StringRef cert_file,
-                 std::vector<uint8_t> sct_data)
-      : private_key_file(std::move(private_key_file)),
-        cert_file(std::move(cert_file)),
-        sct_data(std::move(sct_data)) {}
-
-  StringRef private_key_file;
-  StringRef cert_file;
-  std::vector<uint8_t> sct_data;
-};
-
-struct HttpProxy {
-  Address addr;
-  // host in http proxy URI
-  StringRef host;
-  // userinfo in http proxy URI, not percent-encoded form
-  StringRef userinfo;
-  // port in http proxy URI
-  uint16_t port;
-};
-
-struct TLSConfig {
-  // RFC 5077 Session ticket related configurations
-  struct {
-    struct {
-      Address addr;
-      uint16_t port;
-      // Hostname of memcached server.  This is also used as SNI field
-      // if TLS is enabled.
-      StringRef host;
-      // Client private key and certificate for authentication
-      StringRef private_key_file;
-      StringRef cert_file;
-      ev_tstamp interval;
-      // Maximum number of retries when getting TLS ticket key from
-      // mamcached, due to network error.
-      size_t max_retry;
-      // Maximum number of consecutive error from memcached, when this
-      // limit reached, TLS ticket is disabled.
-      size_t max_fail;
-      // Address family of memcached connection.  One of either
-      // AF_INET, AF_INET6 or AF_UNSPEC.
-      int family;
-      bool tls;
-    } memcached;
-    std::vector<StringRef> files;
-    const EVP_CIPHER *cipher;
-    // true if --tls-ticket-key-cipher is used
-    bool cipher_given;
-  } ticket;
-
-  // Session cache related configurations
-  struct {
-    struct {
-      Address addr;
-      uint16_t port;
-      // Hostname of memcached server.  This is also used as SNI field
-      // if TLS is enabled.
-      StringRef host;
-      // Client private key and certificate for authentication
-      StringRef private_key_file;
-      StringRef cert_file;
-      // Address family of memcached connection.  One of either
-      // AF_INET, AF_INET6 or AF_UNSPEC.
-      int family;
-      bool tls;
-    } memcached;
-  } session_cache;
-
-  // Dynamic record sizing configurations
-  struct {
-    size_t warmup_threshold;
-    ev_tstamp idle_timeout;
-  } dyn_rec;
-
-  // OCSP realted configurations
-  struct {
-    ev_tstamp update_interval;
-    StringRef fetch_ocsp_response_file;
-    bool disabled;
-    bool startup;
-    bool no_verify;
-  } ocsp;
-
-  // Client verification configurations
-  struct {
-    // Path to file containing CA certificate solely used for client
-    // certificate validation
-    StringRef cacert;
-    bool enabled;
-    // true if we accept an expired client certificate.
-    bool tolerate_expired;
-  } client_verify;
-
-  // Client (backend connection) TLS configuration.
-  struct {
-    // Client PSK configuration
-    struct {
-      // identity must be NULL terminated string.
-      StringRef identity;
-      StringRef secret;
-    } psk;
-    StringRef private_key_file;
-    StringRef cert_file;
-    StringRef ciphers;
-    StringRef tls13_ciphers;
-    bool no_http2_cipher_black_list;
-  } client;
-
-  // PSK secrets.  The key is identity, and the associated value is
-  // its secret.
-  std::map<StringRef, StringRef> psk_secrets;
-  // The list of additional TLS certificate pair
-  std::vector<TLSCertificate> subcerts;
-  std::vector<unsigned char> alpn_prefs;
-  // list of supported NPN/ALPN protocol strings in the order of
-  // preference.
-  std::vector<StringRef> npn_list;
-  // list of supported SSL/TLS protocol strings.
-  std::vector<StringRef> tls_proto_list;
-  std::vector<uint8_t> sct_data;
-  BIO_METHOD *bio_method;
-  // Bit mask to disable SSL/TLS protocol versions.  This will be
-  // passed to SSL_CTX_set_options().
-  long int tls_proto_mask;
-  StringRef backend_sni_name;
-  std::chrono::seconds session_timeout;
-  StringRef private_key_file;
-  StringRef private_key_passwd;
-  StringRef cert_file;
-  StringRef dh_param_file;
-  StringRef ciphers;
-  StringRef tls13_ciphers;
-  StringRef ecdh_curves;
-  StringRef cacert;
-  // The maximum amount of 0-RTT data that server accepts.
-  uint32_t max_early_data;
-  // The minimum and maximum TLS version.  These values are defined in
-  // OpenSSL header file.
-  int min_proto_version;
-  int max_proto_version;
-  bool insecure;
-  bool no_http2_cipher_black_list;
-  // true if forwarding requests included in TLS early data should not
-  // be postponed until TLS handshake finishes.
-  bool no_postpone_early_data;
-};
-
-// custom error page
-struct ErrorPage {
-  // not NULL-terminated
-  std::vector<uint8_t> content;
-  // 0 is special value, and it matches all HTTP status code.
-  unsigned int http_status;
-};
-
-struct HttpConfig {
-  struct {
-    // obfuscated value used in "by" parameter of Forwarded header
-    // field.  This is only used when user defined static obfuscated
-    // string is provided.
-    StringRef by_obfuscated;
-    // bitwise-OR of one or more of shrpx_forwarded_param values.
-    uint32_t params;
-    // type of value recorded in "by" parameter of Forwarded header
-    // field.
-    shrpx_forwarded_node_type by_node_type;
-    // type of value recorded in "for" parameter of Forwarded header
-    // field.
-    shrpx_forwarded_node_type for_node_type;
-    bool strip_incoming;
-  } forwarded;
-  struct {
-    bool add;
-    bool strip_incoming;
-  } xff;
-  struct {
-    bool add;
-    bool strip_incoming;
-  } xfp;
-  struct {
-    bool strip_incoming;
-  } early_data;
-  std::vector<AltSvc> altsvcs;
-  std::vector<ErrorPage> error_pages;
-  HeaderRefs add_request_headers;
-  HeaderRefs add_response_headers;
-  StringRef server_name;
-  // Port number which appears in Location header field when https
-  // redirect is made.
-  StringRef redirect_https_port;
-  size_t request_header_field_buffer;
-  size_t max_request_header_fields;
-  size_t response_header_field_buffer;
-  size_t max_response_header_fields;
-  size_t max_requests;
-  bool no_via;
-  bool no_location_rewrite;
-  bool no_host_rewrite;
-  bool no_server_rewrite;
-};
-
-struct Http2Config {
-  struct {
-    struct {
-      struct {
-        StringRef request_header_file;
-        StringRef response_header_file;
-        FILE *request_header;
-        FILE *response_header;
-      } dump;
-      bool frame_debug;
-    } debug;
-    struct {
-      ev_tstamp settings;
-    } timeout;
-    nghttp2_option *option;
-    nghttp2_option *alt_mode_option;
-    nghttp2_session_callbacks *callbacks;
-    size_t max_concurrent_streams;
-    size_t encoder_dynamic_table_size;
-    size_t decoder_dynamic_table_size;
-    int32_t window_size;
-    int32_t connection_window_size;
-    bool optimize_write_buffer_size;
-    bool optimize_window_size;
-  } upstream;
-  struct {
-    struct {
-      ev_tstamp settings;
-    } timeout;
-    nghttp2_option *option;
-    nghttp2_session_callbacks *callbacks;
-    size_t encoder_dynamic_table_size;
-    size_t decoder_dynamic_table_size;
-    int32_t window_size;
-    int32_t connection_window_size;
-    size_t max_concurrent_streams;
-  } downstream;
-  struct {
-    ev_tstamp stream_read;
-    ev_tstamp stream_write;
-  } timeout;
-  bool no_cookie_crumbling;
-  bool no_server_push;
-};
-
-struct LoggingConfig {
-  struct {
-    std::vector<LogFragment> format;
-    StringRef file;
-    // Send accesslog to syslog, ignoring accesslog_file.
-    bool syslog;
-    // Write accesslog when response headers are received from
-    // backend, rather than response body is received and sent.
-    bool write_early;
-  } access;
-  struct {
-    StringRef file;
-    // Send errorlog to syslog, ignoring errorlog_file.
-    bool syslog;
-  } error;
-  int syslog_facility;
-};
-
-struct RateLimitConfig {
-  size_t rate;
-  size_t burst;
-};
-
-// Wildcard host pattern routing.  We strips left most '*' from host
-// field.  router includes all path patterns sharing the same wildcard
-// host.
-struct WildcardPattern {
-  WildcardPattern(const StringRef &host) : host(host) {}
-
-  // This might not be NULL terminated.  Currently it is only used for
-  // comparison.
-  StringRef host;
-  Router router;
-};
-
-// Configuration to select backend to forward request
-struct RouterConfig {
-  Router router;
-  // Router for reversed wildcard hosts.  Since this router has
-  // wildcard hosts reversed without '*', one should call match()
-  // function with reversed host stripping last character.  This is
-  // because we require at least one character must match for '*'.
-  // The index stored in this router is index of wildcard_patterns.
-  Router rev_wildcard_router;
-  std::vector<WildcardPattern> wildcard_patterns;
-};
-
-struct DownstreamConfig {
-  DownstreamConfig()
-      : balloc(1024, 1024),
-        timeout{},
-        addr_group_catch_all{0},
-        connections_per_host{0},
-        connections_per_frontend{0},
-        request_buffer_size{0},
-        response_buffer_size{0},
-        family{0} {}
-
-  DownstreamConfig(const DownstreamConfig &) = delete;
-  DownstreamConfig(DownstreamConfig &&) = delete;
-  DownstreamConfig &operator=(const DownstreamConfig &) = delete;
-  DownstreamConfig &operator=(DownstreamConfig &&) = delete;
-
-  // Allocator to allocate memory for Downstream configuration.  Since
-  // we may swap around DownstreamConfig in arbitrary times with API
-  // calls, we should use their own allocator instead of per Config
-  // allocator.
-  BlockAllocator balloc;
-  struct {
-    ev_tstamp read;
-    ev_tstamp write;
-    ev_tstamp idle_read;
-    ev_tstamp connect;
-    // The maximum backoff while checking health check for offline
-    // backend or while detaching failed backend from load balancing
-    // group temporarily.
-    ev_tstamp max_backoff;
-  } timeout;
-  RouterConfig router;
-  std::vector<DownstreamAddrGroupConfig> addr_groups;
-  // The index of catch-all group in downstream_addr_groups.
-  size_t addr_group_catch_all;
-  size_t connections_per_host;
-  size_t connections_per_frontend;
-  size_t request_buffer_size;
-  size_t response_buffer_size;
-  // Address family of backend connection.  One of either AF_INET,
-  // AF_INET6 or AF_UNSPEC.  This is ignored if backend connection
-  // is made via Unix domain socket.
-  int family;
-};
-
-struct ConnectionConfig {
-  struct {
-    struct {
-      ev_tstamp sleep;
-    } timeout;
-    // address of frontend acceptors
-    std::vector<UpstreamAddr> addrs;
-    int backlog;
-    // TCP fastopen.  If this is positive, it is passed to
-    // setsockopt() along with TCP_FASTOPEN.
-    int fastopen;
-  } listener;
-
-  struct {
-    struct {
-      ev_tstamp http2_read;
-      ev_tstamp read;
-      ev_tstamp write;
-      ev_tstamp idle_read;
-    } timeout;
-    struct {
-      RateLimitConfig read;
-      RateLimitConfig write;
-    } ratelimit;
-    size_t worker_connections;
-    // Deprecated.  See UpstreamAddr.accept_proxy_protocol.
-    bool accept_proxy_protocol;
-  } upstream;
-
-  std::shared_ptr<DownstreamConfig> downstream;
-};
-
-struct APIConfig {
-  // Maximum request body size for one API request
-  size_t max_request_body;
-  // true if at least one of UpstreamAddr has api enabled
-  bool enabled;
-};
-
-struct DNSConfig {
-  struct {
-    ev_tstamp cache;
-    ev_tstamp lookup;
-  } timeout;
-  // The number of tries name resolver makes before abandoning
-  // request.
-  size_t max_try;
-};
-
-struct Config {
-  Config()
-      : balloc(4096, 4096),
-        downstream_http_proxy{},
-        http{},
-        http2{},
-        tls{},
-        logging{},
-        conn{},
-        api{},
-        dns{},
-        config_revision{0},
-        num_worker{0},
-        padding{0},
-        rlimit_nofile{0},
-        uid{0},
-        gid{0},
-        pid{0},
-        verbose{false},
-        daemon{false},
-        http2_proxy{false},
-        single_process{false},
-        single_thread{false},
-        ignore_per_pattern_mruby_error{false},
-        ev_loop_flags{0} {}
-  ~Config();
-
-  Config(Config &&) = delete;
-  Config(const Config &&) = delete;
-  Config &operator=(Config &&) = delete;
-  Config &operator=(const Config &&) = delete;
-
-  // Allocator to allocate memory for this object except for
-  // DownstreamConfig.  Currently, it is used to allocate memory for
-  // strings.
-  BlockAllocator balloc;
-  HttpProxy downstream_http_proxy;
-  HttpConfig http;
-  Http2Config http2;
-  TLSConfig tls;
-  LoggingConfig logging;
-  ConnectionConfig conn;
-  APIConfig api;
-  DNSConfig dns;
-  StringRef pid_file;
-  StringRef conf_path;
-  StringRef user;
-  StringRef mruby_file;
-  // The revision of configuration which is opaque string, and changes
-  // on each configuration reloading.  This does not change on
-  // backendconfig API call.  This value is returned in health check
-  // as "nghttpx-conf-rev" response header field.  The external
-  // program can check this value to know whether reloading has
-  // completed or not.
-  uint64_t config_revision;
-  size_t num_worker;
-  size_t padding;
-  size_t rlimit_nofile;
-  uid_t uid;
-  gid_t gid;
-  pid_t pid;
-  bool verbose;
-  bool daemon;
-  bool http2_proxy;
-  // Run nghttpx in single process mode.  With this mode, signal
-  // handling is omitted.
-  bool single_process;
-  bool single_thread;
-  // Ignore mruby compile error for per-pattern mruby script.
-  bool ignore_per_pattern_mruby_error;
-  // flags passed to ev_default_loop() and ev_loop_new()
-  int ev_loop_flags;
-};
-
-const Config *get_config();
-Config *mod_config();
-// Replaces the current config with given |new_config|.  The old config is
-// returned.
-std::unique_ptr<Config> replace_config(std::unique_ptr<Config> new_config);
-void create_config();
-
-// generated by gennghttpxfun.py
-enum {
-  SHRPX_OPTID_ACCEPT_PROXY_PROTOCOL,
-  SHRPX_OPTID_ACCESSLOG_FILE,
-  SHRPX_OPTID_ACCESSLOG_FORMAT,
-  SHRPX_OPTID_ACCESSLOG_SYSLOG,
-  SHRPX_OPTID_ACCESSLOG_WRITE_EARLY,
-  SHRPX_OPTID_ADD_FORWARDED,
-  SHRPX_OPTID_ADD_REQUEST_HEADER,
-  SHRPX_OPTID_ADD_RESPONSE_HEADER,
-  SHRPX_OPTID_ADD_X_FORWARDED_FOR,
-  SHRPX_OPTID_ALTSVC,
-  SHRPX_OPTID_API_MAX_REQUEST_BODY,
-  SHRPX_OPTID_BACKEND,
-  SHRPX_OPTID_BACKEND_ADDRESS_FAMILY,
-  SHRPX_OPTID_BACKEND_CONNECT_TIMEOUT,
-  SHRPX_OPTID_BACKEND_CONNECTIONS_PER_FRONTEND,
-  SHRPX_OPTID_BACKEND_CONNECTIONS_PER_HOST,
-  SHRPX_OPTID_BACKEND_HTTP_PROXY_URI,
-  SHRPX_OPTID_BACKEND_HTTP1_CONNECTIONS_PER_FRONTEND,
-  SHRPX_OPTID_BACKEND_HTTP1_CONNECTIONS_PER_HOST,
-  SHRPX_OPTID_BACKEND_HTTP1_TLS,
-  SHRPX_OPTID_BACKEND_HTTP2_CONNECTION_WINDOW_BITS,
-  SHRPX_OPTID_BACKEND_HTTP2_CONNECTION_WINDOW_SIZE,
-  SHRPX_OPTID_BACKEND_HTTP2_CONNECTIONS_PER_WORKER,
-  SHRPX_OPTID_BACKEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE,
-  SHRPX_OPTID_BACKEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE,
-  SHRPX_OPTID_BACKEND_HTTP2_MAX_CONCURRENT_STREAMS,
-  SHRPX_OPTID_BACKEND_HTTP2_SETTINGS_TIMEOUT,
-  SHRPX_OPTID_BACKEND_HTTP2_WINDOW_BITS,
-  SHRPX_OPTID_BACKEND_HTTP2_WINDOW_SIZE,
-  SHRPX_OPTID_BACKEND_IPV4,
-  SHRPX_OPTID_BACKEND_IPV6,
-  SHRPX_OPTID_BACKEND_KEEP_ALIVE_TIMEOUT,
-  SHRPX_OPTID_BACKEND_MAX_BACKOFF,
-  SHRPX_OPTID_BACKEND_NO_TLS,
-  SHRPX_OPTID_BACKEND_READ_TIMEOUT,
-  SHRPX_OPTID_BACKEND_REQUEST_BUFFER,
-  SHRPX_OPTID_BACKEND_RESPONSE_BUFFER,
-  SHRPX_OPTID_BACKEND_TLS,
-  SHRPX_OPTID_BACKEND_TLS_SNI_FIELD,
-  SHRPX_OPTID_BACKEND_WRITE_TIMEOUT,
-  SHRPX_OPTID_BACKLOG,
-  SHRPX_OPTID_CACERT,
-  SHRPX_OPTID_CERTIFICATE_FILE,
-  SHRPX_OPTID_CIPHERS,
-  SHRPX_OPTID_CLIENT,
-  SHRPX_OPTID_CLIENT_CERT_FILE,
-  SHRPX_OPTID_CLIENT_CIPHERS,
-  SHRPX_OPTID_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST,
-  SHRPX_OPTID_CLIENT_PRIVATE_KEY_FILE,
-  SHRPX_OPTID_CLIENT_PROXY,
-  SHRPX_OPTID_CLIENT_PSK_SECRETS,
-  SHRPX_OPTID_CONF,
-  SHRPX_OPTID_DAEMON,
-  SHRPX_OPTID_DH_PARAM_FILE,
-  SHRPX_OPTID_DNS_CACHE_TIMEOUT,
-  SHRPX_OPTID_DNS_LOOKUP_TIMEOUT,
-  SHRPX_OPTID_DNS_MAX_TRY,
-  SHRPX_OPTID_ECDH_CURVES,
-  SHRPX_OPTID_ERROR_PAGE,
-  SHRPX_OPTID_ERRORLOG_FILE,
-  SHRPX_OPTID_ERRORLOG_SYSLOG,
-  SHRPX_OPTID_FASTOPEN,
-  SHRPX_OPTID_FETCH_OCSP_RESPONSE_FILE,
-  SHRPX_OPTID_FORWARDED_BY,
-  SHRPX_OPTID_FORWARDED_FOR,
-  SHRPX_OPTID_FRONTEND,
-  SHRPX_OPTID_FRONTEND_FRAME_DEBUG,
-  SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_BITS,
-  SHRPX_OPTID_FRONTEND_HTTP2_CONNECTION_WINDOW_SIZE,
-  SHRPX_OPTID_FRONTEND_HTTP2_DECODER_DYNAMIC_TABLE_SIZE,
-  SHRPX_OPTID_FRONTEND_HTTP2_DUMP_REQUEST_HEADER,
-  SHRPX_OPTID_FRONTEND_HTTP2_DUMP_RESPONSE_HEADER,
-  SHRPX_OPTID_FRONTEND_HTTP2_ENCODER_DYNAMIC_TABLE_SIZE,
-  SHRPX_OPTID_FRONTEND_HTTP2_MAX_CONCURRENT_STREAMS,
-  SHRPX_OPTID_FRONTEND_HTTP2_OPTIMIZE_WINDOW_SIZE,
-  SHRPX_OPTID_FRONTEND_HTTP2_OPTIMIZE_WRITE_BUFFER_SIZE,
-  SHRPX_OPTID_FRONTEND_HTTP2_READ_TIMEOUT,
-  SHRPX_OPTID_FRONTEND_HTTP2_SETTINGS_TIMEOUT,
-  SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_BITS,
-  SHRPX_OPTID_FRONTEND_HTTP2_WINDOW_SIZE,
-  SHRPX_OPTID_FRONTEND_KEEP_ALIVE_TIMEOUT,
-  SHRPX_OPTID_FRONTEND_MAX_REQUESTS,
-  SHRPX_OPTID_FRONTEND_NO_TLS,
-  SHRPX_OPTID_FRONTEND_READ_TIMEOUT,
-  SHRPX_OPTID_FRONTEND_WRITE_TIMEOUT,
-  SHRPX_OPTID_HEADER_FIELD_BUFFER,
-  SHRPX_OPTID_HOST_REWRITE,
-  SHRPX_OPTID_HTTP2_BRIDGE,
-  SHRPX_OPTID_HTTP2_MAX_CONCURRENT_STREAMS,
-  SHRPX_OPTID_HTTP2_NO_COOKIE_CRUMBLING,
-  SHRPX_OPTID_HTTP2_PROXY,
-  SHRPX_OPTID_IGNORE_PER_PATTERN_MRUBY_ERROR,
-  SHRPX_OPTID_INCLUDE,
-  SHRPX_OPTID_INSECURE,
-  SHRPX_OPTID_LISTENER_DISABLE_TIMEOUT,
-  SHRPX_OPTID_LOG_LEVEL,
-  SHRPX_OPTID_MAX_HEADER_FIELDS,
-  SHRPX_OPTID_MAX_REQUEST_HEADER_FIELDS,
-  SHRPX_OPTID_MAX_RESPONSE_HEADER_FIELDS,
-  SHRPX_OPTID_MRUBY_FILE,
-  SHRPX_OPTID_NO_ADD_X_FORWARDED_PROTO,
-  SHRPX_OPTID_NO_HOST_REWRITE,
-  SHRPX_OPTID_NO_HTTP2_CIPHER_BLACK_LIST,
-  SHRPX_OPTID_NO_KQUEUE,
-  SHRPX_OPTID_NO_LOCATION_REWRITE,
-  SHRPX_OPTID_NO_OCSP,
-  SHRPX_OPTID_NO_SERVER_PUSH,
-  SHRPX_OPTID_NO_SERVER_REWRITE,
-  SHRPX_OPTID_NO_STRIP_INCOMING_EARLY_DATA,
-  SHRPX_OPTID_NO_STRIP_INCOMING_X_FORWARDED_PROTO,
-  SHRPX_OPTID_NO_VERIFY_OCSP,
-  SHRPX_OPTID_NO_VIA,
-  SHRPX_OPTID_NPN_LIST,
-  SHRPX_OPTID_OCSP_STARTUP,
-  SHRPX_OPTID_OCSP_UPDATE_INTERVAL,
-  SHRPX_OPTID_PADDING,
-  SHRPX_OPTID_PID_FILE,
-  SHRPX_OPTID_PRIVATE_KEY_FILE,
-  SHRPX_OPTID_PRIVATE_KEY_PASSWD_FILE,
-  SHRPX_OPTID_PSK_SECRETS,
-  SHRPX_OPTID_READ_BURST,
-  SHRPX_OPTID_READ_RATE,
-  SHRPX_OPTID_REDIRECT_HTTPS_PORT,
-  SHRPX_OPTID_REQUEST_HEADER_FIELD_BUFFER,
-  SHRPX_OPTID_RESPONSE_HEADER_FIELD_BUFFER,
-  SHRPX_OPTID_RLIMIT_NOFILE,
-  SHRPX_OPTID_SERVER_NAME,
-  SHRPX_OPTID_SINGLE_PROCESS,
-  SHRPX_OPTID_SINGLE_THREAD,
-  SHRPX_OPTID_STREAM_READ_TIMEOUT,
-  SHRPX_OPTID_STREAM_WRITE_TIMEOUT,
-  SHRPX_OPTID_STRIP_INCOMING_FORWARDED,
-  SHRPX_OPTID_STRIP_INCOMING_X_FORWARDED_FOR,
-  SHRPX_OPTID_SUBCERT,
-  SHRPX_OPTID_SYSLOG_FACILITY,
-  SHRPX_OPTID_TLS_DYN_REC_IDLE_TIMEOUT,
-  SHRPX_OPTID_TLS_DYN_REC_WARMUP_THRESHOLD,
-  SHRPX_OPTID_TLS_MAX_EARLY_DATA,
-  SHRPX_OPTID_TLS_MAX_PROTO_VERSION,
-  SHRPX_OPTID_TLS_MIN_PROTO_VERSION,
-  SHRPX_OPTID_TLS_NO_POSTPONE_EARLY_DATA,
-  SHRPX_OPTID_TLS_PROTO_LIST,
-  SHRPX_OPTID_TLS_SCT_DIR,
-  SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED,
-  SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_ADDRESS_FAMILY,
-  SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_CERT_FILE,
-  SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_PRIVATE_KEY_FILE,
-  SHRPX_OPTID_TLS_SESSION_CACHE_MEMCACHED_TLS,
-  SHRPX_OPTID_TLS_TICKET_KEY_CIPHER,
-  SHRPX_OPTID_TLS_TICKET_KEY_FILE,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_ADDRESS_FAMILY,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_CERT_FILE,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_INTERVAL,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_MAX_FAIL,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_MAX_RETRY,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_PRIVATE_KEY_FILE,
-  SHRPX_OPTID_TLS_TICKET_KEY_MEMCACHED_TLS,
-  SHRPX_OPTID_TLS13_CIPHERS,
-  SHRPX_OPTID_TLS13_CLIENT_CIPHERS,
-  SHRPX_OPTID_USER,
-  SHRPX_OPTID_VERIFY_CLIENT,
-  SHRPX_OPTID_VERIFY_CLIENT_CACERT,
-  SHRPX_OPTID_VERIFY_CLIENT_TOLERATE_EXPIRED,
-  SHRPX_OPTID_WORKER_FRONTEND_CONNECTIONS,
-  SHRPX_OPTID_WORKER_READ_BURST,
-  SHRPX_OPTID_WORKER_READ_RATE,
-  SHRPX_OPTID_WORKER_WRITE_BURST,
-  SHRPX_OPTID_WORKER_WRITE_RATE,
-  SHRPX_OPTID_WORKERS,
-  SHRPX_OPTID_WRITE_BURST,
-  SHRPX_OPTID_WRITE_RATE,
-  SHRPX_OPTID_MAXIDX,
-};
-
-// Looks up token for given option name |name| of length |namelen|.
-int option_lookup_token(const char *name, size_t namelen);
-
-// Parses option name |opt| and value |optarg|.  The results are
-// stored into the object pointed by |config|. This function returns 0
-// if it succeeds, or -1.  The |included_set| contains the all paths
-// already included while processing this configuration, to avoid loop
-// in --include option.  The |pattern_addr_indexer| contains a pair of
-// pattern of backend, and its index in DownstreamConfig::addr_groups.
-// It is introduced to speed up loading configuration file with lots
-// of backends.
-int parse_config(Config *config, const StringRef &opt, const StringRef &optarg,
-                 std::set<StringRef> &included_set,
-                 std::map<StringRef, size_t> &pattern_addr_indexer);
-
-// Similar to parse_config() above, but additional |optid| which
-// should be the return value of option_lookup_token(opt).
-int parse_config(Config *config, int optid, const StringRef &opt,
-                 const StringRef &optarg, std::set<StringRef> &included_set,
-                 std::map<StringRef, size_t> &pattern_addr_indexer);
-
-// Loads configurations from |filename| and stores them in |config|.
-// This function returns 0 if it succeeds, or -1.  See parse_config()
-// for |include_set|.
-int load_config(Config *config, const char *filename,
-                std::set<StringRef> &include_set,
-                std::map<StringRef, size_t> &pattern_addr_indexer);
-
-// Parses header field in |optarg|.  We expect header field is formed
-// like "NAME: VALUE".  We require that NAME is non empty string.  ":"
-// is allowed at the start of the NAME, but NAME == ":" is not
-// allowed.  This function returns pair of NAME and VALUE.
-HeaderRefs::value_type parse_header(BlockAllocator &balloc,
-                                    const StringRef &optarg);
-
-std::vector<LogFragment> parse_log_format(BlockAllocator &balloc,
-                                          const StringRef &optarg);
-
-// Returns string for syslog |facility|.
-StringRef str_syslog_facility(int facility);
-
-// Returns integer value of syslog |facility| string.
-int int_syslog_facility(const StringRef &strfacility);
-
-FILE *open_file_for_write(const char *filename);
-
-// Reads TLS ticket key file in |files| and returns TicketKey which
-// stores read key data.  The given |cipher| and |hmac| determine the
-// expected file size.  This function returns TicketKey if it
-// succeeds, or nullptr.
-std::unique_ptr<TicketKeys>
-read_tls_ticket_key_file(const std::vector<StringRef> &files,
-                         const EVP_CIPHER *cipher, const EVP_MD *hmac);
-
-// Returns string representation of |proto|.
-StringRef strproto(shrpx_proto proto);
-
-int configure_downstream_group(Config *config, bool http2_proxy,
-                               bool numeric_addr_only,
-                               const TLSConfig &tlsconf);
-
-int resolve_hostname(Address *addr, const char *hostname, uint16_t port,
-                     int family, int additional_flags = 0);
-
-} // namespace shrpx
-
-#endif // SHRPX_CONFIG_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,249 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_config_test.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include <cstdlib>
-
-#include <CUnit/CUnit.h>
-
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-void test_shrpx_config_parse_header(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  auto p = parse_header(balloc, StringRef::from_lit("a: b"));
-  CU_ASSERT("a" == p.name);
-  CU_ASSERT("b" == p.value);
-
-  p = parse_header(balloc, StringRef::from_lit("a:  b"));
-  CU_ASSERT("a" == p.name);
-  CU_ASSERT("b" == p.value);
-
-  p = parse_header(balloc, StringRef::from_lit(":a: b"));
-  CU_ASSERT(p.name.empty());
-
-  p = parse_header(balloc, StringRef::from_lit("a: :b"));
-  CU_ASSERT("a" == p.name);
-  CU_ASSERT(":b" == p.value);
-
-  p = parse_header(balloc, StringRef::from_lit(": b"));
-  CU_ASSERT(p.name.empty());
-
-  p = parse_header(balloc, StringRef::from_lit("alpha: bravo charlie"));
-  CU_ASSERT("alpha" == p.name);
-  CU_ASSERT("bravo charlie" == p.value);
-
-  p = parse_header(balloc, StringRef::from_lit("a,: b"));
-  CU_ASSERT(p.name.empty());
-
-  p = parse_header(balloc, StringRef::from_lit("a: b\x0a"));
-  CU_ASSERT(p.name.empty());
-}
-
-void test_shrpx_config_parse_log_format(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  auto res = parse_log_format(
-      balloc, StringRef::from_lit(
-                  R"($remote_addr - $remote_user [$time_local] )"
-                  R"("$request" $status $body_bytes_sent )"
-                  R"("${http_referer}" $http_host "$http_user_agent")"));
-  CU_ASSERT(16 == res.size());
-
-  CU_ASSERT(SHRPX_LOGF_REMOTE_ADDR == res[0].type);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[1].type);
-  CU_ASSERT(" - $remote_user [" == res[1].value);
-
-  CU_ASSERT(SHRPX_LOGF_TIME_LOCAL == res[2].type);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[3].type);
-  CU_ASSERT("] \"" == res[3].value);
-
-  CU_ASSERT(SHRPX_LOGF_REQUEST == res[4].type);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[5].type);
-  CU_ASSERT("\" " == res[5].value);
-
-  CU_ASSERT(SHRPX_LOGF_STATUS == res[6].type);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[7].type);
-  CU_ASSERT(" " == res[7].value);
-
-  CU_ASSERT(SHRPX_LOGF_BODY_BYTES_SENT == res[8].type);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[9].type);
-  CU_ASSERT(" \"" == res[9].value);
-
-  CU_ASSERT(SHRPX_LOGF_HTTP == res[10].type);
-  CU_ASSERT("referer" == res[10].value);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[11].type);
-  CU_ASSERT("\" " == res[11].value);
-
-  CU_ASSERT(SHRPX_LOGF_AUTHORITY == res[12].type);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[13].type);
-  CU_ASSERT(" \"" == res[13].value);
-
-  CU_ASSERT(SHRPX_LOGF_HTTP == res[14].type);
-  CU_ASSERT("user-agent" == res[14].value);
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[15].type);
-  CU_ASSERT("\"" == res[15].value);
-
-  res = parse_log_format(balloc, StringRef::from_lit("$"));
-
-  CU_ASSERT(1 == res.size());
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[0].type);
-  CU_ASSERT("$" == res[0].value);
-
-  res = parse_log_format(balloc, StringRef::from_lit("${"));
-
-  CU_ASSERT(1 == res.size());
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[0].type);
-  CU_ASSERT("${" == res[0].value);
-
-  res = parse_log_format(balloc, StringRef::from_lit("${a"));
-
-  CU_ASSERT(1 == res.size());
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[0].type);
-  CU_ASSERT("${a" == res[0].value);
-
-  res = parse_log_format(balloc, StringRef::from_lit("${a "));
-
-  CU_ASSERT(1 == res.size());
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[0].type);
-  CU_ASSERT("${a " == res[0].value);
-
-  res = parse_log_format(balloc, StringRef::from_lit("$$remote_addr"));
-
-  CU_ASSERT(2 == res.size());
-
-  CU_ASSERT(SHRPX_LOGF_LITERAL == res[0].type);
-  CU_ASSERT("$" == res[0].value);
-
-  CU_ASSERT(SHRPX_LOGF_REMOTE_ADDR == res[1].type);
-  CU_ASSERT("" == res[1].value);
-}
-
-void test_shrpx_config_read_tls_ticket_key_file(void) {
-  char file1[] = "/tmp/nghttpx-unittest.XXXXXX";
-  auto fd1 = mkstemp(file1);
-  CU_ASSERT(fd1 != -1);
-  CU_ASSERT(48 ==
-            write(fd1, "0..............12..............34..............5", 48));
-  char file2[] = "/tmp/nghttpx-unittest.XXXXXX";
-  auto fd2 = mkstemp(file2);
-  CU_ASSERT(fd2 != -1);
-  CU_ASSERT(48 ==
-            write(fd2, "6..............78..............9a..............b", 48));
-
-  close(fd1);
-  close(fd2);
-  auto ticket_keys = read_tls_ticket_key_file(
-      {StringRef{file1}, StringRef{file2}}, EVP_aes_128_cbc(), EVP_sha256());
-  unlink(file1);
-  unlink(file2);
-  CU_ASSERT(ticket_keys.get() != nullptr);
-  CU_ASSERT(2 == ticket_keys->keys.size());
-  auto key = &ticket_keys->keys[0];
-  CU_ASSERT(std::equal(std::begin(key->data.name), std::end(key->data.name),
-                       "0..............1"));
-  CU_ASSERT(std::equal(std::begin(key->data.enc_key),
-                       std::begin(key->data.enc_key) + 16, "2..............3"));
-  CU_ASSERT(std::equal(std::begin(key->data.hmac_key),
-                       std::begin(key->data.hmac_key) + 16,
-                       "4..............5"));
-  CU_ASSERT(16 == key->hmac_keylen);
-
-  key = &ticket_keys->keys[1];
-  CU_ASSERT(std::equal(std::begin(key->data.name), std::end(key->data.name),
-                       "6..............7"));
-  CU_ASSERT(std::equal(std::begin(key->data.enc_key),
-                       std::begin(key->data.enc_key) + 16, "8..............9"));
-  CU_ASSERT(std::equal(std::begin(key->data.hmac_key),
-                       std::begin(key->data.hmac_key) + 16,
-                       "a..............b"));
-  CU_ASSERT(16 == key->hmac_keylen);
-}
-
-void test_shrpx_config_read_tls_ticket_key_file_aes_256(void) {
-  char file1[] = "/tmp/nghttpx-unittest.XXXXXX";
-  auto fd1 = mkstemp(file1);
-  CU_ASSERT(fd1 != -1);
-  CU_ASSERT(80 == write(fd1,
-                        "0..............12..............................34..."
-                        "...........................5",
-                        80));
-  char file2[] = "/tmp/nghttpx-unittest.XXXXXX";
-  auto fd2 = mkstemp(file2);
-  CU_ASSERT(fd2 != -1);
-  CU_ASSERT(80 == write(fd2,
-                        "6..............78..............................9a..."
-                        "...........................b",
-                        80));
-
-  close(fd1);
-  close(fd2);
-  auto ticket_keys = read_tls_ticket_key_file(
-      {StringRef{file1}, StringRef{file2}}, EVP_aes_256_cbc(), EVP_sha256());
-  unlink(file1);
-  unlink(file2);
-  CU_ASSERT(ticket_keys.get() != nullptr);
-  CU_ASSERT(2 == ticket_keys->keys.size());
-  auto key = &ticket_keys->keys[0];
-  CU_ASSERT(std::equal(std::begin(key->data.name), std::end(key->data.name),
-                       "0..............1"));
-  CU_ASSERT(std::equal(std::begin(key->data.enc_key),
-                       std::end(key->data.enc_key),
-                       "2..............................3"));
-  CU_ASSERT(std::equal(std::begin(key->data.hmac_key),
-                       std::end(key->data.hmac_key),
-                       "4..............................5"));
-
-  key = &ticket_keys->keys[1];
-  CU_ASSERT(std::equal(std::begin(key->data.name), std::end(key->data.name),
-                       "6..............7"));
-  CU_ASSERT(std::equal(std::begin(key->data.enc_key),
-                       std::end(key->data.enc_key),
-                       "8..............................9"));
-  CU_ASSERT(std::equal(std::begin(key->data.hmac_key),
-                       std::end(key->data.hmac_key),
-                       "a..............................b"));
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_config_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_CONFIG_TEST_H
-#define SHRPX_CONFIG_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_shrpx_config_parse_header(void);
-void test_shrpx_config_parse_log_format(void);
-void test_shrpx_config_read_tls_ticket_key_file(void);
-void test_shrpx_config_read_tls_ticket_key_file_aes_256(void);
-void test_shrpx_config_match_downstream_addr_group(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_CONFIG_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_connect_blocker.h"
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-namespace {
-void connect_blocker_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto connect_blocker = static_cast<ConnectBlocker *>(w->data);
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Unblock";
-  }
-
-  connect_blocker->call_unblock_func();
-}
-} // namespace
-
-ConnectBlocker::ConnectBlocker(std::mt19937 &gen, struct ev_loop *loop,
-                               std::function<void()> block_func,
-                               std::function<void()> unblock_func)
-    : gen_(gen),
-      block_func_(block_func),
-      unblock_func_(unblock_func),
-      loop_(loop),
-      fail_count_(0),
-      offline_(false) {
-  ev_timer_init(&timer_, connect_blocker_cb, 0., 0.);
-  timer_.data = this;
-}
-
-ConnectBlocker::~ConnectBlocker() { ev_timer_stop(loop_, &timer_); }
-
-bool ConnectBlocker::blocked() const { return ev_is_active(&timer_); }
-
-void ConnectBlocker::on_success() {
-  if (ev_is_active(&timer_)) {
-    return;
-  }
-
-  fail_count_ = 0;
-}
-
-// Use the similar backoff algorithm described in
-// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md
-namespace {
-constexpr size_t MAX_BACKOFF_EXP = 10;
-constexpr auto MULTIPLIER = 1.6;
-constexpr auto JITTER = 0.2;
-} // namespace
-
-void ConnectBlocker::on_failure() {
-  if (ev_is_active(&timer_)) {
-    return;
-  }
-
-  call_block_func();
-
-  ++fail_count_;
-
-  auto base_backoff =
-      util::int_pow(MULTIPLIER, std::min(MAX_BACKOFF_EXP, fail_count_));
-  auto dist = std::uniform_real_distribution<>(-JITTER * base_backoff,
-                                               JITTER * base_backoff);
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  auto backoff =
-      std::min(downstreamconf.timeout.max_backoff, base_backoff + dist(gen_));
-
-  LOG(WARN) << "Could not connect " << fail_count_
-            << " times in a row; sleep for " << backoff << " seconds";
-
-  ev_timer_set(&timer_, backoff, 0.);
-  ev_timer_start(loop_, &timer_);
-}
-
-size_t ConnectBlocker::get_fail_count() const { return fail_count_; }
-
-void ConnectBlocker::offline() {
-  if (offline_) {
-    return;
-  }
-
-  if (!ev_is_active(&timer_)) {
-    call_block_func();
-  }
-
-  offline_ = true;
-
-  ev_timer_stop(loop_, &timer_);
-  ev_timer_set(&timer_, std::numeric_limits<double>::max(), 0.);
-  ev_timer_start(loop_, &timer_);
-}
-
-void ConnectBlocker::online() {
-  ev_timer_stop(loop_, &timer_);
-
-  call_unblock_func();
-
-  fail_count_ = 0;
-
-  offline_ = false;
-}
-
-bool ConnectBlocker::in_offline() const { return offline_; }
-
-void ConnectBlocker::call_block_func() { block_func_(); }
-
-void ConnectBlocker::call_unblock_func() { unblock_func_(); }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connect_blocker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_CONNECT_BLOCKER_H
-#define SHRPX_CONNECT_BLOCKER_H
-
-#include "shrpx.h"
-
-#include <random>
-#include <functional>
-
-#include <ev.h>
-
-namespace shrpx {
-
-class ConnectBlocker {
-public:
-  ConnectBlocker(std::mt19937 &gen, struct ev_loop *loop,
-                 std::function<void()> block_func,
-                 std::function<void()> unblock_func);
-  ~ConnectBlocker();
-
-  // Returns true if making connection is not allowed.
-  bool blocked() const;
-  // Call this function if connect operation succeeded.  This will
-  // reset sleep_ to minimum value.
-  void on_success();
-  // Call this function if connect operations failed.  This will start
-  // timer and blocks connection establishment with exponential
-  // backoff.
-  void on_failure();
-
-  size_t get_fail_count() const;
-
-  // Peer is now considered offline.  This effectively means that the
-  // connection is blocked until online() is called.
-  void offline();
-
-  // Peer is now considered online
-  void online();
-
-  // Returns true if peer is considered offline.
-  bool in_offline() const;
-
-  void call_block_func();
-  void call_unblock_func();
-
-private:
-  std::mt19937 &gen_;
-  // Called when blocking is started
-  std::function<void()> block_func_;
-  // Called when unblocked
-  std::function<void()> unblock_func_;
-  ev_timer timer_;
-  struct ev_loop *loop_;
-  // The number of consecutive connection failure.  Reset to 0 on
-  // success.
-  size_t fail_count_;
-  // true if peer is considered offline.
-  bool offline_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_CONNECT_BLOCKER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1007 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_connection.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <netinet/tcp.h>
-
-#include <limits>
-
-#include <openssl/err.h>
-
-#include "shrpx_tls.h"
-#include "shrpx_memcached_request.h"
-#include "shrpx_log.h"
-#include "memchunk.h"
-#include "util.h"
-#include "ssl_compat.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-#if !LIBRESSL_2_7_API && !OPENSSL_1_1_API
-
-void *BIO_get_data(BIO *bio) { return bio->ptr; }
-void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; }
-void BIO_set_init(BIO *bio, int init) { bio->init = init; }
-
-#endif // !LIBRESSL_2_7_API && !OPENSSL_1_1_API
-
-Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl,
-                       MemchunkPool *mcpool, ev_tstamp write_timeout,
-                       ev_tstamp read_timeout,
-                       const RateLimitConfig &write_limit,
-                       const RateLimitConfig &read_limit, IOCb writecb,
-                       IOCb readcb, TimerCb timeoutcb, void *data,
-                       size_t tls_dyn_rec_warmup_threshold,
-                       ev_tstamp tls_dyn_rec_idle_timeout, shrpx_proto proto)
-    : tls{DefaultMemchunks(mcpool), DefaultPeekMemchunks(mcpool),
-          DefaultMemchunks(mcpool)},
-      wlimit(loop, &wev, write_limit.rate, write_limit.burst),
-      rlimit(loop, &rev, read_limit.rate, read_limit.burst, this),
-      loop(loop),
-      data(data),
-      fd(fd),
-      tls_dyn_rec_warmup_threshold(tls_dyn_rec_warmup_threshold),
-      tls_dyn_rec_idle_timeout(tls_dyn_rec_idle_timeout),
-      proto(proto),
-      last_read(0.),
-      read_timeout(read_timeout) {
-
-  ev_io_init(&wev, writecb, fd, EV_WRITE);
-  ev_io_init(&rev, readcb, fd, EV_READ);
-
-  wev.data = this;
-  rev.data = this;
-
-  ev_timer_init(&wt, timeoutcb, 0., write_timeout);
-  ev_timer_init(&rt, timeoutcb, 0., read_timeout);
-
-  wt.data = this;
-  rt.data = this;
-
-  // set 0. to double field explicitly just in case
-  tls.last_write_idle = 0.;
-
-  if (ssl) {
-    set_ssl(ssl);
-  }
-}
-
-Connection::~Connection() { disconnect(); }
-
-void Connection::disconnect() {
-  if (tls.ssl) {
-    SSL_set_shutdown(tls.ssl,
-                     SSL_get_shutdown(tls.ssl) | SSL_RECEIVED_SHUTDOWN);
-    ERR_clear_error();
-
-    if (tls.cached_session) {
-      SSL_SESSION_free(tls.cached_session);
-      tls.cached_session = nullptr;
-    }
-
-    if (tls.cached_session_lookup_req) {
-      tls.cached_session_lookup_req->canceled = true;
-      tls.cached_session_lookup_req = nullptr;
-    }
-
-    SSL_shutdown(tls.ssl);
-    SSL_free(tls.ssl);
-    tls.ssl = nullptr;
-
-    tls.wbuf.reset();
-    tls.rbuf.reset();
-    tls.last_write_idle = 0.;
-    tls.warmup_writelen = 0;
-    tls.last_writelen = 0;
-    tls.last_readlen = 0;
-    tls.handshake_state = TLS_CONN_NORMAL;
-    tls.initial_handshake_done = false;
-    tls.reneg_started = false;
-    tls.sct_requested = false;
-    tls.early_data_finish = false;
-  }
-
-  if (fd != -1) {
-    shutdown(fd, SHUT_WR);
-    close(fd);
-    fd = -1;
-  }
-
-  // Stop watchers here because they could be activated in
-  // SSL_shutdown().
-  ev_timer_stop(loop, &rt);
-  ev_timer_stop(loop, &wt);
-
-  rlimit.stopw();
-  wlimit.stopw();
-}
-
-void Connection::prepare_client_handshake() {
-  SSL_set_connect_state(tls.ssl);
-  // This prevents SSL_read_early_data from being called.
-  tls.early_data_finish = true;
-}
-
-void Connection::prepare_server_handshake() {
-  SSL_set_accept_state(tls.ssl);
-  tls.server_handshake = true;
-}
-
-// BIO implementation is inspired by openldap implementation:
-// http://www.openldap.org/devel/cvsweb.cgi/~checkout~/libraries/libldap/tls_o.c
-namespace {
-int shrpx_bio_write(BIO *b, const char *buf, int len) {
-  if (buf == nullptr || len <= 0) {
-    return 0;
-  }
-
-  auto conn = static_cast<Connection *>(BIO_get_data(b));
-  auto &wbuf = conn->tls.wbuf;
-
-  BIO_clear_retry_flags(b);
-
-  if (conn->tls.initial_handshake_done) {
-    // After handshake finished, send |buf| of length |len| to the
-    // socket directly.
-
-    // Only when TLS session was prematurely ended before server sent
-    // all handshake message, this condition is true.  This could be
-    // alert from SSL_shutdown().  Since connection is already down,
-    // just return error.
-    if (wbuf.rleft()) {
-      return -1;
-    }
-    auto nwrite = conn->write_clear(buf, len);
-    if (nwrite < 0) {
-      return -1;
-    }
-
-    if (nwrite == 0) {
-      BIO_set_retry_write(b);
-      return -1;
-    }
-
-    return nwrite;
-  }
-
-  wbuf.append(buf, len);
-
-  return len;
-}
-} // namespace
-
-namespace {
-int shrpx_bio_read(BIO *b, char *buf, int len) {
-  if (buf == nullptr || len <= 0) {
-    return 0;
-  }
-
-  auto conn = static_cast<Connection *>(BIO_get_data(b));
-  auto &rbuf = conn->tls.rbuf;
-
-  BIO_clear_retry_flags(b);
-
-  if (conn->tls.initial_handshake_done && rbuf.rleft() == 0) {
-    auto nread = conn->read_clear(buf, len);
-    if (nread < 0) {
-      return -1;
-    }
-    if (nread == 0) {
-      BIO_set_retry_read(b);
-      return -1;
-    }
-    return nread;
-  }
-
-  if (rbuf.rleft() == 0) {
-    BIO_set_retry_read(b);
-    return -1;
-  }
-
-  return rbuf.remove(buf, len);
-}
-} // namespace
-
-namespace {
-int shrpx_bio_puts(BIO *b, const char *str) {
-  return shrpx_bio_write(b, str, strlen(str));
-}
-} // namespace
-
-namespace {
-int shrpx_bio_gets(BIO *b, char *buf, int len) { return -1; }
-} // namespace
-
-namespace {
-long shrpx_bio_ctrl(BIO *b, int cmd, long num, void *ptr) {
-  switch (cmd) {
-  case BIO_CTRL_FLUSH:
-    return 1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int shrpx_bio_create(BIO *b) {
-#if OPENSSL_1_1_API
-  BIO_set_init(b, 1);
-#else  // !OPENSSL_1_1_API
-  b->init = 1;
-  b->num = 0;
-  b->ptr = nullptr;
-  b->flags = 0;
-#endif // !OPENSSL_1_1_API
-  return 1;
-}
-} // namespace
-
-namespace {
-int shrpx_bio_destroy(BIO *b) {
-  if (b == nullptr) {
-    return 0;
-  }
-
-#if !OPENSSL_1_1_API
-  b->ptr = nullptr;
-  b->init = 0;
-  b->flags = 0;
-#endif // !OPENSSL_1_1_API
-
-  return 1;
-}
-} // namespace
-
-#if OPENSSL_1_1_API
-
-BIO_METHOD *create_bio_method() {
-  auto meth = BIO_meth_new(BIO_TYPE_FD, "nghttpx-bio");
-  BIO_meth_set_write(meth, shrpx_bio_write);
-  BIO_meth_set_read(meth, shrpx_bio_read);
-  BIO_meth_set_puts(meth, shrpx_bio_puts);
-  BIO_meth_set_gets(meth, shrpx_bio_gets);
-  BIO_meth_set_ctrl(meth, shrpx_bio_ctrl);
-  BIO_meth_set_create(meth, shrpx_bio_create);
-  BIO_meth_set_destroy(meth, shrpx_bio_destroy);
-
-  return meth;
-}
-
-#else // !OPENSSL_1_1_API
-
-BIO_METHOD *create_bio_method() {
-  static auto meth = new BIO_METHOD{
-      BIO_TYPE_FD,    "nghttpx-bio",    shrpx_bio_write,
-      shrpx_bio_read, shrpx_bio_puts,   shrpx_bio_gets,
-      shrpx_bio_ctrl, shrpx_bio_create, shrpx_bio_destroy,
-  };
-
-  return meth;
-}
-
-#endif // !OPENSSL_1_1_API
-
-void Connection::set_ssl(SSL *ssl) {
-  tls.ssl = ssl;
-
-  auto &tlsconf = get_config()->tls;
-  auto bio = BIO_new(tlsconf.bio_method);
-  BIO_set_data(bio, this);
-  SSL_set_bio(tls.ssl, bio, bio);
-  SSL_set_app_data(tls.ssl, this);
-}
-
-namespace {
-// We should buffer at least full encrypted TLS record here.
-// Theoretically, peer can send client hello in several TLS records,
-// which could exceed this limit, but it is not portable, and we don't
-// have to handle such exotic behaviour.
-bool read_buffer_full(DefaultPeekMemchunks &rbuf) {
-  return rbuf.rleft_buffered() >= 20_k;
-}
-} // namespace
-
-int Connection::tls_handshake() {
-  wlimit.stopw();
-  ev_timer_stop(loop, &wt);
-
-  std::array<uint8_t, 16_k> buf;
-
-  if (ev_is_active(&rev)) {
-    auto nread = read_clear(buf.data(), buf.size());
-    if (nread < 0) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: handshake read error";
-      }
-      return -1;
-    }
-    tls.rbuf.append(buf.data(), nread);
-    if (read_buffer_full(tls.rbuf)) {
-      rlimit.stopw();
-    }
-  }
-
-  if (tls.initial_handshake_done) {
-    return write_tls_pending_handshake();
-  }
-
-  switch (tls.handshake_state) {
-  case TLS_CONN_WAIT_FOR_SESSION_CACHE:
-    return SHRPX_ERR_INPROGRESS;
-  case TLS_CONN_GOT_SESSION_CACHE: {
-    // Use the same trick invented by @kazuho in h2o project.
-
-    // Discard all outgoing data.
-    tls.wbuf.reset();
-    // Rewind buffered incoming data to replay client hello.
-    tls.rbuf.disable_peek(false);
-
-    auto ssl_ctx = SSL_get_SSL_CTX(tls.ssl);
-    auto ssl_opts = SSL_get_options(tls.ssl);
-    SSL_free(tls.ssl);
-
-    auto ssl = tls::create_ssl(ssl_ctx);
-    if (!ssl) {
-      return -1;
-    }
-    if (ssl_opts & SSL_OP_NO_TICKET) {
-      SSL_set_options(ssl, SSL_OP_NO_TICKET);
-    }
-
-    set_ssl(ssl);
-
-    SSL_set_accept_state(tls.ssl);
-
-    tls.handshake_state = TLS_CONN_NORMAL;
-    break;
-  }
-  case TLS_CONN_CANCEL_SESSION_CACHE:
-    tls.handshake_state = TLS_CONN_NORMAL;
-    break;
-  }
-
-  int rv;
-
-  ERR_clear_error();
-
-#if OPENSSL_1_1_1_API
-  if (!tls.server_handshake || tls.early_data_finish) {
-    rv = SSL_do_handshake(tls.ssl);
-  } else {
-    auto &tlsconf = get_config()->tls;
-    for (;;) {
-      size_t nread;
-
-      rv = SSL_read_early_data(tls.ssl, buf.data(), buf.size(), &nread);
-      if (rv == SSL_READ_EARLY_DATA_ERROR) {
-        // If we have early data, and server sends ServerHello, assume
-        // that handshake is completed in server side, and start
-        // processing request.  If we don't exit handshake code here,
-        // server waits for EndOfEarlyData and Finished message from
-        // client, which voids the purpose of 0-RTT data.  The left
-        // over of handshake is done through write_tls or read_tls.
-        if (tlsconf.no_postpone_early_data &&
-            (tls.handshake_state == TLS_CONN_WRITE_STARTED ||
-             tls.wbuf.rleft()) &&
-            tls.earlybuf.rleft()) {
-          rv = 1;
-        }
-
-        break;
-      }
-
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: read early data " << nread << " bytes";
-      }
-
-      tls.earlybuf.append(buf.data(), nread);
-
-      if (rv == SSL_READ_EARLY_DATA_FINISH) {
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "tls: read all early data; total "
-                    << tls.earlybuf.rleft() << " bytes";
-        }
-        tls.early_data_finish = true;
-        // The same reason stated above.
-        if (tlsconf.no_postpone_early_data &&
-            (tls.handshake_state == TLS_CONN_WRITE_STARTED ||
-             tls.wbuf.rleft()) &&
-            tls.earlybuf.rleft()) {
-          rv = 1;
-        } else {
-          ERR_clear_error();
-          rv = SSL_do_handshake(tls.ssl);
-        }
-        break;
-      }
-    }
-  }
-#else  // !OPENSSL_1_1_1_API
-  rv = SSL_do_handshake(tls.ssl);
-#endif // !OPENSSL_1_1_1_API
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(tls.ssl, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      if (read_buffer_full(tls.rbuf)) {
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "tls: handshake message is too large";
-        }
-        return -1;
-      }
-      break;
-    case SSL_ERROR_WANT_WRITE:
-      break;
-    case SSL_ERROR_SSL:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: handshake libssl error: "
-                  << ERR_error_string(ERR_get_error(), nullptr);
-      }
-      return SHRPX_ERR_NETWORK;
-    default:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: handshake libssl error " << err;
-      }
-      return SHRPX_ERR_NETWORK;
-    }
-  }
-
-  if (tls.handshake_state == TLS_CONN_WAIT_FOR_SESSION_CACHE) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "tls: handshake is still in progress";
-    }
-    return SHRPX_ERR_INPROGRESS;
-  }
-
-  // Don't send handshake data if handshake was completed in OpenSSL
-  // routine.  We have to check HTTP/2 requirement if HTTP/2 was
-  // negotiated before sending finished message to the peer.
-  if (rv != 1 && tls.wbuf.rleft()) {
-    // First write indicates that resumption stuff has done.
-    if (tls.handshake_state != TLS_CONN_WRITE_STARTED) {
-      tls.handshake_state = TLS_CONN_WRITE_STARTED;
-      // If peek has already disabled, this is noop.
-      tls.rbuf.disable_peek(true);
-    }
-    std::array<struct iovec, 4> iov;
-    auto iovcnt = tls.wbuf.riovec(iov.data(), iov.size());
-    auto nwrite = writev_clear(iov.data(), iovcnt);
-    if (nwrite < 0) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: handshake write error";
-      }
-      return -1;
-    }
-    tls.wbuf.drain(nwrite);
-
-    if (tls.wbuf.rleft()) {
-      wlimit.startw();
-      ev_timer_again(loop, &wt);
-    }
-  }
-
-  if (!read_buffer_full(tls.rbuf)) {
-    // We may have stopped reading
-    rlimit.startw();
-  }
-
-  if (rv != 1) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "tls: handshake is still in progress";
-    }
-    return SHRPX_ERR_INPROGRESS;
-  }
-
-  // Handshake was done
-
-  rv = check_http2_requirement();
-  if (rv != 0) {
-    return -1;
-  }
-
-  // Just in case
-  tls.rbuf.disable_peek(true);
-
-  tls.initial_handshake_done = true;
-
-  return write_tls_pending_handshake();
-}
-
-int Connection::write_tls_pending_handshake() {
-  // Send handshake data left in the buffer
-  while (tls.wbuf.rleft()) {
-    std::array<struct iovec, 4> iov;
-    auto iovcnt = tls.wbuf.riovec(iov.data(), iov.size());
-    auto nwrite = writev_clear(iov.data(), iovcnt);
-    if (nwrite < 0) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: handshake write error";
-      }
-      return -1;
-    }
-    if (nwrite == 0) {
-      wlimit.startw();
-      ev_timer_again(loop, &wt);
-
-      return SHRPX_ERR_INPROGRESS;
-    }
-    tls.wbuf.drain(nwrite);
-  }
-
-  // We have to start read watcher, since later stage of code expects
-  // this.
-  rlimit.startw();
-
-  // We may have whole request in tls.rbuf.  This means that we don't
-  // get notified further read event.  This is especially true for
-  // HTTP/1.1.
-  handle_tls_pending_read();
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "SSL/TLS handshake completed";
-    nghttp2::tls::TLSSessionInfo tls_info{};
-    if (nghttp2::tls::get_tls_session_info(&tls_info, tls.ssl)) {
-      LOG(INFO) << "cipher=" << tls_info.cipher
-                << " protocol=" << tls_info.protocol
-                << " resumption=" << (tls_info.session_reused ? "yes" : "no")
-                << " session_id="
-                << util::format_hex(tls_info.session_id,
-                                    tls_info.session_id_length);
-    }
-  }
-
-  return 0;
-}
-
-int Connection::check_http2_requirement() {
-  const unsigned char *next_proto = nullptr;
-  unsigned int next_proto_len;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_get0_next_proto_negotiated(tls.ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (next_proto == nullptr) {
-    SSL_get0_alpn_selected(tls.ssl, &next_proto, &next_proto_len);
-  }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (next_proto == nullptr ||
-      !util::check_h2_is_selected(StringRef{next_proto, next_proto_len})) {
-    return 0;
-  }
-  if (!nghttp2::tls::check_http2_tls_version(tls.ssl)) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "TLSv1.2 was not negotiated.  HTTP/2 must not be used.";
-    }
-    return -1;
-  }
-
-  auto check_black_list = false;
-  if (tls.server_handshake) {
-    check_black_list = !get_config()->tls.no_http2_cipher_black_list;
-  } else {
-    check_black_list = !get_config()->tls.client.no_http2_cipher_black_list;
-  }
-
-  if (check_black_list &&
-      nghttp2::tls::check_http2_cipher_black_list(tls.ssl)) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "The negotiated cipher suite is in HTTP/2 cipher suite "
-                   "black list.  HTTP/2 must not be used.";
-    }
-    return -1;
-  }
-
-  return 0;
-}
-
-namespace {
-constexpr size_t SHRPX_SMALL_WRITE_LIMIT = 1300;
-} // namespace
-
-size_t Connection::get_tls_write_limit() {
-
-  if (tls_dyn_rec_warmup_threshold == 0) {
-    return std::numeric_limits<ssize_t>::max();
-  }
-
-  auto t = ev_now(loop);
-
-  if (tls.last_write_idle >= 0. &&
-      t - tls.last_write_idle > tls_dyn_rec_idle_timeout) {
-    // Time out, use small record size
-    tls.warmup_writelen = 0;
-    return SHRPX_SMALL_WRITE_LIMIT;
-  }
-
-  if (tls.warmup_writelen >= tls_dyn_rec_warmup_threshold) {
-    return std::numeric_limits<ssize_t>::max();
-  }
-
-  return SHRPX_SMALL_WRITE_LIMIT;
-}
-
-void Connection::update_tls_warmup_writelen(size_t n) {
-  if (tls.warmup_writelen < tls_dyn_rec_warmup_threshold) {
-    tls.warmup_writelen += n;
-  }
-}
-
-void Connection::start_tls_write_idle() {
-  if (tls.last_write_idle < 0.) {
-    tls.last_write_idle = ev_now(loop);
-  }
-}
-
-ssize_t Connection::write_tls(const void *data, size_t len) {
-  // SSL_write requires the same arguments (buf pointer and its
-  // length) on SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE.
-  // get_write_limit() may return smaller length than previously
-  // passed to SSL_write, which violates OpenSSL assumption.  To avoid
-  // this, we keep last legnth passed to SSL_write to
-  // tls.last_writelen if SSL_write indicated I/O blocking.
-  if (tls.last_writelen == 0) {
-    len = std::min(len, wlimit.avail());
-    len = std::min(len, get_tls_write_limit());
-    if (len == 0) {
-      return 0;
-    }
-  } else {
-    len = tls.last_writelen;
-    tls.last_writelen = 0;
-  }
-
-  tls.last_write_idle = -1.;
-
-  ERR_clear_error();
-
-#if OPENSSL_1_1_1_API
-  int rv;
-  if (SSL_is_init_finished(tls.ssl)) {
-    rv = SSL_write(tls.ssl, data, len);
-  } else {
-    size_t nwrite;
-    rv = SSL_write_early_data(tls.ssl, data, len, &nwrite);
-    // Use the same semantics with SSL_write.
-    if (rv == 1) {
-      rv = nwrite;
-    }
-  }
-#else  // !OPENSSL_1_1_1_API
-  auto rv = SSL_write(tls.ssl, data, len);
-#endif // !OPENSSL_1_1_1_API
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(tls.ssl, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Close connection due to TLS renegotiation";
-      }
-      return SHRPX_ERR_NETWORK;
-    case SSL_ERROR_WANT_WRITE:
-      tls.last_writelen = len;
-      // starting write watcher and timer is done in write_clear via
-      // bio.
-      return 0;
-    case SSL_ERROR_SSL:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "SSL_write: "
-                  << ERR_error_string(ERR_get_error(), nullptr);
-      }
-      return SHRPX_ERR_NETWORK;
-    default:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "SSL_write: SSL_get_error returned " << err;
-      }
-      return SHRPX_ERR_NETWORK;
-    }
-  }
-
-  update_tls_warmup_writelen(rv);
-
-  return rv;
-}
-
-ssize_t Connection::read_tls(void *data, size_t len) {
-  ERR_clear_error();
-
-#if OPENSSL_1_1_1_API
-  if (tls.earlybuf.rleft()) {
-    return tls.earlybuf.remove(data, len);
-  }
-#endif // OPENSSL_1_1_1_API
-
-  // SSL_read requires the same arguments (buf pointer and its
-  // length) on SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE.
-  // rlimit_.avail() or rlimit_.avail() may return different length
-  // than the length previously passed to SSL_read, which violates
-  // OpenSSL assumption.  To avoid this, we keep last legnth passed
-  // to SSL_read to tls_last_readlen_ if SSL_read indicated I/O
-  // blocking.
-  if (tls.last_readlen == 0) {
-    len = std::min(len, rlimit.avail());
-    if (len == 0) {
-      return 0;
-    }
-  } else {
-    len = tls.last_readlen;
-    tls.last_readlen = 0;
-  }
-
-#if OPENSSL_1_1_1_API
-  if (!tls.early_data_finish) {
-    // TLSv1.3 handshake is still going on.
-    size_t nread;
-    auto rv = SSL_read_early_data(tls.ssl, data, len, &nread);
-    if (rv == SSL_READ_EARLY_DATA_ERROR) {
-      auto err = SSL_get_error(tls.ssl, rv);
-      switch (err) {
-      case SSL_ERROR_WANT_READ:
-        tls.last_readlen = len;
-        return 0;
-      case SSL_ERROR_SSL:
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "SSL_read: "
-                    << ERR_error_string(ERR_get_error(), nullptr);
-        }
-        return SHRPX_ERR_NETWORK;
-      default:
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "SSL_read: SSL_get_error returned " << err;
-        }
-        return SHRPX_ERR_NETWORK;
-      }
-    }
-
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "tls: read early data " << nread << " bytes";
-    }
-
-    if (rv == SSL_READ_EARLY_DATA_FINISH) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "tls: read all early data";
-      }
-      tls.early_data_finish = true;
-      // We may have stopped write watcher in write_tls.
-      wlimit.startw();
-    }
-    return nread;
-  }
-#endif // OPENSSL_1_1_1_API
-
-  auto rv = SSL_read(tls.ssl, data, len);
-
-  if (rv <= 0) {
-    auto err = SSL_get_error(tls.ssl, rv);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      tls.last_readlen = len;
-      return 0;
-    case SSL_ERROR_WANT_WRITE:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Close connection due to TLS renegotiation";
-      }
-      return SHRPX_ERR_NETWORK;
-    case SSL_ERROR_ZERO_RETURN:
-      return SHRPX_ERR_EOF;
-    case SSL_ERROR_SSL:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "SSL_read: " << ERR_error_string(ERR_get_error(), nullptr);
-      }
-      return SHRPX_ERR_NETWORK;
-    default:
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "SSL_read: SSL_get_error returned " << err;
-      }
-      return SHRPX_ERR_NETWORK;
-    }
-  }
-
-  return rv;
-}
-
-ssize_t Connection::write_clear(const void *data, size_t len) {
-  len = std::min(len, wlimit.avail());
-  if (len == 0) {
-    return 0;
-  }
-
-  ssize_t nwrite;
-  while ((nwrite = write(fd, data, len)) == -1 && errno == EINTR)
-    ;
-  if (nwrite == -1) {
-    if (errno == EAGAIN || errno == EWOULDBLOCK) {
-      wlimit.startw();
-      ev_timer_again(loop, &wt);
-      return 0;
-    }
-    return SHRPX_ERR_NETWORK;
-  }
-
-  wlimit.drain(nwrite);
-
-  if (ev_is_active(&wt)) {
-    ev_timer_again(loop, &wt);
-  }
-
-  return nwrite;
-}
-
-ssize_t Connection::writev_clear(struct iovec *iov, int iovcnt) {
-  iovcnt = limit_iovec(iov, iovcnt, wlimit.avail());
-  if (iovcnt == 0) {
-    return 0;
-  }
-
-  ssize_t nwrite;
-  while ((nwrite = writev(fd, iov, iovcnt)) == -1 && errno == EINTR)
-    ;
-  if (nwrite == -1) {
-    if (errno == EAGAIN || errno == EWOULDBLOCK) {
-      wlimit.startw();
-      ev_timer_again(loop, &wt);
-      return 0;
-    }
-    return SHRPX_ERR_NETWORK;
-  }
-
-  wlimit.drain(nwrite);
-
-  if (ev_is_active(&wt)) {
-    ev_timer_again(loop, &wt);
-  }
-
-  return nwrite;
-}
-
-ssize_t Connection::read_clear(void *data, size_t len) {
-  len = std::min(len, rlimit.avail());
-  if (len == 0) {
-    return 0;
-  }
-
-  ssize_t nread;
-  while ((nread = read(fd, data, len)) == -1 && errno == EINTR)
-    ;
-  if (nread == -1) {
-    if (errno == EAGAIN || errno == EWOULDBLOCK) {
-      return 0;
-    }
-    return SHRPX_ERR_NETWORK;
-  }
-
-  if (nread == 0) {
-    return SHRPX_ERR_EOF;
-  }
-
-  rlimit.drain(nread);
-
-  return nread;
-}
-
-void Connection::handle_tls_pending_read() {
-  if (!ev_is_active(&rev)) {
-    return;
-  }
-  rlimit.handle_tls_pending_read();
-}
-
-int Connection::get_tcp_hint(TCPHint *hint) const {
-#if defined(TCP_INFO) && defined(TCP_NOTSENT_LOWAT)
-  struct tcp_info tcp_info;
-  socklen_t tcp_info_len = sizeof(tcp_info);
-  int rv;
-
-  rv = getsockopt(fd, IPPROTO_TCP, TCP_INFO, &tcp_info, &tcp_info_len);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  auto avail_packets = tcp_info.tcpi_snd_cwnd > tcp_info.tcpi_unacked
-                           ? tcp_info.tcpi_snd_cwnd - tcp_info.tcpi_unacked
-                           : 0;
-
-  // http://www.slideshare.net/kazuho/programming-tcp-for-responsiveness
-
-  // TODO 29 (5 (header) + 8 (explicit nonce) + 16 (tag)) is TLS
-  // overhead for AES-GCM.  For CHACHA20_POLY1305, it is 21 since it
-  // does not need 8 bytes explicit nonce.
-  //
-  // For TLSv1.3, AES-GCM and CHACHA20_POLY1305 overhead are now 22
-  // bytes (5 (header) + 1 (ContentType) + 16 (tag)).
-  size_t tls_overhead;
-#  ifdef TLS1_3_VERSION
-  if (SSL_version(tls.ssl) == TLS1_3_VERSION) {
-    tls_overhead = 22;
-  } else
-#  endif // TLS1_3_VERSION
-  {
-    tls_overhead = 29;
-  }
-
-  auto writable_size =
-      (avail_packets + 2) * (tcp_info.tcpi_snd_mss - tls_overhead);
-  if (writable_size > 16_k) {
-    writable_size = writable_size & ~(16_k - 1);
-  } else {
-    if (writable_size < 536) {
-      LOG(INFO) << "writable_size is too small: " << writable_size;
-    }
-    // TODO is this required?
-    writable_size = std::max(writable_size, static_cast<size_t>(536 * 2));
-  }
-
-  // if (LOG_ENABLED(INFO)) {
-  //   LOG(INFO) << "snd_cwnd=" << tcp_info.tcpi_snd_cwnd
-  //             << ", unacked=" << tcp_info.tcpi_unacked
-  //             << ", snd_mss=" << tcp_info.tcpi_snd_mss
-  //             << ", rtt=" << tcp_info.tcpi_rtt << "us"
-  //             << ", rcv_space=" << tcp_info.tcpi_rcv_space
-  //             << ", writable=" << writable_size;
-  // }
-
-  hint->write_buffer_size = writable_size;
-  // TODO tcpi_rcv_space is considered as rwin, is that correct?
-  hint->rwin = tcp_info.tcpi_rcv_space;
-
-  return 0;
-#else  // !defined(TCP_INFO) || !defined(TCP_NOTSENT_LOWAT)
-  return -1;
-#endif // !defined(TCP_INFO) || !defined(TCP_NOTSENT_LOWAT)
-}
-
-void Connection::again_rt(ev_tstamp t) {
-  read_timeout = t;
-  rt.repeat = t;
-  ev_timer_again(loop, &rt);
-  last_read = ev_now(loop);
-}
-
-void Connection::again_rt() {
-  rt.repeat = read_timeout;
-  ev_timer_again(loop, &rt);
-  last_read = ev_now(loop);
-}
-
-bool Connection::expired_rt() {
-  auto delta = read_timeout - (ev_now(loop) - last_read);
-  if (delta < 1e-9) {
-    return true;
-  }
-  rt.repeat = delta;
-  ev_timer_again(loop, &rt);
-  return false;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_CONNECTION_H
-#define SHRPX_CONNECTION_H
-
-#include "shrpx_config.h"
-
-#include <sys/uio.h>
-
-#include <ev.h>
-
-#include <openssl/ssl.h>
-
-#include "shrpx_rate_limit.h"
-#include "shrpx_error.h"
-#include "memchunk.h"
-
-namespace shrpx {
-
-struct MemcachedRequest;
-
-namespace tls {
-struct TLSSessionCache;
-} // namespace tls
-
-enum {
-  TLS_CONN_NORMAL,
-  TLS_CONN_WAIT_FOR_SESSION_CACHE,
-  TLS_CONN_GOT_SESSION_CACHE,
-  TLS_CONN_CANCEL_SESSION_CACHE,
-  TLS_CONN_WRITE_STARTED,
-};
-
-struct TLSConnection {
-  DefaultMemchunks wbuf;
-  DefaultPeekMemchunks rbuf;
-  // Stores TLSv1.3 early data.
-  DefaultMemchunks earlybuf;
-  SSL *ssl;
-  SSL_SESSION *cached_session;
-  MemcachedRequest *cached_session_lookup_req;
-  tls::TLSSessionCache *client_session_cache;
-  ev_tstamp last_write_idle;
-  size_t warmup_writelen;
-  // length passed to SSL_write and SSL_read last time.  This is
-  // required since these functions require the exact same parameters
-  // on non-blocking I/O.
-  size_t last_writelen, last_readlen;
-  int handshake_state;
-  bool initial_handshake_done;
-  bool reneg_started;
-  // true if ssl is prepared to do handshake as server.
-  bool server_handshake;
-  // true if ssl is initialized as server, and client requested
-  // signed_certificate_timestamp extension.
-  bool sct_requested;
-  // true if TLSv1.3 early data has been completely received.  Since
-  // SSL_read_early_data acts like SSL_do_handshake, this field may be
-  // true even if the negotiated TLS version is TLSv1.2 or earlier.
-  // This value is also true if this is client side connection for
-  // convenience.
-  bool early_data_finish;
-};
-
-struct TCPHint {
-  size_t write_buffer_size;
-  uint32_t rwin;
-};
-
-template <typename T> using EVCb = void (*)(struct ev_loop *, T *, int);
-
-using IOCb = EVCb<ev_io>;
-using TimerCb = EVCb<ev_timer>;
-
-struct Connection {
-  Connection(struct ev_loop *loop, int fd, SSL *ssl, MemchunkPool *mcpool,
-             ev_tstamp write_timeout, ev_tstamp read_timeout,
-             const RateLimitConfig &write_limit,
-             const RateLimitConfig &read_limit, IOCb writecb, IOCb readcb,
-             TimerCb timeoutcb, void *data, size_t tls_dyn_rec_warmup_threshold,
-             ev_tstamp tls_dyn_rec_idle_timeout, shrpx_proto proto);
-  ~Connection();
-
-  void disconnect();
-
-  void prepare_client_handshake();
-  void prepare_server_handshake();
-
-  int tls_handshake();
-  int write_tls_pending_handshake();
-
-  int check_http2_requirement();
-
-  // All write_* and writev_clear functions return number of bytes
-  // written.  If nothing cannot be written (e.g., there is no
-  // allowance in RateLimit or underlying connection blocks), return
-  // 0.  SHRPX_ERR_NETWORK is returned in case of error.
-  //
-  // All read_* functions return number of bytes read.  If nothing
-  // cannot be read (e.g., there is no allowance in Ratelimit or
-  // underlying connection blocks), return 0.  SHRPX_ERR_EOF is
-  // returned in case of EOF and no data was read.  Otherwise
-  // SHRPX_ERR_NETWORK is return in case of error.
-  ssize_t write_tls(const void *data, size_t len);
-  ssize_t read_tls(void *data, size_t len);
-
-  size_t get_tls_write_limit();
-  // Updates the number of bytes written in warm up period.
-  void update_tls_warmup_writelen(size_t n);
-  // Tells there is no immediate write now.  This triggers timer to
-  // determine fallback to short record size mode.
-  void start_tls_write_idle();
-
-  ssize_t write_clear(const void *data, size_t len);
-  ssize_t writev_clear(struct iovec *iov, int iovcnt);
-  ssize_t read_clear(void *data, size_t len);
-
-  void handle_tls_pending_read();
-
-  void set_ssl(SSL *ssl);
-
-  int get_tcp_hint(TCPHint *hint) const;
-
-  // These functions are provided for read timer which is frequently
-  // restarted.  We do a trick to make a bit more efficient than just
-  // calling ev_timer_again().
-
-  // Restarts read timer with timeout value |t|.
-  void again_rt(ev_tstamp t);
-  // Restarts read timer without chainging timeout.
-  void again_rt();
-  // Returns true if read timer expired.
-  bool expired_rt();
-
-  TLSConnection tls;
-  ev_io wev;
-  ev_io rev;
-  ev_timer wt;
-  ev_timer rt;
-  RateLimit wlimit;
-  RateLimit rlimit;
-  struct ev_loop *loop;
-  void *data;
-  int fd;
-  size_t tls_dyn_rec_warmup_threshold;
-  ev_tstamp tls_dyn_rec_idle_timeout;
-  // Application protocol used over the connection.  This field is not
-  // used in this object at the moment.  The rest of the program may
-  // use this value when it is useful.
-  shrpx_proto proto;
-  // The point of time when last read is observed.  Note: since we use
-  // |rt| as idle timer, the activity is not limited to read.
-  ev_tstamp last_read;
-  // Timeout for read timer |rt|.
-  ev_tstamp read_timeout;
-};
-
-// Creates BIO_method shared by all SSL objects.
-BIO_METHOD *create_bio_method();
-
-} // namespace shrpx
-
-#endif // SHRPX_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,877 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_connection_handler.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <cerrno>
-#include <thread>
-#include <random>
-
-#include "shrpx_client_handler.h"
-#include "shrpx_tls.h"
-#include "shrpx_worker.h"
-#include "shrpx_config.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_downstream_connection.h"
-#include "shrpx_accept_handler.h"
-#include "shrpx_memcached_dispatcher.h"
-#include "shrpx_signal.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-void acceptor_disable_cb(struct ev_loop *loop, ev_timer *w, int revent) {
-  auto h = static_cast<ConnectionHandler *>(w->data);
-
-  // If we are in graceful shutdown period, we must not enable
-  // acceptors again.
-  if (h->get_graceful_shutdown()) {
-    return;
-  }
-
-  h->enable_acceptor();
-}
-} // namespace
-
-namespace {
-void ocsp_cb(struct ev_loop *loop, ev_timer *w, int revent) {
-  auto h = static_cast<ConnectionHandler *>(w->data);
-
-  // If we are in graceful shutdown period, we won't do ocsp query.
-  if (h->get_graceful_shutdown()) {
-    return;
-  }
-
-  LOG(NOTICE) << "Start ocsp update";
-
-  h->proceed_next_cert_ocsp();
-}
-} // namespace
-
-namespace {
-void ocsp_read_cb(struct ev_loop *loop, ev_io *w, int revent) {
-  auto h = static_cast<ConnectionHandler *>(w->data);
-
-  h->read_ocsp_chunk();
-}
-} // namespace
-
-namespace {
-void ocsp_chld_cb(struct ev_loop *loop, ev_child *w, int revent) {
-  auto h = static_cast<ConnectionHandler *>(w->data);
-
-  h->handle_ocsp_complete();
-}
-} // namespace
-
-namespace {
-void thread_join_async_cb(struct ev_loop *loop, ev_async *w, int revent) {
-  ev_break(loop);
-}
-} // namespace
-
-namespace {
-void serial_event_async_cb(struct ev_loop *loop, ev_async *w, int revent) {
-  auto h = static_cast<ConnectionHandler *>(w->data);
-
-  h->handle_serial_event();
-}
-} // namespace
-
-ConnectionHandler::ConnectionHandler(struct ev_loop *loop, std::mt19937 &gen)
-    : gen_(gen),
-      single_worker_(nullptr),
-      loop_(loop),
-#ifdef HAVE_NEVERBLEED
-      nb_(nullptr),
-#endif // HAVE_NEVERBLEED
-      tls_ticket_key_memcached_get_retry_count_(0),
-      tls_ticket_key_memcached_fail_count_(0),
-      worker_round_robin_cnt_(get_config()->api.enabled ? 1 : 0),
-      graceful_shutdown_(false),
-      enable_acceptor_on_ocsp_completion_(false) {
-  ev_timer_init(&disable_acceptor_timer_, acceptor_disable_cb, 0., 0.);
-  disable_acceptor_timer_.data = this;
-
-  ev_timer_init(&ocsp_timer_, ocsp_cb, 0., 0.);
-  ocsp_timer_.data = this;
-
-  ev_io_init(&ocsp_.rev, ocsp_read_cb, -1, EV_READ);
-  ocsp_.rev.data = this;
-
-  ev_async_init(&thread_join_asyncev_, thread_join_async_cb);
-
-  ev_async_init(&serial_event_asyncev_, serial_event_async_cb);
-  serial_event_asyncev_.data = this;
-
-  ev_async_start(loop_, &serial_event_asyncev_);
-
-  ev_child_init(&ocsp_.chldev, ocsp_chld_cb, 0, 0);
-  ocsp_.chldev.data = this;
-
-  ocsp_.next = 0;
-  ocsp_.proc.rfd = -1;
-
-  reset_ocsp();
-}
-
-ConnectionHandler::~ConnectionHandler() {
-  ev_child_stop(loop_, &ocsp_.chldev);
-  ev_async_stop(loop_, &serial_event_asyncev_);
-  ev_async_stop(loop_, &thread_join_asyncev_);
-  ev_io_stop(loop_, &ocsp_.rev);
-  ev_timer_stop(loop_, &ocsp_timer_);
-  ev_timer_stop(loop_, &disable_acceptor_timer_);
-
-  for (auto ssl_ctx : all_ssl_ctx_) {
-    auto tls_ctx_data =
-        static_cast<tls::TLSContextData *>(SSL_CTX_get_app_data(ssl_ctx));
-    if (tls_ctx_data) {
-      delete tls_ctx_data;
-    }
-    SSL_CTX_free(ssl_ctx);
-  }
-
-  // Free workers before destroying ev_loop
-  workers_.clear();
-
-  for (auto loop : worker_loops_) {
-    ev_loop_destroy(loop);
-  }
-}
-
-void ConnectionHandler::set_ticket_keys_to_worker(
-    const std::shared_ptr<TicketKeys> &ticket_keys) {
-  for (auto &worker : workers_) {
-    worker->set_ticket_keys(ticket_keys);
-  }
-}
-
-void ConnectionHandler::worker_reopen_log_files() {
-  WorkerEvent wev{};
-
-  wev.type = REOPEN_LOG;
-
-  for (auto &worker : workers_) {
-    worker->send(wev);
-  }
-}
-
-void ConnectionHandler::worker_replace_downstream(
-    std::shared_ptr<DownstreamConfig> downstreamconf) {
-  WorkerEvent wev{};
-
-  wev.type = REPLACE_DOWNSTREAM;
-  wev.downstreamconf = std::move(downstreamconf);
-
-  for (auto &worker : workers_) {
-    worker->send(wev);
-  }
-}
-
-int ConnectionHandler::create_single_worker() {
-  cert_tree_ = tls::create_cert_lookup_tree();
-  auto sv_ssl_ctx = tls::setup_server_ssl_context(
-      all_ssl_ctx_, indexed_ssl_ctx_, cert_tree_.get()
-#ifdef HAVE_NEVERBLEED
-                                          ,
-      nb_
-#endif // HAVE_NEVERBLEED
-  );
-  auto cl_ssl_ctx = tls::setup_downstream_client_ssl_context(
-#ifdef HAVE_NEVERBLEED
-      nb_
-#endif // HAVE_NEVERBLEED
-  );
-
-  if (cl_ssl_ctx) {
-    all_ssl_ctx_.push_back(cl_ssl_ctx);
-  }
-
-  auto config = get_config();
-  auto &tlsconf = config->tls;
-
-  SSL_CTX *session_cache_ssl_ctx = nullptr;
-  {
-    auto &memcachedconf = config->tls.session_cache.memcached;
-    if (memcachedconf.tls) {
-      session_cache_ssl_ctx = tls::create_ssl_client_context(
-#ifdef HAVE_NEVERBLEED
-          nb_,
-#endif // HAVE_NEVERBLEED
-          tlsconf.cacert, memcachedconf.cert_file,
-          memcachedconf.private_key_file, nullptr);
-      all_ssl_ctx_.push_back(session_cache_ssl_ctx);
-    }
-  }
-
-  single_worker_ = make_unique<Worker>(
-      loop_, sv_ssl_ctx, cl_ssl_ctx, session_cache_ssl_ctx, cert_tree_.get(),
-      ticket_keys_, this, config->conn.downstream);
-#ifdef HAVE_MRUBY
-  if (single_worker_->create_mruby_context() != 0) {
-    return -1;
-  }
-#endif // HAVE_MRUBY
-
-  return 0;
-}
-
-int ConnectionHandler::create_worker_thread(size_t num) {
-#ifndef NOTHREADS
-  assert(workers_.size() == 0);
-
-  cert_tree_ = tls::create_cert_lookup_tree();
-  auto sv_ssl_ctx = tls::setup_server_ssl_context(
-      all_ssl_ctx_, indexed_ssl_ctx_, cert_tree_.get()
-#  ifdef HAVE_NEVERBLEED
-                                          ,
-      nb_
-#  endif // HAVE_NEVERBLEED
-  );
-  auto cl_ssl_ctx = tls::setup_downstream_client_ssl_context(
-#  ifdef HAVE_NEVERBLEED
-      nb_
-#  endif // HAVE_NEVERBLEED
-  );
-
-  if (cl_ssl_ctx) {
-    all_ssl_ctx_.push_back(cl_ssl_ctx);
-  }
-
-  auto config = get_config();
-  auto &tlsconf = config->tls;
-  auto &apiconf = config->api;
-
-  // We have dedicated worker for API request processing.
-  if (apiconf.enabled) {
-    ++num;
-  }
-
-  SSL_CTX *session_cache_ssl_ctx = nullptr;
-  {
-    auto &memcachedconf = config->tls.session_cache.memcached;
-
-    if (memcachedconf.tls) {
-      session_cache_ssl_ctx = tls::create_ssl_client_context(
-#  ifdef HAVE_NEVERBLEED
-          nb_,
-#  endif // HAVE_NEVERBLEED
-          tlsconf.cacert, memcachedconf.cert_file,
-          memcachedconf.private_key_file, nullptr);
-      all_ssl_ctx_.push_back(session_cache_ssl_ctx);
-    }
-  }
-
-  for (size_t i = 0; i < num; ++i) {
-    auto loop = ev_loop_new(config->ev_loop_flags);
-
-    auto worker = make_unique<Worker>(
-        loop, sv_ssl_ctx, cl_ssl_ctx, session_cache_ssl_ctx, cert_tree_.get(),
-        ticket_keys_, this, config->conn.downstream);
-#  ifdef HAVE_MRUBY
-    if (worker->create_mruby_context() != 0) {
-      return -1;
-    }
-#  endif // HAVE_MRUBY
-
-    workers_.push_back(std::move(worker));
-    worker_loops_.push_back(loop);
-
-    LLOG(NOTICE, this) << "Created worker thread #" << workers_.size() - 1;
-  }
-
-  for (auto &worker : workers_) {
-    worker->run_async();
-  }
-
-#endif // NOTHREADS
-
-  return 0;
-}
-
-void ConnectionHandler::join_worker() {
-#ifndef NOTHREADS
-  int n = 0;
-
-  if (LOG_ENABLED(INFO)) {
-    LLOG(INFO, this) << "Waiting for worker thread to join: n="
-                     << workers_.size();
-  }
-
-  for (auto &worker : workers_) {
-    worker->wait();
-    if (LOG_ENABLED(INFO)) {
-      LLOG(INFO, this) << "Thread #" << n << " joined";
-    }
-    ++n;
-  }
-#endif // NOTHREADS
-}
-
-void ConnectionHandler::graceful_shutdown_worker() {
-  if (single_worker_) {
-    return;
-  }
-
-  WorkerEvent wev{};
-  wev.type = GRACEFUL_SHUTDOWN;
-
-  if (LOG_ENABLED(INFO)) {
-    LLOG(INFO, this) << "Sending graceful shutdown signal to worker";
-  }
-
-  for (auto &worker : workers_) {
-    worker->send(wev);
-  }
-
-#ifndef NOTHREADS
-  ev_async_start(loop_, &thread_join_asyncev_);
-
-  thread_join_fut_ = std::async(std::launch::async, [this]() {
-    (void)reopen_log_files(get_config()->logging);
-    join_worker();
-    ev_async_send(get_loop(), &thread_join_asyncev_);
-    delete_log_config();
-  });
-#endif // NOTHREADS
-}
-
-int ConnectionHandler::handle_connection(int fd, sockaddr *addr, int addrlen,
-                                         const UpstreamAddr *faddr) {
-  if (LOG_ENABLED(INFO)) {
-    LLOG(INFO, this) << "Accepted connection from "
-                     << util::numeric_name(addr, addrlen) << ", fd=" << fd;
-  }
-
-  auto config = get_config();
-
-  if (single_worker_) {
-    auto &upstreamconf = config->conn.upstream;
-    if (single_worker_->get_worker_stat()->num_connections >=
-        upstreamconf.worker_connections) {
-
-      if (LOG_ENABLED(INFO)) {
-        LLOG(INFO, this) << "Too many connections >="
-                         << upstreamconf.worker_connections;
-      }
-
-      close(fd);
-      return -1;
-    }
-
-    auto client =
-        tls::accept_connection(single_worker_.get(), fd, addr, addrlen, faddr);
-    if (!client) {
-      LLOG(ERROR, this) << "ClientHandler creation failed";
-
-      close(fd);
-      return -1;
-    }
-
-    return 0;
-  }
-
-  Worker *worker;
-
-  if (faddr->alt_mode == ALTMODE_API) {
-    worker = workers_[0].get();
-
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Dispatch connection to API worker #0";
-    }
-  } else {
-    worker = workers_[worker_round_robin_cnt_].get();
-
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Dispatch connection to worker #" << worker_round_robin_cnt_;
-    }
-
-    if (++worker_round_robin_cnt_ == workers_.size()) {
-      auto &apiconf = config->api;
-
-      if (apiconf.enabled) {
-        worker_round_robin_cnt_ = 1;
-      } else {
-        worker_round_robin_cnt_ = 0;
-      }
-    }
-  }
-
-  WorkerEvent wev{};
-  wev.type = NEW_CONNECTION;
-  wev.client_fd = fd;
-  memcpy(&wev.client_addr, addr, addrlen);
-  wev.client_addrlen = addrlen;
-  wev.faddr = faddr;
-
-  worker->send(wev);
-
-  return 0;
-}
-
-struct ev_loop *ConnectionHandler::get_loop() const {
-  return loop_;
-}
-
-Worker *ConnectionHandler::get_single_worker() const {
-  return single_worker_.get();
-}
-
-void ConnectionHandler::add_acceptor(std::unique_ptr<AcceptHandler> h) {
-  acceptors_.push_back(std::move(h));
-}
-
-void ConnectionHandler::delete_acceptor() { acceptors_.clear(); }
-
-void ConnectionHandler::enable_acceptor() {
-  for (auto &a : acceptors_) {
-    a->enable();
-  }
-}
-
-void ConnectionHandler::disable_acceptor() {
-  for (auto &a : acceptors_) {
-    a->disable();
-  }
-}
-
-void ConnectionHandler::sleep_acceptor(ev_tstamp t) {
-  if (t == 0. || ev_is_active(&disable_acceptor_timer_)) {
-    return;
-  }
-
-  disable_acceptor();
-
-  ev_timer_set(&disable_acceptor_timer_, t, 0.);
-  ev_timer_start(loop_, &disable_acceptor_timer_);
-}
-
-void ConnectionHandler::accept_pending_connection() {
-  for (auto &a : acceptors_) {
-    a->accept_connection();
-  }
-}
-
-void ConnectionHandler::set_ticket_keys(
-    std::shared_ptr<TicketKeys> ticket_keys) {
-  ticket_keys_ = std::move(ticket_keys);
-  if (single_worker_) {
-    single_worker_->set_ticket_keys(ticket_keys_);
-  }
-}
-
-const std::shared_ptr<TicketKeys> &ConnectionHandler::get_ticket_keys() const {
-  return ticket_keys_;
-}
-
-void ConnectionHandler::set_graceful_shutdown(bool f) {
-  graceful_shutdown_ = f;
-  if (single_worker_) {
-    single_worker_->set_graceful_shutdown(f);
-  }
-}
-
-bool ConnectionHandler::get_graceful_shutdown() const {
-  return graceful_shutdown_;
-}
-
-void ConnectionHandler::cancel_ocsp_update() {
-  enable_acceptor_on_ocsp_completion_ = false;
-  ev_timer_stop(loop_, &ocsp_timer_);
-
-  if (ocsp_.proc.pid == 0) {
-    return;
-  }
-
-  int rv;
-
-  rv = kill(ocsp_.proc.pid, SIGTERM);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(ERROR) << "Could not send signal to OCSP query process: errno="
-               << error;
-  }
-
-  while ((rv = waitpid(ocsp_.proc.pid, nullptr, 0)) == -1 && errno == EINTR)
-    ;
-  if (rv == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Error occurred while we were waiting for the completion of "
-                  "OCSP query process: errno="
-               << error;
-  }
-}
-
-// inspired by h2o_read_command function from h2o project:
-// https://github.com/h2o/h2o
-int ConnectionHandler::start_ocsp_update(const char *cert_file) {
-  int rv;
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Start ocsp update for " << cert_file;
-  }
-
-  assert(!ev_is_active(&ocsp_.rev));
-  assert(!ev_is_active(&ocsp_.chldev));
-
-  char *const argv[] = {
-      const_cast<char *>(
-          get_config()->tls.ocsp.fetch_ocsp_response_file.c_str()),
-      const_cast<char *>(cert_file), nullptr};
-
-  Process proc;
-  rv = exec_read_command(proc, argv);
-  if (rv != 0) {
-    return -1;
-  }
-
-  ocsp_.proc = proc;
-
-  ev_io_set(&ocsp_.rev, ocsp_.proc.rfd, EV_READ);
-  ev_io_start(loop_, &ocsp_.rev);
-
-  ev_child_set(&ocsp_.chldev, ocsp_.proc.pid, 0);
-  ev_child_start(loop_, &ocsp_.chldev);
-
-  return 0;
-}
-
-void ConnectionHandler::read_ocsp_chunk() {
-  std::array<uint8_t, 4_k> buf;
-  for (;;) {
-    ssize_t n;
-    while ((n = read(ocsp_.proc.rfd, buf.data(), buf.size())) == -1 &&
-           errno == EINTR)
-      ;
-
-    if (n == -1) {
-      if (errno == EAGAIN || errno == EWOULDBLOCK) {
-        return;
-      }
-      auto error = errno;
-      LOG(WARN) << "Reading from ocsp query command failed: errno=" << error;
-      ocsp_.error = error;
-
-      break;
-    }
-
-    if (n == 0) {
-      break;
-    }
-
-    std::copy_n(std::begin(buf), n, std::back_inserter(ocsp_.resp));
-  }
-
-  ev_io_stop(loop_, &ocsp_.rev);
-}
-
-void ConnectionHandler::handle_ocsp_complete() {
-  ev_io_stop(loop_, &ocsp_.rev);
-  ev_child_stop(loop_, &ocsp_.chldev);
-
-  assert(ocsp_.next < all_ssl_ctx_.size());
-
-  auto ssl_ctx = all_ssl_ctx_[ocsp_.next];
-  auto tls_ctx_data =
-      static_cast<tls::TLSContextData *>(SSL_CTX_get_app_data(ssl_ctx));
-
-  auto rstatus = ocsp_.chldev.rstatus;
-  auto status = WEXITSTATUS(rstatus);
-  if (ocsp_.error || !WIFEXITED(rstatus) || status != 0) {
-    LOG(WARN) << "ocsp query command for " << tls_ctx_data->cert_file
-              << " failed: error=" << ocsp_.error << ", rstatus=" << std::hex
-              << rstatus << std::dec << ", status=" << status;
-    ++ocsp_.next;
-    proceed_next_cert_ocsp();
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "ocsp update for " << tls_ctx_data->cert_file
-              << " finished successfully";
-  }
-
-  auto config = get_config();
-  auto &tlsconf = config->tls;
-
-  if (tlsconf.ocsp.no_verify ||
-      tls::verify_ocsp_response(ssl_ctx, ocsp_.resp.data(),
-                                ocsp_.resp.size()) == 0) {
-#ifndef OPENSSL_IS_BORINGSSL
-#  ifdef HAVE_ATOMIC_STD_SHARED_PTR
-    std::atomic_store_explicit(
-        &tls_ctx_data->ocsp_data,
-        std::make_shared<std::vector<uint8_t>>(std::move(ocsp_.resp)),
-        std::memory_order_release);
-#  else  // !HAVE_ATOMIC_STD_SHARED_PTR
-    std::lock_guard<std::mutex> g(tls_ctx_data->mu);
-    tls_ctx_data->ocsp_data =
-        std::make_shared<std::vector<uint8_t>>(std::move(ocsp_.resp));
-#  endif // !HAVE_ATOMIC_STD_SHARED_PTR
-#else    // OPENSSL_IS_BORINGSSL
-    SSL_CTX_set_ocsp_response(ssl_ctx, ocsp_.resp.data(), ocsp_.resp.size());
-#endif   // OPENSSL_IS_BORINGSSL
-  }
-
-  ++ocsp_.next;
-  proceed_next_cert_ocsp();
-}
-
-void ConnectionHandler::reset_ocsp() {
-  if (ocsp_.proc.rfd != -1) {
-    close(ocsp_.proc.rfd);
-  }
-
-  ocsp_.proc.rfd = -1;
-  ocsp_.proc.pid = 0;
-  ocsp_.error = 0;
-  ocsp_.resp = std::vector<uint8_t>();
-}
-
-void ConnectionHandler::proceed_next_cert_ocsp() {
-  for (;;) {
-    reset_ocsp();
-    if (ocsp_.next == all_ssl_ctx_.size()) {
-      ocsp_.next = 0;
-      // We have updated all ocsp response, and schedule next update.
-      ev_timer_set(&ocsp_timer_, get_config()->tls.ocsp.update_interval, 0.);
-      ev_timer_start(loop_, &ocsp_timer_);
-
-      if (enable_acceptor_on_ocsp_completion_) {
-        enable_acceptor_on_ocsp_completion_ = false;
-        enable_acceptor();
-      }
-
-      return;
-    }
-
-    auto ssl_ctx = all_ssl_ctx_[ocsp_.next];
-    auto tls_ctx_data =
-        static_cast<tls::TLSContextData *>(SSL_CTX_get_app_data(ssl_ctx));
-
-    // client SSL_CTX is also included in all_ssl_ctx_, but has no
-    // tls_ctx_data.
-    if (!tls_ctx_data) {
-      ++ocsp_.next;
-      continue;
-    }
-
-    auto cert_file = tls_ctx_data->cert_file;
-
-    if (start_ocsp_update(cert_file) != 0) {
-      ++ocsp_.next;
-      continue;
-    }
-
-    break;
-  }
-}
-
-void ConnectionHandler::set_tls_ticket_key_memcached_dispatcher(
-    std::unique_ptr<MemcachedDispatcher> dispatcher) {
-  tls_ticket_key_memcached_dispatcher_ = std::move(dispatcher);
-}
-
-MemcachedDispatcher *
-ConnectionHandler::get_tls_ticket_key_memcached_dispatcher() const {
-  return tls_ticket_key_memcached_dispatcher_.get();
-}
-
-// Use the similar backoff algorithm described in
-// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md
-namespace {
-constexpr size_t MAX_BACKOFF_EXP = 10;
-constexpr auto MULTIPLIER = 3.2;
-constexpr auto JITTER = 0.2;
-} // namespace
-
-void ConnectionHandler::on_tls_ticket_key_network_error(ev_timer *w) {
-  if (++tls_ticket_key_memcached_get_retry_count_ >=
-      get_config()->tls.ticket.memcached.max_retry) {
-    LOG(WARN) << "Memcached: tls ticket get retry all failed "
-              << tls_ticket_key_memcached_get_retry_count_ << " times.";
-
-    on_tls_ticket_key_not_found(w);
-    return;
-  }
-
-  auto base_backoff = util::int_pow(
-      MULTIPLIER,
-      std::min(MAX_BACKOFF_EXP, tls_ticket_key_memcached_get_retry_count_));
-  auto dist = std::uniform_real_distribution<>(-JITTER * base_backoff,
-                                               JITTER * base_backoff);
-
-  auto backoff = base_backoff + dist(gen_);
-
-  LOG(WARN)
-      << "Memcached: tls ticket get failed due to network error, retrying in "
-      << backoff << " seconds";
-
-  ev_timer_set(w, backoff, 0.);
-  ev_timer_start(loop_, w);
-}
-
-void ConnectionHandler::on_tls_ticket_key_not_found(ev_timer *w) {
-  tls_ticket_key_memcached_get_retry_count_ = 0;
-
-  if (++tls_ticket_key_memcached_fail_count_ >=
-      get_config()->tls.ticket.memcached.max_fail) {
-    LOG(WARN) << "Memcached: could not get tls ticket; disable tls ticket";
-
-    tls_ticket_key_memcached_fail_count_ = 0;
-
-    set_ticket_keys(nullptr);
-    set_ticket_keys_to_worker(nullptr);
-  }
-
-  LOG(WARN) << "Memcached: tls ticket get failed, schedule next";
-  schedule_next_tls_ticket_key_memcached_get(w);
-}
-
-void ConnectionHandler::on_tls_ticket_key_get_success(
-    const std::shared_ptr<TicketKeys> &ticket_keys, ev_timer *w) {
-  LOG(NOTICE) << "Memcached: tls ticket get success";
-
-  tls_ticket_key_memcached_get_retry_count_ = 0;
-  tls_ticket_key_memcached_fail_count_ = 0;
-
-  schedule_next_tls_ticket_key_memcached_get(w);
-
-  if (!ticket_keys || ticket_keys->keys.empty()) {
-    LOG(WARN) << "Memcached: tls ticket keys are empty; tls ticket disabled";
-    set_ticket_keys(nullptr);
-    set_ticket_keys_to_worker(nullptr);
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "ticket keys get done";
-    LOG(INFO) << 0 << " enc+dec: "
-              << util::format_hex(ticket_keys->keys[0].data.name);
-    for (size_t i = 1; i < ticket_keys->keys.size(); ++i) {
-      auto &key = ticket_keys->keys[i];
-      LOG(INFO) << i << " dec: " << util::format_hex(key.data.name);
-    }
-  }
-
-  set_ticket_keys(ticket_keys);
-  set_ticket_keys_to_worker(ticket_keys);
-}
-
-void ConnectionHandler::schedule_next_tls_ticket_key_memcached_get(
-    ev_timer *w) {
-  ev_timer_set(w, get_config()->tls.ticket.memcached.interval, 0.);
-  ev_timer_start(loop_, w);
-}
-
-SSL_CTX *ConnectionHandler::create_tls_ticket_key_memcached_ssl_ctx() {
-  auto config = get_config();
-  auto &tlsconf = config->tls;
-  auto &memcachedconf = config->tls.ticket.memcached;
-
-  auto ssl_ctx = tls::create_ssl_client_context(
-#ifdef HAVE_NEVERBLEED
-      nb_,
-#endif // HAVE_NEVERBLEED
-      tlsconf.cacert, memcachedconf.cert_file, memcachedconf.private_key_file,
-      nullptr);
-
-  all_ssl_ctx_.push_back(ssl_ctx);
-
-  return ssl_ctx;
-}
-
-#ifdef HAVE_NEVERBLEED
-void ConnectionHandler::set_neverbleed(neverbleed_t *nb) { nb_ = nb; }
-#endif // HAVE_NEVERBLEED
-
-void ConnectionHandler::handle_serial_event() {
-  std::vector<SerialEvent> q;
-  {
-    std::lock_guard<std::mutex> g(serial_event_mu_);
-    q.swap(serial_events_);
-  }
-
-  for (auto &sev : q) {
-    switch (sev.type) {
-    case SEV_REPLACE_DOWNSTREAM:
-      // Mmake sure that none of worker uses
-      // get_config()->conn.downstream
-      mod_config()->conn.downstream = sev.downstreamconf;
-
-      if (single_worker_) {
-        single_worker_->replace_downstream_config(sev.downstreamconf);
-
-        break;
-      }
-
-      worker_replace_downstream(sev.downstreamconf);
-
-      break;
-    }
-  }
-}
-
-void ConnectionHandler::send_replace_downstream(
-    const std::shared_ptr<DownstreamConfig> &downstreamconf) {
-  send_serial_event(SerialEvent(SEV_REPLACE_DOWNSTREAM, downstreamconf));
-}
-
-void ConnectionHandler::send_serial_event(SerialEvent ev) {
-  {
-    std::lock_guard<std::mutex> g(serial_event_mu_);
-
-    serial_events_.push_back(std::move(ev));
-  }
-
-  ev_async_send(loop_, &serial_event_asyncev_);
-}
-
-SSL_CTX *ConnectionHandler::get_ssl_ctx(size_t idx) const {
-  return all_ssl_ctx_[idx];
-}
-
-const std::vector<SSL_CTX *> &
-ConnectionHandler::get_indexed_ssl_ctx(size_t idx) const {
-  return indexed_ssl_ctx_[idx];
-}
-
-void ConnectionHandler::set_enable_acceptor_on_ocsp_completion(bool f) {
-  enable_acceptor_on_ocsp_completion_ = f;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_connection_handler.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,232 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_CONNECTION_HANDLER_H
-#define SHRPX_CONNECTION_HANDLER_H
-
-#include "shrpx.h"
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-
-#include <mutex>
-#include <memory>
-#include <vector>
-#include <random>
-#ifndef NOTHREADS
-#  include <future>
-#endif // NOTHREADS
-
-#include <openssl/ssl.h>
-
-#include <ev.h>
-
-#ifdef HAVE_NEVERBLEED
-#  include <neverbleed.h>
-#endif // HAVE_NEVERBLEED
-
-#include "shrpx_downstream_connection_pool.h"
-#include "shrpx_config.h"
-#include "shrpx_exec.h"
-
-namespace shrpx {
-
-class Http2Session;
-class ConnectBlocker;
-class AcceptHandler;
-class Worker;
-struct WorkerStat;
-struct TicketKeys;
-class MemcachedDispatcher;
-struct UpstreamAddr;
-
-namespace tls {
-
-class CertLookupTree;
-
-} // namespace tls
-
-struct OCSPUpdateContext {
-  // ocsp response buffer
-  std::vector<uint8_t> resp;
-  // Process running fetch-ocsp-response script
-  Process proc;
-  // index to ConnectionHandler::all_ssl_ctx_, which points to next
-  // SSL_CTX to update ocsp response cache.
-  size_t next;
-  ev_child chldev;
-  ev_io rev;
-  // errno encountered while processing response
-  int error;
-};
-
-// SerialEvent is an event sent from Worker thread.
-enum SerialEventType {
-  SEV_NONE,
-  SEV_REPLACE_DOWNSTREAM,
-};
-
-struct SerialEvent {
-  // ctor for event uses DownstreamConfig
-  SerialEvent(int type, const std::shared_ptr<DownstreamConfig> &downstreamconf)
-      : type(type), downstreamconf(downstreamconf) {}
-
-  int type;
-  std::shared_ptr<DownstreamConfig> downstreamconf;
-};
-
-class ConnectionHandler {
-public:
-  ConnectionHandler(struct ev_loop *loop, std::mt19937 &gen);
-  ~ConnectionHandler();
-  int handle_connection(int fd, sockaddr *addr, int addrlen,
-                        const UpstreamAddr *faddr);
-  // Creates Worker object for single threaded configuration.
-  int create_single_worker();
-  // Creates |num| Worker objects for multi threaded configuration.
-  // The |num| must be strictly more than 1.
-  int create_worker_thread(size_t num);
-  void
-  set_ticket_keys_to_worker(const std::shared_ptr<TicketKeys> &ticket_keys);
-  void worker_reopen_log_files();
-  void set_ticket_keys(std::shared_ptr<TicketKeys> ticket_keys);
-  const std::shared_ptr<TicketKeys> &get_ticket_keys() const;
-  struct ev_loop *get_loop() const;
-  Worker *get_single_worker() const;
-  void add_acceptor(std::unique_ptr<AcceptHandler> h);
-  void delete_acceptor();
-  void enable_acceptor();
-  void disable_acceptor();
-  void sleep_acceptor(ev_tstamp t);
-  void accept_pending_connection();
-  void graceful_shutdown_worker();
-  void set_graceful_shutdown(bool f);
-  bool get_graceful_shutdown() const;
-  void join_worker();
-
-  // Cancels ocsp update process
-  void cancel_ocsp_update();
-  // Starts ocsp update for certficate |cert_file|.
-  int start_ocsp_update(const char *cert_file);
-  // Reads incoming data from ocsp update process
-  void read_ocsp_chunk();
-  // Handles the completion of one ocsp update
-  void handle_ocsp_complete();
-  // Resets ocsp_;
-  void reset_ocsp();
-  // Proceeds to the next certificate's ocsp update.  If all
-  // certificates' ocsp update has been done, schedule next ocsp
-  // update.
-  void proceed_next_cert_ocsp();
-
-  void set_tls_ticket_key_memcached_dispatcher(
-      std::unique_ptr<MemcachedDispatcher> dispatcher);
-
-  MemcachedDispatcher *get_tls_ticket_key_memcached_dispatcher() const;
-  void on_tls_ticket_key_network_error(ev_timer *w);
-  void on_tls_ticket_key_not_found(ev_timer *w);
-  void
-  on_tls_ticket_key_get_success(const std::shared_ptr<TicketKeys> &ticket_keys,
-                                ev_timer *w);
-  void schedule_next_tls_ticket_key_memcached_get(ev_timer *w);
-  SSL_CTX *create_tls_ticket_key_memcached_ssl_ctx();
-  // Returns the SSL_CTX at all_ssl_ctx_[idx].  This does not perform
-  // array bound checking.
-  SSL_CTX *get_ssl_ctx(size_t idx) const;
-
-  const std::vector<SSL_CTX *> &get_indexed_ssl_ctx(size_t idx) const;
-
-#ifdef HAVE_NEVERBLEED
-  void set_neverbleed(neverbleed_t *nb);
-#endif // HAVE_NEVERBLEED
-
-  // Send SerialEvent SEV_REPLACE_DOWNSTREAM to this object.
-  void send_replace_downstream(
-      const std::shared_ptr<DownstreamConfig> &downstreamconf);
-  // Internal function to send |ev| to this object.
-  void send_serial_event(SerialEvent ev);
-  // Handles SerialEvents received.
-  void handle_serial_event();
-  // Sends WorkerEvent to make them replace downstream.
-  void
-  worker_replace_downstream(std::shared_ptr<DownstreamConfig> downstreamconf);
-
-  void set_enable_acceptor_on_ocsp_completion(bool f);
-
-private:
-  // Stores all SSL_CTX objects.
-  std::vector<SSL_CTX *> all_ssl_ctx_;
-  // Stores all SSL_CTX objects in a way that its index is stored in
-  // cert_tree.  The SSL_CTXs stored in the same index share the same
-  // hostname, but could have different signature algorithm.  The
-  // selection among them are performed by hostname presented by SNI,
-  // and signature algorithm presented by client.
-  std::vector<std::vector<SSL_CTX *>> indexed_ssl_ctx_;
-  OCSPUpdateContext ocsp_;
-  std::mt19937 &gen_;
-  // ev_loop for each worker
-  std::vector<struct ev_loop *> worker_loops_;
-  // Worker instances when multi threaded mode (-nN, N >= 2) is used.
-  // If at least one frontend enables API request, we allocate 1
-  // additional worker dedicated to API request .
-  std::vector<std::unique_ptr<Worker>> workers_;
-  // mutex for serial event resive buffer handling
-  std::mutex serial_event_mu_;
-  // SerialEvent receive buffer
-  std::vector<SerialEvent> serial_events_;
-  // Worker instance used when single threaded mode (-n1) is used.
-  // Otherwise, nullptr and workers_ has instances of Worker instead.
-  std::unique_ptr<Worker> single_worker_;
-  std::unique_ptr<tls::CertLookupTree> cert_tree_;
-  std::unique_ptr<MemcachedDispatcher> tls_ticket_key_memcached_dispatcher_;
-  // Current TLS session ticket keys.  Note that TLS connection does
-  // not refer to this field directly.  They use TicketKeys object in
-  // Worker object.
-  std::shared_ptr<TicketKeys> ticket_keys_;
-  struct ev_loop *loop_;
-  std::vector<std::unique_ptr<AcceptHandler>> acceptors_;
-#ifdef HAVE_NEVERBLEED
-  neverbleed_t *nb_;
-#endif // HAVE_NEVERBLEED
-  ev_timer disable_acceptor_timer_;
-  ev_timer ocsp_timer_;
-  ev_async thread_join_asyncev_;
-  ev_async serial_event_asyncev_;
-#ifndef NOTHREADS
-  std::future<void> thread_join_fut_;
-#endif // NOTHREADS
-  size_t tls_ticket_key_memcached_get_retry_count_;
-  size_t tls_ticket_key_memcached_fail_count_;
-  unsigned int worker_round_robin_cnt_;
-  bool graceful_shutdown_;
-  // true if acceptors should be enabled after the initial ocsp update
-  // has finished.
-  bool enable_acceptor_on_ocsp_completion_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_CONNECTION_HANDLER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,352 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_dns_resolver.h"
-
-#include <cstring>
-#include <sys/time.h>
-
-#include "shrpx_log.h"
-#include "shrpx_connection.h"
-#include "shrpx_config.h"
-
-namespace shrpx {
-
-namespace {
-void sock_state_cb(void *data, int s, int read, int write) {
-  auto resolv = static_cast<DNSResolver *>(data);
-
-  if (resolv->get_status(nullptr) != DNS_STATUS_RUNNING) {
-    return;
-  }
-
-  if (read) {
-    resolv->start_rev(s);
-  } else {
-    resolv->stop_rev(s);
-  }
-  if (write) {
-    resolv->start_wev(s);
-  } else {
-    resolv->stop_wev(s);
-  }
-}
-} // namespace
-
-namespace {
-void host_cb(void *arg, int status, int timeouts, hostent *hostent) {
-  auto resolv = static_cast<DNSResolver *>(arg);
-  resolv->on_result(status, hostent);
-}
-} // namespace
-
-namespace {
-void process_result(DNSResolver *resolv) {
-  auto cb = resolv->get_complete_cb();
-  if (!cb) {
-    return;
-  }
-  Address result;
-  auto status = resolv->get_status(&result);
-  switch (status) {
-  case DNS_STATUS_OK:
-  case DNS_STATUS_ERROR:
-    cb(status, &result);
-    break;
-  }
-  // resolv may be deleted here.
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto resolv = static_cast<DNSResolver *>(w->data);
-  resolv->on_read(w->fd);
-  process_result(resolv);
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto resolv = static_cast<DNSResolver *>(w->data);
-  resolv->on_write(w->fd);
-  process_result(resolv);
-}
-} // namespace
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto resolv = static_cast<DNSResolver *>(w->data);
-  resolv->on_timeout();
-  process_result(resolv);
-}
-} // namespace
-
-namespace {
-void stop_ev(struct ev_loop *loop,
-             const std::vector<std::unique_ptr<ev_io>> &evs) {
-  for (auto &w : evs) {
-    ev_io_stop(loop, w.get());
-  }
-}
-} // namespace
-
-DNSResolver::DNSResolver(struct ev_loop *loop)
-    : result_{},
-      loop_(loop),
-      channel_(nullptr),
-      family_(AF_UNSPEC),
-      status_(DNS_STATUS_IDLE) {
-  ev_timer_init(&timer_, timeoutcb, 0., 0.);
-  timer_.data = this;
-}
-
-DNSResolver::~DNSResolver() {
-  if (channel_) {
-    ares_destroy(channel_);
-  }
-
-  stop_ev(loop_, revs_);
-  stop_ev(loop_, wevs_);
-
-  ev_timer_stop(loop_, &timer_);
-}
-
-int DNSResolver::resolve(const StringRef &name, int family) {
-  if (status_ != DNS_STATUS_IDLE) {
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Start resolving host " << name << " in IPv"
-              << (family == AF_INET ? "4" : "6");
-  }
-
-  name_ = name;
-  family_ = family;
-
-  int rv;
-
-  auto &dnsconf = get_config()->dns;
-
-  ares_options opts{};
-  opts.sock_state_cb = sock_state_cb;
-  opts.sock_state_cb_data = this;
-  opts.timeout = static_cast<int>(dnsconf.timeout.lookup * 1000);
-  opts.tries = dnsconf.max_try;
-
-  auto optmask = ARES_OPT_SOCK_STATE_CB | ARES_OPT_TIMEOUTMS | ARES_OPT_TRIES;
-
-  ares_channel chan;
-  rv = ares_init_options(&chan, &opts, optmask);
-  if (rv != ARES_SUCCESS) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "ares_init_options failed: " << ares_strerror(rv);
-    }
-    status_ = DNS_STATUS_ERROR;
-    return -1;
-  }
-
-  channel_ = chan;
-  status_ = DNS_STATUS_RUNNING;
-
-  ares_gethostbyname(channel_, name_.c_str(), family_, host_cb, this);
-  reset_timeout();
-
-  return 0;
-}
-
-int DNSResolver::on_read(int fd) { return handle_event(fd, ARES_SOCKET_BAD); }
-
-int DNSResolver::on_write(int fd) { return handle_event(ARES_SOCKET_BAD, fd); }
-
-int DNSResolver::on_timeout() {
-  return handle_event(ARES_SOCKET_BAD, ARES_SOCKET_BAD);
-}
-
-int DNSResolver::handle_event(int rfd, int wfd) {
-  if (status_ == DNS_STATUS_IDLE) {
-    return -1;
-  }
-
-  ares_process_fd(channel_, rfd, wfd);
-
-  switch (status_) {
-  case DNS_STATUS_RUNNING: {
-    reset_timeout();
-    return 0;
-  }
-  case DNS_STATUS_OK:
-    return 0;
-  case DNS_STATUS_ERROR:
-    return -1;
-  default:
-    // Unreachable
-    assert(0);
-    abort();
-  }
-}
-
-void DNSResolver::reset_timeout() {
-  if (status_ != DNS_STATUS_RUNNING) {
-    return;
-  }
-  timeval tvout;
-  auto tv = ares_timeout(channel_, nullptr, &tvout);
-  if (tv == nullptr) {
-    return;
-  }
-  // To avoid that timer_.repeat becomes 0, which makes ev_timer_again
-  // useless, add tiny fraction of time.
-  timer_.repeat = tv->tv_sec + tv->tv_usec / 1000000. + 1e-9;
-  ev_timer_again(loop_, &timer_);
-}
-
-int DNSResolver::get_status(Address *result) const {
-  if (status_ != DNS_STATUS_OK) {
-    return status_;
-  }
-
-  if (result) {
-    memcpy(result, &result_, sizeof(result_));
-  }
-
-  return status_;
-}
-
-namespace {
-void start_ev(std::vector<std::unique_ptr<ev_io>> &evs, struct ev_loop *loop,
-              int fd, int event, IOCb cb, void *data) {
-  for (auto &w : evs) {
-    if (w->fd == fd) {
-      return;
-    }
-  }
-  for (auto &w : evs) {
-    if (w->fd == -1) {
-      ev_io_set(w.get(), fd, event);
-      ev_io_start(loop, w.get());
-      return;
-    }
-  }
-
-  auto w = make_unique<ev_io>();
-  ev_io_init(w.get(), cb, fd, event);
-  w->data = data;
-  ev_io_start(loop, w.get());
-  evs.emplace_back(std::move(w));
-}
-} // namespace
-
-namespace {
-void stop_ev(std::vector<std::unique_ptr<ev_io>> &evs, struct ev_loop *loop,
-             int fd, int event) {
-  for (auto &w : evs) {
-    if (w->fd == fd) {
-      ev_io_stop(loop, w.get());
-      ev_io_set(w.get(), -1, event);
-      return;
-    }
-  }
-}
-} // namespace
-
-void DNSResolver::start_rev(int fd) {
-  start_ev(revs_, loop_, fd, EV_READ, readcb, this);
-}
-
-void DNSResolver::stop_rev(int fd) { stop_ev(revs_, loop_, fd, EV_READ); }
-
-void DNSResolver::start_wev(int fd) {
-  start_ev(wevs_, loop_, fd, EV_WRITE, writecb, this);
-}
-
-void DNSResolver::stop_wev(int fd) { stop_ev(wevs_, loop_, fd, EV_WRITE); }
-
-void DNSResolver::on_result(int status, hostent *hostent) {
-  stop_ev(loop_, revs_);
-  stop_ev(loop_, wevs_);
-  ev_timer_stop(loop_, &timer_);
-
-  if (status != ARES_SUCCESS) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Name lookup for " << name_
-                << " failed: " << ares_strerror(status);
-    }
-    status_ = DNS_STATUS_ERROR;
-    return;
-  }
-
-  auto ap = *hostent->h_addr_list;
-  if (!ap) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Name lookup for " << name_ << "failed: no address returned";
-    }
-    status_ = DNS_STATUS_ERROR;
-    return;
-  }
-
-  switch (hostent->h_addrtype) {
-  case AF_INET:
-    status_ = DNS_STATUS_OK;
-    result_.len = sizeof(result_.su.in);
-    result_.su.in = {};
-    result_.su.in.sin_family = AF_INET;
-#ifdef HAVE_SOCKADDR_IN_SIN_LEN
-    result_.su.in.sin_len = sizeof(result_.su.in);
-#endif // HAVE_SOCKADDR_IN_SIN_LEN
-    memcpy(&result_.su.in.sin_addr, ap, sizeof(result_.su.in.sin_addr));
-    break;
-  case AF_INET6:
-    status_ = DNS_STATUS_OK;
-    result_.len = sizeof(result_.su.in6);
-    result_.su.in6 = {};
-    result_.su.in6.sin6_family = AF_INET6;
-#ifdef HAVE_SOCKADDR_IN6_SIN6_LEN
-    result_.su.in6.sin6_len = sizeof(result_.su.in6);
-#endif // HAVE_SOCKADDR_IN6_SIN6_LEN
-    memcpy(&result_.su.in6.sin6_addr, ap, sizeof(result_.su.in6.sin6_addr));
-    break;
-  default:
-    assert(0);
-  }
-
-  if (status_ == DNS_STATUS_OK) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Name lookup succeeded: " << name_ << " -> "
-                << util::numeric_name(&result_.su.sa, result_.len);
-    }
-    return;
-  }
-
-  status_ = DNS_STATUS_ERROR;
-}
-
-void DNSResolver::set_complete_cb(CompleteCb cb) {
-  completeCb_ = std::move(cb);
-}
-
-CompleteCb DNSResolver::get_complete_cb() const { return completeCb_; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_resolver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DNS_RESOLVER_H
-#define SHRPX_DNS_RESOLVER_H
-
-#include "shrpx.h"
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <vector>
-
-#include <ev.h>
-#include <ares.h>
-
-#include "template.h"
-#include "network.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-enum DNSResolverStatus {
-  // Resolver is in initial status
-  DNS_STATUS_IDLE,
-  // Resolver is currently resolving host name
-  DNS_STATUS_RUNNING,
-  // Resolver successfully resolved host name
-  DNS_STATUS_OK,
-  // Resolver failed to resolve host name
-  DNS_STATUS_ERROR,
-};
-
-// Callback function called when host name lookup is finished.
-// |status| is either DNS_STATUS_OK, or DNS_STATUS_ERROR.  If |status|
-// is DNS_STATUS_OK, |result| points to the resolved address.  Note
-// that port portion of |result| is undefined, and must be initialized
-// by application.  This callback function is not called if name
-// lookup finishes in DNSResolver::resolve() completely.  In this
-// case, application should call DNSResolver::get_status() to get
-// current status and result.  In other words, callback is called if
-// get_status() returns DNS_STATUS_RUNNING.
-using CompleteCb = std::function<void(int status, const Address *result)>;
-
-// DNSResolver is asynchronous name resolver, backed by c-ares
-// library.
-class DNSResolver {
-public:
-  DNSResolver(struct ev_loop *loop);
-  ~DNSResolver();
-
-  // Starts resolving hostname |name|.
-  int resolve(const StringRef &name, int family);
-  // Returns status.  If status_ is DNS_STATUS_SUCCESS && |result| is
-  // not nullptr, |*result| is filled.
-  int get_status(Address *result) const;
-  // Sets callback function when name lookup finishes.  The callback
-  // function is called in a way that it can destroy this DNSResolver.
-  void set_complete_cb(CompleteCb cb);
-  CompleteCb get_complete_cb() const;
-
-  // Calls these functions when read/write event occurred respectively.
-  int on_read(int fd);
-  int on_write(int fd);
-  int on_timeout();
-  // Calls this function when DNS query finished.
-  void on_result(int staus, hostent *hostent);
-  void reset_timeout();
-
-  void start_rev(int fd);
-  void stop_rev(int fd);
-  void start_wev(int fd);
-  void stop_wev(int fd);
-
-private:
-  int handle_event(int rfd, int wfd);
-
-  std::vector<std::unique_ptr<ev_io>> revs_, wevs_;
-  Address result_;
-  CompleteCb completeCb_;
-  ev_timer timer_;
-  StringRef name_;
-  struct ev_loop *loop_;
-  // ares_channel is pointer type
-  ares_channel channel_;
-  // AF_INET or AF_INET6.  AF_INET for A record lookup, and AF_INET6
-  // for AAAA record lookup.
-  int family_;
-  int status_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DNS_RESOLVER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_dns_tracker.h"
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-#include "util.h"
-
-namespace shrpx {
-
-namespace {
-void gccb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto dns_tracker = static_cast<DNSTracker *>(w->data);
-  dns_tracker->gc();
-}
-} // namespace
-
-DNSTracker::DNSTracker(struct ev_loop *loop) : loop_(loop) {
-  ev_timer_init(&gc_timer_, gccb, 0., 12_h);
-  gc_timer_.data = this;
-}
-
-DNSTracker::~DNSTracker() {
-  ev_timer_stop(loop_, &gc_timer_);
-
-  for (auto &p : ents_) {
-    auto &qlist = p.second.qlist;
-    while (!qlist.empty()) {
-      auto head = qlist.head;
-      qlist.remove(head);
-      head->status = DNS_STATUS_ERROR;
-      head->in_qlist = false;
-      // TODO Not sure we should call callback here, or it is even be
-      // safe to do that.
-    }
-  }
-}
-
-ResolverEntry DNSTracker::make_entry(std::unique_ptr<DualDNSResolver> resolv,
-                                     ImmutableString host, int status,
-                                     const Address *result) {
-  auto &dnsconf = get_config()->dns;
-
-  auto ent = ResolverEntry{};
-  ent.resolv = std::move(resolv);
-  ent.host = std::move(host);
-  ent.status = status;
-  switch (status) {
-  case DNS_STATUS_ERROR:
-  case DNS_STATUS_OK:
-    ent.expiry = ev_now(loop_) + dnsconf.timeout.cache;
-    break;
-  }
-  if (result) {
-    ent.result = *result;
-  }
-  return ent;
-}
-
-void DNSTracker::update_entry(ResolverEntry &ent,
-                              std::unique_ptr<DualDNSResolver> resolv,
-                              int status, const Address *result) {
-  auto &dnsconf = get_config()->dns;
-
-  ent.resolv = std::move(resolv);
-  ent.status = status;
-  switch (status) {
-  case DNS_STATUS_ERROR:
-  case DNS_STATUS_OK:
-    ent.expiry = ev_now(loop_) + dnsconf.timeout.cache;
-    break;
-  }
-  if (result) {
-    ent.result = *result;
-  }
-}
-
-int DNSTracker::resolve(Address *result, DNSQuery *dnsq) {
-  int rv;
-
-  auto it = ents_.find(dnsq->host);
-
-  if (it == std::end(ents_)) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "DNS entry not found for " << dnsq->host;
-    }
-
-    auto resolv = make_unique<DualDNSResolver>(loop_);
-    auto host_copy =
-        ImmutableString{std::begin(dnsq->host), std::end(dnsq->host)};
-    auto host = StringRef{host_copy};
-
-    rv = resolv->resolve(host);
-    if (rv != 0) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Name lookup failed for " << host;
-      }
-
-      ents_.emplace(host, make_entry(nullptr, std::move(host_copy),
-                                     DNS_STATUS_ERROR, nullptr));
-
-      start_gc_timer();
-
-      return DNS_STATUS_ERROR;
-    }
-
-    rv = resolv->get_status(result);
-    switch (rv) {
-    case DNS_STATUS_ERROR: {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Name lookup failed for " << host;
-      }
-
-      ents_.emplace(host, make_entry(nullptr, std::move(host_copy),
-                                     DNS_STATUS_ERROR, nullptr));
-
-      start_gc_timer();
-
-      return DNS_STATUS_ERROR;
-    }
-    case DNS_STATUS_OK: {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Name lookup succeeded: " << host << " -> "
-                  << util::numeric_name(&result->su.sa, result->len);
-      }
-
-      ents_.emplace(host, make_entry(nullptr, std::move(host_copy),
-                                     DNS_STATUS_OK, result));
-
-      start_gc_timer();
-
-      return DNS_STATUS_OK;
-    }
-    case DNS_STATUS_RUNNING: {
-      assert(rv == DNS_STATUS_RUNNING);
-
-      auto p = ents_.emplace(host,
-                             make_entry(std::move(resolv), std::move(host_copy),
-                                        DNS_STATUS_RUNNING, nullptr));
-
-      start_gc_timer();
-
-      auto &ent = (*p.first).second;
-
-      add_to_qlist(ent, dnsq);
-
-      return DNS_STATUS_RUNNING;
-    }
-    default:
-      assert(0);
-    }
-  }
-
-  auto &ent = (*it).second;
-
-  if (ent.status != DNS_STATUS_RUNNING && ent.expiry < ev_now(loop_)) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "DNS entry found for " << dnsq->host
-                << ", but it has been expired";
-    }
-
-    auto resolv = make_unique<DualDNSResolver>(loop_);
-    auto host = StringRef{ent.host};
-
-    rv = resolv->resolve(host);
-    if (rv != 0) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Name lookup failed for " << host;
-      }
-
-      update_entry(ent, nullptr, DNS_STATUS_ERROR, nullptr);
-
-      return DNS_STATUS_ERROR;
-    }
-
-    rv = resolv->get_status(result);
-    switch (rv) {
-    case DNS_STATUS_ERROR: {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Name lookup failed for " << host;
-      }
-
-      update_entry(ent, nullptr, DNS_STATUS_ERROR, nullptr);
-
-      return DNS_STATUS_ERROR;
-    }
-    case DNS_STATUS_OK: {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Name lookup succeeded: " << host << " -> "
-                  << util::numeric_name(&result->su.sa, result->len);
-      }
-
-      update_entry(ent, nullptr, DNS_STATUS_OK, result);
-
-      return DNS_STATUS_OK;
-    }
-    case DNS_STATUS_RUNNING: {
-      update_entry(ent, std::move(resolv), DNS_STATUS_RUNNING, nullptr);
-      add_to_qlist(ent, dnsq);
-
-      return DNS_STATUS_RUNNING;
-    }
-    default:
-      assert(0);
-    }
-  }
-
-  switch (ent.status) {
-  case DNS_STATUS_RUNNING:
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Waiting for name lookup complete for " << dnsq->host;
-    }
-    ent.qlist.append(dnsq);
-    dnsq->in_qlist = true;
-    return DNS_STATUS_RUNNING;
-  case DNS_STATUS_ERROR:
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Name lookup failed for " << dnsq->host << " (cached)";
-    }
-    return DNS_STATUS_ERROR;
-  case DNS_STATUS_OK:
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Name lookup succeeded (cached): " << dnsq->host << " -> "
-                << util::numeric_name(&ent.result.su.sa, ent.result.len);
-    }
-    if (result) {
-      memcpy(result, &ent.result, sizeof(*result));
-    }
-    return DNS_STATUS_OK;
-  default:
-    assert(0);
-    abort();
-  }
-}
-
-void DNSTracker::add_to_qlist(ResolverEntry &ent, DNSQuery *dnsq) {
-  auto loop = loop_;
-  ent.resolv->set_complete_cb([&ent, loop](int status, const Address *result) {
-    auto &qlist = ent.qlist;
-    while (!qlist.empty()) {
-      auto head = qlist.head;
-      qlist.remove(head);
-      head->status = status;
-      head->in_qlist = false;
-      auto cb = head->cb;
-      cb(status, result);
-    }
-
-    auto &dnsconf = get_config()->dns;
-
-    ent.resolv.reset();
-    ent.status = status;
-    ent.expiry = ev_now(loop) + dnsconf.timeout.cache;
-    if (ent.status == DNS_STATUS_OK) {
-      ent.result = *result;
-    }
-  });
-  ent.qlist.append(dnsq);
-  dnsq->in_qlist = true;
-}
-
-void DNSTracker::cancel(DNSQuery *dnsq) {
-  if (!dnsq->in_qlist) {
-    return;
-  }
-
-  auto it = ents_.find(dnsq->host);
-  if (it == std::end(ents_)) {
-    return;
-  }
-
-  auto &ent = (*it).second;
-  ent.qlist.remove(dnsq);
-  dnsq->in_qlist = false;
-}
-
-void DNSTracker::start_gc_timer() {
-  if (ev_is_active(&gc_timer_)) {
-    return;
-  }
-
-  ev_timer_again(loop_, &gc_timer_);
-}
-
-void DNSTracker::gc() {
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Starting removing expired DNS cache entries";
-  }
-
-  auto now = ev_now(loop_);
-  for (auto it = std::begin(ents_); it != std::end(ents_);) {
-    auto &ent = (*it).second;
-    if (ent.expiry >= now) {
-      ++it;
-      continue;
-    }
-
-    it = ents_.erase(it);
-  }
-
-  if (ents_.empty()) {
-    ev_timer_stop(loop_, &gc_timer_);
-  }
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dns_tracker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DNS_TRACKER_H
-#define SHRPX_DNS_TRACKER_H
-
-#include "shrpx.h"
-
-#include <map>
-
-#include "shrpx_dual_dns_resolver.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-struct DNSQuery {
-  DNSQuery(StringRef host, CompleteCb cb)
-      : host(std::move(host)),
-        cb(std::move(cb)),
-        dlnext(nullptr),
-        dlprev(nullptr),
-        status(DNS_STATUS_IDLE),
-        in_qlist(false) {}
-
-  // Host name we lookup for.
-  StringRef host;
-  // Callback function called when name lookup finished.  This
-  // callback is not called if name lookup finishes within
-  // DNSTracker::resolve().
-  CompleteCb cb;
-  DNSQuery *dlnext, *dlprev;
-  int status;
-  // true if this object is in linked list ResolverEntry::qlist.
-  bool in_qlist;
-};
-
-struct ResolverEntry {
-  // Host name this entry lookups for.
-  ImmutableString host;
-  // DNS resolver.  Only non-nullptr if status is DNS_STATUS_RUNNING.
-  std::unique_ptr<DualDNSResolver> resolv;
-  // DNSQuery interested in this name lookup result.  The result is
-  // notified to them all.
-  DList<DNSQuery> qlist;
-  // Use the same enum with DNSResolverStatus
-  int status;
-  // result and its expiry time
-  Address result;
-  // time point when cached result expires.
-  ev_tstamp expiry;
-};
-
-class DNSTracker {
-public:
-  DNSTracker(struct ev_loop *loop);
-  ~DNSTracker();
-
-  // Lookups host name described in |dnsq|.  If name lookup finishes
-  // within this function (either it came from /etc/hosts, host name
-  // is numeric, lookup result is cached, etc), it returns
-  // DNS_STATUS_OK or DNS_STATUS_ERROR.  If lookup is successful,
-  // DNS_STATUS_OK is returned, and |result| is filled.  If lookup
-  // failed, DNS_STATUS_ERROR is returned.  If name lookup is being
-  // done background, it returns DNS_STATUS_RUNNING.  Its completion
-  // is notified by calling dnsq->cb.
-  int resolve(Address *result, DNSQuery *dnsq);
-  // Cancels name lookup requested by |dnsq|.
-  void cancel(DNSQuery *dnsq);
-  // Removes expired entries from ents_.
-  void gc();
-  // Starts GC timer.
-  void start_gc_timer();
-
-private:
-  ResolverEntry make_entry(std::unique_ptr<DualDNSResolver> resolv,
-                           ImmutableString host, int status,
-                           const Address *result);
-
-  void update_entry(ResolverEntry &ent, std::unique_ptr<DualDNSResolver> resolv,
-                    int status, const Address *result);
-
-  void add_to_qlist(ResolverEntry &ent, DNSQuery *dnsq);
-
-  std::map<StringRef, ResolverEntry> ents_;
-  // Periodically iterates ents_, and removes expired entries to avoid
-  // excessive use of memory.  Since only backend API can potentially
-  // increase memory consumption, interval could be very long.
-  ev_timer gc_timer_;
-  struct ev_loop *loop_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DNS_TRACKER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1106 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_downstream.h"
-
-#include <cassert>
-
-#include "http-parser/http_parser.h"
-
-#include "shrpx_upstream.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_config.h"
-#include "shrpx_error.h"
-#include "shrpx_downstream_connection.h"
-#include "shrpx_downstream_queue.h"
-#include "shrpx_worker.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_log.h"
-#ifdef HAVE_MRUBY
-#  include "shrpx_mruby.h"
-#endif // HAVE_MRUBY
-#include "util.h"
-#include "http2.h"
-
-namespace shrpx {
-
-namespace {
-void upstream_timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto downstream = static_cast<Downstream *>(w->data);
-  auto upstream = downstream->get_upstream();
-
-  auto which = revents == EV_READ ? "read" : "write";
-
-  if (LOG_ENABLED(INFO)) {
-    DLOG(INFO, downstream) << "upstream timeout stream_id="
-                           << downstream->get_stream_id() << " event=" << which;
-  }
-
-  downstream->disable_upstream_rtimer();
-  downstream->disable_upstream_wtimer();
-
-  upstream->on_timeout(downstream);
-}
-} // namespace
-
-namespace {
-void upstream_rtimeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  upstream_timeoutcb(loop, w, EV_READ);
-}
-} // namespace
-
-namespace {
-void upstream_wtimeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  upstream_timeoutcb(loop, w, EV_WRITE);
-}
-} // namespace
-
-namespace {
-void downstream_timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto downstream = static_cast<Downstream *>(w->data);
-
-  auto which = revents == EV_READ ? "read" : "write";
-
-  if (LOG_ENABLED(INFO)) {
-    DLOG(INFO, downstream) << "downstream timeout stream_id="
-                           << downstream->get_downstream_stream_id()
-                           << " event=" << which;
-  }
-
-  downstream->disable_downstream_rtimer();
-  downstream->disable_downstream_wtimer();
-
-  auto dconn = downstream->get_downstream_connection();
-
-  if (dconn) {
-    dconn->on_timeout();
-  }
-}
-} // namespace
-
-namespace {
-void downstream_rtimeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  downstream_timeoutcb(loop, w, EV_READ);
-}
-} // namespace
-
-namespace {
-void downstream_wtimeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  downstream_timeoutcb(loop, w, EV_WRITE);
-}
-} // namespace
-
-// upstream could be nullptr for unittests
-Downstream::Downstream(Upstream *upstream, MemchunkPool *mcpool,
-                       int32_t stream_id)
-    : dlnext(nullptr),
-      dlprev(nullptr),
-      response_sent_body_length(0),
-      balloc_(1024, 1024),
-      req_(balloc_),
-      resp_(balloc_),
-      request_start_time_(std::chrono::high_resolution_clock::now()),
-      blocked_request_buf_(mcpool),
-      request_buf_(mcpool),
-      response_buf_(mcpool),
-      upstream_(upstream),
-      blocked_link_(nullptr),
-      addr_(nullptr),
-      num_retry_(0),
-      stream_id_(stream_id),
-      assoc_stream_id_(-1),
-      downstream_stream_id_(-1),
-      response_rst_stream_error_code_(NGHTTP2_NO_ERROR),
-      affinity_cookie_(0),
-      request_state_(INITIAL),
-      response_state_(INITIAL),
-      dispatch_state_(DISPATCH_NONE),
-      upgraded_(false),
-      chunked_request_(false),
-      chunked_response_(false),
-      expect_final_response_(false),
-      request_pending_(false),
-      request_header_sent_(false),
-      accesslog_written_(false),
-      new_affinity_cookie_(false),
-      blocked_request_data_eof_(false) {
-
-  auto &timeoutconf = get_config()->http2.timeout;
-
-  ev_timer_init(&upstream_rtimer_, &upstream_rtimeoutcb, 0.,
-                timeoutconf.stream_read);
-  ev_timer_init(&upstream_wtimer_, &upstream_wtimeoutcb, 0.,
-                timeoutconf.stream_write);
-  ev_timer_init(&downstream_rtimer_, &downstream_rtimeoutcb, 0.,
-                timeoutconf.stream_read);
-  ev_timer_init(&downstream_wtimer_, &downstream_wtimeoutcb, 0.,
-                timeoutconf.stream_write);
-
-  upstream_rtimer_.data = this;
-  upstream_wtimer_.data = this;
-  downstream_rtimer_.data = this;
-  downstream_wtimer_.data = this;
-
-  rcbufs_.reserve(32);
-}
-
-Downstream::~Downstream() {
-  if (LOG_ENABLED(INFO)) {
-    DLOG(INFO, this) << "Deleting";
-  }
-
-  // check nullptr for unittest
-  if (upstream_) {
-    auto loop = upstream_->get_client_handler()->get_loop();
-
-    ev_timer_stop(loop, &upstream_rtimer_);
-    ev_timer_stop(loop, &upstream_wtimer_);
-    ev_timer_stop(loop, &downstream_rtimer_);
-    ev_timer_stop(loop, &downstream_wtimer_);
-
-#ifdef HAVE_MRUBY
-    auto handler = upstream_->get_client_handler();
-    auto worker = handler->get_worker();
-    auto mruby_ctx = worker->get_mruby_context();
-
-    mruby_ctx->delete_downstream(this);
-#endif // HAVE_MRUBY
-  }
-
-#ifdef HAVE_MRUBY
-  if (dconn_) {
-    const auto &group = dconn_->get_downstream_addr_group();
-    if (group) {
-      const auto &mruby_ctx = group->mruby_ctx;
-      mruby_ctx->delete_downstream(this);
-    }
-  }
-#endif // HAVE_MRUBY
-
-  // DownstreamConnection may refer to this object.  Delete it now
-  // explicitly.
-  dconn_.reset();
-
-  for (auto rcbuf : rcbufs_) {
-    nghttp2_rcbuf_decref(rcbuf);
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    DLOG(INFO, this) << "Deleted";
-  }
-}
-
-int Downstream::attach_downstream_connection(
-    std::unique_ptr<DownstreamConnection> dconn) {
-  if (dconn->attach_downstream(this) != 0) {
-    return -1;
-  }
-
-  dconn_ = std::move(dconn);
-
-  return 0;
-}
-
-void Downstream::detach_downstream_connection() {
-  if (!dconn_) {
-    return;
-  }
-
-#ifdef HAVE_MRUBY
-  const auto &group = dconn_->get_downstream_addr_group();
-  if (group) {
-    const auto &mruby_ctx = group->mruby_ctx;
-    mruby_ctx->delete_downstream(this);
-  }
-#endif // HAVE_MRUBY
-
-  dconn_->detach_downstream(this);
-
-  auto handler = dconn_->get_client_handler();
-
-  handler->pool_downstream_connection(
-      std::unique_ptr<DownstreamConnection>(dconn_.release()));
-}
-
-DownstreamConnection *Downstream::get_downstream_connection() {
-  return dconn_.get();
-}
-
-std::unique_ptr<DownstreamConnection> Downstream::pop_downstream_connection() {
-#ifdef HAVE_MRUBY
-  if (!dconn_) {
-    return nullptr;
-  }
-
-  const auto &group = dconn_->get_downstream_addr_group();
-  if (group) {
-    const auto &mruby_ctx = group->mruby_ctx;
-    mruby_ctx->delete_downstream(this);
-  }
-#endif // HAVE_MRUBY
-
-  return std::unique_ptr<DownstreamConnection>(dconn_.release());
-}
-
-void Downstream::pause_read(IOCtrlReason reason) {
-  if (dconn_) {
-    dconn_->pause_read(reason);
-  }
-}
-
-int Downstream::resume_read(IOCtrlReason reason, size_t consumed) {
-  if (dconn_) {
-    return dconn_->resume_read(reason, consumed);
-  }
-
-  return 0;
-}
-
-void Downstream::force_resume_read() {
-  if (dconn_) {
-    dconn_->force_resume_read();
-  }
-}
-
-namespace {
-const HeaderRefs::value_type *
-search_header_linear_backwards(const HeaderRefs &headers,
-                               const StringRef &name) {
-  for (auto it = headers.rbegin(); it != headers.rend(); ++it) {
-    auto &kv = *it;
-    if (kv.name == name) {
-      return &kv;
-    }
-  }
-  return nullptr;
-}
-} // namespace
-
-StringRef Downstream::assemble_request_cookie() {
-  size_t len = 0;
-
-  for (auto &kv : req_.fs.headers()) {
-    if (kv.token != http2::HD_COOKIE || kv.value.empty()) {
-      continue;
-    }
-
-    len += kv.value.size() + str_size("; ");
-  }
-
-  auto iov = make_byte_ref(balloc_, len + 1);
-  auto p = iov.base;
-
-  for (auto &kv : req_.fs.headers()) {
-    if (kv.token != http2::HD_COOKIE || kv.value.empty()) {
-      continue;
-    }
-
-    auto end = std::end(kv.value);
-    for (auto it = std::begin(kv.value) + kv.value.size();
-         it != std::begin(kv.value); --it) {
-      auto c = *(it - 1);
-      if (c == ' ' || c == ';') {
-        continue;
-      }
-      end = it;
-      break;
-    }
-
-    p = std::copy(std::begin(kv.value), end, p);
-    p = util::copy_lit(p, "; ");
-  }
-
-  // cut trailing "; "
-  if (p - iov.base >= 2) {
-    p -= 2;
-  }
-
-  return StringRef{iov.base, p};
-}
-
-uint32_t Downstream::find_affinity_cookie(const StringRef &name) {
-  for (auto &kv : req_.fs.headers()) {
-    if (kv.token != http2::HD_COOKIE) {
-      continue;
-    }
-
-    for (auto it = std::begin(kv.value); it != std::end(kv.value);) {
-      if (*it == '\t' || *it == ' ' || *it == ';') {
-        ++it;
-        continue;
-      }
-
-      auto end = std::find(it, std::end(kv.value), '=');
-      if (end == std::end(kv.value)) {
-        return 0;
-      }
-
-      if (!util::streq(name, StringRef{it, end})) {
-        it = std::find(it, std::end(kv.value), ';');
-        continue;
-      }
-
-      it = std::find(end + 1, std::end(kv.value), ';');
-      auto val = StringRef{end + 1, it};
-      if (val.size() != 8) {
-        return 0;
-      }
-      uint32_t h = 0;
-      for (auto c : val) {
-        auto n = util::hex_to_uint(c);
-        if (n == 256) {
-          return 0;
-        }
-        h <<= 4;
-        h += n;
-      }
-      affinity_cookie_ = h;
-      return h;
-    }
-  }
-  return 0;
-}
-
-size_t Downstream::count_crumble_request_cookie() {
-  size_t n = 0;
-  for (auto &kv : req_.fs.headers()) {
-    if (kv.token != http2::HD_COOKIE) {
-      continue;
-    }
-
-    for (auto it = std::begin(kv.value); it != std::end(kv.value);) {
-      if (*it == '\t' || *it == ' ' || *it == ';') {
-        ++it;
-        continue;
-      }
-
-      it = std::find(it, std::end(kv.value), ';');
-
-      ++n;
-    }
-  }
-  return n;
-}
-
-void Downstream::crumble_request_cookie(std::vector<nghttp2_nv> &nva) {
-  for (auto &kv : req_.fs.headers()) {
-    if (kv.token != http2::HD_COOKIE) {
-      continue;
-    }
-
-    for (auto it = std::begin(kv.value); it != std::end(kv.value);) {
-      if (*it == '\t' || *it == ' ' || *it == ';') {
-        ++it;
-        continue;
-      }
-
-      auto first = it;
-
-      it = std::find(it, std::end(kv.value), ';');
-
-      nva.push_back({(uint8_t *)"cookie", (uint8_t *)first, str_size("cookie"),
-                     (size_t)(it - first),
-                     (uint8_t)(NGHTTP2_NV_FLAG_NO_COPY_NAME |
-                               NGHTTP2_NV_FLAG_NO_COPY_VALUE |
-                               (kv.no_index ? NGHTTP2_NV_FLAG_NO_INDEX : 0))});
-    }
-  }
-}
-
-namespace {
-void add_header(size_t &sum, HeaderRefs &headers, const StringRef &name,
-                const StringRef &value, bool no_index, int32_t token) {
-  sum += name.size() + value.size();
-  headers.emplace_back(name, value, no_index, token);
-}
-} // namespace
-
-namespace {
-StringRef alloc_header_name(BlockAllocator &balloc, const StringRef &name) {
-  auto iov = make_byte_ref(balloc, name.size() + 1);
-  auto p = iov.base;
-  p = std::copy(std::begin(name), std::end(name), p);
-  util::inp_strlower(iov.base, p);
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-} // namespace
-
-namespace {
-void append_last_header_key(BlockAllocator &balloc, bool &key_prev, size_t &sum,
-                            HeaderRefs &headers, const char *data, size_t len) {
-  assert(key_prev);
-  sum += len;
-  auto &item = headers.back();
-  auto name =
-      realloc_concat_string_ref(balloc, item.name, StringRef{data, len});
-
-  auto p = const_cast<uint8_t *>(name.byte());
-  util::inp_strlower(p + name.size() - len, p + name.size());
-
-  item.name = name;
-  item.token = http2::lookup_token(item.name);
-}
-} // namespace
-
-namespace {
-void append_last_header_value(BlockAllocator &balloc, bool &key_prev,
-                              size_t &sum, HeaderRefs &headers,
-                              const char *data, size_t len) {
-  key_prev = false;
-  sum += len;
-  auto &item = headers.back();
-  item.value =
-      realloc_concat_string_ref(balloc, item.value, StringRef{data, len});
-}
-} // namespace
-
-int FieldStore::parse_content_length() {
-  content_length = -1;
-
-  for (auto &kv : headers_) {
-    if (kv.token != http2::HD_CONTENT_LENGTH) {
-      continue;
-    }
-
-    auto len = util::parse_uint(kv.value);
-    if (len == -1) {
-      return -1;
-    }
-    if (content_length != -1) {
-      return -1;
-    }
-    content_length = len;
-  }
-  return 0;
-}
-
-const HeaderRefs::value_type *FieldStore::header(int32_t token) const {
-  for (auto it = headers_.rbegin(); it != headers_.rend(); ++it) {
-    auto &kv = *it;
-    if (kv.token == token) {
-      return &kv;
-    }
-  }
-  return nullptr;
-}
-
-HeaderRefs::value_type *FieldStore::header(int32_t token) {
-  for (auto it = headers_.rbegin(); it != headers_.rend(); ++it) {
-    auto &kv = *it;
-    if (kv.token == token) {
-      return &kv;
-    }
-  }
-  return nullptr;
-}
-
-const HeaderRefs::value_type *FieldStore::header(const StringRef &name) const {
-  return search_header_linear_backwards(headers_, name);
-}
-
-void FieldStore::add_header_token(const StringRef &name, const StringRef &value,
-                                  bool no_index, int32_t token) {
-  shrpx::add_header(buffer_size_, headers_, name, value, no_index, token);
-}
-
-void FieldStore::alloc_add_header_name(const StringRef &name) {
-  auto name_ref = alloc_header_name(balloc_, name);
-  auto token = http2::lookup_token(name_ref);
-  add_header_token(name_ref, StringRef{}, false, token);
-  header_key_prev_ = true;
-}
-
-void FieldStore::append_last_header_key(const char *data, size_t len) {
-  shrpx::append_last_header_key(balloc_, header_key_prev_, buffer_size_,
-                                headers_, data, len);
-}
-
-void FieldStore::append_last_header_value(const char *data, size_t len) {
-  shrpx::append_last_header_value(balloc_, header_key_prev_, buffer_size_,
-                                  headers_, data, len);
-}
-
-void FieldStore::clear_headers() {
-  headers_.clear();
-  header_key_prev_ = false;
-}
-
-void FieldStore::add_trailer_token(const StringRef &name,
-                                   const StringRef &value, bool no_index,
-                                   int32_t token) {
-  // Header size limit should be applied to all header and trailer
-  // fields combined.
-  shrpx::add_header(buffer_size_, trailers_, name, value, no_index, token);
-}
-
-void FieldStore::alloc_add_trailer_name(const StringRef &name) {
-  auto name_ref = alloc_header_name(balloc_, name);
-  auto token = http2::lookup_token(name_ref);
-  add_trailer_token(name_ref, StringRef{}, false, token);
-  trailer_key_prev_ = true;
-}
-
-void FieldStore::append_last_trailer_key(const char *data, size_t len) {
-  shrpx::append_last_header_key(balloc_, trailer_key_prev_, buffer_size_,
-                                trailers_, data, len);
-}
-
-void FieldStore::append_last_trailer_value(const char *data, size_t len) {
-  shrpx::append_last_header_value(balloc_, trailer_key_prev_, buffer_size_,
-                                  trailers_, data, len);
-}
-
-void Downstream::set_request_start_time(
-    std::chrono::high_resolution_clock::time_point time) {
-  request_start_time_ = std::move(time);
-}
-
-const std::chrono::high_resolution_clock::time_point &
-Downstream::get_request_start_time() const {
-  return request_start_time_;
-}
-
-void Downstream::reset_upstream(Upstream *upstream) {
-  upstream_ = upstream;
-  if (dconn_) {
-    dconn_->on_upstream_change(upstream);
-  }
-}
-
-Upstream *Downstream::get_upstream() const { return upstream_; }
-
-void Downstream::set_stream_id(int32_t stream_id) { stream_id_ = stream_id; }
-
-int32_t Downstream::get_stream_id() const { return stream_id_; }
-
-void Downstream::set_request_state(int state) { request_state_ = state; }
-
-int Downstream::get_request_state() const { return request_state_; }
-
-bool Downstream::get_chunked_request() const { return chunked_request_; }
-
-void Downstream::set_chunked_request(bool f) { chunked_request_ = f; }
-
-bool Downstream::request_buf_full() {
-  auto handler = upstream_->get_client_handler();
-  auto faddr = handler->get_upstream_addr();
-  auto worker = handler->get_worker();
-
-  // We don't check buffer size here for API endpoint.
-  if (faddr->alt_mode == ALTMODE_API) {
-    return false;
-  }
-
-  if (dconn_) {
-    auto &downstreamconf = *worker->get_downstream_config();
-    return blocked_request_buf_.rleft() + request_buf_.rleft() >=
-           downstreamconf.request_buffer_size;
-  }
-
-  return false;
-}
-
-DefaultMemchunks *Downstream::get_request_buf() { return &request_buf_; }
-
-// Call this function after this object is attached to
-// Downstream. Otherwise, the program will crash.
-int Downstream::push_request_headers() {
-  if (!dconn_) {
-    DLOG(INFO, this) << "dconn_ is NULL";
-    return -1;
-  }
-  return dconn_->push_request_headers();
-}
-
-int Downstream::push_upload_data_chunk(const uint8_t *data, size_t datalen) {
-  req_.recv_body_length += datalen;
-
-  if (!request_header_sent_) {
-    blocked_request_buf_.append(data, datalen);
-    req_.unconsumed_body_length += datalen;
-    return 0;
-  }
-
-  // Assumes that request headers have already been pushed to output
-  // buffer using push_request_headers().
-  if (!dconn_) {
-    DLOG(INFO, this) << "dconn_ is NULL";
-    return -1;
-  }
-  if (dconn_->push_upload_data_chunk(data, datalen) != 0) {
-    return -1;
-  }
-
-  req_.unconsumed_body_length += datalen;
-
-  return 0;
-}
-
-int Downstream::end_upload_data() {
-  if (!request_header_sent_) {
-    blocked_request_data_eof_ = true;
-    return 0;
-  }
-  if (!dconn_) {
-    DLOG(INFO, this) << "dconn_ is NULL";
-    return -1;
-  }
-  return dconn_->end_upload_data();
-}
-
-void Downstream::rewrite_location_response_header(
-    const StringRef &upstream_scheme) {
-  auto hd = resp_.fs.header(http2::HD_LOCATION);
-  if (!hd) {
-    return;
-  }
-
-  if (request_downstream_host_.empty() || req_.authority.empty()) {
-    return;
-  }
-
-  http_parser_url u{};
-  auto rv = http_parser_parse_url(hd->value.c_str(), hd->value.size(), 0, &u);
-  if (rv != 0) {
-    return;
-  }
-
-  auto new_uri = http2::rewrite_location_uri(balloc_, hd->value, u,
-                                             request_downstream_host_,
-                                             req_.authority, upstream_scheme);
-
-  if (new_uri.empty()) {
-    return;
-  }
-
-  hd->value = new_uri;
-}
-
-bool Downstream::get_chunked_response() const { return chunked_response_; }
-
-void Downstream::set_chunked_response(bool f) { chunked_response_ = f; }
-
-int Downstream::on_read() {
-  if (!dconn_) {
-    DLOG(INFO, this) << "dconn_ is NULL";
-    return -1;
-  }
-  return dconn_->on_read();
-}
-
-void Downstream::set_response_state(int state) { response_state_ = state; }
-
-int Downstream::get_response_state() const { return response_state_; }
-
-DefaultMemchunks *Downstream::get_response_buf() { return &response_buf_; }
-
-bool Downstream::response_buf_full() {
-  if (dconn_) {
-    auto handler = upstream_->get_client_handler();
-    auto worker = handler->get_worker();
-    auto &downstreamconf = *worker->get_downstream_config();
-
-    return response_buf_.rleft() >= downstreamconf.response_buffer_size;
-  }
-
-  return false;
-}
-
-bool Downstream::validate_request_recv_body_length() const {
-  if (req_.fs.content_length == -1) {
-    return true;
-  }
-
-  if (req_.fs.content_length != req_.recv_body_length) {
-    if (LOG_ENABLED(INFO)) {
-      DLOG(INFO, this) << "request invalid bodylen: content-length="
-                       << req_.fs.content_length
-                       << ", received=" << req_.recv_body_length;
-    }
-    return false;
-  }
-
-  return true;
-}
-
-bool Downstream::validate_response_recv_body_length() const {
-  if (!expect_response_body() || resp_.fs.content_length == -1) {
-    return true;
-  }
-
-  if (resp_.fs.content_length != resp_.recv_body_length) {
-    if (LOG_ENABLED(INFO)) {
-      DLOG(INFO, this) << "response invalid bodylen: content-length="
-                       << resp_.fs.content_length
-                       << ", received=" << resp_.recv_body_length;
-    }
-    return false;
-  }
-
-  return true;
-}
-
-void Downstream::check_upgrade_fulfilled() {
-  if (req_.method == HTTP_CONNECT) {
-    upgraded_ = 200 <= resp_.http_status && resp_.http_status < 300;
-
-    return;
-  }
-
-  if (resp_.http_status == 101) {
-    // TODO Do more strict checking for upgrade headers
-    upgraded_ = req_.upgrade_request;
-
-    return;
-  }
-}
-
-void Downstream::inspect_http2_request() {
-  if (req_.method == HTTP_CONNECT) {
-    req_.upgrade_request = true;
-  }
-}
-
-void Downstream::inspect_http1_request() {
-  if (req_.method == HTTP_CONNECT) {
-    req_.upgrade_request = true;
-  } else {
-    auto upgrade = req_.fs.header(http2::HD_UPGRADE);
-    if (upgrade) {
-      const auto &val = upgrade->value;
-      // TODO Perform more strict checking for upgrade headers
-      if (util::streq_l(NGHTTP2_CLEARTEXT_PROTO_VERSION_ID, val.c_str(),
-                        val.size())) {
-        req_.http2_upgrade_seen = true;
-      } else {
-        req_.upgrade_request = true;
-      }
-    }
-  }
-  auto transfer_encoding = req_.fs.header(http2::HD_TRANSFER_ENCODING);
-  if (transfer_encoding) {
-    req_.fs.content_length = -1;
-    if (util::iends_with_l(transfer_encoding->value, "chunked")) {
-      chunked_request_ = true;
-    }
-  }
-}
-
-void Downstream::inspect_http1_response() {
-  auto transfer_encoding = resp_.fs.header(http2::HD_TRANSFER_ENCODING);
-  if (transfer_encoding) {
-    resp_.fs.content_length = -1;
-    if (util::iends_with_l(transfer_encoding->value, "chunked")) {
-      chunked_response_ = true;
-    }
-  }
-}
-
-void Downstream::reset_response() {
-  resp_.http_status = 0;
-  resp_.http_major = 1;
-  resp_.http_minor = 1;
-}
-
-bool Downstream::get_non_final_response() const {
-  return !upgraded_ && resp_.http_status / 100 == 1;
-}
-
-bool Downstream::supports_non_final_response() const {
-  return req_.http_major == 2 || (req_.http_major == 1 && req_.http_minor == 1);
-}
-
-bool Downstream::get_upgraded() const { return upgraded_; }
-
-bool Downstream::get_http2_upgrade_request() const {
-  return req_.http2_upgrade_seen && req_.fs.header(http2::HD_HTTP2_SETTINGS) &&
-         response_state_ == INITIAL;
-}
-
-StringRef Downstream::get_http2_settings() const {
-  auto http2_settings = req_.fs.header(http2::HD_HTTP2_SETTINGS);
-  if (!http2_settings) {
-    return StringRef{};
-  }
-  return http2_settings->value;
-}
-
-void Downstream::set_downstream_stream_id(int32_t stream_id) {
-  downstream_stream_id_ = stream_id;
-}
-
-int32_t Downstream::get_downstream_stream_id() const {
-  return downstream_stream_id_;
-}
-
-uint32_t Downstream::get_response_rst_stream_error_code() const {
-  return response_rst_stream_error_code_;
-}
-
-void Downstream::set_response_rst_stream_error_code(uint32_t error_code) {
-  response_rst_stream_error_code_ = error_code;
-}
-
-void Downstream::set_expect_final_response(bool f) {
-  expect_final_response_ = f;
-}
-
-bool Downstream::get_expect_final_response() const {
-  return expect_final_response_;
-}
-
-bool Downstream::expect_response_body() const {
-  return !resp_.headers_only &&
-         http2::expect_response_body(req_.method, resp_.http_status);
-}
-
-bool Downstream::expect_response_trailer() const {
-  // In HTTP/2, if final response HEADERS does not bear END_STREAM it
-  // is possible trailer fields might come, regardless of request
-  // method or status code.
-  return !resp_.headers_only && resp_.http_major == 2;
-}
-
-namespace {
-void reset_timer(struct ev_loop *loop, ev_timer *w) { ev_timer_again(loop, w); }
-} // namespace
-
-namespace {
-void try_reset_timer(struct ev_loop *loop, ev_timer *w) {
-  if (!ev_is_active(w)) {
-    return;
-  }
-  ev_timer_again(loop, w);
-}
-} // namespace
-
-namespace {
-void ensure_timer(struct ev_loop *loop, ev_timer *w) {
-  if (ev_is_active(w)) {
-    return;
-  }
-  ev_timer_again(loop, w);
-}
-} // namespace
-
-namespace {
-void disable_timer(struct ev_loop *loop, ev_timer *w) {
-  ev_timer_stop(loop, w);
-}
-} // namespace
-
-void Downstream::reset_upstream_rtimer() {
-  if (get_config()->http2.timeout.stream_read == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  reset_timer(loop, &upstream_rtimer_);
-}
-
-void Downstream::reset_upstream_wtimer() {
-  auto loop = upstream_->get_client_handler()->get_loop();
-  auto &timeoutconf = get_config()->http2.timeout;
-
-  if (timeoutconf.stream_write != 0.) {
-    reset_timer(loop, &upstream_wtimer_);
-  }
-  if (timeoutconf.stream_read != 0.) {
-    try_reset_timer(loop, &upstream_rtimer_);
-  }
-}
-
-void Downstream::ensure_upstream_wtimer() {
-  if (get_config()->http2.timeout.stream_write == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  ensure_timer(loop, &upstream_wtimer_);
-}
-
-void Downstream::disable_upstream_rtimer() {
-  if (get_config()->http2.timeout.stream_read == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  disable_timer(loop, &upstream_rtimer_);
-}
-
-void Downstream::disable_upstream_wtimer() {
-  if (get_config()->http2.timeout.stream_write == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  disable_timer(loop, &upstream_wtimer_);
-}
-
-void Downstream::reset_downstream_rtimer() {
-  if (get_config()->http2.timeout.stream_read == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  reset_timer(loop, &downstream_rtimer_);
-}
-
-void Downstream::reset_downstream_wtimer() {
-  auto loop = upstream_->get_client_handler()->get_loop();
-  auto &timeoutconf = get_config()->http2.timeout;
-
-  if (timeoutconf.stream_write != 0.) {
-    reset_timer(loop, &downstream_wtimer_);
-  }
-  if (timeoutconf.stream_read != 0.) {
-    try_reset_timer(loop, &downstream_rtimer_);
-  }
-}
-
-void Downstream::ensure_downstream_wtimer() {
-  if (get_config()->http2.timeout.stream_write == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  ensure_timer(loop, &downstream_wtimer_);
-}
-
-void Downstream::disable_downstream_rtimer() {
-  if (get_config()->http2.timeout.stream_read == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  disable_timer(loop, &downstream_rtimer_);
-}
-
-void Downstream::disable_downstream_wtimer() {
-  if (get_config()->http2.timeout.stream_write == 0.) {
-    return;
-  }
-  auto loop = upstream_->get_client_handler()->get_loop();
-  disable_timer(loop, &downstream_wtimer_);
-}
-
-bool Downstream::accesslog_ready() const {
-  return !accesslog_written_ && resp_.http_status > 0;
-}
-
-void Downstream::add_retry() { ++num_retry_; }
-
-bool Downstream::no_more_retry() const { return num_retry_ > 50; }
-
-void Downstream::set_request_downstream_host(const StringRef &host) {
-  request_downstream_host_ = host;
-}
-
-void Downstream::set_request_pending(bool f) { request_pending_ = f; }
-
-bool Downstream::get_request_pending() const { return request_pending_; }
-
-void Downstream::set_request_header_sent(bool f) { request_header_sent_ = f; }
-
-bool Downstream::get_request_header_sent() const {
-  return request_header_sent_;
-}
-
-bool Downstream::request_submission_ready() const {
-  return (request_state_ == Downstream::HEADER_COMPLETE ||
-          request_state_ == Downstream::MSG_COMPLETE) &&
-         (request_pending_ || !request_header_sent_) &&
-         response_state_ == Downstream::INITIAL;
-}
-
-int Downstream::get_dispatch_state() const { return dispatch_state_; }
-
-void Downstream::set_dispatch_state(int s) { dispatch_state_ = s; }
-
-void Downstream::attach_blocked_link(BlockedLink *l) {
-  assert(!blocked_link_);
-
-  l->downstream = this;
-  blocked_link_ = l;
-}
-
-BlockedLink *Downstream::detach_blocked_link() {
-  auto link = blocked_link_;
-  blocked_link_ = nullptr;
-  return link;
-}
-
-bool Downstream::can_detach_downstream_connection() const {
-  // We should check request and response buffer.  If request buffer
-  // is not empty, then we might leave downstream connection in weird
-  // state, especially for HTTP/1.1
-  return dconn_ && response_state_ == Downstream::MSG_COMPLETE &&
-         request_state_ == Downstream::MSG_COMPLETE && !upgraded_ &&
-         !resp_.connection_close && request_buf_.rleft() == 0;
-}
-
-DefaultMemchunks Downstream::pop_response_buf() {
-  return std::move(response_buf_);
-}
-
-void Downstream::set_assoc_stream_id(int32_t stream_id) {
-  assoc_stream_id_ = stream_id;
-}
-
-int32_t Downstream::get_assoc_stream_id() const { return assoc_stream_id_; }
-
-BlockAllocator &Downstream::get_block_allocator() { return balloc_; }
-
-void Downstream::add_rcbuf(nghttp2_rcbuf *rcbuf) {
-  nghttp2_rcbuf_incref(rcbuf);
-  rcbufs_.push_back(rcbuf);
-}
-
-void Downstream::set_downstream_addr_group(
-    const std::shared_ptr<DownstreamAddrGroup> &group) {
-  group_ = group;
-}
-
-void Downstream::set_addr(const DownstreamAddr *addr) { addr_ = addr; }
-
-const DownstreamAddr *Downstream::get_addr() const { return addr_; }
-
-void Downstream::set_accesslog_written(bool f) { accesslog_written_ = f; }
-
-void Downstream::renew_affinity_cookie(uint32_t h) {
-  affinity_cookie_ = h;
-  new_affinity_cookie_ = true;
-}
-
-uint32_t Downstream::get_affinity_cookie_to_send() const {
-  if (new_affinity_cookie_) {
-    return affinity_cookie_;
-  }
-  return 0;
-}
-
-DefaultMemchunks *Downstream::get_blocked_request_buf() {
-  return &blocked_request_buf_;
-}
-
-bool Downstream::get_blocked_request_data_eof() const {
-  return blocked_request_data_eof_;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_downstream_connection.h"
-
-#include "shrpx_client_handler.h"
-#include "shrpx_downstream.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-DownstreamConnection::DownstreamConnection()
-    : client_handler_(nullptr), downstream_(nullptr) {}
-
-DownstreamConnection::~DownstreamConnection() {}
-
-void DownstreamConnection::set_client_handler(ClientHandler *handler) {
-  client_handler_ = handler;
-}
-
-ClientHandler *DownstreamConnection::get_client_handler() {
-  return client_handler_;
-}
-
-Downstream *DownstreamConnection::get_downstream() { return downstream_; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DOWNSTREAM_CONNECTION_H
-#define SHRPX_DOWNSTREAM_CONNECTION_H
-
-#include "shrpx.h"
-
-#include <memory>
-
-#include "shrpx_io_control.h"
-
-namespace shrpx {
-
-class ClientHandler;
-class Upstream;
-class Downstream;
-struct DownstreamAddrGroup;
-struct DownstreamAddr;
-
-class DownstreamConnection {
-public:
-  DownstreamConnection();
-  virtual ~DownstreamConnection();
-  virtual int attach_downstream(Downstream *downstream) = 0;
-  virtual void detach_downstream(Downstream *downstream) = 0;
-
-  virtual int push_request_headers() = 0;
-  virtual int push_upload_data_chunk(const uint8_t *data, size_t datalen) = 0;
-  virtual int end_upload_data() = 0;
-
-  virtual void pause_read(IOCtrlReason reason) = 0;
-  virtual int resume_read(IOCtrlReason reason, size_t consumed) = 0;
-  virtual void force_resume_read() = 0;
-
-  virtual int on_read() = 0;
-  virtual int on_write() = 0;
-  virtual int on_timeout() { return 0; }
-
-  virtual void on_upstream_change(Upstream *uptream) = 0;
-
-  // true if this object is poolable.
-  virtual bool poolable() const = 0;
-
-  virtual const std::shared_ptr<DownstreamAddrGroup> &
-  get_downstream_addr_group() const = 0;
-  virtual DownstreamAddr *get_addr() const = 0;
-
-  void set_client_handler(ClientHandler *client_handler);
-  ClientHandler *get_client_handler();
-  Downstream *get_downstream();
-
-protected:
-  ClientHandler *client_handler_;
-  Downstream *downstream_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DOWNSTREAM_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_downstream_connection_pool.h"
-#include "shrpx_downstream_connection.h"
-
-namespace shrpx {
-
-DownstreamConnectionPool::DownstreamConnectionPool() {}
-
-DownstreamConnectionPool::~DownstreamConnectionPool() { remove_all(); }
-
-void DownstreamConnectionPool::remove_all() {
-  for (auto dconn : pool_) {
-    delete dconn;
-  }
-
-  pool_.clear();
-}
-
-void DownstreamConnectionPool::add_downstream_connection(
-    std::unique_ptr<DownstreamConnection> dconn) {
-  pool_.insert(dconn.release());
-}
-
-std::unique_ptr<DownstreamConnection>
-DownstreamConnectionPool::pop_downstream_connection() {
-  if (pool_.empty()) {
-    return nullptr;
-  }
-
-  auto it = std::begin(pool_);
-  auto dconn = std::unique_ptr<DownstreamConnection>(*it);
-  pool_.erase(it);
-
-  return dconn;
-}
-
-void DownstreamConnectionPool::remove_downstream_connection(
-    DownstreamConnection *dconn) {
-  pool_.erase(dconn);
-  delete dconn;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_connection_pool.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DOWNSTREAM_CONNECTION_POOL_H
-#define SHRPX_DOWNSTREAM_CONNECTION_POOL_H
-
-#include "shrpx.h"
-
-#include <memory>
-#include <set>
-
-namespace shrpx {
-
-class DownstreamConnection;
-
-class DownstreamConnectionPool {
-public:
-  DownstreamConnectionPool();
-  ~DownstreamConnectionPool();
-
-  void add_downstream_connection(std::unique_ptr<DownstreamConnection> dconn);
-  std::unique_ptr<DownstreamConnection> pop_downstream_connection();
-  void remove_downstream_connection(DownstreamConnection *dconn);
-  void remove_all();
-
-private:
-  std::set<DownstreamConnection *> pool_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DOWNSTREAM_CONNECTION_POOL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,563 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DOWNSTREAM_H
-#define SHRPX_DOWNSTREAM_H
-
-#include "shrpx.h"
-
-#include <cinttypes>
-#include <vector>
-#include <string>
-#include <memory>
-#include <chrono>
-#include <algorithm>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_io_control.h"
-#include "shrpx_log_config.h"
-#include "http2.h"
-#include "memchunk.h"
-#include "allocator.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Upstream;
-class DownstreamConnection;
-struct BlockedLink;
-struct DownstreamAddrGroup;
-struct DownstreamAddr;
-
-class FieldStore {
-public:
-  FieldStore(BlockAllocator &balloc, size_t headers_initial_capacity)
-      : content_length(-1),
-        balloc_(balloc),
-        buffer_size_(0),
-        header_key_prev_(false),
-        trailer_key_prev_(false) {
-    headers_.reserve(headers_initial_capacity);
-  }
-
-  const HeaderRefs &headers() const { return headers_; }
-  const HeaderRefs &trailers() const { return trailers_; }
-
-  HeaderRefs &headers() { return headers_; }
-
-  const void add_extra_buffer_size(size_t n) { buffer_size_ += n; }
-  size_t buffer_size() const { return buffer_size_; }
-
-  size_t num_fields() const { return headers_.size() + trailers_.size(); }
-
-  // Returns pointer to the header field with the name |name|.  If
-  // multiple header have |name| as name, return last occurrence from
-  // the beginning.  If no such header is found, returns nullptr.
-  const HeaderRefs::value_type *header(int32_t token) const;
-  HeaderRefs::value_type *header(int32_t token);
-  // Returns pointer to the header field with the name |name|.  If no
-  // such header is found, returns nullptr.
-  const HeaderRefs::value_type *header(const StringRef &name) const;
-
-  void add_header_token(const StringRef &name, const StringRef &value,
-                        bool no_index, int32_t token);
-
-  // Adds header field name |name|.  First, the copy of header field
-  // name pointed by name.c_str() of length name.size() is made, and
-  // stored.
-  void alloc_add_header_name(const StringRef &name);
-
-  void append_last_header_key(const char *data, size_t len);
-  void append_last_header_value(const char *data, size_t len);
-
-  bool header_key_prev() const { return header_key_prev_; }
-
-  // Parses content-length, and records it in the field.  If there are
-  // multiple Content-Length, returns -1.
-  int parse_content_length();
-
-  // Empties headers.
-  void clear_headers();
-
-  void add_trailer_token(const StringRef &name, const StringRef &value,
-                         bool no_index, int32_t token);
-
-  // Adds trailer field name |name|.  First, the copy of trailer field
-  // name pointed by name.c_str() of length name.size() is made, and
-  // stored.
-  void alloc_add_trailer_name(const StringRef &name);
-
-  void append_last_trailer_key(const char *data, size_t len);
-  void append_last_trailer_value(const char *data, size_t len);
-
-  bool trailer_key_prev() const { return trailer_key_prev_; }
-
-  // content-length, -1 if it is unknown.
-  int64_t content_length;
-
-private:
-  BlockAllocator &balloc_;
-  HeaderRefs headers_;
-  // trailer fields.  For HTTP/1.1, trailer fields are only included
-  // with chunked encoding.  For HTTP/2, there is no such limit.
-  HeaderRefs trailers_;
-  // Sum of the length of name and value in headers_ and trailers_.
-  // This could also be increased by add_extra_buffer_size() to take
-  // into account for request URI in case of HTTP/1.x request.
-  size_t buffer_size_;
-  bool header_key_prev_;
-  bool trailer_key_prev_;
-};
-
-struct Request {
-  Request(BlockAllocator &balloc)
-      : fs(balloc, 16),
-        recv_body_length(0),
-        unconsumed_body_length(0),
-        method(-1),
-        http_major(1),
-        http_minor(1),
-        upgrade_request(false),
-        http2_upgrade_seen(false),
-        connection_close(false),
-        http2_expect_body(false),
-        no_authority(false) {}
-
-  void consume(size_t len) {
-    assert(unconsumed_body_length >= len);
-    unconsumed_body_length -= len;
-  }
-
-  FieldStore fs;
-  // Timestamp when all request header fields are received.
-  std::shared_ptr<Timestamp> tstamp;
-  // Request scheme.  For HTTP/2, this is :scheme header field value.
-  // For HTTP/1.1, this is deduced from URI or connection.
-  StringRef scheme;
-  // Request authority.  This is HTTP/2 :authority header field value
-  // or host header field value.  We may deduce it from absolute-form
-  // HTTP/1 request.  We also store authority-form HTTP/1 request.
-  // This could be empty if request comes from HTTP/1.0 without Host
-  // header field and origin-form.
-  StringRef authority;
-  // Request path, including query component.  For HTTP/1.1, this is
-  // request-target.  For HTTP/2, this is :path header field value.
-  // For CONNECT request, this is empty.
-  StringRef path;
-  // the length of request body received so far
-  int64_t recv_body_length;
-  // The number of bytes not consumed by the application yet.
-  size_t unconsumed_body_length;
-  int method;
-  // HTTP major and minor version
-  int http_major, http_minor;
-  // Returns true if the request is HTTP upgrade (HTTP Upgrade or
-  // CONNECT method).  Upgrade to HTTP/2 is excluded.  For HTTP/2
-  // Upgrade, check get_http2_upgrade_request().
-  bool upgrade_request;
-  // true if h2c is seen in Upgrade header field.
-  bool http2_upgrade_seen;
-  bool connection_close;
-  // true if this is HTTP/2, and request body is expected.  Note that
-  // we don't take into account HTTP method here.
-  bool http2_expect_body;
-  // true if request does not have any information about authority.
-  // This happens when: For HTTP/2 request, :authority is missing.
-  // For HTTP/1 request, origin or asterisk form is used.
-  bool no_authority;
-};
-
-struct Response {
-  Response(BlockAllocator &balloc)
-      : fs(balloc, 32),
-        recv_body_length(0),
-        unconsumed_body_length(0),
-        http_status(0),
-        http_major(1),
-        http_minor(1),
-        connection_close(false),
-        headers_only(false) {}
-
-  void consume(size_t len) {
-    assert(unconsumed_body_length >= len);
-    unconsumed_body_length -= len;
-  }
-
-  // returns true if a resource denoted by scheme, authority, and path
-  // has already been pushed.
-  bool is_resource_pushed(const StringRef &scheme, const StringRef &authority,
-                          const StringRef &path) const {
-    if (!pushed_resources) {
-      return false;
-    }
-    return std::find(std::begin(*pushed_resources), std::end(*pushed_resources),
-                     std::make_tuple(scheme, authority, path)) !=
-           std::end(*pushed_resources);
-  }
-
-  // remember that a resource denoted by scheme, authority, and path
-  // is pushed.
-  void resource_pushed(const StringRef &scheme, const StringRef &authority,
-                       const StringRef &path) {
-    if (!pushed_resources) {
-      pushed_resources = make_unique<
-          std::vector<std::tuple<StringRef, StringRef, StringRef>>>();
-    }
-    pushed_resources->emplace_back(scheme, authority, path);
-  }
-
-  FieldStore fs;
-  // array of the tuple of scheme, authority, and path of pushed
-  // resource.  This is required because RFC 8297 says that server
-  // typically includes header fields appeared in non-final response
-  // header fields in final response header fields.  Without checking
-  // that a particular resource has already been pushed, or not, we
-  // end up pushing the same resource at least twice.  It is unknown
-  // that we should use more complex data structure (e.g., std::set)
-  // to find the resources faster.
-  std::unique_ptr<std::vector<std::tuple<StringRef, StringRef, StringRef>>>
-      pushed_resources;
-  // the length of response body received so far
-  int64_t recv_body_length;
-  // The number of bytes not consumed by the application yet.  This is
-  // mainly for HTTP/2 backend.
-  size_t unconsumed_body_length;
-  // HTTP status code
-  unsigned int http_status;
-  int http_major, http_minor;
-  bool connection_close;
-  // true if response only consists of HEADERS, and it bears
-  // END_STREAM.  This is used to tell Http2Upstream that it can send
-  // response with single HEADERS with END_STREAM flag only.
-  bool headers_only;
-};
-
-class Downstream {
-public:
-  Downstream(Upstream *upstream, MemchunkPool *mcpool, int32_t stream_id);
-  ~Downstream();
-  void reset_upstream(Upstream *upstream);
-  Upstream *get_upstream() const;
-  void set_stream_id(int32_t stream_id);
-  int32_t get_stream_id() const;
-  void set_assoc_stream_id(int32_t stream_id);
-  int32_t get_assoc_stream_id() const;
-  void pause_read(IOCtrlReason reason);
-  int resume_read(IOCtrlReason reason, size_t consumed);
-  void force_resume_read();
-  // Set stream ID for downstream HTTP2 connection.
-  void set_downstream_stream_id(int32_t stream_id);
-  int32_t get_downstream_stream_id() const;
-
-  int attach_downstream_connection(std::unique_ptr<DownstreamConnection> dconn);
-  void detach_downstream_connection();
-  DownstreamConnection *get_downstream_connection();
-  // Returns dconn_ and nullifies dconn_.
-  std::unique_ptr<DownstreamConnection> pop_downstream_connection();
-
-  // Returns true if output buffer is full. If underlying dconn_ is
-  // NULL, this function always returns false.
-  bool request_buf_full();
-  // Returns true if upgrade (HTTP Upgrade or CONNECT) is succeeded.
-  // This should not depend on inspect_http1_response().
-  void check_upgrade_fulfilled();
-  // Returns true if the upgrade is succeeded as a result of the call
-  // check_upgrade_fulfilled().  HTTP/2 Upgrade is excluded.
-  bool get_upgraded() const;
-  // Inspects HTTP/2 request.
-  void inspect_http2_request();
-  // Inspects HTTP/1 request.  This checks whether the request is
-  // upgrade request and tranfer-encoding etc.
-  void inspect_http1_request();
-  // Returns true if the request is HTTP Upgrade for HTTP/2
-  bool get_http2_upgrade_request() const;
-  // Returns the value of HTTP2-Settings request header field.
-  StringRef get_http2_settings() const;
-
-  // downstream request API
-  const Request &request() const { return req_; }
-  Request &request() { return req_; }
-
-  // Count number of crumbled cookies
-  size_t count_crumble_request_cookie();
-  // Crumbles (split cookie by ";") in request_headers_ and adds them
-  // in |nva|.  Headers::no_index is inherited.
-  void crumble_request_cookie(std::vector<nghttp2_nv> &nva);
-  // Assembles request cookies.  The opposite operation against
-  // crumble_request_cookie().
-  StringRef assemble_request_cookie();
-
-  void
-  set_request_start_time(std::chrono::high_resolution_clock::time_point time);
-  const std::chrono::high_resolution_clock::time_point &
-  get_request_start_time() const;
-  int push_request_headers();
-  bool get_chunked_request() const;
-  void set_chunked_request(bool f);
-  int push_upload_data_chunk(const uint8_t *data, size_t datalen);
-  int end_upload_data();
-  // Validates that received request body length and content-length
-  // matches.
-  bool validate_request_recv_body_length() const;
-  void set_request_downstream_host(const StringRef &host);
-  bool expect_response_body() const;
-  bool expect_response_trailer() const;
-  enum {
-    INITIAL,
-    HEADER_COMPLETE,
-    MSG_COMPLETE,
-    STREAM_CLOSED,
-    CONNECT_FAIL,
-    IDLE,
-    MSG_RESET,
-    // header contains invalid header field.  We can safely send error
-    // response (502) to a client.
-    MSG_BAD_HEADER,
-    // header fields in HTTP/1 request exceed the configuration limit.
-    // This state is only transitioned from INITIAL state, and solely
-    // used to signal 431 status code to the client.
-    HTTP1_REQUEST_HEADER_TOO_LARGE,
-  };
-  void set_request_state(int state);
-  int get_request_state() const;
-  DefaultMemchunks *get_request_buf();
-  void set_request_pending(bool f);
-  bool get_request_pending() const;
-  void set_request_header_sent(bool f);
-  bool get_request_header_sent() const;
-  // Returns true if request is ready to be submitted to downstream.
-  // When sending pending request, get_request_pending() should be
-  // checked too because this function may return true when
-  // get_request_pending() returns false.
-  bool request_submission_ready() const;
-
-  DefaultMemchunks *get_blocked_request_buf();
-  bool get_blocked_request_data_eof() const;
-
-  // downstream response API
-  const Response &response() const { return resp_; }
-  Response &response() { return resp_; }
-
-  // Rewrites the location response header field.
-  void rewrite_location_response_header(const StringRef &upstream_scheme);
-
-  bool get_chunked_response() const;
-  void set_chunked_response(bool f);
-
-  void set_response_state(int state);
-  int get_response_state() const;
-  DefaultMemchunks *get_response_buf();
-  bool response_buf_full();
-  // Validates that received response body length and content-length
-  // matches.
-  bool validate_response_recv_body_length() const;
-  uint32_t get_response_rst_stream_error_code() const;
-  void set_response_rst_stream_error_code(uint32_t error_code);
-  // Inspects HTTP/1 response.  This checks tranfer-encoding etc.
-  void inspect_http1_response();
-  // Clears some of member variables for response.
-  void reset_response();
-  // True if the response is non-final (1xx status code).  Note that
-  // if connection was upgraded, 101 status code is treated as final.
-  bool get_non_final_response() const;
-  // True if protocol version used by client supports non final
-  // response.  Only HTTP/1.1 and HTTP/2 clients support it.
-  bool supports_non_final_response() const;
-  void set_expect_final_response(bool f);
-  bool get_expect_final_response() const;
-
-  // Call this method when there is incoming data in downstream
-  // connection.
-  int on_read();
-
-  // Resets upstream read timer.  If it is active, timeout value is
-  // reset.  If it is not active, timer will be started.
-  void reset_upstream_rtimer();
-  // Resets upstream write timer. If it is active, timeout value is
-  // reset.  If it is not active, timer will be started.  This
-  // function also resets read timer if it has been started.
-  void reset_upstream_wtimer();
-  // Makes sure that upstream write timer is started.  If it has been
-  // started, do nothing.  Otherwise, write timer will be started.
-  void ensure_upstream_wtimer();
-  // Disables upstream read timer.
-  void disable_upstream_rtimer();
-  // Disables upstream write timer.
-  void disable_upstream_wtimer();
-
-  // Downstream timer functions.  They works in a similar way just
-  // like the upstream timer function.
-  void reset_downstream_rtimer();
-  void reset_downstream_wtimer();
-  void ensure_downstream_wtimer();
-  void disable_downstream_rtimer();
-  void disable_downstream_wtimer();
-
-  // Returns true if accesslog can be written for this downstream.
-  bool accesslog_ready() const;
-
-  // Increment retry count
-  void add_retry();
-  // true if retry attempt should not be done.
-  bool no_more_retry() const;
-
-  int get_dispatch_state() const;
-  void set_dispatch_state(int s);
-
-  void attach_blocked_link(BlockedLink *l);
-  BlockedLink *detach_blocked_link();
-
-  // Returns true if downstream_connection can be detached and reused.
-  bool can_detach_downstream_connection() const;
-
-  DefaultMemchunks pop_response_buf();
-
-  BlockAllocator &get_block_allocator();
-
-  void add_rcbuf(nghttp2_rcbuf *rcbuf);
-
-  void
-  set_downstream_addr_group(const std::shared_ptr<DownstreamAddrGroup> &group);
-  void set_addr(const DownstreamAddr *addr);
-
-  const DownstreamAddr *get_addr() const;
-
-  void set_accesslog_written(bool f);
-
-  // Finds affinity cookie from request header fields.  The name of
-  // cookie is given in |name|.  If an affinity cookie is found, it is
-  // assigned to a member function, and is returned.  If it is not
-  // found, or is malformed, returns 0.
-  uint32_t find_affinity_cookie(const StringRef &name);
-  // Set |h| as affinity cookie.
-  void renew_affinity_cookie(uint32_t h);
-  // Returns affinity cookie to send.  If it does not need to be sent,
-  // for example, because the value is retrieved from a request header
-  // field, returns 0.
-  uint32_t get_affinity_cookie_to_send() const;
-
-  enum {
-    EVENT_ERROR = 0x1,
-    EVENT_TIMEOUT = 0x2,
-  };
-
-  enum {
-    DISPATCH_NONE,
-    DISPATCH_PENDING,
-    DISPATCH_BLOCKED,
-    DISPATCH_ACTIVE,
-    DISPATCH_FAILURE,
-  };
-
-  Downstream *dlnext, *dlprev;
-
-  // the length of response body sent to upstream client
-  int64_t response_sent_body_length;
-
-private:
-  BlockAllocator balloc_;
-
-  std::vector<nghttp2_rcbuf *> rcbufs_;
-
-  Request req_;
-  Response resp_;
-
-  std::chrono::high_resolution_clock::time_point request_start_time_;
-
-  // host we requested to downstream.  This is used to rewrite
-  // location header field to decide the location should be rewritten
-  // or not.
-  StringRef request_downstream_host_;
-
-  // Data arrived in frontend before sending header fields to backend
-  // are stored in this buffer.
-  DefaultMemchunks blocked_request_buf_;
-  DefaultMemchunks request_buf_;
-  DefaultMemchunks response_buf_;
-
-  ev_timer upstream_rtimer_;
-  ev_timer upstream_wtimer_;
-
-  ev_timer downstream_rtimer_;
-  ev_timer downstream_wtimer_;
-
-  Upstream *upstream_;
-  std::unique_ptr<DownstreamConnection> dconn_;
-
-  // only used by HTTP/2 upstream
-  BlockedLink *blocked_link_;
-  // The backend address used to fulfill this request.  These are for
-  // logging purpose.
-  std::shared_ptr<DownstreamAddrGroup> group_;
-  const DownstreamAddr *addr_;
-  // How many times we tried in backend connection
-  size_t num_retry_;
-  // The stream ID in frontend connection
-  int32_t stream_id_;
-  // The associated stream ID in frontend connection if this is pushed
-  // stream.
-  int32_t assoc_stream_id_;
-  // stream ID in backend connection
-  int32_t downstream_stream_id_;
-  // RST_STREAM error_code from downstream HTTP2 connection
-  uint32_t response_rst_stream_error_code_;
-  // An affinity cookie value.
-  uint32_t affinity_cookie_;
-  // request state
-  int request_state_;
-  // response state
-  int response_state_;
-  // only used by HTTP/2 upstream
-  int dispatch_state_;
-  // true if the connection is upgraded (HTTP Upgrade or CONNECT),
-  // excluding upgrade to HTTP/2.
-  bool upgraded_;
-  // true if backend request uses chunked transfer-encoding
-  bool chunked_request_;
-  // true if response to client uses chunked transfer-encoding
-  bool chunked_response_;
-  // true if we have not got final response code
-  bool expect_final_response_;
-  // true if downstream request is pending because backend connection
-  // has not been established or should be checked before use;
-  // currently used only with HTTP/2 connection.
-  bool request_pending_;
-  // true if downstream request header is considered to be sent.
-  bool request_header_sent_;
-  // true if access.log has been written.
-  bool accesslog_written_;
-  // true if affinity cookie is generated for this request.
-  bool new_affinity_cookie_;
-  // true if eof is received from client before sending header fields
-  // to backend.
-  bool blocked_request_data_eof_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DOWNSTREAM_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_downstream_queue.h"
-
-#include <cassert>
-#include <limits>
-
-#include "shrpx_downstream.h"
-
-namespace shrpx {
-
-DownstreamQueue::HostEntry::HostEntry(ImmutableString &&key)
-    : key(std::move(key)), num_active(0) {}
-
-DownstreamQueue::DownstreamQueue(size_t conn_max_per_host, bool unified_host)
-    : conn_max_per_host_(conn_max_per_host == 0
-                             ? std::numeric_limits<size_t>::max()
-                             : conn_max_per_host),
-      unified_host_(unified_host) {}
-
-DownstreamQueue::~DownstreamQueue() {
-  dlist_delete_all(downstreams_);
-  for (auto &p : host_entries_) {
-    auto &ent = p.second;
-    dlist_delete_all(ent.blocked);
-  }
-}
-
-void DownstreamQueue::add_pending(std::unique_ptr<Downstream> downstream) {
-  downstream->set_dispatch_state(Downstream::DISPATCH_PENDING);
-  downstreams_.append(downstream.release());
-}
-
-void DownstreamQueue::mark_failure(Downstream *downstream) {
-  downstream->set_dispatch_state(Downstream::DISPATCH_FAILURE);
-}
-
-DownstreamQueue::HostEntry &
-DownstreamQueue::find_host_entry(const StringRef &host) {
-  auto itr = host_entries_.find(host);
-  if (itr == std::end(host_entries_)) {
-    auto key = ImmutableString{std::begin(host), std::end(host)};
-    auto key_ref = StringRef{key};
-#ifdef HAVE_STD_MAP_EMPLACE
-    std::tie(itr, std::ignore) =
-        host_entries_.emplace(key_ref, HostEntry(std::move(key)));
-#else  // !HAVE_STD_MAP_EMPLACE
-    // for g++-4.7
-    std::tie(itr, std::ignore) = host_entries_.insert(
-        std::make_pair(key_ref, HostEntry(std::move(key))));
-#endif // !HAVE_STD_MAP_EMPLACE
-  }
-  return (*itr).second;
-}
-
-StringRef DownstreamQueue::make_host_key(const StringRef &host) const {
-  return unified_host_ ? StringRef{} : host;
-}
-
-StringRef DownstreamQueue::make_host_key(Downstream *downstream) const {
-  return make_host_key(downstream->request().authority);
-}
-
-void DownstreamQueue::mark_active(Downstream *downstream) {
-  auto &ent = find_host_entry(make_host_key(downstream));
-  ++ent.num_active;
-
-  downstream->set_dispatch_state(Downstream::DISPATCH_ACTIVE);
-}
-
-void DownstreamQueue::mark_blocked(Downstream *downstream) {
-  auto &ent = find_host_entry(make_host_key(downstream));
-
-  downstream->set_dispatch_state(Downstream::DISPATCH_BLOCKED);
-
-  auto link = new BlockedLink{};
-  downstream->attach_blocked_link(link);
-  ent.blocked.append(link);
-}
-
-bool DownstreamQueue::can_activate(const StringRef &host) const {
-  auto itr = host_entries_.find(make_host_key(host));
-  if (itr == std::end(host_entries_)) {
-    return true;
-  }
-  auto &ent = (*itr).second;
-  return ent.num_active < conn_max_per_host_;
-}
-
-namespace {
-bool remove_host_entry_if_empty(const DownstreamQueue::HostEntry &ent,
-                                DownstreamQueue::HostEntryMap &host_entries,
-                                const StringRef &host) {
-  if (ent.blocked.empty() && ent.num_active == 0) {
-    host_entries.erase(host);
-    return true;
-  }
-  return false;
-}
-} // namespace
-
-Downstream *DownstreamQueue::remove_and_get_blocked(Downstream *downstream,
-                                                    bool next_blocked) {
-  // Delete downstream when this function returns.
-  auto delptr = std::unique_ptr<Downstream>(downstream);
-
-  downstreams_.remove(downstream);
-
-  auto host = make_host_key(downstream);
-  auto &ent = find_host_entry(host);
-
-  if (downstream->get_dispatch_state() == Downstream::DISPATCH_ACTIVE) {
-    --ent.num_active;
-  } else {
-    // For those downstreams deleted while in blocked state
-    auto link = downstream->detach_blocked_link();
-    if (link) {
-      ent.blocked.remove(link);
-      delete link;
-    }
-  }
-
-  if (remove_host_entry_if_empty(ent, host_entries_, host)) {
-    return nullptr;
-  }
-
-  if (!next_blocked || ent.num_active >= conn_max_per_host_) {
-    return nullptr;
-  }
-
-  auto link = ent.blocked.head;
-
-  if (!link) {
-    return nullptr;
-  }
-
-  auto next_downstream = link->downstream;
-  auto link2 = next_downstream->detach_blocked_link();
-  // This is required with --disable-assert.
-  (void)link2;
-  assert(link2 == link);
-  ent.blocked.remove(link);
-  delete link;
-  remove_host_entry_if_empty(ent, host_entries_, host);
-
-  return next_downstream;
-}
-
-Downstream *DownstreamQueue::get_downstreams() const {
-  return downstreams_.head;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_queue.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DOWNSTREAM_QUEUE_H
-#define SHRPX_DOWNSTREAM_QUEUE_H
-
-#include "shrpx.h"
-
-#include <cinttypes>
-#include <map>
-#include <set>
-#include <memory>
-
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Downstream;
-
-// Link entry in HostEntry.blocked and downstream because downstream
-// could be deleted in anytime and we'd like to find Downstream in
-// O(1).  Downstream has field to link back to this object.
-struct BlockedLink {
-  Downstream *downstream;
-  BlockedLink *dlnext, *dlprev;
-};
-
-class DownstreamQueue {
-public:
-  struct HostEntry {
-    HostEntry(ImmutableString &&key);
-
-    HostEntry(HostEntry &&) = default;
-    HostEntry &operator=(HostEntry &&) = default;
-
-    HostEntry(const HostEntry &) = delete;
-    HostEntry &operator=(const HostEntry &) = delete;
-
-    // Key that associates this object
-    ImmutableString key;
-    // Set of stream ID that blocked by conn_max_per_host_.
-    DList<BlockedLink> blocked;
-    // The number of connections currently made to this host.
-    size_t num_active;
-  };
-
-  using HostEntryMap = std::map<StringRef, HostEntry, std::less<StringRef>>;
-
-  // conn_max_per_host == 0 means no limit for downstream connection.
-  DownstreamQueue(size_t conn_max_per_host = 0, bool unified_host = true);
-  ~DownstreamQueue();
-  // Add |downstream| to this queue.  This is entry point for
-  // Downstream object.
-  void add_pending(std::unique_ptr<Downstream> downstream);
-  // Set |downstream| to failure state, which means that downstream
-  // failed to connect to backend.
-  void mark_failure(Downstream *downstream);
-  // Set |downstream| to active state, which means that downstream
-  // connection has started.
-  void mark_active(Downstream *downstream);
-  // Set |downstream| to blocked state, which means that download
-  // connection was blocked because conn_max_per_host_ limit.
-  void mark_blocked(Downstream *downstream);
-  // Returns true if we can make downstream connection to given
-  // |host|.
-  bool can_activate(const StringRef &host) const;
-  // Removes and frees |downstream| object.  If |downstream| is in
-  // Downstream::DISPATCH_ACTIVE, and |next_blocked| is true, this
-  // function may return Downstream object with the same target host
-  // in Downstream::DISPATCH_BLOCKED if its connection is now not
-  // blocked by conn_max_per_host_ limit.
-  Downstream *remove_and_get_blocked(Downstream *downstream,
-                                     bool next_blocked = true);
-  Downstream *get_downstreams() const;
-  HostEntry &find_host_entry(const StringRef &host);
-  StringRef make_host_key(const StringRef &host) const;
-  StringRef make_host_key(Downstream *downstream) const;
-
-private:
-  // Per target host structure to keep track of the number of
-  // connections to the same host.
-  HostEntryMap host_entries_;
-  DList<Downstream> downstreams_;
-  // Maximum number of concurrent connections to the same host.
-  size_t conn_max_per_host_;
-  // true if downstream host is treated as the same.  Used for reverse
-  // proxying.
-  bool unified_host_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DOWNSTREAM_QUEUE_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_downstream_test.h"
-
-#include <iostream>
-
-#include <CUnit/CUnit.h>
-
-#include "shrpx_downstream.h"
-
-namespace shrpx {
-
-void test_downstream_field_store_append_last_header(void) {
-  BlockAllocator balloc(16, 16);
-  FieldStore fs(balloc, 0);
-  fs.alloc_add_header_name(StringRef::from_lit("alpha"));
-  auto bravo = StringRef::from_lit("BRAVO");
-  fs.append_last_header_key(bravo.c_str(), bravo.size());
-  // Add more characters so that relloc occurs
-  auto golf = StringRef::from_lit("golF0123456789");
-  fs.append_last_header_key(golf.c_str(), golf.size());
-
-  auto charlie = StringRef::from_lit("Charlie");
-  fs.append_last_header_value(charlie.c_str(), charlie.size());
-  auto delta = StringRef::from_lit("deltA");
-  fs.append_last_header_value(delta.c_str(), delta.size());
-  // Add more characters so that relloc occurs
-  auto echo = StringRef::from_lit("echo0123456789");
-  fs.append_last_header_value(echo.c_str(), echo.size());
-
-  fs.add_header_token(StringRef::from_lit("echo"),
-                      StringRef::from_lit("foxtrot"), false, -1);
-
-  auto ans =
-      HeaderRefs{{StringRef::from_lit("alphabravogolf0123456789"),
-                  StringRef::from_lit("CharliedeltAecho0123456789")},
-                 {StringRef::from_lit("echo"), StringRef::from_lit("foxtrot")}};
-  CU_ASSERT(ans == fs.headers());
-}
-
-void test_downstream_field_store_header(void) {
-  BlockAllocator balloc(16, 16);
-  FieldStore fs(balloc, 0);
-  fs.add_header_token(StringRef::from_lit("alpha"), StringRef::from_lit("0"),
-                      false, -1);
-  fs.add_header_token(StringRef::from_lit(":authority"),
-                      StringRef::from_lit("1"), false, http2::HD__AUTHORITY);
-  fs.add_header_token(StringRef::from_lit("content-length"),
-                      StringRef::from_lit("2"), false,
-                      http2::HD_CONTENT_LENGTH);
-
-  // By token
-  CU_ASSERT(HeaderRef(StringRef{":authority"}, StringRef{"1"}) ==
-            *fs.header(http2::HD__AUTHORITY));
-  CU_ASSERT(nullptr == fs.header(http2::HD__METHOD));
-
-  // By name
-  CU_ASSERT(HeaderRef(StringRef{"alpha"}, StringRef{"0"}) ==
-            *fs.header(StringRef::from_lit("alpha")));
-  CU_ASSERT(nullptr == fs.header(StringRef::from_lit("bravo")));
-}
-
-void test_downstream_crumble_request_cookie(void) {
-  Downstream d(nullptr, nullptr, 0);
-  auto &req = d.request();
-  req.fs.add_header_token(StringRef::from_lit(":method"),
-                          StringRef::from_lit("get"), false, -1);
-  req.fs.add_header_token(StringRef::from_lit(":path"),
-                          StringRef::from_lit("/"), false, -1);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("alpha; bravo; ; ;; charlie;;"),
-                          true, http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit(";delta"), false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("echo"), false, http2::HD_COOKIE);
-
-  std::vector<nghttp2_nv> nva;
-  d.crumble_request_cookie(nva);
-
-  auto num_cookies = d.count_crumble_request_cookie();
-
-  CU_ASSERT(5 == nva.size());
-  CU_ASSERT(5 == num_cookies);
-
-  HeaderRefs cookies;
-  std::transform(std::begin(nva), std::end(nva), std::back_inserter(cookies),
-                 [](const nghttp2_nv &nv) {
-                   return HeaderRef(StringRef{nv.name, nv.namelen},
-                                    StringRef{nv.value, nv.valuelen},
-                                    nv.flags & NGHTTP2_NV_FLAG_NO_INDEX);
-                 });
-
-  HeaderRefs ans = {
-      {StringRef::from_lit("cookie"), StringRef::from_lit("alpha")},
-      {StringRef::from_lit("cookie"), StringRef::from_lit("bravo")},
-      {StringRef::from_lit("cookie"), StringRef::from_lit("charlie")},
-      {StringRef::from_lit("cookie"), StringRef::from_lit("delta")},
-      {StringRef::from_lit("cookie"), StringRef::from_lit("echo")}};
-
-  CU_ASSERT(ans == cookies);
-  CU_ASSERT(cookies[0].no_index);
-  CU_ASSERT(cookies[1].no_index);
-  CU_ASSERT(cookies[2].no_index);
-}
-
-void test_downstream_assemble_request_cookie(void) {
-  Downstream d(nullptr, nullptr, 0);
-  auto &req = d.request();
-
-  req.fs.add_header_token(StringRef::from_lit(":method"),
-                          StringRef::from_lit("get"), false, -1);
-  req.fs.add_header_token(StringRef::from_lit(":path"),
-                          StringRef::from_lit("/"), false, -1);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("alpha"), false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("bravo;"), false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("charlie; "), false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("delta;;"), false,
-                          http2::HD_COOKIE);
-  CU_ASSERT("alpha; bravo; charlie; delta" == d.assemble_request_cookie());
-}
-
-void test_downstream_rewrite_location_response_header(void) {
-  Downstream d(nullptr, nullptr, 0);
-  auto &req = d.request();
-  auto &resp = d.response();
-  d.set_request_downstream_host(StringRef::from_lit("localhost2"));
-  req.authority = StringRef::from_lit("localhost:8443");
-  resp.fs.add_header_token(StringRef::from_lit("location"),
-                           StringRef::from_lit("http://localhost2:3000/"),
-                           false, http2::HD_LOCATION);
-  d.rewrite_location_response_header(StringRef::from_lit("https"));
-  auto location = resp.fs.header(http2::HD_LOCATION);
-  CU_ASSERT("https://localhost:8443/" == (*location).value);
-}
-
-void test_downstream_supports_non_final_response(void) {
-  Downstream d(nullptr, nullptr, 0);
-  auto &req = d.request();
-
-  req.http_major = 2;
-  req.http_minor = 0;
-
-  CU_ASSERT(d.supports_non_final_response());
-
-  req.http_major = 1;
-  req.http_minor = 1;
-
-  CU_ASSERT(d.supports_non_final_response());
-
-  req.http_major = 1;
-  req.http_minor = 0;
-
-  CU_ASSERT(!d.supports_non_final_response());
-
-  req.http_major = 0;
-  req.http_minor = 9;
-
-  CU_ASSERT(!d.supports_non_final_response());
-}
-
-void test_downstream_find_affinity_cookie(void) {
-  Downstream d(nullptr, nullptr, 0);
-
-  auto &req = d.request();
-  req.fs.add_header_token(StringRef::from_lit("cookie"), StringRef{}, false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("a=b;;c=d"), false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("content-length"),
-                          StringRef::from_lit("599"), false,
-                          http2::HD_CONTENT_LENGTH);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("lb=deadbeef;LB=f1f2f3f4"), false,
-                          http2::HD_COOKIE);
-  req.fs.add_header_token(StringRef::from_lit("cookie"),
-                          StringRef::from_lit("short=e1e2e3e"), false,
-                          http2::HD_COOKIE);
-
-  uint32_t aff;
-
-  aff = d.find_affinity_cookie(StringRef::from_lit("lb"));
-
-  CU_ASSERT(0xdeadbeef == aff);
-
-  aff = d.find_affinity_cookie(StringRef::from_lit("LB"));
-
-  CU_ASSERT(0xf1f2f3f4 == aff);
-
-  aff = d.find_affinity_cookie(StringRef::from_lit("short"));
-
-  CU_ASSERT(0 == aff);
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_downstream_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DOWNSTREAM_TEST_H
-#define SHRPX_DOWNSTREAM_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_downstream_field_store_append_last_header(void);
-void test_downstream_field_store_header(void);
-void test_downstream_crumble_request_cookie(void);
-void test_downstream_assemble_request_cookie(void);
-void test_downstream_rewrite_location_response_header(void);
-void test_downstream_supports_non_final_response(void);
-void test_downstream_find_affinity_cookie(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_DOWNSTREAM_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_dual_dns_resolver.h"
-
-namespace shrpx {
-
-DualDNSResolver::DualDNSResolver(struct ev_loop *loop)
-    : resolv4_(loop), resolv6_(loop) {
-  auto cb = [this](int, const Address *) {
-    int rv;
-    Address result;
-
-    rv = this->get_status(&result);
-    switch (rv) {
-    case DNS_STATUS_ERROR:
-    case DNS_STATUS_OK:
-      break;
-    default:
-      return;
-    }
-
-    auto cb = this->get_complete_cb();
-    cb(rv, &result);
-  };
-
-  resolv4_.set_complete_cb(cb);
-  resolv6_.set_complete_cb(cb);
-}
-
-int DualDNSResolver::resolve(const StringRef &host) {
-  int rv4, rv6;
-  rv4 = resolv4_.resolve(host, AF_INET);
-  rv6 = resolv6_.resolve(host, AF_INET6);
-
-  if (rv4 != 0 && rv6 != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-CompleteCb DualDNSResolver::get_complete_cb() const { return complete_cb_; }
-
-void DualDNSResolver::set_complete_cb(CompleteCb cb) { complete_cb_ = cb; }
-
-int DualDNSResolver::get_status(Address *result) const {
-  int rv4, rv6;
-  rv6 = resolv6_.get_status(result);
-  if (rv6 == DNS_STATUS_OK) {
-    return DNS_STATUS_OK;
-  }
-  rv4 = resolv4_.get_status(result);
-  if (rv4 == DNS_STATUS_OK) {
-    return DNS_STATUS_OK;
-  }
-  if (rv4 == DNS_STATUS_RUNNING || rv6 == DNS_STATUS_RUNNING) {
-    return DNS_STATUS_RUNNING;
-  }
-  if (rv4 == DNS_STATUS_ERROR || rv6 == DNS_STATUS_ERROR) {
-    return DNS_STATUS_ERROR;
-  }
-  return DNS_STATUS_IDLE;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_dual_dns_resolver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_DUAL_DNS_RESOLVER_H
-#define SHRPX_DUAL_DNS_RESOLVER_H
-
-#include "shrpx.h"
-
-#include <ev.h>
-
-#include "shrpx_dns_resolver.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-// DualDNSResolver performs name resolution for both A and AAAA
-// records at the same time.  The first successful return (or if we
-// have both successful results, prefer to AAAA) is chosen.  This is
-// wrapper around 2 DNSResolver inside.  resolve(), get_status(), and
-// how CompleteCb is called have the same semantics with DNSResolver.
-class DualDNSResolver {
-public:
-  DualDNSResolver(struct ev_loop *loop);
-
-  // Resolves |host|.  |host| must be NULL-terminated string.
-  int resolve(const StringRef &host);
-  CompleteCb get_complete_cb() const;
-  void set_complete_cb(CompleteCb cb);
-  int get_status(Address *result) const;
-
-private:
-  // For A record
-  DNSResolver resolv4_;
-  // For AAAA record
-  DNSResolver resolv6_;
-  CompleteCb complete_cb_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_DUAL_DNS_RESOLVER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_error.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_error.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_error.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_ERROR_H
-#define SHRPX_ERROR_H
-
-#include "shrpx.h"
-
-namespace shrpx {
-
-// Deprecated, do not use.
-enum ErrorCode {
-  SHRPX_ERR_SUCCESS = 0,
-  SHRPX_ERR_ERROR = -1,
-  SHRPX_ERR_NETWORK = -100,
-  SHRPX_ERR_EOF = -101,
-  SHRPX_ERR_INPROGRESS = -102,
-  SHRPX_ERR_DCONN_CANCELED = -103,
-  SHRPX_ERR_RETRY = -104,
-  SHRPX_ERR_TLS_REQUIRED = -105,
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_ERROR_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_exec.h"
-
-#include <cerrno>
-
-#include "shrpx_signal.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-// inspired by h2o_read_command function from h2o project:
-// https://github.com/h2o/h2o
-int exec_read_command(Process &proc, char *const argv[]) {
-  int rv;
-  int pfd[2];
-
-#ifdef O_CLOEXEC
-  if (pipe2(pfd, O_CLOEXEC) == -1) {
-    return -1;
-  }
-#else  // !O_CLOEXEC
-  if (pipe(pfd) == -1) {
-    return -1;
-  }
-  util::make_socket_closeonexec(pfd[0]);
-  util::make_socket_closeonexec(pfd[1]);
-#endif // !O_CLOEXEC
-
-  auto closer = defer([&pfd]() {
-    if (pfd[0] != -1) {
-      close(pfd[0]);
-    }
-
-    if (pfd[1] != -1) {
-      close(pfd[1]);
-    }
-  });
-
-  sigset_t oldset;
-
-  rv = shrpx_signal_block_all(&oldset);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(ERROR) << "Blocking all signals failed: errno=" << error;
-
-    return -1;
-  }
-
-  auto pid = fork();
-
-  if (pid == 0) {
-    // This is multithreaded program, and we are allowed to use only
-    // async-signal-safe functions here.
-
-    // child process
-    shrpx_signal_unset_worker_proc_ign_handler();
-
-    rv = shrpx_signal_unblock_all();
-    if (rv != 0) {
-      static constexpr char msg[] = "Unblocking all signals failed\n";
-      while (write(STDERR_FILENO, msg, str_size(msg)) == -1 && errno == EINTR)
-        ;
-      nghttp2_Exit(EXIT_FAILURE);
-    }
-
-    dup2(pfd[1], 1);
-    close(pfd[0]);
-
-    rv = execv(argv[0], argv);
-    if (rv == -1) {
-      static constexpr char msg[] = "Could not execute command\n";
-      while (write(STDERR_FILENO, msg, str_size(msg)) == -1 && errno == EINTR)
-        ;
-      nghttp2_Exit(EXIT_FAILURE);
-    }
-    // unreachable
-  }
-
-  // parent process
-  if (pid == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Could not execute command: " << argv[0]
-               << ", fork() failed, errno=" << error;
-  }
-
-  rv = shrpx_signal_set(&oldset);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(FATAL) << "Restoring all signals failed: errno=" << error;
-
-    nghttp2_Exit(EXIT_FAILURE);
-  }
-
-  if (pid == -1) {
-    return -1;
-  }
-
-  close(pfd[1]);
-  pfd[1] = -1;
-
-  util::make_socket_nonblocking(pfd[0]);
-
-  proc.pid = pid;
-  proc.rfd = pfd[0];
-
-  pfd[0] = -1;
-
-  return 0;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_exec.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_EXEC_H
-#define SHRPX_EXEC_H
-
-#include "unistd.h"
-
-namespace shrpx {
-
-struct Process {
-  pid_t pid;
-  // fd to read from process
-  int rfd;
-};
-
-// Executes command |argv| after forking current process.  The command
-// should not expect to read from stdin.  Parent process can read the
-// stdout from command using proc.rfd.  On success, this function
-// returns 0, and process information is stored in |proc|.  Otherwise,
-// returns -1.
-int exec_read_command(Process &proc, char *const argv[]);
-
-} // namespace shrpx
-
-#endif // SHRPX_EXEC_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_H
-#define SHRPX_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-
-#include <cassert>
-
-#ifndef HAVE__EXIT
-#  define nghttp2_Exit(status) _exit(status)
-#else // HAVE__EXIT
-#  define nghttp2_Exit(status) _Exit(status)
-#endif // HAVE__EXIT
-
-#define DIE() nghttp2_Exit(EXIT_FAILURE)
-
-#if defined(HAVE_DECL_INITGROUPS) && !HAVE_DECL_INITGROUPS
-inline int initgroups(const char *user, gid_t group) { return 0; }
-#endif // defined(HAVE_DECL_INITGROUPS) && !HAVE_DECL_INITGROUPS
-
-#endif // SHRPX_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_health_monitor_downstream_connection.h"
-
-#include "shrpx_client_handler.h"
-#include "shrpx_upstream.h"
-#include "shrpx_downstream.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-HealthMonitorDownstreamConnection::HealthMonitorDownstreamConnection() {}
-
-HealthMonitorDownstreamConnection::~HealthMonitorDownstreamConnection() {}
-
-int HealthMonitorDownstreamConnection::attach_downstream(
-    Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Attaching to DOWNSTREAM:" << downstream;
-  }
-
-  downstream_ = downstream;
-
-  return 0;
-}
-
-void HealthMonitorDownstreamConnection::detach_downstream(
-    Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Detaching from DOWNSTREAM:" << downstream;
-  }
-  downstream_ = nullptr;
-}
-
-int HealthMonitorDownstreamConnection::push_request_headers() {
-  downstream_->set_request_header_sent(true);
-  auto src = downstream_->get_blocked_request_buf();
-  auto dest = downstream_->get_request_buf();
-  src->remove(*dest);
-
-  return 0;
-}
-
-int HealthMonitorDownstreamConnection::push_upload_data_chunk(
-    const uint8_t *data, size_t datalen) {
-  return 0;
-}
-
-int HealthMonitorDownstreamConnection::end_upload_data() {
-  auto upstream = downstream_->get_upstream();
-  auto &resp = downstream_->response();
-
-  resp.http_status = 200;
-
-  resp.fs.add_header_token(StringRef::from_lit("content-length"),
-                           StringRef::from_lit("0"), false,
-                           http2::HD_CONTENT_LENGTH);
-
-  if (upstream->send_reply(downstream_, nullptr, 0) != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-void HealthMonitorDownstreamConnection::pause_read(IOCtrlReason reason) {}
-
-int HealthMonitorDownstreamConnection::resume_read(IOCtrlReason reason,
-                                                   size_t consumed) {
-  return 0;
-}
-
-void HealthMonitorDownstreamConnection::force_resume_read() {}
-
-int HealthMonitorDownstreamConnection::on_read() { return 0; }
-
-int HealthMonitorDownstreamConnection::on_write() { return 0; }
-
-void HealthMonitorDownstreamConnection::on_upstream_change(Upstream *uptream) {}
-
-bool HealthMonitorDownstreamConnection::poolable() const { return false; }
-
-const std::shared_ptr<DownstreamAddrGroup> &
-HealthMonitorDownstreamConnection::get_downstream_addr_group() const {
-  static std::shared_ptr<DownstreamAddrGroup> s;
-  return s;
-}
-
-DownstreamAddr *HealthMonitorDownstreamConnection::get_addr() const {
-  return nullptr;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_health_monitor_downstream_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HEALTH_MONITOR_DOWNSTREAM_CONNECTION_H
-#define SHRPX_HEALTH_MONITOR_DOWNSTREAM_CONNECTION_H
-
-#include "shrpx_downstream_connection.h"
-
-namespace shrpx {
-
-class Worker;
-
-class HealthMonitorDownstreamConnection : public DownstreamConnection {
-public:
-  HealthMonitorDownstreamConnection();
-  virtual ~HealthMonitorDownstreamConnection();
-  virtual int attach_downstream(Downstream *downstream);
-  virtual void detach_downstream(Downstream *downstream);
-
-  virtual int push_request_headers();
-  virtual int push_upload_data_chunk(const uint8_t *data, size_t datalen);
-  virtual int end_upload_data();
-
-  virtual void pause_read(IOCtrlReason reason);
-  virtual int resume_read(IOCtrlReason reason, size_t consumed);
-  virtual void force_resume_read();
-
-  virtual int on_read();
-  virtual int on_write();
-
-  virtual void on_upstream_change(Upstream *uptream);
-
-  // true if this object is poolable.
-  virtual bool poolable() const;
-
-  virtual const std::shared_ptr<DownstreamAddrGroup> &
-  get_downstream_addr_group() const;
-  virtual DownstreamAddr *get_addr() const;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_HEALTH_MONITOR_DOWNSTREAM_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,591 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_http2_downstream_connection.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include "http-parser/http_parser.h"
-
-#include "shrpx_client_handler.h"
-#include "shrpx_upstream.h"
-#include "shrpx_downstream.h"
-#include "shrpx_config.h"
-#include "shrpx_error.h"
-#include "shrpx_http.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_worker.h"
-#include "shrpx_log.h"
-#include "http2.h"
-#include "util.h"
-#include "ssl_compat.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-Http2DownstreamConnection::Http2DownstreamConnection(Http2Session *http2session)
-    : dlnext(nullptr),
-      dlprev(nullptr),
-      http2session_(http2session),
-      sd_(nullptr) {}
-
-Http2DownstreamConnection::~Http2DownstreamConnection() {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Deleting";
-  }
-  if (downstream_) {
-    downstream_->disable_downstream_rtimer();
-    downstream_->disable_downstream_wtimer();
-
-    uint32_t error_code;
-    if (downstream_->get_request_state() == Downstream::STREAM_CLOSED &&
-        downstream_->get_upgraded()) {
-      // For upgraded connection, send NO_ERROR.  Should we consider
-      // request states other than Downstream::STREAM_CLOSED ?
-      error_code = NGHTTP2_NO_ERROR;
-    } else {
-      error_code = NGHTTP2_INTERNAL_ERROR;
-    }
-
-    if (http2session_->get_state() == Http2Session::CONNECTED &&
-        downstream_->get_downstream_stream_id() != -1) {
-      submit_rst_stream(downstream_, error_code);
-
-      auto &resp = downstream_->response();
-
-      http2session_->consume(downstream_->get_downstream_stream_id(),
-                             resp.unconsumed_body_length);
-
-      resp.unconsumed_body_length = 0;
-
-      http2session_->signal_write();
-    }
-  }
-  http2session_->remove_downstream_connection(this);
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Deleted";
-  }
-}
-
-int Http2DownstreamConnection::attach_downstream(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Attaching to DOWNSTREAM:" << downstream;
-  }
-  http2session_->add_downstream_connection(this);
-  http2session_->signal_write();
-
-  downstream_ = downstream;
-  downstream_->reset_downstream_rtimer();
-
-  auto &req = downstream_->request();
-
-  // HTTP/2 disables HTTP Upgrade.
-  if (req.method != HTTP_CONNECT) {
-    req.upgrade_request = false;
-  }
-
-  return 0;
-}
-
-void Http2DownstreamConnection::detach_downstream(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Detaching from DOWNSTREAM:" << downstream;
-  }
-
-  auto &resp = downstream_->response();
-
-  if (downstream_->get_downstream_stream_id() != -1) {
-    if (submit_rst_stream(downstream) == 0) {
-      http2session_->signal_write();
-    }
-
-    http2session_->consume(downstream_->get_downstream_stream_id(),
-                           resp.unconsumed_body_length);
-
-    resp.unconsumed_body_length = 0;
-
-    http2session_->signal_write();
-  }
-
-  downstream->disable_downstream_rtimer();
-  downstream->disable_downstream_wtimer();
-  downstream_ = nullptr;
-}
-
-int Http2DownstreamConnection::submit_rst_stream(Downstream *downstream,
-                                                 uint32_t error_code) {
-  int rv = -1;
-  if (http2session_->get_state() == Http2Session::CONNECTED &&
-      downstream->get_downstream_stream_id() != -1) {
-    switch (downstream->get_response_state()) {
-    case Downstream::MSG_RESET:
-    case Downstream::MSG_BAD_HEADER:
-    case Downstream::MSG_COMPLETE:
-      break;
-    default:
-      if (LOG_ENABLED(INFO)) {
-        DCLOG(INFO, this) << "Submit RST_STREAM for DOWNSTREAM:" << downstream
-                          << ", stream_id="
-                          << downstream->get_downstream_stream_id()
-                          << ", error_code=" << error_code;
-      }
-      rv = http2session_->submit_rst_stream(
-          downstream->get_downstream_stream_id(), error_code);
-    }
-  }
-  return rv;
-}
-
-namespace {
-ssize_t http2_data_read_callback(nghttp2_session *session, int32_t stream_id,
-                                 uint8_t *buf, size_t length,
-                                 uint32_t *data_flags,
-                                 nghttp2_data_source *source, void *user_data) {
-  int rv;
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-  if (!sd || !sd->dconn) {
-    return NGHTTP2_ERR_DEFERRED;
-  }
-  auto dconn = sd->dconn;
-  auto downstream = dconn->get_downstream();
-  if (!downstream) {
-    // In this case, RST_STREAM should have been issued. But depending
-    // on the priority, DATA frame may come first.
-    return NGHTTP2_ERR_DEFERRED;
-  }
-  const auto &req = downstream->request();
-  auto input = downstream->get_request_buf();
-
-  auto nread = std::min(input->rleft(), length);
-  auto input_empty = input->rleft() == nread;
-
-  *data_flags |= NGHTTP2_DATA_FLAG_NO_COPY;
-
-  if (input_empty &&
-      downstream->get_request_state() == Downstream::MSG_COMPLETE &&
-      // If connection is upgraded, don't set EOF flag, since HTTP/1
-      // will set MSG_COMPLETE to request state after upgrade response
-      // header is seen.
-      (!req.upgrade_request ||
-       (downstream->get_response_state() == Downstream::HEADER_COMPLETE &&
-        !downstream->get_upgraded()))) {
-
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-    const auto &trailers = req.fs.trailers();
-    if (!trailers.empty()) {
-      std::vector<nghttp2_nv> nva;
-      nva.reserve(trailers.size());
-      http2::copy_headers_to_nva_nocopy(nva, trailers, http2::HDOP_STRIP_ALL);
-      if (!nva.empty()) {
-        rv = nghttp2_submit_trailer(session, stream_id, nva.data(), nva.size());
-        if (rv != 0) {
-          if (nghttp2_is_fatal(rv)) {
-            return NGHTTP2_ERR_CALLBACK_FAILURE;
-          }
-        } else {
-          *data_flags |= NGHTTP2_DATA_FLAG_NO_END_STREAM;
-        }
-      }
-    }
-  }
-
-  if (nread == 0 && (*data_flags & NGHTTP2_DATA_FLAG_EOF) == 0) {
-    downstream->disable_downstream_wtimer();
-
-    return NGHTTP2_ERR_DEFERRED;
-  }
-
-  return nread;
-}
-} // namespace
-
-int Http2DownstreamConnection::push_request_headers() {
-  int rv;
-  if (!downstream_) {
-    return 0;
-  }
-  if (!http2session_->can_push_request()) {
-    // The HTTP2 session to the backend has not been established or
-    // connection is now being checked.  This function will be called
-    // again just after it is established.
-    downstream_->set_request_pending(true);
-    http2session_->start_checking_connection();
-    return 0;
-  }
-
-  downstream_->set_request_pending(false);
-
-  const auto &req = downstream_->request();
-
-  auto &balloc = downstream_->get_block_allocator();
-
-  auto config = get_config();
-  auto &httpconf = config->http;
-  auto &http2conf = config->http2;
-
-  auto no_host_rewrite = httpconf.no_host_rewrite || config->http2_proxy ||
-                         req.method == HTTP_CONNECT;
-
-  // http2session_ has already in CONNECTED state, so we can get
-  // addr_idx here.
-  const auto &downstream_hostport = http2session_->get_addr()->hostport;
-
-  // For HTTP/1.0 request, there is no authority in request.  In that
-  // case, we use backend server's host nonetheless.
-  auto authority = StringRef(downstream_hostport);
-
-  if (no_host_rewrite && !req.authority.empty()) {
-    authority = req.authority;
-  }
-
-  downstream_->set_request_downstream_host(authority);
-
-  size_t num_cookies = 0;
-  if (!http2conf.no_cookie_crumbling) {
-    num_cookies = downstream_->count_crumble_request_cookie();
-  }
-
-  // 10 means:
-  // 1. :method
-  // 2. :scheme
-  // 3. :path
-  // 4. :authority (or host)
-  // 5. via (optional)
-  // 6. x-forwarded-for (optional)
-  // 7. x-forwarded-proto (optional)
-  // 8. te (optional)
-  // 9. forwarded (optional)
-  // 10. early-data (optional)
-  auto nva = std::vector<nghttp2_nv>();
-  nva.reserve(req.fs.headers().size() + 10 + num_cookies +
-              httpconf.add_request_headers.size());
-
-  nva.push_back(
-      http2::make_nv_ls_nocopy(":method", http2::to_method_string(req.method)));
-
-  if (req.method != HTTP_CONNECT) {
-    assert(!req.scheme.empty());
-
-    auto addr = http2session_->get_addr();
-    assert(addr);
-    // We will handle more protocol scheme upgrade in the future.
-    if (addr->tls && addr->upgrade_scheme && req.scheme == "http") {
-      nva.push_back(http2::make_nv_ll(":scheme", "https"));
-    } else {
-      nva.push_back(http2::make_nv_ls_nocopy(":scheme", req.scheme));
-    }
-
-    if (req.method == HTTP_OPTIONS && req.path.empty()) {
-      nva.push_back(http2::make_nv_ll(":path", "*"));
-    } else {
-      nva.push_back(http2::make_nv_ls_nocopy(":path", req.path));
-    }
-
-    if (!req.no_authority) {
-      nva.push_back(http2::make_nv_ls_nocopy(":authority", authority));
-    } else {
-      nva.push_back(http2::make_nv_ls_nocopy("host", authority));
-    }
-  } else {
-    nva.push_back(http2::make_nv_ls_nocopy(":authority", authority));
-  }
-
-  auto &fwdconf = httpconf.forwarded;
-  auto &xffconf = httpconf.xff;
-  auto &xfpconf = httpconf.xfp;
-  auto &earlydataconf = httpconf.early_data;
-
-  uint32_t build_flags =
-      (fwdconf.strip_incoming ? http2::HDOP_STRIP_FORWARDED : 0) |
-      (xffconf.strip_incoming ? http2::HDOP_STRIP_X_FORWARDED_FOR : 0) |
-      (xfpconf.strip_incoming ? http2::HDOP_STRIP_X_FORWARDED_PROTO : 0) |
-      (earlydataconf.strip_incoming ? http2::HDOP_STRIP_EARLY_DATA : 0);
-
-  http2::copy_headers_to_nva_nocopy(nva, req.fs.headers(), build_flags);
-
-  if (!http2conf.no_cookie_crumbling) {
-    downstream_->crumble_request_cookie(nva);
-  }
-
-  auto upstream = downstream_->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-#if OPENSSL_1_1_1_API
-  auto conn = handler->get_connection();
-
-  if (!SSL_is_init_finished(conn->tls.ssl)) {
-    nva.push_back(http2::make_nv_ll("early-data", "1"));
-  }
-#endif // OPENSSL_1_1_1_API
-
-  auto fwd =
-      fwdconf.strip_incoming ? nullptr : req.fs.header(http2::HD_FORWARDED);
-
-  if (fwdconf.params) {
-    auto params = fwdconf.params;
-
-    if (config->http2_proxy || req.method == HTTP_CONNECT) {
-      params &= ~FORWARDED_PROTO;
-    }
-
-    auto value = http::create_forwarded(
-        balloc, params, handler->get_forwarded_by(),
-        handler->get_forwarded_for(), req.authority, req.scheme);
-
-    if (fwd || !value.empty()) {
-      if (fwd) {
-        if (value.empty()) {
-          value = fwd->value;
-        } else {
-          value = concat_string_ref(balloc, fwd->value,
-                                    StringRef::from_lit(", "), value);
-        }
-      }
-
-      nva.push_back(http2::make_nv_ls_nocopy("forwarded", value));
-    }
-  } else if (fwd) {
-    nva.push_back(http2::make_nv_ls_nocopy("forwarded", fwd->value));
-  }
-
-  auto xff = xffconf.strip_incoming ? nullptr
-                                    : req.fs.header(http2::HD_X_FORWARDED_FOR);
-
-  if (xffconf.add) {
-    StringRef xff_value;
-    const auto &addr = upstream->get_client_handler()->get_ipaddr();
-    if (xff) {
-      xff_value = concat_string_ref(balloc, xff->value,
-                                    StringRef::from_lit(", "), addr);
-    } else {
-      xff_value = addr;
-    }
-    nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-for", xff_value));
-  } else if (xff) {
-    nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-for", xff->value));
-  }
-
-  if (!config->http2_proxy && req.method != HTTP_CONNECT) {
-    auto xfp = xfpconf.strip_incoming
-                   ? nullptr
-                   : req.fs.header(http2::HD_X_FORWARDED_PROTO);
-
-    if (xfpconf.add) {
-      StringRef xfp_value;
-      // We use same protocol with :scheme header field
-      if (xfp) {
-        xfp_value = concat_string_ref(balloc, xfp->value,
-                                      StringRef::from_lit(", "), req.scheme);
-      } else {
-        xfp_value = req.scheme;
-      }
-      nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-proto", xfp_value));
-    } else if (xfp) {
-      nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-proto", xfp->value));
-    }
-  }
-
-  auto via = req.fs.header(http2::HD_VIA);
-  if (httpconf.no_via) {
-    if (via) {
-      nva.push_back(http2::make_nv_ls_nocopy("via", (*via).value));
-    }
-  } else {
-    size_t vialen = 16;
-    if (via) {
-      vialen += via->value.size() + 2;
-    }
-
-    auto iov = make_byte_ref(balloc, vialen + 1);
-    auto p = iov.base;
-
-    if (via) {
-      p = std::copy(std::begin(via->value), std::end(via->value), p);
-      p = util::copy_lit(p, ", ");
-    }
-    p = http::create_via_header_value(p, req.http_major, req.http_minor);
-    *p = '\0';
-
-    nva.push_back(http2::make_nv_ls_nocopy("via", StringRef{iov.base, p}));
-  }
-
-  auto te = req.fs.header(http2::HD_TE);
-  // HTTP/1 upstream request can contain keyword other than
-  // "trailers".  We just forward "trailers".
-  // TODO more strict handling required here.
-  if (te && http2::contains_trailers(te->value)) {
-    nva.push_back(http2::make_nv_ll("te", "trailers"));
-  }
-
-  for (auto &p : httpconf.add_request_headers) {
-    nva.push_back(http2::make_nv_nocopy(p.name, p.value));
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    std::stringstream ss;
-    for (auto &nv : nva) {
-      ss << TTY_HTTP_HD << StringRef{nv.name, nv.namelen} << TTY_RST << ": "
-         << StringRef{nv.value, nv.valuelen} << "\n";
-    }
-    DCLOG(INFO, this) << "HTTP request headers\n" << ss.str();
-  }
-
-  auto transfer_encoding = req.fs.header(http2::HD_TRANSFER_ENCODING);
-
-  nghttp2_data_provider *data_prdptr = nullptr;
-  nghttp2_data_provider data_prd;
-
-  // Add body as long as transfer-encoding is given even if
-  // req.fs.content_length == 0 to forward trailer fields.
-  if (req.method == HTTP_CONNECT || transfer_encoding ||
-      req.fs.content_length > 0 || req.http2_expect_body) {
-    // Request-body is expected.
-    data_prd = {{}, http2_data_read_callback};
-    data_prdptr = &data_prd;
-  }
-
-  rv = http2session_->submit_request(this, nva.data(), nva.size(), data_prdptr);
-  if (rv != 0) {
-    DCLOG(FATAL, this) << "nghttp2_submit_request() failed";
-    return -1;
-  }
-
-  if (data_prdptr) {
-    downstream_->reset_downstream_wtimer();
-  }
-
-  http2session_->signal_write();
-  return 0;
-}
-
-int Http2DownstreamConnection::push_upload_data_chunk(const uint8_t *data,
-                                                      size_t datalen) {
-  int rv;
-  auto output = downstream_->get_request_buf();
-  output->append(data, datalen);
-  if (downstream_->get_downstream_stream_id() != -1) {
-    rv = http2session_->resume_data(this);
-    if (rv != 0) {
-      return -1;
-    }
-
-    downstream_->ensure_downstream_wtimer();
-
-    http2session_->signal_write();
-  }
-  return 0;
-}
-
-int Http2DownstreamConnection::end_upload_data() {
-  int rv;
-  if (downstream_->get_downstream_stream_id() != -1) {
-    rv = http2session_->resume_data(this);
-    if (rv != 0) {
-      return -1;
-    }
-
-    downstream_->ensure_downstream_wtimer();
-
-    http2session_->signal_write();
-  }
-  return 0;
-}
-
-int Http2DownstreamConnection::resume_read(IOCtrlReason reason,
-                                           size_t consumed) {
-  int rv;
-
-  if (http2session_->get_state() != Http2Session::CONNECTED) {
-    return 0;
-  }
-
-  if (!downstream_ || downstream_->get_downstream_stream_id() == -1) {
-    return 0;
-  }
-
-  if (consumed > 0) {
-    rv = http2session_->consume(downstream_->get_downstream_stream_id(),
-                                consumed);
-
-    if (rv != 0) {
-      return -1;
-    }
-
-    auto &resp = downstream_->response();
-
-    resp.unconsumed_body_length -= consumed;
-
-    http2session_->signal_write();
-  }
-
-  return 0;
-}
-
-int Http2DownstreamConnection::on_read() { return 0; }
-
-int Http2DownstreamConnection::on_write() { return 0; }
-
-void Http2DownstreamConnection::attach_stream_data(StreamData *sd) {
-  // It is possible sd->dconn is not NULL. sd is detached when
-  // on_stream_close_callback. Before that, after MSG_COMPLETE is set
-  // to Downstream::set_response_state(), upstream's readcb is called
-  // and execution path eventually could reach here. Since the
-  // response was already handled, we just detach sd.
-  detach_stream_data();
-  sd_ = sd;
-  sd_->dconn = this;
-}
-
-StreamData *Http2DownstreamConnection::detach_stream_data() {
-  if (sd_) {
-    auto sd = sd_;
-    sd_ = nullptr;
-    sd->dconn = nullptr;
-    return sd;
-  }
-  return nullptr;
-}
-
-int Http2DownstreamConnection::on_timeout() {
-  if (!downstream_) {
-    return 0;
-  }
-
-  return submit_rst_stream(downstream_, NGHTTP2_NO_ERROR);
-}
-
-const std::shared_ptr<DownstreamAddrGroup> &
-Http2DownstreamConnection::get_downstream_addr_group() const {
-  return http2session_->get_downstream_addr_group();
-}
-
-DownstreamAddr *Http2DownstreamConnection::get_addr() const { return nullptr; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_downstream_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP2_DOWNSTREAM_CONNECTION_H
-#define SHRPX_HTTP2_DOWNSTREAM_CONNECTION_H
-
-#include "shrpx.h"
-
-#include <openssl/ssl.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_downstream_connection.h"
-
-namespace shrpx {
-
-struct StreamData;
-class Http2Session;
-class DownstreamConnectionPool;
-
-class Http2DownstreamConnection : public DownstreamConnection {
-public:
-  Http2DownstreamConnection(Http2Session *http2session);
-  virtual ~Http2DownstreamConnection();
-  virtual int attach_downstream(Downstream *downstream);
-  virtual void detach_downstream(Downstream *downstream);
-
-  virtual int push_request_headers();
-  virtual int push_upload_data_chunk(const uint8_t *data, size_t datalen);
-  virtual int end_upload_data();
-
-  virtual void pause_read(IOCtrlReason reason) {}
-  virtual int resume_read(IOCtrlReason reason, size_t consumed);
-  virtual void force_resume_read() {}
-
-  virtual int on_read();
-  virtual int on_write();
-  virtual int on_timeout();
-
-  virtual void on_upstream_change(Upstream *upstream) {}
-
-  // This object is not poolable because we dont' have facility to
-  // migrate to another Http2Session object.
-  virtual bool poolable() const { return false; }
-
-  virtual const std::shared_ptr<DownstreamAddrGroup> &
-  get_downstream_addr_group() const;
-  virtual DownstreamAddr *get_addr() const;
-
-  int send();
-
-  void attach_stream_data(StreamData *sd);
-  StreamData *detach_stream_data();
-
-  int submit_rst_stream(Downstream *downstream,
-                        uint32_t error_code = NGHTTP2_INTERNAL_ERROR);
-
-  Http2DownstreamConnection *dlnext, *dlprev;
-
-private:
-  Http2Session *http2session_;
-  StreamData *sd_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP2_DOWNSTREAM_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2408 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_http2_session.h"
-
-#include <netinet/tcp.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include <vector>
-
-#include <openssl/err.h>
-
-#include "shrpx_upstream.h"
-#include "shrpx_downstream.h"
-#include "shrpx_config.h"
-#include "shrpx_error.h"
-#include "shrpx_http2_downstream_connection.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_tls.h"
-#include "shrpx_http.h"
-#include "shrpx_worker.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_log.h"
-#include "http2.h"
-#include "util.h"
-#include "base64.h"
-#include "tls.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-constexpr ev_tstamp CONNCHK_TIMEOUT = 5.;
-constexpr ev_tstamp CONNCHK_PING_TIMEOUT = 1.;
-} // namespace
-
-namespace {
-constexpr size_t MAX_BUFFER_SIZE = 32_k;
-} // namespace
-
-namespace {
-void connchk_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto http2session = static_cast<Http2Session *>(w->data);
-
-  ev_timer_stop(loop, w);
-
-  switch (http2session->get_connection_check_state()) {
-  case Http2Session::CONNECTION_CHECK_STARTED:
-    // ping timeout; disconnect
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session) << "ping timeout";
-    }
-
-    delete http2session;
-
-    return;
-  default:
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session) << "connection check required";
-    }
-    http2session->set_connection_check_state(
-        Http2Session::CONNECTION_CHECK_REQUIRED);
-  }
-}
-} // namespace
-
-namespace {
-void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto http2session = static_cast<Http2Session *>(w->data);
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, http2session) << "SETTINGS timeout";
-  }
-
-  downstream_failure(http2session->get_addr(), http2session->get_raddr());
-
-  if (http2session->terminate_session(NGHTTP2_SETTINGS_TIMEOUT) != 0) {
-    delete http2session;
-
-    return;
-  }
-  http2session->signal_write();
-}
-} // namespace
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto http2session = static_cast<Http2Session *>(conn->data);
-
-  if (w == &conn->rt && !conn->expired_rt()) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, http2session) << "Timeout";
-  }
-
-  http2session->on_timeout();
-
-  delete http2session;
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto conn = static_cast<Connection *>(w->data);
-  auto http2session = static_cast<Http2Session *>(conn->data);
-  rv = http2session->do_read();
-  if (rv != 0) {
-    delete http2session;
-
-    return;
-  }
-  http2session->connection_alive();
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto conn = static_cast<Connection *>(w->data);
-  auto http2session = static_cast<Http2Session *>(conn->data);
-  rv = http2session->do_write();
-  if (rv != 0) {
-    delete http2session;
-
-    return;
-  }
-  http2session->reset_connection_check_timer_if_not_checking();
-}
-} // namespace
-
-namespace {
-void initiate_connection_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto http2session = static_cast<Http2Session *>(w->data);
-  ev_timer_stop(loop, w);
-  if (http2session->initiate_connection() != 0) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session) << "Could not initiate backend connection";
-    }
-
-    delete http2session;
-
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void prepare_cb(struct ev_loop *loop, ev_prepare *w, int revents) {
-  auto http2session = static_cast<Http2Session *>(w->data);
-  http2session->check_retire();
-}
-} // namespace
-
-Http2Session::Http2Session(struct ev_loop *loop, SSL_CTX *ssl_ctx,
-                           Worker *worker,
-                           const std::shared_ptr<DownstreamAddrGroup> &group,
-                           DownstreamAddr *addr)
-    : dlnext(nullptr),
-      dlprev(nullptr),
-      conn_(loop, -1, nullptr, worker->get_mcpool(),
-            worker->get_downstream_config()->timeout.write,
-            worker->get_downstream_config()->timeout.read, {}, {}, writecb,
-            readcb, timeoutcb, this, get_config()->tls.dyn_rec.warmup_threshold,
-            get_config()->tls.dyn_rec.idle_timeout, PROTO_HTTP2),
-      wb_(worker->get_mcpool()),
-      worker_(worker),
-      ssl_ctx_(ssl_ctx),
-      group_(group),
-      addr_(addr),
-      session_(nullptr),
-      raddr_(nullptr),
-      state_(DISCONNECTED),
-      connection_check_state_(CONNECTION_CHECK_NONE),
-      freelist_zone_(FREELIST_ZONE_NONE) {
-  read_ = write_ = &Http2Session::noop;
-
-  on_read_ = &Http2Session::read_noop;
-  on_write_ = &Http2Session::write_noop;
-
-  // We will resuse this many times, so use repeat timeout value.  The
-  // timeout value is set later.
-  ev_timer_init(&connchk_timer_, connchk_timeout_cb, 0., 0.);
-
-  connchk_timer_.data = this;
-
-  // SETTINGS ACK timeout is 10 seconds for now.  We will resuse this
-  // many times, so use repeat timeout value.
-  ev_timer_init(&settings_timer_, settings_timeout_cb, 0., 0.);
-
-  settings_timer_.data = this;
-
-  ev_timer_init(&initiate_connection_timer_, initiate_connection_cb, 0., 0.);
-  initiate_connection_timer_.data = this;
-
-  ev_prepare_init(&prep_, prepare_cb);
-  prep_.data = this;
-  ev_prepare_start(loop, &prep_);
-}
-
-Http2Session::~Http2Session() {
-  exclude_from_scheduling();
-  disconnect(should_hard_fail());
-}
-
-int Http2Session::disconnect(bool hard) {
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Disconnecting";
-  }
-  nghttp2_session_del(session_);
-  session_ = nullptr;
-
-  wb_.reset();
-
-  if (dns_query_) {
-    auto dns_tracker = worker_->get_dns_tracker();
-    dns_tracker->cancel(dns_query_.get());
-  }
-
-  conn_.rlimit.stopw();
-  conn_.wlimit.stopw();
-
-  ev_prepare_stop(conn_.loop, &prep_);
-
-  ev_timer_stop(conn_.loop, &initiate_connection_timer_);
-  ev_timer_stop(conn_.loop, &settings_timer_);
-  ev_timer_stop(conn_.loop, &connchk_timer_);
-
-  read_ = write_ = &Http2Session::noop;
-
-  on_read_ = &Http2Session::read_noop;
-  on_write_ = &Http2Session::write_noop;
-
-  conn_.disconnect();
-
-  if (proxy_htp_) {
-    proxy_htp_.reset();
-  }
-
-  connection_check_state_ = CONNECTION_CHECK_NONE;
-  state_ = DISCONNECTED;
-
-  // When deleting Http2DownstreamConnection, it calls this object's
-  // remove_downstream_connection().  The multiple
-  // Http2DownstreamConnection objects belong to the same
-  // ClientHandler object if upstream is h2.  So be careful when you
-  // delete ClientHandler here.
-  //
-  // We allow creating new pending Http2DownstreamConnection with this
-  // object.  Upstream::on_downstream_reset() may add
-  // Http2DownstreamConnection to another Http2Session.
-
-  for (auto dc = dconns_.head; dc;) {
-    auto next = dc->dlnext;
-    auto downstream = dc->get_downstream();
-    auto upstream = downstream->get_upstream();
-
-    // Failure is allowed only for HTTP/1 upstream where upstream is
-    // not shared by multiple Downstreams.
-    if (upstream->on_downstream_reset(downstream, hard) != 0) {
-      delete upstream->get_client_handler();
-    }
-
-    // dc was deleted
-    dc = next;
-  }
-
-  auto streams = std::move(streams_);
-  for (auto s = streams.head; s;) {
-    auto next = s->dlnext;
-    delete s;
-    s = next;
-  }
-
-  return 0;
-}
-
-int Http2Session::resolve_name() {
-  int rv;
-
-  auto dns_query = make_unique<DNSQuery>(
-      addr_->host, [this](int status, const Address *result) {
-        int rv;
-
-        if (status == DNS_STATUS_OK) {
-          *resolved_addr_ = *result;
-          util::set_port(*this->resolved_addr_, this->addr_->port);
-        }
-
-        rv = this->initiate_connection();
-        if (rv != 0) {
-          delete this;
-        }
-      });
-  resolved_addr_ = make_unique<Address>();
-  auto dns_tracker = worker_->get_dns_tracker();
-  rv = dns_tracker->resolve(resolved_addr_.get(), dns_query.get());
-  switch (rv) {
-  case DNS_STATUS_ERROR:
-    return -1;
-  case DNS_STATUS_RUNNING:
-    dns_query_ = std::move(dns_query);
-    state_ = RESOLVING_NAME;
-    return 0;
-  case DNS_STATUS_OK:
-    util::set_port(*resolved_addr_, addr_->port);
-    return 0;
-  default:
-    assert(0);
-    abort();
-  }
-}
-
-int Http2Session::initiate_connection() {
-  int rv = 0;
-
-  auto worker_blocker = worker_->get_connect_blocker();
-
-  if (state_ == DISCONNECTED || state_ == RESOLVING_NAME) {
-    if (worker_blocker->blocked()) {
-      if (LOG_ENABLED(INFO)) {
-        SSLOG(INFO, this)
-            << "Worker wide backend connection was blocked temporarily";
-      }
-      return -1;
-    }
-  }
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  const auto &proxy = get_config()->downstream_http_proxy;
-  if (!proxy.host.empty() && state_ == DISCONNECTED) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "Connecting to the proxy " << proxy.host << ":"
-                        << proxy.port;
-    }
-
-    conn_.fd = util::create_nonblock_socket(proxy.addr.su.storage.ss_family);
-
-    if (conn_.fd == -1) {
-      auto error = errno;
-      SSLOG(WARN, this) << "Backend proxy socket() failed; addr="
-                        << util::to_numeric_addr(&proxy.addr)
-                        << ", errno=" << error;
-
-      worker_blocker->on_failure();
-      return -1;
-    }
-
-    rv = connect(conn_.fd, &proxy.addr.su.sa, proxy.addr.len);
-    if (rv != 0 && errno != EINPROGRESS) {
-      auto error = errno;
-      SSLOG(WARN, this) << "Backend proxy connect() failed; addr="
-                        << util::to_numeric_addr(&proxy.addr)
-                        << ", errno=" << error;
-
-      worker_blocker->on_failure();
-
-      return -1;
-    }
-
-    raddr_ = &proxy.addr;
-
-    worker_blocker->on_success();
-
-    ev_io_set(&conn_.rev, conn_.fd, EV_READ);
-    ev_io_set(&conn_.wev, conn_.fd, EV_WRITE);
-
-    conn_.wlimit.startw();
-
-    conn_.wt.repeat = downstreamconf.timeout.connect;
-    ev_timer_again(conn_.loop, &conn_.wt);
-
-    write_ = &Http2Session::connected;
-
-    on_read_ = &Http2Session::downstream_read_proxy;
-    on_write_ = &Http2Session::downstream_connect_proxy;
-
-    proxy_htp_ = make_unique<http_parser>();
-    http_parser_init(proxy_htp_.get(), HTTP_RESPONSE);
-    proxy_htp_->data = this;
-
-    state_ = PROXY_CONNECTING;
-
-    return 0;
-  }
-
-  if (state_ == DISCONNECTED || state_ == PROXY_CONNECTED ||
-      state_ == RESOLVING_NAME) {
-    if (LOG_ENABLED(INFO)) {
-      if (state_ != RESOLVING_NAME) {
-        SSLOG(INFO, this) << "Connecting to downstream server";
-      }
-    }
-    if (addr_->tls) {
-      assert(ssl_ctx_);
-
-      if (state_ != RESOLVING_NAME) {
-        auto ssl = tls::create_ssl(ssl_ctx_);
-        if (!ssl) {
-          return -1;
-        }
-
-        tls::setup_downstream_http2_alpn(ssl);
-
-        conn_.set_ssl(ssl);
-        conn_.tls.client_session_cache = &addr_->tls_session_cache;
-
-        auto sni_name =
-            addr_->sni.empty() ? StringRef{addr_->host} : StringRef{addr_->sni};
-
-        if (!util::numeric_host(sni_name.c_str())) {
-          // TLS extensions: SNI. There is no documentation about the return
-          // code for this function (actually this is macro wrapping SSL_ctrl
-          // at the time of this writing).
-          SSL_set_tlsext_host_name(conn_.tls.ssl, sni_name.c_str());
-        }
-
-        auto tls_session = tls::reuse_tls_session(addr_->tls_session_cache);
-        if (tls_session) {
-          SSL_set_session(conn_.tls.ssl, tls_session);
-          SSL_SESSION_free(tls_session);
-        }
-      }
-
-      if (state_ == DISCONNECTED) {
-        if (addr_->dns) {
-          rv = resolve_name();
-          if (rv != 0) {
-            downstream_failure(addr_, nullptr);
-            return -1;
-          }
-          if (state_ == RESOLVING_NAME) {
-            return 0;
-          }
-          raddr_ = resolved_addr_.get();
-        } else {
-          raddr_ = &addr_->addr;
-        }
-      }
-
-      if (state_ == RESOLVING_NAME) {
-        if (dns_query_->status == DNS_STATUS_ERROR) {
-          downstream_failure(addr_, nullptr);
-          return -1;
-        }
-        assert(dns_query_->status == DNS_STATUS_OK);
-        state_ = DISCONNECTED;
-        dns_query_.reset();
-        raddr_ = resolved_addr_.get();
-      }
-
-      // If state_ == PROXY_CONNECTED, we has connected to the proxy
-      // using conn_.fd and tunnel has been established.
-      if (state_ == DISCONNECTED) {
-        assert(conn_.fd == -1);
-
-        conn_.fd = util::create_nonblock_socket(raddr_->su.storage.ss_family);
-        if (conn_.fd == -1) {
-          auto error = errno;
-          SSLOG(WARN, this)
-              << "socket() failed; addr=" << util::to_numeric_addr(raddr_)
-              << ", errno=" << error;
-
-          worker_blocker->on_failure();
-          return -1;
-        }
-
-        worker_blocker->on_success();
-
-        rv = connect(conn_.fd,
-                     // TODO maybe not thread-safe?
-                     const_cast<sockaddr *>(&raddr_->su.sa), raddr_->len);
-        if (rv != 0 && errno != EINPROGRESS) {
-          auto error = errno;
-          SSLOG(WARN, this)
-              << "connect() failed; addr=" << util::to_numeric_addr(raddr_)
-              << ", errno=" << error;
-
-          downstream_failure(addr_, raddr_);
-          return -1;
-        }
-
-        ev_io_set(&conn_.rev, conn_.fd, EV_READ);
-        ev_io_set(&conn_.wev, conn_.fd, EV_WRITE);
-      }
-
-      conn_.prepare_client_handshake();
-    } else {
-      if (state_ == DISCONNECTED) {
-        // Without TLS and proxy.
-        if (addr_->dns) {
-          rv = resolve_name();
-          if (rv != 0) {
-            downstream_failure(addr_, nullptr);
-            return -1;
-          }
-          if (state_ == RESOLVING_NAME) {
-            return 0;
-          }
-          raddr_ = resolved_addr_.get();
-        } else {
-          raddr_ = &addr_->addr;
-        }
-      }
-
-      if (state_ == RESOLVING_NAME) {
-        if (dns_query_->status == DNS_STATUS_ERROR) {
-          downstream_failure(addr_, nullptr);
-          return -1;
-        }
-        assert(dns_query_->status == DNS_STATUS_OK);
-        state_ = DISCONNECTED;
-        dns_query_.reset();
-        raddr_ = resolved_addr_.get();
-      }
-
-      if (state_ == DISCONNECTED) {
-        // Without TLS and proxy.
-        assert(conn_.fd == -1);
-
-        conn_.fd = util::create_nonblock_socket(raddr_->su.storage.ss_family);
-
-        if (conn_.fd == -1) {
-          auto error = errno;
-          SSLOG(WARN, this)
-              << "socket() failed; addr=" << util::to_numeric_addr(raddr_)
-              << ", errno=" << error;
-
-          worker_blocker->on_failure();
-          return -1;
-        }
-
-        worker_blocker->on_success();
-
-        rv = connect(conn_.fd, const_cast<sockaddr *>(&raddr_->su.sa),
-                     raddr_->len);
-        if (rv != 0 && errno != EINPROGRESS) {
-          auto error = errno;
-          SSLOG(WARN, this)
-              << "connect() failed; addr=" << util::to_numeric_addr(raddr_)
-              << ", errno=" << error;
-
-          downstream_failure(addr_, raddr_);
-          return -1;
-        }
-
-        ev_io_set(&conn_.rev, conn_.fd, EV_READ);
-        ev_io_set(&conn_.wev, conn_.fd, EV_WRITE);
-      }
-    }
-
-    // We have been already connected when no TLS and proxy is used.
-    if (state_ == PROXY_CONNECTED) {
-      on_read_ = &Http2Session::read_noop;
-      on_write_ = &Http2Session::write_noop;
-
-      return connected();
-    }
-
-    write_ = &Http2Session::connected;
-
-    state_ = CONNECTING;
-    conn_.wlimit.startw();
-
-    conn_.wt.repeat = downstreamconf.timeout.connect;
-    ev_timer_again(conn_.loop, &conn_.wt);
-
-    return 0;
-  }
-
-  // Unreachable
-  assert(0);
-
-  return 0;
-}
-
-namespace {
-int htp_hdrs_completecb(http_parser *htp) {
-  auto http2session = static_cast<Http2Session *>(htp->data);
-
-  // We only read HTTP header part.  If tunneling succeeds, response
-  // body is a different protocol (HTTP/2 in this case), we don't read
-  // them here.
-  //
-  // Here is a caveat: http-parser returns 1 less bytes if we pause
-  // here.  The reason why they do this is probably they want to eat
-  // last 1 byte in s_headers_done state, on the other hand, this
-  // callback is called its previous state s_headers_almost_done.  We
-  // will do "+ 1" to the return value to workaround this.
-  http_parser_pause(htp, 1);
-
-  // We just check status code here
-  if (htp->status_code == 200) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session) << "Tunneling success";
-    }
-    http2session->set_state(Http2Session::PROXY_CONNECTED);
-
-    return 0;
-  }
-
-  SSLOG(WARN, http2session) << "Tunneling failed: " << htp->status_code;
-  http2session->set_state(Http2Session::PROXY_FAILED);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr http_parser_settings htp_hooks = {
-    nullptr,             // http_cb      on_message_begin;
-    nullptr,             // http_data_cb on_url;
-    nullptr,             // http_data_cb on_status;
-    nullptr,             // http_data_cb on_header_field;
-    nullptr,             // http_data_cb on_header_value;
-    htp_hdrs_completecb, // http_cb      on_headers_complete;
-    nullptr,             // http_data_cb on_body;
-    nullptr              // http_cb      on_message_complete;
-};
-} // namespace
-
-int Http2Session::downstream_read_proxy(const uint8_t *data, size_t datalen) {
-  auto nread =
-      http_parser_execute(proxy_htp_.get(), &htp_hooks,
-                          reinterpret_cast<const char *>(data), datalen);
-  (void)nread;
-
-  auto htperr = HTTP_PARSER_ERRNO(proxy_htp_.get());
-
-  if (htperr == HPE_PAUSED) {
-    switch (state_) {
-    case Http2Session::PROXY_CONNECTED:
-      // Initiate SSL/TLS handshake through established tunnel.
-      if (initiate_connection() != 0) {
-        return -1;
-      }
-      return 0;
-    case Http2Session::PROXY_FAILED:
-      return -1;
-    }
-    // should not be here
-    assert(0);
-  }
-
-  if (htperr != HPE_OK) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int Http2Session::downstream_connect_proxy() {
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Connected to the proxy";
-  }
-
-  std::string req = "CONNECT ";
-  req.append(addr_->hostport.c_str(), addr_->hostport.size());
-  if (addr_->port == 80 || addr_->port == 443) {
-    req += ':';
-    req += util::utos(addr_->port);
-  }
-  req += " HTTP/1.1\r\nHost: ";
-  req += addr_->host;
-  req += "\r\n";
-  const auto &proxy = get_config()->downstream_http_proxy;
-  if (!proxy.userinfo.empty()) {
-    req += "Proxy-Authorization: Basic ";
-    req += base64::encode(std::begin(proxy.userinfo), std::end(proxy.userinfo));
-    req += "\r\n";
-  }
-  req += "\r\n";
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "HTTP proxy request headers\n" << req;
-  }
-  wb_.append(req);
-
-  on_write_ = &Http2Session::write_noop;
-
-  signal_write();
-  return 0;
-}
-
-void Http2Session::add_downstream_connection(Http2DownstreamConnection *dconn) {
-  dconns_.append(dconn);
-  ++addr_->num_dconn;
-}
-
-void Http2Session::remove_downstream_connection(
-    Http2DownstreamConnection *dconn) {
-  --addr_->num_dconn;
-  dconns_.remove(dconn);
-  dconn->detach_stream_data();
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Remove downstream";
-  }
-
-  if (freelist_zone_ == FREELIST_ZONE_NONE && !max_concurrency_reached()) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "Append to http2_extra_freelist, addr=" << addr_
-                        << ", freelist.size="
-                        << addr_->http2_extra_freelist.size();
-    }
-
-    add_to_extra_freelist();
-  }
-}
-
-void Http2Session::remove_stream_data(StreamData *sd) {
-  streams_.remove(sd);
-  if (sd->dconn) {
-    sd->dconn->detach_stream_data();
-  }
-  delete sd;
-}
-
-int Http2Session::submit_request(Http2DownstreamConnection *dconn,
-                                 const nghttp2_nv *nva, size_t nvlen,
-                                 const nghttp2_data_provider *data_prd) {
-  assert(state_ == CONNECTED);
-  auto sd = make_unique<StreamData>();
-  sd->dlnext = sd->dlprev = nullptr;
-  // TODO Specify nullptr to pri_spec for now
-  auto stream_id =
-      nghttp2_submit_request(session_, nullptr, nva, nvlen, data_prd, sd.get());
-  if (stream_id < 0) {
-    SSLOG(FATAL, this) << "nghttp2_submit_request() failed: "
-                       << nghttp2_strerror(stream_id);
-    return -1;
-  }
-
-  dconn->attach_stream_data(sd.get());
-  dconn->get_downstream()->set_downstream_stream_id(stream_id);
-  streams_.append(sd.release());
-
-  return 0;
-}
-
-int Http2Session::submit_rst_stream(int32_t stream_id, uint32_t error_code) {
-  assert(state_ == CONNECTED);
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "RST_STREAM stream_id=" << stream_id
-                      << " with error_code=" << error_code;
-  }
-  int rv = nghttp2_submit_rst_stream(session_, NGHTTP2_FLAG_NONE, stream_id,
-                                     error_code);
-  if (rv != 0) {
-    SSLOG(FATAL, this) << "nghttp2_submit_rst_stream() failed: "
-                       << nghttp2_strerror(rv);
-    return -1;
-  }
-  return 0;
-}
-
-nghttp2_session *Http2Session::get_session() const { return session_; }
-
-int Http2Session::resume_data(Http2DownstreamConnection *dconn) {
-  assert(state_ == CONNECTED);
-  auto downstream = dconn->get_downstream();
-  int rv = nghttp2_session_resume_data(session_,
-                                       downstream->get_downstream_stream_id());
-  switch (rv) {
-  case 0:
-  case NGHTTP2_ERR_INVALID_ARGUMENT:
-    return 0;
-  default:
-    SSLOG(FATAL, this) << "nghttp2_resume_session() failed: "
-                       << nghttp2_strerror(rv);
-    return -1;
-  }
-}
-
-namespace {
-void call_downstream_readcb(Http2Session *http2session,
-                            Downstream *downstream) {
-  auto upstream = downstream->get_upstream();
-  if (!upstream) {
-    return;
-  }
-  if (upstream->downstream_read(downstream->get_downstream_connection()) != 0) {
-    delete upstream->get_client_handler();
-  }
-}
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, http2session)
-        << "Stream stream_id=" << stream_id
-        << " is being closed with error code " << error_code;
-  }
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-  if (sd == 0) {
-    // We might get this close callback when pushed streams are
-    // closed.
-    return 0;
-  }
-  auto dconn = sd->dconn;
-  if (dconn) {
-    auto downstream = dconn->get_downstream();
-    auto upstream = downstream->get_upstream();
-
-    if (downstream->get_downstream_stream_id() % 2 == 0 &&
-        downstream->get_request_state() == Downstream::INITIAL) {
-      // Downstream is canceled in backend before it is submitted in
-      // frontend session.
-
-      // This will avoid to send RST_STREAM to backend
-      downstream->set_response_state(Downstream::MSG_RESET);
-      upstream->cancel_premature_downstream(downstream);
-    } else {
-      if (downstream->get_upgraded() &&
-          downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
-        // For tunneled connection, we have to submit RST_STREAM to
-        // upstream *after* whole response body is sent. We just set
-        // MSG_COMPLETE here. Upstream will take care of that.
-        downstream->get_upstream()->on_downstream_body_complete(downstream);
-        downstream->set_response_state(Downstream::MSG_COMPLETE);
-      } else if (error_code == NGHTTP2_NO_ERROR) {
-        switch (downstream->get_response_state()) {
-        case Downstream::MSG_COMPLETE:
-        case Downstream::MSG_BAD_HEADER:
-          break;
-        default:
-          downstream->set_response_state(Downstream::MSG_RESET);
-        }
-      } else if (downstream->get_response_state() !=
-                 Downstream::MSG_BAD_HEADER) {
-        downstream->set_response_state(Downstream::MSG_RESET);
-      }
-      if (downstream->get_response_state() == Downstream::MSG_RESET &&
-          downstream->get_response_rst_stream_error_code() ==
-              NGHTTP2_NO_ERROR) {
-        downstream->set_response_rst_stream_error_code(error_code);
-      }
-      call_downstream_readcb(http2session, downstream);
-    }
-    // dconn may be deleted
-  }
-  // The life time of StreamData ends here
-  http2session->remove_stream_data(sd);
-  return 0;
-}
-} // namespace
-
-void Http2Session::start_settings_timer() {
-  auto &downstreamconf = get_config()->http2.downstream;
-
-  ev_timer_set(&settings_timer_, downstreamconf.timeout.settings, 0.);
-  ev_timer_start(conn_.loop, &settings_timer_);
-}
-
-void Http2Session::stop_settings_timer() {
-  ev_timer_stop(conn_.loop, &settings_timer_);
-}
-
-namespace {
-int on_header_callback2(nghttp2_session *session, const nghttp2_frame *frame,
-                        nghttp2_rcbuf *name, nghttp2_rcbuf *value,
-                        uint8_t flags, void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!sd || !sd->dconn) {
-    return 0;
-  }
-  auto downstream = sd->dconn->get_downstream();
-
-  auto namebuf = nghttp2_rcbuf_get_buf(name);
-  auto valuebuf = nghttp2_rcbuf_get_buf(value);
-
-  auto &resp = downstream->response();
-  auto &httpconf = get_config()->http;
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    auto trailer = frame->headers.cat == NGHTTP2_HCAT_HEADERS &&
-                   !downstream->get_expect_final_response();
-
-    if (resp.fs.buffer_size() + namebuf.len + valuebuf.len >
-            httpconf.response_header_field_buffer ||
-        resp.fs.num_fields() >= httpconf.max_response_header_fields) {
-      if (LOG_ENABLED(INFO)) {
-        DLOG(INFO, downstream)
-            << "Too large or many header field size="
-            << resp.fs.buffer_size() + namebuf.len + valuebuf.len
-            << ", num=" << resp.fs.num_fields() + 1;
-      }
-
-      if (trailer) {
-        // We don't care trailer part exceeds header size limit; just
-        // discard it.
-        return 0;
-      }
-
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    auto token = http2::lookup_token(namebuf.base, namebuf.len);
-    auto no_index = flags & NGHTTP2_NV_FLAG_NO_INDEX;
-
-    downstream->add_rcbuf(name);
-    downstream->add_rcbuf(value);
-
-    if (trailer) {
-      // just store header fields for trailer part
-      resp.fs.add_trailer_token(StringRef{namebuf.base, namebuf.len},
-                                StringRef{valuebuf.base, valuebuf.len},
-                                no_index, token);
-      return 0;
-    }
-
-    resp.fs.add_header_token(StringRef{namebuf.base, namebuf.len},
-                             StringRef{valuebuf.base, valuebuf.len}, no_index,
-                             token);
-    return 0;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    auto promised_stream_id = frame->push_promise.promised_stream_id;
-    auto promised_sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, promised_stream_id));
-    if (!promised_sd || !promised_sd->dconn) {
-      http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    auto promised_downstream = promised_sd->dconn->get_downstream();
-
-    auto namebuf = nghttp2_rcbuf_get_buf(name);
-    auto valuebuf = nghttp2_rcbuf_get_buf(value);
-
-    assert(promised_downstream);
-
-    auto &promised_req = promised_downstream->request();
-
-    // We use request header limit for PUSH_PROMISE
-    if (promised_req.fs.buffer_size() + namebuf.len + valuebuf.len >
-            httpconf.request_header_field_buffer ||
-        promised_req.fs.num_fields() >= httpconf.max_request_header_fields) {
-      if (LOG_ENABLED(INFO)) {
-        DLOG(INFO, downstream)
-            << "Too large or many header field size="
-            << promised_req.fs.buffer_size() + namebuf.len + valuebuf.len
-            << ", num=" << promised_req.fs.num_fields() + 1;
-      }
-
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    promised_downstream->add_rcbuf(name);
-    promised_downstream->add_rcbuf(value);
-
-    auto token = http2::lookup_token(namebuf.base, namebuf.len);
-    promised_req.fs.add_header_token(StringRef{namebuf.base, namebuf.len},
-                                     StringRef{valuebuf.base, valuebuf.len},
-                                     flags & NGHTTP2_NV_FLAG_NO_INDEX, token);
-
-    return 0;
-  }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_invalid_header_callback2(nghttp2_session *session,
-                                const nghttp2_frame *frame, nghttp2_rcbuf *name,
-                                nghttp2_rcbuf *value, uint8_t flags,
-                                void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!sd || !sd->dconn) {
-    return 0;
-  }
-
-  int32_t stream_id;
-
-  if (frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-    stream_id = frame->push_promise.promised_stream_id;
-  } else {
-    stream_id = frame->hd.stream_id;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    auto namebuf = nghttp2_rcbuf_get_buf(name);
-    auto valuebuf = nghttp2_rcbuf_get_buf(value);
-
-    SSLOG(INFO, http2session)
-        << "Invalid header field for stream_id=" << stream_id
-        << " in frame type=" << static_cast<uint32_t>(frame->hd.type)
-        << ": name=[" << StringRef{namebuf.base, namebuf.len} << "], value=["
-        << StringRef{valuebuf.base, valuebuf.len} << "]";
-  }
-
-  http2session->submit_rst_stream(stream_id, NGHTTP2_PROTOCOL_ERROR);
-
-  return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS: {
-    if (frame->headers.cat != NGHTTP2_HCAT_RESPONSE &&
-        frame->headers.cat != NGHTTP2_HCAT_PUSH_RESPONSE) {
-      return 0;
-    }
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!sd || !sd->dconn) {
-      http2session->submit_rst_stream(frame->hd.stream_id,
-                                      NGHTTP2_INTERNAL_ERROR);
-      return 0;
-    }
-    return 0;
-  }
-  case NGHTTP2_PUSH_PROMISE: {
-    auto promised_stream_id = frame->push_promise.promised_stream_id;
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!sd || !sd->dconn) {
-      http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    auto downstream = sd->dconn->get_downstream();
-
-    assert(downstream);
-    assert(downstream->get_downstream_stream_id() == frame->hd.stream_id);
-
-    if (http2session->handle_downstream_push_promise(downstream,
-                                                     promised_stream_id) != 0) {
-      http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_response_headers(Http2Session *http2session, Downstream *downstream,
-                        nghttp2_session *session, const nghttp2_frame *frame) {
-  int rv;
-
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-
-  auto &nva = resp.fs.headers();
-
-  auto config = get_config();
-  auto &loggingconf = config->logging;
-
-  downstream->set_expect_final_response(false);
-
-  auto status = resp.fs.header(http2::HD__STATUS);
-  // libnghttp2 guarantees this exists and can be parsed
-  auto status_code = http2::parse_http_status_code(status->value);
-
-  resp.http_status = status_code;
-  resp.http_major = 2;
-  resp.http_minor = 0;
-
-  downstream->set_downstream_addr_group(
-      http2session->get_downstream_addr_group());
-  downstream->set_addr(http2session->get_addr());
-
-  if (LOG_ENABLED(INFO)) {
-    std::stringstream ss;
-    for (auto &nv : nva) {
-      ss << TTY_HTTP_HD << nv.name << TTY_RST << ": " << nv.value << "\n";
-    }
-    SSLOG(INFO, http2session)
-        << "HTTP response headers. stream_id=" << frame->hd.stream_id << "\n"
-        << ss.str();
-  }
-
-  if (downstream->get_non_final_response()) {
-
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session) << "This is non-final response.";
-    }
-
-    downstream->set_expect_final_response(true);
-    rv = upstream->on_downstream_header_complete(downstream);
-
-    // Now Dowstream's response headers are erased.
-
-    if (rv != 0) {
-      http2session->submit_rst_stream(frame->hd.stream_id,
-                                      NGHTTP2_PROTOCOL_ERROR);
-      downstream->set_response_state(Downstream::MSG_RESET);
-    }
-
-    return 0;
-  }
-
-  downstream->set_response_state(Downstream::HEADER_COMPLETE);
-  downstream->check_upgrade_fulfilled();
-
-  if (downstream->get_upgraded()) {
-    resp.connection_close = true;
-    // On upgrade success, both ends can send data
-    if (upstream->resume_read(SHRPX_NO_BUFFER, downstream, 0) != 0) {
-      // If resume_read fails, just drop connection. Not ideal.
-      delete handler;
-      return -1;
-    }
-    downstream->set_request_state(Downstream::HEADER_COMPLETE);
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session)
-          << "HTTP upgrade success. stream_id=" << frame->hd.stream_id;
-    }
-  } else {
-    auto content_length = resp.fs.header(http2::HD_CONTENT_LENGTH);
-    if (content_length) {
-      // libnghttp2 guarantees this can be parsed
-      resp.fs.content_length = util::parse_uint(content_length->value);
-    }
-
-    if (resp.fs.content_length == -1 && downstream->expect_response_body()) {
-      // Here we have response body but Content-Length is not known in
-      // advance.
-      if (req.http_major <= 0 || (req.http_major == 1 && req.http_minor == 0)) {
-        // We simply close connection for pre-HTTP/1.1 in this case.
-        resp.connection_close = true;
-      } else {
-        // Otherwise, use chunked encoding to keep upstream connection
-        // open.  In HTTP2, we are supporsed not to receive
-        // transfer-encoding.
-        resp.fs.add_header_token(StringRef::from_lit("transfer-encoding"),
-                                 StringRef::from_lit("chunked"), false,
-                                 http2::HD_TRANSFER_ENCODING);
-        downstream->set_chunked_response(true);
-      }
-    }
-  }
-
-  if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-    resp.headers_only = true;
-  }
-
-  if (loggingconf.access.write_early && downstream->accesslog_ready()) {
-    handler->write_accesslog(downstream);
-    downstream->set_accesslog_written(true);
-  }
-
-  rv = upstream->on_downstream_header_complete(downstream);
-  if (rv != 0) {
-    // Handling early return (in other words, response was hijacked by
-    // mruby scripting).
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      http2session->submit_rst_stream(frame->hd.stream_id, NGHTTP2_CANCEL);
-    } else {
-      http2session->submit_rst_stream(frame->hd.stream_id,
-                                      NGHTTP2_INTERNAL_ERROR);
-      downstream->set_response_state(Downstream::MSG_RESET);
-    }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  int rv;
-  auto http2session = static_cast<Http2Session *>(user_data);
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!sd || !sd->dconn) {
-      return 0;
-    }
-    auto downstream = sd->dconn->get_downstream();
-    auto upstream = downstream->get_upstream();
-    rv = upstream->on_downstream_body(downstream, nullptr, 0, true);
-    if (rv != 0) {
-      http2session->submit_rst_stream(frame->hd.stream_id,
-                                      NGHTTP2_INTERNAL_ERROR);
-      downstream->set_response_state(Downstream::MSG_RESET);
-
-    } else if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-
-      downstream->disable_downstream_rtimer();
-
-      if (downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
-
-        downstream->set_response_state(Downstream::MSG_COMPLETE);
-
-        rv = upstream->on_downstream_body_complete(downstream);
-
-        if (rv != 0) {
-          downstream->set_response_state(Downstream::MSG_RESET);
-        }
-      }
-    }
-
-    call_downstream_readcb(http2session, downstream);
-    return 0;
-  }
-  case NGHTTP2_HEADERS: {
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!sd || !sd->dconn) {
-      return 0;
-    }
-    auto downstream = sd->dconn->get_downstream();
-
-    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE ||
-        frame->headers.cat == NGHTTP2_HCAT_PUSH_RESPONSE) {
-      rv = on_response_headers(http2session, downstream, session, frame);
-
-      if (rv != 0) {
-        return 0;
-      }
-    } else if (frame->headers.cat == NGHTTP2_HCAT_HEADERS) {
-      if (downstream->get_expect_final_response()) {
-        rv = on_response_headers(http2session, downstream, session, frame);
-
-        if (rv != 0) {
-          return 0;
-        }
-      }
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      downstream->disable_downstream_rtimer();
-
-      if (downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
-        downstream->set_response_state(Downstream::MSG_COMPLETE);
-
-        auto upstream = downstream->get_upstream();
-
-        rv = upstream->on_downstream_body_complete(downstream);
-
-        if (rv != 0) {
-          downstream->set_response_state(Downstream::MSG_RESET);
-        }
-      }
-    } else {
-      downstream->reset_downstream_rtimer();
-    }
-
-    // This may delete downstream
-    call_downstream_readcb(http2session, downstream);
-
-    return 0;
-  }
-  case NGHTTP2_RST_STREAM: {
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (sd && sd->dconn) {
-      auto downstream = sd->dconn->get_downstream();
-      downstream->set_response_rst_stream_error_code(
-          frame->rst_stream.error_code);
-      call_downstream_readcb(http2session, downstream);
-    }
-    return 0;
-  }
-  case NGHTTP2_SETTINGS: {
-    if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
-      return 0;
-    }
-
-    http2session->stop_settings_timer();
-
-    auto addr = http2session->get_addr();
-    auto &connect_blocker = addr->connect_blocker;
-
-    connect_blocker->on_success();
-
-    return 0;
-  }
-  case NGHTTP2_PING:
-    if (frame->hd.flags & NGHTTP2_FLAG_ACK) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "PING ACK received";
-      }
-      http2session->connection_alive();
-    }
-    return 0;
-  case NGHTTP2_PUSH_PROMISE: {
-    auto promised_stream_id = frame->push_promise.promised_stream_id;
-
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, http2session)
-          << "Received downstream PUSH_PROMISE stream_id="
-          << frame->hd.stream_id
-          << ", promised_stream_id=" << promised_stream_id;
-    }
-
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!sd || !sd->dconn) {
-      http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
-      return 0;
-    }
-
-    auto downstream = sd->dconn->get_downstream();
-
-    assert(downstream);
-    assert(downstream->get_downstream_stream_id() == frame->hd.stream_id);
-
-    auto promised_sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, promised_stream_id));
-    if (!promised_sd || !promised_sd->dconn) {
-      http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
-      return 0;
-    }
-
-    auto promised_downstream = promised_sd->dconn->get_downstream();
-
-    assert(promised_downstream);
-
-    if (http2session->handle_downstream_push_promise_complete(
-            downstream, promised_downstream) != 0) {
-      http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
-      return 0;
-    }
-
-    return 0;
-  }
-  case NGHTTP2_GOAWAY:
-    if (LOG_ENABLED(INFO)) {
-      auto debug_data = util::ascii_dump(frame->goaway.opaque_data,
-                                         frame->goaway.opaque_data_len);
-
-      SSLOG(INFO, http2session)
-          << "GOAWAY received: last-stream-id=" << frame->goaway.last_stream_id
-          << ", error_code=" << frame->goaway.error_code
-          << ", debug_data=" << debug_data;
-    }
-    return 0;
-  default:
-    return 0;
-  }
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  int rv;
-  auto http2session = static_cast<Http2Session *>(user_data);
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-  if (!sd || !sd->dconn) {
-    http2session->submit_rst_stream(stream_id, NGHTTP2_INTERNAL_ERROR);
-
-    if (http2session->consume(stream_id, len) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-  auto downstream = sd->dconn->get_downstream();
-  if (!downstream->expect_response_body()) {
-    http2session->submit_rst_stream(stream_id, NGHTTP2_INTERNAL_ERROR);
-
-    if (http2session->consume(stream_id, len) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-
-  // We don't want DATA after non-final response, which is illegal in
-  // HTTP.
-  if (downstream->get_non_final_response()) {
-    http2session->submit_rst_stream(stream_id, NGHTTP2_PROTOCOL_ERROR);
-
-    if (http2session->consume(stream_id, len) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-
-  downstream->reset_downstream_rtimer();
-
-  auto &resp = downstream->response();
-
-  resp.recv_body_length += len;
-  resp.unconsumed_body_length += len;
-
-  auto upstream = downstream->get_upstream();
-  rv = upstream->on_downstream_body(downstream, data, len, false);
-  if (rv != 0) {
-    http2session->submit_rst_stream(stream_id, NGHTTP2_INTERNAL_ERROR);
-
-    if (http2session->consume(stream_id, len) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    downstream->set_response_state(Downstream::MSG_RESET);
-  }
-
-  call_downstream_readcb(http2session, downstream);
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-
-  if (frame->hd.type == NGHTTP2_DATA || frame->hd.type == NGHTTP2_HEADERS) {
-    auto sd = static_cast<StreamData *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-
-    if (!sd || !sd->dconn) {
-      return 0;
-    }
-
-    auto downstream = sd->dconn->get_downstream();
-
-    if (frame->hd.type == NGHTTP2_HEADERS &&
-        frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-      downstream->set_request_header_sent(true);
-      auto src = downstream->get_blocked_request_buf();
-      if (src->rleft()) {
-        auto dest = downstream->get_request_buf();
-        src->remove(*dest);
-        if (http2session->resume_data(sd->dconn) != 0) {
-          return NGHTTP2_ERR_CALLBACK_FAILURE;
-        }
-        downstream->ensure_downstream_wtimer();
-      }
-    }
-
-    if ((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
-      return 0;
-    }
-
-    downstream->reset_downstream_rtimer();
-
-    return 0;
-  }
-
-  if (frame->hd.type == NGHTTP2_SETTINGS &&
-      (frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
-    http2session->start_settings_timer();
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_not_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, int lib_error_code,
-                               void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, http2session) << "Failed to send control frame type="
-                              << static_cast<uint32_t>(frame->hd.type)
-                              << ", lib_error_code=" << lib_error_code << ": "
-                              << nghttp2_strerror(lib_error_code);
-  }
-  if (frame->hd.type != NGHTTP2_HEADERS ||
-      lib_error_code == NGHTTP2_ERR_STREAM_CLOSED ||
-      lib_error_code == NGHTTP2_ERR_STREAM_CLOSING) {
-    return 0;
-  }
-
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!sd) {
-    return 0;
-  }
-  if (!sd->dconn) {
-    return 0;
-  }
-  auto downstream = sd->dconn->get_downstream();
-
-  if (lib_error_code == NGHTTP2_ERR_START_STREAM_NOT_ALLOWED) {
-    // Migrate to another downstream connection.
-    auto upstream = downstream->get_upstream();
-
-    if (upstream->on_downstream_reset(downstream, false)) {
-      // This should be done for h1 upstream only.  Deleting
-      // ClientHandler for h2 upstream may lead to crash.
-      delete upstream->get_client_handler();
-    }
-
-    return 0;
-  }
-
-  // To avoid stream hanging around, flag Downstream::MSG_RESET.
-  downstream->set_response_state(Downstream::MSG_RESET);
-  call_downstream_readcb(http2session, downstream);
-
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr auto PADDING = std::array<uint8_t, 256>{};
-} // namespace
-
-namespace {
-int send_data_callback(nghttp2_session *session, nghttp2_frame *frame,
-                       const uint8_t *framehd, size_t length,
-                       nghttp2_data_source *source, void *user_data) {
-  auto http2session = static_cast<Http2Session *>(user_data);
-  auto sd = static_cast<StreamData *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-
-  if (sd == nullptr) {
-    return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-  }
-
-  auto dconn = sd->dconn;
-  auto downstream = dconn->get_downstream();
-  auto input = downstream->get_request_buf();
-  auto wb = http2session->get_request_buf();
-
-  size_t padlen = 0;
-
-  wb->append(framehd, 9);
-  if (frame->data.padlen > 0) {
-    padlen = frame->data.padlen - 1;
-    wb->append(static_cast<uint8_t>(padlen));
-  }
-
-  input->remove(*wb, length);
-
-  wb->append(PADDING.data(), padlen);
-
-  if (input->rleft() == 0) {
-    downstream->disable_downstream_wtimer();
-  } else {
-    downstream->reset_downstream_wtimer();
-  }
-
-  if (length > 0) {
-    // This is important because it will handle flow control
-    // stuff.
-    if (downstream->get_upstream()->resume_read(SHRPX_NO_BUFFER, downstream,
-                                                length) != 0) {
-      // In this case, downstream may be deleted.
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    // Here sd->dconn could be nullptr, because
-    // Upstream::resume_read() may delete downstream which will delete
-    // dconn.  Is this still really true?
-  }
-
-  return 0;
-}
-} // namespace
-
-nghttp2_session_callbacks *create_http2_downstream_callbacks() {
-  int rv;
-  nghttp2_session_callbacks *callbacks;
-
-  rv = nghttp2_session_callbacks_new(&callbacks);
-
-  if (rv != 0) {
-    return nullptr;
-  }
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_not_send_callback(
-      callbacks, on_frame_not_send_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback2(callbacks,
-                                                    on_header_callback2);
-
-  nghttp2_session_callbacks_set_on_invalid_header_callback2(
-      callbacks, on_invalid_header_callback2);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-
-  nghttp2_session_callbacks_set_send_data_callback(callbacks,
-                                                   send_data_callback);
-
-  if (get_config()->padding) {
-    nghttp2_session_callbacks_set_select_padding_callback(
-        callbacks, http::select_padding_callback);
-  }
-
-  return callbacks;
-}
-
-int Http2Session::connection_made() {
-  int rv;
-
-  state_ = Http2Session::CONNECTED;
-
-  on_write_ = &Http2Session::downstream_write;
-  on_read_ = &Http2Session::downstream_read;
-
-  if (addr_->tls) {
-    const unsigned char *next_proto = nullptr;
-    unsigned int next_proto_len = 0;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-    SSL_get0_next_proto_negotiated(conn_.tls.ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    if (!next_proto) {
-      SSL_get0_alpn_selected(conn_.tls.ssl, &next_proto, &next_proto_len);
-    }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-    if (!next_proto) {
-      downstream_failure(addr_, raddr_);
-      return -1;
-    }
-
-    auto proto = StringRef{next_proto, next_proto_len};
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "Negotiated next protocol: " << proto;
-    }
-    if (!util::check_h2_is_selected(proto)) {
-      downstream_failure(addr_, raddr_);
-      return -1;
-    }
-  }
-
-  auto config = get_config();
-  auto &http2conf = config->http2;
-
-  rv = nghttp2_session_client_new2(&session_, http2conf.downstream.callbacks,
-                                   this, http2conf.downstream.option);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  std::array<nghttp2_settings_entry, 4> entry;
-  size_t nentry = 2;
-  entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  entry[0].value = http2conf.downstream.max_concurrent_streams;
-
-  entry[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  entry[1].value = http2conf.downstream.window_size;
-
-  if (http2conf.no_server_push || config->http2_proxy) {
-    entry[nentry].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-    entry[nentry].value = 0;
-    ++nentry;
-  }
-
-  if (http2conf.downstream.decoder_dynamic_table_size !=
-      NGHTTP2_DEFAULT_HEADER_TABLE_SIZE) {
-    entry[nentry].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-    entry[nentry].value = http2conf.downstream.decoder_dynamic_table_size;
-    ++nentry;
-  }
-
-  rv = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, entry.data(),
-                               nentry);
-  if (rv != 0) {
-    return -1;
-  }
-
-  rv = nghttp2_session_set_local_window_size(
-      session_, NGHTTP2_FLAG_NONE, 0,
-      http2conf.downstream.connection_window_size);
-  if (rv != 0) {
-    return -1;
-  }
-
-  reset_connection_check_timer(CONNCHK_TIMEOUT);
-
-  submit_pending_requests();
-
-  signal_write();
-  return 0;
-}
-
-int Http2Session::do_read() { return read_(*this); }
-int Http2Session::do_write() { return write_(*this); }
-
-int Http2Session::on_read(const uint8_t *data, size_t datalen) {
-  return on_read_(*this, data, datalen);
-}
-
-int Http2Session::on_write() { return on_write_(*this); }
-
-int Http2Session::downstream_read(const uint8_t *data, size_t datalen) {
-  ssize_t rv;
-
-  rv = nghttp2_session_mem_recv(session_, data, datalen);
-  if (rv < 0) {
-    SSLOG(ERROR, this) << "nghttp2_session_mem_recv() returned error: "
-                       << nghttp2_strerror(rv);
-    return -1;
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "No more read/write for this HTTP2 session";
-    }
-    return -1;
-  }
-
-  signal_write();
-  return 0;
-}
-
-int Http2Session::downstream_write() {
-  for (;;) {
-    const uint8_t *data;
-    auto datalen = nghttp2_session_mem_send(session_, &data);
-
-    if (datalen < 0) {
-      SSLOG(ERROR, this) << "nghttp2_session_mem_send() returned error: "
-                         << nghttp2_strerror(datalen);
-      return -1;
-    }
-    if (datalen == 0) {
-      break;
-    }
-    wb_.append(data, datalen);
-
-    if (wb_.rleft() >= MAX_BUFFER_SIZE) {
-      break;
-    }
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "No more read/write for this session";
-    }
-    return -1;
-  }
-
-  return 0;
-}
-
-void Http2Session::signal_write() {
-  switch (state_) {
-  case Http2Session::DISCONNECTED:
-    if (!ev_is_active(&initiate_connection_timer_)) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "Start connecting to backend server";
-      }
-      // Since the timer is set to 0., these will feed 2 events.  We
-      // will stop the timer in the initiate_connection_timer_ to void
-      // 2nd event.
-      ev_timer_start(conn_.loop, &initiate_connection_timer_);
-      ev_feed_event(conn_.loop, &initiate_connection_timer_, 0);
-    }
-    break;
-  case Http2Session::CONNECTED:
-    conn_.wlimit.startw();
-    break;
-  }
-}
-
-struct ev_loop *Http2Session::get_loop() const {
-  return conn_.loop;
-}
-
-ev_io *Http2Session::get_wev() { return &conn_.wev; }
-
-int Http2Session::get_state() const { return state_; }
-
-void Http2Session::set_state(int state) { state_ = state; }
-
-int Http2Session::terminate_session(uint32_t error_code) {
-  int rv;
-  rv = nghttp2_session_terminate_session(session_, error_code);
-  if (rv != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-SSL *Http2Session::get_ssl() const { return conn_.tls.ssl; }
-
-int Http2Session::consume(int32_t stream_id, size_t len) {
-  int rv;
-
-  if (!session_) {
-    return 0;
-  }
-
-  rv = nghttp2_session_consume(session_, stream_id, len);
-
-  if (rv != 0) {
-    SSLOG(WARN, this) << "nghttp2_session_consume() returned error: "
-                      << nghttp2_strerror(rv);
-
-    return -1;
-  }
-
-  return 0;
-}
-
-bool Http2Session::can_push_request() const {
-  return state_ == CONNECTED &&
-         connection_check_state_ == CONNECTION_CHECK_NONE;
-}
-
-void Http2Session::start_checking_connection() {
-  if (state_ != CONNECTED ||
-      connection_check_state_ != CONNECTION_CHECK_REQUIRED) {
-    return;
-  }
-  connection_check_state_ = CONNECTION_CHECK_STARTED;
-
-  SSLOG(INFO, this) << "Start checking connection";
-  // If connection is down, we may get error when writing data.  Issue
-  // ping frame to see whether connection is alive.
-  nghttp2_submit_ping(session_, NGHTTP2_FLAG_NONE, NULL);
-
-  // set ping timeout and start timer again
-  reset_connection_check_timer(CONNCHK_PING_TIMEOUT);
-
-  signal_write();
-}
-
-void Http2Session::reset_connection_check_timer(ev_tstamp t) {
-  connchk_timer_.repeat = t;
-  ev_timer_again(conn_.loop, &connchk_timer_);
-}
-
-void Http2Session::reset_connection_check_timer_if_not_checking() {
-  if (connection_check_state_ != CONNECTION_CHECK_NONE) {
-    return;
-  }
-
-  reset_connection_check_timer(CONNCHK_TIMEOUT);
-}
-
-void Http2Session::connection_alive() {
-  reset_connection_check_timer(CONNCHK_TIMEOUT);
-
-  if (connection_check_state_ == CONNECTION_CHECK_NONE) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Connection alive";
-  }
-
-  connection_check_state_ = CONNECTION_CHECK_NONE;
-
-  submit_pending_requests();
-}
-
-void Http2Session::submit_pending_requests() {
-  for (auto dconn = dconns_.head; dconn; dconn = dconn->dlnext) {
-    auto downstream = dconn->get_downstream();
-
-    if (!downstream->get_request_pending() ||
-        !downstream->request_submission_ready()) {
-      continue;
-    }
-
-    auto upstream = downstream->get_upstream();
-
-    if (dconn->push_request_headers() != 0) {
-      if (LOG_ENABLED(INFO)) {
-        SSLOG(INFO, this) << "backend request failed";
-      }
-
-      upstream->on_downstream_abort_request(downstream, 400);
-
-      continue;
-    }
-
-    upstream->resume_read(SHRPX_NO_BUFFER, downstream, 0);
-  }
-}
-
-void Http2Session::set_connection_check_state(int state) {
-  connection_check_state_ = state;
-}
-
-int Http2Session::get_connection_check_state() const {
-  return connection_check_state_;
-}
-
-int Http2Session::noop() { return 0; }
-
-int Http2Session::read_noop(const uint8_t *data, size_t datalen) { return 0; }
-
-int Http2Session::write_noop() { return 0; }
-
-int Http2Session::connected() {
-  auto sock_error = util::get_socket_error(conn_.fd);
-  if (sock_error != 0) {
-    SSLOG(WARN, this) << "Backend connect failed; addr="
-                      << util::to_numeric_addr(raddr_)
-                      << ": errno=" << sock_error;
-
-    downstream_failure(addr_, raddr_);
-
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Connection established";
-  }
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  // Reset timeout for write.  Previously, we set timeout for connect.
-  conn_.wt.repeat = downstreamconf.timeout.write;
-  ev_timer_again(conn_.loop, &conn_.wt);
-
-  conn_.rlimit.startw();
-  conn_.again_rt();
-
-  read_ = &Http2Session::read_clear;
-  write_ = &Http2Session::write_clear;
-
-  if (state_ == PROXY_CONNECTING) {
-    return do_write();
-  }
-
-  if (conn_.tls.ssl) {
-    read_ = &Http2Session::tls_handshake;
-    write_ = &Http2Session::tls_handshake;
-
-    return do_write();
-  }
-
-  if (connection_made() != 0) {
-    state_ = CONNECT_FAILING;
-    return -1;
-  }
-
-  return 0;
-}
-
-int Http2Session::read_clear() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<uint8_t, 16_k> buf;
-
-  for (;;) {
-    auto nread = conn_.read_clear(buf.data(), buf.size());
-
-    if (nread == 0) {
-      return write_clear();
-    }
-
-    if (nread < 0) {
-      return nread;
-    }
-
-    if (on_read(buf.data(), nread) != 0) {
-      return -1;
-    }
-  }
-}
-
-int Http2Session::write_clear() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<struct iovec, MAX_WR_IOVCNT> iov;
-
-  for (;;) {
-    if (wb_.rleft() > 0) {
-      auto iovcnt = wb_.riovec(iov.data(), iov.size());
-      auto nwrite = conn_.writev_clear(iov.data(), iovcnt);
-
-      if (nwrite == 0) {
-        return 0;
-      }
-
-      if (nwrite < 0) {
-        // We may have pending data in receive buffer which may
-        // contain part of response body.  So keep reading.  Invoke
-        // read event to get read(2) error just in case.
-        ev_feed_event(conn_.loop, &conn_.rev, EV_READ);
-        write_ = &Http2Session::write_void;
-        break;
-      }
-
-      wb_.drain(nwrite);
-      continue;
-    }
-
-    if (on_write() != 0) {
-      return -1;
-    }
-    if (wb_.rleft() == 0) {
-      break;
-    }
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int Http2Session::tls_handshake() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  ERR_clear_error();
-
-  auto rv = conn_.tls_handshake();
-
-  if (rv == SHRPX_ERR_INPROGRESS) {
-    return 0;
-  }
-
-  if (rv < 0) {
-    downstream_failure(addr_, raddr_);
-
-    return rv;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "SSL/TLS handshake completed";
-  }
-
-  if (!get_config()->tls.insecure &&
-      tls::check_cert(conn_.tls.ssl, addr_, raddr_) != 0) {
-    downstream_failure(addr_, raddr_);
-
-    return -1;
-  }
-
-  read_ = &Http2Session::read_tls;
-  write_ = &Http2Session::write_tls;
-
-  if (connection_made() != 0) {
-    state_ = CONNECT_FAILING;
-    return -1;
-  }
-
-  return 0;
-}
-
-int Http2Session::read_tls() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<uint8_t, 16_k> buf;
-
-  ERR_clear_error();
-
-  for (;;) {
-    auto nread = conn_.read_tls(buf.data(), buf.size());
-
-    if (nread == 0) {
-      return write_tls();
-    }
-
-    if (nread < 0) {
-      return nread;
-    }
-
-    if (on_read(buf.data(), nread) != 0) {
-      return -1;
-    }
-  }
-}
-
-int Http2Session::write_tls() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  ERR_clear_error();
-
-  struct iovec iov;
-
-  for (;;) {
-    if (wb_.rleft() > 0) {
-      auto iovcnt = wb_.riovec(&iov, 1);
-      if (iovcnt != 1) {
-        assert(0);
-        return -1;
-      }
-      auto nwrite = conn_.write_tls(iov.iov_base, iov.iov_len);
-
-      if (nwrite == 0) {
-        return 0;
-      }
-
-      if (nwrite < 0) {
-        // We may have pending data in receive buffer which may
-        // contain part of response body.  So keep reading.  Invoke
-        // read event to get read(2) error just in case.
-        ev_feed_event(conn_.loop, &conn_.rev, EV_READ);
-        write_ = &Http2Session::write_void;
-        break;
-      }
-
-      wb_.drain(nwrite);
-
-      continue;
-    }
-
-    if (on_write() != 0) {
-      return -1;
-    }
-    if (wb_.rleft() == 0) {
-      conn_.start_tls_write_idle();
-      break;
-    }
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int Http2Session::write_void() {
-  conn_.wlimit.stopw();
-  return 0;
-}
-
-bool Http2Session::should_hard_fail() const {
-  switch (state_) {
-  case PROXY_CONNECTING:
-  case PROXY_FAILED:
-    return true;
-  case DISCONNECTED: {
-    const auto &proxy = get_config()->downstream_http_proxy;
-    return !proxy.host.empty();
-  }
-  default:
-    return false;
-  }
-}
-
-DownstreamAddr *Http2Session::get_addr() const { return addr_; }
-
-int Http2Session::handle_downstream_push_promise(Downstream *downstream,
-                                                 int32_t promised_stream_id) {
-  auto upstream = downstream->get_upstream();
-  if (!upstream->push_enabled()) {
-    return -1;
-  }
-
-  auto promised_downstream =
-      upstream->on_downstream_push_promise(downstream, promised_stream_id);
-  if (!promised_downstream) {
-    return -1;
-  }
-
-  // Now we have Downstream object for pushed stream.
-  // promised_downstream->get_stream() still returns 0.
-
-  auto handler = upstream->get_client_handler();
-
-  auto promised_dconn = make_unique<Http2DownstreamConnection>(this);
-  promised_dconn->set_client_handler(handler);
-
-  auto ptr = promised_dconn.get();
-
-  if (promised_downstream->attach_downstream_connection(
-          std::move(promised_dconn)) != 0) {
-    return -1;
-  }
-
-  auto promised_sd = make_unique<StreamData>();
-
-  nghttp2_session_set_stream_user_data(session_, promised_stream_id,
-                                       promised_sd.get());
-
-  ptr->attach_stream_data(promised_sd.get());
-  streams_.append(promised_sd.release());
-
-  return 0;
-}
-
-int Http2Session::handle_downstream_push_promise_complete(
-    Downstream *downstream, Downstream *promised_downstream) {
-  auto &promised_req = promised_downstream->request();
-
-  auto &promised_balloc = promised_downstream->get_block_allocator();
-
-  auto authority = promised_req.fs.header(http2::HD__AUTHORITY);
-  auto path = promised_req.fs.header(http2::HD__PATH);
-  auto method = promised_req.fs.header(http2::HD__METHOD);
-  auto scheme = promised_req.fs.header(http2::HD__SCHEME);
-
-  if (!authority) {
-    authority = promised_req.fs.header(http2::HD_HOST);
-  }
-
-  auto method_token = http2::lookup_method_token(method->value);
-  if (method_token == -1) {
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "Unrecognized method: " << method->value;
-    }
-
-    return -1;
-  }
-
-  // TODO Rewrite authority if we enabled rewrite host.  But we
-  // really don't know how to rewrite host.  Should we use the same
-  // host in associated stream?
-  if (authority) {
-    promised_req.authority = authority->value;
-  }
-  promised_req.method = method_token;
-  // libnghttp2 ensures that we don't have CONNECT method in
-  // PUSH_PROMISE, and guarantees that :scheme exists.
-  if (scheme) {
-    promised_req.scheme = scheme->value;
-  }
-
-  // For server-wide OPTIONS request, path is empty.
-  if (method_token != HTTP_OPTIONS || path->value != "*") {
-    promised_req.path = http2::rewrite_clean_path(promised_balloc, path->value);
-  }
-
-  promised_downstream->inspect_http2_request();
-
-  auto upstream = promised_downstream->get_upstream();
-
-  promised_downstream->set_request_state(Downstream::MSG_COMPLETE);
-  promised_downstream->set_request_header_sent(true);
-
-  if (upstream->on_downstream_push_promise_complete(downstream,
-                                                    promised_downstream) != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-size_t Http2Session::get_num_dconns() const { return dconns_.size(); }
-
-bool Http2Session::max_concurrency_reached(size_t extra) const {
-  if (!session_) {
-    return dconns_.size() + extra >= 100;
-  }
-
-  // If session does not allow further requests, it effectively means
-  // that maximum concurrency is reached.
-  return !nghttp2_session_check_request_allowed(session_) ||
-         dconns_.size() + extra >=
-             nghttp2_session_get_remote_settings(
-                 session_, NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS);
-}
-
-const std::shared_ptr<DownstreamAddrGroup> &
-Http2Session::get_downstream_addr_group() const {
-  return group_;
-}
-
-void Http2Session::add_to_avail_freelist() {
-  if (freelist_zone_ != FREELIST_ZONE_NONE) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Append to http2_avail_freelist, group="
-                      << group_.get() << ", freelist.size="
-                      << group_->shared_addr->http2_avail_freelist.size();
-  }
-
-  freelist_zone_ = FREELIST_ZONE_AVAIL;
-  group_->shared_addr->http2_avail_freelist.append(this);
-  addr_->in_avail = true;
-}
-
-void Http2Session::add_to_extra_freelist() {
-  if (freelist_zone_ != FREELIST_ZONE_NONE) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    SSLOG(INFO, this) << "Append to http2_extra_freelist, addr=" << addr_
-                      << ", freelist.size="
-                      << addr_->http2_extra_freelist.size();
-  }
-
-  freelist_zone_ = FREELIST_ZONE_EXTRA;
-  addr_->http2_extra_freelist.append(this);
-}
-
-void Http2Session::remove_from_freelist() {
-  switch (freelist_zone_) {
-  case FREELIST_ZONE_NONE:
-    return;
-  case FREELIST_ZONE_AVAIL:
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "Remove from http2_avail_freelist, group=" << group_
-                        << ", freelist.size="
-                        << group_->shared_addr->http2_avail_freelist.size();
-    }
-    group_->shared_addr->http2_avail_freelist.remove(this);
-    addr_->in_avail = false;
-    break;
-  case FREELIST_ZONE_EXTRA:
-    if (LOG_ENABLED(INFO)) {
-      SSLOG(INFO, this) << "Remove from http2_extra_freelist, addr=" << addr_
-                        << ", freelist.size="
-                        << addr_->http2_extra_freelist.size();
-    }
-    addr_->http2_extra_freelist.remove(this);
-    break;
-  case FREELIST_ZONE_GONE:
-    return;
-  }
-
-  freelist_zone_ = FREELIST_ZONE_NONE;
-}
-
-void Http2Session::exclude_from_scheduling() {
-  remove_from_freelist();
-  freelist_zone_ = FREELIST_ZONE_GONE;
-}
-
-DefaultMemchunks *Http2Session::get_request_buf() { return &wb_; }
-
-void Http2Session::on_timeout() {
-  switch (state_) {
-  case PROXY_CONNECTING: {
-    auto worker_blocker = worker_->get_connect_blocker();
-    worker_blocker->on_failure();
-    break;
-  }
-  case CONNECTING: {
-    SSLOG(WARN, this) << "Connect time out; addr="
-                      << util::to_numeric_addr(raddr_);
-
-    downstream_failure(addr_, raddr_);
-    break;
-  }
-  }
-}
-
-void Http2Session::check_retire() {
-  if (!group_->retired) {
-    return;
-  }
-
-  ev_prepare_stop(conn_.loop, &prep_);
-
-  auto last_stream_id = nghttp2_session_get_last_proc_stream_id(session_);
-  nghttp2_submit_goaway(session_, NGHTTP2_FLAG_NONE, last_stream_id,
-                        NGHTTP2_NO_ERROR, nullptr, 0);
-
-  signal_write();
-}
-
-const Address *Http2Session::get_raddr() const { return raddr_; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_session.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,289 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP2_SESSION_H
-#define SHRPX_HTTP2_SESSION_H
-
-#include "shrpx.h"
-
-#include <unordered_set>
-#include <memory>
-
-#include <openssl/ssl.h>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "http-parser/http_parser.h"
-
-#include "shrpx_connection.h"
-#include "buffer.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Http2DownstreamConnection;
-class Worker;
-class Downstream;
-struct DownstreamAddrGroup;
-struct DownstreamAddr;
-struct DNSQuery;
-
-struct StreamData {
-  StreamData *dlnext, *dlprev;
-  Http2DownstreamConnection *dconn;
-};
-
-enum FreelistZone {
-  // Http2Session object is not linked in any freelist.
-  FREELIST_ZONE_NONE,
-  // Http2Session object is linked in group scope
-  // http2_avail_freelist.
-  FREELIST_ZONE_AVAIL,
-  // Http2Session object is linked in address scope
-  // http2_extra_freelist.
-  FREELIST_ZONE_EXTRA,
-  // Http2Session object is about to be deleted, and it does not
-  // belong to any linked list.
-  FREELIST_ZONE_GONE
-};
-
-class Http2Session {
-public:
-  Http2Session(struct ev_loop *loop, SSL_CTX *ssl_ctx, Worker *worker,
-               const std::shared_ptr<DownstreamAddrGroup> &group,
-               DownstreamAddr *addr);
-  ~Http2Session();
-
-  // If hard is true, all pending requests are abandoned and
-  // associated ClientHandlers will be deleted.
-  int disconnect(bool hard = false);
-  int initiate_connection();
-  int resolve_name();
-
-  void add_downstream_connection(Http2DownstreamConnection *dconn);
-  void remove_downstream_connection(Http2DownstreamConnection *dconn);
-
-  void remove_stream_data(StreamData *sd);
-
-  int submit_request(Http2DownstreamConnection *dconn, const nghttp2_nv *nva,
-                     size_t nvlen, const nghttp2_data_provider *data_prd);
-
-  int submit_rst_stream(int32_t stream_id, uint32_t error_code);
-
-  int terminate_session(uint32_t error_code);
-
-  nghttp2_session *get_session() const;
-
-  int resume_data(Http2DownstreamConnection *dconn);
-
-  int connection_made();
-
-  int do_read();
-  int do_write();
-
-  int on_read(const uint8_t *data, size_t datalen);
-  int on_write();
-
-  int connected();
-  int read_clear();
-  int write_clear();
-  int tls_handshake();
-  int read_tls();
-  int write_tls();
-  // This is a special write function which just stop write event
-  // watcher.
-  int write_void();
-
-  int downstream_read_proxy(const uint8_t *data, size_t datalen);
-  int downstream_connect_proxy();
-
-  int downstream_read(const uint8_t *data, size_t datalen);
-  int downstream_write();
-
-  int noop();
-  int read_noop(const uint8_t *data, size_t datalen);
-  int write_noop();
-
-  void signal_write();
-
-  struct ev_loop *get_loop() const;
-
-  ev_io *get_wev();
-
-  int get_state() const;
-  void set_state(int state);
-
-  void start_settings_timer();
-  void stop_settings_timer();
-
-  SSL *get_ssl() const;
-
-  int consume(int32_t stream_id, size_t len);
-
-  // Returns true if request can be issued on downstream connection.
-  bool can_push_request() const;
-  // Initiates the connection checking if downstream connection has
-  // been established and connection checking is required.
-  void start_checking_connection();
-  // Resets connection check timer to timeout |t|.  After timeout, we
-  // require connection checking.  If connection checking is already
-  // enabled, this timeout is for PING ACK timeout.
-  void reset_connection_check_timer(ev_tstamp t);
-  void reset_connection_check_timer_if_not_checking();
-  // Signals that connection is alive.  Internally
-  // reset_connection_check_timer() is called.
-  void connection_alive();
-  // Change connection check state.
-  void set_connection_check_state(int state);
-  int get_connection_check_state() const;
-
-  bool should_hard_fail() const;
-
-  void submit_pending_requests();
-
-  DownstreamAddr *get_addr() const;
-
-  const std::shared_ptr<DownstreamAddrGroup> &get_downstream_addr_group() const;
-
-  int handle_downstream_push_promise(Downstream *downstream,
-                                     int32_t promised_stream_id);
-  int handle_downstream_push_promise_complete(Downstream *downstream,
-                                              Downstream *promised_downstream);
-
-  // Returns number of downstream connections, including pushed
-  // streams.
-  size_t get_num_dconns() const;
-
-  // Adds to group scope http2_avail_freelist.
-  void add_to_avail_freelist();
-  // Adds to address scope http2_extra_freelist.
-  void add_to_extra_freelist();
-
-  // Removes this object from any freelist.  If this object is not
-  // linked from any freelist, this function does nothing.
-  void remove_from_freelist();
-
-  // Removes this object form any freelist, and marks this object as
-  // not schedulable.
-  void exclude_from_scheduling();
-
-  // Returns true if the maximum concurrency is reached.  In other
-  // words, the number of currently participated streams in this
-  // session is equal or greater than the max concurrent streams limit
-  // advertised by server.  If |extra| is nonzero, it is added to the
-  // number of current concurrent streams when comparing against
-  // server initiated concurrency limit.
-  bool max_concurrency_reached(size_t extra = 0) const;
-
-  DefaultMemchunks *get_request_buf();
-
-  void on_timeout();
-
-  // This is called periodically using ev_prepare watcher, and if
-  // group_ is retired (backend has been replaced), send GOAWAY to
-  // shutdown the connection.
-  void check_retire();
-
-  // Returns address used to connect to backend.  Could be nullptr.
-  const Address *get_raddr() const;
-
-  enum {
-    // Disconnected
-    DISCONNECTED,
-    // Connecting proxy and making CONNECT request
-    PROXY_CONNECTING,
-    // Tunnel is established with proxy
-    PROXY_CONNECTED,
-    // Establishing tunnel is failed
-    PROXY_FAILED,
-    // Connecting to downstream and/or performing SSL/TLS handshake
-    CONNECTING,
-    // Connected to downstream
-    CONNECTED,
-    // Connection is started to fail
-    CONNECT_FAILING,
-    // Resolving host name
-    RESOLVING_NAME,
-  };
-
-  enum {
-    // Connection checking is not required
-    CONNECTION_CHECK_NONE,
-    // Connection checking is required
-    CONNECTION_CHECK_REQUIRED,
-    // Connection checking has been started
-    CONNECTION_CHECK_STARTED
-  };
-
-  using ReadBuf = Buffer<8_k>;
-
-  Http2Session *dlnext, *dlprev;
-
-private:
-  Connection conn_;
-  DefaultMemchunks wb_;
-  ev_timer settings_timer_;
-  // This timer has 2 purpose: when it first timeout, set
-  // connection_check_state_ = CONNECTION_CHECK_REQUIRED.  After
-  // connection check has started, this timer is started again and
-  // traps PING ACK timeout.
-  ev_timer connchk_timer_;
-  // timer to initiate connection.  usually, this fires immediately.
-  ev_timer initiate_connection_timer_;
-  ev_prepare prep_;
-  DList<Http2DownstreamConnection> dconns_;
-  DList<StreamData> streams_;
-  std::function<int(Http2Session &)> read_, write_;
-  std::function<int(Http2Session &, const uint8_t *, size_t)> on_read_;
-  std::function<int(Http2Session &)> on_write_;
-  // Used to parse the response from HTTP proxy
-  std::unique_ptr<http_parser> proxy_htp_;
-  Worker *worker_;
-  // NULL if no TLS is configured
-  SSL_CTX *ssl_ctx_;
-  std::shared_ptr<DownstreamAddrGroup> group_;
-  // Address of remote endpoint
-  DownstreamAddr *addr_;
-  nghttp2_session *session_;
-  // Actual remote address used to contact backend.  This is initially
-  // nullptr, and may point to either &addr_->addr,
-  // resolved_addr_.get(), or HTTP proxy's address structure.
-  const Address *raddr_;
-  // Resolved IP address if dns parameter is used
-  std::unique_ptr<Address> resolved_addr_;
-  std::unique_ptr<DNSQuery> dns_query_;
-  int state_;
-  int connection_check_state_;
-  int freelist_zone_;
-};
-
-nghttp2_session_callbacks *create_http2_downstream_callbacks();
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP2_SESSION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2328 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_http2_upstream.h"
-
-#include <netinet/tcp.h>
-#include <assert.h>
-#include <cerrno>
-#include <sstream>
-
-#include "shrpx_client_handler.h"
-#include "shrpx_https_upstream.h"
-#include "shrpx_downstream.h"
-#include "shrpx_downstream_connection.h"
-#include "shrpx_config.h"
-#include "shrpx_http.h"
-#include "shrpx_worker.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_log.h"
-#ifdef HAVE_MRUBY
-#  include "shrpx_mruby.h"
-#endif // HAVE_MRUBY
-#include "http2.h"
-#include "util.h"
-#include "base64.h"
-#include "app_helper.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-constexpr size_t MAX_BUFFER_SIZE = 32_k;
-} // namespace
-
-namespace {
-int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                             uint32_t error_code, void *user_data) {
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, upstream) << "Stream stream_id=" << stream_id
-                         << " is being closed";
-  }
-
-  auto downstream = static_cast<Downstream *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-
-  if (!downstream) {
-    return 0;
-  }
-
-  auto &req = downstream->request();
-
-  upstream->consume(stream_id, req.unconsumed_body_length);
-
-  req.unconsumed_body_length = 0;
-
-  if (downstream->get_request_state() == Downstream::CONNECT_FAIL) {
-    upstream->remove_downstream(downstream);
-    // downstream was deleted
-
-    return 0;
-  }
-
-  if (downstream->can_detach_downstream_connection()) {
-    // Keep-alive
-    downstream->detach_downstream_connection();
-  }
-
-  downstream->set_request_state(Downstream::STREAM_CLOSED);
-
-  // At this point, downstream read may be paused.
-
-  // If shrpx_downstream::push_request_headers() failed, the
-  // error is handled here.
-  upstream->remove_downstream(downstream);
-  // downstream was deleted
-
-  // How to test this case? Request sufficient large download
-  // and make client send RST_STREAM after it gets first DATA
-  // frame chunk.
-
-  return 0;
-}
-} // namespace
-
-int Http2Upstream::upgrade_upstream(HttpsUpstream *http) {
-  int rv;
-
-  auto &balloc = http->get_downstream()->get_block_allocator();
-
-  auto http2_settings = http->get_downstream()->get_http2_settings();
-  http2_settings = util::to_base64(balloc, http2_settings);
-
-  auto settings_payload = base64::decode(balloc, std::begin(http2_settings),
-                                         std::end(http2_settings));
-
-  rv = nghttp2_session_upgrade2(
-      session_, settings_payload.byte(), settings_payload.size(),
-      http->get_downstream()->request().method == HTTP_HEAD, nullptr);
-  if (rv != 0) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "nghttp2_session_upgrade() returned error: "
-                       << nghttp2_strerror(rv);
-    }
-    return -1;
-  }
-  pre_upstream_.reset(http);
-  auto downstream = http->pop_downstream();
-  downstream->reset_upstream(this);
-  downstream->set_stream_id(1);
-  downstream->reset_upstream_rtimer();
-  downstream->set_stream_id(1);
-
-  auto ptr = downstream.get();
-
-  nghttp2_session_set_stream_user_data(session_, 1, ptr);
-  downstream_queue_.add_pending(std::move(downstream));
-  downstream_queue_.mark_active(ptr);
-
-  // TODO This might not be necessary
-  handler_->stop_read_timer();
-
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, this) << "Connection upgraded to HTTP/2";
-  }
-
-  return 0;
-}
-
-void Http2Upstream::start_settings_timer() {
-  ev_timer_start(handler_->get_loop(), &settings_timer_);
-}
-
-void Http2Upstream::stop_settings_timer() {
-  ev_timer_stop(handler_->get_loop(), &settings_timer_);
-}
-
-namespace {
-int on_header_callback2(nghttp2_session *session, const nghttp2_frame *frame,
-                        nghttp2_rcbuf *name, nghttp2_rcbuf *value,
-                        uint8_t flags, void *user_data) {
-  auto namebuf = nghttp2_rcbuf_get_buf(name);
-  auto valuebuf = nghttp2_rcbuf_get_buf(value);
-  auto config = get_config();
-
-  if (config->http2.upstream.debug.frame_debug) {
-    verbose_on_header_callback(session, frame, namebuf.base, namebuf.len,
-                               valuebuf.base, valuebuf.len, flags, user_data);
-  }
-  if (frame->hd.type != NGHTTP2_HEADERS) {
-    return 0;
-  }
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  auto downstream = static_cast<Downstream *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!downstream) {
-    return 0;
-  }
-
-  auto &req = downstream->request();
-
-  auto &httpconf = config->http;
-
-  if (req.fs.buffer_size() + namebuf.len + valuebuf.len >
-          httpconf.request_header_field_buffer ||
-      req.fs.num_fields() >= httpconf.max_request_header_fields) {
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      return 0;
-    }
-
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, upstream) << "Too large or many header field size="
-                           << req.fs.buffer_size() + namebuf.len + valuebuf.len
-                           << ", num=" << req.fs.num_fields() + 1;
-    }
-
-    // just ignore header fields if this is trailer part.
-    if (frame->headers.cat == NGHTTP2_HCAT_HEADERS) {
-      return 0;
-    }
-
-    if (upstream->error_reply(downstream, 431) != 0) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-
-  auto token = http2::lookup_token(namebuf.base, namebuf.len);
-  auto no_index = flags & NGHTTP2_NV_FLAG_NO_INDEX;
-
-  downstream->add_rcbuf(name);
-  downstream->add_rcbuf(value);
-
-  if (frame->headers.cat == NGHTTP2_HCAT_HEADERS) {
-    // just store header fields for trailer part
-    req.fs.add_trailer_token(StringRef{namebuf.base, namebuf.len},
-                             StringRef{valuebuf.base, valuebuf.len}, no_index,
-                             token);
-    return 0;
-  }
-
-  req.fs.add_header_token(StringRef{namebuf.base, namebuf.len},
-                          StringRef{valuebuf.base, valuebuf.len}, no_index,
-                          token);
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_invalid_header_callback2(nghttp2_session *session,
-                                const nghttp2_frame *frame, nghttp2_rcbuf *name,
-                                nghttp2_rcbuf *value, uint8_t flags,
-                                void *user_data) {
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  auto downstream = static_cast<Downstream *>(
-      nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-  if (!downstream) {
-    return 0;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    auto namebuf = nghttp2_rcbuf_get_buf(name);
-    auto valuebuf = nghttp2_rcbuf_get_buf(value);
-
-    ULOG(INFO, upstream) << "Invalid header field for stream_id="
-                         << frame->hd.stream_id << ": name=["
-                         << StringRef{namebuf.base, namebuf.len} << "], value=["
-                         << StringRef{valuebuf.base, valuebuf.len} << "]";
-  }
-
-  upstream->rst_stream(downstream, NGHTTP2_PROTOCOL_ERROR);
-
-  return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-}
-} // namespace
-
-namespace {
-int on_begin_headers_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, void *user_data) {
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-
-  if (frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
-    return 0;
-  }
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, upstream) << "Received upstream request HEADERS stream_id="
-                         << frame->hd.stream_id;
-  }
-
-  upstream->on_start_request(frame);
-
-  return 0;
-}
-} // namespace
-
-void Http2Upstream::on_start_request(const nghttp2_frame *frame) {
-  auto downstream = make_unique<Downstream>(this, handler_->get_mcpool(),
-                                            frame->hd.stream_id);
-  nghttp2_session_set_stream_user_data(session_, frame->hd.stream_id,
-                                       downstream.get());
-
-  downstream->reset_upstream_rtimer();
-
-  handler_->repeat_read_timer();
-
-  auto &req = downstream->request();
-
-  // Although, we deprecated minor version from HTTP/2, we supply
-  // minor version 0 to use via header field in a conventional way.
-  req.http_major = 2;
-  req.http_minor = 0;
-
-  add_pending_downstream(std::move(downstream));
-
-  ++num_requests_;
-
-  auto config = get_config();
-  auto &httpconf = config->http;
-  if (httpconf.max_requests <= num_requests_) {
-    start_graceful_shutdown();
-  }
-}
-
-int Http2Upstream::on_request_headers(Downstream *downstream,
-                                      const nghttp2_frame *frame) {
-  auto lgconf = log_config();
-  lgconf->update_tstamp(std::chrono::system_clock::now());
-  auto &req = downstream->request();
-  req.tstamp = lgconf->tstamp;
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    return 0;
-  }
-
-  auto &nva = req.fs.headers();
-
-  if (LOG_ENABLED(INFO)) {
-    std::stringstream ss;
-    for (auto &nv : nva) {
-      ss << TTY_HTTP_HD << nv.name << TTY_RST << ": " << nv.value << "\n";
-    }
-    ULOG(INFO, this) << "HTTP request headers. stream_id="
-                     << downstream->get_stream_id() << "\n"
-                     << ss.str();
-  }
-
-  auto config = get_config();
-  auto &dump = config->http2.upstream.debug.dump;
-
-  if (dump.request_header) {
-    http2::dump_nv(dump.request_header, nva);
-  }
-
-  auto content_length = req.fs.header(http2::HD_CONTENT_LENGTH);
-  if (content_length) {
-    // libnghttp2 guarantees this can be parsed
-    req.fs.content_length = util::parse_uint(content_length->value);
-  }
-
-  // presence of mandatory header fields are guaranteed by libnghttp2.
-  auto authority = req.fs.header(http2::HD__AUTHORITY);
-  auto path = req.fs.header(http2::HD__PATH);
-  auto method = req.fs.header(http2::HD__METHOD);
-  auto scheme = req.fs.header(http2::HD__SCHEME);
-
-  auto method_token = http2::lookup_method_token(method->value);
-  if (method_token == -1) {
-    if (error_reply(downstream, 501) != 0) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-    return 0;
-  }
-
-  auto faddr = handler_->get_upstream_addr();
-
-  // For HTTP/2 proxy, we require :authority.
-  if (method_token != HTTP_CONNECT && config->http2_proxy && !faddr->alt_mode &&
-      !authority) {
-    rst_stream(downstream, NGHTTP2_PROTOCOL_ERROR);
-    return 0;
-  }
-
-  req.method = method_token;
-  if (scheme) {
-    req.scheme = scheme->value;
-  }
-
-  // nghttp2 library guarantees either :authority or host exist
-  if (!authority) {
-    req.no_authority = true;
-    authority = req.fs.header(http2::HD_HOST);
-  }
-
-  if (authority) {
-    req.authority = authority->value;
-  }
-
-  if (path) {
-    if (method_token == HTTP_OPTIONS &&
-        path->value == StringRef::from_lit("*")) {
-      // Server-wide OPTIONS request.  Path is empty.
-    } else if (config->http2_proxy && !faddr->alt_mode) {
-      req.path = path->value;
-    } else {
-      req.path = http2::rewrite_clean_path(downstream->get_block_allocator(),
-                                           path->value);
-    }
-  }
-
-  if (!(frame->hd.flags & NGHTTP2_FLAG_END_STREAM)) {
-    req.http2_expect_body = true;
-  } else if (req.fs.content_length == -1) {
-    // If END_STREAM flag is set to HEADERS frame, we are sure that
-    // content-length is 0.
-    req.fs.content_length = 0;
-  }
-
-  downstream->inspect_http2_request();
-
-  downstream->set_request_state(Downstream::HEADER_COMPLETE);
-
-#ifdef HAVE_MRUBY
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto worker = handler->get_worker();
-  auto mruby_ctx = worker->get_mruby_context();
-
-  if (mruby_ctx->run_on_request_proc(downstream) != 0) {
-    if (error_reply(downstream, 500) != 0) {
-      return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-    }
-    return 0;
-  }
-#endif // HAVE_MRUBY
-
-  if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-    downstream->disable_upstream_rtimer();
-
-    downstream->set_request_state(Downstream::MSG_COMPLETE);
-  }
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    return 0;
-  }
-
-  start_downstream(downstream);
-
-  return 0;
-}
-
-void Http2Upstream::start_downstream(Downstream *downstream) {
-  if (downstream_queue_.can_activate(downstream->request().authority)) {
-    initiate_downstream(downstream);
-    return;
-  }
-
-  downstream_queue_.mark_blocked(downstream);
-}
-
-void Http2Upstream::initiate_downstream(Downstream *downstream) {
-  int rv;
-
-  auto dconn = handler_->get_downstream_connection(rv, downstream);
-  if (!dconn) {
-    if (rv == SHRPX_ERR_TLS_REQUIRED) {
-      rv = redirect_to_https(downstream);
-    } else {
-      rv = error_reply(downstream, 502);
-    }
-    if (rv != 0) {
-      rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    }
-
-    downstream->set_request_state(Downstream::CONNECT_FAIL);
-    downstream_queue_.mark_failure(downstream);
-
-    return;
-  }
-
-#ifdef HAVE_MRUBY
-  auto dconn_ptr = dconn.get();
-#endif // HAVE_MRUBY
-  rv = downstream->attach_downstream_connection(std::move(dconn));
-  if (rv != 0) {
-    // downstream connection fails, send error page
-    if (error_reply(downstream, 502) != 0) {
-      rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    }
-
-    downstream->set_request_state(Downstream::CONNECT_FAIL);
-
-    downstream_queue_.mark_failure(downstream);
-
-    return;
-  }
-
-#ifdef HAVE_MRUBY
-  const auto &group = dconn_ptr->get_downstream_addr_group();
-  if (group) {
-    const auto &mruby_ctx = group->mruby_ctx;
-    if (mruby_ctx->run_on_request_proc(downstream) != 0) {
-      if (error_reply(downstream, 500) != 0) {
-        rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-      }
-
-      downstream_queue_.mark_failure(downstream);
-
-      return;
-    }
-
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      return;
-    }
-  }
-#endif // HAVE_MRUBY
-
-  rv = downstream->push_request_headers();
-  if (rv != 0) {
-
-    if (error_reply(downstream, 502) != 0) {
-      rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    }
-
-    downstream_queue_.mark_failure(downstream);
-
-    return;
-  }
-
-  downstream_queue_.mark_active(downstream);
-
-  auto &req = downstream->request();
-  if (!req.http2_expect_body) {
-    rv = downstream->end_upload_data();
-    if (rv != 0) {
-      rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    }
-  }
-
-  return;
-}
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  if (get_config()->http2.upstream.debug.frame_debug) {
-    verbose_on_frame_recv_callback(session, frame, user_data);
-  }
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  auto handler = upstream->get_client_handler();
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA: {
-    auto downstream = static_cast<Downstream *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!downstream) {
-      return 0;
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      downstream->disable_upstream_rtimer();
-
-      if (downstream->end_upload_data() != 0) {
-        if (downstream->get_response_state() != Downstream::MSG_COMPLETE) {
-          upstream->rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-        }
-      }
-
-      downstream->set_request_state(Downstream::MSG_COMPLETE);
-    }
-
-    return 0;
-  }
-  case NGHTTP2_HEADERS: {
-    auto downstream = static_cast<Downstream *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (!downstream) {
-      return 0;
-    }
-
-    if (frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-      downstream->reset_upstream_rtimer();
-
-      handler->stop_read_timer();
-
-      return upstream->on_request_headers(downstream, frame);
-    }
-
-    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      downstream->disable_upstream_rtimer();
-
-      if (downstream->end_upload_data() != 0) {
-        if (downstream->get_response_state() != Downstream::MSG_COMPLETE) {
-          upstream->rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-        }
-      }
-
-      downstream->set_request_state(Downstream::MSG_COMPLETE);
-    }
-
-    return 0;
-  }
-  case NGHTTP2_SETTINGS:
-    if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
-      return 0;
-    }
-    upstream->stop_settings_timer();
-    return 0;
-  case NGHTTP2_GOAWAY:
-    if (LOG_ENABLED(INFO)) {
-      auto debug_data = util::ascii_dump(frame->goaway.opaque_data,
-                                         frame->goaway.opaque_data_len);
-
-      ULOG(INFO, upstream) << "GOAWAY received: last-stream-id="
-                           << frame->goaway.last_stream_id
-                           << ", error_code=" << frame->goaway.error_code
-                           << ", debug_data=" << debug_data;
-    }
-    return 0;
-  default:
-    return 0;
-  }
-}
-} // namespace
-
-namespace {
-int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                int32_t stream_id, const uint8_t *data,
-                                size_t len, void *user_data) {
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  auto downstream = static_cast<Downstream *>(
-      nghttp2_session_get_stream_user_data(session, stream_id));
-
-  if (!downstream) {
-    if (upstream->consume(stream_id, len) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-
-  downstream->reset_upstream_rtimer();
-
-  if (downstream->push_upload_data_chunk(data, len) != 0) {
-    if (downstream->get_response_state() != Downstream::MSG_COMPLETE) {
-      upstream->rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    }
-
-    if (upstream->consume(stream_id, len) != 0) {
-      return NGHTTP2_ERR_CALLBACK_FAILURE;
-    }
-
-    return 0;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  if (get_config()->http2.upstream.debug.frame_debug) {
-    verbose_on_frame_send_callback(session, frame, user_data);
-  }
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  auto handler = upstream->get_client_handler();
-
-  switch (frame->hd.type) {
-  case NGHTTP2_DATA:
-  case NGHTTP2_HEADERS: {
-    if ((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
-      return 0;
-    }
-    // RST_STREAM if request is still incomplete.
-    auto stream_id = frame->hd.stream_id;
-    auto downstream = static_cast<Downstream *>(
-        nghttp2_session_get_stream_user_data(session, stream_id));
-
-    if (!downstream) {
-      return 0;
-    }
-
-    // For tunneling, issue RST_STREAM to finish the stream.
-    if (downstream->get_upgraded() ||
-        nghttp2_session_get_stream_remote_close(session, stream_id) == 0) {
-      if (LOG_ENABLED(INFO)) {
-        ULOG(INFO, upstream)
-            << "Send RST_STREAM to "
-            << (downstream->get_upgraded() ? "tunneled " : "")
-            << "stream stream_id=" << downstream->get_stream_id()
-            << " to finish off incomplete request";
-      }
-
-      upstream->rst_stream(downstream, NGHTTP2_NO_ERROR);
-    }
-
-    return 0;
-  }
-  case NGHTTP2_SETTINGS:
-    if ((frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
-      upstream->start_settings_timer();
-    }
-    return 0;
-  case NGHTTP2_PUSH_PROMISE: {
-    auto promised_stream_id = frame->push_promise.promised_stream_id;
-
-    if (nghttp2_session_get_stream_user_data(session, promised_stream_id)) {
-      // In case of push from backend, downstream object was already
-      // created.
-      return 0;
-    }
-
-    auto promised_downstream = make_unique<Downstream>(
-        upstream, handler->get_mcpool(), promised_stream_id);
-    auto &req = promised_downstream->request();
-
-    // As long as we use nghttp2_session_mem_send(), setting stream
-    // user data here should not fail.  This is because this callback
-    // is called just after frame was serialized.  So no worries about
-    // hanging Downstream.
-    nghttp2_session_set_stream_user_data(session, promised_stream_id,
-                                         promised_downstream.get());
-
-    promised_downstream->set_assoc_stream_id(frame->hd.stream_id);
-    promised_downstream->disable_upstream_rtimer();
-
-    req.http_major = 2;
-    req.http_minor = 0;
-
-    req.fs.content_length = 0;
-    req.http2_expect_body = false;
-
-    auto &promised_balloc = promised_downstream->get_block_allocator();
-
-    for (size_t i = 0; i < frame->push_promise.nvlen; ++i) {
-      auto &nv = frame->push_promise.nva[i];
-
-      auto name =
-          make_string_ref(promised_balloc, StringRef{nv.name, nv.namelen});
-      auto value =
-          make_string_ref(promised_balloc, StringRef{nv.value, nv.valuelen});
-
-      auto token = http2::lookup_token(nv.name, nv.namelen);
-      switch (token) {
-      case http2::HD__METHOD:
-        req.method = http2::lookup_method_token(value);
-        break;
-      case http2::HD__SCHEME:
-        req.scheme = value;
-        break;
-      case http2::HD__AUTHORITY:
-        req.authority = value;
-        break;
-      case http2::HD__PATH:
-        req.path = http2::rewrite_clean_path(promised_balloc, value);
-        break;
-      }
-      req.fs.add_header_token(name, value, nv.flags & NGHTTP2_NV_FLAG_NO_INDEX,
-                              token);
-    }
-
-    promised_downstream->inspect_http2_request();
-
-    promised_downstream->set_request_state(Downstream::MSG_COMPLETE);
-
-    // a bit weird but start_downstream() expects that given
-    // downstream is in pending queue.
-    auto ptr = promised_downstream.get();
-    upstream->add_pending_downstream(std::move(promised_downstream));
-
-#ifdef HAVE_MRUBY
-    auto worker = handler->get_worker();
-    auto mruby_ctx = worker->get_mruby_context();
-
-    if (mruby_ctx->run_on_request_proc(ptr) != 0) {
-      if (upstream->error_reply(ptr, 500) != 0) {
-        upstream->rst_stream(ptr, NGHTTP2_INTERNAL_ERROR);
-        return 0;
-      }
-      return 0;
-    }
-#endif // HAVE_MRUBY
-
-    upstream->start_downstream(ptr);
-
-    return 0;
-  }
-  case NGHTTP2_GOAWAY:
-    if (LOG_ENABLED(INFO)) {
-      auto debug_data = util::ascii_dump(frame->goaway.opaque_data,
-                                         frame->goaway.opaque_data_len);
-
-      ULOG(INFO, upstream) << "Sending GOAWAY: last-stream-id="
-                           << frame->goaway.last_stream_id
-                           << ", error_code=" << frame->goaway.error_code
-                           << ", debug_data=" << debug_data;
-    }
-    return 0;
-  default:
-    return 0;
-  }
-}
-} // namespace
-
-namespace {
-int on_frame_not_send_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, int lib_error_code,
-                               void *user_data) {
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, upstream) << "Failed to send control frame type="
-                         << static_cast<uint32_t>(frame->hd.type)
-                         << ", lib_error_code=" << lib_error_code << ":"
-                         << nghttp2_strerror(lib_error_code);
-  }
-  if (frame->hd.type == NGHTTP2_HEADERS &&
-      lib_error_code != NGHTTP2_ERR_STREAM_CLOSED &&
-      lib_error_code != NGHTTP2_ERR_STREAM_CLOSING) {
-    // To avoid stream hanging around, issue RST_STREAM.
-    auto downstream = static_cast<Downstream *>(
-        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
-    if (downstream) {
-      upstream->rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr auto PADDING = std::array<uint8_t, 256>{};
-} // namespace
-
-namespace {
-int send_data_callback(nghttp2_session *session, nghttp2_frame *frame,
-                       const uint8_t *framehd, size_t length,
-                       nghttp2_data_source *source, void *user_data) {
-  auto downstream = static_cast<Downstream *>(source->ptr);
-  auto upstream = static_cast<Http2Upstream *>(downstream->get_upstream());
-  auto body = downstream->get_response_buf();
-
-  auto wb = upstream->get_response_buf();
-
-  size_t padlen = 0;
-
-  wb->append(framehd, 9);
-  if (frame->data.padlen > 0) {
-    padlen = frame->data.padlen - 1;
-    wb->append(static_cast<uint8_t>(padlen));
-  }
-
-  body->remove(*wb, length);
-
-  wb->append(PADDING.data(), padlen);
-
-  if (body->rleft() == 0) {
-    downstream->disable_upstream_wtimer();
-  } else {
-    downstream->reset_upstream_wtimer();
-  }
-
-  if (length > 0 && downstream->resume_read(SHRPX_NO_BUFFER, length) != 0) {
-    return NGHTTP2_ERR_CALLBACK_FAILURE;
-  }
-
-  // We have to add length here, so that we can log this amount of
-  // data transferred.
-  downstream->response_sent_body_length += length;
-
-  auto max_buffer_size = upstream->get_max_buffer_size();
-
-  return wb->rleft() >= max_buffer_size ? NGHTTP2_ERR_PAUSE : 0;
-}
-} // namespace
-
-namespace {
-uint32_t infer_upstream_rst_stream_error_code(uint32_t downstream_error_code) {
-  // NGHTTP2_REFUSED_STREAM is important because it tells upstream
-  // client to retry.
-  switch (downstream_error_code) {
-  case NGHTTP2_NO_ERROR:
-  case NGHTTP2_REFUSED_STREAM:
-    return downstream_error_code;
-  default:
-    return NGHTTP2_INTERNAL_ERROR;
-  }
-}
-} // namespace
-
-namespace {
-void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto upstream = static_cast<Http2Upstream *>(w->data);
-  auto handler = upstream->get_client_handler();
-  ULOG(INFO, upstream) << "SETTINGS timeout";
-  if (upstream->terminate_session(NGHTTP2_SETTINGS_TIMEOUT) != 0) {
-    delete handler;
-    return;
-  }
-  handler->signal_write();
-}
-} // namespace
-
-namespace {
-void shutdown_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto upstream = static_cast<Http2Upstream *>(w->data);
-  auto handler = upstream->get_client_handler();
-  upstream->submit_goaway();
-  handler->signal_write();
-}
-} // namespace
-
-namespace {
-void prepare_cb(struct ev_loop *loop, ev_prepare *w, int revents) {
-  auto upstream = static_cast<Http2Upstream *>(w->data);
-  upstream->check_shutdown();
-}
-} // namespace
-
-void Http2Upstream::submit_goaway() {
-  auto last_stream_id = nghttp2_session_get_last_proc_stream_id(session_);
-  nghttp2_submit_goaway(session_, NGHTTP2_FLAG_NONE, last_stream_id,
-                        NGHTTP2_NO_ERROR, nullptr, 0);
-}
-
-void Http2Upstream::check_shutdown() {
-  auto worker = handler_->get_worker();
-
-  if (!worker->get_graceful_shutdown()) {
-    return;
-  }
-
-  ev_prepare_stop(handler_->get_loop(), &prep_);
-
-  start_graceful_shutdown();
-}
-
-void Http2Upstream::start_graceful_shutdown() {
-  int rv;
-  if (ev_is_active(&shutdown_timer_)) {
-    return;
-  }
-
-  rv = nghttp2_submit_shutdown_notice(session_);
-  if (rv != 0) {
-    ULOG(FATAL, this) << "nghttp2_submit_shutdown_notice() failed: "
-                      << nghttp2_strerror(rv);
-    return;
-  }
-
-  handler_->signal_write();
-
-  ev_timer_start(handler_->get_loop(), &shutdown_timer_);
-}
-
-nghttp2_session_callbacks *create_http2_upstream_callbacks() {
-  int rv;
-  nghttp2_session_callbacks *callbacks;
-
-  rv = nghttp2_session_callbacks_new(&callbacks);
-
-  if (rv != 0) {
-    return nullptr;
-  }
-
-  nghttp2_session_callbacks_set_on_stream_close_callback(
-      callbacks, on_stream_close_callback);
-
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-      callbacks, on_data_chunk_recv_callback);
-
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-
-  nghttp2_session_callbacks_set_on_frame_not_send_callback(
-      callbacks, on_frame_not_send_callback);
-
-  nghttp2_session_callbacks_set_on_header_callback2(callbacks,
-                                                    on_header_callback2);
-
-  nghttp2_session_callbacks_set_on_invalid_header_callback2(
-      callbacks, on_invalid_header_callback2);
-
-  nghttp2_session_callbacks_set_on_begin_headers_callback(
-      callbacks, on_begin_headers_callback);
-
-  nghttp2_session_callbacks_set_send_data_callback(callbacks,
-                                                   send_data_callback);
-
-  auto config = get_config();
-
-  if (config->padding) {
-    nghttp2_session_callbacks_set_select_padding_callback(
-        callbacks, http::select_padding_callback);
-  }
-
-  if (config->http2.upstream.debug.frame_debug) {
-    nghttp2_session_callbacks_set_error_callback2(callbacks,
-                                                  verbose_error_callback);
-  }
-
-  return callbacks;
-}
-
-namespace {
-size_t downstream_queue_size(Worker *worker) {
-  auto &downstreamconf = *worker->get_downstream_config();
-
-  if (get_config()->http2_proxy) {
-    return downstreamconf.connections_per_host;
-  }
-
-  return downstreamconf.connections_per_frontend;
-}
-} // namespace
-
-Http2Upstream::Http2Upstream(ClientHandler *handler)
-    : wb_(handler->get_worker()->get_mcpool()),
-      downstream_queue_(downstream_queue_size(handler->get_worker()),
-                        !get_config()->http2_proxy),
-      handler_(handler),
-      session_(nullptr),
-      max_buffer_size_(MAX_BUFFER_SIZE),
-      num_requests_(0) {
-  int rv;
-
-  auto config = get_config();
-  auto &http2conf = config->http2;
-
-  auto faddr = handler_->get_upstream_addr();
-
-  rv = nghttp2_session_server_new2(
-      &session_, http2conf.upstream.callbacks, this,
-      faddr->alt_mode ? http2conf.upstream.alt_mode_option
-                      : http2conf.upstream.option);
-
-  assert(rv == 0);
-
-  flow_control_ = true;
-
-  // TODO Maybe call from outside?
-  std::array<nghttp2_settings_entry, 3> entry;
-  size_t nentry = 2;
-
-  entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  entry[0].value = http2conf.upstream.max_concurrent_streams;
-
-  entry[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  if (faddr->alt_mode) {
-    entry[1].value = (1u << 31) - 1;
-  } else {
-    entry[1].value = http2conf.upstream.window_size;
-  }
-
-  if (http2conf.upstream.decoder_dynamic_table_size !=
-      NGHTTP2_DEFAULT_HEADER_TABLE_SIZE) {
-    entry[nentry].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-    entry[nentry].value = http2conf.upstream.decoder_dynamic_table_size;
-    ++nentry;
-  }
-
-  rv = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, entry.data(),
-                               nentry);
-  if (rv != 0) {
-    ULOG(ERROR, this) << "nghttp2_submit_settings() returned error: "
-                      << nghttp2_strerror(rv);
-  }
-
-  auto window_size =
-      faddr->alt_mode
-          ? std::numeric_limits<int32_t>::max()
-          : http2conf.upstream.optimize_window_size
-                ? std::min(http2conf.upstream.connection_window_size,
-                           NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE)
-                : http2conf.upstream.connection_window_size;
-
-  rv = nghttp2_session_set_local_window_size(session_, NGHTTP2_FLAG_NONE, 0,
-                                             window_size);
-
-  if (rv != 0) {
-    ULOG(ERROR, this)
-        << "nghttp2_session_set_local_window_size() returned error: "
-        << nghttp2_strerror(rv);
-  }
-
-  // We wait for SETTINGS ACK at least 10 seconds.
-  ev_timer_init(&settings_timer_, settings_timeout_cb,
-                http2conf.upstream.timeout.settings, 0.);
-
-  settings_timer_.data = this;
-
-  // timer for 2nd GOAWAY.  HTTP/2 spec recommend 1 RTT.  We wait for
-  // 2 seconds.
-  ev_timer_init(&shutdown_timer_, shutdown_timeout_cb, 2., 0);
-  shutdown_timer_.data = this;
-
-  ev_prepare_init(&prep_, prepare_cb);
-  prep_.data = this;
-  ev_prepare_start(handler_->get_loop(), &prep_);
-
-#if defined(TCP_INFO) && defined(TCP_NOTSENT_LOWAT)
-  if (http2conf.upstream.optimize_write_buffer_size) {
-    auto conn = handler_->get_connection();
-    conn->tls_dyn_rec_warmup_threshold = 0;
-
-    uint32_t pollout_thres = 1;
-    rv = setsockopt(conn->fd, IPPROTO_TCP, TCP_NOTSENT_LOWAT, &pollout_thres,
-                    static_cast<socklen_t>(sizeof(pollout_thres)));
-
-    if (rv != 0) {
-      if (LOG_ENABLED(INFO)) {
-        auto error = errno;
-        LOG(INFO) << "setsockopt(TCP_NOTSENT_LOWAT, " << pollout_thres
-                  << ") failed: errno=" << error;
-      }
-    }
-  }
-#endif // defined(TCP_INFO) && defined(TCP_NOTSENT_LOWAT)
-
-  handler_->reset_upstream_read_timeout(
-      config->conn.upstream.timeout.http2_read);
-
-  handler_->signal_write();
-}
-
-Http2Upstream::~Http2Upstream() {
-  nghttp2_session_del(session_);
-  ev_prepare_stop(handler_->get_loop(), &prep_);
-  ev_timer_stop(handler_->get_loop(), &shutdown_timer_);
-  ev_timer_stop(handler_->get_loop(), &settings_timer_);
-}
-
-int Http2Upstream::on_read() {
-  ssize_t rv = 0;
-  auto rb = handler_->get_rb();
-  auto rlimit = handler_->get_rlimit();
-
-  if (rb->rleft()) {
-    rv = nghttp2_session_mem_recv(session_, rb->pos(), rb->rleft());
-    if (rv < 0) {
-      if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
-        ULOG(ERROR, this) << "nghttp2_session_mem_recv() returned error: "
-                          << nghttp2_strerror(rv);
-      }
-      return -1;
-    }
-
-    // nghttp2_session_mem_recv should consume all input bytes on
-    // success.
-    assert(static_cast<size_t>(rv) == rb->rleft());
-    rb->reset();
-    rlimit->startw();
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "No more read/write for this HTTP2 session";
-    }
-    return -1;
-  }
-
-  handler_->signal_write();
-  return 0;
-}
-
-// After this function call, downstream may be deleted.
-int Http2Upstream::on_write() {
-  int rv;
-  auto config = get_config();
-  auto &http2conf = config->http2;
-
-  if ((http2conf.upstream.optimize_write_buffer_size ||
-       http2conf.upstream.optimize_window_size) &&
-      handler_->get_ssl()) {
-    auto conn = handler_->get_connection();
-    TCPHint hint;
-    rv = conn->get_tcp_hint(&hint);
-    if (rv == 0) {
-      if (http2conf.upstream.optimize_write_buffer_size) {
-        max_buffer_size_ = std::min(MAX_BUFFER_SIZE, hint.write_buffer_size);
-      }
-
-      if (http2conf.upstream.optimize_window_size) {
-        auto faddr = handler_->get_upstream_addr();
-        if (!faddr->alt_mode) {
-          auto window_size = std::min(http2conf.upstream.connection_window_size,
-                                      static_cast<int32_t>(hint.rwin * 2));
-
-          rv = nghttp2_session_set_local_window_size(
-              session_, NGHTTP2_FLAG_NONE, 0, window_size);
-          if (rv != 0) {
-            if (LOG_ENABLED(INFO)) {
-              ULOG(INFO, this)
-                  << "nghttp2_session_set_local_window_size() with window_size="
-                  << window_size << " failed: " << nghttp2_strerror(rv);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  for (;;) {
-    if (wb_.rleft() >= max_buffer_size_) {
-      return 0;
-    }
-
-    const uint8_t *data;
-    auto datalen = nghttp2_session_mem_send(session_, &data);
-
-    if (datalen < 0) {
-      ULOG(ERROR, this) << "nghttp2_session_mem_send() returned error: "
-                        << nghttp2_strerror(datalen);
-      return -1;
-    }
-    if (datalen == 0) {
-      break;
-    }
-    wb_.append(data, datalen);
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "No more read/write for this HTTP2 session";
-    }
-    return -1;
-  }
-
-  return 0;
-}
-
-ClientHandler *Http2Upstream::get_client_handler() const { return handler_; }
-
-int Http2Upstream::downstream_read(DownstreamConnection *dconn) {
-  auto downstream = dconn->get_downstream();
-
-  if (downstream->get_response_state() == Downstream::MSG_RESET) {
-    // The downstream stream was reset (canceled). In this case,
-    // RST_STREAM to the upstream and delete downstream connection
-    // here. Deleting downstream will be taken place at
-    // on_stream_close_callback.
-    rst_stream(downstream,
-               infer_upstream_rst_stream_error_code(
-                   downstream->get_response_rst_stream_error_code()));
-    downstream->pop_downstream_connection();
-    // dconn was deleted
-    dconn = nullptr;
-  } else if (downstream->get_response_state() == Downstream::MSG_BAD_HEADER) {
-    if (error_reply(downstream, 502) != 0) {
-      return -1;
-    }
-    downstream->pop_downstream_connection();
-    // dconn was deleted
-    dconn = nullptr;
-  } else {
-    auto rv = downstream->on_read();
-    if (rv == SHRPX_ERR_EOF) {
-      return downstream_eof(dconn);
-    }
-    if (rv == SHRPX_ERR_DCONN_CANCELED) {
-      downstream->pop_downstream_connection();
-      handler_->signal_write();
-      return 0;
-    }
-    if (rv != 0) {
-      if (rv != SHRPX_ERR_NETWORK) {
-        if (LOG_ENABLED(INFO)) {
-          DCLOG(INFO, dconn) << "HTTP parser failure";
-        }
-      }
-      return downstream_error(dconn, Downstream::EVENT_ERROR);
-    }
-
-    if (downstream->can_detach_downstream_connection()) {
-      // Keep-alive
-      downstream->detach_downstream_connection();
-    }
-  }
-
-  handler_->signal_write();
-
-  // At this point, downstream may be deleted.
-
-  return 0;
-}
-
-int Http2Upstream::downstream_write(DownstreamConnection *dconn) {
-  int rv;
-  rv = dconn->on_write();
-  if (rv == SHRPX_ERR_NETWORK) {
-    return downstream_error(dconn, Downstream::EVENT_ERROR);
-  }
-  if (rv != 0) {
-    return rv;
-  }
-  return 0;
-}
-
-int Http2Upstream::downstream_eof(DownstreamConnection *dconn) {
-  auto downstream = dconn->get_downstream();
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, dconn) << "EOF. stream_id=" << downstream->get_stream_id();
-  }
-
-  // Delete downstream connection. If we don't delete it here, it will
-  // be pooled in on_stream_close_callback.
-  downstream->pop_downstream_connection();
-  // dconn was deleted
-  dconn = nullptr;
-  // downstream wil be deleted in on_stream_close_callback.
-  if (downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
-    // Server may indicate the end of the request by EOF
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "Downstream body was ended by EOF";
-    }
-    downstream->set_response_state(Downstream::MSG_COMPLETE);
-
-    // For tunneled connection, MSG_COMPLETE signals
-    // downstream_data_read_callback to send RST_STREAM after pending
-    // response body is sent. This is needed to ensure that RST_STREAM
-    // is sent after all pending data are sent.
-    on_downstream_body_complete(downstream);
-  } else if (downstream->get_response_state() != Downstream::MSG_COMPLETE) {
-    // If stream was not closed, then we set MSG_COMPLETE and let
-    // on_stream_close_callback delete downstream.
-    if (error_reply(downstream, 502) != 0) {
-      return -1;
-    }
-  }
-  handler_->signal_write();
-  // At this point, downstream may be deleted.
-  return 0;
-}
-
-int Http2Upstream::downstream_error(DownstreamConnection *dconn, int events) {
-  auto downstream = dconn->get_downstream();
-
-  if (LOG_ENABLED(INFO)) {
-    if (events & Downstream::EVENT_ERROR) {
-      DCLOG(INFO, dconn) << "Downstream network/general error";
-    } else {
-      DCLOG(INFO, dconn) << "Timeout";
-    }
-    if (downstream->get_upgraded()) {
-      DCLOG(INFO, dconn) << "Note: this is tunnel connection";
-    }
-  }
-
-  // Delete downstream connection. If we don't delete it here, it will
-  // be pooled in on_stream_close_callback.
-  downstream->pop_downstream_connection();
-  // dconn was deleted
-  dconn = nullptr;
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    // For SSL tunneling, we issue RST_STREAM. For other types of
-    // stream, we don't have to do anything since response was
-    // complete.
-    if (downstream->get_upgraded()) {
-      rst_stream(downstream, NGHTTP2_NO_ERROR);
-    }
-  } else {
-    if (downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
-      if (downstream->get_upgraded()) {
-        on_downstream_body_complete(downstream);
-      } else {
-        rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-      }
-    } else {
-      unsigned int status;
-      if (events & Downstream::EVENT_TIMEOUT) {
-        status = 504;
-      } else {
-        status = 502;
-      }
-      if (error_reply(downstream, status) != 0) {
-        return -1;
-      }
-    }
-    downstream->set_response_state(Downstream::MSG_COMPLETE);
-  }
-  handler_->signal_write();
-  // At this point, downstream may be deleted.
-  return 0;
-}
-
-int Http2Upstream::rst_stream(Downstream *downstream, uint32_t error_code) {
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, this) << "RST_STREAM stream_id=" << downstream->get_stream_id()
-                     << " with error_code=" << error_code;
-  }
-  int rv;
-  rv = nghttp2_submit_rst_stream(session_, NGHTTP2_FLAG_NONE,
-                                 downstream->get_stream_id(), error_code);
-  if (rv < NGHTTP2_ERR_FATAL) {
-    ULOG(FATAL, this) << "nghttp2_submit_rst_stream() failed: "
-                      << nghttp2_strerror(rv);
-    return -1;
-  }
-  return 0;
-}
-
-int Http2Upstream::terminate_session(uint32_t error_code) {
-  int rv;
-  rv = nghttp2_session_terminate_session(session_, error_code);
-  if (rv != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-namespace {
-ssize_t downstream_data_read_callback(nghttp2_session *session,
-                                      int32_t stream_id, uint8_t *buf,
-                                      size_t length, uint32_t *data_flags,
-                                      nghttp2_data_source *source,
-                                      void *user_data) {
-  int rv;
-  auto downstream = static_cast<Downstream *>(source->ptr);
-  auto body = downstream->get_response_buf();
-  assert(body);
-  auto upstream = static_cast<Http2Upstream *>(user_data);
-
-  const auto &resp = downstream->response();
-
-  auto nread = std::min(body->rleft(), length);
-
-  auto max_buffer_size = upstream->get_max_buffer_size();
-
-  auto buffer = upstream->get_response_buf();
-
-  if (max_buffer_size <
-      std::min(nread, static_cast<size_t>(256)) + 9 + buffer->rleft()) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, upstream) << "Buffer is almost full.  Skip write DATA";
-    }
-    return NGHTTP2_ERR_PAUSE;
-  }
-
-  nread = std::min(nread, max_buffer_size - 9 - buffer->rleft());
-
-  auto body_empty = body->rleft() == nread;
-
-  *data_flags |= NGHTTP2_DATA_FLAG_NO_COPY;
-
-  if (body_empty &&
-      downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-
-    if (!downstream->get_upgraded()) {
-      const auto &trailers = resp.fs.trailers();
-      if (!trailers.empty()) {
-        std::vector<nghttp2_nv> nva;
-        nva.reserve(trailers.size());
-        http2::copy_headers_to_nva_nocopy(nva, trailers, http2::HDOP_STRIP_ALL);
-        if (!nva.empty()) {
-          rv = nghttp2_submit_trailer(session, stream_id, nva.data(),
-                                      nva.size());
-          if (rv != 0) {
-            if (nghttp2_is_fatal(rv)) {
-              return NGHTTP2_ERR_CALLBACK_FAILURE;
-            }
-          } else {
-            *data_flags |= NGHTTP2_DATA_FLAG_NO_END_STREAM;
-          }
-        }
-      }
-    }
-  }
-
-  if (nread == 0 && ((*data_flags) & NGHTTP2_DATA_FLAG_EOF) == 0) {
-    downstream->disable_upstream_wtimer();
-    return NGHTTP2_ERR_DEFERRED;
-  }
-
-  return nread;
-}
-} // namespace
-
-int Http2Upstream::send_reply(Downstream *downstream, const uint8_t *body,
-                              size_t bodylen) {
-  int rv;
-
-  nghttp2_data_provider data_prd, *data_prd_ptr = nullptr;
-
-  if (bodylen) {
-    data_prd.source.ptr = downstream;
-    data_prd.read_callback = downstream_data_read_callback;
-    data_prd_ptr = &data_prd;
-  }
-
-  const auto &resp = downstream->response();
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  auto &balloc = downstream->get_block_allocator();
-
-  const auto &headers = resp.fs.headers();
-  auto nva = std::vector<nghttp2_nv>();
-  // 2 for :status and server
-  nva.reserve(2 + headers.size() + httpconf.add_response_headers.size());
-
-  auto response_status = http2::stringify_status(balloc, resp.http_status);
-
-  nva.push_back(http2::make_nv_ls_nocopy(":status", response_status));
-
-  for (auto &kv : headers) {
-    if (kv.name.empty() || kv.name[0] == ':') {
-      continue;
-    }
-    switch (kv.token) {
-    case http2::HD_CONNECTION:
-    case http2::HD_KEEP_ALIVE:
-    case http2::HD_PROXY_CONNECTION:
-    case http2::HD_TE:
-    case http2::HD_TRANSFER_ENCODING:
-    case http2::HD_UPGRADE:
-      continue;
-    }
-    nva.push_back(http2::make_nv_nocopy(kv.name, kv.value, kv.no_index));
-  }
-
-  if (!resp.fs.header(http2::HD_SERVER)) {
-    nva.push_back(http2::make_nv_ls_nocopy("server", config->http.server_name));
-  }
-
-  for (auto &p : httpconf.add_response_headers) {
-    nva.push_back(http2::make_nv_nocopy(p.name, p.value));
-  }
-
-  rv = nghttp2_submit_response(session_, downstream->get_stream_id(),
-                               nva.data(), nva.size(), data_prd_ptr);
-  if (nghttp2_is_fatal(rv)) {
-    ULOG(FATAL, this) << "nghttp2_submit_response() failed: "
-                      << nghttp2_strerror(rv);
-    return -1;
-  }
-
-  auto buf = downstream->get_response_buf();
-
-  buf->append(body, bodylen);
-
-  downstream->set_response_state(Downstream::MSG_COMPLETE);
-
-  if (data_prd_ptr) {
-    downstream->reset_upstream_wtimer();
-  }
-
-  return 0;
-}
-
-int Http2Upstream::error_reply(Downstream *downstream,
-                               unsigned int status_code) {
-  int rv;
-  auto &resp = downstream->response();
-
-  auto &balloc = downstream->get_block_allocator();
-
-  auto html = http::create_error_html(balloc, status_code);
-  resp.http_status = status_code;
-  auto body = downstream->get_response_buf();
-  body->append(html);
-  downstream->set_response_state(Downstream::MSG_COMPLETE);
-
-  nghttp2_data_provider data_prd;
-  data_prd.source.ptr = downstream;
-  data_prd.read_callback = downstream_data_read_callback;
-
-  auto lgconf = log_config();
-  lgconf->update_tstamp(std::chrono::system_clock::now());
-
-  auto response_status = http2::stringify_status(balloc, status_code);
-  auto content_length = util::make_string_ref_uint(balloc, html.size());
-  auto date = make_string_ref(balloc, lgconf->tstamp->time_http);
-
-  auto nva = std::array<nghttp2_nv, 5>{
-      {http2::make_nv_ls_nocopy(":status", response_status),
-       http2::make_nv_ll("content-type", "text/html; charset=UTF-8"),
-       http2::make_nv_ls_nocopy("server", get_config()->http.server_name),
-       http2::make_nv_ls_nocopy("content-length", content_length),
-       http2::make_nv_ls_nocopy("date", date)}};
-
-  rv = nghttp2_submit_response(session_, downstream->get_stream_id(),
-                               nva.data(), nva.size(), &data_prd);
-  if (rv < NGHTTP2_ERR_FATAL) {
-    ULOG(FATAL, this) << "nghttp2_submit_response() failed: "
-                      << nghttp2_strerror(rv);
-    return -1;
-  }
-
-  downstream->reset_upstream_wtimer();
-
-  return 0;
-}
-
-void Http2Upstream::add_pending_downstream(
-    std::unique_ptr<Downstream> downstream) {
-  downstream_queue_.add_pending(std::move(downstream));
-}
-
-void Http2Upstream::remove_downstream(Downstream *downstream) {
-  if (downstream->accesslog_ready()) {
-    handler_->write_accesslog(downstream);
-  }
-
-  nghttp2_session_set_stream_user_data(session_, downstream->get_stream_id(),
-                                       nullptr);
-
-  auto next_downstream = downstream_queue_.remove_and_get_blocked(downstream);
-
-  if (next_downstream) {
-    initiate_downstream(next_downstream);
-  }
-
-  if (downstream_queue_.get_downstreams() == nullptr) {
-    // There is no downstream at the moment.  Start idle timer now.
-    handler_->repeat_read_timer();
-  }
-}
-
-// WARNING: Never call directly or indirectly nghttp2_session_send or
-// nghttp2_session_recv. These calls may delete downstream.
-int Http2Upstream::on_downstream_header_complete(Downstream *downstream) {
-  int rv;
-
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-
-  auto &balloc = downstream->get_block_allocator();
-
-  if (LOG_ENABLED(INFO)) {
-    if (downstream->get_non_final_response()) {
-      DLOG(INFO, downstream) << "HTTP non-final response header";
-    } else {
-      DLOG(INFO, downstream) << "HTTP response header completed";
-    }
-  }
-
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  if (!config->http2_proxy && !httpconf.no_location_rewrite) {
-    downstream->rewrite_location_response_header(req.scheme);
-  }
-
-#ifdef HAVE_MRUBY
-  if (!downstream->get_non_final_response()) {
-    auto dconn = downstream->get_downstream_connection();
-    const auto &group = dconn->get_downstream_addr_group();
-    if (group) {
-      const auto &dmruby_ctx = group->mruby_ctx;
-
-      if (dmruby_ctx->run_on_response_proc(downstream) != 0) {
-        if (error_reply(downstream, 500) != 0) {
-          return -1;
-        }
-        // Returning -1 will signal deletion of dconn.
-        return -1;
-      }
-
-      if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-        return -1;
-      }
-    }
-
-    auto worker = handler_->get_worker();
-    auto mruby_ctx = worker->get_mruby_context();
-
-    if (mruby_ctx->run_on_response_proc(downstream) != 0) {
-      if (error_reply(downstream, 500) != 0) {
-        return -1;
-      }
-      // Returning -1 will signal deletion of dconn.
-      return -1;
-    }
-
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      return -1;
-    }
-  }
-#endif // HAVE_MRUBY
-
-  auto &http2conf = config->http2;
-
-  // We need some conditions that must be fulfilled to initiate server
-  // push.
-  //
-  // * Server push is disabled for http2 proxy or client proxy, since
-  //   incoming headers are mixed origins.  We don't know how to
-  //   reliably determine the authority yet.
-  //
-  // * We need non-final response or 200 response code for associated
-  //   resource.  This is too restrictive, we will review this later.
-  //
-  // * We requires GET or POST for associated resource.  Probably we
-  //   don't want to push for HEAD request.  Not sure other methods
-  //   are also eligible for push.
-  if (!http2conf.no_server_push &&
-      nghttp2_session_get_remote_settings(session_,
-                                          NGHTTP2_SETTINGS_ENABLE_PUSH) == 1 &&
-      !config->http2_proxy && (downstream->get_stream_id() % 2) &&
-      resp.fs.header(http2::HD_LINK) &&
-      (downstream->get_non_final_response() || resp.http_status == 200) &&
-      (req.method == HTTP_GET || req.method == HTTP_POST)) {
-
-    if (prepare_push_promise(downstream) != 0) {
-      // Continue to send response even if push was failed.
-    }
-  }
-
-  auto nva = std::vector<nghttp2_nv>();
-  // 5 means :status and possible server, via, x-http2-push, and
-  // set-cookie (for affinity cookie) header field.
-  nva.reserve(resp.fs.headers().size() + 5 +
-              httpconf.add_response_headers.size());
-
-  auto response_status = http2::stringify_status(balloc, resp.http_status);
-
-  nva.push_back(http2::make_nv_ls_nocopy(":status", response_status));
-
-  if (downstream->get_non_final_response()) {
-    http2::copy_headers_to_nva_nocopy(nva, resp.fs.headers(),
-                                      http2::HDOP_STRIP_ALL);
-
-    if (LOG_ENABLED(INFO)) {
-      log_response_headers(downstream, nva);
-    }
-
-    rv = nghttp2_submit_headers(session_, NGHTTP2_FLAG_NONE,
-                                downstream->get_stream_id(), nullptr,
-                                nva.data(), nva.size(), nullptr);
-
-    resp.fs.clear_headers();
-
-    if (rv != 0) {
-      ULOG(FATAL, this) << "nghttp2_submit_headers() failed";
-      return -1;
-    }
-
-    return 0;
-  }
-
-  http2::copy_headers_to_nva_nocopy(
-      nva, resp.fs.headers(), http2::HDOP_STRIP_ALL & ~http2::HDOP_STRIP_VIA);
-
-  if (!config->http2_proxy && !httpconf.no_server_rewrite) {
-    nva.push_back(http2::make_nv_ls_nocopy("server", httpconf.server_name));
-  } else {
-    auto server = resp.fs.header(http2::HD_SERVER);
-    if (server) {
-      nva.push_back(http2::make_nv_ls_nocopy("server", (*server).value));
-    }
-  }
-
-  if (req.method != HTTP_CONNECT || !downstream->get_upgraded()) {
-    auto affinity_cookie = downstream->get_affinity_cookie_to_send();
-    if (affinity_cookie) {
-      auto dconn = downstream->get_downstream_connection();
-      assert(dconn);
-      auto &group = dconn->get_downstream_addr_group();
-      auto &shared_addr = group->shared_addr;
-      auto &cookieconf = shared_addr->affinity.cookie;
-      auto secure =
-          http::require_cookie_secure_attribute(cookieconf.secure, req.scheme);
-      auto cookie_str = http::create_affinity_cookie(
-          balloc, cookieconf.name, affinity_cookie, cookieconf.path, secure);
-      nva.push_back(http2::make_nv_ls_nocopy("set-cookie", cookie_str));
-    }
-  }
-
-  auto via = resp.fs.header(http2::HD_VIA);
-  if (httpconf.no_via) {
-    if (via) {
-      nva.push_back(http2::make_nv_ls_nocopy("via", (*via).value));
-    }
-  } else {
-    // we don't create more than 16 bytes in
-    // http::create_via_header_value.
-    size_t len = 16;
-    if (via) {
-      len += via->value.size() + 2;
-    }
-
-    auto iov = make_byte_ref(balloc, len + 1);
-    auto p = iov.base;
-    if (via) {
-      p = std::copy(std::begin(via->value), std::end(via->value), p);
-      p = util::copy_lit(p, ", ");
-    }
-    p = http::create_via_header_value(p, resp.http_major, resp.http_minor);
-    *p = '\0';
-
-    nva.push_back(http2::make_nv_ls_nocopy("via", StringRef{iov.base, p}));
-  }
-
-  for (auto &p : httpconf.add_response_headers) {
-    nva.push_back(http2::make_nv_nocopy(p.name, p.value));
-  }
-
-  if (downstream->get_stream_id() % 2 == 0) {
-    // This header field is basically for human on client side to
-    // figure out that the resource is pushed.
-    nva.push_back(http2::make_nv_ll("x-http2-push", "1"));
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    log_response_headers(downstream, nva);
-  }
-
-  if (http2conf.upstream.debug.dump.response_header) {
-    http2::dump_nv(http2conf.upstream.debug.dump.response_header, nva.data(),
-                   nva.size());
-  }
-
-  nghttp2_data_provider data_prd;
-  data_prd.source.ptr = downstream;
-  data_prd.read_callback = downstream_data_read_callback;
-
-  nghttp2_data_provider *data_prdptr;
-
-  if (downstream->expect_response_body() ||
-      downstream->expect_response_trailer()) {
-    data_prdptr = &data_prd;
-  } else {
-    data_prdptr = nullptr;
-  }
-
-  rv = nghttp2_submit_response(session_, downstream->get_stream_id(),
-                               nva.data(), nva.size(), data_prdptr);
-  if (rv != 0) {
-    ULOG(FATAL, this) << "nghttp2_submit_response() failed";
-    return -1;
-  }
-
-  if (data_prdptr) {
-    downstream->reset_upstream_wtimer();
-  }
-
-  return 0;
-}
-
-// WARNING: Never call directly or indirectly nghttp2_session_send or
-// nghttp2_session_recv. These calls may delete downstream.
-int Http2Upstream::on_downstream_body(Downstream *downstream,
-                                      const uint8_t *data, size_t len,
-                                      bool flush) {
-  auto body = downstream->get_response_buf();
-  body->append(data, len);
-
-  if (flush) {
-    nghttp2_session_resume_data(session_, downstream->get_stream_id());
-
-    downstream->ensure_upstream_wtimer();
-  }
-
-  return 0;
-}
-
-// WARNING: Never call directly or indirectly nghttp2_session_send or
-// nghttp2_session_recv. These calls may delete downstream.
-int Http2Upstream::on_downstream_body_complete(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DLOG(INFO, downstream) << "HTTP response completed";
-  }
-
-  auto &resp = downstream->response();
-
-  if (!downstream->validate_response_recv_body_length()) {
-    rst_stream(downstream, NGHTTP2_PROTOCOL_ERROR);
-    resp.connection_close = true;
-    return 0;
-  }
-
-  nghttp2_session_resume_data(session_, downstream->get_stream_id());
-  downstream->ensure_upstream_wtimer();
-
-  return 0;
-}
-
-bool Http2Upstream::get_flow_control() const { return flow_control_; }
-
-void Http2Upstream::pause_read(IOCtrlReason reason) {}
-
-int Http2Upstream::resume_read(IOCtrlReason reason, Downstream *downstream,
-                               size_t consumed) {
-  if (get_flow_control()) {
-    if (consume(downstream->get_stream_id(), consumed) != 0) {
-      return -1;
-    }
-
-    auto &req = downstream->request();
-
-    req.consume(consumed);
-  }
-
-  handler_->signal_write();
-  return 0;
-}
-
-int Http2Upstream::on_downstream_abort_request(Downstream *downstream,
-                                               unsigned int status_code) {
-  int rv;
-
-  rv = error_reply(downstream, status_code);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  handler_->signal_write();
-  return 0;
-}
-
-int Http2Upstream::on_downstream_abort_request_with_https_redirect(
-    Downstream *downstream) {
-  int rv;
-
-  rv = redirect_to_https(downstream);
-  if (rv != 0) {
-    return -1;
-  }
-
-  handler_->signal_write();
-  return 0;
-}
-
-int Http2Upstream::redirect_to_https(Downstream *downstream) {
-  auto &req = downstream->request();
-  if (req.method == HTTP_CONNECT || req.scheme != "http") {
-    return error_reply(downstream, 400);
-  }
-
-  auto authority = util::extract_host(req.authority);
-  if (authority.empty()) {
-    return error_reply(downstream, 400);
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  StringRef loc;
-  if (httpconf.redirect_https_port == StringRef::from_lit("443")) {
-    loc = concat_string_ref(balloc, StringRef::from_lit("https://"), authority,
-                            req.path);
-  } else {
-    loc = concat_string_ref(balloc, StringRef::from_lit("https://"), authority,
-                            StringRef::from_lit(":"),
-                            httpconf.redirect_https_port, req.path);
-  }
-
-  auto &resp = downstream->response();
-  resp.http_status = 308;
-  resp.fs.add_header_token(StringRef::from_lit("location"), loc, false,
-                           http2::HD_LOCATION);
-
-  return send_reply(downstream, nullptr, 0);
-}
-
-int Http2Upstream::consume(int32_t stream_id, size_t len) {
-  int rv;
-
-  auto faddr = handler_->get_upstream_addr();
-
-  if (faddr->alt_mode) {
-    return 0;
-  }
-
-  rv = nghttp2_session_consume(session_, stream_id, len);
-
-  if (rv != 0) {
-    ULOG(WARN, this) << "nghttp2_session_consume() returned error: "
-                     << nghttp2_strerror(rv);
-    return -1;
-  }
-
-  return 0;
-}
-
-void Http2Upstream::log_response_headers(
-    Downstream *downstream, const std::vector<nghttp2_nv> &nva) const {
-  std::stringstream ss;
-  for (auto &nv : nva) {
-    ss << TTY_HTTP_HD << StringRef{nv.name, nv.namelen} << TTY_RST << ": "
-       << StringRef{nv.value, nv.valuelen} << "\n";
-  }
-  ULOG(INFO, this) << "HTTP response headers. stream_id="
-                   << downstream->get_stream_id() << "\n"
-                   << ss.str();
-}
-
-int Http2Upstream::on_timeout(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, this) << "Stream timeout stream_id="
-                     << downstream->get_stream_id();
-  }
-
-  rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-  handler_->signal_write();
-
-  return 0;
-}
-
-void Http2Upstream::on_handler_delete() {
-  for (auto d = downstream_queue_.get_downstreams(); d; d = d->dlnext) {
-    if (d->get_dispatch_state() == Downstream::DISPATCH_ACTIVE &&
-        d->accesslog_ready()) {
-      handler_->write_accesslog(d);
-    }
-  }
-}
-
-int Http2Upstream::on_downstream_reset(Downstream *downstream, bool no_retry) {
-  int rv;
-
-  if (downstream->get_dispatch_state() != Downstream::DISPATCH_ACTIVE) {
-    // This is error condition when we failed push_request_headers()
-    // in initiate_downstream().  Otherwise, we have
-    // Downstream::DISPATCH_ACTIVE state, or we did not set
-    // DownstreamConnection.
-    downstream->pop_downstream_connection();
-    handler_->signal_write();
-
-    return 0;
-  }
-
-  if (!downstream->request_submission_ready()) {
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      // We have got all response body already.  Send it off.
-      downstream->pop_downstream_connection();
-      return 0;
-    }
-    // pushed stream is handled here
-    rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-    downstream->pop_downstream_connection();
-
-    handler_->signal_write();
-
-    return 0;
-  }
-
-  downstream->pop_downstream_connection();
-
-  downstream->add_retry();
-
-  std::unique_ptr<DownstreamConnection> dconn;
-
-  rv = 0;
-
-  if (no_retry || downstream->no_more_retry()) {
-    goto fail;
-  }
-
-  // downstream connection is clean; we can retry with new
-  // downstream connection.
-
-  dconn = handler_->get_downstream_connection(rv, downstream);
-  if (!dconn) {
-    goto fail;
-  }
-
-  rv = downstream->attach_downstream_connection(std::move(dconn));
-  if (rv != 0) {
-    goto fail;
-  }
-
-  rv = downstream->push_request_headers();
-  if (rv != 0) {
-    goto fail;
-  }
-
-  return 0;
-
-fail:
-  if (rv == SHRPX_ERR_TLS_REQUIRED) {
-    rv = on_downstream_abort_request_with_https_redirect(downstream);
-  } else {
-    rv = on_downstream_abort_request(downstream, 502);
-  }
-  if (rv != 0) {
-    rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
-  }
-  downstream->pop_downstream_connection();
-
-  handler_->signal_write();
-
-  return 0;
-}
-
-int Http2Upstream::prepare_push_promise(Downstream *downstream) {
-  int rv;
-
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-
-  auto base = http2::get_pure_path_component(req.path);
-  if (base.empty()) {
-    return 0;
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-
-  for (auto &kv : resp.fs.headers()) {
-    if (kv.token != http2::HD_LINK) {
-      continue;
-    }
-    for (auto &link : http2::parse_link_header(kv.value)) {
-      StringRef scheme, authority, path;
-
-      rv = http2::construct_push_component(balloc, scheme, authority, path,
-                                           base, link.uri);
-      if (rv != 0) {
-        continue;
-      }
-
-      if (scheme.empty()) {
-        scheme = req.scheme;
-      }
-
-      if (authority.empty()) {
-        authority = req.authority;
-      }
-
-      if (resp.is_resource_pushed(scheme, authority, path)) {
-        continue;
-      }
-
-      rv = submit_push_promise(scheme, authority, path, downstream);
-      if (rv != 0) {
-        return -1;
-      }
-
-      resp.resource_pushed(scheme, authority, path);
-    }
-  }
-  return 0;
-}
-
-int Http2Upstream::submit_push_promise(const StringRef &scheme,
-                                       const StringRef &authority,
-                                       const StringRef &path,
-                                       Downstream *downstream) {
-  const auto &req = downstream->request();
-
-  std::vector<nghttp2_nv> nva;
-  // 4 for :method, :scheme, :path and :authority
-  nva.reserve(4 + req.fs.headers().size());
-
-  // juse use "GET" for now
-  nva.push_back(http2::make_nv_ll(":method", "GET"));
-  nva.push_back(http2::make_nv_ls_nocopy(":scheme", scheme));
-  nva.push_back(http2::make_nv_ls_nocopy(":path", path));
-  nva.push_back(http2::make_nv_ls_nocopy(":authority", authority));
-
-  for (auto &kv : req.fs.headers()) {
-    switch (kv.token) {
-    // TODO generate referer
-    case http2::HD__AUTHORITY:
-    case http2::HD__SCHEME:
-    case http2::HD__METHOD:
-    case http2::HD__PATH:
-      continue;
-    case http2::HD_ACCEPT_ENCODING:
-    case http2::HD_ACCEPT_LANGUAGE:
-    case http2::HD_CACHE_CONTROL:
-    case http2::HD_HOST:
-    case http2::HD_USER_AGENT:
-      nva.push_back(http2::make_nv_nocopy(kv.name, kv.value, kv.no_index));
-      break;
-    }
-  }
-
-  auto promised_stream_id = nghttp2_submit_push_promise(
-      session_, NGHTTP2_FLAG_NONE, downstream->get_stream_id(), nva.data(),
-      nva.size(), nullptr);
-
-  if (promised_stream_id < 0) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "nghttp2_submit_push_promise() failed: "
-                       << nghttp2_strerror(promised_stream_id);
-    }
-    if (nghttp2_is_fatal(promised_stream_id)) {
-      return -1;
-    }
-    return 0;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    std::stringstream ss;
-    for (auto &nv : nva) {
-      ss << TTY_HTTP_HD << StringRef{nv.name, nv.namelen} << TTY_RST << ": "
-         << StringRef{nv.value, nv.valuelen} << "\n";
-    }
-    ULOG(INFO, this) << "HTTP push request headers. promised_stream_id="
-                     << promised_stream_id << "\n"
-                     << ss.str();
-  }
-
-  return 0;
-}
-
-bool Http2Upstream::push_enabled() const {
-  auto config = get_config();
-  return !(config->http2.no_server_push ||
-           nghttp2_session_get_remote_settings(
-               session_, NGHTTP2_SETTINGS_ENABLE_PUSH) == 0 ||
-           config->http2_proxy);
-}
-
-int Http2Upstream::initiate_push(Downstream *downstream, const StringRef &uri) {
-  int rv;
-
-  if (uri.empty() || !push_enabled() ||
-      (downstream->get_stream_id() % 2) == 0) {
-    return 0;
-  }
-
-  const auto &req = downstream->request();
-
-  auto base = http2::get_pure_path_component(req.path);
-  if (base.empty()) {
-    return -1;
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-
-  StringRef scheme, authority, path;
-
-  rv = http2::construct_push_component(balloc, scheme, authority, path, base,
-                                       uri);
-  if (rv != 0) {
-    return -1;
-  }
-
-  if (scheme.empty()) {
-    scheme = req.scheme;
-  }
-
-  if (authority.empty()) {
-    authority = req.authority;
-  }
-
-  auto &resp = downstream->response();
-
-  if (resp.is_resource_pushed(scheme, authority, path)) {
-    return 0;
-  }
-
-  rv = submit_push_promise(scheme, authority, path, downstream);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  resp.resource_pushed(scheme, authority, path);
-
-  return 0;
-}
-
-int Http2Upstream::response_riovec(struct iovec *iov, int iovcnt) const {
-  if (iovcnt == 0 || wb_.rleft() == 0) {
-    return 0;
-  }
-
-  return wb_.riovec(iov, iovcnt);
-}
-
-void Http2Upstream::response_drain(size_t n) { wb_.drain(n); }
-
-bool Http2Upstream::response_empty() const { return wb_.rleft() == 0; }
-
-DefaultMemchunks *Http2Upstream::get_response_buf() { return &wb_; }
-
-Downstream *
-Http2Upstream::on_downstream_push_promise(Downstream *downstream,
-                                          int32_t promised_stream_id) {
-  // promised_stream_id is for backend HTTP/2 session, not for
-  // frontend.
-  auto promised_downstream =
-      make_unique<Downstream>(this, handler_->get_mcpool(), 0);
-  auto &promised_req = promised_downstream->request();
-
-  promised_downstream->set_downstream_stream_id(promised_stream_id);
-  // Set associated stream in frontend
-  promised_downstream->set_assoc_stream_id(downstream->get_stream_id());
-
-  promised_downstream->disable_upstream_rtimer();
-
-  promised_req.http_major = 2;
-  promised_req.http_minor = 0;
-
-  promised_req.fs.content_length = 0;
-  promised_req.http2_expect_body = false;
-
-  auto ptr = promised_downstream.get();
-  add_pending_downstream(std::move(promised_downstream));
-  downstream_queue_.mark_active(ptr);
-
-  return ptr;
-}
-
-int Http2Upstream::on_downstream_push_promise_complete(
-    Downstream *downstream, Downstream *promised_downstream) {
-  std::vector<nghttp2_nv> nva;
-
-  const auto &promised_req = promised_downstream->request();
-  const auto &headers = promised_req.fs.headers();
-
-  nva.reserve(headers.size());
-
-  for (auto &kv : headers) {
-    nva.push_back(http2::make_nv(kv.name, kv.value, kv.no_index));
-  }
-
-  auto promised_stream_id = nghttp2_submit_push_promise(
-      session_, NGHTTP2_FLAG_NONE, downstream->get_stream_id(), nva.data(),
-      nva.size(), promised_downstream);
-  if (promised_stream_id < 0) {
-    return -1;
-  }
-
-  promised_downstream->set_stream_id(promised_stream_id);
-
-  return 0;
-}
-
-void Http2Upstream::cancel_premature_downstream(
-    Downstream *promised_downstream) {
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, this) << "Remove premature promised stream "
-                     << promised_downstream;
-  }
-  downstream_queue_.remove_and_get_blocked(promised_downstream, false);
-}
-
-size_t Http2Upstream::get_max_buffer_size() const { return max_buffer_size_; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http2_upstream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP2_UPSTREAM_H
-#define SHRPX_HTTP2_UPSTREAM_H
-
-#include "shrpx.h"
-
-#include <memory>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_upstream.h"
-#include "shrpx_downstream_queue.h"
-#include "memchunk.h"
-#include "buffer.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class ClientHandler;
-class HttpsUpstream;
-
-class Http2Upstream : public Upstream {
-public:
-  Http2Upstream(ClientHandler *handler);
-  virtual ~Http2Upstream();
-  virtual int on_read();
-  virtual int on_write();
-  virtual int on_timeout(Downstream *downstream);
-  virtual int on_downstream_abort_request(Downstream *downstream,
-                                          unsigned int status_code);
-  virtual int
-  on_downstream_abort_request_with_https_redirect(Downstream *downstream);
-  virtual ClientHandler *get_client_handler() const;
-
-  virtual int downstream_read(DownstreamConnection *dconn);
-  virtual int downstream_write(DownstreamConnection *dconn);
-  virtual int downstream_eof(DownstreamConnection *dconn);
-  virtual int downstream_error(DownstreamConnection *dconn, int events);
-
-  void add_pending_downstream(std::unique_ptr<Downstream> downstream);
-  void remove_downstream(Downstream *downstream);
-
-  int rst_stream(Downstream *downstream, uint32_t error_code);
-  int terminate_session(uint32_t error_code);
-  int error_reply(Downstream *downstream, unsigned int status_code);
-
-  virtual void pause_read(IOCtrlReason reason);
-  virtual int resume_read(IOCtrlReason reason, Downstream *downstream,
-                          size_t consumed);
-
-  virtual int on_downstream_header_complete(Downstream *downstream);
-  virtual int on_downstream_body(Downstream *downstream, const uint8_t *data,
-                                 size_t len, bool flush);
-  virtual int on_downstream_body_complete(Downstream *downstream);
-
-  virtual void on_handler_delete();
-  virtual int on_downstream_reset(Downstream *downstream, bool no_retry);
-  virtual int send_reply(Downstream *downstream, const uint8_t *body,
-                         size_t bodylen);
-  virtual int initiate_push(Downstream *downstream, const StringRef &uri);
-  virtual int response_riovec(struct iovec *iov, int iovcnt) const;
-  virtual void response_drain(size_t n);
-  virtual bool response_empty() const;
-
-  virtual Downstream *on_downstream_push_promise(Downstream *downstream,
-                                                 int32_t promised_stream_id);
-  virtual int
-  on_downstream_push_promise_complete(Downstream *downstream,
-                                      Downstream *promised_downstream);
-  virtual bool push_enabled() const;
-  virtual void cancel_premature_downstream(Downstream *promised_downstream);
-
-  bool get_flow_control() const;
-  // Perform HTTP/2 upgrade from |upstream|. On success, this object
-  // takes ownership of the |upstream|. This function returns 0 if it
-  // succeeds, or -1.
-  int upgrade_upstream(HttpsUpstream *upstream);
-  void start_settings_timer();
-  void stop_settings_timer();
-  int consume(int32_t stream_id, size_t len);
-  void log_response_headers(Downstream *downstream,
-                            const std::vector<nghttp2_nv> &nva) const;
-  void start_downstream(Downstream *downstream);
-  void initiate_downstream(Downstream *downstream);
-
-  void submit_goaway();
-  void check_shutdown();
-  // Starts graceful shutdown period.
-  void start_graceful_shutdown();
-
-  int prepare_push_promise(Downstream *downstream);
-  int submit_push_promise(const StringRef &scheme, const StringRef &authority,
-                          const StringRef &path, Downstream *downstream);
-
-  // Called when new request has started.
-  void on_start_request(const nghttp2_frame *frame);
-  int on_request_headers(Downstream *downstream, const nghttp2_frame *frame);
-
-  DefaultMemchunks *get_response_buf();
-
-  size_t get_max_buffer_size() const;
-
-  int redirect_to_https(Downstream *downstream);
-
-private:
-  DefaultMemchunks wb_;
-  std::unique_ptr<HttpsUpstream> pre_upstream_;
-  DownstreamQueue downstream_queue_;
-  ev_timer settings_timer_;
-  ev_timer shutdown_timer_;
-  ev_prepare prep_;
-  ClientHandler *handler_;
-  nghttp2_session *session_;
-  size_t max_buffer_size_;
-  // The number of requests seen so far.
-  size_t num_requests_;
-  bool flow_control_;
-};
-
-nghttp2_session_callbacks *create_http2_upstream_callbacks();
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP2_UPSTREAM_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,216 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_http.h"
-
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-#include "http2.h"
-#include "util.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace http {
-
-StringRef create_error_html(BlockAllocator &balloc, unsigned int http_status) {
-  auto &httpconf = get_config()->http;
-
-  const auto &error_pages = httpconf.error_pages;
-  for (const auto &page : error_pages) {
-    if (page.http_status == 0 || page.http_status == http_status) {
-      return StringRef{std::begin(page.content), std::end(page.content)};
-    }
-  }
-
-  auto status_string = http2::stringify_status(balloc, http_status);
-  auto reason_phrase = http2::get_reason_phrase(http_status);
-
-  return concat_string_ref(
-      balloc, StringRef::from_lit(R"(<!DOCTYPE html><html lang="en"><title>)"),
-      status_string, StringRef::from_lit(" "), reason_phrase,
-      StringRef::from_lit("</title><body><h1>"), status_string,
-      StringRef::from_lit(" "), reason_phrase,
-      StringRef::from_lit("</h1><footer>"), httpconf.server_name,
-      StringRef::from_lit("</footer></body></html>"));
-}
-
-StringRef create_forwarded(BlockAllocator &balloc, int params,
-                           const StringRef &node_by, const StringRef &node_for,
-                           const StringRef &host, const StringRef &proto) {
-  size_t len = 0;
-  if ((params & FORWARDED_BY) && !node_by.empty()) {
-    len += str_size("by=\"") + node_by.size() + str_size("\";");
-  }
-  if ((params & FORWARDED_FOR) && !node_for.empty()) {
-    len += str_size("for=\"") + node_for.size() + str_size("\";");
-  }
-  if ((params & FORWARDED_HOST) && !host.empty()) {
-    len += str_size("host=\"") + host.size() + str_size("\";");
-  }
-  if ((params & FORWARDED_PROTO) && !proto.empty()) {
-    len += str_size("proto=") + proto.size() + str_size(";");
-  }
-
-  auto iov = make_byte_ref(balloc, len + 1);
-  auto p = iov.base;
-
-  if ((params & FORWARDED_BY) && !node_by.empty()) {
-    // This must be quoted-string unless it is obfuscated version
-    // (which starts with "_") or some special value (e.g.,
-    // "localhost" for UNIX domain socket), since ':' is not allowed
-    // in token.  ':' is used to separate host and port.
-    if (node_by[0] == '_' || node_by[0] == 'l') {
-      p = util::copy_lit(p, "by=");
-      p = std::copy(std::begin(node_by), std::end(node_by), p);
-      p = util::copy_lit(p, ";");
-    } else {
-      p = util::copy_lit(p, "by=\"");
-      p = std::copy(std::begin(node_by), std::end(node_by), p);
-      p = util::copy_lit(p, "\";");
-    }
-  }
-  if ((params & FORWARDED_FOR) && !node_for.empty()) {
-    // We only quote IPv6 literal address only, which starts with '['.
-    if (node_for[0] == '[') {
-      p = util::copy_lit(p, "for=\"");
-      p = std::copy(std::begin(node_for), std::end(node_for), p);
-      p = util::copy_lit(p, "\";");
-    } else {
-      p = util::copy_lit(p, "for=");
-      p = std::copy(std::begin(node_for), std::end(node_for), p);
-      p = util::copy_lit(p, ";");
-    }
-  }
-  if ((params & FORWARDED_HOST) && !host.empty()) {
-    // Just be quoted to skip checking characters.
-    p = util::copy_lit(p, "host=\"");
-    p = std::copy(std::begin(host), std::end(host), p);
-    p = util::copy_lit(p, "\";");
-  }
-  if ((params & FORWARDED_PROTO) && !proto.empty()) {
-    // Scheme production rule only allow characters which are all in
-    // token.
-    p = util::copy_lit(p, "proto=");
-    p = std::copy(std::begin(proto), std::end(proto), p);
-    *p++ = ';';
-  }
-
-  if (iov.base == p) {
-    return StringRef{};
-  }
-
-  --p;
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-std::string colorizeHeaders(const char *hdrs) {
-  std::string nhdrs;
-  const char *p = strchr(hdrs, '\n');
-  if (!p) {
-    // Not valid HTTP header
-    return hdrs;
-  }
-  nhdrs.append(hdrs, p + 1);
-  ++p;
-  while (1) {
-    const char *np = strchr(p, ':');
-    if (!np) {
-      nhdrs.append(p);
-      break;
-    }
-    nhdrs += TTY_HTTP_HD;
-    nhdrs.append(p, np);
-    nhdrs += TTY_RST;
-    p = np;
-    np = strchr(p, '\n');
-    if (!np) {
-      nhdrs.append(p);
-      break;
-    }
-    nhdrs.append(p, np + 1);
-    p = np + 1;
-  }
-  return nhdrs;
-}
-
-ssize_t select_padding_callback(nghttp2_session *session,
-                                const nghttp2_frame *frame, size_t max_payload,
-                                void *user_data) {
-  return std::min(max_payload, frame->hd.length + get_config()->padding);
-}
-
-StringRef create_affinity_cookie(BlockAllocator &balloc, const StringRef &name,
-                                 uint32_t affinity_cookie,
-                                 const StringRef &path, bool secure) {
-  static constexpr auto PATH_PREFIX = StringRef::from_lit("; Path=");
-  static constexpr auto SECURE = StringRef::from_lit("; Secure");
-  // <name>=<value>[; Path=<path>][; Secure]
-  size_t len = name.size() + 1 + 8;
-
-  if (!path.empty()) {
-    len += PATH_PREFIX.size() + path.size();
-  }
-  if (secure) {
-    len += SECURE.size();
-  }
-
-  auto iov = make_byte_ref(balloc, len + 1);
-  auto p = iov.base;
-  p = std::copy(std::begin(name), std::end(name), p);
-  *p++ = '=';
-  affinity_cookie = htonl(affinity_cookie);
-  p = util::format_hex(p,
-                       StringRef{reinterpret_cast<uint8_t *>(&affinity_cookie),
-                                 reinterpret_cast<uint8_t *>(&affinity_cookie) +
-                                     sizeof(affinity_cookie)});
-  if (!path.empty()) {
-    p = std::copy(std::begin(PATH_PREFIX), std::end(PATH_PREFIX), p);
-    p = std::copy(std::begin(path), std::end(path), p);
-  }
-  if (secure) {
-    p = std::copy(std::begin(SECURE), std::end(SECURE), p);
-  }
-  *p = '\0';
-  return StringRef{iov.base, p};
-}
-
-bool require_cookie_secure_attribute(shrpx_cookie_secure secure,
-                                     const StringRef &scheme) {
-  switch (secure) {
-  case COOKIE_SECURE_AUTO:
-    return scheme == "https";
-  case COOKIE_SECURE_YES:
-    return true;
-  default:
-    return false;
-  }
-}
-
-} // namespace http
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1532 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_http_downstream_connection.h"
-
-#include "shrpx_client_handler.h"
-#include "shrpx_upstream.h"
-#include "shrpx_downstream.h"
-#include "shrpx_config.h"
-#include "shrpx_error.h"
-#include "shrpx_http.h"
-#include "shrpx_log_config.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_downstream_connection_pool.h"
-#include "shrpx_worker.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_tls.h"
-#include "shrpx_log.h"
-#include "http2.h"
-#include "util.h"
-#include "ssl_compat.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-
-  if (w == &conn->rt && !conn->expired_rt()) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, dconn) << "Time out";
-  }
-
-  auto downstream = dconn->get_downstream();
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto &resp = downstream->response();
-
-  // Do this so that dconn is not pooled
-  resp.connection_close = true;
-
-  if (upstream->downstream_error(dconn, Downstream::EVENT_TIMEOUT) != 0) {
-    delete handler;
-  }
-}
-} // namespace
-
-namespace {
-void retry_downstream_connection(Downstream *downstream,
-                                 unsigned int status_code) {
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-  downstream->add_retry();
-
-  if (downstream->no_more_retry()) {
-    delete handler;
-    return;
-  }
-
-  downstream->pop_downstream_connection();
-
-  int rv;
-  // We have to use h1 backend for retry if we have already written h1
-  // request in request buffer.
-  auto ndconn = handler->get_downstream_connection(
-      rv, downstream,
-      downstream->get_request_header_sent() ? PROTO_HTTP1 : PROTO_NONE);
-  if (ndconn) {
-    if (downstream->attach_downstream_connection(std::move(ndconn)) == 0 &&
-        downstream->push_request_headers() == 0) {
-      return;
-    }
-  }
-
-  downstream->set_request_state(Downstream::CONNECT_FAIL);
-
-  if (rv == SHRPX_ERR_TLS_REQUIRED) {
-    rv = upstream->on_downstream_abort_request_with_https_redirect(downstream);
-  } else {
-    rv = upstream->on_downstream_abort_request(downstream, status_code);
-  }
-
-  if (rv != 0) {
-    delete handler;
-  }
-}
-} // namespace
-
-namespace {
-void connect_timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-  auto addr = dconn->get_addr();
-  auto raddr = dconn->get_raddr();
-
-  DCLOG(WARN, dconn) << "Connect time out; addr="
-                     << util::to_numeric_addr(raddr);
-
-  downstream_failure(addr, raddr);
-
-  auto downstream = dconn->get_downstream();
-
-  retry_downstream_connection(downstream, 504);
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-  auto downstream = dconn->get_downstream();
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-  if (upstream->downstream_read(dconn) != 0) {
-    delete handler;
-  }
-}
-} // namespace
-
-namespace {
-void backend_retry(Downstream *downstream) {
-  retry_downstream_connection(downstream, 502);
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-  auto downstream = dconn->get_downstream();
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-  rv = upstream->downstream_write(dconn);
-  if (rv == SHRPX_ERR_RETRY) {
-    backend_retry(downstream);
-    return;
-  }
-
-  if (rv != 0) {
-    delete handler;
-  }
-}
-} // namespace
-
-namespace {
-void connectcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-  auto downstream = dconn->get_downstream();
-  if (dconn->connected() != 0) {
-    backend_retry(downstream);
-    return;
-  }
-  writecb(loop, w, revents);
-}
-} // namespace
-
-HttpDownstreamConnection::HttpDownstreamConnection(
-    const std::shared_ptr<DownstreamAddrGroup> &group, size_t initial_addr_idx,
-    struct ev_loop *loop, Worker *worker)
-    : conn_(loop, -1, nullptr, worker->get_mcpool(),
-            worker->get_downstream_config()->timeout.write,
-            worker->get_downstream_config()->timeout.read, {}, {}, connectcb,
-            readcb, connect_timeoutcb, this,
-            get_config()->tls.dyn_rec.warmup_threshold,
-            get_config()->tls.dyn_rec.idle_timeout, PROTO_HTTP1),
-      on_read_(&HttpDownstreamConnection::noop),
-      on_write_(&HttpDownstreamConnection::noop),
-      signal_write_(&HttpDownstreamConnection::noop),
-      worker_(worker),
-      ssl_ctx_(worker->get_cl_ssl_ctx()),
-      group_(group),
-      addr_(nullptr),
-      raddr_(nullptr),
-      ioctrl_(&conn_.rlimit),
-      response_htp_{0},
-      initial_addr_idx_(initial_addr_idx),
-      reuse_first_write_done_(true),
-      reusable_(true) {}
-
-HttpDownstreamConnection::~HttpDownstreamConnection() {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Deleted";
-  }
-
-  if (dns_query_) {
-    auto dns_tracker = worker_->get_dns_tracker();
-    dns_tracker->cancel(dns_query_.get());
-  }
-}
-
-int HttpDownstreamConnection::attach_downstream(Downstream *downstream) {
-  int rv;
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Attaching to DOWNSTREAM:" << downstream;
-  }
-
-  downstream_ = downstream;
-
-  rv = initiate_connection();
-  if (rv != 0) {
-    downstream_ = nullptr;
-    return rv;
-  }
-
-  return 0;
-}
-
-int HttpDownstreamConnection::initiate_connection() {
-  int rv;
-
-  auto worker_blocker = worker_->get_connect_blocker();
-  if (worker_blocker->blocked()) {
-    if (LOG_ENABLED(INFO)) {
-      DCLOG(INFO, this)
-          << "Worker wide backend connection was blocked temporarily";
-    }
-    return SHRPX_ERR_NETWORK;
-  }
-
-  auto &downstreamconf = *worker_->get_downstream_config();
-
-  if (conn_.fd == -1) {
-    auto &shared_addr = group_->shared_addr;
-    auto &addrs = shared_addr->addrs;
-
-    // If session affinity is enabled, we always start with address at
-    // initial_addr_idx_.
-    size_t temp_idx = initial_addr_idx_;
-
-    auto &next_downstream = shared_addr->affinity.type == AFFINITY_NONE
-                                ? shared_addr->next
-                                : temp_idx;
-    auto end = next_downstream;
-    for (;;) {
-      auto check_dns_result = dns_query_.get() != nullptr;
-
-      DownstreamAddr *addr;
-      if (check_dns_result) {
-        addr = addr_;
-        addr_ = nullptr;
-        assert(addr);
-        assert(addr->dns);
-      } else {
-        assert(addr_ == nullptr);
-        if (shared_addr->affinity.type == AFFINITY_NONE) {
-          addr = &addrs[next_downstream];
-          if (++next_downstream >= addrs.size()) {
-            next_downstream = 0;
-          }
-        } else {
-          addr = &addrs[shared_addr->affinity_hash[next_downstream].idx];
-          if (++next_downstream >= shared_addr->affinity_hash.size()) {
-            next_downstream = 0;
-          }
-        }
-
-        if (addr->proto != PROTO_HTTP1) {
-          if (end == next_downstream) {
-            return SHRPX_ERR_NETWORK;
-          }
-
-          continue;
-        }
-      }
-
-      auto &connect_blocker = addr->connect_blocker;
-
-      if (connect_blocker->blocked()) {
-        if (LOG_ENABLED(INFO)) {
-          DCLOG(INFO, this) << "Backend server " << addr->host << ":"
-                            << addr->port << " was not available temporarily";
-        }
-
-        if (check_dns_result) {
-          dns_query_.reset();
-        } else if (end == next_downstream) {
-          return SHRPX_ERR_NETWORK;
-        }
-
-        continue;
-      }
-
-      Address *raddr;
-
-      if (addr->dns) {
-        if (!check_dns_result) {
-          auto dns_query = make_unique<DNSQuery>(
-              addr->host, [this](int status, const Address *result) {
-                int rv;
-
-                if (status == DNS_STATUS_OK) {
-                  *this->resolved_addr_ = *result;
-                }
-
-                rv = this->initiate_connection();
-                if (rv != 0) {
-                  // This callback destroys |this|.
-                  auto downstream = this->downstream_;
-                  backend_retry(downstream);
-                }
-              });
-
-          auto dns_tracker = worker_->get_dns_tracker();
-
-          if (!resolved_addr_) {
-            resolved_addr_ = make_unique<Address>();
-          }
-          rv = dns_tracker->resolve(resolved_addr_.get(), dns_query.get());
-          switch (rv) {
-          case DNS_STATUS_ERROR:
-            downstream_failure(addr, nullptr);
-            if (end == next_downstream) {
-              return SHRPX_ERR_NETWORK;
-            }
-            continue;
-          case DNS_STATUS_RUNNING:
-            dns_query_ = std::move(dns_query);
-            // Remember current addr
-            addr_ = addr;
-            return 0;
-          case DNS_STATUS_OK:
-            break;
-          default:
-            assert(0);
-          }
-        } else {
-          switch (dns_query_->status) {
-          case DNS_STATUS_ERROR:
-            dns_query_.reset();
-            downstream_failure(addr, nullptr);
-            continue;
-          case DNS_STATUS_OK:
-            dns_query_.reset();
-            break;
-          default:
-            assert(0);
-          }
-        }
-
-        raddr = resolved_addr_.get();
-        util::set_port(*resolved_addr_, addr->port);
-      } else {
-        raddr = &addr->addr;
-      }
-
-      conn_.fd = util::create_nonblock_socket(raddr->su.storage.ss_family);
-
-      if (conn_.fd == -1) {
-        auto error = errno;
-        DCLOG(WARN, this) << "socket() failed; addr="
-                          << util::to_numeric_addr(raddr)
-                          << ", errno=" << error;
-
-        worker_blocker->on_failure();
-
-        return SHRPX_ERR_NETWORK;
-      }
-
-      worker_blocker->on_success();
-
-      rv = connect(conn_.fd, &raddr->su.sa, raddr->len);
-      if (rv != 0 && errno != EINPROGRESS) {
-        auto error = errno;
-        DCLOG(WARN, this) << "connect() failed; addr="
-                          << util::to_numeric_addr(raddr)
-                          << ", errno=" << error;
-
-        downstream_failure(addr, raddr);
-
-        close(conn_.fd);
-        conn_.fd = -1;
-
-        if (!check_dns_result && end == next_downstream) {
-          return SHRPX_ERR_NETWORK;
-        }
-
-        // Try again with the next downstream server
-        continue;
-      }
-
-      if (LOG_ENABLED(INFO)) {
-        DCLOG(INFO, this) << "Connecting to downstream server";
-      }
-
-      addr_ = addr;
-      raddr_ = raddr;
-
-      if (addr_->tls) {
-        assert(ssl_ctx_);
-
-        auto ssl = tls::create_ssl(ssl_ctx_);
-        if (!ssl) {
-          return -1;
-        }
-
-        tls::setup_downstream_http1_alpn(ssl);
-
-        conn_.set_ssl(ssl);
-        conn_.tls.client_session_cache = &addr_->tls_session_cache;
-
-        auto sni_name =
-            addr_->sni.empty() ? StringRef{addr_->host} : StringRef{addr_->sni};
-        if (!util::numeric_host(sni_name.c_str())) {
-          SSL_set_tlsext_host_name(conn_.tls.ssl, sni_name.c_str());
-        }
-
-        auto session = tls::reuse_tls_session(addr_->tls_session_cache);
-        if (session) {
-          SSL_set_session(conn_.tls.ssl, session);
-          SSL_SESSION_free(session);
-        }
-
-        conn_.prepare_client_handshake();
-      }
-
-      ev_io_set(&conn_.wev, conn_.fd, EV_WRITE);
-      ev_io_set(&conn_.rev, conn_.fd, EV_READ);
-
-      conn_.wlimit.startw();
-
-      break;
-    }
-
-    conn_.wt.repeat = downstreamconf.timeout.connect;
-    ev_timer_again(conn_.loop, &conn_.wt);
-  } else {
-    // we may set read timer cb to idle_timeoutcb.  Reset again.
-    ev_set_cb(&conn_.rt, timeoutcb);
-    if (conn_.read_timeout < downstreamconf.timeout.read) {
-      conn_.read_timeout = downstreamconf.timeout.read;
-      conn_.last_read = ev_now(conn_.loop);
-    } else {
-      conn_.again_rt(downstreamconf.timeout.read);
-    }
-
-    ev_set_cb(&conn_.rev, readcb);
-
-    on_write_ = &HttpDownstreamConnection::write_reuse_first;
-    reuse_first_write_done_ = false;
-  }
-
-  http_parser_init(&response_htp_, HTTP_RESPONSE);
-  response_htp_.data = downstream_;
-
-  return 0;
-}
-
-int HttpDownstreamConnection::push_request_headers() {
-  if (downstream_->get_request_header_sent()) {
-    signal_write();
-    return 0;
-  }
-
-  const auto &downstream_hostport = addr_->hostport;
-  const auto &req = downstream_->request();
-
-  auto &balloc = downstream_->get_block_allocator();
-
-  auto connect_method = req.method == HTTP_CONNECT;
-
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  // Set request_sent to true because we write request into buffer
-  // here.
-  downstream_->set_request_header_sent(true);
-
-  // For HTTP/1.0 request, there is no authority in request.  In that
-  // case, we use backend server's host nonetheless.
-  auto authority = StringRef(downstream_hostport);
-  auto no_host_rewrite =
-      httpconf.no_host_rewrite || config->http2_proxy || connect_method;
-
-  if (no_host_rewrite && !req.authority.empty()) {
-    authority = req.authority;
-  }
-
-  downstream_->set_request_downstream_host(authority);
-
-  auto buf = downstream_->get_request_buf();
-
-  // Assume that method and request path do not contain \r\n.
-  auto meth = http2::to_method_string(req.method);
-  buf->append(meth);
-  buf->append(' ');
-
-  if (connect_method) {
-    buf->append(authority);
-  } else if (config->http2_proxy) {
-    // Construct absolute-form request target because we are going to
-    // send a request to a HTTP/1 proxy.
-    assert(!req.scheme.empty());
-    buf->append(req.scheme);
-    buf->append("://");
-    buf->append(authority);
-    buf->append(req.path);
-  } else if (req.method == HTTP_OPTIONS && req.path.empty()) {
-    // Server-wide OPTIONS
-    buf->append("*");
-  } else {
-    buf->append(req.path);
-  }
-  buf->append(" HTTP/1.1\r\nHost: ");
-  buf->append(authority);
-  buf->append("\r\n");
-
-  auto &fwdconf = httpconf.forwarded;
-  auto &xffconf = httpconf.xff;
-  auto &xfpconf = httpconf.xfp;
-  auto &earlydataconf = httpconf.early_data;
-
-  uint32_t build_flags =
-      (fwdconf.strip_incoming ? http2::HDOP_STRIP_FORWARDED : 0) |
-      (xffconf.strip_incoming ? http2::HDOP_STRIP_X_FORWARDED_FOR : 0) |
-      (xfpconf.strip_incoming ? http2::HDOP_STRIP_X_FORWARDED_PROTO : 0) |
-      (earlydataconf.strip_incoming ? http2::HDOP_STRIP_EARLY_DATA : 0);
-
-  http2::build_http1_headers_from_headers(buf, req.fs.headers(), build_flags);
-
-  auto cookie = downstream_->assemble_request_cookie();
-  if (!cookie.empty()) {
-    buf->append("Cookie: ");
-    buf->append(cookie);
-    buf->append("\r\n");
-  }
-
-  // set transfer-encoding only when content-length is unknown and
-  // request body is expected.
-  if (!connect_method && req.http2_expect_body && req.fs.content_length == -1) {
-    downstream_->set_chunked_request(true);
-    buf->append("Transfer-Encoding: chunked\r\n");
-  }
-
-  if (req.connection_close) {
-    buf->append("Connection: close\r\n");
-  }
-
-  if (!connect_method && req.upgrade_request) {
-    auto connection = req.fs.header(http2::HD_CONNECTION);
-    if (connection) {
-      buf->append("Connection: ");
-      buf->append((*connection).value);
-      buf->append("\r\n");
-    }
-
-    auto upgrade = req.fs.header(http2::HD_UPGRADE);
-    if (upgrade) {
-      buf->append("Upgrade: ");
-      buf->append((*upgrade).value);
-      buf->append("\r\n");
-    }
-  }
-
-  auto upstream = downstream_->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-#if OPENSSL_1_1_1_API
-  auto conn = handler->get_connection();
-
-  if (!SSL_is_init_finished(conn->tls.ssl)) {
-    buf->append("Early-Data: 1\r\n");
-  }
-#endif // OPENSSL_1_1_1_API
-
-  auto fwd =
-      fwdconf.strip_incoming ? nullptr : req.fs.header(http2::HD_FORWARDED);
-
-  if (fwdconf.params) {
-    auto params = fwdconf.params;
-
-    if (config->http2_proxy || connect_method) {
-      params &= ~FORWARDED_PROTO;
-    }
-
-    auto value = http::create_forwarded(
-        balloc, params, handler->get_forwarded_by(),
-        handler->get_forwarded_for(), req.authority, req.scheme);
-
-    if (fwd || !value.empty()) {
-      buf->append("Forwarded: ");
-      if (fwd) {
-        buf->append(fwd->value);
-
-        if (!value.empty()) {
-          buf->append(", ");
-        }
-      }
-      buf->append(value);
-      buf->append("\r\n");
-    }
-  } else if (fwd) {
-    buf->append("Forwarded: ");
-    buf->append(fwd->value);
-    buf->append("\r\n");
-  }
-
-  auto xff = xffconf.strip_incoming ? nullptr
-                                    : req.fs.header(http2::HD_X_FORWARDED_FOR);
-
-  if (xffconf.add) {
-    buf->append("X-Forwarded-For: ");
-    if (xff) {
-      buf->append((*xff).value);
-      buf->append(", ");
-    }
-    buf->append(client_handler_->get_ipaddr());
-    buf->append("\r\n");
-  } else if (xff) {
-    buf->append("X-Forwarded-For: ");
-    buf->append((*xff).value);
-    buf->append("\r\n");
-  }
-  if (!config->http2_proxy && !connect_method) {
-    auto xfp = xfpconf.strip_incoming
-                   ? nullptr
-                   : req.fs.header(http2::HD_X_FORWARDED_PROTO);
-
-    if (xfpconf.add) {
-      buf->append("X-Forwarded-Proto: ");
-      if (xfp) {
-        buf->append((*xfp).value);
-        buf->append(", ");
-      }
-      assert(!req.scheme.empty());
-      buf->append(req.scheme);
-      buf->append("\r\n");
-    } else if (xfp) {
-      buf->append("X-Forwarded-Proto: ");
-      buf->append((*xfp).value);
-      buf->append("\r\n");
-    }
-  }
-  auto via = req.fs.header(http2::HD_VIA);
-  if (httpconf.no_via) {
-    if (via) {
-      buf->append("Via: ");
-      buf->append((*via).value);
-      buf->append("\r\n");
-    }
-  } else {
-    buf->append("Via: ");
-    if (via) {
-      buf->append((*via).value);
-      buf->append(", ");
-    }
-    std::array<char, 16> viabuf;
-    auto end = http::create_via_header_value(viabuf.data(), req.http_major,
-                                             req.http_minor);
-    buf->append(viabuf.data(), end - viabuf.data());
-    buf->append("\r\n");
-  }
-
-  for (auto &p : httpconf.add_request_headers) {
-    buf->append(p.name);
-    buf->append(": ");
-    buf->append(p.value);
-    buf->append("\r\n");
-  }
-
-  buf->append("\r\n");
-
-  if (LOG_ENABLED(INFO)) {
-    std::string nhdrs;
-    for (auto chunk = buf->head; chunk; chunk = chunk->next) {
-      nhdrs.append(chunk->pos, chunk->last);
-    }
-    if (log_config()->errorlog_tty) {
-      nhdrs = http::colorizeHeaders(nhdrs.c_str());
-    }
-    DCLOG(INFO, this) << "HTTP request headers. stream_id="
-                      << downstream_->get_stream_id() << "\n"
-                      << nhdrs;
-  }
-
-  // Don't call signal_write() if we anticipate request body.  We call
-  // signal_write() when we received request body chunk, and it
-  // enables us to send headers and data in one writev system call.
-  if (connect_method || downstream_->get_blocked_request_buf()->rleft() ||
-      (!req.http2_expect_body && req.fs.content_length == 0)) {
-    signal_write();
-  }
-
-  return process_blocked_request_buf();
-}
-
-int HttpDownstreamConnection::process_blocked_request_buf() {
-  auto src = downstream_->get_blocked_request_buf();
-
-  if (src->rleft()) {
-    auto dest = downstream_->get_request_buf();
-    auto chunked = downstream_->get_chunked_request();
-    if (chunked) {
-      auto chunk_size_hex = util::utox(src->rleft());
-      dest->append(chunk_size_hex);
-      dest->append("\r\n");
-    }
-
-    src->remove(*dest);
-
-    if (chunked) {
-      dest->append("\r\n");
-    }
-  }
-
-  if (downstream_->get_blocked_request_data_eof()) {
-    return end_upload_data();
-  }
-
-  return 0;
-}
-
-int HttpDownstreamConnection::push_upload_data_chunk(const uint8_t *data,
-                                                     size_t datalen) {
-  auto chunked = downstream_->get_chunked_request();
-  auto output = downstream_->get_request_buf();
-
-  if (chunked) {
-    auto chunk_size_hex = util::utox(datalen);
-    output->append(chunk_size_hex);
-    output->append("\r\n");
-  }
-
-  output->append(data, datalen);
-
-  if (chunked) {
-    output->append("\r\n");
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-int HttpDownstreamConnection::end_upload_data() {
-  signal_write();
-
-  if (!downstream_->get_chunked_request()) {
-    return 0;
-  }
-
-  const auto &req = downstream_->request();
-
-  auto output = downstream_->get_request_buf();
-  const auto &trailers = req.fs.trailers();
-  if (trailers.empty()) {
-    output->append("0\r\n\r\n");
-  } else {
-    output->append("0\r\n");
-    http2::build_http1_headers_from_headers(output, trailers,
-                                            http2::HDOP_STRIP_ALL);
-    output->append("\r\n");
-  }
-
-  return 0;
-}
-
-namespace {
-void remove_from_pool(HttpDownstreamConnection *dconn) {
-  auto &group = dconn->get_downstream_addr_group();
-  auto &shared_addr = group->shared_addr;
-
-  if (shared_addr->affinity.type == AFFINITY_NONE) {
-    auto &dconn_pool =
-        dconn->get_downstream_addr_group()->shared_addr->dconn_pool;
-    dconn_pool.remove_downstream_connection(dconn);
-    return;
-  }
-
-  auto addr = dconn->get_addr();
-  auto &dconn_pool = addr->dconn_pool;
-  dconn_pool->remove_downstream_connection(dconn);
-}
-} // namespace
-
-namespace {
-void idle_readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, dconn) << "Idle connection EOF";
-  }
-
-  remove_from_pool(dconn);
-  // dconn was deleted
-}
-} // namespace
-
-namespace {
-void idle_timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto dconn = static_cast<HttpDownstreamConnection *>(conn->data);
-
-  if (w == &conn->rt && !conn->expired_rt()) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, dconn) << "Idle connection timeout";
-  }
-
-  remove_from_pool(dconn);
-  // dconn was deleted
-}
-} // namespace
-
-void HttpDownstreamConnection::detach_downstream(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Detaching from DOWNSTREAM:" << downstream;
-  }
-  downstream_ = nullptr;
-
-  ev_set_cb(&conn_.rev, idle_readcb);
-  ioctrl_.force_resume_read();
-
-  auto &downstreamconf = *worker_->get_downstream_config();
-
-  ev_set_cb(&conn_.rt, idle_timeoutcb);
-  if (conn_.read_timeout < downstreamconf.timeout.idle_read) {
-    conn_.read_timeout = downstreamconf.timeout.idle_read;
-    conn_.last_read = ev_now(conn_.loop);
-  } else {
-    conn_.again_rt(downstreamconf.timeout.idle_read);
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-}
-
-void HttpDownstreamConnection::pause_read(IOCtrlReason reason) {
-  ioctrl_.pause_read(reason);
-}
-
-int HttpDownstreamConnection::resume_read(IOCtrlReason reason,
-                                          size_t consumed) {
-  auto &downstreamconf = *worker_->get_downstream_config();
-
-  if (downstream_->get_response_buf()->rleft() <=
-      downstreamconf.request_buffer_size / 2) {
-    ioctrl_.resume_read(reason);
-  }
-
-  return 0;
-}
-
-void HttpDownstreamConnection::force_resume_read() {
-  ioctrl_.force_resume_read();
-}
-
-namespace {
-int htp_msg_begincb(http_parser *htp) {
-  auto downstream = static_cast<Downstream *>(htp->data);
-
-  if (downstream->get_response_state() != Downstream::INITIAL) {
-    return -1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdrs_completecb(http_parser *htp) {
-  auto downstream = static_cast<Downstream *>(htp->data);
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-  int rv;
-
-  auto config = get_config();
-  auto &loggingconf = config->logging;
-
-  resp.http_status = htp->status_code;
-  resp.http_major = htp->http_major;
-  resp.http_minor = htp->http_minor;
-
-  if (resp.http_major > 1 || req.http_minor > 1) {
-    resp.http_major = 1;
-    resp.http_minor = 1;
-    return -1;
-  }
-
-  auto dconn = downstream->get_downstream_connection();
-
-  downstream->set_downstream_addr_group(dconn->get_downstream_addr_group());
-  downstream->set_addr(dconn->get_addr());
-
-  // Server MUST NOT send Transfer-Encoding with a status code 1xx or
-  // 204.  Also server MUST NOT send Transfer-Encoding with a status
-  // code 200 to a CONNECT request.  Same holds true with
-  // Content-Length.
-  if (resp.http_status == 204) {
-    if (resp.fs.header(http2::HD_TRANSFER_ENCODING)) {
-      return -1;
-    }
-    // Some server send content-length: 0 for 204.  Until they get
-    // fixed, we accept, but ignore it.
-
-    // Calling parse_content_length() detects duplicated
-    // content-length header fields.
-    if (resp.fs.parse_content_length() != 0) {
-      return -1;
-    }
-    if (resp.fs.content_length == 0) {
-      auto cl = resp.fs.header(http2::HD_CONTENT_LENGTH);
-      assert(cl);
-      http2::erase_header(cl);
-    } else if (resp.fs.content_length != -1) {
-      return -1;
-    }
-  } else if (resp.http_status / 100 == 1 ||
-             (resp.http_status == 200 && req.method == HTTP_CONNECT)) {
-    if (resp.fs.header(http2::HD_CONTENT_LENGTH) ||
-        resp.fs.header(http2::HD_TRANSFER_ENCODING)) {
-      return -1;
-    }
-  } else if (resp.fs.parse_content_length() != 0) {
-    downstream->set_response_state(Downstream::MSG_BAD_HEADER);
-    return -1;
-  }
-
-  // Check upgrade before processing non-final response, since if
-  // upgrade succeeded, 101 response is treated as final in nghttpx.
-  downstream->check_upgrade_fulfilled();
-
-  if (downstream->get_non_final_response()) {
-    // Reset content-length because we reuse same Downstream for the
-    // next response.
-    resp.fs.content_length = -1;
-    // For non-final response code, we just call
-    // on_downstream_header_complete() without changing response
-    // state.
-    rv = upstream->on_downstream_header_complete(downstream);
-
-    if (rv != 0) {
-      return -1;
-    }
-
-    // Ignore response body for non-final response.
-    return 1;
-  }
-
-  resp.connection_close = !http_should_keep_alive(htp);
-  downstream->set_response_state(Downstream::HEADER_COMPLETE);
-  downstream->inspect_http1_response();
-  if (downstream->get_upgraded()) {
-    // content-length must be ignored for upgraded connection.
-    resp.fs.content_length = -1;
-    resp.connection_close = true;
-    // transfer-encoding not applied to upgraded connection
-    downstream->set_chunked_response(false);
-  } else if (!downstream->expect_response_body()) {
-    downstream->set_chunked_response(false);
-  }
-
-  if (loggingconf.access.write_early && downstream->accesslog_ready()) {
-    handler->write_accesslog(downstream);
-    downstream->set_accesslog_written(true);
-  }
-
-  if (upstream->on_downstream_header_complete(downstream) != 0) {
-    return -1;
-  }
-
-  if (downstream->get_upgraded()) {
-    // Upgrade complete, read until EOF in both ends
-    if (upstream->resume_read(SHRPX_NO_BUFFER, downstream, 0) != 0) {
-      return -1;
-    }
-    downstream->set_request_state(Downstream::HEADER_COMPLETE);
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "HTTP upgrade success. stream_id="
-                << downstream->get_stream_id();
-    }
-  }
-
-  // Ignore the response body. HEAD response may contain
-  // Content-Length or Transfer-Encoding: chunked.  Some server send
-  // 304 status code with nonzero Content-Length, but without response
-  // body. See
-  // https://tools.ietf.org/html/rfc7230#section-3.3
-
-  // TODO It seems that the cases other than HEAD are handled by
-  // http-parser.  Need test.
-  return !http2::expect_response_body(req.method, resp.http_status);
-}
-} // namespace
-
-namespace {
-int ensure_header_field_buffer(const Downstream *downstream,
-                               const HttpConfig &httpconf, size_t len) {
-  auto &resp = downstream->response();
-
-  if (resp.fs.buffer_size() + len > httpconf.response_header_field_buffer) {
-    if (LOG_ENABLED(INFO)) {
-      DLOG(INFO, downstream) << "Too large header header field size="
-                             << resp.fs.buffer_size() + len;
-    }
-    return -1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int ensure_max_header_fields(const Downstream *downstream,
-                             const HttpConfig &httpconf) {
-  auto &resp = downstream->response();
-
-  if (resp.fs.num_fields() >= httpconf.max_response_header_fields) {
-    if (LOG_ENABLED(INFO)) {
-      DLOG(INFO, downstream)
-          << "Too many header field num=" << resp.fs.num_fields() + 1;
-    }
-    return -1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdr_keycb(http_parser *htp, const char *data, size_t len) {
-  auto downstream = static_cast<Downstream *>(htp->data);
-  auto &resp = downstream->response();
-  auto &httpconf = get_config()->http;
-
-  if (ensure_header_field_buffer(downstream, httpconf, len) != 0) {
-    return -1;
-  }
-
-  if (downstream->get_response_state() == Downstream::INITIAL) {
-    if (resp.fs.header_key_prev()) {
-      resp.fs.append_last_header_key(data, len);
-    } else {
-      if (ensure_max_header_fields(downstream, httpconf) != 0) {
-        return -1;
-      }
-      resp.fs.alloc_add_header_name(StringRef{data, len});
-    }
-  } else {
-    // trailer part
-    if (resp.fs.trailer_key_prev()) {
-      resp.fs.append_last_trailer_key(data, len);
-    } else {
-      if (ensure_max_header_fields(downstream, httpconf) != 0) {
-        // Could not ignore this trailer field easily, since we may
-        // get its value in htp_hdr_valcb, and it will be added to
-        // wrong place or crash if trailer fields are currently empty.
-        return -1;
-      }
-      resp.fs.alloc_add_trailer_name(StringRef{data, len});
-    }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdr_valcb(http_parser *htp, const char *data, size_t len) {
-  auto downstream = static_cast<Downstream *>(htp->data);
-  auto &resp = downstream->response();
-  auto &httpconf = get_config()->http;
-
-  if (ensure_header_field_buffer(downstream, httpconf, len) != 0) {
-    return -1;
-  }
-
-  if (downstream->get_response_state() == Downstream::INITIAL) {
-    resp.fs.append_last_header_value(data, len);
-  } else {
-    resp.fs.append_last_trailer_value(data, len);
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_bodycb(http_parser *htp, const char *data, size_t len) {
-  auto downstream = static_cast<Downstream *>(htp->data);
-  auto &resp = downstream->response();
-
-  resp.recv_body_length += len;
-
-  return downstream->get_upstream()->on_downstream_body(
-      downstream, reinterpret_cast<const uint8_t *>(data), len, true);
-}
-} // namespace
-
-namespace {
-int htp_msg_completecb(http_parser *htp) {
-  auto downstream = static_cast<Downstream *>(htp->data);
-
-  // http-parser does not treat "200 connection established" response
-  // against CONNECT request, and in that case, this function is not
-  // called.  But if HTTP Upgrade is made (e.g., WebSocket), this
-  // function is called, and http_parser_execute() returns just after
-  // that.
-  if (downstream->get_upgraded()) {
-    return 0;
-  }
-
-  if (downstream->get_non_final_response()) {
-    downstream->reset_response();
-
-    return 0;
-  }
-
-  downstream->set_response_state(Downstream::MSG_COMPLETE);
-  // Block reading another response message from (broken?)
-  // server. This callback is not called if the connection is
-  // tunneled.
-  downstream->pause_read(SHRPX_MSG_BLOCK);
-  return downstream->get_upstream()->on_downstream_body_complete(downstream);
-}
-} // namespace
-
-namespace {
-constexpr http_parser_settings htp_hooks = {
-    htp_msg_begincb,     // http_cb on_message_begin;
-    nullptr,             // http_data_cb on_url;
-    nullptr,             // http_data_cb on_status;
-    htp_hdr_keycb,       // http_data_cb on_header_field;
-    htp_hdr_valcb,       // http_data_cb on_header_value;
-    htp_hdrs_completecb, // http_cb      on_headers_complete;
-    htp_bodycb,          // http_data_cb on_body;
-    htp_msg_completecb   // http_cb      on_message_complete;
-};
-} // namespace
-
-int HttpDownstreamConnection::write_reuse_first() {
-  int rv;
-
-  if (conn_.tls.ssl) {
-    rv = write_tls();
-  } else {
-    rv = write_clear();
-  }
-
-  if (rv != 0) {
-    return SHRPX_ERR_RETRY;
-  }
-
-  if (conn_.tls.ssl) {
-    on_write_ = &HttpDownstreamConnection::write_tls;
-  } else {
-    on_write_ = &HttpDownstreamConnection::write_clear;
-  }
-
-  reuse_first_write_done_ = true;
-
-  return 0;
-}
-
-int HttpDownstreamConnection::read_clear() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<uint8_t, 16_k> buf;
-  int rv;
-
-  for (;;) {
-    auto nread = conn_.read_clear(buf.data(), buf.size());
-    if (nread == 0) {
-      return 0;
-    }
-
-    if (nread < 0) {
-      return nread;
-    }
-
-    rv = process_input(buf.data(), nread);
-    if (rv != 0) {
-      return rv;
-    }
-
-    if (!ev_is_active(&conn_.rev)) {
-      return 0;
-    }
-  }
-}
-
-int HttpDownstreamConnection::write_clear() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  auto upstream = downstream_->get_upstream();
-  auto input = downstream_->get_request_buf();
-
-  std::array<struct iovec, MAX_WR_IOVCNT> iov;
-
-  while (input->rleft() > 0) {
-    auto iovcnt = input->riovec(iov.data(), iov.size());
-
-    auto nwrite = conn_.writev_clear(iov.data(), iovcnt);
-
-    if (nwrite == 0) {
-      return 0;
-    }
-
-    if (nwrite < 0) {
-      if (!reuse_first_write_done_) {
-        return nwrite;
-      }
-      // We may have pending data in receive buffer which may contain
-      // part of response body.  So keep reading.  Invoke read event
-      // to get read(2) error just in case.
-      ev_feed_event(conn_.loop, &conn_.rev, EV_READ);
-      on_write_ = &HttpDownstreamConnection::noop;
-      reusable_ = false;
-      break;
-    }
-
-    input->drain(nwrite);
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  if (input->rleft() == 0) {
-    auto &req = downstream_->request();
-
-    upstream->resume_read(SHRPX_NO_BUFFER, downstream_,
-                          req.unconsumed_body_length);
-  }
-
-  return 0;
-}
-
-int HttpDownstreamConnection::tls_handshake() {
-  ERR_clear_error();
-
-  conn_.last_read = ev_now(conn_.loop);
-
-  auto rv = conn_.tls_handshake();
-  if (rv == SHRPX_ERR_INPROGRESS) {
-    return 0;
-  }
-
-  if (rv < 0) {
-    downstream_failure(addr_, raddr_);
-
-    return rv;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "SSL/TLS handshake completed";
-  }
-
-  if (!get_config()->tls.insecure &&
-      tls::check_cert(conn_.tls.ssl, addr_, raddr_) != 0) {
-    downstream_failure(addr_, raddr_);
-
-    return -1;
-  }
-
-  auto &connect_blocker = addr_->connect_blocker;
-
-  signal_write_ = &HttpDownstreamConnection::actual_signal_write;
-
-  connect_blocker->on_success();
-
-  ev_set_cb(&conn_.rt, timeoutcb);
-  ev_set_cb(&conn_.wt, timeoutcb);
-
-  on_read_ = &HttpDownstreamConnection::read_tls;
-  on_write_ = &HttpDownstreamConnection::write_tls;
-
-  // TODO Check negotiated ALPN
-
-  return on_write();
-}
-
-int HttpDownstreamConnection::read_tls() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  ERR_clear_error();
-
-  std::array<uint8_t, 16_k> buf;
-  int rv;
-
-  for (;;) {
-    auto nread = conn_.read_tls(buf.data(), buf.size());
-    if (nread == 0) {
-      return 0;
-    }
-
-    if (nread < 0) {
-      return nread;
-    }
-
-    rv = process_input(buf.data(), nread);
-    if (rv != 0) {
-      return rv;
-    }
-
-    if (!ev_is_active(&conn_.rev)) {
-      return 0;
-    }
-  }
-}
-
-int HttpDownstreamConnection::write_tls() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  ERR_clear_error();
-
-  auto upstream = downstream_->get_upstream();
-  auto input = downstream_->get_request_buf();
-
-  struct iovec iov;
-
-  while (input->rleft() > 0) {
-    auto iovcnt = input->riovec(&iov, 1);
-    if (iovcnt != 1) {
-      assert(0);
-      return -1;
-    }
-    auto nwrite = conn_.write_tls(iov.iov_base, iov.iov_len);
-
-    if (nwrite == 0) {
-      return 0;
-    }
-
-    if (nwrite < 0) {
-      if (!reuse_first_write_done_) {
-        return nwrite;
-      }
-      // We may have pending data in receive buffer which may contain
-      // part of response body.  So keep reading.  Invoke read event
-      // to get read(2) error just in case.
-      ev_feed_event(conn_.loop, &conn_.rev, EV_READ);
-      on_write_ = &HttpDownstreamConnection::noop;
-      reusable_ = false;
-      break;
-    }
-
-    input->drain(nwrite);
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  if (input->rleft() == 0) {
-    auto &req = downstream_->request();
-
-    upstream->resume_read(SHRPX_NO_BUFFER, downstream_,
-                          req.unconsumed_body_length);
-  }
-
-  return 0;
-}
-
-int HttpDownstreamConnection::process_input(const uint8_t *data,
-                                            size_t datalen) {
-  int rv;
-
-  if (downstream_->get_upgraded()) {
-    // For upgraded connection, just pass data to the upstream.
-    rv = downstream_->get_upstream()->on_downstream_body(downstream_, data,
-                                                         datalen, true);
-    if (rv != 0) {
-      return rv;
-    }
-
-    if (downstream_->response_buf_full()) {
-      downstream_->pause_read(SHRPX_NO_BUFFER);
-      return 0;
-    }
-
-    return 0;
-  }
-
-  auto nproc =
-      http_parser_execute(&response_htp_, &htp_hooks,
-                          reinterpret_cast<const char *>(data), datalen);
-
-  auto htperr = HTTP_PARSER_ERRNO(&response_htp_);
-
-  if (htperr != HPE_OK) {
-    // Handling early return (in other words, response was hijacked by
-    // mruby scripting).
-    if (downstream_->get_response_state() == Downstream::MSG_COMPLETE) {
-      return SHRPX_ERR_DCONN_CANCELED;
-    }
-
-    if (LOG_ENABLED(INFO)) {
-      DCLOG(INFO, this) << "HTTP parser failure: "
-                        << "(" << http_errno_name(htperr) << ") "
-                        << http_errno_description(htperr);
-    }
-
-    return -1;
-  }
-
-  if (downstream_->get_upgraded()) {
-    if (nproc < datalen) {
-      // Data from data + nproc are for upgraded protocol.
-      rv = downstream_->get_upstream()->on_downstream_body(
-          downstream_, data + nproc, datalen - nproc, true);
-      if (rv != 0) {
-        return rv;
-      }
-
-      if (downstream_->response_buf_full()) {
-        downstream_->pause_read(SHRPX_NO_BUFFER);
-        return 0;
-      }
-    }
-    return 0;
-  }
-
-  if (downstream_->response_buf_full()) {
-    downstream_->pause_read(SHRPX_NO_BUFFER);
-    return 0;
-  }
-
-  return 0;
-}
-
-int HttpDownstreamConnection::connected() {
-  auto &connect_blocker = addr_->connect_blocker;
-
-  auto sock_error = util::get_socket_error(conn_.fd);
-  if (sock_error != 0) {
-    conn_.wlimit.stopw();
-
-    DCLOG(WARN, this) << "Backend connect failed; addr="
-                      << util::to_numeric_addr(raddr_)
-                      << ": errno=" << sock_error;
-
-    downstream_failure(addr_, raddr_);
-
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, this) << "Connected to downstream host";
-  }
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  // Reset timeout for write.  Previously, we set timeout for connect.
-  conn_.wt.repeat = downstreamconf.timeout.write;
-  ev_timer_again(conn_.loop, &conn_.wt);
-
-  conn_.rlimit.startw();
-  conn_.again_rt();
-
-  ev_set_cb(&conn_.wev, writecb);
-
-  if (conn_.tls.ssl) {
-    on_read_ = &HttpDownstreamConnection::tls_handshake;
-    on_write_ = &HttpDownstreamConnection::tls_handshake;
-
-    return 0;
-  }
-
-  signal_write_ = &HttpDownstreamConnection::actual_signal_write;
-
-  connect_blocker->on_success();
-
-  ev_set_cb(&conn_.rt, timeoutcb);
-  ev_set_cb(&conn_.wt, timeoutcb);
-
-  on_read_ = &HttpDownstreamConnection::read_clear;
-  on_write_ = &HttpDownstreamConnection::write_clear;
-
-  return 0;
-}
-
-int HttpDownstreamConnection::on_read() { return on_read_(*this); }
-
-int HttpDownstreamConnection::on_write() { return on_write_(*this); }
-
-void HttpDownstreamConnection::on_upstream_change(Upstream *upstream) {}
-
-void HttpDownstreamConnection::signal_write() { signal_write_(*this); }
-
-int HttpDownstreamConnection::actual_signal_write() {
-  ev_feed_event(conn_.loop, &conn_.wev, EV_WRITE);
-  return 0;
-}
-
-int HttpDownstreamConnection::noop() { return 0; }
-
-const std::shared_ptr<DownstreamAddrGroup> &
-HttpDownstreamConnection::get_downstream_addr_group() const {
-  return group_;
-}
-
-DownstreamAddr *HttpDownstreamConnection::get_addr() const { return addr_; }
-
-bool HttpDownstreamConnection::poolable() const {
-  return !group_->retired && reusable_;
-}
-
-const Address *HttpDownstreamConnection::get_raddr() const { return raddr_; }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_downstream_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP_DOWNSTREAM_CONNECTION_H
-#define SHRPX_HTTP_DOWNSTREAM_CONNECTION_H
-
-#include "shrpx.h"
-
-#include "http-parser/http_parser.h"
-
-#include "shrpx_downstream_connection.h"
-#include "shrpx_io_control.h"
-#include "shrpx_connection.h"
-
-namespace shrpx {
-
-class DownstreamConnectionPool;
-class Worker;
-struct DownstreamAddrGroup;
-struct DownstreamAddr;
-struct DNSQuery;
-
-class HttpDownstreamConnection : public DownstreamConnection {
-public:
-  HttpDownstreamConnection(const std::shared_ptr<DownstreamAddrGroup> &group,
-                           size_t initial_addr_idx, struct ev_loop *loop,
-                           Worker *worker);
-  virtual ~HttpDownstreamConnection();
-  virtual int attach_downstream(Downstream *downstream);
-  virtual void detach_downstream(Downstream *downstream);
-
-  virtual int push_request_headers();
-  virtual int push_upload_data_chunk(const uint8_t *data, size_t datalen);
-  virtual int end_upload_data();
-
-  virtual void pause_read(IOCtrlReason reason);
-  virtual int resume_read(IOCtrlReason reason, size_t consumed);
-  virtual void force_resume_read();
-
-  virtual int on_read();
-  virtual int on_write();
-
-  virtual void on_upstream_change(Upstream *upstream);
-
-  virtual bool poolable() const;
-
-  virtual const std::shared_ptr<DownstreamAddrGroup> &
-  get_downstream_addr_group() const;
-  virtual DownstreamAddr *get_addr() const;
-
-  int initiate_connection();
-
-  int write_reuse_first();
-  int read_clear();
-  int write_clear();
-  int read_tls();
-  int write_tls();
-
-  int process_input(const uint8_t *data, size_t datalen);
-  int tls_handshake();
-
-  int connected();
-  void signal_write();
-  int actual_signal_write();
-
-  // Returns address used to connect to backend.  Could be nullptr.
-  const Address *get_raddr() const;
-
-  int noop();
-
-  int process_blocked_request_buf();
-
-private:
-  Connection conn_;
-  std::function<int(HttpDownstreamConnection &)> on_read_, on_write_,
-      signal_write_;
-  Worker *worker_;
-  // nullptr if TLS is not used.
-  SSL_CTX *ssl_ctx_;
-  std::shared_ptr<DownstreamAddrGroup> group_;
-  // Address of remote endpoint
-  DownstreamAddr *addr_;
-  // Actual remote address used to contact backend.  This is initially
-  // nullptr, and may point to either &addr_->addr, or
-  // resolved_addr_.get().
-  const Address *raddr_;
-  // Resolved IP address if dns parameter is used
-  std::unique_ptr<Address> resolved_addr_;
-  std::unique_ptr<DNSQuery> dns_query_;
-  IOControl ioctrl_;
-  http_parser response_htp_;
-  // Index to backend address.  If client affinity is enabled, it is
-  // the index to affinity_hash.  Otherwise, it is 0, and not used.
-  size_t initial_addr_idx_;
-  // true if first write of reused connection succeeded.  For
-  // convenience, this is initialized as true.
-  bool reuse_first_write_done_;
-  // true if this object can be reused
-  bool reusable_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP_DOWNSTREAM_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP_H
-#define SHRPX_HTTP_H
-
-#include "shrpx.h"
-
-#include <string>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_config.h"
-#include "util.h"
-#include "allocator.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace http {
-
-StringRef create_error_html(BlockAllocator &balloc, unsigned int status_code);
-
-template <typename OutputIt>
-OutputIt create_via_header_value(OutputIt dst, int major, int minor) {
-  *dst++ = static_cast<char>(major + '0');
-  if (major < 2) {
-    *dst++ = '.';
-    *dst++ = static_cast<char>(minor + '0');
-  }
-  return util::copy_lit(dst, " nghttpx");
-}
-
-// Returns generated RFC 7239 Forwarded header field value.  The
-// |params| is bitwise-OR of zero or more of shrpx_forwarded_param
-// defined in shrpx_config.h.
-StringRef create_forwarded(BlockAllocator &balloc, int params,
-                           const StringRef &node_by, const StringRef &node_for,
-                           const StringRef &host, const StringRef &proto);
-
-// Adds ANSI color codes to HTTP headers |hdrs|.
-std::string colorizeHeaders(const char *hdrs);
-
-ssize_t select_padding_callback(nghttp2_session *session,
-                                const nghttp2_frame *frame, size_t max_payload,
-                                void *user_data);
-
-// Creates set-cookie-string for cookie based affinity.  If |path| is
-// not empty, "; <path>" is added.  If |secure| is true, "; Secure" is
-// added.
-StringRef create_affinity_cookie(BlockAllocator &balloc, const StringRef &name,
-                                 uint32_t affinity_cookie,
-                                 const StringRef &path, bool secure);
-
-// Returns true if |secure| indicates that Secure attribute should be
-// set.
-bool require_cookie_secure_attribute(shrpx_cookie_secure secure,
-                                     const StringRef &scheme);
-
-} // namespace http
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1473 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_https_upstream.h"
-
-#include <cassert>
-#include <set>
-#include <sstream>
-
-#include "shrpx_client_handler.h"
-#include "shrpx_downstream.h"
-#include "shrpx_downstream_connection.h"
-#include "shrpx_http.h"
-#include "shrpx_config.h"
-#include "shrpx_error.h"
-#include "shrpx_log_config.h"
-#include "shrpx_worker.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_log.h"
-#ifdef HAVE_MRUBY
-#  include "shrpx_mruby.h"
-#endif // HAVE_MRUBY
-#include "http2.h"
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-HttpsUpstream::HttpsUpstream(ClientHandler *handler)
-    : handler_(handler),
-      current_header_length_(0),
-      ioctrl_(handler->get_rlimit()),
-      num_requests_(0) {
-  http_parser_init(&htp_, HTTP_REQUEST);
-  htp_.data = this;
-}
-
-HttpsUpstream::~HttpsUpstream() {}
-
-void HttpsUpstream::reset_current_header_length() {
-  current_header_length_ = 0;
-}
-
-void HttpsUpstream::on_start_request() {
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, this) << "HTTP request started";
-  }
-  reset_current_header_length();
-
-  auto downstream = make_unique<Downstream>(this, handler_->get_mcpool(), 0);
-
-  attach_downstream(std::move(downstream));
-
-  auto conn = handler_->get_connection();
-  auto &upstreamconf = get_config()->conn.upstream;
-
-  conn->rt.repeat = upstreamconf.timeout.read;
-
-  handler_->repeat_read_timer();
-
-  ++num_requests_;
-}
-
-namespace {
-int htp_msg_begin(http_parser *htp) {
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  upstream->on_start_request();
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_uricb(http_parser *htp, const char *data, size_t len) {
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  auto downstream = upstream->get_downstream();
-  auto &req = downstream->request();
-
-  auto &balloc = downstream->get_block_allocator();
-
-  // We happen to have the same value for method token.
-  req.method = htp->method;
-
-  if (req.fs.buffer_size() + len >
-      get_config()->http.request_header_field_buffer) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, upstream) << "Too large URI size="
-                           << req.fs.buffer_size() + len;
-    }
-    assert(downstream->get_request_state() == Downstream::INITIAL);
-    downstream->set_request_state(Downstream::HTTP1_REQUEST_HEADER_TOO_LARGE);
-    return -1;
-  }
-
-  req.fs.add_extra_buffer_size(len);
-
-  if (req.method == HTTP_CONNECT) {
-    req.authority =
-        concat_string_ref(balloc, req.authority, StringRef{data, len});
-  } else {
-    req.path = concat_string_ref(balloc, req.path, StringRef{data, len});
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdr_keycb(http_parser *htp, const char *data, size_t len) {
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  auto downstream = upstream->get_downstream();
-  auto &req = downstream->request();
-  auto &httpconf = get_config()->http;
-
-  if (req.fs.buffer_size() + len > httpconf.request_header_field_buffer) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, upstream) << "Too large header block size="
-                           << req.fs.buffer_size() + len;
-    }
-    if (downstream->get_request_state() == Downstream::INITIAL) {
-      downstream->set_request_state(Downstream::HTTP1_REQUEST_HEADER_TOO_LARGE);
-    }
-    return -1;
-  }
-  if (downstream->get_request_state() == Downstream::INITIAL) {
-    if (req.fs.header_key_prev()) {
-      req.fs.append_last_header_key(data, len);
-    } else {
-      if (req.fs.num_fields() >= httpconf.max_request_header_fields) {
-        if (LOG_ENABLED(INFO)) {
-          ULOG(INFO, upstream)
-              << "Too many header field num=" << req.fs.num_fields() + 1;
-        }
-        downstream->set_request_state(
-            Downstream::HTTP1_REQUEST_HEADER_TOO_LARGE);
-        return -1;
-      }
-      req.fs.alloc_add_header_name(StringRef{data, len});
-    }
-  } else {
-    // trailer part
-    if (req.fs.trailer_key_prev()) {
-      req.fs.append_last_trailer_key(data, len);
-    } else {
-      if (req.fs.num_fields() >= httpconf.max_request_header_fields) {
-        if (LOG_ENABLED(INFO)) {
-          ULOG(INFO, upstream)
-              << "Too many header field num=" << req.fs.num_fields() + 1;
-        }
-        return -1;
-      }
-      req.fs.alloc_add_trailer_name(StringRef{data, len});
-    }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_hdr_valcb(http_parser *htp, const char *data, size_t len) {
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  auto downstream = upstream->get_downstream();
-  auto &req = downstream->request();
-
-  if (req.fs.buffer_size() + len >
-      get_config()->http.request_header_field_buffer) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, upstream) << "Too large header block size="
-                           << req.fs.buffer_size() + len;
-    }
-    if (downstream->get_request_state() == Downstream::INITIAL) {
-      downstream->set_request_state(Downstream::HTTP1_REQUEST_HEADER_TOO_LARGE);
-    }
-    return -1;
-  }
-  if (downstream->get_request_state() == Downstream::INITIAL) {
-    req.fs.append_last_header_value(data, len);
-  } else {
-    req.fs.append_last_trailer_value(data, len);
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-void rewrite_request_host_path_from_uri(BlockAllocator &balloc, Request &req,
-                                        const StringRef &uri,
-                                        http_parser_url &u) {
-  assert(u.field_set & (1 << UF_HOST));
-
-  // As per https://tools.ietf.org/html/rfc7230#section-5.4, we
-  // rewrite host header field with authority component.
-  auto authority = util::get_uri_field(uri.c_str(), u, UF_HOST);
-  // TODO properly check IPv6 numeric address
-  auto ipv6 = std::find(std::begin(authority), std::end(authority), ':') !=
-              std::end(authority);
-  auto authoritylen = authority.size();
-  if (ipv6) {
-    authoritylen += 2;
-  }
-  if (u.field_set & (1 << UF_PORT)) {
-    authoritylen += 1 + str_size("65535");
-  }
-  if (authoritylen > authority.size()) {
-    auto iovec = make_byte_ref(balloc, authoritylen + 1);
-    auto p = iovec.base;
-    if (ipv6) {
-      *p++ = '[';
-    }
-    p = std::copy(std::begin(authority), std::end(authority), p);
-    if (ipv6) {
-      *p++ = ']';
-    }
-
-    if (u.field_set & (1 << UF_PORT)) {
-      *p++ = ':';
-      p = util::utos(p, u.port);
-    }
-    *p = '\0';
-
-    req.authority = StringRef{iovec.base, p};
-  } else {
-    req.authority = authority;
-  }
-
-  req.scheme = util::get_uri_field(uri.c_str(), u, UF_SCHEMA);
-
-  StringRef path;
-  if (u.field_set & (1 << UF_PATH)) {
-    path = util::get_uri_field(uri.c_str(), u, UF_PATH);
-  } else if (req.method == HTTP_OPTIONS) {
-    // Server-wide OPTIONS takes following form in proxy request:
-    //
-    // OPTIONS http://example.org HTTP/1.1
-    //
-    // Notice that no slash after authority. See
-    // http://tools.ietf.org/html/rfc7230#section-5.3.4
-    req.path = StringRef::from_lit("");
-    // we ignore query component here
-    return;
-  } else {
-    path = StringRef::from_lit("/");
-  }
-
-  if (u.field_set & (1 << UF_QUERY)) {
-    auto &fdata = u.field_data[UF_QUERY];
-
-    if (u.field_set & (1 << UF_PATH)) {
-      auto q = util::get_uri_field(uri.c_str(), u, UF_QUERY);
-      path = StringRef{std::begin(path), std::end(q)};
-    } else {
-      path = concat_string_ref(balloc, path, StringRef::from_lit("?"),
-                               StringRef{&uri[fdata.off], fdata.len});
-    }
-  }
-
-  req.path = http2::rewrite_clean_path(balloc, path);
-}
-} // namespace
-
-namespace {
-int htp_hdrs_completecb(http_parser *htp) {
-  int rv;
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, upstream) << "HTTP request headers completed";
-  }
-
-  auto handler = upstream->get_client_handler();
-
-  auto downstream = upstream->get_downstream();
-  auto &req = downstream->request();
-
-  auto lgconf = log_config();
-  lgconf->update_tstamp(std::chrono::system_clock::now());
-  req.tstamp = lgconf->tstamp;
-
-  req.http_major = htp->http_major;
-  req.http_minor = htp->http_minor;
-
-  req.connection_close = !http_should_keep_alive(htp);
-
-  handler->stop_read_timer();
-
-  auto method = req.method;
-
-  if (LOG_ENABLED(INFO)) {
-    std::stringstream ss;
-    ss << http2::to_method_string(method) << " "
-       << (method == HTTP_CONNECT ? req.authority : req.path) << " "
-       << "HTTP/" << req.http_major << "." << req.http_minor << "\n";
-
-    for (const auto &kv : req.fs.headers()) {
-      ss << TTY_HTTP_HD << kv.name << TTY_RST << ": " << kv.value << "\n";
-    }
-
-    ULOG(INFO, upstream) << "HTTP request headers\n" << ss.str();
-  }
-
-  // set content-length if method is not CONNECT, and no
-  // transfer-encoding is given.  If transfer-encoding is given, leave
-  // req.fs.content_length to -1.
-  if (method != HTTP_CONNECT && !req.fs.header(http2::HD_TRANSFER_ENCODING)) {
-    // http-parser returns (uint64_t)-1 if there is no content-length
-    // header field.  If we don't have both transfer-encoding, and
-    // content-length header field, we assume that there is no request
-    // body.
-    if (htp->content_length == std::numeric_limits<uint64_t>::max()) {
-      req.fs.content_length = 0;
-    } else {
-      req.fs.content_length = htp->content_length;
-    }
-  }
-
-  auto host = req.fs.header(http2::HD_HOST);
-
-  if (req.http_major > 1 || req.http_minor > 1) {
-    req.http_major = 1;
-    req.http_minor = 1;
-    return -1;
-  }
-
-  if (req.http_major == 1 && req.http_minor == 1 && !host) {
-    return -1;
-  }
-
-  if (host) {
-    const auto &value = host->value;
-    // Not allow at least '"' or '\' in host.  They are illegal in
-    // authority component, also they cause headaches when we put them
-    // in quoted-string.
-    if (std::find_if(std::begin(value), std::end(value), [](char c) {
-          return c == '"' || c == '\\';
-        }) != std::end(value)) {
-      return -1;
-    }
-  }
-
-  downstream->inspect_http1_request();
-
-  auto faddr = handler->get_upstream_addr();
-  auto &balloc = downstream->get_block_allocator();
-  auto config = get_config();
-
-  if (method != HTTP_CONNECT) {
-    http_parser_url u{};
-    rv = http_parser_parse_url(req.path.c_str(), req.path.size(), 0, &u);
-    if (rv != 0) {
-      // Expect to respond with 400 bad request
-      return -1;
-    }
-    // checking UF_HOST could be redundant, but just in case ...
-    if (!(u.field_set & (1 << UF_SCHEMA)) || !(u.field_set & (1 << UF_HOST))) {
-      req.no_authority = true;
-
-      if (method == HTTP_OPTIONS && req.path == StringRef::from_lit("*")) {
-        req.path = StringRef{};
-      } else {
-        req.path = http2::rewrite_clean_path(balloc, req.path);
-      }
-
-      if (host) {
-        req.authority = host->value;
-      }
-
-      if (handler->get_ssl()) {
-        req.scheme = StringRef::from_lit("https");
-      } else {
-        req.scheme = StringRef::from_lit("http");
-      }
-    } else {
-      rewrite_request_host_path_from_uri(balloc, req, req.path, u);
-    }
-  }
-
-  downstream->set_request_state(Downstream::HEADER_COMPLETE);
-
-#ifdef HAVE_MRUBY
-  auto worker = handler->get_worker();
-  auto mruby_ctx = worker->get_mruby_context();
-
-  auto &resp = downstream->response();
-
-  if (mruby_ctx->run_on_request_proc(downstream) != 0) {
-    resp.http_status = 500;
-    return -1;
-  }
-#endif // HAVE_MRUBY
-
-  // mruby hook may change method value
-
-  if (req.no_authority && config->http2_proxy && !faddr->alt_mode) {
-    // Request URI should be absolute-form for client proxy mode
-    return -1;
-  }
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    return 0;
-  }
-
-  auto dconn = handler->get_downstream_connection(rv, downstream);
-
-  if (!dconn) {
-    if (rv == SHRPX_ERR_TLS_REQUIRED) {
-      upstream->redirect_to_https(downstream);
-    }
-    downstream->set_request_state(Downstream::CONNECT_FAIL);
-
-    return -1;
-  }
-
-#ifdef HAVE_MRUBY
-  auto dconn_ptr = dconn.get();
-#endif // HAVE_MRUBY
-  if (downstream->attach_downstream_connection(std::move(dconn)) != 0) {
-    downstream->set_request_state(Downstream::CONNECT_FAIL);
-
-    return -1;
-  }
-
-#ifdef HAVE_MRUBY
-  const auto &group = dconn_ptr->get_downstream_addr_group();
-  if (group) {
-    const auto &dmruby_ctx = group->mruby_ctx;
-
-    if (dmruby_ctx->run_on_request_proc(downstream) != 0) {
-      resp.http_status = 500;
-      return -1;
-    }
-
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      return 0;
-    }
-  }
-#endif // HAVE_MRUBY
-
-  rv = downstream->push_request_headers();
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  if (faddr->alt_mode) {
-    // Normally, we forward expect: 100-continue to backend server,
-    // and let them decide whether responds with 100 Continue or not.
-    // For alternative mode, we have no backend, so just send 100
-    // Continue here to make the client happy.
-    auto expect = req.fs.header(http2::HD_EXPECT);
-    if (expect &&
-        util::strieq(expect->value, StringRef::from_lit("100-continue"))) {
-      auto output = downstream->get_response_buf();
-      constexpr auto res = StringRef::from_lit("HTTP/1.1 100 Continue\r\n\r\n");
-      output->append(res);
-      handler->signal_write();
-    }
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_bodycb(http_parser *htp, const char *data, size_t len) {
-  int rv;
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  auto downstream = upstream->get_downstream();
-  rv = downstream->push_upload_data_chunk(
-      reinterpret_cast<const uint8_t *>(data), len);
-  if (rv != 0) {
-    // Ignore error if response has been completed.  We will end up in
-    // htp_msg_completecb, and request will end gracefully.
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      return 0;
-    }
-
-    return -1;
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-int htp_msg_completecb(http_parser *htp) {
-  int rv;
-  auto upstream = static_cast<HttpsUpstream *>(htp->data);
-  if (LOG_ENABLED(INFO)) {
-    ULOG(INFO, upstream) << "HTTP request completed";
-  }
-  auto handler = upstream->get_client_handler();
-  auto downstream = upstream->get_downstream();
-  downstream->set_request_state(Downstream::MSG_COMPLETE);
-  rv = downstream->end_upload_data();
-  if (rv != 0) {
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      // Here both response and request were completed.  One of the
-      // reason why end_upload_data() failed is when we sent response
-      // in request phase hook.  We only delete and proceed to the
-      // next request handling (if we don't close the connection).  We
-      // first pause parser here just as we normally do, and call
-      // signal_write() to run on_write().
-      http_parser_pause(htp, 1);
-
-      return 0;
-    }
-    return -1;
-  }
-
-  if (handler->get_http2_upgrade_allowed() &&
-      downstream->get_http2_upgrade_request() &&
-      handler->perform_http2_upgrade(upstream) != 0) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, upstream) << "HTTP Upgrade to HTTP/2 failed";
-    }
-  }
-
-  // Stop further processing to complete this request
-  http_parser_pause(htp, 1);
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr http_parser_settings htp_hooks = {
-    htp_msg_begin,       // http_cb      on_message_begin;
-    htp_uricb,           // http_data_cb on_url;
-    nullptr,             // http_data_cb on_status;
-    htp_hdr_keycb,       // http_data_cb on_header_field;
-    htp_hdr_valcb,       // http_data_cb on_header_value;
-    htp_hdrs_completecb, // http_cb      on_headers_complete;
-    htp_bodycb,          // http_data_cb on_body;
-    htp_msg_completecb   // http_cb      on_message_complete;
-};
-} // namespace
-
-// on_read() does not consume all available data in input buffer if
-// one http request is fully received.
-int HttpsUpstream::on_read() {
-  auto rb = handler_->get_rb();
-  auto rlimit = handler_->get_rlimit();
-  auto downstream = get_downstream();
-
-  if (rb->rleft() == 0 || handler_->get_should_close_after_write()) {
-    return 0;
-  }
-
-  // downstream can be nullptr here, because it is initialized in the
-  // callback chain called by http_parser_execute()
-  if (downstream && downstream->get_upgraded()) {
-
-    auto rv = downstream->push_upload_data_chunk(rb->pos(), rb->rleft());
-
-    if (rv != 0) {
-      return -1;
-    }
-
-    rb->reset();
-    rlimit->startw();
-
-    if (downstream->request_buf_full()) {
-      if (LOG_ENABLED(INFO)) {
-        ULOG(INFO, this) << "Downstream request buf is full";
-      }
-      pause_read(SHRPX_NO_BUFFER);
-
-      return 0;
-    }
-
-    return 0;
-  }
-
-  if (downstream) {
-    // To avoid reading next pipelined request
-    switch (downstream->get_request_state()) {
-    case Downstream::INITIAL:
-    case Downstream::HEADER_COMPLETE:
-      break;
-    default:
-      return 0;
-    }
-  }
-
-  // http_parser_execute() does nothing once it entered error state.
-  auto nread = http_parser_execute(&htp_, &htp_hooks,
-                                   reinterpret_cast<const char *>(rb->pos()),
-                                   rb->rleft());
-
-  rb->drain(nread);
-  rlimit->startw();
-
-  // Well, actually header length + some body bytes
-  current_header_length_ += nread;
-
-  // Get downstream again because it may be initialized in http parser
-  // execution
-  downstream = get_downstream();
-
-  auto htperr = HTTP_PARSER_ERRNO(&htp_);
-
-  if (htperr == HPE_PAUSED) {
-    // We may pause parser in htp_msg_completecb when both side are
-    // completed.  Signal write, so that we can run on_write().
-    if (downstream &&
-        downstream->get_request_state() == Downstream::MSG_COMPLETE &&
-        downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      handler_->signal_write();
-    }
-    return 0;
-  }
-
-  if (htperr != HPE_OK) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "HTTP parse failure: "
-                       << "(" << http_errno_name(htperr) << ") "
-                       << http_errno_description(htperr);
-    }
-
-    if (downstream && downstream->get_response_state() != Downstream::INITIAL) {
-      handler_->set_should_close_after_write(true);
-      handler_->signal_write();
-      return 0;
-    }
-
-    unsigned int status_code;
-
-    if (htperr == HPE_INVALID_METHOD) {
-      status_code = 501;
-    } else if (downstream) {
-      status_code = downstream->response().http_status;
-      if (status_code == 0) {
-        if (downstream->get_request_state() == Downstream::CONNECT_FAIL) {
-          status_code = 502;
-        } else if (downstream->get_request_state() ==
-                   Downstream::HTTP1_REQUEST_HEADER_TOO_LARGE) {
-          status_code = 431;
-        } else {
-          status_code = 400;
-        }
-      }
-    } else {
-      status_code = 400;
-    }
-
-    error_reply(status_code);
-
-    handler_->signal_write();
-
-    return 0;
-  }
-
-  // downstream can be NULL here.
-  if (downstream && downstream->request_buf_full()) {
-    if (LOG_ENABLED(INFO)) {
-      ULOG(INFO, this) << "Downstream request buffer is full";
-    }
-
-    pause_read(SHRPX_NO_BUFFER);
-
-    return 0;
-  }
-
-  return 0;
-}
-
-int HttpsUpstream::on_write() {
-  auto downstream = get_downstream();
-  if (!downstream) {
-    return 0;
-  }
-
-  auto output = downstream->get_response_buf();
-  const auto &resp = downstream->response();
-
-  if (output->rleft() > 0) {
-    return 0;
-  }
-
-  // We need to postpone detachment until all data are sent so that
-  // we can notify nghttp2 library all data consumed.
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    if (downstream->can_detach_downstream_connection()) {
-      // Keep-alive
-      downstream->detach_downstream_connection();
-    } else {
-      // Connection close
-      downstream->pop_downstream_connection();
-      // dconn was deleted
-    }
-    // We need this if response ends before request.
-    if (downstream->get_request_state() == Downstream::MSG_COMPLETE) {
-      delete_downstream();
-
-      if (handler_->get_should_close_after_write()) {
-        return 0;
-      }
-
-      auto conn = handler_->get_connection();
-      auto &upstreamconf = get_config()->conn.upstream;
-
-      conn->rt.repeat = upstreamconf.timeout.idle_read;
-
-      handler_->repeat_read_timer();
-
-      return resume_read(SHRPX_NO_BUFFER, nullptr, 0);
-    }
-  }
-
-  return downstream->resume_read(SHRPX_NO_BUFFER, resp.unconsumed_body_length);
-}
-
-int HttpsUpstream::on_event() { return 0; }
-
-ClientHandler *HttpsUpstream::get_client_handler() const { return handler_; }
-
-void HttpsUpstream::pause_read(IOCtrlReason reason) {
-  ioctrl_.pause_read(reason);
-}
-
-int HttpsUpstream::resume_read(IOCtrlReason reason, Downstream *downstream,
-                               size_t consumed) {
-  // downstream could be nullptr
-  if (downstream && downstream->request_buf_full()) {
-    return 0;
-  }
-  if (ioctrl_.resume_read(reason)) {
-    // Process remaining data in input buffer here because these bytes
-    // are not notified by readcb until new data arrive.
-    http_parser_pause(&htp_, 0);
-
-    auto conn = handler_->get_connection();
-    ev_feed_event(conn->loop, &conn->rev, EV_READ);
-    return 0;
-  }
-
-  return 0;
-}
-
-int HttpsUpstream::downstream_read(DownstreamConnection *dconn) {
-  auto downstream = dconn->get_downstream();
-  int rv;
-
-  rv = downstream->on_read();
-
-  if (rv == SHRPX_ERR_EOF) {
-    return downstream_eof(dconn);
-  }
-
-  if (rv == SHRPX_ERR_DCONN_CANCELED) {
-    downstream->pop_downstream_connection();
-    goto end;
-  }
-
-  if (rv < 0) {
-    return downstream_error(dconn, Downstream::EVENT_ERROR);
-  }
-
-  if (downstream->get_response_state() == Downstream::MSG_RESET) {
-    return -1;
-  }
-
-  if (downstream->get_response_state() == Downstream::MSG_BAD_HEADER) {
-    error_reply(502);
-    downstream->pop_downstream_connection();
-    goto end;
-  }
-
-  if (downstream->can_detach_downstream_connection()) {
-    // Keep-alive
-    downstream->detach_downstream_connection();
-  }
-
-end:
-  handler_->signal_write();
-
-  return 0;
-}
-
-int HttpsUpstream::downstream_write(DownstreamConnection *dconn) {
-  int rv;
-  rv = dconn->on_write();
-  if (rv == SHRPX_ERR_NETWORK) {
-    return downstream_error(dconn, Downstream::EVENT_ERROR);
-  }
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  return 0;
-}
-
-int HttpsUpstream::downstream_eof(DownstreamConnection *dconn) {
-  auto downstream = dconn->get_downstream();
-
-  if (LOG_ENABLED(INFO)) {
-    DCLOG(INFO, dconn) << "EOF";
-  }
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    goto end;
-  }
-
-  if (downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
-    // Server may indicate the end of the request by EOF
-    if (LOG_ENABLED(INFO)) {
-      DCLOG(INFO, dconn) << "The end of the response body was indicated by "
-                         << "EOF";
-    }
-    on_downstream_body_complete(downstream);
-    downstream->set_response_state(Downstream::MSG_COMPLETE);
-    downstream->pop_downstream_connection();
-    goto end;
-  }
-
-  if (downstream->get_response_state() == Downstream::INITIAL) {
-    // we did not send any response headers, so we can reply error
-    // message.
-    if (LOG_ENABLED(INFO)) {
-      DCLOG(INFO, dconn) << "Return error reply";
-    }
-    error_reply(502);
-    downstream->pop_downstream_connection();
-    goto end;
-  }
-
-  // Otherwise, we don't know how to recover from this situation. Just
-  // drop connection.
-  return -1;
-end:
-  handler_->signal_write();
-
-  return 0;
-}
-
-int HttpsUpstream::downstream_error(DownstreamConnection *dconn, int events) {
-  auto downstream = dconn->get_downstream();
-  if (LOG_ENABLED(INFO)) {
-    if (events & Downstream::EVENT_ERROR) {
-      DCLOG(INFO, dconn) << "Network error/general error";
-    } else {
-      DCLOG(INFO, dconn) << "Timeout";
-    }
-  }
-  if (downstream->get_response_state() != Downstream::INITIAL) {
-    return -1;
-  }
-
-  unsigned int status;
-  if (events & Downstream::EVENT_TIMEOUT) {
-    status = 504;
-  } else {
-    status = 502;
-  }
-  error_reply(status);
-
-  downstream->pop_downstream_connection();
-
-  handler_->signal_write();
-  return 0;
-}
-
-int HttpsUpstream::send_reply(Downstream *downstream, const uint8_t *body,
-                              size_t bodylen) {
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-  auto &balloc = downstream->get_block_allocator();
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  auto connection_close = false;
-
-  auto worker = handler_->get_worker();
-
-  if (httpconf.max_requests <= num_requests_ ||
-      worker->get_graceful_shutdown()) {
-    resp.fs.add_header_token(StringRef::from_lit("connection"),
-                             StringRef::from_lit("close"), false,
-                             http2::HD_CONNECTION);
-    connection_close = true;
-  } else if (req.http_major <= 0 ||
-             (req.http_major == 1 && req.http_minor == 0)) {
-    connection_close = true;
-  } else {
-    auto c = resp.fs.header(http2::HD_CONNECTION);
-    if (c && util::strieq_l("close", c->value)) {
-      connection_close = true;
-    }
-  }
-
-  if (connection_close) {
-    resp.connection_close = true;
-    handler_->set_should_close_after_write(true);
-  }
-
-  auto output = downstream->get_response_buf();
-
-  output->append("HTTP/1.1 ");
-  output->append(http2::stringify_status(balloc, resp.http_status));
-  output->append(' ');
-  output->append(http2::get_reason_phrase(resp.http_status));
-  output->append("\r\n");
-
-  for (auto &kv : resp.fs.headers()) {
-    if (kv.name.empty() || kv.name[0] == ':') {
-      continue;
-    }
-    http2::capitalize(output, kv.name);
-    output->append(": ");
-    output->append(kv.value);
-    output->append("\r\n");
-  }
-
-  if (!resp.fs.header(http2::HD_SERVER)) {
-    output->append("Server: ");
-    output->append(config->http.server_name);
-    output->append("\r\n");
-  }
-
-  for (auto &p : httpconf.add_response_headers) {
-    output->append(p.name);
-    output->append(": ");
-    output->append(p.value);
-    output->append("\r\n");
-  }
-
-  output->append("\r\n");
-
-  output->append(body, bodylen);
-
-  downstream->response_sent_body_length += bodylen;
-  downstream->set_response_state(Downstream::MSG_COMPLETE);
-
-  return 0;
-}
-
-void HttpsUpstream::error_reply(unsigned int status_code) {
-  auto downstream = get_downstream();
-
-  if (!downstream) {
-    attach_downstream(make_unique<Downstream>(this, handler_->get_mcpool(), 1));
-    downstream = get_downstream();
-  }
-
-  auto &resp = downstream->response();
-  auto &balloc = downstream->get_block_allocator();
-
-  auto html = http::create_error_html(balloc, status_code);
-
-  resp.http_status = status_code;
-  // we are going to close connection for both frontend and backend in
-  // error condition.  This is safest option.
-  resp.connection_close = true;
-  handler_->set_should_close_after_write(true);
-
-  auto output = downstream->get_response_buf();
-
-  output->append("HTTP/1.1 ");
-  output->append(http2::stringify_status(balloc, status_code));
-  output->append(' ');
-  output->append(http2::get_reason_phrase(status_code));
-  output->append("\r\nServer: ");
-  output->append(get_config()->http.server_name);
-  output->append("\r\nContent-Length: ");
-  std::array<uint8_t, NGHTTP2_MAX_UINT64_DIGITS> intbuf;
-  output->append(StringRef{std::begin(intbuf),
-                           util::utos(std::begin(intbuf), html.size())});
-  output->append("\r\nDate: ");
-  auto lgconf = log_config();
-  lgconf->update_tstamp(std::chrono::system_clock::now());
-  output->append(lgconf->tstamp->time_http);
-  output->append("\r\nContent-Type: text/html; "
-                 "charset=UTF-8\r\nConnection: close\r\n\r\n");
-  output->append(html);
-
-  downstream->response_sent_body_length += html.size();
-  downstream->set_response_state(Downstream::MSG_COMPLETE);
-}
-
-void HttpsUpstream::attach_downstream(std::unique_ptr<Downstream> downstream) {
-  assert(!downstream_);
-  downstream_ = std::move(downstream);
-}
-
-void HttpsUpstream::delete_downstream() {
-  if (downstream_ && downstream_->accesslog_ready()) {
-    handler_->write_accesslog(downstream_.get());
-  }
-
-  downstream_.reset();
-}
-
-Downstream *HttpsUpstream::get_downstream() const { return downstream_.get(); }
-
-std::unique_ptr<Downstream> HttpsUpstream::pop_downstream() {
-  return std::unique_ptr<Downstream>(downstream_.release());
-}
-
-namespace {
-void write_altsvc(DefaultMemchunks *buf, BlockAllocator &balloc,
-                  const AltSvc &altsvc) {
-  buf->append(util::percent_encode_token(balloc, altsvc.protocol_id));
-  buf->append("=\"");
-  buf->append(util::quote_string(balloc, altsvc.host));
-  buf->append(':');
-  buf->append(altsvc.service);
-  buf->append('"');
-}
-} // namespace
-
-int HttpsUpstream::on_downstream_header_complete(Downstream *downstream) {
-  if (LOG_ENABLED(INFO)) {
-    if (downstream->get_non_final_response()) {
-      DLOG(INFO, downstream) << "HTTP non-final response header";
-    } else {
-      DLOG(INFO, downstream) << "HTTP response header completed";
-    }
-  }
-
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-  auto &balloc = downstream->get_block_allocator();
-  auto dconn = downstream->get_downstream_connection();
-  assert(dconn);
-
-  if (downstream->get_non_final_response() &&
-      !downstream->supports_non_final_response()) {
-    resp.fs.clear_headers();
-    return 0;
-  }
-
-#ifdef HAVE_MRUBY
-  if (!downstream->get_non_final_response()) {
-    const auto &group = dconn->get_downstream_addr_group();
-    if (group) {
-      const auto &dmruby_ctx = group->mruby_ctx;
-
-      if (dmruby_ctx->run_on_response_proc(downstream) != 0) {
-        error_reply(500);
-        return -1;
-      }
-
-      if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-        return -1;
-      }
-    }
-
-    auto worker = handler_->get_worker();
-    auto mruby_ctx = worker->get_mruby_context();
-
-    if (mruby_ctx->run_on_response_proc(downstream) != 0) {
-      error_reply(500);
-      return -1;
-    }
-
-    if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-      return -1;
-    }
-  }
-#endif // HAVE_MRUBY
-
-  auto connect_method = req.method == HTTP_CONNECT;
-
-  auto buf = downstream->get_response_buf();
-  buf->append("HTTP/");
-  buf->append('0' + req.http_major);
-  buf->append('.');
-  buf->append('0' + req.http_minor);
-  buf->append(' ');
-  buf->append(http2::stringify_status(balloc, resp.http_status));
-  buf->append(' ');
-  buf->append(http2::get_reason_phrase(resp.http_status));
-  buf->append("\r\n");
-
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  if (!config->http2_proxy && !httpconf.no_location_rewrite) {
-    downstream->rewrite_location_response_header(
-        get_client_handler()->get_upstream_scheme());
-  }
-
-  if (downstream->get_non_final_response()) {
-    http2::build_http1_headers_from_headers(buf, resp.fs.headers(),
-                                            http2::HDOP_STRIP_ALL);
-
-    buf->append("\r\n");
-
-    if (LOG_ENABLED(INFO)) {
-      log_response_headers(buf);
-    }
-
-    resp.fs.clear_headers();
-
-    return 0;
-  }
-
-  http2::build_http1_headers_from_headers(
-      buf, resp.fs.headers(), http2::HDOP_STRIP_ALL & ~http2::HDOP_STRIP_VIA);
-
-  auto worker = handler_->get_worker();
-
-  // after graceful shutdown commenced, add connection: close header
-  // field.
-  if (httpconf.max_requests <= num_requests_ ||
-      worker->get_graceful_shutdown()) {
-    resp.connection_close = true;
-  }
-
-  // We check downstream->get_response_connection_close() in case when
-  // the Content-Length is not available.
-  if (!req.connection_close && !resp.connection_close) {
-    if (req.http_major <= 0 || req.http_minor <= 0) {
-      // We add this header for HTTP/1.0 or HTTP/0.9 clients
-      buf->append("Connection: Keep-Alive\r\n");
-    }
-  } else if (!downstream->get_upgraded()) {
-    buf->append("Connection: close\r\n");
-  }
-
-  if (!connect_method && downstream->get_upgraded()) {
-    auto connection = resp.fs.header(http2::HD_CONNECTION);
-    if (connection) {
-      buf->append("Connection: ");
-      buf->append((*connection).value);
-      buf->append("\r\n");
-    }
-
-    auto upgrade = resp.fs.header(http2::HD_UPGRADE);
-    if (upgrade) {
-      buf->append("Upgrade: ");
-      buf->append((*upgrade).value);
-      buf->append("\r\n");
-    }
-  }
-
-  if (!resp.fs.header(http2::HD_ALT_SVC)) {
-    // We won't change or alter alt-svc from backend for now
-    if (!httpconf.altsvcs.empty()) {
-      buf->append("Alt-Svc: ");
-
-      auto &altsvcs = httpconf.altsvcs;
-      write_altsvc(buf, downstream->get_block_allocator(), altsvcs[0]);
-      for (size_t i = 1; i < altsvcs.size(); ++i) {
-        buf->append(", ");
-        write_altsvc(buf, downstream->get_block_allocator(), altsvcs[i]);
-      }
-      buf->append("\r\n");
-    }
-  }
-
-  if (!config->http2_proxy && !httpconf.no_server_rewrite) {
-    buf->append("Server: ");
-    buf->append(httpconf.server_name);
-    buf->append("\r\n");
-  } else {
-    auto server = resp.fs.header(http2::HD_SERVER);
-    if (server) {
-      buf->append("Server: ");
-      buf->append((*server).value);
-      buf->append("\r\n");
-    }
-  }
-
-  if (req.method != HTTP_CONNECT || !downstream->get_upgraded()) {
-    auto affinity_cookie = downstream->get_affinity_cookie_to_send();
-    if (affinity_cookie) {
-      auto &group = dconn->get_downstream_addr_group();
-      auto &shared_addr = group->shared_addr;
-      auto &cookieconf = shared_addr->affinity.cookie;
-      auto secure =
-          http::require_cookie_secure_attribute(cookieconf.secure, req.scheme);
-      auto cookie_str = http::create_affinity_cookie(
-          balloc, cookieconf.name, affinity_cookie, cookieconf.path, secure);
-      buf->append("Set-Cookie: ");
-      buf->append(cookie_str);
-      buf->append("\r\n");
-    }
-  }
-
-  auto via = resp.fs.header(http2::HD_VIA);
-  if (httpconf.no_via) {
-    if (via) {
-      buf->append("Via: ");
-      buf->append((*via).value);
-      buf->append("\r\n");
-    }
-  } else {
-    buf->append("Via: ");
-    if (via) {
-      buf->append((*via).value);
-      buf->append(", ");
-    }
-    std::array<char, 16> viabuf;
-    auto end = http::create_via_header_value(viabuf.data(), resp.http_major,
-                                             resp.http_minor);
-    buf->append(viabuf.data(), end - std::begin(viabuf));
-    buf->append("\r\n");
-  }
-
-  for (auto &p : httpconf.add_response_headers) {
-    buf->append(p.name);
-    buf->append(": ");
-    buf->append(p.value);
-    buf->append("\r\n");
-  }
-
-  buf->append("\r\n");
-
-  if (LOG_ENABLED(INFO)) {
-    log_response_headers(buf);
-  }
-
-  return 0;
-}
-
-int HttpsUpstream::on_downstream_body(Downstream *downstream,
-                                      const uint8_t *data, size_t len,
-                                      bool flush) {
-  if (len == 0) {
-    return 0;
-  }
-  auto output = downstream->get_response_buf();
-  if (downstream->get_chunked_response()) {
-    output->append(util::utox(len));
-    output->append("\r\n");
-  }
-  output->append(data, len);
-
-  downstream->response_sent_body_length += len;
-
-  if (downstream->get_chunked_response()) {
-    output->append("\r\n");
-  }
-  return 0;
-}
-
-int HttpsUpstream::on_downstream_body_complete(Downstream *downstream) {
-  const auto &req = downstream->request();
-  auto &resp = downstream->response();
-
-  if (downstream->get_chunked_response()) {
-    auto output = downstream->get_response_buf();
-    const auto &trailers = resp.fs.trailers();
-    if (trailers.empty()) {
-      output->append("0\r\n\r\n");
-    } else {
-      output->append("0\r\n");
-      http2::build_http1_headers_from_headers(output, trailers,
-                                              http2::HDOP_STRIP_ALL);
-      output->append("\r\n");
-    }
-  }
-  if (LOG_ENABLED(INFO)) {
-    DLOG(INFO, downstream) << "HTTP response completed";
-  }
-
-  if (!downstream->validate_response_recv_body_length()) {
-    resp.connection_close = true;
-  }
-
-  if (req.connection_close || resp.connection_close ||
-      // To avoid to stall upload body
-      downstream->get_request_state() != Downstream::MSG_COMPLETE) {
-    auto handler = get_client_handler();
-    handler->set_should_close_after_write(true);
-  }
-  return 0;
-}
-
-int HttpsUpstream::on_downstream_abort_request(Downstream *downstream,
-                                               unsigned int status_code) {
-  error_reply(status_code);
-  handler_->signal_write();
-  return 0;
-}
-
-int HttpsUpstream::on_downstream_abort_request_with_https_redirect(
-    Downstream *downstream) {
-  redirect_to_https(downstream);
-  handler_->signal_write();
-  return 0;
-}
-
-int HttpsUpstream::redirect_to_https(Downstream *downstream) {
-  auto &req = downstream->request();
-  if (req.method == HTTP_CONNECT || req.scheme != "http" ||
-      req.authority.empty()) {
-    error_reply(400);
-    return 0;
-  }
-
-  auto authority = util::extract_host(req.authority);
-  if (authority.empty()) {
-    error_reply(400);
-    return 0;
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-  auto config = get_config();
-  auto &httpconf = config->http;
-
-  StringRef loc;
-  if (httpconf.redirect_https_port == StringRef::from_lit("443")) {
-    loc = concat_string_ref(balloc, StringRef::from_lit("https://"), authority,
-                            req.path);
-  } else {
-    loc = concat_string_ref(balloc, StringRef::from_lit("https://"), authority,
-                            StringRef::from_lit(":"),
-                            httpconf.redirect_https_port, req.path);
-  }
-
-  auto &resp = downstream->response();
-  resp.http_status = 308;
-  resp.fs.add_header_token(StringRef::from_lit("location"), loc, false,
-                           http2::HD_LOCATION);
-  resp.fs.add_header_token(StringRef::from_lit("connection"),
-                           StringRef::from_lit("close"), false,
-                           http2::HD_CONNECTION);
-
-  return send_reply(downstream, nullptr, 0);
-}
-
-void HttpsUpstream::log_response_headers(DefaultMemchunks *buf) const {
-  std::string nhdrs;
-  for (auto chunk = buf->head; chunk; chunk = chunk->next) {
-    nhdrs.append(chunk->pos, chunk->last);
-  }
-  if (log_config()->errorlog_tty) {
-    nhdrs = http::colorizeHeaders(nhdrs.c_str());
-  }
-  ULOG(INFO, this) << "HTTP response headers\n" << nhdrs;
-}
-
-void HttpsUpstream::on_handler_delete() {
-  if (downstream_ && downstream_->accesslog_ready()) {
-    handler_->write_accesslog(downstream_.get());
-  }
-}
-
-int HttpsUpstream::on_downstream_reset(Downstream *downstream, bool no_retry) {
-  int rv;
-  std::unique_ptr<DownstreamConnection> dconn;
-
-  assert(downstream == downstream_.get());
-
-  downstream_->pop_downstream_connection();
-
-  if (!downstream_->request_submission_ready()) {
-    switch (downstream_->get_response_state()) {
-    case Downstream::MSG_COMPLETE:
-      // We have got all response body already.  Send it off.
-      return 0;
-    case Downstream::INITIAL:
-      if (on_downstream_abort_request(downstream_.get(), 502) != 0) {
-        return -1;
-      }
-      return 0;
-    }
-    // Return error so that caller can delete handler
-    return -1;
-  }
-
-  downstream_->add_retry();
-
-  rv = 0;
-
-  if (no_retry || downstream_->no_more_retry()) {
-    goto fail;
-  }
-
-  dconn = handler_->get_downstream_connection(rv, downstream_.get());
-  if (!dconn) {
-    goto fail;
-  }
-
-  rv = downstream_->attach_downstream_connection(std::move(dconn));
-  if (rv != 0) {
-    goto fail;
-  }
-
-  rv = downstream_->push_request_headers();
-  if (rv != 0) {
-    goto fail;
-  }
-
-  return 0;
-
-fail:
-  if (rv == SHRPX_ERR_TLS_REQUIRED) {
-    rv = on_downstream_abort_request_with_https_redirect(downstream);
-  } else {
-    rv = on_downstream_abort_request(downstream_.get(), 502);
-  }
-  if (rv != 0) {
-    return -1;
-  }
-  downstream_->pop_downstream_connection();
-
-  return 0;
-}
-
-int HttpsUpstream::initiate_push(Downstream *downstream, const StringRef &uri) {
-  return 0;
-}
-
-int HttpsUpstream::response_riovec(struct iovec *iov, int iovcnt) const {
-  if (!downstream_) {
-    return 0;
-  }
-
-  auto buf = downstream_->get_response_buf();
-
-  return buf->riovec(iov, iovcnt);
-}
-
-void HttpsUpstream::response_drain(size_t n) {
-  if (!downstream_) {
-    return;
-  }
-
-  auto buf = downstream_->get_response_buf();
-
-  buf->drain(n);
-}
-
-bool HttpsUpstream::response_empty() const {
-  if (!downstream_) {
-    return true;
-  }
-
-  auto buf = downstream_->get_response_buf();
-
-  return buf->rleft() == 0;
-}
-
-Downstream *
-HttpsUpstream::on_downstream_push_promise(Downstream *downstream,
-                                          int32_t promised_stream_id) {
-  return nullptr;
-}
-
-int HttpsUpstream::on_downstream_push_promise_complete(
-    Downstream *downstream, Downstream *promised_downstream) {
-  return -1;
-}
-
-bool HttpsUpstream::push_enabled() const { return false; }
-
-void HttpsUpstream::cancel_premature_downstream(
-    Downstream *promised_downstream) {}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_https_upstream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTPS_UPSTREAM_H
-#define SHRPX_HTTPS_UPSTREAM_H
-
-#include "shrpx.h"
-
-#include <cinttypes>
-#include <memory>
-
-#include "http-parser/http_parser.h"
-
-#include "shrpx_upstream.h"
-#include "memchunk.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class ClientHandler;
-
-class HttpsUpstream : public Upstream {
-public:
-  HttpsUpstream(ClientHandler *handler);
-  virtual ~HttpsUpstream();
-  virtual int on_read();
-  virtual int on_write();
-  virtual int on_event();
-  virtual int on_downstream_abort_request(Downstream *downstream,
-                                          unsigned int status_code);
-  virtual int
-  on_downstream_abort_request_with_https_redirect(Downstream *downstream);
-  virtual ClientHandler *get_client_handler() const;
-
-  virtual int downstream_read(DownstreamConnection *dconn);
-  virtual int downstream_write(DownstreamConnection *dconn);
-  virtual int downstream_eof(DownstreamConnection *dconn);
-  virtual int downstream_error(DownstreamConnection *dconn, int events);
-
-  void attach_downstream(std::unique_ptr<Downstream> downstream);
-  void delete_downstream();
-  Downstream *get_downstream() const;
-  std::unique_ptr<Downstream> pop_downstream();
-  void error_reply(unsigned int status_code);
-
-  virtual void pause_read(IOCtrlReason reason);
-  virtual int resume_read(IOCtrlReason reason, Downstream *downstream,
-                          size_t consumed);
-
-  virtual int on_downstream_header_complete(Downstream *downstream);
-  virtual int on_downstream_body(Downstream *downstream, const uint8_t *data,
-                                 size_t len, bool flush);
-  virtual int on_downstream_body_complete(Downstream *downstream);
-
-  virtual void on_handler_delete();
-  virtual int on_downstream_reset(Downstream *downstream, bool no_retry);
-  virtual int send_reply(Downstream *downstream, const uint8_t *body,
-                         size_t bodylen);
-  virtual int initiate_push(Downstream *downstream, const StringRef &uri);
-  virtual int response_riovec(struct iovec *iov, int iovcnt) const;
-  virtual void response_drain(size_t n);
-  virtual bool response_empty() const;
-
-  virtual Downstream *on_downstream_push_promise(Downstream *downstream,
-                                                 int32_t promised_stream_id);
-  virtual int
-  on_downstream_push_promise_complete(Downstream *downstream,
-                                      Downstream *promised_downstream);
-  virtual bool push_enabled() const;
-  virtual void cancel_premature_downstream(Downstream *promised_downstream);
-
-  void reset_current_header_length();
-  void log_response_headers(DefaultMemchunks *buf) const;
-  int redirect_to_https(Downstream *downstream);
-
-  // Called when new request has started.
-  void on_start_request();
-
-private:
-  ClientHandler *handler_;
-  http_parser htp_;
-  size_t current_header_length_;
-  std::unique_ptr<Downstream> downstream_;
-  IOControl ioctrl_;
-  // The number of requests seen so far.
-  size_t num_requests_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTPS_UPSTREAM_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_http_test.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include <cstdlib>
-
-#include <CUnit/CUnit.h>
-
-#include "shrpx_http.h"
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-void test_shrpx_http_create_forwarded(void) {
-  BlockAllocator balloc(1024, 1024);
-
-  CU_ASSERT("by=\"example.com:3000\";for=\"[::1]\";host=\"www.example.com\";"
-            "proto=https" ==
-            http::create_forwarded(balloc,
-                                   FORWARDED_BY | FORWARDED_FOR |
-                                       FORWARDED_HOST | FORWARDED_PROTO,
-                                   StringRef::from_lit("example.com:3000"),
-                                   StringRef::from_lit("[::1]"),
-                                   StringRef::from_lit("www.example.com"),
-                                   StringRef::from_lit("https")));
-
-  CU_ASSERT("for=192.168.0.1" ==
-            http::create_forwarded(
-                balloc, FORWARDED_FOR, StringRef::from_lit("alpha"),
-                StringRef::from_lit("192.168.0.1"),
-                StringRef::from_lit("bravo"), StringRef::from_lit("charlie")));
-
-  CU_ASSERT("by=_hidden;for=\"[::1]\"" ==
-            http::create_forwarded(
-                balloc, FORWARDED_BY | FORWARDED_FOR,
-                StringRef::from_lit("_hidden"), StringRef::from_lit("[::1]"),
-                StringRef::from_lit(""), StringRef::from_lit("")));
-
-  CU_ASSERT("by=\"[::1]\";for=_hidden" ==
-            http::create_forwarded(
-                balloc, FORWARDED_BY | FORWARDED_FOR,
-                StringRef::from_lit("[::1]"), StringRef::from_lit("_hidden"),
-                StringRef::from_lit(""), StringRef::from_lit("")));
-
-  CU_ASSERT("" ==
-            http::create_forwarded(
-                balloc,
-                FORWARDED_BY | FORWARDED_FOR | FORWARDED_HOST | FORWARDED_PROTO,
-                StringRef::from_lit(""), StringRef::from_lit(""),
-                StringRef::from_lit(""), StringRef::from_lit("")));
-}
-
-void test_shrpx_http_create_via_header_value(void) {
-  std::array<char, 16> buf;
-
-  auto end = http::create_via_header_value(std::begin(buf), 1, 1);
-
-  CU_ASSERT(("1.1 nghttpx" == StringRef{std::begin(buf), end}));
-
-  std::fill(std::begin(buf), std::end(buf), '\0');
-
-  end = http::create_via_header_value(std::begin(buf), 2, 0);
-
-  CU_ASSERT(("2 nghttpx" == StringRef{std::begin(buf), end}));
-}
-
-void test_shrpx_http_create_affinity_cookie(void) {
-  BlockAllocator balloc(1024, 1024);
-  StringRef c;
-
-  c = http::create_affinity_cookie(balloc, StringRef::from_lit("cookie-val"),
-                                   0xf1e2d3c4u, StringRef{}, false);
-
-  CU_ASSERT("cookie-val=f1e2d3c4" == c);
-
-  c = http::create_affinity_cookie(balloc, StringRef::from_lit("alpha"),
-                                   0x00000000u, StringRef{}, true);
-
-  CU_ASSERT("alpha=00000000; Secure" == c);
-
-  c = http::create_affinity_cookie(balloc, StringRef::from_lit("bravo"),
-                                   0x01111111u, StringRef::from_lit("bar"),
-                                   false);
-
-  CU_ASSERT("bravo=01111111; Path=bar" == c);
-
-  c = http::create_affinity_cookie(balloc, StringRef::from_lit("charlie"),
-                                   0x01111111u, StringRef::from_lit("bar"),
-                                   true);
-
-  CU_ASSERT("charlie=01111111; Path=bar; Secure" == c);
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_http_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_HTTP_TEST_H
-#define SHRPX_HTTP_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_shrpx_http_create_forwarded(void);
-void test_shrpx_http_create_via_header_value(void);
-void test_shrpx_http_create_affinity_cookie(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_HTTP_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_io_control.h"
-
-#include <algorithm>
-
-#include "shrpx_rate_limit.h"
-#include "util.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-IOControl::IOControl(RateLimit *lim) : lim_(lim), rdbits_(0) {}
-
-IOControl::~IOControl() {}
-
-void IOControl::pause_read(IOCtrlReason reason) {
-  rdbits_ |= reason;
-  if (lim_) {
-    lim_->stopw();
-  }
-}
-
-bool IOControl::resume_read(IOCtrlReason reason) {
-  rdbits_ &= ~reason;
-  if (rdbits_ == 0) {
-    if (lim_) {
-      lim_->startw();
-    }
-    return true;
-  }
-
-  return false;
-}
-
-void IOControl::force_resume_read() {
-  rdbits_ = 0;
-  if (lim_) {
-    lim_->startw();
-  }
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_io_control.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_IO_CONTROL_H
-#define SHRPX_IO_CONTROL_H
-
-#include "shrpx.h"
-
-#include <cinttypes>
-#include <vector>
-
-#include <ev.h>
-
-#include "shrpx_rate_limit.h"
-
-namespace shrpx {
-
-enum IOCtrlReason { SHRPX_NO_BUFFER = 1 << 0, SHRPX_MSG_BLOCK = 1 << 1 };
-
-class IOControl {
-public:
-  IOControl(RateLimit *lim);
-  ~IOControl();
-  void pause_read(IOCtrlReason reason);
-  // Returns true if read operation is enabled after this call
-  bool resume_read(IOCtrlReason reason);
-  // Clear all pause flags and enable read
-  void force_resume_read();
-
-private:
-  RateLimit *lim_;
-  uint32_t rdbits_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_IO_CONTROL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,800 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_live_check.h"
-#include "shrpx_worker.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_tls.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-namespace {
-constexpr size_t MAX_BUFFER_SIZE = 4_k;
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto conn = static_cast<Connection *>(w->data);
-  auto live_check = static_cast<LiveCheck *>(conn->data);
-
-  rv = live_check->do_read();
-  if (rv != 0) {
-    live_check->on_failure();
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  int rv;
-  auto conn = static_cast<Connection *>(w->data);
-  auto live_check = static_cast<LiveCheck *>(conn->data);
-
-  rv = live_check->do_write();
-  if (rv != 0) {
-    live_check->on_failure();
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto live_check = static_cast<LiveCheck *>(conn->data);
-
-  if (w == &conn->rt && !conn->expired_rt()) {
-    return;
-  }
-
-  live_check->on_failure();
-}
-} // namespace
-
-namespace {
-void backoff_timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  int rv;
-  auto live_check = static_cast<LiveCheck *>(w->data);
-
-  rv = live_check->initiate_connection();
-  if (rv != 0) {
-    live_check->on_failure();
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto live_check = static_cast<LiveCheck *>(w->data);
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "SETTINGS timeout";
-  }
-
-  live_check->on_failure();
-}
-} // namespace
-
-LiveCheck::LiveCheck(struct ev_loop *loop, SSL_CTX *ssl_ctx, Worker *worker,
-                     DownstreamAddr *addr, std::mt19937 &gen)
-    : conn_(loop, -1, nullptr, worker->get_mcpool(),
-            worker->get_downstream_config()->timeout.write,
-            worker->get_downstream_config()->timeout.read, {}, {}, writecb,
-            readcb, timeoutcb, this, get_config()->tls.dyn_rec.warmup_threshold,
-            get_config()->tls.dyn_rec.idle_timeout, PROTO_NONE),
-      wb_(worker->get_mcpool()),
-      gen_(gen),
-      read_(&LiveCheck::noop),
-      write_(&LiveCheck::noop),
-      worker_(worker),
-      ssl_ctx_(ssl_ctx),
-      addr_(addr),
-      session_(nullptr),
-      raddr_(nullptr),
-      success_count_(0),
-      fail_count_(0),
-      settings_ack_received_(false),
-      session_closing_(false) {
-  ev_timer_init(&backoff_timer_, backoff_timeoutcb, 0., 0.);
-  backoff_timer_.data = this;
-
-  // SETTINGS ACK must be received in a short timeout.  Otherwise, we
-  // assume that connection is broken.
-  ev_timer_init(&settings_timer_, settings_timeout_cb, 0., 0.);
-  settings_timer_.data = this;
-}
-
-LiveCheck::~LiveCheck() {
-  disconnect();
-
-  ev_timer_stop(conn_.loop, &backoff_timer_);
-}
-
-void LiveCheck::disconnect() {
-  if (dns_query_) {
-    auto dns_tracker = worker_->get_dns_tracker();
-
-    dns_tracker->cancel(dns_query_.get());
-  }
-
-  dns_query_.reset();
-  // We can reuse resolved_addr_
-  raddr_ = nullptr;
-
-  conn_.rlimit.stopw();
-  conn_.wlimit.stopw();
-
-  ev_timer_stop(conn_.loop, &settings_timer_);
-
-  read_ = write_ = &LiveCheck::noop;
-
-  conn_.disconnect();
-
-  nghttp2_session_del(session_);
-  session_ = nullptr;
-
-  settings_ack_received_ = false;
-  session_closing_ = false;
-
-  wb_.reset();
-}
-
-// Use the similar backoff algorithm described in
-// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md
-namespace {
-constexpr size_t MAX_BACKOFF_EXP = 10;
-constexpr auto MULTIPLIER = 1.6;
-constexpr auto JITTER = 0.2;
-} // namespace
-
-void LiveCheck::schedule() {
-  auto base_backoff =
-      util::int_pow(MULTIPLIER, std::min(fail_count_, MAX_BACKOFF_EXP));
-  auto dist = std::uniform_real_distribution<>(-JITTER * base_backoff,
-                                               JITTER * base_backoff);
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  auto backoff =
-      std::min(downstreamconf.timeout.max_backoff, base_backoff + dist(gen_));
-
-  ev_timer_set(&backoff_timer_, backoff, 0.);
-  ev_timer_start(conn_.loop, &backoff_timer_);
-}
-
-int LiveCheck::do_read() { return read_(*this); }
-
-int LiveCheck::do_write() { return write_(*this); }
-
-int LiveCheck::initiate_connection() {
-  int rv;
-
-  auto worker_blocker = worker_->get_connect_blocker();
-  if (worker_blocker->blocked()) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Worker wide backend connection was blocked temporarily";
-    }
-    return -1;
-  }
-
-  if (!dns_query_ && addr_->tls) {
-    assert(ssl_ctx_);
-
-    auto ssl = tls::create_ssl(ssl_ctx_);
-    if (!ssl) {
-      return -1;
-    }
-
-    switch (addr_->proto) {
-    case PROTO_HTTP1:
-      tls::setup_downstream_http1_alpn(ssl);
-      break;
-    case PROTO_HTTP2:
-      tls::setup_downstream_http2_alpn(ssl);
-      break;
-    default:
-      assert(0);
-    }
-
-    conn_.set_ssl(ssl);
-    conn_.tls.client_session_cache = &addr_->tls_session_cache;
-  }
-
-  if (addr_->dns) {
-    if (!dns_query_) {
-      auto dns_query = make_unique<DNSQuery>(
-          addr_->host, [this](int status, const Address *result) {
-            int rv;
-
-            if (status == DNS_STATUS_OK) {
-              *this->resolved_addr_ = *result;
-            }
-            rv = this->initiate_connection();
-            if (rv != 0) {
-              this->on_failure();
-            }
-          });
-      auto dns_tracker = worker_->get_dns_tracker();
-
-      if (!resolved_addr_) {
-        resolved_addr_ = make_unique<Address>();
-      }
-
-      rv = dns_tracker->resolve(resolved_addr_.get(), dns_query.get());
-      switch (rv) {
-      case DNS_STATUS_ERROR:
-        return -1;
-      case DNS_STATUS_RUNNING:
-        dns_query_ = std::move(dns_query);
-        return 0;
-      case DNS_STATUS_OK:
-        break;
-      default:
-        assert(0);
-      }
-    } else {
-      switch (dns_query_->status) {
-      case DNS_STATUS_ERROR:
-        dns_query_.reset();
-        return -1;
-      case DNS_STATUS_OK:
-        dns_query_.reset();
-        break;
-      default:
-        assert(0);
-      }
-    }
-
-    util::set_port(*resolved_addr_, addr_->port);
-    raddr_ = resolved_addr_.get();
-  } else {
-    raddr_ = &addr_->addr;
-  }
-
-  conn_.fd = util::create_nonblock_socket(raddr_->su.storage.ss_family);
-
-  if (conn_.fd == -1) {
-    auto error = errno;
-    LOG(WARN) << "socket() failed; addr=" << util::to_numeric_addr(raddr_)
-              << ", errno=" << error;
-    return -1;
-  }
-
-  rv = connect(conn_.fd, &raddr_->su.sa, raddr_->len);
-  if (rv != 0 && errno != EINPROGRESS) {
-    auto error = errno;
-    LOG(WARN) << "connect() failed; addr=" << util::to_numeric_addr(raddr_)
-              << ", errno=" << error;
-
-    close(conn_.fd);
-    conn_.fd = -1;
-
-    return -1;
-  }
-
-  if (addr_->tls) {
-    auto sni_name =
-        addr_->sni.empty() ? StringRef{addr_->host} : StringRef{addr_->sni};
-    if (!util::numeric_host(sni_name.c_str())) {
-      SSL_set_tlsext_host_name(conn_.tls.ssl, sni_name.c_str());
-    }
-
-    auto session = tls::reuse_tls_session(addr_->tls_session_cache);
-    if (session) {
-      SSL_set_session(conn_.tls.ssl, session);
-      SSL_SESSION_free(session);
-    }
-
-    conn_.prepare_client_handshake();
-  }
-
-  write_ = &LiveCheck::connected;
-
-  ev_io_set(&conn_.wev, conn_.fd, EV_WRITE);
-  ev_io_set(&conn_.rev, conn_.fd, EV_READ);
-
-  conn_.wlimit.startw();
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  conn_.wt.repeat = downstreamconf.timeout.connect;
-  ev_timer_again(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int LiveCheck::connected() {
-  auto sock_error = util::get_socket_error(conn_.fd);
-  if (sock_error != 0) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Backend connect failed; addr="
-                << util::to_numeric_addr(raddr_) << ": errno=" << sock_error;
-    }
-
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Connection established";
-  }
-
-  auto &downstreamconf = *get_config()->conn.downstream;
-
-  // Reset timeout for write.  Previously, we set timeout for connect.
-  conn_.wt.repeat = downstreamconf.timeout.write;
-  ev_timer_again(conn_.loop, &conn_.wt);
-
-  conn_.rlimit.startw();
-  conn_.again_rt();
-
-  if (conn_.tls.ssl) {
-    read_ = &LiveCheck::tls_handshake;
-    write_ = &LiveCheck::tls_handshake;
-
-    return do_write();
-  }
-
-  if (addr_->proto == PROTO_HTTP2) {
-    // For HTTP/2, we try to read SETTINGS ACK from server to make
-    // sure it is really alive, and serving HTTP/2.
-    read_ = &LiveCheck::read_clear;
-    write_ = &LiveCheck::write_clear;
-
-    if (connection_made() != 0) {
-      return -1;
-    }
-
-    return 0;
-  }
-
-  on_success();
-
-  return 0;
-}
-
-int LiveCheck::tls_handshake() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  ERR_clear_error();
-
-  auto rv = conn_.tls_handshake();
-
-  if (rv == SHRPX_ERR_INPROGRESS) {
-    return 0;
-  }
-
-  if (rv < 0) {
-    return rv;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "SSL/TLS handshake completed";
-  }
-
-  if (!get_config()->tls.insecure &&
-      tls::check_cert(conn_.tls.ssl, addr_, raddr_) != 0) {
-    return -1;
-  }
-
-  // Check negotiated ALPN
-
-  const unsigned char *next_proto = nullptr;
-  unsigned int next_proto_len = 0;
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_get0_next_proto_negotiated(conn_.tls.ssl, &next_proto, &next_proto_len);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (next_proto == nullptr) {
-    SSL_get0_alpn_selected(conn_.tls.ssl, &next_proto, &next_proto_len);
-  }
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  auto proto = StringRef{next_proto, next_proto_len};
-
-  switch (addr_->proto) {
-  case PROTO_HTTP1:
-    if (proto.empty() || proto == StringRef::from_lit("http/1.1")) {
-      break;
-    }
-    return -1;
-  case PROTO_HTTP2:
-    if (util::check_h2_is_selected(proto)) {
-      // For HTTP/2, we try to read SETTINGS ACK from server to make
-      // sure it is really alive, and serving HTTP/2.
-      read_ = &LiveCheck::read_tls;
-      write_ = &LiveCheck::write_tls;
-
-      if (connection_made() != 0) {
-        return -1;
-      }
-
-      return 0;
-    }
-    return -1;
-  default:
-    break;
-  }
-
-  on_success();
-
-  return 0;
-}
-
-int LiveCheck::read_tls() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<uint8_t, 4_k> buf;
-
-  ERR_clear_error();
-
-  for (;;) {
-    auto nread = conn_.read_tls(buf.data(), buf.size());
-
-    if (nread == 0) {
-      return 0;
-    }
-
-    if (nread < 0) {
-      return nread;
-    }
-
-    if (on_read(buf.data(), nread) != 0) {
-      return -1;
-    }
-  }
-}
-
-int LiveCheck::write_tls() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  ERR_clear_error();
-
-  struct iovec iov;
-
-  for (;;) {
-    if (wb_.rleft() > 0) {
-      auto iovcnt = wb_.riovec(&iov, 1);
-      if (iovcnt != 1) {
-        assert(0);
-        return -1;
-      }
-      auto nwrite = conn_.write_tls(iov.iov_base, iov.iov_len);
-
-      if (nwrite == 0) {
-        return 0;
-      }
-
-      if (nwrite < 0) {
-        return nwrite;
-      }
-
-      wb_.drain(nwrite);
-
-      continue;
-    }
-
-    if (on_write() != 0) {
-      return -1;
-    }
-
-    if (wb_.rleft() == 0) {
-      conn_.start_tls_write_idle();
-      break;
-    }
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  if (settings_ack_received_) {
-    on_success();
-  }
-
-  return 0;
-}
-
-int LiveCheck::read_clear() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<uint8_t, 4_k> buf;
-
-  for (;;) {
-    auto nread = conn_.read_clear(buf.data(), buf.size());
-
-    if (nread == 0) {
-      return 0;
-    }
-
-    if (nread < 0) {
-      return nread;
-    }
-
-    if (on_read(buf.data(), nread) != 0) {
-      return -1;
-    }
-  }
-}
-
-int LiveCheck::write_clear() {
-  conn_.last_read = ev_now(conn_.loop);
-
-  struct iovec iov;
-
-  for (;;) {
-    if (wb_.rleft() > 0) {
-      auto iovcnt = wb_.riovec(&iov, 1);
-      if (iovcnt != 1) {
-        assert(0);
-        return -1;
-      }
-      auto nwrite = conn_.write_clear(iov.iov_base, iov.iov_len);
-
-      if (nwrite == 0) {
-        return 0;
-      }
-
-      if (nwrite < 0) {
-        return nwrite;
-      }
-
-      wb_.drain(nwrite);
-
-      continue;
-    }
-
-    if (on_write() != 0) {
-      return -1;
-    }
-
-    if (wb_.rleft() == 0) {
-      break;
-    }
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  if (settings_ack_received_) {
-    on_success();
-  }
-
-  return 0;
-}
-
-int LiveCheck::on_read(const uint8_t *data, size_t len) {
-  ssize_t rv;
-
-  rv = nghttp2_session_mem_recv(session_, data, len);
-  if (rv < 0) {
-    LOG(ERROR) << "nghttp2_session_mem_recv() returned error: "
-               << nghttp2_strerror(rv);
-    return -1;
-  }
-
-  if (settings_ack_received_ && !session_closing_) {
-    session_closing_ = true;
-    rv = nghttp2_session_terminate_session(session_, NGHTTP2_NO_ERROR);
-    if (rv != 0) {
-      return -1;
-    }
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "No more read/write for this session";
-    }
-
-    // If we have SETTINGS ACK already, we treat this success.
-    if (settings_ack_received_) {
-      return 0;
-    }
-
-    return -1;
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-int LiveCheck::on_write() {
-  for (;;) {
-    const uint8_t *data;
-    auto datalen = nghttp2_session_mem_send(session_, &data);
-
-    if (datalen < 0) {
-      LOG(ERROR) << "nghttp2_session_mem_send() returned error: "
-                 << nghttp2_strerror(datalen);
-      return -1;
-    }
-    if (datalen == 0) {
-      break;
-    }
-    wb_.append(data, datalen);
-
-    if (wb_.rleft() >= MAX_BUFFER_SIZE) {
-      break;
-    }
-  }
-
-  if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "No more read/write for this session";
-    }
-
-    if (settings_ack_received_) {
-      return 0;
-    }
-
-    return -1;
-  }
-
-  return 0;
-}
-
-void LiveCheck::on_failure() {
-  ++fail_count_;
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Liveness check for " << addr_->host << ":" << addr_->port
-              << " failed " << fail_count_ << " time(s) in a row";
-  }
-
-  disconnect();
-
-  schedule();
-}
-
-void LiveCheck::on_success() {
-  ++success_count_;
-  fail_count_ = 0;
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Liveness check for " << addr_->host << ":" << addr_->port
-              << " succeeded " << success_count_ << " time(s) in a row";
-  }
-
-  if (success_count_ < addr_->rise) {
-    disconnect();
-
-    schedule();
-
-    return;
-  }
-
-  LOG(NOTICE) << util::to_numeric_addr(&addr_->addr) << " is considered online";
-
-  addr_->connect_blocker->online();
-
-  success_count_ = 0;
-  fail_count_ = 0;
-
-  disconnect();
-}
-
-int LiveCheck::noop() { return 0; }
-
-void LiveCheck::start_settings_timer() {
-  auto &downstreamconf = get_config()->http2.downstream;
-
-  ev_timer_set(&settings_timer_, downstreamconf.timeout.settings, 0.);
-  ev_timer_start(conn_.loop, &settings_timer_);
-}
-
-void LiveCheck::stop_settings_timer() {
-  ev_timer_stop(conn_.loop, &settings_timer_);
-}
-
-void LiveCheck::settings_ack_received() { settings_ack_received_ = true; }
-
-namespace {
-int on_frame_send_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto live_check = static_cast<LiveCheck *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_SETTINGS ||
-      (frame->hd.flags & NGHTTP2_FLAG_ACK)) {
-    return 0;
-  }
-
-  live_check->start_settings_timer();
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int on_frame_recv_callback(nghttp2_session *session, const nghttp2_frame *frame,
-                           void *user_data) {
-  auto live_check = static_cast<LiveCheck *>(user_data);
-
-  if (frame->hd.type != NGHTTP2_SETTINGS ||
-      (frame->hd.flags & NGHTTP2_FLAG_ACK) == 0) {
-    return 0;
-  }
-
-  live_check->stop_settings_timer();
-  live_check->settings_ack_received();
-
-  return 0;
-}
-} // namespace
-
-int LiveCheck::connection_made() {
-  int rv;
-
-  nghttp2_session_callbacks *callbacks;
-  rv = nghttp2_session_callbacks_new(&callbacks);
-  if (rv != 0) {
-    return -1;
-  }
-
-  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
-                                                       on_frame_send_callback);
-  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
-                                                       on_frame_recv_callback);
-
-  rv = nghttp2_session_client_new(&session_, callbacks, this);
-
-  nghttp2_session_callbacks_del(callbacks);
-
-  if (rv != 0) {
-    return -1;
-  }
-
-  rv = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, nullptr, 0);
-  if (rv != 0) {
-    return -1;
-  }
-
-  auto must_terminate =
-      addr_->tls && !nghttp2::tls::check_http2_requirement(conn_.tls.ssl);
-
-  if (must_terminate) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "TLSv1.2 was not negotiated. HTTP/2 must not be negotiated.";
-    }
-
-    rv = nghttp2_session_terminate_session(session_,
-                                           NGHTTP2_INADEQUATE_SECURITY);
-    if (rv != 0) {
-      return -1;
-    }
-  }
-
-  signal_write();
-
-  return 0;
-}
-
-void LiveCheck::signal_write() { conn_.wlimit.startw(); }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_live_check.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_LIVE_CHECK_H
-#define SHRPX_LIVE_CHECK_H
-
-#include "shrpx.h"
-
-#include <functional>
-#include <random>
-
-#include <openssl/ssl.h>
-
-#include <ev.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_connection.h"
-
-namespace shrpx {
-
-class Worker;
-struct DownstreamAddr;
-struct DNSQuery;
-
-class LiveCheck {
-public:
-  LiveCheck(struct ev_loop *loop, SSL_CTX *ssl_ctx, Worker *worker,
-            DownstreamAddr *addr, std::mt19937 &gen);
-  ~LiveCheck();
-
-  void disconnect();
-
-  void on_success();
-  void on_failure();
-
-  int initiate_connection();
-
-  // Schedules next connection attempt
-  void schedule();
-
-  // Low level I/O operation callback; they are called from do_read()
-  // or do_write().
-  int noop();
-  int connected();
-  int tls_handshake();
-  int read_tls();
-  int write_tls();
-  int read_clear();
-  int write_clear();
-
-  int do_read();
-  int do_write();
-
-  // These functions are used to feed / extract data to
-  // nghttp2_session object.
-  int on_read(const uint8_t *data, size_t len);
-  int on_write();
-
-  // Call this function when HTTP/2 connection was established.  We
-  // don't call this function for HTTP/1 at the moment.
-  int connection_made();
-
-  void start_settings_timer();
-  void stop_settings_timer();
-
-  // Call this function when SETTINGS ACK was received from server.
-  void settings_ack_received();
-
-  void signal_write();
-
-private:
-  Connection conn_;
-  DefaultMemchunks wb_;
-  std::mt19937 &gen_;
-  ev_timer backoff_timer_;
-  ev_timer settings_timer_;
-  std::function<int(LiveCheck &)> read_, write_;
-  Worker *worker_;
-  // nullptr if no TLS is configured
-  SSL_CTX *ssl_ctx_;
-  // Address of remote endpoint
-  DownstreamAddr *addr_;
-  nghttp2_session *session_;
-  // Actual remote address used to contact backend.  This is initially
-  // nullptr, and may point to either &addr_->addr, or
-  // resolved_addr_.get().
-  const Address *raddr_;
-  // Resolved IP address if dns parameter is used
-  std::unique_ptr<Address> resolved_addr_;
-  std::unique_ptr<DNSQuery> dns_query_;
-  // The number of successful connect attempt in a row.
-  size_t success_count_;
-  // The number of unsuccessful connect attempt in a row.
-  size_t fail_count_;
-  // true when SETTINGS ACK has been received from server.
-  bool settings_ack_received_;
-  // true when GOAWAY has been queued.
-  bool session_closing_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_LIVE_CHECK_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,771 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_log.h"
-
-#ifdef HAVE_SYSLOG_H
-#  include <syslog.h>
-#endif // HAVE_SYSLOG_H
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#ifdef HAVE_INTTYPES_H
-#  include <inttypes.h>
-#endif // HAVE_INTTYPES_H
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#include <sys/wait.h>
-
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <iostream>
-#include <iomanip>
-
-#include "shrpx_config.h"
-#include "shrpx_downstream.h"
-#include "shrpx_worker.h"
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-constexpr StringRef SEVERITY_STR[] = {
-    StringRef::from_lit("INFO"), StringRef::from_lit("NOTICE"),
-    StringRef::from_lit("WARN"), StringRef::from_lit("ERROR"),
-    StringRef::from_lit("FATAL")};
-} // namespace
-
-namespace {
-constexpr const char *SEVERITY_COLOR[] = {
-    "\033[1;32m", // INFO
-    "\033[1;36m", // NOTICE
-    "\033[1;33m", // WARN
-    "\033[1;31m", // ERROR
-    "\033[1;35m", // FATAL
-};
-} // namespace
-
-int Log::severity_thres_ = NOTICE;
-
-void Log::set_severity_level(int severity) { severity_thres_ = severity; }
-
-int Log::set_severity_level_by_name(const StringRef &name) {
-  for (size_t i = 0, max = array_size(SEVERITY_STR); i < max; ++i) {
-    if (name == SEVERITY_STR[i]) {
-      severity_thres_ = i;
-      return 0;
-    }
-  }
-  return -1;
-}
-
-int severity_to_syslog_level(int severity) {
-  switch (severity) {
-  case (INFO):
-    return LOG_INFO;
-  case (NOTICE):
-    return LOG_NOTICE;
-  case (WARN):
-    return LOG_WARNING;
-  case (ERROR):
-    return LOG_ERR;
-  case (FATAL):
-    return LOG_CRIT;
-  default:
-    return -1;
-  }
-}
-
-Log::Log(int severity, const char *filename, int linenum)
-    : filename_(filename), severity_(severity), linenum_(linenum) {}
-
-Log::~Log() {
-  int rv;
-  auto config = get_config();
-
-  if (!config) {
-    return;
-  }
-
-  auto lgconf = log_config();
-
-  auto &errorconf = config->logging.error;
-
-  if (!log_enabled(severity_) ||
-      (lgconf->errorlog_fd == -1 && !errorconf.syslog)) {
-    return;
-  }
-
-  if (errorconf.syslog) {
-    if (severity_ == NOTICE) {
-      syslog(severity_to_syslog_level(severity_), "[%s] %s",
-             SEVERITY_STR[severity_].c_str(), stream_.str().c_str());
-    } else {
-      syslog(severity_to_syslog_level(severity_), "[%s] %s (%s:%d)",
-             SEVERITY_STR[severity_].c_str(), stream_.str().c_str(), filename_,
-             linenum_);
-    }
-
-    return;
-  }
-
-  char buf[4_k];
-  auto tty = lgconf->errorlog_tty;
-
-  lgconf->update_tstamp_millis(std::chrono::system_clock::now());
-
-  // Error log format: <datetime> <master-pid> <current-pid>
-  // <thread-id> <level> (<filename>:<line>) <msg>
-  rv = snprintf(buf, sizeof(buf), "%s %d %d %s %s%s%s (%s:%d) %s\n",
-                lgconf->tstamp->time_iso8601.c_str(), config->pid, lgconf->pid,
-                lgconf->thread_id.c_str(), tty ? SEVERITY_COLOR[severity_] : "",
-                SEVERITY_STR[severity_].c_str(), tty ? "\033[0m" : "",
-                filename_, linenum_, stream_.str().c_str());
-
-  if (rv < 0) {
-    return;
-  }
-
-  auto nwrite = std::min(static_cast<size_t>(rv), sizeof(buf) - 1);
-
-  while (write(lgconf->errorlog_fd, buf, nwrite) == -1 && errno == EINTR)
-    ;
-}
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator> copy(const char *src, size_t srclen,
-                                               OutputIterator d_first,
-                                               OutputIterator d_last) {
-  auto nwrite =
-      std::min(static_cast<size_t>(std::distance(d_first, d_last)), srclen);
-  return std::make_pair(std::copy_n(src, nwrite, d_first), d_last);
-}
-} // namespace
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator>
-copy(const char *src, OutputIterator d_first, OutputIterator d_last) {
-  return copy(src, strlen(src), d_first, d_last);
-}
-} // namespace
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator>
-copy(const StringRef &src, OutputIterator d_first, OutputIterator d_last) {
-  return copy(src.c_str(), src.size(), d_first, d_last);
-}
-} // namespace
-
-namespace {
-template <size_t N, typename OutputIterator>
-std::pair<OutputIterator, OutputIterator>
-copy_l(const char (&src)[N], OutputIterator d_first, OutputIterator d_last) {
-  return copy(src, N - 1, d_first, d_last);
-}
-} // namespace
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator> copy(char c, OutputIterator d_first,
-                                               OutputIterator d_last) {
-  if (d_first == d_last) {
-    return std::make_pair(d_last, d_last);
-  }
-  *d_first++ = c;
-  return std::make_pair(d_first, d_last);
-}
-} // namespace
-
-namespace {
-constexpr char LOWER_XDIGITS[] = "0123456789abcdef";
-} // namespace
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator>
-copy_hex_low(const uint8_t *src, size_t srclen, OutputIterator d_first,
-             OutputIterator d_last) {
-  auto nwrite = std::min(static_cast<size_t>(std::distance(d_first, d_last)),
-                         srclen * 2) /
-                2;
-  for (size_t i = 0; i < nwrite; ++i) {
-    *d_first++ = LOWER_XDIGITS[src[i] >> 4];
-    *d_first++ = LOWER_XDIGITS[src[i] & 0xf];
-  }
-  return std::make_pair(d_first, d_last);
-}
-} // namespace
-
-namespace {
-template <typename OutputIterator, typename T>
-std::pair<OutputIterator, OutputIterator> copy(T n, OutputIterator d_first,
-                                               OutputIterator d_last) {
-  if (static_cast<size_t>(std::distance(d_first, d_last)) <
-      NGHTTP2_MAX_UINT64_DIGITS) {
-    return std::make_pair(d_last, d_last);
-  }
-  return std::make_pair(util::utos(d_first, n), d_last);
-}
-} // namespace
-
-namespace {
-// 1 means that character must be escaped as "\xNN", where NN is ascii
-// code of the character in hex notation.
-constexpr uint8_t ESCAPE_TBL[] = {
-    1 /* NUL  */, 1 /* SOH  */, 1 /* STX  */, 1 /* ETX  */, 1 /* EOT  */,
-    1 /* ENQ  */, 1 /* ACK  */, 1 /* BEL  */, 1 /* BS   */, 1 /* HT   */,
-    1 /* LF   */, 1 /* VT   */, 1 /* FF   */, 1 /* CR   */, 1 /* SO   */,
-    1 /* SI   */, 1 /* DLE  */, 1 /* DC1  */, 1 /* DC2  */, 1 /* DC3  */,
-    1 /* DC4  */, 1 /* NAK  */, 1 /* SYN  */, 1 /* ETB  */, 1 /* CAN  */,
-    1 /* EM   */, 1 /* SUB  */, 1 /* ESC  */, 1 /* FS   */, 1 /* GS   */,
-    1 /* RS   */, 1 /* US   */, 0 /* SPC  */, 0 /* !    */, 1 /* "    */,
-    0 /* #    */, 0 /* $    */, 0 /* %    */, 0 /* &    */, 0 /* '    */,
-    0 /* (    */, 0 /* )    */, 0 /* *    */, 0 /* +    */, 0 /* ,    */,
-    0 /* -    */, 0 /* .    */, 0 /* /    */, 0 /* 0    */, 0 /* 1    */,
-    0 /* 2    */, 0 /* 3    */, 0 /* 4    */, 0 /* 5    */, 0 /* 6    */,
-    0 /* 7    */, 0 /* 8    */, 0 /* 9    */, 0 /* :    */, 0 /* ;    */,
-    0 /* <    */, 0 /* =    */, 0 /* >    */, 0 /* ?    */, 0 /* @    */,
-    0 /* A    */, 0 /* B    */, 0 /* C    */, 0 /* D    */, 0 /* E    */,
-    0 /* F    */, 0 /* G    */, 0 /* H    */, 0 /* I    */, 0 /* J    */,
-    0 /* K    */, 0 /* L    */, 0 /* M    */, 0 /* N    */, 0 /* O    */,
-    0 /* P    */, 0 /* Q    */, 0 /* R    */, 0 /* S    */, 0 /* T    */,
-    0 /* U    */, 0 /* V    */, 0 /* W    */, 0 /* X    */, 0 /* Y    */,
-    0 /* Z    */, 0 /* [    */, 1 /* \    */, 0 /* ]    */, 0 /* ^    */,
-    0 /* _    */, 0 /* `    */, 0 /* a    */, 0 /* b    */, 0 /* c    */,
-    0 /* d    */, 0 /* e    */, 0 /* f    */, 0 /* g    */, 0 /* h    */,
-    0 /* i    */, 0 /* j    */, 0 /* k    */, 0 /* l    */, 0 /* m    */,
-    0 /* n    */, 0 /* o    */, 0 /* p    */, 0 /* q    */, 0 /* r    */,
-    0 /* s    */, 0 /* t    */, 0 /* u    */, 0 /* v    */, 0 /* w    */,
-    0 /* x    */, 0 /* y    */, 0 /* z    */, 0 /* {    */, 0 /* |    */,
-    0 /* }    */, 0 /* ~    */, 1 /* DEL  */, 1 /* 0x80 */, 1 /* 0x81 */,
-    1 /* 0x82 */, 1 /* 0x83 */, 1 /* 0x84 */, 1 /* 0x85 */, 1 /* 0x86 */,
-    1 /* 0x87 */, 1 /* 0x88 */, 1 /* 0x89 */, 1 /* 0x8a */, 1 /* 0x8b */,
-    1 /* 0x8c */, 1 /* 0x8d */, 1 /* 0x8e */, 1 /* 0x8f */, 1 /* 0x90 */,
-    1 /* 0x91 */, 1 /* 0x92 */, 1 /* 0x93 */, 1 /* 0x94 */, 1 /* 0x95 */,
-    1 /* 0x96 */, 1 /* 0x97 */, 1 /* 0x98 */, 1 /* 0x99 */, 1 /* 0x9a */,
-    1 /* 0x9b */, 1 /* 0x9c */, 1 /* 0x9d */, 1 /* 0x9e */, 1 /* 0x9f */,
-    1 /* 0xa0 */, 1 /* 0xa1 */, 1 /* 0xa2 */, 1 /* 0xa3 */, 1 /* 0xa4 */,
-    1 /* 0xa5 */, 1 /* 0xa6 */, 1 /* 0xa7 */, 1 /* 0xa8 */, 1 /* 0xa9 */,
-    1 /* 0xaa */, 1 /* 0xab */, 1 /* 0xac */, 1 /* 0xad */, 1 /* 0xae */,
-    1 /* 0xaf */, 1 /* 0xb0 */, 1 /* 0xb1 */, 1 /* 0xb2 */, 1 /* 0xb3 */,
-    1 /* 0xb4 */, 1 /* 0xb5 */, 1 /* 0xb6 */, 1 /* 0xb7 */, 1 /* 0xb8 */,
-    1 /* 0xb9 */, 1 /* 0xba */, 1 /* 0xbb */, 1 /* 0xbc */, 1 /* 0xbd */,
-    1 /* 0xbe */, 1 /* 0xbf */, 1 /* 0xc0 */, 1 /* 0xc1 */, 1 /* 0xc2 */,
-    1 /* 0xc3 */, 1 /* 0xc4 */, 1 /* 0xc5 */, 1 /* 0xc6 */, 1 /* 0xc7 */,
-    1 /* 0xc8 */, 1 /* 0xc9 */, 1 /* 0xca */, 1 /* 0xcb */, 1 /* 0xcc */,
-    1 /* 0xcd */, 1 /* 0xce */, 1 /* 0xcf */, 1 /* 0xd0 */, 1 /* 0xd1 */,
-    1 /* 0xd2 */, 1 /* 0xd3 */, 1 /* 0xd4 */, 1 /* 0xd5 */, 1 /* 0xd6 */,
-    1 /* 0xd7 */, 1 /* 0xd8 */, 1 /* 0xd9 */, 1 /* 0xda */, 1 /* 0xdb */,
-    1 /* 0xdc */, 1 /* 0xdd */, 1 /* 0xde */, 1 /* 0xdf */, 1 /* 0xe0 */,
-    1 /* 0xe1 */, 1 /* 0xe2 */, 1 /* 0xe3 */, 1 /* 0xe4 */, 1 /* 0xe5 */,
-    1 /* 0xe6 */, 1 /* 0xe7 */, 1 /* 0xe8 */, 1 /* 0xe9 */, 1 /* 0xea */,
-    1 /* 0xeb */, 1 /* 0xec */, 1 /* 0xed */, 1 /* 0xee */, 1 /* 0xef */,
-    1 /* 0xf0 */, 1 /* 0xf1 */, 1 /* 0xf2 */, 1 /* 0xf3 */, 1 /* 0xf4 */,
-    1 /* 0xf5 */, 1 /* 0xf6 */, 1 /* 0xf7 */, 1 /* 0xf8 */, 1 /* 0xf9 */,
-    1 /* 0xfa */, 1 /* 0xfb */, 1 /* 0xfc */, 1 /* 0xfd */, 1 /* 0xfe */,
-    1 /* 0xff */,
-};
-} // namespace
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator>
-copy_escape(const char *src, size_t srclen, OutputIterator d_first,
-            OutputIterator d_last) {
-  auto safe_first = src;
-  for (auto p = src; p != src + srclen && d_first != d_last; ++p) {
-    unsigned char c = *p;
-    if (!ESCAPE_TBL[c]) {
-      continue;
-    }
-
-    auto n =
-        std::min(std::distance(d_first, d_last), std::distance(safe_first, p));
-    d_first = std::copy_n(safe_first, n, d_first);
-    if (std::distance(d_first, d_last) < 4) {
-      return std::make_pair(d_first, d_last);
-    }
-    *d_first++ = '\\';
-    *d_first++ = 'x';
-    *d_first++ = LOWER_XDIGITS[c >> 4];
-    *d_first++ = LOWER_XDIGITS[c & 0xf];
-    safe_first = p + 1;
-  }
-
-  auto n = std::min(std::distance(d_first, d_last),
-                    std::distance(safe_first, src + srclen));
-  return std::make_pair(std::copy_n(safe_first, n, d_first), d_last);
-}
-} // namespace
-
-namespace {
-template <typename OutputIterator>
-std::pair<OutputIterator, OutputIterator> copy_escape(const StringRef &src,
-                                                      OutputIterator d_first,
-                                                      OutputIterator d_last) {
-  return copy_escape(src.c_str(), src.size(), d_first, d_last);
-}
-} // namespace
-
-namespace {
-// Construct absolute request URI from |Request|, mainly to log
-// request URI for proxy request (HTTP/2 proxy or client proxy).  This
-// is mostly same routine found in
-// HttpDownstreamConnection::push_request_headers(), but vastly
-// simplified since we only care about absolute URI.
-StringRef construct_absolute_request_uri(BlockAllocator &balloc,
-                                         const Request &req) {
-  if (req.authority.empty()) {
-    return req.path;
-  }
-
-  auto len = req.authority.size() + req.path.size();
-  if (req.scheme.empty()) {
-    len += str_size("http://");
-  } else {
-    len += req.scheme.size() + str_size("://");
-  }
-
-  auto iov = make_byte_ref(balloc, len + 1);
-  auto p = iov.base;
-
-  if (req.scheme.empty()) {
-    // We may have to log the request which lacks scheme (e.g.,
-    // http/1.1 with origin form).
-    p = util::copy_lit(p, "http://");
-  } else {
-    p = std::copy(std::begin(req.scheme), std::end(req.scheme), p);
-    p = util::copy_lit(p, "://");
-  }
-  p = std::copy(std::begin(req.authority), std::end(req.authority), p);
-  p = std::copy(std::begin(req.path), std::end(req.path), p);
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-} // namespace
-
-void upstream_accesslog(const std::vector<LogFragment> &lfv,
-                        const LogSpec &lgsp) {
-  auto config = get_config();
-  auto lgconf = log_config();
-  auto &accessconf = get_config()->logging.access;
-
-  if (lgconf->accesslog_fd == -1 && !accessconf.syslog) {
-    return;
-  }
-
-  std::array<char, 4_k> buf;
-
-  auto downstream = lgsp.downstream;
-
-  const auto &req = downstream->request();
-  const auto &resp = downstream->response();
-  const auto &tstamp = req.tstamp;
-  auto &balloc = downstream->get_block_allocator();
-
-  auto downstream_addr = downstream->get_addr();
-  auto method = http2::to_method_string(req.method);
-  auto path = req.method == HTTP_CONNECT
-                  ? req.authority
-                  : config->http2_proxy
-                        ? construct_absolute_request_uri(balloc, req)
-                        : req.path.empty() ? req.method == HTTP_OPTIONS
-                                                 ? StringRef::from_lit("*")
-                                                 : StringRef::from_lit("-")
-                                           : req.path;
-
-  auto p = std::begin(buf);
-  auto last = std::end(buf) - 2;
-
-  for (auto &lf : lfv) {
-    switch (lf.type) {
-    case SHRPX_LOGF_LITERAL:
-      std::tie(p, last) = copy(lf.value, p, last);
-      break;
-    case SHRPX_LOGF_REMOTE_ADDR:
-      std::tie(p, last) = copy(lgsp.remote_addr, p, last);
-      break;
-    case SHRPX_LOGF_TIME_LOCAL:
-      std::tie(p, last) = copy(tstamp->time_local, p, last);
-      break;
-    case SHRPX_LOGF_TIME_ISO8601:
-      std::tie(p, last) = copy(tstamp->time_iso8601, p, last);
-      break;
-    case SHRPX_LOGF_REQUEST:
-      std::tie(p, last) = copy(method, p, last);
-      std::tie(p, last) = copy(' ', p, last);
-      std::tie(p, last) = copy_escape(path, p, last);
-      std::tie(p, last) = copy_l(" HTTP/", p, last);
-      std::tie(p, last) = copy(req.http_major, p, last);
-      if (req.http_major < 2) {
-        std::tie(p, last) = copy('.', p, last);
-        std::tie(p, last) = copy(req.http_minor, p, last);
-      }
-      break;
-    case SHRPX_LOGF_STATUS:
-      std::tie(p, last) = copy(resp.http_status, p, last);
-      break;
-    case SHRPX_LOGF_BODY_BYTES_SENT:
-      std::tie(p, last) = copy(downstream->response_sent_body_length, p, last);
-      break;
-    case SHRPX_LOGF_HTTP: {
-      auto hd = req.fs.header(lf.value);
-      if (hd) {
-        std::tie(p, last) = copy_escape((*hd).value, p, last);
-        break;
-      }
-
-      std::tie(p, last) = copy('-', p, last);
-
-      break;
-    }
-    case SHRPX_LOGF_AUTHORITY:
-      if (!req.authority.empty()) {
-        std::tie(p, last) = copy(req.authority, p, last);
-        break;
-      }
-
-      std::tie(p, last) = copy('-', p, last);
-
-      break;
-    case SHRPX_LOGF_REMOTE_PORT:
-      std::tie(p, last) = copy(lgsp.remote_port, p, last);
-      break;
-    case SHRPX_LOGF_SERVER_PORT:
-      std::tie(p, last) = copy(lgsp.server_port, p, last);
-      break;
-    case SHRPX_LOGF_REQUEST_TIME: {
-      auto t = std::chrono::duration_cast<std::chrono::milliseconds>(
-                   lgsp.request_end_time - downstream->get_request_start_time())
-                   .count();
-      std::tie(p, last) = copy(t / 1000, p, last);
-      std::tie(p, last) = copy('.', p, last);
-      auto frac = t % 1000;
-      if (frac < 100) {
-        auto n = frac < 10 ? 2 : 1;
-        std::tie(p, last) = copy("000", n, p, last);
-      }
-      std::tie(p, last) = copy(frac, p, last);
-      break;
-    }
-    case SHRPX_LOGF_PID:
-      std::tie(p, last) = copy(lgsp.pid, p, last);
-      break;
-    case SHRPX_LOGF_ALPN:
-      std::tie(p, last) = copy_escape(lgsp.alpn, p, last);
-      break;
-    case SHRPX_LOGF_TLS_CIPHER:
-      if (!lgsp.ssl) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy(SSL_get_cipher_name(lgsp.ssl), p, last);
-      break;
-    case SHRPX_LOGF_TLS_PROTOCOL:
-      if (!lgsp.ssl) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) =
-          copy(nghttp2::tls::get_tls_protocol(lgsp.ssl), p, last);
-      break;
-    case SHRPX_LOGF_TLS_SESSION_ID: {
-      auto session = SSL_get_session(lgsp.ssl);
-      if (!session) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      unsigned int session_id_length = 0;
-      auto session_id = SSL_SESSION_get_id(session, &session_id_length);
-      if (session_id_length == 0) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy_hex_low(session_id, session_id_length, p, last);
-      break;
-    }
-    case SHRPX_LOGF_TLS_SESSION_REUSED:
-      if (!lgsp.ssl) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) =
-          copy(SSL_session_reused(lgsp.ssl) ? 'r' : '.', p, last);
-      break;
-    case SHRPX_LOGF_TLS_SNI:
-      if (lgsp.sni.empty()) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy_escape(lgsp.sni, p, last);
-      break;
-    case SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA1:
-    case SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA256: {
-      if (!lgsp.ssl) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      auto x = SSL_get_peer_certificate(lgsp.ssl);
-      if (!x) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::array<uint8_t, 32> buf;
-      auto len = tls::get_x509_fingerprint(
-          buf.data(), buf.size(), x,
-          lf.type == SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA256 ? EVP_sha256()
-                                                              : EVP_sha1());
-      X509_free(x);
-      if (len <= 0) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy_hex_low(buf.data(), len, p, last);
-      break;
-    }
-    case SHRPX_LOGF_TLS_CLIENT_ISSUER_NAME:
-    case SHRPX_LOGF_TLS_CLIENT_SUBJECT_NAME: {
-      if (!lgsp.ssl) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      auto x = SSL_get_peer_certificate(lgsp.ssl);
-      if (!x) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      auto name = lf.type == SHRPX_LOGF_TLS_CLIENT_ISSUER_NAME
-                      ? tls::get_x509_issuer_name(balloc, x)
-                      : tls::get_x509_subject_name(balloc, x);
-      X509_free(x);
-      if (name.empty()) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy(name, p, last);
-      break;
-    }
-    case SHRPX_LOGF_TLS_CLIENT_SERIAL: {
-      if (!lgsp.ssl) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      auto x = SSL_get_peer_certificate(lgsp.ssl);
-      if (!x) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      auto sn = tls::get_x509_serial(balloc, x);
-      X509_free(x);
-      if (sn.empty()) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy(sn, p, last);
-      break;
-    }
-    case SHRPX_LOGF_BACKEND_HOST:
-      if (!downstream_addr) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy(downstream_addr->host, p, last);
-      break;
-    case SHRPX_LOGF_BACKEND_PORT:
-      if (!downstream_addr) {
-        std::tie(p, last) = copy('-', p, last);
-        break;
-      }
-      std::tie(p, last) = copy(downstream_addr->port, p, last);
-      break;
-    case SHRPX_LOGF_NONE:
-      break;
-    default:
-      break;
-    }
-  }
-
-  *p = '\0';
-
-  if (accessconf.syslog) {
-    syslog(LOG_INFO, "%s", buf.data());
-
-    return;
-  }
-
-  *p++ = '\n';
-
-  auto nwrite = std::distance(std::begin(buf), p);
-  while (write(lgconf->accesslog_fd, buf.data(), nwrite) == -1 &&
-         errno == EINTR)
-    ;
-}
-
-int reopen_log_files(const LoggingConfig &loggingconf) {
-  int res = 0;
-  int new_accesslog_fd = -1;
-  int new_errorlog_fd = -1;
-
-  auto lgconf = log_config();
-  auto &accessconf = loggingconf.access;
-  auto &errorconf = loggingconf.error;
-
-  if (!accessconf.syslog && !accessconf.file.empty()) {
-    new_accesslog_fd = open_log_file(accessconf.file.c_str());
-
-    if (new_accesslog_fd == -1) {
-      LOG(ERROR) << "Failed to open accesslog file " << accessconf.file;
-      res = -1;
-    }
-  }
-
-  if (!errorconf.syslog && !errorconf.file.empty()) {
-    new_errorlog_fd = open_log_file(errorconf.file.c_str());
-
-    if (new_errorlog_fd == -1) {
-      if (lgconf->errorlog_fd != -1) {
-        LOG(ERROR) << "Failed to open errorlog file " << errorconf.file;
-      } else {
-        std::cerr << "Failed to open errorlog file " << errorconf.file
-                  << std::endl;
-      }
-
-      res = -1;
-    }
-  }
-
-  close_log_file(lgconf->accesslog_fd);
-  close_log_file(lgconf->errorlog_fd);
-
-  lgconf->accesslog_fd = new_accesslog_fd;
-  lgconf->errorlog_fd = new_errorlog_fd;
-  lgconf->errorlog_tty =
-      (new_errorlog_fd == -1) ? false : isatty(new_errorlog_fd);
-
-  return res;
-}
-
-void log_chld(pid_t pid, int rstatus, const char *msg) {
-  std::string signalstr;
-  if (WIFSIGNALED(rstatus)) {
-    signalstr += "; signal ";
-    auto sig = WTERMSIG(rstatus);
-    auto s = strsignal(sig);
-    if (s) {
-      signalstr += s;
-      signalstr += '(';
-    } else {
-      signalstr += "UNKNOWN(";
-    }
-    signalstr += util::utos(sig);
-    signalstr += ')';
-  }
-
-  LOG(NOTICE) << msg << ": [" << pid << "] exited "
-              << (WIFEXITED(rstatus) ? "normally" : "abnormally")
-              << " with status " << std::hex << rstatus << std::oct
-              << "; exit status " << WEXITSTATUS(rstatus)
-              << (signalstr.empty() ? "" : signalstr.c_str());
-}
-
-void redirect_stderr_to_errorlog(const LoggingConfig &loggingconf) {
-  auto lgconf = log_config();
-  auto &errorconf = loggingconf.error;
-
-  if (errorconf.syslog || lgconf->errorlog_fd == -1) {
-    return;
-  }
-
-  dup2(lgconf->errorlog_fd, STDERR_FILENO);
-}
-
-namespace {
-int STDERR_COPY = -1;
-int STDOUT_COPY = -1;
-} // namespace
-
-void store_original_fds() {
-  // consider dup'ing stdout too
-  STDERR_COPY = dup(STDERR_FILENO);
-  STDOUT_COPY = STDOUT_FILENO;
-  // no race here, since it is called early
-  util::make_socket_closeonexec(STDERR_COPY);
-}
-
-void restore_original_fds() { dup2(STDERR_COPY, STDERR_FILENO); }
-
-void close_log_file(int &fd) {
-  if (fd != STDERR_COPY && fd != STDOUT_COPY && fd != -1) {
-    close(fd);
-  }
-  fd = -1;
-}
-
-int open_log_file(const char *path) {
-
-  if (strcmp(path, "/dev/stdout") == 0 ||
-      strcmp(path, "/proc/self/fd/1") == 0) {
-    return STDOUT_COPY;
-  }
-
-  if (strcmp(path, "/dev/stderr") == 0 ||
-      strcmp(path, "/proc/self/fd/2") == 0) {
-    return STDERR_COPY;
-  }
-#if defined O_CLOEXEC
-
-  auto fd = open(path, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC,
-                 S_IRUSR | S_IWUSR | S_IRGRP);
-#else // !O_CLOEXEC
-
-  auto fd =
-      open(path, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP);
-
-  // We get race condition if execve is called at the same time.
-  if (fd != -1) {
-    util::make_socket_closeonexec(fd);
-  }
-
-#endif // !O_CLOEXEC
-
-  if (fd == -1) {
-    return -1;
-  }
-
-  return fd;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_log_config.h"
-
-#include <unistd.h>
-
-#include <thread>
-#include <sstream>
-
-#include "util.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-Timestamp::Timestamp(const std::chrono::system_clock::time_point &tp) {
-  time_local = util::format_common_log(time_local_buf.data(), tp);
-  time_iso8601 = util::format_iso8601(time_iso8601_buf.data(), tp);
-  time_http = util::format_http_date(time_http_buf.data(), tp);
-}
-
-LogConfig::LogConfig()
-    : time_str_updated(std::chrono::system_clock::now()),
-      tstamp(std::make_shared<Timestamp>(time_str_updated)),
-      pid(getpid()),
-      accesslog_fd(-1),
-      errorlog_fd(-1),
-      errorlog_tty(false) {
-  auto tid = std::this_thread::get_id();
-  auto tid_hash =
-      util::hash32(StringRef{reinterpret_cast<uint8_t *>(&tid),
-                             reinterpret_cast<uint8_t *>(&tid) + sizeof(tid)});
-  thread_id = util::format_hex(reinterpret_cast<uint8_t *>(&tid_hash),
-                               sizeof(tid_hash));
-}
-
-#ifndef NOTHREADS
-#  ifdef HAVE_THREAD_LOCAL
-namespace {
-thread_local std::unique_ptr<LogConfig> config = make_unique<LogConfig>();
-} // namespace
-
-LogConfig *log_config() { return config.get(); }
-void delete_log_config() {}
-#  else  // !HAVE_THREAD_LOCAL
-namespace {
-pthread_key_t lckey;
-pthread_once_t lckey_once = PTHREAD_ONCE_INIT;
-} // namespace
-
-namespace {
-void make_key() { pthread_key_create(&lckey, NULL); }
-} // namespace
-
-LogConfig *log_config() {
-  pthread_once(&lckey_once, make_key);
-  LogConfig *config = (LogConfig *)pthread_getspecific(lckey);
-  if (!config) {
-    config = new LogConfig();
-    pthread_setspecific(lckey, config);
-  }
-  return config;
-}
-
-void delete_log_config() { delete log_config(); }
-#  endif // !HAVE_THREAD_LOCAL
-#else    // NOTHREADS
-namespace {
-std::unique_ptr<LogConfig> config = make_unique<LogConfig>();
-} // namespace
-
-LogConfig *log_config() { return config.get(); }
-
-void delete_log_config() {}
-#endif   // NOTHREADS
-
-void LogConfig::update_tstamp_millis(
-    const std::chrono::system_clock::time_point &now) {
-  if (std::chrono::duration_cast<std::chrono::milliseconds>(
-          now.time_since_epoch()) ==
-      std::chrono::duration_cast<std::chrono::milliseconds>(
-          time_str_updated.time_since_epoch())) {
-    return;
-  }
-
-  time_str_updated = now;
-
-  tstamp = std::make_shared<Timestamp>(now);
-}
-
-void LogConfig::update_tstamp(
-    const std::chrono::system_clock::time_point &now) {
-  if (std::chrono::duration_cast<std::chrono::seconds>(
-          now.time_since_epoch()) ==
-      std::chrono::duration_cast<std::chrono::seconds>(
-          time_str_updated.time_since_epoch())) {
-    return;
-  }
-
-  time_str_updated = now;
-
-  tstamp = std::make_shared<Timestamp>(now);
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_LOG_CONFIG_H
-#define SHRPX_LOG_CONFIG_H
-
-#include "shrpx.h"
-
-#include <sys/types.h>
-
-#include <chrono>
-
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-struct Timestamp {
-  Timestamp(const std::chrono::system_clock::time_point &tp);
-
-  std::array<char, sizeof("03/Jul/2014:00:19:38 +0900")> time_local_buf;
-  std::array<char, sizeof("2014-11-15T12:58:24.741+09:00")> time_iso8601_buf;
-  std::array<char, sizeof("Mon, 10 Oct 2016 10:25:58 GMT")> time_http_buf;
-  StringRef time_local;
-  StringRef time_iso8601;
-  StringRef time_http;
-};
-
-struct LogConfig {
-  std::chrono::system_clock::time_point time_str_updated;
-  std::shared_ptr<Timestamp> tstamp;
-  std::string thread_id;
-  pid_t pid;
-  int accesslog_fd;
-  int errorlog_fd;
-  // true if errorlog_fd is referring to a terminal.
-  bool errorlog_tty;
-
-  LogConfig();
-  // Updates time stamp if difference between time_str_updated and now
-  // is 1 or more milliseconds.
-  void update_tstamp_millis(const std::chrono::system_clock::time_point &now);
-  // Updates time stamp if difference between time_str_updated and
-  // now, converted to time_t, is 1 or more seconds.
-  void update_tstamp(const std::chrono::system_clock::time_point &now);
-};
-
-// We need LogConfig per thread to avoid data race around opening file
-// descriptor for log files.
-LogConfig *log_config();
-
-// Deletes log_config
-void delete_log_config();
-
-} // namespace shrpx
-
-#endif // SHRPX_LOG_CONFIG_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_log.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_LOG_H
-#define SHRPX_LOG_H
-
-#include "shrpx.h"
-
-#include <sys/types.h>
-
-#include <sstream>
-#include <memory>
-#include <vector>
-#include <chrono>
-
-#include "shrpx_config.h"
-#include "shrpx_log_config.h"
-#include "tls.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-#define ENABLE_LOG 1
-
-#define LOG_ENABLED(SEVERITY) (ENABLE_LOG && shrpx::Log::log_enabled(SEVERITY))
-
-#define LOG(SEVERITY) shrpx::Log(SEVERITY, __FILE__, __LINE__)
-
-// Listener log
-#define LLOG(SEVERITY, LISTEN)                                                 \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__) << "[LISTEN:" << LISTEN << "] ")
-
-// Worker log
-#define WLOG(SEVERITY, WORKER)                                                 \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__) << "[WORKER:" << WORKER << "] ")
-
-// ClientHandler log
-#define CLOG(SEVERITY, CLIENT_HANDLER)                                         \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__)                                    \
-   << "[CLIENT_HANDLER:" << CLIENT_HANDLER << "] ")
-
-// Upstream log
-#define ULOG(SEVERITY, UPSTREAM)                                               \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__) << "[UPSTREAM:" << UPSTREAM        \
-                                            << "]"                             \
-                                               " ")
-
-// Downstream log
-#define DLOG(SEVERITY, DOWNSTREAM)                                             \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__)                                    \
-   << "[DOWNSTREAM:" << DOWNSTREAM << "] ")
-
-// Downstream connection log
-#define DCLOG(SEVERITY, DCONN)                                                 \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__) << "[DCONN:" << DCONN << "] ")
-
-// Downstream HTTP2 session log
-#define SSLOG(SEVERITY, HTTP2)                                                 \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__) << "[DHTTP2:" << HTTP2 << "] ")
-
-// Memcached connection log
-#define MCLOG(SEVERITY, MCONN)                                                 \
-  (shrpx::Log(SEVERITY, __FILE__, __LINE__) << "[MCONN:" << MCONN << "] ")
-
-namespace shrpx {
-
-class Downstream;
-struct DownstreamAddr;
-
-enum SeverityLevel { INFO, NOTICE, WARN, ERROR, FATAL };
-
-class Log {
-public:
-  Log(int severity, const char *filename, int linenum);
-  ~Log();
-  template <typename Type> Log &operator<<(Type s) {
-    stream_ << s;
-    return *this;
-  }
-  static void set_severity_level(int severity);
-  static int set_severity_level_by_name(const StringRef &name);
-  static bool log_enabled(int severity) { return severity >= severity_thres_; }
-
-private:
-  std::stringstream stream_;
-  const char *filename_;
-  int severity_;
-  int linenum_;
-  static int severity_thres_;
-};
-
-#define TTY_HTTP_HD (log_config()->errorlog_tty ? "\033[1;34m" : "")
-#define TTY_RST (log_config()->errorlog_tty ? "\033[0m" : "")
-
-enum LogFragmentType {
-  SHRPX_LOGF_NONE,
-  SHRPX_LOGF_LITERAL,
-  SHRPX_LOGF_REMOTE_ADDR,
-  SHRPX_LOGF_TIME_LOCAL,
-  SHRPX_LOGF_TIME_ISO8601,
-  SHRPX_LOGF_REQUEST,
-  SHRPX_LOGF_STATUS,
-  SHRPX_LOGF_BODY_BYTES_SENT,
-  SHRPX_LOGF_HTTP,
-  SHRPX_LOGF_AUTHORITY,
-  SHRPX_LOGF_REMOTE_PORT,
-  SHRPX_LOGF_SERVER_PORT,
-  SHRPX_LOGF_REQUEST_TIME,
-  SHRPX_LOGF_PID,
-  SHRPX_LOGF_ALPN,
-  SHRPX_LOGF_TLS_CIPHER,
-  SHRPX_LOGF_SSL_CIPHER = SHRPX_LOGF_TLS_CIPHER,
-  SHRPX_LOGF_TLS_PROTOCOL,
-  SHRPX_LOGF_SSL_PROTOCOL = SHRPX_LOGF_TLS_PROTOCOL,
-  SHRPX_LOGF_TLS_SESSION_ID,
-  SHRPX_LOGF_SSL_SESSION_ID = SHRPX_LOGF_TLS_SESSION_ID,
-  SHRPX_LOGF_TLS_SESSION_REUSED,
-  SHRPX_LOGF_SSL_SESSION_REUSED = SHRPX_LOGF_TLS_SESSION_REUSED,
-  SHRPX_LOGF_TLS_SNI,
-  SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA1,
-  SHRPX_LOGF_TLS_CLIENT_FINGERPRINT_SHA256,
-  SHRPX_LOGF_TLS_CLIENT_ISSUER_NAME,
-  SHRPX_LOGF_TLS_CLIENT_SERIAL,
-  SHRPX_LOGF_TLS_CLIENT_SUBJECT_NAME,
-  SHRPX_LOGF_BACKEND_HOST,
-  SHRPX_LOGF_BACKEND_PORT,
-};
-
-struct LogFragment {
-  LogFragment(LogFragmentType type, StringRef value = StringRef::from_lit(""))
-      : type(type), value(std::move(value)) {}
-  LogFragmentType type;
-  StringRef value;
-};
-
-struct LogSpec {
-  Downstream *downstream;
-  StringRef remote_addr;
-  StringRef alpn;
-  StringRef sni;
-  SSL *ssl;
-  std::chrono::high_resolution_clock::time_point request_end_time;
-  StringRef remote_port;
-  uint16_t server_port;
-  pid_t pid;
-};
-
-void upstream_accesslog(const std::vector<LogFragment> &lf,
-                        const LogSpec &lgsp);
-
-int reopen_log_files(const LoggingConfig &loggingconf);
-
-// Logs message when process whose pid is |pid| and exist status is
-// |rstatus| exited.  The |msg| is prepended to the log message.
-void log_chld(pid_t pid, int rstatus, const char *msg);
-
-void redirect_stderr_to_errorlog(const LoggingConfig &loggingconf);
-
-// Makes internal copy of stderr (and possibly stdout in the future),
-// which is then used as pointer to /dev/stderr or /proc/self/fd/2
-void store_original_fds();
-
-// Restores the original stderr that was stored with copy_original_fds
-// Used just before execv
-void restore_original_fds();
-
-// Closes |fd| which was returned by open_log_file (see below)
-// and sets it to -1. In the case that |fd| points to stdout or
-// stderr, or is -1, the descriptor is not closed (but still set to -1).
-void close_log_file(int &fd);
-
-// Opens |path| with O_APPEND enabled.  If file does not exist, it is
-// created first.  This function returns file descriptor referring the
-// opened file if it succeeds, or -1.
-int open_log_file(const char *path);
-
-} // namespace shrpx
-
-#endif // SHRPX_LOG_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,772 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_memcached_connection.h"
-
-#include <limits.h>
-#include <sys/uio.h>
-
-#include <cerrno>
-
-#include "shrpx_memcached_request.h"
-#include "shrpx_memcached_result.h"
-#include "shrpx_config.h"
-#include "shrpx_tls.h"
-#include "shrpx_log.h"
-#include "util.h"
-
-namespace shrpx {
-
-namespace {
-void timeoutcb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto mconn = static_cast<MemcachedConnection *>(conn->data);
-
-  if (w == &conn->rt && !conn->expired_rt()) {
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    MCLOG(INFO, mconn) << "Time out";
-  }
-
-  mconn->disconnect();
-}
-} // namespace
-
-namespace {
-void readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto mconn = static_cast<MemcachedConnection *>(conn->data);
-
-  if (mconn->on_read() != 0) {
-    mconn->reconnect_or_fail();
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void writecb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto mconn = static_cast<MemcachedConnection *>(conn->data);
-
-  if (mconn->on_write() != 0) {
-    mconn->reconnect_or_fail();
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void connectcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn = static_cast<Connection *>(w->data);
-  auto mconn = static_cast<MemcachedConnection *>(conn->data);
-
-  if (mconn->connected() != 0) {
-    mconn->disconnect();
-    return;
-  }
-
-  writecb(loop, w, revents);
-}
-} // namespace
-
-constexpr auto write_timeout = 10_s;
-constexpr auto read_timeout = 10_s;
-
-MemcachedConnection::MemcachedConnection(const Address *addr,
-                                         struct ev_loop *loop, SSL_CTX *ssl_ctx,
-                                         const StringRef &sni_name,
-                                         MemchunkPool *mcpool,
-                                         std::mt19937 &gen)
-    : conn_(loop, -1, nullptr, mcpool, write_timeout, read_timeout, {}, {},
-            connectcb, readcb, timeoutcb, this, 0, 0., PROTO_MEMCACHED),
-      do_read_(&MemcachedConnection::noop),
-      do_write_(&MemcachedConnection::noop),
-      sni_name_(sni_name),
-      connect_blocker_(gen, loop, [] {}, [] {}),
-      parse_state_{},
-      addr_(addr),
-      ssl_ctx_(ssl_ctx),
-      sendsum_(0),
-      try_count_(0),
-      connected_(false) {}
-
-MemcachedConnection::~MemcachedConnection() { disconnect(); }
-
-namespace {
-void clear_request(std::deque<std::unique_ptr<MemcachedRequest>> &q) {
-  for (auto &req : q) {
-    if (req->cb) {
-      req->cb(req.get(), MemcachedResult(MEMCACHED_ERR_EXT_NETWORK_ERROR));
-    }
-  }
-  q.clear();
-}
-} // namespace
-
-void MemcachedConnection::disconnect() {
-  clear_request(recvq_);
-  clear_request(sendq_);
-
-  sendbufv_.clear();
-  sendsum_ = 0;
-
-  parse_state_ = {};
-
-  connected_ = false;
-
-  conn_.disconnect();
-
-  assert(recvbuf_.rleft() == 0);
-  recvbuf_.reset();
-
-  do_read_ = do_write_ = &MemcachedConnection::noop;
-}
-
-int MemcachedConnection::initiate_connection() {
-  assert(conn_.fd == -1);
-
-  if (ssl_ctx_) {
-    auto ssl = tls::create_ssl(ssl_ctx_);
-    if (!ssl) {
-      return -1;
-    }
-    conn_.set_ssl(ssl);
-    conn_.tls.client_session_cache = &tls_session_cache_;
-  }
-
-  conn_.fd = util::create_nonblock_socket(addr_->su.storage.ss_family);
-
-  if (conn_.fd == -1) {
-    auto error = errno;
-    MCLOG(WARN, this) << "socket() failed; errno=" << error;
-
-    return -1;
-  }
-
-  int rv;
-  rv = connect(conn_.fd, &addr_->su.sa, addr_->len);
-  if (rv != 0 && errno != EINPROGRESS) {
-    auto error = errno;
-    MCLOG(WARN, this) << "connect() failed; errno=" << error;
-
-    close(conn_.fd);
-    conn_.fd = -1;
-
-    return -1;
-  }
-
-  if (ssl_ctx_) {
-    if (!util::numeric_host(sni_name_.c_str())) {
-      SSL_set_tlsext_host_name(conn_.tls.ssl, sni_name_.c_str());
-    }
-
-    auto session = tls::reuse_tls_session(tls_session_cache_);
-    if (session) {
-      SSL_set_session(conn_.tls.ssl, session);
-      SSL_SESSION_free(session);
-    }
-
-    conn_.prepare_client_handshake();
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    MCLOG(INFO, this) << "Connecting to memcached server";
-  }
-
-  ev_io_set(&conn_.wev, conn_.fd, EV_WRITE);
-  ev_io_set(&conn_.rev, conn_.fd, EV_READ);
-
-  ev_set_cb(&conn_.wev, connectcb);
-
-  conn_.wlimit.startw();
-  ev_timer_again(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int MemcachedConnection::connected() {
-  auto sock_error = util::get_socket_error(conn_.fd);
-  if (sock_error != 0) {
-    MCLOG(WARN, this) << "memcached connect failed; addr="
-                      << util::to_numeric_addr(addr_)
-                      << ": errno=" << sock_error;
-
-    connect_blocker_.on_failure();
-
-    conn_.wlimit.stopw();
-
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    MCLOG(INFO, this) << "connected to memcached server";
-  }
-
-  conn_.rlimit.startw();
-
-  ev_set_cb(&conn_.wev, writecb);
-
-  if (conn_.tls.ssl) {
-    conn_.again_rt();
-
-    do_read_ = &MemcachedConnection::tls_handshake;
-    do_write_ = &MemcachedConnection::tls_handshake;
-
-    return 0;
-  }
-
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  connected_ = true;
-
-  connect_blocker_.on_success();
-
-  do_read_ = &MemcachedConnection::read_clear;
-  do_write_ = &MemcachedConnection::write_clear;
-
-  return 0;
-}
-
-int MemcachedConnection::on_write() { return do_write_(*this); }
-int MemcachedConnection::on_read() { return do_read_(*this); }
-
-int MemcachedConnection::tls_handshake() {
-  ERR_clear_error();
-
-  conn_.last_read = ev_now(conn_.loop);
-
-  auto rv = conn_.tls_handshake();
-  if (rv == SHRPX_ERR_INPROGRESS) {
-    return 0;
-  }
-
-  if (rv < 0) {
-    connect_blocker_.on_failure();
-    return rv;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "SSL/TLS handshake completed";
-  }
-
-  auto &tlsconf = get_config()->tls;
-
-  if (!tlsconf.insecure &&
-      tls::check_cert(conn_.tls.ssl, addr_, sni_name_) != 0) {
-    connect_blocker_.on_failure();
-    return -1;
-  }
-
-  ev_timer_stop(conn_.loop, &conn_.rt);
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  connected_ = true;
-
-  connect_blocker_.on_success();
-
-  do_read_ = &MemcachedConnection::read_tls;
-  do_write_ = &MemcachedConnection::write_tls;
-
-  return on_write();
-}
-
-int MemcachedConnection::write_tls() {
-  if (!connected_) {
-    return 0;
-  }
-
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<struct iovec, MAX_WR_IOVCNT> iov;
-  std::array<uint8_t, 16_k> buf;
-
-  for (; !sendq_.empty();) {
-    auto iovcnt = fill_request_buffer(iov.data(), iov.size());
-    auto p = std::begin(buf);
-    for (size_t i = 0; i < iovcnt; ++i) {
-      auto &v = iov[i];
-      auto n = std::min(static_cast<size_t>(std::end(buf) - p), v.iov_len);
-      p = std::copy_n(static_cast<uint8_t *>(v.iov_base), n, p);
-      if (p == std::end(buf)) {
-        break;
-      }
-    }
-
-    auto nwrite = conn_.write_tls(buf.data(), p - std::begin(buf));
-    if (nwrite < 0) {
-      return -1;
-    }
-    if (nwrite == 0) {
-      return 0;
-    }
-
-    drain_send_queue(nwrite);
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int MemcachedConnection::read_tls() {
-  if (!connected_) {
-    return 0;
-  }
-
-  conn_.last_read = ev_now(conn_.loop);
-
-  for (;;) {
-    auto nread = conn_.read_tls(recvbuf_.last, recvbuf_.wleft());
-
-    if (nread == 0) {
-      return 0;
-    }
-
-    if (nread < 0) {
-      return -1;
-    }
-
-    recvbuf_.write(nread);
-
-    if (parse_packet() != 0) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-int MemcachedConnection::write_clear() {
-  if (!connected_) {
-    return 0;
-  }
-
-  conn_.last_read = ev_now(conn_.loop);
-
-  std::array<struct iovec, MAX_WR_IOVCNT> iov;
-
-  for (; !sendq_.empty();) {
-    auto iovcnt = fill_request_buffer(iov.data(), iov.size());
-    auto nwrite = conn_.writev_clear(iov.data(), iovcnt);
-    if (nwrite < 0) {
-      return -1;
-    }
-    if (nwrite == 0) {
-      return 0;
-    }
-
-    drain_send_queue(nwrite);
-  }
-
-  conn_.wlimit.stopw();
-  ev_timer_stop(conn_.loop, &conn_.wt);
-
-  return 0;
-}
-
-int MemcachedConnection::read_clear() {
-  if (!connected_) {
-    return 0;
-  }
-
-  conn_.last_read = ev_now(conn_.loop);
-
-  for (;;) {
-    auto nread = conn_.read_clear(recvbuf_.last, recvbuf_.wleft());
-
-    if (nread == 0) {
-      return 0;
-    }
-
-    if (nread < 0) {
-      return -1;
-    }
-
-    recvbuf_.write(nread);
-
-    if (parse_packet() != 0) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-int MemcachedConnection::parse_packet() {
-  auto in = recvbuf_.pos;
-
-  for (;;) {
-    auto busy = false;
-
-    switch (parse_state_.state) {
-    case MEMCACHED_PARSE_HEADER24: {
-      if (recvbuf_.last - in < 24) {
-        recvbuf_.drain_reset(in - recvbuf_.pos);
-        return 0;
-      }
-
-      if (recvq_.empty()) {
-        MCLOG(WARN, this)
-            << "Response received, but there is no in-flight request.";
-        return -1;
-      }
-
-      auto &req = recvq_.front();
-
-      if (*in != MEMCACHED_RES_MAGIC) {
-        MCLOG(WARN, this) << "Response has bad magic: "
-                          << static_cast<uint32_t>(*in);
-        return -1;
-      }
-      ++in;
-
-      parse_state_.op = *in++;
-      parse_state_.keylen = util::get_uint16(in);
-      in += 2;
-      parse_state_.extralen = *in++;
-      // skip 1 byte reserved data type
-      ++in;
-      parse_state_.status_code = util::get_uint16(in);
-      in += 2;
-      parse_state_.totalbody = util::get_uint32(in);
-      in += 4;
-      // skip 4 bytes opaque
-      in += 4;
-      parse_state_.cas = util::get_uint64(in);
-      in += 8;
-
-      if (req->op != parse_state_.op) {
-        MCLOG(WARN, this)
-            << "opcode in response does not match to the request: want "
-            << static_cast<uint32_t>(req->op) << ", got " << parse_state_.op;
-        return -1;
-      }
-
-      if (parse_state_.keylen != 0) {
-        MCLOG(WARN, this) << "zero length keylen expected: got "
-                          << parse_state_.keylen;
-        return -1;
-      }
-
-      if (parse_state_.totalbody > 16_k) {
-        MCLOG(WARN, this) << "totalbody is too large: got "
-                          << parse_state_.totalbody;
-        return -1;
-      }
-
-      if (parse_state_.op == MEMCACHED_OP_GET &&
-          parse_state_.status_code == 0 && parse_state_.extralen == 0) {
-        MCLOG(WARN, this) << "response for GET does not have extra";
-        return -1;
-      }
-
-      if (parse_state_.totalbody <
-          parse_state_.keylen + parse_state_.extralen) {
-        MCLOG(WARN, this) << "totalbody is too short: totalbody "
-                          << parse_state_.totalbody << ", want min "
-                          << parse_state_.keylen + parse_state_.extralen;
-        return -1;
-      }
-
-      if (parse_state_.extralen) {
-        parse_state_.state = MEMCACHED_PARSE_EXTRA;
-        parse_state_.read_left = parse_state_.extralen;
-      } else {
-        parse_state_.state = MEMCACHED_PARSE_VALUE;
-        parse_state_.read_left = parse_state_.totalbody - parse_state_.keylen -
-                                 parse_state_.extralen;
-      }
-      busy = true;
-      break;
-    }
-    case MEMCACHED_PARSE_EXTRA: {
-      // We don't use extra for now. Just read and forget.
-      auto n = std::min(static_cast<size_t>(recvbuf_.last - in),
-                        parse_state_.read_left);
-
-      parse_state_.read_left -= n;
-      in += n;
-      if (parse_state_.read_left) {
-        recvbuf_.reset();
-        return 0;
-      }
-      parse_state_.state = MEMCACHED_PARSE_VALUE;
-      // since we require keylen == 0, totalbody - extralen ==
-      // valuelen
-      parse_state_.read_left =
-          parse_state_.totalbody - parse_state_.keylen - parse_state_.extralen;
-      busy = true;
-      break;
-    }
-    case MEMCACHED_PARSE_VALUE: {
-      auto n = std::min(static_cast<size_t>(recvbuf_.last - in),
-                        parse_state_.read_left);
-
-      parse_state_.value.insert(std::end(parse_state_.value), in, in + n);
-
-      parse_state_.read_left -= n;
-      in += n;
-      if (parse_state_.read_left) {
-        recvbuf_.reset();
-        return 0;
-      }
-
-      if (LOG_ENABLED(INFO)) {
-        if (parse_state_.status_code) {
-          MCLOG(INFO, this)
-              << "response returned error status: " << parse_state_.status_code;
-        }
-      }
-
-      // We require at least one complete response to clear try count.
-      try_count_ = 0;
-
-      auto req = std::move(recvq_.front());
-      recvq_.pop_front();
-
-      if (sendq_.empty() && recvq_.empty()) {
-        ev_timer_stop(conn_.loop, &conn_.rt);
-      }
-
-      if (!req->canceled && req->cb) {
-        req->cb(req.get(), MemcachedResult(parse_state_.status_code,
-                                           std::move(parse_state_.value)));
-      }
-
-      parse_state_ = {};
-      break;
-    }
-    }
-
-    if (!busy && in == recvbuf_.last) {
-      break;
-    }
-  }
-
-  assert(in == recvbuf_.last);
-  recvbuf_.reset();
-
-  return 0;
-}
-
-#undef DEFAULT_WR_IOVCNT
-#define DEFAULT_WR_IOVCNT 128
-
-#if defined(IOV_MAX) && IOV_MAX < DEFAULT_WR_IOVCNT
-#  define MAX_WR_IOVCNT IOV_MAX
-#else // !defined(IOV_MAX) || IOV_MAX >= DEFAULT_WR_IOVCNT
-#  define MAX_WR_IOVCNT DEFAULT_WR_IOVCNT
-#endif // !defined(IOV_MAX) || IOV_MAX >= DEFAULT_WR_IOVCNT
-
-size_t MemcachedConnection::fill_request_buffer(struct iovec *iov,
-                                                size_t iovlen) {
-  if (sendsum_ == 0) {
-    for (auto &req : sendq_) {
-      if (req->canceled) {
-        continue;
-      }
-      if (serialized_size(req.get()) + sendsum_ > 1300) {
-        break;
-      }
-      sendbufv_.emplace_back();
-      sendbufv_.back().req = req.get();
-      make_request(&sendbufv_.back(), req.get());
-      sendsum_ += sendbufv_.back().left();
-    }
-
-    if (sendsum_ == 0) {
-      sendq_.clear();
-      return 0;
-    }
-  }
-
-  size_t iovcnt = 0;
-  for (auto &buf : sendbufv_) {
-    if (iovcnt + 2 > iovlen) {
-      break;
-    }
-
-    auto req = buf.req;
-    if (buf.headbuf.rleft()) {
-      iov[iovcnt++] = {buf.headbuf.pos, buf.headbuf.rleft()};
-    }
-    if (buf.send_value_left) {
-      iov[iovcnt++] = {req->value.data() + req->value.size() -
-                           buf.send_value_left,
-                       buf.send_value_left};
-    }
-  }
-
-  return iovcnt;
-}
-
-void MemcachedConnection::drain_send_queue(size_t nwrite) {
-  sendsum_ -= nwrite;
-
-  while (nwrite > 0) {
-    auto &buf = sendbufv_.front();
-    auto &req = sendq_.front();
-    if (req->canceled) {
-      sendq_.pop_front();
-      continue;
-    }
-    assert(buf.req == req.get());
-    auto n = std::min(static_cast<size_t>(nwrite), buf.headbuf.rleft());
-    buf.headbuf.drain(n);
-    nwrite -= n;
-    n = std::min(static_cast<size_t>(nwrite), buf.send_value_left);
-    buf.send_value_left -= n;
-    nwrite -= n;
-
-    if (buf.headbuf.rleft() || buf.send_value_left) {
-      break;
-    }
-    sendbufv_.pop_front();
-    recvq_.push_back(std::move(sendq_.front()));
-    sendq_.pop_front();
-  }
-
-  // start read timer only when we wait for responses.
-  if (recvq_.empty()) {
-    ev_timer_stop(conn_.loop, &conn_.rt);
-  } else if (!ev_is_active(&conn_.rt)) {
-    conn_.again_rt();
-  }
-}
-
-size_t MemcachedConnection::serialized_size(MemcachedRequest *req) {
-  switch (req->op) {
-  case MEMCACHED_OP_GET:
-    return 24 + req->key.size();
-  case MEMCACHED_OP_ADD:
-  default:
-    return 24 + 8 + req->key.size() + req->value.size();
-  }
-}
-
-void MemcachedConnection::make_request(MemcachedSendbuf *sendbuf,
-                                       MemcachedRequest *req) {
-  auto &headbuf = sendbuf->headbuf;
-
-  std::fill(std::begin(headbuf.buf), std::end(headbuf.buf), 0);
-
-  headbuf[0] = MEMCACHED_REQ_MAGIC;
-  headbuf[1] = req->op;
-  switch (req->op) {
-  case MEMCACHED_OP_GET:
-    util::put_uint16be(&headbuf[2], req->key.size());
-    util::put_uint32be(&headbuf[8], req->key.size());
-    headbuf.write(24);
-    break;
-  case MEMCACHED_OP_ADD:
-    util::put_uint16be(&headbuf[2], req->key.size());
-    headbuf[4] = 8;
-    util::put_uint32be(&headbuf[8], 8 + req->key.size() + req->value.size());
-    util::put_uint32be(&headbuf[28], req->expiry);
-    headbuf.write(32);
-    break;
-  }
-
-  headbuf.write(req->key.c_str(), req->key.size());
-
-  sendbuf->send_value_left = req->value.size();
-}
-
-int MemcachedConnection::add_request(std::unique_ptr<MemcachedRequest> req) {
-  if (connect_blocker_.blocked()) {
-    return -1;
-  }
-
-  sendq_.push_back(std::move(req));
-
-  if (connected_) {
-    signal_write();
-    return 0;
-  }
-
-  if (conn_.fd == -1 && initiate_connection() != 0) {
-    connect_blocker_.on_failure();
-    disconnect();
-    return -1;
-  }
-
-  return 0;
-}
-
-// TODO should we start write timer too?
-void MemcachedConnection::signal_write() { conn_.wlimit.startw(); }
-
-int MemcachedConnection::noop() { return 0; }
-
-void MemcachedConnection::reconnect_or_fail() {
-  if (!connected_ || (recvq_.empty() && sendq_.empty())) {
-    disconnect();
-    return;
-  }
-
-  constexpr size_t MAX_TRY_COUNT = 3;
-
-  if (++try_count_ >= MAX_TRY_COUNT) {
-    if (LOG_ENABLED(INFO)) {
-      MCLOG(INFO, this) << "Tried " << MAX_TRY_COUNT
-                        << " times, and all failed.  Aborting";
-    }
-    try_count_ = 0;
-    disconnect();
-    return;
-  }
-
-  std::vector<std::unique_ptr<MemcachedRequest>> q;
-  q.reserve(recvq_.size() + sendq_.size());
-
-  if (LOG_ENABLED(INFO)) {
-    MCLOG(INFO, this) << "Retry connection, enqueue "
-                      << recvq_.size() + sendq_.size() << " request(s) again";
-  }
-
-  q.insert(std::end(q), std::make_move_iterator(std::begin(recvq_)),
-           std::make_move_iterator(std::end(recvq_)));
-  q.insert(std::end(q), std::make_move_iterator(std::begin(sendq_)),
-           std::make_move_iterator(std::end(sendq_)));
-
-  recvq_.clear();
-  sendq_.clear();
-
-  disconnect();
-
-  sendq_.insert(std::end(sendq_), std::make_move_iterator(std::begin(q)),
-                std::make_move_iterator(std::end(q)));
-
-  if (initiate_connection() != 0) {
-    connect_blocker_.on_failure();
-    disconnect();
-    return;
-  }
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_connection.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,153 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MEMCACHED_CONNECTION_H
-#define SHRPX_MEMCACHED_CONNECTION_H
-
-#include "shrpx.h"
-
-#include <memory>
-#include <deque>
-
-#include <ev.h>
-
-#include "shrpx_connection.h"
-#include "shrpx_tls.h"
-#include "shrpx_connect_blocker.h"
-#include "buffer.h"
-#include "network.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-struct MemcachedRequest;
-
-enum {
-  MEMCACHED_PARSE_HEADER24,
-  MEMCACHED_PARSE_EXTRA,
-  MEMCACHED_PARSE_VALUE,
-};
-
-// Stores state when parsing response from memcached server
-struct MemcachedParseState {
-  // Buffer for value, dynamically allocated.
-  std::vector<uint8_t> value;
-  // cas in response
-  uint64_t cas;
-  // keylen in response
-  size_t keylen;
-  // extralen in response
-  size_t extralen;
-  // totalbody in response.  The length of value is totalbody -
-  // extralen - keylen.
-  size_t totalbody;
-  // Number of bytes left to read variable length field.
-  size_t read_left;
-  // Parser state; see enum above
-  int state;
-  // status_code in response
-  int status_code;
-  // op in response
-  int op;
-};
-
-struct MemcachedSendbuf {
-  // Buffer for header + extra + key
-  Buffer<512> headbuf;
-  // MemcachedRequest associated to this object
-  MemcachedRequest *req;
-  // Number of bytes left when sending value
-  size_t send_value_left;
-  // Returns the number of bytes this object transmits.
-  size_t left() const { return headbuf.rleft() + send_value_left; }
-};
-
-constexpr uint8_t MEMCACHED_REQ_MAGIC = 0x80;
-constexpr uint8_t MEMCACHED_RES_MAGIC = 0x81;
-
-// MemcachedConnection implements part of memcached binary protocol.
-// This is not full brown implementation.  Just the part we need is
-// implemented.  We only use GET and ADD.
-//
-// https://github.com/memcached/memcached/blob/master/doc/protocol-binary.xml
-// https://code.google.com/p/memcached/wiki/MemcacheBinaryProtocol
-class MemcachedConnection {
-public:
-  MemcachedConnection(const Address *addr, struct ev_loop *loop,
-                      SSL_CTX *ssl_ctx, const StringRef &sni_name,
-                      MemchunkPool *mcpool, std::mt19937 &gen);
-  ~MemcachedConnection();
-
-  void disconnect();
-
-  int add_request(std::unique_ptr<MemcachedRequest> req);
-  int initiate_connection();
-
-  int connected();
-  int on_write();
-  int on_read();
-
-  int write_clear();
-  int read_clear();
-
-  int tls_handshake();
-  int write_tls();
-  int read_tls();
-
-  size_t fill_request_buffer(struct iovec *iov, size_t iovlen);
-  void drain_send_queue(size_t nwrite);
-
-  void make_request(MemcachedSendbuf *sendbuf, MemcachedRequest *req);
-  int parse_packet();
-  size_t serialized_size(MemcachedRequest *req);
-
-  void signal_write();
-
-  int noop();
-
-  void reconnect_or_fail();
-
-private:
-  Connection conn_;
-  std::deque<std::unique_ptr<MemcachedRequest>> recvq_;
-  std::deque<std::unique_ptr<MemcachedRequest>> sendq_;
-  std::deque<MemcachedSendbuf> sendbufv_;
-  std::function<int(MemcachedConnection &)> do_read_, do_write_;
-  StringRef sni_name_;
-  tls::TLSSessionCache tls_session_cache_;
-  ConnectBlocker connect_blocker_;
-  MemcachedParseState parse_state_;
-  const Address *addr_;
-  SSL_CTX *ssl_ctx_;
-  // Sum of the bytes to be transmitted in sendbufv_.
-  size_t sendsum_;
-  size_t try_count_;
-  bool connected_;
-  Buffer<8_k> recvbuf_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_MEMCACHED_CONNECTION_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_memcached_dispatcher.h"
-
-#include "shrpx_memcached_request.h"
-#include "shrpx_memcached_connection.h"
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-MemcachedDispatcher::MemcachedDispatcher(const Address *addr,
-                                         struct ev_loop *loop, SSL_CTX *ssl_ctx,
-                                         const StringRef &sni_name,
-                                         MemchunkPool *mcpool,
-                                         std::mt19937 &gen)
-    : loop_(loop),
-      mconn_(make_unique<MemcachedConnection>(addr, loop_, ssl_ctx, sni_name,
-                                              mcpool, gen)) {}
-
-MemcachedDispatcher::~MemcachedDispatcher() {}
-
-int MemcachedDispatcher::add_request(std::unique_ptr<MemcachedRequest> req) {
-  if (mconn_->add_request(std::move(req)) != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_dispatcher.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MEMCACHED_DISPATCHER_H
-#define SHRPX_MEMCACHED_DISPATCHER_H
-
-#include "shrpx.h"
-
-#include <memory>
-#include <random>
-
-#include <ev.h>
-
-#include <openssl/ssl.h>
-
-#include "memchunk.h"
-#include "network.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-struct MemcachedRequest;
-class MemcachedConnection;
-
-class MemcachedDispatcher {
-public:
-  MemcachedDispatcher(const Address *addr, struct ev_loop *loop,
-                      SSL_CTX *ssl_ctx, const StringRef &sni_name,
-                      MemchunkPool *mcpool, std::mt19937 &gen);
-  ~MemcachedDispatcher();
-
-  int add_request(std::unique_ptr<MemcachedRequest> req);
-
-private:
-  struct ev_loop *loop_;
-  std::unique_ptr<MemcachedConnection> mconn_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_MEMCACHED_DISPATCHER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_request.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_request.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_request.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_request.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MEMCACHED_REQUEST_H
-#define SHRPX_MEMCACHED_REQUEST_H
-
-#include "shrpx.h"
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#include "shrpx_memcached_result.h"
-
-namespace shrpx {
-
-enum {
-  MEMCACHED_OP_GET = 0x00,
-  MEMCACHED_OP_ADD = 0x02,
-};
-
-struct MemcachedRequest;
-
-using MemcachedResultCallback =
-    std::function<void(MemcachedRequest *req, MemcachedResult res)>;
-
-struct MemcachedRequest {
-  std::string key;
-  std::vector<uint8_t> value;
-  MemcachedResultCallback cb;
-  uint32_t expiry;
-  int op;
-  bool canceled;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_MEMCACHED_REQUEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_result.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_result.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_result.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_memcached_result.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MEMCACHED_RESULT_H
-#define SHRPX_MEMCACHED_RESULT_H
-
-#include "shrpx.h"
-
-#include <vector>
-
-namespace shrpx {
-
-enum MemcachedStatusCode {
-  MEMCACHED_ERR_NO_ERROR,
-  MEMCACHED_ERR_EXT_NETWORK_ERROR = 0x1001,
-};
-
-struct MemcachedResult {
-  MemcachedResult(int status_code) : status_code(status_code) {}
-  MemcachedResult(int status_code, std::vector<uint8_t> value)
-      : value(std::move(value)), status_code(status_code) {}
-
-  std::vector<uint8_t> value;
-  int status_code;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_MEMCACHED_RESULT_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,235 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_mruby.h"
-
-#include <mruby/compile.h>
-#include <mruby/string.h>
-
-#include "shrpx_downstream.h"
-#include "shrpx_config.h"
-#include "shrpx_mruby_module.h"
-#include "shrpx_downstream_connection.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-namespace mruby {
-
-MRubyContext::MRubyContext(mrb_state *mrb, mrb_value app, mrb_value env)
-    : mrb_(mrb), app_(std::move(app)), env_(std::move(env)) {}
-
-MRubyContext::~MRubyContext() {
-  if (mrb_) {
-    mrb_close(mrb_);
-  }
-}
-
-int MRubyContext::run_app(Downstream *downstream, int phase) {
-  if (!mrb_) {
-    return 0;
-  }
-
-  MRubyAssocData data{downstream, phase};
-
-  mrb_->ud = &data;
-
-  int rv = 0;
-  auto ai = mrb_gc_arena_save(mrb_);
-  auto ai_d = defer([ai, this]() { mrb_gc_arena_restore(mrb_, ai); });
-
-  const char *method;
-  switch (phase) {
-  case PHASE_REQUEST:
-    if (!mrb_respond_to(mrb_, app_, mrb_intern_lit(mrb_, "on_req"))) {
-      return 0;
-    }
-    method = "on_req";
-    break;
-  case PHASE_RESPONSE:
-    if (!mrb_respond_to(mrb_, app_, mrb_intern_lit(mrb_, "on_resp"))) {
-      return 0;
-    }
-    method = "on_resp";
-    break;
-  default:
-    assert(0);
-  }
-
-  auto res = mrb_funcall(mrb_, app_, method, 1, env_);
-  (void)res;
-
-  if (mrb_->exc) {
-    // If response has been committed, ignore error
-    if (downstream->get_response_state() != Downstream::MSG_COMPLETE) {
-      rv = -1;
-    }
-
-    auto exc = mrb_obj_value(mrb_->exc);
-    auto inspect = mrb_inspect(mrb_, exc);
-
-    LOG(ERROR) << "Exception caught while executing mruby code: "
-               << mrb_str_to_cstr(mrb_, inspect);
-  }
-
-  mrb_->ud = nullptr;
-
-  return rv;
-}
-
-int MRubyContext::run_on_request_proc(Downstream *downstream) {
-  return run_app(downstream, PHASE_REQUEST);
-}
-
-int MRubyContext::run_on_response_proc(Downstream *downstream) {
-  return run_app(downstream, PHASE_RESPONSE);
-}
-
-void MRubyContext::delete_downstream(Downstream *downstream) {
-  if (!mrb_) {
-    return;
-  }
-  delete_downstream_from_module(mrb_, downstream);
-}
-
-namespace {
-mrb_value instantiate_app(mrb_state *mrb, RProc *proc) {
-  mrb->ud = nullptr;
-
-  auto res = mrb_run(mrb, proc, mrb_top_self(mrb));
-
-  if (mrb->exc) {
-    auto exc = mrb_obj_value(mrb->exc);
-    auto inspect = mrb_inspect(mrb, exc);
-
-    LOG(ERROR) << "Exception caught while executing mruby code: "
-               << mrb_str_to_cstr(mrb, inspect);
-
-    return mrb_nil_value();
-  }
-
-  return res;
-}
-} // namespace
-
-// Based on
-// https://github.com/h2o/h2o/blob/master/lib/handler/mruby.c.  It is
-// very hard to write these kind of code because mruby has almost no
-// documentation about compiling or generating code, at least at the
-// time of this writing.
-RProc *compile(mrb_state *mrb, const StringRef &filename) {
-  if (filename.empty()) {
-    return nullptr;
-  }
-
-  auto infile = fopen(filename.c_str(), "rb");
-  if (infile == nullptr) {
-    return nullptr;
-  }
-  auto infile_d = defer(fclose, infile);
-
-  auto mrbc = mrbc_context_new(mrb);
-  if (mrbc == nullptr) {
-    LOG(ERROR) << "mrb_context_new failed";
-    return nullptr;
-  }
-  auto mrbc_d = defer(mrbc_context_free, mrb, mrbc);
-
-  auto parser = mrb_parse_file(mrb, infile, nullptr);
-  if (parser == nullptr) {
-    LOG(ERROR) << "mrb_parse_nstring failed";
-    return nullptr;
-  }
-  auto parser_d = defer(mrb_parser_free, parser);
-
-  if (parser->nerr != 0) {
-    LOG(ERROR) << "mruby parser detected parse error";
-    return nullptr;
-  }
-
-  auto proc = mrb_generate_code(mrb, parser);
-  if (proc == nullptr) {
-    LOG(ERROR) << "mrb_generate_code failed";
-    return nullptr;
-  }
-
-  return proc;
-}
-
-std::unique_ptr<MRubyContext> create_mruby_context(const StringRef &filename) {
-  if (filename.empty()) {
-    return make_unique<MRubyContext>(nullptr, mrb_nil_value(), mrb_nil_value());
-  }
-
-  auto mrb = mrb_open();
-  if (mrb == nullptr) {
-    LOG(ERROR) << "mrb_open failed";
-    return nullptr;
-  }
-
-  auto ai = mrb_gc_arena_save(mrb);
-
-  auto req_proc = compile(mrb, filename);
-
-  if (!req_proc) {
-    mrb_gc_arena_restore(mrb, ai);
-    LOG(ERROR) << "Could not compile mruby code " << filename;
-    mrb_close(mrb);
-    return nullptr;
-  }
-
-  auto env = init_module(mrb);
-
-  auto app = instantiate_app(mrb, req_proc);
-  if (mrb_nil_p(app)) {
-    mrb_gc_arena_restore(mrb, ai);
-    LOG(ERROR) << "Could not instantiate mruby app from " << filename;
-    mrb_close(mrb);
-    return nullptr;
-  }
-
-  mrb_gc_arena_restore(mrb, ai);
-
-  // TODO These are not necessary, because we retain app and env?
-  mrb_gc_protect(mrb, env);
-  mrb_gc_protect(mrb, app);
-
-  return make_unique<MRubyContext>(mrb, std::move(app), std::move(env));
-}
-
-mrb_sym intern_ptr(mrb_state *mrb, void *ptr) {
-  auto p = reinterpret_cast<uintptr_t>(ptr);
-
-  return mrb_intern(mrb, reinterpret_cast<const char *>(&p), sizeof(p));
-}
-
-void check_phase(mrb_state *mrb, int phase, int phase_mask) {
-  if ((phase & phase_mask) == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "operation was not allowed in this phase");
-  }
-}
-
-} // namespace mruby
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MRUBY_H
-#define SHRPX_MRUBY_H
-
-#include "shrpx.h"
-
-#include <memory>
-
-#include <mruby.h>
-#include <mruby/proc.h>
-
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Downstream;
-
-namespace mruby {
-
-class MRubyContext {
-public:
-  MRubyContext(mrb_state *mrb, mrb_value app, mrb_value env);
-  ~MRubyContext();
-
-  int run_on_request_proc(Downstream *downstream);
-  int run_on_response_proc(Downstream *downstream);
-
-  int run_app(Downstream *downstream, int phase);
-
-  void delete_downstream(Downstream *downstream);
-
-private:
-  mrb_state *mrb_;
-  mrb_value app_;
-  mrb_value env_;
-};
-
-enum {
-  PHASE_NONE = 0,
-  PHASE_REQUEST = 1,
-  PHASE_RESPONSE = 1 << 1,
-};
-
-struct MRubyAssocData {
-  Downstream *downstream;
-  int phase;
-};
-
-RProc *compile(mrb_state *mrb, const StringRef &filename);
-
-std::unique_ptr<MRubyContext> create_mruby_context(const StringRef &filename);
-
-// Return interned |ptr|.
-mrb_sym intern_ptr(mrb_state *mrb, void *ptr);
-
-// Checks that |phase| is set in |phase_mask|.  If not set, raise
-// exception.
-void check_phase(mrb_state *mrb, int phase, int phase_mask);
-
-} // namespace mruby
-
-} // namespace shrpx
-
-#endif // SHRPX_MRUBY_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_mruby_module.h"
-
-#include <array>
-
-#include <mruby/variable.h>
-#include <mruby/string.h>
-#include <mruby/hash.h>
-#include <mruby/array.h>
-
-#include "shrpx_mruby.h"
-#include "shrpx_mruby_module_env.h"
-#include "shrpx_mruby_module_request.h"
-#include "shrpx_mruby_module_response.h"
-
-namespace shrpx {
-
-namespace mruby {
-
-namespace {
-mrb_value create_env(mrb_state *mrb) {
-  auto module = mrb_module_get(mrb, "Nghttpx");
-
-  auto env_class = mrb_class_get_under(mrb, module, "Env");
-  auto request_class = mrb_class_get_under(mrb, module, "Request");
-  auto response_class = mrb_class_get_under(mrb, module, "Response");
-
-  auto env = mrb_obj_new(mrb, env_class, 0, nullptr);
-  auto req = mrb_obj_new(mrb, request_class, 0, nullptr);
-  auto resp = mrb_obj_new(mrb, response_class, 0, nullptr);
-
-  mrb_iv_set(mrb, env, mrb_intern_lit(mrb, "req"), req);
-  mrb_iv_set(mrb, env, mrb_intern_lit(mrb, "resp"), resp);
-
-  return env;
-}
-} // namespace
-
-void delete_downstream_from_module(mrb_state *mrb, Downstream *downstream) {
-  auto module = mrb_module_get(mrb, "Nghttpx");
-  auto env = mrb_obj_iv_get(mrb, reinterpret_cast<RObject *>(module),
-                            mrb_intern_lit(mrb, "env"));
-  if (mrb_nil_p(env)) {
-    return;
-  }
-
-  mrb_iv_remove(mrb, env, intern_ptr(mrb, downstream));
-}
-
-mrb_value init_module(mrb_state *mrb) {
-  auto module = mrb_define_module(mrb, "Nghttpx");
-
-  mrb_define_const(mrb, module, "REQUEST_PHASE",
-                   mrb_fixnum_value(PHASE_REQUEST));
-  mrb_define_const(mrb, module, "RESPONSE_PHASE",
-                   mrb_fixnum_value(PHASE_RESPONSE));
-
-  init_env_class(mrb, module);
-  init_request_class(mrb, module);
-  init_response_class(mrb, module);
-
-  return create_env(mrb);
-}
-
-mrb_value create_headers_hash(mrb_state *mrb, const HeaderRefs &headers) {
-  auto hash = mrb_hash_new(mrb);
-
-  for (auto &hd : headers) {
-    if (hd.name.empty() || hd.name[0] == ':') {
-      continue;
-    }
-    auto ai = mrb_gc_arena_save(mrb);
-
-    auto key = mrb_str_new(mrb, hd.name.c_str(), hd.name.size());
-    auto ary = mrb_hash_get(mrb, hash, key);
-    if (mrb_nil_p(ary)) {
-      ary = mrb_ary_new(mrb);
-      mrb_hash_set(mrb, hash, key, ary);
-    }
-    mrb_ary_push(mrb, ary, mrb_str_new(mrb, hd.value.c_str(), hd.value.size()));
-
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  return hash;
-}
-
-} // namespace mruby
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,460 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_mruby_module_env.h"
-
-#include <mruby/variable.h>
-#include <mruby/string.h>
-#include <mruby/hash.h>
-
-#include "shrpx_downstream.h"
-#include "shrpx_upstream.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_mruby.h"
-#include "shrpx_mruby_module.h"
-#include "shrpx_log.h"
-#include "shrpx_tls.h"
-
-namespace shrpx {
-
-namespace mruby {
-
-namespace {
-mrb_value env_init(mrb_state *mrb, mrb_value self) { return self; }
-} // namespace
-
-namespace {
-mrb_value env_get_req(mrb_state *mrb, mrb_value self) {
-  return mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "req"));
-}
-} // namespace
-
-namespace {
-mrb_value env_get_resp(mrb_state *mrb, mrb_value self) {
-  return mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "resp"));
-}
-} // namespace
-
-namespace {
-mrb_value env_get_ctx(mrb_state *mrb, mrb_value self) {
-  auto data = reinterpret_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-
-  auto dsym = intern_ptr(mrb, downstream);
-
-  auto ctx = mrb_iv_get(mrb, self, dsym);
-  if (mrb_nil_p(ctx)) {
-    ctx = mrb_hash_new(mrb);
-    mrb_iv_set(mrb, self, dsym, ctx);
-  }
-
-  return ctx;
-}
-} // namespace
-
-namespace {
-mrb_value env_get_phase(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-
-  return mrb_fixnum_value(data->phase);
-}
-} // namespace
-
-namespace {
-mrb_value env_get_remote_addr(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-  auto &ipaddr = handler->get_ipaddr();
-
-  return mrb_str_new(mrb, ipaddr.c_str(), ipaddr.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_server_port(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto faddr = handler->get_upstream_addr();
-
-  return mrb_fixnum_value(faddr->port);
-}
-} // namespace
-
-namespace {
-mrb_value env_get_server_addr(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto faddr = handler->get_upstream_addr();
-
-  return mrb_str_new(mrb, faddr->host.c_str(), faddr->host.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_used(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-
-  return handler->get_ssl() ? mrb_true_value() : mrb_false_value();
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_sni(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto sni = handler->get_tls_sni();
-
-  return mrb_str_new(mrb, sni.c_str(), sni.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_fingerprint_md(mrb_state *mrb, const EVP_MD *md) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto x = SSL_get_peer_certificate(ssl);
-  if (!x) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  // Currently the largest hash value is SHA-256, which is 32 bytes.
-  std::array<uint8_t, 32> buf;
-  auto slen = tls::get_x509_fingerprint(buf.data(), buf.size(), x, md);
-  X509_free(x);
-  if (slen == -1) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "could not compute client fingerprint");
-  }
-
-  // TODO Use template version of format_hex
-  auto &balloc = downstream->get_block_allocator();
-  auto f = util::format_hex(balloc,
-                            StringRef{std::begin(buf), std::begin(buf) + slen});
-  return mrb_str_new(mrb, f.c_str(), f.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_fingerprint_sha256(mrb_state *mrb,
-                                                mrb_value self) {
-  return env_get_tls_client_fingerprint_md(mrb, EVP_sha256());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_fingerprint_sha1(mrb_state *mrb, mrb_value self) {
-  return env_get_tls_client_fingerprint_md(mrb, EVP_sha1());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_subject_name(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto x = SSL_get_peer_certificate(ssl);
-  if (!x) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-  auto name = tls::get_x509_subject_name(balloc, x);
-  X509_free(x);
-  return mrb_str_new(mrb, name.c_str(), name.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_issuer_name(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto x = SSL_get_peer_certificate(ssl);
-  if (!x) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-  auto name = tls::get_x509_issuer_name(balloc, x);
-  X509_free(x);
-  return mrb_str_new(mrb, name.c_str(), name.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_serial(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto x = SSL_get_peer_certificate(ssl);
-  if (!x) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-  auto sn = tls::get_x509_serial(balloc, x);
-  X509_free(x);
-  return mrb_str_new(mrb, sn.c_str(), sn.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_not_before(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_fixnum_value(0);
-  }
-
-  auto x = SSL_get_peer_certificate(ssl);
-  if (!x) {
-    return mrb_fixnum_value(0);
-  }
-
-  time_t t;
-  if (tls::get_x509_not_before(t, x) != 0) {
-    return mrb_fixnum_value(0);
-  }
-
-  return mrb_fixnum_value(t);
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_client_not_after(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_fixnum_value(0);
-  }
-
-  auto x = SSL_get_peer_certificate(ssl);
-  if (!x) {
-    return mrb_fixnum_value(0);
-  }
-
-  time_t t;
-  if (tls::get_x509_not_after(t, x) != 0) {
-    return mrb_fixnum_value(0);
-  }
-
-  return mrb_fixnum_value(t);
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_cipher(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  return mrb_str_new_cstr(mrb, SSL_get_cipher_name(ssl));
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_protocol(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  return mrb_str_new_cstr(mrb, nghttp2::tls::get_tls_protocol(ssl));
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_session_id(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  auto session = SSL_get_session(ssl);
-  if (!session) {
-    return mrb_str_new_static(mrb, "", 0);
-  }
-
-  unsigned int session_id_length = 0;
-  auto session_id = SSL_SESSION_get_id(session, &session_id_length);
-
-  // TODO Use template version of util::format_hex.
-  auto &balloc = downstream->get_block_allocator();
-  auto id = util::format_hex(balloc, StringRef{session_id, session_id_length});
-  return mrb_str_new(mrb, id.c_str(), id.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_session_reused(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto ssl = handler->get_ssl();
-
-  if (!ssl) {
-    return mrb_false_value();
-  }
-
-  return SSL_session_reused(ssl) ? mrb_true_value() : mrb_false_value();
-}
-} // namespace
-
-namespace {
-mrb_value env_get_alpn(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto alpn = handler->get_alpn();
-  return mrb_str_new(mrb, alpn.c_str(), alpn.size());
-}
-} // namespace
-
-namespace {
-mrb_value env_get_tls_handshake_finished(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-  auto handler = upstream->get_client_handler();
-  auto conn = handler->get_connection();
-  return SSL_is_init_finished(conn->tls.ssl) ? mrb_true_value()
-                                             : mrb_false_value();
-}
-} // namespace
-
-void init_env_class(mrb_state *mrb, RClass *module) {
-  auto env_class =
-      mrb_define_class_under(mrb, module, "Env", mrb->object_class);
-
-  mrb_define_method(mrb, env_class, "initialize", env_init, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "req", env_get_req, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "resp", env_get_resp, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "ctx", env_get_ctx, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "phase", env_get_phase, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "remote_addr", env_get_remote_addr,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "server_addr", env_get_server_addr,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "server_port", env_get_server_port,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_used", env_get_tls_used,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_sni", env_get_tls_sni,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_fingerprint_sha256",
-                    env_get_tls_client_fingerprint_sha256, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_fingerprint_sha1",
-                    env_get_tls_client_fingerprint_sha1, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_issuer_name",
-                    env_get_tls_client_issuer_name, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_subject_name",
-                    env_get_tls_client_subject_name, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_serial",
-                    env_get_tls_client_serial, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_not_before",
-                    env_get_tls_client_not_before, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_client_not_after",
-                    env_get_tls_client_not_after, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_cipher", env_get_tls_cipher,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_protocol", env_get_tls_protocol,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_session_id", env_get_tls_session_id,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_session_reused",
-                    env_get_tls_session_reused, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "alpn", env_get_alpn, MRB_ARGS_NONE());
-  mrb_define_method(mrb, env_class, "tls_handshake_finished",
-                    env_get_tls_handshake_finished, MRB_ARGS_NONE());
-}
-
-} // namespace mruby
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_env.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MRUBY_MODULE_ENV_H
-#define SHRPX_MRUBY_MODULE_ENV_H
-
-#include "shrpx.h"
-
-#include <mruby.h>
-
-namespace shrpx {
-
-namespace mruby {
-
-void init_env_class(mrb_state *mrb, RClass *module);
-
-} // namespace mruby
-
-} // namespace shrpx
-
-#endif // SHRPX_MRUBY_MODULE_ENV_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MRUBY_MODULE_H
-#define SHRPX_MRUBY_MODULE_H
-
-#include "shrpx.h"
-
-#include <mruby.h>
-
-#include "http2.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Downstream;
-
-namespace mruby {
-
-mrb_value init_module(mrb_state *mrb);
-
-void delete_downstream_from_module(mrb_state *mrb, Downstream *downstream);
-
-mrb_value create_headers_hash(mrb_state *mrb, const HeaderRefs &headers);
-
-} // namespace mruby
-
-} // namespace shrpx
-
-#endif // SHRPX_MRUBY_MODULE_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,367 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_mruby_module_request.h"
-
-#include <mruby/variable.h>
-#include <mruby/string.h>
-#include <mruby/hash.h>
-#include <mruby/array.h>
-
-#include "shrpx_downstream.h"
-#include "shrpx_upstream.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_mruby.h"
-#include "shrpx_mruby_module.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "http2.h"
-
-namespace shrpx {
-
-namespace mruby {
-
-namespace {
-mrb_value request_init(mrb_state *mrb, mrb_value self) { return self; }
-} // namespace
-
-namespace {
-mrb_value request_get_http_version_major(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-  return mrb_fixnum_value(req.http_major);
-}
-} // namespace
-
-namespace {
-mrb_value request_get_http_version_minor(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-  return mrb_fixnum_value(req.http_minor);
-}
-} // namespace
-
-namespace {
-mrb_value request_get_method(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-  auto method = http2::to_method_string(req.method);
-
-  return mrb_str_new(mrb, method.c_str(), method.size());
-}
-} // namespace
-
-namespace {
-mrb_value request_set_method(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-
-  check_phase(mrb, data->phase, PHASE_REQUEST);
-
-  const char *method;
-  mrb_int n;
-  mrb_get_args(mrb, "s", &method, &n);
-  if (n == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "method must not be empty string");
-  }
-  auto token =
-      http2::lookup_method_token(reinterpret_cast<const uint8_t *>(method), n);
-  if (token == -1) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "method not supported");
-  }
-
-  req.method = token;
-
-  return self;
-}
-} // namespace
-
-namespace {
-mrb_value request_get_authority(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-
-  return mrb_str_new(mrb, req.authority.c_str(), req.authority.size());
-}
-} // namespace
-
-namespace {
-mrb_value request_set_authority(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-
-  auto &balloc = downstream->get_block_allocator();
-
-  check_phase(mrb, data->phase, PHASE_REQUEST);
-
-  const char *authority;
-  mrb_int n;
-  mrb_get_args(mrb, "s", &authority, &n);
-  if (n == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "authority must not be empty string");
-  }
-
-  req.authority =
-      make_string_ref(balloc, StringRef{authority, static_cast<size_t>(n)});
-
-  return self;
-}
-} // namespace
-
-namespace {
-mrb_value request_get_scheme(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-
-  return mrb_str_new(mrb, req.scheme.c_str(), req.scheme.size());
-}
-} // namespace
-
-namespace {
-mrb_value request_set_scheme(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-
-  auto &balloc = downstream->get_block_allocator();
-
-  check_phase(mrb, data->phase, PHASE_REQUEST);
-
-  const char *scheme;
-  mrb_int n;
-  mrb_get_args(mrb, "s", &scheme, &n);
-  if (n == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "scheme must not be empty string");
-  }
-
-  req.scheme =
-      make_string_ref(balloc, StringRef{scheme, static_cast<size_t>(n)});
-
-  return self;
-}
-} // namespace
-
-namespace {
-mrb_value request_get_path(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-
-  return mrb_str_new(mrb, req.path.c_str(), req.path.size());
-}
-} // namespace
-
-namespace {
-mrb_value request_set_path(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-
-  auto &balloc = downstream->get_block_allocator();
-
-  check_phase(mrb, data->phase, PHASE_REQUEST);
-
-  const char *path;
-  mrb_int pathlen;
-  mrb_get_args(mrb, "s", &path, &pathlen);
-
-  req.path =
-      make_string_ref(balloc, StringRef{path, static_cast<size_t>(pathlen)});
-
-  return self;
-}
-} // namespace
-
-namespace {
-mrb_value request_get_headers(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &req = downstream->request();
-  return create_headers_hash(mrb, req.fs.headers());
-}
-} // namespace
-
-namespace {
-mrb_value request_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-  auto &balloc = downstream->get_block_allocator();
-
-  check_phase(mrb, data->phase, PHASE_REQUEST);
-
-  mrb_value key, values;
-  mrb_get_args(mrb, "So", &key, &values);
-
-  if (RSTRING_LEN(key) == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "empty key is not allowed");
-  }
-
-  auto ai = mrb_gc_arena_save(mrb);
-
-  key = mrb_funcall(mrb, key, "downcase", 0);
-
-  auto keyref =
-      make_string_ref(balloc, StringRef{RSTRING_PTR(key),
-                                        static_cast<size_t>(RSTRING_LEN(key))});
-
-  mrb_gc_arena_restore(mrb, ai);
-
-  auto token = http2::lookup_token(keyref.byte(), keyref.size());
-
-  if (repl) {
-    size_t p = 0;
-    auto &headers = req.fs.headers();
-    for (size_t i = 0; i < headers.size(); ++i) {
-      auto &kv = headers[i];
-      if (kv.name == keyref) {
-        continue;
-      }
-      if (i != p) {
-        headers[p] = std::move(kv);
-      }
-      ++p;
-    }
-    headers.resize(p);
-  }
-
-  if (mrb_array_p(values)) {
-    auto n = mrb_ary_len(mrb, values);
-    for (int i = 0; i < n; ++i) {
-      auto value = mrb_ary_ref(mrb, values, i);
-      if (!mrb_string_p(value)) {
-        mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
-      }
-
-      req.fs.add_header_token(
-          keyref,
-          make_string_ref(balloc,
-                          StringRef{RSTRING_PTR(value),
-                                    static_cast<size_t>(RSTRING_LEN(value))}),
-          false, token);
-    }
-  } else if (mrb_string_p(values)) {
-    req.fs.add_header_token(
-        keyref,
-        make_string_ref(balloc,
-                        StringRef{RSTRING_PTR(values),
-                                  static_cast<size_t>(RSTRING_LEN(values))}),
-        false, token);
-  } else {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
-  }
-
-  return mrb_nil_value();
-}
-} // namespace
-
-namespace {
-mrb_value request_set_header(mrb_state *mrb, mrb_value self) {
-  return request_mod_header(mrb, self, true);
-}
-} // namespace
-
-namespace {
-mrb_value request_add_header(mrb_state *mrb, mrb_value self) {
-  return request_mod_header(mrb, self, false);
-}
-} // namespace
-
-namespace {
-mrb_value request_clear_headers(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-
-  check_phase(mrb, data->phase, PHASE_REQUEST);
-
-  req.fs.clear_headers();
-
-  return mrb_nil_value();
-}
-} // namespace
-
-namespace {
-mrb_value request_push(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto upstream = downstream->get_upstream();
-
-  const char *uri;
-  mrb_int len;
-  mrb_get_args(mrb, "s", &uri, &len);
-
-  upstream->initiate_push(downstream, StringRef{uri, static_cast<size_t>(len)});
-
-  return mrb_nil_value();
-}
-} // namespace
-
-void init_request_class(mrb_state *mrb, RClass *module) {
-  auto request_class =
-      mrb_define_class_under(mrb, module, "Request", mrb->object_class);
-
-  mrb_define_method(mrb, request_class, "initialize", request_init,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "http_version_major",
-                    request_get_http_version_major, MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "http_version_minor",
-                    request_get_http_version_minor, MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "method", request_get_method,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "method=", request_set_method,
-                    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, request_class, "authority", request_get_authority,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "authority=", request_set_authority,
-                    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, request_class, "scheme", request_get_scheme,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "scheme=", request_set_scheme,
-                    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, request_class, "path", request_get_path,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "path=", request_set_path,
-                    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, request_class, "headers", request_get_headers,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "add_header", request_add_header,
-                    MRB_ARGS_REQ(2));
-  mrb_define_method(mrb, request_class, "set_header", request_set_header,
-                    MRB_ARGS_REQ(2));
-  mrb_define_method(mrb, request_class, "clear_headers", request_clear_headers,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, request_class, "push", request_push, MRB_ARGS_REQ(1));
-}
-
-} // namespace mruby
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_request.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MRUBY_MODULE_REQUEST_H
-#define SHRPX_MRUBY_MODULE_REQUEST_H
-
-#include "shrpx.h"
-
-#include <mruby.h>
-
-namespace shrpx {
-
-namespace mruby {
-
-void init_request_class(mrb_state *mrb, RClass *module);
-
-} // namespace mruby
-
-} // namespace shrpx
-
-#endif // SHRPX_MRUBY_MODULE_REQUEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,394 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_mruby_module_response.h"
-
-#include <mruby/variable.h>
-#include <mruby/string.h>
-#include <mruby/hash.h>
-#include <mruby/array.h>
-
-#include "shrpx_downstream.h"
-#include "shrpx_upstream.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_mruby.h"
-#include "shrpx_mruby_module.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "http2.h"
-
-namespace shrpx {
-
-namespace mruby {
-
-namespace {
-mrb_value response_init(mrb_state *mrb, mrb_value self) { return self; }
-} // namespace
-
-namespace {
-mrb_value response_get_http_version_major(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &resp = downstream->response();
-  return mrb_fixnum_value(resp.http_major);
-}
-} // namespace
-
-namespace {
-mrb_value response_get_http_version_minor(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &resp = downstream->response();
-  return mrb_fixnum_value(resp.http_minor);
-}
-} // namespace
-
-namespace {
-mrb_value response_get_status(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &resp = downstream->response();
-  return mrb_fixnum_value(resp.http_status);
-}
-} // namespace
-
-namespace {
-mrb_value response_set_status(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &resp = downstream->response();
-
-  mrb_int status;
-  mrb_get_args(mrb, "i", &status);
-  // We don't support 1xx status code for mruby scripting yet.
-  if (status < 200 || status > 999) {
-    mrb_raise(mrb, E_RUNTIME_ERROR,
-              "invalid status; it should be [200, 999], inclusive");
-  }
-
-  resp.http_status = status;
-
-  return self;
-}
-} // namespace
-
-namespace {
-mrb_value response_get_headers(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  const auto &resp = downstream->response();
-
-  return create_headers_hash(mrb, resp.fs.headers());
-}
-} // namespace
-
-namespace {
-mrb_value response_mod_header(mrb_state *mrb, mrb_value self, bool repl) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &resp = downstream->response();
-  auto &balloc = downstream->get_block_allocator();
-
-  mrb_value key, values;
-  mrb_get_args(mrb, "So", &key, &values);
-
-  if (RSTRING_LEN(key) == 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "empty key is not allowed");
-  }
-
-  auto ai = mrb_gc_arena_save(mrb);
-
-  key = mrb_funcall(mrb, key, "downcase", 0);
-
-  auto keyref =
-      make_string_ref(balloc, StringRef{RSTRING_PTR(key),
-                                        static_cast<size_t>(RSTRING_LEN(key))});
-
-  mrb_gc_arena_restore(mrb, ai);
-
-  auto token = http2::lookup_token(keyref.byte(), keyref.size());
-
-  if (repl) {
-    size_t p = 0;
-    auto &headers = resp.fs.headers();
-    for (size_t i = 0; i < headers.size(); ++i) {
-      auto &kv = headers[i];
-      if (kv.name == keyref) {
-        continue;
-      }
-      if (i != p) {
-        headers[p] = std::move(kv);
-      }
-      ++p;
-    }
-    headers.resize(p);
-  }
-
-  if (mrb_array_p(values)) {
-    auto n = mrb_ary_len(mrb, values);
-    for (int i = 0; i < n; ++i) {
-      auto value = mrb_ary_ref(mrb, values, i);
-      if (!mrb_string_p(value)) {
-        mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
-      }
-
-      resp.fs.add_header_token(
-          keyref,
-          make_string_ref(balloc,
-                          StringRef{RSTRING_PTR(value),
-                                    static_cast<size_t>(RSTRING_LEN(value))}),
-          false, token);
-    }
-  } else if (mrb_string_p(values)) {
-    resp.fs.add_header_token(
-        keyref,
-        make_string_ref(balloc,
-                        StringRef{RSTRING_PTR(values),
-                                  static_cast<size_t>(RSTRING_LEN(values))}),
-        false, token);
-  } else {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
-  }
-
-  return mrb_nil_value();
-}
-} // namespace
-
-namespace {
-mrb_value response_set_header(mrb_state *mrb, mrb_value self) {
-  return response_mod_header(mrb, self, true);
-}
-} // namespace
-
-namespace {
-mrb_value response_add_header(mrb_state *mrb, mrb_value self) {
-  return response_mod_header(mrb, self, false);
-}
-} // namespace
-
-namespace {
-mrb_value response_clear_headers(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &resp = downstream->response();
-
-  resp.fs.clear_headers();
-
-  return mrb_nil_value();
-}
-} // namespace
-
-namespace {
-mrb_value response_return(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &req = downstream->request();
-  auto &resp = downstream->response();
-  int rv;
-
-  auto &balloc = downstream->get_block_allocator();
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "response has already been committed");
-  }
-
-  const char *val;
-  mrb_int vallen;
-  mrb_get_args(mrb, "|s", &val, &vallen);
-
-  const uint8_t *body = nullptr;
-  size_t bodylen = 0;
-
-  if (resp.http_status == 0) {
-    resp.http_status = 200;
-  }
-
-  if (downstream->expect_response_body() && vallen > 0) {
-    body = reinterpret_cast<const uint8_t *>(val);
-    bodylen = vallen;
-  }
-
-  auto cl = resp.fs.header(http2::HD_CONTENT_LENGTH);
-
-  if (resp.http_status == 204 ||
-      (resp.http_status == 200 && req.method == HTTP_CONNECT)) {
-    if (cl) {
-      // Delete content-length here
-      http2::erase_header(cl);
-    }
-
-    resp.fs.content_length = -1;
-  } else {
-    auto content_length = util::make_string_ref_uint(balloc, vallen);
-
-    if (cl) {
-      cl->value = content_length;
-    } else {
-      resp.fs.add_header_token(StringRef::from_lit("content-length"),
-                               content_length, false, http2::HD_CONTENT_LENGTH);
-    }
-
-    resp.fs.content_length = vallen;
-  }
-
-  auto date = resp.fs.header(http2::HD_DATE);
-  if (!date) {
-    auto lgconf = log_config();
-    lgconf->update_tstamp(std::chrono::system_clock::now());
-    resp.fs.add_header_token(StringRef::from_lit("date"),
-                             make_string_ref(balloc, lgconf->tstamp->time_http),
-                             false, http2::HD_DATE);
-  }
-
-  auto upstream = downstream->get_upstream();
-
-  rv = upstream->send_reply(downstream, body, bodylen);
-  if (rv != 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "could not send response");
-  }
-
-  auto handler = upstream->get_client_handler();
-
-  handler->signal_write();
-
-  return self;
-}
-} // namespace
-
-namespace {
-mrb_value response_send_info(mrb_state *mrb, mrb_value self) {
-  auto data = static_cast<MRubyAssocData *>(mrb->ud);
-  auto downstream = data->downstream;
-  auto &resp = downstream->response();
-  int rv;
-
-  if (downstream->get_response_state() == Downstream::MSG_COMPLETE) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "response has already been committed");
-  }
-
-  mrb_int http_status;
-  mrb_value hash;
-  mrb_get_args(mrb, "iH", &http_status, &hash);
-
-  if (http_status / 100 != 1) {
-    mrb_raise(mrb, E_RUNTIME_ERROR,
-              "status_code must be in range [100, 199], inclusive");
-  }
-
-  auto &balloc = downstream->get_block_allocator();
-
-  auto keys = mrb_hash_keys(mrb, hash);
-  auto keyslen = mrb_ary_len(mrb, keys);
-
-  for (int i = 0; i < keyslen; ++i) {
-    auto key = mrb_ary_ref(mrb, keys, i);
-    if (!mrb_string_p(key)) {
-      mrb_raise(mrb, E_RUNTIME_ERROR, "key must be string");
-    }
-
-    auto values = mrb_hash_get(mrb, hash, key);
-
-    auto ai = mrb_gc_arena_save(mrb);
-
-    key = mrb_funcall(mrb, key, "downcase", 0);
-
-    auto keyref = make_string_ref(
-        balloc,
-        StringRef{RSTRING_PTR(key), static_cast<size_t>(RSTRING_LEN(key))});
-
-    mrb_gc_arena_restore(mrb, ai);
-
-    auto token = http2::lookup_token(keyref.byte(), keyref.size());
-
-    if (mrb_array_p(values)) {
-      auto n = mrb_ary_len(mrb, values);
-      for (int i = 0; i < n; ++i) {
-        auto value = mrb_ary_ref(mrb, values, i);
-        if (!mrb_string_p(value)) {
-          mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
-        }
-
-        resp.fs.add_header_token(
-            keyref,
-            make_string_ref(balloc,
-                            StringRef{RSTRING_PTR(value),
-                                      static_cast<size_t>(RSTRING_LEN(value))}),
-            false, token);
-      }
-    } else if (mrb_string_p(values)) {
-      resp.fs.add_header_token(
-          keyref,
-          make_string_ref(balloc,
-                          StringRef{RSTRING_PTR(values),
-                                    static_cast<size_t>(RSTRING_LEN(values))}),
-          false, token);
-    } else {
-      mrb_raise(mrb, E_RUNTIME_ERROR, "value must be string");
-    }
-  }
-
-  resp.http_status = http_status;
-
-  auto upstream = downstream->get_upstream();
-
-  rv = upstream->on_downstream_header_complete(downstream);
-  if (rv != 0) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "could not send non-final response");
-  }
-
-  return self;
-}
-} // namespace
-
-void init_response_class(mrb_state *mrb, RClass *module) {
-  auto response_class =
-      mrb_define_class_under(mrb, module, "Response", mrb->object_class);
-
-  mrb_define_method(mrb, response_class, "initialize", response_init,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, response_class, "http_version_major",
-                    response_get_http_version_major, MRB_ARGS_NONE());
-  mrb_define_method(mrb, response_class, "http_version_minor",
-                    response_get_http_version_minor, MRB_ARGS_NONE());
-  mrb_define_method(mrb, response_class, "status", response_get_status,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, response_class, "status=", response_set_status,
-                    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, response_class, "headers", response_get_headers,
-                    MRB_ARGS_NONE());
-  mrb_define_method(mrb, response_class, "add_header", response_add_header,
-                    MRB_ARGS_REQ(2));
-  mrb_define_method(mrb, response_class, "set_header", response_set_header,
-                    MRB_ARGS_REQ(2));
-  mrb_define_method(mrb, response_class, "clear_headers",
-                    response_clear_headers, MRB_ARGS_NONE());
-  mrb_define_method(mrb, response_class, "return", response_return,
-                    MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, response_class, "send_info", response_send_info,
-                    MRB_ARGS_REQ(2));
-}
-
-} // namespace mruby
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_mruby_module_response.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_MRUBY_MODULE_RESPONSE_H
-#define SHRPX_MRUBY_MODULE_RESPONSE_H
-
-#include "shrpx.h"
-
-#include <mruby.h>
-
-namespace shrpx {
-
-namespace mruby {
-
-void init_response_class(mrb_state *mrb, RClass *module);
-
-} // namespace mruby
-
-} // namespace shrpx
-
-#endif // SHRPX_MRUBY_MODULE_RESPONSE_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_process.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_process.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_process.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_process.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_PROCESS_H
-#define SHRPX_PROCESS_H
-
-#include "shrpx.h"
-
-namespace shrpx {
-
-constexpr uint8_t SHRPX_IPC_REOPEN_LOG = 1;
-constexpr uint8_t SHRPX_IPC_GRACEFUL_SHUTDOWN = 2;
-
-} // namespace shrpx
-
-#endif // SHRPX_PROCESS_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_rate_limit.h"
-
-#include <limits>
-
-#include "shrpx_connection.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-namespace {
-void regencb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto r = static_cast<RateLimit *>(w->data);
-  r->regen();
-}
-} // namespace
-
-RateLimit::RateLimit(struct ev_loop *loop, ev_io *w, size_t rate, size_t burst,
-                     Connection *conn)
-    : w_(w),
-      loop_(loop),
-      conn_(conn),
-      rate_(rate),
-      burst_(burst),
-      avail_(burst),
-      startw_req_(false) {
-  ev_timer_init(&t_, regencb, 0., 1.);
-  t_.data = this;
-  if (rate_ > 0) {
-    ev_timer_again(loop_, &t_);
-  }
-}
-
-RateLimit::~RateLimit() { ev_timer_stop(loop_, &t_); }
-
-size_t RateLimit::avail() const {
-  if (rate_ == 0) {
-    return std::numeric_limits<ssize_t>::max();
-  }
-  return avail_;
-}
-
-void RateLimit::drain(size_t n) {
-  if (rate_ == 0) {
-    return;
-  }
-  n = std::min(avail_, n);
-  avail_ -= n;
-  if (avail_ == 0) {
-    ev_io_stop(loop_, w_);
-  }
-}
-
-void RateLimit::regen() {
-  if (rate_ == 0) {
-    return;
-  }
-  if (avail_ + rate_ > burst_) {
-    avail_ = burst_;
-  } else {
-    avail_ += rate_;
-  }
-
-  if (w_->fd >= 0 && avail_ > 0 && startw_req_) {
-    ev_io_start(loop_, w_);
-    handle_tls_pending_read();
-  }
-}
-
-void RateLimit::startw() {
-  if (w_->fd < 0) {
-    return;
-  }
-  startw_req_ = true;
-  if (rate_ == 0 || avail_ > 0) {
-    ev_io_start(loop_, w_);
-    handle_tls_pending_read();
-    return;
-  }
-}
-
-void RateLimit::stopw() {
-  startw_req_ = false;
-  ev_io_stop(loop_, w_);
-}
-
-void RateLimit::handle_tls_pending_read() {
-  if (!conn_ || !conn_->tls.ssl || !conn_->tls.initial_handshake_done ||
-      (SSL_pending(conn_->tls.ssl) == 0 && conn_->tls.rbuf.rleft() == 0 &&
-       conn_->tls.earlybuf.rleft() == 0)) {
-    return;
-  }
-
-  // Note that ev_feed_event works without starting watcher, but we
-  // only call this function if watcher is active.
-  ev_feed_event(loop_, w_, EV_READ);
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_rate_limit.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_RATE_LIMIT_H
-#define SHRPX_RATE_LIMIT_H
-
-#include "shrpx.h"
-
-#include <ev.h>
-
-#include <openssl/ssl.h>
-
-namespace shrpx {
-
-struct Connection;
-
-class RateLimit {
-public:
-  // We need |conn| object to check that it has unread bytes for TLS
-  // connection.
-  RateLimit(struct ev_loop *loop, ev_io *w, size_t rate, size_t burst,
-            Connection *conn = nullptr);
-  ~RateLimit();
-  size_t avail() const;
-  void drain(size_t n);
-  void regen();
-  void startw();
-  void stopw();
-  // Feeds event if conn_->tls object has unread bytes.  This is
-  // required since it is buffered in conn_->tls object, io event is
-  // not generated unless new incoming data is received.
-  void handle_tls_pending_read();
-
-private:
-  ev_timer t_;
-  ev_io *w_;
-  struct ev_loop *loop_;
-  Connection *conn_;
-  size_t rate_;
-  size_t burst_;
-  size_t avail_;
-  bool startw_req_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_RATE_LIMIT_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,406 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_router.h"
-
-#include <algorithm>
-
-#include "shrpx_config.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-RNode::RNode() : s(nullptr), len(0), index(-1), wildcard_index(-1) {}
-
-RNode::RNode(const char *s, size_t len, ssize_t index, ssize_t wildcard_index)
-    : s(s), len(len), index(index), wildcard_index(wildcard_index) {}
-
-Router::Router() : balloc_(1024, 1024), root_{} {}
-
-Router::~Router() {}
-
-namespace {
-RNode *find_next_node(const RNode *node, char c) {
-  auto itr = std::lower_bound(std::begin(node->next), std::end(node->next), c,
-                              [](const std::unique_ptr<RNode> &lhs,
-                                 const char c) { return lhs->s[0] < c; });
-  if (itr == std::end(node->next) || (*itr)->s[0] != c) {
-    return nullptr;
-  }
-
-  return (*itr).get();
-}
-} // namespace
-
-namespace {
-void add_next_node(RNode *node, std::unique_ptr<RNode> new_node) {
-  auto itr = std::lower_bound(std::begin(node->next), std::end(node->next),
-                              new_node->s[0],
-                              [](const std::unique_ptr<RNode> &lhs,
-                                 const char c) { return lhs->s[0] < c; });
-  node->next.insert(itr, std::move(new_node));
-}
-} // namespace
-
-void Router::add_node(RNode *node, const char *pattern, size_t patlen,
-                      ssize_t index, ssize_t wildcard_index) {
-  auto pat = make_string_ref(balloc_, StringRef{pattern, patlen});
-  auto new_node =
-      make_unique<RNode>(pat.c_str(), pat.size(), index, wildcard_index);
-  add_next_node(node, std::move(new_node));
-}
-
-size_t Router::add_route(const StringRef &pattern, size_t idx, bool wildcard) {
-  ssize_t index = -1, wildcard_index = -1;
-  if (wildcard) {
-    wildcard_index = idx;
-  } else {
-    index = idx;
-  }
-
-  auto node = &root_;
-  size_t i = 0;
-
-  for (;;) {
-    auto next_node = find_next_node(node, pattern[i]);
-    if (next_node == nullptr) {
-      add_node(node, pattern.c_str() + i, pattern.size() - i, index,
-               wildcard_index);
-      return idx;
-    }
-
-    node = next_node;
-
-    auto slen = pattern.size() - i;
-    auto s = pattern.c_str() + i;
-    auto n = std::min(node->len, slen);
-    size_t j;
-    for (j = 0; j < n && node->s[j] == s[j]; ++j)
-      ;
-    if (j == n) {
-      // The common prefix was matched
-      if (slen == node->len) {
-        // Complete match
-        if (index != -1) {
-          if (node->index != -1) {
-            // Return the existing index for duplicates.
-            return node->index;
-          }
-          node->index = index;
-          return idx;
-        }
-
-        assert(wildcard_index != -1);
-
-        if (node->wildcard_index != -1) {
-          return node->wildcard_index;
-        }
-        node->wildcard_index = wildcard_index;
-        return idx;
-      }
-
-      if (slen > node->len) {
-        // We still have pattern to add
-        i += j;
-
-        continue;
-      }
-    }
-
-    if (node->len > j) {
-      // node must be split into 2 nodes.  new_node is now the child
-      // of node.
-      auto new_node = make_unique<RNode>(&node->s[j], node->len - j,
-                                         node->index, node->wildcard_index);
-      std::swap(node->next, new_node->next);
-
-      node->len = j;
-      node->index = -1;
-      node->wildcard_index = -1;
-
-      add_next_node(node, std::move(new_node));
-
-      if (slen == j) {
-        node->index = index;
-        node->wildcard_index = wildcard_index;
-        return idx;
-      }
-    }
-
-    i += j;
-
-    assert(pattern.size() > i);
-    add_node(node, pattern.c_str() + i, pattern.size() - i, index,
-             wildcard_index);
-
-    return idx;
-  }
-}
-
-namespace {
-const RNode *match_complete(size_t *offset, const RNode *node,
-                            const char *first, const char *last) {
-  *offset = 0;
-
-  if (first == last) {
-    return node;
-  }
-
-  auto p = first;
-
-  for (;;) {
-    auto next_node = find_next_node(node, *p);
-    if (next_node == nullptr) {
-      return nullptr;
-    }
-
-    node = next_node;
-
-    auto n = std::min(node->len, static_cast<size_t>(last - p));
-    if (memcmp(node->s, p, n) != 0) {
-      return nullptr;
-    }
-    p += n;
-    if (p == last) {
-      *offset = n;
-      return node;
-    }
-  }
-}
-} // namespace
-
-namespace {
-const RNode *match_partial(bool *pattern_is_wildcard, const RNode *node,
-                           size_t offset, const char *first, const char *last) {
-  *pattern_is_wildcard = false;
-
-  if (first == last) {
-    if (node->len == offset) {
-      return node;
-    }
-    return nullptr;
-  }
-
-  auto p = first;
-
-  const RNode *found_node = nullptr;
-
-  if (offset > 0) {
-    auto n = std::min(node->len - offset, static_cast<size_t>(last - first));
-    if (memcmp(node->s + offset, first, n) != 0) {
-      return nullptr;
-    }
-
-    p += n;
-
-    if (p == last) {
-      if (node->len == offset + n) {
-        if (node->index != -1) {
-          return node;
-        }
-
-        return nullptr;
-      }
-
-      if (node->index != -1 && offset + n + 1 == node->len &&
-          node->s[node->len - 1] == '/') {
-        return node;
-      }
-
-      return nullptr;
-    }
-
-    if (node->wildcard_index != -1) {
-      found_node = node;
-      *pattern_is_wildcard = true;
-    } else if (node->index != -1 && node->s[node->len - 1] == '/') {
-      found_node = node;
-      *pattern_is_wildcard = false;
-    }
-
-    assert(node->len == offset + n);
-  }
-
-  for (;;) {
-    auto next_node = find_next_node(node, *p);
-    if (next_node == nullptr) {
-      return found_node;
-    }
-
-    node = next_node;
-
-    auto n = std::min(node->len, static_cast<size_t>(last - p));
-    if (memcmp(node->s, p, n) != 0) {
-      return found_node;
-    }
-
-    p += n;
-
-    if (p == last) {
-      if (node->len == n) {
-        // Complete match with this node
-        if (node->index != -1) {
-          *pattern_is_wildcard = false;
-          return node;
-        }
-
-        return found_node;
-      }
-
-      // We allow match without trailing "/" at the end of pattern.
-      // So, if pattern ends with '/', and pattern and path matches
-      // without that slash, we consider they match to deal with
-      // request to the directory without trailing slash.  That is if
-      // pattern is "/foo/" and path is "/foo", we consider they
-      // match.
-      if (node->index != -1 && n + 1 == node->len && node->s[n] == '/') {
-        *pattern_is_wildcard = false;
-        return node;
-      }
-
-      return found_node;
-    }
-
-    if (node->wildcard_index != -1) {
-      found_node = node;
-      *pattern_is_wildcard = true;
-    } else if (node->index != -1 && node->s[node->len - 1] == '/') {
-      // This is the case when pattern which ends with "/" is included
-      // in query.
-      found_node = node;
-      *pattern_is_wildcard = false;
-    }
-
-    assert(node->len == n);
-  }
-}
-} // namespace
-
-ssize_t Router::match(const StringRef &host, const StringRef &path) const {
-  const RNode *node;
-  size_t offset;
-
-  node = match_complete(&offset, &root_, std::begin(host), std::end(host));
-  if (node == nullptr) {
-    return -1;
-  }
-
-  bool pattern_is_wildcard;
-  node = match_partial(&pattern_is_wildcard, node, offset, std::begin(path),
-                       std::end(path));
-  if (node == nullptr || node == &root_) {
-    return -1;
-  }
-
-  return pattern_is_wildcard ? node->wildcard_index : node->index;
-}
-
-ssize_t Router::match(const StringRef &s) const {
-  const RNode *node;
-  size_t offset;
-
-  node = match_complete(&offset, &root_, std::begin(s), std::end(s));
-  if (node == nullptr) {
-    return -1;
-  }
-
-  if (node->len != offset) {
-    return -1;
-  }
-
-  return node->index;
-}
-
-namespace {
-const RNode *match_prefix(size_t *nread, const RNode *node, const char *first,
-                          const char *last) {
-  if (first == last) {
-    return nullptr;
-  }
-
-  auto p = first;
-
-  for (;;) {
-    auto next_node = find_next_node(node, *p);
-    if (next_node == nullptr) {
-      return nullptr;
-    }
-
-    node = next_node;
-
-    auto n = std::min(node->len, static_cast<size_t>(last - p));
-    if (memcmp(node->s, p, n) != 0) {
-      return nullptr;
-    }
-
-    p += n;
-
-    if (p != last) {
-      if (node->index != -1) {
-        *nread = p - first;
-        return node;
-      }
-      continue;
-    }
-
-    if (node->len == n) {
-      *nread = p - first;
-      return node;
-    }
-
-    return nullptr;
-  }
-}
-} // namespace
-
-ssize_t Router::match_prefix(size_t *nread, const RNode **last_node,
-                             const StringRef &s) const {
-  if (*last_node == nullptr) {
-    *last_node = &root_;
-  }
-
-  auto node =
-      ::shrpx::match_prefix(nread, *last_node, std::begin(s), std::end(s));
-  if (node == nullptr) {
-    return -1;
-  }
-
-  *last_node = node;
-
-  return node->index;
-}
-
-namespace {
-void dump_node(const RNode *node, int depth) {
-  fprintf(stderr, "%*ss='%.*s', len=%zu, index=%zd\n", depth, "",
-          (int)node->len, node->s, node->len, node->index);
-  for (auto &nd : node->next) {
-    dump_node(nd.get(), depth + 4);
-  }
-}
-} // namespace
-
-void Router::dump() const { dump_node(&root_, 0); }
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_ROUTER_H
-#define SHRPX_ROUTER_H
-
-#include "shrpx.h"
-
-#include <vector>
-#include <memory>
-
-#include "allocator.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-struct RNode {
-  RNode();
-  RNode(const char *s, size_t len, ssize_t index, ssize_t wildcard_index);
-  RNode(RNode &&) = default;
-  RNode(const RNode &) = delete;
-  RNode &operator=(RNode &&) = default;
-  RNode &operator=(const RNode &) = delete;
-
-  // Next RNode, sorted by s[0].
-  std::vector<std::unique_ptr<RNode>> next;
-  // Stores pointer to the string this node represents.  Not
-  // NULL-terminated.
-  const char *s;
-  // Length of |s|
-  size_t len;
-  // Index of pattern if match ends in this node.  Note that we don't
-  // store duplicated pattern.
-  ssize_t index;
-  // Index of wildcard pattern if query includes this node as prefix
-  // and it still has suffix to match.  Note that we don't store
-  // duplicated pattern.
-  ssize_t wildcard_index;
-};
-
-class Router {
-public:
-  Router();
-  ~Router();
-  Router(Router &&) = default;
-  Router(const Router &) = delete;
-  Router &operator=(Router &&) = default;
-  Router &operator=(const Router &) = delete;
-
-  // Adds route |pattern| with its |index|.  If same pattern has
-  // already been added, the existing index is returned.  If
-  // |wildcard| is true, |pattern| is considered as wildcard pattern,
-  // and all paths which have the |pattern| as prefix and are strictly
-  // longer than |pattern| match.  The wildcard pattern only works
-  // with match(const StringRef&, const StringRef&).
-  size_t add_route(const StringRef &pattern, size_t index,
-                   bool wildcard = false);
-  // Returns the matched index of pattern.  -1 if there is no match.
-  ssize_t match(const StringRef &host, const StringRef &path) const;
-  // Returns the matched index of pattern |s|.  -1 if there is no
-  // match.
-  ssize_t match(const StringRef &s) const;
-  // Returns the matched index of pattern if a pattern is a suffix of
-  // |s|, otherwise -1.  If |*last_node| is not nullptr, it specifies
-  // the first node to start matching.  If it is nullptr, match will
-  // start from scratch.  When the match was found (the return value
-  // is not -1), |*nread| has the number of bytes matched in |s|, and
-  // |*last_node| has the last matched node.  One can continue to
-  // match the longer pattern using the returned |*last_node| to the
-  // another invocation of this function until it returns -1.
-  ssize_t match_prefix(size_t *nread, const RNode **last_node,
-                       const StringRef &s) const;
-
-  void add_node(RNode *node, const char *pattern, size_t patlen, ssize_t index,
-                ssize_t wildcard_index);
-
-  void dump() const;
-
-private:
-  BlockAllocator balloc_;
-  // The root node of Patricia tree.  This is special node and its s
-  // field is nulptr, and len field is 0.
-  RNode root_;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_ROUTER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_router_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "shrpx_router.h"
-
-namespace shrpx {
-
-struct Pattern {
-  StringRef pattern;
-  size_t idx;
-  bool wildcard;
-};
-
-void test_shrpx_router_match(void) {
-  auto patterns = std::vector<Pattern>{
-      {StringRef::from_lit("nghttp2.org/"), 0},
-      {StringRef::from_lit("nghttp2.org/alpha"), 1},
-      {StringRef::from_lit("nghttp2.org/alpha/"), 2},
-      {StringRef::from_lit("nghttp2.org/alpha/bravo/"), 3},
-      {StringRef::from_lit("www.nghttp2.org/alpha/"), 4},
-      {StringRef::from_lit("/alpha"), 5},
-      {StringRef::from_lit("example.com/alpha/"), 6},
-  };
-
-  Router router;
-
-  for (auto &p : patterns) {
-    router.add_route(p.pattern, p.idx);
-  }
-
-  ssize_t idx;
-
-  idx = router.match(StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/"));
-
-  CU_ASSERT(0 == idx);
-
-  idx = router.match(StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha"));
-
-  CU_ASSERT(1 == idx);
-
-  idx = router.match(StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/"));
-
-  CU_ASSERT(2 == idx);
-
-  idx = router.match(StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/charlie"));
-
-  CU_ASSERT(2 == idx);
-
-  idx = router.match(StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo/"));
-
-  CU_ASSERT(3 == idx);
-
-  // matches pattern when last '/' is missing in path
-  idx = router.match(StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo"));
-
-  idx = router.match(StringRef{}, StringRef::from_lit("/alpha"));
-
-  CU_ASSERT(5 == idx);
-}
-
-void test_shrpx_router_match_wildcard(void) {
-  constexpr auto patterns = std::array<Pattern, 6>{{
-      {StringRef::from_lit("nghttp2.org/"), 0},
-      {StringRef::from_lit("nghttp2.org/"), 1, true},
-      {StringRef::from_lit("nghttp2.org/alpha/"), 2},
-      {StringRef::from_lit("nghttp2.org/alpha/"), 3, true},
-      {StringRef::from_lit("nghttp2.org/bravo"), 4},
-      {StringRef::from_lit("nghttp2.org/bravo"), 5, true},
-  }};
-
-  Router router;
-
-  for (auto &p : patterns) {
-    router.add_route(p.pattern, p.idx, p.wildcard);
-  }
-
-  CU_ASSERT(0 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/")));
-
-  CU_ASSERT(1 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/a")));
-
-  CU_ASSERT(1 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/charlie")));
-
-  CU_ASSERT(2 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/alpha")));
-
-  CU_ASSERT(2 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/alpha/")));
-
-  CU_ASSERT(3 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/alpha/b")));
-
-  CU_ASSERT(4 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/bravo")));
-
-  CU_ASSERT(5 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/bravocharlie")));
-
-  CU_ASSERT(5 == router.match(StringRef::from_lit("nghttp2.org"),
-                              StringRef::from_lit("/bravo/")));
-}
-
-void test_shrpx_router_match_prefix(void) {
-  auto patterns = std::vector<Pattern>{
-      {StringRef::from_lit("gro.2ptthgn."), 0},
-      {StringRef::from_lit("gro.2ptthgn.www."), 1},
-      {StringRef::from_lit("gro.2ptthgn.gmi."), 2},
-      {StringRef::from_lit("gro.2ptthgn.gmi.ahpla."), 3},
-  };
-
-  Router router;
-
-  for (auto &p : patterns) {
-    router.add_route(p.pattern, p.idx);
-  }
-
-  ssize_t idx;
-  const RNode *node;
-  size_t nread;
-
-  node = nullptr;
-
-  idx = router.match_prefix(&nread, &node,
-                            StringRef::from_lit("gro.2ptthgn.gmi.ahpla.ovarb"));
-
-  CU_ASSERT(0 == idx);
-  CU_ASSERT(12 == nread);
-
-  idx = router.match_prefix(&nread, &node,
-                            StringRef::from_lit("gmi.ahpla.ovarb"));
-
-  CU_ASSERT(2 == idx);
-  CU_ASSERT(4 == nread);
-
-  idx = router.match_prefix(&nread, &node, StringRef::from_lit("ahpla.ovarb"));
-
-  CU_ASSERT(3 == idx);
-  CU_ASSERT(6 == nread);
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_router_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_ROUTER_TEST_H
-#define SHRPX_ROUTER_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_shrpx_router_match(void);
-void test_shrpx_router_match_wildcard(void);
-void test_shrpx_router_match_prefix(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_ROUTER_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_signal.h"
-
-#include <cerrno>
-
-#include "shrpx_log.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-int shrpx_signal_block_all(sigset_t *oldset) {
-  sigset_t newset;
-
-  sigfillset(&newset);
-
-#ifndef NOTHREADS
-  int rv;
-
-  rv = pthread_sigmask(SIG_SETMASK, &newset, oldset);
-
-  if (rv != 0) {
-    errno = rv;
-    return -1;
-  }
-
-  return 0;
-#else  // NOTHREADS
-  return sigprocmask(SIG_SETMASK, &newset, oldset);
-#endif // NOTHREADS
-}
-
-int shrpx_signal_unblock_all() {
-  sigset_t newset;
-
-  sigemptyset(&newset);
-
-#ifndef NOTHREADS
-  int rv;
-
-  rv = pthread_sigmask(SIG_SETMASK, &newset, nullptr);
-
-  if (rv != 0) {
-    errno = rv;
-    return -1;
-  }
-
-  return 0;
-#else  // NOTHREADS
-  return sigprocmask(SIG_SETMASK, &newset, nullptr);
-#endif // NOTHREADS
-}
-
-int shrpx_signal_set(sigset_t *set) {
-#ifndef NOTHREADS
-  int rv;
-
-  rv = pthread_sigmask(SIG_SETMASK, set, nullptr);
-
-  if (rv != 0) {
-    errno = rv;
-    return -1;
-  }
-
-  return 0;
-#else  // NOTHREADS
-  return sigprocmask(SIG_SETMASK, set, nullptr);
-#endif // NOTHREADS
-}
-
-namespace {
-template <typename Signals>
-int signal_set_handler(void (*handler)(int), Signals &&sigs) {
-  struct sigaction act {};
-  act.sa_handler = handler;
-  sigemptyset(&act.sa_mask);
-  int rv;
-  for (auto sig : sigs) {
-    rv = sigaction(sig, &act, nullptr);
-    if (rv != 0) {
-      return -1;
-    }
-  }
-  return 0;
-}
-} // namespace
-
-namespace {
-constexpr auto master_proc_ign_signals = std::array<int, 1>{{SIGPIPE}};
-} // namespace
-
-namespace {
-constexpr auto worker_proc_ign_signals =
-    std::array<int, 5>{{REOPEN_LOG_SIGNAL, EXEC_BINARY_SIGNAL,
-                        GRACEFUL_SHUTDOWN_SIGNAL, RELOAD_SIGNAL, SIGPIPE}};
-} // namespace
-
-int shrpx_signal_set_master_proc_ign_handler() {
-  return signal_set_handler(SIG_IGN, master_proc_ign_signals);
-}
-
-int shrpx_signal_unset_master_proc_ign_handler() {
-  return signal_set_handler(SIG_DFL, master_proc_ign_signals);
-}
-
-int shrpx_signal_set_worker_proc_ign_handler() {
-  return signal_set_handler(SIG_IGN, worker_proc_ign_signals);
-}
-
-int shrpx_signal_unset_worker_proc_ign_handler() {
-  return signal_set_handler(SIG_DFL, worker_proc_ign_signals);
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_signal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_SIGNAL_H
-#define SHRPX_SIGNAL_H
-
-#include "shrpx.h"
-
-#include <signal.h>
-
-namespace shrpx {
-
-constexpr int REOPEN_LOG_SIGNAL = SIGUSR1;
-constexpr int EXEC_BINARY_SIGNAL = SIGUSR2;
-constexpr int GRACEFUL_SHUTDOWN_SIGNAL = SIGQUIT;
-constexpr int RELOAD_SIGNAL = SIGHUP;
-
-// Blocks all signals.  The previous signal mask is stored into
-// |oldset| if it is not nullptr.  This function returns 0 if it
-// succeeds, or -1.  The errno will indicate the error.
-int shrpx_signal_block_all(sigset_t *oldset);
-
-// Unblocks all signals.  This function returns 0 if it succeeds, or
-// -1.  The errno will indicate the error.
-int shrpx_signal_unblock_all();
-
-// Sets signal mask |set|.  This function returns 0 if it succeeds, or
-// -1.  The errno will indicate the error.
-int shrpx_signal_set(sigset_t *set);
-
-int shrpx_signal_set_master_proc_ign_handler();
-int shrpx_signal_unset_master_proc_ign_handler();
-
-int shrpx_signal_set_worker_proc_ign_handler();
-int shrpx_signal_unset_worker_proc_ign_handler();
-
-} // namespace shrpx
-
-#endif // SHRPX_SIGNAL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2119 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_tls.h"
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#include <netinet/tcp.h>
-#include <pthread.h>
-#include <sys/types.h>
-
-#include <vector>
-#include <string>
-#include <iomanip>
-
-#include <iostream>
-
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/rand.h>
-#include <openssl/dh.h>
-#ifndef OPENSSL_NO_OCSP
-#  include <openssl/ocsp.h>
-#endif // OPENSSL_NO_OCSP
-
-#include <nghttp2/nghttp2.h>
-
-#include "shrpx_log.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_config.h"
-#include "shrpx_worker.h"
-#include "shrpx_downstream_connection_pool.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_memcached_request.h"
-#include "shrpx_memcached_dispatcher.h"
-#include "shrpx_connection_handler.h"
-#include "util.h"
-#include "tls.h"
-#include "template.h"
-#include "ssl_compat.h"
-#include "timegm.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace tls {
-
-#if !OPENSSL_1_1_API
-namespace {
-const unsigned char *ASN1_STRING_get0_data(ASN1_STRING *x) {
-  return ASN1_STRING_data(x);
-}
-} // namespace
-#endif // !OPENSSL_1_1_API
-
-#ifndef OPENSSL_NO_NEXTPROTONEG
-namespace {
-int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
-                  void *arg) {
-  auto &prefs = get_config()->tls.alpn_prefs;
-  *data = prefs.data();
-  *len = prefs.size();
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-namespace {
-int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
-  if (!preverify_ok) {
-    int err = X509_STORE_CTX_get_error(ctx);
-    int depth = X509_STORE_CTX_get_error_depth(ctx);
-    if (err == X509_V_ERR_CERT_HAS_EXPIRED && depth == 0 &&
-        get_config()->tls.client_verify.tolerate_expired) {
-      LOG(INFO) << "The client certificate has expired, but is accepted by "
-                   "configuration";
-      return 1;
-    }
-    LOG(ERROR) << "client certificate verify error:num=" << err << ":"
-               << X509_verify_cert_error_string(err) << ":depth=" << depth;
-  }
-  return preverify_ok;
-}
-} // namespace
-
-int set_alpn_prefs(std::vector<unsigned char> &out,
-                   const std::vector<StringRef> &protos) {
-  size_t len = 0;
-
-  for (const auto &proto : protos) {
-    if (proto.size() > 255) {
-      LOG(FATAL) << "Too long ALPN identifier: " << proto.size();
-      return -1;
-    }
-
-    len += 1 + proto.size();
-  }
-
-  if (len > (1 << 16) - 1) {
-    LOG(FATAL) << "Too long ALPN identifier list: " << len;
-    return -1;
-  }
-
-  out.resize(len);
-  auto ptr = out.data();
-
-  for (const auto &proto : protos) {
-    *ptr++ = proto.size();
-    ptr = std::copy(std::begin(proto), std::end(proto), ptr);
-  }
-
-  return 0;
-}
-
-namespace {
-int ssl_pem_passwd_cb(char *buf, int size, int rwflag, void *user_data) {
-  auto config = static_cast<Config *>(user_data);
-  auto len = static_cast<int>(config->tls.private_key_passwd.size());
-  if (size < len + 1) {
-    LOG(ERROR) << "ssl_pem_passwd_cb: buf is too small " << size;
-    return 0;
-  }
-  // Copy string including last '\0'.
-  memcpy(buf, config->tls.private_key_passwd.c_str(), len + 1);
-  return len;
-}
-} // namespace
-
-namespace {
-// *al is set to SSL_AD_UNRECOGNIZED_NAME by openssl, so we don't have
-// to set it explicitly.
-int servername_callback(SSL *ssl, int *al, void *arg) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto worker = handler->get_worker();
-
-  auto rawhost = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
-  if (rawhost == nullptr) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-
-  auto len = strlen(rawhost);
-  // NI_MAXHOST includes terminal NULL.
-  if (len == 0 || len + 1 > NI_MAXHOST) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-
-  std::array<uint8_t, NI_MAXHOST> buf;
-
-  auto end_buf = std::copy_n(rawhost, len, std::begin(buf));
-
-  util::inp_strlower(std::begin(buf), end_buf);
-
-  auto hostname = StringRef{std::begin(buf), end_buf};
-
-  auto cert_tree = worker->get_cert_lookup_tree();
-
-  auto idx = cert_tree->lookup(hostname);
-  if (idx == -1) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-
-  handler->set_tls_sni(hostname);
-
-  auto conn_handler = worker->get_connection_handler();
-
-  const auto &ssl_ctx_list = conn_handler->get_indexed_ssl_ctx(idx);
-  assert(!ssl_ctx_list.empty());
-
-#if !defined(OPENSSL_IS_BORINGSSL) && !LIBRESSL_IN_USE &&                      \
-    OPENSSL_VERSION_NUMBER >= 0x10002000L
-  auto num_shared_curves = SSL_get_shared_curve(ssl, -1);
-
-  for (auto i = 0; i < num_shared_curves; ++i) {
-    auto shared_curve = SSL_get_shared_curve(ssl, i);
-
-    for (auto ssl_ctx : ssl_ctx_list) {
-      auto cert = SSL_CTX_get0_certificate(ssl_ctx);
-
-#  if OPENSSL_1_1_API
-      auto pubkey = X509_get0_pubkey(cert);
-#  else  // !OPENSSL_1_1_API
-      auto pubkey = X509_get_pubkey(cert);
-#  endif // !OPENSSL_1_1_API
-
-      if (EVP_PKEY_base_id(pubkey) != EVP_PKEY_EC) {
-        continue;
-      }
-
-#  if OPENSSL_1_1_API
-      auto eckey = EVP_PKEY_get0_EC_KEY(pubkey);
-#  else  // !OPENSSL_1_1_API
-      auto eckey = EVP_PKEY_get1_EC_KEY(pubkey);
-#  endif // !OPENSSL_1_1_API
-
-      if (eckey == nullptr) {
-        continue;
-      }
-
-      auto ecgroup = EC_KEY_get0_group(eckey);
-      auto cert_curve = EC_GROUP_get_curve_name(ecgroup);
-
-#  if !OPENSSL_1_1_API
-      EC_KEY_free(eckey);
-      EVP_PKEY_free(pubkey);
-#  endif // !OPENSSL_1_1_API
-
-      if (shared_curve == cert_curve) {
-        SSL_set_SSL_CTX(ssl, ssl_ctx);
-        return SSL_TLSEXT_ERR_OK;
-      }
-    }
-  }
-#endif // !defined(OPENSSL_IS_BORINGSSL) && !LIBRESSL_IN_USE &&
-       // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  SSL_set_SSL_CTX(ssl, ssl_ctx_list[0]);
-
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-
-#ifndef OPENSSL_IS_BORINGSSL
-namespace {
-std::shared_ptr<std::vector<uint8_t>>
-get_ocsp_data(TLSContextData *tls_ctx_data) {
-#  ifdef HAVE_ATOMIC_STD_SHARED_PTR
-  return std::atomic_load_explicit(&tls_ctx_data->ocsp_data,
-                                   std::memory_order_acquire);
-#  else  // !HAVE_ATOMIC_STD_SHARED_PTR
-  std::lock_guard<std::mutex> g(tls_ctx_data->mu);
-  return tls_ctx_data->ocsp_data;
-#  endif // !HAVE_ATOMIC_STD_SHARED_PTR
-}
-} // namespace
-
-namespace {
-int ocsp_resp_cb(SSL *ssl, void *arg) {
-  auto ssl_ctx = SSL_get_SSL_CTX(ssl);
-  auto tls_ctx_data =
-      static_cast<TLSContextData *>(SSL_CTX_get_app_data(ssl_ctx));
-
-  auto data = get_ocsp_data(tls_ctx_data);
-
-  if (!data) {
-    return SSL_TLSEXT_ERR_OK;
-  }
-
-  auto buf =
-      static_cast<uint8_t *>(CRYPTO_malloc(data->size(), __FILE__, __LINE__));
-
-  if (!buf) {
-    return SSL_TLSEXT_ERR_OK;
-  }
-
-  std::copy(std::begin(*data), std::end(*data), buf);
-
-  SSL_set_tlsext_status_ocsp_resp(ssl, buf, data->size());
-
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-#endif // OPENSSL_IS_BORINGSSL
-
-constexpr auto MEMCACHED_SESSION_CACHE_KEY_PREFIX =
-    StringRef::from_lit("nghttpx:tls-session-cache:");
-
-namespace {
-int tls_session_client_new_cb(SSL *ssl, SSL_SESSION *session) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  if (conn->tls.client_session_cache == nullptr) {
-    return 0;
-  }
-
-  try_cache_tls_session(conn->tls.client_session_cache, session,
-                        ev_now(conn->loop));
-
-  return 0;
-}
-} // namespace
-
-namespace {
-int tls_session_new_cb(SSL *ssl, SSL_SESSION *session) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto worker = handler->get_worker();
-  auto dispatcher = worker->get_session_cache_memcached_dispatcher();
-  auto &balloc = handler->get_block_allocator();
-
-#ifdef TLS1_3_VERSION
-  if (SSL_version(ssl) == TLS1_3_VERSION) {
-    return 0;
-  }
-#endif // TLS1_3_VERSION
-
-  const unsigned char *id;
-  unsigned int idlen;
-
-  id = SSL_SESSION_get_id(session, &idlen);
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Memcached: cache session, id=" << util::format_hex(id, idlen);
-  }
-
-  auto req = make_unique<MemcachedRequest>();
-  req->op = MEMCACHED_OP_ADD;
-  req->key = MEMCACHED_SESSION_CACHE_KEY_PREFIX.str();
-  req->key +=
-      util::format_hex(balloc, StringRef{id, static_cast<size_t>(idlen)});
-
-  auto sessionlen = i2d_SSL_SESSION(session, nullptr);
-  req->value.resize(sessionlen);
-  auto buf = &req->value[0];
-  i2d_SSL_SESSION(session, &buf);
-  req->expiry = 12_h;
-  req->cb = [](MemcachedRequest *req, MemcachedResult res) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Memcached: session cache done.  key=" << req->key
-                << ", status_code=" << res.status_code << ", value="
-                << std::string(std::begin(res.value), std::end(res.value));
-    }
-    if (res.status_code != 0) {
-      LOG(WARN) << "Memcached: failed to cache session key=" << req->key
-                << ", status_code=" << res.status_code << ", value="
-                << std::string(std::begin(res.value), std::end(res.value));
-    }
-  };
-  assert(!req->canceled);
-
-  dispatcher->add_request(std::move(req));
-
-  return 0;
-}
-} // namespace
-
-namespace {
-SSL_SESSION *tls_session_get_cb(SSL *ssl,
-#if OPENSSL_1_1_API
-                                const unsigned char *id,
-#else  // !OPENSSL_1_1_API
-                                unsigned char *id,
-#endif // !OPENSSL_1_1_API
-                                int idlen, int *copy) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto worker = handler->get_worker();
-  auto dispatcher = worker->get_session_cache_memcached_dispatcher();
-  auto &balloc = handler->get_block_allocator();
-
-  if (idlen == 0) {
-    return nullptr;
-  }
-
-  if (conn->tls.cached_session) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Memcached: found cached session, id="
-                << util::format_hex(id, idlen);
-    }
-
-    // This is required, without this, memory leak occurs.
-    *copy = 0;
-
-    auto session = conn->tls.cached_session;
-    conn->tls.cached_session = nullptr;
-    return session;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Memcached: get cached session, id="
-              << util::format_hex(id, idlen);
-  }
-
-  auto req = make_unique<MemcachedRequest>();
-  req->op = MEMCACHED_OP_GET;
-  req->key = MEMCACHED_SESSION_CACHE_KEY_PREFIX.str();
-  req->key +=
-      util::format_hex(balloc, StringRef{id, static_cast<size_t>(idlen)});
-  req->cb = [conn](MemcachedRequest *, MemcachedResult res) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Memcached: returned status code " << res.status_code;
-    }
-
-    // We might stop reading, so start it again
-    conn->rlimit.startw();
-    ev_timer_again(conn->loop, &conn->rt);
-
-    conn->wlimit.startw();
-    ev_timer_again(conn->loop, &conn->wt);
-
-    conn->tls.cached_session_lookup_req = nullptr;
-    if (res.status_code != 0) {
-      conn->tls.handshake_state = TLS_CONN_CANCEL_SESSION_CACHE;
-      return;
-    }
-
-    const uint8_t *p = res.value.data();
-
-    auto session = d2i_SSL_SESSION(nullptr, &p, res.value.size());
-    if (!session) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "cannot materialize session";
-      }
-      conn->tls.handshake_state = TLS_CONN_CANCEL_SESSION_CACHE;
-      return;
-    }
-
-    conn->tls.cached_session = session;
-    conn->tls.handshake_state = TLS_CONN_GOT_SESSION_CACHE;
-  };
-
-  conn->tls.handshake_state = TLS_CONN_WAIT_FOR_SESSION_CACHE;
-  conn->tls.cached_session_lookup_req = req.get();
-
-  dispatcher->add_request(std::move(req));
-
-  return nullptr;
-}
-} // namespace
-
-namespace {
-int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
-                  EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  auto handler = static_cast<ClientHandler *>(conn->data);
-  auto worker = handler->get_worker();
-  auto ticket_keys = worker->get_ticket_keys();
-
-  if (!ticket_keys) {
-    // No ticket keys available.
-    return -1;
-  }
-
-  auto &keys = ticket_keys->keys;
-  assert(!keys.empty());
-
-  if (enc) {
-    if (RAND_bytes(iv, EVP_MAX_IV_LENGTH) == 0) {
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, handler) << "session ticket key: RAND_bytes failed";
-      }
-      return -1;
-    }
-
-    auto &key = keys[0];
-
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, handler) << "encrypt session ticket key: "
-                          << util::format_hex(key.data.name);
-    }
-
-    std::copy(std::begin(key.data.name), std::end(key.data.name), key_name);
-
-    EVP_EncryptInit_ex(ctx, get_config()->tls.ticket.cipher, nullptr,
-                       key.data.enc_key.data(), iv);
-    HMAC_Init_ex(hctx, key.data.hmac_key.data(), key.hmac_keylen, key.hmac,
-                 nullptr);
-    return 1;
-  }
-
-  size_t i;
-  for (i = 0; i < keys.size(); ++i) {
-    auto &key = keys[i];
-    if (std::equal(std::begin(key.data.name), std::end(key.data.name),
-                   key_name)) {
-      break;
-    }
-  }
-
-  if (i == keys.size()) {
-    if (LOG_ENABLED(INFO)) {
-      CLOG(INFO, handler) << "session ticket key "
-                          << util::format_hex(key_name, 16) << " not found";
-    }
-    return 0;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    CLOG(INFO, handler) << "decrypt session ticket key: "
-                        << util::format_hex(key_name, 16);
-  }
-
-  auto &key = keys[i];
-  HMAC_Init_ex(hctx, key.data.hmac_key.data(), key.hmac_keylen, key.hmac,
-               nullptr);
-  EVP_DecryptInit_ex(ctx, key.cipher, nullptr, key.data.enc_key.data(), iv);
-
-  return i == 0 ? 1 : 2;
-}
-} // namespace
-
-namespace {
-void info_callback(const SSL *ssl, int where, int ret) {
-#ifdef TLS1_3_VERSION
-  // TLSv1.3 has no renegotiation.
-  if (SSL_version(ssl) == TLS1_3_VERSION) {
-    return;
-  }
-#endif // TLS1_3_VERSION
-
-  // To mitigate possible DOS attack using lots of renegotiations, we
-  // disable renegotiation. Since OpenSSL does not provide an easy way
-  // to disable it, we check that renegotiation is started in this
-  // callback.
-  if (where & SSL_CB_HANDSHAKE_START) {
-    auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-    if (conn && conn->tls.initial_handshake_done) {
-      auto handler = static_cast<ClientHandler *>(conn->data);
-      if (LOG_ENABLED(INFO)) {
-        CLOG(INFO, handler) << "TLS renegotiation started";
-      }
-      handler->start_immediate_shutdown();
-    }
-  }
-}
-} // namespace
-
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-namespace {
-int alpn_select_proto_cb(SSL *ssl, const unsigned char **out,
-                         unsigned char *outlen, const unsigned char *in,
-                         unsigned int inlen, void *arg) {
-  // We assume that get_config()->npn_list contains ALPN protocol
-  // identifier sorted by preference order.  So we just break when we
-  // found the first overlap.
-  for (const auto &target_proto_id : get_config()->tls.npn_list) {
-    for (auto p = in, end = in + inlen; p < end;) {
-      auto proto_id = p + 1;
-      auto proto_len = *p;
-
-      if (proto_id + proto_len <= end &&
-          util::streq(target_proto_id, StringRef{proto_id, proto_len})) {
-
-        *out = reinterpret_cast<const unsigned char *>(proto_id);
-        *outlen = proto_len;
-
-        return SSL_TLSEXT_ERR_OK;
-      }
-
-      p += 1 + proto_len;
-    }
-  }
-
-  return SSL_TLSEXT_ERR_NOACK;
-}
-} // namespace
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-#if !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-#  ifndef TLSEXT_TYPE_signed_certificate_timestamp
-#    define TLSEXT_TYPE_signed_certificate_timestamp 18
-#  endif // !TLSEXT_TYPE_signed_certificate_timestamp
-
-namespace {
-int sct_add_cb(SSL *ssl, unsigned int ext_type, unsigned int context,
-               const unsigned char **out, size_t *outlen, X509 *x,
-               size_t chainidx, int *al, void *add_arg) {
-  assert(ext_type == TLSEXT_TYPE_signed_certificate_timestamp);
-
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  if (!conn->tls.sct_requested) {
-    return 0;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "sct_add_cb is called, chainidx=" << chainidx << ", x=" << x
-              << ", context=" << std::hex << context;
-  }
-
-  // We only have SCTs for leaf certificate.
-  if (chainidx != 0) {
-    return 0;
-  }
-
-  auto ssl_ctx = SSL_get_SSL_CTX(ssl);
-  auto tls_ctx_data =
-      static_cast<TLSContextData *>(SSL_CTX_get_app_data(ssl_ctx));
-
-  *out = tls_ctx_data->sct_data.data();
-  *outlen = tls_ctx_data->sct_data.size();
-
-  return 1;
-}
-} // namespace
-
-namespace {
-void sct_free_cb(SSL *ssl, unsigned int ext_type, unsigned int context,
-                 const unsigned char *out, void *add_arg) {
-  assert(ext_type == TLSEXT_TYPE_signed_certificate_timestamp);
-}
-} // namespace
-
-namespace {
-int sct_parse_cb(SSL *ssl, unsigned int ext_type, unsigned int context,
-                 const unsigned char *in, size_t inlen, X509 *x,
-                 size_t chainidx, int *al, void *parse_arg) {
-  assert(ext_type == TLSEXT_TYPE_signed_certificate_timestamp);
-  // client SHOULD send 0 length extension_data, but it is still
-  // SHOULD, and not MUST.
-
-  // For TLSv1.3 Certificate message, sct_add_cb is called even if
-  // client has not sent signed_certificate_timestamp extension in its
-  // ClientHello.  Explicitly remember that client has included it
-  // here.
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  conn->tls.sct_requested = true;
-
-  return 1;
-}
-} // namespace
-
-#  if !OPENSSL_1_1_1_API
-
-namespace {
-int legacy_sct_add_cb(SSL *ssl, unsigned int ext_type,
-                      const unsigned char **out, size_t *outlen, int *al,
-                      void *add_arg) {
-  return sct_add_cb(ssl, ext_type, 0, out, outlen, nullptr, 0, al, add_arg);
-}
-} // namespace
-
-namespace {
-void legacy_sct_free_cb(SSL *ssl, unsigned int ext_type,
-                        const unsigned char *out, void *add_arg) {
-  sct_free_cb(ssl, ext_type, 0, out, add_arg);
-}
-} // namespace
-
-namespace {
-int legacy_sct_parse_cb(SSL *ssl, unsigned int ext_type,
-                        const unsigned char *in, size_t inlen, int *al,
-                        void *parse_arg) {
-  return sct_parse_cb(ssl, ext_type, 0, in, inlen, nullptr, 0, al, parse_arg);
-}
-} // namespace
-
-#  endif // !OPENSSL_1_1_1_API
-#endif   // !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-#ifndef OPENSSL_NO_PSK
-namespace {
-unsigned int psk_server_cb(SSL *ssl, const char *identity, unsigned char *psk,
-                           unsigned int max_psk_len) {
-  auto config = get_config();
-  auto &tlsconf = config->tls;
-
-  auto it = tlsconf.psk_secrets.find(StringRef{identity});
-  if (it == std::end(tlsconf.psk_secrets)) {
-    return 0;
-  }
-
-  auto &secret = (*it).second;
-  if (secret.size() > max_psk_len) {
-    LOG(ERROR) << "The size of PSK secret is " << secret.size()
-               << ", but the acceptable maximum size is" << max_psk_len;
-    return 0;
-  }
-
-  std::copy(std::begin(secret), std::end(secret), psk);
-
-  return static_cast<unsigned int>(secret.size());
-}
-} // namespace
-#endif // !OPENSSL_NO_PSK
-
-#ifndef OPENSSL_NO_PSK
-namespace {
-unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity_out,
-                           unsigned int max_identity_len, unsigned char *psk,
-                           unsigned int max_psk_len) {
-  auto config = get_config();
-  auto &tlsconf = config->tls;
-
-  auto &identity = tlsconf.client.psk.identity;
-  auto &secret = tlsconf.client.psk.secret;
-
-  if (identity.empty()) {
-    return 0;
-  }
-
-  if (identity.size() + 1 > max_identity_len) {
-    LOG(ERROR) << "The size of PSK identity is " << identity.size()
-               << ", but the acceptable maximum size is " << max_identity_len;
-    return 0;
-  }
-
-  if (secret.size() > max_psk_len) {
-    LOG(ERROR) << "The size of PSK secret is " << secret.size()
-               << ", but the acceptable maximum size is " << max_psk_len;
-    return 0;
-  }
-
-  *std::copy(std::begin(identity), std::end(identity), identity_out) = '\0';
-  std::copy(std::begin(secret), std::end(secret), psk);
-
-  return static_cast<unsigned int>(secret.size());
-}
-} // namespace
-#endif // !OPENSSL_NO_PSK
-
-struct TLSProtocol {
-  StringRef name;
-  long int mask;
-};
-
-constexpr TLSProtocol TLS_PROTOS[] = {
-    TLSProtocol{StringRef::from_lit("TLSv1.2"), SSL_OP_NO_TLSv1_2},
-    TLSProtocol{StringRef::from_lit("TLSv1.1"), SSL_OP_NO_TLSv1_1},
-    TLSProtocol{StringRef::from_lit("TLSv1.0"), SSL_OP_NO_TLSv1}};
-
-long int create_tls_proto_mask(const std::vector<StringRef> &tls_proto_list) {
-  long int res = 0;
-
-  for (auto &supported : TLS_PROTOS) {
-    auto ok = false;
-    for (auto &name : tls_proto_list) {
-      if (util::strieq(supported.name, name)) {
-        ok = true;
-        break;
-      }
-    }
-    if (!ok) {
-      res |= supported.mask;
-    }
-  }
-  return res;
-}
-
-SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file,
-                            const std::vector<uint8_t> &sct_data
-#ifdef HAVE_NEVERBLEED
-                            ,
-                            neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-) {
-  auto ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-  if (!ssl_ctx) {
-    LOG(FATAL) << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-
-  constexpr auto ssl_opts =
-      (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) | SSL_OP_NO_SSLv2 |
-      SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION |
-      SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | SSL_OP_SINGLE_ECDH_USE |
-      SSL_OP_SINGLE_DH_USE |
-      SSL_OP_CIPHER_SERVER_PREFERENCE
-#if OPENSSL_1_1_1_API
-      // The reason for disabling built-in anti-replay in OpenSSL is
-      // that it only works if client gets back to the same server.
-      // The freshness check described in
-      // https://tools.ietf.org/html/rfc8446#section-8.3 is still
-      // performed.
-      | SSL_OP_NO_ANTI_REPLAY
-#endif // OPENSSL_1_1_1_API
-      ;
-
-  auto config = mod_config();
-  auto &tlsconf = config->tls;
-
-  SSL_CTX_set_options(ssl_ctx, ssl_opts | tlsconf.tls_proto_mask);
-
-  if (nghttp2::tls::ssl_ctx_set_proto_versions(
-          ssl_ctx, tlsconf.min_proto_version, tlsconf.max_proto_version) != 0) {
-    LOG(FATAL) << "Could not set TLS protocol version";
-    DIE();
-  }
-
-  const unsigned char sid_ctx[] = "shrpx";
-  SSL_CTX_set_session_id_context(ssl_ctx, sid_ctx, sizeof(sid_ctx) - 1);
-  SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_SERVER);
-
-  if (!tlsconf.session_cache.memcached.host.empty()) {
-    SSL_CTX_sess_set_new_cb(ssl_ctx, tls_session_new_cb);
-    SSL_CTX_sess_set_get_cb(ssl_ctx, tls_session_get_cb);
-  }
-
-  SSL_CTX_set_timeout(ssl_ctx, tlsconf.session_timeout.count());
-
-  if (SSL_CTX_set_cipher_list(ssl_ctx, tlsconf.ciphers.c_str()) == 0) {
-    LOG(FATAL) << "SSL_CTX_set_cipher_list " << tlsconf.ciphers
-               << " failed: " << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-
-#if OPENSSL_1_1_1_API
-  if (SSL_CTX_set_ciphersuites(ssl_ctx, tlsconf.tls13_ciphers.c_str()) == 0) {
-    LOG(FATAL) << "SSL_CTX_set_ciphersuites " << tlsconf.tls13_ciphers
-               << " failed: " << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-#endif // OPENSSL_1_1_1_API
-
-#ifndef OPENSSL_NO_EC
-#  if !LIBRESSL_LEGACY_API && OPENSSL_VERSION_NUMBER >= 0x10002000L
-  if (SSL_CTX_set1_curves_list(ssl_ctx, tlsconf.ecdh_curves.c_str()) != 1) {
-    LOG(FATAL) << "SSL_CTX_set1_curves_list " << tlsconf.ecdh_curves
-               << " failed";
-    DIE();
-  }
-#    if !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API
-  // It looks like we need this function call for OpenSSL 1.0.2.  This
-  // function was deprecated in OpenSSL 1.1.0 and BoringSSL.
-  SSL_CTX_set_ecdh_auto(ssl_ctx, 1);
-#    endif // !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API
-#  else    // LIBRESSL_LEGACY_API || OPENSSL_VERSION_NUBMER < 0x10002000L
-  // Use P-256, which is sufficiently secure at the time of this
-  // writing.
-  auto ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-  if (ecdh == nullptr) {
-    LOG(FATAL) << "EC_KEY_new_by_curv_name failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-  SSL_CTX_set_tmp_ecdh(ssl_ctx, ecdh);
-  EC_KEY_free(ecdh);
-#  endif   // LIBRESSL_LEGACY_API || OPENSSL_VERSION_NUBMER < 0x10002000L
-#endif     // OPENSSL_NO_EC
-
-  if (!tlsconf.dh_param_file.empty()) {
-    // Read DH parameters from file
-    auto bio = BIO_new_file(tlsconf.dh_param_file.c_str(), "r");
-    if (bio == nullptr) {
-      LOG(FATAL) << "BIO_new_file() failed: "
-                 << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-    auto dh = PEM_read_bio_DHparams(bio, nullptr, nullptr, nullptr);
-    if (dh == nullptr) {
-      LOG(FATAL) << "PEM_read_bio_DHparams() failed: "
-                 << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-    SSL_CTX_set_tmp_dh(ssl_ctx, dh);
-    DH_free(dh);
-    BIO_free(bio);
-  }
-
-  SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
-
-  if (SSL_CTX_set_default_verify_paths(ssl_ctx) != 1) {
-    LOG(WARN) << "Could not load system trusted ca certificates: "
-              << ERR_error_string(ERR_get_error(), nullptr);
-  }
-
-  if (!tlsconf.cacert.empty()) {
-    if (SSL_CTX_load_verify_locations(ssl_ctx, tlsconf.cacert.c_str(),
-                                      nullptr) != 1) {
-      LOG(FATAL) << "Could not load trusted ca certificates from "
-                 << tlsconf.cacert << ": "
-                 << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-  }
-
-  if (!tlsconf.private_key_passwd.empty()) {
-    SSL_CTX_set_default_passwd_cb(ssl_ctx, ssl_pem_passwd_cb);
-    SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, config);
-  }
-
-#ifndef HAVE_NEVERBLEED
-  if (SSL_CTX_use_PrivateKey_file(ssl_ctx, private_key_file,
-                                  SSL_FILETYPE_PEM) != 1) {
-    LOG(FATAL) << "SSL_CTX_use_PrivateKey_file failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-  }
-#else  // HAVE_NEVERBLEED
-  std::array<char, NEVERBLEED_ERRBUF_SIZE> errbuf;
-  if (neverbleed_load_private_key_file(nb, ssl_ctx, private_key_file,
-                                       errbuf.data()) != 1) {
-    LOG(FATAL) << "neverbleed_load_private_key_file failed: " << errbuf.data();
-    DIE();
-  }
-#endif // HAVE_NEVERBLEED
-
-  if (SSL_CTX_use_certificate_chain_file(ssl_ctx, cert_file) != 1) {
-    LOG(FATAL) << "SSL_CTX_use_certificate_file failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-  if (SSL_CTX_check_private_key(ssl_ctx) != 1) {
-    LOG(FATAL) << "SSL_CTX_check_private_key failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-  if (tlsconf.client_verify.enabled) {
-    if (!tlsconf.client_verify.cacert.empty()) {
-      if (SSL_CTX_load_verify_locations(
-              ssl_ctx, tlsconf.client_verify.cacert.c_str(), nullptr) != 1) {
-
-        LOG(FATAL) << "Could not load trusted ca certificates from "
-                   << tlsconf.client_verify.cacert << ": "
-                   << ERR_error_string(ERR_get_error(), nullptr);
-        DIE();
-      }
-      // It is heard that SSL_CTX_load_verify_locations() may leave
-      // error even though it returns success. See
-      // http://forum.nginx.org/read.php?29,242540
-      ERR_clear_error();
-      auto list = SSL_load_client_CA_file(tlsconf.client_verify.cacert.c_str());
-      if (!list) {
-        LOG(FATAL) << "Could not load ca certificates from "
-                   << tlsconf.client_verify.cacert << ": "
-                   << ERR_error_string(ERR_get_error(), nullptr);
-        DIE();
-      }
-      SSL_CTX_set_client_CA_list(ssl_ctx, list);
-    }
-    SSL_CTX_set_verify(ssl_ctx,
-                       SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE |
-                           SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                       verify_callback);
-  }
-  SSL_CTX_set_tlsext_servername_callback(ssl_ctx, servername_callback);
-  SSL_CTX_set_tlsext_ticket_key_cb(ssl_ctx, ticket_key_cb);
-#ifndef OPENSSL_IS_BORINGSSL
-  SSL_CTX_set_tlsext_status_cb(ssl_ctx, ocsp_resp_cb);
-#endif // OPENSSL_IS_BORINGSSL
-  SSL_CTX_set_info_callback(ssl_ctx, info_callback);
-
-#ifdef OPENSSL_IS_BORINGSSL
-  SSL_CTX_set_early_data_enabled(ssl_ctx, 1);
-#endif // OPENSSL_IS_BORINGSSL
-
-  // NPN advertisement
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_protos_advertised_cb(ssl_ctx, next_proto_cb, nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  // ALPN selection callback
-  SSL_CTX_set_alpn_select_cb(ssl_ctx, alpn_select_proto_cb, nullptr);
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-#if !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
-  // SSL_extension_supported(TLSEXT_TYPE_signed_certificate_timestamp)
-  // returns 1, which means OpenSSL internally handles it.  But
-  // OpenSSL handles signed_certificate_timestamp extension specially,
-  // and it lets custom handler to process the extension.
-  if (!sct_data.empty()) {
-#  if OPENSSL_1_1_1_API
-    // It is not entirely clear to me that SSL_EXT_CLIENT_HELLO is
-    // required here.  sct_parse_cb is called without
-    // SSL_EXT_CLIENT_HELLO being set.  But the passed context value
-    // is SSL_EXT_CLIENT_HELLO.
-    if (SSL_CTX_add_custom_ext(
-            ssl_ctx, TLSEXT_TYPE_signed_certificate_timestamp,
-            SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO |
-                SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_IGNORE_ON_RESUMPTION,
-            sct_add_cb, sct_free_cb, nullptr, sct_parse_cb, nullptr) != 1) {
-      LOG(FATAL) << "SSL_CTX_add_custom_ext failed: "
-                 << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-#  else  // !OPENSSL_1_1_1_API
-    if (SSL_CTX_add_server_custom_ext(
-            ssl_ctx, TLSEXT_TYPE_signed_certificate_timestamp,
-            legacy_sct_add_cb, legacy_sct_free_cb, nullptr, legacy_sct_parse_cb,
-            nullptr) != 1) {
-      LOG(FATAL) << "SSL_CTX_add_server_custom_ext failed: "
-                 << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-#  endif // !OPENSSL_1_1_1_API
-  }
-#endif // !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-#if OPENSSL_1_1_1_API
-  if (SSL_CTX_set_max_early_data(ssl_ctx, tlsconf.max_early_data) != 1) {
-    LOG(FATAL) << "SSL_CTX_set_max_early_data failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-#endif // OPENSSL_1_1_1_API
-
-#ifndef OPENSSL_NO_PSK
-  SSL_CTX_set_psk_server_callback(ssl_ctx, psk_server_cb);
-#endif // !LIBRESSL_NO_PSK
-
-  auto tls_ctx_data = new TLSContextData();
-  tls_ctx_data->cert_file = cert_file;
-  tls_ctx_data->sct_data = sct_data;
-
-  SSL_CTX_set_app_data(ssl_ctx, tls_ctx_data);
-
-  return ssl_ctx;
-}
-
-namespace {
-int select_h2_next_proto_cb(SSL *ssl, unsigned char **out,
-                            unsigned char *outlen, const unsigned char *in,
-                            unsigned int inlen, void *arg) {
-  if (!util::select_h2(const_cast<const unsigned char **>(out), outlen, in,
-                       inlen)) {
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-
-  return SSL_TLSEXT_ERR_OK;
-}
-} // namespace
-
-namespace {
-int select_h1_next_proto_cb(SSL *ssl, unsigned char **out,
-                            unsigned char *outlen, const unsigned char *in,
-                            unsigned int inlen, void *arg) {
-  auto end = in + inlen;
-  for (; in < end;) {
-    if (util::streq(NGHTTP2_H1_1_ALPN, StringRef{in, in + (in[0] + 1)})) {
-      *out = const_cast<unsigned char *>(in) + 1;
-      *outlen = in[0];
-      return SSL_TLSEXT_ERR_OK;
-    }
-    in += in[0] + 1;
-  }
-
-  return SSL_TLSEXT_ERR_NOACK;
-}
-} // namespace
-
-namespace {
-int select_next_proto_cb(SSL *ssl, unsigned char **out, unsigned char *outlen,
-                         const unsigned char *in, unsigned int inlen,
-                         void *arg) {
-  auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
-  switch (conn->proto) {
-  case PROTO_HTTP1:
-    return select_h1_next_proto_cb(ssl, out, outlen, in, inlen, arg);
-  case PROTO_HTTP2:
-    return select_h2_next_proto_cb(ssl, out, outlen, in, inlen, arg);
-  default:
-    return SSL_TLSEXT_ERR_NOACK;
-  }
-}
-} // namespace
-
-SSL_CTX *create_ssl_client_context(
-#ifdef HAVE_NEVERBLEED
-    neverbleed_t *nb,
-#endif // HAVE_NEVERBLEED
-    const StringRef &cacert, const StringRef &cert_file,
-    const StringRef &private_key_file,
-    int (*next_proto_select_cb)(SSL *s, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg)) {
-  auto ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if (!ssl_ctx) {
-    LOG(FATAL) << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-
-  constexpr auto ssl_opts = (SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) |
-                            SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
-                            SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION;
-
-  auto &tlsconf = get_config()->tls;
-
-  SSL_CTX_set_options(ssl_ctx, ssl_opts | tlsconf.tls_proto_mask);
-
-  SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_CLIENT |
-                                              SSL_SESS_CACHE_NO_INTERNAL_STORE);
-  SSL_CTX_sess_set_new_cb(ssl_ctx, tls_session_client_new_cb);
-
-  if (nghttp2::tls::ssl_ctx_set_proto_versions(
-          ssl_ctx, tlsconf.min_proto_version, tlsconf.max_proto_version) != 0) {
-    LOG(FATAL) << "Could not set TLS protocol version";
-    DIE();
-  }
-
-  if (SSL_CTX_set_cipher_list(ssl_ctx, tlsconf.client.ciphers.c_str()) == 0) {
-    LOG(FATAL) << "SSL_CTX_set_cipher_list " << tlsconf.client.ciphers
-               << " failed: " << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-
-#if OPENSSL_1_1_1_API
-  if (SSL_CTX_set_ciphersuites(ssl_ctx, tlsconf.client.tls13_ciphers.c_str()) ==
-      0) {
-    LOG(FATAL) << "SSL_CTX_set_ciphersuites " << tlsconf.client.tls13_ciphers
-               << " failed: " << ERR_error_string(ERR_get_error(), nullptr);
-    DIE();
-  }
-#endif // OPENSSL_1_1_1_API
-
-  SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
-
-  if (SSL_CTX_set_default_verify_paths(ssl_ctx) != 1) {
-    LOG(WARN) << "Could not load system trusted ca certificates: "
-              << ERR_error_string(ERR_get_error(), nullptr);
-  }
-
-  if (!cacert.empty()) {
-    if (SSL_CTX_load_verify_locations(ssl_ctx, cacert.c_str(), nullptr) != 1) {
-
-      LOG(FATAL) << "Could not load trusted ca certificates from " << cacert
-                 << ": " << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-  }
-
-  if (!tlsconf.insecure) {
-    SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, nullptr);
-  }
-
-  if (!cert_file.empty()) {
-    if (SSL_CTX_use_certificate_chain_file(ssl_ctx, cert_file.c_str()) != 1) {
-
-      LOG(FATAL) << "Could not load client certificate from " << cert_file
-                 << ": " << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-  }
-
-  if (!private_key_file.empty()) {
-#ifndef HAVE_NEVERBLEED
-    if (SSL_CTX_use_PrivateKey_file(ssl_ctx, private_key_file.c_str(),
-                                    SSL_FILETYPE_PEM) != 1) {
-      LOG(FATAL) << "Could not load client private key from "
-                 << private_key_file << ": "
-                 << ERR_error_string(ERR_get_error(), nullptr);
-      DIE();
-    }
-#else  // HAVE_NEVERBLEED
-    std::array<char, NEVERBLEED_ERRBUF_SIZE> errbuf;
-    if (neverbleed_load_private_key_file(nb, ssl_ctx, private_key_file.c_str(),
-                                         errbuf.data()) != 1) {
-      LOG(FATAL) << "neverbleed_load_private_key_file: could not load client "
-                    "private key from "
-                 << private_key_file << ": " << errbuf.data();
-      DIE();
-    }
-#endif // HAVE_NEVERBLEED
-  }
-
-#ifndef OPENSSL_NO_PSK
-  SSL_CTX_set_psk_client_callback(ssl_ctx, psk_client_cb);
-#endif // !OPENSSL_NO_PSK
-
-  // NPN selection callback.  This is required to set SSL_CTX because
-  // OpenSSL does not offer SSL_set_next_proto_select_cb.
-#ifndef OPENSSL_NO_NEXTPROTONEG
-  SSL_CTX_set_next_proto_select_cb(ssl_ctx, next_proto_select_cb, nullptr);
-#endif // !OPENSSL_NO_NEXTPROTONEG
-
-  return ssl_ctx;
-}
-
-SSL *create_ssl(SSL_CTX *ssl_ctx) {
-  auto ssl = SSL_new(ssl_ctx);
-  if (!ssl) {
-    LOG(ERROR) << "SSL_new() failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    return nullptr;
-  }
-
-  return ssl;
-}
-
-ClientHandler *accept_connection(Worker *worker, int fd, sockaddr *addr,
-                                 int addrlen, const UpstreamAddr *faddr) {
-  std::array<char, NI_MAXHOST> host;
-  std::array<char, NI_MAXSERV> service;
-  int rv;
-
-  if (addr->sa_family == AF_UNIX) {
-    std::copy_n("localhost", sizeof("localhost"), std::begin(host));
-    service[0] = '\0';
-  } else {
-    rv = getnameinfo(addr, addrlen, host.data(), host.size(), service.data(),
-                     service.size(), NI_NUMERICHOST | NI_NUMERICSERV);
-    if (rv != 0) {
-      LOG(ERROR) << "getnameinfo() failed: " << gai_strerror(rv);
-
-      return nullptr;
-    }
-
-    rv = util::make_socket_nodelay(fd);
-    if (rv == -1) {
-      LOG(WARN) << "Setting option TCP_NODELAY failed: errno=" << errno;
-    }
-  }
-  SSL *ssl = nullptr;
-  if (faddr->tls) {
-    auto ssl_ctx = worker->get_sv_ssl_ctx();
-
-    assert(ssl_ctx);
-
-    ssl = create_ssl(ssl_ctx);
-    if (!ssl) {
-      return nullptr;
-    }
-    // Disable TLS session ticket if we don't have working ticket
-    // keys.
-    if (!worker->get_ticket_keys()) {
-      SSL_set_options(ssl, SSL_OP_NO_TICKET);
-    }
-  }
-
-  return new ClientHandler(worker, fd, ssl, StringRef{host.data()},
-                           StringRef{service.data()}, addr->sa_family, faddr);
-}
-
-bool tls_hostname_match(const StringRef &pattern, const StringRef &hostname) {
-  auto ptWildcard = std::find(std::begin(pattern), std::end(pattern), '*');
-  if (ptWildcard == std::end(pattern)) {
-    return util::strieq(pattern, hostname);
-  }
-
-  auto ptLeftLabelEnd = std::find(std::begin(pattern), std::end(pattern), '.');
-  auto wildcardEnabled = true;
-  // Do case-insensitive match. At least 2 dots are required to enable
-  // wildcard match. Also wildcard must be in the left-most label.
-  // Don't attempt to match a presented identifier where the wildcard
-  // character is embedded within an A-label.
-  if (ptLeftLabelEnd == std::end(pattern) ||
-      std::find(ptLeftLabelEnd + 1, std::end(pattern), '.') ==
-          std::end(pattern) ||
-      ptLeftLabelEnd < ptWildcard || util::istarts_with_l(pattern, "xn--")) {
-    wildcardEnabled = false;
-  }
-
-  if (!wildcardEnabled) {
-    return util::strieq(pattern, hostname);
-  }
-
-  auto hnLeftLabelEnd =
-      std::find(std::begin(hostname), std::end(hostname), '.');
-  if (hnLeftLabelEnd == std::end(hostname) ||
-      !util::strieq(StringRef{ptLeftLabelEnd, std::end(pattern)},
-                    StringRef{hnLeftLabelEnd, std::end(hostname)})) {
-    return false;
-  }
-  // Perform wildcard match. Here '*' must match at least one
-  // character.
-  if (hnLeftLabelEnd - std::begin(hostname) <
-      ptLeftLabelEnd - std::begin(pattern)) {
-    return false;
-  }
-  return util::istarts_with(StringRef{std::begin(hostname), hnLeftLabelEnd},
-                            StringRef{std::begin(pattern), ptWildcard}) &&
-         util::iends_with(StringRef{std::begin(hostname), hnLeftLabelEnd},
-                          StringRef{ptWildcard + 1, ptLeftLabelEnd});
-}
-
-namespace {
-// if return value is not empty, StringRef.c_str() must be freed using
-// OPENSSL_free().
-StringRef get_common_name(X509 *cert) {
-  auto subjectname = X509_get_subject_name(cert);
-  if (!subjectname) {
-    LOG(WARN) << "Could not get X509 name object from the certificate.";
-    return StringRef{};
-  }
-  int lastpos = -1;
-  for (;;) {
-    lastpos = X509_NAME_get_index_by_NID(subjectname, NID_commonName, lastpos);
-    if (lastpos == -1) {
-      break;
-    }
-    auto entry = X509_NAME_get_entry(subjectname, lastpos);
-
-    unsigned char *p;
-    auto plen = ASN1_STRING_to_UTF8(&p, X509_NAME_ENTRY_get_data(entry));
-    if (plen < 0) {
-      continue;
-    }
-    if (std::find(p, p + plen, '\0') != p + plen) {
-      // Embedded NULL is not permitted.
-      continue;
-    }
-    if (plen == 0) {
-      LOG(WARN) << "X509 name is empty";
-      OPENSSL_free(p);
-      continue;
-    }
-
-    return StringRef{p, static_cast<size_t>(plen)};
-  }
-  return StringRef{};
-}
-} // namespace
-
-namespace {
-int verify_numeric_hostname(X509 *cert, const StringRef &hostname,
-                            const Address *addr) {
-  const void *saddr;
-  switch (addr->su.storage.ss_family) {
-  case AF_INET:
-    saddr = &addr->su.in.sin_addr;
-    break;
-  case AF_INET6:
-    saddr = &addr->su.in6.sin6_addr;
-    break;
-  default:
-    return -1;
-  }
-
-  auto altnames = static_cast<GENERAL_NAMES *>(
-      X509_get_ext_d2i(cert, NID_subject_alt_name, nullptr, nullptr));
-  if (altnames) {
-    auto altnames_deleter = defer(GENERAL_NAMES_free, altnames);
-    size_t n = sk_GENERAL_NAME_num(altnames);
-    auto ip_found = false;
-    for (size_t i = 0; i < n; ++i) {
-      auto altname = sk_GENERAL_NAME_value(altnames, i);
-      if (altname->type != GEN_IPADD) {
-        continue;
-      }
-
-      auto ip_addr = altname->d.iPAddress->data;
-      if (!ip_addr) {
-        continue;
-      }
-      size_t ip_addrlen = altname->d.iPAddress->length;
-
-      ip_found = true;
-      if (addr->len == ip_addrlen && memcmp(saddr, ip_addr, ip_addrlen) == 0) {
-        return 0;
-      }
-    }
-
-    if (ip_found) {
-      return -1;
-    }
-  }
-
-  auto cn = get_common_name(cert);
-  if (cn.empty()) {
-    return -1;
-  }
-
-  // cn is not NULL terminated
-  auto rv = util::streq(hostname, cn);
-  OPENSSL_free(const_cast<char *>(cn.c_str()));
-
-  if (rv) {
-    return 0;
-  }
-
-  return -1;
-}
-} // namespace
-
-namespace {
-int verify_hostname(X509 *cert, const StringRef &hostname,
-                    const Address *addr) {
-  if (util::numeric_host(hostname.c_str())) {
-    return verify_numeric_hostname(cert, hostname, addr);
-  }
-
-  auto altnames = static_cast<GENERAL_NAMES *>(
-      X509_get_ext_d2i(cert, NID_subject_alt_name, nullptr, nullptr));
-  if (altnames) {
-    auto dns_found = false;
-    auto altnames_deleter = defer(GENERAL_NAMES_free, altnames);
-    size_t n = sk_GENERAL_NAME_num(altnames);
-    for (size_t i = 0; i < n; ++i) {
-      auto altname = sk_GENERAL_NAME_value(altnames, i);
-      if (altname->type != GEN_DNS) {
-        continue;
-      }
-
-      auto name = ASN1_STRING_get0_data(altname->d.ia5);
-      if (!name) {
-        continue;
-      }
-
-      auto len = ASN1_STRING_length(altname->d.ia5);
-      if (len == 0) {
-        continue;
-      }
-      if (std::find(name, name + len, '\0') != name + len) {
-        // Embedded NULL is not permitted.
-        continue;
-      }
-
-      if (name[len - 1] == '.') {
-        --len;
-        if (len == 0) {
-          continue;
-        }
-      }
-
-      dns_found = true;
-
-      if (tls_hostname_match(StringRef{name, static_cast<size_t>(len)},
-                             hostname)) {
-        return 0;
-      }
-    }
-
-    // RFC 6125, section 6.4.4. says that client MUST not seek a match
-    // for CN if a dns dNSName is found.
-    if (dns_found) {
-      return -1;
-    }
-  }
-
-  auto cn = get_common_name(cert);
-  if (cn.empty()) {
-    return -1;
-  }
-
-  if (cn[cn.size() - 1] == '.') {
-    if (cn.size() == 1) {
-      OPENSSL_free(const_cast<char *>(cn.c_str()));
-
-      return -1;
-    }
-    cn = StringRef{cn.c_str(), cn.size() - 1};
-  }
-
-  auto rv = tls_hostname_match(cn, hostname);
-  OPENSSL_free(const_cast<char *>(cn.c_str()));
-
-  return rv ? 0 : -1;
-}
-} // namespace
-
-int check_cert(SSL *ssl, const Address *addr, const StringRef &host) {
-  auto cert = SSL_get_peer_certificate(ssl);
-  if (!cert) {
-    // By the protocol definition, TLS server always sends certificate
-    // if it has.  If certificate cannot be retrieved, authentication
-    // without certificate is used, such as PSK.
-    return 0;
-  }
-  auto cert_deleter = defer(X509_free, cert);
-
-  if (verify_hostname(cert, host, addr) != 0) {
-    LOG(ERROR) << "Certificate verification failed: hostname does not match";
-    return -1;
-  }
-  return 0;
-}
-
-int check_cert(SSL *ssl, const DownstreamAddr *addr, const Address *raddr) {
-  auto hostname =
-      addr->sni.empty() ? StringRef{addr->host} : StringRef{addr->sni};
-  return check_cert(ssl, raddr, hostname);
-}
-
-CertLookupTree::CertLookupTree() {}
-
-ssize_t CertLookupTree::add_cert(const StringRef &hostname, size_t idx) {
-  std::array<uint8_t, NI_MAXHOST> buf;
-
-  // NI_MAXHOST includes terminal NULL byte
-  if (hostname.empty() || hostname.size() + 1 > buf.size()) {
-    return -1;
-  }
-
-  auto wildcard_it = std::find(std::begin(hostname), std::end(hostname), '*');
-  if (wildcard_it != std::end(hostname) &&
-      wildcard_it + 1 != std::end(hostname)) {
-    auto wildcard_prefix = StringRef{std::begin(hostname), wildcard_it};
-    auto wildcard_suffix = StringRef{wildcard_it + 1, std::end(hostname)};
-
-    auto rev_suffix = StringRef{std::begin(buf),
-                                std::reverse_copy(std::begin(wildcard_suffix),
-                                                  std::end(wildcard_suffix),
-                                                  std::begin(buf))};
-
-    WildcardPattern *wpat;
-
-    if (wildcard_patterns_.size() !=
-        rev_wildcard_router_.add_route(rev_suffix, wildcard_patterns_.size())) {
-      auto wcidx = rev_wildcard_router_.match(rev_suffix);
-
-      assert(wcidx != -1);
-
-      wpat = &wildcard_patterns_[wcidx];
-    } else {
-      wildcard_patterns_.emplace_back();
-      wpat = &wildcard_patterns_.back();
-    }
-
-    auto rev_prefix = StringRef{std::begin(buf),
-                                std::reverse_copy(std::begin(wildcard_prefix),
-                                                  std::end(wildcard_prefix),
-                                                  std::begin(buf))};
-
-    for (auto &p : wpat->rev_prefix) {
-      if (p.prefix == rev_prefix) {
-        return p.idx;
-      }
-    }
-
-    wpat->rev_prefix.emplace_back(rev_prefix, idx);
-
-    return idx;
-  }
-
-  return router_.add_route(hostname, idx);
-}
-
-ssize_t CertLookupTree::lookup(const StringRef &hostname) {
-  std::array<uint8_t, NI_MAXHOST> buf;
-
-  // NI_MAXHOST includes terminal NULL byte
-  if (hostname.empty() || hostname.size() + 1 > buf.size()) {
-    return -1;
-  }
-
-  // Always prefer exact match
-  auto idx = router_.match(hostname);
-  if (idx != -1) {
-    return idx;
-  }
-
-  if (wildcard_patterns_.empty()) {
-    return -1;
-  }
-
-  ssize_t best_idx = -1;
-  size_t best_prefixlen = 0;
-  const RNode *last_node = nullptr;
-
-  auto rev_host = StringRef{
-      std::begin(buf), std::reverse_copy(std::begin(hostname),
-                                         std::end(hostname), std::begin(buf))};
-
-  for (;;) {
-    size_t nread = 0;
-
-    auto wcidx =
-        rev_wildcard_router_.match_prefix(&nread, &last_node, rev_host);
-    if (wcidx == -1) {
-      return best_idx;
-    }
-
-    // '*' must match at least one byte
-    if (nread == rev_host.size()) {
-      return best_idx;
-    }
-
-    rev_host = StringRef{std::begin(rev_host) + nread, std::end(rev_host)};
-
-    auto rev_prefix = StringRef{std::begin(rev_host) + 1, std::end(rev_host)};
-
-    auto &wpat = wildcard_patterns_[wcidx];
-    for (auto &wprefix : wpat.rev_prefix) {
-      if (!util::ends_with(rev_prefix, wprefix.prefix)) {
-        continue;
-      }
-
-      auto prefixlen =
-          wprefix.prefix.size() +
-          (reinterpret_cast<const uint8_t *>(&rev_host[0]) - &buf[0]);
-
-      // Breaking a tie with longer suffix
-      if (prefixlen < best_prefixlen) {
-        continue;
-      }
-
-      best_idx = wprefix.idx;
-      best_prefixlen = prefixlen;
-    }
-  }
-}
-
-void CertLookupTree::dump() const {
-  std::cerr << "exact:" << std::endl;
-  router_.dump();
-  std::cerr << "wildcard suffix (reversed):" << std::endl;
-  rev_wildcard_router_.dump();
-}
-
-int cert_lookup_tree_add_ssl_ctx(
-    CertLookupTree *lt, std::vector<std::vector<SSL_CTX *>> &indexed_ssl_ctx,
-    SSL_CTX *ssl_ctx) {
-  std::array<uint8_t, NI_MAXHOST> buf;
-
-#if LIBRESSL_2_7_API ||                                                        \
-    (!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L)
-  auto cert = SSL_CTX_get0_certificate(ssl_ctx);
-#else  // !LIBRESSL_2_7_API && OPENSSL_VERSION_NUMBER < 0x10002000L
-  auto tls_ctx_data =
-      static_cast<TLSContextData *>(SSL_CTX_get_app_data(ssl_ctx));
-  auto cert = load_certificate(tls_ctx_data->cert_file);
-  auto cert_deleter = defer(X509_free, cert);
-#endif // !LIBRESSL_2_7_API && OPENSSL_VERSION_NUMBER < 0x10002000L
-
-  auto altnames = static_cast<GENERAL_NAMES *>(
-      X509_get_ext_d2i(cert, NID_subject_alt_name, nullptr, nullptr));
-  if (altnames) {
-    auto altnames_deleter = defer(GENERAL_NAMES_free, altnames);
-    size_t n = sk_GENERAL_NAME_num(altnames);
-    auto dns_found = false;
-    for (size_t i = 0; i < n; ++i) {
-      auto altname = sk_GENERAL_NAME_value(altnames, i);
-      if (altname->type != GEN_DNS) {
-        continue;
-      }
-
-      auto name = ASN1_STRING_get0_data(altname->d.ia5);
-      if (!name) {
-        continue;
-      }
-
-      auto len = ASN1_STRING_length(altname->d.ia5);
-      if (len == 0) {
-        continue;
-      }
-      if (std::find(name, name + len, '\0') != name + len) {
-        // Embedded NULL is not permitted.
-        continue;
-      }
-
-      if (name[len - 1] == '.') {
-        --len;
-        if (len == 0) {
-          continue;
-        }
-      }
-
-      dns_found = true;
-
-      if (static_cast<size_t>(len) + 1 > buf.size()) {
-        continue;
-      }
-
-      auto end_buf = std::copy_n(name, len, std::begin(buf));
-      util::inp_strlower(std::begin(buf), end_buf);
-
-      auto idx = lt->add_cert(StringRef{std::begin(buf), end_buf},
-                              indexed_ssl_ctx.size());
-      if (idx == -1) {
-        continue;
-      }
-
-      if (static_cast<size_t>(idx) < indexed_ssl_ctx.size()) {
-        indexed_ssl_ctx[idx].push_back(ssl_ctx);
-      } else {
-        assert(static_cast<size_t>(idx) == indexed_ssl_ctx.size());
-        indexed_ssl_ctx.emplace_back(std::vector<SSL_CTX *>{ssl_ctx});
-      }
-    }
-
-    // Don't bother CN if we have dNSName.
-    if (dns_found) {
-      return 0;
-    }
-  }
-
-  auto cn = get_common_name(cert);
-  if (cn.empty()) {
-    return 0;
-  }
-
-  if (cn[cn.size() - 1] == '.') {
-    if (cn.size() == 1) {
-      OPENSSL_free(const_cast<char *>(cn.c_str()));
-
-      return 0;
-    }
-
-    cn = StringRef{cn.c_str(), cn.size() - 1};
-  }
-
-  auto end_buf = std::copy(std::begin(cn), std::end(cn), std::begin(buf));
-
-  OPENSSL_free(const_cast<char *>(cn.c_str()));
-
-  util::inp_strlower(std::begin(buf), end_buf);
-
-  auto idx =
-      lt->add_cert(StringRef{std::begin(buf), end_buf}, indexed_ssl_ctx.size());
-  if (idx == -1) {
-    return 0;
-  }
-
-  if (static_cast<size_t>(idx) < indexed_ssl_ctx.size()) {
-    indexed_ssl_ctx[idx].push_back(ssl_ctx);
-  } else {
-    assert(static_cast<size_t>(idx) == indexed_ssl_ctx.size());
-    indexed_ssl_ctx.emplace_back(std::vector<SSL_CTX *>{ssl_ctx});
-  }
-
-  return 0;
-}
-
-bool in_proto_list(const std::vector<StringRef> &protos,
-                   const StringRef &needle) {
-  for (auto &proto : protos) {
-    if (util::streq(proto, needle)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool upstream_tls_enabled(const ConnectionConfig &connconf) {
-  const auto &faddrs = connconf.listener.addrs;
-  return std::any_of(std::begin(faddrs), std::end(faddrs),
-                     [](const UpstreamAddr &faddr) { return faddr.tls; });
-}
-
-X509 *load_certificate(const char *filename) {
-  auto bio = BIO_new(BIO_s_file());
-  if (!bio) {
-    fprintf(stderr, "BIO_new() failed\n");
-    return nullptr;
-  }
-  auto bio_deleter = defer(BIO_vfree, bio);
-  if (!BIO_read_filename(bio, filename)) {
-    fprintf(stderr, "Could not read certificate file '%s'\n", filename);
-    return nullptr;
-  }
-  auto cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
-  if (!cert) {
-    fprintf(stderr, "Could not read X509 structure from file '%s'\n", filename);
-    return nullptr;
-  }
-
-  return cert;
-}
-
-SSL_CTX *
-setup_server_ssl_context(std::vector<SSL_CTX *> &all_ssl_ctx,
-                         std::vector<std::vector<SSL_CTX *>> &indexed_ssl_ctx,
-                         CertLookupTree *cert_tree
-#ifdef HAVE_NEVERBLEED
-                         ,
-                         neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-) {
-  auto config = get_config();
-
-  if (!upstream_tls_enabled(config->conn)) {
-    return nullptr;
-  }
-
-  auto &tlsconf = config->tls;
-
-  auto ssl_ctx = create_ssl_context(tlsconf.private_key_file.c_str(),
-                                    tlsconf.cert_file.c_str(), tlsconf.sct_data
-#ifdef HAVE_NEVERBLEED
-                                    ,
-                                    nb
-#endif // HAVE_NEVERBLEED
-  );
-
-  all_ssl_ctx.push_back(ssl_ctx);
-
-  assert(cert_tree);
-
-  if (cert_lookup_tree_add_ssl_ctx(cert_tree, indexed_ssl_ctx, ssl_ctx) == -1) {
-    LOG(FATAL) << "Failed to add default certificate.";
-    DIE();
-  }
-
-  for (auto &c : tlsconf.subcerts) {
-    auto ssl_ctx = create_ssl_context(c.private_key_file.c_str(),
-                                      c.cert_file.c_str(), c.sct_data
-#ifdef HAVE_NEVERBLEED
-                                      ,
-                                      nb
-#endif // HAVE_NEVERBLEED
-    );
-    all_ssl_ctx.push_back(ssl_ctx);
-
-    if (cert_lookup_tree_add_ssl_ctx(cert_tree, indexed_ssl_ctx, ssl_ctx) ==
-        -1) {
-      LOG(FATAL) << "Failed to add sub certificate.";
-      DIE();
-    }
-  }
-
-  return ssl_ctx;
-}
-
-SSL_CTX *setup_downstream_client_ssl_context(
-#ifdef HAVE_NEVERBLEED
-    neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-) {
-  auto &tlsconf = get_config()->tls;
-
-  return create_ssl_client_context(
-#ifdef HAVE_NEVERBLEED
-      nb,
-#endif // HAVE_NEVERBLEED
-      tlsconf.cacert, tlsconf.client.cert_file, tlsconf.client.private_key_file,
-      select_next_proto_cb);
-}
-
-void setup_downstream_http2_alpn(SSL *ssl) {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  // ALPN advertisement
-  auto alpn = util::get_default_alpn();
-  SSL_set_alpn_protos(ssl, alpn.data(), alpn.size());
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-}
-
-void setup_downstream_http1_alpn(SSL *ssl) {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-  // ALPN advertisement
-  SSL_set_alpn_protos(ssl, NGHTTP2_H1_1_ALPN.byte(), NGHTTP2_H1_1_ALPN.size());
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-}
-
-std::unique_ptr<CertLookupTree> create_cert_lookup_tree() {
-  auto config = get_config();
-  if (!upstream_tls_enabled(config->conn)) {
-    return nullptr;
-  }
-  return make_unique<CertLookupTree>();
-}
-
-namespace {
-std::vector<uint8_t> serialize_ssl_session(SSL_SESSION *session) {
-  auto len = i2d_SSL_SESSION(session, nullptr);
-  auto buf = std::vector<uint8_t>(len);
-  auto p = buf.data();
-  i2d_SSL_SESSION(session, &p);
-
-  return buf;
-}
-} // namespace
-
-void try_cache_tls_session(TLSSessionCache *cache, SSL_SESSION *session,
-                           ev_tstamp t) {
-  if (cache->last_updated + 1_min > t) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Client session cache entry is still fresh.";
-    }
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Update client cache entry "
-              << "timestamp = " << std::fixed << std::setprecision(6) << t;
-  }
-
-  cache->session_data = serialize_ssl_session(session);
-  cache->last_updated = t;
-}
-
-SSL_SESSION *reuse_tls_session(const TLSSessionCache &cache) {
-  if (cache.session_data.empty()) {
-    return nullptr;
-  }
-
-  auto p = cache.session_data.data();
-  return d2i_SSL_SESSION(nullptr, &p, cache.session_data.size());
-}
-
-int proto_version_from_string(const StringRef &v) {
-#ifdef TLS1_3_VERSION
-  if (util::strieq_l("TLSv1.3", v)) {
-    return TLS1_3_VERSION;
-  }
-#endif // TLS1_3_VERSION
-  if (util::strieq_l("TLSv1.2", v)) {
-    return TLS1_2_VERSION;
-  }
-  if (util::strieq_l("TLSv1.1", v)) {
-    return TLS1_1_VERSION;
-  }
-  if (util::strieq_l("TLSv1.0", v)) {
-    return TLS1_VERSION;
-  }
-  return -1;
-}
-
-int verify_ocsp_response(SSL_CTX *ssl_ctx, const uint8_t *ocsp_resp,
-                         size_t ocsp_resplen) {
-
-#if !defined(OPENSSL_NO_OCSP) && !LIBRESSL_IN_USE &&                           \
-    OPENSSL_VERSION_NUMBER >= 0x10002000L
-  int rv;
-
-  STACK_OF(X509) * chain_certs;
-  SSL_CTX_get0_chain_certs(ssl_ctx, &chain_certs);
-
-  auto resp = d2i_OCSP_RESPONSE(nullptr, &ocsp_resp, ocsp_resplen);
-  if (resp == nullptr) {
-    LOG(ERROR) << "d2i_OCSP_RESPONSE failed";
-    return -1;
-  }
-  auto resp_deleter = defer(OCSP_RESPONSE_free, resp);
-
-  ERR_clear_error();
-
-  auto bs = OCSP_response_get1_basic(resp);
-  if (bs == nullptr) {
-    LOG(ERROR) << "OCSP_response_get1_basic failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    return -1;
-  }
-  auto bs_deleter = defer(OCSP_BASICRESP_free, bs);
-
-  auto store = SSL_CTX_get_cert_store(ssl_ctx);
-
-  ERR_clear_error();
-
-  rv = OCSP_basic_verify(bs, chain_certs, store, 0);
-
-  if (rv != 1) {
-    LOG(ERROR) << "OCSP_basic_verify failed: "
-               << ERR_error_string(ERR_get_error(), nullptr);
-    return -1;
-  }
-
-  auto sresp = OCSP_resp_get0(bs, 0);
-  if (sresp == nullptr) {
-    LOG(ERROR) << "OCSP response verification failed: no single response";
-    return -1;
-  }
-
-#  if OPENSSL_1_1_API
-  auto certid = OCSP_SINGLERESP_get0_id(sresp);
-#  else  // !OPENSSL_1_1_API
-  auto certid = sresp->certId;
-#  endif // !OPENSSL_1_1_API
-  assert(certid != nullptr);
-
-  ASN1_INTEGER *serial;
-  rv = OCSP_id_get0_info(nullptr, nullptr, nullptr, &serial,
-                         const_cast<OCSP_CERTID *>(certid));
-  if (rv != 1) {
-    LOG(ERROR) << "OCSP_id_get0_info failed";
-    return -1;
-  }
-
-  if (serial == nullptr) {
-    LOG(ERROR) << "OCSP response does not contain serial number";
-    return -1;
-  }
-
-  auto cert = SSL_CTX_get0_certificate(ssl_ctx);
-  auto cert_serial = X509_get_serialNumber(cert);
-
-  if (ASN1_INTEGER_cmp(cert_serial, serial)) {
-    LOG(ERROR) << "OCSP verification serial numbers do not match";
-    return -1;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "OCSP verification succeeded";
-  }
-#endif // !defined(OPENSSL_NO_OCSP) && !LIBRESSL_IN_USE
-       // && OPENSSL_VERSION_NUMBER >= 0x10002000L
-
-  return 0;
-}
-
-ssize_t get_x509_fingerprint(uint8_t *dst, size_t dstlen, const X509 *x,
-                             const EVP_MD *md) {
-  unsigned int len = dstlen;
-  if (X509_digest(x, md, dst, &len) != 1) {
-    return -1;
-  }
-  return len;
-}
-
-namespace {
-StringRef get_x509_name(BlockAllocator &balloc, X509_NAME *nm) {
-  auto b = BIO_new(BIO_s_mem());
-  if (!b) {
-    return StringRef{};
-  }
-
-  auto b_deleter = defer(BIO_free, b);
-
-  // Not documented, but it seems that X509_NAME_print_ex returns the
-  // number of bytes written into b.
-  auto slen = X509_NAME_print_ex(b, nm, 0, XN_FLAG_RFC2253);
-  if (slen <= 0) {
-    return StringRef{};
-  }
-
-  auto iov = make_byte_ref(balloc, slen + 1);
-  BIO_read(b, iov.base, slen);
-  iov.base[slen] = '\0';
-  return StringRef{iov.base, static_cast<size_t>(slen)};
-}
-} // namespace
-
-StringRef get_x509_subject_name(BlockAllocator &balloc, X509 *x) {
-  return get_x509_name(balloc, X509_get_subject_name(x));
-}
-
-StringRef get_x509_issuer_name(BlockAllocator &balloc, X509 *x) {
-  return get_x509_name(balloc, X509_get_issuer_name(x));
-}
-
-#ifdef WORDS_BIGENDIAN
-#  define bswap64(N) (N)
-#else /* !WORDS_BIGENDIAN */
-#  define bswap64(N)                                                           \
-    ((uint64_t)(ntohl((uint32_t)(N))) << 32 | ntohl((uint32_t)((N) >> 32)))
-#endif /* !WORDS_BIGENDIAN */
-
-StringRef get_x509_serial(BlockAllocator &balloc, X509 *x) {
-#if OPENSSL_1_1_API
-  auto sn = X509_get0_serialNumber(x);
-  uint64_t r;
-  if (ASN1_INTEGER_get_uint64(&r, sn) != 1) {
-    return StringRef{};
-  }
-
-  r = bswap64(r);
-  return util::format_hex(
-      balloc, StringRef{reinterpret_cast<uint8_t *>(&r), sizeof(r)});
-#else  // !OPENSSL_1_1_API
-  auto sn = X509_get_serialNumber(x);
-  auto bn = BN_new();
-  auto bn_d = defer(BN_free, bn);
-  if (!ASN1_INTEGER_to_BN(sn, bn)) {
-    return StringRef{};
-  }
-
-  std::array<uint8_t, 8> b;
-  auto n = BN_bn2bin(bn, b.data());
-  assert(n == b.size());
-
-  return util::format_hex(balloc, StringRef{std::begin(b), std::end(b)});
-#endif // !OPENSSL_1_1_API
-}
-
-namespace {
-// Performs conversion from |at| to time_t.  The result is stored in
-// |t|.  This function returns 0 if it succeeds, or -1.
-int time_t_from_asn1_time(time_t &t, const ASN1_TIME *at) {
-  int rv;
-
-#if OPENSSL_1_1_1_API
-  struct tm tm;
-  rv = ASN1_TIME_to_tm(at, &tm);
-  if (rv != 1) {
-    return -1;
-  }
-
-  t = nghttp2_timegm(&tm);
-#else  // !OPENSSL_1_1_1_API
-  auto b = BIO_new(BIO_s_mem());
-  if (!b) {
-    return -1;
-  }
-
-  auto bio_deleter = defer(BIO_free, b);
-
-  rv = ASN1_TIME_print(b, at);
-  if (rv != 1) {
-    return -1;
-  }
-
-  unsigned char *s;
-  auto slen = BIO_get_mem_data(b, &s);
-  auto tt = util::parse_openssl_asn1_time_print(
-      StringRef{s, static_cast<size_t>(slen)});
-  if (tt == 0) {
-    return -1;
-  }
-
-  t = tt;
-#endif // !OPENSSL_1_1_1_API
-
-  return 0;
-}
-} // namespace
-
-int get_x509_not_before(time_t &t, X509 *x) {
-#if OPENSSL_1_1_API
-  auto at = X509_get0_notBefore(x);
-#else  // !OPENSSL_1_1_API
-  auto at = X509_get_notBefore(x);
-#endif // !OPENSSL_1_1_API
-  if (!at) {
-    return -1;
-  }
-
-  return time_t_from_asn1_time(t, at);
-}
-
-int get_x509_not_after(time_t &t, X509 *x) {
-#if OPENSSL_1_1_API
-  auto at = X509_get0_notAfter(x);
-#else  // !OPENSSL_1_1_API
-  auto at = X509_get_notAfter(x);
-#endif // !OPENSSL_1_1_API
-  if (!at) {
-    return -1;
-  }
-
-  return time_t_from_asn1_time(t, at);
-}
-
-} // namespace tls
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,303 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_TLS_H
-#define SHRPX_TLS_H
-
-#include "shrpx.h"
-
-#include <vector>
-#include <mutex>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include <ev.h>
-
-#ifdef HAVE_NEVERBLEED
-#  include <neverbleed.h>
-#endif // HAVE_NEVERBLEED
-
-#include "network.h"
-#include "shrpx_config.h"
-#include "shrpx_router.h"
-
-namespace shrpx {
-
-class ClientHandler;
-class Worker;
-class DownstreamConnectionPool;
-struct DownstreamAddr;
-struct UpstreamAddr;
-
-namespace tls {
-
-struct TLSSessionCache {
-  // ASN1 representation of SSL_SESSION object.  See
-  // i2d_SSL_SESSION(3SSL).
-  std::vector<uint8_t> session_data;
-  // The last time stamp when this cache entry is created or updated.
-  ev_tstamp last_updated;
-};
-
-// This struct stores the additional information per SSL_CTX.  This is
-// attached to SSL_CTX using SSL_CTX_set_app_data().
-struct TLSContextData {
-  // SCT data formatted so that this can be directly sent as
-  // extension_data of signed_certificate_timestamp.
-  std::vector<uint8_t> sct_data;
-#ifndef HAVE_ATOMIC_STD_SHARED_PTR
-  // Protects ocsp_data;
-  std::mutex mu;
-#endif // !HAVE_ATOMIC_STD_SHARED_PTR
-  // OCSP response
-  std::shared_ptr<std::vector<uint8_t>> ocsp_data;
-
-  // Path to certificate file
-  const char *cert_file;
-};
-
-// Create server side SSL_CTX
-SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file,
-                            const std::vector<uint8_t> &sct_data
-
-#ifdef HAVE_NEVERBLEED
-                            ,
-                            neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-);
-
-// Create client side SSL_CTX.  This does not configure ALPN settings.
-// |next_proto_select_cb| is for NPN.
-SSL_CTX *create_ssl_client_context(
-#ifdef HAVE_NEVERBLEED
-    neverbleed_t *nb,
-#endif // HAVE_NEVERBLEED
-    const StringRef &cacert, const StringRef &cert_file,
-    const StringRef &private_key_file,
-    int (*next_proto_select_cb)(SSL *s, unsigned char **out,
-                                unsigned char *outlen, const unsigned char *in,
-                                unsigned int inlen, void *arg));
-
-ClientHandler *accept_connection(Worker *worker, int fd, sockaddr *addr,
-                                 int addrlen, const UpstreamAddr *faddr);
-
-// Check peer's certificate against given |address| and |host|.
-int check_cert(SSL *ssl, const Address *addr, const StringRef &host);
-// Check peer's certificate against given host name described in
-// |addr| and numeric address in |raddr|.  Note that |raddr| might not
-// point to &addr->addr.
-int check_cert(SSL *ssl, const DownstreamAddr *addr, const Address *raddr);
-
-struct WildcardRevPrefix {
-  WildcardRevPrefix(const StringRef &prefix, size_t idx)
-      : prefix(std::begin(prefix), std::end(prefix)), idx(idx) {}
-
-  // "Prefix" of wildcard pattern.  It is reversed from original form.
-  // For example, if the original wildcard is "test*.nghttp2.org",
-  // prefix would be "tset".
-  ImmutableString prefix;
-  // The index of SSL_CTX.  See ConnectionHandler::get_ssl_ctx().
-  size_t idx;
-};
-
-struct WildcardPattern {
-  // Wildcard host sharing only suffix is probably rare, so we just do
-  // linear search.
-  std::vector<WildcardRevPrefix> rev_prefix;
-};
-
-class CertLookupTree {
-public:
-  CertLookupTree();
-
-  // Adds hostname pattern |hostname| to the lookup tree, associating
-  // value |index|.  When the queried host matches this pattern,
-  // |index| is returned.  We support wildcard pattern.  The left most
-  // '*' is considered as wildcard character, and it must match at
-  // least one character.  If the same pattern has been already added,
-  // this function does not alter the tree, and returns the existing
-  // matching index.
-  //
-  // The caller should lower-case |hostname| since this function does
-  // do that, and lookup function performs case-sensitive match.
-  //
-  // TODO Treat wildcard pattern described as RFC 6125.
-  //
-  // This function returns the index.  It returns -1 if it fails
-  // (e.g., hostname is too long).  If the returned index equals to
-  // |index|, then hostname is added to the tree with the value
-  // |index|.  If it is not -1, and does not equal to |index|, same
-  // hostname has already been added to the tree.
-  ssize_t add_cert(const StringRef &hostname, size_t index);
-
-  // Looks up index using the given |hostname|.  The exact match takes
-  // precedence over wildcard match.  For wildcard match, longest
-  // match (sum of matched suffix and prefix length in bytes) is
-  // preferred, breaking a tie with longer suffix.
-  //
-  // The caller should lower-case |hostname| since this function
-  // performs case-sensitive match.
-  ssize_t lookup(const StringRef &hostname);
-
-  // Dumps the contents of this lookup tree to stderr.
-  void dump() const;
-
-private:
-  // Exact match
-  Router router_;
-  // Wildcard reversed suffix match.  The returned index is into
-  // wildcard_patterns_.
-  Router rev_wildcard_router_;
-  // Stores wildcard suffix patterns.
-  std::vector<WildcardPattern> wildcard_patterns_;
-};
-
-// Adds hostnames in certificate in |ssl_ctx| to lookup tree |lt|.
-// The subjectAltNames and commonName are considered as eligible
-// hostname.  If there is at least one dNSName in subjectAltNames,
-// commonName is not considered.  |ssl_ctx| is also added to
-// |indexed_ssl_ctx|.  This function returns 0 if it succeeds, or -1.
-int cert_lookup_tree_add_ssl_ctx(
-    CertLookupTree *lt, std::vector<std::vector<SSL_CTX *>> &indexed_ssl_ctx,
-    SSL_CTX *ssl_ctx);
-
-// Returns true if |proto| is included in the
-// protocol list |protos|.
-bool in_proto_list(const std::vector<StringRef> &protos,
-                   const StringRef &proto);
-
-// Returns true if security requirement for HTTP/2 is fulfilled.
-bool check_http2_requirement(SSL *ssl);
-
-// Returns SSL/TLS option mask to disable SSL/TLS protocol version not
-// included in |tls_proto_list|.  The returned mask can be directly
-// passed to SSL_CTX_set_options().
-long int create_tls_proto_mask(const std::vector<StringRef> &tls_proto_list);
-
-int set_alpn_prefs(std::vector<unsigned char> &out,
-                   const std::vector<StringRef> &protos);
-
-// Setups server side SSL_CTX.  This function inspects get_config()
-// and if upstream_no_tls is true, returns nullptr.  Otherwise
-// construct default SSL_CTX.  If subcerts are available
-// (get_config()->subcerts), caller should provide CertLookupTree
-// object as |cert_tree| parameter, otherwise SNI does not work.  All
-// the created SSL_CTX is stored into |all_ssl_ctx|.  They are also
-// added to |indexed_ssl_ctx|.  |cert_tree| uses its index to
-// associate hostname to the SSL_CTX.
-SSL_CTX *
-setup_server_ssl_context(std::vector<SSL_CTX *> &all_ssl_ctx,
-                         std::vector<std::vector<SSL_CTX *>> &indexed_ssl_ctx,
-                         CertLookupTree *cert_tree
-#ifdef HAVE_NEVERBLEED
-                         ,
-                         neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-);
-
-// Setups client side SSL_CTX.
-SSL_CTX *setup_downstream_client_ssl_context(
-#ifdef HAVE_NEVERBLEED
-    neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-);
-
-// Sets ALPN settings in |SSL| suitable for HTTP/2 use.
-void setup_downstream_http2_alpn(SSL *ssl);
-// Sets ALPN settings in |SSL| suitable for HTTP/1.1 use.
-void setup_downstream_http1_alpn(SSL *ssl);
-
-// Creates CertLookupTree.  If frontend is configured not to use TLS,
-// this function returns nullptr.
-std::unique_ptr<CertLookupTree> create_cert_lookup_tree();
-
-SSL *create_ssl(SSL_CTX *ssl_ctx);
-
-// Returns true if SSL/TLS is enabled on upstream
-bool upstream_tls_enabled(const ConnectionConfig &connconf);
-
-// Performs TLS hostname match.  |pattern| can contain wildcard
-// character '*', which matches prefix of target hostname.  There are
-// several restrictions to make wildcard work.  The matching algorithm
-// is based on RFC 6125.
-bool tls_hostname_match(const StringRef &pattern, const StringRef &hostname);
-
-// Caches |session|.  |session| is serialized into ASN1
-// representation, and stored.  |t| is used as a time stamp.
-// Depending on the existing cache's time stamp, |session| might not
-// be cached.
-void try_cache_tls_session(TLSSessionCache *cache, SSL_SESSION *session,
-                           ev_tstamp t);
-
-// Returns cached session associated |addr|.  If no cache entry is
-// found associated to |addr|, nullptr will be returned.
-SSL_SESSION *reuse_tls_session(const TLSSessionCache &addr);
-
-// Loads certificate form file |filename|.  The caller should delete
-// the returned object using X509_free().
-X509 *load_certificate(const char *filename);
-
-// Returns TLS version from |v|.  The returned value is defined in
-// OpenSSL header file.  This function returns -1 if |v| is not valid
-// TLS version string.
-int proto_version_from_string(const StringRef &v);
-
-// Verifies OCSP response |ocsp_resp| of length |ocsp_resplen|.  This
-// function returns 0 if it succeeds, or -1.
-int verify_ocsp_response(SSL_CTX *ssl_ctx, const uint8_t *ocsp_resp,
-                         size_t ocsp_resplen);
-
-// Stores fingerprint of |x| in |dst| of length |dstlen|.  |md|
-// specifies hash function to use, and |dstlen| must be large enough
-// to include hash value (e.g., 32 bytes for SHA-256).  This function
-// returns the number of bytes written in |dst|, or -1.
-ssize_t get_x509_fingerprint(uint8_t *dst, size_t dstlen, const X509 *x,
-                             const EVP_MD *md);
-
-// Returns subject name of |x|.  If this function fails to get subject
-// name, it returns an empty string.
-StringRef get_x509_subject_name(BlockAllocator &balloc, X509 *x);
-
-// Returns issuer name of |x|.  If this function fails to get issuer
-// name, it returns an empty string.
-StringRef get_x509_issuer_name(BlockAllocator &balloc, X509 *x);
-
-// Returns serial number of |x|.  If this function fails to get serial
-// number, it returns an empty string.  number
-StringRef get_x509_serial(BlockAllocator &balloc, X509 *x);
-
-// Fills NotBefore of |x| in |t|.  This function returns 0 if it
-// succeeds, or -1.
-int get_x509_not_before(time_t &t, X509 *x);
-
-// Fills NotAfter of |x| in |t|.  This function returns 0 if it
-// succeeds, or -1.
-int get_x509_not_after(time_t &t, X509 *x);
-
-} // namespace tls
-
-} // namespace shrpx
-
-#endif // SHRPX_TLS_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_tls_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "shrpx_tls.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-void test_shrpx_tls_create_lookup_tree(void) {
-  auto tree = make_unique<tls::CertLookupTree>();
-
-  constexpr StringRef hostnames[] = {
-      StringRef::from_lit("example.com"),             // 0
-      StringRef::from_lit("www.example.org"),         // 1
-      StringRef::from_lit("*www.example.org"),        // 2
-      StringRef::from_lit("xy*.host.domain"),         // 3
-      StringRef::from_lit("*yy.host.domain"),         // 4
-      StringRef::from_lit("nghttp2.sourceforge.net"), // 5
-      StringRef::from_lit("sourceforge.net"),         // 6
-      StringRef::from_lit("sourceforge.net"),         // 7, duplicate
-      StringRef::from_lit("*.foo.bar"), // 8, oo.bar is suffix of *.foo.bar
-      StringRef::from_lit("oo.bar")     // 9
-  };
-  auto num = array_size(hostnames);
-
-  for (size_t idx = 0; idx < num; ++idx) {
-    tree->add_cert(hostnames[idx], idx);
-  }
-
-  tree->dump();
-
-  CU_ASSERT(0 == tree->lookup(hostnames[0]));
-  CU_ASSERT(1 == tree->lookup(hostnames[1]));
-  CU_ASSERT(2 == tree->lookup(StringRef::from_lit("2www.example.org")));
-  CU_ASSERT(-1 == tree->lookup(StringRef::from_lit("www2.example.org")));
-  CU_ASSERT(3 == tree->lookup(StringRef::from_lit("xy1.host.domain")));
-  // Does not match *yy.host.domain, because * must match at least 1
-  // character.
-  CU_ASSERT(-1 == tree->lookup(StringRef::from_lit("yy.host.domain")));
-  CU_ASSERT(4 == tree->lookup(StringRef::from_lit("xyy.host.domain")));
-  CU_ASSERT(-1 == tree->lookup(StringRef{}));
-  CU_ASSERT(5 == tree->lookup(hostnames[5]));
-  CU_ASSERT(6 == tree->lookup(hostnames[6]));
-  static constexpr char h6[] = "pdylay.sourceforge.net";
-  for (int i = 0; i < 7; ++i) {
-    CU_ASSERT(-1 == tree->lookup(StringRef{h6 + i, str_size(h6) - i}));
-  }
-  CU_ASSERT(8 == tree->lookup(StringRef::from_lit("x.foo.bar")));
-  CU_ASSERT(9 == tree->lookup(hostnames[9]));
-
-  constexpr StringRef names[] = {
-      StringRef::from_lit("rab"),  // 1
-      StringRef::from_lit("zab"),  // 2
-      StringRef::from_lit("zzub"), // 3
-      StringRef::from_lit("ab")    // 4
-  };
-  num = array_size(names);
-
-  tree = make_unique<tls::CertLookupTree>();
-  for (size_t idx = 0; idx < num; ++idx) {
-    tree->add_cert(names[idx], idx);
-  }
-  for (size_t i = 0; i < num; ++i) {
-    CU_ASSERT((ssize_t)i == tree->lookup(names[i]));
-  }
-}
-
-// We use cfssl to generate key pairs.
-//
-// CA self-signed key pairs generation:
-//
-//   $ cfssl genkey -initca ca.nghttp2.org.csr.json |
-//     cfssljson -bare ca.nghttp2.org
-//
-// Create CSR:
-//
-//   $ cfssl genkey test.nghttp2.org.csr.json | cfssljson -bare test.nghttp2.org
-//   $ cfssl genkey test.example.com.csr.json | cfssljson -bare test.example.com
-//
-// Sign CSR:
-//
-//   $ cfssl sign -ca ca.nghttp2.org.pem -ca-key ca.nghttp2.org-key.pem
-//     -config=ca-config.json -profile=server test.nghttp2.org.csr |
-//     cfssljson -bare test.nghttp2.org
-//
-//   $ cfssl sign -ca ca.nghttp2.org.pem -ca-key ca.nghttp2.org-key.pem
-//     -config=ca-config.json -profile=server test.example.com.csr |
-//     cfssljson -bare test.example.com
-//
-void test_shrpx_tls_cert_lookup_tree_add_ssl_ctx(void) {
-  int rv;
-
-  static constexpr char nghttp2_certfile[] =
-      NGHTTP2_SRC_DIR "/test.nghttp2.org.pem";
-  auto nghttp2_ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-  auto nghttp2_ssl_ctx_del = defer(SSL_CTX_free, nghttp2_ssl_ctx);
-  auto nghttp2_tls_ctx_data = make_unique<tls::TLSContextData>();
-  nghttp2_tls_ctx_data->cert_file = nghttp2_certfile;
-  SSL_CTX_set_app_data(nghttp2_ssl_ctx, nghttp2_tls_ctx_data.get());
-  rv = SSL_CTX_use_certificate_chain_file(nghttp2_ssl_ctx, nghttp2_certfile);
-
-  CU_ASSERT(1 == rv);
-
-  static constexpr char examples_certfile[] =
-      NGHTTP2_SRC_DIR "/test.example.com.pem";
-  auto examples_ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-  auto examples_ssl_ctx_del = defer(SSL_CTX_free, examples_ssl_ctx);
-  auto examples_tls_ctx_data = make_unique<tls::TLSContextData>();
-  examples_tls_ctx_data->cert_file = examples_certfile;
-  SSL_CTX_set_app_data(examples_ssl_ctx, examples_tls_ctx_data.get());
-  rv = SSL_CTX_use_certificate_chain_file(examples_ssl_ctx, examples_certfile);
-
-  CU_ASSERT(1 == rv);
-
-  tls::CertLookupTree tree;
-  std::vector<std::vector<SSL_CTX *>> indexed_ssl_ctx;
-
-  rv = tls::cert_lookup_tree_add_ssl_ctx(&tree, indexed_ssl_ctx,
-                                         nghttp2_ssl_ctx);
-
-  CU_ASSERT(0 == rv);
-
-  rv = tls::cert_lookup_tree_add_ssl_ctx(&tree, indexed_ssl_ctx,
-                                         examples_ssl_ctx);
-
-  CU_ASSERT(0 == rv);
-
-  CU_ASSERT(-1 == tree.lookup(StringRef::from_lit("not-used.nghttp2.org")));
-  CU_ASSERT(0 == tree.lookup(StringRef::from_lit("test.nghttp2.org")));
-  CU_ASSERT(1 == tree.lookup(StringRef::from_lit("w.test.nghttp2.org")));
-  CU_ASSERT(2 == tree.lookup(StringRef::from_lit("www.test.nghttp2.org")));
-  CU_ASSERT(3 == tree.lookup(StringRef::from_lit("test.example.com")));
-}
-
-template <size_t N, size_t M>
-bool tls_hostname_match_wrapper(const char (&pattern)[N],
-                                const char (&hostname)[M]) {
-  return tls::tls_hostname_match(StringRef{pattern, N}, StringRef{hostname, M});
-}
-
-void test_shrpx_tls_tls_hostname_match(void) {
-  CU_ASSERT(tls_hostname_match_wrapper("example.com", "example.com"));
-  CU_ASSERT(tls_hostname_match_wrapper("example.com", "EXAMPLE.com"));
-
-  // check wildcard
-  CU_ASSERT(tls_hostname_match_wrapper("*.example.com", "www.example.com"));
-  CU_ASSERT(tls_hostname_match_wrapper("*w.example.com", "www.example.com"));
-  CU_ASSERT(tls_hostname_match_wrapper("www*.example.com", "www1.example.com"));
-  CU_ASSERT(
-      tls_hostname_match_wrapper("www*.example.com", "WWW12.EXAMPLE.com"));
-  // at least 2 dots are required after '*'
-  CU_ASSERT(!tls_hostname_match_wrapper("*.com", "example.com"));
-  CU_ASSERT(!tls_hostname_match_wrapper("*", "example.com"));
-  // '*' must be in left most label
-  CU_ASSERT(
-      !tls_hostname_match_wrapper("blog.*.example.com", "blog.my.example.com"));
-  // prefix is wrong
-  CU_ASSERT(
-      !tls_hostname_match_wrapper("client*.example.com", "server.example.com"));
-  // '*' must match at least one character
-  CU_ASSERT(!tls_hostname_match_wrapper("www*.example.com", "www.example.com"));
-
-  CU_ASSERT(!tls_hostname_match_wrapper("example.com", "nghttp2.org"));
-  CU_ASSERT(!tls_hostname_match_wrapper("www.example.com", "example.com"));
-  CU_ASSERT(!tls_hostname_match_wrapper("example.com", "www.example.com"));
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_tls_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_TLS_TEST_H
-#define SHRPX_TLS_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_shrpx_tls_create_lookup_tree(void);
-void test_shrpx_tls_cert_lookup_tree_add_ssl_ctx(void);
-void test_shrpx_tls_tls_hostname_match(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_TLS_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx-unittest.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx-unittest.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx-unittest.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx-unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,236 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-#include <stdio.h>
-#include <string.h>
-#include <CUnit/Basic.h>
-// include test cases' include files here
-#include "shrpx_tls_test.h"
-#include "shrpx_downstream_test.h"
-#include "shrpx_config_test.h"
-#include "shrpx_worker_test.h"
-#include "http2_test.h"
-#include "util_test.h"
-#include "nghttp2_gzip_test.h"
-#include "buffer_test.h"
-#include "memchunk_test.h"
-#include "template_test.h"
-#include "shrpx_http_test.h"
-#include "base64_test.h"
-#include "shrpx_config.h"
-#include "tls.h"
-#include "shrpx_router_test.h"
-#include "shrpx_log.h"
-
-static int init_suite1(void) { return 0; }
-
-static int clean_suite1(void) { return 0; }
-
-int main(int argc, char *argv[]) {
-  CU_pSuite pSuite = NULL;
-  unsigned int num_tests_failed;
-
-  nghttp2::tls::libssl_init();
-
-  shrpx::create_config();
-
-  // initialize the CUnit test registry
-  if (CUE_SUCCESS != CU_initialize_registry())
-    return CU_get_error();
-
-  // add a suite to the registry
-  pSuite = CU_add_suite("shrpx_TestSuite", init_suite1, clean_suite1);
-  if (NULL == pSuite) {
-    CU_cleanup_registry();
-    return CU_get_error();
-  }
-
-  // add the tests to the suite
-  if (!CU_add_test(pSuite, "tls_create_lookup_tree",
-                   shrpx::test_shrpx_tls_create_lookup_tree) ||
-      !CU_add_test(pSuite, "tls_cert_lookup_tree_add_ssl_ctx",
-                   shrpx::test_shrpx_tls_cert_lookup_tree_add_ssl_ctx) ||
-      !CU_add_test(pSuite, "tls_tls_hostname_match",
-                   shrpx::test_shrpx_tls_tls_hostname_match) ||
-      !CU_add_test(pSuite, "http2_add_header", shrpx::test_http2_add_header) ||
-      !CU_add_test(pSuite, "http2_get_header", shrpx::test_http2_get_header) ||
-      !CU_add_test(pSuite, "http2_copy_headers_to_nva",
-                   shrpx::test_http2_copy_headers_to_nva) ||
-      !CU_add_test(pSuite, "http2_build_http1_headers_from_headers",
-                   shrpx::test_http2_build_http1_headers_from_headers) ||
-      !CU_add_test(pSuite, "http2_lws", shrpx::test_http2_lws) ||
-      !CU_add_test(pSuite, "http2_rewrite_location_uri",
-                   shrpx::test_http2_rewrite_location_uri) ||
-      !CU_add_test(pSuite, "http2_parse_http_status_code",
-                   shrpx::test_http2_parse_http_status_code) ||
-      !CU_add_test(pSuite, "http2_index_header",
-                   shrpx::test_http2_index_header) ||
-      !CU_add_test(pSuite, "http2_lookup_token",
-                   shrpx::test_http2_lookup_token) ||
-      !CU_add_test(pSuite, "http2_parse_link_header",
-                   shrpx::test_http2_parse_link_header) ||
-      !CU_add_test(pSuite, "http2_path_join", shrpx::test_http2_path_join) ||
-      !CU_add_test(pSuite, "http2_normalize_path",
-                   shrpx::test_http2_normalize_path) ||
-      !CU_add_test(pSuite, "http2_rewrite_clean_path",
-                   shrpx::test_http2_rewrite_clean_path) ||
-      !CU_add_test(pSuite, "http2_get_pure_path_component",
-                   shrpx::test_http2_get_pure_path_component) ||
-      !CU_add_test(pSuite, "http2_construct_push_component",
-                   shrpx::test_http2_construct_push_component) ||
-      !CU_add_test(pSuite, "http2_contains_trailers",
-                   shrpx::test_http2_contains_trailers) ||
-      !CU_add_test(pSuite, "downstream_field_store_append_last_header",
-                   shrpx::test_downstream_field_store_append_last_header) ||
-      !CU_add_test(pSuite, "downstream_field_store_header",
-                   shrpx::test_downstream_field_store_header) ||
-      !CU_add_test(pSuite, "downstream_crumble_request_cookie",
-                   shrpx::test_downstream_crumble_request_cookie) ||
-      !CU_add_test(pSuite, "downstream_assemble_request_cookie",
-                   shrpx::test_downstream_assemble_request_cookie) ||
-      !CU_add_test(pSuite, "downstream_rewrite_location_response_header",
-                   shrpx::test_downstream_rewrite_location_response_header) ||
-      !CU_add_test(pSuite, "downstream_supports_non_final_response",
-                   shrpx::test_downstream_supports_non_final_response) ||
-      !CU_add_test(pSuite, "downstream_find_affinity_cookie",
-                   shrpx::test_downstream_find_affinity_cookie) ||
-      !CU_add_test(pSuite, "config_parse_header",
-                   shrpx::test_shrpx_config_parse_header) ||
-      !CU_add_test(pSuite, "config_parse_log_format",
-                   shrpx::test_shrpx_config_parse_log_format) ||
-      !CU_add_test(pSuite, "config_read_tls_ticket_key_file",
-                   shrpx::test_shrpx_config_read_tls_ticket_key_file) ||
-      !CU_add_test(pSuite, "config_read_tls_ticket_key_file_aes_256",
-                   shrpx::test_shrpx_config_read_tls_ticket_key_file_aes_256) ||
-      !CU_add_test(pSuite, "worker_match_downstream_addr_group",
-                   shrpx::test_shrpx_worker_match_downstream_addr_group) ||
-      !CU_add_test(pSuite, "http_create_forwarded",
-                   shrpx::test_shrpx_http_create_forwarded) ||
-      !CU_add_test(pSuite, "http_create_via_header_value",
-                   shrpx::test_shrpx_http_create_via_header_value) ||
-      !CU_add_test(pSuite, "http_create_affinity_cookie",
-                   shrpx::test_shrpx_http_create_affinity_cookie) ||
-      !CU_add_test(pSuite, "router_match", shrpx::test_shrpx_router_match) ||
-      !CU_add_test(pSuite, "router_match_wildcard",
-                   shrpx::test_shrpx_router_match_wildcard) ||
-      !CU_add_test(pSuite, "router_match_prefix",
-                   shrpx::test_shrpx_router_match_prefix) ||
-      !CU_add_test(pSuite, "util_streq", shrpx::test_util_streq) ||
-      !CU_add_test(pSuite, "util_strieq", shrpx::test_util_strieq) ||
-      !CU_add_test(pSuite, "util_inp_strlower",
-                   shrpx::test_util_inp_strlower) ||
-      !CU_add_test(pSuite, "util_to_base64", shrpx::test_util_to_base64) ||
-      !CU_add_test(pSuite, "util_to_token68", shrpx::test_util_to_token68) ||
-      !CU_add_test(pSuite, "util_percent_encode_token",
-                   shrpx::test_util_percent_encode_token) ||
-      !CU_add_test(pSuite, "util_percent_encode_path",
-                   shrpx::test_util_percent_encode_path) ||
-      !CU_add_test(pSuite, "util_percent_decode",
-                   shrpx::test_util_percent_decode) ||
-      !CU_add_test(pSuite, "util_quote_string",
-                   shrpx::test_util_quote_string) ||
-      !CU_add_test(pSuite, "util_utox", shrpx::test_util_utox) ||
-      !CU_add_test(pSuite, "util_http_date", shrpx::test_util_http_date) ||
-      !CU_add_test(pSuite, "util_select_h2", shrpx::test_util_select_h2) ||
-      !CU_add_test(pSuite, "util_ipv6_numeric_addr",
-                   shrpx::test_util_ipv6_numeric_addr) ||
-      !CU_add_test(pSuite, "util_utos", shrpx::test_util_utos) ||
-      !CU_add_test(pSuite, "util_make_string_ref_uint",
-                   shrpx::test_util_make_string_ref_uint) ||
-      !CU_add_test(pSuite, "util_utos_unit", shrpx::test_util_utos_unit) ||
-      !CU_add_test(pSuite, "util_utos_funit", shrpx::test_util_utos_funit) ||
-      !CU_add_test(pSuite, "util_parse_uint_with_unit",
-                   shrpx::test_util_parse_uint_with_unit) ||
-      !CU_add_test(pSuite, "util_parse_uint", shrpx::test_util_parse_uint) ||
-      !CU_add_test(pSuite, "util_parse_duration_with_unit",
-                   shrpx::test_util_parse_duration_with_unit) ||
-      !CU_add_test(pSuite, "util_duration_str",
-                   shrpx::test_util_duration_str) ||
-      !CU_add_test(pSuite, "util_format_duration",
-                   shrpx::test_util_format_duration) ||
-      !CU_add_test(pSuite, "util_starts_with", shrpx::test_util_starts_with) ||
-      !CU_add_test(pSuite, "util_ends_with", shrpx::test_util_ends_with) ||
-      !CU_add_test(pSuite, "util_parse_http_date",
-                   shrpx::test_util_parse_http_date) ||
-      !CU_add_test(pSuite, "util_localtime_date",
-                   shrpx::test_util_localtime_date) ||
-      !CU_add_test(pSuite, "util_get_uint64", shrpx::test_util_get_uint64) ||
-      !CU_add_test(pSuite, "util_parse_config_str_list",
-                   shrpx::test_util_parse_config_str_list) ||
-      !CU_add_test(pSuite, "util_make_http_hostport",
-                   shrpx::test_util_make_http_hostport) ||
-      !CU_add_test(pSuite, "util_make_hostport",
-                   shrpx::test_util_make_hostport) ||
-      !CU_add_test(pSuite, "util_strifind", shrpx::test_util_strifind) ||
-      !CU_add_test(pSuite, "util_random_alpha_digit",
-                   shrpx::test_util_random_alpha_digit) ||
-      !CU_add_test(pSuite, "util_format_hex", shrpx::test_util_format_hex) ||
-      !CU_add_test(pSuite, "util_is_hex_string",
-                   shrpx::test_util_is_hex_string) ||
-      !CU_add_test(pSuite, "util_decode_hex", shrpx::test_util_decode_hex) ||
-      !CU_add_test(pSuite, "util_extract_host",
-                   shrpx::test_util_extract_host) ||
-      !CU_add_test(pSuite, "gzip_inflate", test_nghttp2_gzip_inflate) ||
-      !CU_add_test(pSuite, "buffer_write", nghttp2::test_buffer_write) ||
-      !CU_add_test(pSuite, "pool_recycle", nghttp2::test_pool_recycle) ||
-      !CU_add_test(pSuite, "memchunk_append", nghttp2::test_memchunks_append) ||
-      !CU_add_test(pSuite, "memchunk_drain", nghttp2::test_memchunks_drain) ||
-      !CU_add_test(pSuite, "memchunk_riovec", nghttp2::test_memchunks_riovec) ||
-      !CU_add_test(pSuite, "memchunk_recycle",
-                   nghttp2::test_memchunks_recycle) ||
-      !CU_add_test(pSuite, "memchunk_reset", nghttp2::test_memchunks_reset) ||
-      !CU_add_test(pSuite, "peek_memchunk_append",
-                   nghttp2::test_peek_memchunks_append) ||
-      !CU_add_test(pSuite, "peek_memchunk_disable_peek_drain",
-                   nghttp2::test_peek_memchunks_disable_peek_drain) ||
-      !CU_add_test(pSuite, "peek_memchunk_disable_peek_no_drain",
-                   nghttp2::test_peek_memchunks_disable_peek_no_drain) ||
-      !CU_add_test(pSuite, "peek_memchunk_reset",
-                   nghttp2::test_peek_memchunks_reset) ||
-      !CU_add_test(pSuite, "template_immutable_string",
-                   nghttp2::test_template_immutable_string) ||
-      !CU_add_test(pSuite, "template_string_ref",
-                   nghttp2::test_template_string_ref) ||
-      !CU_add_test(pSuite, "base64_encode", nghttp2::test_base64_encode) ||
-      !CU_add_test(pSuite, "base64_decode", nghttp2::test_base64_decode)) {
-    CU_cleanup_registry();
-    return CU_get_error();
-  }
-
-  // Run all tests using the CUnit Basic interface
-  CU_basic_set_mode(CU_BRM_VERBOSE);
-  CU_basic_run_tests();
-  num_tests_failed = CU_get_number_of_tests_failed();
-  CU_cleanup_registry();
-  if (CU_get_error() == CUE_SUCCESS) {
-    return num_tests_failed;
-  } else {
-    printf("CUnit Error: %s\n", CU_get_error_msg());
-    return CU_get_error();
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_upstream.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_upstream.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_upstream.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_upstream.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_UPSTREAM_H
-#define SHRPX_UPSTREAM_H
-
-#include "shrpx.h"
-#include "shrpx_io_control.h"
-#include "memchunk.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class ClientHandler;
-class Downstream;
-class DownstreamConnection;
-
-class Upstream {
-public:
-  virtual ~Upstream() {}
-  virtual int on_read() = 0;
-  virtual int on_write() = 0;
-  virtual int on_timeout(Downstream *downstream) { return 0; };
-  virtual int on_downstream_abort_request(Downstream *downstream,
-                                          unsigned int status_code) = 0;
-  // Called when the current request is aborted without forwarding it
-  // to backend, and it should be redirected to https URI.
-  virtual int
-  on_downstream_abort_request_with_https_redirect(Downstream *downstream) = 0;
-  virtual int downstream_read(DownstreamConnection *dconn) = 0;
-  virtual int downstream_write(DownstreamConnection *dconn) = 0;
-  virtual int downstream_eof(DownstreamConnection *dconn) = 0;
-  virtual int downstream_error(DownstreamConnection *dconn, int events) = 0;
-  virtual ClientHandler *get_client_handler() const = 0;
-
-  virtual int on_downstream_header_complete(Downstream *downstream) = 0;
-  virtual int on_downstream_body(Downstream *downstream, const uint8_t *data,
-                                 size_t len, bool flush) = 0;
-  virtual int on_downstream_body_complete(Downstream *downstream) = 0;
-
-  virtual void on_handler_delete() = 0;
-  // Called when downstream connection for |downstream| is reset.
-  // Currently this is only used by Http2Session.  If |no_retry| is
-  // true, another connection attempt using new DownstreamConnection
-  // is not allowed.
-  virtual int on_downstream_reset(Downstream *downstream, bool no_retry) = 0;
-
-  virtual void pause_read(IOCtrlReason reason) = 0;
-  virtual int resume_read(IOCtrlReason reason, Downstream *downstream,
-                          size_t consumed) = 0;
-  virtual int send_reply(Downstream *downstream, const uint8_t *body,
-                         size_t bodylen) = 0;
-
-  // Starts server push.  The |downstream| is an associated stream for
-  // the pushed resource.  This function returns 0 if it succeeds,
-  // otherwise -1.
-  virtual int initiate_push(Downstream *downstream, const StringRef &uri) = 0;
-
-  // Fills response data in |iov| whose capacity is |iovcnt|.  Returns
-  // the number of iovs filled.
-  virtual int response_riovec(struct iovec *iov, int iovcnt) const = 0;
-  virtual void response_drain(size_t n) = 0;
-  virtual bool response_empty() const = 0;
-
-  // Called when PUSH_PROMISE was started in downstream.  The
-  // associated downstream is given as |downstream|.  The promised
-  // stream ID is given as |promised_stream_id|.  If upstream supports
-  // server push for the corresponding upstream connection, it should
-  // return Downstream object for pushed stream.  Otherwise, returns
-  // nullptr.
-  virtual Downstream *
-  on_downstream_push_promise(Downstream *downstream,
-                             int32_t promised_stream_id) = 0;
-  // Called when PUSH_PROMISE frame was completely received in
-  // downstream.  The associated downstream is given as |downstream|.
-  // This function returns 0 if it succeeds, or -1.
-  virtual int
-  on_downstream_push_promise_complete(Downstream *downstream,
-                                      Downstream *promised_downstream) = 0;
-  // Returns true if server push is enabled in upstream connection.
-  virtual bool push_enabled() const = 0;
-  // Cancels promised downstream.  This function is called when
-  // PUSH_PROMISE for |promised_downstream| is not submitted to
-  // upstream session.
-  virtual void cancel_premature_downstream(Downstream *promised_downstream) = 0;
-};
-
-} // namespace shrpx
-
-#endif // SHRPX_UPSTREAM_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,701 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_worker.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include <memory>
-
-#include "shrpx_tls.h"
-#include "shrpx_log.h"
-#include "shrpx_client_handler.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_log_config.h"
-#include "shrpx_memcached_dispatcher.h"
-#ifdef HAVE_MRUBY
-#  include "shrpx_mruby.h"
-#endif // HAVE_MRUBY
-#include "util.h"
-#include "template.h"
-
-namespace shrpx {
-
-namespace {
-void eventcb(struct ev_loop *loop, ev_async *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-  worker->process_events();
-}
-} // namespace
-
-namespace {
-void mcpool_clear_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-  if (worker->get_worker_stat()->num_connections != 0) {
-    return;
-  }
-  worker->get_mcpool()->clear();
-}
-} // namespace
-
-namespace {
-void proc_wev_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto worker = static_cast<Worker *>(w->data);
-  worker->process_events();
-}
-} // namespace
-
-DownstreamAddrGroup::DownstreamAddrGroup() : retired{false} {}
-
-DownstreamAddrGroup::~DownstreamAddrGroup() {}
-
-// DownstreamKey is used to index SharedDownstreamAddr in order to
-// find the same configuration.
-using DownstreamKey = std::tuple<
-    std::vector<std::tuple<StringRef, StringRef, size_t, size_t, shrpx_proto,
-                           uint16_t, bool, bool, bool, bool>>,
-    bool, int, StringRef, StringRef, int>;
-
-namespace {
-DownstreamKey create_downstream_key(
-    const std::shared_ptr<SharedDownstreamAddr> &shared_addr) {
-  DownstreamKey dkey;
-
-  auto &addrs = std::get<0>(dkey);
-  addrs.resize(shared_addr->addrs.size());
-  auto p = std::begin(addrs);
-  for (auto &a : shared_addr->addrs) {
-    std::get<0>(*p) = a.host;
-    std::get<1>(*p) = a.sni;
-    std::get<2>(*p) = a.fall;
-    std::get<3>(*p) = a.rise;
-    std::get<4>(*p) = a.proto;
-    std::get<5>(*p) = a.port;
-    std::get<6>(*p) = a.host_unix;
-    std::get<7>(*p) = a.tls;
-    std::get<8>(*p) = a.dns;
-    std::get<9>(*p) = a.upgrade_scheme;
-    ++p;
-  }
-  std::sort(std::begin(addrs), std::end(addrs));
-
-  std::get<1>(dkey) = shared_addr->redirect_if_not_tls;
-
-  auto &affinity = shared_addr->affinity;
-  std::get<2>(dkey) = affinity.type;
-  std::get<3>(dkey) = affinity.cookie.name;
-  std::get<4>(dkey) = affinity.cookie.path;
-  std::get<5>(dkey) = affinity.cookie.secure;
-
-  return dkey;
-}
-} // namespace
-
-Worker::Worker(struct ev_loop *loop, SSL_CTX *sv_ssl_ctx, SSL_CTX *cl_ssl_ctx,
-               SSL_CTX *tls_session_cache_memcached_ssl_ctx,
-               tls::CertLookupTree *cert_tree,
-               const std::shared_ptr<TicketKeys> &ticket_keys,
-               ConnectionHandler *conn_handler,
-               std::shared_ptr<DownstreamConfig> downstreamconf)
-    : randgen_(util::make_mt19937()),
-      worker_stat_{},
-      dns_tracker_(loop),
-      loop_(loop),
-      sv_ssl_ctx_(sv_ssl_ctx),
-      cl_ssl_ctx_(cl_ssl_ctx),
-      cert_tree_(cert_tree),
-      conn_handler_(conn_handler),
-      ticket_keys_(ticket_keys),
-      connect_blocker_(
-          make_unique<ConnectBlocker>(randgen_, loop_, []() {}, []() {})),
-      graceful_shutdown_(false) {
-  ev_async_init(&w_, eventcb);
-  w_.data = this;
-  ev_async_start(loop_, &w_);
-
-  ev_timer_init(&mcpool_clear_timer_, mcpool_clear_cb, 0., 0.);
-  mcpool_clear_timer_.data = this;
-
-  ev_timer_init(&proc_wev_timer_, proc_wev_cb, 0., 0.);
-  proc_wev_timer_.data = this;
-
-  auto &session_cacheconf = get_config()->tls.session_cache;
-
-  if (!session_cacheconf.memcached.host.empty()) {
-    session_cache_memcached_dispatcher_ = make_unique<MemcachedDispatcher>(
-        &session_cacheconf.memcached.addr, loop,
-        tls_session_cache_memcached_ssl_ctx,
-        StringRef{session_cacheconf.memcached.host}, &mcpool_, randgen_);
-  }
-
-  replace_downstream_config(std::move(downstreamconf));
-}
-
-void Worker::replace_downstream_config(
-    std::shared_ptr<DownstreamConfig> downstreamconf) {
-  for (auto &g : downstream_addr_groups_) {
-    g->retired = true;
-
-    auto &shared_addr = g->shared_addr;
-
-    if (shared_addr->affinity.type == AFFINITY_NONE) {
-      shared_addr->dconn_pool.remove_all();
-      continue;
-    }
-
-    for (auto &addr : shared_addr->addrs) {
-      addr.dconn_pool->remove_all();
-    }
-  }
-
-  downstreamconf_ = downstreamconf;
-
-  // Making a copy is much faster with multiple thread on
-  // backendconfig API call.
-  auto groups = downstreamconf->addr_groups;
-
-  downstream_addr_groups_ =
-      std::vector<std::shared_ptr<DownstreamAddrGroup>>(groups.size());
-
-  std::map<DownstreamKey, size_t> addr_groups_indexer;
-#ifdef HAVE_MRUBY
-  // TODO It is a bit less efficient because
-  // mruby::create_mruby_context returns std::unique_ptr and we cannot
-  // use std::make_shared.
-  std::map<StringRef, std::shared_ptr<mruby::MRubyContext>> shared_mruby_ctxs;
-#endif // HAVE_MRUBY
-
-  for (size_t i = 0; i < groups.size(); ++i) {
-    auto &src = groups[i];
-    auto &dst = downstream_addr_groups_[i];
-
-    dst = std::make_shared<DownstreamAddrGroup>();
-    dst->pattern =
-        ImmutableString{std::begin(src.pattern), std::end(src.pattern)};
-#ifdef HAVE_MRUBY
-    auto mruby_ctx_it = shared_mruby_ctxs.find(src.mruby_file);
-    if (mruby_ctx_it == std::end(shared_mruby_ctxs)) {
-      dst->mruby_ctx = mruby::create_mruby_context(src.mruby_file);
-      assert(dst->mruby_ctx);
-      shared_mruby_ctxs.emplace(src.mruby_file, dst->mruby_ctx);
-    } else {
-      dst->mruby_ctx = (*mruby_ctx_it).second;
-    }
-#endif // HAVE_MRUBY
-
-    auto shared_addr = std::make_shared<SharedDownstreamAddr>();
-
-    shared_addr->addrs.resize(src.addrs.size());
-    shared_addr->affinity.type = src.affinity.type;
-    if (src.affinity.type == AFFINITY_COOKIE) {
-      shared_addr->affinity.cookie.name =
-          make_string_ref(shared_addr->balloc, src.affinity.cookie.name);
-      if (!src.affinity.cookie.path.empty()) {
-        shared_addr->affinity.cookie.path =
-            make_string_ref(shared_addr->balloc, src.affinity.cookie.path);
-      }
-      shared_addr->affinity.cookie.secure = src.affinity.cookie.secure;
-    }
-    shared_addr->affinity_hash = src.affinity_hash;
-    shared_addr->redirect_if_not_tls = src.redirect_if_not_tls;
-
-    size_t num_http1 = 0;
-    size_t num_http2 = 0;
-
-    for (size_t j = 0; j < src.addrs.size(); ++j) {
-      auto &src_addr = src.addrs[j];
-      auto &dst_addr = shared_addr->addrs[j];
-
-      dst_addr.addr = src_addr.addr;
-      dst_addr.host = make_string_ref(shared_addr->balloc, src_addr.host);
-      dst_addr.hostport =
-          make_string_ref(shared_addr->balloc, src_addr.hostport);
-      dst_addr.port = src_addr.port;
-      dst_addr.host_unix = src_addr.host_unix;
-      dst_addr.proto = src_addr.proto;
-      dst_addr.tls = src_addr.tls;
-      dst_addr.sni = make_string_ref(shared_addr->balloc, src_addr.sni);
-      dst_addr.fall = src_addr.fall;
-      dst_addr.rise = src_addr.rise;
-      dst_addr.dns = src_addr.dns;
-      dst_addr.upgrade_scheme = src_addr.upgrade_scheme;
-
-      auto shared_addr_ptr = shared_addr.get();
-
-      dst_addr.connect_blocker =
-          make_unique<ConnectBlocker>(randgen_, loop_,
-                                      [shared_addr_ptr, &dst_addr]() {
-                                        switch (dst_addr.proto) {
-                                        case PROTO_HTTP1:
-                                          --shared_addr_ptr->http1_pri.weight;
-                                          break;
-                                        case PROTO_HTTP2:
-                                          --shared_addr_ptr->http2_pri.weight;
-                                          break;
-                                        default:
-                                          assert(0);
-                                        }
-                                      },
-                                      [shared_addr_ptr, &dst_addr]() {
-                                        switch (dst_addr.proto) {
-                                        case PROTO_HTTP1:
-                                          ++shared_addr_ptr->http1_pri.weight;
-                                          break;
-                                        case PROTO_HTTP2:
-                                          ++shared_addr_ptr->http2_pri.weight;
-                                          break;
-                                        default:
-                                          assert(0);
-                                        }
-                                      });
-
-      dst_addr.live_check =
-          make_unique<LiveCheck>(loop_, cl_ssl_ctx_, this, &dst_addr, randgen_);
-
-      if (dst_addr.proto == PROTO_HTTP2) {
-        ++num_http2;
-      } else {
-        assert(dst_addr.proto == PROTO_HTTP1);
-        ++num_http1;
-      }
-    }
-
-    // share the connection if patterns have the same set of backend
-    // addresses.
-
-    auto dkey = create_downstream_key(shared_addr);
-    auto it = addr_groups_indexer.find(dkey);
-
-    if (it == std::end(addr_groups_indexer)) {
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << "number of http/1.1 backend: " << num_http1
-                  << ", number of h2 backend: " << num_http2;
-      }
-
-      shared_addr->http1_pri.weight = num_http1;
-      shared_addr->http2_pri.weight = num_http2;
-
-      if (shared_addr->affinity.type != AFFINITY_NONE) {
-        for (auto &addr : shared_addr->addrs) {
-          addr.dconn_pool = make_unique<DownstreamConnectionPool>();
-        }
-      }
-
-      dst->shared_addr = shared_addr;
-
-      addr_groups_indexer.emplace(std::move(dkey), i);
-    } else {
-      auto &g = *(std::begin(downstream_addr_groups_) + (*it).second);
-      if (LOG_ENABLED(INFO)) {
-        LOG(INFO) << dst->pattern << " shares the same backend group with "
-                  << g->pattern;
-      }
-      dst->shared_addr = g->shared_addr;
-    }
-  }
-}
-
-Worker::~Worker() {
-  ev_async_stop(loop_, &w_);
-  ev_timer_stop(loop_, &mcpool_clear_timer_);
-  ev_timer_stop(loop_, &proc_wev_timer_);
-}
-
-void Worker::schedule_clear_mcpool() {
-  // libev manual says: "If the watcher is already active nothing will
-  // happen."  Since we don't change any timeout here, we don't have
-  // to worry about querying ev_is_active.
-  ev_timer_start(loop_, &mcpool_clear_timer_);
-}
-
-void Worker::wait() {
-#ifndef NOTHREADS
-  fut_.get();
-#endif // !NOTHREADS
-}
-
-void Worker::run_async() {
-#ifndef NOTHREADS
-  fut_ = std::async(std::launch::async, [this] {
-    (void)reopen_log_files(get_config()->logging);
-    ev_run(loop_);
-    delete_log_config();
-  });
-#endif // !NOTHREADS
-}
-
-void Worker::send(const WorkerEvent &event) {
-  {
-    std::lock_guard<std::mutex> g(m_);
-
-    q_.push_back(event);
-  }
-
-  ev_async_send(loop_, &w_);
-}
-
-void Worker::process_events() {
-  WorkerEvent wev;
-  {
-    std::lock_guard<std::mutex> g(m_);
-
-    // Process event one at a time.  This is important for
-    // NEW_CONNECTION event since accepting large number of new
-    // connections at once may delay time to 1st byte for existing
-    // connections.
-
-    if (q_.empty()) {
-      ev_timer_stop(loop_, &proc_wev_timer_);
-      return;
-    }
-
-    wev = q_.front();
-    q_.pop_front();
-  }
-
-  ev_timer_start(loop_, &proc_wev_timer_);
-
-  auto config = get_config();
-
-  auto worker_connections = config->conn.upstream.worker_connections;
-
-  switch (wev.type) {
-  case NEW_CONNECTION: {
-    if (LOG_ENABLED(INFO)) {
-      WLOG(INFO, this) << "WorkerEvent: client_fd=" << wev.client_fd
-                       << ", addrlen=" << wev.client_addrlen;
-    }
-
-    if (worker_stat_.num_connections >= worker_connections) {
-
-      if (LOG_ENABLED(INFO)) {
-        WLOG(INFO, this) << "Too many connections >= " << worker_connections;
-      }
-
-      close(wev.client_fd);
-
-      break;
-    }
-
-    auto client_handler =
-        tls::accept_connection(this, wev.client_fd, &wev.client_addr.sa,
-                               wev.client_addrlen, wev.faddr);
-    if (!client_handler) {
-      if (LOG_ENABLED(INFO)) {
-        WLOG(ERROR, this) << "ClientHandler creation failed";
-      }
-      close(wev.client_fd);
-      break;
-    }
-
-    if (LOG_ENABLED(INFO)) {
-      WLOG(INFO, this) << "CLIENT_HANDLER:" << client_handler << " created ";
-    }
-
-    break;
-  }
-  case REOPEN_LOG:
-    WLOG(NOTICE, this) << "Reopening log files: worker process (thread " << this
-                       << ")";
-
-    reopen_log_files(config->logging);
-
-    break;
-  case GRACEFUL_SHUTDOWN:
-    WLOG(NOTICE, this) << "Graceful shutdown commencing";
-
-    graceful_shutdown_ = true;
-
-    if (worker_stat_.num_connections == 0) {
-      ev_break(loop_);
-
-      return;
-    }
-
-    break;
-  case REPLACE_DOWNSTREAM:
-    WLOG(NOTICE, this) << "Replace downstream";
-
-    replace_downstream_config(wev.downstreamconf);
-
-    break;
-  default:
-    if (LOG_ENABLED(INFO)) {
-      WLOG(INFO, this) << "unknown event type " << wev.type;
-    }
-  }
-}
-
-tls::CertLookupTree *Worker::get_cert_lookup_tree() const { return cert_tree_; }
-
-std::shared_ptr<TicketKeys> Worker::get_ticket_keys() {
-#ifdef HAVE_ATOMIC_STD_SHARED_PTR
-  return std::atomic_load_explicit(&ticket_keys_, std::memory_order_acquire);
-#else  // !HAVE_ATOMIC_STD_SHARED_PTR
-  std::lock_guard<std::mutex> g(ticket_keys_m_);
-  return ticket_keys_;
-#endif // !HAVE_ATOMIC_STD_SHARED_PTR
-}
-
-void Worker::set_ticket_keys(std::shared_ptr<TicketKeys> ticket_keys) {
-#ifdef HAVE_ATOMIC_STD_SHARED_PTR
-  // This is single writer
-  std::atomic_store_explicit(&ticket_keys_, std::move(ticket_keys),
-                             std::memory_order_release);
-#else  // !HAVE_ATOMIC_STD_SHARED_PTR
-  std::lock_guard<std::mutex> g(ticket_keys_m_);
-  ticket_keys_ = std::move(ticket_keys);
-#endif // !HAVE_ATOMIC_STD_SHARED_PTR
-}
-
-WorkerStat *Worker::get_worker_stat() { return &worker_stat_; }
-
-struct ev_loop *Worker::get_loop() const {
-  return loop_;
-}
-
-SSL_CTX *Worker::get_sv_ssl_ctx() const { return sv_ssl_ctx_; }
-
-SSL_CTX *Worker::get_cl_ssl_ctx() const { return cl_ssl_ctx_; }
-
-void Worker::set_graceful_shutdown(bool f) { graceful_shutdown_ = f; }
-
-bool Worker::get_graceful_shutdown() const { return graceful_shutdown_; }
-
-MemchunkPool *Worker::get_mcpool() { return &mcpool_; }
-
-MemcachedDispatcher *Worker::get_session_cache_memcached_dispatcher() {
-  return session_cache_memcached_dispatcher_.get();
-}
-
-std::mt19937 &Worker::get_randgen() { return randgen_; }
-
-#ifdef HAVE_MRUBY
-int Worker::create_mruby_context() {
-  mruby_ctx_ = mruby::create_mruby_context(StringRef{get_config()->mruby_file});
-  if (!mruby_ctx_) {
-    return -1;
-  }
-
-  return 0;
-}
-
-mruby::MRubyContext *Worker::get_mruby_context() const {
-  return mruby_ctx_.get();
-}
-#endif // HAVE_MRUBY
-
-std::vector<std::shared_ptr<DownstreamAddrGroup>> &
-Worker::get_downstream_addr_groups() {
-  return downstream_addr_groups_;
-}
-
-ConnectBlocker *Worker::get_connect_blocker() const {
-  return connect_blocker_.get();
-}
-
-const DownstreamConfig *Worker::get_downstream_config() const {
-  return downstreamconf_.get();
-}
-
-ConnectionHandler *Worker::get_connection_handler() const {
-  return conn_handler_;
-}
-
-DNSTracker *Worker::get_dns_tracker() { return &dns_tracker_; }
-
-namespace {
-size_t match_downstream_addr_group_host(
-    const RouterConfig &routerconf, const StringRef &host,
-    const StringRef &path,
-    const std::vector<std::shared_ptr<DownstreamAddrGroup>> &groups,
-    size_t catch_all, BlockAllocator &balloc) {
-
-  const auto &router = routerconf.router;
-  const auto &rev_wildcard_router = routerconf.rev_wildcard_router;
-  const auto &wildcard_patterns = routerconf.wildcard_patterns;
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Perform mapping selection, using host=" << host
-              << ", path=" << path;
-  }
-
-  auto group = router.match(host, path);
-  if (group != -1) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Found pattern with query " << host << path
-                << ", matched pattern=" << groups[group]->pattern;
-    }
-    return group;
-  }
-
-  if (!wildcard_patterns.empty() && !host.empty()) {
-    auto rev_host_src = make_byte_ref(balloc, host.size() - 1);
-    auto ep =
-        std::copy(std::begin(host) + 1, std::end(host), rev_host_src.base);
-    std::reverse(rev_host_src.base, ep);
-    auto rev_host = StringRef{rev_host_src.base, ep};
-
-    ssize_t best_group = -1;
-    const RNode *last_node = nullptr;
-
-    for (;;) {
-      size_t nread = 0;
-      auto wcidx =
-          rev_wildcard_router.match_prefix(&nread, &last_node, rev_host);
-      if (wcidx == -1) {
-        break;
-      }
-
-      rev_host = StringRef{std::begin(rev_host) + nread, std::end(rev_host)};
-
-      auto &wc = wildcard_patterns[wcidx];
-      auto group = wc.router.match(StringRef{}, path);
-      if (group != -1) {
-        // We sorted wildcard_patterns in a way that first match is the
-        // longest host pattern.
-        if (LOG_ENABLED(INFO)) {
-          LOG(INFO) << "Found wildcard pattern with query " << host << path
-                    << ", matched pattern=" << groups[group]->pattern;
-        }
-
-        best_group = group;
-      }
-    }
-
-    if (best_group != -1) {
-      return best_group;
-    }
-  }
-
-  group = router.match(StringRef::from_lit(""), path);
-  if (group != -1) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "Found pattern with query " << path
-                << ", matched pattern=" << groups[group]->pattern;
-    }
-    return group;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "None match.  Use catch-all pattern";
-  }
-  return catch_all;
-}
-} // namespace
-
-size_t match_downstream_addr_group(
-    const RouterConfig &routerconf, const StringRef &hostport,
-    const StringRef &raw_path,
-    const std::vector<std::shared_ptr<DownstreamAddrGroup>> &groups,
-    size_t catch_all, BlockAllocator &balloc) {
-  if (std::find(std::begin(hostport), std::end(hostport), '/') !=
-      std::end(hostport)) {
-    // We use '/' specially, and if '/' is included in host, it breaks
-    // our code.  Select catch-all case.
-    return catch_all;
-  }
-
-  auto fragment = std::find(std::begin(raw_path), std::end(raw_path), '#');
-  auto query = std::find(std::begin(raw_path), fragment, '?');
-  auto path = StringRef{std::begin(raw_path), query};
-
-  if (path.empty() || path[0] != '/') {
-    path = StringRef::from_lit("/");
-  }
-
-  if (hostport.empty()) {
-    return match_downstream_addr_group_host(routerconf, hostport, path, groups,
-                                            catch_all, balloc);
-  }
-
-  StringRef host;
-  if (hostport[0] == '[') {
-    // assume this is IPv6 numeric address
-    auto p = std::find(std::begin(hostport), std::end(hostport), ']');
-    if (p == std::end(hostport)) {
-      return catch_all;
-    }
-    if (p + 1 < std::end(hostport) && *(p + 1) != ':') {
-      return catch_all;
-    }
-    host = StringRef{std::begin(hostport), p + 1};
-  } else {
-    auto p = std::find(std::begin(hostport), std::end(hostport), ':');
-    if (p == std::begin(hostport)) {
-      return catch_all;
-    }
-    host = StringRef{std::begin(hostport), p};
-  }
-
-  if (std::find_if(std::begin(host), std::end(host), [](char c) {
-        return 'A' <= c || c <= 'Z';
-      }) != std::end(host)) {
-    auto low_host = make_byte_ref(balloc, host.size() + 1);
-    auto ep = std::copy(std::begin(host), std::end(host), low_host.base);
-    *ep = '\0';
-    util::inp_strlower(low_host.base, ep);
-    host = StringRef{low_host.base, ep};
-  }
-  return match_downstream_addr_group_host(routerconf, host, path, groups,
-                                          catch_all, balloc);
-}
-
-void downstream_failure(DownstreamAddr *addr, const Address *raddr) {
-  const auto &connect_blocker = addr->connect_blocker;
-
-  if (connect_blocker->in_offline()) {
-    return;
-  }
-
-  connect_blocker->on_failure();
-
-  if (addr->fall == 0) {
-    return;
-  }
-
-  auto fail_count = connect_blocker->get_fail_count();
-
-  if (fail_count >= addr->fall) {
-    if (raddr) {
-      LOG(WARN) << "Could not connect to " << util::to_numeric_addr(raddr)
-                << " " << fail_count
-                << " times in a row; considered as offline";
-    } else {
-      LOG(WARN) << "Could not connect to " << addr->host << ":" << addr->port
-                << " " << fail_count
-                << " times in a row; considered as offline";
-    }
-
-    connect_blocker->offline();
-
-    if (addr->rise) {
-      addr->live_check->schedule();
-    }
-  }
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,343 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_WORKER_H
-#define SHRPX_WORKER_H
-
-#include "shrpx.h"
-
-#include <mutex>
-#include <vector>
-#include <random>
-#include <unordered_map>
-#include <deque>
-#include <thread>
-#ifndef NOTHREADS
-#  include <future>
-#endif // NOTHREADS
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include <ev.h>
-
-#include "shrpx_config.h"
-#include "shrpx_downstream_connection_pool.h"
-#include "memchunk.h"
-#include "shrpx_tls.h"
-#include "shrpx_live_check.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_dns_tracker.h"
-#include "allocator.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-class Http2Session;
-class ConnectBlocker;
-class MemcachedDispatcher;
-struct UpstreamAddr;
-class ConnectionHandler;
-
-#ifdef HAVE_MRUBY
-namespace mruby {
-
-class MRubyContext;
-
-} // namespace mruby
-#endif // HAVE_MRUBY
-
-namespace tls {
-class CertLookupTree;
-} // namespace tls
-
-struct DownstreamAddr {
-  Address addr;
-  // backend address.  If |host_unix| is true, this is UNIX domain
-  // socket path.
-  StringRef host;
-  StringRef hostport;
-  // backend port.  0 if |host_unix| is true.
-  uint16_t port;
-  // true if |host| contains UNIX domain socket path.
-  bool host_unix;
-
-  // sni field to send remote server if TLS is enabled.
-  StringRef sni;
-
-  std::unique_ptr<ConnectBlocker> connect_blocker;
-  std::unique_ptr<LiveCheck> live_check;
-  // Connection pool for this particular address if session affinity
-  // is enabled
-  std::unique_ptr<DownstreamConnectionPool> dconn_pool;
-  size_t fall;
-  size_t rise;
-  // Client side TLS session cache
-  tls::TLSSessionCache tls_session_cache;
-  // Http2Session object created for this address.  This list chains
-  // all Http2Session objects that is not in group scope
-  // http2_avail_freelist, and is not reached in maximum concurrency.
-  //
-  // If session affinity is enabled, http2_avail_freelist is not used,
-  // and this list is solely used.
-  DList<Http2Session> http2_extra_freelist;
-  // true if Http2Session for this address is in group scope
-  // SharedDownstreamAddr.http2_avail_freelist
-  bool in_avail;
-  // total number of streams created in HTTP/2 connections for this
-  // address.
-  size_t num_dconn;
-  // Application protocol used in this backend
-  shrpx_proto proto;
-  // true if TLS is used in this backend
-  bool tls;
-  // true if dynamic DNS is enabled
-  bool dns;
-  // true if :scheme pseudo header field should be upgraded to secure
-  // variant (e.g., "https") when forwarding request to a backend
-  // connected by TLS connection.
-  bool upgrade_scheme;
-};
-
-// Simplified weighted fair queuing.  Actually we don't use queue here
-// since we have just 2 items.  This is the same algorithm used in
-// stream priority, but ignores remainder.
-struct WeightedPri {
-  // current cycle of this item.  The lesser cycle has higher
-  // priority.  This is unsigned 32 bit integer, so it may overflow.
-  // But with the same theory described in stream priority, it is no
-  // problem.
-  uint32_t cycle;
-  // weight, larger weight means more frequent use.
-  uint32_t weight;
-};
-
-struct SharedDownstreamAddr {
-  SharedDownstreamAddr()
-      : balloc(1024, 1024),
-        affinity{AFFINITY_NONE},
-        next{0},
-        http1_pri{},
-        http2_pri{},
-        redirect_if_not_tls{false} {}
-
-  SharedDownstreamAddr(const SharedDownstreamAddr &) = delete;
-  SharedDownstreamAddr(SharedDownstreamAddr &&) = delete;
-  SharedDownstreamAddr &operator=(const SharedDownstreamAddr &) = delete;
-  SharedDownstreamAddr &operator=(SharedDownstreamAddr &&) = delete;
-
-  BlockAllocator balloc;
-  std::vector<DownstreamAddr> addrs;
-  // Bunch of session affinity hash.  Only used if affinity ==
-  // AFFINITY_IP.
-  std::vector<AffinityHash> affinity_hash;
-  // List of Http2Session which is not fully utilized (i.e., the
-  // server advertised maximum concurrency is not reached).  We will
-  // coalesce as much stream as possible in one Http2Session to fully
-  // utilize TCP connection.
-  //
-  // If session affinity is enabled, this list is not used.  Per
-  // address http2_extra_freelist is used instead.
-  //
-  // TODO Verify that this approach performs better in performance
-  // wise.
-  DList<Http2Session> http2_avail_freelist;
-  DownstreamConnectionPool dconn_pool;
-  // Configuration for session affinity
-  AffinityConfig affinity;
-  // Next http/1.1 downstream address index in addrs.
-  size_t next;
-  // http1_pri and http2_pri are used to which protocols are used
-  // between HTTP/1.1 or HTTP/2 if they both are available in
-  // backends.  They are choosed proportional to the number available
-  // backend.  Usually, if http1_pri.cycle < http2_pri.cycle, choose
-  // HTTP/1.1.  Otherwise, choose HTTP/2.
-  WeightedPri http1_pri;
-  WeightedPri http2_pri;
-  // Session affinity
-  // true if this group requires that client connection must be TLS,
-  // and the request must be redirected to https URI.
-  bool redirect_if_not_tls;
-};
-
-struct DownstreamAddrGroup {
-  DownstreamAddrGroup();
-  ~DownstreamAddrGroup();
-
-  DownstreamAddrGroup(const DownstreamAddrGroup &) = delete;
-  DownstreamAddrGroup(DownstreamAddrGroup &&) = delete;
-  DownstreamAddrGroup &operator=(const DownstreamAddrGroup &) = delete;
-  DownstreamAddrGroup &operator=(DownstreamAddrGroup &&) = delete;
-
-  ImmutableString pattern;
-  std::shared_ptr<SharedDownstreamAddr> shared_addr;
-#ifdef HAVE_MRUBY
-  std::shared_ptr<mruby::MRubyContext> mruby_ctx;
-#endif // HAVE_MRUBY
-  // true if this group is no longer used for new request.  If this is
-  // true, the connection made using one of address in shared_addr
-  // must not be pooled.
-  bool retired;
-};
-
-struct WorkerStat {
-  size_t num_connections;
-};
-
-enum WorkerEventType {
-  NEW_CONNECTION = 0x01,
-  REOPEN_LOG = 0x02,
-  GRACEFUL_SHUTDOWN = 0x03,
-  REPLACE_DOWNSTREAM = 0x04,
-};
-
-struct WorkerEvent {
-  WorkerEventType type;
-  struct {
-    sockaddr_union client_addr;
-    size_t client_addrlen;
-    int client_fd;
-    const UpstreamAddr *faddr;
-  };
-  std::shared_ptr<TicketKeys> ticket_keys;
-  std::shared_ptr<DownstreamConfig> downstreamconf;
-};
-
-class Worker {
-public:
-  Worker(struct ev_loop *loop, SSL_CTX *sv_ssl_ctx, SSL_CTX *cl_ssl_ctx,
-         SSL_CTX *tls_session_cache_memcached_ssl_ctx,
-         tls::CertLookupTree *cert_tree,
-         const std::shared_ptr<TicketKeys> &ticket_keys,
-         ConnectionHandler *conn_handler,
-         std::shared_ptr<DownstreamConfig> downstreamconf);
-  ~Worker();
-  void run_async();
-  void wait();
-  void process_events();
-  void send(const WorkerEvent &event);
-
-  tls::CertLookupTree *get_cert_lookup_tree() const;
-
-  // These 2 functions make a lock m_ to get/set ticket keys
-  // atomically.
-  std::shared_ptr<TicketKeys> get_ticket_keys();
-  void set_ticket_keys(std::shared_ptr<TicketKeys> ticket_keys);
-
-  WorkerStat *get_worker_stat();
-  struct ev_loop *get_loop() const;
-  SSL_CTX *get_sv_ssl_ctx() const;
-  SSL_CTX *get_cl_ssl_ctx() const;
-
-  void set_graceful_shutdown(bool f);
-  bool get_graceful_shutdown() const;
-
-  MemchunkPool *get_mcpool();
-  void schedule_clear_mcpool();
-
-  MemcachedDispatcher *get_session_cache_memcached_dispatcher();
-
-  std::mt19937 &get_randgen();
-
-#ifdef HAVE_MRUBY
-  int create_mruby_context();
-
-  mruby::MRubyContext *get_mruby_context() const;
-#endif // HAVE_MRUBY
-
-  std::vector<std::shared_ptr<DownstreamAddrGroup>> &
-  get_downstream_addr_groups();
-
-  ConnectBlocker *get_connect_blocker() const;
-
-  const DownstreamConfig *get_downstream_config() const;
-
-  void
-  replace_downstream_config(std::shared_ptr<DownstreamConfig> downstreamconf);
-
-  ConnectionHandler *get_connection_handler() const;
-
-  DNSTracker *get_dns_tracker();
-
-private:
-#ifndef NOTHREADS
-  std::future<void> fut_;
-#endif // NOTHREADS
-  std::mutex m_;
-  std::deque<WorkerEvent> q_;
-  std::mt19937 randgen_;
-  ev_async w_;
-  ev_timer mcpool_clear_timer_;
-  ev_timer proc_wev_timer_;
-  MemchunkPool mcpool_;
-  WorkerStat worker_stat_;
-  DNSTracker dns_tracker_;
-
-  std::shared_ptr<DownstreamConfig> downstreamconf_;
-  std::unique_ptr<MemcachedDispatcher> session_cache_memcached_dispatcher_;
-#ifdef HAVE_MRUBY
-  std::unique_ptr<mruby::MRubyContext> mruby_ctx_;
-#endif // HAVE_MRUBY
-  struct ev_loop *loop_;
-
-  // Following fields are shared across threads if
-  // get_config()->tls_ctx_per_worker == true.
-  SSL_CTX *sv_ssl_ctx_;
-  SSL_CTX *cl_ssl_ctx_;
-  tls::CertLookupTree *cert_tree_;
-  ConnectionHandler *conn_handler_;
-
-#ifndef HAVE_ATOMIC_STD_SHARED_PTR
-  std::mutex ticket_keys_m_;
-#endif // !HAVE_ATOMIC_STD_SHARED_PTR
-  std::shared_ptr<TicketKeys> ticket_keys_;
-  std::vector<std::shared_ptr<DownstreamAddrGroup>> downstream_addr_groups_;
-  // Worker level blocker for downstream connection.  For example,
-  // this is used when file decriptor is exhausted.
-  std::unique_ptr<ConnectBlocker> connect_blocker_;
-
-  bool graceful_shutdown_;
-};
-
-// Selects group based on request's |hostport| and |path|.  |hostport|
-// is the value taken from :authority or host header field, and may
-// contain port.  The |path| may contain query part.  We require the
-// catch-all pattern in place, so this function always selects one
-// group.  The catch-all group index is given in |catch_all|.  All
-// patterns are given in |groups|.
-size_t match_downstream_addr_group(
-    const RouterConfig &routerconfig, const StringRef &hostport,
-    const StringRef &path,
-    const std::vector<std::shared_ptr<DownstreamAddrGroup>> &groups,
-    size_t catch_all, BlockAllocator &balloc);
-
-// Calls this function if connecting to backend failed.  |raddr| is
-// the actual address used to connect to backend, and it could be
-// nullptr.  This function may schedule live check.
-void downstream_failure(DownstreamAddr *addr, const Address *raddr);
-
-} // namespace shrpx
-
-#endif // SHRPX_WORKER_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,588 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_worker_process.h"
-
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <sys/resource.h>
-#include <sys/wait.h>
-#include <grp.h>
-
-#include <cinttypes>
-#include <cstdlib>
-
-#include <openssl/rand.h>
-
-#include <ev.h>
-
-#include <ares.h>
-
-#include "shrpx_config.h"
-#include "shrpx_connection_handler.h"
-#include "shrpx_log_config.h"
-#include "shrpx_worker.h"
-#include "shrpx_accept_handler.h"
-#include "shrpx_http2_upstream.h"
-#include "shrpx_http2_session.h"
-#include "shrpx_memcached_dispatcher.h"
-#include "shrpx_memcached_request.h"
-#include "shrpx_process.h"
-#include "shrpx_tls.h"
-#include "shrpx_log.h"
-#include "util.h"
-#include "app_helper.h"
-#include "template.h"
-#include "xsi_strerror.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-namespace {
-void drop_privileges(
-#ifdef HAVE_NEVERBLEED
-    neverbleed_t *nb
-#endif // HAVE_NEVERBLEED
-) {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  auto config = get_config();
-
-  if (getuid() == 0 && config->uid != 0) {
-#ifdef HAVE_NEVERBLEED
-    if (nb) {
-      neverbleed_setuidgid(nb, config->user.c_str(), 1);
-    }
-#endif // HAVE_NEVERBLEED
-
-    if (initgroups(config->user.c_str(), config->gid) != 0) {
-      auto error = errno;
-      LOG(FATAL) << "Could not change supplementary groups: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      exit(EXIT_FAILURE);
-    }
-    if (setgid(config->gid) != 0) {
-      auto error = errno;
-      LOG(FATAL) << "Could not change gid: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      exit(EXIT_FAILURE);
-    }
-    if (setuid(config->uid) != 0) {
-      auto error = errno;
-      LOG(FATAL) << "Could not change uid: "
-                 << xsi_strerror(error, errbuf.data(), errbuf.size());
-      exit(EXIT_FAILURE);
-    }
-    if (setuid(0) != -1) {
-      LOG(FATAL) << "Still have root privileges?";
-      exit(EXIT_FAILURE);
-    }
-  }
-}
-} // namespace
-
-namespace {
-void graceful_shutdown(ConnectionHandler *conn_handler) {
-  if (conn_handler->get_graceful_shutdown()) {
-    return;
-  }
-
-  LOG(NOTICE) << "Graceful shutdown signal received";
-
-  conn_handler->set_graceful_shutdown(true);
-
-  // TODO What happens for the connections not established in the
-  // kernel?
-  conn_handler->accept_pending_connection();
-  conn_handler->delete_acceptor();
-
-  conn_handler->graceful_shutdown_worker();
-
-  auto single_worker = conn_handler->get_single_worker();
-  if (single_worker) {
-    if (single_worker->get_worker_stat()->num_connections == 0) {
-      ev_break(conn_handler->get_loop());
-    }
-
-    return;
-  }
-}
-} // namespace
-
-namespace {
-void reopen_log(ConnectionHandler *conn_handler) {
-  LOG(NOTICE) << "Reopening log files: worker process (thread main)";
-
-  auto config = get_config();
-  auto &loggingconf = config->logging;
-
-  (void)reopen_log_files(loggingconf);
-  redirect_stderr_to_errorlog(loggingconf);
-
-  conn_handler->worker_reopen_log_files();
-}
-} // namespace
-
-namespace {
-void ipc_readcb(struct ev_loop *loop, ev_io *w, int revents) {
-  auto conn_handler = static_cast<ConnectionHandler *>(w->data);
-  std::array<uint8_t, 1024> buf;
-  ssize_t nread;
-  while ((nread = read(w->fd, buf.data(), buf.size())) == -1 && errno == EINTR)
-    ;
-  if (nread == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Failed to read data from ipc channel: errno=" << error;
-    return;
-  }
-
-  if (nread == 0) {
-    // IPC socket closed.  Perform immediate shutdown.
-    LOG(FATAL) << "IPC socket is closed.  Perform immediate shutdown.";
-    nghttp2_Exit(EXIT_FAILURE);
-  }
-
-  for (ssize_t i = 0; i < nread; ++i) {
-    switch (buf[i]) {
-    case SHRPX_IPC_GRACEFUL_SHUTDOWN:
-      graceful_shutdown(conn_handler);
-      break;
-    case SHRPX_IPC_REOPEN_LOG:
-      reopen_log(conn_handler);
-      break;
-    }
-  }
-}
-} // namespace
-
-namespace {
-int generate_ticket_key(TicketKey &ticket_key) {
-  ticket_key.cipher = get_config()->tls.ticket.cipher;
-  ticket_key.hmac = EVP_sha256();
-  ticket_key.hmac_keylen = EVP_MD_size(ticket_key.hmac);
-
-  assert(static_cast<size_t>(EVP_CIPHER_key_length(ticket_key.cipher)) <=
-         ticket_key.data.enc_key.size());
-  assert(ticket_key.hmac_keylen <= ticket_key.data.hmac_key.size());
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "enc_keylen=" << EVP_CIPHER_key_length(ticket_key.cipher)
-              << ", hmac_keylen=" << ticket_key.hmac_keylen;
-  }
-
-  if (RAND_bytes(reinterpret_cast<unsigned char *>(&ticket_key.data),
-                 sizeof(ticket_key.data)) == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-} // namespace
-
-namespace {
-void renew_ticket_key_cb(struct ev_loop *loop, ev_timer *w, int revents) {
-  auto conn_handler = static_cast<ConnectionHandler *>(w->data);
-  const auto &old_ticket_keys = conn_handler->get_ticket_keys();
-
-  auto ticket_keys = std::make_shared<TicketKeys>();
-  LOG(NOTICE) << "Renew new ticket keys";
-
-  // If old_ticket_keys is not empty, it should contain at least 2
-  // keys: one for encryption, and last one for the next encryption
-  // key but decryption only.  The keys in between are old keys and
-  // decryption only.  The next key is provided to ensure to mitigate
-  // possible problem when one worker encrypt new key, but one worker,
-  // which did not take the that key yet, and cannot decrypt it.
-  //
-  // We keep keys for get_config()->tls_session_timeout seconds.  The
-  // default is 12 hours.  Thus the maximum ticket vector size is 12.
-  if (old_ticket_keys) {
-    auto &old_keys = old_ticket_keys->keys;
-    auto &new_keys = ticket_keys->keys;
-
-    assert(!old_keys.empty());
-
-    auto max_tickets =
-        static_cast<size_t>(std::chrono::duration_cast<std::chrono::hours>(
-                                get_config()->tls.session_timeout)
-                                .count());
-
-    new_keys.resize(std::min(max_tickets, old_keys.size() + 1));
-    std::copy_n(std::begin(old_keys), new_keys.size() - 1,
-                std::begin(new_keys) + 1);
-  } else {
-    ticket_keys->keys.resize(1);
-  }
-
-  auto &new_key = ticket_keys->keys[0];
-
-  if (generate_ticket_key(new_key) != 0) {
-    if (LOG_ENABLED(INFO)) {
-      LOG(INFO) << "failed to generate ticket key";
-    }
-    conn_handler->set_ticket_keys(nullptr);
-    conn_handler->set_ticket_keys_to_worker(nullptr);
-    return;
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "ticket keys generation done";
-    assert(ticket_keys->keys.size() >= 1);
-    LOG(INFO) << 0 << " enc+dec: "
-              << util::format_hex(ticket_keys->keys[0].data.name);
-    for (size_t i = 1; i < ticket_keys->keys.size(); ++i) {
-      auto &key = ticket_keys->keys[i];
-      LOG(INFO) << i << " dec: " << util::format_hex(key.data.name);
-    }
-  }
-
-  conn_handler->set_ticket_keys(ticket_keys);
-  conn_handler->set_ticket_keys_to_worker(ticket_keys);
-}
-} // namespace
-
-namespace {
-void memcached_get_ticket_key_cb(struct ev_loop *loop, ev_timer *w,
-                                 int revents) {
-  auto conn_handler = static_cast<ConnectionHandler *>(w->data);
-  auto dispatcher = conn_handler->get_tls_ticket_key_memcached_dispatcher();
-
-  auto req = make_unique<MemcachedRequest>();
-  req->key = "nghttpx:tls-ticket-key";
-  req->op = MEMCACHED_OP_GET;
-  req->cb = [conn_handler, w](MemcachedRequest *req, MemcachedResult res) {
-    switch (res.status_code) {
-    case MEMCACHED_ERR_NO_ERROR:
-      break;
-    case MEMCACHED_ERR_EXT_NETWORK_ERROR:
-      conn_handler->on_tls_ticket_key_network_error(w);
-      return;
-    default:
-      conn_handler->on_tls_ticket_key_not_found(w);
-      return;
-    }
-
-    // |version (4bytes)|len (2bytes)|key (variable length)|...
-    // (len, key) pairs are repeated as necessary.
-
-    auto &value = res.value;
-    if (value.size() < 4) {
-      LOG(WARN) << "Memcached: tls ticket key value is too small: got "
-                << value.size();
-      conn_handler->on_tls_ticket_key_not_found(w);
-      return;
-    }
-    auto p = value.data();
-    auto version = util::get_uint32(p);
-    // Currently supported version is 1.
-    if (version != 1) {
-      LOG(WARN) << "Memcached: tls ticket key version: want 1, got " << version;
-      conn_handler->on_tls_ticket_key_not_found(w);
-      return;
-    }
-
-    auto end = p + value.size();
-    p += 4;
-
-    auto &ticketconf = get_config()->tls.ticket;
-
-    size_t expectedlen;
-    size_t enc_keylen;
-    size_t hmac_keylen;
-    if (ticketconf.cipher == EVP_aes_128_cbc()) {
-      expectedlen = 48;
-      enc_keylen = 16;
-      hmac_keylen = 16;
-    } else if (ticketconf.cipher == EVP_aes_256_cbc()) {
-      expectedlen = 80;
-      enc_keylen = 32;
-      hmac_keylen = 32;
-    } else {
-      return;
-    }
-
-    auto ticket_keys = std::make_shared<TicketKeys>();
-
-    for (; p != end;) {
-      if (end - p < 2) {
-        LOG(WARN) << "Memcached: tls ticket key data is too small";
-        conn_handler->on_tls_ticket_key_not_found(w);
-        return;
-      }
-      auto len = util::get_uint16(p);
-      p += 2;
-      if (len != expectedlen) {
-        LOG(WARN) << "Memcached: wrong tls ticket key size: want "
-                  << expectedlen << ", got " << len;
-        conn_handler->on_tls_ticket_key_not_found(w);
-        return;
-      }
-      if (p + len > end) {
-        LOG(WARN) << "Memcached: too short tls ticket key payload: want " << len
-                  << ", got " << (end - p);
-        conn_handler->on_tls_ticket_key_not_found(w);
-        return;
-      }
-      auto key = TicketKey();
-      key.cipher = ticketconf.cipher;
-      key.hmac = EVP_sha256();
-      key.hmac_keylen = hmac_keylen;
-
-      std::copy_n(p, key.data.name.size(), std::begin(key.data.name));
-      p += key.data.name.size();
-
-      std::copy_n(p, enc_keylen, std::begin(key.data.enc_key));
-      p += enc_keylen;
-
-      std::copy_n(p, hmac_keylen, std::begin(key.data.hmac_key));
-      p += hmac_keylen;
-
-      ticket_keys->keys.push_back(std::move(key));
-    }
-
-    conn_handler->on_tls_ticket_key_get_success(ticket_keys, w);
-  };
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Memcached: tls ticket key get request sent";
-  }
-
-  dispatcher->add_request(std::move(req));
-}
-
-} // namespace
-
-#ifdef HAVE_NEVERBLEED
-namespace {
-void nb_child_cb(struct ev_loop *loop, ev_child *w, int revents) {
-  log_chld(w->rpid, w->rstatus, "neverbleed process");
-
-  ev_child_stop(loop, w);
-
-  LOG(FATAL) << "neverbleed process exitted; aborting now";
-
-  nghttp2_Exit(EXIT_FAILURE);
-}
-} // namespace
-#endif // HAVE_NEVERBLEED
-
-int worker_process_event_loop(WorkerProcessConfig *wpconf) {
-  int rv;
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-  (void)errbuf;
-
-  auto config = get_config();
-
-  if (reopen_log_files(config->logging) != 0) {
-    LOG(FATAL) << "Failed to open log file";
-    return -1;
-  }
-
-  rv = ares_library_init(ARES_LIB_INIT_ALL);
-  if (rv != 0) {
-    LOG(FATAL) << "ares_library_init failed: " << ares_strerror(rv);
-    return -1;
-  }
-
-  auto loop = EV_DEFAULT;
-
-  auto gen = util::make_mt19937();
-
-  auto conn_handler = make_unique<ConnectionHandler>(loop, gen);
-
-  for (auto &addr : config->conn.listener.addrs) {
-    conn_handler->add_acceptor(
-        make_unique<AcceptHandler>(&addr, conn_handler.get()));
-  }
-
-#ifdef HAVE_NEVERBLEED
-  std::array<char, NEVERBLEED_ERRBUF_SIZE> nb_errbuf;
-  auto nb = make_unique<neverbleed_t>();
-  if (neverbleed_init(nb.get(), nb_errbuf.data()) != 0) {
-    LOG(FATAL) << "neverbleed_init failed: " << nb_errbuf.data();
-    return -1;
-  }
-
-  LOG(NOTICE) << "neverbleed process [" << nb->daemon_pid << "] spawned";
-
-  conn_handler->set_neverbleed(nb.get());
-
-  ev_child nb_childev;
-
-  ev_child_init(&nb_childev, nb_child_cb, nb->daemon_pid, 0);
-  nb_childev.data = nullptr;
-  ev_child_start(loop, &nb_childev);
-#endif // HAVE_NEVERBLEED
-
-  MemchunkPool mcpool;
-
-  ev_timer renew_ticket_key_timer;
-  if (tls::upstream_tls_enabled(config->conn)) {
-    auto &ticketconf = config->tls.ticket;
-    auto &memcachedconf = ticketconf.memcached;
-
-    if (!memcachedconf.host.empty()) {
-      SSL_CTX *ssl_ctx = nullptr;
-
-      if (memcachedconf.tls) {
-        ssl_ctx = conn_handler->create_tls_ticket_key_memcached_ssl_ctx();
-      }
-
-      conn_handler->set_tls_ticket_key_memcached_dispatcher(
-          make_unique<MemcachedDispatcher>(
-              &ticketconf.memcached.addr, loop, ssl_ctx,
-              StringRef{memcachedconf.host}, &mcpool, gen));
-
-      ev_timer_init(&renew_ticket_key_timer, memcached_get_ticket_key_cb, 0.,
-                    0.);
-      renew_ticket_key_timer.data = conn_handler.get();
-      // Get first ticket keys.
-      memcached_get_ticket_key_cb(loop, &renew_ticket_key_timer, 0);
-    } else {
-      bool auto_tls_ticket_key = true;
-      if (!ticketconf.files.empty()) {
-        if (!ticketconf.cipher_given) {
-          LOG(WARN)
-              << "It is strongly recommended to specify "
-                 "--tls-ticket-key-cipher=aes-128-cbc (or "
-                 "tls-ticket-key-cipher=aes-128-cbc in configuration file) "
-                 "when --tls-ticket-key-file is used for the smooth "
-                 "transition when the default value of --tls-ticket-key-cipher "
-                 "becomes aes-256-cbc";
-        }
-        auto ticket_keys = read_tls_ticket_key_file(
-            ticketconf.files, ticketconf.cipher, EVP_sha256());
-        if (!ticket_keys) {
-          LOG(WARN) << "Use internal session ticket key generator";
-        } else {
-          conn_handler->set_ticket_keys(std::move(ticket_keys));
-          auto_tls_ticket_key = false;
-        }
-      }
-      if (auto_tls_ticket_key) {
-        // Generate new ticket key every 1hr.
-        ev_timer_init(&renew_ticket_key_timer, renew_ticket_key_cb, 0., 1_h);
-        renew_ticket_key_timer.data = conn_handler.get();
-        ev_timer_again(loop, &renew_ticket_key_timer);
-
-        // Generate first session ticket key before running workers.
-        renew_ticket_key_cb(loop, &renew_ticket_key_timer, 0);
-      }
-    }
-  }
-
-  if (config->single_thread) {
-    rv = conn_handler->create_single_worker();
-    if (rv != 0) {
-      return -1;
-    }
-  } else {
-#ifndef NOTHREADS
-    sigset_t set;
-    sigemptyset(&set);
-    sigaddset(&set, SIGCHLD);
-
-    rv = pthread_sigmask(SIG_BLOCK, &set, nullptr);
-    if (rv != 0) {
-      LOG(ERROR) << "Blocking SIGCHLD failed: "
-                 << xsi_strerror(rv, errbuf.data(), errbuf.size());
-      return -1;
-    }
-#endif // !NOTHREADS
-
-    rv = conn_handler->create_worker_thread(config->num_worker);
-    if (rv != 0) {
-      return -1;
-    }
-
-#ifndef NOTHREADS
-    rv = pthread_sigmask(SIG_UNBLOCK, &set, nullptr);
-    if (rv != 0) {
-      LOG(ERROR) << "Unblocking SIGCHLD failed: "
-                 << xsi_strerror(rv, errbuf.data(), errbuf.size());
-      return -1;
-    }
-#endif // !NOTHREADS
-  }
-
-  drop_privileges(
-#ifdef HAVE_NEVERBLEED
-      nb.get()
-#endif // HAVE_NEVERBLEED
-  );
-
-  ev_io ipcev;
-  ev_io_init(&ipcev, ipc_readcb, wpconf->ipc_fd, EV_READ);
-  ipcev.data = conn_handler.get();
-  ev_io_start(loop, &ipcev);
-
-  if (tls::upstream_tls_enabled(config->conn) && !config->tls.ocsp.disabled) {
-    if (config->tls.ocsp.startup) {
-      conn_handler->set_enable_acceptor_on_ocsp_completion(true);
-      conn_handler->disable_acceptor();
-    }
-
-    conn_handler->proceed_next_cert_ocsp();
-  }
-
-  if (LOG_ENABLED(INFO)) {
-    LOG(INFO) << "Entering event loop";
-  }
-
-  ev_run(loop, 0);
-
-  conn_handler->cancel_ocsp_update();
-
-  // Destroy SSL_CTX held in conn_handler before killing neverbleed
-  // daemon.  Otherwise priv_rsa_finish yields "write error" and
-  // worker process aborts.
-  conn_handler.reset();
-
-#ifdef HAVE_NEVERBLEED
-  assert(nb->daemon_pid > 0);
-
-  rv = kill(nb->daemon_pid, SIGTERM);
-  if (rv != 0) {
-    auto error = errno;
-    LOG(ERROR) << "Could not send signal to neverbleed daemon: errno=" << error;
-  }
-
-  while ((rv = waitpid(nb->daemon_pid, nullptr, 0)) == -1 && errno == EINTR)
-    ;
-  if (rv == -1) {
-    auto error = errno;
-    LOG(ERROR) << "Error occurred while we were waiting for the completion "
-                  "of neverbleed process: errno="
-               << error;
-  }
-#endif // HAVE_NEVERBLEED
-
-  ares_library_cleanup();
-
-  return 0;
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_process.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_WORKER_PROCESS_H
-#define SHRPX_WORKER_PROCESS_H
-
-#include "shrpx.h"
-
-namespace shrpx {
-
-class ConnectionHandler;
-
-struct WorkerProcessConfig {
-  // IPC socket to read event from master process
-  int ipc_fd;
-  // IPv4 or UNIX domain socket, or -1 if not used
-  int server_fd;
-  // IPv6 socket, or -1 if not used
-  int server_fd6;
-};
-
-int worker_process_event_loop(WorkerProcessConfig *wpconf);
-
-} // namespace shrpx
-
-#endif // SHRPX_WORKER_PROCESS_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,247 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "shrpx_worker_test.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#include <cstdlib>
-
-#include <CUnit/CUnit.h>
-
-#include "shrpx_worker.h"
-#include "shrpx_connect_blocker.h"
-#include "shrpx_log.h"
-
-namespace shrpx {
-
-void test_shrpx_worker_match_downstream_addr_group(void) {
-  auto groups = std::vector<std::shared_ptr<DownstreamAddrGroup>>();
-  for (auto &s : {"nghttp2.org/", "nghttp2.org/alpha/bravo/",
-                  "nghttp2.org/alpha/charlie", "nghttp2.org/delta%3A",
-                  "www.nghttp2.org/", "[::1]/", "nghttp2.org/alpha/bravo/delta",
-                  // Check that match is done in the single node
-                  "example.com/alpha/bravo", "192.168.0.1/alpha/", "/golf/"}) {
-    auto g = std::make_shared<DownstreamAddrGroup>();
-    g->pattern = ImmutableString(s);
-    groups.push_back(std::move(g));
-  }
-
-  BlockAllocator balloc(1024, 1024);
-  RouterConfig routerconf;
-
-  auto &router = routerconf.router;
-  auto &wcrouter = routerconf.rev_wildcard_router;
-  auto &wp = routerconf.wildcard_patterns;
-
-  for (size_t i = 0; i < groups.size(); ++i) {
-    auto &g = groups[i];
-    router.add_route(StringRef{g->pattern}, i);
-  }
-
-  CU_ASSERT(0 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/"), groups, 255, balloc));
-
-  // port is removed
-  CU_ASSERT(0 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org:8080"),
-                     StringRef::from_lit("/"), groups, 255, balloc));
-
-  // host is case-insensitive
-  CU_ASSERT(4 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("WWW.nghttp2.org"),
-                     StringRef::from_lit("/alpha"), groups, 255, balloc));
-
-  CU_ASSERT(1 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo/"), groups, 255,
-                     balloc));
-
-  // /alpha/bravo also matches /alpha/bravo/
-  CU_ASSERT(1 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo"), groups, 255, balloc));
-
-  // path part is case-sensitive
-  CU_ASSERT(0 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/Alpha/bravo"), groups, 255, balloc));
-
-  CU_ASSERT(1 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo/charlie"), groups, 255,
-                     balloc));
-
-  CU_ASSERT(2 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/charlie"), groups, 255,
-                     balloc));
-
-  // pattern which does not end with '/' must match its entirely.  So
-  // this matches to group 0, not group 2.
-  CU_ASSERT(0 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/charlie/"), groups, 255,
-                     balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("example.org"),
-                       StringRef::from_lit("/"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit(""),
-                       StringRef::from_lit("/"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit(""),
-                       StringRef::from_lit("alpha"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("foo/bar"),
-                       StringRef::from_lit("/"), groups, 255, balloc));
-
-  // If path is StringRef::from_lit("*", only match with host + "/").
-  CU_ASSERT(0 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("*"), groups, 255, balloc));
-
-  CU_ASSERT(5 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("[::1]"),
-                     StringRef::from_lit("/"), groups, 255, balloc));
-  CU_ASSERT(5 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("[::1]:8080"),
-                     StringRef::from_lit("/"), groups, 255, balloc));
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("[::1"),
-                       StringRef::from_lit("/"), groups, 255, balloc));
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("[::1]8000"),
-                       StringRef::from_lit("/"), groups, 255, balloc));
-
-  // Check the case where adding route extends tree
-  CU_ASSERT(6 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo/delta"), groups, 255,
-                     balloc));
-
-  CU_ASSERT(1 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/alpha/bravo/delta/"), groups, 255,
-                     balloc));
-
-  // Check the case where query is done in a single node
-  CU_ASSERT(7 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("example.com"),
-                     StringRef::from_lit("/alpha/bravo"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("example.com"),
-                       StringRef::from_lit("/alpha/bravo/"), groups, 255,
-                       balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("example.com"),
-                       StringRef::from_lit("/alpha"), groups, 255, balloc));
-
-  // Check the case where quey is done in a single node
-  CU_ASSERT(8 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("192.168.0.1"),
-                     StringRef::from_lit("/alpha"), groups, 255, balloc));
-
-  CU_ASSERT(8 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("192.168.0.1"),
-                     StringRef::from_lit("/alpha/"), groups, 255, balloc));
-
-  CU_ASSERT(8 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("192.168.0.1"),
-                     StringRef::from_lit("/alpha/bravo"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("192.168.0.1"),
-                       StringRef::from_lit("/alph"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit("192.168.0.1"),
-                       StringRef::from_lit("/"), groups, 255, balloc));
-
-  // Test for wildcard hosts
-  auto g1 = std::make_shared<DownstreamAddrGroup>();
-  g1->pattern = ImmutableString::from_lit("git.nghttp2.org");
-  groups.push_back(std::move(g1));
-
-  auto g2 = std::make_shared<DownstreamAddrGroup>();
-  g2->pattern = ImmutableString::from_lit(".nghttp2.org");
-  groups.push_back(std::move(g2));
-
-  auto g3 = std::make_shared<DownstreamAddrGroup>();
-  g3->pattern = ImmutableString::from_lit(".local");
-  groups.push_back(std::move(g3));
-
-  wp.emplace_back(StringRef::from_lit("git.nghttp2.org"));
-  wcrouter.add_route(StringRef::from_lit("gro.2ptthgn.tig"), 0);
-  wp.back().router.add_route(StringRef::from_lit("/echo/"), 10);
-
-  wp.emplace_back(StringRef::from_lit(".nghttp2.org"));
-  wcrouter.add_route(StringRef::from_lit("gro.2ptthgn."), 1);
-  wp.back().router.add_route(StringRef::from_lit("/echo/"), 11);
-  wp.back().router.add_route(StringRef::from_lit("/echo/foxtrot"), 12);
-
-  wp.emplace_back(StringRef::from_lit(".local"));
-  wcrouter.add_route(StringRef::from_lit("lacol."), 2);
-  wp.back().router.add_route(StringRef::from_lit("/"), 13);
-
-  CU_ASSERT(11 == match_downstream_addr_group(
-                      routerconf, StringRef::from_lit("git.nghttp2.org"),
-                      StringRef::from_lit("/echo"), groups, 255, balloc));
-
-  CU_ASSERT(10 == match_downstream_addr_group(
-                      routerconf, StringRef::from_lit("0git.nghttp2.org"),
-                      StringRef::from_lit("/echo"), groups, 255, balloc));
-
-  CU_ASSERT(11 == match_downstream_addr_group(
-                      routerconf, StringRef::from_lit("it.nghttp2.org"),
-                      StringRef::from_lit("/echo"), groups, 255, balloc));
-
-  CU_ASSERT(255 == match_downstream_addr_group(
-                       routerconf, StringRef::from_lit(".nghttp2.org"),
-                       StringRef::from_lit("/echo/foxtrot"), groups, 255,
-                       balloc));
-
-  CU_ASSERT(9 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("alpha.nghttp2.org"),
-                     StringRef::from_lit("/golf"), groups, 255, balloc));
-
-  CU_ASSERT(0 == match_downstream_addr_group(
-                     routerconf, StringRef::from_lit("nghttp2.org"),
-                     StringRef::from_lit("/echo"), groups, 255, balloc));
-
-  CU_ASSERT(13 == match_downstream_addr_group(
-                      routerconf, StringRef::from_lit("test.local"),
-                      StringRef{}, groups, 255, balloc));
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/shrpx_worker_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef SHRPX_WORKER_TEST_H
-#define SHRPX_WORKER_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_shrpx_worker_match_downstream_addr_group(void);
-
-} // namespace shrpx
-
-#endif // SHRPX_WORKER_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ssl_compat.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ssl_compat.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/ssl_compat.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/ssl_compat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef OPENSSL_COMPAT_H
-
-#  include <openssl/opensslv.h>
-
-#  if defined(LIBRESSL_VERSION_NUMBER)
-#    define OPENSSL_1_1_API 0
-#    define OPENSSL_1_1_1_API 0
-#    define LIBRESSL_IN_USE 1
-#    define LIBRESSL_LEGACY_API (LIBRESSL_VERSION_NUMBER < 0x20700000L)
-#    define LIBRESSL_2_7_API (LIBRESSL_VERSION_NUMBER >= 0x20700000L)
-#  else // !defined(LIBRESSL_VERSION_NUMBER)
-#    define OPENSSL_1_1_API (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
-#    define OPENSSL_1_1_1_API (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-#    define LIBRESSL_IN_USE 0
-#    define LIBRESSL_LEGACY_API 0
-#    define LIBRESSL_2_7_API 0
-#  endif // !defined(LIBRESSL_VERSION_NUMBER)
-
-#endif // OPENSSL_COMPAT_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/template.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/template.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/template.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/template.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,557 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2015 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef TEMPLATE_H
-#define TEMPLATE_H
-
-#include "nghttp2_config.h"
-
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
-#include <array>
-#include <functional>
-#include <typeinfo>
-#include <algorithm>
-#include <ostream>
-
-namespace nghttp2 {
-
-#if __cplusplus > 201103L
-using std::make_unique;
-#else  // __cplusplus <= 201103L
-template <typename T, typename... U>
-typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(U &&... u) {
-  return std::unique_ptr<T>(new T(std::forward<U>(u)...));
-}
-
-template <typename T>
-typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(size_t size) {
-  return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
-}
-#endif // __cplusplus <= 201103L
-
-// std::forward is constexpr since C++14
-template <typename... T>
-constexpr std::array<
-    typename std::decay<typename std::common_type<T...>::type>::type,
-    sizeof...(T)>
-make_array(T &&... t) {
-  return std::array<
-      typename std::decay<typename std::common_type<T...>::type>::type,
-      sizeof...(T)>{{std::forward<T>(t)...}};
-}
-
-template <typename T, size_t N> constexpr size_t array_size(T (&)[N]) {
-  return N;
-}
-
-template <typename T, size_t N> constexpr size_t str_size(T (&)[N]) {
-  return N - 1;
-}
-
-// inspired by <http://blog.korfuri.fr/post/go-defer-in-cpp/>, but our
-// template can take functions returning other than void.
-template <typename F, typename... T> struct Defer {
-  Defer(F &&f, T &&... t)
-      : f(std::bind(std::forward<F>(f), std::forward<T>(t)...)) {}
-  Defer(Defer &&o) noexcept : f(std::move(o.f)) {}
-  ~Defer() { f(); }
-
-  using ResultType = typename std::result_of<typename std::decay<F>::type(
-      typename std::decay<T>::type...)>::type;
-  std::function<ResultType()> f;
-};
-
-template <typename F, typename... T> Defer<F, T...> defer(F &&f, T &&... t) {
-  return Defer<F, T...>(std::forward<F>(f), std::forward<T>(t)...);
-}
-
-template <typename T, typename F> bool test_flags(T t, F flags) {
-  return (t & flags) == flags;
-}
-
-// doubly linked list of element T*.  T must have field T *dlprev and
-// T *dlnext, which point to previous element and next element in the
-// list respectively.
-template <typename T> struct DList {
-  DList() : head(nullptr), tail(nullptr), len(0) {}
-
-  DList(const DList &) = delete;
-  DList &operator=(const DList &) = delete;
-
-  DList(DList &&other) noexcept
-      : head(other.head), tail(other.tail), len(other.len) {
-    other.head = other.tail = nullptr;
-    other.len = 0;
-  }
-
-  DList &operator=(DList &&other) noexcept {
-    if (this == &other) {
-      return *this;
-    }
-    head = other.head;
-    tail = other.tail;
-    len = other.len;
-
-    other.head = other.tail = nullptr;
-    other.len = 0;
-
-    return *this;
-  }
-
-  void append(T *t) {
-    ++len;
-    if (tail) {
-      tail->dlnext = t;
-      t->dlprev = tail;
-      tail = t;
-      return;
-    }
-    head = tail = t;
-  }
-
-  void remove(T *t) {
-    --len;
-    auto p = t->dlprev;
-    auto n = t->dlnext;
-    if (p) {
-      p->dlnext = n;
-    }
-    if (head == t) {
-      head = n;
-    }
-    if (n) {
-      n->dlprev = p;
-    }
-    if (tail == t) {
-      tail = p;
-    }
-    t->dlprev = t->dlnext = nullptr;
-  }
-
-  bool empty() const { return head == nullptr; }
-
-  size_t size() const { return len; }
-
-  T *head, *tail;
-  size_t len;
-};
-
-template <typename T> void dlist_delete_all(DList<T> &dl) {
-  for (auto e = dl.head; e;) {
-    auto next = e->dlnext;
-    delete e;
-    e = next;
-  }
-}
-
-// User-defined literals for K, M, and G (powers of 1024)
-
-constexpr unsigned long long operator"" _k(unsigned long long k) {
-  return k * 1024;
-}
-
-constexpr unsigned long long operator"" _m(unsigned long long m) {
-  return m * 1024 * 1024;
-}
-
-constexpr unsigned long long operator"" _g(unsigned long long g) {
-  return g * 1024 * 1024 * 1024;
-}
-
-// User-defined literals for time, converted into double in seconds
-
-// hours
-constexpr double operator"" _h(unsigned long long h) { return h * 60 * 60; }
-
-// minutes
-constexpr double operator"" _min(unsigned long long min) { return min * 60; }
-
-// seconds
-constexpr double operator"" _s(unsigned long long s) { return s; }
-
-// milliseconds
-constexpr double operator"" _ms(unsigned long long ms) { return ms / 1000.; }
-
-// Returns a copy of NULL-terminated string [first, last).
-template <typename InputIt>
-std::unique_ptr<char[]> strcopy(InputIt first, InputIt last) {
-  auto res = make_unique<char[]>(last - first + 1);
-  *std::copy(first, last, res.get()) = '\0';
-  return res;
-}
-
-// Returns a copy of NULL-terminated string |val|.
-inline std::unique_ptr<char[]> strcopy(const char *val) {
-  return strcopy(val, val + strlen(val));
-}
-
-inline std::unique_ptr<char[]> strcopy(const char *val, size_t n) {
-  return strcopy(val, val + n);
-}
-
-// Returns a copy of val.c_str().
-inline std::unique_ptr<char[]> strcopy(const std::string &val) {
-  return strcopy(std::begin(val), std::end(val));
-}
-
-inline std::unique_ptr<char[]> strcopy(const std::unique_ptr<char[]> &val) {
-  if (!val) {
-    return nullptr;
-  }
-  return strcopy(val.get());
-}
-
-inline std::unique_ptr<char[]> strcopy(const std::unique_ptr<char[]> &val,
-                                       size_t n) {
-  if (!val) {
-    return nullptr;
-  }
-  return strcopy(val.get(), val.get() + n);
-}
-
-// ImmutableString represents string that is immutable unlike
-// std::string.  It has c_str() and size() functions to mimic
-// std::string.  It manages buffer by itself.  Just like std::string,
-// c_str() returns NULL-terminated string, but NULL character may
-// appear before the final terminal NULL.
-class ImmutableString {
-public:
-  using traits_type = std::char_traits<char>;
-  using value_type = traits_type::char_type;
-  using allocator_type = std::allocator<char>;
-  using size_type = std::allocator_traits<allocator_type>::size_type;
-  using difference_type =
-      std::allocator_traits<allocator_type>::difference_type;
-  using const_reference = const value_type &;
-  using const_pointer = const value_type *;
-  using const_iterator = const_pointer;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-  ImmutableString() : len(0), base("") {}
-  ImmutableString(const char *s, size_t slen)
-      : len(slen), base(copystr(s, s + len)) {}
-  explicit ImmutableString(const char *s)
-      : len(strlen(s)), base(copystr(s, s + len)) {}
-  explicit ImmutableString(const std::string &s)
-      : len(s.size()), base(copystr(std::begin(s), std::end(s))) {}
-  template <typename InputIt>
-  ImmutableString(InputIt first, InputIt last)
-      : len(std::distance(first, last)), base(copystr(first, last)) {}
-  ImmutableString(const ImmutableString &other)
-      : len(other.len), base(copystr(std::begin(other), std::end(other))) {}
-  ImmutableString(ImmutableString &&other) noexcept
-      : len(other.len), base(other.base) {
-    other.len = 0;
-    other.base = "";
-  }
-  ~ImmutableString() {
-    if (len) {
-      delete[] base;
-    }
-  }
-
-  ImmutableString &operator=(const ImmutableString &other) {
-    if (this == &other) {
-      return *this;
-    }
-    if (len) {
-      delete[] base;
-    }
-    len = other.len;
-    base = copystr(std::begin(other), std::end(other));
-    return *this;
-  }
-  ImmutableString &operator=(ImmutableString &&other) noexcept {
-    if (this == &other) {
-      return *this;
-    }
-    if (len) {
-      delete[] base;
-    }
-    len = other.len;
-    base = other.base;
-    other.len = 0;
-    other.base = "";
-    return *this;
-  }
-
-  template <size_t N> static ImmutableString from_lit(const char (&s)[N]) {
-    return ImmutableString(s, N - 1);
-  }
-
-  const_iterator begin() const { return base; };
-  const_iterator cbegin() const { return base; };
-
-  const_iterator end() const { return base + len; };
-  const_iterator cend() const { return base + len; };
-
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator{base + len};
-  }
-  const_reverse_iterator crbegin() const {
-    return const_reverse_iterator{base + len};
-  }
-
-  const_reverse_iterator rend() const { return const_reverse_iterator{base}; }
-  const_reverse_iterator crend() const { return const_reverse_iterator{base}; }
-
-  const char *c_str() const { return base; }
-  size_type size() const { return len; }
-  bool empty() const { return len == 0; }
-  const_reference operator[](size_type pos) const { return *(base + pos); }
-
-private:
-  template <typename InputIt> const char *copystr(InputIt first, InputIt last) {
-    if (first == last) {
-      return "";
-    }
-    auto res = new char[std::distance(first, last) + 1];
-    *std::copy(first, last, res) = '\0';
-    return res;
-  }
-
-  size_type len;
-  const char *base;
-};
-
-inline bool operator==(const ImmutableString &lhs, const ImmutableString &rhs) {
-  return lhs.size() == rhs.size() &&
-         std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
-}
-
-inline bool operator==(const ImmutableString &lhs, const std::string &rhs) {
-  return lhs.size() == rhs.size() &&
-         std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
-}
-
-inline bool operator==(const std::string &lhs, const ImmutableString &rhs) {
-  return rhs == lhs;
-}
-
-inline bool operator==(const ImmutableString &lhs, const char *rhs) {
-  return lhs.size() == strlen(rhs) &&
-         std::equal(std::begin(lhs), std::end(lhs), rhs);
-}
-
-inline bool operator==(const char *lhs, const ImmutableString &rhs) {
-  return rhs == lhs;
-}
-
-inline bool operator!=(const ImmutableString &lhs, const ImmutableString &rhs) {
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const ImmutableString &lhs, const std::string &rhs) {
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const std::string &lhs, const ImmutableString &rhs) {
-  return !(rhs == lhs);
-}
-
-inline bool operator!=(const ImmutableString &lhs, const char *rhs) {
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const char *lhs, const ImmutableString &rhs) {
-  return !(rhs == lhs);
-}
-
-inline std::ostream &operator<<(std::ostream &o, const ImmutableString &s) {
-  return o.write(s.c_str(), s.size());
-}
-
-inline std::string &operator+=(std::string &lhs, const ImmutableString &rhs) {
-  lhs.append(rhs.c_str(), rhs.size());
-  return lhs;
-}
-
-// StringRef is a reference to a string owned by something else.  So
-// it behaves like simple string, but it does not own pointer.  When
-// it is default constructed, it has empty string.  You can freely
-// copy or move around this struct, but never free its pointer.  str()
-// function can be used to export the content as std::string.
-class StringRef {
-public:
-  using traits_type = std::char_traits<char>;
-  using value_type = traits_type::char_type;
-  using allocator_type = std::allocator<char>;
-  using size_type = std::allocator_traits<allocator_type>::size_type;
-  using difference_type =
-      std::allocator_traits<allocator_type>::difference_type;
-  using const_reference = const value_type &;
-  using const_pointer = const value_type *;
-  using const_iterator = const_pointer;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-  constexpr StringRef() : base(""), len(0) {}
-  explicit StringRef(const std::string &s) : base(s.c_str()), len(s.size()) {}
-  explicit StringRef(const ImmutableString &s)
-      : base(s.c_str()), len(s.size()) {}
-  explicit StringRef(const char *s) : base(s), len(strlen(s)) {}
-  constexpr StringRef(const char *s, size_t n) : base(s), len(n) {}
-  template <typename CharT>
-  constexpr StringRef(const CharT *s, size_t n)
-      : base(reinterpret_cast<const char *>(s)), len(n) {}
-  template <typename InputIt>
-  StringRef(InputIt first, InputIt last)
-      : base(reinterpret_cast<const char *>(&*first)),
-        len(std::distance(first, last)) {}
-  template <typename InputIt>
-  StringRef(InputIt *first, InputIt *last)
-      : base(reinterpret_cast<const char *>(first)),
-        len(std::distance(first, last)) {}
-  template <typename CharT, size_t N>
-  constexpr static StringRef from_lit(const CharT (&s)[N]) {
-    return StringRef{s, N - 1};
-  }
-  static StringRef from_maybe_nullptr(const char *s) {
-    if (s == nullptr) {
-      return StringRef();
-    }
-
-    return StringRef(s);
-  }
-
-  constexpr const_iterator begin() const { return base; };
-  constexpr const_iterator cbegin() const { return base; };
-
-  constexpr const_iterator end() const { return base + len; };
-  constexpr const_iterator cend() const { return base + len; };
-
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator{base + len};
-  }
-  const_reverse_iterator crbegin() const {
-    return const_reverse_iterator{base + len};
-  }
-
-  const_reverse_iterator rend() const { return const_reverse_iterator{base}; }
-  const_reverse_iterator crend() const { return const_reverse_iterator{base}; }
-
-  constexpr const char *c_str() const { return base; }
-  constexpr size_type size() const { return len; }
-  constexpr bool empty() const { return len == 0; }
-  constexpr const_reference operator[](size_type pos) const {
-    return *(base + pos);
-  }
-
-  std::string str() const { return std::string(base, len); }
-  const uint8_t *byte() const {
-    return reinterpret_cast<const uint8_t *>(base);
-  }
-
-private:
-  const char *base;
-  size_type len;
-};
-
-inline bool operator==(const StringRef &lhs, const StringRef &rhs) {
-  return lhs.size() == rhs.size() &&
-         std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
-}
-
-inline bool operator==(const StringRef &lhs, const std::string &rhs) {
-  return lhs.size() == rhs.size() &&
-         std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
-}
-
-inline bool operator==(const std::string &lhs, const StringRef &rhs) {
-  return rhs == lhs;
-}
-
-inline bool operator==(const StringRef &lhs, const char *rhs) {
-  return lhs.size() == strlen(rhs) &&
-         std::equal(std::begin(lhs), std::end(lhs), rhs);
-}
-
-inline bool operator==(const StringRef &lhs, const ImmutableString &rhs) {
-  return lhs.size() == rhs.size() &&
-         std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
-}
-
-inline bool operator==(const ImmutableString &lhs, const StringRef &rhs) {
-  return rhs == lhs;
-}
-
-inline bool operator==(const char *lhs, const StringRef &rhs) {
-  return rhs == lhs;
-}
-
-inline bool operator!=(const StringRef &lhs, const StringRef &rhs) {
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const StringRef &lhs, const std::string &rhs) {
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const std::string &lhs, const StringRef &rhs) {
-  return !(rhs == lhs);
-}
-
-inline bool operator!=(const StringRef &lhs, const char *rhs) {
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const char *lhs, const StringRef &rhs) {
-  return !(rhs == lhs);
-}
-
-inline bool operator<(const StringRef &lhs, const StringRef &rhs) {
-  return std::lexicographical_compare(std::begin(lhs), std::end(lhs),
-                                      std::begin(rhs), std::end(rhs));
-}
-
-inline std::ostream &operator<<(std::ostream &o, const StringRef &s) {
-  return o.write(s.c_str(), s.size());
-}
-
-inline std::string &operator+=(std::string &lhs, const StringRef &rhs) {
-  lhs.append(rhs.c_str(), rhs.size());
-  return lhs;
-}
-
-inline int run_app(std::function<int(int, char **)> app, int argc,
-                   char **argv) {
-  try {
-    return app(argc, argv);
-  } catch (const std::bad_alloc &) {
-    fputs("Out of memory\n", stderr);
-  } catch (const std::exception &x) {
-    fprintf(stderr, "Caught %s:\n%s\n", typeid(x).name(), x.what());
-  } catch (...) {
-    fputs("Unknown exception caught\n", stderr);
-  }
-  return EXIT_FAILURE;
-}
-
-} // namespace nghttp2
-
-#endif // TEMPLATE_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/template_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/template_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/template_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/template_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,204 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "template_test.h"
-
-#include <cstring>
-#include <iostream>
-#include <sstream>
-
-#include <CUnit/CUnit.h>
-
-#include "template.h"
-
-namespace nghttp2 {
-
-void test_template_immutable_string(void) {
-  ImmutableString null;
-
-  CU_ASSERT("" == null);
-  CU_ASSERT(0 == null.size());
-  CU_ASSERT(null.empty());
-
-  ImmutableString from_cstr("alpha");
-
-  CU_ASSERT(0 == strcmp("alpha", from_cstr.c_str()));
-  CU_ASSERT(5 == from_cstr.size());
-  CU_ASSERT(!from_cstr.empty());
-  CU_ASSERT("alpha" == from_cstr);
-  CU_ASSERT(from_cstr == "alpha");
-  CU_ASSERT(std::string("alpha") == from_cstr);
-  CU_ASSERT(from_cstr == std::string("alpha"));
-
-  // copy constructor
-  ImmutableString src("charlie");
-  ImmutableString copy = src;
-
-  CU_ASSERT("charlie" == copy);
-  CU_ASSERT(7 == copy.size());
-
-  // copy assignment
-  ImmutableString copy2;
-  copy2 = src;
-
-  CU_ASSERT("charlie" == copy2);
-  CU_ASSERT(7 == copy2.size());
-
-  // move constructor
-  ImmutableString move = std::move(copy);
-
-  CU_ASSERT("charlie" == move);
-  CU_ASSERT(7 == move.size());
-  CU_ASSERT("" == copy);
-  CU_ASSERT(0 == copy.size());
-
-  // move assignment
-  move = std::move(from_cstr);
-
-  CU_ASSERT("alpha" == move);
-  CU_ASSERT(5 == move.size());
-  CU_ASSERT("" == from_cstr);
-  CU_ASSERT(0 == from_cstr.size());
-
-  // from string literal
-  auto from_lit = StringRef::from_lit("bravo");
-
-  CU_ASSERT("bravo" == from_lit);
-  CU_ASSERT(5 == from_lit.size());
-
-  // equality
-  ImmutableString eq("delta");
-
-  CU_ASSERT("delta1" != eq);
-  CU_ASSERT("delt" != eq);
-  CU_ASSERT(eq != "delta1");
-  CU_ASSERT(eq != "delt");
-
-  // operator[]
-  ImmutableString br_op("foxtrot");
-
-  CU_ASSERT('f' == br_op[0]);
-  CU_ASSERT('o' == br_op[1]);
-  CU_ASSERT('t' == br_op[6]);
-  CU_ASSERT('\0' == br_op[7]);
-
-  // operator==(const ImmutableString &, const ImmutableString &)
-  {
-    ImmutableString a("foo");
-    ImmutableString b("foo");
-    ImmutableString c("fo");
-
-    CU_ASSERT(a == b);
-    CU_ASSERT(a != c);
-    CU_ASSERT(c != b);
-  }
-
-  // operator<<
-  {
-    ImmutableString a("foo");
-    std::stringstream ss;
-    ss << a;
-
-    CU_ASSERT("foo" == ss.str());
-  }
-
-  // operator +=(std::string &, const ImmutableString &)
-  {
-    std::string a = "alpha";
-    a += ImmutableString("bravo");
-
-    CU_ASSERT("alphabravo" == a);
-  }
-}
-
-void test_template_string_ref(void) {
-  StringRef empty;
-
-  CU_ASSERT("" == empty);
-  CU_ASSERT(0 == empty.size());
-
-  // from std::string
-  std::string alpha = "alpha";
-
-  StringRef ref(alpha);
-
-  CU_ASSERT("alpha" == ref);
-  CU_ASSERT(ref == "alpha");
-  CU_ASSERT(alpha == ref);
-  CU_ASSERT(ref == alpha);
-  CU_ASSERT(5 == ref.size());
-
-  // from string literal
-  auto from_lit = StringRef::from_lit("alpha");
-
-  CU_ASSERT("alpha" == from_lit);
-  CU_ASSERT(5 == from_lit.size());
-
-  // from ImmutableString
-  auto im = ImmutableString::from_lit("bravo");
-
-  StringRef imref(im);
-
-  CU_ASSERT("bravo" == imref);
-  CU_ASSERT(5 == imref.size());
-
-  // from C-string
-  StringRef cstrref("charlie");
-
-  CU_ASSERT("charlie" == cstrref);
-  CU_ASSERT(7 == cstrref.size());
-
-  // from C-string and its length
-  StringRef cstrnref("delta", 5);
-
-  CU_ASSERT("delta" == cstrnref);
-  CU_ASSERT(5 == cstrnref.size());
-
-  // operator[]
-  StringRef br_op("foxtrot");
-
-  CU_ASSERT('f' == br_op[0]);
-  CU_ASSERT('o' == br_op[1]);
-  CU_ASSERT('t' == br_op[6]);
-  CU_ASSERT('\0' == br_op[7]);
-
-  // operator<<
-  {
-    StringRef a("foo");
-    std::stringstream ss;
-    ss << a;
-
-    CU_ASSERT("foo" == ss.str());
-  }
-
-  // operator +=(std::string &, const StringRef &)
-  {
-    std::string a = "alpha";
-    a += StringRef("bravo");
-
-    CU_ASSERT("alphabravo" == a);
-  }
-}
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/template_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/template_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/template_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/template_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef TEMPLATE_TEST_H
-#define TEMPLATE_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace nghttp2 {
-
-void test_template_immutable_string(void);
-void test_template_string_ref(void);
-
-} // namespace nghttp2
-
-#endif // TEMPLATE_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICpTCCAY0CAQAwYDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
-ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEZMBcGA1UEAxMQdGVz
-dC5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK39
-lAbBIf8cHf+FmX1RX+bDMlnJ7P9YnRdha6Cw8KlVGEZcaVPym6yBvF/L98OHFT/8
-Tl3dcvUPlvTiytmEnAHh3hPe5h2V23KaMFMb0w7/xjSBx1yv8r2DPEdhBJ2Ue9al
-3aF7AmpL/2htnsJJLwNdPHhG5NLu0cTZiLGLDtGOIgbcATPzEpAGD31na3R4WPc9
-JeDPBgMlDrmXNLeo9M8N385I6plYBhCb3Fc70oGSMzC6ks7wvPb4l7Y9acs0IzC4
-Jrg27NJeO7kR6WV4DBlchd1LkIqT874Tuxv2W1/+JFFOWz2m3bbz2447u3ROT3xq
-yjk4TOh0vd2O0L2E1LcCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBMAUqwty7R
-/YWRrC8NuvrbSsW0r7Z7FXWxny5w5ImONCgVffc2wVydtBVQ0rfd3pDZLyu0P4sx
-4bJ/KBz67t2MsOKbCMDS7SJuFwHu9AUzaYNh455HeBOVwb6LemJDNnCtMG9DgcRv
-2BpwKqekUVTGDuUQmLibjE8qwDHw/p9k4gjQBxlfJe2sIZGs6oA/JGFJUU6ZIn8Y
-M6aazrbjWexbWCnjhiXkNa8kfKiSHzU+2ct+GY5QxI221+63bXRiAi2/LK0gaY+p
-+3vYu75F7+8oPZOfsGmYEyPz7c1jPqcwPgVDk+sdvl1MO1TGFRaFNIlRP1DhpHkj
-fuJ/id6oUHhj
------END CERTIFICATE REQUEST-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr.json cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr.json
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.csr.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-{
-    "CN": "test.example.com",
-    "key": {
-	"algo": "rsa",
-	"size": 2048
-    },
-    "names": [
-	{
-	    "C": "AU",
-	    "ST": "Some-State",
-	    "O": "Internet Widgits Pty Ltd"
-	}
-    ]
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com-key.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com-key.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com-key.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com-key.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEArf2UBsEh/xwd/4WZfVFf5sMyWcns/1idF2FroLDwqVUYRlxp
-U/KbrIG8X8v3w4cVP/xOXd1y9Q+W9OLK2YScAeHeE97mHZXbcpowUxvTDv/GNIHH
-XK/yvYM8R2EEnZR71qXdoXsCakv/aG2ewkkvA108eEbk0u7RxNmIsYsO0Y4iBtwB
-M/MSkAYPfWdrdHhY9z0l4M8GAyUOuZc0t6j0zw3fzkjqmVgGEJvcVzvSgZIzMLqS
-zvC89viXtj1pyzQjMLgmuDbs0l47uRHpZXgMGVyF3UuQipPzvhO7G/ZbX/4kUU5b
-PabdtvPbjju7dE5PfGrKOThM6HS93Y7QvYTUtwIDAQABAoIBAQCjUL69iFOs7muK
-CZGFe/iU1uxQM6XuGPN7mso3z15W07UxdlS3o6ZUSoLTONWcBxP/N4knulHJjZSY
-0LivbDYz3htic3t0kdGmxOxPVnLKRXN6ncbQTaeAE8tlBMAcWd/UH2Tlylz+Ac//
-6cV3gNJMShwUmhb3l4v3Rml0nZ6PO1pFc/Chk5L9REAV8G6rNtc9bzgmgoFucRO/
-8ce/uJrENt1Pu3vBvmz42DTGfG48v5RZ0OY4qEPawZJ7p+QYiTf6h3Eilss/AllW
-PPfQ0thdyB+yrZ3p6qb+ZUYphpGxgg6YlQxLfDKAikuo+EXwjPBPfeHhTO4kAj+h
-opDCroZhAoGBANyVFbagCWqwguE6nVPmnCaiNQUIh8b7L2CnkkLfdbPQr/KvyIjg
-Ua125bTJhe9Uk+ZBWsobQkjA0Baidiylx51pWYaxPVn5araVmkh2dqMluk2QE82X
-AWemBgKhAqCLLLMVXbrRYlxpKUm1Fc/lJ8Ig2R/MJSntTMpQhJtIejUbAoGBAMnt
-XMvlFABCoFbI9GMcteI/KkvNGQUy3OKEln/QCssnE4/XIu7LCxy6P+1lycbFy/mQ
-0bnp525sPEIIkMpi6LeAbSzYN2O3BRjNrjPcbx6Khz9DweNhRIo5qTFRszZ+pHbV
-N+9Oc9JVenwPw6EuW7uZRFKFhCHtsBFdUrWLJoSVAoGAQ3ytdwGBwA2fDW/UgL32
-mm9YT2DrwbpKJYU/X4xkw44ett6HOTGAa9ULtINPogi7c2AdeeZbIk0znSk5hLF3
-4DZCOM5zWdrQhmpBGNh9ta6uUFq7ZFRGDsMh5Z4DYsER/PyVf7neIS3ffviTYtbW
-kjNgmrTnzesXanK2D5heI28CgYEAhl+qjRTYhoPP53C7EOmeL/0QzHij2c3LKAJL
-lKqBREewwNvNp1L/BhL7T6OY7unZny48IpgBJn5oaxkAIW5IpzSTcnBAC99TSPo2
-ntRmLdDJx9PzRrkHv2Q3r1ZLCEymbV3eZyWx9ZpkdAKZkL0k1mZcDP5Eu79Ml4Ge
-9Kiw7TECgYEAh+nTKwrCUFGbe4RIVCj/QG7FVPbq5PdxJ3gILZ3/1XkhPcNRFKJS
-u5qPfA02tYEALz9KXATK1uRB/GlBM7Eap/g2GFiHpVxrw6wPpybLywJmNyNTwqiq
-eJxQ0FRzW9Kwwn1ThPY38LdFe/wvXZFOcNvGD8hHCLQRdlBR4zuTsBk=
------END RSA PRIVATE KEY-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.example.com.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDwTCCAqmgAwIBAgIUDhKNhGRUq1TSHD6aG2k4TRR8iA0wDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoT
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMOY2EubmdodHRwMi5v
-cmcwHhcNMTYwNjI1MDkzNzAwWhcNMjYwNjIzMDkzNzAwWjBgMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMRkwFwYDVQQDExB0ZXN0LmV4YW1wbGUuY29tMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEArf2UBsEh/xwd/4WZfVFf5sMyWcns/1idF2Fr
-oLDwqVUYRlxpU/KbrIG8X8v3w4cVP/xOXd1y9Q+W9OLK2YScAeHeE97mHZXbcpow
-UxvTDv/GNIHHXK/yvYM8R2EEnZR71qXdoXsCakv/aG2ewkkvA108eEbk0u7RxNmI
-sYsO0Y4iBtwBM/MSkAYPfWdrdHhY9z0l4M8GAyUOuZc0t6j0zw3fzkjqmVgGEJvc
-VzvSgZIzMLqSzvC89viXtj1pyzQjMLgmuDbs0l47uRHpZXgMGVyF3UuQipPzvhO7
-G/ZbX/4kUU5bPabdtvPbjju7dE5PfGrKOThM6HS93Y7QvYTUtwIDAQABo3UwczAO
-BgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIw
-ADAdBgNVHQ4EFgQUm8jn1FICope9qUce6ORQ0CtbmhYwHwYDVR0jBBgwFoAU0DnF
-VHVlxrFEkv1ULqnO4ua924YwDQYJKoZIhvcNAQELBQADggEBAD7RPz/5rAnS1MNP
-JfAj1TXZSBwlYgtmJL65yaFB6a1SNSTo15deAm/1Vl10LbmYdV4sVnGKeZjhKNk+
-bvVzetUSUS7Rh1fHtxlivJFkG1VrvPu9b416l2aKftBiaNyAWXbyjqXwLYli6Ehk
-uu6jZd0040Ggh7bY+KMSnDFDrp7Rar7OvGu9Iovs+sPdkc/iEbvwEiXdMjf3gwkT
-Wqx6br1VDLzhD83HAsFA9tt5fv6KTf91UgJnCmOi81Uo6fSEJG84g32T25gwwmCK
-q4U049aGF/f4u3QuWDsfYqNePycurAg3m5PC0wCoqvpY2u/q+PGbjWMi2PfZsF8U
-imgl/L0=
------END CERTIFICATE-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIDATCCAekCAQAwZDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUx
-ITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEdMBsGA1UEAxMUbm90
-LXVzZWQubmdodHRwMi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDunooprdy1L5Kv+d/a5Mo21OyG4NXNOwFNtobJ2PyrRgOZPecKc49Ze+8bU36M
-m/mlwBc3ZmdX1SkaHc3mD8JpFwVOBBDyj42UJdgF08hcAn4qRvGWKYPDef3Ehd94
-vr5XZC482uqHqfbfHAODlugpo2Sl/tfk6uNPU+HntIR9fWincZdvCQA/b7daXHFh
-izSG1GraAf3ur0ngyWEc8NqmL64oaz7ZvXLpTGB/icPmMRZ0+bJWp4qz59PiNraf
-7eC6Ol06jaWDnTinnSAvjM/zOECVyqVAKZ4kYvXEXMK2bbAdCjvpcdJZxriknuvF
-/agh20TuKS+AWVNVecbVPdMRAgMBAAGgWDBWBgkqhkiG9w0BCQ4xSTBHMEUGA1Ud
-EQQ+MDyCEFRFU1QuTkdIVFRQMi5PUkeCEioudGVzdC5uZ2h0dHAyLm9yZ4IUdyp3
-LnRlc3QubmdodHRwMi5vcmcwDQYJKoZIhvcNAQELBQADggEBAIAEwnoM5moRwO5U
-eaeVCuzpxw1qQsB769GyQu+ey1aa+2BYflirv/FW+8x/uzQpCWGEgHqd5w+MXyXA
-PsyucHgKh5Ia6MUW6xxlHkkOtVtmZiH7lXWv90RNtdfHHGWnBzw8iGsk5WfEaNho
-NlPiuYLiFqA7W6jR/c4kOg3zziDlwTXaH6SWLCuDzLTb7E7nGcrWkN6moYj+QlSx
-viA4GsqDBoFgXT7cSfUzS8ZwIjrqbx7C1xkzPEt5jAiCD/UBX9ot0G+lEgCv3UQj
-Q1KkY+TO3bzMkt/kQSX2Q6plKj8D77tlDfFCjd77VC2lL3Qmzaz+M6T7uF+wyl9W
-AQJvoUg=
------END CERTIFICATE REQUEST-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr.json cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr.json
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.csr.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-{
-    "CN": "not-used.nghttp2.org",
-    "hosts": [
-	"TEST.NGHTTP2.ORG",
-	"*.test.nghttp2.org",
-	"w*w.test.nghttp2.org"
-    ],
-    "key": {
-	"algo": "rsa",
-	"size": 2048
-    },
-    "names": [
-	{
-	    "C": "AU",
-	    "ST": "Some-State",
-	    "O": "Internet Widgits Pty Ltd"
-	}
-    ]
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org-key.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org-key.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org-key.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org-key.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA7p6KKa3ctS+Sr/nf2uTKNtTshuDVzTsBTbaGydj8q0YDmT3n
-CnOPWXvvG1N+jJv5pcAXN2ZnV9UpGh3N5g/CaRcFTgQQ8o+NlCXYBdPIXAJ+Kkbx
-limDw3n9xIXfeL6+V2QuPNrqh6n23xwDg5boKaNkpf7X5OrjT1Ph57SEfX1op3GX
-bwkAP2+3WlxxYYs0htRq2gH97q9J4MlhHPDapi+uKGs+2b1y6Uxgf4nD5jEWdPmy
-VqeKs+fT4ja2n+3gujpdOo2lg504p50gL4zP8zhAlcqlQCmeJGL1xFzCtm2wHQo7
-6XHSWca4pJ7rxf2oIdtE7ikvgFlTVXnG1T3TEQIDAQABAoIBAQDlX/UD96MPcDmb
-e6EZ85AGgUsUpJAhBjVMlMagxTqtEVJoPj8XptoHdMD2DZ66XzztfedTU9bHcZpf
-BoNkQYXqKzzoL7Ry1leML4ymnVweRi8tSKD2bdXBVEUCYoXctc6WhzCDQxTrcBBl
-i7I9DhUB4ZTglEbIQJpdKQ8hAj/Rt55KWSxc+8X7ItSdtMrq+uz+pqg4PkysVAFS
-3aDybOqiI/2hzOvwQU4HaB48uUQwpOU6EGidt0C5nAdWOQMbS8kkCJz6UODiUfdM
-mLIyA4ygkQ45QthzrddKauUMhUd/y1SAFJOambR4ZiyA+bItomlbNq018sFx3FDr
-Uvg7nz2ZAoGBAPC6aO4W0U7vsWyL/lgC7ybFbtPJ4emj4wK/W87qx3LW1/dRgl7Q
-h6oblZTFK/oV6xA7J2/Foocz/s1ntnyIdxrtrZUYAIiBXlrWhDg9+MnnmErfXx7H
-CkRyWH6i9JbTRUeiWRNBGQ9yMkwQPc2Ckytxrh7w9M+RVCpyzUh8lX+XAoGBAP3B
-4V8cF3bVEUOk0tHshR5m2kcJ22qmUv8WUG+IdRUDb4tRpzVFC8HcKedEjk3jxkXR
-UInRSD+hLhx0HIhjZKWqJffSZI/G3U8AqoKu9+eh/xHZCah/8KW1YWNsn4rROcyZ
-5XFRiMn7psWTjLEZ17zQS4rk9g65SKc9u1wtTxeXAoGAIY3qOF2n2Tfh5D5zOnNW
-QHI+q3i1a6qzZtujgWkKWgCGY+vRn0Oz1Us5A16kbZyGgmGscpD6wZvGxXzSW/Nt
-nqxIiMKquFxH+aNzFJ/WwNXuTWlrSc/2p2nE2gn+y9MxEfYYMm3df2CskBuncbDk
-sKaM3bU6eoBIWg5cfOEYuYsCgYACB2bR59uYK6PzsoGtBAMcdx4Pq1iBxcqsF3WV
-LrYg8OIXbxOzLVYmuqfrHXU10jhnnoDSWUYGnDdOKu9/d6v6Vx3umVQMgj6Kvyqd
-2OBKjdUIQ3/8ROmbqZOZw+iSp5GavTBEc65wTv7KXZ+mWtqKu++esK32+CxIignR
-dttHCQKBgQDZUt94wj9s5p7H5LH6hxyqNr6P9JYEuYPao5l/3mOJ8N330wKuN2G+
-GUg7p/AhtQHwdoyErlsQavKZa791oCvfJiOURYa8gYU03sYsyI1tV45UexCwl40f
-oS+VQYgU16UdYo9B2petecEPNpM+mgpne3qzVUwJ5NUNURgmWpyiQw==
------END RSA PRIVATE KEY-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/test.nghttp2.org.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEDjCCAvagAwIBAgIUQBCY8Nre85JT1c7P+HbXUF9yzg8wDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoT
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEXMBUGA1UEAxMOY2EubmdodHRwMi5v
-cmcwHhcNMTYwNjI1MDkzMzAwWhcNMjYwNjIzMDkzMzAwWjBkMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMR0wGwYDVQQDExRub3QtdXNlZC5uZ2h0dHAyLm9yZzCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAO6eiimt3LUvkq/539rkyjbU7Ibg1c07
-AU22hsnY/KtGA5k95wpzj1l77xtTfoyb+aXAFzdmZ1fVKRodzeYPwmkXBU4EEPKP
-jZQl2AXTyFwCfipG8ZYpg8N5/cSF33i+vldkLjza6oep9t8cA4OW6CmjZKX+1+Tq
-409T4ee0hH19aKdxl28JAD9vt1pccWGLNIbUatoB/e6vSeDJYRzw2qYvrihrPtm9
-culMYH+Jw+YxFnT5slanirPn0+I2tp/t4Lo6XTqNpYOdOKedIC+Mz/M4QJXKpUAp
-niRi9cRcwrZtsB0KO+lx0lnGuKSe68X9qCHbRO4pL4BZU1V5xtU90xECAwEAAaOB
-vTCBujAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0T
-AQH/BAIwADAdBgNVHQ4EFgQUGlxgxowH6jrQiyyFpCbwPkCXXIYwHwYDVR0jBBgw
-FoAU0DnFVHVlxrFEkv1ULqnO4ua924YwRQYDVR0RBD4wPIIQVEVTVC5OR0hUVFAy
-Lk9SR4ISKi50ZXN0Lm5naHR0cDIub3JnghR3KncudGVzdC5uZ2h0dHAyLm9yZzAN
-BgkqhkiG9w0BAQsFAAOCAQEANCqM6ocfqOpgDEHYOOQTGFHJIptQhS3kRYAdTIo2
-G8XvGCoy+CDYe1GAUWbxE090+a1I1rsYMHcWKJnjKaCBZid7KMhyayIvrmgEsOCh
-L8iLf3bxkCoyIAmCpxJwa3LMxm2QQLtRx8AoMXWf+N8are4HY6MLNn6aP4zaTrTZ
-H+WkjKIh7WjSHtW/ro666PCXJDCCdRXljOf8v/fff3bYiLg8o70RBp7OFM0HaPtK
-wCfcLLxBeoVIncWswB6GtVUFhLeGjepDzWpuDHOdw6DtpghwSXvWFu9bRtl+x02m
-LAGfJ0kJrpYGfr9UB51NFX3aM/D3p2zxrjKwR2b59vJEcA==
------END CERTIFICATE-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/timegm.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/timegm.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/timegm.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/timegm.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "timegm.h"
-
-#include <inttypes.h>
-
-/* Counter the number of leap year in the range [0, y). The |y| is the
-   year, including century (e.g., 2012) */
-static int count_leap_year(int y) {
-  y -= 1;
-  return y / 4 - y / 100 + y / 400;
-}
-
-/* Based on the algorithm of Python 2.7 calendar.timegm. */
-time_t nghttp2_timegm(struct tm *tm) {
-  int days;
-  int num_leap_year;
-  int64_t t;
-  if (tm->tm_mon > 11) {
-    return -1;
-  }
-  num_leap_year = count_leap_year(tm->tm_year + 1900) - count_leap_year(1970);
-  days = (tm->tm_year - 70) * 365 + num_leap_year + tm->tm_yday;
-  t = ((int64_t)days * 24 + tm->tm_hour) * 3600 + tm->tm_min * 60 + tm->tm_sec;
-
-#if SIZEOF_TIME_T == 4
-  if (t < INT32_MIN || t > INT32_MAX) {
-    return -1;
-  }
-#endif /* SIZEOF_TIME_T == 4 */
-
-  return (time_t)t;
-}
-
-/* Returns nonzero if the |y| is the leap year. The |y| is the year,
-   including century (e.g., 2012) */
-static int is_leap_year(int y) {
-  return y % 4 == 0 && (y % 100 != 0 || y % 400 == 0);
-}
-
-/* The number of days before ith month begins */
-static int daysum[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-
-time_t nghttp2_timegm_without_yday(struct tm *tm) {
-  int days;
-  int num_leap_year;
-  int64_t t;
-  if (tm->tm_mon > 11) {
-    return -1;
-  }
-  num_leap_year = count_leap_year(tm->tm_year + 1900) - count_leap_year(1970);
-  days = (tm->tm_year - 70) * 365 + num_leap_year + daysum[tm->tm_mon] +
-         tm->tm_mday - 1;
-  if (tm->tm_mon >= 2 && is_leap_year(tm->tm_year + 1900)) {
-    ++days;
-  }
-  t = ((int64_t)days * 24 + tm->tm_hour) * 3600 + tm->tm_min * 60 + tm->tm_sec;
-
-#if SIZEOF_TIME_T == 4
-  if (t < INT32_MIN || t > INT32_MAX) {
-    return -1;
-  }
-#endif /* SIZEOF_TIME_T == 4 */
-
-  return (time_t)t;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/timegm.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/timegm.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/timegm.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/timegm.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef TIMEGM_H
-#define TIMEGM_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef HAVE_TIME_H
-#  include <time.h>
-#endif // HAVE_TIME_H
-
-time_t nghttp2_timegm(struct tm *tm);
-
-/* Just like nghttp2_timegm, but without using tm->tm_yday.  This is
-   useful if we use tm from strptime, since some platforms do not
-   calculate tm_yday with that call. */
-time_t nghttp2_timegm_without_yday(struct tm *tm);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* TIMEGM_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/tls.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/tls.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/tls.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/tls.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "tls.h"
-
-#include <cassert>
-#include <vector>
-#include <mutex>
-#include <iostream>
-
-#include <openssl/crypto.h>
-#include <openssl/conf.h>
-
-#include "ssl_compat.h"
-
-namespace nghttp2 {
-
-namespace tls {
-
-#if OPENSSL_1_1_API
-
-// CRYPTO_LOCK is deprecated as of OpenSSL 1.1.0
-LibsslGlobalLock::LibsslGlobalLock() {}
-
-#else // !OPENSSL_1_1_API
-
-namespace {
-std::mutex *ssl_global_locks;
-} // namespace
-
-namespace {
-void ssl_locking_cb(int mode, int type, const char *file, int line) {
-  if (mode & CRYPTO_LOCK) {
-    ssl_global_locks[type].lock();
-  } else {
-    ssl_global_locks[type].unlock();
-  }
-}
-} // namespace
-
-LibsslGlobalLock::LibsslGlobalLock() {
-  if (ssl_global_locks) {
-    std::cerr << "OpenSSL global lock has been already set" << std::endl;
-    assert(0);
-  }
-  ssl_global_locks = new std::mutex[CRYPTO_num_locks()];
-  // CRYPTO_set_id_callback(ssl_thread_id); OpenSSL manual says that
-  // if threadid_func is not specified using
-  // CRYPTO_THREADID_set_callback(), then default implementation is
-  // used. We use this default one.
-  CRYPTO_set_locking_callback(ssl_locking_cb);
-}
-
-#endif // !OPENSSL_1_1_API
-
-const char *get_tls_protocol(SSL *ssl) {
-  switch (SSL_version(ssl)) {
-  case SSL2_VERSION:
-    return "SSLv2";
-  case SSL3_VERSION:
-    return "SSLv3";
-#ifdef TLS1_3_VERSION
-  case TLS1_3_VERSION:
-    return "TLSv1.3";
-#endif // TLS1_3_VERSION
-  case TLS1_2_VERSION:
-    return "TLSv1.2";
-  case TLS1_1_VERSION:
-    return "TLSv1.1";
-  case TLS1_VERSION:
-    return "TLSv1";
-  default:
-    return "unknown";
-  }
-}
-
-TLSSessionInfo *get_tls_session_info(TLSSessionInfo *tls_info, SSL *ssl) {
-  if (!ssl) {
-    return nullptr;
-  }
-
-  auto session = SSL_get_session(ssl);
-  if (!session) {
-    return nullptr;
-  }
-
-  tls_info->cipher = SSL_get_cipher_name(ssl);
-  tls_info->protocol = get_tls_protocol(ssl);
-  tls_info->session_reused = SSL_session_reused(ssl);
-
-  unsigned int session_id_length;
-  tls_info->session_id = SSL_SESSION_get_id(session, &session_id_length);
-  tls_info->session_id_length = session_id_length;
-
-  return tls_info;
-}
-
-/* Conditional logic w/ lookup tables to check if id is one of the
-   the black listed cipher suites for HTTP/2 described in RFC 7540.
-   https://github.com/jay/http2_blacklisted_ciphers
-*/
-#define IS_CIPHER_BANNED_METHOD2(id)                                           \
-  ((0x0000 <= id && id <= 0x00FF &&                                            \
-    "\xFF\xFF\xFF\xCF\xFF\xFF\xFF\xFF\x7F\x00\x00\x00\x80\x3F\x00\x00"         \
-    "\xF0\xFF\xFF\x3F\xF3\xF3\xFF\xFF\x3F\x00\x00\x00\x00\x00\x00\x80"         \
-            [(id & 0xFF) / 8] &                                                \
-        (1 << (id % 8))) ||                                                    \
-   (0xC000 <= id && id <= 0xC0FF &&                                            \
-    "\xFE\xFF\xFF\xFF\xFF\x67\xFE\xFF\xFF\xFF\x33\xCF\xFC\xCF\xFF\xCF"         \
-    "\x3C\xF3\xFC\x3F\x33\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"         \
-            [(id & 0xFF) / 8] &                                                \
-        (1 << (id % 8))))
-
-bool check_http2_cipher_black_list(SSL *ssl) {
-  int id = SSL_CIPHER_get_id(SSL_get_current_cipher(ssl)) & 0xFFFFFF;
-
-  return IS_CIPHER_BANNED_METHOD2(id);
-}
-
-bool check_http2_tls_version(SSL *ssl) {
-  auto tls_ver = SSL_version(ssl);
-
-  return tls_ver >= TLS1_2_VERSION;
-}
-
-bool check_http2_requirement(SSL *ssl) {
-  return check_http2_tls_version(ssl) && !check_http2_cipher_black_list(ssl);
-}
-
-void libssl_init() {
-#if OPENSSL_1_1_API
-// No explicit initialization is required.
-#elif defined(OPENSSL_IS_BORINGSSL)
-  CRYPTO_library_init();
-#else  // !OPENSSL_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-  OPENSSL_config(nullptr);
-  SSL_load_error_strings();
-  SSL_library_init();
-  OpenSSL_add_all_algorithms();
-#endif // !OPENSSL_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-}
-
-int ssl_ctx_set_proto_versions(SSL_CTX *ssl_ctx, int min, int max) {
-#if OPENSSL_1_1_API || defined(OPENSSL_IS_BORINGSSL)
-  if (SSL_CTX_set_min_proto_version(ssl_ctx, min) != 1 ||
-      SSL_CTX_set_max_proto_version(ssl_ctx, max) != 1) {
-    return -1;
-  }
-  return 0;
-#else  // !OPENSSL_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-  long int opts = 0;
-
-  // TODO We depends on the ordering of protocol version macro in
-  // OpenSSL.
-  if (min > TLS1_VERSION) {
-    opts |= SSL_OP_NO_TLSv1;
-  }
-  if (min > TLS1_1_VERSION) {
-    opts |= SSL_OP_NO_TLSv1_1;
-  }
-  if (min > TLS1_2_VERSION) {
-    opts |= SSL_OP_NO_TLSv1_2;
-  }
-
-  if (max < TLS1_2_VERSION) {
-    opts |= SSL_OP_NO_TLSv1_2;
-  }
-  if (max < TLS1_1_VERSION) {
-    opts |= SSL_OP_NO_TLSv1_1;
-  }
-
-  SSL_CTX_set_options(ssl_ctx, opts);
-
-  return 0;
-#endif // !OPENSSL_1_1_API && !defined(OPENSSL_IS_BORINGSSL)
-}
-
-} // namespace tls
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/tls.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/tls.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/tls.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/tls.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef TLS_H
-#define TLS_H
-
-#include "nghttp2_config.h"
-
-#include <cinttypes>
-
-#include <openssl/ssl.h>
-
-#include "ssl_compat.h"
-
-namespace nghttp2 {
-
-namespace tls {
-
-// Acquire OpenSSL global lock to share SSL_CTX across multiple
-// threads. The constructor acquires lock and destructor unlocks.
-class LibsslGlobalLock {
-public:
-  LibsslGlobalLock();
-  LibsslGlobalLock(const LibsslGlobalLock &) = delete;
-  LibsslGlobalLock &operator=(const LibsslGlobalLock &) = delete;
-};
-
-// Recommended general purpose "Modern compatibility" cipher suites by
-// mozilla.
-//
-// https://wiki.mozilla.org/Security/Server_Side_TLS
-constexpr char DEFAULT_CIPHER_LIST[] =
-    "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-"
-    "CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-"
-    "SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-"
-    "AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256";
-
-constexpr char DEFAULT_TLS13_CIPHER_LIST[] =
-#if OPENSSL_1_1_1_API
-    TLS_DEFAULT_CIPHERSUITES
-#else  // !OPENSSL_1_1_1_API
-    ""
-#endif // !OPENSSL_1_1_1_API
-    ;
-
-constexpr auto NGHTTP2_TLS_MIN_VERSION = TLS1_VERSION;
-#ifdef TLS1_3_VERSION
-constexpr auto NGHTTP2_TLS_MAX_VERSION = TLS1_3_VERSION;
-#else  // !TLS1_3_VERSION
-constexpr auto NGHTTP2_TLS_MAX_VERSION = TLS1_2_VERSION;
-#endif // !TLS1_3_VERSION
-
-const char *get_tls_protocol(SSL *ssl);
-
-struct TLSSessionInfo {
-  const char *cipher;
-  const char *protocol;
-  const uint8_t *session_id;
-  bool session_reused;
-  size_t session_id_length;
-};
-
-TLSSessionInfo *get_tls_session_info(TLSSessionInfo *tls_info, SSL *ssl);
-
-// Returns true iff the negotiated protocol is TLSv1.2.
-bool check_http2_tls_version(SSL *ssl);
-
-// Returns true iff the negotiated cipher suite is in HTTP/2 cipher
-// black list.
-bool check_http2_cipher_black_list(SSL *ssl);
-
-// Returns true if SSL/TLS requirement for HTTP/2 is fulfilled.
-// To fulfill the requirement, the following 2 terms must be hold:
-//
-// 1. The negotiated protocol must be TLSv1.2.
-// 2. The negotiated cipher cuite is not listed in the black list
-//    described in RFC 7540.
-bool check_http2_requirement(SSL *ssl);
-
-// Initializes OpenSSL library
-void libssl_init();
-
-// Sets TLS min and max versions to |ssl_ctx|.  This function returns
-// 0 if it succeeds, or -1.
-int ssl_ctx_set_proto_versions(SSL_CTX *ssl_ctx, int min, int max);
-
-} // namespace tls
-
-} // namespace nghttp2
-
-#endif // TLS_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,1537 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "util.h"
-
-#ifdef HAVE_TIME_H
-#  include <time.h>
-#endif // HAVE_TIME_H
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif // HAVE_SYS_SOCKET_H
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-#include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif // HAVE_FCNTL_H
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif // HAVE_NETINET_IN_H
-#ifdef _WIN32
-#  include <ws2tcpip.h>
-#  include <boost/date_time/posix_time/posix_time.hpp>
-#else // !_WIN32
-#  include <netinet/tcp.h>
-#endif // !_WIN32
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif // HAVE_ARPA_INET_H
-
-#include <cmath>
-#include <cerrno>
-#include <cassert>
-#include <cstdio>
-#include <cstring>
-#include <iostream>
-#include <fstream>
-
-#include <openssl/evp.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "ssl_compat.h"
-#include "timegm.h"
-
-namespace nghttp2 {
-
-namespace util {
-
-#ifndef _WIN32
-namespace {
-int nghttp2_inet_pton(int af, const char *src, void *dst) {
-  return inet_pton(af, src, dst);
-}
-} // namespace
-#else // _WIN32
-namespace {
-// inet_pton-wrapper for Windows
-int nghttp2_inet_pton(int af, const char *src, void *dst) {
-#  if _WIN32_WINNT >= 0x0600
-  return InetPtonA(af, src, dst);
-#  else
-  // the function takes a 'char*', so we need to make a copy
-  char addr[INET6_ADDRSTRLEN + 1];
-  strncpy(addr, src, sizeof(addr));
-  addr[sizeof(addr) - 1] = 0;
-
-  int size = sizeof(struct in6_addr);
-
-  if (WSAStringToAddress(addr, af, NULL, (LPSOCKADDR)dst, &size) == 0)
-    return 1;
-  return 0;
-#  endif
-}
-} // namespace
-#endif // _WIN32
-
-const char UPPER_XDIGITS[] = "0123456789ABCDEF";
-
-bool in_rfc3986_unreserved_chars(const char c) {
-  static constexpr char unreserved[] = {'-', '.', '_', '~'};
-  return is_alpha(c) || is_digit(c) ||
-         std::find(std::begin(unreserved), std::end(unreserved), c) !=
-             std::end(unreserved);
-}
-
-bool in_rfc3986_sub_delims(const char c) {
-  static constexpr char sub_delims[] = {'!', '$', '&', '\'', '(', ')',
-                                        '*', '+', ',', ';',  '='};
-  return std::find(std::begin(sub_delims), std::end(sub_delims), c) !=
-         std::end(sub_delims);
-}
-
-std::string percent_encode(const unsigned char *target, size_t len) {
-  std::string dest;
-  for (size_t i = 0; i < len; ++i) {
-    unsigned char c = target[i];
-
-    if (in_rfc3986_unreserved_chars(c)) {
-      dest += c;
-    } else {
-      dest += '%';
-      dest += UPPER_XDIGITS[c >> 4];
-      dest += UPPER_XDIGITS[(c & 0x0f)];
-    }
-  }
-  return dest;
-}
-
-std::string percent_encode(const std::string &target) {
-  return percent_encode(reinterpret_cast<const unsigned char *>(target.c_str()),
-                        target.size());
-}
-
-std::string percent_encode_path(const std::string &s) {
-  std::string dest;
-  for (auto c : s) {
-    if (in_rfc3986_unreserved_chars(c) || in_rfc3986_sub_delims(c) ||
-        c == '/') {
-      dest += c;
-      continue;
-    }
-
-    dest += '%';
-    dest += UPPER_XDIGITS[(c >> 4) & 0x0f];
-    dest += UPPER_XDIGITS[(c & 0x0f)];
-  }
-  return dest;
-}
-
-bool in_token(char c) {
-  static constexpr char extra[] = {'!', '#', '$', '%', '&', '\'', '*', '+',
-                                   '-', '.', '^', '_', '`', '|',  '~'};
-  return is_alpha(c) || is_digit(c) ||
-         std::find(std::begin(extra), std::end(extra), c) != std::end(extra);
-}
-
-bool in_attr_char(char c) {
-  static constexpr char bad[] = {'*', '\'', '%'};
-  return util::in_token(c) &&
-         std::find(std::begin(bad), std::end(bad), c) == std::end(bad);
-}
-
-StringRef percent_encode_token(BlockAllocator &balloc,
-                               const StringRef &target) {
-  auto iov = make_byte_ref(balloc, target.size() * 3 + 1);
-  auto p = iov.base;
-
-  for (auto first = std::begin(target); first != std::end(target); ++first) {
-    uint8_t c = *first;
-
-    if (c != '%' && in_token(c)) {
-      *p++ = c;
-      continue;
-    }
-
-    *p++ = '%';
-    *p++ = UPPER_XDIGITS[c >> 4];
-    *p++ = UPPER_XDIGITS[(c & 0x0f)];
-  }
-
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-uint32_t hex_to_uint(char c) {
-  if (c <= '9') {
-    return c - '0';
-  }
-  if (c <= 'Z') {
-    return c - 'A' + 10;
-  }
-  if (c <= 'z') {
-    return c - 'a' + 10;
-  }
-  return 256;
-}
-
-StringRef quote_string(BlockAllocator &balloc, const StringRef &target) {
-  auto cnt = std::count(std::begin(target), std::end(target), '"');
-
-  if (cnt == 0) {
-    return make_string_ref(balloc, target);
-  }
-
-  auto iov = make_byte_ref(balloc, target.size() + cnt + 1);
-  auto p = iov.base;
-
-  for (auto c : target) {
-    if (c == '"') {
-      *p++ = '\\';
-      *p++ = '"';
-    } else {
-      *p++ = c;
-    }
-  }
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-namespace {
-template <typename Iterator>
-Iterator cpydig(Iterator d, uint32_t n, size_t len) {
-  auto p = d + len - 1;
-
-  do {
-    *p-- = (n % 10) + '0';
-    n /= 10;
-  } while (p >= d);
-
-  return d + len;
-}
-} // namespace
-
-namespace {
-constexpr const char *MONTH[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                                 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-constexpr const char *DAY_OF_WEEK[] = {"Sun", "Mon", "Tue", "Wed",
-                                       "Thu", "Fri", "Sat"};
-} // namespace
-
-std::string http_date(time_t t) {
-  /* Sat, 27 Sep 2014 06:31:15 GMT */
-  std::string res(29, 0);
-  http_date(&res[0], t);
-  return res;
-}
-
-char *http_date(char *res, time_t t) {
-  struct tm tms;
-
-  if (gmtime_r(&t, &tms) == nullptr) {
-    return res;
-  }
-
-  auto p = res;
-
-  auto s = DAY_OF_WEEK[tms.tm_wday];
-  p = std::copy_n(s, 3, p);
-  *p++ = ',';
-  *p++ = ' ';
-  p = cpydig(p, tms.tm_mday, 2);
-  *p++ = ' ';
-  s = MONTH[tms.tm_mon];
-  p = std::copy_n(s, 3, p);
-  *p++ = ' ';
-  p = cpydig(p, tms.tm_year + 1900, 4);
-  *p++ = ' ';
-  p = cpydig(p, tms.tm_hour, 2);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_min, 2);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_sec, 2);
-  s = " GMT";
-  p = std::copy_n(s, 4, p);
-
-  return p;
-}
-
-std::string common_log_date(time_t t) {
-  // 03/Jul/2014:00:19:38 +0900
-  std::string res(26, 0);
-  common_log_date(&res[0], t);
-  return res;
-}
-
-char *common_log_date(char *res, time_t t) {
-  struct tm tms;
-
-  if (localtime_r(&t, &tms) == nullptr) {
-    return res;
-  }
-
-  auto p = res;
-
-  p = cpydig(p, tms.tm_mday, 2);
-  *p++ = '/';
-  auto s = MONTH[tms.tm_mon];
-  p = std::copy_n(s, 3, p);
-  *p++ = '/';
-  p = cpydig(p, tms.tm_year + 1900, 4);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_hour, 2);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_min, 2);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_sec, 2);
-  *p++ = ' ';
-
-#ifdef HAVE_STRUCT_TM_TM_GMTOFF
-  auto gmtoff = tms.tm_gmtoff;
-#else  // !HAVE_STRUCT_TM_TM_GMTOFF
-  auto gmtoff = nghttp2_timegm(&tms) - t;
-#endif // !HAVE_STRUCT_TM_TM_GMTOFF
-  if (gmtoff >= 0) {
-    *p++ = '+';
-  } else {
-    *p++ = '-';
-    gmtoff = -gmtoff;
-  }
-
-  p = cpydig(p, gmtoff / 3600, 2);
-  p = cpydig(p, (gmtoff % 3600) / 60, 2);
-
-  return p;
-}
-
-std::string iso8601_date(int64_t ms) {
-  // 2014-11-15T12:58:24.741Z
-  // 2014-11-15T12:58:24.741+09:00
-  std::string res(29, 0);
-  auto p = iso8601_date(&res[0], ms);
-  res.resize(p - &res[0]);
-  return res;
-}
-
-char *iso8601_date(char *res, int64_t ms) {
-  time_t sec = ms / 1000;
-
-  tm tms;
-  if (localtime_r(&sec, &tms) == nullptr) {
-    return res;
-  }
-
-  auto p = res;
-
-  p = cpydig(p, tms.tm_year + 1900, 4);
-  *p++ = '-';
-  p = cpydig(p, tms.tm_mon + 1, 2);
-  *p++ = '-';
-  p = cpydig(p, tms.tm_mday, 2);
-  *p++ = 'T';
-  p = cpydig(p, tms.tm_hour, 2);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_min, 2);
-  *p++ = ':';
-  p = cpydig(p, tms.tm_sec, 2);
-  *p++ = '.';
-  p = cpydig(p, ms % 1000, 3);
-
-#ifdef HAVE_STRUCT_TM_TM_GMTOFF
-  auto gmtoff = tms.tm_gmtoff;
-#else  // !HAVE_STRUCT_TM_TM_GMTOFF
-  auto gmtoff = nghttp2_timegm(&tms) - sec;
-#endif // !HAVE_STRUCT_TM_TM_GMTOFF
-  if (gmtoff == 0) {
-    *p++ = 'Z';
-  } else {
-    if (gmtoff > 0) {
-      *p++ = '+';
-    } else {
-      *p++ = '-';
-      gmtoff = -gmtoff;
-    }
-    p = cpydig(p, gmtoff / 3600, 2);
-    *p++ = ':';
-    p = cpydig(p, (gmtoff % 3600) / 60, 2);
-  }
-
-  return p;
-}
-
-#ifdef _WIN32
-namespace bt = boost::posix_time;
-// one-time definition of the locale that is used to parse UTC strings
-// (note that the time_input_facet is ref-counted and deleted automatically)
-static const std::locale
-    ptime_locale(std::locale::classic(),
-                 new bt::time_input_facet("%a, %d %b %Y %H:%M:%S GMT"));
-#endif //_WIN32
-
-time_t parse_http_date(const StringRef &s) {
-#ifdef _WIN32
-  // there is no strptime - use boost
-  std::stringstream sstr(s.str());
-  sstr.imbue(ptime_locale);
-  bt::ptime ltime;
-  sstr >> ltime;
-  if (!sstr)
-    return 0;
-
-  return boost::posix_time::to_time_t(ltime);
-#else  // !_WIN32
-  tm tm{};
-  char *r = strptime(s.c_str(), "%a, %d %b %Y %H:%M:%S GMT", &tm);
-  if (r == 0) {
-    return 0;
-  }
-  return nghttp2_timegm_without_yday(&tm);
-#endif // !_WIN32
-}
-
-time_t parse_openssl_asn1_time_print(const StringRef &s) {
-  tm tm{};
-  auto r = strptime(s.c_str(), "%b %d %H:%M:%S %Y GMT", &tm);
-  if (r == nullptr) {
-    return 0;
-  }
-  return nghttp2_timegm_without_yday(&tm);
-}
-
-char upcase(char c) {
-  if ('a' <= c && c <= 'z') {
-    return c - 'a' + 'A';
-  } else {
-    return c;
-  }
-}
-
-std::string format_hex(const unsigned char *s, size_t len) {
-  std::string res;
-  res.resize(len * 2);
-
-  for (size_t i = 0; i < len; ++i) {
-    unsigned char c = s[i];
-
-    res[i * 2] = LOWER_XDIGITS[c >> 4];
-    res[i * 2 + 1] = LOWER_XDIGITS[c & 0x0f];
-  }
-  return res;
-}
-
-StringRef format_hex(BlockAllocator &balloc, const StringRef &s) {
-  auto iov = make_byte_ref(balloc, s.size() * 2 + 1);
-  auto p = iov.base;
-
-  for (auto cc : s) {
-    uint8_t c = cc;
-    *p++ = LOWER_XDIGITS[c >> 4];
-    *p++ = LOWER_XDIGITS[c & 0xf];
-  }
-
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-void to_token68(std::string &base64str) {
-  std::transform(std::begin(base64str), std::end(base64str),
-                 std::begin(base64str), [](char c) {
-                   switch (c) {
-                   case '+':
-                     return '-';
-                   case '/':
-                     return '_';
-                   default:
-                     return c;
-                   }
-                 });
-  base64str.erase(std::find(std::begin(base64str), std::end(base64str), '='),
-                  std::end(base64str));
-}
-
-StringRef to_base64(BlockAllocator &balloc, const StringRef &token68str) {
-  // At most 3 padding '='
-  auto len = token68str.size() + 3;
-  auto iov = make_byte_ref(balloc, len + 1);
-  auto p = iov.base;
-
-  p = std::transform(std::begin(token68str), std::end(token68str), p,
-                     [](char c) {
-                       switch (c) {
-                       case '-':
-                         return '+';
-                       case '_':
-                         return '/';
-                       default:
-                         return c;
-                       }
-                     });
-
-  auto rem = token68str.size() & 0x3;
-  if (rem) {
-    p = std::fill_n(p, 4 - rem, '=');
-  }
-
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-namespace {
-// Calculates Damerau–Levenshtein distance between c-string a and b
-// with given costs.  swapcost, subcost, addcost and delcost are cost
-// to swap 2 adjacent characters, substitute characters, add character
-// and delete character respectively.
-int levenshtein(const char *a, int alen, const char *b, int blen, int swapcost,
-                int subcost, int addcost, int delcost) {
-  auto dp = std::vector<std::vector<int>>(3, std::vector<int>(blen + 1));
-  for (int i = 0; i <= blen; ++i) {
-    dp[1][i] = i;
-  }
-  for (int i = 1; i <= alen; ++i) {
-    dp[0][0] = i;
-    for (int j = 1; j <= blen; ++j) {
-      dp[0][j] = dp[1][j - 1] + (a[i - 1] == b[j - 1] ? 0 : subcost);
-      if (i >= 2 && j >= 2 && a[i - 1] != b[j - 1] && a[i - 2] == b[j - 1] &&
-          a[i - 1] == b[j - 2]) {
-        dp[0][j] = std::min(dp[0][j], dp[2][j - 2] + swapcost);
-      }
-      dp[0][j] = std::min(dp[0][j],
-                          std::min(dp[1][j] + delcost, dp[0][j - 1] + addcost));
-    }
-    std::rotate(std::begin(dp), std::begin(dp) + 2, std::end(dp));
-  }
-  return dp[1][blen];
-}
-} // namespace
-
-void show_candidates(const char *unkopt, const option *options) {
-  for (; *unkopt == '-'; ++unkopt)
-    ;
-  if (*unkopt == '\0') {
-    return;
-  }
-  auto unkoptend = unkopt;
-  for (; *unkoptend && *unkoptend != '='; ++unkoptend)
-    ;
-  auto unkoptlen = unkoptend - unkopt;
-  if (unkoptlen == 0) {
-    return;
-  }
-  int prefix_match = 0;
-  auto cands = std::vector<std::pair<int, const char *>>();
-  for (size_t i = 0; options[i].name != nullptr; ++i) {
-    auto optnamelen = strlen(options[i].name);
-    // Use cost 0 for prefix match
-    if (istarts_with(options[i].name, options[i].name + optnamelen, unkopt,
-                     unkopt + unkoptlen)) {
-      if (optnamelen == static_cast<size_t>(unkoptlen)) {
-        // Exact match, then we don't show any condidates.
-        return;
-      }
-      ++prefix_match;
-      cands.emplace_back(0, options[i].name);
-      continue;
-    }
-    // Use cost 0 for suffix match, but match at least 3 characters
-    if (unkoptlen >= 3 &&
-        iends_with(options[i].name, options[i].name + optnamelen, unkopt,
-                   unkopt + unkoptlen)) {
-      cands.emplace_back(0, options[i].name);
-      continue;
-    }
-    // cost values are borrowed from git, help.c.
-    int sim =
-        levenshtein(unkopt, unkoptlen, options[i].name, optnamelen, 0, 2, 1, 3);
-    cands.emplace_back(sim, options[i].name);
-  }
-  if (prefix_match == 1 || cands.empty()) {
-    return;
-  }
-  std::sort(std::begin(cands), std::end(cands));
-  int threshold = cands[0].first;
-  // threshold value is a magic value.
-  if (threshold > 6) {
-    return;
-  }
-  std::cerr << "\nDid you mean:\n";
-  for (auto &item : cands) {
-    if (item.first > threshold) {
-      break;
-    }
-    std::cerr << "\t--" << item.second << "\n";
-  }
-}
-
-bool has_uri_field(const http_parser_url &u, http_parser_url_fields field) {
-  return u.field_set & (1 << field);
-}
-
-bool fieldeq(const char *uri1, const http_parser_url &u1, const char *uri2,
-             const http_parser_url &u2, http_parser_url_fields field) {
-  if (!has_uri_field(u1, field)) {
-    if (!has_uri_field(u2, field)) {
-      return true;
-    } else {
-      return false;
-    }
-  } else if (!has_uri_field(u2, field)) {
-    return false;
-  }
-  if (u1.field_data[field].len != u2.field_data[field].len) {
-    return false;
-  }
-  return memcmp(uri1 + u1.field_data[field].off,
-                uri2 + u2.field_data[field].off, u1.field_data[field].len) == 0;
-}
-
-bool fieldeq(const char *uri, const http_parser_url &u,
-             http_parser_url_fields field, const char *t) {
-  return fieldeq(uri, u, field, StringRef{t});
-}
-
-bool fieldeq(const char *uri, const http_parser_url &u,
-             http_parser_url_fields field, const StringRef &t) {
-  if (!has_uri_field(u, field)) {
-    return t.empty();
-  }
-  auto &f = u.field_data[field];
-  return StringRef{uri + f.off, f.len} == t;
-}
-
-StringRef get_uri_field(const char *uri, const http_parser_url &u,
-                        http_parser_url_fields field) {
-  if (!util::has_uri_field(u, field)) {
-    return StringRef{};
-  }
-
-  return StringRef{uri + u.field_data[field].off, u.field_data[field].len};
-}
-
-uint16_t get_default_port(const char *uri, const http_parser_url &u) {
-  if (util::fieldeq(uri, u, UF_SCHEMA, "https")) {
-    return 443;
-  } else if (util::fieldeq(uri, u, UF_SCHEMA, "http")) {
-    return 80;
-  } else {
-    return 443;
-  }
-}
-
-bool porteq(const char *uri1, const http_parser_url &u1, const char *uri2,
-            const http_parser_url &u2) {
-  uint16_t port1, port2;
-  port1 =
-      util::has_uri_field(u1, UF_PORT) ? u1.port : get_default_port(uri1, u1);
-  port2 =
-      util::has_uri_field(u2, UF_PORT) ? u2.port : get_default_port(uri2, u2);
-  return port1 == port2;
-}
-
-void write_uri_field(std::ostream &o, const char *uri, const http_parser_url &u,
-                     http_parser_url_fields field) {
-  if (util::has_uri_field(u, field)) {
-    o.write(uri + u.field_data[field].off, u.field_data[field].len);
-  }
-}
-
-bool numeric_host(const char *hostname) {
-  return numeric_host(hostname, AF_INET) || numeric_host(hostname, AF_INET6);
-}
-
-bool numeric_host(const char *hostname, int family) {
-  int rv;
-  std::array<uint8_t, sizeof(struct in6_addr)> dst;
-
-  rv = nghttp2_inet_pton(family, hostname, dst.data());
-
-  return rv == 1;
-}
-
-std::string numeric_name(const struct sockaddr *sa, socklen_t salen) {
-  std::array<char, NI_MAXHOST> host;
-  auto rv = getnameinfo(sa, salen, host.data(), host.size(), nullptr, 0,
-                        NI_NUMERICHOST);
-  if (rv != 0) {
-    return "unknown";
-  }
-  return host.data();
-}
-
-std::string to_numeric_addr(const Address *addr) {
-  auto family = addr->su.storage.ss_family;
-#ifndef _WIN32
-  if (family == AF_UNIX) {
-    return addr->su.un.sun_path;
-  }
-#endif // !_WIN32
-
-  std::array<char, NI_MAXHOST> host;
-  std::array<char, NI_MAXSERV> serv;
-  auto rv =
-      getnameinfo(&addr->su.sa, addr->len, host.data(), host.size(),
-                  serv.data(), serv.size(), NI_NUMERICHOST | NI_NUMERICSERV);
-  if (rv != 0) {
-    return "unknown";
-  }
-
-  auto hostlen = strlen(host.data());
-  auto servlen = strlen(serv.data());
-
-  std::string s;
-  char *p;
-  if (family == AF_INET6) {
-    s.resize(hostlen + servlen + 2 + 1);
-    p = &s[0];
-    *p++ = '[';
-    p = std::copy_n(host.data(), hostlen, p);
-    *p++ = ']';
-  } else {
-    s.resize(hostlen + servlen + 1);
-    p = &s[0];
-    p = std::copy_n(host.data(), hostlen, p);
-  }
-  *p++ = ':';
-  std::copy_n(serv.data(), servlen, p);
-
-  return s;
-}
-
-void set_port(Address &addr, uint16_t port) {
-  switch (addr.su.storage.ss_family) {
-  case AF_INET:
-    addr.su.in.sin_port = htons(port);
-    break;
-  case AF_INET6:
-    addr.su.in6.sin6_port = htons(port);
-    break;
-  }
-}
-
-std::string ascii_dump(const uint8_t *data, size_t len) {
-  std::string res;
-
-  for (size_t i = 0; i < len; ++i) {
-    auto c = data[i];
-
-    if (c >= 0x20 && c < 0x7f) {
-      res += c;
-    } else {
-      res += '.';
-    }
-  }
-
-  return res;
-}
-
-char *get_exec_path(int argc, char **const argv, const char *cwd) {
-  if (argc == 0 || cwd == nullptr) {
-    return nullptr;
-  }
-
-  auto argv0 = argv[0];
-  auto len = strlen(argv0);
-
-  char *path;
-
-  if (argv0[0] == '/') {
-    path = static_cast<char *>(malloc(len + 1));
-    if (path == nullptr) {
-      return nullptr;
-    }
-    memcpy(path, argv0, len + 1);
-  } else {
-    auto cwdlen = strlen(cwd);
-    path = static_cast<char *>(malloc(len + 1 + cwdlen + 1));
-    if (path == nullptr) {
-      return nullptr;
-    }
-    memcpy(path, cwd, cwdlen);
-    path[cwdlen] = '/';
-    memcpy(path + cwdlen + 1, argv0, len + 1);
-  }
-
-  return path;
-}
-
-bool check_path(const std::string &path) {
-  // We don't like '\' in path.
-  return !path.empty() && path[0] == '/' &&
-         path.find('\\') == std::string::npos &&
-         path.find("/../") == std::string::npos &&
-         path.find("/./") == std::string::npos &&
-         !util::ends_with_l(path, "/..") && !util::ends_with_l(path, "/.");
-}
-
-int64_t to_time64(const timeval &tv) {
-  return tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
-bool check_h2_is_selected(const StringRef &proto) {
-  return streq(NGHTTP2_H2, proto) || streq(NGHTTP2_H2_16, proto) ||
-         streq(NGHTTP2_H2_14, proto);
-}
-
-namespace {
-bool select_proto(const unsigned char **out, unsigned char *outlen,
-                  const unsigned char *in, unsigned int inlen,
-                  const StringRef &key) {
-  for (auto p = in, end = in + inlen; p + key.size() <= end; p += *p + 1) {
-    if (std::equal(std::begin(key), std::end(key), p)) {
-      *out = p + 1;
-      *outlen = *p;
-      return true;
-    }
-  }
-  return false;
-}
-} // namespace
-
-bool select_h2(const unsigned char **out, unsigned char *outlen,
-               const unsigned char *in, unsigned int inlen) {
-  return select_proto(out, outlen, in, inlen, NGHTTP2_H2_ALPN) ||
-         select_proto(out, outlen, in, inlen, NGHTTP2_H2_16_ALPN) ||
-         select_proto(out, outlen, in, inlen, NGHTTP2_H2_14_ALPN);
-}
-
-bool select_protocol(const unsigned char **out, unsigned char *outlen,
-                     const unsigned char *in, unsigned int inlen,
-                     std::vector<std::string> proto_list) {
-  for (const auto &proto : proto_list) {
-    if (select_proto(out, outlen, in, inlen, StringRef{proto})) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-std::vector<unsigned char> get_default_alpn() {
-  auto res = std::vector<unsigned char>(NGHTTP2_H2_ALPN.size() +
-                                        NGHTTP2_H2_16_ALPN.size() +
-                                        NGHTTP2_H2_14_ALPN.size());
-  auto p = std::begin(res);
-
-  p = std::copy_n(std::begin(NGHTTP2_H2_ALPN), NGHTTP2_H2_ALPN.size(), p);
-  p = std::copy_n(std::begin(NGHTTP2_H2_16_ALPN), NGHTTP2_H2_16_ALPN.size(), p);
-  p = std::copy_n(std::begin(NGHTTP2_H2_14_ALPN), NGHTTP2_H2_14_ALPN.size(), p);
-
-  return res;
-}
-
-std::vector<StringRef> split_str(const StringRef &s, char delim) {
-  size_t len = 1;
-  auto last = std::end(s);
-  StringRef::const_iterator d;
-  for (auto first = std::begin(s); (d = std::find(first, last, delim)) != last;
-       ++len, first = d + 1)
-    ;
-
-  auto list = std::vector<StringRef>(len);
-
-  len = 0;
-  for (auto first = std::begin(s);; ++len) {
-    auto stop = std::find(first, last, delim);
-    list[len] = StringRef{first, stop};
-    if (stop == last) {
-      break;
-    }
-    first = stop + 1;
-  }
-  return list;
-}
-
-std::vector<std::string> parse_config_str_list(const StringRef &s, char delim) {
-  auto sublist = split_str(s, delim);
-  auto res = std::vector<std::string>();
-  res.reserve(sublist.size());
-  for (const auto &s : sublist) {
-    res.emplace_back(std::begin(s), std::end(s));
-  }
-  return res;
-}
-
-int make_socket_closeonexec(int fd) {
-#ifdef _WIN32
-  (void)fd;
-  return 0;
-#else  // !_WIN32
-  int flags;
-  int rv;
-  while ((flags = fcntl(fd, F_GETFD)) == -1 && errno == EINTR)
-    ;
-  while ((rv = fcntl(fd, F_SETFD, flags | FD_CLOEXEC)) == -1 && errno == EINTR)
-    ;
-  return rv;
-#endif // !_WIN32
-}
-
-int make_socket_nonblocking(int fd) {
-  int rv;
-
-#ifdef _WIN32
-  u_long mode = 1;
-
-  rv = ioctlsocket(fd, FIONBIO, &mode);
-#else  // !_WIN32
-  int flags;
-  while ((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR)
-    ;
-  while ((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR)
-    ;
-#endif // !_WIN32
-
-  return rv;
-}
-
-int make_socket_nodelay(int fd) {
-  int val = 1;
-  if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&val),
-                 sizeof(val)) == -1) {
-    return -1;
-  }
-  return 0;
-}
-
-int create_nonblock_socket(int family) {
-#ifdef SOCK_NONBLOCK
-  auto fd = socket(family, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
-
-  if (fd == -1) {
-    return -1;
-  }
-#else  // !SOCK_NONBLOCK
-  auto fd = socket(family, SOCK_STREAM, 0);
-
-  if (fd == -1) {
-    return -1;
-  }
-
-  make_socket_nonblocking(fd);
-  make_socket_closeonexec(fd);
-#endif // !SOCK_NONBLOCK
-
-  if (family == AF_INET || family == AF_INET6) {
-    make_socket_nodelay(fd);
-  }
-
-  return fd;
-}
-
-bool check_socket_connected(int fd) {
-  int error;
-  socklen_t len = sizeof(error);
-  if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len) != 0) {
-    return false;
-  }
-
-  return error == 0;
-}
-
-int get_socket_error(int fd) {
-  int error;
-  socklen_t len = sizeof(error);
-  if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len) != 0) {
-    return -1;
-  }
-
-  return error;
-}
-
-bool ipv6_numeric_addr(const char *host) {
-  uint8_t dst[16];
-  return nghttp2_inet_pton(AF_INET6, host, dst) == 1;
-}
-
-namespace {
-std::pair<int64_t, size_t> parse_uint_digits(const void *ss, size_t len) {
-  const uint8_t *s = static_cast<const uint8_t *>(ss);
-  int64_t n = 0;
-  size_t i;
-  if (len == 0) {
-    return {-1, 0};
-  }
-  constexpr int64_t max = std::numeric_limits<int64_t>::max();
-  for (i = 0; i < len; ++i) {
-    if ('0' <= s[i] && s[i] <= '9') {
-      if (n > max / 10) {
-        return {-1, 0};
-      }
-      n *= 10;
-      if (n > max - (s[i] - '0')) {
-        return {-1, 0};
-      }
-      n += s[i] - '0';
-      continue;
-    }
-    break;
-  }
-  if (i == 0) {
-    return {-1, 0};
-  }
-  return {n, i};
-}
-} // namespace
-
-int64_t parse_uint_with_unit(const char *s) {
-  return parse_uint_with_unit(reinterpret_cast<const uint8_t *>(s), strlen(s));
-}
-
-int64_t parse_uint_with_unit(const StringRef &s) {
-  return parse_uint_with_unit(s.byte(), s.size());
-}
-
-int64_t parse_uint_with_unit(const uint8_t *s, size_t len) {
-  int64_t n;
-  size_t i;
-  std::tie(n, i) = parse_uint_digits(s, len);
-  if (n == -1) {
-    return -1;
-  }
-  if (i == len) {
-    return n;
-  }
-  if (i + 1 != len) {
-    return -1;
-  }
-  int mul = 1;
-  switch (s[i]) {
-  case 'K':
-  case 'k':
-    mul = 1 << 10;
-    break;
-  case 'M':
-  case 'm':
-    mul = 1 << 20;
-    break;
-  case 'G':
-  case 'g':
-    mul = 1 << 30;
-    break;
-  default:
-    return -1;
-  }
-  constexpr int64_t max = std::numeric_limits<int64_t>::max();
-  if (n > max / mul) {
-    return -1;
-  }
-  return n * mul;
-}
-
-int64_t parse_uint(const char *s) {
-  return parse_uint(reinterpret_cast<const uint8_t *>(s), strlen(s));
-}
-
-int64_t parse_uint(const std::string &s) {
-  return parse_uint(reinterpret_cast<const uint8_t *>(s.c_str()), s.size());
-}
-
-int64_t parse_uint(const StringRef &s) {
-  return parse_uint(s.byte(), s.size());
-}
-
-int64_t parse_uint(const uint8_t *s, size_t len) {
-  int64_t n;
-  size_t i;
-  std::tie(n, i) = parse_uint_digits(s, len);
-  if (n == -1 || i != len) {
-    return -1;
-  }
-  return n;
-}
-
-double parse_duration_with_unit(const char *s) {
-  return parse_duration_with_unit(reinterpret_cast<const uint8_t *>(s),
-                                  strlen(s));
-}
-
-double parse_duration_with_unit(const StringRef &s) {
-  return parse_duration_with_unit(s.byte(), s.size());
-}
-
-double parse_duration_with_unit(const uint8_t *s, size_t len) {
-  constexpr auto max = std::numeric_limits<int64_t>::max();
-  int64_t n;
-  size_t i;
-
-  std::tie(n, i) = parse_uint_digits(s, len);
-  if (n == -1) {
-    goto fail;
-  }
-  if (i == len) {
-    return static_cast<double>(n);
-  }
-  switch (s[i]) {
-  case 'S':
-  case 's':
-    // seconds
-    if (i + 1 != len) {
-      goto fail;
-    }
-    return static_cast<double>(n);
-  case 'M':
-  case 'm':
-    if (i + 1 == len) {
-      // minutes
-      if (n > max / 60) {
-        goto fail;
-      }
-      return static_cast<double>(n) * 60;
-    }
-
-    if (i + 2 != len || (s[i + 1] != 's' && s[i + 1] != 'S')) {
-      goto fail;
-    }
-    // milliseconds
-    return static_cast<double>(n) / 1000.;
-  case 'H':
-  case 'h':
-    // hours
-    if (i + 1 != len) {
-      goto fail;
-    }
-    if (n > max / 3600) {
-      goto fail;
-    }
-    return static_cast<double>(n) * 3600;
-  }
-fail:
-  return std::numeric_limits<double>::infinity();
-}
-
-std::string duration_str(double t) {
-  if (t == 0.) {
-    return "0";
-  }
-  auto frac = static_cast<int64_t>(t * 1000) % 1000;
-  if (frac > 0) {
-    return utos(static_cast<int64_t>(t * 1000)) + "ms";
-  }
-  auto v = static_cast<int64_t>(t);
-  if (v % 60) {
-    return utos(v) + "s";
-  }
-  v /= 60;
-  if (v % 60) {
-    return utos(v) + "m";
-  }
-  v /= 60;
-  return utos(v) + "h";
-}
-
-std::string format_duration(const std::chrono::microseconds &u) {
-  const char *unit = "us";
-  int d = 0;
-  auto t = u.count();
-  if (t >= 1000000) {
-    d = 1000000;
-    unit = "s";
-  } else if (t >= 1000) {
-    d = 1000;
-    unit = "ms";
-  } else {
-    return utos(t) + unit;
-  }
-  return dtos(static_cast<double>(t) / d) + unit;
-}
-
-std::string format_duration(double t) {
-  const char *unit = "us";
-  if (t >= 1.) {
-    unit = "s";
-  } else if (t >= 0.001) {
-    t *= 1000.;
-    unit = "ms";
-  } else {
-    t *= 1000000.;
-    return utos(static_cast<int64_t>(t)) + unit;
-  }
-  return dtos(t) + unit;
-}
-
-std::string dtos(double n) {
-  auto m = llround(100. * n);
-  auto f = utos(m % 100);
-  return utos(m / 100) + "." + (f.size() == 1 ? "0" : "") + f;
-}
-
-StringRef make_http_hostport(BlockAllocator &balloc, const StringRef &host,
-                             uint16_t port) {
-  if (port != 80 && port != 443) {
-    return make_hostport(balloc, host, port);
-  }
-
-  auto ipv6 = ipv6_numeric_addr(host.c_str());
-
-  auto iov = make_byte_ref(balloc, host.size() + (ipv6 ? 2 : 0) + 1);
-  auto p = iov.base;
-
-  if (ipv6) {
-    *p++ = '[';
-  }
-
-  p = std::copy(std::begin(host), std::end(host), p);
-
-  if (ipv6) {
-    *p++ = ']';
-  }
-
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-std::string make_hostport(const StringRef &host, uint16_t port) {
-  auto ipv6 = ipv6_numeric_addr(host.c_str());
-  auto serv = utos(port);
-
-  std::string hostport;
-  hostport.resize(host.size() + (ipv6 ? 2 : 0) + 1 + serv.size());
-
-  auto p = &hostport[0];
-
-  if (ipv6) {
-    *p++ = '[';
-  }
-
-  p = std::copy_n(host.c_str(), host.size(), p);
-
-  if (ipv6) {
-    *p++ = ']';
-  }
-
-  *p++ = ':';
-  std::copy_n(serv.c_str(), serv.size(), p);
-
-  return hostport;
-}
-
-StringRef make_hostport(BlockAllocator &balloc, const StringRef &host,
-                        uint16_t port) {
-  auto ipv6 = ipv6_numeric_addr(host.c_str());
-  auto serv = utos(port);
-
-  auto iov =
-      make_byte_ref(balloc, host.size() + (ipv6 ? 2 : 0) + 1 + serv.size());
-  auto p = iov.base;
-
-  if (ipv6) {
-    *p++ = '[';
-  }
-
-  p = std::copy(std::begin(host), std::end(host), p);
-
-  if (ipv6) {
-    *p++ = ']';
-  }
-
-  *p++ = ':';
-
-  p = std::copy(std::begin(serv), std::end(serv), p);
-
-  *p = '\0';
-
-  return StringRef{iov.base, p};
-}
-
-namespace {
-void hexdump8(FILE *out, const uint8_t *first, const uint8_t *last) {
-  auto stop = std::min(first + 8, last);
-  for (auto k = first; k != stop; ++k) {
-    fprintf(out, "%02x ", *k);
-  }
-  // each byte needs 3 spaces (2 hex value and space)
-  for (; stop != first + 8; ++stop) {
-    fputs("   ", out);
-  }
-  // we have extra space after 8 bytes
-  fputc(' ', out);
-}
-} // namespace
-
-void hexdump(FILE *out, const uint8_t *src, size_t len) {
-  if (len == 0) {
-    return;
-  }
-  size_t buflen = 0;
-  auto repeated = false;
-  std::array<uint8_t, 16> buf{};
-  auto end = src + len;
-  auto i = src;
-  for (;;) {
-    auto nextlen =
-        std::min(static_cast<size_t>(16), static_cast<size_t>(end - i));
-    if (nextlen == buflen &&
-        std::equal(std::begin(buf), std::begin(buf) + buflen, i)) {
-      // as long as adjacent 16 bytes block are the same, we just
-      // print single '*'.
-      if (!repeated) {
-        repeated = true;
-        fputs("*\n", out);
-      }
-      i += nextlen;
-      continue;
-    }
-    repeated = false;
-    fprintf(out, "%08lx", static_cast<unsigned long>(i - src));
-    if (i == end) {
-      fputc('\n', out);
-      break;
-    }
-    fputs("  ", out);
-    hexdump8(out, i, end);
-    hexdump8(out, i + 8, std::max(i + 8, end));
-    fputc('|', out);
-    auto stop = std::min(i + 16, end);
-    buflen = stop - i;
-    auto p = buf.data();
-    for (; i != stop; ++i) {
-      *p++ = *i;
-      if (0x20 <= *i && *i <= 0x7e) {
-        fputc(*i, out);
-      } else {
-        fputc('.', out);
-      }
-    }
-    fputs("|\n", out);
-  }
-}
-
-void put_uint16be(uint8_t *buf, uint16_t n) {
-  uint16_t x = htons(n);
-  memcpy(buf, &x, sizeof(uint16_t));
-}
-
-void put_uint32be(uint8_t *buf, uint32_t n) {
-  uint32_t x = htonl(n);
-  memcpy(buf, &x, sizeof(uint32_t));
-}
-
-uint16_t get_uint16(const uint8_t *data) {
-  uint16_t n;
-  memcpy(&n, data, sizeof(uint16_t));
-  return ntohs(n);
-}
-
-uint32_t get_uint32(const uint8_t *data) {
-  uint32_t n;
-  memcpy(&n, data, sizeof(uint32_t));
-  return ntohl(n);
-}
-
-uint64_t get_uint64(const uint8_t *data) {
-  uint64_t n = 0;
-  n += static_cast<uint64_t>(data[0]) << 56;
-  n += static_cast<uint64_t>(data[1]) << 48;
-  n += static_cast<uint64_t>(data[2]) << 40;
-  n += static_cast<uint64_t>(data[3]) << 32;
-  n += static_cast<uint64_t>(data[4]) << 24;
-  n += data[5] << 16;
-  n += data[6] << 8;
-  n += data[7];
-  return n;
-}
-
-int read_mime_types(std::map<std::string, std::string> &res,
-                    const char *filename) {
-  std::ifstream infile(filename);
-  if (!infile) {
-    return -1;
-  }
-
-  auto delim_pred = [](char c) { return c == ' ' || c == '\t'; };
-
-  std::string line;
-  while (std::getline(infile, line)) {
-    if (line.empty() || line[0] == '#') {
-      continue;
-    }
-
-    auto type_end = std::find_if(std::begin(line), std::end(line), delim_pred);
-    if (type_end == std::begin(line)) {
-      continue;
-    }
-
-    auto ext_end = type_end;
-    for (;;) {
-      auto ext_start = std::find_if_not(ext_end, std::end(line), delim_pred);
-      if (ext_start == std::end(line)) {
-        break;
-      }
-      ext_end = std::find_if(ext_start, std::end(line), delim_pred);
-#ifdef HAVE_STD_MAP_EMPLACE
-      res.emplace(std::string(ext_start, ext_end),
-                  std::string(std::begin(line), type_end));
-#else  // !HAVE_STD_MAP_EMPLACE
-      res.insert(std::make_pair(std::string(ext_start, ext_end),
-                                std::string(std::begin(line), type_end)));
-#endif // !HAVE_STD_MAP_EMPLACE
-    }
-  }
-
-  return 0;
-}
-
-StringRef percent_decode(BlockAllocator &balloc, const StringRef &src) {
-  auto iov = make_byte_ref(balloc, src.size() * 3 + 1);
-  auto p = iov.base;
-  for (auto first = std::begin(src); first != std::end(src); ++first) {
-    if (*first != '%') {
-      *p++ = *first;
-      continue;
-    }
-
-    if (first + 1 != std::end(src) && first + 2 != std::end(src) &&
-        is_hex_digit(*(first + 1)) && is_hex_digit(*(first + 2))) {
-      *p++ = (hex_to_uint(*(first + 1)) << 4) + hex_to_uint(*(first + 2));
-      first += 2;
-      continue;
-    }
-
-    *p++ = *first;
-  }
-  *p = '\0';
-  return StringRef{iov.base, p};
-}
-
-// Returns x**y
-double int_pow(double x, size_t y) {
-  auto res = 1.;
-  for (; y; --y) {
-    res *= x;
-  }
-  return res;
-}
-
-uint32_t hash32(const StringRef &s) {
-  /* 32 bit FNV-1a: http://isthe.com/chongo/tech/comp/fnv/ */
-  uint32_t h = 2166136261u;
-  size_t i;
-
-  for (i = 0; i < s.size(); ++i) {
-    h ^= s[i];
-    h += (h << 1) + (h << 4) + (h << 7) + (h << 8) + (h << 24);
-  }
-
-  return h;
-}
-
-#if !OPENSSL_1_1_API
-namespace {
-EVP_MD_CTX *EVP_MD_CTX_new(void) { return EVP_MD_CTX_create(); }
-} // namespace
-
-namespace {
-void EVP_MD_CTX_free(EVP_MD_CTX *ctx) { EVP_MD_CTX_destroy(ctx); }
-} // namespace
-#endif // !OPENSSL_1_1_API
-
-int sha256(uint8_t *res, const StringRef &s) {
-  int rv;
-
-  auto ctx = EVP_MD_CTX_new();
-  if (ctx == nullptr) {
-    return -1;
-  }
-
-  auto ctx_deleter = defer(EVP_MD_CTX_free, ctx);
-
-  rv = EVP_DigestInit_ex(ctx, EVP_sha256(), nullptr);
-  if (rv != 1) {
-    return -1;
-  }
-
-  rv = EVP_DigestUpdate(ctx, s.c_str(), s.size());
-  if (rv != 1) {
-    return -1;
-  }
-
-  unsigned int mdlen = 32;
-
-  rv = EVP_DigestFinal_ex(ctx, res, &mdlen);
-  if (rv != 1) {
-    return -1;
-  }
-
-  return 0;
-}
-
-bool is_hex_string(const StringRef &s) {
-  if (s.size() % 2) {
-    return false;
-  }
-
-  for (auto c : s) {
-    if (!is_hex_digit(c)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-StringRef decode_hex(BlockAllocator &balloc, const StringRef &s) {
-  auto iov = make_byte_ref(balloc, s.size() + 1);
-  auto p = iov.base;
-  for (auto it = std::begin(s); it != std::end(s); it += 2) {
-    *p++ = (hex_to_uint(*it) << 4) | hex_to_uint(*(it + 1));
-  }
-  *p = '\0';
-  return StringRef{iov.base, p};
-}
-
-StringRef extract_host(const StringRef &hostport) {
-  if (hostport[0] == '[') {
-    // assume this is IPv6 numeric address
-    auto p = std::find(std::begin(hostport), std::end(hostport), ']');
-    if (p == std::end(hostport)) {
-      return StringRef{};
-    }
-    if (p + 1 < std::end(hostport) && *(p + 1) != ':') {
-      return StringRef{};
-    }
-    return StringRef{std::begin(hostport), p + 1};
-  }
-
-  auto p = std::find(std::begin(hostport), std::end(hostport), ':');
-  if (p == std::begin(hostport)) {
-    return StringRef{};
-  }
-  return StringRef{std::begin(hostport), p};
-}
-
-std::mt19937 make_mt19937() {
-  std::random_device rd;
-  return std::mt19937(rd());
-}
-
-} // namespace util
-
-} // namespace nghttp2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,768 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef UTIL_H
-#define UTIL_H
-
-#include "nghttp2_config.h"
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-#include <getopt.h>
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif // HAVE_NETDB_H
-
-#include <cmath>
-#include <cstring>
-#include <cassert>
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <sstream>
-#include <memory>
-#include <chrono>
-#include <map>
-#include <random>
-
-#include "http-parser/http_parser.h"
-
-#include "template.h"
-#include "network.h"
-#include "allocator.h"
-
-namespace nghttp2 {
-
-constexpr auto NGHTTP2_H2_ALPN = StringRef::from_lit("\x2h2");
-constexpr auto NGHTTP2_H2 = StringRef::from_lit("h2");
-
-// The additional HTTP/2 protocol ALPN protocol identifier we also
-// supports for our applications to make smooth migration into final
-// h2 ALPN ID.
-constexpr auto NGHTTP2_H2_16_ALPN = StringRef::from_lit("\x5h2-16");
-constexpr auto NGHTTP2_H2_16 = StringRef::from_lit("h2-16");
-
-constexpr auto NGHTTP2_H2_14_ALPN = StringRef::from_lit("\x5h2-14");
-constexpr auto NGHTTP2_H2_14 = StringRef::from_lit("h2-14");
-
-constexpr auto NGHTTP2_H1_1_ALPN = StringRef::from_lit("\x8http/1.1");
-constexpr auto NGHTTP2_H1_1 = StringRef::from_lit("http/1.1");
-
-constexpr size_t NGHTTP2_MAX_UINT64_DIGITS = str_size("18446744073709551615");
-
-namespace util {
-
-inline bool is_alpha(const char c) {
-  return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
-}
-
-inline bool is_digit(const char c) { return '0' <= c && c <= '9'; }
-
-inline bool is_hex_digit(const char c) {
-  return is_digit(c) || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f');
-}
-
-// Returns true if |s| is hex string.
-bool is_hex_string(const StringRef &s);
-
-bool in_rfc3986_unreserved_chars(const char c);
-
-bool in_rfc3986_sub_delims(const char c);
-
-// Returns true if |c| is in token (HTTP-p1, Section 3.2.6)
-bool in_token(char c);
-
-bool in_attr_char(char c);
-
-// Returns integer corresponding to hex notation |c|.  If
-// is_hex_digit(c) is false, it returns 256.
-uint32_t hex_to_uint(char c);
-
-std::string percent_encode(const unsigned char *target, size_t len);
-
-std::string percent_encode(const std::string &target);
-
-// percent-encode path component of URI |s|.
-std::string percent_encode_path(const std::string &s);
-
-template <typename InputIt>
-std::string percent_decode(InputIt first, InputIt last) {
-  std::string result;
-  result.resize(last - first);
-  auto p = std::begin(result);
-  for (; first != last; ++first) {
-    if (*first != '%') {
-      *p++ = *first;
-      continue;
-    }
-
-    if (first + 1 != last && first + 2 != last && is_hex_digit(*(first + 1)) &&
-        is_hex_digit(*(first + 2))) {
-      *p++ = (hex_to_uint(*(first + 1)) << 4) + hex_to_uint(*(first + 2));
-      first += 2;
-      continue;
-    }
-
-    *p++ = *first;
-  }
-  result.resize(p - std::begin(result));
-  return result;
-}
-
-StringRef percent_decode(BlockAllocator &balloc, const StringRef &src);
-
-// Percent encode |target| if character is not in token or '%'.
-StringRef percent_encode_token(BlockAllocator &balloc, const StringRef &target);
-
-// Returns quotedString version of |target|.  Currently, this function
-// just replace '"' with '\"'.
-StringRef quote_string(BlockAllocator &balloc, const StringRef &target);
-
-std::string format_hex(const unsigned char *s, size_t len);
-
-template <size_t N> std::string format_hex(const unsigned char (&s)[N]) {
-  return format_hex(s, N);
-}
-
-template <size_t N> std::string format_hex(const std::array<uint8_t, N> &s) {
-  return format_hex(s.data(), s.size());
-}
-
-StringRef format_hex(BlockAllocator &balloc, const StringRef &s);
-
-static constexpr char LOWER_XDIGITS[] = "0123456789abcdef";
-
-template <typename OutputIt>
-OutputIt format_hex(OutputIt it, const StringRef &s) {
-  for (auto cc : s) {
-    uint8_t c = cc;
-    *it++ = LOWER_XDIGITS[c >> 4];
-    *it++ = LOWER_XDIGITS[c & 0xf];
-  }
-
-  return it;
-}
-
-// decode_hex decodes hex string |s|, returns the decoded byte string.
-// This function assumes |s| is hex string, that is is_hex_string(s)
-// == true.
-StringRef decode_hex(BlockAllocator &balloc, const StringRef &s);
-
-// Returns given time |t| from epoch in HTTP Date format (e.g., Mon,
-// 10 Oct 2016 10:25:58 GMT).
-std::string http_date(time_t t);
-// Writes given time |t| from epoch in HTTP Date format into the
-// buffer pointed by |res|.  The buffer must be at least 29 bytes
-// long.  This function returns the one beyond the last position.
-char *http_date(char *res, time_t t);
-
-// Returns given time |t| from epoch in Common Log format (e.g.,
-// 03/Jul/2014:00:19:38 +0900)
-std::string common_log_date(time_t t);
-// Writes given time |t| from epoch in Common Log format into the
-// buffer pointed by |res|.  The buffer must be at least 26 bytes
-// long.  This function returns the one beyond the last position.
-char *common_log_date(char *res, time_t t);
-
-// Returns given millisecond |ms| from epoch in ISO 8601 format (e.g.,
-// 2014-11-15T12:58:24.741Z or 2014-11-15T12:58:24.741+09:00)
-std::string iso8601_date(int64_t ms);
-// Writes given time |t| from epoch in ISO 8601 format into the buffer
-// pointed by |res|.  The buffer must be at least 29 bytes long.  This
-// function returns the one beyond the last position.
-char *iso8601_date(char *res, int64_t ms);
-
-time_t parse_http_date(const StringRef &s);
-
-// Parses time formatted as "MMM DD HH:MM:SS YYYY [GMT]" (e.g., Feb 3
-// 00:55:52 2015 GMT), which is specifically used by OpenSSL
-// ASN1_TIME_print().
-time_t parse_openssl_asn1_time_print(const StringRef &s);
-
-char upcase(char c);
-
-inline char lowcase(char c) {
-  constexpr static unsigned char tbl[] = {
-      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,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
-      45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
-      60,  61,  62,  63,  64,  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-      'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
-      'z', 91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
-      105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-      120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
-      135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-      150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-      165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-      180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
-      195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
-      210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
-      225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-      240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
-      255,
-  };
-  return tbl[static_cast<unsigned char>(c)];
-}
-
-template <typename InputIterator1, typename InputIterator2>
-bool starts_with(InputIterator1 first1, InputIterator1 last1,
-                 InputIterator2 first2, InputIterator2 last2) {
-  if (last1 - first1 < last2 - first2) {
-    return false;
-  }
-  return std::equal(first2, last2, first1);
-}
-
-template <typename S, typename T> bool starts_with(const S &a, const T &b) {
-  return starts_with(a.begin(), a.end(), b.begin(), b.end());
-}
-
-struct CaseCmp {
-  bool operator()(char lhs, char rhs) const {
-    return lowcase(lhs) == lowcase(rhs);
-  }
-};
-
-template <typename InputIterator1, typename InputIterator2>
-bool istarts_with(InputIterator1 first1, InputIterator1 last1,
-                  InputIterator2 first2, InputIterator2 last2) {
-  if (last1 - first1 < last2 - first2) {
-    return false;
-  }
-  return std::equal(first2, last2, first1, CaseCmp());
-}
-
-template <typename S, typename T> bool istarts_with(const S &a, const T &b) {
-  return istarts_with(a.begin(), a.end(), b.begin(), b.end());
-}
-
-template <typename T, typename CharT, size_t N>
-bool istarts_with_l(const T &a, const CharT (&b)[N]) {
-  return istarts_with(a.begin(), a.end(), b, b + N - 1);
-}
-
-template <typename InputIterator1, typename InputIterator2>
-bool ends_with(InputIterator1 first1, InputIterator1 last1,
-               InputIterator2 first2, InputIterator2 last2) {
-  if (last1 - first1 < last2 - first2) {
-    return false;
-  }
-  return std::equal(first2, last2, last1 - (last2 - first2));
-}
-
-template <typename T, typename S> bool ends_with(const T &a, const S &b) {
-  return ends_with(a.begin(), a.end(), b.begin(), b.end());
-}
-
-template <typename T, typename CharT, size_t N>
-bool ends_with_l(const T &a, const CharT (&b)[N]) {
-  return ends_with(a.begin(), a.end(), b, b + N - 1);
-}
-
-template <typename InputIterator1, typename InputIterator2>
-bool iends_with(InputIterator1 first1, InputIterator1 last1,
-                InputIterator2 first2, InputIterator2 last2) {
-  if (last1 - first1 < last2 - first2) {
-    return false;
-  }
-  return std::equal(first2, last2, last1 - (last2 - first2), CaseCmp());
-}
-
-template <typename T, typename S> bool iends_with(const T &a, const S &b) {
-  return iends_with(a.begin(), a.end(), b.begin(), b.end());
-}
-
-template <typename T, typename CharT, size_t N>
-bool iends_with_l(const T &a, const CharT (&b)[N]) {
-  return iends_with(a.begin(), a.end(), b, b + N - 1);
-}
-
-template <typename InputIt1, typename InputIt2>
-bool strieq(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2) {
-  if (std::distance(first1, last1) != std::distance(first2, last2)) {
-    return false;
-  }
-
-  return std::equal(first1, last1, first2, CaseCmp());
-}
-
-template <typename T, typename S> bool strieq(const T &a, const S &b) {
-  return strieq(a.begin(), a.end(), b.begin(), b.end());
-}
-
-template <typename CharT, typename InputIt, size_t N>
-bool strieq_l(const CharT (&a)[N], InputIt b, size_t blen) {
-  return strieq(a, a + (N - 1), b, b + blen);
-}
-
-template <typename CharT, size_t N, typename T>
-bool strieq_l(const CharT (&a)[N], const T &b) {
-  return strieq(a, a + (N - 1), b.begin(), b.end());
-}
-
-template <typename InputIt1, typename InputIt2>
-bool streq(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2) {
-  if (std::distance(first1, last1) != std::distance(first2, last2)) {
-    return false;
-  }
-  return std::equal(first1, last1, first2);
-}
-
-template <typename T, typename S> bool streq(const T &a, const S &b) {
-  return streq(a.begin(), a.end(), b.begin(), b.end());
-}
-
-template <typename CharT, typename InputIt, size_t N>
-bool streq_l(const CharT (&a)[N], InputIt b, size_t blen) {
-  return streq(a, a + (N - 1), b, b + blen);
-}
-
-template <typename CharT, size_t N, typename T>
-bool streq_l(const CharT (&a)[N], const T &b) {
-  return streq(a, a + (N - 1), b.begin(), b.end());
-}
-
-// Returns true if |a| contains |b|.  If both |a| and |b| are empty,
-// this function returns false.
-template <typename S, typename T> bool strifind(const S &a, const T &b) {
-  return std::search(a.begin(), a.end(), b.begin(), b.end(), CaseCmp()) !=
-         a.end();
-}
-
-template <typename InputIt> void inp_strlower(InputIt first, InputIt last) {
-  std::transform(first, last, first, lowcase);
-}
-
-// Lowercase |s| in place.
-inline void inp_strlower(std::string &s) {
-  inp_strlower(std::begin(s), std::end(s));
-}
-
-// Returns string representation of |n| with 2 fractional digits.
-std::string dtos(double n);
-
-template <typename T> std::string utos(T n) {
-  std::string res;
-  if (n == 0) {
-    res = "0";
-    return res;
-  }
-  size_t nlen = 0;
-  for (auto t = n; t; t /= 10, ++nlen)
-    ;
-  res.resize(nlen);
-  for (; n; n /= 10) {
-    res[--nlen] = (n % 10) + '0';
-  }
-  return res;
-}
-
-template <typename T, typename OutputIt> OutputIt utos(OutputIt dst, T n) {
-  if (n == 0) {
-    *dst++ = '0';
-    return dst;
-  }
-  size_t nlen = 0;
-  for (auto t = n; t; t /= 10, ++nlen)
-    ;
-  auto p = dst + nlen;
-  auto res = p;
-  for (; n; n /= 10) {
-    *--p = (n % 10) + '0';
-  }
-  return res;
-}
-
-template <typename T>
-StringRef make_string_ref_uint(BlockAllocator &balloc, T n) {
-  auto iov = make_byte_ref(balloc, NGHTTP2_MAX_UINT64_DIGITS + 1);
-  auto p = iov.base;
-  p = util::utos(p, n);
-  *p = '\0';
-  return StringRef{iov.base, p};
-}
-
-template <typename T> std::string utos_unit(T n) {
-  char u = 0;
-  if (n >= (1 << 30)) {
-    u = 'G';
-    n /= (1 << 30);
-  } else if (n >= (1 << 20)) {
-    u = 'M';
-    n /= (1 << 20);
-  } else if (n >= (1 << 10)) {
-    u = 'K';
-    n /= (1 << 10);
-  }
-  if (u == 0) {
-    return utos(n);
-  }
-  return utos(n) + u;
-}
-
-// Like utos_unit(), but 2 digits fraction part is followed.
-template <typename T> std::string utos_funit(T n) {
-  char u = 0;
-  int b = 0;
-  if (n >= (1 << 30)) {
-    u = 'G';
-    b = 30;
-  } else if (n >= (1 << 20)) {
-    u = 'M';
-    b = 20;
-  } else if (n >= (1 << 10)) {
-    u = 'K';
-    b = 10;
-  }
-  if (b == 0) {
-    return utos(n);
-  }
-  return dtos(static_cast<double>(n) / (1 << b)) + u;
-}
-
-extern const char UPPER_XDIGITS[];
-
-template <typename T> std::string utox(T n) {
-  std::string res;
-  if (n == 0) {
-    res = "0";
-    return res;
-  }
-  int i = 0;
-  T t = n;
-  for (; t; t /= 16, ++i)
-    ;
-  res.resize(i);
-  --i;
-  for (; n; --i, n /= 16) {
-    res[i] = UPPER_XDIGITS[(n & 0x0f)];
-  }
-  return res;
-}
-
-void to_token68(std::string &base64str);
-
-StringRef to_base64(BlockAllocator &balloc, const StringRef &token68str);
-
-void show_candidates(const char *unkopt, const option *options);
-
-bool has_uri_field(const http_parser_url &u, http_parser_url_fields field);
-
-bool fieldeq(const char *uri1, const http_parser_url &u1, const char *uri2,
-             const http_parser_url &u2, http_parser_url_fields field);
-
-bool fieldeq(const char *uri, const http_parser_url &u,
-             http_parser_url_fields field, const char *t);
-
-bool fieldeq(const char *uri, const http_parser_url &u,
-             http_parser_url_fields field, const StringRef &t);
-
-StringRef get_uri_field(const char *uri, const http_parser_url &u,
-                        http_parser_url_fields field);
-
-uint16_t get_default_port(const char *uri, const http_parser_url &u);
-
-bool porteq(const char *uri1, const http_parser_url &u1, const char *uri2,
-            const http_parser_url &u2);
-
-void write_uri_field(std::ostream &o, const char *uri, const http_parser_url &u,
-                     http_parser_url_fields field);
-
-bool numeric_host(const char *hostname);
-
-bool numeric_host(const char *hostname, int family);
-
-// Returns numeric address string of |addr|.  If getnameinfo() is
-// failed, "unknown" is returned.
-std::string numeric_name(const struct sockaddr *sa, socklen_t salen);
-
-// Returns string representation of numeric address and port of
-// |addr|.  If address family is AF_UNIX, this return path to UNIX
-// domain socket.  Otherwise, the format is like <HOST>:<PORT>.  For
-// IPv6 address, address is enclosed by square brackets ([]).
-std::string to_numeric_addr(const Address *addr);
-
-// Sets |port| to |addr|.
-void set_port(Address &addr, uint16_t port);
-
-// Returns ASCII dump of |data| of length |len|.  Only ASCII printable
-// characters are preserved.  Other characters are replaced with ".".
-std::string ascii_dump(const uint8_t *data, size_t len);
-
-// Returns absolute path of executable path.  If argc == 0 or |cwd| is
-// nullptr, this function returns nullptr.  If argv[0] starts with
-// '/', this function returns argv[0].  Oterwise return cwd + "/" +
-// argv[0].  If non-null is returned, it is NULL-terminated string and
-// dynamically allocated by malloc.  The caller is responsible to free
-// it.
-char *get_exec_path(int argc, char **const argv, const char *cwd);
-
-// Validates path so that it does not contain directory traversal
-// vector.  Returns true if path is safe.  The |path| must start with
-// "/" otherwise returns false.  This function should be called after
-// percent-decode was performed.
-bool check_path(const std::string &path);
-
-// Returns the |tv| value as 64 bit integer using a microsecond as an
-// unit.
-int64_t to_time64(const timeval &tv);
-
-// Returns true if ALPN ID |proto| is supported HTTP/2 protocol
-// identifier.
-bool check_h2_is_selected(const StringRef &proto);
-
-// Selects h2 protocol ALPN ID if one of supported h2 versions are
-// present in |in| of length inlen.  Returns true if h2 version is
-// selected.
-bool select_h2(const unsigned char **out, unsigned char *outlen,
-               const unsigned char *in, unsigned int inlen);
-
-// Selects protocol ALPN ID if one of identifiers contained in |protolist| is
-// present in |in| of length inlen.  Returns true if identifier is
-// selected.
-bool select_protocol(const unsigned char **out, unsigned char *outlen,
-                     const unsigned char *in, unsigned int inlen,
-                     std::vector<std::string> proto_list);
-
-// Returns default ALPN protocol list, which only contains supported
-// HTTP/2 protocol identifier.
-std::vector<unsigned char> get_default_alpn();
-
-// Parses delimited strings in |s| and returns the array of substring,
-// delimited by |delim|.  The any white spaces around substring are
-// treated as a part of substring.
-std::vector<std::string> parse_config_str_list(const StringRef &s,
-                                               char delim = ',');
-
-// Parses delimited strings in |s| and returns Substrings in |s|
-// delimited by |delim|.  The any white spaces around substring are
-// treated as a part of substring.
-std::vector<StringRef> split_str(const StringRef &s, char delim);
-
-// Writes given time |tp| in Common Log format (e.g.,
-// 03/Jul/2014:00:19:38 +0900) in buffer pointed by |out|.  The buffer
-// must be at least 27 bytes, including terminal NULL byte.  Expected
-// type of |tp| is std::chrono::time_point.  This function returns
-// StringRef wrapping the buffer pointed by |out|, and this string is
-// terminated by NULL.
-template <typename T> StringRef format_common_log(char *out, const T &tp) {
-  auto t =
-      std::chrono::duration_cast<std::chrono::seconds>(tp.time_since_epoch());
-  auto p = common_log_date(out, t.count());
-  *p = '\0';
-  return StringRef{out, p};
-}
-
-// Returns given time |tp| in ISO 8601 format (e.g.,
-// 2014-11-15T12:58:24.741Z or 2014-11-15T12:58:24.741+09:00).
-// Expected type of |tp| is std::chrono::time_point
-template <typename T> std::string format_iso8601(const T &tp) {
-  auto t = std::chrono::duration_cast<std::chrono::milliseconds>(
-      tp.time_since_epoch());
-  return iso8601_date(t.count());
-}
-
-// Writes given time |tp| in ISO 8601 format (e.g.,
-// 2014-11-15T12:58:24.741Z or 2014-11-15T12:58:24.741+09:00) in
-// buffer pointed by |out|.  The buffer must be at least 30 bytes,
-// including terminal NULL byte.  Expected type of |tp| is
-// std::chrono::time_point.  This function returns StringRef wrapping
-// the buffer pointed by |out|, and this string is terminated by NULL.
-template <typename T> StringRef format_iso8601(char *out, const T &tp) {
-  auto t = std::chrono::duration_cast<std::chrono::milliseconds>(
-      tp.time_since_epoch());
-  auto p = iso8601_date(out, t.count());
-  *p = '\0';
-  return StringRef{out, p};
-}
-
-// Writes given time |tp| in HTTP Date format (e.g., Mon, 10 Oct 2016
-// 10:25:58 GMT) in buffer pointed by |out|.  The buffer must be at
-// least 30 bytes, including terminal NULL byte.  Expected type of
-// |tp| is std::chrono::time_point.  This function returns StringRef
-// wrapping the buffer pointed by |out|, and this string is terminated
-// by NULL.
-template <typename T> StringRef format_http_date(char *out, const T &tp) {
-  auto t =
-      std::chrono::duration_cast<std::chrono::seconds>(tp.time_since_epoch());
-  auto p = http_date(out, t.count());
-  *p = '\0';
-  return StringRef{out, p};
-}
-
-// Return the system precision of the template parameter |Clock| as
-// a nanosecond value of type |Rep|
-template <typename Clock, typename Rep> Rep clock_precision() {
-  std::chrono::duration<Rep, std::nano> duration = typename Clock::duration(1);
-
-  return duration.count();
-}
-
-int make_socket_closeonexec(int fd);
-int make_socket_nonblocking(int fd);
-int make_socket_nodelay(int fd);
-
-int create_nonblock_socket(int family);
-
-bool check_socket_connected(int fd);
-
-// Returns the error code (errno) by inspecting SO_ERROR of given
-// |fd|.  This function returns the error code if it succeeds, or -1.
-// Returning 0 means no error.
-int get_socket_error(int fd);
-
-// Returns true if |host| is IPv6 numeric address (e.g., ::1)
-bool ipv6_numeric_addr(const char *host);
-
-// Parses NULL terminated string |s| as unsigned integer and returns
-// the parsed integer.  Additionally, if |s| ends with 'k', 'm', 'g'
-// and its upper case characters, multiply the integer by 1024, 1024 *
-// 1024 and 1024 * 1024 respectively.  If there is an error, returns
-// -1.
-int64_t parse_uint_with_unit(const char *s);
-// The following overload does not require |s| is NULL terminated.
-int64_t parse_uint_with_unit(const uint8_t *s, size_t len);
-int64_t parse_uint_with_unit(const StringRef &s);
-
-// Parses NULL terminated string |s| as unsigned integer and returns
-// the parsed integer.  If there is an error, returns -1.
-int64_t parse_uint(const char *s);
-// The following overload does not require |s| is NULL terminated.
-int64_t parse_uint(const uint8_t *s, size_t len);
-int64_t parse_uint(const std::string &s);
-int64_t parse_uint(const StringRef &s);
-
-// Parses NULL terminated string |s| as unsigned integer and returns
-// the parsed integer casted to double.  If |s| ends with "s", the
-// parsed value's unit is a second.  If |s| ends with "ms", the unit
-// is millisecond.  Similarly, it also supports 'm' and 'h' for
-// minutes and hours respectively.  If none of them are given, the
-// unit is second.  This function returns
-// std::numeric_limits<double>::infinity() if error occurs.
-double parse_duration_with_unit(const char *s);
-// The following overload does not require |s| is NULL terminated.
-double parse_duration_with_unit(const uint8_t *s, size_t len);
-double parse_duration_with_unit(const StringRef &s);
-
-// Returns string representation of time duration |t|.  If t has
-// fractional part (at least more than or equal to 1e-3), |t| is
-// multiplied by 1000 and the unit "ms" is appended.  Otherwise, |t|
-// is left as is and "s" is appended.
-std::string duration_str(double t);
-
-// Returns string representation of time duration |t|.  It appends
-// unit after the formatting.  The available units are s, ms and us.
-// The unit which is equal to or less than |t| is used and 2
-// fractional digits follow.
-std::string format_duration(const std::chrono::microseconds &u);
-
-// Just like above, but this takes |t| as seconds.
-std::string format_duration(double t);
-
-// Creates "host:port" string using given |host| and |port|.  If
-// |host| is numeric IPv6 address (e.g., ::1), it is enclosed by "["
-// and "]".  If |port| is 80 or 443, port part is omitted.
-StringRef make_http_hostport(BlockAllocator &balloc, const StringRef &host,
-                             uint16_t port);
-
-// Just like make_http_hostport(), but doesn't treat 80 and 443
-// specially.
-std::string make_hostport(const StringRef &host, uint16_t port);
-
-StringRef make_hostport(BlockAllocator &balloc, const StringRef &host,
-                        uint16_t port);
-
-// Dumps |src| of length |len| in the format similar to `hexdump -C`.
-void hexdump(FILE *out, const uint8_t *src, size_t len);
-
-// Copies 2 byte unsigned integer |n| in host byte order to |buf| in
-// network byte order.
-void put_uint16be(uint8_t *buf, uint16_t n);
-
-// Copies 4 byte unsigned integer |n| in host byte order to |buf| in
-// network byte order.
-void put_uint32be(uint8_t *buf, uint32_t n);
-
-// Retrieves 2 byte unsigned integer stored in |data| in network byte
-// order and returns it in host byte order.
-uint16_t get_uint16(const uint8_t *data);
-
-// Retrieves 4 byte unsigned integer stored in |data| in network byte
-// order and returns it in host byte order.
-uint32_t get_uint32(const uint8_t *data);
-
-// Retrieves 8 byte unsigned integer stored in |data| in network byte
-// order and returns it in host byte order.
-uint64_t get_uint64(const uint8_t *data);
-
-// Reads mime types file (see /etc/mime.types), and stores extension
-// -> MIME type map in |res|.  This function returns 0 if it succeeds,
-// or -1.
-int read_mime_types(std::map<std::string, std::string> &res,
-                    const char *filename);
-
-// Fills random alpha and digit byte to the range [|first|, |last|).
-// Returns the one beyond the |last|.
-template <typename OutputIt, typename Generator>
-OutputIt random_alpha_digit(OutputIt first, OutputIt last, Generator &gen) {
-  // If we use uint8_t instead char, gcc 6.2.0 complains by shouting
-  // char-array initialized from wide string.
-  static constexpr char s[] =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  std::uniform_int_distribution<> dis(0, 26 * 2 + 10 - 1);
-  for (; first != last; ++first) {
-    *first = s[dis(gen)];
-  }
-  return first;
-}
-
-template <typename OutputIterator, typename CharT, size_t N>
-OutputIterator copy_lit(OutputIterator it, CharT (&s)[N]) {
-  return std::copy_n(s, N - 1, it);
-}
-
-// Returns x**y
-double int_pow(double x, size_t y);
-
-uint32_t hash32(const StringRef &s);
-
-// Computes SHA-256 of |s|, and stores it in |buf|.  This function
-// returns 0 if it succeeds, or -1.
-int sha256(uint8_t *buf, const StringRef &s);
-
-// Returns host from |hostport|.  If host cannot be found in
-// |hostport|, returns empty string.  The returned string might not be
-// NULL-terminated.
-StringRef extract_host(const StringRef &hostport);
-
-// Returns new std::mt19937 object.
-std::mt19937 make_mt19937();
-
-} // namespace util
-
-} // namespace nghttp2
-
-#endif // UTIL_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util_test.cc cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util_test.cc
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util_test.cc	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util_test.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,631 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "util_test.h"
-
-#include <cstring>
-#include <iostream>
-#include <random>
-
-#include <CUnit/CUnit.h>
-
-#include <nghttp2/nghttp2.h>
-
-#include "util.h"
-#include "template.h"
-
-using namespace nghttp2;
-
-namespace shrpx {
-
-void test_util_streq(void) {
-  CU_ASSERT(
-      util::streq(StringRef::from_lit("alpha"), StringRef::from_lit("alpha")));
-  CU_ASSERT(!util::streq(StringRef::from_lit("alpha"),
-                         StringRef::from_lit("alphabravo")));
-  CU_ASSERT(!util::streq(StringRef::from_lit("alphabravo"),
-                         StringRef::from_lit("alpha")));
-  CU_ASSERT(
-      !util::streq(StringRef::from_lit("alpha"), StringRef::from_lit("alphA")));
-  CU_ASSERT(!util::streq(StringRef{}, StringRef::from_lit("a")));
-  CU_ASSERT(util::streq(StringRef{}, StringRef{}));
-  CU_ASSERT(!util::streq(StringRef::from_lit("alpha"), StringRef{}));
-
-  CU_ASSERT(
-      !util::streq(StringRef::from_lit("alph"), StringRef::from_lit("alpha")));
-  CU_ASSERT(
-      !util::streq(StringRef::from_lit("alpha"), StringRef::from_lit("alph")));
-  CU_ASSERT(
-      !util::streq(StringRef::from_lit("alpha"), StringRef::from_lit("alphA")));
-
-  CU_ASSERT(util::streq_l("alpha", "alpha", 5));
-  CU_ASSERT(util::streq_l("alpha", "alphabravo", 5));
-  CU_ASSERT(!util::streq_l("alpha", "alphabravo", 6));
-  CU_ASSERT(!util::streq_l("alphabravo", "alpha", 5));
-  CU_ASSERT(!util::streq_l("alpha", "alphA", 5));
-  CU_ASSERT(!util::streq_l("", "a", 1));
-  CU_ASSERT(util::streq_l("", "", 0));
-  CU_ASSERT(!util::streq_l("alpha", "", 0));
-}
-
-void test_util_strieq(void) {
-  CU_ASSERT(util::strieq(std::string("alpha"), std::string("alpha")));
-  CU_ASSERT(util::strieq(std::string("alpha"), std::string("AlPhA")));
-  CU_ASSERT(util::strieq(std::string(), std::string()));
-  CU_ASSERT(!util::strieq(std::string("alpha"), std::string("AlPhA ")));
-  CU_ASSERT(!util::strieq(std::string(), std::string("AlPhA ")));
-
-  CU_ASSERT(
-      util::strieq(StringRef::from_lit("alpha"), StringRef::from_lit("alpha")));
-  CU_ASSERT(
-      util::strieq(StringRef::from_lit("alpha"), StringRef::from_lit("AlPhA")));
-  CU_ASSERT(util::strieq(StringRef{}, StringRef{}));
-  CU_ASSERT(!util::strieq(StringRef::from_lit("alpha"),
-                          StringRef::from_lit("AlPhA ")));
-  CU_ASSERT(
-      !util::strieq(StringRef::from_lit(""), StringRef::from_lit("AlPhA ")));
-
-  CU_ASSERT(util::strieq_l("alpha", "alpha", 5));
-  CU_ASSERT(util::strieq_l("alpha", "AlPhA", 5));
-  CU_ASSERT(util::strieq_l("", static_cast<const char *>(nullptr), 0));
-  CU_ASSERT(!util::strieq_l("alpha", "AlPhA ", 6));
-  CU_ASSERT(!util::strieq_l("", "AlPhA ", 6));
-
-  CU_ASSERT(util::strieq_l("alpha", StringRef::from_lit("alpha")));
-  CU_ASSERT(util::strieq_l("alpha", StringRef::from_lit("AlPhA")));
-  CU_ASSERT(util::strieq_l("", StringRef{}));
-  CU_ASSERT(!util::strieq_l("alpha", StringRef::from_lit("AlPhA ")));
-  CU_ASSERT(!util::strieq_l("", StringRef::from_lit("AlPhA ")));
-}
-
-void test_util_inp_strlower(void) {
-  std::string a("alPha");
-  util::inp_strlower(a);
-  CU_ASSERT("alpha" == a);
-
-  a = "ALPHA123BRAVO";
-  util::inp_strlower(a);
-  CU_ASSERT("alpha123bravo" == a);
-
-  a = "";
-  util::inp_strlower(a);
-  CU_ASSERT("" == a);
-}
-
-void test_util_to_base64(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  CU_ASSERT("AAA++B/=" ==
-            util::to_base64(balloc, StringRef::from_lit("AAA--B_")));
-  CU_ASSERT("AAA++B/B" ==
-            util::to_base64(balloc, StringRef::from_lit("AAA--B_B")));
-}
-
-void test_util_to_token68(void) {
-  std::string x = "AAA++B/=";
-  util::to_token68(x);
-  CU_ASSERT("AAA--B_" == x);
-
-  x = "AAA++B/B";
-  util::to_token68(x);
-  CU_ASSERT("AAA--B_B" == x);
-}
-
-void test_util_percent_encode_token(void) {
-  BlockAllocator balloc(4096, 4096);
-  CU_ASSERT("h2" ==
-            util::percent_encode_token(balloc, StringRef::from_lit("h2")));
-  CU_ASSERT("h3~" ==
-            util::percent_encode_token(balloc, StringRef::from_lit("h3~")));
-  CU_ASSERT("100%25" ==
-            util::percent_encode_token(balloc, StringRef::from_lit("100%")));
-  CU_ASSERT("http%202" ==
-            util::percent_encode_token(balloc, StringRef::from_lit("http 2")));
-}
-
-void test_util_percent_encode_path(void) {
-  CU_ASSERT("/foo1/bar%3F&/%0A" == util::percent_encode_path("/foo1/bar?&/"
-                                                             "\x0a"));
-}
-
-void test_util_percent_decode(void) {
-  {
-    std::string s = "%66%6F%6f%62%61%72";
-    CU_ASSERT("foobar" == util::percent_decode(std::begin(s), std::end(s)));
-  }
-  {
-    std::string s = "%66%6";
-    CU_ASSERT("f%6" == util::percent_decode(std::begin(s), std::end(s)));
-  }
-  {
-    std::string s = "%66%";
-    CU_ASSERT("f%" == util::percent_decode(std::begin(s), std::end(s)));
-  }
-  BlockAllocator balloc(1024, 1024);
-
-  CU_ASSERT("foobar" == util::percent_decode(
-                            balloc, StringRef::from_lit("%66%6F%6f%62%61%72")));
-
-  CU_ASSERT("f%6" ==
-            util::percent_decode(balloc, StringRef::from_lit("%66%6")));
-
-  CU_ASSERT("f%" == util::percent_decode(balloc, StringRef::from_lit("%66%")));
-}
-
-void test_util_quote_string(void) {
-  BlockAllocator balloc(4096, 4096);
-  CU_ASSERT("alpha" ==
-            util::quote_string(balloc, StringRef::from_lit("alpha")));
-  CU_ASSERT("" == util::quote_string(balloc, StringRef::from_lit("")));
-  CU_ASSERT("\\\"alpha\\\"" ==
-            util::quote_string(balloc, StringRef::from_lit("\"alpha\"")));
-}
-
-void test_util_utox(void) {
-  CU_ASSERT("0" == util::utox(0));
-  CU_ASSERT("1" == util::utox(1));
-  CU_ASSERT("F" == util::utox(15));
-  CU_ASSERT("10" == util::utox(16));
-  CU_ASSERT("3B9ACA07" == util::utox(1000000007));
-  CU_ASSERT("100000000" == util::utox(1LL << 32));
-}
-
-void test_util_http_date(void) {
-  CU_ASSERT("Thu, 01 Jan 1970 00:00:00 GMT" == util::http_date(0));
-  CU_ASSERT("Wed, 29 Feb 2012 09:15:16 GMT" == util::http_date(1330506916));
-
-  std::array<char, 30> http_buf;
-
-  CU_ASSERT("Thu, 01 Jan 1970 00:00:00 GMT" ==
-            util::format_http_date(http_buf.data(),
-                                   std::chrono::system_clock::time_point()));
-  CU_ASSERT("Wed, 29 Feb 2012 09:15:16 GMT" ==
-            util::format_http_date(http_buf.data(),
-                                   std::chrono::system_clock::time_point(
-                                       std::chrono::seconds(1330506916))));
-}
-
-void test_util_select_h2(void) {
-  const unsigned char *out = NULL;
-  unsigned char outlen = 0;
-
-  // Check single entry and select it.
-  const unsigned char t1[] = "\x2h2";
-  CU_ASSERT(util::select_h2(&out, &outlen, t1, sizeof(t1) - 1));
-  CU_ASSERT(
-      memcmp(NGHTTP2_PROTO_VERSION_ID, out, NGHTTP2_PROTO_VERSION_ID_LEN) == 0);
-  CU_ASSERT(NGHTTP2_PROTO_VERSION_ID_LEN == outlen);
-
-  out = NULL;
-  outlen = 0;
-
-  // Check the case where id is correct but length is invalid and too
-  // long.
-  const unsigned char t2[] = "\x6h2-14";
-  CU_ASSERT(!util::select_h2(&out, &outlen, t2, sizeof(t2) - 1));
-
-  // Check the case where h2 is located after bogus ID.
-  const unsigned char t3[] = "\x2h3\x2h2";
-  CU_ASSERT(util::select_h2(&out, &outlen, t3, sizeof(t3) - 1));
-
-  CU_ASSERT(
-      memcmp(NGHTTP2_PROTO_VERSION_ID, out, NGHTTP2_PROTO_VERSION_ID_LEN) == 0);
-  CU_ASSERT(NGHTTP2_PROTO_VERSION_ID_LEN == outlen);
-
-  out = NULL;
-  outlen = 0;
-
-  // Check the case that last entry's length is invalid and too long.
-  const unsigned char t4[] = "\x2h3\x6h2-14";
-  CU_ASSERT(!util::select_h2(&out, &outlen, t4, sizeof(t4) - 1));
-
-  // Check the case that all entries are not supported.
-  const unsigned char t5[] = "\x2h3\x2h4";
-  CU_ASSERT(!util::select_h2(&out, &outlen, t5, sizeof(t5) - 1));
-
-  // Check the case where 2 values are eligible, but last one is
-  // picked up because it has precedence over the other.
-  const unsigned char t6[] = "\x5h2-14\x5h2-16";
-  CU_ASSERT(util::select_h2(&out, &outlen, t6, sizeof(t6) - 1));
-  CU_ASSERT(util::streq(NGHTTP2_H2_16, StringRef{out, outlen}));
-}
-
-void test_util_ipv6_numeric_addr(void) {
-  CU_ASSERT(util::ipv6_numeric_addr("::1"));
-  CU_ASSERT(util::ipv6_numeric_addr("2001:0db8:85a3:0042:1000:8a2e:0370:7334"));
-  // IPv4
-  CU_ASSERT(!util::ipv6_numeric_addr("127.0.0.1"));
-  // not numeric address
-  CU_ASSERT(!util::ipv6_numeric_addr("localhost"));
-}
-
-void test_util_utos(void) {
-  uint8_t buf[32];
-
-  CU_ASSERT(("0" == StringRef{buf, util::utos(buf, 0)}));
-  CU_ASSERT(("123" == StringRef{buf, util::utos(buf, 123)}));
-  CU_ASSERT(("18446744073709551615" ==
-             StringRef{buf, util::utos(buf, 18446744073709551615ULL)}));
-}
-
-void test_util_make_string_ref_uint(void) {
-  BlockAllocator balloc(1024, 1024);
-
-  CU_ASSERT("0" == util::make_string_ref_uint(balloc, 0));
-  CU_ASSERT("123" == util::make_string_ref_uint(balloc, 123));
-  CU_ASSERT("18446744073709551615" ==
-            util::make_string_ref_uint(balloc, 18446744073709551615ULL));
-}
-
-void test_util_utos_unit(void) {
-  CU_ASSERT("0" == util::utos_unit(0));
-  CU_ASSERT("1023" == util::utos_unit(1023));
-  CU_ASSERT("1K" == util::utos_unit(1024));
-  CU_ASSERT("1K" == util::utos_unit(1025));
-  CU_ASSERT("1M" == util::utos_unit(1 << 20));
-  CU_ASSERT("1G" == util::utos_unit(1 << 30));
-  CU_ASSERT("1024G" == util::utos_unit(1LL << 40));
-}
-
-void test_util_utos_funit(void) {
-  CU_ASSERT("0" == util::utos_funit(0));
-  CU_ASSERT("1023" == util::utos_funit(1023));
-  CU_ASSERT("1.00K" == util::utos_funit(1024));
-  CU_ASSERT("1.00K" == util::utos_funit(1025));
-  CU_ASSERT("1.09K" == util::utos_funit(1119));
-  CU_ASSERT("1.27K" == util::utos_funit(1300));
-  CU_ASSERT("1.00M" == util::utos_funit(1 << 20));
-  CU_ASSERT("1.18M" == util::utos_funit(1234567));
-  CU_ASSERT("1.00G" == util::utos_funit(1 << 30));
-  CU_ASSERT("4492450797.23G" == util::utos_funit(4823732313248234343LL));
-  CU_ASSERT("1024.00G" == util::utos_funit(1LL << 40));
-}
-
-void test_util_parse_uint_with_unit(void) {
-  CU_ASSERT(0 == util::parse_uint_with_unit("0"));
-  CU_ASSERT(1023 == util::parse_uint_with_unit("1023"));
-  CU_ASSERT(1024 == util::parse_uint_with_unit("1k"));
-  CU_ASSERT(2048 == util::parse_uint_with_unit("2K"));
-  CU_ASSERT(1 << 20 == util::parse_uint_with_unit("1m"));
-  CU_ASSERT(1 << 21 == util::parse_uint_with_unit("2M"));
-  CU_ASSERT(1 << 30 == util::parse_uint_with_unit("1g"));
-  CU_ASSERT(1LL << 31 == util::parse_uint_with_unit("2G"));
-  CU_ASSERT(9223372036854775807LL ==
-            util::parse_uint_with_unit("9223372036854775807"));
-  // check overflow case
-  CU_ASSERT(-1 == util::parse_uint_with_unit("9223372036854775808"));
-  CU_ASSERT(-1 == util::parse_uint_with_unit("10000000000000000000"));
-  CU_ASSERT(-1 == util::parse_uint_with_unit("9223372036854775807G"));
-  // bad characters
-  CU_ASSERT(-1 == util::parse_uint_with_unit("1.1"));
-  CU_ASSERT(-1 == util::parse_uint_with_unit("1a"));
-  CU_ASSERT(-1 == util::parse_uint_with_unit("a1"));
-  CU_ASSERT(-1 == util::parse_uint_with_unit("1T"));
-  CU_ASSERT(-1 == util::parse_uint_with_unit(""));
-}
-
-void test_util_parse_uint(void) {
-  CU_ASSERT(0 == util::parse_uint("0"));
-  CU_ASSERT(1023 == util::parse_uint("1023"));
-  CU_ASSERT(-1 == util::parse_uint("1k"));
-  CU_ASSERT(9223372036854775807LL == util::parse_uint("9223372036854775807"));
-  // check overflow case
-  CU_ASSERT(-1 == util::parse_uint("9223372036854775808"));
-  CU_ASSERT(-1 == util::parse_uint("10000000000000000000"));
-  // bad characters
-  CU_ASSERT(-1 == util::parse_uint("1.1"));
-  CU_ASSERT(-1 == util::parse_uint("1a"));
-  CU_ASSERT(-1 == util::parse_uint("a1"));
-  CU_ASSERT(-1 == util::parse_uint("1T"));
-  CU_ASSERT(-1 == util::parse_uint(""));
-}
-
-void test_util_parse_duration_with_unit(void) {
-  CU_ASSERT(0. == util::parse_duration_with_unit("0"));
-  CU_ASSERT(123. == util::parse_duration_with_unit("123"));
-  CU_ASSERT(123. == util::parse_duration_with_unit("123s"));
-  CU_ASSERT(0.500 == util::parse_duration_with_unit("500ms"));
-  CU_ASSERT(123. == util::parse_duration_with_unit("123S"));
-  CU_ASSERT(0.500 == util::parse_duration_with_unit("500MS"));
-  CU_ASSERT(180 == util::parse_duration_with_unit("3m"));
-  CU_ASSERT(3600 * 5 == util::parse_duration_with_unit("5h"));
-
-  auto err = std::numeric_limits<double>::infinity();
-  // check overflow case
-  CU_ASSERT(err == util::parse_duration_with_unit("9223372036854775808"));
-  // bad characters
-  CU_ASSERT(err == util::parse_duration_with_unit("0u"));
-  CU_ASSERT(err == util::parse_duration_with_unit("0xs"));
-  CU_ASSERT(err == util::parse_duration_with_unit("0mt"));
-  CU_ASSERT(err == util::parse_duration_with_unit("0mss"));
-  CU_ASSERT(err == util::parse_duration_with_unit("s"));
-  CU_ASSERT(err == util::parse_duration_with_unit("ms"));
-}
-
-void test_util_duration_str(void) {
-  CU_ASSERT("0" == util::duration_str(0.));
-  CU_ASSERT("1s" == util::duration_str(1.));
-  CU_ASSERT("500ms" == util::duration_str(0.5));
-  CU_ASSERT("1500ms" == util::duration_str(1.5));
-  CU_ASSERT("2m" == util::duration_str(120.));
-  CU_ASSERT("121s" == util::duration_str(121.));
-  CU_ASSERT("1h" == util::duration_str(3600.));
-}
-
-void test_util_format_duration(void) {
-  CU_ASSERT("0us" == util::format_duration(std::chrono::microseconds(0)));
-  CU_ASSERT("999us" == util::format_duration(std::chrono::microseconds(999)));
-  CU_ASSERT("1.00ms" == util::format_duration(std::chrono::microseconds(1000)));
-  CU_ASSERT("1.09ms" == util::format_duration(std::chrono::microseconds(1090)));
-  CU_ASSERT("1.01ms" == util::format_duration(std::chrono::microseconds(1009)));
-  CU_ASSERT("999.99ms" ==
-            util::format_duration(std::chrono::microseconds(999990)));
-  CU_ASSERT("1.00s" ==
-            util::format_duration(std::chrono::microseconds(1000000)));
-  CU_ASSERT("1.05s" ==
-            util::format_duration(std::chrono::microseconds(1050000)));
-
-  CU_ASSERT("0us" == util::format_duration(0.));
-  CU_ASSERT("999us" == util::format_duration(0.000999));
-  CU_ASSERT("1.00ms" == util::format_duration(0.001));
-  CU_ASSERT("1.09ms" == util::format_duration(0.00109));
-  CU_ASSERT("1.01ms" == util::format_duration(0.001009));
-  CU_ASSERT("999.99ms" == util::format_duration(0.99999));
-  CU_ASSERT("1.00s" == util::format_duration(1.));
-  CU_ASSERT("1.05s" == util::format_duration(1.05));
-}
-
-void test_util_starts_with(void) {
-  CU_ASSERT(util::starts_with(StringRef::from_lit("foo"),
-                              StringRef::from_lit("foo")));
-  CU_ASSERT(util::starts_with(StringRef::from_lit("fooo"),
-                              StringRef::from_lit("foo")));
-  CU_ASSERT(util::starts_with(StringRef::from_lit("ofoo"), StringRef{}));
-  CU_ASSERT(!util::starts_with(StringRef::from_lit("ofoo"),
-                               StringRef::from_lit("foo")));
-
-  CU_ASSERT(util::istarts_with(StringRef::from_lit("FOO"),
-                               StringRef::from_lit("fOO")));
-  CU_ASSERT(util::istarts_with(StringRef::from_lit("ofoo"), StringRef{}));
-  CU_ASSERT(util::istarts_with(StringRef::from_lit("fOOo"),
-                               StringRef::from_lit("Foo")));
-  CU_ASSERT(!util::istarts_with(StringRef::from_lit("ofoo"),
-                                StringRef::from_lit("foo")));
-
-  CU_ASSERT(util::istarts_with_l(StringRef::from_lit("fOOo"), "Foo"));
-  CU_ASSERT(!util::istarts_with_l(StringRef::from_lit("ofoo"), "foo"));
-}
-
-void test_util_ends_with(void) {
-  CU_ASSERT(
-      util::ends_with(StringRef::from_lit("foo"), StringRef::from_lit("foo")));
-  CU_ASSERT(util::ends_with(StringRef::from_lit("foo"), StringRef{}));
-  CU_ASSERT(
-      util::ends_with(StringRef::from_lit("ofoo"), StringRef::from_lit("foo")));
-  CU_ASSERT(
-      !util::ends_with(StringRef::from_lit("ofoo"), StringRef::from_lit("fo")));
-
-  CU_ASSERT(
-      util::iends_with(StringRef::from_lit("fOo"), StringRef::from_lit("Foo")));
-  CU_ASSERT(util::iends_with(StringRef::from_lit("foo"), StringRef{}));
-  CU_ASSERT(util::iends_with(StringRef::from_lit("oFoo"),
-                             StringRef::from_lit("fOO")));
-  CU_ASSERT(!util::iends_with(StringRef::from_lit("ofoo"),
-                              StringRef::from_lit("fo")));
-
-  CU_ASSERT(util::iends_with_l(StringRef::from_lit("oFoo"), "fOO"));
-  CU_ASSERT(!util::iends_with_l(StringRef::from_lit("ofoo"), "fo"));
-}
-
-void test_util_parse_http_date(void) {
-  CU_ASSERT(1001939696 == util::parse_http_date(StringRef::from_lit(
-                              "Mon, 1 Oct 2001 12:34:56 GMT")));
-}
-
-void test_util_localtime_date(void) {
-  auto tz = getenv("TZ");
-  if (tz) {
-    tz = strdup(tz);
-  }
-  setenv("TZ", ":Pacific/Auckland", 1);
-  tzset();
-
-  CU_ASSERT_STRING_EQUAL("02/Oct/2001:00:34:56 +1200",
-                         util::common_log_date(1001939696).c_str());
-  CU_ASSERT_STRING_EQUAL("2001-10-02T00:34:56.123+12:00",
-                         util::iso8601_date(1001939696000LL + 123).c_str());
-
-  std::array<char, 27> common_buf;
-
-  CU_ASSERT("02/Oct/2001:00:34:56 +1200" ==
-            util::format_common_log(common_buf.data(),
-                                    std::chrono::system_clock::time_point(
-                                        std::chrono::seconds(1001939696))));
-
-  std::array<char, 30> iso8601_buf;
-
-  CU_ASSERT(
-      "2001-10-02T00:34:56.123+12:00" ==
-      util::format_iso8601(iso8601_buf.data(),
-                           std::chrono::system_clock::time_point(
-                               std::chrono::milliseconds(1001939696123LL))));
-
-  if (tz) {
-    setenv("TZ", tz, 1);
-    free(tz);
-  } else {
-    unsetenv("TZ");
-  }
-  tzset();
-}
-
-void test_util_get_uint64(void) {
-  {
-    auto v = std::array<unsigned char, 8>{
-        {0x01, 0x12, 0x34, 0x56, 0xff, 0x9a, 0xab, 0xbc}};
-
-    auto n = util::get_uint64(v.data());
-
-    CU_ASSERT(0x01123456ff9aabbcULL == n);
-  }
-  {
-    auto v = std::array<unsigned char, 8>{
-        {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
-
-    auto n = util::get_uint64(v.data());
-
-    CU_ASSERT(0xffffffffffffffffULL == n);
-  }
-}
-
-void test_util_parse_config_str_list(void) {
-  auto res = util::parse_config_str_list(StringRef::from_lit("a"));
-  CU_ASSERT(1 == res.size());
-  CU_ASSERT("a" == res[0]);
-
-  res = util::parse_config_str_list(StringRef::from_lit("a,"));
-  CU_ASSERT(2 == res.size());
-  CU_ASSERT("a" == res[0]);
-  CU_ASSERT("" == res[1]);
-
-  res = util::parse_config_str_list(StringRef::from_lit(":a::"), ':');
-  CU_ASSERT(4 == res.size());
-  CU_ASSERT("" == res[0]);
-  CU_ASSERT("a" == res[1]);
-  CU_ASSERT("" == res[2]);
-  CU_ASSERT("" == res[3]);
-
-  res = util::parse_config_str_list(StringRef{});
-  CU_ASSERT(1 == res.size());
-  CU_ASSERT("" == res[0]);
-
-  res = util::parse_config_str_list(StringRef::from_lit("alpha,bravo,charlie"));
-  CU_ASSERT(3 == res.size());
-  CU_ASSERT("alpha" == res[0]);
-  CU_ASSERT("bravo" == res[1]);
-  CU_ASSERT("charlie" == res[2]);
-}
-
-void test_util_make_http_hostport(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  CU_ASSERT("localhost" == util::make_http_hostport(
-                               balloc, StringRef::from_lit("localhost"), 80));
-  CU_ASSERT("[::1]" ==
-            util::make_http_hostport(balloc, StringRef::from_lit("::1"), 443));
-  CU_ASSERT(
-      "localhost:3000" ==
-      util::make_http_hostport(balloc, StringRef::from_lit("localhost"), 3000));
-}
-
-void test_util_make_hostport(void) {
-  CU_ASSERT("localhost:80" ==
-            util::make_hostport(StringRef::from_lit("localhost"), 80));
-  CU_ASSERT("[::1]:443" ==
-            util::make_hostport(StringRef::from_lit("::1"), 443));
-
-  BlockAllocator balloc(4096, 4096);
-  CU_ASSERT("localhost:80" ==
-            util::make_hostport(balloc, StringRef::from_lit("localhost"), 80));
-  CU_ASSERT("[::1]:443" ==
-            util::make_hostport(balloc, StringRef::from_lit("::1"), 443));
-}
-
-void test_util_strifind(void) {
-  CU_ASSERT(util::strifind(StringRef::from_lit("gzip, deflate, bzip2"),
-                           StringRef::from_lit("gzip")));
-
-  CU_ASSERT(util::strifind(StringRef::from_lit("gzip, deflate, bzip2"),
-                           StringRef::from_lit("dEflate")));
-
-  CU_ASSERT(util::strifind(StringRef::from_lit("gzip, deflate, bzip2"),
-                           StringRef::from_lit("BZIP2")));
-
-  CU_ASSERT(util::strifind(StringRef::from_lit("nghttp2"), StringRef{}));
-
-  // Be aware this fact
-  CU_ASSERT(!util::strifind(StringRef{}, StringRef{}));
-
-  CU_ASSERT(!util::strifind(StringRef::from_lit("nghttp2"),
-                            StringRef::from_lit("http1")));
-}
-
-void test_util_random_alpha_digit(void) {
-  std::random_device rd;
-  std::mt19937 gen(rd());
-  std::array<uint8_t, 19> data;
-
-  auto p = util::random_alpha_digit(std::begin(data), std::end(data), gen);
-
-  CU_ASSERT(std::end(data) == p);
-
-  for (auto b : data) {
-    CU_ASSERT(('A' <= b && b <= 'Z') || ('a' <= b && b <= 'z') ||
-              ('0' <= b && b <= '9'));
-  }
-}
-
-void test_util_format_hex(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  CU_ASSERT("0ff0" ==
-            util::format_hex(balloc, StringRef::from_lit("\x0f\xf0")));
-  CU_ASSERT("" == util::format_hex(balloc, StringRef::from_lit("")));
-}
-
-void test_util_is_hex_string(void) {
-  CU_ASSERT(util::is_hex_string(StringRef{}));
-  CU_ASSERT(util::is_hex_string(StringRef::from_lit("0123456789abcdef")));
-  CU_ASSERT(util::is_hex_string(StringRef::from_lit("0123456789ABCDEF")));
-  CU_ASSERT(!util::is_hex_string(StringRef::from_lit("000")));
-  CU_ASSERT(!util::is_hex_string(StringRef::from_lit("XX")));
-}
-
-void test_util_decode_hex(void) {
-  BlockAllocator balloc(4096, 4096);
-
-  CU_ASSERT("\x0f\xf0" ==
-            util::decode_hex(balloc, StringRef::from_lit("0ff0")));
-  CU_ASSERT("" == util::decode_hex(balloc, StringRef{}));
-}
-
-void test_util_extract_host(void) {
-  CU_ASSERT(StringRef::from_lit("foo") ==
-            util::extract_host(StringRef::from_lit("foo")));
-  CU_ASSERT(StringRef::from_lit("foo") ==
-            util::extract_host(StringRef::from_lit("foo:")));
-  CU_ASSERT(StringRef::from_lit("foo") ==
-            util::extract_host(StringRef::from_lit("foo:0")));
-  CU_ASSERT(StringRef::from_lit("[::1]") ==
-            util::extract_host(StringRef::from_lit("[::1]")));
-  CU_ASSERT(StringRef::from_lit("[::1]") ==
-            util::extract_host(StringRef::from_lit("[::1]:")));
-
-  CU_ASSERT(util::extract_host(StringRef::from_lit(":foo")).empty());
-  CU_ASSERT(util::extract_host(StringRef::from_lit("[::1")).empty());
-  CU_ASSERT(util::extract_host(StringRef::from_lit("[::1]0")).empty());
-  CU_ASSERT(util::extract_host(StringRef{}).empty());
-}
-
-} // namespace shrpx
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/util_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/util_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef UTIL_TEST_H
-#define UTIL_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif // HAVE_CONFIG_H
-
-namespace shrpx {
-
-void test_util_streq(void);
-void test_util_strieq(void);
-void test_util_inp_strlower(void);
-void test_util_to_base64(void);
-void test_util_to_token68(void);
-void test_util_percent_encode_token(void);
-void test_util_percent_encode_path(void);
-void test_util_percent_decode(void);
-void test_util_quote_string(void);
-void test_util_utox(void);
-void test_util_http_date(void);
-void test_util_select_h2(void);
-void test_util_ipv6_numeric_addr(void);
-void test_util_utos(void);
-void test_util_make_string_ref_uint(void);
-void test_util_utos_unit(void);
-void test_util_utos_funit(void);
-void test_util_parse_uint_with_unit(void);
-void test_util_parse_uint(void);
-void test_util_parse_duration_with_unit(void);
-void test_util_duration_str(void);
-void test_util_format_duration(void);
-void test_util_starts_with(void);
-void test_util_ends_with(void);
-void test_util_parse_http_date(void);
-void test_util_localtime_date(void);
-void test_util_get_uint64(void);
-void test_util_parse_config_str_list(void);
-void test_util_make_http_hostport(void);
-void test_util_make_hostport(void);
-void test_util_strifind(void);
-void test_util_random_alpha_digit(void);
-void test_util_format_hex(void);
-void test_util_is_hex_string(void);
-void test_util_decode_hex(void);
-void test_util_extract_host(void);
-
-} // namespace shrpx
-
-#endif // UTIL_TEST_H
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "xsi_strerror.h"
-
-/* Make sure that we get XSI-compliant version of strerror_r */
-#ifdef _POSIX_C_SOURCE
-#  undef _POSIX_C_SOURCE
-#endif /* _POSIX_C_SOURCE */
-
-#ifdef _GNU_SOURCE
-#  undef _GNU_SOURCE
-#endif /* _GNU_SOURCE */
-
-#include <string.h>
-
-char *xsi_strerror(int errnum, char *buf, size_t buflen) {
-  int rv;
-
-  rv = strerror_r(errnum, buf, buflen);
-
-  if (rv != 0) {
-    if (buflen > 0) {
-      buf[0] = '\0';
-    }
-  }
-
-  return buf;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/src/xsi_strerror.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2016 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef XSI_STRERROR_H
-#define XSI_STRERROR_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Looks like error message is quite small, but we really don't know
-   how much longer they become. */
-#define STRERROR_BUFSIZE 256
-
-/*
- * Returns description of error denoted by |errnum|.  The description
- * is written in |buf| of length |buflen| including terminal NULL.  If
- * there is an error, including the case that buffer space is not
- * sufficient to include error message, and |buflen| > 0, empty string
- * is written to |buf|.  This function returns |buf|.
- */
-char *xsi_strerror(int errnum, char *buf, size_t buflen);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* XSI_STRERROR_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-# XXX testdata/: EXTRA_DIST = cacert.pem  index.html  privkey.pem
-if(HAVE_CUNIT)
-  string(REPLACE " " ";" c_flags "${WARNCFLAGS}")
-  add_compile_options(${c_flags})
-
-  include_directories(
-    "${CMAKE_SOURCE_DIR}/lib/includes"
-    "${CMAKE_SOURCE_DIR}/lib"
-    "${CMAKE_SOURCE_DIR}/src/includes"
-    "${CMAKE_BINARY_DIR}/lib/includes"
-    ${CUNIT_INCLUDE_DIRS}
-  )
-
-  set(MAIN_SOURCES
-    main.c nghttp2_pq_test.c nghttp2_map_test.c nghttp2_queue_test.c
-    nghttp2_test_helper.c
-    nghttp2_frame_test.c
-    nghttp2_stream_test.c
-    nghttp2_session_test.c
-    nghttp2_hd_test.c
-    nghttp2_npn_test.c
-    nghttp2_helper_test.c
-    nghttp2_buf_test.c
-  )
-
-  add_executable(main EXCLUDE_FROM_ALL
-    ${MAIN_SOURCES}
-  )
-  target_include_directories(main PRIVATE ${CUNIT_INCLUDE_DIRS})
-  target_link_libraries(main
-    nghttp2_static
-    ${CUNIT_LIBRARIES}
-  )
-  add_test(main main)
-  add_dependencies(check main)
-
-  if(ENABLE_FAILMALLOC)
-    set(FAILMALLOC_SOURCES
-      failmalloc.c failmalloc_test.c
-      malloc_wrapper.c
-      nghttp2_test_helper.c
-    )
-    add_executable(failmalloc EXCLUDE_FROM_ALL
-      ${FAILMALLOC_SOURCES}
-    )
-    target_link_libraries(failmalloc
-      nghttp2_static
-      ${CUNIT_LIBRARIES}
-    )
-    add_test(failmalloc failmalloc)
-    add_dependencies(check failmalloc)
-  endif()
-
-  if(ENABLE_APP)
-    # EXTRA_DIST = end_to_end.py
-    # TESTS += end_to_end.py
-  endif()
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/end_to_end.py cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/end_to_end.py
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/end_to_end.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/end_to_end.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-#!/usr/bin/env python
-"""End to end tests for the utility programs.
-
-This test assumes the utilities inside src directory have already been
-built.
-
-At the moment top_buiddir is not in the environment, but top_builddir would be
-more reliable than '..', so it's worth trying to pull it from the environment.
-"""
-
-__author__ = 'Jim Morrison <jim@twist.com>'
-
-
-import os
-import subprocess
-import time
-import unittest
-
-
-_PORT = 9893
-
-
-def _run_server(port, args):
-  srcdir = os.environ.get('srcdir', '.')
-  testdata = '%s/testdata' % srcdir
-  top_builddir = os.environ.get('top_builddir', '..')
-  base_args = ['%s/src/spdyd' % top_builddir, '-d', testdata]
-  if args:
-    base_args.extend(args)
-  base_args.extend([str(port), '%s/privkey.pem' % testdata,
-                    '%s/cacert.pem' % testdata])
-  return subprocess.Popen(base_args)
-
-def _check_server_up(port):
-  # Check this check for now.
-  time.sleep(1)
-
-def _kill_server(server):
-  while server.returncode is None:
-    server.terminate()
-    time.sleep(1)
-    server.poll()
-
-
-class EndToEndSpdyTests(unittest.TestCase):
-  @classmethod
-  def setUpClass(cls):
-    cls.setUpServer([])
-
-  @classmethod
-  def setUpServer(cls, args):
-    cls.server = _run_server(_PORT, args)
-    _check_server_up(_PORT)
-
-  @classmethod
-  def tearDownClass(cls):
-    _kill_server(cls.server)
-
-  def setUp(self):
-    build_dir = os.environ.get('top_builddir', '..')
-    self.client = '%s/src/spdycat' % build_dir
-    self.stdout = 'No output'
-
-  def call(self, path, args):
-     full_args = [self.client,'http://localhost:%d%s' % (_PORT, path)] + args
-     p = subprocess.Popen(full_args, stdout=subprocess.PIPE,
-                          stdin=subprocess.PIPE)
-     self.stdout, self.stderr = p.communicate()
-     return p.returncode
-
-
-class EndToEndSpdy2Tests(EndToEndSpdyTests):
-  def testSimpleRequest(self):
-    self.assertEquals(0, self.call('/', []))
-
-  def testSimpleRequestSpdy3(self):
-    self.assertEquals(0, self.call('/', ['-v', '-3']))
-    self.assertIn('NPN selected the protocol: spdy/3', self.stdout)
-
-  def testFailedRequests(self):
-    self.assertEquals(
-        2, self.call('/', ['https://localhost:25/', 'http://localhost:79']))
-
-  def testOneFailedRequest(self):
-    self.assertEquals(1, subprocess.call([self.client, 'http://localhost:2/']))
-
-  def testOneTimedOutRequest(self):
-    self.assertEquals(1, self.call('/?spdyd_do_not_respond_to_req=yes',
-                                   ['--timeout=2']))
-    self.assertEquals(0, self.call('/', ['--timeout=20']))
-
-
-class EndToEndSpdy3Tests(EndToEndSpdyTests):
-  @classmethod
-  def setUpClass(cls):
-    cls.setUpServer(['-3'])
-
-  def testSimpleRequest(self):
-    self.assertEquals(0, self.call('/', ['-v']))
-    self.assertIn('NPN selected the protocol: spdy/3', self.stdout)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <stdio.h>
-#include <string.h>
-#include <CUnit/Basic.h>
-/* include test cases' include files here */
-
-#include "failmalloc_test.h"
-
-static int init_suite1(void) { return 0; }
-
-static int clean_suite1(void) { return 0; }
-
-int main() {
-  CU_pSuite pSuite = NULL;
-  unsigned int num_tests_failed;
-
-  /* initialize the CUnit test registry */
-  if (CUE_SUCCESS != CU_initialize_registry())
-    return (int)CU_get_error();
-
-  /* add a suite to the registry */
-  pSuite = CU_add_suite("libnghttp2_TestSuite", init_suite1, clean_suite1);
-  if (NULL == pSuite) {
-    CU_cleanup_registry();
-    return (int)CU_get_error();
-  }
-
-  /* add the tests to the suite */
-  if (!CU_add_test(pSuite, "failmalloc_session_send",
-                   test_nghttp2_session_send) ||
-      !CU_add_test(pSuite, "failmalloc_session_send_server",
-                   test_nghttp2_session_send_server) ||
-      !CU_add_test(pSuite, "failmalloc_session_recv",
-                   test_nghttp2_session_recv) ||
-      !CU_add_test(pSuite, "failmalloc_frame", test_nghttp2_frame) ||
-      !CU_add_test(pSuite, "failmalloc_hd", test_nghttp2_hd)) {
-    CU_cleanup_registry();
-    return (int)CU_get_error();
-  }
-
-  /* Run all tests using the CUnit Basic interface */
-  CU_basic_set_mode(CU_BRM_VERBOSE);
-  CU_basic_run_tests();
-  num_tests_failed = CU_get_number_of_tests_failed();
-  CU_cleanup_registry();
-  if (CU_get_error() == CUE_SUCCESS) {
-    return (int)num_tests_failed;
-  } else {
-    printf("CUnit Error: %s\n", CU_get_error_msg());
-    return (int)CU_get_error();
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,576 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012, 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "failmalloc_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "nghttp2_session.h"
-#include "nghttp2_stream.h"
-#include "nghttp2_frame.h"
-#include "nghttp2_helper.h"
-#include "malloc_wrapper.h"
-#include "nghttp2_test_helper.h"
-
-typedef struct {
-  uint8_t data[8192];
-  uint8_t *datamark, *datalimit;
-} data_feed;
-
-typedef struct {
-  data_feed *df;
-  size_t data_source_length;
-} my_user_data;
-
-static void data_feed_init(data_feed *df, nghttp2_bufs *bufs) {
-  nghttp2_buf *buf;
-  size_t data_length;
-
-  buf = &bufs->head->buf;
-  data_length = nghttp2_buf_len(buf);
-
-  assert(data_length <= sizeof(df->data));
-  memcpy(df->data, buf->pos, data_length);
-  df->datamark = df->data;
-  df->datalimit = df->data + data_length;
-}
-
-static ssize_t null_send_callback(nghttp2_session *session, const uint8_t *data,
-                                  size_t len, int flags, void *user_data) {
-  (void)session;
-  (void)data;
-  (void)flags;
-  (void)user_data;
-
-  return (ssize_t)len;
-}
-
-static ssize_t data_feed_recv_callback(nghttp2_session *session, uint8_t *data,
-                                       size_t len, int flags, void *user_data) {
-  data_feed *df = ((my_user_data *)user_data)->df;
-  size_t avail = (size_t)(df->datalimit - df->datamark);
-  size_t wlen = nghttp2_min(avail, len);
-  (void)session;
-  (void)flags;
-
-  memcpy(data, df->datamark, wlen);
-  df->datamark += wlen;
-  return (ssize_t)wlen;
-}
-
-static ssize_t fixed_length_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  size_t wlen;
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)source;
-
-  if (len < ud->data_source_length) {
-    wlen = len;
-  } else {
-    wlen = ud->data_source_length;
-  }
-  ud->data_source_length -= wlen;
-  if (ud->data_source_length == 0) {
-    *data_flags = NGHTTP2_DATA_FLAG_EOF;
-  }
-  return (ssize_t)wlen;
-}
-
-#define TEST_FAILMALLOC_RUN(FUN)                                               \
-  do {                                                                         \
-    int nmalloc, i;                                                            \
-                                                                               \
-    nghttp2_failmalloc = 0;                                                    \
-    nghttp2_nmalloc = 0;                                                       \
-    FUN();                                                                     \
-    nmalloc = nghttp2_nmalloc;                                                 \
-                                                                               \
-    nghttp2_failmalloc = 1;                                                    \
-    for (i = 0; i < nmalloc; ++i) {                                            \
-      nghttp2_nmalloc = 0;                                                     \
-      nghttp2_failstart = i;                                                   \
-      /* printf("i=%zu\n", i); */                                              \
-      FUN();                                                                   \
-      /* printf("nmalloc=%d\n", nghttp2_nmalloc); */                           \
-    }                                                                          \
-    nghttp2_failmalloc = 0;                                                    \
-  } while (0)
-
-static void run_nghttp2_session_send(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_nv nv[] = {MAKE_NV(":host", "example.org"),
-                     MAKE_NV(":scheme", "https")};
-  nghttp2_data_provider data_prd;
-  nghttp2_settings_entry iv[2];
-  my_user_data ud;
-  int rv;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = 64 * 1024;
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 4096;
-  iv[1].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[1].value = 100;
-
-  rv = nghttp2_session_client_new3(&session, &callbacks, &ud, NULL,
-                                   nghttp2_mem_fm());
-  if (rv != 0) {
-    goto client_new_fail;
-  }
-  rv = nghttp2_submit_request(session, NULL, nv, ARRLEN(nv), &data_prd, NULL);
-  if (rv < 0) {
-    goto fail;
-  }
-  rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, -1, NULL, nv,
-                              ARRLEN(nv), NULL);
-  if (rv < 0) {
-    goto fail;
-  }
-  rv = nghttp2_session_send(session);
-  if (rv != 0) {
-    goto fail;
-  }
-  /* The HEADERS submitted by the previous nghttp2_submit_headers will
-     have stream ID 3. Send HEADERS to that stream. */
-  rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 3, NULL, nv,
-                              ARRLEN(nv), NULL);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 3, &data_prd);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_session_send(session);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, 3, NGHTTP2_CANCEL);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_session_send(session);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 2);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_session_send(session);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_submit_goaway(session, NGHTTP2_FLAG_NONE, 100, NGHTTP2_NO_ERROR,
-                             NULL, 0);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = nghttp2_session_send(session);
-  if (rv != 0) {
-    goto fail;
-  }
-
-fail:
-  nghttp2_session_del(session);
-client_new_fail:;
-}
-
-void test_nghttp2_session_send(void) {
-  TEST_FAILMALLOC_RUN(run_nghttp2_session_send);
-}
-
-static void run_nghttp2_session_send_server(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks *callbacks;
-  int rv;
-  const uint8_t *txdata;
-  ssize_t txdatalen;
-  const uint8_t origin[] = "nghttp2.org";
-  const uint8_t altsvc_field_value[] = "h2=\":443\"";
-  static const uint8_t nghttp2[] = "https://nghttp2.org";
-  static const nghttp2_origin_entry ov = {
-      (uint8_t *)nghttp2,
-      sizeof(nghttp2) - 1,
-  };
-
-  rv = nghttp2_session_callbacks_new(&callbacks);
-  if (rv != 0) {
-    return;
-  }
-
-  rv = nghttp2_session_server_new3(&session, callbacks, NULL, NULL,
-                                   nghttp2_mem_fm());
-
-  nghttp2_session_callbacks_del(callbacks);
-
-  if (rv != 0) {
-    return;
-  }
-
-  rv = nghttp2_submit_altsvc(session, NGHTTP2_FLAG_NONE, 0, origin,
-                             sizeof(origin) - 1, altsvc_field_value,
-                             sizeof(altsvc_field_value) - 1);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  rv = nghttp2_submit_origin(session, NGHTTP2_FLAG_NONE, &ov, 1);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  txdatalen = nghttp2_session_mem_send(session, &txdata);
-
-  if (txdatalen < 0) {
-    goto fail;
-  }
-
-fail:
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_server(void) {
-  TEST_FAILMALLOC_RUN(run_nghttp2_session_send_server);
-}
-
-static void run_nghttp2_session_recv(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_frame frame;
-  nghttp2_bufs bufs;
-  nghttp2_nv nv[] = {
-      MAKE_NV(":method", "GET"),
-      MAKE_NV(":scheme", "https"),
-      MAKE_NV(":authority", "example.org"),
-      MAKE_NV(":path", "/"),
-  };
-  nghttp2_settings_entry iv[2];
-  my_user_data ud;
-  data_feed df;
-  int rv;
-  nghttp2_nv *nva;
-  size_t nvlen;
-
-  rv = frame_pack_bufs_init(&bufs);
-
-  if (rv != 0) {
-    return;
-  }
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.recv_callback = data_feed_recv_callback;
-  ud.df = &df;
-
-  nghttp2_failmalloc_pause();
-  nghttp2_hd_deflate_init(&deflater, nghttp2_mem_fm());
-  nghttp2_session_server_new3(&session, &callbacks, &ud, NULL,
-                              nghttp2_mem_fm());
-
-  /* Client preface */
-  nghttp2_bufs_add(&bufs, NGHTTP2_CLIENT_MAGIC, NGHTTP2_CLIENT_MAGIC_LEN);
-  data_feed_init(&df, &bufs);
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_failmalloc_unpause();
-
-  rv = nghttp2_session_recv(session);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  nghttp2_failmalloc_pause();
-  /* SETTINGS */
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 4096;
-  iv[1].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[1].value = 100;
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE,
-                              nghttp2_frame_iv_copy(iv, 2, nghttp2_mem_fm()),
-                              2);
-  nghttp2_frame_pack_settings(&bufs, &frame.settings);
-  nghttp2_frame_settings_free(&frame.settings, nghttp2_mem_fm());
-  data_feed_init(&df, &bufs);
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_failmalloc_unpause();
-
-  rv = nghttp2_session_recv(session);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  nghttp2_failmalloc_pause();
-  /* HEADERS */
-  nvlen = ARRLEN(nv);
-  nghttp2_nv_array_copy(&nva, nv, nvlen, nghttp2_mem_fm());
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_STREAM, 1,
-                             NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
-  nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-  nghttp2_frame_headers_free(&frame.headers, nghttp2_mem_fm());
-  data_feed_init(&df, &bufs);
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_failmalloc_unpause();
-
-  rv = nghttp2_session_recv(session);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  /* PING */
-  nghttp2_failmalloc_pause();
-  nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_NONE, NULL);
-  nghttp2_frame_pack_ping(&bufs, &frame.ping);
-  nghttp2_frame_ping_free(&frame.ping);
-  data_feed_init(&df, &bufs);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_failmalloc_unpause();
-
-  rv = nghttp2_session_recv(session);
-  if (rv != 0) {
-    goto fail;
-  }
-
-  /* RST_STREAM */
-  nghttp2_failmalloc_pause();
-  nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_PROTOCOL_ERROR);
-  nghttp2_frame_pack_rst_stream(&bufs, &frame.rst_stream);
-  nghttp2_frame_rst_stream_free(&frame.rst_stream);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_failmalloc_unpause();
-
-  rv = nghttp2_session_recv(session);
-  if (rv != 0) {
-    goto fail;
-  }
-
-fail:
-  nghttp2_bufs_free(&bufs);
-  nghttp2_session_del(session);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_session_recv(void) {
-  TEST_FAILMALLOC_RUN(run_nghttp2_session_recv);
-}
-
-static void run_nghttp2_frame_pack_headers(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_frame frame, oframe;
-  nghttp2_bufs bufs;
-  nghttp2_nv nv[] = {MAKE_NV(":host", "example.org"),
-                     MAKE_NV(":scheme", "https")};
-  int rv;
-  nghttp2_nv *nva;
-  size_t nvlen;
-
-  rv = frame_pack_bufs_init(&bufs);
-
-  if (rv != 0) {
-    return;
-  }
-
-  rv = nghttp2_hd_deflate_init(&deflater, nghttp2_mem_fm());
-  if (rv != 0) {
-    goto deflate_init_fail;
-  }
-  rv = nghttp2_hd_inflate_init(&inflater, nghttp2_mem_fm());
-  if (rv != 0) {
-    goto inflate_init_fail;
-  }
-  nvlen = ARRLEN(nv);
-  rv = nghttp2_nv_array_copy(&nva, nv, nvlen, nghttp2_mem_fm());
-  if (rv < 0) {
-    goto nv_copy_fail;
-  }
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_STREAM, 1,
-                             NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-  if (rv != 0) {
-    goto fail;
-  }
-  rv = unpack_framebuf(&oframe, &bufs);
-  if (rv != 0) {
-    goto fail;
-  }
-  nghttp2_frame_headers_free(&oframe.headers, nghttp2_mem_fm());
-
-fail:
-  nghttp2_frame_headers_free(&frame.headers, nghttp2_mem_fm());
-nv_copy_fail:
-  nghttp2_hd_inflate_free(&inflater);
-inflate_init_fail:
-  nghttp2_hd_deflate_free(&deflater);
-deflate_init_fail:
-  nghttp2_bufs_free(&bufs);
-}
-
-static void run_nghttp2_frame_pack_settings(void) {
-  nghttp2_frame frame, oframe;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_settings_entry iv[2], *iv_copy;
-  int rv;
-
-  rv = frame_pack_bufs_init(&bufs);
-
-  if (rv != 0) {
-    return;
-  }
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 4096;
-  iv[1].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[1].value = 100;
-
-  iv_copy = nghttp2_frame_iv_copy(iv, 2, nghttp2_mem_fm());
-
-  if (iv_copy == NULL) {
-    goto iv_copy_fail;
-  }
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, iv_copy, 2);
-
-  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
-
-  if (rv != 0) {
-    goto fail;
-  }
-
-  buf = &bufs.head->buf;
-
-  rv = nghttp2_frame_unpack_settings_payload2(
-      &oframe.settings.iv, &oframe.settings.niv, buf->pos + NGHTTP2_FRAME_HDLEN,
-      nghttp2_buf_len(buf) - NGHTTP2_FRAME_HDLEN, nghttp2_mem_fm());
-
-  if (rv != 0) {
-    goto fail;
-  }
-  nghttp2_frame_settings_free(&oframe.settings, nghttp2_mem_fm());
-
-fail:
-  nghttp2_frame_settings_free(&frame.settings, nghttp2_mem_fm());
-iv_copy_fail:
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_frame(void) {
-  TEST_FAILMALLOC_RUN(run_nghttp2_frame_pack_headers);
-  TEST_FAILMALLOC_RUN(run_nghttp2_frame_pack_settings);
-}
-
-static int deflate_inflate(nghttp2_hd_deflater *deflater,
-                           nghttp2_hd_inflater *inflater, nghttp2_bufs *bufs,
-                           nghttp2_nv *nva, size_t nvlen, nghttp2_mem *mem) {
-  int rv;
-
-  rv = nghttp2_hd_deflate_hd_bufs(deflater, bufs, nva, nvlen);
-
-  if (rv != 0) {
-    return rv;
-  }
-
-  rv = (int)inflate_hd(inflater, NULL, bufs, 0, mem);
-
-  if (rv < 0) {
-    return rv;
-  }
-
-  nghttp2_bufs_reset(bufs);
-
-  return 0;
-}
-
-static void run_nghttp2_hd(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  int rv;
-  nghttp2_nv nva1[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "example.org"),
-      MAKE_NV(":path", "/slashdot"),
-      MAKE_NV("accept-encoding", "gzip, deflate"), MAKE_NV("foo", "bar")};
-  nghttp2_nv nva2[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "example.org"),
-      MAKE_NV(":path", "/style.css"), MAKE_NV("cookie", "nghttp2=FTW"),
-      MAKE_NV("foo", "bar2")};
-
-  rv = frame_pack_bufs_init(&bufs);
-
-  if (rv != 0) {
-    return;
-  }
-
-  rv = nghttp2_hd_deflate_init(&deflater, nghttp2_mem_fm());
-
-  if (rv != 0) {
-    goto deflate_init_fail;
-  }
-
-  rv = nghttp2_hd_inflate_init(&inflater, nghttp2_mem_fm());
-
-  if (rv != 0) {
-    goto inflate_init_fail;
-  }
-
-  rv = deflate_inflate(&deflater, &inflater, &bufs, nva1, ARRLEN(nva1),
-                       nghttp2_mem_fm());
-
-  if (rv != 0) {
-    goto deflate_hd_fail;
-  }
-
-  rv = deflate_inflate(&deflater, &inflater, &bufs, nva2, ARRLEN(nva2),
-                       nghttp2_mem_fm());
-
-  if (rv != 0) {
-    goto deflate_hd_fail;
-  }
-
-deflate_hd_fail:
-  nghttp2_hd_inflate_free(&inflater);
-inflate_init_fail:
-  nghttp2_hd_deflate_free(&deflater);
-deflate_init_fail:
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_hd(void) { TEST_FAILMALLOC_RUN(run_nghttp2_hd); }
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/failmalloc_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef FAILMALLOC_TEST_H
-#define FAILMALLOC_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_session_send(void);
-void test_nghttp2_session_send_server(void);
-void test_nghttp2_session_recv(void);
-void test_nghttp2_frame(void);
-void test_nghttp2_hd(void);
-
-#endif /* FAILMALLOC_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/main.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/main.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/main.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/main.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,435 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <stdio.h>
-#include <string.h>
-#include <CUnit/Basic.h>
-/* include test cases' include files here */
-#include "nghttp2_pq_test.h"
-#include "nghttp2_map_test.h"
-#include "nghttp2_queue_test.h"
-#include "nghttp2_session_test.h"
-#include "nghttp2_frame_test.h"
-#include "nghttp2_stream_test.h"
-#include "nghttp2_hd_test.h"
-#include "nghttp2_npn_test.h"
-#include "nghttp2_helper_test.h"
-#include "nghttp2_buf_test.h"
-
-extern int nghttp2_enable_strict_preface;
-
-static int init_suite1(void) { return 0; }
-
-static int clean_suite1(void) { return 0; }
-
-int main() {
-  CU_pSuite pSuite = NULL;
-  unsigned int num_tests_failed;
-
-  nghttp2_enable_strict_preface = 0;
-
-  /* initialize the CUnit test registry */
-  if (CUE_SUCCESS != CU_initialize_registry())
-    return (int)CU_get_error();
-
-  /* add a suite to the registry */
-  pSuite = CU_add_suite("libnghttp2_TestSuite", init_suite1, clean_suite1);
-  if (NULL == pSuite) {
-    CU_cleanup_registry();
-    return (int)CU_get_error();
-  }
-
-  /* add the tests to the suite */
-  if (!CU_add_test(pSuite, "pq", test_nghttp2_pq) ||
-      !CU_add_test(pSuite, "pq_update", test_nghttp2_pq_update) ||
-      !CU_add_test(pSuite, "pq_remove", test_nghttp2_pq_remove) ||
-      !CU_add_test(pSuite, "map", test_nghttp2_map) ||
-      !CU_add_test(pSuite, "map_functional", test_nghttp2_map_functional) ||
-      !CU_add_test(pSuite, "map_each_free", test_nghttp2_map_each_free) ||
-      !CU_add_test(pSuite, "queue", test_nghttp2_queue) ||
-      !CU_add_test(pSuite, "npn", test_nghttp2_npn) ||
-      !CU_add_test(pSuite, "session_recv", test_nghttp2_session_recv) ||
-      !CU_add_test(pSuite, "session_recv_invalid_stream_id",
-                   test_nghttp2_session_recv_invalid_stream_id) ||
-      !CU_add_test(pSuite, "session_recv_invalid_frame",
-                   test_nghttp2_session_recv_invalid_frame) ||
-      !CU_add_test(pSuite, "session_recv_eof", test_nghttp2_session_recv_eof) ||
-      !CU_add_test(pSuite, "session_recv_data",
-                   test_nghttp2_session_recv_data) ||
-      !CU_add_test(pSuite, "session_recv_data_no_auto_flow_control",
-                   test_nghttp2_session_recv_data_no_auto_flow_control) ||
-      !CU_add_test(pSuite, "session_recv_continuation",
-                   test_nghttp2_session_recv_continuation) ||
-      !CU_add_test(pSuite, "session_recv_headers_with_priority",
-                   test_nghttp2_session_recv_headers_with_priority) ||
-      !CU_add_test(pSuite, "session_recv_headers_with_padding",
-                   test_nghttp2_session_recv_headers_with_padding) ||
-      !CU_add_test(pSuite, "session_recv_headers_early_response",
-                   test_nghttp2_session_recv_headers_early_response) ||
-      !CU_add_test(pSuite, "session_server_recv_push_response",
-                   test_nghttp2_session_server_recv_push_response) ||
-      !CU_add_test(pSuite, "session_recv_premature_headers",
-                   test_nghttp2_session_recv_premature_headers) ||
-      !CU_add_test(pSuite, "session_recv_unknown_frame",
-                   test_nghttp2_session_recv_unknown_frame) ||
-      !CU_add_test(pSuite, "session_recv_unexpected_continuation",
-                   test_nghttp2_session_recv_unexpected_continuation) ||
-      !CU_add_test(pSuite, "session_recv_settings_header_table_size",
-                   test_nghttp2_session_recv_settings_header_table_size) ||
-      !CU_add_test(pSuite, "session_recv_too_large_frame_length",
-                   test_nghttp2_session_recv_too_large_frame_length) ||
-      !CU_add_test(pSuite, "session_recv_extension",
-                   test_nghttp2_session_recv_extension) ||
-      !CU_add_test(pSuite, "session_recv_altsvc",
-                   test_nghttp2_session_recv_altsvc) ||
-      !CU_add_test(pSuite, "session_recv_origin",
-                   test_nghttp2_session_recv_origin) ||
-      !CU_add_test(pSuite, "session_continue", test_nghttp2_session_continue) ||
-      !CU_add_test(pSuite, "session_add_frame",
-                   test_nghttp2_session_add_frame) ||
-      !CU_add_test(pSuite, "session_on_request_headers_received",
-                   test_nghttp2_session_on_request_headers_received) ||
-      !CU_add_test(pSuite, "session_on_response_headers_received",
-                   test_nghttp2_session_on_response_headers_received) ||
-      !CU_add_test(pSuite, "session_on_headers_received",
-                   test_nghttp2_session_on_headers_received) ||
-      !CU_add_test(pSuite, "session_on_push_response_headers_received",
-                   test_nghttp2_session_on_push_response_headers_received) ||
-      !CU_add_test(pSuite, "session_on_priority_received",
-                   test_nghttp2_session_on_priority_received) ||
-      !CU_add_test(pSuite, "session_on_rst_stream_received",
-                   test_nghttp2_session_on_rst_stream_received) ||
-      !CU_add_test(pSuite, "session_on_settings_received",
-                   test_nghttp2_session_on_settings_received) ||
-      !CU_add_test(pSuite, "session_on_push_promise_received",
-                   test_nghttp2_session_on_push_promise_received) ||
-      !CU_add_test(pSuite, "session_on_ping_received",
-                   test_nghttp2_session_on_ping_received) ||
-      !CU_add_test(pSuite, "session_on_goaway_received",
-                   test_nghttp2_session_on_goaway_received) ||
-      !CU_add_test(pSuite, "session_on_window_update_received",
-                   test_nghttp2_session_on_window_update_received) ||
-      !CU_add_test(pSuite, "session_on_data_received",
-                   test_nghttp2_session_on_data_received) ||
-      !CU_add_test(pSuite, "session_on_data_received_fail_fast",
-                   test_nghttp2_session_on_data_received_fail_fast) ||
-      !CU_add_test(pSuite, "session_on_altsvc_received",
-                   test_nghttp2_session_on_altsvc_received) ||
-      !CU_add_test(pSuite, "session_send_headers_start_stream",
-                   test_nghttp2_session_send_headers_start_stream) ||
-      !CU_add_test(pSuite, "session_send_headers_reply",
-                   test_nghttp2_session_send_headers_reply) ||
-      !CU_add_test(pSuite, "session_send_headers_frame_size_error",
-                   test_nghttp2_session_send_headers_frame_size_error) ||
-      !CU_add_test(pSuite, "session_send_headers_push_reply",
-                   test_nghttp2_session_send_headers_push_reply) ||
-      !CU_add_test(pSuite, "session_send_rst_stream",
-                   test_nghttp2_session_send_rst_stream) ||
-      !CU_add_test(pSuite, "session_send_push_promise",
-                   test_nghttp2_session_send_push_promise) ||
-      !CU_add_test(pSuite, "session_is_my_stream_id",
-                   test_nghttp2_session_is_my_stream_id) ||
-      !CU_add_test(pSuite, "session_upgrade2", test_nghttp2_session_upgrade2) ||
-      !CU_add_test(pSuite, "session_reprioritize_stream",
-                   test_nghttp2_session_reprioritize_stream) ||
-      !CU_add_test(
-          pSuite, "session_reprioritize_stream_with_idle_stream_dep",
-          test_nghttp2_session_reprioritize_stream_with_idle_stream_dep) ||
-      !CU_add_test(pSuite, "submit_data", test_nghttp2_submit_data) ||
-      !CU_add_test(pSuite, "submit_data_read_length_too_large",
-                   test_nghttp2_submit_data_read_length_too_large) ||
-      !CU_add_test(pSuite, "submit_data_read_length_smallest",
-                   test_nghttp2_submit_data_read_length_smallest) ||
-      !CU_add_test(pSuite, "submit_data_twice",
-                   test_nghttp2_submit_data_twice) ||
-      !CU_add_test(pSuite, "submit_request_with_data",
-                   test_nghttp2_submit_request_with_data) ||
-      !CU_add_test(pSuite, "submit_request_without_data",
-                   test_nghttp2_submit_request_without_data) ||
-      !CU_add_test(pSuite, "submit_response_with_data",
-                   test_nghttp2_submit_response_with_data) ||
-      !CU_add_test(pSuite, "submit_response_without_data",
-                   test_nghttp2_submit_response_without_data) ||
-      !CU_add_test(pSuite, "Submit_response_push_response",
-                   test_nghttp2_submit_response_push_response) ||
-      !CU_add_test(pSuite, "submit_trailer", test_nghttp2_submit_trailer) ||
-      !CU_add_test(pSuite, "submit_headers_start_stream",
-                   test_nghttp2_submit_headers_start_stream) ||
-      !CU_add_test(pSuite, "submit_headers_reply",
-                   test_nghttp2_submit_headers_reply) ||
-      !CU_add_test(pSuite, "submit_headers_push_reply",
-                   test_nghttp2_submit_headers_push_reply) ||
-      !CU_add_test(pSuite, "submit_headers", test_nghttp2_submit_headers) ||
-      !CU_add_test(pSuite, "submit_headers_continuation",
-                   test_nghttp2_submit_headers_continuation) ||
-      !CU_add_test(pSuite, "submit_headers_continuation_extra_large",
-                   test_nghttp2_submit_headers_continuation_extra_large) ||
-      !CU_add_test(pSuite, "submit_priority", test_nghttp2_submit_priority) ||
-      !CU_add_test(pSuite, "session_submit_settings",
-                   test_nghttp2_submit_settings) ||
-      !CU_add_test(pSuite, "session_submit_settings_update_local_window_size",
-                   test_nghttp2_submit_settings_update_local_window_size) ||
-      !CU_add_test(pSuite, "session_submit_settings_multiple_times",
-                   test_nghttp2_submit_settings_multiple_times) ||
-      !CU_add_test(pSuite, "session_submit_push_promise",
-                   test_nghttp2_submit_push_promise) ||
-      !CU_add_test(pSuite, "submit_window_update",
-                   test_nghttp2_submit_window_update) ||
-      !CU_add_test(pSuite, "submit_window_update_local_window_size",
-                   test_nghttp2_submit_window_update_local_window_size) ||
-      !CU_add_test(pSuite, "submit_shutdown_notice",
-                   test_nghttp2_submit_shutdown_notice) ||
-      !CU_add_test(pSuite, "submit_invalid_nv",
-                   test_nghttp2_submit_invalid_nv) ||
-      !CU_add_test(pSuite, "submit_extension", test_nghttp2_submit_extension) ||
-      !CU_add_test(pSuite, "submit_altsvc", test_nghttp2_submit_altsvc) ||
-      !CU_add_test(pSuite, "submit_origin", test_nghttp2_submit_origin) ||
-      !CU_add_test(pSuite, "session_open_stream",
-                   test_nghttp2_session_open_stream) ||
-      !CU_add_test(pSuite, "session_open_stream_with_idle_stream_dep",
-                   test_nghttp2_session_open_stream_with_idle_stream_dep) ||
-      !CU_add_test(pSuite, "session_get_next_ob_item",
-                   test_nghttp2_session_get_next_ob_item) ||
-      !CU_add_test(pSuite, "session_pop_next_ob_item",
-                   test_nghttp2_session_pop_next_ob_item) ||
-      !CU_add_test(pSuite, "session_reply_fail",
-                   test_nghttp2_session_reply_fail) ||
-      !CU_add_test(pSuite, "session_max_concurrent_streams",
-                   test_nghttp2_session_max_concurrent_streams) ||
-      !CU_add_test(pSuite, "session_stop_data_with_rst_stream",
-                   test_nghttp2_session_stop_data_with_rst_stream) ||
-      !CU_add_test(pSuite, "session_defer_data",
-                   test_nghttp2_session_defer_data) ||
-      !CU_add_test(pSuite, "session_flow_control",
-                   test_nghttp2_session_flow_control) ||
-      !CU_add_test(pSuite, "session_flow_control_data_recv",
-                   test_nghttp2_session_flow_control_data_recv) ||
-      !CU_add_test(pSuite, "session_flow_control_data_with_padding_recv",
-                   test_nghttp2_session_flow_control_data_with_padding_recv) ||
-      !CU_add_test(pSuite, "session_data_read_temporal_failure",
-                   test_nghttp2_session_data_read_temporal_failure) ||
-      !CU_add_test(pSuite, "session_on_stream_close",
-                   test_nghttp2_session_on_stream_close) ||
-      !CU_add_test(pSuite, "session_on_ctrl_not_send",
-                   test_nghttp2_session_on_ctrl_not_send) ||
-      !CU_add_test(pSuite, "session_get_outbound_queue_size",
-                   test_nghttp2_session_get_outbound_queue_size) ||
-      !CU_add_test(pSuite, "session_get_effective_local_window_size",
-                   test_nghttp2_session_get_effective_local_window_size) ||
-      !CU_add_test(pSuite, "session_set_option",
-                   test_nghttp2_session_set_option) ||
-      !CU_add_test(pSuite, "session_data_backoff_by_high_pri_frame",
-                   test_nghttp2_session_data_backoff_by_high_pri_frame) ||
-      !CU_add_test(pSuite, "session_pack_data_with_padding",
-                   test_nghttp2_session_pack_data_with_padding) ||
-      !CU_add_test(pSuite, "session_pack_headers_with_padding",
-                   test_nghttp2_session_pack_headers_with_padding) ||
-      !CU_add_test(pSuite, "pack_settings_payload",
-                   test_nghttp2_pack_settings_payload) ||
-      !CU_add_test(pSuite, "session_stream_dep_add",
-                   test_nghttp2_session_stream_dep_add) ||
-      !CU_add_test(pSuite, "session_stream_dep_remove",
-                   test_nghttp2_session_stream_dep_remove) ||
-      !CU_add_test(pSuite, "session_stream_dep_add_subtree",
-                   test_nghttp2_session_stream_dep_add_subtree) ||
-      !CU_add_test(pSuite, "session_stream_dep_remove_subtree",
-                   test_nghttp2_session_stream_dep_remove_subtree) ||
-      !CU_add_test(
-          pSuite, "session_stream_dep_all_your_stream_are_belong_to_us",
-          test_nghttp2_session_stream_dep_all_your_stream_are_belong_to_us) ||
-      !CU_add_test(pSuite, "session_stream_attach_item",
-                   test_nghttp2_session_stream_attach_item) ||
-      !CU_add_test(pSuite, "session_stream_attach_item_subtree",
-                   test_nghttp2_session_stream_attach_item_subtree) ||
-      !CU_add_test(pSuite, "session_stream_get_state",
-                   test_nghttp2_session_stream_get_state) ||
-      !CU_add_test(pSuite, "session_stream_get_something",
-                   test_nghttp2_session_stream_get_something) ||
-      !CU_add_test(pSuite, "session_find_stream",
-                   test_nghttp2_session_find_stream) ||
-      !CU_add_test(pSuite, "session_keep_closed_stream",
-                   test_nghttp2_session_keep_closed_stream) ||
-      !CU_add_test(pSuite, "session_keep_idle_stream",
-                   test_nghttp2_session_keep_idle_stream) ||
-      !CU_add_test(pSuite, "session_detach_idle_stream",
-                   test_nghttp2_session_detach_idle_stream) ||
-      !CU_add_test(pSuite, "session_large_dep_tree",
-                   test_nghttp2_session_large_dep_tree) ||
-      !CU_add_test(pSuite, "session_graceful_shutdown",
-                   test_nghttp2_session_graceful_shutdown) ||
-      !CU_add_test(pSuite, "session_on_header_temporal_failure",
-                   test_nghttp2_session_on_header_temporal_failure) ||
-      !CU_add_test(pSuite, "session_recv_client_magic",
-                   test_nghttp2_session_recv_client_magic) ||
-      !CU_add_test(pSuite, "session_delete_data_item",
-                   test_nghttp2_session_delete_data_item) ||
-      !CU_add_test(pSuite, "session_open_idle_stream",
-                   test_nghttp2_session_open_idle_stream) ||
-      !CU_add_test(pSuite, "session_cancel_reserved_remote",
-                   test_nghttp2_session_cancel_reserved_remote) ||
-      !CU_add_test(pSuite, "session_reset_pending_headers",
-                   test_nghttp2_session_reset_pending_headers) ||
-      !CU_add_test(pSuite, "session_send_data_callback",
-                   test_nghttp2_session_send_data_callback) ||
-      !CU_add_test(pSuite, "session_on_begin_headers_temporal_failure",
-                   test_nghttp2_session_on_begin_headers_temporal_failure) ||
-      !CU_add_test(pSuite, "session_defer_then_close",
-                   test_nghttp2_session_defer_then_close) ||
-      !CU_add_test(pSuite, "session_detach_item_from_closed_stream",
-                   test_nghttp2_session_detach_item_from_closed_stream) ||
-      !CU_add_test(pSuite, "session_flooding", test_nghttp2_session_flooding) ||
-      !CU_add_test(pSuite, "session_change_stream_priority",
-                   test_nghttp2_session_change_stream_priority) ||
-      !CU_add_test(pSuite, "session_repeated_priority_change",
-                   test_nghttp2_session_repeated_priority_change) ||
-      !CU_add_test(pSuite, "session_repeated_priority_submission",
-                   test_nghttp2_session_repeated_priority_submission) ||
-      !CU_add_test(pSuite, "session_set_local_window_size",
-                   test_nghttp2_session_set_local_window_size) ||
-      !CU_add_test(pSuite, "session_cancel_from_before_frame_send",
-                   test_nghttp2_session_cancel_from_before_frame_send) ||
-      !CU_add_test(pSuite, "session_removed_closed_stream",
-                   test_nghttp2_session_removed_closed_stream) ||
-      !CU_add_test(pSuite, "session_pause_data",
-                   test_nghttp2_session_pause_data) ||
-      !CU_add_test(pSuite, "session_no_closed_streams",
-                   test_nghttp2_session_no_closed_streams) ||
-      !CU_add_test(pSuite, "session_set_stream_user_data",
-                   test_nghttp2_session_set_stream_user_data) ||
-      !CU_add_test(pSuite, "http_mandatory_headers",
-                   test_nghttp2_http_mandatory_headers) ||
-      !CU_add_test(pSuite, "http_content_length",
-                   test_nghttp2_http_content_length) ||
-      !CU_add_test(pSuite, "http_content_length_mismatch",
-                   test_nghttp2_http_content_length_mismatch) ||
-      !CU_add_test(pSuite, "http_non_final_response",
-                   test_nghttp2_http_non_final_response) ||
-      !CU_add_test(pSuite, "http_trailer_headers",
-                   test_nghttp2_http_trailer_headers) ||
-      !CU_add_test(pSuite, "http_ignore_regular_header",
-                   test_nghttp2_http_ignore_regular_header) ||
-      !CU_add_test(pSuite, "http_ignore_content_length",
-                   test_nghttp2_http_ignore_content_length) ||
-      !CU_add_test(pSuite, "http_record_request_method",
-                   test_nghttp2_http_record_request_method) ||
-      !CU_add_test(pSuite, "http_push_promise",
-                   test_nghttp2_http_push_promise) ||
-      !CU_add_test(pSuite, "http_head_method_upgrade_workaround",
-                   test_nghttp2_http_head_method_upgrade_workaround) ||
-      !CU_add_test(pSuite, "frame_pack_headers",
-                   test_nghttp2_frame_pack_headers) ||
-      !CU_add_test(pSuite, "frame_pack_headers_frame_too_large",
-                   test_nghttp2_frame_pack_headers_frame_too_large) ||
-      !CU_add_test(pSuite, "frame_pack_priority",
-                   test_nghttp2_frame_pack_priority) ||
-      !CU_add_test(pSuite, "frame_pack_rst_stream",
-                   test_nghttp2_frame_pack_rst_stream) ||
-      !CU_add_test(pSuite, "frame_pack_settings",
-                   test_nghttp2_frame_pack_settings) ||
-      !CU_add_test(pSuite, "frame_pack_push_promise",
-                   test_nghttp2_frame_pack_push_promise) ||
-      !CU_add_test(pSuite, "frame_pack_ping", test_nghttp2_frame_pack_ping) ||
-      !CU_add_test(pSuite, "frame_pack_goaway",
-                   test_nghttp2_frame_pack_goaway) ||
-      !CU_add_test(pSuite, "frame_pack_window_update",
-                   test_nghttp2_frame_pack_window_update) ||
-      !CU_add_test(pSuite, "frame_pack_altsvc",
-                   test_nghttp2_frame_pack_altsvc) ||
-      !CU_add_test(pSuite, "frame_pack_origin",
-                   test_nghttp2_frame_pack_origin) ||
-      !CU_add_test(pSuite, "nv_array_copy", test_nghttp2_nv_array_copy) ||
-      !CU_add_test(pSuite, "iv_check", test_nghttp2_iv_check) ||
-      !CU_add_test(pSuite, "hd_deflate", test_nghttp2_hd_deflate) ||
-      !CU_add_test(pSuite, "hd_deflate_same_indexed_repr",
-                   test_nghttp2_hd_deflate_same_indexed_repr) ||
-      !CU_add_test(pSuite, "hd_inflate_indexed",
-                   test_nghttp2_hd_inflate_indexed) ||
-      !CU_add_test(pSuite, "hd_inflate_indname_noinc",
-                   test_nghttp2_hd_inflate_indname_noinc) ||
-      !CU_add_test(pSuite, "hd_inflate_indname_inc",
-                   test_nghttp2_hd_inflate_indname_inc) ||
-      !CU_add_test(pSuite, "hd_inflate_indname_inc_eviction",
-                   test_nghttp2_hd_inflate_indname_inc_eviction) ||
-      !CU_add_test(pSuite, "hd_inflate_newname_noinc",
-                   test_nghttp2_hd_inflate_newname_noinc) ||
-      !CU_add_test(pSuite, "hd_inflate_newname_inc",
-                   test_nghttp2_hd_inflate_newname_inc) ||
-      !CU_add_test(pSuite, "hd_inflate_clearall_inc",
-                   test_nghttp2_hd_inflate_clearall_inc) ||
-      !CU_add_test(pSuite, "hd_inflate_zero_length_huffman",
-                   test_nghttp2_hd_inflate_zero_length_huffman) ||
-      !CU_add_test(pSuite, "hd_inflate_expect_table_size_update",
-                   test_nghttp2_hd_inflate_expect_table_size_update) ||
-      !CU_add_test(pSuite, "hd_inflate_unexpected_table_size_update",
-                   test_nghttp2_hd_inflate_unexpected_table_size_update) ||
-      !CU_add_test(pSuite, "hd_ringbuf_reserve",
-                   test_nghttp2_hd_ringbuf_reserve) ||
-      !CU_add_test(pSuite, "hd_change_table_size",
-                   test_nghttp2_hd_change_table_size) ||
-      !CU_add_test(pSuite, "hd_deflate_inflate",
-                   test_nghttp2_hd_deflate_inflate) ||
-      !CU_add_test(pSuite, "hd_no_index", test_nghttp2_hd_no_index) ||
-      !CU_add_test(pSuite, "hd_deflate_bound", test_nghttp2_hd_deflate_bound) ||
-      !CU_add_test(pSuite, "hd_public_api", test_nghttp2_hd_public_api) ||
-      !CU_add_test(pSuite, "hd_deflate_hd_vec",
-                   test_nghttp2_hd_deflate_hd_vec) ||
-      !CU_add_test(pSuite, "hd_decode_length", test_nghttp2_hd_decode_length) ||
-      !CU_add_test(pSuite, "hd_huff_encode", test_nghttp2_hd_huff_encode) ||
-      !CU_add_test(pSuite, "adjust_local_window_size",
-                   test_nghttp2_adjust_local_window_size) ||
-      !CU_add_test(pSuite, "check_header_name",
-                   test_nghttp2_check_header_name) ||
-      !CU_add_test(pSuite, "check_header_value",
-                   test_nghttp2_check_header_value) ||
-      !CU_add_test(pSuite, "bufs_add", test_nghttp2_bufs_add) ||
-      !CU_add_test(pSuite, "bufs_add_stack_buffer_overflow_bug",
-                   test_nghttp2_bufs_add_stack_buffer_overflow_bug) ||
-      !CU_add_test(pSuite, "bufs_addb", test_nghttp2_bufs_addb) ||
-      !CU_add_test(pSuite, "bufs_orb", test_nghttp2_bufs_orb) ||
-      !CU_add_test(pSuite, "bufs_remove", test_nghttp2_bufs_remove) ||
-      !CU_add_test(pSuite, "bufs_reset", test_nghttp2_bufs_reset) ||
-      !CU_add_test(pSuite, "bufs_advance", test_nghttp2_bufs_advance) ||
-      !CU_add_test(pSuite, "bufs_next_present",
-                   test_nghttp2_bufs_next_present) ||
-      !CU_add_test(pSuite, "bufs_realloc", test_nghttp2_bufs_realloc)) {
-    CU_cleanup_registry();
-    return (int)CU_get_error();
-  }
-
-  /* Run all tests using the CUnit Basic interface */
-  CU_basic_set_mode(CU_BRM_VERBOSE);
-  CU_basic_run_tests();
-  num_tests_failed = CU_get_number_of_tests_failed();
-  CU_cleanup_registry();
-  if (CU_get_error() == CUE_SUCCESS) {
-    return (int)num_tests_failed;
-  } else {
-    printf("CUnit Error: %s\n", CU_get_error_msg());
-    return (int)CU_get_error();
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = testdata
-
-EXTRA_DIST = CMakeLists.txt
-
-if HAVE_CUNIT
-
-check_PROGRAMS = main
-
-if ENABLE_FAILMALLOC
-check_PROGRAMS += failmalloc
-endif # ENABLE_FAILMALLOC
-
-OBJECTS = main.c nghttp2_pq_test.c nghttp2_map_test.c nghttp2_queue_test.c \
-	nghttp2_test_helper.c \
-	nghttp2_frame_test.c \
-	nghttp2_stream_test.c \
-	nghttp2_session_test.c \
-	nghttp2_hd_test.c \
-	nghttp2_npn_test.c \
-	nghttp2_helper_test.c \
-	nghttp2_buf_test.c
-
-HFILES = nghttp2_pq_test.h nghttp2_map_test.h nghttp2_queue_test.h \
-	nghttp2_session_test.h \
-	nghttp2_frame_test.h nghttp2_stream_test.h nghttp2_hd_test.h \
-	nghttp2_npn_test.h nghttp2_helper_test.h \
-	nghttp2_test_helper.h \
-	nghttp2_buf_test.h
-
-main_SOURCES = $(HFILES) $(OBJECTS)
-
-if ENABLE_STATIC
-main_LDADD = ${top_builddir}/lib/libnghttp2.la
-else
-# With static lib disabled and symbol hiding enabled, we have to link object
-# files directly because the tests use symbols not included in public API.
-main_LDADD = ${top_builddir}/lib/.libs/*.o
-endif
-
-main_LDADD += @CUNIT_LIBS@ @TESTLDADD@
-main_LDFLAGS = -static
-
-if ENABLE_FAILMALLOC
-failmalloc_SOURCES = failmalloc.c failmalloc_test.c failmalloc_test.h \
-	malloc_wrapper.c malloc_wrapper.h \
-	nghttp2_test_helper.c nghttp2_test_helper.h
-failmalloc_LDADD = $(main_LDADD)
-failmalloc_LDFLAGS = $(main_LDFLAGS)
-endif # ENABLE_FAILMALLOC
-
-AM_CFLAGS = $(WARNCFLAGS) \
-	-I${top_srcdir}/lib \
-	-I${top_srcdir}/lib/includes \
-	-I${top_builddir}/lib/includes \
-	@CUNIT_CFLAGS@ @DEFS@
-
-TESTS = main
-
-if ENABLE_FAILMALLOC
-TESTS += failmalloc
-endif # ENABLE_FAILMALLOC
-
-if ENABLE_APP
-
-# EXTRA_DIST = end_to_end.py
-# TESTS += end_to_end.py
-
-endif # ENABLE_APP
-
-endif # HAVE_CUNIT
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "malloc_wrapper.h"
-
-int nghttp2_failmalloc = 0;
-int nghttp2_failstart = 0;
-int nghttp2_countmalloc = 1;
-int nghttp2_nmalloc = 0;
-
-#define CHECK_PREREQ                                                           \
-  do {                                                                         \
-    if (nghttp2_failmalloc && nghttp2_nmalloc >= nghttp2_failstart) {          \
-      return NULL;                                                             \
-    }                                                                          \
-    if (nghttp2_countmalloc) {                                                 \
-      ++nghttp2_nmalloc;                                                       \
-    }                                                                          \
-  } while (0)
-
-static void *my_malloc(size_t size, void *mud) {
-  (void)mud;
-
-  CHECK_PREREQ;
-  return malloc(size);
-}
-
-static void my_free(void *ptr, void *mud) {
-  (void)mud;
-
-  free(ptr);
-}
-
-static void *my_calloc(size_t nmemb, size_t size, void *mud) {
-  (void)mud;
-
-  CHECK_PREREQ;
-  return calloc(nmemb, size);
-}
-
-static void *my_realloc(void *ptr, size_t size, void *mud) {
-  (void)mud;
-
-  CHECK_PREREQ;
-  return realloc(ptr, size);
-}
-
-static nghttp2_mem mem = {NULL, my_malloc, my_free, my_calloc, my_realloc};
-
-nghttp2_mem *nghttp2_mem_fm(void) { return &mem; }
-
-static int failmalloc_bk, countmalloc_bk;
-
-void nghttp2_failmalloc_pause(void) {
-  failmalloc_bk = nghttp2_failmalloc;
-  countmalloc_bk = nghttp2_countmalloc;
-  nghttp2_failmalloc = 0;
-  nghttp2_countmalloc = 0;
-}
-
-void nghttp2_failmalloc_unpause(void) {
-  nghttp2_failmalloc = failmalloc_bk;
-  nghttp2_countmalloc = countmalloc_bk;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/malloc_wrapper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef MALLOC_WRAPPER_H
-#define MALLOC_WRAPPER_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <stdlib.h>
-
-#include "nghttp2_mem.h"
-
-/* Global variables to control the behavior of malloc() */
-
-/* If nonzero, malloc failure mode is on */
-extern int nghttp2_failmalloc;
-/* If nghttp2_failstart <= nghttp2_nmalloc and nghttp2_failmalloc is
-   nonzero, malloc() fails. */
-extern int nghttp2_failstart;
-/* If nonzero, nghttp2_nmalloc is incremented if malloc() succeeds. */
-extern int nghttp2_countmalloc;
-/* The number of successful invocation of malloc(). This value is only
-   incremented if nghttp2_nmalloc is nonzero. */
-extern int nghttp2_nmalloc;
-
-/* Returns pointer to nghttp2_mem, which, when dereferenced, contains
-   specifically instrumented memory allocators for failmalloc
-   tests. */
-nghttp2_mem *nghttp2_mem_fm(void);
-
-/* Copies nghttp2_failmalloc and nghttp2_countmalloc to statically
-   allocated space and sets 0 to them. This will effectively make
-   malloc() work like normal malloc(). This is useful when you want to
-   disable malloc() failure mode temporarily. */
-void nghttp2_failmalloc_pause(void);
-
-/* Restores the values of nghttp2_failmalloc and nghttp2_countmalloc
-   with the values saved by the previous
-   nghttp2_failmalloc_pause(). */
-void nghttp2_failmalloc_unpause(void);
-
-#endif /* MALLOC_WRAPPER_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,342 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_buf_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_buf.h"
-#include "nghttp2_test_helper.h"
-
-void test_nghttp2_bufs_add(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  uint8_t data[2048];
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 1000, 3, mem);
-  CU_ASSERT(0 == rv);
-
-  CU_ASSERT(bufs.cur->buf.pos == bufs.cur->buf.last);
-
-  rv = nghttp2_bufs_add(&bufs, data, 493);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(493 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(493 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(507 == nghttp2_bufs_cur_avail(&bufs));
-
-  rv = nghttp2_bufs_add(&bufs, data, 507);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1000 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1000 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(bufs.cur == bufs.head);
-
-  rv = nghttp2_bufs_add(&bufs, data, 1);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1001 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(bufs.cur == bufs.head->next);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-/* Test for GH-232, stack-buffer-overflow */
-void test_nghttp2_bufs_add_stack_buffer_overflow_bug(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  uint8_t data[1024];
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 100, 200, mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_bufs_add(&bufs, data, sizeof(data));
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(sizeof(data) == nghttp2_bufs_len(&bufs));
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_addb(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  ssize_t i;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 1000, 3, mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_bufs_addb(&bufs, 14);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(14 == *bufs.cur->buf.pos);
-
-  for (i = 0; i < 999; ++i) {
-    rv = nghttp2_bufs_addb(&bufs, 254);
-
-    CU_ASSERT(0 == rv);
-    CU_ASSERT((size_t)(i + 2) == nghttp2_buf_len(&bufs.cur->buf));
-    CU_ASSERT((size_t)(i + 2) == nghttp2_bufs_len(&bufs));
-    CU_ASSERT(254 == *(bufs.cur->buf.last - 1));
-    CU_ASSERT(bufs.cur == bufs.head);
-  }
-
-  rv = nghttp2_bufs_addb(&bufs, 253);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1001 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(253 == *(bufs.cur->buf.last - 1));
-  CU_ASSERT(bufs.cur == bufs.head->next);
-
-  rv = nghttp2_bufs_addb_hold(&bufs, 15);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1001 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(15 == *(bufs.cur->buf.last));
-
-  /* test fast version */
-
-  nghttp2_bufs_fast_addb(&bufs, 240);
-
-  CU_ASSERT(2 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1002 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(240 == *(bufs.cur->buf.last - 1));
-
-  nghttp2_bufs_fast_addb_hold(&bufs, 113);
-
-  CU_ASSERT(2 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1002 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(113 == *(bufs.cur->buf.last));
-
-  /* addb_hold when last == end */
-  bufs.cur->buf.last = bufs.cur->buf.end;
-
-  rv = nghttp2_bufs_addb_hold(&bufs, 19);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(2000 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(19 == *(bufs.cur->buf.last));
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_orb(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 1000, 3, mem);
-  CU_ASSERT(0 == rv);
-
-  *(bufs.cur->buf.last) = 0;
-
-  rv = nghttp2_bufs_orb_hold(&bufs, 15);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(0 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(15 == *(bufs.cur->buf.last));
-
-  rv = nghttp2_bufs_orb(&bufs, 240);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == nghttp2_buf_len(&bufs.cur->buf));
-  CU_ASSERT(1 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(255 == *(bufs.cur->buf.last - 1));
-
-  *(bufs.cur->buf.last) = 0;
-  nghttp2_bufs_fast_orb_hold(&bufs, 240);
-  CU_ASSERT(240 == *(bufs.cur->buf.last));
-
-  nghttp2_bufs_fast_orb(&bufs, 15);
-  CU_ASSERT(255 == *(bufs.cur->buf.last - 1));
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_remove(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  nghttp2_buf_chain *chain;
-  int i;
-  uint8_t *out;
-  ssize_t outlen;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 1000, 3, mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_buf_shift_right(&bufs.cur->buf, 10);
-
-  rv = nghttp2_bufs_add(&bufs, "hello ", 6);
-  CU_ASSERT(0 == rv);
-
-  for (i = 0; i < 2; ++i) {
-    chain = bufs.cur;
-
-    rv = nghttp2_bufs_advance(&bufs);
-    CU_ASSERT(0 == rv);
-
-    CU_ASSERT(chain->next == bufs.cur);
-  }
-
-  rv = nghttp2_bufs_add(&bufs, "world", 5);
-  CU_ASSERT(0 == rv);
-
-  outlen = nghttp2_bufs_remove(&bufs, &out);
-  CU_ASSERT(11 == outlen);
-
-  CU_ASSERT(0 == memcmp("hello world", out, (size_t)outlen));
-  CU_ASSERT(11 == nghttp2_bufs_len(&bufs));
-
-  mem->free(out, NULL);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_reset(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  nghttp2_buf_chain *ci;
-  size_t offset = 9;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init3(&bufs, 250, 3, 1, offset, mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_bufs_add(&bufs, "foo", 3);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_bufs_advance(&bufs);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_bufs_add(&bufs, "bar", 3);
-  CU_ASSERT(0 == rv);
-
-  CU_ASSERT(6 == nghttp2_bufs_len(&bufs));
-
-  nghttp2_bufs_reset(&bufs);
-
-  CU_ASSERT(0 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(bufs.cur == bufs.head);
-
-  for (ci = bufs.head; ci; ci = ci->next) {
-    CU_ASSERT((ssize_t)offset == ci->buf.pos - ci->buf.begin);
-    CU_ASSERT(ci->buf.pos == ci->buf.last);
-  }
-
-  CU_ASSERT(bufs.head->next == NULL);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_advance(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  int i;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 250, 3, mem);
-  CU_ASSERT(0 == rv);
-
-  for (i = 0; i < 2; ++i) {
-    rv = nghttp2_bufs_advance(&bufs);
-    CU_ASSERT(0 == rv);
-  }
-
-  rv = nghttp2_bufs_advance(&bufs);
-  CU_ASSERT(NGHTTP2_ERR_BUFFER_ERROR == rv);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_next_present(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init(&bufs, 250, 3, mem);
-  CU_ASSERT(0 == rv);
-
-  CU_ASSERT(0 == nghttp2_bufs_next_present(&bufs));
-
-  rv = nghttp2_bufs_advance(&bufs);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_bufs_rewind(&bufs);
-
-  CU_ASSERT(0 == nghttp2_bufs_next_present(&bufs));
-
-  bufs.cur = bufs.head->next;
-
-  rv = nghttp2_bufs_addb(&bufs, 1);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_bufs_rewind(&bufs);
-
-  CU_ASSERT(0 != nghttp2_bufs_next_present(&bufs));
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_bufs_realloc(void) {
-  int rv;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  rv = nghttp2_bufs_init3(&bufs, 266, 3, 1, 10, mem);
-  CU_ASSERT(0 == rv);
-
-  /* Create new buffer to see that these buffers are deallocated on
-     realloc */
-  rv = nghttp2_bufs_advance(&bufs);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_bufs_realloc(&bufs, 522);
-  CU_ASSERT(0 == rv);
-
-  CU_ASSERT(512 == nghttp2_bufs_cur_avail(&bufs));
-
-  rv = nghttp2_bufs_realloc(&bufs, 9);
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  nghttp2_bufs_free(&bufs);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_buf_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_BUF_TEST_H
-#define NGHTTP2_BUF_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_bufs_add(void);
-void test_nghttp2_bufs_add_stack_buffer_overflow_bug(void);
-void test_nghttp2_bufs_addb(void);
-void test_nghttp2_bufs_orb(void);
-void test_nghttp2_bufs_remove(void);
-void test_nghttp2_bufs_reset(void);
-void test_nghttp2_bufs_advance(void);
-void test_nghttp2_bufs_next_present(void);
-void test_nghttp2_bufs_realloc(void);
-
-#endif /* NGHTTP2_BUF_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,709 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_frame_test.h"
-
-#include <assert.h>
-#include <stdio.h>
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_frame.h"
-#include "nghttp2_helper.h"
-#include "nghttp2_test_helper.h"
-#include "nghttp2_priority_spec.h"
-
-static nghttp2_nv make_nv(const char *name, const char *value) {
-  nghttp2_nv nv;
-  nv.name = (uint8_t *)name;
-  nv.value = (uint8_t *)value;
-  nv.namelen = strlen(name);
-  nv.valuelen = strlen(value);
-  nv.flags = NGHTTP2_NV_FLAG_NONE;
-
-  return nv;
-}
-
-#define HEADERS_LENGTH 7
-
-static nghttp2_nv *headers(nghttp2_mem *mem) {
-  nghttp2_nv *nva = mem->malloc(sizeof(nghttp2_nv) * HEADERS_LENGTH, NULL);
-  nva[0] = make_nv("method", "GET");
-  nva[1] = make_nv("scheme", "https");
-  nva[2] = make_nv("url", "/");
-  nva[3] = make_nv("x-head", "foo");
-  nva[4] = make_nv("x-head", "bar");
-  nva[5] = make_nv("version", "HTTP/1.1");
-  nva[6] = make_nv("x-empty", "");
-  return nva;
-}
-
-static void check_frame_header(size_t length, uint8_t type, uint8_t flags,
-                               int32_t stream_id, nghttp2_frame_hd *hd) {
-  CU_ASSERT(length == hd->length);
-  CU_ASSERT(type == hd->type);
-  CU_ASSERT(flags == hd->flags);
-  CU_ASSERT(stream_id == hd->stream_id);
-  CU_ASSERT(0 == hd->reserved);
-}
-
-void test_nghttp2_frame_pack_headers() {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_headers frame, oframe;
-  nghttp2_bufs bufs;
-  nghttp2_nv *nva;
-  nghttp2_priority_spec pri_spec;
-  size_t nvlen;
-  nva_out out;
-  size_t hdblocklen;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  nva = headers(mem);
-  nvlen = HEADERS_LENGTH;
-
-  nghttp2_priority_spec_default_init(&pri_spec);
-
-  nghttp2_frame_headers_init(
-      &frame, NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS, 1000000007,
-      NGHTTP2_HCAT_REQUEST, &pri_spec, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame, &deflater);
-
-  nghttp2_bufs_rewind(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-
-  check_frame_header(nghttp2_bufs_len(&bufs) - NGHTTP2_FRAME_HDLEN,
-                     NGHTTP2_HEADERS,
-                     NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS,
-                     1000000007, &oframe.hd);
-  /* We did not include PRIORITY flag */
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == oframe.pri_spec.weight);
-
-  hdblocklen = nghttp2_bufs_len(&bufs) - NGHTTP2_FRAME_HDLEN;
-  CU_ASSERT((ssize_t)hdblocklen ==
-            inflate_hd(&inflater, &out, &bufs, NGHTTP2_FRAME_HDLEN, mem));
-
-  CU_ASSERT(7 == out.nvlen);
-  CU_ASSERT(nvnameeq("method", &out.nva[0]));
-  CU_ASSERT(nvvalueeq("GET", &out.nva[0]));
-
-  nghttp2_frame_headers_free(&oframe, mem);
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  memset(&oframe, 0, sizeof(oframe));
-  /* Next, include NGHTTP2_FLAG_PRIORITY */
-  nghttp2_priority_spec_init(&frame.pri_spec, 1000000009, 12, 1);
-  frame.hd.flags |= NGHTTP2_FLAG_PRIORITY;
-
-  rv = nghttp2_frame_pack_headers(&bufs, &frame, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-
-  check_frame_header(nghttp2_bufs_len(&bufs) - NGHTTP2_FRAME_HDLEN,
-                     NGHTTP2_HEADERS,
-                     NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS |
-                         NGHTTP2_FLAG_PRIORITY,
-                     1000000007, &oframe.hd);
-
-  CU_ASSERT(1000000009 == oframe.pri_spec.stream_id);
-  CU_ASSERT(12 == oframe.pri_spec.weight);
-  CU_ASSERT(1 == oframe.pri_spec.exclusive);
-
-  hdblocklen = nghttp2_bufs_len(&bufs) - NGHTTP2_FRAME_HDLEN -
-               nghttp2_frame_priority_len(oframe.hd.flags);
-  CU_ASSERT((ssize_t)hdblocklen ==
-            inflate_hd(&inflater, &out, &bufs,
-                       NGHTTP2_FRAME_HDLEN +
-                           nghttp2_frame_priority_len(oframe.hd.flags),
-                       mem));
-
-  nghttp2_nv_array_sort(out.nva, out.nvlen);
-  CU_ASSERT(nvnameeq("method", &out.nva[0]));
-
-  nghttp2_frame_headers_free(&oframe, mem);
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_headers_free(&frame, mem);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_frame_pack_headers_frame_too_large(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_headers frame;
-  nghttp2_bufs bufs;
-  nghttp2_nv *nva;
-  size_t big_vallen = NGHTTP2_HD_MAX_NV;
-  nghttp2_nv big_hds[16];
-  size_t big_hdslen = ARRLEN(big_hds);
-  size_t i;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  for (i = 0; i < big_hdslen; ++i) {
-    big_hds[i].name = (uint8_t *)"header";
-    big_hds[i].value = mem->malloc(big_vallen + 1, NULL);
-    memset(big_hds[i].value, '0' + (int)i, big_vallen);
-    big_hds[i].value[big_vallen] = '\0';
-    big_hds[i].namelen = strlen((char *)big_hds[i].name);
-    big_hds[i].valuelen = big_vallen;
-    big_hds[i].flags = NGHTTP2_NV_FLAG_NONE;
-  }
-
-  nghttp2_nv_array_copy(&nva, big_hds, big_hdslen, mem);
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_frame_headers_init(
-      &frame, NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS, 1000000007,
-      NGHTTP2_HCAT_REQUEST, NULL, nva, big_hdslen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame, &deflater);
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP == rv);
-
-  nghttp2_frame_headers_free(&frame, mem);
-  nghttp2_bufs_free(&bufs);
-  for (i = 0; i < big_hdslen; ++i) {
-    mem->free(big_hds[i].value, NULL);
-  }
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_frame_pack_priority(void) {
-  nghttp2_priority frame, oframe;
-  nghttp2_bufs bufs;
-  nghttp2_priority_spec pri_spec;
-  int rv;
-
-  frame_pack_bufs_init(&bufs);
-
-  /* First, pack priority with priority group and weight */
-  nghttp2_priority_spec_init(&pri_spec, 1000000009, 12, 1);
-
-  nghttp2_frame_priority_init(&frame, 1000000007, &pri_spec);
-  rv = nghttp2_frame_pack_priority(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 5 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(5, NGHTTP2_PRIORITY, NGHTTP2_FLAG_NONE, 1000000007,
-                     &oframe.hd);
-
-  CU_ASSERT(1000000009 == oframe.pri_spec.stream_id);
-  CU_ASSERT(12 == oframe.pri_spec.weight);
-  CU_ASSERT(1 == oframe.pri_spec.exclusive);
-
-  nghttp2_frame_priority_free(&oframe);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_priority_free(&frame);
-}
-
-void test_nghttp2_frame_pack_rst_stream(void) {
-  nghttp2_rst_stream frame, oframe;
-  nghttp2_bufs bufs;
-  int rv;
-
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_frame_rst_stream_init(&frame, 1000000007, NGHTTP2_PROTOCOL_ERROR);
-  rv = nghttp2_frame_pack_rst_stream(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(4, NGHTTP2_RST_STREAM, NGHTTP2_FLAG_NONE, 1000000007,
-                     &oframe.hd);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == oframe.error_code);
-
-  nghttp2_frame_rst_stream_free(&oframe);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Unknown error code is passed to callback as is */
-  frame.error_code = 1000000009;
-  rv = nghttp2_frame_pack_rst_stream(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-
-  check_frame_header(4, NGHTTP2_RST_STREAM, NGHTTP2_FLAG_NONE, 1000000007,
-                     &oframe.hd);
-
-  CU_ASSERT(1000000009 == oframe.error_code);
-
-  nghttp2_frame_rst_stream_free(&oframe);
-
-  nghttp2_frame_rst_stream_free(&frame);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_frame_pack_settings() {
-  nghttp2_settings frame, oframe;
-  nghttp2_bufs bufs;
-  int i;
-  int rv;
-  nghttp2_settings_entry iv[] = {{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 256},
-                                 {NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, 16384},
-                                 {NGHTTP2_SETTINGS_HEADER_TABLE_SIZE, 4096}};
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_frame_settings_init(&frame, NGHTTP2_FLAG_NONE,
-                              nghttp2_frame_iv_copy(iv, 3, mem), 3);
-  rv = nghttp2_frame_pack_settings(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 3 * NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH ==
-            nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(3 * NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH, NGHTTP2_SETTINGS,
-                     NGHTTP2_FLAG_NONE, 0, &oframe.hd);
-  CU_ASSERT(3 == oframe.niv);
-  for (i = 0; i < 3; ++i) {
-    CU_ASSERT(iv[i].settings_id == oframe.iv[i].settings_id);
-    CU_ASSERT(iv[i].value == oframe.iv[i].value);
-  }
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_settings_free(&frame, mem);
-  nghttp2_frame_settings_free(&oframe, mem);
-}
-
-void test_nghttp2_frame_pack_push_promise() {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_push_promise frame, oframe;
-  nghttp2_bufs bufs;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nva_out out;
-  size_t hdblocklen;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  nva = headers(mem);
-  nvlen = HEADERS_LENGTH;
-  nghttp2_frame_push_promise_init(&frame, NGHTTP2_FLAG_END_HEADERS, 1000000007,
-                                  (1U << 31) - 1, nva, nvlen);
-  rv = nghttp2_frame_pack_push_promise(&bufs, &frame, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-
-  check_frame_header(nghttp2_bufs_len(&bufs) - NGHTTP2_FRAME_HDLEN,
-                     NGHTTP2_PUSH_PROMISE, NGHTTP2_FLAG_END_HEADERS, 1000000007,
-                     &oframe.hd);
-  CU_ASSERT((1U << 31) - 1 == oframe.promised_stream_id);
-
-  hdblocklen = nghttp2_bufs_len(&bufs) - NGHTTP2_FRAME_HDLEN - 4;
-  CU_ASSERT((ssize_t)hdblocklen ==
-            inflate_hd(&inflater, &out, &bufs, NGHTTP2_FRAME_HDLEN + 4, mem));
-
-  CU_ASSERT(7 == out.nvlen);
-  CU_ASSERT(nvnameeq("method", &out.nva[0]));
-  CU_ASSERT(nvvalueeq("GET", &out.nva[0]));
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_push_promise_free(&oframe, mem);
-  nghttp2_frame_push_promise_free(&frame, mem);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_frame_pack_ping(void) {
-  nghttp2_ping frame, oframe;
-  nghttp2_bufs bufs;
-  const uint8_t opaque_data[] = "01234567";
-  int rv;
-
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_frame_ping_init(&frame, NGHTTP2_FLAG_ACK, opaque_data);
-  rv = nghttp2_frame_pack_ping(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 8 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(8, NGHTTP2_PING, NGHTTP2_FLAG_ACK, 0, &oframe.hd);
-  CU_ASSERT(memcmp(opaque_data, oframe.opaque_data, sizeof(opaque_data) - 1) ==
-            0);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_ping_free(&oframe);
-  nghttp2_frame_ping_free(&frame);
-}
-
-void test_nghttp2_frame_pack_goaway() {
-  nghttp2_goaway frame, oframe;
-  nghttp2_bufs bufs;
-  size_t opaque_data_len = 16;
-  uint8_t *opaque_data;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  opaque_data = mem->malloc(opaque_data_len, NULL);
-  memcpy(opaque_data, "0123456789abcdef", opaque_data_len);
-  nghttp2_frame_goaway_init(&frame, 1000000007, NGHTTP2_PROTOCOL_ERROR,
-                            opaque_data, opaque_data_len);
-  rv = nghttp2_frame_pack_goaway(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 8 + opaque_data_len ==
-            nghttp2_bufs_len(&bufs));
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(24, NGHTTP2_GOAWAY, NGHTTP2_FLAG_NONE, 0, &oframe.hd);
-  CU_ASSERT(1000000007 == oframe.last_stream_id);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == oframe.error_code);
-
-  CU_ASSERT(opaque_data_len == oframe.opaque_data_len);
-  CU_ASSERT(memcmp(opaque_data, oframe.opaque_data, opaque_data_len) == 0);
-
-  nghttp2_frame_goaway_free(&oframe, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Unknown error code is passed to callback as is */
-  frame.error_code = 1000000009;
-
-  rv = nghttp2_frame_pack_goaway(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(24, NGHTTP2_GOAWAY, NGHTTP2_FLAG_NONE, 0, &oframe.hd);
-  CU_ASSERT(1000000009 == oframe.error_code);
-
-  nghttp2_frame_goaway_free(&oframe, mem);
-
-  nghttp2_frame_goaway_free(&frame, mem);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_frame_pack_window_update(void) {
-  nghttp2_window_update frame, oframe;
-  nghttp2_bufs bufs;
-  int rv;
-
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_frame_window_update_init(&frame, NGHTTP2_FLAG_NONE, 1000000007, 4096);
-  rv = nghttp2_frame_pack_window_update(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4 == nghttp2_bufs_len(&bufs));
-  CU_ASSERT(0 == unpack_framebuf((nghttp2_frame *)&oframe, &bufs));
-  check_frame_header(4, NGHTTP2_WINDOW_UPDATE, NGHTTP2_FLAG_NONE, 1000000007,
-                     &oframe.hd);
-  CU_ASSERT(4096 == oframe.window_size_increment);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_window_update_free(&oframe);
-  nghttp2_frame_window_update_free(&frame);
-}
-
-void test_nghttp2_frame_pack_altsvc(void) {
-  nghttp2_extension frame, oframe;
-  nghttp2_ext_altsvc altsvc, oaltsvc;
-  nghttp2_bufs bufs;
-  int rv;
-  size_t payloadlen;
-  static const uint8_t origin[] = "nghttp2.org";
-  static const uint8_t field_value[] = "h2=\":443\"";
-  nghttp2_buf buf;
-  uint8_t *rawbuf;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  frame_pack_bufs_init(&bufs);
-
-  frame.payload = &altsvc;
-  oframe.payload = &oaltsvc;
-
-  rawbuf = nghttp2_mem_malloc(mem, 32);
-  nghttp2_buf_wrap_init(&buf, rawbuf, 32);
-
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-  buf.last = nghttp2_cpymem(buf.last, field_value, sizeof(field_value) - 1);
-
-  nghttp2_frame_altsvc_init(&frame, 1000000007, buf.pos, sizeof(origin) - 1,
-                            buf.pos + sizeof(origin) - 1,
-                            sizeof(field_value) - 1);
-
-  payloadlen = 2 + sizeof(origin) - 1 + sizeof(field_value) - 1;
-
-  rv = nghttp2_frame_pack_altsvc(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + payloadlen == nghttp2_bufs_len(&bufs));
-
-  rv = unpack_framebuf((nghttp2_frame *)&oframe, &bufs);
-
-  CU_ASSERT(0 == rv);
-
-  check_frame_header(payloadlen, NGHTTP2_ALTSVC, NGHTTP2_FLAG_NONE, 1000000007,
-                     &oframe.hd);
-
-  CU_ASSERT(sizeof(origin) - 1 == oaltsvc.origin_len);
-  CU_ASSERT(0 == memcmp(origin, oaltsvc.origin, sizeof(origin) - 1));
-  CU_ASSERT(sizeof(field_value) - 1 == oaltsvc.field_value_len);
-  CU_ASSERT(0 ==
-            memcmp(field_value, oaltsvc.field_value, sizeof(field_value) - 1));
-
-  nghttp2_frame_altsvc_free(&oframe, mem);
-  nghttp2_frame_altsvc_free(&frame, mem);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_frame_pack_origin(void) {
-  nghttp2_extension frame, oframe;
-  nghttp2_ext_origin origin, oorigin;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  int rv;
-  size_t payloadlen;
-  static const uint8_t example[] = "https://example.com";
-  static const uint8_t nghttp2[] = "https://nghttp2.org";
-  nghttp2_origin_entry ov[] = {
-      {
-          (uint8_t *)example,
-          sizeof(example) - 1,
-      },
-      {
-          NULL,
-          0,
-      },
-      {
-          (uint8_t *)nghttp2,
-          sizeof(nghttp2) - 1,
-      },
-  };
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  frame_pack_bufs_init(&bufs);
-
-  frame.payload = &origin;
-  oframe.payload = &oorigin;
-
-  nghttp2_frame_origin_init(&frame, ov, 3);
-
-  payloadlen = 2 + sizeof(example) - 1 + 2 + 2 + sizeof(nghttp2) - 1;
-
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + payloadlen == nghttp2_bufs_len(&bufs));
-
-  rv = unpack_framebuf((nghttp2_frame *)&oframe, &bufs);
-
-  CU_ASSERT(0 == rv);
-
-  check_frame_header(payloadlen, NGHTTP2_ORIGIN, NGHTTP2_FLAG_NONE, 0,
-                     &oframe.hd);
-
-  CU_ASSERT(2 == oorigin.nov);
-  CU_ASSERT(sizeof(example) - 1 == oorigin.ov[0].origin_len);
-  CU_ASSERT(0 == memcmp(example, oorigin.ov[0].origin, sizeof(example) - 1));
-  CU_ASSERT(sizeof(nghttp2) - 1 == oorigin.ov[1].origin_len);
-  CU_ASSERT(0 == memcmp(nghttp2, oorigin.ov[1].origin, sizeof(nghttp2) - 1));
-
-  nghttp2_frame_origin_free(&oframe, mem);
-
-  /* Check the case where origin length is too large */
-  buf = &bufs.head->buf;
-  nghttp2_put_uint16be(buf->pos + NGHTTP2_FRAME_HDLEN,
-                       (uint16_t)(payloadlen - 1));
-
-  rv = unpack_framebuf((nghttp2_frame *)&oframe, &bufs);
-
-  CU_ASSERT(NGHTTP2_ERR_FRAME_SIZE_ERROR == rv);
-
-  nghttp2_bufs_reset(&bufs);
-  memset(&oframe, 0, sizeof(oframe));
-  memset(&oorigin, 0, sizeof(oorigin));
-  oframe.payload = &oorigin;
-
-  /* Empty ORIGIN frame */
-  nghttp2_frame_origin_init(&frame, NULL, 0);
-
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN == nghttp2_bufs_len(&bufs));
-
-  rv = unpack_framebuf((nghttp2_frame *)&oframe, &bufs);
-
-  CU_ASSERT(0 == rv);
-
-  check_frame_header(0, NGHTTP2_ORIGIN, NGHTTP2_FLAG_NONE, 0, &oframe.hd);
-
-  CU_ASSERT(0 == oorigin.nov);
-  CU_ASSERT(NULL == oorigin.ov);
-
-  nghttp2_frame_origin_free(&oframe, mem);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_nv_array_copy(void) {
-  nghttp2_nv *nva;
-  ssize_t rv;
-  nghttp2_nv emptynv[] = {MAKE_NV("", ""), MAKE_NV("", "")};
-  nghttp2_nv nv[] = {MAKE_NV("alpha", "bravo"), MAKE_NV("charlie", "delta")};
-  nghttp2_nv bignv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  bignv.name = (uint8_t *)"echo";
-  bignv.namelen = strlen("echo");
-  bignv.valuelen = (1 << 14) - 1;
-  bignv.value = mem->malloc(bignv.valuelen, NULL);
-  bignv.flags = NGHTTP2_NV_FLAG_NONE;
-  memset(bignv.value, '0', bignv.valuelen);
-
-  rv = nghttp2_nv_array_copy(&nva, NULL, 0, mem);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NULL == nva);
-
-  rv = nghttp2_nv_array_copy(&nva, emptynv, ARRLEN(emptynv), mem);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nva[0].namelen == 0);
-  CU_ASSERT(nva[0].valuelen == 0);
-  CU_ASSERT(nva[1].namelen == 0);
-  CU_ASSERT(nva[1].valuelen == 0);
-
-  nghttp2_nv_array_del(nva, mem);
-
-  rv = nghttp2_nv_array_copy(&nva, nv, ARRLEN(nv), mem);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nva[0].namelen == 5);
-  CU_ASSERT(0 == memcmp("alpha", nva[0].name, 5));
-  CU_ASSERT(nva[0].valuelen == 5);
-  CU_ASSERT(0 == memcmp("bravo", nva[0].value, 5));
-  CU_ASSERT(nva[1].namelen == 7);
-  CU_ASSERT(0 == memcmp("charlie", nva[1].name, 7));
-  CU_ASSERT(nva[1].valuelen == 5);
-  CU_ASSERT(0 == memcmp("delta", nva[1].value, 5));
-
-  nghttp2_nv_array_del(nva, mem);
-
-  /* Large header field is acceptable */
-  rv = nghttp2_nv_array_copy(&nva, &bignv, 1, mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_nv_array_del(nva, mem);
-
-  mem->free(bignv.value, NULL);
-}
-
-void test_nghttp2_iv_check(void) {
-  nghttp2_settings_entry iv[5];
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = 100;
-  iv[1].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[1].value = 1024;
-
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = NGHTTP2_MAX_WINDOW_SIZE;
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-
-  /* Too large window size */
-  iv[1].value = (uint32_t)NGHTTP2_MAX_WINDOW_SIZE + 1;
-  CU_ASSERT(0 == nghttp2_iv_check(iv, 2));
-
-  /* ENABLE_PUSH only allows 0 or 1 */
-  iv[1].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-  iv[1].value = 0;
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-  iv[1].value = 1;
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-  iv[1].value = 3;
-  CU_ASSERT(!nghttp2_iv_check(iv, 2));
-
-  /* Undefined SETTINGS ID is allowed */
-  iv[1].settings_id = 1000000009;
-  iv[1].value = 0;
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-
-  /* Full size SETTINGS_HEADER_TABLE_SIZE (UINT32_MAX) must be
-     accepted */
-  iv[1].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[1].value = UINT32_MAX;
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-
-  /* Too small SETTINGS_MAX_FRAME_SIZE */
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
-  iv[0].value = NGHTTP2_MAX_FRAME_SIZE_MIN - 1;
-  CU_ASSERT(!nghttp2_iv_check(iv, 1));
-
-  /* Too large SETTINGS_MAX_FRAME_SIZE */
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
-  iv[0].value = NGHTTP2_MAX_FRAME_SIZE_MAX + 1;
-  CU_ASSERT(!nghttp2_iv_check(iv, 1));
-
-  /* Max and min SETTINGS_MAX_FRAME_SIZE */
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
-  iv[0].value = NGHTTP2_MAX_FRAME_SIZE_MIN;
-  iv[1].settings_id = NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
-  iv[1].value = NGHTTP2_MAX_FRAME_SIZE_MAX;
-  CU_ASSERT(nghttp2_iv_check(iv, 2));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_frame_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_FRAME_TEST_H
-#define NGHTTP2_FRAME_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_frame_pack_headers(void);
-void test_nghttp2_frame_pack_headers_frame_too_large(void);
-void test_nghttp2_frame_pack_priority(void);
-void test_nghttp2_frame_pack_rst_stream(void);
-void test_nghttp2_frame_pack_settings(void);
-void test_nghttp2_frame_pack_push_promise(void);
-void test_nghttp2_frame_pack_ping(void);
-void test_nghttp2_frame_pack_goaway(void);
-void test_nghttp2_frame_pack_window_update(void);
-void test_nghttp2_frame_pack_altsvc(void);
-void test_nghttp2_frame_pack_origin(void);
-void test_nghttp2_nv_array_copy(void);
-void test_nghttp2_iv_check(void);
-
-#endif /* NGHTTP2_FRAME_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1540 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_hd_test.h"
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_hd.h"
-#include "nghttp2_frame.h"
-#include "nghttp2_test_helper.h"
-
-void test_nghttp2_hd_deflate(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_nv nva1[] = {MAKE_NV(":path", "/my-example/index.html"),
-                       MAKE_NV(":scheme", "https"), MAKE_NV("hello", "world")};
-  nghttp2_nv nva2[] = {MAKE_NV(":path", "/script.js"),
-                       MAKE_NV(":scheme", "https")};
-  nghttp2_nv nva3[] = {MAKE_NV("cookie", "k1=v1"), MAKE_NV("cookie", "k2=v2"),
-                       MAKE_NV("via", "proxy")};
-  nghttp2_nv nva4[] = {MAKE_NV(":path", "/style.css"),
-                       MAKE_NV("cookie", "k1=v1"), MAKE_NV("cookie", "k1=v1")};
-  nghttp2_nv nva5[] = {MAKE_NV(":path", "/style.css"),
-                       MAKE_NV("x-nghttp2", "")};
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nva_out out;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  CU_ASSERT(0 == nghttp2_hd_deflate_init(&deflater, mem));
-  CU_ASSERT(0 == nghttp2_hd_inflate_init(&inflater, mem));
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva1, ARRLEN(nva1));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(3 == out.nvlen);
-  assert_nv_equal(nva1, out.nva, 3, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Second headers */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva2, ARRLEN(nva2));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(2 == out.nvlen);
-  assert_nv_equal(nva2, out.nva, 2, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Third headers, including same header field name, but value is not
-     the same. */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva3, ARRLEN(nva3));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(3 == out.nvlen);
-  assert_nv_equal(nva3, out.nva, 3, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Fourth headers, including duplicate header fields. */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva4, ARRLEN(nva4));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(3 == out.nvlen);
-  assert_nv_equal(nva4, out.nva, 3, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Fifth headers includes empty value */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva5, ARRLEN(nva5));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(2 == out.nvlen);
-  assert_nv_equal(nva5, out.nva, 2, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Cleanup */
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_hd_deflate_same_indexed_repr(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_nv nva1[] = {MAKE_NV("host", "alpha"), MAKE_NV("host", "alpha")};
-  nghttp2_nv nva2[] = {MAKE_NV("host", "alpha"), MAKE_NV("host", "alpha"),
-                       MAKE_NV("host", "alpha")};
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nva_out out;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  CU_ASSERT(0 == nghttp2_hd_deflate_init(&deflater, mem));
-  CU_ASSERT(0 == nghttp2_hd_inflate_init(&inflater, mem));
-
-  /* Encode 2 same headers.  Emit 1 literal reprs and 1 index repr. */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva1, ARRLEN(nva1));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(2 == out.nvlen);
-  assert_nv_equal(nva1, out.nva, 2, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Encode 3 same headers.  This time, emits 3 index reprs. */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva2, ARRLEN(nva2));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen == 3);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(3 == out.nvlen);
-  assert_nv_equal(nva2, out.nva, 3, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Cleanup */
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_hd_inflate_indexed(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nv = MAKE_NV(":path", "/");
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  nghttp2_bufs_addb(&bufs, (1 << 7) | 4);
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(1 == blocklen);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-
-  assert_nv_equal(&nv, out.nva, 1, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* index = 0 is error */
-  nghttp2_bufs_addb(&bufs, 1 << 7);
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(1 == blocklen);
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_indname_noinc(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nv[] = {/* Huffman */
-                     MAKE_NV("user-agent", "nghttp2"),
-                     /* Expecting no huffman */
-                     MAKE_NV("user-agent", "x")};
-  size_t i;
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  for (i = 0; i < ARRLEN(nv); ++i) {
-    CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&bufs, 57, &nv[i],
-                                                 NGHTTP2_HD_WITHOUT_INDEXING));
-
-    blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-    CU_ASSERT(blocklen > 0);
-    CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-    CU_ASSERT(1 == out.nvlen);
-    assert_nv_equal(&nv[i], out.nva, 1, mem);
-    CU_ASSERT(0 == inflater.ctx.hd_table.len);
-    CU_ASSERT(61 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-
-    nva_out_reset(&out, mem);
-    nghttp2_bufs_reset(&bufs);
-  }
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_indname_inc(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nv = MAKE_NV("user-agent", "nghttp2");
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&bufs, 57, &nv,
-                                               NGHTTP2_HD_WITH_INDEXING));
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-  assert_nv_equal(&nv, out.nva, 1, mem);
-  CU_ASSERT(1 == inflater.ctx.hd_table.len);
-  CU_ASSERT(62 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-  assert_nv_equal(
-      &nv,
-      nghttp2_hd_inflate_get_table_entry(
-          &inflater, NGHTTP2_STATIC_TABLE_LENGTH + inflater.ctx.hd_table.len),
-      1, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_indname_inc_eviction(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  uint8_t value[1025];
-  nva_out out;
-  nghttp2_nv nv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  memset(value, '0', sizeof(value));
-  value[sizeof(value) - 1] = '\0';
-  nv.value = value;
-  nv.valuelen = sizeof(value) - 1;
-
-  nv.flags = NGHTTP2_NV_FLAG_NONE;
-
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&bufs, 14, &nv,
-                                               NGHTTP2_HD_WITH_INDEXING));
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&bufs, 15, &nv,
-                                               NGHTTP2_HD_WITH_INDEXING));
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&bufs, 16, &nv,
-                                               NGHTTP2_HD_WITH_INDEXING));
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&bufs, 17, &nv,
-                                               NGHTTP2_HD_WITH_INDEXING));
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(blocklen > 0);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(4 == out.nvlen);
-  CU_ASSERT(14 == out.nva[0].namelen);
-  CU_ASSERT(0 == memcmp("accept-charset", out.nva[0].name, out.nva[0].namelen));
-  CU_ASSERT(sizeof(value) - 1 == out.nva[0].valuelen);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  CU_ASSERT(3 == inflater.ctx.hd_table.len);
-  CU_ASSERT(64 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_newname_noinc(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nv[] = {/* Expecting huffman for both */
-                     MAKE_NV("my-long-content-length", "nghttp2"),
-                     /* Expecting no huffman for both */
-                     MAKE_NV("x", "y"),
-                     /* Huffman for key only */
-                     MAKE_NV("my-long-content-length", "y"),
-                     /* Huffman for value only */
-                     MAKE_NV("x", "nghttp2")};
-  size_t i;
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_inflate_init(&inflater, mem);
-  for (i = 0; i < ARRLEN(nv); ++i) {
-    CU_ASSERT(0 == nghttp2_hd_emit_newname_block(&bufs, &nv[i],
-                                                 NGHTTP2_HD_WITHOUT_INDEXING));
-
-    blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-    CU_ASSERT(blocklen > 0);
-    CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-    CU_ASSERT(1 == out.nvlen);
-    assert_nv_equal(&nv[i], out.nva, 1, mem);
-    CU_ASSERT(0 == inflater.ctx.hd_table.len);
-
-    nva_out_reset(&out, mem);
-    nghttp2_bufs_reset(&bufs);
-  }
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_newname_inc(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nv = MAKE_NV("x-rel", "nghttp2");
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  CU_ASSERT(
-      0 == nghttp2_hd_emit_newname_block(&bufs, &nv, NGHTTP2_HD_WITH_INDEXING));
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-  assert_nv_equal(&nv, out.nva, 1, mem);
-  CU_ASSERT(1 == inflater.ctx.hd_table.len);
-  assert_nv_equal(
-      &nv,
-      nghttp2_hd_inflate_get_table_entry(
-          &inflater, NGHTTP2_STATIC_TABLE_LENGTH + inflater.ctx.hd_table.len),
-      1, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_clearall_inc(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nv;
-  uint8_t value[4061];
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  bufs_large_init(&bufs, 8192);
-
-  nva_out_init(&out);
-  /* Total 4097 bytes space required to hold this entry */
-  nv.name = (uint8_t *)"alpha";
-  nv.namelen = strlen((char *)nv.name);
-  memset(value, '0', sizeof(value));
-  value[sizeof(value) - 1] = '\0';
-  nv.value = value;
-  nv.valuelen = sizeof(value) - 1;
-
-  nv.flags = NGHTTP2_NV_FLAG_NONE;
-
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  CU_ASSERT(
-      0 == nghttp2_hd_emit_newname_block(&bufs, &nv, NGHTTP2_HD_WITH_INDEXING));
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-  assert_nv_equal(&nv, out.nva, 1, mem);
-  CU_ASSERT(0 == inflater.ctx.hd_table.len);
-
-  nva_out_reset(&out, mem);
-
-  /* Do it again */
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-  assert_nv_equal(&nv, out.nva, 1, mem);
-  CU_ASSERT(0 == inflater.ctx.hd_table.len);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* This time, 4096 bytes space required, which is just fits in the
-     header table */
-  nv.valuelen = sizeof(value) - 2;
-
-  CU_ASSERT(
-      0 == nghttp2_hd_emit_newname_block(&bufs, &nv, NGHTTP2_HD_WITH_INDEXING));
-
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-  assert_nv_equal(&nv, out.nva, 1, mem);
-  CU_ASSERT(1 == inflater.ctx.hd_table.len);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_zero_length_huffman(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  /* Literal header without indexing - new name */
-  uint8_t data[] = {0x40, 0x01, 0x78 /* 'x' */, 0x80};
-  nva_out out;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-
-  nghttp2_bufs_add(&bufs, data, sizeof(data));
-
-  /* /\* Literal header without indexing - new name *\/ */
-  /* ptr[0] = 0x40; */
-  /* ptr[1] = 1; */
-  /* ptr[2] = 'x'; */
-  /* ptr[3] = 0x80; */
-
-  nghttp2_hd_inflate_init(&inflater, mem);
-  CU_ASSERT(4 == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(1 == out.nvlen);
-  CU_ASSERT(1 == out.nva[0].namelen);
-  CU_ASSERT('x' == out.nva[0].name[0]);
-  CU_ASSERT(NULL == out.nva[0].value);
-  CU_ASSERT(0 == out.nva[0].valuelen);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_inflate_expect_table_size_update(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  /* Indexed Header: :method: GET */
-  uint8_t data[] = {0x82};
-  nva_out out;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-  nva_out_init(&out);
-
-  nghttp2_bufs_add(&bufs, data, sizeof(data));
-  nghttp2_hd_inflate_init(&inflater, mem);
-  /* This will make inflater require table size update in the next
-     inflation. */
-  nghttp2_hd_inflate_change_table_size(&inflater, 4095);
-  nghttp2_hd_inflate_change_table_size(&inflater, 4096);
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* This does not require for encoder to emit table size update since
-   * size is not changed. */
-  nghttp2_hd_inflate_init(&inflater, mem);
-  nghttp2_hd_inflate_change_table_size(&inflater, 4096);
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* This does not require for encodre to emit table size update since
-     new size is larger than current size. */
-  nghttp2_hd_inflate_init(&inflater, mem);
-  nghttp2_hd_inflate_change_table_size(&inflater, 4097);
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* Received table size is strictly larger than minimum table size */
-  nghttp2_hd_inflate_init(&inflater, mem);
-  nghttp2_hd_inflate_change_table_size(&inflater, 111);
-  nghttp2_hd_inflate_change_table_size(&inflater, 4096);
-
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_hd_emit_table_size(&bufs, 112);
-
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* Receiving 2 table size updates, min and last value */
-  nghttp2_hd_inflate_init(&inflater, mem);
-  nghttp2_hd_inflate_change_table_size(&inflater, 111);
-  nghttp2_hd_inflate_change_table_size(&inflater, 4096);
-
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_hd_emit_table_size(&bufs, 111);
-  nghttp2_hd_emit_table_size(&bufs, 4096);
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* 2nd update is larger than last value */
-  nghttp2_hd_inflate_init(&inflater, mem);
-  nghttp2_hd_inflate_change_table_size(&inflater, 111);
-  nghttp2_hd_inflate_change_table_size(&inflater, 4095);
-
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_hd_emit_table_size(&bufs, 111);
-  nghttp2_hd_emit_table_size(&bufs, 4096);
-
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_hd_inflate_free(&inflater);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_hd_inflate_unexpected_table_size_update(void) {
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  /* Indexed Header: :method: GET, followed by table size update.
-     This violates RFC 7541. */
-  uint8_t data[] = {0x82, 0x20};
-  nva_out out;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-  nva_out_init(&out);
-
-  nghttp2_bufs_add(&bufs, data, sizeof(data));
-  nghttp2_hd_inflate_init(&inflater, mem);
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-}
-
-void test_nghttp2_hd_ringbuf_reserve(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_nv nv;
-  nghttp2_bufs bufs;
-  nva_out out;
-  int i;
-  ssize_t rv;
-  ssize_t blocklen;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-  nva_out_init(&out);
-
-  nv.flags = NGHTTP2_NV_FLAG_NONE;
-  nv.name = (uint8_t *)"a";
-  nv.namelen = strlen((const char *)nv.name);
-  nv.valuelen = 4;
-  nv.value = mem->malloc(nv.valuelen + 1, NULL);
-  memset(nv.value, 0, nv.valuelen);
-
-  nghttp2_hd_deflate_init2(&deflater, 8000, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  nghttp2_hd_inflate_change_table_size(&inflater, 8000);
-  nghttp2_hd_deflate_change_table_size(&deflater, 8000);
-
-  for (i = 0; i < 150; ++i) {
-    memcpy(nv.value, &i, sizeof(i));
-    rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, &nv, 1);
-    blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-    CU_ASSERT(0 == rv);
-    CU_ASSERT(blocklen > 0);
-
-    CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-    CU_ASSERT(1 == out.nvlen);
-    assert_nv_equal(&nv, out.nva, 1, mem);
-
-    nva_out_reset(&out, mem);
-    nghttp2_bufs_reset(&bufs);
-  }
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-
-  mem->free(nv.value, NULL);
-}
-
-void test_nghttp2_hd_change_table_size(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_nv nva[] = {MAKE_NV("alpha", "bravo"), MAKE_NV("charlie", "delta")};
-  nghttp2_nv nva2[] = {MAKE_NV(":path", "/")};
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  nva_out out;
-  ssize_t blocklen;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  /* inflater changes notifies 8000 max header table size */
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 8000));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 8000));
-
-  CU_ASSERT(4096 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(8000 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8000 == inflater.settings_hd_table_bufsize_max);
-
-  /* This will emit encoding context update with header table size 4096 */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(2 == deflater.ctx.hd_table.len);
-  CU_ASSERT(63 == nghttp2_hd_deflate_get_num_table_entries(&deflater));
-  CU_ASSERT(4096 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(2 == inflater.ctx.hd_table.len);
-  CU_ASSERT(63 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-  CU_ASSERT(4096 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8000 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* inflater changes header table size to 1024 */
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 1024));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 1024));
-
-  CU_ASSERT(1024 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(1024 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(1024 == inflater.settings_hd_table_bufsize_max);
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(2 == deflater.ctx.hd_table.len);
-  CU_ASSERT(63 == nghttp2_hd_deflate_get_num_table_entries(&deflater));
-  CU_ASSERT(1024 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(2 == inflater.ctx.hd_table.len);
-  CU_ASSERT(63 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-  CU_ASSERT(1024 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(1024 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* inflater changes header table size to 0 */
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 0));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 0));
-
-  CU_ASSERT(0 == deflater.ctx.hd_table.len);
-  CU_ASSERT(61 == nghttp2_hd_deflate_get_num_table_entries(&deflater));
-  CU_ASSERT(0 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(0 == inflater.ctx.hd_table.len);
-  CU_ASSERT(61 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-  CU_ASSERT(0 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(0 == inflater.settings_hd_table_bufsize_max);
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(0 == deflater.ctx.hd_table.len);
-  CU_ASSERT(61 == nghttp2_hd_deflate_get_num_table_entries(&deflater));
-  CU_ASSERT(0 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(0 == inflater.ctx.hd_table.len);
-  CU_ASSERT(61 == nghttp2_hd_inflate_get_num_table_entries(&inflater));
-  CU_ASSERT(0 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(0 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-
-  /* Check table buffer is expanded */
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_hd_deflate_init2(&deflater, 8192, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  /* First inflater changes header table size to 8000 */
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 8000));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 8000));
-
-  CU_ASSERT(8000 == deflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8000 == nghttp2_hd_deflate_get_max_dynamic_table_size(&deflater));
-  CU_ASSERT(8000 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8000 == nghttp2_hd_inflate_get_max_dynamic_table_size(&inflater));
-  CU_ASSERT(8000 == inflater.settings_hd_table_bufsize_max);
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(2 == deflater.ctx.hd_table.len);
-  CU_ASSERT(8000 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(2 == inflater.ctx.hd_table.len);
-  CU_ASSERT(8000 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8000 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 16383));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 16383));
-
-  CU_ASSERT(8192 == deflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(8192 == nghttp2_hd_deflate_get_max_dynamic_table_size(&deflater));
-
-  CU_ASSERT(16383 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(16383 == nghttp2_hd_inflate_get_max_dynamic_table_size(&inflater));
-  CU_ASSERT(16383 == inflater.settings_hd_table_bufsize_max);
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(2 == deflater.ctx.hd_table.len);
-  CU_ASSERT(8192 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(2 == inflater.ctx.hd_table.len);
-  CU_ASSERT(8192 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(16383 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Lastly, check the error condition */
-
-  rv = nghttp2_hd_emit_table_size(&bufs, 25600);
-  CU_ASSERT(rv == 0);
-  CU_ASSERT(NGHTTP2_ERR_HEADER_COMP ==
-            inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-
-  /* Check that encoder can handle the case where its allowable buffer
-     size is less than default size, 4096 */
-  nghttp2_hd_deflate_init2(&deflater, 1024, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  CU_ASSERT(1024 == deflater.ctx.hd_table_bufsize_max);
-
-  /* This emits context update with buffer size 1024 */
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(2 == deflater.ctx.hd_table.len);
-  CU_ASSERT(1024 == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(2 == inflater.ctx.hd_table.len);
-  CU_ASSERT(1024 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(4096 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-
-  /* Check that table size UINT32_MAX can be received */
-  nghttp2_hd_deflate_init2(&deflater, UINT32_MAX, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, UINT32_MAX));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, UINT32_MAX));
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, 2);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(UINT32_MAX == deflater.ctx.hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(UINT32_MAX == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(UINT32_MAX == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-
-  /* Check that context update emitted twice */
-  nghttp2_hd_deflate_init2(&deflater, 4096, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 0));
-  CU_ASSERT(0 == nghttp2_hd_inflate_change_table_size(&inflater, 3000));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 0));
-  CU_ASSERT(0 == nghttp2_hd_deflate_change_table_size(&deflater, 3000));
-
-  CU_ASSERT(0 == deflater.min_hd_table_bufsize_max);
-  CU_ASSERT(3000 == deflater.ctx.hd_table_bufsize_max);
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva2, 1);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(3 < blocklen);
-  CU_ASSERT(3000 == deflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(UINT32_MAX == deflater.min_hd_table_bufsize_max);
-
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(3000 == inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(3000 == inflater.settings_hd_table_bufsize_max);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-static void check_deflate_inflate(nghttp2_hd_deflater *deflater,
-                                  nghttp2_hd_inflater *inflater,
-                                  nghttp2_nv *nva, size_t nvlen,
-                                  nghttp2_mem *mem) {
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nva_out out;
-  int rv;
-
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  rv = nghttp2_hd_deflate_hd_bufs(deflater, &bufs, nva, nvlen);
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen >= 0);
-
-  CU_ASSERT(blocklen == inflate_hd(inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(nvlen == out.nvlen);
-  assert_nv_equal(nva, out.nva, nvlen, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_hd_deflate_inflate(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_nv nv1[] = {
-      MAKE_NV(":status", "200 OK"),
-      MAKE_NV("access-control-allow-origin", "*"),
-      MAKE_NV("cache-control", "private, max-age=0, must-revalidate"),
-      MAKE_NV("content-length", "76073"),
-      MAKE_NV("content-type", "text/html"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("server", "Apache"),
-      MAKE_NV("vary", "foobar"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "MISS from alphabravo"),
-      MAKE_NV("x-cache-action", "MISS"),
-      MAKE_NV("x-cache-age", "0"),
-      MAKE_NV("x-cache-lookup", "MISS from alphabravo:3128"),
-      MAKE_NV("x-lb-nocache", "true"),
-  };
-  nghttp2_nv nv2[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=56682045"),
-      MAKE_NV("content-type", "text/css"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Thu, 14 May 2015 07:22:57 GMT"),
-      MAKE_NV("last-modified", "Tue, 14 May 2013 07:22:15 GMT"),
-      MAKE_NV("vary", "Accept-Encoding"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128")};
-  nghttp2_nv nv3[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=56682072"),
-      MAKE_NV("content-type", "text/css"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Thu, 14 May 2015 07:23:24 GMT"),
-      MAKE_NV("last-modified", "Tue, 14 May 2013 07:22:13 GMT"),
-      MAKE_NV("vary", "Accept-Encoding"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv4[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=56682022"),
-      MAKE_NV("content-type", "text/css"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Thu, 14 May 2015 07:22:34 GMT"),
-      MAKE_NV("last-modified", "Tue, 14 May 2013 07:22:14 GMT"),
-      MAKE_NV("vary", "Accept-Encoding"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv5[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=4461139"),
-      MAKE_NV("content-type", "application/x-javascript"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Mon, 16 Sep 2013 21:34:31 GMT"),
-      MAKE_NV("last-modified", "Thu, 05 May 2011 09:15:59 GMT"),
-      MAKE_NV("vary", "Accept-Encoding"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv6[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=18645951"),
-      MAKE_NV("content-type", "application/x-javascript"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Fri, 28 Feb 2014 01:48:03 GMT"),
-      MAKE_NV("last-modified", "Tue, 12 Jul 2011 16:02:59 GMT"),
-      MAKE_NV("vary", "Accept-Encoding"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv7[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=31536000"),
-      MAKE_NV("content-type", "application/javascript"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("etag", "\"6807-4dc5b54e0dcc0\""),
-      MAKE_NV("expires", "Wed, 21 May 2014 08:32:17 GMT"),
-      MAKE_NV("last-modified", "Fri, 10 May 2013 11:18:51 GMT"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv8[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=31536000"),
-      MAKE_NV("content-type", "application/javascript"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("etag", "\"41c6-4de7d28585b00\""),
-      MAKE_NV("expires", "Thu, 12 Jun 2014 10:00:58 GMT"),
-      MAKE_NV("last-modified", "Thu, 06 Jun 2013 14:30:36 GMT"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv9[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=31536000"),
-      MAKE_NV("content-type", "application/javascript"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("etag", "\"19d6e-4dc5b35a541c0\""),
-      MAKE_NV("expires", "Wed, 21 May 2014 08:32:18 GMT"),
-      MAKE_NV("last-modified", "Fri, 10 May 2013 11:10:07 GMT"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_nv nv10[] = {
-      MAKE_NV(":status", "304 Not Modified"),
-      MAKE_NV("age", "0"),
-      MAKE_NV("cache-control", "max-age=56682045"),
-      MAKE_NV("content-type", "text/css"),
-      MAKE_NV("date", "Sat, 27 Jul 2013 06:22:12 GMT"),
-      MAKE_NV("expires", "Thu, 14 May 2015 07:22:57 GMT"),
-      MAKE_NV("last-modified", "Tue, 14 May 2013 07:21:53 GMT"),
-      MAKE_NV("vary", "Accept-Encoding"),
-      MAKE_NV("via", "1.1 alphabravo (squid/3.x.x), 1.1 nghttpx"),
-      MAKE_NV("x-cache", "HIT from alphabravo"),
-      MAKE_NV("x-cache-lookup", "HIT from alphabravo:3128"),
-  };
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  check_deflate_inflate(&deflater, &inflater, nv1, ARRLEN(nv1), mem);
-  check_deflate_inflate(&deflater, &inflater, nv2, ARRLEN(nv2), mem);
-  check_deflate_inflate(&deflater, &inflater, nv3, ARRLEN(nv3), mem);
-  check_deflate_inflate(&deflater, &inflater, nv4, ARRLEN(nv4), mem);
-  check_deflate_inflate(&deflater, &inflater, nv5, ARRLEN(nv5), mem);
-  check_deflate_inflate(&deflater, &inflater, nv6, ARRLEN(nv6), mem);
-  check_deflate_inflate(&deflater, &inflater, nv7, ARRLEN(nv7), mem);
-  check_deflate_inflate(&deflater, &inflater, nv8, ARRLEN(nv8), mem);
-  check_deflate_inflate(&deflater, &inflater, nv9, ARRLEN(nv9), mem);
-  check_deflate_inflate(&deflater, &inflater, nv10, ARRLEN(nv10), mem);
-
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_hd_no_index(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_hd_inflater inflater;
-  nghttp2_bufs bufs;
-  ssize_t blocklen;
-  nghttp2_nv nva[] = {
-      MAKE_NV(":method", "GET"), MAKE_NV(":method", "POST"),
-      MAKE_NV(":path", "/foo"),  MAKE_NV("version", "HTTP/1.1"),
-      MAKE_NV(":method", "GET"),
-  };
-  size_t i;
-  nva_out out;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  /* 1st :method: GET can be indexable, last one is not */
-  for (i = 1; i < ARRLEN(nva); ++i) {
-    nva[i].flags = NGHTTP2_NV_FLAG_NO_INDEX;
-  }
-
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_hd_inflate_init(&inflater, mem);
-
-  rv = nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, ARRLEN(nva));
-  blocklen = (ssize_t)nghttp2_bufs_len(&bufs);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(blocklen > 0);
-  CU_ASSERT(blocklen == inflate_hd(&inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(ARRLEN(nva) == out.nvlen);
-  assert_nv_equal(nva, out.nva, ARRLEN(nva), mem);
-
-  CU_ASSERT(out.nva[0].flags == NGHTTP2_NV_FLAG_NONE);
-  for (i = 1; i < ARRLEN(nva); ++i) {
-    CU_ASSERT(out.nva[i].flags == NGHTTP2_NV_FLAG_NO_INDEX);
-  }
-
-  nva_out_reset(&out, mem);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_hd_deflate_bound(void) {
-  nghttp2_hd_deflater deflater;
-  nghttp2_nv nva[] = {MAKE_NV(":method", "GET"), MAKE_NV("alpha", "bravo")};
-  nghttp2_bufs bufs;
-  size_t bound, bound2;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  bound = nghttp2_hd_deflate_bound(&deflater, nva, ARRLEN(nva));
-
-  CU_ASSERT(12 + 6 * 2 * 2 + nva[0].namelen + nva[0].valuelen + nva[1].namelen +
-                nva[1].valuelen ==
-            bound);
-
-  nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, nva, ARRLEN(nva));
-
-  CU_ASSERT(bound > (size_t)nghttp2_bufs_len(&bufs));
-
-  bound2 = nghttp2_hd_deflate_bound(&deflater, nva, ARRLEN(nva));
-
-  CU_ASSERT(bound == bound2);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-}
-
-void test_nghttp2_hd_public_api(void) {
-  nghttp2_hd_deflater *deflater;
-  nghttp2_hd_inflater *inflater;
-  nghttp2_nv nva[] = {MAKE_NV("alpha", "bravo"), MAKE_NV("charlie", "delta")};
-  uint8_t buf[4096];
-  size_t buflen;
-  ssize_t blocklen;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  CU_ASSERT(0 == nghttp2_hd_deflate_new(&deflater, 4096));
-  CU_ASSERT(0 == nghttp2_hd_inflate_new(&inflater));
-
-  buflen = nghttp2_hd_deflate_bound(deflater, nva, ARRLEN(nva));
-
-  blocklen = nghttp2_hd_deflate_hd(deflater, buf, buflen, nva, ARRLEN(nva));
-
-  CU_ASSERT(blocklen > 0);
-
-  nghttp2_bufs_wrap_init(&bufs, buf, (size_t)blocklen, mem);
-  bufs.head->buf.last += blocklen;
-
-  CU_ASSERT(blocklen == inflate_hd(inflater, NULL, &bufs, 0, mem));
-
-  nghttp2_bufs_wrap_free(&bufs);
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-
-  /* See NGHTTP2_ERR_INSUFF_BUFSIZE */
-  CU_ASSERT(0 == nghttp2_hd_deflate_new(&deflater, 4096));
-
-  blocklen = nghttp2_hd_deflate_hd(deflater, buf, (size_t)(blocklen - 1), nva,
-                                   ARRLEN(nva));
-
-  CU_ASSERT(NGHTTP2_ERR_INSUFF_BUFSIZE == blocklen);
-
-  nghttp2_hd_deflate_del(deflater);
-}
-
-void test_nghttp2_hd_deflate_hd_vec(void) {
-  nghttp2_hd_deflater *deflater;
-  nghttp2_hd_inflater *inflater;
-  nghttp2_nv nva[] = {
-      MAKE_NV(":method", "PUT"),
-      MAKE_NV(":scheme", "https"),
-      MAKE_NV(":authority", "localhost:3000"),
-      MAKE_NV(":path", "/usr/foo/alpha/bravo"),
-      MAKE_NV("content-type", "image/png"),
-      MAKE_NV("content-length", "1000000007"),
-  };
-  uint8_t buf[4096];
-  ssize_t blocklen;
-  nghttp2_mem *mem;
-  nghttp2_vec vec[256];
-  size_t buflen;
-  nghttp2_bufs bufs;
-  nva_out out;
-  size_t i;
-
-  mem = nghttp2_mem_default();
-
-  nva_out_init(&out);
-
-  nghttp2_hd_deflate_new(&deflater, 4096);
-  nghttp2_hd_inflate_new(&inflater);
-
-  buflen = nghttp2_hd_deflate_bound(deflater, nva, ARRLEN(nva));
-
-  vec[0].base = &buf[0];
-  vec[0].len = buflen / 2;
-  vec[1].base = &buf[buflen / 2];
-  vec[1].len = buflen / 2;
-
-  blocklen = nghttp2_hd_deflate_hd_vec(deflater, vec, 2, nva, ARRLEN(nva));
-
-  CU_ASSERT(blocklen > 0);
-
-  nghttp2_bufs_wrap_init(&bufs, buf, (size_t)blocklen, mem);
-  bufs.head->buf.last += blocklen;
-
-  CU_ASSERT(blocklen == inflate_hd(inflater, &out, &bufs, 0, mem));
-
-  CU_ASSERT(ARRLEN(nva) == out.nvlen);
-  assert_nv_equal(nva, out.nva, ARRLEN(nva), mem);
-
-  nghttp2_bufs_wrap_free(&bufs);
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-  nva_out_reset(&out, mem);
-
-  /* check the case when veclen is 0 */
-  nghttp2_hd_deflate_new(&deflater, 4096);
-  nghttp2_hd_inflate_new(&inflater);
-
-  blocklen = nghttp2_hd_deflate_hd_vec(deflater, NULL, 0, nva, ARRLEN(nva));
-
-  CU_ASSERT(NGHTTP2_ERR_INSUFF_BUFSIZE == blocklen);
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-
-  /* check the case when chunk length is 0 */
-  vec[0].base = NULL;
-  vec[0].len = 0;
-  vec[1].base = NULL;
-  vec[1].len = 0;
-
-  nghttp2_hd_deflate_new(&deflater, 4096);
-  nghttp2_hd_inflate_new(&inflater);
-
-  blocklen = nghttp2_hd_deflate_hd_vec(deflater, vec, 2, nva, ARRLEN(nva));
-
-  CU_ASSERT(NGHTTP2_ERR_INSUFF_BUFSIZE == blocklen);
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-
-  /* check the case where chunk size differs in each chunk */
-  nghttp2_hd_deflate_new(&deflater, 4096);
-  nghttp2_hd_inflate_new(&inflater);
-
-  buflen = nghttp2_hd_deflate_bound(deflater, nva, ARRLEN(nva));
-
-  vec[0].base = &buf[0];
-  vec[0].len = buflen / 2;
-  vec[1].base = &buf[buflen / 2];
-  vec[1].len = (buflen / 2) + 1;
-
-  blocklen = nghttp2_hd_deflate_hd_vec(deflater, vec, 2, nva, ARRLEN(nva));
-
-  CU_ASSERT(blocklen > 0);
-
-  nghttp2_bufs_wrap_init(&bufs, buf, (size_t)blocklen, mem);
-  bufs.head->buf.last += blocklen;
-
-  CU_ASSERT(blocklen == inflate_hd(inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(ARRLEN(nva) == out.nvlen);
-  assert_nv_equal(nva, out.nva, ARRLEN(nva), mem);
-
-  nghttp2_bufs_wrap_free(&bufs);
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-  nva_out_reset(&out, mem);
-
-  /* check the case where chunk size is 1 */
-  nghttp2_hd_deflate_new(&deflater, 4096);
-  nghttp2_hd_inflate_new(&inflater);
-
-  buflen = nghttp2_hd_deflate_bound(deflater, nva, ARRLEN(nva));
-
-  assert(buflen <= ARRLEN(vec));
-
-  for (i = 0; i < buflen; ++i) {
-    vec[i].base = &buf[i];
-    vec[i].len = 1;
-  }
-
-  blocklen = nghttp2_hd_deflate_hd_vec(deflater, vec, buflen, nva, ARRLEN(nva));
-
-  CU_ASSERT(blocklen > 0);
-
-  nghttp2_bufs_wrap_init(&bufs, buf, (size_t)blocklen, mem);
-  bufs.head->buf.last += blocklen;
-
-  CU_ASSERT(blocklen == inflate_hd(inflater, &out, &bufs, 0, mem));
-  CU_ASSERT(ARRLEN(nva) == out.nvlen);
-  assert_nv_equal(nva, out.nva, ARRLEN(nva), mem);
-
-  nghttp2_bufs_wrap_free(&bufs);
-
-  nghttp2_hd_inflate_del(inflater);
-  nghttp2_hd_deflate_del(deflater);
-  nva_out_reset(&out, mem);
-}
-
-static size_t encode_length(uint8_t *buf, uint64_t n, size_t prefix) {
-  size_t k = (size_t)((1 << prefix) - 1);
-  size_t len = 0;
-  *buf = (uint8_t)(*buf & ~k);
-  if (n >= k) {
-    *buf = (uint8_t)(*buf | k);
-    ++buf;
-    n -= k;
-    ++len;
-  } else {
-    *buf = (uint8_t)(*buf | n);
-    ++buf;
-    return 1;
-  }
-  do {
-    ++len;
-    if (n >= 128) {
-      *buf = (uint8_t)((1 << 7) | (n & 0x7f));
-      ++buf;
-      n >>= 7;
-    } else {
-      *buf++ = (uint8_t)n;
-      break;
-    }
-  } while (n);
-  return len;
-}
-
-void test_nghttp2_hd_decode_length(void) {
-  uint32_t out;
-  size_t shift;
-  int fin;
-  uint8_t buf[16];
-  uint8_t *bufp;
-  size_t len;
-  ssize_t rv;
-  size_t i;
-
-  memset(buf, 0, sizeof(buf));
-  len = encode_length(buf, UINT32_MAX, 7);
-
-  rv = nghttp2_hd_decode_length(&out, &shift, &fin, 0, 0, buf, buf + len, 7);
-
-  CU_ASSERT((ssize_t)len == rv);
-  CU_ASSERT(0 != fin);
-  CU_ASSERT(UINT32_MAX == out);
-
-  /* Make sure that we can decode integer if we feed 1 byte at a
-     time */
-  out = 0;
-  shift = 0;
-  fin = 0;
-  bufp = buf;
-
-  for (i = 0; i < len; ++i, ++bufp) {
-    rv = nghttp2_hd_decode_length(&out, &shift, &fin, out, shift, bufp,
-                                  bufp + 1, 7);
-
-    CU_ASSERT(rv == 1);
-
-    if (fin) {
-      break;
-    }
-  }
-
-  CU_ASSERT(i == len - 1);
-  CU_ASSERT(0 != fin);
-  CU_ASSERT(UINT32_MAX == out);
-
-  /* Check overflow case */
-  memset(buf, 0, sizeof(buf));
-  len = encode_length(buf, 1ll << 32, 7);
-
-  rv = nghttp2_hd_decode_length(&out, &shift, &fin, 0, 0, buf, buf + len, 7);
-
-  CU_ASSERT(-1 == rv);
-
-  /* Check the case that shift goes beyond 32 bits */
-  buf[0] = 255;
-  buf[1] = 128;
-  buf[2] = 128;
-  buf[3] = 128;
-  buf[4] = 128;
-  buf[5] = 128;
-  buf[6] = 1;
-
-  rv = nghttp2_hd_decode_length(&out, &shift, &fin, 0, 0, buf, buf + 7, 8);
-
-  CU_ASSERT(-1 == rv);
-}
-
-void test_nghttp2_hd_huff_encode(void) {
-  int rv;
-  ssize_t len;
-  nghttp2_buf outbuf;
-  nghttp2_bufs bufs;
-  nghttp2_hd_huff_decode_context ctx;
-  const uint8_t t1[] = {22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11,
-                        10, 9,  8,  7,  6,  5,  4,  3,  2,  1,  0};
-  uint8_t b[256];
-
-  nghttp2_buf_wrap_init(&outbuf, b, sizeof(b));
-  frame_pack_bufs_init(&bufs);
-
-  rv = nghttp2_hd_huff_encode(&bufs, t1, sizeof(t1));
-
-  CU_ASSERT(rv == 0);
-
-  nghttp2_hd_huff_decode_context_init(&ctx);
-
-  len = nghttp2_hd_huff_decode(&ctx, &outbuf, bufs.cur->buf.pos,
-                               nghttp2_bufs_len(&bufs), 1);
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == len);
-  CU_ASSERT((ssize_t)sizeof(t1) == nghttp2_buf_len(&outbuf));
-
-  CU_ASSERT(0 == memcmp(t1, outbuf.pos, sizeof(t1)));
-
-  nghttp2_bufs_free(&bufs);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_hd_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_HD_TEST_H
-#define NGHTTP2_HD_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_hd_deflate(void);
-void test_nghttp2_hd_deflate_same_indexed_repr(void);
-void test_nghttp2_hd_inflate_indexed(void);
-void test_nghttp2_hd_inflate_indname_noinc(void);
-void test_nghttp2_hd_inflate_indname_inc(void);
-void test_nghttp2_hd_inflate_indname_inc_eviction(void);
-void test_nghttp2_hd_inflate_newname_noinc(void);
-void test_nghttp2_hd_inflate_newname_inc(void);
-void test_nghttp2_hd_inflate_clearall_inc(void);
-void test_nghttp2_hd_inflate_zero_length_huffman(void);
-void test_nghttp2_hd_inflate_expect_table_size_update(void);
-void test_nghttp2_hd_inflate_unexpected_table_size_update(void);
-void test_nghttp2_hd_ringbuf_reserve(void);
-void test_nghttp2_hd_change_table_size(void);
-void test_nghttp2_hd_deflate_inflate(void);
-void test_nghttp2_hd_no_index(void);
-void test_nghttp2_hd_deflate_bound(void);
-void test_nghttp2_hd_public_api(void);
-void test_nghttp2_hd_deflate_hd_vec(void);
-void test_nghttp2_hd_decode_length(void);
-void test_nghttp2_hd_huff_encode(void);
-
-#endif /* NGHTTP2_HD_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_helper_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_helper.h"
-
-void test_nghttp2_adjust_local_window_size(void) {
-  int32_t local_window_size = 100;
-  int32_t recv_window_size = 50;
-  int32_t recv_reduction = 0;
-  int32_t delta;
-
-  delta = 0;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(100 == local_window_size);
-  CU_ASSERT(50 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(0 == delta);
-
-  delta = 49;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(100 == local_window_size);
-  CU_ASSERT(1 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(49 == delta);
-
-  delta = 1;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(100 == local_window_size);
-  CU_ASSERT(0 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(1 == delta);
-
-  delta = 1;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(101 == local_window_size);
-  CU_ASSERT(0 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(1 == delta);
-
-  delta = -1;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(100 == local_window_size);
-  CU_ASSERT(-1 == recv_window_size);
-  CU_ASSERT(1 == recv_reduction);
-  CU_ASSERT(0 == delta);
-
-  delta = 1;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(101 == local_window_size);
-  CU_ASSERT(0 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(0 == delta);
-
-  delta = 100;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(201 == local_window_size);
-  CU_ASSERT(0 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(100 == delta);
-
-  delta = -3;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(198 == local_window_size);
-  CU_ASSERT(-3 == recv_window_size);
-  CU_ASSERT(3 == recv_reduction);
-  CU_ASSERT(0 == delta);
-
-  recv_window_size += 3;
-
-  delta = 3;
-  CU_ASSERT(0 == nghttp2_adjust_local_window_size(&local_window_size,
-                                                  &recv_window_size,
-                                                  &recv_reduction, &delta));
-  CU_ASSERT(201 == local_window_size);
-  CU_ASSERT(3 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(0 == delta);
-
-  local_window_size = 100;
-  recv_window_size = 50;
-  recv_reduction = 0;
-  delta = INT32_MAX;
-  CU_ASSERT(NGHTTP2_ERR_FLOW_CONTROL ==
-            nghttp2_adjust_local_window_size(&local_window_size,
-                                             &recv_window_size, &recv_reduction,
-                                             &delta));
-  CU_ASSERT(100 == local_window_size);
-  CU_ASSERT(50 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(INT32_MAX == delta);
-
-  delta = INT32_MIN;
-  CU_ASSERT(NGHTTP2_ERR_FLOW_CONTROL ==
-            nghttp2_adjust_local_window_size(&local_window_size,
-                                             &recv_window_size, &recv_reduction,
-                                             &delta));
-  CU_ASSERT(100 == local_window_size);
-  CU_ASSERT(50 == recv_window_size);
-  CU_ASSERT(0 == recv_reduction);
-  CU_ASSERT(INT32_MIN == delta);
-}
-
-#define check_header_name(S)                                                   \
-  nghttp2_check_header_name((const uint8_t *)S, sizeof(S) - 1)
-
-void test_nghttp2_check_header_name(void) {
-  CU_ASSERT(check_header_name(":path"));
-  CU_ASSERT(check_header_name("path"));
-  CU_ASSERT(check_header_name("!#$%&'*+-.^_`|~"));
-  CU_ASSERT(!check_header_name(":PATH"));
-  CU_ASSERT(!check_header_name("path:"));
-  CU_ASSERT(!check_header_name(""));
-  CU_ASSERT(!check_header_name(":"));
-}
-
-#define check_header_value(S)                                                  \
-  nghttp2_check_header_value((const uint8_t *)S, sizeof(S) - 1)
-
-void test_nghttp2_check_header_value(void) {
-  uint8_t goodval[] = {'a', 'b', 0x80u, 'c', 0xffu, 'd', '\t', ' '};
-  uint8_t badval1[] = {'a', 0x1fu, 'b'};
-  uint8_t badval2[] = {'a', 0x7fu, 'b'};
-
-  CU_ASSERT(check_header_value(" !|}~"));
-  CU_ASSERT(check_header_value(goodval));
-  CU_ASSERT(!check_header_value(badval1));
-  CU_ASSERT(!check_header_value(badval2));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_helper_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_HELPER_TEST_H
-#define NGHTTP2_HELPER_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_adjust_local_window_size(void);
-void test_nghttp2_check_header_name(void);
-void test_nghttp2_check_header_value(void);
-
-#endif /* NGHTTP2_HELPER_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_map_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_map.h"
-
-typedef struct strentry {
-  nghttp2_map_entry map_entry;
-  const char *str;
-} strentry;
-
-static void strentry_init(strentry *entry, key_type key, const char *str) {
-  nghttp2_map_entry_init(&entry->map_entry, key);
-  entry->str = str;
-}
-
-void test_nghttp2_map(void) {
-  strentry foo, FOO, bar, baz, shrubbery;
-  nghttp2_map map;
-  nghttp2_map_init(&map, nghttp2_mem_default());
-
-  strentry_init(&foo, 1, "foo");
-  strentry_init(&FOO, 1, "FOO");
-  strentry_init(&bar, 2, "bar");
-  strentry_init(&baz, 3, "baz");
-  strentry_init(&shrubbery, 4, "shrubbery");
-
-  CU_ASSERT(0 == nghttp2_map_insert(&map, &foo.map_entry));
-  CU_ASSERT(strcmp("foo", ((strentry *)nghttp2_map_find(&map, 1))->str) == 0);
-  CU_ASSERT(1 == nghttp2_map_size(&map));
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_map_insert(&map, &FOO.map_entry));
-
-  CU_ASSERT(1 == nghttp2_map_size(&map));
-  CU_ASSERT(strcmp("foo", ((strentry *)nghttp2_map_find(&map, 1))->str) == 0);
-
-  CU_ASSERT(0 == nghttp2_map_insert(&map, &bar.map_entry));
-  CU_ASSERT(2 == nghttp2_map_size(&map));
-
-  CU_ASSERT(0 == nghttp2_map_insert(&map, &baz.map_entry));
-  CU_ASSERT(3 == nghttp2_map_size(&map));
-
-  CU_ASSERT(0 == nghttp2_map_insert(&map, &shrubbery.map_entry));
-  CU_ASSERT(4 == nghttp2_map_size(&map));
-
-  CU_ASSERT(strcmp("baz", ((strentry *)nghttp2_map_find(&map, 3))->str) == 0);
-
-  nghttp2_map_remove(&map, 3);
-  CU_ASSERT(3 == nghttp2_map_size(&map));
-  CU_ASSERT(NULL == nghttp2_map_find(&map, 3));
-
-  nghttp2_map_remove(&map, 1);
-  CU_ASSERT(2 == nghttp2_map_size(&map));
-  CU_ASSERT(NULL == nghttp2_map_find(&map, 1));
-
-  /* Erasing non-existent entry */
-  nghttp2_map_remove(&map, 1);
-  CU_ASSERT(2 == nghttp2_map_size(&map));
-  CU_ASSERT(NULL == nghttp2_map_find(&map, 1));
-
-  CU_ASSERT(strcmp("bar", ((strentry *)nghttp2_map_find(&map, 2))->str) == 0);
-  CU_ASSERT(strcmp("shrubbery", ((strentry *)nghttp2_map_find(&map, 4))->str) ==
-            0);
-
-  nghttp2_map_free(&map);
-}
-
-static void shuffle(int *a, int n) {
-  int i;
-  for (i = n - 1; i >= 1; --i) {
-    size_t j = (size_t)((double)(i + 1) * rand() / (RAND_MAX + 1.0));
-    int t = a[j];
-    a[j] = a[i];
-    a[i] = t;
-  }
-}
-
-static int eachfun(nghttp2_map_entry *entry, void *ptr) {
-  (void)entry;
-  (void)ptr;
-
-  return 0;
-}
-
-#define NUM_ENT 6000
-static strentry arr[NUM_ENT];
-static int order[NUM_ENT];
-
-void test_nghttp2_map_functional(void) {
-  nghttp2_map map;
-  int i;
-
-  nghttp2_map_init(&map, nghttp2_mem_default());
-  for (i = 0; i < NUM_ENT; ++i) {
-    strentry_init(&arr[i], i + 1, "foo");
-    order[i] = i + 1;
-  }
-  /* insertion */
-  shuffle(order, NUM_ENT);
-  for (i = 0; i < NUM_ENT; ++i) {
-    CU_ASSERT(0 == nghttp2_map_insert(&map, &arr[order[i] - 1].map_entry));
-  }
-  /* traverse */
-  nghttp2_map_each(&map, eachfun, NULL);
-  /* find */
-  shuffle(order, NUM_ENT);
-  for (i = 0; i < NUM_ENT; ++i) {
-    nghttp2_map_find(&map, order[i]);
-  }
-  /* remove */
-  shuffle(order, NUM_ENT);
-  for (i = 0; i < NUM_ENT; ++i) {
-    CU_ASSERT(0 == nghttp2_map_remove(&map, order[i]));
-  }
-
-  /* each_free (but no op function for testing purpose) */
-  for (i = 0; i < NUM_ENT; ++i) {
-    strentry_init(&arr[i], i + 1, "foo");
-  }
-  /* insert once again */
-  for (i = 0; i < NUM_ENT; ++i) {
-    CU_ASSERT(0 == nghttp2_map_insert(&map, &arr[i].map_entry));
-  }
-  nghttp2_map_each_free(&map, eachfun, NULL);
-  nghttp2_map_free(&map);
-}
-
-static int entry_free(nghttp2_map_entry *entry, void *ptr) {
-  nghttp2_mem *mem = ptr;
-
-  mem->free(entry, NULL);
-  return 0;
-}
-
-void test_nghttp2_map_each_free(void) {
-  nghttp2_mem *mem = nghttp2_mem_default();
-  strentry *foo = mem->malloc(sizeof(strentry), NULL),
-           *bar = mem->malloc(sizeof(strentry), NULL),
-           *baz = mem->malloc(sizeof(strentry), NULL),
-           *shrubbery = mem->malloc(sizeof(strentry), NULL);
-  nghttp2_map map;
-  nghttp2_map_init(&map, nghttp2_mem_default());
-
-  strentry_init(foo, 1, "foo");
-  strentry_init(bar, 2, "bar");
-  strentry_init(baz, 3, "baz");
-  strentry_init(shrubbery, 4, "shrubbery");
-
-  nghttp2_map_insert(&map, &foo->map_entry);
-  nghttp2_map_insert(&map, &bar->map_entry);
-  nghttp2_map_insert(&map, &baz->map_entry);
-  nghttp2_map_insert(&map, &shrubbery->map_entry);
-
-  nghttp2_map_each_free(&map, entry_free, mem);
-  nghttp2_map_free(&map);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_map_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_MAP_TEST_H
-#define NGHTTP2_MAP_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_map(void);
-void test_nghttp2_map_functional(void);
-void test_nghttp2_map_each_free(void);
-
-#endif /* NGHTTP2_MAP_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Twist Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_npn_test.h"
-
-#include <string.h>
-
-#include <CUnit/CUnit.h>
-#include <nghttp2/nghttp2.h>
-
-static void http2(void) {
-  const unsigned char p[] = {8,   'h', 't', 't', 'p', '/', '1', '.', '1', 2,
-                             'h', '2', 6,   's', 'p', 'd', 'y', '/', '3'};
-  unsigned char outlen;
-  unsigned char *out;
-  CU_ASSERT(1 == nghttp2_select_next_protocol(&out, &outlen, p, sizeof(p)));
-  CU_ASSERT(NGHTTP2_PROTO_VERSION_ID_LEN == outlen);
-  CU_ASSERT(memcmp(NGHTTP2_PROTO_VERSION_ID, out, outlen) == 0);
-}
-
-static void http11(void) {
-  const unsigned char spdy[] = {
-      6,   's', 'p', 'd', 'y', '/', '4', 8,   's', 'p', 'd', 'y', '/',
-      '2', '.', '1', 8,   'h', 't', 't', 'p', '/', '1', '.', '1',
-  };
-  unsigned char outlen;
-  unsigned char *out;
-  CU_ASSERT(0 ==
-            nghttp2_select_next_protocol(&out, &outlen, spdy, sizeof(spdy)));
-  CU_ASSERT(8 == outlen);
-  CU_ASSERT(memcmp("http/1.1", out, outlen) == 0);
-}
-
-static void no_overlap(void) {
-  const unsigned char spdy[] = {
-      6,   's', 'p', 'd', 'y', '/', '4', 8,   's', 'p', 'd', 'y', '/',
-      '2', '.', '1', 8,   'h', 't', 't', 'p', '/', '1', '.', '0',
-  };
-  unsigned char outlen = 0;
-  unsigned char *out = NULL;
-  CU_ASSERT(-1 ==
-            nghttp2_select_next_protocol(&out, &outlen, spdy, sizeof(spdy)));
-  CU_ASSERT(0 == outlen);
-  CU_ASSERT(NULL == out);
-}
-
-void test_nghttp2_npn(void) {
-  http2();
-  http11();
-  no_overlap();
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_npn_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Twist Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_NPN_TEST_H
-#define NGHTTP2_NPN_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_npn(void);
-
-#endif /* NGHTTP2_NPN_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_pq_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_pq.h"
-
-typedef struct {
-  nghttp2_pq_entry ent;
-  const char *s;
-} string_entry;
-
-static string_entry *string_entry_new(const char *s) {
-  nghttp2_mem *mem;
-  string_entry *ent;
-
-  mem = nghttp2_mem_default();
-
-  ent = nghttp2_mem_malloc(mem, sizeof(string_entry));
-  ent->s = s;
-
-  return ent;
-}
-
-static void string_entry_del(string_entry *ent) { free(ent); }
-
-static int pq_less(const void *lhs, const void *rhs) {
-  return strcmp(((string_entry *)lhs)->s, ((string_entry *)rhs)->s) < 0;
-}
-
-void test_nghttp2_pq(void) {
-  int i;
-  nghttp2_pq pq;
-  string_entry *top;
-
-  nghttp2_pq_init(&pq, pq_less, nghttp2_mem_default());
-  CU_ASSERT(nghttp2_pq_empty(&pq));
-  CU_ASSERT(0 == nghttp2_pq_size(&pq));
-  CU_ASSERT(0 == nghttp2_pq_push(&pq, &string_entry_new("foo")->ent));
-  CU_ASSERT(0 == nghttp2_pq_empty(&pq));
-  CU_ASSERT(1 == nghttp2_pq_size(&pq));
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("foo", top->s) == 0);
-  CU_ASSERT(0 == nghttp2_pq_push(&pq, &string_entry_new("bar")->ent));
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("bar", top->s) == 0);
-  CU_ASSERT(0 == nghttp2_pq_push(&pq, &string_entry_new("baz")->ent));
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("bar", top->s) == 0);
-  CU_ASSERT(0 == nghttp2_pq_push(&pq, &string_entry_new("C")->ent));
-  CU_ASSERT(4 == nghttp2_pq_size(&pq));
-
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("C", top->s) == 0);
-  string_entry_del(top);
-  nghttp2_pq_pop(&pq);
-
-  CU_ASSERT(3 == nghttp2_pq_size(&pq));
-
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("bar", top->s) == 0);
-  nghttp2_pq_pop(&pq);
-  string_entry_del(top);
-
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("baz", top->s) == 0);
-  nghttp2_pq_pop(&pq);
-  string_entry_del(top);
-
-  top = (string_entry *)nghttp2_pq_top(&pq);
-  CU_ASSERT(strcmp("foo", top->s) == 0);
-  nghttp2_pq_pop(&pq);
-  string_entry_del(top);
-
-  CU_ASSERT(nghttp2_pq_empty(&pq));
-  CU_ASSERT(0 == nghttp2_pq_size(&pq));
-  CU_ASSERT(NULL == nghttp2_pq_top(&pq));
-
-  /* Add bunch of entry to see realloc works */
-  for (i = 0; i < 10000; ++i) {
-    CU_ASSERT(0 == nghttp2_pq_push(&pq, &string_entry_new("foo")->ent));
-    CU_ASSERT((size_t)(i + 1) == nghttp2_pq_size(&pq));
-  }
-  for (i = 10000; i > 0; --i) {
-    top = (string_entry *)nghttp2_pq_top(&pq);
-    CU_ASSERT(NULL != top);
-    nghttp2_pq_pop(&pq);
-    string_entry_del(top);
-    CU_ASSERT((size_t)(i - 1) == nghttp2_pq_size(&pq));
-  }
-
-  nghttp2_pq_free(&pq);
-}
-
-typedef struct {
-  nghttp2_pq_entry ent;
-  int key;
-  int val;
-} node;
-
-static int node_less(const void *lhs, const void *rhs) {
-  node *ln = (node *)lhs;
-  node *rn = (node *)rhs;
-  return ln->key < rn->key;
-}
-
-static int node_update(nghttp2_pq_entry *item, void *arg) {
-  node *nd = (node *)item;
-  (void)arg;
-
-  if ((nd->key % 2) == 0) {
-    nd->key *= -1;
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-void test_nghttp2_pq_update(void) {
-  nghttp2_pq pq;
-  node nodes[10];
-  int i;
-  node *nd;
-  int ans[] = {-8, -6, -4, -2, 0, 1, 3, 5, 7, 9};
-
-  nghttp2_pq_init(&pq, node_less, nghttp2_mem_default());
-
-  for (i = 0; i < (int)(sizeof(nodes) / sizeof(nodes[0])); ++i) {
-    nodes[i].key = i;
-    nodes[i].val = i;
-    nghttp2_pq_push(&pq, &nodes[i].ent);
-  }
-
-  nghttp2_pq_update(&pq, node_update, NULL);
-
-  for (i = 0; i < (int)(sizeof(nodes) / sizeof(nodes[0])); ++i) {
-    nd = (node *)nghttp2_pq_top(&pq);
-    CU_ASSERT(ans[i] == nd->key);
-    nghttp2_pq_pop(&pq);
-  }
-
-  nghttp2_pq_free(&pq);
-}
-
-static void push_nodes(nghttp2_pq *pq, node *dest, size_t n) {
-  size_t i;
-  for (i = 0; i < n; ++i) {
-    dest[i].key = (int)i;
-    dest[i].val = (int)i;
-    nghttp2_pq_push(pq, &dest[i].ent);
-  }
-}
-
-static void check_nodes(nghttp2_pq *pq, size_t n, int *ans_key, int *ans_val) {
-  size_t i;
-  for (i = 0; i < n; ++i) {
-    node *nd = (node *)nghttp2_pq_top(pq);
-    CU_ASSERT(ans_key[i] == nd->key);
-    CU_ASSERT(ans_val[i] == nd->val);
-    nghttp2_pq_pop(pq);
-  }
-}
-
-void test_nghttp2_pq_remove(void) {
-  nghttp2_pq pq;
-  node nodes[10];
-  int ans_key1[] = {1, 2, 3, 4, 5};
-  int ans_val1[] = {1, 2, 3, 4, 5};
-  int ans_key2[] = {0, 1, 2, 4, 5};
-  int ans_val2[] = {0, 1, 2, 4, 5};
-  int ans_key3[] = {0, 1, 2, 3, 4};
-  int ans_val3[] = {0, 1, 2, 3, 4};
-
-  nghttp2_pq_init(&pq, node_less, nghttp2_mem_default());
-
-  push_nodes(&pq, nodes, 6);
-
-  nghttp2_pq_remove(&pq, &nodes[0].ent);
-
-  check_nodes(&pq, 5, ans_key1, ans_val1);
-
-  nghttp2_pq_free(&pq);
-
-  nghttp2_pq_init(&pq, node_less, nghttp2_mem_default());
-
-  push_nodes(&pq, nodes, 6);
-
-  nghttp2_pq_remove(&pq, &nodes[3].ent);
-
-  check_nodes(&pq, 5, ans_key2, ans_val2);
-
-  nghttp2_pq_free(&pq);
-
-  nghttp2_pq_init(&pq, node_less, nghttp2_mem_default());
-
-  push_nodes(&pq, nodes, 6);
-
-  nghttp2_pq_remove(&pq, &nodes[5].ent);
-
-  check_nodes(&pq, 5, ans_key3, ans_val3);
-
-  nghttp2_pq_free(&pq);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_pq_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_PQ_TEST_H
-#define NGHTTP2_PQ_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_pq(void);
-void test_nghttp2_pq_update(void);
-void test_nghttp2_pq_remove(void);
-
-#endif /* NGHTTP2_PQ_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_queue_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_queue.h"
-
-void test_nghttp2_queue(void) {
-  int ints[] = {1, 2, 3, 4, 5};
-  int i;
-  nghttp2_queue queue;
-  nghttp2_queue_init(&queue);
-  CU_ASSERT(nghttp2_queue_empty(&queue));
-  for (i = 0; i < 5; ++i) {
-    nghttp2_queue_push(&queue, &ints[i]);
-    CU_ASSERT_EQUAL(ints[0], *(int *)(nghttp2_queue_front(&queue)));
-    CU_ASSERT(!nghttp2_queue_empty(&queue));
-  }
-  for (i = 0; i < 5; ++i) {
-    CU_ASSERT_EQUAL(ints[i], *(int *)(nghttp2_queue_front(&queue)));
-    nghttp2_queue_pop(&queue);
-  }
-  CU_ASSERT(nghttp2_queue_empty(&queue));
-  nghttp2_queue_free(&queue);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_queue_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_QUEUE_TEST_H
-#define NGHTTP2_QUEUE_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_queue(void);
-
-#endif /* NGHTTP2_QUEUE_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11832 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_session_test.h"
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_session.h"
-#include "nghttp2_stream.h"
-#include "nghttp2_net.h"
-#include "nghttp2_helper.h"
-#include "nghttp2_test_helper.h"
-#include "nghttp2_priority_spec.h"
-
-typedef struct {
-  uint8_t buf[65535];
-  size_t length;
-} accumulator;
-
-typedef struct {
-  uint8_t data[8192];
-  uint8_t *datamark;
-  uint8_t *datalimit;
-  size_t feedseq[8192];
-  size_t seqidx;
-} scripted_data_feed;
-
-typedef struct {
-  accumulator *acc;
-  scripted_data_feed *df;
-  int frame_recv_cb_called, invalid_frame_recv_cb_called;
-  uint8_t recv_frame_type;
-  nghttp2_frame_hd recv_frame_hd;
-  int frame_send_cb_called;
-  uint8_t sent_frame_type;
-  int before_frame_send_cb_called;
-  int frame_not_send_cb_called;
-  uint8_t not_sent_frame_type;
-  int not_sent_error;
-  int stream_close_cb_called;
-  uint32_t stream_close_error_code;
-  size_t data_source_length;
-  int32_t stream_id;
-  size_t block_count;
-  int data_chunk_recv_cb_called;
-  const nghttp2_frame *frame;
-  size_t fixed_sendlen;
-  int header_cb_called;
-  int invalid_header_cb_called;
-  int begin_headers_cb_called;
-  nghttp2_nv nv;
-  size_t data_chunk_len;
-  size_t padlen;
-  int begin_frame_cb_called;
-  nghttp2_buf scratchbuf;
-  size_t data_source_read_cb_paused;
-} my_user_data;
-
-static const nghttp2_nv reqnv[] = {
-    MAKE_NV(":method", "GET"),
-    MAKE_NV(":path", "/"),
-    MAKE_NV(":scheme", "https"),
-    MAKE_NV(":authority", "localhost"),
-};
-
-static const nghttp2_nv resnv[] = {
-    MAKE_NV(":status", "200"),
-};
-
-static const nghttp2_nv trailernv[] = {
-    // from http://tools.ietf.org/html/rfc6249#section-7
-    MAKE_NV("digest", "SHA-256="
-                      "MWVkMWQxYTRiMzk5MDQ0MzI3NGU5NDEyZTk5OWY1ZGFmNzgyZTJlODYz"
-                      "YjRjYzFhOTlmNTQwYzI2M2QwM2U2MQ=="),
-};
-
-static void scripted_data_feed_init2(scripted_data_feed *df,
-                                     nghttp2_bufs *bufs) {
-  nghttp2_buf_chain *ci;
-  nghttp2_buf *buf;
-  uint8_t *ptr;
-  size_t len;
-
-  memset(df, 0, sizeof(scripted_data_feed));
-  ptr = df->data;
-  len = 0;
-
-  for (ci = bufs->head; ci; ci = ci->next) {
-    buf = &ci->buf;
-    ptr = nghttp2_cpymem(ptr, buf->pos, nghttp2_buf_len(buf));
-    len += nghttp2_buf_len(buf);
-  }
-
-  df->datamark = df->data;
-  df->datalimit = df->data + len;
-  df->feedseq[0] = len;
-}
-
-static ssize_t null_send_callback(nghttp2_session *session, const uint8_t *data,
-                                  size_t len, int flags, void *user_data) {
-  (void)session;
-  (void)data;
-  (void)flags;
-  (void)user_data;
-
-  return (ssize_t)len;
-}
-
-static ssize_t fail_send_callback(nghttp2_session *session, const uint8_t *data,
-                                  size_t len, int flags, void *user_data) {
-  (void)session;
-  (void)data;
-  (void)len;
-  (void)flags;
-  (void)user_data;
-
-  return NGHTTP2_ERR_CALLBACK_FAILURE;
-}
-
-static ssize_t fixed_bytes_send_callback(nghttp2_session *session,
-                                         const uint8_t *data, size_t len,
-                                         int flags, void *user_data) {
-  size_t fixed_sendlen = ((my_user_data *)user_data)->fixed_sendlen;
-  (void)session;
-  (void)data;
-  (void)flags;
-
-  return (ssize_t)(fixed_sendlen < len ? fixed_sendlen : len);
-}
-
-static ssize_t scripted_recv_callback(nghttp2_session *session, uint8_t *data,
-                                      size_t len, int flags, void *user_data) {
-  scripted_data_feed *df = ((my_user_data *)user_data)->df;
-  size_t wlen = df->feedseq[df->seqidx] > len ? len : df->feedseq[df->seqidx];
-  (void)session;
-  (void)flags;
-
-  memcpy(data, df->datamark, wlen);
-  df->datamark += wlen;
-  df->feedseq[df->seqidx] -= wlen;
-  if (df->feedseq[df->seqidx] == 0) {
-    ++df->seqidx;
-  }
-  return (ssize_t)wlen;
-}
-
-static ssize_t eof_recv_callback(nghttp2_session *session, uint8_t *data,
-                                 size_t len, int flags, void *user_data) {
-  (void)session;
-  (void)data;
-  (void)len;
-  (void)flags;
-  (void)user_data;
-
-  return NGHTTP2_ERR_EOF;
-}
-
-static ssize_t accumulator_send_callback(nghttp2_session *session,
-                                         const uint8_t *buf, size_t len,
-                                         int flags, void *user_data) {
-  accumulator *acc = ((my_user_data *)user_data)->acc;
-  (void)session;
-  (void)flags;
-
-  assert(acc->length + len < sizeof(acc->buf));
-  memcpy(acc->buf + acc->length, buf, len);
-  acc->length += len;
-  return (ssize_t)len;
-}
-
-static int on_begin_frame_callback(nghttp2_session *session,
-                                   const nghttp2_frame_hd *hd,
-                                   void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)hd;
-
-  ++ud->begin_frame_cb_called;
-  return 0;
-}
-
-static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-
-  ++ud->frame_recv_cb_called;
-  ud->recv_frame_type = frame->hd.type;
-  ud->recv_frame_hd = frame->hd;
-
-  return 0;
-}
-
-static int on_invalid_frame_recv_callback(nghttp2_session *session,
-                                          const nghttp2_frame *frame,
-                                          int lib_error_code, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)frame;
-  (void)lib_error_code;
-
-  ++ud->invalid_frame_recv_cb_called;
-  return 0;
-}
-
-static int on_frame_send_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-
-  ++ud->frame_send_cb_called;
-  ud->sent_frame_type = frame->hd.type;
-  return 0;
-}
-
-static int on_frame_not_send_callback(nghttp2_session *session,
-                                      const nghttp2_frame *frame, int lib_error,
-                                      void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-
-  ++ud->frame_not_send_cb_called;
-  ud->not_sent_frame_type = frame->hd.type;
-  ud->not_sent_error = lib_error;
-  return 0;
-}
-
-static int cancel_before_frame_send_callback(nghttp2_session *session,
-                                             const nghttp2_frame *frame,
-                                             void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)frame;
-
-  ++ud->before_frame_send_cb_called;
-  return NGHTTP2_ERR_CANCEL;
-}
-
-static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id, const uint8_t *data,
-                                       size_t len, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)flags;
-  (void)stream_id;
-  (void)data;
-
-  ++ud->data_chunk_recv_cb_called;
-  ud->data_chunk_len = len;
-  return 0;
-}
-
-static int pause_on_data_chunk_recv_callback(nghttp2_session *session,
-                                             uint8_t flags, int32_t stream_id,
-                                             const uint8_t *data, size_t len,
-                                             void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)flags;
-  (void)stream_id;
-  (void)data;
-  (void)len;
-
-  ++ud->data_chunk_recv_cb_called;
-  return NGHTTP2_ERR_PAUSE;
-}
-
-static ssize_t select_padding_callback(nghttp2_session *session,
-                                       const nghttp2_frame *frame,
-                                       size_t max_payloadlen, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-
-  return (ssize_t)nghttp2_min(max_payloadlen, frame->hd.length + ud->padlen);
-}
-
-static ssize_t too_large_data_source_length_callback(
-    nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
-    int32_t session_remote_window_size, int32_t stream_remote_window_size,
-    uint32_t remote_max_frame_size, void *user_data) {
-  (void)session;
-  (void)frame_type;
-  (void)stream_id;
-  (void)session_remote_window_size;
-  (void)stream_remote_window_size;
-  (void)remote_max_frame_size;
-  (void)user_data;
-
-  return NGHTTP2_MAX_FRAME_SIZE_MAX + 1;
-}
-
-static ssize_t smallest_length_data_source_length_callback(
-    nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
-    int32_t session_remote_window_size, int32_t stream_remote_window_size,
-    uint32_t remote_max_frame_size, void *user_data) {
-  (void)session;
-  (void)frame_type;
-  (void)stream_id;
-  (void)session_remote_window_size;
-  (void)stream_remote_window_size;
-  (void)remote_max_frame_size;
-  (void)user_data;
-
-  return 1;
-}
-
-static ssize_t fixed_length_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  size_t wlen;
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)source;
-
-  if (len < ud->data_source_length) {
-    wlen = len;
-  } else {
-    wlen = ud->data_source_length;
-  }
-  ud->data_source_length -= wlen;
-  if (ud->data_source_length == 0) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-  }
-  return (ssize_t)wlen;
-}
-
-static ssize_t temporal_failure_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)len;
-  (void)data_flags;
-  (void)source;
-  (void)user_data;
-
-  return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-}
-
-static ssize_t fail_data_source_read_callback(nghttp2_session *session,
-                                              int32_t stream_id, uint8_t *buf,
-                                              size_t len, uint32_t *data_flags,
-                                              nghttp2_data_source *source,
-                                              void *user_data) {
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)len;
-  (void)data_flags;
-  (void)source;
-  (void)user_data;
-
-  return NGHTTP2_ERR_CALLBACK_FAILURE;
-}
-
-static ssize_t no_end_stream_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)len;
-  (void)source;
-  (void)user_data;
-
-  *data_flags |= NGHTTP2_DATA_FLAG_EOF | NGHTTP2_DATA_FLAG_NO_END_STREAM;
-  return 0;
-}
-
-static ssize_t no_copy_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  size_t wlen;
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)source;
-
-  if (len < ud->data_source_length) {
-    wlen = len;
-  } else {
-    wlen = ud->data_source_length;
-  }
-
-  ud->data_source_length -= wlen;
-
-  *data_flags |= NGHTTP2_DATA_FLAG_NO_COPY;
-
-  if (ud->data_source_length == 0) {
-    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-  }
-  return (ssize_t)wlen;
-}
-
-static int send_data_callback(nghttp2_session *session, nghttp2_frame *frame,
-                              const uint8_t *framehd, size_t length,
-                              nghttp2_data_source *source, void *user_data) {
-  accumulator *acc = ((my_user_data *)user_data)->acc;
-  (void)session;
-  (void)source;
-
-  memcpy(acc->buf + acc->length, framehd, NGHTTP2_FRAME_HDLEN);
-  acc->length += NGHTTP2_FRAME_HDLEN;
-
-  if (frame->data.padlen) {
-    *(acc->buf + acc->length++) = (uint8_t)(frame->data.padlen - 1);
-  }
-
-  acc->length += length;
-
-  if (frame->data.padlen) {
-    acc->length += frame->data.padlen - 1;
-  }
-
-  return 0;
-}
-
-static ssize_t block_count_send_callback(nghttp2_session *session,
-                                         const uint8_t *data, size_t len,
-                                         int flags, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)data;
-  (void)flags;
-
-  if (ud->block_count == 0) {
-    return NGHTTP2_ERR_WOULDBLOCK;
-  }
-
-  --ud->block_count;
-  return (ssize_t)len;
-}
-
-static int on_header_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame, const uint8_t *name,
-                              size_t namelen, const uint8_t *value,
-                              size_t valuelen, uint8_t flags, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)flags;
-
-  ++ud->header_cb_called;
-  ud->nv.name = (uint8_t *)name;
-  ud->nv.namelen = namelen;
-  ud->nv.value = (uint8_t *)value;
-  ud->nv.valuelen = valuelen;
-
-  ud->frame = frame;
-  return 0;
-}
-
-static int pause_on_header_callback(nghttp2_session *session,
-                                    const nghttp2_frame *frame,
-                                    const uint8_t *name, size_t namelen,
-                                    const uint8_t *value, size_t valuelen,
-                                    uint8_t flags, void *user_data) {
-  on_header_callback(session, frame, name, namelen, value, valuelen, flags,
-                     user_data);
-  return NGHTTP2_ERR_PAUSE;
-}
-
-static int temporal_failure_on_header_callback(
-    nghttp2_session *session, const nghttp2_frame *frame, const uint8_t *name,
-    size_t namelen, const uint8_t *value, size_t valuelen, uint8_t flags,
-    void *user_data) {
-  on_header_callback(session, frame, name, namelen, value, valuelen, flags,
-                     user_data);
-  return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-}
-
-static int on_invalid_header_callback(nghttp2_session *session,
-                                      const nghttp2_frame *frame,
-                                      const uint8_t *name, size_t namelen,
-                                      const uint8_t *value, size_t valuelen,
-                                      uint8_t flags, void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)flags;
-
-  ++ud->invalid_header_cb_called;
-  ud->nv.name = (uint8_t *)name;
-  ud->nv.namelen = namelen;
-  ud->nv.value = (uint8_t *)value;
-  ud->nv.valuelen = valuelen;
-
-  ud->frame = frame;
-  return 0;
-}
-
-static int pause_on_invalid_header_callback(nghttp2_session *session,
-                                            const nghttp2_frame *frame,
-                                            const uint8_t *name, size_t namelen,
-                                            const uint8_t *value,
-                                            size_t valuelen, uint8_t flags,
-                                            void *user_data) {
-  on_invalid_header_callback(session, frame, name, namelen, value, valuelen,
-                             flags, user_data);
-  return NGHTTP2_ERR_PAUSE;
-}
-
-static int reset_on_invalid_header_callback(nghttp2_session *session,
-                                            const nghttp2_frame *frame,
-                                            const uint8_t *name, size_t namelen,
-                                            const uint8_t *value,
-                                            size_t valuelen, uint8_t flags,
-                                            void *user_data) {
-  on_invalid_header_callback(session, frame, name, namelen, value, valuelen,
-                             flags, user_data);
-  return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-}
-
-static int on_begin_headers_callback(nghttp2_session *session,
-                                     const nghttp2_frame *frame,
-                                     void *user_data) {
-  my_user_data *ud = (my_user_data *)user_data;
-  (void)session;
-  (void)frame;
-
-  ++ud->begin_headers_cb_called;
-  return 0;
-}
-
-static int temporal_failure_on_begin_headers_callback(
-    nghttp2_session *session, const nghttp2_frame *frame, void *user_data) {
-  on_begin_headers_callback(session, frame, user_data);
-  return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
-}
-
-static ssize_t defer_data_source_read_callback(nghttp2_session *session,
-                                               int32_t stream_id, uint8_t *buf,
-                                               size_t len, uint32_t *data_flags,
-                                               nghttp2_data_source *source,
-                                               void *user_data) {
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)len;
-  (void)data_flags;
-  (void)source;
-  (void)user_data;
-
-  return NGHTTP2_ERR_DEFERRED;
-}
-
-static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
-                                    nghttp2_error_code error_code,
-                                    void *user_data) {
-  my_user_data *my_data = (my_user_data *)user_data;
-  (void)session;
-  (void)stream_id;
-  (void)error_code;
-
-  ++my_data->stream_close_cb_called;
-  my_data->stream_close_error_code = error_code;
-
-  return 0;
-}
-
-static ssize_t pack_extension_callback(nghttp2_session *session, uint8_t *buf,
-                                       size_t len, const nghttp2_frame *frame,
-                                       void *user_data) {
-  nghttp2_buf *p = frame->ext.payload;
-  (void)session;
-  (void)len;
-  (void)user_data;
-
-  memcpy(buf, p->pos, nghttp2_buf_len(p));
-
-  return (ssize_t)nghttp2_buf_len(p);
-}
-
-static int on_extension_chunk_recv_callback(nghttp2_session *session,
-                                            const nghttp2_frame_hd *hd,
-                                            const uint8_t *data, size_t len,
-                                            void *user_data) {
-  my_user_data *my_data = (my_user_data *)user_data;
-  nghttp2_buf *buf = &my_data->scratchbuf;
-  (void)session;
-  (void)hd;
-
-  buf->last = nghttp2_cpymem(buf->last, data, len);
-
-  return 0;
-}
-
-static int cancel_on_extension_chunk_recv_callback(nghttp2_session *session,
-                                                   const nghttp2_frame_hd *hd,
-                                                   const uint8_t *data,
-                                                   size_t len,
-                                                   void *user_data) {
-  (void)session;
-  (void)hd;
-  (void)data;
-  (void)len;
-  (void)user_data;
-
-  return NGHTTP2_ERR_CANCEL;
-}
-
-static int unpack_extension_callback(nghttp2_session *session, void **payload,
-                                     const nghttp2_frame_hd *hd,
-                                     void *user_data) {
-  my_user_data *my_data = (my_user_data *)user_data;
-  nghttp2_buf *buf = &my_data->scratchbuf;
-  (void)session;
-  (void)hd;
-
-  *payload = buf;
-
-  return 0;
-}
-
-static int cancel_unpack_extension_callback(nghttp2_session *session,
-                                            void **payload,
-                                            const nghttp2_frame_hd *hd,
-                                            void *user_data) {
-  (void)session;
-  (void)payload;
-  (void)hd;
-  (void)user_data;
-
-  return NGHTTP2_ERR_CANCEL;
-}
-
-static nghttp2_settings_entry *dup_iv(const nghttp2_settings_entry *iv,
-                                      size_t niv) {
-  return nghttp2_frame_iv_copy(iv, niv, nghttp2_mem_default());
-}
-
-static nghttp2_priority_spec pri_spec_default = {0, NGHTTP2_DEFAULT_WEIGHT, 0};
-
-void test_nghttp2_session_recv(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  scripted_data_feed df;
-  my_user_data user_data;
-  nghttp2_bufs bufs;
-  size_t framelen;
-  nghttp2_frame frame;
-  size_t i;
-  nghttp2_outbound_item *item;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_hd_deflater deflater;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.recv_callback = scripted_recv_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_begin_frame_callback = on_begin_frame_callback;
-
-  user_data.df = &df;
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-
-  scripted_data_feed_init2(&df, &bufs);
-
-  framelen = nghttp2_bufs_len(&bufs);
-
-  /* Send 1 byte per each read */
-  for (i = 0; i < framelen; ++i) {
-    df.feedseq[i] = 1;
-  }
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  user_data.frame_recv_cb_called = 0;
-  user_data.begin_frame_cb_called = 0;
-
-  while (df.seqidx < framelen) {
-    CU_ASSERT(0 == nghttp2_session_recv(session));
-  }
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-  CU_ASSERT(1 == user_data.begin_frame_cb_called);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* Receive PRIORITY */
-  nghttp2_frame_priority_init(&frame.priority, 5, &pri_spec_default);
-
-  rv = nghttp2_frame_pack_priority(&bufs, &frame.priority);
-
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_priority_free(&frame.priority);
-
-  scripted_data_feed_init2(&df, &bufs);
-
-  user_data.frame_recv_cb_called = 0;
-  user_data.begin_frame_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_recv(session));
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-  CU_ASSERT(1 == user_data.begin_frame_cb_called);
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* Some tests for frame too large */
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  /* Receive PING with too large payload */
-  nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_NONE, NULL);
-
-  rv = nghttp2_frame_pack_ping(&bufs, &frame.ping);
-
-  CU_ASSERT(0 == rv);
-
-  /* Add extra 16 bytes */
-  nghttp2_bufs_seek_last_present(&bufs);
-  assert(nghttp2_buf_len(&bufs.cur->buf) >= 16);
-
-  bufs.cur->buf.last += 16;
-  nghttp2_put_uint32be(
-      bufs.cur->buf.pos,
-      (uint32_t)(((frame.hd.length + 16) << 8) + bufs.cur->buf.pos[3]));
-
-  nghttp2_frame_ping_free(&frame.ping);
-
-  scripted_data_feed_init2(&df, &bufs);
-  user_data.frame_recv_cb_called = 0;
-  user_data.begin_frame_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_recv(session));
-  CU_ASSERT(0 == user_data.frame_recv_cb_called);
-  CU_ASSERT(0 == user_data.begin_frame_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_FRAME_SIZE_ERROR == item->frame.goaway.error_code);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_invalid_stream_id(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  scripted_data_feed df;
-  my_user_data user_data;
-  nghttp2_bufs bufs;
-  nghttp2_frame frame;
-  nghttp2_hd_deflater deflater;
-  int rv;
-  nghttp2_mem *mem;
-  nghttp2_nv *nva;
-  size_t nvlen;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.recv_callback = scripted_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  user_data.df = &df;
-  user_data.invalid_frame_recv_cb_called = 0;
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 2,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  scripted_data_feed_init2(&df, &bufs);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  CU_ASSERT(0 == nghttp2_session_recv(session));
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_invalid_frame(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  scripted_data_feed df;
-  my_user_data user_data;
-  nghttp2_bufs bufs;
-  nghttp2_frame frame;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_hd_deflater deflater;
-  int rv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.recv_callback = scripted_recv_callback;
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  user_data.df = &df;
-  user_data.frame_send_cb_called = 0;
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  scripted_data_feed_init2(&df, &bufs);
-
-  CU_ASSERT(0 == nghttp2_session_recv(session));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == user_data.frame_send_cb_called);
-
-  /* Receive exactly same bytes of HEADERS is treated as error, because it has
-   * pseudo headers and without END_STREAM flag set */
-  scripted_data_feed_init2(&df, &bufs);
-
-  CU_ASSERT(0 == nghttp2_session_recv(session));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == user_data.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_RST_STREAM == user_data.sent_frame_type);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_eof(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.recv_callback = eof_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  CU_ASSERT(NGHTTP2_ERR_EOF == nghttp2_session_recv(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  uint8_t data[8092];
-  ssize_t rv;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-  nghttp2_frame_hd hd;
-  int i;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_data_chunk_recv_callback = on_data_chunk_recv_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  /* Create DATA frame with length 4KiB */
-  memset(data, 0, sizeof(data));
-  hd.length = 4096;
-  hd.type = NGHTTP2_DATA;
-  hd.flags = NGHTTP2_FLAG_NONE;
-  hd.stream_id = 1;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-
-  /* stream 1 is not opened, so it must be responded with connection
-     error.  This is not mandated by the spec */
-  ud.data_chunk_recv_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-
-  CU_ASSERT(0 == ud.data_chunk_recv_cb_called);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  /* Create stream 1 with CLOSING state. DATA is ignored. */
-  stream = open_sent_stream2(session, 1, NGHTTP2_STREAM_CLOSING);
-
-  /* Set initial window size 16383 to check stream flow control,
-     isolating it from the connection flow control */
-  stream->local_window_size = 16383;
-
-  ud.data_chunk_recv_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-
-  CU_ASSERT(0 == ud.data_chunk_recv_cb_called);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NULL == item);
-
-  /* This is normal case. DATA is acceptable. */
-  stream->state = NGHTTP2_STREAM_OPENED;
-
-  ud.data_chunk_recv_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-
-  CU_ASSERT(1 == ud.data_chunk_recv_cb_called);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  ud.data_chunk_recv_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-
-  /* Now we got data more than initial-window-size / 2, WINDOW_UPDATE
-     must be queued */
-  CU_ASSERT(1 == ud.data_chunk_recv_cb_called);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(1 == item->frame.window_update.hd.stream_id);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Set initial window size to 1MiB, so that we can check connection
-     flow control individually */
-  stream->local_window_size = 1 << 20;
-  /* Connection flow control takes into account DATA which is received
-     in the error condition. We have received 4096 * 4 bytes of
-     DATA. Additional 4 DATA frames, connection flow control will kick
-     in. */
-  for (i = 0; i < 5; ++i) {
-    rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-    CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-  }
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(0 == item->frame.window_update.hd.stream_id);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Reception of DATA with stream ID = 0 causes connection error */
-  hd.length = 4096;
-  hd.type = NGHTTP2_DATA;
-  hd.flags = NGHTTP2_FLAG_NONE;
-  hd.stream_id = 0;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-
-  ud.data_chunk_recv_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-
-  CU_ASSERT(0 == ud.data_chunk_recv_cb_called);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
-
-  nghttp2_session_del(session);
-
-  /* Check window_update_queued flag in both session and stream */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  hd.length = 4096;
-  hd.type = NGHTTP2_DATA;
-  hd.flags = NGHTTP2_FLAG_NONE;
-  hd.stream_id = 1;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-
-  stream = open_recv_stream(session, 1);
-
-  /* Send 32767 bytes of DATA.  In our current flow control algorithm,
-     it triggers first WINDOW_UPDATE of window_size_increment
-     32767. */
-  for (i = 0; i < 7; ++i) {
-    rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-    CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-  }
-
-  hd.length = 4095;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4095);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4095 == rv);
-
-  /* Now 2 WINDOW_UPDATEs for session and stream should be queued. */
-  CU_ASSERT(0 == stream->recv_window_size);
-  CU_ASSERT(0 == session->recv_window_size);
-  CU_ASSERT(1 == stream->window_update_queued);
-  CU_ASSERT(1 == session->window_update_queued);
-
-  /* Then send 32768 bytes of DATA.  Since we have not sent queued
-     WINDOW_UDPATE frame, recv_window_size should not be decreased */
-  hd.length = 4096;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-
-  for (i = 0; i < 8; ++i) {
-    rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-    CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-  }
-
-  /* WINDOW_UPDATE is blocked for session and stream, so
-     recv_window_size must not be decreased. */
-  CU_ASSERT(32768 == stream->recv_window_size);
-  CU_ASSERT(32768 == session->recv_window_size);
-  CU_ASSERT(1 == stream->window_update_queued);
-  CU_ASSERT(1 == session->window_update_queued);
-
-  ud.frame_send_cb_called = 0;
-
-  /* This sends queued WINDOW_UPDATES.  And then check
-     recv_window_size, and queue WINDOW_UPDATEs for both session and
-     stream, and send them at once. */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(4 == ud.frame_send_cb_called);
-  CU_ASSERT(0 == stream->recv_window_size);
-  CU_ASSERT(0 == session->recv_window_size);
-  CU_ASSERT(0 == stream->window_update_queued);
-  CU_ASSERT(0 == session->window_update_queued);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_data_no_auto_flow_control(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_option *option;
-  nghttp2_frame_hd hd;
-  size_t padlen;
-  uint8_t data[8192];
-  ssize_t rv;
-  size_t sendlen;
-  nghttp2_stream *stream;
-  size_t i;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  nghttp2_option_new(&option);
-  nghttp2_option_set_no_auto_window_update(option, 1);
-
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  /* Create DATA frame with length 4KiB + 11 bytes padding*/
-  padlen = 11;
-  memset(data, 0, sizeof(data));
-  hd.length = 4096 + 1 + padlen;
-  hd.type = NGHTTP2_DATA;
-  hd.flags = NGHTTP2_FLAG_PADDED;
-  hd.stream_id = 1;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-  data[NGHTTP2_FRAME_HDLEN] = (uint8_t)padlen;
-
-  /* First create stream 1, then close it.  Check that data is
-     consumed for connection in this situation */
-  open_recv_stream(session, 1);
-
-  /* Receive first 100 bytes */
-  sendlen = 100;
-  rv = nghttp2_session_mem_recv(session, data, sendlen);
-  CU_ASSERT((ssize_t)sendlen == rv);
-
-  /* We consumed pad length field (1 byte) */
-  CU_ASSERT(1 == session->consumed_size);
-
-  /* close stream here */
-  nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, 1, NGHTTP2_NO_ERROR);
-  nghttp2_session_send(session);
-
-  /* stream 1 has been closed, and we disabled auto flow-control, so
-     data must be immediately consumed for connection. */
-  rv = nghttp2_session_mem_recv(session, data + sendlen,
-                                NGHTTP2_FRAME_HDLEN + hd.length - sendlen);
-  CU_ASSERT((ssize_t)(NGHTTP2_FRAME_HDLEN + hd.length - sendlen) == rv);
-
-  /* We already consumed pad length field (1 byte), so do +1 here */
-  CU_ASSERT((int32_t)(NGHTTP2_FRAME_HDLEN + hd.length - sendlen + 1) ==
-            session->consumed_size);
-
-  nghttp2_session_del(session);
-
-  /* Reuse DATA created previously. */
-
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  /* Now we are expecting final response header, which means receiving
-     DATA for that stream is illegal. */
-  stream = open_recv_stream(session, 1);
-  stream->http_flags |= NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE;
-
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + hd.length);
-  CU_ASSERT((ssize_t)(NGHTTP2_FRAME_HDLEN + hd.length) == rv);
-
-  /* Whole payload must be consumed now because HTTP messaging rule
-     was not honored. */
-  CU_ASSERT((int32_t)hd.length == session->consumed_size);
-
-  nghttp2_session_del(session);
-
-  /* Check window_update_queued flag in both session and stream */
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  stream = open_recv_stream(session, 1);
-
-  hd.length = 4096;
-  hd.type = NGHTTP2_DATA;
-  hd.flags = NGHTTP2_FLAG_NONE;
-  hd.stream_id = 1;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-
-  /* Receive up to 65535 bytes of DATA */
-  for (i = 0; i < 15; ++i) {
-    rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4096);
-    CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4096 == rv);
-  }
-
-  hd.length = 4095;
-  nghttp2_frame_pack_frame_hd(data, &hd);
-
-  rv = nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 4095);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 4095 == rv);
-
-  CU_ASSERT(65535 == session->recv_window_size);
-  CU_ASSERT(65535 == stream->recv_window_size);
-
-  /* The first call of nghttp2_session_consume_connection() will queue
-     WINDOW_UPDATE.  Next call does not. */
-  nghttp2_session_consume_connection(session, 32767);
-  nghttp2_session_consume_connection(session, 32768);
-
-  CU_ASSERT(32768 == session->recv_window_size);
-  CU_ASSERT(65535 == stream->recv_window_size);
-  CU_ASSERT(1 == session->window_update_queued);
-  CU_ASSERT(0 == stream->window_update_queued);
-
-  ud.frame_send_cb_called = 0;
-
-  /* This will send WINDOW_UPDATE, and check whether we should send
-     WINDOW_UPDATE, and queue and send it at once. */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == session->recv_window_size);
-  CU_ASSERT(65535 == stream->recv_window_size);
-  CU_ASSERT(0 == session->window_update_queued);
-  CU_ASSERT(0 == stream->window_update_queued);
-  CU_ASSERT(2 == ud.frame_send_cb_called);
-
-  /* Do the same for stream */
-  nghttp2_session_consume_stream(session, 1, 32767);
-  nghttp2_session_consume_stream(session, 1, 32768);
-
-  CU_ASSERT(0 == session->recv_window_size);
-  CU_ASSERT(32768 == stream->recv_window_size);
-  CU_ASSERT(0 == session->window_update_queued);
-  CU_ASSERT(1 == stream->window_update_queued);
-
-  ud.frame_send_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == session->recv_window_size);
-  CU_ASSERT(0 == stream->recv_window_size);
-  CU_ASSERT(0 == session->window_update_queued);
-  CU_ASSERT(0 == stream->window_update_queued);
-  CU_ASSERT(2 == ud.frame_send_cb_called);
-
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_recv_continuation(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_frame frame;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  ssize_t rv;
-  my_user_data ud;
-  nghttp2_hd_deflater deflater;
-  uint8_t data[1024];
-  size_t datalen;
-  nghttp2_frame_hd cont_hd;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_header_callback = on_header_callback;
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  callbacks.on_begin_frame_callback = on_begin_frame_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* Make 1 HEADERS and insert CONTINUATION header */
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_NONE, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  /* make sure that all data is in the first buf */
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* HEADERS's payload is 1 byte */
-  memcpy(data, buf->pos, NGHTTP2_FRAME_HDLEN + 1);
-  datalen = NGHTTP2_FRAME_HDLEN + 1;
-  buf->pos += NGHTTP2_FRAME_HDLEN + 1;
-
-  nghttp2_put_uint32be(data, (uint32_t)((1 << 8) + data[3]));
-
-  /* First CONTINUATION, 2 bytes */
-  nghttp2_frame_hd_init(&cont_hd, 2, NGHTTP2_CONTINUATION, NGHTTP2_FLAG_NONE,
-                        1);
-
-  nghttp2_frame_pack_frame_hd(data + datalen, &cont_hd);
-  datalen += NGHTTP2_FRAME_HDLEN;
-
-  memcpy(data + datalen, buf->pos, cont_hd.length);
-  datalen += cont_hd.length;
-  buf->pos += cont_hd.length;
-
-  /* Second CONTINUATION, rest of the bytes */
-  nghttp2_frame_hd_init(&cont_hd, nghttp2_buf_len(buf), NGHTTP2_CONTINUATION,
-                        NGHTTP2_FLAG_END_HEADERS, 1);
-
-  nghttp2_frame_pack_frame_hd(data + datalen, &cont_hd);
-  datalen += NGHTTP2_FRAME_HDLEN;
-
-  memcpy(data + datalen, buf->pos, cont_hd.length);
-  datalen += cont_hd.length;
-  buf->pos += cont_hd.length;
-
-  CU_ASSERT(0 == nghttp2_buf_len(buf));
-
-  ud.header_cb_called = 0;
-  ud.begin_frame_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, data, datalen);
-  CU_ASSERT((ssize_t)datalen == rv);
-  CU_ASSERT(4 == ud.header_cb_called);
-  CU_ASSERT(3 == ud.begin_frame_cb_called);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* HEADERS with padding followed by CONTINUATION */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_NONE, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-
-  nghttp2_bufs_reset(&bufs);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* make sure that all data is in the first buf */
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  /* HEADERS payload is 3 byte (1 for padding field, 1 for padding) */
-  memcpy(data, buf->pos, NGHTTP2_FRAME_HDLEN);
-  nghttp2_put_uint32be(data, (uint32_t)((3 << 8) + data[3]));
-  data[4] |= NGHTTP2_FLAG_PADDED;
-  /* padding field */
-  data[NGHTTP2_FRAME_HDLEN] = 1;
-  data[NGHTTP2_FRAME_HDLEN + 1] = buf->pos[NGHTTP2_FRAME_HDLEN];
-  /* padding */
-  data[NGHTTP2_FRAME_HDLEN + 2] = 0;
-  datalen = NGHTTP2_FRAME_HDLEN + 3;
-  buf->pos += NGHTTP2_FRAME_HDLEN + 1;
-
-  /* CONTINUATION, rest of the bytes */
-  nghttp2_frame_hd_init(&cont_hd, nghttp2_buf_len(buf), NGHTTP2_CONTINUATION,
-                        NGHTTP2_FLAG_END_HEADERS, 1);
-  nghttp2_frame_pack_frame_hd(data + datalen, &cont_hd);
-  datalen += NGHTTP2_FRAME_HDLEN;
-
-  memcpy(data + datalen, buf->pos, cont_hd.length);
-  datalen += cont_hd.length;
-  buf->pos += cont_hd.length;
-
-  CU_ASSERT(0 == nghttp2_buf_len(buf));
-
-  ud.header_cb_called = 0;
-  ud.begin_frame_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, data, datalen);
-
-  CU_ASSERT((ssize_t)datalen == rv);
-  CU_ASSERT(4 == ud.header_cb_called);
-  CU_ASSERT(2 == ud.begin_frame_cb_called);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* Expecting CONTINUATION, but get the other frame */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* HEADERS without END_HEADERS flag */
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_NONE, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  nghttp2_bufs_reset(&bufs);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* make sure that all data is in the first buf */
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  memcpy(data, buf->pos, nghttp2_buf_len(buf));
-  datalen = nghttp2_buf_len(buf);
-
-  /* Followed by PRIORITY */
-  nghttp2_priority_spec_default_init(&pri_spec);
-
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-  nghttp2_bufs_reset(&bufs);
-
-  rv = nghttp2_frame_pack_priority(&bufs, &frame.priority);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  memcpy(data + datalen, buf->pos, nghttp2_buf_len(buf));
-  datalen += nghttp2_buf_len(buf);
-
-  ud.begin_headers_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, data, datalen);
-  CU_ASSERT((ssize_t)datalen == rv);
-
-  CU_ASSERT(1 == ud.begin_headers_cb_called);
-  CU_ASSERT(NGHTTP2_GOAWAY ==
-            nghttp2_session_get_next_ob_item(session)->frame.hd.type);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_headers_with_priority(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_frame frame;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  ssize_t rv;
-  my_user_data ud;
-  nghttp2_hd_deflater deflater;
-  nghttp2_outbound_item *item;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  open_recv_stream(session, 1);
-
-  /* With NGHTTP2_FLAG_PRIORITY without exclusive flag set */
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-
-  nghttp2_priority_spec_init(&pri_spec, 1, 99, 0);
-
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             3, NGHTTP2_HCAT_HEADERS, &pri_spec, nva, nvlen);
-
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  stream = nghttp2_session_get_stream(session, 3);
-
-  CU_ASSERT(99 == stream->weight);
-  CU_ASSERT(1 == stream->dep_prev->stream_id);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* With NGHTTP2_FLAG_PRIORITY, but cut last 1 byte to make it
-     invalid. */
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 99, 0);
-
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             5, NGHTTP2_HCAT_HEADERS, &pri_spec, nva, nvlen);
-
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > NGHTTP2_FRAME_HDLEN + 5);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  buf = &bufs.head->buf;
-  /* Make payload shorter than required length to store priority
-     group */
-  nghttp2_put_uint32be(buf->pos, (uint32_t)((4 << 8) + buf->pos[3]));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  stream = nghttp2_session_get_stream(session, 5);
-
-  CU_ASSERT(NULL == stream);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_FRAME_SIZE_ERROR == item->frame.goaway.error_code);
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* Check dep_stream_id == stream_id */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-
-  nghttp2_priority_spec_init(&pri_spec, 1, 0, 0);
-
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             1, NGHTTP2_HCAT_HEADERS, &pri_spec, nva, nvlen);
-
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(NULL == stream);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_headers_with_padding(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_frame_hd hd;
-  nghttp2_outbound_item *item;
-  my_user_data ud;
-  ssize_t rv;
-
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.send_callback = null_send_callback;
-
-  /* HEADERS: Wrong padding length */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-  nghttp2_session_send(session);
-
-  nghttp2_frame_hd_init(&hd, 10, NGHTTP2_HEADERS,
-                        NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY |
-                            NGHTTP2_FLAG_PADDED,
-                        1);
-  buf = &bufs.head->buf;
-  nghttp2_frame_pack_frame_hd(buf->last, &hd);
-  buf->last += NGHTTP2_FRAME_HDLEN;
-  /* padding is 6 bytes */
-  *buf->last++ = 5;
-  /* priority field */
-  nghttp2_put_uint32be(buf->last, 3);
-  buf->last += sizeof(uint32_t);
-  *buf->last++ = 1;
-  /* rest is garbage */
-  memset(buf->last, 0, 4);
-  buf->last += 4;
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_session_del(session);
-
-  /* PUSH_PROMISE: Wrong padding length */
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  nghttp2_session_send(session);
-
-  open_sent_stream(session, 1);
-
-  nghttp2_frame_hd_init(&hd, 9, NGHTTP2_PUSH_PROMISE,
-                        NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PADDED, 1);
-  buf = &bufs.head->buf;
-  nghttp2_frame_pack_frame_hd(buf->last, &hd);
-  buf->last += NGHTTP2_FRAME_HDLEN;
-  /* padding is 6 bytes */
-  *buf->last++ = 5;
-  /* promised stream ID field */
-  nghttp2_put_uint32be(buf->last, 2);
-  buf->last += sizeof(uint32_t);
-  /* rest is garbage */
-  memset(buf->last, 0, 4);
-  buf->last += 4;
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_session_del(session);
-}
-
-static int response_on_begin_frame_callback(nghttp2_session *session,
-                                            const nghttp2_frame_hd *hd,
-                                            void *user_data) {
-  int rv;
-  (void)user_data;
-
-  if (hd->type != NGHTTP2_HEADERS) {
-    return 0;
-  }
-
-  rv = nghttp2_submit_response(session, hd->stream_id, resnv, ARRLEN(resnv),
-                               NULL);
-
-  CU_ASSERT(0 == rv);
-
-  return 0;
-}
-
-void test_nghttp2_session_recv_headers_early_response(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_frame frame;
-  ssize_t rv;
-  nghttp2_stream *stream;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_begin_frame_callback = response_on_begin_frame_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                             1, NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
-
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  buf = &bufs.head->buf;
-
-  /* Only receive 9 bytes headers, and invoke
-     on_begin_frame_callback */
-  rv = nghttp2_session_mem_recv(session, buf->pos, 9);
-
-  CU_ASSERT(9 == rv);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  rv =
-      nghttp2_session_mem_recv(session, buf->pos + 9, nghttp2_buf_len(buf) - 9);
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) - 9 == rv);
-
-  stream = nghttp2_session_get_stream_raw(session, 1);
-
-  CU_ASSERT(stream->flags & NGHTTP2_STREAM_FLAG_CLOSED);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_server_recv_push_response(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  ssize_t rv;
-  my_user_data ud;
-  nghttp2_mem *mem;
-  nghttp2_frame frame;
-  nghttp2_hd_deflater deflater;
-  nghttp2_nv *nva;
-  size_t nvlen;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  nvlen = ARRLEN(resnv);
-  nghttp2_nv_array_copy(&nva, resnv, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 2,
-                             NGHTTP2_HCAT_HEADERS, &pri_spec_default, nva,
-                             nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  buf = &bufs.head->buf;
-
-  ud.invalid_frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(1 == ud.invalid_frame_recv_cb_called);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_premature_headers(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  ssize_t rv;
-  my_user_data ud;
-  nghttp2_hd_deflater deflater;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-  uint32_t payloadlen;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, reqnv,
-               ARRLEN(reqnv), mem);
-
-  buf = &bufs.head->buf;
-  /* Intentionally feed payload cutting last 1 byte off */
-  payloadlen = nghttp2_get_uint32(buf->pos) >> 8;
-  nghttp2_put_uint32be(buf->pos, ((payloadlen - 1) << 8) + buf->pos[3]);
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf) - 1);
-
-  CU_ASSERT((ssize_t)(nghttp2_buf_len(buf) - 1) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_COMPRESSION_ERROR == item->frame.rst_stream.error_code);
-  CU_ASSERT(1 == item->frame.hd.stream_id);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* Test for PUSH_PROMISE */
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  open_sent_stream3(session, 1, NGHTTP2_STREAM_FLAG_NONE, &pri_spec_default,
-                    NGHTTP2_STREAM_OPENING, NULL);
-
-  rv = pack_push_promise(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, 2,
-                         reqnv, ARRLEN(reqnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  buf = &bufs.head->buf;
-  payloadlen = nghttp2_get_uint32(buf->pos) >> 8;
-  /* Intentionally feed payload cutting last 1 byte off */
-  nghttp2_put_uint32be(buf->pos, ((payloadlen - 1) << 8) + buf->pos[3]);
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf) - 1);
-
-  CU_ASSERT((ssize_t)(nghttp2_buf_len(buf) - 1) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_COMPRESSION_ERROR == item->frame.rst_stream.error_code);
-  CU_ASSERT(2 == item->frame.hd.stream_id);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_recv_unknown_frame(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  uint8_t data[16384];
-  size_t datalen;
-  nghttp2_frame_hd hd;
-  ssize_t rv;
-
-  nghttp2_frame_hd_init(&hd, 16000, 99, NGHTTP2_FLAG_NONE, 0);
-
-  nghttp2_frame_pack_frame_hd(data, &hd);
-  datalen = NGHTTP2_FRAME_HDLEN + hd.length;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  ud.frame_recv_cb_called = 0;
-
-  /* Unknown frame must be ignored */
-  rv = nghttp2_session_mem_recv(session, data, datalen);
-
-  CU_ASSERT(rv == (ssize_t)datalen);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_unexpected_continuation(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  uint8_t data[16384];
-  size_t datalen;
-  nghttp2_frame_hd hd;
-  ssize_t rv;
-  nghttp2_outbound_item *item;
-
-  nghttp2_frame_hd_init(&hd, 16000, NGHTTP2_CONTINUATION,
-                        NGHTTP2_FLAG_END_HEADERS, 1);
-
-  nghttp2_frame_pack_frame_hd(data, &hd);
-  datalen = NGHTTP2_FRAME_HDLEN + hd.length;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  open_recv_stream(session, 1);
-
-  ud.frame_recv_cb_called = 0;
-
-  /* unexpected CONTINUATION must be treated as connection error */
-  rv = nghttp2_session_mem_recv(session, data, datalen);
-
-  CU_ASSERT(rv == (ssize_t)datalen);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_settings_header_table_size(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_frame frame;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  ssize_t rv;
-  my_user_data ud;
-  nghttp2_settings_entry iv[3];
-  nghttp2_nv nv = MAKE_NV(":authority", "example.org");
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 3000;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 16384;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 2),
-                              2);
-
-  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  CU_ASSERT(3000 == session->remote_settings.header_table_size);
-  CU_ASSERT(16384 == session->remote_settings.initial_window_size);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* 2 SETTINGS_HEADER_TABLE_SIZE */
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 3001;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 16383;
-
-  iv[2].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[2].value = 3001;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 3),
-                              3);
-
-  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)(nghttp2_buf_len(buf)) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  CU_ASSERT(3001 == session->remote_settings.header_table_size);
-  CU_ASSERT(16383 == session->remote_settings.initial_window_size);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* 2 SETTINGS_HEADER_TABLE_SIZE; first entry clears dynamic header
-     table. */
-
-  nghttp2_submit_request(session, NULL, &nv, 1, NULL, NULL);
-  nghttp2_session_send(session);
-
-  CU_ASSERT(0 < session->hd_deflater.ctx.hd_table.len);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 0;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 16382;
-
-  iv[2].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[2].value = 4096;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 3),
-                              3);
-
-  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  CU_ASSERT(4096 == session->remote_settings.header_table_size);
-  CU_ASSERT(16382 == session->remote_settings.initial_window_size);
-  CU_ASSERT(0 == session->hd_deflater.ctx.hd_table.len);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* 2 SETTINGS_HEADER_TABLE_SIZE; second entry clears dynamic header
-     table. */
-
-  nghttp2_submit_request(session, NULL, &nv, 1, NULL, NULL);
-  nghttp2_session_send(session);
-
-  CU_ASSERT(0 < session->hd_deflater.ctx.hd_table.len);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 3000;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 16381;
-
-  iv[2].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[2].value = 0;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 3),
-                              3);
-
-  rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  ud.frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  CU_ASSERT(0 == session->remote_settings.header_table_size);
-  CU_ASSERT(16381 == session->remote_settings.initial_window_size);
-  CU_ASSERT(0 == session->hd_deflater.ctx.hd_table.len);
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_too_large_frame_length(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  uint8_t buf[NGHTTP2_FRAME_HDLEN];
-  nghttp2_outbound_item *item;
-  nghttp2_frame_hd hd;
-
-  /* Initial max frame size is NGHTTP2_MAX_FRAME_SIZE_MIN */
-  nghttp2_frame_hd_init(&hd, NGHTTP2_MAX_FRAME_SIZE_MIN + 1, NGHTTP2_HEADERS,
-                        NGHTTP2_FLAG_NONE, 1);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_frame_pack_frame_hd(buf, &hd);
-
-  CU_ASSERT(sizeof(buf) == nghttp2_session_mem_recv(session, buf, sizeof(buf)));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(item != NULL);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_recv_extension(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_buf buf;
-  nghttp2_frame_hd hd;
-  nghttp2_mem *mem;
-  const char data[] = "Hello World!";
-  ssize_t rv;
-  nghttp2_option *option;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  callbacks.on_extension_chunk_recv_callback = on_extension_chunk_recv_callback;
-  callbacks.unpack_extension_callback = unpack_extension_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  nghttp2_option_new(&option);
-  nghttp2_option_set_user_recv_extension_type(option, 111);
-
-  nghttp2_buf_init2(&ud.scratchbuf, 4096, mem);
-  nghttp2_buf_init2(&buf, 4096, mem);
-
-  nghttp2_frame_hd_init(&hd, sizeof(data), 111, 0xab, 1000000007);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  buf.last = nghttp2_cpymem(buf.last, data, sizeof(data));
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&ud.recv_frame_hd, 0, 0, 0, 0);
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + hd.length == (size_t)rv);
-  CU_ASSERT(111 == ud.recv_frame_hd.type);
-  CU_ASSERT(0xab == ud.recv_frame_hd.flags);
-  CU_ASSERT(1000000007 == ud.recv_frame_hd.stream_id);
-  CU_ASSERT(0 == memcmp(data, ud.scratchbuf.pos, sizeof(data)));
-
-  nghttp2_session_del(session);
-
-  /* cancel in on_extension_chunk_recv_callback */
-  nghttp2_buf_reset(&ud.scratchbuf);
-
-  callbacks.on_extension_chunk_recv_callback =
-      cancel_on_extension_chunk_recv_callback;
-
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + hd.length == (size_t)rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* cancel in unpack_extension_callback */
-  nghttp2_buf_reset(&ud.scratchbuf);
-
-  callbacks.on_extension_chunk_recv_callback = on_extension_chunk_recv_callback;
-  callbacks.unpack_extension_callback = cancel_unpack_extension_callback;
-
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + hd.length == (size_t)rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  nghttp2_buf_free(&buf, mem);
-  nghttp2_buf_free(&ud.scratchbuf, mem);
-
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_recv_altsvc(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_buf buf;
-  nghttp2_frame_hd hd;
-  nghttp2_mem *mem;
-  ssize_t rv;
-  nghttp2_option *option;
-  static const uint8_t origin[] = "nghttp2.org";
-  static const uint8_t field_value[] = "h2=\":443\"";
-
-  mem = nghttp2_mem_default();
-
-  nghttp2_buf_init2(&buf, NGHTTP2_FRAME_HDLEN + NGHTTP2_MAX_FRAME_SIZE_MIN,
-                    mem);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_option_new(&option);
-  nghttp2_option_set_builtin_recv_extension_type(option, NGHTTP2_ALTSVC);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&hd, 2 + sizeof(origin) - 1 + sizeof(field_value) - 1,
-                        NGHTTP2_ALTSVC, NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-  buf.last = nghttp2_cpymem(buf.last, field_value, sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  CU_ASSERT(NGHTTP2_ALTSVC == ud.recv_frame_hd.type);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == ud.recv_frame_hd.flags);
-  CU_ASSERT(0 == ud.recv_frame_hd.stream_id);
-
-  nghttp2_session_del(session);
-
-  /* size of origin is larger than frame length */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&hd, 2 + sizeof(origin) - 1 - 1, NGHTTP2_ALTSVC,
-                        NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1 - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* zero-length value */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&hd, 2 + sizeof(origin) - 1, NGHTTP2_ALTSVC,
-                        NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-
-  ud.invalid_frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(1 == ud.invalid_frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* non-empty origin to a stream other than 0 */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  open_sent_stream(session, 1);
-
-  nghttp2_frame_hd_init(&hd, 2 + sizeof(origin) - 1 + sizeof(field_value) - 1,
-                        NGHTTP2_ALTSVC, NGHTTP2_FLAG_NONE, 1);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-  buf.last = nghttp2_cpymem(buf.last, field_value, sizeof(field_value) - 1);
-
-  ud.invalid_frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(1 == ud.invalid_frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* empty origin to stream 0 */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&hd, 2 + sizeof(field_value) - 1, NGHTTP2_ALTSVC,
-                        NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, 0);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, field_value, sizeof(field_value) - 1);
-
-  ud.invalid_frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(1 == ud.invalid_frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* send large frame (16KiB) */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&hd, NGHTTP2_MAX_FRAME_SIZE_MIN, NGHTTP2_ALTSVC,
-                        NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-  memset(buf.last, 0, nghttp2_buf_avail(&buf));
-  buf.last += nghttp2_buf_avail(&buf);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  CU_ASSERT(NGHTTP2_ALTSVC == ud.recv_frame_hd.type);
-  CU_ASSERT(NGHTTP2_MAX_FRAME_SIZE_MIN == ud.recv_frame_hd.length);
-
-  nghttp2_session_del(session);
-
-  /* send too large frame */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  session->local_settings.max_frame_size = NGHTTP2_MAX_FRAME_SIZE_MIN - 1;
-
-  nghttp2_frame_hd_init(&hd, NGHTTP2_MAX_FRAME_SIZE_MIN + 1, NGHTTP2_ALTSVC,
-                        NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-  memset(buf.last, 0, nghttp2_buf_avail(&buf));
-  buf.last += nghttp2_buf_avail(&buf);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* received by server */
-  nghttp2_buf_reset(&buf);
-
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_hd_init(&hd, 2 + sizeof(origin) - 1 + sizeof(field_value) - 1,
-                        NGHTTP2_ALTSVC, NGHTTP2_FLAG_NONE, 0);
-  nghttp2_frame_pack_frame_hd(buf.last, &hd);
-  buf.last += NGHTTP2_FRAME_HDLEN;
-  nghttp2_put_uint16be(buf.last, sizeof(origin) - 1);
-  buf.last += 2;
-  buf.last = nghttp2_cpymem(buf.last, origin, sizeof(origin) - 1);
-  buf.last = nghttp2_cpymem(buf.last, field_value, sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf.pos, nghttp2_buf_len(&buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&buf) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  nghttp2_buf_free(&buf, mem);
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_recv_origin(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  nghttp2_option *option;
-  nghttp2_extension frame;
-  nghttp2_ext_origin origin;
-  nghttp2_origin_entry ov;
-  static const uint8_t nghttp2[] = "https://nghttp2.org";
-
-  frame_pack_bufs_init(&bufs);
-
-  frame.payload = &origin;
-
-  ov.origin = (uint8_t *)nghttp2;
-  ov.origin_len = sizeof(nghttp2) - 1;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  nghttp2_option_new(&option);
-  nghttp2_option_set_builtin_recv_extension_type(option, NGHTTP2_ORIGIN);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_origin_init(&frame, &ov, 1);
-
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  CU_ASSERT(NGHTTP2_ORIGIN == ud.recv_frame_hd.type);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == ud.recv_frame_hd.flags);
-  CU_ASSERT(0 == ud.recv_frame_hd.stream_id);
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_reset(&bufs);
-
-  /* The length of origin is larger than payload length. */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_origin_init(&frame, &ov, 1);
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-
-  nghttp2_put_uint16be(bufs.head->buf.pos + NGHTTP2_FRAME_HDLEN,
-                       (uint16_t)sizeof(nghttp2));
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_reset(&bufs);
-
-  /* A frame should be ignored if it is sent to a stream other than
-     stream 0. */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_origin_init(&frame, &ov, 1);
-  frame.hd.stream_id = 1;
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_reset(&bufs);
-
-  /* A frame should be ignored if the reserved flag is set */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_origin_init(&frame, &ov, 1);
-  frame.hd.flags = 0xf0;
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_reset(&bufs);
-
-  /* A frame should be ignored if it is received by a server. */
-  nghttp2_session_server_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_origin_init(&frame, &ov, 1);
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_reset(&bufs);
-
-  /* Receiving empty ORIGIN frame */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  nghttp2_frame_origin_init(&frame, NULL, 0);
-  rv = nghttp2_frame_pack_origin(&bufs, &frame);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  CU_ASSERT(NGHTTP2_ORIGIN == ud.recv_frame_hd.type);
-
-  nghttp2_session_del(session);
-
-  nghttp2_option_del(option);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_continue(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  const nghttp2_nv nv1[] = {MAKE_NV(":method", "GET"), MAKE_NV(":path", "/")};
-  const nghttp2_nv nv2[] = {MAKE_NV("user-agent", "nghttp2/1.0.0"),
-                            MAKE_NV("alpha", "bravo")};
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  size_t framelen1, framelen2;
-  ssize_t rv;
-  uint8_t buffer[4096];
-  nghttp2_buf databuf;
-  nghttp2_frame frame;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  const nghttp2_frame *recv_frame;
-  nghttp2_frame_hd data_hd;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-  nghttp2_buf_wrap_init(&databuf, buffer, sizeof(buffer));
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_data_chunk_recv_callback = pause_on_data_chunk_recv_callback;
-  callbacks.on_header_callback = pause_on_header_callback;
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  /* disable strict HTTP layering checks */
-  session->opt_flags |= NGHTTP2_OPTMASK_NO_HTTP_MESSAGING;
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* Make 2 HEADERS frames */
-  nvlen = ARRLEN(nv1);
-  nghttp2_nv_array_copy(&nva, nv1, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  buf = &bufs.head->buf;
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  framelen1 = nghttp2_buf_len(buf);
-  databuf.last = nghttp2_cpymem(databuf.last, buf->pos, nghttp2_buf_len(buf));
-
-  nvlen = ARRLEN(nv2);
-  nghttp2_nv_array_copy(&nva, nv2, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 3,
-                             NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  nghttp2_bufs_reset(&bufs);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(nghttp2_bufs_len(&bufs) > 0);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  assert(nghttp2_bufs_len(&bufs) == nghttp2_buf_len(buf));
-
-  framelen2 = nghttp2_buf_len(buf);
-  databuf.last = nghttp2_cpymem(databuf.last, buf->pos, nghttp2_buf_len(buf));
-
-  /* Receive 1st HEADERS and pause */
-  user_data.begin_headers_cb_called = 0;
-  user_data.header_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-
-  CU_ASSERT(rv >= 0);
-  databuf.pos += rv;
-
-  recv_frame = user_data.frame;
-  CU_ASSERT(NGHTTP2_HEADERS == recv_frame->hd.type);
-  CU_ASSERT(framelen1 - NGHTTP2_FRAME_HDLEN == recv_frame->hd.length);
-
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.header_cb_called);
-
-  CU_ASSERT(nghttp2_nv_equal(&nv1[0], &user_data.nv));
-
-  /* get 2nd header field */
-  user_data.begin_headers_cb_called = 0;
-  user_data.header_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-
-  CU_ASSERT(rv >= 0);
-  databuf.pos += rv;
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.header_cb_called);
-
-  CU_ASSERT(nghttp2_nv_equal(&nv1[1], &user_data.nv));
-
-  /* will call end_headers_callback and receive 2nd HEADERS and pause */
-  user_data.begin_headers_cb_called = 0;
-  user_data.header_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-
-  CU_ASSERT(rv >= 0);
-  databuf.pos += rv;
-
-  recv_frame = user_data.frame;
-  CU_ASSERT(NGHTTP2_HEADERS == recv_frame->hd.type);
-  CU_ASSERT(framelen2 - NGHTTP2_FRAME_HDLEN == recv_frame->hd.length);
-
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.header_cb_called);
-
-  CU_ASSERT(nghttp2_nv_equal(&nv2[0], &user_data.nv));
-
-  /* get 2nd header field */
-  user_data.begin_headers_cb_called = 0;
-  user_data.header_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-
-  CU_ASSERT(rv >= 0);
-  databuf.pos += rv;
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.header_cb_called);
-
-  CU_ASSERT(nghttp2_nv_equal(&nv2[1], &user_data.nv));
-
-  /* No input data, frame_recv_callback is called */
-  user_data.begin_headers_cb_called = 0;
-  user_data.header_cb_called = 0;
-  user_data.frame_recv_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-
-  CU_ASSERT(rv >= 0);
-  databuf.pos += rv;
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == user_data.header_cb_called);
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-
-  /* Receive DATA */
-  nghttp2_frame_hd_init(&data_hd, 16, NGHTTP2_DATA, NGHTTP2_FLAG_NONE, 1);
-
-  nghttp2_buf_reset(&databuf);
-  nghttp2_frame_pack_frame_hd(databuf.pos, &data_hd);
-
-  /* Intentionally specify larger buffer size to see pause is kicked
-     in. */
-  databuf.last = databuf.end;
-
-  user_data.frame_recv_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-
-  CU_ASSERT(16 + NGHTTP2_FRAME_HDLEN == rv);
-  CU_ASSERT(0 == user_data.frame_recv_cb_called);
-
-  /* Next nghttp2_session_mem_recv invokes on_frame_recv_callback and
-     pause again in on_data_chunk_recv_callback since we pass same
-     DATA frame. */
-  user_data.frame_recv_cb_called = 0;
-  rv =
-      nghttp2_session_mem_recv(session, databuf.pos, nghttp2_buf_len(&databuf));
-  CU_ASSERT(16 + NGHTTP2_FRAME_HDLEN == rv);
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-
-  /* And finally call on_frame_recv_callback with 0 size input */
-  user_data.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, NULL, 0);
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_add_frame(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  accumulator acc;
-  my_user_data user_data;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-
-  acc.length = 0;
-  user_data.acc = &acc;
-
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &user_data));
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nvlen = ARRLEN(reqnv);
-  nghttp2_nv_array_copy(&nva, reqnv, nvlen, mem);
-
-  nghttp2_frame_headers_init(
-      &frame->headers, NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-      (int32_t)session->next_stream_id, NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
-
-  session->next_stream_id += 2;
-
-  CU_ASSERT(0 == nghttp2_session_add_item(session, item));
-  CU_ASSERT(NULL != nghttp2_outbound_queue_top(&session->ob_syn));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NGHTTP2_HEADERS == acc.buf[3]);
-  CU_ASSERT((NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY) == acc.buf[4]);
-  /* check stream id */
-  CU_ASSERT(1 == nghttp2_get_uint32(&acc.buf[5]));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_request_headers_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  int32_t stream_id = 1;
-  nghttp2_nv malformed_nva[] = {MAKE_NV(":path", "\x01")};
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 255, 0);
-
-  nghttp2_frame_headers_init(
-      &frame.headers, NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-      stream_id, NGHTTP2_HCAT_REQUEST, &pri_spec, NULL, 0);
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  stream = nghttp2_session_get_stream(session, stream_id);
-  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
-  CU_ASSERT(255 == stream->weight);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* More than un-ACKed max concurrent streams leads REFUSED_STREAM */
-  session->pending_local_max_concurrent_stream = 1;
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             3, NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(0 == (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  session->local_settings.max_concurrent_streams =
-      NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS;
-
-  /* Stream ID less than or equal to the previouly received request
-     HEADERS is just ignored due to race condition */
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             3, NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(0 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(0 == (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* Stream ID is our side and it is idle stream ID, then treat it as
-     connection error */
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             2, NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-
-  /* Check malformed headers. The library accept it. */
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  nvlen = ARRLEN(malformed_nva);
-  nghttp2_nv_array_copy(&nva, malformed_nva, nvlen, mem);
-  nghttp2_frame_headers_init(&frame.headers,
-                             NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_PRIORITY,
-                             1, NGHTTP2_HCAT_HEADERS, NULL, nva, nvlen);
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == user_data.invalid_frame_recv_cb_called);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-
-  /* Check client side */
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  /* Receiving peer's idle stream ID is subject to connection error */
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 2,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  /* Receiving our's idle stream ID is subject to connection error */
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  session->next_stream_id = 5;
-  session->last_sent_stream_id = 3;
-
-  /* Stream ID which is not idle and not in stream map is just
-     ignored */
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 3,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(0 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(0 == (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  /* Stream ID which is equal to local_last_stream_id is ok. */
-  session->local_last_stream_id = 3;
-
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 3,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-
-  CU_ASSERT(0 == nghttp2_session_on_request_headers_received(session, &frame));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* If GOAWAY has been sent, new stream is ignored */
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 5,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-
-  session->goaway_flags |= NGHTTP2_GOAWAY_SENT;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(0 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(0 == (session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  /* HEADERS to closed stream */
-  stream = open_recv_stream(session, 1);
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-  nghttp2_session_close_stream(session, 1, NGHTTP2_NO_ERROR);
-
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-  CU_ASSERT(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_response_headers_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  stream = open_sent_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_on_response_headers_received(session, &frame,
-                                                              stream));
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_headers_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  stream = open_sent_stream2(session, 1, NGHTTP2_STREAM_OPENED);
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_on_headers_received(session, &frame, stream));
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-
-  /* stream closed */
-  frame.hd.flags |= NGHTTP2_FLAG_END_STREAM;
-
-  CU_ASSERT(0 == nghttp2_session_on_headers_received(session, &frame, stream));
-  CU_ASSERT(2 == user_data.begin_headers_cb_called);
-
-  /* Check to see when NGHTTP2_STREAM_CLOSING, incoming HEADERS is
-     discarded. */
-  stream = open_sent_stream2(session, 3, NGHTTP2_STREAM_CLOSING);
-  frame.hd.stream_id = 3;
-  frame.hd.flags = NGHTTP2_FLAG_END_HEADERS;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_headers_received(session, &frame, stream));
-  /* See no counters are updated */
-  CU_ASSERT(2 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == user_data.invalid_frame_recv_cb_called);
-
-  /* Server initiated stream */
-  stream = open_recv_stream(session, 2);
-
-  frame.hd.flags = NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM;
-  frame.hd.stream_id = 2;
-
-  CU_ASSERT(0 == nghttp2_session_on_headers_received(session, &frame, stream));
-  CU_ASSERT(3 == user_data.begin_headers_cb_called);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-
-  /* Further reception of HEADERS is subject to stream error */
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_headers_received(session, &frame, stream));
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_push_response_headers_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  stream = open_recv_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 2,
-                             NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  /* nghttp2_session_on_push_response_headers_received assumes
-     stream's state is NGHTTP2_STREAM_RESERVED and session->server is
-     0. */
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-  CU_ASSERT(0 == nghttp2_session_on_push_response_headers_received(
-                     session, &frame, stream));
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-  CU_ASSERT(1 == session->num_incoming_streams);
-  CU_ASSERT(0 == (stream->flags & NGHTTP2_STREAM_FLAG_PUSH));
-
-  /* If un-ACKed max concurrent streams limit is exceeded,
-     RST_STREAMed */
-  session->pending_local_max_concurrent_stream = 1;
-  stream = open_recv_stream2(session, 4, NGHTTP2_STREAM_RESERVED);
-  frame.hd.stream_id = 4;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_response_headers_received(session, &frame,
-                                                              stream));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_REFUSED_STREAM == item->frame.rst_stream.error_code);
-  CU_ASSERT(1 == session->num_incoming_streams);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == session->num_incoming_streams);
-
-  /* If ACKed max concurrent streams limit is exceeded, GOAWAY is
-     issued */
-  session->local_settings.max_concurrent_streams = 1;
-
-  stream = open_recv_stream2(session, 6, NGHTTP2_STREAM_RESERVED);
-  frame.hd.stream_id = 6;
-
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_response_headers_received(session, &frame,
-                                                              stream));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
-  CU_ASSERT(1 == session->num_incoming_streams);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_priority_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream, *dep_stream;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_outbound_item *item;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  stream = open_recv_stream(session, 1);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 2, 0);
-
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-  /* depend on stream 0 */
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  CU_ASSERT(2 == stream->weight);
-
-  stream = open_sent_stream(session, 2);
-  dep_stream = open_recv_stream(session, 3);
-
-  frame.hd.stream_id = 2;
-
-  /* using dependency stream */
-  nghttp2_priority_spec_init(&frame.priority.pri_spec, 3, 1, 0);
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-  CU_ASSERT(dep_stream == stream->dep_prev);
-
-  /* PRIORITY against idle stream */
-
-  frame.hd.stream_id = 100;
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  stream = nghttp2_session_get_stream_raw(session, frame.hd.stream_id);
-
-  CU_ASSERT(NGHTTP2_STREAM_IDLE == stream->state);
-  CU_ASSERT(dep_stream == stream->dep_prev);
-
-  nghttp2_frame_priority_free(&frame.priority);
-  nghttp2_session_del(session);
-
-  /* Check dep_stream_id == stream_id case */
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  open_recv_stream(session, 1);
-
-  nghttp2_priority_spec_init(&pri_spec, 1, 0, 0);
-
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_frame_priority_free(&frame.priority);
-  nghttp2_session_del(session);
-
-  /* Check again dep_stream_id == stream_id, and stream_id is idle */
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  nghttp2_priority_spec_init(&pri_spec, 1, 16, 0);
-
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_frame_priority_free(&frame.priority);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_rst_stream_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  open_recv_stream(session, 1);
-
-  nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_PROTOCOL_ERROR);
-
-  CU_ASSERT(0 == nghttp2_session_on_rst_stream_received(session, &frame));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 1));
-
-  nghttp2_frame_rst_stream_free(&frame.rst_stream);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_settings_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_stream *stream1, *stream2;
-  nghttp2_frame frame;
-  const size_t niv = 5;
-  nghttp2_settings_entry iv[255];
-  nghttp2_outbound_item *item;
-  nghttp2_nv nv = MAKE_NV(":authority", "example.org");
-  nghttp2_mem *mem;
-  nghttp2_option *option;
-
-  mem = nghttp2_mem_default();
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = 50;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[1].value = 1000000009;
-
-  iv[2].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[2].value = 64 * 1024;
-
-  iv[3].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[3].value = 1024;
-
-  iv[4].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-  iv[4].value = 0;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  session->remote_settings.initial_window_size = 16 * 1024;
-
-  stream1 = open_sent_stream(session, 1);
-  stream2 = open_recv_stream(session, 2);
-
-  /* Set window size for each streams and will see how settings
-     updates these values */
-  stream1->remote_window_size = 16 * 1024;
-  stream2->remote_window_size = -48 * 1024;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE,
-                              dup_iv(iv, niv), niv);
-
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-  CU_ASSERT(1000000009 == session->remote_settings.max_concurrent_streams);
-  CU_ASSERT(64 * 1024 == session->remote_settings.initial_window_size);
-  CU_ASSERT(1024 == session->remote_settings.header_table_size);
-  CU_ASSERT(0 == session->remote_settings.enable_push);
-
-  CU_ASSERT(64 * 1024 == stream1->remote_window_size);
-  CU_ASSERT(0 == stream2->remote_window_size);
-
-  frame.settings.iv[2].value = 16 * 1024;
-
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-
-  CU_ASSERT(16 * 1024 == stream1->remote_window_size);
-  CU_ASSERT(-48 * 1024 == stream2->remote_window_size);
-
-  CU_ASSERT(16 * 1024 == nghttp2_session_get_stream_remote_window_size(
-                             session, stream1->stream_id));
-  CU_ASSERT(0 == nghttp2_session_get_stream_remote_window_size(
-                     session, stream2->stream_id));
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  nghttp2_session_del(session);
-
-  /* Check ACK with niv > 0 */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_ACK, dup_iv(iv, 1),
-                              1);
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(item != NULL);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-  nghttp2_session_del(session);
-
-  /* Check ACK against no inflight SETTINGS */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_ACK, NULL, 0);
-
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(item != NULL);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-  nghttp2_session_del(session);
-
-  /* Check that 2 SETTINGS_HEADER_TABLE_SIZE 0 and 4096 are included
-     and header table size is once cleared to 0. */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_submit_request(session, NULL, &nv, 1, NULL, NULL);
-
-  nghttp2_session_send(session);
-
-  CU_ASSERT(session->hd_deflater.ctx.hd_table.len > 0);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 0;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[1].value = 2048;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 2),
-                              2);
-
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-
-  CU_ASSERT(0 == session->hd_deflater.ctx.hd_table.len);
-  CU_ASSERT(2048 == session->hd_deflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(2048 == session->remote_settings.header_table_size);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-  nghttp2_session_del(session);
-
-  /* Check that remote SETTINGS_MAX_CONCURRENT_STREAMS is set to a value set by
-     nghttp2_option_set_peer_max_concurrent_streams() and reset to the default
-     value (unlimited) after receiving initial SETTINGS frame from the peer. */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_peer_max_concurrent_streams(option, 1000);
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-  CU_ASSERT(1000 == session->remote_settings.max_concurrent_streams);
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, NULL, 0);
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-  CU_ASSERT(NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS ==
-            session->remote_settings.max_concurrent_streams);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-
-  /* Check too large SETTINGS_MAX_FRAME_SIZE */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_FRAME_SIZE;
-  iv[0].value = NGHTTP2_MAX_FRAME_SIZE_MAX + 1;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 1),
-                              1);
-
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(item != NULL);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-  nghttp2_session_del(session);
-
-  /* Check the case where stream window size overflows */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream1 = open_recv_stream(session, 1);
-
-  /* This will increment window size by 1 */
-  nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE, 1,
-                                   1);
-
-  CU_ASSERT(0 == nghttp2_session_on_window_update_received(session, &frame));
-
-  nghttp2_frame_window_update_free(&frame.window_update);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[0].value = NGHTTP2_MAX_WINDOW_SIZE;
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, dup_iv(iv, 1),
-                              1);
-
-  /* Now window size gets NGHTTP2_MAX_WINDOW_SIZE + 1, which is
-     unacceptable situation in protocol spec. */
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_SETTINGS == item->frame.hd.type);
-
-  item = nghttp2_outbound_queue_top(&session->ob_reg);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_STREAM_CLOSING == stream1->state);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_push_promise_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream, *promised_stream;
-  nghttp2_outbound_item *item;
-  nghttp2_nv malformed_nva[] = {MAKE_NV(":path", "\x01")};
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_mem *mem;
-  nghttp2_settings_entry iv = {NGHTTP2_SETTINGS_ENABLE_PUSH, 0};
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  stream = open_sent_stream(session, 1);
-
-  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
-                                  1, 2, NULL, 0);
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-  promised_stream = nghttp2_session_get_stream(session, 2);
-  CU_ASSERT(NGHTTP2_STREAM_RESERVED == promised_stream->state);
-  CU_ASSERT(2 == session->last_recv_stream_id);
-
-  /* Attempt to PUSH_PROMISE against half close (remote) */
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-  frame.push_promise.promised_stream_id = 4;
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 4));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_STREAM_CLOSED == item->frame.goaway.error_code);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(4 == session->last_recv_stream_id);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  stream = open_sent_stream(session, 1);
-
-  /* Attempt to PUSH_PROMISE against stream in closing state */
-  stream->state = NGHTTP2_STREAM_CLOSING;
-  frame.push_promise.promised_stream_id = 6;
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 6));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(6 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_CANCEL == item->frame.rst_stream.error_code);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Attempt to PUSH_PROMISE against idle stream */
-  frame.hd.stream_id = 3;
-  frame.push_promise.promised_stream_id = 8;
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 8));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(0 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  stream = open_sent_stream(session, 1);
-
-  /* Same ID twice */
-  frame.hd.stream_id = 1;
-  frame.push_promise.promised_stream_id = 2;
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 2));
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 8));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* After GOAWAY, PUSH_PROMISE will be discarded */
-  frame.push_promise.promised_stream_id = 10;
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 10));
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  open_recv_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  /* Attempt to PUSH_PROMISE against reserved (remote) stream */
-  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
-                                  2, 4, NULL, 0);
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-  nghttp2_session_del(session);
-
-  /* Disable PUSH */
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  open_sent_stream(session, 1);
-
-  session->local_settings.enable_push = 0;
-
-  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
-                                  1, 2, NULL, 0);
-
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == user_data.begin_headers_cb_called);
-  CU_ASSERT(1 == user_data.invalid_frame_recv_cb_called);
-  CU_ASSERT(0 == session->num_incoming_reserved_streams);
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-  nghttp2_session_del(session);
-
-  /* Check malformed headers. We accept malformed headers */
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  open_sent_stream(session, 1);
-
-  nvlen = ARRLEN(malformed_nva);
-  nghttp2_nv_array_copy(&nva, malformed_nva, nvlen, mem);
-  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
-                                  1, 2, nva, nvlen);
-  user_data.begin_headers_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(1 == user_data.begin_headers_cb_called);
-  CU_ASSERT(0 == user_data.invalid_frame_recv_cb_called);
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-  nghttp2_session_del(session);
-
-  /* If local_settings.enable_push = 0 is pending, but not acked from
-     peer, incoming PUSH_PROMISE is rejected */
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  open_sent_stream(session, 1);
-
-  /* Submit settings with ENABLE_PUSH = 0 (thus disabling push) */
-  nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
-
-  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
-                                  1, 2, NULL, 0);
-
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(0 == session->num_incoming_reserved_streams);
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-  nghttp2_session_del(session);
-
-  /* Check max_incoming_reserved_streams */
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  session->max_incoming_reserved_streams = 1;
-
-  open_sent_stream(session, 1);
-  open_recv_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-
-  nghttp2_frame_push_promise_init(&frame.push_promise, NGHTTP2_FLAG_END_HEADERS,
-                                  1, 4, NULL, 0);
-
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_push_promise_received(session, &frame));
-
-  CU_ASSERT(1 == session->num_incoming_reserved_streams);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_CANCEL == item->frame.rst_stream.error_code);
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_ping_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_outbound_item *top;
-  const uint8_t opaque_data[] = "01234567";
-  nghttp2_option *option;
-
-  user_data.frame_recv_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_ACK, opaque_data);
-
-  CU_ASSERT(0 == nghttp2_session_on_ping_received(session, &frame));
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-
-  /* Since this ping frame has ACK flag set, no further action is
-     performed. */
-  CU_ASSERT(NULL == nghttp2_outbound_queue_top(&session->ob_urgent));
-
-  /* Clear the flag, and receive it again */
-  frame.hd.flags = NGHTTP2_FLAG_NONE;
-
-  CU_ASSERT(0 == nghttp2_session_on_ping_received(session, &frame));
-  CU_ASSERT(2 == user_data.frame_recv_cb_called);
-  top = nghttp2_outbound_queue_top(&session->ob_urgent);
-  CU_ASSERT(NGHTTP2_PING == top->frame.hd.type);
-  CU_ASSERT(NGHTTP2_FLAG_ACK == top->frame.hd.flags);
-  CU_ASSERT(memcmp(opaque_data, top->frame.ping.opaque_data, 8) == 0);
-
-  nghttp2_frame_ping_free(&frame.ping);
-  nghttp2_session_del(session);
-
-  /* Use nghttp2_option_set_no_auto_ping_ack() */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_no_auto_ping_ack(option, 1);
-
-  nghttp2_session_server_new2(&session, &callbacks, &user_data, option);
-  nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_NONE, NULL);
-
-  user_data.frame_recv_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_on_ping_received(session, &frame));
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-  CU_ASSERT(NULL == nghttp2_outbound_queue_top(&session->ob_urgent));
-
-  nghttp2_frame_ping_free(&frame.ping);
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_on_goaway_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  int i;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  user_data.frame_recv_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-  callbacks.on_stream_close_callback = on_stream_close_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  for (i = 1; i <= 7; ++i) {
-    if (nghttp2_session_is_my_stream_id(session, i)) {
-      open_sent_stream(session, i);
-    } else {
-      open_recv_stream(session, i);
-    }
-  }
-
-  nghttp2_frame_goaway_init(&frame.goaway, 3, NGHTTP2_PROTOCOL_ERROR, NULL, 0);
-
-  user_data.stream_close_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_on_goaway_received(session, &frame));
-
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-  CU_ASSERT(3 == session->remote_last_stream_id);
-  /* on_stream_close should be callsed for 2 times (stream 5 and 7) */
-  CU_ASSERT(2 == user_data.stream_close_cb_called);
-
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 1));
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 2));
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 3));
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 4));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 5));
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 6));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 7));
-
-  nghttp2_frame_goaway_free(&frame.goaway, mem);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_window_update_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  nghttp2_outbound_item *data_item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-  user_data.frame_recv_cb_called = 0;
-  user_data.invalid_frame_recv_cb_called = 0;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-
-  stream = open_sent_stream(session, 1);
-
-  data_item = create_data_ob_item(mem);
-
-  CU_ASSERT(0 == nghttp2_stream_attach_item(stream, data_item));
-
-  nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE, 1,
-                                   16 * 1024);
-
-  CU_ASSERT(0 == nghttp2_session_on_window_update_received(session, &frame));
-  CU_ASSERT(1 == user_data.frame_recv_cb_called);
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 16 * 1024 ==
-            stream->remote_window_size);
-
-  CU_ASSERT(0 == nghttp2_stream_defer_item(
-                     stream, NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL));
-
-  CU_ASSERT(0 == nghttp2_session_on_window_update_received(session, &frame));
-  CU_ASSERT(2 == user_data.frame_recv_cb_called);
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 16 * 1024 * 2 ==
-            stream->remote_window_size);
-  CU_ASSERT(0 == (stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL));
-
-  nghttp2_frame_window_update_free(&frame.window_update);
-
-  /* Receiving WINDOW_UPDATE on reserved (remote) stream is a
-     connection error */
-  open_recv_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE, 2,
-                                   4096);
-
-  CU_ASSERT(!(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND));
-  CU_ASSERT(0 == nghttp2_session_on_window_update_received(session, &frame));
-  CU_ASSERT(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND);
-
-  nghttp2_frame_window_update_free(&frame.window_update);
-
-  nghttp2_session_del(session);
-
-  /* Receiving WINDOW_UPDATE on reserved (local) stream is allowed */
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-
-  stream = open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE, 2,
-                                   4096);
-
-  CU_ASSERT(0 == nghttp2_session_on_window_update_received(session, &frame));
-  CU_ASSERT(!(session->goaway_flags & NGHTTP2_GOAWAY_TERM_ON_SEND));
-
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 4096 == stream->remote_window_size);
-
-  nghttp2_frame_window_update_free(&frame.window_update);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_data_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_outbound_item *top;
-  nghttp2_stream *stream;
-  nghttp2_frame frame;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  stream = open_recv_stream(session, 2);
-
-  nghttp2_frame_hd_init(&frame.hd, 4096, NGHTTP2_DATA, NGHTTP2_FLAG_NONE, 2);
-
-  CU_ASSERT(0 == nghttp2_session_on_data_received(session, &frame));
-  CU_ASSERT(0 == stream->shut_flags);
-
-  frame.hd.flags = NGHTTP2_FLAG_END_STREAM;
-
-  CU_ASSERT(0 == nghttp2_session_on_data_received(session, &frame));
-  CU_ASSERT(NGHTTP2_SHUT_RD == stream->shut_flags);
-
-  /* If NGHTTP2_STREAM_CLOSING state, DATA frame is discarded. */
-  open_sent_stream2(session, 1, NGHTTP2_STREAM_CLOSING);
-
-  frame.hd.flags = NGHTTP2_FLAG_NONE;
-  frame.hd.stream_id = 1;
-
-  CU_ASSERT(0 == nghttp2_session_on_data_received(session, &frame));
-  CU_ASSERT(NULL == nghttp2_outbound_queue_top(&session->ob_reg));
-
-  /* Check INVALID_STREAM case: DATA frame with stream ID which does
-     not exist. */
-
-  frame.hd.stream_id = 3;
-
-  CU_ASSERT(0 == nghttp2_session_on_data_received(session, &frame));
-  top = nghttp2_outbound_queue_top(&session->ob_reg);
-  /* DATA against nonexistent stream is just ignored for now. */
-  CU_ASSERT(top == NULL);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_data_received_fail_fast(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  uint8_t buf[9];
-  nghttp2_stream *stream;
-  nghttp2_frame_hd hd;
-  nghttp2_outbound_item *item;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_DATA, NGHTTP2_FLAG_NONE, 1);
-  nghttp2_frame_pack_frame_hd(buf, &hd);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* DATA to closed (remote) */
-  stream = open_recv_stream(session, 1);
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-
-  CU_ASSERT((ssize_t)sizeof(buf) ==
-            nghttp2_session_mem_recv(session, buf, sizeof(buf)));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* DATA to closed stream with explicit closed (remote) */
-  stream = open_recv_stream(session, 1);
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_RD);
-  nghttp2_session_close_stream(session, 1, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT((ssize_t)sizeof(buf) ==
-            nghttp2_session_mem_recv(session, buf, sizeof(buf)));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_altsvc_received(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_frame frame;
-  nghttp2_option *option;
-  uint8_t origin[] = "nghttp2.org";
-  uint8_t field_value[] = "h2=\":443\"";
-  int rv;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  nghttp2_option_new(&option);
-  nghttp2_option_set_builtin_recv_extension_type(option, NGHTTP2_ALTSVC);
-
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  frame.ext.payload = &session->iframe.ext_frame_payload;
-
-  /* We just pass the strings without making a copy.  This is OK,
-     since we never call nghttp2_frame_altsvc_free(). */
-  nghttp2_frame_altsvc_init(&frame.ext, 0, origin, sizeof(origin) - 1,
-                            field_value, sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_on_altsvc_received(session, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* Receiving empty origin with stream ID == 0 */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  frame.ext.payload = &session->iframe.ext_frame_payload;
-
-  nghttp2_frame_altsvc_init(&frame.ext, 0, origin, 0, field_value,
-                            sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_on_altsvc_received(session, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* Receiving non-empty origin with stream ID != 0 */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  frame.ext.payload = &session->iframe.ext_frame_payload;
-
-  open_sent_stream(session, 1);
-
-  nghttp2_frame_altsvc_init(&frame.ext, 1, origin, sizeof(origin) - 1,
-                            field_value, sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_on_altsvc_received(session, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* Receiving empty origin with stream ID != 0; this is OK */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  frame.ext.payload = &session->iframe.ext_frame_payload;
-
-  open_sent_stream(session, 1);
-
-  nghttp2_frame_altsvc_init(&frame.ext, 1, origin, 0, field_value,
-                            sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_on_altsvc_received(session, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* Stream does not exist; ALTSVC will be ignored. */
-  nghttp2_session_client_new2(&session, &callbacks, &ud, option);
-
-  frame.ext.payload = &session->iframe.ext_frame_payload;
-
-  nghttp2_frame_altsvc_init(&frame.ext, 1, origin, 0, field_value,
-                            sizeof(field_value) - 1);
-
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_on_altsvc_received(session, &frame);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  nghttp2_session_del(session);
-
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_send_headers_start_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_headers_init(&frame->headers, NGHTTP2_FLAG_END_HEADERS,
-                             (int32_t)session->next_stream_id,
-                             NGHTTP2_HCAT_REQUEST, NULL, NULL, 0);
-  session->next_stream_id += 2;
-
-  nghttp2_session_add_item(session, item);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  stream = nghttp2_session_get_stream(session, 1);
-  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_headers_reply(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, NULL));
-  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_headers_init(&frame->headers, NGHTTP2_FLAG_END_HEADERS, 1,
-                             NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  nghttp2_session_add_item(session, item);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  stream = nghttp2_session_get_stream(session, 1);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_headers_frame_size_error(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  size_t vallen = NGHTTP2_HD_MAX_NV;
-  nghttp2_nv nv[28];
-  size_t nnv = ARRLEN(nv);
-  size_t i;
-  my_user_data ud;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  for (i = 0; i < nnv; ++i) {
-    nv[i].name = (uint8_t *)"header";
-    nv[i].namelen = strlen((const char *)nv[i].name);
-    nv[i].value = mem->malloc(vallen + 1, NULL);
-    memset(nv[i].value, '0' + (int)i, vallen);
-    nv[i].value[vallen] = '\0';
-    nv[i].valuelen = vallen;
-    nv[i].flags = NGHTTP2_NV_FLAG_NONE;
-  }
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  nvlen = nnv;
-  nghttp2_nv_array_copy(&nva, nv, nvlen, mem);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_headers_init(&frame->headers, NGHTTP2_FLAG_END_HEADERS,
-                             (int32_t)session->next_stream_id,
-                             NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
-
-  session->next_stream_id += 2;
-
-  nghttp2_session_add_item(session, item);
-
-  ud.frame_not_send_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == ud.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_ERR_FRAME_SIZE_ERROR == ud.not_sent_error);
-
-  for (i = 0; i < nnv; ++i) {
-    mem->free(nv[i].value, NULL);
-  }
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_headers_push_reply(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, NULL));
-  open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_headers_init(&frame->headers, NGHTTP2_FLAG_END_HEADERS, 2,
-                             NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  nghttp2_session_add_item(session, item);
-  CU_ASSERT(0 == session->num_outgoing_streams);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == session->num_outgoing_streams);
-  stream = nghttp2_session_get_stream(session, 2);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-  CU_ASSERT(0 == (stream->flags & NGHTTP2_STREAM_FLAG_PUSH));
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_rst_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  open_sent_stream(session, 1);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_rst_stream_init(&frame->rst_stream, 1, NGHTTP2_PROTOCOL_ERROR);
-  nghttp2_session_add_item(session, item);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 1));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_push_promise(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_stream *stream;
-  nghttp2_settings_entry iv;
-  my_user_data ud;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-  open_recv_stream(session, 1);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_push_promise_init(&frame->push_promise,
-                                  NGHTTP2_FLAG_END_HEADERS, 1,
-                                  (int32_t)session->next_stream_id, NULL, 0);
-
-  session->next_stream_id += 2;
-
-  nghttp2_session_add_item(session, item);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  stream = nghttp2_session_get_stream(session, 2);
-  CU_ASSERT(NGHTTP2_STREAM_RESERVED == stream->state);
-
-  /* Received ENABLE_PUSH = 0 */
-  iv.settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-  iv.value = 0;
-  frame = mem->malloc(sizeof(nghttp2_frame), NULL);
-  nghttp2_frame_settings_init(&frame->settings, NGHTTP2_FLAG_NONE,
-                              dup_iv(&iv, 1), 1);
-  nghttp2_session_on_settings_received(session, frame, 1);
-  nghttp2_frame_settings_free(&frame->settings, mem);
-  mem->free(frame, NULL);
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_push_promise_init(&frame->push_promise,
-                                  NGHTTP2_FLAG_END_HEADERS, 1, -1, NULL, 0);
-  nghttp2_session_add_item(session, item);
-
-  ud.frame_not_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_PUSH_PROMISE == ud.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_ERR_PUSH_DISABLED == ud.not_sent_error);
-
-  nghttp2_session_del(session);
-
-  /* PUSH_PROMISE from client is error */
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  open_sent_stream(session, 1);
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-
-  nghttp2_outbound_item_init(item);
-
-  frame = &item->frame;
-
-  nghttp2_frame_push_promise_init(&frame->push_promise,
-                                  NGHTTP2_FLAG_END_HEADERS, 1, -1, NULL, 0);
-  nghttp2_session_add_item(session, item);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 3));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_is_my_stream_id(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  CU_ASSERT(0 == nghttp2_session_is_my_stream_id(session, 0));
-  CU_ASSERT(0 == nghttp2_session_is_my_stream_id(session, 1));
-  CU_ASSERT(1 == nghttp2_session_is_my_stream_id(session, 2));
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  CU_ASSERT(0 == nghttp2_session_is_my_stream_id(session, 0));
-  CU_ASSERT(1 == nghttp2_session_is_my_stream_id(session, 1));
-  CU_ASSERT(0 == nghttp2_session_is_my_stream_id(session, 2));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_upgrade2(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  uint8_t settings_payload[128];
-  size_t settings_payloadlen;
-  nghttp2_settings_entry iv[16];
-  nghttp2_stream *stream;
-  nghttp2_outbound_item *item;
-  ssize_t rv;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = 1;
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 4095;
-  settings_payloadlen = (size_t)nghttp2_pack_settings_payload(
-      settings_payload, sizeof(settings_payload), iv, 2);
-
-  /* Check client side */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  CU_ASSERT(0 == nghttp2_session_upgrade2(session, settings_payload,
-                                          settings_payloadlen, 0, &callbacks));
-  CU_ASSERT(1 == session->last_sent_stream_id);
-  stream = nghttp2_session_get_stream(session, 1);
-  CU_ASSERT(stream != NULL);
-  CU_ASSERT(&callbacks == stream->stream_user_data);
-  CU_ASSERT(NGHTTP2_SHUT_WR == stream->shut_flags);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_SETTINGS == item->frame.hd.type);
-  CU_ASSERT(2 == item->frame.settings.niv);
-  CU_ASSERT(NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS ==
-            item->frame.settings.iv[0].settings_id);
-  CU_ASSERT(1 == item->frame.settings.iv[0].value);
-  CU_ASSERT(NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE ==
-            item->frame.settings.iv[1].settings_id);
-  CU_ASSERT(4095 == item->frame.settings.iv[1].value);
-
-  /* Call nghttp2_session_upgrade2() again is error */
-  CU_ASSERT(NGHTTP2_ERR_PROTO ==
-            nghttp2_session_upgrade2(session, settings_payload,
-                                     settings_payloadlen, 0, &callbacks));
-  nghttp2_session_del(session);
-
-  /* Make sure that response from server can be received */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  CU_ASSERT(0 == nghttp2_session_upgrade2(session, settings_payload,
-                                          settings_payloadlen, 0, &callbacks));
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, resnv,
-                    ARRLEN(resnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  buf = &bufs.head->buf;
-
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT(rv == (ssize_t)nghttp2_buf_len(buf));
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* Check server side */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  CU_ASSERT(0 == nghttp2_session_upgrade2(session, settings_payload,
-                                          settings_payloadlen, 0, &callbacks));
-  CU_ASSERT(1 == session->last_recv_stream_id);
-  stream = nghttp2_session_get_stream(session, 1);
-  CU_ASSERT(stream != NULL);
-  CU_ASSERT(NULL == stream->stream_user_data);
-  CU_ASSERT(NGHTTP2_SHUT_RD == stream->shut_flags);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-  CU_ASSERT(1 == session->remote_settings.max_concurrent_streams);
-  CU_ASSERT(4095 == session->remote_settings.initial_window_size);
-  /* Call nghttp2_session_upgrade2() again is error */
-  CU_ASSERT(NGHTTP2_ERR_PROTO ==
-            nghttp2_session_upgrade2(session, settings_payload,
-                                     settings_payloadlen, 0, &callbacks));
-  nghttp2_session_del(session);
-
-  /* Empty SETTINGS is OK */
-  settings_payloadlen = (size_t)nghttp2_pack_settings_payload(
-      settings_payload, sizeof(settings_payload), NULL, 0);
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  CU_ASSERT(0 == nghttp2_session_upgrade2(session, settings_payload,
-                                          settings_payloadlen, 0, NULL));
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_reprioritize_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  nghttp2_stream *dep_stream;
-  nghttp2_priority_spec pri_spec;
-  int rv;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = block_count_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream = open_recv_stream(session, 1);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 10, 0);
-
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(10 == stream->weight);
-  CU_ASSERT(&session->root == stream->dep_prev);
-
-  /* If depenency to idle stream which is not in depdenency tree yet */
-
-  nghttp2_priority_spec_init(&pri_spec, 3, 99, 0);
-
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(99 == stream->weight);
-  CU_ASSERT(3 == stream->dep_prev->stream_id);
-
-  dep_stream = nghttp2_session_get_stream_raw(session, 3);
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == dep_stream->weight);
-
-  dep_stream = open_recv_stream(session, 3);
-
-  /* Change weight */
-  pri_spec.weight = 128;
-
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(128 == stream->weight);
-  CU_ASSERT(dep_stream == stream->dep_prev);
-
-  /* Change weight again to test short-path case */
-  pri_spec.weight = 100;
-
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(100 == stream->weight);
-  CU_ASSERT(dep_stream == stream->dep_prev);
-  CU_ASSERT(100 == dep_stream->sum_dep_weight);
-
-  /* Test circular dependency; stream 1 is first removed and becomes
-     root.  Then stream 3 depends on it. */
-  nghttp2_priority_spec_init(&pri_spec, 1, 1, 0);
-
-  rv = nghttp2_session_reprioritize_stream(session, dep_stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(1 == dep_stream->weight);
-  CU_ASSERT(stream == dep_stream->dep_prev);
-
-  /* Making priority to closed stream will result in default
-     priority */
-  session->last_recv_stream_id = 9;
-
-  nghttp2_priority_spec_init(&pri_spec, 5, 5, 0);
-
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* circular dependency; in case of stream which is not a direct
-     descendant of root.  Use exclusive dependency. */
-  stream = open_recv_stream(session, 1);
-  stream = open_recv_stream_with_dep(session, 3, stream);
-  stream = open_recv_stream_with_dep(session, 5, stream);
-  stream = open_recv_stream_with_dep(session, 7, stream);
-  open_recv_stream_with_dep(session, 9, stream);
-
-  nghttp2_priority_spec_init(&pri_spec, 7, 1, 1);
-
-  stream = nghttp2_session_get_stream(session, 3);
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(7 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream(session, 7);
-
-  CU_ASSERT(1 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream(session, 9);
-
-  CU_ASSERT(3 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream(session, 5);
-
-  CU_ASSERT(3 == stream->dep_prev->stream_id);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* circular dependency; in case of stream which is not a direct
-     descendant of root.  Without exclusive dependency. */
-  stream = open_recv_stream(session, 1);
-  stream = open_recv_stream_with_dep(session, 3, stream);
-  stream = open_recv_stream_with_dep(session, 5, stream);
-  stream = open_recv_stream_with_dep(session, 7, stream);
-  open_recv_stream_with_dep(session, 9, stream);
-
-  nghttp2_priority_spec_init(&pri_spec, 7, 1, 0);
-
-  stream = nghttp2_session_get_stream(session, 3);
-  rv = nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(7 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream(session, 7);
-
-  CU_ASSERT(1 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream(session, 9);
-
-  CU_ASSERT(7 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream(session, 5);
-
-  CU_ASSERT(3 == stream->dep_prev->stream_id);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_reprioritize_stream_with_idle_stream_dep(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  nghttp2_priority_spec pri_spec;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = block_count_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream = open_recv_stream(session, 1);
-
-  session->pending_local_max_concurrent_stream = 1;
-
-  nghttp2_priority_spec_init(&pri_spec, 101, 10, 0);
-
-  nghttp2_session_reprioritize_stream(session, stream, &pri_spec);
-
-  /* idle stream is not counteed to max concurrent streams */
-
-  CU_ASSERT(10 == stream->weight);
-  CU_ASSERT(101 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream_raw(session, 101);
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  nghttp2_frame *frame;
-  nghttp2_frame_hd hd;
-  nghttp2_active_outbound_item *aob;
-  nghttp2_bufs *framebufs;
-  nghttp2_buf *buf;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = block_count_send_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 2;
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-  aob = &session->aob;
-  framebufs = &aob->framebufs;
-
-  open_sent_stream(session, 1);
-
-  CU_ASSERT(
-      0 == nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 1, &data_prd));
-
-  ud.block_count = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  frame = &aob->item->frame;
-
-  buf = &framebufs->head->buf;
-  nghttp2_frame_unpack_frame_hd(&hd, buf->pos);
-
-  CU_ASSERT(NGHTTP2_FLAG_NONE == hd.flags);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == frame->hd.flags);
-  /* aux_data.data.flags has these flags */
-  CU_ASSERT(NGHTTP2_FLAG_END_STREAM == aob->item->aux_data.data.flags);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_data_read_length_too_large(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  nghttp2_frame *frame;
-  nghttp2_frame_hd hd;
-  nghttp2_active_outbound_item *aob;
-  nghttp2_bufs *framebufs;
-  nghttp2_buf *buf;
-  size_t payloadlen;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = block_count_send_callback;
-  callbacks.read_length_callback = too_large_data_source_length_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 2;
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-  aob = &session->aob;
-  framebufs = &aob->framebufs;
-
-  open_sent_stream(session, 1);
-
-  CU_ASSERT(
-      0 == nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 1, &data_prd));
-
-  ud.block_count = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  frame = &aob->item->frame;
-
-  buf = &framebufs->head->buf;
-  nghttp2_frame_unpack_frame_hd(&hd, buf->pos);
-
-  CU_ASSERT(NGHTTP2_FLAG_NONE == hd.flags);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == frame->hd.flags);
-  CU_ASSERT(16384 == hd.length)
-  /* aux_data.data.flags has these flags */
-  CU_ASSERT(NGHTTP2_FLAG_END_STREAM == aob->item->aux_data.data.flags);
-
-  nghttp2_session_del(session);
-
-  /* Check that buffers are expanded */
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-
-  ud.data_source_length = NGHTTP2_MAX_FRAME_SIZE_MAX;
-
-  session->remote_settings.max_frame_size = NGHTTP2_MAX_FRAME_SIZE_MAX;
-
-  open_sent_stream(session, 1);
-
-  CU_ASSERT(
-      0 == nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 1, &data_prd));
-
-  ud.block_count = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  aob = &session->aob;
-
-  frame = &aob->item->frame;
-
-  framebufs = &aob->framebufs;
-
-  buf = &framebufs->head->buf;
-  nghttp2_frame_unpack_frame_hd(&hd, buf->pos);
-
-  payloadlen = nghttp2_min(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE,
-                           NGHTTP2_INITIAL_WINDOW_SIZE);
-
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + 1 + payloadlen ==
-            (size_t)nghttp2_buf_cap(buf));
-  CU_ASSERT(NGHTTP2_FLAG_NONE == hd.flags);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == frame->hd.flags);
-  CU_ASSERT(payloadlen == hd.length);
-  /* aux_data.data.flags has these flags */
-  CU_ASSERT(NGHTTP2_FLAG_END_STREAM == aob->item->aux_data.data.flags);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_data_read_length_smallest(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  nghttp2_frame *frame;
-  nghttp2_frame_hd hd;
-  nghttp2_active_outbound_item *aob;
-  nghttp2_bufs *framebufs;
-  nghttp2_buf *buf;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = block_count_send_callback;
-  callbacks.read_length_callback = smallest_length_data_source_length_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 2;
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-  aob = &session->aob;
-  framebufs = &aob->framebufs;
-
-  open_sent_stream(session, 1);
-
-  CU_ASSERT(
-      0 == nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 1, &data_prd));
-
-  ud.block_count = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  frame = &aob->item->frame;
-
-  buf = &framebufs->head->buf;
-  nghttp2_frame_unpack_frame_hd(&hd, buf->pos);
-
-  CU_ASSERT(NGHTTP2_FLAG_NONE == hd.flags);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == frame->hd.flags);
-  CU_ASSERT(1 == hd.length)
-  /* aux_data.data.flags has these flags */
-  CU_ASSERT(NGHTTP2_FLAG_END_STREAM == aob->item->aux_data.data.flags);
-
-  nghttp2_session_del(session);
-}
-
-static ssize_t submit_data_twice_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  (void)session;
-  (void)stream_id;
-  (void)buf;
-  (void)source;
-  (void)user_data;
-
-  *data_flags |= NGHTTP2_DATA_FLAG_EOF;
-  return (ssize_t)nghttp2_min(len, 16);
-}
-
-static int submit_data_twice_on_frame_send_callback(nghttp2_session *session,
-                                                    const nghttp2_frame *frame,
-                                                    void *user_data) {
-  static int called = 0;
-  int rv;
-  nghttp2_data_provider data_prd;
-  (void)user_data;
-
-  if (called == 0) {
-    called = 1;
-
-    data_prd.read_callback = submit_data_twice_data_source_read_callback;
-
-    rv = nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM,
-                             frame->hd.stream_id, &data_prd);
-    CU_ASSERT(0 == rv);
-  }
-
-  return 0;
-}
-
-void test_nghttp2_submit_data_twice(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  accumulator acc;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-  callbacks.on_frame_send_callback = submit_data_twice_on_frame_send_callback;
-
-  data_prd.read_callback = submit_data_twice_data_source_read_callback;
-
-  acc.length = 0;
-  ud.acc = &acc;
-
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-
-  open_sent_stream(session, 1);
-
-  CU_ASSERT(0 == nghttp2_submit_data(session, NGHTTP2_FLAG_NONE, 1, &data_prd));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* We should have sent 2 DATA frame with 16 bytes payload each */
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN * 2 + 16 * 2 == acc.length);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_request_with_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = 64 * 1024 - 1;
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-  CU_ASSERT(1 == nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv),
-                                        &data_prd, NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(reqnv) == item->frame.headers.nvlen);
-  assert_nv_equal(reqnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.data_source_length);
-
-  nghttp2_session_del(session);
-
-  /* nghttp2_submit_request() with server session is error */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  CU_ASSERT(NGHTTP2_ERR_PROTO == nghttp2_submit_request(session, NULL, reqnv,
-                                                        ARRLEN(reqnv), NULL,
-                                                        NULL));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_request_without_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  accumulator acc;
-  nghttp2_data_provider data_prd = {{-1}, NULL};
-  nghttp2_outbound_item *item;
-  my_user_data ud;
-  nghttp2_frame frame;
-  nghttp2_hd_inflater inflater;
-  nva_out out;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  nghttp2_priority_spec pri_spec;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  acc.length = 0;
-  ud.acc = &acc;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-
-  nghttp2_hd_inflate_init(&inflater, mem);
-  CU_ASSERT(1 == nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv),
-                                        &data_prd, NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(reqnv) == item->frame.headers.nvlen);
-  assert_nv_equal(reqnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT(item->frame.hd.flags & NGHTTP2_FLAG_END_STREAM);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == unpack_frame(&frame, acc.buf, acc.length));
-
-  nghttp2_bufs_add(&bufs, acc.buf, acc.length);
-  inflate_hd(&inflater, &out, &bufs, NGHTTP2_FRAME_HDLEN, mem);
-
-  CU_ASSERT(ARRLEN(reqnv) == out.nvlen);
-  assert_nv_equal(reqnv, out.nva, out.nvlen, mem);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  nva_out_reset(&out, mem);
-
-  nghttp2_bufs_free(&bufs);
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* Try to depend on itself is error */
-  nghttp2_priority_spec_init(&pri_spec, (int32_t)session->next_stream_id, 16,
-                             0);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_request(session, &pri_spec, reqnv, ARRLEN(reqnv),
-                                   NULL, NULL));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_response_with_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = 64 * 1024 - 1;
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-  CU_ASSERT(0 == nghttp2_submit_response(session, 1, resnv, ARRLEN(resnv),
-                                         &data_prd));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(resnv) == item->frame.headers.nvlen);
-  assert_nv_equal(resnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.data_source_length);
-
-  nghttp2_session_del(session);
-
-  /* Various error cases */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  /* Calling nghttp2_submit_response() with client session is error */
-  CU_ASSERT(NGHTTP2_ERR_PROTO ==
-            nghttp2_submit_response(session, 1, resnv, ARRLEN(resnv), NULL));
-
-  /* Stream ID <= 0 is error */
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_response(session, 0, resnv, ARRLEN(resnv), NULL));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_response_without_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  accumulator acc;
-  nghttp2_data_provider data_prd = {{-1}, NULL};
-  nghttp2_outbound_item *item;
-  my_user_data ud;
-  nghttp2_frame frame;
-  nghttp2_hd_inflater inflater;
-  nva_out out;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  acc.length = 0;
-  ud.acc = &acc;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-
-  nghttp2_hd_inflate_init(&inflater, mem);
-  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-  CU_ASSERT(0 == nghttp2_submit_response(session, 1, resnv, ARRLEN(resnv),
-                                         &data_prd));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(resnv) == item->frame.headers.nvlen);
-  assert_nv_equal(resnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT(item->frame.hd.flags & NGHTTP2_FLAG_END_STREAM);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == unpack_frame(&frame, acc.buf, acc.length));
-
-  nghttp2_bufs_add(&bufs, acc.buf, acc.length);
-  inflate_hd(&inflater, &out, &bufs, NGHTTP2_FRAME_HDLEN, mem);
-
-  CU_ASSERT(ARRLEN(resnv) == out.nvlen);
-  assert_nv_equal(resnv, out.nva, out.nvlen, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_response_push_response(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  session->goaway_flags |= NGHTTP2_GOAWAY_RECV;
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_response(session, 2, resnv, ARRLEN(resnv), NULL));
-
-  ud.frame_not_send_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_trailer(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  accumulator acc;
-  nghttp2_data_provider data_prd;
-  nghttp2_outbound_item *item;
-  my_user_data ud;
-  nghttp2_frame frame;
-  nghttp2_hd_inflater inflater;
-  nva_out out;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  data_prd.read_callback = no_end_stream_data_source_read_callback;
-  nva_out_init(&out);
-  acc.length = 0;
-  ud.acc = &acc;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-
-  nghttp2_hd_inflate_init(&inflater, mem);
-  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-  CU_ASSERT(0 == nghttp2_submit_response(session, 1, resnv, ARRLEN(resnv),
-                                         &data_prd));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_trailer(session, 1, trailernv, ARRLEN(trailernv)));
-
-  session->callbacks.send_callback = accumulator_send_callback;
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_HCAT_HEADERS == item->frame.headers.cat);
-  CU_ASSERT(item->frame.hd.flags & NGHTTP2_FLAG_END_STREAM);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == unpack_frame(&frame, acc.buf, acc.length));
-
-  nghttp2_bufs_add(&bufs, acc.buf, acc.length);
-  inflate_hd(&inflater, &out, &bufs, NGHTTP2_FRAME_HDLEN, mem);
-
-  CU_ASSERT(ARRLEN(trailernv) == out.nvlen);
-  assert_nv_equal(trailernv, out.nva, out.nvlen, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  nghttp2_hd_inflate_free(&inflater);
-  nghttp2_session_del(session);
-
-  /* Specifying stream ID <= 0 is error */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  open_recv_stream(session, 1);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_trailer(session, 0, trailernv, ARRLEN(trailernv)));
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_trailer(session, -1, trailernv, ARRLEN(trailernv)));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_headers_start_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, NULL));
-  CU_ASSERT(1 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, -1,
-                                        NULL, reqnv, ARRLEN(reqnv), NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(reqnv) == item->frame.headers.nvlen);
-  assert_nv_equal(reqnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT((NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM) ==
-            item->frame.hd.flags);
-  CU_ASSERT(0 == (item->frame.hd.flags & NGHTTP2_FLAG_PRIORITY));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_headers_reply(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 1,
-                                        NULL, resnv, ARRLEN(resnv), NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(resnv) == item->frame.headers.nvlen);
-  assert_nv_equal(resnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT((NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS) ==
-            item->frame.hd.flags);
-
-  ud.frame_send_cb_called = 0;
-  ud.sent_frame_type = 0;
-  /* The transimission will be canceled because the stream 1 is not
-     open. */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-
-  stream = open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 1,
-                                        NULL, resnv, ARRLEN(resnv), NULL));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type);
-  CU_ASSERT(stream->shut_flags & NGHTTP2_SHUT_WR);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_headers_push_reply(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_stream *stream;
-  int foo;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-  stream = open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 2, NULL,
-                                        resnv, ARRLEN(resnv), &foo));
-
-  ud.frame_send_cb_called = 0;
-  ud.sent_frame_type = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-  CU_ASSERT(&foo == stream->stream_user_data);
-
-  nghttp2_session_del(session);
-
-  /* Sending HEADERS from client against stream in reserved state is
-     error */
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-  open_recv_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 2, NULL,
-                                        reqnv, ARRLEN(reqnv), NULL));
-
-  ud.frame_send_cb_called = 0;
-  ud.sent_frame_type = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_headers(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-  accumulator acc;
-  nghttp2_frame frame;
-  nghttp2_hd_inflater inflater;
-  nva_out out;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  nghttp2_priority_spec pri_spec;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  nva_out_init(&out);
-  acc.length = 0;
-  ud.acc = &acc;
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-
-  nghttp2_hd_inflate_init(&inflater, mem);
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 1,
-                                        NULL, reqnv, ARRLEN(reqnv), NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(ARRLEN(reqnv) == item->frame.headers.nvlen);
-  assert_nv_equal(reqnv, item->frame.headers.nva, item->frame.headers.nvlen,
-                  mem);
-  CU_ASSERT((NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS) ==
-            item->frame.hd.flags);
-
-  ud.frame_send_cb_called = 0;
-  ud.sent_frame_type = 0;
-  /* The transimission will be canceled because the stream 1 is not
-     open. */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-
-  stream = open_sent_stream(session, 1);
-
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 1,
-                                        NULL, reqnv, ARRLEN(reqnv), NULL));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type);
-  CU_ASSERT(stream->shut_flags & NGHTTP2_SHUT_WR);
-
-  CU_ASSERT(0 == unpack_frame(&frame, acc.buf, acc.length));
-
-  nghttp2_bufs_add(&bufs, acc.buf, acc.length);
-  inflate_hd(&inflater, &out, &bufs, NGHTTP2_FRAME_HDLEN, mem);
-
-  CU_ASSERT(ARRLEN(reqnv) == out.nvlen);
-  assert_nv_equal(reqnv, out.nva, out.nvlen, mem);
-
-  nva_out_reset(&out, mem);
-  nghttp2_bufs_free(&bufs);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_hd_inflate_free(&inflater);
-
-  /* Try to depend on itself */
-  nghttp2_priority_spec_init(&pri_spec, 3, 16, 0);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 3, &pri_spec,
-                                   reqnv, ARRLEN(reqnv), NULL));
-
-  session->next_stream_id = 5;
-  nghttp2_priority_spec_init(&pri_spec, 5, 16, 0);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, -1, &pri_spec,
-                                   reqnv, ARRLEN(reqnv), NULL));
-
-  nghttp2_session_del(session);
-
-  /* Error cases with invalid stream ID */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* Sending nghttp2_submit_headers() with stream_id == 1 and server
-     session is error */
-  CU_ASSERT(NGHTTP2_ERR_PROTO ==
-            nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, -1, NULL, reqnv,
-                                   ARRLEN(reqnv), NULL));
-
-  /* Sending stream ID <= 0 is error */
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 0, NULL, resnv,
-                                   ARRLEN(resnv), NULL));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_headers_continuation(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_nv nv[] = {
-      MAKE_NV("h1", ""), MAKE_NV("h1", ""), MAKE_NV("h1", ""),
-      MAKE_NV("h1", ""), MAKE_NV("h1", ""), MAKE_NV("h1", ""),
-      MAKE_NV("h1", ""),
-  };
-  nghttp2_outbound_item *item;
-  uint8_t data[4096];
-  size_t i;
-  my_user_data ud;
-
-  memset(data, '0', sizeof(data));
-  for (i = 0; i < ARRLEN(nv); ++i) {
-    nv[i].valuelen = sizeof(data);
-    nv[i].value = data;
-  }
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, &ud));
-  CU_ASSERT(1 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, -1,
-                                        NULL, nv, ARRLEN(nv), NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
-  CU_ASSERT((NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS) ==
-            item->frame.hd.flags);
-  CU_ASSERT(0 == (item->frame.hd.flags & NGHTTP2_FLAG_PRIORITY));
-
-  ud.frame_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_headers_continuation_extra_large(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_nv nv[] = {
-      MAKE_NV("h1", ""), MAKE_NV("h1", ""), MAKE_NV("h1", ""),
-      MAKE_NV("h1", ""), MAKE_NV("h1", ""), MAKE_NV("h1", ""),
-  };
-  nghttp2_outbound_item *item;
-  uint8_t data[16384];
-  size_t i;
-  my_user_data ud;
-  nghttp2_option *opt;
-
-  memset(data, '0', sizeof(data));
-  for (i = 0; i < ARRLEN(nv); ++i) {
-    nv[i].valuelen = sizeof(data);
-    nv[i].value = data;
-  }
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  /* The default size of max send header block length is too small to
-     send these header fields.  Expand it. */
-  nghttp2_option_new(&opt);
-  nghttp2_option_set_max_send_header_block_length(opt, 102400);
-
-  CU_ASSERT(0 == nghttp2_session_client_new2(&session, &callbacks, &ud, opt));
-  CU_ASSERT(1 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, -1,
-                                        NULL, nv, ARRLEN(nv), NULL));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
-  CU_ASSERT((NGHTTP2_FLAG_END_STREAM | NGHTTP2_FLAG_END_HEADERS) ==
-            item->frame.hd.flags);
-  CU_ASSERT(0 == (item->frame.hd.flags & NGHTTP2_FLAG_PRIORITY));
-
-  ud.frame_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-
-  nghttp2_session_del(session);
-  nghttp2_option_del(opt);
-}
-
-void test_nghttp2_submit_priority(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  my_user_data ud;
-  nghttp2_priority_spec pri_spec;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  stream = open_sent_stream(session, 1);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 3, 0);
-
-  /* depends on stream 0 */
-  CU_ASSERT(0 ==
-            nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 1, &pri_spec));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(3 == stream->weight);
-
-  /* submit against idle stream */
-  CU_ASSERT(0 ==
-            nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 3, &pri_spec));
-
-  ud.frame_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_settings(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_outbound_item *item;
-  nghttp2_frame *frame;
-  nghttp2_settings_entry iv[7];
-  nghttp2_frame ack_frame;
-  const int32_t UNKNOWN_ID = 1000000007;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = 5;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 16 * 1024;
-
-  iv[2].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[2].value = 50;
-
-  iv[3].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[3].value = 111;
-
-  iv[4].settings_id = UNKNOWN_ID;
-  iv[4].value = 999;
-
-  iv[5].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[5].value = 1023;
-
-  iv[6].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[6].value = (uint32_t)NGHTTP2_MAX_WINDOW_SIZE + 1;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 7));
-
-  /* Make sure that local settings are not changed */
-  CU_ASSERT(NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS ==
-            session->local_settings.max_concurrent_streams);
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE ==
-            session->local_settings.initial_window_size);
-
-  /* Now sends without 6th one */
-  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 6));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_SETTINGS == item->frame.hd.type);
-
-  frame = &item->frame;
-  CU_ASSERT(6 == frame->settings.niv);
-  CU_ASSERT(5 == frame->settings.iv[0].value);
-  CU_ASSERT(NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS ==
-            frame->settings.iv[0].settings_id);
-
-  CU_ASSERT(16 * 1024 == frame->settings.iv[1].value);
-  CU_ASSERT(NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE ==
-            frame->settings.iv[1].settings_id);
-
-  CU_ASSERT(UNKNOWN_ID == frame->settings.iv[4].settings_id);
-  CU_ASSERT(999 == frame->settings.iv[4].value);
-
-  ud.frame_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-
-  CU_ASSERT(50 == session->pending_local_max_concurrent_stream);
-
-  /* before receiving SETTINGS ACK, local settings have still default
-     values */
-  CU_ASSERT(NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS ==
-            nghttp2_session_get_local_settings(
-                session, NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS));
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE ==
-            nghttp2_session_get_local_settings(
-                session, NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE));
-
-  nghttp2_frame_settings_init(&ack_frame.settings, NGHTTP2_FLAG_ACK, NULL, 0);
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &ack_frame, 0));
-  nghttp2_frame_settings_free(&ack_frame.settings, mem);
-
-  CU_ASSERT(16 * 1024 == session->local_settings.initial_window_size);
-  CU_ASSERT(1023 == session->hd_inflater.ctx.hd_table_bufsize_max);
-  CU_ASSERT(111 == session->hd_inflater.min_hd_table_bufsize_max);
-  CU_ASSERT(50 == session->local_settings.max_concurrent_streams);
-
-  CU_ASSERT(50 == nghttp2_session_get_local_settings(
-                      session, NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS));
-  CU_ASSERT(16 * 1024 == nghttp2_session_get_local_settings(
-                             session, NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE));
-
-  /* We just keep the last seen value */
-  CU_ASSERT(50 == session->pending_local_max_concurrent_stream);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_settings_update_local_window_size(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_settings_entry iv[4];
-  nghttp2_stream *stream;
-  nghttp2_frame ack_frame;
-  nghttp2_mem *mem;
-  nghttp2_option *option;
-
-  mem = nghttp2_mem_default();
-  nghttp2_frame_settings_init(&ack_frame.settings, NGHTTP2_FLAG_ACK, NULL, 0);
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[0].value = 16 * 1024;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream = open_recv_stream(session, 1);
-  stream->local_window_size = NGHTTP2_INITIAL_WINDOW_SIZE + 100;
-  stream->recv_window_size = 32768;
-
-  open_recv_stream(session, 3);
-
-  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &ack_frame, 0));
-
-  stream = nghttp2_session_get_stream(session, 1);
-  CU_ASSERT(0 == stream->recv_window_size);
-  CU_ASSERT(16 * 1024 + 100 == stream->local_window_size);
-
-  stream = nghttp2_session_get_stream(session, 3);
-  CU_ASSERT(16 * 1024 == stream->local_window_size);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(32768 == item->frame.window_update.window_size_increment);
-
-  nghttp2_session_del(session);
-
-  /* Without auto-window update */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_no_auto_window_update(option, 1);
-
-  nghttp2_session_server_new2(&session, &callbacks, NULL, option);
-
-  nghttp2_option_del(option);
-
-  stream = open_recv_stream(session, 1);
-  stream->local_window_size = NGHTTP2_INITIAL_WINDOW_SIZE + 100;
-  stream->recv_window_size = 32768;
-
-  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &ack_frame, 0));
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(32768 == stream->recv_window_size);
-  CU_ASSERT(16 * 1024 + 100 == stream->local_window_size);
-  /* Check that we can handle the case where local_window_size <
-     recv_window_size */
-  CU_ASSERT(0 == nghttp2_session_get_stream_local_window_size(session, 1));
-
-  nghttp2_session_del(session);
-
-  /* Check overflow case */
-  iv[0].value = 128 * 1024;
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  stream = open_recv_stream(session, 1);
-  stream->local_window_size = NGHTTP2_MAX_WINDOW_SIZE;
-
-  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &ack_frame, 0));
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_FLOW_CONTROL_ERROR == item->frame.rst_stream.error_code);
-
-  nghttp2_session_del(session);
-  nghttp2_frame_settings_free(&ack_frame.settings, mem);
-}
-
-void test_nghttp2_submit_settings_multiple_times(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_settings_entry iv[4];
-  nghttp2_frame frame;
-  nghttp2_inflight_settings *inflight_settings;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  /* first SETTINGS */
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = 100;
-
-  iv[1].settings_id = NGHTTP2_SETTINGS_ENABLE_PUSH;
-  iv[1].value = 0;
-
-  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 2));
-
-  inflight_settings = session->inflight_settings_head;
-
-  CU_ASSERT(NULL != inflight_settings);
-  CU_ASSERT(NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS ==
-            inflight_settings->iv[0].settings_id);
-  CU_ASSERT(100 == inflight_settings->iv[0].value);
-  CU_ASSERT(2 == inflight_settings->niv);
-  CU_ASSERT(NULL == inflight_settings->next);
-
-  CU_ASSERT(100 == session->pending_local_max_concurrent_stream);
-  CU_ASSERT(0 == session->pending_enable_push);
-
-  /* second SETTINGS */
-  iv[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv[0].value = 99;
-
-  CU_ASSERT(0 == nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, iv, 1));
-
-  inflight_settings = session->inflight_settings_head->next;
-
-  CU_ASSERT(NULL != inflight_settings);
-  CU_ASSERT(NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS ==
-            inflight_settings->iv[0].settings_id);
-  CU_ASSERT(99 == inflight_settings->iv[0].value);
-  CU_ASSERT(1 == inflight_settings->niv);
-  CU_ASSERT(NULL == inflight_settings->next);
-
-  CU_ASSERT(99 == session->pending_local_max_concurrent_stream);
-  CU_ASSERT(0 == session->pending_enable_push);
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_ACK, NULL, 0);
-
-  /* receive SETTINGS ACK */
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-
-  inflight_settings = session->inflight_settings_head;
-
-  /* first inflight SETTINGS was removed */
-  CU_ASSERT(NULL != inflight_settings);
-  CU_ASSERT(NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS ==
-            inflight_settings->iv[0].settings_id);
-  CU_ASSERT(99 == inflight_settings->iv[0].value);
-  CU_ASSERT(1 == inflight_settings->niv);
-  CU_ASSERT(NULL == inflight_settings->next);
-
-  CU_ASSERT(100 == session->local_settings.max_concurrent_streams);
-
-  /* receive SETTINGS ACK again */
-  CU_ASSERT(0 == nghttp2_session_on_settings_received(session, &frame, 0));
-
-  CU_ASSERT(NULL == session->inflight_settings_head);
-  CU_ASSERT(99 == session->local_settings.max_concurrent_streams);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_push_promise(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-  open_recv_stream(session, 1);
-  CU_ASSERT(2 == nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 1,
-                                             reqnv, ARRLEN(reqnv), &ud));
-
-  stream = nghttp2_session_get_stream(session, 2);
-
-  CU_ASSERT(NULL != stream);
-  CU_ASSERT(NGHTTP2_STREAM_RESERVED == stream->state);
-  CU_ASSERT(&ud == nghttp2_session_get_stream_user_data(session, 2));
-
-  ud.frame_send_cb_called = 0;
-  ud.sent_frame_type = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_PUSH_PROMISE == ud.sent_frame_type);
-
-  stream = nghttp2_session_get_stream(session, 2);
-
-  CU_ASSERT(NGHTTP2_STREAM_RESERVED == stream->state);
-  CU_ASSERT(&ud == nghttp2_session_get_stream_user_data(session, 2));
-
-  /* submit PUSH_PROMISE while associated stream is not opened */
-  CU_ASSERT(NGHTTP2_ERR_STREAM_CLOSED ==
-            nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 3, reqnv,
-                                        ARRLEN(reqnv), NULL));
-
-  /* Stream ID <= 0 is error */
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 0, reqnv,
-                                        ARRLEN(reqnv), NULL));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_window_update(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  stream = open_recv_stream(session, 2);
-  stream->recv_window_size = 4096;
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2, 1024));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(1024 == item->frame.window_update.window_size_increment);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(3072 == stream->recv_window_size);
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2, 4096));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(4096 == item->frame.window_update.window_size_increment);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == stream->recv_window_size);
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2, 4096));
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(4096 == item->frame.window_update.window_size_increment);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == stream->recv_window_size);
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2, 0));
-  /* It is ok if stream is closed or does not exist at the call
-     time */
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 4, 4096));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_window_update_local_window_size(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  stream = open_recv_stream(session, 2);
-  stream->recv_window_size = 4096;
-
-  CU_ASSERT(0 == nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2,
-                                              stream->recv_window_size + 1));
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 1 == stream->local_window_size);
-  CU_ASSERT(0 == stream->recv_window_size);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(4097 == item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Let's decrement local window size */
-  stream->recv_window_size = 4096;
-  CU_ASSERT(0 == nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2,
-                                              -stream->local_window_size / 2));
-  CU_ASSERT(32768 == stream->local_window_size);
-  CU_ASSERT(-28672 == stream->recv_window_size);
-  CU_ASSERT(32768 == stream->recv_reduction);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(item == NULL);
-
-  /* Increase local window size */
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2, 16384));
-  CU_ASSERT(49152 == stream->local_window_size);
-  CU_ASSERT(-12288 == stream->recv_window_size);
-  CU_ASSERT(16384 == stream->recv_reduction);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  CU_ASSERT(NGHTTP2_ERR_FLOW_CONTROL ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 2,
-                                         NGHTTP2_MAX_WINDOW_SIZE));
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Check connection-level flow control */
-  session->recv_window_size = 4096;
-  CU_ASSERT(0 == nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0,
-                                              session->recv_window_size + 1));
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1 ==
-            session->local_window_size);
-  CU_ASSERT(0 == session->recv_window_size);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(4097 == item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Go decrement part */
-  session->recv_window_size = 4096;
-  CU_ASSERT(0 == nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0,
-                                              -session->local_window_size / 2));
-  CU_ASSERT(32768 == session->local_window_size);
-  CU_ASSERT(-28672 == session->recv_window_size);
-  CU_ASSERT(32768 == session->recv_reduction);
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(item == NULL);
-
-  /* Increase local window size */
-  CU_ASSERT(0 ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0, 16384));
-  CU_ASSERT(49152 == session->local_window_size);
-  CU_ASSERT(-12288 == session->recv_window_size);
-  CU_ASSERT(16384 == session->recv_reduction);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  CU_ASSERT(NGHTTP2_ERR_FLOW_CONTROL ==
-            nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0,
-                                         NGHTTP2_MAX_WINDOW_SIZE));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_shutdown_notice(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  CU_ASSERT(0 == nghttp2_submit_shutdown_notice(session));
-
-  ud.frame_send_cb_called = 0;
-
-  nghttp2_session_send(session);
-
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_GOAWAY == ud.sent_frame_type);
-  CU_ASSERT((1u << 31) - 1 == session->local_last_stream_id);
-
-  /* After another GOAWAY, nghttp2_submit_shutdown_notice() is
-     noop. */
-  CU_ASSERT(0 == nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR));
-
-  ud.frame_send_cb_called = 0;
-
-  nghttp2_session_send(session);
-
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_GOAWAY == ud.sent_frame_type);
-  CU_ASSERT(0 == session->local_last_stream_id);
-
-  CU_ASSERT(0 == nghttp2_submit_shutdown_notice(session));
-
-  ud.frame_send_cb_called = 0;
-  ud.frame_not_send_cb_called = 0;
-
-  nghttp2_session_send(session);
-
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-  CU_ASSERT(0 == ud.frame_not_send_cb_called);
-
-  nghttp2_session_del(session);
-
-  /* Using nghttp2_submit_shutdown_notice() with client side session
-     is error */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_STATE ==
-            nghttp2_submit_shutdown_notice(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_invalid_nv(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_nv empty_name_nv[] = {MAKE_NV("Version", "HTTP/1.1"),
-                                MAKE_NV("", "empty name")};
-
-  /* Now invalid header name/value pair in HTTP/1.1 is accepted in
-     nghttp2 */
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, NULL));
-
-  /* nghttp2_submit_response */
-  CU_ASSERT(0 == nghttp2_submit_response(session, 2, empty_name_nv,
-                                         ARRLEN(empty_name_nv), NULL));
-
-  /* nghttp2_submit_push_promise */
-  open_recv_stream(session, 1);
-
-  CU_ASSERT(0 < nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 1,
-                                            empty_name_nv,
-                                            ARRLEN(empty_name_nv), NULL));
-
-  nghttp2_session_del(session);
-
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, NULL));
-
-  /* nghttp2_submit_request */
-  CU_ASSERT(0 < nghttp2_submit_request(session, NULL, empty_name_nv,
-                                       ARRLEN(empty_name_nv), NULL, NULL));
-
-  /* nghttp2_submit_headers */
-  CU_ASSERT(0 < nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, -1, NULL,
-                                       empty_name_nv, ARRLEN(empty_name_nv),
-                                       NULL));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_extension(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  accumulator acc;
-  nghttp2_mem *mem;
-  const char data[] = "Hello World!";
-  size_t len;
-  int32_t stream_id;
-  int rv;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  callbacks.pack_extension_callback = pack_extension_callback;
-  callbacks.send_callback = accumulator_send_callback;
-
-  nghttp2_buf_init2(&ud.scratchbuf, 4096, mem);
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  ud.scratchbuf.last = nghttp2_cpymem(ud.scratchbuf.last, data, sizeof(data));
-  ud.acc = &acc;
-
-  rv = nghttp2_submit_extension(session, 211, 0x01, 3, &ud.scratchbuf);
-
-  CU_ASSERT(0 == rv);
-
-  acc.length = 0;
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN + sizeof(data) == acc.length);
-
-  len = nghttp2_get_uint32(acc.buf) >> 8;
-
-  CU_ASSERT(sizeof(data) == len);
-  CU_ASSERT(211 == acc.buf[3]);
-  CU_ASSERT(0x01 == acc.buf[4]);
-
-  stream_id = (int32_t)nghttp2_get_uint32(acc.buf + 5);
-
-  CU_ASSERT(3 == stream_id);
-  CU_ASSERT(0 == memcmp(data, &acc.buf[NGHTTP2_FRAME_HDLEN], sizeof(data)));
-
-  nghttp2_session_del(session);
-
-  /* submitting standard HTTP/2 frame is error */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  rv = nghttp2_submit_extension(session, NGHTTP2_GOAWAY, NGHTTP2_FLAG_NONE, 0,
-                                NULL);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  nghttp2_session_del(session);
-  nghttp2_buf_free(&ud.scratchbuf, mem);
-}
-
-void test_nghttp2_submit_altsvc(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  int rv;
-  ssize_t len;
-  const uint8_t *data;
-  nghttp2_frame_hd hd;
-  size_t origin_len;
-  const uint8_t origin[] = "nghttp2.org";
-  const uint8_t field_value[] = "h2=\":443\"";
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  rv = nghttp2_submit_altsvc(session, NGHTTP2_FLAG_NONE, 0, origin,
-                             sizeof(origin) - 1, field_value,
-                             sizeof(field_value) - 1);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_send_cb_called = 0;
-
-  len = nghttp2_session_mem_send(session, &data);
-
-  CU_ASSERT(len == NGHTTP2_FRAME_HDLEN + 2 + sizeof(origin) - 1 +
-                       sizeof(field_value) - 1);
-
-  nghttp2_frame_unpack_frame_hd(&hd, data);
-
-  CU_ASSERT(2 + sizeof(origin) - 1 + sizeof(field_value) - 1 == hd.length);
-  CU_ASSERT(NGHTTP2_ALTSVC == hd.type);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == hd.flags);
-
-  origin_len = nghttp2_get_uint16(data + NGHTTP2_FRAME_HDLEN);
-
-  CU_ASSERT(sizeof(origin) - 1 == origin_len);
-  CU_ASSERT(0 ==
-            memcmp(origin, data + NGHTTP2_FRAME_HDLEN + 2, sizeof(origin) - 1));
-  CU_ASSERT(0 == memcmp(field_value,
-                        data + NGHTTP2_FRAME_HDLEN + 2 + sizeof(origin) - 1,
-                        hd.length - (sizeof(origin) - 1) - 2));
-
-  /* submitting empty origin with stream_id == 0 is error */
-  rv = nghttp2_submit_altsvc(session, NGHTTP2_FLAG_NONE, 0, NULL, 0,
-                             field_value, sizeof(field_value) - 1);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* submitting non-empty origin with stream_id != 0 is error */
-  rv = nghttp2_submit_altsvc(session, NGHTTP2_FLAG_NONE, 1, origin,
-                             sizeof(origin) - 1, field_value,
-                             sizeof(field_value) - 1);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  nghttp2_session_del(session);
-
-  /* submitting from client side session is error */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  rv = nghttp2_submit_altsvc(session, NGHTTP2_FLAG_NONE, 0, origin,
-                             sizeof(origin) - 1, field_value,
-                             sizeof(field_value) - 1);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_STATE == rv);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_submit_origin(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  int rv;
-  ssize_t len;
-  const uint8_t *data;
-  static const uint8_t nghttp2[] = "https://nghttp2.org";
-  static const uint8_t examples[] = "https://examples.com";
-  static const nghttp2_origin_entry ov[] = {
-      {
-          (uint8_t *)nghttp2,
-          sizeof(nghttp2) - 1,
-      },
-      {
-          (uint8_t *)examples,
-          sizeof(examples) - 1,
-      },
-  };
-  nghttp2_frame frame;
-  nghttp2_ext_origin origin;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  frame.ext.payload = &origin;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  rv = nghttp2_submit_origin(session, NGHTTP2_FLAG_NONE, ov, 2);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_send_cb_called = 0;
-  len = nghttp2_session_mem_send(session, &data);
-
-  CU_ASSERT(len > 0);
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-
-  nghttp2_frame_unpack_frame_hd(&frame.hd, data);
-  rv = nghttp2_frame_unpack_origin_payload(
-      &frame.ext, data + NGHTTP2_FRAME_HDLEN, (size_t)len - NGHTTP2_FRAME_HDLEN,
-      mem);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_ORIGIN == frame.hd.type);
-  CU_ASSERT(2 == origin.nov);
-  CU_ASSERT(0 == memcmp(nghttp2, origin.ov[0].origin, sizeof(nghttp2) - 1));
-  CU_ASSERT(sizeof(nghttp2) - 1 == origin.ov[0].origin_len);
-  CU_ASSERT(0 == memcmp(examples, origin.ov[1].origin, sizeof(examples) - 1));
-  CU_ASSERT(sizeof(examples) - 1 == origin.ov[1].origin_len);
-
-  nghttp2_frame_origin_free(&frame.ext, mem);
-
-  nghttp2_session_del(session);
-
-  /* Submitting ORIGIN frame from client session is error */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  rv = nghttp2_submit_origin(session, NGHTTP2_FLAG_NONE, ov, 1);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_STATE == rv);
-
-  nghttp2_session_del(session);
-
-  /* Submitting empty ORIGIN frame */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  rv = nghttp2_submit_origin(session, NGHTTP2_FLAG_NONE, NULL, 0);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_send_cb_called = 0;
-  len = nghttp2_session_mem_send(session, &data);
-
-  CU_ASSERT(len == NGHTTP2_FRAME_HDLEN);
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-
-  nghttp2_frame_unpack_frame_hd(&frame.hd, data);
-
-  CU_ASSERT(NGHTTP2_ORIGIN == frame.hd.type);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_open_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  nghttp2_priority_spec pri_spec;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 245, 0);
-
-  stream = nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec, NGHTTP2_STREAM_OPENED, NULL);
-  CU_ASSERT(1 == session->num_incoming_streams);
-  CU_ASSERT(0 == session->num_outgoing_streams);
-  CU_ASSERT(NGHTTP2_STREAM_OPENED == stream->state);
-  CU_ASSERT(245 == stream->weight);
-  CU_ASSERT(&session->root == stream->dep_prev);
-  CU_ASSERT(NGHTTP2_SHUT_NONE == stream->shut_flags);
-
-  stream = nghttp2_session_open_stream(session, 2, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec_default,
-                                       NGHTTP2_STREAM_OPENING, NULL);
-  CU_ASSERT(1 == session->num_incoming_streams);
-  CU_ASSERT(1 == session->num_outgoing_streams);
-  CU_ASSERT(&session->root == stream->dep_prev);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-  CU_ASSERT(NGHTTP2_SHUT_NONE == stream->shut_flags);
-
-  stream = nghttp2_session_open_stream(session, 4, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec_default,
-                                       NGHTTP2_STREAM_RESERVED, NULL);
-  CU_ASSERT(1 == session->num_incoming_streams);
-  CU_ASSERT(1 == session->num_outgoing_streams);
-  CU_ASSERT(&session->root == stream->dep_prev);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-  CU_ASSERT(NGHTTP2_SHUT_RD == stream->shut_flags);
-
-  nghttp2_priority_spec_init(&pri_spec, 1, 17, 1);
-
-  stream = nghttp2_session_open_stream(session, 3, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec, NGHTTP2_STREAM_OPENED, NULL);
-  CU_ASSERT(17 == stream->weight);
-  CU_ASSERT(1 == stream->dep_prev->stream_id);
-
-  /* Dependency to idle stream */
-  nghttp2_priority_spec_init(&pri_spec, 1000000007, 240, 1);
-
-  stream = nghttp2_session_open_stream(session, 5, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec, NGHTTP2_STREAM_OPENED, NULL);
-  CU_ASSERT(240 == stream->weight);
-  CU_ASSERT(1000000007 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream_raw(session, 1000000007);
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-  CU_ASSERT(&session->root == stream->dep_prev);
-
-  /* Dependency to closed stream which is not in dependency tree */
-  session->last_recv_stream_id = 7;
-
-  nghttp2_priority_spec_init(&pri_spec, 7, 10, 0);
-
-  stream = nghttp2_session_open_stream(session, 9, NGHTTP2_FLAG_NONE, &pri_spec,
-                                       NGHTTP2_STREAM_OPENED, NULL);
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-  CU_ASSERT(&session->root == stream->dep_prev);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  stream = nghttp2_session_open_stream(session, 4, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec_default,
-                                       NGHTTP2_STREAM_RESERVED, NULL);
-  CU_ASSERT(0 == session->num_incoming_streams);
-  CU_ASSERT(0 == session->num_outgoing_streams);
-  CU_ASSERT(&session->root == stream->dep_prev);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-  CU_ASSERT(NGHTTP2_SHUT_WR == stream->shut_flags);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_open_stream_with_idle_stream_dep(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  nghttp2_priority_spec pri_spec;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* Dependency to idle stream */
-  nghttp2_priority_spec_init(&pri_spec, 101, 245, 0);
-
-  stream = nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec, NGHTTP2_STREAM_OPENED, NULL);
-
-  CU_ASSERT(245 == stream->weight);
-  CU_ASSERT(101 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream_raw(session, 101);
-
-  CU_ASSERT(NGHTTP2_STREAM_IDLE == stream->state);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-
-  nghttp2_priority_spec_init(&pri_spec, 211, 1, 0);
-
-  /* stream 101 was already created as idle. */
-  stream = nghttp2_session_open_stream(session, 101, NGHTTP2_STREAM_FLAG_NONE,
-                                       &pri_spec, NGHTTP2_STREAM_OPENED, NULL);
-
-  CU_ASSERT(1 == stream->weight);
-  CU_ASSERT(211 == stream->dep_prev->stream_id);
-
-  stream = nghttp2_session_get_stream_raw(session, 211);
-
-  CU_ASSERT(NGHTTP2_STREAM_IDLE == stream->state);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream->weight);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_get_next_ob_item(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_priority_spec pri_spec;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  session->remote_settings.max_concurrent_streams = 2;
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-  nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
-  CU_ASSERT(NGHTTP2_PING ==
-            nghttp2_session_get_next_ob_item(session)->frame.hd.type);
-
-  CU_ASSERT(1 == nghttp2_submit_request(session, NULL, NULL, 0, NULL, NULL));
-  CU_ASSERT(NGHTTP2_PING ==
-            nghttp2_session_get_next_ob_item(session)->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  /* Incoming stream does not affect the number of outgoing max
-     concurrent streams. */
-  open_recv_stream(session, 2);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_MAX_WEIGHT, 0);
-
-  CU_ASSERT(3 ==
-            nghttp2_submit_request(session, &pri_spec, NULL, 0, NULL, NULL));
-  CU_ASSERT(NGHTTP2_HEADERS ==
-            nghttp2_session_get_next_ob_item(session)->frame.hd.type);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(5 ==
-            nghttp2_submit_request(session, &pri_spec, NULL, 0, NULL, NULL));
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  session->remote_settings.max_concurrent_streams = 3;
-
-  CU_ASSERT(NGHTTP2_HEADERS ==
-            nghttp2_session_get_next_ob_item(session)->frame.hd.type);
-
-  nghttp2_session_del(session);
-
-  /* Check that push reply HEADERS are queued into ob_ss_pq */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  session->remote_settings.max_concurrent_streams = 0;
-  open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 2,
-                                        NULL, NULL, 0, NULL));
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-  CU_ASSERT(1 == nghttp2_outbound_queue_size(&session->ob_syn));
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_pop_next_ob_item(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  session->remote_settings.max_concurrent_streams = 1;
-
-  CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));
-
-  nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 254, 0);
-
-  nghttp2_submit_request(session, &pri_spec, NULL, 0, NULL, NULL);
-
-  item = nghttp2_session_pop_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_PING == item->frame.hd.type);
-  nghttp2_outbound_item_free(item, mem);
-  mem->free(item, NULL);
-
-  item = nghttp2_session_pop_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
-  nghttp2_outbound_item_free(item, mem);
-  mem->free(item, NULL);
-
-  CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));
-
-  /* Incoming stream does not affect the number of outgoing max
-     concurrent streams. */
-  open_recv_stream(session, 4);
-  /* In-flight outgoing stream */
-  open_sent_stream(session, 1);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_MAX_WEIGHT, 0);
-
-  nghttp2_submit_request(session, &pri_spec, NULL, 0, NULL, NULL);
-
-  CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));
-
-  session->remote_settings.max_concurrent_streams = 2;
-
-  item = nghttp2_session_pop_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
-  nghttp2_outbound_item_free(item, mem);
-  mem->free(item, NULL);
-
-  nghttp2_session_del(session);
-
-  /* Check that push reply HEADERS are queued into ob_ss_pq */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  session->remote_settings.max_concurrent_streams = 0;
-  open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 2,
-                                        NULL, NULL, 0, NULL));
-  CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));
-  CU_ASSERT(1 == nghttp2_outbound_queue_size(&session->ob_syn));
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_reply_fail(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = fail_send_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-  ud.data_source_length = 4 * 1024;
-  CU_ASSERT(0 == nghttp2_session_server_new(&session, &callbacks, &ud));
-  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-  CU_ASSERT(0 == nghttp2_submit_response(session, 1, NULL, 0, &data_prd));
-  CU_ASSERT(NGHTTP2_ERR_CALLBACK_FAILURE == nghttp2_session_send(session));
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_max_concurrent_streams(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_frame frame;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  open_recv_stream(session, 1);
-
-  /* Check un-ACKed SETTINGS_MAX_CONCURRENT_STREAMS */
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 3,
-                             NGHTTP2_HCAT_HEADERS, NULL, NULL, 0);
-  session->pending_local_max_concurrent_stream = 1;
-
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-
-  item = nghttp2_outbound_queue_top(&session->ob_reg);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_REFUSED_STREAM == item->frame.rst_stream.error_code);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Check ACKed SETTINGS_MAX_CONCURRENT_STREAMS */
-  session->local_settings.max_concurrent_streams = 1;
-  frame.hd.stream_id = 5;
-
-  CU_ASSERT(NGHTTP2_ERR_IGN_HEADER_BLOCK ==
-            nghttp2_session_on_request_headers_received(session, &frame));
-
-  item = nghttp2_outbound_queue_top(&session->ob_reg);
-  CU_ASSERT(NGHTTP2_GOAWAY == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.goaway.error_code);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stop_data_with_rst_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_data_provider data_prd;
-  nghttp2_frame frame;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.send_callback = block_count_send_callback;
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-
-  ud.frame_send_cb_called = 0;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 4;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-  open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-  nghttp2_submit_response(session, 1, NULL, 0, &data_prd);
-
-  ud.block_count = 2;
-  /* Sends response HEADERS + DATA[0] */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type);
-  /* data for DATA[1] is read from data_prd but it is not sent */
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN * 2);
-
-  nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_CANCEL);
-  CU_ASSERT(0 == nghttp2_session_on_rst_stream_received(session, &frame));
-  nghttp2_frame_rst_stream_free(&frame.rst_stream);
-
-  /* Big enough number to send all DATA frames potentially. */
-  ud.block_count = 100;
-  /* Nothing will be sent in the following call. */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  /* With RST_STREAM, stream is canceled and further DATA on that
-     stream are not sent. */
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN * 2);
-
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 1));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_defer_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_data_provider data_prd;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.send_callback = block_count_send_callback;
-  data_prd.read_callback = defer_data_source_read_callback;
-
-  ud.frame_send_cb_called = 0;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 4;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-  stream = open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  session->remote_window_size = 1 << 20;
-  stream->remote_window_size = 1 << 20;
-
-  nghttp2_submit_response(session, 1, NULL, 0, &data_prd);
-
-  ud.block_count = 1;
-  /* Sends HEADERS reply */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type);
-  /* No data is read */
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN * 4);
-
-  ud.block_count = 1;
-  nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
-  /* Sends PING */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NGHTTP2_PING == ud.sent_frame_type);
-
-  /* Resume deferred DATA */
-  CU_ASSERT(0 == nghttp2_session_resume_data(session, 1));
-  item = stream->item;
-  item->aux_data.data.data_prd.read_callback =
-      fixed_length_data_source_read_callback;
-  ud.block_count = 1;
-  /* Reads 2 DATA chunks */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN * 2);
-
-  /* Deferred again */
-  item->aux_data.data.data_prd.read_callback = defer_data_source_read_callback;
-  /* This is needed since 16KiB block is already read and waiting to be
-     sent. No read_callback invocation. */
-  ud.block_count = 1;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN * 2);
-
-  /* Resume deferred DATA */
-  CU_ASSERT(0 == nghttp2_session_resume_data(session, 1));
-  item->aux_data.data.data_prd.read_callback =
-      fixed_length_data_source_read_callback;
-  ud.block_count = 1;
-  /* Reads 2 16KiB blocks */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(ud.data_source_length == 0);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_flow_control(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_data_provider data_prd;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  int32_t new_initial_window_size;
-  nghttp2_settings_entry iv[1];
-  nghttp2_frame settings_frame;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = fixed_bytes_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-
-  ud.frame_send_cb_called = 0;
-  ud.data_source_length = 128 * 1024;
-  /* Use smaller emission count so that we can check outbound flow
-     control window calculation is correct. */
-  ud.fixed_sendlen = 2 * 1024;
-
-  /* Initial window size to 64KiB - 1*/
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  /* Change it to 64KiB for easy calculation */
-  session->remote_window_size = 64 * 1024;
-  session->remote_settings.initial_window_size = 64 * 1024;
-
-  nghttp2_submit_request(session, NULL, NULL, 0, &data_prd, NULL);
-
-  /* Sends 64KiB - 1 data */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(64 * 1024 == ud.data_source_length);
-
-  /* Back 32KiB in stream window */
-  nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE, 1,
-                                   32 * 1024);
-  nghttp2_session_on_window_update_received(session, &frame);
-
-  /* Send nothing because of connection-level window */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(64 * 1024 == ud.data_source_length);
-
-  /* Back 32KiB in connection-level window */
-  frame.hd.stream_id = 0;
-  nghttp2_session_on_window_update_received(session, &frame);
-
-  /* Sends another 32KiB data */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(32 * 1024 == ud.data_source_length);
-
-  stream = nghttp2_session_get_stream(session, 1);
-  /* Change initial window size to 16KiB. The window_size becomes
-     negative. */
-  new_initial_window_size = 16 * 1024;
-  stream->remote_window_size =
-      new_initial_window_size -
-      ((int32_t)session->remote_settings.initial_window_size -
-       stream->remote_window_size);
-  session->remote_settings.initial_window_size =
-      (uint32_t)new_initial_window_size;
-  CU_ASSERT(-48 * 1024 == stream->remote_window_size);
-
-  /* Back 48KiB to stream window */
-  frame.hd.stream_id = 1;
-  frame.window_update.window_size_increment = 48 * 1024;
-  nghttp2_session_on_window_update_received(session, &frame);
-
-  /* Nothing is sent because window_size is 0 */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(32 * 1024 == ud.data_source_length);
-
-  /* Back 16KiB in stream window */
-  frame.hd.stream_id = 1;
-  frame.window_update.window_size_increment = 16 * 1024;
-  nghttp2_session_on_window_update_received(session, &frame);
-
-  /* Back 24KiB in connection-level window */
-  frame.hd.stream_id = 0;
-  frame.window_update.window_size_increment = 24 * 1024;
-  nghttp2_session_on_window_update_received(session, &frame);
-
-  /* Sends another 16KiB data */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(16 * 1024 == ud.data_source_length);
-
-  /* Increase initial window size to 32KiB */
-  iv[0].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[0].value = 32 * 1024;
-
-  nghttp2_frame_settings_init(&settings_frame.settings, NGHTTP2_FLAG_NONE,
-                              dup_iv(iv, 1), 1);
-  nghttp2_session_on_settings_received(session, &settings_frame, 1);
-  nghttp2_frame_settings_free(&settings_frame.settings, mem);
-
-  /* Sends another 8KiB data */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(8 * 1024 == ud.data_source_length);
-
-  /* Back 8KiB in connection-level window */
-  frame.hd.stream_id = 0;
-  frame.window_update.window_size_increment = 8 * 1024;
-  nghttp2_session_on_window_update_received(session, &frame);
-
-  /* Sends last 8KiB data */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.data_source_length);
-  CU_ASSERT(nghttp2_session_get_stream(session, 1)->shut_flags &
-            NGHTTP2_SHUT_WR);
-
-  nghttp2_frame_window_update_free(&frame.window_update);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_flow_control_data_recv(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  uint8_t data[64 * 1024 + 16];
-  nghttp2_frame_hd hd;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  /* Initial window size to 64KiB - 1*/
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  stream = open_sent_stream(session, 1);
-
-  nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-
-  session->local_window_size = NGHTTP2_MAX_PAYLOADLEN;
-  stream->local_window_size = NGHTTP2_MAX_PAYLOADLEN;
-
-  /* Create DATA frame */
-  memset(data, 0, sizeof(data));
-  nghttp2_frame_hd_init(&hd, NGHTTP2_MAX_PAYLOADLEN, NGHTTP2_DATA,
-                        NGHTTP2_FLAG_END_STREAM, 1);
-
-  nghttp2_frame_pack_frame_hd(data, &hd);
-  CU_ASSERT(NGHTTP2_MAX_PAYLOADLEN + NGHTTP2_FRAME_HDLEN ==
-            nghttp2_session_mem_recv(
-                session, data, NGHTTP2_MAX_PAYLOADLEN + NGHTTP2_FRAME_HDLEN));
-
-  item = nghttp2_session_get_next_ob_item(session);
-  /* Since this is the last frame, stream-level WINDOW_UPDATE is not
-     issued, but connection-level is. */
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(0 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_MAX_PAYLOADLEN ==
-            item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Receive DATA for closed stream. They are still subject to under
-     connection-level flow control, since this situation arises when
-     RST_STREAM is issued by the remote, but the local side keeps
-     sending DATA frames. Without calculating connection-level window,
-     the subsequent flow control gets confused. */
-  CU_ASSERT(NGHTTP2_MAX_PAYLOADLEN + NGHTTP2_FRAME_HDLEN ==
-            nghttp2_session_mem_recv(
-                session, data, NGHTTP2_MAX_PAYLOADLEN + NGHTTP2_FRAME_HDLEN));
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(0 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_MAX_PAYLOADLEN ==
-            item->frame.window_update.window_size_increment);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_flow_control_data_with_padding_recv(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  uint8_t data[1024];
-  nghttp2_frame_hd hd;
-  nghttp2_stream *stream;
-  nghttp2_option *option;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_option_new(&option);
-  /* Disable auto window update so that we can check padding is
-     consumed automatically */
-  nghttp2_option_set_no_auto_window_update(option, 1);
-
-  /* Initial window size to 64KiB - 1*/
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-
-  nghttp2_option_del(option);
-
-  stream = open_sent_stream(session, 1);
-
-  /* Create DATA frame */
-  memset(data, 0, sizeof(data));
-  nghttp2_frame_hd_init(&hd, 357, NGHTTP2_DATA, NGHTTP2_FLAG_PADDED, 1);
-
-  nghttp2_frame_pack_frame_hd(data, &hd);
-  /* Set Pad Length field, which itself is padding */
-  data[NGHTTP2_FRAME_HDLEN] = 255;
-
-  CU_ASSERT(
-      (ssize_t)(NGHTTP2_FRAME_HDLEN + hd.length) ==
-      nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + hd.length));
-
-  CU_ASSERT((int32_t)hd.length == session->recv_window_size);
-  CU_ASSERT((int32_t)hd.length == stream->recv_window_size);
-  CU_ASSERT(256 == session->consumed_size);
-  CU_ASSERT(256 == stream->consumed_size);
-  CU_ASSERT(357 == session->recv_window_size);
-  CU_ASSERT(357 == stream->recv_window_size);
-
-  /* Receive the same DATA frame, but in 2 parts: first 9 + 1 + 102
-     bytes which includes 1st padding byte, and remainder */
-  CU_ASSERT((ssize_t)(NGHTTP2_FRAME_HDLEN + 103) ==
-            nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 103));
-  CU_ASSERT(258 == session->consumed_size);
-  CU_ASSERT(258 == stream->consumed_size);
-  CU_ASSERT(460 == session->recv_window_size);
-  CU_ASSERT(460 == stream->recv_window_size);
-
-  /* 357 - 103 = 254 bytes left */
-  CU_ASSERT(254 == nghttp2_session_mem_recv(session, data, 254));
-  CU_ASSERT(512 == session->consumed_size);
-  CU_ASSERT(512 == stream->consumed_size);
-  CU_ASSERT(714 == session->recv_window_size);
-  CU_ASSERT(714 == stream->recv_window_size);
-
-  /* Receive the same DATA frame, but in 2 parts: first 9 = 1 + 101
-     bytes which only includes data without padding, 2nd part is
-     padding only */
-  CU_ASSERT((ssize_t)(NGHTTP2_FRAME_HDLEN + 102) ==
-            nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 102));
-  CU_ASSERT(513 == session->consumed_size);
-  CU_ASSERT(513 == stream->consumed_size);
-  CU_ASSERT(816 == session->recv_window_size);
-  CU_ASSERT(816 == stream->recv_window_size);
-
-  /* 357 - 102 = 255 bytes left */
-  CU_ASSERT(255 == nghttp2_session_mem_recv(session, data, 255));
-  CU_ASSERT(768 == session->consumed_size);
-  CU_ASSERT(768 == stream->consumed_size);
-  CU_ASSERT(1071 == session->recv_window_size);
-  CU_ASSERT(1071 == stream->recv_window_size);
-
-  /* Receive the same DATA frame, but in 2 parts: first 9 = 1 + 50
-     bytes which includes byte up to middle of data, 2nd part is the
-     remainder */
-  CU_ASSERT((ssize_t)(NGHTTP2_FRAME_HDLEN + 51) ==
-            nghttp2_session_mem_recv(session, data, NGHTTP2_FRAME_HDLEN + 51));
-  CU_ASSERT(769 == session->consumed_size);
-  CU_ASSERT(769 == stream->consumed_size);
-  CU_ASSERT(1122 == session->recv_window_size);
-  CU_ASSERT(1122 == stream->recv_window_size);
-
-  /* 357 - 51 = 306 bytes left */
-  CU_ASSERT(306 == nghttp2_session_mem_recv(session, data, 306));
-  CU_ASSERT(1024 == session->consumed_size);
-  CU_ASSERT(1024 == stream->consumed_size);
-  CU_ASSERT(1428 == session->recv_window_size);
-  CU_ASSERT(1428 == stream->recv_window_size);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_data_read_temporal_failure(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_data_provider data_prd;
-  nghttp2_frame frame;
-  nghttp2_stream *stream;
-  size_t data_size = 128 * 1024;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-
-  ud.data_source_length = data_size;
-
-  /* Initial window size is 64KiB - 1 */
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  nghttp2_submit_request(session, NULL, NULL, 0, &data_prd, NULL);
-
-  /* Sends NGHTTP2_INITIAL_WINDOW_SIZE data, assuming, it is equal to
-     or smaller than NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(data_size - NGHTTP2_INITIAL_WINDOW_SIZE == ud.data_source_length);
-
-  stream = nghttp2_session_get_stream(session, 1);
-  CU_ASSERT(NGHTTP2_DATA == stream->item->frame.hd.type);
-
-  stream->item->aux_data.data.data_prd.read_callback =
-      temporal_failure_data_source_read_callback;
-
-  /* Back NGHTTP2_INITIAL_WINDOW_SIZE to both connection-level and
-     stream-wise window */
-  nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE, 1,
-                                   NGHTTP2_INITIAL_WINDOW_SIZE);
-  nghttp2_session_on_window_update_received(session, &frame);
-  frame.hd.stream_id = 0;
-  nghttp2_session_on_window_update_received(session, &frame);
-  nghttp2_frame_window_update_free(&frame.window_update);
-
-  /* Sending data will fail (soft fail) and treated as stream error */
-  ud.frame_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(data_size - NGHTTP2_INITIAL_WINDOW_SIZE == ud.data_source_length);
-
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_RST_STREAM == ud.sent_frame_type);
-
-  data_prd.read_callback = fail_data_source_read_callback;
-  nghttp2_submit_request(session, NULL, NULL, 0, &data_prd, NULL);
-  /* Sending data will fail (hard fail) and session tear down */
-  CU_ASSERT(NGHTTP2_ERR_CALLBACK_FAILURE == nghttp2_session_send(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_stream_close(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_stream_close_callback = on_stream_close_callback;
-  user_data.stream_close_cb_called = 0;
-
-  nghttp2_session_client_new(&session, &callbacks, &user_data);
-  stream =
-      open_sent_stream3(session, 1, NGHTTP2_STREAM_FLAG_NONE, &pri_spec_default,
-                        NGHTTP2_STREAM_OPENED, &user_data);
-  CU_ASSERT(stream != NULL);
-  CU_ASSERT(nghttp2_session_close_stream(session, 1, NGHTTP2_NO_ERROR) == 0);
-  CU_ASSERT(user_data.stream_close_cb_called == 1);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_ctrl_not_send(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data user_data;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-  callbacks.send_callback = null_send_callback;
-  user_data.frame_not_send_cb_called = 0;
-  user_data.not_sent_frame_type = 0;
-  user_data.not_sent_error = 0;
-
-  nghttp2_session_server_new(&session, &callbacks, &user_data);
-  stream =
-      open_recv_stream3(session, 1, NGHTTP2_STREAM_FLAG_NONE, &pri_spec_default,
-                        NGHTTP2_STREAM_OPENING, &user_data);
-
-  /* Check response HEADERS */
-  /* Send bogus stream ID */
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 3,
-                                        NULL, NULL, 0, NULL));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == user_data.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == user_data.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_ERR_STREAM_CLOSED == user_data.not_sent_error);
-
-  user_data.frame_not_send_cb_called = 0;
-  /* Shutdown transmission */
-  stream->shut_flags |= NGHTTP2_SHUT_WR;
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 1,
-                                        NULL, NULL, 0, NULL));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == user_data.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == user_data.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_ERR_STREAM_SHUT_WR == user_data.not_sent_error);
-
-  stream->shut_flags = NGHTTP2_SHUT_NONE;
-  user_data.frame_not_send_cb_called = 0;
-  /* Queue RST_STREAM */
-  CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 1,
-                                        NULL, NULL, 0, NULL));
-  CU_ASSERT(0 == nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, 1,
-                                           NGHTTP2_INTERNAL_ERROR));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == user_data.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == user_data.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_ERR_STREAM_CLOSING == user_data.not_sent_error);
-
-  nghttp2_session_del(session);
-
-  /* Check request HEADERS */
-  user_data.frame_not_send_cb_called = 0;
-  CU_ASSERT(nghttp2_session_client_new(&session, &callbacks, &user_data) == 0);
-  /* Maximum Stream ID is reached */
-  session->next_stream_id = (1u << 31) + 1;
-  CU_ASSERT(NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE ==
-            nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, -1, NULL,
-                                   NULL, 0, NULL));
-
-  user_data.frame_not_send_cb_called = 0;
-  /* GOAWAY received */
-  session->goaway_flags |= NGHTTP2_GOAWAY_RECV;
-  session->next_stream_id = 9;
-
-  CU_ASSERT(0 < nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, -1,
-                                       NULL, NULL, 0, NULL));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == user_data.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == user_data.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_ERR_START_STREAM_NOT_ALLOWED == user_data.not_sent_error);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_get_outbound_queue_size(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, NULL));
-  CU_ASSERT(0 == nghttp2_session_get_outbound_queue_size(session));
-
-  CU_ASSERT(0 == nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL));
-  CU_ASSERT(1 == nghttp2_session_get_outbound_queue_size(session));
-
-  CU_ASSERT(0 == nghttp2_submit_goaway(session, NGHTTP2_FLAG_NONE, 2,
-                                       NGHTTP2_NO_ERROR, NULL, 0));
-  CU_ASSERT(2 == nghttp2_session_get_outbound_queue_size(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_get_effective_local_window_size(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  CU_ASSERT(0 == nghttp2_session_client_new(&session, &callbacks, NULL));
-
-  stream = open_sent_stream(session, 1);
-
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE ==
-            nghttp2_session_get_effective_local_window_size(session));
-  CU_ASSERT(0 == nghttp2_session_get_effective_recv_data_length(session));
-
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE ==
-            nghttp2_session_get_stream_effective_local_window_size(session, 1));
-  CU_ASSERT(0 ==
-            nghttp2_session_get_stream_effective_recv_data_length(session, 1));
-
-  /* Check connection flow control */
-  session->recv_window_size = 100;
-  nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0, 1100);
-
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_effective_local_window_size(session));
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_local_window_size(session));
-  CU_ASSERT(0 == nghttp2_session_get_effective_recv_data_length(session));
-
-  nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0, -50);
-  /* Now session->recv_window_size = -50 */
-  CU_ASSERT(-50 == session->recv_window_size);
-  CU_ASSERT(50 == session->recv_reduction);
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 950 ==
-            nghttp2_session_get_effective_local_window_size(session));
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_local_window_size(session));
-  CU_ASSERT(0 == nghttp2_session_get_effective_recv_data_length(session));
-
-  session->recv_window_size += 50;
-
-  /* Now session->recv_window_size = 0 */
-
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 950 ==
-            nghttp2_session_get_local_window_size(session));
-
-  nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 0, 100);
-  CU_ASSERT(50 == session->recv_window_size);
-  CU_ASSERT(0 == session->recv_reduction);
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1050 ==
-            nghttp2_session_get_effective_local_window_size(session));
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_local_window_size(session));
-  CU_ASSERT(50 == nghttp2_session_get_effective_recv_data_length(session));
-
-  /* Check stream flow control */
-  stream->recv_window_size = 100;
-  nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 1, 1100);
-
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_stream_effective_local_window_size(session, 1));
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-  CU_ASSERT(0 ==
-            nghttp2_session_get_stream_effective_recv_data_length(session, 1));
-
-  nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 1, -50);
-  /* Now stream->recv_window_size = -50 */
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 950 ==
-            nghttp2_session_get_stream_effective_local_window_size(session, 1));
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-  CU_ASSERT(0 ==
-            nghttp2_session_get_stream_effective_recv_data_length(session, 1));
-
-  stream->recv_window_size += 50;
-  /* Now stream->recv_window_size = 0 */
-  nghttp2_submit_window_update(session, NGHTTP2_FLAG_NONE, 1, 100);
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 1050 ==
-            nghttp2_session_get_stream_effective_local_window_size(session, 1));
-  CU_ASSERT(NGHTTP2_INITIAL_WINDOW_SIZE + 1000 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-  CU_ASSERT(50 ==
-            nghttp2_session_get_stream_effective_recv_data_length(session, 1));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_set_option(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_option *option;
-  nghttp2_hd_deflater *deflater;
-  int rv;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  /* Test for nghttp2_option_set_no_auto_window_update */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_no_auto_window_update(option, 1);
-
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-
-  CU_ASSERT(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE);
-
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-
-  /* Test for nghttp2_option_set_peer_max_concurrent_streams */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_peer_max_concurrent_streams(option, 100);
-
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-
-  CU_ASSERT(100 == session->remote_settings.max_concurrent_streams);
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-
-  /* Test for nghttp2_option_set_max_reserved_remote_streams */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_max_reserved_remote_streams(option, 99);
-
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-
-  CU_ASSERT(99 == session->max_incoming_reserved_streams);
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-
-  /* Test for nghttp2_option_set_no_auto_ping_ack */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_no_auto_ping_ack(option, 1);
-
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-
-  CU_ASSERT(session->opt_flags & NGHTTP2_OPTMASK_NO_AUTO_PING_ACK);
-
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-
-  /* Test for nghttp2_option_set_max_deflate_dynamic_table_size */
-  nghttp2_option_new(&option);
-  nghttp2_option_set_max_deflate_dynamic_table_size(option, 0);
-
-  nghttp2_session_client_new2(&session, &callbacks, NULL, option);
-
-  deflater = &session->hd_deflater;
-
-  rv = nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL, NULL);
-
-  CU_ASSERT(1 == rv);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == deflater->deflate_hd_table_bufsize_max);
-  CU_ASSERT(0 == deflater->ctx.hd_table_bufsize);
-
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_data_backoff_by_high_pri_frame(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_data_provider data_prd;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = block_count_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-
-  ud.frame_send_cb_called = 0;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 4;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  nghttp2_submit_request(session, NULL, NULL, 0, &data_prd, NULL);
-
-  session->remote_window_size = 1 << 20;
-
-  ud.block_count = 2;
-  /* Sends request HEADERS + DATA[0] */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  stream = nghttp2_session_get_stream(session, 1);
-  stream->remote_window_size = 1 << 20;
-
-  CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type);
-  /* data for DATA[1] is read from data_prd but it is not sent */
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN * 2);
-
-  nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
-  ud.block_count = 2;
-  /* Sends DATA[1] + PING, PING is interleaved in DATA sequence */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NGHTTP2_PING == ud.sent_frame_type);
-  /* data for DATA[2] is read from data_prd but it is not sent */
-  CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOADLEN);
-
-  ud.block_count = 2;
-  /* Sends DATA[2..3] */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(stream->shut_flags & NGHTTP2_SHUT_WR);
-
-  nghttp2_session_del(session);
-}
-
-static void check_session_recv_data_with_padding(nghttp2_bufs *bufs,
-                                                 size_t datalen,
-                                                 nghttp2_mem *mem) {
-  nghttp2_session *session;
-  my_user_data ud;
-  nghttp2_session_callbacks callbacks;
-  uint8_t *in;
-  size_t inlen;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_data_chunk_recv_callback = on_data_chunk_recv_callback;
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  open_recv_stream(session, 1);
-
-  inlen = (size_t)nghttp2_bufs_remove(bufs, &in);
-
-  ud.frame_recv_cb_called = 0;
-  ud.data_chunk_len = 0;
-
-  CU_ASSERT((ssize_t)inlen == nghttp2_session_mem_recv(session, in, inlen));
-
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  CU_ASSERT(datalen == ud.data_chunk_len);
-
-  mem->free(in, NULL);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_pack_data_with_padding(void) {
-  nghttp2_session *session;
-  my_user_data ud;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  nghttp2_frame *frame;
-  size_t datalen = 55;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = block_count_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.select_padding_callback = select_padding_callback;
-
-  data_prd.read_callback = fixed_length_data_source_read_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  ud.padlen = 63;
-
-  nghttp2_submit_request(session, NULL, NULL, 0, &data_prd, NULL);
-  ud.block_count = 1;
-  ud.data_source_length = datalen;
-  /* Sends HEADERS */
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type);
-
-  frame = &session->aob.item->frame;
-
-  CU_ASSERT(ud.padlen == frame->data.padlen);
-  CU_ASSERT(frame->hd.flags & NGHTTP2_FLAG_PADDED);
-
-  /* Check reception of this DATA frame */
-  check_session_recv_data_with_padding(&session->aob.framebufs, datalen, mem);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_pack_headers_with_padding(void) {
-  nghttp2_session *session, *sv_session;
-  accumulator acc;
-  my_user_data ud;
-  nghttp2_session_callbacks callbacks;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.select_padding_callback = select_padding_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-
-  acc.length = 0;
-  ud.acc = &acc;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-  nghttp2_session_server_new(&sv_session, &callbacks, &ud);
-
-  ud.padlen = 163;
-
-  CU_ASSERT(1 == nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv),
-                                        NULL, NULL));
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(acc.length < NGHTTP2_MAX_PAYLOADLEN);
-  ud.frame_recv_cb_called = 0;
-  CU_ASSERT((ssize_t)acc.length ==
-            nghttp2_session_mem_recv(sv_session, acc.buf, acc.length));
-  CU_ASSERT(1 == ud.frame_recv_cb_called);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(sv_session));
-
-  nghttp2_session_del(sv_session);
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_pack_settings_payload(void) {
-  nghttp2_settings_entry iv[2];
-  uint8_t buf[64];
-  ssize_t len;
-  nghttp2_settings_entry *resiv;
-  size_t resniv;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-  iv[0].value = 1023;
-  iv[1].settings_id = NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE;
-  iv[1].value = 4095;
-
-  len = nghttp2_pack_settings_payload(buf, sizeof(buf), iv, 2);
-  CU_ASSERT(2 * NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH == len);
-  CU_ASSERT(0 == nghttp2_frame_unpack_settings_payload2(&resiv, &resniv, buf,
-                                                        (size_t)len, mem));
-  CU_ASSERT(2 == resniv);
-  CU_ASSERT(NGHTTP2_SETTINGS_HEADER_TABLE_SIZE == resiv[0].settings_id);
-  CU_ASSERT(1023 == resiv[0].value);
-  CU_ASSERT(NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE == resiv[1].settings_id);
-  CU_ASSERT(4095 == resiv[1].value);
-
-  mem->free(resiv, NULL);
-
-  len = nghttp2_pack_settings_payload(buf, 9 /* too small */, iv, 2);
-  CU_ASSERT(NGHTTP2_ERR_INSUFF_BUFSIZE == len);
-}
-
-#define check_stream_dep_sib(STREAM, DEP_PREV, DEP_NEXT, SIB_PREV, SIB_NEXT)   \
-  do {                                                                         \
-    CU_ASSERT(DEP_PREV == STREAM->dep_prev);                                   \
-    CU_ASSERT(DEP_NEXT == STREAM->dep_next);                                   \
-    CU_ASSERT(SIB_PREV == STREAM->sib_prev);                                   \
-    CU_ASSERT(SIB_NEXT == STREAM->sib_next);                                   \
-  } while (0)
-
-/* nghttp2_stream_dep_add() and its families functions should be
-   tested in nghttp2_stream_test.c, but it is easier to use
-   nghttp2_session_open_stream().  Therefore, we test them here. */
-void test_nghttp2_session_stream_dep_add(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *e, *root;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-
-  c = open_stream_with_dep(session, 5, a);
-  b = open_stream_with_dep(session, 3, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * b--c
-   *    |
-   *    d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, b, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, c);
-  check_stream_dep_sib(c, a, d, b, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  CU_ASSERT(a == session->root.dep_next);
-
-  e = open_stream_with_dep_excl(session, 9, a);
-
-  /* a
-   * |
-   * e
-   * |
-   * b--c
-   *    |
-   *    d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == e->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, e, NULL, NULL);
-  check_stream_dep_sib(e, a, b, NULL, NULL);
-  check_stream_dep_sib(b, e, NULL, NULL, c);
-  check_stream_dep_sib(c, e, d, b, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  CU_ASSERT(a == session->root.dep_next);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_dep_remove(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *e, *f, *root;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  /* Remove root */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  nghttp2_stream_dep_remove(a);
-
-  /* becomes:
-   * c    b
-   * |
-   * d
-   */
-
-  CU_ASSERT(0 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-
-  check_stream_dep_sib(a, NULL, NULL, NULL, NULL);
-  check_stream_dep_sib(b, root, NULL, c, NULL);
-  check_stream_dep_sib(c, root, d, NULL, b);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  CU_ASSERT(c == session->root.dep_next);
-
-  nghttp2_session_del(session);
-
-  /* Remove right most stream */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  nghttp2_stream_dep_remove(b);
-
-  /* becomes:
-   * a
-   * |
-   * c
-   * |
-   * d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, c, NULL, NULL);
-  check_stream_dep_sib(b, NULL, NULL, NULL, NULL);
-  check_stream_dep_sib(c, a, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  CU_ASSERT(a == session->root.dep_next);
-
-  nghttp2_session_del(session);
-
-  /* Remove left most stream */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-  e = open_stream_with_dep(session, 9, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * e--d
-   */
-
-  nghttp2_stream_dep_remove(c);
-
-  /* becomes:
-   * a
-   * |
-   * e--d--b
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(0 == c->sum_dep_weight);
-  CU_ASSERT(0 == e->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, e, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, d, NULL);
-  check_stream_dep_sib(c, NULL, NULL, NULL, NULL);
-  check_stream_dep_sib(d, a, NULL, e, b);
-  check_stream_dep_sib(e, a, NULL, NULL, d);
-
-  nghttp2_session_del(session);
-
-  /* Remove middle stream */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, a);
-  e = open_stream_with_dep(session, 9, c);
-  f = open_stream_with_dep(session, 11, c);
-
-  /* a
-   * |
-   * d--c--b
-   *    |
-   *    f--e
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 3 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(0 == e->sum_dep_weight);
-  CU_ASSERT(0 == f->sum_dep_weight);
-
-  nghttp2_stream_dep_remove(c);
-
-  /* becomes:
-   * a
-   * |
-   * d--f--e--b
-   */
-
-  /* c's weight 16 is distributed evenly to e and f.  Each weight of e
-     and f becomes 8. */
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 + 8 * 2 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(0 == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(0 == e->sum_dep_weight);
-  CU_ASSERT(0 == f->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, d, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, e, NULL);
-  check_stream_dep_sib(c, NULL, NULL, NULL, NULL);
-  check_stream_dep_sib(e, a, NULL, f, b);
-  check_stream_dep_sib(f, a, NULL, d, e);
-  check_stream_dep_sib(d, a, NULL, NULL, f);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_dep_add_subtree(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *e, *f, *root;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  /* dep_stream has dep_next */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  e = open_stream(session, 9);
-  f = open_stream_with_dep(session, 11, e);
-
-  /* a         e
-   * |         |
-   * c--b      f
-   * |
-   * d
-   */
-
-  nghttp2_stream_dep_remove_subtree(e);
-  nghttp2_stream_dep_add_subtree(a, e);
-
-  /* becomes
-   * a
-   * |
-   * e--c--b
-   * |  |
-   * f  d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 3 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == e->sum_dep_weight);
-  CU_ASSERT(0 == f->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, e, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, c, NULL);
-  check_stream_dep_sib(c, a, d, e, b);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-  check_stream_dep_sib(e, a, f, NULL, c);
-  check_stream_dep_sib(f, e, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-
-  /* dep_stream has dep_next and now we insert subtree */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  e = open_stream(session, 9);
-  f = open_stream_with_dep(session, 11, e);
-
-  /* a         e
-   * |         |
-   * c--b      f
-   * |
-   * d
-   */
-
-  nghttp2_stream_dep_remove_subtree(e);
-  nghttp2_stream_dep_insert_subtree(a, e);
-
-  /* becomes
-   * a
-   * |
-   * e
-   * |
-   * f--c--b
-   *    |
-   *    d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 3 == e->sum_dep_weight);
-  CU_ASSERT(0 == f->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, e, NULL, NULL);
-  check_stream_dep_sib(e, a, f, NULL, NULL);
-  check_stream_dep_sib(f, e, NULL, NULL, c);
-  check_stream_dep_sib(b, e, NULL, c, NULL);
-  check_stream_dep_sib(c, e, d, f, b);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_dep_remove_subtree(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *e, *root;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  /* Remove left most stream */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  nghttp2_stream_dep_remove_subtree(c);
-
-  /* becomes
-   * a  c
-   * |  |
-   * b  d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, b, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, NULL);
-  check_stream_dep_sib(c, NULL, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-
-  /* Remove right most stream */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  nghttp2_stream_dep_remove_subtree(b);
-
-  /* becomes
-   * a  b
-   * |
-   * c
-   * |
-   * d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, c, NULL, NULL);
-  check_stream_dep_sib(c, a, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-  check_stream_dep_sib(b, NULL, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-
-  /* Remove middle stream */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  e = open_stream_with_dep(session, 9, a);
-  c = open_stream_with_dep(session, 5, a);
-  b = open_stream_with_dep(session, 3, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * b--c--e
-   *    |
-   *    d
-   */
-
-  nghttp2_stream_dep_remove_subtree(c);
-
-  /* becomes
-   * a     c
-   * |     |
-   * b--e  d
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(0 == e->sum_dep_weight);
-
-  check_stream_dep_sib(a, root, b, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, e);
-  check_stream_dep_sib(e, a, NULL, b, NULL);
-  check_stream_dep_sib(c, NULL, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_dep_all_your_stream_are_belong_to_us(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *root;
-  nghttp2_outbound_item *db, *dc;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-
-  c = open_stream(session, 5);
-
-  /* a     c
-   * |
-   * b
-   */
-
-  nghttp2_stream_dep_remove_subtree(c);
-  CU_ASSERT(0 == nghttp2_stream_dep_insert_subtree(&session->root, c));
-
-  /*
-   * c
-   * |
-   * a
-   * |
-   * b
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == c->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-
-  check_stream_dep_sib(c, root, a, NULL, NULL);
-  check_stream_dep_sib(a, c, b, NULL, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream(session, 3);
-  c = open_stream(session, 5);
-
-  /*
-   * a  b   c
-   */
-
-  nghttp2_stream_dep_remove_subtree(c);
-  CU_ASSERT(0 == nghttp2_stream_dep_insert_subtree(&session->root, c));
-
-  /*
-   * c
-   * |
-   * b--a
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == c->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-  CU_ASSERT(0 == a->sum_dep_weight);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-
-  check_stream_dep_sib(c, root, b, NULL, NULL);
-  check_stream_dep_sib(b, c, NULL, NULL, a);
-  check_stream_dep_sib(a, c, NULL, b, NULL);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-
-  c = open_stream(session, 5);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a     c
-   * |     |
-   * b     d
-   */
-
-  nghttp2_stream_dep_remove_subtree(c);
-  CU_ASSERT(0 == nghttp2_stream_dep_insert_subtree(&session->root, c));
-
-  /*
-   * c
-   * |
-   * d--a
-   *    |
-   *    b
-   */
-
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT * 2 == c->sum_dep_weight);
-  CU_ASSERT(0 == d->sum_dep_weight);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == a->sum_dep_weight);
-  CU_ASSERT(0 == b->sum_dep_weight);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-
-  check_stream_dep_sib(c, root, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, a);
-  check_stream_dep_sib(a, c, b, d, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-
-  c = open_stream(session, 5);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a     c
-   * |     |
-   * b     d
-   */
-
-  db = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(b, db);
-
-  nghttp2_stream_dep_remove_subtree(c);
-  CU_ASSERT(0 == nghttp2_stream_dep_insert_subtree(&session->root, c));
-
-  /*
-   * c
-   * |
-   * d--a
-   *    |
-   *    b
-   */
-
-  CU_ASSERT(c->queued);
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-
-  check_stream_dep_sib(c, root, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, a);
-  check_stream_dep_sib(a, c, b, d, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  root = &session->root;
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-
-  c = open_stream(session, 5);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a     c
-   * |     |
-   * b     d
-   */
-
-  db = create_data_ob_item(mem);
-  dc = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(b, db);
-  nghttp2_stream_attach_item(c, dc);
-
-  nghttp2_stream_dep_remove_subtree(c);
-  CU_ASSERT(0 == nghttp2_stream_dep_insert_subtree(&session->root, c));
-
-  /*
-   * c
-   * |
-   * d--a
-   *    |
-   *    b
-   */
-
-  CU_ASSERT(c->queued);
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!d->queued);
-
-  check_stream_dep_sib(c, root, d, NULL, NULL);
-  check_stream_dep_sib(d, c, NULL, NULL, a);
-  check_stream_dep_sib(a, c, b, d, NULL);
-  check_stream_dep_sib(b, a, NULL, NULL, NULL);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_attach_item(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *e;
-  nghttp2_outbound_item *da, *db, *dc, *dd;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  db = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(b, db);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!c->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-
-  /* Attach item to c */
-  dc = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(c, dc);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-
-  /* Attach item to a */
-  da = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(a, da);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-
-  /* Detach item from a */
-  nghttp2_stream_detach_item(a);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-
-  /* Attach item to d */
-  dd = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(d, dd);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-
-  /* Detach item from c */
-  nghttp2_stream_detach_item(c);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-
-  /* Detach item from b */
-  nghttp2_stream_detach_item(b);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(!b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-
-  /* exercises insertion */
-  e = open_stream_with_dep_excl(session, 9, a);
-
-  /* a
-   * |
-   * e
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-
-  /* exercises deletion */
-  nghttp2_stream_dep_remove(e);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(!b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-
-  /* e's weight 16 is distributed equally among c and b, both now have
-     weight 8 each. */
-  CU_ASSERT(8 == b->weight);
-  CU_ASSERT(8 == c->weight);
-
-  /* da, db, dc have been detached */
-  nghttp2_outbound_item_free(da, mem);
-  nghttp2_outbound_item_free(db, mem);
-  nghttp2_outbound_item_free(dc, mem);
-  free(da);
-  free(db);
-  free(dc);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  /* a
-   * |
-   * c--b
-   * |
-   * d
-   */
-
-  da = create_data_ob_item(mem);
-  db = create_data_ob_item(mem);
-  dc = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(a, da);
-  nghttp2_stream_attach_item(b, db);
-  nghttp2_stream_attach_item(c, dc);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-
-  /* Detach item from a */
-  nghttp2_stream_detach_item(a);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(!d->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-
-  /* da has been detached */
-  nghttp2_outbound_item_free(da, mem);
-  free(da);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_attach_item_subtree(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c, *d, *e, *f;
-  nghttp2_outbound_item *da, *db, *dd, *de;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  a = open_stream(session, 1);
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep(session, 5, a);
-  d = open_stream_with_dep(session, 7, c);
-
-  e = open_stream_with_dep_weight(session, 9, 32, &session->root);
-  f = open_stream_with_dep(session, 11, e);
-
-  /*
-   * a        e
-   * |        |
-   * c--b     f
-   * |
-   * d
-   */
-
-  de = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(e, de);
-
-  db = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(b, db);
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!c->queued);
-  CU_ASSERT(!d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Insert subtree e under a */
-
-  nghttp2_stream_dep_remove_subtree(e);
-  nghttp2_stream_dep_insert_subtree(a, e);
-
-  /*
-   * a
-   * |
-   * e
-   * |
-   * f--c--b
-   *    |
-   *    d
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!c->queued);
-  CU_ASSERT(!d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Remove subtree b */
-
-  nghttp2_stream_dep_remove_subtree(b);
-
-  CU_ASSERT(0 == nghttp2_stream_dep_add_subtree(&session->root, b));
-
-  /*
-   * a       b
-   * |
-   * e
-   * |
-   * f--c
-   *    |
-   *    d
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!c->queued);
-  CU_ASSERT(!d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Remove subtree a, and add it to root again */
-
-  nghttp2_stream_dep_remove_subtree(a);
-
-  CU_ASSERT(0 == nghttp2_stream_dep_add_subtree(&session->root, a));
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!c->queued);
-  CU_ASSERT(!d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Remove subtree c */
-
-  nghttp2_stream_dep_remove_subtree(c);
-
-  CU_ASSERT(0 == nghttp2_stream_dep_add_subtree(&session->root, c));
-
-  /*
-   * a       b     c
-   * |             |
-   * e             d
-   * |
-   * f
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(!c->queued);
-  CU_ASSERT(!d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(nghttp2_pq_empty(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  dd = create_data_ob_item(mem);
-
-  nghttp2_stream_attach_item(d, dd);
-
-  /* Add subtree c to a */
-
-  nghttp2_stream_dep_remove_subtree(c);
-  nghttp2_stream_dep_add_subtree(a, c);
-
-  /*
-   * a       b
-   * |
-   * c--e
-   * |  |
-   * d  f
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(2 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(nghttp2_pq_empty(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Insert b under a */
-
-  nghttp2_stream_dep_remove_subtree(b);
-  nghttp2_stream_dep_insert_subtree(a, b);
-
-  /*
-   * a
-   * |
-   * b
-   * |
-   * c--e
-   * |  |
-   * d  f
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(1 == nghttp2_pq_size(&a->obq));
-  CU_ASSERT(2 == nghttp2_pq_size(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Remove subtree b */
-
-  nghttp2_stream_dep_remove_subtree(b);
-  CU_ASSERT(0 == nghttp2_stream_dep_add_subtree(&session->root, b));
-
-  /*
-   * b       a
-   * |
-   * e--c
-   * |  |
-   * f  d
-   */
-
-  CU_ASSERT(!a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(2 == nghttp2_pq_size(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Remove subtree c, and detach item from b, and then re-add
-     subtree c under b */
-
-  nghttp2_stream_dep_remove_subtree(c);
-  nghttp2_stream_detach_item(b);
-  nghttp2_stream_dep_add_subtree(b, c);
-
-  /*
-   * b       a
-   * |
-   * e--c
-   * |  |
-   * f  d
-   */
-
-  CU_ASSERT(!a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(2 == nghttp2_pq_size(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Attach data to a, and add subtree a under b */
-
-  da = create_data_ob_item(mem);
-  nghttp2_stream_attach_item(a, da);
-  nghttp2_stream_dep_remove_subtree(a);
-  nghttp2_stream_dep_add_subtree(b, a);
-
-  /*
-   * b
-   * |
-   * a--e--c
-   *    |  |
-   *    f  d
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(!f->queued);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(3 == nghttp2_pq_size(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(nghttp2_pq_empty(&e->obq));
-  CU_ASSERT(nghttp2_pq_empty(&f->obq));
-
-  /* Remove subtree c, and add under f */
-  nghttp2_stream_dep_remove_subtree(c);
-  nghttp2_stream_dep_insert_subtree(f, c);
-
-  /*
-   * b
-   * |
-   * a--e
-   *    |
-   *    f
-   *    |
-   *    c
-   *    |
-   *    d
-   */
-
-  CU_ASSERT(a->queued);
-  CU_ASSERT(b->queued);
-  CU_ASSERT(c->queued);
-  CU_ASSERT(d->queued);
-  CU_ASSERT(e->queued);
-  CU_ASSERT(f->queued);
-
-  CU_ASSERT(nghttp2_pq_empty(&a->obq));
-  CU_ASSERT(2 == nghttp2_pq_size(&b->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&c->obq));
-  CU_ASSERT(nghttp2_pq_empty(&d->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&e->obq));
-  CU_ASSERT(1 == nghttp2_pq_size(&f->obq));
-
-  /* db has been detached */
-  nghttp2_outbound_item_free(db, mem);
-  free(db);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_stream_get_state(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_mem *mem;
-  nghttp2_hd_deflater deflater;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_stream *stream;
-  ssize_t rv;
-  nghttp2_data_provider data_prd;
-  nghttp2_frame frame;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-  memset(&data_prd, 0, sizeof(data_prd));
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_IDLE ==
-            nghttp2_stream_get_state(nghttp2_session_get_root_stream(session)));
-
-  /* stream 1 HEADERS; without END_STREAM flag set */
-  pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, reqnv,
-               ARRLEN(reqnv), mem);
-
-  buf = &bufs.head->buf;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-
-  stream = nghttp2_session_find_stream(session, 1);
-
-  CU_ASSERT(NULL != stream);
-  CU_ASSERT(1 == stream->stream_id);
-  CU_ASSERT(NGHTTP2_STREAM_STATE_OPEN == nghttp2_stream_get_state(stream));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* stream 3 HEADERS; with END_STREAM flag set */
-  pack_headers(&bufs, &deflater, 3,
-               NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM, reqnv,
-               ARRLEN(reqnv), mem);
-
-  buf = &bufs.head->buf;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-
-  stream = nghttp2_session_find_stream(session, 3);
-
-  CU_ASSERT(NULL != stream);
-  CU_ASSERT(3 == stream->stream_id);
-  CU_ASSERT(NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE ==
-            nghttp2_stream_get_state(stream));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* Respond to stream 1 */
-  nghttp2_submit_response(session, 1, resnv, ARRLEN(resnv), NULL);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  stream = nghttp2_session_find_stream(session, 1);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL ==
-            nghttp2_stream_get_state(stream));
-
-  /* Respond to stream 3 */
-  nghttp2_submit_response(session, 3, resnv, ARRLEN(resnv), NULL);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  stream = nghttp2_session_find_stream(session, 3);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_CLOSED == nghttp2_stream_get_state(stream));
-
-  /* stream 5 HEADERS; with END_STREAM flag set */
-  pack_headers(&bufs, &deflater, 5,
-               NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM, reqnv,
-               ARRLEN(reqnv), mem);
-
-  buf = &bufs.head->buf;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* Push stream 2 associated to stream 5 */
-  rv = nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 5, reqnv,
-                                   ARRLEN(reqnv), NULL);
-
-  CU_ASSERT(2 == rv);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  stream = nghttp2_session_find_stream(session, 2);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_RESERVED_LOCAL ==
-            nghttp2_stream_get_state(stream));
-
-  /* Send resposne to push stream 2 with END_STREAM set */
-  nghttp2_submit_response(session, 2, resnv, ARRLEN(resnv), NULL);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  stream = nghttp2_session_find_stream(session, 2);
-
-  /* At server, pushed stream object is not retained after closed */
-  CU_ASSERT(NULL == stream);
-
-  /* Push stream 4 associated to stream 5 */
-  rv = nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 5, reqnv,
-                                   ARRLEN(reqnv), NULL);
-
-  CU_ASSERT(4 == rv);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  stream = nghttp2_session_find_stream(session, 4);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_RESERVED_LOCAL ==
-            nghttp2_stream_get_state(stream));
-
-  /* Send response to push stream 4 without closing */
-  data_prd.read_callback = defer_data_source_read_callback;
-
-  nghttp2_submit_response(session, 4, resnv, ARRLEN(resnv), &data_prd);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  stream = nghttp2_session_find_stream(session, 4);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE ==
-            nghttp2_stream_get_state(stream));
-
-  /* Create idle stream by PRIORITY frame */
-  nghttp2_frame_priority_init(&frame.priority, 7, &pri_spec_default);
-
-  rv = nghttp2_frame_pack_priority(&bufs, &frame.priority);
-
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_priority_free(&frame.priority);
-
-  buf = &bufs.head->buf;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-
-  stream = nghttp2_session_find_stream(session, 7);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_IDLE == nghttp2_stream_get_state(stream));
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* Test for client side */
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL, NULL);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  /* Receive PUSH_PROMISE 2 associated to stream 1 */
-  pack_push_promise(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, 2, reqnv,
-                    ARRLEN(reqnv), mem);
-
-  buf = &bufs.head->buf;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-
-  stream = nghttp2_session_find_stream(session, 2);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_RESERVED_REMOTE ==
-            nghttp2_stream_get_state(stream));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* Receive push response for stream 2 without END_STREAM set */
-  pack_headers(&bufs, &deflater, 2, NGHTTP2_FLAG_END_HEADERS, resnv,
-               ARRLEN(resnv), mem);
-
-  buf = &bufs.head->buf;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(buf) == rv);
-
-  stream = nghttp2_session_find_stream(session, 2);
-
-  CU_ASSERT(NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL ==
-            nghttp2_stream_get_state(stream));
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_stream_get_something(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a, *b, *c;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  a = open_stream(session, 1);
-
-  CU_ASSERT(nghttp2_session_get_root_stream(session) ==
-            nghttp2_stream_get_parent(a));
-  CU_ASSERT(NULL == nghttp2_stream_get_previous_sibling(a));
-  CU_ASSERT(NULL == nghttp2_stream_get_next_sibling(a));
-  CU_ASSERT(NULL == nghttp2_stream_get_first_child(a));
-
-  b = open_stream_with_dep(session, 3, a);
-  c = open_stream_with_dep_weight(session, 5, 11, a);
-
-  CU_ASSERT(a == nghttp2_stream_get_parent(c));
-  CU_ASSERT(a == nghttp2_stream_get_parent(b));
-
-  CU_ASSERT(c == nghttp2_stream_get_first_child(a));
-
-  CU_ASSERT(b == nghttp2_stream_get_next_sibling(c));
-  CU_ASSERT(c == nghttp2_stream_get_previous_sibling(b));
-
-  CU_ASSERT(27 == nghttp2_stream_get_sum_dependency_weight(a));
-
-  CU_ASSERT(11 == nghttp2_stream_get_weight(c));
-  CU_ASSERT(5 == nghttp2_stream_get_stream_id(c));
-  CU_ASSERT(0 == nghttp2_stream_get_stream_id(&session->root));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_find_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  open_recv_stream(session, 1);
-
-  stream = nghttp2_session_find_stream(session, 1);
-
-  CU_ASSERT(NULL != stream);
-  CU_ASSERT(1 == stream->stream_id);
-
-  stream = nghttp2_session_find_stream(session, 0);
-
-  CU_ASSERT(&session->root == stream);
-  CU_ASSERT(0 == stream->stream_id);
-
-  stream = nghttp2_session_find_stream(session, 2);
-
-  CU_ASSERT(NULL == stream);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_keep_closed_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  const size_t max_concurrent_streams = 5;
-  nghttp2_settings_entry iv = {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
-                               (uint32_t)max_concurrent_streams};
-  size_t i;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
-
-  for (i = 0; i < max_concurrent_streams; ++i) {
-    open_recv_stream(session, (int32_t)i * 2 + 1);
-  }
-
-  CU_ASSERT(0 == session->num_closed_streams);
-
-  nghttp2_session_close_stream(session, 1, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT(1 == session->num_closed_streams);
-  CU_ASSERT(1 == session->closed_stream_tail->stream_id);
-  CU_ASSERT(session->closed_stream_tail == session->closed_stream_head);
-
-  nghttp2_session_close_stream(session, 5, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT(2 == session->num_closed_streams);
-  CU_ASSERT(5 == session->closed_stream_tail->stream_id);
-  CU_ASSERT(1 == session->closed_stream_head->stream_id);
-  CU_ASSERT(session->closed_stream_head ==
-            session->closed_stream_tail->closed_prev);
-  CU_ASSERT(NULL == session->closed_stream_tail->closed_next);
-  CU_ASSERT(session->closed_stream_tail ==
-            session->closed_stream_head->closed_next);
-  CU_ASSERT(NULL == session->closed_stream_head->closed_prev);
-
-  open_recv_stream(session, 11);
-  nghttp2_session_adjust_closed_stream(session);
-
-  CU_ASSERT(1 == session->num_closed_streams);
-  CU_ASSERT(5 == session->closed_stream_tail->stream_id);
-  CU_ASSERT(session->closed_stream_tail == session->closed_stream_head);
-  CU_ASSERT(NULL == session->closed_stream_head->closed_prev);
-  CU_ASSERT(NULL == session->closed_stream_head->closed_next);
-
-  open_recv_stream(session, 13);
-  nghttp2_session_adjust_closed_stream(session);
-
-  CU_ASSERT(0 == session->num_closed_streams);
-  CU_ASSERT(NULL == session->closed_stream_tail);
-  CU_ASSERT(NULL == session->closed_stream_head);
-
-  nghttp2_session_close_stream(session, 3, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT(1 == session->num_closed_streams);
-  CU_ASSERT(3 == session->closed_stream_head->stream_id);
-
-  /* server initiated stream is not counted to max concurrent limit */
-  open_sent_stream(session, 2);
-  nghttp2_session_adjust_closed_stream(session);
-
-  CU_ASSERT(1 == session->num_closed_streams);
-  CU_ASSERT(3 == session->closed_stream_head->stream_id);
-
-  nghttp2_session_close_stream(session, 2, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT(1 == session->num_closed_streams);
-  CU_ASSERT(3 == session->closed_stream_head->stream_id);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_keep_idle_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  const size_t max_concurrent_streams = 1;
-  nghttp2_settings_entry iv = {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
-                               (uint32_t)max_concurrent_streams};
-  int i;
-  int32_t stream_id;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
-
-  /* We at least allow NGHTTP2_MIN_IDLE_STREAM idle streams even if
-     max concurrent streams is very low. */
-  for (i = 0; i < NGHTTP2_MIN_IDLE_STREAMS; ++i) {
-    open_recv_stream2(session, i * 2 + 1, NGHTTP2_STREAM_IDLE);
-    nghttp2_session_adjust_idle_stream(session);
-  }
-
-  CU_ASSERT(NGHTTP2_MIN_IDLE_STREAMS == session->num_idle_streams);
-
-  stream_id = (NGHTTP2_MIN_IDLE_STREAMS - 1) * 2 + 1;
-  CU_ASSERT(1 == session->idle_stream_head->stream_id);
-  CU_ASSERT(stream_id == session->idle_stream_tail->stream_id);
-
-  stream_id += 2;
-
-  open_recv_stream2(session, stream_id, NGHTTP2_STREAM_IDLE);
-  nghttp2_session_adjust_idle_stream(session);
-
-  CU_ASSERT(NGHTTP2_MIN_IDLE_STREAMS == session->num_idle_streams);
-  CU_ASSERT(3 == session->idle_stream_head->stream_id);
-  CU_ASSERT(stream_id == session->idle_stream_tail->stream_id);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_detach_idle_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  int i;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  for (i = 1; i <= 3; ++i) {
-    nghttp2_session_open_stream(session, i, NGHTTP2_STREAM_FLAG_NONE,
-                                &pri_spec_default, NGHTTP2_STREAM_IDLE, NULL);
-  }
-
-  CU_ASSERT(3 == session->num_idle_streams);
-
-  /* Detach middle stream */
-  stream = nghttp2_session_get_stream_raw(session, 2);
-
-  CU_ASSERT(session->idle_stream_head == stream->closed_prev);
-  CU_ASSERT(session->idle_stream_tail == stream->closed_next);
-  CU_ASSERT(stream == session->idle_stream_head->closed_next);
-  CU_ASSERT(stream == session->idle_stream_tail->closed_prev);
-
-  nghttp2_session_detach_idle_stream(session, stream);
-
-  CU_ASSERT(2 == session->num_idle_streams);
-
-  CU_ASSERT(NULL == stream->closed_prev);
-  CU_ASSERT(NULL == stream->closed_next);
-
-  CU_ASSERT(session->idle_stream_head ==
-            session->idle_stream_tail->closed_prev);
-  CU_ASSERT(session->idle_stream_tail ==
-            session->idle_stream_head->closed_next);
-
-  /* Detach head stream */
-  stream = session->idle_stream_head;
-
-  nghttp2_session_detach_idle_stream(session, stream);
-
-  CU_ASSERT(1 == session->num_idle_streams);
-
-  CU_ASSERT(session->idle_stream_head == session->idle_stream_tail);
-  CU_ASSERT(NULL == session->idle_stream_head->closed_prev);
-  CU_ASSERT(NULL == session->idle_stream_head->closed_next);
-
-  /* Detach last stream */
-
-  stream = session->idle_stream_head;
-
-  nghttp2_session_detach_idle_stream(session, stream);
-
-  CU_ASSERT(0 == session->num_idle_streams);
-
-  CU_ASSERT(NULL == session->idle_stream_head);
-  CU_ASSERT(NULL == session->idle_stream_tail);
-
-  for (i = 4; i <= 5; ++i) {
-    nghttp2_session_open_stream(session, i, NGHTTP2_STREAM_FLAG_NONE,
-                                &pri_spec_default, NGHTTP2_STREAM_IDLE, NULL);
-  }
-
-  CU_ASSERT(2 == session->num_idle_streams);
-
-  /* Detach tail stream */
-
-  stream = session->idle_stream_tail;
-
-  nghttp2_session_detach_idle_stream(session, stream);
-
-  CU_ASSERT(1 == session->num_idle_streams);
-
-  CU_ASSERT(session->idle_stream_head == session->idle_stream_tail);
-  CU_ASSERT(NULL == session->idle_stream_head->closed_prev);
-  CU_ASSERT(NULL == session->idle_stream_head->closed_next);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_large_dep_tree(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  size_t i;
-  nghttp2_stream *dep_stream = NULL;
-  nghttp2_stream *stream;
-  int32_t stream_id;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream_id = 1;
-  for (i = 0; i < 250; ++i, stream_id += 2) {
-    dep_stream = open_stream_with_dep(session, stream_id, dep_stream);
-  }
-
-  stream_id = 1;
-  for (i = 0; i < 250; ++i, stream_id += 2) {
-    stream = nghttp2_session_get_stream(session, stream_id);
-    CU_ASSERT(nghttp2_stream_dep_find_ancestor(stream, &session->root));
-    CU_ASSERT(nghttp2_stream_in_dep_tree(stream));
-  }
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_graceful_shutdown(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.on_stream_close_callback = on_stream_close_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  open_recv_stream(session, 301);
-  open_sent_stream(session, 302);
-  open_recv_stream(session, 309);
-  open_recv_stream(session, 311);
-  open_recv_stream(session, 319);
-
-  CU_ASSERT(0 == nghttp2_submit_shutdown_notice(session));
-
-  ud.frame_send_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT((1u << 31) - 1 == session->local_last_stream_id);
-
-  CU_ASSERT(0 == nghttp2_submit_goaway(session, NGHTTP2_FLAG_NONE, 311,
-                                       NGHTTP2_NO_ERROR, NULL, 0));
-
-  ud.frame_send_cb_called = 0;
-  ud.stream_close_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(311 == session->local_last_stream_id);
-  CU_ASSERT(1 == ud.stream_close_cb_called);
-
-  CU_ASSERT(0 ==
-            nghttp2_session_terminate_session2(session, 301, NGHTTP2_NO_ERROR));
-
-  ud.frame_send_cb_called = 0;
-  ud.stream_close_cb_called = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(301 == session->local_last_stream_id);
-  CU_ASSERT(2 == ud.stream_close_cb_called);
-
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 301));
-  CU_ASSERT(NULL != nghttp2_session_get_stream(session, 302));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 309));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 311));
-  CU_ASSERT(NULL == nghttp2_session_get_stream(session, 319));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_header_temporal_failure(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_hd_deflater deflater;
-  nghttp2_nv nv[] = {MAKE_NV("alpha", "bravo"), MAKE_NV("charlie", "delta")};
-  nghttp2_nv *nva;
-  size_t hdpos;
-  ssize_t rv;
-  nghttp2_frame frame;
-  nghttp2_frame_hd hd;
-  nghttp2_outbound_item *item;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.on_header_callback = temporal_failure_on_header_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  frame_pack_bufs_init(&bufs);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nghttp2_nv_array_copy(&nva, reqnv, ARRLEN(reqnv), mem);
-
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_STREAM, 1,
-                             NGHTTP2_HCAT_REQUEST, NULL, nva, ARRLEN(reqnv));
-  nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  /* We are going to create CONTINUATION.  First serialize header
-     block, and then frame header. */
-  hdpos = nghttp2_bufs_len(&bufs);
-
-  buf = &bufs.head->buf;
-  buf->last += NGHTTP2_FRAME_HDLEN;
-
-  nghttp2_hd_deflate_hd_bufs(&deflater, &bufs, &nv[1], 1);
-
-  nghttp2_frame_hd_init(&hd,
-                        nghttp2_bufs_len(&bufs) - hdpos - NGHTTP2_FRAME_HDLEN,
-                        NGHTTP2_CONTINUATION, NGHTTP2_FLAG_END_HEADERS, 1);
-
-  nghttp2_frame_pack_frame_hd(&buf->pos[hdpos], &hd);
-
-  ud.header_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, buf->pos, nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(1 == ud.header_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(1 == item->frame.hd.stream_id);
-
-  /* Make sure no header decompression error occurred */
-  CU_ASSERT(NGHTTP2_GOAWAY_NONE == session->goaway_flags);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* Check for PUSH_PROMISE */
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  open_sent_stream(session, 1);
-
-  rv = pack_push_promise(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, 2,
-                         reqnv, ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  ud.header_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(1 == ud.header_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(2 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_INTERNAL_ERROR == item->frame.rst_stream.error_code);
-
-  nghttp2_session_del(session);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_recv_client_magic(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  ssize_t rv;
-  nghttp2_frame ping_frame;
-  uint8_t buf[16];
-
-  /* enable global nghttp2_enable_strict_preface here */
-  nghttp2_enable_strict_preface = 1;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  /* Check success case */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  rv = nghttp2_session_mem_recv(session, (const uint8_t *)NGHTTP2_CLIENT_MAGIC,
-                                NGHTTP2_CLIENT_MAGIC_LEN);
-
-  CU_ASSERT(rv == NGHTTP2_CLIENT_MAGIC_LEN);
-  CU_ASSERT(NGHTTP2_IB_READ_FIRST_SETTINGS == session->iframe.state);
-
-  /* Receiving PING is error because we want SETTINGS. */
-  nghttp2_frame_ping_init(&ping_frame.ping, NGHTTP2_FLAG_NONE, NULL);
-
-  nghttp2_frame_pack_frame_hd(buf, &ping_frame.ping.hd);
-
-  rv = nghttp2_session_mem_recv(session, buf, NGHTTP2_FRAME_HDLEN);
-  CU_ASSERT(NGHTTP2_FRAME_HDLEN == rv);
-  CU_ASSERT(NGHTTP2_IB_IGN_ALL == session->iframe.state);
-  CU_ASSERT(0 == session->iframe.payloadleft);
-
-  nghttp2_frame_ping_free(&ping_frame.ping);
-
-  nghttp2_session_del(session);
-
-  /* Check bad case */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* Feed magic with one byte less */
-  rv = nghttp2_session_mem_recv(session, (const uint8_t *)NGHTTP2_CLIENT_MAGIC,
-                                NGHTTP2_CLIENT_MAGIC_LEN - 1);
-
-  CU_ASSERT(rv == NGHTTP2_CLIENT_MAGIC_LEN - 1);
-  CU_ASSERT(NGHTTP2_IB_READ_CLIENT_MAGIC == session->iframe.state);
-  CU_ASSERT(1 == session->iframe.payloadleft);
-
-  rv = nghttp2_session_mem_recv(session, (const uint8_t *)"\0", 1);
-
-  CU_ASSERT(NGHTTP2_ERR_BAD_CLIENT_MAGIC == rv);
-
-  nghttp2_session_del(session);
-
-  /* disable global nghttp2_enable_strict_preface here */
-  nghttp2_enable_strict_preface = 0;
-}
-
-void test_nghttp2_session_delete_data_item(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *a;
-  nghttp2_data_provider prd;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  a = open_recv_stream(session, 1);
-  open_recv_stream_with_dep(session, 3, a);
-
-  /* We don't care about these members, since we won't send data */
-  prd.source.ptr = NULL;
-  prd.read_callback = fail_data_source_read_callback;
-
-  CU_ASSERT(0 == nghttp2_submit_data(session, NGHTTP2_FLAG_NONE, 1, &prd));
-  CU_ASSERT(0 == nghttp2_submit_data(session, NGHTTP2_FLAG_NONE, 3, &prd));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_open_idle_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  nghttp2_stream *opened_stream;
-  nghttp2_priority_spec pri_spec;
-  nghttp2_frame frame;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 3, 0);
-
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  stream = nghttp2_session_get_stream_raw(session, 1);
-
-  CU_ASSERT(NGHTTP2_STREAM_IDLE == stream->state);
-  CU_ASSERT(NULL == stream->closed_prev);
-  CU_ASSERT(NULL == stream->closed_next);
-  CU_ASSERT(1 == session->num_idle_streams);
-  CU_ASSERT(session->idle_stream_head == stream);
-  CU_ASSERT(session->idle_stream_tail == stream);
-
-  opened_stream = open_recv_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  CU_ASSERT(stream == opened_stream);
-  CU_ASSERT(NGHTTP2_STREAM_OPENING == stream->state);
-  CU_ASSERT(0 == session->num_idle_streams);
-  CU_ASSERT(NULL == session->idle_stream_head);
-  CU_ASSERT(NULL == session->idle_stream_tail);
-
-  nghttp2_frame_priority_free(&frame.priority);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_cancel_reserved_remote(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  nghttp2_frame frame;
-  nghttp2_nv *nva;
-  size_t nvlen;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  stream = open_recv_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
-
-  nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, 2, NGHTTP2_CANCEL);
-
-  CU_ASSERT(NGHTTP2_STREAM_CLOSING == stream->state);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nvlen = ARRLEN(resnv);
-  nghttp2_nv_array_copy(&nva, resnv, nvlen, mem);
-
-  nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_HEADERS, 2,
-                             NGHTTP2_HCAT_PUSH_RESPONSE, NULL, nva, nvlen);
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  /* stream is not dangling, so assign NULL */
-  stream = NULL;
-
-  /* No RST_STREAM or GOAWAY is generated since stream should be in
-     NGHTTP2_STREAM_CLOSING and push response should be ignored. */
-  CU_ASSERT(0 == nghttp2_outbound_queue_size(&session->ob_reg));
-
-  /* Check that we can receive push response HEADERS while RST_STREAM
-     is just queued. */
-  open_recv_stream2(session, 4, NGHTTP2_STREAM_RESERVED);
-
-  nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, 2, NGHTTP2_CANCEL);
-
-  nghttp2_bufs_reset(&bufs);
-
-  frame.hd.stream_id = 4;
-  rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(1 == nghttp2_outbound_queue_size(&session->ob_reg));
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_reset_pending_headers(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream;
-  int32_t stream_id;
-  my_user_data ud;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-  callbacks.on_stream_close_callback = on_stream_close_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  stream_id = nghttp2_submit_request(session, NULL, NULL, 0, NULL, NULL);
-  CU_ASSERT(stream_id >= 1);
-
-  nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, stream_id,
-                            NGHTTP2_CANCEL);
-
-  session->remote_settings.max_concurrent_streams = 0;
-
-  /* RST_STREAM cancels pending HEADERS and is not actually sent. */
-  ud.frame_send_cb_called = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  CU_ASSERT(NULL == stream);
-
-  /* See HEADERS is not sent.  on_stream_close is called just like
-     transmission failure. */
-  session->remote_settings.max_concurrent_streams = 1;
-
-  ud.frame_not_send_cb_called = 0;
-  ud.stream_close_error_code = 0;
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-  CU_ASSERT(NGHTTP2_HEADERS == ud.not_sent_frame_type);
-  CU_ASSERT(NGHTTP2_CANCEL == ud.stream_close_error_code);
-
-  stream = nghttp2_session_get_stream(session, stream_id);
-
-  CU_ASSERT(NULL == stream);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_send_data_callback(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-  accumulator acc;
-  nghttp2_frame_hd hd;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = accumulator_send_callback;
-  callbacks.send_data_callback = send_data_callback;
-
-  data_prd.read_callback = no_copy_data_source_read_callback;
-
-  acc.length = 0;
-  ud.acc = &acc;
-
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN * 2;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  open_sent_stream(session, 1);
-
-  nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 1, &data_prd);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  CU_ASSERT((NGHTTP2_FRAME_HDLEN + NGHTTP2_DATA_PAYLOADLEN) * 2 == acc.length);
-
-  nghttp2_frame_unpack_frame_hd(&hd, acc.buf);
-
-  CU_ASSERT(16384 == hd.length);
-  CU_ASSERT(NGHTTP2_DATA == hd.type);
-  CU_ASSERT(NGHTTP2_FLAG_NONE == hd.flags);
-
-  nghttp2_frame_unpack_frame_hd(&hd, acc.buf + NGHTTP2_FRAME_HDLEN + hd.length);
-
-  CU_ASSERT(16384 == hd.length);
-  CU_ASSERT(NGHTTP2_DATA == hd.type);
-  CU_ASSERT(NGHTTP2_FLAG_END_STREAM == hd.flags);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_on_begin_headers_temporal_failure(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  ssize_t rv;
-  nghttp2_hd_deflater deflater;
-  nghttp2_outbound_item *item;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.on_begin_headers_callback =
-      temporal_failure_on_begin_headers_callback;
-  callbacks.on_header_callback = on_header_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.send_callback = null_send_callback;
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, reqnv,
-                    ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  ud.header_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(0 == ud.header_cb_called);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(1 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_INTERNAL_ERROR == item->frame.rst_stream.error_code);
-
-  nghttp2_session_del(session);
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_bufs_reset(&bufs);
-  /* check for PUSH_PROMISE */
-  nghttp2_hd_deflate_init(&deflater, mem);
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  open_sent_stream(session, 1);
-
-  rv = pack_push_promise(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, 2,
-                         reqnv, ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  ud.header_cb_called = 0;
-  ud.frame_recv_cb_called = 0;
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_bufs_len(&bufs));
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == rv);
-  CU_ASSERT(0 == ud.header_cb_called);
-  CU_ASSERT(0 == ud.frame_recv_cb_called);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(2 == item->frame.hd.stream_id);
-  CU_ASSERT(NGHTTP2_INTERNAL_ERROR == item->frame.rst_stream.error_code);
-
-  nghttp2_session_del(session);
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_defer_then_close(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider prd;
-  int rv;
-  const uint8_t *datap;
-  ssize_t datalen;
-  nghttp2_frame frame;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  prd.read_callback = defer_data_source_read_callback;
-
-  rv = nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), &prd, NULL);
-  CU_ASSERT(rv > 0);
-
-  /* This sends HEADERS */
-  datalen = nghttp2_session_mem_send(session, &datap);
-
-  CU_ASSERT(datalen > 0);
-
-  /* This makes DATA item deferred */
-  datalen = nghttp2_session_mem_send(session, &datap);
-
-  CU_ASSERT(datalen == 0);
-
-  nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_CANCEL);
-
-  /* Assertion failure; GH-264 */
-  rv = nghttp2_session_on_rst_stream_received(session, &frame);
-
-  CU_ASSERT(rv == 0);
-
-  nghttp2_session_del(session);
-}
-
-static int submit_response_on_stream_close(nghttp2_session *session,
-                                           int32_t stream_id,
-                                           uint32_t error_code,
-                                           void *user_data) {
-  nghttp2_data_provider data_prd;
-  (void)error_code;
-  (void)user_data;
-
-  data_prd.read_callback = temporal_failure_data_source_read_callback;
-
-  // Attempt to submit response or data to the stream being closed
-  switch (stream_id) {
-  case 1:
-    CU_ASSERT(0 == nghttp2_submit_response(session, stream_id, resnv,
-                                           ARRLEN(resnv), &data_prd));
-    break;
-  case 3:
-    CU_ASSERT(0 == nghttp2_submit_data(session, NGHTTP2_FLAG_NONE, stream_id,
-                                       &data_prd));
-    break;
-  }
-
-  return 0;
-}
-
-void test_nghttp2_session_detach_item_from_closed_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_stream_close_callback = submit_response_on_stream_close;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  open_recv_stream(session, 1);
-  open_recv_stream(session, 3);
-
-  nghttp2_session_close_stream(session, 1, NGHTTP2_NO_ERROR);
-  nghttp2_session_close_stream(session, 3, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_flooding(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_bufs bufs;
-  nghttp2_buf *buf;
-  nghttp2_frame frame;
-  nghttp2_mem *mem;
-  size_t i;
-
-  mem = nghttp2_mem_default();
-
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  /* PING ACK */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_NONE, NULL);
-  nghttp2_frame_pack_ping(&bufs, &frame.ping);
-  nghttp2_frame_ping_free(&frame.ping);
-
-  buf = &bufs.head->buf;
-
-  for (i = 0; i < NGHTTP2_MAX_OBQ_FLOOD_ITEM; ++i) {
-    CU_ASSERT(
-        (ssize_t)nghttp2_buf_len(buf) ==
-        nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf)));
-  }
-
-  CU_ASSERT(NGHTTP2_ERR_FLOODED ==
-            nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf)));
-
-  nghttp2_session_del(session);
-
-  /* SETTINGS ACK */
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, NULL, 0);
-  nghttp2_frame_pack_settings(&bufs, &frame.settings);
-  nghttp2_frame_settings_free(&frame.settings, mem);
-
-  buf = &bufs.head->buf;
-
-  for (i = 0; i < NGHTTP2_MAX_OBQ_FLOOD_ITEM; ++i) {
-    CU_ASSERT(
-        (ssize_t)nghttp2_buf_len(buf) ==
-        nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf)));
-  }
-
-  CU_ASSERT(NGHTTP2_ERR_FLOODED ==
-            nghttp2_session_mem_recv(session, buf->pos, nghttp2_buf_len(buf)));
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_change_stream_priority(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream1, *stream2, *stream3, *stream5;
-  nghttp2_priority_spec pri_spec;
-  int rv;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream1 = open_recv_stream(session, 1);
-  stream3 = open_recv_stream_with_dep_weight(session, 3, 199, stream1);
-  stream2 = open_sent_stream_with_dep_weight(session, 2, 101, stream3);
-
-  nghttp2_priority_spec_init(&pri_spec, 1, 256, 0);
-
-  rv = nghttp2_session_change_stream_priority(session, 2, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-
-  CU_ASSERT(stream1 == stream2->dep_prev);
-  CU_ASSERT(256 == stream2->weight);
-
-  /* Cannot change stream which does not exist */
-  rv = nghttp2_session_change_stream_priority(session, 5, &pri_spec);
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* It is an error to depend on itself */
-  rv = nghttp2_session_change_stream_priority(session, 1, &pri_spec);
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* It is an error to change priority of root stream (0) */
-  rv = nghttp2_session_change_stream_priority(session, 0, &pri_spec);
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* Depends on the non-existing idle stream.  This creates that idle
-     stream. */
-  nghttp2_priority_spec_init(&pri_spec, 5, 9, 1);
-
-  rv = nghttp2_session_change_stream_priority(session, 2, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-
-  stream5 = nghttp2_session_get_stream_raw(session, 5);
-
-  CU_ASSERT(NULL != stream5);
-  CU_ASSERT(&session->root == stream5->dep_prev);
-  CU_ASSERT(stream5 == stream2->dep_prev);
-  CU_ASSERT(9 == stream2->weight);
-
-  nghttp2_session_del(session);
-
-  /* Check that this works in client session too */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  stream1 = open_sent_stream(session, 1);
-
-  nghttp2_priority_spec_init(&pri_spec, 5, 9, 1);
-
-  rv = nghttp2_session_change_stream_priority(session, 1, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-
-  stream5 = nghttp2_session_get_stream_raw(session, 5);
-
-  CU_ASSERT(NULL != stream5);
-  CU_ASSERT(&session->root == stream5->dep_prev);
-  CU_ASSERT(stream5 == stream1->dep_prev);
-  CU_ASSERT(9 == stream1->weight);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_create_idle_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_stream *stream2, *stream4, *stream8, *stream10;
-  nghttp2_priority_spec pri_spec;
-  int rv;
-  int i;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  stream2 = open_sent_stream(session, 2);
-
-  nghttp2_priority_spec_init(&pri_spec, 2, 111, 1);
-
-  rv = nghttp2_session_create_idle_stream(session, 4, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-
-  stream4 = nghttp2_session_get_stream_raw(session, 4);
-
-  CU_ASSERT(4 == stream4->stream_id);
-  CU_ASSERT(111 == stream4->weight);
-  CU_ASSERT(stream2 == stream4->dep_prev);
-  CU_ASSERT(stream4 == stream2->dep_next);
-
-  /* If pri_spec->stream_id does not exist, and it is idle stream, it
-     is created too */
-  nghttp2_priority_spec_init(&pri_spec, 8, 109, 0);
-
-  rv = nghttp2_session_create_idle_stream(session, 8, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-
-  stream8 = nghttp2_session_get_stream_raw(session, 8);
-  stream10 = nghttp2_session_get_stream_raw(session, 10);
-
-  CU_ASSERT(8 == stream8->stream_id);
-  CU_ASSERT(109 == stream8->weight);
-  CU_ASSERT(10 == stream10->stream_id);
-  CU_ASSERT(16 == stream10->weight);
-  CU_ASSERT(stream10 == stream8->dep_prev);
-  CU_ASSERT(&session->root == stream10->dep_prev);
-
-  /* It is an error to attempt to create already existing idle
-     stream */
-  rv = nghttp2_session_create_idle_stream(session, 4, &pri_spec);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* It is an error to depend on itself */
-  pri_spec.stream_id = 6;
-
-  rv = nghttp2_session_create_idle_stream(session, 6, &pri_spec);
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* It is an error to create root stream (0) as idle stream */
-  rv = nghttp2_session_create_idle_stream(session, 0, &pri_spec);
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  /* It is an error to create non-idle stream */
-  session->next_stream_id = 20;
-  pri_spec.stream_id = 2;
-
-  rv = nghttp2_session_create_idle_stream(session, 18, &pri_spec);
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT == rv);
-
-  nghttp2_session_del(session);
-
-  /* Check that this works in client session too */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_priority_spec_init(&pri_spec, 4, 99, 1);
-
-  rv = nghttp2_session_create_idle_stream(session, 2, &pri_spec);
-
-  CU_ASSERT(0 == rv);
-
-  stream4 = nghttp2_session_get_stream_raw(session, 4);
-  stream2 = nghttp2_session_get_stream_raw(session, 2);
-
-  CU_ASSERT(NULL != stream4);
-  CU_ASSERT(NULL != stream2);
-  CU_ASSERT(&session->root == stream4->dep_prev);
-  CU_ASSERT(NGHTTP2_DEFAULT_WEIGHT == stream4->weight);
-  CU_ASSERT(stream4 == stream2->dep_prev);
-  CU_ASSERT(99 == stream2->weight);
-
-  nghttp2_session_del(session);
-
-  /* Check that idle stream is reduced when nghttp2_session_send() is
-     called. */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  session->local_settings.max_concurrent_streams = 30;
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 16, 0);
-  for (i = 0; i < 100; ++i) {
-    rv = nghttp2_session_create_idle_stream(session, i * 2 + 1, &pri_spec);
-
-    CU_ASSERT(0 == rv);
-
-    nghttp2_priority_spec_init(&pri_spec, i * 2 + 1, 16, 0);
-  }
-
-  CU_ASSERT(100 == session->num_idle_streams);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(30 == session->num_idle_streams);
-  CU_ASSERT(141 == session->idle_stream_head->stream_id);
-
-  nghttp2_session_del(session);
-
-  /* Check that idle stream is reduced when nghttp2_session_mem_recv() is
-     called. */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  session->local_settings.max_concurrent_streams = 30;
-
-  nghttp2_priority_spec_init(&pri_spec, 0, 16, 0);
-  for (i = 0; i < 100; ++i) {
-    rv = nghttp2_session_create_idle_stream(session, i * 2 + 1, &pri_spec);
-
-    CU_ASSERT(0 == rv);
-
-    nghttp2_priority_spec_init(&pri_spec, i * 2 + 1, 16, 0);
-  }
-
-  CU_ASSERT(100 == session->num_idle_streams);
-  CU_ASSERT(0 == nghttp2_session_mem_recv(session, NULL, 0));
-  CU_ASSERT(30 == session->num_idle_streams);
-  CU_ASSERT(141 == session->idle_stream_head->stream_id);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_repeated_priority_change(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_frame frame;
-  nghttp2_priority_spec pri_spec;
-  int32_t stream_id, last_stream_id;
-  int32_t max_streams = 20;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  session->local_settings.max_concurrent_streams = (uint32_t)max_streams;
-
-  /* 1 -> 0 */
-  nghttp2_priority_spec_init(&pri_spec, 0, 16, 0);
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  nghttp2_frame_priority_free(&frame.priority);
-
-  last_stream_id = max_streams * 2 + 1;
-
-  for (stream_id = 3; stream_id < last_stream_id; stream_id += 2) {
-    /* 1 -> stream_id */
-    nghttp2_priority_spec_init(&pri_spec, stream_id, 16, 0);
-    nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-    CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-    nghttp2_frame_priority_free(&frame.priority);
-  }
-
-  CU_ASSERT(20 == session->num_idle_streams);
-  CU_ASSERT(1 == session->idle_stream_head->stream_id);
-
-  /* 1 -> last_stream_id */
-  nghttp2_priority_spec_init(&pri_spec, last_stream_id, 16, 0);
-  nghttp2_frame_priority_init(&frame.priority, 1, &pri_spec);
-
-  CU_ASSERT(0 == nghttp2_session_on_priority_received(session, &frame));
-
-  nghttp2_frame_priority_free(&frame.priority);
-
-  CU_ASSERT(20 == session->num_idle_streams);
-  CU_ASSERT(3 == session->idle_stream_head->stream_id);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_repeated_priority_submission(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_priority_spec pri_spec;
-  int32_t stream_id, last_stream_id;
-  uint32_t max_streams = NGHTTP2_MIN_IDLE_STREAMS;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  session->local_settings.max_concurrent_streams = max_streams;
-
-  /* 1 -> 0 */
-  nghttp2_priority_spec_init(&pri_spec, 0, 16, 0);
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 1, &pri_spec));
-
-  last_stream_id = (int32_t)(max_streams * 2 + 1);
-
-  for (stream_id = 3; stream_id < last_stream_id; stream_id += 2) {
-    /* 1 -> stream_id */
-    nghttp2_priority_spec_init(&pri_spec, stream_id, 16, 0);
-
-    CU_ASSERT(
-        0 == nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 1, &pri_spec));
-  }
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(max_streams == session->num_idle_streams);
-  CU_ASSERT(1 == session->idle_stream_head->stream_id);
-
-  /* 1 -> last_stream_id */
-  nghttp2_priority_spec_init(&pri_spec, last_stream_id, 16, 0);
-
-  CU_ASSERT(0 ==
-            nghttp2_submit_priority(session, NGHTTP2_FLAG_NONE, 1, &pri_spec));
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(max_streams == session->num_idle_streams);
-  CU_ASSERT(3 == session->idle_stream_head->stream_id);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_set_local_window_size(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_outbound_item *item;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-  stream = open_sent_stream(session, 1);
-  stream->recv_window_size = 4096;
-
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 1, 65536));
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1 ==
-            stream->local_window_size);
-  CU_ASSERT(4096 == stream->recv_window_size);
-  CU_ASSERT(65536 - 4096 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(1 == item->frame.window_update.hd.stream_id);
-  CU_ASSERT(1 == item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Go decrement part */
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 1, 32768));
-  CU_ASSERT(32768 == stream->local_window_size);
-  CU_ASSERT(-28672 == stream->recv_window_size);
-  CU_ASSERT(32768 == stream->recv_reduction);
-  CU_ASSERT(65536 - 4096 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(item == NULL);
-
-  /* Increase local window size */
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 1, 49152));
-  CU_ASSERT(49152 == stream->local_window_size);
-  CU_ASSERT(-12288 == stream->recv_window_size);
-  CU_ASSERT(16384 == stream->recv_reduction);
-  CU_ASSERT(65536 - 4096 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  /* Increase local window again */
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 1, 65537));
-  CU_ASSERT(65537 == stream->local_window_size);
-  CU_ASSERT(4096 == stream->recv_window_size);
-  CU_ASSERT(0 == stream->recv_reduction);
-  CU_ASSERT(65537 - 4096 ==
-            nghttp2_session_get_stream_local_window_size(session, 1));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(1 == item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Check connection-level flow control */
-  session->recv_window_size = 4096;
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 0, 65536));
-  CU_ASSERT(NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE + 1 ==
-            session->local_window_size);
-  CU_ASSERT(4096 == session->recv_window_size);
-  CU_ASSERT(65536 - 4096 == nghttp2_session_get_local_window_size(session));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_WINDOW_UPDATE == item->frame.hd.type);
-  CU_ASSERT(0 == item->frame.window_update.hd.stream_id);
-  CU_ASSERT(1 == item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  /* Go decrement part */
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 0, 32768));
-  CU_ASSERT(32768 == session->local_window_size);
-  CU_ASSERT(-28672 == session->recv_window_size);
-  CU_ASSERT(32768 == session->recv_reduction);
-  CU_ASSERT(65536 - 4096 == nghttp2_session_get_local_window_size(session));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(item == NULL);
-
-  /* Increase local window size */
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 0, 49152));
-  CU_ASSERT(49152 == session->local_window_size);
-  CU_ASSERT(-12288 == session->recv_window_size);
-  CU_ASSERT(16384 == session->recv_reduction);
-  CU_ASSERT(65536 - 4096 == nghttp2_session_get_local_window_size(session));
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  /* Increase local window again */
-  CU_ASSERT(0 == nghttp2_session_set_local_window_size(
-                     session, NGHTTP2_FLAG_NONE, 0, 65537));
-  CU_ASSERT(65537 == session->local_window_size);
-  CU_ASSERT(4096 == session->recv_window_size);
-  CU_ASSERT(0 == session->recv_reduction);
-  CU_ASSERT(65537 - 4096 == nghttp2_session_get_local_window_size(session));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(1 == item->frame.window_update.window_size_increment);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_cancel_from_before_frame_send(void) {
-  int rv;
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  my_user_data ud;
-  nghttp2_settings_entry iv;
-  nghttp2_data_provider data_prd;
-  int32_t stream_id;
-  nghttp2_stream *stream;
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  callbacks.before_frame_send_callback = cancel_before_frame_send_callback;
-  callbacks.on_frame_not_send_callback = on_frame_not_send_callback;
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  iv.settings_id = 0;
-  iv.value = 1000000009;
-
-  rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
-
-  CU_ASSERT(0 == rv);
-
-  ud.frame_send_cb_called = 0;
-  ud.before_frame_send_cb_called = 0;
-  ud.frame_not_send_cb_called = 0;
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-  CU_ASSERT(1 == ud.before_frame_send_cb_called);
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-
-  data_prd.source.ptr = NULL;
-  data_prd.read_callback = temporal_failure_data_source_read_callback;
-
-  stream_id = nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv),
-                                     &data_prd, NULL);
-
-  CU_ASSERT(stream_id > 0);
-
-  ud.frame_send_cb_called = 0;
-  ud.before_frame_send_cb_called = 0;
-  ud.frame_not_send_cb_called = 0;
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-  CU_ASSERT(1 == ud.before_frame_send_cb_called);
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-
-  stream = nghttp2_session_get_stream_raw(session, stream_id);
-
-  CU_ASSERT(NULL == stream);
-
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  open_recv_stream(session, 1);
-
-  stream_id = nghttp2_submit_push_promise(session, NGHTTP2_FLAG_NONE, 1, reqnv,
-                                          ARRLEN(reqnv), NULL);
-
-  CU_ASSERT(stream_id > 0);
-
-  ud.frame_send_cb_called = 0;
-  ud.before_frame_send_cb_called = 0;
-  ud.frame_not_send_cb_called = 0;
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-  CU_ASSERT(1 == ud.before_frame_send_cb_called);
-  CU_ASSERT(1 == ud.frame_not_send_cb_called);
-
-  stream = nghttp2_session_get_stream_raw(session, stream_id);
-
-  CU_ASSERT(NULL == stream);
-
-  nghttp2_session_del(session);
-}
-
-static void
-prepare_session_removed_closed_stream(nghttp2_session *session,
-                                      nghttp2_hd_deflater *deflater) {
-  int rv;
-  nghttp2_settings_entry iv;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  ssize_t nread;
-  int i;
-  nghttp2_stream *stream;
-  nghttp2_frame_hd hd;
-
-  mem = nghttp2_mem_default();
-
-  frame_pack_bufs_init(&bufs);
-
-  iv.settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  iv.value = 2;
-
-  rv = nghttp2_submit_settings(session, NGHTTP2_FLAG_NONE, &iv, 1);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_send(session);
-
-  CU_ASSERT(0 == rv);
-
-  for (i = 1; i <= 3; i += 2) {
-    rv = pack_headers(&bufs, deflater, i,
-                      NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM, reqnv,
-                      ARRLEN(reqnv), mem);
-
-    CU_ASSERT(0 == rv);
-
-    nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                     nghttp2_bufs_len(&bufs));
-
-    CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-
-    nghttp2_bufs_reset(&bufs);
-  }
-
-  nghttp2_session_close_stream(session, 3, NGHTTP2_NO_ERROR);
-
-  rv = pack_headers(&bufs, deflater, 5,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM, reqnv,
-                    ARRLEN(reqnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  /* Receiving stream 5 will erase stream 3 from closed stream list */
-  nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                   nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-
-  stream = nghttp2_session_get_stream_raw(session, 3);
-
-  CU_ASSERT(NULL == stream);
-
-  /* Since the current max concurrent streams is
-     NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS, receiving frame on stream
-     3 is ignored. */
-  nghttp2_bufs_reset(&bufs);
-  rv = pack_headers(&bufs, deflater, 3,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    trailernv, ARRLEN(trailernv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                   nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_DATA, NGHTTP2_FLAG_NONE, 3);
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN;
-
-  nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                   nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  /* Now server receives SETTINGS ACK */
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_SETTINGS, NGHTTP2_FLAG_ACK, 0);
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN;
-
-  nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                   nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_session_removed_closed_stream(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  int rv;
-  nghttp2_hd_deflater deflater;
-  nghttp2_bufs bufs;
-  nghttp2_mem *mem;
-  ssize_t nread;
-  nghttp2_frame_hd hd;
-  nghttp2_outbound_item *item;
-
-  mem = nghttp2_mem_default();
-
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(callbacks));
-
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  /* Now local max concurrent streams is still unlimited, pending max
-     concurrent streams is now 2. */
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  prepare_session_removed_closed_stream(session, &deflater);
-
-  /* Now current max concurrent streams is 2.  Receiving frame on
-     stream 3 is ignored because we have no stream object for stream
-     3. */
-  nghttp2_bufs_reset(&bufs);
-  rv = pack_headers(&bufs, &deflater, 3,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    trailernv, ARRLEN(trailernv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                   nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL == item);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-  nghttp2_hd_deflate_init(&deflater, mem);
-  /* Same setup, and then receive DATA instead of HEADERS */
-
-  prepare_session_removed_closed_stream(session, &deflater);
-
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_DATA, NGHTTP2_FLAG_NONE, 3);
-  nghttp2_bufs_reset(&bufs);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN;
-
-  nread = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                   nghttp2_bufs_len(&bufs));
-
-  CU_ASSERT((ssize_t)nghttp2_bufs_len(&bufs) == nread);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL == item);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-static ssize_t pause_once_data_source_read_callback(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t len,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data) {
-  my_user_data *ud = user_data;
-  if (ud->data_source_read_cb_paused == 0) {
-    ++ud->data_source_read_cb_paused;
-    return NGHTTP2_ERR_PAUSE;
-  }
-
-  return fixed_length_data_source_read_callback(session, stream_id, buf, len,
-                                                data_flags, source, user_data);
-}
-
-void test_nghttp2_session_pause_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_data_provider data_prd;
-  my_user_data ud;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_send_callback = on_frame_send_callback;
-
-  data_prd.read_callback = pause_once_data_source_read_callback;
-  ud.data_source_length = NGHTTP2_DATA_PAYLOADLEN;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  open_recv_stream(session, 1);
-
-  CU_ASSERT(
-      0 == nghttp2_submit_data(session, NGHTTP2_FLAG_END_STREAM, 1, &data_prd));
-
-  ud.frame_send_cb_called = 0;
-  ud.data_source_read_cb_paused = 0;
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(0 == ud.frame_send_cb_called);
-  CU_ASSERT(NULL == session->aob.item);
-  CU_ASSERT(0 == nghttp2_session_send(session));
-  CU_ASSERT(1 == ud.frame_send_cb_called);
-  CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_session_no_closed_streams(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_option *option;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  nghttp2_option_new(&option);
-  nghttp2_option_set_no_closed_streams(option, 1);
-
-  nghttp2_session_server_new2(&session, &callbacks, NULL, option);
-
-  open_recv_stream(session, 1);
-
-  nghttp2_session_close_stream(session, 1, NGHTTP2_NO_ERROR);
-
-  CU_ASSERT(0 == session->num_closed_streams);
-
-  nghttp2_session_del(session);
-  nghttp2_option_del(option);
-}
-
-void test_nghttp2_session_set_stream_user_data(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  int32_t stream_id;
-  int user_data1, user_data2;
-  int rv;
-  const uint8_t *datap;
-  ssize_t datalen;
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  stream_id = nghttp2_submit_request(session, NULL, reqnv, ARRLEN(reqnv), NULL,
-                                     &user_data1);
-
-  rv = nghttp2_session_set_stream_user_data(session, stream_id, &user_data2);
-
-  CU_ASSERT(0 == rv);
-
-  datalen = nghttp2_session_mem_send(session, &datap);
-
-  CU_ASSERT(datalen > 0);
-
-  CU_ASSERT(&user_data2 ==
-            nghttp2_session_get_stream_user_data(session, stream_id));
-
-  CU_ASSERT(NGHTTP2_ERR_INVALID_ARGUMENT ==
-            nghttp2_session_set_stream_user_data(session, 2, NULL));
-
-  nghttp2_session_del(session);
-}
-
-static void check_nghttp2_http_recv_headers_fail(
-    nghttp2_session *session, nghttp2_hd_deflater *deflater, int32_t stream_id,
-    int stream_state, const nghttp2_nv *nva, size_t nvlen) {
-  nghttp2_mem *mem;
-  ssize_t rv;
-  nghttp2_outbound_item *item;
-  nghttp2_bufs bufs;
-  my_user_data *ud;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  ud = session->user_data;
-
-  if (stream_state != -1) {
-    if (nghttp2_session_is_my_stream_id(session, stream_id)) {
-      open_sent_stream2(session, stream_id, (nghttp2_stream_state)stream_state);
-    } else {
-      open_recv_stream2(session, stream_id, (nghttp2_stream_state)stream_state);
-    }
-  }
-
-  rv = pack_headers(&bufs, deflater, stream_id, NGHTTP2_FLAG_END_HEADERS, nva,
-                    nvlen, mem);
-  CU_ASSERT(0 == rv);
-
-  ud->invalid_frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(1 == ud->invalid_frame_recv_cb_called);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_free(&bufs);
-}
-
-static void check_nghttp2_http_recv_headers_ok(
-    nghttp2_session *session, nghttp2_hd_deflater *deflater, int32_t stream_id,
-    int stream_state, const nghttp2_nv *nva, size_t nvlen) {
-  nghttp2_mem *mem;
-  ssize_t rv;
-  nghttp2_bufs bufs;
-  my_user_data *ud;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  ud = session->user_data;
-
-  if (stream_state != -1) {
-    if (nghttp2_session_is_my_stream_id(session, stream_id)) {
-      open_sent_stream2(session, stream_id, (nghttp2_stream_state)stream_state);
-    } else {
-      open_recv_stream2(session, stream_id, (nghttp2_stream_state)stream_state);
-    }
-  }
-
-  rv = pack_headers(&bufs, deflater, stream_id, NGHTTP2_FLAG_END_HEADERS, nva,
-                    nvlen, mem);
-  CU_ASSERT(0 == rv);
-
-  ud->frame_recv_cb_called = 0;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-  CU_ASSERT(1 == ud->frame_recv_cb_called);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_mandatory_headers(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  my_user_data ud;
-  /* test case for response */
-  const nghttp2_nv nostatus_resnv[] = {MAKE_NV("server", "foo")};
-  const nghttp2_nv dupstatus_resnv[] = {MAKE_NV(":status", "200"),
-                                        MAKE_NV(":status", "200")};
-  const nghttp2_nv badpseudo_resnv[] = {MAKE_NV(":status", "200"),
-                                        MAKE_NV(":scheme", "https")};
-  const nghttp2_nv latepseudo_resnv[] = {MAKE_NV("server", "foo"),
-                                         MAKE_NV(":status", "200")};
-  const nghttp2_nv badstatus_resnv[] = {MAKE_NV(":status", "2000")};
-  const nghttp2_nv badcl_resnv[] = {MAKE_NV(":status", "200"),
-                                    MAKE_NV("content-length", "-1")};
-  const nghttp2_nv dupcl_resnv[] = {MAKE_NV(":status", "200"),
-                                    MAKE_NV("content-length", "0"),
-                                    MAKE_NV("content-length", "0")};
-  const nghttp2_nv badhd_resnv[] = {MAKE_NV(":status", "200"),
-                                    MAKE_NV("connection", "close")};
-  const nghttp2_nv cl1xx_resnv[] = {MAKE_NV(":status", "100"),
-                                    MAKE_NV("content-length", "0")};
-  const nghttp2_nv cl204_resnv[] = {MAKE_NV(":status", "204"),
-                                    MAKE_NV("content-length", "0")};
-  const nghttp2_nv clnonzero204_resnv[] = {MAKE_NV(":status", "204"),
-                                           MAKE_NV("content-length", "100")};
-  const nghttp2_nv status101_resnv[] = {MAKE_NV(":status", "101")};
-
-  /* test case for request */
-  const nghttp2_nv nopath_reqnv[] = {MAKE_NV(":scheme", "https"),
-                                     MAKE_NV(":method", "GET"),
-                                     MAKE_NV(":authority", "localhost")};
-  const nghttp2_nv earlyconnect_reqnv[] = {
-      MAKE_NV(":method", "CONNECT"), MAKE_NV(":scheme", "https"),
-      MAKE_NV(":path", "/"), MAKE_NV(":authority", "localhost")};
-  const nghttp2_nv lateconnect_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":path", "/"),
-      MAKE_NV(":method", "CONNECT"), MAKE_NV(":authority", "localhost")};
-  const nghttp2_nv duppath_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":method", "GET"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":path", "/"),
-      MAKE_NV(":path", "/")};
-  const nghttp2_nv badcl_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":method", "POST"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":path", "/"),
-      MAKE_NV("content-length", "-1")};
-  const nghttp2_nv dupcl_reqnv[] = {
-      MAKE_NV(":scheme", "https"),        MAKE_NV(":method", "POST"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":path", "/"),
-      MAKE_NV("content-length", "0"),     MAKE_NV("content-length", "0")};
-  const nghttp2_nv badhd_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":method", "GET"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":path", "/"),
-      MAKE_NV("connection", "close")};
-  const nghttp2_nv badauthority_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":method", "GET"),
-      MAKE_NV(":authority", "\x0d\x0alocalhost"), MAKE_NV(":path", "/")};
-  const nghttp2_nv badhdbtw_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":method", "GET"),
-      MAKE_NV("foo", "\x0d\x0a"), MAKE_NV(":authority", "localhost"),
-      MAKE_NV(":path", "/")};
-  const nghttp2_nv asteriskget1_reqnv[] = {
-      MAKE_NV(":path", "*"), MAKE_NV(":scheme", "https"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":method", "GET")};
-  const nghttp2_nv asteriskget2_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "localhost"),
-      MAKE_NV(":method", "GET"), MAKE_NV(":path", "*")};
-  const nghttp2_nv asteriskoptions1_reqnv[] = {
-      MAKE_NV(":path", "*"), MAKE_NV(":scheme", "https"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":method", "OPTIONS")};
-  const nghttp2_nv asteriskoptions2_reqnv[] = {
-      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "localhost"),
-      MAKE_NV(":method", "OPTIONS"), MAKE_NV(":path", "*")};
-
-  mem = nghttp2_mem_default();
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* response header lacks :status */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 1,
-                                       NGHTTP2_STREAM_OPENING, nostatus_resnv,
-                                       ARRLEN(nostatus_resnv));
-
-  /* response header has 2 :status */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 3,
-                                       NGHTTP2_STREAM_OPENING, dupstatus_resnv,
-                                       ARRLEN(dupstatus_resnv));
-
-  /* response header has bad pseudo header :scheme */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 5,
-                                       NGHTTP2_STREAM_OPENING, badpseudo_resnv,
-                                       ARRLEN(badpseudo_resnv));
-
-  /* response header has :status after regular header field */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 7,
-                                       NGHTTP2_STREAM_OPENING, latepseudo_resnv,
-                                       ARRLEN(latepseudo_resnv));
-
-  /* response header has bad status code */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 9,
-                                       NGHTTP2_STREAM_OPENING, badstatus_resnv,
-                                       ARRLEN(badstatus_resnv));
-
-  /* response header has bad content-length */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 11,
-                                       NGHTTP2_STREAM_OPENING, badcl_resnv,
-                                       ARRLEN(badcl_resnv));
-
-  /* response header has multiple content-length */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 13,
-                                       NGHTTP2_STREAM_OPENING, dupcl_resnv,
-                                       ARRLEN(dupcl_resnv));
-
-  /* response header has disallowed header field */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 15,
-                                       NGHTTP2_STREAM_OPENING, badhd_resnv,
-                                       ARRLEN(badhd_resnv));
-
-  /* response header has content-length with 100 status code */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 17,
-                                       NGHTTP2_STREAM_OPENING, cl1xx_resnv,
-                                       ARRLEN(cl1xx_resnv));
-
-  /* response header has 0 content-length with 204 status code */
-  check_nghttp2_http_recv_headers_ok(session, &deflater, 19,
-                                     NGHTTP2_STREAM_OPENING, cl204_resnv,
-                                     ARRLEN(cl204_resnv));
-
-  /* response header has nonzero content-length with 204 status
-     code */
-  check_nghttp2_http_recv_headers_fail(
-      session, &deflater, 21, NGHTTP2_STREAM_OPENING, clnonzero204_resnv,
-      ARRLEN(clnonzero204_resnv));
-
-  /* status code 101 should not be used in HTTP/2 because it is used
-     for HTTP Upgrade which HTTP/2 removes. */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 23,
-                                       NGHTTP2_STREAM_OPENING, status101_resnv,
-                                       ARRLEN(status101_resnv));
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  /* check server side */
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* request header has no :path */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 1, -1, nopath_reqnv,
-                                       ARRLEN(nopath_reqnv));
-
-  /* request header has CONNECT method, but followed by :path */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 3, -1,
-                                       earlyconnect_reqnv,
-                                       ARRLEN(earlyconnect_reqnv));
-
-  /* request header has CONNECT method following :path */
-  check_nghttp2_http_recv_headers_fail(
-      session, &deflater, 5, -1, lateconnect_reqnv, ARRLEN(lateconnect_reqnv));
-
-  /* request header has multiple :path */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 7, -1, duppath_reqnv,
-                                       ARRLEN(duppath_reqnv));
-
-  /* request header has bad content-length */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 9, -1, badcl_reqnv,
-                                       ARRLEN(badcl_reqnv));
-
-  /* request header has multiple content-length */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 11, -1, dupcl_reqnv,
-                                       ARRLEN(dupcl_reqnv));
-
-  /* request header has disallowed header field */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 13, -1, badhd_reqnv,
-                                       ARRLEN(badhd_reqnv));
-
-  /* request header has :authority header field containing illegal
-     characters */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 15, -1,
-                                       badauthority_reqnv,
-                                       ARRLEN(badauthority_reqnv));
-
-  /* request header has regular header field containing illegal
-     character before all mandatory header fields are seen. */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 17, -1,
-                                       badhdbtw_reqnv, ARRLEN(badhdbtw_reqnv));
-
-  /* request header has "*" in :path header field while method is GET.
-     :path is received before :method */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 19, -1,
-                                       asteriskget1_reqnv,
-                                       ARRLEN(asteriskget1_reqnv));
-
-  /* request header has "*" in :path header field while method is GET.
-     :method is received before :path */
-  check_nghttp2_http_recv_headers_fail(session, &deflater, 21, -1,
-                                       asteriskget2_reqnv,
-                                       ARRLEN(asteriskget2_reqnv));
-
-  /* OPTIONS method can include "*" in :path header field.  :path is
-     received before :method. */
-  check_nghttp2_http_recv_headers_ok(session, &deflater, 23, -1,
-                                     asteriskoptions1_reqnv,
-                                     ARRLEN(asteriskoptions1_reqnv));
-
-  /* OPTIONS method can include "*" in :path header field.  :method is
-     received before :path. */
-  check_nghttp2_http_recv_headers_ok(session, &deflater, 25, -1,
-                                     asteriskoptions2_reqnv,
-                                     ARRLEN(asteriskoptions2_reqnv));
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-}
-
-void test_nghttp2_http_content_length(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  nghttp2_stream *stream;
-  const nghttp2_nv cl_resnv[] = {MAKE_NV(":status", "200"),
-                                 MAKE_NV("te", "trailers"),
-                                 MAKE_NV("content-length", "9000000000")};
-  const nghttp2_nv cl_reqnv[] = {
-      MAKE_NV(":path", "/"),        MAKE_NV(":method", "PUT"),
-      MAKE_NV(":scheme", "https"),  MAKE_NV("te", "trailers"),
-      MAKE_NV("host", "localhost"), MAKE_NV("content-length", "9000000000")};
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  stream = open_sent_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, cl_resnv,
-                    ARRLEN(cl_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-  CU_ASSERT(9000000000LL == stream->content_length);
-  CU_ASSERT(200 == stream->status_code);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* check server side */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, cl_reqnv,
-                    ARRLEN(cl_reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-  CU_ASSERT(9000000000LL == stream->content_length);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_content_length_mismatch(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  const nghttp2_nv cl_reqnv[] = {
-      MAKE_NV(":path", "/"), MAKE_NV(":method", "PUT"),
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":scheme", "https"),
-      MAKE_NV("content-length", "20")};
-  nghttp2_outbound_item *item;
-  nghttp2_frame_hd hd;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* header says content-length: 20, but HEADERS has END_STREAM flag set */
-  rv = pack_headers(&bufs, &deflater, 1,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    cl_reqnv, ARRLEN(cl_reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* header says content-length: 20, but DATA has 0 byte */
-  rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS, cl_reqnv,
-                    ARRLEN(cl_reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_DATA, NGHTTP2_FLAG_END_STREAM, 3);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* header says content-length: 20, but DATA has 21 bytes */
-  rv = pack_headers(&bufs, &deflater, 5, NGHTTP2_FLAG_END_HEADERS, cl_reqnv,
-                    ARRLEN(cl_reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_hd_init(&hd, 21, NGHTTP2_DATA, NGHTTP2_FLAG_END_STREAM, 5);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN + 21;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_non_final_response(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  const nghttp2_nv nonfinal_resnv[] = {
-      MAKE_NV(":status", "100"),
-  };
-  nghttp2_outbound_item *item;
-  nghttp2_frame_hd hd;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* non-final HEADERS with END_STREAM is illegal */
-  open_sent_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 1,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* non-final HEADERS followed by non-empty DATA is illegal */
-  open_sent_stream2(session, 3, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS,
-                    nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_hd_init(&hd, 10, NGHTTP2_DATA, NGHTTP2_FLAG_END_STREAM, 3);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN + 10;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* non-final HEADERS followed by empty DATA (without END_STREAM) is
-     ok */
-  open_sent_stream2(session, 5, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 5, NGHTTP2_FLAG_END_HEADERS,
-                    nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_DATA, NGHTTP2_FLAG_NONE, 5);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* non-final HEADERS followed by empty DATA (with END_STREAM) is
-     illegal */
-  open_sent_stream2(session, 7, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 7, NGHTTP2_FLAG_END_HEADERS,
-                    nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  nghttp2_frame_hd_init(&hd, 0, NGHTTP2_DATA, NGHTTP2_FLAG_END_STREAM, 7);
-  nghttp2_frame_pack_frame_hd(bufs.head->buf.last, &hd);
-  bufs.head->buf.last += NGHTTP2_FRAME_HDLEN;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* non-final HEADERS followed by final HEADERS is OK */
-  open_sent_stream2(session, 9, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 9, NGHTTP2_FLAG_END_HEADERS,
-                    nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  nghttp2_bufs_reset(&bufs);
-
-  rv = pack_headers(&bufs, &deflater, 9, NGHTTP2_FLAG_END_HEADERS, resnv,
-                    ARRLEN(resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_trailer_headers(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  const nghttp2_nv trailer_reqnv[] = {
-      MAKE_NV("foo", "bar"),
-  };
-  nghttp2_outbound_item *item;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* good trailer header */
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, reqnv,
-                    ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  nghttp2_bufs_reset(&bufs);
-
-  rv = pack_headers(&bufs, &deflater, 1,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    trailer_reqnv, ARRLEN(trailer_reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* trailer header without END_STREAM is illegal */
-  rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS, reqnv,
-                    ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  nghttp2_bufs_reset(&bufs);
-
-  rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS,
-                    trailer_reqnv, ARRLEN(trailer_reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* trailer header including pseudo header field is illegal */
-  rv = pack_headers(&bufs, &deflater, 5, NGHTTP2_FLAG_END_HEADERS, reqnv,
-                    ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  nghttp2_bufs_reset(&bufs);
-
-  rv = pack_headers(&bufs, &deflater, 5, NGHTTP2_FLAG_END_HEADERS, reqnv,
-                    ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  nghttp2_session_del(session);
-
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_ignore_regular_header(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  my_user_data ud;
-  const nghttp2_nv bad_reqnv[] = {
-      MAKE_NV(":authority", "localhost"),
-      MAKE_NV(":scheme", "https"),
-      MAKE_NV(":path", "/"),
-      MAKE_NV(":method", "GET"),
-      MAKE_NV("foo", "\x0zzz"),
-      MAKE_NV("bar", "buzz"),
-  };
-  const nghttp2_nv bad_ansnv[] = {
-      MAKE_NV(":authority", "localhost"), MAKE_NV(":scheme", "https"),
-      MAKE_NV(":path", "/"), MAKE_NV(":method", "GET"), MAKE_NV("bar", "buzz")};
-  size_t proclen;
-  size_t i;
-  nghttp2_outbound_item *item;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-  callbacks.on_header_callback = pause_on_header_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  rv = pack_headers(&bufs, &deflater, 1,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    bad_reqnv, ARRLEN(bad_reqnv), mem);
-
-  CU_ASSERT_FATAL(0 == rv);
-
-  nghttp2_hd_deflate_free(&deflater);
-
-  proclen = 0;
-
-  for (i = 0; i < 4; ++i) {
-    rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos + proclen,
-                                  nghttp2_buf_len(&bufs.head->buf) - proclen);
-    CU_ASSERT_FATAL(rv > 0);
-    proclen += (size_t)rv;
-    CU_ASSERT(nghttp2_nv_equal(&bad_ansnv[i], &ud.nv));
-  }
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos + proclen,
-                                nghttp2_buf_len(&bufs.head->buf) - proclen);
-  CU_ASSERT_FATAL(rv > 0);
-  /* Without on_invalid_frame_recv_callback, bad header causes stream
-     reset */
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-
-  proclen += (size_t)rv;
-
-  CU_ASSERT(nghttp2_buf_len(&bufs.head->buf) == proclen);
-
-  nghttp2_session_del(session);
-
-  /* use on_invalid_header_callback */
-  callbacks.on_invalid_header_callback = pause_on_invalid_header_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  proclen = 0;
-
-  ud.invalid_header_cb_called = 0;
-
-  for (i = 0; i < 4; ++i) {
-    rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos + proclen,
-                                  nghttp2_buf_len(&bufs.head->buf) - proclen);
-    CU_ASSERT_FATAL(rv > 0);
-    proclen += (size_t)rv;
-    CU_ASSERT(nghttp2_nv_equal(&bad_ansnv[i], &ud.nv));
-  }
-
-  CU_ASSERT(0 == ud.invalid_header_cb_called);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos + proclen,
-                                nghttp2_buf_len(&bufs.head->buf) - proclen);
-
-  CU_ASSERT_FATAL(rv > 0);
-  CU_ASSERT(1 == ud.invalid_header_cb_called);
-  CU_ASSERT(nghttp2_nv_equal(&bad_reqnv[4], &ud.nv));
-
-  proclen += (size_t)rv;
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos + proclen,
-                                nghttp2_buf_len(&bufs.head->buf) - proclen);
-
-  CU_ASSERT(rv > 0);
-  CU_ASSERT(nghttp2_nv_equal(&bad_ansnv[4], &ud.nv));
-
-  nghttp2_session_del(session);
-
-  /* make sure that we can reset stream from
-     on_invalid_header_callback */
-  callbacks.on_header_callback = on_header_callback;
-  callbacks.on_invalid_header_callback = reset_on_invalid_header_callback;
-
-  nghttp2_session_server_new(&session, &callbacks, &ud);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT(rv == (ssize_t)nghttp2_buf_len(&bufs.head->buf));
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(1 == item->frame.hd.stream_id);
-
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_ignore_content_length(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  const nghttp2_nv cl_resnv[] = {MAKE_NV(":status", "304"),
-                                 MAKE_NV("content-length", "20")};
-  const nghttp2_nv conn_reqnv[] = {MAKE_NV(":authority", "localhost"),
-                                   MAKE_NV(":method", "CONNECT"),
-                                   MAKE_NV("content-length", "999999")};
-  nghttp2_stream *stream;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  /* If status 304, content-length must be ignored */
-  open_sent_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_headers(&bufs, &deflater, 1,
-                    NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
-                    cl_resnv, ARRLEN(cl_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-
-  /* If request method is CONNECT, content-length must be ignored */
-  nghttp2_session_server_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, conn_reqnv,
-                    ARRLEN(conn_reqnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(-1 == stream->content_length);
-  CU_ASSERT((stream->http_flags & NGHTTP2_HTTP_FLAG_METH_CONNECT) > 0);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_record_request_method(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  const nghttp2_nv conn_reqnv[] = {MAKE_NV(":method", "CONNECT"),
-                                   MAKE_NV(":authority", "localhost")};
-  const nghttp2_nv conn_resnv[] = {MAKE_NV(":status", "200"),
-                                   MAKE_NV("content-length", "9999")};
-  nghttp2_stream *stream;
-  ssize_t rv;
-  nghttp2_bufs bufs;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_outbound_item *item;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  CU_ASSERT(1 == nghttp2_submit_request(session, NULL, conn_reqnv,
-                                        ARRLEN(conn_reqnv), NULL, NULL));
-
-  CU_ASSERT(0 == nghttp2_session_send(session));
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(NGHTTP2_HTTP_FLAG_METH_CONNECT == stream->http_flags);
-
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, conn_resnv,
-                    ARRLEN(conn_resnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT((NGHTTP2_HTTP_FLAG_METH_CONNECT & stream->http_flags) > 0);
-  CU_ASSERT(-1 == stream->content_length);
-
-  /* content-length is now allowed in 200 response to a CONNECT
-     request */
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NULL != item);
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(NGHTTP2_PROTOCOL_ERROR == item->frame.rst_stream.error_code);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_push_promise(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  nghttp2_bufs bufs;
-  ssize_t rv;
-  nghttp2_stream *stream;
-  const nghttp2_nv bad_reqnv[] = {MAKE_NV(":method", "GET")};
-  nghttp2_outbound_item *item;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  /* good PUSH_PROMISE case */
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  open_sent_stream2(session, 1, NGHTTP2_STREAM_OPENING);
-
-  rv = pack_push_promise(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, 2,
-                         reqnv, ARRLEN(reqnv), mem);
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  stream = nghttp2_session_get_stream(session, 2);
-  CU_ASSERT(NULL != stream);
-
-  nghttp2_bufs_reset(&bufs);
-
-  rv = pack_headers(&bufs, &deflater, 2, NGHTTP2_FLAG_END_HEADERS, resnv,
-                    ARRLEN(resnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  CU_ASSERT(NULL == nghttp2_session_get_next_ob_item(session));
-
-  CU_ASSERT(200 == stream->status_code);
-
-  nghttp2_bufs_reset(&bufs);
-
-  /* PUSH_PROMISE lacks mandatory header */
-  rv = pack_push_promise(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, 4,
-                         bad_reqnv, ARRLEN(bad_reqnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  item = nghttp2_session_get_next_ob_item(session);
-
-  CU_ASSERT(NGHTTP2_RST_STREAM == item->frame.hd.type);
-  CU_ASSERT(4 == item->frame.hd.stream_id);
-
-  nghttp2_bufs_reset(&bufs);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
-
-void test_nghttp2_http_head_method_upgrade_workaround(void) {
-  nghttp2_session *session;
-  nghttp2_session_callbacks callbacks;
-  const nghttp2_nv cl_resnv[] = {MAKE_NV(":status", "200"),
-                                 MAKE_NV("content-length", "1000000007")};
-  nghttp2_bufs bufs;
-  nghttp2_hd_deflater deflater;
-  nghttp2_mem *mem;
-  ssize_t rv;
-  nghttp2_stream *stream;
-
-  mem = nghttp2_mem_default();
-  frame_pack_bufs_init(&bufs);
-
-  memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks.send_callback = null_send_callback;
-
-  nghttp2_session_client_new(&session, &callbacks, NULL);
-
-  nghttp2_hd_deflate_init(&deflater, mem);
-
-  nghttp2_session_upgrade(session, NULL, 0, NULL);
-
-  rv = pack_headers(&bufs, &deflater, 1, NGHTTP2_FLAG_END_HEADERS, cl_resnv,
-                    ARRLEN(cl_resnv), mem);
-
-  CU_ASSERT(0 == rv);
-
-  rv = nghttp2_session_mem_recv(session, bufs.head->buf.pos,
-                                nghttp2_buf_len(&bufs.head->buf));
-
-  CU_ASSERT((ssize_t)nghttp2_buf_len(&bufs.head->buf) == rv);
-
-  stream = nghttp2_session_get_stream(session, 1);
-
-  CU_ASSERT(-1 == stream->content_length);
-
-  nghttp2_hd_deflate_free(&deflater);
-  nghttp2_session_del(session);
-  nghttp2_bufs_free(&bufs);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_session_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_SESSION_TEST_H
-#define NGHTTP2_SESSION_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-void test_nghttp2_session_recv(void);
-void test_nghttp2_session_recv_invalid_stream_id(void);
-void test_nghttp2_session_recv_invalid_frame(void);
-void test_nghttp2_session_recv_eof(void);
-void test_nghttp2_session_recv_data(void);
-void test_nghttp2_session_recv_data_no_auto_flow_control(void);
-void test_nghttp2_session_recv_continuation(void);
-void test_nghttp2_session_recv_headers_with_priority(void);
-void test_nghttp2_session_recv_headers_with_padding(void);
-void test_nghttp2_session_recv_headers_early_response(void);
-void test_nghttp2_session_server_recv_push_response(void);
-void test_nghttp2_session_recv_premature_headers(void);
-void test_nghttp2_session_recv_unknown_frame(void);
-void test_nghttp2_session_recv_unexpected_continuation(void);
-void test_nghttp2_session_recv_settings_header_table_size(void);
-void test_nghttp2_session_recv_too_large_frame_length(void);
-void test_nghttp2_session_recv_extension(void);
-void test_nghttp2_session_recv_altsvc(void);
-void test_nghttp2_session_recv_origin(void);
-void test_nghttp2_session_continue(void);
-void test_nghttp2_session_add_frame(void);
-void test_nghttp2_session_on_request_headers_received(void);
-void test_nghttp2_session_on_response_headers_received(void);
-void test_nghttp2_session_on_headers_received(void);
-void test_nghttp2_session_on_push_response_headers_received(void);
-void test_nghttp2_session_on_priority_received(void);
-void test_nghttp2_session_on_rst_stream_received(void);
-void test_nghttp2_session_on_settings_received(void);
-void test_nghttp2_session_on_push_promise_received(void);
-void test_nghttp2_session_on_ping_received(void);
-void test_nghttp2_session_on_goaway_received(void);
-void test_nghttp2_session_on_window_update_received(void);
-void test_nghttp2_session_on_data_received(void);
-void test_nghttp2_session_on_data_received_fail_fast(void);
-void test_nghttp2_session_on_altsvc_received(void);
-void test_nghttp2_session_send_headers_start_stream(void);
-void test_nghttp2_session_send_headers_reply(void);
-void test_nghttp2_session_send_headers_frame_size_error(void);
-void test_nghttp2_session_send_headers_push_reply(void);
-void test_nghttp2_session_send_rst_stream(void);
-void test_nghttp2_session_send_push_promise(void);
-void test_nghttp2_session_is_my_stream_id(void);
-void test_nghttp2_session_upgrade2(void);
-void test_nghttp2_session_reprioritize_stream(void);
-void test_nghttp2_session_reprioritize_stream_with_idle_stream_dep(void);
-void test_nghttp2_submit_data(void);
-void test_nghttp2_submit_data_read_length_too_large(void);
-void test_nghttp2_submit_data_read_length_smallest(void);
-void test_nghttp2_submit_data_twice(void);
-void test_nghttp2_submit_request_with_data(void);
-void test_nghttp2_submit_request_without_data(void);
-void test_nghttp2_submit_response_with_data(void);
-void test_nghttp2_submit_response_without_data(void);
-void test_nghttp2_submit_response_push_response(void);
-void test_nghttp2_submit_trailer(void);
-void test_nghttp2_submit_headers_start_stream(void);
-void test_nghttp2_submit_headers_reply(void);
-void test_nghttp2_submit_headers_push_reply(void);
-void test_nghttp2_submit_headers(void);
-void test_nghttp2_submit_headers_continuation(void);
-void test_nghttp2_submit_headers_continuation_extra_large(void);
-void test_nghttp2_submit_priority(void);
-void test_nghttp2_submit_settings(void);
-void test_nghttp2_submit_settings_update_local_window_size(void);
-void test_nghttp2_submit_settings_multiple_times(void);
-void test_nghttp2_submit_push_promise(void);
-void test_nghttp2_submit_window_update(void);
-void test_nghttp2_submit_window_update_local_window_size(void);
-void test_nghttp2_submit_shutdown_notice(void);
-void test_nghttp2_submit_invalid_nv(void);
-void test_nghttp2_submit_extension(void);
-void test_nghttp2_submit_altsvc(void);
-void test_nghttp2_submit_origin(void);
-void test_nghttp2_session_open_stream(void);
-void test_nghttp2_session_open_stream_with_idle_stream_dep(void);
-void test_nghttp2_session_get_next_ob_item(void);
-void test_nghttp2_session_pop_next_ob_item(void);
-void test_nghttp2_session_reply_fail(void);
-void test_nghttp2_session_max_concurrent_streams(void);
-void test_nghttp2_session_stop_data_with_rst_stream(void);
-void test_nghttp2_session_defer_data(void);
-void test_nghttp2_session_flow_control(void);
-void test_nghttp2_session_flow_control_data_recv(void);
-void test_nghttp2_session_flow_control_data_with_padding_recv(void);
-void test_nghttp2_session_data_read_temporal_failure(void);
-void test_nghttp2_session_on_stream_close(void);
-void test_nghttp2_session_on_ctrl_not_send(void);
-void test_nghttp2_session_get_outbound_queue_size(void);
-void test_nghttp2_session_get_effective_local_window_size(void);
-void test_nghttp2_session_set_option(void);
-void test_nghttp2_session_data_backoff_by_high_pri_frame(void);
-void test_nghttp2_session_pack_data_with_padding(void);
-void test_nghttp2_session_pack_headers_with_padding(void);
-void test_nghttp2_pack_settings_payload(void);
-void test_nghttp2_session_stream_dep_add(void);
-void test_nghttp2_session_stream_dep_remove(void);
-void test_nghttp2_session_stream_dep_add_subtree(void);
-void test_nghttp2_session_stream_dep_remove_subtree(void);
-void test_nghttp2_session_stream_dep_all_your_stream_are_belong_to_us(void);
-void test_nghttp2_session_stream_attach_item(void);
-void test_nghttp2_session_stream_attach_item_subtree(void);
-void test_nghttp2_session_stream_get_state(void);
-void test_nghttp2_session_stream_get_something(void);
-void test_nghttp2_session_find_stream(void);
-void test_nghttp2_session_keep_closed_stream(void);
-void test_nghttp2_session_keep_idle_stream(void);
-void test_nghttp2_session_detach_idle_stream(void);
-void test_nghttp2_session_large_dep_tree(void);
-void test_nghttp2_session_graceful_shutdown(void);
-void test_nghttp2_session_on_header_temporal_failure(void);
-void test_nghttp2_session_recv_client_magic(void);
-void test_nghttp2_session_delete_data_item(void);
-void test_nghttp2_session_open_idle_stream(void);
-void test_nghttp2_session_cancel_reserved_remote(void);
-void test_nghttp2_session_reset_pending_headers(void);
-void test_nghttp2_session_send_data_callback(void);
-void test_nghttp2_session_on_begin_headers_temporal_failure(void);
-void test_nghttp2_session_defer_then_close(void);
-void test_nghttp2_session_detach_item_from_closed_stream(void);
-void test_nghttp2_session_flooding(void);
-void test_nghttp2_session_change_stream_priority(void);
-void test_nghttp2_session_create_idle_stream(void);
-void test_nghttp2_session_repeated_priority_change(void);
-void test_nghttp2_session_repeated_priority_submission(void);
-void test_nghttp2_session_set_local_window_size(void);
-void test_nghttp2_session_cancel_from_before_frame_send(void);
-void test_nghttp2_session_removed_closed_stream(void);
-void test_nghttp2_session_pause_data(void);
-void test_nghttp2_session_no_closed_streams(void);
-void test_nghttp2_session_set_stream_user_data(void);
-void test_nghttp2_http_mandatory_headers(void);
-void test_nghttp2_http_content_length(void);
-void test_nghttp2_http_content_length_mismatch(void);
-void test_nghttp2_http_non_final_response(void);
-void test_nghttp2_http_trailer_headers(void);
-void test_nghttp2_http_ignore_regular_header(void);
-void test_nghttp2_http_ignore_content_length(void);
-void test_nghttp2_http_record_request_method(void);
-void test_nghttp2_http_push_promise(void);
-void test_nghttp2_http_head_method_upgrade_workaround(void);
-
-#endif /* NGHTTP2_SESSION_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_stream_test.h"
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_stream.h"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_stream_test.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_STREAM_TEST_H
-#define NGHTTP2_STREAM_TEST_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#endif /* NGHTTP2_STREAM_TEST_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,431 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include "nghttp2_test_helper.h"
-
-#include <assert.h>
-
-#include <CUnit/CUnit.h>
-
-#include "nghttp2_helper.h"
-#include "nghttp2_priority_spec.h"
-
-int unpack_framebuf(nghttp2_frame *frame, nghttp2_bufs *bufs) {
-  nghttp2_buf *buf;
-
-  /* Assuming we have required data in first buffer. We don't decode
-     header block so, we don't mind its space */
-  buf = &bufs->head->buf;
-  return unpack_frame(frame, buf->pos, nghttp2_buf_len(buf));
-}
-
-int unpack_frame(nghttp2_frame *frame, const uint8_t *in, size_t len) {
-  int rv = 0;
-  const uint8_t *payload = in + NGHTTP2_FRAME_HDLEN;
-  size_t payloadlen = len - NGHTTP2_FRAME_HDLEN;
-  size_t payloadoff;
-  nghttp2_mem *mem;
-
-  mem = nghttp2_mem_default();
-
-  nghttp2_frame_unpack_frame_hd(&frame->hd, in);
-  switch (frame->hd.type) {
-  case NGHTTP2_HEADERS:
-    payloadoff = ((frame->hd.flags & NGHTTP2_FLAG_PADDED) > 0);
-    rv = nghttp2_frame_unpack_headers_payload(&frame->headers,
-                                              payload + payloadoff);
-    break;
-  case NGHTTP2_PRIORITY:
-    nghttp2_frame_unpack_priority_payload(&frame->priority, payload);
-    break;
-  case NGHTTP2_RST_STREAM:
-    nghttp2_frame_unpack_rst_stream_payload(&frame->rst_stream, payload);
-    break;
-  case NGHTTP2_SETTINGS:
-    rv = nghttp2_frame_unpack_settings_payload2(
-        &frame->settings.iv, &frame->settings.niv, payload, payloadlen, mem);
-    break;
-  case NGHTTP2_PUSH_PROMISE:
-    rv = nghttp2_frame_unpack_push_promise_payload(&frame->push_promise,
-                                                   payload);
-    break;
-  case NGHTTP2_PING:
-    nghttp2_frame_unpack_ping_payload(&frame->ping, payload);
-    break;
-  case NGHTTP2_GOAWAY:
-    nghttp2_frame_unpack_goaway_payload2(&frame->goaway, payload, payloadlen,
-                                         mem);
-    break;
-  case NGHTTP2_WINDOW_UPDATE:
-    nghttp2_frame_unpack_window_update_payload(&frame->window_update, payload);
-    break;
-  case NGHTTP2_ALTSVC:
-    assert(payloadlen > 2);
-    nghttp2_frame_unpack_altsvc_payload2(&frame->ext, payload, payloadlen, mem);
-    break;
-  case NGHTTP2_ORIGIN:
-    rv = nghttp2_frame_unpack_origin_payload(&frame->ext, payload, payloadlen,
-                                             mem);
-    break;
-  default:
-    /* Must not be reachable */
-    assert(0);
-  }
-  return rv;
-}
-
-int strmemeq(const char *a, const uint8_t *b, size_t bn) {
-  const uint8_t *c;
-  if (!a || !b) {
-    return 0;
-  }
-  c = b + bn;
-  for (; *a && b != c && *a == *b; ++a, ++b)
-    ;
-  return !*a && b == c;
-}
-
-int nvnameeq(const char *a, nghttp2_nv *nv) {
-  return strmemeq(a, nv->name, nv->namelen);
-}
-
-int nvvalueeq(const char *a, nghttp2_nv *nv) {
-  return strmemeq(a, nv->value, nv->valuelen);
-}
-
-void nva_out_init(nva_out *out) {
-  memset(out->nva, 0, sizeof(out->nva));
-  out->nvlen = 0;
-}
-
-void nva_out_reset(nva_out *out, nghttp2_mem *mem) {
-  size_t i;
-  for (i = 0; i < out->nvlen; ++i) {
-    mem->free(out->nva[i].name, NULL);
-    mem->free(out->nva[i].value, NULL);
-  }
-  memset(out->nva, 0, sizeof(out->nva));
-  out->nvlen = 0;
-}
-
-void add_out(nva_out *out, nghttp2_nv *nv, nghttp2_mem *mem) {
-  nghttp2_nv *onv = &out->nva[out->nvlen];
-  if (nv->namelen) {
-    onv->name = mem->malloc(nv->namelen, NULL);
-    memcpy(onv->name, nv->name, nv->namelen);
-  } else {
-    onv->name = NULL;
-  }
-  if (nv->valuelen) {
-    onv->value = mem->malloc(nv->valuelen, NULL);
-    memcpy(onv->value, nv->value, nv->valuelen);
-  } else {
-    onv->value = NULL;
-  }
-  onv->namelen = nv->namelen;
-  onv->valuelen = nv->valuelen;
-
-  onv->flags = nv->flags;
-
-  ++out->nvlen;
-}
-
-ssize_t inflate_hd(nghttp2_hd_inflater *inflater, nva_out *out,
-                   nghttp2_bufs *bufs, size_t offset, nghttp2_mem *mem) {
-  ssize_t rv;
-  nghttp2_nv nv;
-  int inflate_flags;
-  nghttp2_buf_chain *ci;
-  nghttp2_buf *buf;
-  nghttp2_buf bp;
-  int fin;
-  size_t processed;
-
-  processed = 0;
-
-  for (ci = bufs->head; ci; ci = ci->next) {
-    buf = &ci->buf;
-    fin = nghttp2_buf_len(buf) == 0 || ci->next == NULL;
-    bp = *buf;
-
-    if (offset) {
-      size_t n;
-
-      n = nghttp2_min(offset, nghttp2_buf_len(&bp));
-      bp.pos += n;
-      offset -= n;
-    }
-
-    for (;;) {
-      inflate_flags = 0;
-      rv = nghttp2_hd_inflate_hd2(inflater, &nv, &inflate_flags, bp.pos,
-                                  nghttp2_buf_len(&bp), fin);
-
-      if (rv < 0) {
-        return rv;
-      }
-
-      bp.pos += rv;
-      processed += (size_t)rv;
-
-      if (inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
-        if (out) {
-          add_out(out, &nv, mem);
-        }
-      }
-      if (inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
-        break;
-      }
-      if ((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
-          nghttp2_buf_len(&bp) == 0) {
-        break;
-      }
-    }
-  }
-
-  nghttp2_hd_inflate_end_headers(inflater);
-
-  return (ssize_t)processed;
-}
-
-int pack_headers(nghttp2_bufs *bufs, nghttp2_hd_deflater *deflater,
-                 int32_t stream_id, uint8_t flags, const nghttp2_nv *nva,
-                 size_t nvlen, nghttp2_mem *mem) {
-  nghttp2_nv *dnva;
-  nghttp2_frame frame;
-  int rv;
-
-  nghttp2_nv_array_copy(&dnva, nva, nvlen, mem);
-
-  nghttp2_frame_headers_init(&frame.headers, flags, stream_id,
-                             NGHTTP2_HCAT_HEADERS, NULL, dnva, nvlen);
-  rv = nghttp2_frame_pack_headers(bufs, &frame.headers, deflater);
-
-  nghttp2_frame_headers_free(&frame.headers, mem);
-
-  return rv;
-}
-
-int pack_push_promise(nghttp2_bufs *bufs, nghttp2_hd_deflater *deflater,
-                      int32_t stream_id, uint8_t flags,
-                      int32_t promised_stream_id, const nghttp2_nv *nva,
-                      size_t nvlen, nghttp2_mem *mem) {
-  nghttp2_nv *dnva;
-  nghttp2_frame frame;
-  int rv;
-
-  nghttp2_nv_array_copy(&dnva, nva, nvlen, mem);
-
-  nghttp2_frame_push_promise_init(&frame.push_promise, flags, stream_id,
-                                  promised_stream_id, dnva, nvlen);
-  rv = nghttp2_frame_pack_push_promise(bufs, &frame.push_promise, deflater);
-
-  nghttp2_frame_push_promise_free(&frame.push_promise, mem);
-
-  return rv;
-}
-
-int frame_pack_bufs_init(nghttp2_bufs *bufs) {
-  /* 1 for Pad Length */
-  return nghttp2_bufs_init2(bufs, 4096, 16, NGHTTP2_FRAME_HDLEN + 1,
-                            nghttp2_mem_default());
-}
-
-void bufs_large_init(nghttp2_bufs *bufs, size_t chunk_size) {
-  /* 1 for Pad Length */
-  nghttp2_bufs_init2(bufs, chunk_size, 16, NGHTTP2_FRAME_HDLEN + 1,
-                     nghttp2_mem_default());
-}
-
-static nghttp2_stream *open_stream_with_all(nghttp2_session *session,
-                                            int32_t stream_id, int32_t weight,
-                                            uint8_t exclusive,
-                                            nghttp2_stream *dep_stream) {
-  nghttp2_priority_spec pri_spec;
-  int32_t dep_stream_id;
-
-  if (dep_stream) {
-    dep_stream_id = dep_stream->stream_id;
-  } else {
-    dep_stream_id = 0;
-  }
-
-  nghttp2_priority_spec_init(&pri_spec, dep_stream_id, weight, exclusive);
-
-  return nghttp2_session_open_stream(session, stream_id,
-                                     NGHTTP2_STREAM_FLAG_NONE, &pri_spec,
-                                     NGHTTP2_STREAM_OPENED, NULL);
-}
-
-nghttp2_stream *open_stream(nghttp2_session *session, int32_t stream_id) {
-  return open_stream_with_all(session, stream_id, NGHTTP2_DEFAULT_WEIGHT, 0,
-                              NULL);
-}
-
-nghttp2_stream *open_stream_with_dep(nghttp2_session *session,
-                                     int32_t stream_id,
-                                     nghttp2_stream *dep_stream) {
-  return open_stream_with_all(session, stream_id, NGHTTP2_DEFAULT_WEIGHT, 0,
-                              dep_stream);
-}
-
-nghttp2_stream *open_stream_with_dep_weight(nghttp2_session *session,
-                                            int32_t stream_id, int32_t weight,
-                                            nghttp2_stream *dep_stream) {
-  return open_stream_with_all(session, stream_id, weight, 0, dep_stream);
-}
-
-nghttp2_stream *open_stream_with_dep_excl(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_stream *dep_stream) {
-  return open_stream_with_all(session, stream_id, NGHTTP2_DEFAULT_WEIGHT, 1,
-                              dep_stream);
-}
-
-nghttp2_outbound_item *create_data_ob_item(nghttp2_mem *mem) {
-  nghttp2_outbound_item *item;
-
-  item = mem->malloc(sizeof(nghttp2_outbound_item), NULL);
-  memset(item, 0, sizeof(nghttp2_outbound_item));
-
-  return item;
-}
-
-nghttp2_stream *open_sent_stream(nghttp2_session *session, int32_t stream_id) {
-  nghttp2_priority_spec pri_spec;
-
-  nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_DEFAULT_WEIGHT, 0);
-  return open_sent_stream3(session, stream_id, NGHTTP2_FLAG_NONE, &pri_spec,
-                           NGHTTP2_STREAM_OPENED, NULL);
-}
-
-nghttp2_stream *open_sent_stream2(nghttp2_session *session, int32_t stream_id,
-                                  nghttp2_stream_state initial_state) {
-  nghttp2_priority_spec pri_spec;
-
-  nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_DEFAULT_WEIGHT, 0);
-  return open_sent_stream3(session, stream_id, NGHTTP2_FLAG_NONE, &pri_spec,
-                           initial_state, NULL);
-}
-
-nghttp2_stream *open_sent_stream3(nghttp2_session *session, int32_t stream_id,
-                                  uint8_t flags,
-                                  nghttp2_priority_spec *pri_spec_in,
-                                  nghttp2_stream_state initial_state,
-                                  void *stream_user_data) {
-  nghttp2_stream *stream;
-
-  assert(nghttp2_session_is_my_stream_id(session, stream_id));
-
-  stream = nghttp2_session_open_stream(session, stream_id, flags, pri_spec_in,
-                                       initial_state, stream_user_data);
-  session->last_sent_stream_id =
-      nghttp2_max(session->last_sent_stream_id, stream_id);
-  session->next_stream_id =
-      nghttp2_max(session->next_stream_id, (uint32_t)stream_id + 2);
-
-  return stream;
-}
-
-nghttp2_stream *open_sent_stream_with_dep(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_stream *dep_stream) {
-  return open_sent_stream_with_dep_weight(session, stream_id,
-                                          NGHTTP2_DEFAULT_WEIGHT, dep_stream);
-}
-
-nghttp2_stream *open_sent_stream_with_dep_weight(nghttp2_session *session,
-                                                 int32_t stream_id,
-                                                 int32_t weight,
-                                                 nghttp2_stream *dep_stream) {
-  nghttp2_stream *stream;
-
-  assert(nghttp2_session_is_my_stream_id(session, stream_id));
-
-  stream = open_stream_with_all(session, stream_id, weight, 0, dep_stream);
-
-  session->last_sent_stream_id =
-      nghttp2_max(session->last_sent_stream_id, stream_id);
-  session->next_stream_id =
-      nghttp2_max(session->next_stream_id, (uint32_t)stream_id + 2);
-
-  return stream;
-}
-
-nghttp2_stream *open_recv_stream(nghttp2_session *session, int32_t stream_id) {
-  nghttp2_priority_spec pri_spec;
-
-  nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_DEFAULT_WEIGHT, 0);
-  return open_recv_stream3(session, stream_id, NGHTTP2_FLAG_NONE, &pri_spec,
-                           NGHTTP2_STREAM_OPENED, NULL);
-}
-
-nghttp2_stream *open_recv_stream2(nghttp2_session *session, int32_t stream_id,
-                                  nghttp2_stream_state initial_state) {
-  nghttp2_priority_spec pri_spec;
-
-  nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_DEFAULT_WEIGHT, 0);
-  return open_recv_stream3(session, stream_id, NGHTTP2_FLAG_NONE, &pri_spec,
-                           initial_state, NULL);
-}
-
-nghttp2_stream *open_recv_stream3(nghttp2_session *session, int32_t stream_id,
-                                  uint8_t flags,
-                                  nghttp2_priority_spec *pri_spec_in,
-                                  nghttp2_stream_state initial_state,
-                                  void *stream_user_data) {
-  nghttp2_stream *stream;
-
-  assert(!nghttp2_session_is_my_stream_id(session, stream_id));
-
-  stream = nghttp2_session_open_stream(session, stream_id, flags, pri_spec_in,
-                                       initial_state, stream_user_data);
-  session->last_recv_stream_id =
-      nghttp2_max(session->last_recv_stream_id, stream_id);
-
-  return stream;
-}
-
-nghttp2_stream *open_recv_stream_with_dep(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_stream *dep_stream) {
-  return open_recv_stream_with_dep_weight(session, stream_id,
-                                          NGHTTP2_DEFAULT_WEIGHT, dep_stream);
-}
-
-nghttp2_stream *open_recv_stream_with_dep_weight(nghttp2_session *session,
-                                                 int32_t stream_id,
-                                                 int32_t weight,
-                                                 nghttp2_stream *dep_stream) {
-  nghttp2_stream *stream;
-
-  assert(!nghttp2_session_is_my_stream_id(session, stream_id));
-
-  stream = open_stream_with_all(session, stream_id, weight, 0, dep_stream);
-
-  session->last_recv_stream_id =
-      nghttp2_max(session->last_recv_stream_id, stream_id);
-
-  return stream;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/nghttp2_test_helper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_TEST_HELPER_H
-#define NGHTTP2_TEST_HELPER_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include "nghttp2_frame.h"
-#include "nghttp2_hd.h"
-#include "nghttp2_session.h"
-
-#define MAKE_NV(NAME, VALUE)                                                   \
-  {                                                                            \
-    (uint8_t *)(NAME), (uint8_t *)(VALUE), sizeof((NAME)) - 1,                 \
-        sizeof((VALUE)) - 1, NGHTTP2_NV_FLAG_NONE                              \
-  }
-#define ARRLEN(ARR) (sizeof(ARR) / sizeof(ARR[0]))
-
-#define assert_nv_equal(A, B, len, mem)                                        \
-  do {                                                                         \
-    size_t alloclen = sizeof(nghttp2_nv) * len;                                \
-    const nghttp2_nv *sa = A, *sb = B;                                         \
-    nghttp2_nv *a = mem->malloc(alloclen, NULL);                               \
-    nghttp2_nv *b = mem->malloc(alloclen, NULL);                               \
-    ssize_t i_;                                                                \
-    memcpy(a, sa, alloclen);                                                   \
-    memcpy(b, sb, alloclen);                                                   \
-    nghttp2_nv_array_sort(a, len);                                             \
-    nghttp2_nv_array_sort(b, len);                                             \
-    for (i_ = 0; i_ < (ssize_t)len; ++i_) {                                    \
-      CU_ASSERT(nghttp2_nv_equal(&a[i_], &b[i_]));                             \
-    }                                                                          \
-    mem->free(b, NULL);                                                        \
-    mem->free(a, NULL);                                                        \
-  } while (0);
-
-int unpack_framebuf(nghttp2_frame *frame, nghttp2_bufs *bufs);
-
-int unpack_frame(nghttp2_frame *frame, const uint8_t *in, size_t len);
-
-int strmemeq(const char *a, const uint8_t *b, size_t bn);
-
-int nvnameeq(const char *a, nghttp2_nv *nv);
-
-int nvvalueeq(const char *a, nghttp2_nv *nv);
-
-typedef struct {
-  nghttp2_nv nva[256];
-  size_t nvlen;
-} nva_out;
-
-void nva_out_init(nva_out *out);
-void nva_out_reset(nva_out *out, nghttp2_mem *mem);
-
-void add_out(nva_out *out, nghttp2_nv *nv, nghttp2_mem *mem);
-
-ssize_t inflate_hd(nghttp2_hd_inflater *inflater, nva_out *out,
-                   nghttp2_bufs *bufs, size_t offset, nghttp2_mem *mem);
-
-int pack_headers(nghttp2_bufs *bufs, nghttp2_hd_deflater *deflater,
-                 int32_t stream_id, uint8_t flags, const nghttp2_nv *nva,
-                 size_t nvlen, nghttp2_mem *mem);
-
-int pack_push_promise(nghttp2_bufs *bufs, nghttp2_hd_deflater *deflater,
-                      int32_t stream_id, uint8_t flags,
-                      int32_t promised_stream_id, const nghttp2_nv *nva,
-                      size_t nvlen, nghttp2_mem *mem);
-
-int frame_pack_bufs_init(nghttp2_bufs *bufs);
-
-void bufs_large_init(nghttp2_bufs *bufs, size_t chunk_size);
-
-nghttp2_stream *open_stream(nghttp2_session *session, int32_t stream_id);
-
-nghttp2_stream *open_stream_with_dep(nghttp2_session *session,
-                                     int32_t stream_id,
-                                     nghttp2_stream *dep_stream);
-
-nghttp2_stream *open_stream_with_dep_weight(nghttp2_session *session,
-                                            int32_t stream_id, int32_t weight,
-                                            nghttp2_stream *dep_stream);
-
-nghttp2_stream *open_stream_with_dep_excl(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_stream *dep_stream);
-
-nghttp2_outbound_item *create_data_ob_item(nghttp2_mem *mem);
-
-/* Opens stream.  This stream is assumed to be sent from |session|,
-   and session->last_sent_stream_id and session->next_stream_id will
-   be adjusted accordingly. */
-nghttp2_stream *open_sent_stream(nghttp2_session *session, int32_t stream_id);
-
-nghttp2_stream *open_sent_stream2(nghttp2_session *session, int32_t stream_id,
-                                  nghttp2_stream_state initial_state);
-
-nghttp2_stream *open_sent_stream3(nghttp2_session *session, int32_t stream_id,
-                                  uint8_t flags,
-                                  nghttp2_priority_spec *pri_spec_in,
-                                  nghttp2_stream_state initial_state,
-                                  void *stream_user_data);
-
-nghttp2_stream *open_sent_stream_with_dep(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_stream *dep_stream);
-
-nghttp2_stream *open_sent_stream_with_dep_weight(nghttp2_session *session,
-                                                 int32_t stream_id,
-                                                 int32_t weight,
-                                                 nghttp2_stream *dep_stream);
-
-/* Opens stream.  This stream is assumed to be received by |session|,
-   and session->last_recv_stream_id will be adjusted accordingly. */
-nghttp2_stream *open_recv_stream(nghttp2_session *session, int32_t stream_id);
-
-nghttp2_stream *open_recv_stream2(nghttp2_session *session, int32_t stream_id,
-                                  nghttp2_stream_state initial_state);
-
-nghttp2_stream *open_recv_stream3(nghttp2_session *session, int32_t stream_id,
-                                  uint8_t flags,
-                                  nghttp2_priority_spec *pri_spec_in,
-                                  nghttp2_stream_state initial_state,
-                                  void *stream_user_data);
-
-nghttp2_stream *open_recv_stream_with_dep(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          nghttp2_stream *dep_stream);
-
-nghttp2_stream *open_recv_stream_with_dep_weight(nghttp2_session *session,
-                                                 int32_t stream_id,
-                                                 int32_t weight,
-                                                 nghttp2_stream *dep_stream);
-
-#endif /* NGHTTP2_TEST_HELPER_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/cacert.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/cacert.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/cacert.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/cacert.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKTCCAdOgAwIBAgIJAIsolheWrwMZMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJDQTENMAsGA1UEBwwEQ2l0eTESMBAGA1UECgwJU3Bk
-eSBUZXN0MRIwEAYDVQQDDAlsb2NhbGhvc3QxHTAbBgkqhkiG9w0BCQEWDnNwZHlA
-bG9jYWxob3N0MB4XDTEyMDMwMTE5MTI0NVoXDTIzMDUxOTE5MTI0NVowcDELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgMAkNBMQ0wCwYDVQQHDARDaXR5MRIwEAYDVQQKDAlT
-cGR5IFRlc3QxEjAQBgNVBAMMCWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYOc3Bk
-eUBsb2NhbGhvc3QwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAw/2MgzAdlJDm29qH
-ZlAibgs9mH+8keOtsRrb4B1PiCcZoHvN9eCVZ4WnzT+0zhHF+nO3YfwVFVC3w7TF
-7fLB3QIDAQABo1AwTjAdBgNVHQ4EFgQUVP2Jw9RX6BB76aV5x2qk5qsrAIQwHwYD
-VR0jBBgwFoAUVP2Jw9RX6BB76aV5x2qk5qsrAIQwDAYDVR0TBAUwAwEB/zANBgkq
-hkiG9w0BAQUFAANBAKd9M5FzQLEZW1KPe9/XNZlgxZ2g3EC5Krxo5I4Ul3MnIYS9
-u4K8t/iprhgOzjFH6+8LVk9v0Za+gU+K43CpUo4=
------END CERTIFICATE-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/index.html cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/index.html
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/index.html	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/index.html	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-<html><body>small</body></html>
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2012 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-EXTRA_DIST = cacert.pem  index.html  privkey.pem
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/privkey.pem cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/privkey.pem
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/privkey.pem	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/tests/testdata/privkey.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAMP9jIMwHZSQ5tvah2ZQIm4LPZh/vJHjrbEa2+AdT4gnGaB7zfXg
-lWeFp80/tM4Rxfpzt2H8FRVQt8O0xe3ywd0CAwEAAQJBAIQ8PGP/QNYOdlT8OsLj
-aneJCgQsm1Rro7ONBbFO1WxslvA6+uJsx4Rs8zLiS8cyqmJ/lmGa7zhwYSOvFQPa
-XgECIQDgIcgM/2C67peTm1diKKIoGVVKFCfdRi+Dje6mTl2TQQIhAN/bcFWbG73j
-cUVlIsr9Wk1dJzjPPWKeyirF1qd/WbOdAiEApTsCOeLCssxV3jF02B5QfPNAFx6I
-zO2C9Z7awque/IECIGCHW3VOoTPMs7dc2Rf3D810cclJdArmtf6juOAZRjDxAiBS
-AC+H685IBJ99N5nCbF9NWYIVSkuiKVQ8POYVZX+0Jg==
------END RSA PRIVATE KEY-----
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/build_config.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/build_config.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/build_config.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/build_config.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-MRuby::Build.new do |conf|
-  # TODO use same compilers configured in configure script
-  toolchain :clang
-
-  # C++ project needs this.  Without this, mruby exception does not
-  # properly destory C++ object allocated on stack.
-  conf.enable_cxx_exception
-
-  conf.build_dir = ENV['BUILD_DIR']
-
-  # include the default GEMs
-  conf.gembox 'default'
-  conf.gem :core => 'mruby-eval'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/CMakeLists.txt cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/CMakeLists.txt
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/CMakeLists.txt	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-if(ENABLE_THIRD_PARTY)
-  set(LIBHTTP_PARSER_SOURCES
-    http-parser/http_parser.c
-  )
-  add_library(http-parser OBJECT ${LIBHTTP_PARSER_SOURCES})
-  set_target_properties(http-parser PROPERTIES
-    POSITION_INDEPENDENT_CODE ON)
-
-  if(HAVE_NEVERBLEED)
-    set(NEVERBLEED_SOURCES
-      neverbleed/neverbleed.c
-    )
-    add_library(neverbleed ${NEVERBLEED_SOURCES})
-    target_include_directories(neverbleed PRIVATE ${OPENSSL_INCLUDE_DIRS})
-    target_include_directories(neverbleed INTERFACE
-      "${CMAKE_SOURCE_DIR}/third-party/neverbleed"
-    )
-    target_link_libraries(neverbleed ${OPENSSL_LIBRARIES})
-  endif()
-
-  if(HAVE_MRUBY)
-    # EXTRA_DIST = build_config.rb mruby/*
-
-    set(MRUBY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/mruby/build")
-    set(MRUBY_LIBRARY
-      "${CMAKE_STATIC_LIBRARY_PREFIX}mruby${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    )
-
-    # The mruby build needs some env vars. Alternatively, look at cmake -P
-    if(CMAKE_VERSION VERSION_LESS "3.1")
-      # XXX works only for Unixes?
-      set(ENV_COMMAND env)
-    else()
-      set(ENV_COMMAND ${CMAKE_COMMAND} -E env)
-    endif()
-    # Required for the Ninja generator. For older CMake, you first have to
-    # invoke 'ninja mruby' before building dependents.
-    if(CMAKE_VERSION VERSION_LESS "3.2")
-      set(_byproducts)
-    else()
-      set(_byproducts BYPRODUCTS "mruby/build/lib/${MRUBY_LIBRARY}")
-    endif()
-    add_custom_target(mruby
-      COMMAND ${ENV_COMMAND}
-        "MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/build_config.rb"
-        "BUILD_DIR=${MRUBY_BUILD_DIR}"
-        "INSTALL_DIR=${MRUBY_BUILD_DIR}/install/bin"
-        "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/mruby/minirake"
-        -f "${CMAKE_CURRENT_SOURCE_DIR}/mruby/Rakefile"
-      ${_byproducts}
-      VERBATIM
-    )
-
-    # Make the mruby library available to others in this project without them
-    # having to worry about include dirs and the mruby location.
-    add_library(mruby-lib STATIC IMPORTED GLOBAL)
-    set_target_properties(mruby-lib PROPERTIES
-      IMPORTED_LOCATION "${MRUBY_BUILD_DIR}/lib/${MRUBY_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/mruby/include"
-    )
-    add_dependencies(mruby-lib mruby)
-
-    set_directory_properties(PROPERTIES
-      ADDITIONAL_MAKE_CLEAN_FILES mruby/build
-    )
-  endif()
-endif()
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/AUTHORS cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/AUTHORS
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/AUTHORS	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/AUTHORS	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-# Authors ordered by first contribution.
-Ryan Dahl <ry@tinyclouds.org>
-Jeremy Hinegardner <jeremy@hinegardner.org>
-Sergey Shepelev <temotor@gmail.com>
-Joe Damato <ice799@gmail.com>
-tomika <tomika_nospam@freemail.hu>
-Phoenix Sol <phoenix@burninglabs.com>
-Cliff Frey <cliff@meraki.com>
-Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
-Santiago Gala <sgala@apache.org>
-Tim Becker <tim.becker@syngenio.de>
-Jeff Terrace <jterrace@gmail.com>
-Ben Noordhuis <info@bnoordhuis.nl>
-Nathan Rajlich <nathan@tootallnate.net>
-Mark Nottingham <mnot@mnot.net>
-Aman Gupta <aman@tmm1.net>
-Tim Becker <tim.becker@kuriositaet.de>
-Sean Cunningham <sean.cunningham@mandiant.com>
-Peter Griess <pg@std.in>
-Salman Haq <salman.haq@asti-usa.com>
-Cliff Frey <clifffrey@gmail.com>
-Jon Kolb <jon@b0g.us>
-Fouad Mardini <f.mardini@gmail.com>
-Paul Querna <pquerna@apache.org>
-Felix Geisendörfer <felix@debuggable.com>
-koichik <koichik@improvement.jp>
-Andre Caron <andre.l.caron@gmail.com>
-Ivo Raisr <ivosh@ivosh.net>
-James McLaughlin <jamie@lacewing-project.org>
-David Gwynne <loki@animata.net>
-Thomas LE ROUX <thomas@november-eleven.fr>
-Randy Rizun <rrizun@ortivawireless.com>
-Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
-Simon Zimmermann <simonz05@gmail.com>
-Erik Dubbelboer <erik@dubbelboer.com>
-Martell Malone <martellmalone@gmail.com>
-Bertrand Paquet <bpaquet@octo.com>
-BogDan Vatra <bogdan@kde.org>
-Peter Faiman <peter@thepicard.org>
-Corey Richardson <corey@octayn.net>
-Tóth Tamás <tomika_nospam@freemail.hu>
-Cam Swords <cam.swords@gmail.com>
-Chris Dickinson <christopher.s.dickinson@gmail.com>
-Uli Köhler <ukoehler@btronik.de>
-Charlie Somerville <charlie@charliesomerville.com>
-Patrik Stutz <patrik.stutz@gmail.com>
-Fedor Indutny <fedor.indutny@gmail.com>
-runner <runner.mei@gmail.com>
-Alexis Campailla <alexis@janeasystems.com>
-David Wragg <david@wragg.org>
-Vinnie Falco <vinnie.falco@gmail.com>
-Alex Butum <alexbutum@linux.com>
-Rex Feng <rexfeng@gmail.com>
-Alex Kocharin <alex@kocharin.ru>
-Mark Koopman <markmontymark@yahoo.com>
-Helge Heß <me@helgehess.eu>
-Alexis La Goutte <alexis.lagoutte@gmail.com>
-George Miroshnykov <george.miroshnykov@gmail.com>
-Maciej Małecki <me@mmalecki.com>
-Marc O'Morain <github.com@marcomorain.com>
-Jeff Pinner <jpinner@twitter.com>
-Timothy J Fontaine <tjfontaine@gmail.com>
-Akagi201 <akagi201@gmail.com>
-Romain Giraud <giraud.romain@gmail.com>
-Jay Satiro <raysatiro@yahoo.com>
-Arne Steen <Arne.Steen@gmx.de>
-Kjell Schubert <kjell.schubert@gmail.com>
-Olivier Mengué <dolmen@cpan.org>
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/bench.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/bench.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/bench.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/bench.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/* Copyright Fedor Indutny. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include "http_parser.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-
-static const char data[] =
-    "POST /joyent/http-parser HTTP/1.1\r\n"
-    "Host: github.com\r\n"
-    "DNT: 1\r\n"
-    "Accept-Encoding: gzip, deflate, sdch\r\n"
-    "Accept-Language: ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4\r\n"
-    "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) "
-        "AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/39.0.2171.65 Safari/537.36\r\n"
-    "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,"
-        "image/webp,*/*;q=0.8\r\n"
-    "Referer: https://github.com/joyent/http-parser\r\n"
-    "Connection: keep-alive\r\n"
-    "Transfer-Encoding: chunked\r\n"
-    "Cache-Control: max-age=0\r\n\r\nb\r\nhello world\r\n0\r\n\r\n";
-static const size_t data_len = sizeof(data) - 1;
-
-static int on_info(http_parser* p) {
-  return 0;
-}
-
-
-static int on_data(http_parser* p, const char *at, size_t length) {
-  return 0;
-}
-
-static http_parser_settings settings = {
-  .on_message_begin = on_info,
-  .on_headers_complete = on_info,
-  .on_message_complete = on_info,
-  .on_header_field = on_data,
-  .on_header_value = on_data,
-  .on_url = on_data,
-  .on_status = on_data,
-  .on_body = on_data
-};
-
-int bench(int iter_count, int silent) {
-  struct http_parser parser;
-  int i;
-  int err;
-  struct timeval start;
-  struct timeval end;
-  float rps;
-
-  if (!silent) {
-    err = gettimeofday(&start, NULL);
-    assert(err == 0);
-  }
-
-  for (i = 0; i < iter_count; i++) {
-    size_t parsed;
-    http_parser_init(&parser, HTTP_REQUEST);
-
-    parsed = http_parser_execute(&parser, &settings, data, data_len);
-    assert(parsed == data_len);
-  }
-
-  if (!silent) {
-    err = gettimeofday(&end, NULL);
-    assert(err == 0);
-
-    fprintf(stdout, "Benchmark result:\n");
-
-    rps = (float) (end.tv_sec - start.tv_sec) +
-          (end.tv_usec - start.tv_usec) * 1e-6f;
-    fprintf(stdout, "Took %f seconds to run\n", rps);
-
-    rps = (float) iter_count / rps;
-    fprintf(stdout, "%f req/sec\n", rps);
-    fflush(stdout);
-  }
-
-  return 0;
-}
-
-int main(int argc, char** argv) {
-  if (argc == 2 && strcmp(argv[1], "infinite") == 0) {
-    for (;;)
-      bench(5000000, 1);
-    return 0;
-  } else {
-    return bench(5000000, 0);
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/parsertrace.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/parsertrace.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/parsertrace.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/parsertrace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev
- *
- * Additional changes are licensed under the same terms as NGINX and
- * copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-/* Dump what the parser finds to stdout as it happen */
-
-#include "http_parser.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int on_message_begin(http_parser* _) {
-  (void)_;
-  printf("\n***MESSAGE BEGIN***\n\n");
-  return 0;
-}
-
-int on_headers_complete(http_parser* _) {
-  (void)_;
-  printf("\n***HEADERS COMPLETE***\n\n");
-  return 0;
-}
-
-int on_message_complete(http_parser* _) {
-  (void)_;
-  printf("\n***MESSAGE COMPLETE***\n\n");
-  return 0;
-}
-
-int on_url(http_parser* _, const char* at, size_t length) {
-  (void)_;
-  printf("Url: %.*s\n", (int)length, at);
-  return 0;
-}
-
-int on_header_field(http_parser* _, const char* at, size_t length) {
-  (void)_;
-  printf("Header field: %.*s\n", (int)length, at);
-  return 0;
-}
-
-int on_header_value(http_parser* _, const char* at, size_t length) {
-  (void)_;
-  printf("Header value: %.*s\n", (int)length, at);
-  return 0;
-}
-
-int on_body(http_parser* _, const char* at, size_t length) {
-  (void)_;
-  printf("Body: %.*s\n", (int)length, at);
-  return 0;
-}
-
-void usage(const char* name) {
-  fprintf(stderr,
-          "Usage: %s $type $filename\n"
-          "  type: -x, where x is one of {r,b,q}\n"
-          "  parses file as a Response, reQuest, or Both\n",
-          name);
-  exit(EXIT_FAILURE);
-}
-
-int main(int argc, char* argv[]) {
-  enum http_parser_type file_type;
-
-  if (argc != 3) {
-    usage(argv[0]);
-  }
-
-  char* type = argv[1];
-  if (type[0] != '-') {
-    usage(argv[0]);
-  }
-
-  switch (type[1]) {
-    /* in the case of "-", type[1] will be NUL */
-    case 'r':
-      file_type = HTTP_RESPONSE;
-      break;
-    case 'q':
-      file_type = HTTP_REQUEST;
-      break;
-    case 'b':
-      file_type = HTTP_BOTH;
-      break;
-    default:
-      usage(argv[0]);
-  }
-
-  char* filename = argv[2];
-  FILE* file = fopen(filename, "r");
-  if (file == NULL) {
-    perror("fopen");
-    goto fail;
-  }
-
-  fseek(file, 0, SEEK_END);
-  long file_length = ftell(file);
-  if (file_length == -1) {
-    perror("ftell");
-    goto fail;
-  }
-  fseek(file, 0, SEEK_SET);
-
-  char* data = malloc(file_length);
-  if (fread(data, 1, file_length, file) != (size_t)file_length) {
-    fprintf(stderr, "couldn't read entire file\n");
-    free(data);
-    goto fail;
-  }
-
-  http_parser_settings settings;
-  memset(&settings, 0, sizeof(settings));
-  settings.on_message_begin = on_message_begin;
-  settings.on_url = on_url;
-  settings.on_header_field = on_header_field;
-  settings.on_header_value = on_header_value;
-  settings.on_headers_complete = on_headers_complete;
-  settings.on_body = on_body;
-  settings.on_message_complete = on_message_complete;
-
-  http_parser parser;
-  http_parser_init(&parser, file_type);
-  size_t nparsed = http_parser_execute(&parser, &settings, data, file_length);
-  free(data);
-
-  if (nparsed != (size_t)file_length) {
-    fprintf(stderr,
-            "Error: %s (%s)\n",
-            http_errno_description(HTTP_PARSER_ERRNO(&parser)),
-            http_errno_name(HTTP_PARSER_ERRNO(&parser)));
-    goto fail;
-  }
-
-  return EXIT_SUCCESS;
-
-fail:
-  fclose(file);
-  return EXIT_FAILURE;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/url_parser.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/url_parser.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/url_parser.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/contrib/url_parser.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#include "http_parser.h"
-#include <stdio.h>
-#include <string.h>
-
-void
-dump_url (const char *url, const struct http_parser_url *u)
-{
-  unsigned int i;
-
-  printf("\tfield_set: 0x%x, port: %u\n", u->field_set, u->port);
-  for (i = 0; i < UF_MAX; i++) {
-    if ((u->field_set & (1 << i)) == 0) {
-      printf("\tfield_data[%u]: unset\n", i);
-      continue;
-    }
-
-    printf("\tfield_data[%u]: off: %u, len: %u, part: %.*s\n",
-           i,
-           u->field_data[i].off,
-           u->field_data[i].len,
-           u->field_data[i].len,
-           url + u->field_data[i].off);
-  }
-}
-
-int main(int argc, char ** argv) {
-  struct http_parser_url u;
-  int len, connect, result;
-
-  if (argc != 3) {
-    printf("Syntax : %s connect|get url\n", argv[0]);
-    return 1;
-  }
-  len = strlen(argv[2]);
-  connect = strcmp("connect", argv[1]) == 0 ? 1 : 0;
-  printf("Parsing %s, connect %d\n", argv[2], connect);
-
-  http_parser_url_init(&u);
-  result = http_parser_parse_url(argv[2], len, connect, &u);
-  if (result != 0) {
-    printf("Parse error : %d\n", result);
-    return result;
-  }
-  printf("Parse ok, result : \n");
-  dump_url(argv[2], &u);
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/CONTRIBUTIONS cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/CONTRIBUTIONS
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/CONTRIBUTIONS	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/CONTRIBUTIONS	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-Contributors must agree to the Contributor License Agreement before patches
-can be accepted.
-
-http://spreadsheets2.google.com/viewform?hl=en&formkey=dDJXOGUwbzlYaWM4cHN1MERwQS1CSnc6MQ
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2470 +0,0 @@
-/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev
- *
- * Additional changes are licensed under the same terms as NGINX and
- * copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include "http_parser.h"
-#include <assert.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#ifndef ULLONG_MAX
-# define ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
-#endif
-
-#ifndef MIN
-# define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef ARRAY_SIZE
-# define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef BIT_AT
-# define BIT_AT(a, i)                                                \
-  (!!((unsigned int) (a)[(unsigned int) (i) >> 3] &                  \
-   (1 << ((unsigned int) (i) & 7))))
-#endif
-
-#ifndef ELEM_AT
-# define ELEM_AT(a, i, v) ((unsigned int) (i) < ARRAY_SIZE(a) ? (a)[(i)] : (v))
-#endif
-
-#define SET_ERRNO(e)                                                 \
-do {                                                                 \
-  parser->http_errno = (e);                                          \
-} while(0)
-
-#define CURRENT_STATE() p_state
-#define UPDATE_STATE(V) p_state = (enum state) (V);
-#define RETURN(V)                                                    \
-do {                                                                 \
-  parser->state = CURRENT_STATE();                                   \
-  return (V);                                                        \
-} while (0);
-#define REEXECUTE()                                                  \
-  goto reexecute;                                                    \
-
-
-#ifdef __GNUC__
-# define LIKELY(X) __builtin_expect(!!(X), 1)
-# define UNLIKELY(X) __builtin_expect(!!(X), 0)
-#else
-# define LIKELY(X) (X)
-# define UNLIKELY(X) (X)
-#endif
-
-
-/* Run the notify callback FOR, returning ER if it fails */
-#define CALLBACK_NOTIFY_(FOR, ER)                                    \
-do {                                                                 \
-  assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);                       \
-                                                                     \
-  if (LIKELY(settings->on_##FOR)) {                                  \
-    parser->state = CURRENT_STATE();                                 \
-    if (UNLIKELY(0 != settings->on_##FOR(parser))) {                 \
-      SET_ERRNO(HPE_CB_##FOR);                                       \
-    }                                                                \
-    UPDATE_STATE(parser->state);                                     \
-                                                                     \
-    /* We either errored above or got paused; get out */             \
-    if (UNLIKELY(HTTP_PARSER_ERRNO(parser) != HPE_OK)) {             \
-      return (ER);                                                   \
-    }                                                                \
-  }                                                                  \
-} while (0)
-
-/* Run the notify callback FOR and consume the current byte */
-#define CALLBACK_NOTIFY(FOR)            CALLBACK_NOTIFY_(FOR, p - data + 1)
-
-/* Run the notify callback FOR and don't consume the current byte */
-#define CALLBACK_NOTIFY_NOADVANCE(FOR)  CALLBACK_NOTIFY_(FOR, p - data)
-
-/* Run data callback FOR with LEN bytes, returning ER if it fails */
-#define CALLBACK_DATA_(FOR, LEN, ER)                                 \
-do {                                                                 \
-  assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);                       \
-                                                                     \
-  if (FOR##_mark) {                                                  \
-    if (LIKELY(settings->on_##FOR)) {                                \
-      parser->state = CURRENT_STATE();                               \
-      if (UNLIKELY(0 !=                                              \
-                   settings->on_##FOR(parser, FOR##_mark, (LEN)))) { \
-        SET_ERRNO(HPE_CB_##FOR);                                     \
-      }                                                              \
-      UPDATE_STATE(parser->state);                                   \
-                                                                     \
-      /* We either errored above or got paused; get out */           \
-      if (UNLIKELY(HTTP_PARSER_ERRNO(parser) != HPE_OK)) {           \
-        return (ER);                                                 \
-      }                                                              \
-    }                                                                \
-    FOR##_mark = NULL;                                               \
-  }                                                                  \
-} while (0)
-
-/* Run the data callback FOR and consume the current byte */
-#define CALLBACK_DATA(FOR)                                           \
-    CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
-
-/* Run the data callback FOR and don't consume the current byte */
-#define CALLBACK_DATA_NOADVANCE(FOR)                                 \
-    CALLBACK_DATA_(FOR, p - FOR##_mark, p - data)
-
-/* Set the mark FOR; non-destructive if mark is already set */
-#define MARK(FOR)                                                    \
-do {                                                                 \
-  if (!FOR##_mark) {                                                 \
-    FOR##_mark = p;                                                  \
-  }                                                                  \
-} while (0)
-
-/* Don't allow the total size of the HTTP headers (including the status
- * line) to exceed HTTP_MAX_HEADER_SIZE.  This check is here to protect
- * embedders against denial-of-service attacks where the attacker feeds
- * us a never-ending header that the embedder keeps buffering.
- *
- * This check is arguably the responsibility of embedders but we're doing
- * it on the embedder's behalf because most won't bother and this way we
- * make the web a little safer.  HTTP_MAX_HEADER_SIZE is still far bigger
- * than any reasonable request or response so this should never affect
- * day-to-day operation.
- */
-#define COUNT_HEADER_SIZE(V)                                         \
-do {                                                                 \
-  parser->nread += (V);                                              \
-  if (UNLIKELY(parser->nread > (HTTP_MAX_HEADER_SIZE))) {            \
-    SET_ERRNO(HPE_HEADER_OVERFLOW);                                  \
-    goto error;                                                      \
-  }                                                                  \
-} while (0)
-
-
-#define PROXY_CONNECTION "proxy-connection"
-#define CONNECTION "connection"
-#define CONTENT_LENGTH "content-length"
-#define TRANSFER_ENCODING "transfer-encoding"
-#define UPGRADE "upgrade"
-#define CHUNKED "chunked"
-#define KEEP_ALIVE "keep-alive"
-#define CLOSE "close"
-
-
-static const char *method_strings[] =
-  {
-#define XX(num, name, string) #string,
-  HTTP_METHOD_MAP(XX)
-#undef XX
-  };
-
-
-/* Tokens as defined by rfc 2616. Also lowercases them.
- *        token       = 1*<any CHAR except CTLs or separators>
- *     separators     = "(" | ")" | "<" | ">" | "@"
- *                    | "," | ";" | ":" | "\" | <">
- *                    | "/" | "[" | "]" | "?" | "="
- *                    | "{" | "}" | SP | HT
- */
-static const char tokens[256] = {
-/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
-        0,       0,       0,       0,       0,       0,       0,       0,
-/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
-        0,      '!',      0,      '#',     '$',     '%',     '&',    '\'',
-/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
-        0,       0,      '*',     '+',      0,      '-',     '.',      0,
-/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
-       '0',     '1',     '2',     '3',     '4',     '5',     '6',     '7',
-/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
-       '8',     '9',      0,       0,       0,       0,       0,       0,
-/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
-        0,      'a',     'b',     'c',     'd',     'e',     'f',     'g',
-/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
-       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
-/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
-       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
-/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
-       'x',     'y',     'z',      0,       0,       0,      '^',     '_',
-/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
-       '`',     'a',     'b',     'c',     'd',     'e',     'f',     'g',
-/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
-       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
-/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
-       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
-/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
-       'x',     'y',     'z',      0,      '|',      0,      '~',       0 };
-
-
-static const int8_t unhex[256] =
-  {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1
-  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  };
-
-
-#if HTTP_PARSER_STRICT
-# define T(v) 0
-#else
-# define T(v) v
-#endif
-
-
-static const uint8_t normal_url_char[32] = {
-/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
-/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
-        0    | T(2)   |   0    |   0    | T(16)  |   0    |   0    |   0,
-/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
-/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
-/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
-        0    |   2    |   4    |   0    |   16   |   32   |   64   |  128,
-/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0,
-/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
-/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0, };
-
-#undef T
-
-enum state
-  { s_dead = 1 /* important that this is > 0 */
-
-  , s_start_req_or_res
-  , s_res_or_resp_H
-  , s_start_res
-  , s_res_H
-  , s_res_HT
-  , s_res_HTT
-  , s_res_HTTP
-  , s_res_first_http_major
-  , s_res_http_major
-  , s_res_first_http_minor
-  , s_res_http_minor
-  , s_res_first_status_code
-  , s_res_status_code
-  , s_res_status_start
-  , s_res_status
-  , s_res_line_almost_done
-
-  , s_start_req
-
-  , s_req_method
-  , s_req_spaces_before_url
-  , s_req_schema
-  , s_req_schema_slash
-  , s_req_schema_slash_slash
-  , s_req_server_start
-  , s_req_server
-  , s_req_server_with_at
-  , s_req_path
-  , s_req_query_string_start
-  , s_req_query_string
-  , s_req_fragment_start
-  , s_req_fragment
-  , s_req_http_start
-  , s_req_http_H
-  , s_req_http_HT
-  , s_req_http_HTT
-  , s_req_http_HTTP
-  , s_req_first_http_major
-  , s_req_http_major
-  , s_req_first_http_minor
-  , s_req_http_minor
-  , s_req_line_almost_done
-
-  , s_header_field_start
-  , s_header_field
-  , s_header_value_discard_ws
-  , s_header_value_discard_ws_almost_done
-  , s_header_value_discard_lws
-  , s_header_value_start
-  , s_header_value
-  , s_header_value_lws
-
-  , s_header_almost_done
-
-  , s_chunk_size_start
-  , s_chunk_size
-  , s_chunk_parameters
-  , s_chunk_size_almost_done
-
-  , s_headers_almost_done
-  , s_headers_done
-
-  /* Important: 's_headers_done' must be the last 'header' state. All
-   * states beyond this must be 'body' states. It is used for overflow
-   * checking. See the PARSING_HEADER() macro.
-   */
-
-  , s_chunk_data
-  , s_chunk_data_almost_done
-  , s_chunk_data_done
-
-  , s_body_identity
-  , s_body_identity_eof
-
-  , s_message_done
-  };
-
-
-#define PARSING_HEADER(state) (state <= s_headers_done)
-
-
-enum header_states
-  { h_general = 0
-  , h_C
-  , h_CO
-  , h_CON
-
-  , h_matching_connection
-  , h_matching_proxy_connection
-  , h_matching_content_length
-  , h_matching_transfer_encoding
-  , h_matching_upgrade
-
-  , h_connection
-  , h_content_length
-  , h_transfer_encoding
-  , h_upgrade
-
-  , h_matching_transfer_encoding_chunked
-  , h_matching_connection_token_start
-  , h_matching_connection_keep_alive
-  , h_matching_connection_close
-  , h_matching_connection_upgrade
-  , h_matching_connection_token
-
-  , h_transfer_encoding_chunked
-  , h_connection_keep_alive
-  , h_connection_close
-  , h_connection_upgrade
-  };
-
-enum http_host_state
-  {
-    s_http_host_dead = 1
-  , s_http_userinfo_start
-  , s_http_userinfo
-  , s_http_host_start
-  , s_http_host_v6_start
-  , s_http_host
-  , s_http_host_v6
-  , s_http_host_v6_end
-  , s_http_host_v6_zone_start
-  , s_http_host_v6_zone
-  , s_http_host_port_start
-  , s_http_host_port
-};
-
-/* Macros for character classes; depends on strict-mode  */
-#define CR                  '\r'
-#define LF                  '\n'
-#define LOWER(c)            (unsigned char)(c | 0x20)
-#define IS_ALPHA(c)         (LOWER(c) >= 'a' && LOWER(c) <= 'z')
-#define IS_NUM(c)           ((c) >= '0' && (c) <= '9')
-#define IS_ALPHANUM(c)      (IS_ALPHA(c) || IS_NUM(c))
-#define IS_HEX(c)           (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f'))
-#define IS_MARK(c)          ((c) == '-' || (c) == '_' || (c) == '.' || \
-  (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \
-  (c) == ')')
-#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || \
-  (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \
-  (c) == '$' || (c) == ',')
-
-#define STRICT_TOKEN(c)     (tokens[(unsigned char)c])
-
-#if HTTP_PARSER_STRICT
-#define TOKEN(c)            (tokens[(unsigned char)c])
-#define IS_URL_CHAR(c)      (BIT_AT(normal_url_char, (unsigned char)c))
-#define IS_HOST_CHAR(c)     (IS_ALPHANUM(c) || (c) == '.' || (c) == '-')
-#else
-#define TOKEN(c)            ((c == ' ') ? ' ' : tokens[(unsigned char)c])
-#define IS_URL_CHAR(c)                                                         \
-  (BIT_AT(normal_url_char, (unsigned char)c) || ((c) & 0x80))
-#define IS_HOST_CHAR(c)                                                        \
-  (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_')
-#endif
-
-/**
- * Verify that a char is a valid visible (printable) US-ASCII
- * character or %x80-FF
- **/
-#define IS_HEADER_CHAR(ch)                                                     \
-  (ch == CR || ch == LF || ch == 9 || ((unsigned char)ch > 31 && ch != 127))
-
-#define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res)
-
-
-#if HTTP_PARSER_STRICT
-# define STRICT_CHECK(cond)                                          \
-do {                                                                 \
-  if (cond) {                                                        \
-    SET_ERRNO(HPE_STRICT);                                           \
-    goto error;                                                      \
-  }                                                                  \
-} while (0)
-# define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead)
-#else
-# define STRICT_CHECK(cond)
-# define NEW_MESSAGE() start_state
-#endif
-
-
-/* Map errno values to strings for human-readable output */
-#define HTTP_STRERROR_GEN(n, s) { "HPE_" #n, s },
-static struct {
-  const char *name;
-  const char *description;
-} http_strerror_tab[] = {
-  HTTP_ERRNO_MAP(HTTP_STRERROR_GEN)
-};
-#undef HTTP_STRERROR_GEN
-
-int http_message_needs_eof(const http_parser *parser);
-
-/* Our URL parser.
- *
- * This is designed to be shared by http_parser_execute() for URL validation,
- * hence it has a state transition + byte-for-byte interface. In addition, it
- * is meant to be embedded in http_parser_parse_url(), which does the dirty
- * work of turning state transitions URL components for its API.
- *
- * This function should only be invoked with non-space characters. It is
- * assumed that the caller cares about (and can detect) the transition between
- * URL and non-URL states by looking for these.
- */
-static enum state
-parse_url_char(enum state s, const char ch)
-{
-  if (ch == ' ' || ch == '\r' || ch == '\n') {
-    return s_dead;
-  }
-
-#if HTTP_PARSER_STRICT
-  if (ch == '\t' || ch == '\f') {
-    return s_dead;
-  }
-#endif
-
-  switch (s) {
-    case s_req_spaces_before_url:
-      /* Proxied requests are followed by scheme of an absolute URI (alpha).
-       * All methods except CONNECT are followed by '/' or '*'.
-       */
-
-      if (ch == '/' || ch == '*') {
-        return s_req_path;
-      }
-
-      if (IS_ALPHA(ch)) {
-        return s_req_schema;
-      }
-
-      break;
-
-    case s_req_schema:
-      if (IS_ALPHA(ch)) {
-        return s;
-      }
-
-      if (ch == ':') {
-        return s_req_schema_slash;
-      }
-
-      break;
-
-    case s_req_schema_slash:
-      if (ch == '/') {
-        return s_req_schema_slash_slash;
-      }
-
-      break;
-
-    case s_req_schema_slash_slash:
-      if (ch == '/') {
-        return s_req_server_start;
-      }
-
-      break;
-
-    case s_req_server_with_at:
-      if (ch == '@') {
-        return s_dead;
-      }
-
-    /* FALLTHROUGH */
-    case s_req_server_start:
-    case s_req_server:
-      if (ch == '/') {
-        return s_req_path;
-      }
-
-      if (ch == '?') {
-        return s_req_query_string_start;
-      }
-
-      if (ch == '@') {
-        return s_req_server_with_at;
-      }
-
-      if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') {
-        return s_req_server;
-      }
-
-      break;
-
-    case s_req_path:
-      if (IS_URL_CHAR(ch)) {
-        return s;
-      }
-
-      switch (ch) {
-        case '?':
-          return s_req_query_string_start;
-
-        case '#':
-          return s_req_fragment_start;
-      }
-
-      break;
-
-    case s_req_query_string_start:
-    case s_req_query_string:
-      if (IS_URL_CHAR(ch)) {
-        return s_req_query_string;
-      }
-
-      switch (ch) {
-        case '?':
-          /* allow extra '?' in query string */
-          return s_req_query_string;
-
-        case '#':
-          return s_req_fragment_start;
-      }
-
-      break;
-
-    case s_req_fragment_start:
-      if (IS_URL_CHAR(ch)) {
-        return s_req_fragment;
-      }
-
-      switch (ch) {
-        case '?':
-          return s_req_fragment;
-
-        case '#':
-          return s;
-      }
-
-      break;
-
-    case s_req_fragment:
-      if (IS_URL_CHAR(ch)) {
-        return s;
-      }
-
-      switch (ch) {
-        case '?':
-        case '#':
-          return s;
-      }
-
-      break;
-
-    default:
-      break;
-  }
-
-  /* We should never fall out of the switch above unless there's an error */
-  return s_dead;
-}
-
-size_t http_parser_execute (http_parser *parser,
-                            const http_parser_settings *settings,
-                            const char *data,
-                            size_t len)
-{
-  char c, ch;
-  int8_t unhex_val;
-  const char *p = data;
-  const char *header_field_mark = 0;
-  const char *header_value_mark = 0;
-  const char *url_mark = 0;
-  const char *body_mark = 0;
-  const char *status_mark = 0;
-  enum state p_state = (enum state) parser->state;
-  const unsigned int lenient = parser->lenient_http_headers;
-
-  /* We're in an error state. Don't bother doing anything. */
-  if (HTTP_PARSER_ERRNO(parser) != HPE_OK) {
-    return 0;
-  }
-
-  if (len == 0) {
-    switch (CURRENT_STATE()) {
-      case s_body_identity_eof:
-        /* Use of CALLBACK_NOTIFY() here would erroneously return 1 byte read if
-         * we got paused.
-         */
-        CALLBACK_NOTIFY_NOADVANCE(message_complete);
-        return 0;
-
-      case s_dead:
-      case s_start_req_or_res:
-      case s_start_res:
-      case s_start_req:
-        return 0;
-
-      default:
-        SET_ERRNO(HPE_INVALID_EOF_STATE);
-        return 1;
-    }
-  }
-
-
-  if (CURRENT_STATE() == s_header_field)
-    header_field_mark = data;
-  if (CURRENT_STATE() == s_header_value)
-    header_value_mark = data;
-  switch (CURRENT_STATE()) {
-  case s_req_path:
-  case s_req_schema:
-  case s_req_schema_slash:
-  case s_req_schema_slash_slash:
-  case s_req_server_start:
-  case s_req_server:
-  case s_req_server_with_at:
-  case s_req_query_string_start:
-  case s_req_query_string:
-  case s_req_fragment_start:
-  case s_req_fragment:
-    url_mark = data;
-    break;
-  case s_res_status:
-    status_mark = data;
-    break;
-  default:
-    break;
-  }
-
-  for (p=data; p != data + len; p++) {
-    ch = *p;
-
-    if (PARSING_HEADER(CURRENT_STATE()))
-      COUNT_HEADER_SIZE(1);
-
-reexecute:
-    switch (CURRENT_STATE()) {
-
-      case s_dead:
-        /* this state is used after a 'Connection: close' message
-         * the parser will error out if it reads another message
-         */
-        if (LIKELY(ch == CR || ch == LF))
-          break;
-
-        SET_ERRNO(HPE_CLOSED_CONNECTION);
-        goto error;
-
-      case s_start_req_or_res:
-      {
-        if (ch == CR || ch == LF)
-          break;
-        parser->flags = 0;
-        parser->content_length = ULLONG_MAX;
-
-        if (ch == 'H') {
-          UPDATE_STATE(s_res_or_resp_H);
-
-          CALLBACK_NOTIFY(message_begin);
-        } else {
-          parser->type = HTTP_REQUEST;
-          UPDATE_STATE(s_start_req);
-          REEXECUTE();
-        }
-
-        break;
-      }
-
-      case s_res_or_resp_H:
-        if (ch == 'T') {
-          parser->type = HTTP_RESPONSE;
-          UPDATE_STATE(s_res_HT);
-        } else {
-          if (UNLIKELY(ch != 'E')) {
-            SET_ERRNO(HPE_INVALID_CONSTANT);
-            goto error;
-          }
-
-          parser->type = HTTP_REQUEST;
-          parser->method = HTTP_HEAD;
-          parser->index = 2;
-          UPDATE_STATE(s_req_method);
-        }
-        break;
-
-      case s_start_res:
-      {
-        parser->flags = 0;
-        parser->content_length = ULLONG_MAX;
-
-        switch (ch) {
-          case 'H':
-            UPDATE_STATE(s_res_H);
-            break;
-
-          case CR:
-          case LF:
-            break;
-
-          default:
-            SET_ERRNO(HPE_INVALID_CONSTANT);
-            goto error;
-        }
-
-        CALLBACK_NOTIFY(message_begin);
-        break;
-      }
-
-      case s_res_H:
-        STRICT_CHECK(ch != 'T');
-        UPDATE_STATE(s_res_HT);
-        break;
-
-      case s_res_HT:
-        STRICT_CHECK(ch != 'T');
-        UPDATE_STATE(s_res_HTT);
-        break;
-
-      case s_res_HTT:
-        STRICT_CHECK(ch != 'P');
-        UPDATE_STATE(s_res_HTTP);
-        break;
-
-      case s_res_HTTP:
-        STRICT_CHECK(ch != '/');
-        UPDATE_STATE(s_res_first_http_major);
-        break;
-
-      case s_res_first_http_major:
-        if (UNLIKELY(ch < '0' || ch > '9')) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_major = ch - '0';
-        UPDATE_STATE(s_res_http_major);
-        break;
-
-      /* major HTTP version or dot */
-      case s_res_http_major:
-      {
-        if (ch == '.') {
-          UPDATE_STATE(s_res_first_http_minor);
-          break;
-        }
-
-        if (!IS_NUM(ch)) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_major *= 10;
-        parser->http_major += ch - '0';
-
-        if (UNLIKELY(parser->http_major > 999)) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        break;
-      }
-
-      /* first digit of minor HTTP version */
-      case s_res_first_http_minor:
-        if (UNLIKELY(!IS_NUM(ch))) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_minor = ch - '0';
-        UPDATE_STATE(s_res_http_minor);
-        break;
-
-      /* minor HTTP version or end of request line */
-      case s_res_http_minor:
-      {
-        if (ch == ' ') {
-          UPDATE_STATE(s_res_first_status_code);
-          break;
-        }
-
-        if (UNLIKELY(!IS_NUM(ch))) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_minor *= 10;
-        parser->http_minor += ch - '0';
-
-        if (UNLIKELY(parser->http_minor > 999)) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        break;
-      }
-
-      case s_res_first_status_code:
-      {
-        if (!IS_NUM(ch)) {
-          if (ch == ' ') {
-            break;
-          }
-
-          SET_ERRNO(HPE_INVALID_STATUS);
-          goto error;
-        }
-        parser->status_code = ch - '0';
-        UPDATE_STATE(s_res_status_code);
-        break;
-      }
-
-      case s_res_status_code:
-      {
-        if (!IS_NUM(ch)) {
-          switch (ch) {
-            case ' ':
-              UPDATE_STATE(s_res_status_start);
-              break;
-            case CR:
-              UPDATE_STATE(s_res_line_almost_done);
-              break;
-            case LF:
-              UPDATE_STATE(s_header_field_start);
-              break;
-            default:
-              SET_ERRNO(HPE_INVALID_STATUS);
-              goto error;
-          }
-          break;
-        }
-
-        parser->status_code *= 10;
-        parser->status_code += ch - '0';
-
-        if (UNLIKELY(parser->status_code > 999)) {
-          SET_ERRNO(HPE_INVALID_STATUS);
-          goto error;
-        }
-
-        break;
-      }
-
-      case s_res_status_start:
-      {
-        if (ch == CR) {
-          UPDATE_STATE(s_res_line_almost_done);
-          break;
-        }
-
-        if (ch == LF) {
-          UPDATE_STATE(s_header_field_start);
-          break;
-        }
-
-        MARK(status);
-        UPDATE_STATE(s_res_status);
-        parser->index = 0;
-        break;
-      }
-
-      case s_res_status:
-        if (ch == CR) {
-          UPDATE_STATE(s_res_line_almost_done);
-          CALLBACK_DATA(status);
-          break;
-        }
-
-        if (ch == LF) {
-          UPDATE_STATE(s_header_field_start);
-          CALLBACK_DATA(status);
-          break;
-        }
-
-        break;
-
-      case s_res_line_almost_done:
-        STRICT_CHECK(ch != LF);
-        UPDATE_STATE(s_header_field_start);
-        break;
-
-      case s_start_req:
-      {
-        if (ch == CR || ch == LF)
-          break;
-        parser->flags = 0;
-        parser->content_length = ULLONG_MAX;
-
-        if (UNLIKELY(!IS_ALPHA(ch))) {
-          SET_ERRNO(HPE_INVALID_METHOD);
-          goto error;
-        }
-
-        parser->method = (enum http_method) 0;
-        parser->index = 1;
-        switch (ch) {
-          case 'A': parser->method = HTTP_ACL; break;
-          case 'B': parser->method = HTTP_BIND; break;
-          case 'C': parser->method = HTTP_CONNECT; /* or COPY, CHECKOUT */ break;
-          case 'D': parser->method = HTTP_DELETE; break;
-          case 'G': parser->method = HTTP_GET; break;
-          case 'H': parser->method = HTTP_HEAD; break;
-          case 'L': parser->method = HTTP_LOCK; /* or LINK */ break;
-          case 'M': parser->method = HTTP_MKCOL; /* or MOVE, MKACTIVITY, MERGE, M-SEARCH, MKCALENDAR */ break;
-          case 'N': parser->method = HTTP_NOTIFY; break;
-          case 'O': parser->method = HTTP_OPTIONS; break;
-          case 'P': parser->method = HTTP_POST;
-            /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */
-            break;
-          case 'R': parser->method = HTTP_REPORT; /* or REBIND */ break;
-          case 'S': parser->method = HTTP_SUBSCRIBE; /* or SEARCH */ break;
-          case 'T': parser->method = HTTP_TRACE; break;
-          case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE, UNBIND, UNLINK */ break;
-          default:
-            SET_ERRNO(HPE_INVALID_METHOD);
-            goto error;
-        }
-        UPDATE_STATE(s_req_method);
-
-        CALLBACK_NOTIFY(message_begin);
-
-        break;
-      }
-
-      case s_req_method:
-      {
-        const char *matcher;
-        if (UNLIKELY(ch == '\0')) {
-          SET_ERRNO(HPE_INVALID_METHOD);
-          goto error;
-        }
-
-        matcher = method_strings[parser->method];
-        if (ch == ' ' && matcher[parser->index] == '\0') {
-          UPDATE_STATE(s_req_spaces_before_url);
-        } else if (ch == matcher[parser->index]) {
-          ; /* nada */
-        } else if (IS_ALPHA(ch)) {
-
-          switch (parser->method << 16 | parser->index << 8 | ch) {
-#define XX(meth, pos, ch, new_meth) \
-            case (HTTP_##meth << 16 | pos << 8 | ch): \
-              parser->method = HTTP_##new_meth; break;
-
-            XX(POST,      1, 'U', PUT)
-            XX(POST,      1, 'A', PATCH)
-            XX(CONNECT,   1, 'H', CHECKOUT)
-            XX(CONNECT,   2, 'P', COPY)
-            XX(MKCOL,     1, 'O', MOVE)
-            XX(MKCOL,     1, 'E', MERGE)
-            XX(MKCOL,     2, 'A', MKACTIVITY)
-            XX(MKCOL,     3, 'A', MKCALENDAR)
-            XX(SUBSCRIBE, 1, 'E', SEARCH)
-            XX(REPORT,    2, 'B', REBIND)
-            XX(POST,      1, 'R', PROPFIND)
-            XX(PROPFIND,  4, 'P', PROPPATCH)
-            XX(PUT,       2, 'R', PURGE)
-            XX(LOCK,      1, 'I', LINK)
-            XX(UNLOCK,    2, 'S', UNSUBSCRIBE)
-            XX(UNLOCK,    2, 'B', UNBIND)
-            XX(UNLOCK,    3, 'I', UNLINK)
-#undef XX
-
-            default:
-              SET_ERRNO(HPE_INVALID_METHOD);
-              goto error;
-          }
-        } else if (ch == '-' &&
-                   parser->index == 1 &&
-                   parser->method == HTTP_MKCOL) {
-          parser->method = HTTP_MSEARCH;
-        } else {
-          SET_ERRNO(HPE_INVALID_METHOD);
-          goto error;
-        }
-
-        ++parser->index;
-        break;
-      }
-
-      case s_req_spaces_before_url:
-      {
-        if (ch == ' ') break;
-
-        MARK(url);
-        if (parser->method == HTTP_CONNECT) {
-          UPDATE_STATE(s_req_server_start);
-        }
-
-        UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
-        if (UNLIKELY(CURRENT_STATE() == s_dead)) {
-          SET_ERRNO(HPE_INVALID_URL);
-          goto error;
-        }
-
-        break;
-      }
-
-      case s_req_schema:
-      case s_req_schema_slash:
-      case s_req_schema_slash_slash:
-      case s_req_server_start:
-      {
-        switch (ch) {
-          /* No whitespace allowed here */
-          case ' ':
-          case CR:
-          case LF:
-            SET_ERRNO(HPE_INVALID_URL);
-            goto error;
-          default:
-            UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
-            if (UNLIKELY(CURRENT_STATE() == s_dead)) {
-              SET_ERRNO(HPE_INVALID_URL);
-              goto error;
-            }
-        }
-
-        break;
-      }
-
-      case s_req_server:
-      case s_req_server_with_at:
-      case s_req_path:
-      case s_req_query_string_start:
-      case s_req_query_string:
-      case s_req_fragment_start:
-      case s_req_fragment:
-      {
-        switch (ch) {
-          case ' ':
-            UPDATE_STATE(s_req_http_start);
-            CALLBACK_DATA(url);
-            break;
-          case CR:
-          case LF:
-            parser->http_major = 0;
-            parser->http_minor = 9;
-            UPDATE_STATE((ch == CR) ?
-              s_req_line_almost_done :
-              s_header_field_start);
-            CALLBACK_DATA(url);
-            break;
-          default:
-            UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
-            if (UNLIKELY(CURRENT_STATE() == s_dead)) {
-              SET_ERRNO(HPE_INVALID_URL);
-              goto error;
-            }
-        }
-        break;
-      }
-
-      case s_req_http_start:
-        switch (ch) {
-          case 'H':
-            UPDATE_STATE(s_req_http_H);
-            break;
-          case ' ':
-            break;
-          default:
-            SET_ERRNO(HPE_INVALID_CONSTANT);
-            goto error;
-        }
-        break;
-
-      case s_req_http_H:
-        STRICT_CHECK(ch != 'T');
-        UPDATE_STATE(s_req_http_HT);
-        break;
-
-      case s_req_http_HT:
-        STRICT_CHECK(ch != 'T');
-        UPDATE_STATE(s_req_http_HTT);
-        break;
-
-      case s_req_http_HTT:
-        STRICT_CHECK(ch != 'P');
-        UPDATE_STATE(s_req_http_HTTP);
-        break;
-
-      case s_req_http_HTTP:
-        STRICT_CHECK(ch != '/');
-        UPDATE_STATE(s_req_first_http_major);
-        break;
-
-      /* first digit of major HTTP version */
-      case s_req_first_http_major:
-        if (UNLIKELY(ch < '1' || ch > '9')) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_major = ch - '0';
-        UPDATE_STATE(s_req_http_major);
-        break;
-
-      /* major HTTP version or dot */
-      case s_req_http_major:
-      {
-        if (ch == '.') {
-          UPDATE_STATE(s_req_first_http_minor);
-          break;
-        }
-
-        if (UNLIKELY(!IS_NUM(ch))) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_major *= 10;
-        parser->http_major += ch - '0';
-
-        if (UNLIKELY(parser->http_major > 999)) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        break;
-      }
-
-      /* first digit of minor HTTP version */
-      case s_req_first_http_minor:
-        if (UNLIKELY(!IS_NUM(ch))) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_minor = ch - '0';
-        UPDATE_STATE(s_req_http_minor);
-        break;
-
-      /* minor HTTP version or end of request line */
-      case s_req_http_minor:
-      {
-        if (ch == CR) {
-          UPDATE_STATE(s_req_line_almost_done);
-          break;
-        }
-
-        if (ch == LF) {
-          UPDATE_STATE(s_header_field_start);
-          break;
-        }
-
-        /* XXX allow spaces after digit? */
-
-        if (UNLIKELY(!IS_NUM(ch))) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        parser->http_minor *= 10;
-        parser->http_minor += ch - '0';
-
-        if (UNLIKELY(parser->http_minor > 999)) {
-          SET_ERRNO(HPE_INVALID_VERSION);
-          goto error;
-        }
-
-        break;
-      }
-
-      /* end of request line */
-      case s_req_line_almost_done:
-      {
-        if (UNLIKELY(ch != LF)) {
-          SET_ERRNO(HPE_LF_EXPECTED);
-          goto error;
-        }
-
-        UPDATE_STATE(s_header_field_start);
-        break;
-      }
-
-      case s_header_field_start:
-      {
-        if (ch == CR) {
-          UPDATE_STATE(s_headers_almost_done);
-          break;
-        }
-
-        if (ch == LF) {
-          /* they might be just sending \n instead of \r\n so this would be
-           * the second \n to denote the end of headers*/
-          UPDATE_STATE(s_headers_almost_done);
-          REEXECUTE();
-        }
-
-        c = TOKEN(ch);
-
-        if (UNLIKELY(!c)) {
-          SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
-          goto error;
-        }
-
-        MARK(header_field);
-
-        parser->index = 0;
-        UPDATE_STATE(s_header_field);
-
-        switch (c) {
-          case 'c':
-            parser->header_state = h_C;
-            break;
-
-          case 'p':
-            parser->header_state = h_matching_proxy_connection;
-            break;
-
-          case 't':
-            parser->header_state = h_matching_transfer_encoding;
-            break;
-
-          case 'u':
-            parser->header_state = h_matching_upgrade;
-            break;
-
-          default:
-            parser->header_state = h_general;
-            break;
-        }
-        break;
-      }
-
-      case s_header_field:
-      {
-        const char* start = p;
-        for (; p != data + len; p++) {
-          ch = *p;
-          c = TOKEN(ch);
-
-          if (!c)
-            break;
-
-          switch (parser->header_state) {
-            case h_general:
-              break;
-
-            case h_C:
-              parser->index++;
-              parser->header_state = (c == 'o' ? h_CO : h_general);
-              break;
-
-            case h_CO:
-              parser->index++;
-              parser->header_state = (c == 'n' ? h_CON : h_general);
-              break;
-
-            case h_CON:
-              parser->index++;
-              switch (c) {
-                case 'n':
-                  parser->header_state = h_matching_connection;
-                  break;
-                case 't':
-                  parser->header_state = h_matching_content_length;
-                  break;
-                default:
-                  parser->header_state = h_general;
-                  break;
-              }
-              break;
-
-            /* connection */
-
-            case h_matching_connection:
-              parser->index++;
-              if (parser->index > sizeof(CONNECTION)-1
-                  || c != CONNECTION[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CONNECTION)-2) {
-                parser->header_state = h_connection;
-              }
-              break;
-
-            /* proxy-connection */
-
-            case h_matching_proxy_connection:
-              parser->index++;
-              if (parser->index > sizeof(PROXY_CONNECTION)-1
-                  || c != PROXY_CONNECTION[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(PROXY_CONNECTION)-2) {
-                parser->header_state = h_connection;
-              }
-              break;
-
-            /* content-length */
-
-            case h_matching_content_length:
-              parser->index++;
-              if (parser->index > sizeof(CONTENT_LENGTH)-1
-                  || c != CONTENT_LENGTH[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(CONTENT_LENGTH)-2) {
-                parser->header_state = h_content_length;
-              }
-              break;
-
-            /* transfer-encoding */
-
-            case h_matching_transfer_encoding:
-              parser->index++;
-              if (parser->index > sizeof(TRANSFER_ENCODING)-1
-                  || c != TRANSFER_ENCODING[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
-                parser->header_state = h_transfer_encoding;
-              }
-              break;
-
-            /* upgrade */
-
-            case h_matching_upgrade:
-              parser->index++;
-              if (parser->index > sizeof(UPGRADE)-1
-                  || c != UPGRADE[parser->index]) {
-                parser->header_state = h_general;
-              } else if (parser->index == sizeof(UPGRADE)-2) {
-                parser->header_state = h_upgrade;
-              }
-              break;
-
-            case h_connection:
-            case h_content_length:
-            case h_transfer_encoding:
-            case h_upgrade:
-              if (ch != ' ') parser->header_state = h_general;
-              break;
-
-            default:
-              assert(0 && "Unknown header_state");
-              break;
-          }
-        }
-
-        COUNT_HEADER_SIZE(p - start);
-
-        if (p == data + len) {
-          --p;
-          break;
-        }
-
-        if (ch == ':') {
-          UPDATE_STATE(s_header_value_discard_ws);
-          CALLBACK_DATA(header_field);
-          break;
-        }
-
-        SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
-        goto error;
-      }
-
-      case s_header_value_discard_ws:
-        if (ch == ' ' || ch == '\t') break;
-
-        if (ch == CR) {
-          UPDATE_STATE(s_header_value_discard_ws_almost_done);
-          break;
-        }
-
-        if (ch == LF) {
-          UPDATE_STATE(s_header_value_discard_lws);
-          break;
-        }
-
-        /* FALLTHROUGH */
-
-      case s_header_value_start:
-      {
-        MARK(header_value);
-
-        UPDATE_STATE(s_header_value);
-        parser->index = 0;
-
-        c = LOWER(ch);
-
-        switch (parser->header_state) {
-          case h_upgrade:
-            parser->flags |= F_UPGRADE;
-            parser->header_state = h_general;
-            break;
-
-          case h_transfer_encoding:
-            /* looking for 'Transfer-Encoding: chunked' */
-            if ('c' == c) {
-              parser->header_state = h_matching_transfer_encoding_chunked;
-            } else {
-              parser->header_state = h_general;
-            }
-            break;
-
-          case h_content_length:
-            if (UNLIKELY(!IS_NUM(ch))) {
-              SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
-              goto error;
-            }
-
-            if (parser->flags & F_CONTENTLENGTH) {
-              SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH);
-              goto error;
-            }
-
-            parser->flags |= F_CONTENTLENGTH;
-            parser->content_length = ch - '0';
-            break;
-
-          case h_connection:
-            /* looking for 'Connection: keep-alive' */
-            if (c == 'k') {
-              parser->header_state = h_matching_connection_keep_alive;
-            /* looking for 'Connection: close' */
-            } else if (c == 'c') {
-              parser->header_state = h_matching_connection_close;
-            } else if (c == 'u') {
-              parser->header_state = h_matching_connection_upgrade;
-            } else {
-              parser->header_state = h_matching_connection_token;
-            }
-            break;
-
-          /* Multi-value `Connection` header */
-          case h_matching_connection_token_start:
-            break;
-
-          default:
-            parser->header_state = h_general;
-            break;
-        }
-        break;
-      }
-
-      case s_header_value:
-      {
-        const char* start = p;
-        enum header_states h_state = (enum header_states) parser->header_state;
-        for (; p != data + len; p++) {
-          ch = *p;
-          if (ch == CR) {
-            UPDATE_STATE(s_header_almost_done);
-            parser->header_state = h_state;
-            CALLBACK_DATA(header_value);
-            break;
-          }
-
-          if (ch == LF) {
-            UPDATE_STATE(s_header_almost_done);
-            COUNT_HEADER_SIZE(p - start);
-            parser->header_state = h_state;
-            CALLBACK_DATA_NOADVANCE(header_value);
-            REEXECUTE();
-          }
-
-          if (!lenient && !IS_HEADER_CHAR(ch)) {
-            SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
-            goto error;
-          }
-
-          c = LOWER(ch);
-
-          switch (h_state) {
-            case h_general:
-            {
-              const char* p_cr;
-              const char* p_lf;
-              size_t limit = data + len - p;
-
-              limit = MIN(limit, HTTP_MAX_HEADER_SIZE);
-
-              p_cr = (const char*) memchr(p, CR, limit);
-              p_lf = (const char*) memchr(p, LF, limit);
-              if (p_cr != NULL) {
-                if (p_lf != NULL && p_cr >= p_lf)
-                  p = p_lf;
-                else
-                  p = p_cr;
-              } else if (UNLIKELY(p_lf != NULL)) {
-                p = p_lf;
-              } else {
-                p = data + len;
-              }
-              --p;
-
-              break;
-            }
-
-            case h_connection:
-            case h_transfer_encoding:
-              assert(0 && "Shouldn't get here.");
-              break;
-
-            case h_content_length:
-            {
-              uint64_t t;
-
-              if (ch == ' ') break;
-
-              if (UNLIKELY(!IS_NUM(ch))) {
-                SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
-                parser->header_state = h_state;
-                goto error;
-              }
-
-              t = parser->content_length;
-              t *= 10;
-              t += ch - '0';
-
-              /* Overflow? Test against a conservative limit for simplicity. */
-              if (UNLIKELY((ULLONG_MAX - 10) / 10 < parser->content_length)) {
-                SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
-                parser->header_state = h_state;
-                goto error;
-              }
-
-              parser->content_length = t;
-              break;
-            }
-
-            /* Transfer-Encoding: chunked */
-            case h_matching_transfer_encoding_chunked:
-              parser->index++;
-              if (parser->index > sizeof(CHUNKED)-1
-                  || c != CHUNKED[parser->index]) {
-                h_state = h_general;
-              } else if (parser->index == sizeof(CHUNKED)-2) {
-                h_state = h_transfer_encoding_chunked;
-              }
-              break;
-
-            case h_matching_connection_token_start:
-              /* looking for 'Connection: keep-alive' */
-              if (c == 'k') {
-                h_state = h_matching_connection_keep_alive;
-              /* looking for 'Connection: close' */
-              } else if (c == 'c') {
-                h_state = h_matching_connection_close;
-              } else if (c == 'u') {
-                h_state = h_matching_connection_upgrade;
-              } else if (STRICT_TOKEN(c)) {
-                h_state = h_matching_connection_token;
-              } else if (c == ' ' || c == '\t') {
-                /* Skip lws */
-              } else {
-                h_state = h_general;
-              }
-              break;
-
-            /* looking for 'Connection: keep-alive' */
-            case h_matching_connection_keep_alive:
-              parser->index++;
-              if (parser->index > sizeof(KEEP_ALIVE)-1
-                  || c != KEEP_ALIVE[parser->index]) {
-                h_state = h_matching_connection_token;
-              } else if (parser->index == sizeof(KEEP_ALIVE)-2) {
-                h_state = h_connection_keep_alive;
-              }
-              break;
-
-            /* looking for 'Connection: close' */
-            case h_matching_connection_close:
-              parser->index++;
-              if (parser->index > sizeof(CLOSE)-1 || c != CLOSE[parser->index]) {
-                h_state = h_matching_connection_token;
-              } else if (parser->index == sizeof(CLOSE)-2) {
-                h_state = h_connection_close;
-              }
-              break;
-
-            /* looking for 'Connection: upgrade' */
-            case h_matching_connection_upgrade:
-              parser->index++;
-              if (parser->index > sizeof(UPGRADE) - 1 ||
-                  c != UPGRADE[parser->index]) {
-                h_state = h_matching_connection_token;
-              } else if (parser->index == sizeof(UPGRADE)-2) {
-                h_state = h_connection_upgrade;
-              }
-              break;
-
-            case h_matching_connection_token:
-              if (ch == ',') {
-                h_state = h_matching_connection_token_start;
-                parser->index = 0;
-              }
-              break;
-
-            case h_transfer_encoding_chunked:
-              if (ch != ' ') h_state = h_general;
-              break;
-
-            case h_connection_keep_alive:
-            case h_connection_close:
-            case h_connection_upgrade:
-              if (ch == ',') {
-                if (h_state == h_connection_keep_alive) {
-                  parser->flags |= F_CONNECTION_KEEP_ALIVE;
-                } else if (h_state == h_connection_close) {
-                  parser->flags |= F_CONNECTION_CLOSE;
-                } else if (h_state == h_connection_upgrade) {
-                  parser->flags |= F_CONNECTION_UPGRADE;
-                }
-                h_state = h_matching_connection_token_start;
-                parser->index = 0;
-              } else if (ch != ' ') {
-                h_state = h_matching_connection_token;
-              }
-              break;
-
-            default:
-              UPDATE_STATE(s_header_value);
-              h_state = h_general;
-              break;
-          }
-        }
-        parser->header_state = h_state;
-
-        COUNT_HEADER_SIZE(p - start);
-
-        if (p == data + len)
-          --p;
-        break;
-      }
-
-      case s_header_almost_done:
-      {
-        if (UNLIKELY(ch != LF)) {
-          SET_ERRNO(HPE_LF_EXPECTED);
-          goto error;
-        }
-
-        UPDATE_STATE(s_header_value_lws);
-        break;
-      }
-
-      case s_header_value_lws:
-      {
-        if (ch == ' ' || ch == '\t') {
-          UPDATE_STATE(s_header_value_start);
-          REEXECUTE();
-        }
-
-        /* finished the header */
-        switch (parser->header_state) {
-          case h_connection_keep_alive:
-            parser->flags |= F_CONNECTION_KEEP_ALIVE;
-            break;
-          case h_connection_close:
-            parser->flags |= F_CONNECTION_CLOSE;
-            break;
-          case h_transfer_encoding_chunked:
-            parser->flags |= F_CHUNKED;
-            break;
-          case h_connection_upgrade:
-            parser->flags |= F_CONNECTION_UPGRADE;
-            break;
-          default:
-            break;
-        }
-
-        UPDATE_STATE(s_header_field_start);
-        REEXECUTE();
-      }
-
-      case s_header_value_discard_ws_almost_done:
-      {
-        STRICT_CHECK(ch != LF);
-        UPDATE_STATE(s_header_value_discard_lws);
-        break;
-      }
-
-      case s_header_value_discard_lws:
-      {
-        if (ch == ' ' || ch == '\t') {
-          UPDATE_STATE(s_header_value_discard_ws);
-          break;
-        } else {
-          switch (parser->header_state) {
-            case h_connection_keep_alive:
-              parser->flags |= F_CONNECTION_KEEP_ALIVE;
-              break;
-            case h_connection_close:
-              parser->flags |= F_CONNECTION_CLOSE;
-              break;
-            case h_connection_upgrade:
-              parser->flags |= F_CONNECTION_UPGRADE;
-              break;
-            case h_transfer_encoding_chunked:
-              parser->flags |= F_CHUNKED;
-              break;
-            default:
-              break;
-          }
-
-          /* header value was empty */
-          MARK(header_value);
-          UPDATE_STATE(s_header_field_start);
-          CALLBACK_DATA_NOADVANCE(header_value);
-          REEXECUTE();
-        }
-      }
-
-      case s_headers_almost_done:
-      {
-        STRICT_CHECK(ch != LF);
-
-        if (parser->flags & F_TRAILING) {
-          /* End of a chunked request */
-          UPDATE_STATE(s_message_done);
-          CALLBACK_NOTIFY_NOADVANCE(chunk_complete);
-          REEXECUTE();
-        }
-
-        /* Cannot use chunked encoding and a content-length header together
-           per the HTTP specification. */
-        if ((parser->flags & F_CHUNKED) &&
-            (parser->flags & F_CONTENTLENGTH)) {
-          SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH);
-          goto error;
-        }
-
-        UPDATE_STATE(s_headers_done);
-
-        /* Set this here so that on_headers_complete() callbacks can see it */
-        parser->upgrade =
-          ((parser->flags & (F_UPGRADE | F_CONNECTION_UPGRADE)) ==
-           (F_UPGRADE | F_CONNECTION_UPGRADE) ||
-           parser->method == HTTP_CONNECT);
-
-        /* Here we call the headers_complete callback. This is somewhat
-         * different than other callbacks because if the user returns 1, we
-         * will interpret that as saying that this message has no body. This
-         * is needed for the annoying case of recieving a response to a HEAD
-         * request.
-         *
-         * We'd like to use CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so
-         * we have to simulate it by handling a change in errno below.
-         */
-        if (settings->on_headers_complete) {
-          switch (settings->on_headers_complete(parser)) {
-            case 0:
-              break;
-
-            case 2:
-              parser->upgrade = 1;
-
-            case 1:
-              parser->flags |= F_SKIPBODY;
-              break;
-
-            default:
-              SET_ERRNO(HPE_CB_headers_complete);
-              RETURN(p - data); /* Error */
-          }
-        }
-
-        if (HTTP_PARSER_ERRNO(parser) != HPE_OK) {
-          RETURN(p - data);
-        }
-
-        REEXECUTE();
-      }
-
-      case s_headers_done:
-      {
-        int hasBody;
-        STRICT_CHECK(ch != LF);
-
-        parser->nread = 0;
-
-        hasBody = parser->flags & F_CHUNKED ||
-          (parser->content_length > 0 && parser->content_length != ULLONG_MAX);
-        if (parser->upgrade && (parser->method == HTTP_CONNECT ||
-                                (parser->flags & F_SKIPBODY) || !hasBody)) {
-          /* Exit, the rest of the message is in a different protocol. */
-          UPDATE_STATE(NEW_MESSAGE());
-          CALLBACK_NOTIFY(message_complete);
-          RETURN((p - data) + 1);
-        }
-
-        if (parser->flags & F_SKIPBODY) {
-          UPDATE_STATE(NEW_MESSAGE());
-          CALLBACK_NOTIFY(message_complete);
-        } else if (parser->flags & F_CHUNKED) {
-          /* chunked encoding - ignore Content-Length header */
-          UPDATE_STATE(s_chunk_size_start);
-        } else {
-          if (parser->content_length == 0) {
-            /* Content-Length header given but zero: Content-Length: 0\r\n */
-            UPDATE_STATE(NEW_MESSAGE());
-            CALLBACK_NOTIFY(message_complete);
-          } else if (parser->content_length != ULLONG_MAX) {
-            /* Content-Length header given and non-zero */
-            UPDATE_STATE(s_body_identity);
-          } else {
-            if (!http_message_needs_eof(parser)) {
-              /* Assume content-length 0 - read the next */
-              UPDATE_STATE(NEW_MESSAGE());
-              CALLBACK_NOTIFY(message_complete);
-            } else {
-              /* Read body until EOF */
-              UPDATE_STATE(s_body_identity_eof);
-            }
-          }
-        }
-
-        break;
-      }
-
-      case s_body_identity:
-      {
-        uint64_t to_read = MIN(parser->content_length,
-                               (uint64_t) ((data + len) - p));
-
-        assert(parser->content_length != 0
-            && parser->content_length != ULLONG_MAX);
-
-        /* The difference between advancing content_length and p is because
-         * the latter will automaticaly advance on the next loop iteration.
-         * Further, if content_length ends up at 0, we want to see the last
-         * byte again for our message complete callback.
-         */
-        MARK(body);
-        parser->content_length -= to_read;
-        p += to_read - 1;
-
-        if (parser->content_length == 0) {
-          UPDATE_STATE(s_message_done);
-
-          /* Mimic CALLBACK_DATA_NOADVANCE() but with one extra byte.
-           *
-           * The alternative to doing this is to wait for the next byte to
-           * trigger the data callback, just as in every other case. The
-           * problem with this is that this makes it difficult for the test
-           * harness to distinguish between complete-on-EOF and
-           * complete-on-length. It's not clear that this distinction is
-           * important for applications, but let's keep it for now.
-           */
-          CALLBACK_DATA_(body, p - body_mark + 1, p - data);
-          REEXECUTE();
-        }
-
-        break;
-      }
-
-      /* read until EOF */
-      case s_body_identity_eof:
-        MARK(body);
-        p = data + len - 1;
-
-        break;
-
-      case s_message_done:
-        UPDATE_STATE(NEW_MESSAGE());
-        CALLBACK_NOTIFY(message_complete);
-        if (parser->upgrade) {
-          /* Exit, the rest of the message is in a different protocol. */
-          RETURN((p - data) + 1);
-        }
-        break;
-
-      case s_chunk_size_start:
-      {
-        assert(parser->nread == 1);
-        assert(parser->flags & F_CHUNKED);
-
-        unhex_val = unhex[(unsigned char)ch];
-        if (UNLIKELY(unhex_val == -1)) {
-          SET_ERRNO(HPE_INVALID_CHUNK_SIZE);
-          goto error;
-        }
-
-        parser->content_length = unhex_val;
-        UPDATE_STATE(s_chunk_size);
-        break;
-      }
-
-      case s_chunk_size:
-      {
-        uint64_t t;
-
-        assert(parser->flags & F_CHUNKED);
-
-        if (ch == CR) {
-          UPDATE_STATE(s_chunk_size_almost_done);
-          break;
-        }
-
-        unhex_val = unhex[(unsigned char)ch];
-
-        if (unhex_val == -1) {
-          if (ch == ';' || ch == ' ') {
-            UPDATE_STATE(s_chunk_parameters);
-            break;
-          }
-
-          SET_ERRNO(HPE_INVALID_CHUNK_SIZE);
-          goto error;
-        }
-
-        t = parser->content_length;
-        t *= 16;
-        t += unhex_val;
-
-        /* Overflow? Test against a conservative limit for simplicity. */
-        if (UNLIKELY((ULLONG_MAX - 16) / 16 < parser->content_length)) {
-          SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
-          goto error;
-        }
-
-        parser->content_length = t;
-        break;
-      }
-
-      case s_chunk_parameters:
-      {
-        assert(parser->flags & F_CHUNKED);
-        /* just ignore this shit. TODO check for overflow */
-        if (ch == CR) {
-          UPDATE_STATE(s_chunk_size_almost_done);
-          break;
-        }
-        break;
-      }
-
-      case s_chunk_size_almost_done:
-      {
-        assert(parser->flags & F_CHUNKED);
-        STRICT_CHECK(ch != LF);
-
-        parser->nread = 0;
-
-        if (parser->content_length == 0) {
-          parser->flags |= F_TRAILING;
-          UPDATE_STATE(s_header_field_start);
-        } else {
-          UPDATE_STATE(s_chunk_data);
-        }
-        CALLBACK_NOTIFY(chunk_header);
-        break;
-      }
-
-      case s_chunk_data:
-      {
-        uint64_t to_read = MIN(parser->content_length,
-                               (uint64_t) ((data + len) - p));
-
-        assert(parser->flags & F_CHUNKED);
-        assert(parser->content_length != 0
-            && parser->content_length != ULLONG_MAX);
-
-        /* See the explanation in s_body_identity for why the content
-         * length and data pointers are managed this way.
-         */
-        MARK(body);
-        parser->content_length -= to_read;
-        p += to_read - 1;
-
-        if (parser->content_length == 0) {
-          UPDATE_STATE(s_chunk_data_almost_done);
-        }
-
-        break;
-      }
-
-      case s_chunk_data_almost_done:
-        assert(parser->flags & F_CHUNKED);
-        assert(parser->content_length == 0);
-        STRICT_CHECK(ch != CR);
-        UPDATE_STATE(s_chunk_data_done);
-        CALLBACK_DATA(body);
-        break;
-
-      case s_chunk_data_done:
-        assert(parser->flags & F_CHUNKED);
-        STRICT_CHECK(ch != LF);
-        parser->nread = 0;
-        UPDATE_STATE(s_chunk_size_start);
-        CALLBACK_NOTIFY(chunk_complete);
-        break;
-
-      default:
-        assert(0 && "unhandled state");
-        SET_ERRNO(HPE_INVALID_INTERNAL_STATE);
-        goto error;
-    }
-  }
-
-  /* Run callbacks for any marks that we have leftover after we ran our of
-   * bytes. There should be at most one of these set, so it's OK to invoke
-   * them in series (unset marks will not result in callbacks).
-   *
-   * We use the NOADVANCE() variety of callbacks here because 'p' has already
-   * overflowed 'data' and this allows us to correct for the off-by-one that
-   * we'd otherwise have (since CALLBACK_DATA() is meant to be run with a 'p'
-   * value that's in-bounds).
-   */
-
-  assert(((header_field_mark ? 1 : 0) +
-          (header_value_mark ? 1 : 0) +
-          (url_mark ? 1 : 0)  +
-          (body_mark ? 1 : 0) +
-          (status_mark ? 1 : 0)) <= 1);
-
-  CALLBACK_DATA_NOADVANCE(header_field);
-  CALLBACK_DATA_NOADVANCE(header_value);
-  CALLBACK_DATA_NOADVANCE(url);
-  CALLBACK_DATA_NOADVANCE(body);
-  CALLBACK_DATA_NOADVANCE(status);
-
-  RETURN(len);
-
-error:
-  if (HTTP_PARSER_ERRNO(parser) == HPE_OK) {
-    SET_ERRNO(HPE_UNKNOWN);
-  }
-
-  RETURN(p - data);
-}
-
-
-/* Does the parser need to see an EOF to find the end of the message? */
-int
-http_message_needs_eof (const http_parser *parser)
-{
-  if (parser->type == HTTP_REQUEST) {
-    return 0;
-  }
-
-  /* See RFC 2616 section 4.4 */
-  if (parser->status_code / 100 == 1 || /* 1xx e.g. Continue */
-      parser->status_code == 204 ||     /* No Content */
-      parser->status_code == 304 ||     /* Not Modified */
-      parser->flags & F_SKIPBODY) {     /* response to a HEAD request */
-    return 0;
-  }
-
-  if ((parser->flags & F_CHUNKED) || parser->content_length != ULLONG_MAX) {
-    return 0;
-  }
-
-  return 1;
-}
-
-
-int
-http_should_keep_alive (const http_parser *parser)
-{
-  if (parser->http_major > 0 && parser->http_minor > 0) {
-    /* HTTP/1.1 */
-    if (parser->flags & F_CONNECTION_CLOSE) {
-      return 0;
-    }
-  } else {
-    /* HTTP/1.0 or earlier */
-    if (!(parser->flags & F_CONNECTION_KEEP_ALIVE)) {
-      return 0;
-    }
-  }
-
-  return !http_message_needs_eof(parser);
-}
-
-
-const char *
-http_method_str (enum http_method m)
-{
-  return ELEM_AT(method_strings, m, "<unknown>");
-}
-
-
-void
-http_parser_init (http_parser *parser, enum http_parser_type t)
-{
-  void *data = parser->data; /* preserve application data */
-  memset(parser, 0, sizeof(*parser));
-  parser->data = data;
-  parser->type = t;
-  parser->state = (t == HTTP_REQUEST ? s_start_req : (t == HTTP_RESPONSE ? s_start_res : s_start_req_or_res));
-  parser->http_errno = HPE_OK;
-}
-
-void
-http_parser_settings_init(http_parser_settings *settings)
-{
-  memset(settings, 0, sizeof(*settings));
-}
-
-const char *
-http_errno_name(enum http_errno err) {
-  assert(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
-  return http_strerror_tab[err].name;
-}
-
-const char *
-http_errno_description(enum http_errno err) {
-  assert(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
-  return http_strerror_tab[err].description;
-}
-
-static enum http_host_state
-http_parse_host_char(enum http_host_state s, const char ch) {
-  switch(s) {
-    case s_http_userinfo:
-    case s_http_userinfo_start:
-      if (ch == '@') {
-        return s_http_host_start;
-      }
-
-      if (IS_USERINFO_CHAR(ch)) {
-        return s_http_userinfo;
-      }
-      break;
-
-    case s_http_host_start:
-      if (ch == '[') {
-        return s_http_host_v6_start;
-      }
-
-      if (IS_HOST_CHAR(ch)) {
-        return s_http_host;
-      }
-
-      break;
-
-    case s_http_host:
-      if (IS_HOST_CHAR(ch)) {
-        return s_http_host;
-      }
-
-    /* FALLTHROUGH */
-    case s_http_host_v6_end:
-      if (ch == ':') {
-        return s_http_host_port_start;
-      }
-
-      break;
-
-    case s_http_host_v6:
-      if (ch == ']') {
-        return s_http_host_v6_end;
-      }
-
-    /* FALLTHROUGH */
-    case s_http_host_v6_start:
-      if (IS_HEX(ch) || ch == ':' || ch == '.') {
-        return s_http_host_v6;
-      }
-
-      if (s == s_http_host_v6 && ch == '%') {
-        return s_http_host_v6_zone_start;
-      }
-      break;
-
-    case s_http_host_v6_zone:
-      if (ch == ']') {
-        return s_http_host_v6_end;
-      }
-
-    /* FALLTHROUGH */
-    case s_http_host_v6_zone_start:
-      /* RFC 6874 Zone ID consists of 1*( unreserved / pct-encoded) */
-      if (IS_ALPHANUM(ch) || ch == '%' || ch == '.' || ch == '-' || ch == '_' ||
-          ch == '~') {
-        return s_http_host_v6_zone;
-      }
-      break;
-
-    case s_http_host_port:
-    case s_http_host_port_start:
-      if (IS_NUM(ch)) {
-        return s_http_host_port;
-      }
-
-      break;
-
-    default:
-      break;
-  }
-  return s_http_host_dead;
-}
-
-static int
-http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
-  enum http_host_state s;
-
-  const char *p;
-  size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
-
-  assert(u->field_set & (1 << UF_HOST));
-
-  u->field_data[UF_HOST].len = 0;
-
-  s = found_at ? s_http_userinfo_start : s_http_host_start;
-
-  for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++) {
-    enum http_host_state new_s = http_parse_host_char(s, *p);
-
-    if (new_s == s_http_host_dead) {
-      return 1;
-    }
-
-    switch(new_s) {
-      case s_http_host:
-        if (s != s_http_host) {
-          u->field_data[UF_HOST].off = p - buf;
-        }
-        u->field_data[UF_HOST].len++;
-        break;
-
-      case s_http_host_v6:
-        if (s != s_http_host_v6) {
-          u->field_data[UF_HOST].off = p - buf;
-        }
-        u->field_data[UF_HOST].len++;
-        break;
-
-      case s_http_host_v6_zone_start:
-      case s_http_host_v6_zone:
-        u->field_data[UF_HOST].len++;
-        break;
-
-      case s_http_host_port:
-        if (s != s_http_host_port) {
-          u->field_data[UF_PORT].off = p - buf;
-          u->field_data[UF_PORT].len = 0;
-          u->field_set |= (1 << UF_PORT);
-        }
-        u->field_data[UF_PORT].len++;
-        break;
-
-      case s_http_userinfo:
-        if (s != s_http_userinfo) {
-          u->field_data[UF_USERINFO].off = p - buf ;
-          u->field_data[UF_USERINFO].len = 0;
-          u->field_set |= (1 << UF_USERINFO);
-        }
-        u->field_data[UF_USERINFO].len++;
-        break;
-
-      default:
-        break;
-    }
-    s = new_s;
-  }
-
-  /* Make sure we don't end somewhere unexpected */
-  switch (s) {
-    case s_http_host_start:
-    case s_http_host_v6_start:
-    case s_http_host_v6:
-    case s_http_host_v6_zone_start:
-    case s_http_host_v6_zone:
-    case s_http_host_port_start:
-    case s_http_userinfo:
-    case s_http_userinfo_start:
-      return 1;
-    default:
-      break;
-  }
-
-  return 0;
-}
-
-void
-http_parser_url_init(struct http_parser_url *u) {
-  memset(u, 0, sizeof(*u));
-}
-
-int
-http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
-                      struct http_parser_url *u)
-{
-  enum state s;
-  const char *p;
-  enum http_parser_url_fields uf, old_uf;
-  int found_at = 0;
-
-  u->port = u->field_set = 0;
-  s = is_connect ? s_req_server_start : s_req_spaces_before_url;
-  old_uf = UF_MAX;
-
-  for (p = buf; p < buf + buflen; p++) {
-    s = parse_url_char(s, *p);
-
-    /* Figure out the next field that we're operating on */
-    switch (s) {
-      case s_dead:
-        return 1;
-
-      /* Skip delimeters */
-      case s_req_schema_slash:
-      case s_req_schema_slash_slash:
-      case s_req_server_start:
-      case s_req_query_string_start:
-      case s_req_fragment_start:
-        continue;
-
-      case s_req_schema:
-        uf = UF_SCHEMA;
-        break;
-
-      case s_req_server_with_at:
-        found_at = 1;
-
-      /* FALLTROUGH */
-      case s_req_server:
-        uf = UF_HOST;
-        break;
-
-      case s_req_path:
-        uf = UF_PATH;
-        break;
-
-      case s_req_query_string:
-        uf = UF_QUERY;
-        break;
-
-      case s_req_fragment:
-        uf = UF_FRAGMENT;
-        break;
-
-      default:
-        assert(!"Unexpected state");
-        return 1;
-    }
-
-    /* Nothing's changed; soldier on */
-    if (uf == old_uf) {
-      u->field_data[uf].len++;
-      continue;
-    }
-
-    u->field_data[uf].off = p - buf;
-    u->field_data[uf].len = 1;
-
-    u->field_set |= (1 << uf);
-    old_uf = uf;
-  }
-
-  /* host must be present if there is a schema */
-  /* parsing http:///toto will fail */
-  if ((u->field_set & (1 << UF_SCHEMA)) &&
-      (u->field_set & (1 << UF_HOST)) == 0) {
-    return 1;
-  }
-
-  if (u->field_set & (1 << UF_HOST)) {
-    if (http_parse_host(buf, u, found_at) != 0) {
-      return 1;
-    }
-  }
-
-  /* CONNECT requests can only contain "hostname:port" */
-  if (is_connect && u->field_set != ((1 << UF_HOST)|(1 << UF_PORT))) {
-    return 1;
-  }
-
-  if (u->field_set & (1 << UF_PORT)) {
-    /* Don't bother with endp; we've already validated the string */
-    unsigned long v = strtoul(buf + u->field_data[UF_PORT].off, NULL, 10);
-
-    /* Ports have a max value of 2^16 */
-    if (v > 0xffff) {
-      return 1;
-    }
-
-    u->port = (uint16_t) v;
-  }
-
-  return 0;
-}
-
-void
-http_parser_pause(http_parser *parser, int paused) {
-  /* Users should only be pausing/unpausing a parser that is not in an error
-   * state. In non-debug builds, there's not much that we can do about this
-   * other than ignore it.
-   */
-  if (HTTP_PARSER_ERRNO(parser) == HPE_OK ||
-      HTTP_PARSER_ERRNO(parser) == HPE_PAUSED) {
-    SET_ERRNO((paused) ? HPE_PAUSED : HPE_OK);
-  } else {
-    assert(0 && "Attempting to pause parser in error state");
-  }
-}
-
-int
-http_body_is_final(const struct http_parser *parser) {
-    return parser->state == s_message_done;
-}
-
-unsigned long
-http_parser_version(void) {
-  return HTTP_PARSER_VERSION_MAJOR * 0x10000 |
-         HTTP_PARSER_VERSION_MINOR * 0x00100 |
-         HTTP_PARSER_VERSION_PATCH * 0x00001;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.gyp cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.gyp
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.gyp	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.gyp	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-# This file is used with the GYP meta build system.
-# http://code.google.com/p/gyp/
-# To build try this:
-#   svn co http://gyp.googlecode.com/svn/trunk gyp
-#   ./gyp/gyp -f make --depth=`pwd` http_parser.gyp 
-#   ./out/Debug/test 
-{
-  'target_defaults': {
-    'default_configuration': 'Debug',
-    'configurations': {
-      # TODO: hoist these out and put them somewhere common, because
-      #       RuntimeLibrary MUST MATCH across the entire project
-      'Debug': {
-        'defines': [ 'DEBUG', '_DEBUG' ],
-        'cflags': [ '-Wall', '-Wextra', '-O0', '-g', '-ftrapv' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'RuntimeLibrary': 1, # static debug
-          },
-        },
-      },
-      'Release': {
-        'defines': [ 'NDEBUG' ],
-        'cflags': [ '-Wall', '-Wextra', '-O3' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'RuntimeLibrary': 0, # static release
-          },
-        },
-      }
-    },
-    'msvs_settings': {
-      'VCCLCompilerTool': {
-      },
-      'VCLibrarianTool': {
-      },
-      'VCLinkerTool': {
-        'GenerateDebugInformation': 'true',
-      },
-    },
-    'conditions': [
-      ['OS == "win"', {
-        'defines': [
-          'WIN32'
-        ],
-      }]
-    ],
-  },
-
-  'targets': [
-    {
-      'target_name': 'http_parser',
-      'type': 'static_library',
-      'include_dirs': [ '.' ],
-      'direct_dependent_settings': {
-        'defines': [ 'HTTP_PARSER_STRICT=0' ],
-        'include_dirs': [ '.' ],
-      },
-      'defines': [ 'HTTP_PARSER_STRICT=0' ],
-      'sources': [ './http_parser.c', ],
-      'conditions': [
-        ['OS=="win"', {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              # Compile as C++. http_parser.c is actually C99, but C++ is
-              # close enough in this case.
-              'CompileAs': 2,
-            },
-          },
-        }]
-      ],
-    },
-
-    {
-      'target_name': 'http_parser_strict',
-      'type': 'static_library',
-      'include_dirs': [ '.' ],
-      'direct_dependent_settings': {
-        'defines': [ 'HTTP_PARSER_STRICT=1' ],
-        'include_dirs': [ '.' ],
-      },
-      'defines': [ 'HTTP_PARSER_STRICT=1' ],
-      'sources': [ './http_parser.c', ],
-      'conditions': [
-        ['OS=="win"', {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              # Compile as C++. http_parser.c is actually C99, but C++ is
-              # close enough in this case.
-              'CompileAs': 2,
-            },
-          },
-        }]
-      ],
-    },
-
-    {
-      'target_name': 'test-nonstrict',
-      'type': 'executable',
-      'dependencies': [ 'http_parser' ],
-      'sources': [ 'test.c' ]
-    },
-
-    {
-      'target_name': 'test-strict',
-      'type': 'executable',
-      'dependencies': [ 'http_parser_strict' ],
-      'sources': [ 'test.c' ]
-    }
-  ]
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/http_parser.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,362 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#ifndef http_parser_h
-#define http_parser_h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Also update SONAME in the Makefile whenever you change these. */
-#define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 7
-#define HTTP_PARSER_VERSION_PATCH 1
-
-#include <sys/types.h>
-#if defined(_WIN32) && !defined(__MINGW32__) && \
-  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
-#include <BaseTsd.h>
-#include <stddef.h>
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
- * faster
- */
-#ifndef HTTP_PARSER_STRICT
-# define HTTP_PARSER_STRICT 1
-#endif
-
-/* Maximium header size allowed. If the macro is not defined
- * before including this header then the default is used. To
- * change the maximum header size, define the macro in the build
- * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
- * the effective limit on the size of the header, define the macro
- * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
- */
-#ifndef HTTP_MAX_HEADER_SIZE
-# define HTTP_MAX_HEADER_SIZE (80*1024)
-#endif
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-
-
-/* Callbacks should return non-zero to indicate an error. The parser will
- * then halt execution.
- *
- * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
- * returning '1' from on_headers_complete will tell the parser that it
- * should not expect a body. This is used when receiving a response to a
- * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
- * chunked' headers that indicate the presence of a body.
- *
- * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
- * useful for handling responses to a CONNECT request which may not contain
- * `Upgrade` or `Connection: upgrade` headers.
- *
- * http_data_cb does not return data chunks. It will be called arbitrarily
- * many times for each string. E.G. you might get 10 callbacks for "on_url"
- * each providing just a few characters more data.
- */
-typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
-typedef int (*http_cb) (http_parser*);
-
-
-/* Request Methods */
-#define HTTP_METHOD_MAP(XX)         \
-  XX(0,  DELETE,      DELETE)       \
-  XX(1,  GET,         GET)          \
-  XX(2,  HEAD,        HEAD)         \
-  XX(3,  POST,        POST)         \
-  XX(4,  PUT,         PUT)          \
-  /* pathological */                \
-  XX(5,  CONNECT,     CONNECT)      \
-  XX(6,  OPTIONS,     OPTIONS)      \
-  XX(7,  TRACE,       TRACE)        \
-  /* WebDAV */                      \
-  XX(8,  COPY,        COPY)         \
-  XX(9,  LOCK,        LOCK)         \
-  XX(10, MKCOL,       MKCOL)        \
-  XX(11, MOVE,        MOVE)         \
-  XX(12, PROPFIND,    PROPFIND)     \
-  XX(13, PROPPATCH,   PROPPATCH)    \
-  XX(14, SEARCH,      SEARCH)       \
-  XX(15, UNLOCK,      UNLOCK)       \
-  XX(16, BIND,        BIND)         \
-  XX(17, REBIND,      REBIND)       \
-  XX(18, UNBIND,      UNBIND)       \
-  XX(19, ACL,         ACL)          \
-  /* subversion */                  \
-  XX(20, REPORT,      REPORT)       \
-  XX(21, MKACTIVITY,  MKACTIVITY)   \
-  XX(22, CHECKOUT,    CHECKOUT)     \
-  XX(23, MERGE,       MERGE)        \
-  /* upnp */                        \
-  XX(24, MSEARCH,     M-SEARCH)     \
-  XX(25, NOTIFY,      NOTIFY)       \
-  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
-  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
-  /* RFC-5789 */                    \
-  XX(28, PATCH,       PATCH)        \
-  XX(29, PURGE,       PURGE)        \
-  /* CalDAV */                      \
-  XX(30, MKCALENDAR,  MKCALENDAR)   \
-  /* RFC-2068, section 19.6.1.2 */  \
-  XX(31, LINK,        LINK)         \
-  XX(32, UNLINK,      UNLINK)       \
-
-enum http_method
-  {
-#define XX(num, name, string) HTTP_##name = num,
-  HTTP_METHOD_MAP(XX)
-#undef XX
-  };
-
-
-enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
-
-
-/* Flag values for http_parser.flags field */
-enum flags
-  { F_CHUNKED               = 1 << 0
-  , F_CONNECTION_KEEP_ALIVE = 1 << 1
-  , F_CONNECTION_CLOSE      = 1 << 2
-  , F_CONNECTION_UPGRADE    = 1 << 3
-  , F_TRAILING              = 1 << 4
-  , F_UPGRADE               = 1 << 5
-  , F_SKIPBODY              = 1 << 6
-  , F_CONTENTLENGTH         = 1 << 7
-  };
-
-
-/* Map for errno-related constants
- *
- * The provided argument should be a macro that takes 2 arguments.
- */
-#define HTTP_ERRNO_MAP(XX)                                           \
-  /* No error */                                                     \
-  XX(OK, "success")                                                  \
-                                                                     \
-  /* Callback-related errors */                                      \
-  XX(CB_message_begin, "the on_message_begin callback failed")       \
-  XX(CB_url, "the on_url callback failed")                           \
-  XX(CB_header_field, "the on_header_field callback failed")         \
-  XX(CB_header_value, "the on_header_value callback failed")         \
-  XX(CB_headers_complete, "the on_headers_complete callback failed") \
-  XX(CB_body, "the on_body callback failed")                         \
-  XX(CB_message_complete, "the on_message_complete callback failed") \
-  XX(CB_status, "the on_status callback failed")                     \
-  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
-  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
-                                                                     \
-  /* Parsing-related errors */                                       \
-  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
-  XX(HEADER_OVERFLOW,                                                \
-     "too many header bytes seen; overflow detected")                \
-  XX(CLOSED_CONNECTION,                                              \
-     "data received after completed connection: close message")      \
-  XX(INVALID_VERSION, "invalid HTTP version")                        \
-  XX(INVALID_STATUS, "invalid HTTP status code")                     \
-  XX(INVALID_METHOD, "invalid HTTP method")                          \
-  XX(INVALID_URL, "invalid URL")                                     \
-  XX(INVALID_HOST, "invalid host")                                   \
-  XX(INVALID_PORT, "invalid port")                                   \
-  XX(INVALID_PATH, "invalid path")                                   \
-  XX(INVALID_QUERY_STRING, "invalid query string")                   \
-  XX(INVALID_FRAGMENT, "invalid fragment")                           \
-  XX(LF_EXPECTED, "LF character expected")                           \
-  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
-  XX(INVALID_CONTENT_LENGTH,                                         \
-     "invalid character in content-length header")                   \
-  XX(UNEXPECTED_CONTENT_LENGTH,                                      \
-     "unexpected content-length header")                             \
-  XX(INVALID_CHUNK_SIZE,                                             \
-     "invalid character in chunk size header")                       \
-  XX(INVALID_CONSTANT, "invalid constant string")                    \
-  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
-  XX(STRICT, "strict mode assertion failed")                         \
-  XX(PAUSED, "parser is paused")                                     \
-  XX(UNKNOWN, "an unknown error occurred")
-
-
-/* Define HPE_* values for each errno value above */
-#define HTTP_ERRNO_GEN(n, s) HPE_##n,
-enum http_errno {
-  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
-};
-#undef HTTP_ERRNO_GEN
-
-
-/* Get an http_errno value from an http_parser */
-#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
-
-
-struct http_parser {
-  /** PRIVATE **/
-  unsigned int type : 2;         /* enum http_parser_type */
-  unsigned int flags : 8;        /* F_* values from 'flags' enum; semi-public */
-  unsigned int state : 7;        /* enum state from http_parser.c */
-  unsigned int header_state : 7; /* enum header_state from http_parser.c */
-  unsigned int index : 7;        /* index into current matcher */
-  unsigned int lenient_http_headers : 1;
-
-  uint32_t nread;          /* # bytes read in various scenarios */
-  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
-
-  /** READ-ONLY **/
-  unsigned short http_major;
-  unsigned short http_minor;
-  unsigned int status_code : 16; /* responses only */
-  unsigned int method : 8;       /* requests only */
-  unsigned int http_errno : 7;
-
-  /* 1 = Upgrade header was present and the parser has exited because of that.
-   * 0 = No upgrade header present.
-   * Should be checked when http_parser_execute() returns in addition to
-   * error checking.
-   */
-  unsigned int upgrade : 1;
-
-  /** PUBLIC **/
-  void *data; /* A pointer to get hook to the "connection" or "socket" object */
-};
-
-
-struct http_parser_settings {
-  http_cb      on_message_begin;
-  http_data_cb on_url;
-  http_data_cb on_status;
-  http_data_cb on_header_field;
-  http_data_cb on_header_value;
-  http_cb      on_headers_complete;
-  http_data_cb on_body;
-  http_cb      on_message_complete;
-  /* When on_chunk_header is called, the current chunk length is stored
-   * in parser->content_length.
-   */
-  http_cb      on_chunk_header;
-  http_cb      on_chunk_complete;
-};
-
-
-enum http_parser_url_fields
-  { UF_SCHEMA           = 0
-  , UF_HOST             = 1
-  , UF_PORT             = 2
-  , UF_PATH             = 3
-  , UF_QUERY            = 4
-  , UF_FRAGMENT         = 5
-  , UF_USERINFO         = 6
-  , UF_MAX              = 7
-  };
-
-
-/* Result structure for http_parser_parse_url().
- *
- * Callers should index into field_data[] with UF_* values iff field_set
- * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
- * because we probably have padding left over), we convert any port to
- * a uint16_t.
- */
-struct http_parser_url {
-  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
-  uint16_t port;                /* Converted UF_PORT string */
-
-  struct {
-    uint16_t off;               /* Offset into buffer in which field starts */
-    uint16_t len;               /* Length of run in buffer */
-  } field_data[UF_MAX];
-};
-
-
-/* Returns the library version. Bits 16-23 contain the major version number,
- * bits 8-15 the minor version number and bits 0-7 the patch level.
- * Usage example:
- *
- *   unsigned long version = http_parser_version();
- *   unsigned major = (version >> 16) & 255;
- *   unsigned minor = (version >> 8) & 255;
- *   unsigned patch = version & 255;
- *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
- */
-unsigned long http_parser_version(void);
-
-void http_parser_init(http_parser *parser, enum http_parser_type type);
-
-
-/* Initialize http_parser_settings members to 0
- */
-void http_parser_settings_init(http_parser_settings *settings);
-
-
-/* Executes the parser. Returns number of parsed bytes. Sets
- * `parser->http_errno` on error. */
-size_t http_parser_execute(http_parser *parser,
-                           const http_parser_settings *settings,
-                           const char *data,
-                           size_t len);
-
-
-/* If http_should_keep_alive() in the on_headers_complete or
- * on_message_complete callback returns 0, then this should be
- * the last message on the connection.
- * If you are the server, respond with the "Connection: close" header.
- * If you are the client, close the connection.
- */
-int http_should_keep_alive(const http_parser *parser);
-
-/* Returns a string version of the HTTP method. */
-const char *http_method_str(enum http_method m);
-
-/* Return a string name of the given error */
-const char *http_errno_name(enum http_errno err);
-
-/* Return a string description of the given error */
-const char *http_errno_description(enum http_errno err);
-
-/* Initialize all http_parser_url members to 0 */
-void http_parser_url_init(struct http_parser_url *u);
-
-/* Parse a URL; return nonzero on failure */
-int http_parser_parse_url(const char *buf, size_t buflen,
-                          int is_connect,
-                          struct http_parser_url *u);
-
-/* Pause or un-pause the parser; a nonzero value pauses */
-void http_parser_pause(http_parser *parser, int paused);
-
-/* Checks if this is the final chunk of the body. */
-int http_body_is_final(const http_parser *parser);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/LICENSE-MIT cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/LICENSE-MIT
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
-Igor Sysoev.
-
-Additional changes are licensed under the same terms as NGINX and
-copyright Joyent, Inc. and other Node contributors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE. 
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,246 +0,0 @@
-HTTP Parser
-===========
-
-[![Build Status](https://api.travis-ci.org/nodejs/http-parser.svg?branch=master)](https://travis-ci.org/nodejs/http-parser)
-
-This is a parser for HTTP messages written in C. It parses both requests and
-responses. The parser is designed to be used in performance HTTP
-applications. It does not make any syscalls nor allocations, it does not
-buffer data, it can be interrupted at anytime. Depending on your
-architecture, it only requires about 40 bytes of data per message
-stream (in a web server that is per connection).
-
-Features:
-
-  * No dependencies
-  * Handles persistent streams (keep-alive).
-  * Decodes chunked encoding.
-  * Upgrade support
-  * Defends against buffer overflow attacks.
-
-The parser extracts the following information from HTTP messages:
-
-  * Header fields and values
-  * Content-Length
-  * Request method
-  * Response status code
-  * Transfer-Encoding
-  * HTTP version
-  * Request URL
-  * Message body
-
-
-Usage
------
-
-One `http_parser` object is used per TCP connection. Initialize the struct
-using `http_parser_init()` and set the callbacks. That might look something
-like this for a request parser:
-```c
-http_parser_settings settings;
-settings.on_url = my_url_callback;
-settings.on_header_field = my_header_field_callback;
-/* ... */
-
-http_parser *parser = malloc(sizeof(http_parser));
-http_parser_init(parser, HTTP_REQUEST);
-parser->data = my_socket;
-```
-
-When data is received on the socket execute the parser and check for errors.
-
-```c
-size_t len = 80*1024, nparsed;
-char buf[len];
-ssize_t recved;
-
-recved = recv(fd, buf, len, 0);
-
-if (recved < 0) {
-  /* Handle error. */
-}
-
-/* Start up / continue the parser.
- * Note we pass recved==0 to signal that EOF has been received.
- */
-nparsed = http_parser_execute(parser, &settings, buf, recved);
-
-if (parser->upgrade) {
-  /* handle new protocol */
-} else if (nparsed != recved) {
-  /* Handle error. Usually just close the connection. */
-}
-```
-
-HTTP needs to know where the end of the stream is. For example, sometimes
-servers send responses without Content-Length and expect the client to
-consume input (for the body) until EOF. To tell http_parser about EOF, give
-`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
-can still be encountered during an EOF, so one must still be prepared
-to receive them.
-
-Scalar valued message information such as `status_code`, `method`, and the
-HTTP version are stored in the parser structure. This data is only
-temporally stored in `http_parser` and gets reset on each new message. If
-this information is needed later, copy it out of the structure during the
-`headers_complete` callback.
-
-The parser decodes the transfer-encoding for both requests and responses
-transparently. That is, a chunked encoding is decoded before being sent to
-the on_body callback.
-
-
-The Special Problem of Upgrade
-------------------------------
-
-HTTP supports upgrading the connection to a different protocol. An
-increasingly common example of this is the WebSocket protocol which sends
-a request like
-
-        GET /demo HTTP/1.1
-        Upgrade: WebSocket
-        Connection: Upgrade
-        Host: example.com
-        Origin: http://example.com
-        WebSocket-Protocol: sample
-
-followed by non-HTTP data.
-
-(See [RFC6455](https://tools.ietf.org/html/rfc6455) for more information the
-WebSocket protocol.)
-
-To support this, the parser will treat this as a normal HTTP message without a
-body, issuing both on_headers_complete and on_message_complete callbacks. However
-http_parser_execute() will stop parsing at the end of the headers and return.
-
-The user is expected to check if `parser->upgrade` has been set to 1 after
-`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
-offset by the return value of `http_parser_execute()`.
-
-
-Callbacks
----------
-
-During the `http_parser_execute()` call, the callbacks set in
-`http_parser_settings` will be executed. The parser maintains state and
-never looks behind, so buffering the data is not necessary. If you need to
-save certain data for later usage, you can do that from the callbacks.
-
-There are two types of callbacks:
-
-* notification `typedef int (*http_cb) (http_parser*);`
-    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
-* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
-    Callbacks: (requests only) on_url,
-               (common) on_header_field, on_header_value, on_body;
-
-Callbacks must return 0 on success. Returning a non-zero value indicates
-error to the parser, making it exit immediately.
-
-For cases where it is necessary to pass local information to/from a callback,
-the `http_parser` object's `data` field can be used.
-An example of such a case is when using threads to handle a socket connection,
-parse a request, and then give a response over that socket. By instantiation
-of a thread-local struct containing relevant data (e.g. accepted socket,
-allocated memory for callbacks to write into, etc), a parser's callbacks are
-able to communicate data between the scope of the thread and the scope of the
-callback in a threadsafe manner. This allows http-parser to be used in
-multi-threaded contexts.
-
-Example:
-```c
- typedef struct {
-  socket_t sock;
-  void* buffer;
-  int buf_len;
- } custom_data_t;
-
-
-int my_url_callback(http_parser* parser, const char *at, size_t length) {
-  /* access to thread local custom_data_t struct.
-  Use this access save parsed data for later use into thread local
-  buffer, or communicate over socket
-  */
-  parser->data;
-  ...
-  return 0;
-}
-
-...
-
-void http_parser_thread(socket_t sock) {
- int nparsed = 0;
- /* allocate memory for user data */
- custom_data_t *my_data = malloc(sizeof(custom_data_t));
-
- /* some information for use by callbacks.
- * achieves thread -> callback information flow */
- my_data->sock = sock;
-
- /* instantiate a thread-local parser */
- http_parser *parser = malloc(sizeof(http_parser));
- http_parser_init(parser, HTTP_REQUEST); /* initialise parser */
- /* this custom data reference is accessible through the reference to the
- parser supplied to callback functions */
- parser->data = my_data;
-
- http_parser_settings settings; /* set up callbacks */
- settings.on_url = my_url_callback;
-
- /* execute parser */
- nparsed = http_parser_execute(parser, &settings, buf, recved);
-
- ...
- /* parsed information copied from callback.
- can now perform action on data copied into thread-local memory from callbacks.
- achieves callback -> thread information flow */
- my_data->buffer;
- ...
-}
-
-```
-
-In case you parse HTTP message in chunks (i.e. `read()` request line
-from socket, parse, read half headers, parse, etc) your data callbacks
-may be called more than once. Http-parser guarantees that data pointer is only
-valid for the lifetime of callback. You can also `read()` into a heap allocated
-buffer to avoid copying memory around if this fits your application.
-
-Reading headers may be a tricky task if you read/parse headers partially.
-Basically, you need to remember whether last header callback was field or value
-and apply the following logic:
-
-    (on_header_field and on_header_value shortened to on_h_*)
-     ------------------------ ------------ --------------------------------------------
-    | State (prev. callback) | Callback   | Description/action                         |
-     ------------------------ ------------ --------------------------------------------
-    | nothing (first call)   | on_h_field | Allocate new buffer and copy callback data |
-    |                        |            | into it                                    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_field | New header started.                        |
-    |                        |            | Copy current name,value buffers to headers |
-    |                        |            | list and allocate new buffer for new name  |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_field | Previous name continues. Reallocate name   |
-    |                        |            | buffer and append callback data to it      |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_value | Value for current header started. Allocate |
-    |                        |            | new buffer and copy callback data to it    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_value | Value continues. Reallocate value buffer   |
-    |                        |            | and append callback data to it             |
-     ------------------------ ------------ --------------------------------------------
-
-
-Parsing URLs
-------------
-
-A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
-Users of this library may wish to use it to parse URLs constructed from
-consecutive `on_url` callbacks.
-
-See examples of reading in headers:
-
-* [partial example](http://gist.github.com/155877) in C
-* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
-* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/http-parser/test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4226 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include "http_parser.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h> /* rand */
-#include <string.h>
-#include <stdarg.h>
-
-#if defined(__APPLE__)
-# undef strlcat
-# undef strlncpy
-# undef strlcpy
-#endif  /* defined(__APPLE__) */
-
-#undef TRUE
-#define TRUE 1
-#undef FALSE
-#define FALSE 0
-
-#define MAX_HEADERS 13
-#define MAX_ELEMENT_SIZE 2048
-#define MAX_CHUNKS 16
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
-static http_parser *parser;
-
-struct message {
-  const char *name; // for debugging purposes
-  const char *raw;
-  enum http_parser_type type;
-  enum http_method method;
-  int status_code;
-  char response_status[MAX_ELEMENT_SIZE];
-  char request_path[MAX_ELEMENT_SIZE];
-  char request_url[MAX_ELEMENT_SIZE];
-  char fragment[MAX_ELEMENT_SIZE];
-  char query_string[MAX_ELEMENT_SIZE];
-  char body[MAX_ELEMENT_SIZE];
-  size_t body_size;
-  const char *host;
-  const char *userinfo;
-  uint16_t port;
-  int num_headers;
-  enum { NONE=0, FIELD, VALUE } last_header_element;
-  char headers [MAX_HEADERS][2][MAX_ELEMENT_SIZE];
-  int should_keep_alive;
-
-  int num_chunks;
-  int num_chunks_complete;
-  int chunk_lengths[MAX_CHUNKS];
-
-  const char *upgrade; // upgraded body
-
-  unsigned short http_major;
-  unsigned short http_minor;
-
-  int message_begin_cb_called;
-  int headers_complete_cb_called;
-  int message_complete_cb_called;
-  int message_complete_on_eof;
-  int body_is_final;
-};
-
-static int currently_parsing_eof;
-
-static struct message messages[5];
-static int num_messages;
-static http_parser_settings *current_pause_parser;
-
-/* * R E Q U E S T S * */
-const struct message requests[] =
-#define CURL_GET 0
-{ {.name= "curl get"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /test HTTP/1.1\r\n"
-         "User-Agent: curl/7.18.0 (i486-pc-linux-gnu) libcurl/7.18.0 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/1.1\r\n"
-         "Host: 0.0.0.0=5000\r\n"
-         "Accept: */*\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
-  ,.request_url= "/test"
-  ,.num_headers= 3
-  ,.headers=
-    { { "User-Agent", "curl/7.18.0 (i486-pc-linux-gnu) libcurl/7.18.0 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/1.1" }
-    , { "Host", "0.0.0.0=5000" }
-    , { "Accept", "*/*" }
-    }
-  ,.body= ""
-  }
-
-#define FIREFOX_GET 1
-, {.name= "firefox get"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /favicon.ico HTTP/1.1\r\n"
-         "Host: 0.0.0.0=5000\r\n"
-         "User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9) Gecko/2008061015 Firefox/3.0\r\n"
-         "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"
-         "Accept-Language: en-us,en;q=0.5\r\n"
-         "Accept-Encoding: gzip,deflate\r\n"
-         "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n"
-         "Keep-Alive: 300\r\n"
-         "Connection: keep-alive\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/favicon.ico"
-  ,.request_url= "/favicon.ico"
-  ,.num_headers= 8
-  ,.headers=
-    { { "Host", "0.0.0.0=5000" }
-    , { "User-Agent", "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9) Gecko/2008061015 Firefox/3.0" }
-    , { "Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" }
-    , { "Accept-Language", "en-us,en;q=0.5" }
-    , { "Accept-Encoding", "gzip,deflate" }
-    , { "Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.7" }
-    , { "Keep-Alive", "300" }
-    , { "Connection", "keep-alive" }
-    }
-  ,.body= ""
-  }
-
-#define DUMBFUCK 2
-, {.name= "dumbfuck"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /dumbfuck HTTP/1.1\r\n"
-         "aaaaaaaaaaaaa:++++++++++\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/dumbfuck"
-  ,.request_url= "/dumbfuck"
-  ,.num_headers= 1
-  ,.headers=
-    { { "aaaaaaaaaaaaa",  "++++++++++" }
-    }
-  ,.body= ""
-  }
-
-#define FRAGMENT_IN_URI 3
-, {.name= "fragment in url"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= "page=1"
-  ,.fragment= "posts-17408"
-  ,.request_path= "/forums/1/topics/2375"
-  /* XXX request url does include fragment? */
-  ,.request_url= "/forums/1/topics/2375?page=1#posts-17408"
-  ,.num_headers= 0
-  ,.body= ""
-  }
-
-#define GET_NO_HEADERS_NO_BODY 4
-, {.name= "get no headers no body"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /get_no_headers_no_body/world HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE /* would need Connection: close */
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/get_no_headers_no_body/world"
-  ,.request_url= "/get_no_headers_no_body/world"
-  ,.num_headers= 0
-  ,.body= ""
-  }
-
-#define GET_ONE_HEADER_NO_BODY 5
-, {.name= "get one header no body"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /get_one_header_no_body HTTP/1.1\r\n"
-         "Accept: */*\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE /* would need Connection: close */
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/get_one_header_no_body"
-  ,.request_url= "/get_one_header_no_body"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Accept" , "*/*" }
-    }
-  ,.body= ""
-  }
-
-#define GET_FUNKY_CONTENT_LENGTH 6
-, {.name= "get funky content length body hello"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /get_funky_content_length_body_hello HTTP/1.0\r\n"
-         "conTENT-Length: 5\r\n"
-         "\r\n"
-         "HELLO"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/get_funky_content_length_body_hello"
-  ,.request_url= "/get_funky_content_length_body_hello"
-  ,.num_headers= 1
-  ,.headers=
-    { { "conTENT-Length" , "5" }
-    }
-  ,.body= "HELLO"
-  }
-
-#define POST_IDENTITY_BODY_WORLD 7
-, {.name= "post identity body world"
-  ,.type= HTTP_REQUEST
-  ,.raw= "POST /post_identity_body_world?q=search#hey HTTP/1.1\r\n"
-         "Accept: */*\r\n"
-         "Transfer-Encoding: identity\r\n"
-         "Content-Length: 5\r\n"
-         "\r\n"
-         "World"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= "q=search"
-  ,.fragment= "hey"
-  ,.request_path= "/post_identity_body_world"
-  ,.request_url= "/post_identity_body_world?q=search#hey"
-  ,.num_headers= 3
-  ,.headers=
-    { { "Accept", "*/*" }
-    , { "Transfer-Encoding", "identity" }
-    , { "Content-Length", "5" }
-    }
-  ,.body= "World"
-  }
-
-#define POST_CHUNKED_ALL_YOUR_BASE 8
-, {.name= "post - chunked body: all your base are belong to us"
-  ,.type= HTTP_REQUEST
-  ,.raw= "POST /post_chunked_all_your_base HTTP/1.1\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "1e\r\nall your base are belong to us\r\n"
-         "0\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/post_chunked_all_your_base"
-  ,.request_url= "/post_chunked_all_your_base"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Transfer-Encoding" , "chunked" }
-    }
-  ,.body= "all your base are belong to us"
-  ,.num_chunks_complete= 2
-  ,.chunk_lengths= { 0x1e }
-  }
-
-#define TWO_CHUNKS_MULT_ZERO_END 9
-, {.name= "two chunks ; triple zero ending"
-  ,.type= HTTP_REQUEST
-  ,.raw= "POST /two_chunks_mult_zero_end HTTP/1.1\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "5\r\nhello\r\n"
-         "6\r\n world\r\n"
-         "000\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/two_chunks_mult_zero_end"
-  ,.request_url= "/two_chunks_mult_zero_end"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Transfer-Encoding", "chunked" }
-    }
-  ,.body= "hello world"
-  ,.num_chunks_complete= 3
-  ,.chunk_lengths= { 5, 6 }
-  }
-
-#define CHUNKED_W_TRAILING_HEADERS 10
-, {.name= "chunked with trailing headers. blech."
-  ,.type= HTTP_REQUEST
-  ,.raw= "POST /chunked_w_trailing_headers HTTP/1.1\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "5\r\nhello\r\n"
-         "6\r\n world\r\n"
-         "0\r\n"
-         "Vary: *\r\n"
-         "Content-Type: text/plain\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/chunked_w_trailing_headers"
-  ,.request_url= "/chunked_w_trailing_headers"
-  ,.num_headers= 3
-  ,.headers=
-    { { "Transfer-Encoding",  "chunked" }
-    , { "Vary", "*" }
-    , { "Content-Type", "text/plain" }
-    }
-  ,.body= "hello world"
-  ,.num_chunks_complete= 3
-  ,.chunk_lengths= { 5, 6 }
-  }
-
-#define CHUNKED_W_BULLSHIT_AFTER_LENGTH 11
-, {.name= "with bullshit after the length"
-  ,.type= HTTP_REQUEST
-  ,.raw= "POST /chunked_w_bullshit_after_length HTTP/1.1\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "5; ihatew3;whatthefuck=aretheseparametersfor\r\nhello\r\n"
-         "6; blahblah; blah\r\n world\r\n"
-         "0\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/chunked_w_bullshit_after_length"
-  ,.request_url= "/chunked_w_bullshit_after_length"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Transfer-Encoding", "chunked" }
-    }
-  ,.body= "hello world"
-  ,.num_chunks_complete= 3
-  ,.chunk_lengths= { 5, 6 }
-  }
-
-#define WITH_QUOTES 12
-, {.name= "with quotes"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /with_\"stupid\"_quotes?foo=\"bar\" HTTP/1.1\r\n\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= "foo=\"bar\""
-  ,.fragment= ""
-  ,.request_path= "/with_\"stupid\"_quotes"
-  ,.request_url= "/with_\"stupid\"_quotes?foo=\"bar\""
-  ,.num_headers= 0
-  ,.headers= { }
-  ,.body= ""
-  }
-
-#define APACHEBENCH_GET 13
-/* The server receiving this request SHOULD NOT wait for EOF
- * to know that content-length == 0.
- * How to represent this in a unit test? message_complete_on_eof
- * Compare with NO_CONTENT_LENGTH_RESPONSE.
- */
-, {.name = "apachebench get"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /test HTTP/1.0\r\n"
-         "Host: 0.0.0.0:5000\r\n"
-         "User-Agent: ApacheBench/2.3\r\n"
-         "Accept: */*\r\n\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
-  ,.request_url= "/test"
-  ,.num_headers= 3
-  ,.headers= { { "Host", "0.0.0.0:5000" }
-             , { "User-Agent", "ApacheBench/2.3" }
-             , { "Accept", "*/*" }
-             }
-  ,.body= ""
-  }
-
-#define QUERY_URL_WITH_QUESTION_MARK_GET 14
-/* Some clients include '?' characters in query strings.
- */
-, {.name = "query url with question mark"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /test.cgi?foo=bar?baz HTTP/1.1\r\n\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= "foo=bar?baz"
-  ,.fragment= ""
-  ,.request_path= "/test.cgi"
-  ,.request_url= "/test.cgi?foo=bar?baz"
-  ,.num_headers= 0
-  ,.headers= {}
-  ,.body= ""
-  }
-
-#define PREFIX_NEWLINE_GET 15
-/* Some clients, especially after a POST in a keep-alive connection,
- * will send an extra CRLF before the next request
- */
-, {.name = "newline prefix get"
-  ,.type= HTTP_REQUEST
-  ,.raw= "\r\nGET /test HTTP/1.1\r\n\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
-  ,.request_url= "/test"
-  ,.num_headers= 0
-  ,.headers= { }
-  ,.body= ""
-  }
-
-#define UPGRADE_REQUEST 16
-, {.name = "upgrade request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /demo HTTP/1.1\r\n"
-         "Host: example.com\r\n"
-         "Connection: Upgrade\r\n"
-         "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
-         "Sec-WebSocket-Protocol: sample\r\n"
-         "Upgrade: WebSocket\r\n"
-         "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
-         "Origin: http://example.com\r\n"
-         "\r\n"
-         "Hot diggity dogg"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/demo"
-  ,.request_url= "/demo"
-  ,.num_headers= 7
-  ,.upgrade="Hot diggity dogg"
-  ,.headers= { { "Host", "example.com" }
-             , { "Connection", "Upgrade" }
-             , { "Sec-WebSocket-Key2", "12998 5 Y3 1  .P00" }
-             , { "Sec-WebSocket-Protocol", "sample" }
-             , { "Upgrade", "WebSocket" }
-             , { "Sec-WebSocket-Key1", "4 @1  46546xW%0l 1 5" }
-             , { "Origin", "http://example.com" }
-             }
-  ,.body= ""
-  }
-
-#define CONNECT_REQUEST 17
-, {.name = "connect request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "CONNECT 0-home0.netscape.com:443 HTTP/1.0\r\n"
-         "User-agent: Mozilla/1.1N\r\n"
-         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
-         "\r\n"
-         "some data\r\n"
-         "and yet even more data"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.method= HTTP_CONNECT
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "0-home0.netscape.com:443"
-  ,.num_headers= 2
-  ,.upgrade="some data\r\nand yet even more data"
-  ,.headers= { { "User-agent", "Mozilla/1.1N" }
-             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
-             }
-  ,.body= ""
-  }
-
-#define REPORT_REQ 18
-, {.name= "report request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "REPORT /test HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_REPORT
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
-  ,.request_url= "/test"
-  ,.num_headers= 0
-  ,.headers= {}
-  ,.body= ""
-  }
-
-#define NO_HTTP_VERSION 19
-, {.name= "request with no http version"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 0
-  ,.http_minor= 9
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
-  ,.request_url= "/"
-  ,.num_headers= 0
-  ,.headers= {}
-  ,.body= ""
-  }
-
-#define MSEARCH_REQ 20
-, {.name= "m-search request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "M-SEARCH * HTTP/1.1\r\n"
-         "HOST: 239.255.255.250:1900\r\n"
-         "MAN: \"ssdp:discover\"\r\n"
-         "ST: \"ssdp:all\"\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_MSEARCH
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "*"
-  ,.request_url= "*"
-  ,.num_headers= 3
-  ,.headers= { { "HOST", "239.255.255.250:1900" }
-             , { "MAN", "\"ssdp:discover\"" }
-             , { "ST", "\"ssdp:all\"" }
-             }
-  ,.body= ""
-  }
-
-#define LINE_FOLDING_IN_HEADER 21
-, {.name= "line folding in header value"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET / HTTP/1.1\r\n"
-         "Line1:   abc\r\n"
-         "\tdef\r\n"
-         " ghi\r\n"
-         "\t\tjkl\r\n"
-         "  mno \r\n"
-         "\t \tqrs\r\n"
-         "Line2: \t line2\t\r\n"
-         "Line3:\r\n"
-         " line3\r\n"
-         "Line4: \r\n"
-         " \r\n"
-         "Connection:\r\n"
-         " close\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
-  ,.request_url= "/"
-  ,.num_headers= 5
-  ,.headers= { { "Line1", "abc\tdef ghi\t\tjkl  mno \t \tqrs" }
-             , { "Line2", "line2\t" }
-             , { "Line3", "line3" }
-             , { "Line4", "" }
-             , { "Connection", "close" },
-             }
-  ,.body= ""
-  }
-
-
-#define QUERY_TERMINATED_HOST 22
-, {.name= "host terminated by a query string"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET http://hypnotoad.org?hail=all HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= "hail=all"
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "http://hypnotoad.org?hail=all"
-  ,.host= "hypnotoad.org"
-  ,.num_headers= 0
-  ,.headers= { }
-  ,.body= ""
-  }
-
-#define QUERY_TERMINATED_HOSTPORT 23
-, {.name= "host:port terminated by a query string"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET http://hypnotoad.org:1234?hail=all HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= "hail=all"
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "http://hypnotoad.org:1234?hail=all"
-  ,.host= "hypnotoad.org"
-  ,.port= 1234
-  ,.num_headers= 0
-  ,.headers= { }
-  ,.body= ""
-  }
-
-#define SPACE_TERMINATED_HOSTPORT 24
-, {.name= "host:port terminated by a space"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET http://hypnotoad.org:1234 HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "http://hypnotoad.org:1234"
-  ,.host= "hypnotoad.org"
-  ,.port= 1234
-  ,.num_headers= 0
-  ,.headers= { }
-  ,.body= ""
-  }
-
-#define PATCH_REQ 25
-, {.name = "PATCH request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "PATCH /file.txt HTTP/1.1\r\n"
-         "Host: www.example.com\r\n"
-         "Content-Type: application/example\r\n"
-         "If-Match: \"e0023aa4e\"\r\n"
-         "Content-Length: 10\r\n"
-         "\r\n"
-         "cccccccccc"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_PATCH
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/file.txt"
-  ,.request_url= "/file.txt"
-  ,.num_headers= 4
-  ,.headers= { { "Host", "www.example.com" }
-             , { "Content-Type", "application/example" }
-             , { "If-Match", "\"e0023aa4e\"" }
-             , { "Content-Length", "10" }
-             }
-  ,.body= "cccccccccc"
-  }
-
-#define CONNECT_CAPS_REQUEST 26
-, {.name = "connect caps request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "CONNECT HOME0.NETSCAPE.COM:443 HTTP/1.0\r\n"
-         "User-agent: Mozilla/1.1N\r\n"
-         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.method= HTTP_CONNECT
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "HOME0.NETSCAPE.COM:443"
-  ,.num_headers= 2
-  ,.upgrade=""
-  ,.headers= { { "User-agent", "Mozilla/1.1N" }
-             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
-             }
-  ,.body= ""
-  }
-
-#if !HTTP_PARSER_STRICT
-#define UTF8_PATH_REQ 27
-, {.name= "utf-8 path request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\n"
-         "Host: github.com\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= "q=1"
-  ,.fragment= "narf"
-  ,.request_path= "/δ¶/δt/pope"
-  ,.request_url= "/δ¶/δt/pope?q=1#narf"
-  ,.num_headers= 1
-  ,.headers= { {"Host", "github.com" }
-             }
-  ,.body= ""
-  }
-
-#define HOSTNAME_UNDERSCORE 28
-, {.name = "hostname underscore"
-  ,.type= HTTP_REQUEST
-  ,.raw= "CONNECT home_0.netscape.com:443 HTTP/1.0\r\n"
-         "User-agent: Mozilla/1.1N\r\n"
-         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.method= HTTP_CONNECT
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "home_0.netscape.com:443"
-  ,.num_headers= 2
-  ,.upgrade=""
-  ,.headers= { { "User-agent", "Mozilla/1.1N" }
-             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
-             }
-  ,.body= ""
-  }
-#endif  /* !HTTP_PARSER_STRICT */
-
-/* see https://github.com/ry/http-parser/issues/47 */
-#define EAT_TRAILING_CRLF_NO_CONNECTION_CLOSE 29
-, {.name = "eat CRLF between requests, no \"Connection: close\" header"
-  ,.raw= "POST / HTTP/1.1\r\n"
-         "Host: www.example.com\r\n"
-         "Content-Type: application/x-www-form-urlencoded\r\n"
-         "Content-Length: 4\r\n"
-         "\r\n"
-         "q=42\r\n" /* note the trailing CRLF */
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
-  ,.request_url= "/"
-  ,.num_headers= 3
-  ,.upgrade= 0
-  ,.headers= { { "Host", "www.example.com" }
-             , { "Content-Type", "application/x-www-form-urlencoded" }
-             , { "Content-Length", "4" }
-             }
-  ,.body= "q=42"
-  }
-
-/* see https://github.com/ry/http-parser/issues/47 */
-#define EAT_TRAILING_CRLF_WITH_CONNECTION_CLOSE 30
-, {.name = "eat CRLF between requests even if \"Connection: close\" is set"
-  ,.raw= "POST / HTTP/1.1\r\n"
-         "Host: www.example.com\r\n"
-         "Content-Type: application/x-www-form-urlencoded\r\n"
-         "Content-Length: 4\r\n"
-         "Connection: close\r\n"
-         "\r\n"
-         "q=42\r\n" /* note the trailing CRLF */
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE /* input buffer isn't empty when on_message_complete is called */
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
-  ,.request_url= "/"
-  ,.num_headers= 4
-  ,.upgrade= 0
-  ,.headers= { { "Host", "www.example.com" }
-             , { "Content-Type", "application/x-www-form-urlencoded" }
-             , { "Content-Length", "4" }
-             , { "Connection", "close" }
-             }
-  ,.body= "q=42"
-  }
-
-#define PURGE_REQ 31
-, {.name = "PURGE request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "PURGE /file.txt HTTP/1.1\r\n"
-         "Host: www.example.com\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_PURGE
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/file.txt"
-  ,.request_url= "/file.txt"
-  ,.num_headers= 1
-  ,.headers= { { "Host", "www.example.com" } }
-  ,.body= ""
-  }
-
-#define SEARCH_REQ 32
-, {.name = "SEARCH request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "SEARCH / HTTP/1.1\r\n"
-         "Host: www.example.com\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_SEARCH
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
-  ,.request_url= "/"
-  ,.num_headers= 1
-  ,.headers= { { "Host", "www.example.com" } }
-  ,.body= ""
-  }
-
-#define PROXY_WITH_BASIC_AUTH 33
-, {.name= "host:port and basic_auth"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET http://a%12:b!&*$@hypnotoad.org:1234/toto HTTP/1.1\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.fragment= ""
-  ,.request_path= "/toto"
-  ,.request_url= "http://a%12:b!&*$@hypnotoad.org:1234/toto"
-  ,.host= "hypnotoad.org"
-  ,.userinfo= "a%12:b!&*$"
-  ,.port= 1234
-  ,.num_headers= 0
-  ,.headers= { }
-  ,.body= ""
-  }
-
-#define LINE_FOLDING_IN_HEADER_WITH_LF 34
-, {.name= "line folding in header value"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET / HTTP/1.1\n"
-         "Line1:   abc\n"
-         "\tdef\n"
-         " ghi\n"
-         "\t\tjkl\n"
-         "  mno \n"
-         "\t \tqrs\n"
-         "Line2: \t line2\t\n"
-         "Line3:\n"
-         " line3\n"
-         "Line4: \n"
-         " \n"
-         "Connection:\n"
-         " close\n"
-         "\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
-  ,.request_url= "/"
-  ,.num_headers= 5
-  ,.headers= { { "Line1", "abc\tdef ghi\t\tjkl  mno \t \tqrs" }
-             , { "Line2", "line2\t" }
-             , { "Line3", "line3" }
-             , { "Line4", "" }
-             , { "Connection", "close" },
-             }
-  ,.body= ""
-  }
-
-#define CONNECTION_MULTI 35
-, {.name = "multiple connection header values with folding"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /demo HTTP/1.1\r\n"
-         "Host: example.com\r\n"
-         "Connection: Something,\r\n"
-         " Upgrade, ,Keep-Alive\r\n"
-         "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
-         "Sec-WebSocket-Protocol: sample\r\n"
-         "Upgrade: WebSocket\r\n"
-         "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
-         "Origin: http://example.com\r\n"
-         "\r\n"
-         "Hot diggity dogg"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/demo"
-  ,.request_url= "/demo"
-  ,.num_headers= 7
-  ,.upgrade="Hot diggity dogg"
-  ,.headers= { { "Host", "example.com" }
-             , { "Connection", "Something, Upgrade, ,Keep-Alive" }
-             , { "Sec-WebSocket-Key2", "12998 5 Y3 1  .P00" }
-             , { "Sec-WebSocket-Protocol", "sample" }
-             , { "Upgrade", "WebSocket" }
-             , { "Sec-WebSocket-Key1", "4 @1  46546xW%0l 1 5" }
-             , { "Origin", "http://example.com" }
-             }
-  ,.body= ""
-  }
-
-#define CONNECTION_MULTI_LWS 36
-, {.name = "multiple connection header values with folding and lws"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /demo HTTP/1.1\r\n"
-         "Connection: keep-alive, upgrade\r\n"
-         "Upgrade: WebSocket\r\n"
-         "\r\n"
-         "Hot diggity dogg"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/demo"
-  ,.request_url= "/demo"
-  ,.num_headers= 2
-  ,.upgrade="Hot diggity dogg"
-  ,.headers= { { "Connection", "keep-alive, upgrade" }
-             , { "Upgrade", "WebSocket" }
-             }
-  ,.body= ""
-  }
-
-#define CONNECTION_MULTI_LWS_CRLF 37
-, {.name = "multiple connection header values with folding and lws"
-  ,.type= HTTP_REQUEST
-  ,.raw= "GET /demo HTTP/1.1\r\n"
-         "Connection: keep-alive, \r\n upgrade\r\n"
-         "Upgrade: WebSocket\r\n"
-         "\r\n"
-         "Hot diggity dogg"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/demo"
-  ,.request_url= "/demo"
-  ,.num_headers= 2
-  ,.upgrade="Hot diggity dogg"
-  ,.headers= { { "Connection", "keep-alive,  upgrade" }
-             , { "Upgrade", "WebSocket" }
-             }
-  ,.body= ""
-  }
-
-#define UPGRADE_POST_REQUEST 38
-, {.name = "upgrade post request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "POST /demo HTTP/1.1\r\n"
-         "Host: example.com\r\n"
-         "Connection: Upgrade\r\n"
-         "Upgrade: HTTP/2.0\r\n"
-         "Content-Length: 15\r\n"
-         "\r\n"
-         "sweet post body"
-         "Hot diggity dogg"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_POST
-  ,.request_path= "/demo"
-  ,.request_url= "/demo"
-  ,.num_headers= 4
-  ,.upgrade="Hot diggity dogg"
-  ,.headers= { { "Host", "example.com" }
-             , { "Connection", "Upgrade" }
-             , { "Upgrade", "HTTP/2.0" }
-             , { "Content-Length", "15" }
-             }
-  ,.body= "sweet post body"
-  }
-
-#define CONNECT_WITH_BODY_REQUEST 39
-, {.name = "connect with body request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "CONNECT foo.bar.com:443 HTTP/1.0\r\n"
-         "User-agent: Mozilla/1.1N\r\n"
-         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
-         "Content-Length: 10\r\n"
-         "\r\n"
-         "blarfcicle"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.method= HTTP_CONNECT
-  ,.request_url= "foo.bar.com:443"
-  ,.num_headers= 3
-  ,.upgrade="blarfcicle"
-  ,.headers= { { "User-agent", "Mozilla/1.1N" }
-             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
-             , { "Content-Length", "10" }
-             }
-  ,.body= ""
-  }
-
-/* Examples from the Internet draft for LINK/UNLINK methods:
- * https://tools.ietf.org/id/draft-snell-link-method-01.html#rfc.section.5
- */
-
-#define LINK_REQUEST 40
-, {.name = "link request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "LINK /images/my_dog.jpg HTTP/1.1\r\n"
-         "Host: example.com\r\n"
-         "Link: <http://example.com/profiles/joe>; rel=\"tag\"\r\n"
-         "Link: <http://example.com/profiles/sally>; rel=\"tag\"\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_LINK
-  ,.request_path= "/images/my_dog.jpg"
-  ,.request_url= "/images/my_dog.jpg"
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.num_headers= 3
-  ,.headers= { { "Host", "example.com" }
-             , { "Link", "<http://example.com/profiles/joe>; rel=\"tag\"" }
-	     , { "Link", "<http://example.com/profiles/sally>; rel=\"tag\"" }
-             }
-  ,.body= ""
-  }
-
-#define UNLINK_REQUEST 41
-, {.name = "link request"
-  ,.type= HTTP_REQUEST
-  ,.raw= "UNLINK /images/my_dog.jpg HTTP/1.1\r\n"
-         "Host: example.com\r\n"
-         "Link: <http://example.com/profiles/sally>; rel=\"tag\"\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.method= HTTP_UNLINK
-  ,.request_path= "/images/my_dog.jpg"
-  ,.request_url= "/images/my_dog.jpg"
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.num_headers= 2
-  ,.headers= { { "Host", "example.com" }
-	     , { "Link", "<http://example.com/profiles/sally>; rel=\"tag\"" }
-             }
-  ,.body= ""
-  }
-
-, {.name= NULL } /* sentinel */
-};
-
-/* * R E S P O N S E S * */
-const struct message responses[] =
-#define GOOGLE_301 0
-{ {.name= "google 301"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 301 Moved Permanently\r\n"
-         "Location: http://www.google.com/\r\n"
-         "Content-Type: text/html; charset=UTF-8\r\n"
-         "Date: Sun, 26 Apr 2009 11:11:49 GMT\r\n"
-         "Expires: Tue, 26 May 2009 11:11:49 GMT\r\n"
-         "X-$PrototypeBI-Version: 1.6.0.3\r\n" /* $ char in header field */
-         "Cache-Control: public, max-age=2592000\r\n"
-         "Server: gws\r\n"
-         "Content-Length:  219  \r\n"
-         "\r\n"
-         "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n"
-         "<TITLE>301 Moved</TITLE></HEAD><BODY>\n"
-         "<H1>301 Moved</H1>\n"
-         "The document has moved\n"
-         "<A HREF=\"http://www.google.com/\">here</A>.\r\n"
-         "</BODY></HTML>\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 301
-  ,.response_status= "Moved Permanently"
-  ,.num_headers= 8
-  ,.headers=
-    { { "Location", "http://www.google.com/" }
-    , { "Content-Type", "text/html; charset=UTF-8" }
-    , { "Date", "Sun, 26 Apr 2009 11:11:49 GMT" }
-    , { "Expires", "Tue, 26 May 2009 11:11:49 GMT" }
-    , { "X-$PrototypeBI-Version", "1.6.0.3" }
-    , { "Cache-Control", "public, max-age=2592000" }
-    , { "Server", "gws" }
-    , { "Content-Length", "219  " }
-    }
-  ,.body= "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n"
-          "<TITLE>301 Moved</TITLE></HEAD><BODY>\n"
-          "<H1>301 Moved</H1>\n"
-          "The document has moved\n"
-          "<A HREF=\"http://www.google.com/\">here</A>.\r\n"
-          "</BODY></HTML>\r\n"
-  }
-
-#define NO_CONTENT_LENGTH_RESPONSE 1
-/* The client should wait for the server's EOF. That is, when content-length
- * is not specified, and "Connection: close", the end of body is specified
- * by the EOF.
- * Compare with APACHEBENCH_GET
- */
-, {.name= "no content-length response"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Date: Tue, 04 Aug 2009 07:59:32 GMT\r\n"
-         "Server: Apache\r\n"
-         "X-Powered-By: Servlet/2.5 JSP/2.1\r\n"
-         "Content-Type: text/xml; charset=utf-8\r\n"
-         "Connection: close\r\n"
-         "\r\n"
-         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-         "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
-         "  <SOAP-ENV:Body>\n"
-         "    <SOAP-ENV:Fault>\n"
-         "       <faultcode>SOAP-ENV:Client</faultcode>\n"
-         "       <faultstring>Client Error</faultstring>\n"
-         "    </SOAP-ENV:Fault>\n"
-         "  </SOAP-ENV:Body>\n"
-         "</SOAP-ENV:Envelope>"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 5
-  ,.headers=
-    { { "Date", "Tue, 04 Aug 2009 07:59:32 GMT" }
-    , { "Server", "Apache" }
-    , { "X-Powered-By", "Servlet/2.5 JSP/2.1" }
-    , { "Content-Type", "text/xml; charset=utf-8" }
-    , { "Connection", "close" }
-    }
-  ,.body= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-          "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
-          "  <SOAP-ENV:Body>\n"
-          "    <SOAP-ENV:Fault>\n"
-          "       <faultcode>SOAP-ENV:Client</faultcode>\n"
-          "       <faultstring>Client Error</faultstring>\n"
-          "    </SOAP-ENV:Fault>\n"
-          "  </SOAP-ENV:Body>\n"
-          "</SOAP-ENV:Envelope>"
-  }
-
-#define NO_HEADERS_NO_BODY_404 2
-, {.name= "404 no headers no body"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 404 Not Found\r\n\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 404
-  ,.response_status= "Not Found"
-  ,.num_headers= 0
-  ,.headers= {}
-  ,.body_size= 0
-  ,.body= ""
-  }
-
-#define NO_REASON_PHRASE 3
-, {.name= "301 no response phrase"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 301\r\n\r\n"
-  ,.should_keep_alive = FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 301
-  ,.response_status= ""
-  ,.num_headers= 0
-  ,.headers= {}
-  ,.body= ""
-  }
-
-#define TRAILING_SPACE_ON_CHUNKED_BODY 4
-, {.name="200 trailing space on chunked body"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Content-Type: text/plain\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "25  \r\n"
-         "This is the data in the first chunk\r\n"
-         "\r\n"
-         "1C\r\n"
-         "and this is the second one\r\n"
-         "\r\n"
-         "0  \r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 2
-  ,.headers=
-    { {"Content-Type", "text/plain" }
-    , {"Transfer-Encoding", "chunked" }
-    }
-  ,.body_size = 37+28
-  ,.body =
-         "This is the data in the first chunk\r\n"
-         "and this is the second one\r\n"
-  ,.num_chunks_complete= 3
-  ,.chunk_lengths= { 0x25, 0x1c }
-  }
-
-#define NO_CARRIAGE_RET 5
-, {.name="no carriage ret"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\n"
-         "Content-Type: text/html; charset=utf-8\n"
-         "Connection: close\n"
-         "\n"
-         "these headers are from http://news.ycombinator.com/"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 2
-  ,.headers=
-    { {"Content-Type", "text/html; charset=utf-8" }
-    , {"Connection", "close" }
-    }
-  ,.body= "these headers are from http://news.ycombinator.com/"
-  }
-
-#define PROXY_CONNECTION 6
-, {.name="proxy connection"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Content-Type: text/html; charset=UTF-8\r\n"
-         "Content-Length: 11\r\n"
-         "Proxy-Connection: close\r\n"
-         "Date: Thu, 31 Dec 2009 20:55:48 +0000\r\n"
-         "\r\n"
-         "hello world"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 4
-  ,.headers=
-    { {"Content-Type", "text/html; charset=UTF-8" }
-    , {"Content-Length", "11" }
-    , {"Proxy-Connection", "close" }
-    , {"Date", "Thu, 31 Dec 2009 20:55:48 +0000"}
-    }
-  ,.body= "hello world"
-  }
-
-#define UNDERSTORE_HEADER_KEY 7
-  // shown by
-  // curl -o /dev/null -v "http://ad.doubleclick.net/pfadx/DARTSHELLCONFIGXML;dcmt=text/xml;"
-, {.name="underscore header key"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Server: DCLK-AdSvr\r\n"
-         "Content-Type: text/xml\r\n"
-         "Content-Length: 0\r\n"
-         "DCLK_imp: v7;x;114750856;0-0;0;17820020;0/0;21603567/21621457/1;;~okv=;dcmt=text/xml;;~cs=o\r\n\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 4
-  ,.headers=
-    { {"Server", "DCLK-AdSvr" }
-    , {"Content-Type", "text/xml" }
-    , {"Content-Length", "0" }
-    , {"DCLK_imp", "v7;x;114750856;0-0;0;17820020;0/0;21603567/21621457/1;;~okv=;dcmt=text/xml;;~cs=o" }
-    }
-  ,.body= ""
-  }
-
-#define BONJOUR_MADAME_FR 8
-/* The client should not merge two headers fields when the first one doesn't
- * have a value.
- */
-, {.name= "bonjourmadame.fr"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.0 301 Moved Permanently\r\n"
-         "Date: Thu, 03 Jun 2010 09:56:32 GMT\r\n"
-         "Server: Apache/2.2.3 (Red Hat)\r\n"
-         "Cache-Control: public\r\n"
-         "Pragma: \r\n"
-         "Location: http://www.bonjourmadame.fr/\r\n"
-         "Vary: Accept-Encoding\r\n"
-         "Content-Length: 0\r\n"
-         "Content-Type: text/html; charset=UTF-8\r\n"
-         "Connection: keep-alive\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.status_code= 301
-  ,.response_status= "Moved Permanently"
-  ,.num_headers= 9
-  ,.headers=
-    { { "Date", "Thu, 03 Jun 2010 09:56:32 GMT" }
-    , { "Server", "Apache/2.2.3 (Red Hat)" }
-    , { "Cache-Control", "public" }
-    , { "Pragma", "" }
-    , { "Location", "http://www.bonjourmadame.fr/" }
-    , { "Vary",  "Accept-Encoding" }
-    , { "Content-Length", "0" }
-    , { "Content-Type", "text/html; charset=UTF-8" }
-    , { "Connection", "keep-alive" }
-    }
-  ,.body= ""
-  }
-
-#define RES_FIELD_UNDERSCORE 9
-/* Should handle spaces in header fields */
-, {.name= "field underscore"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Date: Tue, 28 Sep 2010 01:14:13 GMT\r\n"
-         "Server: Apache\r\n"
-         "Cache-Control: no-cache, must-revalidate\r\n"
-         "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
-         ".et-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\n"
-         "Vary: Accept-Encoding\r\n"
-         "_eep-Alive: timeout=45\r\n" /* semantic value ignored */
-         "_onnection: Keep-Alive\r\n" /* semantic value ignored */
-         "Transfer-Encoding: chunked\r\n"
-         "Content-Type: text/html\r\n"
-         "Connection: close\r\n"
-         "\r\n"
-         "0\r\n\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 11
-  ,.headers=
-    { { "Date", "Tue, 28 Sep 2010 01:14:13 GMT" }
-    , { "Server", "Apache" }
-    , { "Cache-Control", "no-cache, must-revalidate" }
-    , { "Expires", "Mon, 26 Jul 1997 05:00:00 GMT" }
-    , { ".et-Cookie", "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com" }
-    , { "Vary", "Accept-Encoding" }
-    , { "_eep-Alive", "timeout=45" }
-    , { "_onnection", "Keep-Alive" }
-    , { "Transfer-Encoding", "chunked" }
-    , { "Content-Type", "text/html" }
-    , { "Connection", "close" }
-    }
-  ,.body= ""
-  ,.num_chunks_complete= 1
-  ,.chunk_lengths= {}
-  }
-
-#define NON_ASCII_IN_STATUS_LINE 10
-/* Should handle non-ASCII in status line */
-, {.name= "non-ASCII in status line"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 500 Oriëntatieprobleem\r\n"
-         "Date: Fri, 5 Nov 2010 23:07:12 GMT+2\r\n"
-         "Content-Length: 0\r\n"
-         "Connection: close\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 500
-  ,.response_status= "Oriëntatieprobleem"
-  ,.num_headers= 3
-  ,.headers=
-    { { "Date", "Fri, 5 Nov 2010 23:07:12 GMT+2" }
-    , { "Content-Length", "0" }
-    , { "Connection", "close" }
-    }
-  ,.body= ""
-  }
-
-#define HTTP_VERSION_0_9 11
-/* Should handle HTTP/0.9 */
-, {.name= "http version 0.9"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/0.9 200 OK\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 0
-  ,.http_minor= 9
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 0
-  ,.headers=
-    {}
-  ,.body= ""
-  }
-
-#define NO_CONTENT_LENGTH_NO_TRANSFER_ENCODING_RESPONSE 12
-/* The client should wait for the server's EOF. That is, when neither
- * content-length nor transfer-encoding is specified, the end of body
- * is specified by the EOF.
- */
-, {.name= "neither content-length nor transfer-encoding response"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Content-Type: text/plain\r\n"
-         "\r\n"
-         "hello world"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Content-Type", "text/plain" }
-    }
-  ,.body= "hello world"
-  }
-
-#define NO_BODY_HTTP10_KA_200 13
-, {.name= "HTTP/1.0 with keep-alive and EOF-terminated 200 status"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.0 200 OK\r\n"
-         "Connection: keep-alive\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Connection", "keep-alive" }
-    }
-  ,.body_size= 0
-  ,.body= ""
-  }
-
-#define NO_BODY_HTTP10_KA_204 14
-, {.name= "HTTP/1.0 with keep-alive and a 204 status"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.0 204 No content\r\n"
-         "Connection: keep-alive\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 0
-  ,.status_code= 204
-  ,.response_status= "No content"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Connection", "keep-alive" }
-    }
-  ,.body_size= 0
-  ,.body= ""
-  }
-
-#define NO_BODY_HTTP11_KA_200 15
-, {.name= "HTTP/1.1 with an EOF-terminated 200 status"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 0
-  ,.headers={}
-  ,.body_size= 0
-  ,.body= ""
-  }
-
-#define NO_BODY_HTTP11_KA_204 16
-, {.name= "HTTP/1.1 with a 204 status"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 204 No content\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 204
-  ,.response_status= "No content"
-  ,.num_headers= 0
-  ,.headers={}
-  ,.body_size= 0
-  ,.body= ""
-  }
-
-#define NO_BODY_HTTP11_NOKA_204 17
-, {.name= "HTTP/1.1 with a 204 status and keep-alive disabled"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 204 No content\r\n"
-         "Connection: close\r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 204
-  ,.response_status= "No content"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Connection", "close" }
-    }
-  ,.body_size= 0
-  ,.body= ""
-  }
-
-#define NO_BODY_HTTP11_KA_CHUNKED_200 18
-, {.name= "HTTP/1.1 with chunked endocing and a 200 response"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "0\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 1
-  ,.headers=
-    { { "Transfer-Encoding", "chunked" }
-    }
-  ,.body_size= 0
-  ,.body= ""
-  ,.num_chunks_complete= 1
-  }
-
-#if !HTTP_PARSER_STRICT
-#define SPACE_IN_FIELD_RES 19
-/* Should handle spaces in header fields */
-, {.name= "field space"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Server: Microsoft-IIS/6.0\r\n"
-         "X-Powered-By: ASP.NET\r\n"
-         "en-US Content-Type: text/xml\r\n" /* this is the problem */
-         "Content-Type: text/xml\r\n"
-         "Content-Length: 16\r\n"
-         "Date: Fri, 23 Jul 2010 18:45:38 GMT\r\n"
-         "Connection: keep-alive\r\n"
-         "\r\n"
-         "<xml>hello</xml>" /* fake body */
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 7
-  ,.headers=
-    { { "Server",  "Microsoft-IIS/6.0" }
-    , { "X-Powered-By", "ASP.NET" }
-    , { "en-US Content-Type", "text/xml" }
-    , { "Content-Type", "text/xml" }
-    , { "Content-Length", "16" }
-    , { "Date", "Fri, 23 Jul 2010 18:45:38 GMT" }
-    , { "Connection", "keep-alive" }
-    }
-  ,.body= "<xml>hello</xml>"
-  }
-#endif /* !HTTP_PARSER_STRICT */
-
-#define AMAZON_COM 20
-, {.name= "amazon.com"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 301 MovedPermanently\r\n"
-         "Date: Wed, 15 May 2013 17:06:33 GMT\r\n"
-         "Server: Server\r\n"
-         "x-amz-id-1: 0GPHKXSJQ826RK7GZEB2\r\n"
-         "p3p: policyref=\"http://www.amazon.com/w3c/p3p.xml\",CP=\"CAO DSP LAW CUR ADM IVAo IVDo CONo OTPo OUR DELi PUBi OTRi BUS PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA HEA PRE LOC GOV OTC \"\r\n"
-         "x-amz-id-2: STN69VZxIFSz9YJLbz1GDbxpbjG6Qjmmq5E3DxRhOUw+Et0p4hr7c/Q8qNcx4oAD\r\n"
-         "Location: http://www.amazon.com/Dan-Brown/e/B000AP9DSU/ref=s9_pop_gw_al1?_encoding=UTF8&refinementId=618073011&pf_rd_m=ATVPDKIKX0DER&pf_rd_s=center-2&pf_rd_r=0SHYY5BZXN3KR20BNFAY&pf_rd_t=101&pf_rd_p=1263340922&pf_rd_i=507846\r\n"
-         "Vary: Accept-Encoding,User-Agent\r\n"
-         "Content-Type: text/html; charset=ISO-8859-1\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "1\r\n"
-         "\n\r\n"
-         "0\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 301
-  ,.response_status= "MovedPermanently"
-  ,.num_headers= 9
-  ,.headers= { { "Date", "Wed, 15 May 2013 17:06:33 GMT" }
-             , { "Server", "Server" }
-             , { "x-amz-id-1", "0GPHKXSJQ826RK7GZEB2" }
-             , { "p3p", "policyref=\"http://www.amazon.com/w3c/p3p.xml\",CP=\"CAO DSP LAW CUR ADM IVAo IVDo CONo OTPo OUR DELi PUBi OTRi BUS PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA HEA PRE LOC GOV OTC \"" }
-             , { "x-amz-id-2", "STN69VZxIFSz9YJLbz1GDbxpbjG6Qjmmq5E3DxRhOUw+Et0p4hr7c/Q8qNcx4oAD" }
-             , { "Location", "http://www.amazon.com/Dan-Brown/e/B000AP9DSU/ref=s9_pop_gw_al1?_encoding=UTF8&refinementId=618073011&pf_rd_m=ATVPDKIKX0DER&pf_rd_s=center-2&pf_rd_r=0SHYY5BZXN3KR20BNFAY&pf_rd_t=101&pf_rd_p=1263340922&pf_rd_i=507846" }
-             , { "Vary", "Accept-Encoding,User-Agent" }
-             , { "Content-Type", "text/html; charset=ISO-8859-1" }
-             , { "Transfer-Encoding", "chunked" }
-             }
-  ,.body= "\n"
-  ,.num_chunks_complete= 2
-  ,.chunk_lengths= { 1 }
-  }
-
-#define EMPTY_REASON_PHRASE_AFTER_SPACE 20
-, {.name= "empty reason phrase after space"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 \r\n"
-         "\r\n"
-  ,.should_keep_alive= FALSE
-  ,.message_complete_on_eof= TRUE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= ""
-  ,.num_headers= 0
-  ,.headers= {}
-  ,.body= ""
-  }
-
-#define CONTENT_LENGTH_X 21
-, {.name= "Content-Length-X"
-  ,.type= HTTP_RESPONSE
-  ,.raw= "HTTP/1.1 200 OK\r\n"
-         "Content-Length-X: 0\r\n"
-         "Transfer-Encoding: chunked\r\n"
-         "\r\n"
-         "2\r\n"
-         "OK\r\n"
-         "0\r\n"
-         "\r\n"
-  ,.should_keep_alive= TRUE
-  ,.message_complete_on_eof= FALSE
-  ,.http_major= 1
-  ,.http_minor= 1
-  ,.status_code= 200
-  ,.response_status= "OK"
-  ,.num_headers= 2
-  ,.headers= { { "Content-Length-X", "0" }
-             , { "Transfer-Encoding", "chunked" }
-             }
-  ,.body= "OK"
-  ,.num_chunks_complete= 2
-  ,.chunk_lengths= { 2 }
-  }
-
-, {.name= NULL } /* sentinel */
-};
-
-/* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
- * define it ourselves.
- */
-size_t
-strnlen(const char *s, size_t maxlen)
-{
-  const char *p;
-
-  p = memchr(s, '\0', maxlen);
-  if (p == NULL)
-    return maxlen;
-
-  return p - s;
-}
-
-size_t
-strlncat(char *dst, size_t len, const char *src, size_t n)
-{
-  size_t slen;
-  size_t dlen;
-  size_t rlen;
-  size_t ncpy;
-
-  slen = strnlen(src, n);
-  dlen = strnlen(dst, len);
-
-  if (dlen < len) {
-    rlen = len - dlen;
-    ncpy = slen < rlen ? slen : (rlen - 1);
-    memcpy(dst + dlen, src, ncpy);
-    dst[dlen + ncpy] = '\0';
-  }
-
-  assert(len > slen + dlen);
-  return slen + dlen;
-}
-
-size_t
-strlcat(char *dst, const char *src, size_t len)
-{
-  return strlncat(dst, len, src, (size_t) -1);
-}
-
-size_t
-strlncpy(char *dst, size_t len, const char *src, size_t n)
-{
-  size_t slen;
-  size_t ncpy;
-
-  slen = strnlen(src, n);
-
-  if (len > 0) {
-    ncpy = slen < len ? slen : (len - 1);
-    memcpy(dst, src, ncpy);
-    dst[ncpy] = '\0';
-  }
-
-  assert(len > slen);
-  return slen;
-}
-
-size_t
-strlcpy(char *dst, const char *src, size_t len)
-{
-  return strlncpy(dst, len, src, (size_t) -1);
-}
-
-int
-request_url_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  strlncat(messages[num_messages].request_url,
-           sizeof(messages[num_messages].request_url),
-           buf,
-           len);
-  return 0;
-}
-
-int
-header_field_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  struct message *m = &messages[num_messages];
-
-  if (m->last_header_element != FIELD)
-    m->num_headers++;
-
-  strlncat(m->headers[m->num_headers-1][0],
-           sizeof(m->headers[m->num_headers-1][0]),
-           buf,
-           len);
-
-  m->last_header_element = FIELD;
-
-  return 0;
-}
-
-int
-header_value_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  struct message *m = &messages[num_messages];
-
-  strlncat(m->headers[m->num_headers-1][1],
-           sizeof(m->headers[m->num_headers-1][1]),
-           buf,
-           len);
-
-  m->last_header_element = VALUE;
-
-  return 0;
-}
-
-void
-check_body_is_final (const http_parser *p)
-{
-  if (messages[num_messages].body_is_final) {
-    fprintf(stderr, "\n\n *** Error http_body_is_final() should return 1 "
-                    "on last on_body callback call "
-                    "but it doesn't! ***\n\n");
-    assert(0);
-    abort();
-  }
-  messages[num_messages].body_is_final = http_body_is_final(p);
-}
-
-int
-body_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  strlncat(messages[num_messages].body,
-           sizeof(messages[num_messages].body),
-           buf,
-           len);
-  messages[num_messages].body_size += len;
-  check_body_is_final(p);
- // printf("body_cb: '%s'\n", requests[num_messages].body);
-  return 0;
-}
-
-int
-count_body_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  assert(buf);
-  messages[num_messages].body_size += len;
-  check_body_is_final(p);
-  return 0;
-}
-
-int
-message_begin_cb (http_parser *p)
-{
-  assert(p == parser);
-  messages[num_messages].message_begin_cb_called = TRUE;
-  return 0;
-}
-
-int
-headers_complete_cb (http_parser *p)
-{
-  assert(p == parser);
-  messages[num_messages].method = parser->method;
-  messages[num_messages].status_code = parser->status_code;
-  messages[num_messages].http_major = parser->http_major;
-  messages[num_messages].http_minor = parser->http_minor;
-  messages[num_messages].headers_complete_cb_called = TRUE;
-  messages[num_messages].should_keep_alive = http_should_keep_alive(parser);
-  return 0;
-}
-
-int
-message_complete_cb (http_parser *p)
-{
-  assert(p == parser);
-  if (messages[num_messages].should_keep_alive != http_should_keep_alive(parser))
-  {
-    fprintf(stderr, "\n\n *** Error http_should_keep_alive() should have same "
-                    "value in both on_message_complete and on_headers_complete "
-                    "but it doesn't! ***\n\n");
-    assert(0);
-    abort();
-  }
-
-  if (messages[num_messages].body_size &&
-      http_body_is_final(p) &&
-      !messages[num_messages].body_is_final)
-  {
-    fprintf(stderr, "\n\n *** Error http_body_is_final() should return 1 "
-                    "on last on_body callback call "
-                    "but it doesn't! ***\n\n");
-    assert(0);
-    abort();
-  }
-
-  messages[num_messages].message_complete_cb_called = TRUE;
-
-  messages[num_messages].message_complete_on_eof = currently_parsing_eof;
-
-  num_messages++;
-  return 0;
-}
-
-int
-response_status_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  strlncat(messages[num_messages].response_status,
-           sizeof(messages[num_messages].response_status),
-           buf,
-           len);
-  return 0;
-}
-
-int
-chunk_header_cb (http_parser *p)
-{
-  assert(p == parser);
-  int chunk_idx = messages[num_messages].num_chunks;
-  messages[num_messages].num_chunks++;
-  if (chunk_idx < MAX_CHUNKS) {
-    messages[num_messages].chunk_lengths[chunk_idx] = p->content_length;
-  }
-
-  return 0;
-}
-
-int
-chunk_complete_cb (http_parser *p)
-{
-  assert(p == parser);
-
-  /* Here we want to verify that each chunk_header_cb is matched by a
-   * chunk_complete_cb, so not only should the total number of calls to
-   * both callbacks be the same, but they also should be interleaved
-   * properly */
-  assert(messages[num_messages].num_chunks ==
-         messages[num_messages].num_chunks_complete + 1);
-
-  messages[num_messages].num_chunks_complete++;
-  return 0;
-}
-
-/* These dontcall_* callbacks exist so that we can verify that when we're
- * paused, no additional callbacks are invoked */
-int
-dontcall_message_begin_cb (http_parser *p)
-{
-  if (p) { } // gcc
-  fprintf(stderr, "\n\n*** on_message_begin() called on paused parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_header_field_cb (http_parser *p, const char *buf, size_t len)
-{
-  if (p || buf || len) { } // gcc
-  fprintf(stderr, "\n\n*** on_header_field() called on paused parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_header_value_cb (http_parser *p, const char *buf, size_t len)
-{
-  if (p || buf || len) { } // gcc
-  fprintf(stderr, "\n\n*** on_header_value() called on paused parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_request_url_cb (http_parser *p, const char *buf, size_t len)
-{
-  if (p || buf || len) { } // gcc
-  fprintf(stderr, "\n\n*** on_request_url() called on paused parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_body_cb (http_parser *p, const char *buf, size_t len)
-{
-  if (p || buf || len) { } // gcc
-  fprintf(stderr, "\n\n*** on_body_cb() called on paused parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_headers_complete_cb (http_parser *p)
-{
-  if (p) { } // gcc
-  fprintf(stderr, "\n\n*** on_headers_complete() called on paused "
-                  "parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_message_complete_cb (http_parser *p)
-{
-  if (p) { } // gcc
-  fprintf(stderr, "\n\n*** on_message_complete() called on paused "
-                  "parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_response_status_cb (http_parser *p, const char *buf, size_t len)
-{
-  if (p || buf || len) { } // gcc
-  fprintf(stderr, "\n\n*** on_status() called on paused parser ***\n\n");
-  abort();
-}
-
-int
-dontcall_chunk_header_cb (http_parser *p)
-{
-  if (p) { } // gcc
-  fprintf(stderr, "\n\n*** on_chunk_header() called on paused parser ***\n\n");
-  exit(1);
-}
-
-int
-dontcall_chunk_complete_cb (http_parser *p)
-{
-  if (p) { } // gcc
-  fprintf(stderr, "\n\n*** on_chunk_complete() "
-          "called on paused parser ***\n\n");
-  exit(1);
-}
-
-static http_parser_settings settings_dontcall =
-  {.on_message_begin = dontcall_message_begin_cb
-  ,.on_header_field = dontcall_header_field_cb
-  ,.on_header_value = dontcall_header_value_cb
-  ,.on_url = dontcall_request_url_cb
-  ,.on_status = dontcall_response_status_cb
-  ,.on_body = dontcall_body_cb
-  ,.on_headers_complete = dontcall_headers_complete_cb
-  ,.on_message_complete = dontcall_message_complete_cb
-  ,.on_chunk_header = dontcall_chunk_header_cb
-  ,.on_chunk_complete = dontcall_chunk_complete_cb
-  };
-
-/* These pause_* callbacks always pause the parser and just invoke the regular
- * callback that tracks content. Before returning, we overwrite the parser
- * settings to point to the _dontcall variety so that we can verify that
- * the pause actually did, you know, pause. */
-int
-pause_message_begin_cb (http_parser *p)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return message_begin_cb(p);
-}
-
-int
-pause_header_field_cb (http_parser *p, const char *buf, size_t len)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return header_field_cb(p, buf, len);
-}
-
-int
-pause_header_value_cb (http_parser *p, const char *buf, size_t len)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return header_value_cb(p, buf, len);
-}
-
-int
-pause_request_url_cb (http_parser *p, const char *buf, size_t len)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return request_url_cb(p, buf, len);
-}
-
-int
-pause_body_cb (http_parser *p, const char *buf, size_t len)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return body_cb(p, buf, len);
-}
-
-int
-pause_headers_complete_cb (http_parser *p)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return headers_complete_cb(p);
-}
-
-int
-pause_message_complete_cb (http_parser *p)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return message_complete_cb(p);
-}
-
-int
-pause_response_status_cb (http_parser *p, const char *buf, size_t len)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return response_status_cb(p, buf, len);
-}
-
-int
-pause_chunk_header_cb (http_parser *p)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return chunk_header_cb(p);
-}
-
-int
-pause_chunk_complete_cb (http_parser *p)
-{
-  http_parser_pause(p, 1);
-  *current_pause_parser = settings_dontcall;
-  return chunk_complete_cb(p);
-}
-
-int
-connect_headers_complete_cb (http_parser *p)
-{
-  headers_complete_cb(p);
-  return 1;
-}
-
-int
-connect_message_complete_cb (http_parser *p)
-{
-  messages[num_messages].should_keep_alive = http_should_keep_alive(parser);
-  return message_complete_cb(p);
-}
-
-static http_parser_settings settings_pause =
-  {.on_message_begin = pause_message_begin_cb
-  ,.on_header_field = pause_header_field_cb
-  ,.on_header_value = pause_header_value_cb
-  ,.on_url = pause_request_url_cb
-  ,.on_status = pause_response_status_cb
-  ,.on_body = pause_body_cb
-  ,.on_headers_complete = pause_headers_complete_cb
-  ,.on_message_complete = pause_message_complete_cb
-  ,.on_chunk_header = pause_chunk_header_cb
-  ,.on_chunk_complete = pause_chunk_complete_cb
-  };
-
-static http_parser_settings settings =
-  {.on_message_begin = message_begin_cb
-  ,.on_header_field = header_field_cb
-  ,.on_header_value = header_value_cb
-  ,.on_url = request_url_cb
-  ,.on_status = response_status_cb
-  ,.on_body = body_cb
-  ,.on_headers_complete = headers_complete_cb
-  ,.on_message_complete = message_complete_cb
-  ,.on_chunk_header = chunk_header_cb
-  ,.on_chunk_complete = chunk_complete_cb
-  };
-
-static http_parser_settings settings_count_body =
-  {.on_message_begin = message_begin_cb
-  ,.on_header_field = header_field_cb
-  ,.on_header_value = header_value_cb
-  ,.on_url = request_url_cb
-  ,.on_status = response_status_cb
-  ,.on_body = count_body_cb
-  ,.on_headers_complete = headers_complete_cb
-  ,.on_message_complete = message_complete_cb
-  ,.on_chunk_header = chunk_header_cb
-  ,.on_chunk_complete = chunk_complete_cb
-  };
-
-static http_parser_settings settings_connect =
-  {.on_message_begin = message_begin_cb
-  ,.on_header_field = header_field_cb
-  ,.on_header_value = header_value_cb
-  ,.on_url = request_url_cb
-  ,.on_status = response_status_cb
-  ,.on_body = dontcall_body_cb
-  ,.on_headers_complete = connect_headers_complete_cb
-  ,.on_message_complete = connect_message_complete_cb
-  ,.on_chunk_header = chunk_header_cb
-  ,.on_chunk_complete = chunk_complete_cb
-  };
-
-static http_parser_settings settings_null =
-  {.on_message_begin = 0
-  ,.on_header_field = 0
-  ,.on_header_value = 0
-  ,.on_url = 0
-  ,.on_status = 0
-  ,.on_body = 0
-  ,.on_headers_complete = 0
-  ,.on_message_complete = 0
-  ,.on_chunk_header = 0
-  ,.on_chunk_complete = 0
-  };
-
-void
-parser_init (enum http_parser_type type)
-{
-  num_messages = 0;
-
-  assert(parser == NULL);
-
-  parser = malloc(sizeof(http_parser));
-
-  http_parser_init(parser, type);
-
-  memset(&messages, 0, sizeof messages);
-
-}
-
-void
-parser_free ()
-{
-  assert(parser);
-  free(parser);
-  parser = NULL;
-}
-
-size_t parse (const char *buf, size_t len)
-{
-  size_t nparsed;
-  currently_parsing_eof = (len == 0);
-  nparsed = http_parser_execute(parser, &settings, buf, len);
-  return nparsed;
-}
-
-size_t parse_count_body (const char *buf, size_t len)
-{
-  size_t nparsed;
-  currently_parsing_eof = (len == 0);
-  nparsed = http_parser_execute(parser, &settings_count_body, buf, len);
-  return nparsed;
-}
-
-size_t parse_pause (const char *buf, size_t len)
-{
-  size_t nparsed;
-  http_parser_settings s = settings_pause;
-
-  currently_parsing_eof = (len == 0);
-  current_pause_parser = &s;
-  nparsed = http_parser_execute(parser, current_pause_parser, buf, len);
-  return nparsed;
-}
-
-size_t parse_connect (const char *buf, size_t len)
-{
-  size_t nparsed;
-  currently_parsing_eof = (len == 0);
-  nparsed = http_parser_execute(parser, &settings_connect, buf, len);
-  return nparsed;
-}
-
-static inline int
-check_str_eq (const struct message *m,
-              const char *prop,
-              const char *expected,
-              const char *found) {
-  if ((expected == NULL) != (found == NULL)) {
-    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
-    printf("expected %s\n", (expected == NULL) ? "NULL" : expected);
-    printf("   found %s\n", (found == NULL) ? "NULL" : found);
-    return 0;
-  }
-  if (expected != NULL && 0 != strcmp(expected, found)) {
-    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
-    printf("expected '%s'\n", expected);
-    printf("   found '%s'\n", found);
-    return 0;
-  }
-  return 1;
-}
-
-static inline int
-check_num_eq (const struct message *m,
-              const char *prop,
-              int expected,
-              int found) {
-  if (expected != found) {
-    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
-    printf("expected %d\n", expected);
-    printf("   found %d\n", found);
-    return 0;
-  }
-  return 1;
-}
-
-#define MESSAGE_CHECK_STR_EQ(expected, found, prop) \
-  if (!check_str_eq(expected, #prop, expected->prop, found->prop)) return 0
-
-#define MESSAGE_CHECK_NUM_EQ(expected, found, prop) \
-  if (!check_num_eq(expected, #prop, expected->prop, found->prop)) return 0
-
-#define MESSAGE_CHECK_URL_EQ(u, expected, found, prop, fn)           \
-do {                                                                 \
-  char ubuf[256];                                                    \
-                                                                     \
-  if ((u)->field_set & (1 << (fn))) {                                \
-    memcpy(ubuf, (found)->request_url + (u)->field_data[(fn)].off,   \
-      (u)->field_data[(fn)].len);                                    \
-    ubuf[(u)->field_data[(fn)].len] = '\0';                          \
-  } else {                                                           \
-    ubuf[0] = '\0';                                                  \
-  }                                                                  \
-                                                                     \
-  check_str_eq(expected, #prop, expected->prop, ubuf);               \
-} while(0)
-
-int
-message_eq (int index, int connect, const struct message *expected)
-{
-  int i;
-  struct message *m = &messages[index];
-
-  MESSAGE_CHECK_NUM_EQ(expected, m, http_major);
-  MESSAGE_CHECK_NUM_EQ(expected, m, http_minor);
-
-  if (expected->type == HTTP_REQUEST) {
-    MESSAGE_CHECK_NUM_EQ(expected, m, method);
-  } else {
-    MESSAGE_CHECK_NUM_EQ(expected, m, status_code);
-    MESSAGE_CHECK_STR_EQ(expected, m, response_status);
-  }
-
-  if (!connect) {
-    MESSAGE_CHECK_NUM_EQ(expected, m, should_keep_alive);
-    MESSAGE_CHECK_NUM_EQ(expected, m, message_complete_on_eof);
-  }
-
-  assert(m->message_begin_cb_called);
-  assert(m->headers_complete_cb_called);
-  assert(m->message_complete_cb_called);
-
-
-  MESSAGE_CHECK_STR_EQ(expected, m, request_url);
-
-  /* Check URL components; we can't do this w/ CONNECT since it doesn't
-   * send us a well-formed URL.
-   */
-  if (*m->request_url && m->method != HTTP_CONNECT) {
-    struct http_parser_url u;
-
-    if (http_parser_parse_url(m->request_url, strlen(m->request_url), 0, &u)) {
-      fprintf(stderr, "\n\n*** failed to parse URL %s ***\n\n",
-        m->request_url);
-      abort();
-    }
-
-    if (expected->host) {
-      MESSAGE_CHECK_URL_EQ(&u, expected, m, host, UF_HOST);
-    }
-
-    if (expected->userinfo) {
-      MESSAGE_CHECK_URL_EQ(&u, expected, m, userinfo, UF_USERINFO);
-    }
-
-    m->port = (u.field_set & (1 << UF_PORT)) ?
-      u.port : 0;
-
-    MESSAGE_CHECK_URL_EQ(&u, expected, m, query_string, UF_QUERY);
-    MESSAGE_CHECK_URL_EQ(&u, expected, m, fragment, UF_FRAGMENT);
-    MESSAGE_CHECK_URL_EQ(&u, expected, m, request_path, UF_PATH);
-    MESSAGE_CHECK_NUM_EQ(expected, m, port);
-  }
-
-  if (connect) {
-    check_num_eq(m, "body_size", 0, m->body_size);
-  } else if (expected->body_size) {
-    MESSAGE_CHECK_NUM_EQ(expected, m, body_size);
-  } else {
-    MESSAGE_CHECK_STR_EQ(expected, m, body);
-  }
-
-  if (connect) {
-    check_num_eq(m, "num_chunks_complete", 0, m->num_chunks_complete);
-  } else {
-    assert(m->num_chunks == m->num_chunks_complete);
-    MESSAGE_CHECK_NUM_EQ(expected, m, num_chunks_complete);
-    for (i = 0; i < m->num_chunks && i < MAX_CHUNKS; i++) {
-      MESSAGE_CHECK_NUM_EQ(expected, m, chunk_lengths[i]);
-    }
-  }
-
-  MESSAGE_CHECK_NUM_EQ(expected, m, num_headers);
-
-  int r;
-  for (i = 0; i < m->num_headers; i++) {
-    r = check_str_eq(expected, "header field", expected->headers[i][0], m->headers[i][0]);
-    if (!r) return 0;
-    r = check_str_eq(expected, "header value", expected->headers[i][1], m->headers[i][1]);
-    if (!r) return 0;
-  }
-
-  MESSAGE_CHECK_STR_EQ(expected, m, upgrade);
-
-  return 1;
-}
-
-/* Given a sequence of varargs messages, return the number of them that the
- * parser should successfully parse, taking into account that upgraded
- * messages prevent all subsequent messages from being parsed.
- */
-size_t
-count_parsed_messages(const size_t nmsgs, ...) {
-  size_t i;
-  va_list ap;
-
-  va_start(ap, nmsgs);
-
-  for (i = 0; i < nmsgs; i++) {
-    struct message *m = va_arg(ap, struct message *);
-
-    if (m->upgrade) {
-      va_end(ap);
-      return i + 1;
-    }
-  }
-
-  va_end(ap);
-  return nmsgs;
-}
-
-/* Given a sequence of bytes and the number of these that we were able to
- * parse, verify that upgrade bodies are correct.
- */
-void
-upgrade_message_fix(char *body, const size_t nread, const size_t nmsgs, ...) {
-  va_list ap;
-  size_t i;
-  size_t off = 0;
-
-  va_start(ap, nmsgs);
-
-  for (i = 0; i < nmsgs; i++) {
-    struct message *m = va_arg(ap, struct message *);
-
-    off += strlen(m->raw);
-
-    if (m->upgrade) {
-      off -= strlen(m->upgrade);
-
-      /* Check the portion of the response after its specified upgrade */
-      if (!check_str_eq(m, "upgrade", body + off, body + nread)) {
-        abort();
-      }
-
-      /* Fix up the response so that message_eq() will verify the beginning
-       * of the upgrade */
-      *(body + nread + strlen(m->upgrade)) = '\0';
-      messages[num_messages -1 ].upgrade = body + nread;
-
-      va_end(ap);
-      return;
-    }
-  }
-
-  va_end(ap);
-  printf("\n\n*** Error: expected a message with upgrade ***\n");
-
-  abort();
-}
-
-static void
-print_error (const char *raw, size_t error_location)
-{
-  fprintf(stderr, "\n*** %s ***\n\n",
-          http_errno_description(HTTP_PARSER_ERRNO(parser)));
-
-  int this_line = 0, char_len = 0;
-  size_t i, j, len = strlen(raw), error_location_line = 0;
-  for (i = 0; i < len; i++) {
-    if (i == error_location) this_line = 1;
-    switch (raw[i]) {
-      case '\r':
-        char_len = 2;
-        fprintf(stderr, "\\r");
-        break;
-
-      case '\n':
-        fprintf(stderr, "\\n\n");
-
-        if (this_line) goto print;
-
-        error_location_line = 0;
-        continue;
-
-      default:
-        char_len = 1;
-        fputc(raw[i], stderr);
-        break;
-    }
-    if (!this_line) error_location_line += char_len;
-  }
-
-  fprintf(stderr, "[eof]\n");
-
- print:
-  for (j = 0; j < error_location_line; j++) {
-    fputc(' ', stderr);
-  }
-  fprintf(stderr, "^\n\nerror location: %u\n", (unsigned int)error_location);
-}
-
-void
-test_preserve_data (void)
-{
-  char my_data[] = "application-specific data";
-  http_parser parser;
-  parser.data = my_data;
-  http_parser_init(&parser, HTTP_REQUEST);
-  if (parser.data != my_data) {
-    printf("\n*** parser.data not preserved accross http_parser_init ***\n\n");
-    abort();
-  }
-}
-
-struct url_test {
-  const char *name;
-  const char *url;
-  int is_connect;
-  struct http_parser_url u;
-  int rv;
-};
-
-const struct url_test url_tests[] =
-{ {.name="proxy request"
-  ,.url="http://hostname/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PATH)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  7,  8 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 15,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="proxy request with port"
-  ,.url="http://hostname:444/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PORT) | (1 << UF_PATH)
-    ,.port=444
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  7,  8 } /* UF_HOST */
-      ,{ 16,  3 } /* UF_PORT */
-      ,{ 19,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="CONNECT request"
-  ,.url="hostname:443"
-  ,.is_connect=1
-  ,.u=
-    {.field_set=(1 << UF_HOST) | (1 << UF_PORT)
-    ,.port=443
-    ,.field_data=
-      {{  0,  0 } /* UF_SCHEMA */
-      ,{  0,  8 } /* UF_HOST */
-      ,{  9,  3 } /* UF_PORT */
-      ,{  0,  0 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="CONNECT request but not connect"
-  ,.url="hostname:443"
-  ,.is_connect=0
-  ,.rv=1
-  }
-
-, {.name="proxy ipv6 request"
-  ,.url="http://[1:2::3:4]/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PATH)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  8,  8 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 17,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="proxy ipv6 request with port"
-  ,.url="http://[1:2::3:4]:67/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PORT) | (1 << UF_PATH)
-    ,.port=67
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  8,  8 } /* UF_HOST */
-      ,{ 18,  2 } /* UF_PORT */
-      ,{ 20,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="CONNECT ipv6 address"
-  ,.url="[1:2::3:4]:443"
-  ,.is_connect=1
-  ,.u=
-    {.field_set=(1 << UF_HOST) | (1 << UF_PORT)
-    ,.port=443
-    ,.field_data=
-      {{  0,  0 } /* UF_SCHEMA */
-      ,{  1,  8 } /* UF_HOST */
-      ,{ 11,  3 } /* UF_PORT */
-      ,{  0,  0 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="ipv4 in ipv6 address"
-  ,.url="http://[2001:0000:0000:0000:0000:0000:1.9.1.1]/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PATH)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  8, 37 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 46,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="extra ? in query string"
-  ,.url="http://a.tbcdn.cn/p/fp/2010c/??fp-header-min.css,fp-base-min.css,"
-  "fp-channel-min.css,fp-product-min.css,fp-mall-min.css,fp-category-min.css,"
-  "fp-sub-min.css,fp-gdp4p-min.css,fp-css3-min.css,fp-misc-min.css?t=20101022.css"
-  ,.is_connect=0
-  ,.u=
-    {.field_set=(1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  7, 10 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 17, 12 } /* UF_PATH */
-      ,{ 30,187 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="space URL encoded"
-  ,.url="/toto.html?toto=a%20b"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_PATH) | (1<<UF_QUERY)
-    ,.port=0
-    ,.field_data=
-      {{  0,  0 } /* UF_SCHEMA */
-      ,{  0,  0 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{  0, 10 } /* UF_PATH */
-      ,{ 11, 10 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-
-, {.name="URL fragment"
-  ,.url="/toto.html#titi"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_PATH) | (1<<UF_FRAGMENT)
-    ,.port=0
-    ,.field_data=
-      {{  0,  0 } /* UF_SCHEMA */
-      ,{  0,  0 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{  0, 10 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{ 11,  4 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="complex URL fragment"
-  ,.url="http://www.webmasterworld.com/r.cgi?f=21&d=8405&url="
-    "http://www.example.com/index.html?foo=bar&hello=world#midpage"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY) |\
-      (1<<UF_FRAGMENT)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  7, 22 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 29,  6 } /* UF_PATH */
-      ,{ 36, 69 } /* UF_QUERY */
-      ,{106,  7 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="complex URL from node js url parser doc"
-  ,.url="http://host.com:8080/p/a/t/h?query=string#hash"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) |\
-      (1<<UF_QUERY) | (1<<UF_FRAGMENT)
-    ,.port=8080
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  7,  8 } /* UF_HOST */
-      ,{ 16,  4 } /* UF_PORT */
-      ,{ 20,  8 } /* UF_PATH */
-      ,{ 29, 12 } /* UF_QUERY */
-      ,{ 42,  4 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="complex URL with basic auth from node js url parser doc"
-  ,.url="http://a:b@host.com:8080/p/a/t/h?query=string#hash"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) |\
-      (1<<UF_QUERY) | (1<<UF_FRAGMENT) | (1<<UF_USERINFO)
-    ,.port=8080
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{ 11,  8 } /* UF_HOST */
-      ,{ 20,  4 } /* UF_PORT */
-      ,{ 24,  8 } /* UF_PATH */
-      ,{ 33, 12 } /* UF_QUERY */
-      ,{ 46,  4 } /* UF_FRAGMENT */
-      ,{  7,  3 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="double @"
-  ,.url="http://a:b@@hostname:443/"
-  ,.is_connect=0
-  ,.rv=1
-  }
-
-, {.name="proxy empty host"
-  ,.url="http://:443/"
-  ,.is_connect=0
-  ,.rv=1
-  }
-
-, {.name="proxy empty port"
-  ,.url="http://hostname:/"
-  ,.is_connect=0
-  ,.rv=1
-  }
-
-, {.name="CONNECT with basic auth"
-  ,.url="a:b@hostname:443"
-  ,.is_connect=1
-  ,.rv=1
-  }
-
-, {.name="CONNECT empty host"
-  ,.url=":443"
-  ,.is_connect=1
-  ,.rv=1
-  }
-
-, {.name="CONNECT empty port"
-  ,.url="hostname:"
-  ,.is_connect=1
-  ,.rv=1
-  }
-
-, {.name="CONNECT with extra bits"
-  ,.url="hostname:443/"
-  ,.is_connect=1
-  ,.rv=1
-  }
-
-, {.name="space in URL"
-  ,.url="/foo bar/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy basic auth with space url encoded"
-  ,.url="http://a%20:b@host.com/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_USERINFO)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{ 14,  8 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 22,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  7,  6 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="carriage return in URL"
-  ,.url="/foo\rbar/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy double : in URL"
-  ,.url="http://hostname::443/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy basic auth with double :"
-  ,.url="http://a::b@host.com/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_USERINFO)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{ 12,  8 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 20,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  7,  4 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="line feed in URL"
-  ,.url="/foo\nbar/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy empty basic auth"
-  ,.url="http://@hostname/fo"
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  8,  8 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 16,  3 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-, {.name="proxy line feed in hostname"
-  ,.url="http://host\name/fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy % in hostname"
-  ,.url="http://host%name/fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy ; in hostname"
-  ,.url="http://host;ame/fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy basic auth with unreservedchars"
-  ,.url="http://a!;-_!=+$@host.com/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_USERINFO)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{ 17,  8 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 25,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  7,  9 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="proxy only empty basic auth"
-  ,.url="http://@/fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy only basic auth"
-  ,.url="http://toto@/fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy emtpy hostname"
-  ,.url="http:///fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="proxy = in URL"
-  ,.url="http://host=ame/fo"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="ipv6 address with Zone ID"
-  ,.url="http://[fe80::a%25eth0]/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  8, 14 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 23,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="ipv6 address with Zone ID, but '%' is not percent-encoded"
-  ,.url="http://[fe80::a%eth0]/"
-  ,.is_connect=0
-  ,.u=
-    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH)
-    ,.port=0
-    ,.field_data=
-      {{  0,  4 } /* UF_SCHEMA */
-      ,{  8, 12 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{ 21,  1 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="ipv6 address ending with '%'"
-  ,.url="http://[fe80::a%]/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="ipv6 address with Zone ID including bad character"
-  ,.url="http://[fe80::a%$HOME]/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="just ipv6 Zone ID"
-  ,.url="http://[%eth0]/"
-  ,.rv=1 /* s_dead */
-  }
-
-#if HTTP_PARSER_STRICT
-
-, {.name="tab in URL"
-  ,.url="/foo\tbar/"
-  ,.rv=1 /* s_dead */
-  }
-
-, {.name="form feed in URL"
-  ,.url="/foo\fbar/"
-  ,.rv=1 /* s_dead */
-  }
-
-#else /* !HTTP_PARSER_STRICT */
-
-, {.name="tab in URL"
-  ,.url="/foo\tbar/"
-  ,.u=
-    {.field_set=(1 << UF_PATH)
-    ,.field_data=
-      {{  0,  0 } /* UF_SCHEMA */
-      ,{  0,  0 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{  0,  9 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-
-, {.name="form feed in URL"
-  ,.url="/foo\fbar/"
-  ,.u=
-    {.field_set=(1 << UF_PATH)
-    ,.field_data=
-      {{  0,  0 } /* UF_SCHEMA */
-      ,{  0,  0 } /* UF_HOST */
-      ,{  0,  0 } /* UF_PORT */
-      ,{  0,  9 } /* UF_PATH */
-      ,{  0,  0 } /* UF_QUERY */
-      ,{  0,  0 } /* UF_FRAGMENT */
-      ,{  0,  0 } /* UF_USERINFO */
-      }
-    }
-  ,.rv=0
-  }
-#endif
-};
-
-void
-dump_url (const char *url, const struct http_parser_url *u)
-{
-  unsigned int i;
-
-  printf("\tfield_set: 0x%x, port: %u\n", u->field_set, u->port);
-  for (i = 0; i < UF_MAX; i++) {
-    if ((u->field_set & (1 << i)) == 0) {
-      printf("\tfield_data[%u]: unset\n", i);
-      continue;
-    }
-
-    printf("\tfield_data[%u]: off: %u len: %u part: \"%.*s\n\"",
-           i,
-           u->field_data[i].off,
-           u->field_data[i].len,
-           u->field_data[i].len,
-           url + u->field_data[i].off);
-  }
-}
-
-void
-test_parse_url (void)
-{
-  struct http_parser_url u;
-  const struct url_test *test;
-  unsigned int i;
-  int rv;
-
-  for (i = 0; i < (sizeof(url_tests) / sizeof(url_tests[0])); i++) {
-    test = &url_tests[i];
-    memset(&u, 0, sizeof(u));
-
-    rv = http_parser_parse_url(test->url,
-                               strlen(test->url),
-                               test->is_connect,
-                               &u);
-
-    if (test->rv == 0) {
-      if (rv != 0) {
-        printf("\n*** http_parser_parse_url(\"%s\") \"%s\" test failed, "
-               "unexpected rv %d ***\n\n", test->url, test->name, rv);
-        abort();
-      }
-
-      if (memcmp(&u, &test->u, sizeof(u)) != 0) {
-        printf("\n*** http_parser_parse_url(\"%s\") \"%s\" failed ***\n",
-               test->url, test->name);
-
-        printf("target http_parser_url:\n");
-        dump_url(test->url, &test->u);
-        printf("result http_parser_url:\n");
-        dump_url(test->url, &u);
-
-        abort();
-      }
-    } else {
-      /* test->rv != 0 */
-      if (rv == 0) {
-        printf("\n*** http_parser_parse_url(\"%s\") \"%s\" test failed, "
-               "unexpected rv %d ***\n\n", test->url, test->name, rv);
-        abort();
-      }
-    }
-  }
-}
-
-void
-test_method_str (void)
-{
-  assert(0 == strcmp("GET", http_method_str(HTTP_GET)));
-  assert(0 == strcmp("<unknown>", http_method_str(1337)));
-}
-
-void
-test_message (const struct message *message)
-{
-  size_t raw_len = strlen(message->raw);
-  size_t msg1len;
-  for (msg1len = 0; msg1len < raw_len; msg1len++) {
-    parser_init(message->type);
-
-    size_t read;
-    const char *msg1 = message->raw;
-    const char *msg2 = msg1 + msg1len;
-    size_t msg2len = raw_len - msg1len;
-
-    if (msg1len) {
-      read = parse(msg1, msg1len);
-
-      if (message->upgrade && parser->upgrade && num_messages > 0) {
-        messages[num_messages - 1].upgrade = msg1 + read;
-        goto test;
-      }
-
-      if (read != msg1len) {
-        print_error(msg1, read);
-        abort();
-      }
-    }
-
-
-    read = parse(msg2, msg2len);
-
-    if (message->upgrade && parser->upgrade) {
-      messages[num_messages - 1].upgrade = msg2 + read;
-      goto test;
-    }
-
-    if (read != msg2len) {
-      print_error(msg2, read);
-      abort();
-    }
-
-    read = parse(NULL, 0);
-
-    if (read != 0) {
-      print_error(message->raw, read);
-      abort();
-    }
-
-  test:
-
-    if (num_messages != 1) {
-      printf("\n*** num_messages != 1 after testing '%s' ***\n\n", message->name);
-      abort();
-    }
-
-    if(!message_eq(0, 0, message)) abort();
-
-    parser_free();
-  }
-}
-
-void
-test_message_count_body (const struct message *message)
-{
-  parser_init(message->type);
-
-  size_t read;
-  size_t l = strlen(message->raw);
-  size_t i, toread;
-  size_t chunk = 4024;
-
-  for (i = 0; i < l; i+= chunk) {
-    toread = MIN(l-i, chunk);
-    read = parse_count_body(message->raw + i, toread);
-    if (read != toread) {
-      print_error(message->raw, read);
-      abort();
-    }
-  }
-
-
-  read = parse_count_body(NULL, 0);
-  if (read != 0) {
-    print_error(message->raw, read);
-    abort();
-  }
-
-  if (num_messages != 1) {
-    printf("\n*** num_messages != 1 after testing '%s' ***\n\n", message->name);
-    abort();
-  }
-
-  if(!message_eq(0, 0, message)) abort();
-
-  parser_free();
-}
-
-void
-test_simple (const char *buf, enum http_errno err_expected)
-{
-  parser_init(HTTP_REQUEST);
-
-  enum http_errno err;
-
-  parse(buf, strlen(buf));
-  err = HTTP_PARSER_ERRNO(parser);
-  parse(NULL, 0);
-
-  parser_free();
-
-  /* In strict mode, allow us to pass with an unexpected HPE_STRICT as
-   * long as the caller isn't expecting success.
-   */
-#if HTTP_PARSER_STRICT
-  if (err_expected != err && err_expected != HPE_OK && err != HPE_STRICT) {
-#else
-  if (err_expected != err) {
-#endif
-    fprintf(stderr, "\n*** test_simple expected %s, but saw %s ***\n\n%s\n",
-        http_errno_name(err_expected), http_errno_name(err), buf);
-    abort();
-  }
-}
-
-void
-test_invalid_header_content (int req, const char* str)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  const char *buf;
-  buf = req ?
-    "GET / HTTP/1.1\r\n" :
-    "HTTP/1.1 200 OK\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  buf = str;
-  size_t buflen = strlen(buf);
-
-  parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
-  if (parsed != buflen) {
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_INVALID_HEADER_TOKEN);
-    return;
-  }
-
-  fprintf(stderr,
-          "\n*** Error expected but none in invalid header content test ***\n");
-  abort();
-}
-
-void
-test_invalid_header_field_content_error (int req)
-{
-  test_invalid_header_content(req, "Foo: F\01ailure");
-  test_invalid_header_content(req, "Foo: B\02ar");
-}
-
-void
-test_invalid_header_field (int req, const char* str)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  const char *buf;
-  buf = req ?
-    "GET / HTTP/1.1\r\n" :
-    "HTTP/1.1 200 OK\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  buf = str;
-  size_t buflen = strlen(buf);
-
-  parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
-  if (parsed != buflen) {
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_INVALID_HEADER_TOKEN);
-    return;
-  }
-
-  fprintf(stderr,
-          "\n*** Error expected but none in invalid header token test ***\n");
-  abort();
-}
-
-void
-test_invalid_header_field_token_error (int req)
-{
-  test_invalid_header_field(req, "Fo@: Failure");
-  test_invalid_header_field(req, "Foo\01\test: Bar");
-}
-
-void
-test_double_content_length_error (int req)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  const char *buf;
-  buf = req ?
-    "GET / HTTP/1.1\r\n" :
-    "HTTP/1.1 200 OK\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  buf = "Content-Length: 0\r\nContent-Length: 1\r\n\r\n";
-  size_t buflen = strlen(buf);
-
-  parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
-  if (parsed != buflen) {
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_UNEXPECTED_CONTENT_LENGTH);
-    return;
-  }
-
-  fprintf(stderr,
-          "\n*** Error expected but none in double content-length test ***\n");
-  abort();
-}
-
-void
-test_chunked_content_length_error (int req)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  const char *buf;
-  buf = req ?
-    "GET / HTTP/1.1\r\n" :
-    "HTTP/1.1 200 OK\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  buf = "Transfer-Encoding: chunked\r\nContent-Length: 1\r\n\r\n";
-  size_t buflen = strlen(buf);
-
-  parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
-  if (parsed != buflen) {
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_UNEXPECTED_CONTENT_LENGTH);
-    return;
-  }
-
-  fprintf(stderr,
-          "\n*** Error expected but none in chunked content-length test ***\n");
-  abort();
-}
-
-void
-test_header_cr_no_lf_error (int req)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  const char *buf;
-  buf = req ?
-    "GET / HTTP/1.1\r\n" :
-    "HTTP/1.1 200 OK\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  buf = "Foo: 1\rBar: 1\r\n\r\n";
-  size_t buflen = strlen(buf);
-
-  parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
-  if (parsed != buflen) {
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_LF_EXPECTED);
-    return;
-  }
-
-  fprintf(stderr,
-          "\n*** Error expected but none in header whitespace test ***\n");
-  abort();
-}
-
-void
-test_header_overflow_error (int req)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  const char *buf;
-  buf = req ? "GET / HTTP/1.1\r\n" : "HTTP/1.0 200 OK\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  buf = "header-key: header-value\r\n";
-  size_t buflen = strlen(buf);
-
-  int i;
-  for (i = 0; i < 10000; i++) {
-    parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
-    if (parsed != buflen) {
-      //fprintf(stderr, "error found on iter %d\n", i);
-      assert(HTTP_PARSER_ERRNO(&parser) == HPE_HEADER_OVERFLOW);
-      return;
-    }
-  }
-
-  fprintf(stderr, "\n*** Error expected but none in header overflow test ***\n");
-  abort();
-}
-
-
-void
-test_header_nread_value ()
-{
-  http_parser parser;
-  http_parser_init(&parser, HTTP_REQUEST);
-  size_t parsed;
-  const char *buf;
-  buf = "GET / HTTP/1.1\r\nheader: value\nhdr: value\r\n";
-  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
-  assert(parsed == strlen(buf));
-
-  assert(parser.nread == strlen(buf));
-}
-
-
-static void
-test_content_length_overflow (const char *buf, size_t buflen, int expect_ok)
-{
-  http_parser parser;
-  http_parser_init(&parser, HTTP_RESPONSE);
-  http_parser_execute(&parser, &settings_null, buf, buflen);
-
-  if (expect_ok)
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_OK);
-  else
-    assert(HTTP_PARSER_ERRNO(&parser) == HPE_INVALID_CONTENT_LENGTH);
-}
-
-void
-test_header_content_length_overflow_error (void)
-{
-#define X(size)                                                               \
-  "HTTP/1.1 200 OK\r\n"                                                       \
-  "Content-Length: " #size "\r\n"                                             \
-  "\r\n"
-  const char a[] = X(1844674407370955160);  /* 2^64 / 10 - 1 */
-  const char b[] = X(18446744073709551615); /* 2^64-1 */
-  const char c[] = X(18446744073709551616); /* 2^64   */
-#undef X
-  test_content_length_overflow(a, sizeof(a) - 1, 1); /* expect ok      */
-  test_content_length_overflow(b, sizeof(b) - 1, 0); /* expect failure */
-  test_content_length_overflow(c, sizeof(c) - 1, 0); /* expect failure */
-}
-
-void
-test_chunk_content_length_overflow_error (void)
-{
-#define X(size)                                                               \
-    "HTTP/1.1 200 OK\r\n"                                                     \
-    "Transfer-Encoding: chunked\r\n"                                          \
-    "\r\n"                                                                    \
-    #size "\r\n"                                                              \
-    "..."
-  const char a[] = X(FFFFFFFFFFFFFFE);   /* 2^64 / 16 - 1 */
-  const char b[] = X(FFFFFFFFFFFFFFFF);  /* 2^64-1 */
-  const char c[] = X(10000000000000000); /* 2^64   */
-#undef X
-  test_content_length_overflow(a, sizeof(a) - 1, 1); /* expect ok      */
-  test_content_length_overflow(b, sizeof(b) - 1, 0); /* expect failure */
-  test_content_length_overflow(c, sizeof(c) - 1, 0); /* expect failure */
-}
-
-void
-test_no_overflow_long_body (int req, size_t length)
-{
-  http_parser parser;
-  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
-  size_t parsed;
-  size_t i;
-  char buf1[3000];
-  size_t buf1len = sprintf(buf1, "%s\r\nConnection: Keep-Alive\r\nContent-Length: %lu\r\n\r\n",
-      req ? "POST / HTTP/1.0" : "HTTP/1.0 200 OK", (unsigned long)length);
-  parsed = http_parser_execute(&parser, &settings_null, buf1, buf1len);
-  if (parsed != buf1len)
-    goto err;
-
-  for (i = 0; i < length; i++) {
-    char foo = 'a';
-    parsed = http_parser_execute(&parser, &settings_null, &foo, 1);
-    if (parsed != 1)
-      goto err;
-  }
-
-  parsed = http_parser_execute(&parser, &settings_null, buf1, buf1len);
-  if (parsed != buf1len) goto err;
-  return;
-
- err:
-  fprintf(stderr,
-          "\n*** error in test_no_overflow_long_body %s of length %lu ***\n",
-          req ? "REQUEST" : "RESPONSE",
-          (unsigned long)length);
-  abort();
-}
-
-void
-test_multiple3 (const struct message *r1, const struct message *r2, const struct message *r3)
-{
-  int message_count = count_parsed_messages(3, r1, r2, r3);
-
-  char total[ strlen(r1->raw)
-            + strlen(r2->raw)
-            + strlen(r3->raw)
-            + 1
-            ];
-  total[0] = '\0';
-
-  strcat(total, r1->raw);
-  strcat(total, r2->raw);
-  strcat(total, r3->raw);
-
-  parser_init(r1->type);
-
-  size_t read;
-
-  read = parse(total, strlen(total));
-
-  if (parser->upgrade) {
-    upgrade_message_fix(total, read, 3, r1, r2, r3);
-    goto test;
-  }
-
-  if (read != strlen(total)) {
-    print_error(total, read);
-    abort();
-  }
-
-  read = parse(NULL, 0);
-
-  if (read != 0) {
-    print_error(total, read);
-    abort();
-  }
-
-test:
-
-  if (message_count != num_messages) {
-    fprintf(stderr, "\n\n*** Parser didn't see 3 messages only %d *** \n", num_messages);
-    abort();
-  }
-
-  if (!message_eq(0, 0, r1)) abort();
-  if (message_count > 1 && !message_eq(1, 0, r2)) abort();
-  if (message_count > 2 && !message_eq(2, 0, r3)) abort();
-
-  parser_free();
-}
-
-/* SCAN through every possible breaking to make sure the
- * parser can handle getting the content in any chunks that
- * might come from the socket
- */
-void
-test_scan (const struct message *r1, const struct message *r2, const struct message *r3)
-{
-  char total[80*1024] = "\0";
-  char buf1[80*1024] = "\0";
-  char buf2[80*1024] = "\0";
-  char buf3[80*1024] = "\0";
-
-  strcat(total, r1->raw);
-  strcat(total, r2->raw);
-  strcat(total, r3->raw);
-
-  size_t read;
-
-  int total_len = strlen(total);
-
-  int total_ops = 2 * (total_len - 1) * (total_len - 2) / 2;
-  int ops = 0 ;
-
-  size_t buf1_len, buf2_len, buf3_len;
-  int message_count = count_parsed_messages(3, r1, r2, r3);
-
-  int i,j,type_both;
-  for (type_both = 0; type_both < 2; type_both ++ ) {
-    for (j = 2; j < total_len; j ++ ) {
-      for (i = 1; i < j; i ++ ) {
-
-        if (ops % 1000 == 0)  {
-          printf("\b\b\b\b%3.0f%%", 100 * (float)ops /(float)total_ops);
-          fflush(stdout);
-        }
-        ops += 1;
-
-        parser_init(type_both ? HTTP_BOTH : r1->type);
-
-        buf1_len = i;
-        strlncpy(buf1, sizeof(buf1), total, buf1_len);
-        buf1[buf1_len] = 0;
-
-        buf2_len = j - i;
-        strlncpy(buf2, sizeof(buf1), total+i, buf2_len);
-        buf2[buf2_len] = 0;
-
-        buf3_len = total_len - j;
-        strlncpy(buf3, sizeof(buf1), total+j, buf3_len);
-        buf3[buf3_len] = 0;
-
-        read = parse(buf1, buf1_len);
-
-        if (parser->upgrade) goto test;
-
-        if (read != buf1_len) {
-          print_error(buf1, read);
-          goto error;
-        }
-
-        read += parse(buf2, buf2_len);
-
-        if (parser->upgrade) goto test;
-
-        if (read != buf1_len + buf2_len) {
-          print_error(buf2, read);
-          goto error;
-        }
-
-        read += parse(buf3, buf3_len);
-
-        if (parser->upgrade) goto test;
-
-        if (read != buf1_len + buf2_len + buf3_len) {
-          print_error(buf3, read);
-          goto error;
-        }
-
-        parse(NULL, 0);
-
-test:
-        if (parser->upgrade) {
-          upgrade_message_fix(total, read, 3, r1, r2, r3);
-        }
-
-        if (message_count != num_messages) {
-          fprintf(stderr, "\n\nParser didn't see %d messages only %d\n",
-            message_count, num_messages);
-          goto error;
-        }
-
-        if (!message_eq(0, 0, r1)) {
-          fprintf(stderr, "\n\nError matching messages[0] in test_scan.\n");
-          goto error;
-        }
-
-        if (message_count > 1 && !message_eq(1, 0, r2)) {
-          fprintf(stderr, "\n\nError matching messages[1] in test_scan.\n");
-          goto error;
-        }
-
-        if (message_count > 2 && !message_eq(2, 0, r3)) {
-          fprintf(stderr, "\n\nError matching messages[2] in test_scan.\n");
-          goto error;
-        }
-
-        parser_free();
-      }
-    }
-  }
-  puts("\b\b\b\b100%");
-  return;
-
- error:
-  fprintf(stderr, "i=%d  j=%d\n", i, j);
-  fprintf(stderr, "buf1 (%u) %s\n\n", (unsigned int)buf1_len, buf1);
-  fprintf(stderr, "buf2 (%u) %s\n\n", (unsigned int)buf2_len , buf2);
-  fprintf(stderr, "buf3 (%u) %s\n", (unsigned int)buf3_len, buf3);
-  abort();
-}
-
-// user required to free the result
-// string terminated by \0
-char *
-create_large_chunked_message (int body_size_in_kb, const char* headers)
-{
-  int i;
-  size_t wrote = 0;
-  size_t headers_len = strlen(headers);
-  size_t bufsize = headers_len + (5+1024+2)*body_size_in_kb + 6;
-  char * buf = malloc(bufsize);
-
-  memcpy(buf, headers, headers_len);
-  wrote += headers_len;
-
-  for (i = 0; i < body_size_in_kb; i++) {
-    // write 1kb chunk into the body.
-    memcpy(buf + wrote, "400\r\n", 5);
-    wrote += 5;
-    memset(buf + wrote, 'C', 1024);
-    wrote += 1024;
-    strcpy(buf + wrote, "\r\n");
-    wrote += 2;
-  }
-
-  memcpy(buf + wrote, "0\r\n\r\n", 6);
-  wrote += 6;
-  assert(wrote == bufsize);
-
-  return buf;
-}
-
-/* Verify that we can pause parsing at any of the bytes in the
- * message and still get the result that we're expecting. */
-void
-test_message_pause (const struct message *msg)
-{
-  char *buf = (char*) msg->raw;
-  size_t buflen = strlen(msg->raw);
-  size_t nread;
-
-  parser_init(msg->type);
-
-  do {
-    nread = parse_pause(buf, buflen);
-
-    // We can only set the upgrade buffer once we've gotten our message
-    // completion callback.
-    if (messages[0].message_complete_cb_called &&
-        msg->upgrade &&
-        parser->upgrade) {
-      messages[0].upgrade = buf + nread;
-      goto test;
-    }
-
-    if (nread < buflen) {
-
-      // Not much do to if we failed a strict-mode check
-      if (HTTP_PARSER_ERRNO(parser) == HPE_STRICT) {
-        parser_free();
-        return;
-      }
-
-      assert (HTTP_PARSER_ERRNO(parser) == HPE_PAUSED);
-    }
-
-    buf += nread;
-    buflen -= nread;
-    http_parser_pause(parser, 0);
-  } while (buflen > 0);
-
-  nread = parse_pause(NULL, 0);
-  assert (nread == 0);
-
-test:
-  if (num_messages != 1) {
-    printf("\n*** num_messages != 1 after testing '%s' ***\n\n", msg->name);
-    abort();
-  }
-
-  if(!message_eq(0, 0, msg)) abort();
-
-  parser_free();
-}
-
-/* Verify that body and next message won't be parsed in responses to CONNECT */
-void
-test_message_connect (const struct message *msg)
-{
-  char *buf = (char*) msg->raw;
-  size_t buflen = strlen(msg->raw);
-
-  parser_init(msg->type);
-
-  parse_connect(buf, buflen);
-
-  if (num_messages != 1) {
-    printf("\n*** num_messages != 1 after testing '%s' ***\n\n", msg->name);
-    abort();
-  }
-
-  if(!message_eq(0, 1, msg)) abort();
-
-  parser_free();
-}
-
-int
-main (void)
-{
-  parser = NULL;
-  int i, j, k;
-  int request_count;
-  int response_count;
-  unsigned long version;
-  unsigned major;
-  unsigned minor;
-  unsigned patch;
-
-  version = http_parser_version();
-  major = (version >> 16) & 255;
-  minor = (version >> 8) & 255;
-  patch = version & 255;
-  printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version);
-
-  printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser));
-
-  for (request_count = 0; requests[request_count].name; request_count++);
-  for (response_count = 0; responses[response_count].name; response_count++);
-
-  //// API
-  test_preserve_data();
-  test_parse_url();
-  test_method_str();
-
-  //// NREAD
-  test_header_nread_value();
-
-  //// OVERFLOW CONDITIONS
-
-  test_header_overflow_error(HTTP_REQUEST);
-  test_no_overflow_long_body(HTTP_REQUEST, 1000);
-  test_no_overflow_long_body(HTTP_REQUEST, 100000);
-
-  test_header_overflow_error(HTTP_RESPONSE);
-  test_no_overflow_long_body(HTTP_RESPONSE, 1000);
-  test_no_overflow_long_body(HTTP_RESPONSE, 100000);
-
-  test_header_content_length_overflow_error();
-  test_chunk_content_length_overflow_error();
-
-  //// HEADER FIELD CONDITIONS
-  test_double_content_length_error(HTTP_REQUEST);
-  test_chunked_content_length_error(HTTP_REQUEST);
-  test_header_cr_no_lf_error(HTTP_REQUEST);
-  test_invalid_header_field_token_error(HTTP_REQUEST);
-  test_invalid_header_field_content_error(HTTP_REQUEST);
-  test_double_content_length_error(HTTP_RESPONSE);
-  test_chunked_content_length_error(HTTP_RESPONSE);
-  test_header_cr_no_lf_error(HTTP_RESPONSE);
-  test_invalid_header_field_token_error(HTTP_RESPONSE);
-  test_invalid_header_field_content_error(HTTP_RESPONSE);
-
-  //// RESPONSES
-
-  for (i = 0; i < response_count; i++) {
-    test_message(&responses[i]);
-  }
-
-  for (i = 0; i < response_count; i++) {
-    test_message_pause(&responses[i]);
-  }
-
-  for (i = 0; i < response_count; i++) {
-    test_message_connect(&responses[i]);
-  }
-
-  for (i = 0; i < response_count; i++) {
-    if (!responses[i].should_keep_alive) continue;
-    for (j = 0; j < response_count; j++) {
-      if (!responses[j].should_keep_alive) continue;
-      for (k = 0; k < response_count; k++) {
-        test_multiple3(&responses[i], &responses[j], &responses[k]);
-      }
-    }
-  }
-
-  test_message_count_body(&responses[NO_HEADERS_NO_BODY_404]);
-  test_message_count_body(&responses[TRAILING_SPACE_ON_CHUNKED_BODY]);
-
-  // test very large chunked response
-  {
-    char * msg = create_large_chunked_message(31337,
-      "HTTP/1.0 200 OK\r\n"
-      "Transfer-Encoding: chunked\r\n"
-      "Content-Type: text/plain\r\n"
-      "\r\n");
-    struct message large_chunked =
-      {.name= "large chunked"
-      ,.type= HTTP_RESPONSE
-      ,.raw= msg
-      ,.should_keep_alive= FALSE
-      ,.message_complete_on_eof= FALSE
-      ,.http_major= 1
-      ,.http_minor= 0
-      ,.status_code= 200
-      ,.response_status= "OK"
-      ,.num_headers= 2
-      ,.headers=
-        { { "Transfer-Encoding", "chunked" }
-        , { "Content-Type", "text/plain" }
-        }
-      ,.body_size= 31337*1024
-      ,.num_chunks_complete= 31338
-      };
-    for (i = 0; i < MAX_CHUNKS; i++) {
-      large_chunked.chunk_lengths[i] = 1024;
-    }
-    test_message_count_body(&large_chunked);
-    free(msg);
-  }
-
-
-
-  printf("response scan 1/2      ");
-  test_scan( &responses[TRAILING_SPACE_ON_CHUNKED_BODY]
-           , &responses[NO_BODY_HTTP10_KA_204]
-           , &responses[NO_REASON_PHRASE]
-           );
-
-  printf("response scan 2/2      ");
-  test_scan( &responses[BONJOUR_MADAME_FR]
-           , &responses[UNDERSTORE_HEADER_KEY]
-           , &responses[NO_CARRIAGE_RET]
-           );
-
-  puts("responses okay");
-
-
-  /// REQUESTS
-
-  test_simple("GET / HTP/1.1\r\n\r\n", HPE_INVALID_VERSION);
-
-  // Extended characters - see nodejs/test/parallel/test-http-headers-obstext.js
-  test_simple("GET / HTTP/1.1\r\n"
-              "Test: Düsseldorf\r\n",
-              HPE_OK);
-
-  // Well-formed but incomplete
-  test_simple("GET / HTTP/1.1\r\n"
-              "Content-Type: text/plain\r\n"
-              "Content-Length: 6\r\n"
-              "\r\n"
-              "fooba",
-              HPE_OK);
-
-  static const char *all_methods[] = {
-    "DELETE",
-    "GET",
-    "HEAD",
-    "POST",
-    "PUT",
-    //"CONNECT", //CONNECT can't be tested like other methods, it's a tunnel
-    "OPTIONS",
-    "TRACE",
-    "COPY",
-    "LOCK",
-    "MKCOL",
-    "MOVE",
-    "PROPFIND",
-    "PROPPATCH",
-    "SEARCH",
-    "UNLOCK",
-    "BIND",
-    "REBIND",
-    "UNBIND",
-    "ACL",
-    "REPORT",
-    "MKACTIVITY",
-    "CHECKOUT",
-    "MERGE",
-    "M-SEARCH",
-    "NOTIFY",
-    "SUBSCRIBE",
-    "UNSUBSCRIBE",
-    "PATCH",
-    "PURGE",
-    "MKCALENDAR",
-    "LINK",
-    "UNLINK",
-    0 };
-  const char **this_method;
-  for (this_method = all_methods; *this_method; this_method++) {
-    char buf[200];
-    sprintf(buf, "%s / HTTP/1.1\r\n\r\n", *this_method);
-    test_simple(buf, HPE_OK);
-  }
-
-  static const char *bad_methods[] = {
-      "ASDF",
-      "C******",
-      "COLA",
-      "GEM",
-      "GETA",
-      "M****",
-      "MKCOLA",
-      "PROPPATCHA",
-      "PUN",
-      "PX",
-      "SA",
-      "hello world",
-      0 };
-  for (this_method = bad_methods; *this_method; this_method++) {
-    char buf[200];
-    sprintf(buf, "%s / HTTP/1.1\r\n\r\n", *this_method);
-    test_simple(buf, HPE_INVALID_METHOD);
-  }
-
-  // illegal header field name line folding
-  test_simple("GET / HTTP/1.1\r\n"
-              "name\r\n"
-              " : value\r\n"
-              "\r\n",
-              HPE_INVALID_HEADER_TOKEN);
-
-  const char *dumbfuck2 =
-    "GET / HTTP/1.1\r\n"
-    "X-SSL-Bullshit:   -----BEGIN CERTIFICATE-----\r\n"
-    "\tMIIFbTCCBFWgAwIBAgICH4cwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVUsx\r\n"
-    "\tETAPBgNVBAoTCGVTY2llbmNlMRIwEAYDVQQLEwlBdXRob3JpdHkxCzAJBgNVBAMT\r\n"
-    "\tAkNBMS0wKwYJKoZIhvcNAQkBFh5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMu\r\n"
-    "\tdWswHhcNMDYwNzI3MTQxMzI4WhcNMDcwNzI3MTQxMzI4WjBbMQswCQYDVQQGEwJV\r\n"
-    "\tSzERMA8GA1UEChMIZVNjaWVuY2UxEzARBgNVBAsTCk1hbmNoZXN0ZXIxCzAJBgNV\r\n"
-    "\tBAcTmrsogriqMWLAk1DMRcwFQYDVQQDEw5taWNoYWVsIHBhcmQYJKoZIhvcNAQEB\r\n"
-    "\tBQADggEPADCCAQoCggEBANPEQBgl1IaKdSS1TbhF3hEXSl72G9J+WC/1R64fAcEF\r\n"
-    "\tW51rEyFYiIeZGx/BVzwXbeBoNUK41OK65sxGuflMo5gLflbwJtHBRIEKAfVVp3YR\r\n"
-    "\tgW7cMA/s/XKgL1GEC7rQw8lIZT8RApukCGqOVHSi/F1SiFlPDxuDfmdiNzL31+sL\r\n"
-    "\t0iwHDdNkGjy5pyBSB8Y79dsSJtCW/iaLB0/n8Sj7HgvvZJ7x0fr+RQjYOUUfrePP\r\n"
-    "\tu2MSpFyf+9BbC/aXgaZuiCvSR+8Snv3xApQY+fULK/xY8h8Ua51iXoQ5jrgu2SqR\r\n"
-    "\twgA7BUi3G8LFzMBl8FRCDYGUDy7M6QaHXx1ZWIPWNKsCAwEAAaOCAiQwggIgMAwG\r\n"
-    "\tA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgHTTPAQDAgWgMA4GA1UdDwEB/wQEAwID6DAs\r\n"
-    "\tBglghkgBhvhCAQ0EHxYdVUsgZS1TY2llbmNlIFVzZXIgQ2VydGlmaWNhdGUwHQYD\r\n"
-    "\tVR0OBBYEFDTt/sf9PeMaZDHkUIldrDYMNTBZMIGaBgNVHSMEgZIwgY+AFAI4qxGj\r\n"
-    "\tloCLDdMVKwiljjDastqooXSkcjBwMQswCQYDVQQGEwJVSzERMA8GA1UEChMIZVNj\r\n"
-    "\taWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0ExLTArBgkqhkiG\r\n"
-    "\t9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51a4IBADApBgNVHRIE\r\n"
-    "\tIjAggR5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMudWswGQYDVR0gBBIwEDAO\r\n"
-    "\tBgwrBgEEAdkvAQEBAQYwPQYJYIZIAYb4QgEEBDAWLmh0dHA6Ly9jYS5ncmlkLXN1\r\n"
-    "\tcHBvcnQuYWMudmT4sopwqlBWsvcHViL2NybC9jYWNybC5jcmwwPQYJYIZIAYb4QgEDBDAWLmh0\r\n"
-    "\tdHA6Ly9jYS5ncmlkLXN1cHBvcnQuYWMudWsvcHViL2NybC9jYWNybC5jcmwwPwYD\r\n"
-    "\tVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NhLmdyaWQt5hYy51ay9wdWIv\r\n"
-    "\tY3JsL2NhY3JsLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAS/U4iiooBENGW/Hwmmd3\r\n"
-    "\tXCy6Zrt08YjKCzGNjorT98g8uGsqYjSxv/hmi0qlnlHs+k/3Iobc3LjS5AMYr5L8\r\n"
-    "\tUO7OSkgFFlLHQyC9JzPfmLCAugvzEbyv4Olnsr8hbxF1MbKZoQxUZtMVu29wjfXk\r\n"
-    "\thTeApBv7eaKCWpSp7MCbvgzm74izKhu3vlDk9w6qVrxePfGgpKPqfHiOoGhFnbTK\r\n"
-    "\twTC6o2xq5y0qZ03JonF7OJspEd3I5zKY3E+ov7/ZhW6DqT8UFvsAdjvQbXyhV8Eu\r\n"
-    "\tYhixw1aKEPzNjNowuIseVogKOLXxWI5vAi5HgXdS0/ES5gDGsABo4fqovUKlgop3\r\n"
-    "\tRA==\r\n"
-    "\t-----END CERTIFICATE-----\r\n"
-    "\r\n";
-  test_simple(dumbfuck2, HPE_OK);
-
-  const char *corrupted_connection =
-    "GET / HTTP/1.1\r\n"
-    "Host: www.example.com\r\n"
-    "Connection\r\033\065\325eep-Alive\r\n"
-    "Accept-Encoding: gzip\r\n"
-    "\r\n";
-  test_simple(corrupted_connection, HPE_INVALID_HEADER_TOKEN);
-
-  const char *corrupted_header_name =
-    "GET / HTTP/1.1\r\n"
-    "Host: www.example.com\r\n"
-    "X-Some-Header\r\033\065\325eep-Alive\r\n"
-    "Accept-Encoding: gzip\r\n"
-    "\r\n";
-  test_simple(corrupted_header_name, HPE_INVALID_HEADER_TOKEN);
-
-#if 0
-  // NOTE(Wed Nov 18 11:57:27 CET 2009) this seems okay. we just read body
-  // until EOF.
-  //
-  // no content-length
-  // error if there is a body without content length
-  const char *bad_get_no_headers_no_body = "GET /bad_get_no_headers_no_body/world HTTP/1.1\r\n"
-                                           "Accept: */*\r\n"
-                                           "\r\n"
-                                           "HELLO";
-  test_simple(bad_get_no_headers_no_body, 0);
-#endif
-  /* TODO sending junk and large headers gets rejected */
-
-
-  /* check to make sure our predefined requests are okay */
-  for (i = 0; requests[i].name; i++) {
-    test_message(&requests[i]);
-  }
-
-  for (i = 0; i < request_count; i++) {
-    test_message_pause(&requests[i]);
-  }
-
-  for (i = 0; i < request_count; i++) {
-    if (!requests[i].should_keep_alive) continue;
-    for (j = 0; j < request_count; j++) {
-      if (!requests[j].should_keep_alive) continue;
-      for (k = 0; k < request_count; k++) {
-        test_multiple3(&requests[i], &requests[j], &requests[k]);
-      }
-    }
-  }
-
-  printf("request scan 1/4      ");
-  test_scan( &requests[GET_NO_HEADERS_NO_BODY]
-           , &requests[GET_ONE_HEADER_NO_BODY]
-           , &requests[GET_NO_HEADERS_NO_BODY]
-           );
-
-  printf("request scan 2/4      ");
-  test_scan( &requests[POST_CHUNKED_ALL_YOUR_BASE]
-           , &requests[POST_IDENTITY_BODY_WORLD]
-           , &requests[GET_FUNKY_CONTENT_LENGTH]
-           );
-
-  printf("request scan 3/4      ");
-  test_scan( &requests[TWO_CHUNKS_MULT_ZERO_END]
-           , &requests[CHUNKED_W_TRAILING_HEADERS]
-           , &requests[CHUNKED_W_BULLSHIT_AFTER_LENGTH]
-           );
-
-  printf("request scan 4/4      ");
-  test_scan( &requests[QUERY_URL_WITH_QUESTION_MARK_GET]
-           , &requests[PREFIX_NEWLINE_GET ]
-           , &requests[CONNECT_REQUEST]
-           );
-
-  puts("requests okay");
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/Makefile.am cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/Makefile.am
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/Makefile.am	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-AM_CPPFLAGS = @DEFS@
-
-EXTRA_DIST = CMakeLists.txt
-
-if ENABLE_THIRD_PARTY
-
-noinst_LTLIBRARIES = libhttp-parser.la
-libhttp_parser_la_SOURCES = \
-	http-parser/http_parser.c \
-	http-parser/http_parser.h
-
-if HAVE_NEVERBLEED
-noinst_LTLIBRARIES += libneverbleed.la
-libneverbleed_la_CPPFLAGS = @OPENSSL_CFLAGS@
-libneverbleed_la_LIBADD = @OPENSSL_LIBS@
-libneverbleed_la_SOURCES = neverbleed/neverbleed.c neverbleed/neverbleed.h
-endif # HAVE_NEVERBLEED
-
-if HAVE_MRUBY
-
-EXTRA_DIST += build_config.rb mruby/*
-
-.PHONY: all-local clean mruby
-
-mruby:
-	MRUBY_CONFIG="${srcdir}/build_config.rb" \
-	BUILD_DIR="${abs_builddir}/mruby/build" \
-	INSTALL_DIR="${abs_builddir}/mruby/build/install/bin" \
-	CC="${CC}" CXX="${CXX}" LD="${LD}" \
-	CFLAGS="${CPPFLAGS} ${CFLAGS}" CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" \
-	LDFLAGS="${LDFLAGS}" \
-	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile"
-
-all-local: mruby
-
-clean-local:
-	MRUBY_CONFIG="${srcdir}/build_config.rb" \
-	BUILD_DIR="${abs_builddir}/mruby/build" \
-	"${srcdir}/mruby/minirake" -f "${srcdir}/mruby/Rakefile" clean
-
-endif # HAVE_MRUBY
-
-endif # ENABLE_THIRD_PARTY
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor_config.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor_config.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor_config.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor_config.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-MRuby::Build.new('debug') do |conf|
-  toolchain :visualcpp
-  enable_debug
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_STRESS MRB_GC_FIXED_ARENA)
-  end
-
-  build_mrbc_exec
-end
-
-MRuby::Build.new('full-debug') do |conf|
-  toolchain :visualcpp
-  enable_debug
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
-
-  conf.enable_test
-end
-
-MRuby::Build.new do |conf|
-  toolchain :visualcpp
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
-  end
-  conf.enable_bintest
-  conf.enable_test
-end
-
-MRuby::Build.new('cxx_abi') do |conf|
-  toolchain :visualcpp
-
-  conf.gembox 'full-core'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
-  end
-  conf.enable_bintest
-  conf.enable_test
-
-  enable_cxx_abi
-
-  build_mrbc_exec
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor.yml cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-version: "{build}"
-
-os: Visual Studio 2015
-
-clone_depth: 50
-
-
-environment:
-  matrix:
-    # Visual Studio 2015 64bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
-      machine: amd64
-
-    # Visual Studio 2013 64bit
-    - visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
-      machine: amd64
-
-
-init:
-  - call "%visualcpp%" %machine%
-  # For using bison.exe
-  - set PATH=%PATH%;C:\cygwin\bin;
-
-
-build_script:
-  - set MRUBY_CONFIG=appveyor_config.rb
-  - ruby .\minirake test
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/AUTHORS cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/AUTHORS
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/AUTHORS	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/AUTHORS	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-Original Authors "mruby developers" are:
-   Yukihiro Matsumoto
-   SCSK KYUSHU CORPORATION
-   Kyushu Institute of Technology
-   Network Applied Communication Laboratory, Inc.
-   Daniel Bovensiepen
-   Jon Maken
-   Bjorn De Meyer
-   Yuichiro MASUI
-   Masamitsu MURASE
-   Masaki Muranaka
-   Internet Initiative Japan Inc.
-   Tadashi FUKUZAWA
-   MATSUMOTO Ryosuke
-   Yasuhiro Matsumoto
-   Koji Yoshioka
-   Jun Hiroe
-   Narihiro Nakamura
-   Yuichi Nishiwaki
-   Tatsuhiko Kubo
-   Takeshi Watanabe
-   Yuki Kurihara
-   specified non-profit corporation mruby Forum
-   Kazuaki Tanaka
-   Hiromasa Ishii
-   Hiroshi Mimaki
-   Satoshi Odawara
-   Mitsubishi Electric Micro-Computer Application Software Co.,Ltd.
-   Ralph Desir(Mav7)
-   Hiroyuki Matsuzaki
-   Yuhei Okazaki
-   Manycolors, Inc.
-   Shota Nakano
-   Yuichi Osawa
-   Terence Lee
-   Zachary Scott
-   Tomasz Dąbrowski
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_ao_render.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_ao_render.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_ao_render.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_ao_render.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,314 +0,0 @@
-# AO render benchmark
-# Original program (C) Syoyo Fujita in Javascript (and other languages)
-#      https://code.google.com/p/aobench/
-# Ruby(yarv2llvm) version by Hideki Miura
-# mruby version by Hideki Miura
-#
-
-IMAGE_WIDTH = 64
-IMAGE_HEIGHT = 64
-NSUBSAMPLES = 2
-NAO_SAMPLES = 8
-
-module Rand
-  # Use xorshift
-  @@x = 123456789
-  @@y = 362436069
-  @@z = 521288629
-  @@w = 88675123
-  BNUM = 1 << 29
-  BNUMF = BNUM.to_f
-  def self.rand
-    x = @@x
-    t = x ^ ((x & 0xfffff) << 11)
-    w = @@w
-    @@x, @@y, @@z = @@y, @@z, w
-    w = @@w = (w ^ (w >> 19) ^ (t ^ (t >> 8)))
-    (w % BNUM) / BNUMF
-  end
-end
-
-class Vec
-  def initialize(x, y, z)
-    @x = x
-    @y = y
-    @z = z
-  end
-
-  def x=(v); @x = v; end
-  def y=(v); @y = v; end
-  def z=(v); @z = v; end
-  def x; @x; end
-  def y; @y; end
-  def z; @z; end
-
-  def vadd(b)
-    Vec.new(@x + b.x, @y + b.y, @z + b.z)
-  end
-
-  def vsub(b)
-    Vec.new(@x - b.x, @y - b.y, @z - b.z)
-  end
-
-  def vcross(b)
-    Vec.new(@y * b.z - @z * b.y,
-            @z * b.x - @x * b.z,
-            @x * b.y - @y * b.x)
-  end
-
-  def vdot(b)
-    r = @x * b.x + @y * b.y + @z * b.z
-    r
-  end
-
-  def vlength
-    Math.sqrt(@x * @x + @y * @y + @z * @z)
-  end
-
-  def vnormalize
-    len = vlength
-    v = Vec.new(@x, @y, @z)
-    if len > 1.0e-17 then
-      v.x = v.x / len
-      v.y = v.y / len
-      v.z = v.z / len
-    end
-    v
-  end
-end
-
-
-class Sphere
-  def initialize(center, radius)
-    @center = center
-    @radius = radius
-  end
-
-  def center; @center; end
-  def radius; @radius; end
-
-  def intersect(ray, isect)
-    rs = ray.org.vsub(@center)
-    b = rs.vdot(ray.dir)
-    c = rs.vdot(rs) - (@radius * @radius)
-    d = b * b - c
-    if d > 0.0 then
-      t = - b - Math.sqrt(d)
-
-      if t > 0.0 and t < isect.t then
-        isect.t = t
-        isect.hit = true
-        isect.pl = Vec.new(ray.org.x + ray.dir.x * t,
-                          ray.org.y + ray.dir.y * t,
-                          ray.org.z + ray.dir.z * t)
-        n = isect.pl.vsub(@center)
-        isect.n = n.vnormalize
-      end
-    end
-  end
-end
-
-class Plane
-  def initialize(p, n)
-    @p = p
-    @n = n
-  end
-
-  def intersect(ray, isect)
-    d = -@p.vdot(@n)
-    v = ray.dir.vdot(@n)
-    v0 = v
-    if v < 0.0 then
-      v0 = -v
-    end
-    if v0 < 1.0e-17 then
-      return
-    end
-
-    t = -(ray.org.vdot(@n) + d) / v
-
-    if t > 0.0 and t < isect.t then
-      isect.hit = true
-      isect.t = t
-      isect.n = @n
-      isect.pl = Vec.new(ray.org.x + t * ray.dir.x,
-                        ray.org.y + t * ray.dir.y,
-                        ray.org.z + t * ray.dir.z)
-    end
-  end
-end
-
-class Ray
-  def initialize(org, dir)
-    @org = org
-    @dir = dir
-  end
-
-  def org; @org; end
-  def org=(v); @org = v; end
-  def dir; @dir; end
-  def dir=(v); @dir = v; end
-end
-
-class Isect
-  def initialize
-    @t = 10000000.0
-    @hit = false
-    @pl = Vec.new(0.0, 0.0, 0.0)
-    @n = Vec.new(0.0, 0.0, 0.0)
-  end
-
-  def t; @t; end
-  def t=(v); @t = v; end
-  def hit; @hit; end
-  def hit=(v); @hit = v; end
-  def pl; @pl; end
-  def pl=(v); @pl = v; end
-  def n; @n; end
-  def n=(v); @n = v; end
-end
-
-def clamp(f)
-  i = f * 255.5
-  if i > 255.0 then
-    i = 255.0
-  end
-  if i < 0.0 then
-    i = 0.0
-  end
-  i.to_i
-end
-
-def otherBasis(basis, n)
-  basis[2] = Vec.new(n.x, n.y, n.z)
-  basis[1] = Vec.new(0.0, 0.0, 0.0)
-
-  if n.x < 0.6 and n.x > -0.6 then
-    basis[1].x = 1.0
-  elsif n.y < 0.6 and n.y > -0.6 then
-    basis[1].y = 1.0
-  elsif n.z < 0.6 and n.z > -0.6 then
-    basis[1].z = 1.0
-  else
-    basis[1].x = 1.0
-  end
-
-  basis[0] = basis[1].vcross(basis[2])
-  basis[0] = basis[0].vnormalize
-
-  basis[1] = basis[2].vcross(basis[0])
-  basis[1] = basis[1].vnormalize
-end
-
-class Scene
-  def initialize
-    @spheres = Array.new
-    @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5)
-    @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5)
-    @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5)
-    @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0))
-  end
-
-  def ambient_occlusion(isect)
-    basis = Array.new(3)
-    otherBasis(basis, isect.n)
-
-    ntheta    = NAO_SAMPLES
-    nphi      = NAO_SAMPLES
-    eps       = 0.0001
-    occlusion = 0.0
-
-    p0 = Vec.new(isect.pl.x + eps * isect.n.x,
-                isect.pl.y + eps * isect.n.y,
-                isect.pl.z + eps * isect.n.z)
-    nphi.times do |j|
-      ntheta.times do |i|
-        r = Rand::rand
-        phi = 2.0 * 3.14159265 * Rand::rand
-        x = Math.cos(phi) * Math.sqrt(1.0 - r)
-        y = Math.sin(phi) * Math.sqrt(1.0 - r)
-        z = Math.sqrt(r)
-
-        rx = x * basis[0].x + y * basis[1].x + z * basis[2].x
-        ry = x * basis[0].y + y * basis[1].y + z * basis[2].y
-        rz = x * basis[0].z + y * basis[1].z + z * basis[2].z
-
-        raydir = Vec.new(rx, ry, rz)
-        ray = Ray.new(p0, raydir)
-
-        occisect = Isect.new
-        @spheres[0].intersect(ray, occisect)
-        @spheres[1].intersect(ray, occisect)
-        @spheres[2].intersect(ray, occisect)
-        @plane.intersect(ray, occisect)
-        if occisect.hit then
-          occlusion = occlusion + 1.0
-        else
-          0.0
-        end
-      end
-    end
-
-    occlusion = (ntheta.to_f * nphi.to_f - occlusion) / (ntheta.to_f * nphi.to_f)
-    Vec.new(occlusion, occlusion, occlusion)
-  end
-
-  def render(w, h, nsubsamples)
-    cnt = 0
-    nsf = nsubsamples.to_f
-    h.times do |y|
-      w.times do |x|
-        rad = Vec.new(0.0, 0.0, 0.0)
-
-        # Subsmpling
-        nsubsamples.times do |v|
-          nsubsamples.times do |u|
-            cnt = cnt + 1
-            wf = w.to_f
-            hf = h.to_f
-            xf = x.to_f
-            yf = y.to_f
-            uf = u.to_f
-            vf = v.to_f
-
-            px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0)
-            py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0)
-
-            eye = Vec.new(px, py, -1.0).vnormalize
-
-            ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye)
-
-            isect = Isect.new
-            @spheres[0].intersect(ray, isect)
-            @spheres[1].intersect(ray, isect)
-            @spheres[2].intersect(ray, isect)
-            @plane.intersect(ray, isect)
-            if isect.hit then
-              col = ambient_occlusion(isect)
-              rad.x = rad.x + col.x
-              rad.y = rad.y + col.y
-              rad.z = rad.z + col.z
-            else
-              0.0
-            end
-          end
-        end
-
-        r = rad.x / (nsf * nsf)
-        g = rad.y / (nsf * nsf)
-        b = rad.z / (nsf * nsf)
-        printf("%c", clamp(r))
-        printf("%c", clamp(g))
-        printf("%c", clamp(b))
-      end
-    end
-  end
-end
-
-# File.open("ao.ppm", "w") do |fp|
-  printf("P6\n")
-  printf("%d %d\n", IMAGE_WIDTH, IMAGE_HEIGHT)
-  printf("255\n", IMAGE_WIDTH, IMAGE_HEIGHT)
-  Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES)
-#  Scene.new.render(256, 256, 2)
-# end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_app_lc_fizzbuzz.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_app_lc_fizzbuzz.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_app_lc_fizzbuzz.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_app_lc_fizzbuzz.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#
-# FizzBuzz program using only lambda calculus
-#
-# This program is quoted from
-#   "Understanding Computation" by Tom Stuart
-#   http://computationbook.com/
-#
-# You can understand why this program works fine by reading this book.
-#
-
-solution = -> k { -> f { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][k][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> l { -> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[l][f[x]] } }] } }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[m][n]][-> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[f[-> n { -> p { -> x { p[n[p][x]] } } }[m]][n]][m][x] }][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]] } } }][-> p { -> x { p[x] } }][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] } }]][-> n { -> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[x]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> n { -> l { -> x { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][l][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][x]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }] } }[-> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> x { f[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { -> n { -> p { -> x { p[n[p][x]] } } }[f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n]][x] }][-> p { -> x { x } }] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][x] }]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]] } }][n]]]] }]
-
-FIRST     = -> l { LEFT[RIGHT[l]] }
-IF        = -> b { b }
-LEFT      = -> p { p[-> x { -> y { x } } ] }
-RIGHT     = -> p { p[-> x { -> y { y } } ] }
-IS_EMPTY  = LEFT
-REST      = -> l { RIGHT[RIGHT[l]] }
-
-def to_integer(proc)
-  proc[-> n { n + 1 }][0]
-end
-
-def to_boolean(proc)
-  IF[proc][true][false]
-end
-
-def to_array(proc)
-  array = []
-
-  until to_boolean(IS_EMPTY[proc])
-    array.push(FIRST[proc])
-    proc = REST[proc]
-  end
-
-  array
-end
-
-def to_char(c)
-  '0123456789BFiuz'.slice(to_integer(c))
-end
-
-def to_string(s)
-  to_array(s).map { |c| to_char(c) }.join
-end
-
-answer = to_array(solution).map do |p|
-  to_string(p)
-end
-
-answer_str = answer.to_a
-# puts answer_str
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_fib.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_fib.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_fib.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_fib.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-
-def fib n
-  return n if n < 2
-  fib(n-2) + fib(n-1)
-end
-
-puts fib(37)
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_so_lists.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_so_lists.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_so_lists.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/bm_so_lists.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
-
-NUM = 300
-SIZE = 10000
-
-def test_lists()
-  # create a list of integers (Li1) from 1 to SIZE
-  li1 = (1..SIZE).to_a
-  # copy the list to li2 (not by individual items)
-  li2 = li1.dup
-  # remove each individual item from left side of li2 and
-  # append to right side of li3 (preserving order)
-  li3 = Array.new
-  while (not li2.empty?)
-    li3.push(li2.shift)
-  end
-  # li2 must now be empty
-  # remove each individual item from right side of li3 and
-  # append to right side of li2 (reversing list)
-  while (not li3.empty?)
-    li2.push(li3.pop)
-  end
-  # li3 must now be empty
-  # reverse li1 in place
-  li1.reverse!
-  # check that first item is now SIZE
-  if li1[0] != SIZE then
-    p "not SIZE"
-    0
-  else
-    # compare li1 and li2 for equality
-    if li1 != li2 then
-      return(0)
-    else
-      # return the length of the list
-      li1.length
-    end
-  end
-end
-
-i = 0
-while i<NUM
-  i += 1
-  result = test_lists()
-end
-
-result
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_boxing.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_boxing.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_boxing.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_boxing.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-MRuby::Build.new do |conf|
-  toolchain :gcc
-end
-
-MRuby::Build.new('no_boxing') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'default'
-end
-
-MRuby::Build.new('word_boxing') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'default'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_WORD_BOXING)
-  end
-end
-
-MRuby::Build.new('nan_boxing') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'default'
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_NAN_BOXING)
-  end
-end
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_cc.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_cc.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_cc.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/build_config_cc.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-MRuby::Build.new do |conf|
-  toolchain :gcc
-end
-
-MRuby::Build.new('gcc') do |conf|
-  toolchain :gcc
-  conf.gembox 'default'
-end
-
-MRuby::Build.new('clang') do |conf|
-  toolchain :clang
-  conf.gembox 'default'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/plot.gpl cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/plot.gpl
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/plot.gpl	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/benchmark/plot.gpl	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-set yrange [0:]
-set terminal pngcairo font 'Sans, 8' lw 1 size 1400,1024
-set xtics rotate by -45
-set style histogram errorbars gap 2 lw 1
-set style fill solid border -1
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/build_config.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/build_config.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/build_config.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/build_config.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-MRuby::Build.new do |conf|
-  # load specific toolchain settings
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # Use mrbgems
-  # conf.gem 'examples/mrbgems/ruby_extension_example'
-  # conf.gem 'examples/mrbgems/c_extension_example' do |g|
-  #   g.cc.flags << '-g' # append cflags in this gem
-  # end
-  # conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
-  # conf.gem :core => 'mruby-eval'
-  # conf.gem :mgem => 'mruby-io'
-  # conf.gem :github => 'iij/mruby-io'
-  # conf.gem :git => 'git@github.com:iij/mruby-io.git', :branch => 'master', :options => '-v'
-
-  # include the default GEMs
-  conf.gembox 'default'
-  # C compiler settings
-  # conf.cc do |cc|
-  #   cc.command = ENV['CC'] || 'gcc'
-  #   cc.flags = [ENV['CFLAGS'] || %w()]
-  #   cc.include_paths = ["#{root}/include"]
-  #   cc.defines = %w(DISABLE_GEMS)
-  #   cc.option_include_path = '-I%s'
-  #   cc.option_define = '-D%s'
-  #   cc.compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}"
-  # end
-
-  # mrbc settings
-  # conf.mrbc do |mrbc|
-  #   mrbc.compile_options = "-g -B%{funcname} -o-" # The -g option is required for line numbers
-  # end
-
-  # Linker settings
-  # conf.linker do |linker|
-  #   linker.command = ENV['LD'] || 'gcc'
-  #   linker.flags = [ENV['LDFLAGS'] || []]
-  #   linker.flags_before_libraries = []
-  #   linker.libraries = %w()
-  #   linker.flags_after_libraries = []
-  #   linker.library_paths = []
-  #   linker.option_library = '-l%s'
-  #   linker.option_library_path = '-L%s'
-  #   linker.link_options = "%{flags} -o %{outfile} %{objs} %{libs}"
-  # end
-
-  # Archiver settings
-  # conf.archiver do |archiver|
-  #   archiver.command = ENV['AR'] || 'ar'
-  #   archiver.archive_options = 'rs %{outfile} %{objs}'
-  # end
-
-  # Parser generator settings
-  # conf.yacc do |yacc|
-  #   yacc.command = ENV['YACC'] || 'bison'
-  #   yacc.compile_options = '-o %{outfile} %{infile}'
-  # end
-
-  # gperf settings
-  # conf.gperf do |gperf|
-  #   gperf.command = 'gperf'
-  #   gperf.compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}'
-  # end
-
-  # file extensions
-  # conf.exts do |exts|
-  #   exts.object = '.o'
-  #   exts.executable = '' # '.exe' if Windows
-  #   exts.library = '.a'
-  # end
-
-  # file separetor
-  # conf.file_separator = '/'
-
-  # bintest
-  # conf.enable_bintest
-end
-
-MRuby::Build.new('host-debug') do |conf|
-  # load specific toolchain settings
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-  # C compiler settings
-  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
-
-  # Generate mruby debugger command (require mruby-eval)
-  conf.gem :core => "mruby-bin-debugger"
-
-  # bintest
-  # conf.enable_bintest
-end
-
-MRuby::Build.new('test') do |conf|
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-  conf.enable_bintest
-  conf.enable_test
-
-  conf.gembox 'default'
-end
-
-MRuby::Build.new('bench') do |conf|
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-    conf.cc.flags << '-O3'
-  end
-
-  conf.gembox 'default'
-end
-
-# Define cross build settings
-# MRuby::CrossBuild.new('32bit') do |conf|
-#   toolchain :gcc
-#
-#   conf.cc.flags << "-m32"
-#   conf.linker.flags << "-m32"
-#
-#   conf.build_mrbtest_lib_only
-#
-#   conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
-#
-#   conf.test_runner.command = 'env'
-#
-# end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/CONTRIBUTING.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/CONTRIBUTING.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/CONTRIBUTING.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-# How to contribute
-
-mruby is an open-source project which is looking forward to each contribution.
-
-## Your Pull Request
-
-To make it easy to review and understand your change please keep the following
-things in mind before submitting your pull request:
-
-* Work on the latest possible state of **mruby/master**
-* Create a branch which is dedicated to your change
-* Test your changes before creating a pull request (```./minirake test```)
-* If possible write a test case which confirms your change
-* Don't mix several features or bug-fixes in one pull request
-* Create a meaningful commit message
-* Explain your change (i.e. with a link to the issue you are fixing)
-* Use mrbgem to provide non ISO features (classes, modules and methods) unless
-  you have a special reason to implement them in the core
-
-## Coding conventions
-
-How to style your C and Ruby code which you want to submit.
-
-### C code
-
-The core part (parser, bytecode-interpreter, core-lib, etc.) of mruby is
-written in the C programming language. Please note the following hints for your
-C code:
-
-#### Comply with C99 (ISO/IEC 9899:1999)
-
-mruby should be highly portable to other systems and compilers. For this it is
-recommended to keep your code as close as possible to the C99 standard
-(http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf).
-
-Although we target C99, Visual C++ is also an important target for mruby. For
-this reason a declaration of a local variable has to be at the beginning of a
-scope block.
-
-#### Reduce library dependencies to a minimum
-
-The dependencies to libraries should be kept to an absolute minimum. This
-increases the portability but makes it also easier to cut away parts of mruby
-on-demand.
-
-#### Don't use C++ style comments
-
-    /* This is the preferred comment style */
-
-Use C++ style comments only for temporary comment e.g. commenting out some code lines.
-
-#### Insert a break after the method return value:
-
-    int
-    main(void)
-    {
-      ...
-    }
-
-### Ruby code
-
-Parts of the standard library of mruby are written in the Ruby programming
-language itself. Please note the following hints for your Ruby code:
-
-#### Comply with the Ruby standard (ISO/IEC 30170:2012)
-
-mruby is currently targeting to execute Ruby code which complies to ISO/IEC
-30170:2012 (http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579).
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/compile.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/compile.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/compile.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/compile.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,488 +0,0 @@
-# Compile
-
-mruby uses Rake to compile and cross-compile all libraries and
-binaries.
-
-## Prerequisites
-
-To compile mruby out of the source code you need the following tools:
-* C Compiler (i.e. ```gcc```)
-* Linker (i.e. ```gcc```)
-* Archive utility (i.e. ```ar```)
-* Parser generator (i.e. ```bison```)
-* Ruby 1.8 or 1.9 (i.e. ```ruby``` or ```jruby```)
-
-Optional:
-* GIT (to update mruby source and integrate mrbgems easier)
-* C++ compiler (to use GEMs which include \*.cpp, \*.cxx, \*.cc)
-* Assembler (to use GEMs which include \*.asm)
-
-## Usage
-
-Inside of the root directory of the mruby source a file exists
-called *build_config.rb*. This file contains the build configuration
-of mruby and looks like this for example:
-```ruby
-MRuby::Build.new do |conf|
-  toolchain :gcc
-end
-```
-
-All tools necessary to compile mruby can be set or modified here. In case
-you want to maintain an additional *build_config.rb* you can define a
-customized path using the *$MRUBY_CONFIG* environment variable.
-
-To compile just call ```./minirake``` inside of the mruby source root. To
-generate and execute the test tools call ```./minirake test```. To clean
-all build files call ```./minirake clean```. To see full command line on
-build, call ```./minirake -v```.
-
-## Build Configuration
-
-Inside of the *build_config.rb* the following options can be configured
-based on your environment.
-
-### Toolchains
-
-The mruby build system already contains a set of toolchain templates which
-configure the build environment for specific compiler infrastructures.
-
-#### GCC
-
-Toolchain configuration for the GNU C Compiler.
-```ruby
-toolchain :gcc
-```
-
-#### clang
-
-Toolchain configuration for the LLVM C Compiler clang. Mainly equal to the
-GCC toolchain.
-```ruby
-toolchain :clang
-```
-
-#### Visual Studio 2010, 2012 and 2013
-
-Toolchain configuration for Visual Studio on Windows. If you use the
-[Visual Studio Command Prompt](http://msdn.microsoft.com/en-us/library/ms229859\(v=vs.110\).aspx),
-you normally do not have to specify this manually, since it gets automatically detected by our build process.
-```ruby
-toolchain :visualcpp
-```
-
-#### Android
-
-Toolchain configuration for Android.
-```ruby
-toolchain :android
-```
-
-Requires the custom standalone Android NDK and the toolchain path
-in ```ANDROID_STANDALONE_TOOLCHAIN```.
-
-### Binaries
-
-It is possible to select which tools should be compiled during the compilation
-process. The following tools can be selected:
-* mruby (mruby interpreter)
-* mirb (mruby interactive shell)
-
-To select them declare conf.gem as follows:
-```ruby
-conf.gem "#{root}/mrbgems/mruby-bin-mruby"
-conf.gem "#{root}/mrbgems/mruby-bin-mirb"
-```
-
-### File Separator
-
-Some environments require a different file separator character. It is possible to
-set the character via ```conf.file_separator```.
-```ruby
-conf.file_separator = '/'
-```
-
-### C Compiler
-
-Configuration of the C compiler binary, flags and include paths.
-```ruby
-conf.cc do |cc|
-  cc.command = ...
-  cc.flags = ...
-  cc.include_paths = ...
-  cc.defines = ...
-  cc.option_include_path = ...
-  cc.option_define = ...
-  cc.compile_options = ...
-end
-```
-
-C Compiler has header searcher to detect installed library.
-
-If you need a include path of header file use ```search_header_path```:
-```ruby
-# Searches ```iconv.h```.
-# If found it will return include path of the header file.
-# Otherwise it will return nil .
-fail 'iconv.h not found' unless conf.cc.search_header_path 'iconv.h'
-```
-
-If you need a full file name of header file use ```search_header```:
-```ruby
-# Searches ```iconv.h```.
-# If found it will return full path of the header file.
-# Otherwise it will return nil .
-iconv_h = conf.cc.search_header 'iconv.h'
-print "iconv.h found: #{iconv_h}\n"
-```
-
-Header searcher uses compiler's ```include_paths``` by default.
-When you are using GCC toolchain (including clang toolchain since its base is gcc toolchain)
-it will use compiler specific include paths too. (For example ```/usr/local/include```, ```/usr/include```)
-
-If you need a special header search paths define a singleton method ```header_search_paths``` to C compiler:
-```ruby
-def conf.cc.header_search_paths
-  ['/opt/local/include'] + include_paths
-end
-```
-
-### Linker
-
-Configuration of the Linker binary, flags and library paths.
-```ruby
-conf.linker do |linker|
-  linker.command = ...
-  linker.flags = ...
-  linker.flags_before_libraries = ...
-  linker.libraries = ...
-  linker.flags_after_libraries = ...
-  linker.library_paths = ....
-  linker.option_library = ...
-  linker.option_library_path = ...
-  linker.link_options = ...
-end
-```
-
-### Archiver
-
-Configuration of the Archiver binary and flags.
-```ruby
-conf.archiver do |archiver|
-  archiver.command = ...
-  archiver.archive_options = ...
-end
-```
-
-### Parser Generator
-
-Configuration of the Parser Generator binary and flags.
-```ruby
-conf.yacc do |yacc|
-  yacc.command = ...
-  yacc.compile_options = ...
-end
-```
-
-### GPerf
-
-Configuration of the GPerf binary and flags.
-```ruby
-conf.gperf do |gperf|
-  gperf.command = ...
-  gperf.compile_options = ...
-end
-```
-
-### File Extensions
-```ruby
-conf.exts do |exts|
-  exts.object = ...
-  exts.executable = ...
-  exts.library = ...
-end
-```
-
-### Mrbgems
-
-Integrate GEMs in the build process.
-```ruby
-# Integrate GEM with additional configuration
-conf.gem 'path/to/gem' do |g|
-  g.cc.flags << ...
-end
-
-# Integrate GEM without additional configuration
-conf.gem 'path/to/another/gem'
-```
-
-See doc/mrbgems/README.md for more option about mrbgems.
-
-### Mrbtest
-
-Configuration Mrbtest build process.
-
-If you want mrbtest.a only, You should set ```conf.build_mrbtest_lib_only```
-```ruby
-conf.build_mrbtest_lib_only
-```
-
-### Bintest
-
-Tests for mrbgem tools using CRuby.
-To have bintests place \*.rb scripts to ```bintest/``` directory of mrbgems.
-See ```mruby-bin-*/bintest/*.rb``` if you need examples.
-If you want a temporary files use `tempfile` module of CRuby instead of ```/tmp/```.
-
-You can enable it with following:
-```ruby
-conf.enable_bintest
-```
-
-### C++ ABI
-
-By default, mruby uses setjmp/longjmp to implement its
-exceptions. But it doesn't release C++ stack object
-correctly. To support mrbgems written in C++, mruby can be
-configured to use C++ exception.
-
-There are two levels of C++ exception handling. The one is
-```enable_cxx_exception``` that enables C++ exception, but
-uses C ABI. The other is ```enable_cxx_abi``` where all
-files are compiled by C++ compiler.
-
-When you mix C++ code, C++ exception would be enabled automatically.
-If you need to enable C++ exception explicitly add the following:
-```ruby
-conf.enable_cxx_exception
-```
-
-#### C++ exception disabling.
-
-If your compiler does not support C++ and you want to ensure
-you don't use mrbgem written in C++, you can explicitly disable
-C++ exception, add following:
-```ruby
-conf.disable_cxx_exception
-```
-and you will get an error when you try to use C++ gem.
-Note that it must be called before ```enable_cxx_exception``` or ```gem``` method.
-
-### Debugging mode
-
-To enable debugging mode add the following:
-```ruby
-conf.enable_debug
-```
-
-When debugging mode is enabled
-* Macro ```MRB_DEBUG``` would be defined.
-	* Which means ```mrb_assert()``` macro is enabled.
-* Debug information of irep would be generated by ```mrbc```.
-	* Because ```-g``` flag would be added to ```mrbc``` runner.
-    * You can have better backtrace of mruby scripts with this.
-
-## Cross-Compilation
-
-mruby can also be cross-compiled from one platform to another. To
-achieve this the *build_config.rb* needs to contain an instance of
-```MRuby::CrossBuild```. This instance defines the compilation
-tools and flags for the target platform. An example could look
-like this:
-```ruby
-MRuby::CrossBuild.new('32bit') do |conf|
-  toolchain :gcc
-
-  conf.cc.flags << "-m32"
-  conf.linker.flags << "-m32"
-end
-```
-
-All configuration options of ```MRuby::Build``` can also be used
-in ```MRuby::CrossBuild```.
-
-### Mrbtest in Cross-Compilation
-
-In cross compilation, you can run ```mrbtest``` on emulator if
-you have it by changing configuration of test runner.
-```ruby
-conf.test_runner do |t|
-  t.command = ... # set emulator. this value must be non nil or false
-  t.flags = ... # set flags of emulator
-
-  def t.run(bin) # override `run` if you need to change the behavior of it
-    ... # `bin` is the full path of mrbtest
-  end
-end
-```
-
-## Build process
-
-During the build process the directory *build* will be created in the
-root directory. The structure of this directory will look like this:
-
-	+- build
-	   |
-	   +-  host
-	       |
-	       +- bin          <- Binaries (mirb, mrbc and mruby)
-	       |
-	       +- lib          <- Libraries (libmruby.a and libmruby_core.a)
-	       |
-	       +- mrblib
-	       |
-	       +- src
-	       |
-	       +- test         <- mrbtest tool
-	       |
-	       +- tools
-	          |
-	          +- mirb
-	          |
-	          +- mrbc
-	          |
-	          +- mruby
-
-The compilation workflow will look like this:
-* compile all files under *src* (object files will be stored
-in *build/host/src*)
-* generate parser grammar out of *src/parse.y* (generated
-result will be stored in *build/host/src/y.tab.c*)
-* compile  *build/host/src/y.tab.c* to  *build/host/src/y.tab.o*
-* create *build/host/lib/libmruby_core.a* out of all object files (C only)
-* create ```build/host/bin/mrbc``` by compiling *tools/mrbc/mrbc.c* and
-linking with *build/host/lib/libmruby_core.a*
-* create *build/host/mrblib/mrblib.c* by compiling all \*.rb files
-under *mrblib* with ```build/host/bin/mrbc```
-* compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o*
-* create *build/host/lib/libmruby.a* out of all object files (C and Ruby)
-* create ```build/host/bin/mruby``` by compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and
-linking with *build/host/lib/libmruby.a*
-* create ```build/host/bin/mirb``` by compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and
-linking with *build/host/lib/libmruby.a*
-
-```
- _____    _____    ______    ____    ____    _____    _____    ____
-| CC  |->|GEN  |->|AR    |->|CC  |->|CC  |->|AR   |->|CC   |->|CC  |
-| *.c |  |y.tab|  |core.a|  |mrbc|  |*.rb|  |lib.a|  |mruby|  |mirb|
- -----    -----    ------    ----    ----    -----    -----    ----
-```
-
-### Cross-Compilation
-
-In case of a cross-compilation to *i386* the *build* directory structure looks
-like this:
-
-	+- build
-	   |
-	   +-  host
-	   |   |
-	   |   +- bin           <- Native Binaries
-	   |   |
-	   |   +- lib           <- Native Libraries
-	   |   |
-	   |   +- mrblib
-	   |   |
-	   |   +- src
-	   |   |
-	   |   +- test          <- Native mrbtest tool
-	   |   |
-	   |   +- tools
-	   |      |
-	   |      +- mirb
-	   |      |
-	   |      +- mrbc
-	   |      |
-	   |      +- mruby
-	   +- i386
-	      |
-	      +- bin            <- Cross-compiled Binaries
-	      |
-	      +- lib            <- Cross-compiled Libraries
-	      |
-	      +- mrblib
-	      |
-	      +- src
-	      |
-	      +- test           <- Cross-compiled mrbtest tool
-	      |
-	      +- tools
-	         |
-	         +- mirb
-	         |
-	         +- mrbc
-	         |
-	         +- mruby
-
-An extra directory is created for the target platform. In case you
-compile for *i386* a directory called *i386* is created under the
-build directory.
-
-The cross compilation workflow starts in the same way as the normal
-compilation by compiling all *native* libraries and binaries.
-Afterwards the cross compilation process proceeds like this:
-* cross-compile all files under *src* (object files will be stored
-in *build/i386/src*)
-* generate parser grammar out of *src/parse.y* (generated
-result will be stored in *build/i386/src/y.tab.c*)
-* cross-compile *build/i386/src/y.tab.c* to *build/i386/src/y.tab.o*
-* create *build/i386/mrblib/mrblib.c* by compiling all \*.rb files
-under *mrblib* with the native ```build/host/bin/mrbc```
-* cross-compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o*
-* create *build/i386/lib/libmruby.a* out of all object files (C and Ruby)
-* create ```build/i386/bin/mruby``` by cross-compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and
-linking with *build/i386/lib/libmruby.a*
-* create ```build/i386/bin/mirb``` by cross-compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and
-linking with *build/i386/lib/libmruby.a*
-* create *build/i386/lib/libmruby_core.a* out of all object files (C only)
-* create ```build/i386/bin/mrbc``` by cross-compiling *tools/mrbc/mrbc.c* and
-linking with *build/i386/lib/libmruby_core.a*
-
-```
- _______________________________________________________________
-|              Native Compilation for Host System               |
-|  _____      ______      _____      ____      ____      _____  |
-| | CC  | -> |AR    | -> |GEN  | -> |CC  | -> |CC  | -> |AR   | |
-| | *.c |    |core.a|    |y.tab|    |mrbc|    |*.rb|    |lib.a| |
-|  -----      ------      -----      ----      ----      -----  |
- ---------------------------------------------------------------
-                                ||
-                               \||/
-                                \/
- ________________________________________________________________
-|             Cross Compilation for Target System                |
-|  _____      _____      _____      ____      ______      _____  |
-| | CC  | -> |AR   | -> |CC   | -> |CC  | -> |AR    | -> |CC   | |
-| | *.c |    |lib.a|    |mruby|    |mirb|    |core.a|    |mrbc | |
-|  -----      -----      -----      ----      ------      -----  |
- ----------------------------------------------------------------
-```
-
-## Build Configuration Examples
-
-### Minimal Library
-
-To build a minimal mruby library you need to use the Cross Compiling
-feature due to the reason that there are functions (i.e. stdio) which
-can't be disabled for the main build.
-
-```ruby
-MRuby::CrossBuild.new('Minimal') do |conf|
-  toolchain :gcc
-
-  conf.cc.defines = %w(MRB_DISABLE_STDIO)
-  conf.bins = []
-end
-```
-
-This configuration defines a cross compile build called 'Minimal' which
-is using the GCC and compiles for the host machine. It also disables
-all usages of stdio and doesn't compile any binaries (i.e. mrbc).
-
-## Test Environment
-
-mruby's build process includes a test environment. In case you start the testing
-of mruby, a native binary called ```mrbtest``` will be generated and executed.
-This binary contains all test cases which are defined under *test/t*. In case
-of a cross-compilation an additional cross-compiled *mrbtest* binary is
-generated. You can copy this binary and run on your target system.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/debugger.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/debugger.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/debugger.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/debugger.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-# How to Use the mruby Debugger
-
-copyright (c) 2014 Specified Non-Profit Corporation mruby Forum
-
-## 1. Summary
-
-This file documents the mruby debugger ('mrdb') methods.
-
-## 2 Debugging with mrdb
-
-## 2.1 Building mrdb
-
-The trunk of the mruby source tree, with the most recent mrdb, can be checked out with the following command:
-
-```bash
-$ git clone https://github.com/mruby/mruby.git
-```
-
-To run the `make` command:
-
-```bash
-$ cd mruby
-$ make
-```
-
-By default, the `make` command will install the debugger files into mruby/bin.
-
-You can add the path for mrdb on your host environment with the following command:
-
-```bash
-$ echo "export PATH=\$PATH:MRUBY_ROOT/bin" >> ~/.bashrc
-$ source ~/.bashrc
-```
-
-`*MRUBY_ROOT` is the directory in which mruby source code will be installed.
-
-To confirm mrdb was installed properly, run mrdb with the `--version` option:
-
-```bash
-$ mrdb --version
-mruby 1.3.0 (2017-7-4)
-```
-
-## 2.2 Basic Operation
-
-### 2.2.1 Debugging mruby Script Files (rb file) with mrdb
-
-To invoke the mruby debugger, just type `mrdb`.
-
-To specify the script file:
-
-```bash
-$ mrdb [option] file name
-```
-
-For example: Debugging sample.rb
-
-```bash
-$ mrdb sample.rb
-```
-
-You can execute the shell commands listed below:
-
-|command|description|
-|:-:|:--|
-|run|execute programs|
-|step|execute stepping|
-|continue|execute continuing program|
-|break|configure the breaking point|
-|delete|deleting the breaking points|
-|disable|disabling the breaking points|
-|enable|enabling the breaking points|
-|info breakpoints|showing list of the breaking points|
-|print|evaluating and printing the values of the mruby expressions in the script|
-|list|displaying the source cords|
-|help|showing help|
-|quit|terminating the mruby debugger|
-
-### 2.2.2 Debugging mruby Binary Files (mrb file) with mrdb
-
-You can debug the mruby binary files.
-
-#### 2.2.2.1 Debugging the binary files
-
-* notice
-To debug mruby binary files, you need to compile mruby files with option `-g`.
-
-```bash
-$ mrbc -g sample.rb
-```
-
-You can debug the mruby binary files with following command and the option `-b`.
-
-```bash
-$ mrdb -b sample.mrb
-```
-
-Then you can execute all debugger shell commands.
-
-#### Break Command
-
-You can use any breakpoint to stop the program by specifying the line number and method name.
-The breakpoint list will be displayed after you have set the breakpoint successfully.
-
-Usage:
-
-```
-break [file:]linenum
-b [file:]linenum
-break [class:]method
-b [class:]method
-```
-
-The breakpoint will be ordered in serial from 1.
-The number, which was given to the deleted breakpoint, will never be given to another breakpoint again.
-
-You can give multiple breakpoints to specified the line number and method.
-Be ware that breakpoint command will not check the validity of the class name and method name.
-
-You can get the current breakpoint information by the following options.
-
-breakpoint breakpoint number : file name. line number
-
-breakpoint breakpoint number : [class name,] method name
-
-#### Continue Command
-
-Usage:
-
-```
-continue [N]
-c [N]
-```
-
-N: the next breakpoint number
-
-When resuming the program, it will stop at breakpoint N (N-1 breakpoint will be ignored).
-
-When you run the `continue` command without specifying N, the program will be stopped at the next breakpoint.
-
-Example:
-
-```
-(foo.rb:1) continue 3
-```
-
-This will resume the program and stop it at the third breakpoint.
-
-#### Delete Command
-
-This will delete the specified breakpoint.
-
-Usage:
-
-```
-delete [breakpoint-no]
-d [breakpoint-no]
-```
-
-breakpoint-no: breakpoint number
-
-Example:
-
-```
-(foo.rb:1) delete
-```
-
-This will delete all of the breakpoints.
-
-```
-(foo.rb:1) delete 1 3
-```
-
-This will delete the breakpoint at 1 and 3.
-
-#### Disable Command
-
-This will disable the specified breakpoint.
-
-Usage:
-
-```
-disable [breakpoint-no]
-dis [breakpoint-no]
-```
-
-reappointing: breakpoint number
-
-Example:
-
-```
-(foo.rb:1) disable
-```
-
-Use `disable` if you would like to disable all of the breakpoints.
-
-```
-(foo.rb:1) disable 1 3
-```
-
-This will disable the breakpoints at 1 and 3.
-
-#### Enable Command
-
-This will enable the specified breakpoints.
-
-Usage:
-
-```
-enable [breakpoint-no]
-e [breakpoint-no]
-```
-
-breakpoint-no: breakpoint number
-
-Example:
-
-```
-(foo.rb:1) enable
-```
-
-Enabling all breakpoints
-```
-(foo.rb:1) enable 1 3
-```
-
-Enabling the breakpoint 1 and 3
-
-#### eval command
-
-Evaluating the string as source code and printing the value.
-
-Same as print command, please see print command.
-
-#### help command
-
-Displaying the help message.
-
-Usage:
-
-```
-help [command]
-h [command]
-```
-
-Typing `help` without any options will display the command list.
-
-#### Info Breakpoints Command
-
-Displaying the specified breakpoint information.
-
-Usage:
-
-```
-info breakpoints [breakpoint-no]
-i b [breakpoint-no]
-```
-
-breakpoint-no: breakpoint number
-
-Typing "info breakpoints" without ant option will display all breakpoint information.
-Example:
-
-```
-(sample.rb:1) info breakpoints
-Num     Type           Enb What  
-1       breakpoint     y   at sample.rb:3                      -> file name,line number
-2       breakpoint     n   in Sample_class:sample_class_method -> [class:]method name
-3       breakpoint     y   in sample_global_method
-```
-
-Displaying the specified breakpoint number:
-
-```
-(foo.rb:1) info breakpoints 1 3
-Num     Type           Enb What  
-1       breakpoint     y   at sample.rb:3  
-3       breakpoint     y   in sample_global_method
-```
-
-#### List Command
-
-To display the code of the source file.
-
-Usage:
-
-```
-list [filename:]first[,last]
-l [filename]:first[,last]
-```
-
-first: the opening row number
-last : the closing row number
-
-When you specify the `first`, but not the `last` option, you will receive 10 rows.
-When you do not specify both the `first` and `last` options, you will receive the next 10 rows.
-
-Example:
-
-```
-Specifying file name and first row number
-sample.rb:1) list sample2.rb:5
-```
-
-Specifying the file name and the first and last row number:
-
-```
-(sample.rb:1) list sample2.rb:6,7
-```
-
-#### Print Command
-
-Evaluating the string as source code and printing the value.
-
-Usage:
-
-```
-print [expr]
-p [expr]
-```
-
-expr: expression
-
-The expression is mandatory.
-The displayed expressions will be serially ordered from 1.
-If an exception occurs, the exception information will be displayed and the debugging will be continued.
-
-Example:
-
-```
-(sample.rb:1) print 1+2
-$1 = 3
-(sample.rb:1) print self
-$2 = main
-```
-
-Below is the case of the exception:
-
-```
-(sample.rb:1) print (1+2
-$1 =  SyntaxError: line 1: syntax error, unexpected $end, expecting ')'
-```
-
-#### Quit Command
-
-Quitting the debugger.
-
-Usage:
-
-```
-quit
-q
-```
-
-#### Run Command
-
-Running the program and stopping at the first breakpoint.
-
-Usage:
-
-```
-run
-r
-```
-
-#### Step Command
-
-This will run the program step by step.
-When the method and the block are invoked, the program will be stop at the first row.
-The program, which is developed in C, will be ignored.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/gc-arena-howto.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/gc-arena-howto.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/gc-arena-howto.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/gc-arena-howto.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-# How to use `mrb_gc_arena_save()`/`mrb_gc_arena_restore()`/`mrb_gc_protect()`
-
-_This is an English translation of [Matz's blog post][matz blog post]
-written in Japanese._
-_Some parts are updated to reflect recent changes._
-[matz blog post]: http://www.rubyist.net/~matz/20130731.html
-
-When you are extending mruby using C language, you may encounter
-mysterious "arena overflow error" or memory leak or very slow
-execution speed.  This is an error indicating overflow of "GC arena"
-implementing "conservative GC".
-
-GC (garbage collector) must ensure that object is "alive", in other
-words, that it is referenced by somewhere from program.  This can be
-determined by checking if the object can be directly or indirectly
-referenced by root.  The local variables, global variables and
-constants etc are root.
-
-If program execution is performed inside mruby VM, there is nothing to
-worry about because GC can access all roots owned by VM.
-
-The problem arises when executing C functions.  The object referenced
-by C variable is also "alive", but mruby GC cannot aware of this, so
-it might mistakenly recognize the objects referenced by only C
-variables as dead.
-
-This can be a fatal bug if the GC tries to collect a live object.
-
-In CRuby, we scan C stack area, and use C variable as root to check
-whether object is alive or not.  Of course, because we are accessing C
-stack just as memory region, we never know it is an integer or a
-pointer.  We workaround this by assuming that if it looks like a
-pointer, then assume it as a pointer.  We call it "conservative".
-
-By the way, CRuby's "conservative GC" has some problems.
-
-The biggest problem is we have no way to access to the stack area in
-portable way.  Therefore, we cannot use this method if we'd like to
-implement highly portable runtime, like mruby.
-
-So we came up with an another plan to implement "conservative GC" in mruby.
-
-Again, the problem is when an object which was created in C function, becomes
-no longer referenced in the Ruby world, and cannot be treated as garbage.
-
-In mruby, we recognize all objects created in C function are alive.
-Then we have no problem such as confusing a live object as dead.
-
-This means that because we cannot collect truly dead object, we may
-lose efficiency, but as a trade-off the GC itself is highly portable.
-We can say goodbye to the problem that GC deletes live objects due to
-optimization which sometimes occurs in CRuby.
-
-According to this idea, we have a table, called "GC arena", which
-remembers objects created in C function.
-
-The arena is stack structure, when C function execution is returned to mruby
-VM, all objects registered in the arena are popped.
-
-This works very well, but can cause another problem: "arena overflow error" or
-memory leak.
-
-As of this writing, mruby automatically extend arena to remember
-objects (See `MRB_GC_FIXED_ARENA` and `MRB_GC_ARENA_SIZE` in
-doc/guides/mrbconf.md).
-
-If you create many objects in C functions, memory usage will increase, since
-GC never kick in.  This memory usage may look like memory leak, but will also
-make execution slower as more memory will need to be allocated.
-
-With the build time configuration, you can limit the maximum size of
-arena (e.g., 100).  Then if you create many objects, arena overflows,
-thus you will get an "arena overflow error".
-
-To workaround these problems, we have `mrb_gc_arena_save()` and
-`mrb_gc_arena_restore()` functions.
-
-`int mrb_gc_arena_save(mrb)` returns the current position of the stack
-top of GC arena, and `void mrb_gc_arena_restore(mrb, idx)` sets the
-stack top position to back to given `idx`.
-
-We can use them like this:
-
-```c
-int arena_idx = mrb_gc_arena_save(mrb);
-
-// ...create objects...
-mrb_gc_arena_restore(mrb, arena_idx);
-
-```
-
-In mruby, C function calls are surrounded by this save/restore, but we
-can further optimize memory usage by surrounding save/restore, and can
-avoid creating arena overflow bugs.
-
-Let's take a real example.  Here is the source code of `Array#inspect`:
-
-```c
-static mrb_value
-inspect_ary(mrb_state *mrb, mrb_value ary, mrb_value list)
-{
-  mrb_int i;
-  mrb_value s, arystr;
-  char head[] = { '[' };
-  char sep[] = { ',', ' ' };
-  char tail[] = { ']' };
-
-  /* check recursive */
-  for(i=0; i<RARRAY_LEN(list); i++) {
-    if (mrb_obj_equal(mrb, ary, RARRAY_PTR(list)[i])) {
-      return mrb_str_new(mrb, "[...]", 5);
-    }
-  }
-
-  mrb_ary_push(mrb, list, ary);
-
-  arystr = mrb_str_buf_new(mrb, 64);
-  mrb_str_buf_cat(mrb, arystr, head, sizeof(head));
-
-  for(i=0; i<RARRAY_LEN(ary); i++) {
-    int ai = mrb_gc_arena_save(mrb);
-
-    if (i > 0) {
-      mrb_str_buf_cat(mrb, arystr, sep, sizeof(sep));
-    }
-    if (mrb_array_p(RARRAY_PTR(ary)[i])) {
-      s = inspect_ary(mrb, RARRAY_PTR(ary)[i], list);
-    }
-    else {
-      s = mrb_inspect(mrb, RARRAY_PTR(ary)[i]);
-    }
-    mrb_str_buf_cat(mrb, arystr, RSTRING_PTR(s), RSTRING_LEN(s));
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  mrb_str_buf_cat(mrb, arystr, tail, sizeof(tail));
-  mrb_ary_pop(mrb, list);
-
-  return arystr;
-}
-```
-
-This is a real example, so a little bit complicated, but bear with me.
-The essence of `Array#inspect` is that after stringifying each element
-of array using `inspect` method, we join them together so that we can
-get `inspect` representation of the entire array.
-
-After the `inspect` representation is created, we no longer require the
-individual string representation.  This means that we don't have to register
-these temporal objects into GC arena.
-
-Therefore, in order to keep the arena size small; the `ary_inspect()` function
-will do the following:
-
-* save the position of the stack top using `mrb_gc_arena_save()`.
-* get `inspect` representation of each element.
-* append it to the constructing entire `inspect` representation of array.
-* restore stack top position using `mrb_gc_arena_restore()`.
-
-Please note that the final `inspect` representation of entire array
-was created before the call of `mrb_gc_arena_restore()`.  Otherwise,
-required temporal object may be deleted by GC.
-
-We may have a usecase where after creating many temporal objects, we'd
-like to keep some of them.  In this case, we cannot use the same idea
-in `ary_inspect()` like appending objects to existing one.
-Instead, after `mrb_gc_arena_restore()`, we must re-register the objects we
-want to keep in the arena using `mrb_gc_protect(mrb, obj)`.
-Use `mrb_gc_protect()` with caution because it could also lead to an "arena
-overflow error".
-
-We must also mention that when `mrb_funcall` is called in top level, the return
-value is also registered to GC arena, so repeated use of `mrb_funcall` may
-eventually lead to an "arena overflow error".
-
-Use `mrb_gc_arena_save()` and `mrb_gc_arena_restore()` or possible use of
-`mrb_gc_protect()` to workaround this.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbconf.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbconf.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbconf.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbconf.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-# mruby configuration macros.
-
-## How to use these macros.
-You can use mrbconfs with following ways:
-* Write them in `mrbconf.h`.
- * Using compiler flags is preferred  when building a cross binaries or multiple mruby binaries
- since it's easier to use different mrbconf per each `MRuby::Build`.
- * Most flags can be enabled by just commenting in.
-* Pass them as compiler flags.
- * Make sure you pass the same flags to all compilers since some mrbconf(e.g., `MRB_GC_FIXED_ARENA`)
- changes `struct` layout and cause memory access error when C and other language(e.g., C++) is mixed.
-
-## stdio setting.
-`MRB_DISABLE_STDIO`
-* When defined `<stdio.h>` functions won't be used.
-* Some features will be disabled when this is enabled:
-  * `mrb_irep` load/dump from/to file.
-  * Compiling mruby script from file.
-  * Printing features in **src/print.c**.
-
-## Debug macros.
-`MRB_ENABLE_DEBUG_HOOK`
-* When defined code fetch hook and debug OP hook will be enabled.
-* When using any of the hook set function pointer `code_fetch_hook` and/or `debug_op_hook` of `mrb_state`.
-* Fetch hook will be called before any OP.
-* Debug OP hook will be called when dispatching `OP_DEBUG`.
-
-`MRB_DEBUG`
-* When defined `mrb_assert*` macro will be defined with macros from `<assert.h>`.
-* Could be enabled via `enable_debug` method of `MRuby::Build`.
-
-## Stack configuration
-
-`MRB_STACK_EXTEND_DOUBLING`
-* If defined doubles the stack size when extending it.
-* Else extends stack with `MRB_STACK_GROWTH`.
-
-`MRB_STACK_GROWTH`
-* Default value is `128`.
-* Used in stack extending.
-* Ignored when `MRB_STACK_EXTEND_DOUBLING` is defined.
-
-`MRB_STACK_MAX`
-* Default value is `0x40000 - MRB_STACK_GROWTH`.
-* Raises `RuntimeError` when stack size exceeds this value.
-
-## Primitive type configuration.
-
-`MRB_USE_FLOAT`
-* When defined single precision floating point type(C type `float`) is used as `mrb_float`.
-* Else double precision floating point type(C type `double`) is used as `mrb_float`.
-
-`MRB_INT16`
-* When defined `int16_t` will be defined as `mrb_int`.
-* Conflicts with `MRB_INT64`.
-
-`MRB_INT64`
-* When defined `int64_t` will be defined as `mrb_int`.
-* Conflicts with `MRB_INT16`.
-* When `MRB_INT16` or `MRB_INT64` isn't defined `int`(most of the times 32-bit integer)
-will be defined as `mrb_int`.
-
-## Garbage collector configuration.
-
-`MRB_GC_STRESS`
-* When defined full GC is emitted per each `RBasic` allocation.
-* Mainly used in memory manager debugging.
-
-`MRB_GC_TURN_OFF_GENERATIONAL`
-* When defined turns generational GC by default.
-
-`MRB_GC_FIXED_ARENA`
-* When defined used fixed size GC arena.
-* Raises `RuntimeError` when this is defined and GC arena size exceeds `MRB_GC_ARENA_SIZE`.
-* Useful tracking unnecessary mruby object allocation.
-
-`MRB_GC_ARENA_SIZE`
-* Default value is `100`.
-* Ignored when `MRB_GC_FIXED_ARENA` isn't defined.
-* Defines fixed GC arena size.
-
-`MRB_HEAP_PAGE_SIZE`
-* Defines value is `1024`.
-* Specifies number of `RBasic` per each heap page.
-
-## Memory pool configuration.
-
-`POOL_ALIGNMENT`
-* Default value is `4`.
-* If you're allocating data types that requires alignment more than default value define the
-largest value of required alignment.
-
-`POOL_PAGE_SIZE`
-* Default value is `16000`.
-* Specifies page size of pool page.
-* Smaller the value is increases memory overhead.
-
-## State atexit configuration.
-
-`MRB_FIXED_STATE_ATEXIT_STACK`
-* If defined enables fixed size `mrb_state` atexit stack.
-* Raises `RuntimeError` when `mrb_state_atexit` call count to same `mrb_state` exceeds
-`MRB_FIXED_STATE_ATEXIT_STACK_SIZE`'s value.
-
-`MRB_FIXED_STATE_ATEXIT_STACK_SIZE`
-* Default value is `5`.
-* If `MRB_FIXED_STATE_ATEXIT_STACK` isn't defined this macro is ignored.
-
-## `mrb_value` configuration.
-
-`MRB_ENDIAN_BIG`
-* If defined compiles mruby for big endian machines.
-* Used in `MRB_NAN_BOXING`.
-* Some mrbgem use this mrbconf.
-
-`MRB_NAN_BOXING`
-* If defined represent `mrb_value` in boxed `double`.
-* Conflicts with `MRB_USE_FLOAT`.
-
-`MRB_WORD_BOXING`
-* If defined represent `mrb_value` as a word.
-* If defined `Float` will be a mruby object with `RBasic`.
-
-## Instance variable configuration.
-`MRB_IV_SEGMENT_SIZE`
-* Default value is `4`.
-* Specifies size of each segment in segment list.
-
-## Other configuration.
-`MRB_UTF8_STRING`
-* Adds UTF-8 encoding support to character-oriented String instance methods.
-* If it isn't defined, they only support the US-ASCII encoding.
-
-`MRB_FUNCALL_ARGC_MAX`
-* Default value is `16`.
-* Specifies 4th argument(`argc`) max value of `mrb_funcall`.
-* Raises `ArgumentError` when the `argc` argument is bigger then this value `mrb_funcall`.
-
-`KHASH_DEFAULT_SIZE`
-* Default value is `32`.
-* Specifies default size of khash table bucket.
-* Used in `kh_init_ ## name` function.
-
-`MRB_STR_BUF_MIN_SIZE`
-* Default value is `128`.
-* Specifies initial capacity of `RString` created by `mrb_str_buf_new` function..
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbgems.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbgems.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbgems.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/guides/mrbgems.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-# mrbgems
-
-mrbgems is a library manager to integrate C and Ruby extension in an easy and
-standardised way into mruby.
-
-## Usage
-
-By default mrbgems is currently deactivated. As soon as you add a GEM to your
-build configuration (i.e. *build_config.rb*), mrbgems will be activated and the
-extension integrated.
-
-To add a GEM into the *build_config.rb* add the following line for example:
-```ruby
-conf.gem '/path/to/your/gem/dir'
-```
-
-You can also use a relative path which would be relative from the mruby root:
-```ruby
-conf.gem 'examples/mrbgems/ruby_extension_example'
-```
-
-A remote GIT repository location for a GEM is also supported:
-```ruby
-conf.gem :git => 'https://github.com/masuidrive/mrbgems-example.git', :branch => 'master'
-conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master'
-conf.gem :bitbucket => 'mruby/mrbgems-example', :branch => 'master'
-```
-
-To use mrbgem from [mgem-list](https://github.com/mruby/mgem-list) use `:mgem` option:
-```ruby
-conf.gem :mgem => 'mruby-yaml'
-conf.gem :mgem => 'yaml' # 'mruby-' prefix could be omitted
-```
-
-If there is missing dependencies, mrbgem dependencies solver will reference
-mrbgem from core or mgem-list.
-
-To pull all gems from remote GIT repository on build, call ```./minirake -p```,
-or ```./minirake --pull-gems```.
-
-NOTE: `:bitbucket` option supports only git. Hg is unsupported in this version.
-
-## GemBox
-
-There are instances when you wish to add a collection of mrbgems into mruby at
-once, or be able to substitute mrbgems based on configuration, without having to
-add each gem to the *build_config.rb* file.  A packaged collection of mrbgems
-is called a GemBox.  A GemBox is a file that contains a list of mrbgems to load
-into mruby, in the same format as if you were adding them to *build_config.rb*
-via `config.gem`, but wrapped in an `MRuby::GemBox` object.  GemBoxes are
-loaded into mruby via `config.gembox 'boxname'`.
-
-Below we have created a GemBox containing *mruby-time* and *mrbgems-example*:
-```ruby
-MRuby::GemBox.new do |conf|
-  conf.gem "#{root}/mrbgems/mruby-time"
-  conf.gem :github => 'masuidrive/mrbgems-example'
-end
-```
-
-As mentioned, the GemBox uses the same conventions as `MRuby::Build`.  The GemBox
-must be saved with a *.gembox* extension inside the *mrbgems* directory to to be
-picked up by mruby.
-
-To use this example GemBox, we save it as `custom.gembox` inside the *mrbgems*
-directory in mruby, and add the following to our *build_config.rb* file inside
-the build block:
-```ruby
-conf.gembox 'custom'
-```
-This will cause the *custom* GemBox to be read in during the build process,
-adding *mruby-time* and *mrbgems-example* to the build.
-
-If you want, you can put GemBox outside of mruby directory. In that case you must
-specify an absolute path like below.
-```ruby
-conf.gembox "#{ENV["HOME"]}/mygemboxes/custom"
-```
-
-There are two GemBoxes that ship with mruby: [default](../../mrbgems/default.gembox)
-and [full-core](../../mrbgems/full-core.gembox). The [default](../../mrbgems/default.gembox) GemBox
-contains several core components of mruby, and [full-core](../../mrbgems/full-core.gembox)
-contains every gem found in the *mrbgems* directory.
-
-## GEM Structure
-
-The maximal GEM structure looks like this:
-
-	+- GEM_NAME         <- Name of GEM
-	   |
-	   +- include/      <- Header for Ruby extension (will exported)
-	   |
-	   +- mrblib/       <- Source for Ruby extension
-	   |
-	   +- src/          <- Source for C extension
-	   |
-	   +- test/         <- Test code (Ruby)
-	   |
-	   +- mrbgem.rake   <- GEM Specification
-	   |
-	   +- README.md     <- Readme for GEM
-
-The folder *mrblib* contains pure Ruby files to extend mruby. The folder *src*
-contains C/C++ files to extend mruby. The folder *include* contains C/C++ header
-files. The folder *test* contains C/C++ and pure Ruby files for testing purposes
-which will be used by `mrbtest`. *mrbgem.rake* contains the specification
-to compile C and Ruby files. *README.md* is a short description of your GEM.
-
-## Build process
-
-mrbgems expects a specification file called *mrbgem.rake* inside of your
-GEM directory. A typical GEM specification could look like this for example:
-```ruby
-MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Example mrbgem using C and ruby'
-end
-```
-
-The mrbgems build process will use this specification to compile Object and Ruby
-files. The compilation results will be added to *lib/libmruby.a*. This file exposes
-the GEM functionality to tools like `mruby` and `mirb`.
-
-The following properties can be set inside of your `MRuby::Gem::Specification` for
-information purpose:
-
-* `spec.license` or `spec.licenses` (A single license or a list of them under which this GEM is licensed)
-* `spec.author` or `spec.authors` (Developer name or a list of them)
-* `spec.version` (Current version)
-* `spec.description` (Detailed description)
-* `spec.summary`
-  * One line short description of mrbgem.
-  * Printed in build summary of rake when set.
-* `spec.homepage` (Homepage)
-* `spec.requirements` (External requirements as information for user)
-
-The `license` and `author` properties are required in every GEM!
-
-In case your GEM is depending on other GEMs please use
-`spec.add_dependency(gem, *requirements[, default_get_info])` like:
-```ruby
-MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-
-  # Add GEM dependency mruby-parser.
-  # The version must be between 1.0.0 and 1.5.2 .
-  spec.add_dependency('mruby-parser', '>= 1.0.0', '<= 1.5.2')
-
-  # Use any version of mruby-uv from github.
-  spec.add_dependency('mruby-uv', '>= 0.0.0', :github => 'mattn/mruby-uv')
-
-  # Use latest mruby-onig-regexp from github. (version requirements can be omitted)
-  spec.add_dependency('mruby-onig-regexp', :github => 'mattn/mruby-onig-regexp')
-
-  # You can add extra mgems active only on test
-  spec.add_test_dependency('mruby-process', :github => 'iij/mruby-process')
-end
-```
-
-The version requirements and default gem information are optional.
-
-Version requirement supports following operators:
-* '=': is equal
-* '!=': is not equal
-* '>': is greater
-* '<': is lesser
-* '>=': is equal or greater
-* '<=': is equal or lesser
-* '~>': is equal or greater and is lesser than the next major version
-    * example 1: '~> 2.2.2' means '>= 2.2.2' and '< 2.3.0'
-    * example 2: '~> 2.2'   means '>= 2.2.0' and '< 3.0.0'
-
-When more than one version requirements is passed, the dependency must satisfy all of it.
-
-You can have default gem to use as depedency when it's not defined in *build_config.rb*.
-When the last argument of `add_dependency` call is `Hash`, it will be treated as default gem information.
-Its format is same as argument of method `MRuby::Build#gem`, expect that it can't be treated as path gem location.
-
-When a special version of depedency is required,
-use `MRuby::Build#gem` in *build_config.rb* to override default gem.
-
-If you have conflicting GEMs use the following method:
-* `spec.add_conflict(gem, *requirements)`
-    * The `requirements` argument is same as in `add_dependency` method.
-
-like following code:
-```ruby
-MRuby::Gem::Specification.new 'some-regexp-binding' do |spec|
-  spec.license = 'BSD'
-  spec.author = 'John Doe'
-
-  spec.add_conflict 'mruby-onig-regexp', '> 0.0.0'
-  spec.add_conflict 'mruby-hs-regexp'
-  spec.add_conflict 'mruby-pcre-regexp'
-  spec.add_conflict 'mruby-regexp-pcre'
-end
-```
-
-In case your GEM has more complex build requirements you can use
-the following options additionally inside of your GEM specification:
-
-* `spec.cc.flags` (C compiler flags)
-* `spec.cc.defines` (C compiler defines)
-* `spec.cc.include_paths` (C compiler include paths)
-* `spec.linker.flags` (Linker flags)
-* `spec.linker.libraries` (Linker libraries)
-* `spec.linker.library_paths` (Linker additional library path)
-* `spec.bins` (Generate binary file)
-* `spec.rbfiles` (Ruby files to compile)
-* `spec.objs` (Object files to compile)
-* `spec.test_rbfiles` (Ruby test files for integration into mrbtest)
-* `spec.test_objs` (Object test files for integration into mrbtest)
-* `spec.test_preload` (Initialization files for mrbtest)
-
-You also can use `spec.mruby.cc` and `spec.mruby.linker` to add extra global parameters for compiler and linker.
-
-### include_paths and dependency
-
-Your GEM can export include paths to another GEMs that depends on your GEM.
-By default, `/...absolute path.../{GEM_NAME}/include` will be exported.
-So it is recommended not to put GEM's local header files on include/.
-
-These exports are retroactive.
-For example: when B depends to C and A depends to B, A will get include paths exported by C.
-
-Exported include_paths are automatically appended to GEM local include_paths by Minirake.
-You can use `spec.export_include_paths` accessor if you want more complex build.
-
-
-## C Extension
-
-mruby can be extended with C. This is possible by using the C API to
-integrate C libraries into mruby.
-
-### Preconditions
-
-mrbgems expects that you have implemented a C method called
-`mrb_YOURGEMNAME_gem_init(mrb_state)`. `YOURGEMNAME` will be replaced
-by the name of your GEM. If you call your GEM *c_extension_example*, your
-initialisation method could look like this:
-```C
-void
-mrb_c_extension_example_gem_init(mrb_state* mrb) {
-  struct RClass *class_cextension = mrb_define_module(mrb, "CExtension");
-  mrb_define_class_method(mrb, class_cextension, "c_method", mrb_c_method, MRB_ARGS_NONE());
-}
-```
-
-### Finalize
-
-mrbgems expects that you have implemented a C method called
-`mrb_YOURGEMNAME_gem_final(mrb_state)`. `YOURGEMNAME` will be replaced
-by the name of your GEM. If you call your GEM *c_extension_example*, your
-finalizer method could look like this:
-
-```C
-void
-mrb_c_extension_example_gem_final(mrb_state* mrb) {
-  free(someone);
-}
-```
-
-### Example
-
-	+- c_extension_example/
-	   |
-	   +- src/
-	   |  |
-	   |  +- example.c         <- C extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for C extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
-
-## Ruby Extension
-
-mruby can be extended with pure Ruby. It is possible to override existing
-classes or add new ones in this way. Put all Ruby files into the *mrblib*
-folder.
-
-
-### Pre-Conditions
-
-none
-
-### Example
-
-	+- ruby_extension_example/
-	   |
-	   +- mrblib/
-	   |  |
-	   |  +- example.rb        <- Ruby extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for Ruby extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
-
-## C and Ruby Extension
-
-mruby can be extended with C and Ruby at the same time. It is possible to
-override existing classes or add new ones in this way. Put all Ruby files
-into the *mrblib* folder and all C files into the *src* folder.
-
-mruby codes under *mrblib* directory would be executed after gem init C
-function is called. Make sure *mruby script* depends on *C code* and
-*C code* doesn't depend on *mruby script*.
-
-### Pre-Conditions
-
-See C and Ruby example.
-
-### Example
-
-	+- c_and_ruby_extension_example/
-	   |
-	   +- mrblib/
-	   |  |
-	   |  +- example.rb        <- Ruby extension source
-	   |
-	   +- src/
-	   |  |
-	   |  +- example.c         <- C extension source
-	   |
-	   +- test/
-	   |  |
-	   |  +- example.rb        <- Test code for C and Ruby extension
-	   |
-	   +- mrbgem.rake          <- GEM specification
-	   |
-	   +- README.md
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/limitations.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/limitations.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/limitations.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/doc/limitations.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,208 +0,0 @@
-# Limitations and Differences
-
-The philosophy of mruby is to be a lightweight implementation of
-the Ruby ISO standard. These two objectives are partially contradicting.
-Ruby is an expressive language with complex implementation details which
-are difficult to implement in a lightweight manner. To cope with this,
-limitations to the "Ruby Compatibility" are defined.
-
-This document is collecting these limitations.
-
-## Integrity
-
-This document does not contain a complete list of limitations.
-Please help to improve it by submitting your findings.
-
-
-## ```1/2``` gives ```0.5```
-
-Since mruby does not have ```Bignum```, bigger integers are represented
-by ```Float``` numbers. To enhance interoperability between ```Fixnum```
-and ```Float```, mruby provides ```Float#upto``` and other iterating
-methods for the ```Float``` class.  As a side effect, ```1/2``` gives ```0.5```
-not ```0```.
-
-## ```Array``` passed to ```puts```
-
-Passing an Array to ```puts``` results in different output.
-
-```ruby
-puts [1,2,3]
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```
-1
-2
-3
-```
-
-#### mruby [1.3.0 (2017-7-4)]
-
-```
-[1, 2, 3]
-```
-
-## ```Kernel.raise``` in rescue clause
-
-```Kernel.raise``` without arguments does not raise the current exception within
-a rescue clause.
-
-```ruby
-begin
-  1 / 0
-rescue
-  raise
-end
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```ZeroDivisionError``` is raised.
-
-#### mruby [1.3.0 (2017-7-4)]
-
-No exception is raised.
-
-## Check of infinite recursion
-
-mruby does not check infinite recursion across C extensions.
-
-```ruby
-def test; eval 'test'; end; test
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```SystemStackError``` is raised.
-
-#### mruby [1.3.0 (2017-7-4)]
-
-Segmentation fault.
-
-## Fiber execution can't cross C function boundary
-
-mruby's ```Fiber``` is implemented in a similar way to Lua's co-routine. This
-results in the consequence that you can't switch context within C functions.
-Only exception is ```mrb_fiber_yield``` at return.
-
-## ```Array``` does not support instance variables
-
-To reduce memory consumption ```Array``` does not support instance variables.
-
-```ruby
-class Liste < Array
-  def initialize(str = nil)
-    @feld = str
-  end
-end
-
-p Liste.new "foobar"
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-``` [] ```
-
-#### mruby [1.3.0 (2017-7-4)]
-
-```ArgumentError``` is raised.
-
-## Method visibility
-
-For simplicity reasons no method visibility (public/private/protected) is
-supported.
-
-```ruby
-class VisibleTest
-
-  def public_method; end
-
-  private
-  def private_method; end
-
-end
-
-p VisibleTest.new.respond_to?(:private_method, false)
-p VisibleTest.new.respond_to?(:private_method, true)
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```
-false
-true
-```
-
-#### mruby [1.3.0 (2017-7-4)]
-
-```
-true
-true
-```
-
-## defined?
-
-The ```defined?``` keyword is considered too complex to be fully
-implemented. It is recommended to use ```const_defined?``` and
-other reflection methods instead.
-
-```ruby
-defined?(Foo)
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```
-nil
-```
-
-#### mruby [1.3.0 (2017-7-4)]
-
-```NameError``` is raised.
-
-## ```alias``` on global variables
-
-Aliasing a global variable works in CRuby but is not part
-of the ISO standard.
-
-```ruby
-alias $a $__a__
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-``` nil ```
-
-#### mruby [1.3.0 (2017-7-4)]
-
-Syntax error
-
-## Operator modification
-
-An operator can't be overwritten by the user.
-
-```ruby
-class String
-  def +
-  end
-end
-
-'a' + 'b'
-```
-
-#### Ruby [ruby 2.0.0p645 (2015-04-13 revision 50299)]
-
-```ArgumentError``` is raised.
-The re-defined ```+``` operator does not accept any arguments.
-
-#### mruby [1.3.0 (2017-7-4)]
-
-``` 'ab' ```
-Behavior of the operator wasn't changed.
-
-## ```Kernel.binding``` missing
-
-```Kernel.binding``` is not implemented as it is not in the
-ISO standard.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-
-  # Add compile flags
-  # spec.cc.flags << ''
-
-  # Add cflags to all
-  # spec.mruby.cc.flags << '-g'
-
-  # Add libraries
-  # spec.linker.libraries << 'external_lib'
-
-  # Default build files
-  # spec.rbfiles = Dir.glob("#{dir}/mrblib/*.rb")
-  # spec.objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
-  # spec.test_rbfiles = Dir.glob("#{dir}/test/*.rb")
-  # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
-  # spec.test_preload = 'test/assert.rb'
-
-  # Values accessible as TEST_ARGS inside test scripts
-  # spec.test_args = {'tmp_dir' => Dir::tmpdir}
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/mrblib/example.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-module CRubyExtension
-  def CRubyExtension.ruby_method
-    puts "A Ruby Extension"
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-C and Ruby Extension Example
-=========
-
-This is an example gem which implements a C and Ruby extension.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/src/example.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <mruby.h>
-#include <stdio.h>
-
-static mrb_value
-mrb_c_method(mrb_state *mrb, mrb_value self)
-{
-  puts("A C Extension");
-  return self;
-}
-
-void
-mrb_c_and_ruby_extension_example_gem_init(mrb_state* mrb) {
-  struct RClass *class_cextension = mrb_define_module(mrb, "CRubyExtension");
-  mrb_define_class_method(mrb, class_cextension, "c_method", mrb_c_method, MRB_ARGS_NONE());
-}
-
-void
-mrb_c_and_ruby_extension_example_gem_final(mrb_state* mrb) {
-  /* finalizer */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/test/example.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/test/example.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/test/example.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_and_ruby_extension_example/test/example.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-assert('C and Ruby Extension Example 1') do
-  CRubyExtension.respond_to? :c_method
-end
-
-assert('C and Ruby Extension Example 2') do
-  CRubyExtension.respond_to? :ruby_method
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-MRuby::Gem::Specification.new('c_extension_example') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-
-  # Add compile flags
-  # spec.cc.flags << '-g'
-
-  # Add cflags to all
-  # spec.mruby.cc.flags << '-g'
-
-  # Add libraries
-  # spec.linker.libraries << 'external_lib'
-
-  # Default build files
-  # spec.rbfiles = Dir.glob("#{dir}/mrblib/*.rb")
-  # spec.objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
-  # spec.test_rbfiles = Dir.glob("#{dir}/test/*.rb")
-  # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
-  # spec.test_preload = 'test/assert.rb'
-
-  # Values accessible as TEST_ARGS inside test scripts
-  # spec.test_args = {'tmp_dir' => Dir::tmpdir}
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-C Extension Example
-=========
-
-This is an example gem which implements a C extension.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/src/example.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/src/example.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/src/example.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/src/example.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <mruby.h>
-#include <stdio.h>
-
-static mrb_value
-mrb_c_method(mrb_state *mrb, mrb_value self)
-{
-  puts("A C Extension");
-  return self;
-}
-
-void
-mrb_c_extension_example_gem_init(mrb_state* mrb) {
-  struct RClass *class_cextension = mrb_define_module(mrb, "CExtension");
-  mrb_define_class_method(mrb, class_cextension, "c_method", mrb_c_method, MRB_ARGS_NONE());
-}
-
-void
-mrb_c_extension_example_gem_final(mrb_state* mrb) {
-  /* finalizer */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#include <mruby.h>
-
-void
-mrb_c_extension_example_gem_test(mrb_state *mrb)
-{
-  /* test initializer in C */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/c_extension_example/test/example.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-assert('C Extension Example') do
-  CExtension.respond_to? :c_method
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-MRuby::Gem::Specification.new('ruby_extension_example') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-
-  # Add compile flags
-  # spec.cc.flags << ''
-
-  # Add cflags to all
-  # spec.mruby.cc.flags << '-g'
-
-  # Add libraries
-  # spec.linker.libraries << 'external_lib'
-
-  spec.add_dependency('mruby-print', :core => 'mruby-print')
-
-  # Default build files
-  # spec.rbfiles = Dir.glob("#{dir}/mrblib/*.rb")
-  # spec.objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
-  # spec.test_rbfiles = Dir.glob("#{dir}/test/*.rb")
-  # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
-  # spec.test_preload = 'test/assert.rb'
-
-  # Values accessible as TEST_ARGS inside test scripts
-  # spec.test_args = {'tmp_dir' => Dir::tmpdir}
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/mrblib/example.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-class RubyExtension
-  def RubyExtension.ruby_method
-    puts "A Ruby Extension"
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-Pure Ruby Extension Example
-=========
-
-This is an example gem which implements a pure Ruby extension.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/test/example.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/test/example.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/test/example.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/mrbgems/ruby_extension_example/test/example.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-assert('Ruby Extension Example') do
-  RubyExtension.respond_to? :ruby_method
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_arm64-v8a.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_arm64-v8a.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_arm64-v8a.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_arm64-v8a.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-end
-
-# Requires Android NDK r13 or later.
-MRuby::CrossBuild.new('android-arm64-v8a') do |conf|
-  params = { 
-    :arch => 'arm64-v8a', 
-    :platform => 'android-24',
-    :toolchain => :clang,
-  }
-  toolchain :android, params
-
-  conf.gembox 'default'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-end
-
-# Requires Android NDK r13 or later.
-MRuby::CrossBuild.new('android-armeabi') do |conf|
-  params = { 
-    :arch => 'armeabi', 
-    :platform => 'android-24',
-    :toolchain => :clang,
-  }
-  toolchain :android, params
-
-  conf.gembox 'default'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi_v7a_neon_hard.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi_v7a_neon_hard.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi_v7a_neon_hard.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_android_armeabi_v7a_neon_hard.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-end
-
-# Requires Android NDK r13 or later.
-MRuby::CrossBuild.new('android-armeabi-v7a-neon-hard') do |conf|
-  params = {
-    :arch => 'armeabi-v7a',
-    :mfpu => 'neon',
-    :mfloat_abi => 'hard',
-    :platform => 'android-24',
-    :toolchain => :clang,
-  }
-  toolchain :android, params
-
-  conf.gembox 'default'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_ArduinoDue.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_ArduinoDue.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_ArduinoDue.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_ArduinoDue.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-# Cross Compiling configuration for Arduino Due
-# http://arduino.cc/en/Main/ArduinoBoardDue
-#
-# Requires Arduino IDE >= 1.5
-MRuby::CrossBuild.new("ArduinoDue") do |conf|
-  toolchain :gcc
-
-  # Mac OS X, Arduino IDE <= 1.5.6
-  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Resources/Java'
-  # Mac OS X, Arduino IDE >= 1.5.7
-  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Java'
-  # GNU Linux
-  ARDUINO_PATH = '/opt/arduino'
-   # Arduino IDE <= 1.5.6
-  BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/g++_arm_none_eabi/bin"
-  # Arduino IDE >= 1.5.7
-  # BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin"
-  SAM_PATH = "#{ARDUINO_PATH}/hardware/arduino/sam"
-  TARGET_PATH = "#{SAM_PATH}/variants/arduino_due_x"
-
-  conf.cc do |cc|
-    cc.command = "#{BIN_PATH}/arm-none-eabi-gcc"
-    cc.include_paths << ["#{SAM_PATH}/system/libsam", "#{SAM_PATH}/system/CMSIS/CMSIS/Include/",
-                        "#{SAM_PATH}/system/CMSIS/Device/ATMEL/",
-                        "#{SAM_PATH}/cores/arduino", "#{SAM_PATH}/libraries","#{TARGET_PATH}"]
-    cc.flags = %w(-g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
-                -Dprintf=iprintf -mcpu=cortex-m3 -DF_CPU=84000000L -DARDUINO=156 -DARDUINO_SAM_DUE -DARDUINO_ARCH_SAM
-                -D__SAM3X8E__ -mthumb -DUSB_PID=0x003e -DUSB_VID=0x2341 -DUSBCON -DUSB_MANUFACTURER="Unknown" -DUSB_PRODUCT="Arduino Due")
-    cc.compile_options = "%{flags} -o %{outfile} -c %{infile}"
-
-    #configuration for low memory environment
-    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
-    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
-    cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20)
-    cc.defines << %w(MRB_GC_STRESS)
-    #cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio.
-    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.flags << %w(-fno-rtti -fno-exceptions)
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{BIN_PATH}/arm-none-eabi-ar"
-    archiver.archive_options = 'rcs %{outfile} %{objs}'
-  end
-
-  #no executables
-  conf.bins = []
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  #disable C++ exception
-  conf.disable_cxx_exception
-
-  #gems from core
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-enum-ext"
-
-  #light-weight regular expression
-  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_chipKITMax32.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_chipKITMax32.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_chipKITMax32.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_chipKITMax32.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-# Cross Compiling configuration for Digilent chipKIT Max32
-# http://www.digilentinc.com/Products/Detail.cfm?Prod=CHIPKIT-MAX32
-#
-# Requires MPIDE (https://github.com/chipKIT32/chipKIT32-MAX)
-#
-# This configuration is based on @kyab's version
-# http://d.hatena.ne.jp/kyab/20130201
-MRuby::CrossBuild.new("chipKITMax32") do |conf|
-  toolchain :gcc
-
-  # Mac OS X
-  # MPIDE_PATH = '/Applications/Mpide.app/Contents/Resources/Java'
-  # GNU Linux
-  MPIDE_PATH = '/opt/mpide-0023-linux-20120903'
-
-  PIC32_PATH = "#{MPIDE_PATH}/hardware/pic32"
-
-  conf.cc do |cc|
-    cc.command = "#{PIC32_PATH}/compiler/pic32-tools/bin/pic32-gcc"
-    cc.include_paths << ["#{PIC32_PATH}/cores/pic32",
-                        "#{PIC32_PATH}/variants/Max32",
-                        "#{PIC32_PATH}/libraries"]
-    cc.flags = %w(-O2 -mno-smart-io -w -ffunction-sections -fdata-sections -g -mdebugger -Wcast-align
-                -fno-short-double -mprocessor=32MX795F512L -DF_CPU=80000000L -DARDUINO=23 -D_BOARD_MEGA_
-                -DMPIDEVER=0x01000202 -DMPIDE=23)
-    cc.compile_options = "%{flags} -o %{outfile} -c %{infile}"
-
-    #configuration for low memory environment
-    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
-    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
-    cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20)
-    cc.defines << %w(MRB_GC_STRESS)
-    #cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio.
-    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{PIC32_PATH}/compiler/pic32-tools/bin/pic32-ar"
-    archiver.archive_options = 'rcs %{outfile} %{objs}'
-  end
-
-  #no executables
-  conf.bins = []
-
-  #do not build test executable
-  conf.build_mrbtest_lib_only
-
-  #disable C++ exception
-  conf.disable_cxx_exception
-
-  #gems from core
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-enum-ext"
-
-  #light-weight regular expression
-  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelEdison.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelEdison.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelEdison.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelEdison.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-# Cross-compiling setup for Intel Edison (poky linux) platform
-# Get SDK from here: https://software.intel.com/en-us/iot/hardware/edison/downloads
-# REMEMBER to check and update the SDK root in the constant POKY_EDISON_PATH
-
-MRuby::Build.new do |conf|
-  toolchain :gcc
-  conf.gembox 'default'
-  conf.cc.defines = %w(ENABLE_READLINE)
-  conf.gembox 'default'
-
-  #lightweight regular expression
-  conf.gem :github => "pbosetti/mruby-hs-regexp", :branch => "master"
-
-end
-
-# Define cross build settings
-MRuby::CrossBuild.new('core2-32-poky-linux') do |conf|
-  toolchain :gcc
-
-  # Mac OS X
-  #
-  POKY_EDISON_PATH = '/opt/poky-edison/1.7.2'
-
-  POKY_EDISON_SYSROOT =  "#{POKY_EDISON_PATH}/sysroots/core2-32-poky-linux"
-  POKY_EDISON_X86_PATH = "#{POKY_EDISON_PATH}/sysroots/i386-pokysdk-darwin"
-  POKY_EDISON_BIN_PATH = "#{POKY_EDISON_X86_PATH}/usr/bin/i586-poky-linux"
-
-
-  conf.cc do |cc|
-    cc.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-gcc"
-    cc.include_paths << ["#{POKY_EDISON_SYSROOT}/usr/include", "#{POKY_EDISON_X86_PATH}/usr/include"]
-    cc.flags = %w(-m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mstackrealign -fno-omit-frame-pointer)
-    cc.flags << %w(-O2 -pipe -g -feliminate-unused-debug-types)
-    cc.flags << "--sysroot=#{POKY_EDISON_SYSROOT}"
-    cc.compile_options = "%{flags} -o %{outfile} -c %{infile}"
-    cc.defines = %w(ENABLE_READLINE)
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-g++"
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.include_paths << ["#{POKY_EDISON_SYSROOT}/usr/include/c++/4.9.1"]
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-ar"
-    archiver.archive_options = 'rcs %{outfile} %{objs}'
-  end
-
-  conf.linker do |linker|
-    linker.command = "#{POKY_EDISON_BIN_PATH}/i586-poky-linux-g++"
-    linker.flags = %w(-m32 -march=i586)
-    linker.flags << "--sysroot=#{POKY_EDISON_SYSROOT}"
-    linker.flags << %w(-O1)
-    linker.libraries = %w(m pthread)
-  end
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  conf.gembox 'default'
-
-  #lightweight regular expression
-  conf.gem :github => "pbosetti/mruby-hs-regexp", :branch => "master"
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelGalileo.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelGalileo.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelGalileo.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_IntelGalileo.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-
-# Cross Compiling configuration for Intel Galileo on Arduino environment
-# http://arduino.cc/en/ArduinoCertified/IntelGalileo
-#
-# Requires Arduino IDE for Intel Galileo
-MRuby::CrossBuild.new("Galileo") do |conf|
-  toolchain :gcc
-
-  # Mac OS X
-  # Assume you renamed Arduino.app to Arduino_Galileo.app
-  GALILEO_ARDUINO_PATH = '/Applications/Arduino_Galileo.app/Contents/Resources/Java'
-  # GNU Linux
-  #ARDUINO_GALILEO_PATH = '/opt/arduino'
-
-  GALILEO_BIN_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i386-pokysdk-darwin/usr/bin/i586-poky-linux-uclibc"
-  GALILEO_SYSROOT =  "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc"
-  GALILEO_X86_PATH = "#{GALILEO_ARDUINO_PATH}/hardware/arduino/x86"
-
-
-  conf.cc do |cc|
-    cc.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-gcc"
-    cc.include_paths << ["#{GALILEO_X86_PATH}/cores/arduino", "#{GALILEO_X86_PATH}/variants/galileo_fab_d"]
-    cc.flags = %w(-m32 -march=i586 -c -g -Os -w
-              -ffunction-sections -fdata-sections -MMD -DARDUINO=153)
-    cc.flags << "--sysroot=#{GALILEO_SYSROOT}"
-    cc.compile_options = "%{flags} -o %{outfile} -c %{infile}"
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-g++"
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.include_paths << "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc/usr/include/c++"
-    cxx.include_paths << "#{GALILEO_ARDUINO_PATH}/hardware/tools/x86/i586-poky-linux-uclibc/usr/include/c++/i586-poky-linux-uclibc"
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-ar"
-    archiver.archive_options = 'rcs %{outfile} %{objs}'
-  end
-
-  conf.linker do |linker|
-    linker.command = "#{GALILEO_BIN_PATH}/i586-poky-linux-uclibc-g++"
-    linker.flags = %w(-m32 -march=i586)
-    linker.flags << "--sysroot=#{GALILEO_SYSROOT}"
-    linker.flags << %w(-Os -Wl,--gc-sections)
-    linker.libraries = %w(m pthread)
-  end
-
-  #no executables
-  conf.bins = []
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  #official mrbgems
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-time"
-  conf.gem :core => "mruby-struct"
-  conf.gem :core => "mruby-enum-ext"
-  conf.gem :core => "mruby-string-ext"
-  conf.gem :core => "mruby-numeric-ext"
-  conf.gem :core => "mruby-array-ext"
-  conf.gem :core => "mruby-hash-ext"
-  conf.gem :core => "mruby-range-ext"
-  conf.gem :core => "mruby-proc-ext"
-  conf.gem :core => "mruby-symbol-ext"
-  conf.gem :core => "mruby-random"
-  conf.gem :core => "mruby-object-ext"
-  conf.gem :core => "mruby-objectspace"
-  conf.gem :core => "mruby-fiber"
-  conf.gem :core => "mruby-toplevel-ext"
-
-  #lightweigh regular expression
-  conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master" do |g|
-  #  g.cxx.include_paths << "#{GALILEO_X86_PATH}/libraries/Wire"
-  #  g.cxx.include_paths << "#{GALILEO_X86_PATH}/libraries/Servo"
-
-    #enable unsupported Servo class
-  #  g.cxx.defines << "MRUBY_ARDUINO_GALILEO_ENABLE_SERVO"
-  #end
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_RX630.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_RX630.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_RX630.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/examples/targets/build_config_RX630.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-MRuby::Build.new do |conf|
-
-  # Gets set by the VS command prompts.
-  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
-    toolchain :visualcpp
-  else
-    toolchain :gcc
-  end
-
-  enable_debug
-
-  # include the default GEMs
-  conf.gembox 'default'
-
-end
-
-# Cross Compiling configuration for RX630
-# http://gadget.renesas.com/
-#
-# Requires gnurx_v14.03
-MRuby::CrossBuild.new("RX630") do |conf|
-  toolchain :gcc
-
-  # Linux
-  BIN_PATH = "/usr/share/gnurx_v14.03_elf-1/bin"
-
-  conf.cc do |cc|
-    cc.command = "#{BIN_PATH}/rx-elf-gcc"
-    cc.flags = "-Wall -g -O2 -flto -mcpu=rx600 -m64bit-doubles"
-    cc.compile_options = "%{flags} -o %{outfile} -c %{infile}"
-
-    #configuration for low memory environment
-    cc.defines << %w(MRB_USE_FLOAT)
-    cc.defines << %w(MRB_HEAP_PAGE_SIZE=64)
-    cc.defines << %w(KHASH_DEFAULT_SIZE=8)
-    cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20)
-    cc.defines << %w(MRB_GC_STRESS)
-    cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio.
-    #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
-  end
-
-  conf.linker do |linker|
-    linker.command="#{BIN_PATH}/rx-elf-ld"
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = "#{BIN_PATH}/rx-elf-ar"
-    archiver.archive_options = 'rcs %{outfile} %{objs}'
-  end
-
-  #no executables
-  conf.bins = []
-
-  #do not build executable test
-  conf.build_mrbtest_lib_only
-
-  #disable C++ exception
-  conf.disable_cxx_exception
-
-  #gems from core
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-enum-ext"
-  conf.gem :core => "mruby-numeric-ext"
-
-  #light-weight regular expression
-  #conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
-
-  #Arduino API
-  #conf.gem :github =>"kyab/mruby-arduino", :branch => "master"
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.gitlab-ci.yml cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.gitlab-ci.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.gitlab-ci.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,3214 +0,0 @@
----
-stages:
-- pretest
-- test
-pretest:
-  stage: pretest
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.1
-  tags:
-  - linux
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-  script: "./minirake all test"
-Test gcc-4.7 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.7 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc47_0.7
-  variables:
-    CC: gcc-4.7
-    CXX: g++-4.7
-    LD: gcc-4.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.8 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc48_0.7
-  variables:
-    CC: gcc-4.8
-    CXX: g++-4.8
-    LD: gcc-4.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-4.9 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc49_0.7
-  variables:
-    CC: gcc-4.9
-    CXX: g++-4.9
-    LD: gcc-4.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-5 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc5_0.7
-  variables:
-    CC: gcc-5
-    CXX: g++-5
-    LD: gcc-5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test gcc-6 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:gcc6_0.7
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-    LD: gcc-6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.5 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang35_0.7
-  variables:
-    CC: clang-3.5
-    CXX: clang++-3.5
-    LD: clang-3.5
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.6 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang36_0.7
-  variables:
-    CC: clang-3.6
-    CXX: clang++-3.6
-    LD: clang-3.6
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.7 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang37_0.7
-  variables:
-    CC: clang-3.7
-    CXX: clang++-3.7
-    LD: clang-3.7
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.8 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang38_0.7
-  variables:
-    CC: clang-3.8
-    CXX: clang++-3.8
-    LD: clang-3.8
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 32bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-m32 -DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: "-m32"
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_int16_nan:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_int16_nan_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_INT16=1 -DMRB_NAN_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_float:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_float_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_float_int16:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_float_int16_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT16=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_float_int64:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
-Test clang-3.9 64bit_float_int64_utf8:
-  stage: test
-  image: registry.gitlab.com/dabroz/mruby:clang39_0.7
-  variables:
-    CC: clang-3.9
-    CXX: clang++-3.9
-    LD: clang-3.9
-    CFLAGS: "-DMRB_USE_FLOAT=1 -DMRB_INT64=1 -DMRB_WORD_BOXING=1 -DMRB_UTF8_STRING=1"
-    LDFLAGS: ''
-  script: env; ./minirake --verbose all test
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mrbconf.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mrbconf.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mrbconf.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mrbconf.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-/*
-** mrbconf.h - mruby core configuration
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBYCONF_H
-#define MRUBYCONF_H
-
-#include <limits.h>
-#include <stdint.h>
-
-/* architecture selection: */
-/* specify -DMRB_32BIT or -DMRB_64BIT to override */
-#if !defined(MRB_32BIT) && !defined(MRB_64BIT)
-#if UINT64_MAX == SIZE_MAX
-#define MRB_64BIT
-#else
-#define MRB_32BIT
-#endif
-#endif
-
-#if defined(MRB_32BIT) && defined(MRB_64BIT)
-#error Cannot build for 32 and 64 bit architecture at the same time
-#endif
-
-/* configuration options: */
-/* add -DMRB_USE_FLOAT to use float instead of double for floating point numbers */
-//#define MRB_USE_FLOAT
-
-/* add -DMRB_INT16 to use 16bit integer for mrb_int; conflict with MRB_INT64 */
-//#define MRB_INT16
-
-/* add -DMRB_INT64 to use 64bit integer for mrb_int; conflict with MRB_INT16 */
-//#define MRB_INT64
-
-/* represent mrb_value in boxed double; conflict with MRB_USE_FLOAT */
-//#define MRB_NAN_BOXING
-
-/* define on big endian machines; used by MRB_NAN_BOXING */
-//#define MRB_ENDIAN_BIG
-
-/* represent mrb_value as a word (natural unit of data for the processor) */
-//#define MRB_WORD_BOXING
-
-/* string class to handle UTF-8 encoding */
-//#define MRB_UTF8_STRING
-
-/* argv max size in mrb_funcall */
-//#define MRB_FUNCALL_ARGC_MAX 16
-
-/* number of object per heap page */
-//#define MRB_HEAP_PAGE_SIZE 1024
-
-/* if _etext and _edata available, mruby can reduce memory used by symbols */
-//#define MRB_USE_ETEXT_EDATA
-
-/* do not use __init_array_start to determine readonly data section;
-   effective only when MRB_USE_ETEXT_EDATA is defined */
-//#define MRB_NO_INIT_ARRAY_START
-
-/* turn off generational GC by default */
-//#define MRB_GC_TURN_OFF_GENERATIONAL
-
-/* default size of khash table bucket */
-//#define KHASH_DEFAULT_SIZE 32
-
-/* allocated memory address alignment */
-//#define POOL_ALIGNMENT 4
-
-/* page size of memory pool */
-//#define POOL_PAGE_SIZE 16000
-
-/* initial minimum size for string buffer */
-//#define MRB_STR_BUF_MIN_SIZE 128
-
-/* arena size */
-//#define MRB_GC_ARENA_SIZE 100
-
-/* fixed size GC arena */
-//#define MRB_GC_FIXED_ARENA
-
-/* state atexit stack size */
-//#define MRB_FIXED_STATE_ATEXIT_STACK_SIZE 5
-
-/* fixed size state atexit stack */
-//#define MRB_FIXED_STATE_ATEXIT_STACK
-
-/* -DMRB_DISABLE_XXXX to drop following features */
-//#define MRB_DISABLE_STDIO	/* use of stdio */
-
-/* -DMRB_ENABLE_XXXX to enable following features */
-//#define MRB_ENABLE_DEBUG_HOOK	/* hooks for debugger */
-
-/* end of configuration */
-
-/* define MRB_DISABLE_XXXX from DISABLE_XXX (for compatibility) */
-#ifdef DISABLE_STDIO
-#define MRB_DISABLE_STDIO
-#endif
-
-/* define MRB_ENABLE_XXXX from ENABLE_XXX (for compatibility) */
-#ifdef ENABLE_DEBUG
-#define MRB_ENABLE_DEBUG_HOOK
-#endif
-
-#ifndef MRB_DISABLE_STDIO
-# include <stdio.h>
-#endif
-
-#ifndef FALSE
-# define FALSE 0
-#endif
-
-#ifndef TRUE
-# define TRUE 1
-#endif
-
-#endif  /* MRUBYCONF_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/array.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/array.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/array.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/array.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-/*
-** mruby/array.h - Array class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_ARRAY_H
-#define MRUBY_ARRAY_H
-
-#include "common.h"
-
-/*
- * Array class
- */
-MRB_BEGIN_DECL
-
-
-typedef struct mrb_shared_array {
-  int refcnt;
-  mrb_int len;
-  mrb_value *ptr;
-} mrb_shared_array;
-
-#define MRB_ARY_EMBED_LEN_MAX ((mrb_int)(sizeof(void*)*3/sizeof(mrb_value)))
-struct RArray {
-  MRB_OBJECT_HEADER;
-  union {
-    struct {
-      mrb_int len;
-      union {
-        mrb_int capa;
-        mrb_shared_array *shared;
-      } aux;
-      mrb_value *ptr;
-    } heap;
-    mrb_value embed[MRB_ARY_EMBED_LEN_MAX];
-  } as;
-};
-
-#define mrb_ary_ptr(v)    ((struct RArray*)(mrb_ptr(v)))
-#define mrb_ary_value(p)  mrb_obj_value((void*)(p))
-#define RARRAY(v)  ((struct RArray*)(mrb_ptr(v)))
-
-#define MRB_ARY_EMBED       4
-#define MRB_ARY_EMBED_MASK  3
-#define ARY_EMBED_P(a) ((a)->flags & MRB_ARY_EMBED)
-#define ARY_SET_EMBED_FLAG(a) ((a)->flags |= MRB_ARY_EMBED)
-#define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED|MRB_ARY_EMBED_MASK))
-#define ARY_EMBED_LEN(a) ((a)->flags & MRB_ARY_EMBED_MASK)
-#define ARY_SET_EMBED_LEN(a,len) (a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | ((len)&MRB_ARY_EMBED_MASK);
-#define ARY_EMBED_PTR(a) (&((a)->as.embed[0]))
-
-#define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len)
-#define ARY_PTR(a) (ARY_EMBED_P(a)?ARY_EMBED_PTR(a):(a)->as.heap.ptr)
-#define RARRAY_LEN(a) ARY_LEN(RARRAY(a))
-#define RARRAY_PTR(a) ARY_PTR(RARRAY(a))
-#define ARY_SET_LEN(a,n) do {\
-  if (ARY_EMBED_P(a)) {\
-    mrb_assert((n) <= MRB_ARY_EMBED_LEN_MAX); \
-    ARY_SET_EMBED_LEN(a,n);\
-  }\
-  else\
-    (a)->as.heap.len = (n);\
-} while (0)
-#define ARY_CAPA(a) (ARY_EMBED_P(a)?MRB_ARY_EMBED_LEN_MAX:(a)->as.heap.aux.capa)
-#define MRB_ARY_SHARED      256
-#define ARY_SHARED_P(a) ((a)->flags & MRB_ARY_SHARED)
-#define ARY_SET_SHARED_FLAG(a) ((a)->flags |= MRB_ARY_SHARED)
-#define ARY_UNSET_SHARED_FLAG(a) ((a)->flags &= ~MRB_ARY_SHARED)
-
-void mrb_ary_decref(mrb_state*, mrb_shared_array*);
-MRB_API void mrb_ary_modify(mrb_state*, struct RArray*);
-MRB_API mrb_value mrb_ary_new_capa(mrb_state*, mrb_int);
-
-/*
- * Initializes a new array.
- *
- * Equivalent to:
- *
- *      Array.new
- *
- * @param mrb The mruby state reference.
- * @return The initialized array.
- */
-MRB_API mrb_value mrb_ary_new(mrb_state *mrb);
-
-/*
- * Initializes a new array with initial values
- *
- * Equivalent to:
- *
- *      Array[value1, value2, ...]
- *
- * @param mrb The mruby state reference.
- * @param size The numer of values.
- * @param vals The actual values.
- * @return The initialized array.
- */
-MRB_API mrb_value mrb_ary_new_from_values(mrb_state *mrb, mrb_int size, const mrb_value *vals);
-
-/*
- * Initializes a new array with two initial values
- *
- * Equivalent to:
- *
- *      Array[car, cdr]
- *
- * @param mrb The mruby state reference.
- * @param car The first value.
- * @param cdr The second value.
- * @return The initialized array.
- */
-MRB_API mrb_value mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr);
-
-/*
- * Concatenate two arrays. The target array will be modified
- *
- * Equivalent to:
- *      ary.concat(other)
- *
- * @param mrb The mruby state reference.
- * @param self The target array.
- * @param other The array that will be concatenated to self.
- */
-MRB_API void mrb_ary_concat(mrb_state *mrb, mrb_value self, mrb_value other);
-
-/*
- * Create an array from the input. It tries calling to_a on the
- * value. If value does not respond to that, it creates a new
- * array with just this value.
- *
- * @param mrb The mruby state reference.
- * @param value The value to change into an array.
- * @return An array representation of value.
- */
-MRB_API mrb_value mrb_ary_splat(mrb_state *mrb, mrb_value value);
-
-/*
- * Pushes value into array.
- *
- * Equivalent to:
- *
- *      ary << value
- *
- * @param mrb The mruby state reference.
- * @param ary The array in which the value will be pushed
- * @param value The value to be pushed into array
- */
-MRB_API void mrb_ary_push(mrb_state *mrb, mrb_value array, mrb_value value);
-
-/*
- * Pops the last element from the array.
- *
- * Equivalent to:
- *
- *      ary.pop
- *
- * @param mrb The mruby state reference.
- * @param ary The array from which the value will be popped.
- * @return The popped value.
- */
-MRB_API mrb_value mrb_ary_pop(mrb_state *mrb, mrb_value ary);
-
-/*
- * Returns a reference to an element of the array on the given index.
- *
- * Equivalent to:
- *
- *      ary[n]
- *
- * @param mrb The mruby state reference.
- * @param ary The target array.
- * @param n The array index being referenced
- * @return The referenced value.
- */
-MRB_API mrb_value mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n);
-
-/*
- * Sets a value on an array at the given index
- *
- * Equivalent to:
- *
- *      ary[n] = val
- *
- * @param mrb The mruby state reference.
- * @param ary The target array.
- * @param n The array index being referenced.
- * @param val The value being setted.
- */
-MRB_API void mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val);
-
-/*
- * Replace the array with another array
- *
- * Equivalent to:
- *
- *      ary.replace(other)
- *
- * @param mrb The mruby state reference
- * @param self The target array.
- * @param other The array to replace it with.
- */
-MRB_API void mrb_ary_replace(mrb_state *mrb, mrb_value self, mrb_value other);
-MRB_API mrb_value mrb_check_array_type(mrb_state *mrb, mrb_value self);
-
-/*
- * Unshift an element into an array
- *
- * Equivalent to:
- *
- *     ary.unshift(item)
- *
- * @param mrb The mruby state reference.
- * @param self The target array.
- * @param item The item to unshift.
- */
-MRB_API mrb_value mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item);
-MRB_API mrb_value mrb_ary_entry(mrb_value ary, mrb_int offset);
-
-/*
- * Shifts the first element from the array.
- *
- * Equivalent to:
- *
- *      ary.shift
- *
- * @param mrb The mruby state reference.
- * @param self The array from which the value will be shifted.
- * @return The shifted value.
- */
-MRB_API mrb_value mrb_ary_shift(mrb_state *mrb, mrb_value self);
-
-/*
- * Removes all elements from this array
- *
- * Equivalent to:
- *
- *      ary.clear
- *
- * @param mrb The mruby state reference.
- * @param self The target array.
- * @return self
- */
-MRB_API mrb_value mrb_ary_clear(mrb_state *mrb, mrb_value self);
-
-/*
- * Join the array elements together in a string
- *
- * Equivalent to:
- *
- *      ary.join(sep="")
- *
- * @param mrb The mruby state reference.
- * @param ary The target array
- * @param sep The separater, can be NULL
- */
-MRB_API mrb_value mrb_ary_join(mrb_state *mrb, mrb_value ary, mrb_value sep);
-
-/*
- * Update the capacity of the array
- *
- * @param mrb The mruby state reference.
- * @param ary The target array.
- * @param new_len The new capacity of the array
- */
-MRB_API mrb_value mrb_ary_resize(mrb_state *mrb, mrb_value ary, mrb_int new_len);
-
-static inline mrb_int
-mrb_ary_len(mrb_state *mrb, mrb_value ary)
-{
-  (void)mrb;
-  mrb_assert(mrb_array_p(ary));
-  return RARRAY_LEN(ary);
-}
-
-static inline mrb_value
-ary_elt(mrb_value ary, mrb_int offset)
-{
-  if (offset < 0 || RARRAY_LEN(ary) <= offset) {
-    return mrb_nil_value();
-  }
-  return RARRAY_PTR(ary)[offset];
-}
-
-MRB_END_DECL
-
-#endif  /* MRUBY_ARRAY_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_nan.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_nan.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_nan.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_nan.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*
-** mruby/boxing_nan.h - nan boxing mrb_value definition
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_BOXING_NAN_H
-#define MRUBY_BOXING_NAN_H
-
-#ifdef MRB_USE_FLOAT
-# error ---->> MRB_NAN_BOXING and MRB_USE_FLOAT conflict <<----
-#endif
-
-#ifdef MRB_INT64
-# error ---->> MRB_NAN_BOXING and MRB_INT64 conflict <<----
-#endif
-
-#define MRB_FIXNUM_SHIFT 0
-#define MRB_TT_HAS_BASIC MRB_TT_OBJECT
-
-#ifdef MRB_ENDIAN_BIG
-#define MRB_ENDIAN_LOHI(a,b) a b
-#else
-#define MRB_ENDIAN_LOHI(a,b) b a
-#endif
-
-/* value representation by nan-boxing:
- *   float : FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFF
- *   object: 111111111111TTTT TTPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPP
- *   int   : 1111111111110001 0000000000000000 IIIIIIIIIIIIIIII IIIIIIIIIIIIIIII
- *   sym   : 1111111111110001 0100000000000000 SSSSSSSSSSSSSSSS SSSSSSSSSSSSSSSS
- * In order to get enough bit size to save TT, all pointers are shifted 2 bits
- * in the right direction. Also, TTTTTT is the mrb_vtype + 1;
- */
-typedef struct mrb_value {
-  union {
-    mrb_float f;
-    union {
-      void *p;
-      struct {
-        MRB_ENDIAN_LOHI(
-          uint32_t ttt;
-          ,union {
-            mrb_int i;
-            mrb_sym sym;
-          };
-        )
-      };
-    } value;
-  };
-} mrb_value;
-
-#define mrb_float_pool(mrb,f) mrb_float_value(mrb,f)
-
-#define mrb_tt(o)       ((enum mrb_vtype)(((o).value.ttt & 0xfc000)>>14)-1)
-#define mrb_type(o)     (enum mrb_vtype)((uint32_t)0xfff00000 < (o).value.ttt ? mrb_tt(o) : MRB_TT_FLOAT)
-#define mrb_ptr(o)      ((void*)((((uintptr_t)0x3fffffffffff)&((uintptr_t)((o).value.p)))<<2))
-#define mrb_float(o)    (o).f
-#define mrb_cptr(o)     mrb_ptr(o)
-#define mrb_fixnum(o)   (o).value.i
-#define mrb_symbol(o)   (o).value.sym
-
-#ifdef MRB_64BIT
-#define BOXNAN_SHIFT_LONG_POINTER(v) (((uintptr_t)(v)>>34)&0x3fff)
-#else
-#define BOXNAN_SHIFT_LONG_POINTER(v) 0
-#endif
-
-#define BOXNAN_SET_VALUE(o, tt, attr, v) do {\
-  (o).attr = (v);\
-  (o).value.ttt = 0xfff00000 | (((tt)+1)<<14);\
-} while (0)
-
-#define BOXNAN_SET_OBJ_VALUE(o, tt, v) do {\
-  (o).value.p = (void*)((uintptr_t)(v)>>2);\
-  (o).value.ttt = (0xfff00000|(((tt)+1)<<14)|BOXNAN_SHIFT_LONG_POINTER(v));\
-} while (0)
-
-#define SET_FLOAT_VALUE(mrb,r,v) do { \
-  if (v != v) { \
-    (r).value.ttt = 0x7ff80000; \
-    (r).value.i = 0; \
-  } \
-  else { \
-    (r).f = v; \
-  }} while(0)
-
-#define SET_NIL_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_FALSE, value.i, 0)
-#define SET_FALSE_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
-#define SET_TRUE_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
-#define SET_BOOL_VALUE(r,b) BOXNAN_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1)
-#define SET_INT_VALUE(r,n) BOXNAN_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n))
-#define SET_SYM_VALUE(r,v) BOXNAN_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v))
-#define SET_OBJ_VALUE(r,v) BOXNAN_SET_OBJ_VALUE(r, (((struct RObject*)(v))->tt), (v))
-#define SET_CPTR_VALUE(mrb,r,v) BOXNAN_SET_OBJ_VALUE(r, MRB_TT_CPTR, v)
-#define SET_UNDEF_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_UNDEF, value.i, 0)
-
-#endif  /* MRUBY_BOXING_NAN_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_no.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_no.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_no.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_no.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
-** mruby/boxing_no.h - unboxed mrb_value definition
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_BOXING_NO_H
-#define MRUBY_BOXING_NO_H
-
-#define MRB_FIXNUM_SHIFT 0
-#define MRB_TT_HAS_BASIC MRB_TT_OBJECT
-
-typedef struct mrb_value {
-  union {
-    mrb_float f;
-    void *p;
-    mrb_int i;
-    mrb_sym sym;
-  } value;
-  enum mrb_vtype tt;
-} mrb_value;
-
-#define mrb_float_pool(mrb,f) mrb_float_value(mrb,f)
-
-#define mrb_ptr(o)      (o).value.p
-#define mrb_cptr(o)     mrb_ptr(o)
-#define mrb_float(o)    (o).value.f
-#define mrb_fixnum(o)   (o).value.i
-#define mrb_symbol(o)   (o).value.sym
-#define mrb_type(o)     (o).tt
-
-#define BOXNIX_SET_VALUE(o, ttt, attr, v) do {\
-  (o).tt = ttt;\
-  (o).attr = v;\
-} while (0)
-
-#define SET_NIL_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_FALSE, value.i, 0)
-#define SET_FALSE_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
-#define SET_TRUE_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
-#define SET_BOOL_VALUE(r,b) BOXNIX_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1)
-#define SET_INT_VALUE(r,n) BOXNIX_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n))
-#define SET_FLOAT_VALUE(mrb,r,v) BOXNIX_SET_VALUE(r, MRB_TT_FLOAT, value.f, (v))
-#define SET_SYM_VALUE(r,v) BOXNIX_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v))
-#define SET_OBJ_VALUE(r,v) BOXNIX_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v))
-#define SET_CPTR_VALUE(mrb,r,v) BOXNIX_SET_VALUE(r, MRB_TT_CPTR, value.p, v)
-#define SET_UNDEF_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_UNDEF, value.i, 0)
-
-#endif  /* MRUBY_BOXING_NO_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_word.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_word.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_word.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/boxing_word.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-/*
-** mruby/boxing_word.h - word boxing mrb_value definition
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_BOXING_WORD_H
-#define MRUBY_BOXING_WORD_H
-
-#if defined(MRB_INT16)
-# error MRB_INT16 is too small for MRB_WORD_BOXING.
-#endif
-
-#if defined(MRB_INT64) && !defined(MRB_64BIT)
-#error MRB_INT64 cannot be used with MRB_WORD_BOXING in 32-bit mode.
-#endif
-
-struct RFloat {
-  MRB_OBJECT_HEADER;
-  mrb_float f;
-};
-
-struct RCptr {
-  MRB_OBJECT_HEADER;
-  void *p;
-};
-
-#define MRB_FIXNUM_SHIFT 1
-#define MRB_TT_HAS_BASIC MRB_TT_FLOAT
-
-enum mrb_special_consts {
-  MRB_Qnil    = 0,
-  MRB_Qfalse  = 2,
-  MRB_Qtrue   = 4,
-  MRB_Qundef  = 6,
-};
-
-#define MRB_FIXNUM_FLAG   0x01
-#define MRB_SYMBOL_FLAG   0x0e
-#define MRB_SPECIAL_SHIFT 8
-
-typedef union mrb_value {
-  union {
-    void *p;
-    struct {
-      unsigned int i_flag : MRB_FIXNUM_SHIFT;
-      mrb_int i : (MRB_INT_BIT - MRB_FIXNUM_SHIFT);
-    };
-    struct {
-      unsigned int sym_flag : MRB_SPECIAL_SHIFT;
-      mrb_sym sym : (sizeof(mrb_sym) * CHAR_BIT);
-    };
-    struct RBasic *bp;
-    struct RFloat *fp;
-    struct RCptr *vp;
-  } value;
-  unsigned long w;
-} mrb_value;
-
-MRB_API mrb_value mrb_word_boxing_cptr_value(struct mrb_state*, void*);
-MRB_API mrb_value mrb_word_boxing_float_value(struct mrb_state*, mrb_float);
-MRB_API mrb_value mrb_word_boxing_float_pool(struct mrb_state*, mrb_float);
-
-#define mrb_float_pool(mrb,f) mrb_word_boxing_float_pool(mrb,f)
-
-#define mrb_ptr(o)     (o).value.p
-#define mrb_cptr(o)    (o).value.vp->p
-#define mrb_float(o)   (o).value.fp->f
-#define mrb_fixnum(o)  ((mrb_int)(o).value.i)
-#define mrb_symbol(o)  (o).value.sym
-
-static inline enum mrb_vtype
-mrb_type(mrb_value o)
-{
-  switch (o.w) {
-  case MRB_Qfalse:
-  case MRB_Qnil:
-    return MRB_TT_FALSE;
-  case MRB_Qtrue:
-    return MRB_TT_TRUE;
-  case MRB_Qundef:
-    return MRB_TT_UNDEF;
-  }
-  if (o.value.i_flag == MRB_FIXNUM_FLAG) {
-    return MRB_TT_FIXNUM;
-  }
-  if (o.value.sym_flag == MRB_SYMBOL_FLAG) {
-    return MRB_TT_SYMBOL;
-  }
-  return o.value.bp->tt;
-}
-
-#define mrb_bool(o)    ((o).w != MRB_Qnil && (o).w != MRB_Qfalse)
-#define mrb_fixnum_p(o) ((o).value.i_flag == MRB_FIXNUM_FLAG)
-#define mrb_undef_p(o) ((o).w == MRB_Qundef)
-#define mrb_nil_p(o)  ((o).w == MRB_Qnil)
-
-#define BOXWORD_SET_VALUE(o, ttt, attr, v) do { \
-  switch (ttt) {\
-  case MRB_TT_FALSE:  (o).w = (v) ? MRB_Qfalse : MRB_Qnil; break;\
-  case MRB_TT_TRUE:   (o).w = MRB_Qtrue; break;\
-  case MRB_TT_UNDEF:  (o).w = MRB_Qundef; break;\
-  case MRB_TT_FIXNUM: (o).w = 0;(o).value.i_flag = MRB_FIXNUM_FLAG; (o).attr = (v); break;\
-  case MRB_TT_SYMBOL: (o).w = 0;(o).value.sym_flag = MRB_SYMBOL_FLAG; (o).attr = (v); break;\
-  default:            (o).w = 0; (o).attr = (v); if ((o).value.bp) (o).value.bp->tt = ttt; break;\
-  }\
-} while (0)
-
-#define SET_FLOAT_VALUE(mrb,r,v) r = mrb_word_boxing_float_value(mrb, v)
-#define SET_CPTR_VALUE(mrb,r,v) r = mrb_word_boxing_cptr_value(mrb, v)
-#define SET_NIL_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 0)
-#define SET_FALSE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
-#define SET_TRUE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
-#define SET_BOOL_VALUE(r,b) BOXWORD_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1)
-#define SET_INT_VALUE(r,n) BOXWORD_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n))
-#define SET_SYM_VALUE(r,v) BOXWORD_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v))
-#define SET_OBJ_VALUE(r,v) BOXWORD_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v))
-#define SET_UNDEF_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_UNDEF, value.i, 0)
-
-#endif  /* MRUBY_BOXING_WORD_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/class.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/class.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/class.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/class.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/*
-** mruby/class.h - Class class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_CLASS_H
-#define MRUBY_CLASS_H
-
-#include "common.h"
-
-/**
- * Class class
- */
-MRB_BEGIN_DECL
-
-struct RClass {
-  MRB_OBJECT_HEADER;
-  struct iv_tbl *iv;
-  struct kh_mt *mt;
-  struct RClass *super;
-};
-
-#define mrb_class_ptr(v)    ((struct RClass*)(mrb_ptr(v)))
-#define RCLASS_SUPER(v)     (((struct RClass*)(mrb_ptr(v)))->super)
-#define RCLASS_IV_TBL(v)    (((struct RClass*)(mrb_ptr(v)))->iv)
-#define RCLASS_M_TBL(v)     (((struct RClass*)(mrb_ptr(v)))->mt)
-
-static inline struct RClass*
-mrb_class(mrb_state *mrb, mrb_value v)
-{
-  switch (mrb_type(v)) {
-  case MRB_TT_FALSE:
-    if (mrb_fixnum(v))
-      return mrb->false_class;
-    return mrb->nil_class;
-  case MRB_TT_TRUE:
-    return mrb->true_class;
-  case MRB_TT_SYMBOL:
-    return mrb->symbol_class;
-  case MRB_TT_FIXNUM:
-    return mrb->fixnum_class;
-  case MRB_TT_FLOAT:
-    return mrb->float_class;
-  case MRB_TT_CPTR:
-    return mrb->object_class;
-  case MRB_TT_ENV:
-    return NULL;
-  default:
-    return mrb_obj_ptr(v)->c;
-  }
-}
-
-/* TODO: figure out where to put user flags */
-#define MRB_FLAG_IS_FROZEN (1 << 18)
-#define MRB_FLAG_IS_PREPENDED (1 << 19)
-#define MRB_FLAG_IS_ORIGIN (1 << 20)
-#define MRB_CLASS_ORIGIN(c) do {\
-  if (c->flags & MRB_FLAG_IS_PREPENDED) {\
-    c = c->super;\
-    while (!(c->flags & MRB_FLAG_IS_ORIGIN)) {\
-      c = c->super;\
-    }\
-  }\
-} while (0)
-#define MRB_INSTANCE_TT_MASK (0xFF)
-#define MRB_SET_INSTANCE_TT(c, tt) c->flags = ((c->flags & ~MRB_INSTANCE_TT_MASK) | (char)tt)
-#define MRB_INSTANCE_TT(c) (enum mrb_vtype)(c->flags & MRB_INSTANCE_TT_MASK)
-
-MRB_API struct RClass* mrb_define_class_id(mrb_state*, mrb_sym, struct RClass*);
-MRB_API struct RClass* mrb_define_module_id(mrb_state*, mrb_sym);
-MRB_API struct RClass *mrb_vm_define_class(mrb_state*, mrb_value, mrb_value, mrb_sym);
-MRB_API struct RClass *mrb_vm_define_module(mrb_state*, mrb_value, mrb_sym);
-MRB_API void mrb_define_method_raw(mrb_state*, struct RClass*, mrb_sym, struct RProc *);
-MRB_API void mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, mrb_aspec aspec);
-MRB_API void mrb_alias_method(mrb_state *mrb, struct RClass *c, mrb_sym a, mrb_sym b);
-
-MRB_API struct RClass *mrb_class_outer_module(mrb_state*, struct RClass *);
-MRB_API struct RProc *mrb_method_search_vm(mrb_state*, struct RClass**, mrb_sym);
-MRB_API struct RProc *mrb_method_search(mrb_state*, struct RClass*, mrb_sym);
-
-MRB_API struct RClass* mrb_class_real(struct RClass* cl);
-
-void mrb_gc_mark_mt(mrb_state*, struct RClass*);
-size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*);
-void mrb_gc_free_mt(mrb_state*, struct RClass*);
-
-MRB_END_DECL
-
-#endif  /* MRUBY_CLASS_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/common.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/common.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/common.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
-**"common.h - mruby common platform definition"
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_COMMON_H
-#define MRUBY_COMMON_H
-
-
-#ifdef __cplusplus
-#ifdef MRB_ENABLE_CXX_ABI
-#define MRB_BEGIN_DECL
-#define MRB_END_DECL
-#else
-# define MRB_BEGIN_DECL extern "C" {
-# define MRB_END_DECL	}
-#endif
-#else
-/** Start declarations in C mode */
-# define MRB_BEGIN_DECL
-/** End declarations in C mode */
-# define MRB_END_DECL
-#endif
-
-/**
- * Shared compiler macros
- */
-MRB_BEGIN_DECL
-
-/** Declare a function that never returns. */
-#if __STDC_VERSION__ >= 201112L
-# define mrb_noreturn _Noreturn
-#elif defined __GNUC__ && !defined __STRICT_ANSI__
-# define mrb_noreturn __attribute__((noreturn))
-#elif defined _MSC_VER
-# define mrb_noreturn __declspec(noreturn)
-#else
-# define mrb_noreturn
-#endif
-
-/** Mark a function as deprecated. */
-#if defined __GNUC__ && !defined __STRICT_ANSI__
-# define mrb_deprecated __attribute__((deprecated))
-#elif defined _MSC_VER
-# define mrb_deprecated __declspec(deprecated)
-#else
-# define mrb_deprecated
-#endif
-
-/** Declare a function as always inlined. */
-#if defined(_MSC_VER)
-# define MRB_INLINE static __inline
-#else
-# define MRB_INLINE static inline
-#endif
-
-
-/** Declare a public MRuby API function. */
-#if defined(MRB_BUILD_AS_DLL)
-#if defined(MRB_CORE) || defined(MRB_LIB)
-# define MRB_API __declspec(dllexport)
-#else
-# define MRB_API __declspec(dllimport)
-#endif
-#else
-# define MRB_API extern
-#endif
-
-MRB_END_DECL
-
-#endif  /* MRUBY_COMMON_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/compile.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/compile.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/compile.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/compile.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,195 +0,0 @@
-/*
-** mruby/compile.h - mruby parser
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_COMPILE_H
-#define MRUBY_COMPILE_H
-
-#include "common.h"
-
-/**
- * MRuby Compiler
- */
-MRB_BEGIN_DECL
-
-#include <mruby.h>
-
-struct mrb_jmpbuf;
-
-struct mrb_parser_state;
-/* load context */
-typedef struct mrbc_context {
-  mrb_sym *syms;
-  int slen;
-  char *filename;
-  short lineno;
-  int (*partial_hook)(struct mrb_parser_state*);
-  void *partial_data;
-  struct RClass *target_class;
-  mrb_bool capture_errors:1;
-  mrb_bool dump_result:1;
-  mrb_bool no_exec:1;
-  mrb_bool keep_lv:1;
-  mrb_bool no_optimize:1;
-
-  size_t parser_nerr;
-} mrbc_context;
-
-MRB_API mrbc_context* mrbc_context_new(mrb_state *mrb);
-MRB_API void mrbc_context_free(mrb_state *mrb, mrbc_context *cxt);
-MRB_API const char *mrbc_filename(mrb_state *mrb, mrbc_context *c, const char *s);
-MRB_API void mrbc_partial_hook(mrb_state *mrb, mrbc_context *c, int (*partial_hook)(struct mrb_parser_state*), void*data);
-
-/* AST node structure */
-typedef struct mrb_ast_node {
-  struct mrb_ast_node *car, *cdr;
-  uint16_t lineno, filename_index;
-} mrb_ast_node;
-
-/* lexer states */
-enum mrb_lex_state_enum {
-  EXPR_BEG,                   /* ignore newline, +/- is a sign. */
-  EXPR_END,                   /* newline significant, +/- is an operator. */
-  EXPR_ENDARG,                /* ditto, and unbound braces. */
-  EXPR_ENDFN,                 /* ditto, and unbound braces. */
-  EXPR_ARG,                   /* newline significant, +/- is an operator. */
-  EXPR_CMDARG,                /* newline significant, +/- is an operator. */
-  EXPR_MID,                   /* newline significant, +/- is an operator. */
-  EXPR_FNAME,                 /* ignore newline, no reserved words. */
-  EXPR_DOT,                   /* right after '.' or '::', no reserved words. */
-  EXPR_CLASS,                 /* immediate after 'class', no here document. */
-  EXPR_VALUE,                 /* alike EXPR_BEG but label is disallowed. */
-  EXPR_MAX_STATE
-};
-
-/* saved error message */
-struct mrb_parser_message {
-  int lineno;
-  int column;
-  char* message;
-};
-
-#define STR_FUNC_PARSING 0x01
-#define STR_FUNC_EXPAND  0x02
-#define STR_FUNC_REGEXP  0x04
-#define STR_FUNC_WORD    0x08
-#define STR_FUNC_SYMBOL  0x10
-#define STR_FUNC_ARRAY   0x20
-#define STR_FUNC_HEREDOC 0x40
-#define STR_FUNC_XQUOTE  0x80
-
-enum mrb_string_type {
-  str_not_parsing  = (0),
-  str_squote   = (STR_FUNC_PARSING),
-  str_dquote   = (STR_FUNC_PARSING|STR_FUNC_EXPAND),
-  str_regexp   = (STR_FUNC_PARSING|STR_FUNC_REGEXP|STR_FUNC_EXPAND),
-  str_sword    = (STR_FUNC_PARSING|STR_FUNC_WORD|STR_FUNC_ARRAY),
-  str_dword    = (STR_FUNC_PARSING|STR_FUNC_WORD|STR_FUNC_ARRAY|STR_FUNC_EXPAND),
-  str_ssym     = (STR_FUNC_PARSING|STR_FUNC_SYMBOL),
-  str_ssymbols = (STR_FUNC_PARSING|STR_FUNC_SYMBOL|STR_FUNC_ARRAY),
-  str_dsymbols = (STR_FUNC_PARSING|STR_FUNC_SYMBOL|STR_FUNC_ARRAY|STR_FUNC_EXPAND),
-  str_heredoc  = (STR_FUNC_PARSING|STR_FUNC_HEREDOC),
-  str_xquote   = (STR_FUNC_PARSING|STR_FUNC_XQUOTE|STR_FUNC_EXPAND),
-};
-
-/* heredoc structure */
-struct mrb_parser_heredoc_info {
-  mrb_bool allow_indent:1;
-  mrb_bool line_head:1;
-  enum mrb_string_type type;
-  const char *term;
-  int term_len;
-  mrb_ast_node *doc;
-};
-
-#define MRB_PARSER_TOKBUF_MAX 65536
-#define MRB_PARSER_TOKBUF_SIZE 256
-
-/* parser structure */
-struct mrb_parser_state {
-  mrb_state *mrb;
-  struct mrb_pool *pool;
-  mrb_ast_node *cells;
-  const char *s, *send;
-#ifndef MRB_DISABLE_STDIO
-  FILE *f;
-#endif
-  mrbc_context *cxt;
-  char const *filename;
-  int lineno;
-  int column;
-
-  enum mrb_lex_state_enum lstate;
-  mrb_ast_node *lex_strterm; /* (type nest_level beg . end) */
-
-  unsigned int cond_stack;
-  unsigned int cmdarg_stack;
-  int paren_nest;
-  int lpar_beg;
-  int in_def, in_single;
-  mrb_bool cmd_start:1;
-  mrb_ast_node *locals;
-
-  mrb_ast_node *pb;
-  char *tokbuf;
-  char buf[MRB_PARSER_TOKBUF_SIZE];
-  int tidx;
-  int tsiz;
-
-  mrb_ast_node *all_heredocs;	/* list of mrb_parser_heredoc_info* */
-  mrb_ast_node *heredocs_from_nextline;
-  mrb_ast_node *parsing_heredoc;
-  mrb_ast_node *lex_strterm_before_heredoc;
-  mrb_bool heredoc_end_now:1; /* for mirb */
-
-  void *ylval;
-
-  size_t nerr;
-  size_t nwarn;
-  mrb_ast_node *tree;
-
-  mrb_bool no_optimize:1;
-  mrb_bool capture_errors:1;
-  struct mrb_parser_message error_buffer[10];
-  struct mrb_parser_message warn_buffer[10];
-
-  mrb_sym* filename_table;
-  size_t filename_table_length;
-  int current_filename_index;
-
-  struct mrb_jmpbuf* jmp;
-};
-
-MRB_API struct mrb_parser_state* mrb_parser_new(mrb_state*);
-MRB_API void mrb_parser_free(struct mrb_parser_state*);
-MRB_API void mrb_parser_parse(struct mrb_parser_state*,mrbc_context*);
-MRB_API double mrb_float_read(const char*, char**);
-
-MRB_API void mrb_parser_set_filename(struct mrb_parser_state*, char const*);
-MRB_API char const* mrb_parser_get_filename(struct mrb_parser_state*, uint16_t idx);
-
-/* utility functions */
-#ifndef MRB_DISABLE_STDIO
-MRB_API struct mrb_parser_state* mrb_parse_file(mrb_state*,FILE*,mrbc_context*);
-#endif
-MRB_API struct mrb_parser_state* mrb_parse_string(mrb_state*,const char*,mrbc_context*);
-MRB_API struct mrb_parser_state* mrb_parse_nstring(mrb_state*,const char*,int,mrbc_context*);
-MRB_API struct RProc* mrb_generate_code(mrb_state*, struct mrb_parser_state*);
-MRB_API mrb_value mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c);
-
-/* program load functions */
-#ifndef MRB_DISABLE_STDIO
-MRB_API mrb_value mrb_load_file(mrb_state*,FILE*);
-MRB_API mrb_value mrb_load_file_cxt(mrb_state*,FILE*, mrbc_context *cxt);
-#endif
-MRB_API mrb_value mrb_load_string(mrb_state *mrb, const char *s);
-MRB_API mrb_value mrb_load_nstring(mrb_state *mrb, const char *s, int len);
-MRB_API mrb_value mrb_load_string_cxt(mrb_state *mrb, const char *s, mrbc_context *cxt);
-MRB_API mrb_value mrb_load_nstring_cxt(mrb_state *mrb, const char *s, int len, mrbc_context *cxt);
-
-/** @} */
-MRB_END_DECL
-
-#endif /* MRUBY_COMPILE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/data.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/data.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/data.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/data.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
-** mruby/data.h - Data class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_DATA_H
-#define MRUBY_DATA_H
-
-#include "common.h"
-
-/**
- * Custom C wrapped data.
- *
- * Defining Ruby wrappers around native objects.
- */
-MRB_BEGIN_DECL
-
-/**
- * Custom data type description.
- */
-typedef struct mrb_data_type {
-  /** data type name */
-  const char *struct_name;
-
-  /** data type release function pointer */
-  void (*dfree)(mrb_state *mrb, void*);
-} mrb_data_type;
-
-struct RData {
-  MRB_OBJECT_HEADER;
-  struct iv_tbl *iv;
-  const mrb_data_type *type;
-  void *data;
-};
-
-MRB_API struct RData *mrb_data_object_alloc(mrb_state *mrb, struct RClass* klass, void *datap, const mrb_data_type *type);
-
-#define Data_Wrap_Struct(mrb,klass,type,ptr)\
-  mrb_data_object_alloc(mrb,klass,ptr,type)
-
-#define Data_Make_Struct(mrb,klass,strct,type,sval,data) do { \
-  sval = mrb_malloc(mrb, sizeof(strct));                     \
-  { static const strct zero = { 0 }; *sval = zero; };\
-  data = Data_Wrap_Struct(mrb,klass,type,sval);\
-} while (0)
-
-#define RDATA(obj)         ((struct RData *)(mrb_ptr(obj)))
-#define DATA_PTR(d)        (RDATA(d)->data)
-#define DATA_TYPE(d)       (RDATA(d)->type)
-MRB_API void mrb_data_check_type(mrb_state *mrb, mrb_value, const mrb_data_type*);
-MRB_API void *mrb_data_get_ptr(mrb_state *mrb, mrb_value, const mrb_data_type*);
-#define DATA_GET_PTR(mrb,obj,dtype,type) (type*)mrb_data_get_ptr(mrb,obj,dtype)
-MRB_API void *mrb_data_check_get_ptr(mrb_state *mrb, mrb_value, const mrb_data_type*);
-#define DATA_CHECK_GET_PTR(mrb,obj,dtype,type) (type*)mrb_data_check_get_ptr(mrb,obj,dtype)
-
-/* obsolete functions and macros */
-#define mrb_data_check_and_get(mrb,obj,dtype) mrb_data_get_ptr(mrb,obj,dtype)
-#define mrb_get_datatype(mrb,val,type) mrb_data_get_ptr(mrb, val, type)
-#define mrb_check_datatype(mrb,val,type) mrb_data_get_ptr(mrb, val, type)
-#define Data_Get_Struct(mrb,obj,type,sval) do {\
-  *(void**)&sval = mrb_data_get_ptr(mrb, obj, type); \
-} while (0)
-
-static inline void
-mrb_data_init(mrb_value v, void *ptr, const mrb_data_type *type)
-{
-  mrb_assert(mrb_type(v) == MRB_TT_DATA);
-  DATA_PTR(v) = ptr;
-  DATA_TYPE(v) = type;
-}
-
-MRB_END_DECL
-
-#endif /* MRUBY_DATA_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/debug.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/debug.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/debug.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/debug.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
-** mruby/debug.h - mruby debug info
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_DEBUG_H
-#define MRUBY_DEBUG_H
-
-#include "common.h"
-
-/**
- * MRuby Debugging.
- */
-MRB_BEGIN_DECL
-
-typedef enum mrb_debug_line_type {
-  mrb_debug_line_ary = 0,
-  mrb_debug_line_flat_map = 1
-} mrb_debug_line_type;
-
-typedef struct mrb_irep_debug_info_line {
-  uint32_t start_pos;
-  uint16_t line;
-} mrb_irep_debug_info_line;
-
-typedef struct mrb_irep_debug_info_file {
-  uint32_t start_pos;
-  const char *filename;
-  mrb_sym filename_sym;
-  uint32_t line_entry_count;
-  mrb_debug_line_type line_type;
-  union {
-    void *ptr;
-    mrb_irep_debug_info_line *flat_map;
-    uint16_t *ary;
-  } lines;
-} mrb_irep_debug_info_file;
-
-typedef struct mrb_irep_debug_info {
-  uint32_t pc_count;
-  uint16_t flen;
-  mrb_irep_debug_info_file **files;
-} mrb_irep_debug_info;
-
-/*
- * get line from irep's debug info and program counter
- * @return returns NULL if not found
- */
-MRB_API const char *mrb_debug_get_filename(mrb_irep *irep, uint32_t pc);
-
-/*
- * get line from irep's debug info and program counter
- * @return returns -1 if not found
- */
-MRB_API int32_t mrb_debug_get_line(mrb_irep *irep, uint32_t pc);
-
-MRB_API mrb_irep_debug_info_file *mrb_debug_info_append_file(
-    mrb_state *mrb, mrb_irep *irep,
-    uint32_t start_pos, uint32_t end_pos);
-MRB_API mrb_irep_debug_info *mrb_debug_info_alloc(mrb_state *mrb, mrb_irep *irep);
-MRB_API void mrb_debug_info_free(mrb_state *mrb, mrb_irep_debug_info *d);
-
-MRB_END_DECL
-
-#endif /* MRUBY_DEBUG_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/dump.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/dump.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/dump.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/dump.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,196 +0,0 @@
-/*
-** mruby/dump.h - mruby binary dumper (mrbc binary format)
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_DUMP_H
-#define MRUBY_DUMP_H
-
-#include <mruby.h>
-#include <mruby/irep.h>
-#include "common.h"
-
-/**
- * Dumping compiled mruby script.
- */
-MRB_BEGIN_DECL
-
-#define DUMP_DEBUG_INFO 1
-#define DUMP_ENDIAN_BIG 2
-#define DUMP_ENDIAN_LIL 4
-#define DUMP_ENDIAN_NAT 6
-#define DUMP_ENDIAN_MASK 6
-
-int mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size);
-#ifndef MRB_DISABLE_STDIO
-int mrb_dump_irep_binary(mrb_state*, mrb_irep*, uint8_t, FILE*);
-int mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep*, uint8_t flags, FILE *f, const char *initname);
-mrb_irep *mrb_read_irep_file(mrb_state*, FILE*);
-MRB_API mrb_value mrb_load_irep_file(mrb_state*,FILE*);
-MRB_API mrb_value mrb_load_irep_file_cxt(mrb_state*, FILE*, mrbc_context*);
-#endif
-MRB_API mrb_irep *mrb_read_irep(mrb_state*, const uint8_t*);
-
-/* dump/load error code
- *
- * NOTE: MRB_DUMP_GENERAL_FAILURE is caused by
- * unspecified issues like malloc failed.
- */
-#define MRB_DUMP_OK                     0
-#define MRB_DUMP_GENERAL_FAILURE      (-1)
-#define MRB_DUMP_WRITE_FAULT          (-2)
-#define MRB_DUMP_READ_FAULT           (-3)
-#define MRB_DUMP_CRC_ERROR            (-4)
-#define MRB_DUMP_INVALID_FILE_HEADER  (-5)
-#define MRB_DUMP_INVALID_IREP         (-6)
-#define MRB_DUMP_INVALID_ARGUMENT     (-7)
-
-/* null symbol length */
-#define MRB_DUMP_NULL_SYM_LEN         0xFFFF
-
-/* Rite Binary File header */
-#define RITE_BINARY_IDENT              "RITE"
-#define RITE_BINARY_IDENT_LIL          "ETIR"
-#define RITE_BINARY_FORMAT_VER         "0004"
-#define RITE_COMPILER_NAME             "MATZ"
-#define RITE_COMPILER_VERSION          "0000"
-
-#define RITE_VM_VER                    "0000"
-
-#define RITE_BINARY_EOF                "END\0"
-#define RITE_SECTION_IREP_IDENT        "IREP"
-#define RITE_SECTION_LINENO_IDENT      "LINE"
-#define RITE_SECTION_DEBUG_IDENT       "DBG\0"
-#define RITE_SECTION_LV_IDENT          "LVAR"
-
-#define MRB_DUMP_DEFAULT_STR_LEN      128
-#define MRB_DUMP_ALIGNMENT            sizeof(uint32_t)
-
-/* binary header */
-struct rite_binary_header {
-  uint8_t binary_ident[4];    /* Binary Identifier */
-  uint8_t binary_version[4];  /* Binary Format Version */
-  uint8_t binary_crc[2];      /* Binary CRC */
-  uint8_t binary_size[4];     /* Binary Size */
-  uint8_t compiler_name[4];   /* Compiler name */
-  uint8_t compiler_version[4];
-};
-
-/* section header */
-#define RITE_SECTION_HEADER \
-  uint8_t section_ident[4]; \
-  uint8_t section_size[4]
-
-struct rite_section_header {
-  RITE_SECTION_HEADER;
-};
-
-struct rite_section_irep_header {
-  RITE_SECTION_HEADER;
-
-  uint8_t rite_version[4];    /* Rite Instruction Specification Version */
-};
-
-struct rite_section_lineno_header {
-  RITE_SECTION_HEADER;
-};
-
-struct rite_section_debug_header {
-  RITE_SECTION_HEADER;
-};
-
-struct rite_section_lv_header {
-  RITE_SECTION_HEADER;
-};
-
-#define RITE_LV_NULL_MARK              UINT16_MAX
-
-struct rite_binary_footer {
-  RITE_SECTION_HEADER;
-};
-
-static inline int
-bigendian_p()
-{
-  int i;
-  char *p;
-
-  i = 1;
-  p = (char*)&i;
-  return p[0]?0:1;
-}
-
-static inline size_t
-uint8_to_bin(uint8_t s, uint8_t *bin)
-{
-  *bin = s;
-  return sizeof(uint8_t);
-}
-
-static inline size_t
-uint16_to_bin(uint16_t s, uint8_t *bin)
-{
-  *bin++ = (s >> 8) & 0xff;
-  *bin   = s & 0xff;
-  return sizeof(uint16_t);
-}
-
-static inline size_t
-uint32_to_bin(uint32_t l, uint8_t *bin)
-{
-  *bin++ = (l >> 24) & 0xff;
-  *bin++ = (l >> 16) & 0xff;
-  *bin++ = (l >> 8) & 0xff;
-  *bin   = l & 0xff;
-  return sizeof(uint32_t);
-}
-
-static inline size_t
-uint32l_to_bin(uint32_t l, uint8_t *bin)
-{
-  bin[3] = (l >> 24) & 0xff;
-  bin[2] = (l >> 16) & 0xff;
-  bin[1] = (l >> 8) & 0xff;
-  bin[0] = l & 0xff;
-  return sizeof(uint32_t);
-}
-
-static inline uint32_t
-bin_to_uint32(const uint8_t *bin)
-{
-  return (uint32_t)bin[0] << 24 |
-         (uint32_t)bin[1] << 16 |
-         (uint32_t)bin[2] << 8  |
-         (uint32_t)bin[3];
-}
-
-static inline uint32_t
-bin_to_uint32l(const uint8_t *bin)
-{
-  return (uint32_t)bin[3] << 24 |
-         (uint32_t)bin[2] << 16 |
-         (uint32_t)bin[1] << 8  |
-         (uint32_t)bin[0];
-}
-
-static inline uint16_t
-bin_to_uint16(const uint8_t *bin)
-{
-  return (uint16_t)bin[0] << 8 |
-         (uint16_t)bin[1];
-}
-
-static inline uint8_t
-bin_to_uint8(const uint8_t *bin)
-{
-  return (uint8_t)bin[0];
-}
-
-MRB_END_DECL
-
-/** @internal crc.c */
-uint16_t
-calc_crc_16_ccitt(const uint8_t *src, size_t nbytes, uint16_t crc);
-
-#endif  /* MRUBY_DUMP_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/error.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/error.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/error.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
-** mruby/error.h - Exception class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_ERROR_H
-#define MRUBY_ERROR_H
-
-#include "common.h"
-
-/**
- * MRuby error handling.
- */
-MRB_BEGIN_DECL
-
-struct RException {
-  MRB_OBJECT_HEADER;
-  struct iv_tbl *iv;
-};
-
-#define mrb_exc_ptr(v) ((struct RException*)mrb_ptr(v))
-
-MRB_API void mrb_sys_fail(mrb_state *mrb, const char *mesg);
-MRB_API mrb_value mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str);
-#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
-MRB_API mrb_value mrb_make_exception(mrb_state *mrb, int argc, const mrb_value *argv);
-MRB_API mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
-MRB_API mrb_value mrb_get_backtrace(mrb_state *mrb);
-MRB_API mrb_noreturn void mrb_no_method_error(mrb_state *mrb, mrb_sym id, mrb_value args, const char *fmt, ...);
-
-/* declaration for fail method */
-MRB_API mrb_value mrb_f_raise(mrb_state*, mrb_value);
-
-struct RBreak {
-  MRB_OBJECT_HEADER;
-  struct iv_tbl *iv;
-  struct RProc *proc;
-  mrb_value val;
-};
-
-/**
- * Protect
- *
- * @mrbgem mruby-error
- */
-MRB_API mrb_value mrb_protect(mrb_state *mrb, mrb_func_t body, mrb_value data, mrb_bool *state);
-
-/**
- * Ensure
- *
- * @mrbgem mruby-error
- */
-MRB_API mrb_value mrb_ensure(mrb_state *mrb, mrb_func_t body, mrb_value b_data,
-                             mrb_func_t ensure, mrb_value e_data);
-
-/**
- * Rescue
- *
- * @mrbgem mruby-error
- */
-MRB_API mrb_value mrb_rescue(mrb_state *mrb, mrb_func_t body, mrb_value b_data,
-                             mrb_func_t rescue, mrb_value r_data);
-
-/**
- * Rescue exception
- *
- * @mrbgem mruby-error
- */
-MRB_API mrb_value mrb_rescue_exceptions(mrb_state *mrb, mrb_func_t body, mrb_value b_data,
-                                        mrb_func_t rescue, mrb_value r_data,
-                                        mrb_int len, struct RClass **classes);
-
-MRB_END_DECL
-
-#endif  /* MRUBY_ERROR_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/gc.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/gc.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/gc.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/gc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
-** mruby/gc.h - garbage collector for mruby
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_GC_H
-#define MRUBY_GC_H
-
-#include "common.h"
-
-/**
- * Uncommon memory management stuffs.
- */
-MRB_BEGIN_DECL
-
-
-struct mrb_state;
-
-#define MRB_EACH_OBJ_OK 0
-#define MRB_EACH_OBJ_BREAK 1
-typedef int (mrb_each_object_callback)(struct mrb_state *mrb, struct RBasic *obj, void *data);
-void mrb_objspace_each_objects(struct mrb_state *mrb, mrb_each_object_callback *callback, void *data);
-MRB_API void mrb_free_context(struct mrb_state *mrb, struct mrb_context *c);
-
-#ifndef MRB_GC_ARENA_SIZE
-#define MRB_GC_ARENA_SIZE 100
-#endif
-
-typedef enum {
-  MRB_GC_STATE_ROOT = 0,
-  MRB_GC_STATE_MARK,
-  MRB_GC_STATE_SWEEP
-} mrb_gc_state;
-
-typedef struct mrb_heap_page {
-  struct RBasic *freelist;
-  struct mrb_heap_page *prev;
-  struct mrb_heap_page *next;
-  struct mrb_heap_page *free_next;
-  struct mrb_heap_page *free_prev;
-  mrb_bool old:1;
-  void *objects[];
-} mrb_heap_page;
-
-typedef struct mrb_gc {
-  mrb_heap_page *heaps;                /* heaps for GC */
-  mrb_heap_page *sweeps;
-  mrb_heap_page *free_heaps;
-  size_t live; /* count of live objects */
-#ifdef MRB_GC_FIXED_ARENA
-  struct RBasic *arena[MRB_GC_ARENA_SIZE]; /* GC protection array */
-#else
-  struct RBasic **arena;                   /* GC protection array */
-  int arena_capa;
-#endif
-  int arena_idx;
-
-  mrb_gc_state state; /* state of gc */
-  int current_white_part; /* make white object by white_part */
-  struct RBasic *gray_list; /* list of gray objects to be traversed incrementally */
-  struct RBasic *atomic_gray_list; /* list of objects to be traversed atomically */
-  size_t live_after_mark;
-  size_t threshold;
-  int interval_ratio;
-  int step_ratio;
-  mrb_bool iterating     :1;
-  mrb_bool disabled      :1;
-  mrb_bool full          :1;
-  mrb_bool generational  :1;
-  mrb_bool out_of_memory :1;
-  size_t majorgc_old_threshold;
-} mrb_gc;
-
-MRB_API mrb_bool
-mrb_object_dead_p(struct mrb_state *mrb, struct RBasic *object);
-
-MRB_END_DECL
-
-#endif  /* MRUBY_GC_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/hash.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/hash.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/hash.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/hash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-/*
-** mruby/hash.h - Hash class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_HASH_H
-#define MRUBY_HASH_H
-
-#include "common.h"
-#include <mruby/khash.h>
-
-/**
- * Hash class
- */
-MRB_BEGIN_DECL
-
-struct RHash {
-  MRB_OBJECT_HEADER;
-  struct iv_tbl *iv;
-  struct kh_ht *ht;
-};
-
-#define mrb_hash_ptr(v)    ((struct RHash*)(mrb_ptr(v)))
-#define mrb_hash_value(p)  mrb_obj_value((void*)(p))
-
-MRB_API mrb_value mrb_hash_new_capa(mrb_state*, mrb_int);
-
-/*
- * Initializes a new hash.
- *
- * Equivalent to:
- *
- *      Hash.new
- *
- * @param mrb The mruby state reference.
- * @return The initialized hash.
- */
-MRB_API mrb_value mrb_hash_new(mrb_state *mrb);
-
-/*
- * Sets a keys and values to hashes.
- *
- * Equivalent to:
- *
- *      hash[key] = val
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @param key The key to set.
- * @param val The value to set.
- * @return The value.
- */
-MRB_API void mrb_hash_set(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value val);
-
-/*
- * Gets a value from a key. If the key is not found, the default of the
- * hash is used.
- *
- * Equivalent to:
- *
- *     hash[key]
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @param key The key to get.
- * @return The found value.
- */
-MRB_API mrb_value mrb_hash_get(mrb_state *mrb, mrb_value hash, mrb_value key);
-
-/*
- * Gets a value from a key. If the key is not found, the default parameter is
- * used.
- *
- * Equivalent to:
- *
- *     hash.hash_key?(key) ? hash[key] : def
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @param key The key to get.
- * @param def The default value.
- * @return The found value.
- */
-MRB_API mrb_value mrb_hash_fetch(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value def);
-
-/*
- * Deletes hash key and value pair.
- *
- * Equivalent to:
- *
- *     hash.delete(key)
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @param key The key to delete.
- * @return The deleted value.
- */
-MRB_API mrb_value mrb_hash_delete_key(mrb_state *mrb, mrb_value hash, mrb_value key);
-
-/*
- * Gets an array of keys.
- *
- * Equivalent to:
- *
- *     hash.keys
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @return An array with the keys of the hash.
- */
-MRB_API mrb_value mrb_hash_keys(mrb_state *mrb, mrb_value hash);
-MRB_API mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash);
-
-/*
- * Check if the hash is empty
- *
- * Equivalent to:
- *
- *     hash.empty?
- *
- * @param mrb The mruby state reference.
- * @param self The target hash.
- * @return True if the hash is empty, false otherwise.
- */
-MRB_API mrb_value mrb_hash_empty_p(mrb_state *mrb, mrb_value self);
-
-/*
- * Gets an array of values.
- *
- * Equivalent to:
- *
- *     hash.values
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @return An array with the values of the hash.
- */
-MRB_API mrb_value mrb_hash_values(mrb_state *mrb, mrb_value hash);
-
-/*
- * Clears the hash.
- *
- * Equivalent to:
- *
- *     hash.clear
- *
- * @param mrb The mruby state reference.
- * @param hash The target hash.
- * @return The hash
- */
-MRB_API mrb_value mrb_hash_clear(mrb_state *mrb, mrb_value hash);
-
-/* declaration of struct kh_ht */
-/* be careful when you touch the internal */
-typedef struct {
-  mrb_value v;
-  mrb_int n;
-} mrb_hash_value;
-
-KHASH_DECLARE(ht, mrb_value, mrb_hash_value, TRUE)
-
-/* RHASH_TBL allocates st_table if not available. */
-#define RHASH(obj)   ((struct RHash*)(mrb_ptr(obj)))
-#define RHASH_TBL(h)          (RHASH(h)->ht)
-#define RHASH_IFNONE(h)       mrb_iv_get(mrb, (h), mrb_intern_lit(mrb, "ifnone"))
-#define RHASH_PROCDEFAULT(h)  RHASH_IFNONE(h)
-MRB_API struct kh_ht * mrb_hash_tbl(mrb_state *mrb, mrb_value hash);
-
-#define MRB_HASH_DEFAULT      1
-#define MRB_HASH_PROC_DEFAULT 2
-#define MRB_RHASH_DEFAULT_P(h) (RHASH(h)->flags & MRB_HASH_DEFAULT)
-#define MRB_RHASH_PROCDEFAULT_P(h) (RHASH(h)->flags & MRB_HASH_PROC_DEFAULT)
-
-/* GC functions */
-void mrb_gc_mark_hash(mrb_state*, struct RHash*);
-size_t mrb_gc_mark_hash_size(mrb_state*, struct RHash*);
-void mrb_gc_free_hash(mrb_state*, struct RHash*);
-
-MRB_END_DECL
-
-#endif  /* MRUBY_HASH_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/irep.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/irep.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/irep.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/irep.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/*
-** mruby/irep.h - mrb_irep structure
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_IREP_H
-#define MRUBY_IREP_H
-
-#include "common.h"
-#include <mruby/compile.h>
-
-/**
- * Compiled mruby scripts.
- */
-MRB_BEGIN_DECL
-
-enum irep_pool_type {
-  IREP_TT_STRING,
-  IREP_TT_FIXNUM,
-  IREP_TT_FLOAT,
-};
-
-struct mrb_locals {
-  mrb_sym name;
-  uint16_t r;
-};
-
-/* Program data array struct */
-typedef struct mrb_irep {
-  uint16_t nlocals;        /* Number of local variables */
-  uint16_t nregs;          /* Number of register variables */
-  uint8_t flags;
-
-  mrb_code *iseq;
-  mrb_value *pool;
-  mrb_sym *syms;
-  struct mrb_irep **reps;
-
-  struct mrb_locals *lv;
-  /* debug info */
-  mrb_bool own_filename;
-  const char *filename;
-  uint16_t *lines;
-  struct mrb_irep_debug_info* debug_info;
-
-  size_t ilen, plen, slen, rlen, refcnt;
-} mrb_irep;
-
-#define MRB_ISEQ_NO_FREE 1
-
-MRB_API mrb_irep *mrb_add_irep(mrb_state *mrb);
-MRB_API mrb_value mrb_load_irep(mrb_state*, const uint8_t*);
-MRB_API mrb_value mrb_load_irep_cxt(mrb_state*, const uint8_t*, mrbc_context*);
-void mrb_irep_free(mrb_state*, struct mrb_irep*);
-void mrb_irep_incref(mrb_state*, struct mrb_irep*);
-void mrb_irep_decref(mrb_state*, struct mrb_irep*);
-
-MRB_END_DECL
-
-#endif  /* MRUBY_IREP_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/istruct.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/istruct.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/istruct.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/istruct.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
-** mruby/istruct.h - Inline structures
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_ISTRUCT_H
-#define MRUBY_ISTRUCT_H
-
-#include "common.h"
-#include <string.h>
-
-/**
- * Inline structures that fit in RVALUE
- *
- * They cannot have finalizer, and cannot have instance variables.
- */
-MRB_BEGIN_DECL
-
-#define ISTRUCT_DATA_SIZE (sizeof(void*) * 3)
-
-struct RIstruct {
-  MRB_OBJECT_HEADER;
-  char inline_data[ISTRUCT_DATA_SIZE];
-};
-
-#define RISTRUCT(obj)         ((struct RIstruct*)(mrb_ptr(obj)))
-#define ISTRUCT_PTR(obj)      (RISTRUCT(obj)->inline_data)
-
-MRB_INLINE mrb_int mrb_istruct_size()
-{
-  return ISTRUCT_DATA_SIZE;
-}
-
-MRB_INLINE void* mrb_istruct_ptr(mrb_value object)
-{
-  return ISTRUCT_PTR(object);
-}
-
-MRB_INLINE void mrb_istruct_copy(mrb_value dest, mrb_value src)
-{
-  memcpy(ISTRUCT_PTR(dest), ISTRUCT_PTR(src), ISTRUCT_DATA_SIZE);
-}
-
-MRB_END_DECL
-
-#endif /* MRUBY_ISTRUCT_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/khash.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/khash.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/khash.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/khash.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-/*
-** mruby/khash.c - Hash for mruby
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_KHASH_H
-#define MRUBY_KHASH_H
-
-#include <string.h>
-
-#include <mruby.h>
-#include "common.h"
-
-/**
- * khash definitions used in mruby's hash table.
- */
-MRB_BEGIN_DECL
-
-typedef uint32_t khint_t;
-typedef khint_t khiter_t;
-
-#ifndef KHASH_DEFAULT_SIZE
-# define KHASH_DEFAULT_SIZE 32
-#endif
-#define KHASH_MIN_SIZE 8
-
-#define UPPER_BOUND(x) ((x)>>2|(x)>>1)
-
-/* extern uint8_t __m[]; */
-
-/* mask for flags */
-static const uint8_t __m_empty[]  = {0x02, 0x08, 0x20, 0x80};
-static const uint8_t __m_del[]    = {0x01, 0x04, 0x10, 0x40};
-static const uint8_t __m_either[] = {0x03, 0x0c, 0x30, 0xc0};
-
-
-#define __ac_isempty(ed_flag, i) (ed_flag[(i)/4]&__m_empty[(i)%4])
-#define __ac_isdel(ed_flag, i) (ed_flag[(i)/4]&__m_del[(i)%4])
-#define __ac_iseither(ed_flag, i) (ed_flag[(i)/4]&__m_either[(i)%4])
-#define khash_power2(v) do { \
-  v--;\
-  v |= v >> 1;\
-  v |= v >> 2;\
-  v |= v >> 4;\
-  v |= v >> 8;\
-  v |= v >> 16;\
-  v++;\
-} while (0)
-#define khash_mask(h) ((h)->n_buckets-1)
-#define khash_upper_bound(h) (UPPER_BOUND((h)->n_buckets))
-
-/* declare struct kh_xxx and kh_xxx_funcs
-
-   name: hash name
-   khkey_t: key data type
-   khval_t: value data type
-   kh_is_map: (0: hash set / 1: hash map)
-*/
-#define KHASH_DECLARE(name, khkey_t, khval_t, kh_is_map)                \
-  typedef struct kh_##name {                                            \
-    khint_t n_buckets;                                                  \
-    khint_t size;                                                       \
-    khint_t n_occupied;                                                 \
-    uint8_t *ed_flags;                                                  \
-    khkey_t *keys;                                                      \
-    khval_t *vals;                                                      \
-  } kh_##name##_t;                                                      \
-  void kh_alloc_##name(mrb_state *mrb, kh_##name##_t *h);               \
-  kh_##name##_t *kh_init_##name##_size(mrb_state *mrb, khint_t size);   \
-  kh_##name##_t *kh_init_##name(mrb_state *mrb);                        \
-  void kh_destroy_##name(mrb_state *mrb, kh_##name##_t *h);             \
-  void kh_clear_##name(mrb_state *mrb, kh_##name##_t *h);               \
-  khint_t kh_get_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key);           \
-  khint_t kh_put_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret); \
-  void kh_resize_##name(mrb_state *mrb, kh_##name##_t *h, khint_t new_n_buckets); \
-  void kh_del_##name(mrb_state *mrb, kh_##name##_t *h, khint_t x);                \
-  kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h);
-
-static inline void
-kh_fill_flags(uint8_t *p, uint8_t c, size_t len)
-{
-  while (len-- > 0) {
-    *p++ = c;
-  }
-}
-
-/* define kh_xxx_funcs
-
-   name: hash name
-   khkey_t: key data type
-   khval_t: value data type
-   kh_is_map: (0: hash set / 1: hash map)
-   __hash_func: hash function
-   __hash_equal: hash comparation function
-*/
-#define KHASH_DEFINE(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
-  void kh_alloc_##name(mrb_state *mrb, kh_##name##_t *h)                \
-  {                                                                     \
-    khint_t sz = h->n_buckets;                                          \
-    size_t len = sizeof(khkey_t) + (kh_is_map ? sizeof(khval_t) : 0);   \
-    uint8_t *p = (uint8_t*)mrb_malloc(mrb, sizeof(uint8_t)*sz/4+len*sz); \
-    h->size = h->n_occupied = 0;                                        \
-    h->keys = (khkey_t *)p;                                             \
-    h->vals = kh_is_map ? (khval_t *)(p+sizeof(khkey_t)*sz) : NULL;     \
-    h->ed_flags = p+len*sz;                                             \
-    kh_fill_flags(h->ed_flags, 0xaa, sz/4);                             \
-  }                                                                     \
-  kh_##name##_t *kh_init_##name##_size(mrb_state *mrb, khint_t size) {  \
-    kh_##name##_t *h = (kh_##name##_t*)mrb_calloc(mrb, 1, sizeof(kh_##name##_t)); \
-    if (size < KHASH_MIN_SIZE)                                          \
-      size = KHASH_MIN_SIZE;                                            \
-    khash_power2(size);                                                 \
-    h->n_buckets = size;                                                \
-    kh_alloc_##name(mrb, h);                                            \
-    return h;                                                           \
-  }                                                                     \
-  kh_##name##_t *kh_init_##name(mrb_state *mrb) {                       \
-    return kh_init_##name##_size(mrb, KHASH_DEFAULT_SIZE);              \
-  }                                                                     \
-  void kh_destroy_##name(mrb_state *mrb, kh_##name##_t *h)              \
-  {                                                                     \
-    if (h) {                                                            \
-      mrb_free(mrb, h->keys);                                           \
-      mrb_free(mrb, h);                                                 \
-    }                                                                   \
-  }                                                                     \
-  void kh_clear_##name(mrb_state *mrb, kh_##name##_t *h)                \
-  {                                                                     \
-    (void)mrb;                                                          \
-    if (h && h->ed_flags) {                                             \
-      kh_fill_flags(h->ed_flags, 0xaa, h->n_buckets/4);                 \
-      h->size = h->n_occupied = 0;                                      \
-    }                                                                   \
-  }                                                                     \
-  khint_t kh_get_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key)  \
-  {                                                                     \
-    khint_t k = __hash_func(mrb,key) & khash_mask(h), step = 0;         \
-    (void)mrb;                                                          \
-    while (!__ac_isempty(h->ed_flags, k)) {                             \
-      if (!__ac_isdel(h->ed_flags, k)) {                                \
-        if (__hash_equal(mrb,h->keys[k], key)) return k;                \
-      }                                                                 \
-      k = (k+(++step)) & khash_mask(h);                                 \
-    }                                                                   \
-    return kh_end(h);                                                   \
-  }                                                                     \
-  void kh_resize_##name(mrb_state *mrb, kh_##name##_t *h, khint_t new_n_buckets) \
-  {                                                                     \
-    if (new_n_buckets < KHASH_MIN_SIZE)                                 \
-      new_n_buckets = KHASH_MIN_SIZE;                                   \
-    khash_power2(new_n_buckets);                                        \
-    {                                                                   \
-      kh_##name##_t hh;                                                 \
-      uint8_t *old_ed_flags = h->ed_flags;                              \
-      khkey_t *old_keys = h->keys;                                      \
-      khval_t *old_vals = h->vals;                                      \
-      khint_t old_n_buckets = h->n_buckets;                             \
-      khint_t i;                                                        \
-      hh.n_buckets = new_n_buckets;                                     \
-      kh_alloc_##name(mrb, &hh);                                        \
-      /* relocate */                                                    \
-      for (i=0 ; i<old_n_buckets ; i++) {                               \
-        if (!__ac_iseither(old_ed_flags, i)) {                          \
-          khint_t k = kh_put_##name(mrb, &hh, old_keys[i], NULL);       \
-          if (kh_is_map) kh_value(&hh,k) = old_vals[i];                 \
-        }                                                               \
-      }                                                                 \
-      /* copy hh to h */                                                \
-      *h = hh;                                                          \
-      mrb_free(mrb, old_keys);                                          \
-    }                                                                   \
-  }                                                                     \
-  khint_t kh_put_##name(mrb_state *mrb, kh_##name##_t *h, khkey_t key, int *ret) \
-  {                                                                     \
-    khint_t k, del_k, step = 0;                                         \
-    if (h->n_occupied >= khash_upper_bound(h)) {                        \
-      kh_resize_##name(mrb, h, h->n_buckets*2);                         \
-    }                                                                   \
-    k = __hash_func(mrb,key) & khash_mask(h);                           \
-    del_k = kh_end(h);                                                  \
-    while (!__ac_isempty(h->ed_flags, k)) {                             \
-      if (!__ac_isdel(h->ed_flags, k)) {                                \
-        if (__hash_equal(mrb,h->keys[k], key)) {                        \
-          if (ret) *ret = 0;                                            \
-          return k;                                                     \
-        }                                                               \
-      }                                                                 \
-      else if (del_k == kh_end(h)) {                                    \
-        del_k = k;                                                      \
-      }                                                                 \
-      k = (k+(++step)) & khash_mask(h);                                 \
-    }                                                                   \
-    if (del_k != kh_end(h)) {                                           \
-      /* put at del */                                                  \
-      h->keys[del_k] = key;                                             \
-      h->ed_flags[del_k/4] &= ~__m_del[del_k%4];                        \
-      h->size++;                                                        \
-      if (ret) *ret = 2;                                                \
-      return del_k;                                                     \
-    }                                                                   \
-    else {                                                              \
-      /* put at empty */                                                \
-      h->keys[k] = key;                                                 \
-      h->ed_flags[k/4] &= ~__m_empty[k%4];                              \
-      h->size++;                                                        \
-      h->n_occupied++;                                                  \
-      if (ret) *ret = 1;                                                \
-      return k;                                                         \
-    }                                                                   \
-  }                                                                     \
-  void kh_del_##name(mrb_state *mrb, kh_##name##_t *h, khint_t x)       \
-  {                                                                     \
-    (void)mrb;                                                          \
-    mrb_assert(x != h->n_buckets && !__ac_iseither(h->ed_flags, x));    \
-    h->ed_flags[x/4] |= __m_del[x%4];                                   \
-    h->size--;                                                          \
-  }                                                                     \
-  kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h)       \
-  {                                                                     \
-    kh_##name##_t *h2;                                                  \
-    khiter_t k, k2;                                                     \
-                                                                        \
-    h2 = kh_init_##name(mrb);                                           \
-    for (k = kh_begin(h); k != kh_end(h); k++) {                        \
-      if (kh_exist(h, k)) {                                             \
-        k2 = kh_put_##name(mrb, h2, kh_key(h, k), NULL);                \
-        if (kh_is_map) kh_value(h2, k2) = kh_value(h, k);               \
-      }                                                                 \
-    }                                                                   \
-    return h2;                                                          \
-  }
-
-
-#define khash_t(name) kh_##name##_t
-
-#define kh_init_size(name,mrb,size) kh_init_##name##_size(mrb,size)
-#define kh_init(name,mrb) kh_init_##name(mrb)
-#define kh_destroy(name, mrb, h) kh_destroy_##name(mrb, h)
-#define kh_clear(name, mrb, h) kh_clear_##name(mrb, h)
-#define kh_resize(name, mrb, h, s) kh_resize_##name(mrb, h, s)
-#define kh_put(name, mrb, h, k) kh_put_##name(mrb, h, k, NULL)
-#define kh_put2(name, mrb, h, k, r) kh_put_##name(mrb, h, k, r)
-#define kh_get(name, mrb, h, k) kh_get_##name(mrb, h, k)
-#define kh_del(name, mrb, h, k) kh_del_##name(mrb, h, k)
-#define kh_copy(name, mrb, h) kh_copy_##name(mrb, h)
-
-#define kh_exist(h, x) (!__ac_iseither((h)->ed_flags, (x)))
-#define kh_key(h, x) ((h)->keys[x])
-#define kh_val(h, x) ((h)->vals[x])
-#define kh_value(h, x) ((h)->vals[x])
-#define kh_begin(h) (khint_t)(0)
-#define kh_end(h) ((h)->n_buckets)
-#define kh_size(h) ((h)->size)
-#define kh_n_buckets(h) ((h)->n_buckets)
-
-#define kh_int_hash_func(mrb,key) (khint_t)((key)^((key)<<2)^((key)>>2))
-#define kh_int_hash_equal(mrb,a, b) (a == b)
-#define kh_int64_hash_func(mrb,key) (khint_t)((key)>>33^(key)^(key)<<11)
-#define kh_int64_hash_equal(mrb,a, b) (a == b)
-static inline khint_t __ac_X31_hash_string(const char *s)
-{
-    khint_t h = *s;
-    if (h) for (++s ; *s; ++s) h = (h << 5) - h + *s;
-    return h;
-}
-#define kh_str_hash_func(mrb,key) __ac_X31_hash_string(key)
-#define kh_str_hash_equal(mrb,a, b) (strcmp(a, b) == 0)
-
-typedef const char *kh_cstr_t;
-
-MRB_END_DECL
-
-#endif  /* MRUBY_KHASH_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/numeric.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/numeric.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/numeric.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/numeric.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-/*
-** mruby/numeric.h - Numeric, Integer, Float, Fixnum class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_NUMERIC_H
-#define MRUBY_NUMERIC_H
-
-#include "common.h"
-
-/**
- * Numeric class and it's sub-classes.
- *
- * Integer, Float and Fixnum
- */
-MRB_BEGIN_DECL
-
-#define TYPED_POSFIXABLE(f,t) ((f) <= (t)MRB_INT_MAX)
-#define TYPED_NEGFIXABLE(f,t) ((f) >= (t)MRB_INT_MIN)
-#define TYPED_FIXABLE(f,t) (TYPED_POSFIXABLE(f,t) && TYPED_NEGFIXABLE(f,t))
-#define POSFIXABLE(f) TYPED_POSFIXABLE(f,mrb_int)
-#define NEGFIXABLE(f) TYPED_NEGFIXABLE(f,mrb_int)
-#define FIXABLE(f) TYPED_FIXABLE(f,mrb_int)
-#define FIXABLE_FLOAT(f) TYPED_FIXABLE(f,double)
-
-MRB_API mrb_value mrb_flo_to_fixnum(mrb_state *mrb, mrb_value val);
-MRB_API mrb_value mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, int base);
-/* ArgumentError if format string doesn't match /%(\.[0-9]+)?[aAeEfFgG]/ */
-MRB_API mrb_value mrb_float_to_str(mrb_state *mrb, mrb_value x, const char *fmt);
-MRB_API mrb_float mrb_to_flo(mrb_state *mrb, mrb_value x);
-
-mrb_value mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y);
-mrb_value mrb_fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y);
-mrb_value mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y);
-mrb_value mrb_num_div(mrb_state *mrb, mrb_value x, mrb_value y);
-
-#ifndef __has_builtin
-  #define __has_builtin(x) 0
-#endif
-
-#if (defined(__GNUC__) && __GNUC__ >= 5) ||   \
-    (__has_builtin(__builtin_add_overflow) && \
-     __has_builtin(__builtin_sub_overflow) && \
-     __has_builtin(__builtin_mul_overflow))
-# define MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
-#endif
-
-/*
-// Clang 3.8 and 3.9 have problem compiling mruby in 32-bit mode, when MRB_INT64 is set
-// because of missing __mulodi4 and similar functions in its runtime. We need to use custom
-// implementation for them.
-*/
-#ifdef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
-#if defined(__clang__) && (__clang_major__ == 3) && (__clang_minor__ >= 8) && \
-    defined(MRB_32BIT) && defined(MRB_INT64)
-#undef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
-#endif
-#endif
-
-#ifdef MRB_HAVE_TYPE_GENERIC_CHECKED_ARITHMETIC_BUILTINS
-
-#ifndef MRB_WORD_BOXING
-# define WBCHK(x) 0
-#else
-# define WBCHK(x) !FIXABLE(x)
-#endif
-
-static inline mrb_bool
-mrb_int_add_overflow(mrb_int augend, mrb_int addend, mrb_int *sum)
-{
-  return __builtin_add_overflow(augend, addend, sum) || WBCHK(*sum);
-}
-
-static inline mrb_bool
-mrb_int_sub_overflow(mrb_int minuend, mrb_int subtrahend, mrb_int *difference)
-{
-  return __builtin_sub_overflow(minuend, subtrahend, difference) || WBCHK(*difference);
-}
-
-static inline mrb_bool
-mrb_int_mul_overflow(mrb_int multiplier, mrb_int multiplicand, mrb_int *product)
-{
-  return __builtin_mul_overflow(multiplier, multiplicand, product) || WBCHK(*product);
-}
-
-#undef WBCHK
-
-#else
-
-#define MRB_UINT_MAKE2(n) uint ## n ## _t
-#define MRB_UINT_MAKE(n) MRB_UINT_MAKE2(n)
-#define mrb_uint MRB_UINT_MAKE(MRB_INT_BIT)
-
-#define MRB_INT_OVERFLOW_MASK ((mrb_uint)1 << (MRB_INT_BIT - 1 - MRB_FIXNUM_SHIFT))
-
-static inline mrb_bool
-mrb_int_add_overflow(mrb_int augend, mrb_int addend, mrb_int *sum)
-{
-  mrb_uint x = (mrb_uint)augend;
-  mrb_uint y = (mrb_uint)addend;
-  mrb_uint z = (mrb_uint)(x + y);
-  *sum = (mrb_int)z;
-  return !!(((x ^ z) & (y ^ z)) & MRB_INT_OVERFLOW_MASK);
-}
-
-static inline mrb_bool
-mrb_int_sub_overflow(mrb_int minuend, mrb_int subtrahend, mrb_int *difference)
-{
-  mrb_uint x = (mrb_uint)minuend;
-  mrb_uint y = (mrb_uint)subtrahend;
-  mrb_uint z = (mrb_uint)(x - y);
-  *difference = (mrb_int)z;
-  return !!(((x ^ z) & (~y ^ z)) & MRB_INT_OVERFLOW_MASK);
-}
-
-static inline mrb_bool
-mrb_int_mul_overflow(mrb_int multiplier, mrb_int multiplicand, mrb_int *product)
-{
-#if MRB_INT_BIT == 32
-  int64_t n = (int64_t)multiplier * multiplicand;
-  *product = (mrb_int)n;
-  return !FIXABLE(n);
-#else
-  if (multiplier > 0) {
-    if (multiplicand > 0) {
-      if (multiplier > MRB_INT_MAX / multiplicand) return TRUE;
-    }
-    else {
-      if (multiplicand < MRB_INT_MAX / multiplier) return TRUE;
-    }
-  }
-  else {
-    if (multiplicand > 0) {
-      if (multiplier < MRB_INT_MAX / multiplicand) return TRUE;
-    }
-    else {
-      if (multiplier != 0 && multiplicand < MRB_INT_MAX / multiplier) return TRUE;
-    }
-  }
-  *product = multiplier * multiplicand;
-  return FALSE;
-#endif
-}
-
-#undef MRB_INT_OVERFLOW_MASK
-#undef mrb_uint
-#undef MRB_UINT_MAKE
-#undef MRB_UINT_MAKE2
-
-#endif
-
-MRB_END_DECL
-
-#endif  /* MRUBY_NUMERIC_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/object.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/object.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/object.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/object.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
-** mruby/object.h - mruby object definition
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_OBJECT_H
-#define MRUBY_OBJECT_H
-
-#define MRB_OBJECT_HEADER \
-  enum mrb_vtype tt:8;\
-  uint32_t color:3;\
-  uint32_t flags:21;\
-  struct RClass *c;\
-  struct RBasic *gcnext
-
-#define MRB_FLAG_TEST(obj, flag) ((obj)->flags & flag)
-
-
-struct RBasic {
-  MRB_OBJECT_HEADER;
-};
-#define mrb_basic_ptr(v) ((struct RBasic*)(mrb_ptr(v)))
-
-#define MRB_FROZEN_P(o) ((o)->flags & MRB_FLAG_IS_FROZEN)
-#define MRB_SET_FROZEN_FLAG(o) ((o)->flags |= MRB_FLAG_IS_FROZEN)
-#define MRB_UNSET_FROZEN_FLAG(o) ((o)->flags &= ~MRB_FLAG_IS_FROZEN)
-
-struct RObject {
-  MRB_OBJECT_HEADER;
-  struct iv_tbl *iv;
-};
-#define mrb_obj_ptr(v)   ((struct RObject*)(mrb_ptr(v)))
-
-#define mrb_immediate_p(x) (mrb_type(x) < MRB_TT_HAS_BASIC)
-#define mrb_special_const_p(x) mrb_immediate_p(x)
-
-struct RFiber {
-  MRB_OBJECT_HEADER;
-  struct mrb_context *cxt;
-};
-
-#endif  /* MRUBY_OBJECT_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/opcode.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/opcode.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/opcode.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/opcode.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/*
-** mruby/opcode.h - RiteVM operation codes
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_OPCODE_H
-#define MRUBY_OPCODE_H
-
-#define MAXARG_Bx        (0xffff)
-#define MAXARG_sBx       (MAXARG_Bx>>1)         /* 'sBx' is signed */
-
-/* instructions: packed 32 bit      */
-/* -------------------------------  */
-/*     A:B:C:OP = 9: 9: 7: 7        */
-/*      A:Bx:OP =    9:16: 7        */
-/*        Ax:OP =      25: 7        */
-/*   A:Bz:Cz:OP = 9:14: 2: 7        */
-
-#define GET_OPCODE(i)            ((int)(((mrb_code)(i)) & 0x7f))
-#define GETARG_A(i)              ((int)((((mrb_code)(i)) >> 23) & 0x1ff))
-#define GETARG_B(i)              ((int)((((mrb_code)(i)) >> 14) & 0x1ff))
-#define GETARG_C(i)              ((int)((((mrb_code)(i)) >>  7) & 0x7f))
-#define GETARG_Bx(i)             ((int)((((mrb_code)(i)) >>  7) & 0xffff))
-#define GETARG_sBx(i)            ((int)(GETARG_Bx(i)-MAXARG_sBx))
-#define GETARG_Ax(i)             ((int32_t)((((mrb_code)(i)) >>  7) & 0x1ffffff))
-#define GETARG_UNPACK_b(i,n1,n2) ((int)((((mrb_code)(i)) >> (7+(n2))) & (((1<<(n1))-1))))
-#define GETARG_UNPACK_c(i,n1,n2) ((int)((((mrb_code)(i)) >> 7) & (((1<<(n2))-1))))
-#define GETARG_b(i)              GETARG_UNPACK_b(i,14,2)
-#define GETARG_c(i)              GETARG_UNPACK_c(i,14,2)
-
-#define MKOPCODE(op)          ((op) & 0x7f)
-#define MKARG_A(c)            ((mrb_code)((c) & 0x1ff) << 23)
-#define MKARG_B(c)            ((mrb_code)((c) & 0x1ff) << 14)
-#define MKARG_C(c)            (((c) & 0x7f) <<  7)
-#define MKARG_Bx(v)           ((mrb_code)((v) & 0xffff) << 7)
-#define MKARG_sBx(v)          MKARG_Bx((v)+MAXARG_sBx)
-#define MKARG_Ax(v)           ((mrb_code)((v) & 0x1ffffff) << 7)
-#define MKARG_PACK(b,n1,c,n2) ((((b) & ((1<<n1)-1)) << (7+n2))|(((c) & ((1<<n2)-1)) << 7))
-#define MKARG_bc(b,c)         MKARG_PACK(b,14,c,2)
-
-#define MKOP_A(op,a)        (MKOPCODE(op)|MKARG_A(a))
-#define MKOP_AB(op,a,b)     (MKOP_A(op,a)|MKARG_B(b))
-#define MKOP_ABC(op,a,b,c)  (MKOP_AB(op,a,b)|MKARG_C(c))
-#define MKOP_ABx(op,a,bx)   (MKOP_A(op,a)|MKARG_Bx(bx))
-#define MKOP_Bx(op,bx)      (MKOPCODE(op)|MKARG_Bx(bx))
-#define MKOP_sBx(op,sbx)    (MKOPCODE(op)|MKARG_sBx(sbx))
-#define MKOP_AsBx(op,a,sbx) (MKOP_A(op,a)|MKARG_sBx(sbx))
-#define MKOP_Ax(op,ax)      (MKOPCODE(op)|MKARG_Ax(ax))
-#define MKOP_Abc(op,a,b,c)  (MKOP_A(op,a)|MKARG_bc(b,c))
-
-enum {
-  /*-----------------------------------------------------------------------
-  operation code  operand description
-  ------------------------------------------------------------------------*/
-  OP_NOP=0,/*                                                             */
-  OP_MOVE,/*      A B     R(A) := R(B)                                    */
-  OP_LOADL,/*     A Bx    R(A) := Pool(Bx)                                */
-  OP_LOADI,/*     A sBx   R(A) := sBx                                     */
-  OP_LOADSYM,/*   A Bx    R(A) := Syms(Bx)                                */
-  OP_LOADNIL,/*   A       R(A) := nil                                     */
-  OP_LOADSELF,/*  A       R(A) := self                                    */
-  OP_LOADT,/*     A       R(A) := true                                    */
-  OP_LOADF,/*     A       R(A) := false                                   */
-
-  OP_GETGLOBAL,/* A Bx    R(A) := getglobal(Syms(Bx))                     */
-  OP_SETGLOBAL,/* A Bx    setglobal(Syms(Bx), R(A))                       */
-  OP_GETSPECIAL,/*A Bx    R(A) := Special[Bx]                             */
-  OP_SETSPECIAL,/*A Bx    Special[Bx] := R(A)                             */
-  OP_GETIV,/*     A Bx    R(A) := ivget(Syms(Bx))                         */
-  OP_SETIV,/*     A Bx    ivset(Syms(Bx),R(A))                            */
-  OP_GETCV,/*     A Bx    R(A) := cvget(Syms(Bx))                         */
-  OP_SETCV,/*     A Bx    cvset(Syms(Bx),R(A))                            */
-  OP_GETCONST,/*  A Bx    R(A) := constget(Syms(Bx))                      */
-  OP_SETCONST,/*  A Bx    constset(Syms(Bx),R(A))                         */
-  OP_GETMCNST,/*  A Bx    R(A) := R(A)::Syms(Bx)                          */
-  OP_SETMCNST,/*  A Bx    R(A+1)::Syms(Bx) := R(A)                        */
-  OP_GETUPVAR,/*  A B C   R(A) := uvget(B,C)                              */
-  OP_SETUPVAR,/*  A B C   uvset(B,C,R(A))                                 */
-
-  OP_JMP,/*       sBx     pc+=sBx                                         */
-  OP_JMPIF,/*     A sBx   if R(A) pc+=sBx                                 */
-  OP_JMPNOT,/*    A sBx   if !R(A) pc+=sBx                                */
-  OP_ONERR,/*     sBx     rescue_push(pc+sBx)                             */
-  OP_RESCUE,/*    A B C   if A (if C exc=R(A) else R(A) := exc);
-                          if B R(B) := exc.isa?(R(B)); clear(exc)         */
-  OP_POPERR,/*    A       A.times{rescue_pop()}                           */
-  OP_RAISE,/*     A       raise(R(A))                                     */
-  OP_EPUSH,/*     Bx      ensure_push(SEQ[Bx])                            */
-  OP_EPOP,/*      A       A.times{ensure_pop().call}                      */
-
-  OP_SEND,/*      A B C   R(A) := call(R(A),Syms(B),R(A+1),...,R(A+C))    */
-  OP_SENDB,/*     A B C   R(A) := call(R(A),Syms(B),R(A+1),...,R(A+C),&R(A+C+1))*/
-  OP_FSEND,/*     A B C   R(A) := fcall(R(A),Syms(B),R(A+1),...,R(A+C-1)) */
-  OP_CALL,/*      A       R(A) := self.call(frame.argc, frame.argv)       */
-  OP_SUPER,/*     A C     R(A) := super(R(A+1),... ,R(A+C+1))             */
-  OP_ARGARY,/*    A Bx    R(A) := argument array (16=6:1:5:4)             */
-  OP_ENTER,/*     Ax      arg setup according to flags (23=5:5:1:5:5:1:1) */
-  OP_KARG,/*      A B C   R(A) := kdict[Syms(B)]; if C kdict.rm(Syms(B))  */
-  OP_KDICT,/*     A C     R(A) := kdict                                   */
-
-  OP_RETURN,/*    A B     return R(A) (B=normal,in-block return/break)    */
-  OP_TAILCALL,/*  A B C   return call(R(A),Syms(B),*R(C))                 */
-  OP_BLKPUSH,/*   A Bx    R(A) := block (16=6:1:5:4)                      */
-
-  OP_ADD,/*       A B C   R(A) := R(A)+R(A+1) (Syms[B]=:+,C=1)            */
-  OP_ADDI,/*      A B C   R(A) := R(A)+C (Syms[B]=:+)                     */
-  OP_SUB,/*       A B C   R(A) := R(A)-R(A+1) (Syms[B]=:-,C=1)            */
-  OP_SUBI,/*      A B C   R(A) := R(A)-C (Syms[B]=:-)                     */
-  OP_MUL,/*       A B C   R(A) := R(A)*R(A+1) (Syms[B]=:*,C=1)            */
-  OP_DIV,/*       A B C   R(A) := R(A)/R(A+1) (Syms[B]=:/,C=1)            */
-  OP_EQ,/*        A B C   R(A) := R(A)==R(A+1) (Syms[B]=:==,C=1)          */
-  OP_LT,/*        A B C   R(A) := R(A)<R(A+1)  (Syms[B]=:<,C=1)           */
-  OP_LE,/*        A B C   R(A) := R(A)<=R(A+1) (Syms[B]=:<=,C=1)          */
-  OP_GT,/*        A B C   R(A) := R(A)>R(A+1)  (Syms[B]=:>,C=1)           */
-  OP_GE,/*        A B C   R(A) := R(A)>=R(A+1) (Syms[B]=:>=,C=1)          */
-
-  OP_ARRAY,/*     A B C   R(A) := ary_new(R(B),R(B+1)..R(B+C))            */
-  OP_ARYCAT,/*    A B     ary_cat(R(A),R(B))                              */
-  OP_ARYPUSH,/*   A B     ary_push(R(A),R(B))                             */
-  OP_AREF,/*      A B C   R(A) := R(B)[C]                                 */
-  OP_ASET,/*      A B C   R(B)[C] := R(A)                                 */
-  OP_APOST,/*     A B C   *R(A),R(A+1)..R(A+C) := R(A)                    */
-
-  OP_STRING,/*    A Bx    R(A) := str_dup(Lit(Bx))                        */
-  OP_STRCAT,/*    A B     str_cat(R(A),R(B))                              */
-
-  OP_HASH,/*      A B C   R(A) := hash_new(R(B),R(B+1)..R(B+C))           */
-  OP_LAMBDA,/*    A Bz Cz R(A) := lambda(SEQ[Bz],Cz)                      */
-  OP_RANGE,/*     A B C   R(A) := range_new(R(B),R(B+1),C)                */
-
-  OP_OCLASS,/*    A       R(A) := ::Object                                */
-  OP_CLASS,/*     A B     R(A) := newclass(R(A),Syms(B),R(A+1))           */
-  OP_MODULE,/*    A B     R(A) := newmodule(R(A),Syms(B))                 */
-  OP_EXEC,/*      A Bx    R(A) := blockexec(R(A),SEQ[Bx])                 */
-  OP_METHOD,/*    A B     R(A).newmethod(Syms(B),R(A+1))                  */
-  OP_SCLASS,/*    A B     R(A) := R(B).singleton_class                    */
-  OP_TCLASS,/*    A       R(A) := target_class                            */
-
-  OP_DEBUG,/*     A B C   print R(A),R(B),R(C)                            */
-  OP_STOP,/*              stop VM                                         */
-  OP_ERR,/*       Bx      raise RuntimeError with message Lit(Bx)         */
-
-  OP_RSVD1,/*             reserved instruction #1                         */
-  OP_RSVD2,/*             reserved instruction #2                         */
-  OP_RSVD3,/*             reserved instruction #3                         */
-  OP_RSVD4,/*             reserved instruction #4                         */
-  OP_RSVD5,/*             reserved instruction #5                         */
-};
-
-#define OP_L_STRICT  1
-#define OP_L_CAPTURE 2
-#define OP_L_METHOD  OP_L_STRICT
-#define OP_L_LAMBDA  (OP_L_STRICT|OP_L_CAPTURE)
-#define OP_L_BLOCK   OP_L_CAPTURE
-
-#define OP_R_NORMAL 0
-#define OP_R_BREAK  1
-#define OP_R_RETURN 2
-
-#endif  /* MRUBY_OPCODE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/proc.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/proc.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/proc.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/proc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/*
-** mruby/proc.h - Proc class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_PROC_H
-#define MRUBY_PROC_H
-
-#include "common.h"
-#include <mruby/irep.h>
-
-/**
- * Proc class
- */
-MRB_BEGIN_DECL
-
-struct REnv {
-  MRB_OBJECT_HEADER;
-  mrb_value *stack;
-  ptrdiff_t cioff;
-  union {
-    mrb_sym mid;
-    struct mrb_context *c;
-  } cxt;
-};
-
-#define MRB_SET_ENV_STACK_LEN(e,len) (e)->flags = (unsigned int)(len)
-#define MRB_ENV_STACK_LEN(e) ((mrb_int)(e)->flags)
-#define MRB_ENV_UNSHARE_STACK(e) ((e)->cioff = -1)
-#define MRB_ENV_STACK_SHARED_P(e) ((e)->cioff >= 0)
-
-MRB_API void mrb_env_unshare(mrb_state*, struct REnv*);
-
-struct RProc {
-  MRB_OBJECT_HEADER;
-  union {
-    mrb_irep *irep;
-    mrb_func_t func;
-  } body;
-  struct RClass *target_class;
-  struct REnv *env;
-};
-
-/* aspec access */
-#define MRB_ASPEC_REQ(a)          (((a) >> 18) & 0x1f)
-#define MRB_ASPEC_OPT(a)          (((a) >> 13) & 0x1f)
-#define MRB_ASPEC_REST(a)         (((a) >> 12) & 0x1)
-#define MRB_ASPEC_POST(a)         (((a) >> 7) & 0x1f)
-#define MRB_ASPEC_KEY(a)          (((a) >> 2) & 0x1f)
-#define MRB_ASPEC_KDICT(a)        ((a) & (1<<1))
-#define MRB_ASPEC_BLOCK(a)        ((a) & 1)
-
-#define MRB_PROC_CFUNC 128
-#define MRB_PROC_CFUNC_P(p) (((p)->flags & MRB_PROC_CFUNC) != 0)
-#define MRB_PROC_STRICT 256
-#define MRB_PROC_STRICT_P(p) (((p)->flags & MRB_PROC_STRICT) != 0)
-#define MRB_PROC_ORPHAN 512
-#define MRB_PROC_ORPHAN_P(p) (((p)->flags & MRB_PROC_ORPHAN) != 0)
-
-#define mrb_proc_ptr(v)    ((struct RProc*)(mrb_ptr(v)))
-
-struct RProc *mrb_proc_new(mrb_state*, mrb_irep*);
-struct RProc *mrb_closure_new(mrb_state*, mrb_irep*);
-MRB_API struct RProc *mrb_proc_new_cfunc(mrb_state*, mrb_func_t);
-MRB_API struct RProc *mrb_closure_new_cfunc(mrb_state *mrb, mrb_func_t func, int nlocals);
-void mrb_proc_copy(struct RProc *a, struct RProc *b);
-
-/* implementation of #send method */
-MRB_API mrb_value mrb_f_send(mrb_state *mrb, mrb_value self);
-
-/* following functions are defined in mruby-proc-ext so please include it when using */
-MRB_API struct RProc *mrb_proc_new_cfunc_with_env(mrb_state*, mrb_func_t, mrb_int, const mrb_value*);
-MRB_API mrb_value mrb_proc_cfunc_env_get(mrb_state*, mrb_int);
-/* old name */
-#define mrb_cfunc_env_get(mrb, idx) mrb_proc_cfunc_env_get(mrb, idx)
-
-#include <mruby/khash.h>
-KHASH_DECLARE(mt, mrb_sym, struct RProc*, TRUE)
-
-MRB_END_DECL
-
-#endif  /* MRUBY_PROC_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/range.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/range.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/range.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/range.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/*
-** mruby/range.h - Range class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_RANGE_H
-#define MRUBY_RANGE_H
-
-#include "common.h"
-
-/**
- * Range class
- */
-MRB_BEGIN_DECL
-
-typedef struct mrb_range_edges {
-  mrb_value beg;
-  mrb_value end;
-} mrb_range_edges;
-
-struct RRange {
-  MRB_OBJECT_HEADER;
-  mrb_range_edges *edges;
-  mrb_bool excl : 1;
-};
-
-MRB_API struct RRange* mrb_range_ptr(mrb_state *mrb, mrb_value v);
-#define mrb_range_raw_ptr(v) ((struct RRange*)mrb_ptr(v))
-#define mrb_range_value(p)  mrb_obj_value((void*)(p))
-
-/*
- * Initializes a Range.
- *
- * If the third parameter is FALSE then it includes the last value in the range.
- * If the third parameter is TRUE then it excludes the last value in the range.
- *
- * @param start the beginning value.
- * @param end the ending value.
- * @param exclude represents the inclusion or exclusion of the last value.
- */
-MRB_API mrb_value mrb_range_new(mrb_state *mrb, mrb_value start, mrb_value end, mrb_bool exclude);
-
-MRB_API mrb_int mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len, mrb_bool trunc);
-mrb_value mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, const mrb_value *argv, mrb_value (*func)(mrb_state*, mrb_value, mrb_int));
-
-MRB_END_DECL
-
-#endif  /* MRUBY_RANGE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/re.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/re.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/re.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/re.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-/*
-** mruby/re.h - Regexp class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_RE_H
-#define MRUBY_RE_H
-
-MRB_BEGIN_DECL
-
-#define REGEXP_CLASS          "Regexp"
-
-MRB_END_DECL
-
-#endif  /* RE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/string.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/string.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/string.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/string.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,422 +0,0 @@
-/*
-** mruby/string.h - String class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_STRING_H
-#define MRUBY_STRING_H
-
-#include "common.h"
-
-/**
- * String class
- */
-MRB_BEGIN_DECL
-
-extern const char mrb_digitmap[];
-
-#define RSTRING_EMBED_LEN_MAX ((mrb_int)(sizeof(void*) * 3 - 1))
-
-struct RString {
-  MRB_OBJECT_HEADER;
-  union {
-    struct {
-      mrb_int len;
-      union {
-        mrb_int capa;
-        struct mrb_shared_string *shared;
-      } aux;
-      char *ptr;
-    } heap;
-    char ary[RSTRING_EMBED_LEN_MAX + 1];
-  } as;
-};
-
-#define RSTR_EMBED_P(s) ((s)->flags & MRB_STR_EMBED)
-#define RSTR_SET_EMBED_FLAG(s) ((s)->flags |= MRB_STR_EMBED)
-#define RSTR_UNSET_EMBED_FLAG(s) ((s)->flags &= ~(MRB_STR_EMBED|MRB_STR_EMBED_LEN_MASK))
-#define RSTR_SET_EMBED_LEN(s, n) do {\
-  size_t tmp_n = (n);\
-  s->flags &= ~MRB_STR_EMBED_LEN_MASK;\
-  s->flags |= (tmp_n) << MRB_STR_EMBED_LEN_SHIFT;\
-} while (0)
-#define RSTR_SET_LEN(s, n) do {\
-  if (RSTR_EMBED_P(s)) {\
-    RSTR_SET_EMBED_LEN((s),(n));\
-  }\
-  else {\
-    s->as.heap.len = (mrb_int)(n);\
-  }\
-} while (0)
-#define RSTR_EMBED_LEN(s)\
-  (mrb_int)(((s)->flags & MRB_STR_EMBED_LEN_MASK) >> MRB_STR_EMBED_LEN_SHIFT)
-#define RSTR_PTR(s) ((RSTR_EMBED_P(s)) ? (s)->as.ary : (s)->as.heap.ptr)
-#define RSTR_LEN(s) ((RSTR_EMBED_P(s)) ? RSTR_EMBED_LEN(s) : (s)->as.heap.len)
-#define RSTR_CAPA(s) (RSTR_EMBED_P(s) ? RSTRING_EMBED_LEN_MAX : (s)->as.heap.aux.capa)
-
-#define RSTR_SHARED_P(s) ((s)->flags & MRB_STR_SHARED)
-#define RSTR_SET_SHARED_FLAG(s) ((s)->flags |= MRB_STR_SHARED)
-#define RSTR_UNSET_SHARED_FLAG(s) ((s)->flags &= ~MRB_STR_SHARED)
-
-#define RSTR_NOFREE_P(s) ((s)->flags & MRB_STR_NOFREE)
-#define RSTR_SET_NOFREE_FLAG(s) ((s)->flags |= MRB_STR_NOFREE)
-#define RSTR_UNSET_NOFREE_FLAG(s) ((s)->flags &= ~MRB_STR_NOFREE)
-
-/*
- * Returns a pointer from a Ruby string
- */
-#define mrb_str_ptr(s)       ((struct RString*)(mrb_ptr(s)))
-#define RSTRING(s)           mrb_str_ptr(s)
-#define RSTRING_PTR(s)       RSTR_PTR(RSTRING(s))
-#define RSTRING_EMBED_LEN(s) RSTR_EMBED_LEN(RSTRING(s))
-#define RSTRING_LEN(s)       RSTR_LEN(RSTRING(s))
-#define RSTRING_CAPA(s)      RSTR_CAPA(RSTRING(s))
-#define RSTRING_END(s)       (RSTRING_PTR(s) + RSTRING_LEN(s))
-MRB_API mrb_int mrb_str_strlen(mrb_state*, struct RString*);
-
-#define MRB_STR_SHARED    1
-#define MRB_STR_NOFREE    2
-#define MRB_STR_NO_UTF    8
-#define MRB_STR_EMBED    16
-#define MRB_STR_EMBED_LEN_MASK 0x3e0
-#define MRB_STR_EMBED_LEN_SHIFT 5
-
-void mrb_gc_free_str(mrb_state*, struct RString*);
-MRB_API void mrb_str_modify(mrb_state*, struct RString*);
-/*
- * Appends self to other. Returns self as a concatnated string.
- *
- *
- *  Example:
- *
- *     !!!c
- *     int
- *     main(int argc,
- *          char **argv)
- *     {
- *       // Variable declarations.
- *       mrb_value str1;
- *       mrb_value str2;
- *
- *       mrb_state *mrb = mrb_open();
- *       if (!mrb)
- *       {
- *          // handle error
- *       }
- *
- *       // Creates new Ruby strings.
- *       str1 = mrb_str_new_lit(mrb, "abc");
- *       str2 = mrb_str_new_lit(mrb, "def");
- *
- *       // Concatnates str2 to str1.
- *       mrb_str_concat(mrb, str1, str2);
- *
- *      // Prints new Concatnated Ruby string.
- *      mrb_p(mrb, str1);
- *
- *      mrb_close(mrb);
- *      return 0;
- *    }
- *
- *
- *  Result:
- *
- *     => "abcdef"
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] self String to concatenate.
- * @param [mrb_value] other String to append to self.
- * @return [mrb_value] Returns a new String appending other to self.
- */
-MRB_API void mrb_str_concat(mrb_state*, mrb_value, mrb_value);
-
-/*
- * Adds two strings together.
- *
- *
- *  Example:
- *
- *     !!!c
- *     int
- *     main(int argc,
- *          char **argv)
- *     {
- *       // Variable declarations.
- *       mrb_value a;
- *       mrb_value b;
- *       mrb_value c;
- *
- *       mrb_state *mrb = mrb_open();
- *       if (!mrb)
- *       {
- *          // handle error
- *       }
- *
- *       // Creates two Ruby strings from the passed in C strings.
- *       a = mrb_str_new_lit(mrb, "abc");
- *       b = mrb_str_new_lit(mrb, "def");
- *
- *       // Prints both C strings.
- *       mrb_p(mrb, a);
- *       mrb_p(mrb, b);
- *
- *       // Concatnates both Ruby strings.
- *       c = mrb_str_plus(mrb, a, b);
- *
- *      // Prints new Concatnated Ruby string.
- *      mrb_p(mrb, c);
- *
- *      mrb_close(mrb);
- *      return 0;
- *    }
- *
- *
- *  Result:
- *
- *     => "abc"  # First string
- *     => "def"  # Second string
- *     => "abcdef" # First & Second concatnated.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] a First string to concatenate.
- * @param [mrb_value] b Second string to concatenate.
- * @return [mrb_value] Returns a new String containing a concatenated to b.
- */
-MRB_API mrb_value mrb_str_plus(mrb_state*, mrb_value, mrb_value);
-
-/*
- * Converts pointer into a Ruby string.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [void*] p The pointer to convert to Ruby string.
- * @return [mrb_value] Returns a new Ruby String.
- */
-MRB_API mrb_value mrb_ptr_to_str(mrb_state *, void*);
-
-/*
- * Returns an object as a Ruby string.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] obj An object to return as a Ruby string.
- * @return [mrb_value] An object as a Ruby string.
- */
-MRB_API mrb_value mrb_obj_as_string(mrb_state *mrb, mrb_value obj);
-
-/*
- * Resizes the string's length. Returns the amount of characters
- * in the specified by len.
- *
- * Example:
- *
- *     !!!c
- *     int
- *     main(int argc,
- *          char **argv)
- *     {
- *         // Variable declaration.
- *         mrb_value str;
- *
- *         mrb_state *mrb = mrb_open();
- *         if (!mrb)
- *         {
- *            // handle error
- *         }
- *         // Creates a new string.
- *         str = mrb_str_new_lit(mrb, "Hello, world!");
- *         // Returns 5 characters of
- *         mrb_str_resize(mrb, str, 5);
- *         mrb_p(mrb, str);
- *
- *         mrb_close(mrb);
- *         return 0;
- *      }
- *
- * Result:
- *
- *     => "Hello"
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str The Ruby string to resize.
- * @param [mrb_value] len The length.
- * @return [mrb_value] An object as a Ruby string.
- */
-MRB_API mrb_value mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len);
-
-/*
- * Returns a sub string.
- *
- *  Example:
- *
- *     !!!c
- *     int
- *     main(int argc,
- *     char const **argv)
- *     {
- *       // Variable declarations.
- *       mrb_value str1;
- *       mrb_value str2;
- *
- *       mrb_state *mrb = mrb_open();
- *       if (!mrb)
- *       {
- *         // handle error
- *       }
- *       // Creates new string.
- *       str1 = mrb_str_new_lit(mrb, "Hello, world!");
- *       // Returns a sub-string within the range of 0..2
- *       str2 = mrb_str_substr(mrb, str1, 0, 2);
- *
- *       // Prints sub-string.
- *       mrb_p(mrb, str2);
- *
- *       mrb_close(mrb);
- *       return 0;
- *     }
- *
- *  Result:
- *
- *     => "He"
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str Ruby string.
- * @param [mrb_int] beg The beginning point of the sub-string.
- * @param [mrb_int] len The end point of the sub-string.
- * @return [mrb_value] An object as a Ruby sub-string.
- */
-MRB_API mrb_value mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
-
-/*
- * Returns a Ruby string type.
- *
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str Ruby string.
- * @return [mrb_value] A Ruby string.
- */
-MRB_API mrb_value mrb_string_type(mrb_state *mrb, mrb_value str);
-
-MRB_API mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str);
-MRB_API mrb_value mrb_str_buf_new(mrb_state *mrb, size_t capa);
-
-MRB_API const char *mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr);
-MRB_API const char *mrb_string_value_ptr(mrb_state *mrb, mrb_value str);
-/*
- * Returns the length of the Ruby string.
- *
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str Ruby string.
- * @return [mrb_int] The length of the passed in Ruby string.
- */
-MRB_API mrb_int mrb_string_value_len(mrb_state *mrb, mrb_value str);
-
-/*
- * Duplicates a string object.
- *
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str Ruby string.
- * @return [mrb_value] Duplicated Ruby string.
- */
-MRB_API mrb_value mrb_str_dup(mrb_state *mrb, mrb_value str);
-
-/*
- * Returns a symbol from a passed in Ruby string.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] self Ruby string.
- * @return [mrb_value] A symbol.
- */
-MRB_API mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self);
-
-MRB_API mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck);
-MRB_API double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck);
-
-/*
- * Returns a converted string type.
- */
-MRB_API mrb_value mrb_str_to_str(mrb_state *mrb, mrb_value str);
-
-/*
- * Returns true if the strings match and false if the strings don't match.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str1 Ruby string to compare.
- * @param [mrb_value] str2 Ruby string to compare.
- * @return [mrb_value] boolean value.
- */
-MRB_API mrb_bool mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2);
-
-/*
- * Returns a concated string comprised of a Ruby string and a C string.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str Ruby string.
- * @param [const char *] ptr A C string.
- * @param [size_t] len length of C string.
- * @return [mrb_value] A Ruby string.
- * @see mrb_str_cat_cstr
- */
-MRB_API mrb_value mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len);
-
-/*
- * Returns a concated string comprised of a Ruby string and a C string.
- *
- * @param [mrb_state] mrb The current mruby state.
- * @param [mrb_value] str Ruby string.
- * @param [const char *] ptr A C string.
- * @return [mrb_value] A Ruby string.
- * @see mrb_str_cat
- */
-MRB_API mrb_value mrb_str_cat_cstr(mrb_state *mrb, mrb_value str, const char *ptr);
-MRB_API mrb_value mrb_str_cat_str(mrb_state *mrb, mrb_value str, mrb_value str2);
-#define mrb_str_cat_lit(mrb, str, lit) mrb_str_cat(mrb, str, lit, mrb_strlen_lit(lit))
-
-/*
- * Adds str2 to the end of str1.
- */
-MRB_API mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2);
-
-/*
- * Returns 0 if both Ruby strings are equal. Returns a value < 0 if Ruby str1 is less than Ruby str2. Returns a value > 0 if Ruby str2 is greater than Ruby str1.
- */
-MRB_API int mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2);
-
-/*
- * Returns a newly allocated C string from a Ruby string.
- * This is an utility function to pass a Ruby string to C library functions.
- *
- * - Returned string does not contain any NUL characters (but terminator).
- * - It raises an ArgumentError exception if Ruby string contains
- *   NUL characters.
- * - Retured string will be freed automatically on next GC.
- * - Caller can modify returned string without affecting Ruby string
- *   (e.g. it can be used for mkstemp(3)).
- *
- * @param [mrb_state *] mrb The current mruby state.
- * @param [mrb_value] str Ruby string. Must be an instance of String.
- * @return [char *] A newly allocated C string.
- */
-MRB_API char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
-
-mrb_value mrb_str_pool(mrb_state *mrb, mrb_value str);
-mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str);
-mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
-
-/*
- * Returns a printable version of str, surrounded by quote marks, with special characters escaped.
- */
-mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str);
-
-void mrb_noregexp(mrb_state *mrb, mrb_value self);
-void mrb_regexp_check(mrb_state *mrb, mrb_value obj);
-
-/* For backward compatibility */
-#define mrb_str_cat2(mrb, str, ptr) mrb_str_cat_cstr(mrb, str, ptr)
-#define mrb_str_buf_cat(mrb, str, ptr, len) mrb_str_cat(mrb, str, ptr, len)
-#define mrb_str_buf_append(mrb, str, str2) mrb_str_cat_str(mrb, str, str2)
-
-MRB_END_DECL
-
-#endif  /* MRUBY_STRING_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/throw.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/throw.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/throw.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/throw.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*
-** mruby/throw.h - mruby exception throwing handler
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRB_THROW_H
-#define MRB_THROW_H
-
-#if defined(MRB_ENABLE_CXX_ABI)
-# if !defined(__cplusplus)
-#  error Trying to use C++ exception handling in C code
-# endif
-#endif
-
-#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
-
-#define MRB_TRY(buf) do { try {
-#define MRB_CATCH(buf) } catch(mrb_jmpbuf_impl e) { if (e != (buf)->impl) { throw e; }
-#define MRB_END_EXC(buf)  } } while(0)
-
-#define MRB_THROW(buf) throw((buf)->impl)
-typedef mrb_int mrb_jmpbuf_impl;
-
-#else
-
-#include <setjmp.h>
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define MRB_SETJMP _setjmp
-#define MRB_LONGJMP _longjmp
-#else
-#define MRB_SETJMP setjmp
-#define MRB_LONGJMP longjmp
-#endif
-
-#define MRB_TRY(buf) do { if (MRB_SETJMP((buf)->impl) == 0) {
-#define MRB_CATCH(buf) } else {
-#define MRB_END_EXC(buf) } } while(0)
-
-#define MRB_THROW(buf) MRB_LONGJMP((buf)->impl, 1);
-#define mrb_jmpbuf_impl jmp_buf
-
-#endif
-
-struct mrb_jmpbuf {
-  mrb_jmpbuf_impl impl;
-
-#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
-  static mrb_int jmpbuf_id;
-  mrb_jmpbuf() : impl(jmpbuf_id++) {}
-#endif
-};
-
-#endif  /* MRB_THROW_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/value.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/value.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/value.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/value.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,303 +0,0 @@
-/*
-** mruby/value.h - mruby value definitions
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_VALUE_H
-#define MRUBY_VALUE_H
-
-#include "common.h"
-
-/**
- * MRuby Value definition functions and macros.
- */
-MRB_BEGIN_DECL
-
-typedef uint32_t mrb_sym;
-typedef uint8_t mrb_bool;
-struct mrb_state;
-
-#if defined(MRB_INT16) && defined(MRB_INT64)
-# error "You can't define MRB_INT16 and MRB_INT64 at the same time."
-#endif
-
-#if defined _MSC_VER && _MSC_VER < 1800
-# define PRIo64 "llo"
-# define PRId64 "lld"
-# define PRIx64 "llx"
-# define PRIo16 "ho"
-# define PRId16 "hd"
-# define PRIx16 "hx"
-# define PRIo32 "o"
-# define PRId32 "d"
-# define PRIx32 "x"
-#else
-# include <inttypes.h>
-#endif
-
-#if defined(MRB_INT64)
-  typedef int64_t mrb_int;
-# define MRB_INT_BIT 64
-# define MRB_INT_MIN (INT64_MIN>>MRB_FIXNUM_SHIFT)
-# define MRB_INT_MAX (INT64_MAX>>MRB_FIXNUM_SHIFT)
-# define MRB_PRIo PRIo64
-# define MRB_PRId PRId64
-# define MRB_PRIx PRIx64
-#elif defined(MRB_INT16)
-  typedef int16_t mrb_int;
-# define MRB_INT_BIT 16
-# define MRB_INT_MIN (INT16_MIN>>MRB_FIXNUM_SHIFT)
-# define MRB_INT_MAX (INT16_MAX>>MRB_FIXNUM_SHIFT)
-# define MRB_PRIo PRIo16
-# define MRB_PRId PRId16
-# define MRB_PRIx PRIx16
-#else
-  typedef int32_t mrb_int;
-# define MRB_INT_BIT 32
-# define MRB_INT_MIN (INT32_MIN>>MRB_FIXNUM_SHIFT)
-# define MRB_INT_MAX (INT32_MAX>>MRB_FIXNUM_SHIFT)
-# define MRB_PRIo PRIo32
-# define MRB_PRId PRId32
-# define MRB_PRIx PRIx32
-#endif
-
-
-MRB_API double mrb_float_read(const char*, char**);
-#ifdef MRB_USE_FLOAT
-  typedef float mrb_float;
-#else
-  typedef double mrb_float;
-#endif
-
-#if defined _MSC_VER && _MSC_VER < 1900
-# ifndef __cplusplus
-#  define inline __inline
-# endif
-# include <stdarg.h>
-MRB_API int mrb_msvc_vsnprintf(char *s, size_t n, const char *format, va_list arg);
-MRB_API int mrb_msvc_snprintf(char *s, size_t n, const char *format, ...);
-# define vsnprintf(s, n, format, arg) mrb_msvc_vsnprintf(s, n, format, arg)
-# define snprintf(s, n, format, ...) mrb_msvc_snprintf(s, n, format, __VA_ARGS__)
-# if _MSC_VER < 1800
-#  include <float.h>
-#  define isfinite(n) _finite(n)
-#  define isnan _isnan
-#  define isinf(n) (!_finite(n) && !_isnan(n))
-#  define signbit(n) (_copysign(1.0, (n)) < 0.0)
-static const unsigned int IEEE754_INFINITY_BITS_SINGLE = 0x7F800000;
-#  define INFINITY (*(float *)&IEEE754_INFINITY_BITS_SINGLE)
-#  define NAN ((float)(INFINITY - INFINITY))
-# endif
-#endif
-
-enum mrb_vtype {
-  MRB_TT_FALSE = 0,   /*   0 */
-  MRB_TT_FREE,        /*   1 */
-  MRB_TT_TRUE,        /*   2 */
-  MRB_TT_FIXNUM,      /*   3 */
-  MRB_TT_SYMBOL,      /*   4 */
-  MRB_TT_UNDEF,       /*   5 */
-  MRB_TT_FLOAT,       /*   6 */
-  MRB_TT_CPTR,        /*   7 */
-  MRB_TT_OBJECT,      /*   8 */
-  MRB_TT_CLASS,       /*   9 */
-  MRB_TT_MODULE,      /*  10 */
-  MRB_TT_ICLASS,      /*  11 */
-  MRB_TT_SCLASS,      /*  12 */
-  MRB_TT_PROC,        /*  13 */
-  MRB_TT_ARRAY,       /*  14 */
-  MRB_TT_HASH,        /*  15 */
-  MRB_TT_STRING,      /*  16 */
-  MRB_TT_RANGE,       /*  17 */
-  MRB_TT_EXCEPTION,   /*  18 */
-  MRB_TT_FILE,        /*  19 */
-  MRB_TT_ENV,         /*  20 */
-  MRB_TT_DATA,        /*  21 */
-  MRB_TT_FIBER,       /*  22 */
-  MRB_TT_ISTRUCT,     /*  23 */
-  MRB_TT_BREAK,       /*  24 */
-  MRB_TT_MAXDEFINE    /*  25 */
-};
-
-#include <mruby/object.h>
-
-#ifdef MRB_DOCUMENTATION_BLOCK
-
-/**
- * @abstract
- * MRuby value boxing.
- *
- * Actual implementation depends on configured boxing type.
- *
- * @see mruby/boxing_no.h Default boxing representation
- * @see mruby/boxing_word.h Word representation
- * @see mruby/boxing_nan.h Boxed double representation
- */
-typedef void mrb_value;
-
-#endif
-
-#if defined(MRB_NAN_BOXING)
-#include "boxing_nan.h"
-#elif defined(MRB_WORD_BOXING)
-#include "boxing_word.h"
-#else
-#include "boxing_no.h"
-#endif
-
-#ifndef mrb_fixnum_p
-#define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM)
-#endif
-#ifndef mrb_undef_p
-#define mrb_undef_p(o) (mrb_type(o) == MRB_TT_UNDEF)
-#endif
-#ifndef mrb_nil_p
-#define mrb_nil_p(o)  (mrb_type(o) == MRB_TT_FALSE && !mrb_fixnum(o))
-#endif
-#ifndef mrb_bool
-#define mrb_bool(o)   (mrb_type(o) != MRB_TT_FALSE)
-#endif
-#define mrb_float_p(o) (mrb_type(o) == MRB_TT_FLOAT)
-#define mrb_symbol_p(o) (mrb_type(o) == MRB_TT_SYMBOL)
-#define mrb_array_p(o) (mrb_type(o) == MRB_TT_ARRAY)
-#define mrb_string_p(o) (mrb_type(o) == MRB_TT_STRING)
-#define mrb_hash_p(o) (mrb_type(o) == MRB_TT_HASH)
-#define mrb_cptr_p(o) (mrb_type(o) == MRB_TT_CPTR)
-#define mrb_exception_p(o) (mrb_type(o) == MRB_TT_EXCEPTION)
-#define mrb_test(o)   mrb_bool(o)
-MRB_API mrb_bool mrb_regexp_p(struct mrb_state*, mrb_value);
-
-/*
- * Returns a float in Ruby.
- */
-MRB_INLINE mrb_value mrb_float_value(struct mrb_state *mrb, mrb_float f)
-{
-  mrb_value v;
-  (void) mrb;
-  SET_FLOAT_VALUE(mrb, v, f);
-  return v;
-}
-
-static inline mrb_value
-mrb_cptr_value(struct mrb_state *mrb, void *p)
-{
-  mrb_value v;
-  (void) mrb;
-  SET_CPTR_VALUE(mrb,v,p);
-  return v;
-}
-
-/*
- * Returns a fixnum in Ruby.
- */
-MRB_INLINE mrb_value mrb_fixnum_value(mrb_int i)
-{
-  mrb_value v;
-  SET_INT_VALUE(v, i);
-  return v;
-}
-
-static inline mrb_value
-mrb_symbol_value(mrb_sym i)
-{
-  mrb_value v;
-  SET_SYM_VALUE(v, i);
-  return v;
-}
-
-static inline mrb_value
-mrb_obj_value(void *p)
-{
-  mrb_value v;
-  SET_OBJ_VALUE(v, (struct RBasic*)p);
-  mrb_assert(p == mrb_ptr(v));
-  mrb_assert(((struct RBasic*)p)->tt == mrb_type(v));
-  return v;
-}
-
-
-/*
- * Get a nil mrb_value object.
- *
- * @return
- *      nil mrb_value object reference.
- */
-MRB_INLINE mrb_value mrb_nil_value(void)
-{
-  mrb_value v;
-  SET_NIL_VALUE(v);
-  return v;
-}
-
-/*
- * Returns false in Ruby.
- */
-MRB_INLINE mrb_value mrb_false_value(void)
-{
-  mrb_value v;
-  SET_FALSE_VALUE(v);
-  return v;
-}
-
-/*
- * Returns true in Ruby.
- */
-MRB_INLINE mrb_value mrb_true_value(void)
-{
-  mrb_value v;
-  SET_TRUE_VALUE(v);
-  return v;
-}
-
-static inline mrb_value
-mrb_bool_value(mrb_bool boolean)
-{
-  mrb_value v;
-  SET_BOOL_VALUE(v, boolean);
-  return v;
-}
-
-static inline mrb_value
-mrb_undef_value(void)
-{
-  mrb_value v;
-  SET_UNDEF_VALUE(v);
-  return v;
-}
-
-#ifdef MRB_USE_ETEXT_EDATA
-#if (defined(__APPLE__) && defined(__MACH__))
-#include <mach-o/getsect.h>
-static inline mrb_bool
-mrb_ro_data_p(const char *p)
-{
-  return (const char*)get_etext() < p && p < (const char*)get_edata();
-}
-#else
-extern char _etext[];
-#ifdef MRB_NO_INIT_ARRAY_START
-extern char _edata[];
-
-static inline mrb_bool
-mrb_ro_data_p(const char *p)
-{
-  return _etext < p && p < _edata;
-}
-#else
-extern char __init_array_start[];
-
-static inline mrb_bool
-mrb_ro_data_p(const char *p)
-{
-  return _etext < p && p < (char*)&__init_array_start;
-}
-#endif
-#endif
-#else
-# define mrb_ro_data_p(p) FALSE
-#endif
-
-MRB_END_DECL
-
-#endif  /* MRUBY_VALUE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/variable.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/variable.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/variable.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/variable.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/*
-** mruby/variable.h - mruby variables
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_VARIABLE_H
-#define MRUBY_VARIABLE_H
-
-#include "common.h"
-
-/**
- * Functions to access mruby variables.
- */
-MRB_BEGIN_DECL
-
-typedef struct global_variable {
-  int   counter;
-  mrb_value *data;
-  mrb_value (*getter)(void);
-  void  (*setter)(void);
-  /* void  (*marker)(); */
-  /* int block_trace; */
-  /* struct trace_var *trace; */
-} global_variable;
-
-struct global_entry {
-  global_variable *var;
-  mrb_sym id;
-};
-
-mrb_value mrb_vm_special_get(mrb_state*, mrb_sym);
-void mrb_vm_special_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_iv_get(mrb_state*, mrb_sym);
-void mrb_vm_iv_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_cv_get(mrb_state*, mrb_sym);
-void mrb_vm_cv_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_const_get(mrb_state*, mrb_sym);
-void mrb_vm_const_set(mrb_state*, mrb_sym, mrb_value);
-MRB_API mrb_value mrb_const_get(mrb_state*, mrb_value, mrb_sym);
-MRB_API void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value);
-MRB_API mrb_bool mrb_const_defined(mrb_state*, mrb_value, mrb_sym);
-MRB_API void mrb_const_remove(mrb_state*, mrb_value, mrb_sym);
-
-MRB_API mrb_bool mrb_iv_p(mrb_state *mrb, mrb_sym sym);
-MRB_API void mrb_iv_check(mrb_state *mrb, mrb_sym sym);
-MRB_API mrb_value mrb_obj_iv_get(mrb_state *mrb, struct RObject *obj, mrb_sym sym);
-MRB_API void mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v);
-MRB_API mrb_bool mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym);
-MRB_API void mrb_obj_iv_ifnone(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v);
-MRB_API mrb_value mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym);
-MRB_API void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v);
-MRB_API mrb_bool mrb_iv_defined(mrb_state*, mrb_value, mrb_sym);
-MRB_API mrb_value mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym);
-MRB_API void mrb_iv_copy(mrb_state *mrb, mrb_value dst, mrb_value src);
-MRB_API mrb_bool mrb_const_defined_at(mrb_state *mrb, mrb_value mod, mrb_sym id);
-
-/**
- * Get a global variable. Will return nil if the var does not exist
- *
- * Example:
- *
- *     !!!ruby
- *     # Ruby style
- *     var = $value
- *
- *     !!!c
- *     // C style
- *     mrb_sym sym = mrb_intern_lit(mrb, "$value");
- *     mrb_value var = mrb_gv_get(mrb, sym);
- *
- * @param mrb The mruby state reference
- * @param sym The name of the global variable
- * @return The value of that global variable. May be nil
- */
-MRB_API mrb_value mrb_gv_get(mrb_state *mrb, mrb_sym sym);
-
-/**
- * Set a global variable
- *
- * Example:
- *
- *     !!!ruby
- *     # Ruby style
- *     $value = "foo"
- *
- *     !!!c
- *     // C style
- *     mrb_sym sym = mrb_intern_lit(mrb, "$value");
- *     mrb_gv_set(mrb, sym, mrb_str_new_lit("foo"));
- *
- * @param mrb The mruby state reference
- * @param sym The name of the global variable
- * @param val The value of the global variable
- */
-MRB_API void mrb_gv_set(mrb_state *mrb, mrb_sym sym, mrb_value val);
-
-/**
- * Remove a global variable.
- *
- * Example:
- *
- *     !!!ruby
- *     # Ruby style
- *     $value = nil
- *
- *     !!!c
- *     // C style
- *     mrb_sym sym = mrb_intern_lit(mrb, "$value");
- *     mrb_gv_remove(mrb, sym);
- *
- * @param mrb The mruby state reference
- * @param sym The name of the global variable
- * @param val The value of the global variable
- */
-MRB_API void mrb_gv_remove(mrb_state *mrb, mrb_sym sym);
-
-MRB_API mrb_value mrb_cv_get(mrb_state *mrb, mrb_value mod, mrb_sym sym);
-MRB_API void mrb_mod_cv_set(mrb_state *mrb, struct RClass * c, mrb_sym sym, mrb_value v);
-MRB_API void mrb_cv_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v);
-MRB_API mrb_bool mrb_cv_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym);
-mrb_value mrb_obj_iv_inspect(mrb_state*, struct RObject*);
-mrb_value mrb_mod_constants(mrb_state *mrb, mrb_value mod);
-mrb_value mrb_f_global_variables(mrb_state *mrb, mrb_value self);
-mrb_value mrb_obj_instance_variables(mrb_state*, mrb_value);
-mrb_value mrb_mod_class_variables(mrb_state*, mrb_value);
-mrb_value mrb_mod_cv_get(mrb_state *mrb, struct RClass * c, mrb_sym sym);
-mrb_bool mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym);
-mrb_sym mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer);
-
-/* GC functions */
-void mrb_gc_mark_gv(mrb_state*);
-void mrb_gc_free_gv(mrb_state*);
-void mrb_gc_mark_iv(mrb_state*, struct RObject*);
-size_t mrb_gc_mark_iv_size(mrb_state*, struct RObject*);
-void mrb_gc_free_iv(mrb_state*, struct RObject*);
-
-MRB_END_DECL
-
-#endif  /* MRUBY_VARIABLE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/version.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/version.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/version.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/*
-** mruby/version.h - mruby version definition
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_VERSION_H
-#define MRUBY_VERSION_H
-
-#include "common.h"
-
-/**
- * mruby version definition macros
- */
-MRB_BEGIN_DECL
-
-/*
- * A passed in expression.
- */
-#define MRB_STRINGIZE0(expr) #expr
-
-/*
- * Passes in an expression to MRB_STRINGIZE0.
- */
-#define MRB_STRINGIZE(expr) MRB_STRINGIZE0(expr)
-
-/*
- * The version of Ruby used by mruby.
- */
-#define MRUBY_RUBY_VERSION "1.9"
-
-/*
- * Ruby engine.
- */
-#define MRUBY_RUBY_ENGINE  "mruby"
-
-/*
- * Major release version number.
- */
-#define MRUBY_RELEASE_MAJOR 1
-
-/*
- * Minor release version number.
- */
-#define MRUBY_RELEASE_MINOR 3
-
-/*
- * Tiny release version number.
- */
-#define MRUBY_RELEASE_TEENY 0
-
-/*
- * The mruby version.
- */
-#define MRUBY_VERSION MRB_STRINGIZE(MRUBY_RELEASE_MAJOR) "." MRB_STRINGIZE(MRUBY_RELEASE_MINOR) "." MRB_STRINGIZE(MRUBY_RELEASE_TEENY)
-
-/*
- * Release number.
- */
-#define MRUBY_RELEASE_NO (MRUBY_RELEASE_MAJOR * 100 * 100 + MRUBY_RELEASE_MINOR * 100 + MRUBY_RELEASE_TEENY)
-
-/*
- * Release year.
- */
-#define MRUBY_RELEASE_YEAR 2017
-
-/*
- * Release month.
- */
-#define MRUBY_RELEASE_MONTH 7
-
-/*
- * Release day.
- */
-#define MRUBY_RELEASE_DAY 4
-
-/*
- * Release date as a string.
- */
-#define MRUBY_RELEASE_DATE MRB_STRINGIZE(MRUBY_RELEASE_YEAR) "-" MRB_STRINGIZE(MRUBY_RELEASE_MONTH) "-" MRB_STRINGIZE(MRUBY_RELEASE_DAY)
-
-/*
- * The year mruby was first created.
- */
-#define MRUBY_BIRTH_YEAR 2010
-
-/*
- * MRuby's authors.
- */
-#define MRUBY_AUTHOR "mruby developers"
-
-/*
- * mruby's version, and release date.
- */
-#define MRUBY_DESCRIPTION      \
-  "mruby " MRUBY_VERSION       \
-  " (" MRUBY_RELEASE_DATE ") " \
-
-/*
- * mruby's copyright information.
- */
-#define MRUBY_COPYRIGHT                \
-  "mruby - Copyright (c) "             \
-  MRB_STRINGIZE(MRUBY_BIRTH_YEAR)"-"   \
-  MRB_STRINGIZE(MRUBY_RELEASE_YEAR)" " \
-  MRUBY_AUTHOR                         \
-
-MRB_END_DECL
-
-#endif  /* MRUBY_VERSION_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/include/mruby.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1233 +0,0 @@
-/*
-** mruby - An embeddable Ruby implementation
-**
-** Copyright (c) mruby developers 2010-2017
-**
-** Permission is hereby granted, free of charge, to any person obtaining
-** a copy of this software and associated documentation files (the
-** "Software"), to deal in the Software without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Software, and to
-** permit persons to whom the Software is furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be
-** included in all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**
-** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
-*/
-
-#ifndef MRUBY_H
-#define MRUBY_H
-
-#ifdef __cplusplus
-#define __STDC_LIMIT_MACROS
-#define __STDC_CONSTANT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include <limits.h>
-
-#ifdef __cplusplus
-#ifndef SIZE_MAX
-#ifdef __SIZE_MAX__
-#define SIZE_MAX __SIZE_MAX__
-#else
-#define SIZE_MAX std::numeric_limits<size_t>::max()
-#endif
-#endif
-#endif
-
-#ifdef MRB_DEBUG
-#include <assert.h>
-#define mrb_assert(p) assert(p)
-#define mrb_assert_int_fit(t1,n,t2,max) assert((n)>=0 && ((sizeof(n)<=sizeof(t2))||(n<=(t1)(max))))
-#else
-#define mrb_assert(p) ((void)0)
-#define mrb_assert_int_fit(t1,n,t2,max) ((void)0)
-#endif
-
-#if __STDC_VERSION__ >= 201112L
-#define mrb_static_assert(exp, str) _Static_assert(exp, str)
-#else
-#define mrb_static_assert(exp, str) mrb_assert(exp)
-#endif
-
-#include "mrbconf.h"
-
-#ifndef DBL_EPSILON
-#define DBL_EPSILON ((double)2.22044604925031308085e-16L)
-#endif
-#ifndef LDBL_EPSILON
-#define LDBL_EPSILON (1.08420217248550443401e-19L)
-#endif
-
-#ifdef MRB_USE_FLOAT
-#define MRB_FLOAT_EPSILON FLT_EPSILON
-#else
-#define MRB_FLOAT_EPSILON DBL_EPSILON
-#endif
-
-#include "mruby/common.h"
-#include <mruby/value.h>
-#include <mruby/gc.h>
-#include <mruby/version.h>
-
-/**
- * MRuby C API entry point
- */
-MRB_BEGIN_DECL
-
-typedef uint32_t mrb_code;
-
-/**
- * Required arguments signature type.
- */
-typedef uint32_t mrb_aspec;
-
-
-struct mrb_irep;
-struct mrb_state;
-
-/**
- * Function pointer type of custom allocator used in @see mrb_open_allocf.
- *
- * The function pointing it must behave similarly as realloc except:
- * - If ptr is NULL it must allocate new space.
- * - If s is NULL, ptr must be freed.
- *
- * See @see mrb_default_allocf for the default implementation.
- */
-typedef void* (*mrb_allocf) (struct mrb_state *mrb, void*, size_t, void *ud);
-
-#ifndef MRB_FIXED_STATE_ATEXIT_STACK_SIZE
-#define MRB_FIXED_STATE_ATEXIT_STACK_SIZE 5
-#endif
-
-typedef struct {
-  mrb_sym mid;
-  struct RProc *proc;
-  mrb_value *stackent;
-  int nregs;
-  int ridx;
-  int epos;
-  struct REnv *env;
-  mrb_code *pc;                 /* return address */
-  mrb_code *err;                /* error position */
-  int argc;
-  int acc;
-  struct RClass *target_class;
-} mrb_callinfo;
-
-enum mrb_fiber_state {
-  MRB_FIBER_CREATED = 0,
-  MRB_FIBER_RUNNING,
-  MRB_FIBER_RESUMED,
-  MRB_FIBER_SUSPENDED,
-  MRB_FIBER_TRANSFERRED,
-  MRB_FIBER_TERMINATED,
-};
-
-struct mrb_context {
-  struct mrb_context *prev;
-
-  mrb_value *stack;                       /* stack of virtual machine */
-  mrb_value *stbase, *stend;
-
-  mrb_callinfo *ci;
-  mrb_callinfo *cibase, *ciend;
-
-  mrb_code **rescue;                      /* exception handler stack */
-  int rsize;
-  struct RProc **ensure;                  /* ensure handler stack */
-  int esize, eidx;
-
-  enum mrb_fiber_state status;
-  mrb_bool vmexec;
-  struct RFiber *fib;
-};
-
-struct mrb_jmpbuf;
-
-typedef void (*mrb_atexit_func)(struct mrb_state*);
-
-#define MRB_STATE_NO_REGEXP 1
-#define MRB_STATE_REGEXP    2
-
-typedef struct mrb_state {
-  struct mrb_jmpbuf *jmp;
-
-  uint32_t flags;
-  mrb_allocf allocf;                      /* memory allocation function */
-  void *allocf_ud;                        /* auxiliary data of allocf */
-
-  struct mrb_context *c;
-  struct mrb_context *root_c;
-  struct iv_tbl *globals;                 /* global variable table */
-
-  struct RObject *exc;                    /* exception */
-
-  struct RObject *top_self;
-  struct RClass *object_class;            /* Object class */
-  struct RClass *class_class;
-  struct RClass *module_class;
-  struct RClass *proc_class;
-  struct RClass *string_class;
-  struct RClass *array_class;
-  struct RClass *hash_class;
-
-  struct RClass *float_class;
-  struct RClass *fixnum_class;
-  struct RClass *true_class;
-  struct RClass *false_class;
-  struct RClass *nil_class;
-  struct RClass *symbol_class;
-  struct RClass *kernel_module;
-
-  struct alloca_header *mems;
-  mrb_gc gc;
-
-  mrb_sym symidx;
-  struct kh_n2s *name2sym;      /* symbol hash */
-  struct symbol_name *symtbl;   /* symbol table */
-  size_t symcapa;
-
-#ifdef MRB_ENABLE_DEBUG_HOOK
-  void (*code_fetch_hook)(struct mrb_state* mrb, struct mrb_irep *irep, mrb_code *pc, mrb_value *regs);
-  void (*debug_op_hook)(struct mrb_state* mrb, struct mrb_irep *irep, mrb_code *pc, mrb_value *regs);
-#endif
-
-#ifdef MRB_BYTECODE_DECODE_OPTION
-  mrb_code (*bytecode_decoder)(struct mrb_state* mrb, mrb_code code);
-#endif
-
-  struct RClass *eException_class;
-  struct RClass *eStandardError_class;
-  struct RObject *nomem_err;              /* pre-allocated NoMemoryError */
-  struct RObject *stack_err;              /* pre-allocated SysStackError */
-#ifdef MRB_GC_FIXED_ARENA
-  struct RObject *arena_err;              /* pre-allocated arena overfow error */
-#endif
-
-  void *ud; /* auxiliary data */
-
-#ifdef MRB_FIXED_STATE_ATEXIT_STACK
-  mrb_atexit_func atexit_stack[MRB_FIXED_STATE_ATEXIT_STACK_SIZE];
-#else
-  mrb_atexit_func *atexit_stack;
-#endif
-  mrb_int atexit_stack_len;
-} mrb_state;
-
-
-typedef mrb_value (*mrb_func_t)(mrb_state *mrb, mrb_value);
-
-/**
- * Defines a new class.
- *
- * If you're creating a gem it may look something like this:
- *
- *      !!!c
- *      void mrb_example_gem_init(mrb_state* mrb) {
- *          struct RClass *example_class;
- *          example_class = mrb_define_class(mrb, "Example_Class", mrb->object_class);
- *      }
- *
- *      void mrb_example_gem_final(mrb_state* mrb) {
- *          //free(TheAnimals);
- *      }
- *
- * @param [mrb_state *] mrb The current mruby state.
- * @param [const char *] name The name of the defined class.
- * @param [struct RClass *] super The new class parent.
- * @return [struct RClass *] Reference to the newly defined class.
- * @see mrb_define_class_under
- */
-MRB_API struct RClass *mrb_define_class(mrb_state *mrb, const char *name, struct RClass *super);
-
-/**
- * Defines a new module.
- *
- * @param [mrb_state *] mrb_state* The current mruby state.
- * @param [const char *] char* The name of the module.
- * @return [struct RClass *] Reference to the newly defined module.
- */
-MRB_API struct RClass *mrb_define_module(mrb_state *, const char*);
-MRB_API mrb_value mrb_singleton_class(mrb_state*, mrb_value);
-
-/**
- * Include a module in another class or module.
- * Equivalent to:
- *
- *   module B
- *     include A
- *   end
- * @param [mrb_state *] mrb_state* The current mruby state.
- * @param [struct RClass *] RClass* A reference to module or a class.
- * @param [struct RClass *] RClass* A reference to the module to be included.
- */
-MRB_API void mrb_include_module(mrb_state*, struct RClass*, struct RClass*);
-
-/**
- * Prepends a module in another class or module.
- *
- * Equivalent to:
- *  module B
- *    prepend A
- *  end
- * @param [mrb_state *] mrb_state* The current mruby state.
- * @param [struct RClass *] RClass* A reference to module or a class.
- * @param [struct RClass *] RClass* A reference to the module to be prepended.
- */
-MRB_API void mrb_prepend_module(mrb_state*, struct RClass*, struct RClass*);
-
-/**
- * Defines a global function in ruby.
- *
- * If you're creating a gem it may look something like this
- *
- * Example:
- *
- *     !!!c
- *     mrb_value example_method(mrb_state* mrb, mrb_value self)
- *     {
- *          puts("Executing example command!");
- *          return self;
- *     }
- *
- *     void mrb_example_gem_init(mrb_state* mrb)
- *     {
- *           mrb_define_method(mrb, mrb->kernel_module, "example_method", example_method, MRB_ARGS_NONE());
- *     }
- *
- * @param [mrb_state *] mrb The MRuby state reference.
- * @param [struct RClass *] cla The class pointer where the method will be defined.
- * @param [const char *] name The name of the method being defined.
- * @param [mrb_func_t] func The function pointer to the method definition.
- * @param [mrb_aspec] aspec The method parameters declaration.
- */
-MRB_API void mrb_define_method(mrb_state *mrb, struct RClass *cla, const char *name, mrb_func_t func, mrb_aspec aspec);
-
-/**
- * Defines a class method.
- *
- * Example:
- *
- *     # Ruby style
- *     class Foo
- *       def Foo.bar
- *       end
- *     end
- *     // C style
- *     mrb_value bar_method(mrb_state* mrb, mrb_value self){
- *       return mrb_nil_value();
- *     }
- *     void mrb_example_gem_init(mrb_state* mrb){
- *       struct RClass *foo;
- *       foo = mrb_define_class(mrb, "Foo", mrb->object_class);
- *       mrb_define_class_method(mrb, foo, "bar", bar_method, MRB_ARGS_NONE());
- *     }
- * @param [mrb_state *] mrb_state* The MRuby state reference.
- * @param [struct RClass *] RClass* The class where the class method will be defined.
- * @param [const char *] char* The name of the class method being defined.
- * @param [mrb_func_t] mrb_func_t The function pointer to the class method definition.
- * @param [mrb_aspec] mrb_aspec The method parameters declaration.
- */
-MRB_API void mrb_define_class_method(mrb_state *, struct RClass *, const char *, mrb_func_t, mrb_aspec);
-MRB_API void mrb_define_singleton_method(mrb_state*, struct RObject*, const char*, mrb_func_t, mrb_aspec);
-
-/**
- *  Defines a module fuction.
- *
- * Example:
- *
- *        # Ruby style
- *        module Foo
- *          def Foo.bar
- *          end
- *        end
- *        // C style
- *        mrb_value bar_method(mrb_state* mrb, mrb_value self){
- *          return mrb_nil_value();
- *        }
- *        void mrb_example_gem_init(mrb_state* mrb){
- *          struct RClass *foo;
- *          foo = mrb_define_module(mrb, "Foo");
- *          mrb_define_module_function(mrb, foo, "bar", bar_method, MRB_ARGS_NONE());
- *        }
- *  @param [mrb_state *] mrb_state* The MRuby state reference.
- *  @param [struct RClass *] RClass* The module where the module function will be defined.
- *  @param [const char *] char* The name of the module function being defined.
- *  @param [mrb_func_t] mrb_func_t The function pointer to the module function definition.
- *  @param [mrb_aspec] mrb_aspec The method parameters declaration.
- */
-MRB_API void mrb_define_module_function(mrb_state*, struct RClass*, const char*, mrb_func_t, mrb_aspec);
-
-/**
- *  Defines a constant.
- *
- * Example:
- *
- *          # Ruby style
- *          class ExampleClass
- *            AGE = 22
- *          end
- *          // C style
- *          #include <stdio.h>
- *          #include <mruby.h>
- *
- *          void
- *          mrb_example_gem_init(mrb_state* mrb){
- *            mrb_define_const(mrb, mrb->kernel_module, "AGE", mrb_fixnum_value(22));
- *          }
- *
- *          mrb_value
- *          mrb_example_gem_final(mrb_state* mrb){
- *          }
- *  @param [mrb_state *] mrb_state* The MRuby state reference.
- *  @param [struct RClass *] RClass* A class or module the constant is defined in.
- *  @param [const char *] name The name of the constant being defined.
- *  @param [mrb_value] mrb_value The value for the constant.
- */
-MRB_API void mrb_define_const(mrb_state*, struct RClass*, const char *name, mrb_value);
-
-/**
- * Undefines a method.
- *
- * Example:
- *
- *     # Ruby style
- *
- *     class ExampleClassA
- *       def example_method
- *         "example"
- *       end
- *     end
- *     ExampleClassA.new.example_method # => example
- *
- *     class ExampleClassB < ExampleClassA
- *       undef_method :example_method
- *     end
- *
- *     ExampleClassB.new.example_method # => undefined method 'example_method' for ExampleClassB (NoMethodError)
- *
- *     // C style
- *     #include <stdio.h>
- *     #include <mruby.h>
- *
- *     mrb_value
- *     mrb_example_method(mrb_state *mrb){
- *       return mrb_str_new_lit(mrb, "example");
- *     }
- *
- *     void
- *     mrb_example_gem_init(mrb_state* mrb){
- *       struct RClass *example_class_a;
- *       struct RClass *example_class_b;
- *       struct RClass *example_class_c;
- *
- *       example_class_a = mrb_define_class(mrb, "ExampleClassA", mrb->object_class);
- *       mrb_define_method(mrb, example_class_a, "example_method", mrb_example_method, MRB_ARGS_NONE());
- *       example_class_b = mrb_define_class(mrb, "ExampleClassB", example_class_a);
- *       example_class_c = mrb_define_class(mrb, "ExampleClassC", example_class_b);
- *       mrb_undef_method(mrb, example_class_c, "example_method");
- *     }
- *
- *     mrb_example_gem_final(mrb_state* mrb){
- *     }
- * @param [mrb_state*] mrb_state* The mruby state reference.
- * @param [struct RClass*] RClass* A class the method will be undefined from.
- * @param [const char*] constchar* The name of the method to be undefined.
- */
-MRB_API void mrb_undef_method(mrb_state*, struct RClass*, const char*);
-
-/**
- * Undefine a class method.
- * Example:
- *
- *      # Ruby style
- *      class ExampleClass
- *        def self.example_method
- *          "example"
- *        end
- *      end
- *
- *     ExampleClass.example_method
- *
- *     // C style
- *     #include <stdio.h>
- *     #include <mruby.h>
- *
- *     mrb_value
- *     mrb_example_method(mrb_state *mrb){
- *       return mrb_str_new_lit(mrb, "example");
- *     }
- *
- *     void
- *     mrb_example_gem_init(mrb_state* mrb){
- *       struct RClass *example_class;
- *       example_class = mrb_define_class(mrb, "ExampleClass", mrb->object_class);
- *       mrb_define_class_method(mrb, example_class, "example_method", mrb_example_method, MRB_ARGS_NONE());
- *       mrb_undef_class_method(mrb, example_class, "example_method");
- *      }
- *
- *      void
- *      mrb_example_gem_final(mrb_state* mrb){
- *      }
- * @param [mrb_state*] mrb_state* The mruby state reference.
- * @param [RClass*] RClass* A class the class method will be undefined from.
- * @param [constchar*] constchar* The name of the class method to be undefined.
- */
-MRB_API void mrb_undef_class_method(mrb_state*, struct RClass*, const char*);
-
-/**
- * Initialize a new object instace of c class.
- *
- * Example:
- *
- *     # Ruby style
- *     class ExampleClass
- *     end
- *
- *     p ExampleClass # => #<ExampleClass:0x9958588>
- *     // C style
- *     #include <stdio.h>
- *     #include <mruby.h>
- *
- *     void
- *     mrb_example_gem_init(mrb_state* mrb) {
- *       struct RClass *example_class;
- *       mrb_value obj;
- *       example_class = mrb_define_class(mrb, "ExampleClass", mrb->object_class); # => class ExampleClass; end
- *       obj = mrb_obj_new(mrb, example_class, 0, NULL); # => ExampleClass.new
- *       mrb_p(mrb, obj); // => Kernel#p
- *      }
- * @param [mrb_state*] mrb The current mruby state.
- * @param [RClass*] c Reference to the class of the new object.
- * @param [mrb_int] argc Number of arguments in argv
- * @param [const mrb_value *] argv Array of mrb_value to initialize the object
- * @return [mrb_value] The newly initialized object
- */
-MRB_API mrb_value mrb_obj_new(mrb_state *mrb, struct RClass *c, mrb_int argc, const mrb_value *argv);
-
-/** @see mrb_obj_new */
-MRB_INLINE mrb_value mrb_class_new_instance(mrb_state *mrb, mrb_int argc, const mrb_value *argv, struct RClass *c)
-{
-  return mrb_obj_new(mrb,c,argc,argv);
-}
-
-MRB_API mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv);
-
-/**
- * Creates a new instance of Class, Class.
- *
- * Example:
- *
- *      void
- *      mrb_example_gem_init(mrb_state* mrb) {
- *        struct RClass *example_class;
- *
- *        mrb_value obj;
- *        example_class = mrb_class_new(mrb, mrb->object_class);
- *        obj = mrb_obj_new(mrb, example_class, 0, NULL); // => #<#<Class:0x9a945b8>:0x9a94588>
- *        mrb_p(mrb, obj); // => Kernel#p
- *       }
- *
- * @param [mrb_state*] mrb The current mruby state.
- * @param [struct RClass *] super The super class or parent.
- * @return [struct RClass *] Reference to the new class.
- */
-MRB_API struct RClass * mrb_class_new(mrb_state *mrb, struct RClass *super);
-
-/**
- * Creates a new module, Module.
- *
- * Example:
- *      void
- *      mrb_example_gem_init(mrb_state* mrb) {
- *        struct RClass *example_module;
- *
- *        example_module = mrb_module_new(mrb);
- *      }
- *
- * @param [mrb_state*] mrb The current mruby state.
- * @return [struct RClass *] Reference to the new module.
- */
-MRB_API struct RClass * mrb_module_new(mrb_state *mrb);
-
-/**
- * Returns an mrb_bool. True if class was defined, and false if the class was not defined.
- *
- * Example:
- *     void
- *     mrb_example_gem_init(mrb_state* mrb) {
- *       struct RClass *example_class;
- *       mrb_bool cd;
- *
- *       example_class = mrb_define_class(mrb, "ExampleClass", mrb->object_class);
- *       cd = mrb_class_defined(mrb, "ExampleClass");
- *
- *       // If mrb_class_defined returns 1 then puts "True"
- *       // If mrb_class_defined returns 0 then puts "False"
- *       if (cd == 1){
- *         puts("True");
- *       }
- *       else {
- *         puts("False");
- *       }
- *      }
- *
- * @param [mrb_state*] mrb The current mruby state.
- * @param [const char *] name A string representing the name of the class.
- * @return [mrb_bool] A boolean value.
- */
-MRB_API mrb_bool mrb_class_defined(mrb_state *mrb, const char *name);
-
-/**
- * Gets a class.
- * @param [mrb_state*] mrb The current mruby state.
- * @param [const char *] name The name of the class.
- * @return [struct RClass *] A reference to the class.
-*/
-MRB_API struct RClass * mrb_class_get(mrb_state *mrb, const char *name);
-
-/**
- * Gets a exception class.
- * @param [mrb_state*] mrb The current mruby state.
- * @param [const char *] name The name of the class.
- * @return [struct RClass *] A reference to the class.
-*/
-MRB_API struct RClass * mrb_exc_get(mrb_state *mrb, const char *name);
-
-/**
- * Returns an mrb_bool. True if inner class was defined, and false if the inner class was not defined.
- *
- * Example:
- *     void
- *     mrb_example_gem_init(mrb_state* mrb) {
- *       struct RClass *example_outer, *example_inner;
- *       mrb_bool cd;
- *
- *       example_outer = mrb_define_module(mrb, "ExampleOuter");
- *
- *       example_inner = mrb_define_class_under(mrb, example_outer, "ExampleInner", mrb->object_class);
- *       cd = mrb_class_defined_under(mrb, example_outer, "ExampleInner");
- *
- *       // If mrb_class_defined_under returns 1 then puts "True"
- *       // If mrb_class_defined_under returns 0 then puts "False"
- *       if (cd == 1){
- *         puts("True");
- *       }
- *       else {
- *         puts("False");
- *       }
- *      }
- *
- * @param [mrb_state*] mrb The current mruby state.
- * @param [struct RClass *] outer The name of the outer class.
- * @param [const char *] name A string representing the name of the inner class.
- * @return [mrb_bool] A boolean value.
- */
-MRB_API mrb_bool mrb_class_defined_under(mrb_state *mrb, struct RClass *outer, const char *name);
-
-/**
- * Gets a child class.
- * @param [mrb_state*] mrb The current mruby state.
- * @param [struct RClass *] outer The name of the parent class.
- * @param [const char *] name The name of the class.
- * @return [struct RClass *] A reference to the class.
-*/
-MRB_API struct RClass * mrb_class_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
-
-/**
- * Gets a module.
- * @param [mrb_state*] mrb The current mruby state.
- * @param [const char *] name The name of the module.
- * @return [struct RClass *] A reference to the module.
-*/
-MRB_API struct RClass * mrb_module_get(mrb_state *mrb, const char *name);
-
-/**
- * Gets a module defined under another module.
- * @param [mrb_state*] mrb The current mruby state.
- * @param [struct RClass *] outer The name of the outer module.
- * @param [const char *] name The name of the module.
- * @return [struct RClass *] A reference to the module.
-*/
-MRB_API struct RClass * mrb_module_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
-MRB_API mrb_value mrb_notimplement_m(mrb_state*, mrb_value);
-
-/**
- * Duplicate an object.
- *
- * Equivalent to:
- *   Object#dup
- * @param [mrb_state*] mrb The current mruby state.
- * @param [mrb_value] obj Object to be duplicate.
- * @return [mrb_value] The newly duplicated object.
- */
-MRB_API mrb_value mrb_obj_dup(mrb_state *mrb, mrb_value obj);
-MRB_API mrb_value mrb_check_to_integer(mrb_state *mrb, mrb_value val, const char *method);
-
-/**
- * Returns true if obj responds to the given method. If the method was defined for that
- * class it returns true, it returns false otherwise.
- *
- *      Example:
- *      # Ruby style
- *      class ExampleClass
- *        def example_method
- *        end
- *      end
- *
- *      ExampleClass.new.respond_to?(:example_method) # => true
- *
- *      // C style
- *      void
- *      mrb_example_gem_init(mrb_state* mrb) {
- *        struct RClass *example_class;
- *        mrb_sym mid;
- *        mrb_bool obj_resp;
- *
- *        example_class = mrb_define_class(mrb, "ExampleClass", mrb->object_class);
- *        mrb_define_method(mrb, example_class, "example_method", exampleMethod, MRB_ARGS_NONE());
- *        mid = mrb_intern_str(mrb, mrb_str_new_lit(mrb, "example_method" ));
- *        obj_resp = mrb_obj_respond_to(mrb, example_class, mid); // => 1(true in Ruby world)
- *
- *        // If mrb_obj_respond_to returns 1 then puts "True"
- *        // If mrb_obj_respond_to returns 0 then puts "False"
- *        if (obj_resp == 1) {
- *          puts("True");
- *        }
- *        else if (obj_resp == 0) {
- *          puts("False");
- *        }
- *      }
- *
- * @param [mrb_state*] mrb The current mruby state.
- * @param [struct RClass *] c A reference to a class.
- * @param [mrb_sym] mid A symbol referencing a method id.
- * @return [mrb_bool] A boolean value.
- */
-MRB_API mrb_bool mrb_obj_respond_to(mrb_state *mrb, struct RClass* c, mrb_sym mid);
-
-/**
- * Defines a new class under a given module
- *
- * @param [mrb_state*] mrb The current mruby state.
- * @param [struct RClass *] outer Reference to the module under which the new class will be defined
- * @param [const char *] name The name of the defined class
- * @param [struct RClass *] super The new class parent
- * @return [struct RClass *] Reference to the newly defined class
- * @see mrb_define_class
- */
-MRB_API struct RClass * mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super);
-
-MRB_API struct RClass * mrb_define_module_under(mrb_state *mrb, struct RClass *outer, const char *name);
-
-/**
- * Function requires n arguments.
- *
- * @param n
- *      The number of required arguments.
- */
-#define MRB_ARGS_REQ(n)     ((mrb_aspec)((n)&0x1f) << 18)
-
-/**
- * Funtion takes n optional arguments
- *
- * @param n
- *      The number of optional arguments.
- */
-#define MRB_ARGS_OPT(n)     ((mrb_aspec)((n)&0x1f) << 13)
-
-/**
- * Funtion takes n1 mandatory arguments and n2 optional arguments
- *
- * @param n1
- *      The number of required arguments.
- * @param n2
- *      The number of optional arguments.
- */
-#define MRB_ARGS_ARG(n1,n2)   (MRB_ARGS_REQ(n1)|MRB_ARGS_OPT(n2))
-
-/** rest argument */
-#define MRB_ARGS_REST()     ((mrb_aspec)(1 << 12))
-
-/** required arguments after rest */
-#define MRB_ARGS_POST(n)    ((mrb_aspec)((n)&0x1f) << 7)
-
-/** keyword arguments (n of keys, kdict) */
-#define MRB_ARGS_KEY(n1,n2) ((mrb_aspec)((((n1)&0x1f) << 2) | ((n2)?(1<<1):0)))
-
-/**
- * Function takes a block argument
- */
-#define MRB_ARGS_BLOCK()    ((mrb_aspec)1)
-
-/**
- * Function accepts any number of arguments
- */
-#define MRB_ARGS_ANY()      MRB_ARGS_REST()
-
-/**
- * Function accepts no arguments
- */
-#define MRB_ARGS_NONE()     ((mrb_aspec)0)
-
-/**
- * Format specifiers for {mrb_get_args} function
- *
- * Must be a C string composed of the following format specifiers:
- *
- * | char | Ruby type      | C types           | Notes                                               |
- * |:----:|----------------|-------------------|----------------------------------------------------|
- * | `o`  | {Object}       | {mrb_value}       | Could be used to retrieve any type of argument     |
- * | `C`  | {Class}/{Module} | {mrb_value}     |                                                    |
- * | `S`  | {String}       | {mrb_value}       | when `!` follows, the value may be `nil`           |
- * | `A`  | {Array}        | {mrb_value}       | when `!` follows, the value may be `nil`           |
- * | `H`  | {Hash}         | {mrb_value}       | when `!` follows, the value may be `nil`           |
- * | `s`  | {String}       | char *, {mrb_int} |  Receive two arguments; `s!` gives (`NULL`,`0`) for `nil`       |
- * | `z`  | {String}       | char *            | `NULL` terminated string; `z!` gives `NULL` for `nil`           |
- * | `a`  | {Array}        | {mrb_value} *, {mrb_int} | Receive two arguments; `a!` gives (`NULL`,`0`) for `nil` |
- * | `f`  | {Float}        | {mrb_float}       |                                                    |
- * | `i`  | {Integer}      | {mrb_int}         |                                                    |
- * | `b`  | boolean        | {mrb_bool}        |                                                    |
- * | `n`  | {Symbol}       | {mrb_sym}         |                                                    |
- * | `&`  | block          | {mrb_value}       |                                                    |
- * | `*`  | rest arguments | {mrb_value} *, {mrb_int} | Receive the rest of arguments as an array.  |
- * | &vert; | optional     |                   | After this spec following specs would be optional. |
- * | `?`  | optional given | {mrb_bool}        | `TRUE` if preceding argument is given. Used to check optional argument is given. |
- *
- * @see mrb_get_args
- */
-typedef const char *mrb_args_format;
-
-/**
- * Retrieve arguments from mrb_state.
- *
- * When applicable, implicit conversions (such as `to_str`, `to_ary`, `to_hash`) are
- * applied to received arguments.
- * Used inside a function of mrb_func_t type.
- *
- * @param mrb The current MRuby state.
- * @param format [mrb_args_format] is a list of format specifiers
- * @param ... The passing variadic arguments must be a pointer of retrieving type.
- * @return the number of arguments retrieved.
- * @see mrb_args_format
- */
-MRB_API mrb_int mrb_get_args(mrb_state *mrb, mrb_args_format format, ...);
-
-static inline mrb_sym
-mrb_get_mid(mrb_state *mrb) /* get method symbol */
-{
-  return mrb->c->ci->mid;
-}
-
-static inline int
-mrb_get_argc(mrb_state *mrb) /* get argc */
-{
-  return mrb->c->ci->argc;
-}
-
-/* `strlen` for character string literals (use with caution or `strlen` instead)
-    Adjacent string literals are concatenated in C/C++ in translation phase 6.
-    If `lit` is not one, the compiler will report a syntax error:
-     MSVC: "error C2143: syntax error : missing ')' before 'string'"
-     GCC:  "error: expected ')' before string constant"
-*/
-#define mrb_strlen_lit(lit) (sizeof(lit "") - 1)
-
-/**
- * Call existing ruby functions.
- *
- *      #include <stdio.h>
- *      #include <mruby.h>
- *      #include "mruby/compile.h"
- *
- *      int
- *      main()
- *      {
- *        mrb_int i = 99;
- *        mrb_state *mrb = mrb_open();
- *
- *        if (!mrb) { }
- *        FILE *fp = fopen("test.rb","r");
- *        mrb_value obj = mrb_load_file(mrb,fp);
- *        mrb_funcall(mrb, obj, "method_name", 1, mrb_fixnum_value(i));
- *        fclose(fp);
- *        mrb_close(mrb);
- *       }
- * @param [mrb_state*] mrb_state* The current mruby state.
- * @param [mrb_value] mrb_value A reference to an mruby value.
- * @param [const char*] const char* The name of the method.
- * @param [mrb_int] mrb_int The number of arguments the method has.
- * @param [...] ... Variadic values(not type safe!).
- * @return [mrb_value] mrb_value mruby function value.
- */
-MRB_API mrb_value mrb_funcall(mrb_state*, mrb_value, const char*, mrb_int,...);
-/**
- * Call existing ruby functions. This is basically the type safe version of mrb_funcall.
- *
- *      #include <stdio.h>
- *      #include <mruby.h>
- *      #include "mruby/compile.h"
- *      int
- *      main()
- *      {
- *        mrb_int i = 99;
- *        mrb_state *mrb = mrb_open();
- *
- *        if (!mrb) { }
- *        mrb_sym m_sym = mrb_intern_lit(mrb, "method_name"); // Symbol for method.
- *
- *        FILE *fp = fopen("test.rb","r");
- *        mrb_value obj = mrb_load_file(mrb,fp);
- *        mrb_funcall_argv(mrb, obj, m_sym, 1, &obj); // Calling ruby function from test.rb.
- *        fclose(fp);
- *        mrb_close(mrb);
- *       }
- * @param [mrb_state*] mrb_state* The current mruby state.
- * @param [mrb_value] mrb_value A reference to an mruby value.
- * @param [mrb_sym] mrb_sym The symbol representing the method.
- * @param [mrb_int] mrb_int The number of arguments the method has.
- * @param [const mrb_value*] mrb_value* Pointer to the object.
- * @return [mrb_value] mrb_value mruby function value.
- * @see mrb_funcall
- */
-MRB_API mrb_value mrb_funcall_argv(mrb_state*, mrb_value, mrb_sym, mrb_int, const mrb_value*);
-/**
- * Call existing ruby functions with a block.
- */
-MRB_API mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, mrb_int, const mrb_value*, mrb_value);
-/**
- * Create a symbol
- *
- *     # Ruby style:
- *     :pizza # => :pizza
- *
- *     // C style:
- *     mrb_sym m_sym = mrb_intern_lit(mrb, "pizza"); //  => :pizza
- * @param [mrb_state*] mrb_state* The current mruby state.
- * @param [const char*] const char* The name of the method.
- * @return [mrb_sym] mrb_sym A symbol.
- */
-MRB_API mrb_sym mrb_intern_cstr(mrb_state*,const char*);
-MRB_API mrb_sym mrb_intern(mrb_state*,const char*,size_t);
-MRB_API mrb_sym mrb_intern_static(mrb_state*,const char*,size_t);
-#define mrb_intern_lit(mrb, lit) mrb_intern_static(mrb, lit, mrb_strlen_lit(lit))
-MRB_API mrb_sym mrb_intern_str(mrb_state*,mrb_value);
-MRB_API mrb_value mrb_check_intern_cstr(mrb_state*,const char*);
-MRB_API mrb_value mrb_check_intern(mrb_state*,const char*,size_t);
-MRB_API mrb_value mrb_check_intern_str(mrb_state*,mrb_value);
-MRB_API const char *mrb_sym2name(mrb_state*,mrb_sym);
-MRB_API const char *mrb_sym2name_len(mrb_state*,mrb_sym,mrb_int*);
-MRB_API mrb_value mrb_sym2str(mrb_state*,mrb_sym);
-
-MRB_API void *mrb_malloc(mrb_state*, size_t);         /* raise RuntimeError if no mem */
-MRB_API void *mrb_calloc(mrb_state*, size_t, size_t); /* ditto */
-MRB_API void *mrb_realloc(mrb_state*, void*, size_t); /* ditto */
-MRB_API void *mrb_realloc_simple(mrb_state*, void*, size_t); /* return NULL if no memory available */
-MRB_API void *mrb_malloc_simple(mrb_state*, size_t);  /* return NULL if no memory available */
-MRB_API struct RBasic *mrb_obj_alloc(mrb_state*, enum mrb_vtype, struct RClass*);
-MRB_API void mrb_free(mrb_state*, void*);
-
-MRB_API mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len);
-
-/**
- * Turns a C string into a Ruby string value.
- */
-MRB_API mrb_value mrb_str_new_cstr(mrb_state*, const char*);
-MRB_API mrb_value mrb_str_new_static(mrb_state *mrb, const char *p, size_t len);
-#define mrb_str_new_lit(mrb, lit) mrb_str_new_static(mrb, (lit), mrb_strlen_lit(lit))
-
-#ifdef _WIN32
-char* mrb_utf8_from_locale(const char *p, size_t len);
-char* mrb_locale_from_utf8(const char *p, size_t len);
-#define mrb_locale_free(p) free(p)
-#define mrb_utf8_free(p) free(p)
-#else
-#define mrb_utf8_from_locale(p, l) (p)
-#define mrb_locale_from_utf8(p, l) (p)
-#define mrb_locale_free(p)
-#define mrb_utf8_free(p)
-#endif
-
-/**
- * Creates new mrb_state.
- *
- * @return
- *      Pointer to the newly created mrb_state.
- */
-MRB_API mrb_state* mrb_open(void);
-
-/**
- * Create new mrb_state with custom allocators.
- *
- * @param f
- *      Reference to the allocation function.
- * @param ud
- *      User data will be passed to custom allocator f.
- *      If user data isn't required just pass NULL.
- * @return
- *      Pointer to the newly created mrb_state.
- */
-MRB_API mrb_state* mrb_open_allocf(mrb_allocf f, void *ud);
-
-/**
- * Create new mrb_state with just the MRuby core
- *
- * @param f
- *      Reference to the allocation function.
- *      Use mrb_default_allocf for the default
- * @param ud
- *      User data will be passed to custom allocator f.
- *      If user data isn't required just pass NULL.
- * @return
- *      Pointer to the newly created mrb_state.
- */
-MRB_API mrb_state* mrb_open_core(mrb_allocf f, void *ud);
-
-/**
- * Closes and frees a mrb_state.
- *
- * @param mrb
- *      Pointer to the mrb_state to be closed.
- */
-MRB_API void mrb_close(mrb_state *mrb);
-
-/**
- * The default allocation function.
- *
- * @see mrb_allocf
- */
-MRB_API void* mrb_default_allocf(mrb_state*, void*, size_t, void*);
-
-MRB_API mrb_value mrb_top_self(mrb_state *);
-MRB_API mrb_value mrb_run(mrb_state*, struct RProc*, mrb_value);
-MRB_API mrb_value mrb_top_run(mrb_state*, struct RProc*, mrb_value, unsigned int);
-MRB_API mrb_value mrb_vm_run(mrb_state*, struct RProc*, mrb_value, unsigned int);
-MRB_API mrb_value mrb_vm_exec(mrb_state*, struct RProc*, mrb_code*);
-/* compatibility macros */
-#define mrb_toplevel_run_keep(m,p,k) mrb_top_run((m),(p),mrb_top_self(m),(k))
-#define mrb_toplevel_run(m,p) mrb_toplevel_run_keep((m),(p),0)
-#define mrb_context_run(m,p,s,k) mrb_vm_run((m),(p),(s),(k))
-
-MRB_API void mrb_p(mrb_state*, mrb_value);
-MRB_API mrb_int mrb_obj_id(mrb_value obj);
-MRB_API mrb_sym mrb_obj_to_sym(mrb_state *mrb, mrb_value name);
-
-MRB_API mrb_bool mrb_obj_eq(mrb_state*, mrb_value, mrb_value);
-MRB_API mrb_bool mrb_obj_equal(mrb_state*, mrb_value, mrb_value);
-MRB_API mrb_bool mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
-MRB_API mrb_value mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base);
-MRB_API mrb_value mrb_Integer(mrb_state *mrb, mrb_value val);
-MRB_API mrb_value mrb_Float(mrb_state *mrb, mrb_value val);
-MRB_API mrb_value mrb_inspect(mrb_state *mrb, mrb_value obj);
-MRB_API mrb_bool mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
-
-static inline int mrb_gc_arena_save(mrb_state*);
-static inline void mrb_gc_arena_restore(mrb_state*,int);
-
-static inline int
-mrb_gc_arena_save(mrb_state *mrb)
-{
-  return mrb->gc.arena_idx;
-}
-
-static inline void
-mrb_gc_arena_restore(mrb_state *mrb, int idx)
-{
-  mrb->gc.arena_idx = idx;
-}
-
-MRB_API int mrb_gc_arena_save(mrb_state*);
-MRB_API void mrb_gc_arena_restore(mrb_state*,int);
-
-MRB_API void mrb_garbage_collect(mrb_state*);
-MRB_API void mrb_full_gc(mrb_state*);
-MRB_API void mrb_incremental_gc(mrb_state *);
-MRB_API void mrb_gc_mark(mrb_state*,struct RBasic*);
-#define mrb_gc_mark_value(mrb,val) do {\
-  if (!mrb_immediate_p(val)) mrb_gc_mark((mrb), mrb_basic_ptr(val)); \
-} while (0)
-MRB_API void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*);
-#define mrb_field_write_barrier_value(mrb, obj, val) do{\
-  if (!mrb_immediate_p(val)) mrb_field_write_barrier((mrb), (obj), mrb_basic_ptr(val)); \
-} while (0)
-MRB_API void mrb_write_barrier(mrb_state *, struct RBasic*);
-
-MRB_API mrb_value mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method);
-MRB_API mrb_value mrb_any_to_s(mrb_state *mrb, mrb_value obj);
-MRB_API const char * mrb_obj_classname(mrb_state *mrb, mrb_value obj);
-MRB_API struct RClass* mrb_obj_class(mrb_state *mrb, mrb_value obj);
-MRB_API mrb_value mrb_class_path(mrb_state *mrb, struct RClass *c);
-MRB_API mrb_value mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method);
-MRB_API mrb_bool mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c);
-MRB_API mrb_value mrb_obj_inspect(mrb_state *mrb, mrb_value self);
-MRB_API mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self);
-
-#ifndef ISPRINT
-#define ISASCII(c) ((unsigned)(c) <= 0x7f)
-#define ISPRINT(c) (((unsigned)(c) - 0x20) < 0x5f)
-#define ISSPACE(c) ((c) == ' ' || (unsigned)(c) - '\t' < 5)
-#define ISUPPER(c) (((unsigned)(c) - 'A') < 26)
-#define ISLOWER(c) (((unsigned)(c) - 'a') < 26)
-#define ISALPHA(c) ((((unsigned)(c) | 0x20) - 'a') < 26)
-#define ISDIGIT(c) (((unsigned)(c) - '0') < 10)
-#define ISXDIGIT(c) (ISDIGIT(c) || ((unsigned)(c) | 0x20) - 'a' < 6)
-#define ISALNUM(c) (ISALPHA(c) || ISDIGIT(c))
-#define ISBLANK(c) ((c) == ' ' || (c) == '\t')
-#define ISCNTRL(c) ((unsigned)(c) < 0x20 || (c) == 0x7f)
-#define TOUPPER(c) (ISLOWER(c) ? ((c) & 0x5f) : (c))
-#define TOLOWER(c) (ISUPPER(c) ? ((c) | 0x20) : (c))
-#endif
-
-MRB_API mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len);
-MRB_API mrb_noreturn void mrb_exc_raise(mrb_state *mrb, mrb_value exc);
-
-MRB_API mrb_noreturn void mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg);
-MRB_API mrb_noreturn void mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...);
-MRB_API mrb_noreturn void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...);
-MRB_API void mrb_warn(mrb_state *mrb, const char *fmt, ...);
-MRB_API mrb_noreturn void mrb_bug(mrb_state *mrb, const char *fmt, ...);
-MRB_API void mrb_print_backtrace(mrb_state *mrb);
-MRB_API void mrb_print_error(mrb_state *mrb);
-
-/* macros to get typical exception objects
-   note:
-   + those E_* macros requires mrb_state* variable named mrb.
-   + exception objects obtained from those macros are local to mrb
-*/
-#define E_RUNTIME_ERROR             (mrb_exc_get(mrb, "RuntimeError"))
-#define E_TYPE_ERROR                (mrb_exc_get(mrb, "TypeError"))
-#define E_ARGUMENT_ERROR            (mrb_exc_get(mrb, "ArgumentError"))
-#define E_INDEX_ERROR               (mrb_exc_get(mrb, "IndexError"))
-#define E_RANGE_ERROR               (mrb_exc_get(mrb, "RangeError"))
-#define E_NAME_ERROR                (mrb_exc_get(mrb, "NameError"))
-#define E_NOMETHOD_ERROR            (mrb_exc_get(mrb, "NoMethodError"))
-#define E_SCRIPT_ERROR              (mrb_exc_get(mrb, "ScriptError"))
-#define E_SYNTAX_ERROR              (mrb_exc_get(mrb, "SyntaxError"))
-#define E_LOCALJUMP_ERROR           (mrb_exc_get(mrb, "LocalJumpError"))
-#define E_REGEXP_ERROR              (mrb_exc_get(mrb, "RegexpError"))
-
-#define E_NOTIMP_ERROR              (mrb_exc_get(mrb, "NotImplementedError"))
-#define E_FLOATDOMAIN_ERROR         (mrb_exc_get(mrb, "FloatDomainError"))
-
-#define E_KEY_ERROR                 (mrb_exc_get(mrb, "KeyError"))
-
-MRB_API mrb_value mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg);
-MRB_API mrb_value mrb_yield_argv(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv);
-MRB_API mrb_value mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv, mrb_value self, struct RClass *c);
-
-/* continue execution to the proc */
-/* this function should always be called as the last function of a method */
-/* e.g. return mrb_yield_cont(mrb, proc, self, argc, argv); */
-mrb_value mrb_yield_cont(mrb_state *mrb, mrb_value b, mrb_value self, mrb_int argc, const mrb_value *argv);
-
-/* mrb_gc_protect() leaves the object in the arena */
-MRB_API void mrb_gc_protect(mrb_state *mrb, mrb_value obj);
-/* mrb_gc_register() keeps the object from GC. */
-MRB_API void mrb_gc_register(mrb_state *mrb, mrb_value obj);
-/* mrb_gc_unregister() removes the object from GC root. */
-MRB_API void mrb_gc_unregister(mrb_state *mrb, mrb_value obj);
-
-MRB_API mrb_value mrb_to_int(mrb_state *mrb, mrb_value val);
-#define mrb_int(mrb, val) mrb_fixnum(mrb_to_int(mrb, val))
-MRB_API void mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t);
-
-typedef enum call_type {
-  CALL_PUBLIC,
-  CALL_FCALL,
-  CALL_VCALL,
-  CALL_TYPE_MAX
-} call_type;
-
-MRB_API void mrb_define_alias(mrb_state *mrb, struct RClass *klass, const char *name1, const char *name2);
-MRB_API const char *mrb_class_name(mrb_state *mrb, struct RClass* klass);
-MRB_API void mrb_define_global_const(mrb_state *mrb, const char *name, mrb_value val);
-
-MRB_API mrb_value mrb_attr_get(mrb_state *mrb, mrb_value obj, mrb_sym id);
-
-MRB_API mrb_bool mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid);
-MRB_API mrb_bool mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c);
-MRB_API mrb_bool mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func);
-
-
-/*
- * Resume a Fiber
- *
- * @mrbgem mruby-fiber
- */
-MRB_API mrb_value mrb_fiber_resume(mrb_state *mrb, mrb_value fib, mrb_int argc, const mrb_value *argv);
-
-/*
- * Yield a Fiber
- *
- * @mrbgem mruby-fiber
- */
-MRB_API mrb_value mrb_fiber_yield(mrb_state *mrb, mrb_int argc, const mrb_value *argv);
-
-/*
- * FiberError reference
- *
- * @mrbgem mruby-fiber
- */
-#define E_FIBER_ERROR (mrb_exc_get(mrb, "FiberError"))
-
-/* memory pool implementation */
-typedef struct mrb_pool mrb_pool;
-MRB_API struct mrb_pool* mrb_pool_open(mrb_state*);
-MRB_API void mrb_pool_close(struct mrb_pool*);
-MRB_API void* mrb_pool_alloc(struct mrb_pool*, size_t);
-MRB_API void* mrb_pool_realloc(struct mrb_pool*, void*, size_t oldlen, size_t newlen);
-MRB_API mrb_bool mrb_pool_can_realloc(struct mrb_pool*, void*, size_t);
-MRB_API void* mrb_alloca(mrb_state *mrb, size_t);
-
-MRB_API void mrb_state_atexit(mrb_state *mrb, mrb_atexit_func func);
-
-MRB_API void mrb_show_version(mrb_state *mrb);
-MRB_API void mrb_show_copyright(mrb_state *mrb);
-
-MRB_API mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
-
-#if 0
-/* memcpy and memset does not work with gdb reverse-next on my box */
-/* use naive memcpy and memset instead */
-#undef memcpy
-#undef memset
-static inline void*
-mrbmemcpy(void *dst, const void *src, size_t n)
-{
-  char *d = (char*)dst;
-  const char *s = (const char*)src;
-  while (n--)
-    *d++ = *s++;
-  return d;
-}
-#define memcpy(a,b,c) mrbmemcpy(a,b,c)
-
-static inline void*
-mrbmemset(void *s, int c, size_t n)
-{
-  char *t = (char*)s;
-  while (n--)
-    *t++ = c;
-  return s;
-}
-#define memset(a,b,c) mrbmemset(a,b,c)
-#endif
-
-MRB_END_DECL
-
-#endif  /* MRUBY_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/LEGAL cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/LEGAL
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/LEGAL	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/LEGAL	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-LEGAL NOTICE INFORMATION
-------------------------
-
-All the files in this distribution are covered under the MIT license
-(see the file MITL) except some files mentioned below:
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/lib/mruby/source.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/lib/mruby/source.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/lib/mruby/source.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/lib/mruby/source.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-require "pathname"
-
-module MRuby
-  module Source
-    # MRuby's source root directory
-    ROOT = Pathname.new(File.expand_path('../../../',__FILE__))
-
-    # Reads a constant defined at version.h
-    MRUBY_READ_VERSION_CONSTANT = Proc.new { |name| ROOT.join('include','mruby','version.h').read.match(/^#define #{name} +"?([\w\. ]+)"?$/)[1] }
-
-    MRUBY_RUBY_VERSION = MRUBY_READ_VERSION_CONSTANT['MRUBY_RUBY_VERSION']
-    MRUBY_RUBY_ENGINE = MRUBY_READ_VERSION_CONSTANT['MRUBY_RUBY_ENGINE']
-
-    MRUBY_RELEASE_MAJOR = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_RELEASE_MAJOR'])
-    MRUBY_RELEASE_MINOR = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_RELEASE_MINOR'])
-    MRUBY_RELEASE_TEENY = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_RELEASE_TEENY'])
-
-    MRUBY_VERSION = [MRUBY_RELEASE_MAJOR,MRUBY_RELEASE_MINOR,MRUBY_RELEASE_TEENY].join('.')
-    MRUBY_RELEASE_NO = (MRUBY_RELEASE_MAJOR * 100 * 100 + MRUBY_RELEASE_MINOR * 100 + MRUBY_RELEASE_TEENY)
-
-    MRUBY_RELEASE_YEAR = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_RELEASE_YEAR'])
-    MRUBY_RELEASE_MONTH = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_RELEASE_MONTH'])
-    MRUBY_RELEASE_DAY = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_RELEASE_DAY'])
-    MRUBY_RELEASE_DATE = [MRUBY_RELEASE_YEAR,MRUBY_RELEASE_MONTH,MRUBY_RELEASE_DAY].join('.')
-
-    MRUBY_BIRTH_YEAR = Integer(MRUBY_READ_VERSION_CONSTANT['MRUBY_BIRTH_YEAR'])
-
-    MRUBY_AUTHOR = MRUBY_READ_VERSION_CONSTANT['MRUBY_AUTHOR']
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Makefile cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Makefile
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Makefile	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-# mruby is using Rake (http://rake.rubyforge.org) as a build tool.
-# We provide a minimalistic version called minirake inside of our
-# codebase.
-
-RAKE = ruby ./minirake
-
-all :
-	$(RAKE)
-.PHONY : all
-
-test : all
-	$(RAKE) test
-.PHONY : test
-
-clean :
-	$(RAKE) clean
-.PHONY : clean
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/minirake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/minirake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/minirake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/minirake	1970-01-01 00:00:00.000000000 +0000
@@ -1,484 +0,0 @@
-#!/usr/bin/env ruby
-
-# Original is https://github.com/jimweirich/rake/
-# Copyright (c) 2003 Jim Weirich
-# License: MIT-LICENSE
-
-require 'getoptlong'
-require 'fileutils'
-
-class String
-  def ext(newext='')
-    return self.dup if ['.', '..'].include? self
-    if newext != ''
-      newext = (newext =~ /^\./) ? newext : ("." + newext)
-    end
-    self.chomp(File.extname(self)) << newext
-  end
-
-  def pathmap(spec=nil, &block)
-    return self if spec.nil?
-    result = ''
-    spec.scan(/%\{[^}]*\}-?\d*[sdpfnxX%]|%-?\d+d|%.|[^%]+/) do |frag|
-      case frag
-      when '%f'
-        result << File.basename(self)
-      when '%n'
-        result << File.basename(self).ext
-      when '%d'
-        result << File.dirname(self)
-      when '%x'
-        result << File.extname(self)
-      when '%X'
-        result << self.ext
-      when '%p'
-        result << self
-      when '%s'
-        result << (File::ALT_SEPARATOR || File::SEPARATOR)
-      when '%-'
-        # do nothing
-      when '%%'
-        result << "%"
-      when /%(-?\d+)d/
-        result << pathmap_partial($1.to_i)
-      when /^%\{([^}]*)\}(\d*[dpfnxX])/
-        patterns, operator = $1, $2
-        result << pathmap('%' + operator).pathmap_replace(patterns, &block)
-      when /^%/
-        fail ArgumentError, "Unknown pathmap specifier #{frag} in '#{spec}'"
-      else
-        result << frag
-      end
-    end
-    result
-  end
-end
-
-module MiniRake
-  class Task
-    TASKS = Hash.new
-    RULES = Array.new
-
-    # List of prerequisites for a task.
-    attr_reader :prerequisites
-
-    # Source dependency for rule synthesized tasks.  Nil if task was not
-    # sythesized from a rule.
-    attr_accessor :source
-
-    # Create a task named +task_name+ with no actions or prerequisites..
-    # use +enhance+ to add actions and prerequisites.
-    def initialize(task_name)
-      @name = task_name
-      @prerequisites = []
-      @actions = []
-    end
-
-    # Enhance a task with prerequisites or actions.  Returns self.
-    def enhance(deps=nil, &block)
-      @prerequisites |= deps if deps
-      @actions << block if block_given?
-      self
-    end
-
-    # Name of the task.
-    def name
-      @name.to_s
-    end
-
-    # Invoke the task if it is needed.  Prerequites are invoked first.
-    def invoke
-      puts "Invoke #{name} (already=[#{@already_invoked}], needed=[#{needed?}])" if $trace
-      return if @already_invoked
-      @already_invoked = true
-      prerequisites = @prerequisites.collect{ |n| n.is_a?(Proc) ? n.call(name) : n }.flatten
-      prerequisites.each { |n| Task[n].invoke }
-      execute if needed?
-    end
-
-    # Execute the actions associated with this task.
-    def execute
-      puts "Execute #{name}" if $trace
-      self.class.enhance_with_matching_rule(name) if @actions.empty?
-      unless $dryrun
-        @actions.each { |act| act.call(self) }
-      end
-    end
-
-    # Is this task needed?
-    def needed?
-      true
-    end
-
-    # Timestamp for this task.  Basic tasks return the current time for
-    # their time stamp.  Other tasks can be more sophisticated.
-    def timestamp
-      Time.now
-    end
-
-    # Class Methods ----------------------------------------------------
-
-    class << self
-
-      # Clear the task list.  This cause rake to immediately forget all
-      # the tasks that have been assigned.  (Normally used in the unit
-      # tests.)
-      def clear
-        TASKS.clear
-        RULES.clear
-      end
-
-      # List of all defined tasks.
-      def tasks
-        TASKS.keys.sort.collect { |tn| Task[tn] }
-      end
-
-      # Return a task with the given name.  If the task is not currently
-      # known, try to synthesize one from the defined rules.  If no
-      # rules are found, but an existing file matches the task name,
-      # assume it is a file task with no dependencies or actions.
-      def [](task_name)
-        task_name = task_name.to_s
-        if task = TASKS[task_name]
-          return task
-        end
-        if task = enhance_with_matching_rule(task_name)
-          return task
-        end
-        if File.exist?(task_name)
-          return FileTask.define_task(task_name)
-        end
-        fail "Don't know how to rake #{task_name}"
-      end
-
-      # Define a task given +args+ and an option block.  If a rule with
-      # the given name already exists, the prerequisites and actions are
-      # added to the existing task.
-      def define_task(args, &block)
-        task_name, deps = resolve_args(args)
-        lookup(task_name).enhance([deps].flatten, &block)
-      end
-
-      # Define a rule for synthesizing tasks.
-      def create_rule(args, &block)
-        pattern, deps = resolve_args(args)
-        pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
-        RULES << [pattern, deps, block]
-      end
-
-
-      # Lookup a task.  Return an existing task if found, otherwise
-      # create a task of the current type.
-      def lookup(task_name)
-        name = task_name.to_s
-        TASKS[name] ||= self.new(name)
-      end
-
-      # If a rule can be found that matches the task name, enhance the
-      # task with the prerequisites and actions from the rule.  Set the
-      # source attribute of the task appropriately for the rule.  Return
-      # the enhanced task or nil of no rule was found.
-      def enhance_with_matching_rule(task_name)
-        RULES.each do |pattern, extensions, block|
-          if pattern.match(task_name)
-            ext = extensions.first
-            deps = extensions[1..-1]
-            case ext
-            when String
-              source = task_name.sub(/\.[^.]*$/, ext)
-            when Proc
-              source = ext.call(task_name)
-            else
-              fail "Don't know how to handle rule dependent: #{ext.inspect}"
-            end
-            if File.exist?(source)
-              task = FileTask.define_task({task_name => [source]+deps}, &block)
-              task.source = source
-              return task
-            end
-          end
-        end
-        nil
-      end
-
-      private
-
-      # Resolve the arguments for a task/rule.
-      def resolve_args(args)
-        case args
-        when Hash
-          fail "Too Many Task Names: #{args.keys.join(' ')}" if args.size > 1
-          fail "No Task Name Given" if args.size < 1
-          task_name = args.keys[0]
-          deps = args[task_name]
-          deps = [deps] if (String===deps) || (Regexp===deps) || (Proc===deps)
-        else
-          task_name = args
-          deps = []
-        end
-        [task_name, deps]
-      end
-    end
-  end
-
-
-  ######################################################################
-  class FileTask < Task
-    # Is this file task needed?  Yes if it doesn't exist, or if its time
-    # stamp is out of date.
-    def needed?
-      return true unless File.exist?(name)
-      prerequisites = @prerequisites.collect{ |n| n.is_a?(Proc) ? n.call(name) : n }.flatten
-      latest_prereq = prerequisites.collect{|n| Task[n].timestamp}.max
-      return false if latest_prereq.nil?
-      timestamp < latest_prereq
-    end
-
-    # Time stamp for file task.
-    def timestamp
-      return Time.at(0) unless File.exist?(name)
-      stat = File::stat(name.to_s)
-      stat.directory? ? Time.at(0) : stat.mtime
-    end
-  end
-
-  module DSL
-    # Declare a basic task.
-    def task(args, &block)
-      MiniRake::Task.define_task(args, &block)
-    end
-
-    # Declare a file task.
-    def file(args, &block)
-      MiniRake::FileTask.define_task(args, &block)
-    end
-
-    # Declare a set of files tasks to create the given directories on
-    # demand.
-    def directory(args, &block)
-      MiniRake::FileTask.define_task(args) do |t|
-        block.call(t) unless block.nil?
-        dir = args.is_a?(Hash) ? args.keys.first : args
-        (dir.split(File::SEPARATOR) + ['']).inject do |acc, part|
-          (acc + File::SEPARATOR).tap do |d|
-            Dir.mkdir(d) unless File.exists? d
-          end + part
-        end
-      end
-    end
-
-    # Declare a rule for auto-tasks.
-    def rule(args, &block)
-      MiniRake::Task.create_rule(args, &block)
-    end
-
-    # Write a message to standard out if $verbose is enabled.
-    def log(msg)
-      print "  " if $trace && $verbose
-      puts msg if $verbose
-    end
-
-    # Run the system command +cmd+.
-    def sh(cmd)
-      puts cmd if $verbose
-      system(cmd) or fail "Command Failed: [#{cmd}]"
-    end
-
-    def desc(text)
-    end
-  end
-end
-
-Rake = MiniRake
-extend MiniRake::DSL
-
-
-######################################################################
-# Task Definition Functions ...
-
-######################################################################
-# Rake main application object.  When invoking +rake+ from the command
-# line, a RakeApp object is created and run.
-#
-class RakeApp
-  RAKEFILES = ['rakefile', 'Rakefile']
-
-  OPTIONS = [
-    ['--dry-run',  '-n', GetoptLong::NO_ARGUMENT,
-      "Do a dry run without executing actions."],
-    ['--help',     '-H', GetoptLong::NO_ARGUMENT,
-      "Display this help message."],
-    ['--libdir',   '-I', GetoptLong::REQUIRED_ARGUMENT,
-      "Include LIBDIR in the search path for required modules."],
-    ['--nosearch', '-N', GetoptLong::NO_ARGUMENT,
-      "Do not search parent directories for the Rakefile."],
-    ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
-      "Do not log messages to standard output (default)."],
-    ['--rakefile', '-f', GetoptLong::REQUIRED_ARGUMENT,
-      "Use FILE as the rakefile."],
-    ['--require',  '-r', GetoptLong::REQUIRED_ARGUMENT,
-      "Require MODULE before executing rakefile."],
-    ['--tasks',    '-T', GetoptLong::NO_ARGUMENT,
-      "Display the tasks and dependencies, then exit."],
-    ['--pull-gems','-p', GetoptLong::NO_ARGUMENT,
-      "Pull all git mrbgems."],
-    ['--trace',    '-t', GetoptLong::NO_ARGUMENT,
-      "Turn on invoke/execute tracing."],
-    ['--usage',    '-h', GetoptLong::NO_ARGUMENT,
-      "Display usage."],
-    ['--verbose',  '-v', GetoptLong::NO_ARGUMENT,
-      "Log message to standard output."],
-    ['--directory', '-C', GetoptLong::REQUIRED_ARGUMENT,
-      "Change executing directory of rakefiles."]
-  ]
-
-  # Create a RakeApp object.
-  def initialize
-    @rakefile = nil
-    @nosearch = false
-  end
-
-  # True if one of the files in RAKEFILES is in the current directory.
-  # If a match is found, it is copied into @rakefile.
-  def have_rakefile
-    RAKEFILES.each do |fn|
-      if File.exist?(fn)
-        @rakefile = fn
-        return true
-      end
-    end
-    return false
-  end
-
-  # Display the program usage line.
-  def usage
-      puts "rake [-f rakefile] {options} targets..."
-  end
-
-  # Display the rake command line help.
-  def help
-    usage
-    puts
-    puts "Options are ..."
-    puts
-    OPTIONS.sort.each do |long, short, mode, desc|
-      if mode == GetoptLong::REQUIRED_ARGUMENT
-        if desc =~ /\b([A-Z]{2,})\b/
-          long = long + "=#{$1}"
-        end
-      end
-      printf "  %-20s (%s)\n", long, short
-      printf "      %s\n", desc
-    end
-  end
-
-  # Display the tasks and dependencies.
-  def display_tasks
-    MiniRake::Task.tasks.each do |t|
-      puts "#{t.class} #{t.name}"
-      t.prerequisites.each { |pre| puts "    #{pre}" }
-    end
-  end
-
-  # Return a list of the command line options supported by the
-  # program.
-  def command_line_options
-    OPTIONS.collect { |lst| lst[0..-2] }
-  end
-
-  # Do the option defined by +opt+ and +value+.
-  def do_option(opt, value)
-    case opt
-    when '--dry-run'
-      $dryrun = true
-      $trace = true
-    when '--help'
-      help
-      exit
-    when '--libdir'
-      $:.push(value)
-    when '--nosearch'
-      @nosearch = true
-    when '--quiet'
-      $verbose = false
-    when '--rakefile'
-      RAKEFILES.clear
-      RAKEFILES << value
-    when '--require'
-      require value
-    when '--tasks'
-      $show_tasks = true
-    when '--pull-gems'
-      $pull_gems = true
-    when '--trace'
-      $trace = true
-    when '--usage'
-      usage
-      exit
-    when '--verbose'
-      $verbose = true
-    when '--version'
-      puts "rake, version #{RAKEVERSION}"
-      exit
-    when '--directory'
-      Dir.chdir value
-    else
-      fail "Unknown option: #{opt}"
-    end
-  end
-
-  # Read and handle the command line options.
-  def handle_options
-    $verbose = false
-    $pull_gems = false
-    opts = GetoptLong.new(*command_line_options)
-    opts.each { |opt, value| do_option(opt, value) }
-  end
-
-  # Run the +rake+ application.
-  def run
-    handle_options
-    begin
-      here = Dir.pwd
-      while ! have_rakefile
-        Dir.chdir("..")
-        if Dir.pwd == here || @nosearch
-          fail "No Rakefile found (looking for: #{RAKEFILES.join(', ')})"
-        end
-        here = Dir.pwd
-      end
-      tasks = []
-      ARGV.each do |task_name|
-        if /^(\w+)=(.*)/.match(task_name)
-          ENV[$1] = $2
-        else
-          tasks << task_name
-        end
-      end
-      puts "(in #{Dir.pwd})"
-      $rakefile = @rakefile
-      load @rakefile
-      if $show_tasks
-        display_tasks
-      else
-        tasks.push("default") if tasks.size == 0
-        tasks.each do |task_name|
-          MiniRake::Task[task_name].invoke
-        end
-      end
-    rescue Exception => ex
-      puts "rake aborted!"
-      puts ex.message
-      if $trace
-        puts ex.backtrace.join("\n")
-      else
-        puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
-      end
-      exit 1
-    end
-  end
-end
-
-if __FILE__ == $0 then
-  RakeApp.new.run
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/MITL cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/MITL
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/MITL	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/MITL	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-Copyright (c) 2017 mruby developers
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/default.gembox cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/default.gembox
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/default.gembox	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/default.gembox	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-MRuby::GemBox.new do |conf|
-  # Use standard Kernel#sprintf method
-  conf.gem :core => "mruby-sprintf"
-
-  # Use standard print/puts/p
-  conf.gem :core => "mruby-print"
-
-  # Use standard Math module
-  conf.gem :core => "mruby-math"
-
-  # Use standard Time class
-  conf.gem :core => "mruby-time"
-
-  # Use standard Struct class
-  conf.gem :core => "mruby-struct"
-
-  # Use Enumerable module extension
-  conf.gem :core => "mruby-enum-ext"
-
-  # Use String class extension
-  conf.gem :core => "mruby-string-ext"
-
-  # Use Numeric class extension
-  conf.gem :core => "mruby-numeric-ext"
-
-  # Use Array class extension
-  conf.gem :core => "mruby-array-ext"
-
-  # Use Hash class extension
-  conf.gem :core => "mruby-hash-ext"
-
-  # Use Range class extension
-  conf.gem :core => "mruby-range-ext"
-
-  # Use Proc class extension
-  conf.gem :core => "mruby-proc-ext"
-
-  # Use Symbol class extension
-  conf.gem :core => "mruby-symbol-ext"
-
-  # Use Random class
-  conf.gem :core => "mruby-random"
-
-  # Use Object class extension
-  conf.gem :core => "mruby-object-ext"
-
-  # Use ObjectSpace class
-  conf.gem :core => "mruby-objectspace"
-
-  # Use Fiber class
-  conf.gem :core => "mruby-fiber"
-
-  # Use Enumerator class (require mruby-fiber)
-  conf.gem :core => "mruby-enumerator"
-
-  # Use Enumerator::Lazy class (require mruby-enumerator)
-  conf.gem :core => "mruby-enum-lazy"
-
-  # Use toplevel object (main) methods extension
-  conf.gem :core => "mruby-toplevel-ext"
-
-  # Generate mirb command
-  conf.gem :core => "mruby-bin-mirb"
-
-  # Generate mruby command
-  conf.gem :core => "mruby-bin-mruby"
-
-  # Generate mruby-strip command
-  conf.gem :core => "mruby-bin-strip"
-
-  # Use Kernel module extension
-  conf.gem :core => "mruby-kernel-ext"
-
-  # Use class/module extension
-  conf.gem :core => "mruby-class-ext"
-
-  # Use mruby-compiler to build other mrbgems
-  conf.gem :core => "mruby-compiler"
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/full-core.gembox cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/full-core.gembox
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/full-core.gembox	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/full-core.gembox	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MRuby::GemBox.new do |conf|
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-
-  Dir.glob("#{root}/mrbgems/mruby-*/mrbgem.rake") do |x|
-    g = File.basename File.dirname x
-    conf.gem :core => g unless g =~ /^mruby-(print|sprintf|bin-debugger|test)$/
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-array-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Array class extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrblib/array.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrblib/array.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrblib/array.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/mrblib/array.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,765 +0,0 @@
-class Array
-  ##
-  # call-seq:
-  #    Array.try_convert(obj) -> array or nil
-  #
-  # Tries to convert +obj+ into an array, using +to_ary+ method.
-  # converted array or +nil+ if +obj+ cannot be converted for any reason.
-  # This method can be used to check if an argument is an array.
-  #
-  #    Array.try_convert([1])   #=> [1]
-  #    Array.try_convert("1")   #=> nil
-  #
-  #    if tmp = Array.try_convert(arg)
-  #      # the argument is an array
-  #    elsif tmp = String.try_convert(arg)
-  #      # the argument is a string
-  #    end
-  #
-  def self.try_convert(obj)
-    if obj.respond_to?(:to_ary)
-      obj.to_ary
-    else
-      nil
-    end
-  end
-
-  ##
-  # call-seq:
-  #    ary.uniq!                -> ary or nil
-  #    ary.uniq! { |item| ... } -> ary or nil
-  #
-  # Removes duplicate elements from +self+.
-  # Returns <code>nil</code> if no changes are made (that is, no
-  # duplicates are found).
-  #
-  #    a = [ "a", "a", "b", "b", "c" ]
-  #    a.uniq!   #=> ["a", "b", "c"]
-  #    b = [ "a", "b", "c" ]
-  #    b.uniq!   #=> nil
-  #    c = [["student","sam"], ["student","george"], ["teacher","matz"]]
-  #    c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
-  #
-  def uniq!(&block)
-    ary = self.dup
-    result = []
-    if block
-      hash = {}
-      while ary.size > 0
-        val = ary.shift
-        key = block.call(val)
-        hash[key] = val unless hash.has_key?(key)
-      end
-      hash.each_value do |value|
-        result << value
-      end
-    else
-      while ary.size > 0
-        result << ary.shift
-        ary.delete(result.last)
-      end
-    end
-    if result.size == self.size
-      nil
-    else
-      self.replace(result)
-    end
-  end
-
-  ##
-  # call-seq:
-  #    ary.uniq                -> new_ary
-  #    ary.uniq { |item| ... } -> new_ary
-  #
-  # Returns a new array by removing duplicate values in +self+.
-  #
-  #    a = [ "a", "a", "b", "b", "c" ]
-  #    a.uniq   #=> ["a", "b", "c"]
-  #
-  #    b = [["student","sam"], ["student","george"], ["teacher","matz"]]
-  #    b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
-  #
-  def uniq(&block)
-    ary = self.dup
-    if block
-      ary.uniq!(&block)
-    else
-      ary.uniq!
-    end
-    ary
-  end
-
-  ##
-  # call-seq:
-  #    ary - other_ary    -> new_ary
-  #
-  # Array Difference---Returns a new array that is a copy of
-  # the original array, removing any items that also appear in
-  # <i>other_ary</i>. (If you need set-like behavior, see the
-  # library class Set.)
-  #
-  #    [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
-  #
-  def -(elem)
-    raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array
-
-    hash = {}
-    array = []
-    elem.each { |x| hash[x] = true }
-    self.each { |x| array << x unless hash[x] }
-    array
-  end
-
-  ##
-  # call-seq:
-  #    ary | other_ary     -> new_ary
-  #
-  # Set Union---Returns a new array by joining this array with
-  # <i>other_ary</i>, removing duplicates.
-  #
-  #    [ "a", "b", "c" ] | [ "c", "d", "a" ]
-  #           #=> [ "a", "b", "c", "d" ]
-  #
-  def |(elem)
-    raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array
-
-    ary = self + elem
-    ary.uniq! or ary
-  end
-
-  ##
-  # call-seq:
-  #    ary & other_ary      -> new_ary
-  #
-  # Set Intersection---Returns a new array
-  # containing elements common to the two arrays, with no duplicates.
-  #
-  #    [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
-  #
-  def &(elem)
-    raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array
-
-    hash = {}
-    array = []
-    elem.each{|v| hash[v] = true }
-    self.each do |v|
-      if hash[v]
-        array << v
-        hash.delete v
-      end
-    end
-    array
-  end
-
-  ##
-  # call-seq:
-  #    ary.flatten -> new_ary
-  #    ary.flatten(level) -> new_ary
-  #
-  # Returns a new array that is a one-dimensional flattening of this
-  # array (recursively). That is, for every element that is an array,
-  # extract its elements into the new array.  If the optional
-  # <i>level</i> argument determines the level of recursion to flatten.
-  #
-  #    s = [ 1, 2, 3 ]           #=> [1, 2, 3]
-  #    t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
-  #    a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
-  #    a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  #    a = [ 1, 2, [3, [4, 5] ] ]
-  #    a.flatten(1)              #=> [1, 2, 3, [4, 5]]
-  #
-  def flatten(depth=nil)
-    ar = []
-    self.each do |e|
-      if e.is_a?(Array) && (depth.nil? || depth > 0)
-        ar += e.flatten(depth.nil? ? nil : depth - 1)
-      else
-        ar << e
-      end
-    end
-    ar
-  end
-
-  ##
-  # call-seq:
-  #    ary.flatten!        -> ary or nil
-  #    ary.flatten!(level) -> array or nil
-  #
-  # Flattens +self+ in place.
-  # Returns <code>nil</code> if no modifications were made (i.e.,
-  # <i>ary</i> contains no subarrays.)  If the optional <i>level</i>
-  # argument determines the level of recursion to flatten.
-  #
-  #    a = [ 1, 2, [3, [4, 5] ] ]
-  #    a.flatten!   #=> [1, 2, 3, 4, 5]
-  #    a.flatten!   #=> nil
-  #    a            #=> [1, 2, 3, 4, 5]
-  #    a = [ 1, 2, [3, [4, 5] ] ]
-  #    a.flatten!(1) #=> [1, 2, 3, [4, 5]]
-  #
-  def flatten!(depth=nil)
-    modified = false
-    ar = []
-    self.each do |e|
-      if e.is_a?(Array) && (depth.nil? || depth > 0)
-        ar += e.flatten(depth.nil? ? nil : depth - 1)
-        modified = true
-      else
-        ar << e
-      end
-    end
-    if modified
-      self.replace(ar)
-    else
-      nil
-    end
-  end
-
-  ##
-  # call-seq:
-  #    ary.compact     -> new_ary
-  #
-  # Returns a copy of +self+ with all +nil+ elements removed.
-  #
-  #    [ "a", nil, "b", nil, "c", nil ].compact
-  #                      #=> [ "a", "b", "c" ]
-  #
-  def compact
-    result = self.dup
-    result.compact!
-    result
-  end
-
-  ##
-  # call-seq:
-  #    ary.compact!    -> ary  or  nil
-  #
-  # Removes +nil+ elements from the array.
-  # Returns +nil+ if no changes were made, otherwise returns
-  # <i>ary</i>.
-  #
-  #    [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
-  #    [ "a", "b", "c" ].compact!           #=> nil
-  #
-  def compact!
-    result = self.select { |e| !e.nil? }
-    if result.size == self.size
-      nil
-    else
-      self.replace(result)
-    end
-  end
-
-  # for efficiency
-  def reverse_each(&block)
-    return to_enum :reverse_each unless block_given?
-
-    i = self.size - 1
-    while i>=0
-      block.call(self[i])
-      i -= 1
-    end
-    self
-  end
-
-  NONE=Object.new
-  ##
-  #  call-seq:
-  #     ary.fetch(index)                    -> obj
-  #     ary.fetch(index, default)           -> obj
-  #     ary.fetch(index) { |index| block }  -> obj
-  #
-  #  Tries to return the element at position +index+, but throws an IndexError
-  #  exception if the referenced +index+ lies outside of the array bounds.  This
-  #  error can be prevented by supplying a second argument, which will act as a
-  #  +default+ value.
-  #
-  #  Alternatively, if a block is given it will only be executed when an
-  #  invalid +index+ is referenced.
-  #
-  #  Negative values of +index+ count from the end of the array.
-  #
-  #     a = [ 11, 22, 33, 44 ]
-  #     a.fetch(1)               #=> 22
-  #     a.fetch(-1)              #=> 44
-  #     a.fetch(4, 'cat')        #=> "cat"
-  #     a.fetch(100) { |i| puts "#{i} is out of bounds" }
-  #                              #=> "100 is out of bounds"
-  #
-
-  def fetch(n=nil, ifnone=NONE, &block)
-    warn "block supersedes default value argument" if !n.nil? && ifnone != NONE && block
-
-    idx = n
-    if idx < 0
-      idx += size
-    end
-    if idx < 0 || size <= idx
-      return block.call(n) if block
-      if ifnone == NONE
-        raise IndexError, "index #{n} outside of array bounds: #{-size}...#{size}"
-      end
-      return ifnone
-    end
-    self[idx]
-  end
-
-  ##
-  #  call-seq:
-  #     ary.fill(obj)                                 -> ary
-  #     ary.fill(obj, start [, length])               -> ary
-  #     ary.fill(obj, range )                         -> ary
-  #     ary.fill { |index| block }                    -> ary
-  #     ary.fill(start [, length] ) { |index| block } -> ary
-  #     ary.fill(range) { |index| block }             -> ary
-  #
-  #  The first three forms set the selected elements of +self+ (which
-  #  may be the entire array) to +obj+.
-  #
-  #  A +start+ of +nil+ is equivalent to zero.
-  #
-  #  A +length+ of +nil+ is equivalent to the length of the array.
-  #
-  #  The last three forms fill the array with the value of the given block,
-  #  which is passed the absolute index of each element to be filled.
-  #
-  #  Negative values of +start+ count from the end of the array, where +-1+ is
-  #  the last element.
-  #
-  #     a = [ "a", "b", "c", "d" ]
-  #     a.fill("x")              #=> ["x", "x", "x", "x"]
-  #     a.fill("w", -1)          #=> ["x", "x", "x", "w"]
-  #     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
-  #     a.fill("y", 0..1)        #=> ["y", "y", "z", "z"]
-  #     a.fill { |i| i*i }       #=> [0, 1, 4, 9]
-  #     a.fill(-2) { |i| i*i*i } #=> [0, 1, 8, 27]
-  #     a.fill(1, 2) { |i| i+1 } #=> [0, 2, 3, 27]
-  #     a.fill(0..1) { |i| i+1 } #=> [1, 2, 3, 27]
-  #
-
-  def fill(arg0=nil, arg1=nil, arg2=nil, &block)
-    if arg0.nil? && arg1.nil? && arg2.nil? && !block
-      raise ArgumentError, "wrong number of arguments (0 for 1..3)"
-    end
-
-    beg = len = 0
-    ary = []
-    if block
-      if arg0.nil? && arg1.nil? && arg2.nil?
-        # ary.fill { |index| block }                    -> ary
-        beg = 0
-        len = self.size
-      elsif !arg0.nil? && arg0.kind_of?(Range)
-        # ary.fill(range) { |index| block }             -> ary
-        beg = arg0.begin
-        beg += self.size if beg < 0
-        len = arg0.end
-        len += self.size if len < 0
-        len += 1 unless arg0.exclude_end?
-      elsif !arg0.nil?
-        # ary.fill(start [, length] ) { |index| block } -> ary
-        beg = arg0
-        beg += self.size if beg < 0
-        if arg1.nil?
-          len = self.size
-        else
-          len = arg0 + arg1
-        end
-      end
-    else
-      if !arg0.nil? && arg1.nil? && arg2.nil?
-        # ary.fill(obj)                                 -> ary
-        beg = 0
-        len = self.size
-      elsif !arg0.nil? && !arg1.nil? && arg1.kind_of?(Range)
-        # ary.fill(obj, range )                         -> ary
-        beg = arg1.begin
-        beg += self.size if beg < 0
-        len = arg1.end
-        len += self.size if len < 0
-        len += 1 unless arg1.exclude_end?
-      elsif !arg0.nil? && !arg1.nil?
-        # ary.fill(obj, start [, length])               -> ary
-        beg = arg1
-        beg += self.size if beg < 0
-        if arg2.nil?
-          len = self.size
-        else
-          len = beg + arg2
-        end
-      end
-    end
-
-    i = beg
-    if block
-      while i < len
-        self[i] = block.call(i)
-        i += 1
-      end
-    else
-      while i < len
-        self[i] = arg0
-        i += 1
-      end
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     ary.rotate(count=1)    -> new_ary
-  #
-  #  Returns a new array by rotating +self+ so that the element at +count+ is
-  #  the first element of the new array.
-  #
-  #  If +count+ is negative then it rotates in the opposite direction, starting
-  #  from the end of +self+ where +-1+ is the last element.
-  #
-  #     a = [ "a", "b", "c", "d" ]
-  #     a.rotate         #=> ["b", "c", "d", "a"]
-  #     a                #=> ["a", "b", "c", "d"]
-  #     a.rotate(2)      #=> ["c", "d", "a", "b"]
-  #     a.rotate(-3)     #=> ["b", "c", "d", "a"]
-
-  def rotate(count=1)
-    ary = []
-    len = self.length
-
-    if len > 0
-      idx = (count < 0) ? (len - (~count % len) - 1) : (count % len) # rotate count
-      len.times do
-        ary << self[idx]
-        idx += 1
-        idx = 0 if idx > len-1
-      end
-    end
-    ary
-  end
-
-  ##
-  #  call-seq:
-  #     ary.rotate!(count=1)   -> ary
-  #
-  #  Rotates +self+ in place so that the element at +count+ comes first, and
-  #  returns +self+.
-  #
-  #  If +count+ is negative then it rotates in the opposite direction, starting
-  #  from the end of the array where +-1+ is the last element.
-  #
-  #     a = [ "a", "b", "c", "d" ]
-  #     a.rotate!        #=> ["b", "c", "d", "a"]
-  #     a                #=> ["b", "c", "d", "a"]
-  #     a.rotate!(2)     #=> ["d", "a", "b", "c"]
-  #     a.rotate!(-3)    #=> ["a", "b", "c", "d"]
-
-  def rotate!(count=1)
-    self.replace(self.rotate(count))
-  end
-
-  ##
-  #  call-seq:
-  #     ary.delete_if { |item| block }  -> ary
-  #     ary.delete_if                   -> Enumerator
-  #
-  #  Deletes every element of +self+ for which block evaluates to +true+.
-  #
-  #  The array is changed instantly every time the block is called, not after
-  #  the iteration is over.
-  #
-  #  See also Array#reject!
-  #
-  #  If no block is given, an Enumerator is returned instead.
-  #
-  #     scores = [ 97, 42, 75 ]
-  #     scores.delete_if {|score| score < 80 }   #=> [97]
-
-  def delete_if(&block)
-    return to_enum :delete_if unless block_given?
-
-    idx = 0
-    while idx < self.size do
-      if block.call(self[idx])
-        self.delete_at(idx)
-      else
-        idx += 1
-      end
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     ary.reject! { |item| block }  -> ary or nil
-  #     ary.reject!                   -> Enumerator
-  #
-  #  Equivalent to Array#delete_if, deleting elements from +self+ for which the
-  #  block evaluates to +true+, but returns +nil+ if no changes were made.
-  #
-  #  The array is changed instantly every time the block is called, not after
-  #  the iteration is over.
-  #
-  #  See also Enumerable#reject and Array#delete_if.
-  #
-  #  If no block is given, an Enumerator is returned instead.
-
-  def reject!(&block)
-    return to_enum :reject! unless block_given?
-
-    len = self.size
-    idx = 0
-    while idx < self.size do
-      if block.call(self[idx])
-        self.delete_at(idx)
-      else
-        idx += 1
-      end
-    end
-    if self.size == len
-      nil
-    else
-      self
-    end
-  end
-
-  ##
-  #  call-seq:
-  #     ary.insert(index, obj...)  -> ary
-  #
-  #  Inserts the given values before the element with the given +index+.
-  #
-  #  Negative indices count backwards from the end of the array, where +-1+ is
-  #  the last element.
-  #
-  #     a = %w{ a b c d }
-  #     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
-  #     a.insert(-2, 1, 2, 3)   #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
-
-  def insert(idx, *args)
-    idx += self.size + 1 if idx < 0
-    self[idx, 0] = args
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     ary.bsearch {|x| block }  -> elem
-  #
-  #  By using binary search, finds a value from this array which meets
-  #  the given condition in O(log n) where n is the size of the array.
-  #
-  #  You can use this method in two use cases: a find-minimum mode and
-  #  a find-any mode.  In either case, the elements of the array must be
-  #  monotone (or sorted) with respect to the block.
-  #
-  #  In find-minimum mode (this is a good choice for typical use case),
-  #  the block must return true or false, and there must be an index i
-  #  (0 <= i <= ary.size) so that:
-  #
-  #  - the block returns false for any element whose index is less than
-  #    i, and
-  #  - the block returns true for any element whose index is greater
-  #    than or equal to i.
-  #
-  #  This method returns the i-th element.  If i is equal to ary.size,
-  #  it returns nil.
-  #
-  #     ary = [0, 4, 7, 10, 12]
-  #     ary.bsearch {|x| x >=   4 } #=> 4
-  #     ary.bsearch {|x| x >=   6 } #=> 7
-  #     ary.bsearch {|x| x >=  -1 } #=> 0
-  #     ary.bsearch {|x| x >= 100 } #=> nil
-  #
-  #  In find-any mode (this behaves like libc's bsearch(3)), the block
-  #  must return a number, and there must be two indices i and j
-  #  (0 <= i <= j <= ary.size) so that:
-  #
-  #  - the block returns a positive number for ary[k] if 0 <= k < i,
-  #  - the block returns zero for ary[k] if i <= k < j, and
-  #  - the block returns a negative number for ary[k] if
-  #    j <= k < ary.size.
-  #
-  #  Under this condition, this method returns any element whose index
-  #  is within i...j.  If i is equal to j (i.e., there is no element
-  #  that satisfies the block), this method returns nil.
-  #
-  #     ary = [0, 4, 7, 10, 12]
-  #     # try to find v such that 4 <= v < 8
-  #     ary.bsearch {|x| 1 - (x / 4).truncate } #=> 4 or 7
-  #     # try to find v such that 8 <= v < 10
-  #     ary.bsearch {|x| 4 - (x / 2).truncate } #=> nil
-  #
-  #  You must not mix the two modes at a time; the block must always
-  #  return either true/false, or always return a number.  It is
-  #  undefined which value is actually picked up at each iteration.
-
-  def bsearch(&block)
-    return to_enum :bsearch unless block_given?
-
-    low = 0
-    high = self.size
-    satisfied = false
-    while low < high
-      mid = low + ((high - low) / 2).truncate
-      val = self[mid]
-      v = block.call(val)
-      if v.is_a?(Integer)
-        return val if v == 0
-        smaller = v < 0
-      elsif v == true
-        satisfied = true
-        smaller = true
-      elsif v == false || v.nil?
-        smaller = false
-      end
-      if smaller
-        high = mid
-      else
-        low = mid + 1
-      end
-    end
-    return nil if low == self.size
-    return nil unless satisfied
-    self[low]
-  end
-
-  ##
-  #  call-seq:
-  #     ary.delete_if { |item| block }  -> ary
-  #     ary.delete_if                   -> Enumerator
-  #
-  #  Deletes every element of +self+ for which block evaluates to +true+.
-  #
-  #  The array is changed instantly every time the block is called, not after
-  #  the iteration is over.
-  #
-  #  See also Array#reject!
-  #
-  #  If no block is given, an Enumerator is returned instead.
-  #
-  #     scores = [ 97, 42, 75 ]
-  #     scores.delete_if {|score| score < 80 }   #=> [97]
-
-  def delete_if(&block)
-    return to_enum :delete_if unless block_given?
-
-    idx = 0
-    while idx < self.size do
-      if block.call(self[idx])
-        self.delete_at(idx)
-      else
-        idx += 1
-      end
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     ary.keep_if { |item| block } -> ary
-  #     ary.keep_if                  -> Enumerator
-  #
-  #  Deletes every element of +self+ for which the given block evaluates to
-  #  +false+.
-  #
-  #  See also Array#select!
-  #
-  #  If no block is given, an Enumerator is returned instead.
-  #
-  #     a = [1, 2, 3, 4, 5]
-  #     a.keep_if { |val| val > 3 } #=> [4, 5]
-
-  def keep_if(&block)
-    return to_enum :keep_if unless block_given?
-
-    idx = 0
-    len = self.size
-    while idx < self.size do
-      if block.call(self[idx])
-        idx += 1
-      else
-        self.delete_at(idx)
-      end
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     ary.select!  {|item| block } -> ary or nil
-  #     ary.select!                  -> Enumerator
-  #
-  #  Invokes the given block passing in successive elements from +self+,
-  #  deleting elements for which the block returns a +false+ value.
-  #
-  #  If changes were made, it will return +self+, otherwise it returns +nil+.
-  #
-  #  See also Array#keep_if
-  #
-  #  If no block is given, an Enumerator is returned instead.
-
-  def select!(&block)
-    return to_enum :select! unless block_given?
-
-    result = []
-    self.each do |x|
-      result << x if block.call(x)
-    end
-    return nil if self.size == result.size
-    self.replace(result)
-  end
-
-  ##
-  #  call-seq:
-  #     ary.index(val)            -> int or nil
-  #     ary.index {|item| block } ->  int or nil
-  #
-  #  Returns the _index_ of the first object in +ary+ such that the object is
-  #  <code>==</code> to +obj+.
-  #
-  #  If a block is given instead of an argument, returns the _index_ of the
-  #  first object for which the block returns +true+.  Returns +nil+ if no
-  #  match is found.
-  #
-  # ISO 15.2.12.5.14
-  def index(val=NONE, &block)
-    return to_enum(:find_index, val) if !block && val == NONE
-
-    if block
-      idx = 0
-      self.each do |*e|
-        return idx if block.call(*e)
-        idx += 1
-      end
-    else
-      return self.__ary_index(val)
-    end
-    nil
-  end
-
-  ##
-  #  call-seq:
-  #     ary.to_ary -> ary
-  #
-  #  Returns +self+.
-  #
-  def to_ary
-    self
-  end
-
-  ##
-  # call-seq:
-  #   ary.dig(idx, ...)                 -> object
-  #
-  # Extracts the nested value specified by the sequence of <i>idx</i>
-  # objects by calling +dig+ at each step, returning +nil+ if any
-  # intermediate step is +nil+.
-  #
-  def dig(idx,*args)
-    n = self[idx]
-    if args.size > 0
-      n&.dig(*args)
-    else
-      n
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/src/array.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/src/array.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/src/array.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/src/array.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-#include <mruby.h>
-#include <mruby/value.h>
-#include <mruby/array.h>
-#include <mruby/range.h>
-#include <mruby/hash.h>
-
-/*
- *  call-seq:
- *     ary.assoc(obj)   -> new_ary  or  nil
- *
- *  Searches through an array whose elements are also arrays
- *  comparing _obj_ with the first element of each contained array
- *  using obj.==.
- *  Returns the first contained array that matches (that
- *  is, the first associated array),
- *  or +nil+ if no match is found.
- *  See also <code>Array#rassoc</code>.
- *
- *     s1 = [ "colors", "red", "blue", "green" ]
- *     s2 = [ "letters", "a", "b", "c" ]
- *     s3 = "foo"
- *     a  = [ s1, s2, s3 ]
- *     a.assoc("letters")  #=> [ "letters", "a", "b", "c" ]
- *     a.assoc("foo")      #=> nil
- */
-
-static mrb_value
-mrb_ary_assoc(mrb_state *mrb, mrb_value ary)
-{
-  mrb_int i;
-  mrb_value v, k;
-
-  mrb_get_args(mrb, "o", &k);
-
-  for (i = 0; i < RARRAY_LEN(ary); ++i) {
-    v = mrb_check_array_type(mrb, RARRAY_PTR(ary)[i]);
-    if (!mrb_nil_p(v) && RARRAY_LEN(v) > 0 &&
-        mrb_equal(mrb, RARRAY_PTR(v)[0], k))
-      return v;
-  }
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     ary.rassoc(obj) -> new_ary or nil
- *
- *  Searches through the array whose elements are also arrays. Compares
- *  _obj_ with the second element of each contained array using
- *  <code>==</code>. Returns the first contained array that matches. See
- *  also <code>Array#assoc</code>.
- *
- *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
- *     a.rassoc("two")    #=> [2, "two"]
- *     a.rassoc("four")   #=> nil
- */
-
-static mrb_value
-mrb_ary_rassoc(mrb_state *mrb, mrb_value ary)
-{
-  mrb_int i;
-  mrb_value v, value;
-
-  mrb_get_args(mrb, "o", &value);
-
-  for (i = 0; i < RARRAY_LEN(ary); ++i) {
-    v = RARRAY_PTR(ary)[i];
-    if (mrb_type(v) == MRB_TT_ARRAY &&
-        RARRAY_LEN(v) > 1 &&
-        mrb_equal(mrb, RARRAY_PTR(v)[1], value))
-      return v;
-  }
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     ary.at(index)   ->   obj  or nil
- *
- *  Returns the element at _index_. A
- *  negative index counts from the end of +self+.  Returns +nil+
- *  if the index is out of range. See also <code>Array#[]</code>.
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.at(0)     #=> "a"
- *     a.at(-1)    #=> "e"
- */
-
-static mrb_value
-mrb_ary_at(mrb_state *mrb, mrb_value ary)
-{
-  mrb_int pos;
-  mrb_get_args(mrb, "i", &pos);
-
-  return mrb_ary_entry(ary, pos);
-}
-
-static mrb_value
-mrb_ary_values_at(mrb_state *mrb, mrb_value self)
-{
-  mrb_int argc;
-  mrb_value *argv;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-
-  return mrb_get_values_at(mrb, self, RARRAY_LEN(self), argc, argv, mrb_ary_ref);
-}
-
-/*
- *  call-seq:
- *     ary.to_h   ->   Hash
- *
- *  Returns the result of interpreting <i>aray</i> as an array of
- *  <tt>[key, value]</tt> paris.
- *
- *      [[:foo, :bar], [1, 2]].to_h
- *        # => {:foo => :bar, 1 => 2}
- *
- */
-
-static mrb_value
-mrb_ary_to_h(mrb_state *mrb, mrb_value ary)
-{
-  mrb_int i;
-  mrb_value v, hash;
-
-  hash = mrb_hash_new_capa(mrb, 0);
-
-  for (i = 0; i < RARRAY_LEN(ary); ++i) {
-    v = mrb_check_array_type(mrb, RARRAY_PTR(ary)[i]);
-
-    if (mrb_nil_p(v)) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "wrong element type %S at %S (expected array)",
-        mrb_str_new_cstr(mrb,  mrb_obj_classname(mrb, ary_elt(ary, i))),
-        mrb_fixnum_value(i)
-      );
-    }
-
-    if (RARRAY_LEN(v) != 2) {
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong array length at %S (expected 2, was %S)",
-        mrb_fixnum_value(i),
-        mrb_fixnum_value(RARRAY_LEN(v))
-      );
-    }
-
-    mrb_hash_set(mrb, hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]);
-  }
-
-  return hash;
-}
-
-/*
- *  call-seq:
- *     ary.slice!(index)         -> obj or nil
- *     ary.slice!(start, length) -> new_ary or nil
- *     ary.slice!(range)         -> new_ary or nil
- *
- *  Deletes the element(s) given by an +index+ (optionally up to +length+
- *  elements) or by a +range+.
- *
- *  Returns the deleted object (or objects), or +nil+ if the +index+ is out of
- *  range.
- *
- *     a = [ "a", "b", "c" ]
- *     a.slice!(1)     #=> "b"
- *     a               #=> ["a", "c"]
- *     a.slice!(-1)    #=> "c"
- *     a               #=> ["a"]
- *     a.slice!(100)   #=> nil
- *     a               #=> ["a"]
- */
-
-static mrb_value
-mrb_ary_slice_bang(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int i, j, k, len, alen = ARY_LEN(a);
-  mrb_value index;
-  mrb_value val;
-  mrb_value *ptr;
-  mrb_value ary;
-
-  mrb_ary_modify(mrb, a);
-
-  if (mrb_get_args(mrb, "o|i", &index, &len) == 1) {
-    switch (mrb_type(index)) {
-    case MRB_TT_RANGE:
-      if (mrb_range_beg_len(mrb, index, &i, &len, alen, TRUE) == 1) {
-        goto delete_pos_len;
-      }
-      else {
-        return mrb_nil_value();
-      }
-    case MRB_TT_FIXNUM:
-      val = mrb_funcall(mrb, self, "delete_at", 1, index);
-      return val;
-    default:
-      val = mrb_funcall(mrb, self, "delete_at", 1, index);
-      return val;
-    }
-  }
-
-  i = mrb_fixnum(index);
- delete_pos_len:
-  if (i < 0) i += alen;
-  if (i < 0 || alen < i) return mrb_nil_value();
-  if (len < 0) return mrb_nil_value();
-  if (alen == i) return mrb_ary_new(mrb);
-  if (len > alen - i) len = alen - i;
-
-  ary = mrb_ary_new_capa(mrb, len);
-  ptr = ARY_PTR(a);
-  for (j = i, k = 0; k < len; ++j, ++k) {
-    mrb_ary_push(mrb, ary, ptr[j]);
-  }
-
-  ptr += i;
-  for (j = i; j < alen - len; ++j) {
-    *ptr = *(ptr+len);
-    ++ptr;
-  }
-
-  mrb_ary_resize(mrb, self, alen - len);
-  return ary;
-}
-
-void
-mrb_mruby_array_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass * a = mrb->array_class;
-
-  mrb_define_method(mrb, a, "assoc",  mrb_ary_assoc,  MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, a, "at",     mrb_ary_at,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, a, "rassoc", mrb_ary_rassoc, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, a, "values_at", mrb_ary_values_at, MRB_ARGS_ANY());
-  mrb_define_method(mrb, a, "to_h",   mrb_ary_to_h, MRB_ARGS_REQ(0));
-  mrb_define_method(mrb, a, "slice!", mrb_ary_slice_bang,   MRB_ARGS_ANY());
-}
-
-void
-mrb_mruby_array_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/test/array.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/test/array.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/test/array.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-array-ext/test/array.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-##
-# Array(Ext) Test
-
-assert("Array.try_convert") do
-  assert_nil Array.try_convert(0)
-  assert_nil Array.try_convert(nil)
-  assert_equal [], Array.try_convert([])
-  assert_equal [1,2,3], Array.try_convert([1,2,3])
-end
-
-assert("Array#assoc") do
-  s1 = [ "colors", "red", "blue", "green" ]
-  s2 = [ "letters", "a", "b", "c" ]
-  s3 = "foo"
-  a  = [ s1, s2, s3 ]
-
-  assert_equal [ "letters", "a", "b", "c" ], a.assoc("letters")
-  assert_nil a.assoc("foo")
-end
-
-assert("Array#at") do
-  a = [ "a", "b", "c", "d", "e" ]
-  assert_equal "a", a.at(0)
-  assert_equal "e", a.at(-1)
-end
-
-assert("Array#rassoc") do
-  a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
-
-  assert_equal [2, "two"], a.rassoc("two")
-  assert_nil a.rassoc("four")
-end
-
-assert("Array#uniq!") do
-  a = [1, 2, 3, 1]
-  a.uniq!
-  assert_equal [1, 2, 3], a
-
-  b = [ "a", "b", "c" ]
-  assert_nil b.uniq!
-
-  c = [["student","sam"], ["student","george"], ["teacher","matz"]]
-  assert_equal [["student", "sam"], ["teacher", "matz"]], c.uniq! { |s| s.first }
-
-  d = [["student","sam"], ["teacher","matz"]]
-  assert_nil d.uniq! { |s| s.first }
-end
-
-assert("Array#uniq") do
-  a = [1, 2, 3, 1]
-  assert_equal [1, 2, 3], a.uniq
-  assert_equal [1, 2, 3, 1], a
-
-  b = [["student","sam"], ["student","george"], ["teacher","matz"]]
-  assert_equal [["student", "sam"], ["teacher", "matz"]], b.uniq { |s| s.first }
-end
-
-assert("Array#-") do
-  a = [1, 2, 3, 1]
-  b = [1]
-  c = 1
-
-  assert_raise(TypeError) { a - c }
-  assert_equal [2, 3], (a - b)
-  assert_equal [1, 2, 3, 1], a
-end
-
-assert("Array#|") do
-  a = [1, 2, 3, 1]
-  b = [1, 4]
-  c = 1
-
-  assert_raise(TypeError) { a | c }
-  assert_equal [1, 2, 3, 4], (a | b)
-  assert_equal [1, 2, 3, 1], a
-end
-
-assert("Array#&") do
-  a = [1, 2, 3, 1]
-  b = [1, 4]
-  c = 1
-
-  assert_raise(TypeError) { a & c }
-  assert_equal [1], (a & b)
-  assert_equal [1, 2, 3, 1], a
-end
-
-assert("Array#flatten") do
-  assert_equal [1, 2, "3", {4=>5}, :'6'],    [1, 2, "3", {4=>5}, :'6'].flatten
-  assert_equal [1, 2, 3, 4, 5, 6], [1, 2,    [3, 4, 5], 6].flatten
-  assert_equal [1, 2, 3, 4, 5, 6], [1, 2,    [3, [4, 5], 6]].flatten
-  assert_equal [1, [2, [3, [4, [5, [6]]]]]], [1, [2, [3, [4, [5, [6]]]]]].flatten(0)
-  assert_equal [1, 2, [3, [4, [5, [6]]]]],   [1, [2, [3, [4, [5, [6]]]]]].flatten(1)
-  assert_equal [1, 2, 3, [4, [5, [6]]]],     [1, [2, [3, [4, [5, [6]]]]]].flatten(2)
-  assert_equal [1, 2, 3, 4, [5, [6]]],       [1, [2, [3, [4, [5, [6]]]]]].flatten(3)
-  assert_equal [1, 2, 3, 4, 5, [6]],         [1, [2, [3, [4, [5, [6]]]]]].flatten(4)
-  assert_equal [1, 2, 3, 4, 5, 6],           [1, [2, [3, [4, [5, [6]]]]]].flatten(5)
-end
-
-assert("Array#flatten!") do
-  assert_equal [1, 2, 3, 4, 5, 6], [1, 2, [3, [4, 5], 6]].flatten!
-end
-
-assert("Array#compact") do
-  a = [1, nil, "2", nil, :t, false, nil]
-  assert_equal [1, "2", :t, false], a.compact
-  assert_equal [1, nil, "2", nil, :t, false, nil], a
-end
-
-assert("Array#compact!") do
-  a = [1, nil, "2", nil, :t, false, nil]
-  a.compact!
-  assert_equal [1, "2", :t, false], a
-end
-
-assert("Array#fetch") do
-  a = [ 11, 22, 33, 44 ]
-  assert_equal 22, a.fetch(1)
-  assert_equal 44, a.fetch(-1)
-  assert_equal 'cat', a.fetch(4, 'cat')
-  ret = 0
-  a.fetch(100) { |i| ret = i }
-  assert_equal 100, ret
-  assert_raise(IndexError) { a.fetch(100) }
-end
-
-assert("Array#fill") do
-  a = [ "a", "b", "c", "d" ]
-  assert_equal ["x", "x", "x", "x"], a.fill("x")
-  assert_equal ["x", "x", "x", "w"], a.fill("w", -1)
-  assert_equal ["x", "x", "z", "z"], a.fill("z", 2, 2)
-  assert_equal ["y", "y", "z", "z"], a.fill("y", 0..1)
-  assert_equal [0, 1, 4, 9], a.fill { |i| i*i }
-  assert_equal [0, 1, 8, 27], a.fill(-2) { |i| i*i*i }
-  assert_equal [0, 2, 3, 27], a.fill(1, 2) { |i| i+1 }
-  assert_equal [1, 2, 3, 27], a.fill(0..1) { |i| i+1 }
-  assert_raise(ArgumentError) { a.fill }
-
-  assert_equal([0, 1, 2, 3, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, -2, 1))
-  assert_equal([0, 1, 2, 3, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1, -2, 3))
-  assert_equal([0, 1, 2, -1, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, 3..4))
-  assert_equal([0, 1, 2, -1, 4, 5], [0, 1, 2, 3, 4, 5].fill(-1, 3...4))
-  assert_equal([0, 1, -1, -1, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, 2..-2))
-  assert_equal([0, 1, -1, -1, 4, 5], [0, 1, 2, 3, 4, 5].fill(-1, 2...-2))
-  assert_equal([0, 1, 2, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(3..4){|i| i+10})
-  assert_equal([0, 1, 2, 13, 4, 5], [0, 1, 2, 3, 4, 5].fill(3...4){|i| i+10})
-  assert_equal([0, 1, 12, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(2..-2){|i| i+10})
-  assert_equal([0, 1, 12, 13, 4, 5], [0, 1, 2, 3, 4, 5].fill(2...-2){|i| i+10})
-
-  assert_equal [1, 2, 3, 4, 'x', 'x'], [1, 2, 3, 4, 5, 6].fill('x', -2..-1)
-  assert_equal [1, 2, 3, 4, 'x', 6], [1, 2, 3, 4, 5, 6].fill('x', -2...-1)
-  assert_equal [1, 2, 3, 4, 5, 6], [1, 2, 3, 4, 5, 6].fill('x', -2...-2)
-  assert_equal [1, 2, 3, 4, 'x', 6], [1, 2, 3, 4, 5, 6].fill('x', -2..-2)
-  assert_equal [1, 2, 3, 4, 5, 6], [1, 2, 3, 4, 5, 6].fill('x', -2..0)
-end
-
-assert("Array#reverse_each") do
-  a = [ "a", "b", "c", "d" ]
-  b = []
-  a.reverse_each do |i|
-    b << i
-  end
-  assert_equal [ "d", "c", "b", "a" ], b
-
-  if Object.const_defined?(:Enumerator)
-    assert_equal [ "d", "c", "b", "a" ], a.reverse_each.to_a
-  else
-    true
-  end
-end
-
-assert("Array#rotate") do
-  a = ["a", "b", "c", "d"]
-  assert_equal ["b", "c", "d", "a"], a.rotate
-  assert_equal ["a", "b", "c", "d"], a
-  assert_equal ["c", "d", "a", "b"], a.rotate(2)
-  assert_equal ["b", "c", "d", "a"], a.rotate(-3)
-  assert_equal ["c", "d", "a", "b"], a.rotate(10)
-  assert_equal [], [].rotate
-end
-
-assert("Array#rotate!") do
-  a = ["a", "b", "c", "d"]
-  assert_equal ["b", "c", "d", "a"], a.rotate!
-  assert_equal ["b", "c", "d", "a"], a
-  assert_equal ["d", "a", "b", "c"], a.rotate!(2)
-  assert_equal ["a", "b", "c", "d"], a.rotate!(-3)
-  assert_equal ["c", "d", "a", "b"], a.rotate(10)
-  assert_equal [], [].rotate!
-end
-
-assert("Array#delete_if") do
-  a = [1, 2, 3, 4, 5]
-  assert_equal [1, 2, 3, 4, 5], a.delete_if { false }
-  assert_equal [1, 2, 3, 4, 5], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [], a.delete_if { true }
-  assert_equal [], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [1, 2, 3], a.delete_if { |i| i > 3 }
-  assert_equal [1, 2, 3], a
-end
-
-assert("Array#reject!") do
-  a = [1, 2, 3, 4, 5]
-  assert_nil a.reject! { false }
-  assert_equal [1, 2, 3, 4, 5], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [], a.reject! { true }
-  assert_equal [], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [1, 2, 3], a.reject! { |val| val > 3 }
-  assert_equal [1, 2, 3], a
-end
-
-assert("Array#insert") do
-  a = ["a", "b", "c", "d"]
-  assert_equal ["a", "b", 99, "c", "d"], a.insert(2, 99)
-  assert_equal ["a", "b", 99, "c", 1, 2, 3, "d"], a.insert(-2, 1, 2, 3)
-
-  b = ["a", "b", "c", "d"]
-  assert_equal ["a", "b", "c", "d", nil, nil, 99], b.insert(6, 99)
-end
-
-assert("Array#bsearch") do
-  # Find minimum mode
-  a = [0, 4, 7, 10, 12]
-  assert_include [4, 7], a.bsearch {|x| x >= 4 }
-  assert_equal 7, a.bsearch {|x| x >= 6 }
-  assert_equal 0, a.bsearch {|x| x >= -1 }
-  assert_nil a.bsearch {|x| x >= 100 }
-
-  # Find any mode
-  a = [0, 4, 7, 10, 12]
-  assert_include [4, 7], a.bsearch {|x| 1 - (x / 4).truncate }
-  assert_nil a.bsearch {|x| 4 - (x / 2).truncate }
-  assert_equal(nil, a.bsearch {|x| 1 })
-  assert_equal(nil, a.bsearch {|x| -1 })
-end
-
-assert("Array#delete_if") do
-  a = [1, 2, 3, 4, 5]
-  assert_equal [1, 2, 3, 4, 5], a.delete_if { false }
-  assert_equal [1, 2, 3, 4, 5], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [], a.delete_if { true }
-  assert_equal [], a
-
-  a = [ 1, 2, 3, 4, 5 ]
-  assert_equal [1, 2, 3], a.delete_if { |val| val > 3 }
-end
-
-assert("Array#keep_if") do
-  a = [1, 2, 3, 4, 5]
-  assert_equal [1, 2, 3, 4, 5], a.keep_if { true }
-  assert_equal [1, 2, 3, 4, 5], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [], a.keep_if { false }
-  assert_equal [], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [4, 5], a.keep_if { |val| val > 3 }
-  assert_equal [4, 5], a
-end
-
-assert("Array#select!") do
-  a = [1, 2, 3, 4, 5]
-  assert_nil a.select! { true }
-  assert_equal [1, 2, 3, 4, 5], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [], a.select! { false }
-  assert_equal [], a
-
-  a = [1, 2, 3, 4, 5]
-  assert_equal [4, 5], a.select! { |val| val > 3 }
-  assert_equal [4, 5], a
-end
-
-assert('Array#values_at') do
-  a = %w{red green purple white none}
-
-  assert_equal %w{red purple none}, a.values_at(0, 2, 4)
-  assert_equal ['green', 'white', nil, nil], a.values_at(1, 3, 5, 7)
-  assert_equal ['none', 'white', 'white', nil], a.values_at(-1, -2, -2, -7)
-  assert_equal ['none', nil, nil, 'red', 'green', 'purple'], a.values_at(4..6, 0...3)
-  assert_raise(TypeError) { a.values_at 'tt' }
-end
-
-assert('Array#to_h') do
-  assert_equal({}, [].to_h)
-  assert_equal({a: 1, b:2}, [[:a, 1], [:b, 2]].to_h)
-
-  assert_raise(TypeError)     { [1].to_h }
-  assert_raise(ArgumentError) { [[1]].to_h }
-end
-
-assert('Array#to_h (Modified)') do
-  class A
-    def to_ary
-      $a.clear
-      nil
-    end
-  end
-  $a = [A.new]
-  assert_raise(TypeError) { $a.to_h }
-end
-
-assert("Array#index (block)") do
-  assert_nil (1..10).to_a.index { |i| i % 5 == 0 and i % 7 == 0 }
-  assert_equal 34, (1..100).to_a.index { |i| i % 5 == 0 and i % 7 == 0 }
-end
-
-assert("Array#to_ary") do
-  assert_equal [], [].to_ary
-  assert_equal [1,2,3], [1,2,3].to_ary
-end
-
-assert("Array#dig") do
-  h = [[[1]], 0]
-  assert_equal(1, h.dig(0, 0, 0))
-  assert_nil(h.dig(2, 0))
-  assert_raise(TypeError) {h.dig(:a)}
-end
-
-assert("Array#slice!") do
-  a = [1, 2, 3]
-  b = a.slice!(0)
-  c = [1, 2, 3, 4, 5]
-  d = c.slice!(0, 2)
-  e = [1, 2, 3, 4, 5]
-  f = e.slice!(1..3)
-  g = [1, 2, 3]
-  h = g.slice!(-1)
-  i = [1, 2, 3]
-  j = i.slice!(0, -1)
-
-  assert_equal(a, [2, 3])
-  assert_equal(b, 1)
-  assert_equal(c, [3, 4, 5])
-  assert_equal(d, [1, 2])
-  assert_equal(e, [1, 5])
-  assert_equal(f, [2, 3, 4])
-  assert_equal(g, [1, 2])
-  assert_equal(h, 3)
-  assert_equal(i, [1, 2, 3])
-  assert_equal(j, nil)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,286 +0,0 @@
-require 'open3'
-require 'tempfile'
-
-class BinTest_MrubyBinDebugger
-  @debug1=false
-  @debug2=true
-  @debug3=true
-  def self.test(rubysource, testcase)
-    script, bin = Tempfile.new(['test', '.rb']), Tempfile.new(['test', '.mrb'])
-
-    # .rb
-    script.write rubysource
-    script.flush
-
-    # compile
-    `./bin/mrbc -g -o "#{bin.path}" "#{script.path}"`
-
-    # add mrdb quit
-    testcase << {:cmd=>"quit"}
-
-    stdin_data = testcase.map{|t| t[:cmd]}.join("\n") << "\n"
-
-    ["bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}"].each do |cmd|
-      o, s = Open3.capture2(cmd, :stdin_data => stdin_data)
-
-      exp_vals = testcase.map{|t| t.fetch(:exp, nil)}
-      unexp_vals = testcase.map{|t| t.fetch(:unexp, nil)}
-
-if @debug1
-  o.split("\n").each_with_index do |i,actual|
-    p [i,actual]
-  end
-end
-      # compare actual / expected
-      o.split("\n").each do |actual|
-        next if actual.empty?
-        exp = exp_vals.shift
-if @debug2
-  a = true
-  a = actual.include?(exp) unless exp.nil?
-  p [actual, exp] unless a
-end
-        assert_true actual.include?(exp) unless exp.nil?
-      end
-      # compare actual / unexpected
-      o.split("\n").each do |actual|
-        next if actual.empty?
-        unexp = unexp_vals.shift
-if @debug3
-  a = false
-  a = actual.include?(unexp) unless unexp.nil?
-  p [actual, unexp] if a
-end
-        assert_false actual.include?(unexp) unless unexp.nil?
-      end
-    end
-  end
-end
-
-INVCMD = "invalid command"
-
-assert('mruby-bin-debugger(mrdb) command line') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  str = ""
-  103.times {
-    str += "1234567890"
-  }
-  cmd = "p a=#{str}"
-
-  # test case
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>cmd[0...1023], :unexp=>'command line too long.'}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>cmd[0...1024], :unexp=>'command line too long.'}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>cmd[0...1025], :exp=>'command line too long.'}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "break"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"b",     :unexp=>INVCMD}
-  tc << {:cmd=>"br",    :unexp=>INVCMD}
-  tc << {:cmd=>"brea",  :unexp=>INVCMD}
-  tc << {:cmd=>"break", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"bl",     :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"breaka", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "continue"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"c",         :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"co",        :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"continu",   :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"continue",  :unexp=>INVCMD}])
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"cn",        :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"continuee", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "delete"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"d 1",      :unexp=>INVCMD}
-  tc << {:cmd=>"de 1",     :unexp=>INVCMD}
-  tc << {:cmd=>"delet 1",  :unexp=>INVCMD}
-  tc << {:cmd=>"delete 1", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"dd 1",      :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"deletee 1", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "disable"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"dis",     :unexp=>INVCMD}
-  tc << {:cmd=>"disa",    :unexp=>INVCMD}
-  tc << {:cmd=>"disabl",  :unexp=>INVCMD}
-  tc << {:cmd=>"disable", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"di",       :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"disb",     :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"disablee", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "enable"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"en",     :unexp=>INVCMD}
-  tc << {:cmd=>"ena",    :unexp=>INVCMD}
-  tc << {:cmd=>"enabl",  :unexp=>INVCMD}
-  tc << {:cmd=>"enable", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"e",       :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"enb",     :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"enablee", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "eval"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"ev",   :unexp=>INVCMD}
-  tc << {:cmd=>"eva",  :unexp=>INVCMD}
-  tc << {:cmd=>"eval", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"e",     :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"evl",   :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"evall", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "help"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"h",    :unexp=>INVCMD}
-  tc << {:cmd=>"he",   :unexp=>INVCMD}
-  tc << {:cmd=>"hel",  :unexp=>INVCMD}
-  tc << {:cmd=>"help", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"hl",    :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"helpp", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "info breakpoints"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"i b",              :unexp=>INVCMD}
-  tc << {:cmd=>"in  b",            :unexp=>INVCMD}
-  tc << {:cmd=>"i    br",          :unexp=>INVCMD}
-  tc << {:cmd=>"inf breakpoint",   :unexp=>INVCMD}
-  tc << {:cmd=>"info breakpoints", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"ii b",              :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"i bb",              :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"infoo breakpoints", :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"info breakpointss", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "list"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"l",    :unexp=>INVCMD}
-  tc << {:cmd=>"li",   :unexp=>INVCMD}
-  tc << {:cmd=>"lis",  :unexp=>INVCMD}
-  tc << {:cmd=>"list", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"ll",    :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"listt", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "print"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"p",     :unexp=>INVCMD}
-  tc << {:cmd=>"pr",    :unexp=>INVCMD}
-  tc << {:cmd=>"prin",  :unexp=>INVCMD}
-  tc << {:cmd=>"print", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"pp",     :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"printt", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "quit"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"q",    :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"qu",   :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"qui",  :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"quit", :unexp=>INVCMD}])
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"qq",    :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"quitt", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "run"') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"r",   :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"ru",  :unexp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"run", :unexp=>INVCMD}])
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"rr",   :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"runn", :exp=>INVCMD}])
-end
-
-assert('mruby-bin-debugger(mrdb) command: "step"') do
-  # ruby source
-  src = <<"SRC"
-while true
-  foo = 'foo'
-end
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s",    :unexp=>INVCMD}
-  tc << {:cmd=>"st",   :unexp=>INVCMD}
-  tc << {:cmd=>"ste",  :unexp=>INVCMD}
-  tc << {:cmd=>"step", :unexp=>INVCMD}
-  BinTest_MrubyBinDebugger.test(src, tc)
-
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"ss",    :exp=>INVCMD}])
-  BinTest_MrubyBinDebugger.test(src, [{:cmd=>"stepp", :exp=>INVCMD}])
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/print.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/print.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/print.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/bintest/print.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,701 +0,0 @@
-require 'open3'
-require 'tempfile'
-
-class BinTest_MrubyBinDebugger
-  @debug1=false
-  @debug2=true
-  def self.test(rubysource, testcase)
-    script, bin = Tempfile.new(['test', '.rb']), Tempfile.new(['test', '.mrb'])
-
-    # .rb
-    script.write rubysource
-    script.flush
-
-    # compile
-    `./bin/mrbc -g -o "#{bin.path}" "#{script.path}"`
-
-    # add mrdb quit
-    testcase << {:cmd=>"quit"}
-
-    stdin_data = testcase.map{|t| t[:cmd]}.join("\n") << "\n"
-
-    ["bin/mrdb #{script.path}","bin/mrdb -b #{bin.path}"].each do |cmd|
-      o, s = Open3.capture2(cmd, :stdin_data => stdin_data)
-
-      exp_vals = testcase.map{|t| t.fetch(:exp, nil)}
-=begin
-if @debug1
-  o.split("\n").each_with_index do |i,actual|
-    p [i,actual]
-  end
-end
-      # compare actual / expected
-      o.split("\n").each do |actual|
-        next if actual.empty?
-        exp = exp_vals.shift
-if @debug2
-  a = true
-  a = actual.include?(exp) unless exp.nil?
-  p [actual, exp] unless a
-end
-        assert_true actual.include?(exp) unless exp.nil?
-      end
-=end
-      idx = 0
-      exp_vals.each do |exp|
-        next if exp.nil?
-        idx = o.index(exp, idx)
-        assert_false idx.nil?
-        break unless idx
-        idx += 1
-      end
-    end
-  end
-end
-
-assert('mruby-bin-debugger(print) invalid arguments') do
-  # ruby source
-  src =  "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"p",   :exp=>"Parameter not specified."}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) nomal') do
-  # ruby source
-  src = <<"SRC"
-foo = 'foo'
-bar = foo
-baz = bar
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"p (1+2)",   :exp=>'$1 = 3'}
-  tc << {:cmd=>"p foo",     :exp=>'$2 = "foo"'}
-  tc << {:cmd=>"p foo*=2",  :exp=>'$3 = "foofoo"'}
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"p bar",     :exp=>'$4 = "foofoo"'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) error') do
-  # ruby source
-  src =  "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"p (1+2",  :exp=>'$1 = SyntaxError'}
-  tc << {:cmd=>"p bar",   :exp=>'$2 = NoMethodError'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-# Kernel#instance_eval(string) does't work multiple statements.
-=begin
-assert('mruby-bin-debugger(print) multiple statements') do
-  # ruby source
-  src = <<"SRC"
-x = 0
-y = 0
-z = 0
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s",}
-  tc << {:cmd=>"p x=1;x+=2",  :exp=>"3"}
-  tc << {:cmd=>"s",}
-  tc << {:cmd=>"p x",         :exp=>"3"}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-=end
-
-assert('mruby-bin-debugger(print) scope:top') do
-  # ruby source (bp is break point)
-  src = "bp=nil\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"p self",  :exp=>'$1 = main'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) scope:class') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-class TestClassScope
-  bp = nil
-end
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"p self",  :exp=>'$1 = TestClassScope'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) scope:module') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-class TestModuleScope
-  bp = nil
-end
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"p self",  :exp=>'$1 = TestModuleScope'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) scope:instance method') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-class TestMethodScope
-  def m
-    bp = nil
-  end
-end
-TestMethodScope.new.m
-SRC
-
-  tc = []
-  tc << {:cmd=>"b 3"}
-  tc << {:cmd=>"r"}
-  tc << {:cmd=>"p self",  :exp=>'$1 = #<TestMethodScope:'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) scope:class method') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-class TestClassMethodScope
-  def self.cm
-    bp = nil
-  end
-end
-TestClassMethodScope.cm
-SRC
-
-  tc = []
-  tc << {:cmd=>"b 3"}
-  tc << {:cmd=>"r"}
-  tc << {:cmd=>"p self",  :exp=>'$1 = TestClassMethodScope'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) scope:block') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-1.times do
-  bp = nil
-end
-class TestBlockScope
-  1.times do
-    bp = nil
-  end
-  def m
-    1.times do
-      bp = nil
-    end
-  end
-end
-TestBlockScope.new.m
-SRC
-
-  tc = []
-  tc << {:cmd=>"b 2"}
-  tc << {:cmd=>"b 6"}
-  tc << {:cmd=>"b 10"}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p self", :exp=>'$1 = main'}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p self", :exp=>'$2 = TestBlockScope'}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p self", :exp=>'$3 = #<TestBlockScope:'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) same name:local variabe') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-lv = 'top'
-class TestLocalVariableName
-  lv = 'class'
-  def m
-    lv = 'instance method'
-    bp = nil
-  end
-  bp = nil
-end
-TestLocalVariableName.new.m
-bp = nil
-SRC
-
-  tc = []
-  tc << {:cmd=>"b 6"}
-  tc << {:cmd=>"b 8"}
-  tc << {:cmd=>"b 11"}
-  tc << {:cmd=>"r"}
-  tc << {:cmd=>"p lv", :exp=>'$1 = "class"'}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p lv", :exp=>'$2 = "instance method"'}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p lv", :exp=>'$3 = "top"'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) same name:instance variabe') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-@iv = 'top'
-class TestInstanceVariableName
-  def initialize(v)
-    @iv = v
-  end
-  def m
-    bp = nil
-  end
-end
-i1 = TestInstanceVariableName.new('instance1')
-i2 = TestInstanceVariableName.new('instance2')
-i1.m
-i2.m
-bp = nil
-SRC
-
-  tc = []
-  tc << {:cmd=>"b 7"}
-  tc << {:cmd=>"b 14"}
-  tc << {:cmd=>"r"}
-  tc << {:cmd=>"p @iv", :exp=>'$1 = "instance1"'}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p @iv", :exp=>'$2 = "instance2"'}
-  tc << {:cmd=>"c"}
-  tc << {:cmd=>"p @iv", :exp=>'$3 = "top"'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-# Kernel#instance_eval(string) does't work const.
-=begin
-assert('mruby-bin-debugger(print) same name:const') do
-  # ruby source (bp is break point)
-  src = <<"SRC"
-CONST='top'
-class TestConstNameSuperClass
-  CONST='super class'
-  def m
-    bp = nil
-  end
-end
-class TestConstNameSubClass < TestConstNameSuperClass
-  CONST='sub class'
-  def m
-    bp = nil
-  end
-end
-
-TestConstNameSuperClass.new.m()
-TestConstNameSubClass.new.m()
-bp = nil
-SRC
-
-  # todo: wait for 'break' to be implimented
-  tc = []
-  9.times { tc << {:cmd=>"s"} }
-  tc << {:cmd=>"p CONST", :exp=>"super class"}
-  3.times { tc << {:cmd=>"s"} }
-  tc << {:cmd=>"p CONST", :exp=>"sub class"}
-  1.times { tc << {:cmd=>"s"} }
-  tc << {:cmd=>"p CONST", :exp=>"top"}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-=end
-
-assert('mruby-bin-debugger(print) Literal:Numeric') do
-  # ruby source
-  src =  "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>"p 100",     :exp=>'$1 = 100'}
-  tc << {:cmd=>"p -0b100",  :exp=>'$2 = -4'}
-  tc << {:cmd=>"p +0100",   :exp=>'$3 = 64'}
-  tc << {:cmd=>"p 0x100",   :exp=>'$4 = 256'}
-  tc << {:cmd=>"p 1_234",   :exp=>'$5 = 1234'}
-  tc << {:cmd=>"p 0b1000_0000", :exp=>"$6 = #{0b1000_0000}"}
-  tc << {:cmd=>"p 0x1000_0000", :exp=>"$7 = #{0x1000_0000}"}
-
-  tc << {:cmd=>"p 3.14",    :exp=>'$8 = 3.14'}
-  tc << {:cmd=>"p -12.3",   :exp=>'$9 = -12.3'}
-  tc << {:cmd=>"p +12.000", :exp=>'$10 = 12.0'}
-  tc << {:cmd=>"p 1e4",     :exp=>'$11 = 10000.0'}
-  tc << {:cmd=>"p -0.1e-2", :exp=>'$12 = -0.001'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Literal:String') do
-  # ruby source
-  src = <<"SRC"
-foo = 'foo'
-bar = "bar"
-baz = "baz"
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"s"}
-
-  tc << {:cmd=>'p "str"',        :exp=>'$1 = "str"'}
-  tc << {:cmd=>'p "s\tt\rr\n"',  :exp=>'$2 = "s\\tt\\rr\\n"'}
-  tc << {:cmd=>'p "\C-a\C-z"',   :exp=>'$3 = "\\001\\032"'}
-  tc << {:cmd=>'p "#{foo+bar}"', :exp=>'$4 = "foobar"'}
-
-  tc << {:cmd=>'p \'str\'',          :exp=>'$5 = "str"'}
-  tc << {:cmd=>'p \'s\\tt\\rr\\n\'', :exp=>'$6 = "s\\\\tt\\\\rr\\\\n"'}
-  tc << {:cmd=>'p \'\\C-a\\C-z\'',   :exp=>'$7 = "\\\\C-a\\\\C-z"'}
-  tc << {:cmd=>'p \'#{foo+bar}\'',   :exp=>'$8 = "#{foo+bar}"'}
-
-  tc << {:cmd=>'p %!str!',        :exp=>'$9 = "str"'}
-  tc << {:cmd=>'p %!s\tt\rr\n!',  :exp=>'$10 = "s\\tt\\rr\\n"'}
-  tc << {:cmd=>'p %!\C-a\C-z!',   :exp=>'$11 = "\\001\\032"'}
-  tc << {:cmd=>'p %!#{foo+bar}!', :exp=>'$12 = "foobar"'}
-
-  tc << {:cmd=>'p %Q!str!',        :exp=>'$13 = "str"'}
-  tc << {:cmd=>'p %Q!s\tt\rr\n!',  :exp=>'$14 = "s\\tt\\rr\\n"'}
-  tc << {:cmd=>'p %Q!\C-a\C-z!',   :exp=>'$15 = "\\001\\032"'}
-  tc << {:cmd=>'p %Q!#{foo+bar}!', :exp=>'$16 = "foobar"'}
-
-  tc << {:cmd=>'p %q!str!',          :exp=>'$17 = "str"'}
-  tc << {:cmd=>'p %q!s\\tt\\rr\\n!', :exp=>'$18 = "s\\\\tt\\\\rr\\\\n"'}
-  tc << {:cmd=>'p %q!\\C-a\\C-z!',   :exp=>'$19 = "\\\\C-a\\\\C-z"'}
-  tc << {:cmd=>'p %q!#{foo+bar}!',   :exp=>'$20 = "#{foo+bar}"'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Literal:Array') do
-  # ruby source
-  src = <<"SRC"
-foo = 'foo'
-bar = "bar"
-baz = "baz"
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"s"}
-
-  tc << {:cmd=>'p []',                      :exp=>'$1 = []'}
-  tc << {:cmd=>'p [ 5,  12,   8,    10, ]', :exp=>'$2 = [5, 12, 8, 10]'}
-  tc << {:cmd=>'p [1,2.5,"#{foo+bar}"]',    :exp=>'$3 = [1, 2.5, "foobar"]'}
-  tc << {:cmd=>'p %w[3.14 A\ &\ B #{foo}]', :exp=>'$4 = ["3.14", "A & B", "#{foo}"]'}
-  tc << {:cmd=>'p %W[3.14 A\ &\ B #{foo}]', :exp=>'$5 = ["3.14", "A & B", "foo"]'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Literal:Hash') do
-  # ruby source
-  src = <<"SRC"
-foo = 'foo'
-bar = "bar"
-baz = "baz"
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"s"}
-
-  tc << {:cmd=>'p {}',                              :exp=>'$1 = {}'}
-  tc << {:cmd=>'p {"one"=>1,"two"=>2}',             :exp=>'$2 = {"one"=>1, "two"=>2}'}
-  tc << {:cmd=>'p {:eins=>"1",   :zwei=>"2", }',    :exp=>'$3 = {:eins=>"1", :zwei=>"2"}'}
-  tc << {:cmd=>'p {uno:"one", dos: 2}',             :exp=>'$4 = {:uno=>"one", :dos=>2}'}
-  tc << {:cmd=>'p {"one"=>1, :zwei=>2, tres:3}',    :exp=>'$5 = {"one"=>1, :zwei=>2, :tres=>3}'}
-  tc << {:cmd=>'p {:foo=>"#{foo}",:bar=>"#{bar}"}', :exp=>'$6 = {:foo=>"foo", :bar=>"bar"}'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Literal:Range') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>'p 1..10',    :exp=>'$1 = 1..10'}
-  tc << {:cmd=>'p 1...10',   :exp=>'$2 = 1...10'}
-  tc << {:cmd=>'p 100..10',  :exp=>'$3 = 100..10'}
-  tc << {:cmd=>'p 1 ... 10', :exp=>'$4 = 1...10'}
-
-  tc << {:cmd=>'p "1" .. "9"',  :exp=>'$5 = "1".."9"'}
-  tc << {:cmd=>'p "A" ... "Z"', :exp=>'$6 = "A"..."Z"'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Literal:Symbol') do
-  # ruby source
-  src = <<"SRC"
-foo = 'foo'
-bar = "bar"
-baz = "baz"
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>"s"}
-  tc << {:cmd=>"s"}
-
-  tc << {:cmd=>'p :sym',          :exp=>'$1 = :sym'}
-  tc << {:cmd=>'p :"sd"',         :exp=>'$2 = :sd'}
-  tc << {:cmd=>"p :'ss'",         :exp=>'$3 = :ss'}
-  tc << {:cmd=>'p :"123"',        :exp=>'$4 = :"123"'}
-  tc << {:cmd=>'p :"#{foo} baz"', :exp=>'$5 = :"foo baz"'}
-  tc << {:cmd=>'p %s!symsym!',    :exp=>'$6 = :symsym'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Unary operation') do
-  # ruby source
-  src = "foo = 'foo'\n"
-
-  # test case
-  tc = []
-  tc << {:cmd=>'p +10',    :exp=>'$1 = 10'}
-  tc << {:cmd=>'p -100',   :exp=>'$2 = -100'}
-  tc << {:cmd=>'p !true',  :exp=>'$3 = false'}
-  tc << {:cmd=>'p !false', :exp=>'$4 = true'}
-  tc << {:cmd=>'p !nil',   :exp=>'$5 = true'}
-  tc << {:cmd=>'p !1',     :exp=>'$6 = false'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Binary operation') do
-  # ruby source
-  src = <<"SRC"
-CONST = 100
-a,b,c = 1, 5, 8
-foo,bar,baz = 'foo','bar','baz'
-ary = []
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-
-  tc << {:cmd=>'p a+1',   :exp=>'$1 = 2'}
-  tc << {:cmd=>'p 2-b',   :exp=>'$2 = -3'}
-  tc << {:cmd=>'p c * 3', :exp=>'$3 = 24'}
-  tc << {:cmd=>'p a/b',   :exp=>'$4 = 0.2'}
-  tc << {:cmd=>'p c%b',   :exp=>'$5 = 3'}
-  tc << {:cmd=>'p 2**10', :exp=>'$6 = 1024'}
-  tc << {:cmd=>'p ~3',    :exp=>'$7 = -4'}
-
-  tc << {:cmd=>'p 1<<2',  :exp=>'$8 = 4'}
-  tc << {:cmd=>'p 64>>5', :exp=>'$9 = 2'}
-
-  tc << {:cmd=>'p a|c',   :exp=>'$10 = 9'}
-  tc << {:cmd=>'p a&b',   :exp=>'$11 = 1'}
-  tc << {:cmd=>'p a^b',   :exp=>'$12 = 4'}
-
-  tc << {:cmd=>'p a>b',   :exp=>'$13 = false'}
-  tc << {:cmd=>'p a<b',   :exp=>'$14 = true'}
-  tc << {:cmd=>'p b>=5',  :exp=>'$15 = true'}
-  tc << {:cmd=>'p b<=5',  :exp=>'$16 = true'}
-
-  tc << {:cmd=>'p "A"<=>"B"', :exp=>'$17 = -1'}
-  tc << {:cmd=>'p "A"=="B"',  :exp=>'$18 = false'}
-  tc << {:cmd=>'p "A"==="B"', :exp=>'$19 = false'}
-  tc << {:cmd=>'p "A"!="B"',  :exp=>'$20 = true'}
-
-  tc << {:cmd=>'p false || true', :exp=>'$21 = true'}
-  tc << {:cmd=>'p false && true', :exp=>'$22 = false'}
-
-  tc << {:cmd=>'p not nil',        :exp=>'$23 = true'}
-  tc << {:cmd=>'p false or true',  :exp=>'$24 = true'}
-  tc << {:cmd=>'p false and true', :exp=>'$25 = false'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Ternary operation') do
-  # ruby source
-  src = <<"SRC"
-CONST = 100
-a,b,c = 1, 5, -10
-foo,bar,baz = 'foo','bar','baz'
-ary = []
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-
-  tc << {:cmd=>'p (a < b) ? a : b',          :exp=>'$1 = 1'}
-  tc << {:cmd=>'p (a > b) ? a : b',          :exp=>'$2 = 5'}
-  tc << {:cmd=>'p true ? "true" : "false"',  :exp=>'$3 = "true"'}
-  tc << {:cmd=>'p false ? "true" : "false"', :exp=>'$4 = "false"'}
-  tc << {:cmd=>'p nil ? "true" : "false"',   :exp=>'$5 = "false"'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Substitution:simple') do
-  # ruby source
-  src = <<"SRC"
-CONST = 100
-a,b,c = 1, 5, -10
-foo,bar,baz = 'foo','bar','baz'
-ary = []
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-
-  tc << {:cmd=>'p a=2',               :exp=>'$1 = 2'}
-  tc << {:cmd=>'p foo=[foo,bar,baz]', :exp=>'$2 = ["foo", "bar", "baz"]'}
-
-  tc << {:cmd=>'p undefined=-1',      :exp=>'$3 = -1'}
-  tc << {:cmd=>'p "#{undefined}"',    :exp=>'$4 = NoMethodError'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Substitution:self') do
-  # ruby source
-  src = <<"SRC"
-CONST = 100
-a,b,c = 1, 5, -10
-foo,bar,baz = 'foo','bar','baz'
-ary = []
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-
-  tc << {:cmd=>'p a+=9',   :exp=>'$1 = 10'}
-  tc << {:cmd=>'p b-=c',   :exp=>'$2 = 15'}
-  tc << {:cmd=>'p bar*=2', :exp=>'$3 = "barbar"'}
-  tc << {:cmd=>'p a/=4',   :exp=>'$4 = 2.5'}
-  tc << {:cmd=>'p c%=4',   :exp=>'$5 = 2'}
-
-  tc << {:cmd=>'p b&=0b0101', :exp=>'$6 = 5'}
-  tc << {:cmd=>'p c|=0x10',   :exp=>'$7 = 18'}
-
-  tc << {:cmd=>'p "#{a} #{b} #{c}"',     :exp=>'$8 = "2.5 5 18"'}
-  tc << {:cmd=>'p "#{foo}#{bar}#{baz}"', :exp=>'$9 = "foobarbarbaz"'}
-
-  tc << {:cmd=>'p a,b,c=[10,20,30]',:exp=>'$10 = [10, 20, 30]'}
-  tc << {:cmd=>'p [a,b,c]',         :exp=>'$11 = [10, 20, 30]'}
-  tc << {:cmd=>'p a,b=b,a',         :exp=>'$12 = [20, 10]'}
-  tc << {:cmd=>'p [a,b]',           :exp=>'$13 = [20, 10]'}
-
-  tc << {:cmd=>'p undefined=-1',    :exp=>'$14 = -1'}
-  tc << {:cmd=>'p "#{undefined}"',  :exp=>'$15 = NoMethodError'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Substitution:multiple') do
-  # ruby source
-  src = <<"SRC"
-CONST = 100
-a,b,c = 1, 5, -10
-foo,bar,baz = 'foo','bar','baz'
-ary = []
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-
-  tc << {:cmd=>'p a,b=[10,20]',   :exp=>'$1 = [10, 20]'}
-  tc << {:cmd=>'p [a,b,c]',       :exp=>'$2 = [10, 20, -10]'}
-
-  tc << {:cmd=>'p foo,bar=["FOO","BAR","BAZ"]', :exp=>'$3 = ["FOO", "BAR", "BAZ"]'}
-  tc << {:cmd=>'p [foo,bar,baz]', :exp=>'$4 = ["FOO", "BAR", "baz"]'}
-
-  tc << {:cmd=>'p a,foo=foo,a',   :exp=>'$5 = ["FOO", 10]'}
-  tc << {:cmd=>'p [a,foo]',       :exp=>'$6 = ["FOO", 10]'}
-
-#  tc << {:cmd=>'p a,*b=[123, 456, 789]'}
-#  tc << {:cmd=>'p [a,b]',       :exp=>'[123, [456, 789]]'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
-assert('mruby-bin-debugger(print) Substitution:self') do
-  # ruby source
-  src = <<"SRC"
-CONST = 100
-a,b,c = 1, 5, -10
-foo,bar,baz = 'foo','bar','baz'
-ary = []
-SRC
-
-  # test case
-  tc = []
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-  tc << {:cmd=>'s'}
-
-  tc << {:cmd=>'p a+=9',   :exp=>'$1 = 10'}
-  tc << {:cmd=>'p b-=c',   :exp=>'$2 = 15'}
-  tc << {:cmd=>'p bar*=2', :exp=>'$3 = "barbar"'}
-  tc << {:cmd=>'p a/=4',   :exp=>'$4 = 2.5'}
-  tc << {:cmd=>'p c%=4',   :exp=>'$5 = 2'}
-
-  tc << {:cmd=>'p b&=0b0101', :exp=>'$6 = 5'}
-  tc << {:cmd=>'p c|=0x10',   :exp=>'$7 = 18'}
-
-  tc << {:cmd=>'p "#{a} #{b} #{c}"',     :exp=>'$8 = "2.5 5 18"'}
-  tc << {:cmd=>'p "#{foo}#{bar}#{baz}"', :exp=>'$9 = "foobarbarbaz"'}
-
-  tc << {:cmd=>'p a,b,c=[10,20,30]',:exp=>'$10 = [10, 20, 30]'}
-  tc << {:cmd=>'p [a,b,c]',         :exp=>'$11 = [10, 20, 30]'}
-  tc << {:cmd=>'p a,b=b,a',         :exp=>'$12 = [20, 10]'}
-  tc << {:cmd=>'p [a,b]',           :exp=>'$13 = [20, 10]'}
-
-  tc << {:cmd=>'p undefined=-1',    :exp=>'$14 = -1'}
-  tc << {:cmd=>'p "#{undefined}"',  :exp=>'$15 = NoMethodError'}
-
-  BinTest_MrubyBinDebugger.test(src, tc)
-end
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MRuby::Gem::Specification.new('mruby-bin-debugger') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mruby debugger command'
-
-  spec.add_dependency('mruby-eval', :core => 'mruby-eval')
-
-  spec.bins = %w(mrdb)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,518 +0,0 @@
-/*
-** apibreak.c
-**
-*/
-
-#include <string.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-#include "mrdb.h"
-#include <mruby/debug.h>
-#include <mruby/opcode.h>
-#include <mruby/class.h>
-#include <mruby/proc.h>
-#include <mruby/variable.h>
-#include "mrdberror.h"
-#include "apibreak.h"
-
-#define MAX_BREAKPOINTNO (MAX_BREAKPOINT * 1024)
-#define MRB_DEBUG_BP_FILE_OK   (0x0001)
-#define MRB_DEBUG_BP_LINENO_OK (0x0002)
-
-static uint16_t
-check_lineno(mrb_irep_debug_info_file *info_file, uint16_t lineno)
-{
-  uint32_t count = info_file->line_entry_count;
-  uint16_t l_idx;
-
-  if (info_file->line_type == mrb_debug_line_ary) {
-    for (l_idx = 0; l_idx < count; ++l_idx) {
-      if (lineno == info_file->lines.ary[l_idx]) {
-        return lineno;
-      }
-    }
-  }
-  else {
-    for (l_idx = 0; l_idx < count; ++l_idx) {
-      if (lineno == info_file->lines.flat_map[l_idx].line) {
-        return lineno;
-      }
-    }
-  }
-
-  return 0;
-}
-
-static int32_t
-get_break_index(mrb_debug_context *dbg, uint32_t bpno)
-{
-  uint32_t i;
-  int32_t index;
-  char hit = FALSE;
-
-  for(i = 0 ; i < dbg->bpnum; i++) {
-    if (dbg->bp[i].bpno == bpno) {
-      hit = TRUE;
-      index = i;
-      break;
-    }
-  }
-
-  if (hit == FALSE) {
-    return MRB_DEBUG_BREAK_INVALID_NO;
-  }
-
-  return index;
-}
-
-static void
-free_breakpoint(mrb_state *mrb, mrb_debug_breakpoint *bp)
-{
-  switch(bp->type) {
-    case MRB_DEBUG_BPTYPE_LINE:
-      mrb_free(mrb, (void*)bp->point.linepoint.file);
-      break;
-    case MRB_DEBUG_BPTYPE_METHOD:
-      mrb_free(mrb, (void*)bp->point.methodpoint.method_name);
-      if (bp->point.methodpoint.class_name != NULL) {
-        mrb_free(mrb, (void*)bp->point.methodpoint.class_name);
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-static uint16_t
-check_file_lineno(struct mrb_irep *irep, const char *file, uint16_t lineno)
-{
-  mrb_irep_debug_info_file *info_file;
-  uint16_t result = 0;
-  uint16_t f_idx;
-  uint16_t fix_lineno;
-  uint16_t i;
-
-  for (f_idx = 0; f_idx < irep->debug_info->flen; ++f_idx) {
-    info_file = irep->debug_info->files[f_idx];
-    if (!strcmp(info_file->filename, file)) {
-      result = MRB_DEBUG_BP_FILE_OK;
-
-      fix_lineno = check_lineno(info_file, lineno);
-      if (fix_lineno != 0) {
-        return result | MRB_DEBUG_BP_LINENO_OK;
-      }
-    }
-    for (i=0; i < irep->rlen; ++i) {
-      result  |= check_file_lineno(irep->reps[i], file, lineno);
-      if (result == (MRB_DEBUG_BP_FILE_OK | MRB_DEBUG_BP_LINENO_OK)) {
-        return result;
-      }
-    }
-  }
-  return result;
-}
-
-static const char*
-get_class_name(mrb_state *mrb, struct RClass *class_obj)
-{
-  struct RClass *outer;
-  mrb_sym class_sym;
-
-  outer = mrb_class_outer_module(mrb, class_obj);
-  class_sym = mrb_class_sym(mrb, class_obj, outer);
-  return mrb_sym2name(mrb, class_sym);
-}
-
-static int32_t
-compare_break_method(mrb_state *mrb, mrb_debug_breakpoint *bp, struct RClass *class_obj, mrb_sym method_sym, mrb_bool* isCfunc)
-{
-  const char* class_name;
-  const char* method_name;
-  struct RProc* m;
-  struct RClass* sc;
-  const char* sn;
-  mrb_sym ssym;
-  mrb_debug_methodpoint *method_p;
-  mrb_bool is_defined;
-
-  method_name = mrb_sym2name(mrb, method_sym);
-
-  method_p = &bp->point.methodpoint;
-  if (strcmp(method_p->method_name, method_name) == 0) {
-    class_name = get_class_name(mrb, class_obj);
-    if (class_name == NULL) {
-      if (method_p->class_name == NULL) {
-        return bp->bpno;
-      }
-    }
-    else if (method_p->class_name != NULL) {
-      m = mrb_method_search_vm(mrb, &class_obj, method_sym);
-      if (m == NULL) {
-        return MRB_DEBUG_OK;
-      }
-      if (MRB_PROC_CFUNC_P(m)) {
-        *isCfunc = TRUE;
-      }
-
-      is_defined = mrb_class_defined(mrb, method_p->class_name);
-      if (is_defined == FALSE) {
-        return MRB_DEBUG_OK;
-      }
-
-      sc = mrb_class_get(mrb, method_p->class_name);
-      ssym = mrb_symbol(mrb_check_intern_cstr(mrb, method_p->method_name));
-      m = mrb_method_search_vm(mrb, &sc, ssym);
-      if (m == NULL) {
-        return MRB_DEBUG_OK;
-      }
-
-      class_name = get_class_name(mrb, class_obj);
-      sn = get_class_name(mrb, sc);
-      if (strcmp(sn, class_name) == 0) {
-        return bp->bpno;
-      }
-    }
-  }
-  return MRB_DEBUG_OK;
-}
-
-int32_t
-mrb_debug_set_break_line(mrb_state *mrb, mrb_debug_context *dbg, const char *file, uint16_t lineno)
-{
-  int32_t index;
-  char* set_file;
-  uint16_t result;
-
-  if ((mrb == NULL)||(dbg == NULL)||(file == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  if (dbg->bpnum >= MAX_BREAKPOINT) {
-    return MRB_DEBUG_BREAK_NUM_OVER;
-  }
-
-  if (dbg->next_bpno > MAX_BREAKPOINTNO) {
-    return MRB_DEBUG_BREAK_NO_OVER;
-  }
-
-  /* file and lineno check (line type mrb_debug_line_ary only.) */
-  result = check_file_lineno(dbg->root_irep, file, lineno);
-  if (result == 0) {
-    return MRB_DEBUG_BREAK_INVALID_FILE;
-  }
-  else if (result == MRB_DEBUG_BP_FILE_OK) {
-    return MRB_DEBUG_BREAK_INVALID_LINENO;
-  }
-
-  set_file = mrb_malloc(mrb, strlen(file) + 1);
-
-  index = dbg->bpnum;
-  dbg->bp[index].bpno = dbg->next_bpno;
-  dbg->next_bpno++;
-  dbg->bp[index].enable = TRUE;
-  dbg->bp[index].type = MRB_DEBUG_BPTYPE_LINE;
-  dbg->bp[index].point.linepoint.lineno = lineno;
-  dbg->bpnum++;
-
-  strncpy(set_file, file, strlen(file) + 1);
-
-  dbg->bp[index].point.linepoint.file = set_file;
-
-  return dbg->bp[index].bpno;
-}
-
-int32_t
-mrb_debug_set_break_method(mrb_state *mrb, mrb_debug_context *dbg, const char *class_name, const char *method_name)
-{
-  int32_t index;
-  char* set_class;
-  char* set_method;
-
-  if ((mrb == NULL) || (dbg == NULL) || (method_name == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  if (dbg->bpnum >= MAX_BREAKPOINT) {
-    return MRB_DEBUG_BREAK_NUM_OVER;
-  }
-
-  if (dbg->next_bpno > MAX_BREAKPOINTNO) {
-    return MRB_DEBUG_BREAK_NO_OVER;
-  }
-
-  if (class_name != NULL) {
-    set_class = mrb_malloc(mrb, strlen(class_name) + 1);
-    strncpy(set_class, class_name, strlen(class_name) + 1);
-  }
-  else {
-    set_class = NULL;
-  }
-
-  set_method = mrb_malloc(mrb, strlen(method_name) + 1);
-
-  strncpy(set_method, method_name, strlen(method_name) + 1);
-
-  index = dbg->bpnum;
-  dbg->bp[index].bpno = dbg->next_bpno;
-  dbg->next_bpno++;
-  dbg->bp[index].enable = TRUE;
-  dbg->bp[index].type = MRB_DEBUG_BPTYPE_METHOD;
-  dbg->bp[index].point.methodpoint.method_name = set_method;
-  dbg->bp[index].point.methodpoint.class_name = set_class;
-  dbg->bpnum++;
-
-  return dbg->bp[index].bpno;
-}
-
-int32_t
-mrb_debug_get_breaknum(mrb_state *mrb, mrb_debug_context *dbg)
-{
-  if ((mrb == NULL) || (dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  return dbg->bpnum;
-}
-
-int32_t
-mrb_debug_get_break_all(mrb_state *mrb, mrb_debug_context *dbg, uint32_t size, mrb_debug_breakpoint *bp)
-{
-  uint32_t get_size = 0;
-
-  if ((mrb == NULL) || (dbg == NULL) || (bp == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  if (dbg->bpnum >= size) {
-    get_size = size;
-  }
-  else {
-    get_size = dbg->bpnum;
-  }
-
-  memcpy(bp, dbg->bp, sizeof(mrb_debug_breakpoint) * get_size);
-
-  return get_size;
-}
-
-int32_t
-mrb_debug_get_break(mrb_state *mrb, mrb_debug_context *dbg, uint32_t bpno, mrb_debug_breakpoint *bp)
-{
-  int32_t index;
-
-  if ((mrb == NULL) || (dbg == NULL) || (bp == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  index = get_break_index(dbg, bpno);
-  if (index == MRB_DEBUG_BREAK_INVALID_NO) {
-    return MRB_DEBUG_BREAK_INVALID_NO;
-  }
-
-  bp->bpno = dbg->bp[index].bpno;
-  bp->enable = dbg->bp[index].enable;
-  bp->point = dbg->bp[index].point;
-  bp->type = dbg->bp[index].type;
-
-  return 0;
-}
-
-int32_t
-mrb_debug_delete_break(mrb_state *mrb, mrb_debug_context *dbg, uint32_t bpno)
-{
-  uint32_t i;
-  int32_t index;
-
-  if ((mrb == NULL) ||(dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  index = get_break_index(dbg, bpno);
-  if (index == MRB_DEBUG_BREAK_INVALID_NO) {
-    return MRB_DEBUG_BREAK_INVALID_NO;
-  }
-
-  free_breakpoint(mrb, &dbg->bp[index]);
-
-  for(i = index ; i < dbg->bpnum; i++) {
-    if ((i + 1) == dbg->bpnum) {
-      memset(&dbg->bp[i], 0, sizeof(mrb_debug_breakpoint));
-    }
-    else {
-      memcpy(&dbg->bp[i], &dbg->bp[i + 1], sizeof(mrb_debug_breakpoint));
-    }
-  }
-
-  dbg->bpnum--;
-
-  return MRB_DEBUG_OK;
-}
-
-int32_t
-mrb_debug_delete_break_all(mrb_state *mrb, mrb_debug_context *dbg)
-{
-  uint32_t i;
-
-  if ((mrb == NULL) || (dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  for(i = 0 ; i < dbg->bpnum ; i++) {
-    free_breakpoint(mrb, &dbg->bp[i]);
-  }
-
-  dbg->bpnum = 0;
-
-  return MRB_DEBUG_OK;
-}
-
-int32_t
-mrb_debug_enable_break(mrb_state *mrb, mrb_debug_context *dbg, uint32_t bpno)
-{
-  int32_t index = 0;
-
-  if ((mrb == NULL) || (dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  index = get_break_index(dbg, bpno);
-  if (index == MRB_DEBUG_BREAK_INVALID_NO) {
-    return MRB_DEBUG_BREAK_INVALID_NO;
-  }
-
-  dbg->bp[index].enable = TRUE;
-
-  return MRB_DEBUG_OK;
-}
-
-int32_t
-mrb_debug_enable_break_all(mrb_state *mrb, mrb_debug_context *dbg)
-{
-  uint32_t i;
-
-  if ((mrb == NULL) || (dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  for(i = 0 ; i < dbg->bpnum; i++) {
-    dbg->bp[i].enable = TRUE;
-  }
-
-  return MRB_DEBUG_OK;
-}
-
-int32_t
-mrb_debug_disable_break(mrb_state *mrb, mrb_debug_context *dbg, uint32_t bpno)
-{
-  int32_t index = 0;
-
-  if ((mrb == NULL) || (dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  index = get_break_index(dbg, bpno);
-  if (index == MRB_DEBUG_BREAK_INVALID_NO) {
-    return MRB_DEBUG_BREAK_INVALID_NO;
-  }
-
-  dbg->bp[index].enable = FALSE;
-
-  return MRB_DEBUG_OK;
-}
-
-int32_t
-mrb_debug_disable_break_all(mrb_state *mrb, mrb_debug_context *dbg)
-{
-  uint32_t i;
-
-  if ((mrb == NULL) || (dbg == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  for(i = 0 ; i < dbg->bpnum; i++) {
-    dbg->bp[i].enable = FALSE;
-  }
-
-  return MRB_DEBUG_OK;
-}
-
-static mrb_bool
-check_start_pc_for_line(mrb_irep *irep, mrb_code *pc, uint16_t line)
-{
-  if (pc > irep->iseq) {
-    if (line == mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq - 1))) {
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
-
-int32_t
-mrb_debug_check_breakpoint_line(mrb_state *mrb, mrb_debug_context *dbg, const char *file, uint16_t line)
-{
-  mrb_debug_breakpoint *bp;
-  mrb_debug_linepoint *line_p;
-  uint32_t i;
-
-  if ((mrb == NULL) || (dbg == NULL) || (file == NULL) || (line <= 0)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  if (!check_start_pc_for_line(dbg->irep, dbg->pc, line)) {
-    return MRB_DEBUG_OK;
-  }
-
-  bp = dbg->bp;
-  for(i=0; i<dbg->bpnum; i++) {
-    switch (bp->type) {
-      case MRB_DEBUG_BPTYPE_LINE:
-        if (bp->enable == TRUE) {
-          line_p = &bp->point.linepoint;
-          if ((strcmp(line_p->file, file) == 0) && (line_p->lineno == line)) {
-            return bp->bpno;
-          }
-        }
-        break;
-      case MRB_DEBUG_BPTYPE_METHOD:
-        break;
-      case MRB_DEBUG_BPTYPE_NONE:
-      default:
-        return MRB_DEBUG_OK;
-    }
-    bp++;
-  }
-  return MRB_DEBUG_OK;
-}
-
-
-int32_t
-mrb_debug_check_breakpoint_method(mrb_state *mrb, mrb_debug_context *dbg, struct RClass *class_obj, mrb_sym method_sym, mrb_bool* isCfunc)
-{
-  mrb_debug_breakpoint *bp;
-  int32_t bpno;
-  uint32_t i;
-
-  if ((mrb == NULL) || (dbg == NULL) || (class_obj == NULL)) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  bp = dbg->bp;
-  for(i=0; i<dbg->bpnum; i++) {
-    if (bp->type == MRB_DEBUG_BPTYPE_METHOD) {
-      if (bp->enable == TRUE) {
-        bpno = compare_break_method(mrb, bp, class_obj, method_sym, isCfunc);
-        if (bpno > 0) {
-          return bpno;
-        }
-      }
-    }
-    else if (bp->type == MRB_DEBUG_BPTYPE_NONE) {
-      break;
-    }
-    bp++;
-  }
-
-  return 0;
-}
-
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apibreak.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*
-** apibreak.h
-**
-*/
-
-#ifndef APIBREAK_H_
-#define APIBREAK_H_
-
-#include <mruby.h>
-#include "mrdb.h"
-
-int32_t mrb_debug_set_break_line(mrb_state *, mrb_debug_context *, const char *, uint16_t);
-int32_t mrb_debug_set_break_method(mrb_state *, mrb_debug_context *, const char *, const char *);
-int32_t mrb_debug_get_breaknum(mrb_state *, mrb_debug_context *);
-int32_t mrb_debug_get_break_all(mrb_state *, mrb_debug_context *, uint32_t, mrb_debug_breakpoint bp[]);
-int32_t mrb_debug_get_break(mrb_state *, mrb_debug_context *, uint32_t, mrb_debug_breakpoint *);
-int32_t mrb_debug_delete_break(mrb_state *, mrb_debug_context *, uint32_t);
-int32_t mrb_debug_delete_break_all(mrb_state *, mrb_debug_context *);
-int32_t mrb_debug_enable_break(mrb_state *, mrb_debug_context *, uint32_t);
-int32_t mrb_debug_enable_break_all(mrb_state *, mrb_debug_context *);
-int32_t mrb_debug_disable_break(mrb_state *, mrb_debug_context *, uint32_t);
-int32_t mrb_debug_disable_break_all(mrb_state *, mrb_debug_context *);
-int32_t mrb_debug_check_breakpoint_line(mrb_state *, mrb_debug_context *, const char *, uint16_t);
-int32_t mrb_debug_check_breakpoint_method(mrb_state *, mrb_debug_context *, struct RClass *, mrb_sym, mrb_bool*);
-
-#endif /* APIBREAK_H_ */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,235 +0,0 @@
-/*
- * apilist.c
- */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "mrdb.h"
-#include "mrdberror.h"
-#include "apilist.h"
-#include <mruby/compile.h>
-#include <mruby/irep.h>
-#include <mruby/debug.h>
-
-#define LINE_BUF_SIZE MAX_COMMAND_LINE
-
-typedef struct source_file {
-  char *path;
-  uint16_t lineno;
-  FILE *fp;
-} source_file;
-
-static void
-source_file_free(mrb_state *mrb, source_file *file)
-{
-  if (file != NULL) {
-    if (file->path != NULL) {
-      mrb_free(mrb, file->path);
-    }
-    if (file->fp != NULL) {
-      fclose(file->fp);
-      file->fp = NULL;
-    }
-    mrb_free(mrb, file);
-  }
-}
-
-static char*
-build_path(mrb_state *mrb, const char *dir, const char *base)
-{
-  int len;
-  char *path = NULL;
-
-  len = strlen(base) + 1;
-
-  if (strcmp(dir, ".")) {
-    len += strlen(dir) + sizeof("/") - 1;
-  }
-
-  path = mrb_malloc(mrb, len);
-  memset(path, 0, len);
-
-  if (strcmp(dir, ".")) {
-    strcat(path, dir);
-    strcat(path, "/");
-  }
-  strcat(path, base);
-
-  return path;
-}
-
-static char*
-dirname(mrb_state *mrb, const char *path)
-{
-  size_t len;
-  char *p, *dir;
-
-  if (path == NULL) {
-    return NULL;
-  }
-
-  p = strrchr(path, '/');
-  len = p != NULL ? (size_t)(p - path) : strlen(path);
-
-  dir = mrb_malloc(mrb, len + 1);
-  strncpy(dir, path, len);
-  dir[len] = '\0';
-
-  return dir;
-}
-
-static source_file*
-source_file_new(mrb_state *mrb, mrb_debug_context *dbg, char *filename)
-{
-  source_file *file = NULL;
-
-  file = mrb_malloc(mrb, sizeof(source_file));
-
-  memset(file, '\0', sizeof(source_file));
-  file->fp = fopen(filename, "rb");
-
-  if (file->fp == NULL) {
-    source_file_free(mrb, file);
-    return NULL;
-  }
-
-  file->lineno = 1;
-  file->path = mrb_malloc(mrb, strlen(filename) + 1);
-  strcpy(file->path, filename);
-  return file;
-}
-
-static mrb_bool
-remove_newlines(char *s, FILE *fp)
-{
-  int c;
-  char *p;
-  size_t len;
-
-  if ((len = strlen(s)) == 0) {
-    return FALSE;
-  }
-
-  p = s + len - 1;
-
-  if (*p != '\r' && *p != '\n') {
-    return FALSE;
-  }
-
-  if (*p == '\r') {
-    /* peek the next character and skip '\n' */
-    if ((c = fgetc(fp)) != '\n') {
-      ungetc(c, fp);
-    }
-  }
-
-  /* remove trailing newline characters */
-  while (s <= p && (*p == '\r' || *p == '\n')) {
-    *p-- = '\0';
-  }
-
-  return TRUE;
-}
-
-static void
-show_lines(source_file *file, uint16_t line_min, uint16_t line_max)
-{
-  char buf[LINE_BUF_SIZE];
-  int show_lineno = 1, found_newline = 0, is_printed = 0;
-
-  if (file->fp == NULL) {
-    return;
-  }
-
-  while (fgets(buf, sizeof(buf), file->fp) != NULL) {
-    found_newline = remove_newlines(buf, file->fp);
-
-    if (line_min <= file->lineno) {
-      if (show_lineno) {
-        printf("%-8d", file->lineno);
-      }
-      show_lineno = found_newline;
-      printf(found_newline ? "%s\n" : "%s", buf);
-      is_printed = 1;
-    }
-
-    if (found_newline) {
-      if (line_max < ++file->lineno) {
-        break;
-      }
-    }
-  }
-
-  if (is_printed && !found_newline) {
-    printf("\n");
-  }
-}
-
-char*
-mrb_debug_get_source(mrb_state *mrb, mrdb_state *mrdb, const char *srcpath, const char *filename)
-{
-  int i;
-  FILE *fp;
-  const char *search_path[3];
-  char *path = NULL;
-
-  search_path[0] = srcpath;
-  search_path[1] = dirname(mrb, mrb_debug_get_filename(mrdb->dbg->root_irep, 0));
-  search_path[2] = ".";
-
-  for (i = 0; i < 3; i++) {
-    if (search_path[i] == NULL) {
-      continue;
-    }
-
-    if ((path = build_path(mrb, search_path[i], filename)) == NULL) {
-      continue;
-    }
-
-    if ((fp = fopen(path, "rb")) == NULL) {
-      mrb_free(mrb, path);
-      path = NULL;
-      continue;
-    }
-    fclose(fp);
-    break;
-  }
-
-  mrb_free(mrb, (void *)search_path[1]);
-
-  return path;
-}
-
-int32_t
-mrb_debug_list(mrb_state *mrb, mrb_debug_context *dbg, char *filename, uint16_t line_min, uint16_t line_max)
-{
-  char *ext;
-  source_file *file;
-
-  if (mrb == NULL || dbg == NULL || filename == NULL) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  ext = strrchr(filename, '.');
-
-  if (ext == NULL || strcmp(ext, ".rb")) {
-    printf("List command only supports .rb file.\n");
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  if (line_min > line_max) {
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-
-  if ((file = source_file_new(mrb, dbg, filename)) != NULL) {
-    show_lines(file, line_min, line_max);
-    source_file_free(mrb, file);
-    return MRB_DEBUG_OK;
-  }
-  else {
-    printf("Invalid source file named %s.\n", filename);
-    return MRB_DEBUG_INVALID_ARGUMENT;
-  }
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apilist.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-/*
- * apilist.h
- */
-
-#ifndef APILIST_H_
-#define APILIST_H_
-
-#include <mruby.h>
-#include "mrdb.h"
-
-int32_t mrb_debug_list(mrb_state *, mrb_debug_context *, char *, uint16_t, uint16_t);
-char* mrb_debug_get_source(mrb_state *, mrdb_state *, const char *, const char *);
-
-#endif /* APILIST_H_ */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/*
-** apiprint.c
-**
-*/
-
-#include <string.h>
-#include "mrdb.h"
-#include <mruby/value.h>
-#include <mruby/class.h>
-#include <mruby/compile.h>
-#include <mruby/error.h>
-#include <mruby/numeric.h>
-#include <mruby/string.h>
-#include "apiprint.h"
-
-static void
-mrdb_check_syntax(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len)
-{
-  mrbc_context *c;
-
-  c = mrbc_context_new(mrb);
-  c->no_exec = TRUE;
-  c->capture_errors = TRUE;
-  c->filename = (char*)dbg->prvfile;
-  c->lineno = dbg->prvline;
-
-  /* Load program */
-  mrb_load_nstring_cxt(mrb, expr, len, c);
-
-  mrbc_context_free(mrb, c);
-}
-
-mrb_value
-mrb_debug_eval(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len, mrb_bool *exc)
-{
-  void (*tmp)(struct mrb_state *, struct mrb_irep *, mrb_code *, mrb_value *);
-  mrb_value ruby_code;
-  mrb_value s;
-  mrb_value v;
-  mrb_value recv;
-
-  /* disable code_fetch_hook */
-  tmp = mrb->code_fetch_hook;
-  mrb->code_fetch_hook = NULL;
-
-  mrdb_check_syntax(mrb, dbg, expr, len);
-  if (mrb->exc) {
-    v = mrb_obj_value(mrb->exc);
-    mrb->exc = 0;
-  }
-  else {
-    /*
-     * begin
-     *   expr
-     * rescue => e
-     *   e
-     * end
-     */
-    ruby_code = mrb_str_new_lit(mrb, "begin\n");
-    ruby_code = mrb_str_cat(mrb, ruby_code, expr, len);
-    ruby_code = mrb_str_cat_lit(mrb, ruby_code, "\nrescue => e\ne\nend");
-
-    recv = dbg->regs[0];
-
-    v =  mrb_funcall(mrb, recv, "instance_eval", 1, ruby_code);
-  }
-
-  if (exc) {
-    *exc = mrb_obj_is_kind_of(mrb, v, mrb->eException_class);
-  }
-
-  s = mrb_funcall(mrb, v, "inspect", 0);
-
-  /* enable code_fetch_hook */
-  mrb->code_fetch_hook = tmp;
-
-  return s;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-/*
- * apiprint.h
- */
-
-#ifndef APIPRINT_H_
-#define APIPRINT_H_
-
-#include <mruby.h>
-#include "mrdb.h"
-
-mrb_value mrb_debug_eval(mrb_state*, mrb_debug_context*, const char*, size_t, mrb_bool*);
-
-#endif /* APIPRINT_H_ */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,436 +0,0 @@
-/*
-** cmdbreak.c
-**
-*/
-
-#include <ctype.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/dump.h>
-#include <mruby/debug.h>
-#include <mruby/string.h>
-#include "mrdb.h"
-#include "mrdberror.h"
-#include "apibreak.h"
-
-#define BREAK_SET_MSG_LINE                  "Breakpoint %d: file %s, line %d.\n"
-#define BREAK_SET_MSG_METHOD                "Breakpoint %d: method %s.\n"
-#define BREAK_SET_MSG_CLASS_METHOD          "Breakpoint %d: class %s, method %s.\n"
-#define BREAK_INFO_MSG_HEADER               "Num     Type           Enb What"
-#define BREAK_INFO_MSG_LINEBREAK            "%-8ubreakpoint     %s   at %s:%u\n"
-#define BREAK_INFO_MSG_METHODBREAK          "%-8ubreakpoint     %s   in %s:%s\n"
-#define BREAK_INFO_MSG_METHODBREAK_NOCLASS  "%-8ubreakpoint     %s   in %s\n"
-#define BREAK_INFO_MSG_ENABLE               "y"
-#define BREAK_INFO_MSG_DISABLE              "n"
-
-#define BREAK_ERR_MSG_INVALIDARG            "Internal error."
-#define BREAK_ERR_MSG_BLANK                 "Try \'help break\' for more information."
-#define BREAK_ERR_MSG_RANGEOVER             "The line number range is from 1 to 65535."
-#define BREAK_ERR_MSG_NUMOVER               "Exceeded the setable number of breakpoint."
-#define BREAK_ERR_MSG_NOOVER                "Breakno is over the available number.Please 'quit' and restart mrdb."
-#define BREAK_ERR_MSG_INVALIDSTR            "String \'%s\' is invalid.\n"
-#define BREAK_ERR_MSG_INVALIDLINENO         "Line %d in file \"%s\" is unavailable.\n"
-#define BREAK_ERR_MSG_INVALIDCLASS          "Class name \'%s\' is invalid.\n"
-#define BREAK_ERR_MSG_INVALIDMETHOD         "Method name \'%s\' is invalid.\n"
-#define BREAK_ERR_MSG_INVALIDFILE           "Source file named \"%s\" is unavailable.\n"
-#define BREAK_ERR_MSG_INVALIDBPNO           "warning: bad breakpoint number at or near '%s'\n"
-#define BREAK_ERR_MSG_INVALIDBPNO_INFO      "Args must be numbers variables."
-#define BREAK_ERR_MSG_NOBPNO                "No breakpoint number %d.\n"
-#define BREAK_ERR_MSG_NOBPNO_INFO           "No breakpoint matching '%d'\n"
-#define BREAK_ERR_MSG_NOBPNO_INFOALL        "No breakpoints."
-
-#define LINENO_MAX_DIGIT 6
-#define BPNO_LETTER_NUM 9
-
-typedef int32_t (*all_command_func)(mrb_state *, mrb_debug_context *);
-typedef int32_t (*select_command_func)(mrb_state *, mrb_debug_context *, uint32_t);
-
-static void
-print_api_common_error(int32_t error)
-{
-  switch(error) {
-    case MRB_DEBUG_INVALID_ARGUMENT:
-      puts(BREAK_ERR_MSG_INVALIDARG);
-      break;
-    default:
-      break;
-  }
-}
-
-#undef STRTOUL
-#define STRTOUL(ul,s) { \
-    int i; \
-    ul = 0; \
-    for(i=0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); \
-}
-
-static int32_t
-parse_breakpoint_no(char* args)
-{
-  char* ps = args;
-  uint32_t l;
-
-  if ((*ps == '0')||(strlen(ps) >= BPNO_LETTER_NUM)) {
-    return 0;
-  }
-
-  while (!(ISBLANK(*ps)||ISCNTRL(*ps))) {
-    if (!ISDIGIT(*ps)) {
-      return 0;
-    }
-    ps++;
-  }
-
-  STRTOUL(l, args);
-  return l;
-}
-
-static mrb_bool
-exe_set_command_all(mrb_state *mrb, mrdb_state *mrdb, all_command_func func)
-{
-  int32_t ret = MRB_DEBUG_OK;
-
-  if (mrdb->wcnt == 1) {
-    ret = func(mrb, mrdb->dbg);
-    print_api_common_error(ret);
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static void
-exe_set_command_select(mrb_state *mrb, mrdb_state *mrdb, select_command_func func)
-{
-  char* ps;
-  int32_t ret = MRB_DEBUG_OK;
-  int32_t bpno = 0;
-  int32_t i;
-
-  for(i=1; i<mrdb->wcnt; i++) {
-    ps = mrdb->words[i];
-    bpno = parse_breakpoint_no(ps);
-    if (bpno == 0) {
-      printf(BREAK_ERR_MSG_INVALIDBPNO, ps);
-      break;
-    }
-    ret = func(mrb, mrdb->dbg, (uint32_t)bpno);
-    if (ret == MRB_DEBUG_BREAK_INVALID_NO) {
-      printf(BREAK_ERR_MSG_NOBPNO, bpno);
-    }
-    else if (ret != MRB_DEBUG_OK) {
-      print_api_common_error(ret);
-    }
-  }
-}
-
-mrb_debug_bptype
-check_bptype(char* args)
-{
-  char* ps = args;
-
-  if (ISBLANK(*ps)||ISCNTRL(*ps)) {
-    puts(BREAK_ERR_MSG_BLANK);
-    return MRB_DEBUG_BPTYPE_NONE;
-  }
-
-  if (!ISDIGIT(*ps)) {
-    return MRB_DEBUG_BPTYPE_METHOD;
-  }
-
-  while (!(ISBLANK(*ps)||ISCNTRL(*ps))) {
-    if (!ISDIGIT(*ps)) {
-      printf(BREAK_ERR_MSG_INVALIDSTR, args);
-      return MRB_DEBUG_BPTYPE_NONE;
-    }
-    ps++;
-  }
-
-  if ((*args == '0')||(strlen(args) >= LINENO_MAX_DIGIT)) {
-    puts(BREAK_ERR_MSG_RANGEOVER);
-    return MRB_DEBUG_BPTYPE_NONE;
-  }
-
-  return MRB_DEBUG_BPTYPE_LINE;
-}
-
-static void
-print_breakpoint(mrb_debug_breakpoint *bp)
-{
-  const char* enable_letter[] = {BREAK_INFO_MSG_DISABLE, BREAK_INFO_MSG_ENABLE};
-
-  if (bp->type == MRB_DEBUG_BPTYPE_LINE) {
-    printf(BREAK_INFO_MSG_LINEBREAK,
-      bp->bpno, enable_letter[bp->enable], bp->point.linepoint.file, bp->point.linepoint.lineno);
-  }
-  else {
-    if (bp->point.methodpoint.class_name == NULL) {
-      printf(BREAK_INFO_MSG_METHODBREAK_NOCLASS,
-        bp->bpno, enable_letter[bp->enable], bp->point.methodpoint.method_name);
-    }
-    else {
-      printf(BREAK_INFO_MSG_METHODBREAK,
-        bp->bpno, enable_letter[bp->enable], bp->point.methodpoint.class_name, bp->point.methodpoint.method_name);
-    }
-  }
-}
-
-static void
-info_break_all(mrb_state *mrb, mrdb_state *mrdb)
-{
-  int32_t bpnum = 0;
-  int32_t i = 0;
-  int32_t ret = MRB_DEBUG_OK;
-  mrb_debug_breakpoint *bp_list;
-
-  bpnum = mrb_debug_get_breaknum(mrb, mrdb->dbg);
-  if (bpnum < 0) {
-    print_api_common_error(bpnum);
-    return;
-  }
-  else if (bpnum == 0) {
-    puts(BREAK_ERR_MSG_NOBPNO_INFOALL);
-    return;
-  }
-  bp_list = (mrb_debug_breakpoint*)mrb_malloc(mrb, bpnum * sizeof(mrb_debug_breakpoint));
-
-  ret = mrb_debug_get_break_all(mrb, mrdb->dbg, (uint32_t)bpnum, bp_list);
-  if (ret < 0) {
-    print_api_common_error(ret);
-    return;
-  }
-  puts(BREAK_INFO_MSG_HEADER);
-  for(i = 0 ; i < bpnum ; i++) {
-    print_breakpoint(&bp_list[i]);
-  }
-
-  mrb_free(mrb, bp_list);
-}
-
-static void
-info_break_select(mrb_state *mrb, mrdb_state *mrdb)
-{
-  int32_t ret = MRB_DEBUG_OK;
-  int32_t bpno = 0;
-  char* ps = mrdb->command;
-  mrb_debug_breakpoint bp;
-  mrb_bool isFirst = TRUE;
-  int32_t i;
-
-  for(i=2; i<mrdb->wcnt; i++) {
-    ps = mrdb->words[i];
-    bpno = parse_breakpoint_no(ps);
-    if (bpno == 0) {
-      puts(BREAK_ERR_MSG_INVALIDBPNO_INFO);
-      break;
-    }
-
-    ret = mrb_debug_get_break(mrb, mrdb->dbg, bpno, &bp);
-    if (ret == MRB_DEBUG_BREAK_INVALID_NO) {
-      printf(BREAK_ERR_MSG_NOBPNO_INFO, bpno);
-      break;
-    }
-    else if (ret != MRB_DEBUG_OK) {
-      print_api_common_error(ret);
-      break;
-    }
-    else if (isFirst == TRUE) {
-      isFirst = FALSE;
-      puts(BREAK_INFO_MSG_HEADER);
-    }
-    print_breakpoint(&bp);
-  }
-}
-
-mrb_debug_bptype
-parse_breakcommand(mrdb_state *mrdb, const char **file, uint32_t *line, char **cname, char **method)
-{
-  mrb_debug_context *dbg = mrdb->dbg;
-  char *args;
-  char *body;
-  mrb_debug_bptype type;
-  uint32_t l;
-
-  if (mrdb->wcnt <= 1) {
-    puts(BREAK_ERR_MSG_BLANK);
-    return MRB_DEBUG_BPTYPE_NONE;
-  }
-
-  args = mrdb->words[1];
-  if ((body = strrchr(args, ':')) == NULL) {
-    body = args;
-    type = check_bptype(body);
-  }
-  else {
-    if (body == args) {
-      printf(BREAK_ERR_MSG_INVALIDSTR, args);
-      return MRB_DEBUG_BPTYPE_NONE;
-    }
-    *body = '\0';
-    type = check_bptype(++body);
-  }
-
-  switch(type) {
-    case MRB_DEBUG_BPTYPE_LINE:
-      STRTOUL(l, body);
-      if (l <= 65535) {
-        *line = l;
-        *file = (body == args)? mrb_debug_get_filename(dbg->irep, (uint32_t)(dbg->pc - dbg->irep->iseq)): args;
-      }
-      else {
-        puts(BREAK_ERR_MSG_RANGEOVER);
-        type = MRB_DEBUG_BPTYPE_NONE;
-      }
-      break;
-    case MRB_DEBUG_BPTYPE_METHOD:
-      if (body == args) {
-        /* method only */
-        if (ISUPPER(*body)||ISLOWER(*body)||(*body == '_')) {
-          *method = body;
-          *cname = NULL;
-        }
-        else {
-          printf(BREAK_ERR_MSG_INVALIDMETHOD, args);
-          type = MRB_DEBUG_BPTYPE_NONE;
-        }
-      }
-      else {
-        if (ISUPPER(*args)) {
-          switch(*body) {
-            case '@': case '$': case '?': case '.': case ',': case ':':
-            case ';': case '#': case '\\': case '\'': case '\"':
-            printf(BREAK_ERR_MSG_INVALIDMETHOD, body);
-            type = MRB_DEBUG_BPTYPE_NONE;
-            break;
-          default:
-            *method = body;
-            *cname = args;
-            break;
-          }
-        }
-        else {
-          printf(BREAK_ERR_MSG_INVALIDCLASS, args);
-          type = MRB_DEBUG_BPTYPE_NONE;
-        }
-      }
-      break;
-    case MRB_DEBUG_BPTYPE_NONE:
-    default:
-      break;
-  }
-
-  return type;
-}
-
-dbgcmd_state
-dbgcmd_break(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_debug_bptype type;
-  mrb_debug_context *dbg = mrdb->dbg;
-  const char *file = NULL;
-  uint32_t line = 0;
-  char *cname = NULL;
-  char *method = NULL;
-  int32_t ret;
-
-  type = parse_breakcommand(mrdb, &file, &line, &cname, &method);
-  switch (type) {
-    case MRB_DEBUG_BPTYPE_LINE:
-      ret = mrb_debug_set_break_line(mrb, dbg, file, line);
-      break;
-    case MRB_DEBUG_BPTYPE_METHOD:
-      ret = mrb_debug_set_break_method(mrb, dbg, cname, method);
-      break;
-    case MRB_DEBUG_BPTYPE_NONE:
-    default:
-      return DBGST_PROMPT;
-  }
-
-  if (ret >= 0) {
-    if (type == MRB_DEBUG_BPTYPE_LINE) {
-      printf(BREAK_SET_MSG_LINE, ret, file, line);
-    }
-    else if ((type == MRB_DEBUG_BPTYPE_METHOD)&&(cname == NULL)) {
-      printf(BREAK_SET_MSG_METHOD, ret, method);
-    }
-    else {
-      printf(BREAK_SET_MSG_CLASS_METHOD, ret, cname, method);
-    }
-  }
-  else {
-    switch (ret) {
-      case MRB_DEBUG_BREAK_INVALID_LINENO:
-        printf(BREAK_ERR_MSG_INVALIDLINENO, line, file);
-        break;
-      case MRB_DEBUG_BREAK_INVALID_FILE:
-        printf(BREAK_ERR_MSG_INVALIDFILE, file);
-        break;
-      case MRB_DEBUG_BREAK_NUM_OVER:
-        puts(BREAK_ERR_MSG_NUMOVER);
-        break;
-      case MRB_DEBUG_BREAK_NO_OVER:
-        puts(BREAK_ERR_MSG_NOOVER);
-        break;
-      case MRB_DEBUG_INVALID_ARGUMENT:
-        puts(BREAK_ERR_MSG_INVALIDARG);
-        break;
-      case MRB_DEBUG_NOBUF:
-        puts("T.B.D.");
-        break;
-      default:
-        break;
-    }
-  }
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_info_break(mrb_state *mrb, mrdb_state *mrdb)
-{
-  if (mrdb->wcnt == 2) {
-    info_break_all(mrb, mrdb);
-  }
-  else {
-    info_break_select(mrb, mrdb);
-  }
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_delete(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_bool ret = FALSE;
-
-  ret = exe_set_command_all(mrb, mrdb, mrb_debug_delete_break_all);
-  if (ret != TRUE) {
-    exe_set_command_select(mrb, mrdb, mrb_debug_delete_break);
-  }
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_enable(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_bool ret = FALSE;
-
-  ret = exe_set_command_all(mrb, mrdb, mrb_debug_enable_break_all);
-  if (ret != TRUE) {
-    exe_set_command_select(mrb, mrdb, mrb_debug_enable_break);
-  }
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_disable(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_bool ret = FALSE;
-
-  ret = exe_set_command_all(mrb, mrdb, mrb_debug_disable_break_all);
-  if (ret != TRUE) {
-    exe_set_command_select(mrb, mrdb, mrb_debug_disable_break);
-  }
-  return DBGST_PROMPT;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdmisc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,501 +0,0 @@
-/*
-** cmdmisc.c - mruby debugger miscellaneous command functions
-**
-*/
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "apilist.h"
-#include <mruby/compile.h>
-
-typedef struct help_msg {
-  const char *cmd1;
-  const char *cmd2;
-  const char *short_msg;
-  const char *long_msg;
-} help_msg;
-
-static help_msg help_msg_list[] = {
-  {
-    "b[reak]", NULL, "Set breakpoint",
-    "Usage: break [file:]line\n"
-    "       break [class:]method\n"
-    "\n"
-    "Set breakpoint at specified line or method.\n"
-    "If \'[file:]line\' is specified, break at start of code for that line (in a file).\n"
-    "If \'[class:]method\' is specified, break at start of code for that method (of the class).\n"
-  },
-  {
-    "c[ontinue]", NULL, "Continue program being debugged",
-    "Usage: continue [N]\n"
-    "\n"
-    "Continue program stopped by a breakpoint.\n"
-    "If N, which is non negative value, is passed,\n"
-    "proceed program until the N-th breakpoint is coming.\n"
-    "If N is not passed, N is assumed 1.\n"
-  },
-  {
-    "d[elete]", NULL, "Delete some breakpoints",
-    "Usage: delete [bpno1 [bpno2 [... [bpnoN]]]]\n"
-    "\n"
-    "Delete some breakpoints.\n"
-    "Arguments are breakpoint numbers with spaces in between.\n"
-    "To delete all breakpoints, give no argument.\n"
-  },
-  {
-    "dis[able]", NULL, "Disable some breakpoints",
-    "Usage: disable [bpno1 [bpno2 [... [bpnoN]]]]\n"
-    "\n"
-    "Disable some breakpoints.\n"
-    "Arguments are breakpoint numbers with spaces in between.\n"
-    "To disable all breakpoints, give no argument.\n"
-  },
-  {
-    "en[able]", NULL, "Enable some breakpoints",
-    "Usage: enable [bpno1 [bpno2 [... [bpnoN]]]]\n"
-    "\n"
-    "Enable some breakpoints.\n"
-    "Arguments are breakpoint numbers with spaces in between.\n"
-    "To enable all breakpoints, give no argument.\n"
-  },
-  {
-    "ev[al]", NULL, "Evaluate expression",
-    "Usage: eval expr\n"
-    "\n"
-    "It evaluates and prints the value of the mruby expression.\n"
-    "This is equivalent to the \'print\' command.\n"
-  },
-  {
-    "h[elp]", NULL, "Print this help",
-    "Usage: help [command]\n"
-    "\n"
-    "With no arguments, help displays a short list of commands.\n"
-    "With a command name as help argument, help displays how to use that command.\n"
-  },
-  {
-    "i[nfo]", "b[reakpoints]", "Status of breakpoints",
-    "Usage: info breakpoints [bpno1 [bpno2 [... [bpnoN]]]]\n"
-    "\n"
-    "Status of specified breakpoints (all user-settable breakpoints if no argument).\n"
-    "Arguments are breakpoint numbers with spaces in between.\n"
-  },
-  {
-    "l[ist]", NULL, "List specified line",
-    "Usage: list\n"
-    "       list first[,last]\n"
-    "       list filename:first[,last]\n"
-    "\n"
-    "Print lines from a source file.\n"
-    "\n"
-    "With first and last, list prints lines from first to last.\n"
-    "When last is empty, it stands for ten lines away from first.\n"
-    "With filename, list prints lines in the specified source file.\n"
-  },
-  {
-    "p[rint]", NULL, "Print value of expression",
-    "Usage: print expr\n"
-    "\n"
-    "It evaluates and prints the value of the mruby expression.\n"
-    "This is equivalent to the \'eval\' command.\n"
-  },
-  {
-    "q[uit]", NULL, "Exit mrdb",
-    "Usage: quit\n"
-    "\n"
-    "Exit mrdb.\n"
-  },
-  {
-    "r[un]", NULL, "Start debugged program",
-    "Usage: run\n"
-    "\n"
-    "Start debugged program.\n"
-  },
-  {
-    "s[tep]", NULL, "Step program until it reaches a different source line",
-    "Usage: step\n"
-    "\n"
-    "Step program until it reaches a different source line.\n"
-  },
-  { NULL, NULL, NULL, NULL }
-};
-
-typedef struct listcmd_parser_state {
-  mrb_bool parse_error;
-  mrb_bool has_line_min;
-  mrb_bool has_line_max;
-  char *filename;
-  uint16_t line_min;
-  uint16_t line_max;
-} listcmd_parser_state;
-
-static listcmd_parser_state*
-listcmd_parser_state_new(mrb_state *mrb)
-{
-  listcmd_parser_state *st = mrb_malloc(mrb, sizeof(listcmd_parser_state));
-  memset(st, 0, sizeof(listcmd_parser_state));
-  return st;
-}
-
-static void
-listcmd_parser_state_free(mrb_state *mrb, listcmd_parser_state *st)
-{
-  if (st != NULL) {
-    if (st->filename != NULL) {
-      mrb_free(mrb, st->filename);
-    }
-    mrb_free(mrb, st);
-  }
-}
-
-static mrb_bool
-parse_uint(char **sp, uint16_t *n)
-{
-  char *p;
-  int i;
-
-  if (*sp == NULL || **sp == '\0') {
-    return FALSE;
-  }
-
-  for (p = *sp; *p != '\0' && ISDIGIT(*p); p++) ;
-
-  if (p != *sp && (i = atoi(*sp)) >= 0) {
-    *n = (uint16_t)i;
-    *sp = p;
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static mrb_bool
-skip_char(char **sp, char c)
-{
-  if (*sp != NULL && **sp == c) {
-    ++*sp;
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static mrb_bool
-parse_lineno(mrb_state *mrb, char **sp, listcmd_parser_state *st)
-{
-  if (*sp == NULL || **sp == '\0') {
-    return FALSE;
-  }
-
-  st->has_line_min = FALSE;
-  st->has_line_max = FALSE;
-
-  if (parse_uint(sp, &st->line_min)) {
-    st->has_line_min = TRUE;
-  }
-  else {
-    return FALSE;
-  }
-
-  if (skip_char(sp, ',')) {
-    if (parse_uint(sp, &st->line_max)) {
-      st->has_line_max = TRUE;
-    }
-    else {
-      st->parse_error = TRUE;
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
-
-static mrb_bool
-parse_filename(mrb_state *mrb, char **sp, listcmd_parser_state *st)
-{
-  char *p;
-  int len;
-
-  if (st->filename != NULL) {
-    mrb_free(mrb, st->filename);
-    st->filename = NULL;
-  }
-
-  if ((p = strchr(*sp, ':')) != NULL) {
-    len = p - *sp;
-  }
-  else {
-    len = strlen(*sp);
-  }
-
-  if (len > 0) {
-    st->filename = mrb_malloc(mrb, len + 1);
-    strncpy(st->filename, *sp, len);
-    st->filename[len] = '\0';
-    *sp += len;
-    return TRUE;
-  }
-  else {
-    return FALSE;
-  }
-}
-
-char*
-replace_ext(mrb_state *mrb, const char *filename, const char *ext)
-{
-  size_t len;
-  char *p, *s;
-
-  if (filename == NULL) {
-    return NULL;
-  }
-
-  if ((p = strrchr(filename, '.')) != NULL && strchr(p, '/') == NULL) {
-    len = p - filename;
-  }
-  else {
-    len = strlen(filename);
-  }
-
-  s = mrb_malloc(mrb, len + strlen(ext) + 1);
-  memset(s, '\0', len + strlen(ext) + 1);
-  strncpy(s, filename, len);
-  strcat(s, ext);
-
-  return s;
-}
-
-static mrb_bool
-parse_listcmd_args(mrb_state *mrb, mrdb_state *mrdb, listcmd_parser_state *st)
-{
-  char *p;
-
-  switch (mrdb->wcnt) {
-  case 2:
-    p = mrdb->words[1];
-
-    /* mrdb->words[1] ::= <lineno> | <filename> ':' <lineno> | <filename> */
-    if (!parse_lineno(mrb, &p, st)) {
-      if (parse_filename(mrb, &p, st)) {
-        if (skip_char(&p, ':')) {
-          if (!parse_lineno(mrb, &p, st)) {
-            st->parse_error = TRUE;
-          }
-        }
-      }
-      else {
-        st->parse_error = TRUE;
-      }
-    }
-    if (*p != '\0') {
-      st->parse_error = TRUE;
-    }
-    break;
-  case 1:
-  case 0:
-    /* do nothing */
-    break;
-  default:
-    st->parse_error = TRUE;
-    printf("too many arguments\n");
-    break;
-  }
-
-  if (!st->parse_error) {
-    if (!st->has_line_min) {
-      st->line_min = (!st->filename && mrdb->dbg->prvline > 0) ? mrdb->dbg->prvline : 1;
-    }
-
-    if (!st->has_line_max) {
-      st->line_max = st->line_min + 9;
-    }
-
-    if (st->filename == NULL) {
-      if (mrdb->dbg->prvfile && strcmp(mrdb->dbg->prvfile, "-")) {
-        st->filename = replace_ext(mrb, mrdb->dbg->prvfile, ".rb");
-      }
-    }
-  }
-
-  if (st->parse_error || st->filename == NULL) {
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static mrb_bool
-check_cmd_pattern(const char *pattern, const char *cmd)
-{
-  char *lbracket, *rbracket, *p, *q;
-
-  if (pattern == NULL && cmd == NULL) {
-    return TRUE;
-  }
-  if (pattern == NULL || cmd == NULL) {
-    return FALSE;
-  }
-  if ((lbracket = strchr(pattern, '[')) == NULL) {
-    return !strcmp(pattern, cmd);
-  }
-  if ((rbracket = strchr(pattern, ']')) == NULL) {
-    return FALSE;
-  }
-  if (strncmp(pattern, cmd, lbracket - pattern)) {
-    return FALSE;
-  }
-
-  p = lbracket + 1;
-  q = (char *)cmd + (lbracket - pattern);
-
-  for ( ; p < rbracket && *q != '\0'; p++, q++) {
-    if (*p != *q) {
-      break;
-    }
-  }
-  return *q == '\0';
-}
-
-static help_msg*
-get_help_msg(char *cmd1, char *cmd2)
-{
-  help_msg *p;
-
-  if (cmd1 == NULL) {
-    return NULL;
-  }
-  for (p = help_msg_list; p->cmd1 != NULL; p++) {
-    if (check_cmd_pattern(p->cmd1, cmd1) && check_cmd_pattern(p->cmd2, cmd2)) {
-      return p;
-    }
-  }
-  return NULL;
-}
-
-static mrb_bool
-show_short_help(void)
-{
-  help_msg *p;
-
-  printf("Commands\n");
-
-  for (p = help_msg_list; p->cmd1 != NULL; p++) {
-    if (p->cmd2 == NULL) {
-      printf("  %s -- %s\n", p->cmd1, p->short_msg);
-    }
-    else {
-      printf("  %s %s -- %s\n", p->cmd1, p->cmd2, p->short_msg);
-    }
-  }
-  return TRUE;
-}
-
-static mrb_bool
-show_long_help(char *cmd1, char *cmd2)
-{
-  help_msg *help;
-
-  if ((help = get_help_msg(cmd1, cmd2)) == NULL) {
-    return FALSE;
-  }
-  printf("%s", help->long_msg);
-  return TRUE;
-}
-
-dbgcmd_state
-dbgcmd_list(mrb_state *mrb, mrdb_state *mrdb)
-{
-  char *filename;
-  listcmd_parser_state *st = listcmd_parser_state_new(mrb);
-
-  if (parse_listcmd_args(mrb, mrdb, st)) {
-    if ((filename = mrb_debug_get_source(mrb, mrdb, mrdb->srcpath, st->filename)) == NULL) {
-      filename = st->filename;
-    }
-    mrb_debug_list(mrb, mrdb->dbg, filename, st->line_min, st->line_max);
-
-    if (filename != NULL && filename != st->filename) {
-      mrb_free(mrb, filename);
-    }
-    listcmd_parser_state_free(mrb, st);
-  }
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_help(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_bool is_valid;
-  int i;
-
-  switch (mrdb->wcnt) {
-  case 0:
-  case 1:
-    is_valid = show_short_help();
-    break;
-  case 2:
-    is_valid = show_long_help(mrdb->words[1], NULL);
-    break;
-  case 3:
-    is_valid = show_long_help(mrdb->words[1], mrdb->words[2]);
-    break;
-  default:
-    is_valid = FALSE;
-    break;
-  }
-
-  if (!is_valid) {
-    printf("Invalid command \"");
-    for (i = 1; i < mrdb->wcnt; i++) {
-      printf("%s%s", i == 1 ? "" : " ", mrdb->words[i]);
-    }
-    printf("\". Try \"help\".\n");
-  }
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_quit(mrb_state *mrb, mrdb_state *mrdb)
-{
-  switch (mrdb->dbg->xm) {
-  case DBG_RUN:
-  case DBG_STEP:
-  case DBG_NEXT:
-    while (1) {
-      char c;
-      int buf;
-
-      printf("The program is running.  Exit anyway? (y or n) ");
-      fflush(stdout);
-
-      if ((buf = getchar()) == EOF) {
-        mrdb->dbg->xm = DBG_QUIT;
-        break;
-      }
-      c = buf;
-      while (buf != '\n' && (buf = getchar()) != EOF) ;
-
-      if (c == 'y' || c == 'Y') {
-        mrdb->dbg->xm = DBG_QUIT;
-        break;
-      }
-      else if (c == 'n' || c == 'N') {
-        break;
-      }
-      else {
-        printf("Please answer y or n.\n");
-      }
-    }
-    break;
-  default:
-    mrdb->dbg->xm = DBG_QUIT;
-    break;
-  }
-
-  if (mrdb->dbg->xm == DBG_QUIT) {
-    struct RClass *exc;
-    exc = mrb_define_class(mrb, "DebuggerExit", mrb_class_get(mrb, "Exception"));
-    mrb_raise(mrb, exc, "Exit mrdb.");
-  }
-  return DBGST_PROMPT;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdprint.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/*
-** cmdprint.c - mruby debugger print command functions
-**
-*/
-
-#include <string.h>
-#include "mrdb.h"
-#include <mruby/value.h>
-#include <mruby/class.h>
-#include <mruby/compile.h>
-#include <mruby/error.h>
-#include <mruby/numeric.h>
-#include <mruby/string.h>
-#include "apiprint.h"
-
-dbgcmd_state
-dbgcmd_print(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_value expr;
-  mrb_value result;
-  mrb_value s;
-  uint8_t wcnt;
-  int ai;
-
-  if (mrdb->wcnt <= 1) {
-    puts("Parameter not specified.");
-    return DBGST_PROMPT;
-  }
-
-  ai = mrb_gc_arena_save(mrb);
-
-  /* eval expr */
-  expr = mrb_str_new_cstr(mrb, NULL);
-  for (wcnt=1; wcnt<mrdb->wcnt; wcnt++) {
-    expr = mrb_str_cat_lit(mrb, expr, " ");
-    expr = mrb_str_cat_cstr(mrb, expr, mrdb->words[wcnt]);
-  }
-
-  result = mrb_debug_eval(mrb, mrdb->dbg, RSTRING_PTR(expr), RSTRING_LEN(expr), NULL);
-
-  /* $print_no = result */
-  s = mrb_str_cat_lit(mrb, result, "\0");
-  printf("$%lu = %s\n", (unsigned long)mrdb->print_no++, RSTRING_PTR(s));
-
-  if (mrdb->print_no == 0) {
-    mrdb->print_no = 1;
-  }
-
-  mrb_gc_arena_restore(mrb, ai);
-
-  return DBGST_PROMPT;
-}
-
-dbgcmd_state
-dbgcmd_eval(mrb_state *mrb, mrdb_state *mrdb)
-{
-  return dbgcmd_print(mrb, mrdb);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
-** cmdrun.c - mruby debugger run command functions
-**
-*/
-
-#include <mruby/opcode.h>
-#include "mrdb.h"
-
-dbgcmd_state
-dbgcmd_run(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_debug_context *dbg = mrdb->dbg;
-
-  if (dbg->xm == DBG_INIT){
-    dbg->xm = DBG_RUN;
-  }
-  else {
-    dbg->xm = DBG_QUIT;
-    if (dbg->xphase == DBG_PHASE_RUNNING){
-      struct RClass *exc;
-      puts("Start it from the beginning.");
-      exc = mrb_define_class(mrb, "DebuggerRestart", mrb_class_get(mrb, "Exception"));
-      mrb_raise(mrb, exc, "Restart mrdb.");
-    }
-  }
-
-  return DBGST_RESTART;
-}
-
-dbgcmd_state
-dbgcmd_continue(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_debug_context *dbg = mrdb->dbg;
-  int ccnt = 1;
-
-  if (mrdb->wcnt > 1){
-    sscanf(mrdb->words[1], "%d", &ccnt);
-  }
-  dbg->ccnt = (uint16_t)(ccnt > 0 ? ccnt : 1);  /* count of continue */
-
-  if (dbg->xphase == DBG_PHASE_AFTER_RUN){
-    puts("The program is not running.");
-    dbg->xm = DBG_QUIT;
-  }
-  else {
-    dbg->xm = DBG_RUN;
-  }
-  return DBGST_CONTINUE;
-}
-
-dbgcmd_state
-dbgcmd_step(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrdb->dbg->xm = DBG_STEP;
-  return DBGST_CONTINUE;
-}
-
-dbgcmd_state
-dbgcmd_next(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrdb->dbg->xm = DBG_NEXT;
-  mrdb->dbg->prvci = mrb->c->ci;
-  return DBGST_CONTINUE;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,759 +0,0 @@
-/*
-** mrdb.c - mruby debugger
-**
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <mruby.h>
-#include <mruby/dump.h>
-#include <mruby/debug.h>
-#include <mruby/class.h>
-#include <mruby/opcode.h>
-#include <mruby/variable.h>
-
-#include "mrdb.h"
-#include "apibreak.h"
-#include "apilist.h"
-
-void mrdb_state_free(mrb_state *);
-
-static mrb_debug_context *_debug_context = NULL;
-static mrdb_state *_mrdb_state = NULL;
-
-struct _args {
-  FILE *rfp;
-  char* fname;
-  char* srcpath;
-  int argc;
-  char** argv;
-  mrb_bool mrbfile : 1;
-};
-
-typedef struct debug_command {
-  const char *cmd1;
-  const char *cmd2;
-  uint8_t len1;
-  uint8_t len2;
-  uint8_t div;
-  debug_command_id id;
-  debug_command_func func;
-} debug_command;
-
-static const debug_command debug_command_list[] = {
-  {"break",     NULL,           1, 0, 0, DBGCMD_BREAK,          dbgcmd_break},           /* b[reak] */
-  {"continue",  NULL,           1, 0, 0, DBGCMD_CONTINUE,       dbgcmd_continue},        /* c[ontinue] */
-  {"delete",    NULL,           1, 0, 1, DBGCMD_DELETE,         dbgcmd_delete},          /* d[elete] */
-  {"disable",   NULL,           3, 0, 1, DBGCMD_DISABLE,        dbgcmd_disable},         /* dis[able] */
-  {"enable",    NULL,           2, 0, 1, DBGCMD_ENABLE,         dbgcmd_enable},          /* en[able] */
-  {"eval",      NULL,           2, 0, 0, DBGCMD_EVAL,           dbgcmd_eval},            /* ev[al] */
-  {"help",      NULL,           1, 0, 1, DBGCMD_HELP,           dbgcmd_help},            /* h[elp] */
-  {"info",      "breakpoints",  1, 1, 1, DBGCMD_INFO_BREAK,     dbgcmd_info_break},      /* i[nfo] b[reakpoints] */
-  {"list",      NULL,           1, 0, 1, DBGCMD_LIST,           dbgcmd_list},            /* l[ist] */
-  {"print",     NULL,           1, 0, 0, DBGCMD_PRINT,          dbgcmd_print},           /* p[rint] */
-  {"quit",      NULL,           1, 0, 0, DBGCMD_QUIT,           dbgcmd_quit},            /* q[uit] */
-  {"run",       NULL,           1, 0, 0, DBGCMD_RUN,            dbgcmd_run},             /* r[un] */
-  {"step",      NULL,           1, 0, 1, DBGCMD_STEP,           dbgcmd_step},            /* s[tep] */
-  {"next",      NULL,           1, 0, 1, DBGCMD_NEXT,           dbgcmd_next},            /* n[ext] */
-  {NULL}
-};
-
-
-static void
-usage(const char *name)
-{
-  static const char *const usage_msg[] = {
-  "switches:",
-  "-b           load and execute RiteBinary (mrb) file",
-  "-d           specify source directory",
-  "--version    print the version",
-  "--copyright  print the copyright",
-  NULL
-  };
-  const char *const *p = usage_msg;
-
-  printf("Usage: %s [switches] programfile\n", name);
-  while (*p) {
-    printf("  %s\n", *p++);
-  }
-}
-
-static int
-parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
-{
-  char **origargv = argv;
-  static const struct _args args_zero = { 0 };
-
-  *args = args_zero;
-
-  for (argc--,argv++; argc > 0; argc--,argv++) {
-    char *item;
-    if (argv[0][0] != '-') break;
-
-    item = argv[0] + 1;
-    switch (*item++) {
-    case 'b':
-      args->mrbfile = TRUE;
-      break;
-    case 'd':
-      if (item[0]) {
-        goto append_srcpath;
-      }
-      else if (argc > 1) {
-        argc--; argv++;
-        item = argv[0];
-append_srcpath:
-        if (!args->srcpath) {
-          size_t buflen;
-          char *buf;
-
-          buflen = strlen(item) + 1;
-          buf = (char *)mrb_malloc(mrb, buflen);
-          memcpy(buf, item, buflen);
-          args->srcpath = buf;
-        }
-        else {
-          size_t srcpathlen;
-          size_t itemlen;
-
-          srcpathlen = strlen(args->srcpath);
-          itemlen = strlen(item);
-          args->srcpath =
-            (char *)mrb_realloc(mrb, args->srcpath, srcpathlen + itemlen + 2);
-          args->srcpath[srcpathlen] = '\n';
-          memcpy(args->srcpath + srcpathlen + 1, item, itemlen + 1);
-        }
-      }
-      else {
-        printf("%s: No path specified for -d\n", *origargv);
-        return EXIT_SUCCESS;
-      }
-      break;
-    case '-':
-      if (strcmp((*argv) + 2, "version") == 0) {
-        mrb_show_version(mrb);
-        exit(EXIT_SUCCESS);
-      }
-      else if (strcmp((*argv) + 2, "copyright") == 0) {
-        mrb_show_copyright(mrb);
-        exit(EXIT_SUCCESS);
-      }
-    default:
-      return EXIT_FAILURE;
-    }
-  }
-
-  if (args->rfp == NULL) {
-    if (*argv == NULL) {
-      printf("%s: Program file not specified.\n", *origargv);
-      return EXIT_FAILURE;
-    }
-    else {
-      args->rfp = fopen(argv[0], args->mrbfile ? "rb" : "r");
-      if (args->rfp == NULL) {
-        printf("%s: Cannot open program file. (%s)\n", *origargv, *argv);
-        return EXIT_FAILURE;
-      }
-      args->fname = argv[0];
-      argc--; argv++;
-    }
-  }
-  args->argv = (char **)mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
-  memcpy(args->argv, argv, (argc+1) * sizeof(char*));
-  args->argc = argc;
-
-  return EXIT_SUCCESS;
-}
-
-static void
-cleanup(mrb_state *mrb, struct _args *args)
-{
-  if (args->rfp)
-    fclose(args->rfp);
-  if (args->srcpath)
-    mrb_free(mrb, args->srcpath);
-  if (args->argv)
-    mrb_free(mrb, args->argv);
-  mrdb_state_free(mrb);
-  mrb_close(mrb);
-}
-
-static mrb_debug_context*
-mrb_debug_context_new(mrb_state *mrb)
-{
-  mrb_debug_context *dbg = mrb_malloc(mrb, sizeof(mrb_debug_context));
-
-  memset(dbg, 0, sizeof(mrb_debug_context));
-
-  dbg->xm = DBG_INIT;
-  dbg->xphase = DBG_PHASE_BEFORE_RUN;
-  dbg->next_bpno = 1;
-
-  return dbg;
-}
-
-mrb_debug_context*
-mrb_debug_context_get(mrb_state *mrb)
-{
-  if (!_debug_context) {
-    _debug_context = mrb_debug_context_new(mrb);
-  }
-  return _debug_context;
-}
-
-void
-mrb_debug_context_set(mrb_debug_context *dbg)
-{
-  _debug_context = dbg;
-}
-
-void
-mrb_debug_context_free(mrb_state *mrb)
-{
-  if (_debug_context) {
-    mrb_debug_delete_break_all(mrb, _debug_context);
-    mrb_free(mrb, _debug_context);
-    _debug_context = NULL;
-  }
-}
-
-static mrdb_state*
-mrdb_state_new(mrb_state *mrb)
-{
-  mrdb_state *mrdb = mrb_malloc(mrb, sizeof(mrdb_state));
-
-  memset(mrdb, 0, sizeof(mrdb_state));
-
-  mrdb->dbg = mrb_debug_context_get(mrb);
-  mrdb->command = mrb_malloc(mrb, MAX_COMMAND_LINE+1);
-  mrdb->print_no = 1;
-
-  return mrdb;
-}
-
-mrdb_state*
-mrdb_state_get(mrb_state *mrb)
-{
-  if (!_mrdb_state) {
-    _mrdb_state = mrdb_state_new(mrb);
-  }
-  return _mrdb_state;
-}
-
-void
-mrdb_state_set(mrdb_state *mrdb)
-{
-  _mrdb_state = mrdb;
-}
-
-void
-mrdb_state_free(mrb_state *mrb)
-{
-  mrb_debug_context_free(mrb);
-  if (_mrdb_state) {
-    mrb_free(mrb, _mrdb_state->command);
-    mrb_free(mrb, _mrdb_state);
-    _mrdb_state = NULL;
-  }
-}
-
-static char*
-get_command(mrb_state *mrb, mrdb_state *mrdb)
-{
-  int i;
-  int c;
-
-  for (i=0; i<MAX_COMMAND_LINE; i++) {
-    if ((c=getchar()) == EOF || c == '\n') break;
-    mrdb->command[i] = c;
-  }
-
-  if (i == 0 && feof(stdin)) {
-    clearerr(stdin);
-    strcpy(mrdb->command, "quit");
-    i += sizeof("quit") - 1;
-  }
-
-  if (i == MAX_COMMAND_LINE) {
-    for ( ; (c=getchar()) != EOF && c !='\n'; i++) ;
-  }
-
-  if (i > MAX_COMMAND_LINE) {
-    printf("command line too long.\n");
-    i = 0; /* discard command data */
-  }
-  mrdb->command[i] = '\0';
-
-  return mrdb->command;
-}
-
-static char*
-pick_out_word(mrb_state *mrb, char **pp)
-{
-  char *ps;
-
-  for (ps=*pp; ISBLANK(*ps); ps++) ;
-  if (*ps == '\0') {
-    return NULL;
-  }
-
-  if (*ps == '\"' || *ps == '\'') {
-    *pp = strchr(ps+1, *ps);
-    if (*pp) (*pp)++;
-  }
-  else {
-    *pp = strpbrk(ps, " \t");
-  }
-
-  if (!*pp) {
-    *pp = ps + strlen(ps);
-  }
-
-  if (**pp != '\0') {
-    **pp = '\0';
-    (*pp)++;
-  }
-
-  return ps;
-}
-
-static debug_command*
-parse_command(mrb_state *mrb, mrdb_state *mrdb, char *buf)
-{
-  debug_command *cmd = NULL;
-  char *p = buf;
-  size_t wlen;
-
-  /* get word #1 */
-  mrdb->words[0] = pick_out_word(mrb, &p);
-  if (!mrdb->words[0]) {
-    return NULL;
-  }
-  mrdb->wcnt = 1;
-  /* set remain parameter */
-  for ( ; *p && ISBLANK(*p); p++) ;
-  if (*p) {
-    mrdb->words[mrdb->wcnt++] = p;
-  }
-
-  /* check word #1 */
-  for (cmd=(debug_command*)debug_command_list; cmd->cmd1; cmd++) {
-    wlen = strlen(mrdb->words[0]);
-    if (wlen >= cmd->len1 &&
-        strncmp(mrdb->words[0], cmd->cmd1, wlen) == 0) {
-      break;
-    }
-  }
-
-  if (cmd->cmd2) {
-    if (mrdb->wcnt > 1) {
-      /* get word #2 */
-      mrdb->words[1] = pick_out_word(mrb, &p);
-      if (mrdb->words[1]) {
-        /* update remain parameter */
-        for ( ; *p && ISBLANK(*p); p++) ;
-        if (*p) {
-          mrdb->words[mrdb->wcnt++] = p;
-        }
-      }
-    }
-
-    /* check word #1,#2 */
-    for ( ; cmd->cmd1; cmd++) {
-      wlen = strlen(mrdb->words[0]);
-      if (wlen < cmd->len1 ||
-          strncmp(mrdb->words[0], cmd->cmd1, wlen)) {
-        continue;
-      }
-
-      if (!cmd->cmd2) break;          /* word #1 only */
-
-      if (mrdb->wcnt == 1) continue;  /* word #2 not specified */
-
-      wlen = strlen(mrdb->words[1]);
-      if (wlen >= cmd->len2 &&
-          strncmp(mrdb->words[1], cmd->cmd2, wlen) == 0) {
-        break;  /* word #1 and #2 */
-      }
-    }
-  }
-
-  /* divide remain parameters */
-  if (cmd->cmd1 && cmd->div) {
-    p = mrdb->words[--mrdb->wcnt];
-    for ( ; mrdb->wcnt<MAX_COMMAND_WORD; mrdb->wcnt++) {
-      mrdb->words[mrdb->wcnt] = pick_out_word(mrb, &p);
-      if (!mrdb->words[mrdb->wcnt]) {
-        break;
-      }
-    }
-  }
-
-  return cmd->cmd1 ? cmd : NULL;
-}
-
-static void
-print_info_stopped_break(mrb_state *mrb, mrdb_state *mrdb)
-{
-  mrb_debug_breakpoint bp;
-  int32_t ret;
-  uint16_t lineno;
-  const char *file;
-  const char *method_name;
-  const char *class_name;
-
-  ret = mrb_debug_get_break(mrb, mrdb->dbg, mrdb->dbg->stopped_bpno, &bp);
-  if (ret == 0) {
-    switch(bp.type) {
-      case MRB_DEBUG_BPTYPE_LINE:
-        file = bp.point.linepoint.file;
-        lineno = bp.point.linepoint.lineno;
-        printf("Breakpoint %d, at %s:%d\n", bp.bpno, file, lineno);
-        break;
-      case MRB_DEBUG_BPTYPE_METHOD:
-        method_name = bp.point.methodpoint.method_name;
-        class_name = bp.point.methodpoint.class_name;
-        if (class_name == NULL) {
-          printf("Breakpoint %d, %s\n", bp.bpno, method_name);
-        }
-        else {
-          printf("Breakpoint %d, %s:%s\n", bp.bpno, class_name, method_name);
-        }
-        if (mrdb->dbg->isCfunc) {
-          printf("Stopped before calling the C function.\n");
-        }
-        break;
-      default:
-        break;
-    }
-  }
-}
-
-static void
-print_info_stopped_step_next(mrb_state *mrb, mrdb_state *mrdb)
-{
-  const char* file = mrdb->dbg->prvfile;
-  uint16_t lineno = mrdb->dbg->prvline;
-  printf("%s:%d\n", file, lineno);
-}
-
-static void
-print_info_stopped_code(mrb_state *mrb, mrdb_state *mrdb)
-{
-  char* file = mrb_debug_get_source(mrb, mrdb, mrdb->srcpath, mrdb->dbg->prvfile);
-  uint16_t lineno = mrdb->dbg->prvline;
-  if (file != NULL) {
-    mrb_debug_list(mrb, mrdb->dbg, file, lineno, lineno);
-    mrb_free(mrb, file);
-  }
-}
-
-static void
-print_info_stopped(mrb_state *mrb, mrdb_state *mrdb)
-{
-  switch(mrdb->dbg->bm) {
-    case BRK_BREAK:
-      print_info_stopped_break(mrb, mrdb);
-      print_info_stopped_code(mrb, mrdb);
-      break;
-    case BRK_STEP:
-    case BRK_NEXT:
-      print_info_stopped_step_next(mrb, mrdb);
-      print_info_stopped_code(mrb, mrdb);
-      break;
-    default:
-      break;
-  }
-}
-
-static debug_command*
-get_and_parse_command(mrb_state *mrb, mrdb_state *mrdb)
-{
-  debug_command *cmd = NULL;
-  char *p;
-  int i;
-
-  while (!cmd) {
-    for (p=NULL; !p || *p=='\0'; ) {
-      printf("(%s:%d) ", mrdb->dbg->prvfile, mrdb->dbg->prvline);
-      fflush(stdout);
-      p = get_command(mrb, mrdb);
-    }
-
-    cmd = parse_command(mrb, mrdb, p);
-#ifdef _DBG_MRDB_PARSER_
-    for (i=0; i<mrdb->wcnt; i++) {
-      printf("%d: %s\n", i, mrdb->words[i]);
-    }
-#endif
-    if (!cmd) {
-      printf("invalid command (");
-      for (i=0; i<mrdb->wcnt; i++) {
-        if (i>0) {
-          printf(" ");
-        }
-        printf("%s", mrdb->words[i]);
-      }
-      puts(")");
-    }
-  }
-  return cmd;
-}
-
-static int32_t
-check_method_breakpoint(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *regs)
-{
-  struct RClass* c;
-  mrb_sym sym;
-  int32_t bpno;
-  mrb_bool isCfunc;
-
-  mrb_debug_context *dbg = mrb_debug_context_get(mrb);
-
-  isCfunc = FALSE;
-  bpno = dbg->method_bpno;
-  dbg->method_bpno = 0;
-
-  switch(GET_OPCODE(*pc)) {
-    case OP_SEND:
-    case OP_SENDB:
-      c = mrb_class(mrb, regs[GETARG_A(*pc)]);
-      sym = irep->syms[GETARG_B(*pc)];
-      break;
-    case OP_SUPER:
-      c = mrb->c->ci->target_class->super;
-      sym = mrb->c->ci->mid;
-      break;
-    default:
-      sym = 0;
-      break;
-  }
-  if (sym != 0) {
-    dbg->method_bpno = mrb_debug_check_breakpoint_method(mrb, dbg, c, sym, &isCfunc);
-    if (isCfunc) {
-      bpno = dbg->method_bpno;
-      dbg->method_bpno = 0;
-    }
-  }
-  dbg->isCfunc = isCfunc;
-  return bpno;
-}
-
-static void
-mrb_code_fetch_hook(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *regs)
-{
-  const char *file;
-  int32_t line;
-  int32_t bpno;
-
-  mrb_debug_context *dbg = mrb_debug_context_get(mrb);
-
-  mrb_assert(dbg);
-
-  dbg->irep = irep;
-  dbg->pc   = pc;
-  dbg->regs = regs;
-
-  if (dbg->xphase == DBG_PHASE_RESTART) {
-    dbg->root_irep = irep;
-    dbg->prvfile = NULL;
-    dbg->prvline = 0;
-    dbg->prvci = NULL;
-    dbg->xm = DBG_RUN;
-    dbg->xphase = DBG_PHASE_RUNNING;
-  }
-
-  file = mrb_debug_get_filename(irep, (uint32_t)(pc - irep->iseq));
-  line = mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq));
-
-  switch (dbg->xm) {
-  case DBG_STEP:
-    if (!file || (dbg->prvfile == file && dbg->prvline == line)) {
-      return;
-    }
-    dbg->method_bpno = 0;
-    dbg->bm = BRK_STEP;
-    break;
-
-  case DBG_NEXT:
-    if (!file || (dbg->prvfile == file && dbg->prvline == line)) {
-      return;
-    }
-    if ((intptr_t)(dbg->prvci) < (intptr_t)(mrb->c->ci)) {
-      return;
-    }
-    dbg->prvci = NULL;
-    dbg->method_bpno = 0;
-    dbg->bm = BRK_NEXT;
-    break;
-
-  case DBG_RUN:
-    bpno = check_method_breakpoint(mrb, irep, pc, regs);
-    if (bpno > 0) {
-      dbg->stopped_bpno = bpno;
-      dbg->bm = BRK_BREAK;
-      break;
-    }
-    if (dbg->prvfile != file || dbg->prvline != line) {
-      bpno = mrb_debug_check_breakpoint_line(mrb, dbg, file, line);
-      if (bpno > 0) {
-        dbg->stopped_bpno = bpno;
-        dbg->bm = BRK_BREAK;
-        break;
-      }
-    }
-    dbg->prvfile = file;
-    dbg->prvline = line;
-    return;
-  case DBG_INIT:
-    dbg->root_irep = irep;
-    dbg->bm = BRK_INIT;
-    if (!file || line < 0) {
-      puts("Cannot get debugging information.");
-    }
-    break;
-
-  default:
-    return;
-  }
-
-  dbg->prvfile = file;
-  dbg->prvline = line;
-
-  if (dbg->bm == BRK_BREAK && --dbg->ccnt > 0) {
-    return;
-  }
-  dbg->break_hook(mrb, dbg);
-
-  dbg->xphase = DBG_PHASE_RUNNING;
-}
-
-static mrdb_exemode
-mrb_debug_break_hook(mrb_state *mrb, mrb_debug_context *dbg)
-{
-  debug_command *cmd;
-  dbgcmd_state st = DBGST_CONTINUE;
-  mrdb_state *mrdb = mrdb_state_get(mrb);
-
-  print_info_stopped(mrb, mrdb);
-
-  while (1) {
-    cmd = get_and_parse_command(mrb, mrdb);
-    mrb_assert(cmd);
-
-    st = cmd->func(mrb, mrdb);
-
-    if ((st == DBGST_CONTINUE) || (st == DBGST_RESTART)) break;
-  }
-  return dbg->xm;
-}
-
-int
-main(int argc, char **argv)
-{
-  mrb_state *mrb = mrb_open();
-  int n = -1;
-  struct _args args;
-  mrb_value v;
-  mrdb_state *mrdb;
-  mrdb_state *mrdb_backup;
-  mrb_debug_context* dbg_backup;
-  debug_command *cmd;
-
- l_restart:
-
-  if (mrb == NULL) {
-    fputs("Invalid mrb_state, exiting mruby\n", stderr);
-    return EXIT_FAILURE;
-  }
-
-  /* parse command parameters */
-  n = parse_args(mrb, argc, argv, &args);
-  if (n == EXIT_FAILURE || args.rfp == NULL) {
-    cleanup(mrb, &args);
-    usage(argv[0]);
-    return n;
-  }
-
-  /* initialize debugger information */
-  mrdb = mrdb_state_get(mrb);
-  mrb_assert(mrdb && mrdb->dbg);
-  mrdb->srcpath = args.srcpath;
-
-  if (mrdb->dbg->xm == DBG_QUIT) {
-    mrdb->dbg->xphase = DBG_PHASE_RESTART;
-  }
-  else {
-    mrdb->dbg->xphase = DBG_PHASE_BEFORE_RUN;
-  }
-  mrdb->dbg->xm = DBG_INIT;
-  mrdb->dbg->ccnt = 1;
-
-  /* setup hook functions */
-  mrb->code_fetch_hook = mrb_code_fetch_hook;
-  mrdb->dbg->break_hook = mrb_debug_break_hook;
-
-  if (args.mrbfile) { /* .mrb */
-    v = mrb_load_irep_file(mrb, args.rfp);
-  }
-  else {              /* .rb */
-    mrbc_context *cc = mrbc_context_new(mrb);
-    mrbc_filename(mrb, cc, args.fname);
-    v = mrb_load_file_cxt(mrb, args.rfp, cc);
-    mrbc_context_free(mrb, cc);
-  }
-  if (mrdb->dbg->xm == DBG_QUIT && !mrb_undef_p(v) && mrb->exc) {
-    const char *classname = mrb_obj_classname(mrb, mrb_obj_value(mrb->exc));
-    if (!strcmp(classname, "DebuggerExit")) {
-      cleanup(mrb, &args);
-      return 0;
-    }
-    if (!strcmp(classname, "DebuggerRestart")) {
-      mrdb_backup = mrdb_state_get(mrb);
-      dbg_backup = mrb_debug_context_get(mrb);
-
-      mrdb_state_set(NULL);
-      mrb_debug_context_set(NULL);
-
-      cleanup(mrb, &args);
-      mrb = mrb_open();
-
-      mrdb_state_set(mrdb_backup);
-      mrb_debug_context_set(dbg_backup);
-
-      goto l_restart;
-    }
-  }
-  puts("mruby application exited.");
-  mrdb->dbg->xphase = DBG_PHASE_AFTER_RUN;
-  if (!mrb_undef_p(v)) {
-    if (mrb->exc) {
-      mrb_print_error(mrb);
-    }
-    else {
-      printf(" => ");
-      mrb_p(mrb, v);
-    }
-  }
-
-  mrdb->dbg->prvfile = "-";
-  mrdb->dbg->prvline = 0;
-
-  while (1) {
-    cmd = get_and_parse_command(mrb, mrdb);
-    mrb_assert(cmd);
-
-    if (cmd->id == DBGCMD_QUIT) {
-      break;
-    }
-
-    if ( cmd->func(mrb, mrdb) == DBGST_RESTART ) goto l_restart;
-  }
-
-  cleanup(mrb, &args);
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-/*
-** mrdbconf.h - mruby debugger configuration
-**
-*/
-
-#ifndef MRDBCONF_H
-#define MRDBCONF_H
-
-/* configuration options: */
-/* maximum size for command buffer */
-#define MAX_COMMAND_LINE 1024
-
-/* maximum number of setable breakpoint */
-#define MAX_BREAKPOINT 5
-
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdberror.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdberror.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdberror.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdberror.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/*
-** mrdberror.h - mruby debugger error code
-**
-*/
-
-#ifndef MRDBERROR_H
-#define MRDBERROR_H
-
-#define MRB_DEBUG_OK                   (0)
-#define MRB_DEBUG_NOBUF                (-1)
-#define MRB_DEBUG_INVALID_ARGUMENT     (-2)
-
-#define MRB_DEBUG_BREAK_INVALID_LINENO (-11)
-#define MRB_DEBUG_BREAK_INVALID_FILE   (-12)
-#define MRB_DEBUG_BREAK_INVALID_NO     (-13)
-#define MRB_DEBUG_BREAK_NUM_OVER       (-14)
-#define MRB_DEBUG_BREAK_NO_OVER        (-15)
-
-#endif
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-/*
-** mrdb.h - mruby debugger
-**
-*/
-
-#ifndef MRDB_H
-#define MRDB_H
-
-#include <mruby.h>
-
-#include "mrdbconf.h"
-
-#ifdef _MSC_VER
-# define __func__ __FUNCTION__
-#endif
-
-#define MAX_COMMAND_WORD (16)
-
-typedef enum debug_command_id {
-  DBGCMD_RUN,
-  DBGCMD_CONTINUE,
-  DBGCMD_NEXT,
-  DBGCMD_STEP,
-  DBGCMD_BREAK,
-  DBGCMD_INFO_BREAK,
-  DBGCMD_WATCH,
-  DBGCMD_INFO_WATCH,
-  DBGCMD_ENABLE,
-  DBGCMD_DISABLE,
-  DBGCMD_DELETE,
-  DBGCMD_PRINT,
-  DBGCMD_DISPLAY,
-  DBGCMD_INFO_DISPLAY,
-  DBGCMD_DELETE_DISPLAY,
-  DBGCMD_EVAL,
-  DBGCMD_BACKTRACE,
-  DBGCMD_LIST,
-  DBGCMD_HELP,
-  DBGCMD_QUIT,
-  DBGCMD_UNKNOWN
-} debug_command_id;
-
-typedef enum dbgcmd_state {
-  DBGST_CONTINUE,
-  DBGST_PROMPT,
-  DBGST_COMMAND_ERROR,
-  DBGST_MAX,
-  DBGST_RESTART
-} dbgcmd_state;
-
-typedef enum mrdb_exemode {
-  DBG_INIT,
-  DBG_RUN,
-  DBG_STEP,
-  DBG_NEXT,
-  DBG_QUIT,
-} mrdb_exemode;
-
-typedef enum mrdb_exephase {
-  DBG_PHASE_BEFORE_RUN,
-  DBG_PHASE_RUNNING,
-  DBG_PHASE_AFTER_RUN,
-  DBG_PHASE_RESTART,
-} mrdb_exephase;
-
-typedef enum mrdb_brkmode {
-  BRK_INIT,
-  BRK_BREAK,
-  BRK_STEP,
-  BRK_NEXT,
-  BRK_QUIT,
-} mrdb_brkmode;
-
-typedef enum {
-  MRB_DEBUG_BPTYPE_NONE,
-  MRB_DEBUG_BPTYPE_LINE,
-  MRB_DEBUG_BPTYPE_METHOD,
-} mrb_debug_bptype;
-
-struct mrb_irep;
-struct mrbc_context;
-struct mrb_debug_context;
-
-typedef struct mrb_debug_linepoint {
-  const char *file;
-  uint16_t lineno;
-} mrb_debug_linepoint;
-
-typedef struct mrb_debug_methodpoint {
-  const char *class_name;
-  const char *method_name;
-} mrb_debug_methodpoint;
-
-typedef struct mrb_debug_breakpoint {
-  uint32_t bpno;
-  uint8_t enable;
-  mrb_debug_bptype type;
-  union point {
-    mrb_debug_linepoint linepoint;
-    mrb_debug_methodpoint methodpoint;
-  } point;
-} mrb_debug_breakpoint;
-
-typedef struct mrb_debug_context {
-  struct mrb_irep *root_irep;
-  struct mrb_irep *irep;
-  mrb_code *pc;
-  mrb_value *regs;
-
-  const char *prvfile;
-  int32_t prvline;
-  mrb_callinfo *prvci;
-
-  mrdb_exemode xm;
-  mrdb_exephase xphase;
-  mrdb_brkmode bm;
-  int16_t bmi;
-
-  uint16_t ccnt;
-  uint16_t scnt;
-
-  mrb_debug_breakpoint bp[MAX_BREAKPOINT];
-  uint32_t bpnum;
-  int32_t next_bpno;
-  int32_t method_bpno;
-  int32_t stopped_bpno;
-  mrb_bool isCfunc;
-
-  mrdb_exemode (*break_hook)(mrb_state *mrb, struct mrb_debug_context *dbg);
-
-} mrb_debug_context;
-
-typedef struct mrdb_state {
-  char *command;
-  uint8_t wcnt;
-  uint8_t pi;
-  char *words[MAX_COMMAND_WORD];
-  const char *srcpath;
-  uint32_t print_no;
-
-  mrb_debug_context *dbg;
-} mrdb_state;
-
-typedef dbgcmd_state (*debug_command_func)(mrb_state*, mrdb_state*);
-
-/* cmdrun.c */
-dbgcmd_state dbgcmd_run(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_continue(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_step(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_next(mrb_state*, mrdb_state*);
-/* cmdbreak.c */
-dbgcmd_state dbgcmd_break(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_info_break(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_delete(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_enable(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_disable(mrb_state*, mrdb_state*);
-/* cmdprint.c */
-dbgcmd_state dbgcmd_print(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_eval(mrb_state*, mrdb_state*);
-/* cmdmisc.c */
-dbgcmd_state dbgcmd_list(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_help(mrb_state*, mrdb_state*);
-dbgcmd_state dbgcmd_quit(mrb_state*, mrdb_state*);
-
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/bintest/mirb.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-require 'open3'
-
-assert('mirb normal operations') do
-  o, s = Open3.capture2('bin/mirb', :stdin_data => "a=1\nb=2\na+b\n")
-  assert_true o.include?('=> 3')
-  assert_true o.include?('=> 2')
-end
-
-assert('regression for #1563') do
-  o, s = Open3.capture2('bin/mirb', :stdin_data => "a=1;b=2;c=3\nb\nc")
-  assert_true o.include?('=> 3')
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-MRuby::Gem::Specification.new('mruby-bin-mirb') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mirb command'
-
-  if spec.build.cc.search_header_path 'readline/readline.h'
-    spec.cc.defines << "ENABLE_READLINE"
-    if spec.build.cc.search_header_path 'termcap.h'
-      if MRUBY_BUILD_HOST_IS_CYGWIN || MRUBY_BUILD_HOST_IS_OPENBSD
-        if spec.build.cc.search_header_path 'termcap.h'
-          if MRUBY_BUILD_HOST_IS_CYGWIN then
-            spec.linker.libraries << 'ncurses'
-          else
-            spec.linker.libraries << 'termcap'
-          end
-        end
-      end
-    end
-    if RUBY_PLATFORM.include?('netbsd')
-      spec.linker.libraries << 'edit'
-    else
-      spec.linker.libraries << 'readline'
-      if spec.build.cc.search_header_path 'curses.h'
-        spec.linker.libraries << 'ncurses'
-      end
-    end
-  elsif spec.build.cc.search_header_path 'linenoise.h'
-    spec.cc.defines << "ENABLE_LINENOISE"
-  end
-
-  spec.bins = %w(mirb)
-  spec.add_dependency('mruby-compiler', :core => 'mruby-compiler')
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,584 +0,0 @@
-/*
-** mirb - Embeddable Interactive Ruby Shell
-**
-** This program takes code from the user in
-** an interactive way and executes it
-** immediately. It's a REPL...
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <signal.h>
-#include <setjmp.h>
-
-#ifdef ENABLE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
-#define MIRB_ADD_HISTORY(line) add_history(line)
-#define MIRB_READLINE(ch) readline(ch)
-#define MIRB_WRITE_HISTORY(path) write_history(path)
-#define MIRB_READ_HISTORY(path) read_history(path)
-#define MIRB_USING_HISTORY() using_history()
-#elif defined(ENABLE_LINENOISE)
-#define ENABLE_READLINE
-#include <linenoise.h>
-#define MIRB_ADD_HISTORY(line) linenoiseHistoryAdd(line)
-#define MIRB_READLINE(ch) linenoise(ch)
-#define MIRB_WRITE_HISTORY(path) linenoiseHistorySave(path)
-#define MIRB_READ_HISTORY(path) linenoiseHistoryLoad(history_path)
-#define MIRB_USING_HISTORY()
-#endif
-
-#ifndef _WIN32
-#define MIRB_SIGSETJMP(env) sigsetjmp(env, 1)
-#define MIRB_SIGLONGJMP(env, val) siglongjmp(env, val)
-#define SIGJMP_BUF sigjmp_buf
-#else
-#define MIRB_SIGSETJMP(env) setjmp(env)
-#define MIRB_SIGLONGJMP(env, val) longjmp(env, val)
-#define SIGJMP_BUF jmp_buf
-#endif
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/proc.h>
-#include <mruby/compile.h>
-#include <mruby/string.h>
-
-#ifdef ENABLE_READLINE
-
-static const char history_file_name[] = ".mirb_history";
-
-static char *
-get_history_path(mrb_state *mrb)
-{
-  char *path = NULL;
-  const char *home = getenv("HOME");
-
-#ifdef _WIN32
-  if (home != NULL) {
-    home = getenv("USERPROFILE");
-  }
-#endif
-
-  if (home != NULL) {
-    int len = snprintf(NULL, 0, "%s/%s", home, history_file_name);
-    if (len >= 0) {
-      size_t size = len + 1;
-      path = (char *)mrb_malloc_simple(mrb, size);
-      if (path != NULL) {
-        int n = snprintf(path, size, "%s/%s", home, history_file_name);
-        if (n != len) {
-          mrb_free(mrb, path);
-          path = NULL;
-        }
-      }
-    }
-  }
-
-  return path;
-}
-
-#endif
-
-static void
-p(mrb_state *mrb, mrb_value obj, int prompt)
-{
-  mrb_value val;
-
-  val = mrb_funcall(mrb, obj, "inspect", 0);
-  if (prompt) {
-    if (!mrb->exc) {
-      fputs(" => ", stdout);
-    }
-    else {
-      val = mrb_funcall(mrb, mrb_obj_value(mrb->exc), "inspect", 0);
-    }
-  }
-  if (!mrb_string_p(val)) {
-    val = mrb_obj_as_string(mrb, obj);
-  }
-  fwrite(RSTRING_PTR(val), RSTRING_LEN(val), 1, stdout);
-  putc('\n', stdout);
-}
-
-/* Guess if the user might want to enter more
- * or if he wants an evaluation of his code now */
-static mrb_bool
-is_code_block_open(struct mrb_parser_state *parser)
-{
-  mrb_bool code_block_open = FALSE;
-
-  /* check for heredoc */
-  if (parser->parsing_heredoc != NULL) return TRUE;
-  if (parser->heredoc_end_now) {
-    parser->heredoc_end_now = FALSE;
-    return FALSE;
-  }
-
-  /* check for unterminated string */
-  if (parser->lex_strterm) return TRUE;
-
-  /* check if parser error are available */
-  if (0 < parser->nerr) {
-    const char unexpected_end[] = "syntax error, unexpected $end";
-    const char *message = parser->error_buffer[0].message;
-
-    /* a parser error occur, we have to check if */
-    /* we need to read one more line or if there is */
-    /* a different issue which we have to show to */
-    /* the user */
-
-    if (strncmp(message, unexpected_end, sizeof(unexpected_end) - 1) == 0) {
-      code_block_open = TRUE;
-    }
-    else if (strcmp(message, "syntax error, unexpected keyword_end") == 0) {
-      code_block_open = FALSE;
-    }
-    else if (strcmp(message, "syntax error, unexpected tREGEXP_BEG") == 0) {
-      code_block_open = FALSE;
-    }
-    return code_block_open;
-  }
-
-  switch (parser->lstate) {
-
-  /* all states which need more code */
-
-  case EXPR_BEG:
-    /* beginning of a statement, */
-    /* that means previous line ended */
-    code_block_open = FALSE;
-    break;
-  case EXPR_DOT:
-    /* a message dot was the last token, */
-    /* there has to come more */
-    code_block_open = TRUE;
-    break;
-  case EXPR_CLASS:
-    /* a class keyword is not enough! */
-    /* we need also a name of the class */
-    code_block_open = TRUE;
-    break;
-  case EXPR_FNAME:
-    /* a method name is necessary */
-    code_block_open = TRUE;
-    break;
-  case EXPR_VALUE:
-    /* if, elsif, etc. without condition */
-    code_block_open = TRUE;
-    break;
-
-  /* now all the states which are closed */
-
-  case EXPR_ARG:
-    /* an argument is the last token */
-    code_block_open = FALSE;
-    break;
-
-  /* all states which are unsure */
-
-  case EXPR_CMDARG:
-    break;
-  case EXPR_END:
-    /* an expression was ended */
-    break;
-  case EXPR_ENDARG:
-    /* closing parenthese */
-    break;
-  case EXPR_ENDFN:
-    /* definition end */
-    break;
-  case EXPR_MID:
-    /* jump keyword like break, return, ... */
-    break;
-  case EXPR_MAX_STATE:
-    /* don't know what to do with this token */
-    break;
-  default:
-    /* this state is unexpected! */
-    break;
-  }
-
-  return code_block_open;
-}
-
-struct _args {
-  FILE *rfp;
-  mrb_bool verbose      : 1;
-  int argc;
-  char** argv;
-};
-
-static void
-usage(const char *name)
-{
-  static const char *const usage_msg[] = {
-  "switches:",
-  "-v           print version number, then run in verbose mode",
-  "--verbose    run in verbose mode",
-  "--version    print the version",
-  "--copyright  print the copyright",
-  NULL
-  };
-  const char *const *p = usage_msg;
-
-  printf("Usage: %s [switches]\n", name);
-  while (*p)
-    printf("  %s\n", *p++);
-}
-
-static int
-parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
-{
-  static const struct _args args_zero = { 0 };
-
-  *args = args_zero;
-
-  for (argc--,argv++; argc > 0; argc--,argv++) {
-    char *item;
-    if (argv[0][0] != '-') break;
-
-    item = argv[0] + 1;
-    switch (*item++) {
-    case 'v':
-      if (!args->verbose) mrb_show_version(mrb);
-      args->verbose = TRUE;
-      break;
-    case '-':
-      if (strcmp((*argv) + 2, "version") == 0) {
-        mrb_show_version(mrb);
-        exit(EXIT_SUCCESS);
-      }
-      else if (strcmp((*argv) + 2, "verbose") == 0) {
-        args->verbose = TRUE;
-        break;
-      }
-      else if (strcmp((*argv) + 2, "copyright") == 0) {
-        mrb_show_copyright(mrb);
-        exit(EXIT_SUCCESS);
-      }
-    default:
-      return EXIT_FAILURE;
-    }
-  }
-
-  if (args->rfp == NULL) {
-    if (*argv != NULL) {
-      args->rfp = fopen(argv[0], "r");
-      if (args->rfp == NULL) {
-        printf("Cannot open program file. (%s)\n", *argv);
-        return EXIT_FAILURE;
-      }
-      argc--; argv++;
-    }
-  }
-  args->argv = (char **)mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
-  memcpy(args->argv, argv, (argc+1) * sizeof(char*));
-  args->argc = argc;
-
-  return EXIT_SUCCESS;
-}
-
-static void
-cleanup(mrb_state *mrb, struct _args *args)
-{
-  if (args->rfp)
-    fclose(args->rfp);
-  mrb_free(mrb, args->argv);
-  mrb_close(mrb);
-}
-
-/* Print a short remark for the user */
-static void
-print_hint(void)
-{
-  printf("mirb - Embeddable Interactive Ruby Shell\n\n");
-}
-
-#ifndef ENABLE_READLINE
-/* Print the command line prompt of the REPL */
-static void
-print_cmdline(int code_block_open)
-{
-  if (code_block_open) {
-    printf("* ");
-  }
-  else {
-    printf("> ");
-  }
-  fflush(stdout);
-}
-#endif
-
-void mrb_codedump_all(mrb_state*, struct RProc*);
-
-static int
-check_keyword(const char *buf, const char *word)
-{
-  const char *p = buf;
-  size_t len = strlen(word);
-
-  /* skip preceding spaces */
-  while (*p && isspace((unsigned char)*p)) {
-    p++;
-  }
-  /* check keyword */
-  if (strncmp(p, word, len) != 0) {
-    return 0;
-  }
-  p += len;
-  /* skip trailing spaces */
-  while (*p) {
-    if (!isspace((unsigned char)*p)) return 0;
-    p++;
-  }
-  return 1;
-}
-
-
-#ifndef ENABLE_READLINE
-volatile sig_atomic_t input_canceled = 0;
-void
-ctrl_c_handler(int signo)
-{
-  input_canceled = 1;
-}
-#else
-SIGJMP_BUF ctrl_c_buf;
-void
-ctrl_c_handler(int signo)
-{
-  MIRB_SIGLONGJMP(ctrl_c_buf, 1);
-}
-#endif
-
-int
-main(int argc, char **argv)
-{
-  char ruby_code[4096] = { 0 };
-  char last_code_line[1024] = { 0 };
-#ifndef ENABLE_READLINE
-  int last_char;
-  size_t char_index;
-#else
-  char *history_path;
-  char* line;
-#endif
-  mrbc_context *cxt;
-  struct mrb_parser_state *parser;
-  mrb_state *mrb;
-  mrb_value result;
-  struct _args args;
-  mrb_value ARGV;
-  int n;
-  int i;
-  mrb_bool code_block_open = FALSE;
-  int ai;
-  unsigned int stack_keep = 0;
-
-  /* new interpreter instance */
-  mrb = mrb_open();
-  if (mrb == NULL) {
-    fputs("Invalid mrb interpreter, exiting mirb\n", stderr);
-    return EXIT_FAILURE;
-  }
-
-  n = parse_args(mrb, argc, argv, &args);
-  if (n == EXIT_FAILURE) {
-    cleanup(mrb, &args);
-    usage(argv[0]);
-    return n;
-  }
-
-  ARGV = mrb_ary_new_capa(mrb, args.argc);
-  for (i = 0; i < args.argc; i++) {
-    char* utf8 = mrb_utf8_from_locale(args.argv[i], -1);
-    if (utf8) {
-      mrb_ary_push(mrb, ARGV, mrb_str_new_cstr(mrb, utf8));
-      mrb_utf8_free(utf8);
-    }
-  }
-  mrb_define_global_const(mrb, "ARGV", ARGV);
-
-#ifdef ENABLE_READLINE
-  history_path = get_history_path(mrb);
-  if (history_path == NULL) {
-    fputs("failed to get history path\n", stderr);
-    mrb_close(mrb);
-    return EXIT_FAILURE;
-  }
-
-  MIRB_USING_HISTORY();
-  MIRB_READ_HISTORY(history_path);
-#endif
-
-  print_hint();
-
-  cxt = mrbc_context_new(mrb);
-  cxt->capture_errors = TRUE;
-  cxt->lineno = 1;
-  mrbc_filename(mrb, cxt, "(mirb)");
-  if (args.verbose) cxt->dump_result = TRUE;
-
-  ai = mrb_gc_arena_save(mrb);
-
-  while (TRUE) {
-    char *utf8;
-
-    if (args.rfp) {
-      if (fgets(last_code_line, sizeof(last_code_line)-1, args.rfp) != NULL)
-        goto done;
-      break;
-    }
-
-#ifndef ENABLE_READLINE
-    print_cmdline(code_block_open);
-
-    signal(SIGINT, ctrl_c_handler);
-    char_index = 0;
-    while ((last_char = getchar()) != '\n') {
-      if (last_char == EOF) break;
-      if (char_index >= sizeof(last_code_line)-2) {
-        fputs("input string too long\n", stderr);
-        continue;
-      }
-      last_code_line[char_index++] = last_char;
-    }
-    signal(SIGINT, SIG_DFL);
-    if (input_canceled) {
-      ruby_code[0] = '\0';
-      last_code_line[0] = '\0';
-      code_block_open = FALSE;
-      puts("^C");
-      input_canceled = 0;
-      continue;
-    }
-    if (last_char == EOF) {
-      fputs("\n", stdout);
-      break;
-    }
-
-    last_code_line[char_index++] = '\n';
-    last_code_line[char_index] = '\0';
-#else
-    if (MIRB_SIGSETJMP(ctrl_c_buf) == 0) {
-      ;
-    }
-    else {
-      ruby_code[0] = '\0';
-      last_code_line[0] = '\0';
-      code_block_open = FALSE;
-      puts("^C");
-    }
-    signal(SIGINT, ctrl_c_handler);
-    line = MIRB_READLINE(code_block_open ? "* " : "> ");
-    signal(SIGINT, SIG_DFL);
-
-    if (line == NULL) {
-      printf("\n");
-      break;
-    }
-    if (strlen(line) > sizeof(last_code_line)-2) {
-      fputs("input string too long\n", stderr);
-      continue;
-    }
-    strcpy(last_code_line, line);
-    strcat(last_code_line, "\n");
-    MIRB_ADD_HISTORY(line);
-    free(line);
-#endif
-
-done:
-
-    if (code_block_open) {
-      if (strlen(ruby_code)+strlen(last_code_line) > sizeof(ruby_code)-1) {
-        fputs("concatenated input string too long\n", stderr);
-        continue;
-      }
-      strcat(ruby_code, last_code_line);
-    }
-    else {
-      if (check_keyword(last_code_line, "quit") || check_keyword(last_code_line, "exit")) {
-        break;
-      }
-      strcpy(ruby_code, last_code_line);
-    }
-
-    utf8 = mrb_utf8_from_locale(ruby_code, -1);
-    if (!utf8) abort();
-
-    /* parse code */
-    parser = mrb_parser_new(mrb);
-    if (parser == NULL) {
-      fputs("create parser state error\n", stderr);
-      break;
-    }
-    parser->s = utf8;
-    parser->send = utf8 + strlen(utf8);
-    parser->lineno = cxt->lineno;
-    mrb_parser_parse(parser, cxt);
-    code_block_open = is_code_block_open(parser);
-    mrb_utf8_free(utf8);
-
-    if (code_block_open) {
-      /* no evaluation of code */
-    }
-    else {
-      if (0 < parser->nerr) {
-        /* syntax error */
-        printf("line %d: %s\n", parser->error_buffer[0].lineno, parser->error_buffer[0].message);
-      }
-      else {
-        /* generate bytecode */
-        struct RProc *proc = mrb_generate_code(mrb, parser);
-        if (proc == NULL) {
-          fputs("codegen error\n", stderr);
-          mrb_parser_free(parser);
-          break;
-        }
-
-        if (args.verbose) {
-          mrb_codedump_all(mrb, proc);
-        }
-        /* pass a proc for evaluation */
-        /* evaluate the bytecode */
-        result = mrb_vm_run(mrb,
-            proc,
-            mrb_top_self(mrb),
-            stack_keep);
-        stack_keep = proc->body.irep->nlocals;
-        /* did an exception occur? */
-        if (mrb->exc) {
-          p(mrb, mrb_obj_value(mrb->exc), 0);
-          mrb->exc = 0;
-        }
-        else {
-          /* no */
-          if (!mrb_respond_to(mrb, result, mrb_intern_lit(mrb, "inspect"))){
-            result = mrb_any_to_s(mrb, result);
-          }
-          p(mrb, result, 1);
-        }
-      }
-      ruby_code[0] = '\0';
-      last_code_line[0] = '\0';
-      mrb_gc_arena_restore(mrb, ai);
-    }
-    mrb_parser_free(parser);
-    cxt->lineno++;
-  }
-
-#ifdef ENABLE_READLINE
-  MIRB_WRITE_HISTORY(history_path);
-  mrb_free(mrb, history_path);
-#endif
-
-  mrbc_context_free(mrb, cxt);
-  mrb_close(mrb);
-
-  return 0;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-MRuby::Gem::Specification.new 'mruby-bin-mrbc' do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mruby compiler executable'
-
-  spec.add_dependency 'mruby-compiler', :core => 'mruby-compiler'
-
-  exec = exefile("#{build.build_dir}/bin/mrbc")
-  mrbc_objs = Dir.glob("#{spec.dir}/tools/mrbc/*.c").map { |f| objfile(f.pathmap("#{spec.build_dir}/tools/mrbc/%n")) }.flatten
-
-  file exec => mrbc_objs + [libfile("#{build.build_dir}/lib/libmruby_core")] do |t|
-    build.linker.run t.name, t.prerequisites
-  end
-
-  build.bins << 'mrbc' unless build.bins.find { |v| v == 'mrbc' }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,336 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/compile.h>
-#include <mruby/dump.h>
-#include <mruby/proc.h>
-
-#define RITEBIN_EXT ".mrb"
-#define C_EXT       ".c"
-
-struct mrbc_args {
-  int argc;
-  char **argv;
-  int idx;
-  const char *prog;
-  const char *outfile;
-  const char *initname;
-  mrb_bool check_syntax : 1;
-  mrb_bool verbose      : 1;
-  unsigned int flags    : 4;
-};
-
-static void
-usage(const char *name)
-{
-  static const char *const usage_msg[] = {
-  "switches:",
-  "-c           check syntax only",
-  "-o<outfile>  place the output into <outfile>",
-  "-v           print version number, then turn on verbose mode",
-  "-g           produce debugging information",
-  "-B<symbol>   binary <symbol> output in C language format",
-  "-e           generate little endian iseq data",
-  "-E           generate big endian iseq data",
-  "--verbose    run at verbose mode",
-  "--version    print the version",
-  "--copyright  print the copyright",
-  NULL
-  };
-  const char *const *p = usage_msg;
-
-  printf("Usage: %s [switches] programfile\n", name);
-  while (*p)
-    printf("  %s\n", *p++);
-}
-
-static char *
-get_outfilename(mrb_state *mrb, char *infile, const char *ext)
-{
-  size_t infilelen;
-  size_t extlen;
-  char *outfile;
-  char *p;
-
-  infilelen = strlen(infile);
-  extlen = strlen(ext);
-  outfile = (char*)mrb_malloc(mrb, infilelen + extlen + 1);
-  memcpy(outfile, infile, infilelen + 1);
-  if (*ext) {
-    if ((p = strrchr(outfile, '.')) == NULL)
-      p = outfile + infilelen;
-    memcpy(p, ext, extlen + 1);
-  }
-
-  return outfile;
-}
-
-static int
-parse_args(mrb_state *mrb, int argc, char **argv, struct mrbc_args *args)
-{
-  char *outfile = NULL;
-  static const struct mrbc_args args_zero = { 0 };
-  int i;
-
-  *args = args_zero;
-  args->argc = argc;
-  args->argv = argv;
-  args->prog = argv[0];
-
-  for (i=1; i<argc; i++) {
-    if (argv[i][0] == '-') {
-      switch ((argv[i])[1]) {
-      case 'o':
-        if (args->outfile) {
-          fprintf(stderr, "%s: an output file is already specified. (%s)\n",
-                  args->prog, outfile);
-          return -1;
-        }
-        if (argv[i][2] == '\0' && argv[i+1]) {
-          i++;
-          args->outfile = get_outfilename(mrb, argv[i], "");
-        }
-        else {
-          args->outfile = get_outfilename(mrb, argv[i] + 2, "");
-        }
-        break;
-      case 'B':
-        if (argv[i][2] == '\0' && argv[i+1]) {
-          i++;
-          args->initname = argv[i];
-        }
-        else {
-          args->initname = argv[i]+2;
-        }
-        if (*args->initname == '\0') {
-          fprintf(stderr, "%s: function name is not specified.\n", args->prog);
-          return -1;
-        }
-        break;
-      case 'c':
-        args->check_syntax = TRUE;
-        break;
-      case 'v':
-        if (!args->verbose) mrb_show_version(mrb);
-        args->verbose = TRUE;
-        break;
-      case 'g':
-        args->flags |= DUMP_DEBUG_INFO;
-        break;
-      case 'E':
-        args->flags = DUMP_ENDIAN_BIG | (args->flags & ~DUMP_ENDIAN_MASK);
-        break;
-      case 'e':
-        args->flags = DUMP_ENDIAN_LIL | (args->flags & ~DUMP_ENDIAN_MASK);
-        break;
-      case 'h':
-        return -1;
-      case '-':
-        if (argv[i][1] == '\n') {
-          return i;
-        }
-        if (strcmp(argv[i] + 2, "version") == 0) {
-          mrb_show_version(mrb);
-          exit(EXIT_SUCCESS);
-        }
-        else if (strcmp(argv[i] + 2, "verbose") == 0) {
-          args->verbose = TRUE;
-          break;
-        }
-        else if (strcmp(argv[i] + 2, "copyright") == 0) {
-          mrb_show_copyright(mrb);
-          exit(EXIT_SUCCESS);
-        }
-        return -1;
-      default:
-        return i;
-      }
-    }
-    else {
-      break;
-    }
-  }
-  if (args->verbose && args->initname && (args->flags & DUMP_ENDIAN_MASK) == 0) {
-    fprintf(stderr, "%s: generating %s endian C file. specify -e/-E for cross compiling.\n",
-            args->prog, bigendian_p() ? "big" : "little");
-  }
-  return i;
-}
-
-static void
-cleanup(mrb_state *mrb, struct mrbc_args *args)
-{
-  mrb_free(mrb, (void*)args->outfile);
-  mrb_close(mrb);
-}
-
-static int
-partial_hook(struct mrb_parser_state *p)
-{
-  mrbc_context *c = p->cxt;
-  struct mrbc_args *args = (struct mrbc_args *)c->partial_data;
-  const char *fn;
-
-  if (p->f) fclose(p->f);
-  if (args->idx >= args->argc) {
-    p->f = NULL;
-    return -1;
-  }
-  fn = args->argv[args->idx++];
-  p->f = fopen(fn, "r");
-  if (p->f == NULL) {
-    fprintf(stderr, "%s: cannot open program file. (%s)\n", args->prog, fn);
-    return -1;
-  }
-  mrb_parser_set_filename(p, fn);
-  return 0;
-}
-
-static mrb_value
-load_file(mrb_state *mrb, struct mrbc_args *args)
-{
-  mrbc_context *c;
-  mrb_value result;
-  char *input = args->argv[args->idx];
-  FILE *infile;
-  mrb_bool need_close = FALSE;
-
-  c = mrbc_context_new(mrb);
-  if (args->verbose)
-    c->dump_result = TRUE;
-  c->no_exec = TRUE;
-  if (input[0] == '-' && input[1] == '\0') {
-    infile = stdin;
-  }
-  else {
-    need_close = TRUE;
-    if ((infile = fopen(input, "r")) == NULL) {
-      fprintf(stderr, "%s: cannot open program file. (%s)\n", args->prog, input);
-      return mrb_nil_value();
-    }
-  }
-  mrbc_filename(mrb, c, input);
-  args->idx++;
-  if (args->idx < args->argc) {
-    need_close = FALSE;
-    mrbc_partial_hook(mrb, c, partial_hook, (void*)args);
-  }
-
-  result = mrb_load_file_cxt(mrb, infile, c);
-  if (need_close) fclose(infile);
-  mrbc_context_free(mrb, c);
-  if (mrb_undef_p(result)) {
-    return mrb_nil_value();
-  }
-  return result;
-}
-
-static int
-dump_file(mrb_state *mrb, FILE *wfp, const char *outfile, struct RProc *proc, struct mrbc_args *args)
-{
-  int n = MRB_DUMP_OK;
-  mrb_irep *irep = proc->body.irep;
-
-  if (args->initname) {
-    n = mrb_dump_irep_cfunc(mrb, irep, args->flags, wfp, args->initname);
-    if (n == MRB_DUMP_INVALID_ARGUMENT) {
-      fprintf(stderr, "%s: invalid C language symbol name\n", args->initname);
-    }
-  }
-  else {
-    n = mrb_dump_irep_binary(mrb, irep, args->flags, wfp);
-  }
-  if (n != MRB_DUMP_OK) {
-    fprintf(stderr, "%s: error in mrb dump (%s) %d\n", args->prog, outfile, n);
-  }
-  return n;
-}
-
-int
-main(int argc, char **argv)
-{
-  mrb_state *mrb = mrb_open();
-  int n, result;
-  struct mrbc_args args;
-  FILE *wfp;
-  mrb_value load;
-
-  if (mrb == NULL) {
-    fputs("Invalid mrb_state, exiting mrbc\n", stderr);
-    return EXIT_FAILURE;
-  }
-
-  n = parse_args(mrb, argc, argv, &args);
-  if (n < 0) {
-    cleanup(mrb, &args);
-    usage(argv[0]);
-    return EXIT_FAILURE;
-  }
-  if (n == argc) {
-    fprintf(stderr, "%s: no program file given\n", args.prog);
-    return EXIT_FAILURE;
-  }
-  if (args.outfile == NULL && !args.check_syntax) {
-    if (n + 1 == argc) {
-      args.outfile = get_outfilename(mrb, argv[n], args.initname ? C_EXT : RITEBIN_EXT);
-    }
-    else {
-      fprintf(stderr, "%s: output file should be specified to compile multiple files\n", args.prog);
-      return EXIT_FAILURE;
-    }
-  }
-
-  args.idx = n;
-  load = load_file(mrb, &args);
-  if (mrb_nil_p(load)) {
-    cleanup(mrb, &args);
-    return EXIT_FAILURE;
-  }
-  if (args.check_syntax) {
-    printf("%s:%s:Syntax OK\n", args.prog, argv[n]);
-  }
-
-  if (args.check_syntax) {
-    cleanup(mrb, &args);
-    return EXIT_SUCCESS;
-  }
-
-  if (args.outfile) {
-    if (strcmp("-", args.outfile) == 0) {
-      wfp = stdout;
-    }
-    else if ((wfp = fopen(args.outfile, "wb")) == NULL) {
-      fprintf(stderr, "%s: cannot open output file:(%s)\n", args.prog, args.outfile);
-      return EXIT_FAILURE;
-    }
-  }
-  else {
-    fprintf(stderr, "Output file is required\n");
-    return EXIT_FAILURE;
-  }
-  result = dump_file(mrb, wfp, args.outfile, mrb_proc_ptr(load), &args);
-  fclose(wfp);
-  cleanup(mrb, &args);
-  if (result != MRB_DUMP_OK) {
-    return EXIT_FAILURE;
-  }
-  return EXIT_SUCCESS;
-}
-
-void
-mrb_init_mrblib(mrb_state *mrb)
-{
-}
-
-#ifndef DISABLE_GEMS
-void
-mrb_init_mrbgems(mrb_state *mrb)
-{
-}
-
-void
-mrb_final_mrbgems(mrb_state *mrb)
-{
-}
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-require 'tempfile'
-
-assert('regression for #1564') do
-  o = `#{cmd('mruby')} -e #{shellquote('<<')} 2>&1`
-  assert_include o, "-e:1:2: syntax error"
-  o = `#{cmd('mruby')} -e #{shellquote('<<-')} 2>&1`
-  assert_include o, "-e:1:3: syntax error"
-end
-
-assert('regression for #1572') do
-  script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb')
-  File.write script.path, 'p "ok"'
-  system "#{cmd('mrbc')} -g -o #{bin.path} #{script.path}"
-  o = `#{cmd('mruby')} -b #{bin.path}`.strip
-  assert_equal o, '"ok"'
-end
-
-assert '$0 value' do
-  script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb')
-
-  # .rb script
-  script.write "p $0\n"
-  script.flush
-  assert_equal "\"#{script.path}\"", `#{cmd('mruby')} "#{script.path}"`.chomp
-
-  # .mrb file
-  `#{cmd('mrbc')} -o "#{bin.path}" "#{script.path}"`
-  assert_equal "\"#{bin.path}\"", `#{cmd('mruby')} -b "#{bin.path}"`.chomp
-
-  # one liner
-  assert_equal '"-e"', `#{cmd('mruby')} -e #{shellquote('p $0')}`.chomp
-end
-
-assert '__END__', '8.6' do
-  script = Tempfile.new('test.rb')
-
-  script.write <<EOS
-p 'test'
-  __END__ = 'fin'
-p __END__
-__END__
-p 'legend'
-EOS
-  script.flush
-  assert_equal "\"test\"\n\"fin\"\n", `#{cmd('mruby')} #{script.path}`
-end
-
-assert('garbage collecting built-in classes') do
-  script = Tempfile.new('test.rb')
-
-  script.write <<RUBY
-NilClass = nil
-GC.start
-Array.dup
-print nil.class.to_s
-RUBY
-  script.flush
-  assert_equal "NilClass", `#{cmd('mruby')} #{script.path}`
-  assert_equal 0, $?.exitstatus
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-MRuby::Gem::Specification.new('mruby-bin-mruby') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mruby command'
-  spec.bins = %w(mruby)
-  spec.add_dependency('mruby-compiler', :core => 'mruby-compiler')
-  spec.add_dependency('mruby-error', :core => 'mruby-error')
-
-  if build.cxx_exception_enabled?
-    build.compile_as_cxx("#{spec.dir}/tools/mruby/mruby.c", "#{spec.build_dir}/tools/mruby/mruby.cxx")
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/compile.h>
-#include <mruby/dump.h>
-#include <mruby/variable.h>
-
-#ifdef MRB_DISABLE_STDIO
-static void
-p(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value val = mrb_inspect(mrb, obj);
-
-  fwrite(RSTRING_PTR(val), RSTRING_LEN(val), 1, stdout);
-  putc('\n', stdout);
-}
-#else
-#define p(mrb,obj) mrb_p(mrb,obj)
-#endif
-
-struct _args {
-  FILE *rfp;
-  char* cmdline;
-  mrb_bool fname        : 1;
-  mrb_bool mrbfile      : 1;
-  mrb_bool check_syntax : 1;
-  mrb_bool verbose      : 1;
-  int argc;
-  char** argv;
-};
-
-static void
-usage(const char *name)
-{
-  static const char *const usage_msg[] = {
-  "switches:",
-  "-b           load and execute RiteBinary (mrb) file",
-  "-c           check syntax only",
-  "-e 'command' one line of script",
-  "-v           print version number, then run in verbose mode",
-  "--verbose    run in verbose mode",
-  "--version    print the version",
-  "--copyright  print the copyright",
-  NULL
-  };
-  const char *const *p = usage_msg;
-
-  printf("Usage: %s [switches] programfile\n", name);
-  while (*p)
-    printf("  %s\n", *p++);
-}
-
-static int
-parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
-{
-  char **origargv = argv;
-  static const struct _args args_zero = { 0 };
-
-  *args = args_zero;
-
-  for (argc--,argv++; argc > 0; argc--,argv++) {
-    char *item;
-    if (argv[0][0] != '-') break;
-
-    if (strlen(*argv) <= 1) {
-      argc--; argv++;
-      args->rfp = stdin;
-      break;
-    }
-
-    item = argv[0] + 1;
-    switch (*item++) {
-    case 'b':
-      args->mrbfile = TRUE;
-      break;
-    case 'c':
-      args->check_syntax = TRUE;
-      break;
-    case 'e':
-      if (item[0]) {
-        goto append_cmdline;
-      }
-      else if (argc > 1) {
-        argc--; argv++;
-        item = argv[0];
-append_cmdline:
-        if (!args->cmdline) {
-          size_t buflen;
-          char *buf;
-
-          buflen = strlen(item) + 1;
-          buf = (char *)mrb_malloc(mrb, buflen);
-          memcpy(buf, item, buflen);
-          args->cmdline = buf;
-        }
-        else {
-          size_t cmdlinelen;
-          size_t itemlen;
-
-          cmdlinelen = strlen(args->cmdline);
-          itemlen = strlen(item);
-          args->cmdline =
-            (char *)mrb_realloc(mrb, args->cmdline, cmdlinelen + itemlen + 2);
-          args->cmdline[cmdlinelen] = '\n';
-          memcpy(args->cmdline + cmdlinelen + 1, item, itemlen + 1);
-        }
-      }
-      else {
-        printf("%s: No code specified for -e\n", *origargv);
-        return EXIT_SUCCESS;
-      }
-      break;
-    case 'v':
-      if (!args->verbose) mrb_show_version(mrb);
-      args->verbose = TRUE;
-      break;
-    case '-':
-      if (strcmp((*argv) + 2, "version") == 0) {
-        mrb_show_version(mrb);
-        exit(EXIT_SUCCESS);
-      }
-      else if (strcmp((*argv) + 2, "verbose") == 0) {
-        args->verbose = TRUE;
-        break;
-      }
-      else if (strcmp((*argv) + 2, "copyright") == 0) {
-        mrb_show_copyright(mrb);
-        exit(EXIT_SUCCESS);
-      }
-    default:
-      return EXIT_FAILURE;
-    }
-  }
-
-  if (args->rfp == NULL && args->cmdline == NULL) {
-    if (*argv == NULL) args->rfp = stdin;
-    else {
-      args->rfp = fopen(argv[0], args->mrbfile ? "rb" : "r");
-      if (args->rfp == NULL) {
-        printf("%s: Cannot open program file. (%s)\n", *origargv, *argv);
-        return EXIT_FAILURE;
-      }
-      args->fname = TRUE;
-      args->cmdline = argv[0];
-      argc--; argv++;
-    }
-  }
-  args->argv = (char **)mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
-  memcpy(args->argv, argv, (argc+1) * sizeof(char*));
-  args->argc = argc;
-
-  return EXIT_SUCCESS;
-}
-
-static void
-cleanup(mrb_state *mrb, struct _args *args)
-{
-  if (args->rfp && args->rfp != stdin)
-    fclose(args->rfp);
-  if (!args->fname)
-    mrb_free(mrb, args->cmdline);
-  mrb_free(mrb, args->argv);
-  mrb_close(mrb);
-}
-
-int
-main(int argc, char **argv)
-{
-  mrb_state *mrb = mrb_open();
-  int n = -1;
-  int i;
-  struct _args args;
-  mrb_value ARGV;
-  mrbc_context *c;
-  mrb_value v;
-  mrb_sym zero_sym;
-
-  if (mrb == NULL) {
-    fputs("Invalid mrb_state, exiting mruby\n", stderr);
-    return EXIT_FAILURE;
-  }
-
-  n = parse_args(mrb, argc, argv, &args);
-  if (n == EXIT_FAILURE || (args.cmdline == NULL && args.rfp == NULL)) {
-    cleanup(mrb, &args);
-    usage(argv[0]);
-    return n;
-  }
-  else {
-    int ai = mrb_gc_arena_save(mrb);
-    ARGV = mrb_ary_new_capa(mrb, args.argc);
-    for (i = 0; i < args.argc; i++) {
-      char* utf8 = mrb_utf8_from_locale(args.argv[i], -1);
-      if (utf8) {
-        mrb_ary_push(mrb, ARGV, mrb_str_new_cstr(mrb, utf8));
-        mrb_utf8_free(utf8);
-      }
-    }
-    mrb_define_global_const(mrb, "ARGV", ARGV);
-
-    c = mrbc_context_new(mrb);
-    if (args.verbose)
-      c->dump_result = TRUE;
-    if (args.check_syntax)
-      c->no_exec = TRUE;
-
-    /* Set $0 */
-    zero_sym = mrb_intern_lit(mrb, "$0");
-    if (args.rfp) {
-      const char *cmdline;
-      cmdline = args.cmdline ? args.cmdline : "-";
-      mrbc_filename(mrb, c, cmdline);
-      mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline));
-    }
-    else {
-      mrbc_filename(mrb, c, "-e");
-      mrb_gv_set(mrb, zero_sym, mrb_str_new_lit(mrb, "-e"));
-    }
-
-    /* Load program */
-    if (args.mrbfile) {
-      v = mrb_load_irep_file_cxt(mrb, args.rfp, c);
-    }
-    else if (args.rfp) {
-      v = mrb_load_file_cxt(mrb, args.rfp, c);
-    }
-    else {
-      char* utf8 = mrb_utf8_from_locale(args.cmdline, -1);
-      if (!utf8) abort();
-      v = mrb_load_string_cxt(mrb, utf8, c);
-      mrb_utf8_free(utf8);
-    }
-
-    mrb_gc_arena_restore(mrb, ai);
-    mrbc_context_free(mrb, c);
-    if (mrb->exc) {
-      if (mrb_undef_p(v)) {
-        mrb_p(mrb, mrb_obj_value(mrb->exc));
-      }
-      else {
-        mrb_print_error(mrb);
-      }
-      n = -1;
-    }
-    else if (args.check_syntax) {
-      printf("Syntax OK\n");
-    }
-  }
-  cleanup(mrb, &args);
-
-  return n == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-module MRuby
-  class Build
-    def exefile(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| exefile(n) }
-      elsif name !~ /\./
-        "#{name}#{exts.executable}"
-      else
-        name
-      end
-    end
-  end
-end
-
-MRuby.each_target do
-  next if kind_of? MRuby::CrossBuild
-
-  mruby_config = 'mruby-config' + (ENV['OS'] == 'Windows_NT' ? '.bat' : '')
-  mruby_config_path = "#{build_dir}/bin/#{mruby_config}"
-  @bins << mruby_config
-
-  file mruby_config_path => libfile("#{build_dir}/lib/libmruby") do |t|
-    FileUtils.copy "#{File.dirname(__FILE__)}/#{mruby_config}", t.name
-    config = Hash[open("#{build_dir}/lib/libmruby.flags.mak").read.split("\n").map {|x| a = x.split(/\s*=\s*/, 2); [a[0], a[1].gsub('\\"', '"') ]}]
-    IO.write(t.name, File.open(t.name) {|f|
-      f.read.gsub (/echo (MRUBY_CFLAGS|MRUBY_LIBS|MRUBY_LDFLAGS_BEFORE_LIBS|MRUBY_LDFLAGS|MRUBY_LIBMRUBY_PATH)/) {|x| config[$1].empty? ? '' : "echo #{config[$1]}"}
-    })
-    FileUtils.chmod(0755, t.name)
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-while [ $# -gt 0 ]; do
-  case $1 in
-    --cflags) echo MRUBY_CFLAGS;;
-    --ldflags) echo MRUBY_LDFLAGS;;
-    --ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;;
-    --libs) echo MRUBY_LIBS;;
-    --libmruby-path) echo MRUBY_LIBMRUBY_PATH;;
-    --help) echo "Usage: mruby-config [switches]"
-            echo "  switches:"
-            echo "  --cflags                    print flags passed to compiler"
-            echo "  --ldflags                   print flags passed to linker"
-            echo "  --ldflags-before-libs       print flags passed to linker before linked libraries"
-            echo "  --libs                      print linked libraries"
-            echo "  --libmruby-path             print libmruby path"
-            exit 0;;
-  esac
-  shift
-done
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config.bat cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config.bat
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config.bat	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-mruby-config/mruby-config.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-@echo off
-
-:top
-shift
-if "%0" equ "" goto :eof
-if "%0" equ "--cflags" goto cflags
-if "%0" equ "--ldflags" goto ldflags
-if "%0" equ "--ldflags-before-libs" goto ldflagsbeforelibs
-if "%0" equ "--libs" goto libs
-if "%0" equ "--libmruby-path" goto libmrubypath
-if "%0" equ "--help" goto showhelp
-echo Invalid Option
-goto :eof
-
-:cflags
-echo MRUBY_CFLAGS
-goto top
-
-:libs
-echo MRUBY_LIBS
-goto top
-
-:ldflags
-echo MRUBY_LDFLAGS
-goto top
-
-:ldflagsbeforelibs
-echo MRUBY_LDFLAGS_BEFORE_LIBS
-goto top
-
-:libmrubypath
-echo MRUBY_LIBMRUBY_PATH
-goto top
-
-:showhelp
-echo Usage: mruby-config [switches]
-echo   switches:
-echo   --cflags                   print flags passed to compiler
-echo   --ldflags                  print flags passed to linker
-echo   --ldflags-before-libs      print flags passed to linker before linked libraries
-echo   --libs                     print linked libraries
-echo   --libmruby-path            print libmruby path
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/bintest/mruby-strip.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-require 'tempfile'
-
-assert('no files') do
-  o = `#{cmd('mruby-strip')} 2>&1`
-  assert_equal 1, $?.exitstatus
-  assert_equal "no files to strip", o.split("\n")[0]
-end
-
-assert('file not found') do
-  o = `#{cmd('mruby-strip')} not_found.mrb 2>&1`
-  assert_equal 1, $?.exitstatus
-  assert_equal "can't open file for reading not_found.mrb\n", o
-end
-
-assert('not irep file') do
-  t = Tempfile.new('script.rb')
-  t.write 'p test\n'
-  t.flush
-  o = `#{cmd('mruby-strip')} #{t.path} 2>&1`
-  assert_equal 1, $?.exitstatus
-  assert_equal "can't read irep file #{t.path}\n", o
-end
-
-assert('success') do
-  script_file, compiled1, compiled2 =
-    Tempfile.new('script.rb'), Tempfile.new('c1.mrb'), Tempfile.new('c2.mrb')
-  script_file.write "p 'test'\n"
-  script_file.flush
-  `#{cmd('mrbc')} -g -o #{compiled1.path} #{script_file.path}`
-  `#{cmd('mrbc')} -g -o #{compiled2.path} #{script_file.path}`
-
-  o = `#{cmd('mruby-strip')} #{compiled1.path}`
-  assert_equal 0, $?.exitstatus
-  assert_equal "", o
-  assert_equal `#{cmd('mruby')} #{script_file.path}`, `#{cmd('mruby')} -b #{compiled1.path}`
-
-  o = `#{cmd('mruby-strip')} #{compiled1.path} #{compiled2.path}`
-  assert_equal 0, $?.exitstatus
-  assert_equal "", o
-end
-
-assert('check debug section') do
-  script_file, with_debug, without_debug =
-    Tempfile.new('script.rb'), Tempfile.new('c1.mrb'), Tempfile.new('c2.mrb')
-  script_file.write "p 'test'\n"
-  script_file.flush
-  `#{cmd('mrbc')} -o #{without_debug.path} #{script_file.path}`
-  `#{cmd('mrbc')} -g -o #{with_debug.path} #{script_file.path}`
-
-  assert_true with_debug.size >= without_debug.size
-
-  `#{cmd('mruby-strip')} #{with_debug.path}`
-  assert_equal without_debug.size, with_debug.size
-end
-
-assert('check lv section') do
-  script_file, with_lv, without_lv =
-    Tempfile.new('script.rb'), Tempfile.new('c1.mrb'), Tempfile.new('c2.mrb')
-  script_file.write <<EOS
-a, b = 0, 1
-a += b
-p Kernel.local_variables
-EOS
-  script_file.flush
-  `#{cmd('mrbc')} -o #{with_lv.path} #{script_file.path}`
-  `#{cmd('mrbc')} -o #{without_lv.path} #{script_file.path}`
-
-  `#{cmd('mruby-strip')} -l #{without_lv.path}`
-  assert_true without_lv.size < with_lv.size
-
-  assert_equal '[:a, :b]', `#{cmd('mruby')} -b #{with_lv.path}`.chomp
-  assert_equal '[]', `#{cmd('mruby')} -b #{without_lv.path}`.chomp
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-MRuby::Gem::Specification.new('mruby-bin-strip') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'irep dump debug section remover command'
-  spec.bins = %w(mruby-strip)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-#include <mruby/dump.h>
-
-struct strip_args {
-  int argc_start;
-  int argc;
-  char **argv;
-  mrb_bool lvar;
-};
-
-
-static void
-irep_remove_lv(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t i;
-
-  if (irep->lv) {
-    mrb_free(mrb, irep->lv);
-    irep->lv = NULL;
-  }
-
-  for (i = 0; i < irep->rlen; ++i) {
-    irep_remove_lv(mrb, irep->reps[i]);
-  }
-}
-
-static void
-print_usage(const char *f)
-{
-  printf("Usage: %s [switches] irepfiles\n", f);
-  printf("switches:\n");
-  printf("  -l, --lvar   remove LVAR section too.\n");
-}
-
-static int
-parse_args(int argc, char **argv, struct strip_args *args)
-{
-  int i;
-
-  args->argc_start = 0;
-  args->argc = argc;
-  args->argv = argv;
-  args->lvar = FALSE;
-
-  for (i = 1; i < argc; ++i) {
-    const size_t len = strlen(argv[i]);
-    if (len >= 2 && argv[i][0] == '-') {
-      switch (argv[i][1]) {
-      case 'l':
-        args->lvar = TRUE;
-        break;
-      case '-':
-        if (strncmp((*argv) + 2, "lvar", len) == 0) {
-          args->lvar = TRUE;
-          break;
-        }
-      default:
-        return -1;
-      }
-    }
-    else {
-      break;
-    }
-  }
-
-  args->argc_start = i;
-  return i;
-}
-
-static int
-strip(mrb_state *mrb, struct strip_args *args)
-{
-  int i;
-
-  for (i = args->argc_start; i < args->argc; ++i) {
-    char *filename;
-    FILE *rfile;
-    mrb_irep *irep;
-    FILE *wfile;
-    int dump_result;
-
-    filename = args->argv[i];
-    rfile = fopen(filename, "rb");
-    if (rfile == NULL) {
-      fprintf(stderr, "can't open file for reading %s\n", filename);
-      return EXIT_FAILURE;
-    }
-
-    irep = mrb_read_irep_file(mrb, rfile);
-    fclose(rfile);
-    if (irep == NULL) {
-      fprintf(stderr, "can't read irep file %s\n", filename);
-      return EXIT_FAILURE;
-    }
-
-    /* clear lv if --lvar is enabled */
-    if (args->lvar) {
-      irep_remove_lv(mrb, irep);
-    }
-
-    wfile = fopen(filename, "wb");
-    if (wfile == NULL) {
-      fprintf(stderr, "can't open file for writing %s\n", filename);
-      mrb_irep_decref(mrb, irep);
-      return EXIT_FAILURE;
-    }
-
-    /* debug flag must always be false */
-    dump_result = mrb_dump_irep_binary(mrb, irep, FALSE, wfile);
-
-    fclose(wfile);
-    mrb_irep_decref(mrb, irep);
-
-    if (dump_result != MRB_DUMP_OK) {
-      fprintf(stderr, "error occurred during dumping %s\n", filename);
-      return EXIT_FAILURE;
-    }
-  }
-  return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char **argv)
-{
-  struct strip_args args;
-  int args_result;
-  mrb_state *mrb;
-  int ret;
-
-  if (argc <= 1) {
-    printf("no files to strip\n");
-    print_usage(argv[0]);
-    return EXIT_FAILURE;
-  }
-
-  args_result = parse_args(argc, argv, &args);
-  if (args_result < 0) {
-    print_usage(argv[0]);
-    return EXIT_FAILURE;
-  }
-  mrb = mrb_open_core(mrb_default_allocf, NULL);
-  if (mrb == NULL) {
-    fputs("Invalid mrb_state, exiting mruby-strip\n", stderr);
-    return EXIT_FAILURE;
-  }
-
-  ret = strip(mrb, &args);
-
-  mrb_close(mrb);
-  return ret;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-class-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'class/module extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/src/class.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/src/class.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/src/class.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/src/class.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include "mruby.h"
-#include "mruby/class.h"
-#include "mruby/string.h"
-
-static mrb_value
-mrb_mod_name(mrb_state *mrb, mrb_value self)
-{
-  mrb_value name = mrb_class_path(mrb, mrb_class_ptr(self));
-  return mrb_nil_p(name)? name : mrb_str_dup(mrb, name);
-}
-
-static mrb_value
-mrb_mod_singleton_class_p(mrb_state *mrb, mrb_value self)
-{
-  return mrb_bool_value(mrb_type(self) == MRB_TT_SCLASS);
-}
-
-void
-mrb_mruby_class_ext_gem_init(mrb_state *mrb)
-{
-  struct RClass *mod = mrb->module_class;
-
-  mrb_define_method(mrb, mod, "name", mrb_mod_name, MRB_ARGS_NONE());
-  mrb_define_method(mrb, mod, "singleton_class?", mrb_mod_singleton_class_p, MRB_ARGS_NONE());
-}
-
-void
-mrb_mruby_class_ext_gem_final(mrb_state *mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/test/module.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/test/module.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/test/module.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-class-ext/test/module.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-assert 'Module#name' do
-  module Outer
-    class Inner; end
-    const_set :SetInner, Class.new
-  end
-
-  assert_equal 'Outer', Outer.name
-  assert_equal 'Outer::Inner', Outer::Inner.name
-  assert_equal 'Outer::SetInner', Outer::SetInner.name
-
-  outer = Module.new do
-    const_set :SetInner, Class.new
-  end
-  Object.const_set :SetOuter, outer
-
-  assert_equal 'SetOuter', SetOuter.name
-  assert_equal 'SetOuter::SetInner', SetOuter::SetInner.name
-
-  mod = Module.new
-  cls = Class.new
-
-  assert_nil mod.name
-  assert_nil cls.name
-end
-
-assert 'Module#singleton_class?' do
-  mod = Module.new
-  cls = Class.new
-  scl = cls.singleton_class
-
-  assert_false mod.singleton_class?
-  assert_false cls.singleton_class?
-  assert_true scl.singleton_class?
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/bintest/mrbc.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/bintest/mrbc.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/bintest/mrbc.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/bintest/mrbc.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-require 'tempfile'
-
-assert('Compiling multiple files without new line in last line. #2361') do
-  a, b, out = Tempfile.new('a.rb'), Tempfile.new('b.rb'), Tempfile.new('out.mrb')
-  a.write('module A; end')
-  a.flush
-  b.write('module B; end')
-  b.flush
-  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} #{b.path} 2>&1`
-  assert_equal "#{cmd('mrbc')}:#{a.path}:Syntax OK", result.chomp
-  assert_equal 0, $?.exitstatus
-end
-
-assert('parsing function with void argument') do
-  a, out = Tempfile.new('a.rb'), Tempfile.new('out.mrb')
-  a.write('f ()')
-  a.flush
-  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
-  assert_equal "#{cmd('mrbc')}:#{a.path}:Syntax OK", result.chomp
-  assert_equal 0, $?.exitstatus
-end
-
-assert('embedded document with invalid terminator') do
-  a, out = Tempfile.new('a.rb'), Tempfile.new('out.mrb')
-  a.write("=begin\n=endx\n")
-  a.flush
-  result = `#{cmd('mrbc')} -c -o #{out.path} #{a.path} 2>&1`
-  assert_equal "#{a.path}:3:0: embedded document meets end of file", result.chomp
-  assert_equal 1, $?.exitstatus
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/codegen.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/codegen.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/codegen.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/codegen.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3024 +0,0 @@
-/*
-** codegen.c - mruby code generator
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/compile.h>
-#include <mruby/proc.h>
-#include <mruby/numeric.h>
-#include <mruby/string.h>
-#include <mruby/debug.h>
-#include "node.h"
-#include <mruby/opcode.h>
-#include <mruby/re.h>
-#include <mruby/throw.h>
-
-#ifndef MRB_CODEGEN_LEVEL_MAX
-#define MRB_CODEGEN_LEVEL_MAX 1024
-#endif
-
-typedef mrb_ast_node node;
-typedef struct mrb_parser_state parser_state;
-
-enum looptype {
-  LOOP_NORMAL,
-  LOOP_BLOCK,
-  LOOP_FOR,
-  LOOP_BEGIN,
-  LOOP_RESCUE,
-};
-
-struct loopinfo {
-  enum looptype type;
-  int pc1, pc2, pc3, acc;
-  int ensure_level;
-  struct loopinfo *prev;
-};
-
-typedef struct scope {
-  mrb_state *mrb;
-  mrb_pool *mpool;
-  struct mrb_jmpbuf jmp;
-
-  struct scope *prev;
-
-  node *lv;
-
-  int sp;
-  int pc;
-  int lastlabel;
-  int ainfo:15;
-  mrb_bool mscope:1;
-
-  struct loopinfo *loop;
-  int ensure_level;
-  char const *filename;
-  uint16_t lineno;
-
-  mrb_code *iseq;
-  uint16_t *lines;
-  int icapa;
-
-  mrb_irep *irep;
-  size_t pcapa;
-  size_t scapa;
-  size_t rcapa;
-
-  uint16_t nlocals;
-  uint16_t nregs;
-  int ai;
-
-  int debug_start_pos;
-  uint16_t filename_index;
-  parser_state* parser;
-
-  int rlev;                     /* recursion levels */
-} codegen_scope;
-
-static codegen_scope* scope_new(mrb_state *mrb, codegen_scope *prev, node *lv);
-static void scope_finish(codegen_scope *s);
-static struct loopinfo *loop_push(codegen_scope *s, enum looptype t);
-static void loop_break(codegen_scope *s, node *tree);
-static void loop_pop(codegen_scope *s, int val);
-
-static void gen_assignment(codegen_scope *s, node *tree, int sp, int val);
-static void gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val);
-
-static void codegen(codegen_scope *s, node *tree, int val);
-static void raise_error(codegen_scope *s, const char *msg);
-
-static void
-codegen_error(codegen_scope *s, const char *message)
-{
-  if (!s) return;
-  while (s->prev) {
-    codegen_scope *tmp = s->prev;
-    mrb_free(s->mrb, s->iseq);
-    mrb_pool_close(s->mpool);
-    s = tmp;
-  }
-#ifndef MRB_DISABLE_STDIO
-  if (s->filename && s->lineno) {
-    fprintf(stderr, "codegen error:%s:%d: %s\n", s->filename, s->lineno, message);
-  }
-  else {
-    fprintf(stderr, "codegen error: %s\n", message);
-  }
-#endif
-  MRB_THROW(&s->jmp);
-}
-
-static void*
-codegen_palloc(codegen_scope *s, size_t len)
-{
-  void *p = mrb_pool_alloc(s->mpool, len);
-
-  if (!p) codegen_error(s, "pool memory allocation");
-  return p;
-}
-
-static void*
-codegen_malloc(codegen_scope *s, size_t len)
-{
-  void *p = mrb_malloc_simple(s->mrb, len);
-
-  if (!p) codegen_error(s, "mrb_malloc");
-  return p;
-}
-
-static void*
-codegen_realloc(codegen_scope *s, void *p, size_t len)
-{
-  p = mrb_realloc_simple(s->mrb, p, len);
-
-  if (!p && len > 0) codegen_error(s, "mrb_realloc");
-  return p;
-}
-
-static int
-new_label(codegen_scope *s)
-{
-  s->lastlabel = s->pc;
-  return s->pc;
-}
-
-static inline int
-genop(codegen_scope *s, mrb_code i)
-{
-  if (s->pc == s->icapa) {
-    s->icapa *= 2;
-    s->iseq = (mrb_code *)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->icapa);
-    if (s->lines) {
-      s->lines = (uint16_t*)codegen_realloc(s, s->lines, sizeof(short)*s->icapa);
-      s->irep->lines = s->lines;
-    }
-  }
-  s->iseq[s->pc] = i;
-  if (s->lines) {
-    s->lines[s->pc] = s->lineno;
-  }
-  return s->pc++;
-}
-
-#define NOVAL  0
-#define VAL    1
-
-static mrb_bool
-no_optimize(codegen_scope *s)
-{
-  if (s && s->parser && s->parser->no_optimize)
-    return TRUE;
-  return FALSE;
-}
-
-static int
-genop_peep(codegen_scope *s, mrb_code i, int val)
-{
-  /* peephole optimization */
-  if (!no_optimize(s) && s->lastlabel != s->pc && s->pc > 0) {
-    mrb_code i0 = s->iseq[s->pc-1];
-    int c1 = GET_OPCODE(i);
-    int c0 = GET_OPCODE(i0);
-
-    switch (c1) {
-    case OP_MOVE:
-      if (GETARG_A(i) == GETARG_B(i)) {
-        /* skip useless OP_MOVE */
-        return 0;
-      }
-      if (val) break;
-      switch (c0) {
-      case OP_MOVE:
-        if (GETARG_A(i) == GETARG_A(i0)) {
-          /* skip overriden OP_MOVE */
-          s->pc--;
-          s->iseq[s->pc] = i;
-        }
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i) == GETARG_B(i0)) {
-          /* skip swapping OP_MOVE */
-          return 0;
-        }
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i0) >= s->nlocals) {
-          s->pc--;
-          return genop_peep(s, MKOP_AB(OP_MOVE, GETARG_A(i), GETARG_B(i0)), val);
-        }
-        break;
-      case OP_LOADI:
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i0) >= s->nlocals) {
-          s->iseq[s->pc-1] = MKOP_AsBx(OP_LOADI, GETARG_A(i), GETARG_sBx(i0));
-          return 0;
-        }
-        break;
-      case OP_ARRAY:
-      case OP_HASH:
-      case OP_RANGE:
-      case OP_AREF:
-      case OP_GETUPVAR:
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i0) >= s->nlocals) {
-          s->iseq[s->pc-1] = MKOP_ABC(c0, GETARG_A(i), GETARG_B(i0), GETARG_C(i0));
-          return 0;
-        }
-        break;
-      case OP_LOADSYM:
-      case OP_GETGLOBAL:
-      case OP_GETIV:
-      case OP_GETCV:
-      case OP_GETCONST:
-      case OP_GETSPECIAL:
-      case OP_LOADL:
-      case OP_STRING:
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i0) >= s->nlocals) {
-          s->iseq[s->pc-1] = MKOP_ABx(c0, GETARG_A(i), GETARG_Bx(i0));
-          return 0;
-        }
-        break;
-      case OP_SCLASS:
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i0) >= s->nlocals) {
-          s->iseq[s->pc-1] = MKOP_AB(c0, GETARG_A(i), GETARG_B(i0));
-          return 0;
-        }
-        break;
-      case OP_LOADNIL:
-      case OP_LOADSELF:
-      case OP_LOADT:
-      case OP_LOADF:
-      case OP_OCLASS:
-        if (GETARG_B(i) == GETARG_A(i0) && GETARG_A(i0) >= s->nlocals) {
-          s->iseq[s->pc-1] = MKOP_A(c0, GETARG_A(i));
-          return 0;
-        }
-        break;
-      default:
-        break;
-      }
-      break;
-    case OP_SETIV:
-    case OP_SETCV:
-    case OP_SETCONST:
-    case OP_SETMCNST:
-    case OP_SETGLOBAL:
-      if (val) break;
-      if (c0 == OP_MOVE) {
-        if (GETARG_A(i) == GETARG_A(i0)) {
-          s->iseq[s->pc-1] = MKOP_ABx(c1, GETARG_B(i0), GETARG_Bx(i));
-          return 0;
-        }
-      }
-      break;
-    case OP_SETUPVAR:
-      if (val) break;
-      if (c0 == OP_MOVE) {
-        if (GETARG_A(i) == GETARG_A(i0)) {
-          s->iseq[s->pc-1] = MKOP_ABC(c1, GETARG_B(i0), GETARG_B(i), GETARG_C(i));
-          return 0;
-        }
-      }
-      break;
-    case OP_EPOP:
-      if (c0 == OP_EPOP) {
-        s->iseq[s->pc-1] = MKOP_A(OP_EPOP, GETARG_A(i0)+GETARG_A(i));
-        return 0;
-      }
-      break;
-    case OP_POPERR:
-      if (c0 == OP_POPERR) {
-        s->iseq[s->pc-1] = MKOP_A(OP_POPERR, GETARG_A(i0)+GETARG_A(i));
-        return 0;
-      }
-      break;
-    case OP_RETURN:
-      switch (c0) {
-      case OP_RETURN:
-        return 0;
-      case OP_MOVE:
-        if (GETARG_A(i0) >= s->nlocals) {
-          s->iseq[s->pc-1] = MKOP_AB(OP_RETURN, GETARG_B(i0), OP_R_NORMAL);
-          return 0;
-        }
-        break;
-      case OP_SETIV:
-      case OP_SETCV:
-      case OP_SETCONST:
-      case OP_SETMCNST:
-      case OP_SETUPVAR:
-      case OP_SETGLOBAL:
-        s->pc--;
-        genop_peep(s, i0, NOVAL);
-        i0 = s->iseq[s->pc-1];
-        return genop(s, MKOP_AB(OP_RETURN, GETARG_A(i0), OP_R_NORMAL));
-#if 0
-      case OP_SEND:
-        if (GETARG_B(i) == OP_R_NORMAL && GETARG_A(i) == GETARG_A(i0)) {
-          s->iseq[s->pc-1] = MKOP_ABC(OP_TAILCALL, GETARG_A(i0), GETARG_B(i0), GETARG_C(i0));
-          return;
-        }
-        break;
-#endif
-      default:
-        break;
-      }
-      break;
-    case OP_ADD:
-    case OP_SUB:
-      if (c0 == OP_LOADI) {
-        int c = GETARG_sBx(i0);
-
-        if (c1 == OP_SUB) c = -c;
-        if (c > 127 || c < -127) break;
-        if (0 <= c)
-          s->iseq[s->pc-1] = MKOP_ABC(OP_ADDI, GETARG_A(i), GETARG_B(i), c);
-        else
-          s->iseq[s->pc-1] = MKOP_ABC(OP_SUBI, GETARG_A(i), GETARG_B(i), -c);
-        return 0;
-      }
-    case OP_STRCAT:
-      if (c0 == OP_STRING) {
-        mrb_value v = s->irep->pool[GETARG_Bx(i0)];
-
-        if (mrb_string_p(v) && RSTRING_LEN(v) == 0) {
-          s->pc--;
-          return 0;
-        }
-      }
-      if (c0 == OP_LOADNIL) {
-        if (GETARG_B(i) == GETARG_A(i0)) {
-          s->pc--;
-          return 0;
-        }
-      }
-      break;
-    case OP_JMPIF:
-    case OP_JMPNOT:
-      if (c0 == OP_MOVE && GETARG_A(i) == GETARG_A(i0)) {
-        s->iseq[s->pc-1] = MKOP_AsBx(c1, GETARG_B(i0), GETARG_sBx(i));
-        return s->pc-1;
-      }
-      break;
-    default:
-      break;
-    }
-  }
-  return genop(s, i);
-}
-
-static void
-scope_error(codegen_scope *s)
-{
-  exit(EXIT_FAILURE);
-}
-
-static inline void
-dispatch(codegen_scope *s, int pc)
-{
-  int diff = s->pc - pc;
-  mrb_code i = s->iseq[pc];
-  int c = GET_OPCODE(i);
-
-  s->lastlabel = s->pc;
-  switch (c) {
-  case OP_JMP:
-  case OP_JMPIF:
-  case OP_JMPNOT:
-  case OP_ONERR:
-    break;
-  default:
-#ifndef MRB_DISABLE_STDIO
-    fprintf(stderr, "bug: dispatch on non JMP op\n");
-#endif
-    scope_error(s);
-    break;
-  }
-  if (diff > MAXARG_sBx) {
-    codegen_error(s, "too distant jump address");
-  }
-  s->iseq[pc] = MKOP_AsBx(c, GETARG_A(i), diff);
-}
-
-static void
-dispatch_linked(codegen_scope *s, int pc)
-{
-  mrb_code i;
-  int pos;
-
-  if (!pc) return;
-  for (;;) {
-    i = s->iseq[pc];
-    pos = GETARG_sBx(i);
-    dispatch(s, pc);
-    if (!pos) break;
-    pc = pos;
-  }
-}
-
-#define nregs_update do {if (s->sp > s->nregs) s->nregs = s->sp;} while (0)
-static void
-push_(codegen_scope *s)
-{
-  if (s->sp > 511) {
-    codegen_error(s, "too complex expression");
-  }
-  s->sp++;
-  nregs_update;
-}
-
-static void
-push_n_(codegen_scope *s, size_t n)
-{
-  if (s->sp+n > 511) {
-    codegen_error(s, "too complex expression");
-  }
-  s->sp+=n;
-  nregs_update;
-}
-
-#define push() push_(s)
-#define push_n(n) push_n_(s,n)
-#define pop_(s) ((s)->sp--)
-#define pop() pop_(s)
-#define pop_n(n) (s->sp-=(n))
-#define cursp() (s->sp)
-
-static inline int
-new_lit(codegen_scope *s, mrb_value val)
-{
-  size_t i;
-  mrb_value *pv;
-
-  switch (mrb_type(val)) {
-  case MRB_TT_STRING:
-    for (i=0; i<s->irep->plen; i++) {
-      mrb_int len;
-      pv = &s->irep->pool[i];
-
-      if (mrb_type(*pv) != MRB_TT_STRING) continue;
-      if ((len = RSTRING_LEN(*pv)) != RSTRING_LEN(val)) continue;
-      if (memcmp(RSTRING_PTR(*pv), RSTRING_PTR(val), len) == 0)
-        return i;
-    }
-    break;
-  case MRB_TT_FLOAT:
-    for (i=0; i<s->irep->plen; i++) {
-      pv = &s->irep->pool[i];
-      if (mrb_type(*pv) != MRB_TT_FLOAT) continue;
-      if (mrb_float(*pv) == mrb_float(val)) return i;
-    }
-    break;
-  case MRB_TT_FIXNUM:
-    for (i=0; i<s->irep->plen; i++) {
-      pv = &s->irep->pool[i];
-      if (!mrb_fixnum_p(*pv)) continue;
-      if (mrb_fixnum(*pv) == mrb_fixnum(val)) return i;
-    }
-    break;
-  default:
-    /* should not happen */
-    return 0;
-  }
-
-  if (s->irep->plen == s->pcapa) {
-    s->pcapa *= 2;
-    s->irep->pool = (mrb_value *)codegen_realloc(s, s->irep->pool, sizeof(mrb_value)*s->pcapa);
-  }
-
-  pv = &s->irep->pool[s->irep->plen];
-  i = s->irep->plen++;
-
-  switch (mrb_type(val)) {
-  case MRB_TT_STRING:
-    *pv = mrb_str_pool(s->mrb, val);
-    break;
-
-  case MRB_TT_FLOAT:
-#ifdef MRB_WORD_BOXING
-    *pv = mrb_float_pool(s->mrb, mrb_float(val));
-    break;
-#endif
-  case MRB_TT_FIXNUM:
-    *pv = val;
-    break;
-
-  default:
-    /* should not happen */
-    break;
-  }
-  return i;
-}
-
-/* method symbols should be fit in 9 bits */
-#define MAXMSYMLEN 512
-/* maximum symbol numbers */
-#define MAXSYMLEN 65536
-
-static int
-new_msym(codegen_scope *s, mrb_sym sym)
-{
-  size_t i, len;
-
-  mrb_assert(s->irep);
-
-  len = s->irep->slen;
-  if (len > MAXMSYMLEN) len = MAXMSYMLEN;
-  for (i=0; i<len; i++) {
-    if (s->irep->syms[i] == sym) return i;
-    if (s->irep->syms[i] == 0) break;
-  }
-  if (i == MAXMSYMLEN) {
-    codegen_error(s, "too many symbols (max " MRB_STRINGIZE(MAXMSYMLEN) ")");
-  }
-  s->irep->syms[i] = sym;
-  if (i == s->irep->slen) s->irep->slen++;
-  return i;
-}
-
-static int
-new_sym(codegen_scope *s, mrb_sym sym)
-{
-  size_t i;
-
-  for (i=0; i<s->irep->slen; i++) {
-    if (s->irep->syms[i] == sym) return i;
-  }
-  if (s->irep->slen == MAXSYMLEN) {
-    codegen_error(s, "too many symbols (max " MRB_STRINGIZE(MAXSYMLEN) ")");
-  }
-
-  if (s->irep->slen > MAXMSYMLEN/2 && s->scapa == MAXMSYMLEN) {
-    s->scapa = MAXSYMLEN;
-    s->irep->syms = (mrb_sym *)codegen_realloc(s, s->irep->syms, sizeof(mrb_sym)*MAXSYMLEN);
-    for (i = s->irep->slen; i < MAXMSYMLEN; i++) {
-      static const mrb_sym mrb_sym_zero = { 0 };
-      s->irep->syms[i] = mrb_sym_zero;
-    }
-    s->irep->slen = MAXMSYMLEN;
-  }
-  s->irep->syms[s->irep->slen] = sym;
-  return s->irep->slen++;
-}
-
-static int
-node_len(node *tree)
-{
-  int n = 0;
-
-  while (tree) {
-    n++;
-    tree = tree->cdr;
-  }
-  return n;
-}
-
-#define sym(x) ((mrb_sym)(intptr_t)(x))
-#define lv_name(lv) sym((lv)->car)
-static int
-lv_idx(codegen_scope *s, mrb_sym id)
-{
-  node *lv = s->lv;
-  int n = 1;
-
-  while (lv) {
-    if (lv_name(lv) == id) return n;
-    n++;
-    lv = lv->cdr;
-  }
-  return 0;
-}
-
-static void
-for_body(codegen_scope *s, node *tree)
-{
-  codegen_scope *prev = s;
-  int idx;
-  struct loopinfo *lp;
-  node *n2;
-  mrb_code c;
-
-  /* generate receiver */
-  codegen(s, tree->cdr->car, VAL);
-  /* generate loop-block */
-  s = scope_new(s->mrb, s, NULL);
-  if (s == NULL) {
-    raise_error(prev, "unexpected scope");
-  }
-
-  push();                       /* push for a block parameter */
-
-  /* generate loop variable */
-  n2 = tree->car;
-  genop(s, MKOP_Ax(OP_ENTER, 0x40000));
-  if (n2->car && !n2->car->cdr && !n2->cdr) {
-    gen_assignment(s, n2->car->car, 1, NOVAL);
-  }
-  else {
-    gen_vmassignment(s, n2, 1, VAL);
-  }
-  /* construct loop */
-  lp = loop_push(s, LOOP_FOR);
-  lp->pc2 = new_label(s);
-
-  /* loop body */
-  codegen(s, tree->cdr->cdr->car, VAL);
-  pop();
-  if (s->pc > 0) {
-    c = s->iseq[s->pc-1];
-    if (GET_OPCODE(c) != OP_RETURN || GETARG_B(c) != OP_R_NORMAL || s->pc == s->lastlabel)
-      genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL);
-  }
-  loop_pop(s, NOVAL);
-  scope_finish(s);
-  s = prev;
-  genop(s, MKOP_Abc(OP_LAMBDA, cursp(), s->irep->rlen-1, OP_L_BLOCK));
-  pop();
-  idx = new_msym(s, mrb_intern_lit(s->mrb, "each"));
-  genop(s, MKOP_ABC(OP_SENDB, cursp(), idx, 0));
-}
-
-static int
-lambda_body(codegen_scope *s, node *tree, int blk)
-{
-  mrb_code c;
-  codegen_scope *parent = s;
-  s = scope_new(s->mrb, s, tree->car);
-  if (s == NULL) {
-    raise_error(parent, "unexpected scope");
-  }
-
-  s->mscope = !blk;
-
-  if (blk) {
-    struct loopinfo *lp = loop_push(s, LOOP_BLOCK);
-    lp->pc1 = new_label(s);
-  }
-  tree = tree->cdr;
-  if (tree->car) {
-    mrb_aspec a;
-    int ma, oa, ra, pa, ka, kd, ba;
-    int pos, i;
-    node *n, *opt;
-
-    ma = node_len(tree->car->car);
-    n = tree->car->car;
-    while (n) {
-      n = n->cdr;
-    }
-    oa = node_len(tree->car->cdr->car);
-    ra = tree->car->cdr->cdr->car ? 1 : 0;
-    pa = node_len(tree->car->cdr->cdr->cdr->car);
-    ka = kd = 0;
-    ba = tree->car->cdr->cdr->cdr->cdr ? 1 : 0;
-
-    if (ma > 0x1f || oa > 0x1f || pa > 0x1f || ka > 0x1f) {
-      codegen_error(s, "too many formal arguments");
-    }
-    a = ((mrb_aspec)(ma & 0x1f) << 18)
-      | ((mrb_aspec)(oa & 0x1f) << 13)
-      | ((ra & 1) << 12)
-      | ((pa & 0x1f) << 7)
-      | ((ka & 0x1f) << 2)
-      | ((kd & 1)<< 1)
-      | (ba & 1);
-    s->ainfo = (((ma+oa) & 0x3f) << 6) /* (12bits = 6:1:5) */
-      | ((ra & 1) << 5)
-      | (pa & 0x1f);
-    genop(s, MKOP_Ax(OP_ENTER, a));
-    pos = new_label(s);
-    for (i=0; i<oa; i++) {
-      new_label(s);
-      genop(s, MKOP_sBx(OP_JMP, 0));
-    }
-    if (oa > 0) {
-      genop(s, MKOP_sBx(OP_JMP, 0));
-    }
-    opt = tree->car->cdr->car;
-    i = 0;
-    while (opt) {
-      int idx;
-
-      dispatch(s, pos+i);
-      codegen(s, opt->car->cdr, VAL);
-      idx = lv_idx(s, (mrb_sym)(intptr_t)opt->car->car);
-      pop();
-      genop_peep(s, MKOP_AB(OP_MOVE, idx, cursp()), NOVAL);
-      i++;
-      opt = opt->cdr;
-    }
-    if (oa > 0) {
-      dispatch(s, pos+i);
-    }
-  }
-  codegen(s, tree->cdr->car, VAL);
-  pop();
-  if (s->pc > 0) {
-    c = s->iseq[s->pc-1];
-    if (GET_OPCODE(c) != OP_RETURN || GETARG_B(c) != OP_R_NORMAL || s->pc == s->lastlabel) {
-      if (s->nregs == 0) {
-        genop(s, MKOP_A(OP_LOADNIL, 0));
-        genop(s, MKOP_AB(OP_RETURN, 0, OP_R_NORMAL));
-      }
-      else {
-        genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL);
-      }
-    }
-  }
-  if (blk) {
-    loop_pop(s, NOVAL);
-  }
-  scope_finish(s);
-  return parent->irep->rlen - 1;
-}
-
-static int
-scope_body(codegen_scope *s, node *tree, int val)
-{
-  codegen_scope *scope = scope_new(s->mrb, s, tree->car);
-  if (scope == NULL) {
-    raise_error(s, "unexpected scope");
-  }
-
-  codegen(scope, tree->cdr, VAL);
-  if (!s->iseq) {
-    genop(scope, MKOP_A(OP_STOP, 0));
-  }
-  else if (!val) {
-    genop(scope, MKOP_AB(OP_RETURN, 0, OP_R_NORMAL));
-  }
-  else {
-    if (scope->nregs == 0) {
-      genop(scope, MKOP_A(OP_LOADNIL, 0));
-      genop(scope, MKOP_AB(OP_RETURN, 0, OP_R_NORMAL));
-    }
-    else {
-      genop_peep(scope, MKOP_AB(OP_RETURN, scope->sp-1, OP_R_NORMAL), NOVAL);
-    }
-  }
-  scope_finish(scope);
-  if (!s->irep) {
-    /* should not happen */
-    return 0;
-  }
-  return s->irep->rlen - 1;
-}
-
-static mrb_bool
-nosplat(node *t)
-{
-  while (t) {
-    if ((intptr_t)t->car->car == NODE_SPLAT) return FALSE;
-    t = t->cdr;
-  }
-  return TRUE;
-}
-
-static mrb_sym
-attrsym(codegen_scope *s, mrb_sym a)
-{
-  const char *name;
-  mrb_int len;
-  char *name2;
-
-  name = mrb_sym2name_len(s->mrb, a, &len);
-  name2 = (char *)codegen_palloc(s,
-                                 (size_t)len
-                                 + 1 /* '=' */
-                                 + 1 /* '\0' */
-                                 );
-  mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-  memcpy(name2, name, (size_t)len);
-  name2[len] = '=';
-  name2[len+1] = '\0';
-
-  return mrb_intern(s->mrb, name2, len+1);
-}
-
-#define CALL_MAXARGS 127
-
-static int
-gen_values(codegen_scope *s, node *t, int val, int extra)
-{
-  int n = 0;
-  int is_splat;
-
-  while (t) {
-    is_splat = (intptr_t)t->car->car == NODE_SPLAT; /* splat mode */
-    if (
-      n+extra >= CALL_MAXARGS - 1 /* need to subtract one because vm.c expects an array if n == CALL_MAXARGS */
-      || is_splat) {
-      if (val) {
-        if (is_splat && n == 0 && (intptr_t)t->car->cdr->car == NODE_ARRAY) {
-          codegen(s, t->car->cdr, VAL);
-          pop();
-        }
-        else {
-          pop_n(n);
-          genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), n));
-          push();
-          codegen(s, t->car, VAL);
-          pop(); pop();
-          if (is_splat) {
-            genop(s, MKOP_AB(OP_ARYCAT, cursp(), cursp()+1));
-          }
-          else {
-            genop(s, MKOP_AB(OP_ARYPUSH, cursp(), cursp()+1));
-          }
-        }
-        t = t->cdr;
-        while (t) {
-          push();
-          codegen(s, t->car, VAL);
-          pop(); pop();
-          if ((intptr_t)t->car->car == NODE_SPLAT) {
-            genop(s, MKOP_AB(OP_ARYCAT, cursp(), cursp()+1));
-          }
-          else {
-            genop(s, MKOP_AB(OP_ARYPUSH, cursp(), cursp()+1));
-          }
-          t = t->cdr;
-        }
-      }
-      else {
-        while (t) {
-          codegen(s, t->car, NOVAL);
-          t = t->cdr;
-        }
-      }
-      return -1;
-    }
-    /* normal (no splat) mode */
-    codegen(s, t->car, val);
-    n++;
-    t = t->cdr;
-  }
-  return n;
-}
-
-static void
-gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
-{
-  mrb_sym sym = name ? name : sym(tree->cdr->car);
-  int idx, skip = 0;
-  int n = 0, noop = 0, sendv = 0, blk = 0;
-
-  codegen(s, tree->car, VAL); /* receiver */
-  if (safe) {
-    int recv = cursp()-1;
-    genop(s, MKOP_A(OP_LOADNIL, cursp()));
-    push();
-    genop(s, MKOP_AB(OP_MOVE, cursp(), recv));
-    push(); pop();              /* space for a block */
-    pop();
-    idx = new_msym(s, mrb_intern_lit(s->mrb, "=="));
-    genop(s, MKOP_ABC(OP_EQ, cursp(), idx, 1));
-    skip = genop(s, MKOP_AsBx(OP_JMPIF, cursp(), 0));
-  }
-  idx = new_msym(s, sym);
-  tree = tree->cdr->cdr->car;
-  if (tree) {
-    n = gen_values(s, tree->car, VAL, sp?1:0);
-    if (n < 0) {
-      n = noop = sendv = 1;
-      push();
-    }
-  }
-  if (sp) {
-    if (sendv) {
-      pop();
-      genop(s, MKOP_AB(OP_ARYPUSH, cursp(), sp));
-      push();
-    }
-    else {
-      genop(s, MKOP_AB(OP_MOVE, cursp(), sp));
-      push();
-      n++;
-    }
-  }
-  if (tree && tree->cdr) {
-    noop = 1;
-    codegen(s, tree->cdr, VAL);
-    pop();
-  }
-  else {
-    blk = cursp();
-  }
-  push();pop();
-  pop_n(n+1);
-  {
-    mrb_int symlen;
-    const char *symname = mrb_sym2name_len(s->mrb, sym, &symlen);
-
-    if (!noop && symlen == 1 && symname[0] == '+' && n == 1)  {
-      genop_peep(s, MKOP_ABC(OP_ADD, cursp(), idx, n), val);
-    }
-    else if (!noop && symlen == 1 && symname[0] == '-' && n == 1)  {
-      genop_peep(s, MKOP_ABC(OP_SUB, cursp(), idx, n), val);
-    }
-    else if (!noop && symlen == 1 && symname[0] == '*' && n == 1)  {
-      genop(s, MKOP_ABC(OP_MUL, cursp(), idx, n));
-    }
-    else if (!noop && symlen == 1 && symname[0] == '/' && n == 1)  {
-      genop(s, MKOP_ABC(OP_DIV, cursp(), idx, n));
-    }
-    else if (!noop && symlen == 1 && symname[0] == '<' && n == 1)  {
-      genop(s, MKOP_ABC(OP_LT, cursp(), idx, n));
-    }
-    else if (!noop && symlen == 2 && symname[0] == '<' && symname[1] == '=' && n == 1)  {
-      genop(s, MKOP_ABC(OP_LE, cursp(), idx, n));
-    }
-    else if (!noop && symlen == 1 && symname[0] == '>' && n == 1)  {
-      genop(s, MKOP_ABC(OP_GT, cursp(), idx, n));
-    }
-    else if (!noop && symlen == 2 && symname[0] == '>' && symname[1] == '=' && n == 1)  {
-      genop(s, MKOP_ABC(OP_GE, cursp(), idx, n));
-    }
-    else if (!noop && symlen == 2 && symname[0] == '=' && symname[1] == '=' && n == 1)  {
-      genop(s, MKOP_ABC(OP_EQ, cursp(), idx, n));
-    }
-    else {
-      if (sendv) n = CALL_MAXARGS;
-      if (blk > 0) {                   /* no block */
-        genop(s, MKOP_ABC(OP_SEND, cursp(), idx, n));
-      }
-      else {
-        genop(s, MKOP_ABC(OP_SENDB, cursp(), idx, n));
-      }
-    }
-  }
-  if (safe) {
-    dispatch(s, skip);
-  }
-  if (val) {
-    push();
-  }
-}
-
-static void
-gen_assignment(codegen_scope *s, node *tree, int sp, int val)
-{
-  int idx;
-  int type = (intptr_t)tree->car;
-
-  tree = tree->cdr;
-  switch (type) {
-  case NODE_GVAR:
-    idx = new_sym(s, sym(tree));
-    genop_peep(s, MKOP_ABx(OP_SETGLOBAL, sp, idx), val);
-    break;
-  case NODE_LVAR:
-    idx = lv_idx(s, sym(tree));
-    if (idx > 0) {
-      if (idx != sp) {
-        genop_peep(s, MKOP_AB(OP_MOVE, idx, sp), val);
-      }
-      break;
-    }
-    else {                      /* upvar */
-      int lv = 0;
-      codegen_scope *up = s->prev;
-
-      while (up) {
-        idx = lv_idx(up, sym(tree));
-        if (idx > 0) {
-          genop_peep(s, MKOP_ABC(OP_SETUPVAR, sp, idx, lv), val);
-          break;
-        }
-        lv++;
-        up = up->prev;
-      }
-    }
-    break;
-  case NODE_IVAR:
-    idx = new_sym(s, sym(tree));
-    genop_peep(s, MKOP_ABx(OP_SETIV, sp, idx), val);
-    break;
-  case NODE_CVAR:
-    idx = new_sym(s, sym(tree));
-    genop_peep(s, MKOP_ABx(OP_SETCV, sp, idx), val);
-    break;
-  case NODE_CONST:
-    idx = new_sym(s, sym(tree));
-    genop_peep(s, MKOP_ABx(OP_SETCONST, sp, idx), val);
-    break;
-  case NODE_COLON2:
-    idx = new_sym(s, sym(tree->cdr));
-    genop_peep(s, MKOP_AB(OP_MOVE, cursp(), sp), NOVAL);
-    push();
-    codegen(s, tree->car, VAL);
-    pop_n(2);
-    genop_peep(s, MKOP_ABx(OP_SETMCNST, cursp(), idx), val);
-    break;
-
-  case NODE_CALL:
-  case NODE_SCALL:
-    push();
-    gen_call(s, tree, attrsym(s, sym(tree->cdr->car)), sp, NOVAL,
-             type == NODE_SCALL);
-    pop();
-    if (val) {
-      genop_peep(s, MKOP_AB(OP_MOVE, cursp(), sp), val);
-    }
-    break;
-
-  case NODE_MASGN:
-    gen_vmassignment(s, tree->car, sp, val);
-    break;
-
-  /* splat without assignment */
-  case NODE_NIL:
-    break;
-
-  default:
-#ifndef MRB_DISABLE_STDIO
-    fprintf(stderr, "unknown lhs %d\n", type);
-#endif
-    break;
-  }
-  if (val) push();
-}
-
-static void
-gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
-{
-  int n = 0, post = 0;
-  node *t, *p;
-
-  if (tree->car) {              /* pre */
-    t = tree->car;
-    n = 0;
-    while (t) {
-      genop(s, MKOP_ABC(OP_AREF, cursp(), rhs, n));
-      gen_assignment(s, t->car, cursp(), NOVAL);
-      n++;
-      t = t->cdr;
-    }
-  }
-  t = tree->cdr;
-  if (t) {
-    if (t->cdr) {               /* post count */
-      p = t->cdr->car;
-      while (p) {
-        post++;
-        p = p->cdr;
-      }
-    }
-    if (val) {
-      genop(s, MKOP_AB(OP_MOVE, cursp(), rhs));
-    }
-    else {
-      pop();
-    }
-    push_n(post);
-    pop_n(post);
-    genop(s, MKOP_ABC(OP_APOST, cursp(), n, post));
-    n = 1;
-    if (t->car) {               /* rest */
-      gen_assignment(s, t->car, cursp(), NOVAL);
-    }
-    if (t->cdr && t->cdr->car) {
-      t = t->cdr->car;
-      while (t) {
-        gen_assignment(s, t->car, cursp()+n, NOVAL);
-        t = t->cdr;
-        n++;
-      }
-    }
-    if (!val) {
-      push();
-    }
-  }
-}
-
-static void
-gen_send_intern(codegen_scope *s)
-{
-  pop();
-  genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "intern")), 0));
-  push();
-}
-static void
-gen_literal_array(codegen_scope *s, node *tree, mrb_bool sym, int val)
-{
-  if (val) {
-    int i = 0, j = 0;
-
-    while (tree) {
-      switch ((intptr_t)tree->car->car) {
-      case NODE_STR:
-        if ((tree->cdr == NULL) && ((intptr_t)tree->car->cdr->cdr == 0))
-          break;
-        /* fall through */
-      case NODE_BEGIN:
-        codegen(s, tree->car, VAL);
-        ++j;
-        break;
-
-      case NODE_LITERAL_DELIM:
-        if (j > 0) {
-          j = 0;
-          ++i;
-          if (sym)
-            gen_send_intern(s);
-        }
-        break;
-      }
-      if (j >= 2) {
-        pop(); pop();
-        genop_peep(s, MKOP_AB(OP_STRCAT, cursp(), cursp()+1), VAL);
-        push();
-        j = 1;
-      }
-      tree = tree->cdr;
-    }
-    if (j > 0) {
-      ++i;
-      if (sym)
-        gen_send_intern(s);
-    }
-    pop_n(i);
-    genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), i));
-    push();
-  }
-  else {
-    while (tree) {
-      switch ((intptr_t)tree->car->car) {
-      case NODE_BEGIN: case NODE_BLOCK:
-        codegen(s, tree->car, NOVAL);
-      }
-      tree = tree->cdr;
-    }
-  }
-}
-
-static void
-raise_error(codegen_scope *s, const char *msg)
-{
-  int idx = new_lit(s, mrb_str_new_cstr(s->mrb, msg));
-
-  genop(s, MKOP_ABx(OP_ERR, 1, idx));
-}
-
-static double
-readint_float(codegen_scope *s, const char *p, int base)
-{
-  const char *e = p + strlen(p);
-  double f = 0;
-  int n;
-
-  if (*p == '+') p++;
-  while (p < e) {
-    char c = *p;
-    c = tolower((unsigned char)c);
-    for (n=0; n<base; n++) {
-      if (mrb_digitmap[n] == c) {
-        f *= base;
-        f += n;
-        break;
-      }
-    }
-    if (n == base) {
-      codegen_error(s, "malformed readint input");
-    }
-    p++;
-  }
-  return f;
-}
-
-static mrb_int
-readint_mrb_int(codegen_scope *s, const char *p, int base, mrb_bool neg, mrb_bool *overflow)
-{
-  const char *e = p + strlen(p);
-  mrb_int result = 0;
-  int n;
-
-  mrb_assert(base >= 2 && base <= 36);
-  if (*p == '+') p++;
-  while (p < e) {
-    char c = *p;
-    c = tolower((unsigned char)c);
-    for (n=0; n<base; n++) {
-      if (mrb_digitmap[n] == c) {
-        break;
-      }
-    }
-    if (n == base) {
-      codegen_error(s, "malformed readint input");
-    }
-
-    if (neg) {
-      if ((MRB_INT_MIN + n)/base > result) {
-        *overflow = TRUE;
-        return 0;
-      }
-      result *= base;
-      result -= n;
-    }
-    else {
-      if ((MRB_INT_MAX - n)/base < result) {
-        *overflow = TRUE;
-        return 0;
-      }
-      result *= base;
-      result += n;
-    }
-    p++;
-  }
-  *overflow = FALSE;
-  return result;
-}
-
-static void
-gen_retval(codegen_scope *s, node *tree)
-{
-  if ((intptr_t)tree->car == NODE_SPLAT) {
-    genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), 0));
-    push();
-    codegen(s, tree, VAL);
-    pop(); pop();
-    genop(s, MKOP_AB(OP_ARYCAT, cursp(), cursp()+1));
-  }
-  else {
-    codegen(s, tree, VAL);
-    pop();
-  }
-}
-
-static void
-codegen(codegen_scope *s, node *tree, int val)
-{
-  int nt;
-  int rlev = s->rlev;
-
-  if (!tree) {
-    if (val) {
-      genop(s, MKOP_A(OP_LOADNIL, cursp()));
-      push();
-    }
-    return;
-  }
-
-  s->rlev++;
-  if (s->rlev > MRB_CODEGEN_LEVEL_MAX) {
-    codegen_error(s, "too complex expression");
-  }
-  if (s->irep && s->filename_index != tree->filename_index) {
-    s->irep->filename = mrb_parser_get_filename(s->parser, s->filename_index);
-    mrb_debug_info_append_file(s->mrb, s->irep, s->debug_start_pos, s->pc);
-    s->debug_start_pos = s->pc;
-    s->filename_index = tree->filename_index;
-    s->filename = mrb_parser_get_filename(s->parser, tree->filename_index);
-  }
-
-  nt = (intptr_t)tree->car;
-  s->lineno = tree->lineno;
-  tree = tree->cdr;
-  switch (nt) {
-  case NODE_BEGIN:
-    if (val && !tree) {
-      genop(s, MKOP_A(OP_LOADNIL, cursp()));
-      push();
-    }
-    while (tree) {
-      codegen(s, tree->car, tree->cdr ? NOVAL : val);
-      tree = tree->cdr;
-    }
-    break;
-
-  case NODE_RESCUE:
-    {
-      int onerr, noexc, exend, pos1, pos2, tmp;
-      struct loopinfo *lp;
-
-      if (tree->car == NULL) goto exit;
-      onerr = genop(s, MKOP_Bx(OP_ONERR, 0));
-      lp = loop_push(s, LOOP_BEGIN);
-      lp->pc1 = onerr;
-      codegen(s, tree->car, VAL);
-      pop();
-      lp->type = LOOP_RESCUE;
-      noexc = genop(s, MKOP_Bx(OP_JMP, 0));
-      dispatch(s, onerr);
-      tree = tree->cdr;
-      exend = 0;
-      pos1 = 0;
-      if (tree->car) {
-        node *n2 = tree->car;
-        int exc = cursp();
-
-        genop(s, MKOP_ABC(OP_RESCUE, exc, 0, 0));
-        push();
-        while (n2) {
-          node *n3 = n2->car;
-          node *n4 = n3->car;
-
-          if (pos1) dispatch(s, pos1);
-          pos2 = 0;
-          do {
-            if (n4 && n4->car && (intptr_t)n4->car->car == NODE_SPLAT) {
-              codegen(s, n4->car, VAL);
-              genop(s, MKOP_AB(OP_MOVE, cursp(), exc));
-              pop();
-              genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "__case_eqq")), 1));
-            }
-            else {
-              if (n4) {
-                codegen(s, n4->car, VAL);
-              }
-              else {
-                genop(s, MKOP_ABx(OP_GETCONST, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "StandardError"))));
-                push();
-              }
-              pop();
-              genop(s, MKOP_ABC(OP_RESCUE, exc, cursp(), 1));
-            }
-            tmp = genop(s, MKOP_AsBx(OP_JMPIF, cursp(), pos2));
-            pos2 = tmp;
-            if (n4) {
-              n4 = n4->cdr;
-            }
-          } while (n4);
-          pos1 = genop(s, MKOP_sBx(OP_JMP, 0));
-          dispatch_linked(s, pos2);
-
-          pop();
-          if (n3->cdr->car) {
-            gen_assignment(s, n3->cdr->car, exc, NOVAL);
-          }
-          if (n3->cdr->cdr->car) {
-            codegen(s, n3->cdr->cdr->car, val);
-            if (val) pop();
-          }
-          tmp = genop(s, MKOP_sBx(OP_JMP, exend));
-          exend = tmp;
-          n2 = n2->cdr;
-          push();
-        }
-        if (pos1) {
-          dispatch(s, pos1);
-          genop(s, MKOP_A(OP_RAISE, exc));
-        }
-      }
-      pop();
-      tree = tree->cdr;
-      dispatch(s, noexc);
-      genop(s, MKOP_A(OP_POPERR, 1));
-      if (tree->car) {
-        codegen(s, tree->car, val);
-      }
-      else if (val) {
-        push();
-      }
-      dispatch_linked(s, exend);
-      loop_pop(s, NOVAL);
-    }
-    break;
-
-  case NODE_ENSURE:
-    if (!tree->cdr || !tree->cdr->cdr ||
-        ((intptr_t)tree->cdr->cdr->car == NODE_BEGIN &&
-         tree->cdr->cdr->cdr)) {
-      int idx;
-      int epush = s->pc;
-
-      genop(s, MKOP_Bx(OP_EPUSH, 0));
-      s->ensure_level++;
-      codegen(s, tree->car, val);
-      idx = scope_body(s, tree->cdr, NOVAL);
-      s->iseq[epush] = MKOP_Bx(OP_EPUSH, idx);
-      s->ensure_level--;
-      genop_peep(s, MKOP_A(OP_EPOP, 1), NOVAL);
-    }
-    else {                      /* empty ensure ignored */
-      codegen(s, tree->car, val);
-    }
-    break;
-
-  case NODE_LAMBDA:
-    if (val) {
-      int idx = lambda_body(s, tree, 1);
-
-      genop(s, MKOP_Abc(OP_LAMBDA, cursp(), idx, OP_L_LAMBDA));
-      push();
-    }
-    break;
-
-  case NODE_BLOCK:
-    if (val) {
-      int idx = lambda_body(s, tree, 1);
-
-      genop(s, MKOP_Abc(OP_LAMBDA, cursp(), idx, OP_L_BLOCK));
-      push();
-    }
-    break;
-
-  case NODE_IF:
-    {
-      int pos1, pos2;
-      node *e = tree->cdr->cdr->car;
-
-      if (!tree->car) {
-        codegen(s, e, val);
-        goto exit;
-      }
-      switch ((intptr_t)tree->car->car) {
-      case NODE_TRUE:
-      case NODE_INT:
-      case NODE_STR:
-        codegen(s, tree->cdr->car, val);
-        goto exit;
-      case NODE_FALSE:
-      case NODE_NIL:
-        codegen(s, e, val);
-        goto exit;
-      }
-      codegen(s, tree->car, VAL);
-      pop();
-      pos1 = genop_peep(s, MKOP_AsBx(OP_JMPNOT, cursp(), 0), NOVAL);
-
-      codegen(s, tree->cdr->car, val);
-      if (e) {
-        if (val) pop();
-        pos2 = genop(s, MKOP_sBx(OP_JMP, 0));
-        dispatch(s, pos1);
-        codegen(s, e, val);
-        dispatch(s, pos2);
-      }
-      else {
-        if (val) {
-          pop();
-          pos2 = genop(s, MKOP_sBx(OP_JMP, 0));
-          dispatch(s, pos1);
-          genop(s, MKOP_A(OP_LOADNIL, cursp()));
-          dispatch(s, pos2);
-          push();
-        }
-        else {
-          dispatch(s, pos1);
-        }
-      }
-    }
-    break;
-
-  case NODE_AND:
-    {
-      int pos;
-
-      codegen(s, tree->car, VAL);
-      pop();
-      pos = genop(s, MKOP_AsBx(OP_JMPNOT, cursp(), 0));
-      codegen(s, tree->cdr, val);
-      dispatch(s, pos);
-    }
-    break;
-
-  case NODE_OR:
-    {
-      int pos;
-
-      codegen(s, tree->car, VAL);
-      pop();
-      pos = genop(s, MKOP_AsBx(OP_JMPIF, cursp(), 0));
-      codegen(s, tree->cdr, val);
-      dispatch(s, pos);
-    }
-    break;
-
-  case NODE_WHILE:
-    {
-      struct loopinfo *lp = loop_push(s, LOOP_NORMAL);
-
-      lp->pc1 = genop(s, MKOP_sBx(OP_JMP, 0));
-      lp->pc2 = new_label(s);
-      codegen(s, tree->cdr, NOVAL);
-      dispatch(s, lp->pc1);
-      codegen(s, tree->car, VAL);
-      pop();
-      genop(s, MKOP_AsBx(OP_JMPIF, cursp(), lp->pc2 - s->pc));
-
-      loop_pop(s, val);
-    }
-    break;
-
-  case NODE_UNTIL:
-    {
-      struct loopinfo *lp = loop_push(s, LOOP_NORMAL);
-
-      lp->pc1 = genop(s, MKOP_sBx(OP_JMP, 0));
-      lp->pc2 = new_label(s);
-      codegen(s, tree->cdr, NOVAL);
-      dispatch(s, lp->pc1);
-      codegen(s, tree->car, VAL);
-      pop();
-      genop(s, MKOP_AsBx(OP_JMPNOT, cursp(), lp->pc2 - s->pc));
-
-      loop_pop(s, val);
-    }
-    break;
-
-  case NODE_FOR:
-    for_body(s, tree);
-    if (val) push();
-    break;
-
-  case NODE_CASE:
-    {
-      int head = 0;
-      int pos1, pos2, pos3, tmp;
-      node *n;
-
-      pos3 = 0;
-      if (tree->car) {
-        head = cursp();
-        codegen(s, tree->car, VAL);
-      }
-      tree = tree->cdr;
-      while (tree) {
-        n = tree->car->car;
-        pos1 = pos2 = 0;
-        while (n) {
-          codegen(s, n->car, VAL);
-          if (head) {
-            genop(s, MKOP_AB(OP_MOVE, cursp(), head));
-            pop();
-            if ((intptr_t)n->car->car == NODE_SPLAT) {
-              genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "__case_eqq")), 1));
-            }
-            else {
-              genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "===")), 1));
-            }
-          }
-          else {
-            pop();
-          }
-          tmp = genop(s, MKOP_AsBx(OP_JMPIF, cursp(), pos2));
-          pos2 = tmp;
-          n = n->cdr;
-        }
-        if (tree->car->car) {
-          pos1 = genop(s, MKOP_sBx(OP_JMP, 0));
-          dispatch_linked(s, pos2);
-        }
-        codegen(s, tree->car->cdr, val);
-        if (val) pop();
-        tmp = genop(s, MKOP_sBx(OP_JMP, pos3));
-        pos3 = tmp;
-        if (pos1) dispatch(s, pos1);
-        tree = tree->cdr;
-      }
-      if (val) {
-        int pos = cursp();
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        if (pos3) dispatch_linked(s, pos3);
-        if (head) pop();
-        if (cursp() != pos) {
-          genop(s, MKOP_AB(OP_MOVE, cursp(), pos));
-        }
-        push();
-      }
-      else {
-        if (pos3) {
-          dispatch_linked(s, pos3);
-        }
-        if (head) {
-          pop();
-        }
-      }
-    }
-    break;
-
-  case NODE_SCOPE:
-    scope_body(s, tree, NOVAL);
-    break;
-
-  case NODE_FCALL:
-  case NODE_CALL:
-    gen_call(s, tree, 0, 0, val, 0);
-    break;
-  case NODE_SCALL:
-    gen_call(s, tree, 0, 0, val, 1);
-    break;
-
-  case NODE_DOT2:
-    codegen(s, tree->car, val);
-    codegen(s, tree->cdr, val);
-    if (val) {
-      pop(); pop();
-      genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), FALSE));
-      push();
-    }
-    break;
-
-  case NODE_DOT3:
-    codegen(s, tree->car, val);
-    codegen(s, tree->cdr, val);
-    if (val) {
-      pop(); pop();
-      genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), TRUE));
-      push();
-    }
-    break;
-
-  case NODE_COLON2:
-    {
-      int sym = new_sym(s, sym(tree->cdr));
-
-      codegen(s, tree->car, VAL);
-      pop();
-      genop(s, MKOP_ABx(OP_GETMCNST, cursp(), sym));
-      if (val) push();
-    }
-    break;
-
-  case NODE_COLON3:
-    {
-      int sym = new_sym(s, sym(tree));
-
-      genop(s, MKOP_A(OP_OCLASS, cursp()));
-      genop(s, MKOP_ABx(OP_GETMCNST, cursp(), sym));
-      if (val) push();
-    }
-    break;
-
-  case NODE_ARRAY:
-    {
-      int n;
-
-      n = gen_values(s, tree, val, 0);
-      if (n >= 0) {
-        if (val) {
-          pop_n(n);
-          genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), n));
-          push();
-        }
-      }
-      else if (val) {
-        push();
-      }
-    }
-    break;
-
-  case NODE_HASH:
-    {
-      int len = 0;
-      mrb_bool update = FALSE;
-
-      while (tree) {
-        codegen(s, tree->car->car, val);
-        codegen(s, tree->car->cdr, val);
-        len++;
-        tree = tree->cdr;
-        if (val && len == 126) {
-          pop_n(len*2);
-          genop(s, MKOP_ABC(OP_HASH, cursp(), cursp(), len));
-          if (update) {
-            pop();
-            genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "__update")), 1));
-          }
-          push();
-          update = TRUE;
-          len = 0;
-        }
-      }
-      if (val) {
-        pop_n(len*2);
-        genop(s, MKOP_ABC(OP_HASH, cursp(), cursp(), len));
-        if (update) {
-          pop();
-          genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "__update")), 1));
-        }
-        push();
-      }
-    }
-    break;
-
-  case NODE_SPLAT:
-    codegen(s, tree, val);
-    break;
-
-  case NODE_ASGN:
-    codegen(s, tree->cdr, VAL);
-    pop();
-    gen_assignment(s, tree->car, cursp(), val);
-    break;
-
-  case NODE_MASGN:
-    {
-      int len = 0, n = 0, post = 0;
-      node *t = tree->cdr, *p;
-      int rhs = cursp();
-
-      if ((intptr_t)t->car == NODE_ARRAY && t->cdr && nosplat(t->cdr)) {
-        /* fixed rhs */
-        t = t->cdr;
-        while (t) {
-          codegen(s, t->car, VAL);
-          len++;
-          t = t->cdr;
-        }
-        tree = tree->car;
-        if (tree->car) {                /* pre */
-          t = tree->car;
-          n = 0;
-          while (t) {
-            if (n < len) {
-              gen_assignment(s, t->car, rhs+n, NOVAL);
-              n++;
-            }
-            else {
-              genop(s, MKOP_A(OP_LOADNIL, rhs+n));
-              gen_assignment(s, t->car, rhs+n, NOVAL);
-            }
-            t = t->cdr;
-          }
-        }
-        t = tree->cdr;
-        if (t) {
-          if (t->cdr) {         /* post count */
-            p = t->cdr->car;
-            while (p) {
-              post++;
-              p = p->cdr;
-            }
-          }
-          if (t->car) {         /* rest (len - pre - post) */
-            int rn;
-
-            if (len < post + n) {
-              rn = 0;
-            }
-            else {
-              rn = len - post - n;
-            }
-            genop(s, MKOP_ABC(OP_ARRAY, cursp(), rhs+n, rn));
-            gen_assignment(s, t->car, cursp(), NOVAL);
-            n += rn;
-          }
-          if (t->cdr && t->cdr->car) {
-            t = t->cdr->car;
-            while (n<len) {
-              gen_assignment(s, t->car, rhs+n, NOVAL);
-              t = t->cdr;
-              n++;
-            }
-          }
-        }
-        pop_n(len);
-        if (val) {
-          genop(s, MKOP_ABC(OP_ARRAY, rhs, rhs, len));
-          push();
-        }
-      }
-      else {
-        /* variable rhs */
-        codegen(s, t, VAL);
-        gen_vmassignment(s, tree->car, rhs, val);
-        if (!val) {
-          pop();
-        }
-      }
-    }
-    break;
-
-  case NODE_OP_ASGN:
-    {
-      mrb_sym sym = sym(tree->cdr->car);
-      mrb_int len;
-      const char *name = mrb_sym2name_len(s->mrb, sym, &len);
-      int idx, callargs = -1, vsp = -1;
-
-      if ((len == 2 && name[0] == '|' && name[1] == '|') &&
-          ((intptr_t)tree->car->car == NODE_CONST ||
-           (intptr_t)tree->car->car == NODE_CVAR)) {
-        int onerr, noexc, exc;
-        struct loopinfo *lp;
-
-        onerr = genop(s, MKOP_Bx(OP_ONERR, 0));
-        lp = loop_push(s, LOOP_BEGIN);
-        lp->pc1 = onerr;
-        exc = cursp();
-        codegen(s, tree->car, VAL);
-        lp->type = LOOP_RESCUE;
-        genop(s, MKOP_A(OP_POPERR, 1));
-        noexc = genop(s, MKOP_Bx(OP_JMP, 0));
-        dispatch(s, onerr);
-        genop(s, MKOP_ABC(OP_RESCUE, exc, 0, 0));
-        genop(s, MKOP_A(OP_LOADF, exc));
-        dispatch(s, noexc);
-        loop_pop(s, NOVAL);
-      }
-      else if ((intptr_t)tree->car->car == NODE_CALL) {
-        node *n = tree->car->cdr;
-
-        if (val) {
-          vsp = cursp();
-          push();
-        }
-        codegen(s, n->car, VAL);   /* receiver */
-        idx = new_msym(s, sym(n->cdr->car));
-        if (n->cdr->cdr->car) {
-          int base = cursp()-1;
-          int nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 1);
-
-          /* copy receiver and arguments */
-          if (nargs >= 0) {
-            int i;
-
-            genop(s, MKOP_AB(OP_MOVE, cursp(), base));
-            for (i=0; i<nargs; i++) {
-              genop(s, MKOP_AB(OP_MOVE, cursp()+i+1, base+i+1));
-            }
-            push_n(nargs+1);
-            pop_n(nargs+1);
-            callargs = nargs;
-          }
-          else {
-            /* varargs */
-            push();
-            genop(s, MKOP_AB(OP_MOVE, cursp(), base));
-            genop(s, MKOP_AB(OP_MOVE, cursp()+1, base+1));
-            callargs = CALL_MAXARGS;
-          }
-          genop(s, MKOP_ABC(OP_SEND, cursp(), idx, callargs));
-        }
-        else {
-          genop(s, MKOP_AB(OP_MOVE, cursp(), cursp()-1));
-          genop(s, MKOP_ABC(OP_SEND, cursp(), idx, 0));
-          callargs = 0;
-        }
-        push();
-      }
-      else {
-        codegen(s, tree->car, VAL);
-      }
-      if (len == 2 &&
-          ((name[0] == '|' && name[1] == '|') ||
-           (name[0] == '&' && name[1] == '&'))) {
-        int pos;
-
-        pop();
-        if (val) {
-          if (vsp >= 0) {
-            genop(s, MKOP_AB(OP_MOVE, vsp, cursp()));
-          }
-          pos = genop(s, MKOP_AsBx(name[0]=='|'?OP_JMPIF:OP_JMPNOT, cursp(), 0));
-        }
-        else {
-          pos = genop_peep(s, MKOP_AsBx(name[0]=='|'?OP_JMPIF:OP_JMPNOT, cursp(), 0), NOVAL);
-        }
-        codegen(s, tree->cdr->cdr->car, VAL);
-        pop();
-        if (val && vsp >= 0) {
-          genop(s, MKOP_AB(OP_MOVE, vsp, cursp()));
-        }
-        if ((intptr_t)tree->car->car == NODE_CALL) {
-          mrb_sym m = sym(tree->car->cdr->cdr->car);
-          mrb_sym m2 = attrsym(s, m);
-
-          idx = new_msym(s, m2);
-          pop();
-          if (callargs == CALL_MAXARGS) {
-            genop(s, MKOP_AB(OP_ARYPUSH, cursp(), cursp()+1));
-            pop();
-            genop(s, MKOP_ABC(OP_SEND, cursp(), idx, callargs));
-          }
-          else {
-            pop_n(callargs);
-            genop(s, MKOP_ABC(OP_SEND, cursp(), idx, callargs+1));
-          }
-        }
-        else {
-          gen_assignment(s, tree->car, cursp(), val);
-        }
-        dispatch(s, pos);
-        goto exit;
-      }
-      codegen(s, tree->cdr->cdr->car, VAL);
-      push(); pop();
-      pop(); pop();
-
-      idx = new_msym(s, sym);
-      if (len == 1 && name[0] == '+')  {
-        genop_peep(s, MKOP_ABC(OP_ADD, cursp(), idx, 1), val);
-      }
-      else if (len == 1 && name[0] == '-')  {
-        genop_peep(s, MKOP_ABC(OP_SUB, cursp(), idx, 1), val);
-      }
-      else if (len == 1 && name[0] == '*')  {
-        genop(s, MKOP_ABC(OP_MUL, cursp(), idx, 1));
-      }
-      else if (len == 1 && name[0] == '/')  {
-        genop(s, MKOP_ABC(OP_DIV, cursp(), idx, 1));
-      }
-      else if (len == 1 && name[0] == '<')  {
-        genop(s, MKOP_ABC(OP_LT, cursp(), idx, 1));
-      }
-      else if (len == 2 && name[0] == '<' && name[1] == '=')  {
-        genop(s, MKOP_ABC(OP_LE, cursp(), idx, 1));
-      }
-      else if (len == 1 && name[0] == '>')  {
-        genop(s, MKOP_ABC(OP_GT, cursp(), idx, 1));
-      }
-      else if (len == 2 && name[0] == '>' && name[1] == '=')  {
-        genop(s, MKOP_ABC(OP_GE, cursp(), idx, 1));
-      }
-      else {
-        genop(s, MKOP_ABC(OP_SEND, cursp(), idx, 1));
-      }
-      if (callargs < 0) {
-        gen_assignment(s, tree->car, cursp(), val);
-      }
-      else {
-        if (val && vsp >= 0) {
-          genop(s, MKOP_AB(OP_MOVE, vsp, cursp()));
-        }
-        if (callargs == CALL_MAXARGS) {
-          pop();
-          genop(s, MKOP_AB(OP_ARYPUSH, cursp(), cursp()+1));
-        }
-        else {
-          pop_n(callargs);
-          callargs++;
-        }
-        pop();
-        idx = new_msym(s, attrsym(s,sym(tree->car->cdr->cdr->car)));
-        genop(s, MKOP_ABC(OP_SEND, cursp(), idx, callargs));
-      }
-    }
-    break;
-
-  case NODE_SUPER:
-    {
-      codegen_scope *s2 = s;
-      int lv = 0;
-      int n = 0, noop = 0, sendv = 0;
-
-      push();        /* room for receiver */
-      while (!s2->mscope) {
-        lv++;
-        s2 = s2->prev;
-        if (!s2) break;
-      }
-      genop(s, MKOP_ABx(OP_ARGARY, cursp(), (lv & 0xf)));
-      push(); push();         /* ARGARY pushes two values */
-      pop(); pop();
-      if (tree) {
-        node *args = tree->car;
-        if (args) {
-          n = gen_values(s, args, VAL, 0);
-          if (n < 0) {
-            n = noop = sendv = 1;
-            push();
-          }
-        }
-      }
-      if (tree && tree->cdr) {
-        codegen(s, tree->cdr, VAL);
-        pop();
-      }
-      else {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        push(); pop();
-      }
-      pop_n(n+1);
-      if (sendv) n = CALL_MAXARGS;
-      genop(s, MKOP_ABC(OP_SUPER, cursp(), 0, n));
-      if (val) push();
-    }
-    break;
-
-  case NODE_ZSUPER:
-    {
-      codegen_scope *s2 = s;
-      int lv = 0, ainfo = 0;
-
-      push();        /* room for receiver */
-      while (!s2->mscope) {
-        lv++;
-        s2 = s2->prev;
-        if (!s2) break;
-      }
-      if (s2) ainfo = s2->ainfo;
-      genop(s, MKOP_ABx(OP_ARGARY, cursp(), (ainfo<<4)|(lv & 0xf)));
-      push(); push(); pop();    /* ARGARY pushes two values */
-      if (tree && tree->cdr) {
-        codegen(s, tree->cdr, VAL);
-        pop();
-      }
-      pop(); pop();
-      genop(s, MKOP_ABC(OP_SUPER, cursp(), 0, CALL_MAXARGS));
-      if (val) push();
-    }
-    break;
-
-  case NODE_RETURN:
-    if (tree) {
-      gen_retval(s, tree);
-    }
-    else {
-      genop(s, MKOP_A(OP_LOADNIL, cursp()));
-    }
-    if (s->loop) {
-      genop(s, MKOP_AB(OP_RETURN, cursp(), OP_R_RETURN));
-    }
-    else {
-      genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL);
-    }
-    if (val) push();
-    break;
-
-  case NODE_YIELD:
-    {
-      codegen_scope *s2 = s;
-      int lv = 0, ainfo = 0;
-      int n = 0, sendv = 0;
-
-      while (!s2->mscope) {
-        lv++;
-        s2 = s2->prev;
-        if (!s2) break;
-      }
-      if (s2) ainfo = s2->ainfo;
-      push();
-      if (tree) {
-        n = gen_values(s, tree, VAL, 0);
-        if (n < 0) {
-          n = sendv = 1;
-          push();
-        }
-      }
-      pop_n(n+1);
-      genop(s, MKOP_ABx(OP_BLKPUSH, cursp(), (ainfo<<4)|(lv & 0xf)));
-      if (sendv) n = CALL_MAXARGS;
-      genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "call")), n));
-      if (val) push();
-    }
-    break;
-
-  case NODE_BREAK:
-    loop_break(s, tree);
-    if (val) push();
-    break;
-
-  case NODE_NEXT:
-    if (!s->loop) {
-      raise_error(s, "unexpected next");
-    }
-    else if (s->loop->type == LOOP_NORMAL) {
-      if (s->ensure_level > s->loop->ensure_level) {
-        genop_peep(s, MKOP_A(OP_EPOP, s->ensure_level - s->loop->ensure_level), NOVAL);
-      }
-      codegen(s, tree, NOVAL);
-      genop(s, MKOP_sBx(OP_JMP, s->loop->pc1 - s->pc));
-    }
-    else {
-      if (tree) {
-        codegen(s, tree, VAL);
-        pop();
-      }
-      else {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-      }
-      genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL);
-    }
-    if (val) push();
-    break;
-
-  case NODE_REDO:
-    if (!s->loop || s->loop->type == LOOP_BEGIN || s->loop->type == LOOP_RESCUE) {
-      raise_error(s, "unexpected redo");
-    }
-    else {
-      if (s->ensure_level > s->loop->ensure_level) {
-        genop_peep(s, MKOP_A(OP_EPOP, s->ensure_level - s->loop->ensure_level), NOVAL);
-      }
-      genop(s, MKOP_sBx(OP_JMP, s->loop->pc2 - s->pc));
-    }
-    if (val) push();
-    break;
-
-  case NODE_RETRY:
-    {
-      const char *msg = "unexpected retry";
-
-      if (!s->loop) {
-        raise_error(s, msg);
-      }
-      else {
-        struct loopinfo *lp = s->loop;
-        int n = 0;
-
-        while (lp && lp->type != LOOP_RESCUE) {
-          if (lp->type == LOOP_BEGIN) {
-            n++;
-          }
-          lp = lp->prev;
-        }
-        if (!lp) {
-          raise_error(s, msg);
-        }
-        else {
-          if (n > 0) {
-            while (n--) {
-              genop_peep(s, MKOP_A(OP_POPERR, 1), NOVAL);
-            }
-          }
-          if (s->ensure_level > lp->ensure_level) {
-            genop_peep(s, MKOP_A(OP_EPOP, s->ensure_level - lp->ensure_level), NOVAL);
-          }
-          genop(s, MKOP_sBx(OP_JMP, lp->pc1 - s->pc));
-        }
-      }
-      if (val) push();
-    }
-    break;
-
-  case NODE_LVAR:
-    if (val) {
-      int idx = lv_idx(s, sym(tree));
-
-      if (idx > 0) {
-        genop_peep(s, MKOP_AB(OP_MOVE, cursp(), idx), NOVAL);
-      }
-      else {
-        int lv = 0;
-        codegen_scope *up = s->prev;
-
-        while (up) {
-          idx = lv_idx(up, sym(tree));
-          if (idx > 0) {
-            genop(s, MKOP_ABC(OP_GETUPVAR, cursp(), idx, lv));
-            break;
-          }
-          lv++;
-          up = up->prev;
-        }
-      }
-      push();
-    }
-    break;
-
-  case NODE_GVAR:
-    if (val) {
-      int sym = new_sym(s, sym(tree));
-
-      genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym));
-      push();
-    }
-    break;
-
-  case NODE_IVAR:
-    if (val) {
-      int sym = new_sym(s, sym(tree));
-
-      genop(s, MKOP_ABx(OP_GETIV, cursp(), sym));
-      push();
-    }
-    break;
-
-  case NODE_CVAR:
-    if (val) {
-      int sym = new_sym(s, sym(tree));
-
-      genop(s, MKOP_ABx(OP_GETCV, cursp(), sym));
-      push();
-    }
-    break;
-
-  case NODE_CONST:
-    {
-      int sym = new_sym(s, sym(tree));
-
-      genop(s, MKOP_ABx(OP_GETCONST, cursp(), sym));
-      if (val) {
-        push();
-      }
-    }
-    break;
-
-  case NODE_DEFINED:
-    codegen(s, tree, VAL);
-    break;
-
-  case NODE_BACK_REF:
-    if (val) {
-      char buf[3];
-      int sym;
-
-      buf[0] = '$';
-      buf[1] = (char)(intptr_t)tree;
-      buf[2] = 0;
-      sym = new_sym(s, mrb_intern_cstr(s->mrb, buf));
-      genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym));
-      push();
-    }
-    break;
-
-  case NODE_NTH_REF:
-    if (val) {
-      mrb_state *mrb = s->mrb;
-      mrb_value str;
-      int sym;
-
-      str = mrb_format(mrb, "$%S", mrb_fixnum_value((mrb_int)(intptr_t)tree));
-      sym = new_sym(s, mrb_intern_str(mrb, str));
-      genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym));
-      push();
-    }
-    break;
-
-  case NODE_ARG:
-    /* should not happen */
-    break;
-
-  case NODE_BLOCK_ARG:
-    codegen(s, tree, VAL);
-    break;
-
-  case NODE_INT:
-    if (val) {
-      char *p = (char*)tree->car;
-      int base = (intptr_t)tree->cdr->car;
-      mrb_int i;
-      mrb_code co;
-      mrb_bool overflow;
-
-      i = readint_mrb_int(s, p, base, FALSE, &overflow);
-      if (overflow) {
-        double f = readint_float(s, p, base);
-        int off = new_lit(s, mrb_float_value(s->mrb, f));
-
-        genop(s, MKOP_ABx(OP_LOADL, cursp(), off));
-      }
-      else {
-        if (i < MAXARG_sBx && i > -MAXARG_sBx) {
-          co = MKOP_AsBx(OP_LOADI, cursp(), i);
-        }
-        else {
-          int off = new_lit(s, mrb_fixnum_value(i));
-          co = MKOP_ABx(OP_LOADL, cursp(), off);
-        }
-        genop(s, co);
-      }
-      push();
-    }
-    break;
-
-  case NODE_FLOAT:
-    if (val) {
-      char *p = (char*)tree;
-      mrb_float f = mrb_float_read(p, NULL);
-      int off = new_lit(s, mrb_float_value(s->mrb, f));
-
-      genop(s, MKOP_ABx(OP_LOADL, cursp(), off));
-      push();
-    }
-    break;
-
-  case NODE_NEGATE:
-    {
-      nt = (intptr_t)tree->car;
-      tree = tree->cdr;
-      switch (nt) {
-      case NODE_FLOAT:
-        if (val) {
-          char *p = (char*)tree;
-          mrb_float f = mrb_float_read(p, NULL);
-          int off = new_lit(s, mrb_float_value(s->mrb, -f));
-
-          genop(s, MKOP_ABx(OP_LOADL, cursp(), off));
-          push();
-        }
-        break;
-
-      case NODE_INT:
-        if (val) {
-          char *p = (char*)tree->car;
-          int base = (intptr_t)tree->cdr->car;
-          mrb_int i;
-          mrb_code co;
-          mrb_bool overflow;
-
-          i = readint_mrb_int(s, p, base, TRUE, &overflow);
-          if (overflow) {
-            double f = readint_float(s, p, base);
-            int off = new_lit(s, mrb_float_value(s->mrb, -f));
-
-            genop(s, MKOP_ABx(OP_LOADL, cursp(), off));
-          }
-          else {
-            if (i < MAXARG_sBx && i > -MAXARG_sBx) {
-              co = MKOP_AsBx(OP_LOADI, cursp(), i);
-            }
-            else {
-              int off = new_lit(s, mrb_fixnum_value(i));
-              co = MKOP_ABx(OP_LOADL, cursp(), off);
-            }
-            genop(s, co);
-          }
-          push();
-        }
-        break;
-
-      default:
-        if (val) {
-          int sym = new_msym(s, mrb_intern_lit(s->mrb, "-"));
-
-          genop(s, MKOP_ABx(OP_LOADI, cursp(), 0));
-          push();
-          codegen(s, tree, VAL);
-          pop(); pop();
-          genop(s, MKOP_ABC(OP_SUB, cursp(), sym, 2));
-        }
-        else {
-          codegen(s, tree, NOVAL);
-        }
-        break;
-      }
-    }
-    break;
-
-  case NODE_STR:
-    if (val) {
-      char *p = (char*)tree->car;
-      size_t len = (intptr_t)tree->cdr;
-      int ai = mrb_gc_arena_save(s->mrb);
-      int off = new_lit(s, mrb_str_new(s->mrb, p, len));
-
-      mrb_gc_arena_restore(s->mrb, ai);
-      genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-      push();
-    }
-    break;
-
-  case NODE_HEREDOC:
-    tree = ((struct mrb_parser_heredoc_info *)tree)->doc;
-    /* fall through */
-  case NODE_DSTR:
-    if (val) {
-      node *n = tree;
-
-      if (!n) {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        push();
-        break;
-      }
-      codegen(s, n->car, VAL);
-      n = n->cdr;
-      while (n) {
-        codegen(s, n->car, VAL);
-        pop(); pop();
-        genop_peep(s, MKOP_AB(OP_STRCAT, cursp(), cursp()+1), VAL);
-        push();
-        n = n->cdr;
-      }
-    }
-    else {
-      node *n = tree;
-
-      while (n) {
-        if ((intptr_t)n->car->car != NODE_STR) {
-          codegen(s, n->car, NOVAL);
-        }
-        n = n->cdr;
-      }
-    }
-    break;
-
-  case NODE_WORDS:
-    gen_literal_array(s, tree, FALSE, val);
-    break;
-
-  case NODE_SYMBOLS:
-    gen_literal_array(s, tree, TRUE, val);
-    break;
-
-  case NODE_DXSTR:
-    {
-      node *n;
-      int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern_lit(s->mrb, "Kernel"));
-
-      genop(s, MKOP_A(OP_LOADSELF, cursp()));
-      push();
-      codegen(s, tree->car, VAL);
-      n = tree->cdr;
-      while (n) {
-        if ((intptr_t)n->car->car == NODE_XSTR) {
-          n->car->car = (struct mrb_ast_node*)(intptr_t)NODE_STR;
-          mrb_assert(!n->cdr); /* must be the end */
-        }
-        codegen(s, n->car, VAL);
-        pop(); pop();
-        genop_peep(s, MKOP_AB(OP_STRCAT, cursp(), cursp()+1), VAL);
-        push();
-        n = n->cdr;
-      }
-      push();                   /* for block */
-      pop_n(3);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "`"));
-      genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1));
-      if (val) push();
-      mrb_gc_arena_restore(s->mrb, ai);
-    }
-    break;
-
-  case NODE_XSTR:
-    {
-      char *p = (char*)tree->car;
-      size_t len = (intptr_t)tree->cdr;
-      int ai = mrb_gc_arena_save(s->mrb);
-      int off = new_lit(s, mrb_str_new(s->mrb, p, len));
-      int sym;
-
-      genop(s, MKOP_A(OP_LOADSELF, cursp()));
-      push();
-      genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-      push(); push();
-      pop_n(3);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "`"));
-      genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1));
-      if (val) push();
-      mrb_gc_arena_restore(s->mrb, ai);
-    }
-    break;
-
-  case NODE_REGX:
-    if (val) {
-      char *p1 = (char*)tree->car;
-      char *p2 = (char*)tree->cdr->car;
-      char *p3 = (char*)tree->cdr->cdr;
-      int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern_lit(s->mrb, REGEXP_CLASS));
-      int off = new_lit(s, mrb_str_new_cstr(s->mrb, p1));
-      int argc = 1;
-
-      genop(s, MKOP_A(OP_OCLASS, cursp()));
-      genop(s, MKOP_ABx(OP_GETMCNST, cursp(), sym));
-      push();
-      genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-      if (p2 || p3) {
-        push();
-        if (p2) {
-          off = new_lit(s, mrb_str_new_cstr(s->mrb, p2));
-          genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-        }
-        else {
-          genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        }
-        argc++;
-        if (p3) {
-          push();
-          off = new_lit(s, mrb_str_new(s->mrb, p3, 1));
-          genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-          argc++;
-          pop();
-        }
-        pop();
-      }
-      pop();
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "compile"));
-      genop(s, MKOP_ABC(OP_SEND, cursp(), sym, argc));
-      mrb_gc_arena_restore(s->mrb, ai);
-      push();
-    }
-    break;
-
-  case NODE_DREGX:
-    if (val) {
-      node *n = tree->car;
-      int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern_lit(s->mrb, REGEXP_CLASS));
-      int argc = 1;
-      int off;
-      char *p;
-
-      genop(s, MKOP_A(OP_OCLASS, cursp()));
-      genop(s, MKOP_ABx(OP_GETMCNST, cursp(), sym));
-      push();
-      codegen(s, n->car, VAL);
-      n = n->cdr;
-      while (n) {
-        codegen(s, n->car, VAL);
-        pop(); pop();
-        genop_peep(s, MKOP_AB(OP_STRCAT, cursp(), cursp()+1), VAL);
-        push();
-        n = n->cdr;
-      }
-      n = tree->cdr->cdr;
-      if (n->car) {
-        p = (char*)n->car;
-        off = new_lit(s, mrb_str_new_cstr(s->mrb, p));
-        codegen(s, tree->car, VAL);
-        genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-        pop();
-        genop_peep(s, MKOP_AB(OP_STRCAT, cursp(), cursp()+1), VAL);
-      }
-      if (n->cdr->car) {
-        char *p2 = (char*)n->cdr->car;
-
-        push();
-        off = new_lit(s, mrb_str_new_cstr(s->mrb, p2));
-        genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-        argc++;
-      }
-      if (n->cdr->cdr) {
-        char *p2 = (char*)n->cdr->cdr;
-
-        push();
-        off = new_lit(s, mrb_str_new_cstr(s->mrb, p2));
-        genop(s, MKOP_ABx(OP_STRING, cursp(), off));
-        argc++;
-      }
-      pop_n(argc);
-      sym = new_sym(s, mrb_intern_lit(s->mrb, "compile"));
-      genop(s, MKOP_ABC(OP_SEND, cursp(), sym, argc));
-      mrb_gc_arena_restore(s->mrb, ai);
-      push();
-    }
-    else {
-      node *n = tree->car;
-
-      while (n) {
-        if ((intptr_t)n->car->car != NODE_STR) {
-          codegen(s, n->car, NOVAL);
-        }
-        n = n->cdr;
-      }
-    }
-    break;
-
-  case NODE_SYM:
-    if (val) {
-      int sym = new_sym(s, sym(tree));
-
-      genop(s, MKOP_ABx(OP_LOADSYM, cursp(), sym));
-      push();
-    }
-    break;
-
-  case NODE_DSYM:
-    codegen(s, tree, val);
-    if (val) {
-      gen_send_intern(s);
-    }
-    break;
-
-  case NODE_SELF:
-    if (val) {
-      genop(s, MKOP_A(OP_LOADSELF, cursp()));
-      push();
-    }
-    break;
-
-  case NODE_NIL:
-    if (val) {
-      genop(s, MKOP_A(OP_LOADNIL, cursp()));
-      push();
-    }
-    break;
-
-  case NODE_TRUE:
-    if (val) {
-      genop(s, MKOP_A(OP_LOADT, cursp()));
-      push();
-    }
-    break;
-
-  case NODE_FALSE:
-    if (val) {
-      genop(s, MKOP_A(OP_LOADF, cursp()));
-      push();
-    }
-    break;
-
-  case NODE_ALIAS:
-    {
-      int a = new_msym(s, sym(tree->car));
-      int b = new_msym(s, sym(tree->cdr));
-      int c = new_msym(s, mrb_intern_lit(s->mrb, "alias_method"));
-
-      genop(s, MKOP_A(OP_TCLASS, cursp()));
-      push();
-      genop(s, MKOP_ABx(OP_LOADSYM, cursp(), a));
-      push();
-      genop(s, MKOP_ABx(OP_LOADSYM, cursp(), b));
-      push();
-      genop(s, MKOP_A(OP_LOADNIL, cursp()));
-      push();
-      pop_n(4);
-      genop(s, MKOP_ABC(OP_SEND, cursp(), c, 2));
-      if (val) {
-        push();
-      }
-    }
-   break;
-
-  case NODE_UNDEF:
-    {
-      int undef = new_msym(s, mrb_intern_lit(s->mrb, "undef_method"));
-      int num = 0;
-      node *t = tree;
-
-      genop(s, MKOP_A(OP_TCLASS, cursp()));
-      push();
-      while (t) {
-        int symbol;
-        if (num >= CALL_MAXARGS - 1) {
-          pop_n(num);
-          genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), num));
-          while (t) {
-            symbol = new_msym(s, sym(t->car));
-            push();
-            genop(s, MKOP_ABx(OP_LOADSYM, cursp(), symbol));
-            pop();
-            genop(s, MKOP_AB(OP_ARYPUSH, cursp(), cursp()+1));
-            t = t->cdr;
-          }
-          num = CALL_MAXARGS;
-          break;
-        }
-        symbol = new_msym(s, sym(t->car));
-        genop(s, MKOP_ABx(OP_LOADSYM, cursp(), symbol));
-        push();
-        t = t->cdr;
-        num++;
-      }
-      pop();
-      if (num < CALL_MAXARGS) {
-        pop_n(num);
-      }
-      genop(s, MKOP_ABC(OP_SEND, cursp(), undef, num));
-      if (val) {
-        push();
-      }
-    }
-    break;
-
-  case NODE_CLASS:
-    {
-      int idx;
-
-      if (tree->car->car == (node*)0) {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        push();
-      }
-      else if (tree->car->car == (node*)1) {
-        genop(s, MKOP_A(OP_OCLASS, cursp()));
-        push();
-      }
-      else {
-        codegen(s, tree->car->car, VAL);
-      }
-      if (tree->cdr->car) {
-        codegen(s, tree->cdr->car, VAL);
-      }
-      else {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        push();
-      }
-      pop(); pop();
-      idx = new_msym(s, sym(tree->car->cdr));
-      genop(s, MKOP_AB(OP_CLASS, cursp(), idx));
-      idx = scope_body(s, tree->cdr->cdr->car, val);
-      genop(s, MKOP_ABx(OP_EXEC, cursp(), idx));
-      if (val) {
-        push();
-      }
-    }
-    break;
-
-  case NODE_MODULE:
-    {
-      int idx;
-
-      if (tree->car->car == (node*)0) {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-        push();
-      }
-      else if (tree->car->car == (node*)1) {
-        genop(s, MKOP_A(OP_OCLASS, cursp()));
-        push();
-      }
-      else {
-        codegen(s, tree->car->car, VAL);
-      }
-      pop();
-      idx = new_msym(s, sym(tree->car->cdr));
-      genop(s, MKOP_AB(OP_MODULE, cursp(), idx));
-      idx = scope_body(s, tree->cdr->car, val);
-      genop(s, MKOP_ABx(OP_EXEC, cursp(), idx));
-      if (val) {
-        push();
-      }
-    }
-    break;
-
-  case NODE_SCLASS:
-    {
-      int idx;
-
-      codegen(s, tree->car, VAL);
-      pop();
-      genop(s, MKOP_AB(OP_SCLASS, cursp(), cursp()));
-      idx = scope_body(s, tree->cdr->car, val);
-      genop(s, MKOP_ABx(OP_EXEC, cursp(), idx));
-      if (val) {
-        push();
-      }
-    }
-    break;
-
-  case NODE_DEF:
-    {
-      int sym = new_msym(s, sym(tree->car));
-      int idx = lambda_body(s, tree->cdr, 0);
-
-      genop(s, MKOP_A(OP_TCLASS, cursp()));
-      push();
-      genop(s, MKOP_Abc(OP_LAMBDA, cursp(), idx, OP_L_METHOD));
-      push(); pop();
-      pop();
-      genop(s, MKOP_AB(OP_METHOD, cursp(), sym));
-      if (val) {
-        genop(s, MKOP_ABx(OP_LOADSYM, cursp(), sym));
-        push();
-      }
-    }
-    break;
-
-  case NODE_SDEF:
-    {
-      node *recv = tree->car;
-      int sym = new_msym(s, sym(tree->cdr->car));
-      int idx = lambda_body(s, tree->cdr->cdr, 0);
-
-      codegen(s, recv, VAL);
-      pop();
-      genop(s, MKOP_AB(OP_SCLASS, cursp(), cursp()));
-      push();
-      genop(s, MKOP_Abc(OP_LAMBDA, cursp(), idx, OP_L_METHOD));
-      pop();
-      genop(s, MKOP_AB(OP_METHOD, cursp(), sym));
-      if (val) {
-        genop(s, MKOP_ABx(OP_LOADSYM, cursp(), sym));
-        push();
-      }
-    }
-    break;
-
-  case NODE_POSTEXE:
-    codegen(s, tree, NOVAL);
-    break;
-
-  default:
-    break;
-  }
- exit:
-  s->rlev = rlev;
-}
-
-static void
-scope_add_irep(codegen_scope *s, mrb_irep *irep)
-{
-  if (s->irep == NULL) {
-    s->irep = irep;
-    return;
-  }
-  if (s->irep->rlen == s->rcapa) {
-    s->rcapa *= 2;
-    s->irep->reps = (mrb_irep**)codegen_realloc(s, s->irep->reps, sizeof(mrb_irep*)*s->rcapa);
-  }
-  s->irep->reps[s->irep->rlen] = irep;
-  s->irep->rlen++;
-}
-
-static codegen_scope*
-scope_new(mrb_state *mrb, codegen_scope *prev, node *lv)
-{
-  static const codegen_scope codegen_scope_zero = { 0 };
-  mrb_pool *pool = mrb_pool_open(mrb);
-  codegen_scope *p = (codegen_scope *)mrb_pool_alloc(pool, sizeof(codegen_scope));
-
-  if (!p) return NULL;
-  *p = codegen_scope_zero;
-  p->mrb = mrb;
-  p->mpool = pool;
-  if (!prev) return p;
-  p->prev = prev;
-  p->ainfo = -1;
-  p->mscope = 0;
-
-  p->irep = mrb_add_irep(mrb);
-  scope_add_irep(prev, p->irep);
-
-  p->rcapa = 8;
-  p->irep->reps = (mrb_irep**)mrb_malloc(mrb, sizeof(mrb_irep*)*p->rcapa);
-
-  p->icapa = 1024;
-  p->iseq = (mrb_code*)mrb_malloc(mrb, sizeof(mrb_code)*p->icapa);
-  p->irep->iseq = NULL;
-
-  p->pcapa = 32;
-  p->irep->pool = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value)*p->pcapa);
-  p->irep->plen = 0;
-
-  p->scapa = MAXMSYMLEN;
-  p->irep->syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym)*p->scapa);
-  p->irep->slen = 0;
-
-  p->lv = lv;
-  p->sp += node_len(lv)+1;        /* add self */
-  p->nlocals = p->sp;
-  if (lv) {
-    node *n = lv;
-    size_t i = 0;
-
-    p->irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (p->nlocals - 1));
-    for (i=0, n=lv; n; i++,n=n->cdr) {
-      p->irep->lv[i].name = lv_name(n);
-      if (lv_name(n)) {
-        p->irep->lv[i].r = lv_idx(p, lv_name(n));
-      }
-      else {
-        p->irep->lv[i].r = 0;
-      }
-    }
-    mrb_assert(i + 1 == p->nlocals);
-  }
-  p->ai = mrb_gc_arena_save(mrb);
-
-  p->filename = prev->filename;
-  if (p->filename) {
-    p->lines = (uint16_t*)mrb_malloc(mrb, sizeof(short)*p->icapa);
-  }
-  p->lineno = prev->lineno;
-
-  /* debug setting */
-  p->debug_start_pos = 0;
-  if (p->filename) {
-    mrb_debug_info_alloc(mrb, p->irep);
-    p->irep->filename = p->filename;
-    p->irep->lines = p->lines;
-  }
-  else {
-    p->irep->debug_info = NULL;
-  }
-  p->parser = prev->parser;
-  p->filename_index = prev->filename_index;
-
-  p->rlev = prev->rlev+1;
-
-  return p;
-}
-
-static void
-scope_finish(codegen_scope *s)
-{
-  mrb_state *mrb = s->mrb;
-  mrb_irep *irep = s->irep;
-  size_t fname_len;
-  char *fname;
-
-  irep->flags = 0;
-  if (s->iseq) {
-    irep->iseq = (mrb_code *)codegen_realloc(s, s->iseq, sizeof(mrb_code)*s->pc);
-    irep->ilen = s->pc;
-    if (s->lines) {
-      irep->lines = (uint16_t *)codegen_realloc(s, s->lines, sizeof(uint16_t)*s->pc);
-    }
-    else {
-      irep->lines = 0;
-    }
-  }
-  irep->pool = (mrb_value*)codegen_realloc(s, irep->pool, sizeof(mrb_value)*irep->plen);
-  irep->syms = (mrb_sym*)codegen_realloc(s, irep->syms, sizeof(mrb_sym)*irep->slen);
-  irep->reps = (mrb_irep**)codegen_realloc(s, irep->reps, sizeof(mrb_irep*)*irep->rlen);
-  if (s->filename) {
-    irep->filename = mrb_parser_get_filename(s->parser, s->filename_index);
-    mrb_debug_info_append_file(mrb, irep, s->debug_start_pos, s->pc);
-
-    fname_len = strlen(s->filename);
-    fname = (char*)codegen_malloc(s, fname_len + 1);
-    memcpy(fname, s->filename, fname_len);
-    fname[fname_len] = '\0';
-    irep->filename = fname;
-    irep->own_filename = TRUE;
-  }
-
-  irep->nlocals = s->nlocals;
-  irep->nregs = s->nregs;
-
-  mrb_gc_arena_restore(mrb, s->ai);
-  mrb_pool_close(s->mpool);
-}
-
-static struct loopinfo*
-loop_push(codegen_scope *s, enum looptype t)
-{
-  struct loopinfo *p = (struct loopinfo *)codegen_palloc(s, sizeof(struct loopinfo));
-
-  p->type = t;
-  p->pc1 = p->pc2 = p->pc3 = 0;
-  p->prev = s->loop;
-  p->ensure_level = s->ensure_level;
-  p->acc = cursp();
-  s->loop = p;
-
-  return p;
-}
-
-static void
-loop_break(codegen_scope *s, node *tree)
-{
-  if (!s->loop) {
-    codegen(s, tree, NOVAL);
-    raise_error(s, "unexpected break");
-  }
-  else {
-    struct loopinfo *loop;
-
-    if (tree) {
-      gen_retval(s, tree);
-    }
-
-    loop = s->loop;
-    while (loop && loop->type == LOOP_BEGIN) {
-      genop_peep(s, MKOP_A(OP_POPERR, 1), NOVAL);
-      loop = loop->prev;
-    }
-    while (loop && (loop->type == LOOP_RESCUE || loop->type == LOOP_BEGIN)) {
-      loop = loop->prev;
-    }
-    if (!loop) {
-      raise_error(s, "unexpected break");
-      return;
-    }
-
-    if (loop->type == LOOP_NORMAL) {
-      int tmp;
-
-      if (s->ensure_level > s->loop->ensure_level) {
-        genop_peep(s, MKOP_A(OP_EPOP, s->ensure_level - s->loop->ensure_level), NOVAL);
-      }
-      if (tree) {
-        genop_peep(s, MKOP_AB(OP_MOVE, loop->acc, cursp()), NOVAL);
-      }
-      tmp = genop(s, MKOP_sBx(OP_JMP, loop->pc3));
-      loop->pc3 = tmp;
-    }
-    else {
-      if (!tree) {
-        genop(s, MKOP_A(OP_LOADNIL, cursp()));
-      }
-      genop(s, MKOP_AB(OP_RETURN, cursp(), OP_R_BREAK));
-    }
-  }
-}
-
-static void
-loop_pop(codegen_scope *s, int val)
-{
-  if (val) {
-    genop(s, MKOP_A(OP_LOADNIL, cursp()));
-  }
-  dispatch_linked(s, s->loop->pc3);
-  s->loop = s->loop->prev;
-  if (val) push();
-}
-
-MRB_API struct RProc*
-mrb_generate_code(mrb_state *mrb, parser_state *p)
-{
-  codegen_scope *scope = scope_new(mrb, 0, 0);
-  struct RProc *proc;
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-
-  if (!scope) {
-    return NULL;
-  }
-  scope->mrb = mrb;
-  scope->parser = p;
-  scope->filename = p->filename;
-  scope->filename_index = p->current_filename_index;
-
-  MRB_TRY(&scope->jmp) {
-    mrb->jmp = &scope->jmp; 
-    /* prepare irep */
-    codegen(scope, p->tree, NOVAL);
-    proc = mrb_proc_new(mrb, scope->irep);
-    mrb_irep_decref(mrb, scope->irep);
-    mrb_pool_close(scope->mpool);
-    proc->c = NULL;
-    mrb->jmp = prev_jmp;
-    return proc;
-  }
-  MRB_CATCH(&scope->jmp) {
-    mrb_irep_decref(mrb, scope->irep);
-    mrb_pool_close(scope->mpool);
-    mrb->jmp = prev_jmp;
-    return NULL;
-  }
-  MRB_END_EXC(&scope->jmp);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/keywords cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/keywords
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/keywords	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/keywords	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-%{
-struct kwtable {const char *name; int id[2]; enum mrb_lex_state_enum state;};
-const struct kwtable *mrb_reserved_word(const char *, unsigned int);
-static const struct kwtable *reserved_word(const char *, unsigned int);
-#define mrb_reserved_word(str, len) reserved_word(str, len)
-%}
-
-struct kwtable;
-%%
-__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
-__FILE__,     {keyword__FILE__,     keyword__FILE__},     EXPR_END
-__LINE__,     {keyword__LINE__,     keyword__LINE__},     EXPR_END
-BEGIN,        {keyword_BEGIN,       keyword_BEGIN},       EXPR_END
-END,          {keyword_END,         keyword_END},         EXPR_END
-alias,        {keyword_alias,       keyword_alias},       EXPR_FNAME
-and,          {keyword_and,         keyword_and},         EXPR_VALUE
-begin,        {keyword_begin,       keyword_begin},       EXPR_BEG
-break,        {keyword_break,       keyword_break},       EXPR_MID
-case,         {keyword_case,        keyword_case},        EXPR_VALUE
-class,        {keyword_class,       keyword_class},       EXPR_CLASS
-def,          {keyword_def,         keyword_def},         EXPR_FNAME
-do,           {keyword_do,          keyword_do},          EXPR_BEG
-else,         {keyword_else,        keyword_else},        EXPR_BEG
-elsif,        {keyword_elsif,       keyword_elsif},       EXPR_VALUE
-end,          {keyword_end,         keyword_end},         EXPR_END
-ensure,       {keyword_ensure,      keyword_ensure},      EXPR_BEG
-false,        {keyword_false,       keyword_false},       EXPR_END
-for,          {keyword_for,         keyword_for},         EXPR_VALUE
-if,           {keyword_if,          modifier_if},         EXPR_VALUE
-in,           {keyword_in,          keyword_in},          EXPR_VALUE
-module,       {keyword_module,      keyword_module},      EXPR_VALUE
-next,         {keyword_next,        keyword_next},        EXPR_MID
-nil,          {keyword_nil,         keyword_nil},         EXPR_END
-not,          {keyword_not,         keyword_not},         EXPR_ARG
-or,           {keyword_or,          keyword_or},          EXPR_VALUE
-redo,         {keyword_redo,        keyword_redo},        EXPR_END
-rescue,       {keyword_rescue,      modifier_rescue},     EXPR_MID
-retry,        {keyword_retry,       keyword_retry},       EXPR_END
-return,       {keyword_return,      keyword_return},      EXPR_MID
-self,         {keyword_self,        keyword_self},        EXPR_END
-super,        {keyword_super,       keyword_super},       EXPR_ARG
-then,         {keyword_then,        keyword_then},        EXPR_BEG
-true,         {keyword_true,        keyword_true},        EXPR_END
-undef,        {keyword_undef,       keyword_undef},       EXPR_FNAME
-unless,       {keyword_unless,      modifier_unless},     EXPR_VALUE
-until,        {keyword_until,       modifier_until},      EXPR_VALUE
-when,         {keyword_when,        keyword_when},        EXPR_VALUE
-while,        {keyword_while,       modifier_while},      EXPR_VALUE
-yield,        {keyword_yield,       keyword_yield},       EXPR_ARG
-%%
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/lex.def cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/lex.def
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/lex.def	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/lex.def	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-/* ANSI-C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k'1,3,$' /home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords  */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 1 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-
-struct kwtable {const char *name; int id[2]; enum mrb_lex_state_enum state;};
-const struct kwtable *mrb_reserved_word(const char *, unsigned int);
-static const struct kwtable *reserved_word(const char *, unsigned int);
-#define mrb_reserved_word(str, len) reserved_word(str, len)
-#line 8 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-struct kwtable;
-
-#define TOTAL_KEYWORDS 40
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 50
-/* maximum key range = 43, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 14, 51, 16,  8,
-      11, 13, 51, 51, 51, 51, 10, 51, 13, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 11, 51, 13,  1, 26,
-       4,  1,  8, 28, 51, 23, 51,  1,  1, 27,
-       5, 19, 21, 51,  8,  3,  3, 11, 51, 21,
-      24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[2]];
-      /*FALLTHROUGH*/
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct kwtable *
-mrb_reserved_word (register const char *str, register unsigned int len)
-{
-  static const struct kwtable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 18 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"break",        {keyword_break,       keyword_break},       EXPR_MID},
-#line 23 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"else",         {keyword_else,        keyword_else},        EXPR_BEG},
-#line 33 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"nil",          {keyword_nil,         keyword_nil},         EXPR_END},
-#line 26 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"ensure",       {keyword_ensure,      keyword_ensure},      EXPR_BEG},
-#line 25 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"end",          {keyword_end,         keyword_end},         EXPR_END},
-#line 42 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"then",         {keyword_then,        keyword_then},        EXPR_BEG},
-#line 34 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"not",          {keyword_not,         keyword_not},         EXPR_ARG},
-#line 27 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"false",        {keyword_false,       keyword_false},       EXPR_END},
-#line 40 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"self",         {keyword_self,        keyword_self},        EXPR_END},
-#line 24 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"elsif",        {keyword_elsif,       keyword_elsif},       EXPR_VALUE},
-#line 37 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"rescue",       {keyword_rescue,      modifier_rescue},     EXPR_MID},
-#line 43 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"true",         {keyword_true,        keyword_true},        EXPR_END},
-#line 46 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"until",        {keyword_until,       modifier_until},      EXPR_VALUE},
-#line 45 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"unless",       {keyword_unless,      modifier_unless},     EXPR_VALUE},
-#line 39 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"return",       {keyword_return,      keyword_return},      EXPR_MID},
-#line 21 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"def",          {keyword_def,         keyword_def},         EXPR_FNAME},
-#line 16 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"and",          {keyword_and,         keyword_and},         EXPR_VALUE},
-#line 22 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"do",           {keyword_do,          keyword_do},          EXPR_BEG},
-#line 49 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"yield",        {keyword_yield,       keyword_yield},       EXPR_ARG},
-#line 28 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"for",          {keyword_for,         keyword_for},         EXPR_VALUE},
-#line 44 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"undef",        {keyword_undef,       keyword_undef},       EXPR_FNAME},
-#line 35 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"or",           {keyword_or,          keyword_or},          EXPR_VALUE},
-#line 30 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"in",           {keyword_in,          keyword_in},          EXPR_VALUE},
-#line 47 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"when",         {keyword_when,        keyword_when},        EXPR_VALUE},
-#line 38 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"retry",        {keyword_retry,       keyword_retry},       EXPR_END},
-#line 29 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"if",           {keyword_if,          modifier_if},         EXPR_VALUE},
-#line 19 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"case",         {keyword_case,        keyword_case},        EXPR_VALUE},
-#line 36 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"redo",         {keyword_redo,        keyword_redo},        EXPR_END},
-#line 32 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"next",         {keyword_next,        keyword_next},        EXPR_MID},
-#line 41 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"super",        {keyword_super,       keyword_super},       EXPR_ARG},
-#line 31 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"module",       {keyword_module,      keyword_module},      EXPR_VALUE},
-#line 17 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"begin",        {keyword_begin,       keyword_begin},       EXPR_BEG},
-#line 12 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"__LINE__",     {keyword__LINE__,     keyword__LINE__},     EXPR_END},
-#line 11 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"__FILE__",     {keyword__FILE__,     keyword__FILE__},     EXPR_END},
-#line 10 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
-#line 14 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"END",          {keyword_END,         keyword_END},         EXPR_END},
-#line 15 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"alias",        {keyword_alias,       keyword_alias},       EXPR_FNAME},
-#line 13 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"BEGIN",        {keyword_BEGIN,       keyword_BEGIN},       EXPR_END},
-      {""},
-#line 20 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"class",        {keyword_class,       keyword_class},       EXPR_CLASS},
-      {""}, {""},
-#line 48 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-      {"while",        {keyword_while,       modifier_while},      EXPR_VALUE}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 50 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/node.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/node.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/node.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/node.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/*
-** node.h - nodes of abstract syntax tree
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_COMPILER_NODE_H
-#define MRUBY_COMPILER_NODE_H
-
-enum node_type {
-  NODE_METHOD,
-  NODE_FBODY,
-  NODE_CFUNC,
-  NODE_SCOPE,
-  NODE_BLOCK,
-  NODE_IF,
-  NODE_CASE,
-  NODE_WHEN,
-  NODE_OPT_N,
-  NODE_WHILE,
-  NODE_UNTIL,
-  NODE_ITER,
-  NODE_FOR,
-  NODE_BREAK,
-  NODE_NEXT,
-  NODE_REDO,
-  NODE_RETRY,
-  NODE_BEGIN,
-  NODE_RESCUE,
-  NODE_ENSURE,
-  NODE_AND,
-  NODE_OR,
-  NODE_NOT,
-  NODE_MASGN,
-  NODE_ASGN,
-  NODE_CDECL,
-  NODE_CVASGN,
-  NODE_CVDECL,
-  NODE_OP_ASGN,
-  NODE_CALL,
-  NODE_SCALL,
-  NODE_FCALL,
-  NODE_VCALL,
-  NODE_SUPER,
-  NODE_ZSUPER,
-  NODE_ARRAY,
-  NODE_ZARRAY,
-  NODE_HASH,
-  NODE_RETURN,
-  NODE_YIELD,
-  NODE_LVAR,
-  NODE_DVAR,
-  NODE_GVAR,
-  NODE_IVAR,
-  NODE_CONST,
-  NODE_CVAR,
-  NODE_NTH_REF,
-  NODE_BACK_REF,
-  NODE_MATCH,
-  NODE_MATCH2,
-  NODE_MATCH3,
-  NODE_INT,
-  NODE_FLOAT,
-  NODE_NEGATE,
-  NODE_LAMBDA,
-  NODE_SYM,
-  NODE_STR,
-  NODE_DSTR,
-  NODE_XSTR,
-  NODE_DXSTR,
-  NODE_REGX,
-  NODE_DREGX,
-  NODE_DREGX_ONCE,
-  NODE_LIST,
-  NODE_ARG,
-  NODE_ARGSCAT,
-  NODE_ARGSPUSH,
-  NODE_SPLAT,
-  NODE_TO_ARY,
-  NODE_SVALUE,
-  NODE_BLOCK_ARG,
-  NODE_DEF,
-  NODE_SDEF,
-  NODE_ALIAS,
-  NODE_UNDEF,
-  NODE_CLASS,
-  NODE_MODULE,
-  NODE_SCLASS,
-  NODE_COLON2,
-  NODE_COLON3,
-  NODE_CREF,
-  NODE_DOT2,
-  NODE_DOT3,
-  NODE_FLIP2,
-  NODE_FLIP3,
-  NODE_ATTRSET,
-  NODE_SELF,
-  NODE_NIL,
-  NODE_TRUE,
-  NODE_FALSE,
-  NODE_DEFINED,
-  NODE_NEWLINE,
-  NODE_POSTEXE,
-  NODE_ALLOCA,
-  NODE_DMETHOD,
-  NODE_BMETHOD,
-  NODE_MEMO,
-  NODE_IFUNC,
-  NODE_DSYM,
-  NODE_ATTRASGN,
-  NODE_HEREDOC,
-  NODE_LITERAL_DELIM,
-  NODE_WORDS,
-  NODE_SYMBOLS,
-  NODE_LAST
-};
-
-#endif  /* MRUBY_COMPILER_NODE_H */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/parse.y cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/parse.y
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/parse.y	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/core/parse.y	1970-01-01 00:00:00.000000000 +0000
@@ -1,6645 +0,0 @@
-/*
-** parse.y - mruby parser
-**
-** See Copyright Notice in mruby.h
-*/
-
-%{
-#undef PARSER_DEBUG
-#ifdef PARSER_DEBUG
-# define YYDEBUG 1
-#endif
-#define YYERROR_VERBOSE 1
-/*
- * Force yacc to use our memory management.  This is a little evil because
- * the macros assume that "parser_state *p" is in scope
- */
-#define YYMALLOC(n)    mrb_malloc(p->mrb, (n))
-#define YYFREE(o)      mrb_free(p->mrb, (o))
-#define YYSTACK_USE_ALLOCA 0
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/compile.h>
-#include <mruby/proc.h>
-#include <mruby/error.h>
-#include <mruby/throw.h>
-#include "node.h"
-
-#define YYLEX_PARAM p
-
-typedef mrb_ast_node node;
-typedef struct mrb_parser_state parser_state;
-typedef struct mrb_parser_heredoc_info parser_heredoc_info;
-
-static int yyparse(parser_state *p);
-static int yylex(void *lval, parser_state *p);
-static void yyerror(parser_state *p, const char *s);
-static void yywarn(parser_state *p, const char *s);
-static void yywarning(parser_state *p, const char *s);
-static void backref_error(parser_state *p, node *n);
-static void void_expr_error(parser_state *p, node *n);
-static void tokadd(parser_state *p, int32_t c);
-
-#define identchar(c) (ISALNUM(c) || (c) == '_' || !ISASCII(c))
-
-typedef unsigned int stack_type;
-
-#define BITSTACK_PUSH(stack, n) ((stack) = ((stack)<<1)|((n)&1))
-#define BITSTACK_POP(stack)     ((stack) = (stack) >> 1)
-#define BITSTACK_LEXPOP(stack)  ((stack) = ((stack) >> 1) | ((stack) & 1))
-#define BITSTACK_SET_P(stack)   ((stack)&1)
-
-#define COND_PUSH(n)    BITSTACK_PUSH(p->cond_stack, (n))
-#define COND_POP()      BITSTACK_POP(p->cond_stack)
-#define COND_LEXPOP()   BITSTACK_LEXPOP(p->cond_stack)
-#define COND_P()        BITSTACK_SET_P(p->cond_stack)
-
-#define CMDARG_PUSH(n)  BITSTACK_PUSH(p->cmdarg_stack, (n))
-#define CMDARG_POP()    BITSTACK_POP(p->cmdarg_stack)
-#define CMDARG_LEXPOP() BITSTACK_LEXPOP(p->cmdarg_stack)
-#define CMDARG_P()      BITSTACK_SET_P(p->cmdarg_stack)
-
-#define SET_LINENO(c,n) ((c)->lineno = (n))
-#define NODE_LINENO(c,n) do {\
-  if (n) {\
-     (c)->filename_index = (n)->filename_index;\
-     (c)->lineno = (n)->lineno;\
-  }\
-} while (0)
-
-#define sym(x) ((mrb_sym)(intptr_t)(x))
-#define nsym(x) ((node*)(intptr_t)(x))
-#define nint(x) ((node*)(intptr_t)(x))
-#define intn(x) ((int)(intptr_t)(x))
-
-static inline mrb_sym
-intern_cstr_gen(parser_state *p, const char *s)
-{
-  return mrb_intern_cstr(p->mrb, s);
-}
-#define intern_cstr(s) intern_cstr_gen(p,(s))
-
-static inline mrb_sym
-intern_gen(parser_state *p, const char *s, size_t len)
-{
-  return mrb_intern(p->mrb, s, len);
-}
-#define intern(s,len) intern_gen(p,(s),(len))
-
-static inline mrb_sym
-intern_gen_c(parser_state *p, const char c)
-{
-  return mrb_intern(p->mrb, &c, 1);
-}
-#define intern_c(c) intern_gen_c(p,(c))
-
-static void
-cons_free_gen(parser_state *p, node *cons)
-{
-  cons->cdr = p->cells;
-  p->cells = cons;
-}
-#define cons_free(c) cons_free_gen(p, (c))
-
-static void*
-parser_palloc(parser_state *p, size_t size)
-{
-  void *m = mrb_pool_alloc(p->pool, size);
-
-  if (!m) {
-    MRB_THROW(p->jmp);
-  }
-  return m;
-}
-
-static node*
-cons_gen(parser_state *p, node *car, node *cdr)
-{
-  node *c;
-
-  if (p->cells) {
-    c = p->cells;
-    p->cells = p->cells->cdr;
-  }
-  else {
-    c = (node *)parser_palloc(p, sizeof(mrb_ast_node));
-  }
-
-  c->car = car;
-  c->cdr = cdr;
-  c->lineno = p->lineno;
-  c->filename_index = p->current_filename_index;
-  return c;
-}
-#define cons(a,b) cons_gen(p,(a),(b))
-
-static node*
-list1_gen(parser_state *p, node *a)
-{
-  return cons(a, 0);
-}
-#define list1(a) list1_gen(p, (a))
-
-static node*
-list2_gen(parser_state *p, node *a, node *b)
-{
-  return cons(a, cons(b,0));
-}
-#define list2(a,b) list2_gen(p, (a),(b))
-
-static node*
-list3_gen(parser_state *p, node *a, node *b, node *c)
-{
-  return cons(a, cons(b, cons(c,0)));
-}
-#define list3(a,b,c) list3_gen(p, (a),(b),(c))
-
-static node*
-list4_gen(parser_state *p, node *a, node *b, node *c, node *d)
-{
-  return cons(a, cons(b, cons(c, cons(d, 0))));
-}
-#define list4(a,b,c,d) list4_gen(p, (a),(b),(c),(d))
-
-static node*
-list5_gen(parser_state *p, node *a, node *b, node *c, node *d, node *e)
-{
-  return cons(a, cons(b, cons(c, cons(d, cons(e, 0)))));
-}
-#define list5(a,b,c,d,e) list5_gen(p, (a),(b),(c),(d),(e))
-
-static node*
-list6_gen(parser_state *p, node *a, node *b, node *c, node *d, node *e, node *f)
-{
-  return cons(a, cons(b, cons(c, cons(d, cons(e, cons(f, 0))))));
-}
-#define list6(a,b,c,d,e,f) list6_gen(p, (a),(b),(c),(d),(e),(f))
-
-static node*
-append_gen(parser_state *p, node *a, node *b)
-{
-  node *c = a;
-
-  if (!a) return b;
-  while (c->cdr) {
-    c = c->cdr;
-  }
-  if (b) {
-    c->cdr = b;
-  }
-  return a;
-}
-#define append(a,b) append_gen(p,(a),(b))
-#define push(a,b) append_gen(p,(a),list1(b))
-
-static char*
-parser_strndup(parser_state *p, const char *s, size_t len)
-{
-  char *b = (char *)parser_palloc(p, len+1);
-
-  memcpy(b, s, len);
-  b[len] = '\0';
-  return b;
-}
-#undef strndup
-#define strndup(s,len) parser_strndup(p, s, len)
-
-static char*
-parser_strdup(parser_state *p, const char *s)
-{
-  return parser_strndup(p, s, strlen(s));
-}
-#undef strdup
-#define strdup(s) parser_strdup(p, s)
-
-/* xxx ----------------------------- */
-
-static node*
-local_switch(parser_state *p)
-{
-  node *prev = p->locals;
-
-  p->locals = cons(0, 0);
-  return prev;
-}
-
-static void
-local_resume(parser_state *p, node *prev)
-{
-  p->locals = prev;
-}
-
-static void
-local_nest(parser_state *p)
-{
-  p->locals = cons(0, p->locals);
-}
-
-static void
-local_unnest(parser_state *p)
-{
-  if (p->locals) {
-    p->locals = p->locals->cdr;
-  }
-}
-
-static mrb_bool
-local_var_p(parser_state *p, mrb_sym sym)
-{
-  node *l = p->locals;
-
-  while (l) {
-    node *n = l->car;
-    while (n) {
-      if (sym(n->car) == sym) return TRUE;
-      n = n->cdr;
-    }
-    l = l->cdr;
-  }
-  return FALSE;
-}
-
-static void
-local_add_f(parser_state *p, mrb_sym sym)
-{
-  if (p->locals) {
-    p->locals->car = push(p->locals->car, nsym(sym));
-  }
-}
-
-static void
-local_add(parser_state *p, mrb_sym sym)
-{
-  if (!local_var_p(p, sym)) {
-    local_add_f(p, sym);
-  }
-}
-
-static node*
-locals_node(parser_state *p)
-{
-  return p->locals ? p->locals->car : NULL;
-}
-
-/* (:scope (vars..) (prog...)) */
-static node*
-new_scope(parser_state *p, node *body)
-{
-  return cons((node*)NODE_SCOPE, cons(locals_node(p), body));
-}
-
-/* (:begin prog...) */
-static node*
-new_begin(parser_state *p, node *body)
-{
-  if (body) {
-    return list2((node*)NODE_BEGIN, body);
-  }
-  return cons((node*)NODE_BEGIN, 0);
-}
-
-#define newline_node(n) (n)
-
-/* (:rescue body rescue else) */
-static node*
-new_rescue(parser_state *p, node *body, node *resq, node *els)
-{
-  return list4((node*)NODE_RESCUE, body, resq, els);
-}
-
-static node*
-new_mod_rescue(parser_state *p, node *body, node *resq)
-{
-  return new_rescue(p, body, list1(list3(0, 0, resq)), 0);
-}
-
-/* (:ensure body ensure) */
-static node*
-new_ensure(parser_state *p, node *a, node *b)
-{
-  return cons((node*)NODE_ENSURE, cons(a, cons(0, b)));
-}
-
-/* (:nil) */
-static node*
-new_nil(parser_state *p)
-{
-  return list1((node*)NODE_NIL);
-}
-
-/* (:true) */
-static node*
-new_true(parser_state *p)
-{
-  return list1((node*)NODE_TRUE);
-}
-
-/* (:false) */
-static node*
-new_false(parser_state *p)
-{
-  return list1((node*)NODE_FALSE);
-}
-
-/* (:alias new old) */
-static node*
-new_alias(parser_state *p, mrb_sym a, mrb_sym b)
-{
-  return cons((node*)NODE_ALIAS, cons(nsym(a), nsym(b)));
-}
-
-/* (:if cond then else) */
-static node*
-new_if(parser_state *p, node *a, node *b, node *c)
-{
-  void_expr_error(p, a);
-  return list4((node*)NODE_IF, a, b, c);
-}
-
-/* (:unless cond then else) */
-static node*
-new_unless(parser_state *p, node *a, node *b, node *c)
-{
-  void_expr_error(p, a);
-  return list4((node*)NODE_IF, a, c, b);
-}
-
-/* (:while cond body) */
-static node*
-new_while(parser_state *p, node *a, node *b)
-{
-  void_expr_error(p, a);
-  return cons((node*)NODE_WHILE, cons(a, b));
-}
-
-/* (:until cond body) */
-static node*
-new_until(parser_state *p, node *a, node *b)
-{
-  void_expr_error(p, a);
-  return cons((node*)NODE_UNTIL, cons(a, b));
-}
-
-/* (:for var obj body) */
-static node*
-new_for(parser_state *p, node *v, node *o, node *b)
-{
-  void_expr_error(p, o);
-  return list4((node*)NODE_FOR, v, o, b);
-}
-
-/* (:case a ((when ...) body) ((when...) body)) */
-static node*
-new_case(parser_state *p, node *a, node *b)
-{
-  node *n = list2((node*)NODE_CASE, a);
-  node *n2 = n;
-
-  void_expr_error(p, a);
-  while (n2->cdr) {
-    n2 = n2->cdr;
-  }
-  n2->cdr = b;
-  return n;
-}
-
-/* (:postexe a) */
-static node*
-new_postexe(parser_state *p, node *a)
-{
-  return cons((node*)NODE_POSTEXE, a);
-}
-
-/* (:self) */
-static node*
-new_self(parser_state *p)
-{
-  return list1((node*)NODE_SELF);
-}
-
-/* (:call a b c) */
-static node*
-new_call(parser_state *p, node *a, mrb_sym b, node *c, int pass)
-{
-  node *n = list4(nint(pass?NODE_CALL:NODE_SCALL), a, nsym(b), c);
-  void_expr_error(p, a);
-  NODE_LINENO(n, a);
-  return n;
-}
-
-/* (:fcall self mid args) */
-static node*
-new_fcall(parser_state *p, mrb_sym b, node *c)
-{
-  node *n = new_self(p);
-  NODE_LINENO(n, c);
-  n = list4((node*)NODE_FCALL, n, nsym(b), c);
-  NODE_LINENO(n, c);
-  return n;
-}
-
-/* (:super . c) */
-static node*
-new_super(parser_state *p, node *c)
-{
-  return cons((node*)NODE_SUPER, c);
-}
-
-/* (:zsuper) */
-static node*
-new_zsuper(parser_state *p)
-{
-  return list1((node*)NODE_ZSUPER);
-}
-
-/* (:yield . c) */
-static node*
-new_yield(parser_state *p, node *c)
-{
-  if (c) {
-    if (c->cdr) {
-      yyerror(p, "both block arg and actual block given");
-    }
-    return cons((node*)NODE_YIELD, c->car);
-  }
-  return cons((node*)NODE_YIELD, 0);
-}
-
-/* (:return . c) */
-static node*
-new_return(parser_state *p, node *c)
-{
-  return cons((node*)NODE_RETURN, c);
-}
-
-/* (:break . c) */
-static node*
-new_break(parser_state *p, node *c)
-{
-  return cons((node*)NODE_BREAK, c);
-}
-
-/* (:next . c) */
-static node*
-new_next(parser_state *p, node *c)
-{
-  return cons((node*)NODE_NEXT, c);
-}
-
-/* (:redo) */
-static node*
-new_redo(parser_state *p)
-{
-  return list1((node*)NODE_REDO);
-}
-
-/* (:retry) */
-static node*
-new_retry(parser_state *p)
-{
-  return list1((node*)NODE_RETRY);
-}
-
-/* (:dot2 a b) */
-static node*
-new_dot2(parser_state *p, node *a, node *b)
-{
-  return cons((node*)NODE_DOT2, cons(a, b));
-}
-
-/* (:dot3 a b) */
-static node*
-new_dot3(parser_state *p, node *a, node *b)
-{
-  return cons((node*)NODE_DOT3, cons(a, b));
-}
-
-/* (:colon2 b c) */
-static node*
-new_colon2(parser_state *p, node *b, mrb_sym c)
-{
-  void_expr_error(p, b);
-  return cons((node*)NODE_COLON2, cons(b, nsym(c)));
-}
-
-/* (:colon3 . c) */
-static node*
-new_colon3(parser_state *p, mrb_sym c)
-{
-  return cons((node*)NODE_COLON3, nsym(c));
-}
-
-/* (:and a b) */
-static node*
-new_and(parser_state *p, node *a, node *b)
-{
-  return cons((node*)NODE_AND, cons(a, b));
-}
-
-/* (:or a b) */
-static node*
-new_or(parser_state *p, node *a, node *b)
-{
-  return cons((node*)NODE_OR, cons(a, b));
-}
-
-/* (:array a...) */
-static node*
-new_array(parser_state *p, node *a)
-{
-  return cons((node*)NODE_ARRAY, a);
-}
-
-/* (:splat . a) */
-static node*
-new_splat(parser_state *p, node *a)
-{
-  return cons((node*)NODE_SPLAT, a);
-}
-
-/* (:hash (k . v) (k . v)...) */
-static node*
-new_hash(parser_state *p, node *a)
-{
-  return cons((node*)NODE_HASH, a);
-}
-
-/* (:sym . a) */
-static node*
-new_sym(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_SYM, nsym(sym));
-}
-
-static mrb_sym
-new_strsym(parser_state *p, node* str)
-{
-  const char *s = (const char*)str->cdr->car;
-  size_t len = (size_t)str->cdr->cdr;
-
-  return mrb_intern(p->mrb, s, len);
-}
-
-/* (:lvar . a) */
-static node*
-new_lvar(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_LVAR, nsym(sym));
-}
-
-/* (:gvar . a) */
-static node*
-new_gvar(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_GVAR, nsym(sym));
-}
-
-/* (:ivar . a) */
-static node*
-new_ivar(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_IVAR, nsym(sym));
-}
-
-/* (:cvar . a) */
-static node*
-new_cvar(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_CVAR, nsym(sym));
-}
-
-/* (:const . a) */
-static node*
-new_const(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_CONST, nsym(sym));
-}
-
-/* (:undef a...) */
-static node*
-new_undef(parser_state *p, mrb_sym sym)
-{
-  return list2((node*)NODE_UNDEF, nsym(sym));
-}
-
-/* (:class class super body) */
-static node*
-new_class(parser_state *p, node *c, node *s, node *b)
-{
-  void_expr_error(p, s);
-  return list4((node*)NODE_CLASS, c, s, cons(locals_node(p), b));
-}
-
-/* (:sclass obj body) */
-static node*
-new_sclass(parser_state *p, node *o, node *b)
-{
-  void_expr_error(p, o);
-  return list3((node*)NODE_SCLASS, o, cons(locals_node(p), b));
-}
-
-/* (:module module body) */
-static node*
-new_module(parser_state *p, node *m, node *b)
-{
-  return list3((node*)NODE_MODULE, m, cons(locals_node(p), b));
-}
-
-/* (:def m lv (arg . body)) */
-static node*
-new_def(parser_state *p, mrb_sym m, node *a, node *b)
-{
-  return list5((node*)NODE_DEF, nsym(m), locals_node(p), a, b);
-}
-
-/* (:sdef obj m lv (arg . body)) */
-static node*
-new_sdef(parser_state *p, node *o, mrb_sym m, node *a, node *b)
-{
-  void_expr_error(p, o);
-  return list6((node*)NODE_SDEF, o, nsym(m), locals_node(p), a, b);
-}
-
-/* (:arg . sym) */
-static node*
-new_arg(parser_state *p, mrb_sym sym)
-{
-  return cons((node*)NODE_ARG, nsym(sym));
-}
-
-/* (m o r m2 b) */
-/* m: (a b c) */
-/* o: ((a . e1) (b . e2)) */
-/* r: a */
-/* m2: (a b c) */
-/* b: a */
-static node*
-new_args(parser_state *p, node *m, node *opt, mrb_sym rest, node *m2, mrb_sym blk)
-{
-  node *n;
-
-  n = cons(m2, nsym(blk));
-  n = cons(nsym(rest), n);
-  n = cons(opt, n);
-  return cons(m, n);
-}
-
-/* (:block_arg . a) */
-static node*
-new_block_arg(parser_state *p, node *a)
-{
-  return cons((node*)NODE_BLOCK_ARG, a);
-}
-
-/* (:block arg body) */
-static node*
-new_block(parser_state *p, node *a, node *b)
-{
-  return list4((node*)NODE_BLOCK, locals_node(p), a, b);
-}
-
-/* (:lambda arg body) */
-static node*
-new_lambda(parser_state *p, node *a, node *b)
-{
-  return list4((node*)NODE_LAMBDA, locals_node(p), a, b);
-}
-
-/* (:asgn lhs rhs) */
-static node*
-new_asgn(parser_state *p, node *a, node *b)
-{
-  void_expr_error(p, b);
-  return cons((node*)NODE_ASGN, cons(a, b));
-}
-
-/* (:masgn mlhs=(pre rest post)  mrhs) */
-static node*
-new_masgn(parser_state *p, node *a, node *b)
-{
-  void_expr_error(p, b);
-  return cons((node*)NODE_MASGN, cons(a, b));
-}
-
-/* (:asgn lhs rhs) */
-static node*
-new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b)
-{
-  void_expr_error(p, b);
-  return list4((node*)NODE_OP_ASGN, a, nsym(op), b);
-}
-
-/* (:int . i) */
-static node*
-new_int(parser_state *p, const char *s, int base)
-{
-  return list3((node*)NODE_INT, (node*)strdup(s), nint(base));
-}
-
-/* (:float . i) */
-static node*
-new_float(parser_state *p, const char *s)
-{
-  return cons((node*)NODE_FLOAT, (node*)strdup(s));
-}
-
-/* (:str . (s . len)) */
-static node*
-new_str(parser_state *p, const char *s, int len)
-{
-  return cons((node*)NODE_STR, cons((node*)strndup(s, len), nint(len)));
-}
-
-/* (:dstr . a) */
-static node*
-new_dstr(parser_state *p, node *a)
-{
-  return cons((node*)NODE_DSTR, a);
-}
-
-/* (:str . (s . len)) */
-static node*
-new_xstr(parser_state *p, const char *s, int len)
-{
-  return cons((node*)NODE_XSTR, cons((node*)strndup(s, len), nint(len)));
-}
-
-/* (:xstr . a) */
-static node*
-new_dxstr(parser_state *p, node *a)
-{
-  return cons((node*)NODE_DXSTR, a);
-}
-
-/* (:dsym . a) */
-static node*
-new_dsym(parser_state *p, node *a)
-{
-  return cons((node*)NODE_DSYM, new_dstr(p, a));
-}
-
-/* (:regx . (s . (opt . enc))) */
-static node*
-new_regx(parser_state *p, const char *p1, const char* p2, const char* p3)
-{
-  return cons((node*)NODE_REGX, cons((node*)p1, cons((node*)p2, (node*)p3)));
-}
-
-/* (:dregx . (a . b)) */
-static node*
-new_dregx(parser_state *p, node *a, node *b)
-{
-  return cons((node*)NODE_DREGX, cons(a, b));
-}
-
-/* (:backref . n) */
-static node*
-new_back_ref(parser_state *p, int n)
-{
-  return cons((node*)NODE_BACK_REF, nint(n));
-}
-
-/* (:nthref . n) */
-static node*
-new_nth_ref(parser_state *p, int n)
-{
-  return cons((node*)NODE_NTH_REF, nint(n));
-}
-
-/* (:heredoc . a) */
-static node*
-new_heredoc(parser_state *p)
-{
-  parser_heredoc_info *inf = (parser_heredoc_info *)parser_palloc(p, sizeof(parser_heredoc_info));
-  return cons((node*)NODE_HEREDOC, (node*)inf);
-}
-
-static void
-new_bv(parser_state *p, mrb_sym id)
-{
-}
-
-static node*
-new_literal_delim(parser_state *p)
-{
-  return cons((node*)NODE_LITERAL_DELIM, 0);
-}
-
-/* (:words . a) */
-static node*
-new_words(parser_state *p, node *a)
-{
-  return cons((node*)NODE_WORDS, a);
-}
-
-/* (:symbols . a) */
-static node*
-new_symbols(parser_state *p, node *a)
-{
-  return cons((node*)NODE_SYMBOLS, a);
-}
-
-/* xxx ----------------------------- */
-
-/* (:call a op) */
-static node*
-call_uni_op(parser_state *p, node *recv, const char *m)
-{
-  void_expr_error(p, recv);
-  return new_call(p, recv, intern_cstr(m), 0, 1);
-}
-
-/* (:call a op b) */
-static node*
-call_bin_op(parser_state *p, node *recv, const char *m, node *arg1)
-{
-  return new_call(p, recv, intern_cstr(m), list1(list1(arg1)), 1);
-}
-
-static void
-args_with_block(parser_state *p, node *a, node *b)
-{
-  if (b) {
-    if (a->cdr) {
-      yyerror(p, "both block arg and actual block given");
-    }
-    a->cdr = b;
-  }
-}
-
-static void
-call_with_block(parser_state *p, node *a, node *b)
-{
-  node *n;
-
-  switch ((enum node_type)intn(a->car)) {
-  case NODE_SUPER:
-  case NODE_ZSUPER:
-    if (!a->cdr) a->cdr = cons(0, b);
-    else {
-      args_with_block(p, a->cdr, b);
-    }
-    break;
-  case NODE_CALL:
-  case NODE_FCALL:
-  case NODE_SCALL:
-    n = a->cdr->cdr->cdr;
-    if (!n->car) n->car = cons(0, b);
-    else {
-      args_with_block(p, n->car, b);
-    }
-    break;
-  default:
-    break;
-  }
-}
-
-static node*
-negate_lit(parser_state *p, node *n)
-{
-  return cons((node*)NODE_NEGATE, n);
-}
-
-static node*
-cond(node *n)
-{
-  return n;
-}
-
-static node*
-ret_args(parser_state *p, node *n)
-{
-  if (n->cdr) {
-    yyerror(p, "block argument should not be given");
-    return NULL;
-  }
-  if (!n->car->cdr) return n->car->car;
-  return new_array(p, n->car);
-}
-
-static void
-assignable(parser_state *p, node *lhs)
-{
-  if (intn(lhs->car) == NODE_LVAR) {
-    local_add(p, sym(lhs->cdr));
-  }
-}
-
-static node*
-var_reference(parser_state *p, node *lhs)
-{
-  node *n;
-
-  if (intn(lhs->car) == NODE_LVAR) {
-    if (!local_var_p(p, sym(lhs->cdr))) {
-      n = new_fcall(p, sym(lhs->cdr), 0);
-      cons_free(lhs);
-      return n;
-    }
-  }
-
-  return lhs;
-}
-
-typedef enum mrb_string_type  string_type;
-
-static node*
-new_strterm(parser_state *p, string_type type, int term, int paren)
-{
-  return cons(nint(type), cons((node*)0, cons(nint(paren), nint(term))));
-}
-
-static void
-end_strterm(parser_state *p)
-{
-  cons_free(p->lex_strterm->cdr->cdr);
-  cons_free(p->lex_strterm->cdr);
-  cons_free(p->lex_strterm);
-  p->lex_strterm = NULL;
-}
-
-static parser_heredoc_info *
-parsing_heredoc_inf(parser_state *p)
-{
-  node *nd = p->parsing_heredoc;
-  if (nd == NULL)
-    return NULL;
-  /* mrb_assert(nd->car->car == NODE_HEREDOC); */
-  return (parser_heredoc_info*)nd->car->cdr;
-}
-
-static void
-heredoc_treat_nextline(parser_state *p)
-{
-  if (p->heredocs_from_nextline == NULL)
-    return;
-  if (p->parsing_heredoc == NULL) {
-    node *n;
-    p->parsing_heredoc = p->heredocs_from_nextline;
-    p->lex_strterm_before_heredoc = p->lex_strterm;
-    p->lex_strterm = new_strterm(p, parsing_heredoc_inf(p)->type, 0, 0);
-    n = p->all_heredocs;
-    if (n) {
-      while (n->cdr)
-        n = n->cdr;
-      n->cdr = p->parsing_heredoc;
-    }
-    else {
-      p->all_heredocs = p->parsing_heredoc;
-    }
-  }
-  else {
-    node *n, *m;
-    m = p->heredocs_from_nextline;
-    while (m->cdr)
-      m = m->cdr;
-    n = p->all_heredocs;
-    mrb_assert(n != NULL);
-    if (n == p->parsing_heredoc) {
-      m->cdr = n;
-      p->all_heredocs = p->heredocs_from_nextline;
-      p->parsing_heredoc = p->heredocs_from_nextline;
-    }
-    else {
-      while (n->cdr != p->parsing_heredoc) {
-        n = n->cdr;
-        mrb_assert(n != NULL);
-      }
-      m->cdr = n->cdr;
-      n->cdr = p->heredocs_from_nextline;
-      p->parsing_heredoc = p->heredocs_from_nextline;
-    }
-  }
-  p->heredocs_from_nextline = NULL;
-}
-
-static void
-heredoc_end(parser_state *p)
-{
-  p->parsing_heredoc = p->parsing_heredoc->cdr;
-  if (p->parsing_heredoc == NULL) {
-    p->lstate = EXPR_BEG;
-    p->cmd_start = TRUE;
-    end_strterm(p);
-    p->lex_strterm = p->lex_strterm_before_heredoc;
-    p->lex_strterm_before_heredoc = NULL;
-    p->heredoc_end_now = TRUE;
-  }
-  else {
-    /* next heredoc */
-    p->lex_strterm->car = nint(parsing_heredoc_inf(p)->type);
-  }
-}
-#define is_strterm_type(p,str_func) (intn((p)->lex_strterm->car) & (str_func))
-
-/* xxx ----------------------------- */
-
-%}
-
-%pure-parser
-%parse-param {parser_state *p}
-%lex-param {parser_state *p}
-
-%union {
-    node *nd;
-    mrb_sym id;
-    int num;
-    stack_type stack;
-    const struct vtable *vars;
-}
-
-%token <num>
-        keyword_class
-        keyword_module
-        keyword_def
-        keyword_begin
-        keyword_if
-        keyword_unless
-        keyword_while
-        keyword_until
-        keyword_for
-
-%token
-        keyword_undef
-        keyword_rescue
-        keyword_ensure
-        keyword_end
-        keyword_then
-        keyword_elsif
-        keyword_else
-        keyword_case
-        keyword_when
-        keyword_break
-        keyword_next
-        keyword_redo
-        keyword_retry
-        keyword_in
-        keyword_do
-        keyword_do_cond
-        keyword_do_block
-        keyword_do_LAMBDA
-        keyword_return
-        keyword_yield
-        keyword_super
-        keyword_self
-        keyword_nil
-        keyword_true
-        keyword_false
-        keyword_and
-        keyword_or
-        keyword_not
-        modifier_if
-        modifier_unless
-        modifier_while
-        modifier_until
-        modifier_rescue
-        keyword_alias
-        keyword_BEGIN
-        keyword_END
-        keyword__LINE__
-        keyword__FILE__
-        keyword__ENCODING__
-
-%token <id>  tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR tLABEL
-%token <nd>  tINTEGER tFLOAT tCHAR tXSTRING tREGEXP
-%token <nd>  tSTRING tSTRING_PART tSTRING_MID tLABEL_END
-%token <nd>  tNTH_REF tBACK_REF
-%token <num> tREGEXP_END
-
-%type <nd> singleton string string_rep string_interp xstring regexp
-%type <nd> literal numeric cpath symbol
-%type <nd> top_compstmt top_stmts top_stmt
-%type <nd> bodystmt compstmt stmts stmt expr arg primary command command_call method_call
-%type <nd> expr_value arg_rhs primary_value
-%type <nd> if_tail opt_else case_body cases opt_rescue exc_list exc_var opt_ensure
-%type <nd> args call_args opt_call_args
-%type <nd> paren_args opt_paren_args variable
-%type <nd> command_args aref_args opt_block_arg block_arg var_ref var_lhs
-%type <nd> command_asgn command_rhs mrhs superclass block_call block_command
-%type <nd> f_block_optarg f_block_opt
-%type <nd> f_arglist f_args f_arg f_arg_item f_optarg f_marg f_marg_list f_margs
-%type <nd> assoc_list assocs assoc undef_list backref for_var
-%type <nd> block_param opt_block_param block_param_def f_opt
-%type <nd> bv_decls opt_bv_decl bvar f_larglist lambda_body
-%type <nd> brace_block cmd_brace_block do_block lhs none f_bad_arg
-%type <nd> mlhs mlhs_list mlhs_post mlhs_basic mlhs_item mlhs_node mlhs_inner
-%type <id> fsym sym basic_symbol operation operation2 operation3
-%type <id> cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_opt_asgn
-%type <nd> heredoc words symbols
-%type <num> call_op call_op2     /* 0:'&.', 1:'.', 2:'::' */
-
-%token tUPLUS             /* unary+ */
-%token tUMINUS            /* unary- */
-%token tPOW               /* ** */
-%token tCMP               /* <=> */
-%token tEQ                /* == */
-%token tEQQ               /* === */
-%token tNEQ               /* != */
-%token tGEQ               /* >= */
-%token tLEQ               /* <= */
-%token tANDOP tOROP       /* && and || */
-%token tMATCH tNMATCH     /* =~ and !~ */
-%token tDOT2 tDOT3        /* .. and ... */
-%token tAREF tASET        /* [] and []= */
-%token tLSHFT tRSHFT      /* << and >> */
-%token tCOLON2            /* :: */
-%token tCOLON3            /* :: at EXPR_BEG */
-%token <id> tOP_ASGN      /* +=, -=  etc. */
-%token tASSOC             /* => */
-%token tLPAREN            /* ( */
-%token tLPAREN_ARG        /* ( */
-%token tRPAREN            /* ) */
-%token tLBRACK            /* [ */
-%token tLBRACE            /* { */
-%token tLBRACE_ARG        /* { */
-%token tSTAR              /* * */
-%token tAMPER             /* & */
-%token tLAMBDA            /* -> */
-%token tANDDOT            /* &. */
-%token tSYMBEG tREGEXP_BEG tWORDS_BEG tSYMBOLS_BEG
-%token tSTRING_BEG tXSTRING_BEG tSTRING_DVAR tLAMBEG
-%token <nd> tHEREDOC_BEG  /* <<, <<- */
-%token tHEREDOC_END tLITERAL_DELIM tHD_LITERAL_DELIM
-%token <nd> tHD_STRING_PART tHD_STRING_MID
-
-/*
- * precedence table
- */
-
-%nonassoc tLOWEST
-%nonassoc tLBRACE_ARG
-
-%nonassoc  modifier_if modifier_unless modifier_while modifier_until
-%left  keyword_or keyword_and
-%right keyword_not
-%right '=' tOP_ASGN
-%left modifier_rescue
-%right '?' ':'
-%nonassoc tDOT2 tDOT3
-%left  tOROP
-%left  tANDOP
-%nonassoc  tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
-%left  '>' tGEQ '<' tLEQ
-%left  '|' '^'
-%left  '&'
-%left  tLSHFT tRSHFT
-%left  '+' '-'
-%left  '*' '/' '%'
-%right tUMINUS_NUM tUMINUS
-%right tPOW
-%right '!' '~' tUPLUS
-
-%token tLAST_TOKEN
-
-%%
-program         :   {
-                      p->lstate = EXPR_BEG;
-                      if (!p->locals) p->locals = cons(0,0);
-                    }
-                  top_compstmt
-                    {
-                      p->tree = new_scope(p, $2);
-                      NODE_LINENO(p->tree, $2);
-                    }
-                ;
-
-top_compstmt    : top_stmts opt_terms
-                    {
-                      $$ = $1;
-                    }
-                ;
-
-top_stmts       : none
-                    {
-                      $$ = new_begin(p, 0);
-                    }
-                | top_stmt
-                    {
-                      $$ = new_begin(p, $1);
-                      NODE_LINENO($$, $1);
-                    }
-                | top_stmts terms top_stmt
-                    {
-                      $$ = push($1, newline_node($3));
-                    }
-                | error top_stmt
-                    {
-                      $$ = new_begin(p, 0);
-                    }
-                ;
-
-top_stmt        : stmt
-                | keyword_BEGIN
-                    {
-                      $<nd>$ = local_switch(p);
-                    }
-                  '{' top_compstmt '}'
-                    {
-                      yyerror(p, "BEGIN not supported");
-                      local_resume(p, $<nd>2);
-                      $$ = 0;
-                    }
-                ;
-
-bodystmt        : compstmt
-                  opt_rescue
-                  opt_else
-                  opt_ensure
-                    {
-                      if ($2) {
-                        $$ = new_rescue(p, $1, $2, $3);
-                        NODE_LINENO($$, $1);
-                      }
-                      else if ($3) {
-                        yywarn(p, "else without rescue is useless");
-                        $$ = push($1, $3);
-                      }
-                      else {
-                        $$ = $1;
-                      }
-                      if ($4) {
-                        if ($$) {
-                          $$ = new_ensure(p, $$, $4);
-                        }
-                        else {
-                          $$ = push($4, new_nil(p));
-                        }
-                      }
-                    }
-                ;
-
-compstmt        : stmts opt_terms
-                    {
-                      $$ = $1;
-                    }
-                ;
-
-stmts           : none
-                    {
-                      $$ = new_begin(p, 0);
-                    }
-                | stmt
-                    {
-                      $$ = new_begin(p, $1);
-                      NODE_LINENO($$, $1);
-                    }
-                | stmts terms stmt
-                    {
-                      $$ = push($1, newline_node($3));
-                    }
-                | error stmt
-                    {
-                      $$ = new_begin(p, $2);
-                    }
-                ;
-
-stmt            : keyword_alias fsym {p->lstate = EXPR_FNAME;} fsym
-                    {
-                      $$ = new_alias(p, $2, $4);
-                    }
-                | keyword_undef undef_list
-                    {
-                      $$ = $2;
-                    }
-                | stmt modifier_if expr_value
-                    {
-                      $$ = new_if(p, cond($3), $1, 0);
-                    }
-                | stmt modifier_unless expr_value
-                    {
-                      $$ = new_unless(p, cond($3), $1, 0);
-                    }
-                | stmt modifier_while expr_value
-                    {
-                      $$ = new_while(p, cond($3), $1);
-                    }
-                | stmt modifier_until expr_value
-                    {
-                      $$ = new_until(p, cond($3), $1);
-                    }
-                | stmt modifier_rescue stmt
-                    {
-                      $$ = new_mod_rescue(p, $1, $3);
-                    }
-                | keyword_END '{' compstmt '}'
-                    {
-                      yyerror(p, "END not supported");
-                      $$ = new_postexe(p, $3);
-                    }
-                | command_asgn
-                | mlhs '=' command_call
-                    {
-                      $$ = new_masgn(p, $1, $3);
-                    }
-                | lhs '=' mrhs
-                    {
-                      $$ = new_asgn(p, $1, new_array(p, $3));
-                    }
-                | mlhs '=' arg
-                    {
-                      $$ = new_masgn(p, $1, $3);
-                    }
-                | mlhs '=' mrhs
-                    {
-                      $$ = new_masgn(p, $1, new_array(p, $3));
-                    }
-                | expr
-                ;
-
-command_asgn    : lhs '=' command_rhs
-                    {
-                      $$ = new_asgn(p, $1, $3);
-                    }
-                | var_lhs tOP_ASGN command_rhs
-                    {
-                      $$ = new_op_asgn(p, $1, $2, $3);
-                    }
-                | primary_value '[' opt_call_args rbracket tOP_ASGN command_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, intern("[]",2), $3, '.'), $5, $6);
-                    }
-                | primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, $3, 0, $2), $4, $5);
-                    }
-                | primary_value call_op tCONSTANT tOP_ASGN command_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, $3, 0, $2), $4, $5);
-                    }
-                | primary_value tCOLON2 tCONSTANT tOP_ASGN command_call
-                    {
-                      yyerror(p, "constant re-assignment");
-                      $$ = 0;
-                    }
-                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, $3, 0, tCOLON2), $4, $5);
-                    }
-                | backref tOP_ASGN command_rhs
-                    {
-                      backref_error(p, $1);
-                      $$ = new_begin(p, 0);
-                    }
-		;
-
-command_rhs     : command_call   %prec tOP_ASGN
-                | command_call modifier_rescue stmt
-                    {
-                      $$ = new_mod_rescue(p, $1, $3);
-                    }
-                | command_asgn
-                ;
-
-
-expr            : command_call
-                | expr keyword_and expr
-                    {
-                      $$ = new_and(p, $1, $3);
-                    }
-                | expr keyword_or expr
-                    {
-                      $$ = new_or(p, $1, $3);
-                    }
-                | keyword_not opt_nl expr
-                    {
-                      $$ = call_uni_op(p, cond($3), "!");
-                    }
-                | '!' command_call
-                    {
-                      $$ = call_uni_op(p, cond($2), "!");
-                    }
-                | arg
-                ;
-
-expr_value      : expr
-                    {
-                      if (!$1) $$ = new_nil(p);
-                      else {
-                        $$ = $1;
-                      }
-                    }
-                ;
-
-command_call    : command
-                | block_command
-                ;
-
-block_command   : block_call
-                | block_call call_op2 operation2 command_args
-                    {
-                      $$ = new_call(p, $1, $3, $4, $2);
-                    }
-                ;
-
-cmd_brace_block : tLBRACE_ARG
-                    {
-                      local_nest(p);
-                    }
-                  opt_block_param
-                  compstmt
-                  '}'
-                    {
-                      $$ = new_block(p, $3, $4);
-                      local_unnest(p);
-                    }
-                ;
-
-command         : operation command_args       %prec tLOWEST
-                    {
-                      $$ = new_fcall(p, $1, $2);
-                    }
-                | operation command_args cmd_brace_block
-                    {
-                      args_with_block(p, $2, $3);
-                      $$ = new_fcall(p, $1, $2);
-                    }
-                | primary_value call_op operation2 command_args     %prec tLOWEST
-                    {
-                      $$ = new_call(p, $1, $3, $4, $2);
-                    }
-                | primary_value call_op operation2 command_args cmd_brace_block
-                    {
-                      args_with_block(p, $4, $5);
-                      $$ = new_call(p, $1, $3, $4, $2);
-                   }
-                | primary_value tCOLON2 operation2 command_args %prec tLOWEST
-                    {
-                      $$ = new_call(p, $1, $3, $4, tCOLON2);
-                    }
-                | primary_value tCOLON2 operation2 command_args cmd_brace_block
-                    {
-                      args_with_block(p, $4, $5);
-                      $$ = new_call(p, $1, $3, $4, tCOLON2);
-                    }
-                | keyword_super command_args
-                    {
-                      $$ = new_super(p, $2);
-                    }
-                | keyword_yield command_args
-                    {
-                      $$ = new_yield(p, $2);
-                    }
-                | keyword_return call_args
-                    {
-                      $$ = new_return(p, ret_args(p, $2));
-                    }
-                | keyword_break call_args
-                    {
-                      $$ = new_break(p, ret_args(p, $2));
-                    }
-                | keyword_next call_args
-                    {
-                      $$ = new_next(p, ret_args(p, $2));
-                    }
-                ;
-
-mlhs            : mlhs_basic
-                    {
-                      $$ = $1;
-                    }
-                | tLPAREN mlhs_inner rparen
-                    {
-                      $$ = $2;
-                    }
-                ;
-
-mlhs_inner      : mlhs_basic
-                | tLPAREN mlhs_inner rparen
-                    {
-                      $$ = $2;
-                    }
-                ;
-
-mlhs_basic      : mlhs_list
-                    {
-                      $$ = list1($1);
-                    }
-                | mlhs_list mlhs_item
-                    {
-                      $$ = list1(push($1,$2));
-                    }
-                | mlhs_list tSTAR mlhs_node
-                    {
-                      $$ = list2($1, $3);
-                    }
-                | mlhs_list tSTAR mlhs_node ',' mlhs_post
-                    {
-                      $$ = list3($1, $3, $5);
-                    }
-                | mlhs_list tSTAR
-                    {
-                      $$ = list2($1, new_nil(p));
-                    }
-                | mlhs_list tSTAR ',' mlhs_post
-                    {
-                      $$ = list3($1, new_nil(p), $4);
-                    }
-                | tSTAR mlhs_node
-                    {
-                      $$ = list2(0, $2);
-                    }
-                | tSTAR mlhs_node ',' mlhs_post
-                    {
-                      $$ = list3(0, $2, $4);
-                    }
-                | tSTAR
-                    {
-                      $$ = list2(0, new_nil(p));
-                    }
-                | tSTAR ',' mlhs_post
-                    {
-                      $$ = list3(0, new_nil(p), $3);
-                    }
-                ;
-
-mlhs_item       : mlhs_node
-                | tLPAREN mlhs_inner rparen
-                    {
-                      $$ = new_masgn(p, $2, NULL);
-                    }
-                ;
-
-mlhs_list       : mlhs_item ','
-                    {
-                      $$ = list1($1);
-                    }
-                | mlhs_list mlhs_item ','
-                    {
-                      $$ = push($1, $2);
-                    }
-                ;
-
-mlhs_post       : mlhs_item
-                    {
-                      $$ = list1($1);
-                    }
-                | mlhs_list mlhs_item
-                    {
-                      $$ = push($1, $2);
-                    }
-                ;
-
-mlhs_node       : variable
-                    {
-                      assignable(p, $1);
-                    }
-                | primary_value '[' opt_call_args rbracket
-                    {
-                      $$ = new_call(p, $1, intern("[]",2), $3, '.');
-                    }
-                | primary_value call_op tIDENTIFIER
-                    {
-                      $$ = new_call(p, $1, $3, 0, $2);
-                    }
-                | primary_value tCOLON2 tIDENTIFIER
-                    {
-                      $$ = new_call(p, $1, $3, 0, tCOLON2);
-                    }
-                | primary_value call_op tCONSTANT
-                    {
-                      $$ = new_call(p, $1, $3, 0, $2);
-                    }
-                | primary_value tCOLON2 tCONSTANT
-                    {
-                      if (p->in_def || p->in_single)
-                        yyerror(p, "dynamic constant assignment");
-                      $$ = new_colon2(p, $1, $3);
-                    }
-                | tCOLON3 tCONSTANT
-                    {
-                      if (p->in_def || p->in_single)
-                        yyerror(p, "dynamic constant assignment");
-                      $$ = new_colon3(p, $2);
-                    }
-                | backref
-                    {
-                      backref_error(p, $1);
-                      $$ = 0;
-                    }
-                ;
-
-lhs             : variable
-                    {
-                      assignable(p, $1);
-                    }
-                | primary_value '[' opt_call_args rbracket
-                    {
-                      $$ = new_call(p, $1, intern("[]",2), $3, '.');
-                    }
-                | primary_value call_op tIDENTIFIER
-                    {
-                      $$ = new_call(p, $1, $3, 0, $2);
-                    }
-                | primary_value tCOLON2 tIDENTIFIER
-                    {
-                      $$ = new_call(p, $1, $3, 0, tCOLON2);
-                    }
-                | primary_value call_op tCONSTANT
-                    {
-                      $$ = new_call(p, $1, $3, 0, $2);
-                    }
-                | primary_value tCOLON2 tCONSTANT
-                    {
-                      if (p->in_def || p->in_single)
-                        yyerror(p, "dynamic constant assignment");
-                      $$ = new_colon2(p, $1, $3);
-                    }
-                | tCOLON3 tCONSTANT
-                    {
-                      if (p->in_def || p->in_single)
-                        yyerror(p, "dynamic constant assignment");
-                      $$ = new_colon3(p, $2);
-                    }
-                | backref
-                    {
-                      backref_error(p, $1);
-                      $$ = 0;
-                    }
-                ;
-
-cname           : tIDENTIFIER
-                    {
-                      yyerror(p, "class/module name must be CONSTANT");
-                    }
-                | tCONSTANT
-                ;
-
-cpath           : tCOLON3 cname
-                    {
-                      $$ = cons((node*)1, nsym($2));
-                    }
-                | cname
-                    {
-                      $$ = cons((node*)0, nsym($1));
-                    }
-                | primary_value tCOLON2 cname
-                    {
-                      void_expr_error(p, $1);
-                      $$ = cons($1, nsym($3));
-                    }
-                ;
-
-fname           : tIDENTIFIER
-                | tCONSTANT
-                | tFID
-                | op
-                    {
-                      p->lstate = EXPR_ENDFN;
-                      $$ = $1;
-                    }
-                | reswords
-                    {
-                      p->lstate = EXPR_ENDFN;
-                      $$ = $<id>1;
-                    }
-                ;
-
-fsym            : fname
-                | basic_symbol
-                ;
-
-undef_list      : fsym
-                    {
-                      $$ = new_undef(p, $1);
-                    }
-                | undef_list ',' {p->lstate = EXPR_FNAME;} fsym
-                    {
-                      $$ = push($1, nsym($4));
-                    }
-                ;
-
-op              : '|'           { $$ = intern_c('|');   }
-                | '^'           { $$ = intern_c('^');   }
-                | '&'           { $$ = intern_c('&');   }
-                | tCMP          { $$ = intern("<=>",3); }
-                | tEQ           { $$ = intern("==",2);  }
-                | tEQQ          { $$ = intern("===",3); }
-                | tMATCH        { $$ = intern("=~",2);  }
-                | tNMATCH       { $$ = intern("!~",2);  }
-                | '>'           { $$ = intern_c('>');   }
-                | tGEQ          { $$ = intern(">=",2);  }
-                | '<'           { $$ = intern_c('<');   }
-                | tLEQ          { $$ = intern("<=",2);  }
-                | tNEQ          { $$ = intern("!=",2);  }
-                | tLSHFT        { $$ = intern("<<",2);  }
-                | tRSHFT        { $$ = intern(">>",2);  }
-                | '+'           { $$ = intern_c('+');   }
-                | '-'           { $$ = intern_c('-');   }
-                | '*'           { $$ = intern_c('*');   }
-                | tSTAR         { $$ = intern_c('*');   }
-                | '/'           { $$ = intern_c('/');   }
-                | '%'           { $$ = intern_c('%');   }
-                | tPOW          { $$ = intern("**",2);  }
-                | '!'           { $$ = intern_c('!');   }
-                | '~'           { $$ = intern_c('~');   }
-                | tUPLUS        { $$ = intern("+@",2);  }
-                | tUMINUS       { $$ = intern("-@",2);  }
-                | tAREF         { $$ = intern("[]",2);  }
-                | tASET         { $$ = intern("[]=",3); }
-                | '`'           { $$ = intern_c('`');   }
-                ;
-
-reswords        : keyword__LINE__ | keyword__FILE__ | keyword__ENCODING__
-                | keyword_BEGIN | keyword_END
-                | keyword_alias | keyword_and | keyword_begin
-                | keyword_break | keyword_case | keyword_class | keyword_def
-                | keyword_do | keyword_else | keyword_elsif
-                | keyword_end | keyword_ensure | keyword_false
-                | keyword_for | keyword_in | keyword_module | keyword_next
-                | keyword_nil | keyword_not | keyword_or | keyword_redo
-                | keyword_rescue | keyword_retry | keyword_return | keyword_self
-                | keyword_super | keyword_then | keyword_true | keyword_undef
-                | keyword_when | keyword_yield | keyword_if | keyword_unless
-                | keyword_while | keyword_until
-                ;
-
-arg             : lhs '=' arg_rhs
-                    {
-                      $$ = new_asgn(p, $1, $3);
-                    }
-                | var_lhs tOP_ASGN arg_rhs
-                    {
-                      $$ = new_op_asgn(p, $1, $2, $3);
-                    }
-                | primary_value '[' opt_call_args rbracket tOP_ASGN arg_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, intern("[]",2), $3, '.'), $5, $6);
-                    }
-                | primary_value call_op tIDENTIFIER tOP_ASGN arg_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, $3, 0, $2), $4, $5);
-                    }
-                | primary_value call_op tCONSTANT tOP_ASGN arg_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, $3, 0, $2), $4, $5);
-                    }
-                | primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg_rhs
-                    {
-                      $$ = new_op_asgn(p, new_call(p, $1, $3, 0, tCOLON2), $4, $5);
-                    }
-                | primary_value tCOLON2 tCONSTANT tOP_ASGN arg_rhs
-                    {
-                      yyerror(p, "constant re-assignment");
-                      $$ = new_begin(p, 0);
-                    }
-                | tCOLON3 tCONSTANT tOP_ASGN arg_rhs
-                    {
-                      yyerror(p, "constant re-assignment");
-                      $$ = new_begin(p, 0);
-                    }
-                | backref tOP_ASGN arg_rhs
-                    {
-                      backref_error(p, $1);
-                      $$ = new_begin(p, 0);
-                    }
-                | arg tDOT2 arg
-                    {
-                      $$ = new_dot2(p, $1, $3);
-                    }
-                | arg tDOT3 arg
-                    {
-                      $$ = new_dot3(p, $1, $3);
-                    }
-                | arg '+' arg
-                    {
-                      $$ = call_bin_op(p, $1, "+", $3);
-                    }
-                | arg '-' arg
-                    {
-                      $$ = call_bin_op(p, $1, "-", $3);
-                    }
-                | arg '*' arg
-                    {
-                      $$ = call_bin_op(p, $1, "*", $3);
-                    }
-                | arg '/' arg
-                    {
-                      $$ = call_bin_op(p, $1, "/", $3);
-                    }
-                | arg '%' arg
-                    {
-                      $$ = call_bin_op(p, $1, "%", $3);
-                    }
-                | arg tPOW arg
-                    {
-                      $$ = call_bin_op(p, $1, "**", $3);
-                    }
-                | tUMINUS_NUM tINTEGER tPOW arg
-                    {
-                      $$ = call_uni_op(p, call_bin_op(p, $2, "**", $4), "-@");
-                    }
-                | tUMINUS_NUM tFLOAT tPOW arg
-                    {
-                      $$ = call_uni_op(p, call_bin_op(p, $2, "**", $4), "-@");
-                    }
-                | tUPLUS arg
-                    {
-                      $$ = call_uni_op(p, $2, "+@");
-                    }
-                | tUMINUS arg
-                    {
-                      $$ = call_uni_op(p, $2, "-@");
-                    }
-                | arg '|' arg
-                    {
-                      $$ = call_bin_op(p, $1, "|", $3);
-                    }
-                | arg '^' arg
-                    {
-                      $$ = call_bin_op(p, $1, "^", $3);
-                    }
-                | arg '&' arg
-                    {
-                      $$ = call_bin_op(p, $1, "&", $3);
-                    }
-                | arg tCMP arg
-                    {
-                      $$ = call_bin_op(p, $1, "<=>", $3);
-                    }
-                | arg '>' arg
-                    {
-                      $$ = call_bin_op(p, $1, ">", $3);
-                    }
-                | arg tGEQ arg
-                    {
-                      $$ = call_bin_op(p, $1, ">=", $3);
-                    }
-                | arg '<' arg
-                    {
-                      $$ = call_bin_op(p, $1, "<", $3);
-                    }
-                | arg tLEQ arg
-                    {
-                      $$ = call_bin_op(p, $1, "<=", $3);
-                    }
-                | arg tEQ arg
-                    {
-                      $$ = call_bin_op(p, $1, "==", $3);
-                    }
-                | arg tEQQ arg
-                    {
-                      $$ = call_bin_op(p, $1, "===", $3);
-                    }
-                | arg tNEQ arg
-                    {
-                      $$ = call_bin_op(p, $1, "!=", $3);
-                    }
-                | arg tMATCH arg
-                    {
-                      $$ = call_bin_op(p, $1, "=~", $3);
-                    }
-                | arg tNMATCH arg
-                    {
-                      $$ = call_bin_op(p, $1, "!~", $3);
-                    }
-                | '!' arg
-                    {
-                      $$ = call_uni_op(p, cond($2), "!");
-                    }
-                | '~' arg
-                    {
-                      $$ = call_uni_op(p, cond($2), "~");
-                    }
-                | arg tLSHFT arg
-                    {
-                      $$ = call_bin_op(p, $1, "<<", $3);
-                    }
-                | arg tRSHFT arg
-                    {
-                      $$ = call_bin_op(p, $1, ">>", $3);
-                    }
-                | arg tANDOP arg
-                    {
-                      $$ = new_and(p, $1, $3);
-                    }
-                | arg tOROP arg
-                    {
-                      $$ = new_or(p, $1, $3);
-                    }
-                | arg '?' arg opt_nl ':' arg
-                    {
-                      $$ = new_if(p, cond($1), $3, $6);
-                    }
-                | primary
-                    {
-                      $$ = $1;
-                    }
-                ;
-
-aref_args       : none
-                | args trailer
-                    {
-                      $$ = $1;
-                      NODE_LINENO($$, $1);
-                    }
-                | args comma assocs trailer
-                    {
-                      $$ = push($1, new_hash(p, $3));
-                    }
-                | assocs trailer
-                    {
-                      $$ = cons(new_hash(p, $1), 0);
-                      NODE_LINENO($$, $1);
-                    }
-                ;
-
-arg_rhs         : arg %prec tOP_ASGN
-                    {
-                      $$ = $1;
-                    }
-                | arg modifier_rescue arg
-                    {
-                      void_expr_error(p, $1);
-                      void_expr_error(p, $3);
-                      $$ = new_mod_rescue(p, $1, $3);
-                    }
-                ;
-
-paren_args      : '(' opt_call_args rparen
-                    {
-                      $$ = $2;
-                    }
-                ;
-
-opt_paren_args  : none
-                | paren_args
-                ;
-
-opt_call_args   : none
-                | call_args
-                | args ','
-                    {
-                      $$ = cons($1,0);
-                      NODE_LINENO($$, $1);
-                    }
-                | args comma assocs ','
-                    {
-                      $$ = cons(push($1, new_hash(p, $3)), 0);
-                      NODE_LINENO($$, $1);
-                    }
-                | assocs ','
-                    {
-                      $$ = cons(list1(new_hash(p, $1)), 0);
-                      NODE_LINENO($$, $1);
-                    }
-                ;
-
-call_args       : command
-                    {
-                      void_expr_error(p, $1);
-                      $$ = cons(list1($1), 0);
-                      NODE_LINENO($$, $1);
-                    }
-                | args opt_block_arg
-                    {
-                      $$ = cons($1, $2);
-                      NODE_LINENO($$, $1);
-                    }
-                | assocs opt_block_arg
-                    {
-                      $$ = cons(list1(new_hash(p, $1)), $2);
-                      NODE_LINENO($$, $1);
-                    }
-                | args comma assocs opt_block_arg
-                    {
-                      $$ = cons(push($1, new_hash(p, $3)), $4);
-                      NODE_LINENO($$, $1);
-                    }
-                | block_arg
-                    {
-                      $$ = cons(0, $1);
-                      NODE_LINENO($$, $1);
-                    }
-                ;
-
-command_args    :  {
-                      $<stack>$ = p->cmdarg_stack;
-                      CMDARG_PUSH(1);
-                    }
-                  call_args
-                    {
-                      p->cmdarg_stack = $<stack>1;
-                      $$ = $2;
-                    }
-                ;
-
-block_arg       : tAMPER arg
-                    {
-                      $$ = new_block_arg(p, $2);
-                    }
-                ;
-
-opt_block_arg   : comma block_arg
-                    {
-                      $$ = $2;
-                    }
-                | none
-                    {
-                      $$ = 0;
-                    }
-                ;
-
-comma           : ','
-                | ','  heredoc_bodies
-                ;
-
-args            : arg
-                    {
-                      void_expr_error(p, $1);
-                      $$ = cons($1, 0);
-                      NODE_LINENO($$, $1);
-                    }
-                | tSTAR arg
-                    {
-                      void_expr_error(p, $2);
-                      $$ = cons(new_splat(p, $2), 0);
-                      NODE_LINENO($$, $2);
-                    }
-                | args comma arg
-                    {
-                      void_expr_error(p, $3);
-                      $$ = push($1, $3);
-                    }
-                | args comma tSTAR arg
-                    {
-                      void_expr_error(p, $4);
-                      $$ = push($1, new_splat(p, $4));
-                    }
-                ;
-
-mrhs            : args comma arg
-                    {
-                      void_expr_error(p, $3);
-                      $$ = push($1, $3);
-                    }
-                | args comma tSTAR arg
-                    {
-                      void_expr_error(p, $4);
-                      $$ = push($1, new_splat(p, $4));
-                    }
-                | tSTAR arg
-                    {
-                      void_expr_error(p, $2);
-                      $$ = list1(new_splat(p, $2));
-                    }
-                ;
-
-primary         : literal
-                | string
-                | xstring
-                | regexp
-                | heredoc
-                | var_ref
-                | backref
-                | tFID
-                    {
-                      $$ = new_fcall(p, $1, 0);
-                    }
-                | keyword_begin
-                    {
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                  bodystmt
-                  keyword_end
-                    {
-                      p->cmdarg_stack = $<stack>2;
-                      $$ = $3;
-                    }
-                | tLPAREN_ARG
-                    {
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                  stmt {p->lstate = EXPR_ENDARG;} rparen
-                    {
-                      p->cmdarg_stack = $<stack>2;
-                      $$ = $3;
-                    }
-                | tLPAREN_ARG {p->lstate = EXPR_ENDARG;} rparen
-                    {
-                      $$ = new_nil(p);
-                    }
-                | tLPAREN compstmt ')'
-                    {
-                      $$ = $2;
-                    }
-                | primary_value tCOLON2 tCONSTANT
-                    {
-                      $$ = new_colon2(p, $1, $3);
-                    }
-                | tCOLON3 tCONSTANT
-                    {
-                      $$ = new_colon3(p, $2);
-                    }
-                | tLBRACK aref_args ']'
-                    {
-                      $$ = new_array(p, $2);
-                      NODE_LINENO($$, $2);
-                    }
-                | tLBRACE assoc_list '}'
-                    {
-                      $$ = new_hash(p, $2);
-                      NODE_LINENO($$, $2);
-                    }
-                | keyword_return
-                    {
-                      $$ = new_return(p, 0);
-                    }
-                | keyword_yield opt_paren_args
-                    {
-                      $$ = new_yield(p, $2);
-                    }
-                | keyword_not '(' expr rparen
-                    {
-                      $$ = call_uni_op(p, cond($3), "!");
-                    }
-                | keyword_not '(' rparen
-                    {
-                      $$ = call_uni_op(p, new_nil(p), "!");
-                    }
-                | operation brace_block
-                    {
-                      $$ = new_fcall(p, $1, cons(0, $2));
-                    }
-                | method_call
-                | method_call brace_block
-                    {
-                      call_with_block(p, $1, $2);
-                      $$ = $1;
-                    }
-                | tLAMBDA
-                    {
-                      local_nest(p);
-                      $<num>$ = p->lpar_beg;
-                      p->lpar_beg = ++p->paren_nest;
-                    }
-                  f_larglist
-                    {
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                  lambda_body
-                    {
-                      p->lpar_beg = $<num>2;
-                      $$ = new_lambda(p, $3, $5);
-                      local_unnest(p);
-                      p->cmdarg_stack = $<stack>4;
-                      CMDARG_LEXPOP();
-                    }
-                | keyword_if expr_value then
-                  compstmt
-                  if_tail
-                  keyword_end
-                    {
-                      $$ = new_if(p, cond($2), $4, $5);
-                      SET_LINENO($$, $1);
-                    }
-                | keyword_unless expr_value then
-                  compstmt
-                  opt_else
-                  keyword_end
-                    {
-                      $$ = new_unless(p, cond($2), $4, $5);
-                      SET_LINENO($$, $1);
-                    }
-                | keyword_while {COND_PUSH(1);} expr_value do {COND_POP();}
-                  compstmt
-                  keyword_end
-                    {
-                      $$ = new_while(p, cond($3), $6);
-                      SET_LINENO($$, $1);
-                    }
-                | keyword_until {COND_PUSH(1);} expr_value do {COND_POP();}
-                  compstmt
-                  keyword_end
-                    {
-                      $$ = new_until(p, cond($3), $6);
-                      SET_LINENO($$, $1);
-                    }
-                | keyword_case expr_value opt_terms
-                  case_body
-                  keyword_end
-                    {
-                      $$ = new_case(p, $2, $4);
-                    }
-                | keyword_case opt_terms case_body keyword_end
-                    {
-                      $$ = new_case(p, 0, $3);
-                    }
-                | keyword_for for_var keyword_in
-                  {COND_PUSH(1);}
-                  expr_value do
-                  {COND_POP();}
-                  compstmt
-                  keyword_end
-                    {
-                      $$ = new_for(p, $2, $5, $8);
-                      SET_LINENO($$, $1);
-                    }
-                | keyword_class
-                  cpath superclass
-                    {
-                      if (p->in_def || p->in_single)
-                        yyerror(p, "class definition in method body");
-                      $<nd>$ = local_switch(p);
-                    }
-                  bodystmt
-                  keyword_end
-                    {
-                      $$ = new_class(p, $2, $3, $5);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>4);
-                    }
-                | keyword_class
-                  tLSHFT expr
-                    {
-                      $<num>$ = p->in_def;
-                      p->in_def = 0;
-                    }
-                  term
-                    {
-                      $<nd>$ = cons(local_switch(p), nint(p->in_single));
-                      p->in_single = 0;
-                    }
-                  bodystmt
-                  keyword_end
-                    {
-                      $$ = new_sclass(p, $3, $7);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>6->car);
-                      p->in_def = $<num>4;
-                      p->in_single = intn($<nd>6->cdr);
-                    }
-                | keyword_module
-                  cpath
-                    {
-                      if (p->in_def || p->in_single)
-                        yyerror(p, "module definition in method body");
-                      $<nd>$ = local_switch(p);
-                    }
-                  bodystmt
-                  keyword_end
-                    {
-                      $$ = new_module(p, $2, $4);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>3);
-                    }
-                | keyword_def fname
-                    {
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                    {
-                      p->in_def++;
-                      $<nd>$ = local_switch(p);
-                    }
-                  f_arglist
-                  bodystmt
-                  keyword_end
-                    {
-                      $$ = new_def(p, $2, $5, $6);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>4);
-                      p->in_def--;
-                      p->cmdarg_stack = $<stack>3;
-                    }
-                | keyword_def singleton dot_or_colon
-                    {
-                      p->lstate = EXPR_FNAME;
-                      $<stack>$ = p->cmdarg_stack;
-                      p->cmdarg_stack = 0;
-                    }
-                    fname
-                    {
-                      p->in_single++;
-                      p->lstate = EXPR_ENDFN; /* force for args */
-                      $<nd>$ = local_switch(p);
-                    }
-                  f_arglist
-                  bodystmt
-                  keyword_end
-                    {
-                      $$ = new_sdef(p, $2, $5, $7, $8);
-                      SET_LINENO($$, $1);
-                      local_resume(p, $<nd>6);
-                      p->in_single--;
-                      p->cmdarg_stack = $<stack>4;
-                    }
-                | keyword_break
-                    {
-                      $$ = new_break(p, 0);
-                    }
-                | keyword_next
-                    {
-                      $$ = new_next(p, 0);
-                    }
-                | keyword_redo
-                    {
-                      $$ = new_redo(p);
-                    }
-                | keyword_retry
-                    {
-                      $$ = new_retry(p);
-                    }
-                ;
-
-primary_value   : primary
-                    {
-                      $$ = $1;
-                      if (!$$) $$ = new_nil(p);
-                    }
-                ;
-
-then            : term
-                | keyword_then
-                | term keyword_then
-                ;
-
-do              : term
-                | keyword_do_cond
-                ;
-
-if_tail         : opt_else
-                | keyword_elsif expr_value then
-                  compstmt
-                  if_tail
-                    {
-                      $$ = new_if(p, cond($2), $4, $5);
-                    }
-                ;
-
-opt_else        : none
-                | keyword_else compstmt
-                    {
-                      $$ = $2;
-                    }
-                ;
-
-for_var         : lhs
-                    {
-                      $$ = list1(list1($1));
-                    }
-                | mlhs
-                ;
-
-f_marg          : f_norm_arg
-                    {
-                      $$ = new_arg(p, $1);
-                    }
-                | tLPAREN f_margs rparen
-                    {
-                      $$ = new_masgn(p, $2, 0);
-                    }
-                ;
-
-f_marg_list     : f_marg
-                    {
-                      $$ = list1($1);
-                    }
-                | f_marg_list ',' f_marg
-                    {
-                      $$ = push($1, $3);
-                    }
-                ;
-
-f_margs         : f_marg_list
-                    {
-                      $$ = list3($1,0,0);
-                    }
-                | f_marg_list ',' tSTAR f_norm_arg
-                    {
-                      $$ = list3($1, new_arg(p, $4), 0);
-                    }
-                | f_marg_list ',' tSTAR f_norm_arg ',' f_marg_list
-                    {
-                      $$ = list3($1, new_arg(p, $4), $6);
-                    }
-                | f_marg_list ',' tSTAR
-                    {
-                      $$ = list3($1, (node*)-1, 0);
-                    }
-                | f_marg_list ',' tSTAR ',' f_marg_list
-                    {
-                      $$ = list3($1, (node*)-1, $5);
-                    }
-                | tSTAR f_norm_arg
-                    {
-                      $$ = list3(0, new_arg(p, $2), 0);
-                    }
-                | tSTAR f_norm_arg ',' f_marg_list
-                    {
-                      $$ = list3(0, new_arg(p, $2), $4);
-                    }
-                | tSTAR
-                    {
-                      $$ = list3(0, (node*)-1, 0);
-                    }
-                | tSTAR ',' f_marg_list
-                    {
-                      $$ = list3(0, (node*)-1, $3);
-                    }
-                ;
-
-block_param     : f_arg ',' f_block_optarg ',' f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, $5, 0, $6);
-                    }
-                | f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, $5, $7, $8);
-                    }
-                | f_arg ',' f_block_optarg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, 0, 0, $4);
-                    }
-                | f_arg ',' f_block_optarg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, 0, $5, $6);
-                    }
-                | f_arg ',' f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, 0, $3, 0, $4);
-                    }
-                | f_arg ','
-                    {
-                      $$ = new_args(p, $1, 0, 0, 0, 0);
-                    }
-                | f_arg ',' f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, 0, $3, $5, $6);
-                    }
-                | f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, 0, 0, 0, $2);
-                    }
-                | f_block_optarg ',' f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, $3, 0, $4);
-                    }
-                | f_block_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, $3, $5, $6);
-                    }
-                | f_block_optarg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, 0, 0, $2);
-                    }
-                | f_block_optarg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, 0, $3, $4);
-                    }
-                | f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, 0, $1, 0, $2);
-                    }
-                | f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, 0, $1, $3, $4);
-                    }
-                | f_block_arg
-                    {
-                      $$ = new_args(p, 0, 0, 0, 0, $1);
-                    }
-                ;
-
-opt_block_param : none
-                | block_param_def
-                    {
-                      p->cmd_start = TRUE;
-                      $$ = $1;
-                    }
-                ;
-
-block_param_def : '|' opt_bv_decl '|'
-                    {
-                      $$ = 0;
-                    }
-                | tOROP
-                    {
-                      $$ = 0;
-                    }
-                | '|' block_param opt_bv_decl '|'
-                    {
-                      $$ = $2;
-                    }
-                ;
-
-
-opt_bv_decl     : opt_nl
-                    {
-                      $$ = 0;
-                    }
-                | opt_nl ';' bv_decls opt_nl
-                    {
-                      $$ = 0;
-                    }
-                ;
-
-bv_decls        : bvar
-                | bv_decls ',' bvar
-                ;
-
-bvar            : tIDENTIFIER
-                    {
-                      local_add_f(p, $1);
-                      new_bv(p, $1);
-                    }
-                | f_bad_arg
-                ;
-
-f_larglist      : '(' f_args opt_bv_decl ')'
-                    {
-                      $$ = $2;
-                    }
-                | f_args
-                    {
-                      $$ = $1;
-                    }
-                ;
-
-lambda_body     : tLAMBEG compstmt '}'
-                    {
-                      $$ = $2;
-                    }
-                | keyword_do_LAMBDA compstmt keyword_end
-                    {
-                      $$ = $2;
-                    }
-                ;
-
-do_block        : keyword_do_block
-                    {
-                      local_nest(p);
-                    }
-                  opt_block_param
-                  compstmt
-                  keyword_end
-                    {
-                      $$ = new_block(p,$3,$4);
-                      local_unnest(p);
-                    }
-                ;
-
-block_call      : command do_block
-                    {
-                      if ($1->car == (node*)NODE_YIELD) {
-                        yyerror(p, "block given to yield");
-                      }
-                      else {
-                        call_with_block(p, $1, $2);
-                      }
-                      $$ = $1;
-                    }
-                | block_call call_op2 operation2 opt_paren_args
-                    {
-                      $$ = new_call(p, $1, $3, $4, $2);
-                    }
-                | block_call call_op2 operation2 opt_paren_args brace_block
-                    {
-                      $$ = new_call(p, $1, $3, $4, $2);
-                      call_with_block(p, $$, $5);
-                    }
-                | block_call call_op2 operation2 command_args do_block
-                    {
-                      $$ = new_call(p, $1, $3, $4, $2);
-                      call_with_block(p, $$, $5);
-                    }
-                ;
-
-method_call     : operation paren_args
-                    {
-                      $$ = new_fcall(p, $1, $2);
-                    }
-                | primary_value call_op operation2 opt_paren_args
-                    {
-                      $$ = new_call(p, $1, $3, $4, $2);
-                    }
-                | primary_value tCOLON2 operation2 paren_args
-                    {
-                      $$ = new_call(p, $1, $3, $4, tCOLON2);
-                    }
-                | primary_value tCOLON2 operation3
-                    {
-                      $$ = new_call(p, $1, $3, 0, tCOLON2);
-                    }
-                | primary_value call_op paren_args
-                    {
-                      $$ = new_call(p, $1, intern("call",4), $3, $2);
-                    }
-                | primary_value tCOLON2 paren_args
-                    {
-                      $$ = new_call(p, $1, intern("call",4), $3, tCOLON2);
-                    }
-                | keyword_super paren_args
-                    {
-                      $$ = new_super(p, $2);
-                    }
-                | keyword_super
-                    {
-                      $$ = new_zsuper(p);
-                    }
-                | primary_value '[' opt_call_args rbracket
-                    {
-                      $$ = new_call(p, $1, intern("[]",2), $3, '.');
-                    }
-                ;
-
-brace_block     : '{'
-                    {
-                      local_nest(p);
-                      $<num>$ = p->lineno;
-                    }
-                  opt_block_param
-                  compstmt '}'
-                    {
-                      $$ = new_block(p,$3,$4);
-                      SET_LINENO($$, $<num>2);
-                      local_unnest(p);
-                    }
-                | keyword_do
-                    {
-                      local_nest(p);
-                      $<num>$ = p->lineno;
-                    }
-                  opt_block_param
-                  compstmt keyword_end
-                    {
-                      $$ = new_block(p,$3,$4);
-                      SET_LINENO($$, $<num>2);
-                      local_unnest(p);
-                    }
-                ;
-
-case_body       : keyword_when args then
-                  compstmt
-                  cases
-                    {
-                      $$ = cons(cons($2, $4), $5);
-                    }
-                ;
-
-cases           : opt_else
-                    {
-                      if ($1) {
-                        $$ = cons(cons(0, $1), 0);
-                      }
-                      else {
-                        $$ = 0;
-                      }
-                    }
-                | case_body
-                ;
-
-opt_rescue      : keyword_rescue exc_list exc_var then
-                  compstmt
-                  opt_rescue
-                    {
-                      $$ = list1(list3($2, $3, $5));
-                      if ($6) $$ = append($$, $6);
-                    }
-                | none
-                ;
-
-exc_list        : arg
-                    {
-                        $$ = list1($1);
-                    }
-                | mrhs
-                | none
-                ;
-
-exc_var         : tASSOC lhs
-                    {
-                      $$ = $2;
-                    }
-                | none
-                ;
-
-opt_ensure      : keyword_ensure compstmt
-                    {
-                      $$ = $2;
-                    }
-                | none
-                ;
-
-literal         : numeric
-                | symbol
-                | words
-                | symbols
-                ;
-
-string          : tCHAR
-                | tSTRING
-                | tSTRING_BEG tSTRING
-                    {
-                      $$ = $2;
-                    }
-                | tSTRING_BEG string_rep tSTRING
-                    {
-                      $$ = new_dstr(p, push($2, $3));
-                    }
-                ;
-
-string_rep      : string_interp
-                | string_rep string_interp
-                    {
-                      $$ = append($1, $2);
-                    }
-                ;
-
-string_interp   : tSTRING_MID
-                    {
-                      $$ = list1($1);
-                    }
-                | tSTRING_PART
-                    {
-                      $<nd>$ = p->lex_strterm;
-                      p->lex_strterm = NULL;
-                    }
-                  compstmt
-                  '}'
-                    {
-                      p->lex_strterm = $<nd>2;
-                      $$ = list2($1, $3);
-                    }
-                | tLITERAL_DELIM
-                    {
-                      $$ = list1(new_literal_delim(p));
-                    }
-                | tHD_LITERAL_DELIM heredoc_bodies
-                    {
-                      $$ = list1(new_literal_delim(p));
-                    }
-                ;
-
-xstring         : tXSTRING_BEG tXSTRING
-                    {
-                        $$ = $2;
-                    }
-                | tXSTRING_BEG string_rep tXSTRING
-                    {
-                      $$ = new_dxstr(p, push($2, $3));
-                    }
-                ;
-
-regexp          : tREGEXP_BEG tREGEXP
-                    {
-                        $$ = $2;
-                    }
-                | tREGEXP_BEG string_rep tREGEXP
-                    {
-                      $$ = new_dregx(p, $2, $3);
-                    }
-                ;
-
-heredoc         : tHEREDOC_BEG
-                ;
-
-heredoc_bodies  : heredoc_body
-                | heredoc_bodies heredoc_body
-                ;
-
-heredoc_body    : tHEREDOC_END
-                    {
-                      parser_heredoc_info * inf = parsing_heredoc_inf(p);
-                      inf->doc = push(inf->doc, new_str(p, "", 0));
-                      heredoc_end(p);
-                    }
-                | heredoc_string_rep tHEREDOC_END
-                    {
-                      heredoc_end(p);
-                    }
-                ;
-
-heredoc_string_rep : heredoc_string_interp
-                   | heredoc_string_rep heredoc_string_interp
-                   ;
-
-heredoc_string_interp : tHD_STRING_MID
-                    {
-                      parser_heredoc_info * inf = parsing_heredoc_inf(p);
-                      inf->doc = push(inf->doc, $1);
-                      heredoc_treat_nextline(p);
-                    }
-                | tHD_STRING_PART
-                    {
-                      $<nd>$ = p->lex_strterm;
-                      p->lex_strterm = NULL;
-                    }
-                  compstmt
-                  '}'
-                    {
-                      parser_heredoc_info * inf = parsing_heredoc_inf(p);
-                      p->lex_strterm = $<nd>2;
-                      inf->doc = push(push(inf->doc, $1), $3);
-                    }
-                ;
-
-words           : tWORDS_BEG tSTRING
-                    {
-                      $$ = new_words(p, list1($2));
-                    }
-                | tWORDS_BEG string_rep tSTRING
-                    {
-                      $$ = new_words(p, push($2, $3));
-                    }
-                ;
-
-
-symbol          : basic_symbol
-                    {
-                      $$ = new_sym(p, $1);
-                    }
-                | tSYMBEG tSTRING_BEG string_rep tSTRING
-                    {
-                      p->lstate = EXPR_END;
-                      $$ = new_dsym(p, push($3, $4));
-                    }
-                ;
-
-basic_symbol    : tSYMBEG sym
-                    {
-                      p->lstate = EXPR_END;
-                      $$ = $2;
-                    }
-                ;
-
-sym             : fname
-                | tIVAR
-                | tGVAR
-                | tCVAR
-                | tSTRING
-                    {
-                      $$ = new_strsym(p, $1);
-                    }
-                | tSTRING_BEG tSTRING
-                    {
-                      $$ = new_strsym(p, $2);
-                    }
-                ;
-
-symbols         : tSYMBOLS_BEG tSTRING
-                    {
-                      $$ = new_symbols(p, list1($2));
-                    }
-                | tSYMBOLS_BEG string_rep tSTRING
-                    {
-                      $$ = new_symbols(p, push($2, $3));
-                    }
-                ;
-
-numeric         : tINTEGER
-                | tFLOAT
-                | tUMINUS_NUM tINTEGER          %prec tLOWEST
-                    {
-                      $$ = negate_lit(p, $2);
-                    }
-                | tUMINUS_NUM tFLOAT            %prec tLOWEST
-                    {
-                      $$ = negate_lit(p, $2);
-                    }
-                ;
-
-variable        : tIDENTIFIER
-                    {
-                      $$ = new_lvar(p, $1);
-                    }
-                | tIVAR
-                    {
-                      $$ = new_ivar(p, $1);
-                    }
-                | tGVAR
-                    {
-                      $$ = new_gvar(p, $1);
-                    }
-                | tCVAR
-                    {
-                      $$ = new_cvar(p, $1);
-                    }
-                | tCONSTANT
-                    {
-                      $$ = new_const(p, $1);
-                    }
-                ;
-
-var_lhs         : variable
-                    {
-                      assignable(p, $1);
-                    }
-                ;
-
-var_ref         : variable
-                    {
-                      $$ = var_reference(p, $1);
-                    }
-                | keyword_nil
-                    {
-                      $$ = new_nil(p);
-                    }
-                | keyword_self
-                    {
-                      $$ = new_self(p);
-                    }
-                | keyword_true
-                    {
-                      $$ = new_true(p);
-                    }
-                | keyword_false
-                    {
-                      $$ = new_false(p);
-                    }
-                | keyword__FILE__
-                    {
-                      const char *fn = p->filename;
-                      if (!fn) {
-                        fn = "(null)";
-                      }
-                      $$ = new_str(p, fn, strlen(fn));
-                    }
-                | keyword__LINE__
-                    {
-                      char buf[16];
-
-                      snprintf(buf, sizeof(buf), "%d", p->lineno);
-                      $$ = new_int(p, buf, 10);
-                    }
-                ;
-
-backref         : tNTH_REF
-                | tBACK_REF
-                ;
-
-superclass      : /* term */
-                    {
-                      $$ = 0;
-                    }
-                | '<'
-                    {
-                      p->lstate = EXPR_BEG;
-                      p->cmd_start = TRUE;
-                    }
-                  expr_value term
-                    {
-                      $$ = $3;
-                    } /*
-                | error term
-                    {
-                      yyerrok;
-                      $$ = 0;
-                    } */
-                ;
-
-f_arglist       : '(' f_args rparen
-                    {
-                      $$ = $2;
-                      p->lstate = EXPR_BEG;
-                      p->cmd_start = TRUE;
-                    }
-                | f_args term
-                    {
-                      $$ = $1;
-                    }
-                ;
-
-f_args          : f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, $5, 0, $6);
-                    }
-                | f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, $5, $7, $8);
-                    }
-                | f_arg ',' f_optarg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, 0, 0, $4);
-                    }
-                | f_arg ',' f_optarg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, $3, 0, $5, $6);
-                    }
-                | f_arg ',' f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, 0, $3, 0, $4);
-                    }
-                | f_arg ',' f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, 0, $3, $5, $6);
-                    }
-                | f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, $1, 0, 0, 0, $2);
-                    }
-                | f_optarg ',' f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, $3, 0, $4);
-                    }
-                | f_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, $3, $5, $6);
-                    }
-                | f_optarg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, 0, 0, $2);
-                    }
-                | f_optarg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, $1, 0, $3, $4);
-                    }
-                | f_rest_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, 0, $1, 0, $2);
-                    }
-                | f_rest_arg ',' f_arg opt_f_block_arg
-                    {
-                      $$ = new_args(p, 0, 0, $1, $3, $4);
-                    }
-                | f_block_arg
-                    {
-                      $$ = new_args(p, 0, 0, 0, 0, $1);
-                    }
-                | /* none */
-                    {
-                      local_add_f(p, 0);
-                      $$ = new_args(p, 0, 0, 0, 0, 0);
-                    }
-                ;
-
-f_bad_arg       : tCONSTANT
-                    {
-                      yyerror(p, "formal argument cannot be a constant");
-                      $$ = 0;
-                    }
-                | tIVAR
-                    {
-                      yyerror(p, "formal argument cannot be an instance variable");
-                      $$ = 0;
-                    }
-                | tGVAR
-                    {
-                      yyerror(p, "formal argument cannot be a global variable");
-                      $$ = 0;
-                    }
-                | tCVAR
-                    {
-                      yyerror(p, "formal argument cannot be a class variable");
-                      $$ = 0;
-                    }
-                ;
-
-f_norm_arg      : f_bad_arg
-                    {
-                      $$ = 0;
-                    }
-                | tIDENTIFIER
-                    {
-                      local_add_f(p, $1);
-                      $$ = $1;
-                    }
-                ;
-
-f_arg_item      : f_norm_arg
-                    {
-                      $$ = new_arg(p, $1);
-                    }
-                | tLPAREN f_margs rparen
-                    {
-                      $$ = new_masgn(p, $2, 0);
-                    }
-                ;
-
-f_arg           : f_arg_item
-                    {
-                      $$ = list1($1);
-                    }
-                | f_arg ',' f_arg_item
-                    {
-                      $$ = push($1, $3);
-                    }
-                ;
-
-f_opt_asgn      : tIDENTIFIER '='
-                    {
-                      local_add_f(p, $1);
-                      $$ = $1;
-                    }
-                ;
-
-f_opt           : f_opt_asgn arg
-                    {
-                      void_expr_error(p, $2);
-                      $$ = cons(nsym($1), $2);
-                    }
-                ;
-
-f_block_opt     : f_opt_asgn primary_value
-                    {
-                      void_expr_error(p, $2);
-                      $$ = cons(nsym($1), $2);
-                    }
-                ;
-
-f_block_optarg  : f_block_opt
-                    {
-                      $$ = list1($1);
-                    }
-                | f_block_optarg ',' f_block_opt
-                    {
-                      $$ = push($1, $3);
-                    }
-                ;
-
-f_optarg        : f_opt
-                    {
-                      $$ = list1($1);
-                    }
-                | f_optarg ',' f_opt
-                    {
-                      $$ = push($1, $3);
-                    }
-                ;
-
-restarg_mark    : '*'
-                | tSTAR
-                ;
-
-f_rest_arg      : restarg_mark tIDENTIFIER
-                    {
-                      local_add_f(p, $2);
-                      $$ = $2;
-                    }
-                | restarg_mark
-                    {
-                      local_add_f(p, 0);
-                      $$ = -1;
-                    }
-                ;
-
-blkarg_mark     : '&'
-                | tAMPER
-                ;
-
-f_block_arg     : blkarg_mark tIDENTIFIER
-                    {
-                      local_add_f(p, $2);
-                      $$ = $2;
-                    }
-                ;
-
-opt_f_block_arg : ',' f_block_arg
-                    {
-                      $$ = $2;
-                    }
-                | none
-                    {
-                      local_add_f(p, 0);
-                      $$ = 0;
-                    }
-                ;
-
-singleton       : var_ref
-                    {
-                      $$ = $1;
-                      if (!$$) $$ = new_nil(p);
-                    }
-                | '(' {p->lstate = EXPR_BEG;} expr rparen
-                    {
-                      if ($3 == 0) {
-                        yyerror(p, "can't define singleton method for ().");
-                      }
-                      else {
-                        switch ((enum node_type)intn($3->car)) {
-                        case NODE_STR:
-                        case NODE_DSTR:
-                        case NODE_XSTR:
-                        case NODE_DXSTR:
-                        case NODE_DREGX:
-                        case NODE_MATCH:
-                        case NODE_FLOAT:
-                        case NODE_ARRAY:
-                        case NODE_HEREDOC:
-                          yyerror(p, "can't define singleton method for literals");
-                        default:
-                          break;
-                        }
-                      }
-                      $$ = $3;
-                    }
-                ;
-
-assoc_list      : none
-                | assocs trailer
-                    {
-                      $$ = $1;
-                    }
-                ;
-
-assocs          : assoc
-                    {
-                      $$ = list1($1);
-                      NODE_LINENO($$, $1);
-                    }
-                | assocs ',' assoc
-                    {
-                      $$ = push($1, $3);
-                    }
-                ;
-
-assoc           : arg tASSOC arg
-                    {
-                      void_expr_error(p, $1);
-                      void_expr_error(p, $3);
-                      $$ = cons($1, $3);
-                    }
-                | tLABEL arg
-                    {
-                      void_expr_error(p, $2);
-                      $$ = cons(new_sym(p, $1), $2);
-                    }
-                | tLABEL_END arg
-                    {
-                      void_expr_error(p, $2);
-                      $$ = cons(new_sym(p, new_strsym(p, $1)), $2);
-                    }
-                | tSTRING_BEG tLABEL_END arg
-                    {
-                      void_expr_error(p, $3);
-                      $$ = cons(new_sym(p, new_strsym(p, $2)), $3);
-                    }
-                | tSTRING_BEG string_rep tLABEL_END arg
-                    {
-                      void_expr_error(p, $4);
-                      $$ = cons(new_dsym(p, push($2, $3)), $4);
-                    }
-                ;
-
-operation       : tIDENTIFIER
-                | tCONSTANT
-                | tFID
-                ;
-
-operation2      : tIDENTIFIER
-                | tCONSTANT
-                | tFID
-                | op
-                ;
-
-operation3      : tIDENTIFIER
-                | tFID
-                | op
-                ;
-
-dot_or_colon    : '.'
-                | tCOLON2
-                ;
-
-call_op         : '.'
-                    {
-                      $$ = '.';
-                    }
-                | tANDDOT
-                    {
-                      $$ = 0;
-                    }
-                ;
-
-call_op2        : call_op
-                | tCOLON2
-                    {
-                      $$ = tCOLON2;
-                    }
-                ;
-
-opt_terms       : /* none */
-                | terms
-                ;
-
-opt_nl          : /* none */
-                | nl
-                ;
-
-rparen          : opt_nl ')'
-                ;
-
-rbracket        : opt_nl ']'
-                ;
-
-trailer         : /* none */
-                | nl
-                | comma
-                ;
-
-term            : ';' {yyerrok;}
-                | nl
-                | heredoc_body
-                ;
-
-nl              : '\n'
-                    {
-                      p->lineno++;
-                      p->column = 0;
-                    }
-                ;
-
-terms           : term
-                | terms term
-                ;
-
-none            : /* none */
-                    {
-                      $$ = 0;
-                    }
-                ;
-%%
-#define pylval  (*((YYSTYPE*)(p->ylval)))
-
-static void
-yyerror(parser_state *p, const char *s)
-{
-  char* c;
-  int n;
-
-  if (! p->capture_errors) {
-#ifndef MRB_DISABLE_STDIO
-    if (p->filename) {
-      fprintf(stderr, "%s:%d:%d: %s\n", p->filename, p->lineno, p->column, s);
-    }
-    else {
-      fprintf(stderr, "line %d:%d: %s\n", p->lineno, p->column, s);
-    }
-#endif
-  }
-  else if (p->nerr < sizeof(p->error_buffer) / sizeof(p->error_buffer[0])) {
-    n = strlen(s);
-    c = (char *)parser_palloc(p, n + 1);
-    memcpy(c, s, n + 1);
-    p->error_buffer[p->nerr].message = c;
-    p->error_buffer[p->nerr].lineno = p->lineno;
-    p->error_buffer[p->nerr].column = p->column;
-  }
-  p->nerr++;
-}
-
-static void
-yyerror_i(parser_state *p, const char *fmt, int i)
-{
-  char buf[256];
-
-  snprintf(buf, sizeof(buf), fmt, i);
-  yyerror(p, buf);
-}
-
-static void
-yywarn(parser_state *p, const char *s)
-{
-  char* c;
-  int n;
-
-  if (! p->capture_errors) {
-#ifndef MRB_DISABLE_STDIO
-    if (p->filename) {
-      fprintf(stderr, "%s:%d:%d: %s\n", p->filename, p->lineno, p->column, s);
-    }
-    else {
-      fprintf(stderr, "line %d:%d: %s\n", p->lineno, p->column, s);
-    }
-#endif
-  }
-  else if (p->nwarn < sizeof(p->warn_buffer) / sizeof(p->warn_buffer[0])) {
-    n = strlen(s);
-    c = (char *)parser_palloc(p, n + 1);
-    memcpy(c, s, n + 1);
-    p->warn_buffer[p->nwarn].message = c;
-    p->warn_buffer[p->nwarn].lineno = p->lineno;
-    p->warn_buffer[p->nwarn].column = p->column;
-  }
-  p->nwarn++;
-}
-
-static void
-yywarning(parser_state *p, const char *s)
-{
-  yywarn(p, s);
-}
-
-static void
-yywarning_s(parser_state *p, const char *fmt, const char *s)
-{
-  char buf[256];
-
-  snprintf(buf, sizeof(buf), fmt, s);
-  yywarning(p, buf);
-}
-
-static void
-backref_error(parser_state *p, node *n)
-{
-  int c;
-
-  c = (int)(intptr_t)n->car;
-
-  if (c == NODE_NTH_REF) {
-    yyerror_i(p, "can't set variable $%" MRB_PRId, (mrb_int)(intptr_t)n->cdr);
-  }
-  else if (c == NODE_BACK_REF) {
-    yyerror_i(p, "can't set variable $%c", (int)(intptr_t)n->cdr);
-  }
-  else {
-    mrb_bug(p->mrb, "Internal error in backref_error() : n=>car == %S", mrb_fixnum_value(c));
-  }
-}
-
-static void
-void_expr_error(parser_state *p, node *n)
-{
-  int c;
-
-  if (n == NULL) return;
-  c = (int)(intptr_t)n->car;
-  switch (c) {
-  case NODE_BREAK:
-  case NODE_RETURN:
-  case NODE_NEXT:
-  case NODE_REDO:
-  case NODE_RETRY:
-    yyerror(p, "void value expression");
-    break;
-  case NODE_AND:
-  case NODE_OR:
-    void_expr_error(p, n->cdr->car);
-    void_expr_error(p, n->cdr->cdr);
-    break;
-  case NODE_BEGIN:
-    if (n->cdr) {
-      while (n->cdr) {
-        n = n->cdr;
-      }
-      void_expr_error(p, n->car);
-    }
-    break;
-  default:
-    break;
-  }
-}
-
-static void pushback(parser_state *p, int c);
-static mrb_bool peeks(parser_state *p, const char *s);
-static mrb_bool skips(parser_state *p, const char *s);
-
-static inline int
-nextc(parser_state *p)
-{
-  int c;
-
-  if (p->pb) {
-    node *tmp;
-
-    c = (int)(intptr_t)p->pb->car;
-    tmp = p->pb;
-    p->pb = p->pb->cdr;
-    cons_free(tmp);
-  }
-  else {
-#ifndef MRB_DISABLE_STDIO
-    if (p->f) {
-      if (feof(p->f)) goto eof;
-      c = fgetc(p->f);
-      if (c == EOF) goto eof;
-    }
-    else
-#endif
-      if (!p->s || p->s >= p->send) {
-        goto eof;
-      }
-      else {
-        c = (unsigned char)*p->s++;
-      }
-  }
-  if (c >= 0) {
-    p->column++;
-  }
-  if (c == '\r') {
-    c = nextc(p);
-    if (c != '\n') {
-      pushback(p, c);
-      return '\r';
-    }
-    return c;
-  }
-  return c;
-
-  eof:
-  if (!p->cxt) return -1;
-  else {
-    if (p->cxt->partial_hook(p) < 0)
-      return -1;                /* end of program(s) */
-    return -2;                  /* end of a file in the program files */
-  }
-}
-
-static void
-pushback(parser_state *p, int c)
-{
-  if (c >= 0) {
-    p->column--;
-  }
-  p->pb = cons((node*)(intptr_t)c, p->pb);
-}
-
-static void
-skip(parser_state *p, char term)
-{
-  int c;
-
-  for (;;) {
-    c = nextc(p);
-    if (c < 0) break;
-    if (c == term) break;
-  }
-}
-
-static int
-peekc_n(parser_state *p, int n)
-{
-  node *list = 0;
-  int c0;
-
-  do {
-    c0 = nextc(p);
-    if (c0 == -1) return c0;    /* do not skip partial EOF */
-    if (c0 >= 0) --p->column;
-    list = push(list, (node*)(intptr_t)c0);
-  } while(n--);
-  if (p->pb) {
-    p->pb = append((node*)list, p->pb);
-  }
-  else {
-    p->pb = list;
-  }
-  return c0;
-}
-
-static mrb_bool
-peek_n(parser_state *p, int c, int n)
-{
-  return peekc_n(p, n) == c && c >= 0;
-}
-#define peek(p,c) peek_n((p), (c), 0)
-
-static mrb_bool
-peeks(parser_state *p, const char *s)
-{
-  int len = strlen(s);
-
-#ifndef MRB_DISABLE_STDIO
-  if (p->f) {
-    int n = 0;
-    while (*s) {
-      if (!peek_n(p, *s++, n++)) return FALSE;
-    }
-    return TRUE;
-  }
-  else
-#endif
-    if (p->s && p->s + len <= p->send) {
-      if (memcmp(p->s, s, len) == 0) return TRUE;
-    }
-  return FALSE;
-}
-
-static mrb_bool
-skips(parser_state *p, const char *s)
-{
-  int c;
-
-  for (;;) {
-    /* skip until first char */
-    for (;;) {
-      c = nextc(p);
-      if (c < 0) return FALSE;
-      if (c == '\n') {
-        p->lineno++;
-        p->column = 0;
-      }
-      if (c == *s) break;
-    }
-    s++;
-    if (peeks(p, s)) {
-      int len = strlen(s);
-
-      while (len--) {
-        if (nextc(p) == '\n') {
-          p->lineno++;
-          p->column = 0;
-        }
-      }
-      return TRUE;
-    }
-    else{
-      s--;
-    }
-  }
-  return FALSE;
-}
-
-
-static int
-newtok(parser_state *p)
-{
-  if (p->tokbuf != p->buf) {
-    mrb_free(p->mrb, p->tokbuf);
-    p->tokbuf = p->buf;
-    p->tsiz = MRB_PARSER_TOKBUF_SIZE;
-  }
-  p->tidx = 0;
-  return p->column - 1;
-}
-
-static void
-tokadd(parser_state *p, int32_t c)
-{
-  char utf8[4];
-  int i, len;
-
-  /* mrb_assert(-0x10FFFF <= c && c <= 0xFF); */
-  if (c >= 0) {
-    /* Single byte from source or non-Unicode escape */
-    utf8[0] = (char)c;
-    len = 1;
-  }
-  else {
-    /* Unicode character */
-    c = -c;
-    if (c < 0x80) {
-      utf8[0] = (char)c;
-      len = 1;
-    }
-    else if (c < 0x800) {
-      utf8[0] = (char)(0xC0 | (c >> 6));
-      utf8[1] = (char)(0x80 | (c & 0x3F));
-      len = 2;
-    }
-    else if (c < 0x10000) {
-      utf8[0] = (char)(0xE0 |  (c >> 12)        );
-      utf8[1] = (char)(0x80 | ((c >>  6) & 0x3F));
-      utf8[2] = (char)(0x80 | ( c        & 0x3F));
-      len = 3;
-    }
-    else {
-      utf8[0] = (char)(0xF0 |  (c >> 18)        );
-      utf8[1] = (char)(0x80 | ((c >> 12) & 0x3F));
-      utf8[2] = (char)(0x80 | ((c >>  6) & 0x3F));
-      utf8[3] = (char)(0x80 | ( c        & 0x3F));
-      len = 4;
-    }
-  }
-  if (p->tidx+len >= p->tsiz) {
-    if (p->tsiz >= MRB_PARSER_TOKBUF_MAX) {
-      p->tidx += len;
-      return;
-    }
-    p->tsiz *= 2;
-    if (p->tokbuf == p->buf) {
-      p->tokbuf = (char*)mrb_malloc(p->mrb, p->tsiz);
-      memcpy(p->tokbuf, p->buf, MRB_PARSER_TOKBUF_SIZE);
-    }
-    else {
-      p->tokbuf = (char*)mrb_realloc(p->mrb, p->tokbuf, p->tsiz);
-    }
-  }
-  for (i = 0; i < len; i++) {
-    p->tokbuf[p->tidx++] = utf8[i];
-  }
-}
-
-static int
-toklast(parser_state *p)
-{
-  return p->tokbuf[p->tidx-1];
-}
-
-static void
-tokfix(parser_state *p)
-{
-  if (p->tidx >= MRB_PARSER_TOKBUF_MAX) {
-    p->tidx = MRB_PARSER_TOKBUF_MAX-1;
-    yyerror(p, "string too long (truncated)");
-  }
-  p->tokbuf[p->tidx] = '\0';
-}
-
-static const char*
-tok(parser_state *p)
-{
-  return p->tokbuf;
-}
-
-static int
-toklen(parser_state *p)
-{
-  return p->tidx;
-}
-
-#define IS_ARG() (p->lstate == EXPR_ARG || p->lstate == EXPR_CMDARG)
-#define IS_END() (p->lstate == EXPR_END || p->lstate == EXPR_ENDARG || p->lstate == EXPR_ENDFN)
-#define IS_BEG() (p->lstate == EXPR_BEG || p->lstate == EXPR_MID || p->lstate == EXPR_VALUE || p->lstate == EXPR_CLASS)
-#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
-#define IS_LABEL_POSSIBLE() ((p->lstate == EXPR_BEG && !cmd_state) || IS_ARG())
-#define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1))
-
-static int
-scan_oct(const int *start, int len, int *retlen)
-{
-  const int *s = start;
-  int retval = 0;
-
-  /* mrb_assert(len <= 3) */
-  while (len-- && *s >= '0' && *s <= '7') {
-    retval <<= 3;
-    retval |= *s++ - '0';
-  }
-  *retlen = s - start;
-
-  return retval;
-}
-
-static int32_t
-scan_hex(const int *start, int len, int *retlen)
-{
-  static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF";
-  const int *s = start;
-  int32_t retval = 0;
-  char *tmp;
-
-  /* mrb_assert(len <= 8) */
-  while (len-- && *s && (tmp = (char*)strchr(hexdigit, *s))) {
-    retval <<= 4;
-    retval |= (tmp - hexdigit) & 15;
-    s++;
-  }
-  *retlen = s - start;
-
-  return retval;
-}
-
-static int32_t
-read_escape_unicode(parser_state *p, int limit)
-{
-  int32_t c;
-  int buf[9];
-  int i;
-
-  /* Look for opening brace */
-  i = 0;
-  buf[0] = nextc(p);
-  if (buf[0] < 0) goto eof;
-  if (ISXDIGIT(buf[0])) {
-    /* \uxxxx form */
-    for (i=1; i<limit; i++) {
-      buf[i] = nextc(p);
-      if (buf[i] < 0) goto eof;
-      if (!ISXDIGIT(buf[i])) {
-        pushback(p, buf[i]);
-        break;
-      }
-    }
-  }
-  else {
-    pushback(p, buf[0]);
-  }
-  c = scan_hex(buf, i, &i);
-  if (i == 0) {
-  eof:
-    yyerror(p, "Invalid escape character syntax");
-    return -1;
-  }
-  if (c < 0 || c > 0x10FFFF || (c & 0xFFFFF800) == 0xD800) {
-    yyerror(p, "Invalid Unicode code point");
-    return -1;
-  }
-  return c;
-}
-
-/* Return negative to indicate Unicode code point */
-static int32_t
-read_escape(parser_state *p)
-{
-  int32_t c;
-
-  switch (c = nextc(p)) {
-  case '\\':/* Backslash */
-    return c;
-
-  case 'n':/* newline */
-    return '\n';
-
-  case 't':/* horizontal tab */
-    return '\t';
-
-  case 'r':/* carriage-return */
-    return '\r';
-
-  case 'f':/* form-feed */
-    return '\f';
-
-  case 'v':/* vertical tab */
-    return '\13';
-
-  case 'a':/* alarm(bell) */
-    return '\007';
-
-  case 'e':/* escape */
-    return 033;
-
-  case '0': case '1': case '2': case '3': /* octal constant */
-  case '4': case '5': case '6': case '7':
-  {
-    int buf[3];
-    int i;
-
-    buf[0] = c;
-    for (i=1; i<3; i++) {
-      buf[i] = nextc(p);
-      if (buf[i] < 0) goto eof;
-      if (buf[i] < '0' || '7' < buf[i]) {
-        pushback(p, buf[i]);
-        break;
-      }
-    }
-    c = scan_oct(buf, i, &i);
-  }
-  return c;
-
-  case 'x':     /* hex constant */
-  {
-    int buf[2];
-    int i;
-
-    for (i=0; i<2; i++) {
-      buf[i] = nextc(p);
-      if (buf[i] < 0) goto eof;
-      if (!ISXDIGIT(buf[i])) {
-        pushback(p, buf[i]);
-        break;
-      }
-    }
-    c = scan_hex(buf, i, &i);
-    if (i == 0) {
-      yyerror(p, "Invalid escape character syntax");
-      return 0;
-    }
-  }
-  return c;
-
-  case 'u':     /* Unicode */
-    if (peek(p, '{')) {
-      /* \u{xxxxxxxx} form */
-      nextc(p);
-      c = read_escape_unicode(p, 8);
-      if (c < 0) return 0;
-      if (nextc(p) != '}') goto eof;
-    }
-    else {
-      c = read_escape_unicode(p, 4);
-      if (c < 0) return 0;
-    }
-  return -c;
-
-  case 'b':/* backspace */
-    return '\010';
-
-  case 's':/* space */
-    return ' ';
-
-  case 'M':
-    if ((c = nextc(p)) != '-') {
-      yyerror(p, "Invalid escape character syntax");
-      pushback(p, c);
-      return '\0';
-    }
-    if ((c = nextc(p)) == '\\') {
-      return read_escape(p) | 0x80;
-    }
-    else if (c < 0) goto eof;
-    else {
-      return ((c & 0xff) | 0x80);
-    }
-
-  case 'C':
-    if ((c = nextc(p)) != '-') {
-      yyerror(p, "Invalid escape character syntax");
-      pushback(p, c);
-      return '\0';
-    }
-  case 'c':
-    if ((c = nextc(p))== '\\') {
-      c = read_escape(p);
-    }
-    else if (c == '?')
-      return 0177;
-    else if (c < 0) goto eof;
-    return c & 0x9f;
-
-    eof:
-  case -1:
-  case -2:                      /* end of a file */
-    yyerror(p, "Invalid escape character syntax");
-    return '\0';
-
-  default:
-    return c;
-  }
-}
-
-static int
-parse_string(parser_state *p)
-{
-  int c;
-  string_type type = (string_type)(intptr_t)p->lex_strterm->car;
-  int nest_level = (intptr_t)p->lex_strterm->cdr->car;
-  int beg = (intptr_t)p->lex_strterm->cdr->cdr->car;
-  int end = (intptr_t)p->lex_strterm->cdr->cdr->cdr;
-  parser_heredoc_info *hinf = (type & STR_FUNC_HEREDOC) ? parsing_heredoc_inf(p) : NULL;
-  int cmd_state = p->cmd_start;
-
-  if (beg == 0) beg = -3;       /* should never happen */
-  if (end == 0) end = -3;
-  newtok(p);
-  while ((c = nextc(p)) != end || nest_level != 0) {
-    if (hinf && (c == '\n' || c < 0)) {
-      mrb_bool line_head;
-      tokadd(p, '\n');
-      tokfix(p);
-      p->lineno++;
-      p->column = 0;
-      line_head = hinf->line_head;
-      hinf->line_head = TRUE;
-      if (line_head) {
-        /* check whether end of heredoc */
-        const char *s = tok(p);
-        int len = toklen(p);
-        if (hinf->allow_indent) {
-          while (ISSPACE(*s) && len > 0) {
-            ++s;
-            --len;
-          }
-        }
-        if ((len-1 == hinf->term_len) && (strncmp(s, hinf->term, len-1) == 0)) {
-          if (c < 0) {
-            p->parsing_heredoc = NULL;
-          }
-          else {
-            return tHEREDOC_END;
-          }
-        }
-      }
-      if (c < 0) {
-        char buf[256];
-        snprintf(buf, sizeof(buf), "can't find heredoc delimiter \"%s\" anywhere before EOF", hinf->term);
-        yyerror(p, buf);
-        return 0;
-      }
-      pylval.nd = new_str(p, tok(p), toklen(p));
-      return tHD_STRING_MID;
-    }
-    if (c < 0) {
-      yyerror(p, "unterminated string meets end of file");
-      return 0;
-    }
-    else if (c == beg) {
-      nest_level++;
-      p->lex_strterm->cdr->car = (node*)(intptr_t)nest_level;
-    }
-    else if (c == end) {
-      nest_level--;
-      p->lex_strterm->cdr->car = (node*)(intptr_t)nest_level;
-    }
-    else if (c == '\\') {
-      c = nextc(p);
-      if (type & STR_FUNC_EXPAND) {
-        if (c == end || c == beg) {
-          tokadd(p, c);
-        }
-        else if (c == '\n') {
-          p->lineno++;
-          p->column = 0;
-          if (type & STR_FUNC_ARRAY) {
-            tokadd(p, '\n');
-          }
-        }
-        else if (type & STR_FUNC_REGEXP) {
-          tokadd(p, '\\');
-          tokadd(p, c);
-        }
-        else if (c == 'u' && peek(p, '{')) {
-          /* \u{xxxx xxxx xxxx} form */
-          nextc(p);
-          while (1) {
-            do c = nextc(p); while (ISSPACE(c));
-            if (c == '}') break;
-            pushback(p, c);
-            c = read_escape_unicode(p, 8);
-            if (c < 0) break;
-            tokadd(p, -c);
-          }
-          if (hinf)
-            hinf->line_head = FALSE;
-        }
-        else {
-          pushback(p, c);
-          tokadd(p, read_escape(p));
-          if (hinf)
-            hinf->line_head = FALSE;
-        }
-      }
-      else {
-        if (c != beg && c != end) {
-          if (c == '\n') {
-            p->lineno++;
-            p->column = 0;
-          }
-          if (!(c == '\\' || ((type & STR_FUNC_ARRAY) && ISSPACE(c)))) {
-            tokadd(p, '\\');
-          }
-        }
-        tokadd(p, c);
-      }
-      continue;
-    }
-    else if ((c == '#') && (type & STR_FUNC_EXPAND)) {
-      c = nextc(p);
-      if (c == '{') {
-        tokfix(p);
-        p->lstate = EXPR_BEG;
-        p->cmd_start = TRUE;
-        pylval.nd = new_str(p, tok(p), toklen(p));
-        if (hinf) {
-          hinf->line_head = FALSE;
-          return tHD_STRING_PART;
-        }
-        return tSTRING_PART;
-      }
-      tokadd(p, '#');
-      pushback(p, c);
-      continue;
-    }
-    if ((type & STR_FUNC_ARRAY) && ISSPACE(c)) {
-      if (toklen(p) == 0) {
-        do {
-          if (c == '\n') {
-            p->lineno++;
-            p->column = 0;
-            heredoc_treat_nextline(p);
-            if (p->parsing_heredoc != NULL) {
-              return tHD_LITERAL_DELIM;
-            }
-          }
-          c = nextc(p);
-        } while (ISSPACE(c));
-        pushback(p, c);
-        return tLITERAL_DELIM;
-      }
-      else {
-        pushback(p, c);
-        tokfix(p);
-        pylval.nd = new_str(p, tok(p), toklen(p));
-        return tSTRING_MID;
-      }
-    }
-    if (c == '\n') {
-      p->lineno++;
-      p->column = 0;
-    }
-    tokadd(p, c);
-  }
-
-  tokfix(p);
-  p->lstate = EXPR_END;
-  end_strterm(p);
-
-  if (type & STR_FUNC_XQUOTE) {
-    pylval.nd = new_xstr(p, tok(p), toklen(p));
-    return tXSTRING;
-  }
-
-  if (type & STR_FUNC_REGEXP) {
-    int f = 0;
-    int re_opt;
-    char *s = strndup(tok(p), toklen(p));
-    char flags[3];
-    char *flag = flags;
-    char enc = '\0';
-    char *encp;
-    char *dup;
-
-    newtok(p);
-    while (re_opt = nextc(p), re_opt >= 0 && ISALPHA(re_opt)) {
-      switch (re_opt) {
-      case 'i': f |= 1; break;
-      case 'x': f |= 2; break;
-      case 'm': f |= 4; break;
-      case 'u': f |= 16; break;
-      case 'n': f |= 32; break;
-      default: tokadd(p, re_opt); break;
-      }
-    }
-    pushback(p, re_opt);
-    if (toklen(p)) {
-      char msg[128];
-      tokfix(p);
-      snprintf(msg, sizeof(msg), "unknown regexp option%s - %s",
-          toklen(p) > 1 ? "s" : "", tok(p));
-      yyerror(p, msg);
-    }
-    if (f != 0) {
-      if (f & 1) *flag++ = 'i';
-      if (f & 2) *flag++ = 'x';
-      if (f & 4) *flag++ = 'm';
-      if (f & 16) enc = 'u';
-      if (f & 32) enc = 'n';
-    }
-    if (flag > flags) {
-      dup = strndup(flags, (size_t)(flag - flags));
-    }
-    else {
-      dup = NULL;
-    }
-    if (enc) {
-      encp = strndup(&enc, 1);
-    }
-    else {
-      encp = NULL;
-    }
-    pylval.nd = new_regx(p, s, dup, encp);
-
-    return tREGEXP;
-  }
-  pylval.nd = new_str(p, tok(p), toklen(p));
-  if (IS_LABEL_POSSIBLE()) {
-    if (IS_LABEL_SUFFIX(0)) {
-      p->lstate = EXPR_BEG;
-      nextc(p);
-      return tLABEL_END;
-    }
-  }
-
-  return tSTRING;
-}
-
-
-static int
-heredoc_identifier(parser_state *p)
-{
-  int c;
-  int type = str_heredoc;
-  mrb_bool indent = FALSE;
-  mrb_bool quote = FALSE;
-  node *newnode;
-  parser_heredoc_info *info;
-
-  c = nextc(p);
-  if (ISSPACE(c) || c == '=') {
-    pushback(p, c);
-    return 0;
-  }
-  if (c == '-') {
-    indent = TRUE;
-    c = nextc(p);
-  }
-  if (c == '\'' || c == '"') {
-    int term = c;
-    if (c == '\'')
-      quote = TRUE;
-    newtok(p);
-    while ((c = nextc(p)) >= 0 && c != term) {
-      if (c == '\n') {
-        c = -1;
-        break;
-      }
-      tokadd(p, c);
-    }
-    if (c < 0) {
-      yyerror(p, "unterminated here document identifier");
-      return 0;
-    }
-  }
-  else {
-    if (c < 0) {
-      return 0;                 /* missing here document identifier */
-    }
-    if (! identchar(c)) {
-      pushback(p, c);
-      if (indent) pushback(p, '-');
-      return 0;
-    }
-    newtok(p);
-    do {
-      tokadd(p, c);
-    } while ((c = nextc(p)) >= 0 && identchar(c));
-    pushback(p, c);
-  }
-  tokfix(p);
-  newnode = new_heredoc(p);
-  info = (parser_heredoc_info*)newnode->cdr;
-  info->term = strndup(tok(p), toklen(p));
-  info->term_len = toklen(p);
-  if (! quote)
-    type |= STR_FUNC_EXPAND;
-  info->type = (string_type)type;
-  info->allow_indent = indent;
-  info->line_head = TRUE;
-  info->doc = NULL;
-  p->heredocs_from_nextline = push(p->heredocs_from_nextline, newnode);
-  p->lstate = EXPR_END;
-
-  pylval.nd = newnode;
-  return tHEREDOC_BEG;
-}
-
-static int
-arg_ambiguous(parser_state *p)
-{
-  yywarning(p, "ambiguous first argument; put parentheses or even spaces");
-  return 1;
-}
-
-#include "lex.def"
-
-static int
-parser_yylex(parser_state *p)
-{
-  int32_t c;
-  int space_seen = 0;
-  int cmd_state;
-  enum mrb_lex_state_enum last_state;
-  int token_column;
-
-  if (p->lex_strterm) {
-    if (is_strterm_type(p, STR_FUNC_HEREDOC)) {
-      if (p->parsing_heredoc != NULL)
-        return parse_string(p);
-    }
-    else
-      return parse_string(p);
-  }
-  cmd_state = p->cmd_start;
-  p->cmd_start = FALSE;
-  retry:
-  last_state = p->lstate;
-  switch (c = nextc(p)) {
-  case '\004':  /* ^D */
-  case '\032':  /* ^Z */
-  case '\0':    /* NUL */
-  case -1:      /* end of script. */
-    if (p->heredocs_from_nextline)
-      goto maybe_heredoc;
-    return 0;
-
-  /* white spaces */
-  case ' ': case '\t': case '\f': case '\r':
-  case '\13':   /* '\v' */
-    space_seen = 1;
-    goto retry;
-
-  case '#':     /* it's a comment */
-    skip(p, '\n');
-    /* fall through */
-  case -2:      /* end of a file */
-  case '\n':
-    maybe_heredoc:
-    heredoc_treat_nextline(p);
-  switch (p->lstate) {
-  case EXPR_BEG:
-  case EXPR_FNAME:
-  case EXPR_DOT:
-  case EXPR_CLASS:
-  case EXPR_VALUE:
-    p->lineno++;
-    p->column = 0;
-    if (p->parsing_heredoc != NULL) {
-      if (p->lex_strterm) {
-        return parse_string(p);
-      }
-    }
-    goto retry;
-  default:
-    break;
-  }
-  if (p->parsing_heredoc != NULL) {
-    return '\n';
-  }
-  while ((c = nextc(p))) {
-    switch (c) {
-    case ' ': case '\t': case '\f': case '\r':
-    case '\13': /* '\v' */
-      space_seen = 1;
-      break;
-    case '.':
-      if ((c = nextc(p)) != '.') {
-        pushback(p, c);
-        pushback(p, '.');
-        goto retry;
-      }
-    case -1:                  /* EOF */
-    case -2:                  /* end of a file */
-      goto normal_newline;
-    default:
-      pushback(p, c);
-      goto normal_newline;
-    }
-  }
-  normal_newline:
-  p->cmd_start = TRUE;
-  p->lstate = EXPR_BEG;
-  return '\n';
-
-  case '*':
-    if ((c = nextc(p)) == '*') {
-      if ((c = nextc(p)) == '=') {
-        pylval.id = intern("**",2);
-        p->lstate = EXPR_BEG;
-        return tOP_ASGN;
-      }
-      pushback(p, c);
-      c = tPOW;
-    }
-    else {
-      if (c == '=') {
-        pylval.id = intern_c('*');
-        p->lstate = EXPR_BEG;
-        return tOP_ASGN;
-      }
-      pushback(p, c);
-      if (IS_SPCARG(c)) {
-        yywarning(p, "'*' interpreted as argument prefix");
-        c = tSTAR;
-      }
-      else if (IS_BEG()) {
-        c = tSTAR;
-      }
-      else {
-        c = '*';
-      }
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    return c;
-
-  case '!':
-    c = nextc(p);
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-      if (c == '@') {
-        return '!';
-      }
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    if (c == '=') {
-      return tNEQ;
-    }
-    if (c == '~') {
-      return tNMATCH;
-    }
-    pushback(p, c);
-    return '!';
-
-  case '=':
-    if (p->column == 1) {
-      static const char begin[] = "begin";
-      static const char end[] = "\n=end";
-      if (peeks(p, begin)) {
-        c = peekc_n(p, sizeof(begin)-1);
-        if (c < 0 || ISSPACE(c)) {
-          do {
-            if (!skips(p, end)) {
-              yyerror(p, "embedded document meets end of file");
-              return 0;
-            }
-            c = nextc(p);
-          } while (!(c < 0 || ISSPACE(c)));
-          if (c != '\n') skip(p, '\n');
-          p->lineno++;
-          p->column = 0;
-          goto retry;
-        }
-      }
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    if ((c = nextc(p)) == '=') {
-      if ((c = nextc(p)) == '=') {
-        return tEQQ;
-      }
-      pushback(p, c);
-      return tEQ;
-    }
-    if (c == '~') {
-      return tMATCH;
-    }
-    else if (c == '>') {
-      return tASSOC;
-    }
-    pushback(p, c);
-    return '=';
-
-  case '<':
-    c = nextc(p);
-    if (c == '<' &&
-        p->lstate != EXPR_DOT &&
-        p->lstate != EXPR_CLASS &&
-        !IS_END() &&
-        (!IS_ARG() || space_seen)) {
-      int token = heredoc_identifier(p);
-      if (token)
-        return token;
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-      if (p->lstate == EXPR_CLASS) {
-        p->cmd_start = TRUE;
-      }
-    }
-    if (c == '=') {
-      if ((c = nextc(p)) == '>') {
-        return tCMP;
-      }
-      pushback(p, c);
-      return tLEQ;
-    }
-    if (c == '<') {
-      if ((c = nextc(p)) == '=') {
-        pylval.id = intern("<<",2);
-        p->lstate = EXPR_BEG;
-        return tOP_ASGN;
-      }
-      pushback(p, c);
-      return tLSHFT;
-    }
-    pushback(p, c);
-    return '<';
-
-  case '>':
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    if ((c = nextc(p)) == '=') {
-      return tGEQ;
-    }
-    if (c == '>') {
-      if ((c = nextc(p)) == '=') {
-        pylval.id = intern(">>",2);
-        p->lstate = EXPR_BEG;
-        return tOP_ASGN;
-      }
-      pushback(p, c);
-      return tRSHFT;
-    }
-    pushback(p, c);
-    return '>';
-
-  case '"':
-    p->lex_strterm = new_strterm(p, str_dquote, '"', 0);
-    return tSTRING_BEG;
-
-  case '\'':
-    p->lex_strterm = new_strterm(p, str_squote, '\'', 0);
-    return parse_string(p);
-
-  case '`':
-    if (p->lstate == EXPR_FNAME) {
-      p->lstate = EXPR_ENDFN;
-      return '`';
-    }
-    if (p->lstate == EXPR_DOT) {
-      if (cmd_state)
-        p->lstate = EXPR_CMDARG;
-      else
-        p->lstate = EXPR_ARG;
-      return '`';
-    }
-    p->lex_strterm = new_strterm(p, str_xquote, '`', 0);
-    return tXSTRING_BEG;
-
-  case '?':
-    if (IS_END()) {
-      p->lstate = EXPR_VALUE;
-      return '?';
-    }
-    c = nextc(p);
-    if (c < 0) {
-      yyerror(p, "incomplete character syntax");
-      return 0;
-    }
-    if (ISSPACE(c)) {
-      if (!IS_ARG()) {
-        int c2;
-        switch (c) {
-        case ' ':
-          c2 = 's';
-          break;
-        case '\n':
-          c2 = 'n';
-          break;
-        case '\t':
-          c2 = 't';
-          break;
-        case '\v':
-          c2 = 'v';
-          break;
-        case '\r':
-          c2 = 'r';
-          break;
-        case '\f':
-          c2 = 'f';
-          break;
-        default:
-          c2 = 0;
-          break;
-        }
-        if (c2) {
-          char buf[256];
-          snprintf(buf, sizeof(buf), "invalid character syntax; use ?\\%c", c2);
-          yyerror(p, buf);
-        }
-      }
-      ternary:
-      pushback(p, c);
-      p->lstate = EXPR_VALUE;
-      return '?';
-    }
-    newtok(p);
-    /* need support UTF-8 if configured */
-    if ((isalnum(c) || c == '_')) {
-      int c2 = nextc(p);
-      pushback(p, c2);
-      if ((isalnum(c2) || c2 == '_')) {
-        goto ternary;
-      }
-    }
-    if (c == '\\') {
-      c = read_escape(p);
-      tokadd(p, c);
-    }
-    else {
-      tokadd(p, c);
-    }
-    tokfix(p);
-    pylval.nd = new_str(p, tok(p), toklen(p));
-    p->lstate = EXPR_END;
-    return tCHAR;
-
-  case '&':
-    if ((c = nextc(p)) == '&') {
-      p->lstate = EXPR_BEG;
-      if ((c = nextc(p)) == '=') {
-        pylval.id = intern("&&",2);
-        p->lstate = EXPR_BEG;
-        return tOP_ASGN;
-      }
-      pushback(p, c);
-      return tANDOP;
-    }
-    else if (c == '.') {
-      p->lstate = EXPR_DOT;
-      return tANDDOT;
-    }
-    else if (c == '=') {
-      pylval.id = intern_c('&');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    pushback(p, c);
-    if (IS_SPCARG(c)) {
-      yywarning(p, "'&' interpreted as argument prefix");
-      c = tAMPER;
-    }
-    else if (IS_BEG()) {
-      c = tAMPER;
-    }
-    else {
-      c = '&';
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    return c;
-
-  case '|':
-    if ((c = nextc(p)) == '|') {
-      p->lstate = EXPR_BEG;
-      if ((c = nextc(p)) == '=') {
-        pylval.id = intern("||",2);
-        p->lstate = EXPR_BEG;
-        return tOP_ASGN;
-      }
-      pushback(p, c);
-      return tOROP;
-    }
-    if (c == '=') {
-      pylval.id = intern_c('|');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    pushback(p, c);
-    return '|';
-
-  case '+':
-    c = nextc(p);
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-      if (c == '@') {
-        return tUPLUS;
-      }
-      pushback(p, c);
-      return '+';
-    }
-    if (c == '=') {
-      pylval.id = intern_c('+');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p))) {
-      p->lstate = EXPR_BEG;
-      pushback(p, c);
-      if (c >= 0 && ISDIGIT(c)) {
-        c = '+';
-        goto start_num;
-      }
-      return tUPLUS;
-    }
-    p->lstate = EXPR_BEG;
-    pushback(p, c);
-    return '+';
-
-  case '-':
-    c = nextc(p);
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-      if (c == '@') {
-        return tUMINUS;
-      }
-      pushback(p, c);
-      return '-';
-    }
-    if (c == '=') {
-      pylval.id = intern_c('-');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    if (c == '>') {
-      p->lstate = EXPR_ENDFN;
-      return tLAMBDA;
-    }
-    if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous(p))) {
-      p->lstate = EXPR_BEG;
-      pushback(p, c);
-      if (c >= 0 && ISDIGIT(c)) {
-        return tUMINUS_NUM;
-      }
-      return tUMINUS;
-    }
-    p->lstate = EXPR_BEG;
-    pushback(p, c);
-    return '-';
-
-  case '.':
-    p->lstate = EXPR_BEG;
-    if ((c = nextc(p)) == '.') {
-      if ((c = nextc(p)) == '.') {
-        return tDOT3;
-      }
-      pushback(p, c);
-      return tDOT2;
-    }
-    pushback(p, c);
-    if (c >= 0 && ISDIGIT(c)) {
-      yyerror(p, "no .<digit> floating literal anymore; put 0 before dot");
-    }
-    p->lstate = EXPR_DOT;
-    return '.';
-
-    start_num:
-  case '0': case '1': case '2': case '3': case '4':
-  case '5': case '6': case '7': case '8': case '9':
-  {
-    int is_float, seen_point, seen_e, nondigit;
-
-    is_float = seen_point = seen_e = nondigit = 0;
-    p->lstate = EXPR_END;
-    newtok(p);
-    if (c == '-' || c == '+') {
-      tokadd(p, c);
-      c = nextc(p);
-    }
-    if (c == '0') {
-#define no_digits() do {yyerror(p,"numeric literal without digits"); return 0;} while (0)
-      int start = toklen(p);
-      c = nextc(p);
-      if (c == 'x' || c == 'X') {
-        /* hexadecimal */
-        c = nextc(p);
-        if (c >= 0 && ISXDIGIT(c)) {
-          do {
-            if (c == '_') {
-              if (nondigit) break;
-              nondigit = c;
-              continue;
-            }
-            if (!ISXDIGIT(c)) break;
-            nondigit = 0;
-            tokadd(p, tolower(c));
-          } while ((c = nextc(p)) >= 0);
-        }
-        pushback(p, c);
-        tokfix(p);
-        if (toklen(p) == start) {
-          no_digits();
-        }
-        else if (nondigit) goto trailing_uc;
-        pylval.nd = new_int(p, tok(p), 16);
-        return tINTEGER;
-      }
-      if (c == 'b' || c == 'B') {
-        /* binary */
-        c = nextc(p);
-        if (c == '0' || c == '1') {
-          do {
-            if (c == '_') {
-              if (nondigit) break;
-              nondigit = c;
-              continue;
-            }
-            if (c != '0' && c != '1') break;
-            nondigit = 0;
-            tokadd(p, c);
-          } while ((c = nextc(p)) >= 0);
-        }
-        pushback(p, c);
-        tokfix(p);
-        if (toklen(p) == start) {
-          no_digits();
-        }
-        else if (nondigit) goto trailing_uc;
-        pylval.nd = new_int(p, tok(p), 2);
-        return tINTEGER;
-      }
-      if (c == 'd' || c == 'D') {
-        /* decimal */
-        c = nextc(p);
-        if (c >= 0 && ISDIGIT(c)) {
-          do {
-            if (c == '_') {
-              if (nondigit) break;
-              nondigit = c;
-              continue;
-            }
-            if (!ISDIGIT(c)) break;
-            nondigit = 0;
-            tokadd(p, c);
-          } while ((c = nextc(p)) >= 0);
-        }
-        pushback(p, c);
-        tokfix(p);
-        if (toklen(p) == start) {
-          no_digits();
-        }
-        else if (nondigit) goto trailing_uc;
-        pylval.nd = new_int(p, tok(p), 10);
-        return tINTEGER;
-      }
-      if (c == '_') {
-        /* 0_0 */
-        goto octal_number;
-      }
-      if (c == 'o' || c == 'O') {
-        /* prefixed octal */
-        c = nextc(p);
-        if (c < 0 || c == '_' || !ISDIGIT(c)) {
-          no_digits();
-        }
-      }
-      if (c >= '0' && c <= '7') {
-        /* octal */
-        octal_number:
-        do {
-          if (c == '_') {
-            if (nondigit) break;
-            nondigit = c;
-            continue;
-          }
-          if (c < '0' || c > '9') break;
-          if (c > '7') goto invalid_octal;
-          nondigit = 0;
-          tokadd(p, c);
-        } while ((c = nextc(p)) >= 0);
-
-        if (toklen(p) > start) {
-          pushback(p, c);
-          tokfix(p);
-          if (nondigit) goto trailing_uc;
-          pylval.nd = new_int(p, tok(p), 8);
-          return tINTEGER;
-        }
-        if (nondigit) {
-          pushback(p, c);
-          goto trailing_uc;
-        }
-      }
-      if (c > '7' && c <= '9') {
-        invalid_octal:
-        yyerror(p, "Invalid octal digit");
-      }
-      else if (c == '.' || c == 'e' || c == 'E') {
-        tokadd(p, '0');
-      }
-      else {
-        pushback(p, c);
-        pylval.nd = new_int(p, "0", 10);
-        return tINTEGER;
-      }
-    }
-
-    for (;;) {
-      switch (c) {
-      case '0': case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9':
-        nondigit = 0;
-        tokadd(p, c);
-        break;
-
-      case '.':
-        if (nondigit) goto trailing_uc;
-        if (seen_point || seen_e) {
-          goto decode_num;
-        }
-        else {
-          int c0 = nextc(p);
-          if (c0 < 0 || !ISDIGIT(c0)) {
-            pushback(p, c0);
-            goto decode_num;
-          }
-          c = c0;
-        }
-        tokadd(p, '.');
-        tokadd(p, c);
-        is_float++;
-        seen_point++;
-        nondigit = 0;
-        break;
-
-      case 'e':
-      case 'E':
-        if (nondigit) {
-          pushback(p, c);
-          c = nondigit;
-          goto decode_num;
-        }
-        if (seen_e) {
-          goto decode_num;
-        }
-        tokadd(p, c);
-        seen_e++;
-        is_float++;
-        nondigit = c;
-        c = nextc(p);
-        if (c != '-' && c != '+') continue;
-        tokadd(p, c);
-        nondigit = c;
-        break;
-
-      case '_':       /* '_' in number just ignored */
-        if (nondigit) goto decode_num;
-        nondigit = c;
-        break;
-
-      default:
-        goto decode_num;
-      }
-      c = nextc(p);
-    }
-
-    decode_num:
-    pushback(p, c);
-    if (nondigit) {
-      trailing_uc:
-      yyerror_i(p, "trailing '%c' in number", nondigit);
-    }
-    tokfix(p);
-    if (is_float) {
-      double d;
-      char *endp;
-
-      errno = 0;
-      d = mrb_float_read(tok(p), &endp);
-      if (d == 0 && endp == tok(p)) {
-        yywarning_s(p, "corrupted float value %s", tok(p));
-      }
-      else if (errno == ERANGE) {
-        yywarning_s(p, "float %s out of range", tok(p));
-        errno = 0;
-      }
-      pylval.nd = new_float(p, tok(p));
-      return tFLOAT;
-    }
-    pylval.nd = new_int(p, tok(p), 10);
-    return tINTEGER;
-  }
-
-  case ')':
-  case ']':
-    p->paren_nest--;
-    /* fall through */
-  case '}':
-    COND_LEXPOP();
-    CMDARG_LEXPOP();
-    if (c == ')')
-      p->lstate = EXPR_ENDFN;
-    else
-      p->lstate = EXPR_ENDARG;
-    return c;
-
-  case ':':
-    c = nextc(p);
-    if (c == ':') {
-      if (IS_BEG() || p->lstate == EXPR_CLASS || IS_SPCARG(-1)) {
-        p->lstate = EXPR_BEG;
-        return tCOLON3;
-      }
-      p->lstate = EXPR_DOT;
-      return tCOLON2;
-    }
-    if (IS_END() || ISSPACE(c)) {
-      pushback(p, c);
-      p->lstate = EXPR_BEG;
-      return ':';
-    }
-    pushback(p, c);
-    p->lstate = EXPR_FNAME;
-    return tSYMBEG;
-
-  case '/':
-    if (IS_BEG()) {
-      p->lex_strterm = new_strterm(p, str_regexp, '/', 0);
-      return tREGEXP_BEG;
-    }
-    if ((c = nextc(p)) == '=') {
-      pylval.id = intern_c('/');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    pushback(p, c);
-    if (IS_SPCARG(c)) {
-      p->lex_strterm = new_strterm(p, str_regexp, '/', 0);
-      return tREGEXP_BEG;
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    return '/';
-
-  case '^':
-    if ((c = nextc(p)) == '=') {
-      pylval.id = intern_c('^');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    pushback(p, c);
-    return '^';
-
-  case ';':
-    p->lstate = EXPR_BEG;
-    return ';';
-
-  case ',':
-    p->lstate = EXPR_BEG;
-    return ',';
-
-  case '~':
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      if ((c = nextc(p)) != '@') {
-        pushback(p, c);
-      }
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    return '~';
-
-  case '(':
-    if (IS_BEG()) {
-      c = tLPAREN;
-    }
-    else if (IS_SPCARG(-1)) {
-      c = tLPAREN_ARG;
-    }
-    p->paren_nest++;
-    COND_PUSH(0);
-    CMDARG_PUSH(0);
-    p->lstate = EXPR_BEG;
-    return c;
-
-  case '[':
-    p->paren_nest++;
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-      if ((c = nextc(p)) == ']') {
-        if ((c = nextc(p)) == '=') {
-          return tASET;
-        }
-        pushback(p, c);
-        return tAREF;
-      }
-      pushback(p, c);
-      return '[';
-    }
-    else if (IS_BEG()) {
-      c = tLBRACK;
-    }
-    else if (IS_ARG() && space_seen) {
-      c = tLBRACK;
-    }
-    p->lstate = EXPR_BEG;
-    COND_PUSH(0);
-    CMDARG_PUSH(0);
-    return c;
-
-  case '{':
-    if (p->lpar_beg && p->lpar_beg == p->paren_nest) {
-      p->lstate = EXPR_BEG;
-      p->lpar_beg = 0;
-      p->paren_nest--;
-      COND_PUSH(0);
-      CMDARG_PUSH(0);
-      return tLAMBEG;
-    }
-    if (IS_ARG() || p->lstate == EXPR_END || p->lstate == EXPR_ENDFN)
-      c = '{';          /* block (primary) */
-    else if (p->lstate == EXPR_ENDARG)
-      c = tLBRACE_ARG;  /* block (expr) */
-    else
-      c = tLBRACE;      /* hash */
-    COND_PUSH(0);
-    CMDARG_PUSH(0);
-    p->lstate = EXPR_BEG;
-    return c;
-
-  case '\\':
-    c = nextc(p);
-    if (c == '\n') {
-      p->lineno++;
-      p->column = 0;
-      space_seen = 1;
-      goto retry; /* skip \\n */
-    }
-    pushback(p, c);
-    return '\\';
-
-  case '%':
-    if (IS_BEG()) {
-      int term;
-      int paren;
-
-      c = nextc(p);
-      quotation:
-      if (c < 0 || !ISALNUM(c)) {
-        term = c;
-        c = 'Q';
-      }
-      else {
-        term = nextc(p);
-        if (isalnum(term)) {
-          yyerror(p, "unknown type of %string");
-          return 0;
-        }
-      }
-      if (c < 0 || term < 0) {
-        yyerror(p, "unterminated quoted string meets end of file");
-        return 0;
-      }
-      paren = term;
-      if (term == '(') term = ')';
-      else if (term == '[') term = ']';
-      else if (term == '{') term = '}';
-      else if (term == '<') term = '>';
-      else paren = 0;
-
-      switch (c) {
-      case 'Q':
-        p->lex_strterm = new_strterm(p, str_dquote, term, paren);
-        return tSTRING_BEG;
-
-      case 'q':
-        p->lex_strterm = new_strterm(p, str_squote, term, paren);
-        return parse_string(p);
-
-      case 'W':
-        p->lex_strterm = new_strterm(p, str_dword, term, paren);
-        return tWORDS_BEG;
-
-      case 'w':
-        p->lex_strterm = new_strterm(p, str_sword, term, paren);
-        return tWORDS_BEG;
-
-      case 'x':
-        p->lex_strterm = new_strterm(p, str_xquote, term, paren);
-        return tXSTRING_BEG;
-
-      case 'r':
-        p->lex_strterm = new_strterm(p, str_regexp, term, paren);
-        return tREGEXP_BEG;
-
-      case 's':
-        p->lex_strterm = new_strterm(p, str_ssym, term, paren);
-        return tSYMBEG;
-
-      case 'I':
-        p->lex_strterm = new_strterm(p, str_dsymbols, term, paren);
-        return tSYMBOLS_BEG;
-
-      case 'i':
-        p->lex_strterm = new_strterm(p, str_ssymbols, term, paren);
-        return tSYMBOLS_BEG;
-
-      default:
-        yyerror(p, "unknown type of %string");
-        return 0;
-      }
-    }
-    if ((c = nextc(p)) == '=') {
-      pylval.id = intern_c('%');
-      p->lstate = EXPR_BEG;
-      return tOP_ASGN;
-    }
-    if (IS_SPCARG(c)) {
-      goto quotation;
-    }
-    if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) {
-      p->lstate = EXPR_ARG;
-    }
-    else {
-      p->lstate = EXPR_BEG;
-    }
-    pushback(p, c);
-    return '%';
-
-  case '$':
-    p->lstate = EXPR_END;
-    token_column = newtok(p);
-    c = nextc(p);
-    if (c < 0) {
-      yyerror(p, "incomplete global variable syntax");
-      return 0;
-    }
-    switch (c) {
-    case '_':     /* $_: last read line string */
-      c = nextc(p);
-      if (c >= 0 && identchar(c)) { /* if there is more after _ it is a variable */
-        tokadd(p, '$');
-        tokadd(p, c);
-        break;
-      }
-      pushback(p, c);
-      c = '_';
-      /* fall through */
-    case '~':     /* $~: match-data */
-    case '*':     /* $*: argv */
-    case '$':     /* $$: pid */
-    case '?':     /* $?: last status */
-    case '!':     /* $!: error string */
-    case '@':     /* $@: error position */
-    case '/':     /* $/: input record separator */
-    case '\\':    /* $\: output record separator */
-    case ';':     /* $;: field separator */
-    case ',':     /* $,: output field separator */
-    case '.':     /* $.: last read line number */
-    case '=':     /* $=: ignorecase */
-    case ':':     /* $:: load path */
-    case '<':     /* $<: reading filename */
-    case '>':     /* $>: default output handle */
-    case '\"':    /* $": already loaded files */
-      tokadd(p, '$');
-      tokadd(p, c);
-      tokfix(p);
-      pylval.id = intern_cstr(tok(p));
-      return tGVAR;
-
-    case '-':
-      tokadd(p, '$');
-      tokadd(p, c);
-      c = nextc(p);
-      pushback(p, c);
-      gvar:
-      tokfix(p);
-      pylval.id = intern_cstr(tok(p));
-      return tGVAR;
-
-    case '&':     /* $&: last match */
-    case '`':     /* $`: string before last match */
-    case '\'':    /* $': string after last match */
-    case '+':     /* $+: string matches last pattern */
-      if (last_state == EXPR_FNAME) {
-        tokadd(p, '$');
-        tokadd(p, c);
-        goto gvar;
-      }
-      pylval.nd = new_back_ref(p, c);
-      return tBACK_REF;
-
-    case '1': case '2': case '3':
-    case '4': case '5': case '6':
-    case '7': case '8': case '9':
-      do {
-        tokadd(p, c);
-        c = nextc(p);
-      } while (c >= 0 && isdigit(c));
-      pushback(p, c);
-      if (last_state == EXPR_FNAME) goto gvar;
-      tokfix(p);
-      {
-        unsigned long n = strtoul(tok(p), NULL, 10);
-        if (n > INT_MAX) {
-          yyerror_i(p, "capture group index must be <= %d", INT_MAX);
-          return 0;
-        }
-        pylval.nd = new_nth_ref(p, (int)n);
-      }
-      return tNTH_REF;
-
-    default:
-      if (!identchar(c)) {
-        pushback(p,  c);
-        return '$';
-      }
-      /* fall through */
-    case '0':
-      tokadd(p, '$');
-    }
-    break;
-
-    case '@':
-      c = nextc(p);
-      token_column = newtok(p);
-      tokadd(p, '@');
-      if (c == '@') {
-        tokadd(p, '@');
-        c = nextc(p);
-      }
-      if (c < 0) {
-        if (p->tidx == 1) {
-          yyerror(p, "incomplete instance variable syntax");
-        }
-        else {
-          yyerror(p, "incomplete class variable syntax");
-        }
-        return 0;
-      }
-      else if (isdigit(c)) {
-        if (p->tidx == 1) {
-          yyerror_i(p, "'@%c' is not allowed as an instance variable name", c);
-        }
-        else {
-          yyerror_i(p, "'@@%c' is not allowed as a class variable name", c);
-        }
-        return 0;
-      }
-      if (!identchar(c)) {
-        pushback(p, c);
-        return '@';
-      }
-      break;
-
-    case '_':
-      token_column = newtok(p);
-      break;
-
-    default:
-      if (!identchar(c)) {
-        yyerror_i(p,  "Invalid char '\\x%02X' in expression", c);
-        goto retry;
-      }
-
-      token_column = newtok(p);
-      break;
-  }
-
-  do {
-    tokadd(p, c);
-    c = nextc(p);
-    if (c < 0) break;
-  } while (identchar(c));
-  if (token_column == 0 && toklen(p) == 7 && (c < 0 || c == '\n') &&
-      strncmp(tok(p), "__END__", toklen(p)) == 0)
-    return -1;
-
-  switch (tok(p)[0]) {
-  case '@': case '$':
-    pushback(p, c);
-    break;
-  default:
-    if ((c == '!' || c == '?') && !peek(p, '=')) {
-      tokadd(p, c);
-    }
-    else {
-      pushback(p, c);
-    }
-  }
-  tokfix(p);
-  {
-    int result = 0;
-
-    switch (tok(p)[0]) {
-    case '$':
-      p->lstate = EXPR_END;
-      result = tGVAR;
-      break;
-    case '@':
-      p->lstate = EXPR_END;
-      if (tok(p)[1] == '@')
-        result = tCVAR;
-      else
-        result = tIVAR;
-      break;
-
-    default:
-      if (toklast(p) == '!' || toklast(p) == '?') {
-        result = tFID;
-      }
-      else {
-        if (p->lstate == EXPR_FNAME) {
-          if ((c = nextc(p)) == '=' && !peek(p, '~') && !peek(p, '>') &&
-              (!peek(p, '=') || (peek_n(p, '>', 1)))) {
-            result = tIDENTIFIER;
-            tokadd(p, c);
-            tokfix(p);
-          }
-          else {
-            pushback(p, c);
-          }
-        }
-        if (result == 0 && ISUPPER(tok(p)[0])) {
-          result = tCONSTANT;
-        }
-        else {
-          result = tIDENTIFIER;
-        }
-      }
-
-      if (IS_LABEL_POSSIBLE()) {
-        if (IS_LABEL_SUFFIX(0)) {
-          p->lstate = EXPR_BEG;
-          nextc(p);
-          tokfix(p);
-          pylval.id = intern_cstr(tok(p));
-          return tLABEL;
-        }
-      }
-      if (p->lstate != EXPR_DOT) {
-        const struct kwtable *kw;
-
-        /* See if it is a reserved word.  */
-        kw = mrb_reserved_word(tok(p), toklen(p));
-        if (kw) {
-          enum mrb_lex_state_enum state = p->lstate;
-          pylval.num = p->lineno;
-          p->lstate = kw->state;
-          if (state == EXPR_FNAME) {
-            pylval.id = intern_cstr(kw->name);
-            return kw->id[0];
-          }
-          if (p->lstate == EXPR_BEG) {
-            p->cmd_start = TRUE;
-          }
-          if (kw->id[0] == keyword_do) {
-            if (p->lpar_beg && p->lpar_beg == p->paren_nest) {
-              p->lpar_beg = 0;
-              p->paren_nest--;
-              return keyword_do_LAMBDA;
-            }
-            if (COND_P()) return keyword_do_cond;
-            if (CMDARG_P() && state != EXPR_CMDARG)
-              return keyword_do_block;
-            if (state == EXPR_ENDARG || state == EXPR_BEG)
-              return keyword_do_block;
-            return keyword_do;
-          }
-          if (state == EXPR_BEG || state == EXPR_VALUE)
-            return kw->id[0];
-          else {
-            if (kw->id[0] != kw->id[1])
-              p->lstate = EXPR_BEG;
-            return kw->id[1];
-          }
-        }
-      }
-
-      if (IS_BEG() || p->lstate == EXPR_DOT || IS_ARG()) {
-        if (cmd_state) {
-          p->lstate = EXPR_CMDARG;
-        }
-        else {
-          p->lstate = EXPR_ARG;
-        }
-      }
-      else if (p->lstate == EXPR_FNAME) {
-        p->lstate = EXPR_ENDFN;
-      }
-      else {
-        p->lstate = EXPR_END;
-      }
-    }
-    {
-      mrb_sym ident = intern_cstr(tok(p));
-
-      pylval.id = ident;
-#if 0
-      if (last_state != EXPR_DOT && islower(tok(p)[0]) && lvar_defined(ident)) {
-        p->lstate = EXPR_END;
-      }
-#endif
-    }
-    return result;
-  }
-}
-
-static int
-yylex(void *lval, parser_state *p)
-{
-  p->ylval = lval;
-  return parser_yylex(p);
-}
-
-static void
-parser_init_cxt(parser_state *p, mrbc_context *cxt)
-{
-  if (!cxt) return;
-  if (cxt->filename) mrb_parser_set_filename(p, cxt->filename);
-  if (cxt->lineno) p->lineno = cxt->lineno;
-  if (cxt->syms) {
-    int i;
-
-    p->locals = cons(0,0);
-    for (i=0; i<cxt->slen; i++) {
-      local_add_f(p, cxt->syms[i]);
-    }
-  }
-  p->capture_errors = cxt->capture_errors;
-  p->no_optimize = cxt->no_optimize;
-  if (cxt->partial_hook) {
-    p->cxt = cxt;
-  }
-}
-
-static void
-parser_update_cxt(parser_state *p, mrbc_context *cxt)
-{
-  node *n, *n0;
-  int i = 0;
-
-  if (!cxt) return;
-  if ((int)(intptr_t)p->tree->car != NODE_SCOPE) return;
-  n0 = n = p->tree->cdr->car;
-  while (n) {
-    i++;
-    n = n->cdr;
-  }
-  cxt->syms = (mrb_sym *)mrb_realloc(p->mrb, cxt->syms, i*sizeof(mrb_sym));
-  cxt->slen = i;
-  for (i=0, n=n0; n; i++,n=n->cdr) {
-    cxt->syms[i] = sym(n->car);
-  }
-}
-
-void mrb_codedump_all(mrb_state*, struct RProc*);
-void mrb_parser_dump(mrb_state *mrb, node *tree, int offset);
-
-MRB_API void
-mrb_parser_parse(parser_state *p, mrbc_context *c)
-{
-  struct mrb_jmpbuf buf1;
-  p->jmp = &buf1;
-
-  MRB_TRY(p->jmp) {
-    int n = 1;
-
-    p->cmd_start = TRUE;
-    p->in_def = p->in_single = 0;
-    p->nerr = p->nwarn = 0;
-    p->lex_strterm = NULL;
-
-    parser_init_cxt(p, c);
-
-    if (p->mrb->jmp) {
-      n = yyparse(p);
-    }
-    else {
-      struct mrb_jmpbuf buf2;
-
-      p->mrb->jmp = &buf2;
-      MRB_TRY(p->mrb->jmp) {
-        n = yyparse(p);
-      }
-      MRB_CATCH(p->mrb->jmp) {
-        p->nerr++;
-      }
-      MRB_END_EXC(p->mrb->jmp);
-      p->mrb->jmp = 0;
-    }
-    if (n != 0 || p->nerr > 0) {
-      p->tree = 0;
-      return;
-    }
-    if (!p->tree) {
-      p->tree = new_nil(p);
-    }
-    parser_update_cxt(p, c);
-    if (c && c->dump_result) {
-      mrb_parser_dump(p->mrb, p->tree, 0);
-    }
-  }
-  MRB_CATCH(p->jmp) {
-    yyerror(p, "memory allocation error");
-    p->nerr++;
-    p->tree = 0;
-    return;
-  }
-  MRB_END_EXC(p->jmp);
-}
-
-MRB_API parser_state*
-mrb_parser_new(mrb_state *mrb)
-{
-  mrb_pool *pool;
-  parser_state *p;
-  static const parser_state parser_state_zero = { 0 };
-
-  pool = mrb_pool_open(mrb);
-  if (!pool) return NULL;
-  p = (parser_state *)mrb_pool_alloc(pool, sizeof(parser_state));
-  if (!p) return NULL;
-
-  *p = parser_state_zero;
-  p->mrb = mrb;
-  p->pool = pool;
-
-  p->s = p->send = NULL;
-#ifndef MRB_DISABLE_STDIO
-  p->f = NULL;
-#endif
-
-  p->cmd_start = TRUE;
-  p->in_def = p->in_single = 0;
-
-  p->capture_errors = FALSE;
-  p->lineno = 1;
-  p->column = 0;
-#if defined(PARSER_TEST) || defined(PARSER_DEBUG)
-  yydebug = 1;
-#endif
-  p->tsiz = MRB_PARSER_TOKBUF_SIZE;
-  p->tokbuf = p->buf;
-
-  p->lex_strterm = NULL;
-  p->all_heredocs = p->parsing_heredoc = NULL;
-  p->lex_strterm_before_heredoc = NULL;
-
-  p->current_filename_index = -1;
-  p->filename_table = NULL;
-  p->filename_table_length = 0;
-
-  return p;
-}
-
-MRB_API void
-mrb_parser_free(parser_state *p) {
-  if (p->tokbuf != p->buf) {
-    mrb_free(p->mrb, p->tokbuf);
-  }
-  mrb_pool_close(p->pool);
-}
-
-MRB_API mrbc_context*
-mrbc_context_new(mrb_state *mrb)
-{
-  return (mrbc_context *)mrb_calloc(mrb, 1, sizeof(mrbc_context));
-}
-
-MRB_API void
-mrbc_context_free(mrb_state *mrb, mrbc_context *cxt)
-{
-  mrb_free(mrb, cxt->filename);
-  mrb_free(mrb, cxt->syms);
-  mrb_free(mrb, cxt);
-}
-
-MRB_API const char*
-mrbc_filename(mrb_state *mrb, mrbc_context *c, const char *s)
-{
-  if (s) {
-    int len = strlen(s);
-    char *p = (char *)mrb_malloc(mrb, len + 1);
-
-    memcpy(p, s, len + 1);
-    if (c->filename) {
-      mrb_free(mrb, c->filename);
-    }
-    c->filename = p;
-  }
-  return c->filename;
-}
-
-MRB_API void
-mrbc_partial_hook(mrb_state *mrb, mrbc_context *c, int (*func)(struct mrb_parser_state*), void *data)
-{
-  c->partial_hook = func;
-  c->partial_data = data;
-}
-
-MRB_API void
-mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
-{
-  mrb_sym sym;
-  size_t i;
-  mrb_sym* new_table;
-
-  sym = mrb_intern_cstr(p->mrb, f);
-  p->filename = mrb_sym2name_len(p->mrb, sym, NULL);
-  p->lineno = (p->filename_table_length > 0)? 0 : 1;
-
-  for (i = 0; i < p->filename_table_length; ++i) {
-    if (p->filename_table[i] == sym) {
-      p->current_filename_index = i;
-      return;
-    }
-  }
-
-  p->current_filename_index = p->filename_table_length++;
-
-  new_table = (mrb_sym*)parser_palloc(p, sizeof(mrb_sym) * p->filename_table_length);
-  if (p->filename_table) {
-    memmove(new_table, p->filename_table, sizeof(mrb_sym) * p->filename_table_length);
-  }
-  p->filename_table = new_table;
-  p->filename_table[p->filename_table_length - 1] = sym;
-}
-
-MRB_API char const*
-mrb_parser_get_filename(struct mrb_parser_state* p, uint16_t idx) {
-  if (idx >= p->filename_table_length) { return NULL; }
-  else {
-    return mrb_sym2name_len(p->mrb, p->filename_table[idx], NULL);
-  }
-}
-
-#ifndef MRB_DISABLE_STDIO
-MRB_API parser_state*
-mrb_parse_file(mrb_state *mrb, FILE *f, mrbc_context *c)
-{
-  parser_state *p;
-
-  p = mrb_parser_new(mrb);
-  if (!p) return NULL;
-  p->s = p->send = NULL;
-  p->f = f;
-
-  mrb_parser_parse(p, c);
-  return p;
-}
-#endif
-
-MRB_API parser_state*
-mrb_parse_nstring(mrb_state *mrb, const char *s, int len, mrbc_context *c)
-{
-  parser_state *p;
-
-  p = mrb_parser_new(mrb);
-  if (!p) return NULL;
-  p->s = s;
-  p->send = s + len;
-
-  mrb_parser_parse(p, c);
-  return p;
-}
-
-MRB_API parser_state*
-mrb_parse_string(mrb_state *mrb, const char *s, mrbc_context *c)
-{
-  return mrb_parse_nstring(mrb, s, strlen(s), c);
-}
-
-MRB_API mrb_value
-mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
-{
-  struct RClass *target = mrb->object_class;
-  struct RProc *proc;
-  mrb_value v;
-  unsigned int keep = 0;
-
-  if (!p) {
-    return mrb_undef_value();
-  }
-  if (!p->tree || p->nerr) {
-    c->parser_nerr = p->nerr;
-    if (p->capture_errors) {
-      char buf[256];
-      int n;
-
-      n = snprintf(buf, sizeof(buf), "line %d: %s\n",
-          p->error_buffer[0].lineno, p->error_buffer[0].message);
-      mrb->exc = mrb_obj_ptr(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, n));
-      mrb_parser_free(p);
-      return mrb_undef_value();
-    }
-    else {
-      if (mrb->exc == NULL) {
-        mrb->exc = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
-      }
-      mrb_parser_free(p);
-      return mrb_undef_value();
-    }
-  }
-  proc = mrb_generate_code(mrb, p);
-  mrb_parser_free(p);
-  if (proc == NULL) {
-    if (mrb->exc == NULL) {
-      mrb->exc = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
-    }
-    return mrb_undef_value();
-  }
-  if (c) {
-    if (c->dump_result) mrb_codedump_all(mrb, proc);
-    if (c->no_exec) return mrb_obj_value(proc);
-    if (c->target_class) {
-      target = c->target_class;
-    }
-    if (c->keep_lv) {
-      keep = c->slen + 1;
-    }
-    else {
-      c->keep_lv = TRUE;
-    }
-  }
-  proc->target_class = target;
-  if (mrb->c->ci) {
-    mrb->c->ci->target_class = target;
-  }
-  v = mrb_top_run(mrb, proc, mrb_top_self(mrb), keep);
-  if (mrb->exc) return mrb_nil_value();
-  return v;
-}
-
-#ifndef MRB_DISABLE_STDIO
-MRB_API mrb_value
-mrb_load_file_cxt(mrb_state *mrb, FILE *f, mrbc_context *c)
-{
-  return mrb_load_exec(mrb, mrb_parse_file(mrb, f, c), c);
-}
-
-MRB_API mrb_value
-mrb_load_file(mrb_state *mrb, FILE *f)
-{
-  return mrb_load_file_cxt(mrb, f, NULL);
-}
-#endif
-
-MRB_API mrb_value
-mrb_load_nstring_cxt(mrb_state *mrb, const char *s, int len, mrbc_context *c)
-{
-  return mrb_load_exec(mrb, mrb_parse_nstring(mrb, s, len, c), c);
-}
-
-MRB_API mrb_value
-mrb_load_nstring(mrb_state *mrb, const char *s, int len)
-{
-  return mrb_load_nstring_cxt(mrb, s, len, NULL);
-}
-
-MRB_API mrb_value
-mrb_load_string_cxt(mrb_state *mrb, const char *s, mrbc_context *c)
-{
-  return mrb_load_nstring_cxt(mrb, s, strlen(s), c);
-}
-
-MRB_API mrb_value
-mrb_load_string(mrb_state *mrb, const char *s)
-{
-  return mrb_load_string_cxt(mrb, s, NULL);
-}
-
-#ifndef MRB_DISABLE_STDIO
-
-static void
-dump_prefix(node *tree, int offset)
-{
-  printf("%05d ", tree->lineno);
-  while (offset--) {
-    putc(' ', stdout);
-    putc(' ', stdout);
-  }
-}
-
-static void
-dump_recur(mrb_state *mrb, node *tree, int offset)
-{
-  while (tree) {
-    mrb_parser_dump(mrb, tree->car, offset);
-    tree = tree->cdr;
-  }
-}
-
-#endif
-
-void
-mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
-{
-#ifndef MRB_DISABLE_STDIO
-  int nodetype;
-
-  if (!tree) return;
-  again:
-  dump_prefix(tree, offset);
-  nodetype = (int)(intptr_t)tree->car;
-  tree = tree->cdr;
-  switch (nodetype) {
-  case NODE_BEGIN:
-    printf("NODE_BEGIN:\n");
-    dump_recur(mrb, tree, offset+1);
-    break;
-
-  case NODE_RESCUE:
-    printf("NODE_RESCUE:\n");
-    if (tree->car) {
-      dump_prefix(tree, offset+1);
-      printf("body:\n");
-      mrb_parser_dump(mrb, tree->car, offset+2);
-    }
-    tree = tree->cdr;
-    if (tree->car) {
-      node *n2 = tree->car;
-
-      dump_prefix(n2, offset+1);
-      printf("rescue:\n");
-      while (n2) {
-        node *n3 = n2->car;
-        if (n3->car) {
-          dump_prefix(n2, offset+2);
-          printf("handle classes:\n");
-          dump_recur(mrb, n3->car, offset+3);
-        }
-        if (n3->cdr->car) {
-          dump_prefix(n3, offset+2);
-          printf("exc_var:\n");
-          mrb_parser_dump(mrb, n3->cdr->car, offset+3);
-        }
-        if (n3->cdr->cdr->car) {
-          dump_prefix(n3, offset+2);
-          printf("rescue body:\n");
-          mrb_parser_dump(mrb, n3->cdr->cdr->car, offset+3);
-        }
-        n2 = n2->cdr;
-      }
-    }
-    tree = tree->cdr;
-    if (tree->car) {
-      dump_prefix(tree, offset+1);
-      printf("else:\n");
-      mrb_parser_dump(mrb, tree->car, offset+2);
-    }
-    break;
-
-  case NODE_ENSURE:
-    printf("NODE_ENSURE:\n");
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    dump_prefix(tree, offset+1);
-    printf("ensure:\n");
-    mrb_parser_dump(mrb, tree->cdr->cdr, offset+2);
-    break;
-
-  case NODE_LAMBDA:
-    printf("NODE_BLOCK:\n");
-    goto block;
-
-  case NODE_BLOCK:
-    block:
-    printf("NODE_BLOCK:\n");
-    tree = tree->cdr;
-    if (tree->car) {
-      node *n = tree->car;
-
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("mandatory args:\n");
-        dump_recur(mrb, n->car, offset+2);
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("optional args:\n");
-        {
-          node *n2 = n->car;
-
-          while (n2) {
-            dump_prefix(n2, offset+2);
-            printf("%s=", mrb_sym2name(mrb, sym(n2->car->car)));
-            mrb_parser_dump(mrb, n2->car->cdr, 0);
-            n2 = n2->cdr;
-          }
-        }
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("rest=*%s\n", mrb_sym2name(mrb, sym(n->car)));
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("post mandatory args:\n");
-        dump_recur(mrb, n->car, offset+2);
-      }
-      if (n->cdr) {
-        dump_prefix(n, offset+1);
-        printf("blk=&%s\n", mrb_sym2name(mrb, sym(n->cdr)));
-      }
-    }
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->cdr->car, offset+2);
-    break;
-
-  case NODE_IF:
-    printf("NODE_IF:\n");
-    dump_prefix(tree, offset+1);
-    printf("cond:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    dump_prefix(tree, offset+1);
-    printf("then:\n");
-    mrb_parser_dump(mrb, tree->cdr->car, offset+2);
-    if (tree->cdr->cdr->car) {
-      dump_prefix(tree, offset+1);
-      printf("else:\n");
-      mrb_parser_dump(mrb, tree->cdr->cdr->car, offset+2);
-    }
-    break;
-
-  case NODE_AND:
-    printf("NODE_AND:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    mrb_parser_dump(mrb, tree->cdr, offset+1);
-    break;
-
-  case NODE_OR:
-    printf("NODE_OR:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    mrb_parser_dump(mrb, tree->cdr, offset+1);
-    break;
-
-  case NODE_CASE:
-    printf("NODE_CASE:\n");
-    if (tree->car) {
-      mrb_parser_dump(mrb, tree->car, offset+1);
-    }
-    tree = tree->cdr;
-    while (tree) {
-      dump_prefix(tree, offset+1);
-      printf("case:\n");
-      dump_recur(mrb, tree->car->car, offset+2);
-      dump_prefix(tree, offset+1);
-      printf("body:\n");
-      mrb_parser_dump(mrb, tree->car->cdr, offset+2);
-      tree = tree->cdr;
-    }
-    break;
-
-  case NODE_WHILE:
-    printf("NODE_WHILE:\n");
-    dump_prefix(tree, offset+1);
-    printf("cond:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->cdr, offset+2);
-    break;
-
-  case NODE_UNTIL:
-    printf("NODE_UNTIL:\n");
-    dump_prefix(tree, offset+1);
-    printf("cond:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->cdr, offset+2);
-    break;
-
-  case NODE_FOR:
-    printf("NODE_FOR:\n");
-    dump_prefix(tree, offset+1);
-    printf("var:\n");
-    {
-      node *n2 = tree->car;
-
-      if (n2->car) {
-        dump_prefix(n2, offset+2);
-        printf("pre:\n");
-        dump_recur(mrb, n2->car, offset+3);
-      }
-      n2 = n2->cdr;
-      if (n2) {
-        if (n2->car) {
-          dump_prefix(n2, offset+2);
-          printf("rest:\n");
-          mrb_parser_dump(mrb, n2->car, offset+3);
-        }
-        n2 = n2->cdr;
-        if (n2) {
-          if (n2->car) {
-            dump_prefix(n2, offset+2);
-            printf("post:\n");
-            dump_recur(mrb, n2->car, offset+3);
-          }
-        }
-      }
-    }
-    tree = tree->cdr;
-    dump_prefix(tree, offset+1);
-    printf("in:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    tree = tree->cdr;
-    dump_prefix(tree, offset+1);
-    printf("do:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    break;
-
-  case NODE_SCOPE:
-    printf("NODE_SCOPE:\n");
-    {
-      node *n2 = tree->car;
-      mrb_bool first_lval = TRUE;
-
-      if (n2 && (n2->car || n2->cdr)) {
-        dump_prefix(n2, offset+1);
-        printf("local variables:\n");
-        dump_prefix(n2, offset+2);
-        while (n2) {
-          if (n2->car) {
-            if (!first_lval) printf(", ");
-            printf("%s", mrb_sym2name(mrb, sym(n2->car)));
-            first_lval = FALSE;
-          }
-          n2 = n2->cdr;
-        }
-        printf("\n");
-      }
-    }
-    tree = tree->cdr;
-    offset++;
-    goto again;
-
-  case NODE_FCALL:
-  case NODE_CALL:
-  case NODE_SCALL:
-    switch (nodetype) {
-    case NODE_FCALL:
-      printf("NODE_FCALL:\n"); break;
-    case NODE_CALL:
-      printf("NODE_CALL(.):\n"); break;
-    case NODE_SCALL:
-      printf("NODE_SCALL(&.):\n"); break;
-    default:
-      break;
-    }
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    dump_prefix(tree, offset+1);
-    printf("method='%s' (%d)\n",
-        mrb_sym2name(mrb, sym(tree->cdr->car)),
-        (int)(intptr_t)tree->cdr->car);
-    tree = tree->cdr->cdr->car;
-    if (tree) {
-      dump_prefix(tree, offset+1);
-      printf("args:\n");
-      dump_recur(mrb, tree->car, offset+2);
-      if (tree->cdr) {
-        dump_prefix(tree, offset+1);
-        printf("block:\n");
-        mrb_parser_dump(mrb, tree->cdr, offset+2);
-      }
-    }
-    break;
-
-  case NODE_DOT2:
-    printf("NODE_DOT2:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    mrb_parser_dump(mrb, tree->cdr, offset+1);
-    break;
-
-  case NODE_DOT3:
-    printf("NODE_DOT3:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    mrb_parser_dump(mrb, tree->cdr, offset+1);
-    break;
-
-  case NODE_COLON2:
-    printf("NODE_COLON2:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    dump_prefix(tree, offset+1);
-    printf("::%s\n", mrb_sym2name(mrb, sym(tree->cdr)));
-    break;
-
-  case NODE_COLON3:
-    printf("NODE_COLON3: ::%s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_ARRAY:
-    printf("NODE_ARRAY:\n");
-    dump_recur(mrb, tree, offset+1);
-    break;
-
-  case NODE_HASH:
-    printf("NODE_HASH:\n");
-    while (tree) {
-      dump_prefix(tree, offset+1);
-      printf("key:\n");
-      mrb_parser_dump(mrb, tree->car->car, offset+2);
-      dump_prefix(tree, offset+1);
-      printf("value:\n");
-      mrb_parser_dump(mrb, tree->car->cdr, offset+2);
-      tree = tree->cdr;
-    }
-    break;
-
-  case NODE_SPLAT:
-    printf("NODE_SPLAT:\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_ASGN:
-    printf("NODE_ASGN:\n");
-    dump_prefix(tree, offset+1);
-    printf("lhs:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    dump_prefix(tree, offset+1);
-    printf("rhs:\n");
-    mrb_parser_dump(mrb, tree->cdr, offset+2);
-    break;
-
-  case NODE_MASGN:
-    printf("NODE_MASGN:\n");
-    dump_prefix(tree, offset+1);
-    printf("mlhs:\n");
-    {
-      node *n2 = tree->car;
-
-      if (n2->car) {
-        dump_prefix(tree, offset+2);
-        printf("pre:\n");
-        dump_recur(mrb, n2->car, offset+3);
-      }
-      n2 = n2->cdr;
-      if (n2) {
-        if (n2->car) {
-          dump_prefix(n2, offset+2);
-          printf("rest:\n");
-          if (n2->car == (node*)-1) {
-            dump_prefix(n2, offset+2);
-            printf("(empty)\n");
-          }
-          else {
-            mrb_parser_dump(mrb, n2->car, offset+3);
-          }
-        }
-        n2 = n2->cdr;
-        if (n2) {
-          if (n2->car) {
-            dump_prefix(n2, offset+2);
-            printf("post:\n");
-            dump_recur(mrb, n2->car, offset+3);
-          }
-        }
-      }
-    }
-    dump_prefix(tree, offset+1);
-    printf("rhs:\n");
-    mrb_parser_dump(mrb, tree->cdr, offset+2);
-    break;
-
-  case NODE_OP_ASGN:
-    printf("NODE_OP_ASGN:\n");
-    dump_prefix(tree, offset+1);
-    printf("lhs:\n");
-    mrb_parser_dump(mrb, tree->car, offset+2);
-    tree = tree->cdr;
-    dump_prefix(tree, offset+1);
-    printf("op='%s' (%d)\n", mrb_sym2name(mrb, sym(tree->car)), (int)(intptr_t)tree->car);
-    tree = tree->cdr;
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    break;
-
-  case NODE_SUPER:
-    printf("NODE_SUPER:\n");
-    if (tree) {
-      dump_prefix(tree, offset+1);
-      printf("args:\n");
-      dump_recur(mrb, tree->car, offset+2);
-      if (tree->cdr) {
-        dump_prefix(tree, offset+1);
-        printf("block:\n");
-        mrb_parser_dump(mrb, tree->cdr, offset+2);
-      }
-    }
-    break;
-
-  case NODE_ZSUPER:
-    printf("NODE_ZSUPER\n");
-    break;
-
-  case NODE_RETURN:
-    printf("NODE_RETURN:\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_YIELD:
-    printf("NODE_YIELD:\n");
-    dump_recur(mrb, tree, offset+1);
-    break;
-
-  case NODE_BREAK:
-    printf("NODE_BREAK:\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_NEXT:
-    printf("NODE_NEXT:\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_REDO:
-    printf("NODE_REDO\n");
-    break;
-
-  case NODE_RETRY:
-    printf("NODE_RETRY\n");
-    break;
-
-  case NODE_LVAR:
-    printf("NODE_LVAR %s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_GVAR:
-    printf("NODE_GVAR %s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_IVAR:
-    printf("NODE_IVAR %s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_CVAR:
-    printf("NODE_CVAR %s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_CONST:
-    printf("NODE_CONST %s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_MATCH:
-    printf("NODE_MATCH:\n");
-    dump_prefix(tree, offset + 1);
-    printf("lhs:\n");
-    mrb_parser_dump(mrb, tree->car, offset + 2);
-    dump_prefix(tree, offset + 1);
-    printf("rhs:\n");
-    mrb_parser_dump(mrb, tree->cdr, offset + 2);
-    break;
-
-  case NODE_BACK_REF:
-    printf("NODE_BACK_REF: $%c\n", (int)(intptr_t)tree);
-    break;
-
-  case NODE_NTH_REF:
-    printf("NODE_NTH_REF: $%" MRB_PRId "\n", (mrb_int)(intptr_t)tree);
-    break;
-
-  case NODE_ARG:
-    printf("NODE_ARG %s\n", mrb_sym2name(mrb, sym(tree)));
-    break;
-
-  case NODE_BLOCK_ARG:
-    printf("NODE_BLOCK_ARG:\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_INT:
-    printf("NODE_INT %s base %d\n", (char*)tree->car, (int)(intptr_t)tree->cdr->car);
-    break;
-
-  case NODE_FLOAT:
-    printf("NODE_FLOAT %s\n", (char*)tree);
-    break;
-
-  case NODE_NEGATE:
-    printf("NODE_NEGATE\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_STR:
-    printf("NODE_STR \"%s\" len %d\n", (char*)tree->car, (int)(intptr_t)tree->cdr);
-    break;
-
-  case NODE_DSTR:
-    printf("NODE_DSTR\n");
-    dump_recur(mrb, tree, offset+1);
-    break;
-
-  case NODE_XSTR:
-    printf("NODE_XSTR \"%s\" len %d\n", (char*)tree->car, (int)(intptr_t)tree->cdr);
-    break;
-
-  case NODE_DXSTR:
-    printf("NODE_DXSTR\n");
-    dump_recur(mrb, tree, offset+1);
-    break;
-
-  case NODE_REGX:
-    printf("NODE_REGX /%s/%s\n", (char*)tree->car, (char*)tree->cdr);
-    break;
-
-  case NODE_DREGX:
-    printf("NODE_DREGX\n");
-    dump_recur(mrb, tree->car, offset+1);
-    dump_prefix(tree, offset);
-    printf("tail: %s\n", (char*)tree->cdr->cdr->car);
-    if (tree->cdr->cdr->cdr->car) {
-      dump_prefix(tree, offset);
-      printf("opt: %s\n", (char*)tree->cdr->cdr->cdr->car);
-    }
-    if (tree->cdr->cdr->cdr->cdr) {
-      dump_prefix(tree, offset);
-      printf("enc: %s\n", (char*)tree->cdr->cdr->cdr->cdr);
-    }
-    break;
-
-  case NODE_SYM:
-    printf("NODE_SYM :%s (%d)\n", mrb_sym2name(mrb, sym(tree)),
-           (int)(intptr_t)tree);
-    break;
-
-  case NODE_SELF:
-    printf("NODE_SELF\n");
-    break;
-
-  case NODE_NIL:
-    printf("NODE_NIL\n");
-    break;
-
-  case NODE_TRUE:
-    printf("NODE_TRUE\n");
-    break;
-
-  case NODE_FALSE:
-    printf("NODE_FALSE\n");
-    break;
-
-  case NODE_ALIAS:
-    printf("NODE_ALIAS %s %s:\n",
-        mrb_sym2name(mrb, sym(tree->car)),
-        mrb_sym2name(mrb, sym(tree->cdr)));
-    break;
-
-  case NODE_UNDEF:
-    printf("NODE_UNDEF");
-    {
-      node *t = tree;
-      while (t) {
-        printf(" %s", mrb_sym2name(mrb, sym(t->car)));
-        t = t->cdr;
-      }
-    }
-    printf(":\n");
-    break;
-
-  case NODE_CLASS:
-    printf("NODE_CLASS:\n");
-    if (tree->car->car == (node*)0) {
-      dump_prefix(tree, offset+1);
-      printf(":%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
-    }
-    else if (tree->car->car == (node*)1) {
-      dump_prefix(tree, offset+1);
-      printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
-    }
-    else {
-      mrb_parser_dump(mrb, tree->car->car, offset+1);
-      dump_prefix(tree, offset+1);
-      printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
-    }
-    if (tree->cdr->car) {
-      dump_prefix(tree, offset+1);
-      printf("super:\n");
-      mrb_parser_dump(mrb, tree->cdr->car, offset+2);
-    }
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->cdr->cdr->car->cdr, offset+2);
-    break;
-
-  case NODE_MODULE:
-    printf("NODE_MODULE:\n");
-    if (tree->car->car == (node*)0) {
-      dump_prefix(tree, offset+1);
-      printf(":%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
-    }
-    else if (tree->car->car == (node*)1) {
-      dump_prefix(tree, offset+1);
-      printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
-    }
-    else {
-      mrb_parser_dump(mrb, tree->car->car, offset+1);
-      dump_prefix(tree, offset+1);
-      printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
-    }
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->cdr->car->cdr, offset+2);
-    break;
-
-  case NODE_SCLASS:
-    printf("NODE_SCLASS:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    dump_prefix(tree, offset+1);
-    printf("body:\n");
-    mrb_parser_dump(mrb, tree->cdr->car->cdr, offset+2);
-    break;
-
-  case NODE_DEF:
-    printf("NODE_DEF:\n");
-    dump_prefix(tree, offset+1);
-    printf("%s\n", mrb_sym2name(mrb, sym(tree->car)));
-    tree = tree->cdr;
-    {
-      node *n2 = tree->car;
-      mrb_bool first_lval = TRUE;
-
-      if (n2 && (n2->car || n2->cdr)) {
-        dump_prefix(n2, offset+1);
-        printf("local variables:\n");
-        dump_prefix(n2, offset+2);
-        while (n2) {
-          if (n2->car) {
-            if (!first_lval) printf(", ");
-            printf("%s", mrb_sym2name(mrb, sym(n2->car)));
-            first_lval = FALSE;
-          }
-          n2 = n2->cdr;
-        }
-        printf("\n");
-      }
-    }
-    tree = tree->cdr;
-    if (tree->car) {
-      node *n = tree->car;
-
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("mandatory args:\n");
-        dump_recur(mrb, n->car, offset+2);
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("optional args:\n");
-        {
-          node *n2 = n->car;
-
-          while (n2) {
-            dump_prefix(n2, offset+2);
-            printf("%s=", mrb_sym2name(mrb, sym(n2->car->car)));
-            mrb_parser_dump(mrb, n2->car->cdr, 0);
-            n2 = n2->cdr;
-          }
-        }
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("rest=*%s\n", mrb_sym2name(mrb, sym(n->car)));
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("post mandatory args:\n");
-        dump_recur(mrb, n->car, offset+2);
-      }
-      if (n->cdr) {
-        dump_prefix(n, offset+1);
-        printf("blk=&%s\n", mrb_sym2name(mrb, sym(n->cdr)));
-      }
-    }
-    mrb_parser_dump(mrb, tree->cdr->car, offset+1);
-    break;
-
-  case NODE_SDEF:
-    printf("NODE_SDEF:\n");
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    tree = tree->cdr;
-    dump_prefix(tree, offset+1);
-    printf(":%s\n", mrb_sym2name(mrb, sym(tree->car)));
-    tree = tree->cdr->cdr;
-    if (tree->car) {
-      node *n = tree->car;
-
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("mandatory args:\n");
-        dump_recur(mrb, n->car, offset+2);
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("optional args:\n");
-        {
-          node *n2 = n->car;
-
-          while (n2) {
-            dump_prefix(n2, offset+2);
-            printf("%s=", mrb_sym2name(mrb, sym(n2->car->car)));
-            mrb_parser_dump(mrb, n2->car->cdr, 0);
-            n2 = n2->cdr;
-          }
-        }
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("rest=*%s\n", mrb_sym2name(mrb, sym(n->car)));
-      }
-      n = n->cdr;
-      if (n->car) {
-        dump_prefix(n, offset+1);
-        printf("post mandatory args:\n");
-        dump_recur(mrb, n->car, offset+2);
-      }
-      n = n->cdr;
-      if (n) {
-        dump_prefix(n, offset+1);
-        printf("blk=&%s\n", mrb_sym2name(mrb, sym(n)));
-      }
-    }
-    tree = tree->cdr;
-    mrb_parser_dump(mrb, tree->car, offset+1);
-    break;
-
-  case NODE_POSTEXE:
-    printf("NODE_POSTEXE:\n");
-    mrb_parser_dump(mrb, tree, offset+1);
-    break;
-
-  case NODE_HEREDOC:
-    printf("NODE_HEREDOC (<<%s):\n", ((parser_heredoc_info*)tree)->term);
-    dump_recur(mrb, ((parser_heredoc_info*)tree)->doc, offset+1);
-    break;
-
-  default:
-    printf("node type: %d (0x%x)\n", nodetype, (unsigned)nodetype);
-    break;
-  }
-#endif
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-compiler/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-MRuby::Gem::Specification.new 'mruby-compiler' do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mruby compiler library'
-
-  current_dir = spec.dir
-  current_build_dir = spec.build_dir
-
-  lex_def = "#{current_dir}/core/lex.def"
-  core_objs = Dir.glob("#{current_dir}/core/*.c").map { |f|
-    next nil if build.cxx_exception_enabled? and f =~ /(codegen).c$/
-    objfile(f.pathmap("#{current_build_dir}/core/%n"))
-  }.compact
-
-  if build.cxx_exception_enabled?
-    core_objs <<
-      build.compile_as_cxx("#{current_build_dir}/core/y.tab.c", "#{current_build_dir}/core/y.tab.cxx",
-                           objfile("#{current_build_dir}/y.tab"), ["#{current_dir}/core"]) <<
-      build.compile_as_cxx("#{current_dir}/core/codegen.c", "#{current_build_dir}/core/codegen.cxx")
-  else
-    core_objs << objfile("#{current_build_dir}/core/y.tab")
-    file objfile("#{current_build_dir}/core/y.tab") => "#{current_build_dir}/core/y.tab.c" do |t|
-      cc.run t.name, t.prerequisites.first, [], ["#{current_dir}/core"]
-    end
-  end
-  file objfile("#{current_build_dir}/core/y.tab") => lex_def
-
-  # Parser
-  file "#{current_build_dir}/core/y.tab.c" => ["#{current_dir}/core/parse.y"] do |t|
-    yacc.run t.name, t.prerequisites.first
-  end
-
-  # Lexical analyzer
-  file lex_def => "#{current_dir}/core/keywords" do |t|
-    gperf.run t.name, t.prerequisites.first
-  end
-
-  file libfile("#{build.build_dir}/lib/libmruby_core") => core_objs
-  build.libmruby << core_objs
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-MRuby::Gem::Specification.new('mruby-enumerator') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.add_dependency('mruby-fiber', :core => 'mruby-fiber')
-  spec.add_dependency 'mruby-enum-ext', :core => 'mruby-enum-ext'
-  spec.summary = 'Enumerator class'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/mrblib/enumerator.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,641 +0,0 @@
-##
-# enumerator.rb Enumerator class
-# See Copyright Notice in mruby.h
-
-##
-# A class which allows both internal and external iteration.
-#
-# An Enumerator can be created by the following methods.
-# - {Kernel#to_enum}
-# - {Kernel#enum_for}
-# - {Enumerator#initialize Enumerator.new}
-#
-# Most methods have two forms: a block form where the contents
-# are evaluated for each item in the enumeration, and a non-block form
-# which returns a new Enumerator wrapping the iteration.
-#
-#       enumerator = %w(one two three).each
-#       puts enumerator.class # => Enumerator
-#
-#       enumerator.each_with_object("foo") do |item, obj|
-#         puts "#{obj}: #{item}"
-#       end
-#
-#       # foo: one
-#       # foo: two
-#       # foo: three
-#
-#       enum_with_obj = enumerator.each_with_object("foo")
-#       puts enum_with_obj.class # => Enumerator
-#
-#       enum_with_obj.each do |item, obj|
-#         puts "#{obj}: #{item}"
-#       end
-#
-#       # foo: one
-#       # foo: two
-#       # foo: three
-#
-# This allows you to chain Enumerators together.  For example, you
-# can map a list's elements to strings containing the index
-# and the element as a string via:
-#
-#       puts %w[foo bar baz].map.with_index { |w, i| "#{i}:#{w}" }
-#       # => ["0:foo", "1:bar", "2:baz"]
-#
-# An Enumerator can also be used as an external iterator.
-# For example, Enumerator#next returns the next value of the iterator
-# or raises StopIteration if the Enumerator is at the end.
-#
-#       e = [1,2,3].each   # returns an enumerator object.
-#       puts e.next   # => 1
-#       puts e.next   # => 2
-#       puts e.next   # => 3
-#       puts e.next   # raises StopIteration
-#
-# You can use this to implement an internal iterator as follows:
-#
-#       def ext_each(e)
-#         while true
-#           begin
-#             vs = e.next_values
-#           rescue StopIteration
-#             return $!.result
-#           end
-#           y = yield(*vs)
-#           e.feed y
-#         end
-#       end
-#
-#       o = Object.new
-#
-#       def o.each
-#         puts yield
-#         puts yield(1)
-#         puts yield(1, 2)
-#         3
-#       end
-#
-#       # use o.each as an internal iterator directly.
-#       puts o.each {|*x| puts x; [:b, *x] }
-#       # => [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
-#
-#       # convert o.each to an external iterator for
-#       # implementing an internal iterator.
-#       puts ext_each(o.to_enum) {|*x| puts x; [:b, *x] }
-#       # => [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
-#
-class Enumerator
-  include Enumerable
-
-  ##
-  # @overload initialize(size = nil, &block)
-  # @overload initialize(obj, method = :each, *args)
-  #
-  # Creates a new Enumerator object, which can be used as an
-  # Enumerable.
-  #
-  # In the first form, iteration is defined by the given block, in
-  # which a "yielder" object, given as block parameter, can be used to
-  # yield a value by calling the +yield+ method (aliased as +<<+):
-  #
-  #     fib = Enumerator.new do |y|
-  #       a = b = 1
-  #       loop do
-  #         y << a
-  #         a, b = b, a + b
-  #       end
-  #     end
-  #
-  #     p fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
-  #
-  def initialize(obj=nil, meth=:each, *args, &block)
-    if block_given?
-      obj = Generator.new(&block)
-    else
-      raise ArgumentError unless obj
-    end
-
-    @obj = obj
-    @meth = meth
-    @args = args.dup
-    @fib = nil
-    @dst = nil
-    @lookahead = nil
-    @feedvalue = nil
-    @stop_exc = false
-  end
-  attr_accessor :obj, :meth, :args, :fib
-  private :obj, :meth, :args, :fib
-
-  def initialize_copy(obj)
-    raise TypeError, "can't copy type #{obj.class}" unless obj.kind_of? Enumerator
-    raise TypeError, "can't copy execution context" if obj.fib
-    @obj = obj.obj
-    @meth = obj.meth
-    @args = obj.args
-    @fib = nil
-    @lookahead = nil
-    @feedvalue = nil
-    self
-  end
-
-  ##
-  # call-seq:
-  #   e.with_index(offset = 0) {|(*args), idx| ... }
-  #   e.with_index(offset = 0)
-  #
-  # Iterates the given block for each element with an index, which
-  # starts from +offset+.  If no block is given, returns a new Enumerator
-  # that includes the index, starting from +offset+
-  #
-  # +offset+:: the starting index to use
-  #
-  def with_index(offset=0)
-    return to_enum :with_index, offset unless block_given?
-    offset = if offset.nil?
-      0
-    elsif offset.respond_to?(:to_int)
-      offset.to_int
-    else
-      raise TypeError, "no implicit conversion of #{offset.class} into Integer"
-    end
-
-    n = offset - 1
-    enumerator_block_call do |*i|
-      n += 1
-      yield i.__svalue, n
-    end
-  end
-
-  ##
-  # call-seq:
-  #   e.each_with_index {|(*args), idx| ... }
-  #   e.each_with_index
-  #
-  # Same as Enumerator#with_index(0), i.e. there is no starting offset.
-  #
-  # If no block is given, a new Enumerator is returned that includes the index.
-  #
-  def each_with_index(&block)
-    with_index(0, &block)
-  end
-
-  ##
-  # call-seq:
-  #   e.each_with_object(obj) {|(*args), obj| ... }
-  #   e.each_with_object(obj)
-  #   e.with_object(obj) {|(*args), obj| ... }
-  #   e.with_object(obj)
-  #
-  # Iterates the given block for each element with an arbitrary object, +obj+,
-  # and returns +obj+
-  #
-  # If no block is given, returns a new Enumerator.
-  #
-  # @example
-  #   to_three = Enumerator.new do |y|
-  #     3.times do |x|
-  #       y << x
-  #     end
-  #   end
-  #
-  #   to_three_with_string = to_three.with_object("foo")
-  #   to_three_with_string.each do |x,string|
-  #     puts "#{string}: #{x}"
-  #   end
-  #
-  #   # => foo:0
-  #   # => foo:1
-  #   # => foo:2
-  #
-  def with_object(object)
-    return to_enum(:with_object, object) unless block_given?
-
-    enumerator_block_call do |i|
-      yield [i,object]
-    end
-    object
-  end
-
-  def inspect
-    return "#<#{self.class}: uninitialized>" unless @obj
-
-    if @args && @args.size > 0
-      args = @args.join(", ")
-      "#<#{self.class}: #{@obj}:#{@meth}(#{args})>"
-    else
-      "#<#{self.class}: #{@obj}:#{@meth}>"
-    end
-  end
-
-  ##
-  # call-seq:
-  #   enum.each { |elm| block }                    -> obj
-  #   enum.each                                    -> enum
-  #   enum.each(*appending_args) { |elm| block }   -> obj
-  #   enum.each(*appending_args)                   -> an_enumerator
-  #
-  # Iterates over the block according to how this Enumerator was constructed.
-  # If no block and no arguments are given, returns self.
-  #
-  # === Examples
-  #
-  #   "Hello, world!".scan(/\w+/)                     #=> ["Hello", "world"]
-  #   "Hello, world!".to_enum(:scan, /\w+/).to_a      #=> ["Hello", "world"]
-  #   "Hello, world!".to_enum(:scan).each(/\w+/).to_a #=> ["Hello", "world"]
-  #
-  #   obj = Object.new
-  #
-  #   def obj.each_arg(a, b=:b, *rest)
-  #     yield a
-  #     yield b
-  #     yield rest
-  #     :method_returned
-  #   end
-  #
-  #   enum = obj.to_enum :each_arg, :a, :x
-  #
-  #   enum.each.to_a                  #=> [:a, :x, []]
-  #   enum.each.equal?(enum)          #=> true
-  #   enum.each { |elm| elm }         #=> :method_returned
-  #
-  #   enum.each(:y, :z).to_a          #=> [:a, :x, [:y, :z]]
-  #   enum.each(:y, :z).equal?(enum)  #=> false
-  #   enum.each(:y, :z) { |elm| elm } #=> :method_returned
-  #
-  def each(*argv, &block)
-    obj = self
-    if 0 < argv.length
-      obj = self.dup
-      args = obj.args
-      if !args.empty?
-        args = args.dup
-        args.concat argv
-      else
-        args = argv.dup
-      end
-      obj.args = args
-    end
-    return obj unless block_given?
-    enumerator_block_call(&block)
-  end
-
-  def enumerator_block_call(&block)
-    @obj.__send__ @meth, *@args, &block
-  end
-  private :enumerator_block_call
-
-  ##
-  # call-seq:
-  #   e.next   -> object
-  #
-  # Returns the next object in the enumerator, and move the internal position
-  # forward.  When the position reached at the end, StopIteration is raised.
-  #
-  # === Example
-  #
-  #   a = [1,2,3]
-  #   e = a.to_enum
-  #   p e.next   #=> 1
-  #   p e.next   #=> 2
-  #   p e.next   #=> 3
-  #   p e.next   #raises StopIteration
-  #
-  # Note that enumeration sequence by +next+ does not affect other non-external
-  # enumeration methods, unless the underlying iteration methods itself has
-  # side-effect
-  #
-  def next
-    next_values.__svalue
-  end
-
-  ##
-  # call-seq:
-  #   e.next_values   -> array
-  #
-  # Returns the next object as an array in the enumerator, and move the
-  # internal position forward.  When the position reached at the end,
-  # StopIteration is raised.
-  #
-  # This method can be used to distinguish <code>yield</code> and <code>yield
-  # nil</code>.
-  #
-  # === Example
-  #
-  #   o = Object.new
-  #   def o.each
-  #     yield
-  #     yield 1
-  #     yield 1, 2
-  #     yield nil
-  #     yield [1, 2]
-  #   end
-  #   e = o.to_enum
-  #   p e.next_values
-  #   p e.next_values
-  #   p e.next_values
-  #   p e.next_values
-  #   p e.next_values
-  #   e = o.to_enum
-  #   p e.next
-  #   p e.next
-  #   p e.next
-  #   p e.next
-  #   p e.next
-  #
-  #   ## yield args       next_values      next
-  #   #  yield            []               nil
-  #   #  yield 1          [1]              1
-  #   #  yield 1, 2       [1, 2]           [1, 2]
-  #   #  yield nil        [nil]            nil
-  #   #  yield [1, 2]     [[1, 2]]         [1, 2]
-  #
-  # Note that +next_values+ does not affect other non-external enumeration
-  # methods unless underlying iteration method itself has side-effect
-  #
-  def next_values
-    if @lookahead
-      vs = @lookahead
-      @lookahead = nil
-      return vs
-    end
-    raise @stop_exc if @stop_exc
-
-    curr = Fiber.current
-
-    if !@fib || !@fib.alive?
-      @dst = curr
-      @fib = Fiber.new do
-        result = each do |*args|
-          feedvalue = nil
-          Fiber.yield args
-          if @feedvalue
-            feedvalue = @feedvalue
-            @feedvalue = nil
-          end
-          feedvalue
-        end
-        @stop_exc = StopIteration.new "iteration reached an end"
-        @stop_exc.result = result
-        Fiber.yield nil
-      end
-      @lookahead = nil
-    end
-
-    vs = @fib.resume curr
-    if @stop_exc
-      @fib = nil
-      @dst = nil
-      @lookahead = nil
-      @feedvalue = nil
-      raise @stop_exc
-    end
-    vs
-  end
-
-  ##
-  # call-seq:
-  #   e.peek   -> object
-  #
-  # Returns the next object in the enumerator, but doesn't move the internal
-  # position forward.  If the position is already at the end, StopIteration
-  # is raised.
-  #
-  # === Example
-  #
-  #   a = [1,2,3]
-  #   e = a.to_enum
-  #   p e.next   #=> 1
-  #   p e.peek   #=> 2
-  #   p e.peek   #=> 2
-  #   p e.peek   #=> 2
-  #   p e.next   #=> 2
-  #   p e.next   #=> 3
-  #   p e.next   #raises StopIteration
-  #
-  def peek
-    peek_values.__svalue
-  end
-
-  ##
-  # call-seq:
-  #   e.peek_values   -> array
-  #
-  # Returns the next object as an array, similar to Enumerator#next_values, but
-  # doesn't move the internal position forward.  If the position is already at
-  # the end, StopIteration is raised.
-  #
-  # === Example
-  #
-  #   o = Object.new
-  #   def o.each
-  #     yield
-  #     yield 1
-  #     yield 1, 2
-  #   end
-  #   e = o.to_enum
-  #   p e.peek_values    #=> []
-  #   e.next
-  #   p e.peek_values    #=> [1]
-  #   p e.peek_values    #=> [1]
-  #   e.next
-  #   p e.peek_values    #=> [1, 2]
-  #   e.next
-  #   p e.peek_values    # raises StopIteration
-  #
-  def peek_values
-    if @lookahead.nil?
-      @lookahead = next_values
-    end
-    @lookahead.dup
-  end
-
-  ##
-  # call-seq:
-  #   e.rewind   -> e
-  #
-  # Rewinds the enumeration sequence to the beginning.
-  #
-  # If the enclosed object responds to a "rewind" method, it is called.
-  #
-  def rewind
-    @obj.rewind if @obj.respond_to? :rewind
-    @fib = nil
-    @dst = nil
-    @lookahead = nil
-    @feedvalue = nil
-    @stop_exc = false
-    self
-  end
-
-  ##
-  # call-seq:
-  #   e.feed obj   -> nil
-  #
-  # Sets the value to be returned by the next yield inside +e+.
-  #
-  # If the value is not set, the yield returns nil.
-  #
-  # This value is cleared after being yielded.
-  #
-  #   # Array#map passes the array's elements to "yield" and collects the
-  #   # results of "yield" as an array.
-  #   # Following example shows that "next" returns the passed elements and
-  #   # values passed to "feed" are collected as an array which can be
-  #   # obtained by StopIteration#result.
-  #   e = [1,2,3].map
-  #   p e.next           #=> 1
-  #   e.feed "a"
-  #   p e.next           #=> 2
-  #   e.feed "b"
-  #   p e.next           #=> 3
-  #   e.feed "c"
-  #   begin
-  #     e.next
-  #   rescue StopIteration
-  #     p $!.result      #=> ["a", "b", "c"]
-  #   end
-  #
-  #   o = Object.new
-  #   def o.each
-  #     x = yield         # (2) blocks
-  #     p x               # (5) => "foo"
-  #     x = yield         # (6) blocks
-  #     p x               # (8) => nil
-  #     x = yield         # (9) blocks
-  #     p x               # not reached w/o another e.next
-  #   end
-  #
-  #   e = o.to_enum
-  #   e.next              # (1)
-  #   e.feed "foo"        # (3)
-  #   e.next              # (4)
-  #   e.next              # (7)
-  #                       # (10)
-  #
-  def feed(value)
-    raise TypeError, "feed value already set" if @feedvalue
-    @feedvalue = value
-    nil
-  end
-
-  # just for internal
-  class Generator
-    include Enumerable
-    def initialize(&block)
-      raise TypeError, "wrong argument type #{self.class} (expected Proc)" unless block.kind_of? Proc
-
-      @proc = block
-    end
-
-    def each(*args, &block)
-      args.unshift Yielder.new(&block)
-      @proc.call(*args)
-    end
-  end
-
-  # just for internal
-  class Yielder
-    def initialize(&block)
-      raise LocalJumpError, "no block given" unless block_given?
-
-      @proc = block
-    end
-
-    def yield(*args)
-      @proc.call(*args)
-    end
-
-    def << *args
-      self.yield(*args)
-      self
-    end
-  end
-end
-
-module Kernel
-  ##
-  # call-seq:
-  #   obj.to_enum(method = :each, *args)                 -> enum
-  #   obj.enum_for(method = :each, *args)                -> enum
-  #   obj.to_enum(method = :each, *args) {|*args| block} -> enum
-  #   obj.enum_for(method = :each, *args){|*args| block} -> enum
-  #
-  # Creates a new Enumerator which will enumerate by calling +method+ on
-  # +obj+, passing +args+ if any.
-  #
-  # If a block is given, it will be used to calculate the size of
-  # the enumerator without the need to iterate it (see Enumerator#size).
-  #
-  # === Examples
-  #
-  #   str = "xyz"
-  #
-  #   enum = str.enum_for(:each_byte)
-  #   enum.each { |b| puts b }
-  #   # => 120
-  #   # => 121
-  #   # => 122
-  #
-  #   # protect an array from being modified by some_method
-  #   a = [1, 2, 3]
-  #   some_method(a.to_enum)
-  #
-  # It is typical to call to_enum when defining methods for
-  # a generic Enumerable, in case no block is passed.
-  #
-  # Here is such an example, with parameter passing and a sizing block:
-  #
-  #     module Enumerable
-  #       # a generic method to repeat the values of any enumerable
-  #       def repeat(n)
-  #         raise ArgumentError, "#{n} is negative!" if n < 0
-  #         unless block_given?
-  #           return to_enum(__method__, n) do # __method__ is :repeat here
-  #             sz = size     # Call size and multiply by n...
-  #             sz * n if sz  # but return nil if size itself is nil
-  #           end
-  #         end
-  #         each do |*val|
-  #           n.times { yield *val }
-  #         end
-  #       end
-  #     end
-  #
-  #     %i[hello world].repeat(2) { |w| puts w }
-  #       # => Prints 'hello', 'hello', 'world', 'world'
-  #     enum = (1..14).repeat(3)
-  #       # => returns an Enumerator when called without a block
-  #     enum.first(4) # => [1, 1, 1, 2]
-  #
-  def to_enum(meth=:each, *args)
-    Enumerator.new self, meth, *args
-  end
-  alias enum_for to_enum
-end
-
-module Enumerable
-  # use Enumerator to use infinite sequence
-  def zip(*arg)
-    ary = []
-    arg = arg.map{|a|a.each}
-    i = 0
-    self.each do |*val|
-      a = []
-      a.push(val.__svalue)
-      idx = 0
-      while idx < arg.size
-        begin
-          a.push(arg[idx].next)
-        rescue StopIteration
-          a.push(nil)
-        end
-        idx += 1
-      end
-      ary.push(a)
-      i += 1
-    end
-    ary
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/test/enumerator.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/test/enumerator.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/test/enumerator.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enumerator/test/enumerator.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,546 +0,0 @@
-@obj = Object.new
-class << @obj
-  include Enumerable
-  def foo *a
-    a.each { |x| yield x }
-  end
-end
-
-assert 'Enumerator' do
-  assert_equal Class, Enumerator.class
-end
-
-assert 'Enumerator' do
-  assert_equal Object, Enumerator.superclass
-end
-
-assert 'Enumerator.new' do
-  assert_equal [0,1,2], 3.times.map{|i| i}.sort
-  assert_equal [:x,:y,:z], [:x,:y,:z].each.map{|i| i}.sort
-  assert_equal [[:x,1],[:y,2]], {x:1, y:2}.each.map{|i| i}.sort
-  assert_equal [1,2,3], @obj.to_enum(:foo, 1,2,3).to_a
-  assert_equal [1,2,3], Enumerator.new(@obj, :foo, 1,2,3).to_a
-  assert_equal [1,2,3], Enumerator.new { |y| i = 0; loop { y << (i += 1) } }.take(3)
-  assert_raise(ArgumentError) { Enumerator.new }
-  enum = @obj.to_enum
-  assert_raise(NoMethodError) { enum.each {} }
-
-  # examples
-  fib = Enumerator.new do |y|
-    a = b = 1
-    loop do
-      y << a
-      a, b = b, a + b
-    end
-  end
-  assert_equal fib.take(10), [1,1,2,3,5,8,13,21,34,55]
-end
-
-assert 'Enumerator#initialize_copy' do
-  assert_equal [1, 2, 3], @obj.to_enum(:foo, 1, 2, 3).dup.to_a
-  e = @obj.to_enum :foo, 1, 2, 3
-  assert_nothing_raised { assert_equal(1, e.next) }
-  assert_raise(TypeError) { e.dup }
-
-  e = Enumerator.new { |y| i = 0; loop { y << (i += 1) } }.dup
-  assert_nothing_raised { assert_equal(1, e.next) }
-  assert_raise(TypeError) { e.dup }
-end
-
-assert 'Enumerator#with_index' do
-  assert_equal([[1,0],[2,1],[3,2]], @obj.to_enum(:foo, 1, 2, 3).with_index.to_a)
-  assert_equal([[1,5],[2,6],[3,7]], @obj.to_enum(:foo, 1, 2, 3).with_index(5).to_a)
-  a = []
-  @obj.to_enum(:foo, 1, 2, 3).with_index(10).with_index(20) { |*i| a << i }
-  assert_equal [[[1, 10], 20], [[2, 11], 21], [[3, 12], 22]], a
-end
-
-assert 'Enumerator#with_index nonnum offset' do
-  s = Object.new
-  def s.to_int; 1 end
-  assert_equal([[1,1],[2,2],[3,3]], @obj.to_enum(:foo, 1, 2, 3).with_index(s).to_a)
-end
-
-assert 'Enumerator#with_index string offset' do
-  assert_raise(TypeError){ @obj.to_enum(:foo, 1, 2, 3).with_index('1').to_a }
-end
-
-assert 'Enumerator#each_with_index' do
-  assert_equal([[1,0],[2,1],[3,2]], @obj.to_enum(:foo, 1, 2, 3).each_with_index.to_a)
-  a = []
-  @obj.to_enum(:foo, 1, 2, 3).each_with_index {|*i| a << i}
-  assert_equal([[1, 0], [2, 1], [3, 2]], a)
-end
-
-assert 'Enumerator#with_object' do
-  obj = [0, 1]
-  ret = (1..10).each.with_object(obj) {|i, memo|
-    memo[0] += i
-    memo[1] *= i
-  }
-  assert_true(obj.equal?(ret))
-  assert_equal([55, 3628800], ret)
-end
-
-assert 'Enumerator#with_object arguments' do
-  to_three = Enumerator.new do |y|
-    3.times do |x|
-      y << x
-    end
-  end
-
-  a = []
-  to_three_with_string = to_three.with_object("foo")
-  to_three_with_string.each do |x,string|
-    a << "#{string}:#{x}"
-  end
-  assert_equal ["foo:0","foo:1","foo:2"], a
-end
-
-assert 'Enumerator#inspect' do
-  e = (0..10).each
-  assert_equal("#<Enumerator: 0..10:each>", e.inspect)
-  e = Enumerator.new("FooObject", :foo, 1)
-  assert_equal("#<Enumerator: FooObject:foo(1)>", e.inspect)
-  e = Enumerator.new("FooObject", :foo, 1, 2, 3)
-  assert_equal("#<Enumerator: FooObject:foo(1, 2, 3)>", e.inspect)
-end
-
-assert 'Enumerator#each' do
-  o = Object.new
-  def o.each(ary)
-    ary << 1
-    yield
-  end
-  ary = []
-  e = o.to_enum.each(ary)
-  e.next
-  assert_equal([1], ary)
-end
-
-assert 'Enumerator#each arguments' do
-  obj = Object.new
-
-  def obj.each_arg(a, b=:b, *rest)
-    yield a
-    yield b
-    yield rest
-    :method_returned
-  end
-
-  enum = obj.to_enum :each_arg, :a, :x
-
-  assert_equal [:a, :x, []], enum.each.to_a
-  assert_true enum.each.equal?(enum)
-  assert_equal :method_returned, enum.each { |elm| elm }
-
-  assert_equal [:a, :x, [:y, :z]], enum.each(:y, :z).to_a
-  assert_false enum.each(:y, :z).equal?(enum)
-  assert_equal :method_returned, enum.each(:y, :z) { |elm| elm }
-end
-
-assert 'Enumerator#next' do
-  e = 3.times
-  3.times { |i|
-    assert_equal i, e.next
-  }
-  assert_raise(StopIteration) { e.next }
-end
-
-assert 'Enumerator#next_values' do
-  o = Object.new
-  def o.each
-    yield
-    yield 1
-    yield 1, 2
-  end
-  e = o.to_enum
-  assert_equal nil, e.next
-  assert_equal 1, e.next
-  assert_equal [1,2], e.next
-  e = o.to_enum
-  assert_equal [], e.next_values
-  assert_equal [1], e.next_values
-  assert_equal [1,2], e.next_values
-end
-
-assert 'Enumerator#peek' do
-  a = [1]
-  e = a.each
-  assert_equal 1, e.peek
-  assert_equal 1, e.peek
-  assert_equal 1, e.next
-  assert_raise(StopIteration) { e.peek }
-  assert_raise(StopIteration) { e.peek }
-end
-
-assert 'Enumerator#peek modify' do
-  o = Object.new
-  def o.each
-    yield 1,2
-  end
-  e = o.to_enum
-  a = e.peek
-  a << 3
-  assert_equal([1,2], e.peek)
-end
-
-assert 'Enumerator#peek_values' do
-  o = Object.new
-  def o.each
-    yield
-    yield 1
-    yield 1, 2
-  end
-  e = o.to_enum
-  assert_equal nil, e.peek
-  assert_equal nil, e.next
-  assert_equal 1, e.peek
-  assert_equal 1, e.next
-  assert_equal [1,2], e.peek
-  assert_equal [1,2], e.next
-  e = o.to_enum
-  assert_equal [], e.peek_values
-  assert_equal [], e.next_values
-  assert_equal [1], e.peek_values
-  assert_equal [1], e.next_values
-  assert_equal [1,2], e.peek_values
-  assert_equal [1,2], e.next_values
-  e = o.to_enum
-  assert_equal [], e.peek_values
-  assert_equal nil, e.next
-  assert_equal [1], e.peek_values
-  assert_equal 1, e.next
-  assert_equal [1,2], e.peek_values
-  assert_equal [1,2], e.next
-  e = o.to_enum
-  assert_equal nil, e.peek
-  assert_equal [], e.next_values
-  assert_equal 1, e.peek
-  assert_equal [1], e.next_values
-  assert_equal [1,2], e.peek
-  assert_equal [1,2], e.next_values
-end
-
-assert 'Enumerator#peek_values modify' do
-  o = Object.new
-  def o.each
-    yield 1,2
-  end
-  e = o.to_enum
-  a = e.peek_values
-  a << 3
-  assert_equal [1,2], e.peek
-end
-
-assert 'Enumerator#feed' do
-  o = Object.new
-  def o.each(ary)
-    ary << yield
-    ary << yield
-    ary << yield
-  end
-  ary = []
-  e = o.to_enum :each, ary
-  e.next
-  e.feed 1
-  e.next
-  e.feed 2
-  e.next
-  e.feed 3
-  assert_raise(StopIteration) { e.next }
-  assert_equal [1,2,3], ary
-end
-
-assert 'Enumerator#feed mixed' do
-  o = Object.new
-  def o.each(ary)
-    ary << yield
-    ary << yield
-    ary << yield
-  end
-  ary = []
-  e = o.to_enum :each, ary
-  e.next
-  e.feed 1
-  e.next
-  e.next
-  e.feed 3
-  assert_raise(StopIteration) { e.next }
-  assert_equal [1,nil,3], ary
-end
-
-assert 'Enumerator#feed twice' do
-  o = Object.new
-  def o.each(ary)
-    ary << yield
-    ary << yield
-    ary << yield
-  end
-  ary = []
-  e = o.to_enum :each, ary
-  e.feed 1
-  assert_raise(TypeError) { e.feed 2 }
-end
-
-assert 'Enumerator#feed before first next' do
-  o = Object.new
-  def o.each(ary)
-    ary << yield
-    ary << yield
-    ary << yield
-  end
-  ary = []
-  e = o.to_enum :each, ary
-  e.feed 1
-  e.next
-  e.next
-  assert_equal [1], ary
-end
-
-assert 'Enumerator#feed yielder' do
-  x = nil
-  e = Enumerator.new {|y| x = y.yield; 10 }
-  e.next
-  e.feed 100
-  assert_raise(StopIteration) { e.next }
-  assert_equal 100, x
-end
-
-assert 'Enumerator#rewind' do
-  e = @obj.to_enum(:foo, 1, 2, 3)
-  assert_equal 1, e.next
-  assert_equal 2, e.next
-  e.rewind
-  assert_equal 1, e.next
-  assert_equal 2, e.next
-  assert_equal 3, e.next
-  assert_raise(StopIteration) { e.next }
-end
-
-assert 'Enumerator#rewind clear feed' do
-  o = Object.new
-  def o.each(ary)
-    ary << yield
-    ary << yield
-    ary << yield
-  end
-  ary = []
-  e = o.to_enum(:each, ary)
-  e.next
-  e.feed 1
-  e.next
-  e.feed 2
-  e.rewind
-  e.next
-  e.next
-  assert_equal([1,nil], ary)
-end
-
-assert 'Enumerator#rewind clear' do
-  o = Object.new
-  def o.each(ary)
-    ary << yield
-    ary << yield
-    ary << yield
-  end
-  ary = []
-  e = o.to_enum :each, ary
-  e.next
-  e.feed 1
-  e.next
-  e.feed 2
-  e.rewind
-  e.next
-  e.next
-  assert_equal [1,nil], ary
-end
-
-assert 'Enumerator::Generator' do
-  # note: Enumerator::Generator is a class just for internal
-  g = Enumerator::Generator.new {|y| y << 1 << 2 << 3; :foo }
-  g2 = g.dup
-  a = []
-  assert_equal(:foo, g.each {|x| a << x })
-  assert_equal([1, 2, 3], a)
-  a = []
-  assert_equal(:foo, g2.each {|x| a << x })
-  assert_equal([1, 2, 3], a)
-end
-
-assert 'Enumerator::Generator args' do
-  g = Enumerator::Generator.new {|y, x| y << 1 << 2 << 3; x }
-  a = []
-  assert_equal(:bar, g.each(:bar) {|x| a << x })
-  assert_equal([1, 2, 3], a)
-end
-
-assert 'Enumerator::Yielder' do
-  # note: Enumerator::Yielder is a class just for internal
-  a = []
-  y = Enumerator::Yielder.new {|x| a << x }
-  assert_equal(y, y << 1 << 2 << 3)
-  assert_equal([1, 2, 3], a)
-
-  a = []
-  y = Enumerator::Yielder.new {|x| a << x }
-  assert_equal([1], y.yield(1))
-  assert_equal([1, 2], y.yield(2))
-  assert_equal([1, 2, 3], y.yield(3))
-
-  assert_raise(LocalJumpError) { Enumerator::Yielder.new }
-end
-
-assert 'next after StopIteration' do
-  a = [1]
-  e = a.each
-  assert_equal(1, e.next)
-  assert_raise(StopIteration) { e.next }
-  assert_raise(StopIteration) { e.next }
-  e.rewind
-  assert_equal(1, e.next)
-  assert_raise(StopIteration) { e.next }
-  assert_raise(StopIteration) { e.next }
-end
-
-assert 'gc' do
-  assert_nothing_raised do
-    1.times do
-      foo = [1,2,3].to_enum
-      GC.start
-    end
-    GC.start
-  end
-end
-
-assert 'nested iteration' do
-  def (o = Object.new).each
-    yield :ok1
-    yield [:ok2, :x].each.next
-  end
-  e = o.to_enum
-  assert_equal :ok1, e.next
-  assert_equal :ok2, e.next
-  assert_raise(StopIteration) { e.next }
-end
-
-assert 'Kernel#to_enum' do
-  assert_equal Enumerator, [].to_enum.class
-  assert_raise(ArgumentError){ nil.to_enum }
-end
-
-assert 'modifying existing methods' do
-  assert_equal Enumerator, loop.class
-  e = 3.times
-  i = 0
-  loop_ret = loop {
-    assert_equal i, e.next
-    i += 1
-  }
-end
-
-assert 'Integral#times' do
-  a = 3
-  b = a.times
-  c = []
-  b.with_object(c) do |i, obj|
-    obj << i
-  end
-  assert_equal 3, a
-  assert_equal Enumerator, b.class
-  assert_equal [0,1,2], c
-end
-
-assert 'Enumerable#each_with_index' do
-  assert_equal [['a',0],['b',1],['c',2]], ['a','b','c'].each_with_index.to_a
-end
-
-assert 'Enumerable#map' do
-  a = [1,2,3]
-  b = a.map
-  c = b.with_index do |i, index|
-    [i*i, index*index]
-  end
-  assert_equal [1,2,3], a
-  assert_equal [[1,0],[4,1],[9,4]], c
-end
-
-assert 'Enumerable#find_all' do
-  assert_equal [[3,4]], [[1,2],[3,4],[5,6]].find_all.each{ |i| i[1] == 4 }
-end
-
-assert 'Array#each_index' do
-  a = [1,2,3]
-  b = a.each_index
-  c = []
-  b.with_index do |index1,index2|
-    c << [index1+2,index2+5]
-  end
-  assert_equal [1,2,3], a
-  assert_equal [[2,5],[3,6],[4,7]], c
-end
-
-assert 'Array#map!' do
-  a = [1,2,3]
-  b = a.map!
-  b.with_index do |i, index|
-    [i*i, index*index]
-  end
-  assert_equal [[1,0],[4,1],[9,4]], a
-end
-
-assert 'Hash#each' do
-  a = {a:1,b:2}
-  b = a.each
-  c = []
-  b.each do |k,v|
-    c << [k,v]
-  end
-  assert_equal [[:a,1], [:b,2]], c.sort
-end
-
-assert 'Hash#each_key' do
-  assert_equal [:a,:b], {a:1,b:2}.each_key.to_a.sort
-end
-
-assert 'Hash#each_value' do
-  assert_equal [1,2], {a:1,b:2}.each_value.to_a.sort
-end
-
-assert 'Hash#select' do
-  h = {1=>2,3=>4,5=>6}
-  hret = h.select.with_index {|a,b| a[1] == 4}
-  assert_equal({3=>4}, hret)
-  assert_equal({1=>2,3=>4,5=>6}, h)
-end
-
-assert 'Hash#select!' do
-  h = {1=>2,3=>4,5=>6}
-  hret = h.select!.with_index {|a,b| a[1] == 4}
-  assert_equal h, hret
-  assert_equal({3=>4}, h)
-end
-
-assert 'Hash#reject' do
-  h = {1=>2,3=>4,5=>6}
-  hret = h.reject.with_index {|a,b| a[1] == 4}
-  assert_equal({1=>2,5=>6}, hret)
-  assert_equal({1=>2,3=>4,5=>6}, h)
-end
-
-assert 'Hash#reject!' do
-  h = {1=>2,3=>4,5=>6}
-  hret = h.reject!.with_index {|a,b| a[1] == 4}
-  assert_equal h, hret
-  assert_equal({1=>2,5=>6}, h)
-end
-
-assert 'Range#each' do
-  a = (1..5)
-  b = a.each
-  c = []
-  b.each do |i|
-    c << i
-  end
-  assert_equal [1,2,3,4,5], c
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-enum-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Enumerable module extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/mrblib/enum.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,711 +0,0 @@
-##
-# Enumerable
-#
-module Enumerable
-  ##
-  # call-seq:
-  #    enum.drop(n)               -> array
-  #
-  # Drops first n elements from <i>enum</i>, and returns rest elements
-  # in an array.
-  #
-  #    a = [1, 2, 3, 4, 5, 0]
-  #    a.drop(3)             #=> [4, 5, 0]
-
-  def drop(n)
-    raise TypeError, "no implicit conversion of #{n.class} into Integer" unless n.respond_to?(:to_int)
-    raise ArgumentError, "attempt to drop negative size" if n < 0
-
-    n = n.to_int
-    ary = []
-    self.each {|*val| n == 0 ? ary << val.__svalue : n -= 1 }
-    ary
-  end
-
-  ##
-  # call-seq:
-  #    enum.drop_while {|arr| block }   -> array
-  #    enum.drop_while                  -> an_enumerator
-  #
-  # Drops elements up to, but not including, the first element for
-  # which the block returns +nil+ or +false+ and returns an array
-  # containing the remaining elements.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #    a = [1, 2, 3, 4, 5, 0]
-  #    a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
-
-  def drop_while(&block)
-    return to_enum :drop_while unless block
-
-    ary, state = [], false
-    self.each do |*val|
-      state = true if !state and !block.call(*val)
-      ary << val.__svalue if state
-    end
-    ary
-  end
-
-  ##
-  # call-seq:
-  #    enum.take(n)               -> array
-  #
-  # Returns first n elements from <i>enum</i>.
-  #
-  #    a = [1, 2, 3, 4, 5, 0]
-  #    a.take(3)             #=> [1, 2, 3]
-
-  def take(n)
-    raise TypeError, "no implicit conversion of #{n.class} into Integer" unless n.respond_to?(:to_int)
-    i = n.to_int
-    raise ArgumentError, "attempt to take negative size" if i < 0
-    ary = []
-    return ary if i == 0
-    self.each do |*val|
-      ary << val.__svalue
-      i -= 1
-      break if i == 0
-    end
-    ary
-  end
-
-  ##
-  # call-seq:
-  #    enum.take_while {|arr| block }   -> array
-  #    enum.take_while                  -> an_enumerator
-  #
-  # Passes elements to the block until the block returns +nil+ or +false+,
-  # then stops iterating and returns an array of all prior elements.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #     a = [1, 2, 3, 4, 5, 0]
-  #     a.take_while {|i| i < 3 }   #=> [1, 2]
-  #
-  def take_while(&block)
-    return to_enum :take_while unless block
-
-    ary = []
-    self.each do |*val|
-      return ary unless block.call(*val)
-      ary << val.__svalue
-    end
-    ary
-  end
-
-  ##
-  # Iterates the given block for each array of consecutive <n>
-  # elements.
-  #
-  # @return [nil]
-  #
-  # @example
-  #     (1..10).each_cons(3) {|a| p a}
-  #     # outputs below
-  #     [1, 2, 3]
-  #     [2, 3, 4]
-  #     [3, 4, 5]
-  #     [4, 5, 6]
-  #     [5, 6, 7]
-  #     [6, 7, 8]
-  #     [7, 8, 9]
-  #     [8, 9, 10]
-
-  def each_cons(n, &block)
-    raise TypeError, "no implicit conversion of #{n.class} into Integer" unless n.respond_to?(:to_int)
-    raise ArgumentError, "invalid size" if n <= 0
-
-    return to_enum(:each_cons,n) unless block
-    ary = []
-    n = n.to_int
-    self.each do |*val|
-      ary.shift if ary.size == n
-      ary << val.__svalue
-      block.call(ary.dup) if ary.size == n
-    end
-    nil
-  end
-
-  ##
-  # Iterates the given block for each slice of <n> elements.
-  #
-  # @return [nil]
-  #
-  # @example
-  #     (1..10).each_slice(3) {|a| p a}
-  #     # outputs below
-  #     [1, 2, 3]
-  #     [4, 5, 6]
-  #     [7, 8, 9]
-  #     [10]
-
-  def each_slice(n, &block)
-    raise TypeError, "no implicit conversion of #{n.class} into Integer" unless n.respond_to?(:to_int)
-    raise ArgumentError, "invalid slice size" if n <= 0
-
-    return to_enum(:each_slice,n) unless block
-    ary = []
-    n = n.to_int
-    self.each do |*val|
-      ary << val.__svalue
-      if ary.size == n
-        block.call(ary)
-        ary = []
-      end
-    end
-    block.call(ary) unless ary.empty?
-    nil
-  end
-
-  ##
-  # call-seq:
-  #    enum.group_by {| obj | block }  -> a_hash
-  #    enum.group_by                   -> an_enumerator
-  #
-  # Returns a hash, which keys are evaluated result from the
-  # block, and values are arrays of elements in <i>enum</i>
-  # corresponding to the key.
-  #
-  #     (1..6).group_by {|i| i%3}   #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
-  #
-  def group_by(&block)
-    return to_enum :group_by unless block
-
-    h = {}
-    self.each do |*val|
-      key = block.call(*val)
-      sv = val.__svalue
-      h.key?(key) ? (h[key] << sv) : (h[key] = [sv])
-    end
-    h
-  end
-
-  ##
-  # call-seq:
-  #    enum.sort_by { |obj| block }   -> array
-  #    enum.sort_by                   -> an_enumerator
-  #
-  # Sorts <i>enum</i> using a set of keys generated by mapping the
-  # values in <i>enum</i> through the given block.
-  #
-  # If no block is given, an enumerator is returned instead.
-
-  def sort_by(&block)
-    return to_enum :sort_by unless block
-
-    ary = []
-    orig = []
-    self.each_with_index{|e, i|
-      orig.push(e)
-      ary.push([block.call(e), i])
-    }
-    if ary.size > 1
-      __sort_sub__(ary, 0, ary.size - 1) do |a,b|
-        a <=> b
-      end
-    end
-    ary.collect{|e,i| orig[i]}
-  end
-
-  NONE = Object.new
-  ##
-  # call-seq:
-  #    enum.first       ->  obj or nil
-  #    enum.first(n)    ->  an_array
-  #
-  # Returns the first element, or the first +n+ elements, of the enumerable.
-  # If the enumerable is empty, the first form returns <code>nil</code>, and the
-  # second form returns an empty array.
-  def first(*args)
-    case args.length
-    when 0
-      self.each do |*val|
-        return val.__svalue
-      end
-      return nil
-    when 1
-      n = args[0]
-      raise TypeError, "no implicit conversion of #{n.class} into Integer" unless n.respond_to?(:to_int)
-      i = n.to_int
-      raise ArgumentError, "attempt to take negative size" if i < 0
-      ary = []
-      return ary if i == 0
-      self.each do |*val|
-        ary << val.__svalue
-        i -= 1
-        break if i == 0
-      end
-      ary
-    else
-      raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 0..1)"
-    end
-  end
-
-  ##
-  # call-seq:
-  #    enum.count                 -> int
-  #    enum.count(item)           -> int
-  #    enum.count { |obj| block } -> int
-  #
-  # Returns the number of items in +enum+ through enumeration.
-  # If an argument is given, the number of items in +enum+ that
-  # are equal to +item+ are counted.  If a block is given, it
-  # counts the number of elements yielding a true value.
-  def count(v=NONE, &block)
-    count = 0
-    if block
-      self.each do |*val|
-        count += 1 if block.call(*val)
-      end
-    else
-      if v == NONE
-        self.each { count += 1 }
-      else
-        self.each do |*val|
-          count += 1 if val.__svalue == v
-        end
-      end
-    end
-    count
-  end
-
-  ##
-  # call-seq:
-  #    enum.flat_map       { |obj| block } -> array
-  #    enum.collect_concat { |obj| block } -> array
-  #    enum.flat_map                       -> an_enumerator
-  #    enum.collect_concat                 -> an_enumerator
-  #
-  # Returns a new array with the concatenated results of running
-  # <em>block</em> once for every element in <i>enum</i>.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #    [1, 2, 3, 4].flat_map { |e| [e, -e] } #=> [1, -1, 2, -2, 3, -3, 4, -4]
-  #    [[1, 2], [3, 4]].flat_map { |e| e + [100] } #=> [1, 2, 100, 3, 4, 100]
-  def flat_map(&block)
-    return to_enum :flat_map unless block
-
-    ary = []
-    self.each do |*e|
-      e2 = block.call(*e)
-      if e2.respond_to? :each
-        e2.each {|e3| ary.push(e3) }
-      else
-        ary.push(e2)
-      end
-    end
-    ary
-  end
-  alias collect_concat flat_map
-
-  ##
-  # call-seq:
-  #    enum.max_by {|obj| block }      -> obj
-  #    enum.max_by                     -> an_enumerator
-  #
-  # Returns the object in <i>enum</i> that gives the maximum
-  # value from the given block.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #    %w[albatross dog horse].max_by {|x| x.length }   #=> "albatross"
-
-  def max_by(&block)
-    return to_enum :max_by unless block
-
-    first = true
-    max = nil
-    max_cmp = nil
-
-    self.each do |*val|
-      if first
-        max = val.__svalue
-        max_cmp = block.call(*val)
-        first = false
-      else
-        if (cmp = block.call(*val)) > max_cmp
-          max = val.__svalue
-          max_cmp = cmp
-        end
-      end
-    end
-    max
-  end
-
-  ##
-  # call-seq:
-  #    enum.min_by {|obj| block }      -> obj
-  #    enum.min_by                     -> an_enumerator
-  #
-  # Returns the object in <i>enum</i> that gives the minimum
-  # value from the given block.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #    %w[albatross dog horse].min_by {|x| x.length }   #=> "dog"
-
-  def min_by(&block)
-    return to_enum :min_by unless block
-
-    first = true
-    min = nil
-    min_cmp = nil
-
-    self.each do |*val|
-      if first
-        min = val.__svalue
-        min_cmp = block.call(*val)
-        first = false
-      else
-        if (cmp = block.call(*val)) < min_cmp
-          min = val.__svalue
-          min_cmp = cmp
-        end
-      end
-    end
-    min
-  end
-
-  ##
-  #  call-seq:
-  #     enum.minmax                  -> [min, max]
-  #     enum.minmax { |a, b| block } -> [min, max]
-  #
-  #  Returns two elements array which contains the minimum and the
-  #  maximum value in the enumerable.  The first form assumes all
-  #  objects implement <code>Comparable</code>; the second uses the
-  #  block to return <em>a <=> b</em>.
-  #
-  #     a = %w(albatross dog horse)
-  #     a.minmax                                  #=> ["albatross", "horse"]
-  #     a.minmax { |a, b| a.length <=> b.length } #=> ["dog", "albatross"]
-
-  def minmax(&block)
-    max = nil
-    min = nil
-    first = true
-
-    self.each do |*val|
-      if first
-        val = val.__svalue
-        max = val
-        min = val
-        first = false
-      else
-        val = val.__svalue
-        if block
-          max = val if block.call(val, max) > 0
-          min = val if block.call(val, min) < 0
-        else
-          max = val if (val <=> max) > 0
-          min = val if (val <=> min) < 0
-        end
-      end
-    end
-    [min, max]
-  end
-
-  ##
-  #  call-seq:
-  #     enum.minmax_by { |obj| block } -> [min, max]
-  #     enum.minmax_by                 -> an_enumerator
-  #
-  #  Returns a two element array containing the objects in
-  #  <i>enum</i> that correspond to the minimum and maximum values respectively
-  #  from the given block.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-  #     %w(albatross dog horse).minmax_by { |x| x.length }   #=> ["dog", "albatross"]
-
-  def minmax_by(&block)
-    return to_enum :minmax_by unless block
-
-    max = nil
-    max_cmp = nil
-    min = nil
-    min_cmp = nil
-    first = true
-
-    self.each do |*val|
-      if first
-        max = min = val.__svalue
-        max_cmp = min_cmp = block.call(*val)
-        first = false
-     else
-        if (cmp = block.call(*val)) > max_cmp
-          max = val.__svalue
-          max_cmp = cmp
-        end
-        if (cmp = block.call(*val)) < min_cmp
-          min = val.__svalue
-          min_cmp = cmp
-        end
-      end
-    end
-    [min, max]
-  end
-
-  ##
-  #  call-seq:
-  #     enum.none? [{ |obj| block }]   -> true or false
-  #
-  #  Passes each element of the collection to the given block. The method
-  #  returns <code>true</code> if the block never returns <code>true</code>
-  #  for all elements. If the block is not given, <code>none?</code> will return
-  #  <code>true</code> only if none of the collection members is true.
-  #
-  #     %w(ant bear cat).none? { |word| word.length == 5 } #=> true
-  #     %w(ant bear cat).none? { |word| word.length >= 4 } #=> false
-  #     [].none?                                           #=> true
-  #     [nil, false].none?                                 #=> true
-  #     [nil, true].none?                                  #=> false
-
-  def none?(&block)
-    if block
-      self.each do |*val|
-        return false if block.call(*val)
-      end
-    else
-      self.each do |*val|
-        return false if val.__svalue
-      end
-    end
-    true
-  end
-
-  ##
-  #  call-seq:
-  #    enum.one? [{ |obj| block }]   -> true or false
-  #
-  # Passes each element of the collection to the given block. The method
-  # returns <code>true</code> if the block returns <code>true</code>
-  # exactly once. If the block is not given, <code>one?</code> will return
-  # <code>true</code> only if exactly one of the collection members is
-  # true.
-  #
-  #    %w(ant bear cat).one? { |word| word.length == 4 }  #=> true
-  #    %w(ant bear cat).one? { |word| word.length > 4 }   #=> false
-  #    %w(ant bear cat).one? { |word| word.length < 4 }   #=> false
-  #    [nil, true, 99].one?                               #=> false
-  #    [nil, true, false].one?                            #=> true
-  #
-
-  def one?(&block)
-    count = 0
-    if block
-      self.each do |*val|
-        count += 1 if block.call(*val)
-        return false if count > 1
-      end
-    else
-      self.each do |*val|
-        count += 1 if val.__svalue
-        return false if count > 1
-      end
-    end
-
-    count == 1 ? true : false
-  end
-
-  ##
-  #  call-seq:
-  #    enum.each_with_object(obj) { |(*args), memo_obj| ... }  ->  obj
-  #    enum.each_with_object(obj)                              ->  an_enumerator
-  #
-  #  Iterates the given block for each element with an arbitrary
-  #  object given, and returns the initially given object.
-  #
-  #  If no block is given, returns an enumerator.
-  #
-  #     (1..10).each_with_object([]) { |i, a| a << i*2 }
-  #     #=> [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
-  #
-
-  def each_with_object(obj=nil, &block)
-    raise ArgumentError, "wrong number of arguments (0 for 1)" if obj.nil?
-
-    return to_enum(:each_with_object, obj) unless block
-
-    self.each {|*val| block.call(val.__svalue, obj) }
-    obj
-  end
-
-  ##
-  #  call-seq:
-  #     enum.reverse_each { |item| block } ->  enum
-  #     enum.reverse_each                  ->  an_enumerator
-  #
-  #  Builds a temporary array and traverses that array in reverse order.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-  #      (1..3).reverse_each { |v| p v }
-  #
-  #    produces:
-  #
-  #      3
-  #      2
-  #      1
-  #
-
-  def reverse_each(&block)
-    return to_enum :reverse_each unless block
-
-    ary = self.to_a
-    i = ary.size - 1
-    while i>=0
-      block.call(ary[i])
-      i -= 1
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     enum.cycle(n=nil) { |obj| block }  ->  nil
-  #     enum.cycle(n=nil)                  ->  an_enumerator
-  #
-  #  Calls <i>block</i> for each element of <i>enum</i> repeatedly _n_
-  #  times or forever if none or +nil+ is given.  If a non-positive
-  #  number is given or the collection is empty, does nothing.  Returns
-  #  +nil+ if the loop has finished without getting interrupted.
-  #
-  #  Enumerable#cycle saves elements in an internal array so changes
-  #  to <i>enum</i> after the first pass have no effect.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-  #     a = ["a", "b", "c"]
-  #     a.cycle { |x| puts x }  # print, a, b, c, a, b, c,.. forever.
-  #     a.cycle(2) { |x| puts x }  # print, a, b, c, a, b, c.
-  #
-
-  def cycle(nv = nil, &block)
-    return to_enum(:cycle, nv) unless block
-
-    n = nil
-
-    if nv.nil?
-      n = -1
-    else
-      unless nv.respond_to?(:to_int)
-        raise TypeError, "no implicit conversion of #{nv.class} into Integer"
-      end
-      n = nv.to_int
-      unless n.kind_of?(Integer)
-        raise TypeError, "no implicit conversion of #{nv.class} into Integer"
-      end
-      return nil if n <= 0
-    end
-
-    ary = []
-    each do |*i|
-      ary.push(i)
-      yield(*i)
-    end
-    return nil if ary.empty?
-
-    while n < 0 || 0 < (n -= 1)
-      ary.each do |i|
-        yield(*i)
-      end
-    end
-
-    nil
-  end
-
-  ##
-  #  call-seq:
-  #     enum.find_index(value)          -> int or nil
-  #     enum.find_index { |obj| block } -> int or nil
-  #     enum.find_index                 -> an_enumerator
-  #
-  #  Compares each entry in <i>enum</i> with <em>value</em> or passes
-  #  to <em>block</em>.  Returns the index for the first for which the
-  #  evaluated value is non-false.  If no object matches, returns
-  #  <code>nil</code>
-  #
-  #  If neither block nor argument is given, an enumerator is returned instead.
-  #
-  #     (1..10).find_index  { |i| i % 5 == 0 and i % 7 == 0 }  #=> nil
-  #     (1..100).find_index { |i| i % 5 == 0 and i % 7 == 0 }  #=> 34
-  #     (1..100).find_index(50)                                #=> 49
-  #
-
-  def find_index(val=NONE, &block)
-    return to_enum(:find_index, val) if !block && val == NONE
-
-    idx = 0
-    if block
-      self.each do |*e|
-        return idx if block.call(*e)
-        idx += 1
-      end
-    else
-      self.each do |*e|
-        return idx if e.__svalue == val
-        idx += 1
-      end
-    end
-    nil
-  end
-
-  ##
-  #  call-seq:
-  #     enum.zip(arg, ...)                  -> an_array_of_array
-  #
-  #  Takes one element from <i>enum</i> and merges corresponding
-  #  elements from each <i>args</i>.  This generates a sequence of
-  #  <em>n</em>-element arrays, where <em>n</em> is one more than the
-  #  count of arguments.  The length of the resulting sequence will be
-  #  <code>enum#size</code>.  If the size of any argument is less than
-  #  <code>enum#size</code>, <code>nil</code> values are supplied.
-  #
-
-  def zip(*arg)
-    ary = []
-    arg = arg.map{|a|a.to_a}
-    i = 0
-    self.each do |*val|
-      a = []
-      a.push(val.__svalue)
-      idx = 0
-      while idx < arg.size
-        a.push(arg[idx][i])
-        idx += 1
-      end
-      ary.push(a)
-      i += 1
-    end
-    ary
-  end
-
-  ##
-  #  call-seq:
-  #     enum.to_h  -> hash
-  #
-  #  Returns the result of interpreting <i>enum</i> as a list of
-  #  <tt>[key, value]</tt> pairs.
-  #
-  #     %i[hello world].each_with_index.to_h
-  #       # => {:hello => 0, :world => 1}
-  #
-
-  def to_h
-    h = {}
-    self.each do |*v|
-      v = v.__svalue
-      raise TypeError, "wrong element type #{v.class} (expected Array)" unless v.is_a? Array
-      raise ArgumentError, "element has wrong array length (expected 2, was #{v.size})" if v.size != 2
-      h[v[0]] = v[1]
-    end
-    h
-  end
-
-  def nil.to_h
-    {}
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/test/enum.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/test/enum.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/test/enum.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-ext/test/enum.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-##
-# Enumerable(Ext) Test
-
-assert("Enumerable#drop") do
-  a = [1, 2, 3, 4, 5, 0]
-
-  assert_equal [4, 5, 0], a.drop(3)
-  assert_equal [], a.drop(6)
-end
-
-assert("Enumerable#drop_while") do
-  a = [1, 2, 3, 4, 5, 0]
-  assert_equal [3, 4, 5, 0], a.drop_while {|i| i < 3 }
-end
-
-assert("Enumerable#take") do
-  a = [1, 2, 3, 4, 5, 0]
-  assert_equal [1, 2, 3], a.take(3)
-end
-
-assert("Enumerable#take_while") do
-  a = [1, 2, 3, 4, 5, 0]
-  assert_equal [1, 2], a.take_while {|i| i < 3}
-end
-
-assert("Enumerable#each_cons") do
-  a = []
-  b = (1..5).each_cons(3){|e| a << e}
-  assert_equal [[1, 2, 3], [2, 3, 4], [3, 4, 5]], a
-  assert_equal nil, b
-end
-
-assert("Enumerable#each_slice") do
-  a = []
-  b = (1..10).each_slice(3){|e| a << e}
-  assert_equal [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]], a
-  assert_equal nil, b
-end
-
-assert("Enumerable#group_by") do
-  r = (1..6).group_by {|i| i % 3 }
-  assert_equal [3, 6], r[0]
-  assert_equal [1, 4], r[1]
-  assert_equal [2, 5], r[2]
-end
-
-assert("Enumerable#sort_by") do
-  assert_equal ["car", "train", "bicycle"], %w{car bicycle train}.sort_by {|e| e.length}
-end
-
-assert("Enumerable#first") do
-  a = Object.new
-  a.extend Enumerable
-  def a.each
-    yield 1
-    yield 2
-    yield 3
-  end
-  assert_equal 1, a.first
-  assert_equal [1, 2], a.first(2)
-  assert_equal [1, 2, 3], a.first(10)
-  a = Object.new
-  a.extend Enumerable
-  def a.each
-  end
-  assert_nil a.first
-end
-
-assert("Enumerable#count") do
-  a = [1, 2, 4, 2]
-  assert_equal 4, a.count
-  assert_equal 2, a.count(2)
-  assert_equal 3, a.count{|x| x % 2 == 0}
-end
-
-assert("Enumerable#flat_map") do
-  assert_equal [1, 2, 3, 4], [1, 2, 3, 4].flat_map { |e| e }
-  assert_equal [1, -1, 2, -2, 3, -3, 4, -4], [1, 2, 3, 4].flat_map { |e| [e, -e] }
-  assert_equal [1, 2, 100, 3, 4, 100], [[1, 2], [3, 4]].flat_map { |e| e + [100] }
-end
-
-assert("Enumerable#max_by") do
-  assert_equal "albatross", %w[albatross dog horse].max_by { |x| x.length }
-end
-
-assert("Enumerable#min_by") do
-  assert_equal "dog", %w[albatross dog horse].min_by { |x| x.length }
-end
-
-assert("Enumerable#minmax") do
-  a = %w(albatross dog horse)
-  assert_equal ["albatross", "horse"], a.minmax
-  assert_equal ["dog", "albatross"], a.minmax { |a, b| a.length <=> b.length }
-end
-
-assert("Enumerable#minmax_by") do
-  assert_equal ["dog", "albatross"], %w(albatross dog horse).minmax_by { |x| x.length }
-end
-
-assert("Enumerable#none?") do
-  assert_true %w(ant bear cat).none? { |word| word.length == 5 }
-  assert_false %w(ant bear cat).none? { |word| word.length >= 4 }
-  assert_true [].none?
-  assert_true [nil, false].none?
-  assert_false [nil, true].none?
-end
-
-assert("Enumerable#one?") do
-  assert_true %w(ant bear cat).one? { |word| word.length == 4 }
-  assert_false %w(ant bear cat).one? { |word| word.length > 4 }
-  assert_false %w(ant bear cat).one? { |word| word.length < 4 }
-  assert_false [nil, true, 99].one?
-  assert_true [nil, true, false].one?
-end
-
-assert("Enumerable#each_with_object") do
-  assert_true [2, 4, 6, 8, 10, 12, 14, 16, 18, 20], (1..10).each_with_object([]) { |i, a| a << i*2 }
-  assert_raise(ArgumentError) { (1..10).each_with_object() { |i, a| a << i*2 } }
-end
-
-assert("Enumerable#reverse_each") do
-  r = (1..3)
-  a = []
-  assert_equal (1..3), r.reverse_each { |v| a << v }
-  assert_equal [3, 2, 1], a
-end
-
-assert("Enumerable#cycle") do
-  a = []
-  ["a", "b", "c"].cycle(2) { |v| a << v }
-  assert_equal ["a", "b", "c", "a", "b", "c"], a
-  assert_raise(TypeError) { ["a", "b", "c"].cycle("a") { |v| a << v } }
-
-  empty = Class.new do
-    include Enumerable
-    def each
-    end
-  end
-  assert_nil empty.new.cycle { break :nope }
-end
-
-assert("Enumerable#find_index") do
-  assert_nil (1..10).find_index { |i| i % 5 == 0 and i % 7 == 0 }
-  assert_equal 34, (1..100).find_index { |i| i % 5 == 0 and i % 7 == 0 }
-  assert_equal 49 ,(1..100).find_index(50)
-end
-
-assert("Enumerable#zip") do
-  a = [ 4, 5, 6 ]
-  b = [ 7, 8, 9 ]
-  assert_equal [[4, 7], [5, 8], [6, 9]], a.zip(b)
-  assert_equal [[1, 4, 7], [2, 5, 8], [3, 6, 9]], [1, 2, 3].zip(a, b)
-  assert_equal [[1, 4, 7], [2, 5, 8]], [1, 2].zip(a, b)
-  assert_equal [[4, 1, 8], [5, 2, nil], [6, nil, nil]], a.zip([1, 2], [8])
-end
-
-assert("Enumerable#to_h") do
-  c = Class.new {
-    include Enumerable
-    def each
-      yield [1,2]
-      yield [3,4]
-    end
-  }
-  h0 = {1=>2, 3=>4}
-  h = c.new.to_h
-  assert_equal Hash, h.class
-  assert_equal h0, h
-  # mruby-enum-ext also provides nil.to_h
-  assert_equal Hash.new, nil.to_h
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-MRuby::Gem::Specification.new('mruby-enum-lazy') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Enumerator::Lazy class'
-  spec.add_dependency('mruby-enumerator', :core => 'mruby-enumerator')
-  spec.add_dependency('mruby-enum-ext', :core => 'mruby-enum-ext')
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrblib/lazy.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrblib/lazy.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrblib/lazy.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/mrblib/lazy.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-module Enumerable
-
-  # = Enumerable#lazy implementation
-  #
-  # Enumerable#lazy returns an instance of Enumerator::Lazy.
-  # You can use it just like as normal Enumerable object,
-  # except these methods act as 'lazy':
-  #
-  #   - map       collect
-  #   - select    find_all
-  #   - reject
-  #   - grep
-  #   - drop
-  #   - drop_while
-  #   - take_while
-  #   - flat_map  collect_concat
-  #   - zip
-  def lazy
-    Enumerator::Lazy.new(self)
-  end
-end
-
-class Enumerator
-  # == Acknowledgements
-  #
-  #   Based on https://github.com/yhara/enumerable-lazy
-  #   Inspired by https://github.com/antimon2/enumerable_lz
-  #   http://jp.rubyist.net/magazine/?0034-Enumerable_lz (ja)
-  class Lazy < Enumerator
-    def initialize(obj, &block)
-      super(){|yielder|
-        begin
-          obj.each{|x|
-            if block
-              block.call(yielder, x)
-            else
-              yielder << x
-            end
-          }
-        rescue StopIteration
-        end
-      }
-    end
-
-    def to_enum(meth=:each, *args, &block)
-      lz = Lazy.new(self, &block)
-      lz.obj = self
-      lz.meth = meth
-      lz.args = args
-      lz
-    end
-    alias enum_for to_enum
-
-    def map(&block)
-      Lazy.new(self){|yielder, val|
-        yielder << block.call(val)
-      }
-    end
-    alias collect map
-
-    def select(&block)
-      Lazy.new(self){|yielder, val|
-        if block.call(val)
-          yielder << val
-        end
-      }
-    end
-    alias find_all select
-
-    def reject(&block)
-      Lazy.new(self){|yielder, val|
-        unless block.call(val)
-          yielder << val
-        end
-      }
-    end
-
-    def grep(pattern)
-      Lazy.new(self){|yielder, val|
-        if pattern === val
-          yielder << val
-        end
-      }
-    end
-
-    def drop(n)
-      dropped = 0
-      Lazy.new(self){|yielder, val|
-        if dropped < n
-          dropped += 1
-        else
-          yielder << val
-        end
-      }
-    end
-
-    def drop_while(&block)
-      dropping = true
-      Lazy.new(self){|yielder, val|
-        if dropping
-          if not block.call(val)
-            yielder << val
-            dropping = false
-          end
-        else
-          yielder << val
-        end
-      }
-    end
-
-    def take(n)
-      if n == 0
-        return Lazy.new(self){raise StopIteration}
-      end
-      taken = 0
-      Lazy.new(self){|yielder, val|
-        yielder << val
-        taken += 1
-        if taken >= n
-          raise StopIteration
-        end
-      }
-    end
-
-    def take_while(&block)
-      Lazy.new(self){|yielder, val|
-        if block.call(val)
-          yielder << val
-        else
-          raise StopIteration
-        end
-      }
-    end
-
-    def flat_map(&block)
-      Lazy.new(self){|yielder, val|
-        ary = block.call(val)
-        # TODO: check ary is an Array
-        ary.each{|x|
-          yielder << x
-        }
-      }
-    end
-    alias collect_concat flat_map
-
-    def zip(*args, &block)
-      enums = [self] + args
-      Lazy.new(self){|yielder, val|
-        ary = enums.map{|e| e.next}
-        if block
-          yielder << block.call(ary)
-        else
-          yielder << ary
-        end
-      }
-    end
-
-    alias force to_a
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/test/lazy.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/test/lazy.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/test/lazy.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-enum-lazy/test/lazy.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-assert("Enumerator::Lazy") do
-  a = [1, 2]
-  assert_equal Enumerator::Lazy, a.lazy.class
-end
-
-assert("Enumerator::Lazy laziness") do
-  a = Object.new
-  def a.each
-    return to_enum :each unless block_given?
-    self.b << 10
-    yield 1
-    self.b << 20
-    yield 2
-    self.b << 30
-    yield 3
-    self.b << 40
-    yield 4
-    self.b << 50
-    yield 5
-  end
-  def a.b(b=nil)
-    @b = b if b
-    @b
-  end
-
-  a.b([])
-  assert_equal [1,2], a.each.lazy.take(2).force
-  assert_equal [10,20], a.b
-
-  a.b([])
-  assert_equal [2,4], a.each.lazy.select{|x|x%2==0}.take(2).force
-  assert_equal [10,20,30,40], a.b
-
-  a.b([])
-  assert_equal [1], a.each.lazy.take_while{|x|x<2}.take(1).force
-  assert_equal [10], a.b
-
-  a.b([])
-  assert_equal [1], a.each.lazy.take_while{|x|x<2}.take(4).force
-  assert_equal [10,20], a.b
-end
-
-assert("Enumrator::Lazy#to_enum") do
-  lazy_enum = (0..Float::INFINITY).lazy.to_enum(:each_slice, 2)
-  assert_kind_of Enumerator::Lazy, lazy_enum
-  assert_equal [0*1, 2*3, 4*5, 6*7], lazy_enum.map { |a| a.first * a.last }.first(4)
-end
-
-assert("Enumerator::Lazy#zip with cycle") do
-  e1 = [1, 2, 3].cycle
-  e2 = [:a, :b].cycle
-  assert_equal [[1,:a],[2,:b],[3,:a]], e1.lazy.zip(e2).first(3)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-MRuby::Gem::Specification.new('mruby-error') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'extensional error handling'
-
-  if build.cxx_exception_enabled?
-    @objs << build.compile_as_cxx("#{spec.dir}/src/exception.c", "#{spec.build_dir}/src/exception.cxx")
-    @objs.delete_if { |v| v == objfile("#{spec.build_dir}/src/exception") }
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/src/exception.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/src/exception.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/src/exception.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/src/exception.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-#include <mruby.h>
-#include <mruby/throw.h>
-#include <mruby/error.h>
-
-MRB_API mrb_value
-mrb_protect(mrb_state *mrb, mrb_func_t body, mrb_value data, mrb_bool *state)
-{
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-  mrb_value result = mrb_nil_value();
-
-  if (state) { *state = FALSE; }
-
-  MRB_TRY(&c_jmp) {
-    mrb->jmp = &c_jmp;
-    result = body(mrb, data);
-    mrb->jmp = prev_jmp;
-  } MRB_CATCH(&c_jmp) {
-    mrb->jmp = prev_jmp;
-    result = mrb_obj_value(mrb->exc);
-    mrb->exc = NULL;
-    if (state) { *state = TRUE; }
-  } MRB_END_EXC(&c_jmp);
-
-  mrb_gc_protect(mrb, result);
-  return result;
-}
-
-MRB_API mrb_value
-mrb_ensure(mrb_state *mrb, mrb_func_t body, mrb_value b_data, mrb_func_t ensure, mrb_value e_data)
-{
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-  mrb_value result;
-
-  MRB_TRY(&c_jmp) {
-    mrb->jmp = &c_jmp;
-    result = body(mrb, b_data);
-    mrb->jmp = prev_jmp;
-  } MRB_CATCH(&c_jmp) {
-    mrb->jmp = prev_jmp;
-    ensure(mrb, e_data);
-    MRB_THROW(mrb->jmp); /* rethrow catched exceptions */
-  } MRB_END_EXC(&c_jmp);
-
-  ensure(mrb, e_data);
-  mrb_gc_protect(mrb, result);
-  return result;
-}
-
-MRB_API mrb_value
-mrb_rescue(mrb_state *mrb, mrb_func_t body, mrb_value b_data,
-           mrb_func_t rescue, mrb_value r_data)
-{
-  return mrb_rescue_exceptions(mrb, body, b_data, rescue, r_data, 1, &mrb->eStandardError_class);
-}
-
-MRB_API mrb_value
-mrb_rescue_exceptions(mrb_state *mrb, mrb_func_t body, mrb_value b_data, mrb_func_t rescue, mrb_value r_data,
-                      mrb_int len, struct RClass **classes)
-{
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-  mrb_value result;
-  mrb_bool error_matched = FALSE;
-  mrb_int i;
-
-  MRB_TRY(&c_jmp) {
-    mrb->jmp = &c_jmp;
-    result = body(mrb, b_data);
-    mrb->jmp = prev_jmp;
-  } MRB_CATCH(&c_jmp) {
-    mrb->jmp = prev_jmp;
-
-    for (i = 0; i < len; ++i) {
-      if (mrb_obj_is_kind_of(mrb, mrb_obj_value(mrb->exc), classes[i])) {
-        error_matched = TRUE;
-        break;
-      }
-    }
-
-    if (!error_matched) { MRB_THROW(mrb->jmp); }
-
-    mrb->exc = NULL;
-    result = rescue(mrb, r_data);
-  } MRB_END_EXC(&c_jmp);
-
-  mrb_gc_protect(mrb, result);
-  return result;
-}
-
-void
-mrb_mruby_error_gem_init(mrb_state *mrb)
-{
-}
-
-void
-mrb_mruby_error_gem_final(mrb_state *mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-#include <mruby.h>
-#include <mruby/error.h>
-#include <mruby/array.h>
-
-static mrb_value
-protect_cb(mrb_state *mrb, mrb_value b)
-{
-  return mrb_yield_argv(mrb, b, 0, NULL);
-}
-
-static mrb_value
-run_protect(mrb_state *mrb, mrb_value self)
-{
-  mrb_value b;
-  mrb_value ret[2];
-  mrb_bool state;
-  mrb_get_args(mrb, "&", &b);
-  ret[0] = mrb_protect(mrb, protect_cb, b, &state);
-  ret[1] = mrb_bool_value(state);
-  return mrb_ary_new_from_values(mrb, 2, ret);
-}
-
-static mrb_value
-run_ensure(mrb_state *mrb, mrb_value self)
-{
-  mrb_value b, e;
-  mrb_get_args(mrb, "oo", &b, &e);
-  return mrb_ensure(mrb, protect_cb, b, protect_cb, e);
-}
-
-static mrb_value
-run_rescue(mrb_state *mrb, mrb_value self)
-{
-  mrb_value b, r;
-  mrb_get_args(mrb, "oo", &b, &r);
-  return mrb_rescue(mrb, protect_cb, b, protect_cb, r);
-}
-
-static mrb_value
-run_rescue_exceptions(mrb_state *mrb, mrb_value self)
-{
-  mrb_value b, r;
-  struct RClass *cls[1];
-  mrb_get_args(mrb, "oo", &b, &r);
-  cls[0] = E_TYPE_ERROR;
-  return mrb_rescue_exceptions(mrb, protect_cb, b, protect_cb, r, 1, cls);
-}
-
-void
-mrb_mruby_error_gem_test(mrb_state *mrb)
-{
-  struct RClass *cls;
-
-  cls = mrb_define_class(mrb, "ExceptionTest", mrb->object_class);
-  mrb_define_module_function(mrb, cls, "mrb_protect", run_protect, MRB_ARGS_NONE() | MRB_ARGS_BLOCK());
-  mrb_define_module_function(mrb, cls, "mrb_ensure", run_ensure, MRB_ARGS_REQ(2));
-  mrb_define_module_function(mrb, cls, "mrb_rescue", run_rescue, MRB_ARGS_REQ(2));
-  mrb_define_module_function(mrb, cls, "mrb_rescue_exceptions", run_rescue_exceptions, MRB_ARGS_REQ(2));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-error/test/exception.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-assert 'mrb_protect' do
-  # no failure in protect returns [result, false]
-  assert_equal ['test', false] do
-    ExceptionTest.mrb_protect { 'test' }
-  end
-  # failure in protect returns [exception, true]
-  result = ExceptionTest.mrb_protect { raise 'test' }
-  assert_kind_of RuntimeError, result[0]
-  assert_true result[1]
-end
-
-assert 'mrb_ensure' do
-  a = false
-  assert_equal 'test' do
-    ExceptionTest.mrb_ensure Proc.new { 'test' }, Proc.new { a = true }
-  end
-  assert_true a
-
-  a = false
-  assert_raise RuntimeError do
-    ExceptionTest.mrb_ensure Proc.new { raise 'test' }, Proc.new { a = true }
-  end
-  assert_true a
-end
-
-assert 'mrb_rescue' do
-  assert_equal 'test' do
-    ExceptionTest.mrb_rescue Proc.new { 'test' }, Proc.new {}
-  end
-
-  class CustomExp < Exception
-  end
-
-  assert_raise CustomExp do
-    ExceptionTest.mrb_rescue Proc.new { raise CustomExp.new 'test' }, Proc.new { 'rescue' }
-  end
-
-  assert_equal 'rescue' do
-    ExceptionTest.mrb_rescue Proc.new { raise 'test' }, Proc.new { 'rescue' }
-  end
-end
-
-assert 'mrb_rescue_exceptions' do
-  assert_equal 'test' do
-    ExceptionTest.mrb_rescue_exceptions Proc.new { 'test' }, Proc.new {}
-  end
-
-  assert_raise RangeError do
-    ExceptionTest.mrb_rescue_exceptions Proc.new { raise RangeError.new 'test' }, Proc.new { 'rescue' }
-  end
-
-  assert_equal 'rescue' do
-    ExceptionTest.mrb_rescue_exceptions Proc.new { raise TypeError.new 'test' }, Proc.new { 'rescue' }
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-MRuby::Gem::Specification.new('mruby-eval') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'standard Kernel#eval method'
-
-  add_dependency 'mruby-compiler', :core => 'mruby-compiler'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/src/eval.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/src/eval.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/src/eval.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/src/eval.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/compile.h>
-#include <mruby/irep.h>
-#include <mruby/proc.h>
-#include <mruby/opcode.h>
-#include <mruby/error.h>
-
-mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);
-mrb_value mrb_obj_instance_eval(mrb_state *mrb, mrb_value self);
-
-static struct mrb_irep *
-get_closure_irep(mrb_state *mrb, int level)
-{
-  struct mrb_context *c = mrb->c;
-  struct REnv *e = c->ci[-1].proc->env;
-  struct RProc *proc;
-
-  if (level == 0) {
-    proc = c->ci[-1].proc;
-    if (MRB_PROC_CFUNC_P(proc)) {
-      return NULL;
-    }
-    return proc->body.irep;
-  }
-
-  while (--level) {
-    e = (struct REnv*)e->c;
-    if (!e) return NULL;
-  }
-
-  if (!e) return NULL;
-  if (!MRB_ENV_STACK_SHARED_P(e)) return NULL;
-  c = e->cxt.c;
-  proc = c->cibase[e->cioff].proc;
-
-  if (!proc || MRB_PROC_CFUNC_P(proc)) {
-    return NULL;
-  }
-  return proc->body.irep;
-}
-
-/* search for irep lev above the bottom */
-static mrb_irep*
-search_irep(mrb_irep *top, int bnest, int lev, mrb_irep *bottom)
-{
-  size_t i;
-
-  for (i=0; i<top->rlen; i++) {
-    mrb_irep* tmp = top->reps[i];
-
-    if (tmp == bottom) return top;
-    tmp = search_irep(tmp, bnest-1, lev, bottom);
-    if (tmp) {
-      if (bnest == lev) return top;
-      return tmp;
-    }
-  }
-  return NULL;
-}
-
-static inline mrb_code
-search_variable(mrb_state *mrb, mrb_sym vsym, int bnest)
-{
-  mrb_irep *virep;
-  int level;
-  int pos;
-
-  for (level = 0; (virep = get_closure_irep(mrb, level)); level++) {
-    if (!virep || virep->lv == NULL) {
-      continue;
-    }
-    for (pos = 0; pos < virep->nlocals - 1; pos++) {
-      if (vsym == virep->lv[pos].name) {
-        return (MKARG_B(pos + 1) | MKARG_C(level + bnest));
-      }
-    }
-  }
-
-  return 0;
-}
-
-static int
-irep_argc(mrb_irep *irep)
-{
-  mrb_code c;
-
-  c = irep->iseq[0];
-  if (GET_OPCODE(c) == OP_ENTER) {
-    mrb_aspec ax = GETARG_Ax(c);
-    /* extra 1 means a slot for block */
-    return MRB_ASPEC_REQ(ax)+MRB_ASPEC_OPT(ax)+MRB_ASPEC_REST(ax)+MRB_ASPEC_POST(ax)+1;
-  }
-  return 0;
-}
-
-static mrb_bool
-potential_upvar_p(struct mrb_locals *lv, uint16_t v, int argc, uint16_t nlocals)
-{
-  if (v >= nlocals) return FALSE;
-  /* skip arguments  */
-  if (v < argc+1) return FALSE;
-  return TRUE;
-}
-
-static void
-patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
-{
-  size_t i;
-  mrb_code c;
-  int argc = irep_argc(irep);
-
-  for (i = 0; i < irep->ilen; i++) {
-    c = irep->iseq[i];
-    switch(GET_OPCODE(c)){
-    case OP_EPUSH:
-      patch_irep(mrb, irep->reps[GETARG_Bx(c)], bnest + 1, top);
-      break;
-
-    case OP_LAMBDA:
-      {
-        int arg_c = GETARG_c(c);
-        if (arg_c & OP_L_CAPTURE) {
-          patch_irep(mrb, irep->reps[GETARG_b(c)], bnest + 1, top);
-        }
-      }
-      break;
-
-    case OP_SEND:
-      if (GETARG_C(c) != 0) {
-        break;
-      }
-      {
-        mrb_code arg = search_variable(mrb, irep->syms[GETARG_B(c)], bnest);
-        if (arg != 0) {
-          /* must replace */
-          irep->iseq[i] = MKOPCODE(OP_GETUPVAR) | MKARG_A(GETARG_A(c)) | arg;
-        }
-      }
-      break;
-
-    case OP_MOVE:
-      /* src part */
-      if (potential_upvar_p(irep->lv, GETARG_B(c), argc, irep->nlocals)) {
-        mrb_code arg = search_variable(mrb, irep->lv[GETARG_B(c) - 1].name, bnest);
-        if (arg != 0) {
-          /* must replace */
-          irep->iseq[i] = MKOPCODE(OP_GETUPVAR) | MKARG_A(GETARG_A(c)) | arg;
-        }
-      }
-      /* dst part */
-      if (potential_upvar_p(irep->lv, GETARG_A(c), argc, irep->nlocals)) {
-        mrb_code arg = search_variable(mrb, irep->lv[GETARG_A(c) - 1].name, bnest);
-        if (arg != 0) {
-          /* must replace */
-          irep->iseq[i] = MKOPCODE(OP_SETUPVAR) | MKARG_A(GETARG_B(c)) | arg;
-        }
-      }
-      break;
-
-    case OP_GETUPVAR:
-      {
-        int lev = GETARG_C(c)+1;
-        mrb_irep *tmp = search_irep(top, bnest, lev, irep);
-        if (potential_upvar_p(tmp->lv, GETARG_B(c), irep_argc(tmp), tmp->nlocals)) {
-          mrb_code arg = search_variable(mrb, tmp->lv[GETARG_B(c)-1].name, bnest);
-          if (arg != 0) {
-            /* must replace */
-            irep->iseq[i] = MKOPCODE(OP_GETUPVAR) | MKARG_A(GETARG_A(c)) | arg;
-          }
-        }
-      }
-      break;
-
-    case OP_SETUPVAR:
-      {
-        int lev = GETARG_C(c)+1;
-        mrb_irep *tmp = search_irep(top, bnest, lev, irep);
-        if (potential_upvar_p(tmp->lv, GETARG_B(c), irep_argc(tmp), tmp->nlocals)) {
-          mrb_code arg = search_variable(mrb, tmp->lv[GETARG_B(c)-1].name, bnest);
-          if (arg != 0) {
-            /* must replace */
-            irep->iseq[i] = MKOPCODE(OP_SETUPVAR) | MKARG_A(GETARG_A(c)) | arg;
-          }
-        }
-      }
-      break;
-
-    case OP_STOP:
-      if (mrb->c->ci->acc >= 0) {
-        irep->iseq[i] = MKOP_AB(OP_RETURN, irep->nlocals, OP_R_NORMAL);
-      }
-      break;
-    }
-  }
-}
-
-void mrb_codedump_all(mrb_state*, struct RProc*);
-
-static struct RProc*
-create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, const char *file, mrb_int line)
-{
-  mrbc_context *cxt;
-  struct mrb_parser_state *p;
-  struct RProc *proc;
-  struct REnv *e;
-  struct mrb_context *c = mrb->c;
-
-  if (!mrb_nil_p(binding)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Binding of eval must be nil.");
-  }
-
-  cxt = mrbc_context_new(mrb);
-  cxt->lineno = line;
-
-  mrbc_filename(mrb, cxt, file ? file : "(eval)");
-  cxt->capture_errors = TRUE;
-  cxt->no_optimize = TRUE;
-
-  p = mrb_parse_nstring(mrb, s, len, cxt);
-
-  /* only occur when memory ran out */
-  if (!p) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to create parser state.");
-  }
-
-  if (0 < p->nerr) {
-    /* parse error */
-    mrb_value str;
-
-    if (file) {
-      str = mrb_format(mrb, " file %S line %S: %S",
-                       mrb_str_new_cstr(mrb, file),
-                       mrb_fixnum_value(p->error_buffer[0].lineno),
-                       mrb_str_new_cstr(mrb, p->error_buffer[0].message));
-    }
-    else {
-      str = mrb_format(mrb, " line %S: %S",
-                       mrb_fixnum_value(p->error_buffer[0].lineno),
-                       mrb_str_new_cstr(mrb, p->error_buffer[0].message));
-    }
-    mrb_parser_free(p);
-    mrbc_context_free(mrb, cxt);
-    mrb_exc_raise(mrb, mrb_exc_new_str(mrb, E_SYNTAX_ERROR, str));
-  }
-
-  proc = mrb_generate_code(mrb, p);
-  if (proc == NULL) {
-    /* codegen error */
-    mrb_parser_free(p);
-    mrbc_context_free(mrb, cxt);
-    mrb_raise(mrb, E_SCRIPT_ERROR, "codegen error");
-  }
-  if (c->ci[-1].proc->target_class) {
-    proc->target_class = c->ci[-1].proc->target_class;
-  }
-  e = c->ci[-1].proc->env;
-  if (!e) e = c->ci[-1].env;
-  e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass*)e);
-  e->cxt.c = c;
-  e->cioff = c->ci - c->cibase;
-  e->stack = c->ci->stackent;
-  MRB_SET_ENV_STACK_LEN(e, c->ci->proc->body.irep->nlocals);
-  c->ci->target_class = proc->target_class;
-  c->ci->env = 0;
-  proc->env = e;
-  patch_irep(mrb, proc->body.irep, 0, proc->body.irep);
-  /* mrb_codedump_all(mrb, proc); */
-
-  mrb_parser_free(p);
-  mrbc_context_free(mrb, cxt);
-
-  return proc;
-}
-
-static mrb_value
-exec_irep(mrb_state *mrb, mrb_value self, struct RProc *proc)
-{
-  if (mrb->c->ci->acc < 0) {
-    mrb_value ret = mrb_top_run(mrb, proc, mrb->c->stack[0], 0);
-    if (mrb->exc) {
-      mrb_exc_raise(mrb, mrb_obj_value(mrb->exc));
-    }
-    return ret;
-  }
-  return mrb_exec_irep(mrb, self, proc);
-}
-
-static mrb_value
-f_eval(mrb_state *mrb, mrb_value self)
-{
-  char *s;
-  mrb_int len;
-  mrb_value binding = mrb_nil_value();
-  char *file = NULL;
-  mrb_int line = 1;
-  struct RProc *proc;
-
-  mrb_get_args(mrb, "s|ozi", &s, &len, &binding, &file, &line);
-
-  proc = create_proc_from_string(mrb, s, len, binding, file, line);
-  mrb_assert(!MRB_PROC_CFUNC_P(proc));
-  return exec_irep(mrb, self, proc);
-}
-
-static mrb_value
-f_instance_eval(mrb_state *mrb, mrb_value self)
-{
-  mrb_value b;
-  mrb_int argc; mrb_value *argv;
-
-  mrb_get_args(mrb, "*!&", &argv, &argc, &b);
-
-  if (mrb_nil_p(b)) {
-    char *s;
-    mrb_int len;
-    char *file = NULL;
-    mrb_int line = 1;
-    mrb_value cv;
-    struct RProc *proc;
-
-    mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
-    cv = mrb_singleton_class(mrb, self);
-    proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
-    proc->target_class = mrb_class_ptr(cv);
-    mrb->c->ci->env = NULL;
-    mrb_assert(!MRB_PROC_CFUNC_P(proc));
-    return exec_irep(mrb, self, proc);
-  }
-  else {
-    mrb_get_args(mrb, "&", &b);
-    return mrb_obj_instance_eval(mrb, self);
-  }
-}
-
-void
-mrb_mruby_eval_gem_init(mrb_state* mrb)
-{
-  mrb_define_module_function(mrb, mrb->kernel_module, "eval", f_eval, MRB_ARGS_ARG(1, 3));
-  mrb_define_method(mrb, mrb->kernel_module, "instance_eval", f_instance_eval, MRB_ARGS_ARG(1, 2));
-}
-
-void
-mrb_mruby_eval_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/test/eval.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/test/eval.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/test/eval.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-eval/test/eval.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-assert('Kernel.eval', '15.3.1.2.3') do
-  assert_equal(10) { Kernel.eval '1 * 10' }
-  assert_equal('aaa') { Kernel.eval "'a' * 3" }
-  assert_equal(10) {
-    a = 10
-    Kernel.eval "a"
-  }
-  assert_equal(20) {
-    a = 10
-    Kernel.eval "a = 20"
-    a
-  }
-  assert_equal(15) {
-    c = 5
-    lambda {
-      a = 10
-      Kernel.eval "c = a + c"
-    }.call
-    c
-  }
-  assert_equal(5) {
-    c = 5
-    lambda {
-      Kernel.eval 'lambda { c }.call'
-    }.call
-  }
-  assert_equal(15) {
-    c = 5
-    lambda {
-      a = 10
-      Kernel.eval 'lambda { c = a + c }.call'
-    }.call
-    c
-  }
-  assert_equal(2) {
-    a = 10
-    Kernel.eval 'def f(a); b=a.send(:+, 1); end'
-    f(1)
-  }
-end
-
-assert('Kernel#eval', '15.3.1.3.12') do
-  assert_equal(10) { eval '1 * 10' }
-end
-
-assert('rest arguments of eval') do
-  assert_raise(ArgumentError) { Kernel.eval('0', 0, 'test', 0) }
-  assert_equal ['test', 'test.rb', 10] do
-    Kernel.eval('[\'test\', __FILE__, __LINE__]', nil, 'test.rb', 10)
-  end
-end
-
-assert 'eval syntax error' do
-  assert_raise(SyntaxError) do
-    eval 'p "test'
-  end
-end
-
-assert('String instance_eval') do
-  obj = Object.new
-  obj.instance_variable_set :@test, 'test'
-  assert_raise(ArgumentError) { obj.instance_eval(0) { } }
-  assert_raise(ArgumentError) { obj.instance_eval('0', 'test', 0, 'test') }
-  assert_equal(['test.rb', 10]) { obj.instance_eval('[__FILE__, __LINE__]', 'test.rb', 10)}
-  assert_equal('test') { obj.instance_eval('@test') }
-  assert_equal('test') { obj.instance_eval { @test } }
-  o = Object.new
-  assert_equal ['', o, o], o.instance_eval("[''].each { |s| break [s, o, self] }")
-end
-
-assert('Kernel.#eval(string) context') do
-  class TestEvalConstScope
-    EVAL_CONST_CLASS = 'class'
-    def const_string
-      eval 'EVAL_CONST_CLASS'
-    end
-  end
-  obj = TestEvalConstScope.new
-  assert_raise(NameError) { eval 'EVAL_CONST_CLASS' }
-  assert_equal('class') { obj.const_string }
-end
-
-assert('Object#instance_eval with begin-rescue-ensure execution order') do
-  class HellRaiser
-    def raise_hell
-      order = [:enter_raise_hell]
-      begin
-        order.push :begin
-        self.instance_eval("raise 'error'")
-      rescue
-        order.push :rescue
-      ensure
-        order.push :ensure
-      end
-      order
-    end
-  end
-
-  hell_raiser = HellRaiser.new
-  assert_equal([:enter_raise_hell, :begin, :rescue, :ensure], hell_raiser.raise_hell)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-exit') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Kernel#exit method'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/src/mruby-exit.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/src/mruby-exit.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/src/mruby-exit.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-exit/src/mruby-exit.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdlib.h>
-#include <mruby.h>
-
-static mrb_value
-f_exit(mrb_state *mrb, mrb_value self)
-{
-  mrb_int i = EXIT_SUCCESS;
-
-  mrb_get_args(mrb, "|i", &i);
-  exit(i);
-  /* not reached */
-  return mrb_nil_value();
-}
-
-void
-mrb_mruby_exit_gem_init(mrb_state* mrb)
-{
-  mrb_define_method(mrb, mrb->kernel_module, "exit", f_exit, MRB_ARGS_OPT(1));
-}
-
-void
-mrb_mruby_exit_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-fiber') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Fiber class'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/src/fiber.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/src/fiber.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/src/fiber.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/src/fiber.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,420 +0,0 @@
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/proc.h>
-
-#define fiber_ptr(o) ((struct RFiber*)mrb_ptr(o))
-
-#define FIBER_STACK_INIT_SIZE 64
-#define FIBER_CI_INIT_SIZE 8
-#define CI_ACC_RESUMED -3
-
-/*
- *  call-seq:
- *     Fiber.new{...} -> obj
- *
- *  Creates a fiber, whose execution is suspend until it is explicitly
- *  resumed using <code>Fiber#resume</code> method.
- *  The code running inside the fiber can give up control by calling
- *  <code>Fiber.yield</code> in which case it yields control back to caller
- *  (the caller of the <code>Fiber#resume</code>).
- *
- *  Upon yielding or termination the Fiber returns the value of the last
- *  executed expression
- *
- *  For instance:
- *
- *    fiber = Fiber.new do
- *      Fiber.yield 1
- *      2
- *    end
- *
- *    puts fiber.resume
- *    puts fiber.resume
- *    puts fiber.resume
- *
- *  <em>produces</em>
- *
- *    1
- *    2
- *    resuming dead fiber (FiberError)
- *
- *  The <code>Fiber#resume</code> method accepts an arbitrary number of
- *  parameters, if it is the first call to <code>resume</code> then they
- *  will be passed as block arguments. Otherwise they will be the return
- *  value of the call to <code>Fiber.yield</code>
- *
- *  Example:
- *
- *    fiber = Fiber.new do |first|
- *      second = Fiber.yield first + 2
- *    end
- *
- *    puts fiber.resume 10
- *    puts fiber.resume 14
- *    puts fiber.resume 18
- *
- *  <em>produces</em>
- *
- *    12
- *    14
- *    resuming dead fiber (FiberError)
- *
- */
-static mrb_value
-fiber_init(mrb_state *mrb, mrb_value self)
-{
-  static const struct mrb_context mrb_context_zero = { 0 };
-  struct RFiber *f = fiber_ptr(self);
-  struct mrb_context *c;
-  struct RProc *p;
-  mrb_callinfo *ci;
-  mrb_value blk;
-  size_t slen;
-
-  mrb_get_args(mrb, "&", &blk);
-
-  if (f->cxt) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "cannot initialize twice");
-  }
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Fiber object without a block");
-  }
-  p = mrb_proc_ptr(blk);
-  if (MRB_PROC_CFUNC_P(p)) {
-    mrb_raise(mrb, E_FIBER_ERROR, "tried to create Fiber from C defined method");
-  }
-
-  c = (struct mrb_context*)mrb_malloc(mrb, sizeof(struct mrb_context));
-  *c = mrb_context_zero;
-  f->cxt = c;
-
-  /* initialize VM stack */
-  slen = FIBER_STACK_INIT_SIZE;
-  if (p->body.irep->nregs > slen) {
-    slen += p->body.irep->nregs;
-  }
-  c->stbase = (mrb_value *)mrb_malloc(mrb, slen*sizeof(mrb_value));
-  c->stend = c->stbase + slen;
-  c->stack = c->stbase;
-
-#ifdef MRB_NAN_BOXING
-  {
-    mrb_value *p = c->stbase;
-    mrb_value *pend = c->stend;
-
-    while (p < pend) {
-      SET_NIL_VALUE(*p);
-      p++;
-    }
-  }
-#else
-  memset(c->stbase, 0, slen * sizeof(mrb_value));
-#endif
-
-  /* copy receiver from a block */
-  c->stack[0] = mrb->c->stack[0];
-
-  /* initialize callinfo stack */
-  c->cibase = (mrb_callinfo *)mrb_calloc(mrb, FIBER_CI_INIT_SIZE, sizeof(mrb_callinfo));
-  c->ciend = c->cibase + FIBER_CI_INIT_SIZE;
-  c->ci = c->cibase;
-  c->ci->stackent = c->stack;
-
-  /* adjust return callinfo */
-  ci = c->ci;
-  ci->target_class = p->target_class;
-  ci->proc = p;
-  mrb_field_write_barrier(mrb, (struct RBasic*)mrb_obj_ptr(self), (struct RBasic*)p);
-  ci->pc = p->body.irep->iseq;
-  ci->nregs = p->body.irep->nregs;
-  ci[1] = ci[0];
-  c->ci++;                      /* push dummy callinfo */
-
-  c->fib = f;
-  c->status = MRB_FIBER_CREATED;
-
-  return self;
-}
-
-static struct mrb_context*
-fiber_check(mrb_state *mrb, mrb_value fib)
-{
-  struct RFiber *f = fiber_ptr(fib);
-
-  mrb_assert(f->tt == MRB_TT_FIBER);
-  if (!f->cxt) {
-    mrb_raise(mrb, E_FIBER_ERROR, "uninitialized Fiber");
-  }
-  return f->cxt;
-}
-
-static mrb_value
-fiber_result(mrb_state *mrb, const mrb_value *a, mrb_int len)
-{
-  if (len == 0) return mrb_nil_value();
-  if (len == 1) return a[0];
-  return mrb_ary_new_from_values(mrb, len, a);
-}
-
-/* mark return from context modifying method */
-#define MARK_CONTEXT_MODIFY(c) (c)->ci->target_class = NULL
-
-static void
-fiber_check_cfunc(mrb_state *mrb, struct mrb_context *c)
-{
-  mrb_callinfo *ci;
-
-  for (ci = c->ci; ci >= c->cibase; ci--) {
-    if (ci->acc < 0) {
-      mrb_raise(mrb, E_FIBER_ERROR, "can't cross C function boundary");
-    }
-  }
-}
-
-static void
-fiber_switch_context(mrb_state *mrb, struct mrb_context *c)
-{
-  if (mrb->c->fib) {
-    mrb_write_barrier(mrb, (struct RBasic*)mrb->c->fib);
-  }
-  c->status = MRB_FIBER_RUNNING;
-  mrb->c = c;
-}
-
-static mrb_value
-fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mrb_bool resume, mrb_bool vmexec)
-{
-  struct mrb_context *c = fiber_check(mrb, self);
-  struct mrb_context *old_c = mrb->c;
-  mrb_value value;
-
-  fiber_check_cfunc(mrb, c);
-  if (resume && c->status == MRB_FIBER_TRANSFERRED) {
-    mrb_raise(mrb, E_FIBER_ERROR, "resuming transferred fiber");
-  }
-  if (c->status == MRB_FIBER_RUNNING || c->status == MRB_FIBER_RESUMED) {
-    mrb_raise(mrb, E_FIBER_ERROR, "double resume (fib)");
-  }
-  if (c->status == MRB_FIBER_TERMINATED) {
-    mrb_raise(mrb, E_FIBER_ERROR, "resuming dead fiber");
-  }
-  mrb->c->status = resume ? MRB_FIBER_RESUMED : MRB_FIBER_TRANSFERRED;
-  c->prev = resume ? mrb->c : (c->prev ? c->prev : mrb->root_c);
-  if (c->status == MRB_FIBER_CREATED) {
-    mrb_value *b, *e;
-
-    if (len >= c->stend - c->stack) {
-      mrb_raise(mrb, E_FIBER_ERROR, "too many arguments to fiber");
-    }
-    b = c->stack+1;
-    e = b + len;
-    while (b<e) {
-      *b++ = *a++;
-    }
-    c->cibase->argc = len;
-    value = c->stack[0] = c->ci->proc->env->stack[0];
-  }
-  else {
-    value = fiber_result(mrb, a, len);
-  }
-  fiber_switch_context(mrb, c);
-
-  if (vmexec) {
-    c->vmexec = TRUE;
-    value = mrb_vm_exec(mrb, c->ci[-1].proc, c->ci->pc);
-    mrb->c = old_c;
-  }
-  else {
-    MARK_CONTEXT_MODIFY(c);
-  }
-  return value;
-}
-
-/*
- *  call-seq:
- *     fiber.resume(args, ...) -> obj
- *
- *  Resumes the fiber from the point at which the last <code>Fiber.yield</code>
- *  was called, or starts running it if it is the first call to
- *  <code>resume</code>. Arguments passed to resume will be the value of
- *  the <code>Fiber.yield</code> expression or will be passed as block
- *  parameters to the fiber's block if this is the first <code>resume</code>.
- *
- *  Alternatively, when resume is called it evaluates to the arguments passed
- *  to the next <code>Fiber.yield</code> statement inside the fiber's block
- *  or to the block value if it runs to completion without any
- *  <code>Fiber.yield</code>
- */
-static mrb_value
-fiber_resume(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *a;
-  mrb_int len;
-  mrb_bool vmexec = FALSE;
-
-  mrb_get_args(mrb, "*!", &a, &len);
-  if (mrb->c->ci->acc < 0) {
-    vmexec = TRUE;
-  }
-  return fiber_switch(mrb, self, len, a, TRUE, vmexec);
-}
-
-/* resume thread with given arguments */
-MRB_API mrb_value
-mrb_fiber_resume(mrb_state *mrb, mrb_value fib, mrb_int len, const mrb_value *a)
-{
-  return fiber_switch(mrb, fib, len, a, TRUE, TRUE);
-}
-
-/*
- *  call-seq:
- *     fiber.alive? -> true or false
- *
- *  Returns true if the fiber can still be resumed. After finishing
- *  execution of the fiber block this method will always return false.
- */
-static mrb_value
-fiber_alive_p(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_context *c = fiber_check(mrb, self);
-  return mrb_bool_value(c->status != MRB_FIBER_TERMINATED);
-}
-
-static mrb_value
-fiber_eq(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-  mrb_get_args(mrb, "o", &other);
-
-  if (mrb_type(other) != MRB_TT_FIBER) {
-    return mrb_false_value();
-  }
-  return mrb_bool_value(fiber_ptr(self) == fiber_ptr(other));
-}
-
-/*
- *  call-seq:
- *     fiber.transfer(args, ...) -> obj
- *
- *  Transfers control to receiver fiber of the method call.
- *  Unlike <code>resume</code> the receiver wouldn't be pushed to call
- * stack of fibers. Instead it will switch to the call stack of
- * transferring fiber.
- *  When resuming a fiber that was transferred to another fiber it would
- * cause double resume error. Though when the fiber is re-transferred
- * and <code>Fiber.yield</code> is called, the fiber would be resumable.
- */
-static mrb_value
-fiber_transfer(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_context *c = fiber_check(mrb, self);
-  mrb_value* a;
-  mrb_int len;
-
-  fiber_check_cfunc(mrb, mrb->c);
-  mrb_get_args(mrb, "*!", &a, &len);
-
-  if (c == mrb->root_c) {
-    mrb->c->status = MRB_FIBER_TRANSFERRED;
-    fiber_switch_context(mrb, c);
-    MARK_CONTEXT_MODIFY(c);
-    return fiber_result(mrb, a, len);
-  }
-
-  if (c == mrb->c) {
-    return fiber_result(mrb, a, len);
-  }
-
-  return fiber_switch(mrb, self, len, a, FALSE, FALSE);
-}
-
-/* yield values to the caller fiber */
-/* mrb_fiber_yield() must be called as `return mrb_fiber_yield(...)` */
-MRB_API mrb_value
-mrb_fiber_yield(mrb_state *mrb, mrb_int len, const mrb_value *a)
-{
-  struct mrb_context *c = mrb->c;
-
-  if (!c->prev) {
-    mrb_raise(mrb, E_FIBER_ERROR, "can't yield from root fiber");
-  }
-
-  fiber_check_cfunc(mrb, c);
-  c->prev->status = MRB_FIBER_RUNNING;
-  c->status = MRB_FIBER_SUSPENDED;
-  fiber_switch_context(mrb, c->prev);
-  c->prev = NULL;
-  if (c->vmexec) {
-    c->vmexec = FALSE;
-    mrb->c->ci->acc = CI_ACC_RESUMED;
-  }
-  MARK_CONTEXT_MODIFY(mrb->c);
-  return fiber_result(mrb, a, len);
-}
-
-/*
- *  call-seq:
- *     Fiber.yield(args, ...) -> obj
- *
- *  Yields control back to the context that resumed the fiber, passing
- *  along any arguments that were passed to it. The fiber will resume
- *  processing at this point when <code>resume</code> is called next.
- *  Any arguments passed to the next <code>resume</code> will be the
- *
- *  mruby limitation: Fiber resume/yield cannot cross C function boundary.
- *  thus you cannot yield from #initialize which is called by mrb_funcall().
- */
-static mrb_value
-fiber_yield(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *a;
-  mrb_int len;
-
-  mrb_get_args(mrb, "*!", &a, &len);
-  return mrb_fiber_yield(mrb, len, a);
-}
-
-/*
- *  call-seq:
- *     Fiber.current() -> fiber
- *
- *  Returns the current fiber. If you are not running in the context of
- *  a fiber this method will return the root fiber.
- */
-static mrb_value
-fiber_current(mrb_state *mrb, mrb_value self)
-{
-  if (!mrb->c->fib) {
-    struct RFiber *f = (struct RFiber*)mrb_obj_alloc(mrb, MRB_TT_FIBER, mrb_class_ptr(self));
-
-    f->cxt = mrb->c;
-    mrb->c->fib = f;
-  }
-  return mrb_obj_value(mrb->c->fib);
-}
-
-void
-mrb_mruby_fiber_gem_init(mrb_state* mrb)
-{
-  struct RClass *c;
-
-  c = mrb_define_class(mrb, "Fiber", mrb->object_class);
-  MRB_SET_INSTANCE_TT(c, MRB_TT_FIBER);
-
-  mrb_define_method(mrb, c, "initialize", fiber_init,    MRB_ARGS_NONE());
-  mrb_define_method(mrb, c, "resume",     fiber_resume,  MRB_ARGS_ANY());
-  mrb_define_method(mrb, c, "transfer",   fiber_transfer, MRB_ARGS_ANY());
-  mrb_define_method(mrb, c, "alive?",     fiber_alive_p, MRB_ARGS_NONE());
-  mrb_define_method(mrb, c, "==",         fiber_eq,      MRB_ARGS_REQ(1));
-
-  mrb_define_class_method(mrb, c, "yield", fiber_yield, MRB_ARGS_ANY());
-  mrb_define_class_method(mrb, c, "current", fiber_current, MRB_ARGS_NONE());
-
-  mrb_define_class(mrb, "FiberError", mrb->eStandardError_class);
-}
-
-void
-mrb_mruby_fiber_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/test/fiber.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/test/fiber.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/test/fiber.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-fiber/test/fiber.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,208 +0,0 @@
-assert('Fiber.new') do
-  f = Fiber.new{}
-  assert_kind_of Fiber, f
-end
-
-assert('Fiber#resume') do
-  f = Fiber.new{|x| x }
-  assert_equal 2, f.resume(2)
-end
-
-assert('Fiber#transfer') do
-  f2 = nil
-  f1 = Fiber.new do |v|
-    Fiber.yield v
-    f2.transfer
-  end
-  f2 = Fiber.new do
-    f1.transfer(1)
-    f1.transfer(1)
-    Fiber.yield 2
-  end
-  assert_equal 1, f2.resume
-  assert_raise(FiberError) { f2.resume }
-  assert_equal 2, f2.transfer
-  assert_raise(FiberError) { f1.resume }
-  f1.transfer
-  f2.resume
-  assert_false f1.alive?
-  assert_false f2.alive?
-end
-
-assert('Fiber#alive?') do
-  f = Fiber.new{ Fiber.yield }
-  f.resume
-  assert_true f.alive?
-  f.resume
-  assert_false f.alive?
-end
-
-assert('Fiber#==') do
-  root = Fiber.current
-  assert_equal root, root
-  assert_equal root, Fiber.current
-  assert_false root != Fiber.current
-  f = Fiber.new {
-    assert_false root == Fiber.current
-  }
-  f.resume
-  assert_false f == root
-  assert_true f != root
-end
-
-assert('Fiber.yield') do
-  f = Fiber.new{|x| Fiber.yield x }
-  assert_equal 3, f.resume(3)
-  assert_true f.alive?
-end
-
-assert('FiberError') do
-  assert_equal StandardError, FiberError.superclass
-end
-
-assert('Fiber iteration') do
-  f1 = Fiber.new{
-    [1,2,3].each{|x| Fiber.yield(x)}
-  }
-  f2 = Fiber.new{
-    [9,8,7].each{|x| Fiber.yield(x)}
-  }
-  a = []
-  3.times {
-    a << f1.resume
-    a << f2.resume
-  }
-  assert_equal [1,9,2,8,3,7], a
-end
-
-assert('Fiber with splat in the block argument list') {
-  Fiber.new{|*x|x}.resume(1) == [1]
-}
-
-assert('Fiber raises on resume when dead') do
-  assert_raise(FiberError) do
-    f = Fiber.new{}
-    f.resume
-    assert_false f.alive?
-    f.resume
-  end
-end
-
-assert('Yield raises when called on root fiber') do
-  assert_raise(FiberError) { Fiber.yield }
-end
-
-assert('Double resume of Fiber') do
-  f1 = Fiber.new {}
-  f2 = Fiber.new {
-    f1.resume
-    assert_raise(FiberError) { f2.resume }
-    Fiber.yield 0
-  }
-  assert_equal 0, f2.resume
-  f2.resume
-  assert_false f1.alive?
-  assert_false f2.alive?
-end
-
-assert('Recursive resume of Fiber') do
-  f1, f2 = nil, nil
-  f1 = Fiber.new { assert_raise(FiberError) { f2.resume } }
-  f2 = Fiber.new {
-    f1.resume
-    Fiber.yield 0
-  }
-  f3 = Fiber.new {
-    f2.resume
-  }
-  assert_equal 0, f3.resume
-  f2.resume
-  assert_false f1.alive?
-  assert_false f2.alive?
-  assert_false f3.alive?
-end
-
-assert('Root fiber resume') do
-  root = Fiber.current
-  assert_raise(FiberError) { root.resume }
-  f = Fiber.new {
-    assert_raise(FiberError) { root.resume }
-  }
-  f.resume
-  assert_false f.alive?
-end
-
-assert('Fiber without block') do
-  assert_raise(ArgumentError) { Fiber.new }
-end
-
-
-assert('Transfer to self.') do
-  result = []
-  f = Fiber.new { result << :start; f.transfer; result << :end  }
-  f.transfer
-  assert_equal [:start, :end], result
-
-  result = []
-  f = Fiber.new { result << :start; f.transfer; result << :end  }
-  f.resume
-  assert_equal [:start, :end], result
-end
-
-assert('Resume transferred fiber') do
-  f = Fiber.new {
-    assert_raise(FiberError) { f.resume }
-  }
-  f.transfer
-end
-
-assert('Root fiber transfer.') do
-  result = nil
-  root = Fiber.current
-  f = Fiber.new {
-    result = :ok
-    root.transfer
-  }
-  f.resume
-  assert_true f.alive?
-  assert_equal :ok, result
-end
-
-assert('Break nested fiber with root fiber transfer') do
-  root = Fiber.current
-
-  result = nil
-  f2 = nil
-  f1 = Fiber.new {
-    Fiber.yield f2.resume
-    result = :f1
-  }
-  f2 = Fiber.new {
-    result = :to_root
-    root.transfer :from_f2
-    result = :f2
-  }
-  assert_equal :from_f2, f1.resume
-  assert_equal :to_root, result
-  assert_equal :f2, f2.transfer
-  assert_equal :f2, result
-  assert_false f2.alive?
-  assert_equal :f1, f1.resume
-  assert_equal :f1, result
-  assert_false f1.alive?
-end
-
-assert('CRuby Fiber#transfer test.') do
-  ary = []
-  f2 = nil
-  f1 = Fiber.new{
-    ary << f2.transfer(:foo)
-    :ok
-  }
-  f2 = Fiber.new{
-    ary << f1.transfer(:baz)
-    :ng
-  }
-  assert_equal :ok, f1.transfer
-  assert_equal [:baz], ary
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-MRuby::Gem::Specification.new('mruby-hash-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Hash class extension'
-  spec.add_dependency 'mruby-enum-ext', core: 'mruby-enum-ext'
-  spec.add_dependency 'mruby-array-ext', core: 'mruby-array-ext'
-  spec.add_test_dependency 'mruby-enumerator', core: 'mruby-enumerator'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/mrblib/hash.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,461 +0,0 @@
-class Hash
-
-  #  ISO does not define Hash#each_pair, so each_pair is defined in gem.
-  alias each_pair each
-
-  ##
-  # call-seq:
-  #     Hash[ key, value, ... ] -> new_hash
-  #     Hash[ [ [key, value], ... ] ] -> new_hash
-  #     Hash[ object ] -> new_hash
-  #
-  # Creates a new hash populated with the given objects.
-  #
-  # Similar to the literal `{ _key_ => _value_, ... }`. In the first
-  # form, keys and values occur in pairs, so there must be an even number of
-  # arguments.
-  #
-  # The second and third form take a single argument which is either an array
-  # of key-value pairs or an object convertible to a hash.
-  #
-  #     Hash["a", 100, "b", 200] #=> {"a"=>100, "b"=>200}
-  #     Hash[ [ ["a", 100], ["b", 200] ] ] #=> {"a"=>100, "b"=>200}
-  #     Hash["a" => 100, "b" => 200] #=> {"a"=>100, "b"=>200}
-  #
-
-  def self.[](*object)
-    length = object.length
-    if length == 1
-      o = object[0]
-      if o.respond_to?(:to_hash)
-        h = self.new
-        object[0].to_hash.each { |k, v| h[k] = v }
-        return h
-      elsif o.respond_to?(:to_a)
-        h = self.new
-        o.to_a.each do |i|
-          raise ArgumentError, "wrong element type #{i.class} (expected array)" unless i.respond_to?(:to_a)
-          k, v = nil
-          case i.size
-          when 2
-            k = i[0]
-            v = i[1]
-          when 1
-            k = i[0]
-          else
-            raise ArgumentError, "invalid number of elements (#{i.size} for 1..2)"
-          end
-          h[k] = v
-        end
-        return h
-      end
-    end
-    unless length % 2 == 0
-      raise ArgumentError, 'odd number of arguments for Hash'
-    end
-    h = self.new
-    0.step(length - 2, 2) do |i|
-      h[object[i]] = object[i + 1]
-    end
-    h
-  end
-
-  ##
-  # call-seq:
-  #     Hash.try_convert(obj) -> hash or nil
-  #
-  # Try to convert <i>obj</i> into a hash, using to_hash method.
-  # Returns converted hash or nil if <i>obj</i> cannot be converted
-  # for any reason.
-  #
-  #     Hash.try_convert({1=>2})   # => {1=>2}
-  #     Hash.try_convert("1=>2")   # => nil
-  #
-  def self.try_convert(obj)
-    if obj.respond_to?(:to_hash)
-      obj.to_hash
-    else
-      nil
-    end
-  end
-
-  ##
-  # call-seq:
-  #     hsh.merge!(other_hash)                                 -> hsh
-  #     hsh.merge!(other_hash){|key, oldval, newval| block}    -> hsh
-  #
-  #  Adds the contents of _other_hash_ to _hsh_.  If no block is specified,
-  #  entries with duplicate keys are overwritten with the values from
-  #  _other_hash_, otherwise the value of each duplicate key is determined by
-  #  calling the block with the key, its value in _hsh_ and its value in
-  #  _other_hash_.
-  #
-  #     h1 = { "a" => 100, "b" => 200 }
-  #     h2 = { "b" => 254, "c" => 300 }
-  #     h1.merge!(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
-  #
-  #     h1 = { "a" => 100, "b" => 200 }
-  #     h2 = { "b" => 254, "c" => 300 }
-  #     h1.merge!(h2) { |key, v1, v2| v1 }
-  #                     #=> {"a"=>100, "b"=>200, "c"=>300}
-  #
-
-  def merge!(other, &block)
-    raise TypeError, "can't convert argument into Hash" unless other.respond_to?(:to_hash)
-    if block
-      other.each_key{|k|
-        self[k] = (self.has_key?(k))? block.call(k, self[k], other[k]): other[k]
-      }
-    else
-      other.each_key{|k| self[k] = other[k]}
-    end
-    self
-  end
-
-  alias update merge!
-
-  ##
-  #  call-seq:
-  #     hsh.fetch(key [, default] )       -> obj
-  #     hsh.fetch(key) {| key | block }   -> obj
-  #
-  #  Returns a value from the hash for the given key. If the key can't be
-  #  found, there are several options: With no other arguments, it will
-  #  raise an <code>KeyError</code> exception; if <i>default</i> is
-  #  given, then that will be returned; if the optional code block is
-  #  specified, then that will be run and its result returned.
-  #
-  #     h = { "a" => 100, "b" => 200 }
-  #     h.fetch("a")                            #=> 100
-  #     h.fetch("z", "go fish")                 #=> "go fish"
-  #     h.fetch("z") { |el| "go fish, #{el}"}   #=> "go fish, z"
-  #
-  #  The following example shows that an exception is raised if the key
-  #  is not found and a default value is not supplied.
-  #
-  #     h = { "a" => 100, "b" => 200 }
-  #     h.fetch("z")
-  #
-  #  <em>produces:</em>
-  #
-  #     prog.rb:2:in 'fetch': key not found (KeyError)
-  #      from prog.rb:2
-  #
-
-  def fetch(key, none=NONE, &block)
-    unless self.key?(key)
-      if block
-        block.call(key)
-      elsif none != NONE
-        none
-      else
-        raise KeyError, "Key not found: #{key}"
-      end
-    else
-      self[key]
-    end
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.delete_if {| key, value | block }  -> hsh
-  #     hsh.delete_if                          -> an_enumerator
-  #
-  #  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
-  #  evaluates to <code>true</code>.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-  #     h = { "a" => 100, "b" => 200, "c" => 300 }
-  #     h.delete_if {|key, value| key >= "b" }   #=> {"a"=>100}
-  #
-
-  def delete_if(&block)
-    return to_enum :delete_if unless block_given?
-
-    self.each do |k, v|
-      self.delete(k) if block.call(k, v)
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     hash.flatten -> an_array
-  #     hash.flatten(level) -> an_array
-  #
-  #  Returns a new array that is a one-dimensional flattening of this
-  #  hash. That is, for every key or value that is an array, extract
-  #  its elements into the new array.  Unlike Array#flatten, this
-  #  method does not flatten recursively by default.  The optional
-  #  <i>level</i> argument determines the level of recursion to flatten.
-  #
-  #     a =  {1=> "one", 2 => [2,"two"], 3 => "three"}
-  #     a.flatten    # => [1, "one", 2, [2, "two"], 3, "three"]
-  #     a.flatten(2) # => [1, "one", 2, 2, "two", 3, "three"]
-  #
-
-  def flatten(level=1)
-    self.to_a.flatten(level)
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.invert -> new_hash
-  #
-  #  Returns a new hash created by using <i>hsh</i>'s values as keys, and
-  #  the keys as values.
-  #
-  #     h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
-  #     h.invert   #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
-  #
-
-  def invert
-    h = self.class.new
-    self.each {|k, v| h[v] = k }
-    h
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.keep_if {| key, value | block }  -> hsh
-  #     hsh.keep_if                          -> an_enumerator
-  #
-  #  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
-  #  evaluates to false.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-
-  def keep_if(&block)
-    return to_enum :keep_if unless block_given?
-
-    keys = []
-    self.each do |k, v|
-      unless block.call([k, v])
-        self.delete(k)
-      end
-    end
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.key(value)    -> key
-  #
-  #  Returns the key of an occurrence of a given value. If the value is
-  #  not found, returns <code>nil</code>.
-  #
-  #     h = { "a" => 100, "b" => 200, "c" => 300, "d" => 300 }
-  #     h.key(200)   #=> "b"
-  #     h.key(300)   #=> "c"
-  #     h.key(999)   #=> nil
-  #
-
-  def key(val)
-    self.each do |k, v|
-      return k if v == val
-    end
-    nil
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.to_h     -> hsh or new_hash
-  #
-  #  Returns +self+. If called on a subclass of Hash, converts
-  #  the receiver to a Hash object.
-  #
-  def to_h
-    self
-  end
-
-  ##
-  #  call-seq:
-  #    hash < other -> true or false
-  #
-  #  Returns <code>true</code> if <i>hash</i> is subset of
-  #  <i>other</i>.
-  #
-  #     h1 = {a:1, b:2}
-  #     h2 = {a:1, b:2, c:3}
-  #     h1 < h2    #=> true
-  #     h2 < h1    #=> false
-  #     h1 < h1    #=> false
-  #
-  def <(hash)
-    begin
-      hash = hash.to_hash
-    rescue NoMethodError
-      raise TypeError, "can't convert #{hash.class} to Hash"
-    end
-    size < hash.size and all? {|key, val|
-      hash.key?(key) and hash[key] == val
-    }
-  end
-
-  ##
-  #  call-seq:
-  #    hash <= other -> true or false
-  #
-  #  Returns <code>true</code> if <i>hash</i> is subset of
-  #  <i>other</i> or equals to <i>other</i>.
-  #
-  #     h1 = {a:1, b:2}
-  #     h2 = {a:1, b:2, c:3}
-  #     h1 <= h2   #=> true
-  #     h2 <= h1   #=> false
-  #     h1 <= h1   #=> true
-  #
-  def <=(hash)
-    begin
-      hash = hash.to_hash
-    rescue NoMethodError
-      raise TypeError, "can't convert #{hash.class} to Hash"
-    end
-    size <= hash.size and all? {|key, val|
-      hash.key?(key) and hash[key] == val
-    }
-  end
-
-  ##
-  #  call-seq:
-  #    hash > other -> true or false
-  #
-  #  Returns <code>true</code> if <i>other</i> is subset of
-  #  <i>hash</i>.
-  #
-  #     h1 = {a:1, b:2}
-  #     h2 = {a:1, b:2, c:3}
-  #     h1 > h2    #=> false
-  #     h2 > h1    #=> true
-  #     h1 > h1    #=> false
-  #
-  def >(hash)
-    begin
-      hash = hash.to_hash
-    rescue NoMethodError
-      raise TypeError, "can't convert #{hash.class} to Hash"
-    end
-    size > hash.size and hash.all? {|key, val|
-      key?(key) and self[key] == val
-    }
-  end
-
-  ##
-  #  call-seq:
-  #    hash >= other -> true or false
-  #
-  #  Returns <code>true</code> if <i>other</i> is subset of
-  #  <i>hash</i> or equals to <i>hash</i>.
-  #
-  #     h1 = {a:1, b:2}
-  #     h2 = {a:1, b:2, c:3}
-  #     h1 >= h2   #=> false
-  #     h2 >= h1   #=> true
-  #     h1 >= h1   #=> true
-  #
-  def >=(hash)
-    begin
-      hash = hash.to_hash
-    rescue NoMethodError
-      raise TypeError, "can't convert #{hash.class} to Hash"
-    end
-    size >= hash.size and hash.all? {|key, val|
-      key?(key) and self[key] == val
-    }
-  end
-
-  ##
-  # call-seq:
-  #   hsh.dig(key,...)                 -> object
-  #
-  # Extracts the nested value specified by the sequence of <i>key</i>
-  # objects by calling +dig+ at each step, returning +nil+ if any
-  # intermediate step is +nil+.
-  #
-  def dig(idx,*args)
-    n = self[idx]
-    if args.size > 0
-      n&.dig(*args)
-    else
-      n
-    end
-  end
-
-  ##
-  # call-seq:
-  #    hsh.transform_keys {|key| block } -> new_hash
-  #    hsh.transform_keys                -> an_enumerator
-  #
-  # Returns a new hash, with the keys computed from running the block
-  # once for each key in the hash, and the values unchanged.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  def transform_keys(&b)
-    return to_enum :transform_keys unless block_given?
-    hash = {}
-    self.keys.each do |k|
-      new_key = yield(k)
-      hash[new_key] = self[k]
-    end
-    hash
-  end
-  ##
-  # call-seq:
-  #    hsh.transform_keys! {|key| block } -> hsh
-  #    hsh.transform_keys!                -> an_enumerator
-  #
-  # Invokes the given block once for each key in <i>hsh</i>, replacing it
-  # with the new key returned by the block, and then returns <i>hsh</i>.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  def transform_keys!(&b)
-    return to_enum :transform_keys! unless block_given?
-    self.keys.each do |k|
-      value = self[k]
-      new_key = yield(k)
-      self.__delete(k)
-      self[new_key] = value
-    end
-    self
-  end
-  ##
-  # call-seq:
-  #    hsh.transform_values {|value| block } -> new_hash
-  #    hsh.transform_values                  -> an_enumerator
-  #
-  # Returns a new hash with the results of running the block once for
-  # every value.
-  # This method does not change the keys.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  def transform_values(&b)
-    return to_enum :transform_values unless block_given?
-    hash = {}
-    self.keys.each do |k|
-      hash[k] = yield(self[k])
-    end
-    hash
-  end
-  ##
-  # call-seq:
-  #    hsh.transform_values! {|key| block } -> hsh
-  #    hsh.transform_values!                -> an_enumerator
-  #
-  # Invokes the given block once for each value in the hash, replacing
-  # with the new value returned by the block, and then returns <i>hsh</i>.
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  def transform_values!(&b)
-    return to_enum :transform_values! unless block_given?
-    self.keys.each do |k|
-      self[k] = yield(self[k])
-    end
-    self
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/src/hash-ext.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/src/hash-ext.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/src/hash-ext.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/src/hash-ext.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
-** hash.c - Hash class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/hash.h>
-
-/*
- * call-seq:
- *   hsh.values_at(key, ...)   -> array
- *
- * Return an array containing the values associated with the given keys.
- * Also see <code>Hash.select</code>.
- *
- *   h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
- *   h.values_at("cow", "cat")  #=> ["bovine", "feline"]
- */
-
-static mrb_value
-hash_values_at(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value *argv, result;
-  mrb_int argc, i;
-  int ai;
-
-  mrb_get_args(mrb, "*!", &argv, &argc);
-  result = mrb_ary_new_capa(mrb, argc);
-  ai = mrb_gc_arena_save(mrb);
-  for (i = 0; i < argc; i++) {
-    mrb_ary_push(mrb, result, mrb_hash_get(mrb, hash, argv[i]));
-    mrb_gc_arena_restore(mrb, ai);
-  }
-  return result;
-}
-
-void
-mrb_mruby_hash_ext_gem_init(mrb_state *mrb)
-{
-  struct RClass *h;
-
-  h = mrb->hash_class;
-  mrb_define_method(mrb, h, "values_at", hash_values_at, MRB_ARGS_ANY());
-}
-
-void
-mrb_mruby_hash_ext_gem_final(mrb_state *mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/test/hash.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/test/hash.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/test/hash.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-hash-ext/test/hash.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-##
-# Hash(Ext) Test
-
-assert('Hash.[] Hash') do
-  a = Hash['a_key' => 'a_value']
-
-  assert_equal({'a_key' => 'a_value'}, a)
-end
-
-assert('Hash.[] [ [ ["b_key", "b_value" ] ] ]') do
-  a = Hash[ [ ['b_key', 'b_value'] ] ]
-
-  assert_equal({'b_key' => 'b_value'}, a)
-
-  a = Hash[ [ ] ]
-
-  assert_equal({}, a)
-
-  assert_raise(ArgumentError) do
-    Hash[ [ ['b_key', 'b_value', 'b_over'] ] ]
-  end
-
-  assert_raise(ArgumentError) do
-    Hash[ [ [] ] ]
-  end
-end
-
-assert('Hash.[] "c_key", "c_value"') do
-  a = Hash['c_key', 'c_value', 'd_key', 1]
-
-  assert_equal({'c_key' => 'c_value', 'd_key' => 1}, a)
-
-  a = Hash[]
-
-  assert_equal({}, a)
-
-  assert_raise(ArgumentError) do
-    Hash['d_key']
-  end
-end
-
-assert('Hash.[] for sub class') do
-  sub_hash_class = Class.new(Hash)
-  sub_hash = sub_hash_class[]
-  assert_equal(sub_hash_class, sub_hash.class)
-end
-
-assert('Hash.try_convert') do
-  assert_nil Hash.try_convert(nil)
-  assert_nil Hash.try_convert("{1=>2}")
-  assert_equal({1=>2}, Hash.try_convert({1=>2}))
-end
-
-assert('Hash#merge!') do
-  a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
-  b = { 'cba_key' => 'XXX',  'xyz_key' => 'xyz_value' }
-
-  result_1 = a.merge! b
-
-  a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
-  result_2 = a.merge!(b) do |key, original, new|
-    original
-  end
-
-  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'XXX',
-               'xyz_key' => 'xyz_value' }, result_1)
-  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'cba_value',
-               'xyz_key' => 'xyz_value' }, result_2)
-
-  assert_raise(TypeError) do
-    { 'abc_key' => 'abc_value' }.merge! "a"
-  end
-end
-
-assert('Hash#values_at') do
-  h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
-  assert_equal ["bovine", "feline"], h.values_at("cow", "cat")
-
-  keys = []
-  (0...1000).each { |v| keys.push "#{v}" }
-  h = Hash.new { |hash,k| hash[k] = k }
-  assert_equal keys, h.values_at(*keys)
-end
-
-assert('Hash#fetch') do
-  h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
-  assert_equal "feline", h.fetch("cat")
-  assert_equal "mickey", h.fetch("mouse", "mickey")
-  assert_equal "minny", h.fetch("mouse"){"minny"}
-  assert_equal "mouse", h.fetch("mouse"){|k| k}
-  assert_raise(KeyError) do
-    h.fetch("gnu")
-  end
-end
-
-assert("Hash#delete_if") do
-  base = { 1 => 'one', 2 => false, true => 'true', 'cat' => 99 }
-  h1   = { 1 => 'one', 2 => false, true => 'true' }
-  h2   = { 2 => false, 'cat' => 99 }
-  h3   = { 2 => false }
-
-  h = base.dup
-  assert_equal(h, h.delete_if { false })
-  assert_equal({}, h.delete_if { true })
-
-  h = base.dup
-  assert_equal(h1, h.delete_if {|k,v| k.instance_of?(String) })
-  assert_equal(h1, h)
-
-  h = base.dup
-  assert_equal(h2, h.delete_if {|k,v| v.instance_of?(String) })
-  assert_equal(h2, h)
-
-  h = base.dup
-  assert_equal(h3, h.delete_if {|k,v| v })
-  assert_equal(h3, h)
-
-  h = base.dup
-  n = 0
-  h.delete_if {|*a|
-    n += 1
-    assert_equal(2, a.size)
-    assert_equal(base[a[0]], a[1])
-    h.shift
-    true
-  }
-  assert_equal(base.size, n)
-end
-
-assert("Hash#flatten") do
-  a =  {1=> "one", 2 => [2,"two"], 3 => [3, ["three"]]}
-  assert_equal [1, "one", 2, [2, "two"], 3, [3, ["three"]]], a.flatten
-  assert_equal [[1, "one"], [2, [2, "two"]], [3, [3, ["three"]]]], a.flatten(0)
-  assert_equal [1, "one", 2, [2, "two"], 3, [3, ["three"]]], a.flatten(1)
-  assert_equal [1, "one", 2, 2, "two", 3, 3, ["three"]], a.flatten(2)
-  assert_equal [1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(3)
-end
-
-assert("Hash#invert") do
-  h = { 1 => 'one', 2 => 'two', 3 => 'three',
-        true => 'true', nil => 'nil' }.invert
-  assert_equal 1, h['one']
-  assert_equal true, h['true']
-  assert_equal nil, h['nil']
-
-  h = { 'a' => 1, 'b' => 2, 'c' => 1 }.invert
-  assert_equal(2, h.length)
-  assert_include(%w[a c], h[1])
-  assert_equal('b', h[2])
-end
-
-assert("Hash#invert with sub class") do
-  sub_hash_class = Class.new(Hash)
-  sub_hash = sub_hash_class.new
-  assert_equal(sub_hash_class, sub_hash.invert.class)
-end
-
-assert("Hash#keep_if") do
-  h = { 1 => 2, 3 => 4, 5 => 6 }
-  assert_equal({3=>4,5=>6}, h.keep_if {|k, v| k + v >= 7 })
-  h = { 1 => 2, 3 => 4, 5 => 6 }
-  assert_equal({ 1 => 2, 3=> 4, 5 =>6} , h.keep_if { true })
-end
-
-assert("Hash#key") do
-  h = { "a" => 100, "b" => 200, "c" => 300, "d" => 300, nil => 'nil', 'nil' => nil }
-  assert_equal "b", h.key(200)
-  assert_equal "c", h.key(300)
-  assert_nil h.key(999)
-  assert_nil h.key('nil')
-  assert_equal 'nil', h.key(nil)
-end
-
-assert("Hash#to_h") do
-  h = { "a" => 100, "b" => 200 }
-  assert_equal Hash, h.to_h.class
-  assert_equal h, h.to_h
-end
-
-assert('Hash#<') do
-  h1 = {a:1, b:2}
-  h2 = {a:1, b:2, c:3}
-
-  assert_false(h1 < h1)
-  assert_true(h1 < h2)
-  assert_false(h2 < h1)
-  assert_false(h2 < h2)
-
-  h1 = {a:1}
-  h2 = {a:2}
-
-  assert_false(h1 < h1)
-  assert_false(h1 < h2)
-  assert_false(h2 < h1)
-  assert_false(h2 < h2)
-end
-
-assert('Hash#<=') do
-  h1 = {a:1, b:2}
-  h2 = {a:1, b:2, c:3}
-
-  assert_true(h1 <= h1)
-  assert_true(h1 <= h2)
-  assert_false(h2 <= h1)
-  assert_true(h2 <= h2)
-
-  h1 = {a:1}
-  h2 = {a:2}
-
-  assert_true(h1 <= h1)
-  assert_false(h1 <= h2)
-  assert_false(h2 <= h1)
-  assert_true(h2 <= h2)
-end
-
-assert('Hash#>=') do
-  h1 = {a:1, b:2}
-  h2 = {a:1, b:2, c:3}
-
-  assert_true(h1 >= h1)
-  assert_false(h1 >= h2)
-  assert_true(h2 >= h1)
-  assert_true(h2 >= h2)
-
-  h1 = {a:1}
-  h2 = {a:2}
-
-  assert_true(h1 >= h1)
-  assert_false(h1 >= h2)
-  assert_false(h2 >= h1)
-  assert_true(h2 >= h2)
-end
-
-assert('Hash#>') do
-  h1 = {a:1, b:2}
-  h2 = {a:1, b:2, c:3}
-
-  assert_false(h1 > h1)
-  assert_false(h1 > h2)
-  assert_true(h2 > h1)
-  assert_false(h2 > h2)
-
-  h1 = {a:1}
-  h2 = {a:2}
-
-  assert_false(h1 > h1)
-  assert_false(h1 > h2)
-  assert_false(h2 > h1)
-  assert_false(h2 > h2)
-end
-
-assert("Hash#dig") do
-  h = {a:{b:{c:1}}}
-  assert_equal(1, h.dig(:a, :b, :c))
-  assert_nil(h.dig(:d))
-end
-
-assert("Hash#transform_keys") do
-  h = {"1" => 100, "2" => 200}
-  assert_equal(h.transform_keys{|k| k+"!"},
-               {"1!" => 100, "2!" => 200})
-  assert_equal(h.transform_keys{|k|k.to_i},
-               {1 => 100, 2 => 200})
-  assert_equal(h.transform_keys.with_index{|k, i| "#{k}.#{i}"},
-               {"1.0" => 100, "2.1" => 200})
-  assert_equal(h.transform_keys!{|k|k.to_i}, h)
-  assert_equal(h, {1 => 100, 2 => 200})
-end
-
-assert("Hash#transform_values") do
-  h = {a: 1, b: 2, c: 3}
-  assert_equal(h.transform_values{|v| v * v + 1},
-               {a: 2, b: 5, c: 10})
-  assert_equal(h.transform_values{|v|v.to_s},
-               {a: "1", b: "2", c: "3"})
-  assert_equal(h.transform_values.with_index{|v, i| "#{v}.#{i}"},
-               {a: "1.0", b: "2.1", c: "3.2"})
-  assert_equal(h.transform_values!{|v|v.to_s}, h)
-  assert_equal(h, {a: "1", b: "2", c: "3"})
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-inline-struct') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'inline structure'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/string.h>
-#include <mruby/istruct.h>
-
-static mrb_value
-istruct_test_initialize(mrb_state *mrb, mrb_value self)
-{
-  char *string = (char*)mrb_istruct_ptr(self);
-  mrb_int size = mrb_istruct_size();
-  mrb_value object;
-  mrb_get_args(mrb, "o", &object);
-
-  if (mrb_float_p(object))
-  {
-    snprintf(string, size, "float(%.3f)", mrb_float(object));
-  }
-  else if (mrb_fixnum_p(object))
-  {
-    snprintf(string, size, "fixnum(%" MRB_PRId ")", mrb_fixnum(object));
-  }
-  else if (mrb_string_p(object))
-  {
-    snprintf(string, size, "string(%s)", mrb_string_value_cstr(mrb, &object));
-  }
-
-  string[size - 1] = 0; // force NULL at the end
-  return self;
-}
-
-static mrb_value
-istruct_test_to_s(mrb_state *mrb, mrb_value self)
-{
-  return mrb_str_new_cstr(mrb, (const char*)mrb_istruct_ptr(self));
-}
-
-static mrb_value
-istruct_test_length(mrb_state *mrb, mrb_value self)
-{
-  return mrb_fixnum_value(mrb_istruct_size());
-}
-
-static mrb_value
-istruct_test_test_receive(mrb_state *mrb, mrb_value self)
-{
-  mrb_value object;
-  mrb_get_args(mrb, "o", &object);
-  if (mrb_obj_class(mrb, object) != mrb_class_get(mrb, "InlineStructTest"))
-  {
-    mrb_raisef(mrb, E_TYPE_ERROR, "Expected InlineStructTest");
-  }
-  return mrb_bool_value(((char*)mrb_istruct_ptr(object))[0] == 's');
-}
-
-static mrb_value
-istruct_test_test_receive_direct(mrb_state *mrb, mrb_value self)
-{
-  char *ptr;
-  mrb_get_args(mrb, "I", &ptr);
-  return mrb_bool_value(ptr[0] == 's');
-}
-
-static mrb_value
-istruct_test_mutate(mrb_state *mrb, mrb_value self)
-{
-  char *ptr = (char*)mrb_istruct_ptr(self);
-  memcpy(ptr, "mutate", 6);
-  return mrb_nil_value();
-}
-
-void mrb_mruby_inline_struct_gem_test(mrb_state *mrb)
-{
-  struct RClass *cls;
-
-  cls = mrb_define_class(mrb, "InlineStructTest", mrb->object_class);
-  MRB_SET_INSTANCE_TT(cls, MRB_TT_ISTRUCT);
-  mrb_define_method(mrb, cls, "initialize", istruct_test_initialize, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, cls, "to_s", istruct_test_to_s, MRB_ARGS_NONE());
-  mrb_define_method(mrb, cls, "mutate", istruct_test_mutate, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, cls, "length", istruct_test_length, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, cls, "test_receive", istruct_test_test_receive, MRB_ARGS_REQ(1));
-  mrb_define_class_method(mrb, cls, "test_receive_direct", istruct_test_test_receive_direct, MRB_ARGS_REQ(1));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-inline-struct/test/inline.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-##
-# InlineStruct Test
-
-class InlineStructTest
-  def extra_method
-    :ok
-  end
-
-  def test_ivar_set
-    @var = :ivar
-  end
-
-  def test_ivar_get
-    @vat
-  end
-end
-
-assert('InlineStructTest#dup') do
-  obj = InlineStructTest.new(1)
-  assert_equal obj.to_s, 'fixnum(1)'
-  assert_equal obj.dup.to_s, 'fixnum(1)'
-end
-
-assert('InlineStructTest#clone') do
-  obj = InlineStructTest.new(1)
-  assert_equal obj.to_s, 'fixnum(1)'
-  assert_equal obj.clone.to_s, 'fixnum(1)'
-end
-
-assert('InlineStruct#object_id') do
-  obj1 = InlineStructTest.new(1)
-  obj2 = InlineStructTest.new(1)
-  assert_not_equal obj1, obj2
-  assert_not_equal obj1.object_id, obj2.object_id
-  assert_not_equal obj1.object_id, obj1.dup.object_id
-  assert_not_equal obj1.object_id, obj1.clone.object_id
-end
-
-assert('InlineStructTest#mutate (dup)') do
-  obj1 = InlineStructTest.new("foo")
-  assert_equal obj1.to_s, "string(foo)"
-  obj2 = obj1.dup
-  assert_equal obj2.to_s, "string(foo)"
-  obj1.mutate
-  assert_equal obj1.to_s, "mutate(foo)"
-  assert_equal obj2.to_s, "string(foo)"
-end
-
-assert('InlineStructTest#mutate (clone)') do
-  obj1 = InlineStructTest.new("foo")
-  assert_equal obj1.to_s, "string(foo)"
-  obj2 = obj1.clone
-  assert_equal obj2.to_s, "string(foo)"
-  obj1.mutate
-  assert_equal obj1.to_s, "mutate(foo)"
-  assert_equal obj2.to_s, "string(foo)"
-end
-
-assert('InlineStructTest#test_receive(string)') do
-  assert_equal InlineStructTest.test_receive(InlineStructTest.new('a')), true
-end
-
-assert('InlineStructTest#test_receive(float)') do
-  assert_equal InlineStructTest.test_receive(InlineStructTest.new(1.25)), false
-end
-
-assert('InlineStructTest#test_receive(invalid object)') do
-  assert_raise(TypeError) do
-    InlineStructTest.test_receive([])
-  end
-end
-
-assert('InlineStructTest#test_receive(string)') do
-  assert_equal InlineStructTest.test_receive_direct(InlineStructTest.new('a')), true
-end
-
-assert('InlineStructTest#test_receive(float)') do
-  assert_equal InlineStructTest.test_receive_direct(InlineStructTest.new(1.25)), false
-end
-
-assert('InlineStructTest#test_receive(invalid object)') do
-  assert_raise(TypeError) do
-    InlineStructTest.test_receive_direct([])
-  end
-end
-
-assert('InlineStructTest#extra_method') do
-  assert_equal InlineStructTest.new(1).extra_method, :ok
-end
-
-assert('InlineStructTest instance variable') do
-  obj = InlineStructTest.new(1)
-  assert_raise(ArgumentError) do
-    obj.test_ivar_set
-  end
-  assert_equal obj.test_ivar_get, nil
-end
-
-# 64-bit mode
-if InlineStructTest.length == 24
-  assert('InlineStructTest length [64 bit]') do
-    assert_equal InlineStructTest.length, 3 * 8
-  end
-
-  assert('InlineStructTest w/float [64 bit]') do
-    obj = InlineStructTest.new(1.25)
-    assert_equal obj.to_s, "float(1.250)"
-  end
-
-  assert('InlineStructTest w/fixnum [64 bit]') do
-    obj = InlineStructTest.new(42)
-    assert_equal obj.to_s, "fixnum(42)"
-  end
-
-  assert('InlineStructTest w/string [64 bit]') do
-    obj = InlineStructTest.new("hello")
-    assert_equal obj.to_s, "string(hello)"
-  end
-
-  assert('InlineStructTest w/long string [64 bit]') do
-    obj = InlineStructTest.new("this won't fit in 3 * 8 bytes available for the structure")
-    assert_equal obj.to_s, "string(this won't fit i"
-  end
-end
-
-# 32-bit mode
-if InlineStructTest.length == 12
-  assert('InlineStructTest length [32 bit]') do
-    assert_equal InlineStructTest.length, 3 * 4
-  end
-
-  assert('InlineStructTest w/float [32 bit]') do
-    obj = InlineStructTest.new(1.25)
-    assert_equal obj.to_s, "float(1.250"
-  end
-
-  assert('InlineStructTest w/fixnum [32 bit]') do
-    obj = InlineStructTest.new(42)
-    assert_equal obj.to_s, "fixnum(42)"
-  end
-
-  assert('InlineStructTest w/string [32 bit]') do
-    obj = InlineStructTest.new("hello")
-    assert_equal obj.to_s, "string(hell"
-  end
-
-  assert('InlineStructTest w/long string [32 bit]') do
-    obj = InlineStructTest.new("this won't fit in 3 * 4 bytes available for the structure")
-    assert_equal obj.to_s, "string(this"
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-kernel-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Kernel module extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/src/kernel.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/src/kernel.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/src/kernel.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/src/kernel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-#include <mruby.h>
-#include <mruby/error.h>
-#include <mruby/array.h>
-#include <mruby/hash.h>
-#include <mruby/range.h>
-
-static mrb_value
-mrb_f_caller(mrb_state *mrb, mrb_value self)
-{
-  mrb_value bt, v, length;
-  mrb_int bt_len, argc, lev, n;
-
-  bt = mrb_get_backtrace(mrb);
-  bt_len = RARRAY_LEN(bt);
-  argc = mrb_get_args(mrb, "|oo", &v, &length);
-
-  switch (argc) {
-    case 0:
-      lev = 1;
-      n = bt_len - lev;
-      break;
-    case 1:
-      if (mrb_type(v) == MRB_TT_RANGE) {
-        mrb_int beg, len;
-        if (mrb_range_beg_len(mrb, v, &beg, &len, bt_len, TRUE) == 1) {
-          lev = beg;
-          n = len;
-        }
-        else {
-          return mrb_nil_value();
-        }
-      }
-      else {
-        v = mrb_to_int(mrb, v);
-        lev = mrb_fixnum(v);
-        if (lev < 0) {
-          mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative level (%S)", v);
-        }
-        n = bt_len - lev;
-      }
-      break;
-    case 2:
-      lev = mrb_fixnum(mrb_to_int(mrb, v));
-      n = mrb_fixnum(mrb_to_int(mrb, length));
-      if (lev < 0) {
-        mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative level (%S)", v);
-      }
-      if (n < 0) {
-        mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative size (%S)", length);
-      }
-      break;
-    default:
-      lev = n = 0;
-      break;
-  }
-
-  if (n == 0) {
-    return mrb_ary_new(mrb);
-  }
-
-  return mrb_funcall(mrb, bt, "[]", 2, mrb_fixnum_value(lev), mrb_fixnum_value(n));
-}
-
-/*
- *  call-seq:
- *     __method__         -> symbol
- *
- *  Returns the name at the definition of the current method as a
- *  Symbol.
- *  If called outside of a method, it returns <code>nil</code>.
- *
- */
-static mrb_value
-mrb_f_method(mrb_state *mrb, mrb_value self)
-{
-  mrb_callinfo *ci = mrb->c->ci;
-  ci--;
-  if (ci->mid)
-    return mrb_symbol_value(ci->mid);
-  else
-    return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     Integer(arg,base=0)    -> integer
- *
- *  Converts <i>arg</i> to a <code>Fixnum</code>.
- *  Numeric types are converted directly (with floating point numbers
- *  being truncated).    <i>base</i> (0, or between 2 and 36) is a base for
- *  integer string representation.  If <i>arg</i> is a <code>String</code>,
- *  when <i>base</i> is omitted or equals to zero, radix indicators
- *  (<code>0</code>, <code>0b</code>, and <code>0x</code>) are honored.
- *  In any case, strings should be strictly conformed to numeric
- *  representation. This behavior is different from that of
- *  <code>String#to_i</code>.  Non string values will be converted using
- *  <code>to_int</code>, and <code>to_i</code>. Passing <code>nil</code>
- *  raises a TypeError.
- *
- *     Integer(123.999)    #=> 123
- *     Integer("0x1a")     #=> 26
- *     Integer(Time.new)   #=> 1204973019
- *     Integer("0930", 10) #=> 930
- *     Integer("111", 2)   #=> 7
- *     Integer(nil)        #=> TypeError
- */
-static mrb_value
-mrb_f_integer(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-  mrb_int base = 0;
-
-  mrb_get_args(mrb, "o|i", &arg, &base);
-  return mrb_convert_to_integer(mrb, arg, base);
-}
-
-/*
- *  call-seq:
- *     Float(arg)    -> float
- *
- *  Returns <i>arg</i> converted to a float. Numeric types are converted
- *  directly, the rest are converted using <i>arg</i>.to_f.
- *
- *     Float(1)           #=> 1.0
- *     Float(123.456)     #=> 123.456
- *     Float("123.456")   #=> 123.456
- *     Float(nil)         #=> TypeError
- */
-static mrb_value
-mrb_f_float(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-
-  mrb_get_args(mrb, "o", &arg);
-  return mrb_Float(mrb, arg);
-}
-
-/*
- *  call-seq:
- *     String(arg)   -> string
- *
- *  Returns <i>arg</i> as an <code>String</code>.
- *
- *  First tries to call its <code>to_str</code> method, then its to_s method.
- *
- *     String(self)        #=> "main"
- *     String(self.class)  #=> "Object"
- *     String(123456)      #=> "123456"
- */
-static mrb_value
-mrb_f_string(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg, tmp;
-
-  mrb_get_args(mrb, "o", &arg);
-  tmp = mrb_check_convert_type(mrb, arg, MRB_TT_STRING, "String", "to_str");
-  if (mrb_nil_p(tmp)) {
-    tmp = mrb_check_convert_type(mrb, arg, MRB_TT_STRING, "String", "to_s");
-  }
-  return tmp;
-}
-
-/*
- *  call-seq:
- *     Array(arg)    -> array
- *
- *  Returns +arg+ as an Array.
- *
- *  First tries to call Array#to_ary on +arg+, then Array#to_a.
- *
- *     Array(1..5)   #=> [1, 2, 3, 4, 5]
- *
- */
-static mrb_value
-mrb_f_array(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg, tmp;
-
-  mrb_get_args(mrb, "o", &arg);
-  tmp = mrb_check_convert_type(mrb, arg, MRB_TT_ARRAY, "Array", "to_ary");
-  if (mrb_nil_p(tmp)) {
-    tmp = mrb_check_convert_type(mrb, arg, MRB_TT_ARRAY, "Array", "to_a");
-  }
-  if (mrb_nil_p(tmp)) {
-    return mrb_ary_new_from_values(mrb, 1, &arg);
-  }
-
-  return tmp;
-}
-
-/*
- *  call-seq:
- *     Hash(arg)    -> hash
- *
- *  Converts <i>arg</i> to a <code>Hash</code> by calling
- *  <i>arg</i><code>.to_hash</code>. Returns an empty <code>Hash</code> when
- *  <i>arg</i> is <tt>nil</tt> or <tt>[]</tt>.
- *
- *      Hash([])          #=> {}
- *      Hash(nil)         #=> {}
- *      Hash(key: :value) #=> {:key => :value}
- *      Hash([1, 2, 3])   #=> TypeError
- *
- */
-static mrb_value
-mrb_f_hash(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg, tmp;
-
-  mrb_get_args(mrb, "o", &arg);
-  if (mrb_nil_p(arg)) {
-    return mrb_hash_new(mrb);
-  }
-  tmp = mrb_check_convert_type(mrb, arg, MRB_TT_HASH, "Hash", "to_hash");
-  if (mrb_nil_p(tmp)) {
-    if (mrb_array_p(arg) && RARRAY_LEN(arg) == 0) {
-      return mrb_hash_new(mrb);
-    }
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into Hash",
-      mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, arg)));
-  }
-  return tmp;
-}
-
-void
-mrb_mruby_kernel_ext_gem_init(mrb_state *mrb)
-{
-  struct RClass *krn = mrb->kernel_module;
-
-  mrb_define_module_function(mrb, krn, "fail", mrb_f_raise, MRB_ARGS_OPT(2));
-  mrb_define_module_function(mrb, krn, "caller", mrb_f_caller, MRB_ARGS_OPT(2));
-  mrb_define_method(mrb, krn, "__method__", mrb_f_method, MRB_ARGS_NONE());
-  mrb_define_module_function(mrb, krn, "Integer", mrb_f_integer, MRB_ARGS_ANY());
-  mrb_define_module_function(mrb, krn, "Float", mrb_f_float, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, krn, "String", mrb_f_string, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, krn, "Array", mrb_f_array, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, krn, "Hash", mrb_f_hash, MRB_ARGS_REQ(1));
-}
-
-void
-mrb_mruby_kernel_ext_gem_final(mrb_state *mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/test/kernel.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/test/kernel.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/test/kernel.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-kernel-ext/test/kernel.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-assert('Kernel.fail, Kernel#fail') do
-  assert_raise(RuntimeError) { fail }
-  assert_raise(RuntimeError) { Kernel.fail }
-end
-
-assert('Kernel.caller, Kernel#caller') do
-  skip "backtrace isn't available" if caller(0).empty?
-
-  caller_lineno = __LINE__ + 3
-  c = Class.new do
-    def foo(*args)
-      caller(*args)
-    end
-
-    def bar(*args)
-      foo(*args)
-    end
-
-    def baz(*args)
-      bar(*args)
-    end
-  end
-  assert_equal "kernel.rb:#{caller_lineno}:in foo", c.new.baz(0)[0][-19..-1]
-  assert_equal "bar", c.new.baz[0][-3..-1]
-  assert_equal "foo", c.new.baz(0)[0][-3..-1]
-  assert_equal "bar", c.new.baz(1)[0][-3..-1]
-  assert_equal "baz", c.new.baz(2)[0][-3..-1]
-  assert_equal ["foo", "bar"], c.new.baz(0, 2).map { |i| i[-3..-1] }
-  assert_equal ["bar", "baz"], c.new.baz(1..2).map { |i| i[-3..-1] }
-  assert_nil c.new.baz(10..20)
-  assert_raise(ArgumentError) { c.new.baz(-1) }
-  assert_raise(ArgumentError) { c.new.baz(-1, 1) }
-  assert_raise(ArgumentError) { c.new.baz(1, -1) }
-  assert_raise(TypeError) { c.new.baz(nil) }
-end
-
-assert('Kernel#__method__') do
-  assert_equal(:m, Class.new {def m; __method__; end}.new.m)
-  assert_equal(:m, Class.new {define_method(:m) {__method__}}.new.m)
-  c = Class.new do
-    [:m1, :m2].each do |m|
-      define_method(m) do
-        __method__
-      end
-    end
-  end
-  assert_equal(:m1, c.new.m1)
-  assert_equal(:m2, c.new.m2)
-end
-
-assert('Kernel#Integer') do
-  assert_equal(123, Integer(123.999))
-  assert_equal(26, Integer("0x1a"))
-  assert_equal(930, Integer("0930", 10))
-  assert_equal(7, Integer("111", 2))
-  assert_equal(0, Integer("0"))
-  assert_equal(0, Integer("00000"))
-  assert_raise(TypeError) { Integer(nil) }
-end
-
-assert('Kernel#Float') do
-  assert_equal(1.0, Float(1))
-  assert_equal(123.456, Float(123.456))
-  assert_equal(123.456, Float("123.456"))
-  assert_raise(TypeError) { Float(nil) }
-end
-
-assert('Kernel#String') do
-  assert_equal("main", String(self))
-  assert_equal("Object", String(self.class))
-  assert_equal("123456", String(123456))
-end
-
-assert('Kernel#Array') do
-  assert_equal([1], Kernel.Array(1))
-  assert_equal([1, 2, 3, 4, 5], Kernel.Array([1, 2, 3, 4, 5]))
-  assert_equal([1, 2, 3, 4, 5], Kernel.Array(1..5))
-  assert_equal([[:a, 1], [:b, 2], [:c, 3]], Kernel.Array({a:1, b:2, c:3}))
-end
-
-assert('Kernel#Hash') do
-  assert_equal({}, Hash([]))
-  assert_equal({}, Hash(nil))
-  assert_equal({:key => :value}, Hash(key: :value))
-  assert_raise(TypeError) { Hash([1, 2, 3]) }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-math') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'standard Math module'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/src/math.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/src/math.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/src/math.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/src/math.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,783 +0,0 @@
-/*
-** math.c - Math module
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/array.h>
-
-#include <math.h>
-
-static void
-domain_error(mrb_state *mrb, const char *func)
-{
-  struct RClass *math = mrb_module_get(mrb, "Math");
-  struct RClass *domainerror = mrb_class_get_under(mrb, math, "DomainError");
-  mrb_value str = mrb_str_new_cstr(mrb, func);
-  mrb_raisef(mrb, domainerror, "Numerical argument is out of domain - %S", str);
-}
-
-/* math functions not provided by Microsoft Visual C++ 2012 or older */
-#if defined _MSC_VER && _MSC_VER <= 1700
-
-#include <float.h>
-
-#define MATH_TOLERANCE 1E-12
-
-double
-asinh(double x)
-{
-  double xa, ya, y;
-
-  /* Basic formula loses precision for x < 0, but asinh is an odd function */
-  xa = fabs(x);
-  if (xa > 3.16227E+18) {
-    /* Prevent x*x from overflowing; basic formula reduces to log(2*x) */
-    ya = log(xa) + 0.69314718055994530942;
-  }
-  else {
-    /* Basic formula for asinh */
-    ya = log(xa + sqrt(xa*xa + 1.0));
-  }
-
-  y = _copysign(ya, x);
-  return y;
-}
-
-double
-acosh(double x)
-{
-  double y;
-
-  if (x > 3.16227E+18) {
-    /* Prevent x*x from overflowing; basic formula reduces to log(2*x) */
-    y = log(x) + 0.69314718055994530942;
-  }
-  else {
-    /* Basic formula for acosh */
-    y = log(x + sqrt(x*x - 1.0));
-  }
-
-  return y;
-}
-
-double
-atanh(double x)
-{
-  double y;
-
-  if (fabs(x) < 1E-2) {
-    /* The sums 1+x and 1-x lose precision for small x.  Use the polynomial
-       instead. */
-    double x2 = x * x;
-    y = x*(1.0 + x2*(1.0/3.0 + x2*(1.0/5.0 + x2*(1.0/7.0))));
-  }
-  else {
-    /* Basic formula for atanh */
-    y = 0.5 * (log(1.0+x) - log(1.0-x));
-  }
-
-  return y;
-}
-
-double
-cbrt(double x)
-{
-  double xa, ya, y;
-
-  /* pow(x, y) is undefined for x < 0 and y not an integer, but cbrt is an
-     odd function */
-  xa = fabs(x);
-  ya = pow(xa, 1.0/3.0);
-  y = _copysign(ya, x);
-  return y;
-}
-
-/* Declaration of complementary Error function */
-double
-erfc(double x);
-
-/*
-** Implementations of error functions
-** credits to http://www.digitalmars.com/archives/cplusplus/3634.html
-*/
-
-/* Implementation of Error function */
-double
-erf(double x)
-{
-  static const double two_sqrtpi =  1.128379167095512574;
-  double sum  = x;
-  double term = x;
-  double xsqr = x*x;
-  int j= 1;
-  if (fabs(x) > 2.2) {
-    return 1.0 - erfc(x);
-  }
-  do {
-    term *= xsqr/j;
-    sum  -= term/(2*j+1);
-    ++j;
-    term *= xsqr/j;
-    sum  += term/(2*j+1);
-    ++j;
-  } while (fabs(term/sum) > MATH_TOLERANCE);
-  return two_sqrtpi*sum;
-}
-
-/* Implementation of complementary Error function */
-double
-erfc(double x)
-{
-  static const double one_sqrtpi=  0.564189583547756287;
-  double a = 1;
-  double b = x;
-  double c = x;
-  double d = x*x+0.5;
-  double q1;
-  double q2 = b/d;
-  double n = 1.0;
-  double t;
-  if (fabs(x) < 2.2) {
-    return 1.0 - erf(x);
-  }
-  if (x < 0.0) { /*signbit(x)*/
-    return 2.0 - erfc(-x);
-  }
-  do {
-    t  = a*n+b*x;
-    a  = b;
-    b  = t;
-    t  = c*n+d*x;
-    c  = d;
-    d  = t;
-    n += 0.5;
-    q1 = q2;
-    q2 = b/d;
-  } while (fabs(q1-q2)/q2 > MATH_TOLERANCE);
-  return one_sqrtpi*exp(-x*x)*q2;
-}
-
-#endif
-
-#if (defined _MSC_VER && _MSC_VER < 1800) || defined __ANDROID__ || (defined __FreeBSD__  &&  __FreeBSD_version < 803000)
-
-double
-log2(double x)
-{
-    return log10(x)/log10(2.0);
-}
-
-#endif
-
-/*
-  TRIGONOMETRIC FUNCTIONS
-*/
-
-/*
- *  call-seq:
- *     Math.sin(x)    -> float
- *
- *  Computes the sine of <i>x</i> (expressed in radians). Returns
- *  -1..1.
- */
-static mrb_value
-math_sin(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = sin(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.cos(x)    -> float
- *
- *  Computes the cosine of <i>x</i> (expressed in radians). Returns
- *  -1..1.
- */
-static mrb_value
-math_cos(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = cos(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.tan(x)    -> float
- *
- *  Returns the tangent of <i>x</i> (expressed in radians).
- */
-static mrb_value
-math_tan(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = tan(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
-  INVERSE TRIGONOMETRIC FUNCTIONS
-*/
-
-/*
- *  call-seq:
- *     Math.asin(x)    -> float
- *
- *  Computes the arc sine of <i>x</i>.
- *  @return computed value between `-(PI/2)` and `(PI/2)`.
- */
-static mrb_value
-math_asin(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < -1.0 || x > 1.0) {
-    domain_error(mrb, "asin");
-  }
-  x = asin(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.acos(x)    -> float
- *
- *  Computes the arc cosine of <i>x</i>. Returns 0..PI.
- */
-static mrb_value
-math_acos(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < -1.0 || x > 1.0) {
-    domain_error(mrb, "acos");
-  }
-  x = acos(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.atan(x)    -> float
- *
- *  Computes the arc tangent of <i>x</i>. Returns `-(PI/2) .. (PI/2)`.
- */
-static mrb_value
-math_atan(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = atan(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.atan2(y, x)  -> float
- *
- *  Computes the arc tangent given <i>y</i> and <i>x</i>. Returns
- *  -PI..PI.
- *
- *    Math.atan2(-0.0, -1.0) #=> -3.141592653589793
- *    Math.atan2(-1.0, -1.0) #=> -2.356194490192345
- *    Math.atan2(-1.0, 0.0)  #=> -1.5707963267948966
- *    Math.atan2(-1.0, 1.0)  #=> -0.7853981633974483
- *    Math.atan2(-0.0, 1.0)  #=> -0.0
- *    Math.atan2(0.0, 1.0)   #=> 0.0
- *    Math.atan2(1.0, 1.0)   #=> 0.7853981633974483
- *    Math.atan2(1.0, 0.0)   #=> 1.5707963267948966
- *    Math.atan2(1.0, -1.0)  #=> 2.356194490192345
- *    Math.atan2(0.0, -1.0)  #=> 3.141592653589793
- *
- */
-static mrb_value
-math_atan2(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x, y;
-
-  mrb_get_args(mrb, "ff", &x, &y);
-  x = atan2(x, y);
-
-  return mrb_float_value(mrb, x);
-}
-
-
-
-/*
-  HYPERBOLIC TRIG FUNCTIONS
-*/
-/*
- *  call-seq:
- *     Math.sinh(x)    -> float
- *
- *  Computes the hyperbolic sine of <i>x</i> (expressed in
- *  radians).
- */
-static mrb_value
-math_sinh(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = sinh(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.cosh(x)    -> float
- *
- *  Computes the hyperbolic cosine of <i>x</i> (expressed in radians).
- */
-static mrb_value
-math_cosh(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = cosh(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.tanh()    -> float
- *
- *  Computes the hyperbolic tangent of <i>x</i> (expressed in
- *  radians).
- */
-static mrb_value
-math_tanh(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = tanh(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-
-/*
-  INVERSE HYPERBOLIC TRIG FUNCTIONS
-*/
-
-/*
- *  call-seq:
- *     Math.asinh(x)    -> float
- *
- *  Computes the inverse hyperbolic sine of <i>x</i>.
- */
-static mrb_value
-math_asinh(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-
-  x = asinh(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.acosh(x)    -> float
- *
- *  Computes the inverse hyperbolic cosine of <i>x</i>.
- */
-static mrb_value
-math_acosh(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < 1.0) {
-    domain_error(mrb, "acosh");
-  }
-  x = acosh(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.atanh(x)    -> float
- *
- *  Computes the inverse hyperbolic tangent of <i>x</i>.
- */
-static mrb_value
-math_atanh(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < -1.0 || x > 1.0) {
-    domain_error(mrb, "atanh");
-  }
-  x = atanh(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
-  EXPONENTIALS AND LOGARITHMS
-*/
-
-/*
- *  call-seq:
- *     Math.exp(x)    -> float
- *
- *  Returns e**x.
- *
- *    Math.exp(0)       #=> 1.0
- *    Math.exp(1)       #=> 2.718281828459045
- *    Math.exp(1.5)     #=> 4.4816890703380645
- *
- */
-static mrb_value
-math_exp(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = exp(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.log(numeric)    -> float
- *     Math.log(num,base)   -> float
- *
- *  Returns the natural logarithm of <i>numeric</i>.
- *  If additional second argument is given, it will be the base
- *  of logarithm.
- *
- *    Math.log(1)          #=> 0.0
- *    Math.log(Math::E)    #=> 1.0
- *    Math.log(Math::E**3) #=> 3.0
- *    Math.log(12,3)       #=> 2.2618595071429146
- *
- */
-static mrb_value
-math_log(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x, base;
-  int argc;
-
-  argc = mrb_get_args(mrb, "f|f", &x, &base);
-  if (x < 0.0) {
-    domain_error(mrb, "log");
-  }
-  x = log(x);
-  if (argc == 2) {
-    if (base < 0.0) {
-      domain_error(mrb, "log");
-    }
-    x /= log(base);
-  }
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.log2(numeric)    -> float
- *
- *  Returns the base 2 logarithm of <i>numeric</i>.
- *
- *    Math.log2(1)      #=> 0.0
- *    Math.log2(2)      #=> 1.0
- *    Math.log2(32768)  #=> 15.0
- *    Math.log2(65536)  #=> 16.0
- *
- */
-static mrb_value
-math_log2(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < 0.0) {
-    domain_error(mrb, "log2");
-  }
-  x = log2(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.log10(numeric)    -> float
- *
- *  Returns the base 10 logarithm of <i>numeric</i>.
- *
- *    Math.log10(1)       #=> 0.0
- *    Math.log10(10)      #=> 1.0
- *    Math.log10(10**100) #=> 100.0
- *
- */
-static mrb_value
-math_log10(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < 0.0) {
-    domain_error(mrb, "log10");
-  }
-  x = log10(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.sqrt(numeric)    -> float
- *
- *  Returns the square root of <i>numeric</i>.
- *
- */
-static mrb_value
-math_sqrt(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  if (x < 0.0) {
-    domain_error(mrb, "sqrt");
-  }
-  x = sqrt(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-
-/*
- *  call-seq:
- *     Math.cbrt(numeric)    -> float
- *
- *  Returns the cube root of <i>numeric</i>.
- *
- *    -9.upto(9) {|x|
- *      p [x, Math.cbrt(x), Math.cbrt(x)**3]
- *    }
- *    #=>
- *    [-9, -2.0800838230519, -9.0]
- *    [-8, -2.0, -8.0]
- *    [-7, -1.91293118277239, -7.0]
- *    [-6, -1.81712059283214, -6.0]
- *    [-5, -1.7099759466767, -5.0]
- *    [-4, -1.5874010519682, -4.0]
- *    [-3, -1.44224957030741, -3.0]
- *    [-2, -1.25992104989487, -2.0]
- *    [-1, -1.0, -1.0]
- *    [0, 0.0, 0.0]
- *    [1, 1.0, 1.0]
- *    [2, 1.25992104989487, 2.0]
- *    [3, 1.44224957030741, 3.0]
- *    [4, 1.5874010519682, 4.0]
- *    [5, 1.7099759466767, 5.0]
- *    [6, 1.81712059283214, 6.0]
- *    [7, 1.91293118277239, 7.0]
- *    [8, 2.0, 8.0]
- *    [9, 2.0800838230519, 9.0]
- *
- */
-static mrb_value
-math_cbrt(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = cbrt(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-
-/*
- *  call-seq:
- *     Math.frexp(numeric)    -> [ fraction, exponent ]
- *
- *  Returns a two-element array containing the normalized fraction (a
- *  <code>Float</code>) and exponent (a <code>Fixnum</code>) of
- *  <i>numeric</i>.
- *
- *     fraction, exponent = Math.frexp(1234)   #=> [0.6025390625, 11]
- *     fraction * 2**exponent                  #=> 1234.0
- */
-static mrb_value
-math_frexp(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-  int exp;
-
-  mrb_get_args(mrb, "f", &x);
-  x = frexp(x, &exp);
-
-  return mrb_assoc_new(mrb, mrb_float_value(mrb, x), mrb_fixnum_value(exp));
-}
-
-/*
- *  call-seq:
- *     Math.ldexp(flt, int) -> float
- *
- *  Returns the value of <i>flt</i>*(2**<i>int</i>).
- *
- *     fraction, exponent = Math.frexp(1234)
- *     Math.ldexp(fraction, exponent)   #=> 1234.0
- */
-static mrb_value
-math_ldexp(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-  mrb_int   i;
-
-  mrb_get_args(mrb, "fi", &x, &i);
-  x = ldexp(x, i);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- *  call-seq:
- *     Math.hypot(x, y)    -> float
- *
- *  Returns sqrt(x**2 + y**2), the hypotenuse of a right-angled triangle
- *  with sides <i>x</i> and <i>y</i>.
- *
- *     Math.hypot(3, 4)   #=> 5.0
- */
-static mrb_value
-math_hypot(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x, y;
-
-  mrb_get_args(mrb, "ff", &x, &y);
-  x = hypot(x, y);
-
-  return mrb_float_value(mrb, x);
-}
-
-/*
- * call-seq:
- *    Math.erf(x)  -> float
- *
- *  Calculates the error function of x.
- */
-static mrb_value
-math_erf(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = erf(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-
-/*
- * call-seq:
- *    Math.erfc(x)  -> float
- *
- *  Calculates the complementary error function of x.
- */
-static mrb_value
-math_erfc(mrb_state *mrb, mrb_value obj)
-{
-  mrb_float x;
-
-  mrb_get_args(mrb, "f", &x);
-  x = erfc(x);
-
-  return mrb_float_value(mrb, x);
-}
-
-/* ------------------------------------------------------------------------*/
-void
-mrb_mruby_math_gem_init(mrb_state* mrb)
-{
-  struct RClass *mrb_math;
-  mrb_math = mrb_define_module(mrb, "Math");
-
-  mrb_define_class_under(mrb, mrb_math, "DomainError", mrb->eStandardError_class);
-
-#ifdef M_PI
-  mrb_define_const(mrb, mrb_math, "PI", mrb_float_value(mrb, M_PI));
-#else
-  mrb_define_const(mrb, mrb_math, "PI", mrb_float_value(mrb, atan(1.0)*4.0));
-#endif
-
-#ifdef M_E
-  mrb_define_const(mrb, mrb_math, "E", mrb_float_value(mrb, M_E));
-#else
-  mrb_define_const(mrb, mrb_math, "E", mrb_float_value(mrb, exp(1.0)));
-#endif
-
-#ifdef MRB_USE_FLOAT
-  mrb_define_const(mrb, mrb_math, "TOLERANCE", mrb_float_value(mrb, 1e-5));
-#else
-  mrb_define_const(mrb, mrb_math, "TOLERANCE", mrb_float_value(mrb, 1e-12));
-#endif
-
-  mrb_define_module_function(mrb, mrb_math, "sin", math_sin, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "cos", math_cos, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "tan", math_tan, MRB_ARGS_REQ(1));
-
-  mrb_define_module_function(mrb, mrb_math, "asin", math_asin, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "acos", math_acos, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "atan", math_atan, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "atan2", math_atan2, MRB_ARGS_REQ(2));
-
-  mrb_define_module_function(mrb, mrb_math, "sinh", math_sinh, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "cosh", math_cosh, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "tanh", math_tanh, MRB_ARGS_REQ(1));
-
-  mrb_define_module_function(mrb, mrb_math, "asinh", math_asinh, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "acosh", math_acosh, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "atanh", math_atanh, MRB_ARGS_REQ(1));
-
-  mrb_define_module_function(mrb, mrb_math, "exp", math_exp, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "log", math_log, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
-  mrb_define_module_function(mrb, mrb_math, "log2", math_log2, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "log10", math_log10, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "sqrt", math_sqrt, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "cbrt", math_cbrt, MRB_ARGS_REQ(1));
-
-  mrb_define_module_function(mrb, mrb_math, "frexp", math_frexp, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "ldexp", math_ldexp, MRB_ARGS_REQ(2));
-
-  mrb_define_module_function(mrb, mrb_math, "hypot", math_hypot, MRB_ARGS_REQ(2));
-
-  mrb_define_module_function(mrb, mrb_math, "erf",  math_erf,  MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, mrb_math, "erfc", math_erfc, MRB_ARGS_REQ(1));
-}
-
-void
-mrb_mruby_math_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/test/math.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/test/math.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/test/math.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-math/test/math.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-##
-# Math Test
-
-##
-# Performs fuzzy check for equality on methods returning floats
-# on the basis of the Math::TOLERANCE constant.
-def check_float(a, b)
-  tolerance = Math::TOLERANCE
-  a = a.to_f
-  b = b.to_f
-  if a.finite? and b.finite?
-    (a-b).abs < tolerance
-  else
-    true
-  end
-end
-
-assert('Math.sin 0') do
-  check_float(Math.sin(0), 0)
-end
-
-assert('Math.sin PI/2') do
-  check_float(Math.sin(Math::PI / 2), 1)
-end
-
-assert('Math.cos 0') do
-  check_float(Math.cos(0), 1)
-end
-
-assert('Math.cos PI/2') do
-  check_float(Math.cos(Math::PI / 2), 0)
-end
-
-assert('Math.tan 0') do
-  check_float(Math.tan(0), 0)
-end
-
-assert('Math.tan PI/4') do
-  check_float(Math.tan(Math::PI / 4), 1)
-end
-
-assert('Fundamental trig identities') do
-  result = true
-  N = 13
-  N.times do |i|
-    a  = Math::PI / N * i
-    ca = Math::PI / 2 - a
-    s  = Math.sin(a)
-    c  = Math.cos(a)
-    t  = Math.tan(a)
-    result &= check_float(s, Math.cos(ca))
-    result &= check_float(t, 1 / Math.tan(ca))
-    result &= check_float(s ** 2 + c ** 2, 1)
-    result &= check_float(t ** 2 + 1, (1/c) ** 2)
-    result &= check_float((1/t) ** 2 + 1, (1/s) ** 2)
-  end
-  result
-end
-
-assert('Math.erf 0') do
-  check_float(Math.erf(0), 0)
-end
-
-assert('Math.exp 0') do
-  check_float(Math.exp(0), 1.0)
-end
-
-assert('Math.exp 1') do
-  check_float(Math.exp(1), 2.718281828459045)
-end
-
-assert('Math.exp 1.5') do
-  check_float(Math.exp(1.5), 4.4816890703380645)
-end
-
-assert('Math.log 1') do
-  check_float(Math.log(1), 0)
-end
-
-assert('Math.log E') do
-  check_float(Math.log(Math::E), 1.0)
-end
-
-assert('Math.log E**3') do
-  check_float(Math.log(Math::E**3), 3.0)
-end
-
-assert('Math.log2 1') do
-  check_float(Math.log2(1), 0.0)
-end
-
-assert('Math.log2 2') do
-  check_float(Math.log2(2), 1.0)
-end
-
-assert('Math.log10 1') do
-  check_float(Math.log10(1), 0.0)
-end
-
-assert('Math.log10 10') do
-  check_float(Math.log10(10), 1.0)
-end
-
-assert('Math.log10 10**100') do
-  check_float(Math.log10(10**100), 100.0)
-end
-
-assert('Math.sqrt') do
-  num = [0.0, 1.0, 2.0, 3.0, 4.0]
-  sqr = [0, 1, 4, 9, 16]
-  result = true
-  sqr.each_with_index do |v,i|
-    result &= check_float(Math.sqrt(v), num[i])
-  end
-  result
-end
-
-assert('Math.cbrt') do
-  num = [-2.0, -1.0, 0.0, 1.0, 2.0]
-  cub = [-8, -1, 0, 1, 8]
-  result = true
-  cub.each_with_index do |v,i|
-    result &= check_float(Math.cbrt(v), num[i])
-  end
-  result
-end
-
-assert('Math.hypot') do
-  check_float(Math.hypot(3, 4), 5.0)
-end
-
-assert('Math.frexp 1234') do
-  n = 1234
-  fraction, exponent = Math.frexp(n)
-  check_float(Math.ldexp(fraction, exponent), n)
-end
-
-assert('Math.erf 1') do
-  check_float(Math.erf(1), 0.842700792949715)
-end
-
-assert('Math.erfc 1') do
-  check_float(Math.erfc(1), 0.157299207050285)
-end
-
-assert('Math.erf -1') do
-  check_float(Math.erf(-1), -0.8427007929497148)
-end
-
-assert('Math.erfc -1') do
-  check_float(Math.erfc(-1), 1.8427007929497148)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-numeric-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Numeric class extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/mrblib/numeric_ext.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-module Integral
-  def div(other)
-    self.divmod(other)[0]
-  end
-
-  def zero?
-    self == 0
-  end
-
-  def nonzero?
-    if self == 0
-      nil
-    else
-      self
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/src/numeric_ext.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include <limits.h>
-#include <mruby.h>
-
-static mrb_value
-mrb_int_chr(mrb_state *mrb, mrb_value x)
-{
-  mrb_int chr;
-  char c;
-
-  chr = mrb_fixnum(x);
-  if (chr >= (1 << CHAR_BIT)) {
-    mrb_raisef(mrb, E_RANGE_ERROR, "%S out of char range", x);
-  }
-  c = (char)chr;
-
-  return mrb_str_new(mrb, &c, 1);
-}
-
-void
-mrb_mruby_numeric_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass *i = mrb_class_get(mrb, "Integer");
-
-  mrb_define_method(mrb, i, "chr", mrb_int_chr, MRB_ARGS_NONE());
-}
-
-void
-mrb_mruby_numeric_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/test/numeric.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/test/numeric.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/test/numeric.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-numeric-ext/test/numeric.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-##
-# Numeric(Ext) Test
-
-assert('Integer#chr') do
-  assert_equal("A", 65.chr)
-  assert_equal("B", 0x42.chr)
-
-  # multibyte encoding (not support yet)
-  assert_raise(RangeError) { 256.chr }
-end
-
-assert('Integer#div') do
-  assert_equal 52, 365.div(7)
-end
-
-assert('Float#div') do
-  assert_float 52, 365.2425.div(7)
-end
-
-assert('Integer#zero?') do
-  assert_equal true, 0.zero?
-  assert_equal false, 1.zero?
-end
-
-assert('Integer#nonzero?') do
-  assert_equal nil, 0.nonzero?
-  assert_equal 1000, 1000.nonzero?
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-object-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Object class extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrblib/object.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrblib/object.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrblib/object.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/mrblib/object.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-class Object
-  ##
-  #  call-seq:
-  #     obj.tap{|x|...}    -> obj
-  #
-  #  Yields <code>x</code> to the block, and then returns <code>x</code>.
-  #  The primary purpose of this method is to "tap into" a method chain,
-  #  in order to perform operations on intermediate results within the chain.
-  #
-  #  (1..10)                .tap {|x| puts "original: #{x.inspect}"}
-  #    .to_a                .tap {|x| puts "array: #{x.inspect}"}
-  #    .select {|x| x%2==0} .tap {|x| puts "evens: #{x.inspect}"}
-  #    .map { |x| x*x }     .tap {|x| puts "squares: #{x.inspect}"}
-  #
-  def tap
-    yield self
-    self
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/src/object.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/src/object.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/src/object.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/src/object.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/proc.h>
-
-/*
- *  call-seq:
- *     nil.to_a    -> []
- *
- *  Always returns an empty array.
- */
-
-static mrb_value
-nil_to_a(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_ary_new(mrb);
-}
-
-/*
- *  call-seq:
- *     nil.to_f    -> 0.0
- *
- *  Always returns zero.
- */
-
-static mrb_value
-nil_to_f(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_float_value(mrb, 0.0);
-}
-
-/*
- *  call-seq:
- *     nil.to_i    -> 0
- *
- *  Always returns zero.
- */
-
-static mrb_value
-nil_to_i(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_fixnum_value(0);
-}
-
-/*
- *  call-seq:
- *     obj.instance_exec(arg...) {|var...| block }                       -> obj
- *
- *  Executes the given block within the context of the receiver
- *  (_obj_). In order to set the context, the variable +self+ is set
- *  to _obj_ while the code is executing, giving the code access to
- *  _obj_'s instance variables.  Arguments are passed as block parameters.
- *
- *     class KlassWithSecret
- *       def initialize
- *         @secret = 99
- *       end
- *     end
- *     k = KlassWithSecret.new
- *     k.instance_exec(5) {|x| @secret+x }   #=> 104
- */
-
-static mrb_value
-mrb_obj_instance_exec(mrb_state *mrb, mrb_value self)
-{
-  const mrb_value *argv;
-  mrb_int argc;
-  mrb_value blk;
-  struct RClass *c;
-
-  mrb_get_args(mrb, "*&", &argv, &argc, &blk);
-
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-
-  switch (mrb_type(self)) {
-  case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
-  case MRB_TT_FLOAT:
-    c = NULL;
-    break;
-  default:
-    c = mrb_class_ptr(mrb_singleton_class(mrb, self));
-    break;
-  }
-  mrb->c->ci->target_class = c;
-  return mrb_yield_cont(mrb, blk, self, argc, argv);
-}
-
-void
-mrb_mruby_object_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass * n = mrb->nil_class;
-
-  mrb_define_method(mrb, n, "to_a", nil_to_a,       MRB_ARGS_NONE());
-  mrb_define_method(mrb, n, "to_f", nil_to_f,       MRB_ARGS_NONE());
-  mrb_define_method(mrb, n, "to_i", nil_to_i,       MRB_ARGS_NONE());
-
-  mrb_define_method(mrb, mrb->kernel_module, "instance_exec", mrb_obj_instance_exec, MRB_ARGS_ANY() | MRB_ARGS_BLOCK());
-}
-
-void
-mrb_mruby_object_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/nil.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/nil.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/nil.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/nil.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-assert('NilClass#to_a') do
-  assert_equal [], nil.to_a
-end
-
-assert('NilClass#to_f') do
-  assert_equal 0.0, nil.to_f
-end
-
-assert('NilClass#to_i') do
-  assert_equal 0, nil.to_i
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/object.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/object.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/object.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-object-ext/test/object.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-assert('Object#instance_exec') do
-  class KlassWithSecret
-    def initialize
-      @secret = 99
-    end
-  end
-  k = KlassWithSecret.new
-  assert_equal 104, k.instance_exec(5) {|x| @secret+x }
-end
-
-assert('Object#tap') do
-  ret = []
-  (1..10)                 .tap {|x| ret << "original: #{x.inspect}"}
-     .to_a                .tap {|x| ret << "array: #{x.inspect}"}
-     .select {|x| x%2==0} .tap {|x| ret << "evens: #{x.inspect}"}
-     .map { |x| x*x }     .tap {|x| ret << "squares: #{x.inspect}"}
-
-  assert_equal [
-    "original: 1..10",
-    "array: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]",
-    "evens: [2, 4, 6, 8, 10]",
-    "squares: [4, 16, 36, 64, 100]"
-  ], ret
-  assert_equal(:tap_ok, Class.new {def m; tap{return :tap_ok}; end}.new.m)
-end
-
-assert('instance_exec on primitives with class and module definition') do
-  begin
-    class A
-      1.instance_exec do
-        class B
-        end
-      end
-    end
-
-    assert_kind_of Class, A::B
-  ensure
-    Object.remove_const :A
-  end
-
-  begin
-    class A
-      1.instance_exec do
-        module B
-        end
-      end
-    end
-
-    assert_kind_of Module, A::B
-  ensure
-    Object.remove_const :A
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-objectspace') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'ObjectSpace class'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-#include <mruby.h>
-#include <mruby/gc.h>
-#include <mruby/hash.h>
-#include <mruby/class.h>
-
-struct os_count_struct {
-  mrb_int total;
-  mrb_int freed;
-  mrb_int counts[MRB_TT_MAXDEFINE+1];
-};
-
-static int
-os_count_object_type(mrb_state *mrb, struct RBasic *obj, void *data)
-{
-  struct os_count_struct *obj_count;
-  obj_count = (struct os_count_struct*)data;
-
-  obj_count->total++;
-
-  if (mrb_object_dead_p(mrb, obj)) {
-    obj_count->freed++;
-  }
-  else {
-    obj_count->counts[obj->tt]++;
-  }
-  return MRB_EACH_OBJ_OK;
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.count_objects([result_hash]) -> hash
- *
- *  Counts objects for each type.
- *
- *  It returns a hash, such as:
- *  {
- *    :TOTAL=>10000,
- *    :FREE=>3011,
- *    :T_OBJECT=>6,
- *    :T_CLASS=>404,
- *    # ...
- *  }
- *
- *  If the optional argument +result_hash+ is given,
- *  it is overwritten and returned. This is intended to avoid probe effect.
- *
- */
-
-static mrb_value
-os_count_objects(mrb_state *mrb, mrb_value self)
-{
-  struct os_count_struct obj_count = { 0 };
-  mrb_int i;
-  mrb_value hash;
-
-  if (mrb_get_args(mrb, "|H", &hash) == 0) {
-    hash = mrb_hash_new(mrb);
-  }
-
-  if (!mrb_test(mrb_hash_empty_p(mrb, hash))) {
-    mrb_hash_clear(mrb, hash);
-  }
-
-  mrb_objspace_each_objects(mrb, os_count_object_type, &obj_count);
-
-  mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_lit(mrb, "TOTAL")), mrb_fixnum_value(obj_count.total));
-  mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_lit(mrb, "FREE")), mrb_fixnum_value(obj_count.freed));
-
-  for (i = MRB_TT_FALSE; i < MRB_TT_MAXDEFINE; i++) {
-    mrb_value type;
-    switch (i) {
-#define COUNT_TYPE(t) case (MRB_T ## t): type = mrb_symbol_value(mrb_intern_lit(mrb, #t)); break;
-      COUNT_TYPE(T_FALSE);
-      COUNT_TYPE(T_FREE);
-      COUNT_TYPE(T_TRUE);
-      COUNT_TYPE(T_FIXNUM);
-      COUNT_TYPE(T_SYMBOL);
-      COUNT_TYPE(T_UNDEF);
-      COUNT_TYPE(T_FLOAT);
-      COUNT_TYPE(T_CPTR);
-      COUNT_TYPE(T_OBJECT);
-      COUNT_TYPE(T_CLASS);
-      COUNT_TYPE(T_MODULE);
-      COUNT_TYPE(T_ICLASS);
-      COUNT_TYPE(T_SCLASS);
-      COUNT_TYPE(T_PROC);
-      COUNT_TYPE(T_ARRAY);
-      COUNT_TYPE(T_HASH);
-      COUNT_TYPE(T_STRING);
-      COUNT_TYPE(T_RANGE);
-      COUNT_TYPE(T_EXCEPTION);
-      COUNT_TYPE(T_FILE);
-      COUNT_TYPE(T_ENV);
-      COUNT_TYPE(T_DATA);
-      COUNT_TYPE(T_FIBER);
-#undef COUNT_TYPE
-    default:
-      type = mrb_fixnum_value(i); break;
-    }
-    if (obj_count.counts[i])
-      mrb_hash_set(mrb, hash, type, mrb_fixnum_value(obj_count.counts[i]));
-  }
-
-  return hash;
-}
-
-struct os_each_object_data {
-  mrb_value block;
-  struct RClass *target_module;
-  mrb_int count;
-};
-
-static int
-os_each_object_cb(mrb_state *mrb, struct RBasic *obj, void *ud)
-{
-  struct os_each_object_data *d = (struct os_each_object_data*)ud;
-
-  /* filter dead objects */
-  if (mrb_object_dead_p(mrb, obj)) {
-    return MRB_EACH_OBJ_OK;
-  }
-
-  /* filter internal objects */
-  switch (obj->tt) {
-  case MRB_TT_ENV:
-  case MRB_TT_ICLASS:
-    return MRB_EACH_OBJ_OK;
-  default:
-    break;
-  }
-
-  /* filter half baked (or internal) objects */
-  if (!obj->c) return MRB_EACH_OBJ_OK;
-
-  /* filter class kind if target module defined */
-  if (d->target_module && !mrb_obj_is_kind_of(mrb, mrb_obj_value(obj), d->target_module)) {
-    return MRB_EACH_OBJ_OK;
-  }
-
-  mrb_yield(mrb, d->block, mrb_obj_value(obj));
-  ++d->count;
-  return MRB_EACH_OBJ_OK;
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.each_object([module]) {|obj| ... } -> fixnum
- *
- *  Calls the block once for each object in this Ruby process.
- *  Returns the number of objects found.
- *  If the optional argument +module+ is given,
- *  calls the block for only those classes or modules
- *  that match (or are a subclass of) +module+.
- *
- *  If no block is given, ArgumentError is raised.
- *
- */
-
-static mrb_value
-os_each_object(mrb_state *mrb, mrb_value self)
-{
-  mrb_value cls = mrb_nil_value();
-  struct os_each_object_data d;
-  mrb_get_args(mrb, "&|C", &d.block, &cls);
-
-  if (mrb_nil_p(d.block)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Expected block in ObjectSpace.each_object.");
-  }
-
-  d.target_module = mrb_nil_p(cls) ? NULL : mrb_class_ptr(cls);
-  d.count = 0;
-  mrb_objspace_each_objects(mrb, os_each_object_cb, &d);
-  return mrb_fixnum_value(d.count);
-}
-
-void
-mrb_mruby_objectspace_gem_init(mrb_state *mrb)
-{
-  struct RClass *os = mrb_define_module(mrb, "ObjectSpace");
-  mrb_define_class_method(mrb, os, "count_objects", os_count_objects, MRB_ARGS_OPT(1));
-  mrb_define_class_method(mrb, os, "each_object", os_each_object, MRB_ARGS_OPT(1));
-}
-
-void
-mrb_mruby_objectspace_gem_final(mrb_state *mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/test/objectspace.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/test/objectspace.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/test/objectspace.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-objectspace/test/objectspace.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-assert('ObjectSpace.count_objects') do
-  h = {}
-  f = Fiber.new {} if Object.const_defined? :Fiber
-  ObjectSpace.count_objects(h)
-  assert_kind_of(Hash, h)
-  assert_true(h.keys.all? {|x| x.is_a?(Symbol) || x.is_a?(Integer) })
-  assert_true(h.values.all? {|x| x.is_a?(Integer) })
-
-  assert_true(h.has_key?(:TOTAL))
-  assert_true(h.has_key?(:FREE))
-  assert_true(h.has_key?(:T_FIBER)) if Object.const_defined? :Fiber
-
-  assert_equal(h[:TOTAL] * 2, h.values.reduce(:+))
-
-  h = ObjectSpace.count_objects
-  assert_kind_of(Hash, h)
-  assert_true(h.keys.all? {|x| x.is_a?(Symbol) || x.is_a?(Integer) })
-  assert_true(h.values.all? {|x| x.is_a?(Integer) })
-
-  assert_raise(TypeError) { ObjectSpace.count_objects(1) }
-
-  h0 = {:T_FOO=>1000}
-  h = ObjectSpace.count_objects(h0)
-  assert_false(h0.has_key?(:T_FOO))
-
-  GC.start
-  h_after = {}
-  h_before = ObjectSpace.count_objects
-
-  objs = []
-  1000.times do
-    objs << {}
-  end
-  objs = nil
-  ObjectSpace.count_objects(h)
-  GC.start
-  ObjectSpace.count_objects(h_after)
-
-  assert_equal(h[:T_HASH], h_before[:T_HASH] + 1000)
-  assert_equal(h_after[:T_HASH], h_before[:T_HASH])
-end
-
-assert('ObjectSpace.each_object') do
-  objs = []
-  objs_count = ObjectSpace.each_object { |obj|
-    objs << obj
-  }
-  assert_equal objs.length, objs_count
-
-  arys = []
-  arys_count = ObjectSpace.each_object(Array) { |obj|
-    arys << obj
-  }
-  assert_equal arys.length, arys_count
-  assert_true arys.length < objs.length
-end
-
-assert 'Check class pointer of ObjectSpace.each_object.' do
-  ObjectSpace.each_object { |obj| !obj }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-print') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'standard print/puts/p'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrblib/print.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrblib/print.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrblib/print.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/mrblib/print.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-##
-# Kernel
-#
-# ISO 15.3.1
-module Kernel
-  ##
-  # Invoke method +print+ on STDOUT and passing +*args+
-  #
-  # ISO 15.3.1.2.10
-  def print(*args)
-    i = 0
-    len = args.size
-    while i < len
-      __printstr__ args[i].to_s
-      i += 1
-    end
-  end
-
-  ##
-  # Invoke method +puts+ on STDOUT and passing +*args*+
-  #
-  # ISO 15.3.1.2.11
-  def puts(*args)
-    i = 0
-    len = args.size
-    while i < len
-      s = args[i].to_s
-      __printstr__ s
-      __printstr__ "\n" if (s[-1] != "\n")
-      i += 1
-    end
-    __printstr__ "\n" if len == 0
-    nil
-  end
-
-  ##
-  # Print human readable object description
-  #
-  # ISO 15.3.1.3.34
-  def p(*args)
-    i = 0
-    len = args.size
-    while i < len
-      __printstr__ args[i].inspect
-      __printstr__ "\n"
-      i += 1
-    end
-    args[0]
-  end
-
-  unless Kernel.respond_to?(:sprintf)
-    def printf(*args)
-      raise NotImplementedError.new('printf not available')
-    end
-    def sprintf(*args)
-      raise NotImplementedError.new('sprintf not available')
-    end
-  else
-    def printf(*args)
-      __printstr__(sprintf(*args))
-      nil
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/src/print.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/src/print.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/src/print.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-print/src/print.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#include <mruby.h>
-#include <mruby/string.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#if defined(_WIN32)
-# include <windows.h>
-# include <io.h>
-#ifdef _MSC_VER
-# define isatty(x) _isatty(x)
-# define fileno(x) _fileno(x)
-#endif
-#endif
-
-static void
-printstr(mrb_state *mrb, mrb_value obj)
-{
-  if (mrb_string_p(obj)) {
-#if defined(_WIN32)
-    if (isatty(fileno(stdout))) {
-      DWORD written;
-      int mlen = RSTRING_LEN(obj);
-      char* utf8 = RSTRING_PTR(obj);
-      int wlen = MultiByteToWideChar(CP_UTF8, 0, utf8, mlen, NULL, 0);
-      wchar_t* utf16 = (wchar_t*)mrb_malloc(mrb, (wlen+1) * sizeof(wchar_t));
-      if (utf16 == NULL) return;
-      if (MultiByteToWideChar(CP_UTF8, 0, utf8, mlen, utf16, wlen) > 0) {
-        utf16[wlen] = 0;
-        WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
-          utf16, wlen, &written, NULL);
-      }
-      mrb_free(mrb, utf16);
-    } else
-#endif
-      fwrite(RSTRING_PTR(obj), RSTRING_LEN(obj), 1, stdout);
-  }
-}
-
-/* 15.3.1.2.9  */
-/* 15.3.1.3.34 */
-mrb_value
-mrb_printstr(mrb_state *mrb, mrb_value self)
-{
-  mrb_value argv;
-
-  mrb_get_args(mrb, "o", &argv);
-  printstr(mrb, argv);
-
-  return argv;
-}
-
-void
-mrb_mruby_print_gem_init(mrb_state* mrb)
-{
-  struct RClass *krn;
-  krn = mrb->kernel_module;
-  mrb_define_method(mrb, krn, "__printstr__", mrb_printstr, MRB_ARGS_REQ(1));
-}
-
-void
-mrb_mruby_print_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-proc-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Proc class extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrblib/proc.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrblib/proc.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrblib/proc.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/mrblib/proc.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-class Proc
-
-  def ===(*args)
-    call(*args)
-  end
-
-  def yield(*args)
-    call(*args)
-  end
-
-  def to_proc
-    self
-  end
-
-  def curry(arity=self.arity)
-    type = :proc
-    abs = lambda {|a| a < 0 ? -a - 1 : a}
-    arity = abs[arity]
-    if lambda?
-      type = :lambda
-      self_arity = self.arity
-      if (self_arity >= 0 && arity != self_arity) ||
-         (self_arity < 0 && abs[self_arity] > arity)
-        raise ArgumentError, "wrong number of arguments (#{arity} for #{abs[self_arity]})"
-      end
-    end
-
-    pproc = self
-    make_curry = proc do |given_args=[]|
-      send(type) do |*args|
-        new_args = given_args + args
-        if new_args.size >= arity
-          pproc[*new_args]
-        else
-          make_curry[new_args]
-        end
-      end
-    end
-    make_curry.call
-  end
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/src/proc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/src/proc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/src/proc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/src/proc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-#include <mruby.h>
-#include <mruby/proc.h>
-#include <mruby/opcode.h>
-#include <mruby/array.h>
-#include <mruby/string.h>
-#include <mruby/debug.h>
-
-static mrb_value
-mrb_proc_lambda(mrb_state *mrb, mrb_value self)
-{
-  struct RProc *p = mrb_proc_ptr(self);
-  return mrb_bool_value(MRB_PROC_STRICT_P(p));
-}
-
-static mrb_value
-mrb_proc_source_location(mrb_state *mrb, mrb_value self)
-{
-  struct RProc *p = mrb_proc_ptr(self);
-
-  if (MRB_PROC_CFUNC_P(p)) {
-    return mrb_nil_value();
-  }
-  else {
-    mrb_irep *irep = p->body.irep;
-    int32_t line;
-    const char *filename;
-
-    filename = mrb_debug_get_filename(irep, 0);
-    line = mrb_debug_get_line(irep, 0);
-
-    return (!filename && line == -1)? mrb_nil_value()
-        : mrb_assoc_new(mrb, mrb_str_new_cstr(mrb, filename), mrb_fixnum_value(line));
-  }
-}
-
-static mrb_value
-mrb_proc_inspect(mrb_state *mrb, mrb_value self)
-{
-  struct RProc *p = mrb_proc_ptr(self);
-  mrb_value str = mrb_str_new_lit(mrb, "#<Proc:");
-  mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(self)));
-
-  if (!MRB_PROC_CFUNC_P(p)) {
-    mrb_irep *irep = p->body.irep;
-    const char *filename;
-    int32_t line;
-    mrb_str_cat_lit(mrb, str, "@");
-
-    filename = mrb_debug_get_filename(irep, 0);
-    mrb_str_cat_cstr(mrb, str, filename ? filename : "-");
-    mrb_str_cat_lit(mrb, str, ":");
-
-    line = mrb_debug_get_line(irep, 0);
-    if (line != -1) {
-      str = mrb_format(mrb, "%S:%S", str, mrb_fixnum_value(line));
-    }
-    else {
-      mrb_str_cat_lit(mrb, str, "-");
-    }
-  }
-
-  if (MRB_PROC_STRICT_P(p)) {
-    mrb_str_cat_lit(mrb, str, " (lambda)");
-  }
-
-  mrb_str_cat_lit(mrb, str, ">");
-  return str;
-}
-
-static mrb_value
-mrb_kernel_proc(mrb_state *mrb, mrb_value self)
-{
-  mrb_value blk;
-
-  mrb_get_args(mrb, "&", &blk);
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Proc object without a block");
-  }
-
-  return blk;
-}
-
-/*
- * call-seq:
- *    prc.parameters  -> array
- *
- * Returns the parameter information of this proc.
- *
- *    prc = lambda{|x, y=42, *other|}
- *    prc.parameters  #=> [[:req, :x], [:opt, :y], [:rest, :other]]
- */
-
-static mrb_value
-mrb_proc_parameters(mrb_state *mrb, mrb_value self)
-{
-  struct parameters_type {
-    int size;
-    const char *name;
-  } *p, parameters_list [] = {
-    {0, "req"},
-    {0, "opt"},
-    {0, "rest"},
-    {0, "req"},
-    {0, "block"},
-    {0, NULL}
-  };
-  const struct RProc *proc = mrb_proc_ptr(self);
-  const struct mrb_irep *irep = proc->body.irep;
-  mrb_aspec aspec;
-  mrb_value sname, parameters;
-  int i, j;
-
-  if (MRB_PROC_CFUNC_P(proc)) {
-    // TODO cfunc aspec is not implemented yet
-    return mrb_ary_new(mrb);
-  }
-  if (!irep) {
-    return mrb_ary_new(mrb);
-  }
-  if (!irep->lv) {
-    return mrb_ary_new(mrb);
-  }
-  if (GET_OPCODE(*irep->iseq) != OP_ENTER) {
-    return mrb_ary_new(mrb);
-  }
-
-  if (!MRB_PROC_STRICT_P(proc)) {
-    parameters_list[0].name = "opt";
-    parameters_list[3].name = "opt";
-  }
-
-  aspec = GETARG_Ax(*irep->iseq);
-  parameters_list[0].size = MRB_ASPEC_REQ(aspec);
-  parameters_list[1].size = MRB_ASPEC_OPT(aspec);
-  parameters_list[2].size = MRB_ASPEC_REST(aspec);
-  parameters_list[3].size = MRB_ASPEC_POST(aspec);
-  parameters_list[4].size = MRB_ASPEC_BLOCK(aspec);
-
-  parameters = mrb_ary_new_capa(mrb, irep->nlocals-1);
-
-  for (i = 0, p = parameters_list; p->name; p++) {
-    if (p->size <= 0) continue;
-    sname = mrb_symbol_value(mrb_intern_cstr(mrb, p->name));
-    for (j = 0; j < p->size; i++, j++) {
-      mrb_value a = mrb_ary_new(mrb);
-      mrb_ary_push(mrb, a, sname);
-      if (irep->lv[i].name) {
-        mrb_ary_push(mrb, a, mrb_symbol_value(irep->lv[i].name));
-      }
-      mrb_ary_push(mrb, parameters, a);
-    }
-  }
-  return parameters;
-}
-
-void
-mrb_mruby_proc_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass *p = mrb->proc_class;
-  mrb_define_method(mrb, p, "lambda?",         mrb_proc_lambda,          MRB_ARGS_NONE());
-  mrb_define_method(mrb, p, "source_location", mrb_proc_source_location, MRB_ARGS_NONE());
-  mrb_define_method(mrb, p, "to_s",            mrb_proc_inspect,         MRB_ARGS_NONE());
-  mrb_define_method(mrb, p, "inspect",         mrb_proc_inspect,         MRB_ARGS_NONE());
-  mrb_define_method(mrb, p, "parameters",      mrb_proc_parameters,      MRB_ARGS_NONE());
-
-  mrb_define_class_method(mrb, mrb->kernel_module, "proc", mrb_kernel_proc, MRB_ARGS_NONE());
-  mrb_define_method(mrb, mrb->kernel_module,       "proc", mrb_kernel_proc, MRB_ARGS_NONE());
-}
-
-void
-mrb_mruby_proc_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-#include <mruby.h>
-#include <mruby/proc.h>
-#include <mruby/class.h>
-
-static mrb_value
-return_func_name(mrb_state *mrb, mrb_value self)
-{
-  return mrb_cfunc_env_get(mrb, 0);
-}
-
-static mrb_value
-proc_new_cfunc_with_env(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym n;
-  mrb_value n_val;
-  mrb_get_args(mrb, "n", &n);
-  n_val = mrb_symbol_value(n);
-  mrb_define_method_raw(mrb, mrb_class_ptr(self), n,
-                        mrb_proc_new_cfunc_with_env(mrb, return_func_name, 1, &n_val));
-  return self;
-}
-
-static mrb_value
-return_env(mrb_state *mrb, mrb_value self)
-{
-  mrb_int idx;
-  mrb_get_args(mrb, "i", &idx);
-  return mrb_cfunc_env_get(mrb, idx);
-}
-
-static mrb_value
-cfunc_env_get(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym n;
-  mrb_value *argv; mrb_int argc;
-  mrb_get_args(mrb, "na", &n, &argv, &argc);
-  mrb_define_method_raw(mrb, mrb_class_ptr(self), n,
-                        mrb_proc_new_cfunc_with_env(mrb, return_env, argc, argv));
-  return self;
-}
-
-static mrb_value
-cfunc_without_env(mrb_state *mrb, mrb_value self)
-{
-  return mrb_cfunc_env_get(mrb, 0);
-}
-
-void mrb_mruby_proc_ext_gem_test(mrb_state *mrb)
-{
-  struct RClass *cls;
-
-  cls = mrb_define_class(mrb, "ProcExtTest", mrb->object_class);
-  mrb_define_module_function(mrb, cls, "mrb_proc_new_cfunc_with_env", proc_new_cfunc_with_env, MRB_ARGS_REQ(1));
-  mrb_define_module_function(mrb, cls, "mrb_cfunc_env_get", cfunc_env_get, MRB_ARGS_REQ(2));
-  mrb_define_module_function(mrb, cls, "cfunc_without_env", cfunc_without_env, MRB_ARGS_NONE());
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-proc-ext/test/proc.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-##
-# Proc(Ext) Test
-
-assert('Proc#source_location') do
-  loc = Proc.new {}.source_location
-  next true if loc.nil?
-  assert_equal loc[0][-7, 7], 'proc.rb'
-  assert_equal loc[1], 5
-end
-
-assert('Proc#inspect') do
-  ins = Proc.new{}.inspect
-  assert_kind_of String, ins
-end
-
-assert('Proc#lambda?') do
-  assert_true lambda{}.lambda?
-  assert_true !Proc.new{}.lambda?
-end
-
-assert('Proc#===') do
-  proc = Proc.new {|a| a * 2}
-  assert_equal 20, (proc === 10)
-end
-
-assert('Proc#yield') do
-  proc = Proc.new {|a| a * 2}
-  assert_equal 20, proc.yield(10)
-end
-
-assert('Proc#curry') do
-  b = proc {|x, y, z| (x||0) + (y||0) + (z||0) }
-  assert_equal 6, b.curry[1][2][3]
-  assert_equal 6, b.curry[1, 2][3, 4]
-  assert_equal 6, b.curry(5)[1][2][3][4][5]
-  assert_equal 6, b.curry(5)[1, 2][3, 4][5]
-  assert_equal 1, b.curry(1)[1]
-
-  b = lambda {|x, y, z| (x||0) + (y||0) + (z||0) }
-  assert_equal 6, b.curry[1][2][3]
-  assert_raise(ArgumentError) { b.curry[1, 2][3, 4] }
-  assert_raise(ArgumentError) { b.curry(5) }
-  assert_raise(ArgumentError) { b.curry(1) }
-
-  assert_false(proc{}.curry.lambda?)
-  assert_true(lambda{}.curry.lambda?)
-end
-
-assert('Proc#parameters') do
-  assert_equal([], Proc.new {}.parameters)
-  assert_equal([], Proc.new {||}.parameters)
-  assert_equal([[:opt, :a]], Proc.new {|a|}.parameters)
-  assert_equal([[:req, :a]], lambda {|a|}.parameters)
-  assert_equal([[:opt, :a]], lambda {|a=nil|}.parameters)
-  assert_equal([[:req, :a]], ->(a){}.parameters)
-  assert_equal([[:rest]], lambda { |*| }.parameters)
-  assert_equal([[:rest, :a]], Proc.new {|*a|}.parameters)
-  assert_equal([[:opt, :a], [:opt, :b], [:opt, :c], [:opt, :d], [:rest, :e], [:opt, :f], [:opt, :g], [:block, :h]], Proc.new {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters)
-  assert_equal([[:req, :a], [:req, :b], [:opt, :c], [:opt, :d], [:rest, :e], [:req, :f], [:req, :g], [:block, :h]], lambda {|a,b,c=:c,d=:d,*e,f,g,&h|}.parameters)
-end
-
-assert('Proc#to_proc') do
-  proc = Proc.new {}
-  assert_equal proc, proc.to_proc
-end
-
-assert('Kernel#proc') do
-  assert_true !proc{|a|}.lambda?
-end
-
-assert('mrb_proc_new_cfunc_with_env') do
-  ProcExtTest.mrb_proc_new_cfunc_with_env(:test)
-  ProcExtTest.mrb_proc_new_cfunc_with_env(:mruby)
-
-  t = ProcExtTest.new
-
-  assert_equal :test, t.test
-  assert_equal :mruby, t.mruby
-end
-
-assert('mrb_cfunc_env_get') do
-  ProcExtTest.mrb_cfunc_env_get :get_int, [0, 1, 2]
-
-  t = ProcExtTest.new
-
-  assert_raise(TypeError) { t.cfunc_without_env }
-
-  assert_raise(IndexError) { t.get_int(-1) }
-  assert_raise(IndexError) { t.get_int(3) }
-
-  assert_equal 1, t.get_int(1)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-random') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Random class'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-/*
-** mt19937ar.c - MT Random functions
-**
-** Copyright (C) 1997 - 2016, Makoto Matsumoto and Takuji Nishimura,
-** All rights reserved.
-**
-** Permission is hereby granted, free of charge, to any person obtaining
-** a copy of this software and associated documentation files (the
-** "Software"), to deal in the Software without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Software, and to
-** permit persons to whom the Software is furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be
-** included in all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**
-** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
-**
-** Any feedback is very welcome.
-** http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
-** email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
-**
-** This version is modified by mruby developers. If you see any problem,
-** contact us first at https://github.com/mruby/mruby/issues
-*/
-
-#include <mruby.h>
-#include "mt19937ar.h"
-
-/* Period parameters */
-/* #define N 624 */
-#define M 397
-#define MATRIX_A 0x9908b0dfUL   /* constant vector a */
-#define UPPER_MASK 0x80000000UL /* most significant w-r bits */
-#define LOWER_MASK 0x7fffffffUL /* least significant r bits */
-
-#if 0 /* dead_code */
-static unsigned long mt[N]; /* the array for the state vector  */
-static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
-#endif /* dead_code */
-
-void mrb_random_init_genrand(mt_state *t, unsigned long s)
-{
-    t->mt[0]= s & 0xffffffffUL;
-    for (t->mti=1; t->mti<N; t->mti++) {
-        t->mt[t->mti] =
-	    (1812433253UL * (t->mt[t->mti-1] ^ (t->mt[t->mti-1] >> 30)) + t->mti);
-        t->mt[t->mti] &= 0xffffffffUL;
-    }
-}
-
-unsigned long mrb_random_genrand_int32(mt_state *t)
-{
-    unsigned long y;
-    static const unsigned long mag01[2]={0x0UL, MATRIX_A};
-    /* mag01[x] = x * MATRIX_A  for x=0,1 */
-
-    if (t->mti >= N) { /* generate N words at one time */
-        int kk;
-
-        if (t->mti == N+1)   /* if init_genrand() has not been called, */
-            mrb_random_init_genrand(t, 5489UL); /* a default initial seed is used */
-
-        for (kk=0;kk<N-M;kk++) {
-            y = (t->mt[kk]&UPPER_MASK)|(t->mt[kk+1]&LOWER_MASK);
-            t->mt[kk] = t->mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
-        }
-        for (;kk<N-1;kk++) {
-            y = (t->mt[kk]&UPPER_MASK)|(t->mt[kk+1]&LOWER_MASK);
-            t->mt[kk] = t->mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
-        }
-        y = (t->mt[N-1]&UPPER_MASK)|(t->mt[0]&LOWER_MASK);
-        t->mt[N-1] = t->mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
-
-        t->mti = 0;
-    }
-
-    y = t->mt[t->mti++];
-
-    /* Tempering */
-    y ^= (y >> 11);
-    y ^= (y << 7) & 0x9d2c5680UL;
-    y ^= (y << 15) & 0xefc60000UL;
-    y ^= (y >> 18);
-
-    t->gen.int_ = y;
-
-    return y;
-}
-
-double mrb_random_genrand_real1(mt_state *t)
-{
-    mrb_random_genrand_int32(t);
-    t->gen.double_ =  t->gen.int_*(1.0/4294967295.0);
-    return t->gen.double_;
-    /* divided by 2^32-1 */
-}
-
-#if 0 /* dead_code */
-/* initializes mt[N] with a seed */
-void init_genrand(unsigned long s)
-{
-    mt[0]= s & 0xffffffffUL;
-    for (mti=1; mti<N; mti++) {
-        mt[mti] =
-	    (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti);
-        /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
-        /* In the previous versions, MSBs of the seed affect   */
-        /* only MSBs of the array mt[].                        */
-        /* 2002/01/09 modified by Makoto Matsumoto             */
-        mt[mti] &= 0xffffffffUL;
-        /* for >32 bit machines */
-    }
-}
-
-/* initialize by an array with array-length */
-/* init_key is the array for initializing keys */
-/* key_length is its length */
-/* slight change for C++, 2004/2/26 */
-void init_by_array(unsigned long init_key[], int key_length)
-{
-    int i, j, k;
-    init_genrand(19650218UL);
-    i=1; j=0;
-    k = (N>key_length ? N : key_length);
-    for (; k; k--) {
-        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL))
-          + init_key[j] + j; /* non linear */
-        mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
-        i++; j++;
-        if (i>=N) { mt[0] = mt[N-1]; i=1; }
-        if (j>=key_length) j=0;
-    }
-    for (k=N-1; k; k--) {
-        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL))
-          - i; /* non linear */
-        mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
-        i++;
-        if (i>=N) { mt[0] = mt[N-1]; i=1; }
-    }
-
-    mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */
-}
-
-/* generates a random number on [0,0xffffffff]-interval */
-unsigned long genrand_int32(void)
-{
-    unsigned long y;
-    static const unsigned long mag01[2]={0x0UL, MATRIX_A};
-    /* mag01[x] = x * MATRIX_A  for x=0,1 */
-
-    if (mti >= N) { /* generate N words at one time */
-        int kk;
-
-        if (mti == N+1)   /* if init_genrand() has not been called, */
-            init_genrand(5489UL); /* a default initial seed is used */
-
-        for (kk=0;kk<N-M;kk++) {
-            y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
-            mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
-        }
-        for (;kk<N-1;kk++) {
-            y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
-            mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
-        }
-        y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK);
-        mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
-
-        mti = 0;
-    }
-
-    y = mt[mti++];
-
-    /* Tempering */
-    y ^= (y >> 11);
-    y ^= (y << 7) & 0x9d2c5680UL;
-    y ^= (y << 15) & 0xefc60000UL;
-    y ^= (y >> 18);
-
-    return y;
-}
-
-/* generates a random number on [0,0x7fffffff]-interval */
-long genrand_int31(void)
-{
-    return (long)(genrand_int32()>>1);
-}
-
-/* generates a random number on [0,1]-real-interval */
-double genrand_real1(void)
-{
-    return genrand_int32()*(1.0/4294967295.0);
-    /* divided by 2^32-1 */
-}
-
-/* generates a random number on [0,1)-real-interval */
-double genrand_real2(void)
-{
-    return genrand_int32()*(1.0/4294967296.0);
-    /* divided by 2^32 */
-}
-
-/* generates a random number on (0,1)-real-interval */
-double genrand_real3(void)
-{
-    return (((double)genrand_int32()) + 0.5)*(1.0/4294967296.0);
-    /* divided by 2^32 */
-}
-
-/* generates a random number on [0,1) with 53-bit resolution*/
-double genrand_res53(void)
-{
-    unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6;
-    return(a*67108864.0+b)*(1.0/9007199254740992.0);
-}
-/* These real versions are due to Isaku Wada, 2002/01/09 added */
-#endif /* dead_code */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/mt19937ar.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
-** mt19937ar.h - MT Random functions
-**
-** Copyright (C) 1997 - 2016, Makoto Matsumoto and Takuji Nishimura,
-** All rights reserved.
-**
-** Permission is hereby granted, free of charge, to any person obtaining
-** a copy of this software and associated documentation files (the
-** "Software"), to deal in the Software without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Software, and to
-** permit persons to whom the Software is furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be
-** included in all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**
-** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
-**
-** Any feedback is very welcome.
-** http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
-** email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
-**
-** This version is modified by mruby developers. If you see any problem,
-** contact us first at https://github.com/mruby/mruby/issues
-*/
-
-#define N 624
-
-typedef struct {
-  unsigned long mt[N];
-  int mti;
-  union {
-    unsigned long int_;
-    double double_;
-  } gen;
-
-  mrb_int seed;
-  mrb_bool has_seed : 1;
-} mt_state;
-
-void mrb_random_init_genrand(mt_state *, unsigned long);
-unsigned long mrb_random_genrand_int32(mt_state *);
-double mrb_random_genrand_real1(mt_state *t);
-
-/* initializes mt[N] with a seed */
-void init_genrand(unsigned long s);
-
-/* initialize by an array with array-length */
-/* init_key is the array for initializing keys */
-/* key_length is its length */
-/* slight change for C++, 2004/2/26 */
-void init_by_array(unsigned long init_key[], int key_length);
-
-/* generates a random number on [0,0xffffffff]-interval */
-unsigned long genrand_int32(void);
-
-/* generates a random number on [0,0x7fffffff]-interval */
-long genrand_int31(void);
-
-/* These real versions are due to Isaku Wada, 2002/01/09 added */
-/* generates a random number on [0,1]-real-interval */
-double genrand_real1(void);
-
-/* generates a random number on [0,1)-real-interval */
-double genrand_real2(void);
-
-/* generates a random number on (0,1)-real-interval */
-double genrand_real3(void);
-
-/* generates a random number on [0,1) with 53-bit resolution*/
-double genrand_res53(void);
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,349 +0,0 @@
-/*
-** random.c - Random module
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/variable.h>
-#include <mruby/class.h>
-#include <mruby/data.h>
-#include <mruby/array.h>
-#include "mt19937ar.h"
-
-#include <time.h>
-
-static char const MT_STATE_KEY[] = "$mrb_i_mt_state";
-
-static const struct mrb_data_type mt_state_type = {
-  MT_STATE_KEY, mrb_free,
-};
-
-static mrb_value mrb_random_rand(mrb_state *mrb, mrb_value self);
-static mrb_value mrb_random_srand(mrb_state *mrb, mrb_value self);
-
-static void
-mt_srand(mt_state *t, unsigned long seed)
-{
-  mrb_random_init_genrand(t, seed);
-}
-
-static unsigned long
-mt_rand(mt_state *t)
-{
-  return mrb_random_genrand_int32(t);
-}
-
-static double
-mt_rand_real(mt_state *t)
-{
-  return mrb_random_genrand_real1(t);
-}
-
-static mrb_value
-mrb_random_mt_srand(mrb_state *mrb, mt_state *t, mrb_value seed)
-{
-  if (mrb_nil_p(seed)) {
-    seed = mrb_fixnum_value((mrb_int)(time(NULL) + mt_rand(t)));
-    if (mrb_fixnum(seed) < 0) {
-      seed = mrb_fixnum_value(0 - mrb_fixnum(seed));
-    }
-  }
-
-  mt_srand(t, (unsigned) mrb_fixnum(seed));
-
-  return seed;
-}
-
-static mrb_value
-mrb_random_mt_rand(mrb_state *mrb, mt_state *t, mrb_value max)
-{
-  mrb_value value;
-
-  if (mrb_fixnum(max) == 0) {
-    value = mrb_float_value(mrb, mt_rand_real(t));
-  }
-  else {
-    value = mrb_fixnum_value(mt_rand(t) % mrb_fixnum(max));
-  }
-
-  return value;
-}
-
-static mrb_value
-get_opt(mrb_state* mrb)
-{
-  mrb_value arg;
-
-  arg = mrb_nil_value();
-  mrb_get_args(mrb, "|o", &arg);
-
-  if (!mrb_nil_p(arg)) {
-    arg = mrb_check_convert_type(mrb, arg, MRB_TT_FIXNUM, "Fixnum", "to_int");
-    if (mrb_nil_p(arg)) {
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid argument type");
-    }
-    if (mrb_fixnum(arg) < 0) {
-      arg = mrb_fixnum_value(0 - mrb_fixnum(arg));
-    }
-  }
-  return arg;
-}
-
-static mrb_value
-get_random(mrb_state *mrb) {
-  return mrb_const_get(mrb,
-             mrb_obj_value(mrb_class_get(mrb, "Random")),
-             mrb_intern_lit(mrb, "DEFAULT"));
-}
-
-static mt_state *
-get_random_state(mrb_state *mrb)
-{
-  mrb_value random_val = get_random(mrb);
-  return DATA_GET_PTR(mrb, random_val, &mt_state_type, mt_state);
-}
-
-static mrb_value
-mrb_random_g_rand(mrb_state *mrb, mrb_value self)
-{
-  mrb_value random = get_random(mrb);
-  return mrb_random_rand(mrb, random);
-}
-
-static mrb_value
-mrb_random_g_srand(mrb_state *mrb, mrb_value self)
-{
-  mrb_value random = get_random(mrb);
-  return mrb_random_srand(mrb, random);
-}
-
-static mrb_value
-mrb_random_init(mrb_state *mrb, mrb_value self)
-{
-  mrb_value seed;
-  mt_state *t;
-
-  seed = get_opt(mrb);
-
-  /* avoid memory leaks */
-  t = (mt_state*)DATA_PTR(self);
-  if (t) {
-    mrb_free(mrb, t);
-  }
-  mrb_data_init(self, NULL, &mt_state_type);
-
-  t = (mt_state *)mrb_malloc(mrb, sizeof(mt_state));
-  t->mti = N + 1;
-
-  seed = mrb_random_mt_srand(mrb, t, seed);
-  if (mrb_nil_p(seed)) {
-    t->has_seed = FALSE;
-  }
-  else {
-    mrb_assert(mrb_fixnum_p(seed));
-    t->has_seed = TRUE;
-    t->seed = mrb_fixnum(seed);
-  }
-
-  mrb_data_init(self, t, &mt_state_type);
-
-  return self;
-}
-
-static void
-mrb_random_rand_seed(mrb_state *mrb, mt_state *t)
-{
-  if (!t->has_seed) {
-    mrb_random_mt_srand(mrb, t, mrb_nil_value());
-  }
-}
-
-static mrb_value
-mrb_random_rand(mrb_state *mrb, mrb_value self)
-{
-  mrb_value max;
-  mt_state *t = DATA_GET_PTR(mrb, self, &mt_state_type, mt_state);
-
-  max = get_opt(mrb);
-  mrb_random_rand_seed(mrb, t);
-  return mrb_random_mt_rand(mrb, t, max);
-}
-
-static mrb_value
-mrb_random_srand(mrb_state *mrb, mrb_value self)
-{
-  mrb_value seed;
-  mrb_value old_seed;
-  mt_state *t = DATA_GET_PTR(mrb, self, &mt_state_type, mt_state);
-
-  seed = get_opt(mrb);
-  seed = mrb_random_mt_srand(mrb, t, seed);
-  old_seed = t->has_seed? mrb_fixnum_value(t->seed) : mrb_nil_value();
-  if (mrb_nil_p(seed)) {
-    t->has_seed = FALSE;
-  }
-  else {
-    mrb_assert(mrb_fixnum_p(seed));
-    t->has_seed = TRUE;
-    t->seed = mrb_fixnum(seed);
-  }
-
-  return old_seed;
-}
-
-/*
- *  call-seq:
- *     ary.shuffle!   ->   ary
- *
- *  Shuffles elements in self in place.
- */
-
-static mrb_value
-mrb_ary_shuffle_bang(mrb_state *mrb, mrb_value ary)
-{
-  mrb_int i;
-  mt_state *random = NULL;
-
-  if (RARRAY_LEN(ary) > 1) {
-    mrb_get_args(mrb, "|d", &random, &mt_state_type);
-
-    if (random == NULL) {
-      random = get_random_state(mrb);
-    }
-    mrb_random_rand_seed(mrb, random);
-
-    mrb_ary_modify(mrb, mrb_ary_ptr(ary));
-
-    for (i = RARRAY_LEN(ary) - 1; i > 0; i--)  {
-      mrb_int j;
-      mrb_value *ptr = RARRAY_PTR(ary);
-      mrb_value tmp;
-      
-
-      j = mrb_fixnum(mrb_random_mt_rand(mrb, random, mrb_fixnum_value(RARRAY_LEN(ary))));
-
-      tmp = ptr[i];
-      ptr[i] = ptr[j];
-      ptr[j] = tmp;
-    }
-  }
-
-  return ary;
-}
-
-/*
- *  call-seq:
- *     ary.shuffle   ->   new_ary
- *
- *  Returns a new array with elements of self shuffled.
- */
-
-static mrb_value
-mrb_ary_shuffle(mrb_state *mrb, mrb_value ary)
-{
-  mrb_value new_ary = mrb_ary_new_from_values(mrb, RARRAY_LEN(ary), RARRAY_PTR(ary));
-  mrb_ary_shuffle_bang(mrb, new_ary);
-
-  return new_ary;
-}
-
-/*
- *  call-seq:
- *     ary.sample      ->   obj
- *     ary.sample(n)   ->   new_ary
- *
- *  Choose a random element or +n+ random elements from the array.
- *
- *  The elements are chosen by using random and unique indices into the array
- *  in order to ensure that an element doesn't repeat itself unless the array
- *  already contained duplicate elements.
- *
- *  If the array is empty the first form returns +nil+ and the second form
- *  returns an empty array.
- */
-
-static mrb_value
-mrb_ary_sample(mrb_state *mrb, mrb_value ary)
-{
-  mrb_int n = 0;
-  mrb_bool given;
-  mt_state *random = NULL;
-  mrb_int len;
-
-  mrb_get_args(mrb, "|i?d", &n, &given, &random, &mt_state_type);
-  if (random == NULL) {
-    random = get_random_state(mrb);
-  }
-  mrb_random_rand_seed(mrb, random);
-  mt_rand(random);
-  len = RARRAY_LEN(ary);
-  if (!given) {                 /* pick one element */
-    switch (len) {
-    case 0:
-      return mrb_nil_value();
-    case 1:
-      return RARRAY_PTR(ary)[0];
-    default:
-      return RARRAY_PTR(ary)[mt_rand(random) % len];
-    }
-  }
-  else {
-    mrb_value result;
-    mrb_int i, j;
-
-    if (n < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "negative sample number");
-    if (n > len) n = len;
-    result = mrb_ary_new_capa(mrb, n);
-    for (i=0; i<n; i++) {
-      mrb_int r;
-
-      for (;;) {
-      retry:
-        r = mt_rand(random) % len;
-
-        for (j=0; j<i; j++) {
-          if (mrb_fixnum(RARRAY_PTR(result)[j]) == r) {
-            goto retry;         /* retry if duplicate */
-          }
-        }
-        break;
-      }
-      mrb_ary_push(mrb, result, mrb_fixnum_value(r));
-    }
-    for (i=0; i<n; i++) {
-      mrb_ary_set(mrb, result, i, RARRAY_PTR(ary)[mrb_fixnum(RARRAY_PTR(result)[i])]);
-    }
-    return result;
-  }
-}
-
-
-void mrb_mruby_random_gem_init(mrb_state *mrb)
-{
-  struct RClass *random;
-  struct RClass *array = mrb->array_class;
-
-  mrb_define_method(mrb, mrb->kernel_module, "rand", mrb_random_g_rand, MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, mrb->kernel_module, "srand", mrb_random_g_srand, MRB_ARGS_OPT(1));
-
-  random = mrb_define_class(mrb, "Random", mrb->object_class);
-  MRB_SET_INSTANCE_TT(random, MRB_TT_DATA);
-  mrb_define_class_method(mrb, random, "rand", mrb_random_g_rand, MRB_ARGS_OPT(1));
-  mrb_define_class_method(mrb, random, "srand", mrb_random_g_srand, MRB_ARGS_OPT(1));
-
-  mrb_define_method(mrb, random, "initialize", mrb_random_init, MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, random, "rand", mrb_random_rand, MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, random, "srand", mrb_random_srand, MRB_ARGS_OPT(1));
-
-  mrb_define_method(mrb, array, "shuffle", mrb_ary_shuffle, MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, array, "shuffle!", mrb_ary_shuffle_bang, MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, array, "sample", mrb_ary_sample, MRB_ARGS_OPT(2));
-
-  mrb_const_set(mrb, mrb_obj_value(random), mrb_intern_lit(mrb, "DEFAULT"),
-          mrb_obj_new(mrb, random, 0, NULL));
-}
-
-void mrb_mruby_random_gem_final(mrb_state *mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/src/random.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/*
-** random.h - Random module
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_RANDOM_H
-#define MRUBY_RANDOM_H
-
-void mrb_mruby_random_gem_init(mrb_state *mrb);
-
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/test/random.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/test/random.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/test/random.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-random/test/random.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-##
-# Random Test
-
-assert("Random#srand") do
-  r1 = Random.new(123)
-  r2 = Random.new(123)
-  r1.rand == r2.rand
-end
-
-assert("Kernel::srand") do
-  srand(234)
-  r1 = rand
-  srand(234)
-  r2 = rand
-  r1 == r2
-end
-
-assert("Random::srand") do
-  Random.srand(345)
-  r1 = rand
-  srand(345)
-  r2 = Random.rand
-  r1 == r2
-end
-
-assert("fixnum") do
-  rand(3).class == Fixnum
-end
-
-assert("float") do
-  rand.class == Float
-end
-
-assert("Array#shuffle") do
-  ary = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  shuffled = ary.shuffle
-
-  ary == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] and shuffled != ary and 10.times { |x| ary.include? x }
-end
-
-assert('Array#shuffle!') do
-  ary = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  ary.shuffle!
-
-  ary != [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] and 10.times { |x| ary.include? x }
-end
-
-assert("Array#shuffle(random)") do
-  assert_raise(TypeError) do
-    # this will cause an exception due to the wrong argument
-    [1, 2].shuffle "Not a Random instance"
-  end
-
-  # verify that the same seed causes the same results
-  ary1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  shuffle1 = ary1.shuffle Random.new 345
-  ary2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  shuffle2 = ary2.shuffle Random.new 345
-
-  ary1 != shuffle1 and 10.times { |x| shuffle1.include? x } and shuffle1 == shuffle2
-end
-
-assert('Array#shuffle!(random)') do
-  assert_raise(TypeError) do
-    # this will cause an exception due to the wrong argument
-    [1, 2].shuffle! "Not a Random instance"
-  end
-
-  # verify that the same seed causes the same results
-  ary1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  ary1.shuffle! Random.new 345
-  ary2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  ary2.shuffle! Random.new 345
-
-  ary1 != [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] and 10.times { |x| ary1.include? x } and ary1 == ary2
-end
-
-assert('Array#sample checks input length after reading arguments') do
-  $ary = [1, 2, 3]
-  class ArrayChange
-    def to_i
-      $ary << 4
-      4
-    end
-  end
-
-  assert_equal [1, 2, 3, 4], $ary.sample(ArrayChange.new).sort
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-range-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Range class extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrblib/range.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrblib/range.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrblib/range.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/mrblib/range.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-class Range
-  ##
-  # call-seq:
-  #    rng.first    -> obj
-  #    rng.first(n) -> an_array
-  #
-  # Returns the first object in the range, or an array of the first +n+
-  # elements.
-  #
-  #   (10..20).first     #=> 10
-  #   (10..20).first(3)  #=> [10, 11, 12]
-  #
-  def first(*args)
-    return self.begin if args.empty?
-
-    raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 1)" unless args.length == 1
-    nv = args[0]
-    raise TypeError, "no implicit conversion from nil to integer" if nv.nil?
-    raise TypeError, "no implicit conversion of #{nv.class} into Integer" unless nv.respond_to?(:to_int)
-    n = nv.to_int
-    raise TypeError, "no implicit conversion of #{nv.class} into Integer" unless n.kind_of?(Integer)
-    raise ArgumentError, "negative array size (or size too big)" unless 0 <= n
-    ary = []
-    each do |i|
-      break if n <= 0
-      ary.push(i)
-      n -= 1
-    end
-    ary
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/src/range.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/src/range.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/src/range.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/src/range.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-#include <mruby.h>
-#include <mruby/range.h>
-#include <math.h>
-#include <float.h>
-
-static mrb_bool
-r_le(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
-  /* output :a < b => -1, a = b =>  0, a > b => +1 */
-
-  if (mrb_fixnum_p(r)) {
-    mrb_int c = mrb_fixnum(r);
-    if (c == 0 || c == -1) return TRUE;
-  }
-
-  return FALSE;
-}
-
-static mrb_bool
-r_lt(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b);
-  /* output :a < b => -1, a = b =>  0, a > b => +1 */
-
-  return mrb_fixnum_p(r) && mrb_fixnum(r) == -1;
-}
-
-/*
- *  call-seq:
- *     rng.cover?(obj)  ->  true or false
- *
- *  Returns <code>true</code> if +obj+ is between the begin and end of
- *  the range.
- *
- *  This tests <code>begin <= obj <= end</code> when #exclude_end? is +false+
- *  and <code>begin <= obj < end</code> when #exclude_end? is +true+.
- *
- *     ("a".."z").cover?("c")    #=> true
- *     ("a".."z").cover?("5")    #=> false
- *     ("a".."z").cover?("cc")   #=> true
- */
-static mrb_value
-mrb_range_cover(mrb_state *mrb, mrb_value range)
-{
-  mrb_value val;
-  struct RRange *r = mrb_range_ptr(mrb, range);
-  mrb_value beg, end;
-
-  mrb_get_args(mrb, "o", &val);
-
-  beg = r->edges->beg;
-  end = r->edges->end;
-
-  if (r_le(mrb, beg, val)) {
-    if (r->excl) {
-      if (r_lt(mrb, val, end))
-        return mrb_true_value();
-    }
-    else {
-      if (r_le(mrb, val, end))
-        return mrb_true_value();
-    }
-  }
-
-  return mrb_false_value();
-}
-
-/*
- *  call-seq:
- *     rng.last    -> obj
- *     rng.last(n) -> an_array
- *
- *  Returns the last object in the range,
- *  or an array of the last +n+ elements.
- *
- *  Note that with no arguments +last+ will return the object that defines
- *  the end of the range even if #exclude_end? is +true+.
- *
- *    (10..20).last      #=> 20
- *    (10...20).last     #=> 20
- *    (10..20).last(3)   #=> [18, 19, 20]
- *    (10...20).last(3)  #=> [17, 18, 19]
- */
-static mrb_value
-mrb_range_last(mrb_state *mrb, mrb_value range)
-{
-  mrb_value num;
-  mrb_value array;
-  struct RRange *r = mrb_range_ptr(mrb, range);
-
-  if (mrb_get_args(mrb, "|o", &num) == 0) {
-    return r->edges->end;
-  }
-
-  array = mrb_funcall(mrb, range, "to_a", 0);
-  return mrb_funcall(mrb, array, "last", 1, mrb_to_int(mrb, num));
-}
-
-/*
- *  call-seq:
- *     rng.size                   -> num
- *
- *  Returns the number of elements in the range. Both the begin and the end of
- *  the Range must be Numeric, otherwise nil is returned.
- *
- *    (10..20).size    #=> 11
- *    ('a'..'z').size  #=> nil
- */
-
-static mrb_value
-mrb_range_size(mrb_state *mrb, mrb_value range)
-{
-  struct RRange *r = mrb_range_ptr(mrb, range);
-  mrb_value beg, end;
-  mrb_float beg_f, end_f;
-  mrb_bool num_p = TRUE;
-  mrb_bool excl;
-
-  beg = r->edges->beg;
-  end = r->edges->end;
-  excl = r->excl;
-  if (mrb_fixnum_p(beg)) {
-    beg_f = (mrb_float)mrb_fixnum(beg);
-  }
-  else if (mrb_float_p(beg)) {
-    beg_f = mrb_float(beg);
-  }
-  else {
-    num_p = FALSE;
-  }
-  if (mrb_fixnum_p(end)) {
-    end_f = (mrb_float)mrb_fixnum(end);
-  }
-  else if (mrb_float_p(end)) {
-    end_f = mrb_float(end);
-  }
-  else {
-    num_p = FALSE;
-  }
-  if (num_p) {
-    mrb_float n = end_f - beg_f;
-    mrb_float err = (fabs(beg_f) + fabs(end_f) + fabs(end_f-beg_f)) * MRB_FLOAT_EPSILON;
-
-    if (err>0.5) err=0.5;
-    if (excl) {
-      if (n<=0) return mrb_fixnum_value(0);
-      if (n<1)
-        n = 0;
-      else
-        n = floor(n - err);
-    }
-    else {
-      if (n<0) return mrb_fixnum_value(0);
-      n = floor(n + err);
-    }
-    if (isinf(n+1))
-      return mrb_float_value(mrb, INFINITY);
-    return mrb_fixnum_value((mrb_int)n+1);
-  }
-  return mrb_nil_value();
-}
-
-void
-mrb_mruby_range_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass * s = mrb_class_get(mrb, "Range");
-
-  mrb_define_method(mrb, s, "cover?", mrb_range_cover, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, s, "last",   mrb_range_last,  MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, s, "size",   mrb_range_size,  MRB_ARGS_NONE());
-}
-
-void
-mrb_mruby_range_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/test/range.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/test/range.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/test/range.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-range-ext/test/range.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-##
-# Range(Ext) Test
-
-assert('Range#cover?') do
-  assert_true ("a".."z").cover?("c")
-  assert_true !("a".."z").cover?("5")
-  assert_true ("a".."z").cover?("cc")
-end
-
-assert('Range#first') do
-  assert_equal 10, (10..20).first
-  assert_equal [10, 11, 12], (10..20).first(3)
-  assert_equal [0, 1, 2], (0..Float::INFINITY).first(3)
-end
-
-assert('Range#last') do
-  assert_equal 20, (10..20).last
-  assert_equal 20, (10...20).last
-  assert_equal [18, 19, 20], (10..20).last(3)
-  assert_equal [17, 18, 19], (10...20).last(3)
-end
-
-assert('Range#size') do
-  assert_equal 42, (1..42).size
-  assert_equal 41, (1...42).size
-  assert_equal 6, (1...6.3).size
-  assert_equal 5, (1...6.0).size
-  assert_equal 5, (1.1...6).size
-  assert_equal 15, (1.0..15.9).size
-  assert_equal Float::INFINITY, (0..Float::INFINITY).size
-  assert_nil ('a'..'z').size
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-sprintf') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'standard Kernel#sprintf method'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrblib/string.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrblib/string.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrblib/string.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/mrblib/string.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-class String
-  def %(args)
-    if args.is_a? Array
-      sprintf(self, *args)
-    else
-      sprintf(self, args)
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/kernel.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/kernel.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/kernel.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/kernel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/*
-** kernel.c - Kernel module suppliment
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-
-mrb_value mrb_f_sprintf(mrb_state *mrb, mrb_value obj); /* in sprintf.c */
-
-void
-mrb_mruby_sprintf_gem_init(mrb_state* mrb)
-{
-  struct RClass *krn;
-
-  if (mrb->kernel_module == NULL) {
-    mrb->kernel_module = mrb_define_module(mrb, "Kernel"); /* Might be PARANOID. */
-  }
-  krn = mrb->kernel_module;
-
-  mrb_define_method(mrb, krn, "sprintf", mrb_f_sprintf, MRB_ARGS_ANY());
-  mrb_define_method(mrb, krn, "format",  mrb_f_sprintf, MRB_ARGS_ANY());
-}
-
-void
-mrb_mruby_sprintf_gem_final(mrb_state* mrb)
-{
-  /* nothing to do. */
-}
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/sprintf.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/sprintf.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/sprintf.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/src/sprintf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1113 +0,0 @@
-/*
-** sprintf.c - Kernel.#sprintf
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <mruby/string.h>
-#include <mruby/hash.h>
-#include <mruby/numeric.h>
-#include <math.h>
-#include <ctype.h>
-
-#define BIT_DIGITS(N)   (((N)*146)/485 + 1)  /* log2(10) =~ 146/485 */
-#define BITSPERDIG MRB_INT_BIT
-#define EXTENDSIGN(n, l) (((~0U << (n)) >> (((n)*(l)) % BITSPERDIG)) & ~(~0U << (n)))
-
-mrb_value mrb_str_format(mrb_state *, int, const mrb_value *, mrb_value);
-static void fmt_setup(char*,size_t,int,int,mrb_int,mrb_int);
-
-static char*
-remove_sign_bits(char *str, int base)
-{
-  char *t;
-
-  t = str;
-  if (base == 16) {
-    while (*t == 'f') {
-      t++;
-    }
-  }
-  else if (base == 8) {
-    *t |= EXTENDSIGN(3, strlen(t));
-    while (*t == '7') {
-      t++;
-    }
-  }
-  else if (base == 2) {
-    while (*t == '1') {
-      t++;
-    }
-  }
-
-  return t;
-}
-
-static char
-sign_bits(int base, const char *p)
-{
-  char c;
-
-  switch (base) {
-  case 16:
-    if (*p == 'X') c = 'F';
-    else c = 'f';
-    break;
-  case 8:
-    c = '7'; break;
-  case 2:
-    c = '1'; break;
-  default:
-    c = '.'; break;
-  }
-  return c;
-}
-
-static mrb_value
-mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
-{
-  char buf[66], *b = buf + sizeof buf;
-  mrb_int num = mrb_fixnum(x);
-  uint64_t val = (uint64_t)num;
-  char d;
-
-  if (base != 2) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %S", mrb_fixnum_value(base));
-  }
-  if (val == 0) {
-    return mrb_str_new_lit(mrb, "0");
-  }
-  *--b = '\0';
-  do {
-    *--b = mrb_digitmap[(int)(val % base)];
-  } while (val /= base);
-
-  if (num < 0) {
-    b = remove_sign_bits(b, base);
-    switch (base) {
-    case 16: d = 'f'; break;
-    case 8:  d = '7'; break;
-    case 2:  d = '1'; break;
-    default: d = 0;   break;
-    }
-
-    if (d && *b != d) {
-      *--b = d;
-    }
-  }
-
-  return mrb_str_new_cstr(mrb, b);
-}
-
-#define FNONE  0
-#define FSHARP 1
-#define FMINUS 2
-#define FPLUS  4
-#define FZERO  8
-#define FSPACE 16
-#define FWIDTH 32
-#define FPREC  64
-#define FPREC0 128
-
-#define CHECK(l) do {\
-/*  int cr = ENC_CODERANGE(result);*/\
-  while ((l) >= bsiz - blen) {\
-    bsiz*=2;\
-    if (bsiz < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "too big specifier"); \
-  }\
-  mrb_str_resize(mrb, result, bsiz);\
-/*  ENC_CODERANGE_SET(result, cr);*/\
-  buf = RSTRING_PTR(result);\
-} while (0)
-
-#define PUSH(s, l) do { \
-  CHECK(l);\
-  memcpy(&buf[blen], s, l);\
-  blen += (l);\
-} while (0)
-
-#define FILL(c, l) do { \
-  CHECK(l);\
-  memset(&buf[blen], c, l);\
-  blen += (l);\
-} while (0)
-
-static void
-check_next_arg(mrb_state *mrb, int posarg, int nextarg)
-{
-  switch (posarg) {
-  case -1:
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "unnumbered(%S) mixed with numbered", mrb_fixnum_value(nextarg));
-    break;
-  case -2:
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "unnumbered(%S) mixed with named", mrb_fixnum_value(nextarg));
-    break;
-  default:
-    break;
-  }
-}
-
-static void
-check_pos_arg(mrb_state *mrb, int posarg, int n)
-{
-  if (posarg > 0) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "numbered(%S) after unnumbered(%S)",
-               mrb_fixnum_value(n), mrb_fixnum_value(posarg));
-  }
-  if (posarg == -2) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "numbered(%S) after named", mrb_fixnum_value(n));
-  }
-  if (n < 1) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid index - %S$", mrb_fixnum_value(n));
-  }
-}
-
-static void
-check_name_arg(mrb_state *mrb, int posarg, const char *name, int len)
-{
-  if (posarg > 0) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "named%S after unnumbered(%S)",
-               mrb_str_new(mrb, (name), (len)), mrb_fixnum_value(posarg));
-  }
-  if (posarg == -1) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "named%S after numbered", mrb_str_new(mrb, (name), (len)));
-  }
-}
-
-#define GETNEXTARG() (\
-  check_next_arg(mrb, posarg, nextarg),\
-  (posarg = nextarg++, GETNTHARG(posarg)))
-
-#define GETARG() (!mrb_undef_p(nextvalue) ? nextvalue : GETNEXTARG())
-
-#define GETPOSARG(n) (\
-  check_pos_arg(mrb, posarg, n),\
-  (posarg = -1, GETNTHARG(n)))
-
-#define GETNTHARG(nth) \
-  ((nth >= argc) ? (mrb_raise(mrb, E_ARGUMENT_ERROR, "too few arguments"), mrb_undef_value()) : argv[nth])
-
-#define GETNAMEARG(id, name, len) (\
-  check_name_arg(mrb, posarg, name, len),\
-  (posarg = -2, mrb_hash_fetch(mrb, get_hash(mrb, &hash, argc, argv), id, mrb_undef_value())))
-
-#define GETNUM(n, val) \
-  for (; p < end && ISDIGIT(*p); p++) {\
-    int next_n = 10 * n + (*p - '0'); \
-    if (next_n / 10 != n) {\
-      mrb_raise(mrb, E_ARGUMENT_ERROR, #val " too big"); \
-    } \
-    n = next_n; \
-  } \
-  if (p >= end) { \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "malformed format string - %*[0-9]"); \
-  }
-
-#define GETASTER(num) do { \
-  mrb_value tmp_v; \
-  t = p++; \
-  n = 0; \
-  GETNUM(n, val); \
-  if (*p == '$') { \
-    tmp_v = GETPOSARG(n); \
-  } \
-  else { \
-    tmp_v = GETNEXTARG(); \
-    p = t; \
-  } \
-  num = mrb_int(mrb, tmp_v); \
-} while (0)
-
-static mrb_value
-get_hash(mrb_state *mrb, mrb_value *hash, int argc, const mrb_value *argv)
-{
-  mrb_value tmp;
-
-  if (!mrb_undef_p(*hash)) return *hash;
-  if (argc != 2) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "one hash required");
-  }
-  tmp = mrb_check_convert_type(mrb, argv[1], MRB_TT_HASH, "Hash", "to_hash");
-  if (mrb_nil_p(tmp)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "one hash required");
-  }
-  return (*hash = tmp);
-}
-
-/*
- *  call-seq:
- *     format(format_string [, arguments...] )   -> string
- *     sprintf(format_string [, arguments...] )  -> string
- *
- *  Returns the string resulting from applying <i>format_string</i> to
- *  any additional arguments.  Within the format string, any characters
- *  other than format sequences are copied to the result.
- *
- *  The syntax of a format sequence is follows.
- *
- *    %[flags][width][.precision]type
- *
- *  A format
- *  sequence consists of a percent sign, followed by optional flags,
- *  width, and precision indicators, then terminated with a field type
- *  character.  The field type controls how the corresponding
- *  <code>sprintf</code> argument is to be interpreted, while the flags
- *  modify that interpretation.
- *
- *  The field type characters are:
- *
- *      Field |  Integer Format
- *      ------+--------------------------------------------------------------
- *        b   | Convert argument as a binary number.
- *            | Negative numbers will be displayed as a two's complement
- *            | prefixed with '..1'.
- *        B   | Equivalent to 'b', but uses an uppercase 0B for prefix
- *            | in the alternative format by #.
- *        d   | Convert argument as a decimal number.
- *        i   | Identical to 'd'.
- *        o   | Convert argument as an octal number.
- *            | Negative numbers will be displayed as a two's complement
- *            | prefixed with '..7'.
- *        u   | Identical to 'd'.
- *        x   | Convert argument as a hexadecimal number.
- *            | Negative numbers will be displayed as a two's complement
- *            | prefixed with '..f' (representing an infinite string of
- *            | leading 'ff's).
- *        X   | Equivalent to 'x', but uses uppercase letters.
- *
- *      Field |  Float Format
- *      ------+--------------------------------------------------------------
- *        e   | Convert floating point argument into exponential notation
- *            | with one digit before the decimal point as [-]d.dddddde[+-]dd.
- *            | The precision specifies the number of digits after the decimal
- *            | point (defaulting to six).
- *        E   | Equivalent to 'e', but uses an uppercase E to indicate
- *            | the exponent.
- *        f   | Convert floating point argument as [-]ddd.dddddd,
- *            | where the precision specifies the number of digits after
- *            | the decimal point.
- *        g   | Convert a floating point number using exponential form
- *            | if the exponent is less than -4 or greater than or
- *            | equal to the precision, or in dd.dddd form otherwise.
- *            | The precision specifies the number of significant digits.
- *        G   | Equivalent to 'g', but use an uppercase 'E' in exponent form.
- *        a   | Convert floating point argument as [-]0xh.hhhhp[+-]dd,
- *            | which is consisted from optional sign, "0x", fraction part
- *            | as hexadecimal, "p", and exponential part as decimal.
- *        A   | Equivalent to 'a', but use uppercase 'X' and 'P'.
- *
- *      Field |  Other Format
- *      ------+--------------------------------------------------------------
- *        c   | Argument is the numeric code for a single character or
- *            | a single character string itself.
- *        p   | The valuing of argument.inspect.
- *        s   | Argument is a string to be substituted.  If the format
- *            | sequence contains a precision, at most that many characters
- *            | will be copied.
- *        %   | A percent sign itself will be displayed.  No argument taken.
- *
- *  The flags modifies the behavior of the formats.
- *  The flag characters are:
- *
- *    Flag     | Applies to    | Meaning
- *    ---------+---------------+-----------------------------------------
- *    space    | bBdiouxX      | Leave a space at the start of
- *             | aAeEfgG       | non-negative numbers.
- *             | (numeric fmt) | For 'o', 'x', 'X', 'b' and 'B', use
- *             |               | a minus sign with absolute value for
- *             |               | negative values.
- *    ---------+---------------+-----------------------------------------
- *    (digit)$ | all           | Specifies the absolute argument number
- *             |               | for this field.  Absolute and relative
- *             |               | argument numbers cannot be mixed in a
- *             |               | sprintf string.
- *    ---------+---------------+-----------------------------------------
- *     #       | bBoxX         | Use an alternative format.
- *             | aAeEfgG       | For the conversions 'o', increase the precision
- *             |               | until the first digit will be '0' if
- *             |               | it is not formatted as complements.
- *             |               | For the conversions 'x', 'X', 'b' and 'B'
- *             |               | on non-zero, prefix the result with "0x",
- *             |               | "0X", "0b" and "0B", respectively.
- *             |               | For 'a', 'A', 'e', 'E', 'f', 'g', and 'G',
- *             |               | force a decimal point to be added,
- *             |               | even if no digits follow.
- *             |               | For 'g' and 'G', do not remove trailing zeros.
- *    ---------+---------------+-----------------------------------------
- *    +        | bBdiouxX      | Add a leading plus sign to non-negative
- *             | aAeEfgG       | numbers.
- *             | (numeric fmt) | For 'o', 'x', 'X', 'b' and 'B', use
- *             |               | a minus sign with absolute value for
- *             |               | negative values.
- *    ---------+---------------+-----------------------------------------
- *    -        | all           | Left-justify the result of this conversion.
- *    ---------+---------------+-----------------------------------------
- *    0 (zero) | bBdiouxX      | Pad with zeros, not spaces.
- *             | aAeEfgG       | For 'o', 'x', 'X', 'b' and 'B', radix-1
- *             | (numeric fmt) | is used for negative numbers formatted as
- *             |               | complements.
- *    ---------+---------------+-----------------------------------------
- *    *        | all           | Use the next argument as the field width.
- *             |               | If negative, left-justify the result. If the
- *             |               | asterisk is followed by a number and a dollar
- *             |               | sign, use the indicated argument as the width.
- *
- *  Examples of flags:
- *
- *   # '+' and space flag specifies the sign of non-negative numbers.
- *   sprintf("%d", 123)  #=> "123"
- *   sprintf("%+d", 123) #=> "+123"
- *   sprintf("% d", 123) #=> " 123"
- *
- *   # '#' flag for 'o' increases number of digits to show '0'.
- *   # '+' and space flag changes format of negative numbers.
- *   sprintf("%o", 123)   #=> "173"
- *   sprintf("%#o", 123)  #=> "0173"
- *   sprintf("%+o", -123) #=> "-173"
- *   sprintf("%o", -123)  #=> "..7605"
- *   sprintf("%#o", -123) #=> "..7605"
- *
- *   # '#' flag for 'x' add a prefix '0x' for non-zero numbers.
- *   # '+' and space flag disables complements for negative numbers.
- *   sprintf("%x", 123)   #=> "7b"
- *   sprintf("%#x", 123)  #=> "0x7b"
- *   sprintf("%+x", -123) #=> "-7b"
- *   sprintf("%x", -123)  #=> "..f85"
- *   sprintf("%#x", -123) #=> "0x..f85"
- *   sprintf("%#x", 0)    #=> "0"
- *
- *   # '#' for 'X' uses the prefix '0X'.
- *   sprintf("%X", 123)  #=> "7B"
- *   sprintf("%#X", 123) #=> "0X7B"
- *
- *   # '#' flag for 'b' add a prefix '0b' for non-zero numbers.
- *   # '+' and space flag disables complements for negative numbers.
- *   sprintf("%b", 123)   #=> "1111011"
- *   sprintf("%#b", 123)  #=> "0b1111011"
- *   sprintf("%+b", -123) #=> "-1111011"
- *   sprintf("%b", -123)  #=> "..10000101"
- *   sprintf("%#b", -123) #=> "0b..10000101"
- *   sprintf("%#b", 0)    #=> "0"
- *
- *   # '#' for 'B' uses the prefix '0B'.
- *   sprintf("%B", 123)  #=> "1111011"
- *   sprintf("%#B", 123) #=> "0B1111011"
- *
- *   # '#' for 'e' forces to show the decimal point.
- *   sprintf("%.0e", 1)  #=> "1e+00"
- *   sprintf("%#.0e", 1) #=> "1.e+00"
- *
- *   # '#' for 'f' forces to show the decimal point.
- *   sprintf("%.0f", 1234)  #=> "1234"
- *   sprintf("%#.0f", 1234) #=> "1234."
- *
- *   # '#' for 'g' forces to show the decimal point.
- *   # It also disables stripping lowest zeros.
- *   sprintf("%g", 123.4)   #=> "123.4"
- *   sprintf("%#g", 123.4)  #=> "123.400"
- *   sprintf("%g", 123456)  #=> "123456"
- *   sprintf("%#g", 123456) #=> "123456."
- *
- *  The field width is an optional integer, followed optionally by a
- *  period and a precision.  The width specifies the minimum number of
- *  characters that will be written to the result for this field.
- *
- *  Examples of width:
- *
- *   # padding is done by spaces,       width=20
- *   # 0 or radix-1.             <------------------>
- *   sprintf("%20d", 123)   #=> "                 123"
- *   sprintf("%+20d", 123)  #=> "                +123"
- *   sprintf("%020d", 123)  #=> "00000000000000000123"
- *   sprintf("%+020d", 123) #=> "+0000000000000000123"
- *   sprintf("% 020d", 123) #=> " 0000000000000000123"
- *   sprintf("%-20d", 123)  #=> "123                 "
- *   sprintf("%-+20d", 123) #=> "+123                "
- *   sprintf("%- 20d", 123) #=> " 123                "
- *   sprintf("%020x", -123) #=> "..ffffffffffffffff85"
- *
- *  For
- *  numeric fields, the precision controls the number of decimal places
- *  displayed.  For string fields, the precision determines the maximum
- *  number of characters to be copied from the string.  (Thus, the format
- *  sequence <code>%10.10s</code> will always contribute exactly ten
- *  characters to the result.)
- *
- *  Examples of precisions:
- *
- *   # precision for 'd', 'o', 'x' and 'b' is
- *   # minimum number of digits               <------>
- *   sprintf("%20.8d", 123)  #=> "            00000123"
- *   sprintf("%20.8o", 123)  #=> "            00000173"
- *   sprintf("%20.8x", 123)  #=> "            0000007b"
- *   sprintf("%20.8b", 123)  #=> "            01111011"
- *   sprintf("%20.8d", -123) #=> "           -00000123"
- *   sprintf("%20.8o", -123) #=> "            ..777605"
- *   sprintf("%20.8x", -123) #=> "            ..ffff85"
- *   sprintf("%20.8b", -11)  #=> "            ..110101"
- *
- *   # "0x" and "0b" for '#x' and '#b' is not counted for
- *   # precision but "0" for '#o' is counted.  <------>
- *   sprintf("%#20.8d", 123)  #=> "            00000123"
- *   sprintf("%#20.8o", 123)  #=> "            00000173"
- *   sprintf("%#20.8x", 123)  #=> "          0x0000007b"
- *   sprintf("%#20.8b", 123)  #=> "          0b01111011"
- *   sprintf("%#20.8d", -123) #=> "           -00000123"
- *   sprintf("%#20.8o", -123) #=> "            ..777605"
- *   sprintf("%#20.8x", -123) #=> "          0x..ffff85"
- *   sprintf("%#20.8b", -11)  #=> "          0b..110101"
- *
- *   # precision for 'e' is number of
- *   # digits after the decimal point           <------>
- *   sprintf("%20.8e", 1234.56789) #=> "      1.23456789e+03"
- *
- *   # precision for 'f' is number of
- *   # digits after the decimal point               <------>
- *   sprintf("%20.8f", 1234.56789) #=> "       1234.56789000"
- *
- *   # precision for 'g' is number of
- *   # significant digits                          <------->
- *   sprintf("%20.8g", 1234.56789) #=> "           1234.5679"
- *
- *   #                                         <------->
- *   sprintf("%20.8g", 123456789)  #=> "       1.2345679e+08"
- *
- *   # precision for 's' is
- *   # maximum number of characters                    <------>
- *   sprintf("%20.8s", "string test") #=> "            string t"
- *
- *  Examples:
- *
- *     sprintf("%d %04x", 123, 123)               #=> "123 007b"
- *     sprintf("%08b '%4s'", 123, 123)            #=> "01111011 ' 123'"
- *     sprintf("%1$*2$s %2$d %1$s", "hello", 8)   #=> "   hello 8 hello"
- *     sprintf("%1$*2$s %2$d", "hello", -8)       #=> "hello    -8"
- *     sprintf("%+g:% g:%-g", 1.23, 1.23, 1.23)   #=> "+1.23: 1.23:1.23"
- *     sprintf("%u", -123)                        #=> "-123"
- *
- *  For more complex formatting, Ruby supports a reference by name.
- *  %<name>s style uses format style, but %{name} style doesn't.
- *
- *  Exapmles:
- *    sprintf("%<foo>d : %<bar>f", { :foo => 1, :bar => 2 })
- *      #=> 1 : 2.000000
- *    sprintf("%{foo}f", { :foo => 1 })
- *      # => "1f"
- */
-
-mrb_value
-mrb_f_sprintf(mrb_state *mrb, mrb_value obj)
-{
-  mrb_int argc;
-  mrb_value *argv;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-
-  if (argc <= 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "too few arguments");
-    return mrb_nil_value();
-  }
-  else {
-    return mrb_str_format(mrb, argc - 1, argv + 1, argv[0]);
-  }
-}
-
-mrb_value
-mrb_str_format(mrb_state *mrb, int argc, const mrb_value *argv, mrb_value fmt)
-{
-  const char *p, *end;
-  char *buf;
-  mrb_int blen;
-  mrb_int bsiz;
-  mrb_value result;
-  mrb_int n;
-  mrb_int width;
-  mrb_int prec;
-  int nextarg = 1;
-  int posarg = 0;
-  mrb_value nextvalue;
-  mrb_value str;
-  mrb_value hash = mrb_undef_value();
-
-#define CHECK_FOR_WIDTH(f)                                                  \
-  if ((f) & FWIDTH) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "width given twice");         \
-  }                                                                         \
-  if ((f) & FPREC0) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "width after precision");     \
-  }
-#define CHECK_FOR_FLAGS(f)                                                  \
-  if ((f) & FWIDTH) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after width");          \
-  }                                                                         \
-  if ((f) & FPREC0) {                                                       \
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "flag after precision");      \
-  }
-
-  ++argc;
-  --argv;
-  fmt = mrb_str_to_str(mrb, fmt);
-  p = RSTRING_PTR(fmt);
-  end = p + RSTRING_LEN(fmt);
-  blen = 0;
-  bsiz = 120;
-  result = mrb_str_buf_new(mrb, bsiz);
-  buf = RSTRING_PTR(result);
-  memset(buf, 0, bsiz);
-
-  for (; p < end; p++) {
-    const char *t;
-    mrb_sym id = 0;
-    int flags = FNONE;
-
-    for (t = p; t < end && *t != '%'; t++) ;
-    if (t + 1 == end) ++t;
-    PUSH(p, t - p);
-    if (t >= end)
-      goto sprint_exit; /* end of fmt string */
-
-    p = t + 1;    /* skip '%' */
-
-    width = prec = -1;
-    nextvalue = mrb_undef_value();
-
-retry:
-    switch (*p) {
-      default:
-        mrb_raisef(mrb, E_ARGUMENT_ERROR, "malformed format string - \\%%S", mrb_str_new(mrb, p, 1));
-        break;
-
-      case ' ':
-        CHECK_FOR_FLAGS(flags);
-        flags |= FSPACE;
-        p++;
-        goto retry;
-
-      case '#':
-        CHECK_FOR_FLAGS(flags);
-        flags |= FSHARP;
-        p++;
-        goto retry;
-
-      case '+':
-        CHECK_FOR_FLAGS(flags);
-        flags |= FPLUS;
-        p++;
-        goto retry;
-
-      case '-':
-        CHECK_FOR_FLAGS(flags);
-        flags |= FMINUS;
-        p++;
-        goto retry;
-
-      case '0':
-        CHECK_FOR_FLAGS(flags);
-        flags |= FZERO;
-        p++;
-        goto retry;
-
-      case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9':
-        n = 0;
-        GETNUM(n, width);
-        if (*p == '$') {
-          if (!mrb_undef_p(nextvalue)) {
-            mrb_raisef(mrb, E_ARGUMENT_ERROR, "value given twice - %S$", mrb_fixnum_value(n));
-          }
-          nextvalue = GETPOSARG(n);
-          p++;
-          goto retry;
-        }
-        CHECK_FOR_WIDTH(flags);
-        width = n;
-        flags |= FWIDTH;
-        goto retry;
-
-      case '<':
-      case '{': {
-        const char *start = p;
-        char term = (*p == '<') ? '>' : '}';
-        mrb_value symname;
-
-        for (; p < end && *p != term; )
-          p++;
-        if (id) {
-          mrb_raisef(mrb, E_ARGUMENT_ERROR, "name%S after <%S>",
-                     mrb_str_new(mrb, start, p - start + 1), mrb_sym2str(mrb, id));
-        }
-        symname = mrb_str_new(mrb, start + 1, p - start - 1);
-        id = mrb_intern_str(mrb, symname);
-        nextvalue = GETNAMEARG(mrb_symbol_value(id), start, (int)(p - start + 1));
-        if (mrb_undef_p(nextvalue)) {
-          mrb_raisef(mrb, E_KEY_ERROR, "key%S not found", mrb_str_new(mrb, start, p - start + 1));
-        }
-        if (term == '}') goto format_s;
-        p++;
-        goto retry;
-      }
-
-      case '*':
-        CHECK_FOR_WIDTH(flags);
-        flags |= FWIDTH;
-        GETASTER(width);
-        if (width < 0) {
-          flags |= FMINUS;
-          width = -width;
-        }
-        p++;
-        goto retry;
-
-      case '.':
-        if (flags & FPREC0) {
-          mrb_raise(mrb, E_ARGUMENT_ERROR, "precision given twice");
-        }
-        flags |= FPREC|FPREC0;
-
-        prec = 0;
-        p++;
-        if (*p == '*') {
-          GETASTER(prec);
-          if (prec < 0) {  /* ignore negative precision */
-            flags &= ~FPREC;
-          }
-          p++;
-          goto retry;
-        }
-
-        GETNUM(prec, precision);
-        goto retry;
-
-      case '\n':
-      case '\0':
-        p--;
-        /* fallthrough */
-      case '%':
-        if (flags != FNONE) {
-          mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format character - %");
-        }
-        PUSH("%", 1);
-        break;
-
-      case 'c': {
-        mrb_value val = GETARG();
-        mrb_value tmp;
-        char *c;
-
-        tmp = mrb_check_string_type(mrb, val);
-        if (!mrb_nil_p(tmp)) {
-          if (RSTRING_LEN(tmp) != 1) {
-            mrb_raise(mrb, E_ARGUMENT_ERROR, "%c requires a character");
-          }
-        }
-        else if (mrb_fixnum_p(val)) {
-          mrb_int n = mrb_fixnum(val);
-
-          if (n < 0x80) {
-            char buf[1];
-
-            buf[0] = (char)n;
-            tmp = mrb_str_new(mrb, buf, 1);
-          }
-          else {
-            tmp = mrb_funcall(mrb, val, "chr", 0);
-            mrb_check_type(mrb, tmp, MRB_TT_STRING);
-          }
-        }
-        else {
-          mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid character");
-        }
-        c = RSTRING_PTR(tmp);
-        n = RSTRING_LEN(tmp);
-        if (!(flags & FWIDTH)) {
-          PUSH(c, n);
-        }
-        else if ((flags & FMINUS)) {
-          PUSH(c, n);
-          if (width>0) FILL(' ', width-1);
-        }
-        else {
-          if (width>0) FILL(' ', width-1);
-          PUSH(c, n);
-        }
-      }
-      break;
-
-      case 's':
-      case 'p':
-  format_s:
-      {
-        mrb_value arg = GETARG();
-        mrb_int len;
-        mrb_int slen;
-
-        if (*p == 'p') arg = mrb_inspect(mrb, arg);
-        str = mrb_obj_as_string(mrb, arg);
-        len = RSTRING_LEN(str);
-        if (RSTRING(result)->flags & MRB_STR_EMBED) {
-          mrb_int tmp_n = len;
-          RSTRING(result)->flags &= ~MRB_STR_EMBED_LEN_MASK;
-          RSTRING(result)->flags |= tmp_n << MRB_STR_EMBED_LEN_SHIFT;
-        }
-        else {
-          RSTRING(result)->as.heap.len = blen;
-        }
-        if (flags&(FPREC|FWIDTH)) {
-          slen = RSTRING_LEN(str);
-          if (slen < 0) {
-            mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid mbstring sequence");
-          }
-          if ((flags&FPREC) && (prec < slen)) {
-            char *p = RSTRING_PTR(str) + prec;
-            slen = prec;
-            len = p - RSTRING_PTR(str);
-          }
-          /* need to adjust multi-byte string pos */
-          if ((flags&FWIDTH) && (width > slen)) {
-            width -= (int)slen;
-            if (!(flags&FMINUS)) {
-              FILL(' ', width);
-            }
-            PUSH(RSTRING_PTR(str), len);
-            if (flags&FMINUS) {
-              FILL(' ', width);
-            }
-            break;
-          }
-        }
-        PUSH(RSTRING_PTR(str), len);
-      }
-      break;
-
-      case 'd':
-      case 'i':
-      case 'o':
-      case 'x':
-      case 'X':
-      case 'b':
-      case 'B':
-      case 'u': {
-        mrb_value val = GETARG();
-        char nbuf[68], *s;
-        const char *prefix = NULL;
-        int sign = 0, dots = 0;
-        char sc = 0;
-        mrb_int v = 0;
-        int base;
-        mrb_int len;
-
-        if (flags & FSHARP) {
-          switch (*p) {
-            case 'o': prefix = "0"; break;
-            case 'x': prefix = "0x"; break;
-            case 'X': prefix = "0X"; break;
-            case 'b': prefix = "0b"; break;
-            case 'B': prefix = "0B"; break;
-            default: break;
-          }
-        }
-
-  bin_retry:
-        switch (mrb_type(val)) {
-          case MRB_TT_FLOAT:
-            val = mrb_flo_to_fixnum(mrb, val);
-            if (mrb_fixnum_p(val)) goto bin_retry;
-            break;
-          case MRB_TT_STRING:
-            val = mrb_str_to_inum(mrb, val, 0, TRUE);
-            goto bin_retry;
-          case MRB_TT_FIXNUM:
-            v = mrb_fixnum(val);
-            break;
-          default:
-            val = mrb_Integer(mrb, val);
-            goto bin_retry;
-        }
-
-        switch (*p) {
-          case 'o':
-            base = 8; break;
-          case 'x':
-          case 'X':
-            base = 16; break;
-          case 'b':
-          case 'B':
-            base = 2; break;
-          case 'u':
-          case 'd':
-          case 'i':
-            sign = 1;
-          default:
-            base = 10; break;
-        }
-
-        if (sign) {
-          if (v >= 0) {
-            if (flags & FPLUS) {
-              sc = '+';
-              width--;
-            }
-            else if (flags & FSPACE) {
-              sc = ' ';
-              width--;
-            }
-          }
-          else {
-            sc = '-';
-            width--;
-          }
-          mrb_assert(base == 10);
-          snprintf(nbuf, sizeof(nbuf), "%" MRB_PRId, v);
-          s = nbuf;
-          if (v < 0) s++;       /* skip minus sign */
-        }
-        else {
-          s = nbuf;
-          if (v < 0) {
-            dots = 1;
-          }
-          switch (base) {
-          case 2:
-            if (v < 0) {
-              val = mrb_fix2binstr(mrb, mrb_fixnum_value(v), base);
-            }
-            else {
-              val = mrb_fixnum_to_str(mrb, mrb_fixnum_value(v), base);
-            }
-            strncpy(++s, RSTRING_PTR(val), sizeof(nbuf)-1);
-            break;
-          case 8:
-            snprintf(++s, sizeof(nbuf)-1, "%" MRB_PRIo, v);
-            break;
-          case 16:
-            snprintf(++s, sizeof(nbuf)-1, "%" MRB_PRIx, v);
-            break;
-          }
-          if (v < 0) {
-            char d;
-
-            s = remove_sign_bits(s, base);
-            switch (base) {
-              case 16: d = 'f'; break;
-              case 8:  d = '7'; break;
-              case 2:  d = '1'; break;
-              default: d = 0; break;
-            }
-
-            if (d && *s != d) {
-              *--s = d;
-            }
-          }
-        }
-        {
-          size_t size;
-          size = strlen(s);
-          /* PARANOID: assert(size <= MRB_INT_MAX) */
-          len = (mrb_int)size;
-        }
-
-        if (*p == 'X') {
-          char *pp = s;
-          int c;
-          while ((c = (int)(unsigned char)*pp) != 0) {
-            *pp = toupper(c);
-            pp++;
-          }
-        }
-
-        if (prefix && !prefix[1]) { /* octal */
-          if (dots) {
-            prefix = NULL;
-          }
-          else if (len == 1 && *s == '0') {
-            len = 0;
-            if (flags & FPREC) prec--;
-          }
-          else if ((flags & FPREC) && (prec > len)) {
-            prefix = NULL;
-          }
-        }
-        else if (len == 1 && *s == '0') {
-          prefix = NULL;
-        }
-
-        if (prefix) {
-          size_t size;
-          size = strlen(prefix);
-          /* PARANOID: assert(size <= MRB_INT_MAX).
-           *  this check is absolutely paranoid. */
-          width -= (mrb_int)size;
-        }
-
-        if ((flags & (FZERO|FMINUS|FPREC)) == FZERO) {
-          prec = width;
-          width = 0;
-        }
-        else {
-          if (prec < len) {
-            if (!prefix && prec == 0 && len == 1 && *s == '0') len = 0;
-            prec = len;
-          }
-          width -= prec;
-        }
-
-        if (!(flags&FMINUS) && width > 0) {
-          FILL(' ', width);
-          width = 0;
-        }
-
-        if (sc) PUSH(&sc, 1);
-
-        if (prefix) {
-          int plen = (int)strlen(prefix);
-          PUSH(prefix, plen);
-        }
-        if (dots) {
-          prec -= 2;
-          width -= 2;
-          PUSH("..", 2);
-        }
-
-        if (prec > len) {
-          CHECK(prec - len);
-          if ((flags & (FMINUS|FPREC)) != FMINUS) {
-            char c = '0';
-            FILL(c, prec - len);
-          } else if (v < 0) {
-            char c = sign_bits(base, p);
-            FILL(c, prec - len);
-          }
-        }
-        PUSH(s, len);
-        if (width > 0) {
-          FILL(' ', width);
-        }
-      }
-      break;
-
-      case 'f':
-      case 'g':
-      case 'G':
-      case 'e':
-      case 'E':
-      case 'a':
-      case 'A': {
-        mrb_value val = GETARG();
-        double fval;
-        int i, need = 6;
-        char fbuf[32];
-
-        fval = mrb_float(mrb_Float(mrb, val));
-        if (!isfinite(fval)) {
-          const char *expr;
-          const int elen = 3;
-          char sign = '\0';
-
-          if (isnan(fval)) {
-            expr = "NaN";
-          }
-          else {
-            expr = "Inf";
-          }
-          need = elen;
-          if (!isnan(fval) && fval < 0.0)
-            sign = '-';
-          else if (flags & (FPLUS|FSPACE))
-            sign = (flags & FPLUS) ? '+' : ' ';
-          if (sign)
-	    ++need;
-          if ((flags & FWIDTH) && need < width)
-            need = width;
-
-          if (need < 0) {
-            mrb_raise(mrb, E_ARGUMENT_ERROR, "width too big");
-          }
-          FILL(' ', need);
-          if (flags & FMINUS) {
-            if (sign)
-              buf[blen - need--] = sign;
-            memcpy(&buf[blen - need], expr, elen);
-          }
-          else {
-            if (sign)
-              buf[blen - elen - 1] = sign;
-            memcpy(&buf[blen - elen], expr, elen);
-          }
-          break;
-        }
-
-        fmt_setup(fbuf, sizeof(fbuf), *p, flags, width, prec);
-        need = 0;
-        if (*p != 'e' && *p != 'E') {
-          i = INT_MIN;
-          frexp(fval, &i);
-          if (i > 0)
-            need = BIT_DIGITS(i);
-        }
-        need += (flags&FPREC) ? prec : 6;
-        if ((flags&FWIDTH) && need < width)
-          need = width;
-        need += 20;
-        if (need <= 0) {
-          mrb_raise(mrb, E_ARGUMENT_ERROR,
-                    (width > prec ? "width too big" : "prec too big"));
-        }
-
-        CHECK(need);
-        n = snprintf(&buf[blen], need, fbuf, fval);
-        if (n < 0) {
-          mrb_raise(mrb, E_RUNTIME_ERROR, "formatting error");
-        }
-        blen += n;
-      }
-      break;
-    }
-    flags = FNONE;
-  }
-
-  sprint_exit:
-#if 0
-  /* XXX - We cannot validate the number of arguments if (digit)$ style used.
-   */
-  if (posarg >= 0 && nextarg < argc) {
-    const char *mesg = "too many arguments for format string";
-    if (mrb_test(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg);
-    if (mrb_test(ruby_verbose)) mrb_warn(mrb, "%S", mrb_str_new_cstr(mrb, mesg));
-  }
-#endif
-  mrb_str_resize(mrb, result, blen);
-
-  return result;
-}
-
-static void
-fmt_setup(char *buf, size_t size, int c, int flags, mrb_int width, mrb_int prec)
-{
-  char *end = buf + size;
-  int n;
-
-  *buf++ = '%';
-  if (flags & FSHARP) *buf++ = '#';
-  if (flags & FPLUS)  *buf++ = '+';
-  if (flags & FMINUS) *buf++ = '-';
-  if (flags & FZERO)  *buf++ = '0';
-  if (flags & FSPACE) *buf++ = ' ';
-
-  if (flags & FWIDTH) {
-    n = snprintf(buf, end - buf, "%d", (int)width);
-    buf += n;
-  }
-
-  if (flags & FPREC) {
-    n = snprintf(buf, end - buf, ".%d", (int)prec);
-    buf += n;
-  }
-
-  *buf++ = c;
-  *buf = '\0';
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/test/sprintf.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/test/sprintf.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/test/sprintf.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-sprintf/test/sprintf.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#assert('Kernel.sprintf') do
-#end
-
-assert('String#%') do
-  assert_equal "one=1", "one=%d" % 1
-  assert_equal "1 one 1.0", "%d %s %3.1f" % [ 1, "one", 1.01 ]
-  assert_equal "123 < 456", "%{num} < %<str>s" % { num: 123, str: "456" }
-  assert_equal 15, ("%b" % (1<<14)).size
-end
-
-assert('String#% with inf') do
-  inf = Float::INFINITY
-
-  assert_equal "Inf", "%f" % inf
-  assert_equal "Inf", "%2f" % inf
-  assert_equal "Inf", "%3f" % inf
-  assert_equal " Inf", "%4f" % inf
-  assert_equal "  Inf", "%5f" % inf
-
-  assert_equal "+Inf", "%+f" % inf
-  assert_equal "+Inf", "%+2f" % inf
-  assert_equal "+Inf", "%+3f" % inf
-  assert_equal "+Inf", "%+4f" % inf
-  assert_equal " +Inf", "%+5f" % inf
-
-  assert_equal "Inf", "%-f" % inf
-  assert_equal "Inf", "%-2f" % inf
-  assert_equal "Inf", "%-3f" % inf
-  assert_equal "Inf ", "%-4f" % inf
-  assert_equal "Inf  ", "%-5f" % inf
-
-  assert_equal " Inf", "% f" % inf
-  assert_equal " Inf", "% 2f" % inf
-  assert_equal " Inf", "% 3f" % inf
-  assert_equal " Inf", "% 4f" % inf
-  assert_equal "  Inf", "% 5f" % inf
-end
-
-assert('String#% with nan') do
-  nan = Float::NAN
-
-  assert_equal "NaN", "%f" % nan
-  assert_equal "NaN", "%2f" % nan
-  assert_equal "NaN", "%3f" % nan
-  assert_equal " NaN", "%4f" % nan
-  assert_equal "  NaN", "%5f" % nan
-
-  assert_equal "+NaN", "%+f" % nan
-  assert_equal "+NaN", "%+2f" % nan
-  assert_equal "+NaN", "%+3f" % nan
-  assert_equal "+NaN", "%+4f" % nan
-  assert_equal " +NaN", "%+5f" % nan
-
-  assert_equal "NaN", "%-f" % nan
-  assert_equal "NaN", "%-2f" % nan
-  assert_equal "NaN", "%-3f" % nan
-  assert_equal "NaN ", "%-4f" % nan
-  assert_equal "NaN  ", "%-5f" % nan
-
-  assert_equal " NaN", "% f" % nan
-  assert_equal " NaN", "% 2f" % nan
-  assert_equal " NaN", "% 3f" % nan
-  assert_equal " NaN", "% 4f" % nan
-  assert_equal "  NaN", "% 5f" % nan
-end
-
-assert("String#% with invalid chr") do
-  begin
-    class Fixnum
-      alias_method :chr_, :chr if method_defined?(:chr)
-
-      def chr
-        nil
-      end
-    end
-
-    assert_raise TypeError do
-      "%c" % 0x80
-    end
-  ensure
-    class Fixnum
-      if method_defined?(:chr_)
-        alias_method :chr, :chr_
-        remove_method :chr_
-      end
-    end
-  end
-end
-
-assert("String#% %b") do
-  assert_equal("..10115", "%0b5" % -5)
-end
-
-assert("String#% %d") do
-  assert_equal("  10",   "%4d" % 10)
-  assert_equal("1000",   "%4d" % 1000)
-  assert_equal("100000", "%4d" % 100000)
-end
-
-assert("String#% invalid format") do
-  assert_raise ArgumentError do
-    "%?" % ""
-  end
-end
-
-assert("String#% invalid format shared substring") do
-  fmt = ("x"*30+"%!")[0...-1]
-  assert_equal fmt, sprintf(fmt, "")
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-MRuby::Gem::Specification.new('mruby-string-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'String class extension'
-  spec.add_test_dependency 'mruby-enumerator', core: 'mruby-enumerator'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrblib/string.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrblib/string.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrblib/string.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/mrblib/string.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,355 +0,0 @@
-class String
-
-  ##
-  #  call-seq:
-  #     String.try_convert(obj) -> string or nil
-  #
-  # Try to convert <i>obj</i> into a String, using to_str method.
-  # Returns converted string or nil if <i>obj</i> cannot be converted
-  # for any reason.
-  #
-  #     String.try_convert("str")     #=> "str"
-  #     String.try_convert(/re/)      #=> nil
-  #
-  def self.try_convert(obj)
-    if obj.respond_to?(:to_str)
-      obj.to_str
-    else
-      nil
-    end
-  end
-
-  ##
-  # call-seq:
-  #    string.clear    ->  string
-  #
-  # Makes string empty.
-  #
-  #    a = "abcde"
-  #    a.clear    #=> ""
-  #
-  def clear
-    self.replace("")
-  end
-
-  ##
-  # call-seq:
-  #    str.lstrip   -> new_str
-  #
-  # Returns a copy of <i>str</i> with leading whitespace removed. See also
-  # <code>String#rstrip</code> and <code>String#strip</code>.
-  #
-  #    "  hello  ".lstrip   #=> "hello  "
-  #    "hello".lstrip       #=> "hello"
-  #
-  def lstrip
-    a = 0
-    z = self.size - 1
-    a += 1 while a <= z and " \f\n\r\t\v".include?(self[a])
-    (z >= 0) ? self[a..z] : ""
-  end
-
-  ##
-  # call-seq:
-  #    str.rstrip   -> new_str
-  #
-  # Returns a copy of <i>str</i> with trailing whitespace removed. See also
-  # <code>String#lstrip</code> and <code>String#strip</code>.
-  #
-  #    "  hello  ".rstrip   #=> "  hello"
-  #    "hello".rstrip       #=> "hello"
-  #
-  def rstrip
-    a = 0
-    z = self.size - 1
-    z -= 1 while a <= z and " \f\n\r\t\v\0".include?(self[z])
-    (z >= 0) ? self[a..z] : ""
-  end
-
-  ##
-  # call-seq:
-  #    str.strip   -> new_str
-  #
-  # Returns a copy of <i>str</i> with leading and trailing whitespace removed.
-  #
-  #    "    hello    ".strip   #=> "hello"
-  #    "\tgoodbye\r\n".strip   #=> "goodbye"
-  #
-  def strip
-    a = 0
-    z = self.size - 1
-    a += 1 while a <= z and " \f\n\r\t\v".include?(self[a])
-    z -= 1 while a <= z and " \f\n\r\t\v\0".include?(self[z])
-    (z >= 0) ? self[a..z] : ""
-  end
-
-  ##
-  # call-seq:
-  #    str.lstrip!   -> self or nil
-  #
-  # Removes leading whitespace from <i>str</i>, returning <code>nil</code> if no
-  # change was made. See also <code>String#rstrip!</code> and
-  # <code>String#strip!</code>.
-  #
-  #    "  hello  ".lstrip   #=> "hello  "
-  #    "hello".lstrip!      #=> nil
-  #
-  def lstrip!
-    raise RuntimeError, "can't modify frozen String" if frozen?
-    s = self.lstrip
-    (s == self) ? nil : self.replace(s)
-  end
-
-  ##
-  # call-seq:
-  #    str.rstrip!   -> self or nil
-  #
-  # Removes trailing whitespace from <i>str</i>, returning <code>nil</code> if
-  # no change was made. See also <code>String#lstrip!</code> and
-  # <code>String#strip!</code>.
-  #
-  #    "  hello  ".rstrip   #=> "  hello"
-  #    "hello".rstrip!      #=> nil
-  #
-  def rstrip!
-    raise RuntimeError, "can't modify frozen String" if frozen?
-    s = self.rstrip
-    (s == self) ? nil : self.replace(s)
-  end
-
-  ##
-  #  call-seq:
-  #     str.strip!   -> str or nil
-  #
-  #  Removes leading and trailing whitespace from <i>str</i>. Returns
-  #  <code>nil</code> if <i>str</i> was not altered.
-  #
-  def strip!
-    raise RuntimeError, "can't modify frozen String" if frozen?
-    s = self.strip
-    (s == self) ? nil : self.replace(s)
-  end
-
-  ##
-  # call-seq:
-  #    str.casecmp(other_str)   -> -1, 0, +1 or nil
-  #
-  # Case-insensitive version of <code>String#<=></code>.
-  #
-  #    "abcdef".casecmp("abcde")     #=> 1
-  #    "aBcDeF".casecmp("abcdef")    #=> 0
-  #    "abcdef".casecmp("abcdefg")   #=> -1
-  #    "abcdef".casecmp("ABCDEF")    #=> 0
-  #
-  def casecmp(str)
-    self.downcase <=> str.to_str.downcase
-  rescue NoMethodError
-    raise TypeError, "no implicit conversion of #{str.class} into String"
-  end
-
-  def partition(sep)
-    raise TypeError, "type mismatch: #{sep.class} given" unless sep.is_a? String
-    n = index(sep)
-    unless n.nil?
-      m = n + sep.size
-      [ slice(0, n), sep, slice(m, size - m) ]
-    else
-      [ self, "", "" ]
-    end
-  end
-
-  def rpartition(sep)
-    raise TypeError, "type mismatch: #{sep.class} given" unless sep.is_a? String
-    n = rindex(sep)
-    unless n.nil?
-      m = n + sep.size
-      [ slice(0, n), sep, slice(m, size - m) ]
-    else
-      [ "", "", self ]
-    end
-  end
-
-  ##
-  # call-seq:
-  #    str.slice!(fixnum)           -> new_str or nil
-  #    str.slice!(fixnum, fixnum)   -> new_str or nil
-  #    str.slice!(range)            -> new_str or nil
-  #    str.slice!(other_str)        -> new_str or nil
-  #
-  # Deletes the specified portion from <i>str</i>, and returns the portion
-  # deleted.
-  #
-  #    string = "this is a string"
-  #    string.slice!(2)        #=> "i"
-  #    string.slice!(3..6)     #=> " is "
-  #    string.slice!("r")      #=> "r"
-  #    string                  #=> "thsa sting"
-  #
-  def slice!(arg1, arg2=nil)
-    raise RuntimeError, "can't modify frozen String" if frozen?
-    raise "wrong number of arguments (for 1..2)" if arg1.nil? && arg2.nil?
-
-    if !arg1.nil? && !arg2.nil?
-      idx = arg1
-      idx += self.size if arg1 < 0
-      if idx >= 0 && idx <= self.size && arg2 > 0
-        str = self[idx, arg2]
-      else
-        return nil
-      end
-    else
-      validated = false
-      if arg1.kind_of?(Range)
-        beg = arg1.begin
-        ed = arg1.end
-        beg += self.size if beg < 0
-        ed += self.size if ed < 0
-        ed -= 1 if arg1.exclude_end?
-        validated = true
-      elsif arg1.kind_of?(String)
-        validated = true
-      else
-        idx = arg1
-        idx += self.size if arg1 < 0
-        validated = true if idx >=0 && arg1 < self.size
-      end
-      if validated
-        str = self[arg1]
-      else
-        return nil
-      end
-    end
-    unless str.nil? || str == ""
-      if !arg1.nil? && !arg2.nil?
-        idx = arg1 >= 0 ? arg1 : self.size+arg1
-        str2 = self[0...idx] + self[idx+arg2..-1].to_s
-      else
-        if arg1.kind_of?(Range)
-          idx = beg >= 0 ? beg : self.size+beg
-          idx2 = ed>= 0 ? ed : self.size+ed
-          str2 = self[0...idx] + self[idx2+1..-1].to_s
-        elsif arg1.kind_of?(String)
-          idx = self.index(arg1)
-          str2 = self[0...idx] + self[idx+arg1.size..-1] unless idx.nil?
-        else
-          idx = arg1 >= 0 ? arg1 : self.size+arg1
-          str2 = self[0...idx] + self[idx+1..-1].to_s
-        end
-      end
-      self.replace(str2) unless str2.nil?
-    end
-    str
-  end
-
-  ##
-  #  call-seq:
-  #     str.insert(index, other_str)   -> str
-  #
-  #  Inserts <i>other_str</i> before the character at the given
-  #  <i>index</i>, modifying <i>str</i>. Negative indices count from the
-  #  end of the string, and insert <em>after</em> the given character.
-  #  The intent is insert <i>aString</i> so that it starts at the given
-  #  <i>index</i>.
-  #
-  #     "abcd".insert(0, 'X')    #=> "Xabcd"
-  #     "abcd".insert(3, 'X')    #=> "abcXd"
-  #     "abcd".insert(4, 'X')    #=> "abcdX"
-  #     "abcd".insert(-3, 'X')   #=> "abXcd"
-  #     "abcd".insert(-1, 'X')   #=> "abcdX"
-  #
-  def insert(idx, str)
-    if idx == -1
-      return self << str
-    elsif idx < 0
-      idx += 1
-    end
-    self[idx, 0] = str
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     str.ljust(integer, padstr=' ')   -> new_str
-  #
-  #  If <i>integer</i> is greater than the length of <i>str</i>, returns a new
-  #  <code>String</code> of length <i>integer</i> with <i>str</i> left justified
-  #  and padded with <i>padstr</i>; otherwise, returns <i>str</i>.
-  #
-  #     "hello".ljust(4)            #=> "hello"
-  #     "hello".ljust(20)           #=> "hello               "
-  #     "hello".ljust(20, '1234')   #=> "hello123412341234123"
-  def ljust(idx, padstr = ' ')
-    raise ArgumentError, 'zero width padding' if padstr == ''
-    return self if idx <= self.size
-    pad_repetitions = (idx / padstr.length).ceil
-    padding = (padstr * pad_repetitions)[0...(idx - self.length)]
-    self + padding
-  end
-
-  ##
-  #  call-seq:
-  #     str.rjust(integer, padstr=' ')   -> new_str
-  #
-  #  If <i>integer</i> is greater than the length of <i>str</i>, returns a new
-  #  <code>String</code> of length <i>integer</i> with <i>str</i> right justified
-  #  and padded with <i>padstr</i>; otherwise, returns <i>str</i>.
-  #
-  #     "hello".rjust(4)            #=> "hello"
-  #     "hello".rjust(20)           #=> "               hello"
-  #     "hello".rjust(20, '1234')   #=> "123412341234123hello"
-  def rjust(idx, padstr = ' ')
-    raise ArgumentError, 'zero width padding' if padstr == ''
-    return self if idx <= self.size
-    pad_repetitions = (idx / padstr.length).ceil
-    padding = (padstr * pad_repetitions)[0...(idx - self.length)]
-    padding + self
-  end
-
-  def chars(&block)
-    if block_given?
-      self.split('').each do |i|
-        block.call(i)
-      end
-      self
-    else
-      self.split('')
-    end
-  end
-
-  def each_char(&block)
-    return to_enum :each_char unless block
-
-    split('').each do |i|
-      block.call(i)
-    end
-    self
-  end
-
-  def codepoints(&block)
-    len = self.size
-
-    if block_given?
-      self.split('').each do|x|
-        block.call(x.ord)
-      end
-      self
-    else
-      self.split('').map{|x| x.ord}
-    end
-  end
-  alias each_codepoint codepoints
-
-  ##
-  # call-seq:
-  #    str.prepend(other_str)  -> str
-  #
-  # Prepend---Prepend the given string to <i>str</i>.
-  #
-  #    a = "world"
-  #    a.prepend("hello ") #=> "hello world"
-  #    a                   #=> "hello world"
-  def prepend(arg)
-    self[0, 0] = arg
-    self
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/src/string.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/src/string.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/src/string.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/src/string.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,685 +0,0 @@
-#include <string.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/string.h>
-#include <mruby/range.h>
-
-static mrb_value
-mrb_str_getbyte(mrb_state *mrb, mrb_value str)
-{
-  mrb_int pos;
-  mrb_get_args(mrb, "i", &pos);
-
-  if (pos < 0)
-    pos += RSTRING_LEN(str);
-  if (pos < 0 ||  RSTRING_LEN(str) <= pos)
-    return mrb_nil_value();
-
-  return mrb_fixnum_value((unsigned char)RSTRING_PTR(str)[pos]);
-}
-
-static mrb_value
-mrb_str_setbyte(mrb_state *mrb, mrb_value str)
-{
-  mrb_int pos, byte;
-  long len;
-
-  mrb_get_args(mrb, "ii", &pos, &byte);
-
-  len = RSTRING_LEN(str);
-  if (pos < -len || len <= pos)
-    mrb_raisef(mrb, E_INDEX_ERROR, "index %S is out of array", mrb_fixnum_value(pos));
-  if (pos < 0)
-    pos += len;
-
-  mrb_str_modify(mrb, mrb_str_ptr(str));
-  byte &= 0xff;
-  RSTRING_PTR(str)[pos] = byte;
-  return mrb_fixnum_value((unsigned char)byte);
-}
-
-static mrb_value
-mrb_str_byteslice(mrb_state *mrb, mrb_value str)
-{
-  mrb_value a1;
-  mrb_int len;
-  int argc;
-
-  argc = mrb_get_args(mrb, "o|i", &a1, &len);
-  if (argc == 2) {
-    return mrb_str_substr(mrb, str, mrb_fixnum(a1), len);
-  }
-  switch (mrb_type(a1)) {
-  case MRB_TT_RANGE:
-    {
-      mrb_int beg;
-
-      len = RSTRING_LEN(str);
-      switch (mrb_range_beg_len(mrb, a1, &beg, &len, len, TRUE)) {
-      case 0:                   /* not range */
-        break;
-      case 1:                   /* range */
-        return mrb_str_substr(mrb, str, beg, len);
-      case 2:                   /* out of range */
-        mrb_raisef(mrb, E_RANGE_ERROR, "%S out of range", a1);
-        break;
-      }
-      return mrb_nil_value();
-    }
-  case MRB_TT_FLOAT:
-    a1 = mrb_fixnum_value((mrb_int)mrb_float(a1));
-    /* fall through */
-  case MRB_TT_FIXNUM:
-    return mrb_str_substr(mrb, str, mrb_fixnum(a1), 1);
-  default:
-    mrb_raise(mrb, E_TYPE_ERROR, "wrong type of argument");
-  }
-  /* not reached */
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     str.swapcase!   -> str or nil
- *
- *  Equivalent to <code>String#swapcase</code>, but modifies the receiver in
- *  place, returning <i>str</i>, or <code>nil</code> if no changes were made.
- *  Note: case conversion is effective only in ASCII region.
- */
-static mrb_value
-mrb_str_swapcase_bang(mrb_state *mrb, mrb_value str)
-{
-  char *p, *pend;
-  int modify = 0;
-  struct RString *s = mrb_str_ptr(str);
-
-  mrb_str_modify(mrb, s);
-  p = RSTRING_PTR(str);
-  pend = p + RSTRING_LEN(str);
-  while (p < pend) {
-    if (ISUPPER(*p)) {
-      *p = TOLOWER(*p);
-      modify = 1;
-    }
-    else if (ISLOWER(*p)) {
-      *p = TOUPPER(*p);
-      modify = 1;
-    }
-    p++;
-  }
-
-  if (modify) return str;
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     str.swapcase   -> new_str
- *
- *  Returns a copy of <i>str</i> with uppercase alphabetic characters converted
- *  to lowercase and lowercase characters converted to uppercase.
- *  Note: case conversion is effective only in ASCII region.
- *
- *     "Hello".swapcase          #=> "hELLO"
- *     "cYbEr_PuNk11".swapcase   #=> "CyBeR_pUnK11"
- */
-static mrb_value
-mrb_str_swapcase(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  str = mrb_str_dup(mrb, self);
-  mrb_str_swapcase_bang(mrb, str);
-  return str;
-}
-
-static mrb_value mrb_fixnum_chr(mrb_state *mrb, mrb_value num);
-
-/*
- *  call-seq:
- *     str << integer       -> str
- *     str.concat(integer)  -> str
- *     str << obj           -> str
- *     str.concat(obj)      -> str
- *
- *  Append---Concatenates the given object to <i>str</i>. If the object is a
- *  <code>Integer</code>, it is considered as a codepoint, and is converted
- *  to a character before concatenation.
- *
- *     a = "hello "
- *     a << "world"   #=> "hello world"
- *     a.concat(33)   #=> "hello world!"
- */
-static mrb_value
-mrb_str_concat2(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  mrb_get_args(mrb, "o", &str);
-  if (mrb_fixnum_p(str))
-    str = mrb_fixnum_chr(mrb, str);
-  else
-    str = mrb_string_type(mrb, str);
-  mrb_str_concat(mrb, self, str);
-  return self;
-}
-
-/*
- *  call-seq:
- *     str.start_with?([prefixes]+)   -> true or false
- *
- *  Returns true if +str+ starts with one of the +prefixes+ given.
- *
- *    "hello".start_with?("hell")               #=> true
- *
- *    # returns true if one of the prefixes matches.
- *    "hello".start_with?("heaven", "hell")     #=> true
- *    "hello".start_with?("heaven", "paradise") #=> false
- *    "h".start_with?("heaven", "hell")         #=> false
- */
-static mrb_value
-mrb_str_start_with(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *argv, sub;
-  mrb_int argc, i;
-  mrb_get_args(mrb, "*", &argv, &argc);
-
-  for (i = 0; i < argc; i++) {
-    size_t len_l, len_r;
-    int ai = mrb_gc_arena_save(mrb);
-    sub = mrb_string_type(mrb, argv[i]);
-    mrb_gc_arena_restore(mrb, ai);
-    len_l = RSTRING_LEN(self);
-    len_r = RSTRING_LEN(sub);
-    if (len_l >= len_r) {
-      if (memcmp(RSTRING_PTR(self), RSTRING_PTR(sub), len_r) == 0) {
-        return mrb_true_value();
-      }
-    }
-  }
-  return mrb_false_value();
-}
-
-/*
- *  call-seq:
- *     str.end_with?([suffixes]+)   -> true or false
- *
- *  Returns true if +str+ ends with one of the +suffixes+ given.
- */
-static mrb_value
-mrb_str_end_with(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *argv, sub;
-  mrb_int argc, i;
-  mrb_get_args(mrb, "*", &argv, &argc);
-
-  for (i = 0; i < argc; i++) {
-    size_t len_l, len_r;
-    int ai = mrb_gc_arena_save(mrb);
-    sub = mrb_string_type(mrb, argv[i]);
-    mrb_gc_arena_restore(mrb, ai);
-    len_l = RSTRING_LEN(self);
-    len_r = RSTRING_LEN(sub);
-    if (len_l >= len_r) {
-      if (memcmp(RSTRING_PTR(self) + (len_l - len_r),
-                 RSTRING_PTR(sub),
-                 len_r) == 0) {
-        return mrb_true_value();
-      }
-    }
-  }
-  return mrb_false_value();
-}
-
-static mrb_value
-mrb_str_hex(mrb_state *mrb, mrb_value self)
-{
-  return mrb_str_to_inum(mrb, self, 16, FALSE);
-}
-
-static mrb_value
-mrb_str_oct(mrb_state *mrb, mrb_value self)
-{
-  return mrb_str_to_inum(mrb, self, 8, FALSE);
-}
-
-/*
- *  call-seq:
- *     string.chr    ->  string
- *
- *  Returns a one-character string at the beginning of the string.
- *
- *     a = "abcde"
- *     a.chr    #=> "a"
- */
-static mrb_value
-mrb_str_chr(mrb_state *mrb, mrb_value self)
-{
-  return mrb_str_substr(mrb, self, 0, 1);
-}
-
-static mrb_value
-mrb_fixnum_chr(mrb_state *mrb, mrb_value num)
-{
-  mrb_int cp = mrb_fixnum(num);
-#ifdef MRB_UTF8_STRING
-  char utf8[4];
-  mrb_int len;
-
-  if (cp < 0 || 0x10FFFF < cp) {
-    mrb_raisef(mrb, E_RANGE_ERROR, "%S out of char range", num);
-  }
-  if (cp < 0x80) {
-    utf8[0] = (char)cp;
-    len = 1;
-  }
-  else if (cp < 0x800) {
-    utf8[0] = (char)(0xC0 | (cp >> 6));
-    utf8[1] = (char)(0x80 | (cp & 0x3F));
-    len = 2;
-  }
-  else if (cp < 0x10000) {
-    utf8[0] = (char)(0xE0 |  (cp >> 12));
-    utf8[1] = (char)(0x80 | ((cp >>  6) & 0x3F));
-    utf8[2] = (char)(0x80 | ( cp        & 0x3F));
-    len = 3;
-  }
-  else {
-    utf8[0] = (char)(0xF0 |  (cp >> 18));
-    utf8[1] = (char)(0x80 | ((cp >> 12) & 0x3F));
-    utf8[2] = (char)(0x80 | ((cp >>  6) & 0x3F));
-    utf8[3] = (char)(0x80 | ( cp        & 0x3F));
-    len = 4;
-  }
-  return mrb_str_new(mrb, utf8, len);
-#else
-  char c;
-
-  if (cp < 0 || 0xff < cp) {
-    mrb_raisef(mrb, E_RANGE_ERROR, "%S out of char range", num);
-  }
-  c = (char)cp;
-  return mrb_str_new(mrb, &c, 1);
-#endif
-}
-
-/*
- *  call-seq:
- *     string.lines    ->  array of string
- *
- *  Returns strings per line;
- *
- *     a = "abc\ndef"
- *     a.lines    #=> ["abc\n", "def"]
- */
-static mrb_value
-mrb_str_lines(mrb_state *mrb, mrb_value self)
-{
-  mrb_value result;
-  mrb_value blk;
-  int ai;
-  mrb_int len;
-  mrb_value arg;
-  char *b = RSTRING_PTR(self);
-  char *p = b, *t;
-  char *e = b + RSTRING_LEN(self);
-
-  mrb_get_args(mrb, "&", &blk);
-
-  result = mrb_ary_new(mrb);
-  ai = mrb_gc_arena_save(mrb);
-  if (!mrb_nil_p(blk)) {
-    while (p < e) {
-      t = p;
-      while (p < e && *p != '\n') p++;
-      if (*p == '\n') p++;
-      len = (mrb_int) (p - t);
-      arg = mrb_str_new(mrb, t, len);
-      mrb_yield_argv(mrb, blk, 1, &arg);
-      mrb_gc_arena_restore(mrb, ai);
-      if (b != RSTRING_PTR(self)) {
-        ptrdiff_t diff = p - b;
-        b = RSTRING_PTR(self);
-        p = b + diff;
-      }
-      e = b + RSTRING_LEN(self);
-    }
-    return self;
-  }
-  while (p < e) {
-    t = p;
-    while (p < e && *p != '\n') p++;
-    if (*p == '\n') p++;
-    len = (mrb_int) (p - t);
-    mrb_ary_push(mrb, result, mrb_str_new(mrb, t, len));
-    mrb_gc_arena_restore(mrb, ai);
-  }
-  return result;
-}
-
-/*
- *  call-seq:
- *     string.succ    ->  string
- *
- *  Returns next sequence of the string;
- *
- *     a = "abc"
- *     a.succ    #=> "abd"
- */
-static mrb_value
-mrb_str_succ_bang(mrb_state *mrb, mrb_value self)
-{
-  mrb_value result;
-  unsigned char *p, *e, *b, *t;
-  const char *prepend;
-  struct RString *s = mrb_str_ptr(self);
-  mrb_int l;
-
-  if (RSTRING_LEN(self) == 0)
-    return self;
-
-  mrb_str_modify(mrb, s);
-  l = RSTRING_LEN(self);
-  b = p = (unsigned char*) RSTRING_PTR(self);
-  t = e = p + l;
-  *(e--) = 0;
-
-  // find trailing ascii/number
-  while (e >= b) {
-    if (ISALNUM(*e))
-      break;
-    e--;
-  }
-  if (e < b) {
-    e = p + l - 1;
-    result = mrb_str_new_lit(mrb, "");
-  }
-  else {
-    // find leading letter of the ascii/number
-    b = e;
-    while (b > p) {
-      if (!ISALNUM(*b) || (ISALNUM(*b) && *b != '9' && *b != 'z' && *b != 'Z'))
-        break;
-      b--;
-    }
-    if (!ISALNUM(*b))
-      b++;
-    result = mrb_str_new(mrb, (char*) p, b - p);
-  }
-
-  while (e >= b) {
-    if (!ISALNUM(*e)) {
-      if (*e == 0xff) {
-        mrb_str_cat_lit(mrb, result, "\x01");
-        (*e) = 0;
-      }
-      else
-        (*e)++;
-      break;
-    }
-    prepend = NULL;
-    if (*e == '9') {
-      if (e == b) prepend = "1";
-      *e = '0';
-    }
-    else if (*e == 'z') {
-      if (e == b) prepend = "a";
-      *e = 'a';
-    }
-    else if (*e == 'Z') {
-      if (e == b) prepend = "A";
-      *e = 'A';
-    }
-    else {
-      (*e)++;
-      break;
-    }
-    if (prepend) mrb_str_cat_cstr(mrb, result, prepend);
-    e--;
-  }
-  result = mrb_str_cat(mrb, result, (char*) b, t - b);
-  l = RSTRING_LEN(result);
-  mrb_str_resize(mrb, self, l);
-  memcpy(RSTRING_PTR(self), RSTRING_PTR(result), l);
-  return self;
-}
-
-static mrb_value
-mrb_str_succ(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  str = mrb_str_dup(mrb, self);
-  mrb_str_succ_bang(mrb, str);
-  return str;
-}
-
-#ifdef MRB_UTF8_STRING
-static const char utf8len_codepage_zero[256] =
-{
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0,
-};
-
-static mrb_int
-utf8code(unsigned char* p)
-{
-  mrb_int len;
-
-  if (p[0] < 0x80)
-    return p[0];
-
-  len = utf8len_codepage_zero[p[0]];
-  if (len > 1 && (p[1] & 0xc0) == 0x80) {
-    if (len == 2)
-      return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f);
-    if ((p[2] & 0xc0) == 0x80) {
-      if (len == 3)
-        return ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6)
-          + (p[2] & 0x3f);
-      if ((p[3] & 0xc0) == 0x80) {
-        if (len == 4)
-          return ((p[0] & 0x07) << 18) + ((p[1] & 0x3f) << 12)
-            + ((p[2] & 0x3f) << 6) + (p[3] & 0x3f);
-        if ((p[4] & 0xc0) == 0x80) {
-          if (len == 5)
-            return ((p[0] & 0x03) << 24) + ((p[1] & 0x3f) << 18)
-              + ((p[2] & 0x3f) << 12) + ((p[3] & 0x3f) << 6)
-              + (p[4] & 0x3f);
-          if ((p[5] & 0xc0) == 0x80 && len == 6)
-            return ((p[0] & 0x01) << 30) + ((p[1] & 0x3f) << 24)
-              + ((p[2] & 0x3f) << 18) + ((p[3] & 0x3f) << 12)
-              + ((p[4] & 0x3f) << 6) + (p[5] & 0x3f);
-        }
-      }
-    }
-  }
-  return p[0];
-}
-
-static mrb_value
-mrb_str_ord(mrb_state* mrb, mrb_value str)
-{
-  if (RSTRING_LEN(str) == 0)
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "empty string");
-  return mrb_fixnum_value(utf8code((unsigned char*) RSTRING_PTR(str)));
-}
-#else
-static mrb_value
-mrb_str_ord(mrb_state* mrb, mrb_value str)
-{
-  if (RSTRING_LEN(str) == 0)
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "empty string");
-  return mrb_fixnum_value((unsigned char)RSTRING_PTR(str)[0]);
-}
-#endif
-
-static mrb_bool
-all_digits_p(const char *s, mrb_int len)
-{
-  while (len-- > 0) {
-    if (!ISDIGIT(*s)) return FALSE;
-    s++;
-  }
-  return TRUE;
-}
-
-/*
- *  call-seq:
- *     str.upto(other_str, exclusive=false) {|s| block }   -> str
- *     str.upto(other_str, exclusive=false)                -> an_enumerator
- *
- *  Iterates through successive values, starting at <i>str</i> and
- *  ending at <i>other_str</i> inclusive, passing each value in turn to
- *  the block. The <code>String#succ</code> method is used to generate
- *  each value.  If optional second argument exclusive is omitted or is false,
- *  the last value will be included; otherwise it will be excluded.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     "a8".upto("b6") {|s| print s, ' ' }
- *     for s in "a8".."b6"
- *       print s, ' '
- *     end
- *
- *  <em>produces:</em>
- *
- *     a8 a9 b0 b1 b2 b3 b4 b5 b6
- *     a8 a9 b0 b1 b2 b3 b4 b5 b6
- *
- *  If <i>str</i> and <i>other_str</i> contains only ascii numeric characters,
- *  both are recognized as decimal numbers. In addition, the width of
- *  string (e.g. leading zeros) is handled appropriately.
- *
- *     "9".upto("11").to_a   #=> ["9", "10", "11"]
- *     "25".upto("5").to_a   #=> []
- *     "07".upto("11").to_a  #=> ["07", "08", "09", "10", "11"]
- */
-static mrb_value
-mrb_str_upto(mrb_state *mrb, mrb_value beg)
-{
-  mrb_value end;
-  mrb_value exclusive = mrb_false_value();
-  mrb_value block = mrb_nil_value();
-  mrb_value current, after_end;
-  mrb_int n;
-  mrb_bool excl;
-
-  mrb_get_args(mrb, "o|o&", &end, &exclusive, &block);
-
-  if (mrb_nil_p(block)) {
-    return mrb_funcall(mrb, beg, "to_enum", 3, mrb_symbol_value(mrb_intern_lit(mrb, "upto")), end, exclusive);
-  }
-  end = mrb_string_type(mrb, end);
-  excl = mrb_test(exclusive);
-
-  /* single character */
-  if (RSTRING_LEN(beg) == 1 && RSTRING_LEN(end) == 1 &&
-  ISASCII(RSTRING_PTR(beg)[0]) && ISASCII(RSTRING_PTR(end)[0])) {
-    char c = RSTRING_PTR(beg)[0];
-    char e = RSTRING_PTR(end)[0];
-    int ai = mrb_gc_arena_save(mrb);
-
-    if (c > e || (excl && c == e)) return beg;
-    for (;;) {
-      mrb_yield(mrb, block, mrb_str_new(mrb, &c, 1));
-      mrb_gc_arena_restore(mrb, ai);
-      if (!excl && c == e) break;
-      c++;
-      if (excl && c == e) break;
-    }
-    return beg;
-  }
-  /* both edges are all digits */
-  if (ISDIGIT(RSTRING_PTR(beg)[0]) && ISDIGIT(RSTRING_PTR(end)[0]) &&
-      all_digits_p(RSTRING_PTR(beg), RSTRING_LEN(beg)) &&
-      all_digits_p(RSTRING_PTR(end), RSTRING_LEN(end))) {
-    mrb_int min_width = RSTRING_LEN(beg);
-    mrb_int bi = mrb_int(mrb, mrb_str_to_inum(mrb, beg, 10, FALSE));
-    mrb_int ei = mrb_int(mrb, mrb_str_to_inum(mrb, end, 10, FALSE));
-    int ai = mrb_gc_arena_save(mrb);
-
-    while (bi <= ei) {
-      mrb_value ns, str;
-
-      if (excl && bi == ei) break;
-      ns = mrb_format(mrb, "%S", mrb_fixnum_value(bi));
-      if (min_width > RSTRING_LEN(ns)) {
-        str = mrb_str_new(mrb, NULL, min_width);
-        memset(RSTRING_PTR(str), '0', min_width-RSTRING_LEN(ns));
-        memcpy(RSTRING_PTR(str)+min_width-RSTRING_LEN(ns),
-               RSTRING_PTR(ns), RSTRING_LEN(ns));
-      }
-      else {
-        str = ns;
-      }
-      mrb_yield(mrb, block, str);
-      mrb_gc_arena_restore(mrb, ai);
-      bi++;
-    }
-
-    return beg;
-  }
-  /* normal case */
-  n = mrb_int(mrb, mrb_funcall(mrb, beg, "<=>", 1, end));
-  if (n > 0 || (excl && n == 0)) return beg;
-
-  after_end = mrb_funcall(mrb, end, "succ", 0);
-  current = mrb_str_dup(mrb, beg);
-  while (!mrb_str_equal(mrb, current, after_end)) {
-    int ai = mrb_gc_arena_save(mrb);
-    mrb_value next = mrb_nil_value();
-    if (excl || !mrb_str_equal(mrb, current, end))
-      next = mrb_funcall(mrb, current, "succ", 0);
-    mrb_yield(mrb, block, current);
-    if (mrb_nil_p(next)) break;
-    current = mrb_str_to_str(mrb, next);
-    if (excl && mrb_str_equal(mrb, current, end)) break;
-    if (RSTRING_LEN(current) > RSTRING_LEN(end) || RSTRING_LEN(current) == 0)
-      break;
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  return beg;
-}
-
-void
-mrb_mruby_string_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass * s = mrb->string_class;
-
-  mrb_define_method(mrb, s, "dump",            mrb_str_dump,            MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "getbyte",         mrb_str_getbyte,         MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, s, "setbyte",         mrb_str_setbyte,         MRB_ARGS_REQ(2));
-  mrb_define_method(mrb, s, "byteslice",       mrb_str_byteslice,       MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, s, "swapcase!",       mrb_str_swapcase_bang,   MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "swapcase",        mrb_str_swapcase,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "concat",          mrb_str_concat2,         MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, s, "<<",              mrb_str_concat2,         MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, s, "start_with?",     mrb_str_start_with,      MRB_ARGS_REST());
-  mrb_define_method(mrb, s, "end_with?",       mrb_str_end_with,        MRB_ARGS_REST());
-  mrb_define_method(mrb, s, "hex",             mrb_str_hex,             MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "oct",             mrb_str_oct,             MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "chr",             mrb_str_chr,             MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "lines",           mrb_str_lines,           MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "succ",            mrb_str_succ,            MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "succ!",           mrb_str_succ_bang,       MRB_ARGS_NONE());
-  mrb_alias_method(mrb, s, mrb_intern_lit(mrb, "next"), mrb_intern_lit(mrb, "succ"));
-  mrb_alias_method(mrb, s, mrb_intern_lit(mrb, "next!"), mrb_intern_lit(mrb, "succ!"));
-  mrb_define_method(mrb, s, "ord", mrb_str_ord, MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "upto", mrb_str_upto, MRB_ARGS_ANY());
-
-  mrb_define_method(mrb, mrb->fixnum_class, "chr", mrb_fixnum_chr, MRB_ARGS_NONE());
-}
-
-void
-mrb_mruby_string_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/test/string.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/test/string.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/test/string.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-string-ext/test/string.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,667 +0,0 @@
-##
-# String(Ext) Test
-
-UTF8STRING = ("\343\201\202".size == 1)
-
-assert('String.try_convert') do
-  assert_nil String.try_convert(nil)
-  assert_nil String.try_convert(:foo)
-  assert_equal "", String.try_convert("")
-  assert_equal "1,2,3", String.try_convert("1,2,3")
-end
-
-assert('String#getbyte') do
-  str1 = "hello"
-  bytes1 = [104, 101, 108, 108, 111]
-  assert_equal bytes1[0], str1.getbyte(0)
-  assert_equal bytes1[-1], str1.getbyte(-1)
-  assert_equal bytes1[6], str1.getbyte(6)
-
-  str2 = "\xFF"
-  bytes2 = [0xFF]
-  assert_equal bytes2[0], str2.getbyte(0)
-end
-
-assert('String#setbyte') do
-  str1 = "hello"
-  h = "H".getbyte(0)
-  str1.setbyte(0, h)
-  assert_equal(h, str1.getbyte(0))
-  assert_equal("Hello", str1)
-end
-
-assert("String#setbyte raises IndexError if arg conversion resizes String") do
-  $s = "01234\n"
-  class Tmp
-      def to_i
-          $s.chomp! ''
-          95
-      end
-  end
-  tmp = Tmp.new
-  assert_raise(IndexError) { $s.setbyte(5, tmp) }
-end
-
-assert('String#byteslice') do
-  str1 = "hello"
-  assert_equal("e", str1.byteslice(1))
-  assert_equal("o", str1.byteslice(-1))
-  assert_equal("ell", str1.byteslice(1..3))
-  assert_equal("el", str1.byteslice(1...3))
-end
-
-assert('String#dump') do
-  ("\1" * 100).dump     # should not raise an exception - regress #1210
-  "\0".inspect == "\"\\000\"" and
-  "foo".dump == "\"foo\""
-end
-
-assert('String#strip') do
-  s = "  abc  "
-  "".strip == "" and " \t\r\n\f\v".strip == "" and
-  "\0a\0".strip == "\0a" and
-  "abc".strip     == "abc" and
-  "  abc".strip   == "abc" and
-  "abc  ".strip   == "abc" and
-  "  abc  ".strip == "abc" and
-  s == "  abc  "
-end
-
-assert('String#lstrip') do
-  s = "  abc  "
-  s.lstrip
-  "".lstrip == "" and " \t\r\n\f\v".lstrip == "" and
-  "\0a\0".lstrip == "\0a\0" and
-  "abc".lstrip     == "abc"   and
-  "  abc".lstrip   == "abc"   and
-  "abc  ".lstrip   == "abc  " and
-  "  abc  ".lstrip == "abc  " and
-  s == "  abc  "
-end
-
-assert('String#rstrip') do
-  s = "  abc  "
-  s.rstrip
-  "".rstrip == "" and " \t\r\n\f\v".rstrip == "" and
-  "\0a\0".rstrip == "\0a" and
-  "abc".rstrip     == "abc"   and
-  "  abc".rstrip   == "  abc" and
-  "abc  ".rstrip   == "abc"   and
-  "  abc  ".rstrip == "  abc" and
-  s == "  abc  "
-end
-
-assert('String#strip!') do
-  s = "  abc  "
-  t = "abc"
-  s.strip! == "abc" and s == "abc" and t.strip! == nil
-end
-
-assert('String#lstrip!') do
-  s = "  abc  "
-  t = "abc  "
-  s.lstrip! == "abc  " and s == "abc  " and t.lstrip! == nil
-end
-
-assert('String#rstrip!') do
-  s = "  abc  "
-  t = "  abc"
-  s.rstrip! == "  abc" and s == "  abc" and t.rstrip! == nil
-end
-
-assert('String#swapcase') do
-  assert_equal "hELLO", "Hello".swapcase
-  assert_equal "CyBeR_pUnK11", "cYbEr_PuNk11".swapcase
-end
-
-assert('String#swapcase!') do
-  s = "Hello"
-  t = s.clone
-  t.swapcase!
-  assert_equal s.swapcase, t
-end
-
-assert('String#concat') do
-  assert_equal "Hello World!", "Hello " << "World" << 33
-  assert_equal "Hello World!", "Hello ".concat("World").concat(33)
-
-  o = Object.new
-  def o.to_str
-    "to_str"
-  end
-  assert_equal "hi to_str", "hi " << o
-
-  assert_raise(TypeError) { "".concat(Object.new) }
-end
-
-assert('String#casecmp') do
-  assert_equal 1, "abcdef".casecmp("abcde")
-  assert_equal 0, "aBcDeF".casecmp("abcdef")
-  assert_equal(-1, "abcdef".casecmp("abcdefg"))
-  assert_equal 0, "abcdef".casecmp("ABCDEF")
-  o = Object.new
-  def o.to_str
-    "ABCDEF"
-  end
-  assert_equal 0, "abcdef".casecmp(o)
-end
-
-assert('String#start_with?') do
-  assert_true "hello".start_with?("heaven", "hell")
-  assert_true !"hello".start_with?("heaven", "paradise")
-  assert_true !"h".start_with?("heaven", "hell")
-  assert_raise TypeError do "hello".start_with?(true) end
-end
-
-assert('String#end_with?') do
-  assert_true "string".end_with?("ing", "mng")
-  assert_true !"string".end_with?("str", "tri")
-  assert_true !"ng".end_with?("ing", "mng")
-  assert_raise TypeError do "hello".end_with?(true) end
-end
-
-assert('String#partition') do
-  assert_equal ["a", "x", "axa"], "axaxa".partition("x")
-  assert_equal ["aaaaa", "", ""], "aaaaa".partition("x")
-  assert_equal ["", "", "aaaaa"], "aaaaa".partition("")
-  assert_equal ["", "a", "aaaa"], "aaaaa".partition("a")
-  assert_equal ["aaaa", "b", ""], "aaaab".partition("b")
-  assert_equal ["", "b", "aaaa"], "baaaa".partition("b")
-  assert_equal ["", "", ""],      "".partition("a")
-end
-
-assert('String#rpartition') do
-  assert_equal ["axa", "x", "a"], "axaxa".rpartition("x")
-  assert_equal ["", "", "aaaaa"], "aaaaa".rpartition("x")
-  assert_equal ["aaaaa", "", ""], "aaaaa".rpartition("")
-  assert_equal ["aaaa", "a", ""], "aaaaa".rpartition("a")
-  assert_equal ["aaaa", "b", ""], "aaaab".rpartition("b")
-  assert_equal ["", "b", "aaaa"], "baaaa".rpartition("b")
-  assert_equal ["", "", ""],      "".rpartition("a")
-end
-
-assert('String#hex') do
-  assert_equal 16, "10".hex
-  assert_equal 255, "ff".hex
-  assert_equal 16, "0x10".hex
-  assert_equal (-16), "-0x10".hex
-  assert_equal 0, "xyz".hex
-  assert_equal 16, "10z".hex
-  assert_equal 16, "1_0".hex
-  assert_equal 0, "".hex
-end
-
-assert('String#oct') do
-  assert_equal 8, "10".oct
-  assert_equal 7, "7".oct
-  assert_equal 0, "8".oct
-  assert_equal 0, "9".oct
-  assert_equal 0, "xyz".oct
-  assert_equal 8, "10z".oct
-  assert_equal 8, "1_0".oct
-  assert_equal 8, "010".oct
-  assert_equal (-8), "-10".oct
-end
-
-assert('String#chr') do
-  assert_equal "a", "abcde".chr
-  # test Fixnum#chr as well
-  assert_equal "a", 97.chr
-end
-
-assert('String#lines') do
-  assert_equal ["Hel\n", "lo\n", "World!"], "Hel\nlo\nWorld!".lines
-  assert_equal ["Hel\n", "lo\n", "World!\n"], "Hel\nlo\nWorld!\n".lines
-  assert_equal ["\n", "\n", "\n"], "\n\n\n".lines
-  assert_equal [], "".lines
-end
-
-assert('String#clear') do
-  # embed string
-  s = "foo"
-  assert_equal("", s.clear)
-  assert_equal("", s)
-
-  # not embed string and not shared string
-  s = "foo" * 100
-  a = s
-  assert_equal("", s.clear)
-  assert_equal("", s)
-  assert_equal("", a)
-
-  # shared string
-  s = "foo" * 100
-  a = s[10, 90]                # create shared string
-  assert_equal("", s.clear)    # clear
-  assert_equal("", s)          # s is cleared
-  assert_not_equal("", a)      # a should not be affected
-end
-
-assert('String#slice!') do
-  a = "AooBar"
-  b = a.dup
-  assert_equal "A", a.slice!(0)
-  assert_equal "AooBar", b
-
-  a = "FooBar"
-  assert_equal "r", a.slice!(-1)
-  assert_equal "FooBa", a
-
-  a = "FooBar"
-  assert_nil a.slice!(6)
-  assert_nil a.slice!(-7)
-  assert_equal "FooBar", a
-
-  a = "FooBar"
-  assert_equal "Foo", a.slice!(0, 3)
-  assert_equal "Bar", a
-
-  a = "FooBar"
-  assert_equal "Bar", a.slice!(-3, 3)
-  assert_equal "Foo", a
-
-  a = "FooBar"
-  assert_equal "", a.slice!(6, 2)
-  assert_equal "FooBar", a
-
-  a = "FooBar"
-  assert_nil a.slice!(-7,10)
-  assert_equal "FooBar", a
-
-  a = "FooBar"
-  assert_equal "Foo", a.slice!(0..2)
-  assert_equal "Bar", a
-
-  a = "FooBar"
-  assert_equal "Bar", a.slice!(-3..-1)
-  assert_equal "Foo", a
-
-  a = "FooBar"
-  assert_equal "", a.slice!(6..2)
-  assert_equal "FooBar", a
-
-  a = "FooBar"
-  assert_nil a.slice!(-10..-7)
-  assert_equal "FooBar", a
-
-  a = "FooBar"
-  assert_equal "Foo", a.slice!("Foo")
-  assert_equal "Bar", a
-
-  a = "FooBar"
-  assert_nil a.slice!("xyzzy")
-  assert_equal "FooBar", a
-
-  assert_raise(ArgumentError) { "foo".slice! }
-end
-
-assert('String#succ') do
-  assert_equal "", "".succ
-  assert_equal "1", "0".succ
-  assert_equal "10", "9".succ
-  assert_equal "01", "00".succ
-  assert_equal "a1", "a0".succ
-  assert_equal "A1", "A0".succ
-  assert_equal "10", "09".succ
-  assert_equal "b0", "a9".succ
-  assert_equal "B0", "A9".succ
-
-  assert_equal "b", "a".succ
-  assert_equal "aa", "z".succ
-  assert_equal "ab", "aa".succ
-  assert_equal "Ab", "Aa".succ
-  assert_equal "0b", "0a".succ
-  assert_equal "ba", "az".succ
-  assert_equal "Ba", "Az".succ
-  assert_equal "1a", "0z".succ
-
-  assert_equal "B", "A".succ
-  assert_equal "AA", "Z".succ
-  assert_equal "AB", "AA".succ
-  assert_equal "aB", "aA".succ
-  assert_equal "0B", "0A".succ
-  assert_equal "BA", "AZ".succ
-  assert_equal "bA", "aZ".succ
-  assert_equal "1A", "0Z".succ
-
-  assert_equal ".", "-".succ
-  assert_equal "\x01\x00", "\xff".succ
-  assert_equal "-b", "-a".succ
-  assert_equal "-aa", "-z".succ
-  assert_equal "-a-b-", "-a-a-".succ
-  assert_equal "-b-", "-a-".succ
-  assert_equal "-aa-", "-z-".succ
-  assert_equal "あb", "あa".succ
-  assert_equal "あba", "あaz".succ
-
-  a = ""; a.succ!
-  assert_equal "", a
-  a = "0"; a.succ!
-  assert_equal "1", a
-  a = "9"; a.succ!
-  assert_equal "10", a
-  a = "00"; a.succ!
-  assert_equal "01", a
-  a = "a0"; a.succ!
-  assert_equal "a1", a
-  a = "A0"; a.succ!
-  assert_equal "A1", a
-  a = "09"; a.succ!
-  assert_equal "10", a
-  a = "a9"; a.succ!
-  assert_equal "b0", a
-  a = "A9"; a.succ!
-  assert_equal "B0", a
-
-  a = "a"; a.succ!
-  assert_equal "b", a
-  a = "z"; a.succ!
-  assert_equal "aa", a
-  a = "aa"; a.succ!
-  assert_equal "ab", a
-  a = "Aa"; a.succ!
-  assert_equal "Ab", a
-  a = "0a"; a.succ!
-  assert_equal "0b", a
-  a = "az"; a.succ!
-  assert_equal "ba", a
-  a = "Az"; a.succ!
-  assert_equal "Ba", a
-  a = "0z"; a.succ!
-  assert_equal "1a", a
-
-  a = "A"; a.succ!
-  assert_equal "B", a
-  a = "Z"; a.succ!
-  assert_equal "AA", a
-  a = "AA"; a.succ!
-  assert_equal "AB", a
-  a = "aA"; a.succ!
-  assert_equal "aB", a
-  a = "0A"; a.succ!
-  assert_equal "0B", a
-  a = "AZ"; a.succ!
-  assert_equal "BA", a
-  a = "aZ"; a.succ!
-  assert_equal "bA", a
-  a = "0Z"; a.succ!
-  assert_equal "1A", a
-
-  a = "-"; a.succ!
-  assert_equal ".", a
-  a = "\xff"; a.succ!
-  assert_equal "\x01\x00", a
-  a = "-a"; a.succ!
-  assert_equal "-b", a
-  a = "-z"; a.succ!
-  assert_equal "-aa", a
-  a = "-a-a-"; a.succ!
-  assert_equal "-a-b-", a
-  a = "-a-"; a.succ!
-  assert_equal "-b-", a
-  a = "-z-"; a.succ!
-  assert_equal "-aa-", a
-  a = "あb"; a.succ!
-  assert_equal "あc", a
-  a = "あaz"; a.succ!
-  assert_equal "あba", a
-end
-
-assert('String#next') do
-  assert_equal "01", "00".next
-
-  a = "00"; a.next!
-  assert_equal "01", a
-end
-
-assert('String#insert') do
-  assert_equal "Xabcd", "abcd".insert(0, 'X')
-  assert_equal "abcXd", "abcd".insert(3, 'X')
-  assert_equal "abcdX", "abcd".insert(4, 'X')
-  assert_equal "abXcd", "abcd".insert(-3, 'X')
-  assert_equal "abcdX", "abcd".insert(-1, 'X')
-  assert_raise(IndexError) { "abcd".insert(5, 'X') }
-  assert_raise(IndexError) { "abcd".insert(-6, 'X') }
-
-  a = "abcd"
-  a.insert(0, 'X')
-  assert_equal "Xabcd", a
-end
-
-assert('String#prepend') do
-  a = "world"
-  assert_equal "hello world", a.prepend("hello ")
-  assert_equal "hello world", a
-end
-
-assert('String#ljust') do
-  assert_equal "hello", "hello".ljust(4)
-  assert_equal "hello               ", "hello".ljust(20)
-  assert_equal 20, "hello".ljust(20).length
-  assert_equal "hello123412341234123", "hello".ljust(20, '1234')
-  assert_equal "hello", "hello".ljust(-3)
-end
-
-assert('String#rjust') do
-  assert_equal "hello", "hello".rjust(4)
-  assert_equal "               hello", "hello".rjust(20)
-  assert_equal 20, "hello".rjust(20).length
-  assert_equal "123412341234123hello", "hello".rjust(20, '1234')
-  assert_equal "hello", "hello".rjust(-3)
-end
-
-if UTF8STRING
-  assert('String#ljust with UTF8') do
-    assert_equal "helloん              ", "helloん".ljust(20)
-    assert_equal "helloó                            ", "helloó".ljust(34)
-    assert_equal 34, "helloó".ljust(34).length
-    assert_equal "helloんんんんんんんんんんんんんん", "hello".ljust(19, 'ん')
-    assert_equal "helloんんんんんんんんんんんんんんん", "hello".ljust(20, 'ん')
-  end
-
-  assert('String#rjust with UTF8') do
-    assert_equal "              helloん", "helloん".rjust(20)
-    assert_equal "                            helloó", "helloó".rjust(34)
-    # assert_equal 34, "helloó".rjust(34).length
-    assert_equal "んんんんんんんんんんんんんんhello", "hello".rjust(19, 'ん')
-    assert_equal "んんんんんんんんんんんんんんんhello", "hello".rjust(20, 'ん')
-  end
-
-  assert('UTF8 byte counting') do
-    ret = '                                  '
-    ret[-6..-1] = "helloó"
-    assert_equal 34, ret.length
-  end
-end
-
-assert('String#ljust should not change string') do
-  a = "hello"
-  a.ljust(20)
-  assert_equal "hello", a
-end
-
-assert('String#rjust should not change string') do
-  a = "hello"
-  a.rjust(20)
-  assert_equal "hello", a
-end
-
-assert('String#ljust should raise on zero width padding') do
-  assert_raise(ArgumentError) { "foo".ljust(10, '') }
-end
-
-assert('String#rjust should raise on zero width padding') do
-  assert_raise(ArgumentError) { "foo".rjust(10, '') }
-end
-
-assert('String#upto') do
-  assert_equal %w(a8 a9 b0 b1 b2 b3 b4 b5 b6), "a8".upto("b6").to_a
-  assert_equal ["9", "10", "11"], "9".upto("11").to_a
-  assert_equal [], "25".upto("5").to_a
-  assert_equal ["07", "08", "09", "10", "11"], "07".upto("11").to_a
-
-if UTF8STRING
-  assert_equal ["あ", "ぃ", "い", "ぅ", "う", "ぇ", "え", "ぉ", "お"], "あ".upto("お").to_a
-end
-
-  assert_equal ["9", ":", ";", "<", "=", ">", "?", "@", "A"], "9".upto("A").to_a
-
-  a     = "aa"
-  start = "aa"
-  count = 0
-  assert_equal("aa", a.upto("zz") {|s|
-    assert_equal(start, s)
-    start.succ!
-    count += 1
-  })
-  assert_equal(676, count)
-
-  a     = "a"
-  start = "a"
-  count = 0
-  assert_equal("a", a.upto("a") {|s|
-    assert_equal(start, s)
-    start.succ!
-    count += 1
-  })
-  assert_equal(1, count)
-
-  a     = "a"
-  start = "a"
-  count = 0
-  assert_equal("a", a.upto("b", true) {|s|
-    assert_equal(start, s)
-    start.succ!
-    count += 1
-  })
-  assert_equal(1, count)
-
-  a     = "0"
-  start = "0"
-  count = 0
-  assert_equal("0", a.upto("0") {|s|
-    assert_equal(start, s)
-    start.succ!
-    count += 1
-  })
-  assert_equal(1, count)
-
-  a     = "0"
-  start = "0"
-  count = 0
-  assert_equal("0", a.upto("-1") {|s|
-    assert_equal(start, s)
-    start.succ!
-    count += 1
-  })
-  assert_equal(0, count)
-
-  a     = "-1"
-  start = "-1"
-  count = 0
-  assert_equal("-1", a.upto("-2") {|s|
-    assert_equal(start, s)
-    start.succ!
-    count += 1
-  })
-  assert_equal(2, count)
-
-  assert_raise(TypeError) { "a".upto(:c) {} }
-end
-
-assert('String#ord') do
-  got = "hello!".split('').map {|x| x.ord}
-  expect = [104, 101, 108, 108, 111, 33]
-  unless UTF8STRING
-    got << "\xff".ord
-    expect << 0xff
-  end
-  assert_equal expect, got
-end
-
-assert('String#ord(UTF-8)') do
-  got = "こんにちは世界!".split('').map {|x| x.ord}
-  expect = [0x3053,0x3093,0x306b,0x3061,0x306f,0x4e16,0x754c,0x21]
-  assert_equal expect, got
-end if UTF8STRING
-
-assert('String#chr') do
-  assert_equal "h", "hello!".chr
-end
-assert('String#chr(UTF-8)') do
-  assert_equal "こ", "こんにちは世界!".chr
-end if UTF8STRING
-
-assert('String#chars') do
-  expect = ["h", "e", "l", "l", "o", "!"]
-  assert_equal expect, "hello!".chars
-  s = ""
-  "hello!".chars do |x|
-    s += x
-  end
-  assert_equal "hello!", s
-end
-
-assert('String#chars(UTF-8)') do
-  expect = ['こ', 'ん', 'に', 'ち', 'は', '世', '界', '!']
-  assert_equal expect, "こんにちは世界!".chars
-  s = ""
-  "こんにちは世界!".chars do |x|
-    s += x
-  end
-  assert_equal "こんにちは世界!", s
-end if UTF8STRING
-
-assert('String#each_char') do
-  s = ""
-  "hello!".each_char do |x|
-    s += x
-  end
-  assert_equal "hello!", s
-end
-
-assert('String#each_char(UTF-8)') do
-  s = ""
-  "こんにちは世界!".each_char do |x|
-    s += x
-  end
-  assert_equal "こんにちは世界!", s
-end if UTF8STRING
-
-assert('String#codepoints') do
-  expect = [104, 101, 108, 108, 111, 33]
-  assert_equal expect, "hello!".codepoints
-  cp = []
-  "hello!".codepoints do |x|
-    cp << x
-  end
-  assert_equal expect, cp
-end
-
-assert('String#codepoints(UTF-8)') do
-  expect = [12371, 12435, 12395, 12385, 12399, 19990, 30028, 33]
-  assert_equal expect, "こんにちは世界!".codepoints
-  cp = []
-  "こんにちは世界!".codepoints do |x|
-    cp << x
-  end
-  assert_equal expect, cp
-end if UTF8STRING
-
-assert('String#each_codepoint') do
-  expect = [104, 101, 108, 108, 111, 33]
-  cp = []
-  "hello!".each_codepoint do |x|
-    cp << x
-  end
-  assert_equal expect, cp
-end
-
-assert('String#each_codepoint(UTF-8)') do
-  expect = [12371, 12435, 12395, 12385, 12399, 19990, 30028, 33]
-  cp = []
-  "こんにちは世界!".each_codepoint do |x|
-    cp << x
-  end
-  assert_equal expect, cp
-end if UTF8STRING
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-struct') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'standard Struct class'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrblib/struct.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrblib/struct.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrblib/struct.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/mrblib/struct.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-##
-# Struct
-#
-# ISO 15.2.18
-
-if Object.const_defined?(:Struct)
-  class Struct
-
-    ##
-    # Calls the given block for each element of +self+
-    # and pass the respective element.
-    #
-    # ISO 15.2.18.4.4
-    def each(&block)
-      self.class.members.each{|field|
-        block.call(self[field])
-      }
-      self
-    end
-
-    ##
-    # Calls the given block for each element of +self+
-    # and pass the name and value of the respectiev
-    # element.
-    #
-    # ISO 15.2.18.4.5
-    def each_pair(&block)
-      self.class.members.each{|field|
-        block.call(field.to_sym, self[field])
-      }
-      self
-    end
-
-    ##
-    # Calls the given block for each element of +self+
-    # and returns an array with all elements of which
-    # block is not false.
-    #
-    # ISO 15.2.18.4.7
-    def select(&block)
-      ary = []
-      self.class.members.each{|field|
-        val = self[field]
-        ary.push(val) if block.call(val)
-      }
-      ary
-    end
-
-    def _inspect
-      name = self.class.to_s
-      if name[0] == "#"
-        str = "#<struct "
-      else
-        str = "#<struct #{name} "
-      end
-      buf = []
-      self.each_pair do |k,v|
-        buf.push [k.to_s + "=" + v._inspect]
-      end
-      str + buf.join(", ") + ">"
-    end
-
-    ##
-    # call-seq:
-    #   struct.to_s      -> string
-    #   struct.inspect   -> string
-    #
-    # Describe the contents of this struct in a string.
-    #
-    # 15.2.18.4.10(x)
-    #
-    def inspect
-      begin
-        self._inspect
-      rescue SystemStackError
-        "#<struct #{self.class.to_s}:...>"
-      end
-    end
-
-    ##
-    # 15.2.18.4.11(x)
-    #
-    alias to_s inspect
-  end
-
-  ##
-  # call-seq:
-  #   hsh.dig(key,...)                 -> object
-  #
-  # Extracts the nested value specified by the sequence of <i>key</i>
-  # objects by calling +dig+ at each step, returning +nil+ if any
-  # intermediate step is +nil+.
-  #
-  def dig(idx,*args)
-    n = self[idx]
-    if args.size > 0
-      n&.dig(*args)
-    else
-      n
-    end
-  end
-end
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/src/struct.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/src/struct.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/src/struct.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/src/struct.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,714 +0,0 @@
-/*
-** struct.c - Struct class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <string.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/string.h>
-#include <mruby/class.h>
-#include <mruby/variable.h>
-#include <mruby/hash.h>
-#include <mruby/range.h>
-
-#define RSTRUCT_LEN(st) RARRAY_LEN(st)
-#define RSTRUCT_PTR(st) RARRAY_PTR(st)
-
-static struct RClass *
-struct_class(mrb_state *mrb)
-{
-  return mrb_class_get(mrb, "Struct");
-}
-
-static inline mrb_value
-struct_ivar_get(mrb_state *mrb, mrb_value c, mrb_sym id)
-{
-  struct RClass* kclass;
-  struct RClass* sclass = struct_class(mrb);
-  mrb_value ans;
-
-  for (;;) {
-    ans = mrb_iv_get(mrb, c, id);
-    if (!mrb_nil_p(ans)) return ans;
-    kclass = RCLASS_SUPER(c);
-    if (kclass == 0 || kclass == sclass)
-      return mrb_nil_value();
-    c = mrb_obj_value(kclass);
-  }
-}
-
-static mrb_value
-struct_s_members(mrb_state *mrb, struct RClass *klass)
-{
-  mrb_value members = struct_ivar_get(mrb, mrb_obj_value(klass), mrb_intern_lit(mrb, "__members__"));
-
-  if (mrb_nil_p(members)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "uninitialized struct");
-  }
-  if (!mrb_array_p(members)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
-  }
-  return members;
-}
-
-static mrb_value
-struct_members(mrb_state *mrb, mrb_value s)
-{
-  mrb_value members = struct_s_members(mrb, mrb_obj_class(mrb, s));
-  if (!mrb_array_p(s)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
-  }
-  if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) {
-    if (RSTRUCT_LEN(s) == 0) {  /* probably uninitialized */
-      mrb_ary_resize(mrb, s, RARRAY_LEN(members));
-    }
-    else {
-      mrb_raisef(mrb, E_TYPE_ERROR,
-                 "struct size differs (%S required %S given)",
-                 mrb_fixnum_value(RARRAY_LEN(members)), mrb_fixnum_value(RSTRUCT_LEN(s)));
-    }
-  }
-  return members;
-}
-
-static mrb_value
-mrb_struct_s_members_m(mrb_state *mrb, mrb_value klass)
-{
-  mrb_value members, ary;
-
-  members = struct_s_members(mrb, mrb_class_ptr(klass));
-  ary = mrb_ary_new_capa(mrb, RARRAY_LEN(members));
-  mrb_ary_replace(mrb, ary, members);
-  return ary;
-}
-
-static void
-mrb_struct_modify(mrb_state *mrb, mrb_value strct)
-{
-  if (MRB_FROZEN_P(mrb_basic_ptr(strct))) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "can't modify frozen struct");
-  }
-
-  mrb_write_barrier(mrb, mrb_basic_ptr(strct));
-}
-
-/* 15.2.18.4.6  */
-/*
- *  call-seq:
- *     struct.members    -> array
- *
- *  Returns an array of strings representing the names of the instance
- *  variables.
- *
- *     Customer = Struct.new(:name, :address, :zip)
- *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
- *     joe.members   #=> [:name, :address, :zip]
- */
-
-static mrb_value
-mrb_struct_members(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_struct_s_members_m(mrb, mrb_obj_value(mrb_obj_class(mrb, obj)));
-}
-
-static mrb_value struct_aref_sym(mrb_state *mrb, mrb_value obj, mrb_sym id);
-
-static mrb_value
-mrb_struct_ref(mrb_state *mrb, mrb_value obj)
-{
-  return struct_aref_sym(mrb, obj, mrb->c->ci->mid);
-}
-
-static mrb_sym
-mrb_id_attrset(mrb_state *mrb, mrb_sym id)
-{
-  const char *name;
-  char *buf;
-  mrb_int len;
-  mrb_sym mid;
-
-  name = mrb_sym2name_len(mrb, id, &len);
-  buf = (char *)mrb_malloc(mrb, (size_t)len+2);
-  memcpy(buf, name, (size_t)len);
-  buf[len] = '=';
-  buf[len+1] = '\0';
-
-  mid = mrb_intern(mrb, buf, len+1);
-  mrb_free(mrb, buf);
-  return mid;
-}
-
-static mrb_value mrb_struct_aset_sym(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val);
-
-static mrb_value
-mrb_struct_set_m(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value val;
-
-  const char *name;
-  mrb_int slen;
-  mrb_sym mid;
-
-  mrb_get_args(mrb, "o", &val);
-
-  /* get base id */
-  name = mrb_sym2name_len(mrb, mrb->c->ci->mid, &slen);
-  mid = mrb_intern(mrb, name, slen-1); /* omit last "=" */
-
-  return mrb_struct_aset_sym(mrb, obj, mid, val);
-}
-
-static mrb_bool
-is_local_id(mrb_state *mrb, const char *name)
-{
-  if (!name) return FALSE;
-  return !ISUPPER(name[0]);
-}
-
-static mrb_bool
-is_const_id(mrb_state *mrb, const char *name)
-{
-  if (!name) return FALSE;
-  return ISUPPER(name[0]);
-}
-
-static void
-make_struct_define_accessors(mrb_state *mrb, mrb_value members, struct RClass *c)
-{
-  const mrb_value *ptr_members = RARRAY_PTR(members);
-  mrb_int i;
-  mrb_int len = RARRAY_LEN(members);
-  int ai = mrb_gc_arena_save(mrb);
-
-  for (i=0; i<len; i++) {
-    mrb_sym id = mrb_symbol(ptr_members[i]);
-    const char *name = mrb_sym2name_len(mrb, id, NULL);
-
-    if (is_local_id(mrb, name) || is_const_id(mrb, name)) {
-      mrb_define_method_id(mrb, c, id, mrb_struct_ref, MRB_ARGS_NONE());
-      mrb_define_method_id(mrb, c, mrb_id_attrset(mrb, id), mrb_struct_set_m, MRB_ARGS_REQ(1));
-      mrb_gc_arena_restore(mrb, ai);
-    }
-  }
-}
-
-static mrb_value
-make_struct(mrb_state *mrb, mrb_value name, mrb_value members, struct RClass * klass)
-{
-  mrb_value nstr;
-  mrb_sym id;
-  struct RClass *c;
-
-  if (mrb_nil_p(name)) {
-    c = mrb_class_new(mrb, klass);
-  }
-  else {
-    /* old style: should we warn? */
-    name = mrb_str_to_str(mrb, name);
-    id = mrb_obj_to_sym(mrb, name);
-    if (!is_const_id(mrb, mrb_sym2name_len(mrb, id, NULL))) {
-      mrb_name_error(mrb, id, "identifier %S needs to be constant", name);
-    }
-    if (mrb_const_defined_at(mrb, mrb_obj_value(klass), id)) {
-      mrb_warn(mrb, "redefining constant Struct::%S", name);
-      mrb_const_remove(mrb, mrb_obj_value(klass), id);
-    }
-    c = mrb_define_class_under(mrb, klass, RSTRING_PTR(name), klass);
-  }
-  MRB_SET_INSTANCE_TT(c, MRB_TT_ARRAY);
-  nstr = mrb_obj_value(c);
-  mrb_iv_set(mrb, nstr, mrb_intern_lit(mrb, "__members__"), members);
-
-  mrb_define_class_method(mrb, c, "new", mrb_instance_new, MRB_ARGS_ANY());
-  mrb_define_class_method(mrb, c, "[]", mrb_instance_new, MRB_ARGS_ANY());
-  mrb_define_class_method(mrb, c, "members", mrb_struct_s_members_m, MRB_ARGS_NONE());
-  /* RSTRUCT(nstr)->basic.c->super = c->c; */
-  make_struct_define_accessors(mrb, members, c);
-  return nstr;
-}
-
-/* 15.2.18.3.1  */
-/*
- *  call-seq:
- *     Struct.new( [aString] [, aSym]+> )    -> StructClass
- *     StructClass.new(arg, ...)             -> obj
- *     StructClass[arg, ...]                 -> obj
- *
- *  Creates a new class, named by <i>aString</i>, containing accessor
- *  methods for the given symbols. If the name <i>aString</i> is
- *  omitted, an anonymous structure class will be created. Otherwise,
- *  the name of this struct will appear as a constant in class
- *  <code>Struct</code>, so it must be unique for all
- *  <code>Struct</code>s in the system and should start with a capital
- *  letter. Assigning a structure class to a constant effectively gives
- *  the class the name of the constant.
- *
- *  <code>Struct::new</code> returns a new <code>Class</code> object,
- *  which can then be used to create specific instances of the new
- *  structure. The number of actual parameters must be
- *  less than or equal to the number of attributes defined for this
- *  class; unset parameters default to <code>nil</code>.  Passing too many
- *  parameters will raise an <code>ArgumentError</code>.
- *
- *  The remaining methods listed in this section (class and instance)
- *  are defined for this generated class.
- *
- *     # Create a structure with a name in Struct
- *     Struct.new("Customer", :name, :address)    #=> Struct::Customer
- *     Struct::Customer.new("Dave", "123 Main")   #=> #<struct Struct::Customer name="Dave", address="123 Main">
- *
- *     # Create a structure named by its constant
- *     Customer = Struct.new(:name, :address)     #=> Customer
- *     Customer.new("Dave", "123 Main")           #=> #<struct Customer name="Dave", address="123 Main">
- */
-static mrb_value
-mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
-{
-  mrb_value name, rest;
-  mrb_value *pargv;
-  mrb_int argcnt;
-  mrb_int i;
-  mrb_value b, st;
-  mrb_sym id;
-  mrb_value *argv;
-  mrb_int argc;
-
-  name = mrb_nil_value();
-  mrb_get_args(mrb, "*&", &argv, &argc, &b);
-  if (argc == 0) { /* special case to avoid crash */
-    rest = mrb_ary_new(mrb);
-  }
-  else {
-    if (argc > 0) name = argv[0];
-    pargv = &argv[1];
-    argcnt = argc-1;
-    if (!mrb_nil_p(name) && mrb_symbol_p(name)) {
-      /* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */
-      name = mrb_nil_value();
-      pargv = &argv[0];
-      argcnt++;
-    }
-    rest = mrb_ary_new_from_values(mrb, argcnt, pargv);
-    for (i=0; i<RARRAY_LEN(rest); i++) {
-      id = mrb_obj_to_sym(mrb, RARRAY_PTR(rest)[i]);
-      mrb_ary_set(mrb, rest, i, mrb_symbol_value(id));
-    }
-  }
-  st = make_struct(mrb, name, rest, mrb_class_ptr(klass));
-  if (!mrb_nil_p(b)) {
-    mrb_yield_with_class(mrb, b, 1, &st, st, mrb_class_ptr(st));
-  }
-
-  return st;
-}
-
-static mrb_int
-num_members(mrb_state *mrb, struct RClass *klass)
-{
-  mrb_value members;
-
-  members = struct_ivar_get(mrb, mrb_obj_value(klass), mrb_intern_lit(mrb, "__members__"));
-  if (!mrb_array_p(members)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "broken members");
-  }
-  return RARRAY_LEN(members);
-}
-
-/* 15.2.18.4.8  */
-/*
- */
-static mrb_value
-mrb_struct_initialize_withArg(mrb_state *mrb, mrb_int argc, mrb_value *argv, mrb_value self)
-{
-  struct RClass *klass = mrb_obj_class(mrb, self);
-  mrb_int i, n;
-
-  n = num_members(mrb, klass);
-  if (n < argc) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "struct size differs");
-  }
-
-  for (i = 0; i < argc; i++) {
-    mrb_ary_set(mrb, self, i, argv[i]);
-  }
-  for (i = argc; i < n; i++) {
-    mrb_ary_set(mrb, self, i, mrb_nil_value());
-  }
-  return self;
-}
-
-static mrb_value
-mrb_struct_initialize(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *argv;
-  mrb_int argc;
-
-  mrb_get_args(mrb, "*!", &argv, &argc);
-  return mrb_struct_initialize_withArg(mrb, argc, argv, self);
-}
-
-/* 15.2.18.4.9  */
-/* :nodoc: */
-static mrb_value
-mrb_struct_init_copy(mrb_state *mrb, mrb_value copy)
-{
-  mrb_value s;
-
-  mrb_get_args(mrb, "o", &s);
-
-  if (mrb_obj_equal(mrb, copy, s)) return copy;
-  if (!mrb_obj_is_instance_of(mrb, s, mrb_obj_class(mrb, copy))) {
-    mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
-  }
-  if (!mrb_array_p(s)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct");
-  }
-  mrb_ary_replace(mrb, copy, s);
-  return copy;
-}
-
-static mrb_value
-struct_aref_sym(mrb_state *mrb, mrb_value obj, mrb_sym id)
-{
-  mrb_value members, *ptr;
-  const mrb_value *ptr_members;
-  mrb_int i, len;
-
-  members = struct_members(mrb, obj);
-  ptr_members = RARRAY_PTR(members);
-  len = RARRAY_LEN(members);
-  ptr = RSTRUCT_PTR(obj);
-  for (i=0; i<len; i++) {
-    mrb_value slot = ptr_members[i];
-    if (mrb_symbol_p(slot) && mrb_symbol(slot) == id) {
-      return ptr[i];
-    }
-  }
-  mrb_raisef(mrb, E_INDEX_ERROR, "'%S' is not a struct member", mrb_sym2str(mrb, id));
-  return mrb_nil_value();       /* not reached */
-}
-
-static mrb_value
-struct_aref_int(mrb_state *mrb, mrb_value s, mrb_int i)
-{
-  if (i < 0) i = RSTRUCT_LEN(s) + i;
-  if (i < 0)
-      mrb_raisef(mrb, E_INDEX_ERROR,
-                 "offset %S too small for struct(size:%S)",
-                 mrb_fixnum_value(i), mrb_fixnum_value(RSTRUCT_LEN(s)));
-  if (RSTRUCT_LEN(s) <= i)
-    mrb_raisef(mrb, E_INDEX_ERROR,
-               "offset %S too large for struct(size:%S)",
-               mrb_fixnum_value(i), mrb_fixnum_value(RSTRUCT_LEN(s)));
-  return RSTRUCT_PTR(s)[i];
-}
-
-/* 15.2.18.4.2  */
-/*
- *  call-seq:
- *     struct[symbol]    -> anObject
- *     struct[fixnum]    -> anObject
- *
- *  Attribute Reference---Returns the value of the instance variable
- *  named by <i>symbol</i>, or indexed (0..length-1) by
- *  <i>fixnum</i>. Will raise <code>NameError</code> if the named
- *  variable does not exist, or <code>IndexError</code> if the index is
- *  out of range.
- *
- *     Customer = Struct.new(:name, :address, :zip)
- *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
- *
- *     joe["name"]   #=> "Joe Smith"
- *     joe[:name]    #=> "Joe Smith"
- *     joe[0]        #=> "Joe Smith"
- */
-static mrb_value
-mrb_struct_aref(mrb_state *mrb, mrb_value s)
-{
-  mrb_value idx;
-
-  mrb_get_args(mrb, "o", &idx);
-  if (mrb_string_p(idx)) {
-    mrb_value sym = mrb_check_intern_str(mrb, idx);
-
-    if (mrb_nil_p(sym)) {
-      mrb_name_error(mrb, mrb_intern_str(mrb, idx), "no member '%S' in struct", idx);
-    }
-    idx = sym;
-  }
-  if (mrb_symbol_p(idx)) {
-    return struct_aref_sym(mrb, s, mrb_symbol(idx));
-  }
-  return struct_aref_int(mrb, s, mrb_int(mrb, idx));
-}
-
-static mrb_value
-mrb_struct_aset_sym(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val)
-{
-  mrb_value members, *ptr;
-  const mrb_value *ptr_members;
-  mrb_int i, len;
-
-  members = struct_members(mrb, s);
-  len = RARRAY_LEN(members);
-  ptr = RSTRUCT_PTR(s);
-  ptr_members = RARRAY_PTR(members);
-  for (i=0; i<len; i++) {
-    if (mrb_symbol(ptr_members[i]) == id) {
-      mrb_struct_modify(mrb, s);
-      ptr[i] = val;
-      return val;
-    }
-  }
-  mrb_name_error(mrb, id, "no member '%S' in struct", mrb_sym2str(mrb, id));
-  return val;                   /* not reach */
-}
-
-/* 15.2.18.4.3  */
-/*
- *  call-seq:
- *     struct[symbol] = obj    -> obj
- *     struct[fixnum] = obj    -> obj
- *
- *  Attribute Assignment---Assigns to the instance variable named by
- *  <i>symbol</i> or <i>fixnum</i> the value <i>obj</i> and
- *  returns it. Will raise a <code>NameError</code> if the named
- *  variable does not exist, or an <code>IndexError</code> if the index
- *  is out of range.
- *
- *     Customer = Struct.new(:name, :address, :zip)
- *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
- *
- *     joe["name"] = "Luke"
- *     joe[:zip]   = "90210"
- *
- *     joe.name   #=> "Luke"
- *     joe.zip    #=> "90210"
- */
-
-static mrb_value
-mrb_struct_aset(mrb_state *mrb, mrb_value s)
-{
-  mrb_int i;
-  mrb_value idx;
-  mrb_value val;
-
-  mrb_get_args(mrb, "oo", &idx, &val);
-
-  if (mrb_string_p(idx)) {
-    mrb_value sym = mrb_check_intern_str(mrb, idx);
-
-    if (mrb_nil_p(sym)) {
-      mrb_name_error(mrb, mrb_intern_str(mrb, idx), "no member '%S' in struct", idx);
-    }
-    idx = sym;
-  }
-  if (mrb_symbol_p(idx)) {
-    return mrb_struct_aset_sym(mrb, s, mrb_symbol(idx), val);
-  }
-
-  i = mrb_int(mrb, idx);
-  if (i < 0) i = RSTRUCT_LEN(s) + i;
-  if (i < 0) {
-    mrb_raisef(mrb, E_INDEX_ERROR,
-               "offset %S too small for struct(size:%S)",
-               mrb_fixnum_value(i), mrb_fixnum_value(RSTRUCT_LEN(s)));
-  }
-  if (RSTRUCT_LEN(s) <= i) {
-    mrb_raisef(mrb, E_INDEX_ERROR,
-               "offset %S too large for struct(size:%S)",
-               mrb_fixnum_value(i), mrb_fixnum_value(RSTRUCT_LEN(s)));
-  }
-  mrb_struct_modify(mrb, s);
-  return RSTRUCT_PTR(s)[i] = val;
-}
-
-/* 15.2.18.4.1  */
-/*
- *  call-seq:
- *     struct == other_struct     -> true or false
- *
- *  Equality---Returns <code>true</code> if <i>other_struct</i> is
- *  equal to this one: they must be of the same class as generated by
- *  <code>Struct::new</code>, and the values of all instance variables
- *  must be equal (according to <code>Object#==</code>).
- *
- *     Customer = Struct.new(:name, :address, :zip)
- *     joe   = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
- *     joejr = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
- *     jane  = Customer.new("Jane Doe", "456 Elm, Anytown NC", 12345)
- *     joe == joejr   #=> true
- *     joe == jane    #=> false
- */
-
-static mrb_value
-mrb_struct_equal(mrb_state *mrb, mrb_value s)
-{
-  mrb_value s2;
-  mrb_value *ptr, *ptr2;
-  mrb_int i, len;
-
-  mrb_get_args(mrb, "o", &s2);
-  if (mrb_obj_equal(mrb, s, s2)) {
-    return mrb_true_value();
-  }
-  if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
-    return mrb_false_value();
-  }
-  if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
-    mrb_bug(mrb, "inconsistent struct"); /* should never happen */
-  }
-  ptr = RSTRUCT_PTR(s);
-  ptr2 = RSTRUCT_PTR(s2);
-  len = RSTRUCT_LEN(s);
-  for (i=0; i<len; i++) {
-    if (!mrb_equal(mrb, ptr[i], ptr2[i])) {
-      return mrb_false_value();
-    }
-  }
-
-  return mrb_true_value();
-}
-
-/* 15.2.18.4.12(x)  */
-/*
- * code-seq:
- *   struct.eql?(other)   -> true or false
- *
- * Two structures are equal if they are the same object, or if all their
- * fields are equal (using <code>eql?</code>).
- */
-static mrb_value
-mrb_struct_eql(mrb_state *mrb, mrb_value s)
-{
-  mrb_value s2;
-  mrb_value *ptr, *ptr2;
-  mrb_int i, len;
-
-  mrb_get_args(mrb, "o", &s2);
-  if (mrb_obj_equal(mrb, s, s2)) {
-    return mrb_true_value();
-  }
-  if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
-    return mrb_false_value();
-  }
-  if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
-    mrb_bug(mrb, "inconsistent struct"); /* should never happen */
-  }
-  ptr = RSTRUCT_PTR(s);
-  ptr2 = RSTRUCT_PTR(s2);
-  len = RSTRUCT_LEN(s);
-  for (i=0; i<len; i++) {
-    if (!mrb_eql(mrb, ptr[i], ptr2[i])) {
-      return mrb_false_value();
-    }
-  }
-
-  return mrb_true_value();
-}
-
-/*
- * call-seq:
- *    struct.length   -> Fixnum
- *    struct.size     -> Fixnum
- *
- * Returns number of struct members.
- */
-static mrb_value
-mrb_struct_len(mrb_state *mrb, mrb_value self)
-{
-  return mrb_fixnum_value(RSTRUCT_LEN(self));
-}
-
-/*
- * call-seq:
- *    struct.to_a    -> array
- *    struct.values  -> array
- *
- * Create an array from struct values.
- */
-static mrb_value
-mrb_struct_to_a(mrb_state *mrb, mrb_value self)
-{
-  return mrb_ary_new_from_values(mrb, RSTRUCT_LEN(self), RSTRUCT_PTR(self));
-}
-
-/*
- * call-seq:
- *    struct.to_h -> hash
- *
- * Create a hash from member names and struct values.
- */
-static mrb_value
-mrb_struct_to_h(mrb_state *mrb, mrb_value self)
-{
-  mrb_value members, ret;
-  mrb_int i;
-
-  members = struct_members(mrb, self);
-  ret = mrb_hash_new_capa(mrb, RARRAY_LEN(members));
-
-  for (i = 0; i < RARRAY_LEN(members); ++i) {
-    mrb_hash_set(mrb, ret, RARRAY_PTR(members)[i], RSTRUCT_PTR(self)[i]);
-  }
-
-  return ret;
-}
-
-static mrb_value
-mrb_struct_values_at(mrb_state *mrb, mrb_value self)
-{
-  mrb_int argc;
-  mrb_value *argv;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-
-  return mrb_get_values_at(mrb, self, RSTRUCT_LEN(self), argc, argv, struct_aref_int);
-}
-
-/*
- *  A <code>Struct</code> is a convenient way to bundle a number of
- *  attributes together, using accessor methods, without having to write
- *  an explicit class.
- *
- *  The <code>Struct</code> class is a generator of specific classes,
- *  each one of which is defined to hold a set of variables and their
- *  accessors. In these examples, we'll call the generated class
- *  "<i>Customer</i>Class," and we'll show an example instance of that
- *  class as "<i>Customer</i>Inst."
- *
- *  In the descriptions that follow, the parameter <i>symbol</i> refers
- *  to a symbol, which is either a quoted string or a
- *  <code>Symbol</code> (such as <code>:name</code>).
- */
-void
-mrb_mruby_struct_gem_init(mrb_state* mrb)
-{
-  struct RClass *st;
-  st = mrb_define_class(mrb, "Struct",  mrb->object_class);
-  MRB_SET_INSTANCE_TT(st, MRB_TT_ARRAY);
-
-  mrb_define_class_method(mrb, st, "new",             mrb_struct_s_def,       MRB_ARGS_ANY());  /* 15.2.18.3.1  */
-
-  mrb_define_method(mrb, st,       "==",              mrb_struct_equal,       MRB_ARGS_REQ(1)); /* 15.2.18.4.1  */
-  mrb_define_method(mrb, st,       "[]",              mrb_struct_aref,        MRB_ARGS_REQ(1)); /* 15.2.18.4.2  */
-  mrb_define_method(mrb, st,       "[]=",             mrb_struct_aset,        MRB_ARGS_REQ(2)); /* 15.2.18.4.3  */
-  mrb_define_method(mrb, st,       "members",         mrb_struct_members,     MRB_ARGS_NONE()); /* 15.2.18.4.6  */
-  mrb_define_method(mrb, st,       "initialize",      mrb_struct_initialize,  MRB_ARGS_ANY());  /* 15.2.18.4.8  */
-  mrb_define_method(mrb, st,       "initialize_copy", mrb_struct_init_copy,   MRB_ARGS_REQ(1)); /* 15.2.18.4.9  */
-  mrb_define_method(mrb, st,       "eql?",            mrb_struct_eql,         MRB_ARGS_REQ(1)); /* 15.2.18.4.12(x)  */
-
-  mrb_define_method(mrb, st,        "size",           mrb_struct_len,         MRB_ARGS_NONE());
-  mrb_define_method(mrb, st,        "length",         mrb_struct_len,         MRB_ARGS_NONE());
-  mrb_define_method(mrb, st,        "to_a",           mrb_struct_to_a,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, st,        "values",         mrb_struct_to_a,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, st,        "to_h",           mrb_struct_to_h,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, st,        "values_at",      mrb_struct_values_at,   MRB_ARGS_ANY());
-}
-
-void
-mrb_mruby_struct_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/test/struct.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/test/struct.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/test/struct.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-struct/test/struct.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-##
-# Struct ISO Test
-
-assert('Struct', '15.2.18') do
-  assert_equal Class, Struct.class
-end
-
-assert('Struct.new', '15.2.18.3.1') do
-  c = Struct.new(:m1, :m2)
-  assert_equal Struct, c.superclass
-  assert_equal [:m1, :m2], c.members
-end
-
-# Check crash bug with Struc.new and no params.
-assert('Struct.new', '15.2.18.3.1') do
-  c = Struct.new()
-  assert_equal Struct, c.superclass
-  assert_equal [], c.members
-end
-
-assert('Struct#==', '15.2.18.4.1') do
-  c = Struct.new(:m1, :m2)
-  cc1 = c.new(1,2)
-  cc2 = c.new(1,2)
-  assert_true cc1 == cc2
-
-  Struct.new(:m1, :m2) { def foo; end }
-  assert_raise(NoMethodError) { Struct.new(:m1).new.foo }
-end
-
-assert('Struct#[]', '15.2.18.4.2') do
-  c = Struct.new(:m1, :m2)
-  cc = c.new(1,2)
-  assert_equal 1, cc[:m1]
-  assert_equal 2, cc["m2"]
-  assert_equal 1, cc[0]
-  assert_equal 2, cc[-1]
-  assert_raise(TypeError) { cc[[]] }
-  assert_raise(IndexError) { cc[2] }
-  assert_raise(NameError) { cc['tama'] }
-end
-
-assert('Struct#[]=', '15.2.18.4.3') do
-  c = Struct.new(:m1, :m2)
-  cc = c.new(1,2)
-  cc[:m1] = 3
-  assert_equal 3, cc[:m1]
-  cc["m2"] = 3
-  assert_equal 3, cc["m2"]
-  cc[0] = 4
-  assert_equal 4, cc[0]
-  cc[-1] = 5
-  assert_equal 5, cc[-1]
-  assert_raise(TypeError) { cc[[]] = 3 }
-  assert_raise(IndexError) { cc[2] = 7 }
-  assert_raise(NameError) { cc['pochi'] = 8 }
-end
-
-assert('Struct#each', '15.2.18.4.4') do
-  c = Struct.new(:m1, :m2)
-  cc = c.new(1,2)
-  a = []
-  cc.each{|x|
-    a << x
-  }
-  assert_equal [1, 2], a
-end
-
-assert('Struct#each_pair', '15.2.18.4.5') do
-  c = Struct.new(:m1, :m2)
-  cc = c.new(1,2)
-  a = []
-  cc.each_pair{|k,v|
-    a << [k,v]
-  }
-  assert_equal [[:m1, 1], [:m2, 2]], a
-end
-
-assert('Struct#members', '15.2.18.4.6') do
-  c = Struct.new(:m1, :m2)
-  assert_equal [:m1, :m2], c.new(1,2).members
-end
-
-assert('Struct#select', '15.2.18.4.7') do
-  c = Struct.new(:m1, :m2)
-  assert_equal([2]) { c.new(1,2).select{|v| v % 2 == 0} }
-end
-
-assert('large struct') do
-  c = Struct.new(:m1, :m2, :m3, :m4, :m5, :m6, :m7, :m8, :m9, :m10, :m11, :m12, :m13)
-  cc = c.new(1,2,3,4,5,6,7,8,9,10,11,12,13)
-  assert_equal 1, cc.m1
-  assert_equal 2, cc.m2
-  assert_equal 3, cc.m3
-  assert_equal 4, cc.m4
-  assert_equal 5, cc.m5
-  assert_equal 6, cc.m6
-  assert_equal 7, cc.m7
-  assert_equal 8, cc.m8
-  assert_equal 9, cc.m9
-  assert_equal 10, cc.m10
-  assert_equal 13, cc.m13
-
-  cc.m13 = 'test'
-  assert_equal 'test', cc.m13
-
-  assert_raise(NoMethodError) { cc.m14 }
-end
-
-assert('wrong struct arg count') do
-  c = Struct.new(:m1)
-  assert_raise ArgumentError do
-    cc = c.new(1,2,3)
-  end
-end
-
-assert('struct dup') do
-  c = Struct.new(:m1, :m2, :m3, :m4, :m5)
-  cc = c.new(1,2,3,4,5)
-  assert_nothing_raised {
-    assert_equal(cc, cc.dup)
-  }
-end
-
-assert('struct inspect') do
-  c = Struct.new(:m1, :m2, :m3, :m4, :m5)
-  cc = c.new(1,2,3,4,5)
-  assert_equal "#<struct m1=1, m2=2, m3=3, m4=4, m5=5>", cc.inspect
-end
-
-assert('Struct#length, Struct#size') do
-  s = Struct.new(:f1, :f2).new(0, 1)
-  assert_equal 2, s.size
-  assert_equal 2, s.length
-end
-
-assert('Struct#to_a, Struct#values') do
-  s = Struct.new(:mem1, :mem2).new('a', 'b')
-  assert_equal ['a', 'b'], s.to_a
-  assert_equal ['a', 'b'], s.values
-end
-
-assert('Struct#to_h') do
-  s = Struct.new(:white, :red, :green).new('ruuko', 'yuzuki', 'hitoe')
-  assert_equal(:white => 'ruuko', :red => 'yuzuki', :green => 'hitoe') { s.to_h }
-end
-
-assert('Struct#values_at') do
-  a = Struct.new(:blue, :purple).new('aki', 'io')
-  assert_equal ['aki'], a.values_at(0)
-  assert_equal ['io', 'aki'], a.values_at(1, 0)
-  assert_raise(IndexError) { a.values_at 2 }
-end
-
-assert("Struct#dig") do
-  a = Struct.new(:blue, :purple).new('aki', Struct.new(:red).new(1))
-  assert_equal 'aki', a.dig(:blue)
-  assert_equal 1, a.dig(:purple, :red)
-  assert_equal 1, a.dig(1, 0)
-end
-
-assert("Struct.new removes existing constant") do
-  skip "redefining Struct with same name cause warnings"
-  begin
-    assert_not_equal Struct.new("Test", :a), Struct.new("Test", :a, :b)
-  ensure
-    Struct.remove_const :Test
-  end
-end
-
-assert("Struct#initialize_copy requires struct to be the same type") do
-  begin
-    Struct.new("Test", :a)
-    a = Struct::Test.new("a")
-    Struct.remove_const :Test
-    Struct.new("Test", :a, :b)
-    assert_raise(TypeError) do
-      a.initialize_copy(Struct::Test.new("a", "b"))
-    end
-  ensure
-    Struct.remove_const :Test
-  end
-end
-
-assert("Struct.new does not allow array") do
-  assert_raise(TypeError) do
-    Struct.new("Test", [:a])
-  end
-end
-
-assert("Struct.new generates subclass of Struct") do
-  begin
-    original_struct = Struct
-    Struct = String
-    assert_equal original_struct, original_struct.new.superclass
-  ensure
-    Struct = original_struct
-  end
-end
-
-assert 'Struct#freeze' do
-  c = Struct.new :m
-
-  o = c.new
-  o.m = :test
-  assert_equal :test, o.m
-
-  o.freeze
-  assert_raise(RuntimeError) { o.m = :modify }
-  assert_raise(RuntimeError) { o[:m] = :modify }
-  assert_equal :test, o.m
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-symbol-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'Symbol class extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/mrblib/symbol.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-class Symbol
-  include Comparable
-
-  alias intern to_sym
-
-  def to_proc
-    ->(obj,*args,&block) do
-      obj.__send__(self, *args, &block)
-    end
-  end
-
-  ##
-  # call-seq:
-  #   sym.capitalize  -> symbol
-  #
-  # Same as <code>sym.to_s.capitalize.intern</code>.
-
-  def capitalize
-    (self.to_s.capitalize! || self).to_sym
-  end
-
-  ##
-  # call-seq:
-  #   sym.downcase  -> symbol
-  #
-  # Same as <code>sym.to_s.downcase.intern</code>.
-
-  def downcase
-    (self.to_s.downcase! || self).to_sym
-  end
-
-  ##
-  # call-seq:
-  #   sym.upcase    -> symbol
-  #
-  # Same as <code>sym.to_s.upcase.intern</code>.
-
-  def upcase
-    (self.to_s.upcase! || self).to_sym
-  end
-
-  ##
-  # call-seq:
-  #   sym.casecmp(other)  -> -1, 0, +1 or nil
-  #
-  # Case-insensitive version of <code>Symbol#<=></code>.
-
-  def casecmp(other)
-    return nil unless other.kind_of?(Symbol)
-    lhs =  self.to_s; lhs.upcase!
-    rhs = other.to_s; rhs.upcase!
-    lhs <=> rhs
-  end
-
-  #
-  # call-seq:
-  #   sym.empty?   -> true or false
-  #
-  # Returns that _sym_ is :"" or not.
-
-  def empty?
-    self.length == 0
-  end
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/src/symbol.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/src/symbol.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/src/symbol.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/src/symbol.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-#include <mruby.h>
-#include <mruby/khash.h>
-#include <mruby/array.h>
-
-typedef struct symbol_name {
-  size_t len;
-  const char *name;
-} symbol_name;
-
-/*
- *  call-seq:
- *     Symbol.all_symbols    => array
- *
- *  Returns an array of all the symbols currently in Ruby's symbol
- *  table.
- *
- *     Symbol.all_symbols.size    #=> 903
- *     Symbol.all_symbols[1,20]   #=> [:floor, :ARGV, :Binding, :symlink,
- *                                     :chown, :EOFError, :$;, :String,
- *                                     :LOCK_SH, :"setuid?", :$<,
- *                                     :default_proc, :compact, :extend,
- *                                     :Tms, :getwd, :$=, :ThreadGroup,
- *                                     :wait2, :$>]
- */
-static mrb_value
-mrb_sym_all_symbols(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym i, lim;
-  mrb_value ary = mrb_ary_new_capa(mrb, mrb->symidx);
-
-  for (i=1, lim=mrb->symidx+1; i<lim; i++) {
-    mrb_ary_push(mrb, ary, mrb_symbol_value(i));
-  }
-
-  return ary;
-}
-
-/*
- * call-seq:
- *   sym.length    -> integer
- *
- * Same as <code>sym.to_s.length</code>.
- */
-static mrb_value
-mrb_sym_length(mrb_state *mrb, mrb_value self)
-{
-  mrb_int len;
-  mrb_sym2name_len(mrb, mrb_symbol(self), &len);
-  return mrb_fixnum_value(len);
-}
-
-void
-mrb_mruby_symbol_ext_gem_init(mrb_state* mrb)
-{
-  struct RClass *s = mrb->symbol_class;
-  mrb_define_class_method(mrb, s, "all_symbols", mrb_sym_all_symbols, MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "length", mrb_sym_length, MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "size", mrb_sym_length, MRB_ARGS_NONE());
-}
-
-void
-mrb_mruby_symbol_ext_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-symbol-ext/test/symbol.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-##
-# Symbol(Ext) Test
-
-assert('Symbol#to_proc') do
-  assert_equal 5, :abs.to_proc[-5]
-end
-
-assert('Symbol.all_symbols') do
-  foo = [:__symbol_test_1, :__symbol_test_2, :__symbol_test_3].sort
-  symbols = Symbol.all_symbols.select{|sym|sym.to_s.include? '__symbol_test'}.sort
-  assert_equal foo, symbols
-end
-
-assert("Symbol#length") do
-  assert_equal 5, :hello.size
-  assert_equal 5, :mruby.length
-end
-
-assert("Symbol#capitalize") do
-  assert_equal :Hello, :hello.capitalize
-  assert_equal :Hello, :HELLO.capitalize
-  assert_equal :Hello, :Hello.capitalize
-end
-
-assert("Symbol#downcase") do
-  assert_equal :hello, :hEllO.downcase
-  assert_equal :hello, :hello.downcase
-end
-
-assert("Symbol#upcase") do
-  assert_equal :HELLO, :hEllO.upcase
-  assert_equal :HELLO, :HELLO.upcase
-end
-
-assert("Symbol#casecmp") do
-  assert_equal 0, :HELLO.casecmp(:hEllO)
-  assert_equal 1, :HELLO.casecmp(:hEllN)
-  assert_equal(-1, :HELLO.casecmp(:hEllP))
-  assert_nil :HELLO.casecmp("hEllO")
-end
-
-assert("Symbol#empty?") do
-  assert_true :''.empty?
-end
-
-assert('Symbol#intern') do
-  assert_equal :test, :test.intern
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/driver.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/driver.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/driver.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/driver.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-/*
-** mrbtest - Test for Embeddable Ruby
-**
-** This program runs Ruby test programs in test/t directory
-** against the current mruby implementation.
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <mruby.h>
-#include <mruby/proc.h>
-#include <mruby/data.h>
-#include <mruby/compile.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/array.h>
-
-void
-mrb_init_mrbtest(mrb_state *);
-
-/* Print a short remark for the user */
-static void
-print_hint(void)
-{
-  printf("mrbtest - Embeddable Ruby Test\n\n");
-}
-
-static int
-check_error(mrb_state *mrb)
-{
-  /* Error check */
-  /* $ko_test and $kill_test should be 0 */
-  mrb_value ko_test = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$ko_test"));
-  mrb_value kill_test = mrb_gv_get(mrb, mrb_intern_lit(mrb, "$kill_test"));
-
-  return mrb_fixnum_p(ko_test) && mrb_fixnum(ko_test) == 0 && mrb_fixnum_p(kill_test) && mrb_fixnum(kill_test) == 0;
-}
-
-static int
-eval_test(mrb_state *mrb)
-{
-  /* evaluate the test */
-  mrb_funcall(mrb, mrb_top_self(mrb), "report", 0);
-  /* did an exception occur? */
-  if (mrb->exc) {
-    mrb_print_error(mrb);
-    mrb->exc = 0;
-    return EXIT_FAILURE;
-  }
-  else if (!check_error(mrb)) {
-    return EXIT_FAILURE;
-  }
-  return EXIT_SUCCESS;
-}
-
-static void
-t_printstr(mrb_state *mrb, mrb_value obj)
-{
-  char *s;
-  int len;
-
-  if (mrb_string_p(obj)) {
-    s = RSTRING_PTR(obj);
-    len = RSTRING_LEN(obj);
-    fwrite(s, len, 1, stdout);
-  }
-}
-
-mrb_value
-mrb_t_printstr(mrb_state *mrb, mrb_value self)
-{
-  mrb_value argv;
-
-  mrb_get_args(mrb, "o", &argv);
-  t_printstr(mrb, argv);
-
-  return argv;
-}
-
-void
-mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose)
-{
-  struct RClass *krn, *mrbtest;
-
-  krn = mrb->kernel_module;
-  mrb_define_method(mrb, krn, "__t_printstr__", mrb_t_printstr, MRB_ARGS_REQ(1));
-
-  mrbtest = mrb_define_module(mrb, "Mrbtest");
-
-  mrb_define_const(mrb, mrbtest, "FIXNUM_MAX", mrb_fixnum_value(MRB_INT_MAX));
-  mrb_define_const(mrb, mrbtest, "FIXNUM_MIN", mrb_fixnum_value(MRB_INT_MIN));
-  mrb_define_const(mrb, mrbtest, "FIXNUM_BIT", mrb_fixnum_value(MRB_INT_BIT));
-
-#ifdef MRB_USE_FLOAT
-  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-6));
-#else
-  mrb_define_const(mrb, mrbtest, "FLOAT_TOLERANCE", mrb_float_value(mrb, 1e-12));
-#endif
-
-  if (verbose) {
-    mrb_gv_set(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"), mrb_true_value());
-  }
-}
-
-void
-mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src)
-{
-  mrb_value res_src;
-
-  if (mrb_src->exc) {
-    mrb_print_error(mrb_src);
-    exit(EXIT_FAILURE);
-  }
-
-#define TEST_COUNT_PASS(name)                                           \
-  do {                                                                  \
-    res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$" #name));  \
-    if (mrb_fixnum_p(res_src)) {                                        \
-      mrb_value res_dst = mrb_gv_get(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name)); \
-      mrb_gv_set(mrb_dst, mrb_intern_lit(mrb_dst, "$" #name), mrb_fixnum_value(mrb_fixnum(res_dst) + mrb_fixnum(res_src))); \
-    }                                                                   \
-  } while (FALSE)                                                       \
-
-  TEST_COUNT_PASS(ok_test);
-  TEST_COUNT_PASS(ko_test);
-  TEST_COUNT_PASS(kill_test);
-
-#undef TEST_COUNT_PASS
-
-  res_src = mrb_gv_get(mrb_src, mrb_intern_lit(mrb_src, "$asserts"));
-
-  if (mrb_array_p(res_src)) {
-    mrb_int i;
-    mrb_value res_dst = mrb_gv_get(mrb_dst, mrb_intern_lit(mrb_dst, "$asserts"));
-    for (i = 0; i < RARRAY_LEN(res_src); ++i) {
-      mrb_value val_src = RARRAY_PTR(res_src)[i];
-      mrb_ary_push(mrb_dst, res_dst, mrb_str_new(mrb_dst, RSTRING_PTR(val_src), RSTRING_LEN(val_src)));
-    }
-  }
-}
-
-int
-main(int argc, char **argv)
-{
-  mrb_state *mrb;
-  int ret;
-  mrb_bool verbose = FALSE;
-
-  print_hint();
-
-  /* new interpreter instance */
-  mrb = mrb_open();
-  if (mrb == NULL) {
-    fprintf(stderr, "Invalid mrb_state, exiting test driver");
-    return EXIT_FAILURE;
-  }
-
-  if (argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v') {
-    printf("verbose mode: enable\n\n");
-    verbose = TRUE;
-  }
-
-  mrb_init_test_driver(mrb, verbose);
-  mrb_init_mrbtest(mrb);
-  ret = eval_test(mrb);
-  mrb_close(mrb);
-
-  return ret;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/init_mrbtest.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/init_mrbtest.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/init_mrbtest.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/init_mrbtest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#include <stdlib.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-#include <mruby/variable.h>
-
-extern const uint8_t mrbtest_assert_irep[];
-
-void mrbgemtest_init(mrb_state* mrb);
-void mrb_init_test_driver(mrb_state* mrb, mrb_bool verbose);
-void mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src);
-
-void
-mrb_init_mrbtest(mrb_state *mrb)
-{
-  mrb_state *core_test;
-
-  mrb_load_irep(mrb, mrbtest_assert_irep);
-
-  core_test = mrb_open_core(mrb_default_allocf, NULL);
-  if (core_test == NULL) {
-    fprintf(stderr, "Invalid mrb_state, exiting %s", __FUNCTION__);
-    exit(EXIT_FAILURE);
-  }
-  mrb_init_test_driver(core_test, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));
-  mrb_load_irep(core_test, mrbtest_assert_irep);
-  mrb_t_pass_result(mrb, core_test);
-
-#ifndef DISABLE_GEMS
-  mrbgemtest_init(mrb);
-#endif
-
-  if (mrb->exc) {
-    mrb_print_error(mrb);
-    exit(EXIT_FAILURE);
-  }
-  mrb_close(core_test);
-}
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-MRuby::Gem::Specification.new('mruby-test') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mruby test'
-
-  build.bins << 'mrbtest'
-  spec.add_dependency('mruby-compiler', :core => 'mruby-compiler')
-
-  spec.test_rbfiles = Dir.glob("#{MRUBY_ROOT}/test/t/*.rb")
-
-  clib = "#{build_dir}/mrbtest.c"
-  mlib = clib.ext(exts.object)
-  exec = exefile("#{build.build_dir}/bin/mrbtest")
-
-  libmruby = libfile("#{build.build_dir}/lib/libmruby")
-  libmruby_core = libfile("#{build.build_dir}/lib/libmruby_core")
-
-  mrbtest_lib = libfile("#{build_dir}/mrbtest")
-  mrbtest_objs = []
-
-  driver_obj = objfile("#{build_dir}/driver")
-  driver = "#{spec.dir}/driver.c"
-
-  assert_c = "#{build_dir}/assert.c"
-  assert_rb = "#{MRUBY_ROOT}/test/assert.rb"
-  assert_lib = assert_c.ext(exts.object)
-  mrbtest_objs << assert_lib
-
-  file assert_lib => assert_c
-  file assert_c => assert_rb do |t|
-    open(t.name, 'w') do |f|
-      mrbc.run f, assert_rb, 'mrbtest_assert_irep'
-    end
-  end
-
-  gem_table = build.gems.generate_gem_table build
-
-  build.gems.each do |g|
-    test_rbobj = g.test_rbireps.ext(exts.object)
-    g.test_objs << test_rbobj
-    dep_list = build.gems.tsort_dependencies(g.test_dependencies, gem_table).select(&:generate_functions)
-
-    file test_rbobj => g.test_rbireps
-    file g.test_rbireps => [g.test_rbfiles].flatten do |t|
-      FileUtils.mkdir_p File.dirname(t.name)
-      open(t.name, 'w') do |f|
-        g.print_gem_test_header(f)
-        test_preload = g.test_preload and [g.dir, MRUBY_ROOT].map {|dir|
-          File.expand_path(g.test_preload, dir)
-        }.find {|file| File.exist?(file) }
-
-        f.puts %Q[/*]
-        f.puts %Q[ * This file contains a test code for #{g.name} gem.]
-        f.puts %Q[ *]
-        f.puts %Q[ * IMPORTANT:]
-        f.puts %Q[ *   This file was generated!]
-        f.puts %Q[ *   All manual changes will get lost.]
-        f.puts %Q[ */]
-        if test_preload.nil?
-          f.puts %Q[extern const uint8_t mrbtest_assert_irep[];]
-        else
-          g.build.mrbc.run f, test_preload, "gem_test_irep_#{g.funcname}_preload"
-        end
-        g.test_rbfiles.flatten.each_with_index do |rbfile, i|
-          g.build.mrbc.run f, rbfile, "gem_test_irep_#{g.funcname}_#{i}"
-        end
-        f.puts %Q[void mrb_#{g.funcname}_gem_test(mrb_state *mrb);] unless g.test_objs.empty?
-        dep_list.each do |d|
-          f.puts %Q[void GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb_state *mrb);]
-          f.puts %Q[void GENERATED_TMP_mrb_#{d.funcname}_gem_final(mrb_state *mrb);]
-        end
-        f.puts %Q[void mrb_init_test_driver(mrb_state *mrb, mrb_bool verbose);]
-        f.puts %Q[void mrb_t_pass_result(mrb_state *dst, mrb_state *src);]
-        f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb) {]
-        unless g.test_rbfiles.empty?
-          f.puts %Q[  mrb_state *mrb2;]
-          unless g.test_args.empty?
-            f.puts %Q[  mrb_value test_args_hash;]
-          end
-          f.puts %Q[  int ai;]
-          g.test_rbfiles.count.times do |i|
-            f.puts %Q[  ai = mrb_gc_arena_save(mrb);]
-            f.puts %Q[  mrb2 = mrb_open_core(mrb_default_allocf, NULL);]
-            f.puts %Q[  if (mrb2 == NULL) {]
-            f.puts %Q[    fprintf(stderr, "Invalid mrb_state, exiting \%s", __FUNCTION__);]
-            f.puts %Q[    exit(EXIT_FAILURE);]
-            f.puts %Q[  }]
-            dep_list.each do |d|
-              f.puts %Q[  GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb2);]
-              f.puts %Q[  mrb_state_atexit(mrb2, GENERATED_TMP_mrb_#{d.funcname}_gem_final);]
-            end
-            f.puts %Q[  mrb_init_test_driver(mrb2, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));]
-            if test_preload.nil?
-              f.puts %Q[  mrb_load_irep(mrb2, mrbtest_assert_irep);]
-            else
-              f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_preload);]
-            end
-            f.puts %Q[  if (mrb2->exc) {]
-            f.puts %Q[    mrb_print_error(mrb2);]
-            f.puts %Q[    exit(EXIT_FAILURE);]
-            f.puts %Q[  }]
-            f.puts %Q[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));]
-
-            unless g.test_args.empty?
-              f.puts %Q[  test_args_hash = mrb_hash_new_capa(mrb, #{g.test_args.length}); ]
-              g.test_args.each do |arg_name, arg_value|
-                escaped_arg_name = arg_name.gsub('\\', '\\\\\\\\').gsub('"', '\"')
-                escaped_arg_value = arg_value.gsub('\\', '\\\\\\\\').gsub('"', '\"')
-                f.puts %Q[  mrb_hash_set(mrb2, test_args_hash, mrb_str_new(mrb2, "#{escaped_arg_name.to_s}", #{escaped_arg_name.to_s.length}), mrb_str_new(mrb2, "#{escaped_arg_value.to_s}", #{escaped_arg_value.to_s.length})); ]
-              end
-              f.puts %Q[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "TEST_ARGS"), test_args_hash); ]
-            end
-
-            f.puts %Q[  mrb_#{g.funcname}_gem_test(mrb2);] if g.custom_test_init?
-
-            f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_#{i});]
-            f.puts %Q[  ]
-
-            f.puts %Q[  mrb_t_pass_result(mrb, mrb2);]
-            f.puts %Q[  mrb_close(mrb2);]
-            f.puts %Q[  mrb_gc_arena_restore(mrb, ai);]
-          end
-        end
-        f.puts %Q[}]
-      end
-    end
-  end
-
-  build.gems.each do |v|
-    mrbtest_objs.concat v.test_objs
-  end
-
-  file mrbtest_lib => mrbtest_objs do |t|
-    build.archiver.run t.name, t.prerequisites
-  end
-
-  unless build.build_mrbtest_lib_only?
-    file exec => [driver_obj, mlib, mrbtest_lib, libmruby_core, libmruby] do |t|
-      gem_flags = build.gems.map { |g| g.linker.flags }
-      gem_flags_before_libraries = build.gems.map { |g| g.linker.flags_before_libraries }
-      gem_flags_after_libraries = build.gems.map { |g| g.linker.flags_after_libraries }
-      gem_libraries = build.gems.map { |g| g.linker.libraries }
-      gem_library_paths = build.gems.map { |g| g.linker.library_paths }
-      build.linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries
-    end
-  end
-
-  init = "#{spec.dir}/init_mrbtest.c"
-
-  # store the last gem selection and make the re-build
-  # of the test gem depending on a change to the gem
-  # selection
-  active_gems = "#{build_dir}/active_gems.lst"
-  FileUtils.mkdir_p File.dirname(active_gems)
-  open(active_gems, 'w+') do |f|
-    build.gems.each do |g|
-      f.puts g.name
-    end
-  end
-  file clib => active_gems
-
-  file mlib => clib
-  file clib => init do |t|
-    _pp "GEN", "*.rb", "#{clib.relative_path}"
-    FileUtils.mkdir_p File.dirname(clib)
-    open(clib, 'w') do |f|
-      f.puts %Q[/*]
-      f.puts %Q[ * This file contains a list of all]
-      f.puts %Q[ * test functions.]
-      f.puts %Q[ *]
-      f.puts %Q[ * IMPORTANT:]
-      f.puts %Q[ *   This file was generated!]
-      f.puts %Q[ *   All manual changes will get lost.]
-      f.puts %Q[ */]
-      f.puts %Q[]
-      f.puts IO.read(init)
-      build.gems.each do |g|
-        f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb);]
-      end
-      f.puts %Q[void mrbgemtest_init(mrb_state* mrb) {]
-      build.gems.each do |g|
-        f.puts %Q[    GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb);]
-      end
-      f.puts %Q[}]
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-test/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-Running Tests
-=============
-
-To run the tests, execute the following from the project's root directory.
-
-    $ make test
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-time') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'standard Time class'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrblib/time.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrblib/time.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrblib/time.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/mrblib/time.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-class Time
-  def sunday?;  wday == 0 end
-  def monday?;  wday == 1 end
-  def tuesday?;  wday == 2 end
-  def wednesday?;  wday == 3 end
-  def thursday?;  wday == 4 end
-  def friday?;  wday == 5 end
-  def saturday?;  wday == 6 end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/src/time.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/src/time.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/src/time.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/src/time.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,869 +0,0 @@
-/*
-** time.c - Time class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <math.h>
-#include <time.h>
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/data.h>
-
-#ifndef DISABLE_STDIO
-#include <stdio.h>
-#else
-#include <string.h>
-#endif
-
-#define NDIV(x,y) (-(-((x)+1)/(y))-1)
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-double round(double x) {
-  return floor(x + 0.5);
-}
-#endif
-
-#if !defined(__MINGW64__) && defined(_WIN32)
-# define llround(x) round(x)
-#endif
-
-#if defined(__MINGW64__) || defined(__MINGW32__)
-# include <sys/time.h>
-#endif
-
-/** Time class configuration */
-
-/* gettimeofday(2) */
-/* C99 does not have gettimeofday that is required to retrieve microseconds */
-/* uncomment following macro on platforms without gettimeofday(2) */
-/* #define NO_GETTIMEOFDAY */
-
-/* gmtime(3) */
-/* C99 does not have reentrant gmtime_r() so it might cause troubles under */
-/* multi-threading environment.  undef following macro on platforms that */
-/* does not have gmtime_r() and localtime_r(). */
-/* #define NO_GMTIME_R */
-
-#ifdef _WIN32
-#if _MSC_VER
-/* Win32 platform do not provide gmtime_r/localtime_r; emulate them using gmtime_s/localtime_s */
-#define gmtime_r(tp, tm)    ((gmtime_s((tm), (tp)) == 0) ? (tm) : NULL)
-#define localtime_r(tp, tm)    ((localtime_s((tm), (tp)) == 0) ? (tm) : NULL)
-#else
-#define NO_GMTIME_R
-#endif
-#endif
-
-/* asctime(3) */
-/* mruby usually use its own implementation of struct tm to string conversion */
-/* except when DISABLE_STDIO is set. In that case, it uses asctime() or asctime_r(). */
-/* By default mruby tries to use asctime_r() which is reentrant. */
-/* Undef following macro on platforms that does not have asctime_r(). */
-/* #define NO_ASCTIME_R */
-
-/* timegm(3) */
-/* mktime() creates tm structure for localtime; timegm() is for UTC time */
-/* define following macro to use probably faster timegm() on the platform */
-/* #define USE_SYSTEM_TIMEGM */
-
-/** end of Time class configuration */
-
-#ifndef NO_GETTIMEOFDAY
-# ifdef _WIN32
-#  define WIN32_LEAN_AND_MEAN  /* don't include winsock.h */
-#  include <windows.h>
-#  define gettimeofday my_gettimeofday
-
-#  ifdef _MSC_VER
-#    define UI64(x) x##ui64
-#  else
-#    define UI64(x) x##ull
-#  endif
-
-typedef long suseconds_t;
-
-# if (!defined __MINGW64__) && (!defined __MINGW32__)
-struct timeval {
-  time_t tv_sec;
-  suseconds_t tv_usec;
-};
-# endif
-
-static int
-gettimeofday(struct timeval *tv, void *tz)
-{
-  if (tz) {
-    mrb_assert(0);  /* timezone is not supported */
-  }
-  if (tv) {
-    union {
-      FILETIME ft;
-      unsigned __int64 u64;
-    } t;
-    GetSystemTimeAsFileTime(&t.ft);   /* 100 ns intervals since Windows epoch */
-    t.u64 -= UI64(116444736000000000);  /* Unix epoch bias */
-    t.u64 /= 10;                      /* to microseconds */
-    tv->tv_sec = (time_t)(t.u64 / (1000 * 1000));
-    tv->tv_usec = t.u64 % (1000 * 1000);
-  }
-  return 0;
-}
-# else
-#  include <sys/time.h>
-# endif
-#endif
-#ifdef NO_GMTIME_R
-#define gmtime_r(t,r) gmtime(t)
-#define localtime_r(t,r) localtime(t)
-#endif
-
-#ifndef USE_SYSTEM_TIMEGM
-#define timegm my_timgm
-
-static unsigned int
-is_leapyear(unsigned int y)
-{
-  return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
-}
-
-static time_t
-timegm(struct tm *tm)
-{
-  static const unsigned int ndays[2][12] = {
-    {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-    {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
-  };
-  time_t r = 0;
-  int i;
-  unsigned int *nday = (unsigned int*) ndays[is_leapyear(tm->tm_year+1900)];
-
-  for (i = 70; i < tm->tm_year; ++i)
-    r += is_leapyear(i+1900) ? 366*24*60*60 : 365*24*60*60;
-  for (i = 0; i < tm->tm_mon; ++i)
-    r += nday[i] * 24 * 60 * 60;
-  r += (tm->tm_mday - 1) * 24 * 60 * 60;
-  r += tm->tm_hour * 60 * 60;
-  r += tm->tm_min * 60;
-  r += tm->tm_sec;
-  return r;
-}
-#endif
-
-/* Since we are limited to using ISO C99, this implementation is based
-* on time_t. That means the resolution of time is only precise to the
-* second level. Also, there are only 2 timezones, namely UTC and LOCAL.
-*/
-
-enum mrb_timezone {
-  MRB_TIMEZONE_NONE   = 0,
-  MRB_TIMEZONE_UTC    = 1,
-  MRB_TIMEZONE_LOCAL  = 2,
-  MRB_TIMEZONE_LAST   = 3
-};
-
-typedef struct mrb_timezone_name {
-  const char name[8];
-  size_t len;
-} mrb_timezone_name;
-
-static const mrb_timezone_name timezone_names[] = {
-  { "none", sizeof("none") - 1 },
-  { "UTC", sizeof("UTC") - 1 },
-  { "LOCAL", sizeof("LOCAL") - 1 },
-};
-
-#ifndef DISABLE_STDIO
-static const char mon_names[12][4] = {
-  "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-};
-
-static const char wday_names[7][4] = {
-  "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
-};
-#endif
-
-struct mrb_time {
-  time_t              sec;
-  time_t              usec;
-  enum mrb_timezone   timezone;
-  struct tm           datetime;
-};
-
-static const struct mrb_data_type mrb_time_type = { "Time", mrb_free };
-
-/** Updates the datetime of a mrb_time based on it's timezone and
-seconds setting. Returns self on success, NULL of failure. */
-static struct mrb_time*
-time_update_datetime(mrb_state *mrb, struct mrb_time *self)
-{
-  struct tm *aid;
-
-  if (self->timezone == MRB_TIMEZONE_UTC) {
-    aid = gmtime_r(&self->sec, &self->datetime);
-  }
-  else {
-    aid = localtime_r(&self->sec, &self->datetime);
-  }
-  if (!aid) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S out of Time range", mrb_float_value(mrb, (mrb_float)self->sec));
-    /* not reached */
-    return NULL;
-  }
-#ifdef NO_GMTIME_R
-  self->datetime = *aid; /* copy data */
-#endif
-
-  return self;
-}
-
-static mrb_value
-mrb_time_wrap(mrb_state *mrb, struct RClass *tc, struct mrb_time *tm)
-{
-  return mrb_obj_value(Data_Wrap_Struct(mrb, tc, &mrb_time_type, tm));
-}
-
-void mrb_check_num_exact(mrb_state *mrb, mrb_float num);
-
-/* Allocates a mrb_time object and initializes it. */
-static struct mrb_time*
-time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone)
-{
-  struct mrb_time *tm;
-  time_t tsec = 0;
-
-  mrb_check_num_exact(mrb, (mrb_float)sec);
-  mrb_check_num_exact(mrb, (mrb_float)usec);
-
-  if (sizeof(time_t) == 4 && (sec > (double)INT32_MAX || (double)INT32_MIN > sec)) {
-    goto out_of_range;
-  }
-  if (sizeof(time_t) == 8 && (sec > (double)INT64_MAX || (double)INT64_MIN > sec)) {
-    goto out_of_range;
-  }
-  tsec  = (time_t)sec;
-  if ((sec > 0 && tsec < 0) || (sec < 0 && (double)tsec > sec)) {
-  out_of_range:
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S out of Time range", mrb_float_value(mrb, sec));
-  }
-  tm = (struct mrb_time *)mrb_malloc(mrb, sizeof(struct mrb_time));
-  tm->sec  = tsec;
-  tm->usec = (time_t)llround((sec - tm->sec) * 1.0e6 + usec);
-  if (tm->usec < 0) {
-    long sec2 = (long)NDIV(usec,1000000); /* negative div */
-    tm->usec -= sec2 * 1000000;
-    tm->sec += sec2;
-  }
-  else if (tm->usec >= 1000000) {
-    long sec2 = (long)(usec / 1000000);
-    tm->usec -= sec2 * 1000000;
-    tm->sec += sec2;
-  }
-  tm->timezone = timezone;
-  time_update_datetime(mrb, tm);
-
-  return tm;
-}
-
-static mrb_value
-mrb_time_make(mrb_state *mrb, struct RClass *c, double sec, double usec, enum mrb_timezone timezone)
-{
-  return mrb_time_wrap(mrb, c, time_alloc(mrb, sec, usec, timezone));
-}
-
-static struct mrb_time*
-current_mrb_time(mrb_state *mrb)
-{
-  struct mrb_time *tm;
-
-  tm = (struct mrb_time *)mrb_malloc(mrb, sizeof(*tm));
-#if defined(TIME_UTC)
-  {
-    struct timespec ts;
-    if (timespec_get(&ts, TIME_UTC) == 0) {
-      mrb_free(mrb, tm);
-      mrb_raise(mrb, E_RUNTIME_ERROR, "timespec_get() failed for unknown reasons");
-    }
-    tm->sec = ts.tv_sec;
-    tm->usec = ts.tv_nsec / 1000;
-  }
-#elif defined(NO_GETTIMEOFDAY)
-  {
-    static time_t last_sec = 0, last_usec = 0;
-
-    tm->sec  = time(NULL);
-    if (tm->sec != last_sec) {
-      last_sec = tm->sec;
-      last_usec = 0;
-    }
-    else {
-      /* add 1 usec to differentiate two times */
-      last_usec += 1;
-    }
-    tm->usec = last_usec;
-  }
-#else
-  {
-    struct timeval tv;
-
-    gettimeofday(&tv, NULL);
-    tm->sec = tv.tv_sec;
-    tm->usec = tv.tv_usec;
-  }
-#endif
-  tm->timezone = MRB_TIMEZONE_LOCAL;
-  time_update_datetime(mrb, tm);
-
-  return tm;
-}
-
-/* Allocates a new Time object with given millis value. */
-static mrb_value
-mrb_time_now(mrb_state *mrb, mrb_value self)
-{
-  return mrb_time_wrap(mrb, mrb_class_ptr(self), current_mrb_time(mrb));
-}
-
-/* 15.2.19.6.1 */
-/* Creates an instance of time at the given time in seconds, etc. */
-static mrb_value
-mrb_time_at(mrb_state *mrb, mrb_value self)
-{
-  mrb_float f, f2 = 0;
-
-  mrb_get_args(mrb, "f|f", &f, &f2);
-  return mrb_time_make(mrb, mrb_class_ptr(self), f, f2, MRB_TIMEZONE_LOCAL);
-}
-
-static struct mrb_time*
-time_mktime(mrb_state *mrb, mrb_int ayear, mrb_int amonth, mrb_int aday,
-  mrb_int ahour, mrb_int amin, mrb_int asec, mrb_int ausec,
-  enum mrb_timezone timezone)
-{
-  time_t nowsecs;
-  struct tm nowtime = { 0 };
-
-  nowtime.tm_year  = (int)ayear  - 1900;
-  nowtime.tm_mon   = (int)amonth - 1;
-  nowtime.tm_mday  = (int)aday;
-  nowtime.tm_hour  = (int)ahour;
-  nowtime.tm_min   = (int)amin;
-  nowtime.tm_sec   = (int)asec;
-  nowtime.tm_isdst = -1;
-
-  if (nowtime.tm_mon  < 0 || nowtime.tm_mon  > 11
-      || nowtime.tm_mday < 1 || nowtime.tm_mday > 31
-      || nowtime.tm_hour < 0 || nowtime.tm_hour > 24
-      || (nowtime.tm_hour == 24 && (nowtime.tm_min > 0 || nowtime.tm_sec > 0))
-      || nowtime.tm_min  < 0 || nowtime.tm_min  > 59
-      || nowtime.tm_sec  < 0 || nowtime.tm_sec  > 60)
-    mrb_raise(mrb, E_RUNTIME_ERROR, "argument out of range");
-
-  if (timezone == MRB_TIMEZONE_UTC) {
-    nowsecs = timegm(&nowtime);
-  }
-  else {
-    nowsecs = mktime(&nowtime);
-  }
-  if (nowsecs == (time_t)-1) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time.");
-  }
-
-  return time_alloc(mrb, (double)nowsecs, ausec, timezone);
-}
-
-/* 15.2.19.6.2 */
-/* Creates an instance of time at the given time in UTC. */
-static mrb_value
-mrb_time_gm(mrb_state *mrb, mrb_value self)
-{
-  mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0, amin = 0, asec = 0, ausec = 0;
-
-  mrb_get_args(mrb, "i|iiiiii",
-                &ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
-  return mrb_time_wrap(mrb, mrb_class_ptr(self),
-          time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_UTC));
-}
-
-
-/* 15.2.19.6.3 */
-/* Creates an instance of time at the given time in local time zone. */
-static mrb_value
-mrb_time_local(mrb_state *mrb, mrb_value self)
-{
-  mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0, amin = 0, asec = 0, ausec = 0;
-
-  mrb_get_args(mrb, "i|iiiiii",
-                &ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
-  return mrb_time_wrap(mrb, mrb_class_ptr(self),
-          time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_LOCAL));
-}
-
-static struct mrb_time*
-time_get_ptr(mrb_state *mrb, mrb_value time)
-{
-  struct mrb_time *tm;
-
-  tm = DATA_GET_PTR(mrb, time, &mrb_time_type, struct mrb_time);
-  if (!tm) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized time");
-  }
-  return tm;
-}
-
-static mrb_value
-mrb_time_eq(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-  struct mrb_time *tm1, *tm2;
-  mrb_bool eq_p;
-
-  mrb_get_args(mrb, "o", &other);
-  tm1 = DATA_GET_PTR(mrb, self, &mrb_time_type, struct mrb_time);
-  tm2 = DATA_CHECK_GET_PTR(mrb, other, &mrb_time_type, struct mrb_time);
-  eq_p = tm1 && tm2 && tm1->sec == tm2->sec && tm1->usec == tm2->usec;
-
-  return mrb_bool_value(eq_p);
-}
-
-static mrb_value
-mrb_time_cmp(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-  struct mrb_time *tm1, *tm2;
-
-  mrb_get_args(mrb, "o", &other);
-  tm1 = DATA_GET_PTR(mrb, self, &mrb_time_type, struct mrb_time);
-  tm2 = DATA_CHECK_GET_PTR(mrb, other, &mrb_time_type, struct mrb_time);
-  if (!tm1 || !tm2) return mrb_nil_value();
-  if (tm1->sec > tm2->sec) {
-    return mrb_fixnum_value(1);
-  }
-  else if (tm1->sec < tm2->sec) {
-    return mrb_fixnum_value(-1);
-  }
-  /* tm1->sec == tm2->sec */
-  if (tm1->usec > tm2->usec) {
-    return mrb_fixnum_value(1);
-  }
-  else if (tm1->usec < tm2->usec) {
-    return mrb_fixnum_value(-1);
-  }
-  return mrb_fixnum_value(0);
-}
-
-static mrb_value
-mrb_time_plus(mrb_state *mrb, mrb_value self)
-{
-  mrb_float f;
-  struct mrb_time *tm;
-
-  mrb_get_args(mrb, "f", &f);
-  tm = time_get_ptr(mrb, self);
-  return mrb_time_make(mrb, mrb_obj_class(mrb, self), (double)tm->sec+f, (double)tm->usec, tm->timezone);
-}
-
-static mrb_value
-mrb_time_minus(mrb_state *mrb, mrb_value self)
-{
-  mrb_float f;
-  mrb_value other;
-  struct mrb_time *tm, *tm2;
-
-  mrb_get_args(mrb, "o", &other);
-  tm = time_get_ptr(mrb, self);
-  tm2 = DATA_CHECK_GET_PTR(mrb, other, &mrb_time_type, struct mrb_time);
-  if (tm2) {
-    f = (mrb_float)(tm->sec - tm2->sec)
-      + (mrb_float)(tm->usec - tm2->usec) / 1.0e6;
-    return mrb_float_value(mrb, f);
-  }
-  else {
-    mrb_get_args(mrb, "f", &f);
-    return mrb_time_make(mrb, mrb_obj_class(mrb, self), (double)tm->sec-f, (double)tm->usec, tm->timezone);
-  }
-}
-
-/* 15.2.19.7.30 */
-/* Returns week day number of time. */
-static mrb_value
-mrb_time_wday(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_wday);
-}
-
-/* 15.2.19.7.31 */
-/* Returns year day number of time. */
-static mrb_value
-mrb_time_yday(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_yday + 1);
-}
-
-/* 15.2.19.7.32 */
-/* Returns year of time. */
-static mrb_value
-mrb_time_year(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_year + 1900);
-}
-
-/* 15.2.19.7.33 */
-/* Returns name of time's timezone. */
-static mrb_value
-mrb_time_zone(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  if (tm->timezone <= MRB_TIMEZONE_NONE) return mrb_nil_value();
-  if (tm->timezone >= MRB_TIMEZONE_LAST) return mrb_nil_value();
-  return mrb_str_new_static(mrb,
-                            timezone_names[tm->timezone].name,
-                            timezone_names[tm->timezone].len);
-}
-
-/* 15.2.19.7.4 */
-/* Returns a string that describes the time. */
-static mrb_value
-mrb_time_asctime(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm = time_get_ptr(mrb, self);
-  struct tm *d = &tm->datetime;
-  int len;
-
-#if defined(DISABLE_STDIO)
-  char *s;
-# ifdef NO_ASCTIME_R
-  s = asctime(d);
-# else
-  char buf[32];
-  s = asctime_r(d, buf);
-# endif
-  len = strlen(s)-1;            /* truncate the last newline */
-#else
-  char buf[256];
-
-  len = snprintf(buf, sizeof(buf), "%s %s %02d %02d:%02d:%02d %s%d",
-    wday_names[d->tm_wday], mon_names[d->tm_mon], d->tm_mday,
-    d->tm_hour, d->tm_min, d->tm_sec,
-    tm->timezone == MRB_TIMEZONE_UTC ? "UTC " : "",
-    d->tm_year + 1900);
-#endif
-  return mrb_str_new(mrb, buf, len);
-}
-
-/* 15.2.19.7.6 */
-/* Returns the day in the month of the time. */
-static mrb_value
-mrb_time_day(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_mday);
-}
-
-
-/* 15.2.19.7.7 */
-/* Returns true if daylight saving was applied for this time. */
-static mrb_value
-mrb_time_dst_p(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_bool_value(tm->datetime.tm_isdst);
-}
-
-/* 15.2.19.7.8 */
-/* 15.2.19.7.10 */
-/* Returns the Time object of the UTC(GMT) timezone. */
-static mrb_value
-mrb_time_getutc(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm, *tm2;
-
-  tm = time_get_ptr(mrb, self);
-  tm2 = (struct mrb_time *)mrb_malloc(mrb, sizeof(*tm));
-  *tm2 = *tm;
-  tm2->timezone = MRB_TIMEZONE_UTC;
-  time_update_datetime(mrb, tm2);
-  return mrb_time_wrap(mrb, mrb_obj_class(mrb, self), tm2);
-}
-
-/* 15.2.19.7.9 */
-/* Returns the Time object of the LOCAL timezone. */
-static mrb_value
-mrb_time_getlocal(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm, *tm2;
-
-  tm = time_get_ptr(mrb, self);
-  tm2 = (struct mrb_time *)mrb_malloc(mrb, sizeof(*tm));
-  *tm2 = *tm;
-  tm2->timezone = MRB_TIMEZONE_LOCAL;
-  time_update_datetime(mrb, tm2);
-  return mrb_time_wrap(mrb, mrb_obj_class(mrb, self), tm2);
-}
-
-/* 15.2.19.7.15 */
-/* Returns hour of time. */
-static mrb_value
-mrb_time_hour(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_hour);
-}
-
-/* 15.2.19.7.16 */
-/* Initializes a time by setting the amount of milliseconds since the epoch.*/
-static mrb_value
-mrb_time_initialize(mrb_state *mrb, mrb_value self)
-{
-  mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0,
-  amin = 0, asec = 0, ausec = 0;
-  int n;
-  struct mrb_time *tm;
-
-  n = mrb_get_args(mrb, "|iiiiiii",
-       &ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
-  tm = (struct mrb_time*)DATA_PTR(self);
-  if (tm) {
-    mrb_free(mrb, tm);
-  }
-  mrb_data_init(self, NULL, &mrb_time_type);
-
-  if (n == 0) {
-    tm = current_mrb_time(mrb);
-  }
-  else {
-    tm = time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_LOCAL);
-  }
-  mrb_data_init(self, tm, &mrb_time_type);
-  return self;
-}
-
-/* 15.2.19.7.17(x) */
-/* Initializes a copy of this time object. */
-static mrb_value
-mrb_time_initialize_copy(mrb_state *mrb, mrb_value copy)
-{
-  mrb_value src;
-  struct mrb_time *t1, *t2;
-
-  mrb_get_args(mrb, "o", &src);
-  if (mrb_obj_equal(mrb, copy, src)) return copy;
-  if (!mrb_obj_is_instance_of(mrb, src, mrb_obj_class(mrb, copy))) {
-    mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
-  }
-  t1 = (struct mrb_time *)DATA_PTR(copy);
-  t2 = (struct mrb_time *)DATA_PTR(src);
-  if (!t2) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized time");
-  }
-  if (!t1) {
-    t1 = (struct mrb_time *)mrb_malloc(mrb, sizeof(struct mrb_time));
-    mrb_data_init(copy, t1, &mrb_time_type);
-  }
-  *t1 = *t2;
-  return copy;
-}
-
-/* 15.2.19.7.18 */
-/* Sets the timezone attribute of the Time object to LOCAL. */
-static mrb_value
-mrb_time_localtime(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  tm->timezone = MRB_TIMEZONE_LOCAL;
-  time_update_datetime(mrb, tm);
-  return self;
-}
-
-/* 15.2.19.7.19 */
-/* Returns day of month of time. */
-static mrb_value
-mrb_time_mday(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_mday);
-}
-
-/* 15.2.19.7.20 */
-/* Returns minutes of time. */
-static mrb_value
-mrb_time_min(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_min);
-}
-
-/* 15.2.19.7.21 and 15.2.19.7.22 */
-/* Returns month of time. */
-static mrb_value
-mrb_time_mon(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_mon + 1);
-}
-
-/* 15.2.19.7.23 */
-/* Returns seconds in minute of time. */
-static mrb_value
-mrb_time_sec(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_fixnum_value(tm->datetime.tm_sec);
-}
-
-
-/* 15.2.19.7.24 */
-/* Returns a Float with the time since the epoch in seconds. */
-static mrb_value
-mrb_time_to_f(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_float_value(mrb, (mrb_float)tm->sec + (mrb_float)tm->usec/1.0e6);
-}
-
-/* 15.2.19.7.25 */
-/* Returns a Fixnum with the time since the epoch in seconds. */
-static mrb_value
-mrb_time_to_i(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  if (tm->sec > MRB_INT_MAX || tm->sec < MRB_INT_MIN) {
-    return mrb_float_value(mrb, (mrb_float)tm->sec);
-  }
-  return mrb_fixnum_value((mrb_int)tm->sec);
-}
-
-/* 15.2.19.7.26 */
-/* Returns a Float with the time since the epoch in microseconds. */
-static mrb_value
-mrb_time_usec(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  if (tm->usec > MRB_INT_MAX || tm->usec < MRB_INT_MIN) {
-    return mrb_float_value(mrb, (mrb_float)tm->usec);
-  }
-  return mrb_fixnum_value((mrb_int)tm->usec);
-}
-
-/* 15.2.19.7.27 */
-/* Sets the timezone attribute of the Time object to UTC. */
-static mrb_value
-mrb_time_utc(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  tm->timezone = MRB_TIMEZONE_UTC;
-  time_update_datetime(mrb, tm);
-  return self;
-}
-
-/* 15.2.19.7.28 */
-/* Returns true if this time is in the UTC timezone false if not. */
-static mrb_value
-mrb_time_utc_p(mrb_state *mrb, mrb_value self)
-{
-  struct mrb_time *tm;
-
-  tm = time_get_ptr(mrb, self);
-  return mrb_bool_value(tm->timezone == MRB_TIMEZONE_UTC);
-}
-
-
-void
-mrb_mruby_time_gem_init(mrb_state* mrb)
-{
-  struct RClass *tc;
-  /* ISO 15.2.19.2 */
-  tc = mrb_define_class(mrb, "Time", mrb->object_class);
-  MRB_SET_INSTANCE_TT(tc, MRB_TT_DATA);
-  mrb_include_module(mrb, tc, mrb_module_get(mrb, "Comparable"));
-  mrb_define_class_method(mrb, tc, "at", mrb_time_at, MRB_ARGS_ARG(1, 1));      /* 15.2.19.6.1 */
-  mrb_define_class_method(mrb, tc, "gm", mrb_time_gm, MRB_ARGS_ARG(1,6));       /* 15.2.19.6.2 */
-  mrb_define_class_method(mrb, tc, "local", mrb_time_local, MRB_ARGS_ARG(1,6)); /* 15.2.19.6.3 */
-  mrb_define_class_method(mrb, tc, "mktime", mrb_time_local, MRB_ARGS_ARG(1,6));/* 15.2.19.6.4 */
-  mrb_define_class_method(mrb, tc, "now", mrb_time_now, MRB_ARGS_NONE());       /* 15.2.19.6.5 */
-  mrb_define_class_method(mrb, tc, "utc", mrb_time_gm, MRB_ARGS_ARG(1,6));      /* 15.2.19.6.6 */
-
-  mrb_define_method(mrb, tc, "=="     , mrb_time_eq     , MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, tc, "<=>"    , mrb_time_cmp    , MRB_ARGS_REQ(1)); /* 15.2.19.7.1 */
-  mrb_define_method(mrb, tc, "+"      , mrb_time_plus   , MRB_ARGS_REQ(1)); /* 15.2.19.7.2 */
-  mrb_define_method(mrb, tc, "-"      , mrb_time_minus  , MRB_ARGS_REQ(1)); /* 15.2.19.7.3 */
-  mrb_define_method(mrb, tc, "to_s"   , mrb_time_asctime, MRB_ARGS_NONE());
-  mrb_define_method(mrb, tc, "inspect", mrb_time_asctime, MRB_ARGS_NONE());
-  mrb_define_method(mrb, tc, "asctime", mrb_time_asctime, MRB_ARGS_NONE()); /* 15.2.19.7.4 */
-  mrb_define_method(mrb, tc, "ctime"  , mrb_time_asctime, MRB_ARGS_NONE()); /* 15.2.19.7.5 */
-  mrb_define_method(mrb, tc, "day"    , mrb_time_day    , MRB_ARGS_NONE()); /* 15.2.19.7.6 */
-  mrb_define_method(mrb, tc, "dst?"   , mrb_time_dst_p  , MRB_ARGS_NONE()); /* 15.2.19.7.7 */
-  mrb_define_method(mrb, tc, "getgm"  , mrb_time_getutc , MRB_ARGS_NONE()); /* 15.2.19.7.8 */
-  mrb_define_method(mrb, tc, "getlocal",mrb_time_getlocal,MRB_ARGS_NONE()); /* 15.2.19.7.9 */
-  mrb_define_method(mrb, tc, "getutc" , mrb_time_getutc , MRB_ARGS_NONE()); /* 15.2.19.7.10 */
-  mrb_define_method(mrb, tc, "gmt?"   , mrb_time_utc_p  , MRB_ARGS_NONE()); /* 15.2.19.7.11 */
-  mrb_define_method(mrb, tc, "gmtime" , mrb_time_utc    , MRB_ARGS_NONE()); /* 15.2.19.7.13 */
-  mrb_define_method(mrb, tc, "hour"   , mrb_time_hour, MRB_ARGS_NONE());    /* 15.2.19.7.15 */
-  mrb_define_method(mrb, tc, "localtime", mrb_time_localtime, MRB_ARGS_NONE()); /* 15.2.19.7.18 */
-  mrb_define_method(mrb, tc, "mday"   , mrb_time_mday, MRB_ARGS_NONE());    /* 15.2.19.7.19 */
-  mrb_define_method(mrb, tc, "min"    , mrb_time_min, MRB_ARGS_NONE());     /* 15.2.19.7.20 */
-
-  mrb_define_method(mrb, tc, "mon"  , mrb_time_mon, MRB_ARGS_NONE());       /* 15.2.19.7.21 */
-  mrb_define_method(mrb, tc, "month", mrb_time_mon, MRB_ARGS_NONE());       /* 15.2.19.7.22 */
-
-  mrb_define_method(mrb, tc, "sec" , mrb_time_sec, MRB_ARGS_NONE());        /* 15.2.19.7.23 */
-  mrb_define_method(mrb, tc, "to_i", mrb_time_to_i, MRB_ARGS_NONE());       /* 15.2.19.7.25 */
-  mrb_define_method(mrb, tc, "to_f", mrb_time_to_f, MRB_ARGS_NONE());       /* 15.2.19.7.24 */
-  mrb_define_method(mrb, tc, "usec", mrb_time_usec, MRB_ARGS_NONE());       /* 15.2.19.7.26 */
-  mrb_define_method(mrb, tc, "utc" , mrb_time_utc, MRB_ARGS_NONE());        /* 15.2.19.7.27 */
-  mrb_define_method(mrb, tc, "utc?", mrb_time_utc_p,MRB_ARGS_NONE());       /* 15.2.19.7.28 */
-  mrb_define_method(mrb, tc, "wday", mrb_time_wday, MRB_ARGS_NONE());       /* 15.2.19.7.30 */
-  mrb_define_method(mrb, tc, "yday", mrb_time_yday, MRB_ARGS_NONE());       /* 15.2.19.7.31 */
-  mrb_define_method(mrb, tc, "year", mrb_time_year, MRB_ARGS_NONE());       /* 15.2.19.7.32 */
-  mrb_define_method(mrb, tc, "zone", mrb_time_zone, MRB_ARGS_NONE());       /* 15.2.19.7.33 */
-
-  mrb_define_method(mrb, tc, "initialize", mrb_time_initialize, MRB_ARGS_REQ(1)); /* 15.2.19.7.16 */
-  mrb_define_method(mrb, tc, "initialize_copy", mrb_time_initialize_copy, MRB_ARGS_REQ(1)); /* 15.2.19.7.17 */
-
-  /*
-    methods not available:
-      gmt_offset(15.2.19.7.12)
-      gmtoff(15.2.19.7.14)
-      utc_offset(15.2.19.7.29)
-  */
-}
-
-void
-mrb_mruby_time_gem_final(mrb_state* mrb)
-{
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/test/time.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/test/time.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/test/time.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-time/test/time.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,228 +0,0 @@
-##
-# Time ISO Test
-
-assert('Time.new', '15.2.3.3.3') do
-  Time.new.class == Time
-end
-
-assert('Time', '15.2.19') do
-  Time.class == Class
-end
-
-assert('Time.at', '15.2.19.6.1') do
-  assert_kind_of(Time, Time.at(1300000000.0))
-
-  assert_raise(FloatDomainError) { Time.at(Float::NAN) }
-  assert_raise(FloatDomainError) { Time.at(Float::INFINITY) }
-  assert_raise(FloatDomainError) { Time.at(-Float::INFINITY) }
-  assert_raise(FloatDomainError) { Time.at(0, Float::NAN) }
-  assert_raise(FloatDomainError) { Time.at(0, Float::INFINITY) }
-  assert_raise(FloatDomainError) { Time.at(0, -Float::INFINITY) }
-end
-
-assert('Time.gm', '15.2.19.6.2') do
-  Time.gm(2012, 12, 23)
-end
-
-assert('Time.local', '15.2.19.6.3') do
-  Time.local(2012, 12, 23)
-end
-
-assert('Time.mktime', '15.2.19.6.4') do
-  Time.mktime(2012, 12, 23)
-end
-
-assert('Time.now', '15.2.19.6.5') do
-  Time.now.class == Time
-end
-
-assert('Time.utc', '15.2.19.6.6') do
-  Time.utc(2012, 12, 23)
-end
-
-assert('Time#+', '15.2.19.7.1') do
-  t1 = Time.at(1300000000.0)
-  t2 = t1.+(60)
-
-  assert_equal(t2.utc.asctime, "Sun Mar 13 07:07:40 UTC 2011")
-
-  assert_raise(FloatDomainError) { Time.at(0) + Float::NAN }
-  assert_raise(FloatDomainError) { Time.at(0) + Float::INFINITY }
-  assert_raise(FloatDomainError) { Time.at(0) + -Float::INFINITY }
-end
-
-assert('Time#-', '15.2.19.7.2') do
-  t1 = Time.at(1300000000.0)
-  t2 = t1.-(60)
-
-  assert_equal(t2.utc.asctime, "Sun Mar 13 07:05:40 UTC 2011")
-
-  assert_raise(FloatDomainError) { Time.at(0) - Float::NAN }
-  assert_raise(FloatDomainError) { Time.at(0) - Float::INFINITY }
-  assert_raise(FloatDomainError) { Time.at(0) - -Float::INFINITY }
-end
-
-assert('Time#<=>', '15.2.19.7.3') do
-  t1 = Time.at(1300000000.0)
-  t2 = Time.at(1400000000.0)
-  t3 = Time.at(1500000000.0)
-
-  t2.<=>(t1) == 1 and
-    t2.<=>(t2) == 0 and
-    t2.<=>(t3) == -1 and
-    t2.<=>(nil) == nil
-end
-
-assert('Time#asctime', '15.2.19.7.4') do
-  Time.at(1300000000.0).utc.asctime == "Sun Mar 13 07:06:40 UTC 2011"
-end
-
-assert('Time#ctime', '15.2.19.7.5') do
-  Time.at(1300000000.0).utc.ctime == "Sun Mar 13 07:06:40 UTC 2011"
-end
-
-assert('Time#day', '15.2.19.7.6') do
-  Time.gm(2012, 12, 23).day == 23
-end
-
-assert('Time#dst?', '15.2.19.7.7') do
-  not Time.gm(2012, 12, 23).utc.dst?
-end
-
-assert('Time#getgm', '15.2.19.7.8') do
-  Time.at(1300000000.0).getgm.asctime == "Sun Mar 13 07:06:40 UTC 2011"
-end
-
-assert('Time#getlocal', '15.2.19.7.9') do
-  t1 = Time.at(1300000000.0)
-  t2 = Time.at(1300000000.0)
-  t3 = t1.getlocal
-
-  t1 == t3 and t3 == t2.getlocal
-end
-
-assert('Time#getutc', '15.2.19.7.10') do
-  Time.at(1300000000.0).getutc.asctime == "Sun Mar 13 07:06:40 UTC 2011"
-end
-
-assert('Time#gmt?', '15.2.19.7.11') do
-  Time.at(1300000000.0).utc.gmt?
-end
-
-# ATM not implemented
-# assert('Time#gmt_offset', '15.2.19.7.12') do
-
-assert('Time#gmtime', '15.2.19.7.13') do
-  Time.at(1300000000.0).gmtime
-end
-
-# ATM not implemented
-# assert('Time#gmtoff', '15.2.19.7.14') do
-
-assert('Time#hour', '15.2.19.7.15') do
-  Time.gm(2012, 12, 23, 7, 6).hour == 7
-end
-
-# ATM doesn't really work
-# assert('Time#initialize', '15.2.19.7.16') do
-
-assert('Time#initialize_copy', '15.2.19.7.17') do
-  time_tmp_2 = Time.at(7.0e6)
-  time_tmp_2.clone == time_tmp_2
-end
-
-assert('Time#localtime', '15.2.19.7.18') do
-  t1 = Time.at(1300000000.0)
-  t2 = Time.at(1300000000.0)
-
-  t1.localtime
-  t1 == t2.getlocal
-end
-
-assert('Time#mday', '15.2.19.7.19') do
-  Time.gm(2012, 12, 23).mday == 23
-end
-
-assert('Time#min', '15.2.19.7.20') do
-  Time.gm(2012, 12, 23, 7, 6).min == 6
-end
-
-assert('Time#mon', '15.2.19.7.21') do
-  Time.gm(2012, 12, 23).mon == 12
-end
-
-assert('Time#month', '15.2.19.7.22') do
-  Time.gm(2012, 12, 23).month == 12
-end
-
-assert('Times#sec', '15.2.19.7.23') do
-  Time.gm(2012, 12, 23, 7, 6, 40).sec == 40
-end
-
-assert('Time#to_f', '15.2.19.7.24') do
-  Time.at(1300000000.0).to_f == 1300000000.0
-end
-
-assert('Time#to_i', '15.2.19.7.25') do
-  Time.at(1300000000.0).to_i == 1300000000
-end
-
-assert('Time#usec', '15.2.19.7.26') do
-  Time.at(1300000000.0).usec == 0
-end
-
-assert('Time#utc', '15.2.19.7.27') do
-  Time.at(1300000000.0).utc
-end
-
-assert('Time#utc?', '15.2.19.7.28') do
-  Time.at(1300000000.0).utc.utc?
-end
-
-# ATM not implemented
-# assert('Time#utc_offset', '15.2.19.7.29') do
-
-assert('Time#wday', '15.2.19.7.30') do
-  Time.gm(2012, 12, 23).wday == 0
-end
-
-assert('Time#yday', '15.2.19.7.31') do
-  Time.gm(2012, 12, 23).yday == 358
-end
-
-assert('Time#year', '15.2.19.7.32') do
-  Time.gm(2012, 12, 23).year == 2012
-end
-
-assert('Time#zone', '15.2.19.7.33') do
-  Time.at(1300000000.0).utc.zone == 'UTC'
-end
-
-# Not ISO specified
-
-assert('Time#to_s') do
-  Time.at(1300000000.0).utc.to_s == "Sun Mar 13 07:06:40 UTC 2011"
-end
-
-assert('Time#inspect') do
-  Time.at(1300000000.0).utc.inspect == "Sun Mar 13 07:06:40 UTC 2011"
-end
-
-assert('day of week methods') do
-  t = Time.gm(2012, 12, 24)
-  assert_false t.sunday?
-  assert_true t.monday?
-  assert_false t.tuesday?
-  assert_false t.wednesday?
-  assert_false t.thursday?
-  assert_false t.friday?
-  assert_false t.saturday?
-end
-
-assert('2000 times 500us make a second') do
-  t = Time.utc 2015
-  2000.times do
-    t += 0.0005
-  end
-  t.usec == 0
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrbgem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrbgem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrbgem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrbgem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-MRuby::Gem::Specification.new('mruby-toplevel-ext') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'toplevel object (main) methods extension'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-
-def self.include (*modules)
-  self.class.include(*modules)
-end
-
-def self.private(*methods)
-end
-def self.protected(*methods)
-end
-def self.public(*methods)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-##
-# Toplevel Self(Ext) Test
-
-assert('Toplevel#include') do
-  module ToplevelTestModule1
-    def method_foo
-      :foo
-    end
-
-    CONST_BAR = :bar
-  end
-
-  module ToplevelTestModule2
-    CONST_BAR = :bar2
-  end
-
-  self.include ToplevelTestModule2, ToplevelTestModule1
-
-  assert_true self.class.included_modules.include?( ToplevelTestModule1 )
-  assert_true self.class.included_modules.include?( ToplevelTestModule2 )
-  assert_equal :foo, method_foo
-  assert_equal :bar2, CONST_BAR
-end
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/00class.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/00class.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/00class.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/00class.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-class Module
-   # 15.2.2.4.12
-  def attr_accessor(*names)
-    attr_reader(*names)
-    attr_writer(*names)
-  end
-  # 15.2.2.4.11
-  def attr(name)
-    attr_reader(name)
-  end
-
-  # 15.2.2.4.27
-  def include(*args)
-    args.reverse.each do |m|
-      m.append_features(self)
-      m.included(self)
-    end
-  end
-
-  def prepend(*args)
-    args.reverse.each do |m|
-      m.prepend_features(self)
-      m.prepended(self)
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/10error.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/10error.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/10error.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/10error.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-# ISO 15.2.24
-class ArgumentError < StandardError
-end
-
-# ISO 15.2.25 says "LocalJumpError < StandardError"
-class LocalJumpError < ScriptError
-end
-
-# ISO 15.2.26
-class RangeError < StandardError
-end
-
-class FloatDomainError < RangeError
-end
-
-# ISO 15.2.26
-class RegexpError < StandardError
-end
-
-# ISO 15.2.29
-class TypeError < StandardError
-end
-
-# ISO 15.2.31
-class NameError < StandardError
-  attr_accessor :name
-
-  def initialize(message=nil, name=nil)
-    @name = name
-    super(message)
-  end
-end
-
-# ISO 15.2.32
-class NoMethodError < NameError
-  attr_reader :args
-
-  def initialize(message=nil, name=nil, args=nil)
-    @args = args
-    super message, name
-  end
-end
-
-# ISO 15.2.33
-class IndexError < StandardError
-end
-
-class KeyError < IndexError
-end
-
-class NotImplementedError < ScriptError
-end
-
-class StopIteration < IndexError
-  attr_accessor :result
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/array.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/array.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/array.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/array.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-# coding: utf-8
-##
-# Array
-#
-# ISO 15.2.12
-class Array
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the respective element.
-  #
-  # ISO 15.2.12.5.10
-  def each(&block)
-    return to_enum :each unless block_given?
-
-    idx = 0
-    while idx < length
-      block.call(self[idx])
-      idx += 1
-    end
-    self
-  end
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the index of the respective element.
-  #
-  # ISO 15.2.12.5.11
-  def each_index(&block)
-    return to_enum :each_index unless block_given?
-
-    idx = 0
-    while idx < length
-      block.call(idx)
-      idx += 1
-    end
-    self
-  end
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the respective element. Each element will
-  # be replaced by the resulting values.
-  #
-  # ISO 15.2.12.5.7
-  def collect!(&block)
-    return to_enum :collect! unless block_given?
-
-    self.each_index { |idx| self[idx] = block.call(self[idx]) }
-    self
-  end
-
-  ##
-  # Alias for collect!
-  #
-  # ISO 15.2.12.5.20
-  alias map! collect!
-
-  ##
-  # Private method for Array creation.
-  #
-  # ISO 15.2.12.5.15
-  def initialize(size=0, obj=nil, &block)
-    raise TypeError, "expected Integer for 1st argument" unless size.kind_of? Integer
-    raise ArgumentError, "negative array size" if size < 0
-
-    self.clear
-    if size > 0
-      self[size - 1] = nil # allocate
-
-      idx = 0
-      while idx < size
-        self[idx] = (block)? block.call(idx): obj
-        idx += 1
-      end
-    end
-
-    self
-  end
-
-  def _inspect
-    return "[]" if self.size == 0
-    "["+self.map{|x|x.inspect}.join(", ")+"]"
-  end
-  ##
-  # Return the contents of this array as a string.
-  #
-  # ISO 15.2.12.5.31 (x)
-  def inspect
-    begin
-      self._inspect
-    rescue SystemStackError
-      "[...]"
-    end
-  end
-  # ISO 15.2.12.5.32 (x)
-  alias to_s inspect
-
-  ##
-  #  Equality---Two arrays are equal if they contain the same number
-  #  of elements and if each element is equal to (according to
-  #  Object.==) the corresponding element in the other array.
-  #
-  # ISO 15.2.12.5.33 (x)
-  def ==(other)
-    other = self.__ary_eq(other)
-    return false if other == false
-    return true  if other == true
-    len = self.size
-    i = 0
-    while i < len
-      return false if self[i] != other[i]
-      i += 1
-    end
-    return true
-  end
-
-  ##
-  #  Returns <code>true</code> if +self+ and _other_ are the same object,
-  #  or are both arrays with the same content.
-  #
-  # ISO 15.2.12.5.34 (x)
-  def eql?(other)
-    other = self.__ary_eq(other)
-    return false if other == false
-    return true  if other == true
-    len = self.size
-    i = 0
-    while i < len
-      return false unless self[i].eql?(other[i])
-      i += 1
-    end
-    return true
-  end
-
-  ##
-  #  Comparison---Returns an integer (-1, 0, or +1)
-  #  if this array is less than, equal to, or greater than <i>other_ary</i>.
-  #  Each object in each array is compared (using <=>). If any value isn't
-  #  equal, then that inequality is the return value. If all the
-  #  values found are equal, then the return is based on a
-  #  comparison of the array lengths.  Thus, two arrays are
-  #  "equal" according to <code>Array#<=></code> if and only if they have
-  #  the same length and the value of each element is equal to the
-  #  value of the corresponding element in the other array.
-  #
-  # ISO 15.2.12.5.36 (x)
-  def <=>(other)
-    other = self.__ary_cmp(other)
-    return 0 if 0 == other
-    return nil if nil == other
-
-    len = self.size
-    n = other.size
-    len = n if len > n
-    i = 0
-    while i < len
-      n = (self[i] <=> other[i])
-      return n if n.nil? || n != 0
-      i += 1
-    end
-    len = self.size - other.size
-    if len == 0
-      0
-    elsif len > 0
-      1
-    else
-      -1
-    end
-  end
-
-  ##
-  # Delete element with index +key+
-  def delete(key, &block)
-    while i = self.index(key)
-      self.delete_at(i)
-      ret = key
-    end
-    return block.call if ret.nil? && block
-    ret
-  end
-
-  # internal method to convert multi-value to single value
-  def __svalue
-    return self.first if self.size < 2
-    self
-  end
-end
-
-##
-# Array is enumerable
-class Array
-  # ISO 15.2.12.3
-  include Enumerable
-
-  ##
-  # Quick sort
-  # a     : the array to sort
-  # left  : the beginning of sort region
-  # right : the end of sort region
-  def __sort_sub__(a, left, right, &block)
-    if left < right
-      i = left
-      j = right
-      pivot = a[i + (j - i) / 2]
-      while true
-        while ((block)? block.call(a[i], pivot): (a[i] <=> pivot)) < 0
-          i += 1
-        end
-        while ((block)? block.call(pivot, a[j]): (pivot <=> a[j])) < 0
-          j -= 1
-        end
-        break if (i >= j)
-        tmp = a[i]; a[i] = a[j]; a[j] = tmp;
-        i += 1
-        j -= 1
-      end
-      __sort_sub__(a, left, i-1, &block)
-      __sort_sub__(a, j+1, right, &block)
-    end
-  end
-  #  private :__sort_sub__
-
-  ##
-  # Sort all elements and replace +self+ with these
-  # elements.
-  def sort!(&block)
-    size = self.size
-    if size > 1
-      __sort_sub__(self, 0, size - 1, &block)
-    end
-    self
-  end
-
-  def sort(&block)
-    self.dup.sort!(&block)
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/compar.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/compar.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/compar.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/compar.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-##
-# Comparable
-#
-# ISO 15.3.3
-module Comparable
-
-  ##
-  # Return true if +self+ is less
-  # than +other+. Otherwise return
-  # false.
-  #
-  # ISO 15.3.3.2.1
-  def < other
-    cmp = self <=> other
-    if cmp.nil?
-      raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
-    end
-    cmp < 0
-  end
-
-  ##
-  # Return true if +self+ is less
-  # than or equal to +other+.
-  # Otherwise return false.
-  #
-  # ISO 15.3.3.2.2
-  def <= other
-    cmp = self <=> other
-    if cmp.nil?
-      raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
-    end
-    cmp <= 0
-  end
-
-  ##
-  # Return true if +self+ is equal
-  # to +other+. Otherwise return
-  # false.
-  #
-  # ISO 15.3.3.2.3
-  def == other
-    cmp = self <=> other
-    cmp == 0
-  end
-
-  ##
-  # Return true if +self+ is greater
-  # than +other+. Otherwise return
-  # false.
-  #
-  # ISO 15.3.3.2.4
-  def > other
-    cmp = self <=> other
-    if cmp.nil?
-      raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
-    end
-    cmp > 0
-  end
-
-  ##
-  # Return true if +self+ is greater
-  # than or equal to +other+.
-  # Otherwise return false.
-  #
-  # ISO 15.3.3.2.5
-  def >= other
-    cmp = self <=> other
-    if cmp.nil?
-      raise ArgumentError, "comparison of #{self.class} with #{other.class} failed"
-    end
-    cmp >= 0
-  end
-
-  ##
-  # Return true if +self+ is greater
-  # than or equal to +min+ and
-  # less than or equal to +max+.
-  # Otherwise return false.
-  #
-  # ISO 15.3.3.2.6
-  def between?(min, max)
-    self >= min and self <= max
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/enum.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/enum.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/enum.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/enum.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,348 +0,0 @@
-##
-# Enumerable
-#
-# The <code>Enumerable</code> mixin provides collection classes with
-# several traversal and searching methods, and with the ability to
-# sort. The class must provide a method `each`, which
-# yields successive members of the collection. If
-# {Enumerable#max}, {#min}, or
-# {#sort} is used, the objects in the collection must also
-# implement a meaningful `<=>` operator, as these methods
-# rely on an ordering between members of the collection.
-#
-# @ISO 15.3.2
-module Enumerable
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return false
-  # if one block value is false. Otherwise
-  # return true. If no block is given and
-  # +self+ is false return false.
-  #
-  # ISO 15.3.2.2.1
-  def all?(&block)
-    if block
-      self.each{|*val| return false unless block.call(*val)}
-    else
-      self.each{|*val| return false unless val.__svalue}
-    end
-    true
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return true
-  # if one block value is true. Otherwise
-  # return false. If no block is given and
-  # +self+ is true object return true.
-  #
-  # ISO 15.3.2.2.2
-  def any?(&block)
-    if block
-      self.each{|*val| return true if block.call(*val)}
-    else
-      self.each{|*val| return true if val.__svalue}
-    end
-    false
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Append all
-  # values of each block together and
-  # return this value.
-  #
-  # ISO 15.3.2.2.3
-  def collect(&block)
-    return to_enum :collect unless block
-
-    ary = []
-    self.each{|*val| ary.push(block.call(*val))}
-    ary
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return
-  # +ifnone+ if no block value was true.
-  # Otherwise return the first block value
-  # which had was true.
-  #
-  # ISO 15.3.2.2.4
-  def detect(ifnone=nil, &block)
-    ret = ifnone
-    self.each{|*val|
-      if block.call(*val)
-        ret = val.__svalue
-        break
-      end
-    }
-    ret
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Pass an
-  # index to the block which starts at 0
-  # and increase by 1 for each element.
-  #
-  # ISO 15.3.2.2.5
-  def each_with_index(&block)
-    return to_enum :each_with_index unless block
-
-    i = 0
-    self.each{|*val|
-      block.call(val.__svalue, i)
-      i += 1
-    }
-    self
-  end
-
-  ##
-  # Return an array of all elements which
-  # are yield by +each+.
-  #
-  # ISO 15.3.2.2.6
-  def entries
-    ary = []
-    self.each{|*val|
-      # __svalue is an internal method
-      ary.push val.__svalue
-    }
-    ary
-  end
-
-  ##
-  # Alias for find
-  #
-  # ISO 15.3.2.2.7
-  alias find detect
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return an array
-  # which contains all elements whose block
-  # value was true.
-  #
-  # ISO 15.3.2.2.8
-  def find_all(&block)
-    return to_enum :find_all unless block
-
-    ary = []
-    self.each{|*val|
-      ary.push(val.__svalue) if block.call(*val)
-    }
-    ary
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+ and which return
-  # value was true when invoking === with
-  # +pattern+. Return an array with all
-  # elements or the respective block values.
-  #
-  # ISO 15.3.2.2.9
-  def grep(pattern, &block)
-    ary = []
-    self.each{|*val|
-      sv = val.__svalue
-      if pattern === sv
-        ary.push((block)? block.call(*val): sv)
-      end
-    }
-    ary
-  end
-
-  ##
-  # Return true if at least one element which
-  # is yield by +each+ returns a true value
-  # by invoking == with +obj+. Otherwise return
-  # false.
-  #
-  # ISO 15.3.2.2.10
-  def include?(obj)
-    self.each{|*val|
-      return true if val.__svalue == obj
-    }
-    false
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return value
-  # is the sum of all block values. Pass
-  # to each block the current sum and the
-  # current element.
-  #
-  # ISO 15.3.2.2.11
-  def inject(*args, &block)
-    raise ArgumentError, "too many arguments" if args.size > 2
-    if Symbol === args[-1]
-      sym = args[-1]
-      block = ->(x,y){x.__send__(sym,y)}
-      args.pop
-    end
-    if args.empty?
-      flag = true  # no initial argument
-      result = nil
-    else
-      flag = false
-      result = args[0]
-    end
-    self.each{|*val|
-      val = val.__svalue
-      if flag
-        # push first element as initial
-        flag = false
-        result = val
-      else
-        result = block.call(result, val)
-      end
-    }
-    result
-  end
-  alias reduce inject
-
-  ##
-  # Alias for collect
-  #
-  # ISO 15.3.2.2.12
-  alias map collect
-
-  ##
-  # Return the maximum value of all elements
-  # yield by +each+. If no block is given <=>
-  # will be invoked to define this value. If
-  # a block is given it will be used instead.
-  #
-  # ISO 15.3.2.2.13
-  def max(&block)
-    flag = true  # 1st element?
-    result = nil
-    self.each{|*val|
-      val = val.__svalue
-      if flag
-        # 1st element
-        result = val
-        flag = false
-      else
-        if block
-          result = val if block.call(val, result) > 0
-        else
-          result = val if (val <=> result) > 0
-        end
-      end
-    }
-    result
-  end
-
-  ##
-  # Return the minimum value of all elements
-  # yield by +each+. If no block is given <=>
-  # will be invoked to define this value. If
-  # a block is given it will be used instead.
-  #
-  # ISO 15.3.2.2.14
-  def min(&block)
-    flag = true  # 1st element?
-    result = nil
-    self.each{|*val|
-      val = val.__svalue
-      if flag
-        # 1st element
-        result = val
-        flag = false
-      else
-        if block
-          result = val if block.call(val, result) < 0
-        else
-          result = val if (val <=> result) < 0
-        end
-      end
-    }
-    result
-  end
-
-  ##
-  # Alias for include?
-  #
-  # ISO 15.3.2.2.15
-  alias member? include?
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return an
-  # array which contains two arrays. The
-  # first array contains all elements
-  # whose block value was true. The second
-  # array contains all elements whose
-  # block value was false.
-  #
-  # ISO 15.3.2.2.16
-  def partition(&block)
-    ary_T = []
-    ary_F = []
-    self.each{|*val|
-      if block.call(*val)
-        ary_T.push(val.__svalue)
-      else
-        ary_F.push(val.__svalue)
-      end
-    }
-    [ary_T, ary_F]
-  end
-
-  ##
-  # Call the given block for each element
-  # which is yield by +each+. Return an
-  # array which contains only the elements
-  # whose block value was false.
-  #
-  # ISO 15.3.2.2.17
-  def reject(&block)
-    ary = []
-    self.each{|*val|
-      ary.push(val.__svalue) unless block.call(*val)
-    }
-    ary
-  end
-
-  ##
-  # Alias for find_all.
-  #
-  # ISO 15.3.2.2.18
-  alias select find_all
-
-  ##
-  # Return a sorted array of all elements
-  # which are yield by +each+. If no block
-  # is given <=> will be invoked on each
-  # element to define the order. Otherwise
-  # the given block will be used for
-  # sorting.
-  #
-  # ISO 15.3.2.2.19
-  def sort(&block)
-    self.map{|*val| val.__svalue}.sort
-  end
-
-  ##
-  # Alias for entries.
-  #
-  # ISO 15.3.2.2.20
-  alias to_a entries
-
-  # redefine #hash 15.3.1.3.15
-  def hash
-    h = 12347
-    i = 0
-    self.each do |e|
-      n = (e.hash & (0x7fffffff >> (i % 16))) << (i % 16)
-      h ^= n
-      i += 1
-    end
-    h
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/hash.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/hash.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/hash.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/hash.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,358 +0,0 @@
-##
-# Hash
-#
-# ISO 15.2.13
-class Hash
-  ##
-  #  Equality---Two hashes are equal if they each contain the same number
-  #  of keys and if each key-value pair is equal to (according to
-  #  <code>Object#==</code>) the corresponding elements in the other
-  #  hash.
-  #
-  # ISO 15.2.13.4.1
-  def ==(hash)
-    return true if self.equal?(hash)
-    begin
-      hash = hash.to_hash
-    rescue NoMethodError
-      return false
-    end
-    return false if self.size != hash.size
-    self.each do |k,v|
-      return false unless hash.key?(k)
-      return false unless self[k] == hash[k]
-    end
-    return true
-  end
-
-  ##
-  # Returns <code>true</code> if <i>hash</i> and <i>other</i> are
-  # both hashes with the same content compared by eql?.
-  #
-  # ISO 15.2.13.4.32 (x)
-  def eql?(hash)
-    return true if self.equal?(hash)
-    begin
-      hash = hash.to_hash
-    rescue NoMethodError
-      return false
-    end
-    return false if self.size != hash.size
-    self.each do |k,v|
-      return false unless hash.key?(k)
-      return false unless self[k].eql?(hash[k])
-    end
-    return true
-  end
-
-  ##
-  # Delete the element with the key +key+.
-  # Return the value of the element if +key+
-  # was found. Return nil if nothing was
-  # found. If a block is given, call the
-  # block with the value of the element.
-  #
-  # ISO 15.2.13.4.8
-  def delete(key, &block)
-    if block && !self.has_key?(key)
-      block.call(key)
-    else
-      self.__delete(key)
-    end
-  end
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the key and value of each element.
-  #
-  # call-seq:
-  #   hsh.each      {| key, value | block } -> hsh
-  #   hsh.each_pair {| key, value | block } -> hsh
-  #   hsh.each                              -> an_enumerator
-  #   hsh.each_pair                         -> an_enumerator
-  #
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #     h = { "a" => 100, "b" => 200 }
-  #     h.each {|key, value| puts "#{key} is #{value}" }
-  #
-  # <em>produces:</em>
-  #
-  # a is 100
-  # b is 200
-  #
-  # ISO 15.2.13.4.9
-  def each(&block)
-    return to_enum :each unless block_given?
-
-    keys = self.keys
-    vals = self.values
-    len = self.size
-    i = 0
-    while i < len
-      block.call [keys[i], vals[i]]
-      i += 1
-    end
-    self
-  end
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the key of each element.
-  #
-  # call-seq:
-  #   hsh.each_key {| key | block } -> hsh
-  #   hsh.each_key                  -> an_enumerator
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #   h = { "a" => 100, "b" => 200 }
-  #   h.each_key {|key| puts key }
-  #
-  # <em>produces:</em>
-  #
-  #  a
-  #  b
-  #
-  # ISO 15.2.13.4.10
-  def each_key(&block)
-    return to_enum :each_key unless block_given?
-
-    self.keys.each{|k| block.call(k)}
-    self
-  end
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the value of each element.
-  #
-  # call-seq:
-  #   hsh.each_value {| value | block } -> hsh
-  #   hsh.each_value                    -> an_enumerator
-  #
-  # If no block is given, an enumerator is returned instead.
-  #
-  #  h = { "a" => 100, "b" => 200 }
-  #  h.each_value {|value| puts value }
-  #
-  # <em>produces:</em>
-  #
-  #  100
-  #  200
-  #
-  # ISO 15.2.13.4.11
-  def each_value(&block)
-    return to_enum :each_value unless block_given?
-
-    self.keys.each{|k| block.call(self[k])}
-    self
-  end
-
-  ##
-  # Replaces the contents of <i>hsh</i> with the contents of other hash
-  #
-  # ISO 15.2.13.4.23
-  def replace(hash)
-    raise TypeError, "can't convert argument into Hash" unless hash.respond_to?(:to_hash)
-    self.clear
-    hash = hash.to_hash
-    hash.each_key{|k|
-      self[k] = hash[k]
-    }
-    if hash.default_proc
-      self.default_proc = hash.default_proc
-    else
-      self.default = hash.default
-    end
-    self
-  end
-  # ISO 15.2.13.4.17
-  alias initialize_copy replace
-
-  ##
-  # Return a hash which contains the content of
-  # +self+ and +other+. If a block is given
-  # it will be called for each element with
-  # a duplicate key. The value of the block
-  # will be the final value of this element.
-  #
-  # ISO 15.2.13.4.22
-  def merge(other, &block)
-    h = {}
-    raise TypeError, "can't convert argument into Hash" unless other.respond_to?(:to_hash)
-    other = other.to_hash
-    self.each_key{|k| h[k] = self[k]}
-    if block
-      other.each_key{|k|
-        h[k] = (self.has_key?(k))? block.call(k, self[k], other[k]): other[k]
-      }
-    else
-      other.each_key{|k| h[k] = other[k]}
-    end
-    h
-  end
-
-  # internal method for Hash inspection
-  def _inspect
-    return "{}" if self.size == 0
-    "{"+self.map {|k,v|
-      k._inspect + "=>" + v._inspect
-    }.join(", ")+"}"
-  end
-  ##
-  # Return the contents of this hash as a string.
- #
-  # ISO 15.2.13.4.30 (x)
-  def inspect
-    begin
-      self._inspect
-    rescue SystemStackError
-      "{...}"
-    end
-  end
-  # ISO 15.2.13.4.31 (x)
-  alias to_s inspect
-
-  ##
-  #  call-seq:
-  #     hsh.reject! {| key, value | block }  -> hsh or nil
-  #     hsh.reject!                          -> an_enumerator
-  #
-  #  Equivalent to <code>Hash#delete_if</code>, but returns
-  #  <code>nil</code> if no changes were made.
-  #
-  #  1.8/1.9 Hash#reject! returns Hash; ISO says nothing.
-  #
-  def reject!(&b)
-    return to_enum :reject! unless block_given?
-
-    keys = []
-    self.each{|k,v|
-      if b.call([k, v])
-        keys.push(k)
-      end
-    }
-    return nil if keys.size == 0
-    keys.each{|k|
-      self.delete(k)
-    }
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.reject {|key, value| block}   -> a_hash
-  #     hsh.reject                        -> an_enumerator
-  #
-  #  Returns a new hash consisting of entries for which the block returns false.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-  #     h = { "a" => 100, "b" => 200, "c" => 300 }
-  #     h.reject {|k,v| k < "b"}  #=> {"b" => 200, "c" => 300}
-  #     h.reject {|k,v| v > 100}  #=> {"a" => 100}
-  #
-  #  1.8/1.9 Hash#reject returns Hash; ISO says nothing.
-  #
-  def reject(&b)
-    return to_enum :reject unless block_given?
-
-    h = {}
-    self.each{|k,v|
-      unless b.call([k, v])
-        h[k] = v
-      end
-    }
-    h
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.select! {| key, value | block }  -> hsh or nil
-  #     hsh.select!                          -> an_enumerator
-  #
-  #  Equivalent to <code>Hash#keep_if</code>, but returns
-  #  <code>nil</code> if no changes were made.
-  #
-  #  1.9 Hash#select! returns Hash; ISO says nothing.
-  #
-  def select!(&b)
-    return to_enum :select! unless block_given?
-
-    keys = []
-    self.each{|k,v|
-      unless b.call([k, v])
-        keys.push(k)
-      end
-    }
-    return nil if keys.size == 0
-    keys.each{|k|
-      self.delete(k)
-    }
-    self
-  end
-
-  ##
-  #  call-seq:
-  #     hsh.select {|key, value| block}   -> a_hash
-  #     hsh.select                        -> an_enumerator
-  #
-  #  Returns a new hash consisting of entries for which the block returns true.
-  #
-  #  If no block is given, an enumerator is returned instead.
-  #
-  #     h = { "a" => 100, "b" => 200, "c" => 300 }
-  #     h.select {|k,v| k > "a"}  #=> {"b" => 200, "c" => 300}
-  #     h.select {|k,v| v < 200}  #=> {"a" => 100}
-  #
-  #  1.9 Hash#select returns Hash; ISO says nothing
-  #
-  def select(&b)
-    return to_enum :select unless block_given?
-
-    h = {}
-    self.each{|k,v|
-      if b.call([k, v])
-        h[k] = v
-      end
-    }
-    h
-  end
-
-  ##
-  #  call-seq:
-  #    hsh.rehash -> hsh
-  #
-  #  Rebuilds the hash based on the current hash values for each key. If
-  #  values of key objects have changed since they were inserted, this
-  #  method will reindex <i>hsh</i>.
-  #
-  #     h = {"AAA" => "b"}
-  #     h.keys[0].chop!
-  #     h          #=> {"AA"=>"b"}
-  #     h["AA"]    #=> nil
-  #     h.rehash   #=> {"AA"=>"b"}
-  #     h["AA"]    #=> "b"
-  #
-  def rehash
-    h = {}
-    self.each{|k,v|
-      h[k] = v
-    }
-    self.replace(h)
-  end
-
-  def __update(h)
-    h.each_key{|k| self[k] = h[k]}
-    self
-  end
-end
-
-##
-# Hash is enumerable
-#
-# ISO 15.2.13.3
-class Hash
-  include Enumerable
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/init_mrblib.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/init_mrblib.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/init_mrblib.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/init_mrblib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <mruby.h>
-#include <mruby/irep.h>
-
-extern const uint8_t mrblib_irep[];
-
-void
-mrb_init_mrblib(mrb_state *mrb)
-{
-  mrb_load_irep(mrb, mrblib_irep);
-}
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/kernel.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/kernel.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/kernel.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/kernel.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-##
-# Kernel
-#
-# ISO 15.3.1
-module Kernel
-
-  # 15.3.1.2.1 Kernel.`
-  # provided by Kernel#`
-  # 15.3.1.3.5
-  def `(s)
-    raise NotImplementedError.new("backquotes not implemented")
-  end
-
-  ##
-  # 15.3.1.2.3  Kernel.eval
-  # 15.3.1.3.12 Kernel#eval
-  # NotImplemented by mruby core; use mruby-eval gem
-
-  ##
-  # ISO 15.3.1.2.8 Kernel.loop
-  # provided by Kernel#loop
-
-  ##
-  # Calls the given block repetitively.
-  #
-  # ISO 15.3.1.3.29
-  def loop(&block)
-    return to_enum :loop unless block
-
-    while true
-      yield
-    end
-  rescue StopIteration => e
-    e.result
-  end
-
-  # 11.4.4 Step c)
-  def !~(y)
-    !(self =~ y)
-  end
-
-  # internal method for inspect
-  def _inspect
-    self.inspect
-  end
-
-  def to_enum(*a)
-    raise NotImplementedError.new("fiber required for enumerator")
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/mrblib.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/mrblib.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/mrblib.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/mrblib.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-MRuby.each_target do
-  current_dir = File.dirname(__FILE__)
-  relative_from_root = File.dirname(__FILE__).relative_path_from(MRUBY_ROOT)
-  current_build_dir = "#{build_dir}/#{relative_from_root}"
-
-  self.libmruby << objfile("#{current_build_dir}/mrblib")
-
-  file objfile("#{current_build_dir}/mrblib") => "#{current_build_dir}/mrblib.c"
-  file "#{current_build_dir}/mrblib.c" => [mrbcfile, __FILE__] + Dir.glob("#{current_dir}/*.rb").sort do |t|
-    _, _, *rbfiles = t.prerequisites
-    FileUtils.mkdir_p File.dirname(t.name)
-    open(t.name, 'w') do |f|
-      _pp "GEN", "*.rb", "#{t.name.relative_path}"
-      f.puts File.read("#{current_dir}/init_mrblib.c")
-      mrbc.run f, rbfiles, 'mrblib_irep'
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/numeric.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/numeric.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/numeric.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/numeric.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-##
-# Numeric
-#
-# ISO 15.2.7
-class Numeric
-  include Comparable
-  ##
-  # Returns the receiver simply.
-  #
-  # ISO 15.2.7.4.1
-  def +@
-    self
-  end
-
-  ##
-  # Returns the receiver's value, negated.
-  #
-  # ISO 15.2.7.4.2
-  def -@
-    0 - self
-  end
-
-  ##
-  # Returns the absolute value of the receiver.
-  #
-  # ISO 15.2.7.4.3
-  def abs
-    if self < 0
-      -self
-    else
-      self
-    end
-  end
-end
-
-##
-# Integral
-#
-# mruby special - module to share methods between Floats and Integers
-#                 to make them compatible
-module Integral
-  ##
-  # Calls the given block once for each Integer
-  # from +self+ downto +num+.
-  #
-  # ISO 15.2.8.3.15
-  def downto(num, &block)
-    return to_enum(:downto, num) unless block_given?
-
-    i = self.to_i
-    while i >= num
-      block.call(i)
-      i -= 1
-    end
-    self
-  end
-
-  ##
-  # Returns self + 1
-  #
-  # ISO 15.2.8.3.19
-  def next
-    self + 1
-  end
-  # ISO 15.2.8.3.21
-  alias succ next
-
-  ##
-  # Calls the given block +self+ times.
-  #
-  # ISO 15.2.8.3.22
-  def times &block
-    return to_enum :times unless block_given?
-
-    i = 0
-    while i < self
-      block.call i
-      i += 1
-    end
-    self
-  end
-
-  ##
-  # Calls the given block once for each Integer
-  # from +self+ upto +num+.
-  #
-  # ISO 15.2.8.3.27
-  def upto(num, &block)
-    return to_enum(:upto, num) unless block_given?
-
-    i = self.to_i
-    while i <= num
-      block.call(i)
-      i += 1
-    end
-    self
-  end
-
-  ##
-  # Calls the given block from +self+ to +num+
-  # incremented by +step+ (default 1).
-  #
-  def step(num=nil, step=1, &block)
-    raise ArgumentError, "step can't be 0" if step == 0
-    return to_enum(:step, num, step) unless block_given?
-
-    i = if num.kind_of? Float then self.to_f else self end
-    if num == nil
-      while true
-        block.call(i)
-        i+=step
-      end
-      return self
-    end
-    if step > 0
-      while i <= num
-        block.call(i)
-        i += step
-      end
-    else
-      while i >= num
-        block.call(i)
-        i += step
-      end
-    end
-    self
-  end
-end
-
-##
-# Integer
-#
-# ISO 15.2.8
-class Integer
-  include Integral
-  ##
-  # Returns the receiver simply.
-  #
-  # ISO 15.2.8.3.14
-  def ceil
-    self
-  end
-
-  ##
-  # Returns the receiver simply.
-  #
-  # ISO 15.2.8.3.17
-  def floor
-    self
-  end
-
-  ##
-  # Returns the receiver simply.
-  #
-  # ISO 15.2.8.3.24
-  alias round floor
-
-  ##
-  # Returns the receiver simply.
-  #
-  # ISO 15.2.8.3.26
-  alias truncate floor
-end
-
-##
-# Float
-#
-# ISO 15.2.9
-class Float
-  # mruby special - since mruby integers may be upgraded to floats,
-  # floats should be compatible to integers.
-  include Integral
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/range.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/range.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/range.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/range.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-##
-# Range
-#
-# ISO 15.2.14
-class Range
-
-  ##
-  # Calls the given block for each element of +self+
-  # and pass the respective element.
-  #
-  # ISO 15.2.14.4.4
-  def each(&block)
-    return to_enum :each unless block_given?
-
-    val = self.first
-    last = self.last
-
-    if val.kind_of?(Fixnum) && last.kind_of?(Fixnum) # fixnums are special
-      lim = last
-      lim += 1 unless exclude_end?
-      i = val
-      while i < lim
-        block.call(i)
-        i += 1
-      end
-      return self
-    end
-
-    if val.kind_of?(String) && last.kind_of?(String) # fixnums are special
-      if val.respond_to? :upto
-        return val.upto(last, exclude_end?, &block)
-      else
-        str_each = true
-      end
-    end
-
-    raise TypeError, "can't iterate" unless val.respond_to? :succ
-
-    return self if (val <=> last) > 0
-
-    while (val <=> last) < 0
-      block.call(val)
-      val = val.succ
-      if str_each
-        break if val.size > last.size
-      end
-    end
-
-    block.call(val) if !exclude_end? && (val <=> last) == 0
-    self
-  end
-
-  # redefine #hash 15.3.1.3.15
-  def hash
-    h = first.hash ^ last.hash
-    h += 1 if self.exclude_end?
-    h
-  end
-end
-
-##
-# Range is enumerable
-#
-# ISO 15.2.14.3
-class Range
-  include Enumerable
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/string.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/string.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/string.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mrblib/string.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-##
-# String
-#
-# ISO 15.2.10
-class String
-  include Comparable
-  ##
-  # Calls the given block for each line
-  # and pass the respective line.
-  #
-  # ISO 15.2.10.5.15
-  def each_line(rs = "\n", &block)
-    return to_enum(:each_line, rs, &block) unless block
-    return block.call(self) if rs.nil?
-    rs = rs.to_str
-    offset = 0
-    rs_len = rs.length
-    this = dup
-    while pos = this.index(rs, offset)
-      block.call(this[offset, pos + rs_len - offset])
-      offset = pos + rs_len
-    end
-    block.call(this[offset, this.size - offset]) if this.size > offset
-    self
-  end
-
-  # private method for gsub/sub
-  def __sub_replace(pre, m, post)
-    s = ""
-    i = 0
-    while j = index("\\", i)
-      break if j == length-1
-      t = case self[j+1]
-          when "\\"
-            "\\"
-          when "`"
-            pre
-          when "&", "0"
-            m
-          when "'"
-            post
-          when "1", "2", "3", "4", "5", "6", "7", "8", "9"
-            ""
-          else
-            self[j, 2]
-          end
-      s += self[i, j-i] + t
-      i = j + 2
-    end
-    s + self[i, length-i]
-  end
-
-  ##
-  # Replace all matches of +pattern+ with +replacement+.
-  # Call block (if given) for each match and replace
-  # +pattern+ with the value of the block. Return the
-  # final value.
-  #
-  # ISO 15.2.10.5.18
-  def gsub(*args, &block)
-    return to_enum(:gsub, *args) if args.length == 1 && !block
-    raise ArgumentError, "wrong number of arguments" unless (1..2).include?(args.length)
-
-    pattern, replace = *args
-    plen = pattern.length
-    if args.length == 2 && block
-      block = nil
-    end
-    if !replace.nil? || !block
-      replace = replace.to_str
-    end
-    offset = 0
-    result = []
-    while found = index(pattern, offset)
-      result << self[offset, found - offset]
-      offset = found + plen
-      result << if block
-        block.call(pattern).to_s
-      else
-        replace.__sub_replace(self[0, found], pattern, self[offset..-1] || "")
-      end
-      if plen == 0
-        result << self[offset, 1]
-        offset += 1
-      end
-    end
-    result << self[offset..-1] if offset < length
-    result.join
-  end
-
-  ##
-  # Replace all matches of +pattern+ with +replacement+.
-  # Call block (if given) for each match and replace
-  # +pattern+ with the value of the block. Modify
-  # +self+ with the final value.
-  #
-  # ISO 15.2.10.5.19
-  def gsub!(*args, &block)
-    raise RuntimeError, "can't modify frozen String" if frozen?
-    return to_enum(:gsub!, *args) if args.length == 1 && !block
-    str = self.gsub(*args, &block)
-    return nil if str == self
-    self.replace(str)
-  end
-
-  ##
-  # Calls the given block for each match of +pattern+
-  # If no block is given return an array with all
-  # matches of +pattern+.
-  #
-  # ISO 15.2.10.5.32
-  def scan(reg, &block)
-    ### *** TODO *** ###
-    unless Object.const_defined?(:Regexp)
-      raise NotImplementedError, "scan not available (yet)"
-    end
-  end
-
-  ##
-  # Replace only the first match of +pattern+ with
-  # +replacement+. Call block (if given) for each
-  # match and replace +pattern+ with the value of the
-  # block. Return the final value.
-  #
-  # ISO 15.2.10.5.36
-  def sub(*args, &block)
-    unless (1..2).include?(args.length)
-      raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 2)"
-    end
-
-    pattern, replace = *args
-    pattern = pattern.to_str
-    if args.length == 2 && block
-      block = nil
-    end
-    unless block
-      replace = replace.to_str
-    end
-    result = []
-    this = dup
-    found = index(pattern)
-    return this unless found
-    result << this[0, found]
-    offset = found + pattern.length
-    result << if block
-      block.call(pattern).to_s
-    else
-      replace.__sub_replace(this[0, found], pattern, this[offset..-1] || "")
-    end
-    result << this[offset..-1] if offset < length
-    result.join
-  end
-
-  ##
-  # Replace only the first match of +pattern+ with
-  # +replacement+. Call block (if given) for each
-  # match and replace +pattern+ with the value of the
-  # block. Modify +self+ with the final value.
-  #
-  # ISO 15.2.10.5.37
-  def sub!(*args, &block)
-    raise RuntimeError, "can't modify frozen String" if frozen?
-    str = self.sub(*args, &block)
-    return nil if str == self
-    self.replace(str)
-  end
-
-  ##
-  # Call the given block for each character of
-  # +self+.
-  def each_char(&block)
-    pos = 0
-    while pos < self.size
-      block.call(self[pos])
-      pos += 1
-    end
-    self
-  end
-
-  ##
-  # Call the given block for each byte of +self+.
-  def each_byte(&block)
-    bytes = self.bytes
-    pos = 0
-    while pos < bytes.size
-      block.call(bytes[pos])
-      pos += 1
-    end
-    self
-  end
-
-  ##
-  # Modify +self+ by replacing the content of +self+.
-  # The portion of the string affected is determined using the same criteria as +String#[]+.
-  def []=(*args)
-    anum = args.size
-    if anum == 2
-      pos, value = args
-      case pos
-      when String
-        posnum = self.index(pos)
-        if posnum
-          b = self[0, posnum.to_i]
-          a = self[(posnum + pos.length)..-1]
-          self.replace([b, value, a].join(''))
-        else
-          raise IndexError, "string not matched"
-        end
-      when Range
-        head = pos.begin
-        tail = pos.end
-        tail += self.length if tail < 0
-        unless pos.exclude_end?
-          tail += 1
-        end
-        return self[head, tail-head]=value
-      else
-        pos += self.length if pos < 0
-        if pos < 0 || pos > self.length
-          raise IndexError, "index #{args[0]} out of string"
-        end
-        b = self[0, pos.to_i]
-        a = self[pos + 1..-1]
-        self.replace([b, value, a].join(''))
-      end
-      return value
-    elsif anum == 3
-      pos, len, value = args
-      pos += self.length if pos < 0
-      if pos < 0 || pos > self.length
-        raise IndexError, "index #{args[0]} out of string"
-      end
-      if len < 0
-        raise IndexError, "negative length #{len}"
-      end
-      b = self[0, pos.to_i]
-      a = self[pos + len..-1]
-      self.replace([b, value, a].join(''))
-      return value
-    else
-      raise ArgumentError, "wrong number of arguments (#{anum} for 2..3)"
-    end
-  end
-
-  ##
-  # ISO 15.2.10.5.3
-  def =~(re)
-    raise TypeError, "type mismatch: String given" if re.respond_to? :to_str
-    re =~ self
-  end
-
-  ##
-  # ISO 15.2.10.5.27
-  def match(re, &block)
-    if re.respond_to? :to_str
-      if Object.const_defined?(:Regexp)
-        r = Regexp.new(re)
-        r.match(self, &block)
-      else
-        raise NotImplementedError, "String#match needs Regexp class"
-      end
-    else
-      re.match(self, &block)
-    end
-  end
-end
-
-##
-# String is comparable
-#
-# ISO 15.2.10.3
-module Comparable; end
-class String
-  include Comparable
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mruby-source.gemspec cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mruby-source.gemspec
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mruby-source.gemspec	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/mruby-source.gemspec	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mruby/source'
-
-Gem::Specification.new do |spec|
-  spec.name          = "mruby-source"
-  spec.version       = MRuby::Source::MRUBY_VERSION
-  spec.authors       = [ MRuby::Source::MRUBY_AUTHOR ]
-
-  spec.summary       = %q{MRuby source code wrapper.}
-  spec.description   = %q{MRuby source code wrapper for use with Ruby libs.}
-  spec.homepage      = "http://www.mruby.org/"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.require_paths = ["lib"]
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/NEWS cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/NEWS
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/NEWS	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/NEWS	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-* NEWS
-
-This document is a list of user visible feature changes made between
-releases except for bug fixes.
-
-Note that each entry is kept so brief that no reason behind or
-reference information is supplied with.  For a full list of changes
-with all sufficient information, see the ChangeLog file.
-
-
-** Information about first release v1.0.0
-
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Rakefile cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Rakefile
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Rakefile	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/Rakefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-# encoding: utf-8
-# Build description.
-# basic build file for mruby
-MRUBY_ROOT = File.dirname(File.expand_path(__FILE__))
-MRUBY_BUILD_HOST_IS_CYGWIN = RUBY_PLATFORM.include?('cygwin')
-MRUBY_BUILD_HOST_IS_OPENBSD = RUBY_PLATFORM.include?('openbsd')
-
-# load build systems
-load "#{MRUBY_ROOT}/tasks/ruby_ext.rake"
-load "#{MRUBY_ROOT}/tasks/mruby_build.rake"
-load "#{MRUBY_ROOT}/tasks/mrbgem_spec.rake"
-
-# load configuration file
-MRUBY_CONFIG = (ENV['MRUBY_CONFIG'] && ENV['MRUBY_CONFIG'] != '') ? ENV['MRUBY_CONFIG'] : "#{MRUBY_ROOT}/build_config.rb"
-load MRUBY_CONFIG
-
-# load basic rules
-MRuby.each_target do |build|
-  build.define_rules
-end
-
-# load custom rules
-load "#{MRUBY_ROOT}/src/mruby_core.rake"
-load "#{MRUBY_ROOT}/mrblib/mrblib.rake"
-
-load "#{MRUBY_ROOT}/tasks/mrbgems.rake"
-load "#{MRUBY_ROOT}/tasks/libmruby.rake"
-
-load "#{MRUBY_ROOT}/tasks/benchmark.rake"
-
-load "#{MRUBY_ROOT}/tasks/gitlab.rake"
-
-##############################
-# generic build targets, rules
-task :default => :all
-
-bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
-
-depfiles = MRuby.targets['host'].bins.map do |bin|
-  install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
-  source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
-
-  file install_path => source_path do |t|
-    FileUtils.rm_f t.name, { :verbose => $verbose }
-    FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
-  end
-
-  install_path
-end
-
-MRuby.each_target do |target|
-  gems.map do |gem|
-    current_dir = gem.dir.relative_path_from(Dir.pwd)
-    relative_from_root = gem.dir.relative_path_from(MRUBY_ROOT)
-    current_build_dir = File.expand_path "#{build_dir}/#{relative_from_root}"
-
-    if current_build_dir !~ /^#{build_dir}/
-      current_build_dir = "#{build_dir}/mrbgems/#{gem.name}"
-    end
-
-    gem.bins.each do |bin|
-      exec = exefile("#{build_dir}/bin/#{bin}")
-      objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx,cc}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
-
-      file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t|
-        gem_flags = gems.map { |g| g.linker.flags }
-        gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
-        gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries }
-        gem_libraries = gems.map { |g| g.linker.libraries }
-        gem_library_paths = gems.map { |g| g.linker.library_paths }
-        linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries, gem_flags_after_libraries
-      end
-
-      if target == MRuby.targets['host']
-        install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
-
-        file install_path => exec do |t|
-          FileUtils.rm_f t.name, { :verbose => $verbose }
-          FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
-        end
-        depfiles += [ install_path ]
-      elsif target == MRuby.targets['host-debug']
-        unless MRuby.targets['host'].gems.map {|g| g.bins}.include?([bin])
-          install_path = MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
-
-          file install_path => exec do |t|
-            FileUtils.rm_f t.name, { :verbose => $verbose }
-            FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
-          end
-          depfiles += [ install_path ]
-        end
-      else
-        depfiles += [ exec ]
-      end
-    end
-  end
-end
-
-depfiles += MRuby.targets.map { |n, t|
-  [t.libfile("#{t.build_dir}/lib/libmruby")]
-}.flatten
-
-depfiles += MRuby.targets.reject { |n, t| n == 'host' }.map { |n, t|
-  t.bins.map { |bin| t.exefile("#{t.build_dir}/bin/#{bin}") }
-}.flatten
-
-desc "build all targets, install (locally) in-repo"
-task :all => depfiles do
-  puts
-  puts "Build summary:"
-  puts
-  MRuby.each_target do
-    print_build_summary
-  end
-end
-
-desc "run all mruby tests"
-task :test => ["all"] do
-  MRuby.each_target do
-    run_test if test_enabled?
-  end
-end
-
-desc "clean all built and in-repo installed artifacts"
-task :clean do
-  MRuby.each_target do |t|
-    FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
-  end
-  FileUtils.rm_f depfiles, { :verbose => $verbose }
-  puts "Cleaned up target build folder"
-end
-
-desc "clean everything!"
-task :deep_clean => ["clean"] do
-  MRuby.each_target do |t|
-    FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
-  end
-  puts "Cleaned up mrbgems build folder"
-end
-
-desc 'generate document'
-task :doc do
-  begin
-    sh "mrbdoc"
-  rescue
-    puts "ERROR: To generate documents, you should install yard-mruby gem."
-    puts "  $ gem install yard-mruby"
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-[![Build Status][build-status-img]][travis-ci]
-
-## What is mruby
-
-mruby is the lightweight implementation of the Ruby language complying to (part
-of) the [ISO standard][ISO-standard]. Its syntax is Ruby 1.9 compatible.
-
-mruby can be linked and embedded within your application.  We provide the
-interpreter program "mruby" and the interactive mruby shell "mirb" as examples.
-You can also compile Ruby programs into compiled byte code using the mruby
-compiler "mrbc".  All those tools reside in the "bin" directory.  "mrbc" is
-also able to generate compiled byte code in a C source file, see the "mrbtest"
-program under the "test" directory for an example.
-
-This achievement was sponsored by the Regional Innovation Creation R&D Programs
-of the Ministry of Economy, Trade and Industry of Japan.
-
-## How to get mruby
-
-The stable version 1.3.0 of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/archive/1.3.0.zip](https://github.com/mruby/mruby/archive/1.3.0.zip)
-
-The latest development version of mruby can be downloaded via the following URL: [https://github.com/mruby/mruby/zipball/master](https://github.com/mruby/mruby/zipball/master)
-
-The trunk of the mruby source tree can be checked out with the
-following command:
-
-    $ git clone https://github.com/mruby/mruby.git
-
-You can also install and compile mruby using [ruby-install](https://github.com/postmodern/ruby-install), [ruby-build](https://github.com/rbenv/ruby-build) or [rvm](https://github.com/rvm/rvm).
-
-## mruby home-page
-
-The URL of the mruby home-page is: [http://www.mruby.org](http://www.mruby.org).
-
-## Mailing list
-
-We don't have a mailing list, but you can use [GitHub issues](https://github.com/mruby/mruby).
-
-## How to compile and install (mruby and gems)
-
-See the [doc/guides/compile.md](doc/guides/compile.md) file.
-
-## Running Tests
-
-To run the tests, execute the following from the project's root directory.
-
-    $ make test
-
-Or
-
-    $ ruby ./minirake test
-
-## How to customize mruby (mrbgems)
-
-mruby contains a package manager called *mrbgems*. To create extensions
-in C and/or Ruby you should create a *GEM*. For a documentation of how to
-use mrbgems consult the file [doc/guides/mrbgems.md](doc/guides/mrbgems.md). For example code of
-how to use mrbgems look into the folder *examples/mrbgems/*.
-
-## License
-
-mruby is released under the [MIT License](MITL).
-
-## Note for License
-
-mruby has chosen a MIT License due to its permissive license allowing
-developers to target various environments such as embedded systems.
-However, the license requires the display of the copyright notice and license
-information in manuals for instance. Doing so for big projects can be
-complicated or troublesome.  This is why mruby has decided to display "mruby
-developers" as the copyright name to make it simple conventionally.
-In the future, mruby might ask you to distribute your new code
-(that you will commit,) under the MIT License as a member of
-"mruby developers" but contributors will keep their copyright.
-(We did not intend for contributors to transfer or waive their copyrights,
-Actual copyright holder name (contributors) will be listed in the AUTHORS
-file.)
-
-Please ask us if you want to distribute your code under another license.
-
-## How to Contribute
-
-See the [contribution guidelines][contribution-guidelines], and then send a pull
-request to <http://github.com/mruby/mruby>.  We consider you have granted
-non-exclusive right to your contributed code under MIT license.  If you want to
-be named as one of mruby developers, please include an update to the AUTHORS
-file in your pull request.
-
-[ISO-standard]: http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579
-[build-status-img]: https://travis-ci.org/mruby/mruby.svg?branch=master
-[contribution-guidelines]: CONTRIBUTING.md
-[travis-ci]: https://travis-ci.org/mruby/mruby
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/array.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/array.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/array.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/array.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1236 +0,0 @@
-/*
-** array.c - Array class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/string.h>
-#include <mruby/range.h>
-#include "value_array.h"
-
-#define ARY_DEFAULT_LEN   4
-#define ARY_SHRINK_RATIO  5 /* must be larger than 2 */
-#define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value))
-#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX-1)
-
-static struct RArray*
-ary_new_capa(mrb_state *mrb, mrb_int capa)
-{
-  struct RArray *a;
-  size_t blen;
-
-  if (capa > ARY_MAX_SIZE) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
-  }
-  blen = capa * sizeof(mrb_value);
-
-  a = (struct RArray*)mrb_obj_alloc(mrb, MRB_TT_ARRAY, mrb->array_class);
-  if (capa <= MRB_ARY_EMBED_LEN_MAX) {
-    ARY_SET_EMBED_FLAG(a);
-    /* ARY_SET_EMBED_LEN(a, 0); */
-  }
-  else {
-    a->as.heap.ptr = (mrb_value *)mrb_malloc(mrb, blen);
-    a->as.heap.aux.capa = capa;
-    a->as.heap.len = 0;
-  }
-
-  return a;
-}
-
-MRB_API mrb_value
-mrb_ary_new_capa(mrb_state *mrb, mrb_int capa)
-{
-  struct RArray *a = ary_new_capa(mrb, capa);
-  return mrb_obj_value(a);
-}
-
-MRB_API mrb_value
-mrb_ary_new(mrb_state *mrb)
-{
-  return mrb_ary_new_capa(mrb, 0);
-}
-
-/*
- * to copy array, use this instead of memcpy because of portability
- * * gcc on ARM may fail optimization of memcpy
- *   http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka3934.html
- * * gcc on MIPS also fail
- *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39755
- * * memcpy doesn't exist on freestanding environment
- *
- * If you optimize for binary size, use memcpy instead of this at your own risk
- * of above portability issue.
- *
- * see also http://togetter.com/li/462898
- *
- */
-static inline void
-array_copy(mrb_value *dst, const mrb_value *src, mrb_int size)
-{
-  mrb_int i;
-
-  for (i = 0; i < size; i++) {
-    dst[i] = src[i];
-  }
-}
-
-MRB_API mrb_value
-mrb_ary_new_from_values(mrb_state *mrb, mrb_int size, const mrb_value *vals)
-{
-  struct RArray *a = ary_new_capa(mrb, size);
-
-  array_copy(ARY_PTR(a), vals, size);
-  ARY_SET_LEN(a, size);
-
-  return mrb_obj_value(a);
-}
-
-MRB_API mrb_value
-mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr)
-{
-  struct RArray *a;
-
-  a = ary_new_capa(mrb, 2);
-  ARY_PTR(a)[0] = car;
-  ARY_PTR(a)[1] = cdr;
-  ARY_SET_LEN(a, 2);
-  return mrb_obj_value(a);
-}
-
-static void
-ary_fill_with_nil(mrb_value *ptr, mrb_int size)
-{
-  mrb_value nil = mrb_nil_value();
-
-  while (size--) {
-    *ptr++ = nil;
-  }
-}
-
-static void
-ary_modify_check(mrb_state *mrb, struct RArray *a)
-{
-  if (MRB_FROZEN_P(a)) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "can't modify frozen array");
-  }
-}
-
-static void
-ary_modify(mrb_state *mrb, struct RArray *a)
-{
-  ary_modify_check(mrb, a);
-
-  if (ARY_SHARED_P(a)) {
-    mrb_shared_array *shared = a->as.heap.aux.shared;
-
-    if (shared->refcnt == 1 && a->as.heap.ptr == shared->ptr) {
-      a->as.heap.ptr = shared->ptr;
-      a->as.heap.aux.capa = a->as.heap.len;
-      mrb_free(mrb, shared);
-    }
-    else {
-      mrb_value *ptr, *p;
-      mrb_int len;
-
-      p = a->as.heap.ptr;
-      len = a->as.heap.len * sizeof(mrb_value);
-      ptr = (mrb_value *)mrb_malloc(mrb, len);
-      if (p) {
-        array_copy(ptr, p, a->as.heap.len);
-      }
-      a->as.heap.ptr = ptr;
-      a->as.heap.aux.capa = a->as.heap.len;
-      mrb_ary_decref(mrb, shared);
-    }
-    ARY_UNSET_SHARED_FLAG(a);
-  }
-}
-
-MRB_API void
-mrb_ary_modify(mrb_state *mrb, struct RArray* a)
-{
-  mrb_write_barrier(mrb, (struct RBasic*)a);
-  ary_modify(mrb, a);
-}
-
-static void
-ary_make_shared(mrb_state *mrb, struct RArray *a)
-{
-  if (!ARY_SHARED_P(a) && !ARY_EMBED_P(a)) {
-    mrb_shared_array *shared = (mrb_shared_array *)mrb_malloc(mrb, sizeof(mrb_shared_array));
-    mrb_value *ptr = a->as.heap.ptr;
-    mrb_int len = a->as.heap.len;
-
-    shared->refcnt = 1;
-    if (a->as.heap.aux.capa > len) {
-      a->as.heap.ptr = shared->ptr = (mrb_value *)mrb_realloc(mrb, ptr, sizeof(mrb_value)*len+1);
-    }
-    else {
-      shared->ptr = ptr;
-    }
-    shared->len = len;
-    a->as.heap.aux.shared = shared;
-    ARY_SET_SHARED_FLAG(a);
-  }
-}
-
-static void
-ary_expand_capa(mrb_state *mrb, struct RArray *a, mrb_int len)
-{
-  mrb_int capa = ARY_CAPA(a);
-
-  if (len > ARY_MAX_SIZE || len < 0) {
-  size_error:
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
-  }
-
-  if (capa < ARY_DEFAULT_LEN) {
-    capa = ARY_DEFAULT_LEN;
-  }
-  while (capa < len) {
-    if (capa <= ARY_MAX_SIZE / 2) {
-      capa *= 2;
-    }
-    else {
-      capa = len;
-    }
-  }
-  if (capa < len || capa > ARY_MAX_SIZE) {
-    goto size_error;
-  }
-
-  if (ARY_EMBED_P(a)) {
-    mrb_value *ptr = ARY_EMBED_PTR(a);
-    mrb_int len = ARY_EMBED_LEN(a);
-    mrb_value *expanded_ptr = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*capa);
-
-    ARY_UNSET_EMBED_FLAG(a);
-    array_copy(expanded_ptr, ptr, len);
-    a->as.heap.len = len;
-    a->as.heap.aux.capa = capa;
-    a->as.heap.ptr = expanded_ptr;
-  }
-  else if (capa > a->as.heap.aux.capa) {
-    mrb_value *expanded_ptr = (mrb_value *)mrb_realloc(mrb, a->as.heap.ptr, sizeof(mrb_value)*capa);
-
-    a->as.heap.aux.capa = capa;
-    a->as.heap.ptr = expanded_ptr;
-  }
-}
-
-static void
-ary_shrink_capa(mrb_state *mrb, struct RArray *a)
-{
-  
-  mrb_int capa;
-
-  if (ARY_EMBED_P(a)) return;
-
-  capa = a->as.heap.aux.capa;
-  if (capa < ARY_DEFAULT_LEN * 2) return;
-  if (capa <= a->as.heap.len * ARY_SHRINK_RATIO) return;
-
-  do {
-    capa /= 2;
-    if (capa < ARY_DEFAULT_LEN) {
-      capa = ARY_DEFAULT_LEN;
-      break;
-    }
-  } while (capa > a->as.heap.len * ARY_SHRINK_RATIO);
-
-  if (capa > a->as.heap.len && capa < a->as.heap.aux.capa) {
-    a->as.heap.aux.capa = capa;
-    a->as.heap.ptr = (mrb_value *)mrb_realloc(mrb, a->as.heap.ptr, sizeof(mrb_value)*capa);
-  }
-}
-
-MRB_API mrb_value
-mrb_ary_resize(mrb_state *mrb, mrb_value ary, mrb_int new_len)
-{
-  mrb_int old_len;
-  struct RArray *a = mrb_ary_ptr(ary);
-
-  ary_modify(mrb, a);
-  old_len = RARRAY_LEN(ary);
-  if (old_len != new_len) {
-    ARY_SET_LEN(a, new_len);
-    if (new_len < old_len) {
-      ary_shrink_capa(mrb, a);
-    }
-    else {
-      ary_expand_capa(mrb, a, new_len);
-      ary_fill_with_nil(ARY_PTR(a) + old_len, new_len - old_len);
-    }
-  }
-
-  return ary;
-}
-
-static mrb_value
-mrb_ary_s_create(mrb_state *mrb, mrb_value klass)
-{
-  mrb_value ary;
-  mrb_value *vals;
-  mrb_int len;
-  struct RArray *a;
-
-  mrb_get_args(mrb, "*!", &vals, &len);
-  ary = mrb_ary_new_from_values(mrb, len, vals);
-  a = mrb_ary_ptr(ary);
-  a->c = mrb_class_ptr(klass);
-
-  return ary;
-}
-
-static void
-ary_concat(mrb_state *mrb, struct RArray *a, struct RArray *a2)
-{
-  mrb_int len;
-
-  if (ARY_LEN(a2) > ARY_MAX_SIZE - ARY_LEN(a)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
-  }
-  len = ARY_LEN(a) + ARY_LEN(a2);
-
-  ary_modify(mrb, a);
-  if (ARY_CAPA(a) < len) {
-    ary_expand_capa(mrb, a, len);
-  }
-  array_copy(ARY_PTR(a)+ARY_LEN(a), ARY_PTR(a2), ARY_LEN(a2));
-  mrb_write_barrier(mrb, (struct RBasic*)a);
-  ARY_SET_LEN(a, len);
-}
-
-MRB_API void
-mrb_ary_concat(mrb_state *mrb, mrb_value self, mrb_value other)
-{
-  struct RArray *a2 = mrb_ary_ptr(other);
-
-  ary_concat(mrb, mrb_ary_ptr(self), a2);
-}
-
-static mrb_value
-mrb_ary_concat_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value ary;
-
-  mrb_get_args(mrb, "A", &ary);
-  mrb_ary_concat(mrb, self, ary);
-  return self;
-}
-
-static mrb_value
-mrb_ary_plus(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a1 = mrb_ary_ptr(self);
-  struct RArray *a2;
-  mrb_value *ptr;
-  mrb_int blen, len1;
-
-  mrb_get_args(mrb, "a", &ptr, &blen);
-  if (ARY_MAX_SIZE - blen < ARY_LEN(a1)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
-  }
-  len1 = ARY_LEN(a1);
-  a2 = ary_new_capa(mrb, len1 + blen);
-  array_copy(ARY_PTR(a2), ARY_PTR(a1), len1);
-  array_copy(ARY_PTR(a2) + len1, ptr, blen);
-  ARY_SET_LEN(a2, len1+blen);
-
-  return mrb_obj_value(a2);
-}
-
-static void
-ary_replace(mrb_state *mrb, struct RArray *a, mrb_value *argv, mrb_int len)
-{
-  ary_modify(mrb, a);
-  if (ARY_CAPA(a) < len)
-    ary_expand_capa(mrb, a, len);
-  array_copy(ARY_PTR(a), argv, len);
-  mrb_write_barrier(mrb, (struct RBasic*)a);
-  ARY_SET_LEN(a, len);
-}
-
-MRB_API void
-mrb_ary_replace(mrb_state *mrb, mrb_value self, mrb_value other)
-{
-  struct RArray *a1 = mrb_ary_ptr(self);
-  struct RArray *a2 = mrb_ary_ptr(other);
-
-  if (a1 != a2) {
-    ary_replace(mrb, a1, ARY_PTR(a2), ARY_LEN(a2));
-  }
-}
-
-static mrb_value
-mrb_ary_replace_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-
-  mrb_get_args(mrb, "A", &other);
-  mrb_ary_replace(mrb, self, other);
-
-  return self;
-}
-
-static mrb_value
-mrb_ary_times(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a1 = mrb_ary_ptr(self);
-  struct RArray *a2;
-  mrb_value *ptr;
-  mrb_int times, len1;
-
-  mrb_get_args(mrb, "i", &times);
-  if (times < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "negative argument");
-  }
-  if (times == 0) return mrb_ary_new(mrb);
-  if (ARY_MAX_SIZE / times < ARY_LEN(a1)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
-  }
-  len1 = ARY_LEN(a1);
-  a2 = ary_new_capa(mrb, len1 * times);
-  ARY_SET_LEN(a2, len1 * times);
-  ptr = ARY_PTR(a2);
-  while (times--) {
-    array_copy(ptr, ARY_PTR(a1), len1);
-    ptr += len1;
-  }
-
-  return mrb_obj_value(a2);
-}
-
-static mrb_value
-mrb_ary_reverse_bang(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int len = ARY_LEN(a);
-
-  if (len > 1) {
-    mrb_value *p1, *p2;
-
-    ary_modify(mrb, a);
-    p1 = ARY_PTR(a);
-    p2 = p1 + len - 1;
-
-    while (p1 < p2) {
-      mrb_value tmp = *p1;
-      *p1++ = *p2;
-      *p2-- = tmp;
-    }
-  }
-  return self;
-}
-
-static mrb_value
-mrb_ary_reverse(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self), *b = ary_new_capa(mrb, ARY_LEN(a));
-  mrb_int len = ARY_LEN(a);
-
-  if (len > 0) {
-    mrb_value *p1, *p2, *e;
-
-    p1 = ARY_PTR(a);
-    e  = p1 + len;
-    p2 = ARY_PTR(b) + len - 1;
-    while (p1 < e) {
-      *p2-- = *p1++;
-    }
-    ARY_SET_LEN(b, len);
-  }
-  return mrb_obj_value(b);
-}
-
-MRB_API void
-mrb_ary_push(mrb_state *mrb, mrb_value ary, mrb_value elem)
-{
-  struct RArray *a = mrb_ary_ptr(ary);
-  mrb_int len = ARY_LEN(a);
-
-  ary_modify(mrb, a);
-  if (len == ARY_CAPA(a))
-    ary_expand_capa(mrb, a, len + 1);
-  ARY_PTR(a)[len] = elem;
-  ARY_SET_LEN(a, len+1);
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)a, elem);
-}
-
-static mrb_value
-mrb_ary_push_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *argv;
-  mrb_int len;
-
-  mrb_get_args(mrb, "*!", &argv, &len);
-  while (len--) {
-    mrb_ary_push(mrb, self, *argv++);
-  }
-
-  return self;
-}
-
-MRB_API mrb_value
-mrb_ary_pop(mrb_state *mrb, mrb_value ary)
-{
-  struct RArray *a = mrb_ary_ptr(ary);
-  mrb_int len = ARY_LEN(a);
-
-  ary_modify_check(mrb, a);
-  if (len == 0) return mrb_nil_value();
-  ARY_SET_LEN(a, len-1);
-  return ARY_PTR(a)[len-1];
-}
-
-#define ARY_SHIFT_SHARED_MIN 10
-
-MRB_API mrb_value
-mrb_ary_shift(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int len = ARY_LEN(a);
-  mrb_value val;
-
-  ary_modify_check(mrb, a);
-  if (len == 0) return mrb_nil_value();
-  if (ARY_SHARED_P(a)) {
-  L_SHIFT:
-    val = a->as.heap.ptr[0];
-    a->as.heap.ptr++;
-    a->as.heap.len--;
-    return val;
-  }
-  if (len > ARY_SHIFT_SHARED_MIN) {
-    ary_make_shared(mrb, a);
-    goto L_SHIFT;
-  }
-  else {
-    mrb_value *ptr = ARY_PTR(a);
-    mrb_int size = len;
-
-    val = *ptr;
-    while (--size) {
-      *ptr = *(ptr+1);
-      ++ptr;
-    }
-    ARY_SET_LEN(a, len-1);
-  }
-  return val;
-}
-
-/* self = [1,2,3]
-   item = 0
-   self.unshift item
-   p self #=> [0, 1, 2, 3] */
-MRB_API mrb_value
-mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int len = ARY_LEN(a);
-
-  if (ARY_SHARED_P(a)
-      && a->as.heap.aux.shared->refcnt == 1 /* shared only referenced from this array */
-      && a->as.heap.ptr - a->as.heap.aux.shared->ptr >= 1) /* there's room for unshifted item */ {
-    a->as.heap.ptr--;
-    a->as.heap.ptr[0] = item;
-  }
-  else {
-    mrb_value *ptr;
-
-    ary_modify(mrb, a);
-    if (ARY_CAPA(a) < len + 1)
-      ary_expand_capa(mrb, a, len + 1);
-    ptr = ARY_PTR(a);
-    value_move(ptr + 1, ptr, len);
-    ptr[0] = item;
-  }
-  ARY_SET_LEN(a, len+1);
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)a, item);
-
-  return self;
-}
-
-static mrb_value
-mrb_ary_unshift_m(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_value *vals, *ptr;
-  mrb_int alen, len;
-
-  mrb_get_args(mrb, "*!", &vals, &alen);
-  len = ARY_LEN(a);
-  if (alen > ARY_MAX_SIZE - len) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
-  }
-  if (ARY_SHARED_P(a)
-      && a->as.heap.aux.shared->refcnt == 1 /* shared only referenced from this array */
-      && a->as.heap.ptr - a->as.heap.aux.shared->ptr >= alen) /* there's room for unshifted item */ {
-    ary_modify_check(mrb, a);
-    a->as.heap.ptr -= len;
-    ptr = a->as.heap.ptr;
-  }
-  else {
-    ary_modify(mrb, a);
-    if (alen == 0) return self;
-    if (ARY_CAPA(a) < len + alen)
-      ary_expand_capa(mrb, a, len + alen);
-    ptr = ARY_PTR(a);
-    value_move(ptr + alen, ptr, len);
-  }
-  array_copy(ptr, vals, alen);
-  ARY_SET_LEN(a, len+alen);
-  while (len--) {
-    mrb_field_write_barrier_value(mrb, (struct RBasic*)a, vals[len]);
-  }
-
-  return self;
-}
-
-MRB_API mrb_value
-mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n)
-{
-  struct RArray *a = mrb_ary_ptr(ary);
-  mrb_int len = ARY_LEN(a);
-
-  /* range check */
-  if (n < 0) n += len;
-  if (n < 0 || len <= n) return mrb_nil_value();
-
-  return ARY_PTR(a)[n];
-}
-
-MRB_API void
-mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val)
-{
-  struct RArray *a = mrb_ary_ptr(ary);
-  mrb_int len = ARY_LEN(a);
-
-  ary_modify(mrb, a);
-  /* range check */
-  if (n < 0) {
-    n += len;
-    if (n < 0) {
-      mrb_raisef(mrb, E_INDEX_ERROR, "index %S out of array", mrb_fixnum_value(n - len));
-    }
-  }
-  if (len <= n) {
-    if (ARY_CAPA(a) <= n)
-      ary_expand_capa(mrb, a, n + 1);
-    ary_fill_with_nil(ARY_PTR(a) + len, n + 1 - len);
-    ARY_SET_LEN(a, n+1);
-  }
-
-  ARY_PTR(a)[n] = val;
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)a, val);
-}
-
-static struct RArray*
-ary_dup(mrb_state *mrb, struct RArray *a)
-{
-  mrb_int len = ARY_LEN(a);
-  struct RArray *d = ary_new_capa(mrb, len);
-
-  ary_replace(mrb, d, ARY_PTR(a), len);
-  return d;
-}
-
-MRB_API mrb_value
-mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_value rpl)
-{
-  struct RArray *a = mrb_ary_ptr(ary);
-  mrb_int alen = ARY_LEN(a);
-  const mrb_value *argv;
-  mrb_int argc;
-  mrb_int tail;
-
-  ary_modify(mrb, a);
-
-  /* len check */
-  if (len < 0) mrb_raisef(mrb, E_INDEX_ERROR, "negative length (%S)", mrb_fixnum_value(len));
-
-  /* range check */
-  if (head < 0) {
-    head += alen;
-    if (head < 0) {
-      mrb_raise(mrb, E_INDEX_ERROR, "index is out of array");
-    }
-  }
-  tail = head + len;
-  if (alen < len || alen < tail) {
-    len = alen - head;
-  }
-
-  /* size check */
-  if (mrb_array_p(rpl)) {
-    argc = RARRAY_LEN(rpl);
-    argv = RARRAY_PTR(rpl);
-    if (argv == ARY_PTR(a)) {
-      struct RArray *r;
-
-      if (argc > 32767) {
-        mrb_raise(mrb, E_ARGUMENT_ERROR, "too big recursive splice");
-      }
-      r = ary_dup(mrb, a);
-      argv = ARY_PTR(r);
-    }
-  }
-  else {
-    argc = 1;
-    argv = &rpl;
-  }
-  if (head >= alen) {
-    if (head > ARY_MAX_SIZE - argc) {
-      mrb_raisef(mrb, E_INDEX_ERROR, "index %S too big", mrb_fixnum_value(head));
-    }
-    len = head + argc;
-    if (len > ARY_CAPA(a)) {
-      ary_expand_capa(mrb, a, head + argc);
-    }
-    ary_fill_with_nil(ARY_PTR(a) + alen, head - alen);
-    if (argc > 0) {
-      array_copy(ARY_PTR(a) + head, argv, argc);
-    }
-    ARY_SET_LEN(a, len);
-  }
-  else {
-    mrb_int newlen;
-
-    if (alen - len > ARY_MAX_SIZE - argc) {
-      mrb_raisef(mrb, E_INDEX_ERROR, "index %S too big", mrb_fixnum_value(alen + argc - len));
-    }
-    newlen = alen + argc - len;
-    if (newlen > ARY_CAPA(a)) {
-      ary_expand_capa(mrb, a, newlen);
-    }
-
-    if (len != argc) {
-      mrb_value *ptr = ARY_PTR(a);
-      tail = head + len;
-      value_move(ptr + head + argc, ptr + tail, alen - tail);
-      ARY_SET_LEN(a, newlen);
-    }
-    if (argc > 0) {
-      value_move(ARY_PTR(a) + head, argv, argc);
-    }
-  }
-  mrb_write_barrier(mrb, (struct RBasic*)a);
-  return ary;
-}
-
-void
-mrb_ary_decref(mrb_state *mrb, mrb_shared_array *shared)
-{
-  shared->refcnt--;
-  if (shared->refcnt == 0) {
-    mrb_free(mrb, shared->ptr);
-    mrb_free(mrb, shared);
-  }
-}
-
-static mrb_value
-ary_subseq(mrb_state *mrb, struct RArray *a, mrb_int beg, mrb_int len)
-{
-  struct RArray *b;
-
-  if (!ARY_SHARED_P(a) && len <= ARY_SHIFT_SHARED_MIN) {
-    return mrb_ary_new_from_values(mrb, len, ARY_PTR(a)+beg);
-  }
-  ary_make_shared(mrb, a);
-  b  = (struct RArray*)mrb_obj_alloc(mrb, MRB_TT_ARRAY, mrb->array_class);
-  b->as.heap.ptr = a->as.heap.ptr + beg;
-  b->as.heap.len = len;
-  b->as.heap.aux.shared = a->as.heap.aux.shared;
-  b->as.heap.aux.shared->refcnt++;
-  ARY_SET_SHARED_FLAG(b);
-
-  return mrb_obj_value(b);
-}
-
-static mrb_int
-aget_index(mrb_state *mrb, mrb_value index)
-{
-  if (mrb_fixnum_p(index)) {
-    return mrb_fixnum(index);
-  }
-  else if (mrb_float_p(index)) {
-    return (mrb_int)mrb_float(index);
-  }
-  else {
-    mrb_int i, argc;
-    mrb_value *argv;
-
-    mrb_get_args(mrb, "i*!", &i, &argv, &argc);
-    return i;
-  }
-}
-
-/*
- *  call-seq:
- *     ary[index]                -> obj     or nil
- *     ary[start, length]        -> new_ary or nil
- *     ary[range]                -> new_ary or nil
- *     ary.slice(index)          -> obj     or nil
- *     ary.slice(start, length)  -> new_ary or nil
- *     ary.slice(range)          -> new_ary or nil
- *
- *  Element Reference --- Returns the element at +index+, or returns a
- *  subarray starting at the +start+ index and continuing for +length+
- *  elements, or returns a subarray specified by +range+ of indices.
- *
- *  Negative indices count backward from the end of the array (-1 is the last
- *  element).  For +start+ and +range+ cases the starting index is just before
- *  an element.  Additionally, an empty array is returned when the starting
- *  index for an element range is at the end of the array.
- *
- *  Returns +nil+ if the index (or starting index) are out of range.
- *
- *  a = [ "a", "b", "c", "d", "e" ]
- *  a[1]     => "b"
- *  a[1,2]   => ["b", "c"]
- *  a[1..-2] => ["b", "c", "d"]
- *
- */
-
-static mrb_value
-mrb_ary_aget(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int i, len, alen = ARY_LEN(a);
-  mrb_value index;
-
-  if (mrb_get_args(mrb, "o|i", &index, &len) == 1) {
-    switch (mrb_type(index)) {
-      /* a[n..m] */
-    case MRB_TT_RANGE:
-      if (mrb_range_beg_len(mrb, index, &i, &len, alen, TRUE) == 1) {
-        return ary_subseq(mrb, a, i, len);
-      }
-      else {
-        return mrb_nil_value();
-      }
-    case MRB_TT_FIXNUM:
-      return mrb_ary_ref(mrb, self, mrb_fixnum(index));
-    default:
-      return mrb_ary_ref(mrb, self, aget_index(mrb, index));
-    }
-  }
-
-  i = aget_index(mrb, index);
-  if (i < 0) i += alen;
-  if (i < 0 || alen < i) return mrb_nil_value();
-  if (len < 0) return mrb_nil_value();
-  if (alen == i) return mrb_ary_new(mrb);
-  if (len > alen - i) len = alen - i;
-
-  return ary_subseq(mrb, a, i, len);
-}
-
-/*
- *  call-seq:
- *     ary[index]         = obj                      ->  obj
- *     ary[start, length] = obj or other_ary or nil  ->  obj or other_ary or nil
- *     ary[range]         = obj or other_ary or nil  ->  obj or other_ary or nil
- *
- *  Element Assignment --- Sets the element at +index+, or replaces a subarray
- *  from the +start+ index for +length+ elements, or replaces a subarray
- *  specified by the +range+ of indices.
- *
- *  If indices are greater than the current capacity of the array, the array
- *  grows automatically.  Elements are inserted into the array at +start+ if
- *  +length+ is zero.
- *
- *  Negative indices will count backward from the end of the array.  For
- *  +start+ and +range+ cases the starting index is just before an element.
- *
- *  An IndexError is raised if a negative index points past the beginning of
- *  the array.
- *
- *  See also Array#push, and Array#unshift.
- *
- *     a = Array.new
- *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
- *     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
- *     a[1..2] = [ 1, 2 ]          #=> ["a", 1, 2, nil, "4"]
- *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
- *     a[0..2] = "A"               #=> ["A", "4"]
- *     a[-1]   = "Z"               #=> ["A", "Z"]
- *     a[1..-1] = nil              #=> ["A", nil]
- *     a[1..-1] = []               #=> ["A"]
- *     a[0, 0] = [ 1, 2 ]          #=> [1, 2, "A"]
- *     a[3, 0] = "B"               #=> [1, 2, "A", "B"]
- */
-
-static mrb_value
-mrb_ary_aset(mrb_state *mrb, mrb_value self)
-{
-  mrb_value v1, v2, v3;
-  mrb_int i, len;
-
-  mrb_ary_modify(mrb, mrb_ary_ptr(self));
-  if (mrb_get_args(mrb, "oo|o", &v1, &v2, &v3) == 2) {
-    /* a[n..m] = v */
-    switch (mrb_range_beg_len(mrb, v1, &i, &len, RARRAY_LEN(self), FALSE)) {
-    case 0:                   /* not range */
-      mrb_ary_set(mrb, self, aget_index(mrb, v1), v2);
-      break;
-    case 1:                   /* range */
-      mrb_ary_splice(mrb, self, i, len, v2);
-      break;
-    case 2:                   /* out of range */
-      mrb_raisef(mrb, E_RANGE_ERROR, "%S out of range", v1);
-      break;
-    }
-    return v2;
-  }
-
-  /* a[n,m] = v */
-  mrb_ary_splice(mrb, self, aget_index(mrb, v1), aget_index(mrb, v2), v3);
-  return v3;
-}
-
-static mrb_value
-mrb_ary_delete_at(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int   index;
-  mrb_value val;
-  mrb_value *ptr;
-  mrb_int len, alen = ARY_LEN(a);
-
-  mrb_get_args(mrb, "i", &index);
-  if (index < 0) index += alen;
-  if (index < 0 || alen <= index) return mrb_nil_value();
-
-  ary_modify(mrb, a);
-  ptr = ARY_PTR(a);
-  val = ptr[index];
-
-  ptr += index;
-  len = alen - index;
-  while (--len) {
-    *ptr = *(ptr+1);
-    ++ptr;
-  }
-  ARY_SET_LEN(a, alen-1);
-
-  ary_shrink_capa(mrb, a);
-
-  return val;
-}
-
-static mrb_value
-mrb_ary_first(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int size, alen = ARY_LEN(a);
-
-  if (mrb_get_args(mrb, "|i", &size) == 0) {
-    return (alen > 0)? ARY_PTR(a)[0]: mrb_nil_value();
-  }
-  if (size < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "negative array size");
-  }
-
-  if (size > alen) size = alen;
-  if (ARY_SHARED_P(a)) {
-    return ary_subseq(mrb, a, 0, size);
-  }
-  return mrb_ary_new_from_values(mrb, size, ARY_PTR(a));
-}
-
-static mrb_value
-mrb_ary_last(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-  mrb_int size, alen = ARY_LEN(a);
-
-  if (mrb_get_args(mrb, "|i", &size) == 0)
-    return (alen > 0)? ARY_PTR(a)[alen - 1]: mrb_nil_value();
-
-  if (size < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "negative array size");
-  }
-  if (size > alen) size = alen;
-  if (ARY_SHARED_P(a) || size > ARY_DEFAULT_LEN) {
-    return ary_subseq(mrb, a, alen - size, size);
-  }
-  return mrb_ary_new_from_values(mrb, size, ARY_PTR(a) + alen - size);
-}
-
-static mrb_value
-mrb_ary_index_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value obj;
-  mrb_int i;
-
-  mrb_get_args(mrb, "o", &obj);
-  for (i = 0; i < RARRAY_LEN(self); i++) {
-    if (mrb_equal(mrb, RARRAY_PTR(self)[i], obj)) {
-      return mrb_fixnum_value(i);
-    }
-  }
-  return mrb_nil_value();
-}
-
-static mrb_value
-mrb_ary_rindex_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value obj;
-  mrb_int i, len;
-
-  mrb_get_args(mrb, "o", &obj);
-  for (i = RARRAY_LEN(self) - 1; i >= 0; i--) {
-    if (mrb_equal(mrb, RARRAY_PTR(self)[i], obj)) {
-      return mrb_fixnum_value(i);
-    }
-    if (i > (len = RARRAY_LEN(self))) {
-      i = len;
-    }
-  }
-  return mrb_nil_value();
-}
-
-MRB_API mrb_value
-mrb_ary_splat(mrb_state *mrb, mrb_value v)
-{
-  mrb_value a, recv_class;
-
-  if (mrb_array_p(v)) {
-    return v;
-  }
-
-  if (!mrb_respond_to(mrb, v, mrb_intern_lit(mrb, "to_a"))) {
-    return mrb_ary_new_from_values(mrb, 1, &v);
-  }
-
-  a = mrb_funcall(mrb, v, "to_a", 0);
-  if (mrb_array_p(a)) {
-    return a;
-  }
-  else if (mrb_nil_p(a)) {
-    return mrb_ary_new_from_values(mrb, 1, &v);
-  }
-  else {
-    recv_class = mrb_obj_value(mrb_obj_class(mrb, v));
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S to Array (%S#to_a gives %S)",
-      recv_class,
-      recv_class,
-      mrb_obj_value(mrb_obj_class(mrb, a))
-    );
-    /* not reached */
-    return mrb_undef_value();
-  }
-}
-
-static mrb_value
-mrb_ary_size(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-
-  return mrb_fixnum_value(ARY_LEN(a));
-}
-
-MRB_API mrb_value
-mrb_ary_clear(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-
-  ary_modify(mrb, a);
-  if (ARY_SHARED_P(a)) {
-    mrb_ary_decref(mrb, a->as.heap.aux.shared);
-    ARY_UNSET_SHARED_FLAG(a);
-  }
-  else if (!ARY_EMBED_P(a)){
-    mrb_free(mrb, a->as.heap.ptr);
-  }
-  ARY_SET_EMBED_FLAG(a);
-  ARY_SET_EMBED_LEN(a, 0);
-
-  return self;
-}
-
-static mrb_value
-mrb_ary_empty_p(mrb_state *mrb, mrb_value self)
-{
-  struct RArray *a = mrb_ary_ptr(self);
-
-  return mrb_bool_value(ARY_LEN(a) == 0);
-}
-
-MRB_API mrb_value
-mrb_check_array_type(mrb_state *mrb, mrb_value ary)
-{
-  return mrb_check_convert_type(mrb, ary, MRB_TT_ARRAY, "Array", "to_ary");
-}
-
-MRB_API mrb_value
-mrb_ary_entry(mrb_value ary, mrb_int offset)
-{
-  if (offset < 0) {
-    offset += RARRAY_LEN(ary);
-  }
-  return ary_elt(ary, offset);
-}
-
-static mrb_value
-join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list)
-{
-  mrb_int i;
-  mrb_value result, val, tmp;
-
-  /* check recursive */
-  for (i=0; i<RARRAY_LEN(list); i++) {
-    if (mrb_obj_equal(mrb, ary, RARRAY_PTR(list)[i])) {
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "recursive array join");
-    }
-  }
-
-  mrb_ary_push(mrb, list, ary);
-
-  result = mrb_str_buf_new(mrb, 64);
-
-  for (i=0; i<RARRAY_LEN(ary); i++) {
-    if (i > 0 && !mrb_nil_p(sep)) {
-      mrb_str_cat_str(mrb, result, sep);
-    }
-
-    val = RARRAY_PTR(ary)[i];
-    switch (mrb_type(val)) {
-    case MRB_TT_ARRAY:
-    ary_join:
-      val = join_ary(mrb, val, sep, list);
-      /* fall through */
-
-    case MRB_TT_STRING:
-    str_join:
-      mrb_str_cat_str(mrb, result, val);
-      break;
-
-    default:
-      if (!mrb_immediate_p(val)) {
-        tmp = mrb_check_string_type(mrb, val);
-        if (!mrb_nil_p(tmp)) {
-          val = tmp;
-          goto str_join;
-        }
-        tmp = mrb_check_convert_type(mrb, val, MRB_TT_ARRAY, "Array", "to_ary");
-        if (!mrb_nil_p(tmp)) {
-          val = tmp;
-          goto ary_join;
-        }
-      }
-      val = mrb_obj_as_string(mrb, val);
-      goto str_join;
-    }
-  }
-
-  mrb_ary_pop(mrb, list);
-
-  return result;
-}
-
-MRB_API mrb_value
-mrb_ary_join(mrb_state *mrb, mrb_value ary, mrb_value sep)
-{
-  if (!mrb_nil_p(sep)) {
-    sep = mrb_obj_as_string(mrb, sep);
-  }
-  return join_ary(mrb, ary, sep, mrb_ary_new(mrb));
-}
-
-/*
- *  call-seq:
- *     ary.join(sep="")    -> str
- *
- *  Returns a string created by converting each element of the array to
- *  a string, separated by <i>sep</i>.
- *
- *     [ "a", "b", "c" ].join        #=> "abc"
- *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
- */
-
-static mrb_value
-mrb_ary_join_m(mrb_state *mrb, mrb_value ary)
-{
-  mrb_value sep = mrb_nil_value();
-
-  mrb_get_args(mrb, "|S!", &sep);
-  return mrb_ary_join(mrb, ary, sep);
-}
-
-static mrb_value
-mrb_ary_eq(mrb_state *mrb, mrb_value ary1)
-{
-  mrb_value ary2;
-
-  mrb_get_args(mrb, "o", &ary2);
-  if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value();
-  if (!mrb_array_p(ary2)) {
-    return mrb_false_value();
-  }
-  if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return mrb_false_value();
-
-  return ary2;
-}
-
-static mrb_value
-mrb_ary_cmp(mrb_state *mrb, mrb_value ary1)
-{
-  mrb_value ary2;
-
-  mrb_get_args(mrb, "o", &ary2);
-  if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_fixnum_value(0);
-  if (!mrb_array_p(ary2)) {
-    return mrb_nil_value();
-  }
-
-  return ary2;
-}
-
-void
-mrb_init_array(mrb_state *mrb)
-{
-  struct RClass *a;
-
-  mrb->array_class = a = mrb_define_class(mrb, "Array", mrb->object_class);            /* 15.2.12 */
-  MRB_SET_INSTANCE_TT(a, MRB_TT_ARRAY);
-
-  mrb_define_class_method(mrb, a, "[]",        mrb_ary_s_create,     MRB_ARGS_ANY());  /* 15.2.12.4.1 */
-
-  mrb_define_method(mrb, a, "+",               mrb_ary_plus,         MRB_ARGS_REQ(1)); /* 15.2.12.5.1  */
-  mrb_define_method(mrb, a, "*",               mrb_ary_times,        MRB_ARGS_REQ(1)); /* 15.2.12.5.2  */
-  mrb_define_method(mrb, a, "<<",              mrb_ary_push_m,       MRB_ARGS_REQ(1)); /* 15.2.12.5.3  */
-  mrb_define_method(mrb, a, "[]",              mrb_ary_aget,         MRB_ARGS_ANY());  /* 15.2.12.5.4  */
-  mrb_define_method(mrb, a, "[]=",             mrb_ary_aset,         MRB_ARGS_ANY());  /* 15.2.12.5.5  */
-  mrb_define_method(mrb, a, "clear",           mrb_ary_clear,        MRB_ARGS_NONE()); /* 15.2.12.5.6  */
-  mrb_define_method(mrb, a, "concat",          mrb_ary_concat_m,     MRB_ARGS_REQ(1)); /* 15.2.12.5.8  */
-  mrb_define_method(mrb, a, "delete_at",       mrb_ary_delete_at,    MRB_ARGS_REQ(1)); /* 15.2.12.5.9  */
-  mrb_define_method(mrb, a, "empty?",          mrb_ary_empty_p,      MRB_ARGS_NONE()); /* 15.2.12.5.12 */
-  mrb_define_method(mrb, a, "first",           mrb_ary_first,        MRB_ARGS_OPT(1)); /* 15.2.12.5.13 */
-  mrb_define_method(mrb, a, "index",           mrb_ary_index_m,      MRB_ARGS_REQ(1)); /* 15.2.12.5.14 */
-  mrb_define_method(mrb, a, "initialize_copy", mrb_ary_replace_m,    MRB_ARGS_REQ(1)); /* 15.2.12.5.16 */
-  mrb_define_method(mrb, a, "join",            mrb_ary_join_m,       MRB_ARGS_ANY());  /* 15.2.12.5.17 */
-  mrb_define_method(mrb, a, "last",            mrb_ary_last,         MRB_ARGS_ANY());  /* 15.2.12.5.18 */
-  mrb_define_method(mrb, a, "length",          mrb_ary_size,         MRB_ARGS_NONE()); /* 15.2.12.5.19 */
-  mrb_define_method(mrb, a, "pop",             mrb_ary_pop,          MRB_ARGS_NONE()); /* 15.2.12.5.21 */
-  mrb_define_method(mrb, a, "push",            mrb_ary_push_m,       MRB_ARGS_ANY());  /* 15.2.12.5.22 */
-  mrb_define_method(mrb, a, "append",          mrb_ary_push_m,       MRB_ARGS_ANY());
-  mrb_define_method(mrb, a, "replace",         mrb_ary_replace_m,    MRB_ARGS_REQ(1)); /* 15.2.12.5.23 */
-  mrb_define_method(mrb, a, "reverse",         mrb_ary_reverse,      MRB_ARGS_NONE()); /* 15.2.12.5.24 */
-  mrb_define_method(mrb, a, "reverse!",        mrb_ary_reverse_bang, MRB_ARGS_NONE()); /* 15.2.12.5.25 */
-  mrb_define_method(mrb, a, "rindex",          mrb_ary_rindex_m,     MRB_ARGS_REQ(1)); /* 15.2.12.5.26 */
-  mrb_define_method(mrb, a, "shift",           mrb_ary_shift,        MRB_ARGS_NONE()); /* 15.2.12.5.27 */
-  mrb_define_method(mrb, a, "size",            mrb_ary_size,         MRB_ARGS_NONE()); /* 15.2.12.5.28 */
-  mrb_define_method(mrb, a, "slice",           mrb_ary_aget,         MRB_ARGS_ANY());  /* 15.2.12.5.29 */
-  mrb_define_method(mrb, a, "unshift",         mrb_ary_unshift_m,    MRB_ARGS_ANY());  /* 15.2.12.5.30 */
-  mrb_define_method(mrb, a, "prepend",         mrb_ary_unshift_m,    MRB_ARGS_ANY());
-
-  mrb_define_method(mrb, a, "__ary_eq",        mrb_ary_eq,           MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, a, "__ary_cmp",       mrb_ary_cmp,          MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, a, "__ary_index",     mrb_ary_index_m,      MRB_ARGS_REQ(1)); /* kept for mruby-array-ext */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/backtrace.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/backtrace.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/backtrace.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/backtrace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,283 +0,0 @@
-/*
-** backtrace.c -
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/variable.h>
-#include <mruby/proc.h>
-#include <mruby/array.h>
-#include <mruby/string.h>
-#include <mruby/class.h>
-#include <mruby/debug.h>
-#include <mruby/error.h>
-#include <mruby/numeric.h>
-#include <mruby/data.h>
-
-struct backtrace_location {
-  int lineno;
-  const char *filename;
-  mrb_sym method_id;
-};
-
-typedef void (*each_backtrace_func)(mrb_state*, int i, struct backtrace_location*, void*);
-
-static const mrb_data_type bt_type = { "Backtrace", mrb_free };
-
-static void
-each_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, each_backtrace_func func, void *data)
-{
-  int i, j;
-
-  if (ciidx >= mrb->c->ciend - mrb->c->cibase)
-    ciidx = 10; /* ciidx is broken... */
-
-  for (i=ciidx, j=0; i >= 0; i--,j++) {
-    struct backtrace_location loc;
-    mrb_callinfo *ci;
-    mrb_irep *irep;
-    mrb_code *pc;
-
-    ci = &mrb->c->cibase[i];
-
-    if (!ci->proc) continue;
-    if (MRB_PROC_CFUNC_P(ci->proc)) continue;
-
-    irep = ci->proc->body.irep;
-    if (!irep) continue;
-
-    if (mrb->c->cibase[i].err) {
-      pc = mrb->c->cibase[i].err;
-    }
-    else if (i+1 <= ciidx) {
-      pc = mrb->c->cibase[i+1].pc - 1;
-    }
-    else {
-      pc = pc0;
-    }
-    loc.filename = mrb_debug_get_filename(irep, (uint32_t)(pc - irep->iseq));
-    loc.lineno = mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq));
-
-    if (loc.lineno == -1) continue;
-
-    if (!loc.filename) {
-      loc.filename = "(unknown)";
-    }
-
-    loc.method_id = ci->mid;
-    func(mrb, j, &loc, data);
-  }
-}
-
-#ifndef MRB_DISABLE_STDIO
-
-static void
-print_backtrace(mrb_state *mrb, mrb_value backtrace)
-{
-  int i, n;
-  FILE *stream = stderr;
-
-  if (!mrb_array_p(backtrace)) return;
-
-  n = RARRAY_LEN(backtrace) - 1;
-  if (n == 0) return;
-
-  fprintf(stream, "trace:\n");
-  for (i=0; i<n; i++) {
-    mrb_value entry = RARRAY_PTR(backtrace)[n-i-1];
-
-    if (mrb_string_p(entry)) {
-      fprintf(stream, "\t[%d] %.*s\n", i, (int)RSTRING_LEN(entry), RSTRING_PTR(entry));
-    }
-  }
-}
-
-static int
-packed_bt_len(struct backtrace_location *bt, int n)
-{
-  int len = 0;
-  int i;
-
-  for (i=0; i<n; i++) {
-    if (!bt[i].filename && !bt[i].lineno && !bt[i].method_id)
-      continue;
-    len++;
-  }
-  return len;
-}
-
-static void
-print_packed_backtrace(mrb_state *mrb, mrb_value packed)
-{
-  FILE *stream = stderr;
-  struct backtrace_location *bt;
-  int n, i;
-  int ai = mrb_gc_arena_save(mrb);
-
-  bt = (struct backtrace_location*)mrb_data_check_get_ptr(mrb, packed, &bt_type);
-  if (bt == NULL) return;
-  n = (mrb_int)RDATA(packed)->flags;
-
-  if (packed_bt_len(bt, n) == 0) return;
-  fprintf(stream, "trace:\n");
-  for (i = 0; i<n; i++) {
-    struct backtrace_location *entry = &bt[n-i-1];
-    if (entry->filename == NULL) continue;
-    fprintf(stream, "\t[%d] %s:%d", i, entry->filename, entry->lineno);
-    if (entry->method_id != 0) {
-      const char *method_name;
-
-      method_name = mrb_sym2name(mrb, entry->method_id);
-      fprintf(stream, ":in %s", method_name);
-      mrb_gc_arena_restore(mrb, ai);
-    }
-    fprintf(stream, "\n");
-  }
-}
-
-/* mrb_print_backtrace
-
-   function to retrieve backtrace information from the last exception.
-*/
-
-MRB_API void
-mrb_print_backtrace(mrb_state *mrb)
-{
-  mrb_value backtrace;
-
-  if (!mrb->exc) {
-    return;
-  }
-
-  backtrace = mrb_obj_iv_get(mrb, mrb->exc, mrb_intern_lit(mrb, "backtrace"));
-  if (mrb_nil_p(backtrace)) return;
-  if (mrb_array_p(backtrace)) {
-    print_backtrace(mrb, backtrace);
-  }
-  else {
-    print_packed_backtrace(mrb, backtrace);
-  }
-}
-#else
-
-MRB_API void
-mrb_print_backtrace(mrb_state *mrb)
-{
-}
-
-#endif
-
-static void
-count_backtrace_i(mrb_state *mrb,
-                 int i,
-                 struct backtrace_location *loc,
-                 void *data)
-{
-  int *lenp = (int*)data;
-
-  if (loc->filename == NULL) return;
-  (*lenp)++;
-}
-
-static void
-pack_backtrace_i(mrb_state *mrb,
-                 int i,
-                 struct backtrace_location *loc,
-                 void *data)
-{
-  struct backtrace_location **pptr = (struct backtrace_location**)data;
-  struct backtrace_location *ptr = *pptr;
-
-  if (loc->filename == NULL) return;
-  *ptr = *loc;
-  *pptr = ptr+1;
-}
-
-static mrb_value
-packed_backtrace(mrb_state *mrb)
-{
-  struct RData *backtrace;
-  ptrdiff_t ciidx = mrb->c->ci - mrb->c->cibase;
-  int len = 0;
-  int size;
-  void *ptr;
-
-  each_backtrace(mrb, ciidx, mrb->c->ci->pc, count_backtrace_i, &len);
-  size = len * sizeof(struct backtrace_location);
-  ptr = mrb_malloc(mrb, size);
-  memset(ptr, 0, size);
-  backtrace = mrb_data_object_alloc(mrb, NULL, ptr, &bt_type);
-  backtrace->flags = (unsigned int)len;
-  each_backtrace(mrb, ciidx, mrb->c->ci->pc, pack_backtrace_i, &ptr);
-  return mrb_obj_value(backtrace);
-}
-
-void
-mrb_keep_backtrace(mrb_state *mrb, mrb_value exc)
-{
-  mrb_value backtrace;
-  int ai = mrb_gc_arena_save(mrb);
-
-  backtrace = packed_backtrace(mrb);
-  mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "backtrace"), backtrace);
-  mrb_gc_arena_restore(mrb, ai);
-}
-
-mrb_value
-mrb_unpack_backtrace(mrb_state *mrb, mrb_value backtrace)
-{
-  struct backtrace_location *bt;
-  mrb_int n, i;
-  int ai;
-
-  if (mrb_nil_p(backtrace)) {
-  empty_backtrace:
-    return mrb_ary_new_capa(mrb, 0);
-  }
-  if (mrb_array_p(backtrace)) return backtrace;
-  bt = (struct backtrace_location*)mrb_data_check_get_ptr(mrb, backtrace, &bt_type);
-  if (bt == NULL) goto empty_backtrace;
-  n = (mrb_int)RDATA(backtrace)->flags;
-  backtrace = mrb_ary_new_capa(mrb, n);
-  ai = mrb_gc_arena_save(mrb);
-  for (i = 0; i < n; i++) {
-    struct backtrace_location *entry = &bt[i];
-    mrb_value btline;
-
-    if (entry->filename == NULL) continue;
-    btline = mrb_format(mrb, "%S:%S",
-                              mrb_str_new_cstr(mrb, entry->filename),
-                              mrb_fixnum_value(entry->lineno));
-    if (entry->method_id != 0) {
-      mrb_str_cat_lit(mrb, btline, ":in ");
-      mrb_str_cat_cstr(mrb, btline, mrb_sym2name(mrb, entry->method_id));
-    }
-    mrb_ary_push(mrb, backtrace, btline);
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  return backtrace;
-}
-
-MRB_API mrb_value
-mrb_exc_backtrace(mrb_state *mrb, mrb_value exc)
-{
-  mrb_sym attr_name;
-  mrb_value backtrace;
-
-  attr_name = mrb_intern_lit(mrb, "backtrace");
-  backtrace = mrb_iv_get(mrb, exc, attr_name);
-  if (mrb_nil_p(backtrace) || mrb_array_p(backtrace)) {
-    return backtrace;
-  }
-  backtrace = mrb_unpack_backtrace(mrb, backtrace);
-  mrb_iv_set(mrb, exc, attr_name, backtrace);
-  return backtrace;
-}
-
-MRB_API mrb_value
-mrb_get_backtrace(mrb_state *mrb)
-{
-  return mrb_unpack_backtrace(mrb, packed_backtrace(mrb));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/class.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/class.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/class.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/class.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2383 +0,0 @@
-/*
-** class.c - Class class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <stdarg.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/numeric.h>
-#include <mruby/proc.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/error.h>
-#include <mruby/data.h>
-#include <mruby/istruct.h>
-
-KHASH_DEFINE(mt, mrb_sym, struct RProc*, TRUE, kh_int_hash_func, kh_int_hash_equal)
-
-void
-mrb_gc_mark_mt(mrb_state *mrb, struct RClass *c)
-{
-  khiter_t k;
-  khash_t(mt) *h = c->mt;
-
-  if (!h) return;
-  for (k = kh_begin(h); k != kh_end(h); k++) {
-    if (kh_exist(h, k)) {
-      struct RProc *m = kh_value(h, k);
-      if (m) {
-        mrb_gc_mark(mrb, (struct RBasic*)m);
-      }
-    }
-  }
-}
-
-size_t
-mrb_gc_mark_mt_size(mrb_state *mrb, struct RClass *c)
-{
-  khash_t(mt) *h = c->mt;
-
-  if (!h) return 0;
-  return kh_size(h);
-}
-
-void
-mrb_gc_free_mt(mrb_state *mrb, struct RClass *c)
-{
-  kh_destroy(mt, mrb, c->mt);
-}
-
-static void
-name_class(mrb_state *mrb, struct RClass *c, mrb_sym name)
-{
-  mrb_obj_iv_set(mrb, (struct RObject*)c,
-                 mrb_intern_lit(mrb, "__classid__"), mrb_symbol_value(name));
-}
-
-static void
-setup_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb_sym id)
-{
-  name_class(mrb, c, id);
-  mrb_obj_iv_set(mrb, (struct RObject*)outer, id, mrb_obj_value(c));
-  if (outer != mrb->object_class) {
-    mrb_obj_iv_set(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"),
-                   mrb_obj_value(outer));
-  }
-}
-
-#define make_metaclass(mrb, c) prepare_singleton_class((mrb), (struct RBasic*)(c))
-
-static void
-prepare_singleton_class(mrb_state *mrb, struct RBasic *o)
-{
-  struct RClass *sc, *c;
-
-  if (o->c->tt == MRB_TT_SCLASS) return;
-  sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class);
-  sc->mt = kh_init(mt, mrb);
-  sc->iv = 0;
-  if (o->tt == MRB_TT_CLASS) {
-    c = (struct RClass*)o;
-    if (!c->super) {
-      sc->super = mrb->class_class;
-    }
-    else {
-      sc->super = c->super->c;
-    }
-  }
-  else if (o->tt == MRB_TT_SCLASS) {
-    c = (struct RClass*)o;
-    while (c->super->tt == MRB_TT_ICLASS)
-      c = c->super;
-    make_metaclass(mrb, c->super);
-    sc->super = c->super->c;
-  }
-  else {
-    sc->super = o->c;
-    prepare_singleton_class(mrb, (struct RBasic*)sc);
-  }
-  o->c = sc;
-  mrb_field_write_barrier(mrb, (struct RBasic*)o, (struct RBasic*)sc);
-  mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)o);
-  mrb_obj_iv_set(mrb, (struct RObject*)sc, mrb_intern_lit(mrb, "__attached__"), mrb_obj_value(o));
-}
-
-static struct RClass *
-class_from_sym(mrb_state *mrb, struct RClass *klass, mrb_sym id)
-{
-  mrb_value c = mrb_const_get(mrb, mrb_obj_value(klass), id);
-
-  mrb_check_type(mrb, c, MRB_TT_CLASS);
-  return mrb_class_ptr(c);
-}
-
-static struct RClass *
-module_from_sym(mrb_state *mrb, struct RClass *klass, mrb_sym id)
-{
-  mrb_value c = mrb_const_get(mrb, mrb_obj_value(klass), id);
-
-  mrb_check_type(mrb, c, MRB_TT_MODULE);
-  return mrb_class_ptr(c);
-}
-
-static mrb_bool
-class_ptr_p(mrb_value obj)
-{
-  switch (mrb_type(obj)) {
-  case MRB_TT_CLASS:
-  case MRB_TT_SCLASS:
-  case MRB_TT_MODULE:
-    return TRUE;
-  default:
-    return FALSE;
-  }
-}
-
-MRB_API struct RClass*
-mrb_class_outer_module(mrb_state *mrb, struct RClass *c)
-{
-  mrb_value outer;
-  struct RClass *cls;
-
-  outer = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"));
-  if (mrb_nil_p(outer)) return NULL;
-  cls = mrb_class_ptr(outer);
-  if (cls->tt == MRB_TT_SCLASS)
-  {
-    mrb_value klass;
-    klass = mrb_obj_iv_get(mrb, (struct RObject *)cls,
-                           mrb_intern_lit(mrb, "__attached__"));
-    if (class_ptr_p(klass)) {
-      cls = mrb_class_ptr(klass);
-    }
-  }
-  return cls;
-}
-
-static void
-check_if_class_or_module(mrb_state *mrb, mrb_value obj)
-{
-  if (!class_ptr_p(obj)) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a class/module", mrb_inspect(mrb, obj));
-  }
-}
-
-static struct RClass*
-define_module(mrb_state *mrb, mrb_sym name, struct RClass *outer)
-{
-  struct RClass *m;
-
-  if (mrb_const_defined_at(mrb, mrb_obj_value(outer), name)) {
-    return module_from_sym(mrb, outer, name);
-  }
-  m = mrb_module_new(mrb);
-  setup_class(mrb, outer, m, name);
-
-  return m;
-}
-
-MRB_API struct RClass*
-mrb_define_module_id(mrb_state *mrb, mrb_sym name)
-{
-  return define_module(mrb, name, mrb->object_class);
-}
-
-MRB_API struct RClass*
-mrb_define_module(mrb_state *mrb, const char *name)
-{
-  return define_module(mrb, mrb_intern_cstr(mrb, name), mrb->object_class);
-}
-
-MRB_API struct RClass*
-mrb_vm_define_module(mrb_state *mrb, mrb_value outer, mrb_sym id)
-{
-  check_if_class_or_module(mrb, outer);
-  if (mrb_const_defined_at(mrb, outer, id)) {
-    mrb_value old = mrb_const_get(mrb, outer, id);
-
-    if (mrb_type(old) != MRB_TT_MODULE) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a module", mrb_inspect(mrb, old));
-    }
-    return mrb_class_ptr(old);
-  }
-  return define_module(mrb, id, mrb_class_ptr(outer));
-}
-
-MRB_API struct RClass*
-mrb_define_module_under(mrb_state *mrb, struct RClass *outer, const char *name)
-{
-  mrb_sym id = mrb_intern_cstr(mrb, name);
-  struct RClass * c = define_module(mrb, id, outer);
-
-  setup_class(mrb, outer, c, id);
-  return c;
-}
-
-static struct RClass*
-find_origin(struct RClass *c)
-{
-  MRB_CLASS_ORIGIN(c);
-  return c;
-}
-
-static struct RClass*
-define_class(mrb_state *mrb, mrb_sym name, struct RClass *super, struct RClass *outer)
-{
-  struct RClass * c;
-
-  if (mrb_const_defined_at(mrb, mrb_obj_value(outer), name)) {
-    c = class_from_sym(mrb, outer, name);
-    MRB_CLASS_ORIGIN(c);
-    if (super && mrb_class_real(c->super) != super) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "superclass mismatch for Class %S (%S not %S)",
-                 mrb_sym2str(mrb, name),
-                 mrb_obj_value(c->super), mrb_obj_value(super));
-    }
-    return c;
-  }
-
-  c = mrb_class_new(mrb, super);
-  setup_class(mrb, outer, c, name);
-
-  return c;
-}
-
-MRB_API struct RClass*
-mrb_define_class_id(mrb_state *mrb, mrb_sym name, struct RClass *super)
-{
-  if (!super) {
-    mrb_warn(mrb, "no super class for '%S', Object assumed", mrb_sym2str(mrb, name));
-  }
-  return define_class(mrb, name, super, mrb->object_class);
-}
-
-MRB_API struct RClass*
-mrb_define_class(mrb_state *mrb, const char *name, struct RClass *super)
-{
-  return mrb_define_class_id(mrb, mrb_intern_cstr(mrb, name), super);
-}
-
-static mrb_value mrb_bob_init(mrb_state *mrb, mrb_value cv);
-
-static void
-mrb_class_inherited(mrb_state *mrb, struct RClass *super, struct RClass *klass)
-{
-  mrb_value s;
-  mrb_sym mid;
-
-  if (!super)
-    super = mrb->object_class;
-  s = mrb_obj_value(super);
-  mid = mrb_intern_lit(mrb, "inherited");
-  if (!mrb_func_basic_p(mrb, s, mid, mrb_bob_init)) {
-    mrb_value c = mrb_obj_value(klass);
-    mrb_funcall_argv(mrb, mrb_obj_value(super), mid, 1, &c);
-  }
-}
-
-MRB_API struct RClass*
-mrb_vm_define_class(mrb_state *mrb, mrb_value outer, mrb_value super, mrb_sym id)
-{
-  struct RClass *s;
-  struct RClass *c;
-
-  if (!mrb_nil_p(super)) {
-    if (mrb_type(super) != MRB_TT_CLASS) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "superclass must be a Class (%S given)",
-                 mrb_inspect(mrb, super));
-    }
-    s = mrb_class_ptr(super);
-  }
-  else {
-    s = 0;
-  }
-  check_if_class_or_module(mrb, outer);
-  if (mrb_const_defined_at(mrb, outer, id)) {
-    mrb_value old = mrb_const_get(mrb, outer, id);
-
-    if (mrb_type(old) != MRB_TT_CLASS) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a class", mrb_inspect(mrb, old));
-    }
-    c = mrb_class_ptr(old);
-    if (s) {
-      /* check super class */
-      if (mrb_class_real(c->super) != s) {
-        mrb_raisef(mrb, E_TYPE_ERROR, "superclass mismatch for class %S", old);
-      }
-    }
-    return c;
-  }
-  c = define_class(mrb, id, s, mrb_class_ptr(outer));
-  mrb_class_inherited(mrb, mrb_class_real(c->super), c);
-
-  return c;
-}
-
-MRB_API mrb_bool
-mrb_class_defined(mrb_state *mrb, const char *name)
-{
-  mrb_value sym = mrb_check_intern_cstr(mrb, name);
-  if (mrb_nil_p(sym)) {
-    return FALSE;
-  }
-  return mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_symbol(sym));
-}
-
-MRB_API mrb_bool
-mrb_class_defined_under(mrb_state *mrb, struct RClass *outer, const char *name)
-{
-  mrb_value sym = mrb_check_intern_cstr(mrb, name);
-  if (mrb_nil_p(sym)) {
-    return FALSE;
-  }
-  return mrb_const_defined_at(mrb, mrb_obj_value(outer), mrb_symbol(sym));
-}
-
-MRB_API struct RClass *
-mrb_class_get_under(mrb_state *mrb, struct RClass *outer, const char *name)
-{
-  return class_from_sym(mrb, outer, mrb_intern_cstr(mrb, name));
-}
-
-MRB_API struct RClass *
-mrb_class_get(mrb_state *mrb, const char *name)
-{
-  return mrb_class_get_under(mrb, mrb->object_class, name);
-}
-
-MRB_API struct RClass *
-mrb_exc_get(mrb_state *mrb, const char *name)
-{
-  struct RClass *exc, *e;
-  mrb_value c = mrb_const_get(mrb, mrb_obj_value(mrb->object_class),
-                              mrb_intern_cstr(mrb, name));
-
-  if (mrb_type(c) != MRB_TT_CLASS) {
-    mrb_raise(mrb, mrb->eException_class, "exception corrupted");
-  }
-  exc = e = mrb_class_ptr(c);
-
-  while (e) {
-    if (e == mrb->eException_class)
-      return exc;
-    e = e->super;
-  }
-  return mrb->eException_class;
-}
-
-MRB_API struct RClass *
-mrb_module_get_under(mrb_state *mrb, struct RClass *outer, const char *name)
-{
-  return module_from_sym(mrb, outer, mrb_intern_cstr(mrb, name));
-}
-
-MRB_API struct RClass *
-mrb_module_get(mrb_state *mrb, const char *name)
-{
-  return mrb_module_get_under(mrb, mrb->object_class, name);
-}
-
-/*!
- * Defines a class under the namespace of \a outer.
- * \param outer  a class which contains the new class.
- * \param id     name of the new class
- * \param super  a class from which the new class will derive.
- *               NULL means \c Object class.
- * \return the created class
- * \throw TypeError if the constant name \a name is already taken but
- *                  the constant is not a \c Class.
- * \throw NameError if the class is already defined but the class can not
- *                  be reopened because its superclass is not \a super.
- * \post top-level constant named \a name refers the returned class.
- *
- * \note if a class named \a name is already defined and its superclass is
- *       \a super, the function just returns the defined class.
- */
-MRB_API struct RClass *
-mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super)
-{
-  mrb_sym id = mrb_intern_cstr(mrb, name);
-  struct RClass * c;
-
-#if 0
-  if (!super) {
-    mrb_warn(mrb, "no super class for '%S::%S', Object assumed",
-             mrb_obj_value(outer), mrb_sym2str(mrb, id));
-  }
-#endif
-  c = define_class(mrb, id, super, outer);
-  setup_class(mrb, outer, c, id);
-  return c;
-}
-
-MRB_API void
-mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, struct RProc *p)
-{
-  khash_t(mt) *h;
-  khiter_t k;
-  MRB_CLASS_ORIGIN(c);
-  h = c->mt;
-
-  if (MRB_FROZEN_P(c)) {
-    if (c->tt == MRB_TT_MODULE)
-      mrb_raise(mrb, E_RUNTIME_ERROR, "can't modify frozen module");
-    else
-      mrb_raise(mrb, E_RUNTIME_ERROR, "can't modify frozen class");
-  }
-  if (!h) h = c->mt = kh_init(mt, mrb);
-  k = kh_put(mt, mrb, h, mid);
-  kh_value(h, k) = p;
-  if (p) {
-    p->c = NULL;
-    mrb_field_write_barrier(mrb, (struct RBasic *)c, (struct RBasic *)p);
-  }
-}
-
-MRB_API void
-mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t func, mrb_aspec aspec)
-{
-  struct RProc *p;
-  int ai = mrb_gc_arena_save(mrb);
-
-  p = mrb_proc_new_cfunc(mrb, func);
-  p->target_class = c;
-  mrb_define_method_raw(mrb, c, mid, p);
-  mrb_gc_arena_restore(mrb, ai);
-}
-
-MRB_API void
-mrb_define_method(mrb_state *mrb, struct RClass *c, const char *name, mrb_func_t func, mrb_aspec aspec)
-{
-  mrb_define_method_id(mrb, c, mrb_intern_cstr(mrb, name), func, aspec);
-}
-
-/* a function to raise NotImplementedError with current method name */
-MRB_API void
-mrb_notimplement(mrb_state *mrb)
-{
-  const char *str;
-  mrb_int len;
-  mrb_callinfo *ci = mrb->c->ci;
-
-  if (ci->mid) {
-    str = mrb_sym2name_len(mrb, ci->mid, &len);
-    mrb_raisef(mrb, E_NOTIMP_ERROR,
-      "%S() function is unimplemented on this machine",
-      mrb_str_new_static(mrb, str, (size_t)len));
-  }
-}
-
-/* a function to be replacement of unimplemented method */
-MRB_API mrb_value
-mrb_notimplement_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_notimplement(mrb);
-  /* not reached */
-  return mrb_nil_value();
-}
-
-static mrb_value
-check_type(mrb_state *mrb, mrb_value val, enum mrb_vtype t, const char *c, const char *m)
-{
-  mrb_value tmp;
-
-  tmp = mrb_check_convert_type(mrb, val, t, c, m);
-  if (mrb_nil_p(tmp)) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "expected %S", mrb_str_new_cstr(mrb, c));
-  }
-  return tmp;
-}
-
-static mrb_value
-to_str(mrb_state *mrb, mrb_value val)
-{
-  return check_type(mrb, val, MRB_TT_STRING, "String", "to_str");
-}
-
-static mrb_value
-to_ary(mrb_state *mrb, mrb_value val)
-{
-  return check_type(mrb, val, MRB_TT_ARRAY, "Array", "to_ary");
-}
-
-static mrb_value
-to_hash(mrb_state *mrb, mrb_value val)
-{
-  return check_type(mrb, val, MRB_TT_HASH, "Hash", "to_hash");
-}
-
-static mrb_sym
-to_sym(mrb_state *mrb, mrb_value ss)
-{
-  if (mrb_type(ss) == MRB_TT_SYMBOL) {
-    return mrb_symbol(ss);
-  }
-  else if (mrb_string_p(ss)) {
-    return mrb_intern_str(mrb, to_str(mrb, ss));
-  }
-  else {
-    mrb_value obj = mrb_funcall(mrb, ss, "inspect", 0);
-    mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a symbol", obj);
-    /* not reached */
-    return 0;
-  }
-}
-
-/*
-  retrieve arguments from mrb_state.
-
-  mrb_get_args(mrb, format, ...)
-
-  returns number of arguments parsed.
-
-  format specifiers:
-
-    string  mruby type     C type                 note
-    ----------------------------------------------------------------------------------------------
-    o:      Object         [mrb_value]
-    C:      class/module   [mrb_value]
-    S:      String         [mrb_value]            when ! follows, the value may be nil
-    A:      Array          [mrb_value]            when ! follows, the value may be nil
-    H:      Hash           [mrb_value]            when ! follows, the value may be nil
-    s:      String         [char*,mrb_int]        Receive two arguments; s! gives (NULL,0) for nil
-    z:      String         [char*]                NUL terminated string; z! gives NULL for nil
-    a:      Array          [mrb_value*,mrb_int]   Receive two arguments; a! gives (NULL,0) for nil
-    f:      Float          [mrb_float]
-    i:      Integer        [mrb_int]
-    b:      Boolean        [mrb_bool]
-    n:      Symbol         [mrb_sym]
-    d:      Data           [void*,mrb_data_type const] 2nd argument will be used to check data type so it won't be modified
-    I:      Inline struct  [void*]
-    &:      Block          [mrb_value]
-    *:      rest argument  [mrb_value*,mrb_int]   The rest of the arguments as an array; *! avoid copy of the stack
-    |:      optional                              Following arguments are optional
-    ?:      optional given [mrb_bool]             true if preceding argument (optional) is given
- */
-MRB_API mrb_int
-mrb_get_args(mrb_state *mrb, const char *format, ...)
-{
-  char c;
-  int i = 0;
-  va_list ap;
-  int argc = mrb->c->ci->argc;
-  int arg_i = 0;
-  mrb_value *array_argv;
-  mrb_bool opt = FALSE;
-  mrb_bool given = TRUE;
-
-  va_start(ap, format);
-  if (argc < 0) {
-    struct RArray *a = mrb_ary_ptr(mrb->c->stack[1]);
-
-    argc = ARY_LEN(a);
-    array_argv = ARY_PTR(a);
-  }
-  else {
-    array_argv = NULL;
-  }
-
-#define ARGV \
-  (array_argv ? array_argv : (mrb->c->stack + 1))
-
-  while ((c = *format++)) {
-    switch (c) {
-    case '|': case '*': case '&': case '?':
-      break;
-    default:
-      if (argc <= i) {
-        if (opt) {
-          given = FALSE;
-        }
-        else {
-          mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
-        }
-      }
-      break;
-    }
-
-    switch (c) {
-    case 'o':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          *p = ARGV[arg_i++];
-          i++;
-        }
-      }
-      break;
-    case 'C':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (i < argc) {
-          mrb_value ss;
-
-          ss = ARGV[arg_i++];
-          if (!class_ptr_p(ss)) {
-            mrb_raisef(mrb, E_TYPE_ERROR, "%S is not class/module", ss);
-          }
-          *p = ss;
-          i++;
-        }
-      }
-      break;
-    case 'S':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *p = ARGV[arg_i++];
-            i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          *p = to_str(mrb, ARGV[arg_i++]);
-          i++;
-        }
-      }
-      break;
-    case 'A':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *p = ARGV[arg_i++];
-            i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          *p = to_ary(mrb, ARGV[arg_i++]);
-          i++;
-        }
-      }
-      break;
-    case 'H':
-      {
-        mrb_value *p;
-
-        p = va_arg(ap, mrb_value*);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *p = ARGV[arg_i++];
-            i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          *p = to_hash(mrb, ARGV[arg_i++]);
-          i++;
-        }
-      }
-      break;
-    case 's':
-      {
-        mrb_value ss;
-        char **ps = 0;
-        mrb_int *pl = 0;
-
-        ps = va_arg(ap, char**);
-        pl = va_arg(ap, mrb_int*);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *ps = NULL;
-            *pl = 0;
-            i++; arg_i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          ss = to_str(mrb, ARGV[arg_i++]);
-          *ps = RSTRING_PTR(ss);
-          *pl = RSTRING_LEN(ss);
-          i++;
-        }
-      }
-      break;
-    case 'z':
-      {
-        mrb_value ss;
-        const char **ps;
-
-        ps = va_arg(ap, const char**);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *ps = NULL;
-            i++; arg_i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          ss = to_str(mrb, ARGV[arg_i++]);
-          *ps = mrb_string_value_cstr(mrb, &ss);
-          i++;
-        }
-      }
-      break;
-    case 'a':
-      {
-        mrb_value aa;
-        struct RArray *a;
-        mrb_value **pb;
-        mrb_int *pl;
-
-        pb = va_arg(ap, mrb_value**);
-        pl = va_arg(ap, mrb_int*);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *pb = 0;
-            *pl = 0;
-            i++; arg_i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          aa = to_ary(mrb, ARGV[arg_i++]);
-          a = mrb_ary_ptr(aa);
-          *pb = ARY_PTR(a);
-          *pl = ARY_LEN(a);
-          i++;
-        }
-      }
-      break;
-    case 'I':
-      {
-        void* *p;
-        mrb_value ss;
-
-        p = va_arg(ap, void**);
-        if (i < argc) {
-          ss = ARGV[arg_i];
-          if (mrb_type(ss) != MRB_TT_ISTRUCT)
-          {
-            mrb_raisef(mrb, E_TYPE_ERROR, "%S is not inline struct", ss);
-          }
-          *p = mrb_istruct_ptr(ss);
-          arg_i++;
-          i++;
-        }
-      }
-      break;
-    case 'f':
-      {
-        mrb_float *p;
-
-        p = va_arg(ap, mrb_float*);
-        if (i < argc) {
-          *p = mrb_to_flo(mrb, ARGV[arg_i]);
-          arg_i++;
-          i++;
-        }
-      }
-      break;
-    case 'i':
-      {
-        mrb_int *p;
-
-        p = va_arg(ap, mrb_int*);
-        if (i < argc) {
-          switch (mrb_type(ARGV[arg_i])) {
-            case MRB_TT_FIXNUM:
-              *p = mrb_fixnum(ARGV[arg_i]);
-              break;
-            case MRB_TT_FLOAT:
-              {
-                mrb_float f = mrb_float(ARGV[arg_i]);
-
-                if (!FIXABLE_FLOAT(f)) {
-                  mrb_raise(mrb, E_RANGE_ERROR, "float too big for int");
-                }
-                *p = (mrb_int)f;
-              }
-              break;
-            case MRB_TT_STRING:
-              mrb_raise(mrb, E_TYPE_ERROR, "no implicit conversion of String into Integer");
-              break;
-            default:
-              *p = mrb_fixnum(mrb_Integer(mrb, ARGV[arg_i]));
-              break;
-          }
-          arg_i++;
-          i++;
-        }
-      }
-      break;
-    case 'b':
-      {
-        mrb_bool *boolp = va_arg(ap, mrb_bool*);
-
-        if (i < argc) {
-          mrb_value b = ARGV[arg_i++];
-          *boolp = mrb_test(b);
-          i++;
-        }
-      }
-      break;
-    case 'n':
-      {
-        mrb_sym *symp;
-
-        symp = va_arg(ap, mrb_sym*);
-        if (i < argc) {
-          mrb_value ss;
-
-          ss = ARGV[arg_i++];
-          *symp = to_sym(mrb, ss);
-          i++;
-        }
-      }
-      break;
-    case 'd':
-      {
-        void** datap;
-        struct mrb_data_type const* type;
-
-        datap = va_arg(ap, void**);
-        type = va_arg(ap, struct mrb_data_type const*);
-        if (*format == '!') {
-          format++;
-          if (i < argc && mrb_nil_p(ARGV[arg_i])) {
-            *datap = 0;
-            i++; arg_i++;
-            break;
-          }
-        }
-        if (i < argc) {
-          *datap = mrb_data_get_ptr(mrb, ARGV[arg_i++], type);
-          ++i;
-        }
-      }
-      break;
-
-    case '&':
-      {
-        mrb_value *p, *bp;
-
-        p = va_arg(ap, mrb_value*);
-        if (mrb->c->ci->argc < 0) {
-          bp = mrb->c->stack + 2;
-        }
-        else {
-          bp = mrb->c->stack + mrb->c->ci->argc + 1;
-        }
-        *p = *bp;
-      }
-      break;
-    case '|':
-      opt = TRUE;
-      break;
-    case '?':
-      {
-        mrb_bool *p;
-
-        p = va_arg(ap, mrb_bool*);
-        *p = given;
-      }
-      break;
-
-    case '*':
-      {
-        mrb_value **var;
-        mrb_int *pl;
-        mrb_bool nocopy = array_argv ? TRUE : FALSE;
-
-        if (*format == '!') {
-          format++;
-          nocopy = TRUE;
-        }
-        var = va_arg(ap, mrb_value**);
-        pl = va_arg(ap, mrb_int*);
-        if (argc > i) {
-          *pl = argc-i;
-          if (*pl > 0) {
-            if (nocopy) {
-              *var = ARGV+arg_i;
-            }
-            else {
-              mrb_value args = mrb_ary_new_from_values(mrb, *pl, ARGV+arg_i);
-              RARRAY(args)->c = NULL;
-              *var = RARRAY_PTR(args);
-            }
-          }
-          i = argc;
-          arg_i += *pl;
-        }
-        else {
-          *pl = 0;
-          *var = NULL;
-        }
-      }
-      break;
-    default:
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid argument specifier %S", mrb_str_new(mrb, &c, 1));
-      break;
-    }
-  }
-
-#undef ARGV
-
-  if (!c && argc > i) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
-  }
-  va_end(ap);
-  return i;
-}
-
-static struct RClass*
-boot_defclass(mrb_state *mrb, struct RClass *super)
-{
-  struct RClass *c;
-
-  c = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_CLASS, mrb->class_class);
-  if (super) {
-    c->super = super;
-    mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)super);
-  }
-  else {
-    c->super = mrb->object_class;
-  }
-  c->mt = kh_init(mt, mrb);
-  return c;
-}
-
-static void
-boot_initmod(mrb_state *mrb, struct RClass *mod)
-{
-  if (!mod->mt) {
-    mod->mt = kh_init(mt, mrb);
-  }
-}
-
-static struct RClass*
-include_class_new(mrb_state *mrb, struct RClass *m, struct RClass *super)
-{
-  struct RClass *ic = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_ICLASS, mrb->class_class);
-  if (m->tt == MRB_TT_ICLASS) {
-    m = m->c;
-  }
-  MRB_CLASS_ORIGIN(m);
-  ic->iv = m->iv;
-  ic->mt = m->mt;
-  ic->super = super;
-  if (m->tt == MRB_TT_ICLASS) {
-    ic->c = m->c;
-  }
-  else {
-    ic->c = m;
-  }
-  return ic;
-}
-
-static int
-include_module_at(mrb_state *mrb, struct RClass *c, struct RClass *ins_pos, struct RClass *m, int search_super)
-{
-  struct RClass *p, *ic;
-  void *klass_mt = find_origin(c)->mt;
-
-  while (m) {
-    int superclass_seen = 0;
-
-    if (m->flags & MRB_FLAG_IS_PREPENDED)
-      goto skip;
-
-    if (klass_mt && klass_mt == m->mt)
-      return -1;
-
-    p = c->super;
-    while(p) {
-      if (p->tt == MRB_TT_ICLASS) {
-        if (p->mt == m->mt) {
-          if (!superclass_seen) {
-            ins_pos = p; /* move insert point */
-          }
-          goto skip;
-        }
-      } else if (p->tt == MRB_TT_CLASS) {
-        if (!search_super) break;
-        superclass_seen = 1;
-      }
-      p = p->super;
-    }
-
-    ic = include_class_new(mrb, m, ins_pos->super);
-    ins_pos->super = ic;
-    mrb_field_write_barrier(mrb, (struct RBasic*)ins_pos, (struct RBasic*)ins_pos->super);
-    ins_pos = ic;
-  skip:
-    m = m->super;
-  }
-  return 0;
-}
-
-MRB_API void
-mrb_include_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
-{
-  int changed = include_module_at(mrb, c, find_origin(c), m, 1);
-  if (changed < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "cyclic include detected");
-  }
-}
-
-MRB_API void
-mrb_prepend_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
-{
-  struct RClass *origin;
-  int changed = 0;
-
-  if (!(c->flags & MRB_FLAG_IS_PREPENDED)) {
-    origin = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_ICLASS, c);
-    origin->flags |= MRB_FLAG_IS_ORIGIN;
-    origin->super = c->super;
-    c->super = origin;
-    origin->mt = c->mt;
-    c->mt = kh_init(mt, mrb);
-    mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)origin);
-    c->flags |= MRB_FLAG_IS_PREPENDED;
-  }
-  changed = include_module_at(mrb, c, c, m, 0);
-  if (changed < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "cyclic prepend detected");
-  }
-}
-
-static mrb_value
-mrb_mod_prepend_features(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value klass;
-
-  mrb_check_type(mrb, mod, MRB_TT_MODULE);
-  mrb_get_args(mrb, "C", &klass);
-  mrb_prepend_module(mrb, mrb_class_ptr(klass), mrb_class_ptr(mod));
-  return mod;
-}
-
-static mrb_value
-mrb_mod_append_features(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value klass;
-
-  mrb_check_type(mrb, mod, MRB_TT_MODULE);
-  mrb_get_args(mrb, "C", &klass);
-  mrb_include_module(mrb, mrb_class_ptr(klass), mrb_class_ptr(mod));
-  return mod;
-}
-
-/* 15.2.2.4.28 */
-/*
- *  call-seq:
- *     mod.include?(module)    -> true or false
- *
- *  Returns <code>true</code> if <i>module</i> is included in
- *  <i>mod</i> or one of <i>mod</i>'s ancestors.
- *
- *     module A
- *     end
- *     class B
- *       include A
- *     end
- *     class C < B
- *     end
- *     B.include?(A)   #=> true
- *     C.include?(A)   #=> true
- *     A.include?(A)   #=> false
- */
-static mrb_value
-mrb_mod_include_p(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value mod2;
-  struct RClass *c = mrb_class_ptr(mod);
-
-  mrb_get_args(mrb, "C", &mod2);
-  mrb_check_type(mrb, mod2, MRB_TT_MODULE);
-
-  while (c) {
-    if (c->tt == MRB_TT_ICLASS) {
-      if (c->c == mrb_class_ptr(mod2)) return mrb_true_value();
-    }
-    c = c->super;
-  }
-  return mrb_false_value();
-}
-
-static mrb_value
-mrb_mod_ancestors(mrb_state *mrb, mrb_value self)
-{
-  mrb_value result;
-  struct RClass *c = mrb_class_ptr(self);
-  result = mrb_ary_new(mrb);
-  while (c) {
-    if (c->tt == MRB_TT_ICLASS) {
-      mrb_ary_push(mrb, result, mrb_obj_value(c->c));
-    }
-    else if (!(c->flags & MRB_FLAG_IS_PREPENDED)) {
-      mrb_ary_push(mrb, result, mrb_obj_value(c));
-    }
-    c = c->super;
-  }
-
-  return result;
-}
-
-static mrb_value
-mrb_mod_extend_object(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value obj;
-
-  mrb_check_type(mrb, mod, MRB_TT_MODULE);
-  mrb_get_args(mrb, "o", &obj);
-  mrb_include_module(mrb, mrb_class_ptr(mrb_singleton_class(mrb, obj)), mrb_class_ptr(mod));
-  return mod;
-}
-
-static mrb_value
-mrb_mod_included_modules(mrb_state *mrb, mrb_value self)
-{
-  mrb_value result;
-  struct RClass *c = mrb_class_ptr(self);
-  struct RClass *origin = c;
-
-  MRB_CLASS_ORIGIN(origin);
-  result = mrb_ary_new(mrb);
-  while (c) {
-    if (c != origin && c->tt == MRB_TT_ICLASS) {
-      if (c->c->tt == MRB_TT_MODULE) {
-        mrb_ary_push(mrb, result, mrb_obj_value(c->c));
-      }
-    }
-    c = c->super;
-  }
-
-  return result;
-}
-
-static mrb_value
-mrb_mod_initialize(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value b;
-  struct RClass *m = mrb_class_ptr(mod);
-  boot_initmod(mrb, m); /* bootstrap a newly initialized module */
-  mrb_get_args(mrb, "|&", &b);
-  if (!mrb_nil_p(b)) {
-    mrb_yield_with_class(mrb, b, 1, &mod, mod, m);
-  }
-  return mod;
-}
-
-mrb_value mrb_class_instance_method_list(mrb_state*, mrb_bool, struct RClass*, int);
-
-/* 15.2.2.4.33 */
-/*
- *  call-seq:
- *     mod.instance_methods(include_super=true)   -> array
- *
- *  Returns an array containing the names of the public and protected instance
- *  methods in the receiver. For a module, these are the public and protected methods;
- *  for a class, they are the instance (not singleton) methods. With no
- *  argument, or with an argument that is <code>false</code>, the
- *  instance methods in <i>mod</i> are returned, otherwise the methods
- *  in <i>mod</i> and <i>mod</i>'s superclasses are returned.
- *
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       def method2()  end
- *     end
- *     class C < B
- *       def method3()  end
- *     end
- *
- *     A.instance_methods                #=> [:method1]
- *     B.instance_methods(false)         #=> [:method2]
- *     C.instance_methods(false)         #=> [:method3]
- *     C.instance_methods(true).length   #=> 43
- */
-
-static mrb_value
-mrb_mod_instance_methods(mrb_state *mrb, mrb_value mod)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  mrb_bool recur = TRUE;
-  mrb_get_args(mrb, "|b", &recur);
-  return mrb_class_instance_method_list(mrb, recur, c, 0);
-}
-
-/* implementation of module_eval/class_eval */
-mrb_value mrb_mod_module_eval(mrb_state*, mrb_value);
-
-static mrb_value
-mrb_mod_dummy_visibility(mrb_state *mrb, mrb_value mod)
-{
-  return mod;
-}
-
-MRB_API mrb_value
-mrb_singleton_class(mrb_state *mrb, mrb_value v)
-{
-  struct RBasic *obj;
-
-  switch (mrb_type(v)) {
-  case MRB_TT_FALSE:
-    if (mrb_nil_p(v))
-      return mrb_obj_value(mrb->nil_class);
-    return mrb_obj_value(mrb->false_class);
-  case MRB_TT_TRUE:
-    return mrb_obj_value(mrb->true_class);
-  case MRB_TT_CPTR:
-    return mrb_obj_value(mrb->object_class);
-  case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
-  case MRB_TT_FLOAT:
-    mrb_raise(mrb, E_TYPE_ERROR, "can't define singleton");
-    return mrb_nil_value();    /* not reached */
-  default:
-    break;
-  }
-  obj = mrb_basic_ptr(v);
-  prepare_singleton_class(mrb, obj);
-  return mrb_obj_value(obj->c);
-}
-
-MRB_API void
-mrb_define_singleton_method(mrb_state *mrb, struct RObject *o, const char *name, mrb_func_t func, mrb_aspec aspec)
-{
-  prepare_singleton_class(mrb, (struct RBasic*)o);
-  mrb_define_method_id(mrb, o->c, mrb_intern_cstr(mrb, name), func, aspec);
-}
-
-MRB_API void
-mrb_define_class_method(mrb_state *mrb, struct RClass *c, const char *name, mrb_func_t func, mrb_aspec aspec)
-{
-  mrb_define_singleton_method(mrb, (struct RObject*)c, name, func, aspec);
-}
-
-MRB_API void
-mrb_define_module_function(mrb_state *mrb, struct RClass *c, const char *name, mrb_func_t func, mrb_aspec aspec)
-{
-  mrb_define_class_method(mrb, c, name, func, aspec);
-  mrb_define_method(mrb, c, name, func, aspec);
-}
-
-MRB_API struct RProc*
-mrb_method_search_vm(mrb_state *mrb, struct RClass **cp, mrb_sym mid)
-{
-  khiter_t k;
-  struct RProc *m;
-  struct RClass *c = *cp;
-
-  while (c) {
-    khash_t(mt) *h = c->mt;
-
-    if (h) {
-      k = kh_get(mt, mrb, h, mid);
-      if (k != kh_end(h)) {
-        m = kh_value(h, k);
-        if (!m) break;
-        *cp = c;
-        return m;
-      }
-    }
-    c = c->super;
-  }
-  return NULL;                  /* no method */
-}
-
-MRB_API struct RProc*
-mrb_method_search(mrb_state *mrb, struct RClass* c, mrb_sym mid)
-{
-  struct RProc *m;
-
-  m = mrb_method_search_vm(mrb, &c, mid);
-  if (!m) {
-    mrb_value inspect = mrb_funcall(mrb, mrb_obj_value(c), "inspect", 0);
-    if (mrb_string_p(inspect) && RSTRING_LEN(inspect) > 64) {
-      inspect = mrb_any_to_s(mrb, mrb_obj_value(c));
-    }
-    mrb_name_error(mrb, mid, "undefined method '%S' for class %S",
-               mrb_sym2str(mrb, mid), inspect);
-  }
-  return m;
-}
-
-static mrb_value
-attr_reader(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value name = mrb_proc_cfunc_env_get(mrb, 0);
-  return mrb_iv_get(mrb, obj, to_sym(mrb, name));
-}
-
-static mrb_value
-mrb_mod_attr_reader(mrb_state *mrb, mrb_value mod)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  mrb_value *argv;
-  mrb_int argc, i;
-  int ai;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-  ai = mrb_gc_arena_save(mrb);
-  for (i=0; i<argc; i++) {
-    mrb_value name, str;
-    mrb_sym method, sym;
-
-    method = to_sym(mrb, argv[i]);
-    name = mrb_sym2str(mrb, method);
-    str = mrb_str_buf_new(mrb, RSTRING_LEN(name)+1);
-    mrb_str_cat_lit(mrb, str, "@");
-    mrb_str_cat_str(mrb, str, name);
-    sym = mrb_intern_str(mrb, str);
-    mrb_iv_check(mrb, sym);
-    name = mrb_symbol_value(sym);
-    mrb_define_method_raw(mrb, c, method,
-                          mrb_proc_new_cfunc_with_env(mrb, attr_reader, 1, &name));
-    mrb_gc_arena_restore(mrb, ai);
-  }
-  return mrb_nil_value();
-}
-
-static mrb_value
-attr_writer(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value name = mrb_proc_cfunc_env_get(mrb, 0);
-  mrb_value val;
-
-  mrb_get_args(mrb, "o", &val);
-  mrb_iv_set(mrb, obj, to_sym(mrb, name), val);
-  return val;
-}
-
-static mrb_value
-mrb_mod_attr_writer(mrb_state *mrb, mrb_value mod)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  mrb_value *argv;
-  mrb_int argc, i;
-  int ai;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-  ai = mrb_gc_arena_save(mrb);
-  for (i=0; i<argc; i++) {
-    mrb_value name, str, attr;
-    mrb_sym method, sym;
-
-    method = to_sym(mrb, argv[i]);
-
-    /* prepare iv name (@name) */
-    name = mrb_sym2str(mrb, method);
-    str = mrb_str_buf_new(mrb, RSTRING_LEN(name)+1);
-    mrb_str_cat_lit(mrb, str, "@");
-    mrb_str_cat_str(mrb, str, name);
-    sym = mrb_intern_str(mrb, str);
-    mrb_iv_check(mrb, sym);
-    attr = mrb_symbol_value(sym);
-
-    /* prepare method name (name=) */
-    str = mrb_str_buf_new(mrb, RSTRING_LEN(str));
-    mrb_str_cat_str(mrb, str, name);
-    mrb_str_cat_lit(mrb, str, "=");
-    method = mrb_intern_str(mrb, str);
-
-    mrb_define_method_raw(mrb, c, method,
-                          mrb_proc_new_cfunc_with_env(mrb, attr_writer, 1, &attr));
-    mrb_gc_arena_restore(mrb, ai);
-  }
-  return mrb_nil_value();
-}
-
-static mrb_value
-mrb_instance_alloc(mrb_state *mrb, mrb_value cv)
-{
-  struct RClass *c = mrb_class_ptr(cv);
-  struct RObject *o;
-  enum mrb_vtype ttype = MRB_INSTANCE_TT(c);
-
-  if (c->tt == MRB_TT_SCLASS)
-    mrb_raise(mrb, E_TYPE_ERROR, "can't create instance of singleton class");
-
-  if (ttype == 0) ttype = MRB_TT_OBJECT;
-  if (ttype <= MRB_TT_CPTR) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't create instance of %S", cv);
-  }
-  o = (struct RObject*)mrb_obj_alloc(mrb, ttype, c);
-  return mrb_obj_value(o);
-}
-
-/*
- *  call-seq:
- *     class.new(args, ...)    ->  obj
- *
- *  Creates a new object of <i>class</i>'s class, then
- *  invokes that object's <code>initialize</code> method,
- *  passing it <i>args</i>. This is the method that ends
- *  up getting called whenever an object is constructed using
- *  `.new`.
- *
- */
-
-MRB_API mrb_value
-mrb_instance_new(mrb_state *mrb, mrb_value cv)
-{
-  mrb_value obj, blk;
-  mrb_value *argv;
-  mrb_int argc;
-
-  mrb_get_args(mrb, "*&", &argv, &argc, &blk);
-  obj = mrb_instance_alloc(mrb, cv);
-  mrb_funcall_with_block(mrb, obj, mrb_intern_lit(mrb, "initialize"), argc, argv, blk);
-
-  return obj;
-}
-
-MRB_API mrb_value
-mrb_obj_new(mrb_state *mrb, struct RClass *c, mrb_int argc, const mrb_value *argv)
-{
-  mrb_value obj;
-  mrb_sym mid;
-
-  obj = mrb_instance_alloc(mrb, mrb_obj_value(c));
-  mid = mrb_intern_lit(mrb, "initialize");
-  if (!mrb_func_basic_p(mrb, obj, mid, mrb_bob_init)) {
-    mrb_funcall_argv(mrb, obj, mid, argc, argv);
-  }
-  return obj;
-}
-
-static mrb_value
-mrb_class_initialize(mrb_state *mrb, mrb_value c)
-{
-  mrb_value a, b;
-
-  mrb_get_args(mrb, "|C&", &a, &b);
-  if (!mrb_nil_p(b)) {
-    mrb_yield_with_class(mrb, b, 1, &c, c, mrb_class_ptr(c));
-  }
-  return c;
-}
-
-static mrb_value
-mrb_class_new_class(mrb_state *mrb, mrb_value cv)
-{
-  mrb_int n;
-  mrb_value super, blk;
-  mrb_value new_class;
-  mrb_sym mid;
-
-  n = mrb_get_args(mrb, "|C&", &super, &blk);
-  if (n == 0) {
-    super = mrb_obj_value(mrb->object_class);
-  }
-  new_class = mrb_obj_value(mrb_class_new(mrb, mrb_class_ptr(super)));
-  mid = mrb_intern_lit(mrb, "initialize");
-  if (!mrb_func_basic_p(mrb, new_class, mid, mrb_bob_init)) {
-    mrb_funcall_with_block(mrb, new_class, mid, n, &super, blk);
-  }
-  mrb_class_inherited(mrb, mrb_class_ptr(super), mrb_class_ptr(new_class));
-  return new_class;
-}
-
-static mrb_value
-mrb_class_superclass(mrb_state *mrb, mrb_value klass)
-{
-  struct RClass *c;
-
-  c = mrb_class_ptr(klass);
-  c = find_origin(c)->super;
-  while (c && c->tt == MRB_TT_ICLASS) {
-    c = find_origin(c)->super;
-  }
-  if (!c) return mrb_nil_value();
-  return mrb_obj_value(c);
-}
-
-static mrb_value
-mrb_bob_init(mrb_state *mrb, mrb_value cv)
-{
-  return mrb_nil_value();
-}
-
-static mrb_value
-mrb_bob_not(mrb_state *mrb, mrb_value cv)
-{
-  return mrb_bool_value(!mrb_test(cv));
-}
-
-/* 15.3.1.3.1  */
-/* 15.3.1.3.10 */
-/* 15.3.1.3.11 */
-/*
- *  call-seq:
- *     obj == other        -> true or false
- *     obj.equal?(other)   -> true or false
- *     obj.eql?(other)     -> true or false
- *
- *  Equality---At the <code>Object</code> level, <code>==</code> returns
- *  <code>true</code> only if <i>obj</i> and <i>other</i> are the
- *  same object. Typically, this method is overridden in descendant
- *  classes to provide class-specific meaning.
- *
- *  Unlike <code>==</code>, the <code>equal?</code> method should never be
- *  overridden by subclasses: it is used to determine object identity
- *  (that is, <code>a.equal?(b)</code> iff <code>a</code> is the same
- *  object as <code>b</code>).
- *
- *  The <code>eql?</code> method returns <code>true</code> if
- *  <i>obj</i> and <i>anObject</i> have the same value. Used by
- *  <code>Hash</code> to test members for equality.  For objects of
- *  class <code>Object</code>, <code>eql?</code> is synonymous with
- *  <code>==</code>. Subclasses normally continue this tradition, but
- *  there are exceptions. <code>Numeric</code> types, for example,
- *  perform type conversion across <code>==</code>, but not across
- *  <code>eql?</code>, so:
- *
- *     1 == 1.0     #=> true
- *     1.eql? 1.0   #=> false
- */
-mrb_value
-mrb_obj_equal_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-
-  mrb_get_args(mrb, "o", &arg);
-  return mrb_bool_value(mrb_obj_equal(mrb, self, arg));
-}
-
-static mrb_value
-mrb_obj_not_equal_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-
-  mrb_get_args(mrb, "o", &arg);
-  return mrb_bool_value(!mrb_equal(mrb, self, arg));
-}
-
-MRB_API mrb_bool
-mrb_obj_respond_to(mrb_state *mrb, struct RClass* c, mrb_sym mid)
-{
-  khiter_t k;
-
-  while (c) {
-    khash_t(mt) *h = c->mt;
-
-    if (h) {
-      k = kh_get(mt, mrb, h, mid);
-      if (k != kh_end(h)) {
-        if (kh_value(h, k)) {
-          return TRUE;  /* method exists */
-        }
-        else {
-          return FALSE; /* undefined method */
-        }
-      }
-    }
-    c = c->super;
-  }
-  return FALSE;         /* no method */
-}
-
-MRB_API mrb_bool
-mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid)
-{
-  return mrb_obj_respond_to(mrb, mrb_class(mrb, obj), mid);
-}
-
-MRB_API mrb_value
-mrb_class_path(mrb_state *mrb, struct RClass *c)
-{
-  mrb_value path;
-  const char *name;
-  mrb_sym classpath = mrb_intern_lit(mrb, "__classpath__");
-
-  path = mrb_obj_iv_get(mrb, (struct RObject*)c, classpath);
-  if (mrb_nil_p(path)) {
-    struct RClass *outer = mrb_class_outer_module(mrb, c);
-    mrb_sym sym = mrb_class_sym(mrb, c, outer);
-    mrb_int len;
-
-    if (sym == 0) {
-      return mrb_nil_value();
-    }
-    else if (outer && outer != c && outer != mrb->object_class) {
-      mrb_value base = mrb_class_path(mrb, outer);
-      path = mrb_str_buf_new(mrb, 0);
-      if (mrb_nil_p(base)) {
-        mrb_str_cat_lit(mrb, path, "#<Class:");
-        mrb_str_concat(mrb, path, mrb_ptr_to_str(mrb, outer));
-        mrb_str_cat_lit(mrb, path, ">");
-      }
-      else {
-        mrb_str_concat(mrb, path, base);
-      }
-      mrb_str_cat_lit(mrb, path, "::");
-      name = mrb_sym2name_len(mrb, sym, &len);
-      mrb_str_cat(mrb, path, name, len);
-    }
-    else {
-      name = mrb_sym2name_len(mrb, sym, &len);
-      path = mrb_str_new(mrb, name, len);
-    }
-    if (!MRB_FROZEN_P(c)) {
-      mrb_obj_iv_set(mrb, (struct RObject*)c, classpath, path);
-    }
-  }
-  return mrb_str_dup(mrb, path);
-}
-
-MRB_API struct RClass *
-mrb_class_real(struct RClass* cl)
-{
-  if (cl == 0)
-    return NULL;
-  while ((cl->tt == MRB_TT_SCLASS) || (cl->tt == MRB_TT_ICLASS)) {
-    cl = cl->super;
-  }
-  return cl;
-}
-
-MRB_API const char*
-mrb_class_name(mrb_state *mrb, struct RClass* c)
-{
-  mrb_value path = mrb_class_path(mrb, c);
-  if (mrb_nil_p(path)) {
-    path = mrb_str_new_lit(mrb, "#<Class:");
-    mrb_str_concat(mrb, path, mrb_ptr_to_str(mrb, c));
-    mrb_str_cat_lit(mrb, path, ">");
-  }
-  return RSTRING_PTR(path);
-}
-
-MRB_API const char*
-mrb_obj_classname(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_class_name(mrb, mrb_obj_class(mrb, obj));
-}
-
-/*!
- * Ensures a class can be derived from super.
- *
- * \param super a reference to an object.
- * \exception TypeError if \a super is not a Class or \a super is a singleton class.
- */
-static void
-mrb_check_inheritable(mrb_state *mrb, struct RClass *super)
-{
-  if (super->tt != MRB_TT_CLASS) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "superclass must be a Class (%S given)", mrb_obj_value(super));
-  }
-  if (super->tt == MRB_TT_SCLASS) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't make subclass of singleton class");
-  }
-  if (super == mrb->class_class) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't make subclass of Class");
-  }
-}
-
-/*!
- * Creates a new class.
- * \param super     a class from which the new class derives.
- * \exception TypeError \a super is not inheritable.
- * \exception TypeError \a super is the Class class.
- */
-MRB_API struct RClass*
-mrb_class_new(mrb_state *mrb, struct RClass *super)
-{
-  struct RClass *c;
-
-  if (super) {
-    mrb_check_inheritable(mrb, super);
-  }
-  c = boot_defclass(mrb, super);
-  if (super) {
-    MRB_SET_INSTANCE_TT(c, MRB_INSTANCE_TT(super));
-  }
-  make_metaclass(mrb, c);
-
-  return c;
-}
-
-/*!
- * Creates a new module.
- */
-MRB_API struct RClass*
-mrb_module_new(mrb_state *mrb)
-{
-  struct RClass *m = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_MODULE, mrb->module_class);
-  boot_initmod(mrb, m);
-  return m;
-}
-
-/*
- *  call-seq:
- *     obj.class    => class
- *
- *  Returns the class of <i>obj</i>, now preferred over
- *  <code>Object#type</code>, as an object's type in Ruby is only
- *  loosely tied to that object's class. This method must always be
- *  called with an explicit receiver, as <code>class</code> is also a
- *  reserved word in Ruby.
- *
- *     1.class      #=> Fixnum
- *     self.class   #=> Object
- */
-
-MRB_API struct RClass*
-mrb_obj_class(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_class_real(mrb_class(mrb, obj));
-}
-
-MRB_API void
-mrb_alias_method(mrb_state *mrb, struct RClass *c, mrb_sym a, mrb_sym b)
-{
-  struct RProc *m = mrb_method_search(mrb, c, b);
-
-  mrb_define_method_raw(mrb, c, a, m);
-}
-
-/*!
- * Defines an alias of a method.
- * \param klass  the class which the original method belongs to
- * \param name1  a new name for the method
- * \param name2  the original name of the method
- */
-MRB_API void
-mrb_define_alias(mrb_state *mrb, struct RClass *klass, const char *name1, const char *name2)
-{
-  mrb_alias_method(mrb, klass, mrb_intern_cstr(mrb, name1), mrb_intern_cstr(mrb, name2));
-}
-
-/*
- * call-seq:
- *   mod.to_s   -> string
- *
- * Return a string representing this module or class. For basic
- * classes and modules, this is the name. For singletons, we
- * show information on the thing we're attached to as well.
- */
-
-static mrb_value
-mrb_mod_to_s(mrb_state *mrb, mrb_value klass)
-{
-  mrb_value str;
-
-  if (mrb_type(klass) == MRB_TT_SCLASS) {
-    mrb_value v = mrb_iv_get(mrb, klass, mrb_intern_lit(mrb, "__attached__"));
-
-    str = mrb_str_new_lit(mrb, "#<Class:");
-
-    if (class_ptr_p(v)) {
-      mrb_str_cat_str(mrb, str, mrb_inspect(mrb, v));
-    }
-    else {
-      mrb_str_cat_str(mrb, str, mrb_any_to_s(mrb, v));
-    }
-    return mrb_str_cat_lit(mrb, str, ">");
-  }
-  else {
-    struct RClass *c;
-    mrb_value path;
-
-    str = mrb_str_buf_new(mrb, 32);
-    c = mrb_class_ptr(klass);
-    path = mrb_class_path(mrb, c);
-
-    if (mrb_nil_p(path)) {
-      switch (mrb_type(klass)) {
-        case MRB_TT_CLASS:
-          mrb_str_cat_lit(mrb, str, "#<Class:");
-          break;
-
-        case MRB_TT_MODULE:
-          mrb_str_cat_lit(mrb, str, "#<Module:");
-          break;
-
-        default:
-          /* Shouldn't be happened? */
-          mrb_str_cat_lit(mrb, str, "#<??????:");
-          break;
-      }
-      mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, c));
-      return mrb_str_cat_lit(mrb, str, ">");
-    }
-    else {
-      return path;
-    }
-  }
-}
-
-static mrb_value
-mrb_mod_alias(mrb_state *mrb, mrb_value mod)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  mrb_sym new_name, old_name;
-
-  mrb_get_args(mrb, "nn", &new_name, &old_name);
-  mrb_alias_method(mrb, c, new_name, old_name);
-  return mrb_nil_value();
-}
-
-static void
-undef_method(mrb_state *mrb, struct RClass *c, mrb_sym a)
-{
-  if (!mrb_obj_respond_to(mrb, c, a)) {
-    mrb_name_error(mrb, a, "undefined method '%S' for class '%S'", mrb_sym2str(mrb, a), mrb_obj_value(c));
-  }
-  else {
-    mrb_define_method_raw(mrb, c, a, NULL);
-  }
-}
-
-MRB_API void
-mrb_undef_method(mrb_state *mrb, struct RClass *c, const char *name)
-{
-  undef_method(mrb, c, mrb_intern_cstr(mrb, name));
-}
-
-MRB_API void
-mrb_undef_class_method(mrb_state *mrb, struct RClass *c, const char *name)
-{
-  mrb_undef_method(mrb,  mrb_class_ptr(mrb_singleton_class(mrb, mrb_obj_value(c))), name);
-}
-
-static mrb_value
-mrb_mod_undef(mrb_state *mrb, mrb_value mod)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  mrb_int argc;
-  mrb_value *argv;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-  while (argc--) {
-    undef_method(mrb, c, to_sym(mrb, *argv));
-    argv++;
-  }
-  return mrb_nil_value();
-}
-
-static mrb_value
-mod_define_method(mrb_state *mrb, mrb_value self)
-{
-  struct RClass *c = mrb_class_ptr(self);
-  struct RProc *p;
-  mrb_sym mid;
-  mrb_value proc = mrb_undef_value();
-  mrb_value blk;
-
-  mrb_get_args(mrb, "n|o&", &mid, &proc, &blk);
-  switch (mrb_type(proc)) {
-    case MRB_TT_PROC:
-      blk = proc;
-      break;
-    case MRB_TT_UNDEF:
-      /* ignored */
-      break;
-    default:
-      mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %S (expected Proc)", mrb_obj_value(mrb_obj_class(mrb, proc)));
-      break;
-  }
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  mrb_proc_copy(p, mrb_proc_ptr(blk));
-  p->flags |= MRB_PROC_STRICT;
-  mrb_define_method_raw(mrb, c, mid, p);
-  return mrb_symbol_value(mid);
-}
-
-static void
-check_cv_name_str(mrb_state *mrb, mrb_value str)
-{
-  const char *s = RSTRING_PTR(str);
-  mrb_int len = RSTRING_LEN(str);
-
-  if (len < 3 || !(s[0] == '@' && s[1] == '@')) {
-    mrb_name_error(mrb, mrb_intern_str(mrb, str), "'%S' is not allowed as a class variable name", str);
-  }
-}
-
-static void
-check_cv_name_sym(mrb_state *mrb, mrb_sym id)
-{
-  check_cv_name_str(mrb, mrb_sym2str(mrb, id));
-}
-
-/* 15.2.2.4.16 */
-/*
- *  call-seq:
- *     obj.class_variable_defined?(symbol)    -> true or false
- *
- *  Returns <code>true</code> if the given class variable is defined
- *  in <i>obj</i>.
- *
- *     class Fred
- *       @@foo = 99
- *     end
- *     Fred.class_variable_defined?(:@@foo)    #=> true
- *     Fred.class_variable_defined?(:@@bar)    #=> false
- */
-
-static mrb_value
-mrb_mod_cvar_defined(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-
-  mrb_get_args(mrb, "n", &id);
-  check_cv_name_sym(mrb, id);
-  return mrb_bool_value(mrb_cv_defined(mrb, mod, id));
-}
-
-/* 15.2.2.4.17 */
-/*
- *  call-seq:
- *     mod.class_variable_get(symbol)    -> obj
- *
- *  Returns the value of the given class variable (or throws a
- *  <code>NameError</code> exception). The <code>@@</code> part of the
- *  variable name should be included for regular class variables
- *
- *     class Fred
- *       @@foo = 99
- *     end
- *     Fred.class_variable_get(:@@foo)     #=> 99
- */
-
-static mrb_value
-mrb_mod_cvar_get(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-
-  mrb_get_args(mrb, "n", &id);
-  check_cv_name_sym(mrb, id);
-  return mrb_cv_get(mrb, mod, id);
-}
-
-/* 15.2.2.4.18 */
-/*
- *  call-seq:
- *     obj.class_variable_set(symbol, obj)    -> obj
- *
- *  Sets the class variable names by <i>symbol</i> to
- *  <i>object</i>.
- *
- *     class Fred
- *       @@foo = 99
- *       def foo
- *         @@foo
- *       end
- *     end
- *     Fred.class_variable_set(:@@foo, 101)     #=> 101
- *     Fred.new.foo                             #=> 101
- */
-
-static mrb_value
-mrb_mod_cvar_set(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value value;
-  mrb_sym id;
-
-  mrb_get_args(mrb, "no", &id, &value);
-  check_cv_name_sym(mrb, id);
-  mrb_cv_set(mrb, mod, id, value);
-  return value;
-}
-
-/* 15.2.2.4.39 */
-/*
- *  call-seq:
- *     remove_class_variable(sym)    -> obj
- *
- *  Removes the definition of the <i>sym</i>, returning that
- *  constant's value.
- *
- *     class Dummy
- *       @@var = 99
- *       puts @@var
- *       p class_variables
- *       remove_class_variable(:@@var)
- *       p class_variables
- *     end
- *
- *  <em>produces:</em>
- *
- *     99
- *     [:@@var]
- *     []
- */
-
-static mrb_value
-mrb_mod_remove_cvar(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value val;
-  mrb_sym id;
-
-  mrb_get_args(mrb, "n", &id);
-  check_cv_name_sym(mrb, id);
-
-  val = mrb_iv_remove(mrb, mod, id);
-  if (!mrb_undef_p(val)) return val;
-
-  if (mrb_cv_defined(mrb, mod, id)) {
-    mrb_name_error(mrb, id, "cannot remove %S for %S",
-                   mrb_sym2str(mrb, id), mod);
-  }
-
-  mrb_name_error(mrb, id, "class variable %S not defined for %S",
-                 mrb_sym2str(mrb, id), mod);
-
- /* not reached */
- return mrb_nil_value();
-}
-
-/* 15.2.2.4.34 */
-/*
- *  call-seq:
- *     mod.method_defined?(symbol)    -> true or false
- *
- *  Returns +true+ if the named method is defined by
- *  _mod_ (or its included modules and, if _mod_ is a class,
- *  its ancestors). Public and protected methods are matched.
- *
- *     module A
- *       def method1()  end
- *     end
- *     class B
- *       def method2()  end
- *     end
- *     class C < B
- *       include A
- *       def method3()  end
- *     end
- *
- *     A.method_defined? :method1    #=> true
- *     C.method_defined? "method1"   #=> true
- *     C.method_defined? "method2"   #=> true
- *     C.method_defined? "method3"   #=> true
- *     C.method_defined? "method4"   #=> false
- */
-
-static mrb_value
-mrb_mod_method_defined(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-
-  mrb_get_args(mrb, "n", &id);
-  return mrb_bool_value(mrb_obj_respond_to(mrb, mrb_class_ptr(mod), id));
-}
-
-static void
-remove_method(mrb_state *mrb, mrb_value mod, mrb_sym mid)
-{
-  struct RClass *c = mrb_class_ptr(mod);
-  khash_t(mt) *h = find_origin(c)->mt;
-  khiter_t k;
-
-  if (h) {
-    k = kh_get(mt, mrb, h, mid);
-    if (k != kh_end(h)) {
-      kh_del(mt, mrb, h, k);
-      mrb_funcall(mrb, mod, "method_removed", 1, mrb_symbol_value(mid));
-      return;
-    }
-  }
-
-  mrb_name_error(mrb, mid, "method '%S' not defined in %S",
-    mrb_sym2str(mrb, mid), mod);
-}
-
-/* 15.2.2.4.41 */
-/*
- *  call-seq:
- *     remove_method(symbol)   -> self
- *
- *  Removes the method identified by _symbol_ from the current
- *  class. For an example, see <code>Module.undef_method</code>.
- */
-
-static mrb_value
-mrb_mod_remove_method(mrb_state *mrb, mrb_value mod)
-{
-  mrb_int argc;
-  mrb_value *argv;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-  while (argc--) {
-    remove_method(mrb, mod, to_sym(mrb, *argv));
-    argv++;
-  }
-  return mod;
-}
-
-
-
-static void
-check_const_name_str(mrb_state *mrb, mrb_value str)
-{
-  if (RSTRING_LEN(str) < 1 || !ISUPPER(*RSTRING_PTR(str))) {
-    mrb_name_error(mrb, mrb_intern_str(mrb, str), "wrong constant name %S", str);
-  }
-}
-
-static void
-check_const_name_sym(mrb_state *mrb, mrb_sym id)
-{
-  check_const_name_str(mrb, mrb_sym2str(mrb, id));
-}
-
-static mrb_value
-const_defined(mrb_state *mrb, mrb_value mod, mrb_sym id, mrb_bool inherit)
-{
-  if (inherit) {
-    return mrb_bool_value(mrb_const_defined(mrb, mod, id));
-  }
-  return mrb_bool_value(mrb_const_defined_at(mrb, mod, id));
-}
-
-static mrb_value
-mrb_mod_const_defined(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-  mrb_bool inherit = TRUE;
-
-  mrb_get_args(mrb, "n|b", &id, &inherit);
-  check_const_name_sym(mrb, id);
-  return const_defined(mrb, mod, id, inherit);
-}
-
-static mrb_value
-mrb_mod_const_get(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-
-  mrb_get_args(mrb, "n", &id);
-  check_const_name_sym(mrb, id);
-  return mrb_const_get(mrb, mod, id);
-}
-
-static mrb_value
-mrb_mod_const_set(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-  mrb_value value;
-
-  mrb_get_args(mrb, "no", &id, &value);
-  check_const_name_sym(mrb, id);
-  if ((mrb_type(value) == MRB_TT_CLASS || mrb_type(value) == MRB_TT_MODULE)
-      && !mrb_obj_iv_defined(mrb, mrb_obj_ptr(value), mrb_intern_lit(mrb, "__classid__"))) {
-    /* name unnamed classes/modules */
-    setup_class(mrb, mrb_class_ptr(mod), mrb_class_ptr(value), id);
-  }
-  else {
-    mrb_const_set(mrb, mod, id, value);
-  }
-  return value;
-}
-
-static mrb_value
-mrb_mod_remove_const(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym id;
-  mrb_value val;
-
-  mrb_get_args(mrb, "n", &id);
-  check_const_name_sym(mrb, id);
-  val = mrb_iv_remove(mrb, mod, id);
-  if (mrb_undef_p(val)) {
-    mrb_name_error(mrb, id, "constant %S not defined", mrb_sym2str(mrb, id));
-  }
-  return val;
-}
-
-static mrb_value
-mrb_mod_const_missing(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym sym;
-
-  mrb_get_args(mrb, "n", &sym);
-
-  if (mrb_class_real(mrb_class_ptr(mod)) != mrb->object_class) {
-    mrb_name_error(mrb, sym, "uninitialized constant %S::%S",
-                   mod,
-                   mrb_sym2str(mrb, sym));
-  }
-  else {
-    mrb_name_error(mrb, sym, "uninitialized constant %S",
-                   mrb_sym2str(mrb, sym));
-  }
-  /* not reached */
-  return mrb_nil_value();
-}
-
-static mrb_value
-mrb_mod_s_constants(mrb_state *mrb, mrb_value mod)
-{
-  mrb_raise(mrb, E_NOTIMP_ERROR, "Module.constants not implemented");
-  return mrb_nil_value();       /* not reached */
-}
-
-static mrb_value
-mrb_mod_eqq(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value obj;
-  mrb_bool eqq;
-
-  mrb_get_args(mrb, "o", &obj);
-  eqq = mrb_obj_is_kind_of(mrb, obj, mrb_class_ptr(mod));
-
-  return mrb_bool_value(eqq);
-}
-
-MRB_API mrb_value
-mrb_mod_module_function(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value *argv;
-  mrb_int argc, i;
-  mrb_sym mid;
-  struct RProc *method_rproc;
-  struct RClass *rclass;
-  int ai;
-
-  mrb_check_type(mrb, mod, MRB_TT_MODULE);
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-  if (argc == 0) {
-    /* set MODFUNC SCOPE if implemented */
-    return mod;
-  }
-
-  /* set PRIVATE method visibility if implemented */
-  /* mrb_mod_dummy_visibility(mrb, mod); */
-
-  for (i=0; i<argc; i++) {
-    mrb_check_type(mrb, argv[i], MRB_TT_SYMBOL);
-
-    mid = mrb_symbol(argv[i]);
-    rclass = mrb_class_ptr(mod);
-    method_rproc = mrb_method_search(mrb, rclass, mid);
-
-    prepare_singleton_class(mrb, (struct RBasic*)rclass);
-    ai = mrb_gc_arena_save(mrb);
-    mrb_define_method_raw(mrb, rclass->c, mid, method_rproc);
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  return mod;
-}
-
-/* implementation of __id__ */
-mrb_value mrb_obj_id_m(mrb_state *mrb, mrb_value self);
-/* implementation of instance_eval */
-mrb_value mrb_obj_instance_eval(mrb_state*, mrb_value);
-
-void
-mrb_init_class(mrb_state *mrb)
-{
-  struct RClass *bob;           /* BasicObject */
-  struct RClass *obj;           /* Object */
-  struct RClass *mod;           /* Module */
-  struct RClass *cls;           /* Class */
-
-  /* boot class hierarchy */
-  bob = boot_defclass(mrb, 0);
-  obj = boot_defclass(mrb, bob); mrb->object_class = obj;
-  mod = boot_defclass(mrb, obj); mrb->module_class = mod;/* obj -> mod */
-  cls = boot_defclass(mrb, mod); mrb->class_class = cls; /* obj -> cls */
-  /* fix-up loose ends */
-  bob->c = obj->c = mod->c = cls->c = cls;
-  make_metaclass(mrb, bob);
-  make_metaclass(mrb, obj);
-  make_metaclass(mrb, mod);
-  make_metaclass(mrb, cls);
-
-  /* name basic classes */
-  mrb_define_const(mrb, bob, "BasicObject", mrb_obj_value(bob));
-  mrb_define_const(mrb, obj, "BasicObject", mrb_obj_value(bob));
-  mrb_define_const(mrb, obj, "Object",      mrb_obj_value(obj));
-  mrb_define_const(mrb, obj, "Module",      mrb_obj_value(mod));
-  mrb_define_const(mrb, obj, "Class",       mrb_obj_value(cls));
-
-  /* name each classes */
-  name_class(mrb, bob, mrb_intern_lit(mrb, "BasicObject"));
-  name_class(mrb, obj, mrb_intern_lit(mrb, "Object"));           /* 15.2.1 */
-  name_class(mrb, mod, mrb_intern_lit(mrb, "Module"));           /* 15.2.2 */
-  name_class(mrb, cls, mrb_intern_lit(mrb, "Class"));            /* 15.2.3 */
-
-  mrb->proc_class = mrb_define_class(mrb, "Proc", mrb->object_class);  /* 15.2.17 */
-  MRB_SET_INSTANCE_TT(mrb->proc_class, MRB_TT_PROC);
-
-  MRB_SET_INSTANCE_TT(cls, MRB_TT_CLASS);
-  mrb_define_method(mrb, bob, "initialize",              mrb_bob_init,             MRB_ARGS_NONE());
-  mrb_define_method(mrb, bob, "!",                       mrb_bob_not,              MRB_ARGS_NONE());
-  mrb_define_method(mrb, bob, "==",                      mrb_obj_equal_m,          MRB_ARGS_REQ(1)); /* 15.3.1.3.1  */
-  mrb_define_method(mrb, bob, "!=",                      mrb_obj_not_equal_m,      MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, bob, "__id__",                  mrb_obj_id_m,             MRB_ARGS_NONE()); /* 15.3.1.3.3  */
-  mrb_define_method(mrb, bob, "__send__",                mrb_f_send,               MRB_ARGS_ANY());  /* 15.3.1.3.4  */
-  mrb_define_method(mrb, bob, "instance_eval",           mrb_obj_instance_eval,    MRB_ARGS_ANY());  /* 15.3.1.3.18 */
-
-  mrb_define_class_method(mrb, cls, "new",               mrb_class_new_class,      MRB_ARGS_OPT(1));
-  mrb_define_method(mrb, cls, "superclass",              mrb_class_superclass,     MRB_ARGS_NONE()); /* 15.2.3.3.4 */
-  mrb_define_method(mrb, cls, "new",                     mrb_instance_new,         MRB_ARGS_ANY());  /* 15.2.3.3.3 */
-  mrb_define_method(mrb, cls, "initialize",              mrb_class_initialize,     MRB_ARGS_OPT(1)); /* 15.2.3.3.1 */
-  mrb_define_method(mrb, cls, "inherited",               mrb_bob_init,             MRB_ARGS_REQ(1));
-
-  MRB_SET_INSTANCE_TT(mod, MRB_TT_MODULE);
-  mrb_define_method(mrb, mod, "class_variable_defined?", mrb_mod_cvar_defined,     MRB_ARGS_REQ(1)); /* 15.2.2.4.16 */
-  mrb_define_method(mrb, mod, "class_variable_get",      mrb_mod_cvar_get,         MRB_ARGS_REQ(1)); /* 15.2.2.4.17 */
-  mrb_define_method(mrb, mod, "class_variable_set",      mrb_mod_cvar_set,         MRB_ARGS_REQ(2)); /* 15.2.2.4.18 */
-  mrb_define_method(mrb, mod, "extend_object",           mrb_mod_extend_object,    MRB_ARGS_REQ(1)); /* 15.2.2.4.25 */
-  mrb_define_method(mrb, mod, "extended",                mrb_bob_init,             MRB_ARGS_REQ(1)); /* 15.2.2.4.26 */
-  mrb_define_method(mrb, mod, "prepended",               mrb_bob_init,             MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, mod, "prepend_features",        mrb_mod_prepend_features, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, mod, "include?",                mrb_mod_include_p,        MRB_ARGS_REQ(1)); /* 15.2.2.4.28 */
-  mrb_define_method(mrb, mod, "append_features",         mrb_mod_append_features,  MRB_ARGS_REQ(1)); /* 15.2.2.4.10 */
-  mrb_define_method(mrb, mod, "class_eval",              mrb_mod_module_eval,      MRB_ARGS_ANY());  /* 15.2.2.4.15 */
-  mrb_define_method(mrb, mod, "included",                mrb_bob_init,             MRB_ARGS_REQ(1)); /* 15.2.2.4.29 */
-  mrb_define_method(mrb, mod, "included_modules",        mrb_mod_included_modules, MRB_ARGS_NONE()); /* 15.2.2.4.30 */
-  mrb_define_method(mrb, mod, "initialize",              mrb_mod_initialize,       MRB_ARGS_NONE()); /* 15.2.2.4.31 */
-  mrb_define_method(mrb, mod, "instance_methods",        mrb_mod_instance_methods, MRB_ARGS_ANY());  /* 15.2.2.4.33 */
-  mrb_define_method(mrb, mod, "method_defined?",         mrb_mod_method_defined,   MRB_ARGS_REQ(1)); /* 15.2.2.4.34 */
-  mrb_define_method(mrb, mod, "module_eval",             mrb_mod_module_eval,      MRB_ARGS_ANY());  /* 15.2.2.4.35 */
-  mrb_define_method(mrb, mod, "module_function",         mrb_mod_module_function,  MRB_ARGS_ANY());
-  mrb_define_method(mrb, mod, "private",                 mrb_mod_dummy_visibility, MRB_ARGS_ANY());  /* 15.2.2.4.36 */
-  mrb_define_method(mrb, mod, "protected",               mrb_mod_dummy_visibility, MRB_ARGS_ANY());  /* 15.2.2.4.37 */
-  mrb_define_method(mrb, mod, "public",                  mrb_mod_dummy_visibility, MRB_ARGS_ANY());  /* 15.2.2.4.38 */
-  mrb_define_method(mrb, mod, "remove_class_variable",   mrb_mod_remove_cvar,      MRB_ARGS_REQ(1)); /* 15.2.2.4.39 */
-  mrb_define_method(mrb, mod, "remove_method",           mrb_mod_remove_method,    MRB_ARGS_ANY());  /* 15.2.2.4.41 */
-  mrb_define_method(mrb, mod, "method_removed",          mrb_bob_init,             MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, mod, "attr_reader",             mrb_mod_attr_reader,      MRB_ARGS_ANY());  /* 15.2.2.4.13 */
-  mrb_define_method(mrb, mod, "attr_writer",             mrb_mod_attr_writer,      MRB_ARGS_ANY());  /* 15.2.2.4.14 */
-  mrb_define_method(mrb, mod, "to_s",                    mrb_mod_to_s,             MRB_ARGS_NONE());
-  mrb_define_method(mrb, mod, "inspect",                 mrb_mod_to_s,             MRB_ARGS_NONE());
-  mrb_define_method(mrb, mod, "alias_method",            mrb_mod_alias,            MRB_ARGS_ANY());  /* 15.2.2.4.8 */
-  mrb_define_method(mrb, mod, "ancestors",               mrb_mod_ancestors,        MRB_ARGS_NONE()); /* 15.2.2.4.9 */
-  mrb_define_method(mrb, mod, "undef_method",            mrb_mod_undef,            MRB_ARGS_ANY());  /* 15.2.2.4.41 */
-  mrb_define_method(mrb, mod, "const_defined?",          mrb_mod_const_defined,    MRB_ARGS_ARG(1,1)); /* 15.2.2.4.20 */
-  mrb_define_method(mrb, mod, "const_get",               mrb_mod_const_get,        MRB_ARGS_REQ(1)); /* 15.2.2.4.21 */
-  mrb_define_method(mrb, mod, "const_set",               mrb_mod_const_set,        MRB_ARGS_REQ(2)); /* 15.2.2.4.23 */
-  mrb_define_method(mrb, mod, "constants",               mrb_mod_constants,        MRB_ARGS_OPT(1)); /* 15.2.2.4.24 */
-  mrb_define_method(mrb, mod, "remove_const",            mrb_mod_remove_const,     MRB_ARGS_REQ(1)); /* 15.2.2.4.40 */
-  mrb_define_method(mrb, mod, "const_missing",           mrb_mod_const_missing,    MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, mod, "define_method",           mod_define_method,        MRB_ARGS_ARG(1,1));
-  mrb_define_method(mrb, mod, "class_variables",         mrb_mod_class_variables,  MRB_ARGS_NONE()); /* 15.2.2.4.19 */
-  mrb_define_method(mrb, mod, "===",                     mrb_mod_eqq,              MRB_ARGS_REQ(1));
-  mrb_define_class_method(mrb, mod, "constants",         mrb_mod_s_constants,      MRB_ARGS_ANY());  /* 15.2.2.3.1 */
-
-  mrb_undef_method(mrb, cls, "append_features");
-  mrb_undef_method(mrb, cls, "extend_object");
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/codedump.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/codedump.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/codedump.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/codedump.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,474 +0,0 @@
-#include <mruby.h>
-#include <mruby/irep.h>
-#include <mruby/debug.h>
-#include <mruby/opcode.h>
-#include <mruby/string.h>
-#include <mruby/proc.h>
-
-#ifndef MRB_DISABLE_STDIO
-static int
-print_r(mrb_state *mrb, mrb_irep *irep, size_t n, int pre)
-{
-  size_t i;
-
-  if (n == 0) return 0;
-
-  for (i=0; i+1<irep->nlocals; i++) {
-    if (irep->lv[i].r == n) {
-      mrb_sym sym = irep->lv[i].name;
-      if (pre) printf(" ");
-      printf("R%d:%s", (int)n, mrb_sym2name(mrb, sym));
-      return 1;
-    }
-  }
-  return 0;
-}
-
-#define RA  1
-#define RB  2
-#define RAB 3
-
-static void
-print_lv(mrb_state *mrb, mrb_irep *irep, mrb_code c, int r)
-{
-  int pre = 0;
-
-  if (!irep->lv
-      || ((!(r & RA) || GETARG_A(c) >= irep->nlocals)
-       && (!(r & RB) || GETARG_B(c) >= irep->nlocals))) {
-    printf("\n");
-    return;
-  }
-  printf("\t; ");
-  if (r & RA) {
-    pre = print_r(mrb, irep, GETARG_A(c), 0);
-  }
-  if (r & RB) {
-    print_r(mrb, irep, GETARG_B(c), pre);
-  }
-  printf("\n");
-}
-#endif
-
-static void
-codedump(mrb_state *mrb, mrb_irep *irep)
-{
-#ifndef MRB_DISABLE_STDIO
-  int i;
-  int ai;
-  mrb_code c;
-  const char *file = NULL, *next_file;
-  int32_t line;
-
-  if (!irep) return;
-  printf("irep %p nregs=%d nlocals=%d pools=%d syms=%d reps=%d\n", (void*)irep,
-         irep->nregs, irep->nlocals, (int)irep->plen, (int)irep->slen, (int)irep->rlen);
-
-  for (i = 0; i < (int)irep->ilen; i++) {
-    ai = mrb_gc_arena_save(mrb);
-
-    next_file = mrb_debug_get_filename(irep, i);
-    if (next_file && file != next_file) {
-      printf("file: %s\n", next_file);
-      file = next_file;
-    }
-    line = mrb_debug_get_line(irep, i);
-    if (line < 0) {
-      printf("      ");
-    }
-    else {
-      printf("%5d ", line);
-    }
-
-    printf("%03d ", i);
-    c = irep->iseq[i];
-    switch (GET_OPCODE(c)) {
-    case OP_NOP:
-      printf("OP_NOP\n");
-      break;
-    case OP_MOVE:
-      printf("OP_MOVE\tR%d\tR%d\t", GETARG_A(c), GETARG_B(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_LOADL:
-      {
-        mrb_value v = irep->pool[GETARG_Bx(c)];
-        mrb_value s = mrb_inspect(mrb, v);
-        printf("OP_LOADL\tR%d\tL(%d)\t; %s", GETARG_A(c), GETARG_Bx(c), RSTRING_PTR(s));
-      }
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_LOADI:
-      printf("OP_LOADI\tR%d\t%d\t", GETARG_A(c), GETARG_sBx(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_LOADSYM:
-      printf("OP_LOADSYM\tR%d\t:%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_LOADNIL:
-      printf("OP_LOADNIL\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_LOADSELF:
-      printf("OP_LOADSELF\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_LOADT:
-      printf("OP_LOADT\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_LOADF:
-      printf("OP_LOADF\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_GETGLOBAL:
-      printf("OP_GETGLOBAL\tR%d\t:%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_SETGLOBAL:
-      printf("OP_SETGLOBAL\t:%s\tR%d\t",
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]),
-             GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_GETCONST:
-      printf("OP_GETCONST\tR%d\t:%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_SETCONST:
-      printf("OP_SETCONST\t:%s\tR%d\t",
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]),
-             GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_GETMCNST:
-      printf("OP_GETMCNST\tR%d\tR%d::%s", GETARG_A(c), GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_SETMCNST:
-      printf("OP_SETMCNST\tR%d::%s\tR%d", GETARG_A(c)+1,
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]),
-             GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_GETIV:
-      printf("OP_GETIV\tR%d\t%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_SETIV:
-      printf("OP_SETIV\t%s\tR%d",
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]),
-             GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_GETUPVAR:
-      printf("OP_GETUPVAR\tR%d\t%d\t%d",
-             GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_SETUPVAR:
-      printf("OP_SETUPVAR\tR%d\t%d\t%d",
-             GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_GETCV:
-      printf("OP_GETCV\tR%d\t%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_SETCV:
-      printf("OP_SETCV\t%s\tR%d",
-             mrb_sym2name(mrb, irep->syms[GETARG_Bx(c)]),
-             GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_JMP:
-      printf("OP_JMP\t%03d\n", i+GETARG_sBx(c));
-      break;
-    case OP_JMPIF:
-      printf("OP_JMPIF\tR%d\t%03d\n", GETARG_A(c), i+GETARG_sBx(c));
-      break;
-    case OP_JMPNOT:
-      printf("OP_JMPNOT\tR%d\t%03d\n", GETARG_A(c), i+GETARG_sBx(c));
-      break;
-    case OP_SEND:
-      printf("OP_SEND\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_SENDB:
-      printf("OP_SENDB\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_TAILCALL:
-      printf("OP_TAILCALL\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_SUPER:
-      printf("OP_SUPER\tR%d\t%d\n", GETARG_A(c),
-             GETARG_C(c));
-      break;
-    case OP_ARGARY:
-      printf("OP_ARGARY\tR%d\t%d:%d:%d:%d", GETARG_A(c),
-             (GETARG_Bx(c)>>10)&0x3f,
-             (GETARG_Bx(c)>>9)&0x1,
-             (GETARG_Bx(c)>>4)&0x1f,
-             (GETARG_Bx(c)>>0)&0xf);
-      print_lv(mrb, irep, c, RA);
-      break;
-
-    case OP_ENTER:
-      printf("OP_ENTER\t%d:%d:%d:%d:%d:%d:%d\n",
-             (GETARG_Ax(c)>>18)&0x1f,
-             (GETARG_Ax(c)>>13)&0x1f,
-             (GETARG_Ax(c)>>12)&0x1,
-             (GETARG_Ax(c)>>7)&0x1f,
-             (GETARG_Ax(c)>>2)&0x1f,
-             (GETARG_Ax(c)>>1)&0x1,
-             GETARG_Ax(c) & 0x1);
-      break;
-    case OP_RETURN:
-      printf("OP_RETURN\tR%d", GETARG_A(c));
-      switch (GETARG_B(c)) {
-      case OP_R_NORMAL:
-        printf("\tnormal\t"); break;
-      case OP_R_RETURN:
-        printf("\treturn\t"); break;
-      case OP_R_BREAK:
-        printf("\tbreak\t"); break;
-      default:
-        printf("\tbroken\t"); break;
-      }
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_BLKPUSH:
-      printf("OP_BLKPUSH\tR%d\t%d:%d:%d:%d", GETARG_A(c),
-             (GETARG_Bx(c)>>10)&0x3f,
-             (GETARG_Bx(c)>>9)&0x1,
-             (GETARG_Bx(c)>>4)&0x1f,
-             (GETARG_Bx(c)>>0)&0xf);
-      print_lv(mrb, irep, c, RA);
-      break;
-
-    case OP_LAMBDA:
-      printf("OP_LAMBDA\tR%d\tI(%+d)\t", GETARG_A(c), GETARG_b(c)+1);
-      switch (GETARG_c(c)) {
-      case OP_L_METHOD:
-        printf("method"); break;
-      case OP_L_BLOCK:
-        printf("block"); break;
-      case OP_L_LAMBDA:
-        printf("lambda"); break;
-      }
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_RANGE:
-      printf("OP_RANGE\tR%d\tR%d\t%d", GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_METHOD:
-      printf("OP_METHOD\tR%d\t:%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-
-    case OP_ADD:
-      printf("OP_ADD\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_ADDI:
-      printf("OP_ADDI\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_SUB:
-      printf("OP_SUB\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_SUBI:
-      printf("OP_SUBI\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_MUL:
-      printf("OP_MUL\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_DIV:
-      printf("OP_DIV\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_LT:
-      printf("OP_LT\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_LE:
-      printf("OP_LE\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_GT:
-      printf("OP_GT\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_GE:
-      printf("OP_GE\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-    case OP_EQ:
-      printf("OP_EQ\t\tR%d\t:%s\t%d\n", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]),
-             GETARG_C(c));
-      break;
-
-    case OP_STOP:
-      printf("OP_STOP\n");
-      break;
-
-    case OP_ARRAY:
-      printf("OP_ARRAY\tR%d\tR%d\t%d", GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_ARYCAT:
-      printf("OP_ARYCAT\tR%d\tR%d\t", GETARG_A(c), GETARG_B(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_ARYPUSH:
-      printf("OP_ARYPUSH\tR%d\tR%d\t", GETARG_A(c), GETARG_B(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_AREF:
-      printf("OP_AREF\tR%d\tR%d\t%d", GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_APOST:
-      printf("OP_APOST\tR%d\t%d\t%d", GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_STRING:
-      {
-        mrb_value v = irep->pool[GETARG_Bx(c)];
-        mrb_value s = mrb_str_dump(mrb, mrb_str_new(mrb, RSTRING_PTR(v), RSTRING_LEN(v)));
-        printf("OP_STRING\tR%d\tL(%d)\t; %s", GETARG_A(c), GETARG_Bx(c), RSTRING_PTR(s));
-      }
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_STRCAT:
-      printf("OP_STRCAT\tR%d\tR%d\t", GETARG_A(c), GETARG_B(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_HASH:
-      printf("OP_HASH\tR%d\tR%d\t%d", GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-
-    case OP_OCLASS:
-      printf("OP_OCLASS\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_CLASS:
-      printf("OP_CLASS\tR%d\t:%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_MODULE:
-      printf("OP_MODULE\tR%d\t:%s", GETARG_A(c),
-             mrb_sym2name(mrb, irep->syms[GETARG_B(c)]));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_EXEC:
-      printf("OP_EXEC\tR%d\tI(%+d)", GETARG_A(c), GETARG_Bx(c)+1);
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_SCLASS:
-      printf("OP_SCLASS\tR%d\tR%d\t", GETARG_A(c), GETARG_B(c));
-      print_lv(mrb, irep, c, RAB);
-      break;
-    case OP_TCLASS:
-      printf("OP_TCLASS\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_ERR:
-      {
-        mrb_value v = irep->pool[GETARG_Bx(c)];
-        mrb_value s = mrb_str_dump(mrb, mrb_str_new(mrb, RSTRING_PTR(v), RSTRING_LEN(v)));
-        printf("OP_ERR\t%s\n", RSTRING_PTR(s));
-      }
-      break;
-    case OP_EPUSH:
-      printf("OP_EPUSH\t:I(%+d)\n", GETARG_Bx(c)+1);
-      break;
-    case OP_ONERR:
-      printf("OP_ONERR\t%03d\n", i+GETARG_sBx(c));
-      break;
-    case OP_RESCUE:
-      {
-        int a = GETARG_A(c);
-        int b = GETARG_B(c);
-        int cnt = GETARG_C(c);
-
-        if (b == 0) {
-          printf("OP_RESCUE\tR%d\t\t%s", a, cnt ? "cont" : "");
-          print_lv(mrb, irep, c, RA);
-          break;
-        }
-        else {
-          printf("OP_RESCUE\tR%d\tR%d\t%s", a, b, cnt ? "cont" : "");
-          print_lv(mrb, irep, c, RAB);
-          break;
-        }
-      }
-      break;
-    case OP_RAISE:
-      printf("OP_RAISE\tR%d\t\t", GETARG_A(c));
-      print_lv(mrb, irep, c, RA);
-      break;
-    case OP_POPERR:
-      printf("OP_POPERR\t%d\t\t\n", GETARG_A(c));
-      break;
-    case OP_EPOP:
-      printf("OP_EPOP\t%d\n", GETARG_A(c));
-      break;
-
-    default:
-      printf("OP_unknown %d\t%d\t%d\t%d\n", GET_OPCODE(c),
-             GETARG_A(c), GETARG_B(c), GETARG_C(c));
-      break;
-    }
-    mrb_gc_arena_restore(mrb, ai);
-  }
-  printf("\n");
-#endif
-}
-
-static void
-codedump_recur(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t i;
-
-  codedump(mrb, irep);
-  for (i=0; i<irep->rlen; i++) {
-    codedump_recur(mrb, irep->reps[i]);
-  }
-}
-
-void
-mrb_codedump_all(mrb_state *mrb, struct RProc *proc)
-{
-  codedump_recur(mrb, proc->body.irep);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/compar.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/compar.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/compar.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/compar.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-/*
-** compar.c - Comparable module
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-
-void
-mrb_init_comparable(mrb_state *mrb)
-{
-  mrb_define_module(mrb, "Comparable");  /* 15.3.3 */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/crc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/crc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/crc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/crc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-** crc.c - calculate CRC
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <limits.h>
-#include <stdint.h>
-#include <stddef.h>
-
-/* Calculate CRC (CRC-16-CCITT)
-**
-**  0000_0000_0000_0000_0000_0000_0000_0000
-**          ^|------- CRC -------|- work --|
-**        carry
-*/
-#define  CRC_16_CCITT       0x11021ul        /* x^16+x^12+x^5+1 */
-#define  CRC_XOR_PATTERN    (CRC_16_CCITT << 8)
-#define  CRC_CARRY_BIT      (0x01000000)
-
-uint16_t
-calc_crc_16_ccitt(const uint8_t *src, size_t nbytes, uint16_t crc)
-{
-  size_t ibyte;
-  uint32_t ibit;
-  uint32_t crcwk = crc << 8;
-
-  for (ibyte = 0; ibyte < nbytes; ibyte++) {
-    crcwk |= *src++;
-    for (ibit = 0; ibit < CHAR_BIT; ibit++) {
-      crcwk <<= 1;
-      if (crcwk & CRC_CARRY_BIT) {
-        crcwk ^= CRC_XOR_PATTERN;
-      }
-    }
-  }
-  return (uint16_t)(crcwk >> 8);
-}
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/debug.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/debug.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/debug.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/debug.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-#include <string.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-#include <mruby/debug.h>
-
-static mrb_irep_debug_info_file *
-get_file(mrb_irep_debug_info *info, uint32_t pc)
-{
-  mrb_irep_debug_info_file **ret;
-  int32_t count;
-
-  if (pc >= info->pc_count) { return NULL; }
-  /* get upper bound */
-  ret = info->files;
-  count =  info->flen;
-  while (count > 0) {
-    int32_t step = count / 2;
-    mrb_irep_debug_info_file **it = ret + step;
-    if (!(pc < (*it)->start_pos)) {
-      ret = it + 1;
-      count -= step + 1;
-    }
-    else { count = step; }
-  }
-
-  --ret;
-
-  /* check returning file exists inside debug info */
-  mrb_assert(info->files <= ret && ret < (info->files + info->flen));
-  /* check pc is within the range of returning file */
-  mrb_assert((*ret)->start_pos <= pc &&
-             pc < (((ret + 1 - info->files) < info->flen)
-                   ? (*(ret+1))->start_pos : info->pc_count));
-
-  return *ret;
-}
-
-static mrb_debug_line_type
-select_line_type(const uint16_t *lines, size_t lines_len)
-{
-  size_t line_count = 0;
-  int prev_line = -1;
-  size_t i;
-  for (i = 0; i < lines_len; ++i) {
-    if (lines[i] != prev_line) {
-      ++line_count;
-    }
-  }
-  return (sizeof(uint16_t) * lines_len) <= (sizeof(mrb_irep_debug_info_line) * line_count)
-      ? mrb_debug_line_ary : mrb_debug_line_flat_map;
-}
-
-MRB_API char const*
-mrb_debug_get_filename(mrb_irep *irep, uint32_t pc)
-{
-  if (irep && pc < irep->ilen) {
-    mrb_irep_debug_info_file* f = NULL;
-    if (!irep->debug_info) { return irep->filename; }
-    else if ((f = get_file(irep->debug_info, pc))) {
-      return f->filename;
-    }
-  }
-  return NULL;
-}
-
-MRB_API int32_t
-mrb_debug_get_line(mrb_irep *irep, uint32_t pc)
-{
-  if (irep && pc < irep->ilen) {
-    mrb_irep_debug_info_file* f = NULL;
-    if (!irep->debug_info) {
-      return irep->lines? irep->lines[pc] : -1;
-    }
-    else if ((f = get_file(irep->debug_info, pc))) {
-      switch (f->line_type) {
-        case mrb_debug_line_ary:
-          mrb_assert(f->start_pos <= pc && pc < (f->start_pos + f->line_entry_count));
-          return f->lines.ary[pc - f->start_pos];
-
-        case mrb_debug_line_flat_map: {
-          /* get upper bound */
-          mrb_irep_debug_info_line *ret = f->lines.flat_map;
-          uint32_t count = f->line_entry_count;
-          while (count > 0) {
-            int32_t step = count / 2;
-            mrb_irep_debug_info_line *it = ret + step;
-            if (!(pc < it->start_pos)) {
-              ret = it + 1;
-              count -= step + 1;
-            }
-            else { count = step; }
-          }
-
-          --ret;
-
-          /* check line entry pointer range */
-          mrb_assert(f->lines.flat_map <= ret && ret < (f->lines.flat_map + f->line_entry_count));
-          /* check pc range */
-          mrb_assert(ret->start_pos <= pc &&
-                     pc < (((uint32_t)(ret + 1 - f->lines.flat_map) < f->line_entry_count)
-                           ? (ret+1)->start_pos : irep->debug_info->pc_count));
-
-          return ret->line;
-        }
-      }
-    }
-  }
-  return -1;
-}
-
-MRB_API mrb_irep_debug_info *
-mrb_debug_info_alloc(mrb_state *mrb, mrb_irep *irep)
-{
-  static const mrb_irep_debug_info initial = { 0, 0, NULL };
-  mrb_irep_debug_info *ret;
-
-  mrb_assert(!irep->debug_info);
-  ret = (mrb_irep_debug_info *)mrb_malloc(mrb, sizeof(*ret));
-  *ret = initial;
-  irep->debug_info = ret;
-  return ret;
-}
-
-MRB_API mrb_irep_debug_info_file *
-mrb_debug_info_append_file(mrb_state *mrb, mrb_irep *irep,
-                           uint32_t start_pos, uint32_t end_pos)
-{
-  mrb_irep_debug_info *info;
-  mrb_irep_debug_info_file *ret;
-  uint32_t file_pc_count;
-  size_t fn_len;
-  mrb_int len;
-  uint32_t i;
-
-  if (!irep->debug_info) { return NULL; }
-
-  mrb_assert(irep->filename);
-  mrb_assert(irep->lines);
-
-  info = irep->debug_info;
-
-  if (info->flen > 0 && strcmp(irep->filename, info->files[info->flen - 1]->filename) == 0) {
-    return NULL;
-  }
-
-  ret = (mrb_irep_debug_info_file *)mrb_malloc(mrb, sizeof(*ret));
-  info->files =
-      (mrb_irep_debug_info_file**)(
-          info->files
-          ? mrb_realloc(mrb, info->files, sizeof(mrb_irep_debug_info_file*) * (info->flen + 1))
-          : mrb_malloc(mrb, sizeof(mrb_irep_debug_info_file*)));
-  info->files[info->flen++] = ret;
-
-  file_pc_count = end_pos - start_pos;
-
-  ret->start_pos = start_pos;
-  info->pc_count = end_pos;
-
-  fn_len = strlen(irep->filename);
-  ret->filename_sym = mrb_intern(mrb, irep->filename, fn_len);
-  len = 0;
-  ret->filename = mrb_sym2name_len(mrb, ret->filename_sym, &len);
-
-  ret->line_type = select_line_type(irep->lines + start_pos, end_pos - start_pos);
-  ret->lines.ptr = NULL;
-
-  switch (ret->line_type) {
-    case mrb_debug_line_ary:
-      ret->line_entry_count = file_pc_count;
-      ret->lines.ary = (uint16_t*)mrb_malloc(mrb, sizeof(uint16_t) * file_pc_count);
-      for (i = 0; i < file_pc_count; ++i) {
-        ret->lines.ary[i] = irep->lines[start_pos + i];
-      }
-      break;
-
-    case mrb_debug_line_flat_map: {
-      uint16_t prev_line = 0;
-      mrb_irep_debug_info_line m;
-      ret->lines.flat_map = (mrb_irep_debug_info_line*)mrb_malloc(mrb, sizeof(mrb_irep_debug_info_line) * 1);
-      ret->line_entry_count = 0;
-      for (i = 0; i < file_pc_count; ++i) {
-        if (irep->lines[start_pos + i] == prev_line) { continue; }
-
-        ret->lines.flat_map = (mrb_irep_debug_info_line*)mrb_realloc(
-            mrb, ret->lines.flat_map,
-            sizeof(mrb_irep_debug_info_line) * (ret->line_entry_count + 1));
-        m.start_pos = start_pos + i;
-        m.line = irep->lines[start_pos + i];
-        ret->lines.flat_map[ret->line_entry_count] = m;
-
-        /* update */
-        ++ret->line_entry_count;
-        prev_line = irep->lines[start_pos + i];
-      }
-    } break;
-
-    default: mrb_assert(0); break;
-  }
-
-  return ret;
-}
-
-MRB_API void
-mrb_debug_info_free(mrb_state *mrb, mrb_irep_debug_info *d)
-{
-  uint32_t i;
-
-  if (!d) { return; }
-
-  for (i = 0; i < d->flen; ++i) {
-    mrb_assert(d->files[i]);
-    mrb_free(mrb, d->files[i]->lines.ptr);
-    mrb_free(mrb, d->files[i]);
-  }
-  mrb_free(mrb, d->files);
-  mrb_free(mrb, d);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/dump.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/dump.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/dump.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/dump.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1098 +0,0 @@
-/*
-** dump.c - mruby binary dumper (mrbc binary format)
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <string.h>
-#include <limits.h>
-#include <mruby/dump.h>
-#include <mruby/string.h>
-#include <mruby/irep.h>
-#include <mruby/numeric.h>
-#include <mruby/debug.h>
-
-#define FLAG_BYTEORDER_NATIVE 2
-#define FLAG_BYTEORDER_NONATIVE 0
-
-#ifdef MRB_USE_FLOAT
-#define MRB_FLOAT_FMT "%.8e"
-#else
-#define MRB_FLOAT_FMT "%.16e"
-#endif
-
-static size_t get_irep_record_size_1(mrb_state *mrb, mrb_irep *irep);
-
-#if UINT32_MAX > SIZE_MAX
-# error This code cannot be built on your environment.
-#endif
-
-static size_t
-write_padding(uint8_t *buf)
-{
-  const size_t align = MRB_DUMP_ALIGNMENT;
-  size_t pad_len = -(intptr_t)buf & (align-1);
-  if (pad_len > 0) {
-    memset(buf, 0, pad_len);
-  }
-  return pad_len;
-}
-
-static size_t
-get_irep_header_size(mrb_state *mrb)
-{
-  size_t size = 0;
-
-  size += sizeof(uint32_t) * 1;
-  size += sizeof(uint16_t) * 3;
-
-  return size;
-}
-
-static ptrdiff_t
-write_irep_header(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
-{
-  uint8_t *cur = buf;
-
-  cur += uint32_to_bin((uint32_t)get_irep_record_size_1(mrb, irep), cur);  /* record size */
-  cur += uint16_to_bin((uint16_t)irep->nlocals, cur);  /* number of local variable */
-  cur += uint16_to_bin((uint16_t)irep->nregs, cur);  /* number of register variable */
-  cur += uint16_to_bin((uint16_t)irep->rlen, cur);  /* number of child irep */
-
-  return cur - buf;
-}
-
-
-static size_t
-get_iseq_block_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t size = 0;
-
-  size += sizeof(uint32_t); /* ilen */
-  size += sizeof(uint32_t); /* max padding */
-  size += sizeof(uint32_t) * irep->ilen; /* iseq(n) */
-
-  return size;
-}
-
-static ptrdiff_t
-write_iseq_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf, uint8_t flags)
-{
-  uint8_t *cur = buf;
-  uint32_t iseq_no;
-
-  cur += uint32_to_bin(irep->ilen, cur); /* number of opcode */
-  cur += write_padding(cur);
-  switch (flags & DUMP_ENDIAN_NAT) {
-  case DUMP_ENDIAN_BIG:
-    if (bigendian_p()) goto native;
-    for (iseq_no = 0; iseq_no < irep->ilen; iseq_no++) {
-      cur += uint32_to_bin(irep->iseq[iseq_no], cur); /* opcode */
-    }
-    break;
-  case DUMP_ENDIAN_LIL:
-    if (!bigendian_p()) goto native;
-    for (iseq_no = 0; iseq_no < irep->ilen; iseq_no++) {
-      cur += uint32l_to_bin(irep->iseq[iseq_no], cur); /* opcode */
-    }
-    break;
-
-  native:
-  case DUMP_ENDIAN_NAT:
-    memcpy(cur, irep->iseq, irep->ilen * sizeof(mrb_code));
-    cur += irep->ilen * sizeof(mrb_code);
-    break;
-  }
-
-  return cur - buf;
-}
-
-
-static size_t
-get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t size = 0;
-  size_t pool_no;
-  mrb_value str;
-
-  size += sizeof(uint32_t); /* plen */
-  size += irep->plen * (sizeof(uint8_t) + sizeof(uint16_t)); /* len(n) */
-
-  for (pool_no = 0; pool_no < irep->plen; pool_no++) {
-    int ai = mrb_gc_arena_save(mrb);
-
-    switch (mrb_type(irep->pool[pool_no])) {
-    case MRB_TT_FIXNUM:
-      str = mrb_fixnum_to_str(mrb, irep->pool[pool_no], 10);
-      {
-        mrb_int len = RSTRING_LEN(str);
-        mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-        size += (size_t)len;
-      }
-      break;
-
-    case MRB_TT_FLOAT:
-      str = mrb_float_to_str(mrb, irep->pool[pool_no], MRB_FLOAT_FMT);
-      {
-        mrb_int len = RSTRING_LEN(str);
-        mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-        size += (size_t)len;
-      }
-      break;
-
-    case MRB_TT_STRING:
-      {
-        mrb_int len = RSTRING_LEN(irep->pool[pool_no]);
-        mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-        size += (size_t)len;
-      }
-      break;
-
-    default:
-      break;
-    }
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  return size;
-}
-
-static ptrdiff_t
-write_pool_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
-{
-  size_t pool_no;
-  uint8_t *cur = buf;
-  uint16_t len;
-  mrb_value str;
-  const char *char_ptr;
-
-  cur += uint32_to_bin(irep->plen, cur); /* number of pool */
-
-  for (pool_no = 0; pool_no < irep->plen; pool_no++) {
-    int ai = mrb_gc_arena_save(mrb);
-
-    switch (mrb_type(irep->pool[pool_no])) {
-    case MRB_TT_FIXNUM:
-      cur += uint8_to_bin(IREP_TT_FIXNUM, cur); /* data type */
-      str = mrb_fixnum_to_str(mrb, irep->pool[pool_no], 10);
-      break;
-
-    case MRB_TT_FLOAT:
-      cur += uint8_to_bin(IREP_TT_FLOAT, cur); /* data type */
-      str = mrb_float_to_str(mrb, irep->pool[pool_no], MRB_FLOAT_FMT);
-      break;
-
-    case MRB_TT_STRING:
-      cur += uint8_to_bin(IREP_TT_STRING, cur); /* data type */
-      str = irep->pool[pool_no];
-      break;
-
-    default:
-      continue;
-    }
-
-    char_ptr = RSTRING_PTR(str);
-    {
-      mrb_int tlen = RSTRING_LEN(str);
-      mrb_assert_int_fit(mrb_int, tlen, uint16_t, UINT16_MAX);
-      len = (uint16_t)tlen;
-    }
-
-    cur += uint16_to_bin(len, cur); /* data length */
-    memcpy(cur, char_ptr, (size_t)len);
-    cur += len;
-
-    mrb_gc_arena_restore(mrb, ai);
-  }
-
-  return cur - buf;
-}
-
-
-static size_t
-get_syms_block_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t size = 0;
-  uint32_t sym_no;
-  mrb_int len;
-
-  size += sizeof(uint32_t); /* slen */
-  for (sym_no = 0; sym_no < irep->slen; sym_no++) {
-    size += sizeof(uint16_t); /* snl(n) */
-    if (irep->syms[sym_no] != 0) {
-      mrb_sym2name_len(mrb, irep->syms[sym_no], &len);
-      size += len + 1; /* sn(n) + null char */
-    }
-  }
-
-  return size;
-}
-
-static ptrdiff_t
-write_syms_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
-{
-  uint32_t sym_no;
-  uint8_t *cur = buf;
-  const char *name;
-
-  cur += uint32_to_bin(irep->slen, cur); /* number of symbol */
-
-  for (sym_no = 0; sym_no < irep->slen; sym_no++) {
-    if (irep->syms[sym_no] != 0) {
-      mrb_int len;
-
-      name = mrb_sym2name_len(mrb, irep->syms[sym_no], &len);
-
-      mrb_assert_int_fit(mrb_int, len, uint16_t, UINT16_MAX);
-      cur += uint16_to_bin((uint16_t)len, cur); /* length of symbol name */
-      memcpy(cur, name, len); /* symbol name */
-      cur += (uint16_t)len;
-      *cur++ = '\0';
-    }
-    else {
-      cur += uint16_to_bin(MRB_DUMP_NULL_SYM_LEN, cur); /* length of symbol name */
-    }
-  }
-
-  return cur - buf;
-}
-
-static size_t
-get_irep_record_size_1(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t size = 0;
-
-  size += get_irep_header_size(mrb);
-  size += get_iseq_block_size(mrb, irep);
-  size += get_pool_block_size(mrb, irep);
-  size += get_syms_block_size(mrb, irep);
-  return size;
-}
-
-static size_t
-get_irep_record_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t size = 0;
-  size_t irep_no;
-
-  size = get_irep_record_size_1(mrb, irep);
-  for (irep_no = 0; irep_no < irep->rlen; irep_no++) {
-    size += get_irep_record_size(mrb, irep->reps[irep_no]);
-  }
-  return size;
-}
-
-static int
-write_irep_record(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, size_t *irep_record_size, uint8_t flags)
-{
-  uint32_t i;
-  uint8_t *src = bin;
-
-  if (irep == NULL) {
-    return MRB_DUMP_INVALID_IREP;
-  }
-
-  *irep_record_size = get_irep_record_size_1(mrb, irep);
-  if (*irep_record_size == 0) {
-    return MRB_DUMP_GENERAL_FAILURE;
-  }
-
-  bin += write_irep_header(mrb, irep, bin);
-  bin += write_iseq_block(mrb, irep, bin, flags);
-  bin += write_pool_block(mrb, irep, bin);
-  bin += write_syms_block(mrb, irep, bin);
-
-  for (i = 0; i < irep->rlen; i++) {
-    int result;
-    size_t rsize;
-
-    result = write_irep_record(mrb, irep->reps[i], bin, &rsize, flags);
-    if (result != MRB_DUMP_OK) {
-      return result;
-    }
-    bin += rsize;
-  }
-  *irep_record_size = bin - src;
-  return MRB_DUMP_OK;
-}
-
-static uint32_t
-write_footer(mrb_state *mrb, uint8_t *bin)
-{
-  struct rite_binary_footer footer;
-
-  memcpy(footer.section_ident, RITE_BINARY_EOF, sizeof(footer.section_ident));
-  uint32_to_bin(sizeof(struct rite_binary_footer), footer.section_size);
-  memcpy(bin, &footer, sizeof(struct rite_binary_footer));
-
-  return sizeof(struct rite_binary_footer);
-}
-
-
-static int
-write_section_irep_header(mrb_state *mrb, size_t section_size, uint8_t *bin)
-{
-  struct rite_section_irep_header *header = (struct rite_section_irep_header*)bin;
-
-  memcpy(header->section_ident, RITE_SECTION_IREP_IDENT, sizeof(header->section_ident));
-
-  mrb_assert_int_fit(size_t, section_size, uint32_t, UINT32_MAX);
-  uint32_to_bin((uint32_t)section_size, header->section_size);
-  memcpy(header->rite_version, RITE_VM_VER, sizeof(header->rite_version));
-
-  return MRB_DUMP_OK;
-}
-
-static int
-write_section_irep(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, size_t *len_p, uint8_t flags)
-{
-  int result;
-  size_t rsize = 0;
-  uint8_t *cur = bin;
-
-  if (mrb == NULL || bin == NULL) {
-    return MRB_DUMP_INVALID_ARGUMENT;
-  }
-
-  cur += sizeof(struct rite_section_irep_header);
-
-  result = write_irep_record(mrb, irep, cur, &rsize, flags);
-  if (result != MRB_DUMP_OK) {
-    return result;
-  }
-  *len_p = cur - bin + rsize;
-  write_section_irep_header(mrb, *len_p, bin);
-
-  return MRB_DUMP_OK;
-}
-
-static int
-write_section_lineno_header(mrb_state *mrb, size_t section_size, uint8_t *bin)
-{
-  struct rite_section_lineno_header *header = (struct rite_section_lineno_header*)bin;
-
-  memcpy(header->section_ident, RITE_SECTION_LINENO_IDENT, sizeof(header->section_ident));
-  uint32_to_bin((uint32_t)section_size, header->section_size);
-
-  return MRB_DUMP_OK;
-}
-
-static size_t
-get_lineno_record_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t size = 0;
-
-  size += sizeof(uint32_t); /* record size */
-  size += sizeof(uint16_t); /* filename size */
-  if (irep->filename) {
-    size += strlen(irep->filename); /* filename */
-  }
-  size += sizeof(uint32_t); /* niseq */
-  if (irep->lines) {
-    size += sizeof(uint16_t) * irep->ilen; /* lineno */
-  }
-
-  return size;
-}
-
-static size_t
-write_lineno_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t* bin)
-{
-  uint8_t *cur = bin;
-  size_t iseq_no;
-  size_t filename_len;
-  ptrdiff_t diff;
-
-  cur += sizeof(uint32_t); /* record size */
-
-  if (irep->filename) {
-    filename_len = strlen(irep->filename);
-  }
-  else {
-    filename_len = 0;
-  }
-  mrb_assert_int_fit(size_t, filename_len, uint16_t, UINT16_MAX);
-  cur += uint16_to_bin((uint16_t)filename_len, cur); /* filename size */
-
-  if (filename_len) {
-    memcpy(cur, irep->filename, filename_len);
-    cur += filename_len; /* filename */
-  }
-
-  if (irep->lines) {
-    mrb_assert_int_fit(size_t, irep->ilen, uint32_t, UINT32_MAX);
-    cur += uint32_to_bin((uint32_t)(irep->ilen), cur); /* niseq */
-    for (iseq_no = 0; iseq_no < irep->ilen; iseq_no++) {
-      cur += uint16_to_bin(irep->lines[iseq_no], cur); /* opcode */
-    }
-  }
-  else {
-    cur += uint32_to_bin(0, cur); /* niseq */
-  }
-
-  diff = cur - bin;
-  mrb_assert_int_fit(ptrdiff_t, diff, uint32_t, UINT32_MAX);
-
-  uint32_to_bin((uint32_t)diff, bin); /* record size */
-
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  return (size_t)diff;
-}
-
-static size_t
-write_lineno_record(mrb_state *mrb, mrb_irep *irep, uint8_t* bin)
-{
-  size_t i;
-  size_t rlen, size = 0;
-
-  rlen = write_lineno_record_1(mrb, irep, bin);
-  bin += rlen;
-  size += rlen;
-  for (i=0; i<irep->rlen; i++) {
-    rlen = write_lineno_record(mrb, irep, bin);
-    bin += rlen;
-    size += rlen;
-  }
-  return size;
-}
-
-static int
-write_section_lineno(mrb_state *mrb, mrb_irep *irep, uint8_t *bin)
-{
-  size_t section_size = 0;
-  size_t rlen = 0; /* size of irep record */
-  uint8_t *cur = bin;
-
-  if (mrb == NULL || bin == NULL) {
-    return MRB_DUMP_INVALID_ARGUMENT;
-  }
-
-  cur += sizeof(struct rite_section_lineno_header);
-  section_size += sizeof(struct rite_section_lineno_header);
-
-  rlen = write_lineno_record(mrb, irep, cur);
-  section_size += rlen;
-
-  write_section_lineno_header(mrb, section_size, bin);
-
-  return MRB_DUMP_OK;
-}
-
-static size_t
-get_debug_record_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t ret = 0;
-  uint16_t f_idx;
-  size_t i;
-
-  ret += sizeof(uint32_t); /* record size */
-  ret += sizeof(uint16_t); /* file count */
-
-  for (f_idx = 0; f_idx < irep->debug_info->flen; ++f_idx) {
-    mrb_irep_debug_info_file const* file = irep->debug_info->files[f_idx];
-
-    ret += sizeof(uint32_t); /* position */
-    ret += sizeof(uint16_t); /* filename index */
-
-    /* lines */
-    ret += sizeof(uint32_t); /* entry count */
-    ret += sizeof(uint8_t); /* line type */
-    switch (file->line_type) {
-      case mrb_debug_line_ary:
-        ret += sizeof(uint16_t) * (size_t)(file->line_entry_count);
-        break;
-
-      case mrb_debug_line_flat_map:
-        ret += (sizeof(uint32_t) + sizeof(uint16_t)) * (size_t)(file->line_entry_count);
-        break;
-
-      default: mrb_assert(0); break;
-    }
-  }
-  for (i=0; i<irep->rlen; i++) {
-    ret += get_debug_record_size(mrb, irep->reps[i]);
-  }
-
-  return ret;
-}
-
-static int
-find_filename_index(const mrb_sym *ary, int ary_len, mrb_sym s)
-{
-  int i;
-
-  for (i = 0; i < ary_len; ++i) {
-    if (ary[i] == s) { return i; }
-  }
-  return -1;
-}
-
-static size_t
-get_filename_table_size(mrb_state *mrb, mrb_irep *irep, mrb_sym **fp, uint16_t *lp)
-{
-  mrb_sym *filenames = *fp;
-  size_t i, size = 0;
-  mrb_irep_debug_info *di = irep->debug_info;
-
-  mrb_assert(lp);
-  for (i = 0; i < di->flen; ++i) {
-    mrb_irep_debug_info_file *file;
-    mrb_int filename_len;
-
-    file = di->files[i];
-    if (find_filename_index(filenames, *lp, file->filename_sym) == -1) {
-      /* register filename */
-      *lp += 1;
-      *fp = filenames = (mrb_sym *)mrb_realloc(mrb, filenames, sizeof(mrb_sym) * (*lp));
-      filenames[*lp - 1] = file->filename_sym;
-
-      /* filename */
-      mrb_sym2name_len(mrb, file->filename_sym, &filename_len);
-      size += sizeof(uint16_t) + (size_t)filename_len;
-    }
-  }
-  for (i=0; i<irep->rlen; i++) {
-    size += get_filename_table_size(mrb, irep->reps[i], fp, lp);
-  }
-  return size;
-}
-
-static size_t
-write_debug_record_1(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const* filenames, uint16_t filenames_len)
-{
-  uint8_t *cur;
-  uint16_t f_idx;
-  ptrdiff_t ret;
-
-  cur = bin + sizeof(uint32_t); /* skip record size */
-  cur += uint16_to_bin(irep->debug_info->flen, cur); /* file count */
-
-  for (f_idx = 0; f_idx < irep->debug_info->flen; ++f_idx) {
-    int filename_idx;
-    const mrb_irep_debug_info_file *file = irep->debug_info->files[f_idx];
-
-    /* position */
-    cur += uint32_to_bin(file->start_pos, cur);
-
-    /* filename index */
-    filename_idx = find_filename_index(filenames, filenames_len,
-                                                  file->filename_sym);
-    mrb_assert_int_fit(int, filename_idx, uint16_t, UINT16_MAX);
-    cur += uint16_to_bin((uint16_t)filename_idx, cur);
-
-    /* lines */
-    cur += uint32_to_bin(file->line_entry_count, cur);
-    cur += uint8_to_bin(file->line_type, cur);
-    switch (file->line_type) {
-      case mrb_debug_line_ary: {
-        uint32_t l;
-        for (l = 0; l < file->line_entry_count; ++l) {
-          cur += uint16_to_bin(file->lines.ary[l], cur);
-        }
-      } break;
-
-      case mrb_debug_line_flat_map: {
-        uint32_t line;
-        for (line = 0; line < file->line_entry_count; ++line) {
-          cur += uint32_to_bin(file->lines.flat_map[line].start_pos, cur);
-          cur += uint16_to_bin(file->lines.flat_map[line].line, cur);
-        }
-      } break;
-
-      default: mrb_assert(0); break;
-    }
-  }
-
-  ret = cur - bin;
-  mrb_assert_int_fit(ptrdiff_t, ret, uint32_t, UINT32_MAX);
-  uint32_to_bin(ret, bin);
-
-  mrb_assert_int_fit(ptrdiff_t, ret, size_t, SIZE_MAX);
-  return (size_t)ret;
-}
-
-static size_t
-write_debug_record(mrb_state *mrb, mrb_irep *irep, uint8_t *bin, mrb_sym const* filenames, uint16_t filenames_len)
-{
-  size_t size, len;
-  size_t irep_no;
-
-  size = len = write_debug_record_1(mrb, irep, bin, filenames, filenames_len);
-  bin += len;
-  for (irep_no = 0; irep_no < irep->rlen; irep_no++) {
-    len = write_debug_record(mrb, irep->reps[irep_no], bin, filenames, filenames_len);
-    bin += len;
-    size += len;
-  }
-
-  mrb_assert(size == get_debug_record_size(mrb, irep));
-  return size;
-}
-
-static int
-write_section_debug(mrb_state *mrb, mrb_irep *irep, uint8_t *cur, mrb_sym const *filenames, uint16_t filenames_len)
-{
-  size_t section_size = 0;
-  const uint8_t *bin = cur;
-  struct rite_section_debug_header *header;
-  size_t dlen;
-  uint16_t i;
-  char const *sym; mrb_int sym_len;
-
-  if (mrb == NULL || cur == NULL) {
-    return MRB_DUMP_INVALID_ARGUMENT;
-  }
-
-  header = (struct rite_section_debug_header *)bin;
-  cur += sizeof(struct rite_section_debug_header);
-  section_size += sizeof(struct rite_section_debug_header);
-
-  /* filename table */
-  cur += uint16_to_bin(filenames_len, cur);
-  section_size += sizeof(uint16_t);
-  for (i = 0; i < filenames_len; ++i) {
-    sym = mrb_sym2name_len(mrb, filenames[i], &sym_len);
-    mrb_assert(sym);
-    cur += uint16_to_bin(sym_len, cur);
-    memcpy(cur, sym, sym_len);
-    cur += sym_len;
-    section_size += sizeof(uint16_t) + sym_len;
-  }
-
-  /* debug records */
-  dlen = write_debug_record(mrb, irep, cur, filenames, filenames_len);
-  section_size += dlen;
-
-  memcpy(header->section_ident, RITE_SECTION_DEBUG_IDENT, sizeof(header->section_ident));
-  mrb_assert(section_size <= INT32_MAX);
-  uint32_to_bin(section_size, header->section_size);
-
-  return MRB_DUMP_OK;
-}
-
-static void
-create_lv_sym_table(mrb_state *mrb, const mrb_irep *irep, mrb_sym **syms, uint32_t *syms_len)
-{
-  size_t i;
-
-  if (*syms == NULL) {
-    *syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * 1);
-  }
-
-  for (i = 0; i + 1 < irep->nlocals; ++i) {
-    mrb_sym const name = irep->lv[i].name;
-    if (name == 0) continue;
-    if (find_filename_index(*syms, *syms_len, name) != -1) continue;
-
-    ++(*syms_len);
-    *syms = (mrb_sym*)mrb_realloc(mrb, *syms, sizeof(mrb_sym) * (*syms_len));
-    (*syms)[*syms_len - 1] = name;
-  }
-
-  for (i = 0; i < irep->rlen; ++i) {
-    create_lv_sym_table(mrb, irep->reps[i], syms, syms_len);
-  }
-}
-
-static int
-write_lv_sym_table(mrb_state *mrb, uint8_t **start, mrb_sym const *syms, uint32_t syms_len)
-{
-  uint8_t *cur = *start;
-  uint32_t i;
-  const char *str;
-  mrb_int str_len;
-
-  cur += uint32_to_bin(syms_len, cur);
-
-  for (i = 0; i < syms_len; ++i) {
-    str = mrb_sym2name_len(mrb, syms[i], &str_len);
-    cur += uint16_to_bin(str_len, cur);
-    memcpy(cur, str, str_len);
-    cur += str_len;
-  }
-
-  *start = cur;
-
-  return MRB_DUMP_OK;
-}
-
-static int
-write_lv_record(mrb_state *mrb, const mrb_irep *irep, uint8_t **start, mrb_sym const *syms, uint32_t syms_len)
-{
-  uint8_t *cur = *start;
-  size_t i;
-
-  for (i = 0; i + 1 < irep->nlocals; ++i) {
-    if (irep->lv[i].name == 0) {
-      cur += uint16_to_bin(RITE_LV_NULL_MARK, cur);
-      cur += uint16_to_bin(0, cur);
-    }
-    else {
-      int const sym_idx = find_filename_index(syms, syms_len, irep->lv[i].name);
-      mrb_assert(sym_idx != -1); /* local variable name must be in syms */
-
-      cur += uint16_to_bin(sym_idx, cur);
-      cur += uint16_to_bin(irep->lv[i].r, cur);
-    }
-  }
-
-  for (i = 0; i < irep->rlen; ++i) {
-    write_lv_record(mrb, irep->reps[i], &cur, syms, syms_len);
-  }
-
-  *start = cur;
-
-  return MRB_DUMP_OK;
-}
-
-static size_t
-get_lv_record_size(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t ret = 0, i;
-
-  ret += (sizeof(uint16_t) + sizeof(uint16_t)) * (irep->nlocals - 1);
-
-  for (i = 0; i < irep->rlen; ++i) {
-    ret += get_lv_record_size(mrb, irep->reps[i]);
-  }
-
-  return ret;
-}
-
-static size_t
-get_lv_section_size(mrb_state *mrb, mrb_irep *irep, mrb_sym const *syms, uint32_t syms_len)
-{
-  size_t ret = 0, i;
-
-  ret += sizeof(uint32_t); /* syms_len */
-  ret += sizeof(uint16_t) * syms_len; /* symbol name lengths */
-  for (i = 0; i < syms_len; ++i) {
-    mrb_int str_len;
-    mrb_sym2name_len(mrb, syms[i], &str_len);
-    ret += str_len;
-  }
-
-  ret += get_lv_record_size(mrb, irep);
-
-  return ret;
-}
-
-static int
-write_section_lv(mrb_state *mrb, mrb_irep *irep, uint8_t *start, mrb_sym const *syms, uint32_t const syms_len)
-{
-  uint8_t *cur = start;
-  struct rite_section_lv_header *header;
-  ptrdiff_t diff;
-  int result = MRB_DUMP_OK;
-
-  if (mrb == NULL || cur == NULL) {
-    return MRB_DUMP_INVALID_ARGUMENT;
-  }
-
-  header = (struct rite_section_lv_header*)cur;
-  cur += sizeof(struct rite_section_lv_header);
-
-  result = write_lv_sym_table(mrb, &cur, syms, syms_len);
-  if (result != MRB_DUMP_OK) {
-    goto lv_section_exit;
-  }
-
-  result = write_lv_record(mrb, irep, &cur, syms, syms_len);
-  if (result != MRB_DUMP_OK) {
-    goto lv_section_exit;
-  }
-
-  memcpy(header->section_ident, RITE_SECTION_LV_IDENT, sizeof(header->section_ident));
-
-  diff = cur - start;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  uint32_to_bin(diff, header->section_size);
-
-lv_section_exit:
-  return result;
-}
-
-static int
-write_rite_binary_header(mrb_state *mrb, size_t binary_size, uint8_t *bin, uint8_t flags)
-{
-  struct rite_binary_header *header = (struct rite_binary_header *)bin;
-  uint16_t crc;
-  uint32_t offset;
-
-  switch (flags & DUMP_ENDIAN_NAT) {
-  endian_big:
-  case DUMP_ENDIAN_BIG:
-    memcpy(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident));
-    break;
-  endian_little:
-  case DUMP_ENDIAN_LIL:
-    memcpy(header->binary_ident, RITE_BINARY_IDENT_LIL, sizeof(header->binary_ident));
-    break;
-
-  case DUMP_ENDIAN_NAT:
-    if (bigendian_p()) goto endian_big;
-    goto endian_little;
-    break;
-  }
-
-  memcpy(header->binary_version, RITE_BINARY_FORMAT_VER, sizeof(header->binary_version));
-  memcpy(header->compiler_name, RITE_COMPILER_NAME, sizeof(header->compiler_name));
-  memcpy(header->compiler_version, RITE_COMPILER_VERSION, sizeof(header->compiler_version));
-  mrb_assert(binary_size <= UINT32_MAX);
-  uint32_to_bin((uint32_t)binary_size, header->binary_size);
-
-  offset = (&(header->binary_crc[0]) - bin) + sizeof(uint16_t);
-  crc = calc_crc_16_ccitt(bin + offset, binary_size - offset, 0);
-  uint16_to_bin(crc, header->binary_crc);
-
-  return MRB_DUMP_OK;
-}
-
-static mrb_bool
-is_debug_info_defined(mrb_irep *irep)
-{
-  size_t i;
-
-  if (!irep->debug_info) return FALSE;
-  for (i=0; i<irep->rlen; i++) {
-    if (!is_debug_info_defined(irep->reps[i])) return FALSE;
-  }
-  return TRUE;
-}
-
-static mrb_bool
-is_lv_defined(mrb_irep *irep)
-{
-  size_t i;
-
-  if (irep->lv) { return TRUE; }
-
-  for (i = 0; i < irep->rlen; ++i) {
-    if (is_lv_defined(irep->reps[i])) { return TRUE; }
-  }
-
-  return FALSE;
-}
-
-static uint8_t
-dump_flags(uint8_t flags, uint8_t native)
-{
-  if (native == FLAG_BYTEORDER_NATIVE) {
-    if ((flags & DUMP_ENDIAN_NAT) == 0) {
-      return (flags & DUMP_DEBUG_INFO) | DUMP_ENDIAN_NAT;
-    }
-    return flags;
-  }
-  if ((flags & DUMP_ENDIAN_NAT) == 0) {
-    return (flags & DUMP_DEBUG_INFO) | DUMP_ENDIAN_BIG;
-  }
-  return flags;
-}
-
-static int
-dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size)
-{
-  int result = MRB_DUMP_GENERAL_FAILURE;
-  size_t malloc_size;
-  size_t section_irep_size;
-  size_t section_lineno_size = 0, section_lv_size = 0;
-  uint8_t *cur = NULL;
-  mrb_bool const debug_info_defined = is_debug_info_defined(irep), lv_defined = is_lv_defined(irep);
-  mrb_sym *lv_syms = NULL; uint32_t lv_syms_len = 0;
-  mrb_sym *filenames = NULL; uint16_t filenames_len = 0;
-
-  if (mrb == NULL) {
-    *bin = NULL;
-    return MRB_DUMP_GENERAL_FAILURE;
-  }
-
-  section_irep_size = sizeof(struct rite_section_irep_header);
-  section_irep_size += get_irep_record_size(mrb, irep);
-
-  /* DEBUG section size */
-  if (flags & DUMP_DEBUG_INFO) {
-    if (debug_info_defined) {
-      section_lineno_size += sizeof(struct rite_section_debug_header);
-      /* filename table */
-      filenames = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) + 1);
-
-      /* filename table size */
-      section_lineno_size += sizeof(uint16_t);
-      section_lineno_size += get_filename_table_size(mrb, irep, &filenames, &filenames_len);
-
-      section_lineno_size += get_debug_record_size(mrb, irep);
-    }
-    else {
-      section_lineno_size += sizeof(struct rite_section_lineno_header);
-      section_lineno_size += get_lineno_record_size(mrb, irep);
-    }
-  }
-
-  if (lv_defined) {
-    section_lv_size += sizeof(struct rite_section_lv_header);
-    create_lv_sym_table(mrb, irep, &lv_syms, &lv_syms_len);
-    section_lv_size += get_lv_section_size(mrb, irep, lv_syms, lv_syms_len);
-  }
-
-  malloc_size = sizeof(struct rite_binary_header) +
-                section_irep_size + section_lineno_size + section_lv_size +
-                sizeof(struct rite_binary_footer);
-  cur = *bin = (uint8_t*)mrb_malloc(mrb, malloc_size);
-  cur += sizeof(struct rite_binary_header);
-
-  result = write_section_irep(mrb, irep, cur, &section_irep_size, flags);
-  if (result != MRB_DUMP_OK) {
-    goto error_exit;
-  }
-  cur += section_irep_size;
-  *bin_size = sizeof(struct rite_binary_header) +
-              section_irep_size + section_lineno_size + section_lv_size +
-              sizeof(struct rite_binary_footer);
-
-  /* write DEBUG section */
-  if (flags & DUMP_DEBUG_INFO) {
-    if (debug_info_defined) {
-      result = write_section_debug(mrb, irep, cur, filenames, filenames_len);
-    }
-    else {
-      result = write_section_lineno(mrb, irep, cur);
-    }
-    if (result != MRB_DUMP_OK) {
-      goto error_exit;
-    }
-    cur += section_lineno_size;
-  }
-
-  if (lv_defined) {
-    result = write_section_lv(mrb, irep, cur, lv_syms, lv_syms_len);
-    if (result != MRB_DUMP_OK) {
-      goto error_exit;
-    }
-    cur += section_lv_size;
-  }
-
-  write_footer(mrb, cur);
-  write_rite_binary_header(mrb, *bin_size, *bin, flags);
-
-error_exit:
-  if (result != MRB_DUMP_OK) {
-    mrb_free(mrb, *bin);
-    *bin = NULL;
-  }
-  mrb_free(mrb, lv_syms);
-  mrb_free(mrb, filenames);
-  return result;
-}
-
-int
-mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size)
-{
-  return dump_irep(mrb, irep, dump_flags(flags, FLAG_BYTEORDER_NONATIVE), bin, bin_size);
-}
-
-#ifndef MRB_DISABLE_STDIO
-
-int
-mrb_dump_irep_binary(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE* fp)
-{
-  uint8_t *bin = NULL;
-  size_t bin_size = 0;
-  int result;
-
-  if (fp == NULL) {
-    return MRB_DUMP_INVALID_ARGUMENT;
-  }
-
-  result = dump_irep(mrb, irep, dump_flags(flags, FLAG_BYTEORDER_NONATIVE), &bin, &bin_size);
-  if (result == MRB_DUMP_OK) {
-    if (fwrite(bin, sizeof(bin[0]), bin_size, fp) != bin_size) {
-      result = MRB_DUMP_WRITE_FAULT;
-    }
-  }
-
-  mrb_free(mrb, bin);
-  return result;
-}
-
-static mrb_bool
-dump_bigendian_p(uint8_t flags)
-{
-  switch (flags & DUMP_ENDIAN_NAT) {
-  case DUMP_ENDIAN_BIG:
-    return TRUE;
-  case DUMP_ENDIAN_LIL:
-    return FALSE;
-  default:
-  case DUMP_ENDIAN_NAT:
-    return bigendian_p();
-  }
-}
-
-int
-mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE *fp, const char *initname)
-{
-  uint8_t *bin = NULL;
-  size_t bin_size = 0, bin_idx = 0;
-  int result;
-
-  if (fp == NULL || initname == NULL || initname[0] == '\0') {
-    return MRB_DUMP_INVALID_ARGUMENT;
-  }
-  flags = dump_flags(flags, FLAG_BYTEORDER_NATIVE);
-  result = dump_irep(mrb, irep, flags, &bin, &bin_size);
-  if (result == MRB_DUMP_OK) {
-    if (!dump_bigendian_p(flags)) {
-      if (fprintf(fp, "/* dumped in little endian order.\n"
-                  "   use `mrbc -E` option for big endian CPU. */\n") < 0) {
-        mrb_free(mrb, bin);
-        return MRB_DUMP_WRITE_FAULT;
-      }
-    }
-    else {
-      if (fprintf(fp, "/* dumped in big endian order.\n"
-                  "   use `mrbc -e` option for better performance on little endian CPU. */\n") < 0) {
-        mrb_free(mrb, bin);
-        return MRB_DUMP_WRITE_FAULT;
-      }
-    }
-    if (fprintf(fp, "#include <stdint.h>\n") < 0) { /* for uint8_t under at least Darwin */
-      mrb_free(mrb, bin);
-      return MRB_DUMP_WRITE_FAULT;
-    }
-    if (fprintf(fp,
-          "extern const uint8_t %s[];\n"
-          "const uint8_t\n"
-          "#if defined __GNUC__\n"
-          "__attribute__((aligned(%u)))\n"
-          "#elif defined _MSC_VER\n"
-          "__declspec(align(%u))\n"
-          "#endif\n"
-          "%s[] = {",
-          initname,
-          (uint16_t)MRB_DUMP_ALIGNMENT, (uint16_t)MRB_DUMP_ALIGNMENT, initname) < 0) {
-      mrb_free(mrb, bin);
-      return MRB_DUMP_WRITE_FAULT;
-    }
-    while (bin_idx < bin_size) {
-      if (bin_idx % 16 == 0) {
-        if (fputs("\n", fp) == EOF) {
-          mrb_free(mrb, bin);
-          return MRB_DUMP_WRITE_FAULT;
-        }
-      }
-      if (fprintf(fp, "0x%02x,", bin[bin_idx++]) < 0) {
-        mrb_free(mrb, bin);
-        return MRB_DUMP_WRITE_FAULT;
-      }
-    }
-    if (fputs("\n};\n", fp) == EOF) {
-      mrb_free(mrb, bin);
-      return MRB_DUMP_WRITE_FAULT;
-    }
-  }
-
-  mrb_free(mrb, bin);
-  return result;
-}
-
-#endif /* MRB_DISABLE_STDIO */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/enum.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/enum.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/enum.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/enum.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-/*
-** enum.c - Enumerable module
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-
-void
-mrb_init_enumerable(mrb_state *mrb)
-{
-  mrb_define_module(mrb, "Enumerable");  /* 15.3.2 */
-}
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,500 +0,0 @@
-/*
-** error.c - Exception class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/irep.h>
-#include <mruby/proc.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/debug.h>
-#include <mruby/error.h>
-#include <mruby/class.h>
-#include <mruby/throw.h>
-
-MRB_API mrb_value
-mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)
-{
-  mrb_value arg = mrb_str_new(mrb, ptr, len);
-  return mrb_obj_new(mrb, c, 1, &arg);
-}
-
-MRB_API mrb_value
-mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str)
-{
-  str = mrb_str_to_str(mrb, str);
-  return mrb_obj_new(mrb, c, 1, &str);
-}
-
-/*
- * call-seq:
- *    Exception.new(msg = nil)   ->  exception
- *
- *  Construct a new Exception object, optionally passing in
- *  a message.
- */
-
-static mrb_value
-exc_initialize(mrb_state *mrb, mrb_value exc)
-{
-  mrb_value mesg;
-  mrb_int argc;
-  mrb_value *argv;
-
-  if (mrb_get_args(mrb, "|o*!", &mesg, &argv, &argc) >= 1) {
-    mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "mesg"), mesg);
-  }
-  return exc;
-}
-
-/*
- *  Document-method: exception
- *
- *  call-seq:
- *     exc.exception(string)  ->  an_exception or exc
- *
- *  With no argument, or if the argument is the same as the receiver,
- *  return the receiver. Otherwise, create a new
- *  exception object of the same class as the receiver, but with a
- *  message equal to <code>string</code>.
- *
- */
-
-static mrb_value
-exc_exception(mrb_state *mrb, mrb_value self)
-{
-  mrb_value exc;
-  mrb_value a;
-  int argc;
-
-  argc = mrb_get_args(mrb, "|o", &a);
-  if (argc == 0) return self;
-  if (mrb_obj_equal(mrb, self, a)) return self;
-  exc = mrb_obj_clone(mrb, self);
-  mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "mesg"), a);
-
-  return exc;
-}
-
-/*
- * call-seq:
- *   exception.to_s   ->  string
- *
- * Returns exception's message (or the name of the exception if
- * no message is set).
- */
-
-static mrb_value
-exc_to_s(mrb_state *mrb, mrb_value exc)
-{
-  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg"));
-  struct RObject *p;
-
-  if (!mrb_string_p(mesg)) {
-    return mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, exc));
-  }
-  p = mrb_obj_ptr(mesg);
-  if (!p->c) {
-    p->c = mrb->string_class;
-  }
-  return mesg;
-}
-
-/*
- * call-seq:
- *   exception.message   ->  string
- *
- * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name.
- */
-
-static mrb_value
-exc_message(mrb_state *mrb, mrb_value exc)
-{
-  return mrb_funcall(mrb, exc, "to_s", 0);
-}
-
-/*
- * call-seq:
- *   exception.inspect   -> string
- *
- * Returns this exception's file name, line number,
- * message and class name.
- * If file name or line number is not set,
- * returns message and class name.
- */
-
-static mrb_value
-exc_inspect(mrb_state *mrb, mrb_value exc)
-{
-  mrb_value str, mesg, file, line;
-  mrb_bool append_mesg;
-  const char *cname;
-
-  mesg = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "mesg"));
-  file = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "file"));
-  line = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "line"));
-
-  append_mesg = !mrb_nil_p(mesg);
-  if (append_mesg) {
-    mesg = mrb_obj_as_string(mrb, mesg);
-    append_mesg = RSTRING_LEN(mesg) > 0;
-  }
-
-  cname = mrb_obj_classname(mrb, exc);
-  str = mrb_str_new_cstr(mrb, cname);
-  if (mrb_string_p(file) && mrb_fixnum_p(line)) {
-    if (append_mesg) {
-      str = mrb_format(mrb, "%S:%S: %S (%S)", file, line, mesg, str);
-    }
-    else {
-      str = mrb_format(mrb, "%S:%S: %S", file, line, str);
-    }
-  }
-  else if (append_mesg) {
-    str = mrb_format(mrb, "%S: %S", str, mesg);
-  }
-  return str;
-}
-
-void mrb_keep_backtrace(mrb_state *mrb, mrb_value exc);
-
-static void
-set_backtrace(mrb_state *mrb, mrb_value exc, mrb_value backtrace)
-{
-  if (!mrb_array_p(backtrace)) {
-  type_err:
-    mrb_raise(mrb, E_TYPE_ERROR, "backtrace must be Array of String");
-  }
-  else {
-    const mrb_value *p = RARRAY_PTR(backtrace);
-    const mrb_value *pend = p + RARRAY_LEN(backtrace);
-
-    while (p < pend) {
-      if (!mrb_string_p(*p)) goto type_err;
-      p++;
-    }
-  }
-  mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "backtrace"), backtrace);
-}
-
-static mrb_value
-exc_set_backtrace(mrb_state *mrb, mrb_value exc)
-{
-  mrb_value backtrace;
-
-  mrb_get_args(mrb, "o", &backtrace);
-  set_backtrace(mrb, exc, backtrace);
-  return backtrace;
-}
-
-static void
-exc_debug_info(mrb_state *mrb, struct RObject *exc)
-{
-  mrb_callinfo *ci = mrb->c->ci;
-  mrb_code *pc = ci->pc;
-
-  while (ci >= mrb->c->cibase) {
-    mrb_code *err = ci->err;
-
-    if (!err && pc) err = pc - 1;
-    if (err && ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
-      mrb_irep *irep = ci->proc->body.irep;
-
-      int32_t const line = mrb_debug_get_line(irep, (uint32_t)(err - irep->iseq));
-      char const* file = mrb_debug_get_filename(irep, (uint32_t)(err - irep->iseq));
-      if (line != -1 && file) {
-        mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "file"), mrb_str_new_cstr(mrb, file));
-        mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "line"), mrb_fixnum_value(line));
-        return;
-      }
-    }
-    pc = ci->pc;
-    ci--;
-  }
-}
-
-void
-mrb_exc_set(mrb_state *mrb, mrb_value exc)
-{
-  if (mrb_nil_p(exc)) {
-    mrb->exc = 0;
-  }
-  else {
-    mrb->exc = mrb_obj_ptr(exc);
-    if (!mrb->gc.out_of_memory) {
-      exc_debug_info(mrb, mrb->exc);
-      mrb_keep_backtrace(mrb, exc);
-    }
-  }
-}
-
-MRB_API mrb_noreturn void
-mrb_exc_raise(mrb_state *mrb, mrb_value exc)
-{
-  if (!mrb_obj_is_kind_of(mrb, exc, mrb->eException_class)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "exception object expected");
-  }
-  mrb_exc_set(mrb, exc);
-  if (!mrb->jmp) {
-    mrb_p(mrb, exc);
-    abort();
-  }
-  MRB_THROW(mrb->jmp);
-}
-
-MRB_API mrb_noreturn void
-mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg)
-{
-  mrb_exc_raise(mrb, mrb_exc_new_str(mrb, c, mrb_str_new_cstr(mrb, msg)));
-}
-
-MRB_API mrb_value
-mrb_vformat(mrb_state *mrb, const char *format, va_list ap)
-{
-  const char *p = format;
-  const char *b = p;
-  ptrdiff_t size;
-  mrb_value ary = mrb_ary_new_capa(mrb, 4);
-  int ai = mrb_gc_arena_save(mrb);
-
-  while (*p) {
-    const char c = *p++;
-
-    if (c == '%') {
-      if (*p == 'S') {
-        size = p - b - 1;
-        mrb_ary_push(mrb, ary, mrb_str_new(mrb, b, size));
-        mrb_ary_push(mrb, ary, va_arg(ap, mrb_value));
-        b = p + 1;
-      }
-    }
-    else if (c == '\\') {
-      if (*p) {
-        size = p - b - 1;
-        mrb_ary_push(mrb, ary, mrb_str_new(mrb, b, size));
-        mrb_ary_push(mrb, ary, mrb_str_new(mrb, p, 1));
-        b = ++p;
-      }
-      else {
-        break;
-      }
-    }
-    mrb_gc_arena_restore(mrb, ai);
-  }
-  if (b == format) {
-    return mrb_str_new_cstr(mrb, format);
-  }
-  else {
-    size = p - b;
-    if (size > 0) {
-      mrb_ary_push(mrb, ary, mrb_str_new(mrb, b, size));
-      mrb_gc_arena_restore(mrb, ai);
-    }
-    return mrb_ary_join(mrb, ary, mrb_nil_value());
-  }
-}
-
-MRB_API mrb_value
-mrb_format(mrb_state *mrb, const char *format, ...)
-{
-  va_list ap;
-  mrb_value str;
-
-  va_start(ap, format);
-  str = mrb_vformat(mrb, format, ap);
-  va_end(ap);
-
-  return str;
-}
-
-static mrb_noreturn void
-raise_va(mrb_state *mrb, struct RClass *c, const char *fmt, va_list ap, int argc, mrb_value *argv)
-{
-  mrb_value mesg;
-
-  mesg = mrb_vformat(mrb, fmt, ap);
-  if (argv == NULL) {
-    argv = &mesg;
-  }
-  else {
-    argv[0] = mesg;
-  }
-  mrb_exc_raise(mrb, mrb_obj_new(mrb, c, argc+1, argv));
-}
-
-MRB_API mrb_noreturn void
-mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...)
-{
-  va_list args;
-
-  va_start(args, fmt);
-  raise_va(mrb, c, fmt, args, 0, NULL);
-  va_end(args);
-}
-
-MRB_API mrb_noreturn void
-mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...)
-{
-  mrb_value argv[2];
-  va_list args;
-
-  va_start(args, fmt);
-  argv[1] = mrb_symbol_value(id);
-  raise_va(mrb, E_NAME_ERROR, fmt, args, 1, argv);
-  va_end(args);
-}
-
-MRB_API void
-mrb_warn(mrb_state *mrb, const char *fmt, ...)
-{
-#ifndef MRB_DISABLE_STDIO
-  va_list ap;
-  mrb_value str;
-
-  va_start(ap, fmt);
-  str = mrb_vformat(mrb, fmt, ap);
-  fputs("warning: ", stderr);
-  fwrite(RSTRING_PTR(str), RSTRING_LEN(str), 1, stderr);
-  va_end(ap);
-#endif
-}
-
-MRB_API mrb_noreturn void
-mrb_bug(mrb_state *mrb, const char *fmt, ...)
-{
-#ifndef MRB_DISABLE_STDIO
-  va_list ap;
-  mrb_value str;
-
-  va_start(ap, fmt);
-  str = mrb_vformat(mrb, fmt, ap);
-  fputs("bug: ", stderr);
-  fwrite(RSTRING_PTR(str), RSTRING_LEN(str), 1, stderr);
-  va_end(ap);
-#endif
-  exit(EXIT_FAILURE);
-}
-
-MRB_API mrb_value
-mrb_make_exception(mrb_state *mrb, int argc, const mrb_value *argv)
-{
-  mrb_value mesg;
-  int n;
-
-  mesg = mrb_nil_value();
-  switch (argc) {
-    case 0:
-    break;
-    case 1:
-      if (mrb_nil_p(argv[0]))
-        break;
-      if (mrb_string_p(argv[0])) {
-        mesg = mrb_exc_new_str(mrb, E_RUNTIME_ERROR, argv[0]);
-        break;
-      }
-      n = 0;
-      goto exception_call;
-
-    case 2:
-    case 3:
-      n = 1;
-exception_call:
-      {
-        mrb_sym exc = mrb_intern_lit(mrb, "exception");
-        if (mrb_respond_to(mrb, argv[0], exc)) {
-          mesg = mrb_funcall_argv(mrb, argv[0], exc, n, argv+1);
-        }
-        else {
-          /* undef */
-          mrb_raise(mrb, E_TYPE_ERROR, "exception class/object expected");
-        }
-      }
-
-      break;
-    default:
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%S for 0..3)", mrb_fixnum_value(argc));
-      break;
-  }
-  if (argc > 0) {
-    if (!mrb_obj_is_kind_of(mrb, mesg, mrb->eException_class))
-      mrb_raise(mrb, mrb->eException_class, "exception object expected");
-    if (argc > 2)
-      set_backtrace(mrb, mesg, argv[2]);
-  }
-
-  return mesg;
-}
-
-MRB_API void
-mrb_sys_fail(mrb_state *mrb, const char *mesg)
-{
-  struct RClass *sce;
-  mrb_int no;
-
-  no = (mrb_int)errno;
-  if (mrb_class_defined(mrb, "SystemCallError")) {
-    sce = mrb_class_get(mrb, "SystemCallError");
-    if (mesg != NULL) {
-      mrb_funcall(mrb, mrb_obj_value(sce), "_sys_fail", 2, mrb_fixnum_value(no), mrb_str_new_cstr(mrb, mesg));
-    }
-    else {
-      mrb_funcall(mrb, mrb_obj_value(sce), "_sys_fail", 1, mrb_fixnum_value(no));
-    }
-  }
-  else {
-    mrb_raise(mrb, E_RUNTIME_ERROR, mesg);
-  }
-}
-
-MRB_API mrb_noreturn void
-mrb_no_method_error(mrb_state *mrb, mrb_sym id, mrb_value args, char const* fmt, ...)
-{
-  mrb_value exc;
-  mrb_value argv[3];
-  va_list ap;
-
-  va_start(ap, fmt);
-  argv[0] = mrb_vformat(mrb, fmt, ap);
-  argv[1] = mrb_symbol_value(id);
-  argv[2] = args;
-  va_end(ap);
-  exc = mrb_obj_new(mrb, E_NOMETHOD_ERROR, 3, argv);
-  mrb_exc_raise(mrb, exc);
-}
-
-void
-mrb_init_exception(mrb_state *mrb)
-{
-  struct RClass *exception, *script_error, *stack_error, *nomem_error;
-
-  mrb->eException_class = exception = mrb_define_class(mrb, "Exception", mrb->object_class); /* 15.2.22 */
-  MRB_SET_INSTANCE_TT(exception, MRB_TT_EXCEPTION);
-  mrb_define_class_method(mrb, exception, "exception", mrb_instance_new,  MRB_ARGS_ANY());
-  mrb_define_method(mrb, exception, "exception",       exc_exception,     MRB_ARGS_ANY());
-  mrb_define_method(mrb, exception, "initialize",      exc_initialize,    MRB_ARGS_ANY());
-  mrb_define_method(mrb, exception, "to_s",            exc_to_s,          MRB_ARGS_NONE());
-  mrb_define_method(mrb, exception, "message",         exc_message,       MRB_ARGS_NONE());
-  mrb_define_method(mrb, exception, "inspect",         exc_inspect,       MRB_ARGS_NONE());
-  mrb_define_method(mrb, exception, "backtrace",       mrb_exc_backtrace, MRB_ARGS_NONE());
-  mrb_define_method(mrb, exception, "set_backtrace",   exc_set_backtrace, MRB_ARGS_REQ(1));
-
-  mrb->eStandardError_class = mrb_define_class(mrb, "StandardError", mrb->eException_class); /* 15.2.23 */
-  mrb_define_class(mrb, "RuntimeError", mrb->eStandardError_class);          /* 15.2.28 */
-  script_error = mrb_define_class(mrb, "ScriptError", mrb->eException_class);                /* 15.2.37 */
-  mrb_define_class(mrb, "SyntaxError", script_error);                                        /* 15.2.38 */
-  stack_error = mrb_define_class(mrb, "SystemStackError", exception);
-  mrb->stack_err = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, stack_error, "stack level too deep"));
-
-  nomem_error = mrb_define_class(mrb, "NoMemoryError", exception);
-  mrb->nomem_err = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, nomem_error, "Out of memory"));
-#ifdef MRB_GC_FIXED_ARENA
-  mrb->arena_err = mrb_obj_ptr(mrb_exc_new_str_lit(mrb, nomem_error, "arena overflow error"));
-#endif
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-/* this header file is to be removed soon.
-   added for compatibility purpose (1.0.0) */
-#include <mruby/error.h>
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/etc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/etc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/etc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/etc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,232 +0,0 @@
-/*
-** etc.c -
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/string.h>
-#include <mruby/data.h>
-#include <mruby/class.h>
-#include <mruby/re.h>
-#include <mruby/irep.h>
-
-MRB_API struct RData*
-mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const mrb_data_type *type)
-{
-  struct RData *data;
-
-  data = (struct RData*)mrb_obj_alloc(mrb, MRB_TT_DATA, klass);
-  data->data = ptr;
-  data->type = type;
-
-  return data;
-}
-
-MRB_API void
-mrb_data_check_type(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
-{
-  if (mrb_type(obj) != MRB_TT_DATA) {
-    mrb_check_type(mrb, obj, MRB_TT_DATA);
-  }
-  if (DATA_TYPE(obj) != type) {
-    const mrb_data_type *t2 = DATA_TYPE(obj);
-
-    if (t2) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %S (expected %S)",
-                 mrb_str_new_cstr(mrb, t2->struct_name), mrb_str_new_cstr(mrb, type->struct_name));
-    }
-    else {
-      struct RClass *c = mrb_class(mrb, obj);
-
-      mrb_raisef(mrb, E_TYPE_ERROR, "uninitialized %S (expected %S)",
-                 mrb_obj_value(c), mrb_str_new_cstr(mrb, type->struct_name));
-    }
-  }
-}
-
-MRB_API void*
-mrb_data_check_get_ptr(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
-{
-  if (mrb_type(obj) != MRB_TT_DATA) {
-    return NULL;
-  }
-  if (DATA_TYPE(obj) != type) {
-    return NULL;
-  }
-  return DATA_PTR(obj);
-}
-
-MRB_API void*
-mrb_data_get_ptr(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
-{
-  mrb_data_check_type(mrb, obj, type);
-  return DATA_PTR(obj);
-}
-
-MRB_API mrb_sym
-mrb_obj_to_sym(mrb_state *mrb, mrb_value name)
-{
-  mrb_sym id;
-
-  switch (mrb_type(name)) {
-    default:
-      name = mrb_check_string_type(mrb, name);
-      if (mrb_nil_p(name)) {
-        name = mrb_inspect(mrb, name);
-        mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a symbol", name);
-      }
-      /* fall through */
-    case MRB_TT_STRING:
-      name = mrb_str_intern(mrb, name);
-      /* fall through */
-    case MRB_TT_SYMBOL:
-      id = mrb_symbol(name);
-  }
-  return id;
-}
-
-MRB_API mrb_int
-mrb_float_id(mrb_float f)
-{
-  const char *p = (const char*)&f;
-  int len = sizeof(f);
-  mrb_int id = 0;
-
-  while (len--) {
-    id = id*65599 + *p;
-    p++;
-  }
-  id = id + (id>>5);
-
-  return id;
-}
-
-MRB_API mrb_int
-mrb_obj_id(mrb_value obj)
-{
-  mrb_int tt = mrb_type(obj);
-
-#define MakeID2(p,t) (mrb_int)(((intptr_t)(p))^(t))
-#define MakeID(p)    MakeID2(p,tt)
-
-  switch (tt) {
-  case MRB_TT_FREE:
-  case MRB_TT_UNDEF:
-    return MakeID(0); /* not define */
-  case MRB_TT_FALSE:
-    if (mrb_nil_p(obj))
-      return MakeID(1);
-    return MakeID(0);
-  case MRB_TT_TRUE:
-    return MakeID(1);
-  case MRB_TT_SYMBOL:
-    return MakeID(mrb_symbol(obj));
-  case MRB_TT_FIXNUM:
-    return MakeID2(mrb_float_id((mrb_float)mrb_fixnum(obj)), MRB_TT_FLOAT);
-  case MRB_TT_FLOAT:
-    return MakeID(mrb_float_id(mrb_float(obj)));
-  case MRB_TT_STRING:
-  case MRB_TT_OBJECT:
-  case MRB_TT_CLASS:
-  case MRB_TT_MODULE:
-  case MRB_TT_ICLASS:
-  case MRB_TT_SCLASS:
-  case MRB_TT_PROC:
-  case MRB_TT_ARRAY:
-  case MRB_TT_HASH:
-  case MRB_TT_RANGE:
-  case MRB_TT_EXCEPTION:
-  case MRB_TT_FILE:
-  case MRB_TT_DATA:
-  case MRB_TT_ISTRUCT:
-  default:
-    return MakeID(mrb_ptr(obj));
-  }
-}
-
-#ifdef MRB_WORD_BOXING
-MRB_API mrb_value
-mrb_word_boxing_float_value(mrb_state *mrb, mrb_float f)
-{
-  mrb_value v;
-
-  v.value.p = mrb_obj_alloc(mrb, MRB_TT_FLOAT, mrb->float_class);
-  v.value.fp->f = f;
-  return v;
-}
-
-MRB_API mrb_value
-mrb_word_boxing_float_pool(mrb_state *mrb, mrb_float f)
-{
-  struct RFloat *nf = (struct RFloat *)mrb_malloc(mrb, sizeof(struct RFloat));
-  nf->tt = MRB_TT_FLOAT;
-  nf->c = mrb->float_class;
-  nf->f = f;
-  return mrb_obj_value(nf);
-}
-
-MRB_API mrb_value
-mrb_word_boxing_cptr_value(mrb_state *mrb, void *p)
-{
-  mrb_value v;
-
-  v.value.p = mrb_obj_alloc(mrb, MRB_TT_CPTR, mrb->object_class);
-  v.value.vp->p = p;
-  return v;
-}
-#endif  /* MRB_WORD_BOXING */
-
-MRB_API mrb_bool
-mrb_regexp_p(mrb_state *mrb, mrb_value v)
-{
-  if (mrb->flags & MRB_STATE_NO_REGEXP) {
-    return FALSE;
-  }
-  if ((mrb->flags & MRB_STATE_REGEXP) || mrb_class_defined(mrb, REGEXP_CLASS)) {
-    mrb->flags |= MRB_STATE_REGEXP;
-    return mrb_obj_is_kind_of(mrb, v, mrb_class_get(mrb, REGEXP_CLASS));
-  }
-  else {
-    mrb->flags |= MRB_STATE_REGEXP;
-    mrb->flags |= MRB_STATE_NO_REGEXP;
-  }
-  return FALSE;
-}
-
-#if defined _MSC_VER && _MSC_VER < 1900
-
-#ifndef va_copy
-static void
-mrb_msvc_va_copy(va_list *dest, va_list src)
-{
-  *dest = src;
-}
-#define va_copy(dest, src) mrb_msvc_va_copy(&(dest), src)
-#endif
-
-MRB_API int
-mrb_msvc_vsnprintf(char *s, size_t n, const char *format, va_list arg)
-{
-  int cnt;
-  va_list argcp;
-  va_copy(argcp, arg);
-  if (n == 0 || (cnt = _vsnprintf_s(s, n, _TRUNCATE, format, argcp)) < 0) {
-    cnt = _vscprintf(format, arg);
-  }
-  va_end(argcp);
-  return cnt;
-}
-
-MRB_API int
-mrb_msvc_snprintf(char *s, size_t n, const char *format, ...)
-{
-  va_list arg;
-  int ret;
-  va_start(arg, format);
-  ret = mrb_msvc_vsnprintf(s, n, format, arg);
-  va_end(arg);
-  return ret;
-}
-
-#endif  /* defined _MSC_VER && _MSC_VER < 1900 */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/fmt_fp.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/fmt_fp.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/fmt_fp.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/fmt_fp.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,371 +0,0 @@
-/*
-
-Most code in this file originates from musl (src/stdio/vfprintf.c)
-which, just like mruby itself, is licensed under the MIT license.
-
-Copyright (c) 2005-2014 Rich Felker, et al.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#include <limits.h>
-#include <string.h>
-#include <stdint.h>
-#include <math.h>
-#include <float.h>
-#include <ctype.h>
-
-#include <mruby.h>
-#include <mruby/string.h>
-
-struct fmt_args {
-  mrb_state *mrb;
-  mrb_value str;
-};
-
-#define MAX(a,b) ((a)>(b) ? (a) : (b))
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
-
-/* Convenient bit representation for modifier flags, which all fall
- * within 31 codepoints of the space character. */
-
-#define ALT_FORM   (1U<<('#'-' '))
-#define ZERO_PAD   (1U<<('0'-' '))
-#define LEFT_ADJ   (1U<<('-'-' '))
-#define PAD_POS    (1U<<(' '-' '))
-#define MARK_POS   (1U<<('+'-' '))
-
-static void
-out(struct fmt_args *f, const char *s, size_t l)
-{
-  mrb_str_cat(f->mrb, f->str, s, l);
-}
-
-#define PAD_SIZE 256
-static void
-pad(struct fmt_args *f, char c, int w, int l, int fl)
-{
-  char pad[PAD_SIZE];
-  if (fl & (LEFT_ADJ | ZERO_PAD) || l >= w) return;
-  l = w - l;
-  memset(pad, c, l>PAD_SIZE ? PAD_SIZE : l);
-  for (; l >= PAD_SIZE; l -= PAD_SIZE)
-    out(f, pad, PAD_SIZE);
-  out(f, pad, l);
-}
-
-static const char xdigits[16] = {
-  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-static char*
-fmt_u(uint32_t x, char *s)
-{
-  for (; x; x /= 10) *--s = '0' + x % 10;
-  return s;
-}
-
-/* Do not override this check. The floating point printing code below
- * depends on the float.h constants being right. If they are wrong, it
- * may overflow the stack. */
-#if LDBL_MANT_DIG == 53
-typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)];
-#endif
-
-static int
-fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
-{
-  uint32_t big[(LDBL_MANT_DIG+28)/29 + 1          // mantissa expansion
-    + (LDBL_MAX_EXP+LDBL_MANT_DIG+28+8)/9]; // exponent expansion
-  uint32_t *a, *d, *r, *z;
-  uint32_t i;
-  int e2=0, e, j, l;
-  char buf[9+LDBL_MANT_DIG/4], *s;
-  const char *prefix="-0X+0X 0X-0x+0x 0x";
-  int pl;
-  char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
-
-  pl=1;
-  if (signbit(y)) {
-    y=-y;
-  } else if (fl & MARK_POS) {
-    prefix+=3;
-  } else if (fl & PAD_POS) {
-    prefix+=6;
-  } else prefix++, pl=0;
-
-  if (!isfinite(y)) {
-    const char *ss = (t&32)?"inf":"INF";
-    if (y!=y) ss=(t&32)?"nan":"NAN";
-    pad(f, ' ', w, 3+pl, fl&~ZERO_PAD);
-    out(f, prefix, pl);
-    out(f, ss, 3);
-    pad(f, ' ', w, 3+pl, fl^LEFT_ADJ);
-    return MAX(w, 3+pl);
-  }
-
-  y = frexp((double)y, &e2) * 2;
-  if (y) e2--;
-
-  if ((t|32)=='a') {
-    long double round = 8.0;
-    int re;
-
-    if (t&32) prefix += 9;
-    pl += 2;
-
-    if (p<0 || p>=LDBL_MANT_DIG/4-1) re=0;
-    else re=LDBL_MANT_DIG/4-1-p;
-
-    if (re) {
-      while (re--) round*=16;
-      if (*prefix=='-') {
-        y=-y;
-        y-=round;
-        y+=round;
-        y=-y;
-      }
-      else {
-        y+=round;
-        y-=round;
-      }
-    }
-
-    estr=fmt_u(e2<0 ? -e2 : e2, ebuf);
-    if (estr==ebuf) *--estr='0';
-    *--estr = (e2<0 ? '-' : '+');
-    *--estr = t+('p'-'a');
-
-    s=buf;
-    do {
-      int x=(int)y;
-      *s++=xdigits[x]|(t&32);
-      y=16*(y-x);
-      if (s-buf==1 && (y||p>0||(fl&ALT_FORM))) *s++='.';
-    } while (y);
-
-    if (p && s-buf-2 < p)
-      l = (p+2) + (ebuf-estr);
-    else
-      l = (s-buf) + (ebuf-estr);
-
-    pad(f, ' ', w, pl+l, fl);
-    out(f, prefix, pl);
-    pad(f, '0', w, pl+l, fl^ZERO_PAD);
-    out(f, buf, s-buf);
-    pad(f, '0', l-(ebuf-estr)-(s-buf), 0, 0);
-    out(f, estr, ebuf-estr);
-    pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
-    return MAX(w, pl+l);
-  }
-  if (p<0) p=6;
-
-  if (y) y *= 268435456.0, e2-=28;
-
-  if (e2<0) a=r=z=big;
-  else a=r=z=big+sizeof(big)/sizeof(*big) - LDBL_MANT_DIG - 1;
-
-  do {
-    *z = (uint32_t)y;
-    y = 1000000000*(y-*z++);
-  } while (y);
-
-  while (e2>0) {
-    uint32_t carry=0;
-    int sh=MIN(29,e2);
-    for (d=z-1; d>=a; d--) {
-      uint64_t x = ((uint64_t)*d<<sh)+carry;
-      *d = x % 1000000000;
-      carry = (uint32_t)(x / 1000000000);
-    }
-    if (carry) *--a = carry;
-    while (z>a && !z[-1]) z--;
-    e2-=sh;
-  }
-  while (e2<0) {
-    uint32_t carry=0, *b;
-    int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3+8)/9;
-    for (d=a; d<z; d++) {
-      uint32_t rm = *d & ((1<<sh)-1);
-      *d = (*d>>sh) + carry;
-      carry = (1000000000>>sh) * rm;
-    }
-    if (!*a) a++;
-    if (carry) *z++ = carry;
-    /* Avoid (slow!) computation past requested precision */
-    b = (t|32)=='f' ? r : a;
-    if (z-b > need) z = b+need;
-    e2+=sh;
-  }
-
-  if (a<z) for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
-  else e=0;
-
-  /* Perform rounding: j is precision after the radix (possibly neg) */
-  j = p - ((t|32)!='f')*e - ((t|32)=='g' && p);
-  if (j < 9*(z-r-1)) {
-    uint32_t x;
-    /* We avoid C's broken division of negative numbers */
-    d = r + 1 + ((j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP);
-    j += 9*LDBL_MAX_EXP;
-    j %= 9;
-    for (i=10, j++; j<9; i*=10, j++);
-    x = *d % i;
-    /* Are there any significant digits past j? */
-    if (x || d+1!=z) {
-      long double round = 2/LDBL_EPSILON;
-      long double small;
-      if (*d/i & 1) round += 2;
-      if (x<i/2) small=0.5;
-      else if (x==i/2 && d+1==z) small=1.0;
-      else small=1.5;
-      if (pl && *prefix=='-') round*=-1, small*=-1;
-      *d -= x;
-      /* Decide whether to round by probing round+small */
-      if (round+small != round) {
-        *d = *d + i;
-        while (*d > 999999999) {
-          *d--=0;
-          if (d<a) *--a=0;
-          (*d)++;
-        }
-        for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
-      }
-    }
-    if (z>d+1) z=d+1;
-  }
-  for (; z>a && !z[-1]; z--);
-
-  if ((t|32)=='g') {
-    if (!p) p++;
-    if (p>e && e>=-4) {
-      t--;
-      p-=e+1;
-    }
-    else {
-      t-=2;
-      p--;
-    }
-    if (!(fl&ALT_FORM)) {
-      /* Count trailing zeros in last place */
-      if (z>a && z[-1]) for (i=10, j=0; z[-1]%i==0; i*=10, j++);
-      else j=9;
-      if ((t|32)=='f')
-        p = MIN(p,MAX(0,9*(z-r-1)-j));
-      else
-        p = MIN(p,MAX(0,9*(z-r-1)+e-j));
-    }
-  }
-  l = 1 + p + (p || (fl&ALT_FORM));
-  if ((t|32)=='f') {
-    if (e>0) l+=e;
-  }
-  else {
-    estr=fmt_u(e<0 ? -e : e, ebuf);
-    while(ebuf-estr<2) *--estr='0';
-    *--estr = (e<0 ? '-' : '+');
-    *--estr = t;
-    l += ebuf-estr;
-  }
-
-  pad(f, ' ', w, pl+l, fl);
-  out(f, prefix, pl);
-  pad(f, '0', w, pl+l, fl^ZERO_PAD);
-
-  if ((t|32)=='f') {
-    if (a>r) a=r;
-    for (d=a; d<=r; d++) {
-      char *ss = fmt_u(*d, buf+9);
-      if (d!=a) while (ss>buf) *--ss='0';
-      else if (ss==buf+9) *--ss='0';
-      out(f, ss, buf+9-ss);
-    }
-    if (p || (fl&ALT_FORM)) out(f, ".", 1);
-    for (; d<z && p>0; d++, p-=9) {
-      char *ss = fmt_u(*d, buf+9);
-      while (ss>buf) *--ss='0';
-      out(f, ss, MIN(9,p));
-    }
-    pad(f, '0', p+9, 9, 0);
-  }
-  else {
-    if (z<=a) z=a+1;
-    for (d=a; d<z && p>=0; d++) {
-      char *ss = fmt_u(*d, buf+9);
-      if (ss==buf+9) *--ss='0';
-      if (d!=a) while (ss>buf) *--ss='0';
-      else {
-        out(f, ss++, 1);
-        if (p>0||(fl&ALT_FORM)) out(f, ".", 1);
-      }
-      out(f, ss, MIN(buf+9-ss, p));
-      p -= buf+9-ss;
-    }
-    pad(f, '0', p+18, 18, 0);
-    out(f, estr, ebuf-estr);
-  }
-
-  pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
-
-  return MAX(w, pl+l);
-}
-
-static int
-fmt_core(struct fmt_args *f, const char *fmt, mrb_float flo)
-{
-  int p;
-
-  if (*fmt != '%') {
-    return -1;
-  }
-  ++fmt;
-
-  if (*fmt == '.') {
-    ++fmt;
-    for (p = 0; ISDIGIT(*fmt); ++fmt) {
-      p = 10 * p + (*fmt - '0');
-    }
-  }
-  else {
-    p = -1;
-  }
-
-  switch (*fmt) {
-  case 'e': case 'f': case 'g': case 'a':
-  case 'E': case 'F': case 'G': case 'A':
-    return fmt_fp(f, flo, 0, p, 0, *fmt);
-  default:
-    return -1;
-  }
-}
-
-mrb_value
-mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
-{
-  struct fmt_args f;
-
-  f.mrb = mrb;
-  f.str = mrb_str_buf_new(mrb, 24);
-  if (fmt_core(&f, fmt, mrb_float(flo)) < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format string");
-  }
-  return f.str;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/gc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/gc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/gc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/gc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1819 +0,0 @@
-/*
-** gc.c - garbage collector for mruby
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <string.h>
-#include <stdlib.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/data.h>
-#include <mruby/hash.h>
-#include <mruby/proc.h>
-#include <mruby/range.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/gc.h>
-#include <mruby/error.h>
-#include <mruby/throw.h>
-
-/*
-  = Tri-color Incremental Garbage Collection
-
-  mruby's GC is Tri-color Incremental GC with Mark & Sweep.
-  Algorithm details are omitted.
-  Instead, the implementation part is described below.
-
-  == Object's Color
-
-  Each object can be painted in three colors:
-
-    * White - Unmarked.
-    * Gray - Marked, But the child objects are unmarked.
-    * Black - Marked, the child objects are also marked.
-
-  == Two White Types
-
-  There're two white color types in a flip-flop fashion: White-A and White-B,
-  which respectively represent the Current White color (the newly allocated
-  objects in the current GC cycle) and the Sweep Target White color (the
-  dead objects to be swept).
-
-  A and B will be switched just at the beginning of the next GC cycle. At
-  that time, all the dead objects have been swept, while the newly created
-  objects in the current GC cycle which finally remains White are now
-  regarded as dead objects. Instead of traversing all the White-A objects and
-  painting them as White-B, just switch the meaning of White-A and White-B as
-  this will be much cheaper.
-
-  As a result, the objects we sweep in the current GC cycle are always
-  left from the previous GC cycle. This allows us to sweep objects
-  incrementally, without the disturbance of the newly created objects.
-
-  == Execution Timing
-
-  GC Execution Time and Each step interval are decided by live objects count.
-  List of Adjustment API:
-
-    * gc_interval_ratio_set
-    * gc_step_ratio_set
-
-  For details, see the comments for each function.
-
-  == Write Barrier
-
-  mruby implementer and C extension library writer must insert a write
-  barrier when updating a reference from a field of an object.
-  When updating a reference from a field of object A to object B,
-  two different types of write barrier are available:
-
-    * mrb_field_write_barrier - target B object for a mark.
-    * mrb_write_barrier       - target A object for a mark.
-
-  == Generational Mode
-
-  mruby's GC offers an Generational Mode while re-using the tri-color GC
-  infrastructure. It will treat the Black objects as Old objects after each
-  sweep phase, instead of painting them White. The key ideas are still the same
-  as traditional generational GC:
-
-    * Minor GC - just traverse the Young objects (Gray objects) in the mark
-                 phase, then only sweep the newly created objects, and leave
-                 the Old objects live.
-
-    * Major GC - same as a full regular GC cycle.
-
-  The difference from "traditional" generational GC is, that the major GC
-  in mruby is triggered incrementally in a tri-color manner.
-
-
-  For details, see the comments for each function.
-
-*/
-
-struct free_obj {
-  MRB_OBJECT_HEADER;
-  struct RBasic *next;
-};
-
-typedef struct {
-  union {
-    struct free_obj free;
-    struct RBasic basic;
-    struct RObject object;
-    struct RClass klass;
-    struct RString string;
-    struct RArray array;
-    struct RHash hash;
-    struct RRange range;
-    struct RData data;
-    struct RProc proc;
-    struct REnv env;
-    struct RException exc;
-    struct RBreak brk;
-#ifdef MRB_WORD_BOXING
-    struct RFloat floatv;
-    struct RCptr cptr;
-#endif
-  } as;
-} RVALUE;
-
-#ifdef GC_PROFILE
-#include <stdio.h>
-#include <sys/time.h>
-
-static double program_invoke_time = 0;
-static double gc_time = 0;
-static double gc_total_time = 0;
-
-static double
-gettimeofday_time(void)
-{
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec + tv.tv_usec * 1e-6;
-}
-
-#define GC_INVOKE_TIME_REPORT(with) do {\
-  fprintf(stderr, "%s\n", with);\
-  fprintf(stderr, "gc_invoke: %19.3f\n", gettimeofday_time() - program_invoke_time);\
-  fprintf(stderr, "is_generational: %d\n", is_generational(gc));\
-  fprintf(stderr, "is_major_gc: %d\n", is_major_gc(gc));\
-} while(0)
-
-#define GC_TIME_START do {\
-  gc_time = gettimeofday_time();\
-} while(0)
-
-#define GC_TIME_STOP_AND_REPORT do {\
-  gc_time = gettimeofday_time() - gc_time;\
-  gc_total_time += gc_time;\
-  fprintf(stderr, "gc_state: %d\n", gc->state);\
-  fprintf(stderr, "live: %zu\n", gc->live);\
-  fprintf(stderr, "majorgc_old_threshold: %zu\n", gc->majorgc_old_threshold);\
-  fprintf(stderr, "gc_threshold: %zu\n", gc->threshold);\
-  fprintf(stderr, "gc_time: %30.20f\n", gc_time);\
-  fprintf(stderr, "gc_total_time: %30.20f\n\n", gc_total_time);\
-} while(0)
-#else
-#define GC_INVOKE_TIME_REPORT(s)
-#define GC_TIME_START
-#define GC_TIME_STOP_AND_REPORT
-#endif
-
-#ifdef GC_DEBUG
-#define DEBUG(x) (x)
-#else
-#define DEBUG(x)
-#endif
-
-#ifndef MRB_HEAP_PAGE_SIZE
-#define MRB_HEAP_PAGE_SIZE 1024
-#endif
-
-#define GC_STEP_SIZE 1024
-
-/* white: 011, black: 100, gray: 000 */
-#define GC_GRAY 0
-#define GC_WHITE_A 1
-#define GC_WHITE_B (1 << 1)
-#define GC_BLACK (1 << 2)
-#define GC_WHITES (GC_WHITE_A | GC_WHITE_B)
-#define GC_COLOR_MASK 7
-
-#define paint_gray(o) ((o)->color = GC_GRAY)
-#define paint_black(o) ((o)->color = GC_BLACK)
-#define paint_white(o) ((o)->color = GC_WHITES)
-#define paint_partial_white(s, o) ((o)->color = (s)->current_white_part)
-#define is_gray(o) ((o)->color == GC_GRAY)
-#define is_white(o) ((o)->color & GC_WHITES)
-#define is_black(o) ((o)->color & GC_BLACK)
-#define flip_white_part(s) ((s)->current_white_part = other_white_part(s))
-#define other_white_part(s) ((s)->current_white_part ^ GC_WHITES)
-#define is_dead(s, o) (((o)->color & other_white_part(s) & GC_WHITES) || (o)->tt == MRB_TT_FREE)
-
-#define objects(p) ((RVALUE *)p->objects)
-
-MRB_API void*
-mrb_realloc_simple(mrb_state *mrb, void *p,  size_t len)
-{
-  void *p2;
-
-  p2 = (mrb->allocf)(mrb, p, len, mrb->allocf_ud);
-  if (!p2 && len > 0 && mrb->gc.heaps) {
-    mrb_full_gc(mrb);
-    p2 = (mrb->allocf)(mrb, p, len, mrb->allocf_ud);
-  }
-
-  return p2;
-}
-
-MRB_API void*
-mrb_realloc(mrb_state *mrb, void *p, size_t len)
-{
-  void *p2;
-
-  p2 = mrb_realloc_simple(mrb, p, len);
-  if (len == 0) return p2;
-  if (p2 == NULL) {
-    if (mrb->gc.out_of_memory) {
-      mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
-      /* mrb_panic(mrb); */
-    }
-    else {
-      mrb->gc.out_of_memory = TRUE;
-      mrb_exc_raise(mrb, mrb_obj_value(mrb->nomem_err));
-    }
-  }
-  else {
-    mrb->gc.out_of_memory = FALSE;
-  }
-
-  return p2;
-}
-
-MRB_API void*
-mrb_malloc(mrb_state *mrb, size_t len)
-{
-  return mrb_realloc(mrb, 0, len);
-}
-
-MRB_API void*
-mrb_malloc_simple(mrb_state *mrb, size_t len)
-{
-  return mrb_realloc_simple(mrb, 0, len);
-}
-
-MRB_API void*
-mrb_calloc(mrb_state *mrb, size_t nelem, size_t len)
-{
-  void *p;
-
-  if (nelem > 0 && len > 0 &&
-      nelem <= SIZE_MAX / len) {
-    size_t size;
-    size = nelem * len;
-    p = mrb_malloc(mrb, size);
-
-    memset(p, 0, size);
-  }
-  else {
-    p = NULL;
-  }
-
-  return p;
-}
-
-MRB_API void
-mrb_free(mrb_state *mrb, void *p)
-{
-  (mrb->allocf)(mrb, p, 0, mrb->allocf_ud);
-}
-
-MRB_API mrb_bool
-mrb_object_dead_p(mrb_state *mrb, struct RBasic *object) {
-  return is_dead(&mrb->gc, object);
-}
-
-static void
-link_heap_page(mrb_gc *gc, mrb_heap_page *page)
-{
-  page->next = gc->heaps;
-  if (gc->heaps)
-    gc->heaps->prev = page;
-  gc->heaps = page;
-}
-
-static void
-unlink_heap_page(mrb_gc *gc, mrb_heap_page *page)
-{
-  if (page->prev)
-    page->prev->next = page->next;
-  if (page->next)
-    page->next->prev = page->prev;
-  if (gc->heaps == page)
-    gc->heaps = page->next;
-  page->prev = NULL;
-  page->next = NULL;
-}
-
-static void
-link_free_heap_page(mrb_gc *gc, mrb_heap_page *page)
-{
-  page->free_next = gc->free_heaps;
-  if (gc->free_heaps) {
-    gc->free_heaps->free_prev = page;
-  }
-  gc->free_heaps = page;
-}
-
-static void
-unlink_free_heap_page(mrb_gc *gc, mrb_heap_page *page)
-{
-  if (page->free_prev)
-    page->free_prev->free_next = page->free_next;
-  if (page->free_next)
-    page->free_next->free_prev = page->free_prev;
-  if (gc->free_heaps == page)
-    gc->free_heaps = page->free_next;
-  page->free_prev = NULL;
-  page->free_next = NULL;
-}
-
-static void
-add_heap(mrb_state *mrb, mrb_gc *gc)
-{
-  mrb_heap_page *page = (mrb_heap_page *)mrb_calloc(mrb, 1, sizeof(mrb_heap_page) + MRB_HEAP_PAGE_SIZE * sizeof(RVALUE));
-  RVALUE *p, *e;
-  struct RBasic *prev = NULL;
-
-  for (p = objects(page), e=p+MRB_HEAP_PAGE_SIZE; p<e; p++) {
-    p->as.free.tt = MRB_TT_FREE;
-    p->as.free.next = prev;
-    prev = &p->as.basic;
-  }
-  page->freelist = prev;
-
-  link_heap_page(gc, page);
-  link_free_heap_page(gc, page);
-}
-
-#define DEFAULT_GC_INTERVAL_RATIO 200
-#define DEFAULT_GC_STEP_RATIO 200
-#define DEFAULT_MAJOR_GC_INC_RATIO 200
-#define is_generational(gc) ((gc)->generational)
-#define is_major_gc(gc) (is_generational(gc) && (gc)->full)
-#define is_minor_gc(gc) (is_generational(gc) && !(gc)->full)
-
-void
-mrb_gc_init(mrb_state *mrb, mrb_gc *gc)
-{
-#ifndef MRB_GC_FIXED_ARENA
-  gc->arena = (struct RBasic**)mrb_malloc(mrb, sizeof(struct RBasic*)*MRB_GC_ARENA_SIZE);
-  gc->arena_capa = MRB_GC_ARENA_SIZE;
-#endif
-
-  gc->current_white_part = GC_WHITE_A;
-  gc->heaps = NULL;
-  gc->free_heaps = NULL;
-  add_heap(mrb, gc);
-  gc->interval_ratio = DEFAULT_GC_INTERVAL_RATIO;
-  gc->step_ratio = DEFAULT_GC_STEP_RATIO;
-#ifndef MRB_GC_TURN_OFF_GENERATIONAL
-  gc->generational = TRUE;
-  gc->full = TRUE;
-#endif
-
-#ifdef GC_PROFILE
-  program_invoke_time = gettimeofday_time();
-#endif
-}
-
-static void obj_free(mrb_state *mrb, struct RBasic *obj, int end);
-
-void
-free_heap(mrb_state *mrb, mrb_gc *gc)
-{
-  mrb_heap_page *page = gc->heaps;
-  mrb_heap_page *tmp;
-  RVALUE *p, *e;
-
-  while (page) {
-    tmp = page;
-    page = page->next;
-    for (p = objects(tmp), e=p+MRB_HEAP_PAGE_SIZE; p<e; p++) {
-      if (p->as.free.tt != MRB_TT_FREE)
-        obj_free(mrb, &p->as.basic, TRUE);
-    }
-    mrb_free(mrb, tmp);
-  }
-}
-
-void
-mrb_gc_destroy(mrb_state *mrb, mrb_gc *gc)
-{
-  free_heap(mrb, gc);
-#ifndef MRB_GC_FIXED_ARENA
-  mrb_free(mrb, gc->arena);
-#endif
-}
-
-static void
-gc_protect(mrb_state *mrb, mrb_gc *gc, struct RBasic *p)
-{
-#ifdef MRB_GC_FIXED_ARENA
-  if (gc->arena_idx >= MRB_GC_ARENA_SIZE) {
-    /* arena overflow error */
-    gc->arena_idx = MRB_GC_ARENA_SIZE - 4; /* force room in arena */
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->arena_err));
-  }
-#else
-  if (gc->arena_idx >= gc->arena_capa) {
-    /* extend arena */
-    gc->arena_capa = (int)(gc->arena_capa * 1.5);
-    gc->arena = (struct RBasic**)mrb_realloc(mrb, gc->arena, sizeof(struct RBasic*)*gc->arena_capa);
-  }
-#endif
-  gc->arena[gc->arena_idx++] = p;
-}
-
-/* mrb_gc_protect() leaves the object in the arena */
-MRB_API void
-mrb_gc_protect(mrb_state *mrb, mrb_value obj)
-{
-  if (mrb_immediate_p(obj)) return;
-  gc_protect(mrb, &mrb->gc, mrb_basic_ptr(obj));
-}
-
-#define GC_ROOT_NAME "_gc_root_"
-
-/* mrb_gc_register() keeps the object from GC.
-
-   Register your object when it's exported to C world,
-   without reference from Ruby world, e.g. callback
-   arguments.  Don't forget to remove the object using
-   mrb_gc_unregister, otherwise your object will leak.
-*/
-
-MRB_API void
-mrb_gc_register(mrb_state *mrb, mrb_value obj)
-{
-  mrb_sym root = mrb_intern_lit(mrb, GC_ROOT_NAME);
-  mrb_value table = mrb_gv_get(mrb, root);
-
-  if (mrb_nil_p(table) || mrb_type(table) != MRB_TT_ARRAY) {
-    table = mrb_ary_new(mrb);
-    mrb_gv_set(mrb, root, table);
-  }
-  mrb_ary_push(mrb, table, obj);
-}
-
-/* mrb_gc_unregister() removes the object from GC root. */
-MRB_API void
-mrb_gc_unregister(mrb_state *mrb, mrb_value obj)
-{
-  mrb_sym root = mrb_intern_lit(mrb, GC_ROOT_NAME);
-  mrb_value table = mrb_gv_get(mrb, root);
-  struct RArray *a;
-  mrb_int i;
-
-  if (mrb_nil_p(table)) return;
-  if (mrb_type(table) != MRB_TT_ARRAY) {
-    mrb_gv_set(mrb, root, mrb_nil_value());
-    return;
-  }
-  a = mrb_ary_ptr(table);
-  mrb_ary_modify(mrb, a);
-  for (i = 0; i < ARY_LEN(a); i++) {
-    if (mrb_obj_eq(mrb, ARY_PTR(a)[i], obj)) {
-      mrb_int len = ARY_LEN(a)-1;
-      mrb_value *ptr = ARY_PTR(a);
-
-      ARY_SET_LEN(a, len);
-      memmove(&ptr[i], &ptr[i + 1], (len - i) * sizeof(mrb_value));
-      break;
-    }
-  }
-}
-
-MRB_API struct RBasic*
-mrb_obj_alloc(mrb_state *mrb, enum mrb_vtype ttype, struct RClass *cls)
-{
-  struct RBasic *p;
-  static const RVALUE RVALUE_zero = { { { MRB_TT_FALSE } } };
-  mrb_gc *gc = &mrb->gc;
-
-  if (cls) {
-    enum mrb_vtype tt;
-
-    switch (cls->tt) {
-    case MRB_TT_CLASS:
-    case MRB_TT_SCLASS:
-    case MRB_TT_MODULE:
-    case MRB_TT_ENV:
-      break;
-    default:
-      mrb_raise(mrb, E_TYPE_ERROR, "allocation failure");
-    }
-    tt = MRB_INSTANCE_TT(cls);
-    if (tt != MRB_TT_FALSE &&
-        ttype != MRB_TT_SCLASS &&
-        ttype != MRB_TT_ICLASS &&
-        ttype != MRB_TT_ENV &&
-        ttype != tt) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "allocation failure of %S", mrb_obj_value(cls));
-    }
-  }
-
-#ifdef MRB_GC_STRESS
-  mrb_full_gc(mrb);
-#endif
-  if (gc->threshold < gc->live) {
-    mrb_incremental_gc(mrb);
-  }
-  if (gc->free_heaps == NULL) {
-    add_heap(mrb, gc);
-  }
-
-  p = gc->free_heaps->freelist;
-  gc->free_heaps->freelist = ((struct free_obj*)p)->next;
-  if (gc->free_heaps->freelist == NULL) {
-    unlink_free_heap_page(gc, gc->free_heaps);
-  }
-
-  gc->live++;
-  gc_protect(mrb, gc, p);
-  *(RVALUE *)p = RVALUE_zero;
-  p->tt = ttype;
-  p->c = cls;
-  paint_partial_white(gc, p);
-  return p;
-}
-
-static inline void
-add_gray_list(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
-{
-#ifdef MRB_GC_STRESS
-  if (obj->tt > MRB_TT_MAXDEFINE) {
-    abort();
-  }
-#endif
-  paint_gray(obj);
-  obj->gcnext = gc->gray_list;
-  gc->gray_list = obj;
-}
-
-static void
-mark_context_stack(mrb_state *mrb, struct mrb_context *c)
-{
-  size_t i;
-  size_t e;
-  mrb_value nil;
-  int nregs;
-
-  if (c->stack == NULL) return;
-  e = c->stack - c->stbase;
-  if (c->ci) {
-    nregs = c->ci->argc + 2;
-    if (c->ci->nregs > nregs)
-      nregs = c->ci->nregs;
-    e += nregs;
-  }
-  if (c->stbase + e > c->stend) e = c->stend - c->stbase;
-  for (i=0; i<e; i++) {
-    mrb_value v = c->stbase[i];
-
-    if (!mrb_immediate_p(v)) {
-      mrb_gc_mark(mrb, mrb_basic_ptr(v));
-    }
-  }
-  e = c->stend - c->stbase;
-  nil = mrb_nil_value();
-  for (; i<e; i++) {
-    c->stbase[i] = nil;
-  }
-}
-
-static void
-mark_context(mrb_state *mrb, struct mrb_context *c)
-{
-  int i;
-  mrb_callinfo *ci;
-
-  if (c->status == MRB_FIBER_TERMINATED) return;
-
-  /* mark VM stack */
-  mark_context_stack(mrb, c);
-
-  /* mark call stack */
-  if (c->cibase) {
-    for (ci = c->cibase; ci <= c->ci; ci++) {
-      mrb_gc_mark(mrb, (struct RBasic*)ci->env);
-      mrb_gc_mark(mrb, (struct RBasic*)ci->proc);
-      mrb_gc_mark(mrb, (struct RBasic*)ci->target_class);
-    }
-  }
-  /* mark ensure stack */
-  for (i=0; i<c->esize; i++) {
-    if (c->ensure[i] == NULL) break;
-    mrb_gc_mark(mrb, (struct RBasic*)c->ensure[i]);
-  }
-  /* mark fibers */
-  mrb_gc_mark(mrb, (struct RBasic*)c->fib);
-  if (c->prev) {
-    mark_context(mrb, c->prev);
-  }
-}
-
-static void
-gc_mark_children(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
-{
-  mrb_assert(is_gray(obj));
-  paint_black(obj);
-  gc->gray_list = obj->gcnext;
-  mrb_gc_mark(mrb, (struct RBasic*)obj->c);
-  switch (obj->tt) {
-  case MRB_TT_ICLASS:
-    {
-      struct RClass *c = (struct RClass*)obj;
-      if (MRB_FLAG_TEST(c, MRB_FLAG_IS_ORIGIN))
-        mrb_gc_mark_mt(mrb, c);
-      mrb_gc_mark(mrb, (struct RBasic*)((struct RClass*)obj)->super);
-    }
-    break;
-
-  case MRB_TT_CLASS:
-  case MRB_TT_MODULE:
-  case MRB_TT_SCLASS:
-    {
-      struct RClass *c = (struct RClass*)obj;
-
-      mrb_gc_mark_mt(mrb, c);
-      mrb_gc_mark(mrb, (struct RBasic*)c->super);
-    }
-    /* fall through */
-
-  case MRB_TT_OBJECT:
-  case MRB_TT_DATA:
-  case MRB_TT_EXCEPTION:
-    mrb_gc_mark_iv(mrb, (struct RObject*)obj);
-    break;
-
-  case MRB_TT_PROC:
-    {
-      struct RProc *p = (struct RProc*)obj;
-
-      mrb_gc_mark(mrb, (struct RBasic*)p->env);
-      mrb_gc_mark(mrb, (struct RBasic*)p->target_class);
-    }
-    break;
-
-  case MRB_TT_ENV:
-    {
-      struct REnv *e = (struct REnv*)obj;
-      mrb_int i, len;
-
-      if (MRB_ENV_STACK_SHARED_P(e)) {
-        if (e->cxt.c->fib) {
-          mrb_gc_mark(mrb, (struct RBasic*)e->cxt.c->fib);
-        }
-        break;
-      }
-      len = MRB_ENV_STACK_LEN(e);
-      for (i=0; i<len; i++) {
-        mrb_gc_mark_value(mrb, e->stack[i]);
-      }
-    }
-    break;
-
-  case MRB_TT_FIBER:
-    {
-      struct mrb_context *c = ((struct RFiber*)obj)->cxt;
-
-      if (c) mark_context(mrb, c);
-    }
-    break;
-
-  case MRB_TT_ARRAY:
-    {
-      struct RArray *a = (struct RArray*)obj;
-      size_t i, e;
-
-      for (i=0,e=ARY_LEN(a); i<e; i++) {
-        mrb_gc_mark_value(mrb, ARY_PTR(a)[i]);
-      }
-    }
-    break;
-
-  case MRB_TT_HASH:
-    mrb_gc_mark_iv(mrb, (struct RObject*)obj);
-    mrb_gc_mark_hash(mrb, (struct RHash*)obj);
-    break;
-
-  case MRB_TT_STRING:
-    break;
-
-  case MRB_TT_RANGE:
-    {
-      struct RRange *r = (struct RRange*)obj;
-
-      if (r->edges) {
-        mrb_gc_mark_value(mrb, r->edges->beg);
-        mrb_gc_mark_value(mrb, r->edges->end);
-      }
-    }
-    break;
-
-  default:
-    break;
-  }
-}
-
-MRB_API void
-mrb_gc_mark(mrb_state *mrb, struct RBasic *obj)
-{
-  if (obj == 0) return;
-  if (!is_white(obj)) return;
-  mrb_assert((obj)->tt != MRB_TT_FREE);
-  add_gray_list(mrb, &mrb->gc, obj);
-}
-
-static void
-obj_free(mrb_state *mrb, struct RBasic *obj, int end)
-{
-  DEBUG(fprintf(stderr, "obj_free(%p,tt=%d)\n",obj,obj->tt));
-  switch (obj->tt) {
-    /* immediate - no mark */
-  case MRB_TT_TRUE:
-  case MRB_TT_FIXNUM:
-  case MRB_TT_SYMBOL:
-    /* cannot happen */
-    return;
-
-  case MRB_TT_FLOAT:
-#ifdef MRB_WORD_BOXING
-    break;
-#else
-    return;
-#endif
-
-  case MRB_TT_OBJECT:
-    mrb_gc_free_iv(mrb, (struct RObject*)obj);
-    break;
-
-  case MRB_TT_EXCEPTION:
-    mrb_gc_free_iv(mrb, (struct RObject*)obj);
-    break;
-
-  case MRB_TT_CLASS:
-  case MRB_TT_MODULE:
-  case MRB_TT_SCLASS:
-    mrb_gc_free_mt(mrb, (struct RClass*)obj);
-    mrb_gc_free_iv(mrb, (struct RObject*)obj);
-    break;
-  case MRB_TT_ICLASS:
-    if (MRB_FLAG_TEST(obj, MRB_FLAG_IS_ORIGIN))
-      mrb_gc_free_mt(mrb, (struct RClass*)obj);
-    break;
-  case MRB_TT_ENV:
-    {
-      struct REnv *e = (struct REnv*)obj;
-
-      if (MRB_ENV_STACK_SHARED_P(e)) {
-        /* cannot be freed */
-        return;
-      }
-      mrb_free(mrb, e->stack);
-      e->stack = NULL;
-    }
-    break;
-
-  case MRB_TT_FIBER:
-    {
-      struct mrb_context *c = ((struct RFiber*)obj)->cxt;
-
-      if (!end && c && c != mrb->root_c) {
-        mrb_callinfo *ci = c->ci;
-        mrb_callinfo *ce = c->cibase;
-
-        while (ce <= ci) {
-          struct REnv *e = ci->env;
-          if (e && !is_dead(&mrb->gc, e) &&
-              e->tt == MRB_TT_ENV && MRB_ENV_STACK_SHARED_P(e)) {
-            mrb_env_unshare(mrb, e);
-          }
-          ci--;
-        }
-        mrb_free_context(mrb, c);
-      }
-    }
-    break;
-
-  case MRB_TT_ARRAY:
-    if (ARY_SHARED_P(obj))
-      mrb_ary_decref(mrb, ((struct RArray*)obj)->as.heap.aux.shared);
-    else if (!ARY_EMBED_P(obj))
-      mrb_free(mrb, ((struct RArray*)obj)->as.heap.ptr);
-    break;
-
-  case MRB_TT_HASH:
-    mrb_gc_free_iv(mrb, (struct RObject*)obj);
-    mrb_gc_free_hash(mrb, (struct RHash*)obj);
-    break;
-
-  case MRB_TT_STRING:
-    mrb_gc_free_str(mrb, (struct RString*)obj);
-    break;
-
-  case MRB_TT_PROC:
-    {
-      struct RProc *p = (struct RProc*)obj;
-
-      if (!MRB_PROC_CFUNC_P(p) && p->body.irep) {
-        mrb_irep_decref(mrb, p->body.irep);
-      }
-    }
-    break;
-
-  case MRB_TT_RANGE:
-    mrb_free(mrb, ((struct RRange*)obj)->edges);
-    break;
-
-  case MRB_TT_DATA:
-    {
-      struct RData *d = (struct RData*)obj;
-      if (d->type && d->type->dfree) {
-        d->type->dfree(mrb, d->data);
-      }
-      mrb_gc_free_iv(mrb, (struct RObject*)obj);
-    }
-    break;
-
-  default:
-    break;
-  }
-  obj->tt = MRB_TT_FREE;
-}
-
-static void
-root_scan_phase(mrb_state *mrb, mrb_gc *gc)
-{
-  int i, e;
-
-  if (!is_minor_gc(gc)) {
-    gc->gray_list = NULL;
-    gc->atomic_gray_list = NULL;
-  }
-
-  mrb_gc_mark_gv(mrb);
-  /* mark arena */
-  for (i=0,e=gc->arena_idx; i<e; i++) {
-    mrb_gc_mark(mrb, gc->arena[i]);
-  }
-  /* mark class hierarchy */
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->object_class);
-
-  /* mark built-in classes */
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->class_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->module_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->proc_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->string_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->array_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->hash_class);
-
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->float_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->fixnum_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->true_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->false_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->nil_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->symbol_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->kernel_module);
-
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->eException_class);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->eStandardError_class);
-
-  /* mark top_self */
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->top_self);
-  /* mark exception */
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->exc);
-  /* mark pre-allocated exception */
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->nomem_err);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->stack_err);
-#ifdef MRB_GC_FIXED_ARENA
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->arena_err);
-#endif
-
-  mark_context(mrb, mrb->c);
-  if (mrb->root_c != mrb->c) {
-    mark_context(mrb, mrb->root_c);
-  }
-}
-
-static size_t
-gc_gray_mark(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj)
-{
-  size_t children = 0;
-
-  gc_mark_children(mrb, gc, obj);
-
-  switch (obj->tt) {
-  case MRB_TT_ICLASS:
-    children++;
-    break;
-
-  case MRB_TT_CLASS:
-  case MRB_TT_SCLASS:
-  case MRB_TT_MODULE:
-    {
-      struct RClass *c = (struct RClass*)obj;
-
-      children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
-      children += mrb_gc_mark_mt_size(mrb, c);
-      children++;
-    }
-    break;
-
-  case MRB_TT_OBJECT:
-  case MRB_TT_DATA:
-  case MRB_TT_EXCEPTION:
-    children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
-    break;
-
-  case MRB_TT_ENV:
-    children += (int)obj->flags;
-    break;
-
-  case MRB_TT_FIBER:
-    {
-      struct mrb_context *c = ((struct RFiber*)obj)->cxt;
-      size_t i;
-      mrb_callinfo *ci;
-
-      if (!c) break;
-      /* mark stack */
-      i = c->stack - c->stbase;
-      if (c->ci) i += c->ci->nregs;
-      if (c->stbase + i > c->stend) i = c->stend - c->stbase;
-      children += i;
-
-      /* mark ensure stack */
-      children += c->eidx;
-
-      /* mark closure */
-      if (c->cibase) {
-        for (i=0, ci = c->cibase; ci <= c->ci; i++, ci++)
-          ;
-      }
-      children += i;
-    }
-    break;
-
-  case MRB_TT_ARRAY:
-    {
-      struct RArray *a = (struct RArray*)obj;
-      children += ARY_LEN(a);
-    }
-    break;
-
-  case MRB_TT_HASH:
-    children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj);
-    children += mrb_gc_mark_hash_size(mrb, (struct RHash*)obj);
-    break;
-
-  case MRB_TT_PROC:
-  case MRB_TT_RANGE:
-    children+=2;
-    break;
-
-  default:
-    break;
-  }
-  return children;
-}
-
-
-static void
-gc_mark_gray_list(mrb_state *mrb, mrb_gc *gc) {
-  while (gc->gray_list) {
-    if (is_gray(gc->gray_list))
-      gc_mark_children(mrb, gc, gc->gray_list);
-    else
-      gc->gray_list = gc->gray_list->gcnext;
-  }
-}
-
-
-static size_t
-incremental_marking_phase(mrb_state *mrb, mrb_gc *gc, size_t limit)
-{
-  size_t tried_marks = 0;
-
-  while (gc->gray_list && tried_marks < limit) {
-    tried_marks += gc_gray_mark(mrb, gc, gc->gray_list);
-  }
-
-  return tried_marks;
-}
-
-static void
-final_marking_phase(mrb_state *mrb, mrb_gc *gc)
-{
-  int i, e;
-
-  /* mark arena */
-  for (i=0,e=gc->arena_idx; i<e; i++) {
-    mrb_gc_mark(mrb, gc->arena[i]);
-  }
-  mrb_gc_mark_gv(mrb);
-  mark_context(mrb, mrb->c);
-  mark_context(mrb, mrb->root_c);
-  mrb_gc_mark(mrb, (struct RBasic*)mrb->exc);
-  gc_mark_gray_list(mrb, gc);
-  mrb_assert(gc->gray_list == NULL);
-  gc->gray_list = gc->atomic_gray_list;
-  gc->atomic_gray_list = NULL;
-  gc_mark_gray_list(mrb, gc);
-  mrb_assert(gc->gray_list == NULL);
-}
-
-static void
-prepare_incremental_sweep(mrb_state *mrb, mrb_gc *gc)
-{
-  gc->state = MRB_GC_STATE_SWEEP;
-  gc->sweeps = gc->heaps;
-  gc->live_after_mark = gc->live;
-}
-
-static size_t
-incremental_sweep_phase(mrb_state *mrb, mrb_gc *gc, size_t limit)
-{
-  mrb_heap_page *page = gc->sweeps;
-  size_t tried_sweep = 0;
-
-  while (page && (tried_sweep < limit)) {
-    RVALUE *p = objects(page);
-    RVALUE *e = p + MRB_HEAP_PAGE_SIZE;
-    size_t freed = 0;
-    mrb_bool dead_slot = TRUE;
-    mrb_bool full = (page->freelist == NULL);
-
-    if (is_minor_gc(gc) && page->old) {
-      /* skip a slot which doesn't contain any young object */
-      p = e;
-      dead_slot = FALSE;
-    }
-    while (p<e) {
-      if (is_dead(gc, &p->as.basic)) {
-        if (p->as.basic.tt != MRB_TT_FREE) {
-          obj_free(mrb, &p->as.basic, FALSE);
-          if (p->as.basic.tt == MRB_TT_FREE) {
-            p->as.free.next = page->freelist;
-            page->freelist = (struct RBasic*)p;
-            freed++;
-          }
-          else {
-            dead_slot = FALSE;
-          }
-        }
-      }
-      else {
-        if (!is_generational(gc))
-          paint_partial_white(gc, &p->as.basic); /* next gc target */
-        dead_slot = FALSE;
-      }
-      p++;
-    }
-
-    /* free dead slot */
-    if (dead_slot && freed < MRB_HEAP_PAGE_SIZE) {
-      mrb_heap_page *next = page->next;
-
-      unlink_heap_page(gc, page);
-      unlink_free_heap_page(gc, page);
-      mrb_free(mrb, page);
-      page = next;
-    }
-    else {
-      if (full && freed > 0) {
-        link_free_heap_page(gc, page);
-      }
-      if (page->freelist == NULL && is_minor_gc(gc))
-        page->old = TRUE;
-      else
-        page->old = FALSE;
-      page = page->next;
-    }
-    tried_sweep += MRB_HEAP_PAGE_SIZE;
-    gc->live -= freed;
-    gc->live_after_mark -= freed;
-  }
-  gc->sweeps = page;
-  return tried_sweep;
-}
-
-static size_t
-incremental_gc(mrb_state *mrb, mrb_gc *gc, size_t limit)
-{
-  switch (gc->state) {
-  case MRB_GC_STATE_ROOT:
-    root_scan_phase(mrb, gc);
-    gc->state = MRB_GC_STATE_MARK;
-    flip_white_part(gc);
-    return 0;
-  case MRB_GC_STATE_MARK:
-    if (gc->gray_list) {
-      return incremental_marking_phase(mrb, gc, limit);
-    }
-    else {
-      final_marking_phase(mrb, gc);
-      prepare_incremental_sweep(mrb, gc);
-      return 0;
-    }
-  case MRB_GC_STATE_SWEEP: {
-     size_t tried_sweep = 0;
-     tried_sweep = incremental_sweep_phase(mrb, gc, limit);
-     if (tried_sweep == 0)
-       gc->state = MRB_GC_STATE_ROOT;
-     return tried_sweep;
-  }
-  default:
-    /* unknown state */
-    mrb_assert(0);
-    return 0;
-  }
-}
-
-static void
-incremental_gc_until(mrb_state *mrb, mrb_gc *gc, mrb_gc_state to_state)
-{
-  do {
-    incremental_gc(mrb, gc, SIZE_MAX);
-  } while (gc->state != to_state);
-}
-
-static void
-incremental_gc_step(mrb_state *mrb, mrb_gc *gc)
-{
-  size_t limit = 0, result = 0;
-  limit = (GC_STEP_SIZE/100) * gc->step_ratio;
-  while (result < limit) {
-    result += incremental_gc(mrb, gc, limit);
-    if (gc->state == MRB_GC_STATE_ROOT)
-      break;
-  }
-
-  gc->threshold = gc->live + GC_STEP_SIZE;
-}
-
-static void
-clear_all_old(mrb_state *mrb, mrb_gc *gc)
-{
-  mrb_bool origin_mode = gc->generational;
-
-  mrb_assert(is_generational(gc));
-  if (is_major_gc(gc)) {
-    /* finish the half baked GC */
-    incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
-  }
-
-  /* Sweep the dead objects, then reset all the live objects
-   * (including all the old objects, of course) to white. */
-  gc->generational = FALSE;
-  prepare_incremental_sweep(mrb, gc);
-  incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
-  gc->generational = origin_mode;
-
-  /* The gray objects have already been painted as white */
-  gc->atomic_gray_list = gc->gray_list = NULL;
-}
-
-MRB_API void
-mrb_incremental_gc(mrb_state *mrb)
-{
-  mrb_gc *gc = &mrb->gc;
-
-  if (gc->disabled || gc->iterating) return;
-
-  GC_INVOKE_TIME_REPORT("mrb_incremental_gc()");
-  GC_TIME_START;
-
-  if (is_minor_gc(gc)) {
-    incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
-  }
-  else {
-    incremental_gc_step(mrb, gc);
-  }
-
-  if (gc->state == MRB_GC_STATE_ROOT) {
-    mrb_assert(gc->live >= gc->live_after_mark);
-    gc->threshold = (gc->live_after_mark/100) * gc->interval_ratio;
-    if (gc->threshold < GC_STEP_SIZE) {
-      gc->threshold = GC_STEP_SIZE;
-    }
-
-    if (is_major_gc(gc)) {
-      gc->majorgc_old_threshold = gc->live_after_mark/100 * DEFAULT_MAJOR_GC_INC_RATIO;
-      gc->full = FALSE;
-    }
-    else if (is_minor_gc(gc)) {
-      if (gc->live > gc->majorgc_old_threshold) {
-        clear_all_old(mrb, gc);
-        gc->full = TRUE;
-      }
-    }
-  }
-
-  GC_TIME_STOP_AND_REPORT;
-}
-
-/* Perform a full gc cycle */
-MRB_API void
-mrb_full_gc(mrb_state *mrb)
-{
-  mrb_gc *gc = &mrb->gc;
-
-  if (gc->disabled || gc->iterating) return;
-
-  GC_INVOKE_TIME_REPORT("mrb_full_gc()");
-  GC_TIME_START;
-
-  if (is_generational(gc)) {
-    /* clear all the old objects back to young */
-    clear_all_old(mrb, gc);
-    gc->full = TRUE;
-  }
-  else if (gc->state != MRB_GC_STATE_ROOT) {
-    /* finish half baked GC cycle */
-    incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
-  }
-
-  incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
-  gc->threshold = (gc->live_after_mark/100) * gc->interval_ratio;
-
-  if (is_generational(gc)) {
-    gc->majorgc_old_threshold = gc->live_after_mark/100 * DEFAULT_MAJOR_GC_INC_RATIO;
-    gc->full = FALSE;
-  }
-
-  GC_TIME_STOP_AND_REPORT;
-}
-
-MRB_API void
-mrb_garbage_collect(mrb_state *mrb)
-{
-  mrb_full_gc(mrb);
-}
-
-/*
- * Field write barrier
- *   Paint obj(Black) -> value(White) to obj(Black) -> value(Gray).
- */
-
-MRB_API void
-mrb_field_write_barrier(mrb_state *mrb, struct RBasic *obj, struct RBasic *value)
-{
-  mrb_gc *gc = &mrb->gc;
-
-  if (!is_black(obj)) return;
-  if (!is_white(value)) return;
-
-  mrb_assert(gc->state == MRB_GC_STATE_MARK || (!is_dead(gc, value) && !is_dead(gc, obj)));
-  mrb_assert(is_generational(gc) || gc->state != MRB_GC_STATE_ROOT);
-
-  if (is_generational(gc) || gc->state == MRB_GC_STATE_MARK) {
-    add_gray_list(mrb, gc, value);
-  }
-  else {
-    mrb_assert(gc->state == MRB_GC_STATE_SWEEP);
-    paint_partial_white(gc, obj); /* for never write barriers */
-  }
-}
-
-/*
- * Write barrier
- *   Paint obj(Black) to obj(Gray).
- *
- *   The object that is painted gray will be traversed atomically in final
- *   mark phase. So you use this write barrier if it's frequency written spot.
- *   e.g. Set element on Array.
- */
-
-MRB_API void
-mrb_write_barrier(mrb_state *mrb, struct RBasic *obj)
-{
-  mrb_gc *gc = &mrb->gc;
-
-  if (!is_black(obj)) return;
-
-  mrb_assert(!is_dead(gc, obj));
-  mrb_assert(is_generational(gc) || gc->state != MRB_GC_STATE_ROOT);
-  paint_gray(obj);
-  obj->gcnext = gc->atomic_gray_list;
-  gc->atomic_gray_list = obj;
-}
-
-/*
- *  call-seq:
- *     GC.start                     -> nil
- *
- *  Initiates full garbage collection.
- *
- */
-
-static mrb_value
-gc_start(mrb_state *mrb, mrb_value obj)
-{
-  mrb_full_gc(mrb);
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     GC.enable    -> true or false
- *
- *  Enables garbage collection, returning <code>true</code> if garbage
- *  collection was previously disabled.
- *
- *     GC.disable   #=> false
- *     GC.enable    #=> true
- *     GC.enable    #=> false
- *
- */
-
-static mrb_value
-gc_enable(mrb_state *mrb, mrb_value obj)
-{
-  mrb_bool old = mrb->gc.disabled;
-
-  mrb->gc.disabled = FALSE;
-
-  return mrb_bool_value(old);
-}
-
-/*
- *  call-seq:
- *     GC.disable    -> true or false
- *
- *  Disables garbage collection, returning <code>true</code> if garbage
- *  collection was already disabled.
- *
- *     GC.disable   #=> false
- *     GC.disable   #=> true
- *
- */
-
-static mrb_value
-gc_disable(mrb_state *mrb, mrb_value obj)
-{
-  mrb_bool old = mrb->gc.disabled;
-
-  mrb->gc.disabled = TRUE;
-
-  return mrb_bool_value(old);
-}
-
-/*
- *  call-seq:
- *     GC.interval_ratio      -> fixnum
- *
- *  Returns ratio of GC interval. Default value is 200(%).
- *
- */
-
-static mrb_value
-gc_interval_ratio_get(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_fixnum_value(mrb->gc.interval_ratio);
-}
-
-/*
- *  call-seq:
- *     GC.interval_ratio = fixnum    -> nil
- *
- *  Updates ratio of GC interval. Default value is 200(%).
- *  GC start as soon as after end all step of GC if you set 100(%).
- *
- */
-
-static mrb_value
-gc_interval_ratio_set(mrb_state *mrb, mrb_value obj)
-{
-  mrb_int ratio;
-
-  mrb_get_args(mrb, "i", &ratio);
-  mrb->gc.interval_ratio = ratio;
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     GC.step_ratio    -> fixnum
- *
- *  Returns step span ratio of Incremental GC. Default value is 200(%).
- *
- */
-
-static mrb_value
-gc_step_ratio_get(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_fixnum_value(mrb->gc.step_ratio);
-}
-
-/*
- *  call-seq:
- *     GC.step_ratio = fixnum   -> nil
- *
- *  Updates step span ratio of Incremental GC. Default value is 200(%).
- *  1 step of incrementalGC becomes long if a rate is big.
- *
- */
-
-static mrb_value
-gc_step_ratio_set(mrb_state *mrb, mrb_value obj)
-{
-  mrb_int ratio;
-
-  mrb_get_args(mrb, "i", &ratio);
-  mrb->gc.step_ratio = ratio;
-  return mrb_nil_value();
-}
-
-static void
-change_gen_gc_mode(mrb_state *mrb, mrb_gc *gc, mrb_bool enable)
-{
-  if (gc->disabled || gc->iterating) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "generational mode changed when GC disabled");
-    return;
-  }
-  if (is_generational(gc) && !enable) {
-    clear_all_old(mrb, gc);
-    mrb_assert(gc->state == MRB_GC_STATE_ROOT);
-    gc->full = FALSE;
-  }
-  else if (!is_generational(gc) && enable) {
-    incremental_gc_until(mrb, gc, MRB_GC_STATE_ROOT);
-    gc->majorgc_old_threshold = gc->live_after_mark/100 * DEFAULT_MAJOR_GC_INC_RATIO;
-    gc->full = FALSE;
-  }
-  gc->generational = enable;
-}
-
-/*
- *  call-seq:
- *     GC.generational_mode -> true or false
- *
- *  Returns generational or normal gc mode.
- *
- */
-
-static mrb_value
-gc_generational_mode_get(mrb_state *mrb, mrb_value self)
-{
-  return mrb_bool_value(mrb->gc.generational);
-}
-
-/*
- *  call-seq:
- *     GC.generational_mode = true or false -> true or false
- *
- *  Changes to generational or normal gc mode.
- *
- */
-
-static mrb_value
-gc_generational_mode_set(mrb_state *mrb, mrb_value self)
-{
-  mrb_bool enable;
-
-  mrb_get_args(mrb, "b", &enable);
-  if (mrb->gc.generational != enable)
-    change_gen_gc_mode(mrb, &mrb->gc, enable);
-
-  return mrb_bool_value(enable);
-}
-
-
-static void
-gc_each_objects(mrb_state *mrb, mrb_gc *gc, mrb_each_object_callback *callback, void *data)
-{
-  mrb_heap_page* page;
-
-  page = gc->heaps;
-  while (page != NULL) {
-    RVALUE *p;
-    int i;
-
-    p = objects(page);
-    for (i=0; i < MRB_HEAP_PAGE_SIZE; i++) {
-      if ((*callback)(mrb, &p[i].as.basic, data) == MRB_EACH_OBJ_BREAK)
-        return;
-    }
-    page = page->next;
-  }
-}
-
-void
-mrb_objspace_each_objects(mrb_state *mrb, mrb_each_object_callback *callback, void *data)
-{
-  mrb_bool iterating = mrb->gc.iterating;
-
-  mrb->gc.iterating = TRUE;
-  if (iterating) {
-    gc_each_objects(mrb, &mrb->gc, callback, data);
-  }
-  else {
-    struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-    struct mrb_jmpbuf c_jmp;
-
-    MRB_TRY(&c_jmp) {
-      mrb->jmp = &c_jmp;
-      gc_each_objects(mrb, &mrb->gc, callback, data);
-      mrb->jmp = prev_jmp;
-      mrb->gc.iterating = iterating; 
-   } MRB_CATCH(&c_jmp) {
-      mrb->gc.iterating = iterating;
-      mrb->jmp = prev_jmp;
-      MRB_THROW(prev_jmp);
-    } MRB_END_EXC(&c_jmp);
-  }
-}
-
-#ifdef GC_TEST
-#ifdef GC_DEBUG
-static mrb_value gc_test(mrb_state *, mrb_value);
-#endif
-#endif
-
-void
-mrb_init_gc(mrb_state *mrb)
-{
-  struct RClass *gc;
-
-  gc = mrb_define_module(mrb, "GC");
-
-  mrb_define_class_method(mrb, gc, "start", gc_start, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, gc, "enable", gc_enable, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, gc, "disable", gc_disable, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, gc, "interval_ratio", gc_interval_ratio_get, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, gc, "interval_ratio=", gc_interval_ratio_set, MRB_ARGS_REQ(1));
-  mrb_define_class_method(mrb, gc, "step_ratio", gc_step_ratio_get, MRB_ARGS_NONE());
-  mrb_define_class_method(mrb, gc, "step_ratio=", gc_step_ratio_set, MRB_ARGS_REQ(1));
-  mrb_define_class_method(mrb, gc, "generational_mode=", gc_generational_mode_set, MRB_ARGS_REQ(1));
-  mrb_define_class_method(mrb, gc, "generational_mode", gc_generational_mode_get, MRB_ARGS_NONE());
-#ifdef GC_TEST
-#ifdef GC_DEBUG
-  mrb_define_class_method(mrb, gc, "test", gc_test, MRB_ARGS_NONE());
-#endif
-#endif
-}
-
-#ifdef GC_TEST
-#ifdef GC_DEBUG
-void
-test_mrb_field_write_barrier(void)
-{
-  mrb_state *mrb = mrb_open();
-  struct RBasic *obj, *value;
-  mrb_gc *gc = &mrb->gc;
-
-  puts("test_mrb_field_write_barrier");
-  gc->generational = FALSE;
-  obj = mrb_basic_ptr(mrb_ary_new(mrb));
-  value = mrb_basic_ptr(mrb_str_new_lit(mrb, "value"));
-  paint_black(obj);
-  paint_partial_white(gc, value);
-
-
-  puts("  in MRB_GC_STATE_MARK");
-  gc->state = MRB_GC_STATE_MARK;
-  mrb_field_write_barrier(mrb, obj, value);
-
-  mrb_assert(is_gray(value));
-
-
-  puts("  in MRB_GC_STATE_SWEEP");
-  paint_partial_white(gc, value);
-  gc->state = MRB_GC_STATE_SWEEP;
-  mrb_field_write_barrier(mrb, obj, value);
-
-  mrb_assert(obj->color & gc->current_white_part);
-  mrb_assert(value->color & gc->current_white_part);
-
-
-  puts("  fail with black");
-  gc->state = MRB_GC_STATE_MARK;
-  paint_white(obj);
-  paint_partial_white(gc, value);
-  mrb_field_write_barrier(mrb, obj, value);
-
-  mrb_assert(obj->color & gc->current_white_part);
-
-
-  puts("  fail with gray");
-  gc->state = MRB_GC_STATE_MARK;
-  paint_black(obj);
-  paint_gray(value);
-  mrb_field_write_barrier(mrb, obj, value);
-
-  mrb_assert(is_gray(value));
-
-
-  {
-    puts("test_mrb_field_write_barrier_value");
-    obj = mrb_basic_ptr(mrb_ary_new(mrb));
-    mrb_value value = mrb_str_new_lit(mrb, "value");
-    paint_black(obj);
-    paint_partial_white(gc, mrb_basic_ptr(value));
-
-    gc->state = MRB_GC_STATE_MARK;
-    mrb_field_write_barrier_value(mrb, obj, value);
-
-    mrb_assert(is_gray(mrb_basic_ptr(value)));
-  }
-
-  mrb_close(mrb);
-}
-
-void
-test_mrb_write_barrier(void)
-{
-  mrb_state *mrb = mrb_open();
-  struct RBasic *obj;
-  mrb_gc *gc = &mrb->gc;
-
-  puts("test_mrb_write_barrier");
-  obj = mrb_basic_ptr(mrb_ary_new(mrb));
-  paint_black(obj);
-
-  puts("  in MRB_GC_STATE_MARK");
-  gc->state = MRB_GC_STATE_MARK;
-  mrb_write_barrier(mrb, obj);
-
-  mrb_assert(is_gray(obj));
-  mrb_assert(gc->atomic_gray_list == obj);
-
-
-  puts("  fail with gray");
-  paint_gray(obj);
-  mrb_write_barrier(mrb, obj);
-
-  mrb_assert(is_gray(obj));
-
-  mrb_close(mrb);
-}
-
-void
-test_add_gray_list(void)
-{
-  mrb_state *mrb = mrb_open();
-  struct RBasic *obj1, *obj2;
-  mrb_gc *gc = &mrb->gc;
-
-  puts("test_add_gray_list");
-  change_gen_gc_mode(mrb, gc, FALSE);
-  mrb_assert(gc->gray_list == NULL);
-  obj1 = mrb_basic_ptr(mrb_str_new_lit(mrb, "test"));
-  add_gray_list(mrb, gc, obj1);
-  mrb_assert(gc->gray_list == obj1);
-  mrb_assert(is_gray(obj1));
-
-  obj2 = mrb_basic_ptr(mrb_str_new_lit(mrb, "test"));
-  add_gray_list(mrb, gc, obj2);
-  mrb_assert(gc->gray_list == obj2);
-  mrb_assert(gc->gray_list->gcnext == obj1);
-  mrb_assert(is_gray(obj2));
-
-  mrb_close(mrb);
-}
-
-void
-test_gc_gray_mark(void)
-{
-  mrb_state *mrb = mrb_open();
-  mrb_value obj_v, value_v;
-  struct RBasic *obj;
-  size_t gray_num = 0;
-  mrb_gc *gc = &mrb->gc;
-
-  puts("test_gc_gray_mark");
-
-  puts("  in MRB_TT_CLASS");
-  obj = (struct RBasic*)mrb->object_class;
-  paint_gray(obj);
-  gray_num = gc_gray_mark(mrb, gc, obj);
-  mrb_assert(is_black(obj));
-  mrb_assert(gray_num > 1);
-
-  puts("  in MRB_TT_ARRAY");
-  obj_v = mrb_ary_new(mrb);
-  value_v = mrb_str_new_lit(mrb, "test");
-  paint_gray(mrb_basic_ptr(obj_v));
-  paint_partial_white(gc, mrb_basic_ptr(value_v));
-  mrb_ary_push(mrb, obj_v, value_v);
-  gray_num = gc_gray_mark(mrb, gc, mrb_basic_ptr(obj_v));
-  mrb_assert(is_black(mrb_basic_ptr(obj_v)));
-  mrb_assert(is_gray(mrb_basic_ptr(value_v)));
-  mrb_assert(gray_num == 1);
-
-  mrb_close(mrb);
-}
-
-void
-test_incremental_gc(void)
-{
-  mrb_state *mrb = mrb_open();
-  size_t max = ~0, live = 0, total = 0, freed = 0;
-  RVALUE *free;
-  mrb_heap_page *page;
-  mrb_gc *gc = &mrb->gc;
-
-  puts("test_incremental_gc");
-  change_gen_gc_mode(mrb, gc, FALSE);
-
-  puts("  in mrb_full_gc");
-  mrb_full_gc(mrb);
-
-  mrb_assert(gc->state == MRB_GC_STATE_ROOT);
-  puts("  in MRB_GC_STATE_ROOT");
-  incremental_gc(mrb, gc, max);
-  mrb_assert(gc->state == MRB_GC_STATE_MARK);
-  puts("  in MRB_GC_STATE_MARK");
-  incremental_gc_until(mrb, gc, MRB_GC_STATE_SWEEP);
-  mrb_assert(gc->state == MRB_GC_STATE_SWEEP);
-
-  puts("  in MRB_GC_STATE_SWEEP");
-  page = gc->heaps;
-  while (page) {
-    RVALUE *p = objects(page);
-    RVALUE *e = p + MRB_HEAP_PAGE_SIZE;
-    while (p<e) {
-      if (is_black(&p->as.basic)) {
-        live++;
-      }
-      if (is_gray(&p->as.basic) && !is_dead(gc, &p->as.basic)) {
-        printf("%p\n", &p->as.basic);
-      }
-      p++;
-    }
-    page = page->next;
-    total += MRB_HEAP_PAGE_SIZE;
-  }
-
-  mrb_assert(gc->gray_list == NULL);
-
-  incremental_gc(mrb, gc, max);
-  mrb_assert(gc->state == MRB_GC_STATE_SWEEP);
-
-  incremental_gc(mrb, gc, max);
-  mrb_assert(gc->state == MRB_GC_STATE_ROOT);
-
-  free = (RVALUE*)gc->heaps->freelist;
-  while (free) {
-   freed++;
-   free = (RVALUE*)free->as.free.next;
-  }
-
-  mrb_assert(gc->live == live);
-  mrb_assert(gc->live == total-freed);
-
-  puts("test_incremental_gc(gen)");
-  incremental_gc_until(mrb, gc, MRB_GC_STATE_SWEEP);
-  change_gen_gc_mode(mrb, gc, TRUE);
-
-  mrb_assert(gc->full == FALSE);
-  mrb_assert(gc->state == MRB_GC_STATE_ROOT);
-
-  puts("  in minor");
-  mrb_assert(is_minor_gc(gc));
-  mrb_assert(gc->majorgc_old_threshold > 0);
-  gc->majorgc_old_threshold = 0;
-  mrb_incremental_gc(mrb);
-  mrb_assert(gc->full == TRUE);
-  mrb_assert(gc->state == MRB_GC_STATE_ROOT);
-
-  puts("  in major");
-  mrb_assert(is_major_gc(gc));
-  do {
-    mrb_incremental_gc(mrb);
-  } while (gc->state != MRB_GC_STATE_ROOT);
-  mrb_assert(gc->full == FALSE);
-
-  mrb_close(mrb);
-}
-
-void
-test_incremental_sweep_phase(void)
-{
-  mrb_state *mrb = mrb_open();
-  mrb_gc *gc = &mrb->gc;
-
-  puts("test_incremental_sweep_phase");
-
-  add_heap(mrb, gc);
-  gc->sweeps = gc->heaps;
-
-  mrb_assert(gc->heaps->next->next == NULL);
-  mrb_assert(gc->free_heaps->next->next == NULL);
-  incremental_sweep_phase(mrb, gc, MRB_HEAP_PAGE_SIZE * 3);
-
-  mrb_assert(gc->heaps->next == NULL);
-  mrb_assert(gc->heaps == gc->free_heaps);
-
-  mrb_close(mrb);
-}
-
-static mrb_value
-gc_test(mrb_state *mrb, mrb_value self)
-{
-  test_mrb_field_write_barrier();
-  test_mrb_write_barrier();
-  test_add_gray_list();
-  test_gc_gray_mark();
-  test_incremental_gc();
-  test_incremental_sweep_phase();
-  return mrb_nil_value();
-}
-#endif  /* GC_DEBUG */
-#endif  /* GC_TEST */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/hash.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/hash.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/hash.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/hash.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,917 +0,0 @@
-/*
-** hash.c - Hash class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/hash.h>
-#include <mruby/khash.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-
-/* a function to get hash value of a float number */
-mrb_int mrb_float_id(mrb_float f);
-
-static inline khint_t
-mrb_hash_ht_hash_func(mrb_state *mrb, mrb_value key)
-{
-  enum mrb_vtype t = mrb_type(key);
-  mrb_value hv;
-  const char *p;
-  mrb_int i, len;
-  khint_t h;
-
-  switch (t) {
-  case MRB_TT_STRING:
-    p = RSTRING_PTR(key);
-    len = RSTRING_LEN(key);
-    h = 0;
-    for (i=0; i<len; i++) {
-      h = (h << 5) - h + *p++;
-    }
-    return h;
-
-  case MRB_TT_SYMBOL:
-    h = (khint_t)mrb_symbol(key);
-    return kh_int_hash_func(mrb, h);
-
-  case MRB_TT_FIXNUM:
-    h = (khint_t)mrb_float_id((mrb_float)mrb_fixnum(key));
-    return kh_int_hash_func(mrb, h);
-
-  case MRB_TT_FLOAT:
-    h = (khint_t)mrb_float_id(mrb_float(key));
-    return kh_int_hash_func(mrb, h);
-
-  default:
-    hv = mrb_funcall(mrb, key, "hash", 0);
-    h = (khint_t)t ^ mrb_fixnum(hv);
-    return kh_int_hash_func(mrb, h);
-  }
-}
-
-static inline khint_t
-mrb_hash_ht_hash_equal(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  enum mrb_vtype t = mrb_type(a);
-
-  switch (t) {
-  case MRB_TT_STRING:
-    return mrb_str_equal(mrb, a, b);
-
-  case MRB_TT_SYMBOL:
-    if (mrb_type(b) != MRB_TT_SYMBOL) return FALSE;
-    return mrb_symbol(a) == mrb_symbol(b);
-
-  case MRB_TT_FIXNUM:
-    switch (mrb_type(b)) {
-    case MRB_TT_FIXNUM:
-      return mrb_fixnum(a) == mrb_fixnum(b);
-    case MRB_TT_FLOAT:
-      return (mrb_float)mrb_fixnum(a) == mrb_float(b);
-    default:
-      return FALSE;
-    }
-
-  case MRB_TT_FLOAT:
-    switch (mrb_type(b)) {
-    case MRB_TT_FIXNUM:
-      return mrb_float(a) == (mrb_float)mrb_fixnum(b);
-    case MRB_TT_FLOAT:
-      return mrb_float(a) == mrb_float(b);
-    default:
-      return FALSE;
-    }
-
-  default:
-    return mrb_eql(mrb, a, b);
-  }
-}
-
-KHASH_DEFINE (ht, mrb_value, mrb_hash_value, TRUE, mrb_hash_ht_hash_func, mrb_hash_ht_hash_equal)
-
-static void mrb_hash_modify(mrb_state *mrb, mrb_value hash);
-
-static inline mrb_value
-mrb_hash_ht_key(mrb_state *mrb, mrb_value key)
-{
-  if (mrb_string_p(key) && !MRB_FROZEN_P(mrb_str_ptr(key))) {
-    key = mrb_str_dup(mrb, key);
-    MRB_SET_FROZEN_FLAG(mrb_str_ptr(key));
-  }
-  return key;
-}
-
-#define KEY(key) mrb_hash_ht_key(mrb, key)
-
-void
-mrb_gc_mark_hash(mrb_state *mrb, struct RHash *hash)
-{
-  khiter_t k;
-  khash_t(ht) *h = hash->ht;
-
-  if (!h) return;
-  for (k = kh_begin(h); k != kh_end(h); k++) {
-    if (kh_exist(h, k)) {
-      mrb_value key = kh_key(h, k);
-      mrb_value val = kh_value(h, k).v;
-
-      mrb_gc_mark_value(mrb, key);
-      mrb_gc_mark_value(mrb, val);
-    }
-  }
-}
-
-size_t
-mrb_gc_mark_hash_size(mrb_state *mrb, struct RHash *hash)
-{
-  if (!hash->ht) return 0;
-  return kh_size(hash->ht)*2;
-}
-
-void
-mrb_gc_free_hash(mrb_state *mrb, struct RHash *hash)
-{
-  if (hash->ht) kh_destroy(ht, mrb, hash->ht);
-}
-
-
-MRB_API mrb_value
-mrb_hash_new_capa(mrb_state *mrb, mrb_int capa)
-{
-  struct RHash *h;
-
-  h = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
-  h->ht = kh_init(ht, mrb);
-  if (capa > 0) {
-    kh_resize(ht, mrb, h->ht, capa);
-  }
-  h->iv = 0;
-  return mrb_obj_value(h);
-}
-
-MRB_API mrb_value
-mrb_hash_new(mrb_state *mrb)
-{
-  return mrb_hash_new_capa(mrb, 0);
-}
-
-static mrb_value mrb_hash_default(mrb_state *mrb, mrb_value hash);
-static mrb_value hash_default(mrb_state *mrb, mrb_value hash, mrb_value key);
-
-MRB_API mrb_value
-mrb_hash_get(mrb_state *mrb, mrb_value hash, mrb_value key)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-  khiter_t k;
-  mrb_sym mid;
-
-  if (h) {
-    k = kh_get(ht, mrb, h, key);
-    if (k != kh_end(h))
-      return kh_value(h, k).v;
-  }
-
-  mid = mrb_intern_lit(mrb, "default");
-  if (mrb_func_basic_p(mrb, hash, mid, mrb_hash_default)) {
-    return hash_default(mrb, hash, key);
-  }
-  /* xxx mrb_funcall_tailcall(mrb, hash, "default", 1, key); */
-  return mrb_funcall_argv(mrb, hash, mid, 1, &key);
-}
-
-MRB_API mrb_value
-mrb_hash_fetch(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value def)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-  khiter_t k;
-
-  if (h) {
-    k = kh_get(ht, mrb, h, key);
-    if (k != kh_end(h))
-      return kh_value(h, k).v;
-  }
-
-  /* not found */
-  return def;
-}
-
-MRB_API void
-mrb_hash_set(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value val)
-{
-  khash_t(ht) *h;
-  khiter_t k;
-  int r;
-
-  mrb_hash_modify(mrb, hash);
-  h = RHASH_TBL(hash);
-
-  if (!h) h = RHASH_TBL(hash) = kh_init(ht, mrb);
-  k = kh_put2(ht, mrb, h, key, &r);
-  kh_value(h, k).v = val;
-
-  if (r != 0) {
-    /* expand */
-    int ai = mrb_gc_arena_save(mrb);
-    key = kh_key(h, k) = KEY(key);
-    mrb_gc_arena_restore(mrb, ai);
-    kh_value(h, k).n = kh_size(h)-1;
-  }
-
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)RHASH(hash), key);
-  mrb_field_write_barrier_value(mrb, (struct RBasic*)RHASH(hash), val);
-  return;
-}
-
-static mrb_value
-mrb_hash_dup(mrb_state *mrb, mrb_value hash)
-{
-  struct RHash* ret;
-  khash_t(ht) *h, *ret_h;
-  khiter_t k, ret_k;
-  mrb_value ifnone, vret;
-
-  h = RHASH_TBL(hash);
-  ret = (struct RHash*)mrb_obj_alloc(mrb, MRB_TT_HASH, mrb->hash_class);
-  ret->ht = kh_init(ht, mrb);
-
-  if (h && kh_size(h) > 0) {
-    ret_h = ret->ht;
-
-    for (k = kh_begin(h); k != kh_end(h); k++) {
-      if (kh_exist(h, k)) {
-        int ai = mrb_gc_arena_save(mrb);
-        ret_k = kh_put(ht, mrb, ret_h, KEY(kh_key(h, k)));
-        mrb_gc_arena_restore(mrb, ai);
-        kh_val(ret_h, ret_k).v = kh_val(h, k).v;
-        kh_val(ret_h, ret_k).n = kh_size(ret_h)-1;
-      }
-    }
-  }
-
-  if (MRB_RHASH_DEFAULT_P(hash)) {
-    ret->flags |= MRB_HASH_DEFAULT;
-  }
-  if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-    ret->flags |= MRB_HASH_PROC_DEFAULT;
-  }
-  vret = mrb_obj_value(ret);
-  ifnone = RHASH_IFNONE(hash);
-  if (!mrb_nil_p(ifnone)) {
-      mrb_iv_set(mrb, vret, mrb_intern_lit(mrb, "ifnone"), ifnone);
-  }
-  return vret;
-}
-
-MRB_API mrb_value
-mrb_check_hash_type(mrb_state *mrb, mrb_value hash)
-{
-  return mrb_check_convert_type(mrb, hash, MRB_TT_HASH, "Hash", "to_hash");
-}
-
-MRB_API khash_t(ht)*
-mrb_hash_tbl(mrb_state *mrb, mrb_value hash)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-
-  if (!h) {
-    return RHASH_TBL(hash) = kh_init(ht, mrb);
-  }
-  return h;
-}
-
-static void
-mrb_hash_modify(mrb_state *mrb, mrb_value hash)
-{
-  if (MRB_FROZEN_P(mrb_hash_ptr(hash))) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "can't modify frozen hash");
-  }
-  mrb_hash_tbl(mrb, hash);
-}
-
-/* 15.2.13.4.16 */
-/*
- *  call-seq:
- *     Hash.new                          -> new_hash
- *     Hash.new(obj)                     -> new_hash
- *     Hash.new {|hash, key| block }     -> new_hash
- *
- *  Returns a new, empty hash. If this hash is subsequently accessed by
- *  a key that doesn't correspond to a hash entry, the value returned
- *  depends on the style of <code>new</code> used to create the hash. In
- *  the first form, the access returns <code>nil</code>. If
- *  <i>obj</i> is specified, this single object will be used for
- *  all <em>default values</em>. If a block is specified, it will be
- *  called with the hash object and the key, and should return the
- *  default value. It is the block's responsibility to store the value
- *  in the hash if required.
- *
- *      h = Hash.new("Go Fish")
- *      h["a"] = 100
- *      h["b"] = 200
- *      h["a"]           #=> 100
- *      h["c"]           #=> "Go Fish"
- *      # The following alters the single default object
- *      h["c"].upcase!   #=> "GO FISH"
- *      h["d"]           #=> "GO FISH"
- *      h.keys           #=> ["a", "b"]
- *
- *      # While this creates a new default object each time
- *      h = Hash.new { |hash, key| hash[key] = "Go Fish: #{key}" }
- *      h["c"]           #=> "Go Fish: c"
- *      h["c"].upcase!   #=> "GO FISH: C"
- *      h["d"]           #=> "Go Fish: d"
- *      h.keys           #=> ["c", "d"]
- *
- */
-
-static mrb_value
-mrb_hash_init(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value block, ifnone;
-  mrb_bool ifnone_p;
-
-  ifnone = mrb_nil_value();
-  mrb_get_args(mrb, "&|o?", &block, &ifnone, &ifnone_p);
-  mrb_hash_modify(mrb, hash);
-  if (!mrb_nil_p(block)) {
-    if (ifnone_p) {
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
-    }
-    RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
-    ifnone = block;
-  }
-  if (!mrb_nil_p(ifnone)) {
-    RHASH(hash)->flags |= MRB_HASH_DEFAULT;
-    mrb_iv_set(mrb, hash, mrb_intern_lit(mrb, "ifnone"), ifnone);
-  }
-  return hash;
-}
-
-/* 15.2.13.4.2  */
-/*
- *  call-seq:
- *     hsh[key]    ->  value
- *
- *  Element Reference---Retrieves the <i>value</i> object corresponding
- *  to the <i>key</i> object. If not found, returns the default value (see
- *  <code>Hash::new</code> for details).
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h["a"]   #=> 100
- *     h["c"]   #=> nil
- *
- */
-static mrb_value
-mrb_hash_aget(mrb_state *mrb, mrb_value self)
-{
-  mrb_value key;
-
-  mrb_get_args(mrb, "o", &key);
-  return mrb_hash_get(mrb, self, key);
-}
-
-static mrb_value
-hash_default(mrb_state *mrb, mrb_value hash, mrb_value key)
-{
-  if (MRB_RHASH_DEFAULT_P(hash)) {
-    if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-      return mrb_funcall(mrb, RHASH_PROCDEFAULT(hash), "call", 2, hash, key);
-    }
-    else {
-      return RHASH_IFNONE(hash);
-    }
-  }
-  return mrb_nil_value();
-}
-
-/* 15.2.13.4.5  */
-/*
- *  call-seq:
- *     hsh.default(key=nil)   -> obj
- *
- *  Returns the default value, the value that would be returned by
- *  <i>hsh</i>[<i>key</i>] if <i>key</i> did not exist in <i>hsh</i>.
- *  See also <code>Hash::new</code> and <code>Hash#default=</code>.
- *
- *     h = Hash.new                            #=> {}
- *     h.default                               #=> nil
- *     h.default(2)                            #=> nil
- *
- *     h = Hash.new("cat")                     #=> {}
- *     h.default                               #=> "cat"
- *     h.default(2)                            #=> "cat"
- *
- *     h = Hash.new {|h,k| h[k] = k.to_i*10}   #=> {}
- *     h.default                               #=> nil
- *     h.default(2)                            #=> 20
- */
-
-static mrb_value
-mrb_hash_default(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value key;
-  mrb_bool given;
-
-  mrb_get_args(mrb, "|o?", &key, &given);
-  if (MRB_RHASH_DEFAULT_P(hash)) {
-    if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-      if (!given) return mrb_nil_value();
-      return mrb_funcall(mrb, RHASH_PROCDEFAULT(hash), "call", 2, hash, key);
-    }
-    else {
-      return RHASH_IFNONE(hash);
-    }
-  }
-  return mrb_nil_value();
-}
-
-/* 15.2.13.4.6  */
-/*
- *  call-seq:
- *     hsh.default = obj     -> obj
- *
- *  Sets the default value, the value returned for a key that does not
- *  exist in the hash. It is not possible to set the default to a
- *  <code>Proc</code> that will be executed on each key lookup.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.default = "Go fish"
- *     h["a"]     #=> 100
- *     h["z"]     #=> "Go fish"
- *     # This doesn't do what you might hope...
- *     h.default = proc do |hash, key|
- *       hash[key] = key + key
- *     end
- *     h[2]       #=> #<Proc:0x401b3948@-:6>
- *     h["cat"]   #=> #<Proc:0x401b3948@-:6>
- */
-
-static mrb_value
-mrb_hash_set_default(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value ifnone;
-
-  mrb_get_args(mrb, "o", &ifnone);
-  mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern_lit(mrb, "ifnone"), ifnone);
-  RHASH(hash)->flags &= ~MRB_HASH_PROC_DEFAULT;
-  if (!mrb_nil_p(ifnone)) {
-    RHASH(hash)->flags |= MRB_HASH_DEFAULT;
-  }
-  else {
-    RHASH(hash)->flags &= ~MRB_HASH_DEFAULT;
-  }
-  return ifnone;
-}
-
-/* 15.2.13.4.7  */
-/*
- *  call-seq:
- *     hsh.default_proc -> anObject
- *
- *  If <code>Hash::new</code> was invoked with a block, return that
- *  block, otherwise return <code>nil</code>.
- *
- *     h = Hash.new {|h,k| h[k] = k*k }   #=> {}
- *     p = h.default_proc                 #=> #<Proc:0x401b3d08@-:1>
- *     a = []                             #=> []
- *     p.call(a, 2)
- *     a                                  #=> [nil, nil, 4]
- */
-
-
-static mrb_value
-mrb_hash_default_proc(mrb_state *mrb, mrb_value hash)
-{
-  if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-    return RHASH_PROCDEFAULT(hash);
-  }
-  return mrb_nil_value();
-}
-
-/*
- *  call-seq:
- *     hsh.default_proc = proc_obj     -> proc_obj
- *
- *  Sets the default proc to be executed on each key lookup.
- *
- *     h.default_proc = proc do |hash, key|
- *       hash[key] = key + key
- *     end
- *     h[2]       #=> 4
- *     h["cat"]   #=> "catcat"
- */
-
-static mrb_value
-mrb_hash_set_default_proc(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value ifnone;
-
-  mrb_get_args(mrb, "o", &ifnone);
-  mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern_lit(mrb, "ifnone"), ifnone);
-  if (!mrb_nil_p(ifnone)) {
-    RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
-    RHASH(hash)->flags |= MRB_HASH_DEFAULT;
-  }
-  else {
-    RHASH(hash)->flags &= ~MRB_HASH_DEFAULT;
-    RHASH(hash)->flags &= ~MRB_HASH_PROC_DEFAULT;
-  }
-
-  return ifnone;
-}
-
-MRB_API mrb_value
-mrb_hash_delete_key(mrb_state *mrb, mrb_value hash, mrb_value key)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-  khiter_t k;
-  mrb_value delVal;
-  mrb_int n;
-
-  if (h) {
-    k = kh_get(ht, mrb, h, key);
-    if (k != kh_end(h)) {
-      delVal = kh_value(h, k).v;
-      n = kh_value(h, k).n;
-      kh_del(ht, mrb, h, k);
-      for (k = kh_begin(h); k != kh_end(h); k++) {
-        if (!kh_exist(h, k)) continue;
-        if (kh_value(h, k).n > n) kh_value(h, k).n--;
-      }
-      return delVal;
-    }
-  }
-
-  /* not found */
-  return mrb_nil_value();
-}
-
-/* 15.2.13.4.8  */
-/*
- *  call-seq:
- *     hsh.delete(key)                   -> value
- *     hsh.delete(key) {| key | block }  -> value
- *
- *  Deletes and returns a key-value pair from <i>hsh</i> whose key is
- *  equal to <i>key</i>. If the key is not found, returns the
- *  <em>default value</em>. If the optional code block is given and the
- *  key is not found, pass in the key and return the result of
- *  <i>block</i>.
- *
- *      h = { "a" => 100, "b" => 200 }
- *      h.delete("a")                              #=> 100
- *      h.delete("z")                              #=> nil
- *      h.delete("z") { |el| "#{el} not found" }   #=> "z not found"
- *
- */
-static mrb_value
-mrb_hash_delete(mrb_state *mrb, mrb_value self)
-{
-  mrb_value key;
-
-  mrb_get_args(mrb, "o", &key);
-  mrb_hash_modify(mrb, self);
-  return mrb_hash_delete_key(mrb, self, key);
-}
-
-/* 15.2.13.4.24 */
-/*
- *  call-seq:
- *     hsh.shift -> anArray or obj
- *
- *  Removes a key-value pair from <i>hsh</i> and returns it as the
- *  two-item array <code>[</code> <i>key, value</i> <code>]</code>, or
- *  the hash's default value if the hash is empty.
- *
- *      h = { 1 => "a", 2 => "b", 3 => "c" }
- *      h.shift   #=> [1, "a"]
- *      h         #=> {2=>"b", 3=>"c"}
- */
-
-static mrb_value
-mrb_hash_shift(mrb_state *mrb, mrb_value hash)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-  khiter_t k;
-  mrb_value delKey, delVal;
-
-  mrb_hash_modify(mrb, hash);
-  if (h && kh_size(h) > 0) {
-    for (k = kh_begin(h); k != kh_end(h); k++) {
-      if (!kh_exist(h, k)) continue;
-
-      delKey = kh_key(h, k);
-      mrb_gc_protect(mrb, delKey);
-      delVal = mrb_hash_delete_key(mrb, hash, delKey);
-      mrb_gc_protect(mrb, delVal);
-
-      return mrb_assoc_new(mrb, delKey, delVal);
-    }
-  }
-
-  if (MRB_RHASH_DEFAULT_P(hash)) {
-    if (MRB_RHASH_PROCDEFAULT_P(hash)) {
-      return mrb_funcall(mrb, RHASH_PROCDEFAULT(hash), "call", 2, hash, mrb_nil_value());
-    }
-    else {
-      return RHASH_IFNONE(hash);
-    }
-  }
-  return mrb_nil_value();
-}
-
-/* 15.2.13.4.4  */
-/*
- *  call-seq:
- *     hsh.clear -> hsh
- *
- *  Removes all key-value pairs from `hsh`.
- *
- *      h = { "a" => 100, "b" => 200 }   #=> {"a"=>100, "b"=>200}
- *      h.clear                          #=> {}
- *
- */
-
-MRB_API mrb_value
-mrb_hash_clear(mrb_state *mrb, mrb_value hash)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-
-  mrb_hash_modify(mrb, hash);
-  if (h) kh_clear(ht, mrb, h);
-  return hash;
-}
-
-/* 15.2.13.4.3  */
-/* 15.2.13.4.26 */
-/*
- *  call-seq:
- *     hsh[key] = value        -> value
- *     hsh.store(key, value)   -> value
- *
- *  Element Assignment---Associates the value given by
- *  <i>value</i> with the key given by <i>key</i>.
- *  <i>key</i> should not have its value changed while it is in
- *  use as a key (a <code>String</code> passed as a key will be
- *  duplicated and frozen).
- *
- *      h = { "a" => 100, "b" => 200 }
- *      h["a"] = 9
- *      h["c"] = 4
- *      h   #=> {"a"=>9, "b"=>200, "c"=>4}
- *
- */
-static mrb_value
-mrb_hash_aset(mrb_state *mrb, mrb_value self)
-{
-  mrb_value key, val;
-
-  mrb_get_args(mrb, "oo", &key, &val);
-  mrb_hash_set(mrb, self, key, val);
-  return val;
-}
-
-/* 15.2.13.4.20 */
-/* 15.2.13.4.25 */
-/*
- *  call-seq:
- *     hsh.length    ->  fixnum
- *     hsh.size      ->  fixnum
- *
- *  Returns the number of key-value pairs in the hash.
- *
- *     h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
- *     h.length        #=> 4
- *     h.delete("a")   #=> 200
- *     h.length        #=> 3
- */
-static mrb_value
-mrb_hash_size_m(mrb_state *mrb, mrb_value self)
-{
-  khash_t(ht) *h = RHASH_TBL(self);
-
-  if (!h) return mrb_fixnum_value(0);
-  return mrb_fixnum_value(kh_size(h));
-}
-
-/* 15.2.13.4.12 */
-/*
- *  call-seq:
- *     hsh.empty?    -> true or false
- *
- *  Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
- *
- *     {}.empty?   #=> true
- *
- */
-MRB_API mrb_value
-mrb_hash_empty_p(mrb_state *mrb, mrb_value self)
-{
-  khash_t(ht) *h = RHASH_TBL(self);
-
-  if (h) return mrb_bool_value(kh_size(h) == 0);
-  return mrb_true_value();
-}
-
-/* 15.2.13.4.29 (x)*/
-/*
- * call-seq:
- *    hsh.to_hash   => hsh
- *
- * Returns +self+.
- */
-
-static mrb_value
-mrb_hash_to_hash(mrb_state *mrb, mrb_value hash)
-{
-  return hash;
-}
-
-/* 15.2.13.4.19 */
-/*
- *  call-seq:
- *     hsh.keys    -> array
- *
- *  Returns a new array populated with the keys from this hash. See also
- *  <code>Hash#values</code>.
- *
- *     h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
- *     h.keys   #=> ["a", "b", "c", "d"]
- *
- */
-
-MRB_API mrb_value
-mrb_hash_keys(mrb_state *mrb, mrb_value hash)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-  khiter_t k;
-  mrb_int end;
-  mrb_value ary;
-  mrb_value *p;
-
-  if (!h || kh_size(h) == 0) return mrb_ary_new(mrb);
-  ary = mrb_ary_new_capa(mrb, kh_size(h));
-  end = kh_size(h)-1;
-  mrb_ary_set(mrb, ary, end, mrb_nil_value());
-  p = RARRAY_PTR(ary);
-  for (k = kh_begin(h); k != kh_end(h); k++) {
-    if (kh_exist(h, k)) {
-      mrb_value kv = kh_key(h, k);
-      mrb_hash_value hv = kh_value(h, k);
-
-      if (hv.n <= end) {
-        p[hv.n] = kv;
-      }
-      else {
-        p[end] = kv;
-      }
-    }
-  }
-  return ary;
-}
-
-/* 15.2.13.4.28 */
-/*
- *  call-seq:
- *     hsh.values    -> array
- *
- *  Returns a new array populated with the values from <i>hsh</i>. See
- *  also <code>Hash#keys</code>.
- *
- *     h = { "a" => 100, "b" => 200, "c" => 300 }
- *     h.values   #=> [100, 200, 300]
- *
- */
-
-MRB_API mrb_value
-mrb_hash_values(mrb_state *mrb, mrb_value hash)
-{
-  khash_t(ht) *h = RHASH_TBL(hash);
-  khiter_t k;
-  mrb_value ary;
-
-  if (!h) return mrb_ary_new(mrb);
-  ary = mrb_ary_new_capa(mrb, kh_size(h));
-  for (k = kh_begin(h); k != kh_end(h); k++) {
-    if (kh_exist(h, k)) {
-      mrb_hash_value hv = kh_value(h, k);
-
-      mrb_ary_set(mrb, ary, hv.n, hv.v);
-    }
-  }
-  return ary;
-}
-
-/* 15.2.13.4.13 */
-/* 15.2.13.4.15 */
-/* 15.2.13.4.18 */
-/* 15.2.13.4.21 */
-/*
- *  call-seq:
- *     hsh.has_key?(key)    -> true or false
- *     hsh.include?(key)    -> true or false
- *     hsh.key?(key)        -> true or false
- *     hsh.member?(key)     -> true or false
- *
- *  Returns <code>true</code> if the given key is present in <i>hsh</i>.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.has_key?("a")   #=> true
- *     h.has_key?("z")   #=> false
- *
- */
-
-static mrb_value
-mrb_hash_has_key(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value key;
-  khash_t(ht) *h;
-  khiter_t k;
-
-  mrb_get_args(mrb, "o", &key);
-
-  h = RHASH_TBL(hash);
-  if (h) {
-    k = kh_get(ht, mrb, h, key);
-    return mrb_bool_value(k != kh_end(h));
-  }
-  return mrb_false_value();
-}
-
-/* 15.2.13.4.14 */
-/* 15.2.13.4.27 */
-/*
- *  call-seq:
- *     hsh.has_value?(value)    -> true or false
- *     hsh.value?(value)        -> true or false
- *
- *  Returns <code>true</code> if the given value is present for some key
- *  in <i>hsh</i>.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.has_value?(100)   #=> true
- *     h.has_value?(999)   #=> false
- */
-
-static mrb_value
-mrb_hash_has_value(mrb_state *mrb, mrb_value hash)
-{
-  mrb_value val;
-  khash_t(ht) *h;
-  khiter_t k;
-
-  mrb_get_args(mrb, "o", &val);
-  h = RHASH_TBL(hash);
-
-  if (h) {
-    for (k = kh_begin(h); k != kh_end(h); k++) {
-      if (!kh_exist(h, k)) continue;
-
-      if (mrb_equal(mrb, kh_value(h, k).v, val)) {
-        return mrb_true_value();
-      }
-    }
-  }
-  return mrb_false_value();
-}
-
-void
-mrb_init_hash(mrb_state *mrb)
-{
-  struct RClass *h;
-
-  mrb->hash_class = h = mrb_define_class(mrb, "Hash", mrb->object_class);              /* 15.2.13 */
-  MRB_SET_INSTANCE_TT(h, MRB_TT_HASH);
-
-  mrb_define_method(mrb, h, "[]",              mrb_hash_aget,        MRB_ARGS_REQ(1)); /* 15.2.13.4.2  */
-  mrb_define_method(mrb, h, "[]=",             mrb_hash_aset,        MRB_ARGS_REQ(2)); /* 15.2.13.4.3  */
-  mrb_define_method(mrb, h, "clear",           mrb_hash_clear,       MRB_ARGS_NONE()); /* 15.2.13.4.4  */
-  mrb_define_method(mrb, h, "default",         mrb_hash_default,     MRB_ARGS_ANY());  /* 15.2.13.4.5  */
-  mrb_define_method(mrb, h, "default=",        mrb_hash_set_default, MRB_ARGS_REQ(1)); /* 15.2.13.4.6  */
-  mrb_define_method(mrb, h, "default_proc",    mrb_hash_default_proc,MRB_ARGS_NONE()); /* 15.2.13.4.7  */
-  mrb_define_method(mrb, h, "default_proc=",   mrb_hash_set_default_proc,MRB_ARGS_REQ(1)); /* 15.2.13.4.7  */
-  mrb_define_method(mrb, h, "__delete",        mrb_hash_delete,      MRB_ARGS_REQ(1)); /* core of 15.2.13.4.8  */
-  mrb_define_method(mrb, h, "empty?",          mrb_hash_empty_p,     MRB_ARGS_NONE()); /* 15.2.13.4.12 */
-  mrb_define_method(mrb, h, "has_key?",        mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.13 */
-  mrb_define_method(mrb, h, "has_value?",      mrb_hash_has_value,   MRB_ARGS_REQ(1)); /* 15.2.13.4.14 */
-  mrb_define_method(mrb, h, "include?",        mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.15 */
-  mrb_define_method(mrb, h, "initialize",      mrb_hash_init,        MRB_ARGS_OPT(1)); /* 15.2.13.4.16 */
-  mrb_define_method(mrb, h, "key?",            mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.18 */
-  mrb_define_method(mrb, h, "keys",            mrb_hash_keys,        MRB_ARGS_NONE()); /* 15.2.13.4.19 */
-  mrb_define_method(mrb, h, "length",          mrb_hash_size_m,      MRB_ARGS_NONE()); /* 15.2.13.4.20 */
-  mrb_define_method(mrb, h, "member?",         mrb_hash_has_key,     MRB_ARGS_REQ(1)); /* 15.2.13.4.21 */
-  mrb_define_method(mrb, h, "shift",           mrb_hash_shift,       MRB_ARGS_NONE()); /* 15.2.13.4.24 */
-  mrb_define_method(mrb, h, "dup",             mrb_hash_dup,         MRB_ARGS_NONE());
-  mrb_define_method(mrb, h, "size",            mrb_hash_size_m,      MRB_ARGS_NONE()); /* 15.2.13.4.25 */
-  mrb_define_method(mrb, h, "store",           mrb_hash_aset,        MRB_ARGS_REQ(2)); /* 15.2.13.4.26 */
-  mrb_define_method(mrb, h, "value?",          mrb_hash_has_value,   MRB_ARGS_REQ(1)); /* 15.2.13.4.27 */
-  mrb_define_method(mrb, h, "values",          mrb_hash_values,      MRB_ARGS_NONE()); /* 15.2.13.4.28 */
-
-  mrb_define_method(mrb, h, "to_hash",         mrb_hash_to_hash,     MRB_ARGS_NONE()); /* 15.2.13.4.29 (x)*/
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/init.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/init.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/init.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/init.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
-** init.c - initialize mruby core
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-
-void mrb_init_symtbl(mrb_state*);
-void mrb_init_class(mrb_state*);
-void mrb_init_object(mrb_state*);
-void mrb_init_kernel(mrb_state*);
-void mrb_init_comparable(mrb_state*);
-void mrb_init_enumerable(mrb_state*);
-void mrb_init_symbol(mrb_state*);
-void mrb_init_string(mrb_state*);
-void mrb_init_exception(mrb_state*);
-void mrb_init_proc(mrb_state*);
-void mrb_init_array(mrb_state*);
-void mrb_init_hash(mrb_state*);
-void mrb_init_numeric(mrb_state*);
-void mrb_init_range(mrb_state*);
-void mrb_init_gc(mrb_state*);
-void mrb_init_math(mrb_state*);
-void mrb_init_version(mrb_state*);
-void mrb_init_mrblib(mrb_state*);
-
-#define DONE mrb_gc_arena_restore(mrb, 0);
-void
-mrb_init_core(mrb_state *mrb)
-{
-  mrb_init_symtbl(mrb); DONE;
-
-  mrb_init_class(mrb); DONE;
-  mrb_init_object(mrb); DONE;
-  mrb_init_kernel(mrb); DONE;
-  mrb_init_comparable(mrb); DONE;
-  mrb_init_enumerable(mrb); DONE;
-
-  mrb_init_symbol(mrb); DONE;
-  mrb_init_string(mrb); DONE;
-  mrb_init_exception(mrb); DONE;
-  mrb_init_proc(mrb); DONE;
-  mrb_init_array(mrb); DONE;
-  mrb_init_hash(mrb); DONE;
-  mrb_init_numeric(mrb); DONE;
-  mrb_init_range(mrb); DONE;
-  mrb_init_gc(mrb); DONE;
-  mrb_init_version(mrb); DONE;
-  mrb_init_mrblib(mrb); DONE;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/kernel.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/kernel.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/kernel.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/kernel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1243 +0,0 @@
-/*
-** kernel.c - Kernel module
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/hash.h>
-#include <mruby/class.h>
-#include <mruby/proc.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/error.h>
-#include <mruby/istruct.h>
-
-typedef enum {
-  NOEX_PUBLIC    = 0x00,
-  NOEX_NOSUPER   = 0x01,
-  NOEX_PRIVATE   = 0x02,
-  NOEX_PROTECTED = 0x04,
-  NOEX_MASK      = 0x06,
-  NOEX_BASIC     = 0x08,
-  NOEX_UNDEF     = NOEX_NOSUPER,
-  NOEX_MODFUNC   = 0x12,
-  NOEX_SUPER     = 0x20,
-  NOEX_VCALL     = 0x40,
-  NOEX_RESPONDS  = 0x80
-} mrb_method_flag_t;
-
-MRB_API mrb_bool
-mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func)
-{
-  struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mid);
-  if (MRB_PROC_CFUNC_P(me) && (me->body.func == func))
-    return TRUE;
-  return FALSE;
-}
-
-static mrb_bool
-mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_func_basic_p(mrb, obj, mrb_intern_lit(mrb, "to_s"), mrb_any_to_s);
-}
-
-/* 15.3.1.3.17 */
-/*
- *  call-seq:
- *     obj.inspect   -> string
- *
- *  Returns a string containing a human-readable representation of
- *  <i>obj</i>. If not overridden and no instance variables, uses the
- *  <code>to_s</code> method to generate the string.
- *  <i>obj</i>.  If not overridden, uses the <code>to_s</code> method to
- *  generate the string.
- *
- *     [ 1, 2, 3..4, 'five' ].inspect   #=> "[1, 2, 3..4, \"five\"]"
- *     Time.new.inspect                 #=> "2008-03-08 19:43:39 +0900"
- */
-MRB_API mrb_value
-mrb_obj_inspect(mrb_state *mrb, mrb_value obj)
-{
-  if ((mrb_type(obj) == MRB_TT_OBJECT) && mrb_obj_basic_to_s_p(mrb, obj)) {
-    return mrb_obj_iv_inspect(mrb, mrb_obj_ptr(obj));
-  }
-  return mrb_any_to_s(mrb, obj);
-}
-
-/* 15.3.1.3.2  */
-/*
- *  call-seq:
- *     obj === other   -> true or false
- *
- *  Case Equality---For class <code>Object</code>, effectively the same
- *  as calling  <code>#==</code>, but typically overridden by descendants
- *  to provide meaningful semantics in <code>case</code> statements.
- */
-static mrb_value
-mrb_equal_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-
-  mrb_get_args(mrb, "o", &arg);
-  return mrb_bool_value(mrb_equal(mrb, self, arg));
-}
-
-/* 15.3.1.3.3  */
-/* 15.3.1.3.33 */
-/*
- *  Document-method: __id__
- *  Document-method: object_id
- *
- *  call-seq:
- *     obj.__id__       -> fixnum
- *     obj.object_id    -> fixnum
- *
- *  Returns an integer identifier for <i>obj</i>. The same number will
- *  be returned on all calls to <code>id</code> for a given object, and
- *  no two active objects will share an id.
- *  <code>Object#object_id</code> is a different concept from the
- *  <code>:name</code> notation, which returns the symbol id of
- *  <code>name</code>. Replaces the deprecated <code>Object#id</code>.
- */
-mrb_value
-mrb_obj_id_m(mrb_state *mrb, mrb_value self)
-{
-  return mrb_fixnum_value(mrb_obj_id(self));
-}
-
-/* 15.3.1.2.2  */
-/* 15.3.1.2.5  */
-/* 15.3.1.3.6  */
-/* 15.3.1.3.25 */
-/*
- *  call-seq:
- *     block_given?   -> true or false
- *     iterator?      -> true or false
- *
- *  Returns <code>true</code> if <code>yield</code> would execute a
- *  block in the current context. The <code>iterator?</code> form
- *  is mildly deprecated.
- *
- *     def try
- *       if block_given?
- *         yield
- *       else
- *         "no block"
- *       end
- *     end
- *     try                  #=> "no block"
- *     try { "hello" }      #=> "hello"
- *     try do "hello" end   #=> "hello"
- */
-static mrb_value
-mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_callinfo *ci = mrb->c->ci;
-  mrb_value *bp;
-
-  bp = ci->stackent + 1;
-  ci--;
-  if (ci <= mrb->c->cibase) {
-    return mrb_false_value();
-  }
-  /* block_given? called within block; check upper scope */
-  if (ci->proc->env) {
-    struct REnv *e = ci->proc->env;
-
-    while (e->c) {
-      e = (struct REnv*)e->c;
-    }
-    /* top-level does not have block slot (always false) */
-    if (e->stack == mrb->c->stbase)
-      return mrb_false_value();
-    if (e->stack && e->cioff < 0) {
-      /* use saved block arg position */
-      bp = &e->stack[-e->cioff];
-      ci = 0;                 /* no callinfo available */
-    }
-    else {
-      ci = e->cxt.c->cibase + e->cioff;
-      bp = ci[1].stackent + 1;
-    }
-  }
-  if (ci && ci->argc > 0) {
-    bp += ci->argc;
-  }
-  if (mrb_nil_p(*bp))
-    return mrb_false_value();
-  return mrb_true_value();
-}
-
-/* 15.3.1.3.7  */
-/*
- *  call-seq:
- *     obj.class    -> class
- *
- *  Returns the class of <i>obj</i>. This method must always be
- *  called with an explicit receiver, as <code>class</code> is also a
- *  reserved word in Ruby.
- *
- *     1.class      #=> Fixnum
- *     self.class   #=> Object
- */
-static mrb_value
-mrb_obj_class_m(mrb_state *mrb, mrb_value self)
-{
-  return mrb_obj_value(mrb_obj_class(mrb, self));
-}
-
-static struct RClass*
-mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj)
-{
-  struct RClass *klass = mrb_basic_ptr(obj)->c;
-
-  if (klass->tt != MRB_TT_SCLASS)
-    return klass;
-  else {
-    /* copy singleton(unnamed) class */
-    struct RClass *clone = (struct RClass*)mrb_obj_alloc(mrb, klass->tt, mrb->class_class);
-
-    switch (mrb_type(obj)) {
-    case MRB_TT_CLASS:
-    case MRB_TT_SCLASS:
-      break;
-    default:
-      clone->c = mrb_singleton_class_clone(mrb, mrb_obj_value(klass));
-      break;
-    }
-    clone->super = klass->super;
-    if (klass->iv) {
-      mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass));
-      mrb_obj_iv_set(mrb, (struct RObject*)clone, mrb_intern_lit(mrb, "__attached__"), obj);
-    }
-    if (klass->mt) {
-      clone->mt = kh_copy(mt, mrb, klass->mt);
-    }
-    else {
-      clone->mt = kh_init(mt, mrb);
-    }
-    clone->tt = MRB_TT_SCLASS;
-    return clone;
-  }
-}
-
-static void
-copy_class(mrb_state *mrb, mrb_value dst, mrb_value src)
-{
-  struct RClass *dc = mrb_class_ptr(dst);
-  struct RClass *sc = mrb_class_ptr(src);
-  /* if the origin is not the same as the class, then the origin and
-     the current class need to be copied */
-  if (sc->flags & MRB_FLAG_IS_PREPENDED) {
-    struct RClass *c0 = sc->super;
-    struct RClass *c1 = dc;
-
-    /* copy prepended iclasses */
-    while (!(c0->flags & MRB_FLAG_IS_ORIGIN)) {
-      c1->super = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(c0)));
-      c1 = c1->super;
-      c0 = c0->super;
-    }
-    c1->super = mrb_class_ptr(mrb_obj_dup(mrb, mrb_obj_value(c0)));
-    c1->super->flags |= MRB_FLAG_IS_ORIGIN;
-  }
-  if (sc->mt) {
-    dc->mt = kh_copy(mt, mrb, sc->mt);
-  }
-  else {
-    dc->mt = kh_init(mt, mrb);
-  }
-  dc->super = sc->super;
-  MRB_SET_INSTANCE_TT(dc, MRB_INSTANCE_TT(sc));
-}
-
-static void
-init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj)
-{
-  switch (mrb_type(obj)) {
-    case MRB_TT_CLASS:
-    case MRB_TT_MODULE:
-      copy_class(mrb, dest, obj);
-      /* fall through */
-    case MRB_TT_OBJECT:
-    case MRB_TT_SCLASS:
-    case MRB_TT_HASH:
-    case MRB_TT_DATA:
-    case MRB_TT_EXCEPTION:
-      mrb_iv_copy(mrb, dest, obj);
-      break;
-    case MRB_TT_ISTRUCT:
-      mrb_istruct_copy(dest, obj);
-      break;
-
-    default:
-      break;
-  }
-  mrb_funcall(mrb, dest, "initialize_copy", 1, obj);
-}
-
-/* 15.3.1.3.8  */
-/*
- *  call-seq:
- *     obj.clone -> an_object
- *
- *  Produces a shallow copy of <i>obj</i>---the instance variables of
- *  <i>obj</i> are copied, but not the objects they reference. Copies
- *  the frozen state of <i>obj</i>. See also the discussion
- *  under <code>Object#dup</code>.
- *
- *     class Klass
- *        attr_accessor :str
- *     end
- *     s1 = Klass.new      #=> #<Klass:0x401b3a38>
- *     s1.str = "Hello"    #=> "Hello"
- *     s2 = s1.clone       #=> #<Klass:0x401b3998 @str="Hello">
- *     s2.str[1,4] = "i"   #=> "i"
- *     s1.inspect          #=> "#<Klass:0x401b3a38 @str=\"Hi\">"
- *     s2.inspect          #=> "#<Klass:0x401b3998 @str=\"Hi\">"
- *
- *  This method may have class-specific behavior.  If so, that
- *  behavior will be documented under the #+initialize_copy+ method of
- *  the class.
- *
- *  Some Class(True False Nil Symbol Fixnum Float) Object  cannot clone.
- */
-MRB_API mrb_value
-mrb_obj_clone(mrb_state *mrb, mrb_value self)
-{
-  struct RObject *p;
-  mrb_value clone;
-
-  if (mrb_immediate_p(self)) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't clone %S", self);
-  }
-  if (mrb_type(self) == MRB_TT_SCLASS) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't clone singleton class");
-  }
-  p = (struct RObject*)mrb_obj_alloc(mrb, mrb_type(self), mrb_obj_class(mrb, self));
-  p->c = mrb_singleton_class_clone(mrb, self);
-  mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)p->c);
-  clone = mrb_obj_value(p);
-  init_copy(mrb, clone, self);
-
-  return clone;
-}
-
-/* 15.3.1.3.9  */
-/*
- *  call-seq:
- *     obj.dup -> an_object
- *
- *  Produces a shallow copy of <i>obj</i>---the instance variables of
- *  <i>obj</i> are copied, but not the objects they reference.
- *  <code>dup</code> copies the frozen state of <i>obj</i>. See also
- *  the discussion under <code>Object#clone</code>. In general,
- *  <code>clone</code> and <code>dup</code> may have different semantics
- *  in descendant classes. While <code>clone</code> is used to duplicate
- *  an object, including its internal state, <code>dup</code> typically
- *  uses the class of the descendant object to create the new instance.
- *
- *  This method may have class-specific behavior.  If so, that
- *  behavior will be documented under the #+initialize_copy+ method of
- *  the class.
- */
-
-MRB_API mrb_value
-mrb_obj_dup(mrb_state *mrb, mrb_value obj)
-{
-  struct RBasic *p;
-  mrb_value dup;
-
-  if (mrb_immediate_p(obj)) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't dup %S", obj);
-  }
-  if (mrb_type(obj) == MRB_TT_SCLASS) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't dup singleton class");
-  }
-  p = mrb_obj_alloc(mrb, mrb_type(obj), mrb_obj_class(mrb, obj));
-  dup = mrb_obj_value(p);
-  init_copy(mrb, dup, obj);
-
-  return dup;
-}
-
-static mrb_value
-mrb_obj_extend(mrb_state *mrb, mrb_int argc, mrb_value *argv, mrb_value obj)
-{
-  mrb_int i;
-
-  if (argc == 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (at least 1)");
-  }
-  for (i = 0; i < argc; i++) {
-    mrb_check_type(mrb, argv[i], MRB_TT_MODULE);
-  }
-  while (argc--) {
-    mrb_funcall(mrb, argv[argc], "extend_object", 1, obj);
-    mrb_funcall(mrb, argv[argc], "extended", 1, obj);
-  }
-  return obj;
-}
-
-/* 15.3.1.3.13 */
-/*
- *  call-seq:
- *     obj.extend(module, ...)    -> obj
- *
- *  Adds to _obj_ the instance methods from each module given as a
- *  parameter.
- *
- *     module Mod
- *       def hello
- *         "Hello from Mod.\n"
- *       end
- *     end
- *
- *     class Klass
- *       def hello
- *         "Hello from Klass.\n"
- *       end
- *     end
- *
- *     k = Klass.new
- *     k.hello         #=> "Hello from Klass.\n"
- *     k.extend(Mod)   #=> #<Klass:0x401b3bc8>
- *     k.hello         #=> "Hello from Mod.\n"
- */
-static mrb_value
-mrb_obj_extend_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value *argv;
-  mrb_int argc;
-
-  mrb_get_args(mrb, "*", &argv, &argc);
-  return mrb_obj_extend(mrb, argc, argv, self);
-}
-
-static mrb_value
-mrb_obj_freeze(mrb_state *mrb, mrb_value self)
-{
-  struct RBasic *b;
-
-  switch (mrb_type(self)) {
-    case MRB_TT_FALSE:
-    case MRB_TT_TRUE:
-    case MRB_TT_FIXNUM:
-    case MRB_TT_SYMBOL:
-    case MRB_TT_FLOAT:
-      return self;
-    default:
-      break;
-  }
-
-  b = mrb_basic_ptr(self);
-  if (!MRB_FROZEN_P(b)) {
-    MRB_SET_FROZEN_FLAG(b);
-  }
-  return self;
-}
-
-static mrb_value
-mrb_obj_frozen(mrb_state *mrb, mrb_value self)
-{
-  struct RBasic *b;
-
-  switch (mrb_type(self)) {
-    case MRB_TT_FALSE:
-    case MRB_TT_TRUE:
-    case MRB_TT_FIXNUM:
-    case MRB_TT_SYMBOL:
-    case MRB_TT_FLOAT:
-      return mrb_true_value();
-    default:
-      break;
-  }
-
-  b = mrb_basic_ptr(self);
-  if (!MRB_FROZEN_P(b)) {
-    return mrb_false_value();
-  }
-  return mrb_true_value();
-}
-
-/* 15.3.1.3.15 */
-/*
- *  call-seq:
- *     obj.hash    -> fixnum
- *
- *  Generates a <code>Fixnum</code> hash value for this object. This
- *  function must have the property that <code>a.eql?(b)</code> implies
- *  <code>a.hash == b.hash</code>. The hash value is used by class
- *  <code>Hash</code>. Any hash value that exceeds the capacity of a
- *  <code>Fixnum</code> will be truncated before being used.
- */
-MRB_API mrb_value
-mrb_obj_hash(mrb_state *mrb, mrb_value self)
-{
-  return mrb_fixnum_value(mrb_obj_id(self));
-}
-
-/* 15.3.1.3.16 */
-static mrb_value
-mrb_obj_init_copy(mrb_state *mrb, mrb_value self)
-{
-  mrb_value orig;
-
-  mrb_get_args(mrb, "o", &orig);
-  if (mrb_obj_equal(mrb, self, orig)) return self;
-  if ((mrb_type(self) != mrb_type(orig)) || (mrb_obj_class(mrb, self) != mrb_obj_class(mrb, orig))) {
-      mrb_raise(mrb, E_TYPE_ERROR, "initialize_copy should take same class object");
-  }
-  return self;
-}
-
-
-MRB_API mrb_bool
-mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c)
-{
-  if (mrb_obj_class(mrb, obj) == c) return TRUE;
-  return FALSE;
-}
-
-/* 15.3.1.3.19 */
-/*
- *  call-seq:
- *     obj.instance_of?(class)    -> true or false
- *
- *  Returns <code>true</code> if <i>obj</i> is an instance of the given
- *  class. See also <code>Object#kind_of?</code>.
- */
-static mrb_value
-obj_is_instance_of(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-
-  mrb_get_args(mrb, "C", &arg);
-
-  return mrb_bool_value(mrb_obj_is_instance_of(mrb, self, mrb_class_ptr(arg)));
-}
-
-/* 15.3.1.3.20 */
-/*
- *  call-seq:
- *     obj.instance_variable_defined?(symbol)    -> true or false
- *
- *  Returns <code>true</code> if the given instance variable is
- *  defined in <i>obj</i>.
- *
- *     class Fred
- *       def initialize(p1, p2)
- *         @a, @b = p1, p2
- *       end
- *     end
- *     fred = Fred.new('cat', 99)
- *     fred.instance_variable_defined?(:@a)    #=> true
- *     fred.instance_variable_defined?("@b")   #=> true
- *     fred.instance_variable_defined?("@c")   #=> false
- */
-static mrb_value
-mrb_obj_ivar_defined(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym sym;
-
-  mrb_get_args(mrb, "n", &sym);
-  mrb_iv_check(mrb, sym);
-  return mrb_bool_value(mrb_iv_defined(mrb, self, sym));
-}
-
-/* 15.3.1.3.21 */
-/*
- *  call-seq:
- *     obj.instance_variable_get(symbol)    -> obj
- *
- *  Returns the value of the given instance variable, or nil if the
- *  instance variable is not set. The <code>@</code> part of the
- *  variable name should be included for regular instance
- *  variables. Throws a <code>NameError</code> exception if the
- *  supplied symbol is not valid as an instance variable name.
- *
- *     class Fred
- *       def initialize(p1, p2)
- *         @a, @b = p1, p2
- *       end
- *     end
- *     fred = Fred.new('cat', 99)
- *     fred.instance_variable_get(:@a)    #=> "cat"
- *     fred.instance_variable_get("@b")   #=> 99
- */
-static mrb_value
-mrb_obj_ivar_get(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym iv_name;
-
-  mrb_get_args(mrb, "n", &iv_name);
-  mrb_iv_check(mrb, iv_name);
-  return mrb_iv_get(mrb, self, iv_name);
-}
-
-/* 15.3.1.3.22 */
-/*
- *  call-seq:
- *     obj.instance_variable_set(symbol, obj)    -> obj
- *
- *  Sets the instance variable names by <i>symbol</i> to
- *  <i>object</i>, thereby frustrating the efforts of the class's
- *  author to attempt to provide proper encapsulation. The variable
- *  did not have to exist prior to this call.
- *
- *     class Fred
- *       def initialize(p1, p2)
- *         @a, @b = p1, p2
- *       end
- *     end
- *     fred = Fred.new('cat', 99)
- *     fred.instance_variable_set(:@a, 'dog')   #=> "dog"
- *     fred.instance_variable_set(:@c, 'cat')   #=> "cat"
- *     fred.inspect                             #=> "#<Fred:0x401b3da8 @a=\"dog\", @b=99, @c=\"cat\">"
- */
-static mrb_value
-mrb_obj_ivar_set(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym iv_name;
-  mrb_value val;
-
-  mrb_get_args(mrb, "no", &iv_name, &val);
-  mrb_iv_check(mrb, iv_name);
-  mrb_iv_set(mrb, self, iv_name, val);
-  return val;
-}
-
-/* 15.3.1.3.24 */
-/* 15.3.1.3.26 */
-/*
- *  call-seq:
- *     obj.is_a?(class)       -> true or false
- *     obj.kind_of?(class)    -> true or false
- *
- *  Returns <code>true</code> if <i>class</i> is the class of
- *  <i>obj</i>, or if <i>class</i> is one of the superclasses of
- *  <i>obj</i> or modules included in <i>obj</i>.
- *
- *     module M;    end
- *     class A
- *       include M
- *     end
- *     class B < A; end
- *     class C < B; end
- *     b = B.new
- *     b.instance_of? A   #=> false
- *     b.instance_of? B   #=> true
- *     b.instance_of? C   #=> false
- *     b.instance_of? M   #=> false
- *     b.kind_of? A       #=> true
- *     b.kind_of? B       #=> true
- *     b.kind_of? C       #=> false
- *     b.kind_of? M       #=> true
- */
-static mrb_value
-mrb_obj_is_kind_of_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value arg;
-
-  mrb_get_args(mrb, "C", &arg);
-
-  return mrb_bool_value(mrb_obj_is_kind_of(mrb, self, mrb_class_ptr(arg)));
-}
-
-KHASH_DECLARE(st, mrb_sym, char, FALSE)
-KHASH_DEFINE(st, mrb_sym, char, FALSE, kh_int_hash_func, kh_int_hash_equal)
-
-static void
-method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set)
-{
-  khint_t i;
-
-  khash_t(mt) *h = klass->mt;
-  if (!h) return;
-  for (i=0;i<kh_end(h);i++) {
-    if (kh_exist(h, i) && kh_value(h, i)) {
-      kh_put(st, mrb, set, kh_key(h, i));
-    }
-  }
-}
-
-mrb_value
-mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* klass, int obj)
-{
-  khint_t i;
-  mrb_value ary;
-  mrb_bool prepended = FALSE;
-  struct RClass* oldklass;
-  khash_t(st)* set = kh_init(st, mrb);
-
-  if (!recur && (klass->flags & MRB_FLAG_IS_PREPENDED)) {
-    MRB_CLASS_ORIGIN(klass);
-    prepended = TRUE;
-  }
-
-  oldklass = 0;
-  while (klass && (klass != oldklass)) {
-    method_entry_loop(mrb, klass, set);
-    if ((klass->tt == MRB_TT_ICLASS && !prepended) ||
-        (klass->tt == MRB_TT_SCLASS)) {
-    }
-    else {
-      if (!recur) break;
-    }
-    oldklass = klass;
-    klass = klass->super;
-  }
-
-  ary = mrb_ary_new(mrb);
-  for (i=0;i<kh_end(set);i++) {
-    if (kh_exist(set, i)) {
-      mrb_ary_push(mrb, ary, mrb_symbol_value(kh_key(set, i)));
-    }
-  }
-  kh_destroy(st, mrb, set);
-
-  return ary;
-}
-
-static mrb_value
-mrb_obj_singleton_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj)
-{
-  khint_t i;
-  mrb_value ary;
-  struct RClass* klass;
-  khash_t(st)* set = kh_init(st, mrb);
-
-  klass = mrb_class(mrb, obj);
-
-  if (klass && (klass->tt == MRB_TT_SCLASS)) {
-      method_entry_loop(mrb, klass, set);
-      klass = klass->super;
-  }
-  if (recur) {
-      while (klass && ((klass->tt == MRB_TT_SCLASS) || (klass->tt == MRB_TT_ICLASS))) {
-        method_entry_loop(mrb, klass, set);
-        klass = klass->super;
-      }
-  }
-
-  ary = mrb_ary_new(mrb);
-  for (i=0;i<kh_end(set);i++) {
-    if (kh_exist(set, i)) {
-      mrb_ary_push(mrb, ary, mrb_symbol_value(kh_key(set, i)));
-    }
-  }
-  kh_destroy(st, mrb, set);
-
-  return ary;
-}
-
-static mrb_value
-mrb_obj_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj, mrb_method_flag_t flag)
-{
-  return mrb_class_instance_method_list(mrb, recur, mrb_class(mrb, obj), 0);
-}
-/* 15.3.1.3.31 */
-/*
- *  call-seq:
- *     obj.methods    -> array
- *
- *  Returns a list of the names of methods publicly accessible in
- *  <i>obj</i>. This will include all the methods accessible in
- *  <i>obj</i>'s ancestors.
- *
- *     class Klass
- *       def kMethod()
- *       end
- *     end
- *     k = Klass.new
- *     k.methods[0..9]    #=> [:kMethod, :respond_to?, :nil?, :is_a?,
- *                        #    :class, :instance_variable_set,
- *                        #    :methods, :extend, :__send__, :instance_eval]
- *     k.methods.length   #=> 42
- */
-static mrb_value
-mrb_obj_methods_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_bool recur = TRUE;
-  mrb_get_args(mrb, "|b", &recur);
-  return mrb_obj_methods(mrb, recur, self, (mrb_method_flag_t)0); /* everything but private */
-}
-
-/* 15.3.1.3.32 */
-/*
- * call_seq:
- *   nil.nil?               -> true
- *   <anything_else>.nil?   -> false
- *
- * Only the object <i>nil</i> responds <code>true</code> to <code>nil?</code>.
- */
-static mrb_value
-mrb_false(mrb_state *mrb, mrb_value self)
-{
-  return mrb_false_value();
-}
-
-/* 15.3.1.3.36 */
-/*
- *  call-seq:
- *     obj.private_methods(all=true)   -> array
- *
- *  Returns the list of private methods accessible to <i>obj</i>. If
- *  the <i>all</i> parameter is set to <code>false</code>, only those methods
- *  in the receiver will be listed.
- */
-static mrb_value
-mrb_obj_private_methods(mrb_state *mrb, mrb_value self)
-{
-  mrb_bool recur = TRUE;
-  mrb_get_args(mrb, "|b", &recur);
-  return mrb_obj_methods(mrb, recur, self, NOEX_PRIVATE); /* private attribute not define */
-}
-
-/* 15.3.1.3.37 */
-/*
- *  call-seq:
- *     obj.protected_methods(all=true)   -> array
- *
- *  Returns the list of protected methods accessible to <i>obj</i>. If
- *  the <i>all</i> parameter is set to <code>false</code>, only those methods
- *  in the receiver will be listed.
- */
-static mrb_value
-mrb_obj_protected_methods(mrb_state *mrb, mrb_value self)
-{
-  mrb_bool recur = TRUE;
-  mrb_get_args(mrb, "|b", &recur);
-  return mrb_obj_methods(mrb, recur, self, NOEX_PROTECTED); /* protected attribute not define */
-}
-
-/* 15.3.1.3.38 */
-/*
- *  call-seq:
- *     obj.public_methods(all=true)   -> array
- *
- *  Returns the list of public methods accessible to <i>obj</i>. If
- *  the <i>all</i> parameter is set to <code>false</code>, only those methods
- *  in the receiver will be listed.
- */
-static mrb_value
-mrb_obj_public_methods(mrb_state *mrb, mrb_value self)
-{
-  mrb_bool recur = TRUE;
-  mrb_get_args(mrb, "|b", &recur);
-  return mrb_obj_methods(mrb, recur, self, NOEX_PUBLIC); /* public attribute not define */
-}
-
-/* 15.3.1.2.12  */
-/* 15.3.1.3.40 */
-/*
- *  call-seq:
- *     raise
- *     raise(string)
- *     raise(exception [, string])
- *
- *  With no arguments, raises a <code>RuntimeError</code>
- *  With a single +String+ argument, raises a
- *  +RuntimeError+ with the string as a message. Otherwise,
- *  the first parameter should be the name of an +Exception+
- *  class (or an object that returns an +Exception+ object when sent
- *  an +exception+ message). The optional second parameter sets the
- *  message associated with the exception, and the third parameter is an
- *  array of callback information. Exceptions are caught by the
- *  +rescue+ clause of <code>begin...end</code> blocks.
- *
- *     raise "Failed to create socket"
- *     raise ArgumentError, "No parameters", caller
- */
-MRB_API mrb_value
-mrb_f_raise(mrb_state *mrb, mrb_value self)
-{
-  mrb_value a[2], exc;
-  int argc;
-
-
-  argc = mrb_get_args(mrb, "|oo", &a[0], &a[1]);
-  switch (argc) {
-  case 0:
-    mrb_raise(mrb, E_RUNTIME_ERROR, "");
-    break;
-  case 1:
-    if (mrb_string_p(a[0])) {
-      a[1] = a[0];
-      argc = 2;
-      a[0] = mrb_obj_value(E_RUNTIME_ERROR);
-    }
-    /* fall through */
-  default:
-    exc = mrb_make_exception(mrb, argc, a);
-    mrb_exc_raise(mrb, exc);
-    break;
-  }
-  return mrb_nil_value();            /* not reached */
-}
-
-/* 15.3.1.3.41 */
-/*
- *  call-seq:
- *     obj.remove_instance_variable(symbol)    -> obj
- *
- *  Removes the named instance variable from <i>obj</i>, returning that
- *  variable's value.
- *
- *     class Dummy
- *       attr_reader :var
- *       def initialize
- *         @var = 99
- *       end
- *       def remove
- *         remove_instance_variable(:@var)
- *       end
- *     end
- *     d = Dummy.new
- *     d.var      #=> 99
- *     d.remove   #=> 99
- *     d.var      #=> nil
- */
-static mrb_value
-mrb_obj_remove_instance_variable(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym sym;
-  mrb_value val;
-
-  mrb_get_args(mrb, "n", &sym);
-  mrb_iv_check(mrb, sym);
-  val = mrb_iv_remove(mrb, self, sym);
-  if (mrb_undef_p(val)) {
-    mrb_name_error(mrb, sym, "instance variable %S not defined", mrb_sym2str(mrb, sym));
-  }
-  return val;
-}
-
-void
-mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args)
-{
-  mrb_sym inspect;
-  mrb_value repr;
-
-  inspect = mrb_intern_lit(mrb, "inspect");
-  if (mrb->c->ci > mrb->c->cibase && mrb->c->ci[-1].mid == inspect) {
-    /* method missing in inspect; avoid recursion */
-    repr = mrb_any_to_s(mrb, self);
-  }
-  else if (mrb_respond_to(mrb, self, inspect) && mrb->c->ci - mrb->c->cibase < 16) {
-    repr = mrb_funcall_argv(mrb, self, inspect, 0, 0);
-    if (mrb_string_p(repr) && RSTRING_LEN(repr) > 64) {
-      repr = mrb_any_to_s(mrb, self);
-    }
-  }
-  else {
-    repr = mrb_any_to_s(mrb, self);
-  }
-
-  mrb_no_method_error(mrb, name, args, "undefined method '%S' for %S",
-                      mrb_sym2str(mrb, name), repr);
-}
-
-/* 15.3.1.3.30 */
-/*
- *  call-seq:
- *     obj.method_missing(symbol [, *args] )   -> result
- *
- *  Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
- *  <i>symbol</i> is the symbol for the method called, and <i>args</i>
- *  are any arguments that were passed to it. By default, the interpreter
- *  raises an error when this method is called. However, it is possible
- *  to override the method to provide more dynamic behavior.
- *  If it is decided that a particular method should not be handled, then
- *  <i>super</i> should be called, so that ancestors can pick up the
- *  missing method.
- *  The example below creates
- *  a class <code>Roman</code>, which responds to methods with names
- *  consisting of roman numerals, returning the corresponding integer
- *  values.
- *
- *     class Roman
- *       def romanToInt(str)
- *         # ...
- *       end
- *       def method_missing(methId)
- *         str = methId.id2name
- *         romanToInt(str)
- *       end
- *     end
- *
- *     r = Roman.new
- *     r.iv      #=> 4
- *     r.xxiii   #=> 23
- *     r.mm      #=> 2000
- */
-#ifdef MRB_DEFAULT_METHOD_MISSING
-static mrb_value
-mrb_obj_missing(mrb_state *mrb, mrb_value mod)
-{
-  mrb_sym name;
-  mrb_value *a;
-  mrb_int alen;
-
-  mrb_get_args(mrb, "n*!", &name, &a, &alen);
-  mrb_method_missing(mrb, name, mod, mrb_ary_new_from_values(mrb, alen, a));
-  /* not reached */
-  return mrb_nil_value();
-}
-#endif
-
-static inline mrb_bool
-basic_obj_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym id, int pub)
-{
-  return mrb_respond_to(mrb, obj, id);
-}
-/* 15.3.1.3.43 */
-/*
- *  call-seq:
- *     obj.respond_to?(symbol, include_private=false) -> true or false
- *
- *  Returns +true+ if _obj_ responds to the given
- *  method. Private methods are included in the search only if the
- *  optional second parameter evaluates to +true+.
- *
- *  If the method is not implemented,
- *  as Process.fork on Windows, File.lchmod on GNU/Linux, etc.,
- *  false is returned.
- *
- *  If the method is not defined, <code>respond_to_missing?</code>
- *  method is called and the result is returned.
- */
-static mrb_value
-obj_respond_to(mrb_state *mrb, mrb_value self)
-{
-  mrb_value mid;
-  mrb_sym id, rtm_id;
-  mrb_bool priv = FALSE, respond_to_p = TRUE;
-
-  mrb_get_args(mrb, "o|b", &mid, &priv);
-
-  if (mrb_symbol_p(mid)) {
-    id = mrb_symbol(mid);
-  }
-  else {
-    mrb_value tmp;
-    if (mrb_string_p(mid)) {
-      tmp = mrb_check_intern_str(mrb, mid);
-    }
-    else {
-      tmp = mrb_check_string_type(mrb, mid);
-      if (mrb_nil_p(tmp)) {
-        tmp = mrb_inspect(mrb, mid);
-        mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a symbol", tmp);
-      }
-      tmp = mrb_check_intern_str(mrb, tmp);
-    }
-    if (mrb_nil_p(tmp)) {
-      respond_to_p = FALSE;
-    }
-    else {
-      id = mrb_symbol(tmp);
-    }
-  }
-
-  if (respond_to_p) {
-    respond_to_p = basic_obj_respond_to(mrb, self, id, !priv);
-  }
-
-  if (!respond_to_p) {
-    rtm_id = mrb_intern_lit(mrb, "respond_to_missing?");
-    if (basic_obj_respond_to(mrb, self, rtm_id, !priv)) {
-      mrb_value args[2], v;
-      args[0] = mid;
-      args[1] = mrb_bool_value(priv);
-      v = mrb_funcall_argv(mrb, self, rtm_id, 2, args);
-      return mrb_bool_value(mrb_bool(v));
-    }
-  }
-  return mrb_bool_value(respond_to_p);
-}
-
-/* 15.3.1.3.45 */
-/*
- *  call-seq:
- *     obj.singleton_methods(all=true)    -> array
- *
- *  Returns an array of the names of singleton methods for <i>obj</i>.
- *  If the optional <i>all</i> parameter is true, the list will include
- *  methods in modules included in <i>obj</i>.
- *  Only public and protected singleton methods are returned.
- *
- *     module Other
- *       def three() end
- *     end
- *
- *     class Single
- *       def Single.four() end
- *     end
- *
- *     a = Single.new
- *
- *     def a.one()
- *     end
- *
- *     class << a
- *       include Other
- *       def two()
- *       end
- *     end
- *
- *     Single.singleton_methods    #=> [:four]
- *     a.singleton_methods(false)  #=> [:two, :one]
- *     a.singleton_methods         #=> [:two, :one, :three]
- */
-static mrb_value
-mrb_obj_singleton_methods_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_bool recur = TRUE;
-  mrb_get_args(mrb, "|b", &recur);
-  return mrb_obj_singleton_methods(mrb, recur, self);
-}
-
-static mrb_value
-mod_define_singleton_method(mrb_state *mrb, mrb_value self)
-{
-  struct RProc *p;
-  mrb_sym mid;
-  mrb_value blk = mrb_nil_value();
-
-  mrb_get_args(mrb, "n&", &mid, &blk);
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  mrb_proc_copy(p, mrb_proc_ptr(blk));
-  p->flags |= MRB_PROC_STRICT;
-  mrb_define_method_raw(mrb, mrb_class_ptr(mrb_singleton_class(mrb, self)), mid, p);
-  return mrb_symbol_value(mid);
-}
-
-static mrb_value
-mrb_obj_ceqq(mrb_state *mrb, mrb_value self)
-{
-  mrb_value v;
-  mrb_int i, len;
-  mrb_sym eqq = mrb_intern_lit(mrb, "===");
-  mrb_value ary = mrb_ary_splat(mrb, self);
-
-  mrb_get_args(mrb, "o", &v);
-  len = RARRAY_LEN(ary);
-  for (i=0; i<len; i++) {
-    mrb_value c = mrb_funcall_argv(mrb, mrb_ary_entry(ary, i), eqq, 1, &v);
-    if (mrb_test(c)) return mrb_true_value();
-  }
-  return mrb_false_value();
-}
-
-static mrb_value
-mrb_local_variables(mrb_state *mrb, mrb_value self)
-{
-  struct RProc *proc;
-  mrb_value vars;
-  struct mrb_irep *irep;
-  size_t i;
-
-  proc = mrb->c->ci[-1].proc;
-
-  if (MRB_PROC_CFUNC_P(proc)) {
-    return mrb_ary_new(mrb);
-  }
-
-  irep = proc->body.irep;
-  if (!irep->lv) {
-    return mrb_ary_new(mrb);
-  }
-  vars = mrb_hash_new(mrb);
-  for (i = 0; i + 1 < irep->nlocals; ++i) {
-    if (irep->lv[i].name) {
-      mrb_hash_set(mrb, vars, mrb_symbol_value(irep->lv[i].name), mrb_true_value());
-    }
-  }
-  if (proc->env) {
-    struct REnv *e = proc->env;
-
-    while (e) {
-      if (MRB_ENV_STACK_SHARED_P(e) &&
-          !MRB_PROC_CFUNC_P(e->cxt.c->cibase[e->cioff].proc)) {
-        irep = e->cxt.c->cibase[e->cioff].proc->body.irep;
-        if (irep->lv) {
-          for (i = 0; i + 1 < irep->nlocals; ++i) {
-            if (irep->lv[i].name) {
-              mrb_hash_set(mrb, vars, mrb_symbol_value(irep->lv[i].name), mrb_true_value());
-            }
-          }
-        }
-      }
-      e = (struct REnv*)e->c;
-    }
-  }
-
-  return mrb_hash_keys(mrb, vars);
-}
-
-mrb_value mrb_obj_equal_m(mrb_state *mrb, mrb_value);
-void
-mrb_init_kernel(mrb_state *mrb)
-{
-  struct RClass *krn;
-
-  mrb->kernel_module = krn = mrb_define_module(mrb, "Kernel");                                                    /* 15.3.1 */
-  mrb_define_class_method(mrb, krn, "block_given?",         mrb_f_block_given_p_m,           MRB_ARGS_NONE());    /* 15.3.1.2.2  */
-  mrb_define_class_method(mrb, krn, "global_variables",     mrb_f_global_variables,          MRB_ARGS_NONE());    /* 15.3.1.2.4  */
-  mrb_define_class_method(mrb, krn, "iterator?",            mrb_f_block_given_p_m,           MRB_ARGS_NONE());    /* 15.3.1.2.5  */
-  mrb_define_class_method(mrb, krn, "local_variables",      mrb_local_variables,             MRB_ARGS_NONE());    /* 15.3.1.2.7  */
-;     /* 15.3.1.2.11 */
-  mrb_define_class_method(mrb, krn, "raise",                mrb_f_raise,                     MRB_ARGS_OPT(2));    /* 15.3.1.2.12 */
-
-  mrb_define_method(mrb, krn, "singleton_class",            mrb_singleton_class,             MRB_ARGS_NONE());
-
-  mrb_define_method(mrb, krn, "===",                        mrb_equal_m,                     MRB_ARGS_REQ(1));    /* 15.3.1.3.2  */
-  mrb_define_method(mrb, krn, "block_given?",               mrb_f_block_given_p_m,           MRB_ARGS_NONE());    /* 15.3.1.3.6  */
-  mrb_define_method(mrb, krn, "class",                      mrb_obj_class_m,                 MRB_ARGS_NONE());    /* 15.3.1.3.7  */
-  mrb_define_method(mrb, krn, "clone",                      mrb_obj_clone,                   MRB_ARGS_NONE());    /* 15.3.1.3.8  */
-  mrb_define_method(mrb, krn, "dup",                        mrb_obj_dup,                     MRB_ARGS_NONE());    /* 15.3.1.3.9  */
-  mrb_define_method(mrb, krn, "eql?",                       mrb_obj_equal_m,                 MRB_ARGS_REQ(1));    /* 15.3.1.3.10 */
-  mrb_define_method(mrb, krn, "equal?",                     mrb_obj_equal_m,                 MRB_ARGS_REQ(1));    /* 15.3.1.3.11 */
-  mrb_define_method(mrb, krn, "extend",                     mrb_obj_extend_m,                MRB_ARGS_ANY());     /* 15.3.1.3.13 */
-  mrb_define_method(mrb, krn, "freeze",                     mrb_obj_freeze,                  MRB_ARGS_NONE());
-  mrb_define_method(mrb, krn, "frozen?",                    mrb_obj_frozen,                  MRB_ARGS_NONE());
-  mrb_define_method(mrb, krn, "global_variables",           mrb_f_global_variables,          MRB_ARGS_NONE());    /* 15.3.1.3.14 */
-  mrb_define_method(mrb, krn, "hash",                       mrb_obj_hash,                    MRB_ARGS_NONE());    /* 15.3.1.3.15 */
-  mrb_define_method(mrb, krn, "initialize_copy",            mrb_obj_init_copy,               MRB_ARGS_REQ(1));    /* 15.3.1.3.16 */
-  mrb_define_method(mrb, krn, "inspect",                    mrb_obj_inspect,                 MRB_ARGS_NONE());    /* 15.3.1.3.17 */
-  mrb_define_method(mrb, krn, "instance_of?",               obj_is_instance_of,              MRB_ARGS_REQ(1));    /* 15.3.1.3.19 */
-  mrb_define_method(mrb, krn, "instance_variable_defined?", mrb_obj_ivar_defined,            MRB_ARGS_REQ(1));    /* 15.3.1.3.20 */
-  mrb_define_method(mrb, krn, "instance_variable_get",      mrb_obj_ivar_get,                MRB_ARGS_REQ(1));    /* 15.3.1.3.21 */
-  mrb_define_method(mrb, krn, "instance_variable_set",      mrb_obj_ivar_set,                MRB_ARGS_REQ(2));    /* 15.3.1.3.22 */
-  mrb_define_method(mrb, krn, "instance_variables",         mrb_obj_instance_variables,      MRB_ARGS_NONE());    /* 15.3.1.3.23 */
-  mrb_define_method(mrb, krn, "is_a?",                      mrb_obj_is_kind_of_m,            MRB_ARGS_REQ(1));    /* 15.3.1.3.24 */
-  mrb_define_method(mrb, krn, "iterator?",                  mrb_f_block_given_p_m,           MRB_ARGS_NONE());    /* 15.3.1.3.25 */
-  mrb_define_method(mrb, krn, "kind_of?",                   mrb_obj_is_kind_of_m,            MRB_ARGS_REQ(1));    /* 15.3.1.3.26 */
-  mrb_define_method(mrb, krn, "local_variables",            mrb_local_variables,             MRB_ARGS_NONE());    /* 15.3.1.3.28 */
-#ifdef MRB_DEFAULT_METHOD_MISSING
-  mrb_define_method(mrb, krn, "method_missing",             mrb_obj_missing,                 MRB_ARGS_ANY());     /* 15.3.1.3.30 */
-#endif
-  mrb_define_method(mrb, krn, "methods",                    mrb_obj_methods_m,               MRB_ARGS_OPT(1));    /* 15.3.1.3.31 */
-  mrb_define_method(mrb, krn, "nil?",                       mrb_false,                       MRB_ARGS_NONE());    /* 15.3.1.3.32 */
-  mrb_define_method(mrb, krn, "object_id",                  mrb_obj_id_m,                    MRB_ARGS_NONE());    /* 15.3.1.3.33 */
-  mrb_define_method(mrb, krn, "private_methods",            mrb_obj_private_methods,         MRB_ARGS_OPT(1));    /* 15.3.1.3.36 */
-  mrb_define_method(mrb, krn, "protected_methods",          mrb_obj_protected_methods,       MRB_ARGS_OPT(1));    /* 15.3.1.3.37 */
-  mrb_define_method(mrb, krn, "public_methods",             mrb_obj_public_methods,          MRB_ARGS_OPT(1));    /* 15.3.1.3.38 */
-  mrb_define_method(mrb, krn, "raise",                      mrb_f_raise,                     MRB_ARGS_ANY());     /* 15.3.1.3.40 */
-  mrb_define_method(mrb, krn, "remove_instance_variable",   mrb_obj_remove_instance_variable,MRB_ARGS_REQ(1));    /* 15.3.1.3.41 */
-  mrb_define_method(mrb, krn, "respond_to?",                obj_respond_to,                  MRB_ARGS_ANY());     /* 15.3.1.3.43 */
-  mrb_define_method(mrb, krn, "send",                       mrb_f_send,                      MRB_ARGS_ANY());     /* 15.3.1.3.44 */
-  mrb_define_method(mrb, krn, "singleton_methods",          mrb_obj_singleton_methods_m,     MRB_ARGS_OPT(1));    /* 15.3.1.3.45 */
-  mrb_define_method(mrb, krn, "define_singleton_method",    mod_define_singleton_method,     MRB_ARGS_ANY());
-  mrb_define_method(mrb, krn, "to_s",                       mrb_any_to_s,                    MRB_ARGS_NONE());    /* 15.3.1.3.46 */
-  mrb_define_method(mrb, krn, "__case_eqq",                 mrb_obj_ceqq,                    MRB_ARGS_REQ(1));    /* internal */
-
-  mrb_include_module(mrb, mrb->object_class, mrb->kernel_module);
-  mrb_alias_method(mrb, mrb->module_class, mrb_intern_lit(mrb, "dup"), mrb_intern_lit(mrb, "clone"));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/load.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/load.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/load.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/load.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,709 +0,0 @@
-/*
-** load.c - mruby binary loader
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby/dump.h>
-#include <mruby/irep.h>
-#include <mruby/proc.h>
-#include <mruby/string.h>
-#include <mruby/debug.h>
-#include <mruby/error.h>
-
-#if SIZE_MAX < UINT32_MAX
-# error size_t must be at least 32 bits wide
-#endif
-
-#define FLAG_BYTEORDER_BIG 2
-#define FLAG_BYTEORDER_LIL 4
-#define FLAG_BYTEORDER_NATIVE 8
-#define FLAG_SRC_MALLOC 1
-#define FLAG_SRC_STATIC 0
-
-#define SIZE_ERROR_MUL(nmemb, size) ((nmemb) > SIZE_MAX / (size))
-
-static size_t
-skip_padding(const uint8_t *buf)
-{
-  const size_t align = MRB_DUMP_ALIGNMENT;
-  return -(intptr_t)buf & (align-1);
-}
-
-static size_t
-offset_crc_body(void)
-{
-  struct rite_binary_header header;
-  return ((uint8_t *)header.binary_crc - (uint8_t *)&header) + sizeof(header.binary_crc);
-}
-
-static mrb_irep*
-read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flags)
-{
-  size_t i;
-  const uint8_t *src = bin;
-  ptrdiff_t diff;
-  uint16_t tt, pool_data_len, snl;
-  size_t plen;
-  int ai = mrb_gc_arena_save(mrb);
-  mrb_irep *irep = mrb_add_irep(mrb);
-
-  /* skip record size */
-  src += sizeof(uint32_t);
-
-  /* number of local variable */
-  irep->nlocals = bin_to_uint16(src);
-  src += sizeof(uint16_t);
-
-  /* number of register variable */
-  irep->nregs = bin_to_uint16(src);
-  src += sizeof(uint16_t);
-
-  /* number of child irep */
-  irep->rlen = (size_t)bin_to_uint16(src);
-  src += sizeof(uint16_t);
-
-  /* Binary Data Section */
-  /* ISEQ BLOCK */
-  irep->ilen = (size_t)bin_to_uint32(src);
-  src += sizeof(uint32_t);
-  src += skip_padding(src);
-
-  if (irep->ilen > 0) {
-    if (SIZE_ERROR_MUL(irep->ilen, sizeof(mrb_code))) {
-      return NULL;
-    }
-    if ((flags & FLAG_SRC_MALLOC) == 0 &&
-        (flags & FLAG_BYTEORDER_NATIVE)) {
-      irep->iseq = (mrb_code*)src;
-      src += sizeof(uint32_t) * irep->ilen;
-      irep->flags |= MRB_ISEQ_NO_FREE;
-    }
-    else {
-      irep->iseq = (mrb_code *)mrb_malloc(mrb, sizeof(mrb_code) * irep->ilen);
-      if (flags & FLAG_BYTEORDER_NATIVE) {
-        memcpy(irep->iseq, src, sizeof(uint32_t) * irep->ilen);
-        src += sizeof(uint32_t) * irep->ilen;
-      }
-      else if (flags & FLAG_BYTEORDER_BIG) {
-        for (i = 0; i < irep->ilen; i++) {
-          irep->iseq[i] = (mrb_code)bin_to_uint32(src);     /* iseq */
-          src += sizeof(uint32_t);
-        }
-      }
-      else {
-        for (i = 0; i < irep->ilen; i++) {
-          irep->iseq[i] = (mrb_code)bin_to_uint32l(src);     /* iseq */
-          src += sizeof(uint32_t);
-        }
-      }
-    }
-  }
-
-  /* POOL BLOCK */
-  plen = (size_t)bin_to_uint32(src); /* number of pool */
-  src += sizeof(uint32_t);
-  if (plen > 0) {
-    if (SIZE_ERROR_MUL(plen, sizeof(mrb_value))) {
-      return NULL;
-    }
-    irep->pool = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * plen);
-
-    for (i = 0; i < plen; i++) {
-      mrb_value s;
-
-      tt = *src++; /* pool TT */
-      pool_data_len = bin_to_uint16(src); /* pool data length */
-      src += sizeof(uint16_t);
-      if (flags & FLAG_SRC_MALLOC) {
-        s = mrb_str_new(mrb, (char *)src, pool_data_len);
-      }
-      else {
-        s = mrb_str_new_static(mrb, (char *)src, pool_data_len);
-      }
-      src += pool_data_len;
-      switch (tt) { /* pool data */
-      case IREP_TT_FIXNUM:
-        irep->pool[i] = mrb_str_to_inum(mrb, s, 10, FALSE);
-        break;
-
-      case IREP_TT_FLOAT:
-        irep->pool[i] = mrb_float_pool(mrb, mrb_str_to_dbl(mrb, s, FALSE));
-        break;
-
-      case IREP_TT_STRING:
-        irep->pool[i] = mrb_str_pool(mrb, s);
-        break;
-
-      default:
-        /* should not happen */
-        irep->pool[i] = mrb_nil_value();
-        break;
-      }
-      irep->plen++;
-      mrb_gc_arena_restore(mrb, ai);
-    }
-  }
-
-  /* SYMS BLOCK */
-  irep->slen = (size_t)bin_to_uint32(src);  /* syms length */
-  src += sizeof(uint32_t);
-  if (irep->slen > 0) {
-    if (SIZE_ERROR_MUL(irep->slen, sizeof(mrb_sym))) {
-      return NULL;
-    }
-    irep->syms = (mrb_sym *)mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen);
-
-    for (i = 0; i < irep->slen; i++) {
-      snl = bin_to_uint16(src);               /* symbol name length */
-      src += sizeof(uint16_t);
-
-      if (snl == MRB_DUMP_NULL_SYM_LEN) {
-        irep->syms[i] = 0;
-        continue;
-      }
-
-      if (flags & FLAG_SRC_MALLOC) {
-        irep->syms[i] = mrb_intern(mrb, (char *)src, snl);
-      }
-      else {
-        irep->syms[i] = mrb_intern_static(mrb, (char *)src, snl);
-      }
-      src += snl + 1;
-
-      mrb_gc_arena_restore(mrb, ai);
-    }
-  }
-
-  irep->reps = (mrb_irep**)mrb_malloc(mrb, sizeof(mrb_irep*)*irep->rlen);
-
-  diff = src - bin;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  *len = (size_t)diff;
-
-  return irep;
-}
-
-static mrb_irep*
-read_irep_record(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flags)
-{
-  mrb_irep *irep = read_irep_record_1(mrb, bin, len, flags);
-  size_t i;
-
-  if (irep == NULL) {
-    return NULL;
-  }
-
-  bin += *len;
-  for (i=0; i<irep->rlen; i++) {
-    size_t rlen;
-
-    irep->reps[i] = read_irep_record(mrb, bin, &rlen, flags);
-    if (irep->reps[i] == NULL) {
-      return NULL;
-    }
-    bin += rlen;
-    *len += rlen;
-  }
-  return irep;
-}
-
-static mrb_irep*
-read_section_irep(mrb_state *mrb, const uint8_t *bin, uint8_t flags)
-{
-  size_t len;
-
-  bin += sizeof(struct rite_section_irep_header);
-  return read_irep_record(mrb, bin, &len, flags);
-}
-
-static int
-read_lineno_record_1(mrb_state *mrb, const uint8_t *bin, mrb_irep *irep, size_t *len)
-{
-  size_t i, fname_len, niseq;
-  char *fname;
-  uint16_t *lines;
-
-  *len = 0;
-  bin += sizeof(uint32_t); /* record size */
-  *len += sizeof(uint32_t);
-  fname_len = bin_to_uint16(bin);
-  bin += sizeof(uint16_t);
-  *len += sizeof(uint16_t);
-  fname = (char *)mrb_malloc(mrb, fname_len + 1);
-  memcpy(fname, bin, fname_len);
-  fname[fname_len] = '\0';
-  bin += fname_len;
-  *len += fname_len;
-
-  niseq = (size_t)bin_to_uint32(bin);
-  bin += sizeof(uint32_t); /* niseq */
-  *len += sizeof(uint32_t);
-
-  if (SIZE_ERROR_MUL(niseq, sizeof(uint16_t))) {
-    return MRB_DUMP_GENERAL_FAILURE;
-  }
-  lines = (uint16_t *)mrb_malloc(mrb, niseq * sizeof(uint16_t));
-  for (i = 0; i < niseq; i++) {
-    lines[i] = bin_to_uint16(bin);
-    bin += sizeof(uint16_t); /* niseq */
-    *len += sizeof(uint16_t);
-  }
-
-  irep->filename = fname;
-  irep->lines = lines;
-  return MRB_DUMP_OK;
-}
-
-static int
-read_lineno_record(mrb_state *mrb, const uint8_t *bin, mrb_irep *irep, size_t *lenp)
-{
-  int result = read_lineno_record_1(mrb, bin, irep, lenp);
-  size_t i;
-
-  if (result != MRB_DUMP_OK) return result;
-  for (i = 0; i < irep->rlen; i++) {
-    size_t len;
-
-    result = read_lineno_record(mrb, bin, irep->reps[i], &len);
-    if (result != MRB_DUMP_OK) break;
-    bin += len;
-    *lenp += len;
-  }
-  return result;
-}
-
-static int
-read_section_lineno(mrb_state *mrb, const uint8_t *bin, mrb_irep *irep)
-{
-  size_t len;
-
-  len = 0;
-  bin += sizeof(struct rite_section_lineno_header);
-
-  /* Read Binary Data Section */
-  return read_lineno_record(mrb, bin, irep, &len);
-}
-
-static int
-read_debug_record(mrb_state *mrb, const uint8_t *start, mrb_irep* irep, size_t *record_len, const mrb_sym *filenames, size_t filenames_len)
-{
-  const uint8_t *bin = start;
-  ptrdiff_t diff;
-  size_t record_size, i;
-  uint16_t f_idx;
-
-  if (irep->debug_info) { return MRB_DUMP_INVALID_IREP; }
-
-  irep->debug_info = (mrb_irep_debug_info*)mrb_malloc(mrb, sizeof(mrb_irep_debug_info));
-  irep->debug_info->pc_count = irep->ilen;
-
-  record_size = (size_t)bin_to_uint32(bin);
-  bin += sizeof(uint32_t);
-
-  irep->debug_info->flen = bin_to_uint16(bin);
-  irep->debug_info->files = (mrb_irep_debug_info_file**)mrb_malloc(mrb, sizeof(mrb_irep_debug_info*) * irep->debug_info->flen);
-  bin += sizeof(uint16_t);
-
-  for (f_idx = 0; f_idx < irep->debug_info->flen; ++f_idx) {
-    mrb_irep_debug_info_file *file;
-    uint16_t filename_idx;
-    mrb_int len;
-
-    file = (mrb_irep_debug_info_file *)mrb_malloc(mrb, sizeof(*file));
-    irep->debug_info->files[f_idx] = file;
-
-    file->start_pos = bin_to_uint32(bin);
-    bin += sizeof(uint32_t);
-
-    /* filename */
-    filename_idx = bin_to_uint16(bin);
-    bin += sizeof(uint16_t);
-    mrb_assert(filename_idx < filenames_len);
-    file->filename_sym = filenames[filename_idx];
-    len = 0;
-    file->filename = mrb_sym2name_len(mrb, file->filename_sym, &len);
-
-    file->line_entry_count = bin_to_uint32(bin);
-    bin += sizeof(uint32_t);
-    file->line_type = (mrb_debug_line_type)bin_to_uint8(bin);
-    bin += sizeof(uint8_t);
-    switch (file->line_type) {
-      case mrb_debug_line_ary: {
-        uint32_t l;
-
-        file->lines.ary = (uint16_t *)mrb_malloc(mrb, sizeof(uint16_t) * (size_t)(file->line_entry_count));
-        for (l = 0; l < file->line_entry_count; ++l) {
-          file->lines.ary[l] = bin_to_uint16(bin);
-          bin += sizeof(uint16_t);
-        }
-      } break;
-
-      case mrb_debug_line_flat_map: {
-        uint32_t l;
-
-        file->lines.flat_map = (mrb_irep_debug_info_line*)mrb_malloc(
-            mrb, sizeof(mrb_irep_debug_info_line) * (size_t)(file->line_entry_count));
-        for (l = 0; l < file->line_entry_count; ++l) {
-          file->lines.flat_map[l].start_pos = bin_to_uint32(bin);
-          bin += sizeof(uint32_t);
-          file->lines.flat_map[l].line = bin_to_uint16(bin);
-          bin += sizeof(uint16_t);
-        }
-      } break;
-
-      default: return MRB_DUMP_GENERAL_FAILURE;
-    }
-  }
-
-  diff = bin - start;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-
-  if (record_size != (size_t)diff) {
-    return MRB_DUMP_GENERAL_FAILURE;
-  }
-
-  for (i = 0; i < irep->rlen; i++) {
-    size_t len;
-    int ret;
-
-    ret = read_debug_record(mrb, bin, irep->reps[i], &len, filenames, filenames_len);
-    if (ret != MRB_DUMP_OK) return ret;
-    bin += len;
-  }
-
-  diff = bin - start;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  *record_len = (size_t)diff;
-
-  return MRB_DUMP_OK;
-}
-
-static int
-read_section_debug(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, uint8_t flags)
-{
-  const uint8_t *bin;
-  ptrdiff_t diff;
-  struct rite_section_debug_header *header;
-  uint16_t i;
-  size_t len = 0;
-  int result;
-  uint16_t filenames_len;
-  mrb_sym *filenames;
-
-  bin = start;
-  header = (struct rite_section_debug_header *)bin;
-  bin += sizeof(struct rite_section_debug_header);
-
-  filenames_len = bin_to_uint16(bin);
-  bin += sizeof(uint16_t);
-  filenames = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * (size_t)filenames_len);
-  for (i = 0; i < filenames_len; ++i) {
-    uint16_t f_len = bin_to_uint16(bin);
-    bin += sizeof(uint16_t);
-    if (flags & FLAG_SRC_MALLOC) {
-      filenames[i] = mrb_intern(mrb, (const char *)bin, (size_t)f_len);
-    }
-    else {
-      filenames[i] = mrb_intern_static(mrb, (const char *)bin, (size_t)f_len);
-    }
-    bin += f_len;
-  }
-
-  result = read_debug_record(mrb, bin, irep, &len, filenames, filenames_len);
-  if (result != MRB_DUMP_OK) goto debug_exit;
-
-  bin += len;
-  diff = bin - start;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  if ((uint32_t)diff != bin_to_uint32(header->section_size)) {
-    result = MRB_DUMP_GENERAL_FAILURE;
-  }
-
-debug_exit:
-  mrb_free(mrb, filenames);
-  return result;
-}
-
-static int
-read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *record_len, mrb_sym const *syms, uint32_t syms_len)
-{
-  const uint8_t *bin = start;
-  size_t i;
-  ptrdiff_t diff;
-
-  irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (irep->nlocals - 1));
-
-  for (i = 0; i + 1< irep->nlocals; ++i) {
-    uint16_t const sym_idx = bin_to_uint16(bin);
-    bin += sizeof(uint16_t);
-    if (sym_idx == RITE_LV_NULL_MARK) {
-      irep->lv[i].name = 0;
-      irep->lv[i].r = 0;
-    }
-    else {
-      if (sym_idx >= syms_len) {
-        return MRB_DUMP_GENERAL_FAILURE;
-      }
-      irep->lv[i].name = syms[sym_idx];
-
-      irep->lv[i].r = bin_to_uint16(bin);
-    }
-    bin += sizeof(uint16_t);
-  }
-
-  for (i = 0; i < irep->rlen; ++i) {
-    size_t len;
-    int ret;
-
-    ret = read_lv_record(mrb, bin, irep->reps[i], &len, syms, syms_len);
-    if (ret != MRB_DUMP_OK) return ret;
-    bin += len;
-  }
-
-  diff = bin - start;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  *record_len = (size_t)diff;
-
-  return MRB_DUMP_OK;
-}
-
-static int
-read_section_lv(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, uint8_t flags)
-{
-  const uint8_t *bin;
-  ptrdiff_t diff;
-  struct rite_section_lv_header const *header;
-  uint32_t i;
-  size_t len = 0;
-  int result;
-  uint32_t syms_len;
-  mrb_sym *syms;
-  mrb_sym (*intern_func)(mrb_state*, const char*, size_t) =
-    (flags & FLAG_SRC_MALLOC)? mrb_intern : mrb_intern_static;
-
-  bin = start;
-  header = (struct rite_section_lv_header const*)bin;
-  bin += sizeof(struct rite_section_lv_header);
-
-  syms_len = bin_to_uint32(bin);
-  bin += sizeof(uint32_t);
-  syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * (size_t)syms_len);
-  for (i = 0; i < syms_len; ++i) {
-    uint16_t const str_len = bin_to_uint16(bin);
-    bin += sizeof(uint16_t);
-
-    syms[i] = intern_func(mrb, (const char*)bin, str_len);
-    bin += str_len;
-  }
-
-  result = read_lv_record(mrb, bin, irep, &len, syms, syms_len);
-  if (result != MRB_DUMP_OK) goto lv_exit;
-
-  bin += len;
-  diff = bin - start;
-  mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX);
-  if ((uint32_t)diff != bin_to_uint32(header->section_size)) {
-    result = MRB_DUMP_GENERAL_FAILURE;
-  }
-
-lv_exit:
-  mrb_free(mrb, syms);
-  return result;
-}
-
-static int
-read_binary_header(const uint8_t *bin, size_t *bin_size, uint16_t *crc, uint8_t *flags)
-{
-  const struct rite_binary_header *header = (const struct rite_binary_header *)bin;
-
-  if (memcmp(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident)) == 0) {
-    if (bigendian_p())
-      *flags |= FLAG_BYTEORDER_NATIVE;
-    else
-      *flags |= FLAG_BYTEORDER_BIG;
-  }
-  else if (memcmp(header->binary_ident, RITE_BINARY_IDENT_LIL, sizeof(header->binary_ident)) == 0) {
-    if (bigendian_p())
-      *flags |= FLAG_BYTEORDER_LIL;
-    else
-      *flags |= FLAG_BYTEORDER_NATIVE;
-  }
-  else {
-    return MRB_DUMP_INVALID_FILE_HEADER;
-  }
-
-  if (crc) {
-    *crc = bin_to_uint16(header->binary_crc);
-  }
-  *bin_size = (size_t)bin_to_uint32(header->binary_size);
-
-  return MRB_DUMP_OK;
-}
-
-static mrb_irep*
-read_irep(mrb_state *mrb, const uint8_t *bin, uint8_t flags)
-{
-  int result;
-  mrb_irep *irep = NULL;
-  const struct rite_section_header *section_header;
-  uint16_t crc;
-  size_t bin_size = 0;
-  size_t n;
-
-  if ((mrb == NULL) || (bin == NULL)) {
-    return NULL;
-  }
-
-  result = read_binary_header(bin, &bin_size, &crc, &flags);
-  if (result != MRB_DUMP_OK) {
-    return NULL;
-  }
-
-  n = offset_crc_body();
-  if (crc != calc_crc_16_ccitt(bin + n, bin_size - n, 0)) {
-    return NULL;
-  }
-
-  bin += sizeof(struct rite_binary_header);
-  do {
-    section_header = (const struct rite_section_header *)bin;
-    if (memcmp(section_header->section_ident, RITE_SECTION_IREP_IDENT, sizeof(section_header->section_ident)) == 0) {
-      irep = read_section_irep(mrb, bin, flags);
-      if (!irep) return NULL;
-    }
-    else if (memcmp(section_header->section_ident, RITE_SECTION_LINENO_IDENT, sizeof(section_header->section_ident)) == 0) {
-      if (!irep) return NULL;   /* corrupted data */
-      result = read_section_lineno(mrb, bin, irep);
-      if (result < MRB_DUMP_OK) {
-        return NULL;
-      }
-    }
-    else if (memcmp(section_header->section_ident, RITE_SECTION_DEBUG_IDENT, sizeof(section_header->section_ident)) == 0) {
-      if (!irep) return NULL;   /* corrupted data */
-      result = read_section_debug(mrb, bin, irep, flags);
-      if (result < MRB_DUMP_OK) {
-        return NULL;
-      }
-    }
-    else if (memcmp(section_header->section_ident, RITE_SECTION_LV_IDENT, sizeof(section_header->section_ident)) == 0) {
-      if (!irep) return NULL;
-      result = read_section_lv(mrb, bin, irep, flags);
-      if (result < MRB_DUMP_OK) {
-        return NULL;
-      }
-    }
-    bin += bin_to_uint32(section_header->section_size);
-  } while (memcmp(section_header->section_ident, RITE_BINARY_EOF, sizeof(section_header->section_ident)) != 0);
-
-  return irep;
-}
-
-mrb_irep*
-mrb_read_irep(mrb_state *mrb, const uint8_t *bin)
-{
-#ifdef MRB_USE_ETEXT_EDATA
-  uint8_t flags = mrb_ro_data_p((char*)bin) ? FLAG_SRC_STATIC : FLAG_SRC_MALLOC;
-#else
-  uint8_t flags = FLAG_SRC_STATIC;
-#endif
-
-  return read_irep(mrb, bin, flags);
-}
-
-void mrb_exc_set(mrb_state *mrb, mrb_value exc);
-
-static void
-irep_error(mrb_state *mrb)
-{
-  mrb_exc_set(mrb, mrb_exc_new_str_lit(mrb, E_SCRIPT_ERROR, "irep load error"));
-}
-
-MRB_API mrb_value
-mrb_load_irep_cxt(mrb_state *mrb, const uint8_t *bin, mrbc_context *c)
-{
-  mrb_irep *irep = mrb_read_irep(mrb, bin);
-  struct RProc *proc;
-
-  if (!irep) {
-    irep_error(mrb);
-    return mrb_nil_value();
-  }
-  proc = mrb_proc_new(mrb, irep);
-  mrb_irep_decref(mrb, irep);
-  if (c && c->no_exec) return mrb_obj_value(proc);
-  return mrb_top_run(mrb, proc, mrb_top_self(mrb), 0);
-}
-
-MRB_API mrb_value
-mrb_load_irep(mrb_state *mrb, const uint8_t *bin)
-{
-  return mrb_load_irep_cxt(mrb, bin, NULL);
-}
-
-#ifndef MRB_DISABLE_STDIO
-
-mrb_irep*
-mrb_read_irep_file(mrb_state *mrb, FILE* fp)
-{
-  mrb_irep *irep = NULL;
-  uint8_t *buf;
-  const size_t header_size = sizeof(struct rite_binary_header);
-  size_t buf_size = 0;
-  uint8_t flags = 0;
-  int result;
-
-  if ((mrb == NULL) || (fp == NULL)) {
-    return NULL;
-  }
-
-  buf = (uint8_t*)mrb_malloc(mrb, header_size);
-  if (fread(buf, header_size, 1, fp) == 0) {
-    goto irep_exit;
-  }
-  result = read_binary_header(buf, &buf_size, NULL, &flags);
-  if (result != MRB_DUMP_OK || buf_size <= header_size) {
-    goto irep_exit;
-  }
-
-  buf = (uint8_t*)mrb_realloc(mrb, buf, buf_size);
-  if (fread(buf+header_size, buf_size-header_size, 1, fp) == 0) {
-    goto irep_exit;
-  }
-  irep = read_irep(mrb, buf, FLAG_SRC_MALLOC);
-
-irep_exit:
-  mrb_free(mrb, buf);
-  return irep;
-}
-
-void mrb_codedump_all(mrb_state*, struct RProc*);
-
-MRB_API mrb_value
-mrb_load_irep_file_cxt(mrb_state *mrb, FILE* fp, mrbc_context *c)
-{
-  mrb_irep *irep = mrb_read_irep_file(mrb, fp);
-  mrb_value val;
-  struct RProc *proc;
-
-  if (!irep) {
-    irep_error(mrb);
-    return mrb_nil_value();
-  }
-  proc = mrb_proc_new(mrb, irep);
-  mrb_irep_decref(mrb, irep);
-  if (c && c->dump_result) mrb_codedump_all(mrb, proc);
-  if (c && c->no_exec) return mrb_obj_value(proc);
-  val = mrb_top_run(mrb, proc, mrb_top_self(mrb), 0);
-  return val;
-}
-
-MRB_API mrb_value
-mrb_load_irep_file(mrb_state *mrb, FILE* fp)
-{
-  return mrb_load_irep_file_cxt(mrb, fp, NULL);
-}
-#endif /* MRB_DISABLE_STDIO */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/mruby_core.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/mruby_core.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/mruby_core.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/mruby_core.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-MRuby.each_target do
-  current_dir = File.dirname(__FILE__).relative_path_from(Dir.pwd)
-  relative_from_root = File.dirname(__FILE__).relative_path_from(MRUBY_ROOT)
-  current_build_dir = "#{build_dir}/#{relative_from_root}"
-
-  objs = Dir.glob("#{current_dir}/*.c").map { |f|
-    next nil if cxx_exception_enabled? and f =~ /(error|vm).c$/
-    objfile(f.pathmap("#{current_build_dir}/%n"))
-  }.compact
-
-  if cxx_exception_enabled?
-    objs += %w(vm error).map { |v| compile_as_cxx "#{current_dir}/#{v}.c", "#{current_build_dir}/#{v}.cxx" }
-  end
-  self.libmruby << objs
-
-  file libfile("#{build_dir}/lib/libmruby_core") => objs do |t|
-    archiver.run t.name, t.prerequisites
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/numeric.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/numeric.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/numeric.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/numeric.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1381 +0,0 @@
-/*
-** numeric.c - Numeric, Integer, Float, Fixnum class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/numeric.h>
-#include <mruby/string.h>
-#include <mruby/class.h>
-
-#ifdef MRB_USE_FLOAT
-#define trunc(f) truncf(f)
-#define floor(f) floorf(f)
-#define ceil(f) ceilf(f)
-#define fmod(x,y) fmodf(x,y)
-#define MRB_FLO_TO_STR_FMT "%.7g"
-#else
-#define MRB_FLO_TO_STR_FMT "%.14g"
-#endif
-
-MRB_API mrb_float
-mrb_to_flo(mrb_state *mrb, mrb_value val)
-{
-  switch (mrb_type(val)) {
-  case MRB_TT_FIXNUM:
-    return (mrb_float)mrb_fixnum(val);
-  case MRB_TT_FLOAT:
-    break;
-  default:
-    mrb_raise(mrb, E_TYPE_ERROR, "non float value");
-  }
-  return mrb_float(val);
-}
-
-/*
- * call-seq:
- *
- *  num ** other  ->  num
- *
- * Raises <code>num</code> the <code>other</code> power.
- *
- *    2.0**3      #=> 8.0
- */
-static mrb_value
-num_pow(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  mrb_float d;
-
-  mrb_get_args(mrb, "o", &y);
-  if (mrb_fixnum_p(x) && mrb_fixnum_p(y)) {
-    /* try ipow() */
-    mrb_int base = mrb_fixnum(x);
-    mrb_int exp = mrb_fixnum(y);
-    mrb_int result = 1;
-
-    if (exp < 0) goto float_pow;
-    for (;;) {
-      if (exp & 1) {
-        if (mrb_int_mul_overflow(result, base, &result)) {
-          goto float_pow;
-        }
-      }
-      exp >>= 1;
-      if (exp == 0) break;
-      if (mrb_int_mul_overflow(base, base, &base)) {
-        goto float_pow;
-      }
-    }
-    return mrb_fixnum_value(result);
-  }
- float_pow:
-  d = pow(mrb_to_flo(mrb, x), mrb_to_flo(mrb, y));
-  return mrb_float_value(mrb, d);
-}
-
-/* 15.2.8.3.4  */
-/* 15.2.9.3.4  */
-/*
- * call-seq:
- *   num / other  ->  num
- *
- * Performs division: the class of the resulting object depends on
- * the class of <code>num</code> and on the magnitude of the
- * result.
- */
-
-mrb_value
-mrb_num_div(mrb_state *mrb, mrb_value x, mrb_value y)
-{
-  return mrb_float_value(mrb, mrb_to_flo(mrb, x) / mrb_to_flo(mrb, y));
-}
-
-/* 15.2.9.3.19(x) */
-/*
- *  call-seq:
- *     num.quo(numeric)  ->  real
- *
- *  Returns most exact division.
- */
-
-static mrb_value
-num_div(mrb_state *mrb, mrb_value x)
-{
-  mrb_float y;
-
-  mrb_get_args(mrb, "f", &y);
-  return mrb_float_value(mrb, mrb_to_flo(mrb, x) / y);
-}
-
-/********************************************************************
- *
- * Document-class: Float
- *
- *  <code>Float</code> objects represent inexact real numbers using
- *  the native architecture's double-precision floating point
- *  representation.
- */
-
-/* 15.2.9.3.16(x) */
-/*
- *  call-seq:
- *     flt.to_s  ->  string
- *
- *  Returns a string containing a representation of self. As well as a
- *  fixed or exponential form of the number, the call may return
- *  "<code>NaN</code>", "<code>Infinity</code>", and
- *  "<code>-Infinity</code>".
- */
-
-static mrb_value
-flo_to_s(mrb_state *mrb, mrb_value flt)
-{
-  if (isnan(mrb_float(flt))) {
-    return mrb_str_new_lit(mrb, "NaN");
-  }
-  return mrb_float_to_str(mrb, flt, MRB_FLO_TO_STR_FMT);
-}
-
-/* 15.2.9.3.2  */
-/*
- * call-seq:
- *   float - other  ->  float
- *
- * Returns a new float which is the difference of <code>float</code>
- * and <code>other</code>.
- */
-
-static mrb_value
-flo_minus(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  return mrb_float_value(mrb, mrb_float(x) - mrb_to_flo(mrb, y));
-}
-
-/* 15.2.9.3.3  */
-/*
- * call-seq:
- *   float * other  ->  float
- *
- * Returns a new float which is the product of <code>float</code>
- * and <code>other</code>.
- */
-
-static mrb_value
-flo_mul(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  return mrb_float_value(mrb, mrb_float(x) * mrb_to_flo(mrb, y));
-}
-
-static void
-flodivmod(mrb_state *mrb, mrb_float x, mrb_float y, mrb_float *divp, mrb_float *modp)
-{
-  mrb_float div;
-  mrb_float mod;
-
-  if (y == 0.0) {
-    if (x == 0.0) {
-      div = NAN;
-    }
-    else {
-      div = INFINITY;
-    }
-    mod = NAN;
-  }
-  else {
-    mod = fmod(x, y);
-    if (isinf(x) && isfinite(y))
-      div = x;
-    else
-      div = (x - mod) / y;
-    if (y*mod < 0) {
-      mod += y;
-      div -= 1.0;
-    }
-  }
-
-  if (modp) *modp = mod;
-  if (divp) *divp = div;
-}
-
-/* 15.2.9.3.5  */
-/*
- *  call-seq:
- *     flt % other        ->  float
- *     flt.modulo(other)  ->  float
- *
- *  Return the modulo after division of <code>flt</code> by <code>other</code>.
- *
- *     6543.21.modulo(137)      #=> 104.21
- *     6543.21.modulo(137.24)   #=> 92.9299999999996
- */
-
-static mrb_value
-flo_mod(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  mrb_float mod;
-
-  mrb_get_args(mrb, "o", &y);
-
-  flodivmod(mrb, mrb_float(x), mrb_to_flo(mrb, y), 0, &mod);
-  return mrb_float_value(mrb, mod);
-}
-
-/* 15.2.8.3.16 */
-/*
- *  call-seq:
- *     num.eql?(numeric)  ->  true or false
- *
- *  Returns <code>true</code> if <i>num</i> and <i>numeric</i> are the
- *  same type and have equal values.
- *
- *     1 == 1.0          #=> true
- *     1.eql?(1.0)       #=> false
- *     (1.0).eql?(1.0)   #=> true
- */
-static mrb_value
-fix_eql(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  if (!mrb_fixnum_p(y)) return mrb_false_value();
-  return mrb_bool_value(mrb_fixnum(x) == mrb_fixnum(y));
-}
-
-static mrb_value
-flo_eql(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  if (!mrb_float_p(y)) return mrb_false_value();
-  return mrb_bool_value(mrb_float(x) == (mrb_float)mrb_fixnum(y));
-}
-
-/* 15.2.9.3.7  */
-/*
- *  call-seq:
- *     flt == obj  ->  true or false
- *
- *  Returns <code>true</code> only if <i>obj</i> has the same value
- *  as <i>flt</i>. Contrast this with <code>Float#eql?</code>, which
- *  requires <i>obj</i> to be a <code>Float</code>.
- *
- *     1.0 == 1   #=> true
- *
- */
-
-static mrb_value
-flo_eq(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  mrb_get_args(mrb, "o", &y);
-
-  switch (mrb_type(y)) {
-  case MRB_TT_FIXNUM:
-    return mrb_bool_value(mrb_float(x) == (mrb_float)mrb_fixnum(y));
-  case MRB_TT_FLOAT:
-    return mrb_bool_value(mrb_float(x) == mrb_float(y));
-  default:
-    return mrb_false_value();
-  }
-}
-
-static int64_t
-value_int64(mrb_state *mrb, mrb_value x)
-{
-  switch (mrb_type(x)) {
-  case MRB_TT_FIXNUM:
-    return (int64_t)mrb_fixnum(x);
-    break;
-  case MRB_TT_FLOAT:
-    return (int64_t)mrb_float(x);
-  default:
-    mrb_raise(mrb, E_TYPE_ERROR, "cannot convert to Integer");
-    break;
-  }
-  /* not reached */
-  return 0;
-}
-
-static mrb_value
-int64_value(mrb_state *mrb, int64_t v)
-{
-  if (FIXABLE(v)) {
-    return mrb_fixnum_value((mrb_int)v);
-  }
-  return mrb_float_value(mrb, (mrb_float)v);
-}
-
-static mrb_value
-flo_rev(mrb_state *mrb, mrb_value x)
-{
-  int64_t v1;
-  mrb_get_args(mrb, "");
-  v1 = (int64_t)mrb_float(x);
-  return int64_value(mrb, ~v1);
-}
-
-static mrb_value
-flo_and(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  int64_t v1, v2;
-  mrb_get_args(mrb, "o", &y);
-
-  v1 = (int64_t)mrb_float(x);
-  v2 = value_int64(mrb, y);
-  return int64_value(mrb, v1 & v2);
-}
-
-static mrb_value
-flo_or(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  int64_t v1, v2;
-  mrb_get_args(mrb, "o", &y);
-
-  v1 = (int64_t)mrb_float(x);
-  v2 = value_int64(mrb, y);
-  return int64_value(mrb, v1 | v2);
-}
-
-static mrb_value
-flo_xor(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  int64_t v1, v2;
-  mrb_get_args(mrb, "o", &y);
-
-  v1 = (int64_t)mrb_float(x);
-  v2 = value_int64(mrb, y);
-  return int64_value(mrb, v1 ^ v2);
-}
-
-static mrb_value
-flo_shift(mrb_state *mrb, mrb_value x, mrb_int width)
-{
-  mrb_float val;
-
-  if (width == 0) {
-    return x;
-  }
-  val = mrb_float(x);
-  if (width < 0) {
-    while (width++) {
-      val /= 2;
-    }
-#if defined(_ISOC99_SOURCE)
-    val = trunc(val);
-#else
-    val = val > 0 ? floor(val) : ceil(val);
-#endif
-    if (val == 0 && mrb_float(x) < 0) {
-      return mrb_fixnum_value(-1);
-    }
-  }
-  else {
-    while (width--) {
-      val *= 2;
-    }
-  }
-  if (FIXABLE_FLOAT(val)) {
-    return mrb_fixnum_value((mrb_int)val);
-  }
-  return mrb_float_value(mrb, val);
-}
-
-static mrb_value
-flo_lshift(mrb_state *mrb, mrb_value x)
-{
-  mrb_int width;
-
-  mrb_get_args(mrb, "i", &width);
-  return flo_shift(mrb, x, -width);
-}
-
-static mrb_value
-flo_rshift(mrb_state *mrb, mrb_value x)
-{
-  mrb_int width;
-
-  mrb_get_args(mrb, "i", &width);
-  return flo_shift(mrb, x, width);
-}
-
-/* 15.2.8.3.18 */
-/*
- * call-seq:
- *   flt.hash  ->  integer
- *
- * Returns a hash code for this float.
- */
-static mrb_value
-flo_hash(mrb_state *mrb, mrb_value num)
-{
-  mrb_float d;
-  char *c;
-  size_t i;
-  mrb_int hash;
-
-  d = (mrb_float)mrb_fixnum(num);
-  /* normalize -0.0 to 0.0 */
-  if (d == 0) d = 0.0;
-  c = (char*)&d;
-  for (hash=0,i=0; i<sizeof(mrb_float); i++) {
-    hash = (hash * 971) ^ (unsigned char)c[i];
-  }
-  if (hash < 0) hash = -hash;
-  return mrb_fixnum_value(hash);
-}
-
-/* 15.2.9.3.13 */
-/*
- * call-seq:
- *   flt.to_f  ->  self
- *
- * As <code>flt</code> is already a float, returns +self+.
- */
-
-static mrb_value
-flo_to_f(mrb_state *mrb, mrb_value num)
-{
-  return num;
-}
-
-/* 15.2.9.3.11 */
-/*
- *  call-seq:
- *     flt.infinite?  ->  nil, -1, +1
- *
- *  Returns <code>nil</code>, -1, or +1 depending on whether <i>flt</i>
- *  is finite, -infinity, or +infinity.
- *
- *     (0.0).infinite?        #=> nil
- *     (-1.0/0.0).infinite?   #=> -1
- *     (+1.0/0.0).infinite?   #=> 1
- */
-
-static mrb_value
-flo_infinite_p(mrb_state *mrb, mrb_value num)
-{
-  mrb_float value = mrb_float(num);
-
-  if (isinf(value)) {
-    return mrb_fixnum_value(value < 0 ? -1 : 1);
-  }
-  return mrb_nil_value();
-}
-
-/* 15.2.9.3.9  */
-/*
- *  call-seq:
- *     flt.finite?  ->  true or false
- *
- *  Returns <code>true</code> if <i>flt</i> is a valid IEEE floating
- *  point number (it is not infinite, and <code>nan?</code> is
- *  <code>false</code>).
- *
- */
-
-static mrb_value
-flo_finite_p(mrb_state *mrb, mrb_value num)
-{
-  return mrb_bool_value(isfinite(mrb_float(num)));
-}
-
-void
-mrb_check_num_exact(mrb_state *mrb, mrb_float num)
-{
-  if (isinf(num)) {
-    mrb_raise(mrb, E_FLOATDOMAIN_ERROR, num < 0 ? "-Infinity" : "Infinity");
-  }
-  if (isnan(num)) {
-    mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN");
-  }
-}
-
-/* 15.2.9.3.10 */
-/*
- *  call-seq:
- *     flt.floor  ->  integer
- *
- *  Returns the largest integer less than or equal to <i>flt</i>.
- *
- *     1.2.floor      #=> 1
- *     2.0.floor      #=> 2
- *     (-1.2).floor   #=> -2
- *     (-2.0).floor   #=> -2
- */
-
-static mrb_value
-flo_floor(mrb_state *mrb, mrb_value num)
-{
-  mrb_float f = floor(mrb_float(num));
-
-  mrb_check_num_exact(mrb, f);
-  if (!FIXABLE_FLOAT(f)) {
-    return mrb_float_value(mrb, f);
-  }
-  return mrb_fixnum_value((mrb_int)f);
-}
-
-/* 15.2.9.3.8  */
-/*
- *  call-seq:
- *     flt.ceil  ->  integer
- *
- *  Returns the smallest <code>Integer</code> greater than or equal to
- *  <i>flt</i>.
- *
- *     1.2.ceil      #=> 2
- *     2.0.ceil      #=> 2
- *     (-1.2).ceil   #=> -1
- *     (-2.0).ceil   #=> -2
- */
-
-static mrb_value
-flo_ceil(mrb_state *mrb, mrb_value num)
-{
-  mrb_float f = ceil(mrb_float(num));
-
-  mrb_check_num_exact(mrb, f);
-  if (!FIXABLE_FLOAT(f)) {
-    return mrb_float_value(mrb, f);
-  }
-  return mrb_fixnum_value((mrb_int)f);
-}
-
-/* 15.2.9.3.12 */
-/*
- *  call-seq:
- *     flt.round([ndigits])  ->  integer or float
- *
- *  Rounds <i>flt</i> to a given precision in decimal digits (default 0 digits).
- *  Precision may be negative.  Returns a floating point number when ndigits
- *  is more than zero.
- *
- *     1.4.round      #=> 1
- *     1.5.round      #=> 2
- *     1.6.round      #=> 2
- *     (-1.5).round   #=> -2
- *
- *     1.234567.round(2)  #=> 1.23
- *     1.234567.round(3)  #=> 1.235
- *     1.234567.round(4)  #=> 1.2346
- *     1.234567.round(5)  #=> 1.23457
- *
- *     34567.89.round(-5) #=> 0
- *     34567.89.round(-4) #=> 30000
- *     34567.89.round(-3) #=> 35000
- *     34567.89.round(-2) #=> 34600
- *     34567.89.round(-1) #=> 34570
- *     34567.89.round(0)  #=> 34568
- *     34567.89.round(1)  #=> 34567.9
- *     34567.89.round(2)  #=> 34567.89
- *     34567.89.round(3)  #=> 34567.89
- *
- */
-
-static mrb_value
-flo_round(mrb_state *mrb, mrb_value num)
-{
-  double number, f;
-  mrb_int ndigits = 0;
-  mrb_int i;
-
-  mrb_get_args(mrb, "|i", &ndigits);
-  number = mrb_float(num);
-
-  if (0 < ndigits && (isinf(number) || isnan(number))) {
-    return num;
-  }
-  mrb_check_num_exact(mrb, number);
-
-  f = 1.0;
-  i = ndigits >= 0 ? ndigits : -ndigits;
-  while  (--i >= 0)
-    f = f*10.0;
-
-  if (isinf(f)) {
-    if (ndigits < 0) number = 0;
-  }
-  else {
-    double d;
-
-    if (ndigits < 0) number /= f;
-    else number *= f;
-
-    /* home-made inline implementation of round(3) */
-    if (number > 0.0) {
-      d = floor(number);
-      number = d + (number - d >= 0.5);
-    }
-    else if (number < 0.0) {
-      d = ceil(number);
-      number = d - (d - number >= 0.5);
-    }
-
-    if (ndigits < 0) number *= f;
-    else number /= f;
-  }
-
-  if (ndigits > 0) {
-    if (!isfinite(number)) return num;
-    return mrb_float_value(mrb, number);
-  }
-  return mrb_fixnum_value((mrb_int)number);
-}
-
-/* 15.2.9.3.14 */
-/* 15.2.9.3.15 */
-/*
- *  call-seq:
- *     flt.to_i      ->  integer
- *     flt.to_int    ->  integer
- *     flt.truncate  ->  integer
- *
- *  Returns <i>flt</i> truncated to an <code>Integer</code>.
- */
-
-static mrb_value
-flo_truncate(mrb_state *mrb, mrb_value num)
-{
-  mrb_float f = mrb_float(num);
-
-  if (f > 0.0) f = floor(f);
-  if (f < 0.0) f = ceil(f);
-
-  mrb_check_num_exact(mrb, f);
-  if (!FIXABLE_FLOAT(f)) {
-    return mrb_float_value(mrb, f);
-  }
-  return mrb_fixnum_value((mrb_int)f);
-}
-
-static mrb_value
-flo_nan_p(mrb_state *mrb, mrb_value num)
-{
-  return mrb_bool_value(isnan(mrb_float(num)));
-}
-
-/*
- * Document-class: Integer
- *
- *  <code>Integer</code> is the basis for the two concrete classes that
- *  hold whole numbers, <code>Bignum</code> and <code>Fixnum</code>.
- *
- */
-
-
-/*
- *  call-seq:
- *     int.to_i      ->  integer
- *     int.to_int    ->  integer
- *
- *  As <i>int</i> is already an <code>Integer</code>, all these
- *  methods simply return the receiver.
- */
-
-static mrb_value
-int_to_i(mrb_state *mrb, mrb_value num)
-{
-  return num;
-}
-
-mrb_value
-mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y)
-{
-  mrb_int a;
-
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
-    mrb_int b, c;
-
-    if (a == 0) return x;
-    b = mrb_fixnum(y);
-    if (mrb_int_mul_overflow(a, b, &c)) {
-      return mrb_float_value(mrb, (mrb_float)a * (mrb_float)b);
-    }
-    return mrb_fixnum_value(c);
-  }
-  return mrb_float_value(mrb, (mrb_float)a * mrb_to_flo(mrb, y));
-}
-
-/* 15.2.8.3.3  */
-/*
- * call-seq:
- *   fix * numeric  ->  numeric_result
- *
- * Performs multiplication: the class of the resulting object depends on
- * the class of <code>numeric</code> and on the magnitude of the
- * result.
- */
-
-static mrb_value
-fix_mul(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  return mrb_fixnum_mul(mrb, x, y);
-}
-
-static void
-fixdivmod(mrb_state *mrb, mrb_int x, mrb_int y, mrb_int *divp, mrb_int *modp)
-{
-  mrb_int div, mod;
-
-  /* TODO: add mrb_assert(y != 0) to make sure */
-
-  if (y < 0) {
-    if (x < 0)
-      div = -x / -y;
-    else
-      div = - (x / -y);
-  }
-  else {
-    if (x < 0)
-      div = - (-x / y);
-    else
-      div = x / y;
-  }
-  mod = x - div*y;
-  if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
-    mod += y;
-    div -= 1;
-  }
-  if (divp) *divp = div;
-  if (modp) *modp = mod;
-}
-
-/* 15.2.8.3.5  */
-/*
- *  call-seq:
- *    fix % other        ->  real
- *    fix.modulo(other)  ->  real
- *
- *  Returns <code>fix</code> modulo <code>other</code>.
- *  See <code>numeric.divmod</code> for more information.
- */
-
-static mrb_value
-fix_mod(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  mrb_int a;
-
-  mrb_get_args(mrb, "o", &y);
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
-    mrb_int b, mod;
-
-    if ((b=mrb_fixnum(y)) == 0) {
-      return mrb_float_value(mrb, NAN);
-    }
-    fixdivmod(mrb, a, b, 0, &mod);
-    return mrb_fixnum_value(mod);
-  }
-  else {
-    mrb_float mod;
-
-    flodivmod(mrb, (mrb_float)a, mrb_to_flo(mrb, y), 0, &mod);
-    return mrb_float_value(mrb, mod);
-  }
-}
-
-/*
- *  call-seq:
- *     fix.divmod(numeric)  ->  array
- *
- *  See <code>Numeric#divmod</code>.
- */
-static mrb_value
-fix_divmod(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-
-  if (mrb_fixnum_p(y)) {
-    mrb_int div, mod;
-
-    if (mrb_fixnum(y) == 0) {
-      return mrb_assoc_new(mrb, ((mrb_fixnum(x) == 0) ?
-                                 mrb_float_value(mrb, NAN):
-                                 mrb_float_value(mrb, INFINITY)),
-                           mrb_float_value(mrb, NAN));
-    }
-    fixdivmod(mrb, mrb_fixnum(x), mrb_fixnum(y), &div, &mod);
-    return mrb_assoc_new(mrb, mrb_fixnum_value(div), mrb_fixnum_value(mod));
-  }
-  else {
-    mrb_float div, mod;
-    mrb_value a, b;
-
-    flodivmod(mrb, (mrb_float)mrb_fixnum(x), mrb_to_flo(mrb, y), &div, &mod);
-    a = mrb_float_value(mrb, div);
-    b = mrb_float_value(mrb, mod);
-    return mrb_assoc_new(mrb, a, b);
-  }
-}
-
-static mrb_value
-flo_divmod(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-  mrb_float div, mod;
-  mrb_value a, b;
-
-  mrb_get_args(mrb, "o", &y);
-
-  flodivmod(mrb, mrb_float(x), mrb_to_flo(mrb, y), &div, &mod);
-  a = mrb_float_value(mrb, div);
-  b = mrb_float_value(mrb, mod);
-  return mrb_assoc_new(mrb, a, b);
-}
-
-/* 15.2.8.3.7  */
-/*
- * call-seq:
- *   fix == other  ->  true or false
- *
- * Return <code>true</code> if <code>fix</code> equals <code>other</code>
- * numerically.
- *
- *   1 == 2      #=> false
- *   1 == 1.0    #=> true
- */
-
-static mrb_value
-fix_equal(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  switch (mrb_type(y)) {
-  case MRB_TT_FIXNUM:
-    return mrb_bool_value(mrb_fixnum(x) == mrb_fixnum(y));
-  case MRB_TT_FLOAT:
-    return mrb_bool_value((mrb_float)mrb_fixnum(x) == mrb_float(y));
-  default:
-    return mrb_false_value();
-  }
-}
-
-/* 15.2.8.3.8  */
-/*
- * call-seq:
- *   ~fix  ->  integer
- *
- * One's complement: returns a number where each bit is flipped.
- *   ex.0---00001 (1)-> 1---11110 (-2)
- *   ex.0---00010 (2)-> 1---11101 (-3)
- *   ex.0---00100 (4)-> 1---11011 (-5)
- */
-
-static mrb_value
-fix_rev(mrb_state *mrb, mrb_value num)
-{
-  mrb_int val = mrb_fixnum(num);
-
-  return mrb_fixnum_value(~val);
-}
-
-static mrb_value flo_and(mrb_state *mrb, mrb_value x);
-static mrb_value flo_or(mrb_state *mrb, mrb_value x);
-static mrb_value flo_xor(mrb_state *mrb, mrb_value x);
-#define bit_op(x,y,op1,op2) do {\
-  if (mrb_fixnum_p(y)) return mrb_fixnum_value(mrb_fixnum(x) op2 mrb_fixnum(y));\
-  return flo_ ## op1(mrb, mrb_float_value(mrb, mrb_fixnum(x)));\
-} while(0)
-
-/* 15.2.8.3.9  */
-/*
- * call-seq:
- *   fix & integer  ->  integer_result
- *
- * Bitwise AND.
- */
-
-static mrb_value
-fix_and(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  bit_op(x, y, and, &);
-}
-
-/* 15.2.8.3.10 */
-/*
- * call-seq:
- *   fix | integer  ->  integer_result
- *
- * Bitwise OR.
- */
-
-static mrb_value
-fix_or(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  bit_op(x, y, or, |);
-}
-
-/* 15.2.8.3.11 */
-/*
- * call-seq:
- *   fix ^ integer  ->  integer_result
- *
- * Bitwise EXCLUSIVE OR.
- */
-
-static mrb_value
-fix_xor(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  bit_op(x, y, or, ^);
-}
-
-#define NUMERIC_SHIFT_WIDTH_MAX (MRB_INT_BIT-1)
-
-static mrb_value
-lshift(mrb_state *mrb, mrb_int val, mrb_int width)
-{
-  if (width < 0) {              /* mrb_int overflow */
-    return mrb_float_value(mrb, INFINITY);
-  }
-  if (val > 0) {
-    if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
-        (val   > (MRB_INT_MAX >> width))) {
-      goto bit_overflow;
-    }
-    return mrb_fixnum_value(val << width);
-  }
-  else {
-    if ((width > NUMERIC_SHIFT_WIDTH_MAX) ||
-        (val   < (MRB_INT_MIN >> width))) {
-      goto bit_overflow;
-    }
-    return mrb_fixnum_value(val * (1u << width));
-  }
-
-bit_overflow:
-  {
-    mrb_float f = (mrb_float)val;
-    while (width--) {
-      f *= 2;
-    }
-    return mrb_float_value(mrb, f);
-  }
-}
-
-static mrb_value
-rshift(mrb_int val, mrb_int width)
-{
-  if (width < 0) {              /* mrb_int overflow */
-    return mrb_fixnum_value(0);
-  }
-  if (width >= NUMERIC_SHIFT_WIDTH_MAX) {
-    if (val < 0) {
-      return mrb_fixnum_value(-1);
-    }
-    return mrb_fixnum_value(0);
-  }
-  return mrb_fixnum_value(val >> width);
-}
-
-/* 15.2.8.3.12 */
-/*
- * call-seq:
- *   fix << count  ->  integer or float
- *
- * Shifts _fix_ left _count_ positions (right if _count_ is negative).
- */
-
-static mrb_value
-fix_lshift(mrb_state *mrb, mrb_value x)
-{
-  mrb_int width, val;
-
-  mrb_get_args(mrb, "i", &width);
-  if (width == 0) {
-    return x;
-  }
-  val = mrb_fixnum(x);
-  if (val == 0) return x;
-  if (width < 0) {
-    return rshift(val, -width);
-  }
-  return lshift(mrb, val, width);
-}
-
-/* 15.2.8.3.13 */
-/*
- * call-seq:
- *   fix >> count  ->  integer or float
- *
- * Shifts _fix_ right _count_ positions (left if _count_ is negative).
- */
-
-static mrb_value
-fix_rshift(mrb_state *mrb, mrb_value x)
-{
-  mrb_int width, val;
-
-  mrb_get_args(mrb, "i", &width);
-  if (width == 0) {
-    return x;
-  }
-  val = mrb_fixnum(x);
-  if (val == 0) return x;
-  if (width < 0) {
-    return lshift(mrb, val, -width);
-  }
-  return rshift(val, width);
-}
-
-/* 15.2.8.3.23 */
-/*
- *  call-seq:
- *     fix.to_f  ->  float
- *
- *  Converts <i>fix</i> to a <code>Float</code>.
- *
- */
-
-static mrb_value
-fix_to_f(mrb_state *mrb, mrb_value num)
-{
-  return mrb_float_value(mrb, (mrb_float)mrb_fixnum(num));
-}
-
-/*
- *  Document-class: FloatDomainError
- *
- *  Raised when attempting to convert special float values
- *  (in particular infinite or NaN)
- *  to numerical classes which don't support them.
- *
- *     Float::INFINITY.to_r
- *
- *  <em>raises the exception:</em>
- *
- *     FloatDomainError: Infinity
- */
-/* ------------------------------------------------------------------------*/
-MRB_API mrb_value
-mrb_flo_to_fixnum(mrb_state *mrb, mrb_value x)
-{
-  mrb_int z = 0;
-
-  if (!mrb_float_p(x)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "non float value");
-    z = 0; /* not reached. just suppress warnings. */
-  }
-  else {
-    mrb_float d = mrb_float(x);
-
-    if (isinf(d)) {
-      mrb_raise(mrb, E_FLOATDOMAIN_ERROR, d < 0 ? "-Infinity" : "Infinity");
-    }
-    if (isnan(d)) {
-      mrb_raise(mrb, E_FLOATDOMAIN_ERROR, "NaN");
-    }
-    if (FIXABLE_FLOAT(d)) {
-      z = (mrb_int)d;
-    }
-    else {
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "number (%S) too big for integer", x);
-    }
-  }
-  return mrb_fixnum_value(z);
-}
-
-mrb_value
-mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y)
-{
-  mrb_int a;
-
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
-    mrb_int b, c;
-
-    if (a == 0) return y;
-    b = mrb_fixnum(y);
-    if (mrb_int_add_overflow(a, b, &c)) {
-      return mrb_float_value(mrb, (mrb_float)a + (mrb_float)b);
-    }
-    return mrb_fixnum_value(c);
-  }
-  return mrb_float_value(mrb, (mrb_float)a + mrb_to_flo(mrb, y));
-}
-
-/* 15.2.8.3.1  */
-/*
- * call-seq:
- *   fix + numeric  ->  numeric_result
- *
- * Performs addition: the class of the resulting object depends on
- * the class of <code>numeric</code> and on the magnitude of the
- * result.
- */
-static mrb_value
-fix_plus(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-
-  mrb_get_args(mrb, "o", &other);
-  return mrb_fixnum_plus(mrb, self, other);
-}
-
-mrb_value
-mrb_fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y)
-{
-  mrb_int a;
-
-  a = mrb_fixnum(x);
-  if (mrb_fixnum_p(y)) {
-    mrb_int b, c;
-
-    b = mrb_fixnum(y);
-    if (mrb_int_sub_overflow(a, b, &c)) {
-      return mrb_float_value(mrb, (mrb_float)a - (mrb_float)b);
-    }
-    return mrb_fixnum_value(c);
-  }
-  return mrb_float_value(mrb, (mrb_float)a - mrb_to_flo(mrb, y));
-}
-
-/* 15.2.8.3.2  */
-/* 15.2.8.3.16 */
-/*
- * call-seq:
- *   fix - numeric  ->  numeric_result
- *
- * Performs subtraction: the class of the resulting object depends on
- * the class of <code>numeric</code> and on the magnitude of the
- * result.
- */
-static mrb_value
-fix_minus(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-
-  mrb_get_args(mrb, "o", &other);
-  return mrb_fixnum_minus(mrb, self, other);
-}
-
-
-MRB_API mrb_value
-mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, int base)
-{
-  char buf[MRB_INT_BIT+1];
-  char *b = buf + sizeof buf;
-  mrb_int val = mrb_fixnum(x);
-
-  if (base < 2 || 36 < base) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid radix %S", mrb_fixnum_value(base));
-  }
-
-  if (val == 0) {
-    *--b = '0';
-  }
-  else if (val < 0) {
-    do {
-      *--b = mrb_digitmap[-(val % base)];
-    } while (val /= base);
-    *--b = '-';
-  }
-  else {
-    do {
-      *--b = mrb_digitmap[(int)(val % base)];
-    } while (val /= base);
-  }
-
-  return mrb_str_new(mrb, b, buf + sizeof(buf) - b);
-}
-
-/* 15.2.8.3.25 */
-/*
- *  call-seq:
- *     fix.to_s(base=10)  ->  string
- *
- *  Returns a string containing the representation of <i>fix</i> radix
- *  <i>base</i> (between 2 and 36).
- *
- *     12345.to_s       #=> "12345"
- *     12345.to_s(2)    #=> "11000000111001"
- *     12345.to_s(8)    #=> "30071"
- *     12345.to_s(10)   #=> "12345"
- *     12345.to_s(16)   #=> "3039"
- *     12345.to_s(36)   #=> "9ix"
- *
- */
-static mrb_value
-fix_to_s(mrb_state *mrb, mrb_value self)
-{
-  mrb_int base = 10;
-
-  mrb_get_args(mrb, "|i", &base);
-  return mrb_fixnum_to_str(mrb, self, base);
-}
-
-/* 15.2.9.3.6  */
-/*
- * call-seq:
- *     self.f <=> other.f    => -1, 0, +1
- *             <  => -1
- *             =  =>  0
- *             >  => +1
- *  Comparison---Returns -1, 0, or +1 depending on whether <i>fix</i> is
- *  less than, equal to, or greater than <i>numeric</i>. This is the
- *  basis for the tests in <code>Comparable</code>.
- */
-static mrb_value
-num_cmp(mrb_state *mrb, mrb_value self)
-{
-  mrb_value other;
-  mrb_float x, y;
-
-  mrb_get_args(mrb, "o", &other);
-
-  x = mrb_to_flo(mrb, self);
-  switch (mrb_type(other)) {
-  case MRB_TT_FIXNUM:
-    y = (mrb_float)mrb_fixnum(other);
-    break;
-  case MRB_TT_FLOAT:
-    y = mrb_float(other);
-    break;
-  default:
-    return mrb_nil_value();
-  }
-  if (x > y)
-    return mrb_fixnum_value(1);
-  else {
-    if (x < y)
-      return mrb_fixnum_value(-1);
-    return mrb_fixnum_value(0);
-  }
-}
-
-/* 15.2.9.3.1  */
-/*
- * call-seq:
- *   float + other  ->  float
- *
- * Returns a new float which is the sum of <code>float</code>
- * and <code>other</code>.
- */
-static mrb_value
-flo_plus(mrb_state *mrb, mrb_value x)
-{
-  mrb_value y;
-
-  mrb_get_args(mrb, "o", &y);
-  return mrb_float_value(mrb, mrb_float(x) + mrb_to_flo(mrb, y));
-}
-
-/* ------------------------------------------------------------------------*/
-void
-mrb_init_numeric(mrb_state *mrb)
-{
-  struct RClass *numeric, *integer, *fixnum, *fl;
-
-  /* Numeric Class */
-  numeric = mrb_define_class(mrb, "Numeric",  mrb->object_class);                /* 15.2.7 */
-
-  mrb_define_method(mrb, numeric, "**",       num_pow,         MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, numeric, "/",        num_div,         MRB_ARGS_REQ(1)); /* 15.2.8.3.4  */
-  mrb_define_method(mrb, numeric, "quo",      num_div,         MRB_ARGS_REQ(1)); /* 15.2.7.4.5 (x) */
-  mrb_define_method(mrb, numeric, "<=>",      num_cmp,         MRB_ARGS_REQ(1)); /* 15.2.9.3.6  */
-
-  /* Integer Class */
-  integer = mrb_define_class(mrb, "Integer",  numeric);                          /* 15.2.8 */
-  MRB_SET_INSTANCE_TT(integer, MRB_TT_FIXNUM);
-  mrb_undef_class_method(mrb, integer, "new");
-  mrb_define_method(mrb, integer, "to_i",     int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.24 */
-  mrb_define_method(mrb, integer, "to_int",   int_to_i,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, integer, "ceil",     int_to_i,        MRB_ARGS_REQ(1)); /* 15.2.8.3.8 (x) */
-  mrb_define_method(mrb, integer, "floor",    int_to_i,        MRB_ARGS_REQ(1)); /* 15.2.8.3.10 (x) */
-  mrb_define_method(mrb, integer, "round",    int_to_i,        MRB_ARGS_REQ(1)); /* 15.2.8.3.12 (x) */
-  mrb_define_method(mrb, integer, "truncate", int_to_i,        MRB_ARGS_REQ(1)); /* 15.2.8.3.15 (x) */
-
-  /* Fixnum Class */
-  mrb->fixnum_class = fixnum = mrb_define_class(mrb, "Fixnum", integer);
-  mrb_define_method(mrb, fixnum,  "+",        fix_plus,        MRB_ARGS_REQ(1)); /* 15.2.8.3.1  */
-  mrb_define_method(mrb, fixnum,  "-",        fix_minus,       MRB_ARGS_REQ(1)); /* 15.2.8.3.2  */
-  mrb_define_method(mrb, fixnum,  "*",        fix_mul,         MRB_ARGS_REQ(1)); /* 15.2.8.3.3  */
-  mrb_define_method(mrb, fixnum,  "%",        fix_mod,         MRB_ARGS_REQ(1)); /* 15.2.8.3.5  */
-  mrb_define_method(mrb, fixnum,  "==",       fix_equal,       MRB_ARGS_REQ(1)); /* 15.2.8.3.7  */
-  mrb_define_method(mrb, fixnum,  "~",        fix_rev,         MRB_ARGS_NONE()); /* 15.2.8.3.8  */
-  mrb_define_method(mrb, fixnum,  "&",        fix_and,         MRB_ARGS_REQ(1)); /* 15.2.8.3.9  */
-  mrb_define_method(mrb, fixnum,  "|",        fix_or,          MRB_ARGS_REQ(1)); /* 15.2.8.3.10 */
-  mrb_define_method(mrb, fixnum,  "^",        fix_xor,         MRB_ARGS_REQ(1)); /* 15.2.8.3.11 */
-  mrb_define_method(mrb, fixnum,  "<<",       fix_lshift,      MRB_ARGS_REQ(1)); /* 15.2.8.3.12 */
-  mrb_define_method(mrb, fixnum,  ">>",       fix_rshift,      MRB_ARGS_REQ(1)); /* 15.2.8.3.13 */
-  mrb_define_method(mrb, fixnum,  "eql?",     fix_eql,         MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
-  mrb_define_method(mrb, fixnum,  "hash",     flo_hash,        MRB_ARGS_NONE()); /* 15.2.8.3.18 */
-  mrb_define_method(mrb, fixnum,  "to_f",     fix_to_f,        MRB_ARGS_NONE()); /* 15.2.8.3.23 */
-  mrb_define_method(mrb, fixnum,  "to_s",     fix_to_s,        MRB_ARGS_NONE()); /* 15.2.8.3.25 */
-  mrb_define_method(mrb, fixnum,  "inspect",  fix_to_s,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, fixnum,  "divmod",   fix_divmod,      MRB_ARGS_REQ(1)); /* 15.2.8.3.30 (x) */
-
-  /* Float Class */
-  mrb->float_class = fl = mrb_define_class(mrb, "Float", numeric);                 /* 15.2.9 */
-  MRB_SET_INSTANCE_TT(fl, MRB_TT_FLOAT);
-  mrb_undef_class_method(mrb,  fl, "new");
-  mrb_define_method(mrb, fl,      "+",         flo_plus,       MRB_ARGS_REQ(1)); /* 15.2.9.3.1  */
-  mrb_define_method(mrb, fl,      "-",         flo_minus,      MRB_ARGS_REQ(1)); /* 15.2.9.3.2  */
-  mrb_define_method(mrb, fl,      "*",         flo_mul,        MRB_ARGS_REQ(1)); /* 15.2.9.3.3  */
-  mrb_define_method(mrb, fl,      "%",         flo_mod,        MRB_ARGS_REQ(1)); /* 15.2.9.3.5  */
-  mrb_define_method(mrb, fl,      "==",        flo_eq,         MRB_ARGS_REQ(1)); /* 15.2.9.3.7  */
-  mrb_define_method(mrb, fl,      "~",         flo_rev,        MRB_ARGS_NONE());
-  mrb_define_method(mrb, fl,      "&",         flo_and,        MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      "|",         flo_or,         MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      "^",         flo_xor,        MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      ">>",        flo_lshift,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      "<<",        flo_rshift,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      "ceil",      flo_ceil,       MRB_ARGS_NONE()); /* 15.2.9.3.8  */
-  mrb_define_method(mrb, fl,      "finite?",   flo_finite_p,   MRB_ARGS_NONE()); /* 15.2.9.3.9  */
-  mrb_define_method(mrb, fl,      "floor",     flo_floor,      MRB_ARGS_NONE()); /* 15.2.9.3.10 */
-  mrb_define_method(mrb, fl,      "infinite?", flo_infinite_p, MRB_ARGS_NONE()); /* 15.2.9.3.11 */
-  mrb_define_method(mrb, fl,      "round",     flo_round,      MRB_ARGS_OPT(1)); /* 15.2.9.3.12 */
-  mrb_define_method(mrb, fl,      "to_f",      flo_to_f,       MRB_ARGS_NONE()); /* 15.2.9.3.13 */
-  mrb_define_method(mrb, fl,      "to_i",      flo_truncate,   MRB_ARGS_NONE()); /* 15.2.9.3.14 */
-  mrb_define_method(mrb, fl,      "to_int",    flo_truncate,   MRB_ARGS_NONE());
-  mrb_define_method(mrb, fl,      "truncate",  flo_truncate,   MRB_ARGS_NONE()); /* 15.2.9.3.15 */
-  mrb_define_method(mrb, fl,      "divmod",    flo_divmod,     MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, fl,      "eql?",      flo_eql,        MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
-
-  mrb_define_method(mrb, fl,      "to_s",      flo_to_s,       MRB_ARGS_NONE()); /* 15.2.9.3.16(x) */
-  mrb_define_method(mrb, fl,      "inspect",   flo_to_s,       MRB_ARGS_NONE());
-  mrb_define_method(mrb, fl,      "nan?",      flo_nan_p,      MRB_ARGS_NONE());
-
-#ifdef INFINITY
-  mrb_define_const(mrb, fl, "INFINITY", mrb_float_value(mrb, INFINITY));
-#endif
-#ifdef NAN
-  mrb_define_const(mrb, fl, "NAN", mrb_float_value(mrb, NAN));
-#endif
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/object.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/object.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/object.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/object.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,610 +0,0 @@
-/*
-** object.c - Object, NilClass, TrueClass, FalseClass class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/numeric.h>
-#include <mruby/string.h>
-#include <mruby/class.h>
-
-MRB_API mrb_bool
-mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
-{
-  if (mrb_type(v1) != mrb_type(v2)) return FALSE;
-  switch (mrb_type(v1)) {
-  case MRB_TT_TRUE:
-    return TRUE;
-
-  case MRB_TT_FALSE:
-  case MRB_TT_FIXNUM:
-    return (mrb_fixnum(v1) == mrb_fixnum(v2));
-  case MRB_TT_SYMBOL:
-    return (mrb_symbol(v1) == mrb_symbol(v2));
-
-  case MRB_TT_FLOAT:
-    return (mrb_float(v1) == mrb_float(v2));
-
-  default:
-    return (mrb_ptr(v1) == mrb_ptr(v2));
-  }
-}
-
-MRB_API mrb_bool
-mrb_obj_equal(mrb_state *mrb, mrb_value v1, mrb_value v2)
-{
-  /* temporary definition */
-  return mrb_obj_eq(mrb, v1, v2);
-}
-
-MRB_API mrb_bool
-mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2)
-{
-  mrb_value result;
-
-  if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE;
-  result = mrb_funcall(mrb, obj1, "==", 1, obj2);
-  if (mrb_test(result)) return TRUE;
-  return FALSE;
-}
-
-/*
- * Document-class: NilClass
- *
- *  The class of the singleton object <code>nil</code>.
- */
-
-/* 15.2.4.3.4  */
-/*
- * call_seq:
- *   nil.nil?               -> true
- *
- * Only the object <i>nil</i> responds <code>true</code> to <code>nil?</code>.
- */
-
-static mrb_value
-mrb_true(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_true_value();
-}
-
-/* 15.2.4.3.5  */
-/*
- *  call-seq:
- *     nil.to_s    -> ""
- *
- *  Always returns the empty string.
- */
-
-static mrb_value
-nil_to_s(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_str_new(mrb, 0, 0);
-}
-
-static mrb_value
-nil_inspect(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_str_new_lit(mrb, "nil");
-}
-
-/***********************************************************************
- *  Document-class: TrueClass
- *
- *  The global value <code>true</code> is the only instance of class
- *  <code>TrueClass</code> and represents a logically true value in
- *  boolean expressions. The class provides operators allowing
- *  <code>true</code> to be used in logical expressions.
- */
-
-/* 15.2.5.3.1  */
-/*
- *  call-seq:
- *     true & obj    -> true or false
- *
- *  And---Returns <code>false</code> if <i>obj</i> is
- *  <code>nil</code> or <code>false</code>, <code>true</code> otherwise.
- */
-
-static mrb_value
-true_and(mrb_state *mrb, mrb_value obj)
-{
-  mrb_bool obj2;
-
-  mrb_get_args(mrb, "b", &obj2);
-
-  return mrb_bool_value(obj2);
-}
-
-/* 15.2.5.3.2  */
-/*
- *  call-seq:
- *     true ^ obj   -> !obj
- *
- *  Exclusive Or---Returns <code>true</code> if <i>obj</i> is
- *  <code>nil</code> or <code>false</code>, <code>false</code>
- *  otherwise.
- */
-
-static mrb_value
-true_xor(mrb_state *mrb, mrb_value obj)
-{
-  mrb_bool obj2;
-
-  mrb_get_args(mrb, "b", &obj2);
-  return mrb_bool_value(!obj2);
-}
-
-/* 15.2.5.3.3  */
-/*
- * call-seq:
- *   true.to_s   ->  "true"
- *
- * The string representation of <code>true</code> is "true".
- */
-
-static mrb_value
-true_to_s(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_str_new_lit(mrb, "true");
-}
-
-/* 15.2.5.3.4  */
-/*
- *  call-seq:
- *     true | obj   -> true
- *
- *  Or---Returns <code>true</code>. As <i>anObject</i> is an argument to
- *  a method call, it is always evaluated; there is no short-circuit
- *  evaluation in this case.
- *
- *     true |  puts("or")
- *     true || puts("logical or")
- *
- *  <em>produces:</em>
- *
- *     or
- */
-
-static mrb_value
-true_or(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_true_value();
-}
-
-/*
- *  Document-class: FalseClass
- *
- *  The global value <code>false</code> is the only instance of class
- *  <code>FalseClass</code> and represents a logically false value in
- *  boolean expressions. The class provides operators allowing
- *  <code>false</code> to participate correctly in logical expressions.
- *
- */
-
-/* 15.2.4.3.1  */
-/* 15.2.6.3.1  */
-/*
- *  call-seq:
- *     false & obj   -> false
- *     nil & obj     -> false
- *
- *  And---Returns <code>false</code>. <i>obj</i> is always
- *  evaluated as it is the argument to a method call---there is no
- *  short-circuit evaluation in this case.
- */
-
-static mrb_value
-false_and(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_false_value();
-}
-
-/* 15.2.4.3.2  */
-/* 15.2.6.3.2  */
-/*
- *  call-seq:
- *     false ^ obj    -> true or false
- *     nil   ^ obj    -> true or false
- *
- *  Exclusive Or---If <i>obj</i> is <code>nil</code> or
- *  <code>false</code>, returns <code>false</code>; otherwise, returns
- *  <code>true</code>.
- *
- */
-
-static mrb_value
-false_xor(mrb_state *mrb, mrb_value obj)
-{
-  mrb_bool obj2;
-
-  mrb_get_args(mrb, "b", &obj2);
-  return mrb_bool_value(obj2);
-}
-
-/* 15.2.4.3.3  */
-/* 15.2.6.3.4  */
-/*
- *  call-seq:
- *     false | obj   ->   true or false
- *     nil   | obj   ->   true or false
- *
- *  Or---Returns <code>false</code> if <i>obj</i> is
- *  <code>nil</code> or <code>false</code>; <code>true</code> otherwise.
- */
-
-static mrb_value
-false_or(mrb_state *mrb, mrb_value obj)
-{
-  mrb_bool obj2;
-
-  mrb_get_args(mrb, "b", &obj2);
-  return mrb_bool_value(obj2);
-}
-
-/* 15.2.6.3.3  */
-/*
- * call-seq:
- *   false.to_s   ->  "false"
- *
- * 'nuf said...
- */
-
-static mrb_value
-false_to_s(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_str_new_lit(mrb, "false");
-}
-
-void
-mrb_init_object(mrb_state *mrb)
-{
-  struct RClass *n;
-  struct RClass *t;
-  struct RClass *f;
-
-  mrb->nil_class   = n = mrb_define_class(mrb, "NilClass",   mrb->object_class);
-  MRB_SET_INSTANCE_TT(n, MRB_TT_TRUE);
-  mrb_undef_class_method(mrb, n, "new");
-  mrb_define_method(mrb, n, "&",    false_and,      MRB_ARGS_REQ(1));  /* 15.2.4.3.1  */
-  mrb_define_method(mrb, n, "^",    false_xor,      MRB_ARGS_REQ(1));  /* 15.2.4.3.2  */
-  mrb_define_method(mrb, n, "|",    false_or,       MRB_ARGS_REQ(1));  /* 15.2.4.3.3  */
-  mrb_define_method(mrb, n, "nil?", mrb_true,       MRB_ARGS_NONE());  /* 15.2.4.3.4  */
-  mrb_define_method(mrb, n, "to_s", nil_to_s,       MRB_ARGS_NONE());  /* 15.2.4.3.5  */
-  mrb_define_method(mrb, n, "inspect", nil_inspect, MRB_ARGS_NONE());
-
-  mrb->true_class  = t = mrb_define_class(mrb, "TrueClass",  mrb->object_class);
-  MRB_SET_INSTANCE_TT(t, MRB_TT_TRUE);
-  mrb_undef_class_method(mrb, t, "new");
-  mrb_define_method(mrb, t, "&",    true_and,       MRB_ARGS_REQ(1));  /* 15.2.5.3.1  */
-  mrb_define_method(mrb, t, "^",    true_xor,       MRB_ARGS_REQ(1));  /* 15.2.5.3.2  */
-  mrb_define_method(mrb, t, "to_s", true_to_s,      MRB_ARGS_NONE());  /* 15.2.5.3.3  */
-  mrb_define_method(mrb, t, "|",    true_or,        MRB_ARGS_REQ(1));  /* 15.2.5.3.4  */
-  mrb_define_method(mrb, t, "inspect", true_to_s,   MRB_ARGS_NONE());
-
-  mrb->false_class = f = mrb_define_class(mrb, "FalseClass", mrb->object_class);
-  MRB_SET_INSTANCE_TT(f, MRB_TT_TRUE);
-  mrb_undef_class_method(mrb, f, "new");
-  mrb_define_method(mrb, f, "&",    false_and,      MRB_ARGS_REQ(1));  /* 15.2.6.3.1  */
-  mrb_define_method(mrb, f, "^",    false_xor,      MRB_ARGS_REQ(1));  /* 15.2.6.3.2  */
-  mrb_define_method(mrb, f, "to_s", false_to_s,     MRB_ARGS_NONE());  /* 15.2.6.3.3  */
-  mrb_define_method(mrb, f, "|",    false_or,       MRB_ARGS_REQ(1));  /* 15.2.6.3.4  */
-  mrb_define_method(mrb, f, "inspect", false_to_s,  MRB_ARGS_NONE());
-}
-
-static mrb_value
-inspect_type(mrb_state *mrb, mrb_value val)
-{
-  if (mrb_type(val) == MRB_TT_FALSE || mrb_type(val) == MRB_TT_TRUE) {
-    return mrb_inspect(mrb, val);
-  }
-  else {
-    return mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, val));
-  }
-}
-
-static mrb_value
-convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *method, mrb_bool raise)
-{
-  mrb_sym m = 0;
-
-  m = mrb_intern_cstr(mrb, method);
-  if (!mrb_respond_to(mrb, val, m)) {
-    if (raise) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", inspect_type(mrb, val), mrb_str_new_cstr(mrb, tname));
-    }
-    return mrb_nil_value();
-  }
-  return mrb_funcall_argv(mrb, val, m, 0, 0);
-}
-
-MRB_API mrb_value
-mrb_check_to_integer(mrb_state *mrb, mrb_value val, const char *method)
-{
-  mrb_value v;
-
-  if (mrb_fixnum_p(val)) return val;
-  v = convert_type(mrb, val, "Integer", method, FALSE);
-  if (mrb_nil_p(v) || !mrb_fixnum_p(v)) {
-    return mrb_nil_value();
-  }
-  return v;
-}
-
-MRB_API mrb_value
-mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method)
-{
-  mrb_value v;
-
-  if (mrb_type(val) == type) return val;
-  v = convert_type(mrb, val, tname, method, TRUE);
-  if (mrb_type(v) != type) {
-    mrb_raisef(mrb, E_TYPE_ERROR, "%S cannot be converted to %S by #%S", val,
-               mrb_str_new_cstr(mrb, tname), mrb_str_new_cstr(mrb, method));
-  }
-  return v;
-}
-
-MRB_API mrb_value
-mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method)
-{
-  mrb_value v;
-
-  if (mrb_type(val) == type && type != MRB_TT_DATA && type != MRB_TT_ISTRUCT) return val;
-  v = convert_type(mrb, val, tname, method, FALSE);
-  if (mrb_nil_p(v) || mrb_type(v) != type) return mrb_nil_value();
-  return v;
-}
-
-static const struct types {
-  unsigned char type;
-  const char *name;
-} builtin_types[] = {
-/*    {MRB_TT_NIL,  "nil"}, */
-  {MRB_TT_FALSE,  "false"},
-  {MRB_TT_TRUE,   "true"},
-  {MRB_TT_FIXNUM, "Fixnum"},
-  {MRB_TT_SYMBOL, "Symbol"},  /* :symbol */
-  {MRB_TT_MODULE, "Module"},
-  {MRB_TT_OBJECT, "Object"},
-  {MRB_TT_CLASS,  "Class"},
-  {MRB_TT_ICLASS, "iClass"},  /* internal use: mixed-in module holder */
-  {MRB_TT_SCLASS, "SClass"},
-  {MRB_TT_PROC,   "Proc"},
-  {MRB_TT_FLOAT,  "Float"},
-  {MRB_TT_ARRAY,  "Array"},
-  {MRB_TT_HASH,   "Hash"},
-  {MRB_TT_STRING, "String"},
-  {MRB_TT_RANGE,  "Range"},
-/*    {MRB_TT_BIGNUM,  "Bignum"}, */
-  {MRB_TT_FILE,   "File"},
-  {MRB_TT_DATA,   "Data"},  /* internal use: wrapped C pointers */
-/*    {MRB_TT_VARMAP,  "Varmap"}, */ /* internal use: dynamic variables */
-/*    {MRB_TT_NODE,  "Node"}, */ /* internal use: syntax tree node */
-/*    {MRB_TT_UNDEF,  "undef"}, */ /* internal use: #undef; should not happen */
-  {MRB_TT_MAXDEFINE,  0}
-};
-
-MRB_API void
-mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t)
-{
-  const struct types *type = builtin_types;
-  enum mrb_vtype xt;
-
-  xt = mrb_type(x);
-  if ((xt != t) || (xt == MRB_TT_DATA) || (xt == MRB_TT_ISTRUCT)) {
-    while (type->type < MRB_TT_MAXDEFINE) {
-      if (type->type == t) {
-        const char *etype;
-
-        if (mrb_nil_p(x)) {
-          etype = "nil";
-        }
-        else if (mrb_fixnum_p(x)) {
-          etype = "Fixnum";
-        }
-        else if (mrb_type(x) == MRB_TT_SYMBOL) {
-          etype = "Symbol";
-        }
-        else if (mrb_immediate_p(x)) {
-          etype = RSTRING_PTR(mrb_obj_as_string(mrb, x));
-        }
-        else {
-          etype = mrb_obj_classname(mrb, x);
-        }
-        mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %S (expected %S)",
-                   mrb_str_new_cstr(mrb, etype), mrb_str_new_cstr(mrb, type->name));
-      }
-      type++;
-    }
-    mrb_raisef(mrb, E_TYPE_ERROR, "unknown type %S (%S given)",
-               mrb_fixnum_value(t), mrb_fixnum_value(mrb_type(x)));
-  }
-}
-
-/* 15.3.1.3.46 */
-/*
- *  call-seq:
- *     obj.to_s    => string
- *
- *  Returns a string representing <i>obj</i>. The default
- *  <code>to_s</code> prints the object's class and an encoding of the
- *  object id. As a special case, the top-level object that is the
- *  initial execution context of Ruby programs returns "main."
- */
-
-MRB_API mrb_value
-mrb_any_to_s(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value str = mrb_str_buf_new(mrb, 20);
-  const char *cname = mrb_obj_classname(mrb, obj);
-
-  mrb_str_cat_lit(mrb, str, "#<");
-  mrb_str_cat_cstr(mrb, str, cname);
-  mrb_str_cat_lit(mrb, str, ":");
-  mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_ptr(obj)));
-  mrb_str_cat_lit(mrb, str, ">");
-
-  return str;
-}
-
-/*
- *  call-seq:
- *     obj.is_a?(class)       => true or false
- *     obj.kind_of?(class)    => true or false
- *
- *  Returns <code>true</code> if <i>class</i> is the class of
- *  <i>obj</i>, or if <i>class</i> is one of the superclasses of
- *  <i>obj</i> or modules included in <i>obj</i>.
- *
- *     module M;    end
- *     class A
- *       include M
- *     end
- *     class B < A; end
- *     class C < B; end
- *     b = B.new
- *     b.instance_of? A   #=> false
- *     b.instance_of? B   #=> true
- *     b.instance_of? C   #=> false
- *     b.instance_of? M   #=> false
- *     b.kind_of? A       #=> true
- *     b.kind_of? B       #=> true
- *     b.kind_of? C       #=> false
- *     b.kind_of? M       #=> true
- */
-
-MRB_API mrb_bool
-mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c)
-{
-  struct RClass *cl = mrb_class(mrb, obj);
-
-  switch (c->tt) {
-    case MRB_TT_MODULE:
-    case MRB_TT_CLASS:
-    case MRB_TT_ICLASS:
-    case MRB_TT_SCLASS:
-      break;
-
-    default:
-      mrb_raise(mrb, E_TYPE_ERROR, "class or module required");
-  }
-
-  MRB_CLASS_ORIGIN(c);
-  while (cl) {
-    if (cl == c || cl->mt == c->mt)
-      return TRUE;
-    cl = cl->super;
-  }
-  return FALSE;
-}
-
-static mrb_value
-mrb_to_integer(mrb_state *mrb, mrb_value val, const char *method)
-{
-  mrb_value v;
-
-  if (mrb_fixnum_p(val)) return val;
-  v = convert_type(mrb, val, "Integer", method, TRUE);
-  if (!mrb_obj_is_kind_of(mrb, v, mrb->fixnum_class)) {
-    mrb_value type = inspect_type(mrb, val);
-    mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S to Integer (%S#%S gives %S)",
-               type, type, mrb_str_new_cstr(mrb, method), inspect_type(mrb, v));
-  }
-  return v;
-}
-
-MRB_API mrb_value
-mrb_to_int(mrb_state *mrb, mrb_value val)
-{
-  return mrb_to_integer(mrb, val, "to_int");
-}
-
-MRB_API mrb_value
-mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
-{
-  mrb_value tmp;
-
-  if (mrb_nil_p(val)) {
-    if (base != 0) goto arg_error;
-      mrb_raise(mrb, E_TYPE_ERROR, "can't convert nil into Integer");
-  }
-  switch (mrb_type(val)) {
-    case MRB_TT_FLOAT:
-      if (base != 0) goto arg_error;
-      else {
-        mrb_float f = mrb_float(val);
-        if (FIXABLE_FLOAT(f)) {
-          break;
-        }
-      }
-      return mrb_flo_to_fixnum(mrb, val);
-
-    case MRB_TT_FIXNUM:
-      if (base != 0) goto arg_error;
-      return val;
-
-    case MRB_TT_STRING:
-    string_conv:
-      return mrb_str_to_inum(mrb, val, base, TRUE);
-
-    default:
-      break;
-  }
-  if (base != 0) {
-    tmp = mrb_check_string_type(mrb, val);
-    if (!mrb_nil_p(tmp)) {
-      val = tmp;
-      goto string_conv;
-    }
-arg_error:
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "base specified for non string value");
-  }
-  tmp = convert_type(mrb, val, "Integer", "to_int", FALSE);
-  if (mrb_nil_p(tmp)) {
-    return mrb_to_integer(mrb, val, "to_i");
-  }
-  return tmp;
-}
-
-MRB_API mrb_value
-mrb_Integer(mrb_state *mrb, mrb_value val)
-{
-  return mrb_convert_to_integer(mrb, val, 0);
-}
-
-MRB_API mrb_value
-mrb_Float(mrb_state *mrb, mrb_value val)
-{
-  if (mrb_nil_p(val)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "can't convert nil into Float");
-  }
-  switch (mrb_type(val)) {
-    case MRB_TT_FIXNUM:
-      return mrb_float_value(mrb, (mrb_float)mrb_fixnum(val));
-
-    case MRB_TT_FLOAT:
-      return val;
-
-    case MRB_TT_STRING:
-      return mrb_float_value(mrb, mrb_str_to_dbl(mrb, val, TRUE));
-
-    default:
-      return mrb_convert_type(mrb, val, MRB_TT_FLOAT, "Float", "to_f");
-  }
-}
-
-MRB_API mrb_value
-mrb_inspect(mrb_state *mrb, mrb_value obj)
-{
-  return mrb_obj_as_string(mrb, mrb_funcall(mrb, obj, "inspect", 0));
-}
-
-MRB_API mrb_bool
-mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2)
-{
-  if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE;
-  return mrb_test(mrb_funcall(mrb, obj1, "eql?", 1, obj2));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/opcode.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/opcode.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/opcode.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/opcode.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-/* this header file is to be removed soon. */
-#include <mruby/opcode.h>
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/pool.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/pool.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/pool.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/pool.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-/*
-** pool.c - memory pool
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <mruby.h>
-
-/* configuration section */
-/* allocated memory address should be multiple of POOL_ALIGNMENT */
-/* or undef it if alignment does not matter */
-#ifndef POOL_ALIGNMENT
-#if INTPTR_MAX == INT64_MAX
-#define POOL_ALIGNMENT 8
-#else
-#define POOL_ALIGNMENT 4
-#endif
-#endif
-/* page size of memory pool */
-#ifndef POOL_PAGE_SIZE
-#define POOL_PAGE_SIZE 16000
-#endif
-/* end of configuration section */
-
-struct mrb_pool_page {
-  struct mrb_pool_page *next;
-  size_t offset;
-  size_t len;
-  void *last;
-  char page[];
-};
-
-struct mrb_pool {
-  mrb_state *mrb;
-  struct mrb_pool_page *pages;
-};
-
-#undef TEST_POOL
-#ifdef TEST_POOL
-
-#define mrb_malloc_simple(m,s) malloc(s)
-#define mrb_free(m,p) free(p)
-#endif
-
-#ifdef POOL_ALIGNMENT
-#  define ALIGN_PADDING(x) ((SIZE_MAX - (x) + 1) & (POOL_ALIGNMENT - 1))
-#else
-#  define ALIGN_PADDING(x) (0)
-#endif
-
-MRB_API mrb_pool*
-mrb_pool_open(mrb_state *mrb)
-{
-  mrb_pool *pool = (mrb_pool *)mrb_malloc_simple(mrb, sizeof(mrb_pool));
-
-  if (pool) {
-    pool->mrb = mrb;
-    pool->pages = NULL;
-  }
-
-  return pool;
-}
-
-MRB_API void
-mrb_pool_close(mrb_pool *pool)
-{
-  struct mrb_pool_page *page, *tmp;
-
-  if (!pool) return;
-  page = pool->pages;
-  while (page) {
-    tmp = page;
-    page = page->next;
-    mrb_free(pool->mrb, tmp);
-  }
-  mrb_free(pool->mrb, pool);
-}
-
-static struct mrb_pool_page*
-page_alloc(mrb_pool *pool, size_t len)
-{
-  struct mrb_pool_page *page;
-
-  if (len < POOL_PAGE_SIZE)
-    len = POOL_PAGE_SIZE;
-  page = (struct mrb_pool_page *)mrb_malloc_simple(pool->mrb, sizeof(struct mrb_pool_page)+len);
-  if (page) {
-    page->offset = 0;
-    page->len = len;
-  }
-
-  return page;
-}
-
-MRB_API void*
-mrb_pool_alloc(mrb_pool *pool, size_t len)
-{
-  struct mrb_pool_page *page;
-  size_t n;
-
-  if (!pool) return NULL;
-  len += ALIGN_PADDING(len);
-  page = pool->pages;
-  while (page) {
-    if (page->offset + len <= page->len) {
-      n = page->offset;
-      page->offset += len;
-      page->last = (char*)page->page+n;
-      return page->last;
-    }
-    page = page->next;
-  }
-  page = page_alloc(pool, len);
-  if (!page) return NULL;
-  page->offset = len;
-  page->next = pool->pages;
-  pool->pages = page;
-
-  page->last = (void*)page->page;
-  return page->last;
-}
-
-MRB_API mrb_bool
-mrb_pool_can_realloc(mrb_pool *pool, void *p, size_t len)
-{
-  struct mrb_pool_page *page;
-
-  if (!pool) return FALSE;
-  len += ALIGN_PADDING(len);
-  page = pool->pages;
-  while (page) {
-    if (page->last == p) {
-      size_t beg;
-
-      beg = (char*)p - page->page;
-      if (beg + len > page->len) return FALSE;
-      return TRUE;
-    }
-    page = page->next;
-  }
-  return FALSE;
-}
-
-MRB_API void*
-mrb_pool_realloc(mrb_pool *pool, void *p, size_t oldlen, size_t newlen)
-{
-  struct mrb_pool_page *page;
-  void *np;
-
-  if (!pool) return NULL;
-  oldlen += ALIGN_PADDING(oldlen);
-  newlen += ALIGN_PADDING(newlen);
-  page = pool->pages;
-  while (page) {
-    if (page->last == p) {
-      size_t beg;
-
-      beg = (char*)p - page->page;
-      if (beg + oldlen != page->offset) break;
-      if (beg + newlen > page->len) {
-        page->offset = beg;
-        break;
-      }
-      page->offset = beg + newlen;
-      return p;
-    }
-    page = page->next;
-  }
-  np = mrb_pool_alloc(pool, newlen);
-  if (np == NULL) {
-    return NULL;
-  }
-  memcpy(np, p, oldlen);
-  return np;
-}
-
-#ifdef TEST_POOL
-int
-main(void)
-{
-  int i, len = 250;
-  mrb_pool *pool;
-  void *p;
-
-  pool = mrb_pool_open(NULL);
-  p = mrb_pool_alloc(pool, len);
-  for (i=1; i<20; i++) {
-    printf("%p (len=%d) %ud\n", p, len, mrb_pool_can_realloc(pool, p, len*2));
-    p = mrb_pool_realloc(pool, p, len, len*2);
-    len *= 2;
-  }
-  mrb_pool_close(pool);
-  return 0;
-}
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/print.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/print.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/print.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/print.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
-** print.c - Kernel.#p
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-
-#ifndef MRB_DISABLE_STDIO
-static void
-printstr(mrb_value obj, FILE *stream)
-{
-  if (mrb_string_p(obj)) {
-    fwrite(RSTRING_PTR(obj), RSTRING_LEN(obj), 1, stream);
-    putc('\n', stream);
-  }
-}
-#else
-# define printstr(obj, stream) (void)0
-#endif
-
-MRB_API void
-mrb_p(mrb_state *mrb, mrb_value obj)
-{
-  printstr(mrb_inspect(mrb, obj), stdout);
-}
-
-MRB_API void
-mrb_print_error(mrb_state *mrb)
-{
-  mrb_print_backtrace(mrb);
-  printstr(mrb_funcall(mrb, mrb_obj_value(mrb->exc), "inspect", 0), stderr);
-}
-
-MRB_API void
-mrb_show_version(mrb_state *mrb)
-{
-  printstr(mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION")), stdout);
-}
-
-MRB_API void
-mrb_show_copyright(mrb_state *mrb)
-{
-  printstr(mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT")), stdout);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/proc.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/proc.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/proc.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/proc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,286 +0,0 @@
-/*
-** proc.c - Proc class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/proc.h>
-#include <mruby/opcode.h>
-
-static mrb_code call_iseq[] = {
-  MKOP_A(OP_CALL, 0),
-};
-
-struct RProc *
-mrb_proc_new(mrb_state *mrb, mrb_irep *irep)
-{
-  struct RProc *p;
-  mrb_callinfo *ci = mrb->c->ci;
-
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  p->target_class = 0;
-  if (ci) {
-    if (ci->proc)
-      p->target_class = ci->proc->target_class;
-    if (!p->target_class)
-      p->target_class = ci->target_class;
-  }
-  p->body.irep = irep;
-  p->env = 0;
-  mrb_irep_incref(mrb, irep);
-
-  return p;
-}
-
-static struct REnv*
-env_new(mrb_state *mrb, int nlocals)
-{
-  struct REnv *e;
-
-  e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass*)mrb->c->ci->proc->env);
-  MRB_SET_ENV_STACK_LEN(e, nlocals);
-  e->cxt.c = mrb->c;
-  e->cioff = mrb->c->ci - mrb->c->cibase;
-  e->stack = mrb->c->stack;
-
-  return e;
-}
-
-static void
-closure_setup(mrb_state *mrb, struct RProc *p, int nlocals)
-{
-  struct REnv *e;
-
-  if (!mrb->c->ci->env) {
-    e = env_new(mrb, nlocals);
-    mrb->c->ci->env = e;
-  }
-  else {
-    e = mrb->c->ci->env;
-  }
-  p->env = e;
-  mrb_field_write_barrier(mrb, (struct RBasic *)p, (struct RBasic *)p->env);
-}
-
-struct RProc *
-mrb_closure_new(mrb_state *mrb, mrb_irep *irep)
-{
-  struct RProc *p = mrb_proc_new(mrb, irep);
-
-  closure_setup(mrb, p, mrb->c->ci->proc->body.irep->nlocals);
-  return p;
-}
-
-MRB_API struct RProc *
-mrb_proc_new_cfunc(mrb_state *mrb, mrb_func_t func)
-{
-  struct RProc *p;
-
-  p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  p->body.func = func;
-  p->flags |= MRB_PROC_CFUNC;
-  p->env = 0;
-
-  return p;
-}
-
-MRB_API struct RProc *
-mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t func, mrb_int argc, const mrb_value *argv)
-{
-  struct RProc *p = mrb_proc_new_cfunc(mrb, func);
-  struct REnv *e;
-  int i;
-
-  p->env = e = env_new(mrb, argc);
-  mrb_field_write_barrier(mrb, (struct RBasic *)p, (struct RBasic *)p->env);
-  MRB_ENV_UNSHARE_STACK(e);
-  e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc);
-  if (argv) {
-    for (i = 0; i < argc; ++i) {
-      e->stack[i] = argv[i];
-    }
-  }
-  else {
-    for (i = 0; i < argc; ++i) {
-      SET_NIL_VALUE(e->stack[i]);
-    }
-  }
-  return p;
-}
-
-MRB_API struct RProc *
-mrb_closure_new_cfunc(mrb_state *mrb, mrb_func_t func, int nlocals)
-{
-  return mrb_proc_new_cfunc_with_env(mrb, func, nlocals, NULL);
-}
-
-MRB_API mrb_value
-mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx)
-{
-  struct RProc *p = mrb->c->ci->proc;
-  struct REnv *e = p->env;
-
-  if (!MRB_PROC_CFUNC_P(p)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from non-cfunc proc.");
-  }
-  if (!e) {
-    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv.");
-  }
-  if (idx < 0 || MRB_ENV_STACK_LEN(e) <= idx) {
-    mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %S (expected: 0 <= index < %S)",
-               mrb_fixnum_value(idx), mrb_fixnum_value(MRB_ENV_STACK_LEN(e)));
-  }
-
-  return e->stack[idx];
-}
-
-void
-mrb_proc_copy(struct RProc *a, struct RProc *b)
-{
-  a->flags = b->flags;
-  a->body = b->body;
-  if (!MRB_PROC_CFUNC_P(a) && a->body.irep) {
-    a->body.irep->refcnt++;
-  }
-  a->target_class = b->target_class;
-  a->env = b->env;
-}
-
-static mrb_value
-mrb_proc_s_new(mrb_state *mrb, mrb_value proc_class)
-{
-  mrb_value blk;
-  mrb_value proc;
-  struct RProc *p;
-
-  mrb_get_args(mrb, "&", &blk);
-  if (mrb_nil_p(blk)) {
-    /* Calling Proc.new without a block is not implemented yet */
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Proc object without a block");
-  }
-  p = (struct RProc *)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class));
-  mrb_proc_copy(p, mrb_proc_ptr(blk));
-  proc = mrb_obj_value(p);
-  mrb_funcall_with_block(mrb, proc, mrb_intern_lit(mrb, "initialize"), 0, NULL, blk);
-  return proc;
-}
-
-static mrb_value
-mrb_proc_init_copy(mrb_state *mrb, mrb_value self)
-{
-  mrb_value proc;
-
-  mrb_get_args(mrb, "o", &proc);
-  if (mrb_type(proc) != MRB_TT_PROC) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
-  }
-  mrb_proc_copy(mrb_proc_ptr(self), mrb_proc_ptr(proc));
-  return self;
-}
-
-int
-mrb_proc_cfunc_p(struct RProc *p)
-{
-  return MRB_PROC_CFUNC_P(p);
-}
-
-mrb_value
-mrb_proc_call_cfunc(mrb_state *mrb, struct RProc *p, mrb_value self)
-{
-  return (p->body.func)(mrb, self);
-}
-
-/* 15.2.17.4.2 */
-static mrb_value
-mrb_proc_arity(mrb_state *mrb, mrb_value self)
-{
-  struct RProc *p = mrb_proc_ptr(self);
-  struct mrb_irep *irep;
-  mrb_code *iseq;
-  mrb_aspec aspec;
-  int ma, op, ra, pa, arity;
-
-  if (MRB_PROC_CFUNC_P(p)) {
-    /* TODO cfunc aspec not implemented yet */
-    return mrb_fixnum_value(-1);
-  }
-
-  irep = p->body.irep;
-  if (!irep) {
-    return mrb_fixnum_value(0);
-  }
-
-  iseq = irep->iseq;
-  /* arity is depend on OP_ENTER */
-  if (GET_OPCODE(*iseq) != OP_ENTER) {
-    return mrb_fixnum_value(0);
-  }
-
-  aspec = GETARG_Ax(*iseq);
-  ma = MRB_ASPEC_REQ(aspec);
-  op = MRB_ASPEC_OPT(aspec);
-  ra = MRB_ASPEC_REST(aspec);
-  pa = MRB_ASPEC_POST(aspec);
-  arity = ra || (MRB_PROC_STRICT_P(p) && op) ? -(ma + pa + 1) : ma + pa;
-
-  return mrb_fixnum_value(arity);
-}
-
-/* 15.3.1.2.6  */
-/* 15.3.1.3.27 */
-/*
- * call-seq:
- *   lambda { |...| block }  -> a_proc
- *
- * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
- * check the number of parameters passed when called.
- */
-static mrb_value
-proc_lambda(mrb_state *mrb, mrb_value self)
-{
-  mrb_value blk;
-  struct RProc *p;
-
-  mrb_get_args(mrb, "&", &blk);
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Proc object without a block");
-  }
-  if (mrb_type(blk) != MRB_TT_PROC) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc");
-  }
-  p = mrb_proc_ptr(blk);
-  if (!MRB_PROC_STRICT_P(p)) {
-    struct RProc *p2 = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, p->c);
-    mrb_proc_copy(p2, p);
-    p2->flags |= MRB_PROC_STRICT;
-    return mrb_obj_value(p2);
-  }
-  return blk;
-}
-
-void
-mrb_init_proc(mrb_state *mrb)
-{
-  struct RProc *m;
-  mrb_irep *call_irep = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep));
-  static const mrb_irep mrb_irep_zero = { 0 };
-
-  *call_irep = mrb_irep_zero;
-  call_irep->flags = MRB_ISEQ_NO_FREE;
-  call_irep->iseq = call_iseq;
-  call_irep->ilen = 1;
-  call_irep->nregs = 2;         /* receiver and block */
-
-  mrb_define_class_method(mrb, mrb->proc_class, "new", mrb_proc_s_new, MRB_ARGS_ANY());
-  mrb_define_method(mrb, mrb->proc_class, "initialize_copy", mrb_proc_init_copy, MRB_ARGS_REQ(1));
-  mrb_define_method(mrb, mrb->proc_class, "arity", mrb_proc_arity, MRB_ARGS_NONE());
-
-  m = mrb_proc_new(mrb, call_irep);
-  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern_lit(mrb, "call"), m);
-  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern_lit(mrb, "[]"), m);
-
-  mrb_define_class_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()); /* 15.3.1.2.6  */
-  mrb_define_method(mrb, mrb->kernel_module,       "lambda", proc_lambda, MRB_ARGS_NONE()); /* 15.3.1.3.27 */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/range.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/range.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/range.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/range.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,443 +0,0 @@
-/*
-** range.c - Range class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/class.h>
-#include <mruby/range.h>
-#include <mruby/string.h>
-#include <mruby/array.h>
-
-#define RANGE_CLASS (mrb_class_get(mrb, "Range"))
-
-MRB_API struct RRange*
-mrb_range_ptr(mrb_state *mrb, mrb_value v)
-{
-  struct RRange *r = (struct RRange*)mrb_ptr(v);
-
-  if (r->edges == NULL) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "uninitialized range");
-  }
-  return r;
-}
-
-static void
-range_check(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  mrb_value ans;
-  enum mrb_vtype ta;
-  enum mrb_vtype tb;
-
-  ta = mrb_type(a);
-  tb = mrb_type(b);
-  if ((ta == MRB_TT_FIXNUM || ta == MRB_TT_FLOAT) &&
-      (tb == MRB_TT_FIXNUM || tb == MRB_TT_FLOAT)) {
-    return;
-  }
-
-  ans =  mrb_funcall(mrb, a, "<=>", 1, b);
-  if (mrb_nil_p(ans)) {
-    /* can not be compared */
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "bad value for range");
-  }
-}
-
-MRB_API mrb_value
-mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, mrb_bool excl)
-{
-  struct RRange *r;
-
-  range_check(mrb, beg, end);
-  r = (struct RRange*)mrb_obj_alloc(mrb, MRB_TT_RANGE, RANGE_CLASS);
-  r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges));
-  r->edges->beg = beg;
-  r->edges->end = end;
-  r->excl = excl;
-  return mrb_range_value(r);
-}
-
-/*
- *  call-seq:
- *     rng.first    => obj
- *     rng.begin    => obj
- *
- *  Returns the first object in <i>rng</i>.
- */
-mrb_value
-mrb_range_beg(mrb_state *mrb, mrb_value range)
-{
-  struct RRange *r = mrb_range_ptr(mrb, range);
-
-  return r->edges->beg;
-}
-
-/*
- *  call-seq:
- *     rng.end    => obj
- *     rng.last   => obj
- *
- *  Returns the object that defines the end of <i>rng</i>.
- *
- *     (1..10).end    #=> 10
- *     (1...10).end   #=> 10
- */
-
-mrb_value
-mrb_range_end(mrb_state *mrb, mrb_value range)
-{
-  struct RRange *r = mrb_range_ptr(mrb, range);
-
-  return r->edges->end;
-}
-
-/*
- *  call-seq:
- *     range.exclude_end?    => true or false
- *
- *  Returns <code>true</code> if <i>range</i> excludes its end value.
- */
-mrb_value
-mrb_range_excl(mrb_state *mrb, mrb_value range)
-{
-  struct RRange *r = mrb_range_ptr(mrb, range);
-
-  return mrb_bool_value(r->excl);
-}
-
-static void
-range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, mrb_bool exclude_end)
-{
-  struct RRange *r = mrb_range_raw_ptr(range);
-
-  range_check(mrb, beg, end);
-  r->excl = exclude_end;
-  if (!r->edges) {
-    r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges));
-  }
-  r->edges->beg = beg;
-  r->edges->end = end;
-}
-/*
- *  call-seq:
- *     Range.new(start, end, exclusive=false)    => range
- *
- *  Constructs a range using the given <i>start</i> and <i>end</i>. If the third
- *  parameter is omitted or is <code>false</code>, the <i>range</i> will include
- *  the end object; otherwise, it will be excluded.
- */
-
-mrb_value
-mrb_range_initialize(mrb_state *mrb, mrb_value range)
-{
-  mrb_value beg, end;
-  mrb_bool exclusive;
-  int n;
-
-  n = mrb_get_args(mrb, "oo|b", &beg, &end, &exclusive);
-  if (n != 3) {
-    exclusive = FALSE;
-  }
-  /* Ranges are immutable, so that they should be initialized only once. */
-  if (mrb_range_raw_ptr(range)->edges) {
-    mrb_name_error(mrb, mrb_intern_lit(mrb, "initialize"), "`initialize' called twice");
-  }
-  range_init(mrb, range, beg, end, exclusive);
-  return range;
-}
-/*
- *  call-seq:
- *     range == obj    => true or false
- *
- *  Returns <code>true</code> only if
- *  1) <i>obj</i> is a Range,
- *  2) <i>obj</i> has equivalent beginning and end items (by comparing them with <code>==</code>),
- *  3) <i>obj</i> has the same #exclude_end? setting as <i>rng</t>.
- *
- *    (0..2) == (0..2)            #=> true
- *    (0..2) == Range.new(0,2)    #=> true
- *    (0..2) == (0...2)           #=> false
- *
- */
-
-mrb_value
-mrb_range_eq(mrb_state *mrb, mrb_value range)
-{
-  struct RRange *rr;
-  struct RRange *ro;
-  mrb_value obj, v1, v2;
-
-  mrb_get_args(mrb, "o", &obj);
-
-  if (mrb_obj_equal(mrb, range, obj)) return mrb_true_value();
-  if (!mrb_obj_is_instance_of(mrb, obj, mrb_obj_class(mrb, range))) { /* same class? */
-    return mrb_false_value();
-  }
-
-  rr = mrb_range_ptr(mrb, range);
-  ro = mrb_range_ptr(mrb, obj);
-  v1 = mrb_funcall(mrb, rr->edges->beg, "==", 1, ro->edges->beg);
-  v2 = mrb_funcall(mrb, rr->edges->end, "==", 1, ro->edges->end);
-  if (!mrb_bool(v1) || !mrb_bool(v2) || rr->excl != ro->excl) {
-    return mrb_false_value();
-  }
-  return mrb_true_value();
-}
-
-static mrb_bool
-r_le(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
-  /* output :a < b => -1, a = b =>  0, a > b => +1 */
-
-  if (mrb_fixnum_p(r)) {
-    mrb_int c = mrb_fixnum(r);
-    if (c == 0 || c == -1) return TRUE;
-  }
-
-  return FALSE;
-}
-
-static mrb_bool
-r_gt(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b);
-  /* output :a < b => -1, a = b =>  0, a > b => +1 */
-
-  return mrb_fixnum_p(r) && mrb_fixnum(r) == 1;
-}
-
-static mrb_bool
-r_ge(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
-  /* output :a < b => -1, a = b =>  0, a > b => +1 */
-
-  if (mrb_fixnum_p(r)) {
-    mrb_int c = mrb_fixnum(r);
-    if (c == 0 || c == 1) return TRUE;
-  }
-
-  return FALSE;
-}
-
-/*
- *  call-seq:
- *     range === obj       =>  true or false
- *     range.member?(val)  =>  true or false
- *     range.include?(val) =>  true or false
- *
- */
-mrb_value
-mrb_range_include(mrb_state *mrb, mrb_value range)
-{
-  mrb_value val;
-  struct RRange *r = mrb_range_ptr(mrb, range);
-  mrb_value beg, end;
-  mrb_bool include_p;
-
-  mrb_get_args(mrb, "o", &val);
-
-  beg = r->edges->beg;
-  end = r->edges->end;
-  include_p = r_le(mrb, beg, val) &&           /* beg <= val */
-              (r->excl ? r_gt(mrb, end, val)   /* end >  val */
-                       : r_ge(mrb, end, val)); /* end >= val */
-
-  return mrb_bool_value(include_p);
-}
-
-MRB_API mrb_int
-mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len, mrb_bool trunc)
-{
-  mrb_int beg, end;
-  struct RRange *r;
-
-  if (mrb_type(range) != MRB_TT_RANGE) return 0;
-  r = mrb_range_ptr(mrb, range);
-
-  beg = mrb_int(mrb, r->edges->beg);
-  end = mrb_int(mrb, r->edges->end);
-
-  if (beg < 0) {
-    beg += len;
-    if (beg < 0) return 2;
-  }
-
-  if (trunc) {
-    if (beg > len) return 2;
-    if (end > len) end = len;
-  }
-
-  if (end < 0) end += len;
-  if (!r->excl && (!trunc || end < len))
-    end++;                      /* include end point */
-  len = end - beg;
-  if (len < 0) len = 0;
-
-  *begp = beg;
-  *lenp = len;
-  return 1;
-}
-
-/* 15.2.14.4.12(x) */
-/*
- * call-seq:
- *   rng.to_s   -> string
- *
- * Convert this range object to a printable form.
- */
-
-static mrb_value
-range_to_s(mrb_state *mrb, mrb_value range)
-{
-  mrb_value str, str2;
-  struct RRange *r = mrb_range_ptr(mrb, range);
-
-  str  = mrb_obj_as_string(mrb, r->edges->beg);
-  str2 = mrb_obj_as_string(mrb, r->edges->end);
-  str  = mrb_str_dup(mrb, str);
-  mrb_str_cat(mrb, str, "...", r->excl ? 3 : 2);
-  mrb_str_cat_str(mrb, str, str2);
-
-  return str;
-}
-
-/* 15.2.14.4.13(x) */
-/*
- * call-seq:
- *   rng.inspect  -> string
- *
- * Convert this range object to a printable form (using
- * <code>inspect</code> to convert the start and end
- * objects).
- */
-
-static mrb_value
-range_inspect(mrb_state *mrb, mrb_value range)
-{
-  mrb_value str, str2;
-  struct RRange *r = mrb_range_ptr(mrb, range);
-
-  str  = mrb_inspect(mrb, r->edges->beg);
-  str2 = mrb_inspect(mrb, r->edges->end);
-  str  = mrb_str_dup(mrb, str);
-  mrb_str_cat(mrb, str, "...", r->excl ? 3 : 2);
-  mrb_str_cat_str(mrb, str, str2);
-
-  return str;
-}
-
-/* 15.2.14.4.14(x) */
-/*
- *  call-seq:
- *     rng.eql?(obj)    -> true or false
- *
- *  Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
- *  beginning and end items (by comparing them with #eql?), and has the same
- *  #exclude_end? setting as <i>rng</i>.
- *
- *    (0..2).eql?(0..2)            #=> true
- *    (0..2).eql?(Range.new(0,2))  #=> true
- *    (0..2).eql?(0...2)           #=> false
- *
- */
-
-static mrb_value
-range_eql(mrb_state *mrb, mrb_value range)
-{
-  mrb_value obj;
-  struct RRange *r, *o;
-
-  mrb_get_args(mrb, "o", &obj);
-
-  if (mrb_obj_equal(mrb, range, obj)) return mrb_true_value();
-  if (!mrb_obj_is_kind_of(mrb, obj, RANGE_CLASS)) {
-    return mrb_false_value();
-  }
-  if (mrb_type(obj) != MRB_TT_RANGE) return mrb_false_value();
-
-  r = mrb_range_ptr(mrb, range);
-  o = mrb_range_ptr(mrb, obj);
-  if (!mrb_eql(mrb, r->edges->beg, o->edges->beg) ||
-      !mrb_eql(mrb, r->edges->end, o->edges->end) ||
-      (r->excl != o->excl)) {
-    return mrb_false_value();
-  }
-  return mrb_true_value();
-}
-
-/* 15.2.14.4.15(x) */
-static mrb_value
-range_initialize_copy(mrb_state *mrb, mrb_value copy)
-{
-  mrb_value src;
-  struct RRange *r;
-
-  mrb_get_args(mrb, "o", &src);
-
-  if (mrb_obj_equal(mrb, copy, src)) return copy;
-  if (!mrb_obj_is_instance_of(mrb, src, mrb_obj_class(mrb, copy))) {
-    mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
-  }
-
-  r = mrb_range_ptr(mrb, src);
-  range_init(mrb, copy, r->edges->beg, r->edges->end, r->excl);
-
-  return copy;
-}
-
-mrb_value
-mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, const mrb_value *argv, mrb_value (*func)(mrb_state*, mrb_value, mrb_int))
-{
-  mrb_int i, j, beg, len;
-  mrb_value result;
-  result = mrb_ary_new(mrb);
-
-  for (i = 0; i < argc; ++i) {
-    if (mrb_fixnum_p(argv[i])) {
-      mrb_ary_push(mrb, result, func(mrb, obj, mrb_fixnum(argv[i])));
-    }
-    else if (mrb_range_beg_len(mrb, argv[i], &beg, &len, olen, FALSE) == 1) {
-      mrb_int const end = olen < beg + len ? olen : beg + len;
-      for (j = beg; j < end; ++j) {
-        mrb_ary_push(mrb, result, func(mrb, obj, j));
-      }
-
-      for (; j < beg + len; ++j) {
-        mrb_ary_push(mrb, result, mrb_nil_value());
-      }
-    }
-    else {
-      mrb_raisef(mrb, E_TYPE_ERROR, "invalid values selector: %S", argv[i]);
-    }
-  }
-
-  return result;
-}
-
-void
-mrb_init_range(mrb_state *mrb)
-{
-  struct RClass *r;
-
-  r = mrb_define_class(mrb, "Range", mrb->object_class);                                /* 15.2.14 */
-  MRB_SET_INSTANCE_TT(r, MRB_TT_RANGE);
-
-  mrb_define_method(mrb, r, "begin",           mrb_range_beg,         MRB_ARGS_NONE()); /* 15.2.14.4.3  */
-  mrb_define_method(mrb, r, "end",             mrb_range_end,         MRB_ARGS_NONE()); /* 15.2.14.4.5  */
-  mrb_define_method(mrb, r, "==",              mrb_range_eq,          MRB_ARGS_REQ(1)); /* 15.2.14.4.1  */
-  mrb_define_method(mrb, r, "===",             mrb_range_include,     MRB_ARGS_REQ(1)); /* 15.2.14.4.2  */
-  mrb_define_method(mrb, r, "exclude_end?",    mrb_range_excl,        MRB_ARGS_NONE()); /* 15.2.14.4.6  */
-  mrb_define_method(mrb, r, "first",           mrb_range_beg,         MRB_ARGS_NONE()); /* 15.2.14.4.7  */
-  mrb_define_method(mrb, r, "include?",        mrb_range_include,     MRB_ARGS_REQ(1)); /* 15.2.14.4.8  */
-  mrb_define_method(mrb, r, "initialize",      mrb_range_initialize,  MRB_ARGS_ANY());  /* 15.2.14.4.9  */
-  mrb_define_method(mrb, r, "last",            mrb_range_end,         MRB_ARGS_NONE()); /* 15.2.14.4.10 */
-  mrb_define_method(mrb, r, "member?",         mrb_range_include,     MRB_ARGS_REQ(1)); /* 15.2.14.4.11 */
-
-  mrb_define_method(mrb, r, "to_s",            range_to_s,            MRB_ARGS_NONE()); /* 15.2.14.4.12(x) */
-  mrb_define_method(mrb, r, "inspect",         range_inspect,         MRB_ARGS_NONE()); /* 15.2.14.4.13(x) */
-  mrb_define_method(mrb, r, "eql?",            range_eql,             MRB_ARGS_REQ(1)); /* 15.2.14.4.14(x) */
-  mrb_define_method(mrb, r, "initialize_copy", range_initialize_copy, MRB_ARGS_REQ(1)); /* 15.2.14.4.15(x) */
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/state.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/state.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/state.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/state.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,301 +0,0 @@
-/*
-** state.c - mrb_state open/close functions
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/irep.h>
-#include <mruby/variable.h>
-#include <mruby/debug.h>
-#include <mruby/string.h>
-
-void mrb_init_core(mrb_state*);
-void mrb_init_mrbgems(mrb_state*);
-
-void mrb_gc_init(mrb_state*, mrb_gc *gc);
-void mrb_gc_destroy(mrb_state*, mrb_gc *gc);
-
-static mrb_value
-inspect_main(mrb_state *mrb, mrb_value mod)
-{
-  return mrb_str_new_lit(mrb, "main");
-}
-
-MRB_API mrb_state*
-mrb_open_core(mrb_allocf f, void *ud)
-{
-  static const mrb_state mrb_state_zero = { 0 };
-  static const struct mrb_context mrb_context_zero = { 0 };
-  mrb_state *mrb;
-
-  mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state), ud);
-  if (mrb == NULL) return NULL;
-
-  *mrb = mrb_state_zero;
-  mrb->allocf_ud = ud;
-  mrb->allocf = f;
-  mrb->atexit_stack_len = 0;
-
-  mrb_gc_init(mrb, &mrb->gc);
-  mrb->c = (struct mrb_context*)mrb_malloc(mrb, sizeof(struct mrb_context));
-  *mrb->c = mrb_context_zero;
-  mrb->root_c = mrb->c;
-
-  mrb_init_core(mrb);
-
-  return mrb;
-}
-
-void*
-mrb_default_allocf(mrb_state *mrb, void *p, size_t size, void *ud)
-{
-  if (size == 0) {
-    free(p);
-    return NULL;
-  }
-  else {
-    return realloc(p, size);
-  }
-}
-
-struct alloca_header {
-  struct alloca_header *next;
-  char buf[];
-};
-
-MRB_API void*
-mrb_alloca(mrb_state *mrb, size_t size)
-{
-  struct alloca_header *p;
-
-  p = (struct alloca_header*) mrb_malloc(mrb, sizeof(struct alloca_header)+size);
-  p->next = mrb->mems;
-  mrb->mems = p;
-  return (void*)p->buf;
-}
-
-static void
-mrb_alloca_free(mrb_state *mrb)
-{
-  struct alloca_header *p;
-  struct alloca_header *tmp;
-
-  if (mrb == NULL) return;
-  p = mrb->mems;
-
-  while (p) {
-    tmp = p;
-    p = p->next;
-    mrb_free(mrb, tmp);
-  }
-}
-
-MRB_API mrb_state*
-mrb_open(void)
-{
-  mrb_state *mrb = mrb_open_allocf(mrb_default_allocf, NULL);
-
-  return mrb;
-}
-
-MRB_API mrb_state*
-mrb_open_allocf(mrb_allocf f, void *ud)
-{
-  mrb_state *mrb = mrb_open_core(f, ud);
-
-  if (mrb == NULL) {
-    return NULL;
-  }
-
-#ifndef DISABLE_GEMS
-  mrb_init_mrbgems(mrb);
-  mrb_gc_arena_restore(mrb, 0);
-#endif
-  return mrb;
-}
-
-void mrb_free_symtbl(mrb_state *mrb);
-
-void
-mrb_irep_incref(mrb_state *mrb, mrb_irep *irep)
-{
-  irep->refcnt++;
-}
-
-void
-mrb_irep_decref(mrb_state *mrb, mrb_irep *irep)
-{
-  irep->refcnt--;
-  if (irep->refcnt == 0) {
-    mrb_irep_free(mrb, irep);
-  }
-}
-
-void
-mrb_irep_free(mrb_state *mrb, mrb_irep *irep)
-{
-  size_t i;
-
-  if (!(irep->flags & MRB_ISEQ_NO_FREE))
-    mrb_free(mrb, irep->iseq);
-  if (irep->pool) for (i=0; i<irep->plen; i++) {
-    if (mrb_type(irep->pool[i]) == MRB_TT_STRING) {
-      mrb_gc_free_str(mrb, RSTRING(irep->pool[i]));
-      mrb_free(mrb, mrb_obj_ptr(irep->pool[i]));
-    }
-#ifdef MRB_WORD_BOXING
-    else if (mrb_type(irep->pool[i]) == MRB_TT_FLOAT) {
-      mrb_free(mrb, mrb_obj_ptr(irep->pool[i]));
-    }
-#endif
-  }
-  mrb_free(mrb, irep->pool);
-  mrb_free(mrb, irep->syms);
-  for (i=0; i<irep->rlen; i++) {
-    mrb_irep_decref(mrb, irep->reps[i]);
-  }
-  mrb_free(mrb, irep->reps);
-  mrb_free(mrb, irep->lv);
-  if (irep->own_filename) {
-    mrb_free(mrb, (void *)irep->filename);
-  }
-  mrb_free(mrb, irep->lines);
-  mrb_debug_info_free(mrb, irep->debug_info);
-  mrb_free(mrb, irep);
-}
-
-mrb_value
-mrb_str_pool(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = mrb_str_ptr(str);
-  struct RString *ns;
-  char *ptr;
-  mrb_int len;
-
-  ns = (struct RString *)mrb_malloc(mrb, sizeof(struct RString));
-  ns->tt = MRB_TT_STRING;
-  ns->c = mrb->string_class;
-
-  if (RSTR_NOFREE_P(s)) {
-    ns->flags = MRB_STR_NOFREE;
-    ns->as.heap.ptr = s->as.heap.ptr;
-    ns->as.heap.len = s->as.heap.len;
-    ns->as.heap.aux.capa = 0;
-  }
-  else {
-    ns->flags = 0;
-    if (RSTR_EMBED_P(s)) {
-      ptr = s->as.ary;
-      len = RSTR_EMBED_LEN(s);
-    }
-    else {
-      ptr = s->as.heap.ptr;
-      len = s->as.heap.len;
-    }
-
-    if (len < RSTRING_EMBED_LEN_MAX) {
-      RSTR_SET_EMBED_FLAG(ns);
-      RSTR_SET_EMBED_LEN(ns, len);
-      if (ptr) {
-        memcpy(ns->as.ary, ptr, len);
-      }
-      ns->as.ary[len] = '\0';
-    }
-    else {
-      ns->as.heap.ptr = (char *)mrb_malloc(mrb, (size_t)len+1);
-      ns->as.heap.len = len;
-      ns->as.heap.aux.capa = len;
-      if (ptr) {
-        memcpy(ns->as.heap.ptr, ptr, len);
-      }
-      ns->as.heap.ptr[len] = '\0';
-    }
-  }
-  return mrb_obj_value(ns);
-}
-
-void mrb_free_backtrace(mrb_state *mrb);
-
-MRB_API void
-mrb_free_context(mrb_state *mrb, struct mrb_context *c)
-{
-  if (!c) return;
-  mrb_free(mrb, c->stbase);
-  mrb_free(mrb, c->cibase);
-  mrb_free(mrb, c->rescue);
-  mrb_free(mrb, c->ensure);
-  mrb_free(mrb, c);
-}
-
-MRB_API void
-mrb_close(mrb_state *mrb)
-{
-  if (!mrb) return;
-  if (mrb->atexit_stack_len > 0) {
-    mrb_int i;
-    for (i = mrb->atexit_stack_len; i > 0; --i) {
-      mrb->atexit_stack[i - 1](mrb);
-    }
-#ifndef MRB_FIXED_STATE_ATEXIT_STACK
-    mrb_free(mrb, mrb->atexit_stack);
-#endif
-  }
-
-  /* free */
-  mrb_gc_free_gv(mrb);
-  mrb_free_context(mrb, mrb->root_c);
-  mrb_free_symtbl(mrb);
-  mrb_alloca_free(mrb);
-  mrb_gc_destroy(mrb, &mrb->gc);
-  mrb_free(mrb, mrb);
-}
-
-MRB_API mrb_irep*
-mrb_add_irep(mrb_state *mrb)
-{
-  static const mrb_irep mrb_irep_zero = { 0 };
-  mrb_irep *irep;
-
-  irep = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep));
-  *irep = mrb_irep_zero;
-  irep->refcnt = 1;
-  irep->own_filename = FALSE;
-
-  return irep;
-}
-
-MRB_API mrb_value
-mrb_top_self(mrb_state *mrb)
-{
-  if (!mrb->top_self) {
-    mrb->top_self = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb->object_class);
-    mrb_define_singleton_method(mrb, mrb->top_self, "inspect", inspect_main, MRB_ARGS_NONE());
-    mrb_define_singleton_method(mrb, mrb->top_self, "to_s", inspect_main, MRB_ARGS_NONE());
-  }
-  return mrb_obj_value(mrb->top_self);
-}
-
-MRB_API void
-mrb_state_atexit(mrb_state *mrb, mrb_atexit_func f)
-{
-#ifdef MRB_FIXED_STATE_ATEXIT_STACK
-  if (mrb->atexit_stack_len + 1 > MRB_FIXED_STATE_ATEXIT_STACK_SIZE) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "exceeded fixed state atexit stack limit");
-  }
-#else
-  size_t stack_size;
-
-  stack_size = sizeof(mrb_atexit_func) * (mrb->atexit_stack_len + 1);
-  if (mrb->atexit_stack_len == 0) {
-    mrb->atexit_stack = (mrb_atexit_func*)mrb_malloc(mrb, stack_size);
-  }
-  else {
-    mrb->atexit_stack = (mrb_atexit_func*)mrb_realloc(mrb, mrb->atexit_stack, stack_size);
-  }
-#endif
-
-  mrb->atexit_stack[mrb->atexit_stack_len++] = f;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/string.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/string.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/string.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/string.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,3022 +0,0 @@
-/*
-** string.c - String class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifdef _MSC_VER
-# define _CRT_NONSTDC_NO_DEPRECATE
-#endif
-
-#include <float.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/range.h>
-#include <mruby/string.h>
-#include <mruby/re.h>
-
-typedef struct mrb_shared_string {
-  mrb_bool nofree : 1;
-  int refcnt;
-  char *ptr;
-  mrb_int len;
-} mrb_shared_string;
-
-const char mrb_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-#define mrb_obj_alloc_string(mrb) ((struct RString*)mrb_obj_alloc((mrb), MRB_TT_STRING, (mrb)->string_class))
-
-static struct RString*
-str_new_static(mrb_state *mrb, const char *p, size_t len)
-{
-  struct RString *s;
-
-  if (len >= MRB_INT_MAX) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
-  }
-  s = mrb_obj_alloc_string(mrb);
-  s->as.heap.len = len;
-  s->as.heap.aux.capa = 0;             /* nofree */
-  s->as.heap.ptr = (char *)p;
-  s->flags = MRB_STR_NOFREE;
-
-  return s;
-}
-
-static struct RString*
-str_new(mrb_state *mrb, const char *p, size_t len)
-{
-  struct RString *s;
-
-  if (p && mrb_ro_data_p(p)) {
-    return str_new_static(mrb, p, len);
-  }
-  s = mrb_obj_alloc_string(mrb);
-  if (len < RSTRING_EMBED_LEN_MAX) {
-    RSTR_SET_EMBED_FLAG(s);
-    RSTR_SET_EMBED_LEN(s, len);
-    if (p) {
-      memcpy(s->as.ary, p, len);
-    }
-  }
-  else {
-    if (len >= MRB_INT_MAX) {
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
-    }
-    s->as.heap.len = len;
-    s->as.heap.aux.capa = len;
-    s->as.heap.ptr = (char *)mrb_malloc(mrb, len+1);
-    if (p) {
-      memcpy(s->as.heap.ptr, p, len);
-    }
-  }
-  RSTR_PTR(s)[len] = '\0';
-  return s;
-}
-
-static inline void
-str_with_class(mrb_state *mrb, struct RString *s, mrb_value obj)
-{
-  s->c = mrb_str_ptr(obj)->c;
-}
-
-static mrb_value
-mrb_str_new_empty(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = str_new(mrb, 0, 0);
-
-  str_with_class(mrb, s, str);
-  return mrb_obj_value(s);
-}
-
-#ifndef MRB_STR_BUF_MIN_SIZE
-# define MRB_STR_BUF_MIN_SIZE 128
-#endif
-
-MRB_API mrb_value
-mrb_str_buf_new(mrb_state *mrb, size_t capa)
-{
-  struct RString *s;
-
-  s = mrb_obj_alloc_string(mrb);
-
-  if (capa >= MRB_INT_MAX) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "string capacity size too big");
-  }
-  if (capa < MRB_STR_BUF_MIN_SIZE) {
-    capa = MRB_STR_BUF_MIN_SIZE;
-  }
-  s->as.heap.len = 0;
-  s->as.heap.aux.capa = capa;
-  s->as.heap.ptr = (char *)mrb_malloc(mrb, capa+1);
-  RSTR_PTR(s)[0] = '\0';
-
-  return mrb_obj_value(s);
-}
-
-static void
-resize_capa(mrb_state *mrb, struct RString *s, size_t capacity)
-{
-#if SIZE_MAX > MRB_INT_MAX
-    mrb_assert(capacity < MRB_INT_MAX);
-#endif
-  if (RSTR_EMBED_P(s)) {
-    if (RSTRING_EMBED_LEN_MAX < capacity) {
-      char *const tmp = (char *)mrb_malloc(mrb, capacity+1);
-      const mrb_int len = RSTR_EMBED_LEN(s);
-      memcpy(tmp, s->as.ary, len);
-      RSTR_UNSET_EMBED_FLAG(s);
-      s->as.heap.ptr = tmp;
-      s->as.heap.len = len;
-      s->as.heap.aux.capa = (mrb_int)capacity;
-    }
-  }
-  else {
-    s->as.heap.ptr = (char*)mrb_realloc(mrb, RSTR_PTR(s), capacity+1);
-    s->as.heap.aux.capa = (mrb_int)capacity;
-  }
-}
-
-static void
-str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len)
-{
-  size_t capa;
-  size_t total;
-  ptrdiff_t off = -1;
-
-  if (len == 0) return;
-  mrb_str_modify(mrb, s);
-  if (ptr >= RSTR_PTR(s) && ptr <= RSTR_PTR(s) + (size_t)RSTR_LEN(s)) {
-      off = ptr - RSTR_PTR(s);
-  }
-
-  capa = RSTR_CAPA(s);
-  if (capa <= RSTRING_EMBED_LEN_MAX)
-    capa = RSTRING_EMBED_LEN_MAX+1;
-
-  total = RSTR_LEN(s)+len;
-  if (total >= MRB_INT_MAX) {
-  size_error:
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
-  }
-  if (capa <= total) {
-    while (total > capa) {
-      if (capa <= MRB_INT_MAX / 2) {
-        capa *= 2;
-      }
-      else {
-        capa = total;
-      }
-    }
-    if (capa < total || capa > MRB_INT_MAX) {
-      goto size_error;
-    }
-    resize_capa(mrb, s, capa);
-  }
-  if (off != -1) {
-      ptr = RSTR_PTR(s) + off;
-  }
-  memcpy(RSTR_PTR(s) + RSTR_LEN(s), ptr, len);
-  mrb_assert_int_fit(size_t, total, mrb_int, MRB_INT_MAX);
-  RSTR_SET_LEN(s, total);
-  RSTR_PTR(s)[total] = '\0';   /* sentinel */
-}
-
-MRB_API mrb_value
-mrb_str_new(mrb_state *mrb, const char *p, size_t len)
-{
-  return mrb_obj_value(str_new(mrb, p, len));
-}
-
-/*
- *  call-seq: (Caution! NULL string)
- *     String.new(str="")   => new_str
- *
- *  Returns a new string object containing a copy of <i>str</i>.
- */
-
-MRB_API mrb_value
-mrb_str_new_cstr(mrb_state *mrb, const char *p)
-{
-  struct RString *s;
-  size_t len;
-
-  if (p) {
-    len = strlen(p);
-  }
-  else {
-    len = 0;
-  }
-
-  s = str_new(mrb, p, len);
-
-  return mrb_obj_value(s);
-}
-
-MRB_API mrb_value
-mrb_str_new_static(mrb_state *mrb, const char *p, size_t len)
-{
-  struct RString *s = str_new_static(mrb, p, len);
-  return mrb_obj_value(s);
-}
-
-static void
-str_decref(mrb_state *mrb, mrb_shared_string *shared)
-{
-  shared->refcnt--;
-  if (shared->refcnt == 0) {
-    if (!shared->nofree) {
-      mrb_free(mrb, shared->ptr);
-    }
-    mrb_free(mrb, shared);
-  }
-}
-
-void
-mrb_gc_free_str(mrb_state *mrb, struct RString *str)
-{
-  if (RSTR_EMBED_P(str))
-    /* no code */;
-  else if (RSTR_SHARED_P(str))
-    str_decref(mrb, str->as.heap.aux.shared);
-  else if (!RSTR_NOFREE_P(str))
-    mrb_free(mrb, str->as.heap.ptr);
-}
-
-#ifdef MRB_UTF8_STRING
-static const char utf8len_codepage[256] =
-{
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1,
-};
-
-static mrb_int
-utf8len(const char* p, const char* e)
-{
-  mrb_int len;
-  mrb_int i;
-
-  len = utf8len_codepage[(unsigned char)*p];
-  if (p + len > e) return 1;
-  for (i = 1; i < len; ++i)
-    if ((p[i] & 0xc0) != 0x80)
-      return 1;
-  return len;
-}
-
-static mrb_int
-utf8_strlen(mrb_value str, mrb_int len)
-{
-  mrb_int total = 0;
-  char* p = RSTRING_PTR(str);
-  char* e = p;
-  if (RSTRING(str)->flags & MRB_STR_NO_UTF) {
-    return RSTRING_LEN(str);
-  }
-  e += len < 0 ? RSTRING_LEN(str) : len;
-  while (p<e) {
-    p += utf8len(p, e);
-    total++;
-  }
-  if (RSTRING_LEN(str) == total) {
-    RSTRING(str)->flags |= MRB_STR_NO_UTF;
-  }
-  return total;
-}
-
-#define RSTRING_CHAR_LEN(s) utf8_strlen(s, -1)
-
-/* map character index to byte offset index */
-static mrb_int
-chars2bytes(mrb_value s, mrb_int off, mrb_int idx)
-{
-  mrb_int i, b, n;
-  const char *p = RSTRING_PTR(s) + off;
-  const char *e = RSTRING_END(s);
-
-  for (b=i=0; p<e && i<idx; i++) {
-    n = utf8len(p, e);
-    b += n;
-    p += n;
-  }
-  return b;
-}
-
-/* map byte offset to character index */
-static mrb_int
-bytes2chars(char *p, mrb_int bi)
-{
-  mrb_int i, b, n;
-
-  for (b=i=0; b<bi; i++) {
-    n = utf8len_codepage[(unsigned char)*p];
-    b += n;
-    p += n;
-  }
-  if (b != bi) return -1;
-  return i;
-}
-
-#define BYTES_ALIGN_CHECK(pos) if (pos < 0) return mrb_nil_value();
-#else
-#define RSTRING_CHAR_LEN(s) RSTRING_LEN(s)
-#define chars2bytes(p, off, ci) (ci)
-#define bytes2chars(p, bi) (bi)
-#define BYTES_ALIGN_CHECK(pos)
-#endif
-
-static inline mrb_int
-mrb_memsearch_qs(const unsigned char *xs, mrb_int m, const unsigned char *ys, mrb_int n)
-{
-  const unsigned char *x = xs, *xe = xs + m;
-  const unsigned char *y = ys;
-  int i, qstable[256];
-
-  /* Preprocessing */
-  for (i = 0; i < 256; ++i)
-    qstable[i] = m + 1;
-  for (; x < xe; ++x)
-    qstable[*x] = xe - x;
-  /* Searching */
-  for (; y + m <= ys + n; y += *(qstable + y[m])) {
-    if (*xs == *y && memcmp(xs, y, m) == 0)
-      return y - ys;
-  }
-  return -1;
-}
-
-static mrb_int
-mrb_memsearch(const void *x0, mrb_int m, const void *y0, mrb_int n)
-{
-  const unsigned char *x = (const unsigned char *)x0, *y = (const unsigned char *)y0;
-
-  if (m > n) return -1;
-  else if (m == n) {
-    return memcmp(x0, y0, m) == 0 ? 0 : -1;
-  }
-  else if (m < 1) {
-    return 0;
-  }
-  else if (m == 1) {
-    const unsigned char *ys = (const unsigned char *)memchr(y, *x, n);
-
-    if (ys)
-      return ys - y;
-    else
-      return -1;
-  }
-  return mrb_memsearch_qs((const unsigned char *)x0, m, (const unsigned char *)y0, n);
-}
-
-static void
-str_make_shared(mrb_state *mrb, struct RString *s)
-{
-  if (!RSTR_SHARED_P(s)) {
-    mrb_shared_string *shared = (mrb_shared_string *)mrb_malloc(mrb, sizeof(mrb_shared_string));
-
-    shared->refcnt = 1;
-    if (RSTR_EMBED_P(s)) {
-      const mrb_int len = RSTR_EMBED_LEN(s);
-      char *const tmp = (char *)mrb_malloc(mrb, len+1);
-      memcpy(tmp, s->as.ary, len);
-      tmp[len] = '\0';
-      RSTR_UNSET_EMBED_FLAG(s);
-      s->as.heap.ptr = tmp;
-      s->as.heap.len = len;
-      shared->nofree = FALSE;
-      shared->ptr = s->as.heap.ptr;
-    }
-    else if (RSTR_NOFREE_P(s)) {
-      shared->nofree = TRUE;
-      shared->ptr = s->as.heap.ptr;
-      RSTR_UNSET_NOFREE_FLAG(s);
-    }
-    else {
-      shared->nofree = FALSE;
-      if (s->as.heap.aux.capa > s->as.heap.len) {
-        s->as.heap.ptr = shared->ptr = (char *)mrb_realloc(mrb, s->as.heap.ptr, s->as.heap.len+1);
-      }
-      else {
-        shared->ptr = s->as.heap.ptr;
-      }
-    }
-    shared->len = s->as.heap.len;
-    s->as.heap.aux.shared = shared;
-    RSTR_SET_SHARED_FLAG(s);
-  }
-}
-
-static mrb_value
-byte_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len)
-{
-  struct RString *orig, *s;
-  mrb_shared_string *shared;
-
-  orig = mrb_str_ptr(str);
-  if (RSTR_EMBED_P(orig) || RSTR_LEN(orig) == 0) {
-    s = str_new(mrb, orig->as.ary+beg, len);
-  }
-  else {
-    str_make_shared(mrb, orig);
-    shared = orig->as.heap.aux.shared;
-    s = mrb_obj_alloc_string(mrb);
-    s->as.heap.ptr = orig->as.heap.ptr + beg;
-    s->as.heap.len = len;
-    s->as.heap.aux.shared = shared;
-    RSTR_SET_SHARED_FLAG(s);
-    shared->refcnt++;
-  }
-
-  return mrb_obj_value(s);
-}
-#ifdef MRB_UTF8_STRING
-static inline mrb_value
-str_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len)
-{
-  beg = chars2bytes(str, 0, beg);
-  len = chars2bytes(str, beg, len);
-
-  return byte_subseq(mrb, str, beg, len);
-}
-#else
-#define str_subseq(mrb, str, beg, len) byte_subseq(mrb, str, beg, len)
-#endif
-
-static mrb_value
-str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len)
-{
-  mrb_int clen = RSTRING_CHAR_LEN(str);
-
-  if (len < 0) return mrb_nil_value();
-  if (clen == 0) {
-    len = 0;
-  }
-  else if (beg < 0) {
-    beg = clen + beg;
-  }
-  if (beg > clen) return mrb_nil_value();
-  if (beg < 0) {
-    beg += clen;
-    if (beg < 0) return mrb_nil_value();
-  }
-  if (len > clen - beg)
-    len = clen - beg;
-  if (len <= 0) {
-    len = 0;
-  }
-  return str_subseq(mrb, str, beg, len);
-}
-
-static mrb_int
-str_index(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int offset)
-{
-  mrb_int pos;
-  char *s, *sptr;
-  mrb_int len, slen;
-
-  len = RSTRING_LEN(str);
-  slen = RSTRING_LEN(sub);
-  if (offset < 0) {
-    offset += len;
-    if (offset < 0) return -1;
-  }
-  if (len - offset < slen) return -1;
-  s = RSTRING_PTR(str);
-  if (offset) {
-    s += offset;
-  }
-  if (slen == 0) return offset;
-  /* need proceed one character at a time */
-  sptr = RSTRING_PTR(sub);
-  slen = RSTRING_LEN(sub);
-  len = RSTRING_LEN(str) - offset;
-  pos = mrb_memsearch(sptr, slen, s, len);
-  if (pos < 0) return pos;
-  return pos + offset;
-}
-
-static void
-check_frozen(mrb_state *mrb, struct RString *s)
-{
-  if (MRB_FROZEN_P(s)) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "can't modify frozen string");
-  }
-}
-
-static mrb_value
-str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2)
-{
-  long len;
-
-  check_frozen(mrb, s1);
-  if (s1 == s2) return mrb_obj_value(s1);
-  s1->flags &= ~MRB_STR_NO_UTF;
-  s1->flags |= s2->flags&MRB_STR_NO_UTF;
-  len = RSTR_LEN(s2);
-  if (RSTR_SHARED_P(s1)) {
-    str_decref(mrb, s1->as.heap.aux.shared);
-  }
-  else if (!RSTR_EMBED_P(s1) && !RSTR_NOFREE_P(s1)) {
-    mrb_free(mrb, s1->as.heap.ptr);
-  }
-
-  RSTR_UNSET_NOFREE_FLAG(s1);
-
-  if (RSTR_SHARED_P(s2)) {
-L_SHARE:
-    RSTR_UNSET_EMBED_FLAG(s1);
-    s1->as.heap.ptr = s2->as.heap.ptr;
-    s1->as.heap.len = len;
-    s1->as.heap.aux.shared = s2->as.heap.aux.shared;
-    RSTR_SET_SHARED_FLAG(s1);
-    s1->as.heap.aux.shared->refcnt++;
-  }
-  else {
-    if (len <= RSTRING_EMBED_LEN_MAX) {
-      RSTR_UNSET_SHARED_FLAG(s1);
-      RSTR_SET_EMBED_FLAG(s1);
-      memcpy(s1->as.ary, RSTR_PTR(s2), len);
-      RSTR_SET_EMBED_LEN(s1, len);
-    }
-    else {
-      str_make_shared(mrb, s2);
-      goto L_SHARE;
-    }
-  }
-
-  return mrb_obj_value(s1);
-}
-
-static mrb_int
-str_rindex(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int pos)
-{
-  char *s, *sbeg, *t;
-  struct RString *ps = mrb_str_ptr(str);
-  mrb_int len = RSTRING_LEN(sub);
-
-  /* substring longer than string */
-  if (RSTR_LEN(ps) < len) return -1;
-  if (RSTR_LEN(ps) - pos < len) {
-    pos = RSTR_LEN(ps) - len;
-  }
-  sbeg = RSTR_PTR(ps);
-  s = RSTR_PTR(ps) + pos;
-  t = RSTRING_PTR(sub);
-  if (len) {
-    while (sbeg <= s) {
-      if (memcmp(s, t, len) == 0) {
-        return s - RSTR_PTR(ps);
-      }
-      s--;
-    }
-    return -1;
-  }
-  else {
-    return pos;
-  }
-}
-
-MRB_API mrb_int
-mrb_str_strlen(mrb_state *mrb, struct RString *s)
-{
-  mrb_int i, max = RSTR_LEN(s);
-  char *p = RSTR_PTR(s);
-
-  if (!p) return 0;
-  for (i=0; i<max; i++) {
-    if (p[i] == '\0') {
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
-    }
-  }
-  return max;
-}
-
-#ifdef _WIN32
-#include <windows.h>
-
-char*
-mrb_utf8_from_locale(const char *str, size_t len)
-{
-  wchar_t* wcsp;
-  char* mbsp;
-  size_t mbssize, wcssize;
-
-  if (len == 0)
-    return strdup("");
-  if (len == -1)
-    len = strlen(str);
-  wcssize = MultiByteToWideChar(GetACP(), 0, str, len,  NULL, 0);
-  wcsp = (wchar_t*) malloc((wcssize + 1) * sizeof(wchar_t));
-  if (!wcsp)
-    return NULL;
-  wcssize = MultiByteToWideChar(GetACP(), 0, str, len, wcsp, wcssize + 1);
-  wcsp[wcssize] = 0;
-
-  mbssize = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR) wcsp, -1, NULL, 0, NULL, NULL);
-  mbsp = (char*) malloc((mbssize + 1));
-  if (!mbsp) {
-    free(wcsp);
-    return NULL;
-  }
-  mbssize = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR) wcsp, -1, mbsp, mbssize, NULL, NULL);
-  mbsp[mbssize] = 0;
-  free(wcsp);
-  return mbsp;
-}
-
-char*
-mrb_locale_from_utf8(const char *utf8, size_t len)
-{
-  wchar_t* wcsp;
-  char* mbsp;
-  size_t mbssize, wcssize;
-
-  if (len == 0)
-    return strdup("");
-  if (len == -1)
-    len = strlen(utf8);
-  wcssize = MultiByteToWideChar(CP_UTF8, 0, utf8, len,  NULL, 0);
-  wcsp = (wchar_t*) malloc((wcssize + 1) * sizeof(wchar_t));
-  if (!wcsp)
-    return NULL;
-  wcssize = MultiByteToWideChar(CP_UTF8, 0, utf8, len, wcsp, wcssize + 1);
-  wcsp[wcssize] = 0;
-  mbssize = WideCharToMultiByte(GetACP(), 0, (LPCWSTR) wcsp, -1, NULL, 0, NULL, NULL);
-  mbsp = (char*) malloc((mbssize + 1));
-  if (!mbsp) {
-    free(wcsp);
-    return NULL;
-  }
-  mbssize = WideCharToMultiByte(GetACP(), 0, (LPCWSTR) wcsp, -1, mbsp, mbssize, NULL, NULL);
-  mbsp[mbssize] = 0;
-  free(wcsp);
-  return mbsp;
-}
-#endif
-
-MRB_API void
-mrb_str_modify(mrb_state *mrb, struct RString *s)
-{
-  check_frozen(mrb, s);
-  s->flags &= ~MRB_STR_NO_UTF;
-  if (RSTR_SHARED_P(s)) {
-    mrb_shared_string *shared = s->as.heap.aux.shared;
-
-    if (shared->nofree == 0 && shared->refcnt == 1 && s->as.heap.ptr == shared->ptr) {
-      s->as.heap.ptr = shared->ptr;
-      s->as.heap.aux.capa = shared->len;
-      RSTR_PTR(s)[s->as.heap.len] = '\0';
-      mrb_free(mrb, shared);
-    }
-    else {
-      char *ptr, *p;
-      mrb_int len;
-
-      p = RSTR_PTR(s);
-      len = s->as.heap.len;
-      if (len < RSTRING_EMBED_LEN_MAX) {
-        RSTR_SET_EMBED_FLAG(s);
-        RSTR_SET_EMBED_LEN(s, len);
-        ptr = RSTR_PTR(s);
-      }
-      else {
-        ptr = (char *)mrb_malloc(mrb, (size_t)len + 1);
-        s->as.heap.ptr = ptr;
-        s->as.heap.aux.capa = len;
-      }
-      if (p) {
-        memcpy(ptr, p, len);
-      }
-      ptr[len] = '\0';
-      str_decref(mrb, shared);
-    }
-    RSTR_UNSET_SHARED_FLAG(s);
-    return;
-  }
-  if (RSTR_NOFREE_P(s)) {
-    char *p = s->as.heap.ptr;
-    mrb_int len = s->as.heap.len;
-
-    RSTR_UNSET_NOFREE_FLAG(s);
-    if (len < RSTRING_EMBED_LEN_MAX) {
-      RSTR_SET_EMBED_FLAG(s);
-      RSTR_SET_EMBED_LEN(s, len);
-    }
-    else {
-      s->as.heap.ptr = (char *)mrb_malloc(mrb, (size_t)len+1);
-      s->as.heap.aux.capa = len;
-    }
-    if (p) {
-      memcpy(RSTR_PTR(s), p, len);
-    }
-    RSTR_PTR(s)[len] = '\0';
-    return;
-  }
-}
-
-MRB_API mrb_value
-mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len)
-{
-  mrb_int slen;
-  struct RString *s = mrb_str_ptr(str);
-
-  mrb_str_modify(mrb, s);
-  slen = RSTR_LEN(s);
-  if (len != slen) {
-    if (slen < len || slen - len > 256) {
-      resize_capa(mrb, s, len);
-    }
-    RSTR_SET_LEN(s, len);
-    RSTR_PTR(s)[len] = '\0';   /* sentinel */
-  }
-  return str;
-}
-
-MRB_API char*
-mrb_str_to_cstr(mrb_state *mrb, mrb_value str0)
-{
-  struct RString *s;
-
-  if (!mrb_string_p(str0)) {
-    mrb_raise(mrb, E_TYPE_ERROR, "expected String");
-  }
-
-  s = str_new(mrb, RSTRING_PTR(str0), RSTRING_LEN(str0));
-  if ((strlen(RSTR_PTR(s)) ^ RSTR_LEN(s)) != 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
-  }
-  return RSTR_PTR(s);
-}
-
-/*
- *  call-seq: (Caution! String("abcd") change)
- *     String("abcdefg") = String("abcd") + String("efg")
- *
- *  Returns a new string object containing a copy of <i>str</i>.
- */
-MRB_API void
-mrb_str_concat(mrb_state *mrb, mrb_value self, mrb_value other)
-{
-  struct RString *s1 = mrb_str_ptr(self), *s2;
-  mrb_int len;
-
-  mrb_str_modify(mrb, s1);
-  if (!mrb_string_p(other)) {
-    other = mrb_str_to_str(mrb, other);
-  }
-  s2 = mrb_str_ptr(other);
-  if (RSTR_LEN(s2) == 0) {
-    return;
-  }
-  len = RSTR_LEN(s1) + RSTR_LEN(s2);
-
-  if (len < 0 || len >= MRB_INT_MAX) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "string size too big");
-  }
-  if (RSTRING_CAPA(self) < len) {
-    resize_capa(mrb, s1, len);
-  }
-  memcpy(RSTR_PTR(s1)+RSTR_LEN(s1), RSTR_PTR(s2), RSTR_LEN(s2));
-  RSTR_SET_LEN(s1, len);
-  RSTR_PTR(s1)[len] = '\0';
-}
-
-/*
- *  call-seq: (Caution! String("abcd") remain)
- *     String("abcdefg") = String("abcd") + String("efg")
- *
- *  Returns a new string object containing a copy of <i>str</i>.
- */
-MRB_API mrb_value
-mrb_str_plus(mrb_state *mrb, mrb_value a, mrb_value b)
-{
-  struct RString *s = mrb_str_ptr(a);
-  struct RString *s2 = mrb_str_ptr(b);
-  struct RString *t;
-
-  t = str_new(mrb, 0, RSTR_LEN(s) + RSTR_LEN(s2));
-  memcpy(RSTR_PTR(t), RSTR_PTR(s), RSTR_LEN(s));
-  memcpy(RSTR_PTR(t) + RSTR_LEN(s), RSTR_PTR(s2), RSTR_LEN(s2));
-
-  return mrb_obj_value(t);
-}
-
-/* 15.2.10.5.2  */
-
-/*
- *  call-seq: (Caution! String("abcd") remain) for stack_argument
- *     String("abcdefg") = String("abcd") + String("efg")
- *
- *  Returns a new string object containing a copy of <i>str</i>.
- */
-static mrb_value
-mrb_str_plus_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  mrb_get_args(mrb, "S", &str);
-  return mrb_str_plus(mrb, self, str);
-}
-
-/* 15.2.10.5.26 */
-/* 15.2.10.5.33 */
-/*
- *  call-seq:
- *     "abcd".size   => int
- *
- *  Returns the length of string.
- */
-static mrb_value
-mrb_str_size(mrb_state *mrb, mrb_value self)
-{
-  mrb_int len = RSTRING_CHAR_LEN(self);
-  return mrb_fixnum_value(len);
-}
-
-static mrb_value
-mrb_str_bytesize(mrb_state *mrb, mrb_value self)
-{
-  mrb_int len = RSTRING_LEN(self);
-  return mrb_fixnum_value(len);
-}
-
-/* 15.2.10.5.1  */
-/*
- *  call-seq:
- *     str * integer   => new_str
- *
- *  Copy---Returns a new <code>String</code> containing <i>integer</i> copies of
- *  the receiver.
- *
- *     "Ho! " * 3   #=> "Ho! Ho! Ho! "
- */
-static mrb_value
-mrb_str_times(mrb_state *mrb, mrb_value self)
-{
-  mrb_int n,len,times;
-  struct RString *str2;
-  char *p;
-
-  mrb_get_args(mrb, "i", &times);
-  if (times < 0) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "negative argument");
-  }
-  if (times && MRB_INT_MAX / times < RSTRING_LEN(self)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "argument too big");
-  }
-
-  len = RSTRING_LEN(self)*times;
-  str2 = str_new(mrb, 0, len);
-  str_with_class(mrb, str2, self);
-  p = RSTR_PTR(str2);
-  if (len > 0) {
-    n = RSTRING_LEN(self);
-    memcpy(p, RSTRING_PTR(self), n);
-    while (n <= len/2) {
-      memcpy(p + n, p, n);
-      n *= 2;
-    }
-    memcpy(p + n, p, len-n);
-  }
-  p[RSTR_LEN(str2)] = '\0';
-
-  return mrb_obj_value(str2);
-}
-/* -------------------------------------------------------------- */
-
-#define lesser(a,b) (((a)>(b))?(b):(a))
-
-/* ---------------------------*/
-/*
- *  call-seq:
- *     mrb_value str1 <=> mrb_value str2   => int
- *                     >  1
- *                     =  0
- *                     <  -1
- */
-MRB_API int
-mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2)
-{
-  mrb_int len;
-  mrb_int retval;
-  struct RString *s1 = mrb_str_ptr(str1);
-  struct RString *s2 = mrb_str_ptr(str2);
-
-  len = lesser(RSTR_LEN(s1), RSTR_LEN(s2));
-  retval = memcmp(RSTR_PTR(s1), RSTR_PTR(s2), len);
-  if (retval == 0) {
-    if (RSTR_LEN(s1) == RSTR_LEN(s2)) return 0;
-    if (RSTR_LEN(s1) > RSTR_LEN(s2))  return 1;
-    return -1;
-  }
-  if (retval > 0) return 1;
-  return -1;
-}
-
-/* 15.2.10.5.3  */
-
-/*
- *  call-seq:
- *     str <=> other_str   => -1, 0, +1
- *
- *  Comparison---Returns -1 if <i>other_str</i> is less than, 0 if
- *  <i>other_str</i> is equal to, and +1 if <i>other_str</i> is greater than
- *  <i>str</i>. If the strings are of different lengths, and the strings are
- *  equal when compared up to the shortest length, then the longer string is
- *  considered greater than the shorter one. If the variable <code>$=</code> is
- *  <code>false</code>, the comparison is based on comparing the binary values
- *  of each character in the string. In older versions of Ruby, setting
- *  <code>$=</code> allowed case-insensitive comparisons; this is now deprecated
- *  in favor of using <code>String#casecmp</code>.
- *
- *  <code><=></code> is the basis for the methods <code><</code>,
- *  <code><=</code>, <code>></code>, <code>>=</code>, and <code>between?</code>,
- *  included from module <code>Comparable</code>.  The method
- *  <code>String#==</code> does not use <code>Comparable#==</code>.
- *
- *     "abcdef" <=> "abcde"     #=> 1
- *     "abcdef" <=> "abcdef"    #=> 0
- *     "abcdef" <=> "abcdefg"   #=> -1
- *     "abcdef" <=> "ABCDEF"    #=> 1
- */
-static mrb_value
-mrb_str_cmp_m(mrb_state *mrb, mrb_value str1)
-{
-  mrb_value str2;
-  mrb_int result;
-
-  mrb_get_args(mrb, "o", &str2);
-  if (!mrb_string_p(str2)) {
-    if (!mrb_respond_to(mrb, str2, mrb_intern_lit(mrb, "to_s"))) {
-      return mrb_nil_value();
-    }
-    else if (!mrb_respond_to(mrb, str2, mrb_intern_lit(mrb, "<=>"))) {
-      return mrb_nil_value();
-    }
-    else {
-      mrb_value tmp = mrb_funcall(mrb, str2, "<=>", 1, str1);
-
-      if (!mrb_nil_p(tmp)) return mrb_nil_value();
-      if (!mrb_fixnum_p(tmp)) {
-        return mrb_funcall(mrb, mrb_fixnum_value(0), "-", 1, tmp);
-      }
-      result = -mrb_fixnum(tmp);
-    }
-  }
-  else {
-    result = mrb_str_cmp(mrb, str1, str2);
-  }
-  return mrb_fixnum_value(result);
-}
-
-static mrb_bool
-str_eql(mrb_state *mrb, const mrb_value str1, const mrb_value str2)
-{
-  const mrb_int len = RSTRING_LEN(str1);
-
-  if (len != RSTRING_LEN(str2)) return FALSE;
-  if (memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2), (size_t)len) == 0)
-    return TRUE;
-  return FALSE;
-}
-
-MRB_API mrb_bool
-mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2)
-{
-  if (mrb_immediate_p(str2)) return FALSE;
-  if (!mrb_string_p(str2)) {
-    if (mrb_nil_p(str2)) return FALSE;
-    if (!mrb_respond_to(mrb, str2, mrb_intern_lit(mrb, "to_str"))) {
-      return FALSE;
-    }
-    str2 = mrb_funcall(mrb, str2, "to_str", 0);
-    return mrb_equal(mrb, str2, str1);
-  }
-  return str_eql(mrb, str1, str2);
-}
-
-/* 15.2.10.5.4  */
-/*
- *  call-seq:
- *     str == obj   => true or false
- *
- *  Equality---
- *  If <i>obj</i> is not a <code>String</code>, returns <code>false</code>.
- *  Otherwise, returns <code>false</code> or <code>true</code>
- *
- *   caution:if <i>str</i> <code><=></code> <i>obj</i> returns zero.
- */
-static mrb_value
-mrb_str_equal_m(mrb_state *mrb, mrb_value str1)
-{
-  mrb_value str2;
-
-  mrb_get_args(mrb, "o", &str2);
-
-  return mrb_bool_value(mrb_str_equal(mrb, str1, str2));
-}
-/* ---------------------------------- */
-MRB_API mrb_value
-mrb_str_to_str(mrb_state *mrb, mrb_value str)
-{
-  mrb_value s;
-
-  if (!mrb_string_p(str)) {
-    s = mrb_check_convert_type(mrb, str, MRB_TT_STRING, "String", "to_str");
-    if (mrb_nil_p(s)) {
-      s = mrb_convert_type(mrb, str, MRB_TT_STRING, "String", "to_s");
-    }
-    return s;
-  }
-  return str;
-}
-
-MRB_API const char*
-mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr)
-{
-  mrb_value str = mrb_str_to_str(mrb, ptr);
-  return RSTRING_PTR(str);
-}
-
-MRB_API mrb_int
-mrb_string_value_len(mrb_state *mrb, mrb_value ptr)
-{
-  mrb_value str = mrb_str_to_str(mrb, ptr);
-  return RSTRING_LEN(str);
-}
-
-void
-mrb_noregexp(mrb_state *mrb, mrb_value self)
-{
-  mrb_raise(mrb, E_NOTIMP_ERROR, "Regexp class not implemented");
-}
-
-void
-mrb_regexp_check(mrb_state *mrb, mrb_value obj)
-{
-  if (mrb_regexp_p(mrb, obj)) {
-    mrb_noregexp(mrb, obj);
-  }
-}
-
-MRB_API mrb_value
-mrb_str_dup(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = mrb_str_ptr(str);
-  struct RString *dup = str_new(mrb, 0, 0);
-
-  str_with_class(mrb, dup, str);
-  return str_replace(mrb, dup, s);
-}
-
-static mrb_value
-mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value indx)
-{
-  mrb_int idx;
-
-  mrb_regexp_check(mrb, indx);
-  switch (mrb_type(indx)) {
-    case MRB_TT_FIXNUM:
-      idx = mrb_fixnum(indx);
-
-num_index:
-      str = str_substr(mrb, str, idx, 1);
-      if (!mrb_nil_p(str) && RSTRING_LEN(str) == 0) return mrb_nil_value();
-      return str;
-
-    case MRB_TT_STRING:
-      if (str_index(mrb, str, indx, 0) != -1)
-        return mrb_str_dup(mrb, indx);
-      return mrb_nil_value();
-
-    case MRB_TT_RANGE:
-      goto range_arg;
-
-    default:
-      indx = mrb_Integer(mrb, indx);
-      if (mrb_nil_p(indx)) {
-      range_arg:
-        {
-          mrb_int beg, len;
-
-          len = RSTRING_CHAR_LEN(str);
-          switch (mrb_range_beg_len(mrb, indx, &beg, &len, len, TRUE)) {
-          case 1:
-            return str_subseq(mrb, str, beg, len);
-          case 2:
-            return mrb_nil_value();
-          default:
-            break;
-          }
-        }
-        mrb_raise(mrb, E_TYPE_ERROR, "can't convert to Fixnum");
-      }
-      idx = mrb_fixnum(indx);
-      goto num_index;
-  }
-  return mrb_nil_value();    /* not reached */
-}
-
-/* 15.2.10.5.6  */
-/* 15.2.10.5.34 */
-/*
- *  call-seq:
- *     str[fixnum]                 => fixnum or nil
- *     str[fixnum, fixnum]         => new_str or nil
- *     str[range]                  => new_str or nil
- *     str[regexp]                 => new_str or nil
- *     str[regexp, fixnum]         => new_str or nil
- *     str[other_str]              => new_str or nil
- *     str.slice(fixnum)           => fixnum or nil
- *     str.slice(fixnum, fixnum)   => new_str or nil
- *     str.slice(range)            => new_str or nil
- *     str.slice(other_str)        => new_str or nil
- *
- *  Element Reference---If passed a single <code>Fixnum</code>, returns the code
- *  of the character at that position. If passed two <code>Fixnum</code>
- *  objects, returns a substring starting at the offset given by the first, and
- *  a length given by the second. If given a range, a substring containing
- *  characters at offsets given by the range is returned. In all three cases, if
- *  an offset is negative, it is counted from the end of <i>str</i>. Returns
- *  <code>nil</code> if the initial offset falls outside the string, the length
- *  is negative, or the beginning of the range is greater than the end.
- *
- *  If a <code>String</code> is given, that string is returned if it occurs in
- *  <i>str</i>. In both cases, <code>nil</code> is returned if there is no
- *  match.
- *
- *     a = "hello there"
- *     a[1]                   #=> 101(1.8.7) "e"(1.9.2)
- *     a[1.1]                 #=>            "e"(1.9.2)
- *     a[1,3]                 #=> "ell"
- *     a[1..3]                #=> "ell"
- *     a[-3,2]                #=> "er"
- *     a[-4..-2]              #=> "her"
- *     a[12..-1]              #=> nil
- *     a[-2..-4]              #=> ""
- *     a["lo"]                #=> "lo"
- *     a["bye"]               #=> nil
- */
-static mrb_value
-mrb_str_aref_m(mrb_state *mrb, mrb_value str)
-{
-  mrb_value a1, a2;
-  int argc;
-
-  argc = mrb_get_args(mrb, "o|o", &a1, &a2);
-  if (argc == 2) {
-    mrb_int n1, n2;
-
-    mrb_regexp_check(mrb, a1);
-    mrb_get_args(mrb, "ii", &n1, &n2);
-    return str_substr(mrb, str, n1, n2);
-  }
-  if (argc != 1) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%S for 1)", mrb_fixnum_value(argc));
-  }
-  return mrb_str_aref(mrb, str, a1);
-}
-
-/* 15.2.10.5.8  */
-/*
- *  call-seq:
- *     str.capitalize!   => str or nil
- *
- *  Modifies <i>str</i> by converting the first character to uppercase and the
- *  remainder to lowercase. Returns <code>nil</code> if no changes are made.
- *
- *     a = "hello"
- *     a.capitalize!   #=> "Hello"
- *     a               #=> "Hello"
- *     a.capitalize!   #=> nil
- */
-static mrb_value
-mrb_str_capitalize_bang(mrb_state *mrb, mrb_value str)
-{
-  char *p, *pend;
-  mrb_bool modify = FALSE;
-  struct RString *s = mrb_str_ptr(str);
-
-  mrb_str_modify(mrb, s);
-  if (RSTR_LEN(s) == 0 || !RSTR_PTR(s)) return mrb_nil_value();
-  p = RSTR_PTR(s); pend = RSTR_PTR(s) + RSTR_LEN(s);
-  if (ISLOWER(*p)) {
-    *p = TOUPPER(*p);
-    modify = TRUE;
-  }
-  while (++p < pend) {
-    if (ISUPPER(*p)) {
-      *p = TOLOWER(*p);
-      modify = TRUE;
-    }
-  }
-  if (modify) return str;
-  return mrb_nil_value();
-}
-
-/* 15.2.10.5.7  */
-/*
- *  call-seq:
- *     str.capitalize   => new_str
- *
- *  Returns a copy of <i>str</i> with the first character converted to uppercase
- *  and the remainder to lowercase.
- *
- *     "hello".capitalize    #=> "Hello"
- *     "HELLO".capitalize    #=> "Hello"
- *     "123ABC".capitalize   #=> "123abc"
- */
-static mrb_value
-mrb_str_capitalize(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  str = mrb_str_dup(mrb, self);
-  mrb_str_capitalize_bang(mrb, str);
-  return str;
-}
-
-/* 15.2.10.5.10  */
-/*
- *  call-seq:
- *     str.chomp!(separator="\n")   => str or nil
- *
- *  Modifies <i>str</i> in place as described for <code>String#chomp</code>,
- *  returning <i>str</i>, or <code>nil</code> if no modifications were made.
- */
-static mrb_value
-mrb_str_chomp_bang(mrb_state *mrb, mrb_value str)
-{
-  mrb_value rs;
-  mrb_int newline;
-  char *p, *pp;
-  mrb_int rslen;
-  mrb_int len;
-  mrb_int argc;
-  struct RString *s = mrb_str_ptr(str);
-
-  mrb_str_modify(mrb, s);
-  argc = mrb_get_args(mrb, "|S", &rs);
-  len = RSTR_LEN(s);
-  if (argc == 0) {
-    if (len == 0) return mrb_nil_value();
-  smart_chomp:
-    if (RSTR_PTR(s)[len-1] == '\n') {
-      RSTR_SET_LEN(s, RSTR_LEN(s) - 1);
-      if (RSTR_LEN(s) > 0 &&
-          RSTR_PTR(s)[RSTR_LEN(s)-1] == '\r') {
-        RSTR_SET_LEN(s, RSTR_LEN(s) - 1);
-      }
-    }
-    else if (RSTR_PTR(s)[len-1] == '\r') {
-      RSTR_SET_LEN(s, RSTR_LEN(s) - 1);
-    }
-    else {
-      return mrb_nil_value();
-    }
-    RSTR_PTR(s)[RSTR_LEN(s)] = '\0';
-    return str;
-  }
-
-  if (len == 0 || mrb_nil_p(rs)) return mrb_nil_value();
-  p = RSTR_PTR(s);
-  rslen = RSTRING_LEN(rs);
-  if (rslen == 0) {
-    while (len>0 && p[len-1] == '\n') {
-      len--;
-      if (len>0 && p[len-1] == '\r')
-        len--;
-    }
-    if (len < RSTR_LEN(s)) {
-      RSTR_SET_LEN(s, len);
-      p[len] = '\0';
-      return str;
-    }
-    return mrb_nil_value();
-  }
-  if (rslen > len) return mrb_nil_value();
-  newline = RSTRING_PTR(rs)[rslen-1];
-  if (rslen == 1 && newline == '\n')
-    newline = RSTRING_PTR(rs)[rslen-1];
-  if (rslen == 1 && newline == '\n')
-    goto smart_chomp;
-
-  pp = p + len - rslen;
-  if (p[len-1] == newline &&
-     (rslen <= 1 ||
-     memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) {
-    RSTR_SET_LEN(s, len - rslen);
-    p[RSTR_LEN(s)] = '\0';
-    return str;
-  }
-  return mrb_nil_value();
-}
-
-/* 15.2.10.5.9  */
-/*
- *  call-seq:
- *     str.chomp(separator="\n")   => new_str
- *
- *  Returns a new <code>String</code> with the given record separator removed
- *  from the end of <i>str</i> (if present). If <code>$/</code> has not been
- *  changed from the default Ruby record separator, then <code>chomp</code> also
- *  removes carriage return characters (that is it will remove <code>\n</code>,
- *  <code>\r</code>, and <code>\r\n</code>).
- *
- *     "hello".chomp            #=> "hello"
- *     "hello\n".chomp          #=> "hello"
- *     "hello\r\n".chomp        #=> "hello"
- *     "hello\n\r".chomp        #=> "hello\n"
- *     "hello\r".chomp          #=> "hello"
- *     "hello \n there".chomp   #=> "hello \n there"
- *     "hello".chomp("llo")     #=> "he"
- */
-static mrb_value
-mrb_str_chomp(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  str = mrb_str_dup(mrb, self);
-  mrb_str_chomp_bang(mrb, str);
-  return str;
-}
-
-/* 15.2.10.5.12 */
-/*
- *  call-seq:
- *     str.chop!   => str or nil
- *
- *  Processes <i>str</i> as for <code>String#chop</code>, returning <i>str</i>,
- *  or <code>nil</code> if <i>str</i> is the empty string.  See also
- *  <code>String#chomp!</code>.
- */
-static mrb_value
-mrb_str_chop_bang(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = mrb_str_ptr(str);
-
-  mrb_str_modify(mrb, s);
-  if (RSTR_LEN(s) > 0) {
-    mrb_int len;
-#ifdef MRB_UTF8_STRING
-    const char* t = RSTR_PTR(s), *p = t;
-    const char* e = p + RSTR_LEN(s);
-    while (p<e) {
-      mrb_int clen = utf8len(p, e);
-      if (p + clen>=e) break;
-      p += clen;
-    }
-    len = p - t;
-#else
-    len = RSTR_LEN(s) - 1;
-#endif
-    if (RSTR_PTR(s)[len] == '\n') {
-      if (len > 0 &&
-          RSTR_PTR(s)[len-1] == '\r') {
-        len--;
-      }
-    }
-    RSTR_SET_LEN(s, len);
-    RSTR_PTR(s)[len] = '\0';
-    return str;
-  }
-  return mrb_nil_value();
-}
-
-/* 15.2.10.5.11 */
-/*
- *  call-seq:
- *     str.chop   => new_str
- *
- *  Returns a new <code>String</code> with the last character removed.  If the
- *  string ends with <code>\r\n</code>, both characters are removed. Applying
- *  <code>chop</code> to an empty string returns an empty
- *  string. <code>String#chomp</code> is often a safer alternative, as it leaves
- *  the string unchanged if it doesn't end in a record separator.
- *
- *     "string\r\n".chop   #=> "string"
- *     "string\n\r".chop   #=> "string\n"
- *     "string\n".chop     #=> "string"
- *     "string".chop       #=> "strin"
- *     "x".chop            #=> ""
- */
-static mrb_value
-mrb_str_chop(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-  str = mrb_str_dup(mrb, self);
-  mrb_str_chop_bang(mrb, str);
-  return str;
-}
-
-/* 15.2.10.5.14 */
-/*
- *  call-seq:
- *     str.downcase!   => str or nil
- *
- *  Downcases the contents of <i>str</i>, returning <code>nil</code> if no
- *  changes were made.
- */
-static mrb_value
-mrb_str_downcase_bang(mrb_state *mrb, mrb_value str)
-{
-  char *p, *pend;
-  mrb_bool modify = FALSE;
-  struct RString *s = mrb_str_ptr(str);
-
-  mrb_str_modify(mrb, s);
-  p = RSTR_PTR(s);
-  pend = RSTR_PTR(s) + RSTR_LEN(s);
-  while (p < pend) {
-    if (ISUPPER(*p)) {
-      *p = TOLOWER(*p);
-      modify = TRUE;
-    }
-    p++;
-  }
-
-  if (modify) return str;
-  return mrb_nil_value();
-}
-
-/* 15.2.10.5.13 */
-/*
- *  call-seq:
- *     str.downcase   => new_str
- *
- *  Returns a copy of <i>str</i> with all uppercase letters replaced with their
- *  lowercase counterparts. The operation is locale insensitive---only
- *  characters 'A' to 'Z' are affected.
- *
- *     "hEllO".downcase   #=> "hello"
- */
-static mrb_value
-mrb_str_downcase(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  str = mrb_str_dup(mrb, self);
-  mrb_str_downcase_bang(mrb, str);
-  return str;
-}
-
-/* 15.2.10.5.16 */
-/*
- *  call-seq:
- *     str.empty?   => true or false
- *
- *  Returns <code>true</code> if <i>str</i> has a length of zero.
- *
- *     "hello".empty?   #=> false
- *     "".empty?        #=> true
- */
-static mrb_value
-mrb_str_empty_p(mrb_state *mrb, mrb_value self)
-{
-  struct RString *s = mrb_str_ptr(self);
-
-  return mrb_bool_value(RSTR_LEN(s) == 0);
-}
-
-/* 15.2.10.5.17 */
-/*
- * call-seq:
- *   str.eql?(other)   => true or false
- *
- * Two strings are equal if the have the same length and content.
- */
-static mrb_value
-mrb_str_eql(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str2;
-  mrb_bool eql_p;
-
-  mrb_get_args(mrb, "o", &str2);
-  eql_p = (mrb_type(str2) == MRB_TT_STRING) && str_eql(mrb, self, str2);
-
-  return mrb_bool_value(eql_p);
-}
-
-MRB_API mrb_value
-mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len)
-{
-  return str_substr(mrb, str, beg, len);
-}
-
-mrb_int
-mrb_str_hash(mrb_state *mrb, mrb_value str)
-{
-  /* 1-8-7 */
-  struct RString *s = mrb_str_ptr(str);
-  mrb_int len = RSTR_LEN(s);
-  char *p = RSTR_PTR(s);
-  uint64_t key = 0;
-
-  while (len--) {
-    key = key*65599 + *p;
-    p++;
-  }
-  return (mrb_int)(key + (key>>5));
-}
-
-/* 15.2.10.5.20 */
-/*
- * call-seq:
- *    str.hash   => fixnum
- *
- * Return a hash based on the string's length and content.
- */
-static mrb_value
-mrb_str_hash_m(mrb_state *mrb, mrb_value self)
-{
-  mrb_int key = mrb_str_hash(mrb, self);
-  return mrb_fixnum_value(key);
-}
-
-/* 15.2.10.5.21 */
-/*
- *  call-seq:
- *     str.include? other_str   => true or false
- *     str.include? fixnum      => true or false
- *
- *  Returns <code>true</code> if <i>str</i> contains the given string or
- *  character.
- *
- *     "hello".include? "lo"   #=> true
- *     "hello".include? "ol"   #=> false
- *     "hello".include? ?h     #=> true
- */
-static mrb_value
-mrb_str_include(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str2;
-
-  mrb_get_args(mrb, "S", &str2);
-  if (str_index(mrb, self, str2, 0) < 0)
-    return mrb_bool_value(FALSE);
-  return mrb_bool_value(TRUE);
-}
-
-/* 15.2.10.5.22 */
-/*
- *  call-seq:
- *     str.index(substring [, offset])   => fixnum or nil
- *     str.index(fixnum [, offset])      => fixnum or nil
- *     str.index(regexp [, offset])      => fixnum or nil
- *
- *  Returns the index of the first occurrence of the given
- *  <i>substring</i>,
- *  character (<i>fixnum</i>), or pattern (<i>regexp</i>) in <i>str</i>.
- *  Returns
- *  <code>nil</code> if not found.
- *  If the second parameter is present, it
- *  specifies the position in the string to begin the search.
- *
- *     "hello".index('e')             #=> 1
- *     "hello".index('lo')            #=> 3
- *     "hello".index('a')             #=> nil
- *     "hello".index(101)             #=> 1(101=0x65='e')
- *     "hello".index(/[aeiou]/, -3)   #=> 4
- */
-static mrb_value
-mrb_str_index(mrb_state *mrb, mrb_value str)
-{
-  mrb_value *argv;
-  mrb_int argc;
-  mrb_value sub;
-  mrb_int pos, clen;
-
-  mrb_get_args(mrb, "*!", &argv, &argc);
-  if (argc == 2) {
-    mrb_get_args(mrb, "oi", &sub, &pos);
-  }
-  else {
-    pos = 0;
-    if (argc > 0)
-      sub = argv[0];
-    else
-      sub = mrb_nil_value();
-  }
-  mrb_regexp_check(mrb, sub);
-  clen = RSTRING_CHAR_LEN(str);
-  if (pos < 0) {
-    pos += clen;
-    if (pos < 0) {
-      return mrb_nil_value();
-    }
-  }
-  if (pos > clen) return mrb_nil_value();
-  pos = chars2bytes(str, 0, pos);
-
-  switch (mrb_type(sub)) {
-    default: {
-      mrb_value tmp;
-
-      tmp = mrb_check_string_type(mrb, sub);
-      if (mrb_nil_p(tmp)) {
-        mrb_raisef(mrb, E_TYPE_ERROR, "type mismatch: %S given", sub);
-      }
-      sub = tmp;
-    }
-    /* fall through */
-    case MRB_TT_STRING:
-      pos = str_index(mrb, str, sub, pos);
-      break;
-  }
-
-  if (pos == -1) return mrb_nil_value();
-  pos = bytes2chars(RSTRING_PTR(str), pos);
-  BYTES_ALIGN_CHECK(pos);
-  return mrb_fixnum_value(pos);
-}
-
-#define STR_REPLACE_SHARED_MIN 10
-
-/* 15.2.10.5.24 */
-/* 15.2.10.5.28 */
-/*
- *  call-seq:
- *     str.replace(other_str)   => str
- *
- *     s = "hello"         #=> "hello"
- *     s.replace "world"   #=> "world"
- */
-static mrb_value
-mrb_str_replace(mrb_state *mrb, mrb_value str)
-{
-  mrb_value str2;
-
-  mrb_get_args(mrb, "S", &str2);
-  return str_replace(mrb, mrb_str_ptr(str), mrb_str_ptr(str2));
-}
-
-/* 15.2.10.5.23 */
-/*
- *  call-seq:
- *     String.new(str="")   => new_str
- *
- *  Returns a new string object containing a copy of <i>str</i>.
- */
-static mrb_value
-mrb_str_init(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str2;
-
-  if (mrb_get_args(mrb, "|S", &str2) == 0) {
-    struct RString *s = str_new(mrb, 0, 0);
-    str2 = mrb_obj_value(s);
-  }
-  str_replace(mrb, mrb_str_ptr(self), mrb_str_ptr(str2));
-  return self;
-}
-
-/* 15.2.10.5.25 */
-/* 15.2.10.5.41 */
-/*
- *  call-seq:
- *     str.intern   => symbol
- *     str.to_sym   => symbol
- *
- *  Returns the <code>Symbol</code> corresponding to <i>str</i>, creating the
- *  symbol if it did not previously exist. See <code>Symbol#id2name</code>.
- *
- *     "Koala".intern         #=> :Koala
- *     s = 'cat'.to_sym       #=> :cat
- *     s == :cat              #=> true
- *     s = '@cat'.to_sym      #=> :@cat
- *     s == :@cat             #=> true
- *
- *  This can also be used to create symbols that cannot be represented using the
- *  <code>:xxx</code> notation.
- *
- *     'cat and dog'.to_sym   #=> :"cat and dog"
- */
-MRB_API mrb_value
-mrb_str_intern(mrb_state *mrb, mrb_value self)
-{
-  return mrb_symbol_value(mrb_intern_str(mrb, self));
-}
-/* ---------------------------------- */
-MRB_API mrb_value
-mrb_obj_as_string(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value str;
-
-  if (mrb_string_p(obj)) {
-    return obj;
-  }
-  str = mrb_funcall(mrb, obj, "to_s", 0);
-  if (!mrb_string_p(str))
-    return mrb_any_to_s(mrb, obj);
-  return str;
-}
-
-MRB_API mrb_value
-mrb_ptr_to_str(mrb_state *mrb, void *p)
-{
-  struct RString *p_str;
-  char *p1;
-  char *p2;
-  uintptr_t n = (uintptr_t)p;
-
-  p_str = str_new(mrb, NULL, 2 + sizeof(uintptr_t) * CHAR_BIT / 4);
-  p1 = RSTR_PTR(p_str);
-  *p1++ = '0';
-  *p1++ = 'x';
-  p2 = p1;
-
-  do {
-    *p2++ = mrb_digitmap[n % 16];
-    n /= 16;
-  } while (n > 0);
-  *p2 = '\0';
-  RSTR_SET_LEN(p_str, (mrb_int)(p2 - RSTR_PTR(p_str)));
-
-  while (p1 < p2) {
-    const char  c = *p1;
-    *p1++ = *--p2;
-    *p2 = c;
-  }
-
-  return mrb_obj_value(p_str);
-}
-
-MRB_API mrb_value
-mrb_string_type(mrb_state *mrb, mrb_value str)
-{
-  return mrb_convert_type(mrb, str, MRB_TT_STRING, "String", "to_str");
-}
-
-MRB_API mrb_value
-mrb_check_string_type(mrb_state *mrb, mrb_value str)
-{
-  return mrb_check_convert_type(mrb, str, MRB_TT_STRING, "String", "to_str");
-}
-
-/* 15.2.10.5.30 */
-/*
- *  call-seq:
- *     str.reverse!   => str
- *
- *  Reverses <i>str</i> in place.
- */
-static mrb_value
-mrb_str_reverse_bang(mrb_state *mrb, mrb_value str)
-{
-#ifdef MRB_UTF8_STRING
-  mrb_int utf8_len = RSTRING_CHAR_LEN(str);
-  mrb_int len = RSTRING_LEN(str);
-
-  if (utf8_len == len) goto bytes;
-  if (utf8_len > 1) {
-    char *buf;
-    char *p, *e, *r;
-
-    mrb_str_modify(mrb, mrb_str_ptr(str));
-    len = RSTRING_LEN(str);
-    buf = (char*)mrb_malloc(mrb, (size_t)len);
-    p = buf;
-    e = buf + len;
-
-    memcpy(buf, RSTRING_PTR(str), len);
-    r = RSTRING_PTR(str) + len;
-
-    while (p<e) {
-      mrb_int clen = utf8len(p, e);
-      r -= clen;
-      memcpy(r, p, clen);
-      p += clen;
-    }
-    mrb_free(mrb, buf);
-  }
-  return str;
-
- bytes:
-#endif
-  {
-    struct RString *s = mrb_str_ptr(str);
-    char *p, *e;
-    char c;
-
-    mrb_str_modify(mrb, s);
-    if (RSTR_LEN(s) > 1) {
-      p = RSTR_PTR(s);
-      e = p + RSTR_LEN(s) - 1;
-      while (p < e) {
-      c = *p;
-      *p++ = *e;
-      *e-- = c;
-      }
-    }
-    return str;
-  }
-}
-
-/* ---------------------------------- */
-/* 15.2.10.5.29 */
-/*
- *  call-seq:
- *     str.reverse   => new_str
- *
- *  Returns a new string with the characters from <i>str</i> in reverse order.
- *
- *     "stressed".reverse   #=> "desserts"
- */
-static mrb_value
-mrb_str_reverse(mrb_state *mrb, mrb_value str)
-{
-  mrb_value str2 = mrb_str_dup(mrb, str);
-  mrb_str_reverse_bang(mrb, str2);
-  return str2;
-}
-
-/* 15.2.10.5.31 */
-/*
- *  call-seq:
- *     str.rindex(substring [, fixnum])   => fixnum or nil
- *     str.rindex(fixnum [, fixnum])   => fixnum or nil
- *     str.rindex(regexp [, fixnum])   => fixnum or nil
- *
- *  Returns the index of the last occurrence of the given <i>substring</i>,
- *  character (<i>fixnum</i>), or pattern (<i>regexp</i>) in <i>str</i>. Returns
- *  <code>nil</code> if not found. If the second parameter is present, it
- *  specifies the position in the string to end the search---characters beyond
- *  this point will not be considered.
- *
- *     "hello".rindex('e')             #=> 1
- *     "hello".rindex('l')             #=> 3
- *     "hello".rindex('a')             #=> nil
- *     "hello".rindex(101)             #=> 1
- *     "hello".rindex(/[aeiou]/, -2)   #=> 1
- */
-static mrb_value
-mrb_str_rindex(mrb_state *mrb, mrb_value str)
-{
-  mrb_value *argv;
-  mrb_int argc;
-  mrb_value sub;
-  mrb_int pos, len = RSTRING_CHAR_LEN(str);
-
-  mrb_get_args(mrb, "*!", &argv, &argc);
-  if (argc == 2) {
-    mrb_get_args(mrb, "oi", &sub, &pos);
-    if (pos < 0) {
-      pos += len;
-      if (pos < 0) {
-        mrb_regexp_check(mrb, sub);
-        return mrb_nil_value();
-      }
-    }
-    if (pos > len) pos = len;
-  }
-  else {
-    pos = len;
-    if (argc > 0)
-      sub = argv[0];
-    else
-      sub = mrb_nil_value();
-  }
-  pos = chars2bytes(str, 0, pos);
-  mrb_regexp_check(mrb, sub);
-
-  switch (mrb_type(sub)) {
-    default: {
-      mrb_value tmp;
-
-      tmp = mrb_check_string_type(mrb, sub);
-      if (mrb_nil_p(tmp)) {
-        mrb_raisef(mrb, E_TYPE_ERROR, "type mismatch: %S given", sub);
-      }
-      sub = tmp;
-    }
-     /* fall through */
-    case MRB_TT_STRING:
-      pos = str_rindex(mrb, str, sub, pos);
-      if (pos >= 0) {
-        pos = bytes2chars(RSTRING_PTR(str), pos);
-        BYTES_ALIGN_CHECK(pos);
-        return mrb_fixnum_value(pos);
-      }
-      break;
-
-  } /* end of switch (TYPE(sub)) */
-  return mrb_nil_value();
-}
-
-/* 15.2.10.5.35 */
-
-/*
- *  call-seq:
- *     str.split(pattern="\n", [limit])   => anArray
- *
- *  Divides <i>str</i> into substrings based on a delimiter, returning an array
- *  of these substrings.
- *
- *  If <i>pattern</i> is a <code>String</code>, then its contents are used as
- *  the delimiter when splitting <i>str</i>. If <i>pattern</i> is a single
- *  space, <i>str</i> is split on whitespace, with leading whitespace and runs
- *  of contiguous whitespace characters ignored.
- *
- *  If <i>pattern</i> is a <code>Regexp</code>, <i>str</i> is divided where the
- *  pattern matches. Whenever the pattern matches a zero-length string,
- *  <i>str</i> is split into individual characters.
- *
- *  If <i>pattern</i> is omitted, the value of <code>$;</code> is used.  If
- *  <code>$;</code> is <code>nil</code> (which is the default), <i>str</i> is
- *  split on whitespace as if ' ' were specified.
- *
- *  If the <i>limit</i> parameter is omitted, trailing null fields are
- *  suppressed. If <i>limit</i> is a positive number, at most that number of
- *  fields will be returned (if <i>limit</i> is <code>1</code>, the entire
- *  string is returned as the only entry in an array). If negative, there is no
- *  limit to the number of fields returned, and trailing null fields are not
- *  suppressed.
- *
- *     " now's  the time".split        #=> ["now's", "the", "time"]
- *     " now's  the time".split(' ')   #=> ["now's", "the", "time"]
- *     " now's  the time".split(/ /)   #=> ["", "now's", "", "the", "time"]
- *     "hello".split(//)               #=> ["h", "e", "l", "l", "o"]
- *     "hello".split(//, 3)            #=> ["h", "e", "llo"]
- *
- *     "mellow yellow".split("ello")   #=> ["m", "w y", "w"]
- *     "1,2,,3,4,,".split(',')         #=> ["1", "2", "", "3", "4"]
- *     "1,2,,3,4,,".split(',', 4)      #=> ["1", "2", "", "3,4,,"]
- *     "1,2,,3,4,,".split(',', -4)     #=> ["1", "2", "", "3", "4", "", ""]
- */
-
-static mrb_value
-mrb_str_split_m(mrb_state *mrb, mrb_value str)
-{
-  int argc;
-  mrb_value spat = mrb_nil_value();
-  enum {awk, string, regexp} split_type = string;
-  mrb_int i = 0;
-  mrb_int beg;
-  mrb_int end;
-  mrb_int lim = 0;
-  mrb_bool lim_p;
-  mrb_value result, tmp;
-
-  argc = mrb_get_args(mrb, "|oi", &spat, &lim);
-  lim_p = (lim > 0 && argc == 2);
-  if (argc == 2) {
-    if (lim == 1) {
-      if (RSTRING_LEN(str) == 0)
-        return mrb_ary_new_capa(mrb, 0);
-      return mrb_ary_new_from_values(mrb, 1, &str);
-    }
-    i = 1;
-  }
-
-  if (argc == 0 || mrb_nil_p(spat)) {
-    split_type = awk;
-  }
-  else {
-    if (mrb_string_p(spat)) {
-      split_type = string;
-      if (RSTRING_LEN(spat) == 1 && RSTRING_PTR(spat)[0] == ' ') {
-          split_type = awk;
-      }
-    }
-    else {
-      mrb_noregexp(mrb, str);
-    }
-  }
-
-  result = mrb_ary_new(mrb);
-  beg = 0;
-  if (split_type == awk) {
-    mrb_bool skip = TRUE;
-    mrb_int idx = 0;
-    mrb_int str_len = RSTRING_LEN(str);
-    unsigned int c;
-    int ai = mrb_gc_arena_save(mrb);
-
-    idx = end = beg;
-    while (idx < str_len) {
-      c = (unsigned char)RSTRING_PTR(str)[idx++];
-      if (skip) {
-        if (ISSPACE(c)) {
-          beg = idx;
-        }
-        else {
-          end = idx;
-          skip = FALSE;
-          if (lim_p && lim <= i) break;
-        }
-      }
-      else if (ISSPACE(c)) {
-        mrb_ary_push(mrb, result, byte_subseq(mrb, str, beg, end-beg));
-        mrb_gc_arena_restore(mrb, ai);
-        skip = TRUE;
-        beg = idx;
-        if (lim_p) ++i;
-      }
-      else {
-        end = idx;
-      }
-    }
-  }
-  else if (split_type == string) {
-    mrb_int str_len = RSTRING_LEN(str);
-    mrb_int pat_len = RSTRING_LEN(spat);
-    mrb_int idx = 0;
-    int ai = mrb_gc_arena_save(mrb);
-
-    while (idx < str_len) {
-      if (pat_len > 0) {
-        end = mrb_memsearch(RSTRING_PTR(spat), pat_len, RSTRING_PTR(str)+idx, str_len - idx);
-        if (end < 0) break;
-      }
-      else {
-        end = chars2bytes(str, idx, 1);
-      }
-      mrb_ary_push(mrb, result, byte_subseq(mrb, str, idx, end));
-      mrb_gc_arena_restore(mrb, ai);
-      idx += end + pat_len;
-      if (lim_p && lim <= ++i) break;
-    }
-    beg = idx;
-  }
-  else {
-    mrb_noregexp(mrb, str);
-  }
-  if (RSTRING_LEN(str) > 0 && (lim_p || RSTRING_LEN(str) > beg || lim < 0)) {
-    if (RSTRING_LEN(str) == beg) {
-      tmp = mrb_str_new_empty(mrb, str);
-    }
-    else {
-      tmp = byte_subseq(mrb, str, beg, RSTRING_LEN(str)-beg);
-    }
-    mrb_ary_push(mrb, result, tmp);
-  }
-  if (!lim_p && lim == 0) {
-    mrb_int len;
-    while ((len = RARRAY_LEN(result)) > 0 &&
-           (tmp = RARRAY_PTR(result)[len-1], RSTRING_LEN(tmp) == 0))
-      mrb_ary_pop(mrb, result);
-  }
-
-  return result;
-}
-
-MRB_API mrb_value
-mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, int base, int badcheck)
-{
-  const char *p = str;
-  const char *pend = str + len;
-  char sign = 1;
-  int c;
-  uint64_t n = 0;
-  mrb_int val;
-
-#define conv_digit(c) \
-    (ISDIGIT(c) ? ((c) - '0') : \
-     ISLOWER(c) ? ((c) - 'a' + 10) : \
-     ISUPPER(c) ? ((c) - 'A' + 10) : \
-     -1)
-
-  if (!p) {
-    if (badcheck) goto bad;
-    return mrb_fixnum_value(0);
-  }
-  while (p<pend && ISSPACE(*p))
-    p++;
-
-  if (p[0] == '+') {
-    p++;
-  }
-  else if (p[0] == '-') {
-    p++;
-    sign = 0;
-  }
-  if (base <= 0) {
-    if (p[0] == '0') {
-      switch (p[1]) {
-        case 'x': case 'X':
-          base = 16;
-          break;
-        case 'b': case 'B':
-          base = 2;
-          break;
-        case 'o': case 'O':
-          base = 8;
-          break;
-        case 'd': case 'D':
-          base = 10;
-          break;
-        default:
-          base = 8;
-          break;
-      }
-    }
-    else if (base < -1) {
-      base = -base;
-    }
-    else {
-      base = 10;
-    }
-  }
-  switch (base) {
-    case 2:
-      if (p[0] == '0' && (p[1] == 'b'||p[1] == 'B')) {
-        p += 2;
-      }
-      break;
-    case 3:
-      break;
-    case 8:
-      if (p[0] == '0' && (p[1] == 'o'||p[1] == 'O')) {
-        p += 2;
-      }
-    case 4: case 5: case 6: case 7:
-      break;
-    case 10:
-      if (p[0] == '0' && (p[1] == 'd'||p[1] == 'D')) {
-        p += 2;
-      }
-    case 9: case 11: case 12: case 13: case 14: case 15:
-      break;
-    case 16:
-      if (p[0] == '0' && (p[1] == 'x'||p[1] == 'X')) {
-        p += 2;
-      }
-      break;
-    default:
-      if (base < 2 || 36 < base) {
-        mrb_raisef(mrb, E_ARGUMENT_ERROR, "illegal radix %S", mrb_fixnum_value(base));
-      }
-      break;
-  } /* end of switch (base) { */
-  if (p>=pend) {
-    if (badcheck) goto bad;
-    return mrb_fixnum_value(0);
-  }
-  if (*p == '0') {    /* squeeze preceding 0s */
-    p++;
-    while (p<pend) {
-      c = *p++;
-      if (c == '_') {
-        if (p<pend && *p == '_') {
-          if (badcheck) goto bad;
-          break;
-        }
-        continue;
-      }
-      if (c != '0') {
-        p--;
-        break;
-      }
-    }
-    if (*(p - 1) == '0')
-      p--;
-  }
-  if (p == pend) {
-    if (badcheck) goto bad;
-    return mrb_fixnum_value(0);
-  }
-  for ( ;p<pend;p++) {
-    if (*p == '_') {
-      p++;
-      if (p==pend) {
-        if (badcheck) goto bad;
-        continue;
-      }
-      if (*p == '_') {
-        if (badcheck) goto bad;
-        break;
-      }
-    }
-    if (badcheck && *p == '\0') {
-      goto nullbyte;
-    }
-    c = conv_digit(*p);
-    if (c < 0 || c >= base) {
-      break;
-    }
-    n *= base;
-    n += c;
-    if (n > (uint64_t)MRB_INT_MAX + (sign ? 0 : 1)) {
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "string (%S) too big for integer",
-                 mrb_str_new(mrb, str, pend-str));
-    }
-  }
-  val = (mrb_int)n;
-  if (badcheck) {
-    if (p == str) goto bad; /* no number */
-    while (p<pend && ISSPACE(*p)) p++;
-    if (p<pend) goto bad;       /* trailing garbage */
-  }
-
-  return mrb_fixnum_value(sign ? val : -val);
- nullbyte:
-  mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
-  /* not reached */
- bad:
-  mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for number(%S)",
-             mrb_inspect(mrb, mrb_str_new(mrb, str, pend-str)));
-  /* not reached */
-  return mrb_fixnum_value(0);
-}
-
-MRB_API mrb_value
-mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
-{
-  return mrb_str_len_to_inum(mrb, str, strlen(str), base, badcheck);
-}
-
-MRB_API const char*
-mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr)
-{
-  mrb_value str = mrb_str_to_str(mrb, *ptr);
-  struct RString *ps = mrb_str_ptr(str);
-  mrb_int len = mrb_str_strlen(mrb, ps);
-  char *p = RSTR_PTR(ps);
-
-  if (!p || p[len] != '\0') {
-    if (MRB_FROZEN_P(ps)) {
-      *ptr = str = mrb_str_dup(mrb, str);
-      ps = mrb_str_ptr(str);
-    }
-    mrb_str_modify(mrb, ps);
-    return RSTR_PTR(ps);
-  }
-  return p;
-}
-
-MRB_API mrb_value
-mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
-{
-  const char *s;
-  mrb_int len;
-
-  s = mrb_string_value_ptr(mrb, str);
-  len = RSTRING_LEN(str);
-  return mrb_str_len_to_inum(mrb, s, len, base, badcheck);
-}
-
-/* 15.2.10.5.38 */
-/*
- *  call-seq:
- *     str.to_i(base=10)   => integer
- *
- *  Returns the result of interpreting leading characters in <i>str</i> as an
- *  integer base <i>base</i> (between 2 and 36). Extraneous characters past the
- *  end of a valid number are ignored. If there is not a valid number at the
- *  start of <i>str</i>, <code>0</code> is returned. This method never raises an
- *  exception.
- *
- *     "12345".to_i             #=> 12345
- *     "99 red balloons".to_i   #=> 99
- *     "0a".to_i                #=> 0
- *     "0a".to_i(16)            #=> 10
- *     "hello".to_i             #=> 0
- *     "1100101".to_i(2)        #=> 101
- *     "1100101".to_i(8)        #=> 294977
- *     "1100101".to_i(10)       #=> 1100101
- *     "1100101".to_i(16)       #=> 17826049
- */
-static mrb_value
-mrb_str_to_i(mrb_state *mrb, mrb_value self)
-{
-  mrb_int base = 10;
-
-  mrb_get_args(mrb, "|i", &base);
-  if (base < 0) {
-    mrb_raisef(mrb, E_ARGUMENT_ERROR, "illegal radix %S", mrb_fixnum_value(base));
-  }
-  return mrb_str_to_inum(mrb, self, base, FALSE);
-}
-
-MRB_API double
-mrb_cstr_to_dbl(mrb_state *mrb, const char * p, mrb_bool badcheck)
-{
-  char *end;
-  char buf[DBL_DIG * 4 + 10];
-  double d;
-
-  enum {max_width = 20};
-
-  if (!p) return 0.0;
-  while (ISSPACE(*p)) p++;
-
-  if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
-    return 0.0;
-  }
-  d = mrb_float_read(p, &end);
-  if (p == end) {
-    if (badcheck) {
-bad:
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for float(%S)", mrb_str_new_cstr(mrb, p));
-      /* not reached */
-    }
-    return d;
-  }
-  if (*end) {
-    char *n = buf;
-    char *e = buf + sizeof(buf) - 1;
-    char prev = 0;
-
-    while (p < end && n < e) prev = *n++ = *p++;
-    while (*p) {
-      if (*p == '_') {
-        /* remove underscores between digits */
-        if (badcheck) {
-          if (n == buf || !ISDIGIT(prev)) goto bad;
-          ++p;
-          if (!ISDIGIT(*p)) goto bad;
-        }
-        else {
-          while (*++p == '_');
-          continue;
-        }
-      }
-      prev = *p++;
-      if (n < e) *n++ = prev;
-    }
-    *n = '\0';
-    p = buf;
-
-    if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
-      return 0.0;
-    }
-
-    d = mrb_float_read(p, &end);
-    if (badcheck) {
-      if (!end || p == end) goto bad;
-      while (*end && ISSPACE(*end)) end++;
-      if (*end) goto bad;
-    }
-  }
-  return d;
-}
-
-MRB_API double
-mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck)
-{
-  char *s;
-  mrb_int len;
-
-  str = mrb_str_to_str(mrb, str);
-  s = RSTRING_PTR(str);
-  len = RSTRING_LEN(str);
-  if (s) {
-    if (badcheck && memchr(s, '\0', len)) {
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "string for Float contains null byte");
-    }
-    if (s[len]) {    /* no sentinel somehow */
-      struct RString *temp_str = str_new(mrb, s, len);
-      s = RSTR_PTR(temp_str);
-    }
-  }
-  return mrb_cstr_to_dbl(mrb, s, badcheck);
-}
-
-/* 15.2.10.5.39 */
-/*
- *  call-seq:
- *     str.to_f   => float
- *
- *  Returns the result of interpreting leading characters in <i>str</i> as a
- *  floating point number. Extraneous characters past the end of a valid number
- *  are ignored. If there is not a valid number at the start of <i>str</i>,
- *  <code>0.0</code> is returned. This method never raises an exception.
- *
- *     "123.45e1".to_f        #=> 1234.5
- *     "45.67 degrees".to_f   #=> 45.67
- *     "thx1138".to_f         #=> 0.0
- */
-static mrb_value
-mrb_str_to_f(mrb_state *mrb, mrb_value self)
-{
-  return mrb_float_value(mrb, mrb_str_to_dbl(mrb, self, FALSE));
-}
-
-/* 15.2.10.5.40 */
-/*
- *  call-seq:
- *     str.to_s     => str
- *     str.to_str   => str
- *
- *  Returns the receiver.
- */
-static mrb_value
-mrb_str_to_s(mrb_state *mrb, mrb_value self)
-{
-  if (mrb_obj_class(mrb, self) != mrb->string_class) {
-    return mrb_str_dup(mrb, self);
-  }
-  return self;
-}
-
-/* 15.2.10.5.43 */
-/*
- *  call-seq:
- *     str.upcase!   => str or nil
- *
- *  Upcases the contents of <i>str</i>, returning <code>nil</code> if no changes
- *  were made.
- */
-static mrb_value
-mrb_str_upcase_bang(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = mrb_str_ptr(str);
-  char *p, *pend;
-  mrb_bool modify = FALSE;
-
-  mrb_str_modify(mrb, s);
-  p = RSTRING_PTR(str);
-  pend = RSTRING_END(str);
-  while (p < pend) {
-    if (ISLOWER(*p)) {
-      *p = TOUPPER(*p);
-      modify = TRUE;
-    }
-    p++;
-  }
-
-  if (modify) return str;
-  return mrb_nil_value();
-}
-
-/* 15.2.10.5.42 */
-/*
- *  call-seq:
- *     str.upcase   => new_str
- *
- *  Returns a copy of <i>str</i> with all lowercase letters replaced with their
- *  uppercase counterparts. The operation is locale insensitive---only
- *  characters 'a' to 'z' are affected.
- *
- *     "hEllO".upcase   #=> "HELLO"
- */
-static mrb_value
-mrb_str_upcase(mrb_state *mrb, mrb_value self)
-{
-  mrb_value str;
-
-  str = mrb_str_dup(mrb, self);
-  mrb_str_upcase_bang(mrb, str);
-  return str;
-}
-
-#define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{'))
-
-/*
- *  call-seq:
- *     str.dump   -> new_str
- *
- *  Produces a version of <i>str</i> with all nonprinting characters replaced by
- *  <code>\nnn</code> notation and all special characters escaped.
- */
-mrb_value
-mrb_str_dump(mrb_state *mrb, mrb_value str)
-{
-  mrb_int len;
-  const char *p, *pend;
-  char *q;
-  struct RString *result;
-
-  len = 2;                  /* "" */
-  p = RSTRING_PTR(str); pend = p + RSTRING_LEN(str);
-  while (p < pend) {
-    unsigned char c = *p++;
-    switch (c) {
-      case '"':  case '\\':
-      case '\n': case '\r':
-      case '\t': case '\f':
-      case '\013': case '\010': case '\007': case '\033':
-        len += 2;
-        break;
-
-      case '#':
-        len += IS_EVSTR(p, pend) ? 2 : 1;
-        break;
-
-      default:
-        if (ISPRINT(c)) {
-          len++;
-        }
-        else {
-          len += 4;                /* \NNN */
-        }
-        break;
-    }
-  }
-
-  result = str_new(mrb, 0, len);
-  str_with_class(mrb, result, str);
-  p = RSTRING_PTR(str); pend = p + RSTRING_LEN(str);
-  q = RSTR_PTR(result);
-  *q++ = '"';
-  while (p < pend) {
-    unsigned char c = *p++;
-
-    switch (c) {
-      case '"':
-      case '\\':
-        *q++ = '\\';
-        *q++ = c;
-        break;
-
-      case '\n':
-        *q++ = '\\';
-        *q++ = 'n';
-        break;
-
-      case '\r':
-        *q++ = '\\';
-        *q++ = 'r';
-        break;
-
-      case '\t':
-        *q++ = '\\';
-        *q++ = 't';
-        break;
-
-      case '\f':
-        *q++ = '\\';
-        *q++ = 'f';
-        break;
-
-      case '\013':
-        *q++ = '\\';
-        *q++ = 'v';
-        break;
-
-      case '\010':
-        *q++ = '\\';
-        *q++ = 'b';
-        break;
-
-      case '\007':
-        *q++ = '\\';
-        *q++ = 'a';
-        break;
-
-      case '\033':
-        *q++ = '\\';
-        *q++ = 'e';
-        break;
-
-      case '#':
-        if (IS_EVSTR(p, pend)) *q++ = '\\';
-        *q++ = '#';
-        break;
-
-      default:
-        if (ISPRINT(c)) {
-          *q++ = c;
-        }
-        else {
-          *q++ = '\\';
-          q[2] = '0' + c % 8; c /= 8;
-          q[1] = '0' + c % 8; c /= 8;
-          q[0] = '0' + c % 8;
-          q += 3;
-        }
-    }
-  }
-  *q = '"';
-  return mrb_obj_value(result);
-}
-
-MRB_API mrb_value
-mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len)
-{
-  str_buf_cat(mrb, mrb_str_ptr(str), ptr, len);
-  return str;
-}
-
-MRB_API mrb_value
-mrb_str_cat_cstr(mrb_state *mrb, mrb_value str, const char *ptr)
-{
-  return mrb_str_cat(mrb, str, ptr, strlen(ptr));
-}
-
-MRB_API mrb_value
-mrb_str_cat_str(mrb_state *mrb, mrb_value str, mrb_value str2)
-{
-  return mrb_str_cat(mrb, str, RSTRING_PTR(str2), RSTRING_LEN(str2));
-}
-
-MRB_API mrb_value
-mrb_str_append(mrb_state *mrb, mrb_value str1, mrb_value str2)
-{
-  str2 = mrb_str_to_str(mrb, str2);
-  return mrb_str_cat_str(mrb, str1, str2);
-}
-
-#define CHAR_ESC_LEN 13 /* sizeof(\x{ hex of 32bit unsigned int } \0) */
-
-/*
- * call-seq:
- *   str.inspect   -> string
- *
- * Returns a printable version of _str_, surrounded by quote marks,
- * with special characters escaped.
- *
- *    str = "hello"
- *    str[3] = "\b"
- *    str.inspect       #=> "\"hel\\bo\""
- */
-mrb_value
-mrb_str_inspect(mrb_state *mrb, mrb_value str)
-{
-  const char *p, *pend;
-  char buf[CHAR_ESC_LEN + 1];
-  mrb_value result = mrb_str_new_lit(mrb, "\"");
-
-  p = RSTRING_PTR(str); pend = RSTRING_END(str);
-  for (;p < pend; p++) {
-    unsigned char c, cc;
-#ifdef MRB_UTF8_STRING
-    mrb_int clen;
-
-    clen = utf8len(p, pend);
-    if (clen > 1) {
-      mrb_int i;
-
-      for (i=0; i<clen; i++) {
-        buf[i] = p[i];
-      }
-      mrb_str_cat(mrb, result, buf, clen);
-      p += clen-1;
-      continue;
-    }
-#endif
-    c = *p;
-    if (c == '"'|| c == '\\' || (c == '#' && IS_EVSTR(p+1, pend))) {
-      buf[0] = '\\'; buf[1] = c;
-      mrb_str_cat(mrb, result, buf, 2);
-      continue;
-    }
-    if (ISPRINT(c)) {
-      buf[0] = c;
-      mrb_str_cat(mrb, result, buf, 1);
-      continue;
-    }
-    switch (c) {
-      case '\n': cc = 'n'; break;
-      case '\r': cc = 'r'; break;
-      case '\t': cc = 't'; break;
-      case '\f': cc = 'f'; break;
-      case '\013': cc = 'v'; break;
-      case '\010': cc = 'b'; break;
-      case '\007': cc = 'a'; break;
-      case 033: cc = 'e'; break;
-      default: cc = 0; break;
-    }
-    if (cc) {
-      buf[0] = '\\';
-      buf[1] = (char)cc;
-      mrb_str_cat(mrb, result, buf, 2);
-      continue;
-    }
-    else {
-      buf[0] = '\\';
-      buf[3] = '0' + c % 8; c /= 8;
-      buf[2] = '0' + c % 8; c /= 8;
-      buf[1] = '0' + c % 8;
-      mrb_str_cat(mrb, result, buf, 4);
-      continue;
-    }
-  }
-  mrb_str_cat_lit(mrb, result, "\"");
-
-  return result;
-}
-
-/*
- * call-seq:
- *   str.bytes   -> array of fixnums
- *
- * Returns an array of bytes in _str_.
- *
- *    str = "hello"
- *    str.bytes       #=> [104, 101, 108, 108, 111]
- */
-static mrb_value
-mrb_str_bytes(mrb_state *mrb, mrb_value str)
-{
-  struct RString *s = mrb_str_ptr(str);
-  mrb_value a = mrb_ary_new_capa(mrb, RSTR_LEN(s));
-  unsigned char *p = (unsigned char *)(RSTR_PTR(s)), *pend = p + RSTR_LEN(s);
-
-  while (p < pend) {
-    mrb_ary_push(mrb, a, mrb_fixnum_value(p[0]));
-    p++;
-  }
-  return a;
-}
-
-/* ---------------------------*/
-void
-mrb_init_string(mrb_state *mrb)
-{
-  struct RClass *s;
-
-  mrb_static_assert(RSTRING_EMBED_LEN_MAX < (1 << 5), "pointer size too big for embedded string");
-
-  mrb->string_class = s = mrb_define_class(mrb, "String", mrb->object_class);             /* 15.2.10 */
-  MRB_SET_INSTANCE_TT(s, MRB_TT_STRING);
-
-  mrb_define_method(mrb, s, "bytesize",        mrb_str_bytesize,        MRB_ARGS_NONE());
-
-  mrb_define_method(mrb, s, "<=>",             mrb_str_cmp_m,           MRB_ARGS_REQ(1)); /* 15.2.10.5.1  */
-  mrb_define_method(mrb, s, "==",              mrb_str_equal_m,         MRB_ARGS_REQ(1)); /* 15.2.10.5.2  */
-  mrb_define_method(mrb, s, "+",               mrb_str_plus_m,          MRB_ARGS_REQ(1)); /* 15.2.10.5.4  */
-  mrb_define_method(mrb, s, "*",               mrb_str_times,           MRB_ARGS_REQ(1)); /* 15.2.10.5.5  */
-  mrb_define_method(mrb, s, "[]",              mrb_str_aref_m,          MRB_ARGS_ANY());  /* 15.2.10.5.6  */
-  mrb_define_method(mrb, s, "capitalize",      mrb_str_capitalize,      MRB_ARGS_NONE()); /* 15.2.10.5.7  */
-  mrb_define_method(mrb, s, "capitalize!",     mrb_str_capitalize_bang, MRB_ARGS_NONE()); /* 15.2.10.5.8  */
-  mrb_define_method(mrb, s, "chomp",           mrb_str_chomp,           MRB_ARGS_ANY());  /* 15.2.10.5.9  */
-  mrb_define_method(mrb, s, "chomp!",          mrb_str_chomp_bang,      MRB_ARGS_ANY());  /* 15.2.10.5.10 */
-  mrb_define_method(mrb, s, "chop",            mrb_str_chop,            MRB_ARGS_NONE()); /* 15.2.10.5.11 */
-  mrb_define_method(mrb, s, "chop!",           mrb_str_chop_bang,       MRB_ARGS_NONE()); /* 15.2.10.5.12 */
-  mrb_define_method(mrb, s, "downcase",        mrb_str_downcase,        MRB_ARGS_NONE()); /* 15.2.10.5.13 */
-  mrb_define_method(mrb, s, "downcase!",       mrb_str_downcase_bang,   MRB_ARGS_NONE()); /* 15.2.10.5.14 */
-  mrb_define_method(mrb, s, "empty?",          mrb_str_empty_p,         MRB_ARGS_NONE()); /* 15.2.10.5.16 */
-  mrb_define_method(mrb, s, "eql?",            mrb_str_eql,             MRB_ARGS_REQ(1)); /* 15.2.10.5.17 */
-
-  mrb_define_method(mrb, s, "hash",            mrb_str_hash_m,          MRB_ARGS_NONE()); /* 15.2.10.5.20 */
-  mrb_define_method(mrb, s, "include?",        mrb_str_include,         MRB_ARGS_REQ(1)); /* 15.2.10.5.21 */
-  mrb_define_method(mrb, s, "index",           mrb_str_index,           MRB_ARGS_ANY());  /* 15.2.10.5.22 */
-  mrb_define_method(mrb, s, "initialize",      mrb_str_init,            MRB_ARGS_REQ(1)); /* 15.2.10.5.23 */
-  mrb_define_method(mrb, s, "initialize_copy", mrb_str_replace,         MRB_ARGS_REQ(1)); /* 15.2.10.5.24 */
-  mrb_define_method(mrb, s, "intern",          mrb_str_intern,          MRB_ARGS_NONE()); /* 15.2.10.5.25 */
-  mrb_define_method(mrb, s, "length",          mrb_str_size,            MRB_ARGS_NONE()); /* 15.2.10.5.26 */
-  mrb_define_method(mrb, s, "replace",         mrb_str_replace,         MRB_ARGS_REQ(1)); /* 15.2.10.5.28 */
-  mrb_define_method(mrb, s, "reverse",         mrb_str_reverse,         MRB_ARGS_NONE()); /* 15.2.10.5.29 */
-  mrb_define_method(mrb, s, "reverse!",        mrb_str_reverse_bang,    MRB_ARGS_NONE()); /* 15.2.10.5.30 */
-  mrb_define_method(mrb, s, "rindex",          mrb_str_rindex,          MRB_ARGS_ANY());  /* 15.2.10.5.31 */
-  mrb_define_method(mrb, s, "size",            mrb_str_size,            MRB_ARGS_NONE()); /* 15.2.10.5.33 */
-  mrb_define_method(mrb, s, "slice",           mrb_str_aref_m,          MRB_ARGS_ANY());  /* 15.2.10.5.34 */
-  mrb_define_method(mrb, s, "split",           mrb_str_split_m,         MRB_ARGS_ANY());  /* 15.2.10.5.35 */
-
-  mrb_define_method(mrb, s, "to_f",            mrb_str_to_f,            MRB_ARGS_NONE()); /* 15.2.10.5.38 */
-  mrb_define_method(mrb, s, "to_i",            mrb_str_to_i,            MRB_ARGS_ANY());  /* 15.2.10.5.39 */
-  mrb_define_method(mrb, s, "to_s",            mrb_str_to_s,            MRB_ARGS_NONE()); /* 15.2.10.5.40 */
-  mrb_define_method(mrb, s, "to_str",          mrb_str_to_s,            MRB_ARGS_NONE());
-  mrb_define_method(mrb, s, "to_sym",          mrb_str_intern,          MRB_ARGS_NONE()); /* 15.2.10.5.41 */
-  mrb_define_method(mrb, s, "upcase",          mrb_str_upcase,          MRB_ARGS_NONE()); /* 15.2.10.5.42 */
-  mrb_define_method(mrb, s, "upcase!",         mrb_str_upcase_bang,     MRB_ARGS_NONE()); /* 15.2.10.5.43 */
-  mrb_define_method(mrb, s, "inspect",         mrb_str_inspect,         MRB_ARGS_NONE()); /* 15.2.10.5.46(x) */
-  mrb_define_method(mrb, s, "bytes",           mrb_str_bytes,           MRB_ARGS_NONE());
-}
-
-/*
- *	Source code for the "strtod" library procedure.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The University of California
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- *
- * RCS: @(#) $Id: strtod.c 11708 2007-02-12 23:01:19Z shyouhei $
- */
-
-#include <ctype.h>
-#include <errno.h>
-
-static const int maxExponent = 511; /* Largest possible base 10 exponent.  Any
-                                     * exponent larger than this will already
-                                     * produce underflow or overflow, so there's
-                                     * no need to worry about additional digits.
-                                     */
-static const double powersOf10[] = {/* Table giving binary powers of 10.  Entry */
-    10.,                            /* is 10^2^i.  Used to convert decimal */
-    100.,			    /* exponents into floating-point numbers. */
-    1.0e4,
-    1.0e8,
-    1.0e16,
-    1.0e32,
-    1.0e64,
-    1.0e128,
-    1.0e256
-};
-
-MRB_API double
-mrb_float_read(const char *string, char **endPtr)
-/*  const char *string;		   A decimal ASCII floating-point number,
-				 * optionally preceded by white space.
-				 * Must have form "-I.FE-X", where I is the
-				 * integer part of the mantissa, F is the
-				 * fractional part of the mantissa, and X
-				 * is the exponent.  Either of the signs
-				 * may be "+", "-", or omitted.  Either I
-				 * or F may be omitted, or both.  The decimal
-				 * point isn't necessary unless F is present.
-				 * The "E" may actually be an "e".  E and X
-				 * may both be omitted (but not just one).
-				 */
-/*  char **endPtr;		   If non-NULL, store terminating character's
-				 * address here. */
-{
-    int sign, expSign = FALSE;
-    double fraction, dblExp;
-    const double *d;
-    register const char *p;
-    register int c;
-    int exp = 0;		/* Exponent read from "EX" field. */
-    int fracExp = 0;		/* Exponent that derives from the fractional
-				 * part.  Under normal circumstatnces, it is
-				 * the negative of the number of digits in F.
-				 * However, if I is very long, the last digits
-				 * of I get dropped (otherwise a long I with a
-				 * large negative exponent could cause an
-				 * unnecessary overflow on I alone).  In this
-				 * case, fracExp is incremented one for each
-				 * dropped digit. */
-    int mantSize;		/* Number of digits in mantissa. */
-    int decPt;			/* Number of mantissa digits BEFORE decimal
-				 * point. */
-    const char *pExp;		/* Temporarily holds location of exponent
-				 * in string. */
-
-    /*
-     * Strip off leading blanks and check for a sign.
-     */
-
-    p = string;
-    while (isspace(*p)) {
-	p += 1;
-    }
-    if (*p == '-') {
-	sign = TRUE;
-	p += 1;
-    }
-    else {
-	if (*p == '+') {
-	    p += 1;
-	}
-	sign = FALSE;
-    }
-
-    /*
-     * Count the number of digits in the mantissa (including the decimal
-     * point), and also locate the decimal point.
-     */
-
-    decPt = -1;
-    for (mantSize = 0; ; mantSize += 1)
-    {
-	c = *p;
-	if (!isdigit(c)) {
-	    if ((c != '.') || (decPt >= 0)) {
-		break;
-	    }
-	    decPt = mantSize;
-	}
-	p += 1;
-    }
-
-    /*
-     * Now suck up the digits in the mantissa.  Use two integers to
-     * collect 9 digits each (this is faster than using floating-point).
-     * If the mantissa has more than 18 digits, ignore the extras, since
-     * they can't affect the value anyway.
-     */
-
-    pExp  = p;
-    p -= mantSize;
-    if (decPt < 0) {
-	decPt = mantSize;
-    }
-    else {
-	mantSize -= 1;			/* One of the digits was the point. */
-    }
-    if (mantSize > 18) {
-	if (decPt - 18 > 29999) {
-	    fracExp = 29999;
-	}
-        else {
-	    fracExp = decPt - 18;
-	}
-	mantSize = 18;
-    }
-    else {
-	fracExp = decPt - mantSize;
-    }
-    if (mantSize == 0) {
-	fraction = 0.0;
-	p = string;
-	goto done;
-    }
-    else {
-	int frac1, frac2;
-	frac1 = 0;
-	for ( ; mantSize > 9; mantSize -= 1)
-	{
-	    c = *p;
-	    p += 1;
-	    if (c == '.') {
-		c = *p;
-		p += 1;
-	    }
-	    frac1 = 10*frac1 + (c - '0');
-	}
-	frac2 = 0;
-	for (; mantSize > 0; mantSize -= 1)
-	{
-	    c = *p;
-	    p += 1;
-	    if (c == '.') {
-		c = *p;
-		p += 1;
-	    }
-	    frac2 = 10*frac2 + (c - '0');
-	}
-	fraction = (1.0e9 * frac1) + frac2;
-    }
-
-    /*
-     * Skim off the exponent.
-     */
-
-    p = pExp;
-    if ((*p == 'E') || (*p == 'e')) {
-	p += 1;
-	if (*p == '-') {
-	    expSign = TRUE;
-	    p += 1;
-	}
-        else {
-	    if (*p == '+') {
-		p += 1;
-	    }
-	    expSign = FALSE;
-	}
-	while (isdigit(*p)) {
-	    exp = exp * 10 + (*p - '0');
-	    if (exp > 19999) {
-		exp = 19999;
-	    }
-	    p += 1;
-	}
-    }
-    if (expSign) {
-	exp = fracExp - exp;
-    }
-    else {
-	exp = fracExp + exp;
-    }
-
-    /*
-     * Generate a floating-point number that represents the exponent.
-     * Do this by processing the exponent one bit at a time to combine
-     * many powers of 2 of 10. Then combine the exponent with the
-     * fraction.
-     */
-
-    if (exp < 0) {
-	expSign = TRUE;
-	exp = -exp;
-    }
-    else {
-	expSign = FALSE;
-    }
-    if (exp > maxExponent) {
-	exp = maxExponent;
-	errno = ERANGE;
-    }
-    dblExp = 1.0;
-    for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
-	if (exp & 01) {
-	    dblExp *= *d;
-	}
-    }
-    if (expSign) {
-	fraction /= dblExp;
-    }
-    else {
-	fraction *= dblExp;
-    }
-
-done:
-    if (endPtr != NULL) {
-	*endPtr = (char *) p;
-    }
-
-    if (sign) {
-	return -fraction;
-    }
-    return fraction;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/symbol.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/symbol.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/symbol.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/symbol.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,494 +0,0 @@
-/*
-** symbol.c - Symbol class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <limits.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/khash.h>
-#include <mruby/string.h>
-#include <mruby/dump.h>
-#include <mruby/class.h>
-
-/* ------------------------------------------------------ */
-typedef struct symbol_name {
-  mrb_bool lit : 1;
-  uint16_t len;
-  const char *name;
-} symbol_name;
-
-static inline khint_t
-sym_hash_func(mrb_state *mrb, mrb_sym s)
-{
-  khint_t h = 0;
-  size_t i, len = mrb->symtbl[s].len;
-  const char *p = mrb->symtbl[s].name;
-
-  for (i=0; i<len; i++) {
-    h = (h << 5) - h + *p++;
-  }
-  return h;
-}
-#define sym_hash_equal(mrb,a, b) (mrb->symtbl[a].len == mrb->symtbl[b].len && memcmp(mrb->symtbl[a].name, mrb->symtbl[b].name, mrb->symtbl[a].len) == 0)
-
-KHASH_DECLARE(n2s, mrb_sym, mrb_sym, FALSE)
-KHASH_DEFINE (n2s, mrb_sym, mrb_sym, FALSE, sym_hash_func, sym_hash_equal)
-/* ------------------------------------------------------ */
-
-static void
-sym_validate_len(mrb_state *mrb, size_t len)
-{
-  if (len >= RITE_LV_NULL_MARK) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "symbol length too long");
-  }
-}
-
-static mrb_sym
-sym_intern(mrb_state *mrb, const char *name, size_t len, mrb_bool lit)
-{
-  khash_t(n2s) *h = mrb->name2sym;
-  symbol_name *sname = mrb->symtbl; /* symtbl[0] for working memory */
-  khiter_t k;
-  mrb_sym sym;
-  char *p;
-
-  sym_validate_len(mrb, len);
-  if (sname) {
-    sname->lit = lit;
-    sname->len = (uint16_t)len;
-    sname->name = name;
-    k = kh_get(n2s, mrb, h, 0);
-    if (k != kh_end(h))
-      return kh_key(h, k);
-  }
-
-  /* registering a new symbol */
-  sym = ++mrb->symidx;
-  if (mrb->symcapa < sym) {
-    if (mrb->symcapa == 0) mrb->symcapa = 100;
-    else mrb->symcapa = (size_t)(mrb->symcapa * 1.2);
-    mrb->symtbl = (symbol_name*)mrb_realloc(mrb, mrb->symtbl, sizeof(symbol_name)*(mrb->symcapa+1));
-  }
-  sname = &mrb->symtbl[sym];
-  sname->len = (uint16_t)len;
-  if (lit || mrb_ro_data_p(name)) {
-    sname->name = name;
-    sname->lit = TRUE;
-  }
-  else {
-    p = (char *)mrb_malloc(mrb, len+1);
-    memcpy(p, name, len);
-    p[len] = 0;
-    sname->name = (const char*)p;
-    sname->lit = FALSE;
-  }
-  kh_put(n2s, mrb, h, sym);
-
-  return sym;
-}
-
-MRB_API mrb_sym
-mrb_intern(mrb_state *mrb, const char *name, size_t len)
-{
-  return sym_intern(mrb, name, len, FALSE);
-}
-
-MRB_API mrb_sym
-mrb_intern_static(mrb_state *mrb, const char *name, size_t len)
-{
-  return sym_intern(mrb, name, len, TRUE);
-}
-
-MRB_API mrb_sym
-mrb_intern_cstr(mrb_state *mrb, const char *name)
-{
-  return mrb_intern(mrb, name, strlen(name));
-}
-
-MRB_API mrb_sym
-mrb_intern_str(mrb_state *mrb, mrb_value str)
-{
-  return mrb_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
-}
-
-MRB_API mrb_value
-mrb_check_intern(mrb_state *mrb, const char *name, size_t len)
-{
-  khash_t(n2s) *h = mrb->name2sym;
-  symbol_name *sname = mrb->symtbl;
-  khiter_t k;
-
-  sym_validate_len(mrb, len);
-  sname->len = (uint16_t)len;
-  sname->name = name;
-
-  k = kh_get(n2s, mrb, h, 0);
-  if (k != kh_end(h)) {
-    return mrb_symbol_value(kh_key(h, k));
-  }
-  return mrb_nil_value();
-}
-
-MRB_API mrb_value
-mrb_check_intern_cstr(mrb_state *mrb, const char *name)
-{
-  return mrb_check_intern(mrb, name, (mrb_int)strlen(name));
-}
-
-MRB_API mrb_value
-mrb_check_intern_str(mrb_state *mrb, mrb_value str)
-{
-  return mrb_check_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
-}
-
-/* lenp must be a pointer to a size_t variable */
-MRB_API const char*
-mrb_sym2name_len(mrb_state *mrb, mrb_sym sym, mrb_int *lenp)
-{
-  if (sym == 0 || mrb->symidx < sym) {
-    if (lenp) *lenp = 0;
-    return NULL;
-  }
-
-  if (lenp) *lenp = mrb->symtbl[sym].len;
-  return mrb->symtbl[sym].name;
-}
-
-void
-mrb_free_symtbl(mrb_state *mrb)
-{
-  mrb_sym i, lim;
-
-  for (i=1, lim=mrb->symidx+1; i<lim; i++) {
-    if (!mrb->symtbl[i].lit) {
-      mrb_free(mrb, (char*)mrb->symtbl[i].name);
-    }
-  }
-  mrb_free(mrb, mrb->symtbl);
-  kh_destroy(n2s, mrb, mrb->name2sym);
-}
-
-void
-mrb_init_symtbl(mrb_state *mrb)
-{
-  mrb->name2sym = kh_init(n2s, mrb);
-}
-
-/**********************************************************************
- * Document-class: Symbol
- *
- *  <code>Symbol</code> objects represent names and some strings
- *  inside the Ruby
- *  interpreter. They are generated using the <code>:name</code> and
- *  <code>:"string"</code> literals
- *  syntax, and by the various <code>to_sym</code> methods. The same
- *  <code>Symbol</code> object will be created for a given name or string
- *  for the duration of a program's execution, regardless of the context
- *  or meaning of that name. Thus if <code>Fred</code> is a constant in
- *  one context, a method in another, and a class in a third, the
- *  <code>Symbol</code> <code>:Fred</code> will be the same object in
- *  all three contexts.
- *
- *     module One
- *       class Fred
- *       end
- *       $f1 = :Fred
- *     end
- *     module Two
- *       Fred = 1
- *       $f2 = :Fred
- *     end
- *     def Fred()
- *     end
- *     $f3 = :Fred
- *     $f1.object_id   #=> 2514190
- *     $f2.object_id   #=> 2514190
- *     $f3.object_id   #=> 2514190
- *
- */
-
-
-/* 15.2.11.3.1  */
-/*
- *  call-seq:
- *     sym == obj   -> true or false
- *
- *  Equality---If <i>sym</i> and <i>obj</i> are exactly the same
- *  symbol, returns <code>true</code>.
- */
-
-static mrb_value
-sym_equal(mrb_state *mrb, mrb_value sym1)
-{
-  mrb_value sym2;
-
-  mrb_get_args(mrb, "o", &sym2);
-
-  return mrb_bool_value(mrb_obj_equal(mrb, sym1, sym2));
-}
-
-/* 15.2.11.3.2  */
-/* 15.2.11.3.3  */
-/*
- *  call-seq:
- *     sym.id2name   -> string
- *     sym.to_s      -> string
- *
- *  Returns the name or string corresponding to <i>sym</i>.
- *
- *     :fred.id2name   #=> "fred"
- */
-static mrb_value
-mrb_sym_to_s(mrb_state *mrb, mrb_value sym)
-{
-  mrb_sym id = mrb_symbol(sym);
-  const char *p;
-  mrb_int len;
-
-  p = mrb_sym2name_len(mrb, id, &len);
-  return mrb_str_new_static(mrb, p, len);
-}
-
-/* 15.2.11.3.4  */
-/*
- * call-seq:
- *   sym.to_sym   -> sym
- *   sym.intern   -> sym
- *
- * In general, <code>to_sym</code> returns the <code>Symbol</code> corresponding
- * to an object. As <i>sym</i> is already a symbol, <code>self</code> is returned
- * in this case.
- */
-
-static mrb_value
-sym_to_sym(mrb_state *mrb, mrb_value sym)
-{
-  return sym;
-}
-
-/* 15.2.11.3.5(x)  */
-/*
- *  call-seq:
- *     sym.inspect    -> string
- *
- *  Returns the representation of <i>sym</i> as a symbol literal.
- *
- *     :fred.inspect   #=> ":fred"
- */
-
-#if __STDC__
-# define SIGN_EXTEND_CHAR(c) ((signed char)(c))
-#else  /* not __STDC__ */
-/* As in Harbison and Steele.  */
-# define SIGN_EXTEND_CHAR(c) ((((unsigned char)(c)) ^ 128) - 128)
-#endif
-#define is_identchar(c) (SIGN_EXTEND_CHAR(c)!=-1&&(ISALNUM(c) || (c) == '_'))
-
-static mrb_bool
-is_special_global_name(const char* m)
-{
-  switch (*m) {
-    case '~': case '*': case '$': case '?': case '!': case '@':
-    case '/': case '\\': case ';': case ',': case '.': case '=':
-    case ':': case '<': case '>': case '\"':
-    case '&': case '`': case '\'': case '+':
-    case '0':
-      ++m;
-      break;
-    case '-':
-      ++m;
-      if (is_identchar(*m)) m += 1;
-      break;
-    default:
-      if (!ISDIGIT(*m)) return FALSE;
-      do ++m; while (ISDIGIT(*m));
-      break;
-  }
-  return !*m;
-}
-
-static mrb_bool
-symname_p(const char *name)
-{
-  const char *m = name;
-  mrb_bool localid = FALSE;
-
-  if (!m) return FALSE;
-  switch (*m) {
-    case '\0':
-      return FALSE;
-
-    case '$':
-      if (is_special_global_name(++m)) return TRUE;
-      goto id;
-
-    case '@':
-      if (*++m == '@') ++m;
-      goto id;
-
-    case '<':
-      switch (*++m) {
-        case '<': ++m; break;
-        case '=': if (*++m == '>') ++m; break;
-        default: break;
-      }
-      break;
-
-    case '>':
-      switch (*++m) {
-        case '>': case '=': ++m; break;
-        default: break;
-      }
-      break;
-
-    case '=':
-      switch (*++m) {
-        case '~': ++m; break;
-        case '=': if (*++m == '=') ++m; break;
-        default: return FALSE;
-      }
-      break;
-
-    case '*':
-      if (*++m == '*') ++m;
-      break;
-    case '!':
-      switch (*++m) {
-        case '=': case '~': ++m;
-      }
-      break;
-    case '+': case '-':
-      if (*++m == '@') ++m;
-      break;
-    case '|':
-      if (*++m == '|') ++m;
-      break;
-    case '&':
-      if (*++m == '&') ++m;
-      break;
-
-    case '^': case '/': case '%': case '~': case '`':
-      ++m;
-      break;
-
-    case '[':
-      if (*++m != ']') return FALSE;
-      if (*++m == '=') ++m;
-      break;
-
-    default:
-      localid = !ISUPPER(*m);
-id:
-      if (*m != '_' && !ISALPHA(*m)) return FALSE;
-      while (is_identchar(*m)) m += 1;
-      if (localid) {
-        switch (*m) {
-          case '!': case '?': case '=': ++m;
-          default: break;
-            }
-        }
-      break;
-  }
-  return *m ? FALSE : TRUE;
-}
-
-static mrb_value
-sym_inspect(mrb_state *mrb, mrb_value sym)
-{
-  mrb_value str;
-  const char *name;
-  mrb_int len;
-  mrb_sym id = mrb_symbol(sym);
-  char *sp;
-
-  name = mrb_sym2name_len(mrb, id, &len);
-  str = mrb_str_new(mrb, 0, len+1);
-  sp = RSTRING_PTR(str);
-  RSTRING_PTR(str)[0] = ':';
-  memcpy(sp+1, name, len);
-  mrb_assert_int_fit(mrb_int, len, size_t, SIZE_MAX);
-  if (!symname_p(name) || strlen(name) != (size_t)len) {
-    str = mrb_str_dump(mrb, str);
-    sp = RSTRING_PTR(str);
-    sp[0] = ':';
-    sp[1] = '"';
-  }
-  return str;
-}
-
-MRB_API mrb_value
-mrb_sym2str(mrb_state *mrb, mrb_sym sym)
-{
-  mrb_int len;
-  const char *name = mrb_sym2name_len(mrb, sym, &len);
-
-  if (!name) return mrb_undef_value(); /* can't happen */
-  return mrb_str_new_static(mrb, name, len);
-}
-
-MRB_API const char*
-mrb_sym2name(mrb_state *mrb, mrb_sym sym)
-{
-  mrb_int len;
-  const char *name = mrb_sym2name_len(mrb, sym, &len);
-
-  if (!name) return NULL;
-  if (symname_p(name) && strlen(name) == (size_t)len) {
-    return name;
-  }
-  else {
-    mrb_value str = mrb_str_dump(mrb, mrb_str_new_static(mrb, name, len));
-    return RSTRING_PTR(str);
-  }
-}
-
-#define lesser(a,b) (((a)>(b))?(b):(a))
-
-static mrb_value
-sym_cmp(mrb_state *mrb, mrb_value s1)
-{
-  mrb_value s2;
-  mrb_sym sym1, sym2;
-
-  mrb_get_args(mrb, "o", &s2);
-  if (mrb_type(s2) != MRB_TT_SYMBOL) return mrb_nil_value();
-  sym1 = mrb_symbol(s1);
-  sym2 = mrb_symbol(s2);
-  if (sym1 == sym2) return mrb_fixnum_value(0);
-  else {
-    const char *p1, *p2;
-    int retval;
-    mrb_int len, len1, len2;
-
-    p1 = mrb_sym2name_len(mrb, sym1, &len1);
-    p2 = mrb_sym2name_len(mrb, sym2, &len2);
-    len = lesser(len1, len2);
-    retval = memcmp(p1, p2, len);
-    if (retval == 0) {
-      if (len1 == len2) return mrb_fixnum_value(0);
-      if (len1 > len2)  return mrb_fixnum_value(1);
-      return mrb_fixnum_value(-1);
-    }
-    if (retval > 0) return mrb_fixnum_value(1);
-    return mrb_fixnum_value(-1);
-  }
-}
-
-void
-mrb_init_symbol(mrb_state *mrb)
-{
-  struct RClass *sym;
-
-  mrb->symbol_class = sym = mrb_define_class(mrb, "Symbol", mrb->object_class);                 /* 15.2.11 */
-  MRB_SET_INSTANCE_TT(sym, MRB_TT_SYMBOL);
-  mrb_undef_class_method(mrb,  sym, "new");
-
-  mrb_define_method(mrb, sym, "===",             sym_equal,      MRB_ARGS_REQ(1));              /* 15.2.11.3.1  */
-  mrb_define_method(mrb, sym, "id2name",         mrb_sym_to_s,   MRB_ARGS_NONE());              /* 15.2.11.3.2  */
-  mrb_define_method(mrb, sym, "to_s",            mrb_sym_to_s,   MRB_ARGS_NONE());              /* 15.2.11.3.3  */
-  mrb_define_method(mrb, sym, "to_sym",          sym_to_sym,     MRB_ARGS_NONE());              /* 15.2.11.3.4  */
-  mrb_define_method(mrb, sym, "inspect",         sym_inspect,    MRB_ARGS_NONE());              /* 15.2.11.3.5(x)  */
-  mrb_define_method(mrb, sym, "<=>",             sym_cmp,        MRB_ARGS_REQ(1));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/value_array.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/value_array.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/value_array.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/value_array.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#ifndef MRB_VALUE_ARRAY_H__
-#define MRB_VALUE_ARRAY_H__
-
-#include <mruby.h>
-
-static inline void
-value_move(mrb_value *s1, const mrb_value *s2, size_t n)
-{
-  if (s1 > s2 && s1 < s2 + n)
-  {
-    s1 += n;
-    s2 += n;
-    while (n-- > 0) {
-      *--s1 = *--s2;
-    }
-  }
-  else if (s1 != s2) {
-    while (n-- > 0) {
-      *s1++ = *s2++;
-    }
-  }
-  else {
-    /* nothing to do. */
-  }
-}
-
-#endif /* MRB_VALUE_ARRAY_H__ */
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/variable.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/variable.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/variable.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/variable.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1097 +0,0 @@
-/*
-** variable.c - mruby variables
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/proc.h>
-#include <mruby/string.h>
-
-typedef int (iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*);
-
-#ifndef MRB_IV_SEGMENT_SIZE
-#define MRB_IV_SEGMENT_SIZE 4
-#endif
-
-typedef struct segment {
-  mrb_sym key[MRB_IV_SEGMENT_SIZE];
-  mrb_value val[MRB_IV_SEGMENT_SIZE];
-  struct segment *next;
-} segment;
-
-/* Instance variable table structure */
-typedef struct iv_tbl {
-  segment *rootseg;
-  size_t size;
-  size_t last_len;
-} iv_tbl;
-
-/*
- * Creates the instance variable table.
- *
- * Parameters
- *   mrb
- * Returns
- *   the instance variable table.
- */
-static iv_tbl*
-iv_new(mrb_state *mrb)
-{
-  iv_tbl *t;
-
-  t = (iv_tbl*)mrb_malloc(mrb, sizeof(iv_tbl));
-  t->size = 0;
-  t->rootseg =  NULL;
-  t->last_len = 0;
-
-  return t;
-}
-
-/*
- * Set the value for the symbol in the instance variable table.
- *
- * Parameters
- *   mrb
- *   t     the instance variable table to be set in.
- *   sym   the symbol to be used as the key.
- *   val   the value to be set.
- */
-static void
-iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
-{
-  segment *seg = t->rootseg;
-  segment *prev = NULL;
-  segment *matched_seg = NULL;
-  size_t matched_idx = 0;
-  size_t i;
-
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->key[i];
-      /* Found room in last segment after last_len */
-      if (!seg->next && i >= t->last_len) {
-        seg->key[i] = sym;
-        seg->val[i] = val;
-        t->last_len = i+1;
-        t->size++;
-        return;
-      }
-      if (!matched_seg && key == 0) {
-        matched_seg = seg;
-        matched_idx = i;
-      }
-      else if (key == sym) {
-        seg->val[i] = val;
-        return;
-      }
-    }
-    prev = seg;
-    seg = seg->next;
-  }
-
-  /* Not found */
-  t->size++;
-  if (matched_seg) {
-    matched_seg->key[matched_idx] = sym;
-    matched_seg->val[matched_idx] = val;
-    return;
-  }
-
-  seg = (segment*)mrb_malloc(mrb, sizeof(segment));
-  if (!seg) return;
-  seg->next = NULL;
-  seg->key[0] = sym;
-  seg->val[0] = val;
-  t->last_len = 1;
-  if (prev) {
-    prev->next = seg;
-  }
-  else {
-    t->rootseg = seg;
-  }
-}
-
-/*
- * Get a value for a symbol from the instance variable table.
- *
- * Parameters
- *   mrb
- *   t     the variable table to be searched.
- *   sym   the symbol to be used as the key.
- *   vp    the value pointer. Receives the value if the specified symbol is
- *         contained in the instance variable table.
- * Returns
- *   true if the specified symbol is contained in the instance variable table.
- */
-static mrb_bool
-iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
-{
-  segment *seg;
-  size_t i;
-
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->key[i];
-
-      if (!seg->next && i >= t->last_len) {
-        return FALSE;
-      }
-      if (key == sym) {
-        if (vp) *vp = seg->val[i];
-        return TRUE;
-      }
-    }
-    seg = seg->next;
-  }
-  return FALSE;
-}
-
-/*
- * Deletes the value for the symbol from the instance variable table.
- *
- * Parameters
- *   t    the variable table to be searched.
- *   sym  the symbol to be used as the key.
- *   vp   the value pointer. Receive the deleted value if the symbol is
- *        contained in the instance variable table.
- * Returns
- *   true if the specified symbol is contained in the instance variable table.
- */
-static mrb_bool
-iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
-{
-  segment *seg;
-  size_t i;
-
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->key[i];
-
-      if (!seg->next && i >= t->last_len) {
-        return FALSE;
-      }
-      if (key == sym) {
-        t->size--;
-        seg->key[i] = 0;
-        if (vp) *vp = seg->val[i];
-        return TRUE;
-      }
-    }
-    seg = seg->next;
-  }
-  return FALSE;
-}
-
-static mrb_bool
-iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
-{
-  segment *seg;
-  size_t i;
-  int n;
-
-  seg = t->rootseg;
-  while (seg) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->key[i];
-
-      /* no value in last segment after last_len */
-      if (!seg->next && i >= t->last_len) {
-        return FALSE;
-      }
-      if (key != 0) {
-        n =(*func)(mrb, key, seg->val[i], p);
-        if (n > 0) return FALSE;
-        if (n < 0) {
-          t->size--;
-          seg->key[i] = 0;
-        }
-      }
-    }
-    seg = seg->next;
-  }
-  return TRUE;
-}
-
-static size_t
-iv_size(mrb_state *mrb, iv_tbl *t)
-{
-  segment *seg;
-  size_t size = 0;
-
-  if (!t) return 0;
-  if (t->size > 0) return t->size;
-  seg = t->rootseg;
-  while (seg) {
-    if (seg->next == NULL) {
-      size += t->last_len;
-      return size;
-    }
-    seg = seg->next;
-    size += MRB_IV_SEGMENT_SIZE;
-  }
-  /* empty iv_tbl */
-  return 0;
-}
-
-static iv_tbl*
-iv_copy(mrb_state *mrb, iv_tbl *t)
-{
-  segment *seg;
-  iv_tbl *t2;
-
-  size_t i;
-
-  seg = t->rootseg;
-  t2 = iv_new(mrb);
-
-  while (seg != NULL) {
-    for (i=0; i<MRB_IV_SEGMENT_SIZE; i++) {
-      mrb_sym key = seg->key[i];
-      mrb_value val = seg->val[i];
-
-      if ((seg->next == NULL) && (i >= t->last_len)) {
-        return t2;
-      }
-      iv_put(mrb, t2, key, val);
-    }
-    seg = seg->next;
-  }
-  return t2;
-}
-
-static void
-iv_free(mrb_state *mrb, iv_tbl *t)
-{
-  segment *seg;
-
-  seg = t->rootseg;
-  while (seg) {
-    segment *p = seg;
-    seg = seg->next;
-    mrb_free(mrb, p);
-  }
-  mrb_free(mrb, t);
-}
-
-static int
-iv_mark_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  mrb_gc_mark_value(mrb, v);
-  return 0;
-}
-
-static void
-mark_tbl(mrb_state *mrb, iv_tbl *t)
-{
-  if (t) {
-    iv_foreach(mrb, t, iv_mark_i, 0);
-  }
-}
-
-void
-mrb_gc_mark_gv(mrb_state *mrb)
-{
-  mark_tbl(mrb, mrb->globals);
-}
-
-void
-mrb_gc_free_gv(mrb_state *mrb)
-{
-  if (mrb->globals)
-    iv_free(mrb, mrb->globals);
-}
-
-void
-mrb_gc_mark_iv(mrb_state *mrb, struct RObject *obj)
-{
-  mark_tbl(mrb, obj->iv);
-}
-
-size_t
-mrb_gc_mark_iv_size(mrb_state *mrb, struct RObject *obj)
-{
-  return iv_size(mrb, obj->iv);
-}
-
-void
-mrb_gc_free_iv(mrb_state *mrb, struct RObject *obj)
-{
-  if (obj->iv) {
-    iv_free(mrb, obj->iv);
-  }
-}
-
-mrb_value
-mrb_vm_special_get(mrb_state *mrb, mrb_sym i)
-{
-  return mrb_fixnum_value(0);
-}
-
-void
-mrb_vm_special_set(mrb_state *mrb, mrb_sym i, mrb_value v)
-{
-}
-
-static mrb_bool
-obj_iv_p(mrb_value obj)
-{
-  switch (mrb_type(obj)) {
-    case MRB_TT_OBJECT:
-    case MRB_TT_CLASS:
-    case MRB_TT_MODULE:
-    case MRB_TT_SCLASS:
-    case MRB_TT_HASH:
-    case MRB_TT_DATA:
-    case MRB_TT_EXCEPTION:
-      return TRUE;
-    default:
-      return FALSE;
-  }
-}
-
-MRB_API mrb_value
-mrb_obj_iv_get(mrb_state *mrb, struct RObject *obj, mrb_sym sym)
-{
-  mrb_value v;
-
-  if (obj->iv && iv_get(mrb, obj->iv, sym, &v))
-    return v;
-  return mrb_nil_value();
-}
-
-MRB_API mrb_value
-mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym)
-{
-  if (obj_iv_p(obj)) {
-    return mrb_obj_iv_get(mrb, mrb_obj_ptr(obj), sym);
-  }
-  return mrb_nil_value();
-}
-
-MRB_API void
-mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
-{
-  iv_tbl *t = obj->iv;
-
-  if (MRB_FROZEN_P(obj)) {
-    mrb_raisef(mrb, E_RUNTIME_ERROR, "can't modify frozen %S", mrb_obj_value(obj));
-  }
-  if (!t) {
-    t = obj->iv = iv_new(mrb);
-  }
-  mrb_write_barrier(mrb, (struct RBasic*)obj);
-  iv_put(mrb, t, sym, v);
-}
-
-MRB_API void
-mrb_obj_iv_ifnone(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
-{
-  iv_tbl *t = obj->iv;
-
-  if (!t) {
-    t = obj->iv = iv_new(mrb);
-  }
-  else if (iv_get(mrb, t, sym, &v)) {
-    return;
-  }
-  mrb_write_barrier(mrb, (struct RBasic*)obj);
-  iv_put(mrb, t, sym, v);
-}
-
-MRB_API void
-mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v)
-{
-  if (obj_iv_p(obj)) {
-    mrb_obj_iv_set(mrb, mrb_obj_ptr(obj), sym, v);
-  }
-  else {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "cannot set instance variable");
-  }
-}
-
-MRB_API mrb_bool
-mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym)
-{
-  iv_tbl *t;
-
-  t = obj->iv;
-  if (t) {
-    return iv_get(mrb, t, sym, NULL);
-  }
-  return FALSE;
-}
-
-MRB_API mrb_bool
-mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym)
-{
-  if (!obj_iv_p(obj)) return FALSE;
-  return mrb_obj_iv_defined(mrb, mrb_obj_ptr(obj), sym);
-}
-
-#define identchar(c) (ISALNUM(c) || (c) == '_' || !ISASCII(c))
-
-MRB_API mrb_bool
-mrb_iv_p(mrb_state *mrb, mrb_sym iv_name)
-{
-  const char *s;
-  mrb_int i, len;
-
-  s = mrb_sym2name_len(mrb, iv_name, &len);
-  if (len < 2) return FALSE;
-  if (s[0] != '@') return FALSE;
-  if (s[1] == '@') return FALSE;
-  for (i=1; i<len; i++) {
-    if (!identchar(s[i])) return FALSE;
-  }
-  return TRUE;
-}
-
-MRB_API void
-mrb_iv_check(mrb_state *mrb, mrb_sym iv_name)
-{
-  if (!mrb_iv_p(mrb, iv_name)) {
-    mrb_name_error(mrb, iv_name, "'%S' is not allowed as an instance variable name", mrb_sym2str(mrb, iv_name));
-  }
-}
-
-MRB_API void
-mrb_iv_copy(mrb_state *mrb, mrb_value dest, mrb_value src)
-{
-  struct RObject *d = mrb_obj_ptr(dest);
-  struct RObject *s = mrb_obj_ptr(src);
-
-  if (d->iv) {
-    iv_free(mrb, d->iv);
-    d->iv = 0;
-  }
-  if (s->iv) {
-    mrb_write_barrier(mrb, (struct RBasic*)d);
-    d->iv = iv_copy(mrb, s->iv);
-  }
-}
-
-static int
-inspect_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  mrb_value str = *(mrb_value*)p;
-  const char *s;
-  mrb_int len;
-  mrb_value ins;
-  char *sp = RSTRING_PTR(str);
-
-  /* need not to show internal data */
-  if (sp[0] == '-') { /* first element */
-    sp[0] = '#';
-    mrb_str_cat_lit(mrb, str, " ");
-  }
-  else {
-    mrb_str_cat_lit(mrb, str, ", ");
-  }
-  s = mrb_sym2name_len(mrb, sym, &len);
-  mrb_str_cat(mrb, str, s, len);
-  mrb_str_cat_lit(mrb, str, "=");
-  if (mrb_type(v) == MRB_TT_OBJECT) {
-    ins = mrb_any_to_s(mrb, v);
-  }
-  else {
-    ins = mrb_inspect(mrb, v);
-  }
-  mrb_str_cat_str(mrb, str, ins);
-  return 0;
-}
-
-mrb_value
-mrb_obj_iv_inspect(mrb_state *mrb, struct RObject *obj)
-{
-  iv_tbl *t = obj->iv;
-  size_t len = iv_size(mrb, t);
-
-  if (len > 0) {
-    const char *cn = mrb_obj_classname(mrb, mrb_obj_value(obj));
-    mrb_value str = mrb_str_buf_new(mrb, 30);
-
-    mrb_str_cat_lit(mrb, str, "-<");
-    mrb_str_cat_cstr(mrb, str, cn);
-    mrb_str_cat_lit(mrb, str, ":");
-    mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, obj));
-
-    iv_foreach(mrb, t, inspect_i, &str);
-    mrb_str_cat_lit(mrb, str, ">");
-    return str;
-  }
-  return mrb_any_to_s(mrb, mrb_obj_value(obj));
-}
-
-MRB_API mrb_value
-mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym)
-{
-  if (obj_iv_p(obj)) {
-    iv_tbl *t = mrb_obj_ptr(obj)->iv;
-    mrb_value val;
-
-    if (t && iv_del(mrb, t, sym, &val)) {
-      return val;
-    }
-  }
-  return mrb_undef_value();
-}
-
-mrb_value
-mrb_vm_iv_get(mrb_state *mrb, mrb_sym sym)
-{
-  /* get self */
-  return mrb_iv_get(mrb, mrb->c->stack[0], sym);
-}
-
-void
-mrb_vm_iv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
-{
-  /* get self */
-  mrb_iv_set(mrb, mrb->c->stack[0], sym, v);
-}
-
-static int
-iv_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  mrb_value ary;
-  const char* s;
-  mrb_int len;
-
-  ary = *(mrb_value*)p;
-  s = mrb_sym2name_len(mrb, sym, &len);
-  if (len > 1 && s[0] == '@' && s[1] != '@') {
-    mrb_ary_push(mrb, ary, mrb_symbol_value(sym));
-  }
-  return 0;
-}
-
-/* 15.3.1.3.23 */
-/*
- *  call-seq:
- *     obj.instance_variables    -> array
- *
- *  Returns an array of instance variable names for the receiver. Note
- *  that simply defining an accessor does not create the corresponding
- *  instance variable.
- *
- *     class Fred
- *       attr_accessor :a1
- *       def initialize
- *         @iv = 3
- *       end
- *     end
- *     Fred.new.instance_variables   #=> [:@iv]
- */
-mrb_value
-mrb_obj_instance_variables(mrb_state *mrb, mrb_value self)
-{
-  mrb_value ary;
-
-  ary = mrb_ary_new(mrb);
-  if (obj_iv_p(self) && mrb_obj_ptr(self)->iv) {
-    iv_foreach(mrb, mrb_obj_ptr(self)->iv, iv_i, &ary);
-  }
-  return ary;
-}
-
-static int
-cv_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  mrb_value ary;
-  const char* s;
-  mrb_int len;
-
-  ary = *(mrb_value*)p;
-  s = mrb_sym2name_len(mrb, sym, &len);
-  if (len > 2 && s[0] == '@' && s[1] == '@') {
-    mrb_ary_push(mrb, ary, mrb_symbol_value(sym));
-  }
-  return 0;
-}
-
-/* 15.2.2.4.19 */
-/*
- *  call-seq:
- *     mod.class_variables   -> array
- *
- *  Returns an array of the names of class variables in <i>mod</i>.
- *
- *     class One
- *       @@var1 = 1
- *     end
- *     class Two < One
- *       @@var2 = 2
- *     end
- *     One.class_variables   #=> [:@@var1]
- *     Two.class_variables   #=> [:@@var2]
- */
-mrb_value
-mrb_mod_class_variables(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value ary;
-  struct RClass *c;
-
-  ary = mrb_ary_new(mrb);
-  c = mrb_class_ptr(mod);
-  while (c) {
-    if (c->iv) {
-      iv_foreach(mrb, c->iv, cv_i, &ary);
-    }
-    c = c->super;
-  }
-  return ary;
-}
-
-MRB_API mrb_value
-mrb_mod_cv_get(mrb_state *mrb, struct RClass *c, mrb_sym sym)
-{
-  struct RClass * cls = c;
-  mrb_value v;
-  int given = FALSE;
-
-  while (c) {
-    if (c->iv && iv_get(mrb, c->iv, sym, &v)) {
-      given = TRUE;
-    }
-    c = c->super;
-  }
-  if (given) return v;
-  if (cls && cls->tt == MRB_TT_SCLASS) {
-    mrb_value klass;
-
-    klass = mrb_obj_iv_get(mrb, (struct RObject *)cls,
-                           mrb_intern_lit(mrb, "__attached__"));
-    c = mrb_class_ptr(klass);
-    if (c->tt == MRB_TT_CLASS || c->tt == MRB_TT_MODULE) {
-      given = FALSE;
-      while (c) {
-        if (c->iv && iv_get(mrb, c->iv, sym, &v)) {
-          given = TRUE;
-        }
-        c = c->super;
-      }
-      if (given) return v;
-    }
-  }
-  mrb_name_error(mrb, sym, "uninitialized class variable %S in %S",
-                 mrb_sym2str(mrb, sym), mrb_obj_value(cls));
-  /* not reached */
-  return mrb_nil_value();
-}
-
-MRB_API mrb_value
-mrb_cv_get(mrb_state *mrb, mrb_value mod, mrb_sym sym)
-{
-  return mrb_mod_cv_get(mrb, mrb_class_ptr(mod), sym);
-}
-
-MRB_API void
-mrb_mod_cv_set(mrb_state *mrb, struct RClass *c, mrb_sym sym, mrb_value v)
-{
-  struct RClass * cls = c;
-
-  while (c) {
-    if (c->iv) {
-      iv_tbl *t = c->iv;
-
-      if (iv_get(mrb, t, sym, NULL)) {
-        mrb_write_barrier(mrb, (struct RBasic*)c);
-        iv_put(mrb, t, sym, v);
-        return;
-      }
-    }
-    c = c->super;
-  }
-
-  if (cls && cls->tt == MRB_TT_SCLASS) {
-    mrb_value klass;
-
-    klass = mrb_obj_iv_get(mrb, (struct RObject*)cls,
-                           mrb_intern_lit(mrb, "__attached__"));
-    switch (mrb_type(klass)) {
-    case MRB_TT_CLASS:
-    case MRB_TT_MODULE:
-    case MRB_TT_SCLASS:
-      c = mrb_class_ptr(klass);
-      break;
-    default:
-      c = cls;
-      break;
-    }
-  }
-  else{
-    c = cls;
-  }
-
-  if (!c->iv) {
-    c->iv = iv_new(mrb);
-  }
-
-  mrb_write_barrier(mrb, (struct RBasic*)c);
-  iv_put(mrb, c->iv, sym, v);
-}
-
-MRB_API void
-mrb_cv_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v)
-{
-  mrb_mod_cv_set(mrb, mrb_class_ptr(mod), sym, v);
-}
-
-MRB_API mrb_bool
-mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym)
-{
-  while (c) {
-    if (c->iv) {
-      iv_tbl *t = c->iv;
-      if (iv_get(mrb, t, sym, NULL)) return TRUE;
-    }
-    c = c->super;
-  }
-
-  return FALSE;
-}
-
-MRB_API mrb_bool
-mrb_cv_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym)
-{
-  return mrb_mod_cv_defined(mrb, mrb_class_ptr(mod), sym);
-}
-
-mrb_value
-mrb_vm_cv_get(mrb_state *mrb, mrb_sym sym)
-{
-  struct RClass *c = mrb->c->ci->proc->target_class;
-
-  if (!c) c = mrb->c->ci->target_class;
-
-  return mrb_mod_cv_get(mrb, c, sym);
-}
-
-void
-mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
-{
-  struct RClass *c = mrb->c->ci->proc->target_class;
-
-  if (!c) c = mrb->c->ci->target_class;
-  mrb_mod_cv_set(mrb, c, sym, v);
-}
-
-static void
-mod_const_check(mrb_state *mrb, mrb_value mod)
-{
-  switch (mrb_type(mod)) {
-  case MRB_TT_CLASS:
-  case MRB_TT_MODULE:
-  case MRB_TT_SCLASS:
-    break;
-  default:
-    mrb_raise(mrb, E_TYPE_ERROR, "constant look-up for non class/module");
-    break;
-  }
-}
-
-static mrb_value
-const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym)
-{
-  struct RClass *c = base;
-  mrb_value v;
-  iv_tbl *t;
-  mrb_bool retry = FALSE;
-  mrb_value name;
-
-L_RETRY:
-  while (c) {
-    if (c->iv) {
-      t = c->iv;
-      if (iv_get(mrb, t, sym, &v))
-        return v;
-    }
-    c = c->super;
-  }
-  if (!retry && base && base->tt == MRB_TT_MODULE) {
-    c = mrb->object_class;
-    retry = TRUE;
-    goto L_RETRY;
-  }
-  name = mrb_symbol_value(sym);
-  return mrb_funcall_argv(mrb, mrb_obj_value(base), mrb_intern_lit(mrb, "const_missing"), 1, &name);
-}
-
-MRB_API mrb_value
-mrb_const_get(mrb_state *mrb, mrb_value mod, mrb_sym sym)
-{
-  mod_const_check(mrb, mod);
-  return const_get(mrb, mrb_class_ptr(mod), sym);
-}
-
-mrb_value
-mrb_vm_const_get(mrb_state *mrb, mrb_sym sym)
-{
-  struct RClass *c = mrb->c->ci->proc->target_class;
-
-  if (!c) c = mrb->c->ci->target_class;
-  if (c) {
-    struct RClass *c2;
-    mrb_value v;
-
-    if (c->iv && iv_get(mrb, c->iv, sym, &v)) {
-      return v;
-    }
-    c2 = c;
-    while (c2 && c2->tt == MRB_TT_SCLASS) {
-      mrb_value klass;
-      klass = mrb_obj_iv_get(mrb, (struct RObject *)c2,
-                             mrb_intern_lit(mrb, "__attached__"));
-      c2 = mrb_class_ptr(klass);
-    }
-    if (c2->tt == MRB_TT_CLASS || c2->tt == MRB_TT_MODULE) c = c2;
-    c2 = c;
-    for (;;) {
-      c2 = mrb_class_outer_module(mrb, c2);
-      if (!c2) break;
-      if (c2->iv && iv_get(mrb, c2->iv, sym, &v)) {
-        return v;
-      }
-    }
-  }
-  return const_get(mrb, c, sym);
-}
-
-MRB_API void
-mrb_const_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v)
-{
-  mod_const_check(mrb, mod);
-  mrb_iv_set(mrb, mod, sym, v);
-}
-
-void
-mrb_vm_const_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
-{
-  struct RClass *c = mrb->c->ci->proc->target_class;
-
-  if (!c) c = mrb->c->ci->target_class;
-  mrb_obj_iv_set(mrb, (struct RObject*)c, sym, v);
-}
-
-MRB_API void
-mrb_const_remove(mrb_state *mrb, mrb_value mod, mrb_sym sym)
-{
-  mod_const_check(mrb, mod);
-  mrb_iv_remove(mrb, mod, sym);
-}
-
-MRB_API void
-mrb_define_const(mrb_state *mrb, struct RClass *mod, const char *name, mrb_value v)
-{
-  mrb_obj_iv_set(mrb, (struct RObject*)mod, mrb_intern_cstr(mrb, name), v);
-}
-
-MRB_API void
-mrb_define_global_const(mrb_state *mrb, const char *name, mrb_value val)
-{
-  mrb_define_const(mrb, mrb->object_class, name, val);
-}
-
-static int
-const_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  mrb_value ary;
-  const char* s;
-  mrb_int len;
-
-  ary = *(mrb_value*)p;
-  s = mrb_sym2name_len(mrb, sym, &len);
-  if (len >= 1 && ISUPPER(s[0])) {
-    mrb_ary_push(mrb, ary, mrb_symbol_value(sym));
-  }
-  return 0;
-}
-
-/* 15.2.2.4.24 */
-/*
- *  call-seq:
- *     mod.constants    -> array
- *
- *  Returns an array of all names of contants defined in the receiver.
- */
-mrb_value
-mrb_mod_constants(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value ary;
-  mrb_bool inherit = TRUE;
-  struct RClass *c = mrb_class_ptr(mod);
-
-  mrb_get_args(mrb, "|b", &inherit);
-  ary = mrb_ary_new(mrb);
-  while (c) {
-    if (c->iv) {
-      iv_foreach(mrb, c->iv, const_i, &ary);
-    }
-    if (!inherit) break;
-    c = c->super;
-    if (c == mrb->object_class) break;
-  }
-  return ary;
-}
-
-MRB_API mrb_value
-mrb_gv_get(mrb_state *mrb, mrb_sym sym)
-{
-  mrb_value v;
-
-  if (!mrb->globals) {
-    return mrb_nil_value();
-  }
-  if (iv_get(mrb, mrb->globals, sym, &v))
-    return v;
-  return mrb_nil_value();
-}
-
-MRB_API void
-mrb_gv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
-{
-  iv_tbl *t;
-
-  if (!mrb->globals) {
-    t = mrb->globals = iv_new(mrb);
-  }
-  else {
-    t = mrb->globals;
-  }
-  iv_put(mrb, t, sym, v);
-}
-
-MRB_API void
-mrb_gv_remove(mrb_state *mrb, mrb_sym sym)
-{
-  if (!mrb->globals) {
-    return;
-  }
-  iv_del(mrb, mrb->globals, sym, NULL);
-}
-
-static int
-gv_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  mrb_value ary;
-
-  ary = *(mrb_value*)p;
-  mrb_ary_push(mrb, ary, mrb_symbol_value(sym));
-  return 0;
-}
-
-/* 15.3.1.2.4  */
-/* 15.3.1.3.14 */
-/*
- *  call-seq:
- *     global_variables    -> array
- *
- *  Returns an array of the names of global variables.
- *
- *     global_variables.grep /std/   #=> [:$stdin, :$stdout, :$stderr]
- */
-mrb_value
-mrb_f_global_variables(mrb_state *mrb, mrb_value self)
-{
-  iv_tbl *t = mrb->globals;
-  mrb_value ary = mrb_ary_new(mrb);
-  size_t i;
-  char buf[3];
-
-  if (t) {
-    iv_foreach(mrb, t, gv_i, &ary);
-  }
-  buf[0] = '$';
-  buf[2] = 0;
-  for (i = 1; i <= 9; ++i) {
-    buf[1] = (char)(i + '0');
-    mrb_ary_push(mrb, ary, mrb_symbol_value(mrb_intern(mrb, buf, 2)));
-  }
-  return ary;
-}
-
-static mrb_bool
-mrb_const_defined_0(mrb_state *mrb, mrb_value mod, mrb_sym id, mrb_bool exclude, mrb_bool recurse)
-{
-  struct RClass *klass = mrb_class_ptr(mod);
-  struct RClass *tmp;
-  mrb_bool mod_retry = 0;
-
-  tmp = klass;
-retry:
-  while (tmp) {
-    if (tmp->iv && iv_get(mrb, tmp->iv, id, NULL)) {
-      return TRUE;
-    }
-    if (!recurse && (klass != mrb->object_class)) break;
-    tmp = tmp->super;
-  }
-  if (!exclude && !mod_retry && (klass->tt == MRB_TT_MODULE)) {
-    mod_retry = 1;
-    tmp = mrb->object_class;
-    goto retry;
-  }
-  return FALSE;
-}
-
-MRB_API mrb_bool
-mrb_const_defined(mrb_state *mrb, mrb_value mod, mrb_sym id)
-{
-  return mrb_const_defined_0(mrb, mod, id, TRUE, TRUE);
-}
-
-MRB_API mrb_bool
-mrb_const_defined_at(mrb_state *mrb, mrb_value mod, mrb_sym id)
-{
-  return mrb_const_defined_0(mrb, mod, id, TRUE, FALSE);
-}
-
-MRB_API mrb_value
-mrb_attr_get(mrb_state *mrb, mrb_value obj, mrb_sym id)
-{
-  return mrb_iv_get(mrb, obj, id);
-}
-
-struct csym_arg {
-  struct RClass *c;
-  mrb_sym sym;
-};
-
-static int
-csym_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p)
-{
-  struct csym_arg *a = (struct csym_arg*)p;
-  struct RClass *c = a->c;
-
-  if (mrb_type(v) == c->tt && mrb_class_ptr(v) == c) {
-    a->sym = sym;
-    return 1;     /* stop iteration */
-  }
-  return 0;
-}
-
-mrb_sym
-mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer)
-{
-  mrb_value name;
-
-  name = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__classid__"));
-  if (mrb_nil_p(name)) {
-
-    if (!outer) return 0;
-    else {
-      struct csym_arg arg;
-
-      arg.c = c;
-      arg.sym = 0;
-      iv_foreach(mrb, outer->iv, csym_i, &arg);
-      return arg.sym;
-    }
-  }
-  return mrb_symbol(name);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/version.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/version.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/version.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/version.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#include <mruby.h>
-#include <mruby/variable.h>
-
-void
-mrb_init_version(mrb_state* mrb)
-{
-  mrb_value mruby_version = mrb_str_new_lit(mrb, MRUBY_VERSION);
-
-  mrb_define_global_const(mrb, "RUBY_VERSION", mrb_str_new_lit(mrb, MRUBY_RUBY_VERSION));
-  mrb_define_global_const(mrb, "RUBY_ENGINE", mrb_str_new_lit(mrb, MRUBY_RUBY_ENGINE));
-  mrb_define_global_const(mrb, "RUBY_ENGINE_VERSION", mruby_version);
-  mrb_define_global_const(mrb, "MRUBY_VERSION", mruby_version);
-  mrb_define_global_const(mrb, "MRUBY_RELEASE_NO", mrb_fixnum_value(MRUBY_RELEASE_NO));
-  mrb_define_global_const(mrb, "MRUBY_RELEASE_DATE", mrb_str_new_lit(mrb, MRUBY_RELEASE_DATE));
-  mrb_define_global_const(mrb, "MRUBY_DESCRIPTION", mrb_str_new_lit(mrb, MRUBY_DESCRIPTION));
-  mrb_define_global_const(mrb, "MRUBY_COPYRIGHT", mrb_str_new_lit(mrb, MRUBY_COPYRIGHT));
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/vm.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/vm.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/vm.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/src/vm.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2941 +0,0 @@
-/*
-** vm.c - virtual machine for mruby
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include <stddef.h>
-#include <stdarg.h>
-#include <math.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/class.h>
-#include <mruby/hash.h>
-#include <mruby/irep.h>
-#include <mruby/numeric.h>
-#include <mruby/proc.h>
-#include <mruby/range.h>
-#include <mruby/string.h>
-#include <mruby/variable.h>
-#include <mruby/error.h>
-#include <mruby/opcode.h>
-#include "value_array.h"
-#include <mruby/throw.h>
-
-#ifdef MRB_DISABLE_STDIO
-#if defined(__cplusplus)
-extern "C" {
-#endif
-void abort(void);
-#if defined(__cplusplus)
-}  /* extern "C" { */
-#endif
-#endif
-
-#define STACK_INIT_SIZE 128
-#define CALLINFO_INIT_SIZE 32
-
-#ifndef ENSURE_STACK_INIT_SIZE
-#define ENSURE_STACK_INIT_SIZE 16
-#endif
-
-#ifndef RESCUE_STACK_INIT_SIZE
-#define RESCUE_STACK_INIT_SIZE 16
-#endif
-
-/* Define amount of linear stack growth. */
-#ifndef MRB_STACK_GROWTH
-#define MRB_STACK_GROWTH 128
-#endif
-
-/* Maximum mrb_funcall() depth. Should be set lower on memory constrained systems. */
-#ifndef MRB_FUNCALL_DEPTH_MAX
-#define MRB_FUNCALL_DEPTH_MAX 512
-#endif
-
-/* Maximum stack depth. Should be set lower on memory constrained systems.
-The value below allows about 60000 recursive calls in the simplest case. */
-#ifndef MRB_STACK_MAX
-#define MRB_STACK_MAX (0x40000 - MRB_STACK_GROWTH)
-#endif
-
-#ifdef VM_DEBUG
-# define DEBUG(x) (x)
-#else
-# define DEBUG(x)
-#endif
-
-
-#ifndef MRB_GC_FIXED_ARENA
-static void
-mrb_gc_arena_shrink(mrb_state *mrb, int idx)
-{
-  mrb_gc *gc = &mrb->gc;
-  int capa = gc->arena_capa;
-
-  if (idx < capa / 4) {
-    capa >>= 2;
-    if (capa < MRB_GC_ARENA_SIZE) {
-      capa = MRB_GC_ARENA_SIZE;
-    }
-    if (capa != gc->arena_capa) {
-      gc->arena = (struct RBasic**)mrb_realloc(mrb, gc->arena, sizeof(struct RBasic*)*capa);
-      gc->arena_capa = capa;
-    }
-  }
-}
-#else
-#define mrb_gc_arena_shrink(mrb,idx)
-#endif
-
-#define CALL_MAXARGS 127
-
-void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
-
-static inline void
-stack_clear(mrb_value *from, size_t count)
-{
-#ifndef MRB_NAN_BOXING
-  const mrb_value mrb_value_zero = { { 0 } };
-
-  while (count-- > 0) {
-    *from++ = mrb_value_zero;
-  }
-#else
-  while (count-- > 0) {
-    SET_NIL_VALUE(*from);
-    from++;
-  }
-#endif
-}
-
-static inline void
-stack_copy(mrb_value *dst, const mrb_value *src, size_t size)
-{
-  while (size-- > 0) {
-    *dst++ = *src++;
-  }
-}
-
-static void
-stack_init(mrb_state *mrb)
-{
-  struct mrb_context *c = mrb->c;
-
-  /* mrb_assert(mrb->stack == NULL); */
-  c->stbase = (mrb_value *)mrb_calloc(mrb, STACK_INIT_SIZE, sizeof(mrb_value));
-  c->stend = c->stbase + STACK_INIT_SIZE;
-  c->stack = c->stbase;
-
-  /* mrb_assert(ci == NULL); */
-  c->cibase = (mrb_callinfo *)mrb_calloc(mrb, CALLINFO_INIT_SIZE, sizeof(mrb_callinfo));
-  c->ciend = c->cibase + CALLINFO_INIT_SIZE;
-  c->ci = c->cibase;
-  c->ci->target_class = mrb->object_class;
-  c->ci->stackent = c->stack;
-}
-
-static inline void
-envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase, size_t size)
-{
-  mrb_callinfo *ci = mrb->c->cibase;
-
-  if (newbase == oldbase) return;
-  while (ci <= mrb->c->ci) {
-    struct REnv *e = ci->env;
-    mrb_value *st;
-
-    if (e && MRB_ENV_STACK_SHARED_P(e) &&
-        (st = e->stack) && oldbase <= st && st < oldbase+size) {
-      ptrdiff_t off = e->stack - oldbase;
-
-      e->stack = newbase + off;
-    }
-    ci->stackent = newbase + (ci->stackent - oldbase);
-    ci++;
-  }
-}
-
-/** def rec ; $deep =+ 1 ; if $deep > 1000 ; return 0 ; end ; rec ; end  */
-
-static void
-stack_extend_alloc(mrb_state *mrb, int room)
-{
-  mrb_value *oldbase = mrb->c->stbase;
-  mrb_value *newstack;
-  size_t oldsize = mrb->c->stend - mrb->c->stbase;
-  size_t size = oldsize;
-  size_t off = mrb->c->stack - mrb->c->stbase;
-
-  if (off > size) size = off;
-#ifdef MRB_STACK_EXTEND_DOUBLING
-  if (room <= size)
-    size *= 2;
-  else
-    size += room;
-#else
-  /* Use linear stack growth.
-     It is slightly slower than doubling the stack space,
-     but it saves memory on small devices. */
-  if (room <= MRB_STACK_GROWTH)
-    size += MRB_STACK_GROWTH;
-  else
-    size += room;
-#endif
-
-  newstack = (mrb_value *)mrb_realloc(mrb, mrb->c->stbase, sizeof(mrb_value) * size);
-  if (newstack == NULL) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
-  }
-  stack_clear(&(newstack[oldsize]), size - oldsize);
-  envadjust(mrb, oldbase, newstack, size);
-  mrb->c->stbase = newstack;
-  mrb->c->stack = mrb->c->stbase + off;
-  mrb->c->stend = mrb->c->stbase + size;
-
-  /* Raise an exception if the new stack size will be too large,
-     to prevent infinite recursion. However, do this only after resizing the stack, so mrb_raise has stack space to work with. */
-  if (size > MRB_STACK_MAX) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
-  }
-}
-
-static inline void
-stack_extend(mrb_state *mrb, int room)
-{
-  if (mrb->c->stack + room >= mrb->c->stend) {
-    stack_extend_alloc(mrb, room);
-  }
-}
-
-static inline struct REnv*
-uvenv(mrb_state *mrb, int up)
-{
-  struct REnv *e = mrb->c->ci->proc->env;
-
-  while (up--) {
-    if (!e) return NULL;
-    e = (struct REnv*)e->c;
-  }
-  return e;
-}
-
-static inline mrb_bool
-is_strict(mrb_state *mrb, struct REnv *e)
-{
-  int cioff = e->cioff;
-
-  if (MRB_ENV_STACK_SHARED_P(e) && e->cxt.c->cibase[cioff].proc &&
-      MRB_PROC_STRICT_P(e->cxt.c->cibase[cioff].proc)) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static inline struct REnv*
-top_env(mrb_state *mrb, struct RProc *proc)
-{
-  struct REnv *e = proc->env;
-
-  if (is_strict(mrb, e)) return e;
-  while (e->c) {
-    e = (struct REnv*)e->c;
-    if (is_strict(mrb, e)) return e;
-  }
-  return e;
-}
-
-#define CI_ACC_SKIP    -1
-#define CI_ACC_DIRECT  -2
-#define CI_ACC_RESUMED -3
-
-static inline mrb_callinfo*
-cipush(mrb_state *mrb)
-{
-  struct mrb_context *c = mrb->c;
-  static const mrb_callinfo ci_zero = { 0 };
-  mrb_callinfo *ci = c->ci;
-
-  int ridx = ci->ridx;
-
-  if (ci + 1 == c->ciend) {
-    ptrdiff_t size = ci - c->cibase;
-
-    c->cibase = (mrb_callinfo *)mrb_realloc(mrb, c->cibase, sizeof(mrb_callinfo)*size*2);
-    c->ci = c->cibase + size;
-    c->ciend = c->cibase + size * 2;
-  }
-  ci = ++c->ci;
-  *ci = ci_zero;
-  ci->epos = mrb->c->eidx;
-  ci->ridx = ridx;
-
-  return ci;
-}
-
-MRB_API void
-mrb_env_unshare(mrb_state *mrb, struct REnv *e)
-{
-  if (e == NULL) return;
-  else {
-    size_t len = (size_t)MRB_ENV_STACK_LEN(e);
-    ptrdiff_t cioff = e->cioff;
-    mrb_value *p;
-
-    if (!MRB_ENV_STACK_SHARED_P(e)) return;
-    if (e->cxt.c != mrb->c) return;
-    if (e->cioff == 0 && e->cxt.c == mrb->root_c) return;
-    MRB_ENV_UNSHARE_STACK(e);
-    if (!e->c) {
-      /* save block argument position (negated) */
-      e->cioff = -e->cxt.c->cibase[cioff].argc-1;
-    }
-    e->cxt.mid = e->cxt.c->cibase[cioff].mid;
-    p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len);
-    if (len > 0) {
-      stack_copy(p, e->stack, len);
-    }
-    e->stack = p;
-    mrb_write_barrier(mrb, (struct RBasic *)e);
-  }
-}
-
-static inline void
-cipop(mrb_state *mrb)
-{
-  struct mrb_context *c = mrb->c;
-  struct REnv *env = c->ci->env;
-
-  c->ci--;
-  mrb_env_unshare(mrb, env);
-}
-
-void mrb_exc_set(mrb_state *mrb, mrb_value exc);
-
-static void
-ecall(mrb_state *mrb, int i)
-{
-  struct RProc *p;
-  mrb_callinfo *ci = mrb->c->ci;
-  mrb_value *self = mrb->c->stack;
-  struct RObject *exc;
-  ptrdiff_t cioff;
-  int ai = mrb_gc_arena_save(mrb);
-
-  if (i<0) return;
-  if (ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
-  }
-  p = mrb->c->ensure[i];
-  if (!p) return;
-  mrb->c->ensure[i] = NULL;
-  cioff = ci - mrb->c->cibase;
-  ci = cipush(mrb);
-  ci->stackent = mrb->c->stack;
-  ci->mid = ci[-1].mid;
-  ci->acc = CI_ACC_SKIP;
-  ci->argc = 0;
-  ci->proc = p;
-  ci->nregs = p->body.irep->nregs;
-  ci->target_class = p->target_class;
-  mrb->c->stack = mrb->c->stack + ci[-1].nregs;
-  exc = mrb->exc; mrb->exc = 0;
-  if (exc) {
-    mrb_gc_protect(mrb, mrb_obj_value(exc));
-  }
-  mrb_run(mrb, p, *self);
-  mrb->c->ci = mrb->c->cibase + cioff;
-  if (!mrb->exc) mrb->exc = exc;
-  mrb_gc_arena_restore(mrb, ai);
-}
-
-#ifndef MRB_FUNCALL_ARGC_MAX
-#define MRB_FUNCALL_ARGC_MAX 16
-#endif
-
-MRB_API mrb_value
-mrb_funcall(mrb_state *mrb, mrb_value self, const char *name, mrb_int argc, ...)
-{
-  mrb_value argv[MRB_FUNCALL_ARGC_MAX];
-  va_list ap;
-  mrb_int i;
-  mrb_sym mid = mrb_intern_cstr(mrb, name);
-
-  if (argc > MRB_FUNCALL_ARGC_MAX) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Too long arguments. (limit=" MRB_STRINGIZE(MRB_FUNCALL_ARGC_MAX) ")");
-  }
-
-  va_start(ap, argc);
-  for (i = 0; i < argc; i++) {
-    argv[i] = va_arg(ap, mrb_value);
-  }
-  va_end(ap);
-  return mrb_funcall_argv(mrb, self, mid, argc, argv);
-}
-
-MRB_API mrb_value
-mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, const mrb_value *argv, mrb_value blk)
-{
-  mrb_value val;
-
-  if (!mrb->jmp) {
-    struct mrb_jmpbuf c_jmp;
-    ptrdiff_t nth_ci = mrb->c->ci - mrb->c->cibase;
-
-    MRB_TRY(&c_jmp) {
-      mrb->jmp = &c_jmp;
-      /* recursive call */
-      val = mrb_funcall_with_block(mrb, self, mid, argc, argv, blk);
-      mrb->jmp = 0;
-    }
-    MRB_CATCH(&c_jmp) { /* error */
-      while (nth_ci < (mrb->c->ci - mrb->c->cibase)) {
-        mrb->c->stack = mrb->c->ci->stackent;
-        cipop(mrb);
-      }
-      mrb->jmp = 0;
-      val = mrb_obj_value(mrb->exc);
-    }
-    MRB_END_EXC(&c_jmp);
-    mrb->jmp = 0;
-  }
-  else {
-    struct RProc *p;
-    struct RClass *c;
-    mrb_callinfo *ci;
-    int n;
-    ptrdiff_t voff = -1;
-
-    if (!mrb->c->stack) {
-      stack_init(mrb);
-    }
-    n = mrb->c->ci->nregs;
-    if (argc < 0) {
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative argc for funcall (%S)", mrb_fixnum_value(argc));
-    }
-    c = mrb_class(mrb, self);
-    p = mrb_method_search_vm(mrb, &c, mid);
-    if (!p) {
-      mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-      mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
-      p = mrb_method_search_vm(mrb, &c, missing);
-      if (!p) {
-        mrb_method_missing(mrb, mid, self, args);
-      }
-      mrb_ary_unshift(mrb, args, mrb_symbol_value(mid));
-      stack_extend(mrb, n+2);
-      mrb->c->stack[n+1] = args;
-      argc = -1;
-    }
-    if (mrb->c->ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
-      mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
-    }
-    ci = cipush(mrb);
-    ci->mid = mid;
-    ci->proc = p;
-    ci->stackent = mrb->c->stack;
-    ci->argc = argc;
-    ci->target_class = c;
-    mrb->c->stack = mrb->c->stack + n;
-    if (mrb->c->stbase <= argv && argv < mrb->c->stend) {
-      voff = argv - mrb->c->stbase;
-    }
-    if (MRB_PROC_CFUNC_P(p)) {
-      ci->nregs = argc + 2;
-      stack_extend(mrb, ci->nregs);
-    }
-    else if (argc >= CALL_MAXARGS) {
-      mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
-      stack_extend(mrb, ci->nregs);
-      mrb->c->stack[1] = args;
-      ci->argc = -1;
-      argc = 1;
-    }
-    else {
-      if (argc < 0) argc = 1;
-      ci->nregs = p->body.irep->nregs + argc;
-      stack_extend(mrb, ci->nregs);
-    }
-    if (voff >= 0) {
-      argv = mrb->c->stbase + voff;
-    }
-    mrb->c->stack[0] = self;
-    if (ci->argc > 0) {
-      stack_copy(mrb->c->stack+1, argv, argc);
-    }
-    mrb->c->stack[argc+1] = blk;
-
-    if (MRB_PROC_CFUNC_P(p)) {
-      int ai = mrb_gc_arena_save(mrb);
-
-      ci->acc = CI_ACC_DIRECT;
-      val = p->body.func(mrb, self);
-      mrb->c->stack = mrb->c->ci->stackent;
-      cipop(mrb);
-      mrb_gc_arena_restore(mrb, ai);
-    }
-    else {
-      ci->acc = CI_ACC_SKIP;
-      val = mrb_run(mrb, p, self);
-    }
-  }
-  mrb_gc_protect(mrb, val);
-  return val;
-}
-
-MRB_API mrb_value
-mrb_funcall_argv(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, const mrb_value *argv)
-{
-  return mrb_funcall_with_block(mrb, self, mid, argc, argv, mrb_nil_value());
-}
-
-mrb_value
-mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p)
-{
-  mrb_callinfo *ci = mrb->c->ci;
-
-  mrb->c->stack[0] = self;
-  ci->proc = p;
-  ci->target_class = p->target_class;
-  if (MRB_PROC_CFUNC_P(p)) {
-    return p->body.func(mrb, self);
-  }
-  if (ci->argc < 0) {
-    stack_extend(mrb, (p->body.irep->nregs < 3) ? 3 : p->body.irep->nregs);
-  }
-  else {
-    stack_extend(mrb, p->body.irep->nregs);
-  }
-
-  ci->nregs = p->body.irep->nregs;
-  ci = cipush(mrb);
-  ci->nregs = 0;
-  ci->target_class = 0;
-  ci->pc = p->body.irep->iseq;
-  ci->stackent = mrb->c->stack;
-  ci->acc = 0;
-
-  return self;
-}
-
-/* 15.3.1.3.4  */
-/* 15.3.1.3.44 */
-/*
- *  call-seq:
- *     obj.send(symbol [, args...])        -> obj
- *     obj.__send__(symbol [, args...])      -> obj
- *
- *  Invokes the method identified by _symbol_, passing it any
- *  arguments specified. You can use <code>__send__</code> if the name
- *  +send+ clashes with an existing method in _obj_.
- *
- *     class Klass
- *       def hello(*args)
- *         "Hello " + args.join(' ')
- *       end
- *     end
- *     k = Klass.new
- *     k.send :hello, "gentle", "readers"   #=> "Hello gentle readers"
- */
-MRB_API mrb_value
-mrb_f_send(mrb_state *mrb, mrb_value self)
-{
-  mrb_sym name;
-  mrb_value block, *argv, *regs;
-  mrb_int argc, i, len;
-  struct RProc *p;
-  struct RClass *c;
-  mrb_callinfo *ci;
-
-  mrb_get_args(mrb, "n*&", &name, &argv, &argc, &block);
-  ci = mrb->c->ci;
-  if (ci->acc < 0) {
-  funcall:
-    return mrb_funcall_with_block(mrb, self, name, argc, argv, block);
-  }
-
-  c = mrb_class(mrb, self);
-  p = mrb_method_search_vm(mrb, &c, name);
-
-  if (!p) {                     /* call method_mising */
-    goto funcall;
-  }
-
-  ci->mid = name;
-  ci->target_class = c;
-  regs = mrb->c->stack+1;
-  /* remove first symbol from arguments */
-  if (ci->argc >= 0) {
-    for (i=0,len=ci->argc; i<len; i++) {
-      regs[i] = regs[i+1];
-    }
-    ci->argc--;
-  }
-  else {                     /* variable length arguments */
-    mrb_ary_shift(mrb, regs[0]);
-  }
-
-  return mrb_exec_irep(mrb, self, p);
-}
-
-static mrb_value
-eval_under(mrb_state *mrb, mrb_value self, mrb_value blk, struct RClass *c)
-{
-  struct RProc *p;
-  mrb_callinfo *ci;
-  mrb_int max = 3;
-
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-  ci = mrb->c->ci;
-  if (ci->acc == CI_ACC_DIRECT) {
-    ci->target_class = c;
-    return mrb_yield_cont(mrb, blk, self, 1, &self);
-  }
-  ci->target_class = c;
-  p = mrb_proc_ptr(blk);
-  ci->proc = p;
-  ci->argc = 1;
-  ci->mid = ci[-1].mid;
-  if (MRB_PROC_CFUNC_P(p)) {
-    stack_extend(mrb, 3);
-    mrb->c->stack[0] = self;
-    mrb->c->stack[1] = self;
-    mrb->c->stack[2] = mrb_nil_value();
-    return p->body.func(mrb, self);
-  }
-  ci->nregs = p->body.irep->nregs;
-  if (max < ci->nregs) max = ci->nregs;
-  stack_extend(mrb, max);
-  mrb->c->stack[0] = self;
-  mrb->c->stack[1] = self;
-  mrb->c->stack[2] = mrb_nil_value();
-  ci = cipush(mrb);
-  ci->nregs = 0;
-  ci->target_class = 0;
-  ci->pc = p->body.irep->iseq;
-  ci->stackent = mrb->c->stack;
-  ci->acc = 0;
-
-  return self;
-}
-
-/* 15.2.2.4.35 */
-/*
- *  call-seq:
- *     mod.class_eval {| | block }  -> obj
- *     mod.module_eval {| | block } -> obj
- *
- *  Evaluates block in the context of _mod_. This can
- *  be used to add methods to a class. <code>module_eval</code> returns
- *  the result of evaluating its argument.
- */
-mrb_value
-mrb_mod_module_eval(mrb_state *mrb, mrb_value mod)
-{
-  mrb_value a, b;
-
-  if (mrb_get_args(mrb, "|S&", &a, &b) == 1) {
-    mrb_raise(mrb, E_NOTIMP_ERROR, "module_eval/class_eval with string not implemented");
-  }
-  return eval_under(mrb, mod, b, mrb_class_ptr(mod));
-}
-
-/* 15.3.1.3.18 */
-/*
- *  call-seq:
- *     obj.instance_eval {| | block }                       -> obj
- *
- *  Evaluates the given block,within  the context of the receiver (_obj_).
- *  In order to set the context, the variable +self+ is set to _obj_ while
- *  the code is executing, giving the code access to _obj_'s
- *  instance variables. In the version of <code>instance_eval</code>
- *  that takes a +String+, the optional second and third
- *  parameters supply a filename and starting line number that are used
- *  when reporting compilation errors.
- *
- *     class KlassWithSecret
- *       def initialize
- *         @secret = 99
- *       end
- *     end
- *     k = KlassWithSecret.new
- *     k.instance_eval { @secret }   #=> 99
- */
-mrb_value
-mrb_obj_instance_eval(mrb_state *mrb, mrb_value self)
-{
-  mrb_value a, b;
-  mrb_value cv;
-  struct RClass *c;
-
-  if (mrb_get_args(mrb, "|S&", &a, &b) == 1) {
-    mrb_raise(mrb, E_NOTIMP_ERROR, "instance_eval with string not implemented");
-  }
-  switch (mrb_type(self)) {
-  case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
-  case MRB_TT_FLOAT:
-    c = 0;
-    break;
-  default:
-    cv = mrb_singleton_class(mrb, self);
-    c = mrb_class_ptr(cv);
-    break;
-  }
-  return eval_under(mrb, self, b, c);
-}
-
-MRB_API mrb_value
-mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv, mrb_value self, struct RClass *c)
-{
-  struct RProc *p;
-  mrb_sym mid = mrb->c->ci->mid;
-  mrb_callinfo *ci;
-  int n = mrb->c->ci->nregs;
-  mrb_value val;
-
-  if (mrb_nil_p(b)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-  if (mrb->c->ci - mrb->c->cibase > MRB_FUNCALL_DEPTH_MAX) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err));
-  }
-  p = mrb_proc_ptr(b);
-  ci = cipush(mrb);
-  ci->mid = mid;
-  ci->proc = p;
-  ci->stackent = mrb->c->stack;
-  ci->argc = argc;
-  ci->target_class = c;
-  ci->acc = CI_ACC_SKIP;
-  mrb->c->stack = mrb->c->stack + n;
-  if (MRB_PROC_CFUNC_P(p)) {
-    ci->nregs = argc + 2;
-    stack_extend(mrb, ci->nregs);
-  }
-  else {
-    ci->nregs = p->body.irep->nregs;
-    stack_extend(mrb, ci->nregs);
-  }
-
-  mrb->c->stack[0] = self;
-  if (argc > 0) {
-    stack_copy(mrb->c->stack+1, argv, argc);
-  }
-  mrb->c->stack[argc+1] = mrb_nil_value();
-
-  if (MRB_PROC_CFUNC_P(p)) {
-    val = p->body.func(mrb, self);
-    mrb->c->stack = mrb->c->ci->stackent;
-  }
-  else {
-    int cioff = mrb->c->ci - mrb->c->cibase;
-    val = mrb_run(mrb, p, self);
-    mrb->c->ci = mrb->c->cibase + cioff;
-  }
-  cipop(mrb);
-  return val;
-}
-
-MRB_API mrb_value
-mrb_yield_argv(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv)
-{
-  struct RProc *p = mrb_proc_ptr(b);
-
-  return mrb_yield_with_class(mrb, b, argc, argv, p->env->stack[0], p->target_class);
-}
-
-MRB_API mrb_value
-mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg)
-{
-  struct RProc *p = mrb_proc_ptr(b);
-
-  return mrb_yield_with_class(mrb, b, 1, &arg, p->env->stack[0], p->target_class);
-}
-
-mrb_value
-mrb_yield_cont(mrb_state *mrb, mrb_value b, mrb_value self, mrb_int argc, const mrb_value *argv)
-{
-  struct RProc *p;
-  mrb_callinfo *ci;
-
-  if (mrb_nil_p(b)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-  if (mrb_type(b) != MRB_TT_PROC) {
-    mrb_raise(mrb, E_TYPE_ERROR, "not a block");
-  }
-
-  p = mrb_proc_ptr(b);
-  ci = mrb->c->ci;
-
-  stack_extend(mrb, 3);
-  mrb->c->stack[1] = mrb_ary_new_from_values(mrb, argc, argv);
-  mrb->c->stack[2] = mrb_nil_value();
-  ci->argc = -1;
-  return mrb_exec_irep(mrb, self, p);
-}
-
-static struct RBreak*
-break_new(mrb_state *mrb, struct RProc *p, mrb_value val)
-{
-  struct RBreak *brk;
-
-  brk = (struct RBreak*)mrb_obj_alloc(mrb, MRB_TT_BREAK, NULL);
-  brk->iv = NULL;
-  brk->proc = p;
-  brk->val = val;
-
-  return brk;
-}
-
-typedef enum {
-  LOCALJUMP_ERROR_RETURN = 0,
-  LOCALJUMP_ERROR_BREAK = 1,
-  LOCALJUMP_ERROR_YIELD = 2
-} localjump_error_kind;
-
-static void
-localjump_error(mrb_state *mrb, localjump_error_kind kind)
-{
-  char kind_str[3][7] = { "return", "break", "yield" };
-  char kind_str_len[] = { 6, 5, 5 };
-  static const char lead[] = "unexpected ";
-  mrb_value msg;
-  mrb_value exc;
-
-  msg = mrb_str_buf_new(mrb, sizeof(lead) + 7);
-  mrb_str_cat(mrb, msg, lead, sizeof(lead) - 1);
-  mrb_str_cat(mrb, msg, kind_str[kind], kind_str_len[kind]);
-  exc = mrb_exc_new_str(mrb, E_LOCALJUMP_ERROR, msg);
-  mrb_exc_set(mrb, exc);
-}
-
-static void
-argnum_error(mrb_state *mrb, mrb_int num)
-{
-  mrb_value exc;
-  mrb_value str;
-  mrb_int argc = mrb->c->ci->argc;
-
-  if (argc < 0) {
-    mrb_value args = mrb->c->stack[1];
-    if (mrb_array_p(args)) {
-      argc = RARRAY_LEN(args);
-    }
-  }
-  if (mrb->c->ci->mid) {
-    str = mrb_format(mrb, "'%S': wrong number of arguments (%S for %S)",
-                  mrb_sym2str(mrb, mrb->c->ci->mid),
-                  mrb_fixnum_value(argc), mrb_fixnum_value(num));
-  }
-  else {
-    str = mrb_format(mrb, "wrong number of arguments (%S for %S)",
-                     mrb_fixnum_value(argc), mrb_fixnum_value(num));
-  }
-  exc = mrb_exc_new_str(mrb, E_ARGUMENT_ERROR, str);
-  mrb_exc_set(mrb, exc);
-}
-
-#define ERR_PC_SET(mrb, pc) mrb->c->ci->err = pc;
-#define ERR_PC_CLR(mrb)     mrb->c->ci->err = 0;
-#ifdef MRB_ENABLE_DEBUG_HOOK
-#define CODE_FETCH_HOOK(mrb, irep, pc, regs) if ((mrb)->code_fetch_hook) (mrb)->code_fetch_hook((mrb), (irep), (pc), (regs));
-#else
-#define CODE_FETCH_HOOK(mrb, irep, pc, regs)
-#endif
-
-#ifdef MRB_BYTECODE_DECODE_OPTION
-#define BYTECODE_DECODER(x) ((mrb)->bytecode_decoder)?(mrb)->bytecode_decoder((mrb), (x)):(x)
-#else
-#define BYTECODE_DECODER(x) (x)
-#endif
-
-
-#if defined __GNUC__ || defined __clang__ || defined __INTEL_COMPILER
-#define DIRECT_THREADED
-#endif
-
-#ifndef DIRECT_THREADED
-
-#define INIT_DISPATCH for (;;) { i = BYTECODE_DECODER(*pc); CODE_FETCH_HOOK(mrb, irep, pc, regs); switch (GET_OPCODE(i)) {
-#define CASE(op) case op:
-#define NEXT pc++; break
-#define JUMP break
-#define END_DISPATCH }}
-
-#else
-
-#define INIT_DISPATCH JUMP; return mrb_nil_value();
-#define CASE(op) L_ ## op:
-#define NEXT i=BYTECODE_DECODER(*++pc); CODE_FETCH_HOOK(mrb, irep, pc, regs); goto *optable[GET_OPCODE(i)]
-#define JUMP i=BYTECODE_DECODER(*pc); CODE_FETCH_HOOK(mrb, irep, pc, regs); goto *optable[GET_OPCODE(i)]
-
-#define END_DISPATCH
-
-#endif
-
-MRB_API mrb_value
-mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep)
-{
-  mrb_irep *irep = proc->body.irep;
-  mrb_value result;
-  struct mrb_context *c = mrb->c;
-  int cioff = c->ci - c->cibase;
-  unsigned int nregs = irep->nregs;
-
-  if (!c->stack) {
-    stack_init(mrb);
-  }
-  if (stack_keep > nregs)
-    nregs = stack_keep;
-  stack_extend(mrb, nregs);
-  stack_clear(c->stack + stack_keep, nregs - stack_keep);
-  c->stack[0] = self;
-  result = mrb_vm_exec(mrb, proc, irep->iseq);
-  if (c->ci - c->cibase > cioff) {
-    c->ci = c->cibase + cioff;
-  }
-  if (mrb->c != c) {
-    if (mrb->c->fib) {
-      mrb_write_barrier(mrb, (struct RBasic*)mrb->c->fib);
-    }
-    mrb->c = c;
-  }
-  return result;
-}
-
-MRB_API mrb_value
-mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
-{
-  /* mrb_assert(mrb_proc_cfunc_p(proc)) */
-  mrb_irep *irep = proc->body.irep;
-  mrb_value *pool = irep->pool;
-  mrb_sym *syms = irep->syms;
-  mrb_code i;
-  int ai = mrb_gc_arena_save(mrb);
-  struct mrb_jmpbuf *prev_jmp = mrb->jmp;
-  struct mrb_jmpbuf c_jmp;
-
-#ifdef DIRECT_THREADED
-  static void *optable[] = {
-    &&L_OP_NOP, &&L_OP_MOVE,
-    &&L_OP_LOADL, &&L_OP_LOADI, &&L_OP_LOADSYM, &&L_OP_LOADNIL,
-    &&L_OP_LOADSELF, &&L_OP_LOADT, &&L_OP_LOADF,
-    &&L_OP_GETGLOBAL, &&L_OP_SETGLOBAL, &&L_OP_GETSPECIAL, &&L_OP_SETSPECIAL,
-    &&L_OP_GETIV, &&L_OP_SETIV, &&L_OP_GETCV, &&L_OP_SETCV,
-    &&L_OP_GETCONST, &&L_OP_SETCONST, &&L_OP_GETMCNST, &&L_OP_SETMCNST,
-    &&L_OP_GETUPVAR, &&L_OP_SETUPVAR,
-    &&L_OP_JMP, &&L_OP_JMPIF, &&L_OP_JMPNOT,
-    &&L_OP_ONERR, &&L_OP_RESCUE, &&L_OP_POPERR, &&L_OP_RAISE, &&L_OP_EPUSH, &&L_OP_EPOP,
-    &&L_OP_SEND, &&L_OP_SENDB, &&L_OP_FSEND,
-    &&L_OP_CALL, &&L_OP_SUPER, &&L_OP_ARGARY, &&L_OP_ENTER,
-    &&L_OP_KARG, &&L_OP_KDICT, &&L_OP_RETURN, &&L_OP_TAILCALL, &&L_OP_BLKPUSH,
-    &&L_OP_ADD, &&L_OP_ADDI, &&L_OP_SUB, &&L_OP_SUBI, &&L_OP_MUL, &&L_OP_DIV,
-    &&L_OP_EQ, &&L_OP_LT, &&L_OP_LE, &&L_OP_GT, &&L_OP_GE,
-    &&L_OP_ARRAY, &&L_OP_ARYCAT, &&L_OP_ARYPUSH, &&L_OP_AREF, &&L_OP_ASET, &&L_OP_APOST,
-    &&L_OP_STRING, &&L_OP_STRCAT, &&L_OP_HASH,
-    &&L_OP_LAMBDA, &&L_OP_RANGE, &&L_OP_OCLASS,
-    &&L_OP_CLASS, &&L_OP_MODULE, &&L_OP_EXEC,
-    &&L_OP_METHOD, &&L_OP_SCLASS, &&L_OP_TCLASS,
-    &&L_OP_DEBUG, &&L_OP_STOP, &&L_OP_ERR,
-  };
-#endif
-
-  mrb_bool exc_catched = FALSE;
-RETRY_TRY_BLOCK:
-
-  MRB_TRY(&c_jmp) {
-
-  if (exc_catched) {
-    exc_catched = FALSE;
-    if (mrb->exc && mrb->exc->tt == MRB_TT_BREAK)
-      goto L_BREAK;
-    goto L_RAISE;
-  }
-  mrb->jmp = &c_jmp;
-  mrb->c->ci->proc = proc;
-  mrb->c->ci->nregs = irep->nregs;
-
-#define regs (mrb->c->stack)
-  INIT_DISPATCH {
-    CASE(OP_NOP) {
-      /* do nothing */
-      NEXT;
-    }
-
-    CASE(OP_MOVE) {
-      /* A B    R(A) := R(B) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      regs[a] = regs[b];
-      NEXT;
-    }
-
-    CASE(OP_LOADL) {
-      /* A Bx   R(A) := Pool(Bx) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-#ifdef MRB_WORD_BOXING
-      mrb_value val = pool[bx];
-      if (mrb_float_p(val)) {
-        val = mrb_float_value(mrb, mrb_float(val));
-      }
-      regs[a] = val;
-#else
-      regs[a] = pool[bx];
-#endif
-      NEXT;
-    }
-
-    CASE(OP_LOADI) {
-      /* A sBx  R(A) := sBx */
-      SET_INT_VALUE(regs[GETARG_A(i)], GETARG_sBx(i));
-      NEXT;
-    }
-
-    CASE(OP_LOADSYM) {
-      /* A Bx   R(A) := Syms(Bx) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      SET_SYM_VALUE(regs[a], syms[bx]);
-      NEXT;
-    }
-
-    CASE(OP_LOADSELF) {
-      /* A      R(A) := self */
-      int a = GETARG_A(i);
-      regs[a] = regs[0];
-      NEXT;
-    }
-
-    CASE(OP_LOADT) {
-      /* A      R(A) := true */
-      int a = GETARG_A(i);
-      SET_TRUE_VALUE(regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_LOADF) {
-      /* A      R(A) := false */
-      int a = GETARG_A(i);
-      SET_FALSE_VALUE(regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETGLOBAL) {
-      /* A Bx   R(A) := getglobal(Syms(Bx)) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_value val = mrb_gv_get(mrb, syms[bx]);
-      regs[a] = val;
-      NEXT;
-    }
-
-    CASE(OP_SETGLOBAL) {
-      /* A Bx   setglobal(Syms(Bx), R(A)) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_gv_set(mrb, syms[bx], regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETSPECIAL) {
-      /* A Bx   R(A) := Special[Bx] */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_value val = mrb_vm_special_get(mrb, bx);
-      regs[a] = val;
-      NEXT;
-    }
-
-    CASE(OP_SETSPECIAL) {
-      /* A Bx   Special[Bx] := R(A) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_vm_special_set(mrb, bx, regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETIV) {
-      /* A Bx   R(A) := ivget(Bx) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_value val = mrb_vm_iv_get(mrb, syms[bx]);
-      regs[a] = val;
-      NEXT;
-    }
-
-    CASE(OP_SETIV) {
-      /* A Bx   ivset(Syms(Bx),R(A)) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_vm_iv_set(mrb, syms[bx], regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETCV) {
-      /* A Bx   R(A) := cvget(Syms(Bx)) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_value val;
-      ERR_PC_SET(mrb, pc);
-      val = mrb_vm_cv_get(mrb, syms[bx]);
-      ERR_PC_CLR(mrb);
-      regs[a] = val;
-      NEXT;
-    }
-
-    CASE(OP_SETCV) {
-      /* A Bx   cvset(Syms(Bx),R(A)) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_vm_cv_set(mrb, syms[bx], regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETCONST) {
-      /* A Bx    R(A) := constget(Syms(Bx)) */
-      mrb_value val;
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_sym sym = syms[bx];
-
-      ERR_PC_SET(mrb, pc);
-      val = mrb_vm_const_get(mrb, sym);
-      ERR_PC_CLR(mrb);
-      regs[a] = val;
-      NEXT;
-    }
-
-    CASE(OP_SETCONST) {
-      /* A Bx   constset(Syms(Bx),R(A)) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_vm_const_set(mrb, syms[bx], regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETMCNST) {
-      /* A Bx   R(A) := R(A)::Syms(Bx) */
-      mrb_value val;
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-
-      ERR_PC_SET(mrb, pc);
-      val = mrb_const_get(mrb, regs[a], syms[bx]);
-      ERR_PC_CLR(mrb);
-      regs[a] = val;
-      NEXT;
-    }
-
-    CASE(OP_SETMCNST) {
-      /* A Bx    R(A+1)::Syms(Bx) := R(A) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      mrb_const_set(mrb, regs[a+1], syms[bx], regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_GETUPVAR) {
-      /* A B C  R(A) := uvget(B,C) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-      mrb_value *regs_a = regs + a;
-      struct REnv *e = uvenv(mrb, c);
-
-      if (!e) {
-        *regs_a = mrb_nil_value();
-      }
-      else {
-        *regs_a = e->stack[b];
-      }
-      NEXT;
-    }
-
-    CASE(OP_SETUPVAR) {
-      /* A B C  uvset(B,C,R(A)) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-
-      struct REnv *e = uvenv(mrb, c);
-
-      if (e) {
-        mrb_value *regs_a = regs + a;
-
-        if (b < MRB_ENV_STACK_LEN(e)) {
-          e->stack[b] = *regs_a;
-          mrb_write_barrier(mrb, (struct RBasic*)e);
-        }
-      }
-      NEXT;
-    }
-
-    CASE(OP_JMP) {
-      /* sBx    pc+=sBx */
-      int sbx = GETARG_sBx(i);
-      pc += sbx;
-      JUMP;
-    }
-
-    CASE(OP_JMPIF) {
-      /* A sBx  if R(A) pc+=sBx */
-      int a = GETARG_A(i);
-      int sbx = GETARG_sBx(i);
-      if (mrb_test(regs[a])) {
-        pc += sbx;
-        JUMP;
-      }
-      NEXT;
-    }
-
-    CASE(OP_JMPNOT) {
-      /* A sBx  if !R(A) pc+=sBx */
-      int a = GETARG_A(i);
-      int sbx = GETARG_sBx(i);
-      if (!mrb_test(regs[a])) {
-        pc += sbx;
-        JUMP;
-      }
-      NEXT;
-    }
-
-    CASE(OP_ONERR) {
-      /* sBx    pc+=sBx on exception */
-      int sbx = GETARG_sBx(i);
-      if (mrb->c->rsize <= mrb->c->ci->ridx) {
-        if (mrb->c->rsize == 0) mrb->c->rsize = RESCUE_STACK_INIT_SIZE;
-        else mrb->c->rsize *= 2;
-        mrb->c->rescue = (mrb_code **)mrb_realloc(mrb, mrb->c->rescue, sizeof(mrb_code*) * mrb->c->rsize);
-      }
-      mrb->c->rescue[mrb->c->ci->ridx++] = pc + sbx;
-      NEXT;
-    }
-
-    CASE(OP_RESCUE) {
-      /* A B    R(A) := exc; clear(exc); R(B) := matched (bool) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-      mrb_value exc;
-
-      if (c == 0) {
-        exc = mrb_obj_value(mrb->exc);
-        mrb->exc = 0;
-      }
-      else {           /* continued; exc taken from R(A) */
-        exc = regs[a];
-      }
-      if (b != 0) {
-        mrb_value e = regs[b];
-        struct RClass *ec;
-
-        switch (mrb_type(e)) {
-        case MRB_TT_CLASS:
-        case MRB_TT_MODULE:
-          break;
-        default:
-          {
-            mrb_value exc;
-
-            exc = mrb_exc_new_str_lit(mrb, E_TYPE_ERROR,
-                  "class or module required for rescue clause");
-            mrb_exc_set(mrb, exc);
-            goto L_RAISE;
-          }
-        }
-        ec = mrb_class_ptr(e);
-        regs[b] = mrb_bool_value(mrb_obj_is_kind_of(mrb, exc, ec));
-      }
-      if (a != 0 && c == 0) {
-        regs[a] = exc;
-      }
-      NEXT;
-    }
-
-    CASE(OP_POPERR) {
-      /* A      A.times{rescue_pop()} */
-      int a = GETARG_A(i);
-
-      mrb->c->ci->ridx -= a;
-      NEXT;
-    }
-
-    CASE(OP_RAISE) {
-      /* A      raise(R(A)) */
-      int a = GETARG_A(i);
-
-      mrb_exc_set(mrb, regs[a]);
-      goto L_RAISE;
-    }
-
-    CASE(OP_EPUSH) {
-      /* Bx     ensure_push(SEQ[Bx]) */
-      int bx = GETARG_Bx(i);
-      struct RProc *p;
-
-      p = mrb_closure_new(mrb, irep->reps[bx]);
-      /* push ensure_stack */
-      if (mrb->c->esize <= mrb->c->eidx+1) {
-        if (mrb->c->esize == 0) mrb->c->esize = ENSURE_STACK_INIT_SIZE;
-        else mrb->c->esize *= 2;
-        mrb->c->ensure = (struct RProc **)mrb_realloc(mrb, mrb->c->ensure, sizeof(struct RProc*) * mrb->c->esize);
-      }
-      mrb->c->ensure[mrb->c->eidx++] = p;
-      mrb->c->ensure[mrb->c->eidx] = NULL;
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_EPOP) {
-      /* A      A.times{ensure_pop().call} */
-      int a = GETARG_A(i);
-      mrb_callinfo *ci = mrb->c->ci;
-      int n, epos = ci->epos;
-
-      for (n=0; n<a && mrb->c->eidx > epos; n++) {
-        ecall(mrb, --mrb->c->eidx);
-        mrb_gc_arena_restore(mrb, ai);
-      }
-      NEXT;
-    }
-
-    CASE(OP_LOADNIL) {
-      /* A     R(A) := nil */
-      int a = GETARG_A(i);
-
-      SET_NIL_VALUE(regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_SENDB) {
-      /* A B C  R(A) := call(R(A),Syms(B),R(A+1),...,R(A+C),&R(A+C+1))*/
-      /* fall through */
-    };
-
-  L_SEND:
-    CASE(OP_SEND) {
-      /* A B C  R(A) := call(R(A),Syms(B),R(A+1),...,R(A+C)) */
-      int a = GETARG_A(i);
-      int n = GETARG_C(i);
-      struct RProc *m;
-      struct RClass *c;
-      mrb_callinfo *ci = mrb->c->ci;
-      mrb_value recv, result;
-      mrb_sym mid = syms[GETARG_B(i)];
-      int bidx;
-      mrb_value blk;
-
-      recv = regs[a];
-      if (n == CALL_MAXARGS) {
-        bidx = a+2;
-      }
-      else {
-        bidx = a+n+1;
-      }
-      if (GET_OPCODE(i) != OP_SENDB) {
-        if (bidx >= ci->nregs) {
-          stack_extend(mrb, bidx+1);
-          ci->nregs = bidx+1;
-        }
-        SET_NIL_VALUE(regs[bidx]);
-        blk = mrb_nil_value();
-      }
-      else {
-        blk = regs[bidx];
-        if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
-          if (bidx >= ci->nregs) {
-            stack_extend(mrb, bidx+1);
-            ci->nregs = bidx+1;
-          }
-          result = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
-          blk = regs[bidx] = result;
-        }
-      }
-      c = mrb_class(mrb, recv);
-      m = mrb_method_search_vm(mrb, &c, mid);
-      if (!m) {
-        mrb_value sym = mrb_symbol_value(mid);
-        mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-
-        m = mrb_method_search_vm(mrb, &c, missing);
-        if (!m) {
-          mrb_value args;
-
-          if (n == CALL_MAXARGS) {
-            args = regs[a+1];
-          }
-          else {
-            args = mrb_ary_new_from_values(mrb, n, regs+a+1);
-          }
-          ERR_PC_SET(mrb, pc);
-          mrb_method_missing(mrb, mid, recv, args);
-        }
-        mid = missing;
-        if (n != CALL_MAXARGS) {
-          if (a+2 >= irep->nregs) {
-            stack_extend(mrb, a+3);
-          }
-          regs[a+1] = mrb_ary_new_from_values(mrb, n, regs+a+1);
-          regs[a+2] = blk;
-          n = CALL_MAXARGS;
-        }
-        mrb_ary_unshift(mrb, regs[a+1], sym);
-      }
-
-      /* push callinfo */
-      ci = cipush(mrb);
-      ci->mid = mid;
-      ci->proc = m;
-      ci->stackent = mrb->c->stack;
-      ci->target_class = c;
-
-      ci->pc = pc + 1;
-      ci->acc = a;
-
-      /* prepare stack */
-      mrb->c->stack += a;
-
-      if (MRB_PROC_CFUNC_P(m)) {
-        if (n == CALL_MAXARGS) {
-          ci->argc = -1;
-          ci->nregs = 3;
-        }
-        else {
-          ci->argc = n;
-          ci->nregs = n + 2;
-        }
-        result = m->body.func(mrb, recv);
-        mrb_gc_arena_restore(mrb, ai);
-        mrb_gc_arena_shrink(mrb, ai);
-        if (mrb->exc) goto L_RAISE;
-        ci = mrb->c->ci;
-        if (GET_OPCODE(i) == OP_SENDB) {
-          if (mrb_type(blk) == MRB_TT_PROC) {
-            struct RProc *p = mrb_proc_ptr(blk);
-
-            if (p && !MRB_PROC_STRICT_P(p) && p->env == ci[-1].env) {
-              p->flags |= MRB_PROC_ORPHAN;
-            }
-          }
-        }
-        if (!ci->target_class) { /* return from context modifying method (resume/yield) */
-          if (ci->acc == CI_ACC_RESUMED) {
-            mrb->jmp = prev_jmp;
-            return result;
-          }
-          else {
-            mrb_assert(!MRB_PROC_CFUNC_P(ci[-1].proc));
-            proc = ci[-1].proc;
-            irep = proc->body.irep;
-            pool = irep->pool;
-            syms = irep->syms;
-          }
-        }
-        mrb->c->stack[0] = result;
-        /* pop stackpos */
-        mrb->c->stack = ci->stackent;
-        pc = ci->pc;
-        cipop(mrb);
-        JUMP;
-      }
-      else {
-        /* setup environment for calling method */
-        proc = mrb->c->ci->proc = m;
-        irep = m->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-        ci->nregs = irep->nregs;
-        if (n == CALL_MAXARGS) {
-          ci->argc = -1;
-          stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs);
-        }
-        else {
-          ci->argc = n;
-          stack_extend(mrb, irep->nregs);
-        }
-        pc = irep->iseq;
-        JUMP;
-      }
-    }
-
-    CASE(OP_FSEND) {
-      /* A B C  R(A) := fcall(R(A),Syms(B),R(A+1),... ,R(A+C-1)) */
-      /* not implemented yet */
-      NEXT;
-    }
-
-    CASE(OP_CALL) {
-      /* A      R(A) := self.call(frame.argc, frame.argv) */
-      mrb_callinfo *ci;
-      mrb_value recv = mrb->c->stack[0];
-      struct RProc *m = mrb_proc_ptr(recv);
-
-      /* replace callinfo */
-      ci = mrb->c->ci;
-      ci->target_class = m->target_class;
-      ci->proc = m;
-      if (m->env) {
-        mrb_sym mid;
-
-        if (MRB_ENV_STACK_SHARED_P(m->env)) {
-          mid = m->env->cxt.c->cibase[m->env->cioff].mid;
-        }
-        else {
-          mid = m->env->cxt.mid;
-        }
-        if (mid) ci->mid = mid;
-        if (!m->env->stack) {
-          m->env->stack = mrb->c->stack;
-        }
-      }
-
-      /* prepare stack */
-      if (MRB_PROC_CFUNC_P(m)) {
-        recv = m->body.func(mrb, recv);
-        mrb_gc_arena_restore(mrb, ai);
-        mrb_gc_arena_shrink(mrb, ai);
-        if (mrb->exc) goto L_RAISE;
-        /* pop stackpos */
-        ci = mrb->c->ci;
-        mrb->c->stack = ci->stackent;
-        regs[ci->acc] = recv;
-        pc = ci->pc;
-        cipop(mrb);
-        irep = mrb->c->ci->proc->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-        JUMP;
-      }
-      else {
-        /* setup environment for calling method */
-        proc = m;
-        irep = m->body.irep;
-        if (!irep) {
-          mrb->c->stack[0] = mrb_nil_value();
-          goto L_RETURN;
-        }
-        pool = irep->pool;
-        syms = irep->syms;
-        ci->nregs = irep->nregs;
-        stack_extend(mrb, irep->nregs);
-        if (ci->argc < 0) {
-          if (irep->nregs > 3) {
-            stack_clear(regs+3, irep->nregs-3);
-          }
-        }
-        else if (ci->argc+2 < irep->nregs) {
-          stack_clear(regs+ci->argc+2, irep->nregs-ci->argc-2);
-        }
-        if (m->env) {
-          regs[0] = m->env->stack[0];
-        }
-        pc = irep->iseq;
-        JUMP;
-      }
-    }
-
-    CASE(OP_SUPER) {
-      /* A C  R(A) := super(R(A+1),... ,R(A+C+1)) */
-      mrb_value recv;
-      mrb_callinfo *ci = mrb->c->ci;
-      struct RProc *m;
-      struct RClass *c;
-      mrb_sym mid = ci->mid;
-      int a = GETARG_A(i);
-      int n = GETARG_C(i);
-      mrb_value blk;
-      int bidx;
-
-      if (mid == 0 || !ci->target_class) {
-        mrb_value exc;
-
-        exc = mrb_exc_new_str_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
-        mrb_exc_set(mrb, exc);
-        goto L_RAISE;
-      }
-      recv = regs[0];
-      c = mrb->c->ci->target_class->super;
-      m = mrb_method_search_vm(mrb, &c, mid);
-      if (!m) {
-        mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-        m = mrb_method_search_vm(mrb, &c, missing);
-        if (!m) {
-          mrb_value args;
-
-          if (n == CALL_MAXARGS) {
-            args = regs[a+1];
-          }
-          else {
-            args = mrb_ary_new_from_values(mrb, n, regs+a+1);
-          }
-          ERR_PC_SET(mrb, pc);
-          mrb_method_missing(mrb, mid, recv, args);
-        }
-        mid = missing;
-        if (n == CALL_MAXARGS-1) {
-          regs[a+1] = mrb_ary_new_from_values(mrb, n, regs+a+1);
-          n++;
-        }
-        if (n == CALL_MAXARGS) {
-          mrb_ary_unshift(mrb, regs[a+1], mrb_symbol_value(ci->mid));
-        }
-        else {
-          value_move(regs+a+2, regs+a+1, ++n);
-          SET_SYM_VALUE(regs[a+1], ci->mid);
-        }
-      }
-
-      if (n == CALL_MAXARGS) {
-        bidx = a+2;
-      }
-      else {
-        bidx = a+n+1;
-      }
-      blk = regs[bidx];
-      if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
-        mrb_value result;
-
-        if (bidx >= ci->nregs) {
-          stack_extend(mrb, bidx+1);
-          ci->nregs = bidx+1;
-        }
-        result = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
-        regs[bidx] = result;
-      }
-
-      /* push callinfo */
-      ci = cipush(mrb);
-      ci->mid = mid;
-      ci->proc = m;
-      ci->stackent = mrb->c->stack;
-      ci->target_class = c;
-      ci->pc = pc + 1;
-      if (n == CALL_MAXARGS) {
-        ci->argc = -1;
-      }
-      else {
-        ci->argc = n;
-      }
-
-      /* prepare stack */
-      mrb->c->stack += a;
-      mrb->c->stack[0] = recv;
-
-      if (MRB_PROC_CFUNC_P(m)) {
-        mrb_value v;
-
-        if (n == CALL_MAXARGS) {
-          ci->nregs = 3;
-        }
-        else {
-          ci->nregs = n + 2;
-        }
-        v = m->body.func(mrb, recv);
-        mrb_gc_arena_restore(mrb, ai);
-        if (mrb->exc) goto L_RAISE;
-        ci = mrb->c->ci;
-        if (!ci->target_class) { /* return from context modifying method (resume/yield) */
-          if (ci->acc == CI_ACC_RESUMED) {
-            mrb->jmp = prev_jmp;
-            return v;
-          }
-          else {
-            mrb_assert(!MRB_PROC_CFUNC_P(ci[-1].proc));
-            proc = ci[-1].proc;
-            irep = proc->body.irep;
-            pool = irep->pool;
-            syms = irep->syms;
-          }
-        }
-        mrb->c->stack[0] = v;
-        /* pop stackpos */
-        mrb->c->stack = ci->stackent;
-        pc = ci->pc;
-        cipop(mrb);
-        JUMP;
-      }
-      else {
-        /* fill callinfo */
-        ci->acc = a;
-
-        /* setup environment for calling method */
-        ci->proc = m;
-        irep = m->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-        ci->nregs = irep->nregs;
-        if (n == CALL_MAXARGS) {
-          stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs);
-        }
-        else {
-          stack_extend(mrb, irep->nregs);
-        }
-        pc = irep->iseq;
-        JUMP;
-      }
-    }
-
-    CASE(OP_ARGARY) {
-      /* A Bx   R(A) := argument array (16=6:1:5:4) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      int m1 = (bx>>10)&0x3f;
-      int r  = (bx>>9)&0x1;
-      int m2 = (bx>>4)&0x1f;
-      int lv = (bx>>0)&0xf;
-      mrb_value *stack;
-
-      if (mrb->c->ci->mid == 0 || mrb->c->ci->target_class == NULL) {
-        mrb_value exc;
-
-      L_NOSUPER:
-        exc = mrb_exc_new_str_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
-        mrb_exc_set(mrb, exc);
-        goto L_RAISE;
-      }
-      if (lv == 0) stack = regs + 1;
-      else {
-        struct REnv *e = uvenv(mrb, lv-1);
-        if (!e) goto L_NOSUPER;
-        if (MRB_ENV_STACK_LEN(e) <= m1+r+m2+1)
-          goto L_NOSUPER;
-        stack = e->stack + 1;
-      }
-      if (r == 0) {
-        regs[a] = mrb_ary_new_from_values(mrb, m1+m2, stack);
-      }
-      else {
-        mrb_value *pp = NULL;
-        struct RArray *rest;
-        int len = 0;
-
-        if (mrb_array_p(stack[m1])) {
-          struct RArray *ary = mrb_ary_ptr(stack[m1]);
-
-          pp = ARY_PTR(ary);
-          len = ARY_LEN(ary);
-        }
-        regs[a] = mrb_ary_new_capa(mrb, m1+len+m2);
-        rest = mrb_ary_ptr(regs[a]);
-        if (m1 > 0) {
-          stack_copy(ARY_PTR(rest), stack, m1);
-        }
-        if (len > 0) {
-          stack_copy(ARY_PTR(rest)+m1, pp, len);
-        }
-        if (m2 > 0) {
-          stack_copy(ARY_PTR(rest)+m1+len, stack+m1+1, m2);
-        }
-        ARY_SET_LEN(rest, m1+len+m2);
-      }
-      regs[a+1] = stack[m1+r+m2];
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_ENTER) {
-      /* Ax             arg setup according to flags (23=5:5:1:5:5:1:1) */
-      /* number of optional arguments times OP_JMP should follow */
-      mrb_aspec ax = GETARG_Ax(i);
-      int m1 = MRB_ASPEC_REQ(ax);
-      int o  = MRB_ASPEC_OPT(ax);
-      int r  = MRB_ASPEC_REST(ax);
-      int m2 = MRB_ASPEC_POST(ax);
-      /* unused
-      int k  = MRB_ASPEC_KEY(ax);
-      int kd = MRB_ASPEC_KDICT(ax);
-      int b  = MRB_ASPEC_BLOCK(ax);
-      */
-      int argc = mrb->c->ci->argc;
-      mrb_value *argv = regs+1;
-      mrb_value *argv0 = argv;
-      int len = m1 + o + r + m2;
-      mrb_value *blk = &argv[argc < 0 ? 1 : argc];
-
-      if (argc < 0) {
-        struct RArray *ary = mrb_ary_ptr(regs[1]);
-        argv = ARY_PTR(ary);
-        argc = ARY_LEN(ary);
-        mrb_gc_protect(mrb, regs[1]);
-      }
-      if (mrb->c->ci->proc && MRB_PROC_STRICT_P(mrb->c->ci->proc)) {
-        if (argc >= 0) {
-          if (argc < m1 + m2 || (r == 0 && argc > len)) {
-            argnum_error(mrb, m1+m2);
-            goto L_RAISE;
-          }
-        }
-      }
-      else if (len > 1 && argc == 1 && mrb_array_p(argv[0])) {
-        mrb_gc_protect(mrb, argv[0]);
-        argc = RARRAY_LEN(argv[0]);
-        argv = RARRAY_PTR(argv[0]);
-      }
-      if (argc < len) {
-        int mlen = m2;
-        if (argc < m1+m2) {
-          if (m1 < argc)
-            mlen = argc - m1;
-          else
-            mlen = 0;
-        }
-        regs[len+1] = *blk; /* move block */
-        SET_NIL_VALUE(regs[argc+1]);
-        if (argv0 != argv) {
-          value_move(&regs[1], argv, argc-mlen); /* m1 + o */
-        }
-        if (argc < m1) {
-          stack_clear(&regs[argc+1], m1-argc);
-        }
-        if (mlen) {
-          value_move(&regs[len-m2+1], &argv[argc-mlen], mlen);
-        }
-        if (mlen < m2) {
-          stack_clear(&regs[len-m2+mlen+1], m2-mlen);
-        }
-        if (r) {
-          regs[m1+o+1] = mrb_ary_new_capa(mrb, 0);
-        }
-        if (o == 0 || argc < m1+m2) pc++;
-        else
-          pc += argc - m1 - m2 + 1;
-      }
-      else {
-        int rnum = 0;
-        if (argv0 != argv) {
-          regs[len+1] = *blk; /* move block */
-          value_move(&regs[1], argv, m1+o);
-        }
-        if (r) {
-          rnum = argc-m1-o-m2;
-          regs[m1+o+1] = mrb_ary_new_from_values(mrb, rnum, argv+m1+o);
-        }
-        if (m2) {
-          if (argc-m2 > m1) {
-            value_move(&regs[m1+o+r+1], &argv[m1+o+rnum], m2);
-          }
-        }
-        if (argv0 == argv) {
-          regs[len+1] = *blk; /* move block */
-        }
-        pc += o + 1;
-      }
-      mrb->c->ci->argc = len;
-      /* clear local (but non-argument) variables */
-      if (irep->nlocals-len-2 > 0) {
-        stack_clear(&regs[len+2], irep->nlocals-len-2);
-      }
-      JUMP;
-    }
-
-    CASE(OP_KARG) {
-      /* A B C          R(A) := kdict[Syms(B)]; if C kdict.rm(Syms(B)) */
-      /* if C == 2; raise unless kdict.empty? */
-      /* OP_JMP should follow to skip init code */
-      NEXT;
-    }
-
-    CASE(OP_KDICT) {
-      /* A C            R(A) := kdict */
-      NEXT;
-    }
-
-    L_RETURN:
-      i = MKOP_AB(OP_RETURN, GETARG_A(i), OP_R_NORMAL);
-      /* fall through */
-    CASE(OP_RETURN) {
-      /* A B     return R(A) (B=normal,in-block return/break) */
-      mrb_callinfo *ci;
-
-      ci = mrb->c->ci;
-      if (ci->mid) {
-        mrb_value blk;
-
-        if (ci->argc < 0) {
-          blk = regs[2];
-        }
-        else {
-          blk = regs[ci->argc+1];
-        }
-        if (mrb_type(blk) == MRB_TT_PROC) {
-          struct RProc *p = mrb_proc_ptr(blk);
-
-          if (!MRB_PROC_STRICT_P(proc) &&
-              ci > mrb->c->cibase && p->env == ci[-1].env) {
-            p->flags |= MRB_PROC_ORPHAN;
-          }
-        }
-      }
-
-      if (mrb->exc) {
-        mrb_callinfo *ci0;
-        mrb_value *stk;
-
-      L_RAISE:
-        ci0 = ci = mrb->c->ci;
-        if (ci == mrb->c->cibase) {
-          if (ci->ridx == 0) goto L_FTOP;
-          goto L_RESCUE;
-        }
-        stk = mrb->c->stack;
-        while (ci[0].ridx == ci[-1].ridx) {
-          cipop(mrb);
-          mrb->c->stack = ci->stackent;
-          if (ci->acc == CI_ACC_SKIP && prev_jmp) {
-            mrb->jmp = prev_jmp;
-            MRB_THROW(prev_jmp);
-          }
-          ci = mrb->c->ci;
-          if (ci == mrb->c->cibase) {
-            mrb->c->stack = stk;
-            if (ci->ridx == 0) {
-            L_FTOP:             /* fiber top */
-              if (mrb->c == mrb->root_c) {
-                mrb->c->stack = mrb->c->stbase;
-                goto L_STOP;
-              }
-              else {
-                struct mrb_context *c = mrb->c;
-
-                if (c->fib) {
-                  mrb_write_barrier(mrb, (struct RBasic*)c->fib);
-                }
-                mrb->c = c->prev;
-                c->prev = NULL;
-                goto L_RAISE;
-              }
-            }
-            break;
-          }
-          /* call ensure only when we skip this callinfo */
-          if (ci[0].ridx == ci[-1].ridx) {
-	    mrb_value *org_stbase = mrb->c->stbase;
-            while (mrb->c->eidx > ci->epos) {
-              ecall(mrb, --mrb->c->eidx);
-              ci = mrb->c->ci;
-	      if (org_stbase != mrb->c->stbase) {
-		stk = mrb->c->stack;
-	      }
-            }
-          }
-        }
-      L_RESCUE:
-        if (ci->ridx == 0) goto L_STOP;
-        proc = ci->proc;
-        irep = proc->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-        if (ci != ci0) {
-          mrb->c->stack = ci[1].stackent;
-        }
-        stack_extend(mrb, irep->nregs);
-        pc = mrb->c->rescue[--ci->ridx];
-      }
-      else {
-        int acc;
-        mrb_value v;
-
-        v = regs[GETARG_A(i)];
-        mrb_gc_protect(mrb, v);
-        switch (GETARG_B(i)) {
-        case OP_R_RETURN:
-          /* Fall through to OP_R_NORMAL otherwise */
-          if (ci->acc >=0 && proc->env && !MRB_PROC_STRICT_P(proc)) {
-            struct REnv *e = top_env(mrb, proc);
-            mrb_callinfo *ce;
-
-            if (!MRB_ENV_STACK_SHARED_P(e) || e->cxt.c != mrb->c) {
-              localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
-              goto L_RAISE;
-            }
-            
-            ce = mrb->c->cibase + e->cioff;
-            while (ci > ce) {
-              mrb_env_unshare(mrb, ci->env);
-              if (ci->acc < 0) {
-                localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
-                goto L_RAISE;
-              }
-              ci--;
-            }
-            mrb_env_unshare(mrb, ci->env);
-            if (ce == mrb->c->cibase) {
-              localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
-              goto L_RAISE;
-            }
-            mrb->c->stack = mrb->c->ci->stackent;
-            mrb->c->ci = ce;
-            break;
-          }
-        case OP_R_NORMAL:
-        NORMAL_RETURN:
-          if (ci == mrb->c->cibase) {
-            if (!mrb->c->prev) { /* toplevel return */
-              localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
-              goto L_RAISE;
-            }
-            if (mrb->c->prev->ci == mrb->c->prev->cibase) {
-              mrb_value exc = mrb_exc_new_str_lit(mrb, E_FIBER_ERROR, "double resume");
-              mrb_exc_set(mrb, exc);
-              goto L_RAISE;
-            }
-            while (mrb->c->eidx > 0) {
-              ecall(mrb, --mrb->c->eidx);
-            }
-            /* automatic yield at the end */
-            mrb->c->status = MRB_FIBER_TERMINATED;
-            mrb->c = mrb->c->prev;
-            mrb->c->status = MRB_FIBER_RUNNING;
-          }
-          ci = mrb->c->ci;
-          break;
-        case OP_R_BREAK:
-          if (MRB_PROC_STRICT_P(proc)) goto NORMAL_RETURN;
-          if (MRB_PROC_ORPHAN_P(proc)) { 
-            mrb_value exc;
-
-          L_BREAK_ERROR:
-            exc = mrb_exc_new_str_lit(mrb, E_LOCALJUMP_ERROR,
-                                      "break from proc-closure");
-            mrb_exc_set(mrb, exc);
-            goto L_RAISE;
-          }
-          if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
-            goto L_BREAK_ERROR;
-          }
-          if (proc->env->cxt.c != mrb->c) {
-            goto L_BREAK_ERROR;
-          }
-          while (mrb->c->eidx > mrb->c->ci->epos) {
-            ecall(mrb, --mrb->c->eidx);
-          }
-          /* break from fiber block */
-          if (mrb->c->ci == mrb->c->cibase && mrb->c->ci->pc) {
-            struct mrb_context *c = mrb->c;
-
-            mrb->c = c->prev;
-            c->prev = NULL;
-            ci = mrb->c->ci;
-          }
-          if (ci->acc < 0) {
-            mrb_gc_arena_restore(mrb, ai);
-            mrb->c->vmexec = FALSE;
-            mrb->exc = (struct RObject*)break_new(mrb, proc, v);
-            mrb->jmp = prev_jmp;
-            MRB_THROW(prev_jmp);
-          }
-          if (FALSE) {
-          L_BREAK:
-            v = ((struct RBreak*)mrb->exc)->val;
-            proc = ((struct RBreak*)mrb->exc)->proc;
-            mrb->exc = NULL;
-            ci = mrb->c->ci;
-          }
-          mrb->c->stack = ci->stackent;
-          mrb->c->ci = mrb->c->cibase + proc->env->cioff + 1;
-          while (ci > mrb->c->ci) {
-            mrb_env_unshare(mrb, ci->env);
-            if (ci[-1].acc == CI_ACC_SKIP) {
-              mrb->c->ci = ci;
-              goto L_BREAK_ERROR;
-            }
-            ci--;
-          }
-          mrb_env_unshare(mrb, ci->env);
-          break;
-        default:
-          /* cannot happen */
-          break;
-        }
-        while (mrb->c->eidx > mrb->c->ci->epos) {
-          ecall(mrb, --mrb->c->eidx);
-        }
-        if (mrb->c->vmexec && !mrb->c->ci->target_class) {
-          mrb_gc_arena_restore(mrb, ai);
-          mrb->c->vmexec = FALSE;
-          mrb->jmp = prev_jmp;
-          return v;
-        }
-        ci = mrb->c->ci;
-        acc = ci->acc;
-        mrb->c->stack = ci->stackent;
-        cipop(mrb);
-        if (acc == CI_ACC_SKIP || acc == CI_ACC_DIRECT) {
-          mrb_gc_arena_restore(mrb, ai);
-          mrb->jmp = prev_jmp;
-          return v;
-        }
-        pc = ci->pc;
-        DEBUG(fprintf(stderr, "from :%s\n", mrb_sym2name(mrb, ci->mid)));
-        proc = mrb->c->ci->proc;
-        irep = proc->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-
-        regs[acc] = v;
-        mrb_gc_arena_restore(mrb, ai);
-      }
-      JUMP;
-    }
-
-    CASE(OP_TAILCALL) {
-      /* A B C  return call(R(A),Syms(B),R(A+1),... ,R(A+C+1)) */
-      int a = GETARG_A(i);
-      int n = GETARG_C(i);
-      struct RProc *m;
-      struct RClass *c;
-      mrb_callinfo *ci;
-      mrb_value recv;
-      mrb_sym mid = syms[GETARG_B(i)];
-
-      recv = regs[a];
-      c = mrb_class(mrb, recv);
-      m = mrb_method_search_vm(mrb, &c, mid);
-      if (!m) {
-        mrb_value sym = mrb_symbol_value(mid);
-        mrb_sym missing = mrb_intern_lit(mrb, "method_missing");
-        m = mrb_method_search_vm(mrb, &c, missing);
-        if (!m) {
-          mrb_value args;
-
-          if (n == CALL_MAXARGS) {
-            args = regs[a+1];
-          }
-          else {
-            args = mrb_ary_new_from_values(mrb, n, regs+a+1);
-          }
-          ERR_PC_SET(mrb, pc);
-          mrb_method_missing(mrb, mid, recv, args);
-        }
-        mid = missing;
-        if (n == CALL_MAXARGS) {
-          mrb_ary_unshift(mrb, regs[a+1], sym);
-        }
-        else {
-          value_move(regs+a+2, regs+a+1, ++n);
-          regs[a+1] = sym;
-        }
-      }
-
-      /* replace callinfo */
-      ci = mrb->c->ci;
-      ci->mid = mid;
-      ci->target_class = c;
-      if (n == CALL_MAXARGS) {
-        ci->argc = -1;
-      }
-      else {
-        ci->argc = n;
-      }
-
-      /* move stack */
-      value_move(mrb->c->stack, &regs[a], ci->argc+1);
-
-      if (MRB_PROC_CFUNC_P(m)) {
-        mrb_value v = m->body.func(mrb, recv);
-        mrb->c->stack[0] = v;
-        mrb_gc_arena_restore(mrb, ai);
-        goto L_RETURN;
-      }
-      else {
-        /* setup environment for calling method */
-        irep = m->body.irep;
-        pool = irep->pool;
-        syms = irep->syms;
-        if (ci->argc < 0) {
-          stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs);
-        }
-        else {
-          stack_extend(mrb, irep->nregs);
-        }
-        pc = irep->iseq;
-      }
-      JUMP;
-    }
-
-    CASE(OP_BLKPUSH) {
-      /* A Bx   R(A) := block (16=6:1:5:4) */
-      int a = GETARG_A(i);
-      int bx = GETARG_Bx(i);
-      int m1 = (bx>>10)&0x3f;
-      int r  = (bx>>9)&0x1;
-      int m2 = (bx>>4)&0x1f;
-      int lv = (bx>>0)&0xf;
-      mrb_value *stack;
-
-      if (lv == 0) stack = regs + 1;
-      else {
-        struct REnv *e = uvenv(mrb, lv-1);
-        if (!e || e->cioff == 0 ||
-            (!MRB_ENV_STACK_SHARED_P(e) && e->cxt.mid == 0) ||
-            MRB_ENV_STACK_LEN(e) <= m1+r+m2+1) {
-          localjump_error(mrb, LOCALJUMP_ERROR_YIELD);
-          goto L_RAISE;
-        }
-        stack = e->stack + 1;
-      }
-      if (mrb_nil_p(stack[m1+r+m2])) {
-        localjump_error(mrb, LOCALJUMP_ERROR_YIELD);
-        goto L_RAISE;
-      }
-      regs[a] = stack[m1+r+m2];
-      NEXT;
-    }
-
-#define TYPES2(a,b) ((((uint16_t)(a))<<8)|(((uint16_t)(b))&0xff))
-#define OP_MATH_BODY(op,v1,v2) do {\
-  v1(regs[a]) = v1(regs[a]) op v2(regs[a+1]);\
-} while(0)
-
-    CASE(OP_ADD) {
-      /* A B C  R(A) := R(A)+R(A+1) (Syms[B]=:+,C=1)*/
-      int a = GETARG_A(i);
-
-      /* need to check if op is overridden */
-      switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
-        {
-          mrb_int x, y, z;
-          mrb_value *regs_a = regs + a;
-
-          x = mrb_fixnum(regs_a[0]);
-          y = mrb_fixnum(regs_a[1]);
-          if (mrb_int_add_overflow(x, y, &z)) {
-            SET_FLOAT_VALUE(mrb, regs_a[0], (mrb_float)x + (mrb_float)y);
-            break;
-          }
-          SET_INT_VALUE(regs[a], z);
-        }
-        break;
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
-        {
-          mrb_int x = mrb_fixnum(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x + y);
-        }
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_int y = mrb_fixnum(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x + y);
-        }
-#else
-        OP_MATH_BODY(+,mrb_float,mrb_fixnum);
-#endif
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x + y);
-        }
-#else
-        OP_MATH_BODY(+,mrb_float,mrb_float);
-#endif
-        break;
-      case TYPES2(MRB_TT_STRING,MRB_TT_STRING):
-        regs[a] = mrb_str_plus(mrb, regs[a], regs[a+1]);
-        break;
-      default:
-        goto L_SEND;
-      }
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_SUB) {
-      /* A B C  R(A) := R(A)-R(A+1) (Syms[B]=:-,C=1)*/
-      int a = GETARG_A(i);
-
-      /* need to check if op is overridden */
-      switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
-        {
-          mrb_int x, y, z;
-
-          x = mrb_fixnum(regs[a]);
-          y = mrb_fixnum(regs[a+1]);
-          if (mrb_int_sub_overflow(x, y, &z)) {
-            SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x - (mrb_float)y);
-            break;
-          }
-          SET_INT_VALUE(regs[a], z);
-        }
-        break;
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
-        {
-          mrb_int x = mrb_fixnum(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x - y);
-        }
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_int y = mrb_fixnum(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x - y);
-        }
-#else
-        OP_MATH_BODY(-,mrb_float,mrb_fixnum);
-#endif
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x - y);
-        }
-#else
-        OP_MATH_BODY(-,mrb_float,mrb_float);
-#endif
-        break;
-      default:
-        goto L_SEND;
-      }
-      NEXT;
-    }
-
-    CASE(OP_MUL) {
-      /* A B C  R(A) := R(A)*R(A+1) (Syms[B]=:*,C=1)*/
-      int a = GETARG_A(i);
-
-      /* need to check if op is overridden */
-      switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
-        {
-          mrb_int x, y, z;
-
-          x = mrb_fixnum(regs[a]);
-          y = mrb_fixnum(regs[a+1]);
-          if (mrb_int_mul_overflow(x, y, &z)) {
-            SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x * (mrb_float)y);
-            break;
-          }
-          SET_INT_VALUE(regs[a], z);
-        }
-        break;
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
-        {
-          mrb_int x = mrb_fixnum(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x * y);
-        }
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_int y = mrb_fixnum(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x * y);
-        }
-#else
-        OP_MATH_BODY(*,mrb_float,mrb_fixnum);
-#endif
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x * y);
-        }
-#else
-        OP_MATH_BODY(*,mrb_float,mrb_float);
-#endif
-        break;
-      default:
-        goto L_SEND;
-      }
-      NEXT;
-    }
-
-    CASE(OP_DIV) {
-      /* A B C  R(A) := R(A)/R(A+1) (Syms[B]=:/,C=1)*/
-      int a = GETARG_A(i);
-
-      /* need to check if op is overridden */
-      switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
-        {
-          mrb_int x = mrb_fixnum(regs[a]);
-          mrb_int y = mrb_fixnum(regs[a+1]);
-          double f;
-          if (y == 0 && x != 0) {
-            f = INFINITY;
-          }
-          else {
-            f = (mrb_float)x / (mrb_float)y;
-          }
-          SET_FLOAT_VALUE(mrb, regs[a], f);
-        }
-        break;
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
-        {
-          mrb_int x = mrb_fixnum(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x / y);
-        }
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_int y = mrb_fixnum(regs[a+1]);
-          double f;
-          if (y == 0) {
-            f = INFINITY;
-          }
-          else {
-            f = x / y;
-          }
-          SET_FLOAT_VALUE(mrb, regs[a], f);
-        }
-#else
-        OP_MATH_BODY(/,mrb_float,mrb_fixnum);
-#endif
-        break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          mrb_float y = mrb_float(regs[a+1]);
-          SET_FLOAT_VALUE(mrb, regs[a], x / y);
-        }
-#else
-        OP_MATH_BODY(/,mrb_float,mrb_float);
-#endif
-        break;
-      default:
-        goto L_SEND;
-      }
-#ifdef MRB_NAN_BOXING
-      if (isnan(mrb_float(regs[a]))) {
-        mrb_value v = mrb_float_value(mrb, mrb_float(regs[a]));
-        regs[a] = v;
-      }
-#endif
-      NEXT;
-    }
-
-    CASE(OP_ADDI) {
-      /* A B C  R(A) := R(A)+C (Syms[B]=:+)*/
-      int a = GETARG_A(i);
-
-      /* need to check if + is overridden */
-      switch (mrb_type(regs[a])) {
-      case MRB_TT_FIXNUM:
-        {
-          mrb_int x = mrb_fixnum(regs[a]);
-          mrb_int y = GETARG_C(i);
-          mrb_int z;
-
-          if (mrb_int_add_overflow(x, y, &z)) {
-            SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x + (mrb_float)y);
-            break;
-          }
-          SET_INT_VALUE(regs[a], z);
-        }
-        break;
-      case MRB_TT_FLOAT:
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          SET_FLOAT_VALUE(mrb, regs[a], x + GETARG_C(i));
-        }
-#else
-        mrb_float(regs[a]) += GETARG_C(i);
-#endif
-        break;
-      default:
-        SET_INT_VALUE(regs[a+1], GETARG_C(i));
-        i = MKOP_ABC(OP_SEND, a, GETARG_B(i), 1);
-        goto L_SEND;
-      }
-      NEXT;
-    }
-
-    CASE(OP_SUBI) {
-      /* A B C  R(A) := R(A)-C (Syms[B]=:-)*/
-      int a = GETARG_A(i);
-      mrb_value *regs_a = regs + a;
-
-      /* need to check if + is overridden */
-      switch (mrb_type(regs_a[0])) {
-      case MRB_TT_FIXNUM:
-        {
-          mrb_int x = mrb_fixnum(regs_a[0]);
-          mrb_int y = GETARG_C(i);
-          mrb_int z;
-
-          if (mrb_int_sub_overflow(x, y, &z)) {
-            SET_FLOAT_VALUE(mrb, regs_a[0], (mrb_float)x - (mrb_float)y);
-          }
-          else {
-            SET_INT_VALUE(regs_a[0], z);
-          }
-        }
-        break;
-      case MRB_TT_FLOAT:
-#ifdef MRB_WORD_BOXING
-        {
-          mrb_float x = mrb_float(regs[a]);
-          SET_FLOAT_VALUE(mrb, regs[a], x - GETARG_C(i));
-        }
-#else
-        mrb_float(regs_a[0]) -= GETARG_C(i);
-#endif
-        break;
-      default:
-        SET_INT_VALUE(regs_a[1], GETARG_C(i));
-        i = MKOP_ABC(OP_SEND, a, GETARG_B(i), 1);
-        goto L_SEND;
-      }
-      NEXT;
-    }
-
-#define OP_CMP_BODY(op,v1,v2) (v1(regs[a]) op v2(regs[a+1]))
-
-#define OP_CMP(op) do {\
-  int result;\
-  /* need to check if - is overridden */\
-  switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):\
-    result = OP_CMP_BODY(op,mrb_fixnum,mrb_fixnum);\
-    break;\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):\
-    result = OP_CMP_BODY(op,mrb_fixnum,mrb_float);\
-    break;\
-  case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):\
-    result = OP_CMP_BODY(op,mrb_float,mrb_fixnum);\
-    break;\
-  case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):\
-    result = OP_CMP_BODY(op,mrb_float,mrb_float);\
-    break;\
-  default:\
-    goto L_SEND;\
-  }\
-  if (result) {\
-    SET_TRUE_VALUE(regs[a]);\
-  }\
-  else {\
-    SET_FALSE_VALUE(regs[a]);\
-  }\
-} while(0)
-
-    CASE(OP_EQ) {
-      /* A B C  R(A) := R(A)==R(A+1) (Syms[B]=:==,C=1)*/
-      int a = GETARG_A(i);
-      if (mrb_obj_eq(mrb, regs[a], regs[a+1])) {
-        SET_TRUE_VALUE(regs[a]);
-      }
-      else {
-        OP_CMP(==);
-      }
-      NEXT;
-    }
-
-    CASE(OP_LT) {
-      /* A B C  R(A) := R(A)<R(A+1) (Syms[B]=:<,C=1)*/
-      int a = GETARG_A(i);
-      OP_CMP(<);
-      NEXT;
-    }
-
-    CASE(OP_LE) {
-      /* A B C  R(A) := R(A)<=R(A+1) (Syms[B]=:<=,C=1)*/
-      int a = GETARG_A(i);
-      OP_CMP(<=);
-      NEXT;
-    }
-
-    CASE(OP_GT) {
-      /* A B C  R(A) := R(A)>R(A+1) (Syms[B]=:>,C=1)*/
-      int a = GETARG_A(i);
-      OP_CMP(>);
-      NEXT;
-    }
-
-    CASE(OP_GE) {
-      /* A B C  R(A) := R(A)>=R(A+1) (Syms[B]=:>=,C=1)*/
-      int a = GETARG_A(i);
-      OP_CMP(>=);
-      NEXT;
-    }
-
-    CASE(OP_ARRAY) {
-      /* A B C          R(A) := ary_new(R(B),R(B+1)..R(B+C)) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-      mrb_value v = mrb_ary_new_from_values(mrb, c, &regs[b]);
-      regs[a] = v;
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_ARYCAT) {
-      /* A B            mrb_ary_concat(R(A),R(B)) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      mrb_value splat = mrb_ary_splat(mrb, regs[b]);
-      mrb_ary_concat(mrb, regs[a], splat);
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_ARYPUSH) {
-      /* A B            R(A).push(R(B)) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      mrb_ary_push(mrb, regs[a], regs[b]);
-      NEXT;
-    }
-
-    CASE(OP_AREF) {
-      /* A B C          R(A) := R(B)[C] */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-      mrb_value v = regs[b];
-
-      if (!mrb_array_p(v)) {
-        if (c == 0) {
-          regs[a] = v;
-        }
-        else {
-          SET_NIL_VALUE(regs[a]);
-        }
-      }
-      else {
-        v = mrb_ary_ref(mrb, v, c);
-        regs[a] = v;
-      }
-      NEXT;
-    }
-
-    CASE(OP_ASET) {
-      /* A B C          R(B)[C] := R(A) */
-      int a = GETARG_A(i);
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-      mrb_ary_set(mrb, regs[b], c, regs[a]);
-      NEXT;
-    }
-
-    CASE(OP_APOST) {
-      /* A B C  *R(A),R(A+1)..R(A+C) := R(A) */
-      int a = GETARG_A(i);
-      mrb_value v = regs[a];
-      int pre  = GETARG_B(i);
-      int post = GETARG_C(i);
-      struct RArray *ary;
-      int len, idx;
-
-      if (!mrb_array_p(v)) {
-        v = mrb_ary_new_from_values(mrb, 1, &regs[a]);
-      }
-      ary = mrb_ary_ptr(v);
-      len = ARY_LEN(ary);
-      if (len > pre + post) {
-        v = mrb_ary_new_from_values(mrb, len - pre - post, ARY_PTR(ary)+pre);
-        regs[a++] = v;
-        while (post--) {
-          regs[a++] = ARY_PTR(ary)[len-post-1];
-        }
-      }
-      else {
-        v = mrb_ary_new_capa(mrb, 0);
-        regs[a++] = v;
-        for (idx=0; idx+pre<len; idx++) {
-          regs[a+idx] = ARY_PTR(ary)[pre+idx];
-        }
-        while (idx < post) {
-          SET_NIL_VALUE(regs[a+idx]);
-          idx++;
-        }
-      }
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_STRING) {
-      /* A Bx           R(A) := str_new(Lit(Bx)) */
-      mrb_value str = mrb_str_dup(mrb, pool[GETARG_Bx(i)]);
-      regs[GETARG_A(i)] = str;
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_STRCAT) {
-      /* A B    R(A).concat(R(B)) */
-      mrb_str_concat(mrb, regs[GETARG_A(i)], regs[GETARG_B(i)]);
-      NEXT;
-    }
-
-    CASE(OP_HASH) {
-      /* A B C   R(A) := hash_new(R(B),R(B+1)..R(B+C)) */
-      int b = GETARG_B(i);
-      int c = GETARG_C(i);
-      int lim = b+c*2;
-      mrb_value hash = mrb_hash_new_capa(mrb, c);
-
-      while (b < lim) {
-        mrb_hash_set(mrb, hash, regs[b], regs[b+1]);
-        b+=2;
-      }
-      regs[GETARG_A(i)] = hash;
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_LAMBDA) {
-      /* A b c  R(A) := lambda(SEQ[b],c) (b:c = 14:2) */
-      struct RProc *p;
-      int c = GETARG_c(i);
-
-      if (c & OP_L_CAPTURE) {
-        p = mrb_closure_new(mrb, irep->reps[GETARG_b(i)]);
-      }
-      else {
-        p = mrb_proc_new(mrb, irep->reps[GETARG_b(i)]);
-      }
-      if (c & OP_L_STRICT) p->flags |= MRB_PROC_STRICT;
-      regs[GETARG_A(i)] = mrb_obj_value(p);
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_OCLASS) {
-      /* A      R(A) := ::Object */
-      regs[GETARG_A(i)] = mrb_obj_value(mrb->object_class);
-      NEXT;
-    }
-
-    CASE(OP_CLASS) {
-      /* A B    R(A) := newclass(R(A),Syms(B),R(A+1)) */
-      struct RClass *c = 0, *baseclass;
-      int a = GETARG_A(i);
-      mrb_value base, super;
-      mrb_sym id = syms[GETARG_B(i)];
-
-      base = regs[a];
-      super = regs[a+1];
-      if (mrb_nil_p(base)) {
-        baseclass = mrb->c->ci->proc->target_class;
-        if (!baseclass) baseclass = mrb->c->ci->target_class;
-
-        base = mrb_obj_value(baseclass);
-      }
-      c = mrb_vm_define_class(mrb, base, super, id);
-      regs[a] = mrb_obj_value(c);
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_MODULE) {
-      /* A B            R(A) := newmodule(R(A),Syms(B)) */
-      struct RClass *c = 0, *baseclass;
-      int a = GETARG_A(i);
-      mrb_value base;
-      mrb_sym id = syms[GETARG_B(i)];
-
-      base = regs[a];
-      if (mrb_nil_p(base)) {
-        baseclass = mrb->c->ci->proc->target_class;
-        if (!baseclass) baseclass = mrb->c->ci->target_class;
-
-        base = mrb_obj_value(baseclass);
-      }
-      c = mrb_vm_define_module(mrb, base, id);
-      regs[a] = mrb_obj_value(c);
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_EXEC) {
-      /* A Bx   R(A) := blockexec(R(A),SEQ[Bx]) */
-      int a = GETARG_A(i);
-      mrb_callinfo *ci;
-      mrb_value recv = regs[a];
-      struct RProc *p;
-
-      /* prepare closure */
-      p = mrb_closure_new(mrb, irep->reps[GETARG_Bx(i)]);
-      p->c = NULL;
-
-      /* prepare stack */
-      ci = cipush(mrb);
-      ci->pc = pc + 1;
-      ci->acc = a;
-      ci->mid = 0;
-      ci->stackent = mrb->c->stack;
-      ci->argc = 0;
-      ci->target_class = mrb_class_ptr(recv);
-
-      /* prepare stack */
-      mrb->c->stack += a;
-
-      /* setup closure */
-      p->target_class = ci->target_class;
-      ci->proc = p;
-
-      irep = p->body.irep;
-      pool = irep->pool;
-      syms = irep->syms;
-      stack_extend(mrb, irep->nregs);
-      stack_clear(regs+1, irep->nregs-1);
-      ci->nregs = irep->nregs;
-      pc = irep->iseq;
-      JUMP;
-    }
-
-    CASE(OP_METHOD) {
-      /* A B            R(A).newmethod(Syms(B),R(A+1)) */
-      int a = GETARG_A(i);
-      struct RClass *c = mrb_class_ptr(regs[a]);
-      struct RProc *p = mrb_proc_ptr(regs[a+1]);
-
-      mrb_define_method_raw(mrb, c, syms[GETARG_B(i)], p);
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_SCLASS) {
-      /* A B    R(A) := R(B).singleton_class */
-      regs[GETARG_A(i)] = mrb_singleton_class(mrb, regs[GETARG_B(i)]);
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_TCLASS) {
-      /* A      R(A) := target_class */
-      if (!mrb->c->ci->target_class) {
-        mrb_value exc = mrb_exc_new_str_lit(mrb, E_TYPE_ERROR, "no target class or module");
-        mrb_exc_set(mrb, exc);
-        goto L_RAISE;
-      }
-      regs[GETARG_A(i)] = mrb_obj_value(mrb->c->ci->target_class);
-      NEXT;
-    }
-
-    CASE(OP_RANGE) {
-      /* A B C  R(A) := range_new(R(B),R(B+1),C) */
-      int b = GETARG_B(i);
-      mrb_value val = mrb_range_new(mrb, regs[b], regs[b+1], GETARG_C(i));
-      regs[GETARG_A(i)] = val;
-      mrb_gc_arena_restore(mrb, ai);
-      NEXT;
-    }
-
-    CASE(OP_DEBUG) {
-      /* A B C    debug print R(A),R(B),R(C) */
-#ifdef MRB_ENABLE_DEBUG_HOOK
-      mrb->debug_op_hook(mrb, irep, pc, regs);
-#else
-#ifndef MRB_DISABLE_STDIO
-      printf("OP_DEBUG %d %d %d\n", GETARG_A(i), GETARG_B(i), GETARG_C(i));
-#else
-      abort();
-#endif
-#endif
-      NEXT;
-    }
-
-    CASE(OP_STOP) {
-      /*        stop VM */
-    L_STOP:
-      {
-        int epos = mrb->c->ci->epos;
-
-        while (mrb->c->eidx > epos) {
-          ecall(mrb, --mrb->c->eidx);
-        }
-      }
-      ERR_PC_CLR(mrb);
-      mrb->jmp = prev_jmp;
-      if (mrb->exc) {
-        return mrb_obj_value(mrb->exc);
-      }
-      return regs[irep->nlocals];
-    }
-
-    CASE(OP_ERR) {
-      /* Bx     raise RuntimeError with message Lit(Bx) */
-      mrb_value msg = mrb_str_dup(mrb, pool[GETARG_Bx(i)]);
-      mrb_value exc;
-
-      if (GETARG_A(i) == 0) {
-        exc = mrb_exc_new_str(mrb, E_RUNTIME_ERROR, msg);
-      }
-      else {
-        exc = mrb_exc_new_str(mrb, E_LOCALJUMP_ERROR, msg);
-      }
-      mrb_exc_set(mrb, exc);
-      goto L_RAISE;
-    }
-  }
-  END_DISPATCH;
-#undef regs
-
-  }
-  MRB_CATCH(&c_jmp) {
-    exc_catched = TRUE;
-    goto RETRY_TRY_BLOCK;
-  }
-  MRB_END_EXC(&c_jmp);
-}
-
-MRB_API mrb_value
-mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
-{
-  if (mrb->c->ci->argc < 0) {
-    return mrb_vm_run(mrb, proc, self, 3); /* receiver, args and block) */
-  }
-  else {
-    return mrb_vm_run(mrb, proc, self, mrb->c->ci->argc + 2); /* argc + 2 (receiver and block) */
-  }
-}
-
-MRB_API mrb_value
-mrb_top_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep)
-{
-  mrb_callinfo *ci;
-  mrb_value v;
-
-  if (!mrb->c->cibase) {
-    return mrb_vm_run(mrb, proc, self, stack_keep);
-  }
-  if (mrb->c->ci == mrb->c->cibase) {
-    mrb->c->ci->env = NULL;
-    return mrb_vm_run(mrb, proc, self, stack_keep);
-  }
-  ci = cipush(mrb);
-  ci->mid = 0;
-  ci->nregs = 1;   /* protect the receiver */
-  ci->acc = CI_ACC_SKIP;
-  ci->target_class = mrb->object_class;
-  v = mrb_vm_run(mrb, proc, self, stack_keep);
-  cipop(mrb);
-
-  return v;
-}
-
-#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
-# if !defined(MRB_ENABLE_CXX_ABI)
-} /* end of extern "C" */
-# endif
-mrb_int mrb_jmpbuf::jmpbuf_id = 0;
-# if !defined(MRB_ENABLE_CXX_ABI)
-extern "C" {
-# endif
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/benchmark.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/benchmark.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/benchmark.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/benchmark.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-module MRuby
-  BENCHMARK_REPEAT = 4
-end
-
-$dat_files = []
-
-def bm_files
-  Dir.glob("#{MRUBY_ROOT}/benchmark/bm_*.rb")
-end
-
-def build_config_name
-  if ENV['MRUBY_CONFIG']
-    File.basename(ENV['MRUBY_CONFIG'], '.rb').gsub('build_config_', '')
-  else
-    "build"
-  end
-end
-
-def plot_file
-  File.join(MRUBY_ROOT, 'benchmark', "#{build_config_name}.png")
-end
-
-def plot
-  opts_file = "#{MRUBY_ROOT}/benchmark/plot.gpl"
-  opts = File.read(opts_file).each_line.to_a.map(&:strip).join(';')
-
-  dat_files = $dat_files.group_by {|f| File.dirname(f).split(File::SEPARATOR)[-1]}
-
-  opts += ";set output '#{plot_file}'"
-
-  opts += ';plot '
-
-  opts += dat_files.keys.map do |data_file|
-    %Q['-' u 2:3:4:xtic(1) w hist title columnheader(1)]
-  end.join(',')
-  opts += ';'
-
-  cmd = %Q{gnuplot -p -e "#{opts}"}
-
-  IO.popen(cmd, 'w') do |p|
-    dat_files.each do |target_name, bm_files|
-      p.puts target_name.gsub('_', '-')
-      bm_files.each do |bm_file|
-        p.write File.read(bm_file)
-      end
-      p.puts "e"
-    end
-  end
-end
-
-
-MRuby.each_target do |target|
-  next if target.name == 'host'
-  mruby_bin = "#{target.build_dir}/bin/mruby"
-
-  bm_files.each do |bm_file|
-    bm_name = File.basename bm_file, ".rb"
-
-    dat_dir = File.join('benchmark', build_config_name, target.name)
-    dat_file = File.join(dat_dir, "#{bm_name}.dat")
-    $dat_files << dat_file
-
-    directory dat_dir
-
-    file dat_file => [bm_file, dat_dir, mruby_bin] do |task|
-      print bm_name
-      puts "..."
-
-      data = (0...MRuby::BENCHMARK_REPEAT).map do |n|
-        str = %x{(time -f "%e %S %U" #{mruby_bin} #{bm_file}) 2>&1 >/dev/null}
-        str.split(' ').map(&:to_f)
-      end
-
-      File.open(task.name, "w") do |f|
-        data = data.map {|_,r,s| (r + s) / 2.0}
-        min = data.min
-        max = data.max
-        avg = data.inject(&:+) / data.size
-        f.puts "#{bm_name.gsub('_', '-')} #{avg} #{min} #{max}"
-      end
-    end
-  end
-end
-
-file plot_file => $dat_files do
-  plot
-end
-
-task :benchmark => plot_file do
-  plot
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/gitlab.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/gitlab.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/gitlab.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/gitlab.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-CI_VERSION = '0.7'.freeze
-CI_BASE = 'ubuntu:16.10'.freeze
-CI_COMPILERS = ['gcc-4.7',
-                'gcc-4.8',
-                'gcc-4.9',
-                'gcc-5',
-                'gcc-6',
-                'clang-3.5',
-                'clang-3.6',
-                'clang-3.7',
-                'clang-3.8',
-                'clang-3.9'].freeze
-
-def ci_image_tag(compiler)
-  compiler.tr('+', 'c').delete('-').delete('.')
-end
-
-def ci_docker_tag(compiler)
-  tag = ci_image_tag(compiler)
-  "registry.gitlab.com/dabroz/mruby:#{tag}_#{CI_VERSION}"
-end
-
-def run_cmd(cmd)
-  puts cmd
-  raise 'error' unless system cmd
-end
-
-desc 'recreate docker images for GitLab builds'
-task :gitlab_dockers do
-  CI_COMPILERS.each do |compiler|
-    tag = ci_image_tag(compiler)
-    filename = "Dockerfile.#{tag}"
-    File.open(filename, 'wb') do |f|
-      f << "# #{compiler} - #{tag}\n"
-      f << "FROM #{CI_BASE}\n"
-      f << "RUN apt-get update && apt-get install -y git ruby2.3 ruby2.3-dev bison\n"
-      f << "RUN apt-get update && apt-get install -y binutils manpages\n"
-      f << "RUN apt-get update && apt-get install -y #{compiler}\n"
-      if compiler['gcc']
-        f << "RUN apt-get update && apt-get install -y libx32#{compiler}-dev\n"
-        f << "RUN apt-get update && apt-get install --no-install-recommends -y #{compiler}-multilib\n"
-      end
-      f << "RUN dpkg --add-architecture i386\n"
-      f << "RUN apt-get update && apt-get install -y linux-libc-dev:i386\n"
-      if compiler['clang']
-        f << "RUN apt-get update && apt-get install --no-install-recommends -y libc6-dev-i386\n"
-        f << "RUN apt-get update && apt-get install -y gcc gcc-multilib\n"
-      end
-    end
-    docker_tag = ci_docker_tag(compiler)
-    cmd1 = "docker build -t #{docker_tag} -f #{filename} ."
-    cmd2 = "docker push #{docker_tag}"
-    run_cmd cmd1
-    run_cmd cmd2
-    File.delete(filename)
-  end
-end
-
-desc 'create build configurations and update .gitlab-ci.yml'
-task :gitlab_config do
-  require 'yaml'
-
-  configs = []
-  [true, false].each do |mode_32|
-    ['', 'MRB_USE_FLOAT'].each do |float_conf|
-      ['', 'MRB_INT16', 'MRB_INT64'].each do |int_conf|
-        ['', 'MRB_NAN_BOXING', 'MRB_WORD_BOXING'].each do |boxing_conf|
-          ['', 'MRB_UTF8_STRING'].each do |utf8_conf|
-            next if (float_conf == 'MRB_USE_FLOAT') && (boxing_conf == 'MRB_NAN_BOXING')
-            next if (int_conf == 'MRB_INT64') && (boxing_conf == 'MRB_NAN_BOXING')
-            next if (int_conf == 'MRB_INT16') && (boxing_conf == 'MRB_WORD_BOXING')
-            next if (int_conf == 'MRB_INT64') && (boxing_conf == 'MRB_WORD_BOXING') && mode_32
-            env = [float_conf, int_conf, boxing_conf, utf8_conf].map do |conf|
-              conf == '' ? nil : "-D#{conf}=1"
-            end.compact.join(' ')
-            bit = mode_32 ? '-m32 ' : ''
-            _info = ''
-            _info += mode_32 ? '32bit ' : '64bit '
-            _info += float_conf['USE'] ? 'float ' : ''
-            _info += int_conf['16'] ? 'int16 ' : ''
-            _info += int_conf['64'] ? 'int64 ' : ''
-            _info += boxing_conf['NAN'] ? 'nan ' : ''
-            _info += boxing_conf['word'] ? 'word ' : ''
-            _info += utf8_conf['UTF8'] ? 'utf8 ' : ''
-            _info = _info.gsub(/ +/, ' ').strip.tr(' ', '_')
-            configs << { '_info' => _info, 'CFLAGS' => "#{bit}#{env}", 'LDFLAGS' => bit.strip.to_s }
-          end
-        end
-      end
-    end
-  end
-  path = './.gitlab-ci.yml'
-  data = YAML.load_file(path)
-  data.keys.select do |key|
-    key.start_with? 'Test'
-  end.each do |key|
-    data.delete(key)
-  end
-  CI_COMPILERS.each do |compiler|
-    configs.each do |config|
-      name = "Test #{compiler} #{config['_info']}"
-      hash = {
-        'CC' => compiler,
-        'CXX' => compiler.gsub('gcc', 'g++').gsub('clang', 'clang++'),
-        'LD' => compiler
-      }
-      hash = hash.merge(config)
-      hash.delete('_info')
-      data[name] = {
-        'stage' => 'test',
-        'image' => ci_docker_tag(compiler),
-        'variables' => hash,
-        'script' => 'env; ./minirake --verbose all test'
-      }
-    end
-  end
-  File.open(path, 'w') { |f| YAML.dump(data, f) }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/libmruby.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/libmruby.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/libmruby.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/libmruby.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-MRuby.each_target do
-  file libfile("#{build_dir}/lib/libmruby") => libmruby.flatten do |t|
-    archiver.run t.name, t.prerequisites
-  end
-
-  file "#{build_dir}/lib/libmruby.flags.mak" => [__FILE__, libfile("#{build_dir}/lib/libmruby")] do |t|
-    open(t.name, 'w') do |f|
-      f.puts "MRUBY_CFLAGS = #{cc.all_flags}"
-
-      gem_flags = gems.map { |g| g.linker.flags }
-      gem_library_paths = gems.map { |g| g.linker.library_paths }
-      f.puts "MRUBY_LDFLAGS = #{linker.all_flags(gem_library_paths, gem_flags)} #{linker.option_library_path % "#{build_dir}/lib"}"
-
-      gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
-      f.puts "MRUBY_LDFLAGS_BEFORE_LIBS = #{[linker.flags_before_libraries, gem_flags_before_libraries].flatten.join(' ')}"
-
-      gem_libraries = gems.map { |g| g.linker.libraries }
-      f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries)}"
-
-      f.puts "MRUBY_LIBMRUBY_PATH = #{libfile("#{build_dir}/lib/libmruby")}"
-    end
-  end
-  task :all => "#{build_dir}/lib/libmruby.flags.mak"
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgem_spec.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgem_spec.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgem_spec.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgem_spec.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,459 +0,0 @@
-require 'pathname'
-require 'forwardable'
-require 'tsort'
-require 'shellwords'
-
-module MRuby
-  module Gem
-    class << self
-      attr_accessor :current
-    end
-    LinkerConfig = Struct.new(:libraries, :library_paths, :flags, :flags_before_libraries, :flags_after_libraries)
-
-    class Specification
-      include Rake::DSL
-      extend Forwardable
-      def_delegators :@build, :filename, :objfile, :libfile, :exefile
-
-      attr_accessor :name, :dir, :build
-      alias mruby build
-      attr_accessor :build_config_initializer
-      attr_accessor :mrblib_dir, :objs_dir
-
-      attr_accessor :version
-      attr_accessor :description, :summary
-      attr_accessor :homepage
-      attr_accessor :licenses, :authors
-      alias :license= :licenses=
-      alias :author= :authors=
-
-      attr_accessor :rbfiles, :objs
-      attr_accessor :test_objs, :test_rbfiles, :test_args
-      attr_accessor :test_preload
-
-      attr_accessor :bins
-
-      attr_accessor :requirements
-      attr_reader :dependencies, :conflicts
-
-      attr_accessor :export_include_paths
-
-      attr_reader :generate_functions
-
-      attr_block MRuby::Build::COMMANDS
-
-      def initialize(name, &block)
-        @name = name
-        @initializer = block
-        @version = "0.0.0"
-        @mrblib_dir = "mrblib"
-        @objs_dir = "src"
-        MRuby::Gem.current = self
-      end
-
-      def setup
-        MRuby::Gem.current = self
-        MRuby::Build::COMMANDS.each do |command|
-          instance_variable_set("@#{command}", @build.send(command).clone)
-        end
-        @linker = LinkerConfig.new([], [], [], [], [])
-
-        @rbfiles = Dir.glob("#{@dir}/#{@mrblib_dir}/**/*.rb").sort
-        @objs = Dir.glob("#{@dir}/#{@objs_dir}/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
-          objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
-        end
-
-        @test_rbfiles = Dir.glob("#{dir}/test/**/*.rb")
-        @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
-          objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
-        end
-        @custom_test_init = !@test_objs.empty?
-        @test_preload = nil # 'test/assert.rb'
-        @test_args = {}
-
-        @bins = []
-
-        @requirements = []
-        @dependencies, @conflicts = [], []
-        @export_include_paths = []
-        @export_include_paths << "#{dir}/include" if File.directory? "#{dir}/include"
-
-        instance_eval(&@initializer)
-
-        @generate_functions = !(@rbfiles.empty? && @objs.empty?)
-        @objs << objfile("#{build_dir}/gem_init") if @generate_functions
-
-        if !name || !licenses || !authors
-          fail "#{name || dir} required to set name, license(s) and author(s)"
-        end
-
-        build.libmruby << @objs
-
-        instance_eval(&@build_config_initializer) if @build_config_initializer
-      end
-
-      def setup_compilers
-        compilers.each do |compiler|
-          compiler.define_rules build_dir, "#{dir}"
-          compiler.defines << %Q[MRBGEM_#{funcname.upcase}_VERSION=#{version}]
-          compiler.include_paths << "#{dir}/include" if File.directory? "#{dir}/include"
-        end
-
-        define_gem_init_builder if @generate_functions
-      end
-
-      def add_dependency(name, *requirements)
-        default_gem = requirements.last.kind_of?(Hash) ? requirements.pop : nil
-        requirements = ['>= 0.0.0'] if requirements.empty?
-        requirements.flatten!
-        @dependencies << {:gem => name, :requirements => requirements, :default => default_gem}
-      end
-
-      def add_test_dependency(*args)
-        add_dependency(*args) if build.test_enabled?
-      end
-
-      def add_conflict(name, *req)
-        @conflicts << {:gem => name, :requirements => req.empty? ? nil : req}
-      end
-
-      def self.bin=(bin)
-        @bins = [bin].flatten
-      end
-
-      def build_dir
-        "#{build.build_dir}/mrbgems/#{name}"
-      end
-
-      def test_rbireps
-        "#{build_dir}/gem_test.c"
-      end
-
-      def search_package(name, version_query=nil)
-        package_query = name
-        package_query += " #{version_query}" if version_query
-        _pp "PKG-CONFIG", package_query
-        escaped_package_query = Shellwords.escape(package_query)
-        if system("pkg-config --exists #{escaped_package_query}")
-          cc.flags += [`pkg-config --cflags #{escaped_package_query}`.strip]
-          cxx.flags += [`pkg-config --cflags #{escaped_package_query}`.strip]
-          linker.flags_before_libraries += [`pkg-config --libs #{escaped_package_query}`.strip]
-          true
-        else
-          false
-        end
-      end
-
-      def funcname
-        @funcname ||= @name.gsub('-', '_')
-      end
-
-      def compilers
-        MRuby::Build::COMPILERS.map do |c|
-          instance_variable_get("@#{c}")
-        end
-      end
-
-      def define_gem_init_builder
-        file objfile("#{build_dir}/gem_init") => [ "#{build_dir}/gem_init.c", File.join(dir, "mrbgem.rake") ]
-        file "#{build_dir}/gem_init.c" => [build.mrbcfile, __FILE__] + [rbfiles].flatten do |t|
-          FileUtils.mkdir_p build_dir
-          generate_gem_init("#{build_dir}/gem_init.c")
-        end
-      end
-
-      def generate_gem_init(fname)
-        open(fname, 'w') do |f|
-          print_gem_init_header f
-          build.mrbc.run f, rbfiles, "gem_mrblib_irep_#{funcname}" unless rbfiles.empty?
-          f.puts %Q[void mrb_#{funcname}_gem_init(mrb_state *mrb);]
-          f.puts %Q[void mrb_#{funcname}_gem_final(mrb_state *mrb);]
-          f.puts %Q[]
-          f.puts %Q[void GENERATED_TMP_mrb_#{funcname}_gem_init(mrb_state *mrb) {]
-          f.puts %Q[  int ai = mrb_gc_arena_save(mrb);]
-          f.puts %Q[  mrb_#{funcname}_gem_init(mrb);] if objs != [objfile("#{build_dir}/gem_init")]
-          unless rbfiles.empty?
-            f.puts %Q[  mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});]
-            f.puts %Q[  if (mrb->exc) {]
-            f.puts %Q[    mrb_print_error(mrb);]
-            f.puts %Q[    exit(EXIT_FAILURE);]
-            f.puts %Q[  }]
-          end
-          f.puts %Q[  mrb_gc_arena_restore(mrb, ai);]
-          f.puts %Q[}]
-          f.puts %Q[]
-          f.puts %Q[void GENERATED_TMP_mrb_#{funcname}_gem_final(mrb_state *mrb) {]
-          f.puts %Q[  mrb_#{funcname}_gem_final(mrb);] if objs != [objfile("#{build_dir}/gem_init")]
-          f.puts %Q[}]
-        end
-      end # generate_gem_init
-
-      def print_gem_comment(f)
-        f.puts %Q[/*]
-        f.puts %Q[ * This file is loading the irep]
-        f.puts %Q[ * Ruby GEM code.]
-        f.puts %Q[ *]
-        f.puts %Q[ * IMPORTANT:]
-        f.puts %Q[ *   This file was generated!]
-        f.puts %Q[ *   All manual changes will get lost.]
-        f.puts %Q[ */]
-      end
-
-      def print_gem_init_header(f)
-        print_gem_comment(f)
-        f.puts %Q[#include <stdlib.h>] unless rbfiles.empty?
-        f.puts %Q[#include <mruby.h>]
-        f.puts %Q[#include <mruby/irep.h>] unless rbfiles.empty?
-      end
-
-      def print_gem_test_header(f)
-        print_gem_comment(f)
-        f.puts %Q[#include <stdio.h>]
-        f.puts %Q[#include <stdlib.h>]
-        f.puts %Q[#include <mruby.h>]
-        f.puts %Q[#include <mruby/irep.h>]
-        f.puts %Q[#include <mruby/variable.h>]
-        f.puts %Q[#include <mruby/hash.h>] unless test_args.empty?
-      end
-
-      def test_dependencies
-        [@name]
-      end
-
-      def custom_test_init?
-        @custom_test_init
-      end
-
-      def version_ok?(req_versions)
-        req_versions.map do |req|
-          cmp, ver = req.split
-          cmp_result = Version.new(version) <=> Version.new(ver)
-          case cmp
-          when '=' then cmp_result == 0
-          when '!=' then cmp_result != 0
-          when '>' then cmp_result == 1
-          when '<' then cmp_result == -1
-          when '>=' then cmp_result >= 0
-          when '<=' then cmp_result <= 0
-          when '~>'
-            Version.new(version).twiddle_wakka_ok?(Version.new(ver))
-          else
-            fail "Comparison not possible with '#{cmp}'"
-          end
-        end.all?
-      end
-    end # Specification
-
-    class Version
-      include Comparable
-      include Enumerable
-
-      def <=>(other)
-        ret = 0
-        own = to_enum
-
-        other.each do |oth|
-          begin
-            ret = own.next <=> oth
-          rescue StopIteration
-            ret = 0 <=> oth
-          end
-
-          break unless ret == 0
-        end
-
-        ret
-      end
-
-      # ~> compare algorithm
-      #
-      # Example:
-      #    ~> 2.2   means >= 2.2.0 and < 3.0.0
-      #    ~> 2.2.0 means >= 2.2.0 and < 2.3.0
-      def twiddle_wakka_ok?(other)
-        gr_or_eql = (self <=> other) >= 0
-        still_minor = (self <=> other.skip_minor) < 0
-        gr_or_eql and still_minor
-      end
-
-      def skip_minor
-        a = @ary.dup
-        a.slice!(-1)
-        a[-1] = a[-1].succ
-        a
-      end
-
-      def initialize(str)
-        @str = str
-        @ary = @str.split('.').map(&:to_i)
-      end
-
-      def each(&block); @ary.each(&block); end
-      def [](index); @ary[index]; end
-      def []=(index, value)
-        @ary[index] = value
-        @str = @ary.join('.')
-      end
-      def slice!(index)
-        @ary.slice!(index)
-        @str = @ary.join('.')
-      end
-    end # Version
-
-    class List
-      include Enumerable
-
-      def initialize
-        @ary = []
-      end
-
-      def each(&b)
-        @ary.each(&b)
-      end
-
-      def <<(gem)
-        unless @ary.detect {|g| g.dir == gem.dir }
-          @ary << gem
-        else
-          # GEM was already added to this list
-        end
-      end
-
-      def empty?
-        @ary.empty?
-      end
-
-      def generate_gem_table build
-        gem_table = @ary.reduce({}) { |res,v| res[v.name] = v; res }
-
-        default_gems = []
-        each do |g|
-          g.dependencies.each do |dep|
-            unless gem_table.key? dep[:gem]
-              if dep[:default]; default_gems << dep
-              elsif File.exist? "#{MRUBY_ROOT}/mrbgems/#{dep[:gem]}" # check core
-                default_gems << { :gem => dep[:gem], :default => { :core => dep[:gem] } }
-              else # fallback to mgem-list
-                default_gems << { :gem => dep[:gem], :default => { :mgem => dep[:gem] } }
-              end
-            end
-          end
-        end
-
-        until default_gems.empty?
-          def_gem = default_gems.pop
-
-          spec = build.gem def_gem[:default]
-          fail "Invalid gem name: #{spec.name} (Expected: #{def_gem[:gem]})" if spec.name != def_gem[:gem]
-          spec.setup
-
-          spec.dependencies.each do |dep|
-            unless gem_table.key? dep[:gem]
-              if dep[:default]; default_gems << dep
-              else default_gems << { :gem => dep[:gem], :default => { :mgem => dep[:gem] } }
-              end
-            end
-          end
-          gem_table[spec.name] = spec
-        end
-
-        each do |g|
-          g.dependencies.each do |dep|
-            name = dep[:gem]
-            req_versions = dep[:requirements]
-            dep_g = gem_table[name]
-
-            # check each GEM dependency against all available GEMs
-            if dep_g.nil?
-              fail "The GEM '#{g.name}' depends on the GEM '#{name}' but it could not be found"
-            end
-            unless dep_g.version_ok? req_versions
-              fail "#{name} version should be #{req_versions.join(' and ')} but was '#{dep_g.version}'"
-            end
-          end
-
-          cfls = g.conflicts.select { |c|
-            cfl_g = gem_table[c[:gem]]
-            cfl_g and cfl_g.version_ok?(c[:requirements] || ['>= 0.0.0'])
-          }.map { |c| "#{c[:gem]}(#{gem_table[c[:gem]].version})" }
-          fail "Conflicts of gem `#{g.name}` found: #{cfls.join ', '}" unless cfls.empty?
-        end
-
-        gem_table
-      end
-
-      def tsort_dependencies ary, table, all_dependency_listed = false
-        unless all_dependency_listed
-          left = ary.dup
-          until left.empty?
-            v = left.pop
-            table[v].dependencies.each do |dep|
-              left.push dep[:gem]
-              ary.push dep[:gem]
-            end
-          end
-        end
-
-        ary.uniq!
-        table.instance_variable_set :@root_gems, ary
-        class << table
-          include TSort
-          def tsort_each_node &b
-            @root_gems.each &b
-          end
-
-          def tsort_each_child(n, &b)
-            fetch(n).dependencies.each do |v|
-              b.call v[:gem]
-            end
-          end
-        end
-
-        begin
-          table.tsort.map { |v| table[v] }
-        rescue TSort::Cyclic => e
-          fail "Circular mrbgem dependency found: #{e.message}"
-        end
-      end
-
-      def check(build)
-        gem_table = generate_gem_table build
-
-        @ary = tsort_dependencies gem_table.keys, gem_table, true
-
-        each(&:setup_compilers)
-
-        each do |g|
-          import_include_paths(g)
-        end
-      end
-
-      def import_include_paths(g)
-        gem_table = @ary.reduce({}) { |res,v| res[v.name] = v; res }
-        g.dependencies.each do |dep|
-          dep_g = gem_table[dep[:gem]]
-          # We can do recursive call safely
-          # as circular dependency has already detected in the caller.
-          import_include_paths(dep_g)
-
-          dep_g.export_include_paths.uniq!
-          g.compilers.each do |compiler|
-            compiler.include_paths += dep_g.export_include_paths
-            g.export_include_paths += dep_g.export_include_paths
-            compiler.include_paths.uniq!
-            g.export_include_paths.uniq!
-          end
-        end
-      end
-    end # List
-  end # Gem
-
-  GemBox = Object.new
-  class << GemBox
-    attr_accessor :path
-
-    def new(&block); block.call(self); end
-    def config=(obj); @config = obj; end
-    def gem(gemdir, &block); @config.gem(gemdir, &block); end
-  end # GemBox
-end # MRuby
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgems.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgems.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgems.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mrbgems.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-MRuby.each_target do
-  if enable_gems?
-    # set up all gems
-    gems.each(&:setup)
-    gems.check self
-
-    # loader all gems
-    self.libmruby << objfile("#{build_dir}/mrbgems/gem_init")
-    file objfile("#{build_dir}/mrbgems/gem_init") => ["#{build_dir}/mrbgems/gem_init.c", "#{build_dir}/LEGAL"]
-    file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG, __FILE__] do |t|
-      FileUtils.mkdir_p "#{build_dir}/mrbgems"
-      open(t.name, 'w') do |f|
-        gem_func_gems = gems.select { |g| g.generate_functions }
-        gem_func_decls = gem_func_gems.each_with_object('') do |g, s|
-          s << "void GENERATED_TMP_mrb_#{g.funcname}_gem_init(mrb_state*);\n" \
-               "void GENERATED_TMP_mrb_#{g.funcname}_gem_final(mrb_state*);\n"
-        end
-        gem_init_calls = gem_func_gems.each_with_object('') do |g, s|
-          s << "  GENERATED_TMP_mrb_#{g.funcname}_gem_init(mrb);\n"
-        end
-        gem_final_calls = gem_func_gems.each_with_object('') do |g, s|
-          s << "  GENERATED_TMP_mrb_#{g.funcname}_gem_final(mrb);\n"
-        end
-        f.puts %Q[/*]
-        f.puts %Q[ * This file contains a list of all]
-        f.puts %Q[ * initializing methods which are]
-        f.puts %Q[ * necessary to bootstrap all gems.]
-        f.puts %Q[ *]
-        f.puts %Q[ * IMPORTANT:]
-        f.puts %Q[ *   This file was generated!]
-        f.puts %Q[ *   All manual changes will get lost.]
-        f.puts %Q[ */]
-        f.puts %Q[]
-        f.puts %Q[#include <mruby.h>]
-        f.puts %Q[]
-        f.write gem_func_decls
-        f.puts %Q[]
-        f.puts %Q[static void]
-        f.puts %Q[mrb_final_mrbgems(mrb_state *mrb) {]
-        f.write gem_final_calls
-        f.puts %Q[}]
-        f.puts %Q[]
-        f.puts %Q[void]
-        f.puts %Q[mrb_init_mrbgems(mrb_state *mrb) {]
-        f.write gem_init_calls
-        f.puts %Q[  mrb_state_atexit(mrb, mrb_final_mrbgems);] unless gem_final_calls.empty?
-        f.puts %Q[}]
-      end
-    end
-  end
-
-  # legal documents
-  file "#{build_dir}/LEGAL" => [MRUBY_CONFIG, __FILE__] do |t|
-    open(t.name, 'w+') do |f|
-     f.puts <<LEGAL
-Copyright (c) #{Time.now.year} mruby developers
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-LEGAL
-
-      if enable_gems?
-        f.puts <<GEMS_LEGAL
-
-Additional Licenses
-
-Due to the reason that you choosed additional mruby packages (GEMS),
-please check the following additional licenses too:
-GEMS_LEGAL
-
-        gems.map do |g|
-          authors = [g.authors].flatten.sort.join(", ")
-          f.puts
-          f.puts "GEM: #{g.name}"
-          f.puts "Copyright (c) #{Time.now.year} #{authors}"
-          f.puts "License: #{g.licenses}"
-        end
-      end
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_commands.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_commands.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_commands.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_commands.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,324 +0,0 @@
-require 'forwardable'
-
-module MRuby
-  class Command
-    include Rake::DSL
-    extend Forwardable
-    def_delegators :@build, :filename, :objfile, :libfile, :exefile, :cygwin_filename
-    attr_accessor :build, :command
-
-    def initialize(build)
-      @build = build
-    end
-
-    # clone is deep clone without @build
-    def clone
-      target = super
-      excepts = %w(@build)
-      instance_variables.each do |attr|
-        unless excepts.include?(attr.to_s)
-          val = Marshal::load(Marshal.dump(instance_variable_get(attr))) # deep clone
-          target.instance_variable_set(attr, val)
-        end
-      end
-      target
-    end
-
-    NotFoundCommands = {}
-
-    private
-    def _run(options, params={})
-      return sh command + ' ' + ( options % params ) if NotFoundCommands.key? @command
-      begin
-        sh build.filename(command) + ' ' + ( options % params )
-      rescue RuntimeError
-        NotFoundCommands[@command] = true
-        _run options, params
-      end
-    end
-  end
-
-  class Command::Compiler < Command
-    attr_accessor :flags, :include_paths, :defines, :source_exts
-    attr_accessor :compile_options, :option_define, :option_include_path, :out_ext
-    attr_accessor :cxx_compile_flag, :cxx_exception_flag
-
-    def initialize(build, source_exts=[])
-      super(build)
-      @command = ENV['CC'] || 'cc'
-      @flags = [ENV['CFLAGS'] || []]
-      @source_exts = source_exts
-      @include_paths = ["#{MRUBY_ROOT}/include"]
-      @defines = %w()
-      @option_include_path = '-I%s'
-      @option_define = '-D%s'
-      @compile_options = '%{flags} -o %{outfile} -c %{infile}'
-    end
-
-    alias header_search_paths include_paths
-    def search_header_path(name)
-      header_search_paths.find do |v|
-        File.exist? build.filename("#{v}/#{name}").sub(/^"(.*)"$/, '\1')
-      end
-    end
-
-    def search_header(name)
-      path = search_header_path name
-      path && build.filename("#{path}/#{name}").sub(/^"(.*)"$/, '\1')
-    end
-
-    def all_flags(_defineds=[], _include_paths=[], _flags=[])
-      define_flags = [defines, _defineds].flatten.map{ |d| option_define % d }
-      include_path_flags = [include_paths, _include_paths].flatten.map do |f|
-        if MRUBY_BUILD_HOST_IS_CYGWIN
-          option_include_path % cygwin_filename(f)
-        else
-          option_include_path % filename(f)
-        end
-      end
-      [flags, define_flags, include_path_flags, _flags].flatten.join(' ')
-    end
-
-    def run(outfile, infile, _defineds=[], _include_paths=[], _flags=[])
-      FileUtils.mkdir_p File.dirname(outfile)
-      _pp "CC", infile.relative_path, outfile.relative_path
-      if MRUBY_BUILD_HOST_IS_CYGWIN
-        _run compile_options, { :flags => all_flags(_defineds, _include_paths, _flags),
-                                :infile => cygwin_filename(infile), :outfile => cygwin_filename(outfile) }
-      else
-        _run compile_options, { :flags => all_flags(_defineds, _include_paths, _flags),
-                                :infile => filename(infile), :outfile => filename(outfile) }
-      end
-    end
-
-    def define_rules(build_dir, source_dir='')
-      @out_ext = build.exts.object
-      gemrake = File.join(source_dir, "mrbgem.rake")
-      rakedep = File.exist?(gemrake) ? [ gemrake ] : []
-
-      if build_dir.include? "mrbgems/"
-        generated_file_matcher = Regexp.new("^#{Regexp.escape build_dir}/(.*)#{Regexp.escape out_ext}$")
-      else
-        generated_file_matcher = Regexp.new("^#{Regexp.escape build_dir}/(?!mrbgems/.+/)(.*)#{Regexp.escape out_ext}$")
-      end
-      source_exts.each do |ext, compile|
-        rule generated_file_matcher => [
-          proc { |file|
-            file.sub(generated_file_matcher, "#{source_dir}/\\1#{ext}")
-          },
-          proc { |file|
-            get_dependencies(file) + rakedep
-          }
-        ] do |t|
-          run t.name, t.prerequisites.first
-        end
-
-        rule generated_file_matcher => [
-          proc { |file|
-            file.sub(generated_file_matcher, "#{build_dir}/\\1#{ext}")
-          },
-          proc { |file|
-            get_dependencies(file) + rakedep
-          }
-        ] do |t|
-          run t.name, t.prerequisites.first
-        end
-      end
-    end
-
-    private
-    def get_dependencies(file)
-      file = file.ext('d') unless File.extname(file) == '.d'
-      if File.exist?(file)
-        File.read(file).gsub("\\\n ", "").scan(/^\S+:\s+(.+)$/).flatten.map {|s| s.split(' ') }.flatten
-      else
-        []
-      end + [ MRUBY_CONFIG ]
-    end
-  end
-
-  class Command::Linker < Command
-    attr_accessor :flags, :library_paths, :flags_before_libraries, :libraries, :flags_after_libraries
-    attr_accessor :link_options, :option_library, :option_library_path
-
-    def initialize(build)
-      super
-      @command = ENV['LD'] || 'ld'
-      @flags = (ENV['LDFLAGS'] || [])
-      @flags_before_libraries, @flags_after_libraries = [], []
-      @libraries = []
-      @library_paths = []
-      @option_library = '-l%s'
-      @option_library_path = '-L%s'
-      @link_options = "%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}"
-    end
-
-    def all_flags(_library_paths=[], _flags=[])
-      library_path_flags = [library_paths, _library_paths].flatten.map do |f|
-        if MRUBY_BUILD_HOST_IS_CYGWIN
-          option_library_path % cygwin_filename(f)
-        else
-          option_library_path % filename(f)
-        end
-      end
-      [flags, library_path_flags, _flags].flatten.join(' ')
-    end
-
-    def library_flags(_libraries)
-      [libraries, _libraries].flatten.map{ |d| option_library % d }.join(' ')
-    end
-
-    def run(outfile, objfiles, _libraries=[], _library_paths=[], _flags=[], _flags_before_libraries=[], _flags_after_libraries=[])
-      FileUtils.mkdir_p File.dirname(outfile)
-      library_flags = [libraries, _libraries].flatten.map { |d| option_library % d }
-
-      _pp "LD", outfile.relative_path
-      if MRUBY_BUILD_HOST_IS_CYGWIN
-        _run link_options, { :flags => all_flags(_library_paths, _flags),
-                             :outfile => cygwin_filename(outfile) , :objs => cygwin_filename(objfiles).join(' '),
-                             :flags_before_libraries => [flags_before_libraries, _flags_before_libraries].flatten.join(' '),
-                             :flags_after_libraries => [flags_after_libraries, _flags_after_libraries].flatten.join(' '),
-                             :libs => library_flags.join(' ') }
-      else
-        _run link_options, { :flags => all_flags(_library_paths, _flags),
-                             :outfile => filename(outfile) , :objs => filename(objfiles).join(' '),
-                             :flags_before_libraries => [flags_before_libraries, _flags_before_libraries].flatten.join(' '),
-                             :flags_after_libraries => [flags_after_libraries, _flags_after_libraries].flatten.join(' '),
-                             :libs => library_flags.join(' ') }
-      end
-    end
-  end
-
-  class Command::Archiver < Command
-    attr_accessor :archive_options
-
-    def initialize(build)
-      super
-      @command = ENV['AR'] || 'ar'
-      @archive_options = 'rs %{outfile} %{objs}'
-    end
-
-    def run(outfile, objfiles)
-      FileUtils.mkdir_p File.dirname(outfile)
-      _pp "AR", outfile.relative_path
-      if MRUBY_BUILD_HOST_IS_CYGWIN
-        _run archive_options, { :outfile => cygwin_filename(outfile), :objs => cygwin_filename(objfiles).join(' ') }
-      else
-        _run archive_options, { :outfile => filename(outfile), :objs => filename(objfiles).join(' ') }
-      end
-    end
-  end
-
-  class Command::Yacc < Command
-    attr_accessor :compile_options
-
-    def initialize(build)
-      super
-      @command = 'bison'
-      @compile_options = '-o %{outfile} %{infile}'
-    end
-
-    def run(outfile, infile)
-      FileUtils.mkdir_p File.dirname(outfile)
-      _pp "YACC", infile.relative_path, outfile.relative_path
-      _run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) }
-    end
-  end
-
-  class Command::Gperf < Command
-    attr_accessor :compile_options
-
-    def initialize(build)
-      super
-      @command = 'gperf'
-      @compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}'
-    end
-
-    def run(outfile, infile)
-      FileUtils.mkdir_p File.dirname(outfile)
-      _pp "GPERF", infile.relative_path, outfile.relative_path
-      _run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) }
-    end
-  end
-
-  class Command::Git < Command
-    attr_accessor :flags
-    attr_accessor :clone_options, :pull_options, :checkout_options
-
-    def initialize(build)
-      super
-      @command = 'git'
-      @flags = %w[]
-      @clone_options = "clone %{flags} %{url} %{dir}"
-      @pull_options = "pull"
-      @checkout_options = "checkout %{checksum_hash}"
-    end
-
-    def run_clone(dir, url, _flags = [])
-      _pp "GIT", url, dir.relative_path
-      _run clone_options, { :flags => [flags, _flags].flatten.join(' '), :url => url, :dir => filename(dir) }
-    end
-
-    def run_pull(dir, url)
-      root = Dir.pwd
-      Dir.chdir dir
-      _pp "GIT PULL", url, dir.relative_path
-      _run pull_options
-      Dir.chdir root
-    end
-
-    def run_checkout(dir, checksum_hash)
-      root = Dir.pwd
-      Dir.chdir dir
-      _pp "GIT CHECKOUT", checksum_hash
-      _run checkout_options, { :checksum_hash => checksum_hash }
-      Dir.chdir root
-    end
-  end
-
-  class Command::Mrbc < Command
-    attr_accessor :compile_options
-
-    def initialize(build)
-      super
-      @command = nil
-      @compile_options = "-B%{funcname} -o-"
-    end
-
-    def run(out, infiles, funcname)
-      @command ||= @build.mrbcfile
-      infiles = [infiles].flatten
-      infiles.each do |f|
-        _pp "MRBC", f.relative_path, nil, :indent => 2
-      end
-      IO.popen("#{filename @command} #{@compile_options % {:funcname => funcname}} #{filename(infiles).join(' ')}", 'r+') do |io|
-        out.puts io.read
-      end
-      # if mrbc execution fail, drop the file
-      if $?.exitstatus != 0
-        File.delete(out.path)
-        exit(-1)
-      end
-    end
-  end
-
-  class Command::CrossTestRunner < Command
-    attr_accessor :runner_options
-    attr_accessor :verbose_flag
-    attr_accessor :flags
-
-    def initialize(build)
-      super
-      @command = nil
-      @runner_options = '%{flags} %{infile}'
-      @verbose_flag = ''
-      @flags = []
-    end
-
-    def run(testbinfile)
-      puts "TEST for " + @build.name
-      _run runner_options, { :flags => [flags, verbose_flag].flatten.join(' '), :infile => testbinfile }
-    end
-  end
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_gem.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_gem.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_gem.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build_gem.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-module MRuby
-  module LoadGems
-    def gembox(gemboxfile)
-      gembox = File.expand_path("#{gemboxfile}.gembox", "#{MRUBY_ROOT}/mrbgems")
-      fail "Can't find gembox '#{gembox}'" unless File.exist?(gembox)
-
-      GemBox.config = self
-      GemBox.path = gembox
-
-      instance_eval File.read(gembox)
-
-      GemBox.path = nil
-    end
-
-    def gem(gemdir, &block)
-      caller_dir = File.expand_path(File.dirname(/^(.*?):\d/.match(caller.first).to_a[1]))
-
-      if gemdir.is_a?(Hash)
-        gemdir = load_special_path_gem(gemdir)
-      elsif GemBox.path && gemdir.is_a?(String)
-        gemdir = File.expand_path(gemdir, File.dirname(GemBox.path))
-      else
-        gemdir = File.expand_path(gemdir, caller_dir)
-      end
-
-      gemrake = File.join(gemdir, "mrbgem.rake")
-
-      fail "Can't find #{gemrake}" unless File.exist?(gemrake)
-      Gem.current = nil
-      load gemrake
-      return nil unless Gem.current
-
-      Gem.current.dir = gemdir
-      Gem.current.build = self.is_a?(MRuby::Build) ? self : MRuby::Build.current
-      Gem.current.build_config_initializer = block
-      gems << Gem.current
-
-      cxx_srcs = ['src', 'test', 'tools'].map do |subdir|
-        Dir.glob("#{Gem.current.dir}/#{subdir}/*.{cpp,cxx,cc}")
-      end.flatten
-      enable_cxx_exception unless cxx_srcs.empty?
-
-      Gem.current
-    end
-
-    def load_special_path_gem(params)
-      if params[:github]
-        params[:git] = "https://github.com/#{params[:github]}.git"
-      elsif params[:bitbucket]
-        if params[:method] == "ssh"
-          params[:git] = "git@bitbucket.org:#{params[:bitbucket]}.git"
-        else
-          params[:git] = "https://bitbucket.org/#{params[:bitbucket]}.git"
-        end
-      elsif params[:mgem]
-        mgem_list_dir = "#{gem_clone_dir}/mgem-list"
-        mgem_list_url = 'https://github.com/mruby/mgem-list.git'
-        if File.exist? mgem_list_dir
-          git.run_pull mgem_list_dir, mgem_list_url if $pull_gems
-        else
-          FileUtils.mkdir_p mgem_list_dir
-          git.run_clone mgem_list_dir, mgem_list_url, "--depth 1"
-        end
-
-        require 'yaml'
-
-        conf_path = "#{mgem_list_dir}/#{params[:mgem]}.gem"
-        conf_path = "#{mgem_list_dir}/mruby-#{params[:mgem]}.gem" unless File.exist? conf_path
-        fail "mgem not found: #{params[:mgem]}" unless File.exist? conf_path
-        conf = YAML.load File.read conf_path
-
-        fail "unknown mgem protocol: #{conf['protocol']}" if conf['protocol'] != 'git'
-        params[:git] = conf['repository']
-        params[:branch] = conf['branch'] if conf['branch']
-      end
-
-      if params[:core]
-        gemdir = "#{root}/mrbgems/#{params[:core]}"
-      elsif params[:path]
-        require 'pathname'
-        gemdir = Pathname.new(params[:path]).absolute? ? params[:path] : "#{root}/#{params[:path]}"
-      elsif params[:git]
-        url = params[:git]
-        gemdir = "#{gem_clone_dir}/#{url.match(/([-\w]+)(\.[-\w]+|)$/).to_a[1]}"
-
-        # by default the 'master' branch is used
-        branch = params[:branch] ? params[:branch] : 'master'
-
-        if File.exist?(gemdir)
-          if $pull_gems
-            git.run_pull gemdir, url
-          else
-            gemdir
-          end
-        else
-          options = [params[:options]] || []
-          options << "--recursive"
-          options << "--branch \"#{branch}\""
-          options << "--depth 1" unless params[:checksum_hash]
-          FileUtils.mkdir_p "#{gem_clone_dir}"
-          git.run_clone gemdir, url, options
-        end
-
-        if params[:checksum_hash]
-          # Jump to the specified commit
-          git.run_checkout gemdir, params[:checksum_hash]
-        else
-          # Jump to the top of the branch
-          git.run_checkout gemdir, branch if $pull_gems
-        end
-      else
-        fail "unknown gem option #{params}"
-      end
-
-      gemdir
-    end
-
-    def enable_gems?
-      !@gems.empty?
-    end
-  end # LoadGems
-end # MRuby
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/mruby_build.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,355 +0,0 @@
-load "#{MRUBY_ROOT}/tasks/mruby_build_gem.rake"
-load "#{MRUBY_ROOT}/tasks/mruby_build_commands.rake"
-
-module MRuby
-  class << self
-    def targets
-      @targets ||= {}
-    end
-
-    def each_target(&block)
-      return to_enum(:each_target) if block.nil?
-      @targets.each do |key, target|
-        target.instance_eval(&block)
-      end
-    end
-  end
-
-  class Toolchain
-    class << self
-      attr_accessor :toolchains
-    end
-
-    def initialize(name, &block)
-      @name, @initializer = name.to_s, block
-      MRuby::Toolchain.toolchains ||= {}
-      MRuby::Toolchain.toolchains[@name] = self
-    end
-
-    def setup(conf,params={})
-      conf.instance_exec(conf, params, &@initializer)
-    end
-
-    def self.load
-      Dir.glob("#{MRUBY_ROOT}/tasks/toolchains/*.rake").each do |file|
-        Kernel.load file
-      end
-    end
-  end
-  Toolchain.load
-
-  class Build
-    class << self
-      attr_accessor :current
-    end
-    include Rake::DSL
-    include LoadGems
-    attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir
-    attr_reader :libmruby, :gems, :toolchains
-    attr_writer :enable_bintest, :enable_test
-
-    COMPILERS = %w(cc cxx objc asm)
-    COMMANDS = COMPILERS + %w(linker archiver yacc gperf git exts mrbc)
-    attr_block MRuby::Build::COMMANDS
-
-    Exts = Struct.new(:object, :executable, :library)
-
-    def initialize(name='host', build_dir=nil, &block)
-      @name = name.to_s
-
-      unless MRuby.targets[@name]
-        if ENV['OS'] == 'Windows_NT'
-          @exts = Exts.new('.o', '.exe', '.a')
-        else
-          @exts = Exts.new('.o', '', '.a')
-        end
-
-        build_dir = build_dir || ENV['MRUBY_BUILD_DIR'] || "#{MRUBY_ROOT}/build"
-
-        @file_separator = '/'
-        @build_dir = "#{build_dir}/#{@name}"
-        @gem_clone_dir = "#{build_dir}/mrbgems"
-        @cc = Command::Compiler.new(self, %w(.c))
-        @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp))
-        @objc = Command::Compiler.new(self, %w(.m))
-        @asm = Command::Compiler.new(self, %w(.S .asm))
-        @linker = Command::Linker.new(self)
-        @archiver = Command::Archiver.new(self)
-        @yacc = Command::Yacc.new(self)
-        @gperf = Command::Gperf.new(self)
-        @git = Command::Git.new(self)
-        @mrbc = Command::Mrbc.new(self)
-
-        @bins = []
-        @gems, @libmruby = MRuby::Gem::List.new, []
-        @build_mrbtest_lib_only = false
-        @cxx_exception_enabled = false
-        @cxx_exception_disabled = false
-        @cxx_abi_enabled = false
-        @enable_bintest = false
-        @enable_test = false
-        @toolchains = []
-
-        MRuby.targets[@name] = self
-      end
-
-      MRuby::Build.current = MRuby.targets[@name]
-      MRuby.targets[@name].instance_eval(&block)
-
-      build_mrbc_exec if name == 'host'
-      build_mrbtest if test_enabled?
-    end
-
-    def enable_debug
-      compilers.each do |c|
-        c.defines += %w(MRB_DEBUG)
-        if toolchains.any? { |toolchain| toolchain == "gcc" }
-          c.flags += %w(-g3 -O0)
-        end
-      end
-      @mrbc.compile_options += ' -g'
-    end
-
-    def disable_cxx_exception
-      if @cxx_exception_enabled or @cxx_abi_enabled
-        raise "cxx_exception already enabled"
-      end
-      @cxx_exception_disabled = true
-    end
-
-    def enable_cxx_exception
-      return if @cxx_exception_enabled
-      return if @cxx_abi_enabled
-      if @cxx_exception_disabled
-        raise "cxx_exception disabled"
-      end
-      @cxx_exception_enabled = true
-      compilers.each { |c|
-        c.defines += %w(MRB_ENABLE_CXX_EXCEPTION)
-        c.flags << c.cxx_exception_flag
-      }
-      linker.command = cxx.command if toolchains.find { |v| v == 'gcc' }
-    end
-
-    def cxx_exception_enabled?
-      @cxx_exception_enabled
-    end
-
-    def cxx_abi_enabled?
-      @cxx_abi_enabled
-    end
-
-    def enable_cxx_abi
-      return if @cxx_abi_enabled
-      if @cxx_exception_enabled
-        raise "cxx_exception already enabled"
-      end
-      compilers.each { |c|
-        c.defines += %w(MRB_ENABLE_CXX_EXCEPTION MRB_ENABLE_CXX_ABI)
-        c.flags << c.cxx_compile_flag
-      }
-      compilers.each { |c| c.flags << c.cxx_compile_flag }
-      linker.command = cxx.command if toolchains.find { |v| v == 'gcc' }
-      @cxx_abi_enabled = true
-    end
-
-    def compile_as_cxx src, cxx_src, obj = nil, includes = []
-      src = File.absolute_path src
-      cxx_src = File.absolute_path cxx_src
-      obj = objfile(cxx_src) if obj.nil?
-
-      file cxx_src => [src, __FILE__] do |t|
-        FileUtils.mkdir_p File.dirname t.name
-        IO.write t.name, <<EOS
-#define __STDC_CONSTANT_MACROS
-#define __STDC_LIMIT_MACROS
-
-#ifndef MRB_ENABLE_CXX_ABI
-extern "C" {
-#endif
-#include "#{src}"
-#ifndef MRB_ENABLE_CXX_ABI
-}
-#endif
-EOS
-      end
-
-      file obj => cxx_src do |t|
-        cxx.run t.name, t.prerequisites.first, [], ["#{MRUBY_ROOT}/src"] + includes
-      end
-
-      obj
-    end
-
-    def enable_bintest
-      @enable_bintest = true
-    end
-
-    def bintest_enabled?
-      @enable_bintest
-    end
-
-    def toolchain(name, params={})
-      tc = Toolchain.toolchains[name.to_s]
-      fail "Unknown #{name} toolchain" unless tc
-      tc.setup(self, params)
-      @toolchains.unshift name.to_s
-    end
-
-    def primary_toolchain
-      @toolchains.first
-    end
-
-    def root
-      MRUBY_ROOT
-    end
-
-    def enable_test
-      @enable_test = true
-    end
-
-    def test_enabled?
-      @enable_test
-    end
-
-    def build_mrbtest
-      gem :core => 'mruby-test'
-    end
-
-    def build_mrbc_exec
-      gem :core => 'mruby-bin-mrbc'
-    end
-
-    def mrbcfile
-      return @mrbcfile if @mrbcfile
-
-      mrbc_build = MRuby.targets['host']
-      gems.each { |v| mrbc_build = self if v.name == 'mruby-bin-mrbc' }
-      @mrbcfile = mrbc_build.exefile("#{mrbc_build.build_dir}/bin/mrbc")
-    end
-
-    def compilers
-      COMPILERS.map do |c|
-        instance_variable_get("@#{c}")
-      end
-    end
-
-    def define_rules
-      compilers.each do |compiler|
-        if respond_to?(:enable_gems?) && enable_gems?
-          compiler.defines -= %w(DISABLE_GEMS)
-        else
-          compiler.defines += %w(DISABLE_GEMS)
-        end
-        compiler.define_rules build_dir, File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      end
-    end
-
-    def filename(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| filename(n) }
-      else
-        '"%s"' % name.gsub('/', file_separator)
-      end
-    end
-
-    def cygwin_filename(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| cygwin_filename(n) }
-      else
-        '"%s"' % `cygpath -w "#{filename(name)}"`.strip
-      end
-    end
-
-    def exefile(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| exefile(n) }
-      else
-        "#{name}#{exts.executable}"
-      end
-    end
-
-    def objfile(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| objfile(n) }
-      else
-        "#{name}#{exts.object}"
-      end
-    end
-
-    def libfile(name)
-      if name.is_a?(Array)
-        name.flatten.map { |n| libfile(n) }
-      else
-        "#{name}#{exts.library}"
-      end
-    end
-
-    def build_mrbtest_lib_only
-      @build_mrbtest_lib_only = true
-    end
-
-    def build_mrbtest_lib_only?
-      @build_mrbtest_lib_only
-    end
-
-    def run_test
-      puts ">>> Test #{name} <<<"
-      mrbtest = exefile("#{build_dir}/bin/mrbtest")
-      sh "#{filename mrbtest.relative_path}#{$verbose ? ' -v' : ''}"
-      puts
-      run_bintest if bintest_enabled?
-    end
-
-    def run_bintest
-      targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir }
-      targets << filename(".") if File.directory? "./bintest"
-      sh "ruby test/bintest.rb #{targets.join ' '}"
-    end
-
-    def print_build_summary
-      puts "================================================"
-      puts "      Config Name: #{@name}"
-      puts " Output Directory: #{self.build_dir.relative_path}"
-      puts "         Binaries: #{@bins.join(', ')}" unless @bins.empty?
-      unless @gems.empty?
-        puts "    Included Gems:"
-        @gems.map do |gem|
-          gem_version = " - #{gem.version}" if gem.version != '0.0.0'
-          gem_summary = " - #{gem.summary}" if gem.summary
-          puts "             #{gem.name}#{gem_version}#{gem_summary}"
-          puts "               - Binaries: #{gem.bins.join(', ')}" unless gem.bins.empty?
-        end
-      end
-      puts "================================================"
-      puts
-    end
-  end # Build
-
-  class CrossBuild < Build
-    attr_block %w(test_runner)
-    # cross compiling targets for building native extensions.
-    # host  - arch of where the built binary will run
-    # build - arch of the machine building the binary
-    attr_accessor :host_target, :build_target
-
-    def initialize(name, build_dir=nil, &block)
-      @test_runner = Command::CrossTestRunner.new(self)
-      super
-    end
-
-    def mrbcfile
-      MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/mrbc")
-    end
-
-    def run_test
-      mrbtest = exefile("#{build_dir}/bin/mrbtest")
-      if (@test_runner.command == nil)
-        puts "You should run #{mrbtest} on target device."
-        puts
-      else
-        @test_runner.run(mrbtest)
-      end
-    end
-  end # CrossBuild
-end # MRuby
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/ruby_ext.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/ruby_ext.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/ruby_ext.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/ruby_ext.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-class Object
-  class << self
-    def attr_block(*syms)
-      syms.flatten.each do |sym|
-        class_eval "def #{sym}(&block);block.call(@#{sym}) if block_given?;@#{sym};end"
-      end
-    end
-  end
-end
-
-class String
-  def relative_path_from(dir)
-    Pathname.new(File.expand_path(self)).relative_path_from(Pathname.new(File.expand_path(dir))).to_s
-  end
-
-  def relative_path
-    relative_path_from(Dir.pwd)
-  end
-
-  # Compatible with 1.9 on 1.8
-  def %(params)
-    if params.is_a?(Hash)
-      str = self.clone
-      params.each do |k, v|
-        str.gsub!("%{#{k}}") { v }
-      end
-      str
-    else
-      if params.is_a?(Array)
-        sprintf(self, *params)
-      else
-        sprintf(self, params)
-      end
-    end
-  end
-end
-
-class Symbol
-  # Compatible with 1.9 on 1.8
-  def to_proc
-    proc { |obj, *args| obj.send(self, *args) }
-  end
-end
-
-module Enumerable
-  # Compatible with 1.9 on 1.8
-  def each_with_object(memo)
-    return to_enum :each_with_object, memo unless block_given?
-    each { |obj| yield obj, memo }
-    memo
-  end
-end
-
-$pp_show = true
-
-if $verbose.nil?
-  if Rake.respond_to?(:verbose) && !Rake.verbose.nil?
-    if Rake.verbose.class == TrueClass
-      # verbose message logging
-      $pp_show = false
-    else
-      $pp_show = true
-      Rake.verbose(false)
-    end
-  else
-    # could not identify rake version
-    $pp_show = false
-  end
-else
-  $pp_show = false if $verbose
-end
-
-def _pp(cmd, src, tgt=nil, options={})
-  return unless $pp_show
-
-  width = 5
-  template = options[:indent] ? "%#{width*options[:indent]}s %s %s" : "%-#{width}s %s %s"
-  puts template % [cmd, src, tgt ? "-> #{tgt}" : nil]
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/android.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/android.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/android.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/android.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,321 +0,0 @@
-class MRuby::Toolchain::Android
-
-  DEFAULT_ARCH = 'armeabi' # TODO : Revise if arch should have a default
-
-  DEFAULT_TOOLCHAIN = :clang
-
-  DEFAULT_NDK_HOMES = %w{
-    /usr/local/opt/android-sdk/ndk-bundle
-    /usr/local/opt/android-ndk
-    %LOCALAPPDATA%/Android/android-sdk/ndk-bundle
-    %LOCALAPPDATA%/Android/android-ndk
-    ~/Library/Android/sdk/ndk-bundle
-    ~/Library/Android/ndk
-  }
-
-  TOOLCHAINS = [:clang, :gcc]
-
-  ARCHITECTURES = %w{
-    armeabi armeabi-v7a arm64-v8a
-    x86 x86_64
-    mips mips64
-  }
-
-  class AndroidNDKHomeNotFound < StandardError
-    def message
-        <<-EOM
-Couldn't find Android NDK Home.
-Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
-        EOM
-    end
-  end
-
-  class PlatformDirNotFound < StandardError
-    def message
-        <<-EOM
-Couldn't find Android NDK platform directories.
-Set ANDROID_PLATFORM environment variable or set :platform parameter
-        EOM
-    end
-  end
-
-  attr_reader :params
-
-  def initialize(params)
-    @params = params
-  end
-
-  def bin_gcc(command)
-    command = command.to_s
-
-    command = case arch
-      when /armeabi/    then 'arm-linux-androideabi-'
-      when /arm64-v8a/  then 'aarch64-linux-android-'
-      when /x86_64/     then 'x86_64-linux-android-'
-      when /x86/        then 'i686-linux-android-'
-      when /mips64/     then 'mips64el-linux-android-'
-      when /mips/       then 'mipsel-linux-android-'
-      end + command
-
-    gcc_toolchain_path.join('bin', command).to_s
-  end
-
-  def bin(command)
-    command = command.to_s
-    toolchain_path.join('bin', command).to_s
-  end
-
-  def home_path
-    @home_path ||= Pathname(
-      params[:ndk_home] ||
-      ENV['ANDROID_NDK_HOME'] ||
-      DEFAULT_NDK_HOMES.find { |path|
-        path.gsub! '%LOCALAPPDATA%', ENV['LOCALAPPDATA'] || '%LOCALAPPDATA%'
-        path.gsub! '\\', '/'
-        path.gsub! '~', Dir.home || '~'
-        File.directory?(path)
-      } || raise(AndroidNDKHomeNotFound)
-    )
-  end
-
-  def toolchain
-    @toolchain ||= params.fetch(:toolchain){ DEFAULT_TOOLCHAIN }
-  end
-
-  def toolchain_path
-    @toolchain_path ||= case toolchain
-      when :gcc
-        gcc_toolchain_path
-      when :clang
-        home_path.join('toolchains', 'llvm' , 'prebuilt', host_platform)
-      end
-  end
-
-  def gcc_toolchain_path
-    if @gcc_toolchain_path === nil then
-      prefix = case arch
-        when /armeabi/    then 'arm-linux-androideabi-'
-        when /arm64-v8a/  then 'aarch64-linux-android-'
-        when /x86_64/     then 'x86_64-'
-        when /x86/        then 'x86-'
-        when /mips64/     then 'mips64el-linux-android-'
-        when /mips/       then 'mipsel-linux-android-'
-        end
-
-      test = case arch
-        when /armeabi/    then 'arm-linux-androideabi-*'
-        when /arm64-v8a/  then 'aarch64-linux-android-*'
-        when /x86_64/     then 'x86_64-*'
-        when /x86/        then 'x86-*'
-        when /mips64/     then 'mips64el-linux-android-*'
-        when /mips/       then 'mipsel-linux-android-*'
-        end
-
-      gcc_toolchain_version = Dir[home_path.join('toolchains', test)].map{|t| t.match(/-(\d+\.\d+)$/); $1.to_f }.max
-      @gcc_toolchain_path = home_path.join('toolchains', prefix + gcc_toolchain_version.to_s, 'prebuilt', host_platform)
-    end
-    @gcc_toolchain_path
-  end
-
-  def host_platform
-    @host_platform ||= case RUBY_PLATFORM
-      when /cygwin|mswin|mingw|bccwin|wince|emx/i
-        path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*')
-        Dir.glob(path.to_s){ |item|
-          next if File.file?(item)
-          path = Pathname(item)
-          break
-        }
-        path.basename
-      when /x86_64-darwin/i
-        'darwin-x86_64'
-      when /darwin/i
-        'darwin-x86'
-      when /x86_64-linux/i
-        'linux-x86_64'
-      when /linux/i
-        'linux-x86'
-      else
-        raise NotImplementedError, "Unknown host platform (#{RUBY_PLATFORM})"
-      end
-  end
-
-  def arch
-    @arch ||= (params[:arch] || ENV['ANDROID_ARCH'] || DEFAULT_ARCH).to_s
-  end
-
-  def sysroot
-    @sysroot ||= home_path.join('platforms', platform,
-        case arch
-        when /armeabi/    then 'arch-arm'
-        when /arm64-v8a/  then 'arch-arm64'
-        when /x86_64/     then 'arch-x86_64'
-        when /x86/        then 'arch-x86'
-        when /mips64/     then 'arch-mips64'
-        when /mips/       then 'arch-mips'
-        end
-      ).to_s
-  end
-
-  def platform
-    if @platform === nil then
-      @platform = params[:platform] || ENV['ANDROID_PLATFORM'] || nil
-      if @platform === nil
-        Dir.glob(home_path.join('platforms/android-*').to_s){ |item|
-          next if File.file?(item)
-          if @platform === nil
-            @platform = Integer(item.rpartition('-')[2])
-          else
-            platform = Integer(item.rpartition('-')[2])
-            @platform = platform > @platform ? platform : @platform
-          end
-        }
-        if @platform === nil
-          raise(PlatformDirNotFound)
-        else
-          @platform = "android-#{@platform}"
-        end
-      end
-    end
-    if Integer(@platform.rpartition('-')[2]) < 21
-      case arch
-      when /arm64-v8a/, /x86_64/, /mips64/
-        raise NotImplementedError, "Platform (#{@platform}) has no implementation for architecture (#{arch})"
-      end
-    end
-    @platform
-  end
-
-  def armeabi_v7a_mfpu
-    @armeabi_v7a_mfpu ||= (params[:mfpu] || 'vfpv3-d16').to_s
-  end
-
-  def armeabi_v7a_mfloat_abi
-    @armeabi_v7a_mfloat_abi ||= (params[:mfloat_abi] || 'softfp').to_s
-  end
-
-  def no_warn_mismatch
-    if %W(soft softfp).include? armeabi_v7a_mfloat_abi
-      ''
-    else
-      ',--no-warn-mismatch'
-    end
-  end
-
-  def cc
-    case toolchain
-    when :gcc then bin_gcc('gcc')
-    when :clang then bin('clang')
-    end
-  end
-
-  def ar
-    case toolchain
-    when :gcc   then bin_gcc('ar')
-    when :clang then bin_gcc('ar')
-    end
-  end
-
-  def ctarget
-    flags = []
-
-    case toolchain
-    when :gcc
-      case arch
-      when /armeabi-v7a/  then flags += %W(-march=armv7-a)
-      when /armeabi/      then flags += %W(-march=armv5te)
-      when /arm64-v8a/    then flags += %W(-march=armv8-a)
-      when /x86_64/       then flags += %W(-march=x86-64)
-      when /x86/          then flags += %W(-march=i686)
-      when /mips64/       then flags += %W(-march=mips64r6)
-      when /mips/         then flags += %W(-march=mips32)
-      end
-    when :clang
-      case arch
-      when /armeabi-v7a/  then flags += %W(-target armv7-none-linux-androideabi)
-      when /armeabi/      then flags += %W(-target armv5te-none-linux-androideabi)
-      when /arm64-v8a/    then flags += %W(-target aarch64-none-linux-android)
-      when /x86_64/       then flags += %W(-target x86_64-none-linux-android)
-      when /x86/          then flags += %W(-target i686-none-linux-android)
-      when /mips64/       then flags += %W(-target mips64el-none-linux-android)
-      when /mips/         then flags += %W(-target mipsel-none-linux-android)
-      end
-    end
-
-    case arch
-    when /armeabi-v7a/  then flags += %W(-mfpu=#{armeabi_v7a_mfpu} -mfloat-abi=#{armeabi_v7a_mfloat_abi})
-    when /armeabi/      then flags += %W(-mtune=xscale -msoft-float)
-    when /arm64-v8a/    then flags += %W()
-    when /x86_64/       then flags += %W()
-    when /x86/          then flags += %W()
-    when /mips64/       then flags += %W(-fmessage-length=0)
-    when /mips/         then flags += %W(-fmessage-length=0)
-    end
-
-    flags
-  end
-
-  def cflags
-    flags = []
-
-    flags += %W(-MMD -MP -D__android__ -DANDROID --sysroot="#{sysroot}")
-    flags += ctarget
-    case toolchain
-    when :gcc
-    when :clang
-      flags += %W(-gcc-toolchain "#{gcc_toolchain_path}" -Wno-invalid-command-line-argument -Wno-unused-command-line-argument)
-    end
-    flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes)
-
-    flags
-  end
-
-  def ldflags
-    flags = []
-
-    flags += %W(--sysroot="#{sysroot}")
-
-    flags
-  end
-
-  def ldflags_before_libraries
-    flags = []
-
-    case toolchain
-    when :gcc
-      case arch
-      when /armeabi-v7a/  then flags += %W(-Wl#{no_warn_mismatch})
-      end
-    when :clang
-      flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}")
-      case arch
-      when /armeabi-v7a/  then flags += %W(-target armv7-none-linux-androideabi -Wl,--fix-cortex-a8#{no_warn_mismatch})
-      when /armeabi/      then flags += %W(-target armv5te-none-linux-androideabi)
-      when /arm64-v8a/    then flags += %W(-target aarch64-none-linux-android)
-      when /x86_64/       then flags += %W(-target x86_64-none-linux-android)
-      when /x86/          then flags += %W(-target i686-none-linux-android)
-      when /mips64/       then flags += %W(-target mips64el-none-linux-android)
-      when /mips/         then flags += %W(-target mipsel-none-linux-android)
-      end
-    end
-    flags += %W(-no-canonical-prefixes)
-
-    flags
-  end
-end
-
-MRuby::Toolchain.new(:android) do |conf, params|
-  android = MRuby::Toolchain::Android.new(params)
-
-  toolchain android.toolchain
-
-  [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
-    cc.command = android.cc
-    cc.flags = android.cflags
-  end
-
-  conf.archiver.command = android.ar
-  conf.linker.command = android.cc
-  conf.linker.flags = android.ldflags
-  conf.linker.flags_before_libraries = android.ldflags_before_libraries
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/clang.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/clang.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/clang.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/clang.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-MRuby::Toolchain.new(:clang) do |conf, _params|
-  toolchain :gcc
-
-  [conf.cc, conf.objc, conf.asm].each do |cc|
-    cc.command = ENV['CC'] || 'clang'
-  end
-  conf.cxx.command = ENV['CXX'] || 'clang++'
-  conf.linker.command = ENV['LD'] || 'clang'
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/gcc.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/gcc.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/gcc.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/gcc.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-MRuby::Toolchain.new(:gcc) do |conf, _params|
-  [conf.cc, conf.objc, conf.asm].each do |cc|
-    cc.command = ENV['CC'] || 'gcc'
-    cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings)]
-    cc.defines = %w(DISABLE_GEMS)
-    cc.option_include_path = '-I%s'
-    cc.option_define = '-D%s'
-    cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
-    cc.cxx_compile_flag = '-x c++ -std=c++03'
-    cc.cxx_exception_flag = '-fexceptions'
-  end
-
-  [conf.cxx].each do |cxx|
-    cxx.command = ENV['CXX'] || 'g++'
-    cxx.flags = [ENV['CXXFLAGS'] || ENV['CFLAGS'] || %w(-g -O3 -Wall -Werror-implicit-function-declaration)]
-    cxx.defines = %w(DISABLE_GEMS)
-    cxx.option_include_path = '-I%s'
-    cxx.option_define = '-D%s'
-    cxx.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
-    cxx.cxx_compile_flag = '-x c++ -std=c++03'
-    cxx.cxx_exception_flag = '-fexceptions'
-  end
-
-  conf.linker do |linker|
-    linker.command = ENV['LD'] || 'gcc'
-    linker.flags = [ENV['LDFLAGS'] || %w()]
-    linker.libraries = %w(m)
-    linker.library_paths = []
-    linker.option_library = '-l%s'
-    linker.option_library_path = '-L%s'
-    linker.link_options = '%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
-  end
-
-  [[conf.cc, 'c'], [conf.cxx, 'c++']].each do |cc, lang|
-    cc.instance_variable_set :@header_search_language, lang
-    def cc.header_search_paths
-      if @header_search_command != command
-        result = `echo | #{build.filename command} -x#{@header_search_language} -Wp,-v - -fsyntax-only 2>&1`
-        result = `echo | #{command} -x#{@header_search_language} -Wp,-v - -fsyntax-only 2>&1` if $?.exitstatus != 0
-        return include_paths if  $?.exitstatus != 0
-
-        @frameworks = []
-        @header_search_paths = result.lines.map { |v|
-          framework = v.match(/^ (.*)(?: \(framework directory\))$/)
-          if framework
-            @frameworks << framework[1]
-            next nil
-          end
-
-          v.match(/^ (.*)$/)
-        }.compact.map { |v| v[1] }.select { |v| File.directory? v }
-        @header_search_paths += include_paths
-        @header_search_command = command
-      end
-      @header_search_paths
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/openwrt.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/openwrt.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/openwrt.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/openwrt.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# usage of environmental variables to set the
-# cross compiling toolchain proper
-MRuby::Toolchain.new(:openwrt) do |conf|
-  [conf.cc, conf.objc, conf.asm].each do |cc|
-    cc.command = ENV['TARGET_CC']
-    cc.flags = ENV['TARGET_CFLAGS']
-    cc.include_paths = ["#{MRUBY_ROOT}/include"]
-    cc.defines = %w(DISABLE_GEMS)
-    cc.option_include_path = '-I%s'
-    cc.option_define = '-D%s'
-    cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
-  end
-
-  [conf.cxx].each do |cxx|
-    cxx.command = ENV['TARGET_CXX']
-    cxx.flags = ENV['TARGET_CXXFLAGS']
-    cxx.include_paths = ["#{MRUBY_ROOT}/include"]
-    cxx.defines = %w(DISABLE_GEMS)
-    cxx.option_include_path = '-I%s'
-    cxx.option_define = '-D%s'
-    cxx.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
-   end
-
-  conf.linker do |linker|
-    linker.command = ENV['TARGET_CC']
-    linker.flags = ENV['TARGET_LDFLAGS']
-    linker.libraries = %w(m)
-    linker.library_paths = []
-    linker.option_library = '-l%s'
-    linker.option_library_path = '-L%s'
-    linker.link_options = '%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = ENV['TARGET_AR']
-    archiver.archive_options = 'rs %{outfile} %{objs}'
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/visualcpp.rake cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/visualcpp.rake
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/visualcpp.rake	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/tasks/toolchains/visualcpp.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-MRuby::Toolchain.new(:visualcpp) do |conf, _params|
-  conf.cc do |cc|
-    cc.command = ENV['CC'] || 'cl.exe'
-    # C4013: implicit function declaration
-    cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /we4013 /Zi /MD /O2 /D_CRT_SECURE_NO_WARNINGS)]
-    cc.defines = %w(DISABLE_GEMS MRB_STACK_EXTEND_DOUBLING)
-    cc.option_include_path = '/I%s'
-    cc.option_define = '/D%s'
-    cc.compile_options = "%{flags} /Fo%{outfile} %{infile}"
-    cc.cxx_compile_flag = '/TP'
-    cc.cxx_exception_flag = '/EHs'
-  end
-
-  conf.cxx do |cxx|
-    cxx.command = ENV['CXX'] || 'cl.exe'
-    cxx.flags = [ENV['CXXFLAGS'] || ENV['CFLAGS'] || %w(/c /nologo /W3 /Zi /MD /O2 /EHs /D_CRT_SECURE_NO_WARNINGS)]
-    cxx.defines = %w(DISABLE_GEMS MRB_STACK_EXTEND_DOUBLING)
-    cxx.option_include_path = '/I%s'
-    cxx.option_define = '/D%s'
-    cxx.compile_options = "%{flags} /Fo%{outfile} %{infile}"
-    cxx.cxx_compile_flag = '/TP'
-    cxx.cxx_exception_flag = '/EHs'
-  end
-
-  conf.linker do |linker|
-    linker.command = ENV['LD'] || 'link.exe'
-    linker.flags = [ENV['LDFLAGS'] || %w(/NOLOGO /DEBUG /INCREMENTAL:NO /OPT:ICF /OPT:REF)]
-    linker.libraries = %w()
-    linker.library_paths = %w()
-    linker.option_library = '%s.lib'
-    linker.option_library_path = '/LIBPATH:%s'
-    linker.link_options = "%{flags} /OUT:%{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}"
-  end
-
-  conf.archiver do |archiver|
-    archiver.command = ENV['AR'] || 'lib.exe'
-    archiver.archive_options = '/nologo /OUT:%{outfile} %{objs}'
-  end
-
-  conf.yacc do |yacc|
-    yacc.command = ENV['YACC'] || 'bison.exe'
-    yacc.compile_options = '-o %{outfile} %{infile}'
-  end
-
-  conf.gperf do |gperf|
-    gperf.command = 'gperf.exe'
-    gperf.compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}'
-  end
-
-  conf.exts do |exts|
-    exts.object = '.obj'
-    exts.executable = '.exe'
-    exts.library = '.lib'
-  end
-
-  conf.file_separator = '\\'
-
-  if require 'open3'
-    Open3.popen3 conf.cc.command do |_, _, e, _|
-      if /Version (\d{2})\.\d{2}\.\d{5}/ =~ e.gets && $1.to_i <= 17
-        m = "# VS2010/2012 support will be dropped after the next release! #"
-        h = "#" * m.length
-        puts h, m, h
-      end
-    end
-  end
-
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/assert.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/assert.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/assert.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/assert.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,257 +0,0 @@
-$ok_test = 0
-$ko_test = 0
-$kill_test = 0
-$asserts  = []
-$test_start = Time.now if Object.const_defined?(:Time)
-
-# Implementation of print due to the reason that there might be no print
-def t_print(*args)
-  i = 0
-  len = args.size
-  while i < len
-    str = args[i].to_s
-    __t_printstr__ str rescue print str
-    i += 1
-  end
-end
-
-##
-# Create the assertion in a readable way
-def assertion_string(err, str, iso=nil, e=nil, bt=nil)
-  msg = "#{err}#{str}"
-  msg += " [#{iso}]" if iso && iso != ''
-  msg += " => #{e.message}" if e
-  msg += " (mrbgems: #{GEMNAME})" if Object.const_defined?(:GEMNAME)
-  if $mrbtest_assert && $mrbtest_assert.size > 0
-    $mrbtest_assert.each do |idx, assert_msg, diff|
-      msg += "\n - Assertion[#{idx}] Failed: #{assert_msg}\n#{diff}"
-    end
-  end
-  msg += "\nbacktrace:\n\t#{bt.join("\n\t")}" if bt
-  msg
-end
-
-##
-# Verify a code block.
-#
-# str : A remark which will be printed in case
-#       this assertion fails
-# iso : The ISO reference code of the feature
-#       which will be tested by this
-#       assertion
-def assert(str = 'Assertion failed', iso = '')
-  t_print(str, (iso != '' ? " [#{iso}]" : ''), ' : ') if $mrbtest_verbose
-  begin
-    $mrbtest_assert = []
-    $mrbtest_assert_idx = 0
-    yield
-    if($mrbtest_assert.size > 0)
-      $asserts.push(assertion_string('Fail: ', str, iso, nil))
-      $ko_test += 1
-      t_print('F')
-    else
-      $ok_test += 1
-      t_print('.')
-    end
-  rescue Exception => e
-    bt = e.backtrace if $mrbtest_verbose
-    if e.class.to_s == 'MRubyTestSkip'
-      $asserts.push "Skip: #{str} #{iso} #{e.cause}"
-      t_print('?')
-    else
-      $asserts.push(assertion_string("#{e.class}: ", str, iso, e, bt))
-      $kill_test += 1
-      t_print('X')
-    end
-  ensure
-    $mrbtest_assert = nil
-  end
-  t_print("\n") if $mrbtest_verbose
-end
-
-def assertion_diff(exp, act)
-  "    Expected: #{exp.inspect}\n" +
-  "      Actual: #{act.inspect}"
-end
-
-def assert_true(ret, msg = nil, diff = nil)
-  if $mrbtest_assert
-    $mrbtest_assert_idx += 1
-    unless ret
-      msg = "Expected #{ret.inspect} to be true" unless msg
-      diff = assertion_diff(true, ret)  unless diff
-      $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff])
-    end
-  end
-  ret
-end
-
-def assert_false(ret, msg = nil, diff = nil)
-  if $mrbtest_assert
-    $mrbtest_assert_idx += 1
-    if ret
-      msg = "Expected #{ret.inspect} to be false" unless msg
-      diff = assertion_diff(false, ret) unless diff
-
-      $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff])
-    end
-  end
-  !ret
-end
-
-def assert_equal(arg1, arg2 = nil, arg3 = nil)
-  if block_given?
-    exp, act, msg = arg1, yield, arg2
-  else
-    exp, act, msg = arg1, arg2, arg3
-  end
-
-  msg = "Expected to be equal" unless msg
-  diff = assertion_diff(exp, act)
-  assert_true(exp == act, msg, diff)
-end
-
-def assert_not_equal(arg1, arg2 = nil, arg3 = nil)
-  if block_given?
-    exp, act, msg = arg1, yield, arg2
-  else
-    exp, act, msg = arg1, arg2, arg3
-  end
-
-  msg = "Expected to be not equal" unless msg
-  diff = assertion_diff(exp, act)
-  assert_false(exp == act, msg, diff)
-end
-
-def assert_nil(obj, msg = nil)
-  msg = "Expected #{obj.inspect} to be nil" unless msg
-  diff = assertion_diff(nil, obj)
-  assert_true(obj.nil?, msg, diff)
-end
-
-def assert_include(collection, obj, msg = nil)
-  msg = "Expected #{collection.inspect} to include #{obj.inspect}" unless msg
-  diff = "    Collection: #{collection.inspect}\n" +
-         "        Object: #{obj.inspect}"
-  assert_true(collection.include?(obj), msg, diff)
-end
-
-def assert_not_include(collection, obj, msg = nil)
-  msg = "Expected #{collection.inspect} to not include #{obj.inspect}" unless msg
-  diff = "    Collection: #{collection.inspect}\n" +
-         "        Object: #{obj.inspect}"
-  assert_false(collection.include?(obj), msg, diff)
-end
-
-def assert_raise(*exp)
-  ret = true
-  if $mrbtest_assert
-    $mrbtest_assert_idx += 1
-    msg = exp.last.class == String ? exp.pop : nil
-    msg = msg.to_s + " : " if msg
-    should_raise = false
-    begin
-      yield
-      should_raise = true
-    rescue Exception => e
-      msg = "#{msg}#{exp.inspect} exception expected, not"
-      diff = "      Class: <#{e.class}>\n" +
-             "    Message: #{e.message}"
-      unless exp.any?{|ex| ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class }
-        $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff])
-        ret = false
-      end
-    end
-
-    exp = exp.first if exp.first
-    if should_raise
-      msg = "#{msg}#{exp.inspect} expected but nothing was raised."
-      $mrbtest_assert.push([$mrbtest_assert_idx, msg, nil])
-      ret = false
-    end
-  end
-  ret
-end
-
-def assert_nothing_raised(*exp)
-  ret = true
-  if $mrbtest_assert
-    $mrbtest_assert_idx += 1
-    msg = exp.last.class == String ? exp.pop : ""
-    begin
-      yield
-    rescue Exception => e
-      msg = "#{msg} exception raised."
-      diff = "      Class: <#{e.class}>\n" +
-             "    Message: #{e.message}"
-      $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff])
-      ret = false
-    end
-  end
-  ret
-end
-
-##
-# Fails unless +obj+ is a kind of +cls+.
-def assert_kind_of(cls, obj, msg = nil)
-  msg = "Expected #{obj.inspect} to be a kind of #{cls}, not #{obj.class}" unless msg
-  diff = assertion_diff(cls, obj.class)
-  assert_true(obj.kind_of?(cls), msg, diff)
-end
-
-##
-# Fails unless +exp+ is equal to +act+ in terms of a Float
-def assert_float(exp, act, msg = nil)
-  msg = "Float #{exp} expected to be equal to float #{act}" unless msg
-  diff = assertion_diff(exp, act)
-  assert_true check_float(exp, act), msg, diff
-end
-
-##
-# Report the test result and print all assertions
-# which were reported broken.
-def report()
-  t_print("\n")
-
-  $asserts.each do |msg|
-    t_print "#{msg}\n"
-  end
-
-  $total_test = $ok_test+$ko_test+$kill_test
-  t_print("Total: #{$total_test}\n")
-
-  t_print("   OK: #{$ok_test}\n")
-  t_print("   KO: #{$ko_test}\n")
-  t_print("Crash: #{$kill_test}\n")
-
-  if Object.const_defined?(:Time)
-    t_time = Time.now - $test_start
-    t_print(" Time: #{t_time.round(2)} seconds\n")
-  end
-end
-
-##
-# Performs fuzzy check for equality on methods returning floats
-def check_float(a, b)
-  tolerance = Mrbtest::FLOAT_TOLERANCE
-  a = a.to_f
-  b = b.to_f
-  if a.finite? and b.finite?
-    (a-b).abs < tolerance
-  else
-    true
-  end
-end
-
-##
-# Skip the test
-class MRubyTestSkip < NotImplementedError
-  attr_accessor :cause
-  def initialize(cause)
-    @cause = cause
-  end
-end
-
-def skip(cause = "")
-  raise MRubyTestSkip.new(cause)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/bintest.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/bintest.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/bintest.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/bintest.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-$:.unshift File.dirname(File.dirname(File.expand_path(__FILE__)))
-require 'test/assert.rb'
-
-def cmd(s)
-  case RbConfig::CONFIG['host_os']
-  when /mswin(?!ce)|mingw|bccwin/
-    "bin\\#{s}.exe"
-  else
-    "bin/#{s}"
-  end
-end
-
-def shellquote(s)
-  case RbConfig::CONFIG['host_os']
-  when /mswin(?!ce)|mingw|bccwin/
-    "\"#{s}\""
-  else
-    "'#{s}'"
-  end
-end
-
-ARGV.each do |gem|
-  case RbConfig::CONFIG['host_os']
-  when /mswin(?!ce)|mingw|bccwin/
-    gem = gem.gsub('\\', '/')
-  end
-
-  Dir["#{gem}/bintest/**/*.rb"].each do |file|
-    load file
-  end
-end
-
-load 'test/report.rb'
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/report.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/report.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/report.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/report.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-report
-if $ko_test > 0 or $kill_test > 0
-  raise "mrbtest failed (KO:#{$ko_test}, Crash:#{$kill_test})"
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/argumenterror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/argumenterror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/argumenterror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/argumenterror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-##
-# ArgumentError ISO Test
-
-assert('ArgumentError', '15.2.24') do
-  e2 = nil
-  a = []
-  begin
-    # this will cause an exception due to the wrong arguments
-    a[]
-  rescue => e1
-    e2 = e1
-  end
-
-  assert_equal(Class, ArgumentError.class)
-  assert_equal(ArgumentError, e2.class)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/array.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/array.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/array.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/array.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,394 +0,0 @@
-##
-# Array ISO Test
-
-assert('Array', '15.2.12') do
-  assert_equal(Class, Array.class)
-end
-
-assert('Array inclueded modules', '15.2.12.3') do
-  assert_true(Array.include?(Enumerable))
-end
-
-assert('Array.[]', '15.2.12.4.1') do
-  assert_equal([1, 2, 3], Array.[](1,2,3))
-end
-
-class SubArray < Array
-end
-
-assert('SubArray.[]') do
-  a = SubArray[1, 2, 3]
-  assert_equal(SubArray, a.class)
-end
-
-assert('Array#+', '15.2.12.5.1') do
-  assert_equal([1, 1], [1].+([1]))
-end
-
-assert('Array#*', '15.2.12.5.2') do
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong argument
-    [1].*(-1)
-  end
-  assert_equal([1, 1, 1], [1].*(3))
-  assert_equal([], [1].*(0))
-end
-
-assert('Array#<<', '15.2.12.5.3') do
-  assert_equal([1, 1], [1].<<(1))
-end
-
-assert('Array#[]', '15.2.12.5.4') do
-  a = Array.new
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong arguments
-    a.[]()
-  end
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong arguments
-    a.[](1,2,3)
-  end
-
-  assert_equal(2, [1,2,3].[](1))
-  assert_equal(nil, [1,2,3].[](4))
-  assert_equal(3, [1,2,3].[](-1))
-  assert_equal(nil, [1,2,3].[](-4))
-
-  a = [ "a", "b", "c", "d", "e" ]
-  assert_equal("b", a[1.1])
-  assert_equal(["b", "c"], a[1,2])
-  assert_equal(["b", "c", "d"], a[1..-2])
-end
-
-assert('Array#[]=', '15.2.12.5.5') do
-  a = Array.new
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong arguments
-    a.[]=()
-  end
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong arguments
-    a.[]=(1,2,3,4)
-  end
-  assert_raise(IndexError) do
-    # this will cause an exception due to the wrong arguments
-    a = [1,2,3,4,5]
-    a[1, -1] = 10
-  end
-
-  assert_equal(4, [1,2,3].[]=(1,4))
-  assert_equal(3, [1,2,3].[]=(1,2,3))
-
-  a = [1,2,3,4,5]
-  a[3..-1] = 6
-  assert_equal([1,2,3,6], a)
-
-  a = [1,2,3,4,5]
-  a[3..-1] = []
-  assert_equal([1,2,3], a)
-
-  a = [1,2,3,4,5]
-  a[2...4] = 6
-  assert_equal([1,2,6,5], a)
-
-  # passing self (#3274)
-  a = [1,2,3]
-  a[1,0] = a
-  assert_equal([1,1,2,3,2,3], a)
-  a = [1,2,3]
-  a[-1,0] = a
-  assert_equal([1,2,1,2,3,3], a)
-end
-
-assert('Array#clear', '15.2.12.5.6') do
-  a = [1]
-  a.clear
-  assert_equal([], a)
-end
-
-assert('Array#collect!', '15.2.12.5.7') do
-  a = [1,2,3]
-  a.collect! { |i| i + i }
-  assert_equal([2,4,6], a)
-end
-
-assert('Array#concat', '15.2.12.5.8') do
-  assert_equal([1,2,3,4], [1, 2].concat([3, 4]))
-
-  # passing self (#3302)
-  a = [1,2,3]
-  a.concat(a)
-  assert_equal([1,2,3,1,2,3], a)
-end
-
-assert('Array#delete_at', '15.2.12.5.9') do
-  a = [1,2,3]
-  assert_equal(2, a.delete_at(1))
-  assert_equal([1,3], a)
-  assert_equal(nil, a.delete_at(3))
-  assert_equal([1,3], a)
-  assert_equal(nil, a.delete_at(-3))
-  assert_equal([1,3], a)
-  assert_equal(3, a.delete_at(-1))
-  assert_equal([1], a)
-end
-
-assert('Array#each', '15.2.12.5.10') do
-  a = [1,2,3]
-  b = 0
-  a.each {|i| b += i}
-  assert_equal(6, b)
-end
-
-assert('Array#each_index', '15.2.12.5.11') do
-  a = [1]
-  b = nil
-  a.each_index {|i| b = i}
-  assert_equal(0, b)
-end
-
-assert('Array#empty?', '15.2.12.5.12') do
-  a = []
-  b = [b]
-  assert_true([].empty?)
-  assert_false([1].empty?)
-end
-
-assert('Array#first', '15.2.12.5.13') do
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong argument
-    [1,2,3].first(-1)
-  end
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong argument
-    [1,2,3].first(1,2)
-  end
-
-  assert_nil([].first)
-
-  b = [1,2,3]
-  assert_equal(1, b.first)
-  assert_equal([], b.first(0))
-  assert_equal([1], b.first(1))
-  assert_equal([1,2,3], b.first(4))
-end
-
-assert('Array#index', '15.2.12.5.14') do
-  a = [1,2,3]
-
-  assert_equal(1, a.index(2))
-  assert_equal(nil, a.index(0))
-end
-
-assert('Array#initialize', '15.2.12.5.15') do
-  a = [].initialize(1)
-  b = [].initialize(2)
-  c = [].initialize(2, 1)
-  d = [].initialize(2) {|i| i}
-
-  assert_equal([nil], a)
-  assert_equal([nil,nil], b)
-  assert_equal([1,1], c)
-  assert_equal([0,1], d)
-end
-
-assert('Array#initialize_copy', '15.2.12.5.16') do
-  a = [1,2,3]
-  b = [].initialize_copy(a)
-
-  assert_equal([1,2,3], b)
-end
-
-assert('Array#join', '15.2.12.5.17') do
-  a = [1,2,3].join
-  b = [1,2,3].join(',')
-
-  assert_equal('123', a)
-  assert_equal('1,2,3', b)
-end
-
-assert('Array#last', '15.2.12.5.18') do
-  assert_raise(ArgumentError) do
-    # this will cause an exception due to the wrong argument
-    [1,2,3].last(-1)
-  end
-
-  a = [1,2,3]
-  assert_equal(3, a.last)
-  assert_nil([].last)
-end
-
-assert('Array#length', '15.2.12.5.19') do
-  a = [1,2,3]
-
-  assert_equal(3, a.length)
-end
-
-assert('Array#map!', '15.2.12.5.20') do
-  a = [1,2,3]
-  a.map! { |i| i + i }
-  assert_equal([2,4,6], a)
-end
-
-assert('Array#pop', '15.2.12.5.21') do
-  a = [1,2,3]
-  b = a.pop
-
-  assert_nil([].pop)
-  assert_equal([1,2], a)
-  assert_equal(3, b)
-
-  assert_raise(RuntimeError) { [].freeze.pop }
-end
-
-assert('Array#push', '15.2.12.5.22') do
-  a = [1,2,3]
-  b = a.push(4)
-
-  assert_equal([1,2,3,4], a)
-  assert_equal([1,2,3,4], b)
-end
-
-assert('Array#replace', '15.2.12.5.23') do
-  a = [1,2,3]
-  b = [].replace(a)
-
-  assert_equal([1,2,3], b)
-end
-
-assert('Array#reverse', '15.2.12.5.24') do
-  a = [1,2,3]
-  b = a.reverse
-
-  assert_equal([1,2,3], a)
-  assert_equal([3,2,1], b)
-end
-
-assert('Array#reverse!', '15.2.12.5.25') do
-  a = [1,2,3]
-  b = a.reverse!
-
-  assert_equal([3,2,1], a)
-  assert_equal([3,2,1], b)
-end
-
-assert('Array#rindex', '15.2.12.5.26') do
-  a = [1,2,3]
-
-  assert_equal(1, a.rindex(2))
-  assert_equal(nil, a.rindex(0))
-end
-
-assert('Array#shift', '15.2.12.5.27') do
-  a = [1,2,3]
-  b = a.shift
-
-  assert_nil([].shift)
-  assert_equal([2,3], a)
-  assert_equal(1, b)
-
-  assert_raise(RuntimeError) { [].freeze.shift }
-end
-
-assert('Array#size', '15.2.12.5.28') do
-  a = [1,2,3]
-
-  assert_equal(3, a.size)
-end
-
-assert('Array#slice', '15.2.12.5.29') do
-  a = "12345".slice(1, 3)
-  b = a.slice(0)
-
-  assert_equal("2:", "#{b}:")
-  assert_equal(2, [1,2,3].[](1))
-end
-
-assert('Array#unshift', '15.2.12.5.30') do
-  a = [2,3]
-  b = a.unshift(1)
-  c = [2,3]
-  d = c.unshift(0, 1)
-
-  assert_equal([1,2,3], a)
-  assert_equal([1,2,3], b)
-  assert_equal([0,1,2,3], c)
-  assert_equal([0,1,2,3], d)
-end
-
-assert('Array#to_s', '15.2.12.5.31 / 15.2.12.5.32') do
-  a = [2, 3,   4, 5]
-  r1 = a.to_s
-  r2 = a.inspect
-
-  assert_equal(r2, r1)
-  assert_equal("[2, 3, 4, 5]", r1)
-end
-
-assert('Array#==', '15.2.12.5.33') do
-  assert_false(["a", "c"] == ["a", "c", 7])
-  assert_true(["a", "c", 7] == ["a", "c", 7])
-  assert_false(["a", "c", 7] == ["a", "d", "f"])
-end
-
-assert('Array#eql?', '15.2.12.5.34') do
-  a1 = [ 1, 2, 3 ]
-  a2 = [ 1, 2, 3 ]
-  a3 = [ 1.0, 2.0, 3.0 ]
-
-  assert_true(a1.eql? a2)
-  assert_false(a1.eql? a3)
-end
-
-assert('Array#hash', '15.2.12.5.35') do
-  a = [ 1, 2, 3 ]
-
-  #assert_true(a.hash.is_a? Integer)
-  assert_true(a.hash.is_a? Integral)  # mruby special
-  assert_equal([1,2].hash, [1,2].hash)
-end
-
-assert('Array#<=>', '15.2.12.5.36') do
-  r1 = [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
-  r2 = [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
-  r3 = [ "a", "b", "c" ]    <=> [ "a", "b", "c" ]   #=> 0
-
-  assert_equal(-1, r1)
-  assert_equal(+1, r2)
-  assert_equal(0, r3)
-end
-
-# Not ISO specified
-
-assert("Array (Shared Array Corruption)") do
-  a = [ "a", "b", "c", "d", "e", "f" ]
-  b = a.slice(1, 3)
-  a.clear
-  b.clear
-end
-
-assert("Array (Longish inline array)") do
-  ary = [[0, 0], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5], [6, 6], [7, 7], [8, 8], [9, 9], [10, 10], [11, 11], [12, 12], [13, 13], [14, 14], [15, 15], [16, 16], [17, 17], [18, 18], [19, 19], [20, 20], [21, 21], [22, 22], [23, 23], [24, 24], [25, 25], [26, 26], [27, 27], [28, 28], [29, 29], [30, 30], [31, 31], [32, 32], [33, 33], [34, 34], [35, 35], [36, 36], [37, 37], [38, 38], [39, 39], [40, 40], [41, 41], [42, 42], [43, 43], [44, 44], [45, 45], [46, 46], [47, 47], [48, 48], [49, 49], [50, 50], [51, 51], [52, 52], [53, 53], [54, 54], [55, 55], [56, 56], [57, 57], [58, 58], [59, 59], [60, 60], [61, 61], [62, 62], [63, 63], [64, 64], [65, 65], [66, 66], [67, 67], [68, 68], [69, 69], [70, 70], [71, 71], [72, 72], [73, 73], [74, 74], [75, 75], [76, 76], [77, 77], [78, 78], [79, 79], [80, 80], [81, 81], [82, 82], [83, 83], [84, 84], [85, 85], [86, 86], [87, 87], [88, 88], [89, 89], [90, 90], [91, 91], [92, 92], [93, 93], [94, 94], [95, 95], [96, 96], [97, 97], [98, 98], [99, 99], [100, 100], [101, 101], [102, 102], [103, 103], [104, 104], [105, 105], [106, 106], [107, 107], [108, 108], [109, 109], [110, 110], [111, 111], [112, 112], [113, 113], [114, 114], [115, 115], [116, 116], [117, 117], [118, 118], [119, 119], [120, 120], [121, 121], [122, 122], [123, 123], [124, 124], [125, 125], [126, 126], [127, 127], [128, 128], [129, 129], [130, 130], [131, 131], [132, 132], [133, 133], [134, 134], [135, 135], [136, 136], [137, 137], [138, 138], [139, 139], [140, 140], [141, 141], [142, 142], [143, 143], [144, 144], [145, 145], [146, 146], [147, 147], [148, 148], [149, 149], [150, 150], [151, 151], [152, 152], [153, 153], [154, 154], [155, 155], [156, 156], [157, 157], [158, 158], [159, 159], [160, 160], [161, 161], [162, 162], [163, 163], [164, 164], [165, 165], [166, 166], [167, 167], [168, 168], [169, 169], [170, 170], [171, 171], [172, 172], [173, 173], [174, 174], [175, 175], [176, 176], [177, 177], [178, 178], [179, 179], [180, 180], [181, 181], [182, 182], [183, 183], [184, 184], [185, 185], [186, 186], [187, 187], [188, 188], [189, 189], [190, 190], [191, 191], [192, 192], [193, 193], [194, 194], [195, 195], [196, 196], [197, 197], [198, 198], [199, 199]]
-  h = Hash.new(0)
-  ary.each {|p| h[p.class] += 1}
-  assert_equal({Array=>200}, h)
-end
-
-assert("Array#rindex") do
-  class Sneaky
-    def ==(*)
-      $a.clear
-      $a.replace([1])
-      false
-    end
-  end
-  $a = [2, 3, 4, 5, 6, 7, 8, 9, 10, Sneaky.new]
-  assert_equal 0, $a.rindex(1)
-end
-
-assert('Array#freeze') do
-  a = [].freeze
-  assert_raise(RuntimeError) do
-    a[0] = 1
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/basicobject.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/basicobject.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/basicobject.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/basicobject.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-##
-# BasicObject
-
-assert('BasicObject') do
-  assert_equal(Class, BasicObject.class)
-end
-
-assert('BasicObject superclass') do
-  assert_nil(BasicObject.superclass)
-end
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_block.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_block.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_block.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_block.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,521 +0,0 @@
-##
-# Bootstrap tests for blocks
-
-assert('BS Block 1') do
-  assert_equal(1) do
-    1.times{
-      begin
-        a = 1
-      ensure
-        foo = nil
-      end
-    }
-  end
-end
-
-assert('BS Block 2') do
-  assert_equal 2, [1,2,3].find{|x| x == 2}
-end
-
-assert('BS Block 3') do
-  class E
-    include Enumerable
-    def each(&block)
-      [1, 2, 3].each(&block)
-    end
-  end
-  assert_equal 2, E.new.find {|x| x == 2 }
-end
-
-assert('BS Block 3') do
-  sum = 0
-  for x in [1, 2, 3]
-    sum += x
-  end
-  assert_equal 6, sum
-end
-
-assert('BS Block 4') do
-  sum = 0
-  for x in (1..5)
-    sum += x
-  end
-  assert_equal 15, sum
-end
-
-assert('BS Block 5') do
-  sum = 0
-  for x in []
-    sum += x
-  end
-  assert_equal 0, sum
-end
-
-assert('BS Block 6') do
-  ans = []
-  assert_equal(1) do
-    1.times{
-      for n in 1..3
-        a = n
-        ans << a
-      end
-    }
-  end
-end
-
-assert('BS Block 7') do
-  ans = []
-  assert_equal((1..3)) do
-    for m in 1..3
-      for n in 2..4
-        a = [m, n]
-        ans << a
-      end
-    end
-  end
-end
-
-assert('BS Block 8') do
-  assert_equal [1, 2, 3], (1..3).to_a
-end
-
-assert('BS Block 9') do
-  assert_equal([4, 8, 12]) do
-    (1..3).map{|e|
-      e * 4
-    }
-  end
-end
-
-assert('BS Block 10') do
-  def m
-    yield
-  end
-  def n
-    yield
-  end
-
-  assert_equal(100) do
-    m{
-      n{
-        100
-      }
-    }
-  end
-end
-
-assert('BS Block 11') do
-  def m
-    yield 1
-  end
-
-  assert_equal(20) do
-    m{|ib|
-      m{|jb|
-        i = 20
-      }
-    }
-  end
-end
-
-assert('BS Block 12') do
-  def m
-    yield 1
-  end
-
-  assert_equal(2) do
-    m{|ib|
-      m{|jb|
-        ib = 20
-        kb = 2
-      }
-    }
-  end
-end
-
-assert('BS Block 13') do
-  def iter1
-    iter2{
-      yield
-    }
-  end
-
-  def iter2
-    yield
-  end
-
-  assert_equal(3) do
-    iter1{
-      jb = 2
-      iter1{
-        jb = 3
-      }
-      jb
-    }
-  end
-end
-
-assert('BS Block 14') do
-  def iter1
-    iter2{
-      yield
-    }
-  end
-
-  def iter2
-    yield
-  end
-
-  assert_equal(2) do
-    iter1{
-      jb = 2
-      iter1{
-        jb
-      }
-      jb
-    }
-  end
-end
-
-assert('BS Block 15') do
-  def m
-    yield 1
-  end
-  assert_equal(2) do
-    m{|ib|
-      ib*2
-    }
-  end
-end
-
-assert('BS Block 16') do
-  def m
-    yield 12345, 67890
-  end
-  assert_equal(92580) do
-    m{|ib,jb|
-      ib*2+jb
-    }
-  end
-end
-
-assert('BS Block 17') do
-  def iter
-    yield 10
-  end
-
-  a = nil
-  assert_equal [10, nil] do
-    [iter{|a|
-      a
-    }, a]
-  end
-end
-
-assert('BS Block 18') do
-  def iter
-    yield 10
-  end
-
-  assert_equal(21) do
-    iter{|a|
-      iter{|a|
-        a + 1
-      } + a
-    }
-  end
-end
-
-assert('BS Block 19') do
-  def iter
-    yield 10, 20, 30, 40
-  end
-
-  a = b = c = d = nil
-  assert_equal([10, 20, 30, 40, nil, nil, nil, nil]) do
-    iter{|a, b, c, d|
-      [a, b, c, d]
-    } + [a, b, c, d]
-  end
-end
-
-assert('BS Block 20') do
-  def iter
-    yield 10, 20, 30, 40
-  end
-
-  a = b = nil
-  assert_equal([10, 20, 30, 40, nil, nil]) do
-    iter{|a, b, c, d|
-      [a, b, c, d]
-    } + [a, b]
-  end
-end
-
-assert('BS Block 21') do
-  def iter
-    yield 1, 2
-  end
-
-  assert_equal([1, [2]]) do
-    iter{|a, *b|
-      [a, b]
-    }
-  end
-end
-
-assert('BS Block 22') do
-  def iter
-    yield 1, 2
-  end
-
-  assert_equal([[1, 2]]) do
-    iter{|*a|
-      [a]
-    }
-  end
-end
-
-assert('BS Block 23') do
-  def iter
-    yield 1, 2
-  end
-
-  assert_equal([1, 2, []]) do
-    iter{|a, b, *c|
-      [a, b, c]
-    }
-  end
-end
-
-assert('BS Block 24') do
-  def m
-    yield
-  end
-  assert_equal(1) do
-    m{
-      1
-    }
-  end
-end
-
-assert('BS Block 25') do
-  def m
-    yield 123
-  end
-  assert_equal(15129) do
-    m{|ib|
-      m{|jb|
-        ib*jb
-      }
-    }
-  end
-end
-
-assert('BS Block 26') do
-  def m a
-    yield a
-  end
-  assert_equal(2) do
-    m(1){|ib|
-      m(2){|jb|
-        ib*jb
-      }
-    }
-  end
-end
-
-assert('BS Block 27') do
-  sum = 0
-  3.times{|ib|
-    2.times{|jb|
-      sum += ib + jb
-    }}
-  assert_equal sum, 9
-end
-
-assert('BS Block 28') do
-  assert_equal(10) do
-    3.times{|bl|
-      break 10
-    }
-  end
-end
-
-assert('BS Block 29') do
-  def iter
-    yield 1,2,3
-  end
-
-  assert_equal([1, 2]) do
-    iter{|i, j|
-      [i, j]
-    }
-  end
-end
-
-assert('BS Block 30') do
-  def iter
-    yield 1
-  end
-
-  assert_equal([1, nil]) do
-    iter{|i, j|
-      [i, j]
-    }
-  end
-end
-
-assert('BS Block [ruby-dev:31147]') do
-  def m
-    yield
-  end
-  assert_nil m{|&b| b}
-end
-
-assert('BS Block [ruby-dev:31160]') do
-  def m()
-    yield
-  end
-  assert_nil m {|(v,(*))|}
-end
-
-assert('BS Block [issue #750]') do
-  def m(a, *b)
-    yield
-  end
-  args = [1, 2, 3]
-  assert_equal m(*args){ 1 }, 1
-end
-
-assert('BS Block 31') do
-  def m()
-    yield
-  end
-  assert_nil m {|((*))|}
-end
-
-assert('BS Block [ruby-dev:31440]') do
-  def m
-    yield [0]
-  end
-  assert_equal m{|v, &b| v}, [0]
-end
-
-assert('BS Block 32') do
-  r = false; 1.times{|&b| r = b}
-  assert_equal NilClass, r.class
-end
-
-assert('BS Block [ruby-core:14395]') do
-  class Controller
-    def respond_to(&block)
-      responder = Responder.new
-      block.call(responder)
-      responder.respond
-    end
-    def test_for_bug
-      respond_to{|format|
-        format.js{
-          "in test"
-          render{|obj|
-            obj
-          }
-        }
-      }
-    end
-    def render(&block)
-      "in render"
-    end
-  end
-
-  class Responder
-    def method_missing(symbol, &block)
-      "enter method_missing"
-      @response = Proc.new{
-        'in method missing'
-        block.call
-      }
-      "leave method_missing"
-    end
-    def respond
-      @response.call
-    end
-  end
-  t = Controller.new
-  assert_true t.test_for_bug
-end
-
-assert("BS Block 33") do
-  module TestReturnFromNestedBlock
-    def self.test
-      1.times do
-        1.times do
-          return :ok
-        end
-      end
-      :bad
-    end
-  end
-  assert_equal :ok, TestReturnFromNestedBlock.test
-end
-
-assert("BS Block 34") do
-  module TestReturnFromNestedBlock_BSBlock34
-    def self.test
-      1.times do
-        while true
-          return :ok
-        end
-      end
-      :bad
-    end
-  end
-  assert_equal :ok, TestReturnFromNestedBlock_BSBlock34.test
-end
-
-assert("BS Block 35") do
-  module TestReturnFromNestedBlock_BSBlock35
-    def self.test
-      1.times do
-        until false
-          return :ok
-        end
-      end
-      :bad
-    end
-  end
-  assert_equal :ok, TestReturnFromNestedBlock_BSBlock35.test
-end
-
-assert('BS Block 36') do
-  def iter
-    yield 1, 2, 3, 4, 5
-  end
-
-  assert_equal([1, 2, [3, 4], 5]) do
-    iter{|a, b, *c, d|
-      [a, b, c, d]
-    }
-  end
-end
-
-assert('BS Block 37') do
-  def iter
-    yield 1, 2, 3
-  end
-
-  assert_equal([1, 2, [], 3]) do
-    iter{|a, b, *c, d|
-      [a, b, c, d]
-    }
-  end
-end
-
-assert('BS Block 38') do
-  def iter
-    yield 1,2,3,4,5,6
-  end
-
-  assert_equal [1,2,3,4,5], iter{|a,b,c=:c,d,e| [a,b,c,d,e]}
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_literal.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_literal.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_literal.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/bs_literal.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-##
-# Bootstrap test for literals
-
-assert('BS Literal 1') do
-  assert_true true
-end
-
-assert('BS Literal 2') do
-  assert_equal TrueClass, true.class
-end
-
-assert('BS Literal 3') do
-  assert_false false
-end
-
-assert('BS Literal 4') do
-  assert_equal FalseClass, false.class
-end
-
-assert('BS Literal 5') do
-  assert_equal 'nil', nil.inspect
-end
-
-assert('BS Literal 6') do
-  assert_equal NilClass, nil.class
-end
-
-assert('BS Literal 7') do
-  assert_equal Symbol, :sym.class
-end
-
-assert('BS Literal 8') do
-  assert_equal 1234, 1234
-end
-
-assert('BS Literal 9') do
-  assert_equal Fixnum, 1234.class
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/class.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/class.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/class.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/class.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,451 +0,0 @@
-##
-# Class ISO Test
-
-assert('Class', '15.2.3') do
-  assert_equal(Class, Class.class)
-end
-
-assert('Class#initialize', '15.2.3.3.1') do
-  c = Class.new do
-    def test
-      :test
-    end
-  end.new
-
-  assert_equal(c.test, :test)
-end
-
-assert('Class#initialize_copy', '15.2.3.3.2') do
-  class TestClass
-    attr_accessor :n
-    def initialize(n)
-      @n = n
-    end
-    def initialize_copy(obj)
-      @n = n
-    end
-  end
-
-  c1 = TestClass.new('Foo')
-  c2 = c1.dup
-  c3 = TestClass.new('Bar')
-
-  assert_equal(c1.n, c2.n)
-  assert_not_equal(c1.n, c3.n)
-end
-
-assert('Class#new', '15.2.3.3.3') do
-  assert_raise(TypeError, 'Singleton should raise TypeError') do
-    "a".singleton_class.new
-  end
-
-  class TestClass
-    def initialize args, &block
-      @result = if not args.nil? and block.nil?
-        # only arguments
-        :only_args
-      elsif not args.nil? and not block.nil?
-        # args and block is given
-        :args_and_block
-      else
-        # this should never happen
-        :broken
-      end
-    end
-
-    def result; @result; end
-  end
-
-  assert_equal(:only_args, TestClass.new(:arg).result)
-  # with block doesn't work yet
-end
-
-assert('Class#superclass', '15.2.3.3.4') do
-  class SubClass < String; end
-  assert_equal(String, SubClass.superclass)
-end
-
-# Not ISO specified
-
-assert('Class 1') do
-  class C1; end
-  assert_equal(Class, C1.class)
-end
-
-assert('Class 2') do
-  class C2; end
-  assert_equal(C2, C2.new.class)
-end
-
-assert('Class 3') do
-  class C3; end
-  assert_equal(Class, C3.new.class.class)
-end
-
-assert('Class 4') do
-  class C4_A; end
-  class C4 < C4_A; end
-  assert_equal(Class, C4.class)
-end
-
-assert('Class 5') do
-  class C5_A; end
-  class C5 < C5_A; end
-  assert_equal(C5, C5.new.class)
-end
-
-assert('Class 6') do
-  class C6_A; end
-  class C6 < C6_A; end
-  assert_equal(Class, C6.new.class.class)
-end
-
-assert('Class 7') do
-  class C7_A; end
-  class C7_B; end
-
-  class C7 < C7_A; end
-
-  assert_raise(TypeError) do
-    # Different superclass.
-    class C7 < C7_B; end
-  end
-end
-
-assert('Class 8') do
-  class C8_A; end
-
-  class C8; end  # superclass is Object
-
-  assert_raise(TypeError) do
-    # Different superclass.
-    class C8 < C8_A; end
-  end
-end
-
-assert('Class 9') do
-  Class9Const = "a"
-
-  assert_raise(TypeError) do
-    class Class9Const; end
-  end
-end
-
-assert('Class Module 1') do
-  module M; end
-  assert_equal(Module, M.class)
-end
-
-assert('Class Module 2') do
-  module M; end
-  class C; include M; end
-  assert_equal(C, C.new.class)
-end
-
-# nested class
-assert('Class Nested 1') do
-  class A; end
-  class A::B; end
-  assert_equal(A::B, A::B)
-end
-
-assert('Class Nested 2') do
-  class A; end
-  class A::B; end
-  assert_equal(A::B, A::B.new.class)
-end
-
-assert('Class Nested 3') do
-  class A; end
-  class A::B; end
-  assert_equal(Class, A::B.new.class.class)
-end
-
-assert('Class Nested 4') do
-  class A; end
-  class A::B; end
-  class A::B::C; end
-  assert_equal(A::B::C, A::B::C)
-end
-
-assert('Class Nested 5') do
-  class A; end
-  class A::B; end
-  class A::B::C; end
-  assert_equal(Class, A::B::C.class)
-end
-
-assert('Class Nested 6') do
-  class A; end
-  class A::B; end
-  class A::B::C; end
-  assert_equal(A::B::C, A::B::C.new.class)
-end
-
-assert('Class Nested 7') do
-  class A; end
-  class A::B; end
-  class A::B2 < A::B; end
-  assert_equal(A::B2, A::B2)
-end
-
-assert('Class Nested 8') do
-  class A; end
-  class A::B; end
-  class A::B2 < A::B; end
-  assert_equal(Class, A::B2.class)
-end
-
-assert('Class Colon 1') do
-  class A; end
-  A::C = 1
-  assert_equal(1, A::C)
-end
-
-assert('Class Colon 2') do
-  class A; class ::C; end end
-  assert_equal(C, C)
-end
-
-assert('Class Colon 3') do
-  class A; class ::C; end end
-  assert_equal(Class, C.class)
-end
-
-assert('Class Dup 1') do
-  class C; end
-  assert_equal(Class, C.dup.class)
-end
-
-assert('Class Dup 2') do
-  module M; end
-  assert_equal(Module, M.dup.class)
-end
-
-assert('Class.new') do
-  assert_equal(Class, Class.new.class)
-  a = []
-  klass = Class.new do |c|
-    a << c
-  end
-  assert_equal([klass], a)
-end
-
-assert('class to return the last value') do
-  m = class C; :m end
-  assert_equal(m, :m)
-end
-
-assert('raise when superclass is not a class') do
-  module FirstModule; end
-  assert_raise(TypeError, 'should raise TypeError') do
-    class FirstClass < FirstModule; end
-  end
-
-  class SecondClass; end
-  assert_raise(TypeError, 'should raise TypeError') do
-    class SecondClass < false; end
-  end
-
-  class ThirdClass; end
-  assert_raise(TypeError, 'should raise TypeError') do
-    class ThirdClass < ThirdClass; end
-  end
-end
-
-assert('Class#inherited') do
-  class Foo
-    @@subclass_name = nil
-    def self.inherited(subclass)
-      @@subclass_name = subclass
-    end
-    def self.subclass_name
-      @@subclass_name
-    end
-  end
-
-  assert_equal(nil, Foo.subclass_name)
-
-  class Bar < Foo
-  end
-
-  assert_equal(Bar, Foo.subclass_name)
-
-  class Baz < Bar
-  end
-
-  assert_equal(Baz, Foo.subclass_name)
-end
-
-assert('singleton tests') do
-  module FooMod
-    def run_foo_mod
-      100
-    end
-  end
-
-  bar = String.new
-
-  baz = class << bar
-    extend FooMod
-    def self.run_baz
-      200
-    end
-  end
-
-  assert_false baz.singleton_methods.include? :run_foo_mod
-  assert_false baz.singleton_methods.include? :run_baz
-
-  assert_raise(NoMethodError, 'should raise NoMethodError') do
-    baz.run_foo_mod
-  end
-  assert_raise(NoMethodError, 'should raise NoMethodError') do
-    baz.run_baz
-  end
-
-  assert_raise(NoMethodError, 'should raise NoMethodError') do
-    bar.run_foo_mod
-  end
-  assert_raise(NoMethodError, 'should raise NoMethodError') do
-    bar.run_baz
-  end
-
-  baz = class << bar
-    extend FooMod
-    def self.run_baz
-      300
-    end
-    self
-  end
-
-  assert_true baz.singleton_methods.include? :run_baz
-  assert_true baz.singleton_methods.include? :run_foo_mod
-  assert_equal 100, baz.run_foo_mod
-  assert_equal 300, baz.run_baz
-
-  assert_raise(NoMethodError, 'should raise NoMethodError') do
-    bar.run_foo_mod
-  end
-  assert_raise(NoMethodError, 'should raise NoMethodError') do
-    bar.run_baz
-  end
-
-  fv = false
-  class << fv
-    def self.run_false
-      5
-    end
-  end
-
-  nv = nil
-  class << nv
-    def self.run_nil
-      6
-    end
-  end
-
-  tv = true
-  class << tv
-    def self.run_nil
-      7
-    end
-  end
-
-  assert_raise(TypeError, 'should raise TypeError') do
-    num = 1.0
-    class << num
-      def self.run_nil
-        7
-      end
-    end
-  end
-end
-
-assert('clone Class') do
-  class Foo
-    def func
-      true
-    end
-  end
-
-  Foo.clone.new.func
-end
-
-assert('class variable and class << self style class method') do
-  class ClassVariableTest
-    @@class_variable = "value"
-    class << self
-      def class_variable
-        @@class_variable
-      end
-    end
-  end
-
-  assert_equal("value", ClassVariableTest.class_variable)
-end
-
-assert('class variable definition in singleton_class') do
-  class ClassVariableDefinitionInSingletonTest
-    class << self
-      @@class_variable = "value"
-    end
-    def class_variable
-      @@class_variable
-    end
-  end
-
-  assert_equal("value", ClassVariableDefinitionInSingletonTest.new.class_variable)
-end
-
-assert('class variable in module and class << self style class method') do
-  module ClassVariableInModuleTest
-    @@class_variable = "value"
-    class << self
-      def class_variable
-        @@class_variable
-      end
-    end
-  end
-
-  assert_equal("value", ClassVariableInModuleTest.class_variable)
-end
-
-assert('child class/module defined in singleton class get parent constant') do
-  actual = module GetParentConstantTest
-            EXPECT = "value"
-            class << self
-              class CHILD
-                class << self
-                    EXPECT
-                end
-              end
-            end
-          end
-  assert_equal("value", actual)
-end
-
-assert('overriding class variable with a module (#3235)') do
-  module ModuleWithCVar
-    @@class_variable = 1
-  end
-  class CVarOverrideTest
-    @@class_variable = 2
-    include ModuleWithCVar
-
-    assert_equal(1, @@class_variable)
-  end
-end
-
-assert('class with non-class/module outer raises TypeError') do
-  assert_raise(TypeError) { class 0::C1; end }
-  assert_raise(TypeError) { class []::C2; end }
-end
-
-assert("remove_method doesn't segfault if the passed in argument isn't a symbol") do
-  klass = Class.new
-  assert_raise(TypeError) { klass.remove_method nil }
-  assert_raise(TypeError) { klass.remove_method 123 }
-  assert_raise(TypeError) { klass.remove_method 1.23 }
-  assert_raise(NameError) { klass.remove_method "hello" }
-  assert_raise(TypeError) { klass.remove_method Class.new }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/codegen.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/codegen.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/codegen.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/codegen.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-##
-# Codegen tests
-
-assert('peephole optimization does not eliminate move whose result is reused') do
-  assert_raise LocalJumpError do
-    def method
-      yield
-    end
-    method(&a &&= 0)
-  end
-end
-
-assert('empty condition in ternary expression parses correctly') do
-  assert_equal(() ? 1 : 2, 2)
-end
-
-assert('method call with exactly 127 arguments') do
-  def args_to_ary(*args)
-    args
-  end
-
-  assert_equal [0]*127, args_to_ary(
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, \
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-  )
-end
-
-assert('nested empty heredoc') do
-  _, a = nil, <<B
-#{<<A}
-A
-B
-  assert_equal "\n", a
-end
-
-assert('splat in case splat') do
-  a = *case
-    when 0
-      * = 1
-  end
-
-  assert_equal [1], a
-end
-
-assert('undef with 127 or more arguments') do
-  assert_raise NameError do
-    undef
-      a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,
-      a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,
-      a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,
-      a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a, a
-  end
-end
-
-assert('next in normal loop with 127 arguments') do
-  assert_raise NameError do
-    while true
-      next A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A,A
-    end
-  end
-end
-
-assert('negate literal register alignment') do
-  a = *case
-  when 0
-    -0.0
-    2
-  end
-
-  assert_equal [2], a
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/comparable.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/comparable.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/comparable.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/comparable.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-
-assert('Comparable#<', '15.3.3.2.1') do
-  class Foo
-    include Comparable
-    def <=>(x)
-      x
-    end
-  end
-  assert_false(Foo.new < 0)
-  assert_false(Foo.new < 1)
-  assert_true(Foo.new < -1)
-  assert_raise(ArgumentError){ Foo.new < nil }
-end
-
-assert('Comparable#<=', '15.3.3.2.2') do
-  class Foo
-    include Comparable
-    def <=>(x)
-      x
-    end
-  end
-  assert_true(Foo.new <= 0)
-  assert_false(Foo.new <= 1)
-  assert_true(Foo.new <= -1)
-  assert_raise(ArgumentError){ Foo.new <= nil }
-end
-
-assert('Comparable#==', '15.3.3.2.3') do
-  class Foo
-    include Comparable
-    def <=>(x)
-      0
-    end
-  end
-
-  assert_true(Foo.new == Foo.new)
-end
-
-assert('Comparable#>', '15.3.3.2.4') do
-  class Foo
-    include Comparable
-    def <=>(x)
-      x
-    end
-  end
-  assert_false(Foo.new > 0)
-  assert_true(Foo.new > 1)
-  assert_false(Foo.new > -1)
-  assert_raise(ArgumentError){ Foo.new > nil }
-end
-
-assert('Comparable#>=', '15.3.3.2.5') do
-  class Foo
-    include Comparable
-    def <=>(x)
-      x
-    end
-  end
-  assert_true(Foo.new >= 0)
-  assert_true(Foo.new >= 1)
-  assert_false(Foo.new >= -1)
-  assert_raise(ArgumentError){ Foo.new >= nil }
-end
-
-assert('Comparable#between?', '15.3.3.2.6') do
-  class Foo
-    include Comparable
-    def <=>(x)
-      x
-    end
-  end
-
-  c = Foo.new
-
-  assert_false(c.between?(-1,  1))
-  assert_false(c.between?(-1, -1))
-  assert_false(c.between?( 1,  1))
-  assert_true(c.between?( 1, -1))
-  assert_true(c.between?(0, 0))
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/ensure.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/ensure.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/ensure.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/ensure.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-##
-# ensure Test
-
-assert('ensure - context - yield') do
-  class EnsureYieldBreak
-    attr_reader :ensure_context
-    def try
-      yield
-    ensure
-      @ensure_context = self
-    end
-  end
-
-  yielder = EnsureYieldBreak.new
-  yielder.try do
-  end
-  assert_equal yielder, yielder.ensure_context
-end
-
-assert('ensure - context - yield and break') do
-  class EnsureYieldBreak
-    attr_reader :ensure_context
-    def try
-      yield
-    ensure
-      @ensure_context = self
-    end
-  end
-
-  yielder = EnsureYieldBreak.new
-  yielder.try do
-    break
-  end
-  assert_equal yielder, yielder.ensure_context
-end
-
-assert('ensure - context - yield and return') do
-  class EnsureYieldBreak
-    attr_reader :ensure_context
-    def try
-      yield
-    ensure
-      @ensure_context = self
-    end
-  end
-
-  yielder = EnsureYieldBreak.new
-  lambda do
-    yielder.try do
-      return
-    end
-  end.call
-  assert_equal yielder, yielder.ensure_context
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/enumerable.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/enumerable.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/enumerable.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/enumerable.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-##
-# Enumerable ISO Test
-
-assert('Enumerable', '15.3.2') do
-  assert_equal(Module, Enumerable.class)
-end
-
-assert('Enumerable#all?', '15.3.2.2.1') do
-  assert_true([1,2,3].all?)
-  assert_false([1,false,3].all?)
-
-  a = [2,4,6]
-  all = a.all? do |e|
-    e % 2 == 0
-  end
-  assert_true(all)
-
-  a = [2,4,7]
-  all = a.all? do |e|
-    e % 2 == 0
-  end
-  assert_false(all)
-end
-
-assert('Enumerable#any?', '15.3.2.2.2') do
-  assert_true([false,true,false].any?)
-  assert_false([false,false,false].any?)
-
-  a = [1,3,6]
-  any = a.any? do |e|
-    e % 2 == 0
-  end
-  assert_true(any)
-
-  a = [1,3,5]
-  any = a.any? do |e|
-    e % 2 == 0
-  end
-  assert_false(any)
-end
-
-assert('Enumerable#collect', '15.3.2.2.3') do
-  assert_true [1,2,3].collect { |i| i + i } == [2,4,6]
-end
-
-assert('Enumerable#detect', '15.3.2.2.4') do
-  assert_equal 1, [1,2,3].detect() { true }
-  assert_equal 'a', [1,2,3].detect("a") { false }
-end
-
-assert('Array#each_with_index', '15.3.2.2.5') do
-  a = nil
-  b = nil
-
-  [1].each_with_index {|e,i| a = e; b = i}
-
-  assert_equal(1, a)
-  assert_equal(0, b)
-end
-
-assert('Enumerable#entries', '15.3.2.2.6') do
-  assert_equal([1], [1].entries)
-end
-
-assert('Enumerable#find', '15.3.2.2.7') do
-  assert_equal 1, [1,2,3].find() { true }
-  assert_equal 'a', [1,2,3].find("a") { false }
-end
-
-assert('Enumerable#find_all', '15.3.2.2.8') do
-  assert_true [1,2,3,4,5,6,7,8,9].find_all() {|i| i%2 == 0}, [2,4,6,8]
-end
-
-assert('Enumerable#grep', '15.3.2.2.9') do
-  assert_equal [4,5,6], [1,2,3,4,5,6,7,8,9].grep(4..6)
-end
-
-assert('Enumerable#include?', '15.3.2.2.10') do
-  assert_true [1,2,3,4,5,6,7,8,9].include?(5)
-  assert_false [1,2,3,4,5,6,7,8,9].include?(0)
-end
-
-assert('Enumerable#inject', '15.3.2.2.11') do
-  assert_equal 21, [1,2,3,4,5,6].inject() {|s, n| s + n}
-  assert_equal 22, [1,2,3,4,5,6].inject(1) {|s, n| s + n}
-end
-
-assert('Enumerable#map', '15.3.2.2.12') do
-  assert_equal [2,4,6], [1,2,3].map { |i| i + i }
-end
-
-assert('Enumerable#max', '15.3.2.2.13') do
-  a = ['aaa', 'bb', 'c']
-  assert_equal 'c', a.max
-  assert_equal 'aaa', a.max {|i1,i2| i1.length <=> i2.length}
-end
-
-assert('Enumerable#min', '15.3.2.2.14') do
-  a = ['aaa', 'bb', 'c']
-  assert_equal 'aaa', a.min
-  assert_equal 'c', a.min {|i1,i2| i1.length <=> i2.length}
-end
-
-assert('Enumerable#member?', '15.3.2.2.15') do
-  assert_true [1,2,3,4,5,6,7,8,9].member?(5)
-  assert_false [1,2,3,4,5,6,7,8,9].member?(0)
-end
-
-assert('Enumerable#partition', '15.3.2.2.16') do
-  partition = [0,1,2,3,4,5,6,7,8,9].partition do |i|
-    i % 2 == 0
-  end
-  assert_equal [[0,2,4,6,8], [1,3,5,7,9]], partition
-end
-
-assert('Enumerable#reject', '15.3.2.2.17') do
-  reject = [0,1,2,3,4,5,6,7,8,9].reject do |i|
-    i % 2 == 0
-  end
-  assert_equal [1,3,5,7,9], reject
-end
-
-assert('Enumerable#select', '15.3.2.2.18') do
-  assert_equal [2,4,6,8], [1,2,3,4,5,6,7,8,9].select() {|i| i%2 == 0}
-end
-
-assert('Enumerable#sort', '15.3.2.2.19') do
-  assert_equal [1,2,3,4,6,7], [7,3,1,2,6,4].sort
-  assert_equal [7,6,4,3,2,1], [7,3,1,2,6,4].sort {|e1,e2|e2<=>e1}
-end
-
-assert('Enumerable#to_a', '15.3.2.2.20') do
-  assert_equal [1], [1].to_a
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/exception.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/exception.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/exception.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/exception.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,422 +0,0 @@
-##
-# Exception ISO Test
-
-assert('Exception', '15.2.22') do
-  assert_equal Class, Exception.class
-end
-
-assert('Exception.exception', '15.2.22.4.1') do
-  e = Exception.exception('a')
-
-  assert_equal Exception, e.class
-end
-
-assert('Exception#exception', '15.2.22.5.1') do
-  e = Exception.new
-  re = RuntimeError.new
-  assert_equal e, e.exception
-  assert_equal e, e.exception(e)
-  assert_equal re, re.exception(re)
-  changed_re = re.exception('message has changed')
-  assert_not_equal re, changed_re
-  assert_equal 'message has changed', changed_re.message
-end
-
-assert('Exception#message', '15.2.22.5.2') do
-  e = Exception.exception('a')
-
-  assert_equal 'a', e.message
-end
-
-assert('Exception#to_s', '15.2.22.5.3') do
-  e = Exception.exception('a')
-
-  assert_equal 'a', e.to_s
-end
-
-assert('Exception.exception', '15.2.22.4.1') do
-  e = Exception.exception()
-  e.initialize('a')
-
-  assert_equal 'a', e.message
-end
-
-assert('NameError', '15.2.31') do
-  assert_raise(NameError) do
-    raise NameError.new
-  end
-
-  e = NameError.new "msg", "name"
-  assert_equal "msg", e.message
-  assert_equal "name", e.name
-end
-
-assert('ScriptError', '15.2.37') do
-  assert_raise(ScriptError) do
-    raise ScriptError.new
-  end
-end
-
-assert('SyntaxError', '15.2.38') do
-  assert_raise(SyntaxError) do
-    raise SyntaxError.new
-  end
-end
-
-# Not ISO specified
-
-assert('Exception 1') do
-r=begin
-    1+1
-  ensure
-    2+2
-  end
-  assert_equal 2, r
-end
-
-assert('Exception 2') do
-r=begin
-    1+1
-    begin
-      2+2
-    ensure
-      3+3
-    end
-  ensure
-    4+4
-  end
-  assert_equal 4, r
-end
-
-assert('Exception 3') do
-r=begin
-    1+1
-    begin
-      2+2
-    ensure
-      3+3
-    end
-  ensure
-    4+4
-    begin
-      5+5
-    ensure
-      6+6
-    end
-  end
-  assert_equal 4, r
-end
-
-assert('Exception 4') do
-  a = nil
-  1.times{|e|
-    begin
-    rescue => err
-    end
-    a = err.class
-  }
-  assert_equal NilClass, a
-end
-
-assert('Exception 5') do
-  $ans = []
-  def m
-    $!
-  end
-  def m2
-    1.times{
-      begin
-        return
-      ensure
-        $ans << m
-      end
-    }
-  end
-  m2
-  assert_equal [nil], $ans
-end
-
-assert('Exception 6') do
-  $i = 0
-  def m
-    iter{
-      begin
-        $i += 1
-        begin
-          $i += 2
-          break
-        ensure
-
-        end
-      ensure
-        $i += 4
-      end
-      $i = 0
-    }
-  end
-
-  def iter
-    yield
-  end
-  m
-  assert_equal 7, $i
-end
-
-assert('Exception 7') do
-  $i = 0
-  def m
-    begin
-      $i += 1
-      begin
-        $i += 2
-        return
-      ensure
-        $i += 3
-      end
-    ensure
-      $i += 4
-    end
-    p :end
-  end
-  m
-  assert_equal 10, $i
-end
-
-assert('Exception 8') do
-r=begin
-    1
-  rescue
-    2
-  else
-    3
-  end
-  assert_equal 3, r
-end
-
-assert('Exception 9') do
-r=begin
-    1+1
-  rescue
-    2+2
-  else
-    3+3
-  ensure
-    4+4
-  end
-  assert_equal 6, r
-end
-
-assert('Exception 10') do
-r=begin
-    1+1
-    begin
-      2+2
-    rescue
-      3+3
-    else
-      4+4
-    end
-  rescue
-    5+5
-  else
-    6+6
-  ensure
-    7+7
-  end
-  assert_equal 12, r
-end
-
-assert('Exception 11') do
-  a = :ok
-  begin
-    begin
-      raise Exception
-    rescue
-      a = :ng
-    end
-  rescue Exception
-  end
-  assert_equal :ok, a
-end
-
-assert('Exception 12') do
-  a = :ok
-  begin
-    raise Exception rescue a = :ng
-  rescue Exception
-  end
-  assert_equal :ok, a
-end
-
-assert('Exception 13') do
-  a = :ng
-  begin
-    raise StandardError
-  rescue TypeError, ArgumentError
-    a = :ng
-  rescue
-    a = :ok
-  else
-    a = :ng
-  end
-  assert_equal :ok, a
-end
-
-assert('Exception 14') do
-  def exception_test14; UnknownConstant; end
-  a = :ng
-  begin
-    send(:exception_test14)
-  rescue
-    a = :ok
-  end
-
-  assert_equal :ok, a
-end
-
-assert('Exception 15') do
-  a = begin
-        :ok
-      rescue
-        :ko
-      end
-  assert_equal :ok, a
-end
-
-assert('Exception 16') do
-  begin
-    raise "foo"
-    false
-  rescue => e
-    assert_equal "foo", e.message
-  end
-end
-
-assert('Exception 17') do
-r=begin
-    raise "a"  # RuntimeError
-  rescue ArgumentError
-    1
-  rescue StandardError
-    2
-  else
-    3
-  ensure
-    4
-  end
-  assert_equal 2, r
-end
-
-assert('Exception 18') do
-r=begin
-    0
-  rescue ArgumentError
-    1
-  rescue StandardError
-    2
-  else
-    3
-  ensure
-    4
-  end
-  assert_equal 3, r
-end
-
-assert('Exception 19') do
-  class Class4Exception19
-    def a
-      r = @e = false
-      begin
-        b
-      rescue TypeError
-        r = self.z
-      end
-      [ r, @e ]
-    end
-
-    def b
-      begin
-        1 * "b"
-      ensure
-        @e = self.zz
-      end
-    end
-
-    def zz
-      true
-    end
-    def z
-      true
-    end
-  end
-  assert_equal [true, true], Class4Exception19.new.a
-end
-
-assert('Exception#inspect without message') do
-  assert_equal "Exception", Exception.new.inspect
-end
-
-assert('Exception#backtrace') do
-  assert_nothing_raised do
-    begin
-      raise "get backtrace"
-    rescue => e
-      e.backtrace
-    end
-  end
-end
-
-assert('Raise in ensure') do
-  assert_raise(ArgumentError) do
-    begin
-      raise "" # RuntimeError
-    ensure
-      raise ArgumentError
-    end
-  end
-end
-
-def backtrace_available?
-  begin
-    raise "XXX"
-  rescue => exception
-    not exception.backtrace.empty?
-  end
-end
-
-assert('GC in rescue') do
-  skip "backtrace isn't available" unless backtrace_available?
-
-  line = nil
-  begin
-    [1].each do
-      [2].each do
-        [3].each do
-          line = __LINE__; raise "XXX"
-        end
-      end
-    end
-  rescue => exception
-    GC.start
-    assert_equal("#{__FILE__}:#{line}:in call",
-                 exception.backtrace.first)
-  end
-end
-
-assert('Method call in rescue') do
-  skip "backtrace isn't available" unless backtrace_available?
-
-  line = nil
-  begin
-    [1].each do
-      [2].each do
-        line = __LINE__; raise "XXX"
-      end
-    end
-  rescue => exception
-    [3].each do
-    end
-    assert_equal("#{__FILE__}:#{line}:in call",
-                 exception.backtrace.first)
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/false.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/false.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/false.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/false.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-##
-# FalseClass ISO Test
-
-assert('FalseClass', '15.2.6') do
-  assert_equal Class, FalseClass.class
-end
-
-assert('FalseClass false', '15.2.6.1') do
-  assert_false false
-  assert_equal FalseClass, false.class
-  assert_false FalseClass.method_defined? :new
-end
-
-assert('FalseClass#&', '15.2.6.3.1') do
-  assert_false false.&(true)
-  assert_false false.&(false)
-end
-
-assert('FalseClass#^', '15.2.6.3.2') do
-  assert_true false.^(true)
-  assert_false false.^(false)
-end
-
-assert('FalseClass#to_s', '15.2.6.3.3') do
-  assert_equal 'false', false.to_s
-end
-
-assert('FalseClass#|', '15.2.6.3.4') do
-  assert_true false.|(true)
-  assert_false false.|(false)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/float.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/float.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/float.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/float.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-##
-# Float ISO Test
-
-assert('Float', '15.2.9') do
-  assert_equal Class, Float.class
-end
-
-assert('Float#+', '15.2.9.3.1') do
-  a = 3.123456788 + 0.000000001
-  b = 3.123456789 + 1
-
-  assert_float(3.123456789, a)
-  assert_float(4.123456789, b)
-
-  assert_raise(TypeError){ 0.0+nil }
-  assert_raise(TypeError){ 1.0+nil }
-end
-
-assert('Float#-', '15.2.9.3.2') do
-  a = 3.123456790 - 0.000000001
-  b = 5.123456789 - 1
-
-  assert_float(3.123456789, a)
-  assert_float(4.123456789, b)
-end
-
-assert('Float#*', '15.2.9.3.3') do
-  a = 3.125 * 3.125
-  b = 3.125 * 1
-
-  assert_float(9.765625, a)
-  assert_float(3.125   , b)
-end
-
-assert('Float#/', '15.2.9.3.4') do
-  a = 3.123456789 / 3.123456789
-  b = 3.123456789 / 1
-
-  assert_float(1.0        , a)
-  assert_float(3.123456789, b)
-end
-
-assert('Float#%', '15.2.9.3.5') do
-  a = 3.125 % 3.125
-  b = 3.125 % 1
-
-  assert_float(0.0  , a)
-  assert_float(0.125, b)
-end
-
-assert('Float#<=>', '15.2.9.3.6') do
-  a = 3.125 <=> 3.123
-  b = 3.125 <=> 3.125
-  c = 3.125 <=> 3.126
-  a2 = 3.125 <=> 3
-  c2 = 3.125 <=> 4
-
-  assert_equal( 1, a)
-  assert_equal( 0, b)
-  assert_equal(-1, c)
-  assert_equal( 1, a2)
-  assert_equal(-1, c2)
-end
-
-assert('Float#==', '15.2.9.3.7') do
-  assert_true 3.1 == 3.1
-  assert_false 3.1 == 3.2
-end
-
-assert('Float#ceil', '15.2.9.3.8') do
-  a = 3.123456789.ceil
-  b = 3.0.ceil
-  c = -3.123456789.ceil
-  d = -3.0.ceil
-
-  assert_equal( 4, a)
-  assert_equal( 3, b)
-  assert_equal(-3, c)
-  assert_equal(-3, d)
-end
-
-assert('Float#finite?', '15.2.9.3.9') do
-  assert_true 3.123456789.finite?
-  assert_false (1.0 / 0.0).finite?
-end
-
-assert('Float#floor', '15.2.9.3.10') do
-  a = 3.123456789.floor
-  b = 3.0.floor
-  c = -3.123456789.floor
-  d = -3.0.floor
-
-  assert_equal( 3, a)
-  assert_equal( 3, b)
-  assert_equal(-4, c)
-  assert_equal(-3, d)
-end
-
-assert('Float#infinite?', '15.2.9.3.11') do
-  a = 3.123456789.infinite?
-  b = (1.0 / 0.0).infinite?
-  c = (-1.0 / 0.0).infinite?
-
-  assert_nil a
-  assert_equal( 1, b)
-  assert_equal(-1, c)
-end
-
-assert('Float#round', '15.2.9.3.12') do
-  a = 3.123456789.round
-  b = 3.5.round
-  c = 3.4999.round
-  d = (-3.123456789).round
-  e = (-3.5).round
-  f = 12345.67.round(-1)
-  g = 3.423456789.round(0)
-  h = 3.423456789.round(1)
-  i = 3.423456789.round(3)
-
-  assert_equal(    3, a)
-  assert_equal(    4, b)
-  assert_equal(    3, c)
-  assert_equal(   -3, d)
-  assert_equal(   -4, e)
-  assert_equal(12350, f)
-  assert_equal(    3, g)
-  assert_float(  3.4, h)
-  assert_float(3.423, i)
-
-  assert_equal(42.0, 42.0.round(307))
-  assert_equal(1.0e307, 1.0e307.round(2))
-
-  inf = 1.0/0.0
-  assert_raise(FloatDomainError){ inf.round }
-  assert_raise(FloatDomainError){ inf.round(-1) }
-  assert_equal(inf, inf.round(1))
-  nan = 0.0/0.0
-  assert_raise(FloatDomainError){ nan.round }
-  assert_raise(FloatDomainError){ nan.round(-1) }
-  assert_true(nan.round(1).nan?)
-end
-
-assert('Float#to_f', '15.2.9.3.13') do
-  a = 3.123456789
-
-  assert_float(a, a.to_f)
-end
-
-assert('Float#to_i', '15.2.9.3.14') do
-  assert_equal(3, 3.123456789.to_i)
-  assert_raise(FloatDomainError) { Float::INFINITY.to_i }
-  assert_raise(FloatDomainError) { (-Float::INFINITY).to_i }
-  assert_raise(FloatDomainError) { Float::NAN.to_i }
-end
-
-assert('Float#truncate', '15.2.9.3.15') do
-  assert_equal( 3,  3.123456789.truncate)
-  assert_equal(-3, -3.1.truncate)
-end
-
-assert('Float#divmod') do
-  def check_floats exp, act
-    assert_float exp[0], act[0]
-    assert_float exp[1], act[1]
-  end
-
-  # Note: quotients are Float because mruby does not have Bignum.
-  check_floats [ 0,  0.0],   0.0.divmod(1)
-  check_floats [ 0,  1.1],   1.1.divmod(3)
-  check_floats [ 3,  0.2],   3.2.divmod(1)
-  check_floats [ 2,  6.3],  20.3.divmod(7)
-  check_floats [-1,  1.6],  -3.4.divmod(5)
-  check_floats [-2, -0.5],  25.5.divmod(-13)
-  check_floats [ 1, -6.6], -13.6.divmod(-7)
-  check_floats [ 3,  0.2],   9.8.divmod(3.2)
-end
-
-assert('Float#nan?') do
-  assert_true (0.0/0.0).nan?
-  assert_false 0.0.nan?
-  assert_false (1.0/0.0).nan?
-  assert_false (-1.0/0.0).nan?
-end
-
-assert('Float#<<') do
-  # Left Shift by one
-  assert_equal 46, 23.0 << 1
-
-  # Left Shift by a negative is Right Shift
-  assert_equal 23, 46.0 << -1
-end
-
-assert('Float#>>') do
-  # Right Shift by one
-  assert_equal 23, 46.0 >> 1
-
-  # Right Shift by a negative is Left Shift
-  assert_equal 46, 23.0 >> -1
-
-  # Don't raise on large Right Shift
-  assert_equal 0, 23.0 >> 128
-
-  # Don't raise on large Right Shift
-  assert_equal(-1, -23.0 >> 128)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/gc.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/gc.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/gc.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/gc.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-# Not ISO specified
-
-assert('GC.enable') do
-  assert_false GC.disable
-  assert_true GC.enable
-  assert_false GC.enable
-end
-
-assert('GC.disable') do
-  begin
-    assert_false GC.disable
-    assert_true GC.disable
-  ensure
-    GC.enable
-  end
-end
-
-assert('GC.interval_ratio=') do
-  origin = GC.interval_ratio
-  begin
-    assert_equal 150, (GC.interval_ratio = 150)
-  ensure
-    GC.interval_ratio = origin
-  end
-end
-
-assert('GC.step_ratio=') do
-  origin = GC.step_ratio
-  begin
-    assert_equal 150, (GC.step_ratio = 150)
-  ensure
-    GC.step_ratio = origin
-  end
-end
-
-assert('GC.generational_mode=') do
-  origin = GC.generational_mode
-  begin
-    assert_false (GC.generational_mode = false)
-    assert_true (GC.generational_mode = true)
-    assert_true (GC.generational_mode = true)
-  ensure
-    GC.generational_mode = origin
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/hash.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/hash.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/hash.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/hash.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,375 +0,0 @@
-##
-# Hash ISO Test
-
-assert('Hash', '15.2.13') do
-  assert_equal Class, Hash.class
-end
-
-assert('Hash#==', '15.2.13.4.1') do
-  assert_true({ 'abc' => 'abc' } == { 'abc' => 'abc' })
-  assert_false({ 'abc' => 'abc' } ==  { 'cba' => 'cba' })
-  assert_true({ :equal => 1 } == { :equal => 1.0 })
-  assert_false({ :a => 1 } == true)
-end
-
-assert('Hash#[]', '15.2.13.4.2') do
-  a = { 'abc' => 'abc' }
-
-  assert_equal 'abc', a['abc']
-
-  # Hash#[] should call #default (#3272)
-  hash = {}
-  def hash.default(k); self[k] = 1; end
-  hash[:foo] += 1
-
-  assert_equal 2, hash[:foo]
-end
-
-assert('Hash#[]=', '15.2.13.4.3') do
-  a = Hash.new
-  a['abc'] = 'abc'
-
-  assert_equal 'abc', a['abc']
-end
-
-assert('Hash#clear', '15.2.13.4.4') do
-  a = { 'abc' => 'abc' }
-  a.clear
-
-  assert_equal({ }, a)
-end
-
-assert('Hash#dup') do
-  a = { 'a' => 1 }
-  b = a.dup
-  a['a'] = 2
-  assert_equal({'a' => 1}, b)
-
-  c = Hash.new { |h, k| h[k] = k.upcase }
-  d = c.dup
-  assert_equal("FOO", d["foo"])
-end
-
-assert('Hash#default', '15.2.13.4.5') do
-  a = Hash.new
-  b = Hash.new('abc')
-  c = Hash.new {|s,k| s[k] = k}
-
-  assert_nil a.default
-  assert_equal 'abc', b.default
-  assert_nil c.default
-  assert_equal 'abc', c.default('abc')
-end
-
-assert('Hash#default=', '15.2.13.4.6') do
-  a = { 'abc' => 'abc' }
-  a.default = 'cba'
-
-  assert_equal 'abc', a['abc']
-  assert_equal 'cba', a['notexist']
-end
-
-assert('Hash#default_proc', '15.2.13.4.7') do
-  a = Hash.new
-  b = Hash.new {|s,k| s[k] = k + k}
-  c = b[2]
-  d = b['cat']
-
-  assert_nil a.default_proc
-  assert_equal Proc, b.default_proc.class
-  assert_equal 4, c
-  assert_equal 'catcat', d
-end
-
-assert('Hash#delete', '15.2.13.4.8') do
-  a = { 'abc' => 'abc' }
-  b = { 'abc' => 'abc' }
-  b_tmp_1 = false
-  b_tmp_2 = false
-
-  a.delete('abc')
-  b.delete('abc') do |k|
-    b_tmp_1 = true
-  end
-  b.delete('abc') do |k|
-    b_tmp_2 = true
-  end
-
-  assert_nil a.delete('cba')
-  assert_false a.has_key?('abc')
-  assert_false b_tmp_1
-  assert_true b_tmp_2
-end
-
-assert('Hash#each', '15.2.13.4.9') do
-  a = { 'abc_key' => 'abc_value' }
-  key = nil
-  value = nil
-
-  a.each  do |k,v|
-    key = k
-    value = v
-  end
-
-  assert_equal 'abc_key', key
-  assert_equal 'abc_value', value
-end
-
-assert('Hash#each_key', '15.2.13.4.10') do
-  a = { 'abc_key' => 'abc_value' }
-  key = nil
-
-  a.each_key  do |k|
-    key = k
-  end
-
-  assert_equal 'abc_key', key
-end
-
-assert('Hash#each_value', '15.2.13.4.11') do
-  a = { 'abc_key' => 'abc_value' }
-  value = nil
-
-  a.each_value  do |v|
-    value = v
-  end
-
-  assert_equal 'abc_value', value
-end
-
-assert('Hash#empty?', '15.2.13.4.12') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_false a.empty?
-  assert_true b.empty?
-end
-
-assert('Hash#has_key?', '15.2.13.4.13') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.has_key?('abc_key')
-  assert_false b.has_key?('cba')
-end
-
-assert('Hash#has_value?', '15.2.13.4.14') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.has_value?('abc_value')
-  assert_false b.has_value?('cba')
-end
-
-assert('Hash#include?', '15.2.13.4.15') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.include?('abc_key')
-  assert_false b.include?('cba')
-end
-
-assert('Hash#initialize', '15.2.13.4.16') do
-  # Testing initialize by new.
-  h = Hash.new
-  h2 = Hash.new(:not_found)
-
-  assert_true h.is_a? Hash
-  assert_equal({ }, h)
-  assert_nil h["hello"]
-  assert_equal :not_found, h2["hello"]
-end
-
-assert('Hash#initialize_copy', '15.2.13.4.17') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new.initialize_copy(a)
-
-  assert_equal({ 'abc_key' => 'abc_value' }, b)
-end
-
-assert('Hash#key?', '15.2.13.4.18') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.key?('abc_key')
-  assert_false b.key?('cba')
-end
-
-assert('Hash#keys', '15.2.13.4.19') do
-  a = { 'abc_key' => 'abc_value' }
-
-  assert_equal ['abc_key'], a.keys
-end
-
-assert('Hash#length', '15.2.13.4.20') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_equal 1, a.length
-  assert_equal 0, b.length
-end
-
-assert('Hash#member?', '15.2.13.4.21') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.member?('abc_key')
-  assert_false b.member?('cba')
-end
-
-assert('Hash#merge', '15.2.13.4.22') do
-  a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
-  b = { 'cba_key' => 'XXX',  'xyz_key' => 'xyz_value' }
-
-  result_1 = a.merge b
-  result_2 = a.merge(b) do |key, original, new|
-    original
-  end
-
-  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'XXX',
-                'xyz_key' => 'xyz_value' }, result_1)
-  assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'cba_value',
-                'xyz_key' => 'xyz_value' }, result_2)
-
-  assert_raise(TypeError) do
-    { 'abc_key' => 'abc_value' }.merge "a"
-  end
-end
-
-assert('Hash#replace', '15.2.13.4.23') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new.replace(a)
-
-  assert_equal({ 'abc_key' => 'abc_value' }, b)
-
-  a = Hash.new(42)
-  b = {}
-  b.replace(a)
-  assert_equal(42, b[1])
-
-  a = Hash.new{|h,x| x}
-  b.replace(a)
-  assert_equal(127, b[127])
-
-   assert_raise(TypeError) do
-    { 'abc_key' => 'abc_value' }.replace "a"
-  end
-end
-
-assert('Hash#shift', '15.2.13.4.24') do
-  a = { 'abc_key' => 'abc_value', 'cba_key' => 'cba_value' }
-  b = a.shift
-
-  assert_equal Array, b.class
-  assert_equal 2, b.size
-  assert_equal 1, a.size
-
-  b = a.shift
-
-  assert_equal Array, b.class
-  assert_equal 2, b.size
-  assert_equal 0, a.size
-end
-
-assert('Hash#size', '15.2.13.4.25') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_equal 1, a.size
-  assert_equal 0, b.size
-end
-
-assert('Hash#store', '15.2.13.4.26') do
-  a = Hash.new
-  a.store('abc', 'abc')
-
-  assert_equal 'abc', a['abc']
-end
-
-assert('Hash#value?', '15.2.13.4.27') do
-  a = { 'abc_key' => 'abc_value' }
-  b = Hash.new
-
-  assert_true a.value?('abc_value')
-  assert_false b.value?('cba')
-end
-
-assert('Hash#values', '15.2.13.4.28') do
-  a = { 'abc_key' => 'abc_value' }
-
-  assert_equal ['abc_value'], a.values
-end
-
-# Not ISO specified
-
-assert('Hash#eql?') do
-  a = { 'a' => 1, 'b' => 2, 'c' => 3 }
-  b = { 'a' => 1, 'b' => 2, 'c' => 3 }
-  c = { 'a' => 1.0, 'b' => 2, 'c' => 3 }
-  assert_true(a.eql?(b))
-  assert_false(a.eql?(c))
-  assert_false(a.eql?(true))
-end
-
-assert('Hash#reject') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.reject do |k,v|
-    v % 2 == 0
-  end
-  assert_equal({:one => 1, :three => 3}, ret)
-  assert_equal({:one => 1, :two => 2, :three => 3, :four => 4}, h)
-end
-
-assert('Hash#reject!') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.reject! do |k,v|
-    v % 2 == 0
-  end
-  assert_equal({:one => 1, :three => 3}, ret)
-  assert_equal({:one => 1, :three => 3}, h)
-end
-
-assert('Hash#select') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.select do |k,v|
-    v % 2 == 0
-  end
-  assert_equal({:two => 2, :four => 4}, ret)
-  assert_equal({:one => 1, :two => 2, :three => 3, :four => 4}, h)
-end
-
-assert('Hash#select!') do
-  h = {:one => 1, :two => 2, :three => 3, :four => 4}
-  ret = h.select! do |k,v|
-    v % 2 == 0
-  end
-  assert_equal({:two => 2, :four => 4}, ret)
-  assert_equal({:two => 2, :four => 4}, h)
-end
-
-# Not ISO specified
-
-assert('Hash#inspect') do
-  h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
-  ret = h.to_s
-
-  assert_include ret, '"c"=>300'
-  assert_include ret, '"a"=>100'
-  assert_include ret, '"d"=>400'
-end
-
-assert('Hash#rehash') do
-  h = {[:a] => "b"}
-  # hash key modified
-  h.keys[0][0] = :b
-  # h[[:b]] => nil
-  h.rehash
-  assert_equal("b", h[[:b]])
-end
-
-assert('Hash#freeze') do
-  h = {}.freeze
-  assert_raise(RuntimeError) do
-    h[:a] = 'b'
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/indexerror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/indexerror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/indexerror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/indexerror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-##
-# IndexError ISO Test
-
-assert('IndexError', '15.2.33') do
-  assert_equal Class, IndexError.class
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/integer.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/integer.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/integer.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/integer.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-##
-# Integer ISO Test
-
-assert('Integer', '15.2.8') do
-  assert_equal Class, Integer.class
-end
-
-assert('Integer#+', '15.2.8.3.1') do
-  a = 1+1
-  b = 1+1.0
-
-  assert_equal 2, a
-  assert_equal 2.0, b
-
-  assert_raise(TypeError){ 0+nil }
-  assert_raise(TypeError){ 1+nil }
-
-  c = Mrbtest::FIXNUM_MAX + 1
-  d = Mrbtest::FIXNUM_MAX.__send__(:+, 1)
-  e = Mrbtest::FIXNUM_MAX + 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
-end
-
-assert('Integer#-', '15.2.8.3.2') do
-  a = 2-1
-  b = 2-1.0
-
-  assert_equal 1, a
-  assert_equal 1.0, b
-
-  c = Mrbtest::FIXNUM_MIN - 1
-  d = Mrbtest::FIXNUM_MIN.__send__(:-, 1)
-  e = Mrbtest::FIXNUM_MIN - 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
-end
-
-assert('Integer#*', '15.2.8.3.3') do
-  a = 1*1
-  b = 1*1.0
-
-  assert_equal 1, a
-  assert_equal 1.0, b
-
-  assert_raise(TypeError){ 0*nil }
-  assert_raise(TypeError){ 1*nil }
-
-  c = Mrbtest::FIXNUM_MAX * 2
-  d = Mrbtest::FIXNUM_MAX.__send__(:*, 2)
-  e = Mrbtest::FIXNUM_MAX * 2.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
-end
-
-assert('Integer#/', '15.2.8.3.4') do
-  a = 2/1
-  b = 2/1.0
-
-  assert_equal 2, a
-  assert_equal 2.0, b
-end
-
-assert('Integer#%', '15.2.8.3.5') do
-  a = 1%1
-  b = 1%1.0
-  c = 2%4
-  d = 2%5
-  e = 2%-5
-  f = -2%5
-  g = -2%-5
-  h =  2%-2
-  i = -2%2
-  j = -2%-2
-
-  assert_equal 0, a
-  assert_equal 0.0, b
-  assert_equal 2, c
-  assert_equal 2, d
-  assert_equal(-3, e)
-  assert_equal 3, f
-  assert_equal(-2, g)
-  assert_equal 0, h
-  assert_equal 0, i
-  assert_equal 0, j
-end
-
-assert('Integer#<=>', '15.2.9.3.6') do
-  a = 1<=>0
-  b = 1<=>1
-  c = 1<=>2
-
-  assert_equal  1, a
-  assert_equal  0, b
-  assert_equal(-1, c)
-end
-
-assert('Integer#==', '15.2.8.3.7') do
-  a = 1==0
-  b = 1==1
-
-  assert_false a
-  assert_true b
-end
-
-assert('Integer#~', '15.2.8.3.8') do
-  # Complement
-  assert_equal(-1, ~0)
-  assert_equal(-3, ~2)
-end
-
-assert('Integer#&', '15.2.8.3.9') do
-  # Bitwise AND
-  #   0101 (5)
-  # & 0011 (3)
-  # = 0001 (1)
-  assert_equal 1, 5 & 3
-end
-
-assert('Integer#|', '15.2.8.3.10') do
-  # Bitwise OR
-  #   0101 (5)
-  # | 0011 (3)
-  # = 0111 (7)
-  assert_equal 7, 5 | 3
-end
-
-assert('Integer#^', '15.2.8.3.11') do
-  # Bitwise XOR
-  #   0101 (5)
-  # ^ 0011 (3)
-  # = 0110 (6)
-  assert_equal 6, 5 ^ 3
-end
-
-assert('Integer#<<', '15.2.8.3.12') do
-  # Left Shift by one
-  #   00010111 (23)
-  # = 00101110 (46)
-  assert_equal 46, 23 << 1
-
-  # Left Shift by a negative is Right Shift
-  assert_equal 23, 46 << -1
-
-  # Left Shift by 31 is bitShift overflow to SignedInt
-  assert_equal 2147483648, 1 << 31
-
-  # -3 Left Shift by 30 is bitShift overflow to SignedInt
-  assert_equal(-3221225472, -3 << 30)
-end
-
-assert('Integer#>>', '15.2.8.3.13') do
-  # Right Shift by one
-  #   00101110 (46)
-  # = 00010111 (23)
-  assert_equal 23, 46 >> 1
-
-  # Right Shift by a negative is Left Shift
-  assert_equal 46, 23 >> -1
-
-  # Don't raise on large Right Shift
-  assert_equal 0, 23 >> 128
-end
-
-assert('Integer#ceil', '15.2.8.3.14') do
-  assert_equal 10, 10.ceil
-end
-
-assert('Integer#downto', '15.2.8.3.15') do
-  a = 0
-  3.downto(1) do |i|
-    a += i
-  end
-  assert_equal 6, a
-end
-
-assert('Integer#eql?', '15.2.8.3.16') do
-  a = 1.eql?(1)
-  b = 1.eql?(2)
-  c = 1.eql?(nil)
-
-  assert_true a
-  assert_false b
-  assert_false c
-end
-
-assert('Integer#floor', '15.2.8.3.17') do
-  a = 1.floor
-
-  assert_equal 1, a
-end
-
-assert('Integer#next', '15.2.8.3.19') do
-  assert_equal 2, 1.next
-end
-
-assert('Integer#round', '15.2.8.3.20') do
-  assert_equal 1, 1.round
-end
-
-assert('Integer#succ', '15.2.8.3.21') do
-  assert_equal 2, 1.succ
-end
-
-assert('Integer#times', '15.2.8.3.22') do
-  a = 0
-  3.times do
-    a += 1
-  end
-  assert_equal 3, a
-end
-
-assert('Integer#to_f', '15.2.8.3.23') do
-  assert_equal 1.0, 1.to_f
-end
-
-assert('Integer#to_i', '15.2.8.3.24') do
-  assert_equal 1, 1.to_i
-end
-
-assert('Integer#to_s', '15.2.8.3.25') do
-  assert_equal '1', 1.to_s
-  assert_equal("-1", -1.to_s)
-end
-
-assert('Integer#truncate', '15.2.8.3.26') do
-  assert_equal 1, 1.truncate
-end
-
-assert('Integer#upto', '15.2.8.3.27') do
-  a = 0
-  1.upto(3) do |i|
-    a += i
-  end
-  assert_equal 6, a
-end
-
-assert('Integer#divmod', '15.2.8.3.30') do
-  assert_equal [ 0,  0],   0.divmod(1)
-  assert_equal [ 0,  1],   1.divmod(3)
-  assert_equal [ 3,  0],   3.divmod(1)
-  assert_equal [ 2,  6],  20.divmod(7)
-  assert_equal [-1,  2],  -3.divmod(5)
-  assert_equal [-2, -1],  25.divmod(-13)
-  assert_equal [ 1, -6], -13.divmod(-7)
-end
-
-# Not ISO specified
-
-assert('Integer#step') do
-  a = []
-  b = []
-  1.step(3) do |i|
-    a << i
-  end
-  1.step(6, 2) do |i|
-    b << i
-  end
-
-  assert_equal [1, 2, 3], a
-  assert_equal [1, 3, 5], b
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/iterations.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/iterations.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/iterations.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/iterations.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-assert('while expression', '11.5.2.3.2') do
-  idx = 10
-  all = []
-  res = while idx > 0
-    all << idx
-    idx -= 1
-  end
-
-  assert_equal nil, res
-  assert_equal [10,9,8,7,6,5,4,3,2,1], all
-end
-
-assert('until expression', '11.5.2.3.3') do
-  idx = 10
-  all = []
-  res = until idx == 0
-    all << idx
-    idx -= 1
-  end
-
-  assert_equal nil, res
-  assert_equal [10,9,8,7,6,5,4,3,2,1], all
-end
-
-assert('break expression', '11.5.2.4.3') do
-  assert_equal :result do
-    while true
-      break :result
-    end
-  end
-
-  assert_equal :result do
-    until false
-      break :result
-    end
-  end
-end
-
-assert('next expression', '11.5.2.4.4') do
-  assert_equal [8,6,4,2,0] do
-    all = []
-    idx = 10
-    while idx > 0
-      idx -= 1
-      next if (idx % 2) == 1
-      all << idx
-    end
-    all
-  end
-
-  assert_equal [8,6,4,2,0] do
-    all = []
-    idx = 10
-    until idx == 0
-      idx -= 1
-      next if (idx % 2) == 1
-      all << idx
-    end
-    all
-  end
-end
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/kernel.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/kernel.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/kernel.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/kernel.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,623 +0,0 @@
-##
-# Kernel ISO Test
-
-assert('Kernel', '15.3.1') do
-  assert_equal Module, Kernel.class
-end
-
-assert('Kernel.block_given?', '15.3.1.2.2') do
-  def bg_try(&b)
-    if Kernel.block_given?
-      yield
-    else
-      "no block"
-    end
-  end
-
-  assert_false Kernel.block_given?
-  # test without block
-  assert_equal "no block", bg_try
-  # test with block
-  assert_equal "block" do
-    bg_try { "block" }
-  end
-  # test with block
-  assert_equal "block" do
-    bg_try do
-      "block"
-    end
-  end
-end
-
-# Kernel.eval is provided by the mruby-gem mrbgem. '15.3.1.2.3'
-
-assert('Kernel.global_variables', '15.3.1.2.4') do
-  assert_equal Array, Kernel.global_variables.class
-end
-
-assert('Kernel.iterator?', '15.3.1.2.5') do
-  assert_false Kernel.iterator?
-end
-
-assert('Kernel.lambda', '15.3.1.2.6') do
-  l = Kernel.lambda do
-    true
-  end
-
-  m = Kernel.lambda(&l)
-
-  assert_true l.call
-  assert_equal Proc, l.class
-  assert_true m.call
-  assert_equal Proc, m.class
-end
-
-# Not implemented at the moment
-#assert('Kernel.local_variables', '15.3.1.2.7') do
-#  Kernel.local_variables.class == Array
-#end
-
-assert('Kernel.loop', '15.3.1.2.8') do
-  i = 0
-
-  Kernel.loop do
-    i += 1
-    break if i == 100
-  end
-
-  assert_equal 100, i
-end
-
-assert('Kernel.p', '15.3.1.2.9') do
-  # TODO search for a way to test p to stdio
-  assert_true true
-end
-
-assert('Kernel.print', '15.3.1.2.10') do
-  # TODO search for a way to test print to stdio
-  assert_true true
-end
-
-assert('Kernel.puts', '15.3.1.2.11') do
-  # TODO search for a way to test puts to stdio
-  assert_true true
-end
-
-assert('Kernel.raise', '15.3.1.2.12') do
-  assert_raise RuntimeError do
-    Kernel.raise
-  end
-
-  assert_raise RuntimeError do
-    Kernel.raise RuntimeError.new
-  end
-end
-
-assert('Kernel#__id__', '15.3.1.3.3') do
-  assert_equal Fixnum, __id__.class
-end
-
-assert('Kernel#__send__', '15.3.1.3.4') do
-  # test with block
-  l = __send__(:lambda) do
-    true
-  end
-
-  assert_true l.call
-  assert_equal Proc, l.class
-  # test with argument
-  assert_true __send__(:respond_to?, :nil?)
-  # test without argument and without block
-  assert_equal  Array, __send__(:public_methods).class
-end
-
-assert('Kernel#block_given?', '15.3.1.3.6') do
-  def bg_try(&b)
-    if block_given?
-      yield
-    else
-      "no block"
-    end
-  end
-
-  assert_false block_given?
-  assert_equal "no block", bg_try
-  assert_equal "block" do
-    bg_try { "block" }
-  end
-  assert_equal "block" do
-    bg_try do
-      "block"
-    end
-  end
-end
-
-assert('Kernel#class', '15.3.1.3.7') do
-  assert_equal Module, Kernel.class
-end
-
-assert('Kernel#clone', '15.3.1.3.8') do
-  class KernelCloneTest
-    def initialize
-      @v = 0
-    end
-
-    def get
-      @v
-    end
-
-    def set(v)
-      @v = v
-    end
-  end
-
-  a = KernelCloneTest.new
-  a.set(1)
-  b = a.clone
-
-  def a.test
-  end
-  a.set(2)
-  c = a.clone
-
-  immutables = [ 1, :foo, true, false, nil ]
-  error_count = 0
-  immutables.each do |i|
-    begin
-      i.clone
-    rescue TypeError
-      error_count += 1
-    end
-  end
-
-  assert_equal 2, a.get
-  assert_equal 1, b.get
-  assert_equal 2, c.get
-  assert_true a.respond_to?(:test)
-  assert_false b.respond_to?(:test)
-  assert_true c.respond_to?(:test)
-end
-
-assert('Kernel#dup', '15.3.1.3.9') do
-  class KernelDupTest
-    def initialize
-      @v = 0
-    end
-
-    def get
-      @v
-    end
-
-    def set(v)
-      @v = v
-    end
-  end
-
-  a = KernelDupTest.new
-  a.set(1)
-  b = a.dup
-
-  def a.test
-  end
-  a.set(2)
-  c = a.dup
-
-  immutables = [ 1, :foo, true, false, nil ]
-  error_count = 0
-  immutables.each do |i|
-    begin
-      i.dup
-    rescue TypeError
-      error_count += 1
-    end
-  end
-
-  assert_equal immutables.size, error_count
-  assert_equal 2, a.get
-  assert_equal 1, b.get
-  assert_equal 2, c.get
-  assert_true a.respond_to?(:test)
-  assert_false b.respond_to?(:test)
-  assert_false c.respond_to?(:test)
-end
-
-assert('Kernel#dup class') do
-  assert_nothing_raised do
-    Array.dup.new(200)
-    Range.dup.new(2, 3)
-    String.dup.new("a"*50)
-  end
-end
-
-# Kernel#eval is provided by mruby-eval mrbgem '15.3.1.3.12'
-
-assert('Kernel#extend', '15.3.1.3.13') do
-  class Test4ExtendClass
-  end
-
-  module Test4ExtendModule
-    def test_method; end
-  end
-
-  a = Test4ExtendClass.new
-  a.extend(Test4ExtendModule)
-  b = Test4ExtendClass.new
-
-  assert_true a.respond_to?(:test_method)
-  assert_false b.respond_to?(:test_method)
-end
-
-assert('Kernel#extend works on toplevel', '15.3.1.3.13') do
-  module Test4ExtendModule
-    def test_method; end
-  end
-  # This would crash...
-  extend(Test4ExtendModule)
-
-  assert_true respond_to?(:test_method)
-end
-
-assert('Kernel#freeze') do
-  obj = Object.new
-  assert_equal obj, obj.freeze
-  assert_equal 0, 0.freeze
-  assert_equal :a, :a.freeze
-end
-
-assert('Kernel#global_variables', '15.3.1.3.14') do
-  assert_equal Array, global_variables.class
-end
-
-assert('Kernel#hash', '15.3.1.3.15') do
-  assert_equal hash, hash
-end
-
-assert('Kernel#inspect', '15.3.1.3.17') do
-  s = inspect
-
-  assert_equal String, s.class
-  assert_equal "main", s
-end
-
-assert('Kernel#instance_variable_defined?', '15.3.1.3.20') do
-  o = Object.new
-  o.instance_variable_set(:@a, 1)
-
-  assert_true o.instance_variable_defined?("@a")
-  assert_false o.instance_variable_defined?("@b")
-  assert_true o.instance_variable_defined?("@a"[0,2])
-  assert_true o.instance_variable_defined?("@abc"[0,2])
-end
-
-assert('Kernel#instance_variables', '15.3.1.3.23') do
-  o = Object.new
-  o.instance_eval do
-    @a = 11
-    @b = 12
-  end
-  ivars = o.instance_variables
-
-  assert_equal Array, ivars.class,
-  assert_equal(2, ivars.size)
-  assert_true ivars.include?(:@a)
-  assert_true ivars.include?(:@b)
-end
-
-assert('Kernel#is_a?', '15.3.1.3.24') do
-  assert_true is_a?(Kernel)
-  assert_false is_a?(Array)
-
-  assert_raise TypeError do
-    42.is_a?(42)
-  end
-end
-
-assert('Kernel#iterator?', '15.3.1.3.25') do
-  assert_false iterator?
-end
-
-assert('Kernel#kind_of?', '15.3.1.3.26') do
-  assert_true kind_of?(Kernel)
-  assert_false kind_of?(Array)
-end
-
-assert('Kernel#lambda', '15.3.1.3.27') do
-  l = lambda do
-    true
-  end
-
-  m = lambda(&l)
-
-  assert_true l.call
-  assert_equal Proc, l.class
-  assert_true m.call
-  assert_equal Proc, m.class
-end
-
-# Not implemented yet
-#assert('Kernel#local_variables', '15.3.1.3.28') do
-#  local_variables.class == Array
-#end
-
-assert('Kernel#loop', '15.3.1.3.29') do
-  i = 0
-
-  loop do
-    i += 1
-    break if i == 100
-  end
-
-  assert_equal i, 100
-end
-
-assert('Kernel#method_missing', '15.3.1.3.30') do
-  class MMTestClass
-    def method_missing(sym)
-      "A call to #{sym}"
-    end
-  end
-  mm_test = MMTestClass.new
-  assert_equal 'A call to no_method_named_this', mm_test.no_method_named_this
-
-  a = String.new
-  begin
-    a.no_method_named_this
-  rescue NoMethodError => e
-    assert_equal "undefined method 'no_method_named_this' for \"\"", e.message
-  end
-
-  class ShortInspectClass
-    def inspect
-      'An inspect string'
-    end
-  end
-  b = ShortInspectClass.new
-  begin
-    b.no_method_named_this
-  rescue NoMethodError => e
-    assert_equal "undefined method 'no_method_named_this' for An inspect string", e.message
-  end
-
-  class LongInspectClass
-    def inspect
-      "A" * 70
-    end
-  end
-  c = LongInspectClass.new
-  begin
-    c.no_method_named_this
-  rescue NoMethodError => e
-    assert_equal "undefined method 'no_method_named_this' for #{c}", e.message
-  end
-
-  class NoInspectClass
-    undef inspect
-  end
-  d = NoInspectClass.new
-  begin
-    d.no_method_named_this
-  rescue NoMethodError => e
-    assert_equal "undefined method 'no_method_named_this' for #{d}", e.message
-  end
-end
-
-assert('Kernel#methods', '15.3.1.3.31') do
-  assert_equal Array, methods.class
-end
-
-assert('Kernel#nil?', '15.3.1.3.32') do
-  assert_false nil?
-end
-
-assert('Kernel#object_id', '15.3.1.3.33') do
-  a = ""
-  b = ""
-  assert_not_equal a.object_id, b.object_id
-
-  assert_kind_of Numeric, object_id
-  assert_kind_of Numeric, "".object_id
-  assert_kind_of Numeric, true.object_id
-  assert_kind_of Numeric, false.object_id
-  assert_kind_of Numeric, nil.object_id
-  assert_kind_of Numeric, :no.object_id
-  assert_kind_of Numeric, 1.object_id
-  assert_kind_of Numeric, 1.0.object_id
-end
-
-# Kernel#p is defined in mruby-print mrbgem. '15.3.1.3.34'
-
-# Kernel#print is defined in mruby-print mrbgem. '15.3.1.3.35'
-
-assert('Kernel#private_methods', '15.3.1.3.36') do
-  assert_equal Array, private_methods.class
-end
-
-assert('Kernel#protected_methods', '15.3.1.3.37') do
-  assert_equal Array, protected_methods.class
-end
-
-assert('Kernel#public_methods', '15.3.1.3.38') do
-  assert_equal Array, public_methods.class
-  class Foo
-    def foo
-    end
-  end
-  assert_equal [:foo], Foo.new.public_methods(false)
-end
-
-# Kernel#puts is defined in mruby-print mrbgem. '15.3.1.3.39'
-
-assert('Kernel#raise', '15.3.1.3.40') do
-  assert_raise RuntimeError do
-    raise
-  end
-
-  assert_raise RuntimeError do
-    raise RuntimeError.new
-  end
-end
-
-assert('Kernel#remove_instance_variable', '15.3.1.3.41') do
-  class Test4RemoveInstanceVar
-    attr_reader :var
-    def initialize
-      @var = 99
-    end
-    def remove
-      remove_instance_variable(:@var)
-    end
-  end
-
-  tri = Test4RemoveInstanceVar.new
-  assert_equal 99, tri.var
-  tri.remove
-  assert_equal nil, tri.var
-  assert_raise NameError do
-    tri.remove
-  end
-end
-
-# Kernel#require is defined in mruby-require. '15.3.1.3.42'
-
-assert('Kernel#respond_to?', '15.3.1.3.43') do
-  class Test4RespondTo
-    def valid_method; end
-
-    def test_method; end
-    undef test_method
-  end
-
-  assert_raise TypeError do
-    Test4RespondTo.new.respond_to?(1)
-  end
-
-  assert_raise ArgumentError do
-    Test4RespondTo.new.respond_to?
-  end
-
-  assert_raise ArgumentError do
-    Test4RespondTo.new.respond_to? :a, true, :aa
-  end
-
-  assert_true respond_to?(:nil?)
-  assert_true Test4RespondTo.new.respond_to?(:valid_method)
-  assert_true Test4RespondTo.new.respond_to?('valid_method')
-  assert_false Test4RespondTo.new.respond_to?(:test_method)
-end
-
-assert('Kernel#send', '15.3.1.3.44') do
-  # test with block
-  l = send(:lambda) do
-    true
-  end
-
-  assert_true l.call
-  assert_equal l.class, Proc
-  # test with argument
-  assert_true send(:respond_to?, :nil?)
-  # test without argument and without block
-  assert_equal send(:public_methods).class, Array
-end
-
-assert('Kernel#singleton_methods', '15.3.1.3.45') do
-  assert_equal singleton_methods.class, Array
-end
-
-assert('Kernel#to_s', '15.3.1.3.46') do
-  assert_equal to_s.class, String
-end
-
-assert('Kernel#to_s on primitives') do
-  begin
-    Fixnum.alias_method :to_s_, :to_s
-    Fixnum.remove_method :to_s
-
-    assert_nothing_raised do
-      # segfaults if mrb_cptr is used
-      1.to_s
-    end
-  ensure
-    Fixnum.alias_method :to_s, :to_s_
-    Fixnum.remove_method :to_s_
-  end
-end
-
-assert('Kernel.local_variables', '15.3.1.2.7') do
-  a, b = 0, 1
-  a += b
-
-  vars = Kernel.local_variables.sort
-  assert_equal [:a, :b, :vars], vars
-
-  assert_equal [:a, :b, :c, :vars], Proc.new { |a, b|
-    c = 2
-    Kernel.local_variables.sort
-  }.call(-1, -2)
-end
-
-assert('Kernel#!=') do
-  str1 = "hello"
-  str2 = str1
-  str3 = "world"
-
-  assert_false (str1[1] != 'e')
-  assert_true (str1 != str3)
-  assert_false (str2 != str1)
-end
-
-# operator "!~" is defined in ISO Ruby 11.4.4.
-assert('Kernel#!~') do
-  x = "x"
-  def x.=~(other)
-    other == "x"
-  end
-  assert_false x !~ "x"
-  assert_true  x !~ "z"
-
-  y = "y"
-  def y.=~(other)
-    other == "y"
-  end
-  def y.!~(other)
-    other == "not y"
-  end
-  assert_false y !~ "y"
-  assert_false y !~ "z"
-  assert_true  y !~ "not y"
-end
-
-assert('Kernel#respond_to_missing?') do
-  class Test4RespondToMissing
-    def respond_to_missing?(method_name, include_private = false)
-      method_name == :a_method
-    end
-  end
-
-  assert_true Test4RespondToMissing.new.respond_to?(:a_method)
-  assert_false Test4RespondToMissing.new.respond_to?(:no_method)
-end
-
-assert('Kernel#global_variables') do
-  variables = global_variables
-  1.upto(9) do |i|
-    assert_equal variables.include?(:"$#{i}"), true
-  end
-end
-
-assert('Kernel#define_singleton_method') do
-  o = Object.new
-  ret = o.define_singleton_method(:test_method) do
-    :singleton_method_ok
-  end
-  assert_equal :test_method, ret
-  assert_equal :singleton_method_ok, o.test_method
-end
-
-assert('stack extend') do
-  def recurse(count, stop)
-    return count if count > stop
-    recurse(count+1, stop)
-  end
-
-  assert_equal 6, recurse(0, 5)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/lang.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/lang.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/lang.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/lang.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-# The aim of these tests is  to detect pitfall for optimized VM.
-
-# Test for or/and
-#
-# You may think instruction fusion(OP_EQ and OP_JMPIF) for avoiding
-# generate intermediate boolean value.
-# But and/or is pitfall for this fusioning.
-#
-# For example, the following mruby code:
-#
-#   if i > 0 and i < 10 then
-#
-# compiles to the following byte code:
-#
-#    1 000 OP_LOADI      R1      0               ; R1:i
-#    2 001 OP_MOVE       R2      R1              ; R1:i
-#    2 002 OP_LOADI      R3      0
-#    2 003 OP_GT R2      :>      1
-#    2 004 OP_JMPNOT     R2      008
-#    2 005 OP_MOVE       R2      R1              ; R1:i
-#    2 006 OP_LOADI      R3      10
-#    2 007 OP_LT R2      :<      1
-#    2 008 OP_JMPNOT     R2      (The address of end of then part)
-#
-# When the instruction fusion the OP_GT and OP_JMPNOT you fell into the pitfalls.
-# The deleted intermediate boolean value is used in OP_JMPNOT (address 008).
-
-assert('and', '11.2.3') do
-  a = 1
-  if a > 0 and a < 10 then
-    b = 1
-  else
-    b = 0
-  end
-  assert_equal 1, b
-
-  if a < 0 and a < 10 then
-    b = 1
-  else
-    b = 0
-  end
-  assert_equal 0, b
-
-  if a < 0 and a > 10 then
-    b = 1
-  else
-    b = 0
-  end
-  assert_equal 0, b
-end
-
-assert('or','11.2.4') do
-  a = 1
-  if a > 0 or a < 10 then
-    b = 1
-  else
-    b = 0
-  end
-  assert_equal 1, b
-
-  if a < 0 or a < 10 then
-    b = 1
-  else
-    b = 0
-  end
-  assert_equal 1, b
-
-  if a < 0 or a > 10 then
-    b = 1
-  else
-    b = 0
-  end
-  assert_equal 0, b
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/literals.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/literals.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/literals.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/literals.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,337 +0,0 @@
-##
-# Literals ISO Test
-
-assert('Literals Numerical', '8.7.6.2') do
-  # signed and unsigned integer
-  assert_equal 1, 1
-  assert_equal(-1, -1)
-  assert_equal(+1, +1)
-  # signed and unsigned float
-  assert_equal 1.0, 1.0
-  assert_equal(-1.0, -1.0)
-  # binary
-  assert_equal 128, 0b10000000
-  assert_equal 128, 0B10000000
-  # octal
-  assert_equal 8, 0o10
-  assert_equal 8, 0O10
-  assert_equal 8, 0_10
-  # hex
-  assert_equal 255, 0xff
-  assert_equal 255, 0Xff
-  # decimal
-  assert_equal 999, 0d999
-  assert_equal 999, 0D999
-  # decimal seperator
-  assert_equal 10000000, 10_000_000
-  assert_equal       10, 1_0
-  # integer with exponent
-  assert_equal 10.0, 1e1
-  assert_equal(0.1, 1e-1)
-  assert_equal 10.0, 1e+1
-  # float with exponent
-  assert_equal 10.0, 1.0e1
-  assert_equal(0.1, 1.0e-1)
-  assert_equal 10.0, 1.0e+1
-end
-
-assert('Literals Strings Single Quoted', '8.7.6.3.2') do
-  assert_equal 'abc', 'abc'
-  assert_equal '\'', '\''
-  assert_equal '\\', '\\'
-end
-
-assert('Literals Strings Double Quoted', '8.7.6.3.3') do
-  a = "abc"
-
-  assert_equal "abc", "abc"
-  assert_equal "\"", "\""
-  assert_equal "\\", "\\"
-  assert_equal "abc", "#{a}"
-end
-
-assert('Literals Strings Quoted Non-Expanded', '8.7.6.3.4') do
-  a = %q{abc}
-  b = %q(abc)
-  c = %q[abc]
-  d = %q<abc>
-  e = %q/abc/
-  f = %q/ab\/c/
-  g = %q{#{a}}
-
-  assert_equal 'abc', a
-  assert_equal 'abc', b
-  assert_equal 'abc', c
-  assert_equal 'abc', d
-  assert_equal 'abc', e
-  assert_equal 'ab/c', f
-  assert_equal '#{a}', g
-end
-
-assert('Literals Strings Quoted Expanded', '8.7.6.3.5') do
-  a = %Q{abc}
-  b = %Q(abc)
-  c = %Q[abc]
-  d = %Q<abc>
-  e = %Q/abc/
-  f = %Q/ab\/c/
-  g = %Q{#{a}}
-
-  assert_equal 'abc', a
-  assert_equal 'abc', b
-  assert_equal 'abc', c
-  assert_equal 'abc', d
-  assert_equal 'abc', e
-  assert_equal 'ab/c', f
-  assert_equal 'abc', g
-end
-
-assert('Literals Strings Here documents', '8.7.6.3.6') do
-  a = <<AAA
-aaa
-AAA
-   b = <<b_b
-bbb
-b_b
-    c = [<<CCC1, <<"CCC2", <<'CCC3']
-c1
-CCC1
-c 2
-CCC2
-c  3
-CCC3
-
-      d = <<DDD
-d#{1+2}DDD
-d\t
-DDD\n
-DDD
-  e = <<'EEE'
-e#{1+2}EEE
-e\t
-EEE\n
-EEE
-  f = <<"FFF"
-F
-FF#{"f"}FFF
-F
-FFF
-
-  g = <<-GGG
-  ggg
-  GGG
-  h = <<-"HHH"
-  hhh
-  HHH
-  i = <<-'III'
-  iii
-  III
-  j = [<<-JJJ1   , <<-"JJJ2"   , <<-'JJJ3' ]
-  j#{1}j
-  JJJ1
-  j#{2}j
-  JJJ2
-  j#{3}j
-  JJJ3
-
-  k = <<'KKK'.to_i
-123
-KKK
-
-  m = [<<MM1, <<MM2]
-x#{m2 = {x:<<MM3}}y
-mm3
-MM3
-mm1
-MM1
-mm2
-MM2
-
-  n = [1, "#{<<NN1}", 3,
-nn1
-NN1
-  4]
-
-  qqq = Proc.new {|*x| x.join(' $ ')}
-  q1 = qqq.call("a", <<QQ1, "c",
-q
-QQ1
-      "d")
-  q2 = qqq.call("l", "m#{<<QQ2}n",
-qq
-QQ2
-      "o")
-
-  w = %W( 1 #{<<WWW} 3
-www
-WWW
-      4 5 )
-
-  x = [1, <<XXX1,
-foo #{<<XXX2} bar
-222 #{<<XXX3} 444
-333
-XXX3
-5
-XXX2
-6
-XXX1
-    9]
-
-  z = <<'ZZZ'
-ZZZ
-
-  assert_equal "aaa\n", a
-  assert_equal "bbb\n", b
-  assert_equal ["c1\n", "c 2\n", "c  3\n"], c
-  assert_equal "d3DDD\nd\t\nDDD\n\n", d
-  assert_equal "e\#{1+2}EEE\ne\\t\nEEE\\n\n", e
-  assert_equal "F\nFFfFFF\nF\n", f
-  assert_equal "  ggg\n", g
-  assert_equal "  hhh\n", h
-  assert_equal "  iii\n", i
-  assert_equal ["  j1j\n", "  j2j\n", "  j\#{3}j\n"], j
-  assert_equal 123, k
-  assert_equal ["x{:x=>\"mm3\\n\"}y\nmm1\n", "mm2\n"], m
-  assert_equal ({:x=>"mm3\n"}), m2
-  assert_equal [1, "nn1\n", 3, 4], n
-  assert_equal "a $ q\n $ c $ d", q1
-  assert_equal "l $ mqq\nn $ o", q2
-  assert_equal ["1", "www\n", "3", "4", "5"], w
-  assert_equal [1, "foo 222 333\n 444\n5\n bar\n6\n", 9], x
-  assert_equal "", z
-
-end
-
-
-assert('Literals Array', '8.7.6.4') do
-  a = %W{abc#{1+2}def \}g}
-  b = %W(abc #{2+3} def \(g)
-  c = %W[#{3+4}]
-  d = %W< #{4+5} >
-  e = %W//
-  f = %W[[ab cd][ef]]
-  g = %W{
-    ab
-    #{-1}1
-    2#{2}
-  }
-  h = %W(a\nb
-         test\ abc
-         c\
-d
-         x\y x\\y x\\\y)
-
-  assert_equal ['abc3def', '}g'], a
-  assert_equal ['abc', '5', 'def', '(g'], b
-  assert_equal ['7'],c
-  assert_equal ['9'], d
-  assert_equal [], e
-  assert_equal ['[ab', 'cd][ef]'], f
-  assert_equal ['ab', '-11', '22'], g
-  assert_equal ["a\nb", 'test abc', "c\nd", "xy", "x\\y", "x\\y"], h
-
-  a = %w{abc#{1+2}def \}g}
-  b = %w(abc #{2+3} def \(g)
-  c = %w[#{3+4}]
-  d = %w< #{4+5} >
-  e = %w//
-  f = %w[[ab cd][ef]]
-  g = %w{
-    ab
-    #{-1}1
-    2#{2}
-  }
-  h = %w(a\nb
-         test\ abc
-         c\
-d
-         x\y x\\y x\\\y)
-
-  assert_equal ['abc#{1+2}def', '}g'], a
-  assert_equal ['abc', '#{2+3}', 'def', '(g'], b
-  assert_equal ['#{3+4}'], c
-  assert_equal ['#{4+5}'], d
-  assert_equal [], e
-  assert_equal ['[ab', 'cd][ef]'], f
-  assert_equal ['ab', '#{-1}1', '2#{2}'], g
-  assert_equal ["a\\nb", "test abc", "c\nd", "x\\y", "x\\y", "x\\\\y"], h
-end
-
-
-assert('Literals Array of symbols') do
-  a = %I{abc#{1+2}def \}g}
-  b = %I(abc #{2+3} def \(g)
-  c = %I[#{3+4}]
-  d = %I< #{4+5} >
-  e = %I//
-  f = %I[[ab cd][ef]]
-  g = %I{
-    ab
-    #{-1}1
-    2#{2}
-  }
-
-  assert_equal [:'abc3def', :'}g'], a
-  assert_equal [:'abc', :'5', :'def', :'(g'], b
-  assert_equal [:'7'],c
-  assert_equal [:'9'], d
-  assert_equal [], e
-  assert_equal [:'[ab', :'cd][ef]'], f
-  assert_equal [:'ab', :'-11', :'22'], g
-
-  a = %i{abc#{1+2}def \}g}
-  b = %i(abc #{2+3} def \(g)
-  c = %i[#{3+4}]
-  d = %i< #{4+5} >
-  e = %i//
-  f = %i[[ab cd][ef]]
-  g = %i{
-    ab
-    #{-1}1
-    2#{2}
-  }
-
-  assert_equal [:'abc#{1+2}def', :'}g'], a
-  assert_equal [:'abc', :'#{2+3}', :'def', :'(g'], b
-  assert_equal [:'#{3+4}'], c
-  assert_equal [:'#{4+5}'], d
-  assert_equal [] ,e
-  assert_equal [:'[ab', :'cd][ef]'], f
-  assert_equal [:'ab', :'#{-1}1', :'2#{2}'], g
-end
-
-assert('Literals Symbol', '8.7.6.6') do
-  # do not compile error
-  :$asd
-  :@asd
-  :@@asd
-  :asd=
-  :asd!
-  :asd?
-  :+
-  :+@
-  :if
-  :BEGIN
-
-  a = :"asd qwe"
-  b = :'foo bar'
-  c = :"a#{1+2}b"
-  d = %s(asd)
-  e = %s( foo \))
-  f = %s[asd \[
-qwe]
-  g = %s/foo#{1+2}bar/
-  h = %s{{foo bar}}
-
-  assert_equal :'asd qwe', a
-  assert_equal :"foo bar", b
-  assert_equal :a3b, c
-  assert_equal :asd, d
-  assert_equal :' foo )', e
-  assert_equal :"asd [\nqwe", f
-  assert_equal :'foo#{1+2}bar', g
-  assert_equal :'{foo bar}', h
-end
-
-# Not Implemented ATM assert('Literals Regular expression', '8.7.6.5') do
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/localjumperror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/localjumperror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/localjumperror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/localjumperror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-##
-# LocalJumpError ISO Test
-
-assert('LocalJumpError', '15.2.25') do
-  assert_equal Class, LocalJumpError.class
-#  assert_raise LocalJumpError do
-#    # this will cause an exception due to the wrong location
-#    retry
-#  end
-end
-
-# TODO 15.2.25.2.1 LocalJumpError#exit_value
-# TODO 15.2.25.2.2 LocalJumpError#reason
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/methods.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/methods.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/methods.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/methods.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-##
-# Chapter 13.3 "Methods" ISO Test
-
-assert('The alias statement', '13.3.6 a) 4)') do
-  # check aliasing in all possible ways
-
-  def alias_test_method_original; true; end
-
-  alias alias_test_method_a alias_test_method_original
-  alias :alias_test_method_b :alias_test_method_original
-
-  assert_true(alias_test_method_original)
-  assert_true(alias_test_method_a)
-  assert_true(alias_test_method_b)
-end
-
-assert('The alias statement (overwrite original)', '13.3.6 a) 4)') do
-  # check that an aliased method can be overwritten
-  # without side effect
-
-  def alias_test_method_original; true; end
-
-  alias alias_test_method_a alias_test_method_original
-  alias :alias_test_method_b :alias_test_method_original
-
-  assert_true(alias_test_method_original)
-
-  def alias_test_method_original; false; end
-
-  assert_false(alias_test_method_original)
-  assert_true(alias_test_method_a)
-  assert_true(alias_test_method_b)
-end
-
-assert('The alias statement', '13.3.6 a) 5)') do
-  # check that alias is raising NameError if
-  # non-existing method should be undefined
-
-  assert_raise(NameError) do
-    alias new_name_a non_existing_method
-  end
-
-  assert_raise(NameError) do
-    alias :new_name_b :non_existing_method
-  end
-end
-
-assert('The undef statement', '13.3.7 a) 4)') do
-  # check that undef is undefining method
-  # based on the method name
-
-  def existing_method_a; true; end
-  def existing_method_b; true; end
-  def existing_method_c; true; end
-  def existing_method_d; true; end
-  def existing_method_e; true; end
-  def existing_method_f; true; end
-
-  # check that methods are defined
-
-  assert_true(existing_method_a, 'Method should be defined')
-  assert_true(existing_method_b, 'Method should be defined')
-  assert_true(existing_method_c, 'Method should be defined')
-  assert_true(existing_method_d, 'Method should be defined')
-  assert_true(existing_method_e, 'Method should be defined')
-  assert_true(existing_method_f, 'Method should be defined')
-
-  # undefine in all possible ways and check that method
-  # is undefined
-
-  undef existing_method_a
-  assert_raise(NoMethodError) do
-    existing_method_a
-  end
-
-  undef :existing_method_b
-  assert_raise(NoMethodError) do
-    existing_method_b
-  end
-
-  undef existing_method_c, existing_method_d
-  assert_raise(NoMethodError) do
-    existing_method_c
-  end
-  assert_raise(NoMethodError) do
-    existing_method_d
-  end
-
-  undef :existing_method_e, :existing_method_f
-  assert_raise(NoMethodError) do
-    existing_method_e
-  end
-  assert_raise(NoMethodError) do
-    existing_method_f
-  end
-end
-
-assert('The undef statement (method undefined)', '13.3.7 a) 5)') do
-  # check that undef is raising NameError if
-  # non-existing method should be undefined
-
-  assert_raise(NameError) do
-    undef non_existing_method
-  end
-
-  assert_raise(NameError) do
-    undef :non_existing_method
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/module.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/module.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/module.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/module.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,880 +0,0 @@
-##
-# Module ISO Test
-
-def labeled_module(name, &block)
-  Module.new do
-    singleton_class.class_eval do
-      define_method(:to_s) { name }
-      alias_method :inspect, :to_s
-    end
-    class_eval(&block) if block
-  end
-end
-
-def labeled_class(name, supklass = Object, &block)
-  Class.new(supklass) do
-    singleton_class.class_eval do
-      define_method(:to_s) { name }
-      alias_method :inspect, :to_s
-    end
-    class_eval(&block) if block
-  end
-end
-
-assert('Module', '15.2.2') do
-  assert_equal Class, Module.class
-end
-
-# TODO not implemented ATM assert('Module.constants', '15.2.2.3.1') do
-
-# TODO not implemented ATM assert('Module.nesting', '15.2.2.3.2') do
-
-assert('Module#ancestors', '15.2.2.4.9') do
-  class Test4ModuleAncestors
-  end
-  sc = Test4ModuleAncestors.singleton_class
-  r = String.ancestors
-
-  assert_equal Array, r.class
-  assert_true r.include?(String)
-  assert_true r.include?(Object)
-end
-
-assert('Module#append_features', '15.2.2.4.10') do
-  module Test4AppendFeatures
-    def self.append_features(mod)
-      Test4AppendFeatures2.const_set(:Const4AppendFeatures2, mod)
-    end
-  end
-  module Test4AppendFeatures2
-    include Test4AppendFeatures
-  end
-
-  assert_equal Test4AppendFeatures2, Test4AppendFeatures2.const_get(:Const4AppendFeatures2)
-end
-
-assert('Module#attr NameError') do
-  %w[
-    foo?
-    @foo
-    @@foo
-    $foo
-  ].each do |name|
-    module NameTest; end
-
-    assert_raise(NameError) do
-      NameTest.module_eval { attr_reader name.to_sym }
-    end
-
-    assert_raise(NameError) do
-      NameTest.module_eval { attr_writer name.to_sym }
-    end
-
-    assert_raise(NameError) do
-      NameTest.module_eval { attr name.to_sym }
-    end
-
-    assert_raise(NameError) do
-      NameTest.module_eval { attr_accessor name.to_sym }
-    end
-  end
-
-end
-
-assert('Module#attr', '15.2.2.4.11') do
-  class AttrTest
-    class << self
-      attr :cattr
-      def cattr_val=(val)
-        @cattr = val
-      end
-    end
-    attr :iattr
-    def iattr_val=(val)
-      @iattr = val
-    end
-  end
-
-  test = AttrTest.new
-  assert_true AttrTest.respond_to?(:cattr)
-  assert_true test.respond_to?(:iattr)
-
-  assert_false AttrTest.respond_to?(:cattr=)
-  assert_false test.respond_to?(:iattr=)
-
-  test.iattr_val = 'test'
-  assert_equal 'test', test.iattr
-
-  AttrTest.cattr_val = 'test'
-  assert_equal 'test', AttrTest.cattr
-end
-
-assert('Module#attr_accessor', '15.2.2.4.12') do
-  class AttrTestAccessor
-    class << self
-      attr_accessor :cattr
-    end
-    attr_accessor :iattr, 'iattr2'
-  end
-
-  attr_instance = AttrTestAccessor.new
-  assert_true AttrTestAccessor.respond_to?(:cattr=)
-  assert_true attr_instance.respond_to?(:iattr=)
-  assert_true attr_instance.respond_to?(:iattr2=)
-  assert_true AttrTestAccessor.respond_to?(:cattr)
-  assert_true attr_instance.respond_to?(:iattr)
-  assert_true attr_instance.respond_to?(:iattr2)
-
-  attr_instance.iattr = 'test'
-  assert_equal 'test', attr_instance.iattr
-
-  AttrTestAccessor.cattr = 'test'
-  assert_equal 'test', AttrTestAccessor.cattr
-end
-
-assert('Module#attr_reader', '15.2.2.4.13') do
-  class AttrTestReader
-    class << self
-      attr_reader :cattr
-      def cattr_val=(val)
-        @cattr = val
-      end
-    end
-    attr_reader :iattr, 'iattr2'
-    def iattr_val=(val)
-      @iattr = val
-    end
-  end
-
-  attr_instance = AttrTestReader.new
-  assert_true AttrTestReader.respond_to?(:cattr)
-  assert_true attr_instance.respond_to?(:iattr)
-  assert_true attr_instance.respond_to?(:iattr2)
-
-  assert_false AttrTestReader.respond_to?(:cattr=)
-  assert_false attr_instance.respond_to?(:iattr=)
-  assert_false attr_instance.respond_to?(:iattr2=)
-
-  attr_instance.iattr_val = 'test'
-  assert_equal 'test', attr_instance.iattr
-
-  AttrTestReader.cattr_val = 'test'
-  assert_equal 'test', AttrTestReader.cattr
-end
-
-assert('Module#attr_writer', '15.2.2.4.14') do
-  class AttrTestWriter
-    class << self
-      attr_writer :cattr
-      def cattr_val
-        @cattr
-      end
-    end
-    attr_writer :iattr, 'iattr2'
-    def iattr_val
-      @iattr
-    end
-  end
-
-  attr_instance = AttrTestWriter.new
-  assert_true AttrTestWriter.respond_to?(:cattr=)
-  assert_true attr_instance.respond_to?(:iattr=)
-  assert_true attr_instance.respond_to?(:iattr2=)
-
-  assert_false AttrTestWriter.respond_to?(:cattr)
-  assert_false attr_instance.respond_to?(:iattr)
-  assert_false attr_instance.respond_to?(:iattr2)
-
-  attr_instance.iattr = 'test'
-  assert_equal 'test', attr_instance.iattr_val
-
-  AttrTestWriter.cattr = 'test'
-  assert_equal 'test', AttrTestWriter.cattr_val
-end
-
-assert('Module#class_eval', '15.2.2.4.15') do
-  class Test4ClassEval
-    @a = 11
-    @b = 12
-  end
-  Test4ClassEval.class_eval do
-    def method1
-    end
-  end
-  r = Test4ClassEval.instance_methods
-
-  assert_equal 11, Test4ClassEval.class_eval{ @a }
-  assert_equal 12, Test4ClassEval.class_eval{ @b }
-  assert_equal Array, r.class
-  assert_true r.include?(:method1)
-end
-
-assert('Module#class_variable_defined?', '15.2.2.4.16') do
-  class Test4ClassVariableDefined
-    @@cv = 99
-  end
-
-  assert_true Test4ClassVariableDefined.class_variable_defined?(:@@cv)
-  assert_false Test4ClassVariableDefined.class_variable_defined?(:@@noexisting)
-end
-
-assert('Module#class_variable_get', '15.2.2.4.17') do
-  class Test4ClassVariableGet
-    @@cv = 99
-  end
-
-  assert_equal 99, Test4ClassVariableGet.class_variable_get(:@@cv)
-end
-
-assert('Module#class_variable_set', '15.2.2.4.18') do
-  class Test4ClassVariableSet
-    @@foo = 100
-    def foo
-      @@foo
-    end
-  end
-
-  assert_true Test4ClassVariableSet.class_variable_set(:@@cv, 99)
-  assert_true Test4ClassVariableSet.class_variable_set(:@@foo, 101)
-  assert_true Test4ClassVariableSet.class_variables.include? :@@cv
-  assert_equal 99, Test4ClassVariableSet.class_variable_get(:@@cv)
-  assert_equal 101, Test4ClassVariableSet.new.foo
-end
-
-assert('Module#class_variables', '15.2.2.4.19') do
-  class Test4ClassVariables1
-    @@var1 = 1
-  end
-  class Test4ClassVariables2 < Test4ClassVariables1
-    @@var2 = 2
-  end
-
-  assert_equal [:@@var1], Test4ClassVariables1.class_variables
-  assert_equal [:@@var2, :@@var1], Test4ClassVariables2.class_variables
-end
-
-assert('Module#const_defined?', '15.2.2.4.20') do
-  module Test4ConstDefined
-    Const4Test4ConstDefined = true
-  end
-
-  assert_true Test4ConstDefined.const_defined?(:Const4Test4ConstDefined)
-  assert_false Test4ConstDefined.const_defined?(:NotExisting)
-end
-
-assert('Module#const_get', '15.2.2.4.21') do
-  module Test4ConstGet
-    Const4Test4ConstGet = 42
-  end
-
-  assert_equal 42, Test4ConstGet.const_get(:Const4Test4ConstGet)
-end
-
-assert('Module#const_missing', '15.2.2.4.22') do
-  module Test4ConstMissing
-    def self.const_missing(sym)
-      42 # the answer to everything
-    end
-  end
-
-  assert_equal 42, Test4ConstMissing.const_get(:ConstDoesntExist)
-end
-
-assert('Module#const_get', '15.2.2.4.23') do
-  module Test4ConstSet
-    Const4Test4ConstSet = 42
-  end
-
-  assert_true Test4ConstSet.const_set(:Const4Test4ConstSet, 23)
-  assert_equal 23, Test4ConstSet.const_get(:Const4Test4ConstSet)
-end
-
-assert('Module#constants', '15.2.2.4.24') do
-  $n = []
-  module TestA
-    C = 1
-  end
-  class TestB
-    include TestA
-    C2 = 1
-    $n = constants.sort
-  end
-
-  assert_equal [ :C ], TestA.constants
-  assert_equal [ :C, :C2 ], $n
-end
-
-assert('Module#include', '15.2.2.4.27') do
-  module Test4Include
-    Const4Include = 42
-  end
-  module Test4Include2
-    include Test4Include
-  end
-
-  assert_equal 42, Test4Include2.const_get(:Const4Include)
-end
-
-assert('Module#include?', '15.2.2.4.28') do
-  module Test4IncludeP
-  end
-  class Test4IncludeP2
-    include Test4IncludeP
-  end
-  class Test4IncludeP3 < Test4IncludeP2
-  end
-
-  assert_true Test4IncludeP2.include?(Test4IncludeP)
-  assert_true Test4IncludeP3.include?(Test4IncludeP)
-  assert_false Test4IncludeP.include?(Test4IncludeP)
-end
-
-assert('Module#included', '15.2.2.4.29') do
-  module Test4Included
-    Const4Included = 42
-    def self.included mod
-      Test4Included.const_set(:Const4Included2, mod)
-    end
-  end
-  module Test4Included2
-    include Test4Included
-  end
-
-  assert_equal 42, Test4Included2.const_get(:Const4Included)
-  assert_equal Test4Included2, Test4Included2.const_get(:Const4Included2)
-end
-
-assert('Module#included_modules', '15.2.2.4.30') do
-  module Test4includedModules
-  end
-  module Test4includedModules2
-    include Test4includedModules
-  end
-  r = Test4includedModules2.included_modules
-
-  assert_equal Array, r.class
-  assert_true r.include?(Test4includedModules)
-end
-
-assert('Module#initialize', '15.2.2.4.31') do
-  assert_kind_of Module, Module.new
-  mod = Module.new { def hello; "hello"; end }
-  assert_equal [:hello], mod.instance_methods
-  a = nil
-  mod = Module.new { |m| a = m }
-  assert_equal mod, a
-end
-
-assert('Module#instance_methods', '15.2.2.4.33') do
-  module Test4InstanceMethodsA
-    def method1()  end
-  end
-  class Test4InstanceMethodsB
-    def method2()  end
-  end
-  class Test4InstanceMethodsC < Test4InstanceMethodsB
-    def method3()  end
-  end
-
-  r = Test4InstanceMethodsC.instance_methods(true)
-
-  assert_equal [:method1], Test4InstanceMethodsA.instance_methods
-  assert_equal [:method2], Test4InstanceMethodsB.instance_methods(false)
-  assert_equal [:method3], Test4InstanceMethodsC.instance_methods(false)
-  assert_equal Array, r.class
-  assert_true r.include?(:method3)
-  assert_true r.include?(:method2)
-end
-
-assert('Module#method_defined?', '15.2.2.4.34') do
-  module Test4MethodDefined
-    module A
-      def method1()  end
-    end
-
-    class B
-      def method2()  end
-    end
-
-    class C < B
-      include A
-      def method3()  end
-    end
-  end
-
-  assert_true Test4MethodDefined::A.method_defined? :method1
-  assert_true Test4MethodDefined::C.method_defined? :method1
-  assert_true Test4MethodDefined::C.method_defined? "method2"
-  assert_true Test4MethodDefined::C.method_defined? "method3"
-  assert_false Test4MethodDefined::C.method_defined? "method4"
-end
-
-
-assert('Module#module_eval', '15.2.2.4.35') do
-  module Test4ModuleEval
-    @a = 11
-    @b = 12
-  end
-
-  assert_equal 11, Test4ModuleEval.module_eval{ @a }
-  assert_equal 12, Test4ModuleEval.module_eval{ @b }
-end
-
-assert('Module#remove_class_variable', '15.2.2.4.39') do
-  class Test4RemoveClassVariable
-    @@cv = 99
-  end
-
-  assert_equal 99, Test4RemoveClassVariable.remove_class_variable(:@@cv)
-  assert_false Test4RemoveClassVariable.class_variables.include? :@@cv
-end
-
-assert('Module#remove_const', '15.2.2.4.40') do
-  module Test4RemoveConst
-    ExistingConst = 23
-  end
-
-  result = Test4RemoveConst.module_eval { remove_const :ExistingConst }
-
-  name_error = false
-  begin
-    Test4RemoveConst.module_eval { remove_const :NonExistingConst }
-  rescue NameError
-    name_error = true
-  end
-
-  # Constant removed from Module
-  assert_false Test4RemoveConst.const_defined? :ExistingConst
-  # Return value of binding
-  assert_equal 23, result
-  # Name Error raised when Constant doesn't exist
-  assert_true name_error
-end
-
-assert('Module#remove_method', '15.2.2.4.41') do
-  module Test4RemoveMethod
-    class Parent
-      def hello
-      end
-     end
-
-     class Child < Parent
-      def hello
-      end
-    end
-  end
-
-  assert_true Test4RemoveMethod::Child.class_eval{ remove_method :hello }
-  assert_true Test4RemoveMethod::Child.instance_methods.include? :hello
-  assert_false Test4RemoveMethod::Child.instance_methods(false).include? :hello
-end
-
-assert('Module#undef_method', '15.2.2.4.42') do
-  module Test4UndefMethod
-    class Parent
-      def hello
-      end
-     end
-
-     class Child < Parent
-      def hello
-      end
-     end
-
-     class GrandChild < Child
-     end
-  end
-  Test4UndefMethod::Child.class_eval{ undef_method :hello }
-
-  assert_true Test4UndefMethod::Parent.new.respond_to?(:hello)
-  assert_false Test4UndefMethod::Child.new.respond_to?(:hello)
-  assert_false Test4UndefMethod::GrandChild.new.respond_to?(:hello)
-  assert_false Test4UndefMethod::Child.instance_methods(false).include? :hello
-end
-
-# Not ISO specified
-
-assert('Module#define_method') do
-  c = Class.new {
-    define_method(:m1) { :ok }
-    define_method(:m2, Proc.new { :ok })
-  }
-  assert_equal c.new.m1, :ok
-  assert_equal c.new.m2, :ok
-  assert_raise(TypeError) do
-    Class.new { define_method(:n1, nil) }
-  end
-end
-
-# @!group prepend
-  assert('Module#prepend') do
-    module M0
-      def m1; [:M0] end
-    end
-    module M1
-      def m1; [:M1, super, :M1] end
-    end
-    module M2
-      def m1; [:M2, super, :M2] end
-    end
-    M3 = Module.new do
-      def m1; [:M3, super, :M3] end
-    end
-    module M4
-      def m1; [:M4, super, :M4] end
-    end
-
-    class P0
-      include M0
-      prepend M1
-      def m1; [:C0, super, :C0] end
-    end
-    class P1 < P0
-      prepend M2, M3
-      include M4
-      def m1; [:C1, super, :C1] end
-    end
-
-    obj = P1.new
-    expected = [:M2,[:M3,[:C1,[:M4,[:M1,[:C0,[:M0],:C0],:M1],:M4],:C1],:M3],:M2]
-    assert_equal(expected, obj.m1)
-  end
-
-  # mruby shouldn't be affected by this since there is
-  # no visibility control (yet)
-  assert('Module#prepend public') do
-    assert_nothing_raised('ruby/ruby #8846') do
-      Class.new.prepend(Module.new)
-    end
-  end
-
-  assert('Module#prepend inheritance') do
-    bug6654 = '[ruby-core:45914]'
-    a = labeled_module('a')
-    b = labeled_module('b') { include a }
-    c = labeled_module('c') { prepend b }
-
-    #assert bug6654 do
-      # the Module#< operator should be used here instead, but we don't have it
-      assert_include(c.ancestors, a)
-      assert_include(c.ancestors, b)
-    #end
-
-    bug8357 = '[ruby-core:54736] [Bug #8357]'
-    b = labeled_module('b') { prepend a }
-    c = labeled_class('c') { include b }
-
-    #assert bug8357 do
-      # the Module#< operator should be used here instead, but we don't have it
-      assert_include(c.ancestors, a)
-      assert_include(c.ancestors, b)
-    #end
-
-    bug8357 = '[ruby-core:54742] [Bug #8357]'
-    assert_kind_of(b, c.new, bug8357)
-  end
-
-  assert('Moduler#prepend + #instance_methods') do
-    bug6655 = '[ruby-core:45915]'
-    assert_equal(Object.instance_methods, Class.new {prepend Module.new}.instance_methods, bug6655)
-  end
-
-  assert 'Module#prepend + #singleton_methods' do
-    o = Object.new
-    o.singleton_class.class_eval {prepend Module.new}
-    assert_equal([], o.singleton_methods)
-  end
-
-  assert 'Module#prepend + #remove_method' do
-    c = Class.new do
-      prepend Module.new { def foo; end }
-    end
-    assert_raise(NameError) do
-      c.class_eval do
-        remove_method(:foo)
-      end
-    end
-    c.class_eval do
-      def foo; end
-    end
-    removed = nil
-    c.singleton_class.class_eval do
-      define_method(:method_removed) {|id| removed = id}
-    end
-    assert_nothing_raised(NoMethodError, NameError, '[Bug #7843]') do
-      c.class_eval do
-        remove_method(:foo)
-      end
-    end
-    assert_equal(:foo, removed)
-  end
-
-  assert 'Module#prepend + Class#ancestors' do
-    bug6658 = '[ruby-core:45919]'
-    m = labeled_module("m")
-    c = labeled_class("c") {prepend m}
-    assert_equal([m, c], c.ancestors[0, 2], bug6658)
-
-    bug6662 = '[ruby-dev:45868]'
-    c2 = labeled_class("c2", c)
-    anc = c2.ancestors
-    assert_equal([c2, m, c, Object], anc[0..anc.index(Object)], bug6662)
-  end
-
-  assert 'Module#prepend + Module#ancestors' do
-    bug6659 = '[ruby-dev:45861]'
-    m0 = labeled_module("m0") { def x; [:m0, *super] end }
-    m1 = labeled_module("m1") { def x; [:m1, *super] end; prepend m0 }
-    m2 = labeled_module("m2") { def x; [:m2, *super] end; prepend m1 }
-    c0 = labeled_class("c0") { def x; [:c0] end }
-    c1 = labeled_class("c1") { def x; [:c1] end; prepend m2 }
-    c2 = labeled_class("c2", c0) { def x; [:c2, *super] end; include m2 }
-    #
-    assert_equal([m0, m1], m1.ancestors, bug6659)
-    #
-    bug6662 = '[ruby-dev:45868]'
-    assert_equal([m0, m1, m2], m2.ancestors, bug6662)
-    assert_equal([m0, m1, m2, c1], c1.ancestors[0, 4], bug6662)
-    assert_equal([:m0, :m1, :m2, :c1], c1.new.x)
-    assert_equal([c2, m0, m1, m2, c0], c2.ancestors[0, 5], bug6662)
-    assert_equal([:c2, :m0, :m1, :m2, :c0], c2.new.x)
-    #
-    m3 = labeled_module("m3") { include m1; prepend m1 }
-    assert_equal([m3, m0, m1], m3.ancestors)
-    m3 = labeled_module("m3") { prepend m1; include m1 }
-    assert_equal([m0, m1, m3], m3.ancestors)
-    m3 = labeled_module("m3") { prepend m1; prepend m1 }
-    assert_equal([m0, m1, m3], m3.ancestors)
-    m3 = labeled_module("m3") { include m1; include m1 }
-    assert_equal([m3, m0, m1], m3.ancestors)
-  end
-
-  assert 'Module#prepend #instance_methods(false)' do
-    bug6660 = '[ruby-dev:45863]'
-    assert_equal([:m1], Class.new{ prepend Module.new; def m1; end }.instance_methods(false), bug6660)
-    assert_equal([:m1], Class.new(Class.new{def m2;end}){ prepend Module.new; def m1; end }.instance_methods(false), bug6660)
-  end
-
-  assert 'cyclic Module#prepend' do
-    bug7841 = '[ruby-core:52205] [Bug #7841]'
-    m1 = Module.new
-    m2 = Module.new
-    m1.instance_eval { prepend(m2) }
-    assert_raise(ArgumentError, bug7841) do
-      m2.instance_eval { prepend(m1) }
-    end
-  end
-
-  # these assertions will not run without a #assert_seperately method
-  #assert 'test_prepend_optmethod' do
-  #  bug7983 = '[ruby-dev:47124] [Bug #7983]'
-  #  assert_separately [], %{
-  #    module M
-  #      def /(other)
-  #        to_f / other
-  #      end
-  #    end
-  #    Fixnum.send(:prepend, M)
-  #    assert_equal(0.5, 1 / 2, "#{bug7983}")
-  #  }
-  #  assert_equal(0, 1 / 2)
-  #end
-
-  # mruby has no visibility control
-  assert 'Module#prepend visibility' do
-    bug8005 = '[ruby-core:53106] [Bug #8005]'
-    c = Class.new do
-      prepend Module.new {}
-      def foo() end
-      protected :foo
-    end
-    a = c.new
-    assert_true a.respond_to?(:foo), bug8005
-    assert_nothing_raised(NoMethodError, bug8005) {a.send :foo}
-  end
-
-  # mruby has no visibility control
-  assert 'Module#prepend inherited visibility' do
-    bug8238 = '[ruby-core:54105] [Bug #8238]'
-    module Test4PrependVisibilityInherited
-      class A
-        def foo() A; end
-        private :foo
-      end
-      class B < A
-        public :foo
-        prepend Module.new
-      end
-    end
-    assert_equal(Test4PrependVisibilityInherited::A, Test4PrependVisibilityInherited::B.new.foo, "#{bug8238}")
-  end
-
-  assert 'Module#prepend + #included_modules' do
-    bug8025 = '[ruby-core:53158] [Bug #8025]'
-    mixin = labeled_module("mixin")
-    c = labeled_module("c") {prepend mixin}
-    im = c.included_modules
-    assert_not_include(im, c, bug8025)
-    assert_include(im, mixin, bug8025)
-    c1 = labeled_class("c1") {prepend mixin}
-    c2 = labeled_class("c2", c1)
-    im = c2.included_modules
-    assert_not_include(im, c1, bug8025)
-    assert_not_include(im, c2, bug8025)
-    assert_include(im, mixin, bug8025)
-  end
-
-  assert 'Module#prepend super in alias' do
-    skip "super does not currently work in aliased methods"
-    bug7842 = '[Bug #7842]'
-
-    p = labeled_module("P") do
-      def m; "P"+super; end
-    end
-
-    a = labeled_class("A") do
-      def m; "A"; end
-    end
-
-    b = labeled_class("B", a) do
-      def m; "B"+super; end
-      alias m2 m
-      prepend p
-      alias m3 m
-    end
-
-    assert_nothing_raised do
-      assert_equal("BA", b.new.m2, bug7842)
-    end
-
-    assert_nothing_raised do
-      assert_equal("PBA", b.new.m3, bug7842)
-    end
-  end
-
-  assert 'Module#prepend each class' do
-    m = labeled_module("M")
-    c1 = labeled_class("C1") {prepend m}
-    c2 = labeled_class("C2", c1) {prepend m}
-    assert_equal([m, c2, m, c1], c2.ancestors[0, 4], "should be able to prepend each class")
-  end
-
-  assert 'Module#prepend no duplication' do
-    m = labeled_module("M")
-    c = labeled_class("C") {prepend m; prepend m}
-    assert_equal([m, c], c.ancestors[0, 2], "should never duplicate")
-  end
-
-  assert 'Module#prepend in superclass' do
-    m = labeled_module("M")
-    c1 = labeled_class("C1")
-    c2 = labeled_class("C2", c1) {prepend m}
-    c1.class_eval {prepend m}
-    assert_equal([m, c2, m, c1], c2.ancestors[0, 4], "should accesisble prepended module in superclass")
-  end
-
-  # requires #assert_seperately
-  #assert 'Module#prepend call super' do
-  #  assert_separately([], <<-'end;') #do
-  #    bug10847 = '[ruby-core:68093] [Bug #10847]'
-  #    module M; end
-  #    Float.prepend M
-  #    assert_nothing_raised(SystemStackError, bug10847) do
-  #      0.3.numerator
-  #    end
-  #  end;
-  #end
-# @!endgroup prepend
-
-assert('Module#to_s') do
-  module Outer
-    class Inner; end
-    const_set :SetInner, Class.new
-  end
-
-  assert_equal 'Outer', Outer.to_s
-  assert_equal 'Outer::Inner', Outer::Inner.to_s
-  assert_equal 'Outer::SetInner', Outer::SetInner.to_s
-
-  outer = Module.new do
-    const_set :SetInner, Class.new
-  end
-  Object.const_set :SetOuter, outer
-
-  assert_equal 'SetOuter', SetOuter.to_s
-  assert_equal 'SetOuter::SetInner', SetOuter::SetInner.to_s
-
-  mod = Module.new
-  cls = Class.new
-
-  assert_equal "#<Module:0x", mod.to_s[0,11]
-  assert_equal "#<Class:0x", cls.to_s[0,10]
-end
-
-assert('Module#inspect') do
-  module Test4to_sModules
-  end
-
-  assert_equal 'Test4to_sModules', Test4to_sModules.inspect
-end
-
-assert('Issue 1467') do
-  module M1
-    def initialize()
-      super()
-    end
-  end
-
-  class C1
-    include M1
-     def initialize()
-       super()
-     end
-  end
-
-  class C2
-    include M1
-  end
-
-  C1.new
-  C2.new
-end
-
-assert('clone Module') do
-  module M1
-    def foo
-      true
-    end
-  end
-
-  class B
-    include M1.clone
-  end
-
-  B.new.foo
-end
-
-assert('Module#module_function') do
-  module M
-    def modfunc; end
-    module_function :modfunc
-  end
-
-  assert_true M.respond_to?(:modfunc)
-end
-
-assert('module with non-class/module outer raises TypeError') do
-  assert_raise(TypeError) { module 0::M1 end }
-  assert_raise(TypeError) { module []::M2 end }
-end
-
-assert('get constant of parent module in singleton class; issue #3568') do
-  actual = module GetConstantInSingletonTest
-    EXPECTED = "value"
-    class << self
-      EXPECTED
-    end
-  end
-
-  assert_equal("value", actual)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nameerror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nameerror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nameerror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nameerror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-##
-# NameError ISO Test
-
-assert('NameError', '15.2.31') do
-  assert_equal Class, NameError.class
-end
-
-assert('NameError#name', '15.2.31.2.1') do
-
-  # This check is not duplicate with 15.2.31.2.2 check.
-  # Because the NameError in this test is generated in
-  # C API.
-  class TestDummy
-    alias foo bar
-  rescue NameError => e
-    $test_dummy_result = e.name
-  end
-
-  assert_equal :bar, $test_dummy_result
-end
-
-assert('NameError#initialize', '15.2.31.2.2') do
-   e = NameError.new('a', :foo)
-
-   assert_equal NameError, e.class
-   assert_equal 'a', e.message
-   assert_equal :foo, e.name
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nil.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nil.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nil.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nil.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-##
-# NilClass ISO Test
-
-assert('NilClass', '15.2.4') do
-  assert_equal Class, NilClass.class
-end
-
-assert('NilClass', '15.2.4.1') do
-  assert_equal NilClass, nil.class
-  assert_false NilClass.method_defined? :new
-end
-
-assert('NilClass#&', '15.2.4.3.1') do
-  assert_false nil.&(true)
-  assert_false nil.&(nil)
-end
-
-assert('NilClass#^', '15.2.4.3.2') do
-  assert_true nil.^(true)
-  assert_false nil.^(false)
-end
-
-assert('NilClass#|', '15.2.4.3.3') do
-  assert_true nil.|(true)
-  assert_false nil.|(false)
-end
-
-assert('NilClass#nil?', '15.2.4.3.4') do
-  assert_true nil.nil?
-end
-
-assert('NilClass#to_s', '15.2.4.3.5') do
-  assert_equal '', nil.to_s
-end
-
-assert('safe navigation') do
-  assert_nil nil&.size
-  assert_equal 0, []&.size
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nomethoderror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nomethoderror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nomethoderror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/nomethoderror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-##
-# NoMethodError ISO Test
-
-assert('NoMethodError', '15.2.32') do
-  NoMethodError.class == Class
-  assert_raise NoMethodError do
-    doesNotExistAsAMethodNameForVerySure("")
-  end
-end
-
-assert('NoMethodError#args', '15.2.32.2.1') do
-  a = NoMethodError.new 'test', :test, [1, 2]
-  assert_equal [1, 2], a.args
-
-  assert_nothing_raised do
-    begin
-      doesNotExistAsAMethodNameForVerySure 3, 1, 4
-    rescue NoMethodError => e
-      assert_equal [3, 1, 4], e.args
-    end
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/numeric.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/numeric.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/numeric.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/numeric.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-##
-# Numeric ISO Test
-
-assert('Numeric', '15.2.7') do
-  assert_equal Class, Numeric.class
-end
-
-assert('Numeric#+@', '15.2.7.4.1') do
-  assert_equal(+1, +1)
-end
-
-assert('Numeric#-@', '15.2.7.4.2') do
-  assert_equal(-1, -1)
-end
-
-assert('Numeric#abs', '15.2.7.4.3') do
-  assert_equal(1, 1.abs)
-  assert_equal(1.0, -1.abs)
-end
-
-assert('Numeric#pow') do
-  assert_equal(8, 2 ** 3)
-  assert_equal(-8, -2 ** 3)
-  assert_equal(1, 2 ** 0)
-  assert_equal(1, 2.2 ** 0)
-  assert_equal(0.5, 2 ** -1)
-end
-
-assert('Numeric#/', '15.2.8.3.4') do
-  n = Class.new(Numeric){ def /(x); 15.1;end }.new
-
-  assert_equal(2, 10/5)
-  assert_equal(0.0625, 1/16)
-  assert_equal(15.1, n/10)
-  assert_raise(TypeError){ 1/n }
-  assert_raise(TypeError){ 1/nil }
-end
-
-# Not ISO specified
-
-assert('Numeric#**') do
-  assert_equal 8.0, 2.0**3
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/object.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/object.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/object.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/object.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-##
-# Object ISO Test
-
-assert('Object', '15.2.1') do
-  assert_equal Class, Object.class
-end
-
-assert('Object superclass', '15.2.1.2') do
-  assert_equal BasicObject, Object.superclass
-end
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/proc.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/proc.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/proc.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/proc.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,166 +0,0 @@
-##
-# Proc ISO Test
-
-assert('Proc', '15.2.17') do
-  assert_equal Class, Proc.class
-end
-
-assert('Proc.new', '15.2.17.3.1') do
-  assert_raise ArgumentError do
-    Proc.new
-  end
-
-  assert_equal (Proc.new {}).class, Proc
-end
-
-assert('Proc#[]', '15.2.17.4.1') do
-  a = 0
-  b = Proc.new { a += 1 }
-  b.[]
-
-  a2 = 0
-  b2 = Proc.new { |i| a2 += i }
-  b2.[](5)
-
-  assert_equal 1, a
-  assert_equal 5, a2
-end
-
-assert('Proc#arity', '15.2.17.4.2') do
-  a = Proc.new {|x, y|}.arity
-  b = Proc.new {|x, *y, z|}.arity
-  c = Proc.new {|x=0, y|}.arity
-  d = Proc.new {|(x, y), z=0|}.arity
-
-  assert_equal  2, a
-  assert_equal(-3, b)
-  assert_equal  1, c
-  assert_equal  1, d
-
-  e = ->(x=0, y){}.arity
-  f = ->((x, y), z=0){}.arity
-  g = ->(x=0){}.arity
-
-  assert_equal(-2, e)
-  assert_equal(-2, f)
-  assert_equal(-1, g)
-end
-
-assert('Proc#call', '15.2.17.4.3') do
-  a = 0
-  b = Proc.new { a += 1 }
-  b.call
-
-  a2 = 0
-  b2 = Proc.new { |i| a2 += i }
-  b2.call(5)
-
-  assert_equal 1, a
-  assert_equal 5, a2
-end
-
-assert('Proc#call proc args pos block') do
-  pr = Proc.new {|a,b,&c|
-    [a, b, c.class, c&&c.call(:x)]
-  }
-  assert_equal [nil, nil, Proc, :proc], (pr.call(){ :proc })
-  assert_equal [1, nil, Proc, :proc], (pr.call(1){ :proc })
-  assert_equal [1, 2, Proc, :proc], (pr.call(1, 2){ :proc })
-  assert_equal [1, 2, Proc, :proc], (pr.call(1, 2, 3){ :proc })
-  assert_equal [1, 2, Proc, :proc], (pr.call(1, 2, 3, 4){ :proc })
-
-  assert_equal [nil, nil, Proc, :x], (pr.call(){|x| x})
-  assert_equal [1, nil, Proc, :x], (pr.call(1){|x| x})
-  assert_equal [1, 2, Proc, :x], (pr.call(1, 2){|x| x})
-  assert_equal [1, 2, Proc, :x], (pr.call(1, 2, 3){|x| x})
-  assert_equal [1, 2, Proc, :x], (pr.call(1, 2, 3, 4){|x| x})
-end
-
-assert('Proc#call proc args pos rest post') do
-  pr = Proc.new {|a,b,*c,d,e|
-    [a,b,c,d,e]
-  }
-  assert_equal [nil, nil, [], nil, nil], pr.call()
-  assert_equal [1, nil, [], nil, nil], pr.call(1)
-  assert_equal [1, 2, [], nil, nil], pr.call(1,2)
-  assert_equal [1, 2, [], 3, nil], pr.call(1,2,3)
-  assert_equal [1, 2, [], 3, 4], pr.call(1,2,3,4)
-  assert_equal [1, 2, [3], 4, 5], pr.call(1,2,3,4,5)
-  assert_equal [1, 2, [3, 4], 5, 6], pr.call(1,2,3,4,5,6)
-  assert_equal [1, 2, [3, 4, 5], 6,7], pr.call(1,2,3,4,5,6,7)
-
-  assert_equal [nil, nil, [], nil, nil], pr.call([])
-  assert_equal [1, nil, [], nil, nil], pr.call([1])
-  assert_equal [1, 2, [], nil, nil], pr.call([1,2])
-  assert_equal [1, 2, [], 3, nil], pr.call([1,2,3])
-  assert_equal [1, 2, [], 3, 4], pr.call([1,2,3,4])
-  assert_equal [1, 2, [3], 4, 5], pr.call([1,2,3,4,5])
-  assert_equal [1, 2, [3, 4], 5, 6], pr.call([1,2,3,4,5,6])
-  assert_equal [1, 2, [3, 4, 5], 6,7], pr.call([1,2,3,4,5,6,7])
-end
-
-assert('Proc#return_does_not_break_self') do
-  class TestClass
-    attr_accessor :block
-    def initialize
-    end
-    def return_array
-      @block = Proc.new { self }
-      return []
-    end
-    def return_instance_variable
-      @block = Proc.new { self }
-      return @block
-    end
-    def return_const_fixnum
-      @block = Proc.new { self }
-      return 123
-    end
-    def return_nil
-      @block = Proc.new { self }
-      return nil
-    end
-  end
-
-  c = TestClass.new
-  assert_equal [], c.return_array
-  assert_equal c, c.block.call
-
-  c.return_instance_variable
-  assert_equal c, c.block.call
-
-  assert_equal 123, c.return_const_fixnum
-  assert_equal c, c.block.call
-
-  assert_equal nil, c.return_nil
-  assert_equal c, c.block.call
-end
-
-assert('call Proc#initialize if defined') do
-  a = []
-  c = Class.new(Proc) do
-    define_method(:initialize) do
-      a << :ok
-    end
-  end
-
-  assert_kind_of c, c.new{}
-  assert_equal [:ok], a
-end
-
-assert('&obj call to_proc if defined') do
-  pr = Proc.new{}
-  def mock(&b)
-    b
-  end
-  assert_equal pr.object_id, mock(&pr).object_id
-  assert_equal pr, mock(&pr)
-
-  obj = Object.new
-  def obj.to_proc
-    Proc.new{ :from_to_proc }
-  end
-  assert_equal :from_to_proc, mock(&obj).call
-
-  assert_raise(TypeError){ mock(&(Object.new)) }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/rangeerror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/rangeerror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/rangeerror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/rangeerror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-##
-# RangeError ISO Test
-
-assert('RangeError', '15.2.26') do
-  assert_equal Class, RangeError.class
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/range.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/range.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/range.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/range.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-##
-# Range ISO Test
-
-assert('Range', '15.2.14') do
-  assert_equal Class, Range.class
-end
-
-assert('Range#==', '15.2.14.4.1') do
-  assert_true (1..10) == (1..10)
-  assert_false (1..10) == (1..100)
-  assert_true (1..10) == Range.new(1.0, 10.0)
-end
-
-assert('Range#===', '15.2.14.4.2') do
-  a = (1..10)
-
-  assert_true a === 5
-  assert_false a === 20
-end
-
-assert('Range#begin', '15.2.14.4.3') do
-  assert_equal 1, (1..10).begin
-end
-
-assert('Range#each', '15.2.14.4.4') do
-  a = (1..3)
-  b = 0
-  a.each {|i| b += i}
-  assert_equal 6, b
-end
-
-assert('Range#end', '15.2.14.4.5') do
-  assert_equal 10, (1..10).end
-end
-
-assert('Range#exclude_end?', '15.2.14.4.6') do
-  assert_true (1...10).exclude_end?
-  assert_false (1..10).exclude_end?
-end
-
-assert('Range#first', '15.2.14.4.7') do
-  assert_equal 1, (1..10).first
-end
-
-assert('Range#include?', '15.2.14.4.8') do
-  assert_true (1..10).include?(10)
-  assert_false (1..10).include?(11)
-
-  assert_true (1...10).include?(9)
-  assert_false (1...10).include?(10)
-end
-
-assert('Range#initialize', '15.2.14.4.9') do
-  a = Range.new(1, 10, true)
-  b = Range.new(1, 10, false)
-
-  assert_equal (1...10), a
-  assert_true a.exclude_end?
-  assert_equal (1..10), b
-  assert_false b.exclude_end?
-
-  assert_raise(NameError) { (0..1).send(:initialize, 1, 3) }
-end
-
-assert('Range#last', '15.2.14.4.10') do
-  assert_equal 10, (1..10).last
-end
-
-assert('Range#member?', '15.2.14.4.11') do
-  a = (1..10)
-
-  assert_true a.member?(5)
-  assert_false a.member?(20)
-end
-
-assert('Range#to_s', '15.2.14.4.12') do
-  assert_equal "0..1", (0..1).to_s
-  assert_equal "0...1", (0...1).to_s
-  assert_equal "a..b", ("a".."b").to_s
-  assert_equal "a...b", ("a"..."b").to_s
-end
-
-assert('Range#inspect', '15.2.14.4.13') do
-  assert_equal "0..1", (0..1).inspect
-  assert_equal "0...1", (0...1).inspect
-  assert_equal "\"a\"..\"b\"", ("a".."b").inspect
-  assert_equal "\"a\"...\"b\"", ("a"..."b").inspect
-end
-
-assert('Range#eql?', '15.2.14.4.14') do
-  assert_true (1..10).eql? (1..10)
-  assert_false (1..10).eql? (1..100)
-  assert_false (1..10).eql? (Range.new(1.0, 10.0))
-  assert_false (1..10).eql? "1..10"
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/regexperror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/regexperror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/regexperror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/regexperror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-##
-# RegexpError ISO Test
-
-# TODO broken ATM assert('RegexpError', '15.2.27') do
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/runtimeerror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/runtimeerror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/runtimeerror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/runtimeerror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-##
-# RuntimeError ISO Test
-
-assert('RuntimeError', '15.2.28') do
-  assert_equal Class, RuntimeError.class
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/standarderror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/standarderror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/standarderror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/standarderror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-##
-# StandardError ISO Test
-
-assert('StandardError', '15.2.23') do
-  assert_equal Class, StandardError.class
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/string.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/string.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/string.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/string.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,727 +0,0 @@
-# coding: utf-8
-##
-# String ISO Test
-
-UTF8STRING = ("\343\201\202".size == 1)
-
-assert('String', '15.2.10') do
-  assert_equal Class, String.class
-end
-
-assert('String#<=>', '15.2.10.5.1') do
-  a = '' <=> ''
-  b = '' <=> 'not empty'
-  c = 'not empty' <=> ''
-  d = 'abc' <=> 'cba'
-  e = 'cba' <=> 'abc'
-
-  assert_equal  0, a
-  assert_equal(-1, b)
-  assert_equal  1, c
-  assert_equal(-1, d)
-  assert_equal  1, e
-end
-
-assert('String#==', '15.2.10.5.2') do
-  assert_equal 'abc', 'abc'
-  assert_not_equal 'abc', 'cba'
-end
-
-# 'String#=~', '15.2.10.5.3' will be tested in mrbgems.
-
-assert('String#+', '15.2.10.5.4') do
-  assert_equal 'ab', 'a' + 'b'
-end
-
-assert('String#*', '15.2.10.5.5') do
-  assert_equal 'aaaaa', 'a' * 5
-  assert_equal '', 'a' * 0
-  assert_raise(ArgumentError) do
-    'a' * -1
-  end
-end
-
-assert('String#[]', '15.2.10.5.6') do
-  # length of args is 1
-  a = 'abc'[0]
-  b = 'abc'[-1]
-  c = 'abc'[10]
-  d = 'abc'[-10]
-  e = 'abc'[1.1]
-
-  # length of args is 2
-  a1 = 'abc'[0, -1]
-  b1 = 'abc'[10, 0]
-  c1 = 'abc'[-10, 0]
-  d1 = 'abc'[0, 0]
-  e1 = 'abc'[1, 2]
-
-  # args is RegExp
-  # It will be tested in mrbgems.
-
-  # args is String
-  a3 = 'abc'['bc']
-  b3 = 'abc'['XX']
-
-  assert_equal 'a', 'a'
-  # assert_equal 'c', b
-  # assert_nil c
-  # assert_nil d
-  # assert_equal 'b', e
-  # assert_nil a1
-  # assert_nil b1
-  # assert_nil c1
-  # assert_equal '', d1
-  # assert_equal 'bc', e1
-  # assert_equal 'bc', a3
-  # assert_nil b3
-
-  # assert_raise(TypeError) do
-  #   a[nil]
-  # end
-end
-
-assert('String#[](UTF-8)', '15.2.10.5.6') do
-  assert_equal "ち", "こんにちは世界"[3]
-  assert_equal nil, "こんにちは世界"[20]
-  assert_equal "世", "こんにちは世界"[-2]
-  assert_equal "世界", "こんにちは世界"[-2..-1]
-  assert_equal "んに", "こんにちは世界"[1,2]
-  assert_equal "世", "こんにちは世界"["世"]
-end if UTF8STRING
-
-assert('String#[] with Range') do
-  a1 = 'abc'[1..0]
-  b1 = 'abc'[1..1]
-  c1 = 'abc'[1..2]
-  d1 = 'abc'[1..3]
-  e1 = 'abc'[1..4]
-  f1 = 'abc'[0..-2]
-  g1 = 'abc'[-2..3]
-  h1 = 'abc'[3..4]
-  i1 = 'abc'[4..5]
-  j1 = 'abcdefghijklmnopqrstuvwxyz'[1..3]
-  a2 = 'abc'[1...0]
-  b2 = 'abc'[1...1]
-  c2 = 'abc'[1...2]
-  d2 = 'abc'[1...3]
-  e2 = 'abc'[1...4]
-  f2 = 'abc'[0...-2]
-  g2 = 'abc'[-2...3]
-  h2 = 'abc'[3...4]
-  i2 = 'abc'[4...5]
-  j2 = 'abcdefghijklmnopqrstuvwxyz'[1...3]
-
-  assert_equal '', a1
-  assert_equal 'b', b1
-  assert_equal 'bc', c1
-  assert_equal 'bc', d1
-  assert_equal 'bc', e1
-  assert_equal 'ab', f1
-  assert_equal 'bc', g1
-  assert_equal '', h1
-  assert_nil i2
-  assert_equal 'bcd', j1
-  assert_equal '', a2
-  assert_equal '', b2
-  assert_equal 'b', c2
-  assert_equal 'bc', d2
-  assert_equal 'bc', e2
-  assert_equal 'a', f2
-  assert_equal 'bc', g2
-  assert_equal '', h2
-  assert_nil i2
-  assert_equal 'bc', j2
-end
-
-assert('String#[]=') do
-  # length of args is 1
-  a = 'abc'
-  a[0] = 'X'
-  assert_equal 'Xbc', a
-
-  b = 'abc'
-  b[-1] = 'X'
-  assert_equal 'abX', b
-
-  c = 'abc'
-  assert_raise(IndexError) do
-    c[10] = 'X'
-  end
-
-  d = 'abc'
-  assert_raise(IndexError) do
-    d[-10] = 'X'
-  end
-
-  e = 'abc'
-  e[1.1] = 'X'
-  assert_equal 'aXc', e
-
-
-  # length of args is 2
-  a1 = 'abc'
-  assert_raise(IndexError) do
-    a1[0, -1] = 'X'
-  end
-
-  b1 = 'abc'
-  assert_raise(IndexError) do
-    b1[10, 0] = 'X'
-  end
-
-  c1 = 'abc'
-  assert_raise(IndexError) do
-    c1[-10, 0] = 'X'
-  end
-
-  d1 = 'abc'
-  d1[0, 0] = 'X'
-  assert_equal 'Xabc', d1
-
-  e1 = 'abc'
-  e1[1, 3] = 'X'
-  assert_equal 'aX', e1
-
-  # args is RegExp
-  # It will be tested in mrbgems.
-
-  # args is String
-  a3 = 'abc'
-  a3['bc'] = 'X'
-  assert_equal a3, 'aX'
-
-  b3 = 'abc'
-  assert_raise(IndexError) do
-    b3['XX'] = 'Y'
-  end
-end
-
-assert('String#capitalize', '15.2.10.5.7') do
-  a = 'abc'
-  a.capitalize
-
-  assert_equal 'abc', a
-  assert_equal 'Abc', 'abc'.capitalize
-end
-
-assert('String#capitalize!', '15.2.10.5.8') do
-  a = 'abc'
-  a.capitalize!
-
-  assert_equal 'Abc', a
-  assert_equal nil, 'Abc'.capitalize!
-end
-
-assert('String#chomp', '15.2.10.5.9') do
-  a = 'abc'.chomp
-  b = ''.chomp
-  c = "abc\n".chomp
-  d = "abc\n\n".chomp
-  e = "abc\t".chomp("\t")
-  f = "abc\n"
-
-  f.chomp
-
-  assert_equal 'abc', a
-  assert_equal '', b
-  assert_equal 'abc', c
-  assert_equal "abc\n", d
-  assert_equal 'abc', e
-  assert_equal "abc\n", f
-end
-
-assert('String#chomp!', '15.2.10.5.10') do
-  a = 'abc'
-  b = ''
-  c = "abc\n"
-  d = "abc\n\n"
-  e = "abc\t"
-
-  a.chomp!
-  b.chomp!
-  c.chomp!
-  d.chomp!
-  e.chomp!("\t")
-
-  assert_equal 'abc', a
-  assert_equal '', b
-  assert_equal 'abc', c
-  assert_equal "abc\n", d
-  assert_equal 'abc', e
-end
-
-assert('String#chomp! uses the correct length') do
-  class A
-    def to_str
-      $s.replace("AA")
-      "A"
-    end
-  end
-
-  $s = "AAA"
-  $s.chomp!(A.new)
-  assert_equal $s, "A"
-end
-
-assert('String#chop', '15.2.10.5.11') do
-  a = ''.chop
-  b = 'abc'.chop
-  c = 'abc'
-
-  c.chop
-
-  assert_equal '', a
-  assert_equal 'ab', b
-  assert_equal 'abc', c
-end
-
-assert('String#chop(UTF-8)', '15.2.10.5.11') do
-  a = ''.chop
-  b = 'あいう'.chop
-  c = "あ\nい".chop.chop
-
-  assert_equal '', a
-  assert_equal 'あい', b
-  assert_equal 'あ', c
-end if UTF8STRING
-
-assert('String#chop!', '15.2.10.5.12') do
-  a = ''
-  b = 'abc'
-
-  a.chop!
-  b.chop!
-
-  assert_equal a, ''
-  assert_equal b, 'ab'
-end
-
-assert('String#chop!(UTF-8)', '15.2.10.5.12') do
-  a = ''
-  b = "あいうえ\n"
-  c = "あいうえ\n"
-
-  a.chop!
-  b.chop!
-  c.chop!
-  c.chop!
-
-  assert_equal a, ''
-  assert_equal b, 'あいうえ'
-  assert_equal c, 'あいう'
-end if UTF8STRING
-
-assert('String#downcase', '15.2.10.5.13') do
-  a = 'ABC'.downcase
-  b = 'ABC'
-
-  b.downcase
-
-  assert_equal 'abc', a
-  assert_equal 'ABC', b
-end
-
-assert('String#downcase!', '15.2.10.5.14') do
-  a = 'ABC'
-
-  a.downcase!
-
-  assert_equal 'abc', a
-  assert_equal nil, 'abc'.downcase!
-end
-
-assert('String#each_line', '15.2.10.5.15') do
-  a = "first line\nsecond line\nthird line"
-  list = ["first line\n", "second line\n", "third line"]
-  n_list = []
-
-  a.each_line do |line|
-    n_list << line
-  end
-
-  assert_equal list, n_list
-
-  n_list.clear
-  a.each_line("li") do |line|
-    n_list << line
-  end
-  assert_equal ["first li", "ne\nsecond li", "ne\nthird li", "ne"], n_list
-end
-
-assert('String#empty?', '15.2.10.5.16') do
-  a = ''
-  b = 'not empty'
-
-  assert_true a.empty?
-  assert_false b.empty?
-end
-
-assert('String#eql?', '15.2.10.5.17') do
-  assert_true 'abc'.eql?('abc')
-  assert_false 'abc'.eql?('cba')
-end
-
-assert('String#gsub', '15.2.10.5.18') do
-  assert_equal('aBcaBc', 'abcabc'.gsub('b', 'B'), 'gsub without block')
-  assert_equal('aBcaBc', 'abcabc'.gsub('b'){|w| w.capitalize }, 'gsub with block')
-  assert_equal('$a$a$',  '#a#a#'.gsub('#', '$'), 'mruby/mruby#847')
-  assert_equal('$a$a$',  '#a#a#'.gsub('#'){|w| '$' }, 'mruby/mruby#847 with block')
-  assert_equal('$$a$$',  '##a##'.gsub('##', '$$'), 'mruby/mruby#847 another case')
-  assert_equal('$$a$$',  '##a##'.gsub('##'){|w| '$$' }, 'mruby/mruby#847 another case with block')
-  assert_equal('A',      'a'.gsub('a', 'A'))
-  assert_equal('A',      'a'.gsub('a'){|w| w.capitalize })
-  assert_equal("<a><><>", 'a'.gsub('a', '<\0><\1><\2>'))
-  assert_equal(".h.e.l.l.o.", "hello".gsub("", "."))
-  a = []
-  assert_equal(".h.e.l.l.o.", "hello".gsub("") { |i| a << i; "." })
-  assert_equal(["", "", "", "", "", ""], a)
-  assert_raise(ArgumentError) { "".gsub }
-  assert_raise(ArgumentError) { "".gsub("", "", "") }
-end
-
-assert('String#gsub with backslash') do
-  s = 'abXcdXef'
-  assert_equal 'ab<\\>cd<\\>ef',    s.gsub('X', '<\\\\>')
-  assert_equal 'ab<X>cd<X>ef',      s.gsub('X', '<\\&>')
-  assert_equal 'ab<X>cd<X>ef',      s.gsub('X', '<\\0>')
-  assert_equal 'ab<ab>cd<abXcd>ef', s.gsub('X', '<\\`>')
-  assert_equal 'ab<cdXef>cd<ef>ef', s.gsub('X', '<\\\'>')
-end
-
-assert('String#gsub!', '15.2.10.5.19') do
-  a = 'abcabc'
-  a.gsub!('b', 'B')
-
-  b = 'abcabc'
-  b.gsub!('b') { |w| w.capitalize }
-
-  assert_equal 'aBcaBc', a
-  assert_equal 'aBcaBc', b
-end
-
-assert('String#hash', '15.2.10.5.20') do
-  a = 'abc'
-
-  assert_equal 'abc'.hash, a.hash
-end
-
-assert('String#include?', '15.2.10.5.21') do
-  assert_true 'abc'.include?('a')
-  assert_false 'abc'.include?('d')
-end
-
-assert('String#index', '15.2.10.5.22') do
-  assert_equal 0, 'abc'.index('a')
-  assert_nil 'abc'.index('d')
-  assert_equal 3, 'abcabc'.index('a', 1)
-  assert_equal 5, "hello".index("", 5)
-  assert_equal nil, "hello".index("", 6)
-end
-
-assert('String#initialize', '15.2.10.5.23') do
-  a = ''
-  a.initialize('abc')
-  assert_equal 'abc', a
-
-  a.initialize('abcdefghijklmnopqrstuvwxyz')
-  assert_equal 'abcdefghijklmnopqrstuvwxyz', a
-end
-
-assert('String#initialize_copy', '15.2.10.5.24') do
-  a = ''
-  a.initialize_copy('abc')
-
-  assert_equal 'abc', a
-end
-
-assert('String#intern', '15.2.10.5.25') do
-  assert_equal :abc, 'abc'.intern
-end
-
-assert('String#length', '15.2.10.5.26') do
-  assert_equal 3, 'abc'.length
-end
-
-# 'String#match', '15.2.10.5.27' will be tested in mrbgems.
-
-assert('String#replace', '15.2.10.5.28') do
-  a = ''
-  a.replace('abc')
-
-  assert_equal 'abc', a
-  assert_equal 'abc', 'cba'.replace(a)
-
-  b = 'abc' * 10
-  c = ('cba' * 10).dup
-  b.replace(c);
-  c.replace(b);
-  assert_equal c, b
-
-  # shared string
-  s = "foo" * 100
-  a = s[10, 90]                # create shared string
-  assert_equal("", s.replace(""))    # clear
-  assert_equal("", s)          # s is cleared
-  assert_not_equal("", a)      # a should not be affected
-end
-
-assert('String#reverse', '15.2.10.5.29') do
-  a = 'abc'
-  a.reverse
-
-  assert_equal 'abc', a
-  assert_equal 'cba', 'abc'.reverse
-end
-
-assert('String#reverse(UTF-8)', '15.2.10.5.29') do
-  assert_equal "ち", "こんにちは世界"[3]
-  assert_equal nil, "こんにちは世界"[20]
-  assert_equal "世", "こんにちは世界"[-2]
-  assert_equal "世界", "こんにちは世界"[-2..-1]
-  assert_equal "んに", "こんにちは世界"[1,2]
-  assert_equal "世", "こんにちは世界"["世"]
-end if UTF8STRING
-
-assert('String#reverse!', '15.2.10.5.30') do
-  a = 'abc'
-  a.reverse!
-
-  assert_equal 'cba', a
-  assert_equal 'cba', 'abc'.reverse!
-end
-
-assert('String#reverse!(UTF-8)', '15.2.10.5.30') do
-  a = 'こんにちは世界!'
-  a.reverse!
-
-  assert_equal '!界世はちにんこ', a
-  assert_equal '!界世はちにんこ', 'こんにちは世界!'.reverse!
-end if UTF8STRING
-
-assert('String#rindex', '15.2.10.5.31') do
-  assert_equal 0, 'abc'.rindex('a')
-  assert_nil 'abc'.rindex('d')
-  assert_equal 0, 'abcabc'.rindex('a', 1)
-  assert_equal 3, 'abcabc'.rindex('a', 4)
-end
-
-assert('String#rindex(UTF-8)', '15.2.10.5.31') do
-  str = "こんにちは世界!\nこんにちは世界!"
-  assert_nil str.index('さ')
-  assert_equal 3, str.index('ち')
-  assert_equal 12, str.index('ち', 10)
-  assert_equal nil, str.index("さ")
-end if UTF8STRING
-
-# 'String#scan', '15.2.10.5.32' will be tested in mrbgems.
-
-assert('String#size', '15.2.10.5.33') do
-  assert_equal 3, 'abc'.size
-end
-
-assert('String#size(UTF-8)', '15.2.10.5.33') do
-  str = 'こんにちは世界!'
-  assert_equal 8, str.size
-  assert_not_equal str.bytesize, str.size
-  assert_equal 2, str[1, 2].size
-end if UTF8STRING
-
-assert('String#slice', '15.2.10.5.34') do
-  # length of args is 1
-  a = 'abc'.slice(0)
-  b = 'abc'.slice(-1)
-  c = 'abc'.slice(10)
-  d = 'abc'.slice(-10)
-
-  # length of args is 2
-  a1 = 'abc'.slice(0, -1)
-  b1 = 'abc'.slice(10, 0)
-  c1 = 'abc'.slice(-10, 0)
-  d1 = 'abc'.slice(0, 0)
-  e1 = 'abc'.slice(1, 2)
-
-  # slice of shared string
-  e11 = e1.slice(0)
-
-  # args is RegExp
-  # It will be tested in mrbgems.
-
-  # args is String
-  a3 = 'abc'.slice('bc')
-  b3 = 'abc'.slice('XX')
-
-  assert_equal 'a', a
-  assert_equal 'c', b
-  assert_nil c
-  assert_nil d
-  assert_nil a1
-  assert_nil b1
-  assert_nil c1
-  assert_equal '', d1
-  assert_equal 'bc', e1
-  assert_equal 'b', e11
-  assert_equal 'bc', a3
-  assert_nil b3
-end
-
-# TODO Broken ATM
-assert('String#split', '15.2.10.5.35') do
-  # without RegExp behavior is actually unspecified
-  assert_equal ['abc', 'abc', 'abc'], 'abc abc abc'.split
-  assert_equal ["a", "b", "c", "", "d"], 'a,b,c,,d'.split(',')
-  assert_equal ['abc', 'abc', 'abc'], 'abc abc abc'.split(nil)
-  assert_equal ['a', 'b', 'c'], 'abc'.split("")
-end
-
-assert('String#split(UTF-8)', '15.2.10.5.35') do
-  got = "こんにちは世界!".split('')
-  assert_equal ['こ', 'ん', 'に', 'ち', 'は', '世', '界', '!'], got
-  got = "こんにちは世界!".split('に')
-  assert_equal ['こん', 'ちは世界!'], got
-end if UTF8STRING
-
-assert('String#sub', '15.2.10.5.36') do
-  assert_equal 'aBcabc', 'abcabc'.sub('b', 'B')
-  assert_equal 'aBcabc', 'abcabc'.sub('b') { |w| w.capitalize }
-  assert_equal 'aa$', 'aa#'.sub('#', '$')
-  assert_equal '.abc', "abc".sub("", ".")
-
-  str = "abc"
-  miss = str.sub("X", "Z")
-  assert_equal str, miss
-  assert_not_equal str.object_id, miss.object_id
-
-  a = []
-  assert_equal '.abc', "abc".sub("") { |i| a << i; "." }
-  assert_equal [""], a
-end
-
-assert('String#sub with backslash') do
-  s = 'abXcdXef'
-  assert_equal 'ab<\\>cdXef',    s.sub('X', '<\\\\>')
-  assert_equal 'ab<X>cdXef',     s.sub('X', '<\\&>')
-  assert_equal 'ab<X>cdXef',     s.sub('X', '<\\0>')
-  assert_equal 'ab<ab>cdXef',    s.sub('X', '<\\`>')
-  assert_equal 'ab<cdXef>cdXef', s.sub('X', '<\\\'>')
-end
-
-assert('String#sub!', '15.2.10.5.37') do
-  a = 'abcabc'
-  a.sub!('b', 'B')
-
-  b = 'abcabc'
-  b.sub!('b') { |w| w.capitalize }
-
-  assert_equal 'aBcabc', a
-  assert_equal 'aBcabc', b
-end
-
-assert('String#to_f', '15.2.10.5.38') do
-  a = ''.to_f
-  b = '123456789'.to_f
-  c = '12345.6789'.to_f
-  d = '1e-2147483648'.to_f
-  e = '1e2147483648'.to_f
-
-  assert_float(0.0, a)
-  assert_float(123456789.0, b)
-  assert_float(12345.6789, c)
-  assert_float(0, d)
-  assert_float(Float::INFINITY, e)
-end
-
-assert('String#to_i', '15.2.10.5.39') do
-  a = ''.to_i
-  b = '32143'.to_i
-  c = 'a'.to_i(16)
-  d = '100'.to_i(2)
-  e = '1_000'.to_i
-
-  assert_equal 0, a
-  assert_equal 32143, b
-  assert_equal 10, c
-  assert_equal 4, d
-  assert_equal 1_000, e
-end
-
-assert('String#to_s', '15.2.10.5.40') do
-  assert_equal 'abc', 'abc'.to_s
-end
-
-assert('String#to_sym', '15.2.10.5.41') do
-  assert_equal :abc, 'abc'.to_sym
-end
-
-assert('String#upcase', '15.2.10.5.42') do
-  a = 'abc'.upcase
-  b = 'abc'
-
-  b.upcase
-
-  assert_equal 'ABC', a
-  assert_equal 'abc', b
-end
-
-assert('String#upcase!', '15.2.10.5.43') do
-  a = 'abc'
-
-  a.upcase!
-
-  assert_equal 'ABC', a
-  assert_equal nil, 'ABC'.upcase!
-
-  a = 'abcdefghijklmnopqrstuvwxyz'
-  b = a.dup
-  a.upcase!
-  b.upcase!
-  assert_equal 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', b
-end
-
-assert('String#inspect', '15.2.10.5.46') do
-  # should not raise an exception - regress #1210
-  assert_nothing_raised do
-  ("\1" * 100).inspect
-  end
-
-  assert_equal "\"\\000\"", "\0".inspect
-end
-
-# Not ISO specified
-
-assert('String interpolation (mrb_str_concat for shared strings)') do
-  a = "A" * 32
-  assert_equal "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:", "#{a}:"
-end
-
-assert('Check the usage of a NUL character') do
-  "qqq\0ppp"
-end
-
-assert('String#bytes') do
-  str1 = "hello"
-  bytes1 = [104, 101, 108, 108, 111]
-
-  str2 = "\xFF"
-  bytes2 = [0xFF]
-
-  assert_equal bytes1, str1.bytes
-  assert_equal bytes2, str2.bytes
-end
-
-assert('String#each_byte') do
-  str1 = "hello"
-  bytes1 = [104, 101, 108, 108, 111]
-  bytes2 = []
-
-  str1.each_byte {|b| bytes2 << b }
-
-  assert_equal bytes1, bytes2
-end
-
-assert('String#freeze') do
-  str = "hello"
-  str.freeze
-
-  assert_raise(RuntimeError) { str.upcase! }
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/superclass.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/superclass.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/superclass.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/superclass.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-[
-  # [:Object, :implementation_defined_value, '15.2.2.1'],
-  [:Module, :Object, '15.2.2.2'],
-  [:Class, :Module, '15.2.3.2'],
-  [:NilClass, :Object, '15.2.4.2'],
-  [:TrueClass, :Object, '15.2.5.2'],
-  [:FalseClass, :Object, '15.2.6.2'],
-  [:Numeric, :Object, '15.2.7.2'],
-  [:Integer, :Numeric, '15.2.8.2'],
-  [:Float, :Numeric, '15.2.9.2'],
-  [:String, :Object, '15.2.10.2'],
-  [:Symbol, :Object, '15.2.11.2'],
-  [:Array, :Object, '15.2.12.2'],
-  [:Hash, :Object, '15.2.13.2'],
-  [:Range, :Object, '15.2.14.2'],
-#  [:Regexp, :Object, '15.2.15.2'],      #No Regexp in mruby core
-#  [:MatchData, :Object, '15.2.16.2'],
-  [:Proc, :Object, '15.2.17.2'],
-#  [:Struct, :Object, '15.2.18.2'],
-#  [:Time, :Object, '15.2.19.2'],
-#  [:IO, :Object, '15.2.20.2'],
-#  [:File, :IO, '15.2.21.2'],
-  [:Exception, :Object, '15.2.22.2'],
-  [:StandardError, :Exception, '15.2.23.2'],
-  [:ArgumentError, :StandardError, '15.2.24.2'],
-  # [:LocalJumpError, :StandardError, '15.2.25.2'],
-  [:LocalJumpError, :ScriptError, '15.2.25.2'], # mruby specific
-  [:RangeError, :StandardError, '12.2.26.2'],
-  [:RegexpError, :StandardError, '12.2.27.2'],
-  [:RuntimeError, :StandardError, '12.2.28.2'],
-  [:TypeError, :StandardError, '12.2.29.2'],
-#  [:ZeroDivisionError, :StandardError, '12.2.30.2'],  # No ZeroDivisionError in mruby
-  [:NameError, :StandardError, '15.2.31.2'],
-  [:NoMethodError, :NameError, '15.2.32.2'],
-  [:IndexError, :StandardError, '15.2.33.2'],
-#  [:IOError, :StandardError, '12.2.34.2'],
-#  [:EOFError, :IOError, '12.2.35.2'],
-#  [:SystemCallError, :StandardError, '15.2.36.2'],
-  [:ScriptError, :Exception, '12.2.37.2'],
-  [:SyntaxError, :ScriptError, '12.2.38.2'],
-#  [:LoadError, :ScriptError, '12.2.39,2'],
-].each do |cls, super_cls, iso|
-  assert "Direct superclass of #{cls}", iso do
-    skip "#{cls} isn't defined" unless Object.const_defined? cls
-    assert_equal Object.const_get(super_cls), Object.const_get(cls).superclass
-  end
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/symbol.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/symbol.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/symbol.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/symbol.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-##
-# Symbol ISO Test
-
-assert('Symbol') do
-  assert_equal :"a", :a
-  assert_equal :"a#{1}", :a1
-  assert_equal :'a', :a
-  assert_equal :'a#{1}', :"a\#{1}"
-end
-
-assert('Symbol', '15.2.11') do
-  assert_equal Class, Symbol.class
-end
-
-assert('Symbol#===', '15.2.11.3.1') do
-  assert_true :abc == :abc
-  assert_false :abc == :cba
-end
-
-assert('Symbol#id2name', '15.2.11.3.2') do
-  assert_equal 'abc', :abc.id2name
-end
-
-assert('Symbol#to_s', '15.2.11.3.3') do
-  assert_equal  'abc', :abc.to_s
-end
-
-assert('Symbol#to_sym', '15.2.11.3.4') do
-  assert_equal :abc, :abc.to_sym
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/syntax.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/syntax.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/syntax.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/syntax.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,468 +0,0 @@
-assert('__FILE__') do
-  file = __FILE__[-9, 9]
-  assert_equal 'syntax.rb', file
-end
-
-assert('__LINE__') do
-  assert_equal 7, __LINE__
-end
-
-assert('super', '11.3.4') do
-  assert_raise NoMethodError do
-    super
-  end
-
-  class SuperFoo
-    def foo
-      true
-    end
-    def bar(*a)
-      a
-    end
-  end
-  class SuperBar < SuperFoo
-    def foo
-      super
-    end
-    def bar(*a)
-      super(*a)
-    end
-  end
-  bar = SuperBar.new
-
-  assert_true bar.foo
-  assert_equal [1,2,3], bar.bar(1,2,3)
-end
-
-assert('yield', '11.3.5') do
-  assert_raise LocalJumpError do
-    yield
-  end
-  assert_raise LocalJumpError do
-    o = Object.new
-    def o.foo
-      yield
-    end
-    o.foo
-  end
-end
-
-assert('redo in a for loop (#3275)') do
-  sum = 0
-  for i in 1..10
-    sum += i
-    i -= 1
-    if i > 0
-      redo
-    end
-  end
-
-  assert_equal 220, sum
-end
-
-assert('Abbreviated variable assignment', '11.4.2.3.2') do
-  a ||= 1
-  b &&= 1
-  c = 1
-  c += 2
-
-  assert_equal 1, a
-  assert_nil b
-  assert_equal 3, c
-end
-
-assert('case expression', '11.5.2.2.4') do
-  # case-expression-with-expression, one when-clause
-  x = 0
-  case "a"
-  when "a"
-    x = 1
-  end
-  assert_equal 1, x
-
-  # case-expression-with-expression, multiple when-clauses
-  x = 0
-  case "b"
-  when "a"
-    x = 1
-  when "b"
-    x = 2
-  end
-  assert_equal 2, x
-
-  # no matching when-clause
-  x = 0
-  case "c"
-  when "a"
-    x = 1
-  when "b"
-    x = 2
-  end
-  assert_equal 0, x
-
-  # case-expression-with-expression, one when-clause and one else-clause
-  a = 0
-  case "c"
-  when "a"
-    x = 1
-  else
-    x = 3
-  end
-  assert_equal 3, x
-
-  # case-expression-without-expression, one when-clause
-  x = 0
-  case
-  when true
-    x = 1
-  end
-  assert_equal 1, x
-
-  # case-expression-without-expression, multiple when-clauses
-  x = 0
-  case
-  when 0 == 1
-    x = 1
-  when 1 == 1
-    x = 2
-  end
-  assert_equal 2, x
-
-  # case-expression-without-expression, one when-clause and one else-clause
-  x = 0
-  case
-  when 0 == 1
-    x = 1
-  else
-    x = 3
-  end
-  assert_equal 3, x
-
-  # multiple when-arguments
-  x = 0
-  case 4
-  when 1, 3, 5
-    x = 1
-  when 2, 4, 6
-    x = 2
-  end
-  assert_equal 2, x
-
-  # when-argument with splatting argument
-  x = :integer
-  odds  = [ 1, 3, 5, 7, 9 ]
-  evens = [ 2, 4, 6, 8 ]
-  case 5
-  when *odds
-    x = :odd
-  when *evens
-    x = :even
-  end
-  assert_equal :odd, x
-
-  true
-end
-
-assert('Nested const reference') do
-  module Syntax4Const
-    CONST1 = "hello world"
-    class Const2
-      def const1
-        CONST1
-      end
-    end
-  end
-  assert_equal "hello world", Syntax4Const::CONST1
-  assert_equal "hello world", Syntax4Const::Const2.new.const1
-end
-
-assert('Abbreviated variable assignment as returns') do
-  module Syntax4AbbrVarAsgnAsReturns
-    class A
-      def b
-        @c ||= 1
-      end
-    end
-  end
-  assert_equal 1, Syntax4AbbrVarAsgnAsReturns::A.new.b
-end
-
-assert('Splat and multiple assignment') do
-  *a = *[1,2,3]
-  b, *c = *[7,8,9]
-
-  assert_equal [1,2,3], a
-  assert_equal 7, b
-  assert_equal [8,9], c
-
-  (a, b), c = [1,2],3
-  assert_equal [1,2,3], [a,b,c]
-  (a, b), c = 1,2,3
-  assert_equal [1,nil,2], [a,b,c]
-end
-
-assert('Splat and multiple assignment from variable') do
-  a = [1, 2, 3]
-  b, *c = a
-
-  assert_equal 1, b
-  assert_equal [2, 3], c
-end
-
-assert('Splat and multiple assignment from variables') do
-  a = [1, 2, 3]
-  b = [4, 5, 6, 7]
-  c, d, *e, f, g = *a, *b
-
-  assert_equal 1, c
-  assert_equal 2, d
-  assert_equal [3, 4, 5], e
-  assert_equal 6, f
-  assert_equal 7, g
-end
-
-assert('Splat and multiple assignment in for') do
-  a = [1, 2, 3, 4, 5, 6, 7]
-  for b, c, *d, e, f in [a] do
-  end
-
-  assert_equal 1, b
-  assert_equal 2, c
-  assert_equal [3, 4, 5], d
-  assert_equal 6, e
-  assert_equal 7, f
-end
-
-assert('Splat without assignment') do
-  * = [0]
-  a, * = [1, 2]
-  assert_equal 1, a
-end
-
-assert('multiple assignment (rest)') do
-  *a = 0
-  assert_equal [0], a
-end
-
-assert('multiple assignment (rest+post)') do
-  *a, b = 0, 1, 2
-  *c, d = 3
-
-  assert_equal [0, 1], a
-  assert_equal 2, b
-  assert_equal [], c
-  assert_equal 3, d
-end
-
-assert('multiple assignment (nosplat array rhs)') do
-  a, *b = []
-  *c, d = [0]
-  e, *f, g = [1, 2]
-
-  assert_nil a
-  assert_equal [], b
-  assert_equal [], c
-  assert_equal 0, d
-  assert_equal 1, e
-  assert_equal [], f
-  assert_equal 2, g
-end
-
-assert('multiple assignment (empty array rhs #3236, #3239)') do
-  a,b,*c = []; assert_equal [nil, nil, []], [a, b, c]
-  a,b,*c = [1]; assert_equal [1, nil, []], [a, b, c]
-  a,b,*c = [nil]; assert_equal [nil,nil, []], [a, b, c]
-  a,b,*c = [[]]; assert_equal [[], nil, []], [a, b, c]
-end
-
-assert('Return values of case statements') do
-  a = [] << case 1
-  when 3 then 2
-  when 2 then 2
-  when 1 then 2
-  end
-
-  b = [] << case 1
-  when 2 then 2
-  else
-  end
-
-  def fb
-    n = 0
-    Proc.new do
-      n += 1
-      case
-      when n % 15 == 0
-      else n
-      end
-    end
-  end
-
-  assert_equal [2], a
-  assert_equal [nil], b
-  assert_equal 1, fb.call
-end
-
-assert('Return values of if and case statements') do
-  true_clause_value =
-    if true
-      1
-    else
-      case 2
-      when 3
-      end
-      4
-    end
-
-  assert_equal 1, true_clause_value
-end
-
-assert('Return values of no expression case statement') do
-  when_value =
-    case
-    when true
-      1
-    end
-
-  assert_equal 1, when_value
-end
-
-assert('splat object in assignment') do
-  o = Object.new
-  def o.to_a
-    nil
-  end
-  assert_equal [o], (a = *o)
-
-  def o.to_a
-    1
-  end
-  assert_raise(TypeError) { a = *o }
-
-  def o.to_a
-    [2]
-  end
-  assert_equal [2], (a = *o)
-end
-
-assert('splat object in case statement') do
-  o = Object.new
-  def o.to_a
-    nil
-  end
-  a = case o
-  when *o
-    1
-  end
-  assert_equal 1, a
-end
-
-assert('splat in case statement') do
-  values = [3,5,1,7,8]
-  testa = [1,2,7]
-  testb = [5,6]
-  resulta = []
-  resultb = []
-  resultc = []
-  values.each do |value|
-    case value
-    when *testa
-      resulta << value
-    when *testb
-      resultb << value
-    else
-      resultc << value
-    end
-  end
-
-  assert_equal [1,7], resulta
-  assert_equal [5], resultb
-  assert_equal [3,8], resultc
-end
-
-assert('External command execution.') do
-  module Kernel
-    sym = '`'.to_sym
-    alias_method :old_cmd, sym
-
-    results = []
-    define_method(sym) do |str|
-      results.push str
-      str
-    end
-
-    `test` # NOVAL NODE_XSTR
-    `test dynamic #{sym}` # NOVAL NODE_DXSTR
-    assert_equal ['test', 'test dynamic `'], results
-
-    t = `test` # VAL NODE_XSTR
-    assert_equal 'test', t
-    assert_equal ['test', 'test dynamic `', 'test'], results
-
-    t = `test dynamic #{sym}` # VAL NODE_DXSTR
-    assert_equal 'test dynamic `', t
-    assert_equal ['test', 'test dynamic `', 'test', 'test dynamic `'], results
-
-    alias_method sym, :old_cmd
-  end
-  true
-end
-
-assert('parenthesed do-block in cmdarg') do
-  class ParenDoBlockCmdArg
-    def test(block)
-      block.call
-    end
-  end
-  x = ParenDoBlockCmdArg.new
-  result = x.test (Proc.new do :ok; end)
-  assert_equal :ok, result
-end
-
-assert('method definition in cmdarg') do
-  if false
-    bar def foo; self.each do end end
-  end
-  true
-end
-
-assert('optional argument in the rhs default expressions') do
-  class OptArgInRHS
-    def foo
-      "method called"
-    end
-    def t(foo = foo)
-      foo
-    end
-    def t2(foo = foo())
-      foo
-    end
-  end
-  o = OptArgInRHS.new
-  assert_nil(o.t)
-  assert_equal("method called", o.t2)
-end
-
-assert('optional block argument in the rhs default expressions') do
-  assert_nil(Proc.new {|foo = foo| foo}.call)
-end
-
-assert('multiline comments work correctly') do
-=begin
-this is a comment with nothing after begin and end
-=end
-=begin  this is a comment 
-this is a comment with extra after =begin
-=end
-=begin
-this is a comment that has =end with spaces after it
-=end  
-=begin this is a comment
-this is a comment that has extra after =begin and =end with spaces after it
-=end  
-  line = __LINE__
-=begin	this is a comment
-this is a comment that has extra after =begin and =end with tabs after it
-=end	xxxxxxxxxxxxxxxxxxxxxxxxxx
-  assert_equal(line + 4, __LINE__)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/true.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/true.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/true.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/true.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-##
-# TrueClass ISO Test
-
-assert('TrueClass', '15.2.5') do
-  assert_equal Class, TrueClass.class
-end
-
-assert('TrueClass true', '15.2.5.1') do
-  assert_true true
-  assert_equal TrueClass, true.class
-  assert_false TrueClass.method_defined? :new
-end
-
-assert('TrueClass#&', '15.2.5.3.1') do
-  assert_true true.&(true)
-  assert_false true.&(false)
-end
-
-assert('TrueClass#^', '15.2.5.3.2') do
-  assert_false true.^(true)
-  assert_true true.^(false)
-end
-
-assert('TrueClass#to_s', '15.2.5.3.3') do
-  assert_equal 'true', true.to_s
-end
-
-assert('TrueClass#|', '15.2.5.3.4') do
-  assert_true true.|(true)
-  assert_true true.|(false)
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/typeerror.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/typeerror.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/typeerror.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/typeerror.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-##
-# TypeError ISO Test
-
-assert('TypeError', '15.2.29') do
-  assert_equal Class, TypeError.class
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/unicode.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/unicode.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/unicode.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/test/t/unicode.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-# Test of the \u notation
-
-assert('bare \u notation test') do
-  # Mininum and maximum one byte characters
-  assert_equal("\x00", "\u0000")
-  assert_equal("\x7F", "\u007F")
-
-  # Mininum and maximum two byte characters
-  assert_equal("\xC2\x80", "\u0080")
-  assert_equal("\xDF\xBF", "\u07FF")
-
-  # Mininum and maximum three byte characters
-  assert_equal("\xE0\xA0\x80", "\u0800")
-  assert_equal("\xEF\xBF\xBF", "\uFFFF")
-
-  # Four byte characters require the \U notation
-end
-
-assert('braced \u notation test') do
-  # Mininum and maximum one byte characters
-  assert_equal("\x00", "\u{0000}")
-  assert_equal("\x7F", "\u{007F}")
-
-  # Mininum and maximum two byte characters
-  assert_equal("\xC2\x80", "\u{0080}")
-  assert_equal("\xDF\xBF", "\u{07FF}")
-
-  # Mininum and maximum three byte characters
-  assert_equal("\xE0\xA0\x80", "\u{0800}")
-  assert_equal("\xEF\xBF\xBF", "\u{FFFF}")
-
-  # Mininum and maximum four byte characters
-  assert_equal("\xF0\x90\x80\x80", "\u{10000}")
-  assert_equal("\xF4\x8F\xBF\xBF", "\u{10FFFF}")
-end
-
-assert('braced multiple \u notation test') do
-  assert_equal("ABC", "\u{41 42 43}")
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/TODO cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/TODO
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/TODO	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/TODO	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-Things to do (Things that are not done yet)
-
-* special variables ($1,$2..)
-* super in aliased methods
-* multi-assignment decomposing
-* keyword arguments in def statement
-
-Things to improve (Done but things to fix)
-
-* Make additions as they are noticed.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/travis_config.rb cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/travis_config.rb
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/travis_config.rb	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/travis_config.rb	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-MRuby::Build.new('debug') do |conf|
-  toolchain :gcc
-  enable_debug
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.cc.flags += %w(-Werror=declaration-after-statement)
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_STRESS MRB_GC_FIXED_ARENA)
-  end
-
-  build_mrbc_exec
-end
-
-MRuby::Build.new('full-debug') do |conf|
-  toolchain :gcc
-  enable_debug
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
-
-  conf.enable_test
-end
-
-MRuby::Build.new do |conf|
-  toolchain :gcc
-
-  # include all core GEMs
-  conf.gembox 'full-core'
-  conf.cc.flags += %w(-Werror=declaration-after-statement)
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
-  end
-  conf.enable_bintest
-  conf.enable_test
-end
-
-MRuby::Build.new('cxx_abi') do |conf|
-  toolchain :gcc
-
-  conf.gembox 'full-core'
-  conf.cc.flags += %w(-Werror=declaration-after-statement)
-  conf.compilers.each do |c|
-    c.defines += %w(MRB_GC_FIXED_ARENA)
-  end
-  conf.enable_bintest
-  conf.enable_test
-
-  enable_cxx_abi
-
-  build_mrbc_exec
-end
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.travis.yml cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.travis.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-language: c
-
-sudo: false
-
-matrix:
-  include:
-    - os: linux
-      sudo: 9000
-    - os: osx
-      osx_image: xcode7.1
-
-addons:
-  apt:
-    packages:
-      - gperf
-
-env: MRUBY_CONFIG=travis_config.rb
-script: "./minirake all test"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.yardopts cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.yardopts
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.yardopts	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/mruby/.yardopts	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
---markup markdown
---plugin mruby
---plugin coderay
---output-dir doc/api
-
-src/**/*.c
-mrblib/**/*.rb
-include/**/*.h
-
-mrbgems/*/src/**/*.c
-mrbgems/*/mrblib/**/*.rb
-mrbgems/*/include/**/*.h
--
-AUTHORS
-MITL
-CONTRIBUTING.md
-doc/guides/*.md
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/.clang-format cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/.clang-format
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/.clang-format	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/.clang-format	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# requires clang-format >= 3.6
-BasedOnStyle: "LLVM"
-IndentWidth: 4
-ColumnLimit: 132
-BreakBeforeBraces: Linux
-AllowShortFunctionsOnASingleLine: None
-SortIncludes: false
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/LICENSE cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/LICENSE
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/LICENSE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Kazuho Oku, DeNA Co., Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1521 +0,0 @@
-/*
- * Copyright (c) 2015 Kazuho Oku, DeNA Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <limits.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <openssl/rand.h>
-#include <openssl/ssl.h>
-#include <openssl/rsa.h>
-#include <openssl/bn.h>
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-#include "neverbleed.h"
-
-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
-#define OPENSSL_1_1_API 1
-#else
-#define OPENSSL_1_1_API 0
-#endif
-
-enum neverbleed_type { NEVERBLEED_TYPE_ERROR, NEVERBLEED_TYPE_RSA, NEVERBLEED_TYPE_ECDSA };
-
-struct expbuf_t {
-    char *buf;
-    char *start;
-    char *end;
-    size_t capacity;
-};
-
-struct st_neverbleed_rsa_exdata_t {
-    neverbleed_t *nb;
-    size_t key_index;
-};
-
-struct st_neverbleed_thread_data_t {
-    pid_t self_pid;
-    int fd;
-};
-
-static void warnvf(const char *fmt, va_list args)
-{
-    char errbuf[256];
-
-    if (errno != 0) {
-        strerror_r(errno, errbuf, sizeof(errbuf));
-    } else {
-        errbuf[0] = '\0';
-    }
-
-    fprintf(stderr, "[openssl-privsep] ");
-    vfprintf(stderr, fmt, args);
-    if (errbuf[0] != '\0')
-        fputs(errbuf, stderr);
-    fputc('\n', stderr);
-}
-
-__attribute__((format(printf, 1, 2))) static void warnf(const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    warnvf(fmt, args);
-    va_end(args);
-}
-
-__attribute__((format(printf, 1, 2), noreturn)) static void dief(const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    warnvf(fmt, args);
-    va_end(args);
-
-    abort();
-}
-
-static char *dirname(const char *path)
-{
-    const char *last_slash = strrchr(path, '/');
-    char *ret;
-
-    if (last_slash == NULL) {
-        errno = 0;
-        dief("dirname: no slash in given path:%s", path);
-    }
-    if ((ret = malloc(last_slash + 1 - path)) == NULL)
-        dief("no memory");
-    memcpy(ret, path, last_slash - path);
-    ret[last_slash - path] = '\0';
-    return ret;
-}
-
-static void set_cloexec(int fd)
-{
-    if (fcntl(fd, F_SETFD, O_CLOEXEC) == -1)
-        dief("failed to set O_CLOEXEC to fd %d", fd);
-}
-
-static int read_nbytes(int fd, void *p, size_t sz)
-{
-    while (sz != 0) {
-        ssize_t r;
-        while ((r = read(fd, p, sz)) == -1 && errno == EINTR)
-            ;
-        if (r == -1) {
-            return -1;
-        } else if (r == 0) {
-            errno = 0;
-            return -1;
-        }
-        p = (char *)p + r;
-        sz -= r;
-    }
-    return 0;
-}
-
-static size_t expbuf_size(struct expbuf_t *buf)
-{
-    return buf->end - buf->start;
-}
-
-static void expbuf_dispose(struct expbuf_t *buf)
-{
-    if (buf->capacity != 0)
-        OPENSSL_cleanse(buf->buf, buf->capacity);
-    free(buf->buf);
-    memset(buf, 0, sizeof(*buf));
-}
-
-static void expbuf_reserve(struct expbuf_t *buf, size_t extra)
-{
-    char *n;
-
-    if (extra <= buf->buf + buf->capacity - buf->end)
-        return;
-
-    if (buf->capacity == 0)
-        buf->capacity = 4096;
-    while (buf->buf + buf->capacity - buf->end < extra)
-        buf->capacity *= 2;
-    if ((n = realloc(buf->buf, buf->capacity)) == NULL)
-        dief("realloc failed");
-    buf->start += n - buf->buf;
-    buf->end += n - buf->buf;
-    buf->buf = n;
-}
-
-static void expbuf_push_num(struct expbuf_t *buf, size_t v)
-{
-    expbuf_reserve(buf, sizeof(v));
-    memcpy(buf->end, &v, sizeof(v));
-    buf->end += sizeof(v);
-}
-
-static void expbuf_push_str(struct expbuf_t *buf, const char *s)
-{
-    size_t l = strlen(s) + 1;
-    expbuf_reserve(buf, l);
-    memcpy(buf->end, s, l);
-    buf->end += l;
-}
-
-static void expbuf_push_bytes(struct expbuf_t *buf, const void *p, size_t l)
-{
-    expbuf_push_num(buf, l);
-    expbuf_reserve(buf, l);
-    memcpy(buf->end, p, l);
-    buf->end += l;
-}
-
-static int expbuf_shift_num(struct expbuf_t *buf, size_t *v)
-{
-    if (expbuf_size(buf) < sizeof(*v))
-        return -1;
-    memcpy(v, buf->start, sizeof(*v));
-    buf->start += sizeof(*v);
-    return 0;
-}
-
-static char *expbuf_shift_str(struct expbuf_t *buf)
-{
-    char *nul = memchr(buf->start, '\0', expbuf_size(buf)), *ret;
-    if (nul == NULL)
-        return NULL;
-    ret = buf->start;
-    buf->start = nul + 1;
-    return ret;
-}
-
-static void *expbuf_shift_bytes(struct expbuf_t *buf, size_t *l)
-{
-    void *ret;
-    if (expbuf_shift_num(buf, l) != 0)
-        return NULL;
-    if (expbuf_size(buf) < *l)
-        return NULL;
-    ret = buf->start;
-    buf->start += *l;
-    return ret;
-}
-
-static int expbuf_write(struct expbuf_t *buf, int fd)
-{
-    struct iovec vecs[2] = {{NULL}};
-    size_t bufsz = expbuf_size(buf);
-    int vecindex;
-    ssize_t r;
-
-    vecs[0].iov_base = &bufsz;
-    vecs[0].iov_len = sizeof(bufsz);
-    vecs[1].iov_base = buf->start;
-    vecs[1].iov_len = bufsz;
-
-    for (vecindex = 0; vecindex != sizeof(vecs) / sizeof(vecs[0]);) {
-        while ((r = writev(fd, vecs + vecindex, sizeof(vecs) / sizeof(vecs[0]) - vecindex)) == -1 && errno == EINTR)
-            ;
-        if (r == -1)
-            return -1;
-        assert(r != 0);
-        while (r != 0 && r >= vecs[vecindex].iov_len) {
-            r -= vecs[vecindex].iov_len;
-            ++vecindex;
-        }
-        if (r != 0) {
-            vecs[vecindex].iov_base = (char *)vecs[vecindex].iov_base + r;
-            vecs[vecindex].iov_len -= r;
-        }
-    }
-
-    return 0;
-}
-
-static int expbuf_read(struct expbuf_t *buf, int fd)
-{
-    size_t sz;
-
-    if (read_nbytes(fd, &sz, sizeof(sz)) != 0)
-        return -1;
-    expbuf_reserve(buf, sz);
-    if (read_nbytes(fd, buf->end, sz) != 0)
-        return -1;
-    buf->end += sz;
-    return 0;
-}
-
-#if !defined(NAME_MAX) || defined(__linux__)
-/* readdir(3) is known to be thread-safe on Linux and should be thread-safe on a platform that does not have a predefined value for
-   NAME_MAX */
-#define FOREACH_DIRENT(dp, dent)                                                                                                   \
-    struct dirent *dent;                                                                                                           \
-    while ((dent = readdir(dp)) != NULL)
-#else
-#define FOREACH_DIRENT(dp, dent)                                                                                                   \
-    struct {                                                                                                                       \
-        struct dirent d;                                                                                                           \
-        char s[NAME_MAX + 1];                                                                                                      \
-    } dent_;                                                                                                                       \
-    struct dirent *dentp, *dent = &dent_.d;                                                                                        \
-    int ret;                                                                                                                       \
-    while ((ret = readdir_r(dp, dent, &dentp)) == 0 && dentp != NULL)
-#endif /* FOREACH_DIRENT */
-
-static void unlink_dir(const char *path)
-{
-    DIR *dp;
-    char buf[PATH_MAX];
-
-    if ((dp = opendir(path)) != NULL) {
-        FOREACH_DIRENT(dp, entp)
-        {
-            if (strcmp(entp->d_name, ".") == 0 || strcmp(entp->d_name, "..") == 0)
-                continue;
-            snprintf(buf, sizeof(buf), "%s/%s", path, entp->d_name);
-            unlink_dir(buf);
-        }
-        closedir(dp);
-    }
-    unlink(path);
-    rmdir(path);
-}
-
-void dispose_thread_data(void *_thdata)
-{
-    struct st_neverbleed_thread_data_t *thdata = _thdata;
-    assert(thdata->fd >= 0);
-    close(thdata->fd);
-    thdata->fd = -1;
-}
-
-struct st_neverbleed_thread_data_t *get_thread_data(neverbleed_t *nb)
-{
-    struct st_neverbleed_thread_data_t *thdata;
-    pid_t self_pid = getpid();
-    ssize_t r;
-
-    if ((thdata = pthread_getspecific(nb->thread_key)) != NULL) {
-        if (thdata->self_pid == self_pid)
-            return thdata;
-        /* we have been forked! */
-        close(thdata->fd);
-    } else {
-        if ((thdata = malloc(sizeof(*thdata))) == NULL)
-            dief("malloc failed");
-    }
-
-    thdata->self_pid = self_pid;
-#ifdef SOCK_CLOEXEC
-    if ((thdata->fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1)
-        dief("socket(2) failed");
-#else
-    if ((thdata->fd = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
-        dief("socket(2) failed");
-    set_cloexec(thdata->fd);
-#endif
-    while (connect(thdata->fd, (void *)&nb->sun_, sizeof(nb->sun_)) != 0)
-        if (errno != EINTR)
-            dief("failed to connect to privsep daemon");
-    while ((r = write(thdata->fd, nb->auth_token, sizeof(nb->auth_token))) == -1 && errno == EINTR)
-        ;
-    if (r != sizeof(nb->auth_token))
-        dief("failed to send authentication token");
-    pthread_setspecific(nb->thread_key, thdata);
-
-    return thdata;
-}
-
-static void get_privsep_data(const RSA *rsa, struct st_neverbleed_rsa_exdata_t **exdata,
-                             struct st_neverbleed_thread_data_t **thdata)
-{
-    *exdata = RSA_get_ex_data(rsa, 0);
-    if (*exdata == NULL) {
-        errno = 0;
-        dief("invalid internal ref");
-    }
-    *thdata = get_thread_data((*exdata)->nb);
-}
-
-static const size_t default_reserved_size = 8192;
-
-struct key_slots {
-    size_t size;
-    size_t reserved_size;
-    /* bit array slots:
-     *   1-bit slot available
-     *   0-bit slot unavailable
-     */
-    uint8_t *bita_avail;
-};
-
-static struct {
-    struct {
-        pthread_mutex_t lock;
-        RSA **keys;
-        struct key_slots rsa_slots;
-        EC_KEY **ecdsa_keys;
-        struct key_slots ecdsa_slots;
-    } keys;
-    neverbleed_t *nb;
-} daemon_vars = {{PTHREAD_MUTEX_INITIALIZER}};
-
-static RSA *daemon_get_rsa(size_t key_index)
-{
-    RSA *rsa;
-
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-    rsa = daemon_vars.keys.keys[key_index];
-    if (rsa)
-        RSA_up_ref(rsa);
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    return rsa;
-}
-
-/*
- *  Returns an available slot in bit array B
- *  or if not found, returns SIZE_MAX
- */
-static size_t bita_ffirst(const uint8_t *b, const size_t tot, size_t bits)
-{
-    if (bits >= tot)
-        return SIZE_MAX;
-
-    uint64_t w = *((uint64_t *) b);
-    /* __builtin_ffsll returns one plus the index of the least significant 1-bit, or zero if not found */
-    uint32_t r = __builtin_ffsll(w);
-    if (r)
-        return bits + r - 1; /* adjust result */
-
-    return bita_ffirst(&b[8], tot, bits + 64);
-}
-
-/*
- * bit operation helpers for the bit-array in key_slots
- */
-#define BITMASK(b) (1 << ((b) % CHAR_BIT))
-#define BITBYTE(b) ((b) / CHAR_BIT)
-#define BITSET(a, b) ((a)[BITBYTE(b)] |= BITMASK(b))
-#define BITUNSET(a, b) ((a)[BITBYTE(b)] &= ~BITMASK(b))
-#define BITBYTES(nb) ((nb + CHAR_BIT - 1) / CHAR_BIT)
-#define BITCHECK(a, b) ((a)[BITBYTE(b)] & BITMASK(b))
-
-static void adjust_slots_reserved_size(int type, struct key_slots *slots)
-{
-#define ROUND2WORD(n) (n + 64 - 1 - (n + 64 - 1) % 64)
-    if (!slots->reserved_size || (slots->size >= slots->reserved_size)) {
-        size_t size = slots->reserved_size ? ROUND2WORD((size_t)(slots->reserved_size * 0.50) + slots->reserved_size)
-                : default_reserved_size;
-#undef ROUND2WORD
-
-        switch (type) {
-        case NEVERBLEED_TYPE_RSA:
-            if ((daemon_vars.keys.keys = realloc(daemon_vars.keys.keys, sizeof(*daemon_vars.keys.keys) * size)) == NULL)
-                dief("no memory");
-            break;
-        case NEVERBLEED_TYPE_ECDSA:
-            if ((daemon_vars.keys.ecdsa_keys = realloc(daemon_vars.keys.ecdsa_keys, sizeof(*daemon_vars.keys.ecdsa_keys) * size)) == NULL)
-                dief("no memory");
-            break;
-        default:
-            dief("invalid type adjusting reserved");
-        }
-
-        uint8_t *b;
-        if ((b = realloc(slots->bita_avail, BITBYTES(size))) == NULL)
-            dief("no memory");
-
-        /* set all bits to 1 making all slots available */
-        memset(&b[BITBYTES(slots->reserved_size)], 0xff, BITBYTES(size - slots->reserved_size));
-
-        slots->bita_avail = b;
-        slots->reserved_size = size;
-    }
-}
-
-static size_t daemon_set_rsa(RSA *rsa)
-{
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-
-    adjust_slots_reserved_size(NEVERBLEED_TYPE_RSA, &daemon_vars.keys.rsa_slots);
-
-    size_t index = bita_ffirst(daemon_vars.keys.rsa_slots.bita_avail, daemon_vars.keys.rsa_slots.reserved_size, 0);
-
-    if (index == SIZE_MAX)
-        dief("no available slot for key");
-
-    /* set slot as unavailable */
-    BITUNSET(daemon_vars.keys.rsa_slots.bita_avail, index);
-
-    daemon_vars.keys.rsa_slots.size++;
-    daemon_vars.keys.keys[index] = rsa;
-    RSA_up_ref(rsa);
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    return index;
-}
-
-static int priv_encdec_proxy(const char *cmd, int flen, const unsigned char *from, unsigned char *_to, RSA *rsa, int padding)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    struct st_neverbleed_thread_data_t *thdata;
-    struct expbuf_t buf = {NULL};
-    size_t ret;
-    unsigned char *to;
-    size_t tolen;
-
-    get_privsep_data(rsa, &exdata, &thdata);
-
-    expbuf_push_str(&buf, cmd);
-    expbuf_push_bytes(&buf, from, flen);
-    expbuf_push_num(&buf, exdata->key_index);
-    expbuf_push_num(&buf, padding);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0 || (to = expbuf_shift_bytes(&buf, &tolen)) == NULL) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-    memcpy(_to, to, tolen);
-    expbuf_dispose(&buf);
-
-    return (int)ret;
-}
-
-static int priv_encdec_stub(const char *name,
-                            int (*func)(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding),
-                            struct expbuf_t *buf)
-{
-    unsigned char *from, to[4096];
-    size_t flen;
-    size_t key_index, padding;
-    RSA *rsa;
-    int ret;
-
-    if ((from = expbuf_shift_bytes(buf, &flen)) == NULL || expbuf_shift_num(buf, &key_index) != 0 ||
-        expbuf_shift_num(buf, &padding) != 0) {
-        errno = 0;
-        warnf("%s: failed to parse request", name);
-        return -1;
-    }
-    if ((rsa = daemon_get_rsa(key_index)) == NULL) {
-        errno = 0;
-        warnf("%s: invalid key index:%zu\n", name, key_index);
-        return -1;
-    }
-    ret = func((int)flen, from, to, rsa, (int)padding);
-    expbuf_dispose(buf);
-    RSA_free(rsa);
-
-    expbuf_push_num(buf, ret);
-    expbuf_push_bytes(buf, to, ret > 0 ? ret : 0);
-
-    return 0;
-}
-
-static int priv_enc_proxy(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
-{
-    return priv_encdec_proxy("priv_enc", flen, from, to, rsa, padding);
-}
-
-static int priv_enc_stub(struct expbuf_t *buf)
-{
-    return priv_encdec_stub(__FUNCTION__, RSA_private_encrypt, buf);
-}
-
-static int priv_dec_proxy(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
-{
-    return priv_encdec_proxy("priv_dec", flen, from, to, rsa, padding);
-}
-
-static int priv_dec_stub(struct expbuf_t *buf)
-{
-    return priv_encdec_stub(__FUNCTION__, RSA_private_decrypt, buf);
-}
-
-static int sign_proxy(int type, const unsigned char *m, unsigned int m_len, unsigned char *_sigret, unsigned *_siglen,
-                      const RSA *rsa)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    struct st_neverbleed_thread_data_t *thdata;
-    struct expbuf_t buf = {NULL};
-    size_t ret, siglen;
-    unsigned char *sigret;
-
-    get_privsep_data(rsa, &exdata, &thdata);
-
-    expbuf_push_str(&buf, "sign");
-    expbuf_push_num(&buf, type);
-    expbuf_push_bytes(&buf, m, m_len);
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0 || (sigret = expbuf_shift_bytes(&buf, &siglen)) == NULL) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-    memcpy(_sigret, sigret, siglen);
-    *_siglen = (unsigned)siglen;
-    expbuf_dispose(&buf);
-
-    return (int)ret;
-}
-
-static int sign_stub(struct expbuf_t *buf)
-{
-    unsigned char *m, sigret[4096];
-    size_t type, m_len, key_index;
-    RSA *rsa;
-    unsigned siglen = 0;
-    int ret;
-
-    if (expbuf_shift_num(buf, &type) != 0 || (m = expbuf_shift_bytes(buf, &m_len)) == NULL ||
-        expbuf_shift_num(buf, &key_index) != 0) {
-        errno = 0;
-        warnf("%s: failed to parse request", __FUNCTION__);
-        return -1;
-    }
-    if ((rsa = daemon_get_rsa(key_index)) == NULL) {
-        errno = 0;
-        warnf("%s: invalid key index:%zu", __FUNCTION__, key_index);
-        return -1;
-    }
-    ret = RSA_sign((int)type, m, (unsigned)m_len, sigret, &siglen, rsa);
-    expbuf_dispose(buf);
-    RSA_free(rsa);
-
-    expbuf_push_num(buf, ret);
-    expbuf_push_bytes(buf, sigret, ret == 1 ? siglen : 0);
-
-    return 0;
-}
-
-#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
-static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-{
-    if (n) {
-        *n = rsa->n;
-    }
-
-    if (e) {
-        *e = rsa->e;
-    }
-
-    if (d) {
-        *d = rsa->d;
-    }
-}
-
-static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-{
-    if (n == NULL || e == NULL) {
-        return 0;
-    }
-
-    BN_free(rsa->n);
-    BN_free(rsa->e);
-    BN_free(rsa->d);
-    rsa->n = n;
-    rsa->e = e;
-    rsa->d = d;
-
-    return 1;
-}
-
-static void RSA_set_flags(RSA *r, int flags)
-{
-    r->flags |= flags;
-}
-#endif
-
-static EVP_PKEY *create_pkey(neverbleed_t *nb, size_t key_index, const char *ebuf, const char *nbuf)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    RSA *rsa;
-    EVP_PKEY *pkey;
-    BIGNUM *e = NULL, *n = NULL;
-
-    if ((exdata = malloc(sizeof(*exdata))) == NULL) {
-        fprintf(stderr, "no memory\n");
-        abort();
-    }
-    exdata->nb = nb;
-    exdata->key_index = key_index;
-
-    rsa = RSA_new_method(nb->engine);
-    RSA_set_ex_data(rsa, 0, exdata);
-    if (BN_hex2bn(&e, ebuf) == 0) {
-        fprintf(stderr, "failed to parse e:%s\n", ebuf);
-        abort();
-    }
-    if (BN_hex2bn(&n, nbuf) == 0) {
-        fprintf(stderr, "failed to parse n:%s\n", nbuf);
-        abort();
-    }
-    RSA_set0_key(rsa, n, e, NULL);
-    RSA_set_flags(rsa, RSA_FLAG_EXT_PKEY);
-
-    pkey = EVP_PKEY_new();
-    EVP_PKEY_set1_RSA(pkey, rsa);
-    RSA_free(rsa);
-
-    return pkey;
-}
-
-#if OPENSSL_1_1_API
-
-static EC_KEY *daemon_get_ecdsa(size_t key_index)
-{
-    EC_KEY *ec_key;
-
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-    ec_key = daemon_vars.keys.ecdsa_keys[key_index];
-    if (ec_key)
-        EC_KEY_up_ref(ec_key);
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    return ec_key;
-}
-
-static size_t daemon_set_ecdsa(EC_KEY *ec_key)
-{
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-
-    adjust_slots_reserved_size(NEVERBLEED_TYPE_ECDSA, &daemon_vars.keys.ecdsa_slots);
-
-    size_t index = bita_ffirst(daemon_vars.keys.ecdsa_slots.bita_avail, daemon_vars.keys.ecdsa_slots.reserved_size, 0);
-
-    if (index == SIZE_MAX)
-        dief("no available slot for key");
-
-    /* set slot as unavailable */
-    BITUNSET(daemon_vars.keys.ecdsa_slots.bita_avail, index);
-
-    daemon_vars.keys.ecdsa_slots.size++;
-    daemon_vars.keys.ecdsa_keys[index] = ec_key;
-    EC_KEY_up_ref(ec_key);
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    return index;
-}
-
-static int ecdsa_sign_stub(struct expbuf_t *buf)
-{
-    unsigned char *m, sigret[4096];
-    size_t type, m_len, key_index;
-    EC_KEY *ec_key;
-    unsigned siglen = 0;
-    int ret;
-
-    if (expbuf_shift_num(buf, &type) != 0 || (m = expbuf_shift_bytes(buf, &m_len)) == NULL ||
-        expbuf_shift_num(buf, &key_index) != 0) {
-        errno = 0;
-        warnf("%s: failed to parse request", __FUNCTION__);
-        return -1;
-    }
-    if ((ec_key = daemon_get_ecdsa(key_index)) == NULL) {
-        errno = 0;
-        warnf("%s: invalid key index:%zu", __FUNCTION__, key_index);
-        return -1;
-    }
-
-    ret = ECDSA_sign((int)type, m, (unsigned)m_len, sigret, &siglen, ec_key);
-    expbuf_dispose(buf);
-
-    EC_KEY_free(ec_key);
-
-    expbuf_push_num(buf, ret);
-    expbuf_push_bytes(buf, sigret, ret == 1 ? siglen : 0);
-
-    return 0;
-}
-
-static void ecdsa_get_privsep_data(const EC_KEY *ec_key, struct st_neverbleed_rsa_exdata_t **exdata,
-                                   struct st_neverbleed_thread_data_t **thdata)
-{
-    *exdata = EC_KEY_get_ex_data(ec_key, 0);
-    if (*exdata == NULL) {
-        errno = 0;
-        dief("invalid internal ref");
-    }
-    *thdata = get_thread_data((*exdata)->nb);
-}
-
-static int ecdsa_sign_proxy(int type, const unsigned char *m, int m_len, unsigned char *_sigret, unsigned int *_siglen,
-                            const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *ec_key)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    struct st_neverbleed_thread_data_t *thdata;
-    struct expbuf_t buf = {};
-    size_t ret, siglen;
-    unsigned char *sigret;
-
-    ecdsa_get_privsep_data(ec_key, &exdata, &thdata);
-
-    /* as far as I've tested so far, kinv and rp are always NULL.
-       Looks like setup_sign will precompute this, but it is only
-       called sign_sig, and it seems to be not used in TLS ECDSA */
-    if (kinv != NULL || rp != NULL) {
-        errno = 0;
-        dief("unexpected non-NULL kinv and rp");
-    }
-
-    expbuf_push_str(&buf, "ecdsa_sign");
-    expbuf_push_num(&buf, type);
-    expbuf_push_bytes(&buf, m, m_len);
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0 || (sigret = expbuf_shift_bytes(&buf, &siglen)) == NULL) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-    memcpy(_sigret, sigret, siglen);
-    *_siglen = (unsigned)siglen;
-    expbuf_dispose(&buf);
-
-    return (int)ret;
-}
-
-static EVP_PKEY *ecdsa_create_pkey(neverbleed_t *nb, size_t key_index, int curve_name, const char *ec_pubkeybuf)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    EC_KEY *ec_key;
-    EC_GROUP *ec_group;
-    BIGNUM *ec_pubkeybn = NULL;
-    EC_POINT *ec_pubkey;
-    EVP_PKEY *pkey;
-
-    if ((exdata = malloc(sizeof(*exdata))) == NULL) {
-        fprintf(stderr, "no memory\n");
-        abort();
-    }
-    exdata->nb = nb;
-    exdata->key_index = key_index;
-
-    ec_key = EC_KEY_new_method(nb->engine);
-    EC_KEY_set_ex_data(ec_key, 0, exdata);
-
-    ec_group = EC_GROUP_new_by_curve_name(curve_name);
-    if (!ec_group) {
-        fprintf(stderr, "could not create EC_GROUP\n");
-        abort();
-    }
-
-    EC_KEY_set_group(ec_key, ec_group);
-
-    if (BN_hex2bn(&ec_pubkeybn, ec_pubkeybuf) == 0) {
-        fprintf(stderr, "failed to parse ECDSA ephemeral public key:%s\n", ec_pubkeybuf);
-        abort();
-    }
-
-    if ((ec_pubkey = EC_POINT_bn2point(ec_group, ec_pubkeybn, NULL, NULL)) == NULL) {
-        fprintf(stderr, "failed to get ECDSA ephemeral public key from BIGNUM\n");
-        abort();
-    }
-
-    EC_KEY_set_public_key(ec_key, ec_pubkey);
-
-    pkey = EVP_PKEY_new();
-    EVP_PKEY_set1_EC_KEY(pkey, ec_key);
-
-    EC_POINT_free(ec_pubkey);
-    BN_free(ec_pubkeybn);
-    EC_GROUP_free(ec_group);
-    EC_KEY_free(ec_key);
-
-    return pkey;
-}
-
-static void priv_ecdsa_finish(EC_KEY *key)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    struct st_neverbleed_thread_data_t *thdata;
-
-    ecdsa_get_privsep_data(key, &exdata, &thdata);
-
-    struct expbuf_t buf = {NULL};
-    size_t ret;
-
-    expbuf_push_str(&buf, "del_ecdsa_key");
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-    expbuf_dispose(&buf);
-}
-
-static int del_ecdsa_key_stub(struct expbuf_t *buf)
-{
-    size_t key_index;
-    int ret = 0;
-
-    if (expbuf_shift_num(buf, &key_index) != 0) {
-        errno = 0;
-        warnf("%s: failed to parse request", __FUNCTION__);
-        return -1;
-    }
-
-    if (!daemon_vars.keys.ecdsa_keys || key_index >= daemon_vars.keys.ecdsa_slots.reserved_size) {
-        errno = 0;
-        warnf("%s: invalid key index %zu", __FUNCTION__, key_index);
-        goto respond;
-    }
-
-    if (BITCHECK(daemon_vars.keys.ecdsa_slots.bita_avail, key_index)) {
-        warnf("%s: index not in use %zu", __FUNCTION__, key_index);
-        goto respond;
-    }
-
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-    /* set slot as available */
-    BITSET(daemon_vars.keys.ecdsa_slots.bita_avail, key_index);
-    daemon_vars.keys.ecdsa_slots.size--;
-    EC_KEY_free(daemon_vars.keys.ecdsa_keys[key_index]);
-    daemon_vars.keys.ecdsa_keys[key_index] = NULL;
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    ret = 1;
-
-respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, ret);
-    return 0;
-}
-
-#endif
-
-int neverbleed_load_private_key_file(neverbleed_t *nb, SSL_CTX *ctx, const char *fn, char *errbuf)
-{
-    struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
-    struct expbuf_t buf = {NULL};
-    int ret = 1;
-    size_t index, type;
-    EVP_PKEY *pkey;
-
-    expbuf_push_str(&buf, "load_key");
-    expbuf_push_str(&buf, fn);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &type) != 0 || expbuf_shift_num(&buf, &index) != 0) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-
-    switch (type) {
-    case NEVERBLEED_TYPE_RSA: {
-        char *estr, *nstr;
-
-        if ((estr = expbuf_shift_str(&buf)) == NULL || (nstr = expbuf_shift_str(&buf)) == NULL) {
-            errno = 0;
-            dief("failed to parse response");
-        }
-        pkey = create_pkey(nb, index, estr, nstr);
-        break;
-    }
-#if OPENSSL_1_1_API
-    case NEVERBLEED_TYPE_ECDSA: {
-        char *ec_pubkeystr;
-        size_t curve_name;
-
-        if (expbuf_shift_num(&buf, &curve_name) != 0 || (ec_pubkeystr = expbuf_shift_str(&buf)) == NULL) {
-            errno = 0;
-            dief("failed to parse response");
-        }
-        pkey = ecdsa_create_pkey(nb, index, curve_name, ec_pubkeystr);
-        break;
-    }
-#endif
-    default: {
-        char *errstr;
-
-        if ((errstr = expbuf_shift_str(&buf)) == NULL) {
-            errno = 0;
-            dief("failed to parse response");
-        }
-
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "%s", errstr);
-        return -1;
-    }
-    }
-
-    expbuf_dispose(&buf);
-
-    /* success */
-    if (SSL_CTX_use_PrivateKey(ctx, pkey) != 1) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "SSL_CTX_use_PrivateKey failed");
-        ret = 0;
-    }
-
-    EVP_PKEY_free(pkey);
-    return ret;
-}
-
-static int load_key_stub(struct expbuf_t *buf)
-{
-    char *fn;
-    FILE *fp = NULL;
-    RSA *rsa = NULL;
-    size_t key_index = SIZE_MAX;
-    char *estr = NULL, *nstr = NULL, errbuf[NEVERBLEED_ERRBUF_SIZE] = "";
-    size_t type = NEVERBLEED_TYPE_ERROR;
-    EVP_PKEY *pkey = NULL;
-    const EC_GROUP *ec_group;
-    BIGNUM *ec_pubkeybn = NULL;
-    char *ec_pubkeystr = NULL;
-
-    if ((fn = expbuf_shift_str(buf)) == NULL) {
-        warnf("%s: failed to parse request", __FUNCTION__);
-        return -1;
-    }
-
-    if ((fp = fopen(fn, "rt")) == NULL) {
-        strerror_r(errno, errbuf, sizeof(errbuf));
-        goto Respond;
-    }
-
-    if ((pkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL)) == NULL) {
-        snprintf(errbuf, sizeof(errbuf), "failed to parse the private key");
-        goto Respond;
-    }
-
-    switch (EVP_PKEY_base_id(pkey)) {
-    case EVP_PKEY_RSA: {
-        const BIGNUM *e, *n;
-
-        rsa = EVP_PKEY_get1_RSA(pkey);
-        type = NEVERBLEED_TYPE_RSA;
-        key_index = daemon_set_rsa(rsa);
-        RSA_get0_key(rsa, &n, &e, NULL);
-        estr = BN_bn2hex(e);
-        nstr = BN_bn2hex(n);
-        break;
-    }
-    case EVP_PKEY_EC: {
-#if OPENSSL_1_1_API
-        const EC_POINT *ec_pubkey;
-        EC_KEY *ec_key;
-
-        ec_key = EVP_PKEY_get0_EC_KEY(pkey);
-        type = NEVERBLEED_TYPE_ECDSA;
-        key_index = daemon_set_ecdsa(ec_key);
-        ec_group = EC_KEY_get0_group(ec_key);
-        ec_pubkey = EC_KEY_get0_public_key(ec_key);
-        ec_pubkeybn = BN_new();
-        if (!EC_POINT_point2bn(ec_group, ec_pubkey, POINT_CONVERSION_COMPRESSED, ec_pubkeybn, NULL)) {
-            type = NEVERBLEED_TYPE_ERROR;
-            snprintf(errbuf, sizeof(errbuf), "failed to convert ECDSA public key to BIGNUM");
-            goto Respond;
-        }
-        ec_pubkeystr = BN_bn2hex(ec_pubkeybn);
-        break;
-#else
-        snprintf(errbuf, sizeof(errbuf), "ECDSA support requires OpenSSL >= 1.1.0");
-        goto Respond;
-#endif
-    }
-    default:
-        snprintf(errbuf, sizeof(errbuf), "unsupported private key: %d", EVP_PKEY_base_id(pkey));
-        goto Respond;
-    }
-
-Respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, type);
-    expbuf_push_num(buf, key_index);
-    switch (type) {
-    case NEVERBLEED_TYPE_RSA:
-        expbuf_push_str(buf, estr != NULL ? estr : "");
-        expbuf_push_str(buf, nstr != NULL ? nstr : "");
-        break;
-    case NEVERBLEED_TYPE_ECDSA:
-        expbuf_push_num(buf, EC_GROUP_get_curve_name(ec_group));
-        expbuf_push_str(buf, ec_pubkeystr);
-        break;
-    default:
-        expbuf_push_str(buf, errbuf);
-    }
-    if (rsa != NULL)
-        RSA_free(rsa);
-    if (pkey != NULL)
-        EVP_PKEY_free(pkey);
-    if (estr != NULL)
-        OPENSSL_free(estr);
-    if (nstr != NULL)
-        OPENSSL_free(nstr);
-    if (ec_pubkeystr != NULL)
-        OPENSSL_free(ec_pubkeystr);
-    if (ec_pubkeybn != NULL)
-        BN_free(ec_pubkeybn);
-    if (fp != NULL)
-        fclose(fp);
-
-    return 0;
-}
-
-int neverbleed_setuidgid(neverbleed_t *nb, const char *user, int change_socket_ownership)
-{
-    struct st_neverbleed_thread_data_t *thdata = get_thread_data(nb);
-    struct expbuf_t buf = {NULL};
-    size_t ret;
-
-    expbuf_push_str(&buf, "setuidgid");
-    expbuf_push_str(&buf, user);
-    expbuf_push_num(&buf, change_socket_ownership);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-    expbuf_dispose(&buf);
-
-    return (int)ret;
-}
-
-static int setuidgid_stub(struct expbuf_t *buf)
-{
-    const char *user;
-    size_t change_socket_ownership;
-    struct passwd pwbuf, *pw;
-    char pwstrbuf[65536]; /* should be large enough */
-    int ret = -1;
-
-    if ((user = expbuf_shift_str(buf)) == NULL || expbuf_shift_num(buf, &change_socket_ownership) != 0) {
-        errno = 0;
-        warnf("%s: failed to parse request", __FUNCTION__);
-        return -1;
-    }
-
-    errno = 0;
-    if (getpwnam_r(user, &pwbuf, pwstrbuf, sizeof(pwstrbuf), &pw) != 0) {
-        warnf("%s: getpwnam_r failed", __FUNCTION__);
-        goto Respond;
-    }
-    if (pw == NULL) {
-        warnf("%s: failed to obtain information of user:%s", __FUNCTION__, user);
-        goto Respond;
-    }
-
-    if (change_socket_ownership) {
-        char *dir;
-        if (chown(daemon_vars.nb->sun_.sun_path, pw->pw_uid, pw->pw_gid) != 0)
-            dief("chown failed for:%s", daemon_vars.nb->sun_.sun_path);
-        dir = dirname(daemon_vars.nb->sun_.sun_path);
-        if (chown(dir, pw->pw_uid, pw->pw_gid) != 0)
-            dief("chown failed for:%s", dir);
-        free(dir);
-    }
-
-    /* setuidgid */
-    if (setgid(pw->pw_gid) != 0) {
-        warnf("%s: setgid(%d) failed", __FUNCTION__, (int)pw->pw_gid);
-        goto Respond;
-    }
-    if (initgroups(pw->pw_name, pw->pw_gid) != 0) {
-        warnf("%s: initgroups(%s, %d) failed", __FUNCTION__, pw->pw_name, (int)pw->pw_gid);
-        goto Respond;
-    }
-    if (setuid(pw->pw_uid) != 0) {
-        warnf("%s: setuid(%d) failed\n", __FUNCTION__, (int)pw->pw_uid);
-        goto Respond;
-    }
-    ret = 0;
-
-Respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, ret);
-    return 0;
-}
-
-__attribute__((noreturn)) static void *daemon_close_notify_thread(void *_close_notify_fd)
-{
-    int close_notify_fd = (int)((char *)_close_notify_fd - (char *)NULL);
-    char b;
-    ssize_t r;
-
-Redo:
-    r = read(close_notify_fd, &b, 1);
-    if (r == -1 && errno == EINTR)
-        goto Redo;
-    if (r > 0)
-        goto Redo;
-    /* close or error */
-
-    /* unlink the temporary directory and socket file */
-    unlink_dir(dirname(daemon_vars.nb->sun_.sun_path));
-
-    _exit(0);
-}
-
-static int priv_rsa_finish(RSA *rsa)
-{
-    struct st_neverbleed_rsa_exdata_t *exdata;
-    struct st_neverbleed_thread_data_t *thdata;
-
-    get_privsep_data(rsa, &exdata, &thdata);
-
-    struct expbuf_t buf = {NULL};
-    size_t ret;
-
-    expbuf_push_str(&buf, "del_rsa_key");
-    expbuf_push_num(&buf, exdata->key_index);
-    if (expbuf_write(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "write error" : "connection closed by daemon");
-    expbuf_dispose(&buf);
-
-    if (expbuf_read(&buf, thdata->fd) != 0)
-        dief(errno != 0 ? "read error" : "connection closed by daemon");
-    if (expbuf_shift_num(&buf, &ret) != 0) {
-        errno = 0;
-        dief("failed to parse response");
-    }
-    expbuf_dispose(&buf);
-
-    return (int)ret;
-}
-
-static int del_rsa_key_stub(struct expbuf_t *buf)
-{
-    size_t key_index;
-
-    int ret = 0;
-
-    if (expbuf_shift_num(buf, &key_index) != 0) {
-        errno = 0;
-        warnf("%s: failed to parse request", __FUNCTION__);
-        return -1;
-    }
-
-    if (!daemon_vars.keys.keys || key_index >= daemon_vars.keys.rsa_slots.reserved_size) {
-        errno = 0;
-        warnf("%s: invalid key index %zu", __FUNCTION__, key_index);
-        goto respond;
-    }
-
-    if (BITCHECK(daemon_vars.keys.rsa_slots.bita_avail, key_index)) {
-        warnf("%s: index not in use %zu", __FUNCTION__, key_index);
-        goto respond;
-    }
-
-    pthread_mutex_lock(&daemon_vars.keys.lock);
-    /* set slot as available */
-    BITSET(daemon_vars.keys.rsa_slots.bita_avail, key_index);
-    daemon_vars.keys.rsa_slots.size--;
-    RSA_free(daemon_vars.keys.keys[key_index]);
-    daemon_vars.keys.keys[key_index] = NULL;
-    pthread_mutex_unlock(&daemon_vars.keys.lock);
-
-    ret = 1;
-
-respond:
-    expbuf_dispose(buf);
-    expbuf_push_num(buf, ret);
-    return 0;
-}
-
-static void *daemon_conn_thread(void *_sock_fd)
-{
-    int sock_fd = (int)((char *)_sock_fd - (char *)NULL);
-    struct expbuf_t buf = {NULL};
-    unsigned char auth_token[NEVERBLEED_AUTH_TOKEN_SIZE];
-
-    /* authenticate */
-    if (read_nbytes(sock_fd, &auth_token, sizeof(auth_token)) != 0) {
-        warnf("failed to receive authencication token from client");
-        goto Exit;
-    }
-    if (memcmp(auth_token, daemon_vars.nb->auth_token, NEVERBLEED_AUTH_TOKEN_SIZE) != 0) {
-        warnf("client authentication failed");
-        goto Exit;
-    }
-
-    while (1) {
-        char *cmd;
-        if (expbuf_read(&buf, sock_fd) != 0) {
-            if (errno != 0)
-                warnf("read error");
-            break;
-        }
-        if ((cmd = expbuf_shift_str(&buf)) == NULL) {
-            errno = 0;
-            warnf("failed to parse request");
-            break;
-        }
-        if (strcmp(cmd, "priv_enc") == 0) {
-            if (priv_enc_stub(&buf) != 0)
-                break;
-        } else if (strcmp(cmd, "priv_dec") == 0) {
-            if (priv_dec_stub(&buf) != 0)
-                break;
-        } else if (strcmp(cmd, "sign") == 0) {
-            if (sign_stub(&buf) != 0)
-                break;
-#if OPENSSL_1_1_API
-        } else if (strcmp(cmd, "ecdsa_sign") == 0) {
-            if (ecdsa_sign_stub(&buf) != 0)
-                break;
-        } else if (strcmp(cmd, "del_ecdsa_key") == 0) {
-            if (del_ecdsa_key_stub(&buf) != 0)
-                break;
-#endif
-        } else if (strcmp(cmd, "load_key") == 0) {
-            if (load_key_stub(&buf) != 0)
-                break;
-        } else if (strcmp(cmd, "del_rsa_key") == 0) {
-            if (del_rsa_key_stub(&buf) != 0)
-                break;
-        } else if (strcmp(cmd, "setuidgid") == 0) {
-            if (setuidgid_stub(&buf) != 0)
-                break;
-        } else {
-            warnf("unknown command:%s", cmd);
-            break;
-        }
-        if (expbuf_write(&buf, sock_fd) != 0) {
-            warnf(errno != 0 ? "write error" : "connection closed by client");
-            break;
-        }
-        expbuf_dispose(&buf);
-    }
-
-Exit:
-    expbuf_dispose(&buf);
-    close(sock_fd);
-
-    return NULL;
-}
-
-__attribute__((noreturn)) static void daemon_main(int listen_fd, int close_notify_fd, const char *tempdir)
-{
-    pthread_t tid;
-    pthread_attr_t thattr;
-    int sock_fd;
-
-    { /* close all descriptors (except STDIN, STDOUT, STRERR, listen_fd, close_notify_fd) */
-        int fd = (int)sysconf(_SC_OPEN_MAX) - 1;
-        for (; fd > 2; --fd) {
-            if (fd == listen_fd || fd == close_notify_fd)
-                continue;
-            close(fd);
-        }
-    }
-
-    pthread_attr_init(&thattr);
-    pthread_attr_setdetachstate(&thattr, 1);
-
-    if (pthread_create(&tid, &thattr, daemon_close_notify_thread, (char *)NULL + close_notify_fd) != 0)
-        dief("pthread_create failed");
-
-    while (1) {
-        while ((sock_fd = accept(listen_fd, NULL, NULL)) == -1)
-            ;
-        if (pthread_create(&tid, &thattr, daemon_conn_thread, (char *)NULL + sock_fd) != 0)
-            dief("pthread_create failed");
-    }
-}
-
-#if !OPENSSL_1_1_API
-
-static RSA_METHOD static_rsa_method = {
-    "privsep RSA method", /* name */
-    NULL,                 /* rsa_pub_enc */
-    NULL,                 /* rsa_pub_dec */
-    priv_enc_proxy,       /* rsa_priv_enc */
-    priv_dec_proxy,       /* rsa_priv_dec */
-    NULL,                 /* rsa_mod_exp */
-    NULL,                 /* bn_mod_exp */
-    NULL,                 /* init */
-    priv_rsa_finish,      /* finish */
-    RSA_FLAG_SIGN_VER,    /* flags */
-    NULL,                 /* app data */
-    sign_proxy,           /* rsa_sign */
-    NULL,                 /* rsa_verify */
-    NULL                  /* rsa_keygen */
-};
-
-#endif
-
-int neverbleed_init(neverbleed_t *nb, char *errbuf)
-{
-    int pipe_fds[2] = {-1, -1}, listen_fd = -1;
-    char *tempdir = NULL;
-#if OPENSSL_1_1_API
-    const RSA_METHOD *default_method = RSA_PKCS1_OpenSSL();
-    EC_KEY_METHOD *ecdsa_method;
-    const EC_KEY_METHOD *ecdsa_default_method;
-    RSA_METHOD *rsa_method = RSA_meth_new("privsep RSA method", 0);
-
-    RSA_meth_set_priv_enc(rsa_method, priv_enc_proxy);
-    RSA_meth_set_priv_dec(rsa_method, priv_dec_proxy);
-    RSA_meth_set_sign(rsa_method, sign_proxy);
-
-    RSA_meth_set_pub_enc(rsa_method, RSA_meth_get_pub_enc(default_method));
-    RSA_meth_set_pub_dec(rsa_method, RSA_meth_get_pub_dec(default_method));
-    RSA_meth_set_verify(rsa_method, RSA_meth_get_verify(default_method));
-
-    RSA_meth_set_finish(rsa_method, priv_rsa_finish);
-
-    /* setup EC_KEY_METHOD for ECDSA */
-    ecdsa_default_method = EC_KEY_get_default_method();
-    ecdsa_method = EC_KEY_METHOD_new(ecdsa_default_method);
-
-    EC_KEY_METHOD_set_keygen(ecdsa_method, NULL);
-    EC_KEY_METHOD_set_compute_key(ecdsa_method, NULL);
-    /* it seems sign_sig and sign_setup is not used in TLS ECDSA. */
-    EC_KEY_METHOD_set_sign(ecdsa_method, ecdsa_sign_proxy, NULL, NULL);
-    EC_KEY_METHOD_set_init(ecdsa_method, NULL, priv_ecdsa_finish, NULL, NULL, NULL, NULL);
-#else
-    const RSA_METHOD *default_method = RSA_PKCS1_SSLeay();
-    RSA_METHOD *rsa_method = &static_rsa_method;
-
-    rsa_method->rsa_pub_enc = default_method->rsa_pub_enc;
-    rsa_method->rsa_pub_dec = default_method->rsa_pub_dec;
-    rsa_method->rsa_verify = default_method->rsa_verify;
-#endif
-
-    /* setup the daemon */
-    if (pipe(pipe_fds) != 0) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "pipe(2) failed:%s", strerror(errno));
-        goto Fail;
-    }
-    set_cloexec(pipe_fds[1]);
-    if ((tempdir = strdup("/tmp/openssl-privsep.XXXXXX")) == NULL) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "no memory");
-        goto Fail;
-    }
-    if (mkdtemp(tempdir) == NULL) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "failed to create temporary directory under /tmp:%s", strerror(errno));
-        goto Fail;
-    }
-    memset(&nb->sun_, 0, sizeof(nb->sun_));
-    nb->sun_.sun_family = AF_UNIX;
-    snprintf(nb->sun_.sun_path, sizeof(nb->sun_.sun_path), "%s/_", tempdir);
-    RAND_bytes(nb->auth_token, sizeof(nb->auth_token));
-    if ((listen_fd = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "socket(2) failed:%s", strerror(errno));
-        goto Fail;
-    }
-    if (bind(listen_fd, (void *)&nb->sun_, sizeof(nb->sun_)) != 0) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "failed to bind to %s:%s", nb->sun_.sun_path, strerror(errno));
-        goto Fail;
-    }
-    if (listen(listen_fd, SOMAXCONN) != 0) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "listen(2) failed:%s", strerror(errno));
-        goto Fail;
-    }
-    nb->daemon_pid = fork();
-    switch (nb->daemon_pid) {
-    case -1:
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "fork(2) failed:%s", strerror(errno));
-        goto Fail;
-    case 0:
-        close(pipe_fds[1]);
-#ifdef __linux__
-        prctl(PR_SET_DUMPABLE, 0, 0, 0, 0);
-#endif
-        daemon_vars.nb = nb;
-        daemon_main(listen_fd, pipe_fds[0], tempdir);
-        break;
-    default:
-        break;
-    }
-    close(listen_fd);
-    listen_fd = -1;
-    close(pipe_fds[0]);
-    pipe_fds[0] = -1;
-
-    /* setup engine */
-    if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
-        !ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
-#if OPENSSL_1_1_API
-        || !ENGINE_set_EC(nb->engine, ecdsa_method)
-#endif
-            ) {
-        snprintf(errbuf, NEVERBLEED_ERRBUF_SIZE, "failed to initialize the OpenSSL engine");
-        goto Fail;
-    }
-    ENGINE_add(nb->engine);
-
-    /* setup thread key */
-    pthread_key_create(&nb->thread_key, dispose_thread_data);
-
-    free(tempdir);
-    return 0;
-Fail:
-    if (pipe_fds[0] != -1)
-        close(pipe_fds[0]);
-    if (pipe_fds[1] != -1)
-        close(pipe_fds[1]);
-    if (tempdir != NULL) {
-        unlink_dir(tempdir);
-        free(tempdir);
-    }
-    if (listen_fd != -1)
-        close(listen_fd);
-    if (nb->engine != NULL) {
-        ENGINE_free(nb->engine);
-        nb->engine = NULL;
-    }
-    return -1;
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.h cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.h
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.h	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/neverbleed.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015 Kazuho Oku, DeNA Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#ifndef NEVERBLEED_H
-#define NEVERBLEED_H
-
-#include <pthread.h>
-#include <sys/un.h>
-#include <openssl/engine.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NEVERBLEED_ERRBUF_SIZE (256)
-#define NEVERBLEED_AUTH_TOKEN_SIZE 32
-
-typedef struct st_neverbleed_t {
-    ENGINE *engine;
-    pid_t daemon_pid;
-    struct sockaddr_un sun_;
-    pthread_key_t thread_key;
-    unsigned char auth_token[NEVERBLEED_AUTH_TOKEN_SIZE];
-} neverbleed_t;
-
-/**
- * initializes the privilege separation engine (returns 0 if successful)
- */
-int neverbleed_init(neverbleed_t *nb, char *errbuf);
-/**
- * loads a private key file (returns 1 if successful)
- */
-int neverbleed_load_private_key_file(neverbleed_t *nb, SSL_CTX *ctx, const char *fn, char *errbuf);
-/**
- * setuidgid (also changes the file permissions so that `user` can connect to the daemon, if change_socket_ownership is non-zero)
- */
-int neverbleed_setuidgid(neverbleed_t *nb, const char *user, int change_socket_ownership);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/README.md cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/README.md
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-Neverbleed
-===============
-
-Neverbleed is an [OpenSSL engine](https://www.openssl.org/docs/manmaster/crypto/engine.html) that runs RSA private key operations in an isolated process, thereby minimizing the risk of private key leak in case of vulnerability such as [Heartbleed](http://heartbleed.com/).
-
-The engine is known to work together with existing versions of OpenSSL or LibreSSL, with minimal changes to the server source code.
-
-FAQ
----
-
-### Q. How much is the overhead?
-
-Virtually none.
-
-Generally speaking, private key operations are much more heavier than the overhead of inter-process communication.
-On my Linux VM running on Core i7 @ 2.4GHz (MacBook Pro 15" Late 2013), OpenSSL 1.0.2 without privilege separation processes 319.56 full TLS handshakes per second, whereas OpenSSL with privilege separation processes 316.72 handshakes per second (note: RSA key length: 2,048 bits, selected cipher-suite: ECDHE-RSA-AES128-GCM-SHA256).
-
-### Q. Why does the library only protect the private keys?
-
-Because private keys are the only _long-term_ secret being used for encrypting and/or digitally-signing the communication.
-
-Depending on how OpenSSL is used, it might be beneficial to separate symmetric cipher operations or TLS operations as a whole.
-But even in such case, it would still be a good idea to isolate private key operations from them considering the impact of private key leaks.
-In other words, separating private key operations only to an isolated process in always a good thing to do.
-
-### Q. Is there any HTTP server that uses Neverbleed?
-
-Neverbleed is used by [H2O](https://h2o.examp1e.net/) HTTP2 server since version [1.5.0-beta4](https://github.com/h2o/h2o/releases/tag/v1.5.0-beta4).
-
-How-to
-------
-
-The library exposes two functions: `neverbleed_init` and `neverbleed_load_private_key_file`.
-
-The first function spawns an external process dedicated to private key operations, and the second function assigns a RSA private key stored in the specified file to an existing SSL context (`SSL_CTX`).
-
-By
-
-1. adding call to `neverbleed_init`
-2. replacing call to `SSL_CTX_use_PrivateKey_file` with `neverbleed_load_private_key_file`
-
-the privilege separation engine will be used for all the incoming TLS connections.
-
-```
-  neverbleed_t nb;
-  char errbuf[NEVERBLEED_ERRBUF_SIZE];
-
-  /* initialize the OpenSSL library and the neverbleed engine */
-  SSL_load_error_strings();
-  SSL_library_init();
-  OpenSSL_add_all_algorithms();
-  if (neverbleed_init(&nb, errbuf) != 0) {
-    fprintf(stderr, "neverbleed_init failed: %s\n", errbuf);
-    ...
-  }
-
-  ...
-
-  /* load certificate chain and private key */
-  if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certchain_fn) != 1) {
-    fprintf(stderr, "failed to load certificate chain file:%s\n", certchain_fn);
-    ...
-  }
-  if (neverbleed_load_private_key_file(&nb, ctx, privkey_fn, errbuf) != 1) {
-    fprintf(stderr, "failed to load private key from file:%s:%s\n", privkey_fn, errbuf);
-    ...
-  }
-```
-
-Also, `neverbleed_setuidgid` function can be used to drop the privileges of the daemon process once it completes loading all the private keys.
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/test.c cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/test.c
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/test.c	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/third-party/neverbleed/test.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2015 Kazuho Oku, DeNA Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include <netinet/in.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <openssl/crypto.h>
-#include <openssl/ssl.h>
-#include "neverbleed.h"
-
-static void setup_ecc_key(SSL_CTX *ssl_ctx)
-{
-    int nid = NID_X9_62_prime256v1;
-    EC_KEY *key = EC_KEY_new_by_curve_name(nid);
-    if (key == NULL) {
-        fprintf(stderr, "Failed to create curve \"%s\"\n", OBJ_nid2sn(nid));
-        return;
-    }
-    SSL_CTX_set_tmp_ecdh(ssl_ctx, key);
-    EC_KEY_free(key);
-}
-
-int dumb_https_server(unsigned short port, SSL_CTX *ctx)
-{
-    int listen_fd, reuse_flag;
-    struct sockaddr_in sin = {};
-
-    if ((listen_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-        fprintf(stderr, "failed to create socket:%s\n", strerror(errno));
-        return 111;
-    }
-    reuse_flag = 1;
-    setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuse_flag, sizeof(reuse_flag));
-    sin.sin_family = AF_INET;
-    sin.sin_addr.s_addr = htonl(0x7f000001);
-    sin.sin_port = htons(8888);
-    if (bind(listen_fd, (void *)&sin, sizeof(sin)) != 0) {
-        fprintf(stderr, "bind failed:%s\n", strerror(errno));
-        return 111;
-    }
-    if (listen(listen_fd, SOMAXCONN) != 0) {
-        fprintf(stderr, "listen failed:%s\n", strerror(errno));
-        return 111;
-    }
-
-    while (1) {
-        int conn_fd;
-        SSL *ssl;
-        char buf[4096];
-        /* accept connection */
-        while ((conn_fd = accept(listen_fd, NULL, NULL)) == -1 && errno == EINTR)
-            ;
-        if (conn_fd == -1) {
-            fprintf(stderr, "accept(2) failed:%s\n", strerror(errno));
-            return 111;
-        }
-        ssl = SSL_new(ctx);
-        SSL_set_fd(ssl, conn_fd);
-        if (SSL_accept(ssl) == 1) {
-            SSL_read(ssl, buf, sizeof(buf));
-            const char *resp =
-                "HTTP/1.0 200 OK\r\nContent-Length: 6\r\nConnection: close\r\nContent-Type: text/plain\r\n\r\nhello\n";
-            SSL_write(ssl, resp, strlen(resp));
-            SSL_shutdown(ssl);
-        } else {
-            fprintf(stderr, "SSL_accept failed\n");
-        }
-        SSL_free(ssl);
-        close(conn_fd);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    unsigned short port;
-    SSL_CTX *ctx;
-    neverbleed_t nb;
-    char errbuf[NEVERBLEED_ERRBUF_SIZE];
-    int use_privsep;
-
-    /* initialization */
-    SSL_load_error_strings();
-    SSL_library_init();
-    OpenSSL_add_all_algorithms();
-    if (neverbleed_init(&nb, errbuf) != 0) {
-        fprintf(stderr, "openssl_privsep_init: %s\n", errbuf);
-        return 111;
-    }
-    ctx = SSL_CTX_new(SSLv23_server_method());
-    SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION);
-    setup_ecc_key(ctx);
-
-    /* parse args */
-    if (argc != 5) {
-        fprintf(stderr, "Usage: %s <internal|privsep> <port> <certificate-chain-file> <private-key-file>\n", argv[0]);
-        return 111;
-    }
-    if (strcmp(argv[1], "internal") == 0) {
-        use_privsep = 0;
-    } else if (strcmp(argv[1], "privsep") == 0) {
-        use_privsep = 1;
-    } else {
-        fprintf(stderr, "unknown mode:%s\n", argv[1]);
-        return 111;
-    }
-    if (sscanf(argv[2], "%hu", &port) != 1) {
-        fprintf(stderr, "failed to parse port:%s\n", argv[2]);
-        return 111;
-    }
-    if (SSL_CTX_use_certificate_chain_file(ctx, argv[3]) != 1) {
-        fprintf(stderr, "failed to load certificate chain file:%s\n", argv[3]);
-        return 111;
-    }
-    if (use_privsep) {
-        if (neverbleed_load_private_key_file(&nb, ctx, argv[4], errbuf) != 1) {
-            fprintf(stderr, "failed to load private key from file:%s:%s\n", argv[4], errbuf);
-            return 111;
-        }
-    } else {
-        if (SSL_CTX_use_PrivateKey_file(ctx, argv[4], SSL_FILETYPE_PEM) != 1) {
-            fprintf(stderr, "failed to load private key from file:%s\n", argv[4]);
-            return 111;
-        }
-    }
-
-    /* start the httpd */
-    return dumb_https_server(port, ctx);
-}
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/.travis.yml cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/.travis.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/nghttp2/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/nghttp2/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-dist: trusty
-env:
-  matrix:
-    - CI_BUILD=cmake
-    - CI_BUILD=autotools
-language: cpp
-compiler:
-  - clang
-  - gcc
-sudo: required
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-7
-    - autoconf
-    - automake
-    - autotools-dev
-    - libtool
-    - pkg-config
-    - zlib1g-dev
-    - libcunit1-dev
-    - libssl-dev
-    - libxml2-dev
-    - libev-dev
-    - libevent-dev
-    - libjansson-dev
-    - libjemalloc-dev
-    - libc-ares-dev
-    - cmake
-    - cmake-data
-before_install:
-  - $CC --version
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi
-  - $CC --version
-  - go version
-  - cmake --version
-before_script:
-  # Now build nghttp2
-  - if [ "$CI_BUILD" = "autotools" ]; then autoreconf -i; fi
-  - git submodule update --init
-  - if [ "$CI_BUILD" = "autotools" ]; then ./configure --with-mruby; fi
-  - if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1; fi
-script:
-  - if [ "$CI_BUILD" = "autotools" ]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --enable-werror CPPFLAGS=-fsanitize=address LDFLAGS=\"-fsanitize=address -fuse-ld=gold\""; fi
-  - if [ "$CI_BUILD" = "cmake" ]; then make check; fi
-  # As of April, 23, 2016, golang http2 build fails, probably because
-  # the default go version is too old.
-  # - cd integration-tests
-  # - export GOPATH="$PWD/integration-tests/golang"
-  # - make itprep
-  # - make it
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.pc/applied-patches cargo-0.33.0/vendor/libnghttp2-sys/.pc/applied-patches
--- cargo-0.32.0/vendor/libnghttp2-sys/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+use-system-lib.patch
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.pc/.quilt_patches cargo-0.33.0/vendor/libnghttp2-sys/.pc/.quilt_patches
--- cargo-0.32.0/vendor/libnghttp2-sys/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.pc/.quilt_patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+debian/patches
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.pc/.quilt_series cargo-0.33.0/vendor/libnghttp2-sys/.pc/.quilt_series
--- cargo-0.32.0/vendor/libnghttp2-sys/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.pc/.quilt_series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+series
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.pc/use-system-lib.patch/Cargo.toml cargo-0.33.0/vendor/libnghttp2-sys/.pc/use-system-lib.patch/Cargo.toml
--- cargo-0.32.0/vendor/libnghttp2-sys/.pc/use-system-lib.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.pc/use-system-lib.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,29 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "libnghttp2-sys"
+version = "0.1.1"
+authors = ["Alex Crichton <alex@alexcrichton.com>"]
+links = "nghttp2"
+description = "FFI bindings for libnghttp2 (nghttp2)\n"
+homepage = "https://github.com/alexcrichton/nghttp2-rs"
+readme = "README.md"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/alexcrichton/nghttp2-rs"
+
+[lib]
+doctest = false
+[dependencies.libc]
+version = "0.2"
+[build-dependencies.cc]
+version = "1.0.24"
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.pc/.version cargo-0.33.0/vendor/libnghttp2-sys/.pc/.version
--- cargo-0.32.0/vendor/libnghttp2-sys/.pc/.version	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.pc/.version	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+2
diff -Nru cargo-0.32.0/vendor/libnghttp2-sys/.travis.yml cargo-0.33.0/vendor/libnghttp2-sys/.travis.yml
--- cargo-0.32.0/vendor/libnghttp2-sys/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libnghttp2-sys/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-    - os: osx
-script:
-  - cargo test
-  - cargo run --manifest-path systest/Cargo.toml
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/libz-sys/.gitmodules cargo-0.33.0/vendor/libz-sys/.gitmodules
--- cargo-0.32.0/vendor/libz-sys/.gitmodules	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libz-sys/.gitmodules	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[submodule "src/zlib"]
-	path = src/zlib
-	url = https://github.com/madler/zlib
diff -Nru cargo-0.32.0/vendor/libz-sys/.travis.yml cargo-0.33.0/vendor/libz-sys/.travis.yml
--- cargo-0.32.0/vendor/libz-sys/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/libz-sys/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-language: rust
-sudo: false
-matrix:
-  include:
-    - rust: stable
-    - os: osx
-
-    - env: LIBZ_SYS_STATIC=1
-    - env: LIBZ_SYS_STATIC=1
-      os: osx
-
-    - rust: stable
-      script:
-        - cargo generate-lockfile
-        - ci/run-docker.sh
-
-    - rust: beta
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      after_success:
-        - travis-cargo doc-upload
-
-script:
-  - cargo test
-  - cargo run --manifest-path systest/Cargo.toml
-  - cargo doc --no-deps
-
-notifications:
-  email:
-    on_success: never
-env:
-  global:
-    secure: "eq1KPWs3sNmvrQj6ayLRrY2Jqwpx4p9CNU5gRU6LCdx2otIQqKXY1Jj9E6uvQIspL6ZpCNzYDMDUSsRdNahdx59WQGD/mxdrFWStUonJ4t0al2FIQ97NaEy57r4vw36oViDCzqZudDlsacHZnpCpI8ei6AB73rGXfxc3g3fxk6o="
diff -Nru cargo-0.32.0/vendor/lock_api/.cargo-checksum.json cargo-0.33.0/vendor/lock_api/.cargo-checksum.json
--- cargo-0.32.0/vendor/lock_api/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/lock_api/Cargo.toml cargo-0.33.0/vendor/lock_api/Cargo.toml
--- cargo-0.32.0/vendor/lock_api/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "lock_api"
-version = "0.1.5"
-authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
-description = "Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std."
-keywords = ["mutex", "rwlock", "lock", "no_std"]
-categories = ["concurrency", "no-std"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/Amanieu/parking_lot"
-[dependencies.owning_ref]
-version = "0.4"
-optional = true
-
-[dependencies.scopeguard]
-version = "0.3"
-default-features = false
-
-[features]
-nightly = []
diff -Nru cargo-0.32.0/vendor/lock_api/.cargo_vcs_info.json cargo-0.33.0/vendor/lock_api/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/lock_api/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "2653619a613bc12dd6ab486f789d98956b65cdf0"
-  }
-}
diff -Nru cargo-0.32.0/vendor/lock_api/LICENSE-APACHE cargo-0.33.0/vendor/lock_api/LICENSE-APACHE
--- cargo-0.32.0/vendor/lock_api/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/lock_api/LICENSE-MIT cargo-0.33.0/vendor/lock_api/LICENSE-MIT
--- cargo-0.32.0/vendor/lock_api/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2016 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/lock_api/src/lib.rs cargo-0.33.0/vendor/lock_api/src/lib.rs
--- cargo-0.32.0/vendor/lock_api/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-// Copyright 2018 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-//! This library provides type-safe and fully-featured `Mutex` and `RwLock`
-//! types which wrap a simple raw mutex or rwlock type. This has several
-//! benefits: not only does it eliminate a large portion of the work in
-//! implementing custom lock types, it also allows users to write code which is
-//! generic with regards to different lock implementations.
-//!
-//! Basic usage of this crate is very straightforward:
-//!
-//! 1. Create a raw lock type. This should only contain the lock state, not any
-//!    data protected by the lock.
-//! 2. Implement the `RawMutex` trait for your custom lock type.
-//! 3. Export your mutex as a type alias for `lock_api::Mutex`, and
-//!    your mutex guard as a type alias for `lock_api::MutexGuard`.
-//!    See the [example](#example) below for details.
-//!
-//! This process is similar for RwLocks, except that two guards need to be
-//! exported instead of one. (Or 3 guards if your type supports upgradable read
-//! locks, see [extension traits](#extension-traits) below for details)
-//!
-//! # Example
-//!
-//! ```
-//! use lock_api::{RawMutex, Mutex, GuardSend};
-//! use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
-//!
-//! // 1. Define our raw lock type
-//! pub struct RawSpinlock(AtomicBool);
-//!
-//! // 2. Implement RawMutex for this type
-//! unsafe impl RawMutex for RawSpinlock {
-//!     const INIT: RawSpinlock = RawSpinlock(ATOMIC_BOOL_INIT);
-//!
-//!     // A spinlock guard can be sent to another thread and unlocked there
-//!     type GuardMarker = GuardSend;
-//!
-//!     fn lock(&self) {
-//!         // Note: This isn't the best way of implementing a spinlock, but it
-//!         // suffices for the sake of this example.
-//!         while !self.try_lock() {}
-//!     }
-//!
-//!     fn try_lock(&self) -> bool {
-//!         self.0.swap(true, Ordering::Acquire)
-//!     }
-//!
-//!     fn unlock(&self) {
-//!         self.0.store(false, Ordering::Release);
-//!     }
-//! }
-//!
-//! // 3. Export the wrappers. This are the types that your users will actually use.
-//! pub type Spinlock<T> = lock_api::Mutex<RawSpinlock, T>;
-//! pub type SpinlockGuard<'a, T> = lock_api::MutexGuard<'a, RawSpinlock, T>;
-//! ```
-//!
-//! # Extension traits
-//!
-//! In addition to basic locking & unlocking functionality, you have the option
-//! of exposing additional functionality in your lock types by implementing
-//! additional traits for it. Examples of extension features include:
-//!
-//! - Fair unlocking (`RawMutexFair`, `RawRwLockFair`)
-//! - Lock timeouts (`RawMutexTimed`, `RawRwLockTimed`)
-//! - Downgradable write locks (`RawRwLockDowngradable`)
-//! - Recursive read locks (`RawRwLockRecursive`)
-//! - Upgradable read locks (`RawRwLockUpgrade`)
-//!
-//! The `Mutex` and `RwLock` wrappers will automatically expose this additional
-//! functionality if the raw lock type implements these extension traits.
-//!
-//! # Cargo features
-//!
-//! This crate supports two cargo features:
-//!
-//! - `owning_ref`: Allows your lock types to be used with the `owning_ref` crate.
-//! - `nightly`: Enables nightly-only features. At the moment the only such
-//!   feature is `const fn` constructors for lock types.
-
-#![no_std]
-#![warn(missing_docs)]
-#![cfg_attr(feature = "nightly", feature(const_fn))]
-
-#[macro_use]
-extern crate scopeguard;
-
-#[cfg(feature = "owning_ref")]
-extern crate owning_ref;
-
-/// Marker type which indicates that the Guard type for a lock is `Send`.
-pub struct GuardSend(());
-
-/// Marker type which indicates that the Guard type for a lock is not `Send`.
-pub struct GuardNoSend(*mut ());
-
-mod mutex;
-pub use mutex::*;
-
-mod remutex;
-pub use remutex::*;
-
-mod rwlock;
-pub use rwlock::*;
diff -Nru cargo-0.32.0/vendor/lock_api/src/mutex.rs cargo-0.33.0/vendor/lock_api/src/mutex.rs
--- cargo-0.32.0/vendor/lock_api/src/mutex.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/src/mutex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,550 +0,0 @@
-// Copyright 2018 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use core::cell::UnsafeCell;
-use core::fmt;
-use core::marker::PhantomData;
-use core::mem;
-use core::ops::{Deref, DerefMut};
-
-#[cfg(feature = "owning_ref")]
-use owning_ref::StableAddress;
-
-/// Basic operations for a mutex.
-///
-/// Types implementing this trait can be used by `Mutex` to form a safe and
-/// fully-functioning mutex type.
-///
-/// # Safety
-///
-/// Implementations of this trait must ensure that the mutex is actually
-/// exclusive: a lock can't be acquired while the mutex is already locked.
-pub unsafe trait RawMutex {
-    /// Initial value for an unlocked mutex.
-    const INIT: Self;
-
-    /// Marker type which determines whether a lock guard should be `Send`. Use
-    /// one of the `GuardSend` or `GuardNoSend` helper types here.
-    type GuardMarker;
-
-    /// Acquires this mutex, blocking the current thread until it is able to do so.
-    fn lock(&self);
-
-    /// Attempts to acquire this mutex without blocking.
-    fn try_lock(&self) -> bool;
-
-    /// Unlocks this mutex.
-    fn unlock(&self);
-}
-
-/// Additional methods for mutexes which support fair unlocking.
-///
-/// Fair unlocking means that a lock is handed directly over to the next waiting
-/// thread if there is one, without giving other threads the opportunity to
-/// "steal" the lock in the meantime. This is typically slower than unfair
-/// unlocking, but may be necessary in certain circumstances.
-pub unsafe trait RawMutexFair: RawMutex {
-    /// Unlocks this mutex using a fair unlock protocol.
-    fn unlock_fair(&self);
-
-    /// Temporarily yields the mutex to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_fair` followed
-    /// by `lock`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    fn bump(&self) {
-        self.unlock_fair();
-        self.lock();
-    }
-}
-
-/// Additional methods for mutexes which support locking with timeouts.
-///
-/// The `Duration` and `Instant` types are specified as associated types so that
-/// this trait is usable even in `no_std` environments.
-pub unsafe trait RawMutexTimed: RawMutex {
-    /// Duration type used for `try_lock_for`.
-    type Duration;
-
-    /// Instant type used for `try_lock_until`.
-    type Instant;
-
-    /// Attempts to acquire this lock until a timeout is reached.
-    fn try_lock_for(&self, timeout: Self::Duration) -> bool;
-
-    /// Attempts to acquire this lock until a timeout is reached.
-    fn try_lock_until(&self, timeout: Self::Instant) -> bool;
-}
-
-/// A mutual exclusion primitive useful for protecting shared data
-///
-/// This mutex will block threads waiting for the lock to become available. The
-/// mutex can also be statically initialized or created via a `new`
-/// constructor. Each mutex has a type parameter which represents the data that
-/// it is protecting. The data can only be accessed through the RAII guards
-/// returned from `lock` and `try_lock`, which guarantees that the data is only
-/// ever accessed when the mutex is locked.
-pub struct Mutex<R: RawMutex, T: ?Sized> {
-    raw: R,
-    data: UnsafeCell<T>,
-}
-
-unsafe impl<R: RawMutex + Send, T: ?Sized + Send> Send for Mutex<R, T> {}
-unsafe impl<R: RawMutex + Sync, T: ?Sized + Send> Sync for Mutex<R, T> {}
-
-impl<R: RawMutex, T> Mutex<R, T> {
-    /// Creates a new mutex in an unlocked state ready for use.
-    #[cfg(feature = "nightly")]
-    #[inline]
-    pub const fn new(val: T) -> Mutex<R, T> {
-        Mutex {
-            data: UnsafeCell::new(val),
-            raw: R::INIT,
-        }
-    }
-
-    /// Creates a new mutex in an unlocked state ready for use.
-    #[cfg(not(feature = "nightly"))]
-    #[inline]
-    pub fn new(val: T) -> Mutex<R, T> {
-        Mutex {
-            data: UnsafeCell::new(val),
-            raw: R::INIT,
-        }
-    }
-
-    /// Consumes this mutex, returning the underlying data.
-    #[inline]
-    #[allow(unused_unsafe)]
-    pub fn into_inner(self) -> T {
-        unsafe { self.data.into_inner() }
-    }
-}
-
-impl<R: RawMutex, T: ?Sized> Mutex<R, T> {
-    #[inline]
-    fn guard(&self) -> MutexGuard<R, T> {
-        MutexGuard {
-            mutex: self,
-            marker: PhantomData,
-        }
-    }
-
-    /// Acquires a mutex, blocking the current thread until it is able to do so.
-    ///
-    /// This function will block the local thread until it is available to acquire
-    /// the mutex. Upon returning, the thread is the only thread with the mutex
-    /// held. An RAII guard is returned to allow scoped unlock of the lock. When
-    /// the guard goes out of scope, the mutex will be unlocked.
-    ///
-    /// Attempts to lock a mutex in the thread which already holds the lock will
-    /// result in a deadlock.
-    #[inline]
-    pub fn lock(&self) -> MutexGuard<R, T> {
-        self.raw.lock();
-        self.guard()
-    }
-
-    /// Attempts to acquire this lock.
-    ///
-    /// If the lock could not be acquired at this time, then `None` is returned.
-    /// Otherwise, an RAII guard is returned. The lock will be unlocked when the
-    /// guard is dropped.
-    ///
-    /// This function does not block.
-    #[inline]
-    pub fn try_lock(&self) -> Option<MutexGuard<R, T>> {
-        if self.raw.try_lock() {
-            Some(self.guard())
-        } else {
-            None
-        }
-    }
-
-    /// Returns a mutable reference to the underlying data.
-    ///
-    /// Since this call borrows the `Mutex` mutably, no actual locking needs to
-    /// take place---the mutable borrow statically guarantees no locks exist.
-    #[inline]
-    pub fn get_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.data.get() }
-    }
-
-    /// Forcibly unlocks the mutex.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `MutexGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `MutexGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a mutex is unlocked when not locked.
-    #[inline]
-    pub unsafe fn force_unlock(&self) {
-        self.raw.unlock();
-    }
-
-    /// Returns the underlying raw mutex object.
-    ///
-    /// Note that you will most likely need to import the `RawMutex` trait from
-    /// `lock_api` to be able to call functions on the raw mutex.
-    ///
-    /// # Safety
-    ///
-    /// This method is unsafe because it allows unlocking a mutex while
-    /// still holding a reference to a `MutexGuard`.
-    #[inline]
-    pub unsafe fn raw(&self) -> &R {
-        &self.raw
-    }
-}
-
-impl<R: RawMutexFair, T: ?Sized> Mutex<R, T> {
-    /// Forcibly unlocks the mutex using a fair unlock procotol.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `MutexGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `MutexGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a mutex is unlocked when not locked.
-    #[inline]
-    pub unsafe fn force_unlock_fair(&self) {
-        self.raw.unlock_fair();
-    }
-}
-
-impl<R: RawMutexTimed, T: ?Sized> Mutex<R, T> {
-    /// Attempts to acquire this lock until a timeout is reached.
-    ///
-    /// If the lock could not be acquired before the timeout expired, then
-    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
-    /// be unlocked when the guard is dropped.
-    #[inline]
-    pub fn try_lock_for(&self, timeout: R::Duration) -> Option<MutexGuard<R, T>> {
-        if self.raw.try_lock_for(timeout) {
-            Some(self.guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this lock until a timeout is reached.
-    ///
-    /// If the lock could not be acquired before the timeout expired, then
-    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
-    /// be unlocked when the guard is dropped.
-    #[inline]
-    pub fn try_lock_until(&self, timeout: R::Instant) -> Option<MutexGuard<R, T>> {
-        if self.raw.try_lock_until(timeout) {
-            Some(self.guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawMutex, T: ?Sized + Default> Default for Mutex<R, T> {
-    #[inline]
-    fn default() -> Mutex<R, T> {
-        Mutex::new(Default::default())
-    }
-}
-
-impl<R: RawMutex, T> From<T> for Mutex<R, T> {
-    #[inline]
-    fn from(t: T) -> Mutex<R, T> {
-        Mutex::new(t)
-    }
-}
-
-impl<R: RawMutex, T: ?Sized + fmt::Debug> fmt::Debug for Mutex<R, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self.try_lock() {
-            Some(guard) => f.debug_struct("Mutex").field("data", &&*guard).finish(),
-            None => f.pad("Mutex { <locked> }"),
-        }
-    }
-}
-
-/// An RAII implementation of a "scoped lock" of a mutex. When this structure is
-/// dropped (falls out of scope), the lock will be unlocked.
-///
-/// The data protected by the mutex can be accessed through this guard via its
-/// `Deref` and `DerefMut` implementations.
-#[must_use]
-pub struct MutexGuard<'a, R: RawMutex + 'a, T: ?Sized + 'a> {
-    mutex: &'a Mutex<R, T>,
-    marker: PhantomData<(&'a mut T, R::GuardMarker)>,
-}
-
-unsafe impl<'a, R: RawMutex + Sync + 'a, T: ?Sized + Sync + 'a> Sync for MutexGuard<'a, R, T> {}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> MutexGuard<'a, R, T> {
-    /// Returns a reference to the original `Mutex` object.
-    pub fn mutex(s: &Self) -> &'a Mutex<R, T> {
-        s.mutex
-    }
-
-    /// Makes a new `MappedMutexGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `MutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedMutexGuard<'a, R, U>
-    where
-        F: FnOnce(&mut T) -> &mut U,
-    {
-        let raw = &s.mutex.raw;
-        let data = f(unsafe { &mut *s.mutex.data.get() });
-        mem::forget(s);
-        MappedMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedMutexGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `MutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedMutexGuard<'a, R, U>, Self>
-    where
-        F: FnOnce(&mut T) -> Option<&mut U>,
-    {
-        let raw = &s.mutex.raw;
-        let data = match f(unsafe { &mut *s.mutex.data.get() }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-
-    /// Temporarily unlocks the mutex to execute the given function.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the mutex.
-    #[inline]
-    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.mutex.raw.unlock();
-        defer!(s.mutex.raw.lock());
-        f()
-    }
-}
-
-impl<'a, R: RawMutexFair + 'a, T: ?Sized + 'a> MutexGuard<'a, R, T> {
-    /// Unlocks the mutex using a fair unlock protocol.
-    ///
-    /// By default, mutexes are unfair and allow the current thread to re-lock
-    /// the mutex before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the mutex for a long time. This is the
-    /// default because it allows much higher throughput as it avoids forcing a
-    /// context switch on every mutex unlock. This can result in one thread
-    /// acquiring a mutex many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `MutexGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.mutex.raw.unlock_fair();
-        mem::forget(s);
-    }
-
-    /// Temporarily unlocks the mutex to execute the given function.
-    ///
-    /// The mutex is unlocked a fair unlock protocol.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the mutex.
-    #[inline]
-    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.mutex.raw.unlock_fair();
-        defer!(s.mutex.raw.lock());
-        f()
-    }
-
-    /// Temporarily yields the mutex to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_fair` followed
-    /// by `lock`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    #[inline]
-    pub fn bump(s: &mut Self) {
-        s.mutex.raw.bump();
-    }
-}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Deref for MutexGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.mutex.data.get() }
-    }
-}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> DerefMut for MutexGuard<'a, R, T> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.mutex.data.get() }
-    }
-}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Drop for MutexGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.mutex.raw.unlock();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> StableAddress for MutexGuard<'a, R, T> {}
-
-/// An RAII mutex guard returned by `MutexGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedMutexGuard` and `MutexGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-#[must_use]
-pub struct MappedMutexGuard<'a, R: RawMutex + 'a, T: ?Sized + 'a> {
-    raw: &'a R,
-    data: *mut T,
-    marker: PhantomData<&'a mut T>,
-}
-
-unsafe impl<'a, R: RawMutex + Sync + 'a, T: ?Sized + Sync + 'a> Sync
-    for MappedMutexGuard<'a, R, T>
-{}
-unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Send for MappedMutexGuard<'a, R, T> where
-    R::GuardMarker: Send
-{}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> MappedMutexGuard<'a, R, T> {
-    /// Makes a new `MappedMutexGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `MappedMutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedMutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedMutexGuard<'a, R, U>
-    where
-        F: FnOnce(&mut T) -> &mut U,
-    {
-        let raw = s.raw;
-        let data = f(unsafe { &mut *s.data });
-        mem::forget(s);
-        MappedMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedMutexGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `MappedMutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedMutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedMutexGuard<'a, R, U>, Self>
-    where
-        F: FnOnce(&mut T) -> Option<&mut U>,
-    {
-        let raw = s.raw;
-        let data = match f(unsafe { &mut *s.data }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-}
-
-impl<'a, R: RawMutexFair + 'a, T: ?Sized + 'a> MappedMutexGuard<'a, R, T> {
-    /// Unlocks the mutex using a fair unlock protocol.
-    ///
-    /// By default, mutexes are unfair and allow the current thread to re-lock
-    /// the mutex before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the mutex for a long time. This is the
-    /// default because it allows much higher throughput as it avoids forcing a
-    /// context switch on every mutex unlock. This can result in one thread
-    /// acquiring a mutex many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `MutexGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.raw.unlock_fair();
-        mem::forget(s);
-    }
-}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Deref for MappedMutexGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.data }
-    }
-}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> DerefMut for MappedMutexGuard<'a, R, T> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.data }
-    }
-}
-
-impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Drop for MappedMutexGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.raw.unlock();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> StableAddress for MappedMutexGuard<'a, R, T> {}
diff -Nru cargo-0.32.0/vendor/lock_api/src/remutex.rs cargo-0.33.0/vendor/lock_api/src/remutex.rs
--- cargo-0.32.0/vendor/lock_api/src/remutex.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/src/remutex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,618 +0,0 @@
-// Copyright 2018 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use core::cell::{Cell, UnsafeCell};
-use core::fmt;
-use core::marker::PhantomData;
-use core::mem;
-use core::ops::Deref;
-use core::sync::atomic::{AtomicUsize, Ordering};
-use mutex::{RawMutex, RawMutexFair, RawMutexTimed};
-use GuardNoSend;
-
-#[cfg(feature = "owning_ref")]
-use owning_ref::StableAddress;
-
-/// Helper trait which returns a non-zero thread ID.
-///
-/// The simplest way to implement this trait is to return the address of a
-/// thread-local variable.
-///
-/// # Safety
-///
-/// Implementations of this trait must ensure that no two active threads share
-/// the same thread ID. However the ID of a thread that has exited can be
-/// re-used since that thread is no longer active.
-pub unsafe trait GetThreadId {
-    /// Initial value.
-    const INIT: Self;
-
-    /// Returns a non-zero thread ID which identifies the current thread of
-    /// execution.
-    fn nonzero_thread_id(&self) -> usize;
-}
-
-struct RawReentrantMutex<R: RawMutex, G: GetThreadId> {
-    owner: AtomicUsize,
-    lock_count: Cell<usize>,
-    mutex: R,
-    get_thread_id: G,
-}
-
-impl<R: RawMutex, G: GetThreadId> RawReentrantMutex<R, G> {
-    #[inline]
-    fn lock_internal<F: FnOnce() -> bool>(&self, try_lock: F) -> bool {
-        let id = self.get_thread_id.nonzero_thread_id();
-        if self.owner.load(Ordering::Relaxed) == id {
-            self.lock_count.set(
-                self.lock_count
-                    .get()
-                    .checked_add(1)
-                    .expect("ReentrantMutex lock count overflow"),
-            );
-        } else {
-            if !try_lock() {
-                return false;
-            }
-            self.owner.store(id, Ordering::Relaxed);
-            self.lock_count.set(1);
-        }
-        true
-    }
-
-    #[inline]
-    fn lock(&self) {
-        self.lock_internal(|| {
-            self.mutex.lock();
-            true
-        });
-    }
-
-    #[inline]
-    fn try_lock(&self) -> bool {
-        self.lock_internal(|| self.mutex.try_lock())
-    }
-
-    #[inline]
-    fn unlock(&self) {
-        let lock_count = self.lock_count.get() - 1;
-        if lock_count == 0 {
-            self.owner.store(0, Ordering::Relaxed);
-            self.mutex.unlock();
-        } else {
-            self.lock_count.set(lock_count);
-        }
-    }
-}
-
-impl<R: RawMutexFair, G: GetThreadId> RawReentrantMutex<R, G> {
-    #[inline]
-    fn unlock_fair(&self) {
-        let lock_count = self.lock_count.get() - 1;
-        if lock_count == 0 {
-            self.owner.store(0, Ordering::Relaxed);
-            self.mutex.unlock_fair();
-        } else {
-            self.lock_count.set(lock_count);
-        }
-    }
-
-    #[inline]
-    fn bump(&self) {
-        if self.lock_count.get() == 1 {
-            let id = self.owner.load(Ordering::Relaxed);
-            self.owner.store(0, Ordering::Relaxed);
-            self.mutex.bump();
-            self.owner.store(id, Ordering::Relaxed);
-        }
-    }
-}
-
-impl<R: RawMutexTimed, G: GetThreadId> RawReentrantMutex<R, G> {
-    #[inline]
-    fn try_lock_until(&self, timeout: R::Instant) -> bool {
-        self.lock_internal(|| self.mutex.try_lock_until(timeout))
-    }
-
-    #[inline]
-    fn try_lock_for(&self, timeout: R::Duration) -> bool {
-        self.lock_internal(|| self.mutex.try_lock_for(timeout))
-    }
-}
-
-/// A mutex which can be recursively locked by a single thread.
-///
-/// This type is identical to `Mutex` except for the following points:
-///
-/// - Locking multiple times from the same thread will work correctly instead of
-///   deadlocking.
-/// - `ReentrantMutexGuard` does not give mutable references to the locked data.
-///   Use a `RefCell` if you need this.
-///
-/// See [`Mutex`](struct.Mutex.html) for more details about the underlying mutex
-/// primitive.
-pub struct ReentrantMutex<R: RawMutex, G: GetThreadId, T: ?Sized> {
-    raw: RawReentrantMutex<R, G>,
-    data: UnsafeCell<T>,
-}
-
-unsafe impl<R: RawMutex + Send, G: GetThreadId + Send, T: ?Sized + Send> Send
-    for ReentrantMutex<R, G, T>
-{}
-unsafe impl<R: RawMutex + Sync, G: GetThreadId + Sync, T: ?Sized + Send> Sync
-    for ReentrantMutex<R, G, T>
-{}
-
-impl<R: RawMutex, G: GetThreadId, T> ReentrantMutex<R, G, T> {
-    /// Creates a new reentrant mutex in an unlocked state ready for use.
-    #[cfg(feature = "nightly")]
-    #[inline]
-    pub const fn new(val: T) -> ReentrantMutex<R, G, T> {
-        ReentrantMutex {
-            data: UnsafeCell::new(val),
-            raw: RawReentrantMutex {
-                owner: AtomicUsize::new(0),
-                lock_count: Cell::new(0),
-                mutex: R::INIT,
-                get_thread_id: G::INIT,
-            },
-        }
-    }
-
-    /// Creates a new reentrant mutex in an unlocked state ready for use.
-    #[cfg(not(feature = "nightly"))]
-    #[inline]
-    pub fn new(val: T) -> ReentrantMutex<R, G, T> {
-        ReentrantMutex {
-            data: UnsafeCell::new(val),
-            raw: RawReentrantMutex {
-                owner: AtomicUsize::new(0),
-                lock_count: Cell::new(0),
-                mutex: R::INIT,
-                get_thread_id: G::INIT,
-            },
-        }
-    }
-
-    /// Consumes this mutex, returning the underlying data.
-    #[inline]
-    #[allow(unused_unsafe)]
-    pub fn into_inner(self) -> T {
-        unsafe { self.data.into_inner() }
-    }
-}
-
-impl<R: RawMutex, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
-    #[inline]
-    fn guard(&self) -> ReentrantMutexGuard<R, G, T> {
-        ReentrantMutexGuard {
-            remutex: &self,
-            marker: PhantomData,
-        }
-    }
-
-    /// Acquires a reentrant mutex, blocking the current thread until it is able
-    /// to do so.
-    ///
-    /// If the mutex is held by another thread then this function will block the
-    /// local thread until it is available to acquire the mutex. If the mutex is
-    /// already held by the current thread then this function will increment the
-    /// lock reference count and return immediately. Upon returning,
-    /// the thread is the only thread with the mutex held. An RAII guard is
-    /// returned to allow scoped unlock of the lock. When the guard goes out of
-    /// scope, the mutex will be unlocked.
-    #[inline]
-    pub fn lock(&self) -> ReentrantMutexGuard<R, G, T> {
-        self.raw.lock();
-        self.guard()
-    }
-
-    /// Attempts to acquire this lock.
-    ///
-    /// If the lock could not be acquired at this time, then `None` is returned.
-    /// Otherwise, an RAII guard is returned. The lock will be unlocked when the
-    /// guard is dropped.
-    ///
-    /// This function does not block.
-    #[inline]
-    pub fn try_lock(&self) -> Option<ReentrantMutexGuard<R, G, T>> {
-        if self.raw.try_lock() {
-            Some(self.guard())
-        } else {
-            None
-        }
-    }
-
-    /// Returns a mutable reference to the underlying data.
-    ///
-    /// Since this call borrows the `ReentrantMutex` mutably, no actual locking needs to
-    /// take place---the mutable borrow statically guarantees no locks exist.
-    #[inline]
-    pub fn get_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.data.get() }
-    }
-
-    /// Forcibly unlocks the mutex.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `ReentrantMutexGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `ReentrantMutexGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a mutex is unlocked when not locked.
-    #[inline]
-    pub unsafe fn force_unlock(&self) {
-        self.raw.unlock();
-    }
-
-    /// Returns the underlying raw mutex object.
-    ///
-    /// Note that you will most likely need to import the `RawMutex` trait from
-    /// `lock_api` to be able to call functions on the raw mutex.
-    ///
-    /// # Safety
-    ///
-    /// This method is unsafe because it allows unlocking a mutex while
-    /// still holding a reference to a `ReentrantMutexGuard`.
-    #[inline]
-    pub unsafe fn raw(&self) -> &R {
-        &self.raw.mutex
-    }
-}
-
-impl<R: RawMutexFair, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
-    /// Forcibly unlocks the mutex using a fair unlock protocol.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `ReentrantMutexGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `ReentrantMutexGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a mutex is unlocked when not locked.
-    #[inline]
-    pub unsafe fn force_unlock_fair(&self) {
-        self.raw.unlock_fair();
-    }
-}
-
-impl<R: RawMutexTimed, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
-    /// Attempts to acquire this lock until a timeout is reached.
-    ///
-    /// If the lock could not be acquired before the timeout expired, then
-    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
-    /// be unlocked when the guard is dropped.
-    #[inline]
-    pub fn try_lock_for(&self, timeout: R::Duration) -> Option<ReentrantMutexGuard<R, G, T>> {
-        if self.raw.try_lock_for(timeout) {
-            Some(self.guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this lock until a timeout is reached.
-    ///
-    /// If the lock could not be acquired before the timeout expired, then
-    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
-    /// be unlocked when the guard is dropped.
-    #[inline]
-    pub fn try_lock_until(&self, timeout: R::Instant) -> Option<ReentrantMutexGuard<R, G, T>> {
-        if self.raw.try_lock_until(timeout) {
-            Some(self.guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawMutex, G: GetThreadId, T: ?Sized + Default> Default for ReentrantMutex<R, G, T> {
-    #[inline]
-    fn default() -> ReentrantMutex<R, G, T> {
-        ReentrantMutex::new(Default::default())
-    }
-}
-
-impl<R: RawMutex, G: GetThreadId, T> From<T> for ReentrantMutex<R, G, T> {
-    #[inline]
-    fn from(t: T) -> ReentrantMutex<R, G, T> {
-        ReentrantMutex::new(t)
-    }
-}
-
-impl<R: RawMutex, G: GetThreadId, T: ?Sized + fmt::Debug> fmt::Debug for ReentrantMutex<R, G, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self.try_lock() {
-            Some(guard) => f
-                .debug_struct("ReentrantMutex")
-                .field("data", &&*guard)
-                .finish(),
-            None => f.pad("ReentrantMutex { <locked> }"),
-        }
-    }
-}
-
-/// An RAII implementation of a "scoped lock" of a reentrant mutex. When this structure
-/// is dropped (falls out of scope), the lock will be unlocked.
-///
-/// The data protected by the mutex can be accessed through this guard via its
-/// `Deref` implementation.
-#[must_use]
-pub struct ReentrantMutexGuard<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> {
-    remutex: &'a ReentrantMutex<R, G, T>,
-    marker: PhantomData<(&'a T, GuardNoSend)>,
-}
-
-unsafe impl<'a, R: RawMutex + Sync + 'a, G: GetThreadId + Sync + 'a, T: ?Sized + Sync + 'a> Sync
-    for ReentrantMutexGuard<'a, R, G, T>
-{}
-
-impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> ReentrantMutexGuard<'a, R, G, T> {
-    /// Returns a reference to the original `ReentrantMutex` object.
-    pub fn remutex(s: &Self) -> &'a ReentrantMutex<R, G, T> {
-        s.remutex
-    }
-
-    /// Makes a new `MappedReentrantMutexGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `ReentrantMutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `ReentrantMutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedReentrantMutexGuard<'a, R, G, U>
-    where
-        F: FnOnce(&T) -> &U,
-    {
-        let raw = &s.remutex.raw;
-        let data = f(unsafe { &*s.remutex.data.get() });
-        mem::forget(s);
-        MappedReentrantMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedReentrantMutexGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `ReentrantMutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `ReentrantMutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedReentrantMutexGuard<'a, R, G, U>, Self>
-    where
-        F: FnOnce(&mut T) -> Option<&mut U>,
-    {
-        let raw = &s.remutex.raw;
-        let data = match f(unsafe { &mut *s.remutex.data.get() }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedReentrantMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-
-    /// Temporarily unlocks the mutex to execute the given function.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the mutex.
-    #[inline]
-    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.remutex.raw.unlock();
-        defer!(s.remutex.raw.lock());
-        f()
-    }
-}
-
-impl<'a, R: RawMutexFair + 'a, G: GetThreadId + 'a, T: ?Sized + 'a>
-    ReentrantMutexGuard<'a, R, G, T>
-{
-    /// Unlocks the mutex using a fair unlock protocol.
-    ///
-    /// By default, mutexes are unfair and allow the current thread to re-lock
-    /// the mutex before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the mutex for a long time. This is the
-    /// default because it allows much higher throughput as it avoids forcing a
-    /// context switch on every mutex unlock. This can result in one thread
-    /// acquiring a mutex many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `ReentrantMutexGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.remutex.raw.unlock_fair();
-        mem::forget(s);
-    }
-
-    /// Temporarily unlocks the mutex to execute the given function.
-    ///
-    /// The mutex is unlocked a fair unlock protocol.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the mutex.
-    #[inline]
-    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.remutex.raw.unlock_fair();
-        defer!(s.remutex.raw.lock());
-        f()
-    }
-
-    /// Temporarily yields the mutex to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_fair` followed
-    /// by `lock`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    #[inline]
-    pub fn bump(s: &mut Self) {
-        s.remutex.raw.bump();
-    }
-}
-
-impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Deref
-    for ReentrantMutexGuard<'a, R, G, T>
-{
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.remutex.data.get() }
-    }
-}
-
-impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Drop
-    for ReentrantMutexGuard<'a, R, G, T>
-{
-    #[inline]
-    fn drop(&mut self) {
-        self.remutex.raw.unlock();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> StableAddress
-    for ReentrantMutexGuard<'a, R, G, T>
-{}
-
-/// An RAII mutex guard returned by `ReentrantMutexGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedReentrantMutexGuard` and `ReentrantMutexGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-#[must_use]
-pub struct MappedReentrantMutexGuard<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> {
-    raw: &'a RawReentrantMutex<R, G>,
-    data: *const T,
-    marker: PhantomData<&'a T>,
-}
-
-unsafe impl<'a, R: RawMutex + Sync + 'a, G: GetThreadId + Sync + 'a, T: ?Sized + Sync + 'a> Sync
-    for MappedReentrantMutexGuard<'a, R, G, T>
-{}
-
-impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a>
-    MappedReentrantMutexGuard<'a, R, G, T>
-{
-    /// Makes a new `MappedReentrantMutexGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `MappedReentrantMutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedReentrantMutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedReentrantMutexGuard<'a, R, G, U>
-    where
-        F: FnOnce(&T) -> &U,
-    {
-        let raw = s.raw;
-        let data = f(unsafe { &*s.data });
-        mem::forget(s);
-        MappedReentrantMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedReentrantMutexGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `MappedReentrantMutexGuard` passed
-    /// in already locked the mutex.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedReentrantMutexGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedReentrantMutexGuard<'a, R, G, U>, Self>
-    where
-        F: FnOnce(&T) -> Option<&U>,
-    {
-        let raw = s.raw;
-        let data = match f(unsafe { &*s.data }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedReentrantMutexGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-}
-
-impl<'a, R: RawMutexFair + 'a, G: GetThreadId + 'a, T: ?Sized + 'a>
-    MappedReentrantMutexGuard<'a, R, G, T>
-{
-    /// Unlocks the mutex using a fair unlock protocol.
-    ///
-    /// By default, mutexes are unfair and allow the current thread to re-lock
-    /// the mutex before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the mutex for a long time. This is the
-    /// default because it allows much higher throughput as it avoids forcing a
-    /// context switch on every mutex unlock. This can result in one thread
-    /// acquiring a mutex many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `ReentrantMutexGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.raw.unlock_fair();
-        mem::forget(s);
-    }
-}
-
-impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Deref
-    for MappedReentrantMutexGuard<'a, R, G, T>
-{
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.data }
-    }
-}
-
-impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Drop
-    for MappedReentrantMutexGuard<'a, R, G, T>
-{
-    #[inline]
-    fn drop(&mut self) {
-        self.raw.unlock();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> StableAddress
-    for MappedReentrantMutexGuard<'a, R, G, T>
-{}
diff -Nru cargo-0.32.0/vendor/lock_api/src/rwlock.rs cargo-0.33.0/vendor/lock_api/src/rwlock.rs
--- cargo-0.32.0/vendor/lock_api/src/rwlock.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/lock_api/src/rwlock.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1453 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use core::cell::UnsafeCell;
-use core::fmt;
-use core::marker::PhantomData;
-use core::mem;
-use core::ops::{Deref, DerefMut};
-
-#[cfg(feature = "owning_ref")]
-use owning_ref::StableAddress;
-
-/// Basic operations for a reader-writer lock.
-///
-/// Types implementing this trait can be used by `RwLock` to form a safe and
-/// fully-functioning `RwLock` type.
-///
-/// # Safety
-///
-/// Implementations of this trait must ensure that the `RwLock` is actually
-/// exclusive: an exclusive lock can't be acquired while an exclusive or shared
-/// lock exists, and a shared lock can't be acquire while an exclusive lock
-/// exists.
-pub unsafe trait RawRwLock {
-    /// Initial value for an unlocked `RwLock`.
-    const INIT: Self;
-
-    /// Marker type which determines whether a lock guard should be `Send`. Use
-    /// one of the `GuardSend` or `GuardNoSend` helper types here.
-    type GuardMarker;
-
-    /// Acquires a shared lock, blocking the current thread until it is able to do so.
-    fn lock_shared(&self);
-
-    /// Attempts to acquire a shared lock without blocking.
-    fn try_lock_shared(&self) -> bool;
-
-    /// Releases a shared lock.
-    fn unlock_shared(&self);
-
-    /// Acquires an exclusive lock, blocking the current thread until it is able to do so.
-    fn lock_exclusive(&self);
-
-    /// Attempts to acquire an exclusive lock without blocking.
-    fn try_lock_exclusive(&self) -> bool;
-
-    /// Releases an exclusive lock.
-    fn unlock_exclusive(&self);
-}
-
-/// Additional methods for RwLocks which support fair unlocking.
-///
-/// Fair unlocking means that a lock is handed directly over to the next waiting
-/// thread if there is one, without giving other threads the opportunity to
-/// "steal" the lock in the meantime. This is typically slower than unfair
-/// unlocking, but may be necessary in certain circumstances.
-pub unsafe trait RawRwLockFair: RawRwLock {
-    /// Releases a shared lock using a fair unlock protocol.
-    fn unlock_shared_fair(&self);
-
-    /// Releases an exclusive lock using a fair unlock protocol.
-    fn unlock_exclusive_fair(&self);
-
-    /// Temporarily yields a shared lock to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_shared_fair` followed
-    /// by `lock_shared`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    fn bump_shared(&self) {
-        self.unlock_shared_fair();
-        self.lock_shared();
-    }
-
-    /// Temporarily yields an exclusive lock to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_exclusive_fair` followed
-    /// by `lock_exclusive`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    fn bump_exclusive(&self) {
-        self.unlock_exclusive_fair();
-        self.lock_exclusive();
-    }
-}
-
-/// Additional methods for RwLocks which support atomically downgrading an
-/// exclusive lock to a shared lock.
-pub unsafe trait RawRwLockDowngrade: RawRwLock {
-    /// Atomically downgrades an exclusive lock into a shared lock without
-    /// allowing any thread to take an exclusive lock in the meantime.
-    fn downgrade(&self);
-}
-
-/// Additional methods for RwLocks which support locking with timeouts.
-///
-/// The `Duration` and `Instant` types are specified as associated types so that
-/// this trait is usable even in `no_std` environments.
-pub unsafe trait RawRwLockTimed: RawRwLock {
-    /// Duration type used for `try_lock_for`.
-    type Duration;
-
-    /// Instant type used for `try_lock_until`.
-    type Instant;
-
-    /// Attempts to acquire a shared lock until a timeout is reached.
-    fn try_lock_shared_for(&self, timeout: Self::Duration) -> bool;
-
-    /// Attempts to acquire a shared lock until a timeout is reached.
-    fn try_lock_shared_until(&self, timeout: Self::Instant) -> bool;
-
-    /// Attempts to acquire an exclusive lock until a timeout is reached.
-    fn try_lock_exclusive_for(&self, timeout: Self::Duration) -> bool;
-
-    /// Attempts to acquire an exclusive lock until a timeout is reached.
-    fn try_lock_exclusive_until(&self, timeout: Self::Instant) -> bool;
-}
-
-/// Additional methods for RwLocks which support recursive read locks.
-///
-/// These are guaranteed to succeed without blocking if
-/// another read lock is held at the time of the call. This allows a thread
-/// to recursively lock a `RwLock`. However using this method can cause
-/// writers to starve since readers no longer block if a writer is waiting
-/// for the lock.
-pub unsafe trait RawRwLockRecursive: RawRwLock {
-    /// Acquires a shared lock without deadlocking in case of a recursive lock.
-    fn lock_shared_recursive(&self);
-
-    /// Attempts to acquire a shared lock without deadlocking in case of a recursive lock.
-    fn try_lock_shared_recursive(&self) -> bool;
-}
-
-/// Additional methods for RwLocks which support recursive read locks and timeouts.
-pub unsafe trait RawRwLockRecursiveTimed: RawRwLockRecursive + RawRwLockTimed {
-    /// Attempts to acquire a shared lock until a timeout is reached, without
-    /// deadlocking in case of a recursive lock.
-    fn try_lock_shared_recursive_for(&self, timeout: Self::Duration) -> bool;
-
-    /// Attempts to acquire a shared lock until a timeout is reached, without
-    /// deadlocking in case of a recursive lock.
-    fn try_lock_shared_recursive_until(&self, timeout: Self::Instant) -> bool;
-}
-
-/// Additional methods for RwLocks which support atomically upgrading a shared
-/// lock to an exclusive lock.
-///
-/// This requires acquiring a special "upgradable read lock" instead of a
-/// normal shared lock. There may only be one upgradable lock at any time,
-/// otherwise deadlocks could occur when upgrading.
-pub unsafe trait RawRwLockUpgrade: RawRwLock {
-    /// Acquires an upgradable lock, blocking the current thread until it is able to do so.
-    fn lock_upgradable(&self);
-
-    /// Attempts to acquire an upgradable lock without blocking.
-    fn try_lock_upgradable(&self) -> bool;
-
-    /// Releases an upgradable lock.
-    fn unlock_upgradable(&self);
-
-    /// Upgrades an upgradable lock to an exclusive lock.
-    fn upgrade(&self);
-
-    /// Attempts to upgrade an upgradable lock to an exclusive lock without
-    /// blocking.
-    fn try_upgrade(&self) -> bool;
-}
-
-/// Additional methods for RwLocks which support upgradable locks and fair
-/// unlocking.
-pub unsafe trait RawRwLockUpgradeFair: RawRwLockUpgrade + RawRwLockFair {
-    /// Releases an upgradable lock using a fair unlock protocol.
-    fn unlock_upgradable_fair(&self);
-
-    /// Temporarily yields an upgradable lock to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_upgradable_fair` followed
-    /// by `lock_upgradable`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    fn bump_upgradable(&self) {
-        self.unlock_upgradable_fair();
-        self.lock_upgradable();
-    }
-}
-
-/// Additional methods for RwLocks which support upgradable locks and lock
-/// downgrading.
-pub unsafe trait RawRwLockUpgradeDowngrade: RawRwLockUpgrade + RawRwLockDowngrade {
-    /// Downgrades an upgradable lock to a shared lock.
-    fn downgrade_upgradable(&self);
-
-    /// Downgrades an exclusive lock to an upgradable lock.
-    fn downgrade_to_upgradable(&self);
-}
-
-/// Additional methods for RwLocks which support upgradable locks and locking
-/// with timeouts.
-pub unsafe trait RawRwLockUpgradeTimed: RawRwLockUpgrade + RawRwLockTimed {
-    /// Attempts to acquire an upgradable lock until a timeout is reached.
-    fn try_lock_upgradable_for(&self, timeout: Self::Duration) -> bool;
-
-    /// Attempts to acquire an upgradable lock until a timeout is reached.
-    fn try_lock_upgradable_until(&self, timeout: Self::Instant) -> bool;
-
-    /// Attempts to upgrade an upgradable lock to an exclusive lock until a
-    /// timeout is reached.
-    fn try_upgrade_for(&self, timeout: Self::Duration) -> bool;
-
-    /// Attempts to upgrade an upgradable lock to an exclusive lock until a
-    /// timeout is reached.
-    fn try_upgrade_until(&self, timeout: Self::Instant) -> bool;
-}
-
-/// A reader-writer lock
-///
-/// This type of lock allows a number of readers or at most one writer at any
-/// point in time. The write portion of this lock typically allows modification
-/// of the underlying data (exclusive access) and the read portion of this lock
-/// typically allows for read-only access (shared access).
-///
-/// The type parameter `T` represents the data that this lock protects. It is
-/// required that `T` satisfies `Send` to be shared across threads and `Sync` to
-/// allow concurrent access through readers. The RAII guards returned from the
-/// locking methods implement `Deref` (and `DerefMut` for the `write` methods)
-/// to allow access to the contained of the lock.
-pub struct RwLock<R: RawRwLock, T: ?Sized> {
-    raw: R,
-    data: UnsafeCell<T>,
-}
-
-unsafe impl<R: RawRwLock + Send, T: ?Sized + Send> Send for RwLock<R, T> {}
-unsafe impl<R: RawRwLock + Sync, T: ?Sized + Send + Sync> Sync for RwLock<R, T> {}
-
-impl<R: RawRwLock, T> RwLock<R, T> {
-    /// Creates a new instance of an `RwLock<T>` which is unlocked.
-    #[cfg(feature = "nightly")]
-    #[inline]
-    pub const fn new(val: T) -> RwLock<R, T> {
-        RwLock {
-            data: UnsafeCell::new(val),
-            raw: R::INIT,
-        }
-    }
-
-    /// Creates a new instance of an `RwLock<T>` which is unlocked.
-    #[cfg(not(feature = "nightly"))]
-    #[inline]
-    pub fn new(val: T) -> RwLock<R, T> {
-        RwLock {
-            data: UnsafeCell::new(val),
-            raw: R::INIT,
-        }
-    }
-
-    /// Consumes this `RwLock`, returning the underlying data.
-    #[inline]
-    #[allow(unused_unsafe)]
-    pub fn into_inner(self) -> T {
-        unsafe { self.data.into_inner() }
-    }
-}
-
-impl<R: RawRwLock, T: ?Sized> RwLock<R, T> {
-    #[inline]
-    fn read_guard(&self) -> RwLockReadGuard<R, T> {
-        RwLockReadGuard {
-            rwlock: self,
-            marker: PhantomData,
-        }
-    }
-
-    #[inline]
-    fn write_guard(&self) -> RwLockWriteGuard<R, T> {
-        RwLockWriteGuard {
-            rwlock: self,
-            marker: PhantomData,
-        }
-    }
-
-    /// Locks this `RwLock` with shared read access, blocking the current thread
-    /// until it can be acquired.
-    ///
-    /// The calling thread will be blocked until there are no more writers which
-    /// hold the lock. There may be other readers currently inside the lock when
-    /// this method returns.
-    ///
-    /// Note that attempts to recursively acquire a read lock on a `RwLock` when
-    /// the current thread already holds one may result in a deadlock.
-    ///
-    /// Returns an RAII guard which will release this thread's shared access
-    /// once it is dropped.
-    #[inline]
-    pub fn read(&self) -> RwLockReadGuard<R, T> {
-        self.raw.lock_shared();
-        self.read_guard()
-    }
-
-    /// Attempts to acquire this `RwLock` with shared read access.
-    ///
-    /// If the access could not be granted at this time, then `None` is returned.
-    /// Otherwise, an RAII guard is returned which will release the shared access
-    /// when it is dropped.
-    ///
-    /// This function does not block.
-    #[inline]
-    pub fn try_read(&self) -> Option<RwLockReadGuard<R, T>> {
-        if self.raw.try_lock_shared() {
-            Some(self.read_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Locks this `RwLock` with exclusive write access, blocking the current
-    /// thread until it can be acquired.
-    ///
-    /// This function will not return while other writers or other readers
-    /// currently have access to the lock.
-    ///
-    /// Returns an RAII guard which will drop the write access of this `RwLock`
-    /// when dropped.
-    #[inline]
-    pub fn write(&self) -> RwLockWriteGuard<R, T> {
-        self.raw.lock_exclusive();
-        self.write_guard()
-    }
-
-    /// Attempts to lock this `RwLock` with exclusive write access.
-    ///
-    /// If the lock could not be acquired at this time, then `None` is returned.
-    /// Otherwise, an RAII guard is returned which will release the lock when
-    /// it is dropped.
-    ///
-    /// This function does not block.
-    #[inline]
-    pub fn try_write(&self) -> Option<RwLockWriteGuard<R, T>> {
-        if self.raw.try_lock_exclusive() {
-            Some(self.write_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Returns a mutable reference to the underlying data.
-    ///
-    /// Since this call borrows the `RwLock` mutably, no actual locking needs to
-    /// take place---the mutable borrow statically guarantees no locks exist.
-    #[inline]
-    pub fn get_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.data.get() }
-    }
-
-    /// Forcibly unlocks a read lock.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `RwLockReadGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `RwLockReadGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a rwlock is read-unlocked when not read-locked.
-    #[inline]
-    pub unsafe fn force_unlock_read(&self) {
-        self.raw.unlock_shared();
-    }
-
-    /// Forcibly unlocks a write lock.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `RwLockWriteGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `RwLockWriteGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a rwlock is write-unlocked when not write-locked.
-    #[inline]
-    pub unsafe fn force_unlock_write(&self) {
-        self.raw.unlock_exclusive();
-    }
-
-    /// Returns the underlying raw reader-writer lock object.
-    ///
-    /// Note that you will most likely need to import the `RawRwLock` trait from
-    /// `lock_api` to be able to call functions on the raw
-    /// reader-writer lock.
-    ///
-    /// # Safety
-    ///
-    /// This method is unsafe because it allows unlocking a mutex while
-    /// still holding a reference to a lock guard.
-    pub unsafe fn raw(&self) -> &R {
-        &self.raw
-    }
-}
-
-impl<R: RawRwLockFair, T: ?Sized> RwLock<R, T> {
-    /// Forcibly unlocks a read lock using a fair unlock procotol.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `RwLockReadGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `RwLockReadGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a rwlock is read-unlocked when not read-locked.
-    #[inline]
-    pub unsafe fn force_unlock_read_fair(&self) {
-        self.raw.unlock_shared_fair();
-    }
-
-    /// Forcibly unlocks a write lock using a fair unlock procotol.
-    ///
-    /// This is useful when combined with `mem::forget` to hold a lock without
-    /// the need to maintain a `RwLockWriteGuard` object alive, for example when
-    /// dealing with FFI.
-    ///
-    /// # Safety
-    ///
-    /// This method must only be called if the current thread logically owns a
-    /// `RwLockWriteGuard` but that guard has be discarded using `mem::forget`.
-    /// Behavior is undefined if a rwlock is write-unlocked when not write-locked.
-    #[inline]
-    pub unsafe fn force_unlock_write_fair(&self) {
-        self.raw.unlock_exclusive_fair();
-    }
-}
-
-impl<R: RawRwLockTimed, T: ?Sized> RwLock<R, T> {
-    /// Attempts to acquire this `RwLock` with shared read access until a timeout
-    /// is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the shared access when it is dropped.
-    #[inline]
-    pub fn try_read_for(&self, timeout: R::Duration) -> Option<RwLockReadGuard<R, T>> {
-        if self.raw.try_lock_shared_for(timeout) {
-            Some(self.read_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this `RwLock` with shared read access until a timeout
-    /// is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the shared access when it is dropped.
-    #[inline]
-    pub fn try_read_until(&self, timeout: R::Instant) -> Option<RwLockReadGuard<R, T>> {
-        if self.raw.try_lock_shared_until(timeout) {
-            Some(self.read_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this `RwLock` with exclusive write access until a
-    /// timeout is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the exclusive access when it is dropped.
-    #[inline]
-    pub fn try_write_for(&self, timeout: R::Duration) -> Option<RwLockWriteGuard<R, T>> {
-        if self.raw.try_lock_exclusive_for(timeout) {
-            Some(self.write_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this `RwLock` with exclusive write access until a
-    /// timeout is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the exclusive access when it is dropped.
-    #[inline]
-    pub fn try_write_until(&self, timeout: R::Instant) -> Option<RwLockWriteGuard<R, T>> {
-        if self.raw.try_lock_exclusive_until(timeout) {
-            Some(self.write_guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawRwLockRecursive, T: ?Sized> RwLock<R, T> {
-    /// Locks this `RwLock` with shared read access, blocking the current thread
-    /// until it can be acquired.
-    ///
-    /// The calling thread will be blocked until there are no more writers which
-    /// hold the lock. There may be other readers currently inside the lock when
-    /// this method returns.
-    ///
-    /// Unlike `read`, this method is guaranteed to succeed without blocking if
-    /// another read lock is held at the time of the call. This allows a thread
-    /// to recursively lock a `RwLock`. However using this method can cause
-    /// writers to starve since readers no longer block if a writer is waiting
-    /// for the lock.
-    ///
-    /// Returns an RAII guard which will release this thread's shared access
-    /// once it is dropped.
-    #[inline]
-    pub fn read_recursive(&self) -> RwLockReadGuard<R, T> {
-        self.raw.lock_shared_recursive();
-        self.read_guard()
-    }
-
-    /// Attempts to acquire this `RwLock` with shared read access.
-    ///
-    /// If the access could not be granted at this time, then `None` is returned.
-    /// Otherwise, an RAII guard is returned which will release the shared access
-    /// when it is dropped.
-    ///
-    /// This method is guaranteed to succeed if another read lock is held at the
-    /// time of the call. See the documentation for `read_recursive` for details.
-    ///
-    /// This function does not block.
-    #[inline]
-    pub fn try_read_recursive(&self) -> Option<RwLockReadGuard<R, T>> {
-        if self.raw.try_lock_shared_recursive() {
-            Some(self.read_guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawRwLockRecursiveTimed, T: ?Sized> RwLock<R, T> {
-    /// Attempts to acquire this `RwLock` with shared read access until a timeout
-    /// is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the shared access when it is dropped.
-    ///
-    /// This method is guaranteed to succeed without blocking if another read
-    /// lock is held at the time of the call. See the documentation for
-    /// `read_recursive` for details.
-    #[inline]
-    pub fn try_read_recursive_for(&self, timeout: R::Duration) -> Option<RwLockReadGuard<R, T>> {
-        if self.raw.try_lock_shared_recursive_for(timeout) {
-            Some(self.read_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this `RwLock` with shared read access until a timeout
-    /// is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the shared access when it is dropped.
-    #[inline]
-    pub fn try_read_recursive_until(&self, timeout: R::Instant) -> Option<RwLockReadGuard<R, T>> {
-        if self.raw.try_lock_shared_recursive_until(timeout) {
-            Some(self.read_guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawRwLockUpgrade, T: ?Sized> RwLock<R, T> {
-    #[inline]
-    fn upgradable_guard(&self) -> RwLockUpgradableReadGuard<R, T> {
-        RwLockUpgradableReadGuard {
-            rwlock: self,
-            marker: PhantomData,
-        }
-    }
-
-    /// Locks this `RwLock` with upgradable read access, blocking the current thread
-    /// until it can be acquired.
-    ///
-    /// The calling thread will be blocked until there are no more writers or other
-    /// upgradable reads which hold the lock. There may be other readers currently
-    /// inside the lock when this method returns.
-    ///
-    /// Returns an RAII guard which will release this thread's shared access
-    /// once it is dropped.
-    #[inline]
-    pub fn upgradable_read(&self) -> RwLockUpgradableReadGuard<R, T> {
-        self.raw.lock_upgradable();
-        self.upgradable_guard()
-    }
-
-    /// Attempts to acquire this `RwLock` with upgradable read access.
-    ///
-    /// If the access could not be granted at this time, then `None` is returned.
-    /// Otherwise, an RAII guard is returned which will release the shared access
-    /// when it is dropped.
-    ///
-    /// This function does not block.
-    #[inline]
-    pub fn try_upgradable_read(&self) -> Option<RwLockUpgradableReadGuard<R, T>> {
-        if self.raw.try_lock_upgradable() {
-            Some(self.upgradable_guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawRwLockUpgradeTimed, T: ?Sized> RwLock<R, T> {
-    /// Attempts to acquire this `RwLock` with upgradable read access until a timeout
-    /// is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the shared access when it is dropped.
-    #[inline]
-    pub fn try_upgradable_read_for(
-        &self,
-        timeout: R::Duration,
-    ) -> Option<RwLockUpgradableReadGuard<R, T>> {
-        if self.raw.try_lock_upgradable_for(timeout) {
-            Some(self.upgradable_guard())
-        } else {
-            None
-        }
-    }
-
-    /// Attempts to acquire this `RwLock` with upgradable read access until a timeout
-    /// is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// `None` is returned. Otherwise, an RAII guard is returned which will
-    /// release the shared access when it is dropped.
-    #[inline]
-    pub fn try_upgradable_read_until(
-        &self,
-        timeout: R::Instant,
-    ) -> Option<RwLockUpgradableReadGuard<R, T>> {
-        if self.raw.try_lock_upgradable_until(timeout) {
-            Some(self.upgradable_guard())
-        } else {
-            None
-        }
-    }
-}
-
-impl<R: RawRwLock, T: ?Sized + Default> Default for RwLock<R, T> {
-    #[inline]
-    fn default() -> RwLock<R, T> {
-        RwLock::new(Default::default())
-    }
-}
-
-impl<R: RawRwLock, T> From<T> for RwLock<R, T> {
-    #[inline]
-    fn from(t: T) -> RwLock<R, T> {
-        RwLock::new(t)
-    }
-}
-
-impl<R: RawRwLock, T: ?Sized + fmt::Debug> fmt::Debug for RwLock<R, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self.try_read() {
-            Some(guard) => f.debug_struct("RwLock").field("data", &&*guard).finish(),
-            None => f.pad("RwLock { <locked> }"),
-        }
-    }
-}
-
-/// RAII structure used to release the shared read access of a lock when
-/// dropped.
-#[must_use]
-pub struct RwLockReadGuard<'a, R: RawRwLock + 'a, T: ?Sized + 'a> {
-    rwlock: &'a RwLock<R, T>,
-    marker: PhantomData<(&'a T, R::GuardMarker)>,
-}
-
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync for RwLockReadGuard<'a, R, T> {}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockReadGuard<'a, R, T> {
-    /// Returns a reference to the original reader-writer lock object.
-    pub fn rwlock(s: &Self) -> &'a RwLock<R, T> {
-        s.rwlock
-    }
-
-    /// Make a new `MappedRwLockReadGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `RwLockReadGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `RwLockReadGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockReadGuard<'a, R, U>
-    where
-        F: FnOnce(&T) -> &U,
-    {
-        let raw = &s.rwlock.raw;
-        let data = f(unsafe { &*s.rwlock.data.get() });
-        mem::forget(s);
-        MappedRwLockReadGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedRwLockReadGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `RwLockReadGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `RwLockReadGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockReadGuard<'a, R, U>, Self>
-    where
-        F: FnOnce(&T) -> Option<&U>,
-    {
-        let raw = &s.rwlock.raw;
-        let data = match f(unsafe { &*s.rwlock.data.get() }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedRwLockReadGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-
-    /// Temporarily unlocks the `RwLock` to execute the given function.
-    ///
-    /// The `RwLock` is unlocked a fair unlock protocol.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the `RwLock`.
-    #[inline]
-    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.rwlock.raw.unlock_shared();
-        defer!(s.rwlock.raw.lock_shared());
-        f()
-    }
-}
-
-impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> RwLockReadGuard<'a, R, T> {
-    /// Unlocks the `RwLock` using a fair unlock protocol.
-    ///
-    /// By default, `RwLock` is unfair and allow the current thread to re-lock
-    /// the `RwLock` before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the `RwLock` for a long time. This is
-    /// the default because it allows much higher throughput as it avoids
-    /// forcing a context switch on every `RwLock` unlock. This can result in one
-    /// thread acquiring a `RwLock` many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `RwLockReadGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.rwlock.raw.unlock_shared_fair();
-        mem::forget(s);
-    }
-
-    /// Temporarily unlocks the `RwLock` to execute the given function.
-    ///
-    /// The `RwLock` is unlocked a fair unlock protocol.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the `RwLock`.
-    #[inline]
-    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.rwlock.raw.unlock_shared_fair();
-        defer!(s.rwlock.raw.lock_shared());
-        f()
-    }
-
-    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_fair` followed
-    /// by `read`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    #[inline]
-    pub fn bump(s: &mut Self) {
-        s.rwlock.raw.bump_shared();
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for RwLockReadGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.rwlock.data.get() }
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for RwLockReadGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.rwlock.raw.unlock_shared();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress for RwLockReadGuard<'a, R, T> {}
-
-/// RAII structure used to release the exclusive write access of a lock when
-/// dropped.
-#[must_use]
-pub struct RwLockWriteGuard<'a, R: RawRwLock + 'a, T: ?Sized + 'a> {
-    rwlock: &'a RwLock<R, T>,
-    marker: PhantomData<(&'a mut T, R::GuardMarker)>,
-}
-
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync for RwLockWriteGuard<'a, R, T> {}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
-    /// Returns a reference to the original reader-writer lock object.
-    pub fn rwlock(s: &Self) -> &'a RwLock<R, T> {
-        s.rwlock
-    }
-
-    /// Make a new `MappedRwLockWriteGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `RwLockWriteGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `RwLockWriteGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockWriteGuard<'a, R, U>
-    where
-        F: FnOnce(&mut T) -> &mut U,
-    {
-        let raw = &s.rwlock.raw;
-        let data = f(unsafe { &mut *s.rwlock.data.get() });
-        mem::forget(s);
-        MappedRwLockWriteGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedRwLockWriteGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `RwLockWriteGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `RwLockWriteGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockWriteGuard<'a, R, U>, Self>
-    where
-        F: FnOnce(&mut T) -> Option<&mut U>,
-    {
-        let raw = &s.rwlock.raw;
-        let data = match f(unsafe { &mut *s.rwlock.data.get() }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedRwLockWriteGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-
-    /// Temporarily unlocks the `RwLock` to execute the given function.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the `RwLock`.
-    #[inline]
-    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.rwlock.raw.unlock_exclusive();
-        defer!(s.rwlock.raw.lock_exclusive());
-        f()
-    }
-}
-
-impl<'a, R: RawRwLockDowngrade + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
-    /// Atomically downgrades a write lock into a read lock without allowing any
-    /// writers to take exclusive access of the lock in the meantime.
-    ///
-    /// Note that if there are any writers currently waiting to take the lock
-    /// then other readers may not be able to acquire the lock even if it was
-    /// downgraded.
-    pub fn downgrade(s: Self) -> RwLockReadGuard<'a, R, T> {
-        s.rwlock.raw.downgrade();
-        let rwlock = s.rwlock;
-        mem::forget(s);
-        RwLockReadGuard {
-            rwlock,
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<'a, R: RawRwLockUpgradeDowngrade + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
-    /// Atomically downgrades a write lock into an upgradable read lock without allowing any
-    /// writers to take exclusive access of the lock in the meantime.
-    ///
-    /// Note that if there are any writers currently waiting to take the lock
-    /// then other readers may not be able to acquire the lock even if it was
-    /// downgraded.
-    pub fn downgrade_to_upgradable(s: Self) -> RwLockUpgradableReadGuard<'a, R, T> {
-        s.rwlock.raw.downgrade_to_upgradable();
-        let rwlock = s.rwlock;
-        mem::forget(s);
-        RwLockUpgradableReadGuard {
-            rwlock,
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
-    /// Unlocks the `RwLock` using a fair unlock protocol.
-    ///
-    /// By default, `RwLock` is unfair and allow the current thread to re-lock
-    /// the `RwLock` before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the `RwLock` for a long time. This is
-    /// the default because it allows much higher throughput as it avoids
-    /// forcing a context switch on every `RwLock` unlock. This can result in one
-    /// thread acquiring a `RwLock` many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `RwLockWriteGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.rwlock.raw.unlock_exclusive_fair();
-        mem::forget(s);
-    }
-
-    /// Temporarily unlocks the `RwLock` to execute the given function.
-    ///
-    /// The `RwLock` is unlocked a fair unlock protocol.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the `RwLock`.
-    #[inline]
-    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.rwlock.raw.unlock_exclusive_fair();
-        defer!(s.rwlock.raw.lock_exclusive());
-        f()
-    }
-
-    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_fair` followed
-    /// by `write`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    #[inline]
-    pub fn bump(s: &mut Self) {
-        s.rwlock.raw.bump_exclusive();
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for RwLockWriteGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.rwlock.data.get() }
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> DerefMut for RwLockWriteGuard<'a, R, T> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.rwlock.data.get() }
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for RwLockWriteGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.rwlock.raw.unlock_exclusive();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress for RwLockWriteGuard<'a, R, T> {}
-
-/// RAII structure used to release the upgradable read access of a lock when
-/// dropped.
-#[must_use]
-pub struct RwLockUpgradableReadGuard<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> {
-    rwlock: &'a RwLock<R, T>,
-    marker: PhantomData<(&'a T, R::GuardMarker)>,
-}
-
-unsafe impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + Sync + 'a> Sync
-    for RwLockUpgradableReadGuard<'a, R, T>
-{}
-
-impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
-    /// Returns a reference to the original reader-writer lock object.
-    pub fn rwlock(s: &Self) -> &'a RwLock<R, T> {
-        s.rwlock
-    }
-
-    /// Temporarily unlocks the `RwLock` to execute the given function.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the `RwLock`.
-    #[inline]
-    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.rwlock.raw.unlock_upgradable();
-        defer!(s.rwlock.raw.lock_upgradable());
-        f()
-    }
-
-    /// Atomically upgrades an upgradable read lock lock into a exclusive write lock,
-    /// blocking the current thread until it can be acquired.
-    pub fn upgrade(s: Self) -> RwLockWriteGuard<'a, R, T> {
-        s.rwlock.raw.upgrade();
-        let rwlock = s.rwlock;
-        mem::forget(s);
-        RwLockWriteGuard {
-            rwlock,
-            marker: PhantomData,
-        }
-    }
-
-    /// Tries to atomically upgrade an upgradable read lock into a exclusive write lock.
-    ///
-    /// If the access could not be granted at this time, then the current guard is returned.
-    pub fn try_upgrade(s: Self) -> Result<RwLockWriteGuard<'a, R, T>, Self> {
-        if s.rwlock.raw.try_upgrade() {
-            let rwlock = s.rwlock;
-            mem::forget(s);
-            Ok(RwLockWriteGuard {
-                rwlock,
-                marker: PhantomData,
-            })
-        } else {
-            Err(s)
-        }
-    }
-}
-
-impl<'a, R: RawRwLockUpgradeFair + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
-    /// Unlocks the `RwLock` using a fair unlock protocol.
-    ///
-    /// By default, `RwLock` is unfair and allow the current thread to re-lock
-    /// the `RwLock` before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the `RwLock` for a long time. This is
-    /// the default because it allows much higher throughput as it avoids
-    /// forcing a context switch on every `RwLock` unlock. This can result in one
-    /// thread acquiring a `RwLock` many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `RwLockUpgradableReadGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.rwlock.raw.unlock_upgradable_fair();
-        mem::forget(s);
-    }
-
-    /// Temporarily unlocks the `RwLock` to execute the given function.
-    ///
-    /// The `RwLock` is unlocked a fair unlock protocol.
-    ///
-    /// This is safe because `&mut` guarantees that there exist no other
-    /// references to the data protected by the `RwLock`.
-    #[inline]
-    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
-    where
-        F: FnOnce() -> U,
-    {
-        s.rwlock.raw.unlock_upgradable_fair();
-        defer!(s.rwlock.raw.lock_upgradable());
-        f()
-    }
-
-    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
-    ///
-    /// This method is functionally equivalent to calling `unlock_fair` followed
-    /// by `upgradable_read`, however it can be much more efficient in the case where there
-    /// are no waiting threads.
-    #[inline]
-    pub fn bump(s: &mut Self) {
-        s.rwlock.raw.bump_upgradable();
-    }
-}
-
-impl<'a, R: RawRwLockUpgradeDowngrade + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
-    /// Atomically downgrades an upgradable read lock lock into a shared read lock
-    /// without allowing any writers to take exclusive access of the lock in the
-    /// meantime.
-    ///
-    /// Note that if there are any writers currently waiting to take the lock
-    /// then other readers may not be able to acquire the lock even if it was
-    /// downgraded.
-    pub fn downgrade(s: Self) -> RwLockReadGuard<'a, R, T> {
-        s.rwlock.raw.downgrade_upgradable();
-        let rwlock = s.rwlock;
-        mem::forget(s);
-        RwLockReadGuard {
-            rwlock,
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<'a, R: RawRwLockUpgradeTimed + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
-    /// Tries to atomically upgrade an upgradable read lock into a exclusive
-    /// write lock, until a timeout is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// the current guard is returned.
-    pub fn try_upgrade_for(
-        s: Self,
-        timeout: R::Duration,
-    ) -> Result<RwLockWriteGuard<'a, R, T>, Self> {
-        if s.rwlock.raw.try_upgrade_for(timeout) {
-            let rwlock = s.rwlock;
-            mem::forget(s);
-            Ok(RwLockWriteGuard {
-                rwlock,
-                marker: PhantomData,
-            })
-        } else {
-            Err(s)
-        }
-    }
-
-    /// Tries to atomically upgrade an upgradable read lock into a exclusive
-    /// write lock, until a timeout is reached.
-    ///
-    /// If the access could not be granted before the timeout expires, then
-    /// the current guard is returned.
-    #[inline]
-    pub fn try_upgrade_until(
-        s: Self,
-        timeout: R::Instant,
-    ) -> Result<RwLockWriteGuard<'a, R, T>, Self> {
-        if s.rwlock.raw.try_upgrade_until(timeout) {
-            let rwlock = s.rwlock;
-            mem::forget(s);
-            Ok(RwLockWriteGuard {
-                rwlock,
-                marker: PhantomData,
-            })
-        } else {
-            Err(s)
-        }
-    }
-}
-
-impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> Deref for RwLockUpgradableReadGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.rwlock.data.get() }
-    }
-}
-
-impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> Drop for RwLockUpgradableReadGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.rwlock.raw.unlock_upgradable();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> StableAddress
-    for RwLockUpgradableReadGuard<'a, R, T>
-{}
-
-/// An RAII read lock guard returned by `RwLockReadGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedRwLockReadGuard` and `RwLockReadGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-#[must_use]
-pub struct MappedRwLockReadGuard<'a, R: RawRwLock + 'a, T: ?Sized + 'a> {
-    raw: &'a R,
-    data: *const T,
-    marker: PhantomData<&'a T>,
-}
-
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync for MappedRwLockReadGuard<'a, R, T> {}
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Send for MappedRwLockReadGuard<'a, R, T> where
-    R::GuardMarker: Send
-{}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> MappedRwLockReadGuard<'a, R, T> {
-    /// Make a new `MappedRwLockReadGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `MappedRwLockReadGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedRwLockReadGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockReadGuard<'a, R, U>
-    where
-        F: FnOnce(&T) -> &U,
-    {
-        let raw = s.raw;
-        let data = f(unsafe { &*s.data });
-        mem::forget(s);
-        MappedRwLockReadGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedRwLockReadGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `MappedRwLockReadGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedRwLockReadGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockReadGuard<'a, R, U>, Self>
-    where
-        F: FnOnce(&T) -> Option<&U>,
-    {
-        let raw = s.raw;
-        let data = match f(unsafe { &*s.data }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedRwLockReadGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-}
-
-impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> MappedRwLockReadGuard<'a, R, T> {
-    /// Unlocks the `RwLock` using a fair unlock protocol.
-    ///
-    /// By default, `RwLock` is unfair and allow the current thread to re-lock
-    /// the `RwLock` before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the `RwLock` for a long time. This is
-    /// the default because it allows much higher throughput as it avoids
-    /// forcing a context switch on every `RwLock` unlock. This can result in one
-    /// thread acquiring a `RwLock` many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `MappedRwLockReadGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.raw.unlock_shared_fair();
-        mem::forget(s);
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for MappedRwLockReadGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.data }
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for MappedRwLockReadGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.raw.unlock_shared();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress
-    for MappedRwLockReadGuard<'a, R, T>
-{}
-
-/// An RAII write lock guard returned by `RwLockWriteGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedRwLockWriteGuard` and `RwLockWriteGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-#[must_use]
-pub struct MappedRwLockWriteGuard<'a, R: RawRwLock + 'a, T: ?Sized + 'a> {
-    raw: &'a R,
-    data: *mut T,
-    marker: PhantomData<&'a mut T>,
-}
-
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync
-    for MappedRwLockWriteGuard<'a, R, T>
-{}
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Send for MappedRwLockWriteGuard<'a, R, T> where
-    R::GuardMarker: Send
-{}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> MappedRwLockWriteGuard<'a, R, T> {
-    /// Make a new `MappedRwLockWriteGuard` for a component of the locked data.
-    ///
-    /// This operation cannot fail as the `MappedRwLockWriteGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedRwLockWriteGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockWriteGuard<'a, R, U>
-    where
-        F: FnOnce(&mut T) -> &mut U,
-    {
-        let raw = s.raw;
-        let data = f(unsafe { &mut *s.data });
-        mem::forget(s);
-        MappedRwLockWriteGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-
-    /// Attempts to make  a new `MappedRwLockWriteGuard` for a component of the
-    /// locked data. The original guard is return if the closure returns `None`.
-    ///
-    /// This operation cannot fail as the `MappedRwLockWriteGuard` passed
-    /// in already locked the data.
-    ///
-    /// This is an associated function that needs to be
-    /// used as `MappedRwLockWriteGuard::map(...)`. A method would interfere with methods of
-    /// the same name on the contents of the locked data.
-    #[inline]
-    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockWriteGuard<'a, R, U>, Self>
-    where
-        F: FnOnce(&mut T) -> Option<&mut U>,
-    {
-        let raw = s.raw;
-        let data = match f(unsafe { &mut *s.data }) {
-            Some(data) => data,
-            None => return Err(s),
-        };
-        mem::forget(s);
-        Ok(MappedRwLockWriteGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        })
-    }
-}
-
-impl<'a, R: RawRwLockDowngrade + 'a, T: ?Sized + 'a> MappedRwLockWriteGuard<'a, R, T> {
-    /// Atomically downgrades a write lock into a read lock without allowing any
-    /// writers to take exclusive access of the lock in the meantime.
-    ///
-    /// Note that if there are any writers currently waiting to take the lock
-    /// then other readers may not be able to acquire the lock even if it was
-    /// downgraded.
-    pub fn downgrade(s: Self) -> MappedRwLockReadGuard<'a, R, T> {
-        s.raw.downgrade();
-        let raw = s.raw;
-        let data = s.data;
-        mem::forget(s);
-        MappedRwLockReadGuard {
-            raw,
-            data,
-            marker: PhantomData,
-        }
-    }
-}
-
-impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> MappedRwLockWriteGuard<'a, R, T> {
-    /// Unlocks the `RwLock` using a fair unlock protocol.
-    ///
-    /// By default, `RwLock` is unfair and allow the current thread to re-lock
-    /// the `RwLock` before another has the chance to acquire the lock, even if
-    /// that thread has been blocked on the `RwLock` for a long time. This is
-    /// the default because it allows much higher throughput as it avoids
-    /// forcing a context switch on every `RwLock` unlock. This can result in one
-    /// thread acquiring a `RwLock` many more times than other threads.
-    ///
-    /// However in some cases it can be beneficial to ensure fairness by forcing
-    /// the lock to pass on to a waiting thread if there is one. This is done by
-    /// using this method instead of dropping the `MappedRwLockWriteGuard` normally.
-    #[inline]
-    pub fn unlock_fair(s: Self) {
-        s.raw.unlock_exclusive_fair();
-        mem::forget(s);
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for MappedRwLockWriteGuard<'a, R, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        unsafe { &*self.data }
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> DerefMut for MappedRwLockWriteGuard<'a, R, T> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.data }
-    }
-}
-
-impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for MappedRwLockWriteGuard<'a, R, T> {
-    #[inline]
-    fn drop(&mut self) {
-        self.raw.unlock_exclusive();
-    }
-}
-
-#[cfg(feature = "owning_ref")]
-unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress
-    for MappedRwLockWriteGuard<'a, R, T>
-{}
diff -Nru cargo-0.32.0/vendor/log/.cargo_vcs_info.json cargo-0.33.0/vendor/log/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/log/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/log/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "1a9a8275f5d84d50b756437524da5ff8273ef99b"
-  }
-}
diff -Nru cargo-0.32.0/vendor/log/.travis.yml cargo-0.33.0/vendor/log/.travis.yml
--- cargo-0.32.0/vendor/log/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/log/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-language: rust
-sudo: false
-rust:
-  - 1.16.0
-  - stable
-  - beta
-  - nightly
-script:
-  - cargo build --verbose
-  - cargo build --verbose --features serde
-  - cargo build --verbose --features std
-  - cargo test --verbose
-  - cargo test --verbose --features serde
-  - cargo test --verbose --features std
-  - cargo run --verbose --manifest-path tests/max_level_features/Cargo.toml
-  - cargo run --verbose --manifest-path tests/max_level_features/Cargo.toml --release
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/memchr/build.rs cargo-0.33.0/vendor/memchr/build.rs
--- cargo-0.32.0/vendor/memchr/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memchr/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,18 +1,23 @@
-extern crate version_check;
-
 use std::env;
-
-use version_check::is_min_version;
+use std::ffi::OsString;
+use std::process::Command;
 
 fn main() {
-    enable_simd_optimizations();
+    let version = match Version::read() {
+        Ok(version) => version,
+        Err(err) => {
+            eprintln!("failed to parse `rustc --version`: {}", err);
+            return;
+        }
+    };
+    enable_simd_optimizations(version);
 }
 
-fn enable_simd_optimizations() {
-    if is_env_set("CARGO_CFG_MEMCHR_DISABLE_AUTO_SIMD") {
+fn enable_simd_optimizations(version: Version) {
+    if env::var_os("CARGO_CFG_MEMCHR_DISABLE_AUTO_SIMD").is_some() {
         return;
     }
-    if !is_min_version("1.27.0").map(|(yes, _)| yes).unwrap_or(false) {
+    if version < (Version { major: 1, minor: 27, patch: 0 }) {
         return;
     }
 
@@ -22,6 +27,62 @@
     println!("cargo:rustc-cfg=memchr_runtime_avx");
 }
 
-fn is_env_set(name: &str) -> bool {
-    env::var(name).is_ok()
+#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
+struct Version {
+    major: u32,
+    minor: u32,
+    patch: u32,
+}
+
+impl Version {
+    fn read() -> Result<Version, String> {
+        let rustc = env::var_os("RUSTC").unwrap_or(OsString::from("rustc"));
+        let output = Command::new(&rustc)
+            .arg("--version")
+            .output()
+            .unwrap()
+            .stdout;
+        Version::parse(&String::from_utf8(output).unwrap())
+    }
+
+    fn parse(mut s: &str) -> Result<Version, String> {
+        if !s.starts_with("rustc ") {
+            return Err(format!("unrecognized version string: {}", s));
+        }
+        s = &s["rustc ".len()..];
+
+        let parts: Vec<&str> = s.split(".").collect();
+        if parts.len() < 3 {
+            return Err(format!("not enough version parts: {:?}", parts));
+        }
+
+        let mut num = String::new();
+        for c in parts[0].chars() {
+            if !c.is_digit(10) {
+                break;
+            }
+            num.push(c);
+        }
+        let major = num.parse::<u32>().map_err(|e| e.to_string())?;
+
+        num.clear();
+        for c in parts[1].chars() {
+            if !c.is_digit(10) {
+                break;
+            }
+            num.push(c);
+        }
+        let minor = num.parse::<u32>().map_err(|e| e.to_string())?;
+
+        num.clear();
+        for c in parts[2].chars() {
+            if !c.is_digit(10) {
+                break;
+            }
+            num.push(c);
+        }
+        let patch = num.parse::<u32>().map_err(|e| e.to_string())?;
+
+        Ok(Version { major, minor, patch })
+    }
 }
diff -Nru cargo-0.32.0/vendor/memchr/.cargo-checksum.json cargo-0.33.0/vendor/memchr/.cargo-checksum.json
--- cargo-0.32.0/vendor/memchr/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memchr/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"}
\ No newline at end of file
+{"files":{},"package":"e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/memchr/Cargo.toml cargo-0.33.0/vendor/memchr/Cargo.toml
--- cargo-0.32.0/vendor/memchr/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memchr/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "memchr"
-version = "2.1.2"
+version = "2.1.3"
 authors = ["Andrew Gallant <jamslam@gmail.com>", "bluss"]
 exclude = ["/ci/*", "/.travis.yml", "/Makefile", "/appveyor.yml", "/ctags.rust", "/session.vim"]
 description = "Safe interface to memchr."
@@ -36,10 +36,8 @@
 optional = true
 default-features = false
 [dev-dependencies.quickcheck]
-version = "0.7"
+version = "0.8"
 default-features = false
-[build-dependencies.version_check]
-version = "0.1.4"
 
 [features]
 default = ["use_std", "libc"]
diff -Nru cargo-0.32.0/vendor/memchr/.cargo_vcs_info.json cargo-0.33.0/vendor/memchr/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/memchr/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memchr/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "437a177ab53bc1c27b5bcd5c23c3f2b0b6594d73"
-  }
-}
diff -Nru cargo-0.32.0/vendor/memchr/src/lib.rs cargo-0.33.0/vendor/memchr/src/lib.rs
--- cargo-0.32.0/vendor/memchr/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memchr/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -222,7 +222,7 @@
 ///
 /// While this is operationally the same as something like
 /// `haystack.iter().rposition(|&b| b == needle)`, `memrchr` will use a highly
-/// optimized routine that can be up to an order of magnitude master in some
+/// optimized routine that can be up to an order of magnitude faster in some
 /// cases.
 ///
 /// # Example
diff -Nru cargo-0.32.0/vendor/memchr/src/tests/mod.rs cargo-0.33.0/vendor/memchr/src/tests/mod.rs
--- cargo-0.32.0/vendor/memchr/src/tests/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memchr/src/tests/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -3,6 +3,18 @@
 mod iter;
 mod memchr;
 
+#[cfg(target_endian = "little")]
+#[test]
+fn byte_order() {
+    eprintln!("LITTLE ENDIAN");
+}
+
+#[cfg(target_endian = "big")]
+#[test]
+fn byte_order() {
+    eprintln!("BIG ENDIAN");
+}
+
 /// Create a sequence of tests that should be run by memchr implementations.
 fn memchr_tests() -> Vec<MemchrTest> {
     let mut tests = Vec::new();
diff -Nru cargo-0.32.0/vendor/memoffset/.cargo-checksum.json cargo-0.33.0/vendor/memoffset/.cargo-checksum.json
--- cargo-0.32.0/vendor/memoffset/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/memoffset/Cargo.toml cargo-0.33.0/vendor/memoffset/Cargo.toml
--- cargo-0.32.0/vendor/memoffset/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "memoffset"
-version = "0.2.1"
-authors = ["Gilad Naaman <gilad.naaman@gmail.com>"]
-description = "offset_of functionality for Rust structs."
-readme = "README.md"
-keywords = ["mem", "offset", "offset_of", "offsetof"]
-categories = ["no-std"]
-license = "MIT"
-repository = "https://github.com/Gilnaa/memoffset"
-
-[dependencies]
diff -Nru cargo-0.32.0/vendor/memoffset/LICENSE cargo-0.33.0/vendor/memoffset/LICENSE
--- cargo-0.32.0/vendor/memoffset/LICENSE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Copyright (c) 2017 Gilad Naaman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/memoffset/README.md cargo-0.33.0/vendor/memoffset/README.md
--- cargo-0.32.0/vendor/memoffset/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# memoffset #
-
-[![](http://meritbadge.herokuapp.com/memoffset)](https://crates.io/crates/memoffset)
-
-C-Like `offset_of` functionality for Rust structs.
-
-Introduces the following macros:
- * `offset_of!` for obtaining the offset of a member of a struct.
- * `span_of!` for obtaining the range that a field, or fields, span.
-
-`memoffset` works under `no_std` environments.
-
-## Usage ##
-Add the following dependency to your `Cargo.toml`:
-
-```toml
-[dependencies]
-memoffset = "0.2"
-```
-
-Add the following lines at the top of your `main.rs` or `lib.rs` files.
-
-```rust
-#[macro_use]
-extern crate memoffset;
-```
-
-## Examples ##
-```rust
-#[repr(C, packed)]
-struct Foo {
-	a: u32,
-	b: u32,
-	c: [u8; 5],
-	d: u32,
-}
-
-assert_eq!(offset_of!(Foo, b), 4);
-assert_eq!(offset_of!(Foo, c[3]), 11);
-
-assert_eq!(span_of!(Foo, a),          0..4);
-assert_eq!(span_of!(Foo, a ..  c),    0..8);
-assert_eq!(span_of!(Foo, a ..  c[1]), 0..9);
-assert_eq!(span_of!(Foo, a ..= c[1]), 0..10);
-assert_eq!(span_of!(Foo, ..= d),      0..14);
-assert_eq!(span_of!(Foo, b ..),       4..17);
-```
diff -Nru cargo-0.32.0/vendor/memoffset/src/lib.rs cargo-0.33.0/vendor/memoffset/src/lib.rs
--- cargo-0.32.0/vendor/memoffset/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-// Copyright (c) 2017 Gilad Naaman
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-//! A crate used for calculating offsets of struct members and their spans.
-//!
-//! Some of the funcationality of the crate makes no sense when used along with structs that
-//! are not `#[repr(C, packed)]`, but it is up to the user to make sure that they are.
-//!
-//! ## Examples
-//! ```
-//! #[macro_use]
-//! extern crate memoffset;
-//!
-//! #[repr(C, packed)]
-//! struct HelpMeIAmTrappedInAStructFactory {
-//!     help_me_before_they_: [u8; 15],
-//!     a: u32
-//! }
-//!
-//! fn main() {
-//!     assert_eq!(offset_of!(HelpMeIAmTrappedInAStructFactory, a), 15);
-//!     assert_eq!(span_of!(HelpMeIAmTrappedInAStructFactory, a), 15..19);
-//!     assert_eq!(span_of!(HelpMeIAmTrappedInAStructFactory, help_me_before_they_[2] .. a), 2..15);
-//! }
-//! ```
-//!
-//! This functionality can be useful, for example, for checksum calculations:
-//!
-//! ```ignore
-//! #[repr(C, packed)]
-//! struct Message {
-//!     header: MessageHeader,
-//!     fragment_index: u32,
-//!     fragment_count: u32,
-//!     payload: [u8; 1024],
-//!     checksum: u16
-//! }
-//!
-//! let checksum_range = &raw[span_of!(Message, header..checksum)];
-//! let checksum = crc16(checksum_range);
-//! ```
-
-#![no_std]
-
-// This `use` statement enables the macros to use `$crate::mem`.
-// Doing this enables this crate to function under both std and no-std crates.
-#[doc(hidden)]
-pub use core::mem;
-
-#[macro_use]
-mod offset_of;
-#[macro_use]
-mod span_of;
diff -Nru cargo-0.32.0/vendor/memoffset/src/offset_of.rs cargo-0.33.0/vendor/memoffset/src/offset_of.rs
--- cargo-0.32.0/vendor/memoffset/src/offset_of.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/src/offset_of.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-// Copyright (c) 2017 Gilad Naaman
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-/// Calculates the offset of the specified field from the start of the struct.
-/// This macro supports arbitrary amount of subscripts and recursive member-accesses.
-///
-/// *Note*: This macro may not make much sense when used on structs that are not `#[repr(C, packed)]`
-///
-/// ## Examples - Simple
-/// ```
-/// #[macro_use]
-/// extern crate memoffset;
-///
-/// #[repr(C, packed)]
-/// struct Foo {
-///     a: u32,
-///     b: u64,
-///     c: [u8; 5]
-/// }
-///
-/// fn main() {
-///     assert_eq!(offset_of!(Foo, a), 0);
-///     assert_eq!(offset_of!(Foo, b), 4);
-///     assert_eq!(offset_of!(Foo, c[2]), 14);
-/// }
-/// ```
-///
-/// ## Examples - Advanced
-/// ```
-/// #[macro_use]
-/// extern crate memoffset;
-///
-/// #[repr(C, packed)]
-/// struct UnnecessarilyComplicatedStruct {
-///     member: [UnnecessarilyComplexStruct; 12]
-/// }
-///
-/// #[repr(C, packed)]
-/// struct UnnecessarilyComplexStruct {
-///     a: u32,
-///     b: u64,
-///     c: [u8; 5]
-/// }
-///
-///
-/// fn main() {
-///     assert_eq!(offset_of!(UnnecessarilyComplicatedStruct, member[3].c[3]), 66);
-/// }
-/// ```
-#[macro_export]
-macro_rules! offset_of {
-    ($father:ty, $($field:tt)+) => ({
-        #[allow(unused_unsafe)]
-        let root: $father = unsafe { $crate::mem::uninitialized() };
-
-        let base = &root as *const _ as usize;
-
-        // Future error: borrow of packed field requires unsafe function or block (error E0133)
-        #[allow(unused_unsafe)]
-        let member =  unsafe { &root.$($field)* as *const _ as usize };
-
-        $crate::mem::forget(root);
-
-        member - base
-    });
-}
-
-#[cfg(test)]
-mod tests {
-    #[repr(C, packed)]
-    struct Foo {
-        a: u32,
-        b: [u8; 4],
-        c: i64,
-    }
-
-    #[test]
-    fn offset_simple() {
-        assert_eq!(offset_of!(Foo, a), 0);
-        assert_eq!(offset_of!(Foo, b), 4);
-        assert_eq!(offset_of!(Foo, c), 8);
-    }
-
-    #[test]
-    fn offset_index() {
-        assert_eq!(offset_of!(Foo, b[2]), 6);
-    }
-
-    #[test]
-    #[should_panic]
-    fn offset_index_out_of_bounds() {
-        offset_of!(Foo, b[4]);
-    }
-
-    #[test]
-    fn tuple_struct() {
-        #[repr(C, packed)]
-        struct Tup(i32, i32);
-
-        assert_eq!(offset_of!(Tup, 0), 0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/memoffset/src/span_of.rs cargo-0.33.0/vendor/memoffset/src/span_of.rs
--- cargo-0.32.0/vendor/memoffset/src/span_of.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/memoffset/src/span_of.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-// Copyright (c) 2017 Gilad Naaman
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-/// Produces a range instance representing the sub-slice containing the specified member.
-///
-/// This macro provides 2 forms of differing functionalities.
-///
-/// The first form is identical to the appearance of the `offset_of!` macro,
-/// and just like `offset_of!`, it has no limit on the depth of fields / subscripts used.
-///
-/// ```ignore
-/// span_of!(Struct, member[index].field)
-/// ```
-///
-/// The second form of `span_of!` returns a sub-slice which starts at one field, and ends at another.
-/// The general pattern of this form is:
-///
-/// ```ignore
-/// // Exclusive
-/// span_of!(Struct, member_a .. member_b)
-/// // Inclusive
-/// span_of!(Struct, member_a ..= member_b)
-///
-/// // Open-ended ranges
-/// span_of!(Struct, .. end)
-/// span_of!(Struct, start ..)
-/// ```
-///
-/// *Note*: 
-/// This macro uses recursion in order to resolve the range expressions, so there is a limit to the complexity of the expression.
-/// In order to raise the limit, the compiler's recursion limit should be lifted.
-///
-/// *Note*: 
-/// This macro may not make much sense when used on structs that are not `#[repr(C, packed)]`
-///
-/// ## Examples
-/// ```
-/// #[macro_use]
-/// extern crate memoffset;
-///
-/// #[repr(C, packed)]
-/// struct Florp {
-///     a: u32
-/// }
-///
-/// #[repr(C, packed)]
-/// struct Blarg {
-///     x: u64,
-///     y: [u8; 56],
-///     z: Florp,
-///     egg: [[u8; 4]; 4]
-/// }
-///
-/// fn main() {
-///     assert_eq!(0..8,   span_of!(Blarg, x));
-///     assert_eq!(64..68, span_of!(Blarg, z.a));
-///     assert_eq!(79..80, span_of!(Blarg, egg[2][3]));
-///
-///     assert_eq!(8..64,  span_of!(Blarg, y[0]  ..  z));
-///     assert_eq!(0..42,  span_of!(Blarg, x     ..  y[34]));
-///     assert_eq!(0..64,  span_of!(Blarg, x     ..= y));
-///     assert_eq!(58..68, span_of!(Blarg, y[50] ..= z));
-/// }
-/// ```
-#[macro_export]
-macro_rules! span_of {
-    (@helper $root:ident, [] ..=) => {
-        compile_error!("Expected a range, found '..='")
-    };
-    (@helper $root:ident, [] ..) => {
-        compile_error!("Expected a range, found '..'")
-    };
-    (@helper $root:ident, [] ..= $($field:tt)+) => {
-        (&$root as *const _ as usize,
-         &$root.$($field)* as *const _ as usize + $crate::mem::size_of_val(&$root.$($field)*))
-    };
-    (@helper $root:ident, [] .. $($field:tt)+) => {
-        (&$root as *const _ as usize, &$root.$($field)* as *const _ as usize)
-    };
-    (@helper $root:ident, $(# $begin:tt)+ [] ..= $($end:tt)+) => {
-        (&$root.$($begin)* as *const _ as usize,
-         &$root.$($end)* as *const _ as usize + $crate::mem::size_of_val(&$root.$($end)*))
-    };
-    (@helper $root:ident, $(# $begin:tt)+ [] .. $($end:tt)+) => {
-        (&$root.$($begin)* as *const _ as usize, &$root.$($end)* as *const _ as usize)
-    };
-    (@helper $root:ident, $(# $begin:tt)+ [] ..) => {
-        (&$root.$($begin)* as *const _ as usize,
-         &$root as *const _ as usize + $crate::mem::size_of_val(&$root))
-    };
-    (@helper $root:ident, $(# $begin:tt)+ [] ..=) => {
-        compile_error!(
-            "Found inclusive range to the end of a struct. Did you mean '..' instead of '..='?")
-    };
-    (@helper $root:ident, $(# $begin:tt)+ []) => {
-        (&$root.$($begin)* as *const _ as usize,
-         &$root.$($begin)* as *const _ as usize + $crate::mem::size_of_val(&$root.$($begin)*))
-    };
-    (@helper $root:ident, $(# $begin:tt)+ [] $tt:tt $($rest:tt)*) => {
-        span_of!(@helper $root, $(#$begin)* #$tt [] $($rest)*)
-    };
-    (@helper $root:ident, [] $tt:tt $($rest:tt)*) => {
-        span_of!(@helper $root, #$tt [] $($rest)*)
-    };
-
-    ($sty:ty, $($exp:tt)+) => ({
-        unsafe { 
-            let root: $sty = $crate::mem::uninitialized();
-            let base = &root as *const _ as usize;
-            let (begin, end) = span_of!(@helper root, [] $($exp)*);
-            begin-base..end-base
-        }
-    });
-}
-
-#[cfg(test)]
-mod tests {
-    use ::core::mem;
-
-    #[repr(C, packed)]
-    struct Foo {
-        a: u32,
-        b: [u8; 4],
-        c: i64,
-    }
-
-    #[test]
-    fn span_simple() {
-        assert_eq!(span_of!(Foo, a), 0..4);
-        assert_eq!(span_of!(Foo, b), 4..8);
-        assert_eq!(span_of!(Foo, c), 8..16);
-    }
-
-    #[test]
-    fn span_index() {
-        assert_eq!(span_of!(Foo, b[1]), 5..6);
-    }
-
-    #[test]
-    fn span_forms() {
-        #[repr(C, packed)]
-        struct Florp {
-            a: u32,
-        }
-
-        #[repr(C, packed)]
-        struct Blarg {
-            x: u64,
-            y: [u8; 56],
-            z: Florp,
-            egg: [[u8; 4]; 4],
-        }
-
-        // Love me some brute force
-        assert_eq!(0..8, span_of!(Blarg, x));
-        assert_eq!(64..68, span_of!(Blarg, z.a));
-        assert_eq!(79..80, span_of!(Blarg, egg[2][3]));
-
-        assert_eq!(8..64, span_of!(Blarg, y[0]..z));
-        assert_eq!(0..42, span_of!(Blarg, x..y[34]));
-        assert_eq!(0..64, span_of!(Blarg, x     ..= y));
-        assert_eq!(58..68, span_of!(Blarg, y[50] ..= z));
-    }
-
-    #[test]
-    fn ig_test() {
-        #[repr(C)]
-        struct Member {
-            foo: u32,
-        }
-
-        #[repr(C)]
-        struct Test {
-            x: u64,
-            y: [u8; 56],
-            z: Member,
-            egg: [[u8; 4]; 4],
-        }
-
-        assert_eq!(span_of!(Test, ..x), 0..0);
-        assert_eq!(span_of!(Test, ..=x), 0..8);
-        assert_eq!(span_of!(Test, ..y), 0..8);
-        assert_eq!(span_of!(Test, ..=y), 0..64);
-        assert_eq!(span_of!(Test, ..y[0]), 0..8);
-        assert_eq!(span_of!(Test, ..=y[0]), 0..9);
-        assert_eq!(span_of!(Test, ..z), 0..64);
-        assert_eq!(span_of!(Test, ..=z), 0..68);
-        assert_eq!(span_of!(Test, ..z.foo), 0..64);
-        assert_eq!(span_of!(Test, ..=z.foo), 0..68);
-        assert_eq!(span_of!(Test, ..egg), 0..68);
-        assert_eq!(span_of!(Test, ..=egg), 0..84);
-        assert_eq!(span_of!(Test, ..egg[0]), 0..68);
-        assert_eq!(span_of!(Test, ..=egg[0]), 0..72);
-        assert_eq!(span_of!(Test, ..egg[0][0]), 0..68);
-        assert_eq!(span_of!(Test, ..=egg[0][0]), 0..69);
-        assert_eq!(
-            span_of!(Test, x..),
-            offset_of!(Test, x)..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, y..),
-            offset_of!(Test, y)..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, y[0]..),
-            offset_of!(Test, y[0])..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, z..),
-            offset_of!(Test, z)..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, z.foo..),
-            offset_of!(Test, z.foo)..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, egg..),
-            offset_of!(Test, egg)..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, egg[0]..),
-            offset_of!(Test, egg[0])..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, egg[0][0]..),
-            offset_of!(Test, egg[0][0])..mem::size_of::<Test>()
-        );
-        assert_eq!(
-            span_of!(Test, x..y),
-            offset_of!(Test, x)..offset_of!(Test, y)
-        );
-        assert_eq!(
-            span_of!(Test, x..=y),
-            offset_of!(Test, x)..offset_of!(Test, y) + mem::size_of::<[u8; 56]>()
-        );
-        assert_eq!(
-            span_of!(Test, x..y[4]),
-            offset_of!(Test, x)..offset_of!(Test, y[4])
-        );
-        assert_eq!(
-            span_of!(Test, x..=y[4]),
-            offset_of!(Test, x)..offset_of!(Test, y) + mem::size_of::<[u8; 5]>()
-        );
-        assert_eq!(
-            span_of!(Test, x..z.foo),
-            offset_of!(Test, x)..offset_of!(Test, z.foo)
-        );
-        assert_eq!(
-            span_of!(Test, x..=z.foo),
-            offset_of!(Test, x)..offset_of!(Test, z.foo) + mem::size_of::<u32>()
-        );
-        assert_eq!(
-            span_of!(Test, egg[0][0]..egg[1][0]),
-            offset_of!(Test, egg[0][0])..offset_of!(Test, egg[1][0])
-        );
-    }
-}
diff -Nru cargo-0.32.0/vendor/nodrop/.cargo-checksum.json cargo-0.33.0/vendor/nodrop/.cargo-checksum.json
--- cargo-0.32.0/vendor/nodrop/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/nodrop/Cargo.toml cargo-0.33.0/vendor/nodrop/Cargo.toml
--- cargo-0.32.0/vendor/nodrop/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "nodrop"
-version = "0.1.13"
-authors = ["bluss"]
-description = "A wrapper type to inhibit drop (destructor). Use std::mem::ManuallyDrop instead!"
-documentation = "https://docs.rs/nodrop/"
-keywords = ["container", "drop", "no_std"]
-categories = ["rust-patterns"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/bluss/arrayvec"
-[package.metadata.release]
-no-dev-version = true
-[dependencies.nodrop-union]
-version = "0.1.8"
-optional = true
-
-[features]
-default = ["std"]
-std = []
-use_needs_drop = []
-use_union = ["nodrop-union"]
diff -Nru cargo-0.32.0/vendor/nodrop/.cargo_vcs_info.json cargo-0.33.0/vendor/nodrop/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/nodrop/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "08c20edbb0c62939904759b9c14095ca0fd07d03"
-  }
-}
diff -Nru cargo-0.32.0/vendor/nodrop/LICENSE-APACHE cargo-0.33.0/vendor/nodrop/LICENSE-APACHE
--- cargo-0.32.0/vendor/nodrop/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/nodrop/LICENSE-MIT cargo-0.33.0/vendor/nodrop/LICENSE-MIT
--- cargo-0.32.0/vendor/nodrop/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) Ulrik Sverdrup "bluss" 2015-2017
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/nodrop/README.rst cargo-0.33.0/vendor/nodrop/README.rst
--- cargo-0.32.0/vendor/nodrop/README.rst	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-
-nodrop
-======
-
-Recent Changes (nodrop)
------------------------
-
-- 0.1.12
-
-  - Remove dependency on crate odds.
-
-- 0.1.11
-
-  - Remove erronous assertion in test (#77)
-
-- 0.1.10
-
-  - Update for stable ``needs_drop`` (Rust 1.21, was nightly only)
-
-- 0.1.9
-
-  - Fix issue in recent nightly where ``repr(u8)`` did not work. Use
-    a better way to get rid of the enum layout optimization.
-
-- 0.1.8
-  
-  - Add crate feature ``use_union`` that uses untagged unions to implement NoDrop.
-    Finally we have an implementation without hacks, without a runtime flag,
-    and without an actual ``Drop`` impl (which was needed to suppress drop).
-    The crate feature requires nightly and is unstable.
-
-- 0.1.7
-
-  - Remove crate feature ``no_drop_flag``, because it doesn't compile on nightly
-    anymore. Drop flags are gone anyway!
-
-- 0.1.6
-
-  - Add feature std, which you can opt out of to use ``no_std``.
-
-- 0.1.5
-
-  - Added crate feature ``use_needs_drop`` which is a nightly-only
-    optimization, which skips overwriting if the inner value does not need
-    drop.
-
-License
-=======
-
-Dual-licensed to be compatible with the Rust project.
-
-Licensed under the Apache License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
-http://opensource.org/licenses/MIT, at your
-option. This file may not be copied, modified, or distributed
-except according to those terms.
-
-
diff -Nru cargo-0.32.0/vendor/nodrop/src/lib.rs cargo-0.33.0/vendor/nodrop/src/lib.rs
--- cargo-0.32.0/vendor/nodrop/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/nodrop/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-//!
-//! The **nodrop** crate has the following cargo feature flags:
-//!
-//! - `std`
-//!   - Optional, enabled by default
-//!   - Use libstd
-//! - `use_needs_drop`
-//!   - Optional
-//!   - Requires Rust 1.21
-//!   - Use `needs_drop` to skip overwriting if not necessary
-//! - `use_union`
-//!   - Optional
-//!   - Requires nightly channel
-//!   - Using untagged union, finally we have an implementation of `NoDrop` without hacks,
-//!     for example the fact that `NoDrop<T>` never has a destructor anymore.
-//!
-
-#![cfg_attr(not(any(test, feature="std")), no_std)]
-#[cfg(not(any(test, feature="std")))]
-extern crate core as std;
-
-#[cfg(feature = "use_union")]
-extern crate nodrop_union as imp;
-
-pub use imp::NoDrop;
-
-
-#[cfg(not(feature = "use_union"))]
-mod imp {
-    use std::ptr;
-    use std::mem;
-    use std::ops::{Deref, DerefMut};
-
-    /// repr(u8) - Make sure the non-nullable pointer optimization does not occur!
-    #[repr(u8)]
-    enum Flag<T> {
-        Alive(T),
-        // Dummy u8 field below, again to beat the enum layout opt
-        Dropped(u8),
-    }
-
-
-    /// A type holding **T** that will not call its destructor on drop
-    pub struct NoDrop<T>(Flag<T>);
-
-    impl<T> NoDrop<T> {
-        /// Create a new **NoDrop**.
-        #[inline]
-        pub fn new(value: T) -> NoDrop<T> {
-            NoDrop(Flag::Alive(value))
-        }
-
-        /// Extract the inner value.
-        ///
-        /// Once extracted, the value can of course drop again.
-        #[inline]
-        pub fn into_inner(mut self) -> T {
-            let inner = unsafe {
-                ptr::read(&mut *self)
-            };
-            // skip Drop, so we don't even have to overwrite
-            mem::forget(self);
-            inner
-        }
-    }
-
-    #[cfg(not(feature = "use_needs_drop"))]
-    #[inline]
-    fn needs_drop<T>() -> bool {
-        true
-    }
-
-    #[cfg(feature = "use_needs_drop")]
-    #[inline]
-    fn needs_drop<T>() -> bool {
-        unsafe {
-            ::std::mem::needs_drop::<T>()
-        }
-    }
-
-    impl<T> Drop for NoDrop<T> {
-        fn drop(&mut self) {
-            if needs_drop::<T>() {
-                // inhibit drop
-                unsafe {
-                    ptr::write(&mut self.0, Flag::Dropped(0));
-                }
-            }
-        }
-    }
-
-    impl<T> Deref for NoDrop<T> {
-        type Target = T;
-
-        // Use type invariant, always Flag::Alive.
-        #[inline]
-        fn deref(&self) -> &T {
-            match self.0 {
-                Flag::Alive(ref inner) => inner,
-                _ => unsafe { debug_assert_unreachable() }
-            }
-        }
-    }
-
-    impl<T> DerefMut for NoDrop<T> {
-        // Use type invariant, always Flag::Alive.
-        #[inline]
-        fn deref_mut(&mut self) -> &mut T {
-            match self.0 {
-                Flag::Alive(ref mut inner) => inner,
-                _ => unsafe { debug_assert_unreachable() }
-            }
-        }
-    }
-
-    #[cfg(test)]
-    #[test]
-    fn test_no_nonnullable_opt() {
-        // Make sure `Flag` does not apply the non-nullable pointer optimization
-        // as Option would do.
-        assert!(mem::size_of::<Flag<&i32>>() > mem::size_of::<&i32>());
-        assert!(mem::size_of::<Flag<Vec<i32>>>() > mem::size_of::<Vec<i32>>());
-    }
-
-    // copying this code saves us microcrate deps
-    #[inline]
-    unsafe fn debug_assert_unreachable() -> ! {
-        debug_assert!(false, "Reached unreachable section: this is a bug!");
-        enum Void { }
-        match *(1 as *const Void) { }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::NoDrop;
-
-    #[test]
-    fn test_drop() {
-        use std::cell::Cell;
-
-        let flag = &Cell::new(0);
-
-        struct Bump<'a>(&'a Cell<i32>);
-
-        impl<'a> Drop for Bump<'a> {
-            fn drop(&mut self) {
-                let n = self.0.get();
-                self.0.set(n + 1);
-            }
-        }
-
-        {
-            let _ = NoDrop::new([Bump(flag), Bump(flag)]);
-        }
-        assert_eq!(flag.get(), 0);
-
-        // test something with the nullable pointer optimization
-        flag.set(0);
-
-        {
-            let mut array = NoDrop::new(Vec::new());
-            array.push(vec![Bump(flag)]);
-            array.push(vec![Bump(flag), Bump(flag)]);
-            array.push(vec![]);
-            array.push(vec![Bump(flag)]);
-            drop(array.pop());
-            assert_eq!(flag.get(), 1);
-            drop(array.pop());
-            assert_eq!(flag.get(), 1);
-            drop(array.pop());
-            assert_eq!(flag.get(), 3);
-        }
-
-        // last one didn't drop.
-        assert_eq!(flag.get(), 3);
-
-        flag.set(0);
-        {
-            let array = NoDrop::new(Bump(flag));
-            array.into_inner();
-            assert_eq!(flag.get(), 1);
-        }
-        assert_eq!(flag.get(), 1);
-    }
-}
diff -Nru cargo-0.32.0/vendor/num_cpus/.appveyor.yml cargo-0.33.0/vendor/num_cpus/.appveyor.yml
--- cargo-0.32.0/vendor/num_cpus/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num_cpus/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  - TARGET: i686-pc-windows-msvc
-  - TARGET: x86_64-pc-windows-gnu
-  - TARGET: i686-pc-windows-gnu
-install:
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host %TARGET%
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -vV
-  - cargo -vV
-build: false
-test_script:
-  - cargo build --verbose
-  - cargo test --verbose
diff -Nru cargo-0.32.0/vendor/num_cpus/.cargo-checksum.json cargo-0.33.0/vendor/num_cpus/.cargo-checksum.json
--- cargo-0.32.0/vendor/num_cpus/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num_cpus/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"}
\ No newline at end of file
+{"files":{},"package":"5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/num_cpus/Cargo.toml cargo-0.33.0/vendor/num_cpus/Cargo.toml
--- cargo-0.32.0/vendor/num_cpus/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num_cpus/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "num_cpus"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 description = "Get the number of CPUs on a machine."
 documentation = "https://docs.rs/num_cpus"
diff -Nru cargo-0.32.0/vendor/num_cpus/CHANGELOG.md cargo-0.33.0/vendor/num_cpus/CHANGELOG.md
--- cargo-0.32.0/vendor/num_cpus/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num_cpus/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,9 @@
+## v1.9.0
+
+#### Features
+
+- add `sgx` target env support
+
 ## v1.8.0
 
 #### Features
diff -Nru cargo-0.32.0/vendor/num_cpus/src/lib.rs cargo-0.33.0/vendor/num_cpus/src/lib.rs
--- cargo-0.32.0/vendor/num_cpus/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num_cpus/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -28,7 +28,7 @@
 //! [`rayon::ThreadPool`]: https://docs.rs/rayon/0.8.2/rayon/struct.ThreadPool.html
 #![cfg_attr(test, deny(warnings))]
 #![deny(missing_docs)]
-#![doc(html_root_url = "https://docs.rs/num_cpus/1.8.0")]
+#![doc(html_root_url = "https://docs.rs/num_cpus/1.9.0")]
 #![allow(non_snake_case)]
 
 #[cfg(not(windows))]
@@ -374,12 +374,13 @@
     }
 }
 
-#[cfg(any(target_os = "emscripten", target_os = "redox", target_os = "haiku"))]
-fn get_num_cpus() -> usize {
-    1
-}
-
-#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
+#[cfg(any(
+    target_os = "emscripten",
+    target_os = "redox",
+    target_os = "haiku",
+    target_arch = "wasm32",
+    target_env = "sgx"
+))]
 fn get_num_cpus() -> usize {
     1
 }
diff -Nru cargo-0.32.0/vendor/num_cpus/.travis.yml cargo-0.33.0/vendor/num_cpus/.travis.yml
--- cargo-0.32.0/vendor/num_cpus/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num_cpus/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-language: rust
-rust: stable
-dist: trusty
-sudo: false
-
-cache: cargo
-
-install:
-  - if [ -z "$NO_ADD" ]; then rustup target add "$TARGET"; fi
-
-script:
-  - cargo build --verbose --target "$TARGET"
-  # Only run the targets if we are on the same OS.
-  - if [ "$RUN" == "1" ]; then cargo test --verbose --target "$TARGET"; fi
-
-env:
-  global:
-    # Travis CI servers make 2 cores available to processes via virtualization.
-    # See https://docs.travis-ci.com/user/reference/overview/
-    - NUM_CPUS_TEST_GET=2
-
-matrix:
-  include:
-    # Linux
-    # 32-bit requires multilib.
-    - env: TARGET=i686-unknown-linux-gnu RUN=1
-      addons:
-        apt:
-          packages:
-            - gcc-multilib
-    # 64-bit stable.
-    - env: TARGET=x86_64-unknown-linux-gnu RUN=1 NO_ADD=1
-      rust: stable
-    # 64-bit beta.
-    - env: TARGET=x86_64-unknown-linux-gnu RUN=1 NO_ADD=1
-      rust: beta
-    # 64-bit nightly.
-    - env: TARGET=x86_64-unknown-linux-gnu RUN=1 NO_ADD=1
-      rust: nightly
-    # Mac OS X
-    - os: osx
-      env: TARGET=i686-apple-darwin RUN=1
-    - os: osx
-      env: TARGET=x86_64-apple-darwin RUN=1 NO_ADD=1
-    # Android
-    # - for x86
-    - env: TARGET=i686-linux-android
-    - env: TARGET=x86_64-linux-android
-    # - for ARM
-    - env: TARGET=arm-linux-androideabi
-    - env: TARGET=aarch64-linux-android
-    # IOS
-    - os: osx
-      osx_image: xcode9
-      env: TARGET=i386-apple-ios
-    - os: osx
-      osx_image: xcode9
-      env: TARGET=x86_64-apple-ios
-    # FreeBSD
-    - env: TARGET=x86_64-unknown-freebsd
-    # Fuchsia
-    - env: TARGET=x86_64-unknown-fuchsia
-    # NetBSD
-    - env: TARGET=x86_64-unknown-netbsd
-    # Emscripten
-    - env: TARGET=asmjs-unknown-emscripten
diff -Nru cargo-0.32.0/vendor/num-integer/benches/roots.rs cargo-0.33.0/vendor/num-integer/benches/roots.rs
--- cargo-0.32.0/vendor/num-integer/benches/roots.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/benches/roots.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,174 @@
+//! Benchmark sqrt and cbrt
+
+#![feature(test)]
+
+extern crate num_integer;
+extern crate num_traits;
+extern crate test;
+
+use num_integer::Integer;
+use num_traits::checked_pow;
+use num_traits::{AsPrimitive, PrimInt, WrappingAdd, WrappingMul};
+use test::{black_box, Bencher};
+
+trait BenchInteger: Integer + PrimInt + WrappingAdd + WrappingMul + 'static {}
+
+impl<T> BenchInteger for T
+where
+    T: Integer + PrimInt + WrappingAdd + WrappingMul + 'static,
+{
+}
+
+fn bench<T, F>(b: &mut Bencher, v: &[T], f: F, n: u32)
+where
+    T: BenchInteger,
+    F: Fn(&T) -> T,
+{
+    // Pre-validate the results...
+    for i in v {
+        let rt = f(i);
+        if *i >= T::zero() {
+            let rt1 = rt + T::one();
+            assert!(rt.pow(n) <= *i);
+            if let Some(x) = checked_pow(rt1, n as usize) {
+                assert!(*i < x);
+            }
+        } else {
+            let rt1 = rt - T::one();
+            assert!(rt < T::zero());
+            assert!(*i <= rt.pow(n));
+            if let Some(x) = checked_pow(rt1, n as usize) {
+                assert!(x < *i);
+            }
+        };
+    }
+
+    // Now just run as fast as we can!
+    b.iter(|| {
+        for i in v {
+            black_box(f(i));
+        }
+    });
+}
+
+// Simple PRNG so we don't have to worry about rand compatibility
+fn lcg<T>(x: T) -> T
+where
+    u32: AsPrimitive<T>,
+    T: BenchInteger,
+{
+    // LCG parameters from Numerical Recipes
+    // (but we're applying it to arbitrary sizes)
+    const LCG_A: u32 = 1664525;
+    const LCG_C: u32 = 1013904223;
+    x.wrapping_mul(&LCG_A.as_()).wrapping_add(&LCG_C.as_())
+}
+
+fn bench_rand<T, F>(b: &mut Bencher, f: F, n: u32)
+where
+    u32: AsPrimitive<T>,
+    T: BenchInteger,
+    F: Fn(&T) -> T,
+{
+    let mut x: T = 3u32.as_();
+    let v: Vec<T> = (0..1000)
+        .map(|_| {
+            x = lcg(x);
+            x
+        })
+        .collect();
+    bench(b, &v, f, n);
+}
+
+fn bench_rand_pos<T, F>(b: &mut Bencher, f: F, n: u32)
+where
+    u32: AsPrimitive<T>,
+    T: BenchInteger,
+    F: Fn(&T) -> T,
+{
+    let mut x: T = 3u32.as_();
+    let v: Vec<T> = (0..1000)
+        .map(|_| {
+            x = lcg(x);
+            while x < T::zero() {
+                x = lcg(x);
+            }
+            x
+        })
+        .collect();
+    bench(b, &v, f, n);
+}
+
+fn bench_small<T, F>(b: &mut Bencher, f: F, n: u32)
+where
+    u32: AsPrimitive<T>,
+    T: BenchInteger,
+    F: Fn(&T) -> T,
+{
+    let v: Vec<T> = (0..1000).map(|i| i.as_()).collect();
+    bench(b, &v, f, n);
+}
+
+fn bench_small_pos<T, F>(b: &mut Bencher, f: F, n: u32)
+where
+    u32: AsPrimitive<T>,
+    T: BenchInteger,
+    F: Fn(&T) -> T,
+{
+    let v: Vec<T> = (0..1000)
+        .map(|i| i.as_().mod_floor(&T::max_value()))
+        .collect();
+    bench(b, &v, f, n);
+}
+
+macro_rules! bench_roots {
+    ($($T:ident),*) => {$(
+        mod $T {
+            use test::Bencher;
+            use num_integer::Roots;
+
+            #[bench]
+            fn sqrt_rand(b: &mut Bencher) {
+                ::bench_rand_pos(b, $T::sqrt, 2);
+            }
+
+            #[bench]
+            fn sqrt_small(b: &mut Bencher) {
+                ::bench_small_pos(b, $T::sqrt, 2);
+            }
+
+            #[bench]
+            fn cbrt_rand(b: &mut Bencher) {
+                ::bench_rand(b, $T::cbrt, 3);
+            }
+
+            #[bench]
+            fn cbrt_small(b: &mut Bencher) {
+                ::bench_small(b, $T::cbrt, 3);
+            }
+
+            #[bench]
+            fn fourth_root_rand(b: &mut Bencher) {
+                ::bench_rand_pos(b, |x: &$T| x.nth_root(4), 4);
+            }
+
+            #[bench]
+            fn fourth_root_small(b: &mut Bencher) {
+                ::bench_small_pos(b, |x: &$T| x.nth_root(4), 4);
+            }
+
+            #[bench]
+            fn fifth_root_rand(b: &mut Bencher) {
+                ::bench_rand(b, |x: &$T| x.nth_root(5), 5);
+            }
+
+            #[bench]
+            fn fifth_root_small(b: &mut Bencher) {
+                ::bench_small(b, |x: &$T| x.nth_root(5), 5);
+            }
+        }
+    )*}
+}
+
+bench_roots!(i8, i16, i32, i64, i128);
+bench_roots!(u8, u16, u32, u64, u128);
diff -Nru cargo-0.32.0/vendor/num-integer/bors.toml cargo-0.33.0/vendor/num-integer/bors.toml
--- cargo-0.32.0/vendor/num-integer/bors.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/bors.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,3 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]
diff -Nru cargo-0.32.0/vendor/num-integer/build.rs cargo-0.33.0/vendor/num-integer/build.rs
--- cargo-0.32.0/vendor/num-integer/build.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,35 @@
+use std::env;
+use std::io::Write;
+use std::process::{Command, Stdio};
+
+fn main() {
+    if probe("fn main() { 0i128; }") {
+        println!("cargo:rustc-cfg=has_i128");
+    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
+        panic!("i128 support was not detected!");
+    }
+}
+
+/// Test if a code snippet can be compiled
+fn probe(code: &str) -> bool {
+    let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
+    let out_dir = env::var_os("OUT_DIR").expect("environment variable OUT_DIR");
+
+    let mut child = Command::new(rustc)
+        .arg("--out-dir")
+        .arg(out_dir)
+        .arg("--emit=obj")
+        .arg("-")
+        .stdin(Stdio::piped())
+        .spawn()
+        .expect("rustc probe");
+
+    child
+        .stdin
+        .as_mut()
+        .expect("rustc stdin")
+        .write_all(code.as_bytes())
+        .expect("write rustc stdin");
+
+    child.wait().expect("rustc probe").success()
+}
diff -Nru cargo-0.32.0/vendor/num-integer/.cargo-checksum.json cargo-0.33.0/vendor/num-integer/.cargo-checksum.json
--- cargo-0.32.0/vendor/num-integer/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/num-integer/Cargo.toml cargo-0.33.0/vendor/num-integer/Cargo.toml
--- cargo-0.32.0/vendor/num-integer/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,35 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "num-integer"
+version = "0.1.39"
+authors = ["The Rust Project Developers"]
+build = "build.rs"
+description = "Integer traits and functions"
+homepage = "https://github.com/rust-num/num-integer"
+documentation = "https://docs.rs/num-integer"
+readme = "README.md"
+keywords = ["mathematics", "numerics"]
+categories = ["algorithms", "science", "no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-num/num-integer"
+[package.metadata.docs.rs]
+features = ["std"]
+[dependencies.num-traits]
+version = "0.2.4"
+default-features = false
+
+[features]
+default = ["std"]
+i128 = ["num-traits/i128"]
+std = ["num-traits/std"]
diff -Nru cargo-0.32.0/vendor/num-integer/ci/rustup.sh cargo-0.33.0/vendor/num-integer/ci/rustup.sh
--- cargo-0.32.0/vendor/num-integer/ci/rustup.sh	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/ci/rustup.sh	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Use rustup to locally run the same suite of tests as .travis.yml.
+# (You should first install/update 1.8.0, stable, beta, and nightly.)
+
+set -ex
+
+export TRAVIS_RUST_VERSION
+for TRAVIS_RUST_VERSION in 1.8.0 1.15.0 1.20.0 stable beta nightly; do
+    run="rustup run $TRAVIS_RUST_VERSION"
+    $run cargo build --verbose
+    $run $PWD/ci/test_full.sh
+done
diff -Nru cargo-0.32.0/vendor/num-integer/ci/test_full.sh cargo-0.33.0/vendor/num-integer/ci/test_full.sh
--- cargo-0.32.0/vendor/num-integer/ci/test_full.sh	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/ci/test_full.sh	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -ex
+
+echo Testing num-integer on rustc ${TRAVIS_RUST_VERSION}
+
+# num-integer should build and test everywhere.
+cargo build --verbose
+cargo test --verbose
+
+# test `no_std`
+cargo build --verbose --no-default-features
+cargo test --verbose --no-default-features
+
+# test `i128`
+if [[ "$TRAVIS_RUST_VERSION" =~ ^(nightly|beta|stable)$ ]]; then
+    cargo build --verbose --features=i128
+    cargo test --verbose --features=i128
+fi
+
+if [[ "$TRAVIS_RUST_VERSION" == "nightly" ]]; then
+    cargo test --verbose --all-features --benches
+fi
diff -Nru cargo-0.32.0/vendor/num-integer/LICENSE-APACHE cargo-0.33.0/vendor/num-integer/LICENSE-APACHE
--- cargo-0.32.0/vendor/num-integer/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
diff -Nru cargo-0.32.0/vendor/num-integer/LICENSE-MIT cargo-0.33.0/vendor/num-integer/LICENSE-MIT
--- cargo-0.32.0/vendor/num-integer/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/num-integer/README.md cargo-0.33.0/vendor/num-integer/README.md
--- cargo-0.32.0/vendor/num-integer/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,50 @@
+# num-integer
+
+[![crate](https://img.shields.io/crates/v/num-integer.svg)](https://crates.io/crates/num-integer)
+[![documentation](https://docs.rs/num-integer/badge.svg)](https://docs.rs/num-integer)
+![minimum rustc 1.8](https://img.shields.io/badge/rustc-1.8+-red.svg)
+[![Travis status](https://travis-ci.org/rust-num/num-integer.svg?branch=master)](https://travis-ci.org/rust-num/num-integer)
+
+`Integer` trait and functions for Rust.
+
+## Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+num-integer = "0.1"
+```
+
+and this to your crate root:
+
+```rust
+extern crate num_integer;
+```
+
+## Features
+
+This crate can be used without the standard library (`#![no_std]`) by disabling
+the default `std` feature.  Use this in `Cargo.toml`:
+
+```toml
+[dependencies.num-integer]
+version = "0.1.36"
+default-features = false
+```
+
+There is no functional difference with and without `std` at this time, but
+there may be in the future.
+
+Implementations for `i128` and `u128` are only available with Rust 1.26 and
+later.  The build script automatically detects this, but you can make it
+mandatory by enabling the `i128` crate feature.
+
+
+## Releases
+
+Release notes are available in [RELEASES.md](RELEASES.md).
+
+## Compatibility
+
+The `num-integer` crate is tested for rustc 1.8 and greater.
diff -Nru cargo-0.32.0/vendor/num-integer/RELEASES.md cargo-0.33.0/vendor/num-integer/RELEASES.md
--- cargo-0.32.0/vendor/num-integer/RELEASES.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/RELEASES.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,49 @@
+# Release 0.1.39
+
+- [The new `Roots` trait provides `sqrt`, `cbrt`, and `nth_root` methods][9],
+  calculating an `Integer`'s principal roots rounded toward zero.
+
+**Contributors**: @cuviper
+
+[9]: https://github.com/rust-num/num-integer/pull/9
+
+# Release 0.1.38
+
+- [Support for 128-bit integers is now automatically detected and enabled.][8]
+  Setting the `i128` crate feature now causes the build script to panic if such
+  support is not detected.
+
+**Contributors**: @cuviper
+
+[8]: https://github.com/rust-num/num-integer/pull/8
+
+# Release 0.1.37
+
+- [`Integer` is now implemented for `i128` and `u128`][7] starting with Rust
+  1.26, enabled by the new `i128` crate feature.
+
+**Contributors**: @cuviper
+
+[7]: https://github.com/rust-num/num-integer/pull/7
+
+# Release 0.1.36
+
+- [num-integer now has its own source repository][num-356] at [rust-num/num-integer][home].
+- [Corrected the argument order documented in `Integer::is_multiple_of`][1]
+- [There is now a `std` feature][5], enabled by default, along with the implication
+  that building *without* this feature makes this a `#[no_std]` crate.
+  - There is no difference in the API at this time.
+
+**Contributors**: @cuviper, @jaystrictor
+
+[home]: https://github.com/rust-num/num-integer
+[num-356]: https://github.com/rust-num/num/pull/356
+[1]: https://github.com/rust-num/num-integer/pull/1
+[5]: https://github.com/rust-num/num-integer/pull/5
+
+
+# Prior releases
+
+No prior release notes were kept.  Thanks all the same to the many
+contributors that have made this crate what it is!
+
diff -Nru cargo-0.32.0/vendor/num-integer/src/lib.rs cargo-0.33.0/vendor/num-integer/src/lib.rs
--- cargo-0.32.0/vendor/num-integer/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1005 @@
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Integer trait and functions.
+//!
+//! ## Compatibility
+//!
+//! The `num-integer` crate is tested for rustc 1.8 and greater.
+
+#![doc(html_root_url = "https://docs.rs/num-integer/0.1")]
+
+#![no_std]
+#[cfg(feature = "std")]
+extern crate std;
+
+extern crate num_traits as traits;
+
+use core::ops::Add;
+use core::mem;
+
+use traits::{Num, Signed};
+
+mod roots;
+pub use roots::Roots;
+pub use roots::{sqrt, cbrt, nth_root};
+
+pub trait Integer: Sized + Num + PartialOrd + Ord + Eq {
+    /// Floored integer division.
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert!(( 8).div_floor(& 3) ==  2);
+    /// assert!(( 8).div_floor(&-3) == -3);
+    /// assert!((-8).div_floor(& 3) == -3);
+    /// assert!((-8).div_floor(&-3) ==  2);
+    ///
+    /// assert!(( 1).div_floor(& 2) ==  0);
+    /// assert!(( 1).div_floor(&-2) == -1);
+    /// assert!((-1).div_floor(& 2) == -1);
+    /// assert!((-1).div_floor(&-2) ==  0);
+    /// ~~~
+    fn div_floor(&self, other: &Self) -> Self;
+
+    /// Floored integer modulo, satisfying:
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// # let n = 1; let d = 1;
+    /// assert!(n.div_floor(&d) * d + n.mod_floor(&d) == n)
+    /// ~~~
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert!(( 8).mod_floor(& 3) ==  2);
+    /// assert!(( 8).mod_floor(&-3) == -1);
+    /// assert!((-8).mod_floor(& 3) ==  1);
+    /// assert!((-8).mod_floor(&-3) == -2);
+    ///
+    /// assert!(( 1).mod_floor(& 2) ==  1);
+    /// assert!(( 1).mod_floor(&-2) == -1);
+    /// assert!((-1).mod_floor(& 2) ==  1);
+    /// assert!((-1).mod_floor(&-2) == -1);
+    /// ~~~
+    fn mod_floor(&self, other: &Self) -> Self;
+
+    /// Greatest Common Divisor (GCD).
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(6.gcd(&8), 2);
+    /// assert_eq!(7.gcd(&3), 1);
+    /// ~~~
+    fn gcd(&self, other: &Self) -> Self;
+
+    /// Lowest Common Multiple (LCM).
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(7.lcm(&3), 21);
+    /// assert_eq!(2.lcm(&4), 4);
+    /// ~~~
+    fn lcm(&self, other: &Self) -> Self;
+
+    /// Deprecated, use `is_multiple_of` instead.
+    fn divides(&self, other: &Self) -> bool;
+
+    /// Returns `true` if `self` is a multiple of `other`.
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(9.is_multiple_of(&3), true);
+    /// assert_eq!(3.is_multiple_of(&9), false);
+    /// ~~~
+    fn is_multiple_of(&self, other: &Self) -> bool;
+
+    /// Returns `true` if the number is even.
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(3.is_even(), false);
+    /// assert_eq!(4.is_even(), true);
+    /// ~~~
+    fn is_even(&self) -> bool;
+
+    /// Returns `true` if the number is odd.
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(3.is_odd(), true);
+    /// assert_eq!(4.is_odd(), false);
+    /// ~~~
+    fn is_odd(&self) -> bool;
+
+    /// Simultaneous truncated integer division and modulus.
+    /// Returns `(quotient, remainder)`.
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(( 8).div_rem( &3), ( 2,  2));
+    /// assert_eq!(( 8).div_rem(&-3), (-2,  2));
+    /// assert_eq!((-8).div_rem( &3), (-2, -2));
+    /// assert_eq!((-8).div_rem(&-3), ( 2, -2));
+    ///
+    /// assert_eq!(( 1).div_rem( &2), ( 0,  1));
+    /// assert_eq!(( 1).div_rem(&-2), ( 0,  1));
+    /// assert_eq!((-1).div_rem( &2), ( 0, -1));
+    /// assert_eq!((-1).div_rem(&-2), ( 0, -1));
+    /// ~~~
+    #[inline]
+    fn div_rem(&self, other: &Self) -> (Self, Self);
+
+    /// Simultaneous floored integer division and modulus.
+    /// Returns `(quotient, remainder)`.
+    ///
+    /// # Examples
+    ///
+    /// ~~~
+    /// # use num_integer::Integer;
+    /// assert_eq!(( 8).div_mod_floor( &3), ( 2,  2));
+    /// assert_eq!(( 8).div_mod_floor(&-3), (-3, -1));
+    /// assert_eq!((-8).div_mod_floor( &3), (-3,  1));
+    /// assert_eq!((-8).div_mod_floor(&-3), ( 2, -2));
+    ///
+    /// assert_eq!(( 1).div_mod_floor( &2), ( 0,  1));
+    /// assert_eq!(( 1).div_mod_floor(&-2), (-1, -1));
+    /// assert_eq!((-1).div_mod_floor( &2), (-1,  1));
+    /// assert_eq!((-1).div_mod_floor(&-2), ( 0, -1));
+    /// ~~~
+    fn div_mod_floor(&self, other: &Self) -> (Self, Self) {
+        (self.div_floor(other), self.mod_floor(other))
+    }
+}
+
+/// Simultaneous integer division and modulus
+#[inline]
+pub fn div_rem<T: Integer>(x: T, y: T) -> (T, T) {
+    x.div_rem(&y)
+}
+/// Floored integer division
+#[inline]
+pub fn div_floor<T: Integer>(x: T, y: T) -> T {
+    x.div_floor(&y)
+}
+/// Floored integer modulus
+#[inline]
+pub fn mod_floor<T: Integer>(x: T, y: T) -> T {
+    x.mod_floor(&y)
+}
+/// Simultaneous floored integer division and modulus
+#[inline]
+pub fn div_mod_floor<T: Integer>(x: T, y: T) -> (T, T) {
+    x.div_mod_floor(&y)
+}
+
+/// Calculates the Greatest Common Divisor (GCD) of the number and `other`. The
+/// result is always positive.
+#[inline(always)]
+pub fn gcd<T: Integer>(x: T, y: T) -> T {
+    x.gcd(&y)
+}
+/// Calculates the Lowest Common Multiple (LCM) of the number and `other`.
+#[inline(always)]
+pub fn lcm<T: Integer>(x: T, y: T) -> T {
+    x.lcm(&y)
+}
+
+macro_rules! impl_integer_for_isize {
+    ($T:ty, $test_mod:ident) => (
+        impl Integer for $T {
+            /// Floored integer division
+            #[inline]
+            fn div_floor(&self, other: &Self) -> Self {
+                // Algorithm from [Daan Leijen. _Division and Modulus for Computer Scientists_,
+                // December 2001](http://research.microsoft.com/pubs/151917/divmodnote-letter.pdf)
+                match self.div_rem(other) {
+                    (d, r) if (r > 0 && *other < 0)
+                           || (r < 0 && *other > 0) => d - 1,
+                    (d, _)                          => d,
+                }
+            }
+
+            /// Floored integer modulo
+            #[inline]
+            fn mod_floor(&self, other: &Self) -> Self {
+                // Algorithm from [Daan Leijen. _Division and Modulus for Computer Scientists_,
+                // December 2001](http://research.microsoft.com/pubs/151917/divmodnote-letter.pdf)
+                match *self % *other {
+                    r if (r > 0 && *other < 0)
+                      || (r < 0 && *other > 0) => r + *other,
+                    r                          => r,
+                }
+            }
+
+            /// Calculates `div_floor` and `mod_floor` simultaneously
+            #[inline]
+            fn div_mod_floor(&self, other: &Self) -> (Self, Self) {
+                // Algorithm from [Daan Leijen. _Division and Modulus for Computer Scientists_,
+                // December 2001](http://research.microsoft.com/pubs/151917/divmodnote-letter.pdf)
+                match self.div_rem(other) {
+                    (d, r) if (r > 0 && *other < 0)
+                           || (r < 0 && *other > 0) => (d - 1, r + *other),
+                    (d, r)                          => (d, r),
+                }
+            }
+
+            /// Calculates the Greatest Common Divisor (GCD) of the number and
+            /// `other`. The result is always positive.
+            #[inline]
+            fn gcd(&self, other: &Self) -> Self {
+                // Use Stein's algorithm
+                let mut m = *self;
+                let mut n = *other;
+                if m == 0 || n == 0 { return (m | n).abs() }
+
+                // find common factors of 2
+                let shift = (m | n).trailing_zeros();
+
+                // The algorithm needs positive numbers, but the minimum value
+                // can't be represented as a positive one.
+                // It's also a power of two, so the gcd can be
+                // calculated by bitshifting in that case
+
+                // Assuming two's complement, the number created by the shift
+                // is positive for all numbers except gcd = abs(min value)
+                // The call to .abs() causes a panic in debug mode
+                if m == Self::min_value() || n == Self::min_value() {
+                    return (1 << shift).abs()
+                }
+
+                // guaranteed to be positive now, rest like unsigned algorithm
+                m = m.abs();
+                n = n.abs();
+
+                // divide n and m by 2 until odd
+                // m inside loop
+                n >>= n.trailing_zeros();
+
+                while m != 0 {
+                    m >>= m.trailing_zeros();
+                    if n > m { mem::swap(&mut n, &mut m) }
+                    m -= n;
+                }
+
+                n << shift
+            }
+
+            /// Calculates the Lowest Common Multiple (LCM) of the number and
+            /// `other`.
+            #[inline]
+            fn lcm(&self, other: &Self) -> Self {
+                // should not have to recalculate abs
+                (*self * (*other / self.gcd(other))).abs()
+            }
+
+            /// Deprecated, use `is_multiple_of` instead.
+            #[inline]
+            fn divides(&self, other: &Self) -> bool {
+                self.is_multiple_of(other)
+            }
+
+            /// Returns `true` if the number is a multiple of `other`.
+            #[inline]
+            fn is_multiple_of(&self, other: &Self) -> bool {
+                *self % *other == 0
+            }
+
+            /// Returns `true` if the number is divisible by `2`
+            #[inline]
+            fn is_even(&self) -> bool { (*self) & 1 == 0 }
+
+            /// Returns `true` if the number is not divisible by `2`
+            #[inline]
+            fn is_odd(&self) -> bool { !self.is_even() }
+
+            /// Simultaneous truncated integer division and modulus.
+            #[inline]
+            fn div_rem(&self, other: &Self) -> (Self, Self) {
+                (*self / *other, *self % *other)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test_mod {
+            use Integer;
+            use core::mem;
+
+            /// Checks that the division rule holds for:
+            ///
+            /// - `n`: numerator (dividend)
+            /// - `d`: denominator (divisor)
+            /// - `qr`: quotient and remainder
+            #[cfg(test)]
+            fn test_division_rule((n,d): ($T, $T), (q,r): ($T, $T)) {
+                assert_eq!(d * q + r, n);
+            }
+
+            #[test]
+            fn test_div_rem() {
+                fn test_nd_dr(nd: ($T,$T), qr: ($T,$T)) {
+                    let (n,d) = nd;
+                    let separate_div_rem = (n / d, n % d);
+                    let combined_div_rem = n.div_rem(&d);
+
+                    assert_eq!(separate_div_rem, qr);
+                    assert_eq!(combined_div_rem, qr);
+
+                    test_division_rule(nd, separate_div_rem);
+                    test_division_rule(nd, combined_div_rem);
+                }
+
+                test_nd_dr(( 8,  3), ( 2,  2));
+                test_nd_dr(( 8, -3), (-2,  2));
+                test_nd_dr((-8,  3), (-2, -2));
+                test_nd_dr((-8, -3), ( 2, -2));
+
+                test_nd_dr(( 1,  2), ( 0,  1));
+                test_nd_dr(( 1, -2), ( 0,  1));
+                test_nd_dr((-1,  2), ( 0, -1));
+                test_nd_dr((-1, -2), ( 0, -1));
+            }
+
+            #[test]
+            fn test_div_mod_floor() {
+                fn test_nd_dm(nd: ($T,$T), dm: ($T,$T)) {
+                    let (n,d) = nd;
+                    let separate_div_mod_floor = (n.div_floor(&d), n.mod_floor(&d));
+                    let combined_div_mod_floor = n.div_mod_floor(&d);
+
+                    assert_eq!(separate_div_mod_floor, dm);
+                    assert_eq!(combined_div_mod_floor, dm);
+
+                    test_division_rule(nd, separate_div_mod_floor);
+                    test_division_rule(nd, combined_div_mod_floor);
+                }
+
+                test_nd_dm(( 8,  3), ( 2,  2));
+                test_nd_dm(( 8, -3), (-3, -1));
+                test_nd_dm((-8,  3), (-3,  1));
+                test_nd_dm((-8, -3), ( 2, -2));
+
+                test_nd_dm(( 1,  2), ( 0,  1));
+                test_nd_dm(( 1, -2), (-1, -1));
+                test_nd_dm((-1,  2), (-1,  1));
+                test_nd_dm((-1, -2), ( 0, -1));
+            }
+
+            #[test]
+            fn test_gcd() {
+                assert_eq!((10 as $T).gcd(&2), 2 as $T);
+                assert_eq!((10 as $T).gcd(&3), 1 as $T);
+                assert_eq!((0 as $T).gcd(&3), 3 as $T);
+                assert_eq!((3 as $T).gcd(&3), 3 as $T);
+                assert_eq!((56 as $T).gcd(&42), 14 as $T);
+                assert_eq!((3 as $T).gcd(&-3), 3 as $T);
+                assert_eq!((-6 as $T).gcd(&3), 3 as $T);
+                assert_eq!((-4 as $T).gcd(&-2), 2 as $T);
+            }
+
+            #[test]
+            fn test_gcd_cmp_with_euclidean() {
+                fn euclidean_gcd(mut m: $T, mut n: $T) -> $T {
+                    while m != 0 {
+                        mem::swap(&mut m, &mut n);
+                        m %= n;
+                    }
+
+                    n.abs()
+                }
+
+                // gcd(-128, b) = 128 is not representable as positive value
+                // for i8
+                for i in -127..127 {
+                    for j in -127..127 {
+                        assert_eq!(euclidean_gcd(i,j), i.gcd(&j));
+                    }
+                }
+
+                // last value
+                // FIXME: Use inclusive ranges for above loop when implemented
+                let i = 127;
+                for j in -127..127 {
+                    assert_eq!(euclidean_gcd(i,j), i.gcd(&j));
+                }
+                assert_eq!(127.gcd(&127), 127);
+            }
+
+            #[test]
+            fn test_gcd_min_val() {
+                let min = <$T>::min_value();
+                let max = <$T>::max_value();
+                let max_pow2 = max / 2 + 1;
+                assert_eq!(min.gcd(&max), 1 as $T);
+                assert_eq!(max.gcd(&min), 1 as $T);
+                assert_eq!(min.gcd(&max_pow2), max_pow2);
+                assert_eq!(max_pow2.gcd(&min), max_pow2);
+                assert_eq!(min.gcd(&42), 2 as $T);
+                assert_eq!((42 as $T).gcd(&min), 2 as $T);
+            }
+
+            #[test]
+            #[should_panic]
+            fn test_gcd_min_val_min_val() {
+                let min = <$T>::min_value();
+                assert!(min.gcd(&min) >= 0);
+            }
+
+            #[test]
+            #[should_panic]
+            fn test_gcd_min_val_0() {
+                let min = <$T>::min_value();
+                assert!(min.gcd(&0) >= 0);
+            }
+
+            #[test]
+            #[should_panic]
+            fn test_gcd_0_min_val() {
+                let min = <$T>::min_value();
+                assert!((0 as $T).gcd(&min) >= 0);
+            }
+
+            #[test]
+            fn test_lcm() {
+                assert_eq!((1 as $T).lcm(&0), 0 as $T);
+                assert_eq!((0 as $T).lcm(&1), 0 as $T);
+                assert_eq!((1 as $T).lcm(&1), 1 as $T);
+                assert_eq!((-1 as $T).lcm(&1), 1 as $T);
+                assert_eq!((1 as $T).lcm(&-1), 1 as $T);
+                assert_eq!((-1 as $T).lcm(&-1), 1 as $T);
+                assert_eq!((8 as $T).lcm(&9), 72 as $T);
+                assert_eq!((11 as $T).lcm(&5), 55 as $T);
+            }
+
+            #[test]
+            fn test_even() {
+                assert_eq!((-4 as $T).is_even(), true);
+                assert_eq!((-3 as $T).is_even(), false);
+                assert_eq!((-2 as $T).is_even(), true);
+                assert_eq!((-1 as $T).is_even(), false);
+                assert_eq!((0 as $T).is_even(), true);
+                assert_eq!((1 as $T).is_even(), false);
+                assert_eq!((2 as $T).is_even(), true);
+                assert_eq!((3 as $T).is_even(), false);
+                assert_eq!((4 as $T).is_even(), true);
+            }
+
+            #[test]
+            fn test_odd() {
+                assert_eq!((-4 as $T).is_odd(), false);
+                assert_eq!((-3 as $T).is_odd(), true);
+                assert_eq!((-2 as $T).is_odd(), false);
+                assert_eq!((-1 as $T).is_odd(), true);
+                assert_eq!((0 as $T).is_odd(), false);
+                assert_eq!((1 as $T).is_odd(), true);
+                assert_eq!((2 as $T).is_odd(), false);
+                assert_eq!((3 as $T).is_odd(), true);
+                assert_eq!((4 as $T).is_odd(), false);
+            }
+        }
+    )
+}
+
+impl_integer_for_isize!(i8, test_integer_i8);
+impl_integer_for_isize!(i16, test_integer_i16);
+impl_integer_for_isize!(i32, test_integer_i32);
+impl_integer_for_isize!(i64, test_integer_i64);
+impl_integer_for_isize!(isize, test_integer_isize);
+#[cfg(has_i128)]
+impl_integer_for_isize!(i128, test_integer_i128);
+
+macro_rules! impl_integer_for_usize {
+    ($T:ty, $test_mod:ident) => (
+        impl Integer for $T {
+            /// Unsigned integer division. Returns the same result as `div` (`/`).
+            #[inline]
+            fn div_floor(&self, other: &Self) -> Self {
+                *self / *other
+            }
+
+            /// Unsigned integer modulo operation. Returns the same result as `rem` (`%`).
+            #[inline]
+            fn mod_floor(&self, other: &Self) -> Self {
+                *self % *other
+            }
+
+            /// Calculates the Greatest Common Divisor (GCD) of the number and `other`
+            #[inline]
+            fn gcd(&self, other: &Self) -> Self {
+                // Use Stein's algorithm
+                let mut m = *self;
+                let mut n = *other;
+                if m == 0 || n == 0 { return m | n }
+
+                // find common factors of 2
+                let shift = (m | n).trailing_zeros();
+
+                // divide n and m by 2 until odd
+                // m inside loop
+                n >>= n.trailing_zeros();
+
+                while m != 0 {
+                    m >>= m.trailing_zeros();
+                    if n > m { mem::swap(&mut n, &mut m) }
+                    m -= n;
+                }
+
+                n << shift
+            }
+
+            /// Calculates the Lowest Common Multiple (LCM) of the number and `other`.
+            #[inline]
+            fn lcm(&self, other: &Self) -> Self {
+                *self * (*other / self.gcd(other))
+            }
+
+            /// Deprecated, use `is_multiple_of` instead.
+            #[inline]
+            fn divides(&self, other: &Self) -> bool {
+                self.is_multiple_of(other)
+            }
+
+            /// Returns `true` if the number is a multiple of `other`.
+            #[inline]
+            fn is_multiple_of(&self, other: &Self) -> bool {
+                *self % *other == 0
+            }
+
+            /// Returns `true` if the number is divisible by `2`.
+            #[inline]
+            fn is_even(&self) -> bool {
+                *self % 2 == 0
+            }
+
+            /// Returns `true` if the number is not divisible by `2`.
+            #[inline]
+            fn is_odd(&self) -> bool {
+                !self.is_even()
+            }
+
+            /// Simultaneous truncated integer division and modulus.
+            #[inline]
+            fn div_rem(&self, other: &Self) -> (Self, Self) {
+                (*self / *other, *self % *other)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test_mod {
+            use Integer;
+            use core::mem;
+
+            #[test]
+            fn test_div_mod_floor() {
+                assert_eq!((10 as $T).div_floor(&(3 as $T)), 3 as $T);
+                assert_eq!((10 as $T).mod_floor(&(3 as $T)), 1 as $T);
+                assert_eq!((10 as $T).div_mod_floor(&(3 as $T)), (3 as $T, 1 as $T));
+                assert_eq!((5 as $T).div_floor(&(5 as $T)), 1 as $T);
+                assert_eq!((5 as $T).mod_floor(&(5 as $T)), 0 as $T);
+                assert_eq!((5 as $T).div_mod_floor(&(5 as $T)), (1 as $T, 0 as $T));
+                assert_eq!((3 as $T).div_floor(&(7 as $T)), 0 as $T);
+                assert_eq!((3 as $T).mod_floor(&(7 as $T)), 3 as $T);
+                assert_eq!((3 as $T).div_mod_floor(&(7 as $T)), (0 as $T, 3 as $T));
+            }
+
+            #[test]
+            fn test_gcd() {
+                assert_eq!((10 as $T).gcd(&2), 2 as $T);
+                assert_eq!((10 as $T).gcd(&3), 1 as $T);
+                assert_eq!((0 as $T).gcd(&3), 3 as $T);
+                assert_eq!((3 as $T).gcd(&3), 3 as $T);
+                assert_eq!((56 as $T).gcd(&42), 14 as $T);
+            }
+
+            #[test]
+            fn test_gcd_cmp_with_euclidean() {
+                fn euclidean_gcd(mut m: $T, mut n: $T) -> $T {
+                    while m != 0 {
+                        mem::swap(&mut m, &mut n);
+                        m %= n;
+                    }
+                    n
+                }
+
+                for i in 0..255 {
+                    for j in 0..255 {
+                        assert_eq!(euclidean_gcd(i,j), i.gcd(&j));
+                    }
+                }
+
+                // last value
+                // FIXME: Use inclusive ranges for above loop when implemented
+                let i = 255;
+                for j in 0..255 {
+                    assert_eq!(euclidean_gcd(i,j), i.gcd(&j));
+                }
+                assert_eq!(255.gcd(&255), 255);
+            }
+
+            #[test]
+            fn test_lcm() {
+                assert_eq!((1 as $T).lcm(&0), 0 as $T);
+                assert_eq!((0 as $T).lcm(&1), 0 as $T);
+                assert_eq!((1 as $T).lcm(&1), 1 as $T);
+                assert_eq!((8 as $T).lcm(&9), 72 as $T);
+                assert_eq!((11 as $T).lcm(&5), 55 as $T);
+                assert_eq!((15 as $T).lcm(&17), 255 as $T);
+            }
+
+            #[test]
+            fn test_is_multiple_of() {
+                assert!((6 as $T).is_multiple_of(&(6 as $T)));
+                assert!((6 as $T).is_multiple_of(&(3 as $T)));
+                assert!((6 as $T).is_multiple_of(&(1 as $T)));
+            }
+
+            #[test]
+            fn test_even() {
+                assert_eq!((0 as $T).is_even(), true);
+                assert_eq!((1 as $T).is_even(), false);
+                assert_eq!((2 as $T).is_even(), true);
+                assert_eq!((3 as $T).is_even(), false);
+                assert_eq!((4 as $T).is_even(), true);
+            }
+
+            #[test]
+            fn test_odd() {
+                assert_eq!((0 as $T).is_odd(), false);
+                assert_eq!((1 as $T).is_odd(), true);
+                assert_eq!((2 as $T).is_odd(), false);
+                assert_eq!((3 as $T).is_odd(), true);
+                assert_eq!((4 as $T).is_odd(), false);
+            }
+        }
+    )
+}
+
+impl_integer_for_usize!(u8, test_integer_u8);
+impl_integer_for_usize!(u16, test_integer_u16);
+impl_integer_for_usize!(u32, test_integer_u32);
+impl_integer_for_usize!(u64, test_integer_u64);
+impl_integer_for_usize!(usize, test_integer_usize);
+#[cfg(has_i128)]
+impl_integer_for_usize!(u128, test_integer_u128);
+
+/// An iterator over binomial coefficients.
+pub struct IterBinomial<T> {
+    a: T,
+    n: T,
+    k: T,
+}
+
+impl<T> IterBinomial<T>
+    where T: Integer,
+{
+    /// For a given n, iterate over all binomial coefficients binomial(n, k), for k=0...n.
+    ///
+    /// Note that this might overflow, depending on `T`. For the primitive
+    /// integer types, the following n are the largest ones for which there will
+    /// be no overflow:
+    ///
+    /// type | n
+    /// -----|---
+    /// u8   | 10
+    /// i8   |  9
+    /// u16  | 18
+    /// i16  | 17
+    /// u32  | 34
+    /// i32  | 33
+    /// u64  | 67
+    /// i64  | 66
+    ///
+    /// For larger n, `T` should be a bigint type.
+    pub fn new(n: T) -> IterBinomial<T> {
+        IterBinomial {
+            k: T::zero(), a: T::one(), n: n
+        }
+    }
+}
+
+impl<T> Iterator for IterBinomial<T>
+    where T: Integer + Clone
+{
+    type Item = T;
+
+    fn next(&mut self) -> Option<T> {
+        if self.k > self.n {
+            return None;
+        }
+        self.a = if !self.k.is_zero() {
+            multiply_and_divide(
+                self.a.clone(),
+                self.n.clone() - self.k.clone() + T::one(),
+                self.k.clone()
+            )
+        } else {
+            T::one()
+        };
+        self.k = self.k.clone() + T::one();
+        Some(self.a.clone())
+    }
+}
+
+/// Calculate r * a / b, avoiding overflows and fractions.
+///
+/// Assumes that b divides r * a evenly.
+fn multiply_and_divide<T: Integer + Clone>(r: T, a: T, b: T) -> T {
+    // See http://blog.plover.com/math/choose-2.html for the idea.
+    let g = gcd(r.clone(), b.clone());
+    r/g.clone() * (a / (b/g))
+}
+
+/// Calculate the binomial coefficient.
+///
+/// Note that this might overflow, depending on `T`. For the primitive integer
+/// types, the following n are the largest ones possible such that there will
+/// be no overflow for any k:
+///
+/// type | n
+/// -----|---
+/// u8   | 10
+/// i8   |  9
+/// u16  | 18
+/// i16  | 17
+/// u32  | 34
+/// i32  | 33
+/// u64  | 67
+/// i64  | 66
+///
+/// For larger n, consider using a bigint type for `T`.
+pub fn binomial<T: Integer + Clone>(mut n: T, k: T) -> T {
+    // See http://blog.plover.com/math/choose.html for the idea.
+    if k > n {
+        return T::zero();
+    }
+    if k > n.clone() - k.clone() {
+        return binomial(n.clone(), n - k);
+    }
+    let mut r = T::one();
+    let mut d = T::one();
+    loop {
+        if d > k {
+            break;
+        }
+        r = multiply_and_divide(r, n.clone(), d.clone());
+        n = n - T::one();
+        d = d + T::one();
+    }
+    r
+}
+
+/// Calculate the multinomial coefficient.
+pub fn multinomial<T: Integer + Clone>(k: &[T]) -> T
+    where for<'a> T: Add<&'a T, Output = T>
+{
+    let mut r = T::one();
+    let mut p = T::zero();
+    for i in k {
+        p = p + i;
+        r = r * binomial(p.clone(), i.clone());
+    }
+    r
+}
+
+#[test]
+fn test_lcm_overflow() {
+    macro_rules! check {
+        ($t:ty, $x:expr, $y:expr, $r:expr) => { {
+            let x: $t = $x;
+            let y: $t = $y;
+            let o = x.checked_mul(y);
+            assert!(o.is_none(),
+                    "sanity checking that {} input {} * {} overflows",
+                    stringify!($t), x, y);
+            assert_eq!(x.lcm(&y), $r);
+            assert_eq!(y.lcm(&x), $r);
+        } }
+    }
+
+    // Original bug (Issue #166)
+    check!(i64, 46656000000000000, 600, 46656000000000000);
+
+    check!(i8, 0x40, 0x04, 0x40);
+    check!(u8, 0x80, 0x02, 0x80);
+    check!(i16, 0x40_00, 0x04, 0x40_00);
+    check!(u16, 0x80_00, 0x02, 0x80_00);
+    check!(i32, 0x4000_0000, 0x04, 0x4000_0000);
+    check!(u32, 0x8000_0000, 0x02, 0x8000_0000);
+    check!(i64, 0x4000_0000_0000_0000, 0x04, 0x4000_0000_0000_0000);
+    check!(u64, 0x8000_0000_0000_0000, 0x02, 0x8000_0000_0000_0000);
+}
+
+#[test]
+fn test_iter_binomial() {
+    macro_rules! check_simple {
+        ($t:ty) => { {
+            let n: $t = 3;
+            let expected = [1, 3, 3, 1];
+            for (b, &e) in IterBinomial::new(n).zip(&expected) {
+                assert_eq!(b, e);
+            }
+        } }
+    }
+
+    check_simple!(u8);
+    check_simple!(i8);
+    check_simple!(u16);
+    check_simple!(i16);
+    check_simple!(u32);
+    check_simple!(i32);
+    check_simple!(u64);
+    check_simple!(i64);
+
+    macro_rules! check_binomial {
+        ($t:ty, $n:expr) => { {
+            let n: $t = $n;
+            let mut k: $t = 0;
+            for b in IterBinomial::new(n) {
+                assert_eq!(b, binomial(n, k));
+                k += 1;
+            }
+        } }
+    }
+
+    // Check the largest n for which there is no overflow.
+    check_binomial!(u8, 10);
+    check_binomial!(i8, 9);
+    check_binomial!(u16, 18);
+    check_binomial!(i16, 17);
+    check_binomial!(u32, 34);
+    check_binomial!(i32, 33);
+    check_binomial!(u64, 67);
+    check_binomial!(i64, 66);
+}
+
+#[test]
+fn test_binomial() {
+    macro_rules! check {
+        ($t:ty, $x:expr, $y:expr, $r:expr) => { {
+            let x: $t = $x;
+            let y: $t = $y;
+            let expected: $t = $r;
+            assert_eq!(binomial(x, y), expected);
+            if y <= x {
+                assert_eq!(binomial(x, x - y), expected);
+            }
+        } }
+    }
+    check!(u8, 9, 4, 126);
+    check!(u8, 0, 0, 1);
+    check!(u8, 2, 3, 0);
+
+    check!(i8, 9, 4, 126);
+    check!(i8, 0, 0, 1);
+    check!(i8, 2, 3, 0);
+
+    check!(u16, 100, 2, 4950);
+    check!(u16, 14, 4, 1001);
+    check!(u16, 0, 0, 1);
+    check!(u16, 2, 3, 0);
+
+    check!(i16, 100, 2, 4950);
+    check!(i16, 14, 4, 1001);
+    check!(i16, 0, 0, 1);
+    check!(i16, 2, 3, 0);
+
+    check!(u32, 100, 2, 4950);
+    check!(u32, 35, 11, 417225900);
+    check!(u32, 14, 4, 1001);
+    check!(u32, 0, 0, 1);
+    check!(u32, 2, 3, 0);
+
+    check!(i32, 100, 2, 4950);
+    check!(i32, 35, 11, 417225900);
+    check!(i32, 14, 4, 1001);
+    check!(i32, 0, 0, 1);
+    check!(i32, 2, 3, 0);
+
+    check!(u64, 100, 2, 4950);
+    check!(u64, 35, 11, 417225900);
+    check!(u64, 14, 4, 1001);
+    check!(u64, 0, 0, 1);
+    check!(u64, 2, 3, 0);
+
+    check!(i64, 100, 2, 4950);
+    check!(i64, 35, 11, 417225900);
+    check!(i64, 14, 4, 1001);
+    check!(i64, 0, 0, 1);
+    check!(i64, 2, 3, 0);
+}
+
+#[test]
+fn test_multinomial() {
+    macro_rules! check_binomial {
+        ($t:ty, $k:expr) => { {
+            let n: $t = $k.iter().fold(0, |acc, &x| acc + x);
+            let k: &[$t] = $k;
+            assert_eq!(k.len(), 2);
+            assert_eq!(multinomial(k), binomial(n, k[0]));
+        } }
+    }
+
+    check_binomial!(u8, &[4, 5]);
+
+    check_binomial!(i8, &[4, 5]);
+
+    check_binomial!(u16, &[2, 98]);
+    check_binomial!(u16, &[4, 10]);
+
+    check_binomial!(i16, &[2, 98]);
+    check_binomial!(i16, &[4, 10]);
+
+    check_binomial!(u32, &[2, 98]);
+    check_binomial!(u32, &[11, 24]);
+    check_binomial!(u32, &[4, 10]);
+
+    check_binomial!(i32, &[2, 98]);
+    check_binomial!(i32, &[11, 24]);
+    check_binomial!(i32, &[4, 10]);
+
+    check_binomial!(u64, &[2, 98]);
+    check_binomial!(u64, &[11, 24]);
+    check_binomial!(u64, &[4, 10]);
+
+    check_binomial!(i64, &[2, 98]);
+    check_binomial!(i64, &[11, 24]);
+    check_binomial!(i64, &[4, 10]);
+
+    macro_rules! check_multinomial {
+        ($t:ty, $k:expr, $r:expr) => { {
+            let k: &[$t] = $k;
+            let expected: $t = $r;
+            assert_eq!(multinomial(k), expected);
+        } }
+    }
+
+    check_multinomial!(u8, &[2, 1, 2], 30);
+    check_multinomial!(u8, &[2, 3, 0], 10);
+
+    check_multinomial!(i8, &[2, 1, 2], 30);
+    check_multinomial!(i8, &[2, 3, 0], 10);
+
+    check_multinomial!(u16, &[2, 1, 2], 30);
+    check_multinomial!(u16, &[2, 3, 0], 10);
+
+    check_multinomial!(i16, &[2, 1, 2], 30);
+    check_multinomial!(i16, &[2, 3, 0], 10);
+
+    check_multinomial!(u32, &[2, 1, 2], 30);
+    check_multinomial!(u32, &[2, 3, 0], 10);
+
+    check_multinomial!(i32, &[2, 1, 2], 30);
+    check_multinomial!(i32, &[2, 3, 0], 10);
+
+    check_multinomial!(u64, &[2, 1, 2], 30);
+    check_multinomial!(u64, &[2, 3, 0], 10);
+
+    check_multinomial!(i64, &[2, 1, 2], 30);
+    check_multinomial!(i64, &[2, 3, 0], 10);
+
+    check_multinomial!(u64, &[], 1);
+    check_multinomial!(u64, &[0], 1);
+    check_multinomial!(u64, &[12345], 1);
+}
diff -Nru cargo-0.32.0/vendor/num-integer/src/roots.rs cargo-0.33.0/vendor/num-integer/src/roots.rs
--- cargo-0.32.0/vendor/num-integer/src/roots.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/src/roots.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,380 @@
+use core;
+use core::mem;
+use traits::checked_pow;
+use traits::PrimInt;
+use Integer;
+
+/// Provides methods to compute an integer's square root, cube root,
+/// and arbitrary `n`th root.
+pub trait Roots: Integer {
+    /// Returns the truncated principal `n`th root of an integer
+    /// -- `if x >= 0 { ⌊ⁿ√x⌋ } else { ⌈ⁿ√x⌉ }`
+    ///
+    /// This is solving for `r` in `rⁿ = x`, rounding toward zero.
+    /// If `x` is positive, the result will satisfy `rⁿ ≤ x < (r+1)ⁿ`.
+    /// If `x` is negative and `n` is odd, then `(r-1)ⁿ < x ≤ rⁿ`.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `n` is zero:
+    ///
+    /// ```should_panic
+    /// # use num_integer::Roots;
+    /// println!("can't compute ⁰√x : {}", 123.nth_root(0));
+    /// ```
+    ///
+    /// or if `n` is even and `self` is negative:
+    ///
+    /// ```should_panic
+    /// # use num_integer::Roots;
+    /// println!("no imaginary numbers... {}", (-1).nth_root(10));
+    /// ```
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use num_integer::Roots;
+    ///
+    /// let x: i32 = 12345;
+    /// assert_eq!(x.nth_root(1), x);
+    /// assert_eq!(x.nth_root(2), x.sqrt());
+    /// assert_eq!(x.nth_root(3), x.cbrt());
+    /// assert_eq!(x.nth_root(4), 10);
+    /// assert_eq!(x.nth_root(13), 2);
+    /// assert_eq!(x.nth_root(14), 1);
+    /// assert_eq!(x.nth_root(std::u32::MAX), 1);
+    ///
+    /// assert_eq!(std::i32::MAX.nth_root(30), 2);
+    /// assert_eq!(std::i32::MAX.nth_root(31), 1);
+    /// assert_eq!(std::i32::MIN.nth_root(31), -2);
+    /// assert_eq!((std::i32::MIN + 1).nth_root(31), -1);
+    ///
+    /// assert_eq!(std::u32::MAX.nth_root(31), 2);
+    /// assert_eq!(std::u32::MAX.nth_root(32), 1);
+    /// ```
+    fn nth_root(&self, n: u32) -> Self;
+
+    /// Returns the truncated principal square root of an integer -- `⌊√x⌋`
+    ///
+    /// This is solving for `r` in `r² = x`, rounding toward zero.
+    /// The result will satisfy `r² ≤ x < (r+1)²`.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `self` is less than zero:
+    ///
+    /// ```should_panic
+    /// # use num_integer::Roots;
+    /// println!("no imaginary numbers... {}", (-1).sqrt());
+    /// ```
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use num_integer::Roots;
+    ///
+    /// let x: i32 = 12345;
+    /// assert_eq!((x * x).sqrt(), x);
+    /// assert_eq!((x * x + 1).sqrt(), x);
+    /// assert_eq!((x * x - 1).sqrt(), x - 1);
+    /// ```
+    #[inline]
+    fn sqrt(&self) -> Self {
+        self.nth_root(2)
+    }
+
+    /// Returns the truncated principal cube root of an integer --
+    /// `if x >= 0 { ⌊∛x⌋ } else { ⌈∛x⌉ }`
+    ///
+    /// This is solving for `r` in `r³ = x`, rounding toward zero.
+    /// If `x` is positive, the result will satisfy `r³ ≤ x < (r+1)³`.
+    /// If `x` is negative, then `(r-1)³ < x ≤ r³`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use num_integer::Roots;
+    ///
+    /// let x: i32 = 1234;
+    /// assert_eq!((x * x * x).cbrt(), x);
+    /// assert_eq!((x * x * x + 1).cbrt(), x);
+    /// assert_eq!((x * x * x - 1).cbrt(), x - 1);
+    ///
+    /// assert_eq!((-(x * x * x)).cbrt(), -x);
+    /// assert_eq!((-(x * x * x + 1)).cbrt(), -x);
+    /// assert_eq!((-(x * x * x - 1)).cbrt(), -(x - 1));
+    /// ```
+    #[inline]
+    fn cbrt(&self) -> Self {
+        self.nth_root(3)
+    }
+}
+
+/// Returns the truncated principal square root of an integer --
+/// see [Roots::sqrt](trait.Roots.html#method.sqrt).
+#[inline]
+pub fn sqrt<T: Roots>(x: T) -> T {
+    x.sqrt()
+}
+
+/// Returns the truncated principal cube root of an integer --
+/// see [Roots::cbrt](trait.Roots.html#method.cbrt).
+#[inline]
+pub fn cbrt<T: Roots>(x: T) -> T {
+    x.cbrt()
+}
+
+/// Returns the truncated principal `n`th root of an integer --
+/// see [Roots::nth_root](trait.Roots.html#tymethod.nth_root).
+#[inline]
+pub fn nth_root<T: Roots>(x: T, n: u32) -> T {
+    x.nth_root(n)
+}
+
+macro_rules! signed_roots {
+    ($T:ty, $U:ty) => {
+        impl Roots for $T {
+            #[inline]
+            fn nth_root(&self, n: u32) -> Self {
+                if *self >= 0 {
+                    (*self as $U).nth_root(n) as Self
+                } else {
+                    assert!(n.is_odd(), "even roots of a negative are imaginary");
+                    -((self.wrapping_neg() as $U).nth_root(n) as Self)
+                }
+            }
+
+            #[inline]
+            fn sqrt(&self) -> Self {
+                assert!(*self >= 0, "the square root of a negative is imaginary");
+                (*self as $U).sqrt() as Self
+            }
+
+            #[inline]
+            fn cbrt(&self) -> Self {
+                if *self >= 0 {
+                    (*self as $U).cbrt() as Self
+                } else {
+                    -((self.wrapping_neg() as $U).cbrt() as Self)
+                }
+            }
+        }
+    };
+}
+
+signed_roots!(i8, u8);
+signed_roots!(i16, u16);
+signed_roots!(i32, u32);
+signed_roots!(i64, u64);
+#[cfg(has_i128)]
+signed_roots!(i128, u128);
+signed_roots!(isize, usize);
+
+#[inline]
+fn fixpoint<T, F>(mut x: T, f: F) -> T
+where
+    T: Integer + Copy,
+    F: Fn(T) -> T,
+{
+    let mut xn = f(x);
+    while x < xn {
+        x = xn;
+        xn = f(x);
+    }
+    while x > xn {
+        x = xn;
+        xn = f(x);
+    }
+    x
+}
+
+#[inline]
+fn bits<T>() -> u32 {
+    8 * mem::size_of::<T>() as u32
+}
+
+#[inline]
+fn log2<T: PrimInt>(x: T) -> u32 {
+    debug_assert!(x > T::zero());
+    bits::<T>() - 1 - x.leading_zeros()
+}
+
+macro_rules! unsigned_roots {
+    ($T:ident) => {
+        impl Roots for $T {
+            fn nth_root(&self, n: u32) -> Self {
+                // Specialize small roots
+                match n {
+                    0 => panic!("can't find a root of degree 0!"),
+                    1 => return *self,
+                    2 => return self.sqrt(),
+                    3 => return self.cbrt(),
+                    _ => (),
+                }
+
+                // The root of values less than 2ⁿ can only be 0 or 1.
+                if bits::<$T>() <= n || *self < (1 << n) {
+                    return (*self > 0) as $T;
+                }
+
+                if bits::<$T>() > 64 {
+                    // 128-bit division is slow, so do a bitwise `nth_root` until it's small enough.
+                    return if *self <= core::u64::MAX as $T {
+                        (*self as u64).nth_root(n) as $T
+                    } else {
+                        let lo = (self >> n).nth_root(n) << 1;
+                        let hi = lo + 1;
+                        // 128-bit `checked_mul` also involves division, but we can't always
+                        // compute `hiⁿ` without risking overflow.  Try to avoid it though...
+                        if hi.next_power_of_two().trailing_zeros() * n >= bits::<$T>() {
+                            match checked_pow(hi, n as usize) {
+                                Some(x) if x <= *self => hi,
+                                _ => lo,
+                            }
+                        } else {
+                            if hi.pow(n) <= *self {
+                                hi
+                            } else {
+                                lo
+                            }
+                        }
+                    };
+                }
+
+                #[cfg(feature = "std")]
+                #[inline]
+                fn guess(x: $T, n: u32) -> $T {
+                    // for smaller inputs, `f64` doesn't justify its cost.
+                    if bits::<$T>() <= 32 || x <= core::u32::MAX as $T {
+                        1 << ((log2(x) + n - 1) / n)
+                    } else {
+                        ((x as f64).ln() / f64::from(n)).exp() as $T
+                    }
+                }
+
+                #[cfg(not(feature = "std"))]
+                #[inline]
+                fn guess(x: $T, n: u32) -> $T {
+                    1 << ((log2(x) + n - 1) / n)
+                }
+
+                // https://en.wikipedia.org/wiki/Nth_root_algorithm
+                let n1 = n - 1;
+                let next = |x: $T| {
+                    let y = match checked_pow(x, n1 as usize) {
+                        Some(ax) => self / ax,
+                        None => 0,
+                    };
+                    (y + x * n1 as $T) / n as $T
+                };
+                fixpoint(guess(*self, n), next)
+            }
+
+            fn sqrt(&self) -> Self {
+                if bits::<$T>() > 64 {
+                    // 128-bit division is slow, so do a bitwise `sqrt` until it's small enough.
+                    // https://en.wikipedia.org/wiki/Integer_square_root#Using_bitwise_operations
+                    return if *self <= core::u64::MAX as $T {
+                        (*self as u64).sqrt() as $T
+                    } else {
+                        let lo = (self >> 2u32).sqrt() << 1;
+                        let hi = lo + 1;
+                        if hi * hi <= *self {
+                            hi
+                        } else {
+                            lo
+                        }
+                    };
+                }
+
+                if *self < 4 {
+                    return (*self > 0) as Self;
+                }
+
+                #[cfg(feature = "std")]
+                #[inline]
+                fn guess(x: $T) -> $T {
+                    (x as f64).sqrt() as $T
+                }
+
+                #[cfg(not(feature = "std"))]
+                #[inline]
+                fn guess(x: $T) -> $T {
+                    1 << ((log2(x) + 1) / 2)
+                }
+
+                // https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method
+                let next = |x: $T| (self / x + x) >> 1;
+                fixpoint(guess(*self), next)
+            }
+
+            fn cbrt(&self) -> Self {
+                if bits::<$T>() > 64 {
+                    // 128-bit division is slow, so do a bitwise `cbrt` until it's small enough.
+                    return if *self <= core::u64::MAX as $T {
+                        (*self as u64).cbrt() as $T
+                    } else {
+                        let lo = (self >> 3u32).cbrt() << 1;
+                        let hi = lo + 1;
+                        if hi * hi * hi <= *self {
+                            hi
+                        } else {
+                            lo
+                        }
+                    };
+                }
+
+                if bits::<$T>() <= 32 {
+                    // Implementation based on Hacker's Delight `icbrt2`
+                    let mut x = *self;
+                    let mut y2 = 0;
+                    let mut y = 0;
+                    let smax = bits::<$T>() / 3;
+                    for s in (0..smax + 1).rev() {
+                        let s = s * 3;
+                        y2 *= 4;
+                        y *= 2;
+                        let b = 3 * (y2 + y) + 1;
+                        if x >> s >= b {
+                            x -= b << s;
+                            y2 += 2 * y + 1;
+                            y += 1;
+                        }
+                    }
+                    return y;
+                }
+
+                if *self < 8 {
+                    return (*self > 0) as Self;
+                }
+                if *self <= core::u32::MAX as $T {
+                    return (*self as u32).cbrt() as $T;
+                }
+
+                #[cfg(feature = "std")]
+                #[inline]
+                fn guess(x: $T) -> $T {
+                    (x as f64).cbrt() as $T
+                }
+
+                #[cfg(not(feature = "std"))]
+                #[inline]
+                fn guess(x: $T) -> $T {
+                    1 << ((log2(x) + 2) / 3)
+                }
+
+                // https://en.wikipedia.org/wiki/Cube_root#Numerical_methods
+                let next = |x: $T| (self / (x * x) + x * 2) / 3;
+                fixpoint(guess(*self), next)
+            }
+        }
+    };
+}
+
+unsigned_roots!(u8);
+unsigned_roots!(u16);
+unsigned_roots!(u32);
+unsigned_roots!(u64);
+#[cfg(has_i128)]
+unsigned_roots!(u128);
+unsigned_roots!(usize);
diff -Nru cargo-0.32.0/vendor/num-integer/tests/roots.rs cargo-0.33.0/vendor/num-integer/tests/roots.rs
--- cargo-0.32.0/vendor/num-integer/tests/roots.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/num-integer/tests/roots.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,276 @@
+extern crate num_integer;
+extern crate num_traits;
+
+use num_integer::Roots;
+use num_traits::checked_pow;
+use num_traits::{AsPrimitive, PrimInt, Signed};
+use std::f64::MANTISSA_DIGITS;
+use std::fmt::Debug;
+use std::mem;
+
+trait TestInteger: Roots + PrimInt + Debug + AsPrimitive<f64> + 'static {}
+
+impl<T> TestInteger for T
+where
+    T: Roots + PrimInt + Debug + AsPrimitive<f64> + 'static,
+{
+}
+
+/// Check that each root is correct
+///
+/// If `x` is positive, check `rⁿ ≤ x < (r+1)ⁿ`.
+/// If `x` is negative, check `(r-1)ⁿ < x ≤ rⁿ`.
+fn check<T>(v: &[T], n: u32)
+where
+    T: TestInteger,
+{
+    for i in v {
+        let rt = i.nth_root(n);
+        // println!("nth_root({:?}, {}) = {:?}", i, n, rt);
+        if n == 2 {
+            assert_eq!(rt, i.sqrt());
+        } else if n == 3 {
+            assert_eq!(rt, i.cbrt());
+        }
+        if *i >= T::zero() {
+            let rt1 = rt + T::one();
+            assert!(rt.pow(n) <= *i);
+            if let Some(x) = checked_pow(rt1, n as usize) {
+                assert!(*i < x);
+            }
+        } else {
+            let rt1 = rt - T::one();
+            assert!(rt < T::zero());
+            assert!(*i <= rt.pow(n));
+            if let Some(x) = checked_pow(rt1, n as usize) {
+                assert!(x < *i);
+            }
+        };
+    }
+}
+
+/// Get the maximum value that will round down as `f64` (if any),
+/// and its successor that will round up.
+///
+/// Important because the `std` implementations cast to `f64` to
+/// get a close approximation of the roots.
+fn mantissa_max<T>() -> Option<(T, T)>
+where
+    T: TestInteger,
+{
+    let bits = if T::min_value().is_zero() {
+        8 * mem::size_of::<T>()
+    } else {
+        8 * mem::size_of::<T>() - 1
+    };
+    if bits > MANTISSA_DIGITS as usize {
+        let rounding_bit = T::one() << (bits - MANTISSA_DIGITS as usize - 1);
+        let x = T::max_value() - rounding_bit;
+
+        let x1 = x + T::one();
+        let x2 = x1 + T::one();
+        assert!(x.as_() < x1.as_());
+        assert_eq!(x1.as_(), x2.as_());
+
+        Some((x, x1))
+    } else {
+        None
+    }
+}
+
+fn extend<T>(v: &mut Vec<T>, start: T, end: T)
+where
+    T: TestInteger,
+{
+    let mut i = start;
+    while i < end {
+        v.push(i);
+        i = i + T::one();
+    }
+    v.push(i);
+}
+
+fn extend_shl<T>(v: &mut Vec<T>, start: T, end: T, mask: T)
+where
+    T: TestInteger,
+{
+    let mut i = start;
+    while i != end {
+        v.push(i);
+        i = (i << 1) & mask;
+    }
+}
+
+fn extend_shr<T>(v: &mut Vec<T>, start: T, end: T)
+where
+    T: TestInteger,
+{
+    let mut i = start;
+    while i != end {
+        v.push(i);
+        i = i >> 1;
+    }
+}
+
+fn pos<T>() -> Vec<T>
+where
+    T: TestInteger,
+    i8: AsPrimitive<T>,
+{
+    let mut v: Vec<T> = vec![];
+    if mem::size_of::<T>() == 1 {
+        extend(&mut v, T::zero(), T::max_value());
+    } else {
+        extend(&mut v, T::zero(), i8::max_value().as_());
+        extend(
+            &mut v,
+            T::max_value() - i8::max_value().as_(),
+            T::max_value(),
+        );
+        if let Some((i, j)) = mantissa_max::<T>() {
+            v.push(i);
+            v.push(j);
+        }
+        extend_shl(&mut v, T::max_value(), T::zero(), !T::min_value());
+        extend_shr(&mut v, T::max_value(), T::zero());
+    }
+    v
+}
+
+fn neg<T>() -> Vec<T>
+where
+    T: TestInteger + Signed,
+    i8: AsPrimitive<T>,
+{
+    let mut v: Vec<T> = vec![];
+    if mem::size_of::<T>() <= 1 {
+        extend(&mut v, T::min_value(), T::zero());
+    } else {
+        extend(&mut v, i8::min_value().as_(), T::zero());
+        extend(
+            &mut v,
+            T::min_value(),
+            T::min_value() - i8::min_value().as_(),
+        );
+        if let Some((i, j)) = mantissa_max::<T>() {
+            v.push(-i);
+            v.push(-j);
+        }
+        extend_shl(&mut v, -T::one(), T::min_value(), !T::zero());
+        extend_shr(&mut v, T::min_value(), -T::one());
+    }
+    v
+}
+
+macro_rules! test_roots {
+    ($I:ident, $U:ident) => {
+        mod $I {
+            use check;
+            use neg;
+            use num_integer::Roots;
+            use pos;
+            use std::mem;
+
+            #[test]
+            #[should_panic]
+            fn zeroth_root() {
+                (123 as $I).nth_root(0);
+            }
+
+            #[test]
+            fn sqrt() {
+                check(&pos::<$I>(), 2);
+            }
+
+            #[test]
+            #[should_panic]
+            fn sqrt_neg() {
+                (-123 as $I).sqrt();
+            }
+
+            #[test]
+            fn cbrt() {
+                check(&pos::<$I>(), 3);
+            }
+
+            #[test]
+            fn cbrt_neg() {
+                check(&neg::<$I>(), 3);
+            }
+
+            #[test]
+            fn nth_root() {
+                let bits = 8 * mem::size_of::<$I>() as u32 - 1;
+                let pos = pos::<$I>();
+                for n in 4..bits {
+                    check(&pos, n);
+                }
+            }
+
+            #[test]
+            fn nth_root_neg() {
+                let bits = 8 * mem::size_of::<$I>() as u32 - 1;
+                let neg = neg::<$I>();
+                for n in 2..bits / 2 {
+                    check(&neg, 2 * n + 1);
+                }
+            }
+
+            #[test]
+            fn bit_size() {
+                let bits = 8 * mem::size_of::<$I>() as u32 - 1;
+                assert_eq!($I::max_value().nth_root(bits - 1), 2);
+                assert_eq!($I::max_value().nth_root(bits), 1);
+                assert_eq!($I::min_value().nth_root(bits), -2);
+                assert_eq!(($I::min_value() + 1).nth_root(bits), -1);
+            }
+        }
+
+        mod $U {
+            use check;
+            use num_integer::Roots;
+            use pos;
+            use std::mem;
+
+            #[test]
+            #[should_panic]
+            fn zeroth_root() {
+                (123 as $U).nth_root(0);
+            }
+
+            #[test]
+            fn sqrt() {
+                check(&pos::<$U>(), 2);
+            }
+
+            #[test]
+            fn cbrt() {
+                check(&pos::<$U>(), 3);
+            }
+
+            #[test]
+            fn nth_root() {
+                let bits = 8 * mem::size_of::<$I>() as u32 - 1;
+                let pos = pos::<$I>();
+                for n in 4..bits {
+                    check(&pos, n);
+                }
+            }
+
+            #[test]
+            fn bit_size() {
+                let bits = 8 * mem::size_of::<$U>() as u32;
+                assert_eq!($U::max_value().nth_root(bits - 1), 2);
+                assert_eq!($U::max_value().nth_root(bits), 1);
+            }
+        }
+    };
+}
+
+test_roots!(i8, u8);
+test_roots!(i16, u16);
+test_roots!(i32, u32);
+test_roots!(i64, u64);
+#[cfg(has_i128)]
+test_roots!(i128, u128);
+test_roots!(isize, usize);
diff -Nru cargo-0.32.0/vendor/num-traits/.travis.yml cargo-0.33.0/vendor/num-traits/.travis.yml
--- cargo-0.32.0/vendor/num-traits/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/num-traits/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-language: rust
-rust:
-  - 1.8.0
-  - 1.15.0
-  - 1.20.0
-  - stable
-  - beta
-  - nightly
-sudo: false
-script:
-  - cargo build --verbose
-  - ./ci/test_full.sh
-notifications:
-  email:
-    on_success: never
-branches:
-  only:
-    - master
-    - next
-    - staging
-    - trying
diff -Nru cargo-0.32.0/vendor/opener/.cargo_vcs_info.json cargo-0.33.0/vendor/opener/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/opener/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/opener/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "565a08abf5a1ce7d69a086648ade3c74952732b1"
-  }
-}
diff -Nru cargo-0.32.0/vendor/opener/src/xdg-open cargo-0.33.0/vendor/opener/src/xdg-open
--- cargo-0.32.0/vendor/opener/src/xdg-open	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/opener/src/xdg-open	1970-01-01 00:00:00.000000000 +0000
@@ -1,1066 +0,0 @@
-#!/bin/sh
-#---------------------------------------------
-#   xdg-open
-#
-#   Utility script to open a URL in the registered default application.
-#
-#   Refer to the usage() function below for usage.
-#
-#   Copyright 2009-2010, Fathi Boudra <fabo@freedesktop.org>
-#   Copyright 2009-2010, Rex Dieter <rdieter@fedoraproject.org>
-#   Copyright 2006, Kevin Krammer <kevin.krammer@gmx.at>
-#   Copyright 2006, Jeremy White <jwhite@codeweavers.com>
-#
-#   LICENSE:
-#
-#   Permission is hereby granted, free of charge, to any person obtaining a
-#   copy of this software and associated documentation files (the "Software"),
-#   to deal in the Software without restriction, including without limitation
-#   the rights to use, copy, modify, merge, publish, distribute, sublicense,
-#   and/or sell copies of the Software, and to permit persons to whom the
-#   Software is furnished to do so, subject to the following conditions:
-#
-#   The above copyright notice and this permission notice shall be included
-#   in all copies or substantial portions of the Software.
-#
-#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-#   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-#   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-#   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-#   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-#   OTHER DEALINGS IN THE SOFTWARE.
-#
-#---------------------------------------------
-
-manualpage()
-{
-cat << _MANUALPAGE
-Name
-
-   xdg-open -- opens a file or URL in the user's preferred
-   application
-
-Synopsis
-
-   xdg-open { file | URL }
-
-   xdg-open { --help | --manual | --version }
-
-Description
-
-   xdg-open opens a file or URL in the user's preferred
-   application. If a URL is provided the URL will be opened in the
-   user's preferred web browser. If a file is provided the file
-   will be opened in the preferred application for files of that
-   type. xdg-open supports file, ftp, http and https URLs.
-
-   xdg-open is for use inside a desktop session only. It is not
-   recommended to use xdg-open as root.
-
-Options
-
-   --help
-          Show command synopsis.
-
-   --manual
-          Show this manual page.
-
-   --version
-          Show the xdg-utils version information.
-
-Exit Codes
-
-   An exit code of 0 indicates success while a non-zero exit code
-   indicates failure. The following failure codes can be returned:
-
-   1
-          Error in command line syntax.
-
-   2
-          One of the files passed on the command line did not
-          exist.
-
-   3
-          A required tool could not be found.
-
-   4
-          The action failed.
-
-See Also
-
-   xdg-mime(1), xdg-settings(1), MIME applications associations
-   specification
-
-Examples
-
-xdg-open 'http://www.freedesktop.org/'
-
-   Opens the freedesktop.org website in the user's default
-   browser.
-
-xdg-open /tmp/foobar.png
-
-   Opens the PNG image file /tmp/foobar.png in the user's default
-   image viewing application.
-_MANUALPAGE
-}
-
-usage()
-{
-cat << _USAGE
-   xdg-open -- opens a file or URL in the user's preferred
-   application
-
-Synopsis
-
-   xdg-open { file | URL }
-
-   xdg-open { --help | --manual | --version }
-
-_USAGE
-}
-
-#@xdg-utils-common@
-
-#----------------------------------------------------------------------------
-#   Common utility functions included in all XDG wrapper scripts
-#----------------------------------------------------------------------------
-
-DEBUG()
-{
-  [ -z "${XDG_UTILS_DEBUG_LEVEL}" ] && return 0;
-  [ ${XDG_UTILS_DEBUG_LEVEL} -lt $1 ] && return 0;
-  shift
-  echo "$@" >&2
-}
-
-# This handles backslashes but not quote marks.
-first_word()
-{
-    read first rest
-    echo "$first"
-}
-
-#-------------------------------------------------------------
-# map a binary to a .desktop file
-binary_to_desktop_file()
-{
-    search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-    binary="`which "$1"`"
-    binary="`readlink -f "$binary"`"
-    base="`basename "$binary"`"
-    IFS=:
-    for dir in $search; do
-        unset IFS
-        [ "$dir" ] || continue
-        [ -d "$dir/applications" ] || [ -d "$dir/applnk" ] || continue
-        for file in "$dir"/applications/*.desktop "$dir"/applications/*/*.desktop "$dir"/applnk/*.desktop "$dir"/applnk/*/*.desktop; do
-            [ -r "$file" ] || continue
-            # Check to make sure it's worth the processing.
-            grep -q "^Exec.*$base" "$file" || continue
-            # Make sure it's a visible desktop file (e.g. not "preferred-web-browser.desktop").
-            grep -Eq "^(NoDisplay|Hidden)=true" "$file" && continue
-            command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
-            command="`which "$command"`"
-            if [ x"`readlink -f "$command"`" = x"$binary" ]; then
-                # Fix any double slashes that got added path composition
-                echo "$file" | sed -e 's,//*,/,g'
-                return
-            fi
-        done
-    done
-}
-
-#-------------------------------------------------------------
-# map a .desktop file to a binary
-desktop_file_to_binary()
-{
-    search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-    desktop="`basename "$1"`"
-    IFS=:
-    for dir in $search; do
-        unset IFS
-        [ "$dir" ] && [ -d "$dir/applications" ] || [ -d "$dir/applnk" ] || continue
-        # Check if desktop file contains -
-        if [ "${desktop#*-}" != "$desktop" ]; then
-            vendor=${desktop%-*}
-            app=${desktop#*-}
-            if [ -r $dir/applications/$vendor/$app ]; then
-                file_path=$dir/applications/$vendor/$app
-            elif [ -r $dir/applnk/$vendor/$app ]; then
-                file_path=$dir/applnk/$vendor/$app
-            fi
-        fi
-        if test -z "$file_path" ; then
-            for indir in "$dir"/applications/ "$dir"/applications/*/ "$dir"/applnk/ "$dir"/applnk/*/; do
-                file="$indir/$desktop"
-                if [ -r "$file" ]; then
-                    file_path=$file
-                    break
-                fi
-            done
-        fi
-        if [ -r "$file_path" ]; then
-            # Remove any arguments (%F, %f, %U, %u, etc.).
-            command="`grep -E "^Exec(\[[^]=]*])?=" "$file_path" | cut -d= -f 2- | first_word`"
-            command="`which "$command"`"
-            readlink -f "$command"
-            return
-        fi
-    done
-}
-
-#-------------------------------------------------------------
-# Exit script on successfully completing the desired operation
-
-exit_success()
-{
-    if [ $# -gt 0 ]; then
-        echo "$@"
-        echo
-    fi
-
-    exit 0
-}
-
-
-#-----------------------------------------
-# Exit script on malformed arguments, not enough arguments
-# or missing required option.
-# prints usage information
-
-exit_failure_syntax()
-{
-    if [ $# -gt 0 ]; then
-        echo "xdg-open: $@" >&2
-        echo "Try 'xdg-open --help' for more information." >&2
-    else
-        usage
-        echo "Use 'man xdg-open' or 'xdg-open --manual' for additional info."
-    fi
-
-    exit 1
-}
-
-#-------------------------------------------------------------
-# Exit script on missing file specified on command line
-
-exit_failure_file_missing()
-{
-    if [ $# -gt 0 ]; then
-        echo "xdg-open: $@" >&2
-    fi
-
-    exit 2
-}
-
-#-------------------------------------------------------------
-# Exit script on failure to locate necessary tool applications
-
-exit_failure_operation_impossible()
-{
-    if [ $# -gt 0 ]; then
-        echo "xdg-open: $@" >&2
-    fi
-
-    exit 3
-}
-
-#-------------------------------------------------------------
-# Exit script on failure returned by a tool application
-
-exit_failure_operation_failed()
-{
-    if [ $# -gt 0 ]; then
-        echo "xdg-open: $@" >&2
-    fi
-
-    exit 4
-}
-
-#------------------------------------------------------------
-# Exit script on insufficient permission to read a specified file
-
-exit_failure_file_permission_read()
-{
-    if [ $# -gt 0 ]; then
-        echo "xdg-open: $@" >&2
-    fi
-
-    exit 5
-}
-
-#------------------------------------------------------------
-# Exit script on insufficient permission to write a specified file
-
-exit_failure_file_permission_write()
-{
-    if [ $# -gt 0 ]; then
-        echo "xdg-open: $@" >&2
-    fi
-
-    exit 6
-}
-
-check_input_file()
-{
-    if [ ! -e "$1" ]; then
-        exit_failure_file_missing "file '$1' does not exist"
-    fi
-    if [ ! -r "$1" ]; then
-        exit_failure_file_permission_read "no permission to read file '$1'"
-    fi
-}
-
-check_vendor_prefix()
-{
-    file_label="$2"
-    [ -n "$file_label" ] || file_label="filename"
-    file=`basename "$1"`
-    case "$file" in
-       [[:alpha:]]*-*)
-         return
-         ;;
-    esac
-
-    echo "xdg-open: $file_label '$file' does not have a proper vendor prefix" >&2
-    echo 'A vendor prefix consists of alpha characters ([a-zA-Z]) and is terminated' >&2
-    echo 'with a dash ("-"). An example '"$file_label"' is '"'example-$file'" >&2
-    echo "Use --novendor to override or 'xdg-open --manual' for additional info." >&2
-    exit 1
-}
-
-check_output_file()
-{
-    # if the file exists, check if it is writeable
-    # if it does not exists, check if we are allowed to write on the directory
-    if [ -e "$1" ]; then
-        if [ ! -w "$1" ]; then
-            exit_failure_file_permission_write "no permission to write to file '$1'"
-        fi
-    else
-        DIR=`dirname "$1"`
-        if [ ! -w "$DIR" ] || [ ! -x "$DIR" ]; then
-            exit_failure_file_permission_write "no permission to create file '$1'"
-        fi
-    fi
-}
-
-#----------------------------------------
-# Checks for shared commands, e.g. --help
-
-check_common_commands()
-{
-    while [ $# -gt 0 ] ; do
-        parm="$1"
-        shift
-
-        case "$parm" in
-            --help)
-            usage
-            echo "Use 'man xdg-open' or 'xdg-open --manual' for additional info."
-            exit_success
-            ;;
-
-            --manual)
-            manualpage
-            exit_success
-            ;;
-
-            --version)
-            echo "xdg-open 1.1.3"
-            exit_success
-            ;;
-        esac
-    done
-}
-
-check_common_commands "$@"
-
-[ -z "${XDG_UTILS_DEBUG_LEVEL}" ] && unset XDG_UTILS_DEBUG_LEVEL;
-if [ ${XDG_UTILS_DEBUG_LEVEL-0} -lt 1 ]; then
-    # Be silent
-    xdg_redirect_output=" > /dev/null 2> /dev/null"
-else
-    # All output to stderr
-    xdg_redirect_output=" >&2"
-fi
-
-#--------------------------------------
-# Checks for known desktop environments
-# set variable DE to the desktop environments name, lowercase
-
-detectDE()
-{
-    # see https://bugs.freedesktop.org/show_bug.cgi?id=34164
-    unset GREP_OPTIONS
-
-    if [ -n "${XDG_CURRENT_DESKTOP}" ]; then
-      case "${XDG_CURRENT_DESKTOP}" in
-         # only recently added to menu-spec, pre-spec X- still in use
-         Cinnamon|X-Cinnamon)
-           DE=cinnamon;
-           ;;
-         ENLIGHTENMENT)
-           DE=enlightenment;
-           ;;
-         # GNOME, GNOME-Classic:GNOME, or GNOME-Flashback:GNOME
-         GNOME*)
-           DE=gnome;
-           ;;
-         KDE)
-           DE=kde;
-           ;;
-         # Deepin Desktop Environments
-         DEEPIN|Deepin|deepin)
-           DE=dde;
-           ;;
-         LXDE)
-           DE=lxde;
-           ;;
-         LXQt)
-           DE=lxqt;
-           ;;
-         MATE)
-           DE=mate;
-           ;;
-         XFCE)
-           DE=xfce
-           ;;
-         X-Generic)
-           DE=generic
-           ;;
-      esac
-    fi
-
-    if [ x"$DE" = x"" ]; then
-      # classic fallbacks
-      if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
-      elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
-      elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate;
-      elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
-      elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
-      elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce
-      elif echo $DESKTOP | grep -q '^Enlightenment'; then DE=enlightenment;
-      elif [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=lxqt;
-      fi
-    fi
-
-    if [ x"$DE" = x"" ]; then
-      # fallback to checking $DESKTOP_SESSION
-      case "$DESKTOP_SESSION" in
-         gnome)
-           DE=gnome;
-           ;;
-         LXDE|Lubuntu)
-           DE=lxde; 
-           ;;
-         MATE)
-           DE=mate;
-           ;;
-         xfce|xfce4|'Xfce Session')
-           DE=xfce;
-           ;;
-      esac
-    fi
-
-    if [ x"$DE" = x"" ]; then
-      # fallback to uname output for other platforms
-      case "$(uname 2>/dev/null)" in 
-        CYGWIN*)
-          DE=cygwin;
-          ;;
-        Darwin)
-          DE=darwin;
-          ;;
-      esac
-    fi
-
-    if [ x"$DE" = x"gnome" ]; then
-      # gnome-default-applications-properties is only available in GNOME 2.x
-      # but not in GNOME 3.x
-      which gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
-    fi
-
-    if [ -f "$XDG_RUNTIME_DIR/flatpak-info" ]; then
-      DE="flatpak"
-    fi
-}
-
-#----------------------------------------------------------------------------
-# kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4
-# It also always returns 1 in KDE 3.4 and earlier
-# Simply return 0 in such case
-
-kfmclient_fix_exit_code()
-{
-    version=`LC_ALL=C.UTF-8 kde-config --version 2>/dev/null | grep '^KDE'`
-    major=`echo $version | sed 's/KDE.*: \([0-9]\).*/\1/'`
-    minor=`echo $version | sed 's/KDE.*: [0-9]*\.\([0-9]\).*/\1/'`
-    release=`echo $version | sed 's/KDE.*: [0-9]*\.[0-9]*\.\([0-9]\).*/\1/'`
-    test "$major" -gt 3 && return $1
-    test "$minor" -gt 5 && return $1
-    test "$release" -gt 4 && return $1
-    return 0
-}
-
-#----------------------------------------------------------------------------
-# Returns true if there is a graphical display attached.
-
-has_display()
-{
-    if [ -n "$DISPLAY" ] || [ -n "$WAYLAND_DISPLAY" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# This handles backslashes but not quote marks.
-last_word()
-{
-    read first rest
-    echo "$rest"
-}
-
-# Get the value of a key in a desktop file's Desktop Entry group.
-# Example: Use get_key foo.desktop Exec
-# to get the values of the Exec= key for the Desktop Entry group.
-get_key()
-{
-    local file="${1}"
-    local key="${2}"
-    local desktop_entry=""
-
-    IFS_="${IFS}"
-    IFS=""
-    while read line
-    do
-        case "$line" in
-            "[Desktop Entry]")
-                desktop_entry="y"
-            ;;
-            # Reset match flag for other groups
-            "["*)
-                desktop_entry=""
-            ;;
-            "${key}="*)
-                # Only match Desktop Entry group
-                if [ -n "${desktop_entry}" ]
-                then
-                    echo "${line}" | cut -d= -f 2-
-                fi
-        esac
-    done < "${file}"
-    IFS="${IFS_}"
-}
-
-# Returns true if argument is a file:// URL or path
-is_file_url_or_path()
-{
-    if echo "$1" | grep -q '^file://' \
-            || ! echo "$1" | egrep -q '^[[:alpha:]+\.\-]+:'; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# If argument is a file URL, convert it to a (percent-decoded) path.
-# If not, leave it as it is.
-file_url_to_path()
-{
-    local file="$1"
-    if echo "$file" | grep -q '^file:///'; then
-        file=${file#file://}
-        file=${file%%#*}
-        file=$(echo "$file" | sed -r 's/\?.*$//')
-        local printf=printf
-        if [ -x /usr/bin/printf ]; then
-            printf=/usr/bin/printf
-        fi
-        file=$($printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")
-    fi
-    echo "$file"
-}
-
-open_cygwin()
-{
-    cygstart "$1"
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_darwin()
-{
-    open "$1"
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_kde()
-{
-    if [ -n "${KDE_SESSION_VERSION}" ]; then
-      case "${KDE_SESSION_VERSION}" in
-        4)
-          kde-open "$1"
-        ;;
-        5)
-          kde-open${KDE_SESSION_VERSION} "$1"
-        ;;
-      esac
-    else
-        kfmclient exec "$1"
-        kfmclient_fix_exit_code $?
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_dde()
-{
-    if dde-open -version >/dev/null 2>&1; then
-        dde-open "$1"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_gnome3()
-{
-    if gio help open 2>/dev/null 1>&2; then
-        gio open "$1"
-    elif gvfs-open --help 2>/dev/null 1>&2; then
-        gvfs-open "$1"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_gnome()
-{
-    if gio help open 2>/dev/null 1>&2; then
-        gio open "$1"
-    elif gvfs-open --help 2>/dev/null 1>&2; then
-        gvfs-open "$1"
-    elif gnome-open --help 2>/dev/null 1>&2; then
-        gnome-open "$1"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_mate()
-{
-    if gio help open 2>/dev/null 1>&2; then
-        gio open "$1"
-    elif gvfs-open --help 2>/dev/null 1>&2; then
-        gvfs-open "$1"
-    elif mate-open --help 2>/dev/null 1>&2; then
-        mate-open "$1"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_xfce()
-{
-    if exo-open --help 2>/dev/null 1>&2; then
-        exo-open "$1"
-    elif gio help open 2>/dev/null 1>&2; then
-        gio open "$1"
-    elif gvfs-open --help 2>/dev/null 1>&2; then
-        gvfs-open "$1"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_enlightenment()
-{
-    if enlightenment_open --help 2>/dev/null 1>&2; then
-        enlightenment_open "$1"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_flatpak()
-{
-    gdbus call --session \
-        --dest org.freedesktop.portal.Desktop \
-        --object-path /org/freedesktop/portal/desktop \
-        --method org.freedesktop.portal.OpenURI.OpenURI \
-        "" "$1" {}
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-#-----------------------------------------
-# Recursively search .desktop file
-
-search_desktop_file()
-{
-    local default="$1"
-    local dir="$2"
-    local target="$3"
-
-    local file=""
-    # look for both vendor-app.desktop, vendor/app.desktop
-    if [ -r "$dir/$default" ]; then
-      file="$dir/$default"
-    elif [ -r "$dir/`echo $default | sed -e 's|-|/|'`" ]; then
-      file="$dir/`echo $default | sed -e 's|-|/|'`"
-    fi
-
-    if [ -r "$file" ] ; then
-        command="$(get_key "${file}" "Exec" | first_word)"
-        command_exec=`which $command 2>/dev/null`
-        icon="$(get_key "${file}" "Icon")"
-        # FIXME: Actually LC_MESSAGES should be used as described in
-        # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html
-        localised_name="$(get_key "${file}" "Name")"
-        set -- $(get_key "${file}" "Exec" | last_word)
-        # We need to replace any occurrence of "%f", "%F" and
-        # the like by the target file. We examine each
-        # argument and append the modified argument to the
-        # end then shift.
-        local args=$#
-        local replaced=0
-        while [ $args -gt 0 ]; do
-            case $1 in
-                %[c])
-                    replaced=1
-                    arg="${localised_name}"
-                    shift
-                    set -- "$@" "$arg"
-                    ;;
-                %[fFuU])
-                    replaced=1
-                    arg="$target"
-                    shift
-                    set -- "$@" "$arg"
-                    ;;
-                %[i])
-                    replaced=1
-                    shift
-                    set -- "$@" "--icon" "$icon"
-                    ;;
-                *)
-                    arg="$1"
-                    shift
-                    set -- "$@" "$arg"
-                    ;;
-            esac
-            args=$(( $args - 1 ))
-        done
-        [ $replaced -eq 1 ] || set -- "$@" "$target"
-        "$command_exec" "$@"
-
-        if [ $? -eq 0 ]; then
-            exit_success
-        fi
-    fi
-
-    for d in $dir/*/; do
-        [ -d "$d" ] && search_desktop_file "$default" "$d" "$target"
-    done
-}
-
-
-open_generic_xdg_mime()
-{
-    filetype="$2"
-    default=`xdg-mime query default "$filetype"`
-    if [ -n "$default" ] ; then
-        xdg_user_dir="$XDG_DATA_HOME"
-        [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
-
-        xdg_system_dirs="$XDG_DATA_DIRS"
-        [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
-
-DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
-        for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
-            search_desktop_file "$default" "$x/applications/" "$1"
-        done
-    fi
-}
-
-open_generic_xdg_file_mime()
-{
-    filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
-    open_generic_xdg_mime "$1" "$filetype"
-}
-
-open_generic_xdg_x_scheme_handler()
-{
-    scheme="`echo $1 | sed -n 's/\(^[[:alnum:]+\.-]*\):.*$/\1/p'`"
-    if [ -n $scheme ]; then
-        filetype="x-scheme-handler/$scheme"
-        open_generic_xdg_mime "$1" "$filetype"
-    fi
-}
-
-has_single_argument()
-{
-  test $# = 1
-}
-
-open_envvar()
-{
-    local oldifs="$IFS"
-    local browser browser_with_arg
-
-    IFS=":"
-    for browser in $BROWSER; do
-        IFS="$oldifs"
-
-        if [ -z "$browser" ]; then
-            continue
-        fi
-
-        if echo "$browser" | grep -q %s; then
-            # Avoid argument injection.
-            # See https://bugs.freedesktop.org/show_bug.cgi?id=103807
-            # URIs don't have IFS characters spaces anyway.
-            has_single_argument $1 && $(printf "$browser" "$1")
-        else
-            $browser "$1"
-        fi
-
-        if [ $? -eq 0 ]; then
-            exit_success
-        fi
-    done
-}
-
-open_generic()
-{
-    if is_file_url_or_path "$1"; then
-        local file="$(file_url_to_path "$1")"
-
-        check_input_file "$file"
-
-        if has_display; then
-            filetype=`xdg-mime query filetype "$file" | sed "s/;.*//"`
-            open_generic_xdg_mime "$file" "$filetype"
-        fi
-
-        if which run-mailcap 2>/dev/null 1>&2; then
-            run-mailcap --action=view "$file"
-            if [ $? -eq 0 ]; then
-                exit_success
-            fi
-        fi
-
-        if has_display && mimeopen -v 2>/dev/null 1>&2; then
-            mimeopen -L -n "$file"
-            if [ $? -eq 0 ]; then
-                exit_success
-            fi
-        fi
-    fi
-
-    if has_display; then
-        open_generic_xdg_x_scheme_handler "$1"
-    fi
-
-    if [ -n "$BROWSER" ]; then
-        open_envvar "$1"
-    fi
-
-    # if BROWSER variable is not set, check some well known browsers instead
-    if [ x"$BROWSER" = x"" ]; then
-        BROWSER=www-browser:links2:elinks:links:lynx:w3m
-        if has_display; then
-            BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium:chromium-browser:google-chrome:$BROWSER
-        fi
-    fi
-
-    open_envvar "$1"
-
-    exit_failure_operation_impossible "no method available for opening '$1'"
-}
-
-open_lxde()
-{
-
-    # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
-    if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
-        local file="$(file_url_to_path "$1")"
-
-        # handle relative paths
-        if ! echo "$file" | grep -q ^/; then
-            file="$(pwd)/$file"
-        fi
-
-        pcmanfm "$file"
-    else
-        open_generic "$1"
-    fi
-
-    if [ $? -eq 0 ]; then
-        exit_success
-    else
-        exit_failure_operation_failed
-    fi
-}
-
-open_lxqt()
-{
-    open_generic "$1"
-}
-
-[ x"$1" != x"" ] || exit_failure_syntax
-
-url=
-while [ $# -gt 0 ] ; do
-    parm="$1"
-    shift
-
-    case "$parm" in
-      -*)
-        exit_failure_syntax "unexpected option '$parm'"
-        ;;
-
-      *)
-        if [ -n "$url" ] ; then
-            exit_failure_syntax "unexpected argument '$parm'"
-        fi
-        url="$parm"
-        ;;
-    esac
-done
-
-if [ -z "${url}" ] ; then
-    exit_failure_syntax "file or URL argument missing"
-fi
-
-detectDE
-
-if [ x"$DE" = x"" ]; then
-    DE=generic
-fi
-
-DEBUG 2 "Selected DE $DE"
-
-# sanitize BROWSER (avoid caling ourselves in particular)
-case "${BROWSER}" in
-    *:"xdg-open"|"xdg-open":*)
-        BROWSER=$(echo $BROWSER | sed -e 's|:xdg-open||g' -e 's|xdg-open:||g')
-        ;;
-    "xdg-open")
-        BROWSER=
-        ;;
-esac
-
-case "$DE" in
-    kde)
-    open_kde "$url"
-    ;;
-
-    dde)
-    open_dde "$url"
-    ;;
-
-    gnome3|cinnamon)
-    open_gnome3 "$url"
-    ;;
-
-    gnome)
-    open_gnome "$url"
-    ;;
-
-    mate)
-    open_mate "$url"
-    ;;
-
-    xfce)
-    open_xfce "$url"
-    ;;
-
-    lxde)
-    open_lxde "$url"
-    ;;
-
-    lxqt)
-    open_lxqt "$url"
-    ;;
-
-    enlightenment)
-    open_enlightenment "$url"
-    ;;
-
-    cygwin)
-    open_cygwin "$url"
-    ;;
-
-    darwin)
-    open_darwin "$url"
-    ;;
-
-    flatpak)
-    open_flatpak "$url"
-    ;;
-
-    generic)
-    open_generic "$url"
-    ;;
-
-    *)
-    exit_failure_operation_impossible "no method available for opening '$url'"
-    ;;
-esac
diff -Nru cargo-0.32.0/vendor/openssl/.cargo-checksum.json cargo-0.33.0/vendor/openssl/.cargo-checksum.json
--- cargo-0.32.0/vendor/openssl/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"5e1309181cdcbdb51bc3b6bedb33dfac2a83b3d585033d3f6d9e22e8c1928613"}
\ No newline at end of file
+{"files":{},"package":"ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/openssl/Cargo.toml cargo-0.33.0/vendor/openssl/Cargo.toml
--- cargo-0.32.0/vendor/openssl/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "openssl"
-version = "0.10.15"
+version = "0.10.16"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 description = "OpenSSL bindings"
 readme = "README.md"
@@ -36,7 +36,7 @@
 version = "0.2"
 
 [dependencies.openssl-sys]
-version = "0.9.39"
+version = "0.9.40"
 [dev-dependencies.data-encoding]
 version = "2.0"
 
@@ -51,4 +51,4 @@
 v102 = []
 v110 = []
 v111 = []
-vendored = ["openssl-sys/vendored"]
+vendored = []
diff -Nru cargo-0.32.0/vendor/openssl/debian/patches/disable-vendor.patch cargo-0.33.0/vendor/openssl/debian/patches/disable-vendor.patch
--- cargo-0.32.0/vendor/openssl/debian/patches/disable-vendor.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/debian/patches/disable-vendor.patch	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,8 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -51,4 +51,4 @@
+ v102 = []
+ v110 = []
+ v111 = []
+-vendored = ["openssl-sys/vendored"]
++vendored = []
diff -Nru cargo-0.32.0/vendor/openssl/debian/patches/series cargo-0.33.0/vendor/openssl/debian/patches/series
--- cargo-0.32.0/vendor/openssl/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/debian/patches/series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+disable-vendor.patch
diff -Nru cargo-0.32.0/vendor/openssl/.pc/applied-patches cargo-0.33.0/vendor/openssl/.pc/applied-patches
--- cargo-0.32.0/vendor/openssl/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/.pc/applied-patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+disable-vendor.patch
diff -Nru cargo-0.32.0/vendor/openssl/.pc/disable-vendor.patch/Cargo.toml cargo-0.33.0/vendor/openssl/.pc/disable-vendor.patch/Cargo.toml
--- cargo-0.32.0/vendor/openssl/.pc/disable-vendor.patch/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/.pc/disable-vendor.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,54 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "openssl"
+version = "0.10.16"
+authors = ["Steven Fackler <sfackler@gmail.com>"]
+description = "OpenSSL bindings"
+readme = "README.md"
+keywords = ["crypto", "tls", "ssl", "dtls"]
+categories = ["cryptography", "api-bindings"]
+license = "Apache-2.0"
+repository = "https://github.com/sfackler/rust-openssl"
+[dependencies.bitflags]
+version = "1.0"
+
+[dependencies.cfg-if]
+version = "0.1"
+
+[dependencies.foreign-types]
+version = "0.3.1"
+
+[dependencies.lazy_static]
+version = "1"
+
+[dependencies.libc]
+version = "0.2"
+
+[dependencies.openssl-sys]
+version = "0.9.40"
+[dev-dependencies.data-encoding]
+version = "2.0"
+
+[dev-dependencies.hex]
+version = "0.3"
+
+[dev-dependencies.tempdir]
+version = "0.3"
+
+[features]
+v101 = []
+v102 = []
+v110 = []
+v111 = []
+vendored = ["openssl-sys/vendored"]
diff -Nru cargo-0.32.0/vendor/openssl/.pc/.quilt_patches cargo-0.33.0/vendor/openssl/.pc/.quilt_patches
--- cargo-0.32.0/vendor/openssl/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/.pc/.quilt_patches	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+debian/patches
diff -Nru cargo-0.32.0/vendor/openssl/.pc/.quilt_series cargo-0.33.0/vendor/openssl/.pc/.quilt_series
--- cargo-0.32.0/vendor/openssl/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/.pc/.quilt_series	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+series
diff -Nru cargo-0.32.0/vendor/openssl/.pc/.version cargo-0.33.0/vendor/openssl/.pc/.version
--- cargo-0.32.0/vendor/openssl/.pc/.version	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/.pc/.version	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+2
diff -Nru cargo-0.32.0/vendor/openssl/src/hash.rs cargo-0.33.0/vendor/openssl/src/hash.rs
--- cargo-0.32.0/vendor/openssl/src/hash.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/src/hash.rs	2019-02-06 04:11:58.000000000 +0000
@@ -64,6 +64,36 @@
         unsafe { MessageDigest(ffi::EVP_sha512()) }
     }
 
+    #[cfg(ossl111)]
+    pub fn sha3_224() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_sha3_224()) }
+    }
+
+    #[cfg(ossl111)]
+    pub fn sha3_256() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_sha3_256()) }
+    }
+
+    #[cfg(ossl111)]
+    pub fn sha3_384() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_sha3_384()) }
+    }
+
+    #[cfg(ossl111)]
+    pub fn sha3_512() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_sha3_512()) }
+    }
+
+    #[cfg(ossl111)]
+    pub fn shake_128() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_shake128()) }
+    }
+
+    #[cfg(ossl111)]
+    pub fn shake_256() -> MessageDigest {
+        unsafe { MessageDigest(ffi::EVP_shake256()) }
+    }
+
     pub fn ripemd160() -> MessageDigest {
         unsafe { MessageDigest(ffi::EVP_ripemd160()) }
     }
@@ -119,11 +149,29 @@
 /// assert_eq!(&*res, spec);
 /// ```
 ///
+/// Use an XOF hasher (OpenSSL 1.1.1+):
+///
+/// ```
+/// #[cfg(ossl111)]
+/// {
+///     use openssl::hash::{hash_xof, MessageDigest};
+///
+///     let data = b"\x41\x6c\x6c\x20\x79\x6f\x75\x72\x20\x62\x61\x73\x65\x20\x61\x72\x65\x20\x62\x65\x6c\x6f\x6e\x67\x20\x74\x6f\x20\x75\x73";
+///     let spec = b"\x49\xd0\x69\x7f\xf5\x08\x11\x1d\x8b\x84\xf1\x5e\x46\xda\xf1\x35";
+///     let mut buf = vec![0; 16];
+///     hash_xof(MessageDigest::shake_128(), data, buf.as_mut_slice()).unwrap();
+///     assert_eq!(buf, spec);
+/// }
+/// ```
+///
 /// # Warning
 ///
 /// Don't actually use MD5 and SHA-1 hashes, they're not secure anymore.
 ///
 /// Don't ever hash passwords, use the functions in the `pkcs5` module or bcrypt/scrypt instead.
+///
+/// For extendable output functions (XOFs, i.e. SHAKE128/SHAKE256), you must use finish_xof instead
+/// of finish and provide a buf to store the hash. The hash will be as long as the buf.
 pub struct Hasher {
     ctx: *mut ffi::EVP_MD_CTX,
     md: *const ffi::EVP_MD,
@@ -182,7 +230,7 @@
         Ok(())
     }
 
-    /// Returns the hash of the data written and resets the hasher.
+    /// Returns the hash of the data written and resets the non-XOF hasher.
     pub fn finish(&mut self) -> Result<DigestBytes, ErrorStack> {
         if self.state == Finalized {
             self.init()?;
@@ -202,6 +250,24 @@
             })
         }
     }
+
+    /// Writes the hash of the data into the supplied buf and resets the XOF hasher.
+    /// The hash will be as long as the buf.
+    #[cfg(ossl111)]
+    pub fn finish_xof(&mut self, buf: &mut[u8]) -> Result<(), ErrorStack> {
+        if self.state == Finalized {
+            self.init()?;
+        }
+        unsafe {
+            cvt(ffi::EVP_DigestFinalXOF(
+                self.ctx,
+                buf.as_mut_ptr(),
+                buf.len(),
+            ))?;
+            self.state = Finalized;
+            Ok(())
+        }
+    }
 }
 
 impl Write for Hasher {
@@ -291,13 +357,21 @@
     }
 }
 
-/// Computes the hash of the `data` with the hash `t`.
+/// Computes the hash of the `data` with the non-XOF hasher `t`.
 pub fn hash(t: MessageDigest, data: &[u8]) -> Result<DigestBytes, ErrorStack> {
     let mut h = Hasher::new(t)?;
     h.update(data)?;
     h.finish()
 }
 
+/// Computes the hash of the `data` with the XOF hasher `t` and stores it in `buf`.
+#[cfg(ossl111)]
+pub fn hash_xof(t: MessageDigest, data: &[u8], buf: &mut[u8]) -> Result<(), ErrorStack> {
+    let mut h = Hasher::new(t)?;
+    h.update(data)?;
+    h.finish_xof(buf)
+}
+
 #[cfg(test)]
 mod tests {
     use hex::{self, FromHex};
@@ -310,6 +384,14 @@
         assert_eq!(hex::encode(res), hashtest.1);
     }
 
+    #[cfg(ossl111)]
+    fn hash_xof_test(hashtype: MessageDigest, hashtest: &(&str, &str)) {
+        let expected = Vec::from_hex(hashtest.1).unwrap();
+        let mut buf = vec![0; expected.len()];
+        hash_xof(hashtype, &Vec::from_hex(hashtest.0).unwrap(), buf.as_mut_slice()).unwrap();
+        assert_eq!(buf, expected);
+    }
+
     fn hash_recycle_test(h: &mut Hasher, hashtest: &(&str, &str)) {
         let _ = h.write_all(&Vec::from_hex(hashtest.0).unwrap()).unwrap();
         let res = h.finish().unwrap();
@@ -414,6 +496,80 @@
         }
     }
 
+    #[cfg(ossl111)]
+    #[test]
+    fn test_sha3_224() {
+        let tests = [("416c6c20796f75722062617365206172652062656c6f6e6720746f207573",
+            "1de092dd9fbcbbf450f26264f4778abd48af851f2832924554c56913"
+        )];
+
+        for test in tests.iter() {
+            hash_test(MessageDigest::sha3_224(), test);
+        }
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_sha3_256() {
+        let tests = [("416c6c20796f75722062617365206172652062656c6f6e6720746f207573",
+            "b38e38f08bc1c0091ed4b5f060fe13e86aa4179578513ad11a6e3abba0062f61"
+        )];
+
+        for test in tests.iter() {
+            hash_test(MessageDigest::sha3_256(), test);
+        }
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_sha3_384() {
+        let tests = [("416c6c20796f75722062617365206172652062656c6f6e6720746f207573",
+            "966ee786ab3482dd811bf7c8fa8db79aa1f52f6c3c369942ef14240ebd857c6ff626ec35d9e131ff64d328\
+            ef2008ff16"
+        )];
+
+        for test in tests.iter() {
+            hash_test(MessageDigest::sha3_384(), test);
+        }
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_sha3_512() {
+        let tests = [("416c6c20796f75722062617365206172652062656c6f6e6720746f207573",
+            "c072288ef728cd53a029c47687960b9225893532f42b923156e37020bdc1eda753aafbf30af859d4f4c3a1\
+            807caee3a79f8eb02dcd61589fbbdf5f40c8787a72"
+        )];
+
+        for test in tests.iter() {
+            hash_test(MessageDigest::sha3_512(), test);
+        }
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_shake_128() {
+        let tests = [("416c6c20796f75722062617365206172652062656c6f6e6720746f207573",
+            "49d0697ff508111d8b84f15e46daf135"
+        )];
+
+        for test in tests.iter() {
+            hash_xof_test(MessageDigest::shake_128(), test);
+        }
+    }
+
+    #[cfg(ossl111)]
+    #[test]
+    fn test_shake_256() {
+        let tests = [("416c6c20796f75722062617365206172652062656c6f6e6720746f207573",
+            "4e2dfdaa75d1e049d0eaeffe28e76b17cea47b650fb8826fe48b94664326a697"
+        )];
+
+        for test in tests.iter() {
+            hash_xof_test(MessageDigest::shake_256(), test);
+        }
+    }
+
     #[test]
     fn test_ripemd160() {
         let tests = [("616263", "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc")];
diff -Nru cargo-0.32.0/vendor/openssl/src/lib.rs cargo-0.33.0/vendor/openssl/src/lib.rs
--- cargo-0.32.0/vendor/openssl/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -16,7 +16,7 @@
 //! 
 //! ```toml
 //! [dependencies]
-//! openssl = { version = "0.10", feature = ["vendored"] }
+//! openssl = { version = "0.10", features = ["vendored"] }
 //! ```
 //! 
 //! The vendored copy will not be configured to automatically find the system's root certificates, but the
diff -Nru cargo-0.32.0/vendor/openssl/src/rand.rs cargo-0.33.0/vendor/openssl/src/rand.rs
--- cargo-0.32.0/vendor/openssl/src/rand.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl/src/rand.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,14 +10,16 @@
 //! let mut buf = [0; 256];
 //! rand_bytes(&mut buf).unwrap();
 //! ```
-use libc::c_int;
 use ffi;
+use libc::c_int;
 
 use cvt;
 use error::ErrorStack;
 
 /// Fill buffer with cryptographically strong pseudo-random bytes.
 ///
+/// This corresponds to [`RAND_bytes`].
+///
 /// # Examples
 ///
 /// To generate a buffer with cryptographically strong bytes:
@@ -29,9 +31,7 @@
 /// rand_bytes(&mut buf).unwrap();
 /// ```
 ///
-/// # External OpenSSL Documentation
-///
-/// [RAND_bytes](https://www.openssl.org/docs/man1.1.0/crypto/RAND_bytes.html)
+/// [`RAND_bytes`](https://www.openssl.org/docs/man1.1.0/crypto/RAND_bytes.html)
 pub fn rand_bytes(buf: &mut [u8]) -> Result<(), ErrorStack> {
     unsafe {
         ffi::init();
@@ -40,6 +40,20 @@
     }
 }
 
+/// Controls random device file descriptor behavior.
+///
+/// Requires OpenSSL 1.1.1 or newer.
+///
+/// This corresponds to [`RAND_keep_random_devices_open`].
+///
+/// [`RAND_keep_random_devices_open`]: https://www.openssl.org/docs/manmaster/man3/RAND_keep_random_devices_open.html
+#[cfg(ossl111)]
+pub fn keep_random_devices_open(keep: bool) {
+    unsafe {
+        ffi::RAND_keep_random_devices_open(keep as c_int);
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::rand_bytes;
diff -Nru cargo-0.32.0/vendor/openssl-sys/build/main.rs cargo-0.33.0/vendor/openssl-sys/build/main.rs
--- cargo-0.32.0/vendor/openssl-sys/build/main.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/build/main.rs	2019-02-06 04:11:58.000000000 +0000
@@ -504,6 +504,7 @@
             (8, 0) => ('8', '0'),
             (8, 1) => ('8', '1'),
             (8, _) => ('8', 'x'),
+            (9, 0) => ('9', '0'),
             _ => version_error(),
         };
 
@@ -544,7 +545,7 @@
         "
 
 This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
-through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
+through 2.9.0, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "
diff -Nru cargo-0.32.0/vendor/openssl-sys/.cargo-checksum.json cargo-0.33.0/vendor/openssl-sys/.cargo-checksum.json
--- cargo-0.32.0/vendor/openssl-sys/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"278c1ad40a89aa1e741a1eed089a2f60b18fab8089c3139b542140fc7d674106"}
\ No newline at end of file
+{"files":{},"package":"1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/openssl-sys/Cargo.toml cargo-0.33.0/vendor/openssl-sys/Cargo.toml
--- cargo-0.32.0/vendor/openssl-sys/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "openssl-sys"
-version = "0.9.39"
+version = "0.9.40"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Steven Fackler <sfackler@gmail.com>"]
 build = "build/main.rs"
 links = "openssl"
diff -Nru cargo-0.32.0/vendor/openssl-sys/debian/patches/disable-vendor.patch cargo-0.33.0/vendor/openssl-sys/debian/patches/disable-vendor.patch
--- cargo-0.32.0/vendor/openssl-sys/debian/patches/disable-vendor.patch	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/debian/patches/disable-vendor.patch	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,5 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
+--- a/Cargo.toml	2018-09-03 21:17:45.506177066 -0700
++++ b/Cargo.toml	2018-09-03 21:18:00.573513575 -0700
 @@ -28,14 +28,11 @@
  [build-dependencies.cc]
  version = "1.0"
diff -Nru cargo-0.32.0/vendor/openssl-sys/.pc/disable-vendor.patch/Cargo.toml cargo-0.33.0/vendor/openssl-sys/.pc/disable-vendor.patch/Cargo.toml
--- cargo-0.32.0/vendor/openssl-sys/.pc/disable-vendor.patch/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/.pc/disable-vendor.patch/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "openssl-sys"
-version = "0.9.39"
+version = "0.9.40"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Steven Fackler <sfackler@gmail.com>"]
 build = "build/main.rs"
 links = "openssl"
diff -Nru cargo-0.32.0/vendor/openssl-sys/src/evp.rs cargo-0.33.0/vendor/openssl-sys/src/evp.rs
--- cargo-0.32.0/vendor/openssl-sys/src/evp.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/src/evp.rs	2019-02-06 04:11:58.000000000 +0000
@@ -53,6 +53,8 @@
     pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
     pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int;
     pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
+    #[cfg(ossl111)]
+    pub fn EVP_DigestFinalXOF(ctx: *mut EVP_MD_CTX, res: *mut u8, len: usize) -> c_int;
 
     pub fn EVP_BytesToKey(
         typ: *const EVP_CIPHER,
@@ -148,6 +150,18 @@
     pub fn EVP_sha256() -> *const EVP_MD;
     pub fn EVP_sha384() -> *const EVP_MD;
     pub fn EVP_sha512() -> *const EVP_MD;
+    #[cfg(ossl111)]
+    pub fn EVP_sha3_224() -> *const EVP_MD;
+    #[cfg(ossl111)]
+    pub fn EVP_sha3_256() -> *const EVP_MD;
+    #[cfg(ossl111)]
+    pub fn EVP_sha3_384() -> *const EVP_MD;
+    #[cfg(ossl111)]
+    pub fn EVP_sha3_512() -> *const EVP_MD;
+    #[cfg(ossl111)]
+    pub fn EVP_shake128() -> *const EVP_MD;
+    #[cfg(ossl111)]
+    pub fn EVP_shake256() -> *const EVP_MD;
     pub fn EVP_ripemd160() -> *const EVP_MD;
     pub fn EVP_des_ecb() -> *const EVP_CIPHER;
     pub fn EVP_des_ede3() -> *const EVP_CIPHER;
diff -Nru cargo-0.32.0/vendor/openssl-sys/src/rand.rs cargo-0.33.0/vendor/openssl-sys/src/rand.rs
--- cargo-0.32.0/vendor/openssl-sys/src/rand.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/openssl-sys/src/rand.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2,5 +2,9 @@
 
 extern "C" {
     pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int;
+
+    #[cfg(ossl111)]
+    pub fn RAND_keep_random_devices_open(keep: c_int);
+
     pub fn RAND_status() -> c_int;
 }
diff -Nru cargo-0.32.0/vendor/owning_ref/.cargo-checksum.json cargo-0.33.0/vendor/owning_ref/.cargo-checksum.json
--- cargo-0.32.0/vendor/owning_ref/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/owning_ref/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/owning_ref/Cargo.toml cargo-0.33.0/vendor/owning_ref/Cargo.toml
--- cargo-0.32.0/vendor/owning_ref/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/owning_ref/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "owning_ref"
-version = "0.4.0"
-authors = ["Marvin Löbel <loebel.marvin@gmail.com>"]
-description = "A library for creating references that carry their owner with them."
-documentation = "http://kimundi.github.io/owning-ref-rs/owning_ref/index.html"
-readme = "README.md"
-keywords = ["reference", "sibling", "field", "owning"]
-license = "MIT"
-repository = "https://github.com/Kimundi/owning-ref-rs"
-[dependencies.stable_deref_trait]
-version = "1.0.0"
diff -Nru cargo-0.32.0/vendor/owning_ref/LICENSE cargo-0.33.0/vendor/owning_ref/LICENSE
--- cargo-0.32.0/vendor/owning_ref/LICENSE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/owning_ref/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Marvin Löbel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff -Nru cargo-0.32.0/vendor/owning_ref/README.md cargo-0.33.0/vendor/owning_ref/README.md
--- cargo-0.32.0/vendor/owning_ref/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/owning_ref/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-owning-ref-rs
-==============
-
-A library for creating references that carry their owner with them.
-
-This can sometimes be useful because Rust borrowing rules normally prevent
-moving a type that has been borrowed from. For example, this kind of code gets rejected:
-
-```rust
-fn return_owned_and_referenced<'a>() -> (Vec<u8>, &'a [u8]) {
-    let v = vec![1, 2, 3, 4];
-    let s = &v[1..3];
-    (v, s)
-}
-```
-
-This library enables this safe usage by keeping the owner and the reference
-bundled together in a wrapper type that ensure that lifetime constraint:
-
-```rust
-fn return_owned_and_referenced() -> OwningRef<Vec<u8>, [u8]> {
-    let v = vec![1, 2, 3, 4];
-    let or = OwningRef::new(v);
-    let or = or.map(|v| &v[1..3]);
-    or
-}
-```
-
-[![Travis-CI Status](https://travis-ci.org/Kimundi/owning-ref-rs.png?branch=master)](https://travis-ci.org/Kimundi/owning-ref-rs)
-
-# Getting Started
-
-[owning-ref-rs is available on crates.io](https://crates.io/crates/owning_ref).
-It is recommended to look there for the newest released version, as well as links to the newest builds of the docs.
-
-At the point of the last update of this README, the latest published version could be used like this:
-
-Add the following dependency to your Cargo manifest...
-
-```toml
-[dependencies]
-owning_ref = "0.3"
-```
-
-...and see the [docs](http://kimundi.github.io/owning-ref-rs/owning_ref/index.html) for how to use it.
-
-# Example
-
-```rust
-extern crate owning_ref;
-use owning_ref::BoxRef;
-
-fn main() {
-    // Create an array owned by a Box.
-    let arr = Box::new([1, 2, 3, 4]) as Box<[i32]>;
-
-    // Transfer into a BoxRef.
-    let arr: BoxRef<[i32]> = BoxRef::new(arr);
-    assert_eq!(&*arr, &[1, 2, 3, 4]);
-
-    // We can slice the array without losing ownership or changing type.
-    let arr: BoxRef<[i32]> = arr.map(|arr| &arr[1..3]);
-    assert_eq!(&*arr, &[2, 3]);
-
-    // Also works for Arc, Rc, String and Vec!
-}
-```
diff -Nru cargo-0.32.0/vendor/owning_ref/src/lib.rs cargo-0.33.0/vendor/owning_ref/src/lib.rs
--- cargo-0.32.0/vendor/owning_ref/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/owning_ref/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1918 +0,0 @@
-#![warn(missing_docs)]
-
-/*!
-# An owning reference.
-
-This crate provides the _owning reference_ types `OwningRef` and `OwningRefMut`
-that enables it to bundle a reference together with the owner of the data it points to.
-This allows moving and dropping of a `OwningRef` without needing to recreate the reference.
-
-This can sometimes be useful because Rust borrowing rules normally prevent
-moving a type that has been moved from. For example, this kind of code gets rejected:
-
-```rust,ignore
-fn return_owned_and_referenced<'a>() -> (Vec<u8>, &'a [u8]) {
-    let v = vec![1, 2, 3, 4];
-    let s = &v[1..3];
-    (v, s)
-}
-```
-
-Even though, from a memory-layout point of view, this can be entirely safe
-if the new location of the vector still lives longer than the lifetime `'a`
-of the reference because the backing allocation of the vector does not change.
-
-This library enables this safe usage by keeping the owner and the reference
-bundled together in a wrapper type that ensure that lifetime constraint:
-
-```rust
-# extern crate owning_ref;
-# use owning_ref::OwningRef;
-# fn main() {
-fn return_owned_and_referenced() -> OwningRef<Vec<u8>, [u8]> {
-    let v = vec![1, 2, 3, 4];
-    let or = OwningRef::new(v);
-    let or = or.map(|v| &v[1..3]);
-    or
-}
-# }
-```
-
-It works by requiring owner types to dereference to stable memory locations
-and preventing mutable access to root containers, which in practice requires heap allocation
-as provided by `Box<T>`, `Rc<T>`, etc.
-
-Also provided are typedefs for common owner type combinations,
-which allow for less verbose type signatures. For example, `BoxRef<T>` instead of `OwningRef<Box<T>, T>`.
-
-The crate also provides the more advanced `OwningHandle` type,
-which allows more freedom in bundling a dependent handle object
-along with the data it depends on, at the cost of some unsafe needed in the API.
-See the documentation around `OwningHandle` for more details.
-
-# Examples
-
-## Basics
-
-```
-extern crate owning_ref;
-use owning_ref::BoxRef;
-
-fn main() {
-    // Create an array owned by a Box.
-    let arr = Box::new([1, 2, 3, 4]) as Box<[i32]>;
-
-    // Transfer into a BoxRef.
-    let arr: BoxRef<[i32]> = BoxRef::new(arr);
-    assert_eq!(&*arr, &[1, 2, 3, 4]);
-
-    // We can slice the array without losing ownership or changing type.
-    let arr: BoxRef<[i32]> = arr.map(|arr| &arr[1..3]);
-    assert_eq!(&*arr, &[2, 3]);
-
-    // Also works for Arc, Rc, String and Vec!
-}
-```
-
-## Caching a reference to a struct field
-
-```
-extern crate owning_ref;
-use owning_ref::BoxRef;
-
-fn main() {
-    struct Foo {
-        tag: u32,
-        x: u16,
-        y: u16,
-        z: u16,
-    }
-    let foo = Foo { tag: 1, x: 100, y: 200, z: 300 };
-
-    let or = BoxRef::new(Box::new(foo)).map(|foo| {
-        match foo.tag {
-            0 => &foo.x,
-            1 => &foo.y,
-            2 => &foo.z,
-            _ => panic!(),
-        }
-    });
-
-    assert_eq!(*or, 200);
-}
-```
-
-## Caching a reference to an entry in a vector
-
-```
-extern crate owning_ref;
-use owning_ref::VecRef;
-
-fn main() {
-    let v = VecRef::new(vec![1, 2, 3, 4, 5]).map(|v| &v[3]);
-    assert_eq!(*v, 4);
-}
-```
-
-## Caching a subslice of a String
-
-```
-extern crate owning_ref;
-use owning_ref::StringRef;
-
-fn main() {
-    let s = StringRef::new("hello world".to_owned())
-        .map(|s| s.split(' ').nth(1).unwrap());
-
-    assert_eq!(&*s, "world");
-}
-```
-
-## Reference counted slices that share ownership of the backing storage
-
-```
-extern crate owning_ref;
-use owning_ref::RcRef;
-use std::rc::Rc;
-
-fn main() {
-    let rc: RcRef<[i32]> = RcRef::new(Rc::new([1, 2, 3, 4]) as Rc<[i32]>);
-    assert_eq!(&*rc, &[1, 2, 3, 4]);
-
-    let rc_a: RcRef<[i32]> = rc.clone().map(|s| &s[0..2]);
-    let rc_b = rc.clone().map(|s| &s[1..3]);
-    let rc_c = rc.clone().map(|s| &s[2..4]);
-    assert_eq!(&*rc_a, &[1, 2]);
-    assert_eq!(&*rc_b, &[2, 3]);
-    assert_eq!(&*rc_c, &[3, 4]);
-
-    let rc_c_a = rc_c.clone().map(|s| &s[1]);
-    assert_eq!(&*rc_c_a, &4);
-}
-```
-
-## Atomic reference counted slices that share ownership of the backing storage
-
-```
-extern crate owning_ref;
-use owning_ref::ArcRef;
-use std::sync::Arc;
-
-fn main() {
-    use std::thread;
-
-    fn par_sum(rc: ArcRef<[i32]>) -> i32 {
-        if rc.len() == 0 {
-            return 0;
-        } else if rc.len() == 1 {
-            return rc[0];
-        }
-        let mid = rc.len() / 2;
-        let left = rc.clone().map(|s| &s[..mid]);
-        let right = rc.map(|s| &s[mid..]);
-
-        let left = thread::spawn(move || par_sum(left));
-        let right = thread::spawn(move || par_sum(right));
-
-        left.join().unwrap() + right.join().unwrap()
-    }
-
-    let rc: Arc<[i32]> = Arc::new([1, 2, 3, 4]);
-    let rc: ArcRef<[i32]> = rc.into();
-
-    assert_eq!(par_sum(rc), 10);
-}
-```
-
-## References into RAII locks
-
-```
-extern crate owning_ref;
-use owning_ref::RefRef;
-use std::cell::{RefCell, Ref};
-
-fn main() {
-    let refcell = RefCell::new((1, 2, 3, 4));
-    // Also works with Mutex and RwLock
-
-    let refref = {
-        let refref = RefRef::new(refcell.borrow()).map(|x| &x.3);
-        assert_eq!(*refref, 4);
-
-        // We move the RAII lock and the reference to one of
-        // the subfields in the data it guards here:
-        refref
-    };
-
-    assert_eq!(*refref, 4);
-
-    drop(refref);
-
-    assert_eq!(*refcell.borrow(), (1, 2, 3, 4));
-}
-```
-
-## Mutable reference
-
-When the owned container implements `DerefMut`, it is also possible to make
-a _mutable owning reference_. (E.g. with `Box`, `RefMut`, `MutexGuard`)
-
-```
-extern crate owning_ref;
-use owning_ref::RefMutRefMut;
-use std::cell::{RefCell, RefMut};
-
-fn main() {
-    let refcell = RefCell::new((1, 2, 3, 4));
-
-    let mut refmut_refmut = {
-        let mut refmut_refmut = RefMutRefMut::new(refcell.borrow_mut()).map_mut(|x| &mut x.3);
-        assert_eq!(*refmut_refmut, 4);
-        *refmut_refmut *= 2;
-
-        refmut_refmut
-    };
-
-    assert_eq!(*refmut_refmut, 8);
-    *refmut_refmut *= 2;
-
-    drop(refmut_refmut);
-
-    assert_eq!(*refcell.borrow(), (1, 2, 3, 16));
-}
-```
-*/
-
-extern crate stable_deref_trait;
-pub use stable_deref_trait::{StableDeref as StableAddress, CloneStableDeref as CloneStableAddress};
-
-/// An owning reference.
-///
-/// This wraps an owner `O` and a reference `&T` pointing
-/// at something reachable from `O::Target` while keeping
-/// the ability to move `self` around.
-///
-/// The owner is usually a pointer that points at some base type.
-///
-/// For more details and examples, see the module and method docs.
-pub struct OwningRef<O, T: ?Sized> {
-    owner: O,
-    reference: *const T,
-}
-
-/// An mutable owning reference.
-///
-/// This wraps an owner `O` and a reference `&mut T` pointing
-/// at something reachable from `O::Target` while keeping
-/// the ability to move `self` around.
-///
-/// The owner is usually a pointer that points at some base type.
-///
-/// For more details and examples, see the module and method docs.
-pub struct OwningRefMut<O, T: ?Sized> {
-    owner: O,
-    reference: *mut T,
-}
-
-/// Helper trait for an erased concrete type an owner dereferences to.
-/// This is used in form of a trait object for keeping
-/// something around to (virtually) call the destructor.
-pub trait Erased {}
-impl<T> Erased for T {}
-
-/// Helper trait for erasing the concrete type of what an owner derferences to,
-/// for example `Box<T> -> Box<Erased>`. This would be unneeded with
-/// higher kinded types support in the language.
-pub unsafe trait IntoErased<'a> {
-    /// Owner with the dereference type substituted to `Erased`.
-    type Erased;
-    /// Perform the type erasure.
-    fn into_erased(self) -> Self::Erased;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// OwningRef
-/////////////////////////////////////////////////////////////////////////////
-
-impl<O, T: ?Sized> OwningRef<O, T> {
-    /// Creates a new owning reference from a owner
-    /// initialized to the direct dereference of it.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRef;
-    ///
-    /// fn main() {
-    ///     let owning_ref = OwningRef::new(Box::new(42));
-    ///     assert_eq!(*owning_ref, 42);
-    /// }
-    /// ```
-    pub fn new(o: O) -> Self
-        where O: StableAddress,
-              O: Deref<Target = T>,
-    {
-        OwningRef {
-            reference: &*o,
-            owner: o,
-        }
-    }
-
-    /// Like `new`, but doesn’t require `O` to implement the `StableAddress` trait.
-    /// Instead, the caller is responsible to make the same promises as implementing the trait.
-    ///
-    /// This is useful for cases where coherence rules prevents implementing the trait
-    /// without adding a dependency to this crate in a third-party library.
-    pub unsafe fn new_assert_stable_address(o: O) -> Self
-        where O: Deref<Target = T>,
-    {
-        OwningRef {
-            reference: &*o,
-            owner: o,
-        }
-    }
-
-    /// Converts `self` into a new owning reference that points at something reachable
-    /// from the previous one.
-    ///
-    /// This can be a reference to a field of `U`, something reachable from a field of
-    /// `U`, or even something unrelated with a `'static` lifetime.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRef;
-    ///
-    /// fn main() {
-    ///     let owning_ref = OwningRef::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     // create a owning reference that points at the
-    ///     // third element of the array.
-    ///     let owning_ref = owning_ref.map(|array| &array[2]);
-    ///     assert_eq!(*owning_ref, 3);
-    /// }
-    /// ```
-    pub fn map<F, U: ?Sized>(self, f: F) -> OwningRef<O, U>
-        where O: StableAddress,
-              F: FnOnce(&T) -> &U
-    {
-        OwningRef {
-            reference: f(&self),
-            owner: self.owner,
-        }
-    }
-
-    /// Tries to convert `self` into a new owning reference that points
-    /// at something reachable from the previous one.
-    ///
-    /// This can be a reference to a field of `U`, something reachable from a field of
-    /// `U`, or even something unrelated with a `'static` lifetime.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRef;
-    ///
-    /// fn main() {
-    ///     let owning_ref = OwningRef::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     // create a owning reference that points at the
-    ///     // third element of the array.
-    ///     let owning_ref = owning_ref.try_map(|array| {
-    ///         if array[2] == 3 { Ok(&array[2]) } else { Err(()) }
-    ///     });
-    ///     assert_eq!(*owning_ref.unwrap(), 3);
-    /// }
-    /// ```
-    pub fn try_map<F, U: ?Sized, E>(self, f: F) -> Result<OwningRef<O, U>, E>
-        where O: StableAddress,
-              F: FnOnce(&T) -> Result<&U, E>
-    {
-        Ok(OwningRef {
-            reference: f(&self)?,
-            owner: self.owner,
-        })
-    }
-
-    /// Converts `self` into a new owning reference with a different owner type.
-    ///
-    /// The new owner type needs to still contain the original owner in some way
-    /// so that the reference into it remains valid. This function is marked unsafe
-    /// because the user needs to manually uphold this guarantee.
-    pub unsafe fn map_owner<F, P>(self, f: F) -> OwningRef<P, T>
-        where O: StableAddress,
-              P: StableAddress,
-              F: FnOnce(O) -> P
-    {
-        OwningRef {
-            reference: self.reference,
-            owner: f(self.owner),
-        }
-    }
-
-    /// Converts `self` into a new owning reference where the owner is wrapped
-    /// in an additional `Box<O>`.
-    ///
-    /// This can be used to safely erase the owner of any `OwningRef<O, T>`
-    /// to a `OwningRef<Box<Erased>, T>`.
-    pub fn map_owner_box(self) -> OwningRef<Box<O>, T> {
-        OwningRef {
-            reference: self.reference,
-            owner: Box::new(self.owner),
-        }
-    }
-
-    /// Erases the concrete base type of the owner with a trait object.
-    ///
-    /// This allows mixing of owned references with different owner base types.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::{OwningRef, Erased};
-    ///
-    /// fn main() {
-    ///     // NB: Using the concrete types here for explicitnes.
-    ///     // For less verbose code type aliases like `BoxRef` are provided.
-    ///
-    ///     let owning_ref_a: OwningRef<Box<[i32; 4]>, [i32; 4]>
-    ///         = OwningRef::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     let owning_ref_b: OwningRef<Box<Vec<(i32, bool)>>, Vec<(i32, bool)>>
-    ///         = OwningRef::new(Box::new(vec![(0, false), (1, true)]));
-    ///
-    ///     let owning_ref_a: OwningRef<Box<[i32; 4]>, i32>
-    ///         = owning_ref_a.map(|a| &a[0]);
-    ///
-    ///     let owning_ref_b: OwningRef<Box<Vec<(i32, bool)>>, i32>
-    ///         = owning_ref_b.map(|a| &a[1].0);
-    ///
-    ///     let owning_refs: [OwningRef<Box<Erased>, i32>; 2]
-    ///         = [owning_ref_a.erase_owner(), owning_ref_b.erase_owner()];
-    ///
-    ///     assert_eq!(*owning_refs[0], 1);
-    ///     assert_eq!(*owning_refs[1], 1);
-    /// }
-    /// ```
-    pub fn erase_owner<'a>(self) -> OwningRef<O::Erased, T>
-        where O: IntoErased<'a>,
-    {
-        OwningRef {
-            reference: self.reference,
-            owner: self.owner.into_erased(),
-        }
-    }
-
-    // TODO: wrap_owner
-
-    /// A reference to the underlying owner.
-    pub fn as_owner(&self) -> &O {
-        &self.owner
-    }
-
-    /// Discards the reference and retrieves the owner.
-    pub fn into_owner(self) -> O {
-        self.owner
-    }
-}
-
-impl<O, T: ?Sized> OwningRefMut<O, T> {
-    /// Creates a new owning reference from a owner
-    /// initialized to the direct dereference of it.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRefMut;
-    ///
-    /// fn main() {
-    ///     let owning_ref_mut = OwningRefMut::new(Box::new(42));
-    ///     assert_eq!(*owning_ref_mut, 42);
-    /// }
-    /// ```
-    pub fn new(mut o: O) -> Self
-        where O: StableAddress,
-              O: DerefMut<Target = T>,
-    {
-        OwningRefMut {
-            reference: &mut *o,
-            owner: o,
-        }
-    }
-
-    /// Like `new`, but doesn’t require `O` to implement the `StableAddress` trait.
-    /// Instead, the caller is responsible to make the same promises as implementing the trait.
-    ///
-    /// This is useful for cases where coherence rules prevents implementing the trait
-    /// without adding a dependency to this crate in a third-party library.
-    pub unsafe fn new_assert_stable_address(mut o: O) -> Self
-        where O: DerefMut<Target = T>,
-    {
-        OwningRefMut {
-            reference: &mut *o,
-            owner: o,
-        }
-    }
-
-    /// Converts `self` into a new _shared_ owning reference that points at
-    /// something reachable from the previous one.
-    ///
-    /// This can be a reference to a field of `U`, something reachable from a field of
-    /// `U`, or even something unrelated with a `'static` lifetime.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRefMut;
-    ///
-    /// fn main() {
-    ///     let owning_ref_mut = OwningRefMut::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     // create a owning reference that points at the
-    ///     // third element of the array.
-    ///     let owning_ref = owning_ref_mut.map(|array| &array[2]);
-    ///     assert_eq!(*owning_ref, 3);
-    /// }
-    /// ```
-    pub fn map<F, U: ?Sized>(mut self, f: F) -> OwningRef<O, U>
-        where O: StableAddress,
-              F: FnOnce(&mut T) -> &U
-    {
-        OwningRef {
-            reference: f(&mut self),
-            owner: self.owner,
-        }
-    }
-
-    /// Converts `self` into a new _mutable_ owning reference that points at
-    /// something reachable from the previous one.
-    ///
-    /// This can be a reference to a field of `U`, something reachable from a field of
-    /// `U`, or even something unrelated with a `'static` lifetime.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRefMut;
-    ///
-    /// fn main() {
-    ///     let owning_ref_mut = OwningRefMut::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     // create a owning reference that points at the
-    ///     // third element of the array.
-    ///     let owning_ref_mut = owning_ref_mut.map_mut(|array| &mut array[2]);
-    ///     assert_eq!(*owning_ref_mut, 3);
-    /// }
-    /// ```
-    pub fn map_mut<F, U: ?Sized>(mut self, f: F) -> OwningRefMut<O, U>
-        where O: StableAddress,
-              F: FnOnce(&mut T) -> &mut U
-    {
-        OwningRefMut {
-            reference: f(&mut self),
-            owner: self.owner,
-        }
-    }
-
-    /// Tries to convert `self` into a new _shared_ owning reference that points
-    /// at something reachable from the previous one.
-    ///
-    /// This can be a reference to a field of `U`, something reachable from a field of
-    /// `U`, or even something unrelated with a `'static` lifetime.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRefMut;
-    ///
-    /// fn main() {
-    ///     let owning_ref_mut = OwningRefMut::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     // create a owning reference that points at the
-    ///     // third element of the array.
-    ///     let owning_ref = owning_ref_mut.try_map(|array| {
-    ///         if array[2] == 3 { Ok(&array[2]) } else { Err(()) }
-    ///     });
-    ///     assert_eq!(*owning_ref.unwrap(), 3);
-    /// }
-    /// ```
-    pub fn try_map<F, U: ?Sized, E>(mut self, f: F) -> Result<OwningRef<O, U>, E>
-        where O: StableAddress,
-              F: FnOnce(&mut T) -> Result<&U, E>
-    {
-        Ok(OwningRef {
-            reference: f(&mut self)?,
-            owner: self.owner,
-        })
-    }
-
-    /// Tries to convert `self` into a new _mutable_ owning reference that points
-    /// at something reachable from the previous one.
-    ///
-    /// This can be a reference to a field of `U`, something reachable from a field of
-    /// `U`, or even something unrelated with a `'static` lifetime.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::OwningRefMut;
-    ///
-    /// fn main() {
-    ///     let owning_ref_mut = OwningRefMut::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     // create a owning reference that points at the
-    ///     // third element of the array.
-    ///     let owning_ref_mut = owning_ref_mut.try_map_mut(|array| {
-    ///         if array[2] == 3 { Ok(&mut array[2]) } else { Err(()) }
-    ///     });
-    ///     assert_eq!(*owning_ref_mut.unwrap(), 3);
-    /// }
-    /// ```
-    pub fn try_map_mut<F, U: ?Sized, E>(mut self, f: F) -> Result<OwningRefMut<O, U>, E>
-        where O: StableAddress,
-              F: FnOnce(&mut T) -> Result<&mut U, E>
-    {
-        Ok(OwningRefMut {
-            reference: f(&mut self)?,
-            owner: self.owner,
-        })
-    }
-
-    /// Converts `self` into a new owning reference with a different owner type.
-    ///
-    /// The new owner type needs to still contain the original owner in some way
-    /// so that the reference into it remains valid. This function is marked unsafe
-    /// because the user needs to manually uphold this guarantee.
-    pub unsafe fn map_owner<F, P>(self, f: F) -> OwningRefMut<P, T>
-        where O: StableAddress,
-              P: StableAddress,
-              F: FnOnce(O) -> P
-    {
-        OwningRefMut {
-            reference: self.reference,
-            owner: f(self.owner),
-        }
-    }
-
-    /// Converts `self` into a new owning reference where the owner is wrapped
-    /// in an additional `Box<O>`.
-    ///
-    /// This can be used to safely erase the owner of any `OwningRefMut<O, T>`
-    /// to a `OwningRefMut<Box<Erased>, T>`.
-    pub fn map_owner_box(self) -> OwningRefMut<Box<O>, T> {
-        OwningRefMut {
-            reference: self.reference,
-            owner: Box::new(self.owner),
-        }
-    }
-
-    /// Erases the concrete base type of the owner with a trait object.
-    ///
-    /// This allows mixing of owned references with different owner base types.
-    ///
-    /// # Example
-    /// ```
-    /// extern crate owning_ref;
-    /// use owning_ref::{OwningRefMut, Erased};
-    ///
-    /// fn main() {
-    ///     // NB: Using the concrete types here for explicitnes.
-    ///     // For less verbose code type aliases like `BoxRef` are provided.
-    ///
-    ///     let owning_ref_mut_a: OwningRefMut<Box<[i32; 4]>, [i32; 4]>
-    ///         = OwningRefMut::new(Box::new([1, 2, 3, 4]));
-    ///
-    ///     let owning_ref_mut_b: OwningRefMut<Box<Vec<(i32, bool)>>, Vec<(i32, bool)>>
-    ///         = OwningRefMut::new(Box::new(vec![(0, false), (1, true)]));
-    ///
-    ///     let owning_ref_mut_a: OwningRefMut<Box<[i32; 4]>, i32>
-    ///         = owning_ref_mut_a.map_mut(|a| &mut a[0]);
-    ///
-    ///     let owning_ref_mut_b: OwningRefMut<Box<Vec<(i32, bool)>>, i32>
-    ///         = owning_ref_mut_b.map_mut(|a| &mut a[1].0);
-    ///
-    ///     let owning_refs_mut: [OwningRefMut<Box<Erased>, i32>; 2]
-    ///         = [owning_ref_mut_a.erase_owner(), owning_ref_mut_b.erase_owner()];
-    ///
-    ///     assert_eq!(*owning_refs_mut[0], 1);
-    ///     assert_eq!(*owning_refs_mut[1], 1);
-    /// }
-    /// ```
-    pub fn erase_owner<'a>(self) -> OwningRefMut<O::Erased, T>
-        where O: IntoErased<'a>,
-    {
-        OwningRefMut {
-            reference: self.reference,
-            owner: self.owner.into_erased(),
-        }
-    }
-
-    // TODO: wrap_owner
-
-    /// A reference to the underlying owner.
-    pub fn as_owner(&self) -> &O {
-        &self.owner
-    }
-
-    /// A mutable reference to the underlying owner.
-    pub fn as_owner_mut(&mut self) -> &mut O {
-        &mut self.owner
-    }
-
-    /// Discards the reference and retrieves the owner.
-    pub fn into_owner(self) -> O {
-        self.owner
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// OwningHandle
-/////////////////////////////////////////////////////////////////////////////
-
-use std::ops::{Deref, DerefMut};
-
-/// `OwningHandle` is a complement to `OwningRef`. Where `OwningRef` allows
-/// consumers to pass around an owned object and a dependent reference,
-/// `OwningHandle` contains an owned object and a dependent _object_.
-///
-/// `OwningHandle` can encapsulate a `RefMut` along with its associated
-/// `RefCell`, or an `RwLockReadGuard` along with its associated `RwLock`.
-/// However, the API is completely generic and there are no restrictions on
-/// what types of owning and dependent objects may be used.
-///
-/// `OwningHandle` is created by passing an owner object (which dereferences
-/// to a stable address) along with a callback which receives a pointer to
-/// that stable location. The callback may then dereference the pointer and
-/// mint a dependent object, with the guarantee that the returned object will
-/// not outlive the referent of the pointer.
-///
-/// Since the callback needs to dereference a raw pointer, it requires `unsafe`
-/// code. To avoid forcing this unsafety on most callers, the `ToHandle` trait is
-/// implemented for common data structures. Types that implement `ToHandle` can
-/// be wrapped into an `OwningHandle` without passing a callback.
-pub struct OwningHandle<O, H>
-    where O: StableAddress, H: Deref,
-{
-    handle: H,
-    _owner: O,
-}
-
-impl<O, H> Deref for OwningHandle<O, H>
-    where O: StableAddress, H: Deref,
-{
-    type Target = H::Target;
-    fn deref(&self) -> &H::Target {
-        self.handle.deref()
-    }
-}
-
-unsafe impl<O, H> StableAddress for OwningHandle<O, H>
-    where O: StableAddress, H: StableAddress,
-{}
-
-impl<O, H> DerefMut for OwningHandle<O, H>
-    where O: StableAddress, H: DerefMut,
-{
-    fn deref_mut(&mut self) -> &mut H::Target {
-        self.handle.deref_mut()
-    }
-}
-
-/// Trait to implement the conversion of owner to handle for common types.
-pub trait ToHandle {
-    /// The type of handle to be encapsulated by the OwningHandle.
-    type Handle: Deref;
-
-    /// Given an appropriately-long-lived pointer to ourselves, create a
-    /// handle to be encapsulated by the `OwningHandle`.
-    unsafe fn to_handle(x: *const Self) -> Self::Handle;
-}
-
-/// Trait to implement the conversion of owner to mutable handle for common types.
-pub trait ToHandleMut {
-    /// The type of handle to be encapsulated by the OwningHandle.
-    type HandleMut: DerefMut;
-
-    /// Given an appropriately-long-lived pointer to ourselves, create a
-    /// mutable handle to be encapsulated by the `OwningHandle`.
-    unsafe fn to_handle_mut(x: *const Self) -> Self::HandleMut;
-}
-
-impl<O, H> OwningHandle<O, H>
-    where O: StableAddress, O::Target: ToHandle<Handle = H>, H: Deref,
-{
-    /// Create a new `OwningHandle` for a type that implements `ToHandle`. For types
-    /// that don't implement `ToHandle`, callers may invoke `new_with_fn`, which accepts
-    /// a callback to perform the conversion.
-    pub fn new(o: O) -> Self {
-        OwningHandle::new_with_fn(o, |x| unsafe { O::Target::to_handle(x) })
-    }
-}
-
-impl<O, H> OwningHandle<O, H>
-    where O: StableAddress, O::Target: ToHandleMut<HandleMut = H>, H: DerefMut,
-{
-    /// Create a new mutable `OwningHandle` for a type that implements `ToHandleMut`.
-    pub fn new_mut(o: O) -> Self {
-        OwningHandle::new_with_fn(o, |x| unsafe { O::Target::to_handle_mut(x) })
-    }
-}
-
-impl<O, H> OwningHandle<O, H>
-    where O: StableAddress, H: Deref,
-{
-    /// Create a new OwningHandle. The provided callback will be invoked with
-    /// a pointer to the object owned by `o`, and the returned value is stored
-    /// as the object to which this `OwningHandle` will forward `Deref` and
-    /// `DerefMut`.
-    pub fn new_with_fn<F>(o: O, f: F) -> Self
-        where F: FnOnce(*const O::Target) -> H
-    {
-        let h: H;
-        {
-            h = f(o.deref() as *const O::Target);
-        }
-
-        OwningHandle {
-          handle: h,
-          _owner: o,
-        }
-    }
-
-    /// Create a new OwningHandle. The provided callback will be invoked with
-    /// a pointer to the object owned by `o`, and the returned value is stored
-    /// as the object to which this `OwningHandle` will forward `Deref` and
-    /// `DerefMut`.
-    pub fn try_new<F, E>(o: O, f: F) -> Result<Self, E>
-        where F: FnOnce(*const O::Target) -> Result<H, E>
-    {
-        let h: H;
-        {
-            h = f(o.deref() as *const O::Target)?;
-        }
-
-        Ok(OwningHandle {
-          handle: h,
-          _owner: o,
-        })
-    }
-
-    /// A getter for the underlying owner.
-    pub fn as_owner(&self) -> &O {
-        &self._owner
-    }
-
-    /// Discards the dependent object and returns the owner.
-    pub fn into_owner(self) -> O {
-        self._owner
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// std traits
-/////////////////////////////////////////////////////////////////////////////
-
-use std::convert::From;
-use std::fmt::{self, Debug};
-use std::marker::{Send, Sync};
-use std::cmp::{Eq, PartialEq, Ord, PartialOrd, Ordering};
-use std::hash::{Hash, Hasher};
-use std::borrow::Borrow;
-
-impl<O, T: ?Sized> Deref for OwningRef<O, T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        unsafe {
-            &*self.reference
-        }
-    }
-}
-
-impl<O, T: ?Sized> Deref for OwningRefMut<O, T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        unsafe {
-            &*self.reference
-        }
-    }
-}
-
-impl<O, T: ?Sized> DerefMut for OwningRefMut<O, T> {
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe {
-            &mut *self.reference
-        }
-    }
-}
-
-unsafe impl<O, T: ?Sized> StableAddress for OwningRef<O, T> {}
-
-unsafe impl<O, T: ?Sized> StableAddress for OwningRefMut<O, T> {}
-
-impl<O, T: ?Sized> AsRef<T> for OwningRef<O, T> {
-    fn as_ref(&self) -> &T {
-        &*self
-    }
-}
-
-impl<O, T: ?Sized> AsRef<T> for OwningRefMut<O, T> {
-    fn as_ref(&self) -> &T {
-        &*self
-    }
-}
-
-impl<O, T: ?Sized> AsMut<T> for OwningRefMut<O, T> {
-    fn as_mut(&mut self) -> &mut T {
-        &mut *self
-    }
-}
-
-impl<O, T: ?Sized> Borrow<T> for OwningRef<O, T> {
-    fn borrow(&self) -> &T {
-        &*self
-    }
-}
-
-impl<O, T: ?Sized> From<O> for OwningRef<O, T>
-    where O: StableAddress,
-          O: Deref<Target = T>,
-{
-    fn from(owner: O) -> Self {
-        OwningRef::new(owner)
-    }
-}
-
-impl<O, T: ?Sized> From<O> for OwningRefMut<O, T>
-    where O: StableAddress,
-          O: DerefMut<Target = T>
-{
-    fn from(owner: O) -> Self {
-        OwningRefMut::new(owner)
-    }
-}
-
-impl<O, T: ?Sized> From<OwningRefMut<O, T>> for OwningRef<O, T>
-    where O: StableAddress,
-          O: DerefMut<Target = T>
-{
-    fn from(other: OwningRefMut<O, T>) -> Self {
-        OwningRef {
-            owner: other.owner,
-            reference: other.reference,
-        }
-    }
-}
-
-// ^ FIXME: Is a Into impl for calling into_owner() possible as well?
-
-impl<O, T: ?Sized> Debug for OwningRef<O, T>
-    where O: Debug,
-          T: Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f,
-               "OwningRef {{ owner: {:?}, reference: {:?} }}",
-               self.as_owner(),
-               &**self)
-    }
-}
-
-impl<O, T: ?Sized> Debug for OwningRefMut<O, T>
-    where O: Debug,
-          T: Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f,
-               "OwningRefMut {{ owner: {:?}, reference: {:?} }}",
-               self.as_owner(),
-               &**self)
-    }
-}
-
-impl<O, T: ?Sized> Clone for OwningRef<O, T>
-    where O: CloneStableAddress,
-{
-    fn clone(&self) -> Self {
-        OwningRef {
-            owner: self.owner.clone(),
-            reference: self.reference,
-        }
-    }
-}
-
-unsafe impl<O, T: ?Sized> CloneStableAddress for OwningRef<O, T>
-    where O: CloneStableAddress {}
-
-unsafe impl<O, T: ?Sized> Send for OwningRef<O, T>
-    where O: Send, for<'a> (&'a T): Send {}
-unsafe impl<O, T: ?Sized> Sync for OwningRef<O, T>
-    where O: Sync, for<'a> (&'a T): Sync {}
-
-unsafe impl<O, T: ?Sized> Send for OwningRefMut<O, T>
-    where O: Send, for<'a> (&'a mut T): Send {}
-unsafe impl<O, T: ?Sized> Sync for OwningRefMut<O, T>
-    where O: Sync, for<'a> (&'a mut T): Sync {}
-
-impl Debug for Erased {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "<Erased>",)
-    }
-}
-
-impl<O, T: ?Sized> PartialEq for OwningRef<O, T> where T: PartialEq {
-    fn eq(&self, other: &Self) -> bool {
-        (&*self as &T).eq(&*other as &T)
-     }
-}
-
-impl<O, T: ?Sized> Eq for OwningRef<O, T> where T: Eq {}
-
-impl<O, T: ?Sized> PartialOrd for OwningRef<O, T> where T: PartialOrd {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        (&*self as &T).partial_cmp(&*other as &T)
-    }
-}
-
-impl<O, T: ?Sized> Ord for OwningRef<O, T> where T: Ord {
-    fn cmp(&self, other: &Self) -> Ordering {
-        (&*self as &T).cmp(&*other as &T)
-    }
-}
-
-impl<O, T: ?Sized> Hash for OwningRef<O, T> where T: Hash {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (&*self as &T).hash(state);
-    }
-}
-
-impl<O, T: ?Sized> PartialEq for OwningRefMut<O, T> where T: PartialEq {
-    fn eq(&self, other: &Self) -> bool {
-        (&*self as &T).eq(&*other as &T)
-     }
-}
-
-impl<O, T: ?Sized> Eq for OwningRefMut<O, T> where T: Eq {}
-
-impl<O, T: ?Sized> PartialOrd for OwningRefMut<O, T> where T: PartialOrd {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        (&*self as &T).partial_cmp(&*other as &T)
-    }
-}
-
-impl<O, T: ?Sized> Ord for OwningRefMut<O, T> where T: Ord {
-    fn cmp(&self, other: &Self) -> Ordering {
-        (&*self as &T).cmp(&*other as &T)
-    }
-}
-
-impl<O, T: ?Sized> Hash for OwningRefMut<O, T> where T: Hash {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (&*self as &T).hash(state);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// std types integration and convenience type defs
-/////////////////////////////////////////////////////////////////////////////
-
-use std::boxed::Box;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::sync::{MutexGuard, RwLockReadGuard, RwLockWriteGuard};
-use std::cell::{Ref, RefCell, RefMut};
-
-impl<T: 'static> ToHandle for RefCell<T> {
-    type Handle = Ref<'static, T>;
-    unsafe fn to_handle(x: *const Self) -> Self::Handle { (*x).borrow() }
-}
-
-impl<T: 'static> ToHandleMut for RefCell<T> {
-    type HandleMut = RefMut<'static, T>;
-    unsafe fn to_handle_mut(x: *const Self) -> Self::HandleMut { (*x).borrow_mut() }
-}
-
-// NB: Implementing ToHandle{,Mut} for Mutex and RwLock requires a decision
-// about which handle creation to use (i.e. read() vs try_read()) as well as
-// what to do with error results.
-
-/// Typedef of a owning reference that uses a `Box` as the owner.
-pub type BoxRef<T, U = T> = OwningRef<Box<T>, U>;
-/// Typedef of a owning reference that uses a `Vec` as the owner.
-pub type VecRef<T, U = T> = OwningRef<Vec<T>, U>;
-/// Typedef of a owning reference that uses a `String` as the owner.
-pub type StringRef = OwningRef<String, str>;
-
-/// Typedef of a owning reference that uses a `Rc` as the owner.
-pub type RcRef<T, U = T> = OwningRef<Rc<T>, U>;
-/// Typedef of a owning reference that uses a `Arc` as the owner.
-pub type ArcRef<T, U = T> = OwningRef<Arc<T>, U>;
-
-/// Typedef of a owning reference that uses a `Ref` as the owner.
-pub type RefRef<'a, T, U = T> = OwningRef<Ref<'a, T>, U>;
-/// Typedef of a owning reference that uses a `RefMut` as the owner.
-pub type RefMutRef<'a, T, U = T> = OwningRef<RefMut<'a, T>, U>;
-/// Typedef of a owning reference that uses a `MutexGuard` as the owner.
-pub type MutexGuardRef<'a, T, U = T> = OwningRef<MutexGuard<'a, T>, U>;
-/// Typedef of a owning reference that uses a `RwLockReadGuard` as the owner.
-pub type RwLockReadGuardRef<'a, T, U = T> = OwningRef<RwLockReadGuard<'a, T>, U>;
-/// Typedef of a owning reference that uses a `RwLockWriteGuard` as the owner.
-pub type RwLockWriteGuardRef<'a, T, U = T> = OwningRef<RwLockWriteGuard<'a, T>, U>;
-
-/// Typedef of a mutable owning reference that uses a `Box` as the owner.
-pub type BoxRefMut<T, U = T> = OwningRefMut<Box<T>, U>;
-/// Typedef of a mutable owning reference that uses a `Vec` as the owner.
-pub type VecRefMut<T, U = T> = OwningRefMut<Vec<T>, U>;
-/// Typedef of a mutable owning reference that uses a `String` as the owner.
-pub type StringRefMut = OwningRefMut<String, str>;
-
-/// Typedef of a mutable owning reference that uses a `RefMut` as the owner.
-pub type RefMutRefMut<'a, T, U = T> = OwningRefMut<RefMut<'a, T>, U>;
-/// Typedef of a mutable owning reference that uses a `MutexGuard` as the owner.
-pub type MutexGuardRefMut<'a, T, U = T> = OwningRefMut<MutexGuard<'a, T>, U>;
-/// Typedef of a mutable owning reference that uses a `RwLockWriteGuard` as the owner.
-pub type RwLockWriteGuardRefMut<'a, T, U = T> = OwningRefMut<RwLockWriteGuard<'a, T>, U>;
-
-unsafe impl<'a, T: 'a> IntoErased<'a> for Box<T> {
-    type Erased = Box<Erased + 'a>;
-    fn into_erased(self) -> Self::Erased {
-        self
-    }
-}
-unsafe impl<'a, T: 'a> IntoErased<'a> for Rc<T> {
-    type Erased = Rc<Erased + 'a>;
-    fn into_erased(self) -> Self::Erased {
-        self
-    }
-}
-unsafe impl<'a, T: 'a> IntoErased<'a> for Arc<T> {
-    type Erased = Arc<Erased + 'a>;
-    fn into_erased(self) -> Self::Erased {
-        self
-    }
-}
-
-/// Typedef of a owning reference that uses an erased `Box` as the owner.
-pub type ErasedBoxRef<U> = OwningRef<Box<Erased>, U>;
-/// Typedef of a owning reference that uses an erased `Rc` as the owner.
-pub type ErasedRcRef<U> = OwningRef<Rc<Erased>, U>;
-/// Typedef of a owning reference that uses an erased `Arc` as the owner.
-pub type ErasedArcRef<U> = OwningRef<Arc<Erased>, U>;
-
-/// Typedef of a mutable owning reference that uses an erased `Box` as the owner.
-pub type ErasedBoxRefMut<U> = OwningRefMut<Box<Erased>, U>;
-
-#[cfg(test)]
-mod tests {
-    mod owning_ref {
-        use super::super::OwningRef;
-        use super::super::{RcRef, BoxRef, Erased, ErasedBoxRef};
-        use std::cmp::{PartialEq, Ord, PartialOrd, Ordering};
-        use std::hash::{Hash, Hasher};
-        use std::collections::hash_map::DefaultHasher;
-        use std::collections::HashMap;
-        use std::rc::Rc;
-
-        #[derive(Debug, PartialEq)]
-        struct Example(u32, String, [u8; 3]);
-        fn example() -> Example {
-            Example(42, "hello world".to_string(), [1, 2, 3])
-        }
-
-        #[test]
-        fn new_deref() {
-            let or: OwningRef<Box<()>, ()> = OwningRef::new(Box::new(()));
-            assert_eq!(&*or, &());
-        }
-
-        #[test]
-        fn into() {
-            let or: OwningRef<Box<()>, ()> = Box::new(()).into();
-            assert_eq!(&*or, &());
-        }
-
-        #[test]
-        fn map_offset_ref() {
-            let or: BoxRef<Example> = Box::new(example()).into();
-            let or: BoxRef<_, u32> = or.map(|x| &x.0);
-            assert_eq!(&*or, &42);
-
-            let or: BoxRef<Example> = Box::new(example()).into();
-            let or: BoxRef<_, u8> = or.map(|x| &x.2[1]);
-            assert_eq!(&*or, &2);
-        }
-
-        #[test]
-        fn map_heap_ref() {
-            let or: BoxRef<Example> = Box::new(example()).into();
-            let or: BoxRef<_, str> = or.map(|x| &x.1[..5]);
-            assert_eq!(&*or, "hello");
-        }
-
-        #[test]
-        fn map_static_ref() {
-            let or: BoxRef<()> = Box::new(()).into();
-            let or: BoxRef<_, str> = or.map(|_| "hello");
-            assert_eq!(&*or, "hello");
-        }
-
-        #[test]
-        fn map_chained() {
-            let or: BoxRef<String> = Box::new(example().1).into();
-            let or: BoxRef<_, str> = or.map(|x| &x[1..5]);
-            let or: BoxRef<_, str> = or.map(|x| &x[..2]);
-            assert_eq!(&*or, "el");
-        }
-
-        #[test]
-        fn map_chained_inference() {
-            let or = BoxRef::new(Box::new(example().1))
-                .map(|x| &x[..5])
-                .map(|x| &x[1..3]);
-            assert_eq!(&*or, "el");
-        }
-
-        #[test]
-        fn as_owner() {
-            let or: BoxRef<String> = Box::new(example().1).into();
-            let or = or.map(|x| &x[..5]);
-            assert_eq!(&*or, "hello");
-            assert_eq!(&**or.as_owner(), "hello world");
-        }
-
-        #[test]
-        fn into_owner() {
-            let or: BoxRef<String> = Box::new(example().1).into();
-            let or = or.map(|x| &x[..5]);
-            assert_eq!(&*or, "hello");
-            let s = *or.into_owner();
-            assert_eq!(&s, "hello world");
-        }
-
-        #[test]
-        fn fmt_debug() {
-            let or: BoxRef<String> = Box::new(example().1).into();
-            let or = or.map(|x| &x[..5]);
-            let s = format!("{:?}", or);
-            assert_eq!(&s, "OwningRef { owner: \"hello world\", reference: \"hello\" }");
-        }
-
-        #[test]
-        fn erased_owner() {
-            let o1: BoxRef<Example, str> = BoxRef::new(Box::new(example()))
-                .map(|x| &x.1[..]);
-
-            let o2: BoxRef<String, str> = BoxRef::new(Box::new(example().1))
-                .map(|x| &x[..]);
-
-            let os: Vec<ErasedBoxRef<str>> = vec![o1.erase_owner(), o2.erase_owner()];
-            assert!(os.iter().all(|e| &e[..] == "hello world"));
-        }
-
-        #[test]
-        fn non_static_erased_owner() {
-            let foo = [413, 612];
-            let bar = &foo;
-
-            // FIXME: lifetime inference fails us, and we can't easily define a lifetime for a closure
-            // (see https://github.com/rust-lang/rust/issues/22340)
-            // So we use a function to identify the lifetimes instead.
-            fn borrow<'a>(a: &'a &[i32; 2]) -> &'a i32 {
-                &a[0]
-            }
-
-            let o: BoxRef<&[i32; 2]> = Box::new(bar).into();
-            let o: BoxRef<&[i32; 2], i32> = o.map(borrow);
-            let o: BoxRef<Erased, i32> = o.erase_owner();
-
-            assert_eq!(*o, 413);
-        }
-
-        #[test]
-        fn raii_locks() {
-            use super::super::{RefRef, RefMutRef};
-            use std::cell::RefCell;
-            use super::super::{MutexGuardRef, RwLockReadGuardRef, RwLockWriteGuardRef};
-            use std::sync::{Mutex, RwLock};
-
-            {
-                let a = RefCell::new(1);
-                let a = {
-                    let a = RefRef::new(a.borrow());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-            {
-                let a = RefCell::new(1);
-                let a = {
-                    let a = RefMutRef::new(a.borrow_mut());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-            {
-                let a = Mutex::new(1);
-                let a = {
-                    let a = MutexGuardRef::new(a.lock().unwrap());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-            {
-                let a = RwLock::new(1);
-                let a = {
-                    let a = RwLockReadGuardRef::new(a.read().unwrap());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-            {
-                let a = RwLock::new(1);
-                let a = {
-                    let a = RwLockWriteGuardRef::new(a.write().unwrap());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-        }
-
-        #[test]
-        fn eq() {
-            let or1: BoxRef<[u8]> = BoxRef::new(vec![1, 2, 3].into_boxed_slice());
-            let or2: BoxRef<[u8]> = BoxRef::new(vec![1, 2, 3].into_boxed_slice());
-            assert_eq!(or1.eq(&or2), true);
-        }
-
-        #[test]
-        fn cmp() {
-            let or1: BoxRef<[u8]> = BoxRef::new(vec![1, 2, 3].into_boxed_slice());
-            let or2: BoxRef<[u8]> = BoxRef::new(vec![4, 5, 6].into_boxed_slice());
-            assert_eq!(or1.cmp(&or2), Ordering::Less);
-        }
-
-        #[test]
-        fn partial_cmp() {
-            let or1: BoxRef<[u8]> = BoxRef::new(vec![4, 5, 6].into_boxed_slice());
-            let or2: BoxRef<[u8]> = BoxRef::new(vec![1, 2, 3].into_boxed_slice());
-            assert_eq!(or1.partial_cmp(&or2), Some(Ordering::Greater));
-        }
-
-        #[test]
-        fn hash() {
-            let mut h1 = DefaultHasher::new();
-            let mut h2 = DefaultHasher::new();
-
-            let or1: BoxRef<[u8]> = BoxRef::new(vec![1, 2, 3].into_boxed_slice());
-            let or2: BoxRef<[u8]> = BoxRef::new(vec![1, 2, 3].into_boxed_slice());
-
-            or1.hash(&mut h1);
-            or2.hash(&mut h2);
-
-            assert_eq!(h1.finish(), h2.finish());
-        }
-
-        #[test]
-        fn borrow() {
-            let mut hash = HashMap::new();
-            let     key  = RcRef::<String>::new(Rc::new("foo-bar".to_string())).map(|s| &s[..]);
-
-            hash.insert(key.clone().map(|s| &s[..3]), 42);
-            hash.insert(key.clone().map(|s| &s[4..]), 23);
-
-            assert_eq!(hash.get("foo"), Some(&42));
-            assert_eq!(hash.get("bar"), Some(&23));
-        }
-
-        #[test]
-        fn total_erase() {
-            let a: OwningRef<Vec<u8>, [u8]>
-                = OwningRef::new(vec![]).map(|x| &x[..]);
-            let b: OwningRef<Box<[u8]>, [u8]>
-                = OwningRef::new(vec![].into_boxed_slice()).map(|x| &x[..]);
-
-            let c: OwningRef<Rc<Vec<u8>>, [u8]> = unsafe {a.map_owner(Rc::new)};
-            let d: OwningRef<Rc<Box<[u8]>>, [u8]> = unsafe {b.map_owner(Rc::new)};
-
-            let e: OwningRef<Rc<Erased>, [u8]> = c.erase_owner();
-            let f: OwningRef<Rc<Erased>, [u8]> = d.erase_owner();
-
-            let _g = e.clone();
-            let _h = f.clone();
-        }
-
-        #[test]
-        fn total_erase_box() {
-            let a: OwningRef<Vec<u8>, [u8]>
-                = OwningRef::new(vec![]).map(|x| &x[..]);
-            let b: OwningRef<Box<[u8]>, [u8]>
-                = OwningRef::new(vec![].into_boxed_slice()).map(|x| &x[..]);
-
-            let c: OwningRef<Box<Vec<u8>>, [u8]> = a.map_owner_box();
-            let d: OwningRef<Box<Box<[u8]>>, [u8]> = b.map_owner_box();
-
-            let _e: OwningRef<Box<Erased>, [u8]> = c.erase_owner();
-            let _f: OwningRef<Box<Erased>, [u8]> = d.erase_owner();
-        }
-
-        #[test]
-        fn try_map1() {
-            use std::any::Any;
-
-            let x = Box::new(123_i32);
-            let y: Box<Any> = x;
-
-            OwningRef::new(y).try_map(|x| x.downcast_ref::<i32>().ok_or(())).is_ok();
-        }
-
-        #[test]
-        fn try_map2() {
-            use std::any::Any;
-
-            let x = Box::new(123_i32);
-            let y: Box<Any> = x;
-
-            OwningRef::new(y).try_map(|x| x.downcast_ref::<i32>().ok_or(())).is_err();
-        }
-    }
-
-    mod owning_handle {
-        use super::super::OwningHandle;
-        use super::super::RcRef;
-        use std::rc::Rc;
-        use std::cell::RefCell;
-        use std::sync::Arc;
-        use std::sync::RwLock;
-
-        #[test]
-        fn owning_handle() {
-            use std::cell::RefCell;
-            let cell = Rc::new(RefCell::new(2));
-            let cell_ref = RcRef::new(cell);
-            let mut handle = OwningHandle::new_with_fn(cell_ref, |x| unsafe { x.as_ref() }.unwrap().borrow_mut());
-            assert_eq!(*handle, 2);
-            *handle = 3;
-            assert_eq!(*handle, 3);
-        }
-
-        #[test]
-        fn try_owning_handle_ok() {
-            use std::cell::RefCell;
-            let cell = Rc::new(RefCell::new(2));
-            let cell_ref = RcRef::new(cell);
-            let mut handle = OwningHandle::try_new::<_, ()>(cell_ref, |x| {
-                Ok(unsafe {
-                    x.as_ref()
-                }.unwrap().borrow_mut())
-            }).unwrap();
-            assert_eq!(*handle, 2);
-            *handle = 3;
-            assert_eq!(*handle, 3);
-        }
-
-        #[test]
-        fn try_owning_handle_err() {
-            use std::cell::RefCell;
-            let cell = Rc::new(RefCell::new(2));
-            let cell_ref = RcRef::new(cell);
-            let handle = OwningHandle::try_new::<_, ()>(cell_ref, |x| {
-                if false {
-                    return Ok(unsafe {
-                        x.as_ref()
-                    }.unwrap().borrow_mut())
-                }
-                Err(())
-            });
-            assert!(handle.is_err());
-        }
-
-        #[test]
-        fn nested() {
-            use std::cell::RefCell;
-            use std::sync::{Arc, RwLock};
-
-            let result = {
-                let complex = Rc::new(RefCell::new(Arc::new(RwLock::new("someString"))));
-                let curr = RcRef::new(complex);
-                let curr = OwningHandle::new_with_fn(curr, |x| unsafe { x.as_ref() }.unwrap().borrow_mut());
-                let mut curr = OwningHandle::new_with_fn(curr, |x| unsafe { x.as_ref() }.unwrap().try_write().unwrap());
-                assert_eq!(*curr, "someString");
-                *curr = "someOtherString";
-                curr
-            };
-            assert_eq!(*result, "someOtherString");
-        }
-
-        #[test]
-        fn owning_handle_safe() {
-            use std::cell::RefCell;
-            let cell = Rc::new(RefCell::new(2));
-            let cell_ref = RcRef::new(cell);
-            let handle = OwningHandle::new(cell_ref);
-            assert_eq!(*handle, 2);
-        }
-
-        #[test]
-        fn owning_handle_mut_safe() {
-            use std::cell::RefCell;
-            let cell = Rc::new(RefCell::new(2));
-            let cell_ref = RcRef::new(cell);
-            let mut handle = OwningHandle::new_mut(cell_ref);
-            assert_eq!(*handle, 2);
-            *handle = 3;
-            assert_eq!(*handle, 3);
-        }
-
-        #[test]
-        fn owning_handle_safe_2() {
-            let result = {
-                let complex = Rc::new(RefCell::new(Arc::new(RwLock::new("someString"))));
-                let curr = RcRef::new(complex);
-                let curr = OwningHandle::new_with_fn(curr, |x| unsafe { x.as_ref() }.unwrap().borrow_mut());
-                let mut curr = OwningHandle::new_with_fn(curr, |x| unsafe { x.as_ref() }.unwrap().try_write().unwrap());
-                assert_eq!(*curr, "someString");
-                *curr = "someOtherString";
-                curr
-            };
-            assert_eq!(*result, "someOtherString");
-        }
-    }
-
-    mod owning_ref_mut {
-        use super::super::{OwningRefMut, BoxRefMut, Erased, ErasedBoxRefMut};
-        use super::super::BoxRef;
-        use std::cmp::{PartialEq, Ord, PartialOrd, Ordering};
-        use std::hash::{Hash, Hasher};
-        use std::collections::hash_map::DefaultHasher;
-        use std::collections::HashMap;
-
-        #[derive(Debug, PartialEq)]
-        struct Example(u32, String, [u8; 3]);
-        fn example() -> Example {
-            Example(42, "hello world".to_string(), [1, 2, 3])
-        }
-
-        #[test]
-        fn new_deref() {
-            let or: OwningRefMut<Box<()>, ()> = OwningRefMut::new(Box::new(()));
-            assert_eq!(&*or, &());
-        }
-
-        #[test]
-        fn new_deref_mut() {
-            let mut or: OwningRefMut<Box<()>, ()> = OwningRefMut::new(Box::new(()));
-            assert_eq!(&mut *or, &mut ());
-        }
-
-        #[test]
-        fn mutate() {
-            let mut or: OwningRefMut<Box<usize>, usize> = OwningRefMut::new(Box::new(0));
-            assert_eq!(&*or, &0);
-            *or = 1;
-            assert_eq!(&*or, &1);
-        }
-
-        #[test]
-        fn into() {
-            let or: OwningRefMut<Box<()>, ()> = Box::new(()).into();
-            assert_eq!(&*or, &());
-        }
-
-        #[test]
-        fn map_offset_ref() {
-            let or: BoxRefMut<Example> = Box::new(example()).into();
-            let or: BoxRef<_, u32> = or.map(|x| &mut x.0);
-            assert_eq!(&*or, &42);
-
-            let or: BoxRefMut<Example> = Box::new(example()).into();
-            let or: BoxRef<_, u8> = or.map(|x| &mut x.2[1]);
-            assert_eq!(&*or, &2);
-        }
-
-        #[test]
-        fn map_heap_ref() {
-            let or: BoxRefMut<Example> = Box::new(example()).into();
-            let or: BoxRef<_, str> = or.map(|x| &mut x.1[..5]);
-            assert_eq!(&*or, "hello");
-        }
-
-        #[test]
-        fn map_static_ref() {
-            let or: BoxRefMut<()> = Box::new(()).into();
-            let or: BoxRef<_, str> = or.map(|_| "hello");
-            assert_eq!(&*or, "hello");
-        }
-
-        #[test]
-        fn map_mut_offset_ref() {
-            let or: BoxRefMut<Example> = Box::new(example()).into();
-            let or: BoxRefMut<_, u32> = or.map_mut(|x| &mut x.0);
-            assert_eq!(&*or, &42);
-
-            let or: BoxRefMut<Example> = Box::new(example()).into();
-            let or: BoxRefMut<_, u8> = or.map_mut(|x| &mut x.2[1]);
-            assert_eq!(&*or, &2);
-        }
-
-        #[test]
-        fn map_mut_heap_ref() {
-            let or: BoxRefMut<Example> = Box::new(example()).into();
-            let or: BoxRefMut<_, str> = or.map_mut(|x| &mut x.1[..5]);
-            assert_eq!(&*or, "hello");
-        }
-
-        #[test]
-        fn map_mut_static_ref() {
-            static mut MUT_S: [u8; 5] = *b"hello";
-
-            let mut_s: &'static mut [u8] = unsafe { &mut MUT_S };
-
-            let or: BoxRefMut<()> = Box::new(()).into();
-            let or: BoxRefMut<_, [u8]> = or.map_mut(move |_| mut_s);
-            assert_eq!(&*or, b"hello");
-        }
-
-        #[test]
-        fn map_mut_chained() {
-            let or: BoxRefMut<String> = Box::new(example().1).into();
-            let or: BoxRefMut<_, str> = or.map_mut(|x| &mut x[1..5]);
-            let or: BoxRefMut<_, str> = or.map_mut(|x| &mut x[..2]);
-            assert_eq!(&*or, "el");
-        }
-
-        #[test]
-        fn map_chained_inference() {
-            let or = BoxRefMut::new(Box::new(example().1))
-                .map_mut(|x| &mut x[..5])
-                .map_mut(|x| &mut x[1..3]);
-            assert_eq!(&*or, "el");
-        }
-
-        #[test]
-        fn try_map_mut() {
-            let or: BoxRefMut<String> = Box::new(example().1).into();
-            let or: Result<BoxRefMut<_, str>, ()> = or.try_map_mut(|x| Ok(&mut x[1..5]));
-            assert_eq!(&*or.unwrap(), "ello");
-
-            let or: BoxRefMut<String> = Box::new(example().1).into();
-            let or: Result<BoxRefMut<_, str>, ()> = or.try_map_mut(|_| Err(()));
-            assert!(or.is_err());
-        }
-
-        #[test]
-        fn as_owner() {
-            let or: BoxRefMut<String> = Box::new(example().1).into();
-            let or = or.map_mut(|x| &mut x[..5]);
-            assert_eq!(&*or, "hello");
-            assert_eq!(&**or.as_owner(), "hello world");
-        }
-
-        #[test]
-        fn into_owner() {
-            let or: BoxRefMut<String> = Box::new(example().1).into();
-            let or = or.map_mut(|x| &mut x[..5]);
-            assert_eq!(&*or, "hello");
-            let s = *or.into_owner();
-            assert_eq!(&s, "hello world");
-        }
-
-        #[test]
-        fn fmt_debug() {
-            let or: BoxRefMut<String> = Box::new(example().1).into();
-            let or = or.map_mut(|x| &mut x[..5]);
-            let s = format!("{:?}", or);
-            assert_eq!(&s,
-                       "OwningRefMut { owner: \"hello world\", reference: \"hello\" }");
-        }
-
-        #[test]
-        fn erased_owner() {
-            let o1: BoxRefMut<Example, str> = BoxRefMut::new(Box::new(example()))
-                .map_mut(|x| &mut x.1[..]);
-
-            let o2: BoxRefMut<String, str> = BoxRefMut::new(Box::new(example().1))
-                .map_mut(|x| &mut x[..]);
-
-            let os: Vec<ErasedBoxRefMut<str>> = vec![o1.erase_owner(), o2.erase_owner()];
-            assert!(os.iter().all(|e| &e[..] == "hello world"));
-        }
-
-        #[test]
-        fn non_static_erased_owner() {
-            let mut foo = [413, 612];
-            let bar = &mut foo;
-
-            // FIXME: lifetime inference fails us, and we can't easily define a lifetime for a closure
-            // (see https://github.com/rust-lang/rust/issues/22340)
-            // So we use a function to identify the lifetimes instead.
-            fn borrow<'a>(a: &'a mut &mut [i32; 2]) -> &'a mut i32 {
-                &mut a[0]
-            }
-
-            let o: BoxRefMut<&mut [i32; 2]> = Box::new(bar).into();
-            let o: BoxRefMut<&mut [i32; 2], i32> = o.map_mut(borrow);
-            let o: BoxRefMut<Erased, i32> = o.erase_owner();
-
-            assert_eq!(*o, 413);
-        }
-
-        #[test]
-        fn raii_locks() {
-            use super::super::RefMutRefMut;
-            use std::cell::RefCell;
-            use super::super::{MutexGuardRefMut, RwLockWriteGuardRefMut};
-            use std::sync::{Mutex, RwLock};
-
-            {
-                let a = RefCell::new(1);
-                let a = {
-                    let a = RefMutRefMut::new(a.borrow_mut());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-            {
-                let a = Mutex::new(1);
-                let a = {
-                    let a = MutexGuardRefMut::new(a.lock().unwrap());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-            {
-                let a = RwLock::new(1);
-                let a = {
-                    let a = RwLockWriteGuardRefMut::new(a.write().unwrap());
-                    assert_eq!(*a, 1);
-                    a
-                };
-                assert_eq!(*a, 1);
-                drop(a);
-            }
-        }
-
-        #[test]
-        fn eq() {
-            let or1: BoxRefMut<[u8]> = BoxRefMut::new(vec![1, 2, 3].into_boxed_slice());
-            let or2: BoxRefMut<[u8]> = BoxRefMut::new(vec![1, 2, 3].into_boxed_slice());
-            assert_eq!(or1.eq(&or2), true);
-        }
-
-        #[test]
-        fn cmp() {
-            let or1: BoxRefMut<[u8]> = BoxRefMut::new(vec![1, 2, 3].into_boxed_slice());
-            let or2: BoxRefMut<[u8]> = BoxRefMut::new(vec![4, 5, 6].into_boxed_slice());
-            assert_eq!(or1.cmp(&or2), Ordering::Less);
-        }
-
-        #[test]
-        fn partial_cmp() {
-            let or1: BoxRefMut<[u8]> = BoxRefMut::new(vec![4, 5, 6].into_boxed_slice());
-            let or2: BoxRefMut<[u8]> = BoxRefMut::new(vec![1, 2, 3].into_boxed_slice());
-            assert_eq!(or1.partial_cmp(&or2), Some(Ordering::Greater));
-        }
-
-        #[test]
-        fn hash() {
-            let mut h1 = DefaultHasher::new();
-            let mut h2 = DefaultHasher::new();
-
-            let or1: BoxRefMut<[u8]> = BoxRefMut::new(vec![1, 2, 3].into_boxed_slice());
-            let or2: BoxRefMut<[u8]> = BoxRefMut::new(vec![1, 2, 3].into_boxed_slice());
-
-            or1.hash(&mut h1);
-            or2.hash(&mut h2);
-
-            assert_eq!(h1.finish(), h2.finish());
-        }
-
-        #[test]
-        fn borrow() {
-            let mut hash = HashMap::new();
-            let     key1 = BoxRefMut::<String>::new(Box::new("foo".to_string())).map(|s| &s[..]);
-            let     key2 = BoxRefMut::<String>::new(Box::new("bar".to_string())).map(|s| &s[..]);
-
-            hash.insert(key1, 42);
-            hash.insert(key2, 23);
-
-            assert_eq!(hash.get("foo"), Some(&42));
-            assert_eq!(hash.get("bar"), Some(&23));
-        }
-
-        #[test]
-        fn total_erase() {
-            let a: OwningRefMut<Vec<u8>, [u8]>
-                = OwningRefMut::new(vec![]).map_mut(|x| &mut x[..]);
-            let b: OwningRefMut<Box<[u8]>, [u8]>
-                = OwningRefMut::new(vec![].into_boxed_slice()).map_mut(|x| &mut x[..]);
-
-            let c: OwningRefMut<Box<Vec<u8>>, [u8]> = unsafe {a.map_owner(Box::new)};
-            let d: OwningRefMut<Box<Box<[u8]>>, [u8]> = unsafe {b.map_owner(Box::new)};
-
-            let _e: OwningRefMut<Box<Erased>, [u8]> = c.erase_owner();
-            let _f: OwningRefMut<Box<Erased>, [u8]> = d.erase_owner();
-        }
-
-        #[test]
-        fn total_erase_box() {
-            let a: OwningRefMut<Vec<u8>, [u8]>
-                = OwningRefMut::new(vec![]).map_mut(|x| &mut x[..]);
-            let b: OwningRefMut<Box<[u8]>, [u8]>
-                = OwningRefMut::new(vec![].into_boxed_slice()).map_mut(|x| &mut x[..]);
-
-            let c: OwningRefMut<Box<Vec<u8>>, [u8]> = a.map_owner_box();
-            let d: OwningRefMut<Box<Box<[u8]>>, [u8]> = b.map_owner_box();
-
-            let _e: OwningRefMut<Box<Erased>, [u8]> = c.erase_owner();
-            let _f: OwningRefMut<Box<Erased>, [u8]> = d.erase_owner();
-        }
-
-        #[test]
-        fn try_map1() {
-            use std::any::Any;
-
-            let x = Box::new(123_i32);
-            let y: Box<Any> = x;
-
-            OwningRefMut::new(y).try_map_mut(|x| x.downcast_mut::<i32>().ok_or(())).is_ok();
-        }
-
-        #[test]
-        fn try_map2() {
-            use std::any::Any;
-
-            let x = Box::new(123_i32);
-            let y: Box<Any> = x;
-
-            OwningRefMut::new(y).try_map_mut(|x| x.downcast_mut::<i32>().ok_or(())).is_err();
-        }
-
-        #[test]
-        fn try_map3() {
-            use std::any::Any;
-
-            let x = Box::new(123_i32);
-            let y: Box<Any> = x;
-
-            OwningRefMut::new(y).try_map(|x| x.downcast_ref::<i32>().ok_or(())).is_ok();
-        }
-
-        #[test]
-        fn try_map4() {
-            use std::any::Any;
-
-            let x = Box::new(123_i32);
-            let y: Box<Any> = x;
-
-            OwningRefMut::new(y).try_map(|x| x.downcast_ref::<i32>().ok_or(())).is_err();
-        }
-
-        #[test]
-        fn into_owning_ref() {
-            use super::super::BoxRef;
-
-            let or: BoxRefMut<()> = Box::new(()).into();
-            let or: BoxRef<()> = or.into();
-            assert_eq!(&*or, &());
-        }
-
-        struct Foo {
-            u: u32,
-        }
-        struct Bar {
-            f: Foo,
-        }
-
-        #[test]
-        fn ref_mut() {
-            use std::cell::RefCell;
-
-            let a = RefCell::new(Bar { f: Foo { u: 42 } });
-            let mut b = OwningRefMut::new(a.borrow_mut());
-            assert_eq!(b.f.u, 42);
-            b.f.u = 43;
-            let mut c = b.map_mut(|x| &mut x.f);
-            assert_eq!(c.u, 43);
-            c.u = 44;
-            let mut d = c.map_mut(|x| &mut x.u);
-            assert_eq!(*d, 44);
-            *d = 45;
-            assert_eq!(*d, 45);
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/owning_ref/.travis.yml cargo-0.33.0/vendor/owning_ref/.travis.yml
--- cargo-0.32.0/vendor/owning_ref/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/owning_ref/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-language: rust
-rust:
-- nightly
-- beta
-- stable
-before_script:
-- |
-  pip install 'travis-cargo<0.2' --user &&
-  export PATH=$HOME/.local/bin:$PATH
-script:
-- |
-  travis-cargo build &&
-  travis-cargo test &&
-  travis-cargo bench &&
-  travis-cargo --only stable doc
-after_success:
-- travis-cargo --only stable doc-upload
-env:
-  global:
-  - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-  - secure: bHizPyUOOWEDjecxCSPyZeOrnNTpLbsFRVO25fW2M5B6FOxsbJwf+ZUXI1VqoAtKBAR0JbY+xpNPTW55ANa/Xyd3/daKFxah/jriiJ+RzRf5/iCyx2ik6tp2Z4LmRZQ/XjyPsQZcPHW9vVxGxW2o8JE78VTmcZwPElLRQoCLlPddDxCmbUpiw0FywkbqFRmG+0M96ymjvl58wvPYRlA76Jd+KoTlehPd+oAmoVRlvYgUZUYUphfDlYN04wXBnSkMqZdiAolkIMAFQ3o9A/W95RUIKiARQe2L9j33/joCMZBme0tq8l6GpmaLpmiXGqKdUlHOJF3cqAPQO1Kve0whNBs4/QlH0xgav6rQcLdCLilPkTj/vFXjo9EiZrOsYFXMQ+dAejqg/+JI1LBJqEwMJZKNe6T2vlJfbCyONEHdPtkhdhT26TjO1JCTeLIFa42ejRgA21PZFFsBos7ZdZO75QW5Wrqw2BLVfZVY3kl+rAWwacj3rLnfs32Vy5KmFjG5zTBlu3HQ/LX1J9E7jwBRKTWglnAyfb8E/NXHutX0wdVrdufwGD7bufjL3uHc3fs1wYSb+wBk1HtVMe/1JWgYpiRCPk4Z+NslCgFm1h7HX2QKikHaCzz7F8TJFEzDN9Lv9JVW2RmpEQBM/lKmNMVLrLt8gAaRQbjQFA4tck9rv9g=
diff -Nru cargo-0.32.0/vendor/parking_lot/appveyor.yml cargo-0.33.0/vendor/parking_lot/appveyor.yml
--- cargo-0.32.0/vendor/parking_lot/appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-environment:
-  TRAVIS_CARGO_NIGHTLY_FEATURE: nightly
-  RUST_TEST_THREADS: 1
-  matrix:
-  - TARGET: nightly-x86_64-pc-windows-msvc
-  - TARGET: nightly-i686-pc-windows-msvc
-  - TARGET: nightly-x86_64-pc-windows-gnu
-  - TARGET: nightly-i686-pc-windows-gnu
-  - TARGET: 1.24.0-x86_64-pc-windows-msvc
-  - TARGET: 1.24.0-i686-pc-windows-msvc
-  - TARGET: 1.24.0-x86_64-pc-windows-gnu
-  - TARGET: 1.24.0-i686-pc-windows-gnu
-
-install:
-  - SET PATH=C:\Python27;C:\Python27\Scripts;%PATH%;%APPDATA%\Python\Scripts
-  - pip install "travis-cargo<0.2" --user
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust-install.exe"
-  - ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
-  - ps: $env:PATH="$env:PATH;C:\rust\bin"
-  - rustc -vV
-  - cargo -vV
-
-build_script:
-  - travis-cargo build
-
-test_script:
-  - travis-cargo test
-  - travis-cargo test -- --features=deadlock_detection
-  - travis-cargo doc
diff -Nru cargo-0.32.0/vendor/parking_lot/.cargo-checksum.json cargo-0.33.0/vendor/parking_lot/.cargo-checksum.json
--- cargo-0.32.0/vendor/parking_lot/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/parking_lot/Cargo.toml cargo-0.33.0/vendor/parking_lot/Cargo.toml
--- cargo-0.32.0/vendor/parking_lot/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "parking_lot"
-version = "0.6.4"
-authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
-description = "More compact and efficient implementations of the standard synchronization primitives."
-readme = "README.md"
-keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
-categories = ["concurrency"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/Amanieu/parking_lot"
-[dependencies.lock_api]
-version = "0.1"
-
-[dependencies.parking_lot_core]
-version = "0.3"
-[dev-dependencies.rand]
-version = "0.5"
-
-[features]
-deadlock_detection = ["parking_lot_core/deadlock_detection"]
-default = ["owning_ref"]
-nightly = ["parking_lot_core/nightly", "lock_api/nightly"]
-owning_ref = ["lock_api/owning_ref"]
diff -Nru cargo-0.32.0/vendor/parking_lot/CHANGELOG.md cargo-0.33.0/vendor/parking_lot/CHANGELOG.md
--- cargo-0.32.0/vendor/parking_lot/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-0.6.3 (2018-07-18)
-==================
-
-- Export `RawMutex`, `RawRwLock` and `RawThreadId`.
-
-0.6.2 (2018-06-18)
-==================
-
-- Enable `lock_api/nightly` feature from `parking_lot/nightly` (#79)
-
-0.6.1 (2018-06-08)
-==================
-
-Added missing typedefs for mapped lock guards:
-
-- `MappedMutexGuard`
-- `MappedReentrantMutexGuard`
-- `MappedRwLockReadGuard`
-- `MappedRwLockWriteGuard`
-
-0.6.0 (2018-06-08)
-==================
-
-This release moves most of the code for type-safe `Mutex` and `RwLock` types
-into a separate crate called `lock_api`. This new crate is compatible with
-`no_std` and provides `Mutex` and `RwLock` type-safe wrapper types from a
-raw mutex type which implements the `RawMutex` or `RawRwLock` trait. The API
-provided by the wrapper types can be extended by implementing more traits on the
-raw mutex type which provide more functionality (e.g. `RawMutexTimed`). See the
-crate documentation for more details.
-
-There are also several major changes:
-
-- The minimum required Rust version is bumped to 1.26.
-- All methods on `MutexGuard` (and other guard types) are no longer inherent
-  methods and must be called as `MutexGuard::method(self)`. This avoids
-  conflicts with methods from the inner type.
-- `MutexGuard` (and other guard types) add the `unlocked` method which
-  temporarily unlocks a mutex, runs the given closure, and then re-locks the
-   mutex.
-- `MutexGuard` (and other guard types) add the `bump` method which gives a
-  chance for other threads to acquire the mutex by temporarily unlocking it and
-  re-locking it. However this is optimized for the common case where there are
-  no threads waiting on the lock, in which case no unlocking is performed.
-- `MutexGuard` (and other guard types) add the `map` method which returns a
-  `MappedMutexGuard` which holds only a subset of the original locked type. The
-  `MappedMutexGuard` type is identical to `MutexGuard` except that it does not
-  support the `unlocked` and `bump` methods, and can't be used with `CondVar`.
diff -Nru cargo-0.32.0/vendor/parking_lot/LICENSE-APACHE cargo-0.33.0/vendor/parking_lot/LICENSE-APACHE
--- cargo-0.32.0/vendor/parking_lot/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/parking_lot/LICENSE-MIT cargo-0.33.0/vendor/parking_lot/LICENSE-MIT
--- cargo-0.32.0/vendor/parking_lot/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2016 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/parking_lot/README.md cargo-0.33.0/vendor/parking_lot/README.md
--- cargo-0.32.0/vendor/parking_lot/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-parking_lot
-============
-
-[![Build Status](https://travis-ci.org/Amanieu/parking_lot.svg?branch=master)](https://travis-ci.org/Amanieu/parking_lot) [![Build status](https://ci.appveyor.com/api/projects/status/wppcc32ttpud0a30/branch/master?svg=true)](https://ci.appveyor.com/project/Amanieu/parking-lot/branch/master) [![Crates.io](https://img.shields.io/crates/v/parking_lot.svg)](https://crates.io/crates/parking_lot)
-
-[Documentation (synchronization primitives)](https://docs.rs/parking_lot/)
-
-[Documentation (core parking lot API)](https://docs.rs/parking_lot_core/)
-
-[Documentation (type-safe lock API)](https://docs.rs/lock_api/)
-
-This library provides implementations of `Mutex`, `RwLock`, `Condvar` and
-`Once` that are smaller, faster and more flexible than those in the Rust
-standard library, as well as a `ReentrantMutex` type which supports recursive
-locking. It also exposes a low-level API for creating your own efficient
-synchronization primitives.
-
-When tested on x86_64 Linux, `parking_lot::Mutex` was found to be 1.5x
-faster than `std::sync::Mutex` when uncontended, and up to 5x faster when
-contended from multiple threads. The numbers for `RwLock` vary depending on
-the number of reader and writer threads, but are almost always faster than
-the standard library `RwLock`, and even up to 50x faster in some cases.
-
-## Features
-
-The primitives provided by this library have several advantages over those
-in the Rust standard library:
-
-1. `Mutex` and `Once` only require 1 byte of storage space, while `Condvar`
-   and `RwLock` only require 1 word of storage space. On the other hand the
-   standard library primitives require a dynamically allocated `Box` to hold
-   OS-specific synchronization primitives. The small size of `Mutex` in
-   particular encourages the use of fine-grained locks to increase
-   parallelism.
-2. Since they consist of just a single atomic variable, have constant
-   initializers and don't need destructors, these primitives can be used as
-    `static` global variables. The standard library primitives require
-   dynamic initialization and thus need to be lazily initialized with
-   `lazy_static!`.
-3. Uncontended lock acquisition and release is done through fast inline
-   paths which only require a single atomic operation.
-4. Microcontention (a contended lock with a short critical section) is
-   efficiently handled by spinning a few times while trying to acquire a
-   lock.
-5. The locks are adaptive and will suspend a thread after a few failed spin
-   attempts. This makes the locks suitable for both long and short critical
-   sections.
-6. `Condvar`, `RwLock` and `Once` work on Windows XP, unlike the standard
-   library versions of those types.
-7. `RwLock` takes advantage of hardware lock elision on processors that
-   support it, which can lead to huge performance wins with many readers.
-8. `RwLock` uses a task-fair locking policy, which avoids reader and writer
-   starvation, whereas the standard library version makes no guarantees.
-9. `Condvar` is guaranteed not to produce spurious wakeups. A thread will
-    only be woken up if it timed out or it was woken up by a notification.
-10. `Condvar::notify_all` will only wake up a single thread and requeue the
-    rest to wait on the associated `Mutex`. This avoids a thundering herd
-    problem where all threads try to acquire the lock at the same time.
-11. `RwLock` supports atomically downgrading a write lock into a read lock.
-12. `Mutex` and `RwLock` allow raw unlocking without a RAII guard object.
-13. `Mutex<()>` and `RwLock<()>` allow raw locking without a RAII guard
-    object.
-14. `Mutex` and `RwLock` support [eventual fairness](https://trac.webkit.org/changeset/203350)
-    which allows them to be fair on average without sacrificing performance.
-15. A `ReentrantMutex` type which supports recursive locking.
-16. An *experimental* deadlock detector that works for `Mutex`,
-    `RwLock` and `ReentrantMutex`. This feature is disabled by default and
-    can be enabled via the `deadlock_detection` feature.
-17. `RwLock` supports atomically upgrading an "upgradable" read lock into a
-    write lock.
-
-## The parking lot
-
-To keep these primitives small, all thread queuing and suspending
-functionality is offloaded to the *parking lot*. The idea behind this is
-based on the Webkit [`WTF::ParkingLot`](https://webkit.org/blog/6161/locking-in-webkit/)
-class, which essentially consists of a hash table mapping of lock addresses
-to queues of parked (sleeping) threads. The Webkit parking lot was itself
-inspired by Linux [futexes](http://man7.org/linux/man-pages/man2/futex.2.html),
-but it is more powerful since it allows invoking callbacks while holding a queue
-lock.
-
-## Nightly vs stable
-
-There are a few restrictions when using this library on stable Rust:
-
-- `Mutex` and `Once` will use 1 word of space instead of 1 byte.
-- You will have to use `lazy_static!` to statically initialize `Mutex`,
-  `Condvar` and `RwLock` types instead of `const fn`.
-- `RwLock` will not be able to take advantage of hardware lock elision for
-  readers, which improves performance when there are multiple readers.
-
-To enable nightly-only functionality, you need to enable the `nightly` feature
-in Cargo (see below).
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-parking_lot = "0.6"
-```
-
-and this to your crate root:
-
-```rust
-extern crate parking_lot;
-```
-
-To enable nightly-only features, add this to your `Cargo.toml` instead:
-
-```toml
-[dependencies]
-parking_lot = {version = "0.6", features = ["nightly"]}
-```
-
-The experimental deadlock detector can be enabled with the
-`deadlock_detection` Cargo feature.
-
-The core parking lot API is provided by the `parking_lot_core` crate. It is
-separate from the synchronization primitives in the `parking_lot` crate so that
-changes to the core API do not cause breaking changes for users of `parking_lot`.
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
diff -Nru cargo-0.32.0/vendor/parking_lot/src/condvar.rs cargo-0.33.0/vendor/parking_lot/src/condvar.rs
--- cargo-0.32.0/vendor/parking_lot/src/condvar.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/condvar.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,533 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use deadlock;
-use lock_api::RawMutex as RawMutexTrait;
-use mutex::MutexGuard;
-use parking_lot_core::{self, ParkResult, RequeueOp, UnparkResult, DEFAULT_PARK_TOKEN};
-use raw_mutex::{RawMutex, TOKEN_HANDOFF, TOKEN_NORMAL};
-use std::sync::atomic::{AtomicPtr, Ordering};
-use std::time::{Duration, Instant};
-use std::{fmt, ptr};
-
-/// A type indicating whether a timed wait on a condition variable returned
-/// due to a time out or not.
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub struct WaitTimeoutResult(bool);
-
-impl WaitTimeoutResult {
-    /// Returns whether the wait was known to have timed out.
-    #[inline]
-    pub fn timed_out(&self) -> bool {
-        self.0
-    }
-}
-
-/// A Condition Variable
-///
-/// Condition variables represent the ability to block a thread such that it
-/// consumes no CPU time while waiting for an event to occur. Condition
-/// variables are typically associated with a boolean predicate (a condition)
-/// and a mutex. The predicate is always verified inside of the mutex before
-/// determining that thread must block.
-///
-/// Note that this module places one additional restriction over the system
-/// condition variables: each condvar can be used with only one mutex at a
-/// time. Any attempt to use multiple mutexes on the same condition variable
-/// simultaneously will result in a runtime panic. However it is possible to
-/// switch to a different mutex if there are no threads currently waiting on
-/// the condition variable.
-///
-/// # Differences from the standard library `Condvar`
-///
-/// - No spurious wakeups: A wait will only return a non-timeout result if it
-///   was woken up by `notify_one` or `notify_all`.
-/// - `Condvar::notify_all` will only wake up a single thread, the rest are
-///   requeued to wait for the `Mutex` to be unlocked by the thread that was
-///   woken up.
-/// - Only requires 1 word of space, whereas the standard library boxes the
-///   `Condvar` due to platform limitations.
-/// - Can be statically constructed (requires the `const_fn` nightly feature).
-/// - Does not require any drop glue when dropped.
-/// - Inline fast path for the uncontended case.
-///
-/// # Examples
-///
-/// ```
-/// use parking_lot::{Mutex, Condvar};
-/// use std::sync::Arc;
-/// use std::thread;
-///
-/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
-/// let pair2 = pair.clone();
-///
-/// // Inside of our lock, spawn a new thread, and then wait for it to start
-/// thread::spawn(move|| {
-///     let &(ref lock, ref cvar) = &*pair2;
-///     let mut started = lock.lock();
-///     *started = true;
-///     cvar.notify_one();
-/// });
-///
-/// // wait for the thread to start up
-/// let &(ref lock, ref cvar) = &*pair;
-/// let mut started = lock.lock();
-/// while !*started {
-///     cvar.wait(&mut started);
-/// }
-/// ```
-pub struct Condvar {
-    state: AtomicPtr<RawMutex>,
-}
-
-impl Condvar {
-    /// Creates a new condition variable which is ready to be waited on and
-    /// notified.
-    #[cfg(feature = "nightly")]
-    #[inline]
-    pub const fn new() -> Condvar {
-        Condvar {
-            state: AtomicPtr::new(ptr::null_mut()),
-        }
-    }
-
-    /// Creates a new condition variable which is ready to be waited on and
-    /// notified.
-    #[cfg(not(feature = "nightly"))]
-    #[inline]
-    pub fn new() -> Condvar {
-        Condvar {
-            state: AtomicPtr::new(ptr::null_mut()),
-        }
-    }
-
-    /// Wakes up one blocked thread on this condvar.
-    ///
-    /// If there is a blocked thread on this condition variable, then it will
-    /// be woken up from its call to `wait` or `wait_timeout`. Calls to
-    /// `notify_one` are not buffered in any way.
-    ///
-    /// To wake up all threads, see `notify_all()`.
-    #[inline]
-    pub fn notify_one(&self) {
-        // Nothing to do if there are no waiting threads
-        if self.state.load(Ordering::Relaxed).is_null() {
-            return;
-        }
-
-        self.notify_one_slow();
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn notify_one_slow(&self) {
-        unsafe {
-            // Unpark one thread
-            let addr = self as *const _ as usize;
-            let callback = |result: UnparkResult| {
-                // Clear our state if there are no more waiting threads
-                if !result.have_more_threads {
-                    self.state.store(ptr::null_mut(), Ordering::Relaxed);
-                }
-                TOKEN_NORMAL
-            };
-            parking_lot_core::unpark_one(addr, callback);
-        }
-    }
-
-    /// Wakes up all blocked threads on this condvar.
-    ///
-    /// This method will ensure that any current waiters on the condition
-    /// variable are awoken. Calls to `notify_all()` are not buffered in any
-    /// way.
-    ///
-    /// To wake up only one thread, see `notify_one()`.
-    #[inline]
-    pub fn notify_all(&self) {
-        // Nothing to do if there are no waiting threads
-        let state = self.state.load(Ordering::Relaxed);
-        if state.is_null() {
-            return;
-        }
-
-        self.notify_all_slow(state);
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn notify_all_slow(&self, mutex: *mut RawMutex) {
-        unsafe {
-            // Unpark one thread and requeue the rest onto the mutex
-            let from = self as *const _ as usize;
-            let to = mutex as usize;
-            let validate = || {
-                // Make sure that our atomic state still points to the same
-                // mutex. If not then it means that all threads on the current
-                // mutex were woken up and a new waiting thread switched to a
-                // different mutex. In that case we can get away with doing
-                // nothing.
-                if self.state.load(Ordering::Relaxed) != mutex {
-                    return RequeueOp::Abort;
-                }
-
-                // Clear our state since we are going to unpark or requeue all
-                // threads.
-                self.state.store(ptr::null_mut(), Ordering::Relaxed);
-
-                // Unpark one thread if the mutex is unlocked, otherwise just
-                // requeue everything to the mutex. This is safe to do here
-                // since unlocking the mutex when the parked bit is set requires
-                // locking the queue. There is the possibility of a race if the
-                // mutex gets locked after we check, but that doesn't matter in
-                // this case.
-                if (*mutex).mark_parked_if_locked() {
-                    RequeueOp::RequeueAll
-                } else {
-                    RequeueOp::UnparkOneRequeueRest
-                }
-            };
-            let callback = |op, result: UnparkResult| {
-                // If we requeued threads to the mutex, mark it as having
-                // parked threads. The RequeueAll case is already handled above.
-                if op == RequeueOp::UnparkOneRequeueRest && result.have_more_threads {
-                    (*mutex).mark_parked();
-                }
-                TOKEN_NORMAL
-            };
-            parking_lot_core::unpark_requeue(from, to, validate, callback);
-        }
-    }
-
-    /// Blocks the current thread until this condition variable receives a
-    /// notification.
-    ///
-    /// This function will atomically unlock the mutex specified (represented by
-    /// `mutex_guard`) and block the current thread. This means that any calls
-    /// to `notify_*()` which happen logically after the mutex is unlocked are
-    /// candidates to wake this thread up. When this function call returns, the
-    /// lock specified will have been re-acquired.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if another thread is waiting on the `Condvar`
-    /// with a different `Mutex` object.
-    #[inline]
-    pub fn wait<T: ?Sized>(&self, mutex_guard: &mut MutexGuard<T>) {
-        self.wait_until_internal(unsafe { MutexGuard::mutex(mutex_guard).raw() }, None);
-    }
-
-    /// Waits on this condition variable for a notification, timing out after
-    /// the specified time instant.
-    ///
-    /// The semantics of this function are equivalent to `wait()` except that
-    /// the thread will be blocked roughly until `timeout` is reached. This
-    /// method should not be used for precise timing due to anomalies such as
-    /// preemption or platform differences that may not cause the maximum
-    /// amount of time waited to be precisely `timeout`.
-    ///
-    /// Note that the best effort is made to ensure that the time waited is
-    /// measured with a monotonic clock, and not affected by the changes made to
-    /// the system time.
-    ///
-    /// The returned `WaitTimeoutResult` value indicates if the timeout is
-    /// known to have elapsed.
-    ///
-    /// Like `wait`, the lock specified will be re-acquired when this function
-    /// returns, regardless of whether the timeout elapsed or not.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if another thread is waiting on the `Condvar`
-    /// with a different `Mutex` object.
-    #[inline]
-    pub fn wait_until<T: ?Sized>(
-        &self,
-        mutex_guard: &mut MutexGuard<T>,
-        timeout: Instant,
-    ) -> WaitTimeoutResult {
-        self.wait_until_internal(
-            unsafe { MutexGuard::mutex(mutex_guard).raw() },
-            Some(timeout),
-        )
-    }
-
-    // This is a non-generic function to reduce the monomorphization cost of
-    // using `wait_until`.
-    fn wait_until_internal(
-        &self,
-        mutex: &RawMutex,
-        timeout: Option<Instant>,
-    ) -> WaitTimeoutResult {
-        unsafe {
-            let result;
-            let mut bad_mutex = false;
-            let mut requeued = false;
-            {
-                let addr = self as *const _ as usize;
-                let lock_addr = mutex as *const _ as *mut _;
-                let validate = || {
-                    // Ensure we don't use two different mutexes with the same
-                    // Condvar at the same time. This is done while locked to
-                    // avoid races with notify_one
-                    let state = self.state.load(Ordering::Relaxed);
-                    if state.is_null() {
-                        self.state.store(lock_addr, Ordering::Relaxed);
-                    } else if state != lock_addr {
-                        bad_mutex = true;
-                        return false;
-                    }
-                    true
-                };
-                let before_sleep = || {
-                    // Unlock the mutex before sleeping...
-                    mutex.unlock();
-                };
-                let timed_out = |k, was_last_thread| {
-                    // If we were requeued to a mutex, then we did not time out.
-                    // We'll just park ourselves on the mutex again when we try
-                    // to lock it later.
-                    requeued = k != addr;
-
-                    // If we were the last thread on the queue then we need to
-                    // clear our state. This is normally done by the
-                    // notify_{one,all} functions when not timing out.
-                    if !requeued && was_last_thread {
-                        self.state.store(ptr::null_mut(), Ordering::Relaxed);
-                    }
-                };
-                result = parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    DEFAULT_PARK_TOKEN,
-                    timeout,
-                );
-            }
-
-            // Panic if we tried to use multiple mutexes with a Condvar. Note
-            // that at this point the MutexGuard is still locked. It will be
-            // unlocked by the unwinding logic.
-            if bad_mutex {
-                panic!("attempted to use a condition variable with more than one mutex");
-            }
-
-            // ... and re-lock it once we are done sleeping
-            if result == ParkResult::Unparked(TOKEN_HANDOFF) {
-                deadlock::acquire_resource(mutex as *const _ as usize);
-            } else {
-                mutex.lock();
-            }
-
-            WaitTimeoutResult(!(result.is_unparked() || requeued))
-        }
-    }
-
-    /// Waits on this condition variable for a notification, timing out after a
-    /// specified duration.
-    ///
-    /// The semantics of this function are equivalent to `wait()` except that
-    /// the thread will be blocked for roughly no longer than `timeout`. This
-    /// method should not be used for precise timing due to anomalies such as
-    /// preemption or platform differences that may not cause the maximum
-    /// amount of time waited to be precisely `timeout`.
-    ///
-    /// Note that the best effort is made to ensure that the time waited is
-    /// measured with a monotonic clock, and not affected by the changes made to
-    /// the system time.
-    ///
-    /// The returned `WaitTimeoutResult` value indicates if the timeout is
-    /// known to have elapsed.
-    ///
-    /// Like `wait`, the lock specified will be re-acquired when this function
-    /// returns, regardless of whether the timeout elapsed or not.
-    #[inline]
-    pub fn wait_for<T: ?Sized>(
-        &self,
-        guard: &mut MutexGuard<T>,
-        timeout: Duration,
-    ) -> WaitTimeoutResult {
-        self.wait_until(guard, Instant::now() + timeout)
-    }
-}
-
-impl Default for Condvar {
-    #[inline]
-    fn default() -> Condvar {
-        Condvar::new()
-    }
-}
-
-impl fmt::Debug for Condvar {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.pad("Condvar { .. }")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::mpsc::channel;
-    use std::sync::Arc;
-    use std::thread;
-    use std::time::{Duration, Instant};
-    use {Condvar, Mutex};
-
-    #[test]
-    fn smoke() {
-        let c = Condvar::new();
-        c.notify_one();
-        c.notify_all();
-    }
-
-    #[test]
-    fn notify_one() {
-        let m = Arc::new(Mutex::new(()));
-        let m2 = m.clone();
-        let c = Arc::new(Condvar::new());
-        let c2 = c.clone();
-
-        let mut g = m.lock();
-        let _t = thread::spawn(move || {
-            let _g = m2.lock();
-            c2.notify_one();
-        });
-        c.wait(&mut g);
-    }
-
-    #[test]
-    fn notify_all() {
-        const N: usize = 10;
-
-        let data = Arc::new((Mutex::new(0), Condvar::new()));
-        let (tx, rx) = channel();
-        for _ in 0..N {
-            let data = data.clone();
-            let tx = tx.clone();
-            thread::spawn(move || {
-                let &(ref lock, ref cond) = &*data;
-                let mut cnt = lock.lock();
-                *cnt += 1;
-                if *cnt == N {
-                    tx.send(()).unwrap();
-                }
-                while *cnt != 0 {
-                    cond.wait(&mut cnt);
-                }
-                tx.send(()).unwrap();
-            });
-        }
-        drop(tx);
-
-        let &(ref lock, ref cond) = &*data;
-        rx.recv().unwrap();
-        let mut cnt = lock.lock();
-        *cnt = 0;
-        cond.notify_all();
-        drop(cnt);
-
-        for _ in 0..N {
-            rx.recv().unwrap();
-        }
-    }
-
-    #[test]
-    fn wait_for() {
-        let m = Arc::new(Mutex::new(()));
-        let m2 = m.clone();
-        let c = Arc::new(Condvar::new());
-        let c2 = c.clone();
-
-        let mut g = m.lock();
-        let no_timeout = c.wait_for(&mut g, Duration::from_millis(1));
-        assert!(no_timeout.timed_out());
-        let _t = thread::spawn(move || {
-            let _g = m2.lock();
-            c2.notify_one();
-        });
-        let timeout_res = c.wait_for(&mut g, Duration::from_millis(u32::max_value() as u64));
-        assert!(!timeout_res.timed_out());
-        drop(g);
-    }
-
-    #[test]
-    fn wait_until() {
-        let m = Arc::new(Mutex::new(()));
-        let m2 = m.clone();
-        let c = Arc::new(Condvar::new());
-        let c2 = c.clone();
-
-        let mut g = m.lock();
-        let no_timeout = c.wait_until(&mut g, Instant::now() + Duration::from_millis(1));
-        assert!(no_timeout.timed_out());
-        let _t = thread::spawn(move || {
-            let _g = m2.lock();
-            c2.notify_one();
-        });
-        let timeout_res = c.wait_until(
-            &mut g,
-            Instant::now() + Duration::from_millis(u32::max_value() as u64),
-        );
-        assert!(!timeout_res.timed_out());
-        drop(g);
-    }
-
-    #[test]
-    #[should_panic]
-    fn two_mutexes() {
-        let m = Arc::new(Mutex::new(()));
-        let m2 = m.clone();
-        let m3 = Arc::new(Mutex::new(()));
-        let c = Arc::new(Condvar::new());
-        let c2 = c.clone();
-
-        // Make sure we don't leave the child thread dangling
-        struct PanicGuard<'a>(&'a Condvar);
-        impl<'a> Drop for PanicGuard<'a> {
-            fn drop(&mut self) {
-                self.0.notify_one();
-            }
-        }
-
-        let (tx, rx) = channel();
-        let g = m.lock();
-        let _t = thread::spawn(move || {
-            let mut g = m2.lock();
-            tx.send(()).unwrap();
-            c2.wait(&mut g);
-        });
-        drop(g);
-        rx.recv().unwrap();
-        let _g = m.lock();
-        let _guard = PanicGuard(&*c);
-        let _ = c.wait(&mut m3.lock());
-    }
-
-    #[test]
-    fn two_mutexes_disjoint() {
-        let m = Arc::new(Mutex::new(()));
-        let m2 = m.clone();
-        let m3 = Arc::new(Mutex::new(()));
-        let c = Arc::new(Condvar::new());
-        let c2 = c.clone();
-
-        let mut g = m.lock();
-        let _t = thread::spawn(move || {
-            let _g = m2.lock();
-            c2.notify_one();
-        });
-        c.wait(&mut g);
-        drop(g);
-
-        let _ = c.wait_for(&mut m3.lock(), Duration::from_millis(1));
-    }
-
-    #[test]
-    fn test_debug_condvar() {
-        let c = Condvar::new();
-        assert_eq!(format!("{:?}", c), "Condvar { .. }");
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/deadlock.rs cargo-0.33.0/vendor/parking_lot/src/deadlock.rs
--- cargo-0.32.0/vendor/parking_lot/src/deadlock.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/deadlock.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
-//! \[Experimental\] Deadlock detection
-//!
-//! This feature is optional and can be enabled via the `deadlock_detection` feature flag.
-//!
-//! # Example
-//!
-//! ```
-//! #[cfg(feature = "deadlock_detection")]
-//! { // only for #[cfg]
-//! use std::thread;
-//! use std::time::Duration;
-//! use parking_lot::deadlock;
-//!
-//! // Create a background thread which checks for deadlocks every 10s
-//! thread::spawn(move || {
-//!     loop {
-//!         thread::sleep(Duration::from_secs(10));
-//!         let deadlocks = deadlock::check_deadlock();
-//!         if deadlocks.is_empty() {
-//!             continue;
-//!         }
-//!
-//!         println!("{} deadlocks detected", deadlocks.len());
-//!         for (i, threads) in deadlocks.iter().enumerate() {
-//!             println!("Deadlock #{}", i);
-//!             for t in threads {
-//!                 println!("Thread Id {:#?}", t.thread_id());
-//!                 println!("{:#?}", t.backtrace());
-//!             }
-//!         }
-//!     }
-//! });
-//! } // only for #[cfg]
-//! ```
-
-#[cfg(feature = "deadlock_detection")]
-pub use parking_lot_core::deadlock::check_deadlock;
-pub(crate) use parking_lot_core::deadlock::{acquire_resource, release_resource};
-
-#[cfg(test)]
-#[cfg(feature = "deadlock_detection")]
-mod tests {
-    use std::sync::{Arc, Barrier};
-    use std::thread::{self, sleep};
-    use std::time::Duration;
-    use {Mutex, ReentrantMutex, RwLock};
-
-    fn check_deadlock() -> bool {
-        use parking_lot_core::deadlock::check_deadlock;
-        !check_deadlock().is_empty()
-    }
-
-    #[test]
-    fn test_mutex_deadlock() {
-        let m1: Arc<Mutex<()>> = Default::default();
-        let m2: Arc<Mutex<()>> = Default::default();
-        let m3: Arc<Mutex<()>> = Default::default();
-        let b = Arc::new(Barrier::new(4));
-
-        let m1_ = m1.clone();
-        let m2_ = m2.clone();
-        let m3_ = m3.clone();
-        let b1 = b.clone();
-        let b2 = b.clone();
-        let b3 = b.clone();
-
-        assert!(!check_deadlock());
-
-        let _t1 = thread::spawn(move || {
-            let _g = m1.lock();
-            b1.wait();
-            let _ = m2_.lock();
-        });
-
-        let _t2 = thread::spawn(move || {
-            let _g = m2.lock();
-            b2.wait();
-            let _ = m3_.lock();
-        });
-
-        let _t3 = thread::spawn(move || {
-            let _g = m3.lock();
-            b3.wait();
-            let _ = m1_.lock();
-        });
-
-        assert!(!check_deadlock());
-
-        b.wait();
-        sleep(Duration::from_millis(50));
-        assert!(check_deadlock());
-
-        assert!(!check_deadlock());
-    }
-
-    #[test]
-    fn test_mutex_deadlock_reentrant() {
-        let m1: Arc<Mutex<()>> = Default::default();
-
-        assert!(!check_deadlock());
-
-        let _t1 = thread::spawn(move || {
-            let _g = m1.lock();
-            let _ = m1.lock();
-        });
-
-        sleep(Duration::from_millis(50));
-        assert!(check_deadlock());
-
-        assert!(!check_deadlock());
-    }
-
-    #[test]
-    fn test_remutex_deadlock() {
-        let m1: Arc<ReentrantMutex<()>> = Default::default();
-        let m2: Arc<ReentrantMutex<()>> = Default::default();
-        let m3: Arc<ReentrantMutex<()>> = Default::default();
-        let b = Arc::new(Barrier::new(4));
-
-        let m1_ = m1.clone();
-        let m2_ = m2.clone();
-        let m3_ = m3.clone();
-        let b1 = b.clone();
-        let b2 = b.clone();
-        let b3 = b.clone();
-
-        assert!(!check_deadlock());
-
-        let _t1 = thread::spawn(move || {
-            let _g = m1.lock();
-            let _g = m1.lock();
-            b1.wait();
-            let _ = m2_.lock();
-        });
-
-        let _t2 = thread::spawn(move || {
-            let _g = m2.lock();
-            let _g = m2.lock();
-            b2.wait();
-            let _ = m3_.lock();
-        });
-
-        let _t3 = thread::spawn(move || {
-            let _g = m3.lock();
-            let _g = m3.lock();
-            b3.wait();
-            let _ = m1_.lock();
-        });
-
-        assert!(!check_deadlock());
-
-        b.wait();
-        sleep(Duration::from_millis(50));
-        assert!(check_deadlock());
-
-        assert!(!check_deadlock());
-    }
-
-    #[test]
-    fn test_rwlock_deadlock() {
-        let m1: Arc<RwLock<()>> = Default::default();
-        let m2: Arc<RwLock<()>> = Default::default();
-        let m3: Arc<RwLock<()>> = Default::default();
-        let b = Arc::new(Barrier::new(4));
-
-        let m1_ = m1.clone();
-        let m2_ = m2.clone();
-        let m3_ = m3.clone();
-        let b1 = b.clone();
-        let b2 = b.clone();
-        let b3 = b.clone();
-
-        assert!(!check_deadlock());
-
-        let _t1 = thread::spawn(move || {
-            let _g = m1.read();
-            b1.wait();
-            let _g = m2_.write();
-        });
-
-        let _t2 = thread::spawn(move || {
-            let _g = m2.read();
-            b2.wait();
-            let _g = m3_.write();
-        });
-
-        let _t3 = thread::spawn(move || {
-            let _g = m3.read();
-            b3.wait();
-            let _ = m1_.write();
-        });
-
-        assert!(!check_deadlock());
-
-        b.wait();
-        sleep(Duration::from_millis(50));
-        assert!(check_deadlock());
-
-        assert!(!check_deadlock());
-    }
-
-    #[test]
-    fn test_rwlock_deadlock_reentrant() {
-        let m1: Arc<RwLock<()>> = Default::default();
-
-        assert!(!check_deadlock());
-
-        let _t1 = thread::spawn(move || {
-            let _g = m1.read();
-            let _ = m1.write();
-        });
-
-        sleep(Duration::from_millis(50));
-        assert!(check_deadlock());
-
-        assert!(!check_deadlock());
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/elision.rs cargo-0.33.0/vendor/parking_lot/src/elision.rs
--- cargo-0.32.0/vendor/parking_lot/src/elision.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/elision.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::sync::atomic::AtomicUsize;
-
-// Extension trait to add lock elision primitives to atomic types
-pub trait AtomicElisionExt {
-    type IntType;
-
-    // Perform a compare_exchange and start a transaction
-    fn elision_acquire(
-        &self,
-        current: Self::IntType,
-        new: Self::IntType,
-    ) -> Result<Self::IntType, Self::IntType>;
-    // Perform a compare_exchange and end a transaction
-    fn elision_release(
-        &self,
-        current: Self::IntType,
-        new: Self::IntType,
-    ) -> Result<Self::IntType, Self::IntType>;
-}
-
-// Indicates whether the target architecture supports lock elision
-#[inline]
-pub fn have_elision() -> bool {
-    cfg!(all(
-        feature = "nightly",
-        any(target_arch = "x86", target_arch = "x86_64"),
-    ))
-}
-
-// This implementation is never actually called because it is guarded by
-// have_elision().
-#[cfg(not(all(feature = "nightly", any(target_arch = "x86", target_arch = "x86_64"))))]
-impl AtomicElisionExt for AtomicUsize {
-    type IntType = usize;
-
-    #[inline]
-    fn elision_acquire(&self, _: usize, _: usize) -> Result<usize, usize> {
-        unreachable!();
-    }
-
-    #[inline]
-    fn elision_release(&self, _: usize, _: usize) -> Result<usize, usize> {
-        unreachable!();
-    }
-}
-
-#[cfg(all(feature = "nightly", target_arch = "x86"))]
-impl AtomicElisionExt for AtomicUsize {
-    type IntType = usize;
-
-    #[inline]
-    fn elision_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
-        unsafe {
-            let prev: usize;
-            asm!("xacquire; lock; cmpxchgl $2, $1"
-                 : "={eax}" (prev), "+*m" (self)
-                 : "r" (new), "{eax}" (current)
-                 : "memory"
-                 : "volatile");
-            if prev == current {
-                Ok(prev)
-            } else {
-                Err(prev)
-            }
-        }
-    }
-
-    #[inline]
-    fn elision_release(&self, current: usize, new: usize) -> Result<usize, usize> {
-        unsafe {
-            let prev: usize;
-            asm!("xrelease; lock; cmpxchgl $2, $1"
-                 : "={eax}" (prev), "+*m" (self)
-                 : "r" (new), "{eax}" (current)
-                 : "memory"
-                 : "volatile");
-            if prev == current {
-                Ok(prev)
-            } else {
-                Err(prev)
-            }
-        }
-    }
-}
-
-#[cfg(all(feature = "nightly", target_arch = "x86_64", target_pointer_width = "32"))]
-impl AtomicElisionExt for AtomicUsize {
-    type IntType = usize;
-
-    #[inline]
-    fn elision_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
-        unsafe {
-            let prev: usize;
-            asm!("xacquire; lock; cmpxchgl $2, $1"
-                 : "={rax}" (prev), "+*m" (self)
-                 : "r" (new), "{rax}" (current)
-                 : "memory"
-                 : "volatile");
-            if prev == current {
-                Ok(prev)
-            } else {
-                Err(prev)
-            }
-        }
-    }
-
-    #[inline]
-    fn elision_release(&self, current: usize, new: usize) -> Result<usize, usize> {
-        unsafe {
-            let prev: usize;
-            asm!("xrelease; lock; cmpxchgl $2, $1"
-                 : "={rax}" (prev), "+*m" (self)
-                 : "r" (new), "{rax}" (current)
-                 : "memory"
-                 : "volatile");
-            if prev == current {
-                Ok(prev)
-            } else {
-                Err(prev)
-            }
-        }
-    }
-}
-
-#[cfg(all(feature = "nightly", target_arch = "x86_64", target_pointer_width = "64"))]
-impl AtomicElisionExt for AtomicUsize {
-    type IntType = usize;
-
-    #[inline]
-    fn elision_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
-        unsafe {
-            let prev: usize;
-            asm!("xacquire; lock; cmpxchgq $2, $1"
-                 : "={rax}" (prev), "+*m" (self)
-                 : "r" (new), "{rax}" (current)
-                 : "memory"
-                 : "volatile");
-            if prev == current {
-                Ok(prev)
-            } else {
-                Err(prev)
-            }
-        }
-    }
-
-    #[inline]
-    fn elision_release(&self, current: usize, new: usize) -> Result<usize, usize> {
-        unsafe {
-            let prev: usize;
-            asm!("xrelease; lock; cmpxchgq $2, $1"
-                 : "={rax}" (prev), "+*m" (self)
-                 : "r" (new), "{rax}" (current)
-                 : "memory"
-                 : "volatile");
-            if prev == current {
-                Ok(prev)
-            } else {
-                Err(prev)
-            }
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/lib.rs cargo-0.33.0/vendor/parking_lot/src/lib.rs
--- cargo-0.32.0/vendor/parking_lot/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-//! This library provides implementations of `Mutex`, `RwLock`, `Condvar` and
-//! `Once` that are smaller, faster and more flexible than those in the Rust
-//! standard library. It also provides a `ReentrantMutex` type.
-
-#![warn(missing_docs)]
-#![cfg_attr(feature = "nightly", feature(const_fn))]
-#![cfg_attr(feature = "nightly", feature(integer_atomics))]
-#![cfg_attr(feature = "nightly", feature(asm))]
-
-extern crate lock_api;
-extern crate parking_lot_core;
-
-mod condvar;
-mod elision;
-mod mutex;
-mod once;
-mod raw_mutex;
-mod raw_rwlock;
-mod remutex;
-mod rwlock;
-mod util;
-
-#[cfg(feature = "deadlock_detection")]
-pub mod deadlock;
-#[cfg(not(feature = "deadlock_detection"))]
-mod deadlock;
-
-pub use condvar::{Condvar, WaitTimeoutResult};
-pub use mutex::{MappedMutexGuard, Mutex, MutexGuard};
-pub use once::{Once, OnceState, ONCE_INIT};
-pub use raw_mutex::RawMutex;
-pub use raw_rwlock::RawRwLock;
-pub use remutex::{MappedReentrantMutexGuard, RawThreadId, ReentrantMutex, ReentrantMutexGuard};
-pub use rwlock::{
-    MappedRwLockReadGuard, MappedRwLockWriteGuard, RwLock, RwLockReadGuard,
-    RwLockUpgradableReadGuard, RwLockWriteGuard,
-};
diff -Nru cargo-0.32.0/vendor/parking_lot/src/mutex.rs cargo-0.33.0/vendor/parking_lot/src/mutex.rs
--- cargo-0.32.0/vendor/parking_lot/src/mutex.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/mutex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,298 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use lock_api;
-use raw_mutex::RawMutex;
-
-/// A mutual exclusion primitive useful for protecting shared data
-///
-/// This mutex will block threads waiting for the lock to become available. The
-/// mutex can also be statically initialized or created via a `new`
-/// constructor. Each mutex has a type parameter which represents the data that
-/// it is protecting. The data can only be accessed through the RAII guards
-/// returned from `lock` and `try_lock`, which guarantees that the data is only
-/// ever accessed when the mutex is locked.
-///
-/// # Fairness
-///
-/// A typical unfair lock can often end up in a situation where a single thread
-/// quickly acquires and releases the same mutex in succession, which can starve
-/// other threads waiting to acquire the mutex. While this improves performance
-/// because it doesn't force a context switch when a thread tries to re-acquire
-/// a mutex it has just released, this can starve other threads.
-///
-/// This mutex uses [eventual fairness](https://trac.webkit.org/changeset/203350)
-/// to ensure that the lock will be fair on average without sacrificing
-/// performance. This is done by forcing a fair unlock on average every 0.5ms,
-/// which will force the lock to go to the next thread waiting for the mutex.
-///
-/// Additionally, any critical section longer than 1ms will always use a fair
-/// unlock, which has a negligible performance impact compared to the length of
-/// the critical section.
-///
-/// You can also force a fair unlock by calling `MutexGuard::unlock_fair` when
-/// unlocking a mutex instead of simply dropping the `MutexGuard`.
-///
-/// # Differences from the standard library `Mutex`
-///
-/// - No poisoning, the lock is released normally on panic.
-/// - Only requires 1 byte of space, whereas the standard library boxes the
-///   `Mutex` due to platform limitations.
-/// - Can be statically constructed (requires the `const_fn` nightly feature).
-/// - Does not require any drop glue when dropped.
-/// - Inline fast path for the uncontended case.
-/// - Efficient handling of micro-contention using adaptive spinning.
-/// - Allows raw locking & unlocking without a guard.
-/// - Supports eventual fairness so that the mutex is fair on average.
-/// - Optionally allows making the mutex fair by calling `MutexGuard::unlock_fair`.
-///
-/// # Examples
-///
-/// ```
-/// use std::sync::Arc;
-/// use parking_lot::Mutex;
-/// use std::thread;
-/// use std::sync::mpsc::channel;
-///
-/// const N: usize = 10;
-///
-/// // Spawn a few threads to increment a shared variable (non-atomically), and
-/// // let the main thread know once all increments are done.
-/// //
-/// // Here we're using an Arc to share memory among threads, and the data inside
-/// // the Arc is protected with a mutex.
-/// let data = Arc::new(Mutex::new(0));
-///
-/// let (tx, rx) = channel();
-/// for _ in 0..10 {
-///     let (data, tx) = (data.clone(), tx.clone());
-///     thread::spawn(move || {
-///         // The shared state can only be accessed once the lock is held.
-///         // Our non-atomic increment is safe because we're the only thread
-///         // which can access the shared state when the lock is held.
-///         let mut data = data.lock();
-///         *data += 1;
-///         if *data == N {
-///             tx.send(()).unwrap();
-///         }
-///         // the lock is unlocked here when `data` goes out of scope.
-///     });
-/// }
-///
-/// rx.recv().unwrap();
-/// ```
-pub type Mutex<T> = lock_api::Mutex<RawMutex, T>;
-
-/// An RAII implementation of a "scoped lock" of a mutex. When this structure is
-/// dropped (falls out of scope), the lock will be unlocked.
-///
-/// The data protected by the mutex can be accessed through this guard via its
-/// `Deref` and `DerefMut` implementations.
-pub type MutexGuard<'a, T> = lock_api::MutexGuard<'a, RawMutex, T>;
-
-/// An RAII mutex guard returned by `MutexGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedMutexGuard` and `MutexGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-pub type MappedMutexGuard<'a, T> = lock_api::MappedMutexGuard<'a, RawMutex, T>;
-
-#[cfg(test)]
-mod tests {
-    use std::sync::atomic::{AtomicUsize, Ordering};
-    use std::sync::mpsc::channel;
-    use std::sync::Arc;
-    use std::thread;
-    use {Condvar, Mutex};
-
-    struct Packet<T>(Arc<(Mutex<T>, Condvar)>);
-
-    #[derive(Eq, PartialEq, Debug)]
-    struct NonCopy(i32);
-
-    unsafe impl<T: Send> Send for Packet<T> {}
-    unsafe impl<T> Sync for Packet<T> {}
-
-    #[test]
-    fn smoke() {
-        let m = Mutex::new(());
-        drop(m.lock());
-        drop(m.lock());
-    }
-
-    #[test]
-    fn lots_and_lots() {
-        const J: u32 = 1000;
-        const K: u32 = 3;
-
-        let m = Arc::new(Mutex::new(0));
-
-        fn inc(m: &Mutex<u32>) {
-            for _ in 0..J {
-                *m.lock() += 1;
-            }
-        }
-
-        let (tx, rx) = channel();
-        for _ in 0..K {
-            let tx2 = tx.clone();
-            let m2 = m.clone();
-            thread::spawn(move || {
-                inc(&m2);
-                tx2.send(()).unwrap();
-            });
-            let tx2 = tx.clone();
-            let m2 = m.clone();
-            thread::spawn(move || {
-                inc(&m2);
-                tx2.send(()).unwrap();
-            });
-        }
-
-        drop(tx);
-        for _ in 0..2 * K {
-            rx.recv().unwrap();
-        }
-        assert_eq!(*m.lock(), J * K * 2);
-    }
-
-    #[test]
-    fn try_lock() {
-        let m = Mutex::new(());
-        *m.try_lock().unwrap() = ();
-    }
-
-    #[test]
-    fn test_into_inner() {
-        let m = Mutex::new(NonCopy(10));
-        assert_eq!(m.into_inner(), NonCopy(10));
-    }
-
-    #[test]
-    fn test_into_inner_drop() {
-        struct Foo(Arc<AtomicUsize>);
-        impl Drop for Foo {
-            fn drop(&mut self) {
-                self.0.fetch_add(1, Ordering::SeqCst);
-            }
-        }
-        let num_drops = Arc::new(AtomicUsize::new(0));
-        let m = Mutex::new(Foo(num_drops.clone()));
-        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
-        {
-            let _inner = m.into_inner();
-            assert_eq!(num_drops.load(Ordering::SeqCst), 0);
-        }
-        assert_eq!(num_drops.load(Ordering::SeqCst), 1);
-    }
-
-    #[test]
-    fn test_get_mut() {
-        let mut m = Mutex::new(NonCopy(10));
-        *m.get_mut() = NonCopy(20);
-        assert_eq!(m.into_inner(), NonCopy(20));
-    }
-
-    #[test]
-    fn test_mutex_arc_condvar() {
-        let packet = Packet(Arc::new((Mutex::new(false), Condvar::new())));
-        let packet2 = Packet(packet.0.clone());
-        let (tx, rx) = channel();
-        let _t = thread::spawn(move || {
-            // wait until parent gets in
-            rx.recv().unwrap();
-            let &(ref lock, ref cvar) = &*packet2.0;
-            let mut lock = lock.lock();
-            *lock = true;
-            cvar.notify_one();
-        });
-
-        let &(ref lock, ref cvar) = &*packet.0;
-        let mut lock = lock.lock();
-        tx.send(()).unwrap();
-        assert!(!*lock);
-        while !*lock {
-            cvar.wait(&mut lock);
-        }
-    }
-
-    #[test]
-    fn test_mutex_arc_nested() {
-        // Tests nested mutexes and access
-        // to underlying data.
-        let arc = Arc::new(Mutex::new(1));
-        let arc2 = Arc::new(Mutex::new(arc));
-        let (tx, rx) = channel();
-        let _t = thread::spawn(move || {
-            let lock = arc2.lock();
-            let lock2 = lock.lock();
-            assert_eq!(*lock2, 1);
-            tx.send(()).unwrap();
-        });
-        rx.recv().unwrap();
-    }
-
-    #[test]
-    fn test_mutex_arc_access_in_unwind() {
-        let arc = Arc::new(Mutex::new(1));
-        let arc2 = arc.clone();
-        let _ = thread::spawn(move || -> () {
-            struct Unwinder {
-                i: Arc<Mutex<i32>>,
-            }
-            impl Drop for Unwinder {
-                fn drop(&mut self) {
-                    *self.i.lock() += 1;
-                }
-            }
-            let _u = Unwinder { i: arc2 };
-            panic!();
-        }).join();
-        let lock = arc.lock();
-        assert_eq!(*lock, 2);
-    }
-
-    #[test]
-    fn test_mutex_unsized() {
-        let mutex: &Mutex<[i32]> = &Mutex::new([1, 2, 3]);
-        {
-            let b = &mut *mutex.lock();
-            b[0] = 4;
-            b[2] = 5;
-        }
-        let comp: &[i32] = &[4, 2, 5];
-        assert_eq!(&*mutex.lock(), comp);
-    }
-
-    #[test]
-    fn test_mutexguard_sync() {
-        fn sync<T: Sync>(_: T) {}
-
-        let mutex = Mutex::new(());
-        sync(mutex.lock());
-    }
-
-    #[test]
-    fn test_mutex_debug() {
-        let mutex = Mutex::new(vec![0u8, 10]);
-
-        assert_eq!(format!("{:?}", mutex), "Mutex { data: [0, 10] }");
-        assert_eq!(
-            format!("{:#?}", mutex),
-            "Mutex {
-    data: [
-        0,
-        10
-    ]
-}"
-        );
-        let _lock = mutex.lock();
-        assert_eq!(format!("{:?}", mutex), "Mutex { <locked> }");
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/once.rs cargo-0.33.0/vendor/parking_lot/src/once.rs
--- cargo-0.32.0/vendor/parking_lot/src/once.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/once.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,488 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::sync::atomic::{fence, Ordering};
-#[cfg(feature = "nightly")]
-use std::sync::atomic::{ATOMIC_U8_INIT, AtomicU8};
-#[cfg(feature = "nightly")]
-type U8 = u8;
-#[cfg(not(feature = "nightly"))]
-use std::sync::atomic::AtomicUsize as AtomicU8;
-#[cfg(not(feature = "nightly"))]
-use std::sync::atomic::ATOMIC_USIZE_INIT as ATOMIC_U8_INIT;
-#[cfg(not(feature = "nightly"))]
-type U8 = usize;
-use parking_lot_core::{self, SpinWait, DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN};
-use std::fmt;
-use std::mem;
-use util::UncheckedOptionExt;
-
-const DONE_BIT: U8 = 1;
-const POISON_BIT: U8 = 2;
-const LOCKED_BIT: U8 = 4;
-const PARKED_BIT: U8 = 8;
-
-/// Current state of a `Once`.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum OnceState {
-    /// A closure has not been executed yet
-    New,
-
-    /// A closure was executed but panicked.
-    Poisoned,
-
-    /// A thread is currently executing a closure.
-    InProgress,
-
-    /// A closure has completed sucessfully.
-    Done,
-}
-
-impl OnceState {
-    /// Returns whether the associated `Once` has been poisoned.
-    ///
-    /// Once an initalization routine for a `Once` has panicked it will forever
-    /// indicate to future forced initialization routines that it is poisoned.
-    #[inline]
-    pub fn poisoned(&self) -> bool {
-        match *self {
-            OnceState::Poisoned => true,
-            _ => false,
-        }
-    }
-
-    /// Returns whether the associated `Once` has successfullly executed a
-    /// closure.
-    #[inline]
-    pub fn done(&self) -> bool {
-        match *self {
-            OnceState::Done => true,
-            _ => false,
-        }
-    }
-}
-
-/// A synchronization primitive which can be used to run a one-time
-/// initialization. Useful for one-time initialization for globals, FFI or
-/// related functionality.
-///
-/// # Differences from the standard library `Once`
-///
-/// - Only requires 1 byte of space, instead of 1 word.
-/// - Not required to be `'static`.
-/// - Relaxed memory barriers in the fast path, which can significantly improve
-///   performance on some architectures.
-/// - Efficient handling of micro-contention using adaptive spinning.
-///
-/// # Examples
-///
-/// ```
-/// use parking_lot::{Once, ONCE_INIT};
-///
-/// static START: Once = ONCE_INIT;
-///
-/// START.call_once(|| {
-///     // run initialization here
-/// });
-/// ```
-pub struct Once(AtomicU8);
-
-/// Initialization value for static `Once` values.
-pub const ONCE_INIT: Once = Once(ATOMIC_U8_INIT);
-
-impl Once {
-    /// Creates a new `Once` value.
-    #[cfg(feature = "nightly")]
-    #[inline]
-    pub const fn new() -> Once {
-        Once(ATOMIC_U8_INIT)
-    }
-
-    /// Creates a new `Once` value.
-    #[cfg(not(feature = "nightly"))]
-    #[inline]
-    pub fn new() -> Once {
-        Once(ATOMIC_U8_INIT)
-    }
-
-    /// Returns the current state of this `Once`.
-    #[inline]
-    pub fn state(&self) -> OnceState {
-        let state = self.0.load(Ordering::Acquire);
-        if state & DONE_BIT != 0 {
-            OnceState::Done
-        } else if state & LOCKED_BIT != 0 {
-            OnceState::InProgress
-        } else if state & POISON_BIT != 0 {
-            OnceState::Poisoned
-        } else {
-            OnceState::New
-        }
-    }
-
-    /// Performs an initialization routine once and only once. The given closure
-    /// will be executed if this is the first time `call_once` has been called,
-    /// and otherwise the routine will *not* be invoked.
-    ///
-    /// This method will block the calling thread if another initialization
-    /// routine is currently running.
-    ///
-    /// When this function returns, it is guaranteed that some initialization
-    /// has run and completed (it may not be the closure specified). It is also
-    /// guaranteed that any memory writes performed by the executed closure can
-    /// be reliably observed by other threads at this point (there is a
-    /// happens-before relation between the closure and code executing after the
-    /// return).
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use parking_lot::{Once, ONCE_INIT};
-    ///
-    /// static mut VAL: usize = 0;
-    /// static INIT: Once = ONCE_INIT;
-    ///
-    /// // Accessing a `static mut` is unsafe much of the time, but if we do so
-    /// // in a synchronized fashion (e.g. write once or read all) then we're
-    /// // good to go!
-    /// //
-    /// // This function will only call `expensive_computation` once, and will
-    /// // otherwise always return the value returned from the first invocation.
-    /// fn get_cached_val() -> usize {
-    ///     unsafe {
-    ///         INIT.call_once(|| {
-    ///             VAL = expensive_computation();
-    ///         });
-    ///         VAL
-    ///     }
-    /// }
-    ///
-    /// fn expensive_computation() -> usize {
-    ///     // ...
-    /// # 2
-    /// }
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// The closure `f` will only be executed once if this is called
-    /// concurrently amongst many threads. If that closure panics, however, then
-    /// it will *poison* this `Once` instance, causing all future invocations of
-    /// `call_once` to also panic.
-    #[inline]
-    pub fn call_once<F>(&self, f: F)
-    where
-        F: FnOnce(),
-    {
-        if self.0.load(Ordering::Acquire) == DONE_BIT {
-            return;
-        }
-
-        let mut f = Some(f);
-        self.call_once_slow(false, &mut |_| unsafe { f.take().unchecked_unwrap()() });
-    }
-
-    /// Performs the same function as `call_once` except ignores poisoning.
-    ///
-    /// If this `Once` has been poisoned (some initialization panicked) then
-    /// this function will continue to attempt to call initialization functions
-    /// until one of them doesn't panic.
-    ///
-    /// The closure `f` is yielded a structure which can be used to query the
-    /// state of this `Once` (whether initialization has previously panicked or
-    /// not).
-    #[inline]
-    pub fn call_once_force<F>(&self, f: F)
-    where
-        F: FnOnce(OnceState),
-    {
-        if self.0.load(Ordering::Acquire) == DONE_BIT {
-            return;
-        }
-
-        let mut f = Some(f);
-        self.call_once_slow(true, &mut |state| unsafe {
-            f.take().unchecked_unwrap()(state)
-        });
-    }
-
-    // This is a non-generic function to reduce the monomorphization cost of
-    // using `call_once` (this isn't exactly a trivial or small implementation).
-    //
-    // Additionally, this is tagged with `#[cold]` as it should indeed be cold
-    // and it helps let LLVM know that calls to this function should be off the
-    // fast path. Essentially, this should help generate more straight line code
-    // in LLVM.
-    //
-    // Finally, this takes an `FnMut` instead of a `FnOnce` because there's
-    // currently no way to take an `FnOnce` and call it via virtual dispatch
-    // without some allocation overhead.
-    #[cold]
-    #[inline(never)]
-    fn call_once_slow(&self, ignore_poison: bool, f: &mut FnMut(OnceState)) {
-        let mut spinwait = SpinWait::new();
-        let mut state = self.0.load(Ordering::Relaxed);
-        loop {
-            // If another thread called the closure, we're done
-            if state & DONE_BIT != 0 {
-                // An acquire fence is needed here since we didn't load the
-                // state with Ordering::Acquire.
-                fence(Ordering::Acquire);
-                return;
-            }
-
-            // If the state has been poisoned and we aren't forcing, then panic
-            if state & POISON_BIT != 0 && !ignore_poison {
-                // Need the fence here as well for the same reason
-                fence(Ordering::Acquire);
-                panic!("Once instance has previously been poisoned");
-            }
-
-            // Grab the lock if it isn't locked, even if there is a queue on it.
-            // We also clear the poison bit since we are going to try running
-            // the closure again.
-            if state & LOCKED_BIT == 0 {
-                match self.0.compare_exchange_weak(
-                    state,
-                    (state | LOCKED_BIT) & !POISON_BIT,
-                    Ordering::Acquire,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => break,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            // If there is no queue, try spinning a few times
-            if state & PARKED_BIT == 0 && spinwait.spin() {
-                state = self.0.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Set the parked bit
-            if state & PARKED_BIT == 0 {
-                if let Err(x) = self.0.compare_exchange_weak(
-                    state,
-                    state | PARKED_BIT,
-                    Ordering::Relaxed,
-                    Ordering::Relaxed,
-                ) {
-                    state = x;
-                    continue;
-                }
-            }
-
-            // Park our thread until we are woken up by the thread that owns the
-            // lock.
-            unsafe {
-                let addr = self as *const _ as usize;
-                let validate = || self.0.load(Ordering::Relaxed) == LOCKED_BIT | PARKED_BIT;
-                let before_sleep = || {};
-                let timed_out = |_, _| unreachable!();
-                parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    DEFAULT_PARK_TOKEN,
-                    None,
-                );
-            }
-
-            // Loop back and check if the done bit was set
-            spinwait.reset();
-            state = self.0.load(Ordering::Relaxed);
-        }
-
-        struct PanicGuard<'a>(&'a Once);
-        impl<'a> Drop for PanicGuard<'a> {
-            fn drop(&mut self) {
-                // Mark the state as poisoned, unlock it and unpark all threads.
-                let once = self.0;
-                let state = once.0.swap(POISON_BIT, Ordering::Release);
-                if state & PARKED_BIT != 0 {
-                    unsafe {
-                        let addr = once as *const _ as usize;
-                        parking_lot_core::unpark_all(addr, DEFAULT_UNPARK_TOKEN);
-                    }
-                }
-            }
-        }
-
-        // At this point we have the lock, so run the closure. Make sure we
-        // properly clean up if the closure panicks.
-        let guard = PanicGuard(self);
-        let once_state = if state & POISON_BIT != 0 {
-            OnceState::Poisoned
-        } else {
-            OnceState::New
-        };
-        f(once_state);
-        mem::forget(guard);
-
-        // Now unlock the state, set the done bit and unpark all threads
-        let state = self.0.swap(DONE_BIT, Ordering::Release);
-        if state & PARKED_BIT != 0 {
-            unsafe {
-                let addr = self as *const _ as usize;
-                parking_lot_core::unpark_all(addr, DEFAULT_UNPARK_TOKEN);
-            }
-        }
-    }
-}
-
-impl Default for Once {
-    #[inline]
-    fn default() -> Once {
-        Once::new()
-    }
-}
-
-impl fmt::Debug for Once {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Once")
-            .field("state", &self.state())
-            .finish()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[cfg(feature = "nightly")]
-    use std::panic;
-    use std::sync::mpsc::channel;
-    use std::thread;
-    use {Once, ONCE_INIT};
-
-    #[test]
-    fn smoke_once() {
-        static O: Once = ONCE_INIT;
-        let mut a = 0;
-        O.call_once(|| a += 1);
-        assert_eq!(a, 1);
-        O.call_once(|| a += 1);
-        assert_eq!(a, 1);
-    }
-
-    #[test]
-    fn stampede_once() {
-        static O: Once = ONCE_INIT;
-        static mut RUN: bool = false;
-
-        let (tx, rx) = channel();
-        for _ in 0..10 {
-            let tx = tx.clone();
-            thread::spawn(move || {
-                for _ in 0..4 {
-                    thread::yield_now()
-                }
-                unsafe {
-                    O.call_once(|| {
-                        assert!(!RUN);
-                        RUN = true;
-                    });
-                    assert!(RUN);
-                }
-                tx.send(()).unwrap();
-            });
-        }
-
-        unsafe {
-            O.call_once(|| {
-                assert!(!RUN);
-                RUN = true;
-            });
-            assert!(RUN);
-        }
-
-        for _ in 0..10 {
-            rx.recv().unwrap();
-        }
-    }
-
-    #[cfg(feature = "nightly")]
-    #[test]
-    fn poison_bad() {
-        static O: Once = ONCE_INIT;
-
-        // poison the once
-        let t = panic::catch_unwind(|| {
-            O.call_once(|| panic!());
-        });
-        assert!(t.is_err());
-
-        // poisoning propagates
-        let t = panic::catch_unwind(|| {
-            O.call_once(|| {});
-        });
-        assert!(t.is_err());
-
-        // we can subvert poisoning, however
-        let mut called = false;
-        O.call_once_force(|p| {
-            called = true;
-            assert!(p.poisoned())
-        });
-        assert!(called);
-
-        // once any success happens, we stop propagating the poison
-        O.call_once(|| {});
-    }
-
-    #[cfg(feature = "nightly")]
-    #[test]
-    fn wait_for_force_to_finish() {
-        static O: Once = ONCE_INIT;
-
-        // poison the once
-        let t = panic::catch_unwind(|| {
-            O.call_once(|| panic!());
-        });
-        assert!(t.is_err());
-
-        // make sure someone's waiting inside the once via a force
-        let (tx1, rx1) = channel();
-        let (tx2, rx2) = channel();
-        let t1 = thread::spawn(move || {
-            O.call_once_force(|p| {
-                assert!(p.poisoned());
-                tx1.send(()).unwrap();
-                rx2.recv().unwrap();
-            });
-        });
-
-        rx1.recv().unwrap();
-
-        // put another waiter on the once
-        let t2 = thread::spawn(|| {
-            let mut called = false;
-            O.call_once(|| {
-                called = true;
-            });
-            assert!(!called);
-        });
-
-        tx2.send(()).unwrap();
-
-        assert!(t1.join().is_ok());
-        assert!(t2.join().is_ok());
-    }
-
-    #[test]
-    fn test_once_debug() {
-        static O: Once = ONCE_INIT;
-
-        assert_eq!(format!("{:?}", O), "Once { state: New }");
-        assert_eq!(
-            format!("{:#?}", O),
-            "Once {
-    state: New
-}"
-        );
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/raw_mutex.rs cargo-0.33.0/vendor/parking_lot/src/raw_mutex.rs
--- cargo-0.32.0/vendor/parking_lot/src/raw_mutex.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/raw_mutex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,312 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::sync::atomic::Ordering;
-#[cfg(feature = "nightly")]
-use std::sync::atomic::{ATOMIC_U8_INIT, AtomicU8};
-#[cfg(feature = "nightly")]
-type U8 = u8;
-#[cfg(not(feature = "nightly"))]
-use std::sync::atomic::AtomicUsize as AtomicU8;
-#[cfg(not(feature = "nightly"))]
-use std::sync::atomic::ATOMIC_USIZE_INIT as ATOMIC_U8_INIT;
-#[cfg(not(feature = "nightly"))]
-type U8 = usize;
-use deadlock;
-use lock_api::{GuardNoSend, RawMutex as RawMutexTrait, RawMutexFair, RawMutexTimed};
-use parking_lot_core::{self, ParkResult, SpinWait, UnparkResult, UnparkToken, DEFAULT_PARK_TOKEN};
-use std::time::{Duration, Instant};
-
-// UnparkToken used to indicate that that the target thread should attempt to
-// lock the mutex again as soon as it is unparked.
-pub(crate) const TOKEN_NORMAL: UnparkToken = UnparkToken(0);
-
-// UnparkToken used to indicate that the mutex is being handed off to the target
-// thread directly without unlocking it.
-pub(crate) const TOKEN_HANDOFF: UnparkToken = UnparkToken(1);
-
-const LOCKED_BIT: U8 = 1;
-const PARKED_BIT: U8 = 2;
-
-/// Raw mutex type backed by the parking lot.
-pub struct RawMutex {
-    state: AtomicU8,
-}
-
-unsafe impl RawMutexTrait for RawMutex {
-    const INIT: RawMutex = RawMutex {
-        state: ATOMIC_U8_INIT,
-    };
-
-    type GuardMarker = GuardNoSend;
-
-    #[inline]
-    fn lock(&self) {
-        if self
-            .state
-            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
-            .is_err()
-        {
-            self.lock_slow(None);
-        }
-        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-    }
-
-    #[inline]
-    fn try_lock(&self) -> bool {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            if state & LOCKED_BIT != 0 {
-                return false;
-            }
-            match self.state.compare_exchange_weak(
-                state,
-                state | LOCKED_BIT,
-                Ordering::Acquire,
-                Ordering::Relaxed,
-            ) {
-                Ok(_) => {
-                    unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-                    return true;
-                }
-                Err(x) => state = x,
-            }
-        }
-    }
-
-    #[inline]
-    fn unlock(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        if self
-            .state
-            .compare_exchange_weak(LOCKED_BIT, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.unlock_slow(false);
-    }
-}
-
-unsafe impl RawMutexFair for RawMutex {
-    #[inline]
-    fn unlock_fair(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        if self
-            .state
-            .compare_exchange_weak(LOCKED_BIT, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.unlock_slow(true);
-    }
-
-    #[inline]
-    fn bump(&self) {
-        if self.state.load(Ordering::Relaxed) & PARKED_BIT != 0 {
-            self.bump_slow();
-        }
-    }
-}
-
-unsafe impl RawMutexTimed for RawMutex {
-    type Duration = Duration;
-    type Instant = Instant;
-
-    #[inline]
-    fn try_lock_until(&self, timeout: Instant) -> bool {
-        let result = if self
-            .state
-            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
-            .is_ok()
-        {
-            true
-        } else {
-            self.lock_slow(Some(timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_lock_for(&self, timeout: Duration) -> bool {
-        let result = if self
-            .state
-            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
-            .is_ok()
-        {
-            true
-        } else {
-            self.lock_slow(Some(Instant::now() + timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-}
-
-impl RawMutex {
-    // Used by Condvar when requeuing threads to us, must be called while
-    // holding the queue lock.
-    #[inline]
-    pub(crate) fn mark_parked_if_locked(&self) -> bool {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            if state & LOCKED_BIT == 0 {
-                return false;
-            }
-            match self.state.compare_exchange_weak(
-                state,
-                state | PARKED_BIT,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            ) {
-                Ok(_) => return true,
-                Err(x) => state = x,
-            }
-        }
-    }
-
-    // Used by Condvar when requeuing threads to us, must be called while
-    // holding the queue lock.
-    #[inline]
-    pub(crate) fn mark_parked(&self) {
-        self.state.fetch_or(PARKED_BIT, Ordering::Relaxed);
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn lock_slow(&self, timeout: Option<Instant>) -> bool {
-        let mut spinwait = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // Grab the lock if it isn't locked, even if there is a queue on it
-            if state & LOCKED_BIT == 0 {
-                match self.state.compare_exchange_weak(
-                    state,
-                    state | LOCKED_BIT,
-                    Ordering::Acquire,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            // If there is no queue, try spinning a few times
-            if state & PARKED_BIT == 0 && spinwait.spin() {
-                state = self.state.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Set the parked bit
-            if state & PARKED_BIT == 0 {
-                if let Err(x) = self.state.compare_exchange_weak(
-                    state,
-                    state | PARKED_BIT,
-                    Ordering::Relaxed,
-                    Ordering::Relaxed,
-                ) {
-                    state = x;
-                    continue;
-                }
-            }
-
-            // Park our thread until we are woken up by an unlock
-            unsafe {
-                let addr = self as *const _ as usize;
-                let validate = || self.state.load(Ordering::Relaxed) == LOCKED_BIT | PARKED_BIT;
-                let before_sleep = || {};
-                let timed_out = |_, was_last_thread| {
-                    // Clear the parked bit if we were the last parked thread
-                    if was_last_thread {
-                        self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                    }
-                };
-                match parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    DEFAULT_PARK_TOKEN,
-                    timeout,
-                ) {
-                    // The thread that unparked us passed the lock on to us
-                    // directly without unlocking it.
-                    ParkResult::Unparked(TOKEN_HANDOFF) => return true,
-
-                    // We were unparked normally, try acquiring the lock again
-                    ParkResult::Unparked(_) => (),
-
-                    // The validation function failed, try locking again
-                    ParkResult::Invalid => (),
-
-                    // Timeout expired
-                    ParkResult::TimedOut => return false,
-                }
-            }
-
-            // Loop back and try locking again
-            spinwait.reset();
-            state = self.state.load(Ordering::Relaxed);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn unlock_slow(&self, force_fair: bool) {
-        // Unlock directly if there are no parked threads
-        if self
-            .state
-            .compare_exchange(LOCKED_BIT, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-
-        // Unpark one thread and leave the parked bit set if there might
-        // still be parked threads on this address.
-        unsafe {
-            let addr = self as *const _ as usize;
-            let callback = |result: UnparkResult| {
-                // If we are using a fair unlock then we should keep the
-                // mutex locked and hand it off to the unparked thread.
-                if result.unparked_threads != 0 && (force_fair || result.be_fair) {
-                    // Clear the parked bit if there are no more parked
-                    // threads.
-                    if !result.have_more_threads {
-                        self.state.store(LOCKED_BIT, Ordering::Relaxed);
-                    }
-                    return TOKEN_HANDOFF;
-                }
-
-                // Clear the locked bit, and the parked bit as well if there
-                // are no more parked threads.
-                if result.have_more_threads {
-                    self.state.store(PARKED_BIT, Ordering::Release);
-                } else {
-                    self.state.store(0, Ordering::Release);
-                }
-                TOKEN_NORMAL
-            };
-            parking_lot_core::unpark_one(addr, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn bump_slow(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        self.unlock_slow(true);
-        self.lock();
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/raw_rwlock.rs cargo-0.33.0/vendor/parking_lot/src/raw_rwlock.rs
--- cargo-0.32.0/vendor/parking_lot/src/raw_rwlock.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/raw_rwlock.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1402 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use deadlock;
-use elision::{have_elision, AtomicElisionExt};
-use lock_api::{
-    GuardNoSend, RawRwLock as RawRwLockTrait, RawRwLockDowngrade, RawRwLockFair,
-    RawRwLockRecursive, RawRwLockRecursiveTimed, RawRwLockTimed, RawRwLockUpgrade,
-    RawRwLockUpgradeDowngrade, RawRwLockUpgradeFair, RawRwLockUpgradeTimed,
-};
-use parking_lot_core::{self, FilterOp, ParkResult, ParkToken, SpinWait, UnparkResult};
-use raw_mutex::{TOKEN_HANDOFF, TOKEN_NORMAL};
-use std::cell::Cell;
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::time::{Duration, Instant};
-
-const PARKED_BIT: usize = 0b001;
-const UPGRADING_BIT: usize = 0b010;
-// A shared guard acquires a single guard resource
-const SHARED_GUARD: usize = 0b100;
-const GUARD_COUNT_MASK: usize = !(SHARED_GUARD - 1);
-// An exclusive lock acquires all of guard resource (i.e. it is exclusive)
-const EXCLUSIVE_GUARD: usize = GUARD_COUNT_MASK;
-// An upgradable lock acquires just over half of the guard resource
-// This should be (GUARD_COUNT_MASK + SHARED_GUARD) >> 1, however this might
-// overflow, so we shift before adding (which is okay since the least
-// significant bit is zero for both GUARD_COUNT_MASK and SHARED_GUARD)
-const UPGRADABLE_GUARD: usize = (GUARD_COUNT_MASK >> 1) + (SHARED_GUARD >> 1);
-
-// Token indicating what type of lock queued threads are trying to acquire
-const TOKEN_SHARED: ParkToken = ParkToken(SHARED_GUARD);
-const TOKEN_EXCLUSIVE: ParkToken = ParkToken(EXCLUSIVE_GUARD);
-const TOKEN_UPGRADABLE: ParkToken = ParkToken(UPGRADABLE_GUARD);
-const TOKEN_UPGRADING: ParkToken = ParkToken((EXCLUSIVE_GUARD - UPGRADABLE_GUARD) | UPGRADING_BIT);
-
-/// Raw reader-writer lock type backed by the parking lot.
-pub struct RawRwLock {
-    state: AtomicUsize,
-}
-
-unsafe impl RawRwLockTrait for RawRwLock {
-    const INIT: RawRwLock = RawRwLock {
-        state: ATOMIC_USIZE_INIT,
-    };
-
-    type GuardMarker = GuardNoSend;
-
-    #[inline]
-    fn lock_exclusive(&self) {
-        if self
-            .state
-            .compare_exchange_weak(0, EXCLUSIVE_GUARD, Ordering::Acquire, Ordering::Relaxed)
-            .is_err()
-        {
-            let result = self.lock_exclusive_slow(None);
-            debug_assert!(result);
-        }
-        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-    }
-
-    #[inline]
-    fn try_lock_exclusive(&self) -> bool {
-        if self
-            .state
-            .compare_exchange(0, EXCLUSIVE_GUARD, Ordering::Acquire, Ordering::Relaxed)
-            .is_ok()
-        {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-            true
-        } else {
-            false
-        }
-    }
-
-    #[inline]
-    fn unlock_exclusive(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        if self
-            .state
-            .compare_exchange_weak(EXCLUSIVE_GUARD, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.unlock_exclusive_slow(false);
-    }
-
-    #[inline]
-    fn lock_shared(&self) {
-        if !self.try_lock_shared_fast(false) {
-            let result = self.lock_shared_slow(false, None);
-            debug_assert!(result);
-        }
-        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-    }
-
-    #[inline]
-    fn try_lock_shared(&self) -> bool {
-        let result = if self.try_lock_shared_fast(false) {
-            true
-        } else {
-            self.try_lock_shared_slow(false)
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn unlock_shared(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        let state = self.state.load(Ordering::Relaxed);
-        if state & PARKED_BIT == 0
-            || (state & UPGRADING_BIT == 0 && state & GUARD_COUNT_MASK != SHARED_GUARD)
-        {
-            if have_elision() {
-                if self
-                    .state
-                    .elision_release(state, state - SHARED_GUARD)
-                    .is_ok()
-                {
-                    return;
-                }
-            } else {
-                if self
-                    .state
-                    .compare_exchange_weak(
-                        state,
-                        state - SHARED_GUARD,
-                        Ordering::Release,
-                        Ordering::Relaxed,
-                    )
-                    .is_ok()
-                {
-                    return;
-                }
-            }
-        }
-        self.unlock_shared_slow(false);
-    }
-}
-
-unsafe impl RawRwLockFair for RawRwLock {
-    #[inline]
-    fn unlock_shared_fair(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        let state = self.state.load(Ordering::Relaxed);
-        if state & PARKED_BIT == 0
-            || (state & UPGRADING_BIT == 0 && state & GUARD_COUNT_MASK != SHARED_GUARD)
-        {
-            if have_elision() {
-                if self
-                    .state
-                    .elision_release(state, state - SHARED_GUARD)
-                    .is_ok()
-                {
-                    return;
-                }
-            } else {
-                if self
-                    .state
-                    .compare_exchange_weak(
-                        state,
-                        state - SHARED_GUARD,
-                        Ordering::Release,
-                        Ordering::Relaxed,
-                    )
-                    .is_ok()
-                {
-                    return;
-                }
-            }
-        }
-        self.unlock_shared_slow(true);
-    }
-
-    #[inline]
-    fn unlock_exclusive_fair(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        if self
-            .state
-            .compare_exchange_weak(EXCLUSIVE_GUARD, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.unlock_exclusive_slow(true);
-    }
-
-    #[inline]
-    fn bump_shared(&self) {
-        if self.state.load(Ordering::Relaxed) & PARKED_BIT != 0 {
-            self.bump_shared_slow();
-        }
-    }
-
-    #[inline]
-    fn bump_exclusive(&self) {
-        if self.state.load(Ordering::Relaxed) & PARKED_BIT != 0 {
-            self.bump_exclusive_slow();
-        }
-    }
-}
-
-unsafe impl RawRwLockDowngrade for RawRwLock {
-    #[inline]
-    fn downgrade(&self) {
-        let state = self
-            .state
-            .fetch_sub(EXCLUSIVE_GUARD - SHARED_GUARD, Ordering::Release);
-
-        // Wake up parked shared and upgradable threads if there are any
-        if state & PARKED_BIT != 0 {
-            self.downgrade_slow();
-        }
-    }
-}
-
-unsafe impl RawRwLockTimed for RawRwLock {
-    type Duration = Duration;
-    type Instant = Instant;
-
-    #[inline]
-    fn try_lock_shared_for(&self, timeout: Self::Duration) -> bool {
-        let result = if self.try_lock_shared_fast(false) {
-            true
-        } else {
-            self.lock_shared_slow(false, Some(Instant::now() + timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_lock_shared_until(&self, timeout: Self::Instant) -> bool {
-        let result = if self.try_lock_shared_fast(false) {
-            true
-        } else {
-            self.lock_shared_slow(false, Some(timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_lock_exclusive_for(&self, timeout: Duration) -> bool {
-        let result = if self
-            .state
-            .compare_exchange_weak(0, EXCLUSIVE_GUARD, Ordering::Acquire, Ordering::Relaxed)
-            .is_ok()
-        {
-            true
-        } else {
-            self.lock_exclusive_slow(Some(Instant::now() + timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_lock_exclusive_until(&self, timeout: Instant) -> bool {
-        let result = if self
-            .state
-            .compare_exchange_weak(0, EXCLUSIVE_GUARD, Ordering::Acquire, Ordering::Relaxed)
-            .is_ok()
-        {
-            true
-        } else {
-            self.lock_exclusive_slow(Some(timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-}
-
-unsafe impl RawRwLockRecursive for RawRwLock {
-    #[inline]
-    fn lock_shared_recursive(&self) {
-        if !self.try_lock_shared_fast(true) {
-            let result = self.lock_shared_slow(true, None);
-            debug_assert!(result);
-        }
-        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-    }
-
-    #[inline]
-    fn try_lock_shared_recursive(&self) -> bool {
-        let result = if self.try_lock_shared_fast(true) {
-            true
-        } else {
-            self.try_lock_shared_slow(true)
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-}
-
-unsafe impl RawRwLockRecursiveTimed for RawRwLock {
-    #[inline]
-    fn try_lock_shared_recursive_for(&self, timeout: Self::Duration) -> bool {
-        let result = if self.try_lock_shared_fast(true) {
-            true
-        } else {
-            self.lock_shared_slow(true, Some(Instant::now() + timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_lock_shared_recursive_until(&self, timeout: Self::Instant) -> bool {
-        let result = if self.try_lock_shared_fast(true) {
-            true
-        } else {
-            self.lock_shared_slow(true, Some(timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-}
-
-unsafe impl RawRwLockUpgrade for RawRwLock {
-    #[inline]
-    fn lock_upgradable(&self) {
-        if !self.try_lock_upgradable_fast() {
-            let result = self.lock_upgradable_slow(None);
-            debug_assert!(result);
-        }
-        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-    }
-
-    #[inline]
-    fn try_lock_upgradable(&self) -> bool {
-        let result = if self.try_lock_upgradable_fast() {
-            true
-        } else {
-            self.try_lock_upgradable_slow()
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn unlock_upgradable(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        if self
-            .state
-            .compare_exchange_weak(UPGRADABLE_GUARD, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.unlock_upgradable_slow(false);
-    }
-
-    #[inline]
-    fn upgrade(&self) {
-        if self
-            .state
-            .compare_exchange_weak(
-                UPGRADABLE_GUARD,
-                EXCLUSIVE_GUARD,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            )
-            .is_err()
-        {
-            let result = self.upgrade_slow(None);
-            debug_assert!(result);
-        }
-    }
-
-    fn try_upgrade(&self) -> bool {
-        if self
-            .state
-            .compare_exchange_weak(
-                UPGRADABLE_GUARD,
-                EXCLUSIVE_GUARD,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            )
-            .is_ok()
-        {
-            true
-        } else {
-            self.try_upgrade_slow()
-        }
-    }
-}
-
-unsafe impl RawRwLockUpgradeFair for RawRwLock {
-    #[inline]
-    fn unlock_upgradable_fair(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        if self
-            .state
-            .compare_exchange_weak(UPGRADABLE_GUARD, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.unlock_upgradable_slow(true);
-    }
-
-    #[inline]
-    fn bump_upgradable(&self) {
-        if self.state.load(Ordering::Relaxed) & PARKED_BIT != 0 {
-            self.bump_upgradable_slow();
-        }
-    }
-}
-
-unsafe impl RawRwLockUpgradeDowngrade for RawRwLock {
-    #[inline]
-    fn downgrade_upgradable(&self) {
-        let state = self
-            .state
-            .fetch_sub(UPGRADABLE_GUARD - SHARED_GUARD, Ordering::Relaxed);
-
-        // Wake up parked shared and upgradable threads if there are any
-        if state & PARKED_BIT != 0 {
-            self.downgrade_upgradable_slow(state);
-        }
-    }
-
-    #[inline]
-    fn downgrade_to_upgradable(&self) {
-        let state = self
-            .state
-            .fetch_sub(EXCLUSIVE_GUARD - UPGRADABLE_GUARD, Ordering::Release);
-
-        // Wake up parked shared threads if there are any
-        if state & PARKED_BIT != 0 {
-            self.downgrade_to_upgradable_slow();
-        }
-    }
-}
-
-unsafe impl RawRwLockUpgradeTimed for RawRwLock {
-    #[inline]
-    fn try_lock_upgradable_until(&self, timeout: Instant) -> bool {
-        let result = if self.try_lock_upgradable_fast() {
-            true
-        } else {
-            self.lock_upgradable_slow(Some(timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_lock_upgradable_for(&self, timeout: Duration) -> bool {
-        let result = if self.try_lock_upgradable_fast() {
-            true
-        } else {
-            self.lock_upgradable_slow(Some(Instant::now() + timeout))
-        };
-        if result {
-            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
-        }
-        result
-    }
-
-    #[inline]
-    fn try_upgrade_until(&self, timeout: Instant) -> bool {
-        if self
-            .state
-            .compare_exchange_weak(
-                UPGRADABLE_GUARD,
-                EXCLUSIVE_GUARD,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            )
-            .is_ok()
-        {
-            true
-        } else {
-            self.upgrade_slow(Some(timeout))
-        }
-    }
-
-    #[inline]
-    fn try_upgrade_for(&self, timeout: Duration) -> bool {
-        if self
-            .state
-            .compare_exchange_weak(
-                UPGRADABLE_GUARD,
-                EXCLUSIVE_GUARD,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            )
-            .is_ok()
-        {
-            true
-        } else {
-            self.upgrade_slow(Some(Instant::now() + timeout))
-        }
-    }
-}
-
-impl RawRwLock {
-    #[inline(always)]
-    fn try_lock_shared_fast(&self, recursive: bool) -> bool {
-        let state = self.state.load(Ordering::Relaxed);
-
-        // We can't allow grabbing a shared lock while there are parked threads
-        // since that could lead to writer starvation.
-        if !recursive && state & PARKED_BIT != 0 {
-            return false;
-        }
-
-        // Use hardware lock elision to avoid cache conflicts when multiple
-        // readers try to acquire the lock. We only do this if the lock is
-        // completely empty since elision handles conflicts poorly.
-        if have_elision() && state == 0 {
-            self.state.elision_acquire(0, SHARED_GUARD).is_ok()
-        } else if let Some(new_state) = state.checked_add(SHARED_GUARD) {
-            self.state
-                .compare_exchange_weak(state, new_state, Ordering::Acquire, Ordering::Relaxed)
-                .is_ok()
-        } else {
-            false
-        }
-    }
-
-    #[inline(always)]
-    fn try_lock_upgradable_fast(&self) -> bool {
-        let state = self.state.load(Ordering::Relaxed);
-
-        // We can't allow grabbing an upgradable lock while there are parked threads
-        // since that could lead to writer starvation.
-        if state & PARKED_BIT != 0 {
-            return false;
-        }
-
-        if let Some(new_state) = state.checked_add(UPGRADABLE_GUARD) {
-            self.state
-                .compare_exchange_weak(state, new_state, Ordering::Acquire, Ordering::Relaxed)
-                .is_ok()
-        } else {
-            false
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn lock_exclusive_slow(&self, timeout: Option<Instant>) -> bool {
-        let mut spinwait = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // Grab the lock if it isn't locked, even if there are other
-            // threads parked.
-            if let Some(new_state) = state.checked_add(EXCLUSIVE_GUARD) {
-                match self.state.compare_exchange_weak(
-                    state,
-                    new_state,
-                    Ordering::Acquire,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            // If there are no parked threads and only one reader or writer, try
-            // spinning a few times.
-            if (state == EXCLUSIVE_GUARD || state == SHARED_GUARD || state == UPGRADABLE_GUARD)
-                && spinwait.spin()
-            {
-                state = self.state.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Park our thread until we are woken up by an unlock
-            unsafe {
-                let addr = self as *const _ as usize;
-                let validate = || {
-                    let mut state = self.state.load(Ordering::Relaxed);
-                    loop {
-                        // If the rwlock is free, abort the park and try to grab
-                        // it immediately.
-                        if state & GUARD_COUNT_MASK == 0 {
-                            return false;
-                        }
-
-                        // Nothing to do if the parked bit is already set
-                        if state & PARKED_BIT != 0 {
-                            return true;
-                        }
-
-                        // Set the parked bit
-                        match self.state.compare_exchange_weak(
-                            state,
-                            state | PARKED_BIT,
-                            Ordering::Relaxed,
-                            Ordering::Relaxed,
-                        ) {
-                            Ok(_) => return true,
-                            Err(x) => state = x,
-                        }
-                    }
-                };
-                let before_sleep = || {};
-                let timed_out = |_, was_last_thread| {
-                    // Clear the parked bit if we were the last parked thread
-                    if was_last_thread {
-                        self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                    }
-                };
-                match parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    TOKEN_EXCLUSIVE,
-                    timeout,
-                ) {
-                    // The thread that unparked us passed the lock on to us
-                    // directly without unlocking it.
-                    ParkResult::Unparked(TOKEN_HANDOFF) => return true,
-
-                    // We were unparked normally, try acquiring the lock again
-                    ParkResult::Unparked(_) => (),
-
-                    // The validation function failed, try locking again
-                    ParkResult::Invalid => (),
-
-                    // Timeout expired
-                    ParkResult::TimedOut => return false,
-                }
-            }
-
-            // Loop back and try locking again
-            spinwait.reset();
-            state = self.state.load(Ordering::Relaxed);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn unlock_exclusive_slow(&self, force_fair: bool) {
-        // Unlock directly if there are no parked threads
-        if self
-            .state
-            .compare_exchange(EXCLUSIVE_GUARD, 0, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        };
-
-        // There are threads to unpark. We unpark threads up to the guard capacity.
-        let guard_count = Cell::new(0usize);
-        unsafe {
-            let addr = self as *const _ as usize;
-            let filter = |ParkToken(token)| -> FilterOp {
-                match guard_count.get().checked_add(token) {
-                    Some(new_guard_count) => {
-                        guard_count.set(new_guard_count);
-                        FilterOp::Unpark
-                    }
-                    None => FilterOp::Stop,
-                }
-            };
-            let callback = |result: UnparkResult| {
-                // If we are using a fair unlock then we should keep the
-                // rwlock locked and hand it off to the unparked threads.
-                if result.unparked_threads != 0 && (force_fair || result.be_fair) {
-                    // We need to set the guard count accordingly.
-                    let mut new_state = guard_count.get();
-
-                    if result.have_more_threads {
-                        new_state |= PARKED_BIT;
-                    }
-
-                    self.state.store(new_state, Ordering::Release);
-                    TOKEN_HANDOFF
-                } else {
-                    // Clear the parked bit if there are no more parked threads.
-                    if result.have_more_threads {
-                        self.state.store(PARKED_BIT, Ordering::Release);
-                    } else {
-                        self.state.store(0, Ordering::Release);
-                    }
-                    TOKEN_NORMAL
-                }
-            };
-            parking_lot_core::unpark_filter(addr, filter, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn downgrade_slow(&self) {
-        unsafe {
-            let addr = self as *const _ as usize;
-            let mut guard_count = SHARED_GUARD;
-            let filter = |ParkToken(token)| -> FilterOp {
-                match guard_count.checked_add(token) {
-                    Some(new_guard_count) => {
-                        guard_count = new_guard_count;
-                        FilterOp::Unpark
-                    }
-                    None => FilterOp::Stop,
-                }
-            };
-            let callback = |result: UnparkResult| {
-                // Clear the parked bit if there no more parked threads
-                if !result.have_more_threads {
-                    self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                }
-                TOKEN_NORMAL
-            };
-            parking_lot_core::unpark_filter(addr, filter, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn downgrade_to_upgradable_slow(&self) {
-        unsafe {
-            let addr = self as *const _ as usize;
-            let mut guard_count = UPGRADABLE_GUARD;
-            let filter = |ParkToken(token)| -> FilterOp {
-                match guard_count.checked_add(token) {
-                    Some(new_guard_count) => {
-                        guard_count = new_guard_count;
-                        FilterOp::Unpark
-                    }
-                    None => FilterOp::Stop,
-                }
-            };
-            let callback = |result: UnparkResult| {
-                // Clear the parked bit if there no more parked threads
-                if !result.have_more_threads {
-                    self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                }
-                TOKEN_NORMAL
-            };
-            parking_lot_core::unpark_filter(addr, filter, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn lock_shared_slow(&self, recursive: bool, timeout: Option<Instant>) -> bool {
-        let mut spinwait = SpinWait::new();
-        let mut spinwait_shared = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
-        let mut unparked = false;
-        loop {
-            // Use hardware lock elision to avoid cache conflicts when multiple
-            // readers try to acquire the lock. We only do this if the lock is
-            // completely empty since elision handles conflicts poorly.
-            if have_elision() && state == 0 {
-                match self.state.elision_acquire(0, SHARED_GUARD) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                }
-            }
-
-            // Grab the lock if there are no exclusive threads locked or
-            // waiting. However if we were unparked then we are allowed to grab
-            // the lock even if there are pending exclusive threads.
-            if unparked || recursive || state & PARKED_BIT == 0 {
-                if let Some(new_state) = state.checked_add(SHARED_GUARD) {
-                    if self
-                        .state
-                        .compare_exchange_weak(
-                            state,
-                            new_state,
-                            Ordering::Acquire,
-                            Ordering::Relaxed,
-                        )
-                        .is_ok()
-                    {
-                        return true;
-                    }
-
-                    // If there is high contention on the reader count then we want
-                    // to leave some time between attempts to acquire the lock to
-                    // let other threads make progress.
-                    spinwait_shared.spin_no_yield();
-                    state = self.state.load(Ordering::Relaxed);
-                    continue;
-                } else {
-                    // We were unparked spuriously, reset unparked flag.
-                    unparked = false;
-                }
-            }
-
-            // If there are no parked threads, try spinning a few times
-            if state & PARKED_BIT == 0 && spinwait.spin() {
-                state = self.state.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Park our thread until we are woken up by an unlock
-            unsafe {
-                let addr = self as *const _ as usize;
-                let validate = || {
-                    let mut state = self.state.load(Ordering::Relaxed);
-                    loop {
-                        // Nothing to do if the parked bit is already set
-                        if state & PARKED_BIT != 0 {
-                            return true;
-                        }
-
-                        // If the parked bit is not set then it means we are at
-                        // the front of the queue. If there is space for another
-                        // lock then we should abort the park and try acquiring
-                        // the lock again.
-                        if state & GUARD_COUNT_MASK != GUARD_COUNT_MASK {
-                            return false;
-                        }
-
-                        // Set the parked bit
-                        match self.state.compare_exchange_weak(
-                            state,
-                            state | PARKED_BIT,
-                            Ordering::Relaxed,
-                            Ordering::Relaxed,
-                        ) {
-                            Ok(_) => return true,
-                            Err(x) => state = x,
-                        }
-                    }
-                };
-                let before_sleep = || {};
-                let timed_out = |_, was_last_thread| {
-                    // Clear the parked bit if we were the last parked thread
-                    if was_last_thread {
-                        self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                    }
-                };
-                match parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    TOKEN_SHARED,
-                    timeout,
-                ) {
-                    // The thread that unparked us passed the lock on to us
-                    // directly without unlocking it.
-                    ParkResult::Unparked(TOKEN_HANDOFF) => return true,
-
-                    // We were unparked normally, try acquiring the lock again
-                    ParkResult::Unparked(_) => (),
-
-                    // The validation function failed, try locking again
-                    ParkResult::Invalid => (),
-
-                    // Timeout expired
-                    ParkResult::TimedOut => return false,
-                }
-            }
-
-            // Loop back and try locking again
-            spinwait.reset();
-            spinwait_shared.reset();
-            state = self.state.load(Ordering::Relaxed);
-            unparked = true;
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn try_lock_shared_slow(&self, recursive: bool) -> bool {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            if !recursive && state & PARKED_BIT != 0 {
-                return false;
-            }
-            if have_elision() && state == 0 {
-                match self.state.elision_acquire(0, SHARED_GUARD) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                }
-            } else {
-                match state.checked_add(SHARED_GUARD) {
-                    Some(new_state) => match self.state.compare_exchange_weak(
-                        state,
-                        new_state,
-                        Ordering::Acquire,
-                        Ordering::Relaxed,
-                    ) {
-                        Ok(_) => return true,
-                        Err(x) => state = x,
-                    },
-                    None => return false,
-                }
-            }
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn unlock_shared_slow(&self, force_fair: bool) {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // Just release the lock if there are no parked thread or if we are
-            // not the last shared thread.
-            if state & PARKED_BIT == 0
-                || (state & UPGRADING_BIT == 0 && state & GUARD_COUNT_MASK != SHARED_GUARD)
-                || (state & UPGRADING_BIT != 0
-                    && state & GUARD_COUNT_MASK != UPGRADABLE_GUARD + SHARED_GUARD)
-            {
-                match self.state.compare_exchange_weak(
-                    state,
-                    state - SHARED_GUARD,
-                    Ordering::Release,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            break;
-        }
-
-        // There are threads to unpark. If there is a thread waiting to be
-        // upgraded, we find that thread and let it upgrade, otherwise we
-        // unpark threads up to the guard capacity. Note that there is a
-        // potential race condition here: another thread might grab a shared
-        // lock between now and when we actually release our lock.
-        let additional_guards = Cell::new(0usize);
-        let has_upgraded = Cell::new(if state & UPGRADING_BIT == 0 {
-            None
-        } else {
-            Some(false)
-        });
-        unsafe {
-            let addr = self as *const _ as usize;
-            let filter = |ParkToken(token)| -> FilterOp {
-                match has_upgraded.get() {
-                    None => match additional_guards.get().checked_add(token) {
-                        Some(x) => {
-                            additional_guards.set(x);
-                            FilterOp::Unpark
-                        }
-                        None => FilterOp::Stop,
-                    },
-                    Some(false) => if token & UPGRADING_BIT != 0 {
-                        additional_guards.set(token & !UPGRADING_BIT);
-                        has_upgraded.set(Some(true));
-                        FilterOp::Unpark
-                    } else {
-                        FilterOp::Skip
-                    },
-                    Some(true) => FilterOp::Stop,
-                }
-            };
-            let callback = |result: UnparkResult| {
-                let mut state = self.state.load(Ordering::Relaxed);
-                loop {
-                    // Release our shared lock
-                    let mut new_state = state - SHARED_GUARD;
-
-                    // Clear the parked bit if there are no more threads in
-                    // the queue.
-                    if !result.have_more_threads {
-                        new_state &= !PARKED_BIT;
-                    }
-
-                    // Clear the upgrading bit if we are upgrading a thread.
-                    if let Some(true) = has_upgraded.get() {
-                        new_state &= !UPGRADING_BIT;
-                    }
-
-                    // Consider using fair unlocking. If we are, then we should set
-                    // the state to the new value and tell the threads that we are
-                    // handing the lock directly.
-                    let token = if result.unparked_threads != 0 && (force_fair || result.be_fair) {
-                        match new_state.checked_add(additional_guards.get()) {
-                            Some(x) => {
-                                new_state = x;
-                                TOKEN_HANDOFF
-                            }
-                            None => TOKEN_NORMAL,
-                        }
-                    } else {
-                        TOKEN_NORMAL
-                    };
-
-                    match self.state.compare_exchange_weak(
-                        state,
-                        new_state,
-                        Ordering::Release,
-                        Ordering::Relaxed,
-                    ) {
-                        Ok(_) => return token,
-                        Err(x) => state = x,
-                    }
-                }
-            };
-            parking_lot_core::unpark_filter(addr, filter, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn lock_upgradable_slow(&self, timeout: Option<Instant>) -> bool {
-        let mut spinwait = SpinWait::new();
-        let mut spinwait_shared = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
-        let mut unparked = false;
-        loop {
-            // Grab the lock if there are no exclusive or upgradable threads
-            // locked or waiting. However if we were unparked then we are
-            // allowed to grab the lock even if there are pending exclusive threads.
-            if unparked || state & PARKED_BIT == 0 {
-                if let Some(new_state) = state.checked_add(UPGRADABLE_GUARD) {
-                    if self
-                        .state
-                        .compare_exchange_weak(
-                            state,
-                            new_state,
-                            Ordering::Acquire,
-                            Ordering::Relaxed,
-                        )
-                        .is_ok()
-                    {
-                        return true;
-                    }
-
-                    // If there is high contention on the reader count then we want
-                    // to leave some time between attempts to acquire the lock to
-                    // let other threads make progress.
-                    spinwait_shared.spin_no_yield();
-                    state = self.state.load(Ordering::Relaxed);
-                    continue;
-                } else {
-                    // We were unparked spuriously, reset unparked flag.
-                    unparked = false;
-                }
-            }
-
-            // If there are no parked threads, try spinning a few times
-            if state & PARKED_BIT == 0 && spinwait.spin() {
-                state = self.state.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Park our thread until we are woken up by an unlock
-            unsafe {
-                let addr = self as *const _ as usize;
-                let validate = || {
-                    let mut state = self.state.load(Ordering::Relaxed);
-                    loop {
-                        // Nothing to do if the parked bit is already set
-                        if state & PARKED_BIT != 0 {
-                            return true;
-                        }
-
-                        // If the parked bit is not set then it means we are at
-                        // the front of the queue. If there is space for an
-                        // upgradable lock then we should abort the park and try
-                        // acquiring the lock again.
-                        if state & UPGRADABLE_GUARD != UPGRADABLE_GUARD {
-                            return false;
-                        }
-
-                        // Set the parked bit
-                        match self.state.compare_exchange_weak(
-                            state,
-                            state | PARKED_BIT,
-                            Ordering::Relaxed,
-                            Ordering::Relaxed,
-                        ) {
-                            Ok(_) => return true,
-                            Err(x) => state = x,
-                        }
-                    }
-                };
-                let before_sleep = || {};
-                let timed_out = |_, was_last_thread| {
-                    // Clear the parked bit if we were the last parked thread
-                    if was_last_thread {
-                        self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                    }
-                };
-                match parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    TOKEN_UPGRADABLE,
-                    timeout,
-                ) {
-                    // The thread that unparked us passed the lock on to us
-                    // directly without unlocking it.
-                    ParkResult::Unparked(TOKEN_HANDOFF) => return true,
-
-                    // We were unparked normally, try acquiring the lock again
-                    ParkResult::Unparked(_) => (),
-
-                    // The validation function failed, try locking again
-                    ParkResult::Invalid => (),
-
-                    // Timeout expired
-                    ParkResult::TimedOut => return false,
-                }
-            }
-
-            // Loop back and try locking again
-            spinwait.reset();
-            spinwait_shared.reset();
-            state = self.state.load(Ordering::Relaxed);
-            unparked = true;
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn try_lock_upgradable_slow(&self) -> bool {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            if state & PARKED_BIT != 0 {
-                return false;
-            }
-
-            match state.checked_add(UPGRADABLE_GUARD) {
-                Some(new_state) => match self.state.compare_exchange_weak(
-                    state,
-                    new_state,
-                    Ordering::Acquire,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                },
-                None => return false,
-            }
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn unlock_upgradable_slow(&self, force_fair: bool) {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // Just release the lock if there are no parked threads.
-            if state & PARKED_BIT == 0 {
-                match self.state.compare_exchange_weak(
-                    state,
-                    state - UPGRADABLE_GUARD,
-                    Ordering::Release,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            break;
-        }
-
-        // There are threads to unpark. We unpark threads up to the guard capacity.
-        let additional_guards = Cell::new(0usize);
-        unsafe {
-            let addr = self as *const _ as usize;
-            let filter = |ParkToken(token)| -> FilterOp {
-                match additional_guards.get().checked_add(token) {
-                    Some(x) => {
-                        additional_guards.set(x);
-                        FilterOp::Unpark
-                    }
-                    None => FilterOp::Stop,
-                }
-            };
-            let callback = |result: UnparkResult| {
-                let mut state = self.state.load(Ordering::Relaxed);
-                loop {
-                    // Release our upgradable lock
-                    let mut new_state = state - UPGRADABLE_GUARD;
-
-                    // Clear the parked bit if there are no more threads in
-                    // the queue
-                    if !result.have_more_threads {
-                        new_state &= !PARKED_BIT;
-                    }
-
-                    // Consider using fair unlocking. If we are, then we should set
-                    // the state to the new value and tell the threads that we are
-                    // handing the lock directly.
-                    let token = if result.unparked_threads != 0 && (force_fair || result.be_fair) {
-                        match new_state.checked_add(additional_guards.get()) {
-                            Some(x) => {
-                                new_state = x;
-                                TOKEN_HANDOFF
-                            }
-                            None => TOKEN_NORMAL,
-                        }
-                    } else {
-                        TOKEN_NORMAL
-                    };
-
-                    match self.state.compare_exchange_weak(
-                        state,
-                        new_state,
-                        Ordering::Release,
-                        Ordering::Relaxed,
-                    ) {
-                        Ok(_) => return token,
-                        Err(x) => state = x,
-                    }
-                }
-            };
-            parking_lot_core::unpark_filter(addr, filter, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn downgrade_upgradable_slow(&self, state: usize) {
-        unsafe {
-            let addr = self as *const _ as usize;
-            let mut guard_count = (state & GUARD_COUNT_MASK) - UPGRADABLE_GUARD;
-            let filter = |ParkToken(token)| -> FilterOp {
-                match guard_count.checked_add(token) {
-                    Some(x) => {
-                        guard_count = x;
-                        FilterOp::Unpark
-                    }
-                    None => FilterOp::Stop,
-                }
-            };
-            let callback = |result: UnparkResult| {
-                // Clear the parked bit if there no more parked threads
-                if !result.have_more_threads {
-                    self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
-                }
-                TOKEN_NORMAL
-            };
-            parking_lot_core::unpark_filter(addr, filter, callback);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn try_upgrade_slow(&self) -> bool {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            match state.checked_add(EXCLUSIVE_GUARD - SHARED_GUARD) {
-                Some(new_state) => match self.state.compare_exchange_weak(
-                    state,
-                    new_state,
-                    Ordering::Relaxed,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                },
-                None => return false,
-            }
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn upgrade_slow(&self, timeout: Option<Instant>) -> bool {
-        let mut spinwait = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // Grab the lock if it isn't locked, even if there are other
-            // threads parked.
-            if let Some(new_state) = state.checked_add(EXCLUSIVE_GUARD - UPGRADABLE_GUARD) {
-                match self.state.compare_exchange_weak(
-                    state,
-                    new_state,
-                    Ordering::Acquire,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return true,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            // If there are no parked threads and only one other reader, try
-            // spinning a few times.
-            if state == UPGRADABLE_GUARD | SHARED_GUARD && spinwait.spin() {
-                state = self.state.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Park our thread until we are woken up by an unlock
-            unsafe {
-                let addr = self as *const _ as usize;
-                let validate = || {
-                    let mut state = self.state.load(Ordering::Relaxed);
-                    loop {
-                        // If the rwlock is free, abort the park and try to grab
-                        // it immediately.
-                        if state & GUARD_COUNT_MASK == UPGRADABLE_GUARD {
-                            return false;
-                        }
-
-                        // Set the upgrading and parked bits
-                        match self.state.compare_exchange_weak(
-                            state,
-                            state | (UPGRADING_BIT | PARKED_BIT),
-                            Ordering::Relaxed,
-                            Ordering::Relaxed,
-                        ) {
-                            Ok(_) => return true,
-                            Err(x) => state = x,
-                        }
-                    }
-                };
-                let before_sleep = || {};
-                let timed_out = |_, was_last_thread| {
-                    // Clear the upgrading bit
-                    let mut flags = UPGRADING_BIT;
-
-                    // Clear the parked bit if we were the last parked thread
-                    if was_last_thread {
-                        flags |= PARKED_BIT;
-                    }
-
-                    self.state.fetch_and(!flags, Ordering::Relaxed);
-                };
-                match parking_lot_core::park(
-                    addr,
-                    validate,
-                    before_sleep,
-                    timed_out,
-                    TOKEN_UPGRADING,
-                    timeout,
-                ) {
-                    // The thread that unparked us passed the lock on to us
-                    // directly without unlocking it.
-                    ParkResult::Unparked(TOKEN_HANDOFF) => return true,
-
-                    // We were unparked normally, try acquiring the lock again
-                    ParkResult::Unparked(_) => (),
-
-                    // The validation function failed, try locking again
-                    ParkResult::Invalid => (),
-
-                    // Timeout expired
-                    ParkResult::TimedOut => return false,
-                }
-            }
-
-            // Loop back and try locking again
-            spinwait.reset();
-            state = self.state.load(Ordering::Relaxed);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn bump_shared_slow(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        self.unlock_shared_slow(true);
-        self.lock_shared();
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn bump_exclusive_slow(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        self.unlock_exclusive_slow(true);
-        self.lock_exclusive();
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn bump_upgradable_slow(&self) {
-        unsafe { deadlock::release_resource(self as *const _ as usize) };
-        self.unlock_upgradable_slow(true);
-        self.lock_upgradable();
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/remutex.rs cargo-0.33.0/vendor/parking_lot/src/remutex.rs
--- cargo-0.32.0/vendor/parking_lot/src/remutex.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/remutex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use lock_api::{self, GetThreadId};
-use raw_mutex::RawMutex;
-
-/// Implementation of the `GetThreadId` trait for `lock_api::ReentrantMutex`.
-pub struct RawThreadId;
-
-unsafe impl GetThreadId for RawThreadId {
-    const INIT: RawThreadId = RawThreadId;
-
-    fn nonzero_thread_id(&self) -> usize {
-        // The address of a thread-local variable is guaranteed to be unique to the
-        // current thread, and is also guaranteed to be non-zero.
-        thread_local!(static KEY: u8 = unsafe { ::std::mem::uninitialized() });
-        KEY.with(|x| x as *const _ as usize)
-    }
-}
-
-/// A mutex which can be recursively locked by a single thread.
-///
-/// This type is identical to `Mutex` except for the following points:
-///
-/// - Locking multiple times from the same thread will work correctly instead of
-///   deadlocking.
-/// - `ReentrantMutexGuard` does not give mutable references to the locked data.
-///   Use a `RefCell` if you need this.
-///
-/// See [`Mutex`](struct.Mutex.html) for more details about the underlying mutex
-/// primitive.
-pub type ReentrantMutex<T> = lock_api::ReentrantMutex<RawMutex, RawThreadId, T>;
-
-/// An RAII implementation of a "scoped lock" of a reentrant mutex. When this structure
-/// is dropped (falls out of scope), the lock will be unlocked.
-///
-/// The data protected by the mutex can be accessed through this guard via its
-/// `Deref` implementation.
-pub type ReentrantMutexGuard<'a, T> =
-    lock_api::ReentrantMutexGuard<'a, RawMutex, RawThreadId, T>;
-
-/// An RAII mutex guard returned by `ReentrantMutexGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedReentrantMutexGuard` and `ReentrantMutexGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-pub type MappedReentrantMutexGuard<'a, T> =
-    lock_api::MappedReentrantMutexGuard<'a, RawMutex, RawThreadId, T>;
-
-#[cfg(test)]
-mod tests {
-    use std::cell::RefCell;
-    use std::sync::Arc;
-    use std::thread;
-    use ReentrantMutex;
-
-    #[test]
-    fn smoke() {
-        let m = ReentrantMutex::new(());
-        {
-            let a = m.lock();
-            {
-                let b = m.lock();
-                {
-                    let c = m.lock();
-                    assert_eq!(*c, ());
-                }
-                assert_eq!(*b, ());
-            }
-            assert_eq!(*a, ());
-        }
-    }
-
-    #[test]
-    fn is_mutex() {
-        let m = Arc::new(ReentrantMutex::new(RefCell::new(0)));
-        let m2 = m.clone();
-        let lock = m.lock();
-        let child = thread::spawn(move || {
-            let lock = m2.lock();
-            assert_eq!(*lock.borrow(), 4950);
-        });
-        for i in 0..100 {
-            let lock = m.lock();
-            *lock.borrow_mut() += i;
-        }
-        drop(lock);
-        child.join().unwrap();
-    }
-
-    #[test]
-    fn trylock_works() {
-        let m = Arc::new(ReentrantMutex::new(()));
-        let m2 = m.clone();
-        let _lock = m.try_lock();
-        let _lock2 = m.try_lock();
-        thread::spawn(move || {
-            let lock = m2.try_lock();
-            assert!(lock.is_none());
-        }).join()
-            .unwrap();
-        let _lock3 = m.try_lock();
-    }
-
-    #[test]
-    fn test_reentrant_mutex_debug() {
-        let mutex = ReentrantMutex::new(vec![0u8, 10]);
-
-        assert_eq!(format!("{:?}", mutex), "ReentrantMutex { data: [0, 10] }");
-        assert_eq!(
-            format!("{:#?}", mutex),
-            "ReentrantMutex {
-    data: [
-        0,
-        10
-    ]
-}"
-        );
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/rwlock.rs cargo-0.33.0/vendor/parking_lot/src/rwlock.rs
--- cargo-0.32.0/vendor/parking_lot/src/rwlock.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/rwlock.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,564 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use lock_api;
-use raw_rwlock::RawRwLock;
-
-/// A reader-writer lock
-///
-/// This type of lock allows a number of readers or at most one writer at any
-/// point in time. The write portion of this lock typically allows modification
-/// of the underlying data (exclusive access) and the read portion of this lock
-/// typically allows for read-only access (shared access).
-///
-/// This lock uses a task-fair locking policy which avoids both reader and
-/// writer starvation. This means that readers trying to acquire the lock will
-/// block even if the lock is unlocked when there are writers waiting to acquire
-/// the lock. Because of this, attempts to recursively acquire a read lock
-/// within a single thread may result in a deadlock.
-///
-/// The type parameter `T` represents the data that this lock protects. It is
-/// required that `T` satisfies `Send` to be shared across threads and `Sync` to
-/// allow concurrent access through readers. The RAII guards returned from the
-/// locking methods implement `Deref` (and `DerefMut` for the `write` methods)
-/// to allow access to the contained of the lock.
-///
-/// # Fairness
-///
-/// A typical unfair lock can often end up in a situation where a single thread
-/// quickly acquires and releases the same lock in succession, which can starve
-/// other threads waiting to acquire the rwlock. While this improves performance
-/// because it doesn't force a context switch when a thread tries to re-acquire
-/// a rwlock it has just released, this can starve other threads.
-///
-/// This rwlock uses [eventual fairness](https://trac.webkit.org/changeset/203350)
-/// to ensure that the lock will be fair on average without sacrificing
-/// performance. This is done by forcing a fair unlock on average every 0.5ms,
-/// which will force the lock to go to the next thread waiting for the rwlock.
-///
-/// Additionally, any critical section longer than 1ms will always use a fair
-/// unlock, which has a negligible performance impact compared to the length of
-/// the critical section.
-///
-/// You can also force a fair unlock by calling `RwLockReadGuard::unlock_fair`
-/// or `RwLockWriteGuard::unlock_fair` when unlocking a mutex instead of simply
-/// dropping the guard.
-///
-/// # Differences from the standard library `RwLock`
-///
-/// - Supports atomically downgrading a write lock into a read lock.
-/// - Task-fair locking policy instead of an unspecified platform default.
-/// - No poisoning, the lock is released normally on panic.
-/// - Only requires 1 word of space, whereas the standard library boxes the
-///   `RwLock` due to platform limitations.
-/// - Can be statically constructed (requires the `const_fn` nightly feature).
-/// - Does not require any drop glue when dropped.
-/// - Inline fast path for the uncontended case.
-/// - Efficient handling of micro-contention using adaptive spinning.
-/// - Allows raw locking & unlocking without a guard.
-/// - Supports eventual fairness so that the rwlock is fair on average.
-/// - Optionally allows making the rwlock fair by calling
-///   `RwLockReadGuard::unlock_fair` and `RwLockWriteGuard::unlock_fair`.
-///
-/// # Examples
-///
-/// ```
-/// use parking_lot::RwLock;
-///
-/// let lock = RwLock::new(5);
-///
-/// // many reader locks can be held at once
-/// {
-///     let r1 = lock.read();
-///     let r2 = lock.read();
-///     assert_eq!(*r1, 5);
-///     assert_eq!(*r2, 5);
-/// } // read locks are dropped at this point
-///
-/// // only one write lock may be held, however
-/// {
-///     let mut w = lock.write();
-///     *w += 1;
-///     assert_eq!(*w, 6);
-/// } // write lock is dropped here
-/// ```
-pub type RwLock<T> = lock_api::RwLock<RawRwLock, T>;
-
-/// RAII structure used to release the shared read access of a lock when
-/// dropped.
-pub type RwLockReadGuard<'a, T> = lock_api::RwLockReadGuard<'a, RawRwLock, T>;
-
-/// RAII structure used to release the exclusive write access of a lock when
-/// dropped.
-pub type RwLockWriteGuard<'a, T> = lock_api::RwLockWriteGuard<'a, RawRwLock, T>;
-
-/// An RAII read lock guard returned by `RwLockReadGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedRwLockReadGuard` and `RwLockReadGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-pub type MappedRwLockReadGuard<'a, T> = lock_api::MappedRwLockReadGuard<'a, RawRwLock, T>;
-
-/// An RAII write lock guard returned by `RwLockWriteGuard::map`, which can point to a
-/// subfield of the protected data.
-///
-/// The main difference between `MappedRwLockWriteGuard` and `RwLockWriteGuard` is that the
-/// former doesn't support temporarily unlocking and re-locking, since that
-/// could introduce soundness issues if the locked object is modified by another
-/// thread.
-pub type MappedRwLockWriteGuard<'a, T> = lock_api::MappedRwLockWriteGuard<'a, RawRwLock, T>;
-
-/// RAII structure used to release the upgradable read access of a lock when
-/// dropped.
-pub type RwLockUpgradableReadGuard<'a, T> =
-    lock_api::RwLockUpgradableReadGuard<'a, RawRwLock, T>;
-
-#[cfg(test)]
-mod tests {
-    extern crate rand;
-    use self::rand::Rng;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-    use std::sync::mpsc::channel;
-    use std::sync::Arc;
-    use std::thread;
-    use std::time::Duration;
-    use {RwLock, RwLockUpgradableReadGuard, RwLockWriteGuard};
-
-    #[derive(Eq, PartialEq, Debug)]
-    struct NonCopy(i32);
-
-    #[test]
-    fn smoke() {
-        let l = RwLock::new(());
-        drop(l.read());
-        drop(l.write());
-        drop(l.upgradable_read());
-        drop((l.read(), l.read()));
-        drop((l.read(), l.upgradable_read()));
-        drop(l.write());
-    }
-
-    #[test]
-    fn frob() {
-        const N: u32 = 10;
-        const M: u32 = 1000;
-
-        let r = Arc::new(RwLock::new(()));
-
-        let (tx, rx) = channel::<()>();
-        for _ in 0..N {
-            let tx = tx.clone();
-            let r = r.clone();
-            thread::spawn(move || {
-                let mut rng = rand::thread_rng();
-                for _ in 0..M {
-                    if rng.gen_bool(1.0 / N as f64) {
-                        drop(r.write());
-                    } else {
-                        drop(r.read());
-                    }
-                }
-                drop(tx);
-            });
-        }
-        drop(tx);
-        let _ = rx.recv();
-    }
-
-    #[test]
-    fn test_rw_arc_no_poison_wr() {
-        let arc = Arc::new(RwLock::new(1));
-        let arc2 = arc.clone();
-        let _: Result<(), _> = thread::spawn(move || {
-            let _lock = arc2.write();
-            panic!();
-        }).join();
-        let lock = arc.read();
-        assert_eq!(*lock, 1);
-    }
-
-    #[test]
-    fn test_rw_arc_no_poison_ww() {
-        let arc = Arc::new(RwLock::new(1));
-        let arc2 = arc.clone();
-        let _: Result<(), _> = thread::spawn(move || {
-            let _lock = arc2.write();
-            panic!();
-        }).join();
-        let lock = arc.write();
-        assert_eq!(*lock, 1);
-    }
-
-    #[test]
-    fn test_rw_arc_no_poison_rr() {
-        let arc = Arc::new(RwLock::new(1));
-        let arc2 = arc.clone();
-        let _: Result<(), _> = thread::spawn(move || {
-            let _lock = arc2.read();
-            panic!();
-        }).join();
-        let lock = arc.read();
-        assert_eq!(*lock, 1);
-    }
-
-    #[test]
-    fn test_rw_arc_no_poison_rw() {
-        let arc = Arc::new(RwLock::new(1));
-        let arc2 = arc.clone();
-        let _: Result<(), _> = thread::spawn(move || {
-            let _lock = arc2.read();
-            panic!()
-        }).join();
-        let lock = arc.write();
-        assert_eq!(*lock, 1);
-    }
-
-    #[test]
-    fn test_ruw_arc() {
-        let arc = Arc::new(RwLock::new(0));
-        let arc2 = arc.clone();
-        let (tx, rx) = channel();
-
-        thread::spawn(move || {
-            for _ in 0..10 {
-                let mut lock = arc2.write();
-                let tmp = *lock;
-                *lock = -1;
-                thread::yield_now();
-                *lock = tmp + 1;
-            }
-            tx.send(()).unwrap();
-        });
-
-        let mut children = Vec::new();
-
-        // Upgradable readers try to catch the writer in the act and also
-        // try to touch the value
-        for _ in 0..5 {
-            let arc3 = arc.clone();
-            children.push(thread::spawn(move || {
-                let lock = arc3.upgradable_read();
-                let tmp = *lock;
-                assert!(tmp >= 0);
-                thread::yield_now();
-                let mut lock = RwLockUpgradableReadGuard::upgrade(lock);
-                assert_eq!(tmp, *lock);
-                *lock = -1;
-                thread::yield_now();
-                *lock = tmp + 1;
-            }));
-        }
-
-        // Readers try to catch the writers in the act
-        for _ in 0..5 {
-            let arc4 = arc.clone();
-            children.push(thread::spawn(move || {
-                let lock = arc4.read();
-                assert!(*lock >= 0);
-            }));
-        }
-
-        // Wait for children to pass their asserts
-        for r in children {
-            assert!(r.join().is_ok());
-        }
-
-        // Wait for writer to finish
-        rx.recv().unwrap();
-        let lock = arc.read();
-        assert_eq!(*lock, 15);
-    }
-
-    #[test]
-    fn test_rw_arc() {
-        let arc = Arc::new(RwLock::new(0));
-        let arc2 = arc.clone();
-        let (tx, rx) = channel();
-
-        thread::spawn(move || {
-            let mut lock = arc2.write();
-            for _ in 0..10 {
-                let tmp = *lock;
-                *lock = -1;
-                thread::yield_now();
-                *lock = tmp + 1;
-            }
-            tx.send(()).unwrap();
-        });
-
-        // Readers try to catch the writer in the act
-        let mut children = Vec::new();
-        for _ in 0..5 {
-            let arc3 = arc.clone();
-            children.push(thread::spawn(move || {
-                let lock = arc3.read();
-                assert!(*lock >= 0);
-            }));
-        }
-
-        // Wait for children to pass their asserts
-        for r in children {
-            assert!(r.join().is_ok());
-        }
-
-        // Wait for writer to finish
-        rx.recv().unwrap();
-        let lock = arc.read();
-        assert_eq!(*lock, 10);
-    }
-
-    #[test]
-    fn test_rw_arc_access_in_unwind() {
-        let arc = Arc::new(RwLock::new(1));
-        let arc2 = arc.clone();
-        let _ = thread::spawn(move || -> () {
-            struct Unwinder {
-                i: Arc<RwLock<isize>>,
-            }
-            impl Drop for Unwinder {
-                fn drop(&mut self) {
-                    let mut lock = self.i.write();
-                    *lock += 1;
-                }
-            }
-            let _u = Unwinder { i: arc2 };
-            panic!();
-        }).join();
-        let lock = arc.read();
-        assert_eq!(*lock, 2);
-    }
-
-    #[test]
-    fn test_rwlock_unsized() {
-        let rw: &RwLock<[i32]> = &RwLock::new([1, 2, 3]);
-        {
-            let b = &mut *rw.write();
-            b[0] = 4;
-            b[2] = 5;
-        }
-        let comp: &[i32] = &[4, 2, 5];
-        assert_eq!(&*rw.read(), comp);
-    }
-
-    #[test]
-    fn test_rwlock_try_read() {
-        let lock = RwLock::new(0isize);
-        {
-            let read_guard = lock.read();
-
-            let read_result = lock.try_read();
-            assert!(
-                read_result.is_some(),
-                "try_read should succeed while read_guard is in scope"
-            );
-
-            drop(read_guard);
-        }
-        {
-            let upgrade_guard = lock.upgradable_read();
-
-            let read_result = lock.try_read();
-            assert!(
-                read_result.is_some(),
-                "try_read should succeed while upgrade_guard is in scope"
-            );
-
-            drop(upgrade_guard);
-        }
-        {
-            let write_guard = lock.write();
-
-            let read_result = lock.try_read();
-            assert!(
-                read_result.is_none(),
-                "try_read should fail while write_guard is in scope"
-            );
-
-            drop(write_guard);
-        }
-    }
-
-    #[test]
-    fn test_rwlock_try_write() {
-        let lock = RwLock::new(0isize);
-        {
-            let read_guard = lock.read();
-
-            let write_result = lock.try_write();
-            assert!(
-                write_result.is_none(),
-                "try_write should fail while read_guard is in scope"
-            );
-
-            drop(read_guard);
-        }
-        {
-            let upgrade_guard = lock.upgradable_read();
-
-            let write_result = lock.try_write();
-            assert!(
-                write_result.is_none(),
-                "try_write should fail while upgrade_guard is in scope"
-            );
-
-            drop(upgrade_guard);
-        }
-        {
-            let write_guard = lock.write();
-
-            let write_result = lock.try_write();
-            assert!(
-                write_result.is_none(),
-                "try_write should fail while write_guard is in scope"
-            );
-
-            drop(write_guard);
-        }
-    }
-
-    #[test]
-    fn test_rwlock_try_upgrade() {
-        let lock = RwLock::new(0isize);
-        {
-            let read_guard = lock.read();
-
-            let upgrade_result = lock.try_upgradable_read();
-            assert!(
-                upgrade_result.is_some(),
-                "try_upgradable_read should succeed while read_guard is in scope"
-            );
-
-            drop(read_guard);
-        }
-        {
-            let upgrade_guard = lock.upgradable_read();
-
-            let upgrade_result = lock.try_upgradable_read();
-            assert!(
-                upgrade_result.is_none(),
-                "try_upgradable_read should fail while upgrade_guard is in scope"
-            );
-
-            drop(upgrade_guard);
-        }
-        {
-            let write_guard = lock.write();
-
-            let upgrade_result = lock.try_upgradable_read();
-            assert!(
-                upgrade_result.is_none(),
-                "try_upgradable should fail while write_guard is in scope"
-            );
-
-            drop(write_guard);
-        }
-    }
-
-    #[test]
-    fn test_into_inner() {
-        let m = RwLock::new(NonCopy(10));
-        assert_eq!(m.into_inner(), NonCopy(10));
-    }
-
-    #[test]
-    fn test_into_inner_drop() {
-        struct Foo(Arc<AtomicUsize>);
-        impl Drop for Foo {
-            fn drop(&mut self) {
-                self.0.fetch_add(1, Ordering::SeqCst);
-            }
-        }
-        let num_drops = Arc::new(AtomicUsize::new(0));
-        let m = RwLock::new(Foo(num_drops.clone()));
-        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
-        {
-            let _inner = m.into_inner();
-            assert_eq!(num_drops.load(Ordering::SeqCst), 0);
-        }
-        assert_eq!(num_drops.load(Ordering::SeqCst), 1);
-    }
-
-    #[test]
-    fn test_get_mut() {
-        let mut m = RwLock::new(NonCopy(10));
-        *m.get_mut() = NonCopy(20);
-        assert_eq!(m.into_inner(), NonCopy(20));
-    }
-
-    #[test]
-    fn test_rwlockguard_sync() {
-        fn sync<T: Sync>(_: T) {}
-
-        let rwlock = RwLock::new(());
-        sync(rwlock.read());
-        sync(rwlock.write());
-    }
-
-    #[test]
-    fn test_rwlock_downgrade() {
-        let x = Arc::new(RwLock::new(0));
-        let mut handles = Vec::new();
-        for _ in 0..8 {
-            let x = x.clone();
-            handles.push(thread::spawn(move || {
-                for _ in 0..100 {
-                    let mut writer = x.write();
-                    *writer += 1;
-                    let cur_val = *writer;
-                    let reader = RwLockWriteGuard::downgrade(writer);
-                    assert_eq!(cur_val, *reader);
-                }
-            }));
-        }
-        for handle in handles {
-            handle.join().unwrap()
-        }
-        assert_eq!(*x.read(), 800);
-    }
-
-    #[test]
-    fn test_rwlock_recursive() {
-        let arc = Arc::new(RwLock::new(1));
-        let arc2 = arc.clone();
-        let _lock1 = arc.read();
-        thread::spawn(move || {
-            let _lock = arc2.write();
-        });
-        thread::sleep(Duration::from_millis(100));
-
-        // A normal read would block here since there is a pending writer
-        let _lock2 = arc.read_recursive();
-    }
-
-    #[test]
-    fn test_rwlock_debug() {
-        let x = RwLock::new(vec![0u8, 10]);
-
-        assert_eq!(format!("{:?}", x), "RwLock { data: [0, 10] }");
-        assert_eq!(
-            format!("{:#?}", x),
-            "RwLock {
-    data: [
-        0,
-        10
-    ]
-}"
-        );
-        let _lock = x.write();
-        assert_eq!(format!("{:?}", x), "RwLock { <locked> }");
-    }
-
-    #[test]
-    fn test_clone() {
-        let rwlock = RwLock::new(Arc::new(1));
-        let a = rwlock.read_recursive();
-        let b = a.clone();
-        assert_eq!(Arc::strong_count(&b), 2);
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/src/util.rs cargo-0.33.0/vendor/parking_lot/src/util.rs
--- cargo-0.32.0/vendor/parking_lot/src/util.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/src/util.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-// Option::unchecked_unwrap
-pub trait UncheckedOptionExt<T> {
-    unsafe fn unchecked_unwrap(self) -> T;
-}
-
-impl<T> UncheckedOptionExt<T> for Option<T> {
-    #[inline]
-    unsafe fn unchecked_unwrap(self) -> T {
-        match self {
-            Some(x) => x,
-            None => unreachable(),
-        }
-    }
-}
-
-// Equivalent to intrinsics::unreachable() in release mode
-#[inline]
-unsafe fn unreachable() -> ! {
-    if cfg!(debug_assertions) {
-        unreachable!();
-    } else {
-        enum Void {}
-        match *(1 as *const Void) {}
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot/.travis.yml cargo-0.33.0/vendor/parking_lot/.travis.yml
--- cargo-0.32.0/vendor/parking_lot/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-language: rust
-sudo: false
-
-rust:
-- 1.26.2
-- stable
-- beta
-- nightly
-
-before_script:
-- |
-  pip install 'travis-cargo<0.2' --user &&
-  export PATH=$HOME/.local/bin:$PATH
-
-script:
-- cd core;
-- travis-cargo build;
-- cd ../lock_api;
-- travis-cargo build;
-- cd ..;
-- travis-cargo build
-- travis-cargo test
-- travis-cargo test -- --features=deadlock_detection
-- travis-cargo --only nightly doc -- --all-features --no-deps -p parking_lot -p parking_lot_core -p lock_api
-- cd benchmark
-- travis-cargo build
-- cargo run -- --release --bin mutex 2 1 0 1 2
-- cargo run -- --release --bin rwlock 1 1 1 0 1 2
-- cd ..
-
-env:
-  global:
-  - TRAVIS_CARGO_NIGHTLY_FEATURE=nightly
-  - RUST_TEST_THREADS=1
-
-notifications:
-  email: false
diff -Nru cargo-0.32.0/vendor/parking_lot_core/build.rs cargo-0.33.0/vendor/parking_lot_core/build.rs
--- cargo-0.32.0/vendor/parking_lot_core/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/build.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-extern crate rustc_version;
-use rustc_version::{version, Version};
-
-fn main() {
-    if version().unwrap() >= Version::parse("1.26.0").unwrap() {
-        println!("cargo:rustc-cfg=has_localkey_try_with");
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/.cargo-checksum.json cargo-0.33.0/vendor/parking_lot_core/.cargo-checksum.json
--- cargo-0.32.0/vendor/parking_lot_core/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/parking_lot_core/Cargo.toml cargo-0.33.0/vendor/parking_lot_core/Cargo.toml
--- cargo-0.32.0/vendor/parking_lot_core/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "parking_lot_core"
-version = "0.3.1"
-authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
-description = "An advanced API for creating custom synchronization primitives."
-keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
-categories = ["concurrency"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/Amanieu/parking_lot"
-[dependencies.backtrace]
-version = "0.3.2"
-optional = true
-
-[dependencies.petgraph]
-version = "0.4.5"
-optional = true
-
-[dependencies.rand]
-version = "0.5"
-
-[dependencies.smallvec]
-version = "0.6"
-
-[dependencies.thread-id]
-version = "3.2.0"
-optional = true
-[build-dependencies.rustc_version]
-version = "0.2"
-
-[features]
-deadlock_detection = ["petgraph", "thread-id", "backtrace"]
-nightly = []
-[target."cfg(unix)".dependencies.libc]
-version = "0.2.27"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["winnt", "ntstatus", "minwindef", "winerror", "winbase", "errhandlingapi", "handleapi"]
diff -Nru cargo-0.32.0/vendor/parking_lot_core/LICENSE-APACHE cargo-0.33.0/vendor/parking_lot_core/LICENSE-APACHE
--- cargo-0.32.0/vendor/parking_lot_core/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/parking_lot_core/LICENSE-MIT cargo-0.33.0/vendor/parking_lot_core/LICENSE-MIT
--- cargo-0.32.0/vendor/parking_lot_core/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2016 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/lib.rs cargo-0.33.0/vendor/parking_lot_core/src/lib.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-//! This library exposes a low-level API for creating your own efficient
-//! synchronization primitives.
-//!
-//! # The parking lot
-//!
-//! To keep synchronization primitives small, all thread queuing and suspending
-//! functionality is offloaded to the *parking lot*. The idea behind this is based
-//! on the Webkit [`WTF::ParkingLot`](https://webkit.org/blog/6161/locking-in-webkit/)
-//! class, which essentially consists of a hash table mapping of lock addresses
-//! to queues of parked (sleeping) threads. The Webkit parking lot was itself
-//! inspired by Linux [futexes](http://man7.org/linux/man-pages/man2/futex.2.html),
-//! but it is more powerful since it allows invoking callbacks while holding a
-//! queue lock.
-//!
-//! There are two main operations that can be performed on the parking lot:
-//!
-//!  - *Parking* refers to suspending the thread while simultaneously enqueuing it
-//! on a queue keyed by some address.
-//! - *Unparking* refers to dequeuing a thread from a queue keyed by some address
-//! and resuming it.
-//!
-//! See the documentation of the individual functions for more details.
-//!
-//! # Building custom synchronization primitives
-//!
-//! Building custom synchronization primitives is very simple since the parking
-//! lot takes care of all the hard parts for you. A simple example for a
-//! custom primitive would be to integrate a `Mutex` inside another data type.
-//! Since a mutex only requires 2 bits, it can share space with other data.
-//! For example, one could create an `ArcMutex` type that combines the atomic
-//! reference count and the two mutex bits in the same atomic word.
-
-#![warn(missing_docs)]
-#![cfg_attr(
-    all(feature = "nightly", target_os = "linux"),
-    feature(integer_atomics)
-)]
-
-extern crate rand;
-extern crate smallvec;
-
-#[cfg(feature = "deadlock_detection")]
-extern crate backtrace;
-#[cfg(feature = "deadlock_detection")]
-extern crate petgraph;
-#[cfg(feature = "deadlock_detection")]
-extern crate thread_id;
-
-#[cfg(unix)]
-extern crate libc;
-
-#[cfg(windows)]
-extern crate winapi;
-
-#[cfg(all(feature = "nightly", target_os = "linux"))]
-#[path = "thread_parker/linux.rs"]
-mod thread_parker;
-#[cfg(all(unix, not(all(feature = "nightly", target_os = "linux"))))]
-#[path = "thread_parker/unix.rs"]
-mod thread_parker;
-#[cfg(windows)]
-#[path = "thread_parker/windows/mod.rs"]
-mod thread_parker;
-#[cfg(not(any(windows, unix)))]
-#[path = "thread_parker/generic.rs"]
-mod thread_parker;
-
-mod parking_lot;
-mod spinwait;
-mod util;
-mod word_lock;
-
-pub use parking_lot::deadlock;
-pub use parking_lot::{park, unpark_all, unpark_filter, unpark_one, unpark_requeue};
-pub use parking_lot::{FilterOp, ParkResult, ParkToken, RequeueOp, UnparkResult, UnparkToken};
-pub use parking_lot::{DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN};
-pub use spinwait::SpinWait;
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/parking_lot.rs cargo-0.33.0/vendor/parking_lot_core/src/parking_lot.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/parking_lot.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/parking_lot.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1391 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use rand::rngs::SmallRng;
-use rand::{FromEntropy, Rng};
-use smallvec::SmallVec;
-use std::cell::{Cell, UnsafeCell};
-use std::mem;
-#[cfg(not(has_localkey_try_with))]
-use std::panic;
-use std::ptr;
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::thread::LocalKey;
-use std::time::{Duration, Instant};
-use thread_parker::ThreadParker;
-use util::UncheckedOptionExt;
-use word_lock::WordLock;
-
-static NUM_THREADS: AtomicUsize = ATOMIC_USIZE_INIT;
-static HASHTABLE: AtomicUsize = ATOMIC_USIZE_INIT;
-
-// Even with 3x more buckets than threads, the memory overhead per thread is
-// still only a few hundred bytes per thread.
-const LOAD_FACTOR: usize = 3;
-
-struct HashTable {
-    // Hash buckets for the table
-    entries: Box<[Bucket]>,
-
-    // Number of bits used for the hash function
-    hash_bits: u32,
-
-    // Previous table. This is only kept to keep leak detectors happy.
-    _prev: *const HashTable,
-}
-
-impl HashTable {
-    fn new(num_threads: usize, prev: *const HashTable) -> Box<HashTable> {
-        let new_size = (num_threads * LOAD_FACTOR).next_power_of_two();
-        let hash_bits = 0usize.leading_zeros() - new_size.leading_zeros() - 1;
-        let bucket = Bucket {
-            mutex: WordLock::new(),
-            queue_head: Cell::new(ptr::null()),
-            queue_tail: Cell::new(ptr::null()),
-            fair_timeout: UnsafeCell::new(FairTimeout::new()),
-            _padding: unsafe { mem::uninitialized() },
-        };
-        Box::new(HashTable {
-            entries: vec![bucket; new_size].into_boxed_slice(),
-            hash_bits: hash_bits,
-            _prev: prev,
-        })
-    }
-}
-
-struct Bucket {
-    // Lock protecting the queue
-    mutex: WordLock,
-
-    // Linked list of threads waiting on this bucket
-    queue_head: Cell<*const ThreadData>,
-    queue_tail: Cell<*const ThreadData>,
-
-    // Next time at which point be_fair should be set
-    fair_timeout: UnsafeCell<FairTimeout>,
-
-    // Padding to avoid false sharing between buckets. Ideally we would just
-    // align the bucket structure to 64 bytes, but Rust doesn't support that
-    // yet.
-    _padding: [u8; 64],
-}
-
-// Implementation of Clone for Bucket, needed to make vec![] work
-impl Clone for Bucket {
-    fn clone(&self) -> Bucket {
-        Bucket {
-            mutex: WordLock::new(),
-            queue_head: Cell::new(ptr::null()),
-            queue_tail: Cell::new(ptr::null()),
-            fair_timeout: UnsafeCell::new(FairTimeout::new()),
-            _padding: unsafe { mem::uninitialized() },
-        }
-    }
-}
-
-struct FairTimeout {
-    // Next time at which point be_fair should be set
-    timeout: Instant,
-
-    // Random number generator for calculating the next timeout
-    rng: SmallRng,
-}
-
-impl FairTimeout {
-    fn new() -> FairTimeout {
-        FairTimeout {
-            timeout: Instant::now(),
-            rng: SmallRng::from_entropy(),
-        }
-    }
-
-    // Determine whether we should force a fair unlock, and update the timeout
-    fn should_timeout(&mut self) -> bool {
-        let now = Instant::now();
-        if now > self.timeout {
-            self.timeout = now + Duration::new(0, self.rng.gen_range(0, 1000000));
-            true
-        } else {
-            false
-        }
-    }
-}
-
-struct ThreadData {
-    parker: ThreadParker,
-
-    // Key that this thread is sleeping on. This may change if the thread is
-    // requeued to a different key.
-    key: AtomicUsize,
-
-    // Linked list of parked threads in a bucket
-    next_in_queue: Cell<*const ThreadData>,
-
-    // UnparkToken passed to this thread when it is unparked
-    unpark_token: Cell<UnparkToken>,
-
-    // ParkToken value set by the thread when it was parked
-    park_token: Cell<ParkToken>,
-
-    // Is the thread parked with a timeout?
-    parked_with_timeout: Cell<bool>,
-
-    // Extra data for deadlock detection
-    // TODO: once supported in stable replace with #[cfg...] & remove dummy struct/impl
-    #[allow(dead_code)]
-    deadlock_data: deadlock::DeadlockData,
-}
-
-impl ThreadData {
-    fn new() -> ThreadData {
-        // Keep track of the total number of live ThreadData objects and resize
-        // the hash table accordingly.
-        let num_threads = NUM_THREADS.fetch_add(1, Ordering::Relaxed) + 1;
-        unsafe {
-            grow_hashtable(num_threads);
-        }
-
-        ThreadData {
-            parker: ThreadParker::new(),
-            key: AtomicUsize::new(0),
-            next_in_queue: Cell::new(ptr::null()),
-            unpark_token: Cell::new(DEFAULT_UNPARK_TOKEN),
-            park_token: Cell::new(DEFAULT_PARK_TOKEN),
-            parked_with_timeout: Cell::new(false),
-            deadlock_data: deadlock::DeadlockData::new(),
-        }
-    }
-}
-
-// Returns a ThreadData structure for the current thread
-unsafe fn get_thread_data(local: &mut Option<ThreadData>) -> &ThreadData {
-    // Try to read from thread-local storage, but return None if the TLS has
-    // already been destroyed.
-    #[cfg(has_localkey_try_with)]
-    fn try_get_tls(key: &'static LocalKey<ThreadData>) -> Option<*const ThreadData> {
-        key.try_with(|x| x as *const ThreadData).ok()
-    }
-    #[cfg(not(has_localkey_try_with))]
-    fn try_get_tls(key: &'static LocalKey<ThreadData>) -> Option<*const ThreadData> {
-        panic::catch_unwind(|| key.with(|x| x as *const ThreadData)).ok()
-    }
-
-    // Unlike word_lock::ThreadData, parking_lot::ThreadData is always expensive
-    // to construct. Try to use a thread-local version if possible.
-    thread_local!(static THREAD_DATA: ThreadData = ThreadData::new());
-    if let Some(tls) = try_get_tls(&THREAD_DATA) {
-        return &*tls;
-    }
-
-    // Otherwise just create a ThreadData on the stack
-    *local = Some(ThreadData::new());
-    local.as_ref().unwrap()
-}
-
-impl Drop for ThreadData {
-    fn drop(&mut self) {
-        NUM_THREADS.fetch_sub(1, Ordering::Relaxed);
-    }
-}
-
-// Get a pointer to the latest hash table, creating one if it doesn't exist yet.
-unsafe fn get_hashtable() -> *const HashTable {
-    let mut table = HASHTABLE.load(Ordering::Acquire);
-
-    // If there is no table, create one
-    if table == 0 {
-        let new_table = Box::into_raw(HashTable::new(LOAD_FACTOR, ptr::null()));
-
-        // If this fails then it means some other thread created the hash
-        // table first.
-        match HASHTABLE.compare_exchange(
-            0,
-            new_table as usize,
-            Ordering::Release,
-            Ordering::Relaxed,
-        ) {
-            Ok(_) => return new_table,
-            Err(x) => table = x,
-        }
-
-        // Free the table we created
-        Box::from_raw(new_table);
-    }
-
-    table as *const HashTable
-}
-
-// Grow the hash table so that it is big enough for the given number of threads.
-// This isn't performance-critical since it is only done when a ThreadData is
-// created, which only happens once per thread.
-unsafe fn grow_hashtable(num_threads: usize) {
-    // If there is no table, create one
-    if HASHTABLE.load(Ordering::Relaxed) == 0 {
-        let new_table = Box::into_raw(HashTable::new(num_threads, ptr::null()));
-
-        // If this fails then it means some other thread created the hash
-        // table first.
-        if HASHTABLE
-            .compare_exchange(0, new_table as usize, Ordering::Release, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-
-        // Free the table we created
-        Box::from_raw(new_table);
-    }
-
-    let mut old_table;
-    loop {
-        old_table = HASHTABLE.load(Ordering::Acquire) as *mut HashTable;
-
-        // Check if we need to resize the existing table
-        if (*old_table).entries.len() >= LOAD_FACTOR * num_threads {
-            return;
-        }
-
-        // Lock all buckets in the old table
-        for b in &(*old_table).entries[..] {
-            b.mutex.lock();
-        }
-
-        // Now check if our table is still the latest one. Another thread could
-        // have grown the hash table between us reading HASHTABLE and locking
-        // the buckets.
-        if HASHTABLE.load(Ordering::Relaxed) == old_table as usize {
-            break;
-        }
-
-        // Unlock buckets and try again
-        for b in &(*old_table).entries[..] {
-            b.mutex.unlock();
-        }
-    }
-
-    // Create the new table
-    let new_table = HashTable::new(num_threads, old_table);
-
-    // Move the entries from the old table to the new one
-    for b in &(*old_table).entries[..] {
-        let mut current = b.queue_head.get();
-        while !current.is_null() {
-            let next = (*current).next_in_queue.get();
-            let hash = hash((*current).key.load(Ordering::Relaxed), new_table.hash_bits);
-            if new_table.entries[hash].queue_tail.get().is_null() {
-                new_table.entries[hash].queue_head.set(current);
-            } else {
-                (*new_table.entries[hash].queue_tail.get())
-                    .next_in_queue
-                    .set(current);
-            }
-            new_table.entries[hash].queue_tail.set(current);
-            (*current).next_in_queue.set(ptr::null());
-            current = next;
-        }
-    }
-
-    // Publish the new table. No races are possible at this point because
-    // any other thread trying to grow the hash table is blocked on the bucket
-    // locks in the old table.
-    HASHTABLE.store(Box::into_raw(new_table) as usize, Ordering::Release);
-
-    // Unlock all buckets in the old table
-    for b in &(*old_table).entries[..] {
-        b.mutex.unlock();
-    }
-}
-
-// Hash function for addresses
-#[cfg(target_pointer_width = "32")]
-fn hash(key: usize, bits: u32) -> usize {
-    key.wrapping_mul(0x9E3779B9) >> (32 - bits)
-}
-#[cfg(target_pointer_width = "64")]
-fn hash(key: usize, bits: u32) -> usize {
-    key.wrapping_mul(0x9E3779B97F4A7C15) >> (64 - bits)
-}
-
-// Lock the bucket for the given key
-unsafe fn lock_bucket<'a>(key: usize) -> &'a Bucket {
-    let mut bucket;
-    loop {
-        let hashtable = get_hashtable();
-
-        let hash = hash(key, (*hashtable).hash_bits);
-        bucket = &(*hashtable).entries[hash];
-
-        // Lock the bucket
-        bucket.mutex.lock();
-
-        // If no other thread has rehashed the table before we grabbed the lock
-        // then we are good to go! The lock we grabbed prevents any rehashes.
-        if HASHTABLE.load(Ordering::Relaxed) == hashtable as usize {
-            return bucket;
-        }
-
-        // Unlock the bucket and try again
-        bucket.mutex.unlock();
-    }
-}
-
-// Lock the bucket for the given key, but check that the key hasn't been changed
-// in the meantime due to a requeue.
-unsafe fn lock_bucket_checked<'a>(key: &AtomicUsize) -> (usize, &'a Bucket) {
-    let mut bucket;
-    loop {
-        let hashtable = get_hashtable();
-        let current_key = key.load(Ordering::Relaxed);
-
-        let hash = hash(current_key, (*hashtable).hash_bits);
-        bucket = &(*hashtable).entries[hash];
-
-        // Lock the bucket
-        bucket.mutex.lock();
-
-        // Check that both the hash table and key are correct while the bucket
-        // is locked. Note that the key can't change once we locked the proper
-        // bucket for it, so we just keep trying until we have the correct key.
-        if HASHTABLE.load(Ordering::Relaxed) == hashtable as usize
-            && key.load(Ordering::Relaxed) == current_key
-        {
-            return (current_key, bucket);
-        }
-
-        // Unlock the bucket and try again
-        bucket.mutex.unlock();
-    }
-}
-
-// Lock the two buckets for the given pair of keys
-unsafe fn lock_bucket_pair<'a>(key1: usize, key2: usize) -> (&'a Bucket, &'a Bucket) {
-    let mut bucket1;
-    loop {
-        let hashtable = get_hashtable();
-
-        // Get the lowest bucket first
-        let hash1 = hash(key1, (*hashtable).hash_bits);
-        let hash2 = hash(key2, (*hashtable).hash_bits);
-        if hash1 <= hash2 {
-            bucket1 = &(*hashtable).entries[hash1];
-        } else {
-            bucket1 = &(*hashtable).entries[hash2];
-        }
-
-        // Lock the first bucket
-        bucket1.mutex.lock();
-
-        // If no other thread has rehashed the table before we grabbed the lock
-        // then we are good to go! The lock we grabbed prevents any rehashes.
-        if HASHTABLE.load(Ordering::Relaxed) == hashtable as usize {
-            // Now lock the second bucket and return the two buckets
-            if hash1 == hash2 {
-                return (bucket1, bucket1);
-            } else if hash1 < hash2 {
-                let bucket2 = &(*hashtable).entries[hash2];
-                bucket2.mutex.lock();
-                return (bucket1, bucket2);
-            } else {
-                let bucket2 = &(*hashtable).entries[hash1];
-                bucket2.mutex.lock();
-                return (bucket2, bucket1);
-            }
-        }
-
-        // Unlock the bucket and try again
-        bucket1.mutex.unlock();
-    }
-}
-
-// Unlock a pair of buckets
-unsafe fn unlock_bucket_pair(bucket1: &Bucket, bucket2: &Bucket) {
-    if bucket1 as *const _ == bucket2 as *const _ {
-        bucket1.mutex.unlock();
-    } else if bucket1 as *const _ < bucket2 as *const _ {
-        bucket2.mutex.unlock();
-        bucket1.mutex.unlock();
-    } else {
-        bucket1.mutex.unlock();
-        bucket2.mutex.unlock();
-    }
-}
-
-/// Result of a park operation.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum ParkResult {
-    /// We were unparked by another thread with the given token.
-    Unparked(UnparkToken),
-
-    /// The validation callback returned false.
-    Invalid,
-
-    /// The timeout expired.
-    TimedOut,
-}
-
-impl ParkResult {
-    /// Returns true if we were unparked by another thread.
-    pub fn is_unparked(self) -> bool {
-        if let ParkResult::Unparked(_) = self {
-            true
-        } else {
-            false
-        }
-    }
-}
-
-/// Result of an unpark operation.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub struct UnparkResult {
-    /// The number of threads that were unparked.
-    pub unparked_threads: usize,
-
-    /// Whether there are any threads remaining in the queue. This only returns
-    /// true if a thread was unparked.
-    pub have_more_threads: bool,
-
-    /// This is set to true on average once every 0.5ms for any given key. It
-    /// should be used to switch to a fair unlocking mechanism for a particular
-    /// unlock.
-    pub be_fair: bool,
-}
-
-/// Operation that `unpark_requeue` should perform.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum RequeueOp {
-    /// Abort the operation without doing anything.
-    Abort,
-
-    /// Unpark one thread and requeue the rest onto the target queue.
-    UnparkOneRequeueRest,
-
-    /// Requeue all threads onto the target queue.
-    RequeueAll,
-}
-
-/// Operation that `unpark_filter` should perform for each thread.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum FilterOp {
-    /// Unpark the thread and continue scanning the list of parked threads.
-    Unpark,
-
-    /// Don't unpark the thread and continue scanning the list of parked threads.
-    Skip,
-
-    /// Don't unpark the thread and stop scanning the list of parked threads.
-    Stop,
-}
-
-/// A value which is passed from an unparker to a parked thread.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub struct UnparkToken(pub usize);
-
-/// A value associated with a parked thread which can be used by `unpark_filter`.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub struct ParkToken(pub usize);
-
-/// A default unpark token to use.
-pub const DEFAULT_UNPARK_TOKEN: UnparkToken = UnparkToken(0);
-
-/// A default park token to use.
-pub const DEFAULT_PARK_TOKEN: ParkToken = ParkToken(0);
-
-/// Parks the current thread in the queue associated with the given key.
-///
-/// The `validate` function is called while the queue is locked and can abort
-/// the operation by returning false. If `validate` returns true then the
-/// current thread is appended to the queue and the queue is unlocked.
-///
-/// The `before_sleep` function is called after the queue is unlocked but before
-/// the thread is put to sleep. The thread will then sleep until it is unparked
-/// or the given timeout is reached.
-///
-/// The `timed_out` function is also called while the queue is locked, but only
-/// if the timeout was reached. It is passed the key of the queue it was in when
-/// it timed out, which may be different from the original key if
-/// `unpark_requeue` was called. It is also passed a bool which indicates
-/// whether it was the last thread in the queue.
-///
-/// # Safety
-///
-/// You should only call this function with an address that you control, since
-/// you could otherwise interfere with the operation of other synchronization
-/// primitives.
-///
-/// The `validate` and `timed_out` functions are called while the queue is
-/// locked and must not panic or call into any function in `parking_lot`.
-///
-/// The `before_sleep` function is called outside the queue lock and is allowed
-/// to call `unpark_one`, `unpark_all`, `unpark_requeue` or `unpark_filter`, but
-/// it is not allowed to call `park` or panic.
-#[inline]
-pub unsafe fn park<V, B, T>(
-    key: usize,
-    validate: V,
-    before_sleep: B,
-    timed_out: T,
-    park_token: ParkToken,
-    timeout: Option<Instant>,
-) -> ParkResult
-where
-    V: FnOnce() -> bool,
-    B: FnOnce(),
-    T: FnOnce(usize, bool),
-{
-    let mut v = Some(validate);
-    let mut b = Some(before_sleep);
-    let mut t = Some(timed_out);
-    park_internal(
-        key,
-        &mut || v.take().unchecked_unwrap()(),
-        &mut || b.take().unchecked_unwrap()(),
-        &mut |key, was_last_thread| t.take().unchecked_unwrap()(key, was_last_thread),
-        park_token,
-        timeout,
-    )
-}
-
-// Non-generic version to reduce monomorphization cost
-unsafe fn park_internal(
-    key: usize,
-    validate: &mut FnMut() -> bool,
-    before_sleep: &mut FnMut(),
-    timed_out: &mut FnMut(usize, bool),
-    park_token: ParkToken,
-    timeout: Option<Instant>,
-) -> ParkResult {
-    // Grab our thread data, this also ensures that the hash table exists
-    let mut thread_data = None;
-    let thread_data = get_thread_data(&mut thread_data);
-
-    // Lock the bucket for the given key
-    let bucket = lock_bucket(key);
-
-    // If the validation function fails, just return
-    if !validate() {
-        bucket.mutex.unlock();
-        return ParkResult::Invalid;
-    }
-
-    // Append our thread data to the queue and unlock the bucket
-    thread_data.parked_with_timeout.set(timeout.is_some());
-    thread_data.next_in_queue.set(ptr::null());
-    thread_data.key.store(key, Ordering::Relaxed);
-    thread_data.park_token.set(park_token);
-    thread_data.parker.prepare_park();
-    if !bucket.queue_head.get().is_null() {
-        (*bucket.queue_tail.get()).next_in_queue.set(thread_data);
-    } else {
-        bucket.queue_head.set(thread_data);
-    }
-    bucket.queue_tail.set(thread_data);
-    bucket.mutex.unlock();
-
-    // Invoke the pre-sleep callback
-    before_sleep();
-
-    // Park our thread and determine whether we were woken up by an unpark or by
-    // our timeout. Note that this isn't precise: we can still be unparked since
-    // we are still in the queue.
-    let unparked = match timeout {
-        Some(timeout) => thread_data.parker.park_until(timeout),
-        None => {
-            thread_data.parker.park();
-            // call deadlock detection on_unpark hook
-            deadlock::on_unpark(thread_data);
-            true
-        }
-    };
-
-    // If we were unparked, return now
-    if unparked {
-        return ParkResult::Unparked(thread_data.unpark_token.get());
-    }
-
-    // Lock our bucket again. Note that the hashtable may have been rehashed in
-    // the meantime. Our key may also have changed if we were requeued.
-    let (key, bucket) = lock_bucket_checked(&thread_data.key);
-
-    // Now we need to check again if we were unparked or timed out. Unlike the
-    // last check this is precise because we hold the bucket lock.
-    if !thread_data.parker.timed_out() {
-        bucket.mutex.unlock();
-        return ParkResult::Unparked(thread_data.unpark_token.get());
-    }
-
-    // We timed out, so we now need to remove our thread from the queue
-    let mut link = &bucket.queue_head;
-    let mut current = bucket.queue_head.get();
-    let mut previous = ptr::null();
-    while !current.is_null() {
-        if current == thread_data {
-            let next = (*current).next_in_queue.get();
-            link.set(next);
-            let mut was_last_thread = true;
-            if bucket.queue_tail.get() == current {
-                bucket.queue_tail.set(previous);
-            } else {
-                // Scan the rest of the queue to see if there are any other
-                // entries with the given key.
-                let mut scan = next;
-                while !scan.is_null() {
-                    if (*scan).key.load(Ordering::Relaxed) == key {
-                        was_last_thread = false;
-                        break;
-                    }
-                    scan = (*scan).next_in_queue.get();
-                }
-            }
-
-            // Callback to indicate that we timed out, and whether we were the
-            // last thread on the queue.
-            timed_out(key, was_last_thread);
-            break;
-        } else {
-            link = &(*current).next_in_queue;
-            previous = current;
-            current = link.get();
-        }
-    }
-
-    // There should be no way for our thread to have been removed from the queue
-    // if we timed out.
-    debug_assert!(!current.is_null());
-
-    // Unlock the bucket, we are done
-    bucket.mutex.unlock();
-    ParkResult::TimedOut
-}
-
-/// Unparks one thread from the queue associated with the given key.
-///
-/// The `callback` function is called while the queue is locked and before the
-/// target thread is woken up. The `UnparkResult` argument to the function
-/// indicates whether a thread was found in the queue and whether this was the
-/// last thread in the queue. This value is also returned by `unpark_one`.
-///
-/// The `callback` function should return an `UnparkToken` value which will be
-/// passed to the thread that is unparked. If no thread is unparked then the
-/// returned value is ignored.
-///
-/// # Safety
-///
-/// You should only call this function with an address that you control, since
-/// you could otherwise interfere with the operation of other synchronization
-/// primitives.
-///
-/// The `callback` function is called while the queue is locked and must not
-/// panic or call into any function in `parking_lot`.
-#[inline]
-pub unsafe fn unpark_one<C>(key: usize, callback: C) -> UnparkResult
-where
-    C: FnOnce(UnparkResult) -> UnparkToken,
-{
-    let mut c = Some(callback);
-    unpark_one_internal(key, &mut |result| c.take().unchecked_unwrap()(result))
-}
-
-// Non-generic version to reduce monomorphization cost
-unsafe fn unpark_one_internal(
-    key: usize,
-    callback: &mut FnMut(UnparkResult) -> UnparkToken,
-) -> UnparkResult {
-    // Lock the bucket for the given key
-    let bucket = lock_bucket(key);
-
-    // Find a thread with a matching key and remove it from the queue
-    let mut link = &bucket.queue_head;
-    let mut current = bucket.queue_head.get();
-    let mut previous = ptr::null();
-    let mut result = UnparkResult {
-        unparked_threads: 0,
-        have_more_threads: false,
-        be_fair: false,
-    };
-    while !current.is_null() {
-        if (*current).key.load(Ordering::Relaxed) == key {
-            // Remove the thread from the queue
-            let next = (*current).next_in_queue.get();
-            link.set(next);
-            if bucket.queue_tail.get() == current {
-                bucket.queue_tail.set(previous);
-            } else {
-                // Scan the rest of the queue to see if there are any other
-                // entries with the given key.
-                let mut scan = next;
-                while !scan.is_null() {
-                    if (*scan).key.load(Ordering::Relaxed) == key {
-                        result.have_more_threads = true;
-                        break;
-                    }
-                    scan = (*scan).next_in_queue.get();
-                }
-            }
-
-            // Invoke the callback before waking up the thread
-            result.unparked_threads = 1;
-            result.be_fair = (*bucket.fair_timeout.get()).should_timeout();
-            let token = callback(result);
-
-            // Set the token for the target thread
-            (*current).unpark_token.set(token);
-
-            // This is a bit tricky: we first lock the ThreadParker to prevent
-            // the thread from exiting and freeing its ThreadData if its wait
-            // times out. Then we unlock the queue since we don't want to keep
-            // the queue locked while we perform a system call. Finally we wake
-            // up the parked thread.
-            let handle = (*current).parker.unpark_lock();
-            bucket.mutex.unlock();
-            handle.unpark();
-
-            return result;
-        } else {
-            link = &(*current).next_in_queue;
-            previous = current;
-            current = link.get();
-        }
-    }
-
-    // No threads with a matching key were found in the bucket
-    callback(result);
-    bucket.mutex.unlock();
-    result
-}
-
-/// Unparks all threads in the queue associated with the given key.
-///
-/// The given `UnparkToken` is passed to all unparked threads.
-///
-/// This function returns the number of threads that were unparked.
-///
-/// # Safety
-///
-/// You should only call this function with an address that you control, since
-/// you could otherwise interfere with the operation of other synchronization
-/// primitives.
-pub unsafe fn unpark_all(key: usize, unpark_token: UnparkToken) -> usize {
-    // Lock the bucket for the given key
-    let bucket = lock_bucket(key);
-
-    // Remove all threads with the given key in the bucket
-    let mut link = &bucket.queue_head;
-    let mut current = bucket.queue_head.get();
-    let mut previous = ptr::null();
-    let mut threads = SmallVec::<[_; 8]>::new();
-    while !current.is_null() {
-        if (*current).key.load(Ordering::Relaxed) == key {
-            // Remove the thread from the queue
-            let next = (*current).next_in_queue.get();
-            link.set(next);
-            if bucket.queue_tail.get() == current {
-                bucket.queue_tail.set(previous);
-            }
-
-            // Set the token for the target thread
-            (*current).unpark_token.set(unpark_token);
-
-            // Don't wake up threads while holding the queue lock. See comment
-            // in unpark_one. For now just record which threads we need to wake
-            // up.
-            threads.push((*current).parker.unpark_lock());
-            current = next;
-        } else {
-            link = &(*current).next_in_queue;
-            previous = current;
-            current = link.get();
-        }
-    }
-
-    // Unlock the bucket
-    bucket.mutex.unlock();
-
-    // Now that we are outside the lock, wake up all the threads that we removed
-    // from the queue.
-    let num_threads = threads.len();
-    for handle in threads.into_iter() {
-        handle.unpark();
-    }
-
-    num_threads
-}
-
-/// Removes all threads from the queue associated with `key_from`, optionally
-/// unparks the first one and requeues the rest onto the queue associated with
-/// `key_to`.
-///
-/// The `validate` function is called while both queues are locked and can abort
-/// the operation by returning `RequeueOp::Abort`. It can also choose to
-/// unpark the first thread in the source queue while moving the rest by
-/// returning `RequeueOp::UnparkFirstRequeueRest`. Returning
-/// `RequeueOp::RequeueAll` will move all threads to the destination queue.
-///
-/// The `callback` function is also called while both queues are locked. It is
-/// passed the `RequeueOp` returned by `validate` and an `UnparkResult`
-/// indicating whether a thread was unparked and whether there are threads still
-/// parked in the new queue. This `UnparkResult` value is also returned by
-/// `unpark_requeue`.
-///
-/// The `callback` function should return an `UnparkToken` value which will be
-/// passed to the thread that is unparked. If no thread is unparked then the
-/// returned value is ignored.
-///
-/// # Safety
-///
-/// You should only call this function with an address that you control, since
-/// you could otherwise interfere with the operation of other synchronization
-/// primitives.
-///
-/// The `validate` and `callback` functions are called while the queue is locked
-/// and must not panic or call into any function in `parking_lot`.
-#[inline]
-pub unsafe fn unpark_requeue<V, C>(
-    key_from: usize,
-    key_to: usize,
-    validate: V,
-    callback: C,
-) -> UnparkResult
-where
-    V: FnOnce() -> RequeueOp,
-    C: FnOnce(RequeueOp, UnparkResult) -> UnparkToken,
-{
-    let mut v = Some(validate);
-    let mut c = Some(callback);
-    unpark_requeue_internal(
-        key_from,
-        key_to,
-        &mut || v.take().unchecked_unwrap()(),
-        &mut |op, r| c.take().unchecked_unwrap()(op, r),
-    )
-}
-
-// Non-generic version to reduce monomorphization cost
-unsafe fn unpark_requeue_internal(
-    key_from: usize,
-    key_to: usize,
-    validate: &mut FnMut() -> RequeueOp,
-    callback: &mut FnMut(RequeueOp, UnparkResult) -> UnparkToken,
-) -> UnparkResult {
-    // Lock the two buckets for the given key
-    let (bucket_from, bucket_to) = lock_bucket_pair(key_from, key_to);
-
-    // If the validation function fails, just return
-    let mut result = UnparkResult {
-        unparked_threads: 0,
-        have_more_threads: false,
-        be_fair: false,
-    };
-    let op = validate();
-    if op == RequeueOp::Abort {
-        unlock_bucket_pair(bucket_from, bucket_to);
-        return result;
-    }
-
-    // Remove all threads with the given key in the source bucket
-    let mut link = &bucket_from.queue_head;
-    let mut current = bucket_from.queue_head.get();
-    let mut previous = ptr::null();
-    let mut requeue_threads: *const ThreadData = ptr::null();
-    let mut requeue_threads_tail: *const ThreadData = ptr::null();
-    let mut wakeup_thread = None;
-    while !current.is_null() {
-        if (*current).key.load(Ordering::Relaxed) == key_from {
-            // Remove the thread from the queue
-            let next = (*current).next_in_queue.get();
-            link.set(next);
-            if bucket_from.queue_tail.get() == current {
-                bucket_from.queue_tail.set(previous);
-            }
-
-            // Prepare the first thread for wakeup and requeue the rest.
-            if op == RequeueOp::UnparkOneRequeueRest && wakeup_thread.is_none() {
-                wakeup_thread = Some(current);
-                result.unparked_threads = 1;
-            } else {
-                if !requeue_threads.is_null() {
-                    (*requeue_threads_tail).next_in_queue.set(current);
-                } else {
-                    requeue_threads = current;
-                }
-                requeue_threads_tail = current;
-                (*current).key.store(key_to, Ordering::Relaxed);
-                result.have_more_threads = true;
-            }
-            current = next;
-        } else {
-            link = &(*current).next_in_queue;
-            previous = current;
-            current = link.get();
-        }
-    }
-
-    // Add the requeued threads to the destination bucket
-    if !requeue_threads.is_null() {
-        (*requeue_threads_tail).next_in_queue.set(ptr::null());
-        if !bucket_to.queue_head.get().is_null() {
-            (*bucket_to.queue_tail.get())
-                .next_in_queue
-                .set(requeue_threads);
-        } else {
-            bucket_to.queue_head.set(requeue_threads);
-        }
-        bucket_to.queue_tail.set(requeue_threads_tail);
-    }
-
-    // Invoke the callback before waking up the thread
-    if result.unparked_threads != 0 {
-        result.be_fair = (*bucket_from.fair_timeout.get()).should_timeout();
-    }
-    let token = callback(op, result);
-
-    // See comment in unpark_one for why we mess with the locking
-    if let Some(wakeup_thread) = wakeup_thread {
-        (*wakeup_thread).unpark_token.set(token);
-        let handle = (*wakeup_thread).parker.unpark_lock();
-        unlock_bucket_pair(bucket_from, bucket_to);
-        handle.unpark();
-    } else {
-        unlock_bucket_pair(bucket_from, bucket_to);
-    }
-
-    result
-}
-
-/// Unparks a number of threads from the front of the queue associated with
-/// `key` depending on the results of a filter function which inspects the
-/// `ParkToken` associated with each thread.
-///
-/// The `filter` function is called for each thread in the queue or until
-/// `FilterOp::Stop` is returned. This function is passed the `ParkToken`
-/// associated with a particular thread, which is unparked if `FilterOp::Unpark`
-/// is returned.
-///
-/// The `callback` function is also called while both queues are locked. It is
-/// passed an `UnparkResult` indicating the number of threads that were unparked
-/// and whether there are still parked threads in the queue. This `UnparkResult`
-/// value is also returned by `unpark_filter`.
-///
-/// The `callback` function should return an `UnparkToken` value which will be
-/// passed to all threads that are unparked. If no thread is unparked then the
-/// returned value is ignored.
-///
-/// # Safety
-///
-/// You should only call this function with an address that you control, since
-/// you could otherwise interfere with the operation of other synchronization
-/// primitives.
-///
-/// The `filter` and `callback` functions are called while the queue is locked
-/// and must not panic or call into any function in `parking_lot`.
-#[inline]
-pub unsafe fn unpark_filter<F, C>(key: usize, mut filter: F, callback: C) -> UnparkResult
-where
-    F: FnMut(ParkToken) -> FilterOp,
-    C: FnOnce(UnparkResult) -> UnparkToken,
-{
-    let mut c = Some(callback);
-    unpark_filter_internal(key, &mut filter, &mut |r| c.take().unchecked_unwrap()(r))
-}
-
-// Non-generic version to reduce monomorphization cost
-unsafe fn unpark_filter_internal(
-    key: usize,
-    filter: &mut FnMut(ParkToken) -> FilterOp,
-    callback: &mut FnMut(UnparkResult) -> UnparkToken,
-) -> UnparkResult {
-    // Lock the bucket for the given key
-    let bucket = lock_bucket(key);
-
-    // Go through the queue looking for threads with a matching key
-    let mut link = &bucket.queue_head;
-    let mut current = bucket.queue_head.get();
-    let mut previous = ptr::null();
-    let mut threads = SmallVec::<[_; 8]>::new();
-    let mut result = UnparkResult {
-        unparked_threads: 0,
-        have_more_threads: false,
-        be_fair: false,
-    };
-    while !current.is_null() {
-        if (*current).key.load(Ordering::Relaxed) == key {
-            // Call the filter function with the thread's ParkToken
-            let next = (*current).next_in_queue.get();
-            match filter((*current).park_token.get()) {
-                FilterOp::Unpark => {
-                    // Remove the thread from the queue
-                    link.set(next);
-                    if bucket.queue_tail.get() == current {
-                        bucket.queue_tail.set(previous);
-                    }
-
-                    // Add the thread to our list of threads to unpark
-                    threads.push((current, None));
-
-                    current = next;
-                }
-                FilterOp::Skip => {
-                    result.have_more_threads = true;
-                    link = &(*current).next_in_queue;
-                    previous = current;
-                    current = link.get();
-                }
-                FilterOp::Stop => {
-                    result.have_more_threads = true;
-                    break;
-                }
-            }
-        } else {
-            link = &(*current).next_in_queue;
-            previous = current;
-            current = link.get();
-        }
-    }
-
-    // Invoke the callback before waking up the threads
-    result.unparked_threads = threads.len();
-    if result.unparked_threads != 0 {
-        result.be_fair = (*bucket.fair_timeout.get()).should_timeout();
-    }
-    let token = callback(result);
-
-    // Pass the token to all threads that are going to be unparked and prepare
-    // them for unparking.
-    for t in threads.iter_mut() {
-        (*t.0).unpark_token.set(token);
-        t.1 = Some((*t.0).parker.unpark_lock());
-    }
-
-    bucket.mutex.unlock();
-
-    // Now that we are outside the lock, wake up all the threads that we removed
-    // from the queue.
-    for (_, handle) in threads.into_iter() {
-        handle.unchecked_unwrap().unpark();
-    }
-
-    result
-}
-
-/// \[Experimental\] Deadlock detection
-///
-/// Enabled via the `deadlock_detection` feature flag.
-pub mod deadlock {
-    #[cfg(feature = "deadlock_detection")]
-    use super::deadlock_impl;
-
-    #[cfg(feature = "deadlock_detection")]
-    pub(super) use super::deadlock_impl::DeadlockData;
-
-    #[cfg(not(feature = "deadlock_detection"))]
-    pub(super) struct DeadlockData {}
-
-    #[cfg(not(feature = "deadlock_detection"))]
-    impl DeadlockData {
-        pub(super) fn new() -> Self {
-            DeadlockData {}
-        }
-    }
-
-    /// Acquire a resource identified by key in the deadlock detector
-    /// Noop if deadlock_detection feature isn't enabled.
-    /// Note: Call after the resource is acquired
-    #[inline]
-    pub unsafe fn acquire_resource(_key: usize) {
-        #[cfg(feature = "deadlock_detection")]
-        deadlock_impl::acquire_resource(_key);
-    }
-
-    /// Release a resource identified by key in the deadlock detector.
-    /// Noop if deadlock_detection feature isn't enabled.
-    /// Note: Call before the resource is released
-    /// # Panics
-    /// Panics if the resource was already released or wasn't acquired in this thread.
-    #[inline]
-    pub unsafe fn release_resource(_key: usize) {
-        #[cfg(feature = "deadlock_detection")]
-        deadlock_impl::release_resource(_key);
-    }
-
-    /// Returns all deadlocks detected *since* the last call.
-    /// Each cycle consist of a vector of `DeadlockedThread`.
-    #[cfg(feature = "deadlock_detection")]
-    #[inline]
-    pub fn check_deadlock() -> Vec<Vec<deadlock_impl::DeadlockedThread>> {
-        deadlock_impl::check_deadlock()
-    }
-
-    #[inline]
-    pub(super) unsafe fn on_unpark(_td: &super::ThreadData) {
-        #[cfg(feature = "deadlock_detection")]
-        deadlock_impl::on_unpark(_td);
-    }
-}
-
-#[cfg(feature = "deadlock_detection")]
-mod deadlock_impl {
-    use super::{get_hashtable, get_thread_data, lock_bucket, ThreadData, NUM_THREADS};
-    use backtrace::Backtrace;
-    use petgraph;
-    use petgraph::graphmap::DiGraphMap;
-    use std::cell::{Cell, UnsafeCell};
-    use std::collections::HashSet;
-    use std::sync::atomic::Ordering;
-    use std::sync::mpsc;
-    use thread_id;
-
-    /// Representation of a deadlocked thread
-    pub struct DeadlockedThread {
-        thread_id: usize,
-        backtrace: Backtrace,
-    }
-
-    impl DeadlockedThread {
-        /// The system thread id
-        pub fn thread_id(&self) -> usize {
-            self.thread_id
-        }
-
-        /// The thread backtrace
-        pub fn backtrace(&self) -> &Backtrace {
-            &self.backtrace
-        }
-    }
-
-    pub struct DeadlockData {
-        // Currently owned resources (keys)
-        resources: UnsafeCell<Vec<usize>>,
-
-        // Set when there's a pending callstack request
-        deadlocked: Cell<bool>,
-
-        // Sender used to report the backtrace
-        backtrace_sender: UnsafeCell<Option<mpsc::Sender<DeadlockedThread>>>,
-
-        // System thread id
-        thread_id: usize,
-    }
-
-    impl DeadlockData {
-        pub fn new() -> Self {
-            DeadlockData {
-                resources: UnsafeCell::new(Vec::new()),
-                deadlocked: Cell::new(false),
-                backtrace_sender: UnsafeCell::new(None),
-                thread_id: thread_id::get(),
-            }
-        }
-    }
-
-    pub(super) unsafe fn on_unpark(td: &ThreadData) {
-        if td.deadlock_data.deadlocked.get() {
-            let sender = (*td.deadlock_data.backtrace_sender.get()).take().unwrap();
-            sender
-                .send(DeadlockedThread {
-                    thread_id: td.deadlock_data.thread_id,
-                    backtrace: Backtrace::new(),
-                }).unwrap();
-            // make sure to close this sender
-            drop(sender);
-
-            // park until the end of the time
-            td.parker.prepare_park();
-            td.parker.park();
-            unreachable!("unparked deadlocked thread!");
-        }
-    }
-
-    pub unsafe fn acquire_resource(key: usize) {
-        let mut thread_data = None;
-        let thread_data = get_thread_data(&mut thread_data);
-        (*thread_data.deadlock_data.resources.get()).push(key);
-    }
-
-    pub unsafe fn release_resource(key: usize) {
-        let mut thread_data = None;
-        let thread_data = get_thread_data(&mut thread_data);
-        let resources = &mut (*thread_data.deadlock_data.resources.get());
-        match resources.iter().rposition(|x| *x == key) {
-            Some(p) => resources.swap_remove(p),
-            None => panic!("key {} not found in thread resources", key),
-        };
-    }
-
-    pub fn check_deadlock() -> Vec<Vec<DeadlockedThread>> {
-        unsafe {
-            // fast pass
-            if check_wait_graph_fast() {
-                // double check
-                check_wait_graph_slow()
-            } else {
-                Vec::new()
-            }
-        }
-    }
-
-    // Simple algorithm that builds a wait graph f the threads and the resources,
-    // then checks for the presence of cycles (deadlocks).
-    // This variant isn't precise as it doesn't lock the entire table before checking
-    unsafe fn check_wait_graph_fast() -> bool {
-        let table = get_hashtable();
-        let thread_count = NUM_THREADS.load(Ordering::Relaxed);
-        let mut graph = DiGraphMap::<usize, ()>::with_capacity(thread_count * 2, thread_count * 2);
-
-        for b in &(*table).entries[..] {
-            b.mutex.lock();
-            let mut current = b.queue_head.get();
-            while !current.is_null() {
-                if !(*current).parked_with_timeout.get()
-                    && !(*current).deadlock_data.deadlocked.get()
-                {
-                    // .resources are waiting for their owner
-                    for &resource in &(*(*current).deadlock_data.resources.get()) {
-                        graph.add_edge(resource, current as usize, ());
-                    }
-                    // owner waits for resource .key
-                    graph.add_edge(current as usize, (*current).key.load(Ordering::Relaxed), ());
-                }
-                current = (*current).next_in_queue.get();
-            }
-            b.mutex.unlock();
-        }
-
-        petgraph::algo::is_cyclic_directed(&graph)
-    }
-
-    #[derive(Hash, PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
-    enum WaitGraphNode {
-        Thread(*const ThreadData),
-        Resource(usize),
-    }
-
-    use self::WaitGraphNode::*;
-
-    // Contrary to the _fast variant this locks the entrie table before looking for cycles.
-    // Returns all detected thread wait cycles.
-    // Note that once a cycle is reported it's never reported again.
-    unsafe fn check_wait_graph_slow() -> Vec<Vec<DeadlockedThread>> {
-        let mut table = get_hashtable();
-        loop {
-            // Lock all buckets in the old table
-            for b in &(*table).entries[..] {
-                b.mutex.lock();
-            }
-
-            // Now check if our table is still the latest one. Another thread could
-            // have grown the hash table between us getting and locking the hash table.
-            let new_table = get_hashtable();
-            if new_table == table {
-                break;
-            }
-
-            // Unlock buckets and try again
-            for b in &(*table).entries[..] {
-                b.mutex.unlock();
-            }
-
-            table = new_table;
-        }
-
-        let thread_count = NUM_THREADS.load(Ordering::Relaxed);
-        let mut graph =
-            DiGraphMap::<WaitGraphNode, ()>::with_capacity(thread_count * 2, thread_count * 2);
-
-        for b in &(*table).entries[..] {
-            let mut current = b.queue_head.get();
-            while !current.is_null() {
-                if !(*current).parked_with_timeout.get()
-                    && !(*current).deadlock_data.deadlocked.get()
-                {
-                    // .resources are waiting for their owner
-                    for &resource in &(*(*current).deadlock_data.resources.get()) {
-                        graph.add_edge(Resource(resource), Thread(current), ());
-                    }
-                    // owner waits for resource .key
-                    graph.add_edge(
-                        Thread(current),
-                        Resource((*current).key.load(Ordering::Relaxed)),
-                        (),
-                    );
-                }
-                current = (*current).next_in_queue.get();
-            }
-        }
-
-        for b in &(*table).entries[..] {
-            b.mutex.unlock();
-        }
-
-        // find cycles
-        let cycles = graph_cycles(&graph);
-
-        let mut results = Vec::with_capacity(cycles.len());
-
-        for cycle in cycles {
-            let (sender, receiver) = mpsc::channel();
-            for td in cycle {
-                let bucket = lock_bucket((*td).key.load(Ordering::Relaxed));
-                (*td).deadlock_data.deadlocked.set(true);
-                *(*td).deadlock_data.backtrace_sender.get() = Some(sender.clone());
-                let handle = (*td).parker.unpark_lock();
-                bucket.mutex.unlock();
-                // unpark the deadlocked thread!
-                // on unpark it'll notice the deadlocked flag and report back
-                handle.unpark();
-            }
-            // make sure to drop our sender before collecting results
-            drop(sender);
-            results.push(receiver.iter().collect());
-        }
-
-        results
-    }
-
-    // normalize a cycle to start with the "smallest" node
-    fn normalize_cycle<T: Ord + Copy + Clone>(input: &[T]) -> Vec<T> {
-        let min_pos = input
-            .iter()
-            .enumerate()
-            .min_by_key(|&(_, &t)| t)
-            .map(|(p, _)| p)
-            .unwrap_or(0);
-        input
-            .iter()
-            .cycle()
-            .skip(min_pos)
-            .take(input.len())
-            .cloned()
-            .collect()
-    }
-
-    // returns all thread cycles in the wait graph
-    fn graph_cycles(g: &DiGraphMap<WaitGraphNode, ()>) -> Vec<Vec<*const ThreadData>> {
-        use petgraph::visit::depth_first_search;
-        use petgraph::visit::DfsEvent;
-        use petgraph::visit::NodeIndexable;
-
-        let mut cycles = HashSet::new();
-        let mut path = Vec::with_capacity(g.node_bound());
-        // start from threads to get the correct threads cycle
-        let threads = g
-            .nodes()
-            .filter(|n| if let &Thread(_) = n { true } else { false });
-
-        depth_first_search(g, threads, |e| match e {
-            DfsEvent::Discover(Thread(n), _) => path.push(n),
-            DfsEvent::Finish(Thread(_), _) => {
-                path.pop();
-            }
-            DfsEvent::BackEdge(_, Thread(n)) => {
-                let from = path.iter().rposition(|&i| i == n).unwrap();
-                cycles.insert(normalize_cycle(&path[from..]));
-            }
-            _ => (),
-        });
-
-        cycles.iter().cloned().collect()
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/spinwait.rs cargo-0.33.0/vendor/parking_lot_core/src/spinwait.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/spinwait.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/spinwait.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-#[cfg(unix)]
-use libc;
-use std::sync::atomic::spin_loop_hint;
-#[cfg(not(any(windows, unix)))]
-use std::thread;
-#[cfg(windows)]
-use winapi;
-
-// Yields the rest of the current timeslice to the OS
-#[cfg(windows)]
-#[inline]
-fn thread_yield() {
-    // Note that this is manually defined here rather than using the definition
-    // through `winapi`. The `winapi` definition comes from the `synchapi`
-    // header which enables the "synchronization.lib" library. It turns out,
-    // however that `Sleep` comes from `kernel32.dll` so this activation isn't
-    // necessary.
-    //
-    // This was originally identified in rust-lang/rust where on MinGW the
-    // libsynchronization.a library pulls in a dependency on a newer DLL not
-    // present in older versions of Windows. (see rust-lang/rust#49438)
-    //
-    // This is a bit of a hack for now and ideally we'd fix MinGW's own import
-    // libraries, but that'll probably take a lot longer than patching this here
-    // and avoiding the `synchapi` feature entirely.
-    extern "system" {
-        fn Sleep(a: winapi::shared::minwindef::DWORD);
-    }
-    unsafe {
-        // We don't use SwitchToThread here because it doesn't consider all
-        // threads in the system and the thread we are waiting for may not get
-        // selected.
-        Sleep(0);
-    }
-}
-#[cfg(unix)]
-#[inline]
-fn thread_yield() {
-    unsafe {
-        libc::sched_yield();
-    }
-}
-#[cfg(not(any(windows, unix)))]
-#[inline]
-fn thread_yield() {
-    thread::yield_now();
-}
-
-// Wastes some CPU time for the given number of iterations,
-// using a hint to indicate to the CPU that we are spinning.
-#[inline]
-fn cpu_relax(iterations: u32) {
-    for _ in 0..iterations {
-        spin_loop_hint()
-    }
-}
-
-/// A counter used to perform exponential backoff in spin loops.
-pub struct SpinWait {
-    counter: u32,
-}
-
-impl SpinWait {
-    /// Creates a new `SpinWait`.
-    #[inline]
-    pub fn new() -> SpinWait {
-        SpinWait { counter: 0 }
-    }
-
-    /// Resets a `SpinWait` to its initial state.
-    #[inline]
-    pub fn reset(&mut self) {
-        self.counter = 0;
-    }
-
-    /// Spins until the sleep threshold has been reached.
-    ///
-    /// This function returns whether the sleep threshold has been reached, at
-    /// which point further spinning has diminishing returns and the thread
-    /// should be parked instead.
-    ///
-    /// The spin strategy will initially use a CPU-bound loop but will fall back
-    /// to yielding the CPU to the OS after a few iterations.
-    #[inline]
-    pub fn spin(&mut self) -> bool {
-        if self.counter >= 10 {
-            return false;
-        }
-        self.counter += 1;
-        if self.counter <= 3 {
-            cpu_relax(1 << self.counter);
-        } else {
-            thread_yield();
-        }
-        true
-    }
-
-    /// Spins without yielding the thread to the OS.
-    ///
-    /// Instead, the backoff is simply capped at a maximum value. This can be
-    /// used to improve throughput in `compare_exchange` loops that have high
-    /// contention.
-    #[inline]
-    pub fn spin_no_yield(&mut self) {
-        self.counter += 1;
-        if self.counter > 10 {
-            self.counter = 10;
-        }
-        cpu_relax(1 << self.counter);
-    }
-}
-
-impl Default for SpinWait {
-    #[inline]
-    fn default() -> SpinWait {
-        SpinWait::new()
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/generic.rs cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/generic.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/generic.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/generic.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::cell::Cell;
-use std::sync::{Condvar, Mutex, MutexGuard};
-use std::time::Instant;
-
-// Helper type for putting a thread to sleep until some other thread wakes it up
-pub struct ThreadParker {
-    should_park: Cell<bool>,
-    mutex: Mutex<()>,
-    condvar: Condvar,
-}
-
-impl ThreadParker {
-    pub fn new() -> ThreadParker {
-        ThreadParker {
-            should_park: Cell::new(false),
-            mutex: Mutex::new(()),
-            condvar: Condvar::new(),
-        }
-    }
-
-    // Prepares the parker. This should be called before adding it to the queue.
-    pub unsafe fn prepare_park(&self) {
-        self.should_park.set(true);
-    }
-
-    // Checks if the park timed out. This should be called while holding the
-    // queue lock after park_until has returned false.
-    pub unsafe fn timed_out(&self) -> bool {
-        // We need to grab the mutex here because another thread may be
-        // concurrently executing UnparkHandle::unpark, which is done without
-        // holding the queue lock.
-        let _lock = self.mutex.lock().unwrap();
-        self.should_park.get()
-    }
-
-    // Parks the thread until it is unparked. This should be called after it has
-    // been added to the queue, after unlocking the queue.
-    pub unsafe fn park(&self) {
-        let mut lock = self.mutex.lock().unwrap();
-        while self.should_park.get() {
-            lock = self.condvar.wait(lock).unwrap();
-        }
-    }
-
-    // Parks the thread until it is unparked or the timeout is reached. This
-    // should be called after it has been added to the queue, after unlocking
-    // the queue. Returns true if we were unparked and false if we timed out.
-    pub unsafe fn park_until(&self, timeout: Instant) -> bool {
-        let mut lock = self.mutex.lock().unwrap();
-        while self.should_park.get() {
-            let now = Instant::now();
-            if timeout <= now {
-                return false;
-            }
-            let (new_lock, _) = self.condvar.wait_timeout(lock, timeout - now).unwrap();
-            lock = new_lock;
-        }
-        true
-    }
-
-    // Locks the parker to prevent the target thread from exiting. This is
-    // necessary to ensure that thread-local ThreadData objects remain valid.
-    // This should be called while holding the queue lock.
-    pub unsafe fn unpark_lock(&self) -> UnparkHandle {
-        UnparkHandle {
-            thread_parker: self,
-            _guard: self.mutex.lock().unwrap(),
-        }
-    }
-}
-
-// Handle for a thread that is about to be unparked. We need to mark the thread
-// as unparked while holding the queue lock, but we delay the actual unparking
-// until after the queue lock is released.
-pub struct UnparkHandle<'a> {
-    thread_parker: *const ThreadParker,
-    _guard: MutexGuard<'a, ()>,
-}
-
-impl<'a> UnparkHandle<'a> {
-    // Wakes up the parked thread. This should be called after the queue lock is
-    // released to avoid blocking the queue for too long.
-    pub unsafe fn unpark(self) {
-        (*self.thread_parker).should_park.set(false);
-
-        // We notify while holding the lock here to avoid races with the target
-        // thread. In particular, the thread could exit after we unlock the
-        // mutex, which would make the condvar access invalid memory.
-        (*self.thread_parker).condvar.notify_one();
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/linux.rs cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/linux.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/linux.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/linux.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use libc;
-use std::sync::atomic::{AtomicI32, Ordering};
-use std::time::Instant;
-
-const FUTEX_WAIT: i32 = 0;
-const FUTEX_WAKE: i32 = 1;
-const FUTEX_PRIVATE: i32 = 128;
-
-// x32 Linux uses a non-standard type for tv_nsec in timespec.
-// See https://sourceware.org/bugzilla/show_bug.cgi?id=16437
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
-#[allow(non_camel_case_types)]
-type tv_nsec_t = i64;
-#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
-#[allow(non_camel_case_types)]
-type tv_nsec_t = libc::c_long;
-
-// Helper type for putting a thread to sleep until some other thread wakes it up
-pub struct ThreadParker {
-    futex: AtomicI32,
-}
-
-impl ThreadParker {
-    pub fn new() -> ThreadParker {
-        ThreadParker {
-            futex: AtomicI32::new(0),
-        }
-    }
-
-    // Prepares the parker. This should be called before adding it to the queue.
-    pub unsafe fn prepare_park(&self) {
-        self.futex.store(1, Ordering::Relaxed);
-    }
-
-    // Checks if the park timed out. This should be called while holding the
-    // queue lock after park_until has returned false.
-    pub unsafe fn timed_out(&self) -> bool {
-        self.futex.load(Ordering::Relaxed) != 0
-    }
-
-    // Parks the thread until it is unparked. This should be called after it has
-    // been added to the queue, after unlocking the queue.
-    pub unsafe fn park(&self) {
-        while self.futex.load(Ordering::Acquire) != 0 {
-            let r = libc::syscall(
-                libc::SYS_futex,
-                &self.futex,
-                FUTEX_WAIT | FUTEX_PRIVATE,
-                1,
-                0,
-            );
-            debug_assert!(r == 0 || r == -1);
-            if r == -1 {
-                debug_assert!(
-                    *libc::__errno_location() == libc::EINTR
-                        || *libc::__errno_location() == libc::EAGAIN
-                );
-            }
-        }
-    }
-
-    // Parks the thread until it is unparked or the timeout is reached. This
-    // should be called after it has been added to the queue, after unlocking
-    // the queue. Returns true if we were unparked and false if we timed out.
-    pub unsafe fn park_until(&self, timeout: Instant) -> bool {
-        while self.futex.load(Ordering::Acquire) != 0 {
-            let now = Instant::now();
-            if timeout <= now {
-                return false;
-            }
-            let diff = timeout - now;
-            if diff.as_secs() as libc::time_t as u64 != diff.as_secs() {
-                // Timeout overflowed, just sleep indefinitely
-                self.park();
-                return true;
-            }
-            let ts = libc::timespec {
-                tv_sec: diff.as_secs() as libc::time_t,
-                tv_nsec: diff.subsec_nanos() as tv_nsec_t,
-            };
-            let r = libc::syscall(
-                libc::SYS_futex,
-                &self.futex,
-                FUTEX_WAIT | FUTEX_PRIVATE,
-                1,
-                &ts,
-            );
-            debug_assert!(r == 0 || r == -1);
-            if r == -1 {
-                debug_assert!(
-                    *libc::__errno_location() == libc::EINTR
-                        || *libc::__errno_location() == libc::EAGAIN
-                        || *libc::__errno_location() == libc::ETIMEDOUT
-                );
-            }
-        }
-        true
-    }
-
-    // Locks the parker to prevent the target thread from exiting. This is
-    // necessary to ensure that thread-local ThreadData objects remain valid.
-    // This should be called while holding the queue lock.
-    pub unsafe fn unpark_lock(&self) -> UnparkHandle {
-        // We don't need to lock anything, just clear the state
-        self.futex.store(0, Ordering::Release);
-
-        UnparkHandle { futex: &self.futex }
-    }
-}
-
-// Handle for a thread that is about to be unparked. We need to mark the thread
-// as unparked while holding the queue lock, but we delay the actual unparking
-// until after the queue lock is released.
-pub struct UnparkHandle {
-    futex: *const AtomicI32,
-}
-
-impl UnparkHandle {
-    // Wakes up the parked thread. This should be called after the queue lock is
-    // released to avoid blocking the queue for too long.
-    pub unsafe fn unpark(self) {
-        // The thread data may have been freed at this point, but it doesn't
-        // matter since the syscall will just return EFAULT in that case.
-        let r = libc::syscall(libc::SYS_futex, self.futex, FUTEX_WAKE | FUTEX_PRIVATE, 1);
-        debug_assert!(r == 0 || r == 1 || r == -1);
-        if r == -1 {
-            debug_assert_eq!(*libc::__errno_location(), libc::EFAULT);
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/unix.rs cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/unix.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/unix.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/unix.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use libc;
-use std::cell::{Cell, UnsafeCell};
-use std::mem;
-#[cfg(any(target_os = "macos", target_os = "ios"))]
-use std::ptr;
-use std::time::{Duration, Instant};
-
-// x32 Linux uses a non-standard type for tv_nsec in timespec.
-// See https://sourceware.org/bugzilla/show_bug.cgi?id=16437
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
-#[allow(non_camel_case_types)]
-type tv_nsec_t = i64;
-#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
-#[allow(non_camel_case_types)]
-type tv_nsec_t = libc::c_long;
-
-// Helper type for putting a thread to sleep until some other thread wakes it up
-pub struct ThreadParker {
-    should_park: Cell<bool>,
-    mutex: UnsafeCell<libc::pthread_mutex_t>,
-    condvar: UnsafeCell<libc::pthread_cond_t>,
-    initialized: Cell<bool>,
-}
-
-impl ThreadParker {
-    pub fn new() -> ThreadParker {
-        ThreadParker {
-            should_park: Cell::new(false),
-            mutex: UnsafeCell::new(libc::PTHREAD_MUTEX_INITIALIZER),
-            condvar: UnsafeCell::new(libc::PTHREAD_COND_INITIALIZER),
-            initialized: Cell::new(false),
-        }
-    }
-
-    // Initializes the condvar to use CLOCK_MONOTONIC instead of CLOCK_REALTIME.
-    #[cfg(any(
-        target_os = "macos",
-        target_os = "ios",
-        target_os = "android"
-    ))]
-    unsafe fn init(&self) {}
-    #[cfg(not(any(
-        target_os = "macos",
-        target_os = "ios",
-        target_os = "android"
-    )))]
-    unsafe fn init(&self) {
-        let mut attr: libc::pthread_condattr_t = mem::uninitialized();
-        let r = libc::pthread_condattr_init(&mut attr);
-        debug_assert_eq!(r, 0);
-        let r = libc::pthread_condattr_setclock(&mut attr, libc::CLOCK_MONOTONIC);
-        debug_assert_eq!(r, 0);
-        let r = libc::pthread_cond_init(self.condvar.get(), &attr);
-        debug_assert_eq!(r, 0);
-        let r = libc::pthread_condattr_destroy(&mut attr);
-        debug_assert_eq!(r, 0);
-    }
-
-    // Prepares the parker. This should be called before adding it to the queue.
-    pub unsafe fn prepare_park(&self) {
-        self.should_park.set(true);
-        if !self.initialized.get() {
-            self.init();
-            self.initialized.set(true);
-        }
-    }
-
-    // Checks if the park timed out. This should be called while holding the
-    // queue lock after park_until has returned false.
-    pub unsafe fn timed_out(&self) -> bool {
-        // We need to grab the mutex here because another thread may be
-        // concurrently executing UnparkHandle::unpark, which is done without
-        // holding the queue lock.
-        let r = libc::pthread_mutex_lock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-        let should_park = self.should_park.get();
-        let r = libc::pthread_mutex_unlock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-        should_park
-    }
-
-    // Parks the thread until it is unparked. This should be called after it has
-    // been added to the queue, after unlocking the queue.
-    pub unsafe fn park(&self) {
-        let r = libc::pthread_mutex_lock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-        while self.should_park.get() {
-            let r = libc::pthread_cond_wait(self.condvar.get(), self.mutex.get());
-            debug_assert_eq!(r, 0);
-        }
-        let r = libc::pthread_mutex_unlock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-    }
-
-    // Parks the thread until it is unparked or the timeout is reached. This
-    // should be called after it has been added to the queue, after unlocking
-    // the queue. Returns true if we were unparked and false if we timed out.
-    pub unsafe fn park_until(&self, timeout: Instant) -> bool {
-        let r = libc::pthread_mutex_lock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-        while self.should_park.get() {
-            let now = Instant::now();
-            if timeout <= now {
-                let r = libc::pthread_mutex_unlock(self.mutex.get());
-                debug_assert_eq!(r, 0);
-                return false;
-            }
-
-            if let Some(ts) = timeout_to_timespec(timeout - now) {
-                let r = libc::pthread_cond_timedwait(self.condvar.get(), self.mutex.get(), &ts);
-                if ts.tv_sec < 0 {
-                    // On some systems, negative timeouts will return EINVAL. In
-                    // that case we won't sleep and will just busy loop instead,
-                    // which is the best we can do.
-                    debug_assert!(r == 0 || r == libc::ETIMEDOUT || r == libc::EINVAL);
-                } else {
-                    debug_assert!(r == 0 || r == libc::ETIMEDOUT);
-                }
-            } else {
-                // Timeout calculation overflowed, just sleep indefinitely
-                let r = libc::pthread_cond_wait(self.condvar.get(), self.mutex.get());
-                debug_assert_eq!(r, 0);
-            }
-        }
-        let r = libc::pthread_mutex_unlock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-        true
-    }
-
-    // Locks the parker to prevent the target thread from exiting. This is
-    // necessary to ensure that thread-local ThreadData objects remain valid.
-    // This should be called while holding the queue lock.
-    pub unsafe fn unpark_lock(&self) -> UnparkHandle {
-        let r = libc::pthread_mutex_lock(self.mutex.get());
-        debug_assert_eq!(r, 0);
-
-        UnparkHandle {
-            thread_parker: self,
-        }
-    }
-}
-
-impl Drop for ThreadParker {
-    fn drop(&mut self) {
-        // On DragonFly pthread_mutex_destroy() returns EINVAL if called on a
-        // mutex that was just initialized with libc::PTHREAD_MUTEX_INITIALIZER.
-        // Once it is used (locked/unlocked) or pthread_mutex_init() is called,
-        // this behaviour no longer occurs. The same applies to condvars.
-        unsafe {
-            let r = libc::pthread_mutex_destroy(self.mutex.get());
-            if cfg!(target_os = "dragonfly") {
-                debug_assert!(r == 0 || r == libc::EINVAL);
-            } else {
-                debug_assert_eq!(r, 0);
-            }
-            let r = libc::pthread_cond_destroy(self.condvar.get());
-            if cfg!(target_os = "dragonfly") {
-                debug_assert!(r == 0 || r == libc::EINVAL);
-            } else {
-                debug_assert_eq!(r, 0);
-            }
-        }
-    }
-}
-
-// Handle for a thread that is about to be unparked. We need to mark the thread
-// as unparked while holding the queue lock, but we delay the actual unparking
-// until after the queue lock is released.
-pub struct UnparkHandle {
-    thread_parker: *const ThreadParker,
-}
-
-impl UnparkHandle {
-    // Wakes up the parked thread. This should be called after the queue lock is
-    // released to avoid blocking the queue for too long.
-    pub unsafe fn unpark(self) {
-        (*self.thread_parker).should_park.set(false);
-
-        // We notify while holding the lock here to avoid races with the target
-        // thread. In particular, the thread could exit after we unlock the
-        // mutex, which would make the condvar access invalid memory.
-        let r = libc::pthread_cond_signal((*self.thread_parker).condvar.get());
-        debug_assert_eq!(r, 0);
-        let r = libc::pthread_mutex_unlock((*self.thread_parker).mutex.get());
-        debug_assert_eq!(r, 0);
-    }
-}
-
-// Returns the current time on the clock used by pthread_cond_t as a timespec.
-#[cfg(any(target_os = "macos", target_os = "ios"))]
-unsafe fn timespec_now() -> libc::timespec {
-    let mut now: libc::timeval = mem::uninitialized();
-    let r = libc::gettimeofday(&mut now, ptr::null_mut());
-    debug_assert_eq!(r, 0);
-    libc::timespec {
-        tv_sec: now.tv_sec,
-        tv_nsec: now.tv_usec as tv_nsec_t * 1000,
-    }
-}
-#[cfg(not(any(target_os = "macos", target_os = "ios")))]
-unsafe fn timespec_now() -> libc::timespec {
-    let mut now: libc::timespec = mem::uninitialized();
-    let clock = if cfg!(target_os = "android") {
-        // Android doesn't support pthread_condattr_setclock, so we need to
-        // specify the timeout in CLOCK_REALTIME.
-        libc::CLOCK_REALTIME
-    } else {
-        libc::CLOCK_MONOTONIC
-    };
-    let r = libc::clock_gettime(clock, &mut now);
-    debug_assert_eq!(r, 0);
-    now
-}
-
-// Converts a relative timeout into an absolute timeout in the clock used by
-// pthread_cond_t.
-unsafe fn timeout_to_timespec(timeout: Duration) -> Option<libc::timespec> {
-    // Handle overflows early on
-    if timeout.as_secs() > libc::time_t::max_value() as u64 {
-        return None;
-    }
-
-    let now = timespec_now();
-    let mut nsec = now.tv_nsec + timeout.subsec_nanos() as tv_nsec_t;
-    let mut sec = now.tv_sec.checked_add(timeout.as_secs() as libc::time_t);
-    if nsec >= 1_000_000_000 {
-        nsec -= 1_000_000_000;
-        sec = sec.and_then(|sec| sec.checked_add(1));
-    }
-
-    sec.map(|sec| libc::timespec {
-        tv_nsec: nsec,
-        tv_sec: sec,
-    })
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::mem;
-use std::ptr;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::time::Instant;
-
-use winapi::shared::minwindef::{TRUE, ULONG};
-use winapi::shared::ntdef::NTSTATUS;
-use winapi::shared::ntstatus::{STATUS_SUCCESS, STATUS_TIMEOUT};
-use winapi::um::handleapi::CloseHandle;
-use winapi::um::libloaderapi::{GetModuleHandleA, GetProcAddress};
-use winapi::um::winnt::{ACCESS_MASK, GENERIC_READ, GENERIC_WRITE, LPCSTR};
-use winapi::um::winnt::{BOOLEAN, HANDLE, LARGE_INTEGER, PHANDLE, PLARGE_INTEGER, PVOID};
-
-const STATE_UNPARKED: usize = 0;
-const STATE_PARKED: usize = 1;
-const STATE_TIMED_OUT: usize = 2;
-
-#[allow(non_snake_case)]
-pub struct KeyedEvent {
-    handle: HANDLE,
-    NtReleaseKeyedEvent: extern "system" fn(
-        EventHandle: HANDLE,
-        Key: PVOID,
-        Alertable: BOOLEAN,
-        Timeout: PLARGE_INTEGER,
-    ) -> NTSTATUS,
-    NtWaitForKeyedEvent: extern "system" fn(
-        EventHandle: HANDLE,
-        Key: PVOID,
-        Alertable: BOOLEAN,
-        Timeout: PLARGE_INTEGER,
-    ) -> NTSTATUS,
-}
-
-impl KeyedEvent {
-    unsafe fn wait_for(&self, key: PVOID, timeout: PLARGE_INTEGER) -> NTSTATUS {
-        (self.NtWaitForKeyedEvent)(self.handle, key, 0, timeout)
-    }
-
-    unsafe fn release(&self, key: PVOID) -> NTSTATUS {
-        (self.NtReleaseKeyedEvent)(self.handle, key, 0, ptr::null_mut())
-    }
-
-    #[allow(non_snake_case)]
-    pub unsafe fn create() -> Option<KeyedEvent> {
-        let ntdll = GetModuleHandleA(b"ntdll.dll\0".as_ptr() as LPCSTR);
-        if ntdll.is_null() {
-            return None;
-        }
-
-        let NtCreateKeyedEvent = GetProcAddress(ntdll, b"NtCreateKeyedEvent\0".as_ptr() as LPCSTR);
-        if NtCreateKeyedEvent.is_null() {
-            return None;
-        }
-        let NtReleaseKeyedEvent =
-            GetProcAddress(ntdll, b"NtReleaseKeyedEvent\0".as_ptr() as LPCSTR);
-        if NtReleaseKeyedEvent.is_null() {
-            return None;
-        }
-        let NtWaitForKeyedEvent =
-            GetProcAddress(ntdll, b"NtWaitForKeyedEvent\0".as_ptr() as LPCSTR);
-        if NtWaitForKeyedEvent.is_null() {
-            return None;
-        }
-
-        let NtCreateKeyedEvent: extern "system" fn(
-            KeyedEventHandle: PHANDLE,
-            DesiredAccess: ACCESS_MASK,
-            ObjectAttributes: PVOID,
-            Flags: ULONG,
-        ) -> NTSTATUS = mem::transmute(NtCreateKeyedEvent);
-        let mut handle = mem::uninitialized();
-        let status = NtCreateKeyedEvent(
-            &mut handle,
-            GENERIC_READ | GENERIC_WRITE,
-            ptr::null_mut(),
-            0,
-        );
-        if status != STATUS_SUCCESS {
-            return None;
-        }
-
-        Some(KeyedEvent {
-            handle,
-            NtReleaseKeyedEvent: mem::transmute(NtReleaseKeyedEvent),
-            NtWaitForKeyedEvent: mem::transmute(NtWaitForKeyedEvent),
-        })
-    }
-
-    pub unsafe fn prepare_park(&'static self, key: &AtomicUsize) {
-        key.store(STATE_PARKED, Ordering::Relaxed);
-    }
-
-    pub unsafe fn timed_out(&'static self, key: &AtomicUsize) -> bool {
-        key.load(Ordering::Relaxed) == STATE_TIMED_OUT
-    }
-
-    pub unsafe fn park(&'static self, key: &AtomicUsize) {
-        let status = self.wait_for(key as *const _ as PVOID, ptr::null_mut());
-        debug_assert_eq!(status, STATUS_SUCCESS);
-    }
-
-    pub unsafe fn park_until(&'static self, key: &AtomicUsize, timeout: Instant) -> bool {
-        let now = Instant::now();
-        if timeout <= now {
-            // If another thread unparked us, we need to call
-            // NtWaitForKeyedEvent otherwise that thread will stay stuck at
-            // NtReleaseKeyedEvent.
-            if key.swap(STATE_TIMED_OUT, Ordering::Relaxed) == STATE_UNPARKED {
-                self.park(key);
-                return true;
-            }
-            return false;
-        }
-
-        // NT uses a timeout in units of 100ns. We use a negative value to
-        // indicate a relative timeout based on a monotonic clock.
-        let mut nt_timeout: LARGE_INTEGER = mem::zeroed();
-        let diff = timeout - now;
-        let value = (diff.as_secs() as i64)
-            .checked_mul(-10000000)
-            .and_then(|x| x.checked_sub((diff.subsec_nanos() as i64 + 99) / 100));
-
-        match value {
-            Some(x) => *nt_timeout.QuadPart_mut() = x,
-            None => {
-                // Timeout overflowed, just sleep indefinitely
-                self.park(key);
-                return true;
-            }
-        };
-
-        let status = self.wait_for(key as *const _ as PVOID, &mut nt_timeout);
-        if status == STATUS_SUCCESS {
-            return true;
-        }
-        debug_assert_eq!(status, STATUS_TIMEOUT);
-
-        // If another thread unparked us, we need to call NtWaitForKeyedEvent
-        // otherwise that thread will stay stuck at NtReleaseKeyedEvent.
-        if key.swap(STATE_TIMED_OUT, Ordering::Relaxed) == STATE_UNPARKED {
-            self.park(key);
-            return true;
-        }
-        false
-    }
-
-    pub unsafe fn unpark_lock(&'static self, key: &AtomicUsize) -> UnparkHandle {
-        // If the state was STATE_PARKED then we need to wake up the thread
-        if key.swap(STATE_UNPARKED, Ordering::Relaxed) == STATE_PARKED {
-            UnparkHandle {
-                key: key,
-                keyed_event: self,
-            }
-        } else {
-            UnparkHandle {
-                key: ptr::null(),
-                keyed_event: self,
-            }
-        }
-    }
-}
-
-impl Drop for KeyedEvent {
-    fn drop(&mut self) {
-        unsafe {
-            let ok = CloseHandle(self.handle);
-            debug_assert_eq!(ok, TRUE);
-        }
-    }
-}
-
-// Handle for a thread that is about to be unparked. We need to mark the thread
-// as unparked while holding the queue lock, but we delay the actual unparking
-// until after the queue lock is released.
-pub struct UnparkHandle {
-    key: *const AtomicUsize,
-    keyed_event: &'static KeyedEvent,
-}
-
-impl UnparkHandle {
-    // Wakes up the parked thread. This should be called after the queue lock is
-    // released to avoid blocking the queue for too long.
-    pub unsafe fn unpark(self) {
-        if !self.key.is_null() {
-            let status = self.keyed_event.release(self.key as PVOID);
-            debug_assert_eq!(status, STATUS_SUCCESS);
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/windows/mod.rs cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/windows/mod.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/windows/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/windows/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::time::Instant;
-
-mod keyed_event;
-mod waitaddress;
-
-enum Backend {
-    KeyedEvent(keyed_event::KeyedEvent),
-    WaitAddress(waitaddress::WaitAddress),
-}
-
-impl Backend {
-    unsafe fn get() -> &'static Backend {
-        static BACKEND: AtomicUsize = ATOMIC_USIZE_INIT;
-
-        // Fast path: use the existing object
-        let backend = BACKEND.load(Ordering::Acquire);
-        if backend != 0 {
-            return &*(backend as *const Backend);
-        };
-
-        // Try to create a new Backend
-        let backend;
-        if let Some(waitaddress) = waitaddress::WaitAddress::create() {
-            backend = Backend::WaitAddress(waitaddress);
-        } else if let Some(keyed_event) = keyed_event::KeyedEvent::create() {
-            backend = Backend::KeyedEvent(keyed_event);
-        } else {
-            panic!(
-                "parking_lot requires either NT Keyed Events (WinXP+) or \
-                 WaitOnAddress/WakeByAddress (Win8+)"
-            );
-        }
-
-        // Try to create a new object
-        let backend = Box::into_raw(Box::new(backend));
-        match BACKEND.compare_exchange(0, backend as usize, Ordering::Release, Ordering::Relaxed) {
-            Ok(_) => &*(backend as *const Backend),
-            Err(x) => {
-                // We lost the race, free our object and return the global one
-                Box::from_raw(backend);
-                &*(x as *const Backend)
-            }
-        }
-    }
-}
-
-// Helper type for putting a thread to sleep until some other thread wakes it up
-pub struct ThreadParker {
-    key: AtomicUsize,
-    backend: &'static Backend,
-}
-
-impl ThreadParker {
-    pub fn new() -> ThreadParker {
-        // Initialize the backend here to ensure we don't get any panics
-        // later on, which could leave synchronization primitives in a broken
-        // state.
-        ThreadParker {
-            key: AtomicUsize::new(0),
-            backend: unsafe { Backend::get() },
-        }
-    }
-
-    // Prepares the parker. This should be called before adding it to the queue.
-    pub unsafe fn prepare_park(&self) {
-        match *self.backend {
-            Backend::KeyedEvent(ref x) => x.prepare_park(&self.key),
-            Backend::WaitAddress(ref x) => x.prepare_park(&self.key),
-        }
-    }
-
-    // Checks if the park timed out. This should be called while holding the
-    // queue lock after park_until has returned false.
-    pub unsafe fn timed_out(&self) -> bool {
-        match *self.backend {
-            Backend::KeyedEvent(ref x) => x.timed_out(&self.key),
-            Backend::WaitAddress(ref x) => x.timed_out(&self.key),
-        }
-    }
-
-    // Parks the thread until it is unparked. This should be called after it has
-    // been added to the queue, after unlocking the queue.
-    pub unsafe fn park(&self) {
-        match *self.backend {
-            Backend::KeyedEvent(ref x) => x.park(&self.key),
-            Backend::WaitAddress(ref x) => x.park(&self.key),
-        }
-    }
-
-    // Parks the thread until it is unparked or the timeout is reached. This
-    // should be called after it has been added to the queue, after unlocking
-    // the queue. Returns true if we were unparked and false if we timed out.
-    pub unsafe fn park_until(&self, timeout: Instant) -> bool {
-        match *self.backend {
-            Backend::KeyedEvent(ref x) => x.park_until(&self.key, timeout),
-            Backend::WaitAddress(ref x) => x.park_until(&self.key, timeout),
-        }
-    }
-
-    // Locks the parker to prevent the target thread from exiting. This is
-    // necessary to ensure that thread-local ThreadData objects remain valid.
-    // This should be called while holding the queue lock.
-    pub unsafe fn unpark_lock(&self) -> UnparkHandle {
-        match *self.backend {
-            Backend::KeyedEvent(ref x) => UnparkHandle::KeyedEvent(x.unpark_lock(&self.key)),
-            Backend::WaitAddress(ref x) => UnparkHandle::WaitAddress(x.unpark_lock(&self.key)),
-        }
-    }
-}
-
-// Handle for a thread that is about to be unparked. We need to mark the thread
-// as unparked while holding the queue lock, but we delay the actual unparking
-// until after the queue lock is released.
-pub enum UnparkHandle {
-    KeyedEvent(keyed_event::UnparkHandle),
-    WaitAddress(waitaddress::UnparkHandle),
-}
-
-impl UnparkHandle {
-    // Wakes up the parked thread. This should be called after the queue lock is
-    // released to avoid blocking the queue for too long.
-    pub unsafe fn unpark(self) {
-        match self {
-            UnparkHandle::KeyedEvent(x) => x.unpark(),
-            UnparkHandle::WaitAddress(x) => x.unpark(),
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use std::mem;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::time::Instant;
-
-use winapi::shared::basetsd::SIZE_T;
-use winapi::shared::minwindef::{BOOL, DWORD, FALSE, TRUE};
-use winapi::shared::winerror::ERROR_TIMEOUT;
-use winapi::um::errhandlingapi::GetLastError;
-use winapi::um::libloaderapi::{GetModuleHandleA, GetProcAddress};
-use winapi::um::winbase::INFINITE;
-use winapi::um::winnt::{LPCSTR, PVOID};
-
-#[allow(non_snake_case)]
-pub struct WaitAddress {
-    WaitOnAddress: extern "system" fn(
-        Address: PVOID,
-        CompareAddress: PVOID,
-        AddressSize: SIZE_T,
-        dwMilliseconds: DWORD,
-    ) -> BOOL,
-    WakeByAddressSingle: extern "system" fn(Address: PVOID),
-}
-
-impl WaitAddress {
-    #[allow(non_snake_case)]
-    pub unsafe fn create() -> Option<WaitAddress> {
-        // MSDN claims that that WaitOnAddress and WakeByAddressSingle are
-        // located in kernel32.dll, but they are lying...
-        let synch_dll = GetModuleHandleA(b"api-ms-win-core-synch-l1-2-0.dll\0".as_ptr() as LPCSTR);
-        if synch_dll.is_null() {
-            return None;
-        }
-
-        let WaitOnAddress = GetProcAddress(synch_dll, b"WaitOnAddress\0".as_ptr() as LPCSTR);
-        if WaitOnAddress.is_null() {
-            return None;
-        }
-        let WakeByAddressSingle =
-            GetProcAddress(synch_dll, b"WakeByAddressSingle\0".as_ptr() as LPCSTR);
-        if WakeByAddressSingle.is_null() {
-            return None;
-        }
-        Some(WaitAddress {
-            WaitOnAddress: mem::transmute(WaitOnAddress),
-            WakeByAddressSingle: mem::transmute(WakeByAddressSingle),
-        })
-    }
-
-    pub unsafe fn prepare_park(&'static self, key: &AtomicUsize) {
-        key.store(1, Ordering::Relaxed);
-    }
-
-    pub unsafe fn timed_out(&'static self, key: &AtomicUsize) -> bool {
-        key.load(Ordering::Relaxed) != 0
-    }
-
-    pub unsafe fn park(&'static self, key: &AtomicUsize) {
-        while key.load(Ordering::Acquire) != 0 {
-            let cmp = 1usize;
-            let r = (self.WaitOnAddress)(
-                key as *const _ as PVOID,
-                &cmp as *const _ as PVOID,
-                mem::size_of::<usize>() as SIZE_T,
-                INFINITE,
-            );
-            debug_assert!(r == TRUE);
-        }
-    }
-
-    pub unsafe fn park_until(&'static self, key: &AtomicUsize, timeout: Instant) -> bool {
-        while key.load(Ordering::Acquire) != 0 {
-            let now = Instant::now();
-            if timeout <= now {
-                return false;
-            }
-            let diff = timeout - now;
-            let timeout = diff
-                .as_secs()
-                .checked_mul(1000)
-                .and_then(|x| x.checked_add((diff.subsec_nanos() as u64 + 999999) / 1000000))
-                .map(|ms| {
-                    if ms > <DWORD>::max_value() as u64 {
-                        INFINITE
-                    } else {
-                        ms as DWORD
-                    }
-                }).unwrap_or(INFINITE);
-            let cmp = 1usize;
-            let r = (self.WaitOnAddress)(
-                key as *const _ as PVOID,
-                &cmp as *const _ as PVOID,
-                mem::size_of::<usize>() as SIZE_T,
-                timeout,
-            );
-            if r == FALSE {
-                debug_assert_eq!(GetLastError(), ERROR_TIMEOUT);
-            }
-        }
-        true
-    }
-
-    pub unsafe fn unpark_lock(&'static self, key: &AtomicUsize) -> UnparkHandle {
-        // We don't need to lock anything, just clear the state
-        key.store(0, Ordering::Release);
-
-        UnparkHandle {
-            key: key,
-            waitaddress: self,
-        }
-    }
-}
-
-// Handle for a thread that is about to be unparked. We need to mark the thread
-// as unparked while holding the queue lock, but we delay the actual unparking
-// until after the queue lock is released.
-pub struct UnparkHandle {
-    key: *const AtomicUsize,
-    waitaddress: &'static WaitAddress,
-}
-
-impl UnparkHandle {
-    // Wakes up the parked thread. This should be called after the queue lock is
-    // released to avoid blocking the queue for too long.
-    pub unsafe fn unpark(self) {
-        (self.waitaddress.WakeByAddressSingle)(self.key as PVOID);
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/util.rs cargo-0.33.0/vendor/parking_lot_core/src/util.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/util.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/util.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-// Option::unchecked_unwrap
-pub trait UncheckedOptionExt<T> {
-    unsafe fn unchecked_unwrap(self) -> T;
-}
-
-impl<T> UncheckedOptionExt<T> for Option<T> {
-    #[inline]
-    unsafe fn unchecked_unwrap(self) -> T {
-        match self {
-            Some(x) => x,
-            None => unreachable(),
-        }
-    }
-}
-
-// Equivalent to intrinsics::unreachable() in release mode
-#[inline]
-unsafe fn unreachable() -> ! {
-    if cfg!(debug_assertions) {
-        unreachable!();
-    } else {
-        enum Void {}
-        match *(1 as *const Void) {}
-    }
-}
diff -Nru cargo-0.32.0/vendor/parking_lot_core/src/word_lock.rs cargo-0.33.0/vendor/parking_lot_core/src/word_lock.rs
--- cargo-0.32.0/vendor/parking_lot_core/src/word_lock.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/parking_lot_core/src/word_lock.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use spinwait::SpinWait;
-use std::cell::Cell;
-use std::mem;
-#[cfg(not(has_localkey_try_with))]
-use std::panic;
-use std::ptr;
-use std::sync::atomic::{fence, AtomicUsize, Ordering};
-use std::thread::LocalKey;
-use thread_parker::ThreadParker;
-
-struct ThreadData {
-    parker: ThreadParker,
-
-    // Linked list of threads in the queue. The queue is split into two parts:
-    // the processed part and the unprocessed part. When new nodes are added to
-    // the list, they only have the next pointer set, and queue_tail is null.
-    //
-    // Nodes are processed with the queue lock held, which consists of setting
-    // the prev pointer for each node and setting the queue_tail pointer on the
-    // first processed node of the list.
-    //
-    // This setup allows nodes to be added to the queue without a lock, while
-    // still allowing O(1) removal of nodes from the processed part of the list.
-    // The only cost is the O(n) processing, but this only needs to be done
-    // once for each node, and therefore isn't too expensive.
-    queue_tail: Cell<*const ThreadData>,
-    prev: Cell<*const ThreadData>,
-    next: Cell<*const ThreadData>,
-}
-
-impl ThreadData {
-    fn new() -> ThreadData {
-        ThreadData {
-            parker: ThreadParker::new(),
-            queue_tail: Cell::new(ptr::null()),
-            prev: Cell::new(ptr::null()),
-            next: Cell::new(ptr::null()),
-        }
-    }
-}
-
-// Returns a ThreadData structure for the current thread
-unsafe fn get_thread_data(local: &mut Option<ThreadData>) -> &ThreadData {
-    // Try to read from thread-local storage, but return None if the TLS has
-    // already been destroyed.
-    #[cfg(has_localkey_try_with)]
-    fn try_get_tls(key: &'static LocalKey<ThreadData>) -> Option<*const ThreadData> {
-        key.try_with(|x| x as *const ThreadData).ok()
-    }
-    #[cfg(not(has_localkey_try_with))]
-    fn try_get_tls(key: &'static LocalKey<ThreadData>) -> Option<*const ThreadData> {
-        panic::catch_unwind(|| key.with(|x| x as *const ThreadData)).ok()
-    }
-
-    // If ThreadData is expensive to construct, then we want to use a cached
-    // version in thread-local storage if possible.
-    if !cfg!(windows) && !cfg!(all(feature = "nightly", target_os = "linux")) {
-        thread_local!(static THREAD_DATA: ThreadData = ThreadData::new());
-        if let Some(tls) = try_get_tls(&THREAD_DATA) {
-            return &*tls;
-        }
-    }
-
-    // Otherwise just create a ThreadData on the stack
-    *local = Some(ThreadData::new());
-    local.as_ref().unwrap()
-}
-
-const LOCKED_BIT: usize = 1;
-const QUEUE_LOCKED_BIT: usize = 2;
-const QUEUE_MASK: usize = !3;
-
-// Word-sized lock that is used to implement the parking_lot API. Since this
-// can't use parking_lot, it instead manages its own queue of waiting threads.
-pub struct WordLock {
-    state: AtomicUsize,
-}
-
-impl WordLock {
-    #[inline]
-    pub fn new() -> WordLock {
-        WordLock {
-            state: AtomicUsize::new(0),
-        }
-    }
-
-    #[inline]
-    pub unsafe fn lock(&self) {
-        if self
-            .state
-            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
-            .is_ok()
-        {
-            return;
-        }
-        self.lock_slow();
-    }
-
-    #[inline]
-    pub unsafe fn unlock(&self) {
-        let state = self.state.fetch_sub(LOCKED_BIT, Ordering::Release);
-        if state & QUEUE_LOCKED_BIT != 0 || state & QUEUE_MASK == 0 {
-            return;
-        }
-        self.unlock_slow();
-    }
-
-    #[cold]
-    #[inline(never)]
-    unsafe fn lock_slow(&self) {
-        let mut spinwait = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // Grab the lock if it isn't locked, even if there is a queue on it
-            if state & LOCKED_BIT == 0 {
-                match self.state.compare_exchange_weak(
-                    state,
-                    state | LOCKED_BIT,
-                    Ordering::Acquire,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return,
-                    Err(x) => state = x,
-                }
-                continue;
-            }
-
-            // If there is no queue, try spinning a few times
-            if state & QUEUE_MASK == 0 && spinwait.spin() {
-                state = self.state.load(Ordering::Relaxed);
-                continue;
-            }
-
-            // Get our thread data and prepare it for parking
-            let mut thread_data = None;
-            let thread_data = get_thread_data(&mut thread_data);
-            assert!(mem::align_of_val(thread_data) > !QUEUE_MASK);
-            thread_data.parker.prepare_park();
-
-            // Add our thread to the front of the queue
-            let queue_head = (state & QUEUE_MASK) as *const ThreadData;
-            if queue_head.is_null() {
-                thread_data.queue_tail.set(thread_data);
-                thread_data.prev.set(ptr::null());
-            } else {
-                thread_data.queue_tail.set(ptr::null());
-                thread_data.prev.set(ptr::null());
-                thread_data.next.set(queue_head);
-            }
-            if let Err(x) = self.state.compare_exchange_weak(
-                state,
-                (state & !QUEUE_MASK) | thread_data as *const _ as usize,
-                Ordering::Release,
-                Ordering::Relaxed,
-            ) {
-                state = x;
-                continue;
-            }
-
-            // Sleep until we are woken up by an unlock
-            thread_data.parker.park();
-
-            // Loop back and try locking again
-            spinwait.reset();
-            self.state.load(Ordering::Relaxed);
-        }
-    }
-
-    #[cold]
-    #[inline(never)]
-    unsafe fn unlock_slow(&self) {
-        let mut state = self.state.load(Ordering::Relaxed);
-        loop {
-            // We just unlocked the WordLock. Just check if there is a thread
-            // to wake up. If the queue is locked then another thread is already
-            // taking care of waking up a thread.
-            if state & QUEUE_LOCKED_BIT != 0 || state & QUEUE_MASK == 0 {
-                return;
-            }
-
-            // Try to grab the queue lock
-            match self.state.compare_exchange_weak(
-                state,
-                state | QUEUE_LOCKED_BIT,
-                Ordering::Acquire,
-                Ordering::Relaxed,
-            ) {
-                Ok(_) => break,
-                Err(x) => state = x,
-            }
-        }
-
-        // Now we have the queue lock and the queue is non-empty
-        'outer: loop {
-            // First, we need to fill in the prev pointers for any newly added
-            // threads. We do this until we reach a node that we previously
-            // processed, which has a non-null queue_tail pointer.
-            let queue_head = (state & QUEUE_MASK) as *const ThreadData;
-            let mut queue_tail;
-            let mut current = queue_head;
-            loop {
-                queue_tail = (*current).queue_tail.get();
-                if !queue_tail.is_null() {
-                    break;
-                }
-                let next = (*current).next.get();
-                (*next).prev.set(current);
-                current = next;
-            }
-
-            // Set queue_tail on the queue head to indicate that the whole list
-            // has prev pointers set correctly.
-            (*queue_head).queue_tail.set(queue_tail);
-
-            // If the WordLock is locked, then there is no point waking up a
-            // thread now. Instead we let the next unlocker take care of waking
-            // up a thread.
-            if state & LOCKED_BIT != 0 {
-                match self.state.compare_exchange_weak(
-                    state,
-                    state & !QUEUE_LOCKED_BIT,
-                    Ordering::Release,
-                    Ordering::Relaxed,
-                ) {
-                    Ok(_) => return,
-                    Err(x) => state = x,
-                }
-
-                // Need an acquire fence before reading the new queue
-                fence(Ordering::Acquire);
-                continue;
-            }
-
-            // Remove the last thread from the queue and unlock the queue
-            let new_tail = (*queue_tail).prev.get();
-            if new_tail.is_null() {
-                loop {
-                    match self.state.compare_exchange_weak(
-                        state,
-                        state & LOCKED_BIT,
-                        Ordering::Release,
-                        Ordering::Relaxed,
-                    ) {
-                        Ok(_) => break,
-                        Err(x) => state = x,
-                    }
-
-                    // If the compare_exchange failed because a new thread was
-                    // added to the queue then we need to re-scan the queue to
-                    // find the previous element.
-                    if state & QUEUE_MASK == 0 {
-                        continue;
-                    } else {
-                        // Need an acquire fence before reading the new queue
-                        fence(Ordering::Acquire);
-                        continue 'outer;
-                    }
-                }
-            } else {
-                (*queue_head).queue_tail.set(new_tail);
-                self.state.fetch_and(!QUEUE_LOCKED_BIT, Ordering::Release);
-            }
-
-            // Finally, wake up the thread we removed from the queue. Note that
-            // we don't need to worry about any races here since the thread is
-            // guaranteed to be sleeping right now and we are the only one who
-            // can wake it up.
-            (*queue_tail).parker.unpark_lock().unpark();
-            break;
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/percent-encoding/Cargo.lock cargo-0.33.0/vendor/percent-encoding/Cargo.lock
--- cargo-0.32.0/vendor/percent-encoding/Cargo.lock	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/percent-encoding/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-
diff -Nru cargo-0.32.0/vendor/pkg-config/.travis.yml cargo-0.33.0/vendor/pkg-config/.travis.yml
--- cargo-0.32.0/vendor/pkg-config/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/pkg-config/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo doc --no-deps
-after_success:
-  - travis-cargo --only nightly doc-upload
-env:
-  global:
-    secure: "D/GKEEBQarjXTZ6NWzwQq39nQ892XJ9m3C9219K/6Us8jyjE5DBhosDPvg6pvRJtTLaghDxuhxqkHunayNL18IOvkNbfMjYsnkP8/yMftQUfRdNub6C1kXAi8guXjPd8rUwW0Oy8Nar61WAwWQgHkXfuSJ2em7u/Xk0tICPSwlA="
-
-
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/pretty_env_logger/.cargo-checksum.json cargo-0.33.0/vendor/pretty_env_logger/.cargo-checksum.json
--- cargo-0.32.0/vendor/pretty_env_logger/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/pretty_env_logger/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"ed8d1e63042e889b85228620629b51c011d380eed2c7e0015f8a644def280c28"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/pretty_env_logger/Cargo.toml cargo-0.33.0/vendor/pretty_env_logger/Cargo.toml
--- cargo-0.32.0/vendor/pretty_env_logger/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/pretty_env_logger/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,34 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "pretty_env_logger"
+version = "0.2.5"
+authors = ["Sean McArthur <sean@seanmonstar>"]
+include = ["Cargo.toml", "LICENSE-APACHE", "LICENSE-MIT", "src/**/*"]
+description = "a visually pretty env_logger"
+readme = "README.md"
+keywords = ["log", "logger", "logging"]
+categories = ["development-tools::debugging"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/seanmonstar/pretty-env-logger"
+[dependencies.ansi_term]
+version = "0.11"
+
+[dependencies.chrono]
+version = "0.4.4"
+
+[dependencies.env_logger]
+version = "0.5"
+
+[dependencies.log]
+version = "0.4"
diff -Nru cargo-0.32.0/vendor/pretty_env_logger/LICENSE-APACHE cargo-0.33.0/vendor/pretty_env_logger/LICENSE-APACHE
--- cargo-0.32.0/vendor/pretty_env_logger/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/pretty_env_logger/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
diff -Nru cargo-0.32.0/vendor/pretty_env_logger/LICENSE-MIT cargo-0.33.0/vendor/pretty_env_logger/LICENSE-MIT
--- cargo-0.32.0/vendor/pretty_env_logger/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/pretty_env_logger/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2017 Sean McArthur
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff -Nru cargo-0.32.0/vendor/pretty_env_logger/src/lib.rs cargo-0.33.0/vendor/pretty_env_logger/src/lib.rs
--- cargo-0.32.0/vendor/pretty_env_logger/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/pretty_env_logger/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,207 @@
+#![deny(warnings)]
+#![deny(missing_docs)]
+
+//! A logger configured via an environment variable which writes to standard
+//! error with nice colored output for log levels.
+//!
+//! ## Example
+//!
+//! ```
+//! extern crate pretty_env_logger;
+//! #[macro_use] extern crate log;
+//!
+//! fn main() {
+//!     pretty_env_logger::init();
+//!
+//!     trace!("a trace example");
+//!     debug!("deboogging");
+//!     info!("such information");
+//!     warn!("o_O");
+//!     error!("boom");
+//! }
+//! ```
+
+extern crate ansi_term;
+extern crate env_logger;
+extern crate log;
+extern crate chrono;
+
+use std::fmt;
+use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
+
+use chrono::Local;
+use ansi_term::{Color, Style};
+use env_logger::Builder;
+use log::Level;
+
+struct ColorLevel(Level);
+
+impl fmt::Display for ColorLevel {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.0 {
+            Level::Trace => Color::Purple.paint("TRACE"),
+            Level::Debug => Color::Blue.paint("DEBUG"),
+            Level::Info => Color::Green.paint("INFO "),
+            Level::Warn => Color::Yellow.paint("WARN "),
+            Level::Error => Color::Red.paint("ERROR")
+        }.fmt(f)
+    }
+}
+
+static MAX_MODULE_WIDTH: AtomicUsize = ATOMIC_USIZE_INIT;
+
+/// Initializes the global logger with a pretty env logger.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Panics
+///
+/// This function fails to set the global logger if one has already been set.
+#[inline]
+pub fn init() {
+    try_init().unwrap();
+}
+
+/// Initializes the global logger with a timed pretty env logger.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Panics
+///
+/// This function fails to set the global logger if one has already been set.
+#[inline]
+pub fn init_timed() {
+    try_init_timed().unwrap();
+}
+
+/// Initializes the global logger with a pretty env logger.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Errors
+///
+/// This function fails to set the global logger if one has already been set.
+pub fn try_init() -> Result<(), log::SetLoggerError> {
+    try_init_custom_env("RUST_LOG")
+}
+
+/// Initializes the global logger with a timed pretty env logger.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Errors
+///
+/// This function fails to set the global logger if one has already been set.
+pub fn try_init_timed() -> Result<(), log::SetLoggerError> {
+    try_init_timed_custom_env("RUST_LOG")
+}
+
+/// Initialized the global logger with a pretty env logger, with a custom variable name.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Panics
+///
+/// This function fails to set the global logger if one has already been set.
+pub fn init_custom_env(environment_variable_name: &str) {
+    try_init_custom_env(environment_variable_name).unwrap();
+}
+
+/// Initialized the global logger with a pretty env logger, with a custom variable name.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Errors
+///
+/// This function fails to set the global logger if one has already been set.
+pub fn try_init_custom_env(environment_variable_name: &str) -> Result<(), log::SetLoggerError> {
+    let mut builder = formatted_builder()?;
+
+    if let Ok(s) = ::std::env::var(environment_variable_name) {
+        builder.parse(&s);
+    }
+
+    builder.try_init()
+}
+
+/// Initialized the global logger with a timed pretty env logger, with a custom variable name.
+///
+/// This should be called early in the execution of a Rust program, and the
+/// global logger may only be initialized once. Future initialization attempts
+/// will return an error.
+///
+/// # Errors
+///
+/// This function fails to set the global logger if one has already been set.
+pub fn try_init_timed_custom_env(environment_variable_name: &str) -> Result<(), log::SetLoggerError> {
+    let mut builder = formatted_timed_builder();
+
+    if let Ok(s) = ::std::env::var(environment_variable_name) {
+        builder.parse(&s);
+    }
+
+    builder.try_init()
+}
+
+/// Returns a `env_logger::Builder` for further customization.
+///
+/// This method will return a colored and formatted) `env_logger::Builder`
+/// for further customization. Refer to env_logger::Build crate documentation
+/// for further details and usage.
+pub fn formatted_builder() -> Result<Builder, log::SetLoggerError> {
+    let mut builder = Builder::new();
+
+    builder.format(|f, record| {
+        use std::io::Write;
+        let target = record.target();
+        let mut max_width = MAX_MODULE_WIDTH.load(Ordering::Relaxed);
+        if max_width < target.len() {
+            MAX_MODULE_WIDTH.store(target.len(), Ordering::Relaxed);
+            max_width = target.len();
+        }
+        writeln!(f, " {} {} > {}",
+                 ColorLevel(record.level()),
+                 Style::new().bold().paint(format!("{: <width$}", target, width=max_width)),
+                 record.args())
+    });
+
+    Ok(builder)
+}
+
+/// Returns a `env_logger::Builder` for further customization.
+///
+/// This method will return a colored and time formatted) `env_logger::Builder`
+/// for further customization. Refer to env_logger::Build crate documentation
+/// for further details and usage.
+pub fn formatted_timed_builder() -> Builder {
+    let mut builder = Builder::new();
+
+    builder.format(|f, record| {
+        use std::io::Write;
+        let target = record.target();
+        let mut max_width = MAX_MODULE_WIDTH.load(Ordering::Relaxed);
+        if max_width < target.len() {
+            MAX_MODULE_WIDTH.store(target.len(), Ordering::Relaxed);
+            max_width = target.len();
+        }
+        writeln!(f, " {} {} {} > {}",
+                 Local::now().format("%Y-%m-%d %H:%M:%S"),
+                 ColorLevel(record.level()),
+                 Style::new().bold().paint(format!("{: <width$}", target, width=max_width)),
+                 record.args())
+    });
+
+    builder
+}
diff -Nru cargo-0.32.0/vendor/proc-macro2/build.rs cargo-0.33.0/vendor/proc-macro2/build.rs
--- cargo-0.32.0/vendor/proc-macro2/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,43 @@
+// rustc-cfg emitted by the build script:
+//
+// "u128"
+//     Include u128 and i128 constructors for proc_macro2::Literal. Enabled on
+//     any compiler 1.26+.
+//
+// "use_proc_macro"
+//     Link to extern crate proc_macro. Available on any compiler and any target
+//     except wasm32. Requires "proc-macro" Cargo cfg to be enabled (default is
+//     enabled). On wasm32 we never link to proc_macro even if "proc-macro" cfg
+//     is enabled.
+//
+// "wrap_proc_macro"
+//     Wrap types from libproc_macro rather than polyfilling the whole API.
+//     Enabled on rustc 1.29+ as long as procmacro2_semver_exempt is not set,
+//     because we can't emulate the unstable API without emulating everything
+//     else. Also enabled unconditionally on nightly, in which case the
+//     procmacro2_semver_exempt surface area is implemented by using the
+//     nightly-only proc_macro API.
+//
+// "slow_extend"
+//     Fallback when `impl Extend for TokenStream` is not available. These impls
+//     were added one version later than the rest of the proc_macro token API.
+//     Enabled on rustc 1.29 only.
+//
+// "nightly"
+//     Enable the Span::unwrap method. This is to support proc_macro_span and
+//     proc_macro_diagnostic use on the nightly channel without requiring the
+//     semver exemption opt-in. Enabled when building with nightly.
+//
+// "super_unstable"
+//     Implement the semver exempt API in terms of the nightly-only proc_macro
+//     API. Enabled when using procmacro2_semver_exempt on a nightly compiler.
+//
+// "span_locations"
+//     Provide methods Span::start and Span::end which give the line/column
+//     location of a token. Enabled by procmacro2_semver_exempt or the
+//     "span-locations" Cargo cfg. This is behind a cfg because tracking
+//     location inside spans is a performance hit.
+
 use std::env;
 use std::process::Command;
 use std::str;
@@ -7,34 +47,47 @@
 
     let target = env::var("TARGET").unwrap();
 
-    let minor = match rustc_minor_version() {
-        Some(n) => n,
+    let version = match rustc_version() {
+        Some(version) => version,
         None => return,
     };
 
-    if minor >= 26 {
+    if version.minor >= 26 {
         println!("cargo:rustc-cfg=u128");
     }
 
+    let semver_exempt = cfg!(procmacro2_semver_exempt);
+    if semver_exempt {
+        // https://github.com/alexcrichton/proc-macro2/issues/147
+        println!("cargo:rustc-cfg=procmacro2_semver_exempt");
+    }
+
+    if semver_exempt || cfg!(feature = "span-locations") {
+        println!("cargo:rustc-cfg=span_locations");
+    }
+
     if !enable_use_proc_macro(&target) {
         return;
     }
+
     println!("cargo:rustc-cfg=use_proc_macro");
 
     // Rust 1.29 stabilized the necessary APIs in the `proc_macro` crate
-    if (minor >= 29 && !cfg!(procmacro2_semver_exempt)) || cfg!(feature = "nightly") {
+    if version.nightly || version.minor >= 29 && !semver_exempt {
         println!("cargo:rustc-cfg=wrap_proc_macro");
-
-        if cfg!(procmacro2_semver_exempt) {
-            println!("cargo:rustc-cfg=super_unstable");
-            // https://github.com/alexcrichton/proc-macro2/issues/147
-            println!("cargo:rustc-cfg=procmacro2_semver_exempt");
-        }
     }
 
-    if minor == 29 {
+    if version.minor == 29 {
         println!("cargo:rustc-cfg=slow_extend");
     }
+
+    if version.nightly {
+        println!("cargo:rustc-cfg=nightly");
+    }
+
+    if semver_exempt && version.nightly {
+        println!("cargo:rustc-cfg=super_unstable");
+    }
 }
 
 fn enable_use_proc_macro(target: &str) -> bool {
@@ -47,7 +100,12 @@
     cfg!(feature = "proc-macro")
 }
 
-fn rustc_minor_version() -> Option<u32> {
+struct RustcVersion {
+    minor: u32,
+    nightly: bool,
+}
+
+fn rustc_version() -> Option<RustcVersion> {
     macro_rules! otry {
         ($e:expr) => {
             match $e {
@@ -56,12 +114,20 @@
             }
         };
     }
+
     let rustc = otry!(env::var_os("RUSTC"));
     let output = otry!(Command::new(rustc).arg("--version").output().ok());
     let version = otry!(str::from_utf8(&output.stdout).ok());
+    let nightly = version.contains("nightly");
     let mut pieces = version.split('.');
     if pieces.next() != Some("rustc 1") {
         return None;
     }
-    otry!(pieces.next()).parse().ok()
+    let minor = otry!(pieces.next());
+    let minor = otry!(minor.parse().ok());
+
+    Some(RustcVersion {
+        minor: minor,
+        nightly: nightly,
+    })
 }
diff -Nru cargo-0.32.0/vendor/proc-macro2/.cargo-checksum.json cargo-0.33.0/vendor/proc-macro2/.cargo-checksum.json
--- cargo-0.32.0/vendor/proc-macro2/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"}
\ No newline at end of file
+{"files":{},"package":"4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/proc-macro2/Cargo.toml cargo-0.33.0/vendor/proc-macro2/Cargo.toml
--- cargo-0.32.0/vendor/proc-macro2/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "proc-macro2"
-version = "0.4.24"
+version = "0.4.27"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 build = "build.rs"
 description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n"
@@ -32,7 +32,8 @@
 
 [features]
 default = ["proc-macro"]
-nightly = ["proc-macro"]
+nightly = []
 proc-macro = []
+span-locations = []
 [badges.travis-ci]
 repository = "alexcrichton/proc-macro2"
diff -Nru cargo-0.32.0/vendor/proc-macro2/README.md cargo-0.33.0/vendor/proc-macro2/README.md
--- cargo-0.32.0/vendor/proc-macro2/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,60 +1,76 @@
 # proc-macro2
 
-[![Build Status](https://api.travis-ci.org/alexcrichton/proc-macro2.svg?branch=master)](https://travis-ci.org/alexcrichton/proc-macro2)
+[![Build Status](https://api.travis-ci.com/alexcrichton/proc-macro2.svg?branch=master)](https://travis-ci.com/alexcrichton/proc-macro2)
 [![Latest Version](https://img.shields.io/crates/v/proc-macro2.svg)](https://crates.io/crates/proc-macro2)
 [![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/proc-macro2)
 
-A small shim over the `proc_macro` crate in the compiler intended to multiplex
-the stable interface as of 1.15.0 and the interface as of 1.30.0.
+A wrapper around the procedural macro API of the compiler's `proc_macro` crate.
+This library serves three purposes:
 
-New features added in Rust 1.30.0 include:
+- **Bring proc-macro-like functionality to other contexts like build.rs and
+  main.rs.** Types from `proc_macro` are entirely specific to procedural macros
+  and cannot ever exist in code outside of a procedural macro. Meanwhile
+  `proc_macro2` types may exist anywhere including non-macro code. By developing
+  foundational libraries like [syn] and [quote] against `proc_macro2` rather
+  than `proc_macro`, the procedural macro ecosystem becomes easily applicable to
+  many other use cases and we avoid reimplementing non-macro equivalents of
+  those libraries.
+
+- **Make procedural macros unit testable.** As a consequence of being specific
+  to procedural macros, nothing that uses `proc_macro` can be executed from a
+  unit test. In order for helper libraries or components of a macro to be
+  testable in isolation, they must be implemented using `proc_macro2`.
+
+- **Provide the latest and greatest APIs across all compiler versions.**
+  Procedural macros were first introduced to Rust in 1.15.0 with an extremely
+  minimal interface. Since then, many improvements have landed to make macros
+  more flexible and easier to write. This library tracks the procedural macro
+  API of the most recent stable compiler but employs a polyfill to provide that
+  API consistently across any compiler since 1.15.0.
 
-* Span information on tokens
-* No need to go in/out through strings
-* Structured input/output
-
-Libraries ported to `proc_macro2` can retain support for older compilers while
-continuing to get all the nice benefits of using a 1.30.0+ compiler.
+[syn]: https://github.com/dtolnay/syn
+[quote]: https://github.com/dtolnay/quote
 
 ## Usage
 
-This crate compiles on all 1.15.0+ stable compilers and usage looks like:
-
 ```toml
 [dependencies]
 proc-macro2 = "0.4"
 ```
 
-followed by
+The skeleton of a typical procedural macro typically looks like this:
 
 ```rust
 extern crate proc_macro;
-extern crate proc_macro2;
 
 #[proc_macro_derive(MyDerive)]
 pub fn my_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input: proc_macro2::TokenStream = input.into();
+    let input = proc_macro2::TokenStream::from(input);
 
     let output: proc_macro2::TokenStream = {
         /* transform input */
     };
 
-    output.into()
+    proc_macro::TokenStream::from(output)
 }
 ```
 
-The 1.30.0 compiler is automatically detected and its interfaces are used when
-available.
+If parsing with [Syn], you'll use [`parse_macro_input!`] instead to propagate
+parse errors correctly back to the compiler when parsing fails.
 
-## Unstable Features
+[`parse_macro_input!`]: https://docs.rs/syn/0.15/syn/macro.parse_macro_input.html
 
-`proc-macro2` supports exporting some methods from `proc_macro` which are
-currently highly unstable, and are not stabilized in the first pass of
-`proc_macro` stabilizations. These features are not exported by default. Minor
-versions of `proc-macro2` may make breaking changes to them at any time.
+## Unstable features
 
-To enable these features, the `procmacro2_semver_exempt` config flag must be
-passed to rustc.
+The default feature set of proc-macro2 tracks the most recent stable compiler
+API. Functionality in `proc_macro` that is not yet stable is not exposed by
+proc-macro2 by default.
+
+To opt into the additional APIs available in the most recent nightly compiler,
+the `procmacro2_semver_exempt` config flag must be passed to rustc. As usual, we
+will polyfill those nightly-only APIs all the way back to Rust 1.15.0. As these
+are unstable APIs that track the nightly compiler, minor versions of proc-macro2
+may make breaking changes to them at any time.
 
 ```
 RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo build
@@ -64,6 +80,8 @@
 depends on your crate. This infectious nature is intentional, as it serves as a
 reminder that you are outside of the normal semver guarantees.
 
+Semver exempt methods are marked as such in the proc-macro2 documentation.
+
 # License
 
 This project is licensed under either of
diff -Nru cargo-0.32.0/vendor/proc-macro2/src/fallback.rs cargo-0.33.0/vendor/proc-macro2/src/fallback.rs
--- cargo-0.32.0/vendor/proc-macro2/src/fallback.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/src/fallback.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1421 @@
+#[cfg(span_locations)]
+use std::cell::RefCell;
+#[cfg(procmacro2_semver_exempt)]
+use std::cmp;
+use std::fmt;
+use std::iter;
+#[cfg(procmacro2_semver_exempt)]
+use std::path::Path;
+use std::path::PathBuf;
+use std::str::FromStr;
+use std::vec;
+
+use strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
+use unicode_xid::UnicodeXID;
+
+use {Delimiter, Punct, Spacing, TokenTree};
+
+#[derive(Clone)]
+pub struct TokenStream {
+    inner: Vec<TokenTree>,
+}
+
+#[derive(Debug)]
+pub struct LexError;
+
+impl TokenStream {
+    pub fn new() -> TokenStream {
+        TokenStream { inner: Vec::new() }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.inner.len() == 0
+    }
+}
+
+#[cfg(span_locations)]
+fn get_cursor(src: &str) -> Cursor {
+    // Create a dummy file & add it to the codemap
+    CODEMAP.with(|cm| {
+        let mut cm = cm.borrow_mut();
+        let name = format!("<parsed string {}>", cm.files.len());
+        let span = cm.add_file(&name, src);
+        Cursor {
+            rest: src,
+            off: span.lo,
+        }
+    })
+}
+
+#[cfg(not(span_locations))]
+fn get_cursor(src: &str) -> Cursor {
+    Cursor { rest: src }
+}
+
+impl FromStr for TokenStream {
+    type Err = LexError;
+
+    fn from_str(src: &str) -> Result<TokenStream, LexError> {
+        // Create a dummy file & add it to the codemap
+        let cursor = get_cursor(src);
+
+        match token_stream(cursor) {
+            Ok((input, output)) => {
+                if skip_whitespace(input).len() != 0 {
+                    Err(LexError)
+                } else {
+                    Ok(output)
+                }
+            }
+            Err(LexError) => Err(LexError),
+        }
+    }
+}
+
+impl fmt::Display for TokenStream {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut joint = false;
+        for (i, tt) in self.inner.iter().enumerate() {
+            if i != 0 && !joint {
+                write!(f, " ")?;
+            }
+            joint = false;
+            match *tt {
+                TokenTree::Group(ref tt) => {
+                    let (start, end) = match tt.delimiter() {
+                        Delimiter::Parenthesis => ("(", ")"),
+                        Delimiter::Brace => ("{", "}"),
+                        Delimiter::Bracket => ("[", "]"),
+                        Delimiter::None => ("", ""),
+                    };
+                    if tt.stream().into_iter().next().is_none() {
+                        write!(f, "{} {}", start, end)?
+                    } else {
+                        write!(f, "{} {} {}", start, tt.stream(), end)?
+                    }
+                }
+                TokenTree::Ident(ref tt) => write!(f, "{}", tt)?,
+                TokenTree::Punct(ref tt) => {
+                    write!(f, "{}", tt.as_char())?;
+                    match tt.spacing() {
+                        Spacing::Alone => {}
+                        Spacing::Joint => joint = true,
+                    }
+                }
+                TokenTree::Literal(ref tt) => write!(f, "{}", tt)?,
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl fmt::Debug for TokenStream {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str("TokenStream ")?;
+        f.debug_list().entries(self.clone()).finish()
+    }
+}
+
+#[cfg(use_proc_macro)]
+impl From<::proc_macro::TokenStream> for TokenStream {
+    fn from(inner: ::proc_macro::TokenStream) -> TokenStream {
+        inner
+            .to_string()
+            .parse()
+            .expect("compiler token stream parse failed")
+    }
+}
+
+#[cfg(use_proc_macro)]
+impl From<TokenStream> for ::proc_macro::TokenStream {
+    fn from(inner: TokenStream) -> ::proc_macro::TokenStream {
+        inner
+            .to_string()
+            .parse()
+            .expect("failed to parse to compiler tokens")
+    }
+}
+
+impl From<TokenTree> for TokenStream {
+    fn from(tree: TokenTree) -> TokenStream {
+        TokenStream { inner: vec![tree] }
+    }
+}
+
+impl iter::FromIterator<TokenTree> for TokenStream {
+    fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self {
+        let mut v = Vec::new();
+
+        for token in streams.into_iter() {
+            v.push(token);
+        }
+
+        TokenStream { inner: v }
+    }
+}
+
+impl iter::FromIterator<TokenStream> for TokenStream {
+    fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
+        let mut v = Vec::new();
+
+        for stream in streams.into_iter() {
+            v.extend(stream.inner);
+        }
+
+        TokenStream { inner: v }
+    }
+}
+
+impl Extend<TokenTree> for TokenStream {
+    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
+        self.inner.extend(streams);
+    }
+}
+
+impl Extend<TokenStream> for TokenStream {
+    fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
+        self.inner
+            .extend(streams.into_iter().flat_map(|stream| stream));
+    }
+}
+
+pub type TokenTreeIter = vec::IntoIter<TokenTree>;
+
+impl IntoIterator for TokenStream {
+    type Item = TokenTree;
+    type IntoIter = TokenTreeIter;
+
+    fn into_iter(self) -> TokenTreeIter {
+        self.inner.into_iter()
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct SourceFile {
+    path: PathBuf,
+}
+
+impl SourceFile {
+    /// Get the path to this source file as a string.
+    pub fn path(&self) -> PathBuf {
+        self.path.clone()
+    }
+
+    pub fn is_real(&self) -> bool {
+        // XXX(nika): Support real files in the future?
+        false
+    }
+}
+
+impl fmt::Debug for SourceFile {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("SourceFile")
+            .field("path", &self.path())
+            .field("is_real", &self.is_real())
+            .finish()
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct LineColumn {
+    pub line: usize,
+    pub column: usize,
+}
+
+#[cfg(span_locations)]
+thread_local! {
+    static CODEMAP: RefCell<Codemap> = RefCell::new(Codemap {
+        // NOTE: We start with a single dummy file which all call_site() and
+        // def_site() spans reference.
+        files: vec![{
+            #[cfg(procmacro2_semver_exempt)]
+            {
+                FileInfo {
+                    name: "<unspecified>".to_owned(),
+                    span: Span { lo: 0, hi: 0 },
+                    lines: vec![0],
+                }
+            }
+
+            #[cfg(not(procmacro2_semver_exempt))]
+            {
+                FileInfo {
+                    span: Span { lo: 0, hi: 0 },
+                    lines: vec![0],
+                }
+            }
+        }],
+    });
+}
+
+#[cfg(span_locations)]
+struct FileInfo {
+    #[cfg(procmacro2_semver_exempt)]
+    name: String,
+    span: Span,
+    lines: Vec<usize>,
+}
+
+#[cfg(span_locations)]
+impl FileInfo {
+    fn offset_line_column(&self, offset: usize) -> LineColumn {
+        assert!(self.span_within(Span {
+            lo: offset as u32,
+            hi: offset as u32
+        }));
+        let offset = offset - self.span.lo as usize;
+        match self.lines.binary_search(&offset) {
+            Ok(found) => LineColumn {
+                line: found + 1,
+                column: 0,
+            },
+            Err(idx) => LineColumn {
+                line: idx,
+                column: offset - self.lines[idx - 1],
+            },
+        }
+    }
+
+    fn span_within(&self, span: Span) -> bool {
+        span.lo >= self.span.lo && span.hi <= self.span.hi
+    }
+}
+
+/// Computesthe offsets of each line in the given source string.
+#[cfg(span_locations)]
+fn lines_offsets(s: &str) -> Vec<usize> {
+    let mut lines = vec![0];
+    let mut prev = 0;
+    while let Some(len) = s[prev..].find('\n') {
+        prev += len + 1;
+        lines.push(prev);
+    }
+    lines
+}
+
+#[cfg(span_locations)]
+struct Codemap {
+    files: Vec<FileInfo>,
+}
+
+#[cfg(span_locations)]
+impl Codemap {
+    fn next_start_pos(&self) -> u32 {
+        // Add 1 so there's always space between files.
+        //
+        // We'll always have at least 1 file, as we initialize our files list
+        // with a dummy file.
+        self.files.last().unwrap().span.hi + 1
+    }
+
+    fn add_file(&mut self, name: &str, src: &str) -> Span {
+        let lines = lines_offsets(src);
+        let lo = self.next_start_pos();
+        // XXX(nika): Shouild we bother doing a checked cast or checked add here?
+        let span = Span {
+            lo: lo,
+            hi: lo + (src.len() as u32),
+        };
+
+        #[cfg(procmacro2_semver_exempt)]
+        self.files.push(FileInfo {
+            name: name.to_owned(),
+            span: span,
+            lines: lines,
+        });
+
+        #[cfg(not(procmacro2_semver_exempt))]
+        self.files.push(FileInfo {
+            span: span,
+            lines: lines,
+        });
+        let _ = name;
+
+        span
+    }
+
+    fn fileinfo(&self, span: Span) -> &FileInfo {
+        for file in &self.files {
+            if file.span_within(span) {
+                return file;
+            }
+        }
+        panic!("Invalid span with no related FileInfo!");
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub struct Span {
+    #[cfg(span_locations)]
+    lo: u32,
+    #[cfg(span_locations)]
+    hi: u32,
+}
+
+impl Span {
+    #[cfg(not(span_locations))]
+    pub fn call_site() -> Span {
+        Span {}
+    }
+
+    #[cfg(span_locations)]
+    pub fn call_site() -> Span {
+        Span { lo: 0, hi: 0 }
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn def_site() -> Span {
+        Span::call_site()
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn resolved_at(&self, _other: Span) -> Span {
+        // Stable spans consist only of line/column information, so
+        // `resolved_at` and `located_at` only select which span the
+        // caller wants line/column information from.
+        *self
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn located_at(&self, other: Span) -> Span {
+        other
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn source_file(&self) -> SourceFile {
+        CODEMAP.with(|cm| {
+            let cm = cm.borrow();
+            let fi = cm.fileinfo(*self);
+            SourceFile {
+                path: Path::new(&fi.name).to_owned(),
+            }
+        })
+    }
+
+    #[cfg(span_locations)]
+    pub fn start(&self) -> LineColumn {
+        CODEMAP.with(|cm| {
+            let cm = cm.borrow();
+            let fi = cm.fileinfo(*self);
+            fi.offset_line_column(self.lo as usize)
+        })
+    }
+
+    #[cfg(span_locations)]
+    pub fn end(&self) -> LineColumn {
+        CODEMAP.with(|cm| {
+            let cm = cm.borrow();
+            let fi = cm.fileinfo(*self);
+            fi.offset_line_column(self.hi as usize)
+        })
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn join(&self, other: Span) -> Option<Span> {
+        CODEMAP.with(|cm| {
+            let cm = cm.borrow();
+            // If `other` is not within the same FileInfo as us, return None.
+            if !cm.fileinfo(*self).span_within(other) {
+                return None;
+            }
+            Some(Span {
+                lo: cmp::min(self.lo, other.lo),
+                hi: cmp::max(self.hi, other.hi),
+            })
+        })
+    }
+}
+
+impl fmt::Debug for Span {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[cfg(procmacro2_semver_exempt)]
+        return write!(f, "bytes({}..{})", self.lo, self.hi);
+
+        #[cfg(not(procmacro2_semver_exempt))]
+        write!(f, "Span")
+    }
+}
+
+pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
+    if cfg!(procmacro2_semver_exempt) {
+        debug.field("span", &span);
+    }
+}
+
+#[derive(Clone)]
+pub struct Group {
+    delimiter: Delimiter,
+    stream: TokenStream,
+    span: Span,
+}
+
+impl Group {
+    pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
+        Group {
+            delimiter: delimiter,
+            stream: stream,
+            span: Span::call_site(),
+        }
+    }
+
+    pub fn delimiter(&self) -> Delimiter {
+        self.delimiter
+    }
+
+    pub fn stream(&self) -> TokenStream {
+        self.stream.clone()
+    }
+
+    pub fn span(&self) -> Span {
+        self.span
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn span_open(&self) -> Span {
+        self.span
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn span_close(&self) -> Span {
+        self.span
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        self.span = span;
+    }
+}
+
+impl fmt::Display for Group {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let (left, right) = match self.delimiter {
+            Delimiter::Parenthesis => ("(", ")"),
+            Delimiter::Brace => ("{", "}"),
+            Delimiter::Bracket => ("[", "]"),
+            Delimiter::None => ("", ""),
+        };
+
+        f.write_str(left)?;
+        self.stream.fmt(f)?;
+        f.write_str(right)?;
+
+        Ok(())
+    }
+}
+
+impl fmt::Debug for Group {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        let mut debug = fmt.debug_struct("Group");
+        debug.field("delimiter", &self.delimiter);
+        debug.field("stream", &self.stream);
+        #[cfg(procmacro2_semver_exempt)]
+        debug.field("span", &self.span);
+        debug.finish()
+    }
+}
+
+#[derive(Clone)]
+pub struct Ident {
+    sym: String,
+    span: Span,
+    raw: bool,
+}
+
+impl Ident {
+    fn _new(string: &str, raw: bool, span: Span) -> Ident {
+        validate_term(string);
+
+        Ident {
+            sym: string.to_owned(),
+            span: span,
+            raw: raw,
+        }
+    }
+
+    pub fn new(string: &str, span: Span) -> Ident {
+        Ident::_new(string, false, span)
+    }
+
+    pub fn new_raw(string: &str, span: Span) -> Ident {
+        Ident::_new(string, true, span)
+    }
+
+    pub fn span(&self) -> Span {
+        self.span
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        self.span = span;
+    }
+}
+
+#[inline]
+fn is_ident_start(c: char) -> bool {
+    ('a' <= c && c <= 'z')
+        || ('A' <= c && c <= 'Z')
+        || c == '_'
+        || (c > '\x7f' && UnicodeXID::is_xid_start(c))
+}
+
+#[inline]
+fn is_ident_continue(c: char) -> bool {
+    ('a' <= c && c <= 'z')
+        || ('A' <= c && c <= 'Z')
+        || c == '_'
+        || ('0' <= c && c <= '9')
+        || (c > '\x7f' && UnicodeXID::is_xid_continue(c))
+}
+
+fn validate_term(string: &str) {
+    let validate = string;
+    if validate.is_empty() {
+        panic!("Ident is not allowed to be empty; use Option<Ident>");
+    }
+
+    if validate.bytes().all(|digit| digit >= b'0' && digit <= b'9') {
+        panic!("Ident cannot be a number; use Literal instead");
+    }
+
+    fn ident_ok(string: &str) -> bool {
+        let mut chars = string.chars();
+        let first = chars.next().unwrap();
+        if !is_ident_start(first) {
+            return false;
+        }
+        for ch in chars {
+            if !is_ident_continue(ch) {
+                return false;
+            }
+        }
+        true
+    }
+
+    if !ident_ok(validate) {
+        panic!("{:?} is not a valid Ident", string);
+    }
+}
+
+impl PartialEq for Ident {
+    fn eq(&self, other: &Ident) -> bool {
+        self.sym == other.sym && self.raw == other.raw
+    }
+}
+
+impl<T> PartialEq<T> for Ident
+where
+    T: ?Sized + AsRef<str>,
+{
+    fn eq(&self, other: &T) -> bool {
+        let other = other.as_ref();
+        if self.raw {
+            other.starts_with("r#") && self.sym == other[2..]
+        } else {
+            self.sym == other
+        }
+    }
+}
+
+impl fmt::Display for Ident {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if self.raw {
+            "r#".fmt(f)?;
+        }
+        self.sym.fmt(f)
+    }
+}
+
+impl fmt::Debug for Ident {
+    // Ident(proc_macro), Ident(r#union)
+    #[cfg(not(procmacro2_semver_exempt))]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut debug = f.debug_tuple("Ident");
+        debug.field(&format_args!("{}", self));
+        debug.finish()
+    }
+
+    // Ident {
+    //     sym: proc_macro,
+    //     span: bytes(128..138)
+    // }
+    #[cfg(procmacro2_semver_exempt)]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut debug = f.debug_struct("Ident");
+        debug.field("sym", &format_args!("{}", self));
+        debug.field("span", &self.span);
+        debug.finish()
+    }
+}
+
+#[derive(Clone)]
+pub struct Literal {
+    text: String,
+    span: Span,
+}
+
+macro_rules! suffixed_numbers {
+    ($($name:ident => $kind:ident,)*) => ($(
+        pub fn $name(n: $kind) -> Literal {
+            Literal::_new(format!(concat!("{}", stringify!($kind)), n))
+        }
+    )*)
+}
+
+macro_rules! unsuffixed_numbers {
+    ($($name:ident => $kind:ident,)*) => ($(
+        pub fn $name(n: $kind) -> Literal {
+            Literal::_new(n.to_string())
+        }
+    )*)
+}
+
+impl Literal {
+    fn _new(text: String) -> Literal {
+        Literal {
+            text: text,
+            span: Span::call_site(),
+        }
+    }
+
+    suffixed_numbers! {
+        u8_suffixed => u8,
+        u16_suffixed => u16,
+        u32_suffixed => u32,
+        u64_suffixed => u64,
+        usize_suffixed => usize,
+        i8_suffixed => i8,
+        i16_suffixed => i16,
+        i32_suffixed => i32,
+        i64_suffixed => i64,
+        isize_suffixed => isize,
+
+        f32_suffixed => f32,
+        f64_suffixed => f64,
+    }
+
+    #[cfg(u128)]
+    suffixed_numbers! {
+        u128_suffixed => u128,
+        i128_suffixed => i128,
+    }
+
+    unsuffixed_numbers! {
+        u8_unsuffixed => u8,
+        u16_unsuffixed => u16,
+        u32_unsuffixed => u32,
+        u64_unsuffixed => u64,
+        usize_unsuffixed => usize,
+        i8_unsuffixed => i8,
+        i16_unsuffixed => i16,
+        i32_unsuffixed => i32,
+        i64_unsuffixed => i64,
+        isize_unsuffixed => isize,
+    }
+
+    #[cfg(u128)]
+    unsuffixed_numbers! {
+        u128_unsuffixed => u128,
+        i128_unsuffixed => i128,
+    }
+
+    pub fn f32_unsuffixed(f: f32) -> Literal {
+        let mut s = f.to_string();
+        if !s.contains(".") {
+            s.push_str(".0");
+        }
+        Literal::_new(s)
+    }
+
+    pub fn f64_unsuffixed(f: f64) -> Literal {
+        let mut s = f.to_string();
+        if !s.contains(".") {
+            s.push_str(".0");
+        }
+        Literal::_new(s)
+    }
+
+    pub fn string(t: &str) -> Literal {
+        let mut s = t
+            .chars()
+            .flat_map(|c| c.escape_default())
+            .collect::<String>();
+        s.push('"');
+        s.insert(0, '"');
+        Literal::_new(s)
+    }
+
+    pub fn character(t: char) -> Literal {
+        Literal::_new(format!("'{}'", t.escape_default().collect::<String>()))
+    }
+
+    pub fn byte_string(bytes: &[u8]) -> Literal {
+        let mut escaped = "b\"".to_string();
+        for b in bytes {
+            match *b {
+                b'\0' => escaped.push_str(r"\0"),
+                b'\t' => escaped.push_str(r"\t"),
+                b'\n' => escaped.push_str(r"\n"),
+                b'\r' => escaped.push_str(r"\r"),
+                b'"' => escaped.push_str("\\\""),
+                b'\\' => escaped.push_str("\\\\"),
+                b'\x20'...b'\x7E' => escaped.push(*b as char),
+                _ => escaped.push_str(&format!("\\x{:02X}", b)),
+            }
+        }
+        escaped.push('"');
+        Literal::_new(escaped)
+    }
+
+    pub fn span(&self) -> Span {
+        self.span
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        self.span = span;
+    }
+}
+
+impl fmt::Display for Literal {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.text.fmt(f)
+    }
+}
+
+impl fmt::Debug for Literal {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        let mut debug = fmt.debug_struct("Literal");
+        debug.field("lit", &format_args!("{}", self.text));
+        #[cfg(procmacro2_semver_exempt)]
+        debug.field("span", &self.span);
+        debug.finish()
+    }
+}
+
+fn token_stream(mut input: Cursor) -> PResult<TokenStream> {
+    let mut trees = Vec::new();
+    loop {
+        let input_no_ws = skip_whitespace(input);
+        if input_no_ws.rest.len() == 0 {
+            break;
+        }
+        if let Ok((a, tokens)) = doc_comment(input_no_ws) {
+            input = a;
+            trees.extend(tokens);
+            continue;
+        }
+
+        let (a, tt) = match token_tree(input_no_ws) {
+            Ok(p) => p,
+            Err(_) => break,
+        };
+        trees.push(tt);
+        input = a;
+    }
+    Ok((input, TokenStream { inner: trees }))
+}
+
+#[cfg(not(span_locations))]
+fn spanned<'a, T>(
+    input: Cursor<'a>,
+    f: fn(Cursor<'a>) -> PResult<'a, T>,
+) -> PResult<'a, (T, ::Span)> {
+    let (a, b) = f(skip_whitespace(input))?;
+    Ok((a, ((b, ::Span::_new_stable(Span::call_site())))))
+}
+
+#[cfg(span_locations)]
+fn spanned<'a, T>(
+    input: Cursor<'a>,
+    f: fn(Cursor<'a>) -> PResult<'a, T>,
+) -> PResult<'a, (T, ::Span)> {
+    let input = skip_whitespace(input);
+    let lo = input.off;
+    let (a, b) = f(input)?;
+    let hi = a.off;
+    let span = ::Span::_new_stable(Span { lo: lo, hi: hi });
+    Ok((a, (b, span)))
+}
+
+fn token_tree(input: Cursor) -> PResult<TokenTree> {
+    let (rest, (mut tt, span)) = spanned(input, token_kind)?;
+    tt.set_span(span);
+    Ok((rest, tt))
+}
+
+named!(token_kind -> TokenTree, alt!(
+    map!(group, |g| TokenTree::Group(::Group::_new_stable(g)))
+    |
+    map!(literal, |l| TokenTree::Literal(::Literal::_new_stable(l))) // must be before symbol
+    |
+    map!(op, TokenTree::Punct)
+    |
+    symbol_leading_ws
+));
+
+named!(group -> Group, alt!(
+    delimited!(
+        punct!("("),
+        token_stream,
+        punct!(")")
+    ) => { |ts| Group::new(Delimiter::Parenthesis, ts) }
+    |
+    delimited!(
+        punct!("["),
+        token_stream,
+        punct!("]")
+    ) => { |ts| Group::new(Delimiter::Bracket, ts) }
+    |
+    delimited!(
+        punct!("{"),
+        token_stream,
+        punct!("}")
+    ) => { |ts| Group::new(Delimiter::Brace, ts) }
+));
+
+fn symbol_leading_ws(input: Cursor) -> PResult<TokenTree> {
+    symbol(skip_whitespace(input))
+}
+
+fn symbol(input: Cursor) -> PResult<TokenTree> {
+    let mut chars = input.char_indices();
+
+    let raw = input.starts_with("r#");
+    if raw {
+        chars.next();
+        chars.next();
+    }
+
+    match chars.next() {
+        Some((_, ch)) if is_ident_start(ch) => {}
+        _ => return Err(LexError),
+    }
+
+    let mut end = input.len();
+    for (i, ch) in chars {
+        if !is_ident_continue(ch) {
+            end = i;
+            break;
+        }
+    }
+
+    let a = &input.rest[..end];
+    if a == "r#_" {
+        Err(LexError)
+    } else {
+        let ident = if raw {
+            ::Ident::_new_raw(&a[2..], ::Span::call_site())
+        } else {
+            ::Ident::new(a, ::Span::call_site())
+        };
+        Ok((input.advance(end), ident.into()))
+    }
+}
+
+fn literal(input: Cursor) -> PResult<Literal> {
+    let input_no_ws = skip_whitespace(input);
+
+    match literal_nocapture(input_no_ws) {
+        Ok((a, ())) => {
+            let start = input.len() - input_no_ws.len();
+            let len = input_no_ws.len() - a.len();
+            let end = start + len;
+            Ok((a, Literal::_new(input.rest[start..end].to_string())))
+        }
+        Err(LexError) => Err(LexError),
+    }
+}
+
+named!(literal_nocapture -> (), alt!(
+    string
+    |
+    byte_string
+    |
+    byte
+    |
+    character
+    |
+    float
+    |
+    int
+));
+
+named!(string -> (), alt!(
+    quoted_string
+    |
+    preceded!(
+        punct!("r"),
+        raw_string
+    ) => { |_| () }
+));
+
+named!(quoted_string -> (), delimited!(
+    punct!("\""),
+    cooked_string,
+    tag!("\"")
+));
+
+fn cooked_string(input: Cursor) -> PResult<()> {
+    let mut chars = input.char_indices().peekable();
+    while let Some((byte_offset, ch)) = chars.next() {
+        match ch {
+            '"' => {
+                return Ok((input.advance(byte_offset), ()));
+            }
+            '\r' => {
+                if let Some((_, '\n')) = chars.next() {
+                    // ...
+                } else {
+                    break;
+                }
+            }
+            '\\' => match chars.next() {
+                Some((_, 'x')) => {
+                    if !backslash_x_char(&mut chars) {
+                        break;
+                    }
+                }
+                Some((_, 'n')) | Some((_, 'r')) | Some((_, 't')) | Some((_, '\\'))
+                | Some((_, '\'')) | Some((_, '"')) | Some((_, '0')) => {}
+                Some((_, 'u')) => {
+                    if !backslash_u(&mut chars) {
+                        break;
+                    }
+                }
+                Some((_, '\n')) | Some((_, '\r')) => {
+                    while let Some(&(_, ch)) = chars.peek() {
+                        if ch.is_whitespace() {
+                            chars.next();
+                        } else {
+                            break;
+                        }
+                    }
+                }
+                _ => break,
+            },
+            _ch => {}
+        }
+    }
+    Err(LexError)
+}
+
+named!(byte_string -> (), alt!(
+    delimited!(
+        punct!("b\""),
+        cooked_byte_string,
+        tag!("\"")
+    ) => { |_| () }
+    |
+    preceded!(
+        punct!("br"),
+        raw_string
+    ) => { |_| () }
+));
+
+fn cooked_byte_string(mut input: Cursor) -> PResult<()> {
+    let mut bytes = input.bytes().enumerate();
+    'outer: while let Some((offset, b)) = bytes.next() {
+        match b {
+            b'"' => {
+                return Ok((input.advance(offset), ()));
+            }
+            b'\r' => {
+                if let Some((_, b'\n')) = bytes.next() {
+                    // ...
+                } else {
+                    break;
+                }
+            }
+            b'\\' => match bytes.next() {
+                Some((_, b'x')) => {
+                    if !backslash_x_byte(&mut bytes) {
+                        break;
+                    }
+                }
+                Some((_, b'n')) | Some((_, b'r')) | Some((_, b't')) | Some((_, b'\\'))
+                | Some((_, b'0')) | Some((_, b'\'')) | Some((_, b'"')) => {}
+                Some((newline, b'\n')) | Some((newline, b'\r')) => {
+                    let rest = input.advance(newline + 1);
+                    for (offset, ch) in rest.char_indices() {
+                        if !ch.is_whitespace() {
+                            input = rest.advance(offset);
+                            bytes = input.bytes().enumerate();
+                            continue 'outer;
+                        }
+                    }
+                    break;
+                }
+                _ => break,
+            },
+            b if b < 0x80 => {}
+            _ => break,
+        }
+    }
+    Err(LexError)
+}
+
+fn raw_string(input: Cursor) -> PResult<()> {
+    let mut chars = input.char_indices();
+    let mut n = 0;
+    while let Some((byte_offset, ch)) = chars.next() {
+        match ch {
+            '"' => {
+                n = byte_offset;
+                break;
+            }
+            '#' => {}
+            _ => return Err(LexError),
+        }
+    }
+    for (byte_offset, ch) in chars {
+        match ch {
+            '"' if input.advance(byte_offset + 1).starts_with(&input.rest[..n]) => {
+                let rest = input.advance(byte_offset + 1 + n);
+                return Ok((rest, ()));
+            }
+            '\r' => {}
+            _ => {}
+        }
+    }
+    Err(LexError)
+}
+
+named!(byte -> (), do_parse!(
+    punct!("b") >>
+    tag!("'") >>
+    cooked_byte >>
+    tag!("'") >>
+    (())
+));
+
+fn cooked_byte(input: Cursor) -> PResult<()> {
+    let mut bytes = input.bytes().enumerate();
+    let ok = match bytes.next().map(|(_, b)| b) {
+        Some(b'\\') => match bytes.next().map(|(_, b)| b) {
+            Some(b'x') => backslash_x_byte(&mut bytes),
+            Some(b'n') | Some(b'r') | Some(b't') | Some(b'\\') | Some(b'0') | Some(b'\'')
+            | Some(b'"') => true,
+            _ => false,
+        },
+        b => b.is_some(),
+    };
+    if ok {
+        match bytes.next() {
+            Some((offset, _)) => {
+                if input.chars().as_str().is_char_boundary(offset) {
+                    Ok((input.advance(offset), ()))
+                } else {
+                    Err(LexError)
+                }
+            }
+            None => Ok((input.advance(input.len()), ())),
+        }
+    } else {
+        Err(LexError)
+    }
+}
+
+named!(character -> (), do_parse!(
+    punct!("'") >>
+    cooked_char >>
+    tag!("'") >>
+    (())
+));
+
+fn cooked_char(input: Cursor) -> PResult<()> {
+    let mut chars = input.char_indices();
+    let ok = match chars.next().map(|(_, ch)| ch) {
+        Some('\\') => match chars.next().map(|(_, ch)| ch) {
+            Some('x') => backslash_x_char(&mut chars),
+            Some('u') => backslash_u(&mut chars),
+            Some('n') | Some('r') | Some('t') | Some('\\') | Some('0') | Some('\'') | Some('"') => {
+                true
+            }
+            _ => false,
+        },
+        ch => ch.is_some(),
+    };
+    if ok {
+        match chars.next() {
+            Some((idx, _)) => Ok((input.advance(idx), ())),
+            None => Ok((input.advance(input.len()), ())),
+        }
+    } else {
+        Err(LexError)
+    }
+}
+
+macro_rules! next_ch {
+    ($chars:ident @ $pat:pat $(| $rest:pat)*) => {
+        match $chars.next() {
+            Some((_, ch)) => match ch {
+                $pat $(| $rest)*  => ch,
+                _ => return false,
+            },
+            None => return false
+        }
+    };
+}
+
+fn backslash_x_char<I>(chars: &mut I) -> bool
+where
+    I: Iterator<Item = (usize, char)>,
+{
+    next_ch!(chars @ '0'...'7');
+    next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F');
+    true
+}
+
+fn backslash_x_byte<I>(chars: &mut I) -> bool
+where
+    I: Iterator<Item = (usize, u8)>,
+{
+    next_ch!(chars @ b'0'...b'9' | b'a'...b'f' | b'A'...b'F');
+    next_ch!(chars @ b'0'...b'9' | b'a'...b'f' | b'A'...b'F');
+    true
+}
+
+fn backslash_u<I>(chars: &mut I) -> bool
+where
+    I: Iterator<Item = (usize, char)>,
+{
+    next_ch!(chars @ '{');
+    next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F');
+    loop {
+        let c = next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F' | '_' | '}');
+        if c == '}' {
+            return true;
+        }
+    }
+}
+
+fn float(input: Cursor) -> PResult<()> {
+    let (rest, ()) = float_digits(input)?;
+    for suffix in &["f32", "f64"] {
+        if rest.starts_with(suffix) {
+            return word_break(rest.advance(suffix.len()));
+        }
+    }
+    word_break(rest)
+}
+
+fn float_digits(input: Cursor) -> PResult<()> {
+    let mut chars = input.chars().peekable();
+    match chars.next() {
+        Some(ch) if ch >= '0' && ch <= '9' => {}
+        _ => return Err(LexError),
+    }
+
+    let mut len = 1;
+    let mut has_dot = false;
+    let mut has_exp = false;
+    while let Some(&ch) = chars.peek() {
+        match ch {
+            '0'...'9' | '_' => {
+                chars.next();
+                len += 1;
+            }
+            '.' => {
+                if has_dot {
+                    break;
+                }
+                chars.next();
+                if chars
+                    .peek()
+                    .map(|&ch| ch == '.' || UnicodeXID::is_xid_start(ch))
+                    .unwrap_or(false)
+                {
+                    return Err(LexError);
+                }
+                len += 1;
+                has_dot = true;
+            }
+            'e' | 'E' => {
+                chars.next();
+                len += 1;
+                has_exp = true;
+                break;
+            }
+            _ => break,
+        }
+    }
+
+    let rest = input.advance(len);
+    if !(has_dot || has_exp || rest.starts_with("f32") || rest.starts_with("f64")) {
+        return Err(LexError);
+    }
+
+    if has_exp {
+        let mut has_exp_value = false;
+        while let Some(&ch) = chars.peek() {
+            match ch {
+                '+' | '-' => {
+                    if has_exp_value {
+                        break;
+                    }
+                    chars.next();
+                    len += 1;
+                }
+                '0'...'9' => {
+                    chars.next();
+                    len += 1;
+                    has_exp_value = true;
+                }
+                '_' => {
+                    chars.next();
+                    len += 1;
+                }
+                _ => break,
+            }
+        }
+        if !has_exp_value {
+            return Err(LexError);
+        }
+    }
+
+    Ok((input.advance(len), ()))
+}
+
+fn int(input: Cursor) -> PResult<()> {
+    let (rest, ()) = digits(input)?;
+    for suffix in &[
+        "isize", "i8", "i16", "i32", "i64", "i128", "usize", "u8", "u16", "u32", "u64", "u128",
+    ] {
+        if rest.starts_with(suffix) {
+            return word_break(rest.advance(suffix.len()));
+        }
+    }
+    word_break(rest)
+}
+
+fn digits(mut input: Cursor) -> PResult<()> {
+    let base = if input.starts_with("0x") {
+        input = input.advance(2);
+        16
+    } else if input.starts_with("0o") {
+        input = input.advance(2);
+        8
+    } else if input.starts_with("0b") {
+        input = input.advance(2);
+        2
+    } else {
+        10
+    };
+
+    let mut len = 0;
+    let mut empty = true;
+    for b in input.bytes() {
+        let digit = match b {
+            b'0'...b'9' => (b - b'0') as u64,
+            b'a'...b'f' => 10 + (b - b'a') as u64,
+            b'A'...b'F' => 10 + (b - b'A') as u64,
+            b'_' => {
+                if empty && base == 10 {
+                    return Err(LexError);
+                }
+                len += 1;
+                continue;
+            }
+            _ => break,
+        };
+        if digit >= base {
+            return Err(LexError);
+        }
+        len += 1;
+        empty = false;
+    }
+    if empty {
+        Err(LexError)
+    } else {
+        Ok((input.advance(len), ()))
+    }
+}
+
+fn op(input: Cursor) -> PResult<Punct> {
+    let input = skip_whitespace(input);
+    match op_char(input) {
+        Ok((rest, '\'')) => {
+            symbol(rest)?;
+            Ok((rest, Punct::new('\'', Spacing::Joint)))
+        }
+        Ok((rest, ch)) => {
+            let kind = match op_char(rest) {
+                Ok(_) => Spacing::Joint,
+                Err(LexError) => Spacing::Alone,
+            };
+            Ok((rest, Punct::new(ch, kind)))
+        }
+        Err(LexError) => Err(LexError),
+    }
+}
+
+fn op_char(input: Cursor) -> PResult<char> {
+    if input.starts_with("//") || input.starts_with("/*") {
+        // Do not accept `/` of a comment as an op.
+        return Err(LexError);
+    }
+
+    let mut chars = input.chars();
+    let first = match chars.next() {
+        Some(ch) => ch,
+        None => {
+            return Err(LexError);
+        }
+    };
+    let recognized = "~!@#$%^&*-=+|;:,<.>/?'";
+    if recognized.contains(first) {
+        Ok((input.advance(first.len_utf8()), first))
+    } else {
+        Err(LexError)
+    }
+}
+
+fn doc_comment(input: Cursor) -> PResult<Vec<TokenTree>> {
+    let mut trees = Vec::new();
+    let (rest, ((comment, inner), span)) = spanned(input, doc_comment_contents)?;
+    trees.push(TokenTree::Punct(Punct::new('#', Spacing::Alone)));
+    if inner {
+        trees.push(Punct::new('!', Spacing::Alone).into());
+    }
+    let mut stream = vec![
+        TokenTree::Ident(::Ident::new("doc", span)),
+        TokenTree::Punct(Punct::new('=', Spacing::Alone)),
+        TokenTree::Literal(::Literal::string(comment)),
+    ];
+    for tt in stream.iter_mut() {
+        tt.set_span(span);
+    }
+    let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
+    trees.push(::Group::_new_stable(group).into());
+    for tt in trees.iter_mut() {
+        tt.set_span(span);
+    }
+    Ok((rest, trees))
+}
+
+named!(doc_comment_contents -> (&str, bool), alt!(
+    do_parse!(
+        punct!("//!") >>
+        s: take_until_newline_or_eof!() >>
+        ((s, true))
+    )
+    |
+    do_parse!(
+        option!(whitespace) >>
+        peek!(tag!("/*!")) >>
+        s: block_comment >>
+        ((s, true))
+    )
+    |
+    do_parse!(
+        punct!("///") >>
+        not!(tag!("/")) >>
+        s: take_until_newline_or_eof!() >>
+        ((s, false))
+    )
+    |
+    do_parse!(
+        option!(whitespace) >>
+        peek!(tuple!(tag!("/**"), not!(tag!("*")))) >>
+        s: block_comment >>
+        ((s, false))
+    )
+));
diff -Nru cargo-0.32.0/vendor/proc-macro2/src/lib.rs cargo-0.33.0/vendor/proc-macro2/src/lib.rs
--- cargo-0.32.0/vendor/proc-macro2/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,35 +1,72 @@
-//! A "shim crate" intended to multiplex the [`proc_macro`] API on to stable
-//! Rust.
+//! A wrapper around the procedural macro API of the compiler's [`proc_macro`]
+//! crate. This library serves three purposes:
 //!
-//! Procedural macros in Rust operate over the upstream
-//! [`proc_macro::TokenStream`][ts] type. This type currently is quite
-//! conservative and exposed no internal implementation details. Nightly
-//! compilers, however, contain a much richer interface. This richer interface
-//! allows fine-grained inspection of the token stream which avoids
-//! stringification/re-lexing and also preserves span information.
-//!
-//! The upcoming APIs added to [`proc_macro`] upstream are the foundation for
-//! productive procedural macros in the ecosystem. To help prepare the ecosystem
-//! for using them this crate serves to both compile on stable and nightly and
-//! mirrors the API-to-be. The intention is that procedural macros which switch
-//! to use this crate will be trivially able to switch to the upstream
-//! `proc_macro` crate once its API stabilizes.
-//!
-//! In the meantime this crate also has a `nightly` Cargo feature which
-//! enables it to reimplement itself with the unstable API of [`proc_macro`].
-//! This'll allow immediate usage of the beneficial upstream API, particularly
-//! around preserving span information.
-//!
-//! # Unstable Features
-//!
-//! `proc-macro2` supports exporting some methods from `proc_macro` which are
-//! currently highly unstable, and may not be stabilized in the first pass of
-//! `proc_macro` stabilizations. These features are not exported by default.
-//! Minor versions of `proc-macro2` may make breaking changes to them at any
-//! time.
+//! [`proc_macro`]: https://doc.rust-lang.org/proc_macro/
+//!
+//! - **Bring proc-macro-like functionality to other contexts like build.rs and
+//!   main.rs.** Types from `proc_macro` are entirely specific to procedural
+//!   macros and cannot ever exist in code outside of a procedural macro.
+//!   Meanwhile `proc_macro2` types may exist anywhere including non-macro code.
+//!   By developing foundational libraries like [syn] and [quote] against
+//!   `proc_macro2` rather than `proc_macro`, the procedural macro ecosystem
+//!   becomes easily applicable to many other use cases and we avoid
+//!   reimplementing non-macro equivalents of those libraries.
+//!
+//! - **Make procedural macros unit testable.** As a consequence of being
+//!   specific to procedural macros, nothing that uses `proc_macro` can be
+//!   executed from a unit test. In order for helper libraries or components of
+//!   a macro to be testable in isolation, they must be implemented using
+//!   `proc_macro2`.
+//!
+//! - **Provide the latest and greatest APIs across all compiler versions.**
+//!   Procedural macros were first introduced to Rust in 1.15.0 with an
+//!   extremely minimal interface. Since then, many improvements have landed to
+//!   make macros more flexible and easier to write. This library tracks the
+//!   procedural macro API of the most recent stable compiler but employs a
+//!   polyfill to provide that API consistently across any compiler since
+//!   1.15.0.
+//!
+//! [syn]: https://github.com/dtolnay/syn
+//! [quote]: https://github.com/dtolnay/quote
+//!
+//! # Usage
+//!
+//! The skeleton of a typical procedural macro typically looks like this:
+//!
+//! ```edition2018
+//! extern crate proc_macro;
+//!
+//! # const IGNORE: &str = stringify! {
+//! #[proc_macro_derive(MyDerive)]
+//! # };
+//! pub fn my_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+//!     let input = proc_macro2::TokenStream::from(input);
 //!
-//! To enable these features, the `procmacro2_semver_exempt` config flag must be
-//! passed to rustc.
+//!     let output: proc_macro2::TokenStream = {
+//!         /* transform input */
+//!         # input
+//!     };
+//!
+//!     proc_macro::TokenStream::from(output)
+//! }
+//! ```
+//!
+//! If parsing with [Syn], you'll use [`parse_macro_input!`] instead to
+//! propagate parse errors correctly back to the compiler when parsing fails.
+//!
+//! [`parse_macro_input!`]: https://docs.rs/syn/0.15/syn/macro.parse_macro_input.html
+//!
+//! # Unstable features
+//!
+//! The default feature set of proc-macro2 tracks the most recent stable
+//! compiler API. Functionality in `proc_macro` that is not yet stable is not
+//! exposed by proc-macro2 by default.
+//!
+//! To opt into the additional APIs available in the most recent nightly
+//! compiler, the `procmacro2_semver_exempt` config flag must be passed to
+//! rustc. As usual, we will polyfill those nightly-only APIs all the way back
+//! to Rust 1.15.0. As these are unstable APIs that track the nightly compiler,
+//! minor versions of proc-macro2 may make breaking changes to them at any time.
 //!
 //! ```sh
 //! RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo build
@@ -39,15 +76,12 @@
 //! depends on your crate. This infectious nature is intentional, as it serves
 //! as a reminder that you are outside of the normal semver guarantees.
 //!
-//! [`proc_macro`]: https://doc.rust-lang.org/proc_macro/
-//! [ts]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
+//! Semver exempt methods are marked as such in the proc-macro2 documentation.
 
 // Proc-macro2 types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/proc-macro2/0.4.24")]
-#![cfg_attr(
-    super_unstable,
-    feature(proc_macro_raw_ident, proc_macro_span, proc_macro_def_site)
-)]
+#![doc(html_root_url = "https://docs.rs/proc-macro2/0.4.27")]
+#![cfg_attr(nightly, feature(proc_macro_span))]
+#![cfg_attr(super_unstable, feature(proc_macro_raw_ident, proc_macro_def_site))]
 
 #[cfg(use_proc_macro)]
 extern crate proc_macro;
@@ -65,11 +99,11 @@
 
 #[macro_use]
 mod strnom;
-mod stable;
+mod fallback;
 
 #[cfg(not(wrap_proc_macro))]
-use stable as imp;
-#[path = "unstable.rs"]
+use fallback as imp;
+#[path = "wrapper.rs"]
 #[cfg(wrap_proc_macro)]
 mod imp;
 
@@ -100,7 +134,7 @@
         }
     }
 
-    fn _new_stable(inner: stable::TokenStream) -> TokenStream {
+    fn _new_stable(inner: fallback::TokenStream) -> TokenStream {
         TokenStream {
             inner: inner.into(),
             _marker: marker::PhantomData,
@@ -266,7 +300,7 @@
 /// A line-column pair representing the start or end of a `Span`.
 ///
 /// This type is semver exempt and not exposed by default.
-#[cfg(procmacro2_semver_exempt)]
+#[cfg(span_locations)]
 pub struct LineColumn {
     /// The 1-indexed line in the source file on which the span starts or ends
     /// (inclusive).
@@ -291,7 +325,7 @@
         }
     }
 
-    fn _new_stable(inner: stable::Span) -> Span {
+    fn _new_stable(inner: fallback::Span) -> Span {
         Span {
             inner: inner.into(),
             _marker: marker::PhantomData,
@@ -333,11 +367,26 @@
         Span::_new(self.inner.located_at(other.inner))
     }
 
-    /// This method is only available when the `"nightly"` feature is enabled.
+    /// Convert `proc_macro2::Span` to `proc_macro::Span`.
+    ///
+    /// This method is available when building with a nightly compiler, or when
+    /// building with rustc 1.29+ *without* semver exempt features.
+    ///
+    /// # Panics
+    ///
+    /// Panics if called from outside of a procedural macro. Unlike
+    /// `proc_macro2::Span`, the `proc_macro::Span` type can only exist within
+    /// the context of a procedural macro invocation.
+    #[cfg(wrap_proc_macro)]
+    pub fn unwrap(self) -> proc_macro::Span {
+        self.inner.unwrap()
+    }
+
+    // Soft deprecated. Please use Span::unwrap.
+    #[cfg(wrap_proc_macro)]
     #[doc(hidden)]
-    #[cfg(any(feature = "nightly", super_unstable))]
     pub fn unstable(self) -> proc_macro::Span {
-        self.inner.unstable()
+        self.unwrap()
     }
 
     /// The original source file into which this span points.
@@ -350,8 +399,8 @@
 
     /// Get the starting line/column in the source file for this span.
     ///
-    /// This method is semver exempt and not exposed by default.
-    #[cfg(procmacro2_semver_exempt)]
+    /// This method requires the `"span-locations"` feature to be enabled.
+    #[cfg(span_locations)]
     pub fn start(&self) -> LineColumn {
         let imp::LineColumn { line, column } = self.inner.start();
         LineColumn {
@@ -362,8 +411,8 @@
 
     /// Get the ending line/column in the source file for this span.
     ///
-    /// This method is semver exempt and not exposed by default.
-    #[cfg(procmacro2_semver_exempt)]
+    /// This method requires the `"span-locations"` feature to be enabled.
+    #[cfg(span_locations)]
     pub fn end(&self) -> LineColumn {
         let imp::LineColumn { line, column } = self.inner.end();
         LineColumn {
@@ -487,8 +536,7 @@
             TokenTree::Ident(ref t) => {
                 let mut debug = f.debug_struct("Ident");
                 debug.field("sym", &format_args!("{}", t));
-                #[cfg(any(feature = "nightly", procmacro2_semver_exempt))]
-                debug.field("span", &t.span());
+                imp::debug_span_field_if_nontrivial(&mut debug, t.span().inner);
                 debug.finish()
             }
             TokenTree::Punct(ref t) => t.fmt(f),
@@ -527,12 +575,10 @@
 
 impl Group {
     fn _new(inner: imp::Group) -> Self {
-        Group {
-            inner: inner,
-        }
+        Group { inner: inner }
     }
 
-    fn _new_stable(inner: stable::Group) -> Self {
+    fn _new_stable(inner: fallback::Group) -> Self {
         Group {
             inner: inner.into(),
         }
@@ -699,8 +745,7 @@
         let mut debug = fmt.debug_struct("Punct");
         debug.field("op", &self.op);
         debug.field("spacing", &self.spacing);
-        #[cfg(procmacro2_semver_exempt)]
-        debug.field("span", &self.span);
+        imp::debug_span_field_if_nontrivial(&mut debug, self.span.inner);
         debug.finish()
     }
 }
@@ -727,9 +772,7 @@
 /// A span must be provided explicitly which governs the name resolution
 /// behavior of the resulting identifier.
 ///
-/// ```rust
-/// extern crate proc_macro2;
-///
+/// ```edition2018
 /// use proc_macro2::{Ident, Span};
 ///
 /// fn main() {
@@ -741,13 +784,9 @@
 ///
 /// An ident can be interpolated into a token stream using the `quote!` macro.
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate quote;
-///
-/// extern crate proc_macro2;
-///
+/// ```edition2018
 /// use proc_macro2::{Ident, Span};
+/// use quote::quote;
 ///
 /// fn main() {
 ///     let ident = Ident::new("demo", Span::call_site());
@@ -764,9 +803,7 @@
 /// A string representation of the ident is available through the `to_string()`
 /// method.
 ///
-/// ```rust
-/// # extern crate proc_macro2;
-/// #
+/// ```edition2018
 /// # use proc_macro2::{Ident, Span};
 /// #
 /// # let ident = Ident::new("another_identifier", Span::call_site());
@@ -954,7 +991,7 @@
         }
     }
 
-    fn _new_stable(inner: stable::Literal) -> Literal {
+    fn _new_stable(inner: fallback::Literal) -> Literal {
         Literal {
             inner: inner.into(),
             _marker: marker::PhantomData,
diff -Nru cargo-0.32.0/vendor/proc-macro2/src/stable.rs cargo-0.33.0/vendor/proc-macro2/src/stable.rs
--- cargo-0.32.0/vendor/proc-macro2/src/stable.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/src/stable.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1390 +0,0 @@
-#![cfg_attr(not(procmacro2_semver_exempt), allow(dead_code))]
-
-#[cfg(procmacro2_semver_exempt)]
-use std::cell::RefCell;
-#[cfg(procmacro2_semver_exempt)]
-use std::cmp;
-use std::fmt;
-use std::iter;
-#[cfg(procmacro2_semver_exempt)]
-use std::path::Path;
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::vec;
-
-use strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
-use unicode_xid::UnicodeXID;
-
-use {Delimiter, Punct, Spacing, TokenTree};
-
-#[derive(Clone)]
-pub struct TokenStream {
-    inner: Vec<TokenTree>,
-}
-
-#[derive(Debug)]
-pub struct LexError;
-
-impl TokenStream {
-    pub fn new() -> TokenStream {
-        TokenStream { inner: Vec::new() }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.len() == 0
-    }
-}
-
-#[cfg(procmacro2_semver_exempt)]
-fn get_cursor(src: &str) -> Cursor {
-    // Create a dummy file & add it to the codemap
-    CODEMAP.with(|cm| {
-        let mut cm = cm.borrow_mut();
-        let name = format!("<parsed string {}>", cm.files.len());
-        let span = cm.add_file(&name, src);
-        Cursor {
-            rest: src,
-            off: span.lo,
-        }
-    })
-}
-
-#[cfg(not(procmacro2_semver_exempt))]
-fn get_cursor(src: &str) -> Cursor {
-    Cursor { rest: src }
-}
-
-impl FromStr for TokenStream {
-    type Err = LexError;
-
-    fn from_str(src: &str) -> Result<TokenStream, LexError> {
-        // Create a dummy file & add it to the codemap
-        let cursor = get_cursor(src);
-
-        match token_stream(cursor) {
-            Ok((input, output)) => {
-                if skip_whitespace(input).len() != 0 {
-                    Err(LexError)
-                } else {
-                    Ok(output)
-                }
-            }
-            Err(LexError) => Err(LexError),
-        }
-    }
-}
-
-impl fmt::Display for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut joint = false;
-        for (i, tt) in self.inner.iter().enumerate() {
-            if i != 0 && !joint {
-                write!(f, " ")?;
-            }
-            joint = false;
-            match *tt {
-                TokenTree::Group(ref tt) => {
-                    let (start, end) = match tt.delimiter() {
-                        Delimiter::Parenthesis => ("(", ")"),
-                        Delimiter::Brace => ("{", "}"),
-                        Delimiter::Bracket => ("[", "]"),
-                        Delimiter::None => ("", ""),
-                    };
-                    if tt.stream().into_iter().next().is_none() {
-                        write!(f, "{} {}", start, end)?
-                    } else {
-                        write!(f, "{} {} {}", start, tt.stream(), end)?
-                    }
-                }
-                TokenTree::Ident(ref tt) => write!(f, "{}", tt)?,
-                TokenTree::Punct(ref tt) => {
-                    write!(f, "{}", tt.as_char())?;
-                    match tt.spacing() {
-                        Spacing::Alone => {}
-                        Spacing::Joint => joint = true,
-                    }
-                }
-                TokenTree::Literal(ref tt) => write!(f, "{}", tt)?,
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl fmt::Debug for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("TokenStream ")?;
-        f.debug_list().entries(self.clone()).finish()
-    }
-}
-
-#[cfg(use_proc_macro)]
-impl From<::proc_macro::TokenStream> for TokenStream {
-    fn from(inner: ::proc_macro::TokenStream) -> TokenStream {
-        inner
-            .to_string()
-            .parse()
-            .expect("compiler token stream parse failed")
-    }
-}
-
-#[cfg(use_proc_macro)]
-impl From<TokenStream> for ::proc_macro::TokenStream {
-    fn from(inner: TokenStream) -> ::proc_macro::TokenStream {
-        inner
-            .to_string()
-            .parse()
-            .expect("failed to parse to compiler tokens")
-    }
-}
-
-impl From<TokenTree> for TokenStream {
-    fn from(tree: TokenTree) -> TokenStream {
-        TokenStream { inner: vec![tree] }
-    }
-}
-
-impl iter::FromIterator<TokenTree> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self {
-        let mut v = Vec::new();
-
-        for token in streams.into_iter() {
-            v.push(token);
-        }
-
-        TokenStream { inner: v }
-    }
-}
-
-impl iter::FromIterator<TokenStream> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
-        let mut v = Vec::new();
-
-        for stream in streams.into_iter() {
-            v.extend(stream.inner);
-        }
-
-        TokenStream { inner: v }
-    }
-}
-
-impl Extend<TokenTree> for TokenStream {
-    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
-        self.inner.extend(streams);
-    }
-}
-
-impl Extend<TokenStream> for TokenStream {
-    fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
-        self.inner
-            .extend(streams.into_iter().flat_map(|stream| stream));
-    }
-}
-
-pub type TokenTreeIter = vec::IntoIter<TokenTree>;
-
-impl IntoIterator for TokenStream {
-    type Item = TokenTree;
-    type IntoIter = TokenTreeIter;
-
-    fn into_iter(self) -> TokenTreeIter {
-        self.inner.into_iter()
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-pub struct SourceFile {
-    path: PathBuf,
-}
-
-impl SourceFile {
-    /// Get the path to this source file as a string.
-    pub fn path(&self) -> PathBuf {
-        self.path.clone()
-    }
-
-    pub fn is_real(&self) -> bool {
-        // XXX(nika): Support real files in the future?
-        false
-    }
-}
-
-impl fmt::Debug for SourceFile {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("SourceFile")
-            .field("path", &self.path())
-            .field("is_real", &self.is_real())
-            .finish()
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct LineColumn {
-    pub line: usize,
-    pub column: usize,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-thread_local! {
-    static CODEMAP: RefCell<Codemap> = RefCell::new(Codemap {
-        // NOTE: We start with a single dummy file which all call_site() and
-        // def_site() spans reference.
-        files: vec![FileInfo {
-            name: "<unspecified>".to_owned(),
-            span: Span { lo: 0, hi: 0 },
-            lines: vec![0],
-        }],
-    });
-}
-
-#[cfg(procmacro2_semver_exempt)]
-struct FileInfo {
-    name: String,
-    span: Span,
-    lines: Vec<usize>,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl FileInfo {
-    fn offset_line_column(&self, offset: usize) -> LineColumn {
-        assert!(self.span_within(Span {
-            lo: offset as u32,
-            hi: offset as u32
-        }));
-        let offset = offset - self.span.lo as usize;
-        match self.lines.binary_search(&offset) {
-            Ok(found) => LineColumn {
-                line: found + 1,
-                column: 0,
-            },
-            Err(idx) => LineColumn {
-                line: idx,
-                column: offset - self.lines[idx - 1],
-            },
-        }
-    }
-
-    fn span_within(&self, span: Span) -> bool {
-        span.lo >= self.span.lo && span.hi <= self.span.hi
-    }
-}
-
-/// Computesthe offsets of each line in the given source string.
-#[cfg(procmacro2_semver_exempt)]
-fn lines_offsets(s: &str) -> Vec<usize> {
-    let mut lines = vec![0];
-    let mut prev = 0;
-    while let Some(len) = s[prev..].find('\n') {
-        prev += len + 1;
-        lines.push(prev);
-    }
-    lines
-}
-
-#[cfg(procmacro2_semver_exempt)]
-struct Codemap {
-    files: Vec<FileInfo>,
-}
-
-#[cfg(procmacro2_semver_exempt)]
-impl Codemap {
-    fn next_start_pos(&self) -> u32 {
-        // Add 1 so there's always space between files.
-        //
-        // We'll always have at least 1 file, as we initialize our files list
-        // with a dummy file.
-        self.files.last().unwrap().span.hi + 1
-    }
-
-    fn add_file(&mut self, name: &str, src: &str) -> Span {
-        let lines = lines_offsets(src);
-        let lo = self.next_start_pos();
-        // XXX(nika): Shouild we bother doing a checked cast or checked add here?
-        let span = Span {
-            lo: lo,
-            hi: lo + (src.len() as u32),
-        };
-
-        self.files.push(FileInfo {
-            name: name.to_owned(),
-            span: span,
-            lines: lines,
-        });
-
-        span
-    }
-
-    fn fileinfo(&self, span: Span) -> &FileInfo {
-        for file in &self.files {
-            if file.span_within(span) {
-                return file;
-            }
-        }
-        panic!("Invalid span with no related FileInfo!");
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub struct Span {
-    #[cfg(procmacro2_semver_exempt)]
-    lo: u32,
-    #[cfg(procmacro2_semver_exempt)]
-    hi: u32,
-}
-
-impl Span {
-    #[cfg(not(procmacro2_semver_exempt))]
-    pub fn call_site() -> Span {
-        Span {}
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn call_site() -> Span {
-        Span { lo: 0, hi: 0 }
-    }
-
-    pub fn def_site() -> Span {
-        Span::call_site()
-    }
-
-    pub fn resolved_at(&self, _other: Span) -> Span {
-        // Stable spans consist only of line/column information, so
-        // `resolved_at` and `located_at` only select which span the
-        // caller wants line/column information from.
-        *self
-    }
-
-    pub fn located_at(&self, other: Span) -> Span {
-        other
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn source_file(&self) -> SourceFile {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            let fi = cm.fileinfo(*self);
-            SourceFile {
-                path: Path::new(&fi.name).to_owned(),
-            }
-        })
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn start(&self) -> LineColumn {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            let fi = cm.fileinfo(*self);
-            fi.offset_line_column(self.lo as usize)
-        })
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn end(&self) -> LineColumn {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            let fi = cm.fileinfo(*self);
-            fi.offset_line_column(self.hi as usize)
-        })
-    }
-
-    #[cfg(procmacro2_semver_exempt)]
-    pub fn join(&self, other: Span) -> Option<Span> {
-        CODEMAP.with(|cm| {
-            let cm = cm.borrow();
-            // If `other` is not within the same FileInfo as us, return None.
-            if !cm.fileinfo(*self).span_within(other) {
-                return None;
-            }
-            Some(Span {
-                lo: cmp::min(self.lo, other.lo),
-                hi: cmp::max(self.hi, other.hi),
-            })
-        })
-    }
-}
-
-impl fmt::Debug for Span {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        #[cfg(procmacro2_semver_exempt)]
-        return write!(f, "bytes({}..{})", self.lo, self.hi);
-
-        #[cfg(not(procmacro2_semver_exempt))]
-        write!(f, "Span")
-    }
-}
-
-#[derive(Clone)]
-pub struct Group {
-    delimiter: Delimiter,
-    stream: TokenStream,
-    span: Span,
-}
-
-impl Group {
-    pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
-        Group {
-            delimiter: delimiter,
-            stream: stream,
-            span: Span::call_site(),
-        }
-    }
-
-    pub fn delimiter(&self) -> Delimiter {
-        self.delimiter
-    }
-
-    pub fn stream(&self) -> TokenStream {
-        self.stream.clone()
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn span_open(&self) -> Span {
-        self.span
-    }
-
-    pub fn span_close(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-impl fmt::Display for Group {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let (left, right) = match self.delimiter {
-            Delimiter::Parenthesis => ("(", ")"),
-            Delimiter::Brace => ("{", "}"),
-            Delimiter::Bracket => ("[", "]"),
-            Delimiter::None => ("", ""),
-        };
-
-        f.write_str(left)?;
-        self.stream.fmt(f)?;
-        f.write_str(right)?;
-
-        Ok(())
-    }
-}
-
-impl fmt::Debug for Group {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut debug = fmt.debug_struct("Group");
-        debug.field("delimiter", &self.delimiter);
-        debug.field("stream", &self.stream);
-        #[cfg(procmacro2_semver_exempt)]
-        debug.field("span", &self.span);
-        debug.finish()
-    }
-}
-
-#[derive(Clone)]
-pub struct Ident {
-    sym: String,
-    span: Span,
-    raw: bool,
-}
-
-impl Ident {
-    fn _new(string: &str, raw: bool, span: Span) -> Ident {
-        validate_term(string);
-
-        Ident {
-            sym: string.to_owned(),
-            span: span,
-            raw: raw,
-        }
-    }
-
-    pub fn new(string: &str, span: Span) -> Ident {
-        Ident::_new(string, false, span)
-    }
-
-    pub fn new_raw(string: &str, span: Span) -> Ident {
-        Ident::_new(string, true, span)
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-#[inline]
-fn is_ident_start(c: char) -> bool {
-    ('a' <= c && c <= 'z')
-        || ('A' <= c && c <= 'Z')
-        || c == '_'
-        || (c > '\x7f' && UnicodeXID::is_xid_start(c))
-}
-
-#[inline]
-fn is_ident_continue(c: char) -> bool {
-    ('a' <= c && c <= 'z')
-        || ('A' <= c && c <= 'Z')
-        || c == '_'
-        || ('0' <= c && c <= '9')
-        || (c > '\x7f' && UnicodeXID::is_xid_continue(c))
-}
-
-fn validate_term(string: &str) {
-    let validate = string;
-    if validate.is_empty() {
-        panic!("Ident is not allowed to be empty; use Option<Ident>");
-    }
-
-    if validate.bytes().all(|digit| digit >= b'0' && digit <= b'9') {
-        panic!("Ident cannot be a number; use Literal instead");
-    }
-
-    fn ident_ok(string: &str) -> bool {
-        let mut chars = string.chars();
-        let first = chars.next().unwrap();
-        if !is_ident_start(first) {
-            return false;
-        }
-        for ch in chars {
-            if !is_ident_continue(ch) {
-                return false;
-            }
-        }
-        true
-    }
-
-    if !ident_ok(validate) {
-        panic!("{:?} is not a valid Ident", string);
-    }
-}
-
-impl PartialEq for Ident {
-    fn eq(&self, other: &Ident) -> bool {
-        self.sym == other.sym && self.raw == other.raw
-    }
-}
-
-impl<T> PartialEq<T> for Ident
-where
-    T: ?Sized + AsRef<str>,
-{
-    fn eq(&self, other: &T) -> bool {
-        let other = other.as_ref();
-        if self.raw {
-            other.starts_with("r#") && self.sym == other[2..]
-        } else {
-            self.sym == other
-        }
-    }
-}
-
-impl fmt::Display for Ident {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if self.raw {
-            "r#".fmt(f)?;
-        }
-        self.sym.fmt(f)
-    }
-}
-
-impl fmt::Debug for Ident {
-    // Ident(proc_macro), Ident(r#union)
-    #[cfg(not(procmacro2_semver_exempt))]
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut debug = f.debug_tuple("Ident");
-        debug.field(&format_args!("{}", self));
-        debug.finish()
-    }
-
-    // Ident {
-    //     sym: proc_macro,
-    //     span: bytes(128..138)
-    // }
-    #[cfg(procmacro2_semver_exempt)]
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut debug = f.debug_struct("Ident");
-        debug.field("sym", &format_args!("{}", self));
-        debug.field("span", &self.span);
-        debug.finish()
-    }
-}
-
-#[derive(Clone)]
-pub struct Literal {
-    text: String,
-    span: Span,
-}
-
-macro_rules! suffixed_numbers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(format!(concat!("{}", stringify!($kind)), n))
-        }
-    )*)
-}
-
-macro_rules! unsuffixed_numbers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            Literal::_new(n.to_string())
-        }
-    )*)
-}
-
-impl Literal {
-    fn _new(text: String) -> Literal {
-        Literal {
-            text: text,
-            span: Span::call_site(),
-        }
-    }
-
-    suffixed_numbers! {
-        u8_suffixed => u8,
-        u16_suffixed => u16,
-        u32_suffixed => u32,
-        u64_suffixed => u64,
-        usize_suffixed => usize,
-        i8_suffixed => i8,
-        i16_suffixed => i16,
-        i32_suffixed => i32,
-        i64_suffixed => i64,
-        isize_suffixed => isize,
-
-        f32_suffixed => f32,
-        f64_suffixed => f64,
-    }
-
-    #[cfg(u128)]
-    suffixed_numbers! {
-        u128_suffixed => u128,
-        i128_suffixed => i128,
-    }
-
-    unsuffixed_numbers! {
-        u8_unsuffixed => u8,
-        u16_unsuffixed => u16,
-        u32_unsuffixed => u32,
-        u64_unsuffixed => u64,
-        usize_unsuffixed => usize,
-        i8_unsuffixed => i8,
-        i16_unsuffixed => i16,
-        i32_unsuffixed => i32,
-        i64_unsuffixed => i64,
-        isize_unsuffixed => isize,
-    }
-
-    #[cfg(u128)]
-    unsuffixed_numbers! {
-        u128_unsuffixed => u128,
-        i128_unsuffixed => i128,
-    }
-
-    pub fn f32_unsuffixed(f: f32) -> Literal {
-        let mut s = f.to_string();
-        if !s.contains(".") {
-            s.push_str(".0");
-        }
-        Literal::_new(s)
-    }
-
-    pub fn f64_unsuffixed(f: f64) -> Literal {
-        let mut s = f.to_string();
-        if !s.contains(".") {
-            s.push_str(".0");
-        }
-        Literal::_new(s)
-    }
-
-    pub fn string(t: &str) -> Literal {
-        let mut s = t
-            .chars()
-            .flat_map(|c| c.escape_default())
-            .collect::<String>();
-        s.push('"');
-        s.insert(0, '"');
-        Literal::_new(s)
-    }
-
-    pub fn character(t: char) -> Literal {
-        Literal::_new(format!("'{}'", t.escape_default().collect::<String>()))
-    }
-
-    pub fn byte_string(bytes: &[u8]) -> Literal {
-        let mut escaped = "b\"".to_string();
-        for b in bytes {
-            match *b {
-                b'\0' => escaped.push_str(r"\0"),
-                b'\t' => escaped.push_str(r"\t"),
-                b'\n' => escaped.push_str(r"\n"),
-                b'\r' => escaped.push_str(r"\r"),
-                b'"' => escaped.push_str("\\\""),
-                b'\\' => escaped.push_str("\\\\"),
-                b'\x20'...b'\x7E' => escaped.push(*b as char),
-                _ => escaped.push_str(&format!("\\x{:02X}", b)),
-            }
-        }
-        escaped.push('"');
-        Literal::_new(escaped)
-    }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
-
-impl fmt::Display for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.text.fmt(f)
-    }
-}
-
-impl fmt::Debug for Literal {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let mut debug = fmt.debug_struct("Literal");
-        debug.field("lit", &format_args!("{}", self.text));
-        #[cfg(procmacro2_semver_exempt)]
-        debug.field("span", &self.span);
-        debug.finish()
-    }
-}
-
-fn token_stream(mut input: Cursor) -> PResult<TokenStream> {
-    let mut trees = Vec::new();
-    loop {
-        let input_no_ws = skip_whitespace(input);
-        if input_no_ws.rest.len() == 0 {
-            break;
-        }
-        if let Ok((a, tokens)) = doc_comment(input_no_ws) {
-            input = a;
-            trees.extend(tokens);
-            continue;
-        }
-
-        let (a, tt) = match token_tree(input_no_ws) {
-            Ok(p) => p,
-            Err(_) => break,
-        };
-        trees.push(tt);
-        input = a;
-    }
-    Ok((input, TokenStream { inner: trees }))
-}
-
-#[cfg(not(procmacro2_semver_exempt))]
-fn spanned<'a, T>(
-    input: Cursor<'a>,
-    f: fn(Cursor<'a>) -> PResult<'a, T>,
-) -> PResult<'a, (T, ::Span)> {
-    let (a, b) = f(skip_whitespace(input))?;
-    Ok((a, ((b, ::Span::_new_stable(Span {})))))
-}
-
-#[cfg(procmacro2_semver_exempt)]
-fn spanned<'a, T>(
-    input: Cursor<'a>,
-    f: fn(Cursor<'a>) -> PResult<'a, T>,
-) -> PResult<'a, (T, ::Span)> {
-    let input = skip_whitespace(input);
-    let lo = input.off;
-    let (a, b) = f(input)?;
-    let hi = a.off;
-    let span = ::Span::_new_stable(Span { lo: lo, hi: hi });
-    Ok((a, (b, span)))
-}
-
-fn token_tree(input: Cursor) -> PResult<TokenTree> {
-    let (rest, (mut tt, span)) = spanned(input, token_kind)?;
-    tt.set_span(span);
-    Ok((rest, tt))
-}
-
-named!(token_kind -> TokenTree, alt!(
-    map!(group, |g| TokenTree::Group(::Group::_new_stable(g)))
-    |
-    map!(literal, |l| TokenTree::Literal(::Literal::_new_stable(l))) // must be before symbol
-    |
-    map!(op, TokenTree::Punct)
-    |
-    symbol_leading_ws
-));
-
-named!(group -> Group, alt!(
-    delimited!(
-        punct!("("),
-        token_stream,
-        punct!(")")
-    ) => { |ts| Group::new(Delimiter::Parenthesis, ts) }
-    |
-    delimited!(
-        punct!("["),
-        token_stream,
-        punct!("]")
-    ) => { |ts| Group::new(Delimiter::Bracket, ts) }
-    |
-    delimited!(
-        punct!("{"),
-        token_stream,
-        punct!("}")
-    ) => { |ts| Group::new(Delimiter::Brace, ts) }
-));
-
-fn symbol_leading_ws(input: Cursor) -> PResult<TokenTree> {
-    symbol(skip_whitespace(input))
-}
-
-fn symbol(input: Cursor) -> PResult<TokenTree> {
-    let mut chars = input.char_indices();
-
-    let raw = input.starts_with("r#");
-    if raw {
-        chars.next();
-        chars.next();
-    }
-
-    match chars.next() {
-        Some((_, ch)) if is_ident_start(ch) => {}
-        _ => return Err(LexError),
-    }
-
-    let mut end = input.len();
-    for (i, ch) in chars {
-        if !is_ident_continue(ch) {
-            end = i;
-            break;
-        }
-    }
-
-    let a = &input.rest[..end];
-    if a == "r#_" {
-        Err(LexError)
-    } else {
-        let ident = if raw {
-            ::Ident::_new_raw(&a[2..], ::Span::call_site())
-        } else {
-            ::Ident::new(a, ::Span::call_site())
-        };
-        Ok((input.advance(end), ident.into()))
-    }
-}
-
-fn literal(input: Cursor) -> PResult<Literal> {
-    let input_no_ws = skip_whitespace(input);
-
-    match literal_nocapture(input_no_ws) {
-        Ok((a, ())) => {
-            let start = input.len() - input_no_ws.len();
-            let len = input_no_ws.len() - a.len();
-            let end = start + len;
-            Ok((a, Literal::_new(input.rest[start..end].to_string())))
-        }
-        Err(LexError) => Err(LexError),
-    }
-}
-
-named!(literal_nocapture -> (), alt!(
-    string
-    |
-    byte_string
-    |
-    byte
-    |
-    character
-    |
-    float
-    |
-    int
-));
-
-named!(string -> (), alt!(
-    quoted_string
-    |
-    preceded!(
-        punct!("r"),
-        raw_string
-    ) => { |_| () }
-));
-
-named!(quoted_string -> (), delimited!(
-    punct!("\""),
-    cooked_string,
-    tag!("\"")
-));
-
-fn cooked_string(input: Cursor) -> PResult<()> {
-    let mut chars = input.char_indices().peekable();
-    while let Some((byte_offset, ch)) = chars.next() {
-        match ch {
-            '"' => {
-                return Ok((input.advance(byte_offset), ()));
-            }
-            '\r' => {
-                if let Some((_, '\n')) = chars.next() {
-                    // ...
-                } else {
-                    break;
-                }
-            }
-            '\\' => match chars.next() {
-                Some((_, 'x')) => {
-                    if !backslash_x_char(&mut chars) {
-                        break;
-                    }
-                }
-                Some((_, 'n')) | Some((_, 'r')) | Some((_, 't')) | Some((_, '\\'))
-                | Some((_, '\'')) | Some((_, '"')) | Some((_, '0')) => {}
-                Some((_, 'u')) => {
-                    if !backslash_u(&mut chars) {
-                        break;
-                    }
-                }
-                Some((_, '\n')) | Some((_, '\r')) => {
-                    while let Some(&(_, ch)) = chars.peek() {
-                        if ch.is_whitespace() {
-                            chars.next();
-                        } else {
-                            break;
-                        }
-                    }
-                }
-                _ => break,
-            },
-            _ch => {}
-        }
-    }
-    Err(LexError)
-}
-
-named!(byte_string -> (), alt!(
-    delimited!(
-        punct!("b\""),
-        cooked_byte_string,
-        tag!("\"")
-    ) => { |_| () }
-    |
-    preceded!(
-        punct!("br"),
-        raw_string
-    ) => { |_| () }
-));
-
-fn cooked_byte_string(mut input: Cursor) -> PResult<()> {
-    let mut bytes = input.bytes().enumerate();
-    'outer: while let Some((offset, b)) = bytes.next() {
-        match b {
-            b'"' => {
-                return Ok((input.advance(offset), ()));
-            }
-            b'\r' => {
-                if let Some((_, b'\n')) = bytes.next() {
-                    // ...
-                } else {
-                    break;
-                }
-            }
-            b'\\' => match bytes.next() {
-                Some((_, b'x')) => {
-                    if !backslash_x_byte(&mut bytes) {
-                        break;
-                    }
-                }
-                Some((_, b'n')) | Some((_, b'r')) | Some((_, b't')) | Some((_, b'\\'))
-                | Some((_, b'0')) | Some((_, b'\'')) | Some((_, b'"')) => {}
-                Some((newline, b'\n')) | Some((newline, b'\r')) => {
-                    let rest = input.advance(newline + 1);
-                    for (offset, ch) in rest.char_indices() {
-                        if !ch.is_whitespace() {
-                            input = rest.advance(offset);
-                            bytes = input.bytes().enumerate();
-                            continue 'outer;
-                        }
-                    }
-                    break;
-                }
-                _ => break,
-            },
-            b if b < 0x80 => {}
-            _ => break,
-        }
-    }
-    Err(LexError)
-}
-
-fn raw_string(input: Cursor) -> PResult<()> {
-    let mut chars = input.char_indices();
-    let mut n = 0;
-    while let Some((byte_offset, ch)) = chars.next() {
-        match ch {
-            '"' => {
-                n = byte_offset;
-                break;
-            }
-            '#' => {}
-            _ => return Err(LexError),
-        }
-    }
-    for (byte_offset, ch) in chars {
-        match ch {
-            '"' if input.advance(byte_offset + 1).starts_with(&input.rest[..n]) => {
-                let rest = input.advance(byte_offset + 1 + n);
-                return Ok((rest, ()));
-            }
-            '\r' => {}
-            _ => {}
-        }
-    }
-    Err(LexError)
-}
-
-named!(byte -> (), do_parse!(
-    punct!("b") >>
-    tag!("'") >>
-    cooked_byte >>
-    tag!("'") >>
-    (())
-));
-
-fn cooked_byte(input: Cursor) -> PResult<()> {
-    let mut bytes = input.bytes().enumerate();
-    let ok = match bytes.next().map(|(_, b)| b) {
-        Some(b'\\') => match bytes.next().map(|(_, b)| b) {
-            Some(b'x') => backslash_x_byte(&mut bytes),
-            Some(b'n') | Some(b'r') | Some(b't') | Some(b'\\') | Some(b'0') | Some(b'\'')
-            | Some(b'"') => true,
-            _ => false,
-        },
-        b => b.is_some(),
-    };
-    if ok {
-        match bytes.next() {
-            Some((offset, _)) => {
-                if input.chars().as_str().is_char_boundary(offset) {
-                    Ok((input.advance(offset), ()))
-                } else {
-                    Err(LexError)
-                }
-            }
-            None => Ok((input.advance(input.len()), ())),
-        }
-    } else {
-        Err(LexError)
-    }
-}
-
-named!(character -> (), do_parse!(
-    punct!("'") >>
-    cooked_char >>
-    tag!("'") >>
-    (())
-));
-
-fn cooked_char(input: Cursor) -> PResult<()> {
-    let mut chars = input.char_indices();
-    let ok = match chars.next().map(|(_, ch)| ch) {
-        Some('\\') => match chars.next().map(|(_, ch)| ch) {
-            Some('x') => backslash_x_char(&mut chars),
-            Some('u') => backslash_u(&mut chars),
-            Some('n') | Some('r') | Some('t') | Some('\\') | Some('0') | Some('\'') | Some('"') => {
-                true
-            }
-            _ => false,
-        },
-        ch => ch.is_some(),
-    };
-    if ok {
-        match chars.next() {
-            Some((idx, _)) => Ok((input.advance(idx), ())),
-            None => Ok((input.advance(input.len()), ())),
-        }
-    } else {
-        Err(LexError)
-    }
-}
-
-macro_rules! next_ch {
-    ($chars:ident @ $pat:pat $(| $rest:pat)*) => {
-        match $chars.next() {
-            Some((_, ch)) => match ch {
-                $pat $(| $rest)*  => ch,
-                _ => return false,
-            },
-            None => return false
-        }
-    };
-}
-
-fn backslash_x_char<I>(chars: &mut I) -> bool
-where
-    I: Iterator<Item = (usize, char)>,
-{
-    next_ch!(chars @ '0'...'7');
-    next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F');
-    true
-}
-
-fn backslash_x_byte<I>(chars: &mut I) -> bool
-where
-    I: Iterator<Item = (usize, u8)>,
-{
-    next_ch!(chars @ b'0'...b'9' | b'a'...b'f' | b'A'...b'F');
-    next_ch!(chars @ b'0'...b'9' | b'a'...b'f' | b'A'...b'F');
-    true
-}
-
-fn backslash_u<I>(chars: &mut I) -> bool
-where
-    I: Iterator<Item = (usize, char)>,
-{
-    next_ch!(chars @ '{');
-    next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F');
-    loop {
-        let c = next_ch!(chars @ '0'...'9' | 'a'...'f' | 'A'...'F' | '_' | '}');
-        if c == '}' {
-            return true;
-        }
-    }
-}
-
-fn float(input: Cursor) -> PResult<()> {
-    let (rest, ()) = float_digits(input)?;
-    for suffix in &["f32", "f64"] {
-        if rest.starts_with(suffix) {
-            return word_break(rest.advance(suffix.len()));
-        }
-    }
-    word_break(rest)
-}
-
-fn float_digits(input: Cursor) -> PResult<()> {
-    let mut chars = input.chars().peekable();
-    match chars.next() {
-        Some(ch) if ch >= '0' && ch <= '9' => {}
-        _ => return Err(LexError),
-    }
-
-    let mut len = 1;
-    let mut has_dot = false;
-    let mut has_exp = false;
-    while let Some(&ch) = chars.peek() {
-        match ch {
-            '0'...'9' | '_' => {
-                chars.next();
-                len += 1;
-            }
-            '.' => {
-                if has_dot {
-                    break;
-                }
-                chars.next();
-                if chars
-                    .peek()
-                    .map(|&ch| ch == '.' || UnicodeXID::is_xid_start(ch))
-                    .unwrap_or(false)
-                {
-                    return Err(LexError);
-                }
-                len += 1;
-                has_dot = true;
-            }
-            'e' | 'E' => {
-                chars.next();
-                len += 1;
-                has_exp = true;
-                break;
-            }
-            _ => break,
-        }
-    }
-
-    let rest = input.advance(len);
-    if !(has_dot || has_exp || rest.starts_with("f32") || rest.starts_with("f64")) {
-        return Err(LexError);
-    }
-
-    if has_exp {
-        let mut has_exp_value = false;
-        while let Some(&ch) = chars.peek() {
-            match ch {
-                '+' | '-' => {
-                    if has_exp_value {
-                        break;
-                    }
-                    chars.next();
-                    len += 1;
-                }
-                '0'...'9' => {
-                    chars.next();
-                    len += 1;
-                    has_exp_value = true;
-                }
-                '_' => {
-                    chars.next();
-                    len += 1;
-                }
-                _ => break,
-            }
-        }
-        if !has_exp_value {
-            return Err(LexError);
-        }
-    }
-
-    Ok((input.advance(len), ()))
-}
-
-fn int(input: Cursor) -> PResult<()> {
-    let (rest, ()) = digits(input)?;
-    for suffix in &[
-        "isize", "i8", "i16", "i32", "i64", "i128", "usize", "u8", "u16", "u32", "u64", "u128",
-    ] {
-        if rest.starts_with(suffix) {
-            return word_break(rest.advance(suffix.len()));
-        }
-    }
-    word_break(rest)
-}
-
-fn digits(mut input: Cursor) -> PResult<()> {
-    let base = if input.starts_with("0x") {
-        input = input.advance(2);
-        16
-    } else if input.starts_with("0o") {
-        input = input.advance(2);
-        8
-    } else if input.starts_with("0b") {
-        input = input.advance(2);
-        2
-    } else {
-        10
-    };
-
-    let mut len = 0;
-    let mut empty = true;
-    for b in input.bytes() {
-        let digit = match b {
-            b'0'...b'9' => (b - b'0') as u64,
-            b'a'...b'f' => 10 + (b - b'a') as u64,
-            b'A'...b'F' => 10 + (b - b'A') as u64,
-            b'_' => {
-                if empty && base == 10 {
-                    return Err(LexError);
-                }
-                len += 1;
-                continue;
-            }
-            _ => break,
-        };
-        if digit >= base {
-            return Err(LexError);
-        }
-        len += 1;
-        empty = false;
-    }
-    if empty {
-        Err(LexError)
-    } else {
-        Ok((input.advance(len), ()))
-    }
-}
-
-fn op(input: Cursor) -> PResult<Punct> {
-    let input = skip_whitespace(input);
-    match op_char(input) {
-        Ok((rest, '\'')) => {
-            symbol(rest)?;
-            Ok((rest, Punct::new('\'', Spacing::Joint)))
-        }
-        Ok((rest, ch)) => {
-            let kind = match op_char(rest) {
-                Ok(_) => Spacing::Joint,
-                Err(LexError) => Spacing::Alone,
-            };
-            Ok((rest, Punct::new(ch, kind)))
-        }
-        Err(LexError) => Err(LexError),
-    }
-}
-
-fn op_char(input: Cursor) -> PResult<char> {
-    if input.starts_with("//") || input.starts_with("/*") {
-        // Do not accept `/` of a comment as an op.
-        return Err(LexError);
-    }
-
-    let mut chars = input.chars();
-    let first = match chars.next() {
-        Some(ch) => ch,
-        None => {
-            return Err(LexError);
-        }
-    };
-    let recognized = "~!@#$%^&*-=+|;:,<.>/?'";
-    if recognized.contains(first) {
-        Ok((input.advance(first.len_utf8()), first))
-    } else {
-        Err(LexError)
-    }
-}
-
-fn doc_comment(input: Cursor) -> PResult<Vec<TokenTree>> {
-    let mut trees = Vec::new();
-    let (rest, ((comment, inner), span)) = spanned(input, doc_comment_contents)?;
-    trees.push(TokenTree::Punct(Punct::new('#', Spacing::Alone)));
-    if inner {
-        trees.push(Punct::new('!', Spacing::Alone).into());
-    }
-    let mut stream = vec![
-        TokenTree::Ident(::Ident::new("doc", span)),
-        TokenTree::Punct(Punct::new('=', Spacing::Alone)),
-        TokenTree::Literal(::Literal::string(comment)),
-    ];
-    for tt in stream.iter_mut() {
-        tt.set_span(span);
-    }
-    let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
-    trees.push(::Group::_new_stable(group).into());
-    for tt in trees.iter_mut() {
-        tt.set_span(span);
-    }
-    Ok((rest, trees))
-}
-
-named!(doc_comment_contents -> (&str, bool), alt!(
-    do_parse!(
-        punct!("//!") >>
-        s: take_until_newline_or_eof!() >>
-        ((s, true))
-    )
-    |
-    do_parse!(
-        option!(whitespace) >>
-        peek!(tag!("/*!")) >>
-        s: block_comment >>
-        ((s, true))
-    )
-    |
-    do_parse!(
-        punct!("///") >>
-        not!(tag!("/")) >>
-        s: take_until_newline_or_eof!() >>
-        ((s, false))
-    )
-    |
-    do_parse!(
-        option!(whitespace) >>
-        peek!(tuple!(tag!("/**"), not!(tag!("*")))) >>
-        s: block_comment >>
-        ((s, false))
-    )
-));
diff -Nru cargo-0.32.0/vendor/proc-macro2/src/strnom.rs cargo-0.33.0/vendor/proc-macro2/src/strnom.rs
--- cargo-0.32.0/vendor/proc-macro2/src/strnom.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/src/strnom.rs	2019-02-06 04:11:58.000000000 +0000
@@ -4,23 +4,23 @@
 
 use unicode_xid::UnicodeXID;
 
-use stable::LexError;
+use fallback::LexError;
 
 #[derive(Copy, Clone, Eq, PartialEq)]
 pub struct Cursor<'a> {
     pub rest: &'a str,
-    #[cfg(procmacro2_semver_exempt)]
+    #[cfg(span_locations)]
     pub off: u32,
 }
 
 impl<'a> Cursor<'a> {
-    #[cfg(not(procmacro2_semver_exempt))]
+    #[cfg(not(span_locations))]
     pub fn advance(&self, amt: usize) -> Cursor<'a> {
         Cursor {
             rest: &self.rest[amt..],
         }
     }
-    #[cfg(procmacro2_semver_exempt)]
+    #[cfg(span_locations)]
     pub fn advance(&self, amt: usize) -> Cursor<'a> {
         Cursor {
             rest: &self.rest[amt..],
diff -Nru cargo-0.32.0/vendor/proc-macro2/src/unstable.rs cargo-0.33.0/vendor/proc-macro2/src/unstable.rs
--- cargo-0.32.0/vendor/proc-macro2/src/unstable.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/src/unstable.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,922 +0,0 @@
-#![cfg_attr(not(super_unstable), allow(dead_code))]
-
-use std::fmt;
-use std::iter;
-use std::panic::{self, PanicInfo};
-#[cfg(super_unstable)]
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use proc_macro;
-use stable;
-
-use {Delimiter, Punct, Spacing, TokenTree};
-
-#[derive(Clone)]
-pub enum TokenStream {
-    Nightly(proc_macro::TokenStream),
-    Stable(stable::TokenStream),
-}
-
-pub enum LexError {
-    Nightly(proc_macro::LexError),
-    Stable(stable::LexError),
-}
-
-fn nightly_works() -> bool {
-    use std::sync::atomic::*;
-    use std::sync::Once;
-
-    static WORKS: AtomicUsize = ATOMIC_USIZE_INIT;
-    static INIT: Once = Once::new();
-
-    match WORKS.load(Ordering::SeqCst) {
-        1 => return false,
-        2 => return true,
-        _ => {}
-    }
-
-    // Swap in a null panic hook to avoid printing "thread panicked" to stderr,
-    // then use catch_unwind to determine whether the compiler's proc_macro is
-    // working. When proc-macro2 is used from outside of a procedural macro all
-    // of the proc_macro crate's APIs currently panic.
-    //
-    // The Once is to prevent the possibility of this ordering:
-    //
-    //     thread 1 calls take_hook, gets the user's original hook
-    //     thread 1 calls set_hook with the null hook
-    //     thread 2 calls take_hook, thinks null hook is the original hook
-    //     thread 2 calls set_hook with the null hook
-    //     thread 1 calls set_hook with the actual original hook
-    //     thread 2 calls set_hook with what it thinks is the original hook
-    //
-    // in which the user's hook has been lost.
-    //
-    // There is still a race condition where a panic in a different thread can
-    // happen during the interval that the user's original panic hook is
-    // unregistered such that their hook is incorrectly not called. This is
-    // sufficiently unlikely and less bad than printing panic messages to stderr
-    // on correct use of this crate. Maybe there is a libstd feature request
-    // here. For now, if a user needs to guarantee that this failure mode does
-    // not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
-    // the main thread before launching any other threads.
-    INIT.call_once(|| {
-        type PanicHook = Fn(&PanicInfo) + Sync + Send + 'static;
-
-        let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
-        let sanity_check = &*null_hook as *const PanicHook;
-        let original_hook = panic::take_hook();
-        panic::set_hook(null_hook);
-
-        let works = panic::catch_unwind(|| proc_macro::Span::call_site()).is_ok();
-        WORKS.store(works as usize + 1, Ordering::SeqCst);
-
-        let hopefully_null_hook = panic::take_hook();
-        panic::set_hook(original_hook);
-        if sanity_check != &*hopefully_null_hook {
-            panic!("observed race condition in proc_macro2::nightly_works");
-        }
-    });
-    nightly_works()
-}
-
-fn mismatch() -> ! {
-    panic!("stable/nightly mismatch")
-}
-
-impl TokenStream {
-    pub fn new() -> TokenStream {
-        if nightly_works() {
-            TokenStream::Nightly(proc_macro::TokenStream::new())
-        } else {
-            TokenStream::Stable(stable::TokenStream::new())
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        match self {
-            TokenStream::Nightly(tts) => tts.is_empty(),
-            TokenStream::Stable(tts) => tts.is_empty(),
-        }
-    }
-
-    fn unwrap_nightly(self) -> proc_macro::TokenStream {
-        match self {
-            TokenStream::Nightly(s) => s,
-            TokenStream::Stable(_) => mismatch(),
-        }
-    }
-
-    fn unwrap_stable(self) -> stable::TokenStream {
-        match self {
-            TokenStream::Nightly(_) => mismatch(),
-            TokenStream::Stable(s) => s,
-        }
-    }
-}
-
-impl FromStr for TokenStream {
-    type Err = LexError;
-
-    fn from_str(src: &str) -> Result<TokenStream, LexError> {
-        if nightly_works() {
-            Ok(TokenStream::Nightly(src.parse()?))
-        } else {
-            Ok(TokenStream::Stable(src.parse()?))
-        }
-    }
-}
-
-impl fmt::Display for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            TokenStream::Nightly(tts) => tts.fmt(f),
-            TokenStream::Stable(tts) => tts.fmt(f),
-        }
-    }
-}
-
-impl From<proc_macro::TokenStream> for TokenStream {
-    fn from(inner: proc_macro::TokenStream) -> TokenStream {
-        TokenStream::Nightly(inner)
-    }
-}
-
-impl From<TokenStream> for proc_macro::TokenStream {
-    fn from(inner: TokenStream) -> proc_macro::TokenStream {
-        match inner {
-            TokenStream::Nightly(inner) => inner,
-            TokenStream::Stable(inner) => inner.to_string().parse().unwrap(),
-        }
-    }
-}
-
-impl From<stable::TokenStream> for TokenStream {
-    fn from(inner: stable::TokenStream) -> TokenStream {
-        TokenStream::Stable(inner)
-    }
-}
-
-impl From<TokenTree> for TokenStream {
-    fn from(token: TokenTree) -> TokenStream {
-        if !nightly_works() {
-            return TokenStream::Stable(token.into());
-        }
-        let tt: proc_macro::TokenTree = match token {
-            TokenTree::Group(tt) => tt.inner.unwrap_nightly().into(),
-            TokenTree::Punct(tt) => {
-                let spacing = match tt.spacing() {
-                    Spacing::Joint => proc_macro::Spacing::Joint,
-                    Spacing::Alone => proc_macro::Spacing::Alone,
-                };
-                let mut op = proc_macro::Punct::new(tt.as_char(), spacing);
-                op.set_span(tt.span().inner.unwrap_nightly());
-                op.into()
-            }
-            TokenTree::Ident(tt) => tt.inner.unwrap_nightly().into(),
-            TokenTree::Literal(tt) => tt.inner.unwrap_nightly().into(),
-        };
-        TokenStream::Nightly(tt.into())
-    }
-}
-
-impl iter::FromIterator<TokenTree> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenTree>>(trees: I) -> Self {
-        if nightly_works() {
-            let trees = trees
-                .into_iter()
-                .map(TokenStream::from)
-                .flat_map(|t| match t {
-                    TokenStream::Nightly(s) => s,
-                    TokenStream::Stable(_) => mismatch(),
-                });
-            TokenStream::Nightly(trees.collect())
-        } else {
-            TokenStream::Stable(trees.into_iter().collect())
-        }
-    }
-}
-
-impl iter::FromIterator<TokenStream> for TokenStream {
-    fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
-        let mut streams = streams.into_iter();
-        match streams.next() {
-            #[cfg(slow_extend)]
-            Some(TokenStream::Nightly(first)) => {
-                let stream = iter::once(first).chain(streams.map(|s| {
-                    match s {
-                        TokenStream::Nightly(s) => s,
-                        TokenStream::Stable(_) => mismatch(),
-                    }
-                })).collect();
-                TokenStream::Nightly(stream)
-            }
-            #[cfg(not(slow_extend))]
-            Some(TokenStream::Nightly(mut first)) => {
-                first.extend(streams.map(|s| {
-                    match s {
-                        TokenStream::Nightly(s) => s,
-                        TokenStream::Stable(_) => mismatch(),
-                    }
-                }));
-                TokenStream::Nightly(first)
-            }
-            Some(TokenStream::Stable(mut first)) => {
-                first.extend(streams.map(|s| {
-                    match s {
-                        TokenStream::Stable(s) => s,
-                        TokenStream::Nightly(_) => mismatch(),
-                    }
-                }));
-                TokenStream::Stable(first)
-            }
-            None => TokenStream::new(),
-
-        }
-    }
-}
-
-impl Extend<TokenTree> for TokenStream {
-    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
-        match self {
-            TokenStream::Nightly(tts) => {
-                #[cfg(not(slow_extend))]
-                {
-                    tts.extend(
-                        streams
-                            .into_iter()
-                            .map(|t| TokenStream::from(t).unwrap_nightly()),
-                    );
-                }
-                #[cfg(slow_extend)]
-                {
-                    *tts = tts
-                        .clone()
-                        .into_iter()
-                        .chain(
-                            streams
-                                .into_iter()
-                                .map(TokenStream::from)
-                                .flat_map(|t| match t {
-                                    TokenStream::Nightly(tts) => tts.into_iter(),
-                                    _ => mismatch(),
-                                }),
-                        ).collect();
-                }
-            }
-            TokenStream::Stable(tts) => tts.extend(streams),
-        }
-    }
-}
-
-impl Extend<TokenStream> for TokenStream {
-    fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
-        match self {
-            TokenStream::Nightly(tts) => {
-                #[cfg(not(slow_extend))]
-                {
-                    tts.extend(streams.into_iter().map(|stream| stream.unwrap_nightly()));
-                }
-                #[cfg(slow_extend)]
-                {
-                    *tts = tts
-                        .clone()
-                        .into_iter()
-                        .chain(
-                            streams
-                                .into_iter()
-                                .flat_map(|t| match t {
-                                    TokenStream::Nightly(tts) => tts.into_iter(),
-                                    _ => mismatch(),
-                                }),
-                        ).collect();
-                }
-            }
-            TokenStream::Stable(tts) => {
-                tts.extend(streams.into_iter().map(|stream| stream.unwrap_stable()))
-            }
-        }
-    }
-}
-
-impl fmt::Debug for TokenStream {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            TokenStream::Nightly(tts) => tts.fmt(f),
-            TokenStream::Stable(tts) => tts.fmt(f),
-        }
-    }
-}
-
-impl From<proc_macro::LexError> for LexError {
-    fn from(e: proc_macro::LexError) -> LexError {
-        LexError::Nightly(e)
-    }
-}
-
-impl From<stable::LexError> for LexError {
-    fn from(e: stable::LexError) -> LexError {
-        LexError::Stable(e)
-    }
-}
-
-impl fmt::Debug for LexError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            LexError::Nightly(e) => e.fmt(f),
-            LexError::Stable(e) => e.fmt(f),
-        }
-    }
-}
-
-pub enum TokenTreeIter {
-    Nightly(proc_macro::token_stream::IntoIter),
-    Stable(stable::TokenTreeIter),
-}
-
-impl IntoIterator for TokenStream {
-    type Item = TokenTree;
-    type IntoIter = TokenTreeIter;
-
-    fn into_iter(self) -> TokenTreeIter {
-        match self {
-            TokenStream::Nightly(tts) => TokenTreeIter::Nightly(tts.into_iter()),
-            TokenStream::Stable(tts) => TokenTreeIter::Stable(tts.into_iter()),
-        }
-    }
-}
-
-impl Iterator for TokenTreeIter {
-    type Item = TokenTree;
-
-    fn next(&mut self) -> Option<TokenTree> {
-        let token = match self {
-            TokenTreeIter::Nightly(iter) => iter.next()?,
-            TokenTreeIter::Stable(iter) => return iter.next(),
-        };
-        Some(match token {
-            proc_macro::TokenTree::Group(tt) => ::Group::_new(Group::Nightly(tt)).into(),
-            proc_macro::TokenTree::Punct(tt) => {
-                let spacing = match tt.spacing() {
-                    proc_macro::Spacing::Joint => Spacing::Joint,
-                    proc_macro::Spacing::Alone => Spacing::Alone,
-                };
-                let mut o = Punct::new(tt.as_char(), spacing);
-                o.set_span(::Span::_new(Span::Nightly(tt.span())));
-                o.into()
-            }
-            proc_macro::TokenTree::Ident(s) => ::Ident::_new(Ident::Nightly(s)).into(),
-            proc_macro::TokenTree::Literal(l) => ::Literal::_new(Literal::Nightly(l)).into(),
-        })
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        match self {
-            TokenTreeIter::Nightly(tts) => tts.size_hint(),
-            TokenTreeIter::Stable(tts) => tts.size_hint(),
-        }
-    }
-}
-
-impl fmt::Debug for TokenTreeIter {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("TokenTreeIter").finish()
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-#[cfg(super_unstable)]
-pub enum SourceFile {
-    Nightly(proc_macro::SourceFile),
-    Stable(stable::SourceFile),
-}
-
-#[cfg(super_unstable)]
-impl SourceFile {
-    fn nightly(sf: proc_macro::SourceFile) -> Self {
-        SourceFile::Nightly(sf)
-    }
-
-    /// Get the path to this source file as a string.
-    pub fn path(&self) -> PathBuf {
-        match self {
-            SourceFile::Nightly(a) => a.path(),
-            SourceFile::Stable(a) => a.path(),
-        }
-    }
-
-    pub fn is_real(&self) -> bool {
-        match self {
-            SourceFile::Nightly(a) => a.is_real(),
-            SourceFile::Stable(a) => a.is_real(),
-        }
-    }
-}
-
-#[cfg(super_unstable)]
-impl fmt::Debug for SourceFile {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            SourceFile::Nightly(a) => a.fmt(f),
-            SourceFile::Stable(a) => a.fmt(f),
-        }
-    }
-}
-
-pub struct LineColumn {
-    pub line: usize,
-    pub column: usize,
-}
-
-#[derive(Copy, Clone)]
-pub enum Span {
-    Nightly(proc_macro::Span),
-    Stable(stable::Span),
-}
-
-impl Span {
-    pub fn call_site() -> Span {
-        if nightly_works() {
-            Span::Nightly(proc_macro::Span::call_site())
-        } else {
-            Span::Stable(stable::Span::call_site())
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn def_site() -> Span {
-        if nightly_works() {
-            Span::Nightly(proc_macro::Span::def_site())
-        } else {
-            Span::Stable(stable::Span::def_site())
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn resolved_at(&self, other: Span) -> Span {
-        match (self, other) {
-            (Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.resolved_at(b)),
-            (Span::Stable(a), Span::Stable(b)) => Span::Stable(a.resolved_at(b)),
-            _ => mismatch(),
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn located_at(&self, other: Span) -> Span {
-        match (self, other) {
-            (Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.located_at(b)),
-            (Span::Stable(a), Span::Stable(b)) => Span::Stable(a.located_at(b)),
-            _ => mismatch(),
-        }
-    }
-
-    pub fn unstable(self) -> proc_macro::Span {
-        match self {
-            Span::Nightly(s) => s,
-            Span::Stable(_) => mismatch(),
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn source_file(&self) -> SourceFile {
-        match self {
-            Span::Nightly(s) => SourceFile::nightly(s.source_file()),
-            Span::Stable(s) => SourceFile::Stable(s.source_file()),
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn start(&self) -> LineColumn {
-        match self {
-            Span::Nightly(s) => {
-                let proc_macro::LineColumn { line, column } = s.start();
-                LineColumn { line, column }
-            }
-            Span::Stable(s) => {
-                let stable::LineColumn { line, column } = s.start();
-                LineColumn { line, column }
-            }
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn end(&self) -> LineColumn {
-        match self {
-            Span::Nightly(s) => {
-                let proc_macro::LineColumn { line, column } = s.end();
-                LineColumn { line, column }
-            }
-            Span::Stable(s) => {
-                let stable::LineColumn { line, column } = s.end();
-                LineColumn { line, column }
-            }
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn join(&self, other: Span) -> Option<Span> {
-        let ret = match (self, other) {
-            (Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.join(b)?),
-            (Span::Stable(a), Span::Stable(b)) => Span::Stable(a.join(b)?),
-            _ => return None,
-        };
-        Some(ret)
-    }
-
-    #[cfg(super_unstable)]
-    pub fn eq(&self, other: &Span) -> bool {
-        match (self, other) {
-            (Span::Nightly(a), Span::Nightly(b)) => a.eq(b),
-            (Span::Stable(a), Span::Stable(b)) => a.eq(b),
-            _ => false,
-        }
-    }
-
-    fn unwrap_nightly(self) -> proc_macro::Span {
-        match self {
-            Span::Nightly(s) => s,
-            Span::Stable(_) => mismatch(),
-        }
-    }
-}
-
-impl From<proc_macro::Span> for ::Span {
-    fn from(proc_span: proc_macro::Span) -> ::Span {
-        ::Span::_new(Span::Nightly(proc_span))
-    }
-}
-
-impl From<stable::Span> for Span {
-    fn from(inner: stable::Span) -> Span {
-        Span::Stable(inner)
-    }
-}
-
-impl fmt::Debug for Span {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Span::Nightly(s) => s.fmt(f),
-            Span::Stable(s) => s.fmt(f),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum Group {
-    Nightly(proc_macro::Group),
-    Stable(stable::Group),
-}
-
-impl Group {
-    pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
-        match stream {
-            TokenStream::Nightly(stream) => {
-                let delimiter = match delimiter {
-                    Delimiter::Parenthesis => proc_macro::Delimiter::Parenthesis,
-                    Delimiter::Bracket => proc_macro::Delimiter::Bracket,
-                    Delimiter::Brace => proc_macro::Delimiter::Brace,
-                    Delimiter::None => proc_macro::Delimiter::None,
-                };
-                Group::Nightly(proc_macro::Group::new(delimiter, stream))
-            }
-            TokenStream::Stable(stream) => {
-                Group::Stable(stable::Group::new(delimiter, stream))
-            }
-        }
-    }
-
-    pub fn delimiter(&self) -> Delimiter {
-        match self {
-            Group::Nightly(g) => match g.delimiter() {
-                proc_macro::Delimiter::Parenthesis => Delimiter::Parenthesis,
-                proc_macro::Delimiter::Bracket => Delimiter::Bracket,
-                proc_macro::Delimiter::Brace => Delimiter::Brace,
-                proc_macro::Delimiter::None => Delimiter::None,
-            }
-            Group::Stable(g) => g.delimiter(),
-        }
-    }
-
-    pub fn stream(&self) -> TokenStream {
-        match self {
-            Group::Nightly(g) => TokenStream::Nightly(g.stream()),
-            Group::Stable(g) => TokenStream::Stable(g.stream()),
-        }
-    }
-
-    pub fn span(&self) -> Span {
-        match self {
-            Group::Nightly(g) => Span::Nightly(g.span()),
-            Group::Stable(g) => Span::Stable(g.span()),
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn span_open(&self) -> Span {
-        match self {
-            Group::Nightly(g) => Span::Nightly(g.span_open()),
-            Group::Stable(g) => Span::Stable(g.span_open()),
-        }
-    }
-
-    #[cfg(super_unstable)]
-    pub fn span_close(&self) -> Span {
-        match self {
-            Group::Nightly(g) => Span::Nightly(g.span_close()),
-            Group::Stable(g) => Span::Stable(g.span_close()),
-        }
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        match (self, span) {
-            (Group::Nightly(g), Span::Nightly(s)) => g.set_span(s),
-            (Group::Stable(g), Span::Stable(s)) => g.set_span(s),
-            _ => mismatch(),
-        }
-    }
-
-    fn unwrap_nightly(self) -> proc_macro::Group {
-        match self {
-            Group::Nightly(g) => g,
-            Group::Stable(_) => mismatch(),
-        }
-    }
-}
-
-impl From<stable::Group> for Group {
-    fn from(g: stable::Group) -> Self {
-        Group::Stable(g)
-    }
-}
-
-impl fmt::Display for Group {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Group::Nightly(group) => group.fmt(formatter),
-            Group::Stable(group) => group.fmt(formatter),
-        }
-    }
-}
-
-impl fmt::Debug for Group {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Group::Nightly(group) => group.fmt(formatter),
-            Group::Stable(group) => group.fmt(formatter),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum Ident {
-    Nightly(proc_macro::Ident),
-    Stable(stable::Ident),
-}
-
-impl Ident {
-    pub fn new(string: &str, span: Span) -> Ident {
-        match span {
-            Span::Nightly(s) => Ident::Nightly(proc_macro::Ident::new(string, s)),
-            Span::Stable(s) => Ident::Stable(stable::Ident::new(string, s)),
-        }
-    }
-
-    pub fn new_raw(string: &str, span: Span) -> Ident {
-        match span {
-            Span::Nightly(s) => {
-                let p: proc_macro::TokenStream = string.parse().unwrap();
-                let ident = match p.into_iter().next() {
-                    Some(proc_macro::TokenTree::Ident(mut i)) => {
-                        i.set_span(s);
-                        i
-                    }
-                    _ => panic!(),
-                };
-                Ident::Nightly(ident)
-            }
-            Span::Stable(s) => Ident::Stable(stable::Ident::new_raw(string, s)),
-        }
-    }
-
-    pub fn span(&self) -> Span {
-        match self {
-            Ident::Nightly(t) => Span::Nightly(t.span()),
-            Ident::Stable(t) => Span::Stable(t.span()),
-        }
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        match (self, span) {
-            (Ident::Nightly(t), Span::Nightly(s)) => t.set_span(s),
-            (Ident::Stable(t), Span::Stable(s)) => t.set_span(s),
-            _ => mismatch(),
-        }
-    }
-
-    fn unwrap_nightly(self) -> proc_macro::Ident {
-        match self {
-            Ident::Nightly(s) => s,
-            Ident::Stable(_) => mismatch(),
-        }
-    }
-}
-
-impl PartialEq for Ident {
-    fn eq(&self, other: &Ident) -> bool {
-        match (self, other) {
-            (Ident::Nightly(t), Ident::Nightly(o)) => t.to_string() == o.to_string(),
-            (Ident::Stable(t), Ident::Stable(o)) => t == o,
-            _ => mismatch(),
-        }
-    }
-}
-
-impl<T> PartialEq<T> for Ident
-where
-    T: ?Sized + AsRef<str>,
-{
-    fn eq(&self, other: &T) -> bool {
-        let other = other.as_ref();
-        match self {
-            Ident::Nightly(t) => t.to_string() == other,
-            Ident::Stable(t) => t == other,
-        }
-    }
-}
-
-impl fmt::Display for Ident {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Ident::Nightly(t) => t.fmt(f),
-            Ident::Stable(t) => t.fmt(f),
-        }
-    }
-}
-
-impl fmt::Debug for Ident {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Ident::Nightly(t) => t.fmt(f),
-            Ident::Stable(t) => t.fmt(f),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum Literal {
-    Nightly(proc_macro::Literal),
-    Stable(stable::Literal),
-}
-
-macro_rules! suffixed_numbers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            if nightly_works() {
-                Literal::Nightly(proc_macro::Literal::$name(n))
-            } else {
-                Literal::Stable(stable::Literal::$name(n))
-            }
-        }
-    )*)
-}
-
-macro_rules! unsuffixed_integers {
-    ($($name:ident => $kind:ident,)*) => ($(
-        pub fn $name(n: $kind) -> Literal {
-            if nightly_works() {
-                Literal::Nightly(proc_macro::Literal::$name(n))
-            } else {
-                Literal::Stable(stable::Literal::$name(n))
-            }
-        }
-    )*)
-}
-
-impl Literal {
-    suffixed_numbers! {
-        u8_suffixed => u8,
-        u16_suffixed => u16,
-        u32_suffixed => u32,
-        u64_suffixed => u64,
-        usize_suffixed => usize,
-        i8_suffixed => i8,
-        i16_suffixed => i16,
-        i32_suffixed => i32,
-        i64_suffixed => i64,
-        isize_suffixed => isize,
-
-        f32_suffixed => f32,
-        f64_suffixed => f64,
-    }
-
-    #[cfg(u128)]
-    suffixed_numbers! {
-        i128_suffixed => i128,
-        u128_suffixed => u128,
-    }
-
-    unsuffixed_integers! {
-        u8_unsuffixed => u8,
-        u16_unsuffixed => u16,
-        u32_unsuffixed => u32,
-        u64_unsuffixed => u64,
-        usize_unsuffixed => usize,
-        i8_unsuffixed => i8,
-        i16_unsuffixed => i16,
-        i32_unsuffixed => i32,
-        i64_unsuffixed => i64,
-        isize_unsuffixed => isize,
-    }
-
-    #[cfg(u128)]
-    unsuffixed_integers! {
-        i128_unsuffixed => i128,
-        u128_unsuffixed => u128,
-    }
-
-    pub fn f32_unsuffixed(f: f32) -> Literal {
-        if nightly_works() {
-            Literal::Nightly(proc_macro::Literal::f32_unsuffixed(f))
-        } else {
-            Literal::Stable(stable::Literal::f32_unsuffixed(f))
-        }
-    }
-
-    pub fn f64_unsuffixed(f: f64) -> Literal {
-        if nightly_works() {
-            Literal::Nightly(proc_macro::Literal::f64_unsuffixed(f))
-        } else {
-            Literal::Stable(stable::Literal::f64_unsuffixed(f))
-        }
-    }
-
-    pub fn string(t: &str) -> Literal {
-        if nightly_works() {
-            Literal::Nightly(proc_macro::Literal::string(t))
-        } else {
-            Literal::Stable(stable::Literal::string(t))
-        }
-    }
-
-    pub fn character(t: char) -> Literal {
-        if nightly_works() {
-            Literal::Nightly(proc_macro::Literal::character(t))
-        } else {
-            Literal::Stable(stable::Literal::character(t))
-        }
-    }
-
-    pub fn byte_string(bytes: &[u8]) -> Literal {
-        if nightly_works() {
-            Literal::Nightly(proc_macro::Literal::byte_string(bytes))
-        } else {
-            Literal::Stable(stable::Literal::byte_string(bytes))
-        }
-    }
-
-    pub fn span(&self) -> Span {
-        match self {
-            Literal::Nightly(lit) => Span::Nightly(lit.span()),
-            Literal::Stable(lit) => Span::Stable(lit.span()),
-        }
-    }
-
-    pub fn set_span(&mut self, span: Span) {
-        match (self, span) {
-            (Literal::Nightly(lit), Span::Nightly(s)) => lit.set_span(s),
-            (Literal::Stable(lit), Span::Stable(s)) => lit.set_span(s),
-            _ => mismatch(),
-        }
-    }
-
-    fn unwrap_nightly(self) -> proc_macro::Literal {
-        match self {
-            Literal::Nightly(s) => s,
-            Literal::Stable(_) => mismatch(),
-        }
-    }
-}
-
-impl From<stable::Literal> for Literal {
-    fn from(s: stable::Literal) -> Literal {
-        Literal::Stable(s)
-    }
-}
-
-impl fmt::Display for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Literal::Nightly(t) => t.fmt(f),
-            Literal::Stable(t) => t.fmt(f),
-        }
-    }
-}
-
-impl fmt::Debug for Literal {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Literal::Nightly(t) => t.fmt(f),
-            Literal::Stable(t) => t.fmt(f),
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/proc-macro2/src/wrapper.rs cargo-0.33.0/vendor/proc-macro2/src/wrapper.rs
--- cargo-0.32.0/vendor/proc-macro2/src/wrapper.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/src/wrapper.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,926 @@
+use std::fmt;
+use std::iter;
+use std::panic::{self, PanicInfo};
+#[cfg(super_unstable)]
+use std::path::PathBuf;
+use std::str::FromStr;
+
+use fallback;
+use proc_macro;
+
+use {Delimiter, Punct, Spacing, TokenTree};
+
+#[derive(Clone)]
+pub enum TokenStream {
+    Compiler(proc_macro::TokenStream),
+    Fallback(fallback::TokenStream),
+}
+
+pub enum LexError {
+    Compiler(proc_macro::LexError),
+    Fallback(fallback::LexError),
+}
+
+fn nightly_works() -> bool {
+    use std::sync::atomic::*;
+    use std::sync::Once;
+
+    static WORKS: AtomicUsize = ATOMIC_USIZE_INIT;
+    static INIT: Once = Once::new();
+
+    match WORKS.load(Ordering::SeqCst) {
+        1 => return false,
+        2 => return true,
+        _ => {}
+    }
+
+    // Swap in a null panic hook to avoid printing "thread panicked" to stderr,
+    // then use catch_unwind to determine whether the compiler's proc_macro is
+    // working. When proc-macro2 is used from outside of a procedural macro all
+    // of the proc_macro crate's APIs currently panic.
+    //
+    // The Once is to prevent the possibility of this ordering:
+    //
+    //     thread 1 calls take_hook, gets the user's original hook
+    //     thread 1 calls set_hook with the null hook
+    //     thread 2 calls take_hook, thinks null hook is the original hook
+    //     thread 2 calls set_hook with the null hook
+    //     thread 1 calls set_hook with the actual original hook
+    //     thread 2 calls set_hook with what it thinks is the original hook
+    //
+    // in which the user's hook has been lost.
+    //
+    // There is still a race condition where a panic in a different thread can
+    // happen during the interval that the user's original panic hook is
+    // unregistered such that their hook is incorrectly not called. This is
+    // sufficiently unlikely and less bad than printing panic messages to stderr
+    // on correct use of this crate. Maybe there is a libstd feature request
+    // here. For now, if a user needs to guarantee that this failure mode does
+    // not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
+    // the main thread before launching any other threads.
+    INIT.call_once(|| {
+        type PanicHook = Fn(&PanicInfo) + Sync + Send + 'static;
+
+        let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
+        let sanity_check = &*null_hook as *const PanicHook;
+        let original_hook = panic::take_hook();
+        panic::set_hook(null_hook);
+
+        let works = panic::catch_unwind(|| proc_macro::Span::call_site()).is_ok();
+        WORKS.store(works as usize + 1, Ordering::SeqCst);
+
+        let hopefully_null_hook = panic::take_hook();
+        panic::set_hook(original_hook);
+        if sanity_check != &*hopefully_null_hook {
+            panic!("observed race condition in proc_macro2::nightly_works");
+        }
+    });
+    nightly_works()
+}
+
+fn mismatch() -> ! {
+    panic!("stable/nightly mismatch")
+}
+
+impl TokenStream {
+    pub fn new() -> TokenStream {
+        if nightly_works() {
+            TokenStream::Compiler(proc_macro::TokenStream::new())
+        } else {
+            TokenStream::Fallback(fallback::TokenStream::new())
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        match self {
+            TokenStream::Compiler(tts) => tts.is_empty(),
+            TokenStream::Fallback(tts) => tts.is_empty(),
+        }
+    }
+
+    fn unwrap_nightly(self) -> proc_macro::TokenStream {
+        match self {
+            TokenStream::Compiler(s) => s,
+            TokenStream::Fallback(_) => mismatch(),
+        }
+    }
+
+    fn unwrap_stable(self) -> fallback::TokenStream {
+        match self {
+            TokenStream::Compiler(_) => mismatch(),
+            TokenStream::Fallback(s) => s,
+        }
+    }
+}
+
+impl FromStr for TokenStream {
+    type Err = LexError;
+
+    fn from_str(src: &str) -> Result<TokenStream, LexError> {
+        if nightly_works() {
+            Ok(TokenStream::Compiler(src.parse()?))
+        } else {
+            Ok(TokenStream::Fallback(src.parse()?))
+        }
+    }
+}
+
+impl fmt::Display for TokenStream {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            TokenStream::Compiler(tts) => tts.fmt(f),
+            TokenStream::Fallback(tts) => tts.fmt(f),
+        }
+    }
+}
+
+impl From<proc_macro::TokenStream> for TokenStream {
+    fn from(inner: proc_macro::TokenStream) -> TokenStream {
+        TokenStream::Compiler(inner)
+    }
+}
+
+impl From<TokenStream> for proc_macro::TokenStream {
+    fn from(inner: TokenStream) -> proc_macro::TokenStream {
+        match inner {
+            TokenStream::Compiler(inner) => inner,
+            TokenStream::Fallback(inner) => inner.to_string().parse().unwrap(),
+        }
+    }
+}
+
+impl From<fallback::TokenStream> for TokenStream {
+    fn from(inner: fallback::TokenStream) -> TokenStream {
+        TokenStream::Fallback(inner)
+    }
+}
+
+impl From<TokenTree> for TokenStream {
+    fn from(token: TokenTree) -> TokenStream {
+        if !nightly_works() {
+            return TokenStream::Fallback(token.into());
+        }
+        let tt: proc_macro::TokenTree = match token {
+            TokenTree::Group(tt) => tt.inner.unwrap_nightly().into(),
+            TokenTree::Punct(tt) => {
+                let spacing = match tt.spacing() {
+                    Spacing::Joint => proc_macro::Spacing::Joint,
+                    Spacing::Alone => proc_macro::Spacing::Alone,
+                };
+                let mut op = proc_macro::Punct::new(tt.as_char(), spacing);
+                op.set_span(tt.span().inner.unwrap_nightly());
+                op.into()
+            }
+            TokenTree::Ident(tt) => tt.inner.unwrap_nightly().into(),
+            TokenTree::Literal(tt) => tt.inner.unwrap_nightly().into(),
+        };
+        TokenStream::Compiler(tt.into())
+    }
+}
+
+impl iter::FromIterator<TokenTree> for TokenStream {
+    fn from_iter<I: IntoIterator<Item = TokenTree>>(trees: I) -> Self {
+        if nightly_works() {
+            let trees = trees
+                .into_iter()
+                .map(TokenStream::from)
+                .flat_map(|t| match t {
+                    TokenStream::Compiler(s) => s,
+                    TokenStream::Fallback(_) => mismatch(),
+                });
+            TokenStream::Compiler(trees.collect())
+        } else {
+            TokenStream::Fallback(trees.into_iter().collect())
+        }
+    }
+}
+
+impl iter::FromIterator<TokenStream> for TokenStream {
+    fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
+        let mut streams = streams.into_iter();
+        match streams.next() {
+            #[cfg(slow_extend)]
+            Some(TokenStream::Compiler(first)) => {
+                let stream = iter::once(first)
+                    .chain(streams.map(|s| match s {
+                        TokenStream::Compiler(s) => s,
+                        TokenStream::Fallback(_) => mismatch(),
+                    }))
+                    .collect();
+                TokenStream::Compiler(stream)
+            }
+            #[cfg(not(slow_extend))]
+            Some(TokenStream::Compiler(mut first)) => {
+                first.extend(streams.map(|s| match s {
+                    TokenStream::Compiler(s) => s,
+                    TokenStream::Fallback(_) => mismatch(),
+                }));
+                TokenStream::Compiler(first)
+            }
+            Some(TokenStream::Fallback(mut first)) => {
+                first.extend(streams.map(|s| match s {
+                    TokenStream::Fallback(s) => s,
+                    TokenStream::Compiler(_) => mismatch(),
+                }));
+                TokenStream::Fallback(first)
+            }
+            None => TokenStream::new(),
+        }
+    }
+}
+
+impl Extend<TokenTree> for TokenStream {
+    fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
+        match self {
+            TokenStream::Compiler(tts) => {
+                #[cfg(not(slow_extend))]
+                {
+                    tts.extend(
+                        streams
+                            .into_iter()
+                            .map(|t| TokenStream::from(t).unwrap_nightly()),
+                    );
+                }
+                #[cfg(slow_extend)]
+                {
+                    *tts =
+                        tts.clone()
+                            .into_iter()
+                            .chain(streams.into_iter().map(TokenStream::from).flat_map(
+                                |t| match t {
+                                    TokenStream::Compiler(tts) => tts.into_iter(),
+                                    _ => mismatch(),
+                                },
+                            ))
+                            .collect();
+                }
+            }
+            TokenStream::Fallback(tts) => tts.extend(streams),
+        }
+    }
+}
+
+impl Extend<TokenStream> for TokenStream {
+    fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
+        match self {
+            TokenStream::Compiler(tts) => {
+                #[cfg(not(slow_extend))]
+                {
+                    tts.extend(streams.into_iter().map(|stream| stream.unwrap_nightly()));
+                }
+                #[cfg(slow_extend)]
+                {
+                    *tts = tts
+                        .clone()
+                        .into_iter()
+                        .chain(streams.into_iter().flat_map(|t| match t {
+                            TokenStream::Compiler(tts) => tts.into_iter(),
+                            _ => mismatch(),
+                        }))
+                        .collect();
+                }
+            }
+            TokenStream::Fallback(tts) => {
+                tts.extend(streams.into_iter().map(|stream| stream.unwrap_stable()))
+            }
+        }
+    }
+}
+
+impl fmt::Debug for TokenStream {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            TokenStream::Compiler(tts) => tts.fmt(f),
+            TokenStream::Fallback(tts) => tts.fmt(f),
+        }
+    }
+}
+
+impl From<proc_macro::LexError> for LexError {
+    fn from(e: proc_macro::LexError) -> LexError {
+        LexError::Compiler(e)
+    }
+}
+
+impl From<fallback::LexError> for LexError {
+    fn from(e: fallback::LexError) -> LexError {
+        LexError::Fallback(e)
+    }
+}
+
+impl fmt::Debug for LexError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            LexError::Compiler(e) => e.fmt(f),
+            LexError::Fallback(e) => e.fmt(f),
+        }
+    }
+}
+
+pub enum TokenTreeIter {
+    Compiler(proc_macro::token_stream::IntoIter),
+    Fallback(fallback::TokenTreeIter),
+}
+
+impl IntoIterator for TokenStream {
+    type Item = TokenTree;
+    type IntoIter = TokenTreeIter;
+
+    fn into_iter(self) -> TokenTreeIter {
+        match self {
+            TokenStream::Compiler(tts) => TokenTreeIter::Compiler(tts.into_iter()),
+            TokenStream::Fallback(tts) => TokenTreeIter::Fallback(tts.into_iter()),
+        }
+    }
+}
+
+impl Iterator for TokenTreeIter {
+    type Item = TokenTree;
+
+    fn next(&mut self) -> Option<TokenTree> {
+        let token = match self {
+            TokenTreeIter::Compiler(iter) => iter.next()?,
+            TokenTreeIter::Fallback(iter) => return iter.next(),
+        };
+        Some(match token {
+            proc_macro::TokenTree::Group(tt) => ::Group::_new(Group::Compiler(tt)).into(),
+            proc_macro::TokenTree::Punct(tt) => {
+                let spacing = match tt.spacing() {
+                    proc_macro::Spacing::Joint => Spacing::Joint,
+                    proc_macro::Spacing::Alone => Spacing::Alone,
+                };
+                let mut o = Punct::new(tt.as_char(), spacing);
+                o.set_span(::Span::_new(Span::Compiler(tt.span())));
+                o.into()
+            }
+            proc_macro::TokenTree::Ident(s) => ::Ident::_new(Ident::Compiler(s)).into(),
+            proc_macro::TokenTree::Literal(l) => ::Literal::_new(Literal::Compiler(l)).into(),
+        })
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self {
+            TokenTreeIter::Compiler(tts) => tts.size_hint(),
+            TokenTreeIter::Fallback(tts) => tts.size_hint(),
+        }
+    }
+}
+
+impl fmt::Debug for TokenTreeIter {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("TokenTreeIter").finish()
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+#[cfg(super_unstable)]
+pub enum SourceFile {
+    Compiler(proc_macro::SourceFile),
+    Fallback(fallback::SourceFile),
+}
+
+#[cfg(super_unstable)]
+impl SourceFile {
+    fn nightly(sf: proc_macro::SourceFile) -> Self {
+        SourceFile::Compiler(sf)
+    }
+
+    /// Get the path to this source file as a string.
+    pub fn path(&self) -> PathBuf {
+        match self {
+            SourceFile::Compiler(a) => a.path(),
+            SourceFile::Fallback(a) => a.path(),
+        }
+    }
+
+    pub fn is_real(&self) -> bool {
+        match self {
+            SourceFile::Compiler(a) => a.is_real(),
+            SourceFile::Fallback(a) => a.is_real(),
+        }
+    }
+}
+
+#[cfg(super_unstable)]
+impl fmt::Debug for SourceFile {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            SourceFile::Compiler(a) => a.fmt(f),
+            SourceFile::Fallback(a) => a.fmt(f),
+        }
+    }
+}
+
+#[cfg(any(super_unstable, feature = "span-locations"))]
+pub struct LineColumn {
+    pub line: usize,
+    pub column: usize,
+}
+
+#[derive(Copy, Clone)]
+pub enum Span {
+    Compiler(proc_macro::Span),
+    Fallback(fallback::Span),
+}
+
+impl Span {
+    pub fn call_site() -> Span {
+        if nightly_works() {
+            Span::Compiler(proc_macro::Span::call_site())
+        } else {
+            Span::Fallback(fallback::Span::call_site())
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn def_site() -> Span {
+        if nightly_works() {
+            Span::Compiler(proc_macro::Span::def_site())
+        } else {
+            Span::Fallback(fallback::Span::def_site())
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn resolved_at(&self, other: Span) -> Span {
+        match (self, other) {
+            (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.resolved_at(b)),
+            (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.resolved_at(b)),
+            _ => mismatch(),
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn located_at(&self, other: Span) -> Span {
+        match (self, other) {
+            (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.located_at(b)),
+            (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.located_at(b)),
+            _ => mismatch(),
+        }
+    }
+
+    pub fn unwrap(self) -> proc_macro::Span {
+        match self {
+            Span::Compiler(s) => s,
+            Span::Fallback(_) => panic!("proc_macro::Span is only available in procedural macros"),
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn source_file(&self) -> SourceFile {
+        match self {
+            Span::Compiler(s) => SourceFile::nightly(s.source_file()),
+            Span::Fallback(s) => SourceFile::Fallback(s.source_file()),
+        }
+    }
+
+    #[cfg(any(super_unstable, feature = "span-locations"))]
+    pub fn start(&self) -> LineColumn {
+        match self {
+            #[cfg(nightly)]
+            Span::Compiler(s) => {
+                let proc_macro::LineColumn { line, column } = s.start();
+                LineColumn { line, column }
+            }
+            #[cfg(not(nightly))]
+            Span::Compiler(_) => LineColumn { line: 0, column: 0 },
+            Span::Fallback(s) => {
+                let fallback::LineColumn { line, column } = s.start();
+                LineColumn { line, column }
+            }
+        }
+    }
+
+    #[cfg(any(super_unstable, feature = "span-locations"))]
+    pub fn end(&self) -> LineColumn {
+        match self {
+            #[cfg(nightly)]
+            Span::Compiler(s) => {
+                let proc_macro::LineColumn { line, column } = s.end();
+                LineColumn { line, column }
+            }
+            #[cfg(not(nightly))]
+            Span::Compiler(_) => LineColumn { line: 0, column: 0 },
+            Span::Fallback(s) => {
+                let fallback::LineColumn { line, column } = s.end();
+                LineColumn { line, column }
+            }
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn join(&self, other: Span) -> Option<Span> {
+        let ret = match (self, other) {
+            (Span::Compiler(a), Span::Compiler(b)) => Span::Compiler(a.join(b)?),
+            (Span::Fallback(a), Span::Fallback(b)) => Span::Fallback(a.join(b)?),
+            _ => return None,
+        };
+        Some(ret)
+    }
+
+    #[cfg(super_unstable)]
+    pub fn eq(&self, other: &Span) -> bool {
+        match (self, other) {
+            (Span::Compiler(a), Span::Compiler(b)) => a.eq(b),
+            (Span::Fallback(a), Span::Fallback(b)) => a.eq(b),
+            _ => false,
+        }
+    }
+
+    fn unwrap_nightly(self) -> proc_macro::Span {
+        match self {
+            Span::Compiler(s) => s,
+            Span::Fallback(_) => mismatch(),
+        }
+    }
+}
+
+impl From<proc_macro::Span> for ::Span {
+    fn from(proc_span: proc_macro::Span) -> ::Span {
+        ::Span::_new(Span::Compiler(proc_span))
+    }
+}
+
+impl From<fallback::Span> for Span {
+    fn from(inner: fallback::Span) -> Span {
+        Span::Fallback(inner)
+    }
+}
+
+impl fmt::Debug for Span {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Span::Compiler(s) => s.fmt(f),
+            Span::Fallback(s) => s.fmt(f),
+        }
+    }
+}
+
+pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span) {
+    match span {
+        Span::Compiler(s) => {
+            debug.field("span", &s);
+        }
+        Span::Fallback(s) => fallback::debug_span_field_if_nontrivial(debug, s),
+    }
+}
+
+#[derive(Clone)]
+pub enum Group {
+    Compiler(proc_macro::Group),
+    Fallback(fallback::Group),
+}
+
+impl Group {
+    pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
+        match stream {
+            TokenStream::Compiler(stream) => {
+                let delimiter = match delimiter {
+                    Delimiter::Parenthesis => proc_macro::Delimiter::Parenthesis,
+                    Delimiter::Bracket => proc_macro::Delimiter::Bracket,
+                    Delimiter::Brace => proc_macro::Delimiter::Brace,
+                    Delimiter::None => proc_macro::Delimiter::None,
+                };
+                Group::Compiler(proc_macro::Group::new(delimiter, stream))
+            }
+            TokenStream::Fallback(stream) => {
+                Group::Fallback(fallback::Group::new(delimiter, stream))
+            }
+        }
+    }
+
+    pub fn delimiter(&self) -> Delimiter {
+        match self {
+            Group::Compiler(g) => match g.delimiter() {
+                proc_macro::Delimiter::Parenthesis => Delimiter::Parenthesis,
+                proc_macro::Delimiter::Bracket => Delimiter::Bracket,
+                proc_macro::Delimiter::Brace => Delimiter::Brace,
+                proc_macro::Delimiter::None => Delimiter::None,
+            },
+            Group::Fallback(g) => g.delimiter(),
+        }
+    }
+
+    pub fn stream(&self) -> TokenStream {
+        match self {
+            Group::Compiler(g) => TokenStream::Compiler(g.stream()),
+            Group::Fallback(g) => TokenStream::Fallback(g.stream()),
+        }
+    }
+
+    pub fn span(&self) -> Span {
+        match self {
+            Group::Compiler(g) => Span::Compiler(g.span()),
+            Group::Fallback(g) => Span::Fallback(g.span()),
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn span_open(&self) -> Span {
+        match self {
+            Group::Compiler(g) => Span::Compiler(g.span_open()),
+            Group::Fallback(g) => Span::Fallback(g.span_open()),
+        }
+    }
+
+    #[cfg(super_unstable)]
+    pub fn span_close(&self) -> Span {
+        match self {
+            Group::Compiler(g) => Span::Compiler(g.span_close()),
+            Group::Fallback(g) => Span::Fallback(g.span_close()),
+        }
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        match (self, span) {
+            (Group::Compiler(g), Span::Compiler(s)) => g.set_span(s),
+            (Group::Fallback(g), Span::Fallback(s)) => g.set_span(s),
+            _ => mismatch(),
+        }
+    }
+
+    fn unwrap_nightly(self) -> proc_macro::Group {
+        match self {
+            Group::Compiler(g) => g,
+            Group::Fallback(_) => mismatch(),
+        }
+    }
+}
+
+impl From<fallback::Group> for Group {
+    fn from(g: fallback::Group) -> Self {
+        Group::Fallback(g)
+    }
+}
+
+impl fmt::Display for Group {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Group::Compiler(group) => group.fmt(formatter),
+            Group::Fallback(group) => group.fmt(formatter),
+        }
+    }
+}
+
+impl fmt::Debug for Group {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Group::Compiler(group) => group.fmt(formatter),
+            Group::Fallback(group) => group.fmt(formatter),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub enum Ident {
+    Compiler(proc_macro::Ident),
+    Fallback(fallback::Ident),
+}
+
+impl Ident {
+    pub fn new(string: &str, span: Span) -> Ident {
+        match span {
+            Span::Compiler(s) => Ident::Compiler(proc_macro::Ident::new(string, s)),
+            Span::Fallback(s) => Ident::Fallback(fallback::Ident::new(string, s)),
+        }
+    }
+
+    pub fn new_raw(string: &str, span: Span) -> Ident {
+        match span {
+            Span::Compiler(s) => {
+                let p: proc_macro::TokenStream = string.parse().unwrap();
+                let ident = match p.into_iter().next() {
+                    Some(proc_macro::TokenTree::Ident(mut i)) => {
+                        i.set_span(s);
+                        i
+                    }
+                    _ => panic!(),
+                };
+                Ident::Compiler(ident)
+            }
+            Span::Fallback(s) => Ident::Fallback(fallback::Ident::new_raw(string, s)),
+        }
+    }
+
+    pub fn span(&self) -> Span {
+        match self {
+            Ident::Compiler(t) => Span::Compiler(t.span()),
+            Ident::Fallback(t) => Span::Fallback(t.span()),
+        }
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        match (self, span) {
+            (Ident::Compiler(t), Span::Compiler(s)) => t.set_span(s),
+            (Ident::Fallback(t), Span::Fallback(s)) => t.set_span(s),
+            _ => mismatch(),
+        }
+    }
+
+    fn unwrap_nightly(self) -> proc_macro::Ident {
+        match self {
+            Ident::Compiler(s) => s,
+            Ident::Fallback(_) => mismatch(),
+        }
+    }
+}
+
+impl PartialEq for Ident {
+    fn eq(&self, other: &Ident) -> bool {
+        match (self, other) {
+            (Ident::Compiler(t), Ident::Compiler(o)) => t.to_string() == o.to_string(),
+            (Ident::Fallback(t), Ident::Fallback(o)) => t == o,
+            _ => mismatch(),
+        }
+    }
+}
+
+impl<T> PartialEq<T> for Ident
+where
+    T: ?Sized + AsRef<str>,
+{
+    fn eq(&self, other: &T) -> bool {
+        let other = other.as_ref();
+        match self {
+            Ident::Compiler(t) => t.to_string() == other,
+            Ident::Fallback(t) => t == other,
+        }
+    }
+}
+
+impl fmt::Display for Ident {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Ident::Compiler(t) => t.fmt(f),
+            Ident::Fallback(t) => t.fmt(f),
+        }
+    }
+}
+
+impl fmt::Debug for Ident {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Ident::Compiler(t) => t.fmt(f),
+            Ident::Fallback(t) => t.fmt(f),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub enum Literal {
+    Compiler(proc_macro::Literal),
+    Fallback(fallback::Literal),
+}
+
+macro_rules! suffixed_numbers {
+    ($($name:ident => $kind:ident,)*) => ($(
+        pub fn $name(n: $kind) -> Literal {
+            if nightly_works() {
+                Literal::Compiler(proc_macro::Literal::$name(n))
+            } else {
+                Literal::Fallback(fallback::Literal::$name(n))
+            }
+        }
+    )*)
+}
+
+macro_rules! unsuffixed_integers {
+    ($($name:ident => $kind:ident,)*) => ($(
+        pub fn $name(n: $kind) -> Literal {
+            if nightly_works() {
+                Literal::Compiler(proc_macro::Literal::$name(n))
+            } else {
+                Literal::Fallback(fallback::Literal::$name(n))
+            }
+        }
+    )*)
+}
+
+impl Literal {
+    suffixed_numbers! {
+        u8_suffixed => u8,
+        u16_suffixed => u16,
+        u32_suffixed => u32,
+        u64_suffixed => u64,
+        usize_suffixed => usize,
+        i8_suffixed => i8,
+        i16_suffixed => i16,
+        i32_suffixed => i32,
+        i64_suffixed => i64,
+        isize_suffixed => isize,
+
+        f32_suffixed => f32,
+        f64_suffixed => f64,
+    }
+
+    #[cfg(u128)]
+    suffixed_numbers! {
+        i128_suffixed => i128,
+        u128_suffixed => u128,
+    }
+
+    unsuffixed_integers! {
+        u8_unsuffixed => u8,
+        u16_unsuffixed => u16,
+        u32_unsuffixed => u32,
+        u64_unsuffixed => u64,
+        usize_unsuffixed => usize,
+        i8_unsuffixed => i8,
+        i16_unsuffixed => i16,
+        i32_unsuffixed => i32,
+        i64_unsuffixed => i64,
+        isize_unsuffixed => isize,
+    }
+
+    #[cfg(u128)]
+    unsuffixed_integers! {
+        i128_unsuffixed => i128,
+        u128_unsuffixed => u128,
+    }
+
+    pub fn f32_unsuffixed(f: f32) -> Literal {
+        if nightly_works() {
+            Literal::Compiler(proc_macro::Literal::f32_unsuffixed(f))
+        } else {
+            Literal::Fallback(fallback::Literal::f32_unsuffixed(f))
+        }
+    }
+
+    pub fn f64_unsuffixed(f: f64) -> Literal {
+        if nightly_works() {
+            Literal::Compiler(proc_macro::Literal::f64_unsuffixed(f))
+        } else {
+            Literal::Fallback(fallback::Literal::f64_unsuffixed(f))
+        }
+    }
+
+    pub fn string(t: &str) -> Literal {
+        if nightly_works() {
+            Literal::Compiler(proc_macro::Literal::string(t))
+        } else {
+            Literal::Fallback(fallback::Literal::string(t))
+        }
+    }
+
+    pub fn character(t: char) -> Literal {
+        if nightly_works() {
+            Literal::Compiler(proc_macro::Literal::character(t))
+        } else {
+            Literal::Fallback(fallback::Literal::character(t))
+        }
+    }
+
+    pub fn byte_string(bytes: &[u8]) -> Literal {
+        if nightly_works() {
+            Literal::Compiler(proc_macro::Literal::byte_string(bytes))
+        } else {
+            Literal::Fallback(fallback::Literal::byte_string(bytes))
+        }
+    }
+
+    pub fn span(&self) -> Span {
+        match self {
+            Literal::Compiler(lit) => Span::Compiler(lit.span()),
+            Literal::Fallback(lit) => Span::Fallback(lit.span()),
+        }
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        match (self, span) {
+            (Literal::Compiler(lit), Span::Compiler(s)) => lit.set_span(s),
+            (Literal::Fallback(lit), Span::Fallback(s)) => lit.set_span(s),
+            _ => mismatch(),
+        }
+    }
+
+    fn unwrap_nightly(self) -> proc_macro::Literal {
+        match self {
+            Literal::Compiler(s) => s,
+            Literal::Fallback(_) => mismatch(),
+        }
+    }
+}
+
+impl From<fallback::Literal> for Literal {
+    fn from(s: fallback::Literal) -> Literal {
+        Literal::Fallback(s)
+    }
+}
+
+impl fmt::Display for Literal {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Literal::Compiler(t) => t.fmt(f),
+            Literal::Fallback(t) => t.fmt(f),
+        }
+    }
+}
+
+impl fmt::Debug for Literal {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Literal::Compiler(t) => t.fmt(f),
+            Literal::Fallback(t) => t.fmt(f),
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/proc-macro2/tests/test.rs cargo-0.33.0/vendor/proc-macro2/tests/test.rs
--- cargo-0.32.0/vendor/proc-macro2/tests/test.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/tests/test.rs	2019-02-06 04:11:58.000000000 +0000
@@ -137,7 +137,7 @@
     fail("r#_");
 }
 
-#[cfg(procmacro2_semver_exempt)]
+#[cfg(span_locations)]
 #[test]
 fn span_test() {
     use proc_macro2::TokenTree;
@@ -193,7 +193,7 @@
 }
 
 #[cfg(procmacro2_semver_exempt)]
-#[cfg(not(feature = "nightly"))]
+#[cfg(not(nightly))]
 #[test]
 fn default_span() {
     let start = Span::call_site().start();
@@ -329,7 +329,6 @@
 }
 
 #[test]
-#[cfg(not(feature = "nightly"))]
 fn test_debug_tokenstream() {
     let tts = TokenStream::from_str("[a + 1]").unwrap();
 
diff -Nru cargo-0.32.0/vendor/proc-macro2/.travis.yml cargo-0.33.0/vendor/proc-macro2/.travis.yml
--- cargo-0.32.0/vendor/proc-macro2/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proc-macro2/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: 1.15.0 # oldest supported version
-      script: cargo build
-    - rust: 1.19.0 # first release with the --tests flag
-      script: cargo test --tests
-    - rust: 1.26.0 # first release on which our doc tests pass
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-      install: rustup target add wasm32-unknown-unknown
-      script: cargo test --target wasm32-unknown-unknown --no-run
-    - rust: nightly
-      script:
-        - cargo test
-        - cargo test --features nightly
-        - cargo test --no-default-features
-        - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo test
-        - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo test --features nightly
-        - cargo update -Z minimal-versions && cargo build
-
-before_script:
-  - set -o errexit
-
-script:
-  - cargo test
-  - RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo test
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/proptest/.travis.yml cargo-0.33.0/vendor/proptest/.travis.yml
--- cargo-0.32.0/vendor/proptest/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/proptest/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-language: rust
-sudo: false
-dist: trusty
-rust:
-- 1.27.0
-- stable
-- beta
-- nightly
-
-# Install travis-cargo which sets `--feature unstable` for nightly builds automatically
-before_script:
-  - |
-      pip install 'travis-cargo<0.2' --user &&
-      export PATH=$HOME/.local/bin:$PATH
-
-script:
-  - |
-      travis-cargo build &&
-      travis-cargo test &&
-      travis-cargo --only stable build -- --no-default-features --features fork &&
-      travis-cargo --only stable build -- --lib --no-default-features --features std &&
-      travis-cargo --only nightly build -- --no-default-features --features "alloc nightly unstable" &&
-      (cd test-persistence-location && ./run-tests.sh)
-
-cache: cargo
diff -Nru cargo-0.32.0/vendor/quick-error/.travis.yml cargo-0.33.0/vendor/quick-error/.travis.yml
--- cargo-0.32.0/vendor/quick-error/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quick-error/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-sudo: false
-dist: trusty
-language: rust
-
-cache:
-- cargo
-
-before_cache:
-- rm -r $TRAVIS_BUILD_DIR/target/debug
-
-jobs:
-  include:
-  - os: linux
-    rust: stable
-  - os: linux
-    rust: beta
-  - os: linux
-    rust: nightly
-
-  # deploy
-  - stage: publish
-    os: linux
-    rust: stable
-    env:
-    # CARGO_TOKEN
-    - secure: "tYrt4NUyp3jgpIO6k5zqBoSDO7e6j79IS0jRgAgeoAxfM6V36kU+xLM266mXeiXhYK/p4MjtjAnF7VmQwQklnkOXibTNnwRMkJLodl9WGTK9UxLrGEC7ZUS6QywvhOQEu2ZbAsYESw5+o3vLHZouxm1JfSSSoG/IfqiEIAvqlCmP2gync1nZ+gWSjPuEkUDAIlkCKc6yUvFA+qexuCnITTyKOjdBrnBIX9yZ5tPPZa/RAd/GqQwTf3oXhqZraxP6MwxFFjDNQz4dt+64Ew9odtXjgf0StoqOzb5FzWalbQN/hfvfRfAEs7C1Y6s3N+xMLPCmKTML0AmmGLj52KzVtf5TbxAonC/i8oRb+Yv6l+TloZEJnfn1VTozVQFt2FBabPeKN0NA3Rn3V1YF50sf9RzLD9R8Oksk1C3SuKIRWuUK6r98HXMT4Hu7SAk1T88O9btiiehspUfOhvaoRxeTuXsxoezTwKoKh2T/m989z6w+hPDS1LedULxQQjztxBp7EAVUGnBNxSNFX3SUuReFDY3AVFdPOLomi9XEAKv4i3yDmQJFZ7J9XQXITnWgtKdpfqFW7HlhyPlpLLRxWxfCrK7bP5LmHzWss7fR5zDd5FXUbHLre15DXXLbdPp8FTFEWoDV0p/EIIqUIUamlI1Ny1zQCD0PxhXLUuD+I+WzKpg="
-    install: true
-    script: true
-
-    deploy:
-    - provider: script
-      script: 'cargo publish --verbose --token=$CARGO_TOKEN'
-      on:
-        tags: true
diff -Nru cargo-0.32.0/vendor/quote/.cargo-checksum.json cargo-0.33.0/vendor/quote/.cargo-checksum.json
--- cargo-0.32.0/vendor/quote/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"}
\ No newline at end of file
+{"files":{},"package":"cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/quote/Cargo.toml cargo-0.33.0/vendor/quote/Cargo.toml
--- cargo-0.32.0/vendor/quote/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "quote"
-version = "0.6.10"
+version = "0.6.11"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 include = ["Cargo.toml", "src/**/*.rs", "tests/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "Quasi-quoting macro quote!(...)"
diff -Nru cargo-0.32.0/vendor/quote/.cargo_vcs_info.json cargo-0.33.0/vendor/quote/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/quote/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "44038ca42c212a5e10d22d8efa3d218d0dd2a743"
-  }
-}
diff -Nru cargo-0.32.0/vendor/quote/README.md cargo-0.33.0/vendor/quote/README.md
--- cargo-0.32.0/vendor/quote/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -38,18 +38,11 @@
 quote = "0.6"
 ```
 
-```rust
-#[macro_use]
-extern crate quote;
-```
-
 ## Syntax
 
 The quote crate provides a [`quote!`] macro within which you can write Rust code
 that gets packaged into a [`TokenStream`] and can be treated as data. You should
-think of `TokenStream` as representing a fragment of Rust source code. This type
-can be returned directly back to the compiler by a procedural macro to get
-compiled into the caller's crate.
+think of `TokenStream` as representing a fragment of Rust source code.
 
 [`TokenStream`]: https://docs.rs/proc-macro2/0.4/proc_macro2/struct.TokenStream.html
 
@@ -64,7 +57,7 @@
 let tokens = quote! {
     struct SerializeWith #generics #where_clause {
         value: &'a #field_ty,
-        phantom: ::std::marker::PhantomData<#item_ty>,
+        phantom: core::marker::PhantomData<#item_ty>,
     }
 
     impl #generics serde::Serialize for SerializeWith #generics #where_clause {
@@ -78,7 +71,7 @@
 
     SerializeWith {
         value: #value,
-        phantom: ::std::marker::PhantomData::<#item_ty>,
+        phantom: core::marker::PhantomData::<#item_ty>,
     }
 };
 ```
@@ -100,6 +93,107 @@
 does not produce a trailing comma. This matches the behavior of delimiters in
 `macro_rules!`.
 
+## Returning tokens to the compiler
+
+The `quote!` macro evaluates to an expression of type
+`proc_macro2::TokenStream`. Meanwhile Rust procedural macros are expected to
+return the type `proc_macro::TokenStream`.
+
+The difference between the two types is that `proc_macro` types are entirely
+specific to procedural macros and cannot ever exist in code outside of a
+procedural macro, while `proc_macro2` types may exist anywhere including tests
+and non-macro code like main.rs and build.rs. This is why even the procedural
+macro ecosystem is largely built around `proc_macro2`, because that ensures the
+libraries are unit testable and accessible in non-macro contexts.
+
+There is a [`From`]-conversion in both directions so returning the output of
+`quote!` from a procedural macro usually looks like `tokens.into()` or
+`proc_macro::TokenStream::from(tokens)`.
+
+[`From`]: https://doc.rust-lang.org/std/convert/trait.From.html
+
+## Examples
+
+### Combining quoted fragments
+
+Usually you don't end up constructing an entire final `TokenStream` in one
+piece. Different parts may come from different helper functions. The tokens
+produced by `quote!` themselves implement `ToTokens` and so can be interpolated
+into later `quote!` invocations to build up a final result.
+
+```rust
+let type_definition = quote! {...};
+let methods = quote! {...};
+
+let tokens = quote! {
+    #type_definition
+    #methods
+};
+```
+
+### Constructing identifiers
+
+Suppose we have an identifier `ident` which came from somewhere in a macro
+input and we need to modify it in some way for the macro output. Let's consider
+prepending the identifier with an underscore.
+
+Simply interpolating the identifier next to an underscore will not have the
+behavior of concatenating them. The underscore and the identifier will continue
+to be two separate tokens as if you had written `_ x`.
+
+```rust
+// incorrect
+quote! {
+    let mut _#ident = 0;
+}
+```
+
+The solution is to perform token-level manipulations using the APIs provided by
+Syn and proc-macro2.
+
+```rust
+let concatenated = format!("_{}", ident);
+let varname = syn::Ident::new(&concatenated, ident.span());
+quote! {
+    let mut #varname = 0;
+}
+```
+
+### Making method calls
+
+Let's say our macro requires some type specified in the macro input to have a
+constructor called `new`. We have the type in a variable called `field_type` of
+type `syn::Type` and want to invoke the constructor.
+
+```rust
+// incorrect
+quote! {
+    let value = #field_type::new();
+}
+```
+
+This works only sometimes. If `field_type` is `String`, the expanded code
+contains `String::new()` which is fine. But if `field_type` is something like
+`Vec<i32>` then the expanded code is `Vec<i32>::new()` which is invalid syntax.
+Ordinarily in handwritten Rust we would write `Vec::<i32>::new()` but for macros
+often the following is more convenient.
+
+```rust
+quote! {
+    let value = <#field_type>::new();
+}
+```
+
+This expands to `<Vec<i32>>::new()` which behaves correctly.
+
+A similar pattern is appropriate for trait methods.
+
+```rust
+quote! {
+    let value = <#field_type as core::default::Default>::default();
+}
+```
+
 ## Hygiene
 
 Any interpolated tokens preserve the `Span` information provided by their
diff -Nru cargo-0.32.0/vendor/quote/src/ext.rs cargo-0.33.0/vendor/quote/src/ext.rs
--- cargo-0.32.0/vendor/quote/src/ext.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/src/ext.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,21 +8,49 @@
 ///
 /// This trait is sealed and cannot be implemented outside of the `quote` crate.
 pub trait TokenStreamExt: private::Sealed {
+    /// For use by `ToTokens` implementations.
+    ///
+    /// Appends the token specified to this list of tokens.
     fn append<U>(&mut self, token: U)
     where
         U: Into<TokenTree>;
 
+    /// For use by `ToTokens` implementations.
+    ///
+    /// ```edition2018
+    /// # use quote::{quote, TokenStreamExt, ToTokens};
+    /// # use proc_macro2::TokenStream;
+    /// #
+    /// struct X;
+    ///
+    /// impl ToTokens for X {
+    ///     fn to_tokens(&self, tokens: &mut TokenStream) {
+    ///         tokens.append_all(&[true, false]);
+    ///     }
+    /// }
+    ///
+    /// let tokens = quote!(#X);
+    /// assert_eq!(tokens.to_string(), "true false");
+    /// ```
     fn append_all<T, I>(&mut self, iter: I)
     where
         T: ToTokens,
         I: IntoIterator<Item = T>;
 
+    /// For use by `ToTokens` implementations.
+    ///
+    /// Appends all of the items in the iterator `I`, separated by the tokens
+    /// `U`.
     fn append_separated<T, I, U>(&mut self, iter: I, op: U)
     where
         T: ToTokens,
         I: IntoIterator<Item = T>,
         U: ToTokens;
 
+    /// For use by `ToTokens` implementations.
+    ///
+    /// Appends all tokens in the iterator `I`, appending `U` after each
+    /// element, including after the last element of the iterator.
     fn append_terminated<T, I, U>(&mut self, iter: I, term: U)
     where
         T: ToTokens,
@@ -31,9 +59,6 @@
 }
 
 impl TokenStreamExt for TokenStream {
-    /// For use by `ToTokens` implementations.
-    ///
-    /// Appends the token specified to this list of tokens.
     fn append<U>(&mut self, token: U)
     where
         U: Into<TokenTree>,
@@ -41,26 +66,6 @@
         self.extend(iter::once(token.into()));
     }
 
-    /// For use by `ToTokens` implementations.
-    ///
-    /// ```
-    /// # #[macro_use] extern crate quote;
-    /// # extern crate proc_macro2;
-    /// # use quote::{TokenStreamExt, ToTokens};
-    /// # use proc_macro2::TokenStream;
-    /// # fn main() {
-    /// struct X;
-    ///
-    /// impl ToTokens for X {
-    ///     fn to_tokens(&self, tokens: &mut TokenStream) {
-    ///         tokens.append_all(&[true, false]);
-    ///     }
-    /// }
-    ///
-    /// let tokens = quote!(#X);
-    /// assert_eq!(tokens.to_string(), "true false");
-    /// # }
-    /// ```
     fn append_all<T, I>(&mut self, iter: I)
     where
         T: ToTokens,
@@ -71,10 +76,6 @@
         }
     }
 
-    /// For use by `ToTokens` implementations.
-    ///
-    /// Appends all of the items in the iterator `I`, separated by the tokens
-    /// `U`.
     fn append_separated<T, I, U>(&mut self, iter: I, op: U)
     where
         T: ToTokens,
@@ -89,10 +90,6 @@
         }
     }
 
-    /// For use by `ToTokens` implementations.
-    ///
-    /// Appends all tokens in the iterator `I`, appending `U` after each
-    /// element, including after the last element of the iterator.
     fn append_terminated<T, I, U>(&mut self, iter: I, term: U)
     where
         T: ToTokens,
diff -Nru cargo-0.32.0/vendor/quote/src/lib.rs cargo-0.33.0/vendor/quote/src/lib.rs
--- cargo-0.32.0/vendor/quote/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -29,13 +29,6 @@
 //! quote = "0.6"
 //! ```
 //!
-//! ```
-//! #[macro_use]
-//! extern crate quote;
-//! #
-//! # fn main() {}
-//! ```
-//!
 //! # Example
 //!
 //! The following quasi-quoted block of code is something you might find in [a]
@@ -48,22 +41,20 @@
 //! [a]: https://serde.rs/
 //! [`quote_spanned!`]: macro.quote_spanned.html
 //!
-//! ```
-//! # #[macro_use]
-//! # extern crate quote;
+//! ```edition2018
+//! # use quote::quote;
 //! #
-//! # fn main() {
-//! #     let generics = "";
-//! #     let where_clause = "";
-//! #     let field_ty = "";
-//! #     let item_ty = "";
-//! #     let path = "";
-//! #     let value = "";
+//! # let generics = "";
+//! # let where_clause = "";
+//! # let field_ty = "";
+//! # let item_ty = "";
+//! # let path = "";
+//! # let value = "";
 //! #
 //! let tokens = quote! {
 //!     struct SerializeWith #generics #where_clause {
 //!         value: &'a #field_ty,
-//!         phantom: ::std::marker::PhantomData<#item_ty>,
+//!         phantom: core::marker::PhantomData<#item_ty>,
 //!     }
 //!
 //!     impl #generics serde::Serialize for SerializeWith #generics #where_clause {
@@ -77,14 +68,12 @@
 //!
 //!     SerializeWith {
 //!         value: #value,
-//!         phantom: ::std::marker::PhantomData::<#item_ty>,
+//!         phantom: core::marker::PhantomData::<#item_ty>,
 //!     }
 //! };
-//! #
-//! # }
 //! ```
 //!
-//! ## Recursion limit
+//! # Recursion limit
 //!
 //! The `quote!` macro relies on deep recursion so some large invocations may
 //! fail with "recursion limit reached" when you compile. If it fails, bump up
@@ -92,7 +81,7 @@
 //! An even higher limit may be necessary for especially large invocations.
 
 // Quote types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/quote/0.6.10")]
+#![doc(html_root_url = "https://docs.rs/quote/0.6.11")]
 
 #[cfg(all(
     not(all(target_arch = "wasm32", target_os = "unknown")),
@@ -277,17 +266,43 @@
 ///
 /// [`quote_spanned!`]: macro.quote_spanned.html
 ///
-/// # Example
+/// # Return type
 ///
-/// ```
+/// The macro evaluates to an expression of type `proc_macro2::TokenStream`.
+/// Meanwhile Rust procedural macros are expected to return the type
+/// `proc_macro::TokenStream`.
+///
+/// The difference between the two types is that `proc_macro` types are entirely
+/// specific to procedural macros and cannot ever exist in code outside of a
+/// procedural macro, while `proc_macro2` types may exist anywhere including
+/// tests and non-macro code like main.rs and build.rs. This is why even the
+/// procedural macro ecosystem is largely built around `proc_macro2`, because
+/// that ensures the libraries are unit testable and accessible in non-macro
+/// contexts.
+///
+/// There is a [`From`]-conversion in both directions so returning the output of
+/// `quote!` from a procedural macro usually looks like `tokens.into()` or
+/// `proc_macro::TokenStream::from(tokens)`.
+///
+/// [`From`]: https://doc.rust-lang.org/std/convert/trait.From.html
+///
+/// # Examples
+///
+/// ## Procedural macro
+///
+/// The structure of a basic procedural macro is as follows. Refer to the [Syn]
+/// crate for further useful guidance on using `quote!` as part of a procedural
+/// macro.
+///
+/// [Syn]: https://github.com/dtolnay/syn
+///
+/// ```edition2018
 /// # #[cfg(any())]
 /// extern crate proc_macro;
-/// # extern crate proc_macro2 as proc_macro;
-///
-/// #[macro_use]
-/// extern crate quote;
+/// # use proc_macro2 as proc_macro;
 ///
 /// use proc_macro::TokenStream;
+/// use quote::quote;
 ///
 /// # const IGNORE_TOKENS: &'static str = stringify! {
 /// #[proc_macro_derive(HeapSize)]
@@ -304,7 +319,7 @@
 ///
 ///     let expanded = quote! {
 ///         // The generated impl.
-///         impl ::heapsize::HeapSize for #name {
+///         impl heapsize::HeapSize for #name {
 ///             fn heap_size_of_children(&self) -> usize {
 ///                 #expr
 ///             }
@@ -312,10 +327,117 @@
 ///     };
 ///
 ///     // Hand the output tokens back to the compiler.
-///     expanded.into()
+///     TokenStream::from(expanded)
+/// }
+/// ```
+///
+/// ## Combining quoted fragments
+///
+/// Usually you don't end up constructing an entire final `TokenStream` in one
+/// piece. Different parts may come from different helper functions. The tokens
+/// produced by `quote!` themselves implement `ToTokens` and so can be
+/// interpolated into later `quote!` invocations to build up a final result.
+///
+/// ```edition2018
+/// # use quote::quote;
+/// #
+/// let type_definition = quote! {...};
+/// let methods = quote! {...};
+///
+/// let tokens = quote! {
+///     #type_definition
+///     #methods
+/// };
+/// ```
+///
+/// ## Constructing identifiers
+///
+/// Suppose we have an identifier `ident` which came from somewhere in a macro
+/// input and we need to modify it in some way for the macro output. Let's
+/// consider prepending the identifier with an underscore.
+///
+/// Simply interpolating the identifier next to an underscore will not have the
+/// behavior of concatenating them. The underscore and the identifier will
+/// continue to be two separate tokens as if you had written `_ x`.
+///
+/// ```edition2018
+/// # use proc_macro2::{self as syn, Span};
+/// # use quote::quote;
+/// #
+/// # let ident = syn::Ident::new("i", Span::call_site());
+/// #
+/// // incorrect
+/// quote! {
+///     let mut _#ident = 0;
 /// }
+/// # ;
+/// ```
+///
+/// The solution is to perform token-level manipulations using the APIs provided
+/// by Syn and proc-macro2.
+///
+/// ```edition2018
+/// # use proc_macro2::{self as syn, Span};
+/// # use quote::quote;
+/// #
+/// # let ident = syn::Ident::new("i", Span::call_site());
+/// #
+/// let concatenated = format!("_{}", ident);
+/// let varname = syn::Ident::new(&concatenated, ident.span());
+/// quote! {
+///     let mut #varname = 0;
+/// }
+/// # ;
+/// ```
+///
+/// ## Making method calls
+///
+/// Let's say our macro requires some type specified in the macro input to have
+/// a constructor called `new`. We have the type in a variable called
+/// `field_type` of type `syn::Type` and want to invoke the constructor.
+///
+/// ```edition2018
+/// # use quote::quote;
 /// #
-/// # fn main() {}
+/// # let field_type = quote!(...);
+/// #
+/// // incorrect
+/// quote! {
+///     let value = #field_type::new();
+/// }
+/// # ;
+/// ```
+///
+/// This works only sometimes. If `field_type` is `String`, the expanded code
+/// contains `String::new()` which is fine. But if `field_type` is something
+/// like `Vec<i32>` then the expanded code is `Vec<i32>::new()` which is invalid
+/// syntax. Ordinarily in handwritten Rust we would write `Vec::<i32>::new()`
+/// but for macros often the following is more convenient.
+///
+/// ```edition2018
+/// # use quote::quote;
+/// #
+/// # let field_type = quote!(...);
+/// #
+/// quote! {
+///     let value = <#field_type>::new();
+/// }
+/// # ;
+/// ```
+///
+/// This expands to `<Vec<i32>>::new()` which behaves correctly.
+///
+/// A similar pattern is appropriate for trait methods.
+///
+/// ```edition2018
+/// # use quote::quote;
+/// #
+/// # let field_type = quote!(...);
+/// #
+/// quote! {
+///     let value = <#field_type as core::default::Default>::default();
+/// }
+/// # ;
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! quote {
@@ -333,14 +455,10 @@
 ///
 /// [`Span`]: https://docs.rs/proc-macro2/0.4/proc_macro2/struct.Span.html
 ///
-/// ```
-/// # #[macro_use]
-/// # extern crate quote;
-/// # extern crate proc_macro2;
-/// #
+/// ```edition2018
 /// # use proc_macro2::Span;
+/// # use quote::quote_spanned;
 /// #
-/// # fn main() {
 /// # const IGNORE_TOKENS: &'static str = stringify! {
 /// let span = /* ... */;
 /// # };
@@ -354,7 +472,6 @@
 /// let tokens = quote_spanned! {span=>
 ///     Box::into_raw(Box::new(#init))
 /// };
-/// # }
 /// ```
 ///
 /// The lack of space before the `=>` should look jarring to Rust programmers
@@ -377,12 +494,8 @@
 ///
 /// [`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html
 ///
-/// ```
-/// # #[macro_use]
-/// # extern crate quote;
-/// # extern crate proc_macro2;
-/// #
-/// # use quote::{TokenStreamExt, ToTokens};
+/// ```edition2018
+/// # use quote::{quote_spanned, TokenStreamExt, ToTokens};
 /// # use proc_macro2::{Span, TokenStream};
 /// #
 /// # struct Type;
@@ -397,7 +510,6 @@
 /// #     fn to_tokens(&self, _tokens: &mut TokenStream) {}
 /// # }
 /// #
-/// # fn main() {
 /// # let ty = Type;
 /// # let call_site = Span::call_site();
 /// #
@@ -405,7 +517,6 @@
 /// let assert_sync = quote_spanned! {ty_span=>
 ///     struct _AssertSync where #ty: Sync;
 /// };
-/// # }
 /// ```
 ///
 /// If the assertion fails, the user will see an error like the following. The
diff -Nru cargo-0.32.0/vendor/quote/src/to_tokens.rs cargo-0.33.0/vendor/quote/src/to_tokens.rs
--- cargo-0.32.0/vendor/quote/src/to_tokens.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/quote/src/to_tokens.rs	2019-02-06 04:11:58.000000000 +0000
@@ -21,12 +21,9 @@
     /// Example implementation for a struct representing Rust paths like
     /// `std::cmp::PartialEq`:
     ///
-    /// ```
-    /// extern crate quote;
-    /// use quote::{TokenStreamExt, ToTokens};
-    ///
-    /// extern crate proc_macro2;
+    /// ```edition2018
     /// use proc_macro2::{TokenTree, Spacing, Span, Punct, TokenStream};
+    /// use quote::{TokenStreamExt, ToTokens};
     ///
     /// pub struct Path {
     ///     pub global: bool,
@@ -53,8 +50,6 @@
     /// #         unimplemented!()
     /// #     }
     /// # }
-    /// #
-    /// # fn main() {}
     /// ```
     fn to_tokens(&self, tokens: &mut TokenStream);
 
diff -Nru cargo-0.32.0/vendor/rand/benches/distributions.rs cargo-0.33.0/vendor/rand/benches/distributions.rs
--- cargo-0.32.0/vendor/rand/benches/distributions.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/benches/distributions.rs	2019-02-06 04:11:58.000000000 +0000
@@ -101,6 +101,26 @@
     }
 }
 
+macro_rules! distr_arr {
+    ($fnn:ident, $ty:ty, $distr:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = SmallRng::from_entropy();
+            let distr = $distr;
+
+            b.iter(|| {
+                let mut accum = 0u32;
+                for _ in 0..::RAND_BENCH_N {
+                    let x: $ty = distr.sample(&mut rng);
+                    accum = accum.wrapping_add(x[0] as u32);
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
+        }
+    }
+}
+
 // uniform
 distr_int!(distr_uniform_i8, i8, Uniform::new(20i8, 100));
 distr_int!(distr_uniform_i16, i16, Uniform::new(-500i16, 2000));
@@ -158,6 +178,8 @@
 distr_int!(distr_binomial, u64, Binomial::new(20, 0.7));
 distr_int!(distr_poisson, u64, Poisson::new(4.0));
 distr!(distr_bernoulli, bool, Bernoulli::new(0.18));
+distr_arr!(distr_circle, [f64; 2], UnitCircle::new());
+distr_arr!(distr_sphere_surface, [f64; 3], UnitSphereSurface::new());
 
 // Weighted
 distr_int!(distr_weighted_i8, usize, WeightedIndex::new(&[1i8, 2, 3, 4, 12, 0, 2, 1]).unwrap());
diff -Nru cargo-0.32.0/vendor/rand/benches/generators.rs cargo-0.33.0/vendor/rand/benches/generators.rs
--- cargo-0.32.0/vendor/rand/benches/generators.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/benches/generators.rs	2019-02-06 04:11:58.000000000 +0000
@@ -15,6 +15,7 @@
 extern crate rand_hc;
 extern crate rand_pcg;
 extern crate rand_xorshift;
+extern crate rand_xoshiro;
 
 const RAND_BENCH_N: u64 = 1000;
 const BYTES_LEN: usize = 1024;
@@ -30,6 +31,9 @@
 use rand_hc::{Hc128Rng, Hc128Core};
 use rand_pcg::{Lcg64Xsh32, Mcg128Xsl64};
 use rand_xorshift::XorShiftRng;
+use rand_xoshiro::{Xoshiro256StarStar, Xoshiro256Plus, Xoshiro128StarStar,
+    Xoshiro128Plus, Xoroshiro128StarStar, Xoroshiro128Plus, SplitMix64,
+    Xoroshiro64StarStar, Xoroshiro64Star};
 
 macro_rules! gen_bytes {
     ($fnn:ident, $gen:expr) => {
@@ -49,6 +53,15 @@
 }
 
 gen_bytes!(gen_bytes_xorshift, XorShiftRng::from_entropy());
+gen_bytes!(gen_bytes_xoshiro256starstar, Xoshiro256StarStar::from_entropy());
+gen_bytes!(gen_bytes_xoshiro256plus, Xoshiro256Plus::from_entropy());
+gen_bytes!(gen_bytes_xoshiro128starstar, Xoshiro128StarStar::from_entropy());
+gen_bytes!(gen_bytes_xoshiro128plus, Xoshiro128Plus::from_entropy());
+gen_bytes!(gen_bytes_xoroshiro128starstar, Xoroshiro128StarStar::from_entropy());
+gen_bytes!(gen_bytes_xoroshiro128plus, Xoroshiro128Plus::from_entropy());
+gen_bytes!(gen_bytes_xoroshiro64starstar, Xoroshiro64StarStar::from_entropy());
+gen_bytes!(gen_bytes_xoroshiro64star, Xoroshiro64Star::from_entropy());
+gen_bytes!(gen_bytes_splitmix64, SplitMix64::from_entropy());
 gen_bytes!(gen_bytes_lcg64_xsh32, Lcg64Xsh32::from_entropy());
 gen_bytes!(gen_bytes_mcg128_xsh64, Mcg128Xsl64::from_entropy());
 gen_bytes!(gen_bytes_chacha20, ChaChaRng::from_entropy());
@@ -77,6 +90,15 @@
 }
 
 gen_uint!(gen_u32_xorshift, u32, XorShiftRng::from_entropy());
+gen_uint!(gen_u32_xoshiro256starstar, u32, Xoshiro256StarStar::from_entropy());
+gen_uint!(gen_u32_xoshiro256plus, u32, Xoshiro256Plus::from_entropy());
+gen_uint!(gen_u32_xoshiro128starstar, u32, Xoshiro128StarStar::from_entropy());
+gen_uint!(gen_u32_xoshiro128plus, u32, Xoshiro128Plus::from_entropy());
+gen_uint!(gen_u32_xoroshiro128starstar, u32, Xoroshiro128StarStar::from_entropy());
+gen_uint!(gen_u32_xoroshiro128plus, u32, Xoroshiro128Plus::from_entropy());
+gen_uint!(gen_u32_xoroshiro64starstar, u32, Xoroshiro64StarStar::from_entropy());
+gen_uint!(gen_u32_xoroshiro64star, u32, Xoroshiro64Star::from_entropy());
+gen_uint!(gen_u32_splitmix64, u32, SplitMix64::from_entropy());
 gen_uint!(gen_u32_lcg64_xsh32, u32, Lcg64Xsh32::from_entropy());
 gen_uint!(gen_u32_mcg128_xsh64, u32, Mcg128Xsl64::from_entropy());
 gen_uint!(gen_u32_chacha20, u32, ChaChaRng::from_entropy());
@@ -88,6 +110,15 @@
 gen_uint!(gen_u32_os, u32, OsRng::new().unwrap());
 
 gen_uint!(gen_u64_xorshift, u64, XorShiftRng::from_entropy());
+gen_uint!(gen_u64_xoshiro256starstar, u64, Xoshiro256StarStar::from_entropy());
+gen_uint!(gen_u64_xoshiro256plus, u64, Xoshiro256Plus::from_entropy());
+gen_uint!(gen_u64_xoshiro128starstar, u64, Xoshiro128StarStar::from_entropy());
+gen_uint!(gen_u64_xoshiro128plus, u64, Xoshiro128Plus::from_entropy());
+gen_uint!(gen_u64_xoroshiro128starstar, u64, Xoroshiro128StarStar::from_entropy());
+gen_uint!(gen_u64_xoroshiro128plus, u64, Xoroshiro128Plus::from_entropy());
+gen_uint!(gen_u64_xoroshiro64starstar, u64, Xoroshiro64StarStar::from_entropy());
+gen_uint!(gen_u64_xoroshiro64star, u64, Xoroshiro64Star::from_entropy());
+gen_uint!(gen_u64_splitmix64, u64, SplitMix64::from_entropy());
 gen_uint!(gen_u64_lcg64_xsh32, u64, Lcg64Xsh32::from_entropy());
 gen_uint!(gen_u64_mcg128_xsh64, u64, Mcg128Xsl64::from_entropy());
 gen_uint!(gen_u64_chacha20, u64, ChaChaRng::from_entropy());
@@ -123,6 +154,15 @@
 }
 
 init_gen!(init_xorshift, XorShiftRng);
+init_gen!(init_xoshiro256starstar, Xoshiro256StarStar);
+init_gen!(init_xoshiro256plus, Xoshiro256Plus);
+init_gen!(init_xoshiro128starstar, Xoshiro128StarStar);
+init_gen!(init_xoshiro128plus, Xoshiro128Plus);
+init_gen!(init_xoroshiro128starstar, Xoroshiro128StarStar);
+init_gen!(init_xoroshiro128plus, Xoroshiro128Plus);
+init_gen!(init_xoroshiro64starstar, Xoroshiro64StarStar);
+init_gen!(init_xoroshiro64star, Xoroshiro64Star);
+init_gen!(init_splitmix64, SplitMix64);
 init_gen!(init_lcg64_xsh32, Lcg64Xsh32);
 init_gen!(init_mcg128_xsh64, Mcg128Xsl64);
 init_gen!(init_hc128, Hc128Rng);
diff -Nru cargo-0.32.0/vendor/rand/build.rs cargo-0.33.0/vendor/rand/build.rs
--- cargo-0.32.0/vendor/rand/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,14 +1,10 @@
-extern crate rustc_version;
-use rustc_version::{version, Version};
+extern crate autocfg;
 
 fn main() {
-    if version().unwrap() >= Version::parse("1.25.0").unwrap() {
-        println!("cargo:rustc-cfg=rust_1_25");
-    }
-    if version().unwrap() >= Version::parse("1.26.0").unwrap() {
-        println!("cargo:rustc-cfg=rust_1_26");
-    }
-    if version().unwrap() >= Version::parse("1.27.0").unwrap() {
-        println!("cargo:rustc-cfg=rust_1_27");
-    }
+    println!("cargo:rerun-if-changed=build.rs");
+
+    let ac = autocfg::new();
+    ac.emit_rustc_version(1, 25);
+    ac.emit_rustc_version(1, 26);
+    ac.emit_rustc_version(1, 27);
 }
diff -Nru cargo-0.32.0/vendor/rand/.cargo-checksum.json cargo-0.33.0/vendor/rand/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a"}
\ No newline at end of file
+{"files":{},"package":"6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand/Cargo.toml cargo-0.33.0/vendor/rand/Cargo.toml
--- cargo-0.32.0/vendor/rand/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "rand"
-version = "0.6.1"
+version = "0.6.5"
 authors = ["The Rand Project Developers", "The Rust Project Developers"]
 build = "build.rs"
 exclude = ["/utils/*", "/.travis.yml", "/appveyor.yml", ".gitignore"]
@@ -39,8 +39,7 @@
 version = "0.1"
 
 [dependencies.rand_core]
-version = "0.3"
-default-features = false
+version = "0.4"
 
 [dependencies.rand_hc]
 version = "0.1"
@@ -48,6 +47,13 @@
 [dependencies.rand_isaac]
 version = "0.1"
 
+[dependencies.rand_jitter]
+version = "0.1"
+
+[dependencies.rand_os]
+version = "0.1"
+optional = true
+
 [dependencies.rand_pcg]
 version = "0.1"
 
@@ -55,8 +61,11 @@
 version = "0.1"
 [dev-dependencies.average]
 version = "0.9.2"
-[build-dependencies.rustc_version]
-version = "0.2"
+
+[dev-dependencies.rand_xoshiro]
+version = "0.1"
+[build-dependencies.autocfg]
+version = "0.1"
 
 [features]
 alloc = ["rand_core/alloc"]
@@ -65,25 +74,15 @@
 nightly = ["simd_support"]
 serde1 = ["rand_core/serde1", "rand_isaac/serde1", "rand_xorshift/serde1"]
 simd_support = ["packed_simd"]
-std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi"]
-[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
-version = "0.0.3"
-optional = true
+std = ["rand_core/std", "alloc", "rand_os", "rand_jitter/std"]
+stdweb = ["rand_os/stdweb"]
+wasm-bindgen = ["rand_os/wasm-bindgen"]
 [target."cfg(unix)".dependencies.libc]
 version = "0.2"
-optional = true
 default-features = false
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3"
 features = ["minwindef", "ntsecapi", "profileapi", "winnt"]
-optional = true
-[target.wasm32-unknown-unknown.dependencies.stdweb]
-version = "0.4"
-optional = true
-
-[target.wasm32-unknown-unknown.dependencies.wasm-bindgen]
-version = "0.2.12"
-optional = true
 [badges.appveyor]
 repository = "rust-random/rand"
 
diff -Nru cargo-0.32.0/vendor/rand/.cargo_vcs_info.json cargo-0.33.0/vendor/rand/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "73613ff903512e9503e41cc8ba9eae76269dc598"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand/CHANGELOG.md cargo-0.33.0/vendor/rand/CHANGELOG.md
--- cargo-0.32.0/vendor/rand/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -9,6 +9,44 @@
 You may also find the [Upgrade Guide](https://rust-random.github.io/book/update.html) useful.
 
 
+## [0.6.5] - 2019-01-28
+### Crates
+- Update `rand_core` to 0.4 (#703)
+- Move `JitterRng` to its own crate (#685)
+- Add a warm-bindgen test crate (#696)
+
+### Platforms
+- Fuchsia: Replaced fuchsia-zircon with fuchsia-cprng
+
+### Doc
+- Use RFC 1946 for doc links (#691)
+- Fix some doc links and notes (#711)
+
+## [0.6.4] - 2019-01-08
+### Fixes
+- Move wasm-bindgen shims to correct crate (#686)
+- Make `wasm32-unknown-unknown` compile but fail at run-time if missing bindingsg (#686)
+
+## [0.6.3] - 2019-01-04
+### Fixes
+- Make the `std` feature require the optional `rand_os` dependency (#675)
+- Re-export the optional WASM dependencies of `rand_os` from `rand` to avoid breakage (#674)
+
+## [0.6.2] - 2019-01-04
+### Additions
+- Add `Default` for `ThreadRng` (#657)
+- Move `rngs::OsRng` to `rand_os` sub-crate; clean up code; use as dependency (#643) ##BLOCKER##
+- Add `rand_xoshiro` sub-crate, plus benchmarks (#642, #668)
+
+### Fixes
+- Fix bias in `UniformInt::sample_single` (#662)
+- Use `autocfg` instead of `rustc_version` for rustc version detection (#664)
+- Disable `i128` and `u128` if the `target_os` is `emscripten` (#671: work-around Emscripten limitation)
+- CI fixes (#660, #671)
+
+### Optimisations
+- Optimise memory usage of `UnitCircle` and `UnitSphereSurface` distributions (no PR)
+
 ## [0.6.1] - 2018-11-22
 - Support sampling `Duration` also for `no_std` (only since Rust 1.25) (#649)
 - Disable default features of `libc` (#647)
diff -Nru cargo-0.32.0/vendor/rand/debian/patches/disable-fuchsia-zircon-dep.diff cargo-0.33.0/vendor/rand/debian/patches/disable-fuchsia-zircon-dep.diff
--- cargo-0.32.0/vendor/rand/debian/patches/disable-fuchsia-zircon-dep.diff	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/debian/patches/disable-fuchsia-zircon-dep.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -65,13 +65,10 @@
- nightly = ["simd_support"]
- serde1 = ["rand_core/serde1", "rand_isaac/serde1", "rand_xorshift/serde1"]
- simd_support = ["packed_simd"]
--std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-zircon"]
-+std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi"]
- [target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
- version = "0.0.3"
- optional = true
--[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon]
--version = "0.3.2"
--optional = true
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
- optional = true
diff -Nru cargo-0.32.0/vendor/rand/debian/patches/series cargo-0.33.0/vendor/rand/debian/patches/series
--- cargo-0.32.0/vendor/rand/debian/patches/series	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-disable-fuchsia-zircon-dep.diff
diff -Nru cargo-0.32.0/vendor/rand/.pc/applied-patches cargo-0.33.0/vendor/rand/.pc/applied-patches
--- cargo-0.32.0/vendor/rand/.pc/applied-patches	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-disable-fuchsia-zircon-dep.diff
diff -Nru cargo-0.32.0/vendor/rand/.pc/disable-fuchsia-zircon-dep.diff/Cargo.toml cargo-0.33.0/vendor/rand/.pc/disable-fuchsia-zircon-dep.diff/Cargo.toml
--- cargo-0.32.0/vendor/rand/.pc/disable-fuchsia-zircon-dep.diff/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.pc/disable-fuchsia-zircon-dep.diff/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "rand"
-version = "0.6.1"
-authors = ["The Rand Project Developers", "The Rust Project Developers"]
-build = "build.rs"
-exclude = ["/utils/*", "/.travis.yml", "/appveyor.yml", ".gitignore"]
-description = "Random number generators and other randomness functionality.\n"
-homepage = "https://crates.io/crates/rand"
-documentation = "https://rust-random.github.io/rand"
-readme = "README.md"
-keywords = ["random", "rng"]
-categories = ["algorithms", "no-std"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-random/rand"
-[package.metadata.docs.rs]
-all-features = true
-[dependencies.log]
-version = "0.4"
-optional = true
-
-[dependencies.packed_simd]
-version = "0.3"
-features = ["into_bits"]
-optional = true
-
-[dependencies.rand_chacha]
-version = "0.1"
-
-[dependencies.rand_core]
-version = "0.3"
-default-features = false
-
-[dependencies.rand_hc]
-version = "0.1"
-
-[dependencies.rand_isaac]
-version = "0.1"
-
-[dependencies.rand_pcg]
-version = "0.1"
-
-[dependencies.rand_xorshift]
-version = "0.1"
-[dev-dependencies.average]
-version = "0.9.2"
-[build-dependencies.rustc_version]
-version = "0.2"
-
-[features]
-alloc = ["rand_core/alloc"]
-default = ["std"]
-i128_support = []
-nightly = ["simd_support"]
-serde1 = ["rand_core/serde1", "rand_isaac/serde1", "rand_xorshift/serde1"]
-simd_support = ["packed_simd"]
-std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-zircon"]
-[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
-version = "0.0.3"
-optional = true
-[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon]
-version = "0.3.2"
-optional = true
-[target."cfg(unix)".dependencies.libc]
-version = "0.2"
-optional = true
-default-features = false
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["minwindef", "ntsecapi", "profileapi", "winnt"]
-optional = true
-[target.wasm32-unknown-unknown.dependencies.stdweb]
-version = "0.4"
-optional = true
-
-[target.wasm32-unknown-unknown.dependencies.wasm-bindgen]
-version = "0.2.12"
-optional = true
-[badges.appveyor]
-repository = "rust-random/rand"
-
-[badges.travis-ci]
-repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand/.pc/.quilt_patches cargo-0.33.0/vendor/rand/.pc/.quilt_patches
--- cargo-0.32.0/vendor/rand/.pc/.quilt_patches	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.pc/.quilt_patches	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/patches
diff -Nru cargo-0.32.0/vendor/rand/.pc/.quilt_series cargo-0.33.0/vendor/rand/.pc/.quilt_series
--- cargo-0.32.0/vendor/rand/.pc/.quilt_series	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.pc/.quilt_series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-series
diff -Nru cargo-0.32.0/vendor/rand/.pc/.version cargo-0.33.0/vendor/rand/.pc/.version
--- cargo-0.32.0/vendor/rand/.pc/.version	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/.pc/.version	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-2
diff -Nru cargo-0.32.0/vendor/rand/README.md cargo-0.33.0/vendor/rand/README.md
--- cargo-0.32.0/vendor/rand/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -74,8 +74,15 @@
 
 ## Crate Features
 
-Rand is built with only the `std` feature enabled by default. The following
-optional features are available:
+Rand is built with the `std` and `rand_os` features enabled by default:
+
+-   `std` enables functionality dependent on the `std` lib and implies `alloc`
+    and `rand_os`
+-   `rand_os` enables the `rand_os` crate, `rngs::OsRng` and enables its usage;
+    the continued existance of this feature is not guaranteed so users are
+    encouraged to specify `std` instead
+
+The following optional features are available:
 
 - `alloc` can be used instead of `std` to provide `Vec` and `Box`.
 - `log` enables some logging via the `log` crate.
diff -Nru cargo-0.32.0/vendor/rand/src/deprecated.rs cargo-0.33.0/vendor/rand/src/deprecated.rs
--- cargo-0.32.0/vendor/rand/src/deprecated.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/deprecated.rs	2019-02-06 04:11:58.000000000 +0000
@@ -151,12 +151,12 @@
 }
 
 impl ChaChaRng {
-    #[cfg(rust_1_26)]
+    #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
     pub fn get_word_pos(&self) -> u128 {
         self.0.get_word_pos()
     }
 
-    #[cfg(rust_1_26)]
+    #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
     pub fn set_word_pos(&mut self, word_offset: u128) {
         self.0.set_word_pos(word_offset)
     }
@@ -291,45 +291,12 @@
 impl CryptoRng for StdRng {}
 
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
+#[cfg(feature="rand_os")]
 #[derive(Clone, Debug)]
 #[deprecated(since="0.6.0", note="import with rand::rngs::OsRng instead")]
 pub struct OsRng(rngs::OsRng);
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
-#[cfg(feature="std")]
+#[cfg(feature="rand_os")]
 impl RngCore for OsRng {
     #[inline(always)]
     fn next_u32(&mut self) -> u32 {
@@ -352,48 +319,14 @@
     }
 }
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
-#[cfg(feature="std")]
+#[cfg(feature="rand_os")]
 impl OsRng {
     pub fn new() -> Result<Self, Error> {
         rngs::OsRng::new().map(OsRng)
     }
 }
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
-#[cfg(feature="std")]
+#[cfg(feature="rand_os")]
 impl CryptoRng for OsRng {}
 
 
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/exponential.rs cargo-0.33.0/vendor/rand/src/distributions/exponential.rs
--- cargo-0.32.0/vendor/rand/src/distributions/exponential.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/exponential.rs	2019-02-06 04:11:58.000000000 +0000
@@ -64,7 +64,7 @@
 /// This distribution has density function: `f(x) = lambda * exp(-lambda * x)`
 /// for `x > 0`.
 /// 
-/// Note that [`Exp1`](struct.Exp1.html) is an optimised implementation for `lambda = 1`.
+/// Note that [`Exp1`][crate::distributions::Exp1] is an optimised implementation for `lambda = 1`.
 ///
 /// # Example
 ///
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/float.rs cargo-0.33.0/vendor/rand/src/distributions/float.rs
--- cargo-0.32.0/vendor/rand/src/distributions/float.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/float.rs	2019-02-06 04:11:58.000000000 +0000
@@ -36,9 +36,9 @@
 /// println!("f32 from (0, 1): {}", val);
 /// ```
 ///
-/// [`Standard`]: struct.Standard.html
-/// [`Open01`]: struct.Open01.html
-/// [`Uniform`]: uniform/struct.Uniform.html
+/// [`Standard`]: crate::distributions::Standard
+/// [`Open01`]: crate::distributions::Open01
+/// [`Uniform`]: crate::distributions::uniform::Uniform
 #[derive(Clone, Copy, Debug)]
 pub struct OpenClosed01;
 
@@ -62,9 +62,9 @@
 /// println!("f32 from (0, 1): {}", val);
 /// ```
 ///
-/// [`Standard`]: struct.Standard.html
-/// [`OpenClosed01`]: struct.OpenClosed01.html
-/// [`Uniform`]: uniform/struct.Uniform.html
+/// [`Standard`]: crate::distributions::Standard
+/// [`OpenClosed01`]: crate::distributions::OpenClosed01
+/// [`Uniform`]: crate::distributions::uniform::Uniform
 #[derive(Clone, Copy, Debug)]
 pub struct Open01;
 
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/integer.rs cargo-0.33.0/vendor/rand/src/distributions/integer.rs
--- cargo-0.32.0/vendor/rand/src/distributions/integer.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/integer.rs	2019-02-06 04:11:58.000000000 +0000
@@ -45,7 +45,7 @@
     }
 }
 
-#[cfg(rust_1_26)]
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
 impl Distribution<u128> for Standard {
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u128 {
@@ -85,7 +85,7 @@
 impl_int_from_uint! { i16, u16 }
 impl_int_from_uint! { i32, u32 }
 impl_int_from_uint! { i64, u64 }
-#[cfg(rust_1_26)] impl_int_from_uint! { i128, u128 }
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))] impl_int_from_uint! { i128, u128 }
 impl_int_from_uint! { isize, usize }
 
 #[cfg(feature="simd_support")]
@@ -147,7 +147,7 @@
         rng.sample::<i16, _>(Standard);
         rng.sample::<i32, _>(Standard);
         rng.sample::<i64, _>(Standard);
-        #[cfg(rust_1_26)]
+        #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
         rng.sample::<i128, _>(Standard);
         
         rng.sample::<usize, _>(Standard);
@@ -155,7 +155,7 @@
         rng.sample::<u16, _>(Standard);
         rng.sample::<u32, _>(Standard);
         rng.sample::<u64, _>(Standard);
-        #[cfg(rust_1_26)]
+        #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
         rng.sample::<u128, _>(Standard);
     }
 }
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/mod.rs cargo-0.33.0/vendor/rand/src/distributions/mod.rs
--- cargo-0.32.0/vendor/rand/src/distributions/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -56,7 +56,7 @@
 //!
 //! User types `T` may also implement `Distribution<T>` for [`Uniform`],
 //! although this is less straightforward than for [`Standard`] (see the
-//! documentation in the [`uniform` module]. Doing so enables generation of
+//! documentation in the [`uniform`] module. Doing so enables generation of
 //! values of type `T` with  [`Rng::gen_range`].
 //!
 //!
@@ -65,8 +65,8 @@
 //! There are surprisingly many ways to uniformly generate random floats. A
 //! range between 0 and 1 is standard, but the exact bounds (open vs closed)
 //! and accuracy differ. In addition to the [`Standard`] distribution Rand offers
-//! [`Open01`] and [`OpenClosed01`]. See [Floating point implementation] for
-//! more details.
+//! [`Open01`] and [`OpenClosed01`]. See "Floating point implementation" section of
+//! [`Standard`] documentation for more details.
 //!
 //! [`Alphanumeric`] is a simple distribution to sample random letters and
 //! numbers of the `char` type; in contrast [`Standard`] may sample any valid
@@ -140,49 +140,40 @@
 //!
 //!
 //! [probability distribution]: https://en.wikipedia.org/wiki/Probability_distribution
-//! [`Distribution`]: trait.Distribution.html
-//! [`gen_range`]: ../trait.Rng.html#method.gen_range
-//! [`gen`]: ../trait.Rng.html#method.gen
-//! [`sample`]: ../trait.Rng.html#method.sample
-//! [`new_inclusive`]: struct.Uniform.html#method.new_inclusive
-//! [`random()`]: ../fn.random.html
-//! [`Rng::gen_bool`]: ../trait.Rng.html#method.gen_bool
-//! [`Rng::gen_range`]: ../trait.Rng.html#method.gen_range
-//! [`Rng::gen()`]: ../trait.Rng.html#method.gen
-//! [`Rng`]: ../trait.Rng.html
-//! [`uniform` module]: uniform/index.html
-//! [Floating point implementation]: struct.Standard.html#floating-point-implementation
-// distributions
-//! [`Alphanumeric`]: struct.Alphanumeric.html
-//! [`Bernoulli`]: struct.Bernoulli.html
-//! [`Beta`]: struct.Beta.html
-//! [`Binomial`]: struct.Binomial.html
-//! [`Cauchy`]: struct.Cauchy.html
-//! [`ChiSquared`]: struct.ChiSquared.html
-//! [`Dirichlet`]: struct.Dirichlet.html
-//! [`Exp`]: struct.Exp.html
-//! [`Exp1`]: struct.Exp1.html
-//! [`FisherF`]: struct.FisherF.html
-//! [`Gamma`]: struct.Gamma.html
-//! [`LogNormal`]: struct.LogNormal.html
-//! [`Normal`]: struct.Normal.html
-//! [`Open01`]: struct.Open01.html
-//! [`OpenClosed01`]: struct.OpenClosed01.html
-//! [`Pareto`]: struct.Pareto.html
-//! [`Poisson`]: struct.Poisson.html
-//! [`Standard`]: struct.Standard.html
-//! [`StandardNormal`]: struct.StandardNormal.html
-//! [`StudentT`]: struct.StudentT.html
-//! [`Triangular`]: struct.Triangular.html
-//! [`Uniform`]: struct.Uniform.html
-//! [`Uniform::new`]: struct.Uniform.html#method.new
-//! [`Uniform::new_inclusive`]: struct.Uniform.html#method.new_inclusive
-//! [`UnitSphereSurface`]: struct.UnitSphereSurface.html
-//! [`UnitCircle`]: struct.UnitCircle.html
-//! [`Weibull`]: struct.Weibull.html
-//! [`WeightedIndex`]: struct.WeightedIndex.html
+//! [`gen_range`]: Rng::gen_range
+//! [`gen`]: Rng::gen
+//! [`sample`]: Rng::sample
+//! [`new_inclusive`]: Uniform::new_inclusive
+//! [`Alphanumeric`]: distributions::Alphanumeric
+//! [`Bernoulli`]: distributions::Bernoulli
+//! [`Beta`]: distributions::Beta
+//! [`Binomial`]: distributions::Binomial
+//! [`Cauchy`]: distributions::Cauchy
+//! [`ChiSquared`]: distributions::ChiSquared
+//! [`Dirichlet`]: distributions::Dirichlet
+//! [`Exp`]: distributions::Exp
+//! [`Exp1`]: distributions::Exp1
+//! [`FisherF`]: distributions::FisherF
+//! [`Gamma`]: distributions::Gamma
+//! [`LogNormal`]: distributions::LogNormal
+//! [`Normal`]: distributions::Normal
+//! [`Open01`]: distributions::Open01
+//! [`OpenClosed01`]: distributions::OpenClosed01
+//! [`Pareto`]: distributions::Pareto
+//! [`Poisson`]: distributions::Poisson
+//! [`Standard`]: distributions::Standard
+//! [`StandardNormal`]: distributions::StandardNormal
+//! [`StudentT`]: distributions::StudentT
+//! [`Triangular`]: distributions::Triangular
+//! [`Uniform`]: distributions::Uniform
+//! [`Uniform::new`]: distributions::Uniform::new
+//! [`Uniform::new_inclusive`]: distributions::Uniform::new_inclusive
+//! [`UnitSphereSurface`]: distributions::UnitSphereSurface
+//! [`UnitCircle`]: distributions::UnitCircle
+//! [`Weibull`]: distributions::Weibull
+//! [`WeightedIndex`]: distributions::WeightedIndex
 
-#[cfg(any(rust_1_26, features="nightly"))]
+#[cfg(any(rustc_1_26, features="nightly"))]
 use core::iter;
 use Rng;
 
@@ -238,8 +229,7 @@
 /// advantage of not needing to consider thread safety, and for most
 /// distributions efficient state-less sampling algorithms are available.
 ///
-/// [`Rng`]: ../trait.Rng.html
-/// [`sample_iter`]: trait.Distribution.html#method.sample_iter
+/// [`sample_iter`]: Distribution::method.sample_iter
 pub trait Distribution<T> {
     /// Generate a random value of `T`, using `rng` as the source of randomness.
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T;
@@ -292,8 +282,7 @@
 /// This `struct` is created by the [`sample_iter`] method on [`Distribution`].
 /// See its documentation for more.
 ///
-/// [`Distribution`]: trait.Distribution.html
-/// [`sample_iter`]: trait.Distribution.html#method.sample_iter
+/// [`sample_iter`]: Distribution::sample_iter
 #[derive(Debug)]
 pub struct DistIter<'a, D: 'a, R: 'a, T> {
     distr: &'a D,
@@ -316,7 +305,7 @@
     }
 }
 
-#[cfg(rust_1_26)]
+#[cfg(rustc_1_26)]
 impl<'a, D, R, T> iter::FusedIterator for DistIter<'a, D, R, T>
     where D: Distribution<T>, R: Rng + 'a {}
 
@@ -328,7 +317,7 @@
 /// A generic random value distribution, implemented for many primitive types.
 /// Usually generates values with a numerically uniform distribution, and with a
 /// range appropriate to the type.
-/// 
+///
 /// ## Built-in Implementations
 ///
 /// Assuming the provided `Rng` is well-behaved, these implementations
@@ -379,9 +368,7 @@
 /// faster on some architectures (on modern Intel CPUs all methods have
 /// approximately equal performance).
 ///
-/// [`Open01`]: struct.Open01.html
-/// [`OpenClosed01`]: struct.OpenClosed01.html
-/// [`Uniform`]: uniform/struct.Uniform.html
+/// [`Uniform`]: uniform::Uniform
 #[derive(Clone, Copy, Debug)]
 pub struct Standard;
 
@@ -401,7 +388,7 @@
 ///
 /// Deprecated: use [`WeightedIndex`] instead.
 ///
-/// [`WeightedIndex`]: struct.WeightedIndex.html
+/// [`WeightedIndex`]: WeightedIndex
 #[deprecated(since="0.6.0", note="use WeightedIndex instead")]
 #[allow(deprecated)]
 #[derive(Debug)]
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/normal.rs cargo-0.33.0/vendor/rand/src/distributions/normal.rs
--- cargo-0.32.0/vendor/rand/src/distributions/normal.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/normal.rs	2019-02-06 04:11:58.000000000 +0000
@@ -91,7 +91,7 @@
 /// println!("{} is from a N(2, 9) distribution", v)
 /// ```
 ///
-/// [`StandardNormal`]: struct.StandardNormal.html
+/// [`StandardNormal`]: crate::distributions::StandardNormal
 #[derive(Clone, Copy, Debug)]
 pub struct Normal {
     mean: f64,
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/uniform.rs cargo-0.33.0/vendor/rand/src/distributions/uniform.rs
--- cargo-0.32.0/vendor/rand/src/distributions/uniform.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/uniform.rs	2019-02-06 04:11:58.000000000 +0000
@@ -15,13 +15,13 @@
 //! [`Uniform`].
 //!
 //! This distribution is provided with support for several primitive types
-//! (all integer and floating-point types) as well as `std::time::Duration`,
+//! (all integer and floating-point types) as well as [`std::time::Duration`],
 //! and supports extension to user-defined types via a type-specific *back-end*
 //! implementation.
 //!
 //! The types [`UniformInt`], [`UniformFloat`] and [`UniformDuration`] are the
 //! back-ends supporting sampling from primitive integer and floating-point
-//! ranges as well as from `std::time::Duration`; these types do not normally
+//! ranges as well as from [`std::time::Duration`]; these types do not normally
 //! need to be used directly (unless implementing a derived back-end).
 //!
 //! # Example usage
@@ -100,18 +100,16 @@
 //! let x = uniform.sample(&mut thread_rng());
 //! ```
 //!
-//! [`Uniform`]: struct.Uniform.html
-//! [`Rng::gen_range`]: ../../trait.Rng.html#method.gen_range
-//! [`SampleUniform`]: trait.SampleUniform.html
-//! [`UniformSampler`]: trait.UniformSampler.html
-//! [`UniformInt`]: struct.UniformInt.html
-//! [`UniformFloat`]: struct.UniformFloat.html
-//! [`UniformDuration`]: struct.UniformDuration.html
-//! [`SampleBorrow::borrow`]: trait.SampleBorrow.html#method.borrow
+//! [`SampleUniform`]: crate::distributions::uniform::SampleUniform
+//! [`UniformSampler`]: crate::distributions::uniform::UniformSampler
+//! [`UniformInt`]: crate::distributions::uniform::UniformInt
+//! [`UniformFloat`]: crate::distributions::uniform::UniformFloat
+//! [`UniformDuration`]: crate::distributions::uniform::UniformDuration
+//! [`SampleBorrow::borrow`]: crate::distributions::uniform::SampleBorrow::borrow
 
 #[cfg(feature = "std")]
 use std::time::Duration;
-#[cfg(all(not(feature = "std"), rust_1_25))]
+#[cfg(all(not(feature = "std"), rustc_1_25))]
 use core::time::Duration;
 
 use Rng;
@@ -165,10 +163,8 @@
 /// }
 /// ```
 ///
-/// [`Uniform::new`]: struct.Uniform.html#method.new
-/// [`Uniform::new_inclusive`]: struct.Uniform.html#method.new_inclusive
-/// [`new`]: struct.Uniform.html#method.new
-/// [`new_inclusive`]: struct.Uniform.html#method.new_inclusive
+/// [`new`]: Uniform::new
+/// [`new_inclusive`]: Uniform::new_inclusive
 #[derive(Clone, Copy, Debug)]
 pub struct Uniform<X: SampleUniform> {
     inner: X::Sampler,
@@ -206,9 +202,7 @@
 /// See the [module documentation] on how to implement [`Uniform`] range
 /// sampling for a custom type.
 ///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [module documentation]: index.html
-/// [`Uniform`]: struct.Uniform.html
+/// [module documentation]: crate::distributions::uniform
 pub trait SampleUniform: Sized {
     /// The `UniformSampler` implementation supporting type `X`.
     type Sampler: UniformSampler<X = Self>;
@@ -222,9 +216,8 @@
 /// Implementation of [`sample_single`] is optional, and is only useful when
 /// the implementation can be faster than `Self::new(low, high).sample(rng)`.
 ///
-/// [module documentation]: index.html
-/// [`Uniform`]: struct.Uniform.html
-/// [`sample_single`]: trait.UniformSampler.html#method.sample_single
+/// [module documentation]: crate::distributions::uniform
+/// [`sample_single`]: UniformSampler::sample_single
 pub trait UniformSampler: Sized {
     /// The type sampled by this implementation.
     type X;
@@ -277,7 +270,7 @@
     }
 }
 
-#[cfg(rust_1_27)]
+#[cfg(rustc_1_27)]
 impl<X: SampleUniform> From<::core::ops::RangeInclusive<X>> for Uniform<X> {
     fn from(r: ::core::ops::RangeInclusive<X>) -> Uniform<X> {
         Uniform::new_inclusive(r.start(), r.end())
@@ -288,11 +281,11 @@
 /// only for SampleUniform and references to SampleUniform in
 /// order to resolve ambiguity issues.
 ///
-/// [`Borrow`]: https://doc.rust-lang.org/std/borrow/trait.Borrow.html
+/// [`Borrow`]: std::borrow::Borrow
 pub trait SampleBorrow<Borrowed> {
     /// Immutably borrows from an owned value. See [`Borrow::borrow`]
     ///
-    /// [`Borrow::borrow`]: https://doc.rust-lang.org/std/borrow/trait.Borrow.html#tymethod.borrow
+    /// [`Borrow::borrow`]: std::borrow::Borrow::borrow
     fn borrow(&self) -> &Borrowed;
 }
 impl<Borrowed> SampleBorrow<Borrowed> for Borrowed where Borrowed: SampleUniform {
@@ -345,9 +338,6 @@
 /// An alternative to using a modulus is widening multiply: After a widening
 /// multiply by `range`, the result is in the high word. Then comparing the low
 /// word against `zone` makes sure our distribution is uniform.
-///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [`Uniform`]: struct.Uniform.html
 #[derive(Clone, Copy, Debug)]
 pub struct UniformInt<X> {
     low: X,
@@ -452,8 +442,9 @@
                         let ints_to_reject = (unsigned_max - range + 1) % range;
                         unsigned_max - ints_to_reject
                     } else {
-                        // conservative but fast approximation
-                       range << range.leading_zeros()
+                        // conservative but fast approximation. `- 1` is necessary to allow the
+                        // same comparison without bias.
+                        (range << range.leading_zeros()).wrapping_sub(1)
                     };
 
                 loop {
@@ -472,7 +463,7 @@
 uniform_int_impl! { i16, i16, u16, i32, u32 }
 uniform_int_impl! { i32, i32, u32, i32, u32 }
 uniform_int_impl! { i64, i64, u64, i64, u64 }
-#[cfg(rust_1_26)]
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
 uniform_int_impl! { i128, i128, u128, u128, u128 }
 uniform_int_impl! { isize, isize, usize, isize, usize }
 uniform_int_impl! { u8, i8, u8, i32, u32 }
@@ -480,7 +471,7 @@
 uniform_int_impl! { u32, i32, u32, i32, u32 }
 uniform_int_impl! { u64, i64, u64, i64, u64 }
 uniform_int_impl! { usize, isize, usize, isize, usize }
-#[cfg(rust_1_26)]
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
 uniform_int_impl! { u128, u128, u128, i128, u128 }
 
 #[cfg(all(feature = "simd_support", feature = "nightly"))]
@@ -645,11 +636,9 @@
 /// multiply and addition. Values produced this way have what equals 22 bits of
 /// random digits for an `f32`, and 52 for an `f64`.
 ///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [`new`]: trait.UniformSampler.html#tymethod.new
-/// [`new_inclusive`]: trait.UniformSampler.html#tymethod.new_inclusive
-/// [`Uniform`]: struct.Uniform.html
-/// [`Standard`]: ../struct.Standard.html
+/// [`new`]: UniformSampler::new
+/// [`new_inclusive`]: UniformSampler::new_inclusive
+/// [`Standard`]: crate::distributions::Standard
 #[derive(Clone, Copy, Debug)]
 pub struct UniformFloat<X> {
     low: X,
@@ -832,17 +821,14 @@
 ///
 /// Unless you are implementing [`UniformSampler`] for your own types, this type
 /// should not be used directly, use [`Uniform`] instead.
-///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [`Uniform`]: struct.Uniform.html
-#[cfg(any(feature = "std", rust_1_25))]
+#[cfg(any(feature = "std", rustc_1_25))]
 #[derive(Clone, Copy, Debug)]
 pub struct UniformDuration {
     mode: UniformDurationMode,
     offset: u32,
 }
 
-#[cfg(any(feature = "std", rust_1_25))]
+#[cfg(any(feature = "std", rustc_1_25))]
 #[derive(Debug, Copy, Clone)]
 enum UniformDurationMode {
     Small {
@@ -859,12 +845,12 @@
     }
 }
 
-#[cfg(any(feature = "std", rust_1_25))]
+#[cfg(any(feature = "std", rustc_1_25))]
 impl SampleUniform for Duration {
     type Sampler = UniformDuration;
 }
 
-#[cfg(any(feature = "std", rust_1_25))]
+#[cfg(any(feature = "std", rustc_1_25))]
 impl UniformSampler for UniformDuration {
     type X = Duration;
 
@@ -989,7 +975,7 @@
     fn test_integers() {
         use core::{i8, i16, i32, i64, isize};
         use core::{u8, u16, u32, u64, usize};
-        #[cfg(rust_1_26)]
+        #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
         use core::{i128, u128};
 
         let mut rng = ::test::rng(251);
@@ -1053,7 +1039,7 @@
         }
         t!(i8, i16, i32, i64, isize,
            u8, u16, u32, u64, usize);
-        #[cfg(rust_1_26)]
+        #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
         t!(i128, u128);
 
         #[cfg(all(feature = "simd_support", feature = "nightly"))]
@@ -1208,11 +1194,11 @@
 
 
     #[test]
-    #[cfg(any(feature = "std", rust_1_25))]
+    #[cfg(any(feature = "std", rustc_1_25))]
     fn test_durations() {
         #[cfg(feature = "std")]
         use std::time::Duration;
-        #[cfg(all(not(feature = "std"), rust_1_25))]
+        #[cfg(all(not(feature = "std"), rustc_1_25))]
         use core::time::Duration;
 
         let mut rng = ::test::rng(253);
@@ -1283,7 +1269,7 @@
         assert_eq!(r.inner.scale, 5.0);
     }
 
-    #[cfg(rust_1_27)]
+    #[cfg(rustc_1_27)]
     #[test]
     fn test_uniform_from_std_range_inclusive() {
         let r = Uniform::from(2u32..=6);
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/unit_circle.rs cargo-0.33.0/vendor/rand/src/distributions/unit_circle.rs
--- cargo-0.32.0/vendor/rand/src/distributions/unit_circle.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/unit_circle.rs	2019-02-06 04:11:58.000000000 +0000
@@ -29,27 +29,26 @@
 ///       NBS Appl. Math. Ser., No. 12. Washington, DC: U.S. Government Printing
 ///       Office, pp. 36-38.
 #[derive(Clone, Copy, Debug)]
-pub struct UnitCircle {
-    uniform: Uniform<f64>,
-}
+pub struct UnitCircle;
 
 impl UnitCircle {
     /// Construct a new `UnitCircle` distribution.
     #[inline]
     pub fn new() -> UnitCircle {
-        UnitCircle { uniform: Uniform::new(-1., 1.) }
+        UnitCircle
     }
 }
 
 impl Distribution<[f64; 2]> for UnitCircle {
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> [f64; 2] {
+        let uniform = Uniform::new(-1., 1.);
         let mut x1;
         let mut x2;
         let mut sum;
         loop {
-            x1 = self.uniform.sample(rng);
-            x2 = self.uniform.sample(rng);
+            x1 = uniform.sample(rng);
+            x2 = uniform.sample(rng);
             sum = x1*x1 + x2*x2;
             if sum < 1. {
                 break;
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/unit_sphere.rs cargo-0.33.0/vendor/rand/src/distributions/unit_sphere.rs
--- cargo-0.32.0/vendor/rand/src/distributions/unit_sphere.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/unit_sphere.rs	2019-02-06 04:11:58.000000000 +0000
@@ -28,23 +28,22 @@
 ///       Sphere.*](https://doi.org/10.1214/aoms/1177692644)
 ///       Ann. Math. Statist. 43, no. 2, 645--646.
 #[derive(Clone, Copy, Debug)]
-pub struct UnitSphereSurface {
-    uniform: Uniform<f64>,
-}
+pub struct UnitSphereSurface;
 
 impl UnitSphereSurface {
     /// Construct a new `UnitSphereSurface` distribution.
     #[inline]
     pub fn new() -> UnitSphereSurface {
-        UnitSphereSurface { uniform: Uniform::new(-1., 1.) }
+        UnitSphereSurface
     }
 }
 
 impl Distribution<[f64; 3]> for UnitSphereSurface {
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> [f64; 3] {
+        let uniform = Uniform::new(-1., 1.);
         loop {
-            let (x1, x2) = (self.uniform.sample(rng), self.uniform.sample(rng));
+            let (x1, x2) = (uniform.sample(rng), uniform.sample(rng));
             let sum = x1*x1 + x2*x2;
             if sum >= 1. {
                 continue;
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/utils.rs cargo-0.33.0/vendor/rand/src/distributions/utils.rs
--- cargo-0.32.0/vendor/rand/src/distributions/utils.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/utils.rs	2019-02-06 04:11:58.000000000 +0000
@@ -61,7 +61,7 @@
 wmul_impl! { u8, u16, 8 }
 wmul_impl! { u16, u32, 16 }
 wmul_impl! { u32, u64, 32 }
-#[cfg(rust_1_26)]
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
 wmul_impl! { u64, u128, 64 }
 
 // This code is a translation of the __mulddi3 function in LLVM's
@@ -125,9 +125,9 @@
         )+
     };
 }
-#[cfg(not(rust_1_26))]
+#[cfg(not(all(rustc_1_26, not(target_os = "emscripten"))))]
 wmul_impl_large! { u64, 32 }
-#[cfg(rust_1_26)]
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
 wmul_impl_large! { u128, 64 }
 
 macro_rules! wmul_impl_usize {
diff -Nru cargo-0.32.0/vendor/rand/src/distributions/weighted.rs cargo-0.33.0/vendor/rand/src/distributions/weighted.rs
--- cargo-0.32.0/vendor/rand/src/distributions/weighted.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/distributions/weighted.rs	2019-02-06 04:11:58.000000000 +0000
@@ -40,9 +40,9 @@
 /// `N` is the number of weights.
 ///
 /// Sampling from `WeightedIndex` will result in a single call to
-/// [`Uniform<X>::sample`], which typically will request a single value from
-/// the underlying [`RngCore`], though the exact number depends on the
-/// implementaiton of [`Uniform<X>::sample`].
+/// `Uniform<X>::sample` (method of the [`Distribution`] trait), which typically
+/// will request a single value from the underlying [`RngCore`], though the
+/// exact number depends on the implementaiton of `Uniform<X>::sample`.
 ///
 /// # Example
 ///
@@ -67,9 +67,8 @@
 /// }
 /// ```
 ///
-/// [`Uniform<X>`]: struct.Uniform.html
-/// [`Uniform<X>::sample`]: struct.Uniform.html#method.sample
-/// [`RngCore`]: ../trait.RngCore.html
+/// [`Uniform<X>`]: crate::distributions::uniform::Uniform
+/// [`RngCore`]: rand_core::RngCore
 #[derive(Debug, Clone)]
 pub struct WeightedIndex<X: SampleUniform + PartialOrd> {
     cumulative_weights: Vec<X>,
@@ -84,8 +83,7 @@
     /// Returns an error if the iterator is empty, if any weight is `< 0`, or
     /// if its total value is 0.
     ///
-    /// [`Distribution`]: trait.Distribution.html
-    /// [`Uniform<X>`]: struct.Uniform.html
+    /// [`Uniform<X>`]: crate::distributions::uniform::Uniform
     pub fn new<I>(weights: I) -> Result<WeightedIndex<X>, WeightedError>
         where I: IntoIterator,
               I::Item: SampleBorrow<X>,
diff -Nru cargo-0.32.0/vendor/rand/src/lib.rs cargo-0.33.0/vendor/rand/src/lib.rs
--- cargo-0.32.0/vendor/rand/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -13,16 +13,16 @@
 //! useful types and distributions, and some randomness-related algorithms.
 //!
 //! # Quick Start
-//! 
+//!
 //! To get you started quickly, the easiest and highest-level way to get
 //! a random value is to use [`random()`]; alternatively you can use
 //! [`thread_rng()`]. The [`Rng`] trait provides a useful API on all RNGs, while
-//! the [`distributions` module] and [`seq` module] provide further
+//! the [`distributions`] and [`seq`] modules provide further
 //! functionality on top of RNGs.
 //!
 //! ```
 //! use rand::prelude::*;
-//! 
+//!
 //! if rand::random() { // generates a boolean
 //!     // Try printing a random unicode code point (probably a bad idea)!
 //!     println!("char: {}", rand::random::<char>());
@@ -36,15 +36,9 @@
 //! ```
 //!
 //! # The Book
-//! 
+//!
 //! For the user guide and futher documentation, please read
 //! [The Rust Rand Book](https://rust-random.github.io/book).
-//!
-//! [`distributions` module]: distributions/index.html
-//! [`random()`]: fn.random.html
-//! [`Rng`]: trait.Rng.html
-//! [`seq` module]: seq/index.html
-//! [`thread_rng()`]: fn.thread_rng.html
 
 
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
@@ -58,19 +52,15 @@
 #![cfg_attr(not(feature="std"), no_std)]
 #![cfg_attr(all(feature="alloc", not(feature="std")), feature(alloc))]
 #![cfg_attr(all(feature="simd_support", feature="nightly"), feature(stdsimd))]
-#![cfg_attr(feature = "stdweb", recursion_limit="128")]
 
 #[cfg(feature = "std")] extern crate core;
 #[cfg(all(feature = "alloc", not(feature="std")))] #[macro_use] extern crate alloc;
 
 #[cfg(feature="simd_support")] extern crate packed_simd;
 
-#[cfg(all(target_arch="wasm32", not(target_os="emscripten"), feature="stdweb"))]
-#[macro_use]
-extern crate stdweb;
-
-#[cfg(all(target_arch = "wasm32", feature = "wasm-bindgen"))]
-extern crate wasm_bindgen;
+extern crate rand_jitter;
+#[cfg(feature = "rand_os")]
+extern crate rand_os;
 
 extern crate rand_core;
 extern crate rand_isaac;    // only for deprecations
@@ -119,23 +109,7 @@
 #[cfg(feature="std")] #[doc(hidden)] pub use deprecated::EntropyRng;
 
 #[allow(deprecated)]
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
+#[cfg(feature="rand_os")]
 #[doc(hidden)]
 pub use deprecated::OsRng;
 
@@ -152,23 +126,7 @@
     pub use rngs::TimerError;
 }
 #[allow(deprecated)]
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
+#[cfg(feature="rand_os")]
 #[doc(hidden)]
 pub mod os {
     pub use deprecated::OsRng;
@@ -237,12 +195,10 @@
 ///
 /// # let v = foo(&mut thread_rng());
 /// ```
-///
-/// [`RngCore`]: trait.RngCore.html
 pub trait Rng: RngCore {
     /// Return a random value supporting the [`Standard`] distribution.
     ///
-    /// [`Standard`]: distributions/struct.Standard.html
+    /// [`Standard`]: distributions::Standard
     ///
     /// # Example
     ///
@@ -282,7 +238,7 @@
     /// println!("{}", m);
     /// ```
     ///
-    /// [`Uniform`]: distributions/uniform/struct.Uniform.html
+    /// [`Uniform`]: distributions::uniform::Uniform
     fn gen_range<T: SampleUniform, B1, B2>(&mut self, low: B1, high: B2) -> T
         where B1: SampleBorrow<T> + Sized,
               B2: SampleBorrow<T> + Sized {
@@ -360,9 +316,8 @@
     /// thread_rng().fill(&mut arr[..]);
     /// ```
     ///
-    /// [`fill_bytes`]: trait.RngCore.html#method.fill_bytes
-    /// [`try_fill`]: trait.Rng.html#method.try_fill
-    /// [`AsByteSliceMut`]: trait.AsByteSliceMut.html
+    /// [`fill_bytes`]: RngCore::fill_bytes
+    /// [`try_fill`]: Rng::try_fill
     fn fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) {
         self.fill_bytes(dest.as_byte_slice_mut());
         dest.to_le();
@@ -395,10 +350,8 @@
     /// # try_inner().unwrap()
     /// ```
     ///
-    /// [`ErrorKind`]: enum.ErrorKind.html
-    /// [`try_fill_bytes`]: trait.RngCore.html#method.try_fill_bytes
-    /// [`fill`]: trait.Rng.html#method.fill
-    /// [`AsByteSliceMut`]: trait.AsByteSliceMut.html
+    /// [`try_fill_bytes`]: RngCore::try_fill_bytes
+    /// [`fill`]: Rng::fill
     fn try_fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) -> Result<(), Error> {
         self.try_fill_bytes(dest.as_byte_slice_mut())?;
         dest.to_le();
@@ -423,7 +376,7 @@
     ///
     /// If `p < 0` or `p > 1`.
     ///
-    /// [`Bernoulli`]: distributions/bernoulli/struct.Bernoulli.html
+    /// [`Bernoulli`]: distributions::bernoulli::Bernoulli
     #[inline]
     fn gen_bool(&mut self, p: f64) -> bool {
         let d = distributions::Bernoulli::new(p);
@@ -452,7 +405,7 @@
     /// println!("{}", rng.gen_ratio(2, 3));
     /// ```
     ///
-    /// [`Bernoulli`]: distributions/bernoulli/struct.Bernoulli.html
+    /// [`Bernoulli`]: distributions::bernoulli::Bernoulli
     #[inline]
     fn gen_ratio(&mut self, numerator: u32, denominator: u32) -> bool {
         let d = distributions::Bernoulli::from_ratio(numerator, denominator);
@@ -461,9 +414,7 @@
 
     /// Return a random element from `values`.
     ///
-    /// Deprecated: use [`SliceRandom::choose`] instead.
-    ///
-    /// [`SliceRandom::choose`]: seq/trait.SliceRandom.html#method.choose
+    /// Deprecated: use [`seq::SliceRandom::choose`] instead.
     #[deprecated(since="0.6.0", note="use SliceRandom::choose instead")]
     fn choose<'a, T>(&mut self, values: &'a [T]) -> Option<&'a T> {
         use seq::SliceRandom;
@@ -472,9 +423,7 @@
 
     /// Return a mutable pointer to a random element from `values`.
     ///
-    /// Deprecated: use [`SliceRandom::choose_mut`] instead.
-    ///
-    /// [`SliceRandom::choose_mut`]: seq/trait.SliceRandom.html#method.choose_mut
+    /// Deprecated: use [`seq::SliceRandom::choose_mut`] instead.
     #[deprecated(since="0.6.0", note="use SliceRandom::choose_mut instead")]
     fn choose_mut<'a, T>(&mut self, values: &'a mut [T]) -> Option<&'a mut T> {
         use seq::SliceRandom;
@@ -483,9 +432,7 @@
 
     /// Shuffle a mutable slice in place.
     ///
-    /// Deprecated: use [`SliceRandom::shuffle`] instead.
-    ///
-    /// [`SliceRandom::shuffle`]: seq/trait.SliceRandom.html#method.shuffle
+    /// Deprecated: use [`seq::SliceRandom::shuffle`] instead.
     #[deprecated(since="0.6.0", note="use SliceRandom::shuffle instead")]
     fn shuffle<T>(&mut self, values: &mut [T]) {
         use seq::SliceRandom;
@@ -497,10 +444,7 @@
 
 /// Trait for casting types to byte slices
 ///
-/// This is used by the [`fill`] and [`try_fill`] methods.
-///
-/// [`fill`]: trait.Rng.html#method.fill
-/// [`try_fill`]: trait.Rng.html#method.try_fill
+/// This is used by the [`Rng::fill`] and [`Rng::try_fill`] methods.
 pub trait AsByteSliceMut {
     /// Return a mutable reference to self as a byte slice
     fn as_byte_slice_mut(&mut self) -> &mut [u8];
@@ -549,13 +493,13 @@
 impl_as_byte_slice!(u16);
 impl_as_byte_slice!(u32);
 impl_as_byte_slice!(u64);
-#[cfg(rust_1_26)] impl_as_byte_slice!(u128);
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))] impl_as_byte_slice!(u128);
 impl_as_byte_slice!(usize);
 impl_as_byte_slice!(i8);
 impl_as_byte_slice!(i16);
 impl_as_byte_slice!(i32);
 impl_as_byte_slice!(i64);
-#[cfg(rust_1_26)] impl_as_byte_slice!(i128);
+#[cfg(all(rustc_1_26, not(target_os = "emscripten")))] impl_as_byte_slice!(i128);
 impl_as_byte_slice!(isize);
 
 macro_rules! impl_as_byte_slice_arrays {
@@ -617,9 +561,7 @@
 /// println!("Random die roll: {}", rng.gen_range(1, 7));
 /// ```
 ///
-/// [`EntropyRng`]: rngs/struct.EntropyRng.html
-/// [`SeedableRng`]: trait.SeedableRng.html
-/// [`SeedableRng::from_seed`]: trait.SeedableRng.html#tymethod.from_seed
+/// [`EntropyRng`]: rngs::EntropyRng
 #[cfg(feature="std")]
 pub trait FromEntropy: SeedableRng {
     /// Creates a new instance, automatically seeded with fresh entropy.
@@ -704,69 +646,13 @@
 /// }
 /// ```
 ///
-/// [`thread_rng`]: fn.thread_rng.html
-/// [`Standard`]: distributions/struct.Standard.html
+/// [`Standard`]: distributions::Standard
 #[cfg(feature="std")]
 #[inline]
 pub fn random<T>() -> T where Standard: Distribution<T> {
     thread_rng().gen()
 }
 
-// Due to rustwasm/wasm-bindgen#201 this can't be defined in the inner os
-// modules, so hack around it for now and place it at the root.
-#[cfg(all(feature = "wasm-bindgen", target_arch = "wasm32"))]
-#[doc(hidden)]
-#[allow(missing_debug_implementations)]
-pub mod __wbg_shims {
-
-    // `extern { type Foo; }` isn't supported on 1.22 syntactically, so use a
-    // macro to work around that.
-    macro_rules! rust_122_compat {
-        ($($t:tt)*) => ($($t)*)
-    }
-
-    rust_122_compat! {
-        extern crate wasm_bindgen;
-
-        pub use wasm_bindgen::prelude::*;
-
-        #[wasm_bindgen]
-        extern "C" {
-            pub type Function;
-            #[wasm_bindgen(constructor)]
-            pub fn new(s: &str) -> Function;
-            #[wasm_bindgen(method)]
-            pub fn call(this: &Function, self_: &JsValue) -> JsValue;
-
-            pub type This;
-            #[wasm_bindgen(method, getter, structural, js_name = self)]
-            pub fn self_(me: &This) -> JsValue;
-            #[wasm_bindgen(method, getter, structural)]
-            pub fn crypto(me: &This) -> JsValue;
-
-            #[derive(Clone, Debug)]
-            pub type BrowserCrypto;
-
-            // TODO: these `structural` annotations here ideally wouldn't be here to
-            // avoid a JS shim, but for now with feature detection they're
-            // unavoidable.
-            #[wasm_bindgen(method, js_name = getRandomValues, structural, getter)]
-            pub fn get_random_values_fn(me: &BrowserCrypto) -> JsValue;
-            #[wasm_bindgen(method, js_name = getRandomValues, structural)]
-            pub fn get_random_values(me: &BrowserCrypto, buf: &mut [u8]);
-
-            #[wasm_bindgen(js_name = require)]
-            pub fn node_require(s: &str) -> NodeCrypto;
-
-            #[derive(Clone, Debug)]
-            pub type NodeCrypto;
-
-            #[wasm_bindgen(method, js_name = randomFillSync, structural)]
-            pub fn random_fill_sync(me: &NodeCrypto, buf: &mut [u8]);
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use rngs::mock::StepRng;
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/adapter/read.rs cargo-0.33.0/vendor/rand/src/rngs/adapter/read.rs
--- cargo-0.32.0/vendor/rand/src/rngs/adapter/read.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/adapter/read.rs	2019-02-06 04:11:58.000000000 +0000
@@ -15,7 +15,7 @@
 
 
 /// An RNG that reads random bytes straight from any type supporting
-/// `std::io::Read`, for example files.
+/// [`std::io::Read`], for example files.
 ///
 /// This will work best with an infinite reader, but that is not required.
 ///
@@ -24,10 +24,10 @@
 ///
 /// # Panics
 ///
-/// `ReadRng` uses `std::io::read_exact`, which retries on interrupts. All other
-/// errors from the underlying reader, including when it does not have enough
-/// data, will only be reported through [`try_fill_bytes`]. The other
-/// [`RngCore`] methods will panic in case of an error.
+/// `ReadRng` uses [`std::io::Read::read_exact`], which retries on interrupts.
+/// All other errors from the underlying reader, including when it does not
+/// have enough data, will only be reported through [`try_fill_bytes`].
+/// The other [`RngCore`] methods will panic in case of an error.
 ///
 /// # Example
 ///
@@ -40,9 +40,8 @@
 /// println!("{:x}", rng.gen::<u32>());
 /// ```
 ///
-/// [`OsRng`]: ../struct.OsRng.html
-/// [`RngCore`]: ../../trait.RngCore.html
-/// [`try_fill_bytes`]: ../../trait.RngCore.html#method.tymethod.try_fill_bytes
+/// [`OsRng`]: rand_os::OsRng
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Debug)]
 pub struct ReadRng<R> {
     reader: R
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/adapter/reseeding.rs cargo-0.33.0/vendor/rand/src/rngs/adapter/reseeding.rs
--- cargo-0.32.0/vendor/rand/src/rngs/adapter/reseeding.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/adapter/reseeding.rs	2019-02-06 04:11:58.000000000 +0000
@@ -79,11 +79,11 @@
 /// # }
 /// ```
 ///
-/// [`ChaChaCore`]: ../../../rand_chacha/struct.ChaChaCore.html
-/// [`Hc128Core`]: ../../../rand_hc/struct.Hc128Core.html
-/// [`BlockRngCore`]: ../../../rand_core/block/trait.BlockRngCore.html
-/// [`ReseedingRng::new`]: struct.ReseedingRng.html#method.new
-/// [`reseed()`]: struct.ReseedingRng.html#method.reseed
+/// [`ChaChaCore`]: rand_chacha::ChaChaCore
+/// [`Hc128Core`]: rand_hc::Hc128Core
+/// [`BlockRngCore`]: rand_core::block::BlockRngCore
+/// [`ReseedingRng::new`]: ReseedingRng::new
+/// [`reseed()`]: ReseedingRng::reseed
 #[derive(Debug)]
 pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
 where R: BlockRngCore + SeedableRng,
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/entropy.rs cargo-0.33.0/vendor/rand/src/rngs/entropy.rs
--- cargo-0.32.0/vendor/rand/src/rngs/entropy.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/entropy.rs	2019-02-06 04:11:58.000000000 +0000
@@ -38,11 +38,10 @@
 /// report the error, and only the one from `OsRng`. The other [`RngCore`]
 /// methods will panic in case of an error.
 ///
-/// [`OsRng`]: struct.OsRng.html
-/// [`JitterRng`]: jitter/struct.JitterRng.html
-/// [`thread_rng`]: ../fn.thread_rng.html
-/// [`RngCore`]: ../trait.RngCore.html
-/// [`try_fill_bytes`]: ../trait.RngCore.html#method.tymethod.try_fill_bytes
+/// [`OsRng`]: rand_os::OsRng
+/// [`thread_rng`]: crate::thread_rng
+/// [`JitterRng`]: crate::rngs::JitterRng
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Debug)]
 pub struct EntropyRng {
     source: Source,
@@ -191,43 +190,11 @@
 }
 
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
+#[cfg(feature="rand_os")]
 #[derive(Clone, Debug)]
 pub struct Os(rngs::OsRng);
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
+#[cfg(feature="rand_os")]
 impl EntropySource for Os {
     fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
         let mut rng = rngs::OsRng::new()?;
@@ -240,23 +207,7 @@
     }
 }
 
-#[cfg(not(all(feature="std",
-              any(target_os = "linux", target_os = "android",
-                  target_os = "netbsd",
-                  target_os = "dragonfly",
-                  target_os = "haiku",
-                  target_os = "emscripten",
-                  target_os = "solaris",
-                  target_os = "cloudabi",
-                  target_os = "macos", target_os = "ios",
-                  target_os = "freebsd",
-                  target_os = "openbsd", target_os = "bitrig",
-                  target_os = "redox",
-                  target_os = "fuchsia",
-                  windows,
-                  all(target_arch = "wasm32", feature = "stdweb"),
-                  all(target_arch = "wasm32", feature = "wasm-bindgen"),
-))))]
+#[cfg(not(feature="std"))]
 type Os = NoSource;
 
 
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/jitter.rs cargo-0.33.0/vendor/rand/src/rngs/jitter.rs
--- cargo-0.32.0/vendor/rand/src/rngs/jitter.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/jitter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,885 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-//
-// Based on jitterentropy-library, http://www.chronox.de/jent.html.
-// Copyright Stephan Mueller <smueller@chronox.de>, 2014 - 2017.
-//
-// With permission from Stephan Mueller to relicense the Rust translation under
-// the MIT license.
-
-//! Non-physical true random number generator based on timing jitter.
-
-// Note: the C implementation of `Jitterentropy` relies on being compiled
-// without optimizations. This implementation goes through lengths to make the
-// compiler not optimize out code which does influence timing jitter, but is
-// technically dead code.
-
-use rand_core::{RngCore, CryptoRng, Error, ErrorKind, impls};
-
-use core::{fmt, mem, ptr};
-#[cfg(all(feature="std", not(target_arch = "wasm32")))]
-use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
-
-const MEMORY_BLOCKS: usize = 64;
-const MEMORY_BLOCKSIZE: usize = 32;
-const MEMORY_SIZE: usize = MEMORY_BLOCKS * MEMORY_BLOCKSIZE;
-
-/// A true random number generator based on jitter in the CPU execution time,
-/// and jitter in memory access time.
-///
-/// This is a true random number generator, as opposed to pseudo-random
-/// generators. Random numbers generated by `JitterRng` can be seen as fresh
-/// entropy. A consequence is that is orders of magnitude slower than [`OsRng`]
-/// and PRNGs (about 10<sup>3</sup>..10<sup>6</sup> slower).
-///
-/// There are very few situations where using this RNG is appropriate. Only very
-/// few applications require true entropy. A normal PRNG can be statistically
-/// indistinguishable, and a cryptographic PRNG should also be as impossible to
-/// predict.
-///
-/// Use of `JitterRng` is recommended for initializing cryptographic PRNGs when
-/// [`OsRng`] is not available.
-///
-/// `JitterRng` can be used without the standard library, but not conveniently,
-/// you must provide a high-precision timer and carefully have to follow the
-/// instructions of [`new_with_timer`].
-///
-/// This implementation is based on
-/// [Jitterentropy](http://www.chronox.de/jent.html) version 2.1.0.
-///
-/// Note: There is no accurate timer available on Wasm platforms, to help
-/// prevent fingerprinting or timing side-channel attacks. Therefore
-/// [`JitterRng::new()`] is not available on Wasm.
-///
-/// # Quality testing
-///
-/// [`JitterRng::new()`] has build-in, but limited, quality testing, however
-/// before using `JitterRng` on untested hardware, or after changes that could
-/// effect how the code is optimized (such as a new LLVM version), it is
-/// recommend to run the much more stringent
-/// [NIST SP 800-90B Entropy Estimation Suite](
-/// https://github.com/usnistgov/SP800-90B_EntropyAssessment).
-///
-/// Use the following code using [`timer_stats`] to collect the data:
-///
-/// ```no_run
-/// use rand::rngs::JitterRng;
-/// #
-/// # use std::error::Error;
-/// # use std::fs::File;
-/// # use std::io::Write;
-/// #
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// let mut rng = JitterRng::new()?;
-///
-/// // 1_000_000 results are required for the
-/// // NIST SP 800-90B Entropy Estimation Suite
-/// const ROUNDS: usize = 1_000_000;
-/// let mut deltas_variable: Vec<u8> = Vec::with_capacity(ROUNDS);
-/// let mut deltas_minimal: Vec<u8> = Vec::with_capacity(ROUNDS);
-///
-/// for _ in 0..ROUNDS {
-///     deltas_variable.push(rng.timer_stats(true) as u8);
-///     deltas_minimal.push(rng.timer_stats(false) as u8);
-/// }
-///
-/// // Write out after the statistics collection loop, to not disturb the
-/// // test results.
-/// File::create("jitter_rng_var.bin")?.write(&deltas_variable)?;
-/// File::create("jitter_rng_min.bin")?.write(&deltas_minimal)?;
-/// #
-/// # Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-///
-/// This will produce two files: `jitter_rng_var.bin` and `jitter_rng_min.bin`.
-/// Run the Entropy Estimation Suite in three configurations, as outlined below.
-/// Every run has two steps. One step to produce an estimation, another to
-/// validate the estimation.
-///
-/// 1. Estimate the expected amount of entropy that is at least available with
-///    each round of the entropy collector. This number should be greater than
-///    the amount estimated with `64 / test_timer()`.
-///    ```sh
-///    python noniid_main.py -v jitter_rng_var.bin 8
-///    restart.py -v jitter_rng_var.bin 8 <min-entropy>
-///    ```
-/// 2. Estimate the expected amount of entropy that is available in the last 4
-///    bits of the timer delta after running noice sources. Note that a value of
-///    `3.70` is the minimum estimated entropy for true randomness.
-///    ```sh
-///    python noniid_main.py -v -u 4 jitter_rng_var.bin 4
-///    restart.py -v -u 4 jitter_rng_var.bin 4 <min-entropy>
-///    ```
-/// 3. Estimate the expected amount of entropy that is available to the entropy
-///    collector if both noice sources only run their minimal number of times.
-///    This measures the absolute worst-case, and gives a lower bound for the
-///    available entropy.
-///    ```sh
-///    python noniid_main.py -v -u 4 jitter_rng_min.bin 4
-///    restart.py -v -u 4 jitter_rng_min.bin 4 <min-entropy>
-///    ```
-///
-/// [`OsRng`]: struct.OsRng.html
-/// [`JitterRng::new()`]: struct.JitterRng.html#method.new
-/// [`new_with_timer`]: struct.JitterRng.html#method.new_with_timer
-/// [`timer_stats`]: struct.JitterRng.html#method.timer_stats
-pub struct JitterRng {
-    data: u64, // Actual random number
-    // Number of rounds to run the entropy collector per 64 bits
-    rounds: u8,
-    // Timer used by `measure_jitter`
-    timer: fn() -> u64,
-    // Memory for the Memory Access noise source
-    mem_prev_index: u16,
-    // Make `next_u32` not waste 32 bits
-    data_half_used: bool,
-}
-
-// Note: `JitterRng` maintains a small 64-bit entropy pool. With every
-// `generate` 64 new bits should be integrated in the pool. If a round of
-// `generate` were to collect less than the expected 64 bit, then the returned
-// value, and the new state of the entropy pool, would be in some way related to
-// the initial state. It is therefore better if the initial state of the entropy
-// pool is different on each call to `generate`. This has a few implications:
-// - `generate` should be called once before using `JitterRng` to produce the
-//   first usable value (this is done by default in `new`);
-// - We do not zero the entropy pool after generating a result. The reference
-//   implementation also does not support zeroing, but recommends generating a
-//   new value without using it if you want to protect a previously generated
-//   'secret' value from someone inspecting the memory;
-// - Implementing `Clone` seems acceptable, as it would not cause the systematic
-//   bias a constant might cause. Only instead of one value that could be
-//   potentially related to the same initial state, there are now two.
-
-// Entropy collector state.
-// These values are not necessary to preserve across runs.
-struct EcState {
-    // Previous time stamp to determine the timer delta
-    prev_time: u64,
-    // Deltas used for the stuck test
-    last_delta: i32,
-    last_delta2: i32,
-    // Memory for the Memory Access noise source
-    mem: [u8; MEMORY_SIZE],
-}
-
-impl EcState {
-    // Stuck test by checking the:
-    // - 1st derivation of the jitter measurement (time delta)
-    // - 2nd derivation of the jitter measurement (delta of time deltas)
-    // - 3rd derivation of the jitter measurement (delta of delta of time
-    //   deltas)
-    //
-    // All values must always be non-zero.
-    // This test is a heuristic to see whether the last measurement holds
-    // entropy.
-    fn stuck(&mut self, current_delta: i32) -> bool {
-        let delta2 = self.last_delta - current_delta;
-        let delta3 = delta2 - self.last_delta2;
-
-        self.last_delta = current_delta;
-        self.last_delta2 = delta2;
-
-        current_delta == 0 || delta2 == 0 || delta3 == 0
-    }
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for JitterRng {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "JitterRng {{}}")
-    }
-}
-
-impl Clone for JitterRng {
-    fn clone(&self) -> JitterRng {
-        JitterRng {
-            data: self.data,
-            rounds: self.rounds,
-            timer: self.timer,
-            mem_prev_index: self.mem_prev_index,
-            // The 32 bits that may still be unused from the previous round are
-            // for the original to use, not for the clone.
-            data_half_used: false,
-        }
-    }
-}
-
-/// An error that can occur when [`JitterRng::test_timer`] fails.
-///
-/// [`JitterRng::test_timer`]: struct.JitterRng.html#method.test_timer
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum TimerError {
-    /// No timer available.
-    NoTimer,
-    /// Timer too coarse to use as an entropy source.
-    CoarseTimer,
-    /// Timer is not monotonically increasing.
-    NotMonotonic,
-    /// Variations of deltas of time too small.
-    TinyVariantions,
-    /// Too many stuck results (indicating no added entropy).
-    TooManyStuck,
-    #[doc(hidden)]
-    __Nonexhaustive,
-}
-
-impl TimerError {
-    fn description(&self) -> &'static str {
-        match *self {
-            TimerError::NoTimer => "no timer available",
-            TimerError::CoarseTimer => "coarse timer",
-            TimerError::NotMonotonic => "timer not monotonic",
-            TimerError::TinyVariantions => "time delta variations too small",
-            TimerError::TooManyStuck => "too many stuck results",
-            TimerError::__Nonexhaustive => unreachable!(),
-        }
-    }
-}
-
-impl fmt::Display for TimerError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.description())
-    }
-}
-
-#[cfg(feature="std")]
-impl ::std::error::Error for TimerError {
-    fn description(&self) -> &str {
-        self.description()
-    }
-}
-
-impl From<TimerError> for Error {
-    fn from(err: TimerError) -> Error {
-        // Timer check is already quite permissive of failures so we don't
-        // expect false-positive failures, i.e. any error is irrecoverable.
-        Error::with_cause(ErrorKind::Unavailable,
-                              "timer jitter failed basic quality tests", err)
-    }
-}
-
-// Initialise to zero; must be positive
-#[cfg(all(feature="std", not(target_arch = "wasm32")))]
-static JITTER_ROUNDS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-impl JitterRng {
-    /// Create a new `JitterRng`. Makes use of `std::time` for a timer, or a
-    /// platform-specific function with higher accuracy if necessary and
-    /// available.
-    ///
-    /// During initialization CPU execution timing jitter is measured a few
-    /// hundred times. If this does not pass basic quality tests, an error is
-    /// returned. The test result is cached to make subsequent calls faster.
-    #[cfg(all(feature="std", not(target_arch = "wasm32")))]
-    pub fn new() -> Result<JitterRng, TimerError> {
-        let mut state = JitterRng::new_with_timer(platform::get_nstime);
-        let mut rounds = JITTER_ROUNDS.load(Ordering::Relaxed) as u8;
-        if rounds == 0 {
-            // No result yet: run test.
-            // This allows the timer test to run multiple times; we don't care.
-            rounds = state.test_timer()?;
-            JITTER_ROUNDS.store(rounds as usize, Ordering::Relaxed);
-            info!("JitterRng: using {} rounds per u64 output", rounds);
-        }
-        state.set_rounds(rounds);
-
-        // Fill `data` with a non-zero value.
-        state.gen_entropy();
-        Ok(state)
-    }
-
-    /// Create a new `JitterRng`.
-    /// A custom timer can be supplied, making it possible to use `JitterRng` in
-    /// `no_std` environments.
-    ///
-    /// The timer must have nanosecond precision.
-    ///
-    /// This method is more low-level than `new()`. It is the responsibility of
-    /// the caller to run [`test_timer`] before using any numbers generated with
-    /// `JitterRng`, and optionally call [`set_rounds`]. Also it is important to
-    /// consume at least one `u64` before using the first result to initialize
-    /// the entropy collection pool.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # use rand::{Rng, Error};
-    /// use rand::rngs::JitterRng;
-    ///
-    /// # fn try_inner() -> Result<(), Error> {
-    /// fn get_nstime() -> u64 {
-    ///     use std::time::{SystemTime, UNIX_EPOCH};
-    ///
-    ///     let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
-    ///     // The correct way to calculate the current time is
-    ///     // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
-    ///     // But this is faster, and the difference in terms of entropy is
-    ///     // negligible (log2(10^9) == 29.9).
-    ///     dur.as_secs() << 30 | dur.subsec_nanos() as u64
-    /// }
-    ///
-    /// let mut rng = JitterRng::new_with_timer(get_nstime);
-    /// let rounds = rng.test_timer()?;
-    /// rng.set_rounds(rounds); // optional
-    /// let _ = rng.gen::<u64>();
-    ///
-    /// // Ready for use
-    /// let v: u64 = rng.gen();
-    /// # Ok(())
-    /// # }
-    ///
-    /// # let _ = try_inner();
-    /// ```
-    ///
-    /// [`test_timer`]: struct.JitterRng.html#method.test_timer
-    /// [`set_rounds`]: struct.JitterRng.html#method.set_rounds
-    pub fn new_with_timer(timer: fn() -> u64) -> JitterRng {
-        JitterRng {
-            data: 0,
-            rounds: 64,
-            timer,
-            mem_prev_index: 0,
-            data_half_used: false,
-        }
-    }
-
-    /// Configures how many rounds are used to generate each 64-bit value.
-    /// This must be greater than zero, and has a big impact on performance
-    /// and output quality.
-    ///
-    /// [`new_with_timer`] conservatively uses 64 rounds, but often less rounds
-    /// can be used. The `test_timer()` function returns the minimum number of
-    /// rounds required for full strength (platform dependent), so one may use
-    /// `rng.set_rounds(rng.test_timer()?);` or cache the value.
-    ///
-    /// [`new_with_timer`]: struct.JitterRng.html#method.new_with_timer
-    pub fn set_rounds(&mut self, rounds: u8) {
-        assert!(rounds > 0);
-        self.rounds = rounds;
-    }
-
-    // Calculate a random loop count used for the next round of an entropy
-    // collection, based on bits from a fresh value from the timer.
-    //
-    // The timer is folded to produce a number that contains at most `n_bits`
-    // bits.
-    //
-    // Note: A constant should be added to the resulting random loop count to
-    // prevent loops that run 0 times.
-    #[inline(never)]
-    fn random_loop_cnt(&mut self, n_bits: u32) -> u32 {
-        let mut rounds = 0;
-
-        let mut time = (self.timer)();
-        // Mix with the current state of the random number balance the random
-        // loop counter a bit more.
-        time ^= self.data;
-
-        // We fold the time value as much as possible to ensure that as many
-        // bits of the time stamp are included as possible.
-        let folds = (64 + n_bits - 1) / n_bits;
-        let mask = (1 << n_bits) - 1;
-        for _ in 0..folds {
-            rounds ^= time & mask;
-            time >>= n_bits;
-        }
-
-        rounds as u32
-    }
-
-    // CPU jitter noise source
-    // Noise source based on the CPU execution time jitter
-    //
-    // This function injects the individual bits of the time value into the
-    // entropy pool using an LFSR.
-    //
-    // The code is deliberately inefficient with respect to the bit shifting.
-    // This function not only acts as folding operation, but this function's
-    // execution is used to measure the CPU execution time jitter. Any change to
-    // the loop in this function implies that careful retesting must be done.
-    #[inline(never)]
-    fn lfsr_time(&mut self, time: u64, var_rounds: bool) {
-        fn lfsr(mut data: u64, time: u64) -> u64{
-            for i in 1..65 {
-                let mut tmp = time << (64 - i);
-                tmp >>= 64 - 1;
-
-                // Fibonacci LSFR with polynomial of
-                // x^64 + x^61 + x^56 + x^31 + x^28 + x^23 + 1 which is
-                // primitive according to
-                // http://poincare.matf.bg.ac.rs/~ezivkovm/publications/primpol1.pdf
-                // (the shift values are the polynomial values minus one
-                // due to counting bits from 0 to 63). As the current
-                // position is always the LSB, the polynomial only needs
-                // to shift data in from the left without wrap.
-                data ^= tmp;
-                data ^= (data >> 63) & 1;
-                data ^= (data >> 60) & 1;
-                data ^= (data >> 55) & 1;
-                data ^= (data >> 30) & 1;
-                data ^= (data >> 27) & 1;
-                data ^= (data >> 22) & 1;
-                data = data.rotate_left(1);
-            }
-            data
-        }
-
-        // Note: in the reference implementation only the last round effects
-        // `self.data`, all the other results are ignored. To make sure the
-        // other rounds are not optimised out, we first run all but the last
-        // round on a throw-away value instead of the real `self.data`.
-        let mut lfsr_loop_cnt = 0;
-        if var_rounds { lfsr_loop_cnt = self.random_loop_cnt(4) };
-
-        let mut throw_away: u64 = 0;
-        for _ in 0..lfsr_loop_cnt {
-            throw_away = lfsr(throw_away, time);
-        }
-        black_box(throw_away);
-
-        self.data = lfsr(self.data, time);
-    }
-
-    // Memory Access noise source
-    // This is a noise source based on variations in memory access times
-    //
-    // This function performs memory accesses which will add to the timing
-    // variations due to an unknown amount of CPU wait states that need to be
-    // added when accessing memory. The memory size should be larger than the L1
-    // caches as outlined in the documentation and the associated testing.
-    //
-    // The L1 cache has a very high bandwidth, albeit its access rate is usually
-    // slower than accessing CPU registers. Therefore, L1 accesses only add
-    // minimal variations as the CPU has hardly to wait. Starting with L2,
-    // significant variations are added because L2 typically does not belong to
-    // the CPU any more and therefore a wider range of CPU wait states is
-    // necessary for accesses. L3 and real memory accesses have even a wider
-    // range of wait states. However, to reliably access either L3 or memory,
-    // the `self.mem` memory must be quite large which is usually not desirable.
-    #[inline(never)]
-    fn memaccess(&mut self, mem: &mut [u8; MEMORY_SIZE], var_rounds: bool) {
-        let mut acc_loop_cnt = 128;
-        if var_rounds { acc_loop_cnt += self.random_loop_cnt(4) };
-
-        let mut index = self.mem_prev_index as usize;
-        for _ in 0..acc_loop_cnt {
-            // Addition of memblocksize - 1 to index with wrap around logic to
-            // ensure that every memory location is hit evenly.
-            // The modulus also allows the compiler to remove the indexing
-            // bounds check.
-            index = (index + MEMORY_BLOCKSIZE - 1) % MEMORY_SIZE;
-
-            // memory access: just add 1 to one byte
-            // memory access implies read from and write to memory location
-            mem[index] = mem[index].wrapping_add(1);
-        }
-        self.mem_prev_index = index as u16;
-    }
-
-    // This is the heart of the entropy generation: calculate time deltas and
-    // use the CPU jitter in the time deltas. The jitter is injected into the
-    // entropy pool.
-    //
-    // Ensure that `ec.prev_time` is primed before using the output of this
-    // function. This can be done by calling this function and not using its
-    // result.
-    fn measure_jitter(&mut self, ec: &mut EcState) -> Option<()> {
-        // Invoke one noise source before time measurement to add variations
-        self.memaccess(&mut ec.mem, true);
-
-        // Get time stamp and calculate time delta to previous
-        // invocation to measure the timing variations
-        let time = (self.timer)();
-        // Note: wrapping_sub combined with a cast to `i64` generates a correct
-        // delta, even in the unlikely case this is a timer that is not strictly
-        // monotonic.
-        let current_delta = time.wrapping_sub(ec.prev_time) as i64 as i32;
-        ec.prev_time = time;
-
-        // Call the next noise source which also injects the data
-        self.lfsr_time(current_delta as u64, true);
-
-        // Check whether we have a stuck measurement (i.e. does the last
-        // measurement holds entropy?).
-        if ec.stuck(current_delta) { return None };
-
-        // Rotate the data buffer by a prime number (any odd number would
-        // do) to ensure that every bit position of the input time stamp
-        // has an even chance of being merged with a bit position in the
-        // entropy pool. We do not use one here as the adjacent bits in
-        // successive time deltas may have some form of dependency. The
-        // chosen value of 7 implies that the low 7 bits of the next
-        // time delta value is concatenated with the current time delta.
-        self.data = self.data.rotate_left(7);
-
-        Some(())
-    }
-
-    // Shuffle the pool a bit by mixing some value with a bijective function
-    // (XOR) into the pool.
-    //
-    // The function generates a mixer value that depends on the bits set and
-    // the location of the set bits in the random number generated by the
-    // entropy source. Therefore, based on the generated random number, this
-    // mixer value can have 2^64 different values. That mixer value is
-    // initialized with the first two SHA-1 constants. After obtaining the
-    // mixer value, it is XORed into the random number.
-    //
-    // The mixer value is not assumed to contain any entropy. But due to the
-    // XOR operation, it can also not destroy any entropy present in the
-    // entropy pool.
-    #[inline(never)]
-    fn stir_pool(&mut self) {
-        // This constant is derived from the first two 32 bit initialization
-        // vectors of SHA-1 as defined in FIPS 180-4 section 5.3.1
-        // The order does not really matter as we do not rely on the specific
-        // numbers. We just pick the SHA-1 constants as they have a good mix of
-        // bit set and unset.
-        const CONSTANT: u64 = 0x67452301efcdab89;
-
-        // The start value of the mixer variable is derived from the third
-        // and fourth 32 bit initialization vector of SHA-1 as defined in
-        // FIPS 180-4 section 5.3.1
-        let mut mixer = 0x98badcfe10325476;
-
-        // This is a constant time function to prevent leaking timing
-        // information about the random number.
-        // The normal code is:
-        // ```
-        // for i in 0..64 {
-        //     if ((self.data >> i) & 1) == 1 { mixer ^= CONSTANT; }
-        // }
-        // ```
-        // This is a bit fragile, as LLVM really wants to use branches here, and
-        // we rely on it to not recognise the opportunity.
-        for i in 0..64 {
-            let apply = (self.data >> i) & 1;
-            let mask = !apply.wrapping_sub(1);
-            mixer ^= CONSTANT & mask;
-            mixer = mixer.rotate_left(1);
-        }
-
-        self.data ^= mixer;
-    }
-
-    fn gen_entropy(&mut self) -> u64 {
-        trace!("JitterRng: collecting entropy");
-
-        // Prime `ec.prev_time`, and run the noice sources to make sure the
-        // first loop round collects the expected entropy.
-        let mut ec = EcState {
-            prev_time: (self.timer)(),
-            last_delta: 0,
-            last_delta2: 0,
-            mem: [0; MEMORY_SIZE],
-        };
-        let _ = self.measure_jitter(&mut ec);
-
-        for _ in 0..self.rounds {
-            // If a stuck measurement is received, repeat measurement
-            // Note: we do not guard against an infinite loop, that would mean
-            // the timer suddenly became broken.
-            while self.measure_jitter(&mut ec).is_none() {}
-        }
-
-        // Do a single read from `self.mem` to make sure the Memory Access noise
-        // source is not optimised out.
-        black_box(ec.mem[0]);
-
-        self.stir_pool();
-        self.data
-    }
-    
-    /// Basic quality tests on the timer, by measuring CPU timing jitter a few
-    /// hundred times.
-    ///
-    /// If succesful, this will return the estimated number of rounds necessary
-    /// to collect 64 bits of entropy. Otherwise a [`TimerError`] with the cause
-    /// of the failure will be returned.
-    ///
-    /// [`TimerError`]: enum.TimerError.html
-    pub fn test_timer(&mut self) -> Result<u8, TimerError> {
-        debug!("JitterRng: testing timer ...");
-        // We could add a check for system capabilities such as `clock_getres`
-        // or check for `CONFIG_X86_TSC`, but it does not make much sense as the
-        // following sanity checks verify that we have a high-resolution timer.
-
-        let mut delta_sum = 0;
-        let mut old_delta = 0;
-
-        let mut time_backwards = 0;
-        let mut count_mod = 0;
-        let mut count_stuck = 0;
-
-        let mut ec = EcState {
-            prev_time: (self.timer)(),
-            last_delta: 0,
-            last_delta2: 0,
-            mem: [0; MEMORY_SIZE],
-        };
-
-        // TESTLOOPCOUNT needs some loops to identify edge systems.
-        // 100 is definitely too little.
-        const TESTLOOPCOUNT: u64 = 300;
-        const CLEARCACHE: u64 = 100;
-
-        for i in 0..(CLEARCACHE + TESTLOOPCOUNT) {
-            // Measure time delta of core entropy collection logic
-            let time = (self.timer)();
-            self.memaccess(&mut ec.mem, true);
-            self.lfsr_time(time, true);
-            let time2 = (self.timer)();
-
-            // Test whether timer works
-            if time == 0 || time2 == 0 {
-                return Err(TimerError::NoTimer);
-            }
-            let delta = time2.wrapping_sub(time) as i64 as i32;
-
-            // Test whether timer is fine grained enough to provide delta even
-            // when called shortly after each other -- this implies that we also
-            // have a high resolution timer
-            if delta == 0 {
-                return Err(TimerError::CoarseTimer);
-            }
-
-            // Up to here we did not modify any variable that will be
-            // evaluated later, but we already performed some work. Thus we
-            // already have had an impact on the caches, branch prediction,
-            // etc. with the goal to clear it to get the worst case
-            // measurements.
-            if i < CLEARCACHE { continue; }
-
-            if ec.stuck(delta) { count_stuck += 1; }
-
-            // Test whether we have an increasing timer.
-            if !(time2 > time) { time_backwards += 1; }
-
-            // Count the number of times the counter increases in steps of 100ns
-            // or greater.
-            if (delta % 100) == 0 { count_mod += 1; }
-
-            // Ensure that we have a varying delta timer which is necessary for
-            // the calculation of entropy -- perform this check only after the
-            // first loop is executed as we need to prime the old_delta value
-            delta_sum += (delta - old_delta).abs() as u64;
-            old_delta = delta;
-        }
-
-        // Do a single read from `self.mem` to make sure the Memory Access noise
-        // source is not optimised out.
-        black_box(ec.mem[0]);
-
-        // We allow the time to run backwards for up to three times.
-        // This can happen if the clock is being adjusted by NTP operations.
-        // If such an operation just happens to interfere with our test, it
-        // should not fail. The value of 3 should cover the NTP case being
-        // performed during our test run.
-        if time_backwards > 3 {
-            return Err(TimerError::NotMonotonic);
-        }
-
-        // Test that the available amount of entropy per round does not get to
-        // low. We expect 1 bit of entropy per round as a reasonable minimum
-        // (although less is possible, it means the collector loop has to run
-        // much more often).
-        // `assert!(delta_average >= log2(1))`
-        // `assert!(delta_sum / TESTLOOPCOUNT >= 1)`
-        // `assert!(delta_sum >= TESTLOOPCOUNT)`
-        if delta_sum < TESTLOOPCOUNT {
-            return Err(TimerError::TinyVariantions);
-        }
-
-        // Ensure that we have variations in the time stamp below 100 for at
-        // least 10% of all checks -- on some platforms, the counter increments
-        // in multiples of 100, but not always
-        if count_mod > (TESTLOOPCOUNT * 9 / 10) {
-            return Err(TimerError::CoarseTimer);
-        }
-
-        // If we have more than 90% stuck results, then this Jitter RNG is
-        // likely to not work well.
-        if count_stuck > (TESTLOOPCOUNT * 9 / 10) {
-            return Err(TimerError::TooManyStuck);
-        }
-
-        // Estimate the number of `measure_jitter` rounds necessary for 64 bits
-        // of entropy.
-        //
-        // We don't try very hard to come up with a good estimate of the
-        // available bits of entropy per round here for two reasons:
-        // 1. Simple estimates of the available bits (like Shannon entropy) are
-        //    too optimistic.
-        // 2. Unless we want to waste a lot of time during intialization, there
-        //    only a small number of samples are available.
-        //
-        // Therefore we use a very simple and conservative estimate:
-        // `let bits_of_entropy = log2(delta_average) / 2`.
-        //
-        // The number of rounds `measure_jitter` should run to collect 64 bits
-        // of entropy is `64 / bits_of_entropy`.
-        let delta_average = delta_sum / TESTLOOPCOUNT;
-
-        if delta_average >= 16 {
-            let log2 = 64 - delta_average.leading_zeros();
-            // Do something similar to roundup(64/(log2/2)):
-            Ok( ((64u32 * 2 + log2 - 1) / log2) as u8)
-        } else {
-            // For values < 16 the rounding error becomes too large, use a
-            // lookup table.
-            // Values 0 and 1 are invalid, and filtered out by the
-            // `delta_sum < TESTLOOPCOUNT` test above.
-            let log2_lookup = [0,  0, 128, 81, 64, 56, 50, 46,
-                               43, 41, 39, 38, 36, 35, 34, 33];
-            Ok(log2_lookup[delta_average as usize])
-        }
-    }
-
-    /// Statistical test: return the timer delta of one normal run of the
-    /// `JitterRng` entropy collector.
-    ///
-    /// Setting `var_rounds` to `true` will execute the memory access and the
-    /// CPU jitter noice sources a variable amount of times (just like a real
-    /// `JitterRng` round).
-    ///
-    /// Setting `var_rounds` to `false` will execute the noice sources the
-    /// minimal number of times. This can be used to measure the minimum amount
-    /// of entropy one round of the entropy collector can collect in the worst
-    /// case.
-    ///
-    /// See [Quality testing](struct.JitterRng.html#quality-testing) on how to
-    /// use `timer_stats` to test the quality of `JitterRng`.
-    pub fn timer_stats(&mut self, var_rounds: bool) -> i64 {
-        let mut mem = [0; MEMORY_SIZE];
-
-        let time = (self.timer)();
-        self.memaccess(&mut mem, var_rounds);
-        self.lfsr_time(time, var_rounds);
-        let time2 = (self.timer)();
-        time2.wrapping_sub(time) as i64
-    }
-}
-
-#[cfg(feature="std")]
-mod platform {
-    #[cfg(not(any(target_os = "macos", target_os = "ios",
-                  target_os = "windows",
-                  target_arch = "wasm32")))]
-    pub fn get_nstime() -> u64 {
-        use std::time::{SystemTime, UNIX_EPOCH};
-
-        let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
-        // The correct way to calculate the current time is
-        // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
-        // But this is faster, and the difference in terms of entropy is
-        // negligible (log2(10^9) == 29.9).
-        dur.as_secs() << 30 | dur.subsec_nanos() as u64
-    }
-
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
-    pub fn get_nstime() -> u64 {
-        extern crate libc;
-        // On Mac OS and iOS std::time::SystemTime only has 1000ns resolution.
-        // We use `mach_absolute_time` instead. This provides a CPU dependent
-        // unit, to get real nanoseconds the result should by multiplied by
-        // numer/denom from `mach_timebase_info`.
-        // But we are not interested in the exact nanoseconds, just entropy. So
-        // we use the raw result.
-        unsafe { libc::mach_absolute_time() }
-    }
-
-    #[cfg(target_os = "windows")]
-    pub fn get_nstime() -> u64 {
-        extern crate winapi;
-        unsafe {
-            let mut t = super::mem::zeroed();
-            winapi::um::profileapi::QueryPerformanceCounter(&mut t);
-            *t.QuadPart() as u64
-        }
-    }
-}
-
-// A function that is opaque to the optimizer to assist in avoiding dead-code
-// elimination. Taken from `bencher`.
-fn black_box<T>(dummy: T) -> T {
-    unsafe {
-        let ret = ptr::read_volatile(&dummy);
-        mem::forget(dummy);
-        ret
-    }
-}
-
-impl RngCore for JitterRng {
-    fn next_u32(&mut self) -> u32 {
-        // We want to use both parts of the generated entropy
-        if self.data_half_used {
-            self.data_half_used = false;
-            (self.data >> 32) as u32
-        } else {
-            self.data = self.next_u64();
-            self.data_half_used = true;
-            self.data as u32
-        }
-    }
-
-    fn next_u64(&mut self) -> u64 {
-       self.data_half_used = false;
-       self.gen_entropy()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        // Fill using `next_u32`. This is faster for filling small slices (four
-        // bytes or less), while the overhead is negligible.
-        //
-        // This is done especially for wrappers that implement `next_u32`
-        // themselves via `fill_bytes`.
-        impls::fill_bytes_via_next(self, dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
-    }
-}
-
-impl CryptoRng for JitterRng {}
-
-#[cfg(test)]
-mod test_jitter_init {
-    use super::JitterRng;
-
-    #[cfg(all(feature="std", not(target_arch = "wasm32")))]
-    #[test]
-    fn test_jitter_init() {
-        use RngCore;
-        // Because this is a debug build, measurements here are not representive
-        // of the final release build.
-        // Don't fail this test if initializing `JitterRng` fails because of a
-        // bad timer (the timer from the standard library may not have enough
-        // accuracy on all platforms).
-        match JitterRng::new() {
-            Ok(ref mut rng) => {
-                // false positives are possible, but extremely unlikely
-                assert!(rng.next_u32() | rng.next_u32() != 0);
-            },
-            Err(_) => {},
-        }
-    }
-
-    #[test]
-    fn test_jitter_bad_timer() {
-        fn bad_timer() -> u64 { 0 }
-        let mut rng = JitterRng::new_with_timer(bad_timer);
-        assert!(rng.test_timer().is_err());
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/mod.rs cargo-0.33.0/vendor/rand/src/rngs/mod.rs
--- cargo-0.32.0/vendor/rand/src/rngs/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -53,7 +53,7 @@
 //!   which is one of the recommendations by ECRYPT's eSTREAM project.
 //!
 //! The above PRNGs do not cover all use-cases; more algorithms can be found in
-//! the [`prng` module], as well as in several other crates. For example, you
+//! the [`prng`][crate::prng] module, as well as in several other crates. For example, you
 //! may wish a CSPRNG with significantly lower memory usage than [`StdRng`]
 //! while being less concerned about performance, in which case [`ChaChaRng`]
 //! is a good choice.
@@ -83,19 +83,19 @@
 //!   to reproduce the output sequence by using a fixed seed. (Don't use
 //!   [`StdRng`] or [`SmallRng`] in this case since different algorithms may be
 //!   used by future versions of Rand; use an algorithm from the
-//!   [`prng` module].)
+//!   [`prng`] module.)
 //!
 //! ## Conclusion
 //!
 //! - [`thread_rng`] is what you often want to use.
 //! - If you want more control, flexibility, or better performance, use
-//!   [`StdRng`], [`SmallRng`] or an algorithm from the [`prng` module].
+//!   [`StdRng`], [`SmallRng`] or an algorithm from the [`prng`] module.
 //! - Use [`FromEntropy::from_entropy`] to seed new PRNGs.
 //! - If you need reproducibility, use [`SeedableRng::from_seed`] combined with
 //!   a named PRNG.
 //!
 //! More information and notes on cryptographic security can be found
-//! in the [`prng` module].
+//! in the [`prng`] module.
 //!
 //! ## Examples
 //!
@@ -135,35 +135,20 @@
 //! [`CryptoRng`] is a marker trait cryptographically secure PRNGs can
 //! implement.
 //!
-//!
-// This module:
-//! [`ThreadRng`]: struct.ThreadRng.html
-//! [`StdRng`]: struct.StdRng.html
-//! [`SmallRng`]: struct.SmallRng.html
-//! [`EntropyRng`]: struct.EntropyRng.html
-//! [`OsRng`]: struct.OsRng.html
-//! [`JitterRng`]: struct.JitterRng.html
-// Other traits and functions:
-//! [`rand_core`]: https://crates.io/crates/rand_core
-//! [`prng` module]: ../prng/index.html
-//! [`CryptoRng`]: ../trait.CryptoRng.html
-//! [`FromEntropy`]: ../trait.FromEntropy.html
-//! [`FromEntropy::from_entropy`]: ../trait.FromEntropy.html#tymethod.from_entropy
-//! [`RngCore`]: ../trait.RngCore.html
-//! [`Rng`]: ../trait.Rng.html
-//! [`SeedableRng`]: ../trait.SeedableRng.html
-//! [`SeedableRng::from_rng`]: ../trait.SeedableRng.html#tymethod.from_rng
-//! [`SeedableRng::from_seed`]: ../trait.SeedableRng.html#tymethod.from_seed
-//! [`thread_rng`]: ../fn.thread_rng.html
-//! [`mock::StepRng`]: mock/struct.StepRng.html
-//! [`adapter::ReadRng`]: adapter/struct.ReadRng.html
-//! [`adapter::ReseedingRng`]: adapter/struct.ReseedingRng.html
-//! [`ChaChaRng`]: ../../rand_chacha/struct.ChaChaRng.html
+//! [`OsRng`]: rand_os::OsRng
+//! [`SmallRng`]: rngs::SmallRng
+//! [`StdRng`]: rngs::StdRng
+//! [`ThreadRng`]: rngs::ThreadRng
+//! [`EntropyRng`]: rngs::EntropyRng
+//! [`JitterRng`]: rngs::JitterRng
+//! [`mock::StepRng`]: rngs::mock::StepRng
+//! [`adapter::ReadRng`]: rngs::adapter::ReadRng
+//! [`adapter::ReseedingRng`]: rngs::adapter::ReseedingRng
+//! [`ChaChaRng`]: rand_chacha::ChaChaRng
 
 pub mod adapter;
 
 #[cfg(feature="std")] mod entropy;
-mod jitter;
 pub mod mock;   // Public so we don't export `StepRng` directly, making it a bit
                 // more clear it is intended for testing.
 mod small;
@@ -171,47 +156,12 @@
 #[cfg(feature="std")] pub(crate) mod thread;
 
 
-pub use self::jitter::{JitterRng, TimerError};
+pub use rand_jitter::{JitterRng, TimerError};
 #[cfg(feature="std")] pub use self::entropy::EntropyRng;
 
 pub use self::small::SmallRng;
 pub use self::std::StdRng;
 #[cfg(feature="std")] pub use self::thread::ThreadRng;
 
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
-mod os;
-
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb"),
-              all(target_arch = "wasm32", feature = "wasm-bindgen"),
-)))]
-pub use self::os::OsRng;
+#[cfg(feature="rand_os")]
+pub use rand_os::OsRng;
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/os.rs cargo-0.33.0/vendor/rand/src/rngs/os.rs
--- cargo-0.32.0/vendor/rand/src/rngs/os.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/os.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1275 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2013-2015 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Interface to the random number generator of the operating system.
-
-use std::fmt;
-use rand_core::{CryptoRng, RngCore, Error, impls};
-
-/// A random number generator that retrieves randomness straight from the
-/// operating system.
-///
-/// This is the preferred external source of entropy for most applications.
-/// Commonly it is used to initialize a user-space RNG, which can then be used
-/// to generate random values with much less overhead than `OsRng`.
-///
-/// You may prefer to use [`EntropyRng`] instead of `OsRng`. It is unlikely, but
-/// not entirely theoretical, for `OsRng` to fail. In such cases [`EntropyRng`]
-/// falls back on a good alternative entropy source.
-///
-/// `OsRng::new()` is guaranteed to be very cheap (after the first successful
-/// call), and will never consume more than one file handle per process.
-///
-/// # Platform sources
-///
-/// | OS               | interface
-/// |------------------|---------------------------------------------------------
-/// | Linux, Android   | [`getrandom`][1] system call if available, otherwise [`/dev/urandom`][2] after reading from `/dev/random` once
-/// | Windows          | [`RtlGenRandom`][3]
-/// | macOS, iOS       | [`SecRandomCopyBytes`][4]
-/// | FreeBSD          | [`kern.arandom`][5]
-/// | OpenBSD, Bitrig  | [`getentropy`][6]
-/// | NetBSD           | [`/dev/urandom`][7] after reading from `/dev/random` once
-/// | Dragonfly BSD    | [`/dev/random`][8]
-/// | Solaris, illumos | [`getrandom`][9] system call if available, otherwise [`/dev/random`][10]
-/// | Fuchsia OS       | [`cprng_draw`][11]
-/// | Redox            | [`rand:`][12]
-/// | CloudABI         | [`random_get`][13]
-/// | Haiku            | `/dev/random` (identical to `/dev/urandom`)
-/// | Web browsers     | [`Crypto.getRandomValues`][14] (see [Support for WebAssembly and ams.js][14])
-/// | Node.js          | [`crypto.randomBytes`][15] (see [Support for WebAssembly and ams.js][16])
-///
-/// Rand doesn't have a blanket implementation for all Unix-like operating
-/// systems that reads from `/dev/urandom`. This ensures all supported operating
-/// systems are using the recommended interface and respect maximum buffer
-/// sizes.
-///
-/// ## Support for WebAssembly and ams.js
-///
-/// The three Emscripten targets `asmjs-unknown-emscripten`,
-/// `wasm32-unknown-emscripten` and `wasm32-experimental-emscripten` use
-/// Emscripten's emulation of `/dev/random` on web browsers and Node.js.
-///
-/// The bare Wasm target `wasm32-unknown-unknown` tries to call the javascript
-/// methods directly, using either `stdweb` in combination with `cargo-web` or
-/// `wasm-bindgen` depending on what features are activated for this crate.
-///
-/// ## Early boot
-///
-/// It is possible that early in the boot process the OS hasn't had enough time
-/// yet to collect entropy to securely seed its RNG, especially on virtual
-/// machines.
-///
-/// Some operating systems always block the thread until the RNG is securely
-/// seeded. This can take anywhere from a few seconds to more than a minute.
-/// Others make a best effort to use a seed from before the shutdown and don't
-/// document much.
-///
-/// A few, Linux, NetBSD and Solaris, offer a choice between blocking, and
-/// getting an error. With `try_fill_bytes` we choose to get the error
-/// ([`ErrorKind::NotReady`]), while the other methods use a blocking interface.
-///
-/// On Linux (when the `genrandom` system call is not available) and on NetBSD
-/// reading from `/dev/urandom` never blocks, even when the OS hasn't collected
-/// enough entropy yet. As a countermeasure we try to do a single read from
-/// `/dev/random` until we know the OS RNG is initialized (and store this in a
-/// global static).
-///
-/// # Panics
-///
-/// `OsRng` is extremely unlikely to fail if `OsRng::new()`, and one read from
-/// it, where succesfull. But in case it does fail, only [`try_fill_bytes`] is
-/// able to report the cause. Depending on the error the other [`RngCore`]
-/// methods will retry several times, and panic in case the error remains.
-///
-/// [`EntropyRng`]: struct.EntropyRng.html
-/// [`RngCore`]: ../trait.RngCore.html
-/// [`try_fill_bytes`]: ../trait.RngCore.html#method.tymethod.try_fill_bytes
-/// [`ErrorKind::NotReady`]: ../enum.ErrorKind.html#variant.NotReady
-///
-/// [1]: http://man7.org/linux/man-pages/man2/getrandom.2.html
-/// [2]: http://man7.org/linux/man-pages/man4/urandom.4.html
-/// [3]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx
-/// [4]: https://developer.apple.com/documentation/security/1399291-secrandomcopybytes?language=objc
-/// [5]: https://www.freebsd.org/cgi/man.cgi?query=random&sektion=4
-/// [6]: https://man.openbsd.org/getentropy.2
-/// [7]: http://netbsd.gw.com/cgi-bin/man-cgi?random+4+NetBSD-current
-/// [8]: https://leaf.dragonflybsd.org/cgi/web-man?command=random&section=4
-/// [9]: https://docs.oracle.com/cd/E88353_01/html/E37841/getrandom-2.html
-/// [10]: https://docs.oracle.com/cd/E86824_01/html/E54777/random-7d.html
-/// [11]: https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_draw.md
-/// [12]: https://github.com/redox-os/randd/blob/master/src/main.rs
-/// [13]: https://github.com/NuxiNL/cloudabi/blob/v0.20/cloudabi.txt#L1826
-/// [14]: https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
-/// [15]: https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback
-/// [16]: #support-for-webassembly-and-amsjs
-
-
-#[derive(Clone)]
-pub struct OsRng(imp::OsRng);
-
-impl fmt::Debug for OsRng {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl OsRng {
-    /// Create a new `OsRng`.
-    pub fn new() -> Result<OsRng, Error> {
-        imp::OsRng::new().map(OsRng)
-    }
-}
-
-impl CryptoRng for OsRng {}
-
-impl RngCore for OsRng {
-    fn next_u32(&mut self) -> u32 {
-        impls::next_u32_via_fill(self)
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_fill(self)
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        use std::{time, thread};
-
-        // We cannot return Err(..), so we try to handle before panicking.
-        const MAX_RETRY_PERIOD: u32 = 10; // max 10s
-        const WAIT_DUR_MS: u32 = 100; // retry every 100ms
-        let wait_dur = time::Duration::from_millis(WAIT_DUR_MS as u64);
-        const RETRY_LIMIT: u32 = (MAX_RETRY_PERIOD * 1000) / WAIT_DUR_MS;
-        const TRANSIENT_RETRIES: u32 = 8;
-        let mut err_count = 0;
-        let mut error_logged = false;
-
-        // Maybe block until the OS RNG is initialized
-        let mut read = 0;
-        if let Ok(n) = self.0.test_initialized(dest, true) { read = n };
-        let dest = &mut dest[read..];
-
-        loop {
-            if let Err(e) = self.try_fill_bytes(dest) {
-                if err_count >= RETRY_LIMIT {
-                    error!("OsRng failed too many times; last error: {}", e);
-                    panic!("OsRng failed too many times; last error: {}", e);
-                }
-
-                if e.kind.should_wait() {
-                    if !error_logged {
-                        warn!("OsRng failed; waiting up to {}s and retrying. Error: {}",
-                                MAX_RETRY_PERIOD, e);
-                        error_logged = true;
-                    }
-                    err_count += 1;
-                    thread::sleep(wait_dur);
-                    continue;
-                } else if e.kind.should_retry() {
-                    if !error_logged {
-                        warn!("OsRng failed; retrying up to {} times. Error: {}",
-                                TRANSIENT_RETRIES, e);
-                        error_logged = true;
-                    }
-                    err_count += (RETRY_LIMIT + TRANSIENT_RETRIES - 1)
-                            / TRANSIENT_RETRIES;    // round up
-                    continue;
-                } else {
-                    error!("OsRng failed: {}", e);
-                    panic!("OsRng fatal error: {}", e);
-                }
-            }
-
-            break;
-        }
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        // Some systems do not support reading 0 random bytes.
-        // (And why waste a system call?)
-        if dest.len() == 0 { return Ok(()); }
-
-        let read = self.0.test_initialized(dest, false)?;
-        let dest = &mut dest[read..];
-
-        let max = self.0.max_chunk_size();
-        if dest.len() <= max {
-            trace!("OsRng: reading {} bytes via {}",
-                   dest.len(), self.0.method_str());
-        } else {
-            trace!("OsRng: reading {} bytes via {} in {} chunks of {} bytes",
-                   dest.len(), self.0.method_str(), (dest.len() + max) / max, max);
-        }
-        for slice in dest.chunks_mut(max) {
-            self.0.fill_chunk(slice)?;
-        }
-        Ok(())
-    }
-}
-
-trait OsRngImpl where Self: Sized {
-    // Create a new `OsRng` platform interface.
-    fn new() -> Result<Self, Error>;
-
-    // Fill a chunk with random bytes.
-    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error>;
-
-    // Test whether the OS RNG is initialized. This method may not be possible
-    // to support cheaply (or at all) on all operating systems.
-    //
-    // If `blocking` is set, this will cause the OS the block execution until
-    // its RNG is initialized.
-    //
-    // Random values that are read while this are stored in `dest`, the amount
-    // of read bytes is returned.
-    fn test_initialized(&mut self, _dest: &mut [u8], _blocking: bool)
-        -> Result<usize, Error> { Ok(0) }
-
-    // Maximum chunk size supported.
-    fn max_chunk_size(&self) -> usize { ::core::usize::MAX }
-
-    // Name of the OS interface (used for logging).
-    fn method_str(&self) -> &'static str;
-}
-
-
-
-
-// Helper functions to read from a random device such as `/dev/urandom`.
-//
-// All instances use a single internal file handle, to prevent possible
-// exhaustion of file descriptors.
-#[cfg(any(target_os = "linux", target_os = "android",
-          target_os = "netbsd", target_os = "dragonfly",
-          target_os = "solaris", target_os = "redox",
-          target_os = "haiku", target_os = "emscripten"))]
-mod random_device {
-    use {Error, ErrorKind};
-    use std::fs::File;
-    use std::io;
-    use std::io::Read;
-    use std::sync::{Once, Mutex, ONCE_INIT};
-
-    // TODO: remove outer Option when `Mutex::new(None)` is a constant expression
-    static mut READ_RNG_FILE: Option<Mutex<Option<File>>> = None;
-    static READ_RNG_ONCE: Once = ONCE_INIT;
-
-    #[allow(unused)]
-    pub fn open<F>(path: &'static str, open_fn: F) -> Result<(), Error>
-        where F: Fn(&'static str) -> Result<File, io::Error>
-    {
-        READ_RNG_ONCE.call_once(|| {
-            unsafe { READ_RNG_FILE = Some(Mutex::new(None)) }
-        });
-
-        // We try opening the file outside the `call_once` fn because we cannot
-        // clone the error, thus we must retry on failure.
-
-        let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
-        let mut guard = mutex.lock().unwrap();
-        if (*guard).is_none() {
-            info!("OsRng: opening random device {}", path);
-            let file = open_fn(path).map_err(map_err)?;
-            *guard = Some(file);
-        };
-        Ok(())
-    }
-
-    pub fn read(dest: &mut [u8]) -> Result<(), Error> {
-        // We expect this function only to be used after `random_device::open`
-        // was succesful. Therefore we can assume that our memory was set with a
-        // valid object.
-        let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
-        let mut guard = mutex.lock().unwrap();
-        let file = (*guard).as_mut().unwrap();
-
-        // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
-        file.read_exact(dest).map_err(|err| {
-            Error::with_cause(ErrorKind::Unavailable,
-                              "error reading random device", err)
-        })
-
-    }
-
-    pub fn map_err(err: io::Error) -> Error {
-        match err.kind() {
-            io::ErrorKind::Interrupted =>
-                    Error::new(ErrorKind::Transient, "interrupted"),
-            io::ErrorKind::WouldBlock =>
-                    Error::with_cause(ErrorKind::NotReady,
-                    "OS RNG not yet seeded", err),
-            _ => Error::with_cause(ErrorKind::Unavailable,
-                    "error while opening random device", err)
-        }
-    }
-}
-
-
-#[cfg(any(target_os = "linux", target_os = "android"))]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::random_device;
-    use super::OsRngImpl;
-
-    use std::io;
-    use std::io::Read;
-    use std::fs::{File, OpenOptions};
-    use std::os::unix::fs::OpenOptionsExt;
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-    use std::sync::{Once, ONCE_INIT};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng {
-        method: OsRngMethod,
-        initialized: bool,
-    }
-
-    #[derive(Clone, Debug)]
-    enum OsRngMethod {
-        GetRandom,
-        RandomDevice,
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            if is_getrandom_available() {
-                return Ok(OsRng { method: OsRngMethod::GetRandom,
-                                  initialized: false });
-            }
-            random_device::open("/dev/urandom", &|p| File::open(p))?;
-            Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            match self.method {
-                OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
-                OsRngMethod::RandomDevice => random_device::read(dest),
-            }
-        }
-
-        fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
-            -> Result<usize, Error>
-        {
-            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
-            if !self.initialized {
-                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
-            }
-            if self.initialized { return Ok(0); }
-
-            let result = match self.method {
-                OsRngMethod::GetRandom => {
-                    getrandom_try_fill(dest, blocking)?;
-                    Ok(dest.len())
-                }
-                OsRngMethod::RandomDevice => {
-                    info!("OsRng: testing random device /dev/random");
-                    let mut file = OpenOptions::new()
-                        .read(true)
-                        .custom_flags(if blocking { 0 } else { libc::O_NONBLOCK })
-                        .open("/dev/random")
-                        .map_err(random_device::map_err)?;
-                    file.read(&mut dest[..1]).map_err(random_device::map_err)?;
-                    Ok(1)
-                }
-            };
-            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
-            self.initialized = true;
-            result
-        }
-
-        fn method_str(&self) -> &'static str {
-            match self.method {
-                OsRngMethod::GetRandom => "getrandom",
-                OsRngMethod::RandomDevice => "/dev/urandom",
-            }
-        }
-    }
-
-    #[cfg(target_arch = "x86_64")]
-    const NR_GETRANDOM: libc::c_long = 318;
-    #[cfg(target_arch = "x86")]
-    const NR_GETRANDOM: libc::c_long = 355;
-    #[cfg(target_arch = "arm")]
-    const NR_GETRANDOM: libc::c_long = 384;
-    #[cfg(target_arch = "aarch64")]
-    const NR_GETRANDOM: libc::c_long = 278;
-     #[cfg(target_arch = "s390x")]
-    const NR_GETRANDOM: libc::c_long = 349;
-    #[cfg(target_arch = "powerpc")]
-    const NR_GETRANDOM: libc::c_long = 359;
-    #[cfg(target_arch = "powerpc64")]
-    const NR_GETRANDOM: libc::c_long = 359;
-    #[cfg(target_arch = "mips")] // old ABI
-    const NR_GETRANDOM: libc::c_long = 4353;
-    #[cfg(target_arch = "mips64")]
-    const NR_GETRANDOM: libc::c_long = 5313;
-    #[cfg(target_arch = "sparc")]
-    const NR_GETRANDOM: libc::c_long = 347;
-    #[cfg(target_arch = "sparc64")]
-    const NR_GETRANDOM: libc::c_long = 347;
-    #[cfg(not(any(target_arch = "x86_64", target_arch = "x86",
-                  target_arch = "arm", target_arch = "aarch64",
-                  target_arch = "s390x", target_arch = "powerpc",
-                  target_arch = "powerpc64", target_arch = "mips",
-                  target_arch = "mips64", target_arch = "sparc",
-                  target_arch = "sparc64")))]
-    const NR_GETRANDOM: libc::c_long = 0;
-
-    fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
-        const GRND_NONBLOCK: libc::c_uint = 0x0001;
-
-        if NR_GETRANDOM == 0 { return -1 };
-
-        unsafe {
-            libc::syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(),
-                          if blocking { 0 } else { GRND_NONBLOCK })
-        }
-    }
-
-    fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
-        let mut read = 0;
-        while read < dest.len() {
-            let result = getrandom(&mut dest[read..], blocking);
-            if result == -1 {
-                let err = io::Error::last_os_error();
-                let kind = err.kind();
-                if kind == io::ErrorKind::Interrupted {
-                    continue;
-                } else if kind == io::ErrorKind::WouldBlock {
-                    return Err(Error::with_cause(
-                        ErrorKind::NotReady,
-                        "getrandom not ready",
-                        err,
-                    ));
-                } else {
-                    return Err(Error::with_cause(
-                        ErrorKind::Unavailable,
-                        "unexpected getrandom error",
-                        err,
-                    ));
-                }
-            } else {
-                read += result as usize;
-            }
-        }
-        Ok(())
-    }
-
-    fn is_getrandom_available() -> bool {
-        static CHECKER: Once = ONCE_INIT;
-        static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
-
-        if NR_GETRANDOM == 0 { return false };
-
-        CHECKER.call_once(|| {
-            debug!("OsRng: testing getrandom");
-            let mut buf: [u8; 0] = [];
-            let result = getrandom(&mut buf, false);
-            let available = if result == -1 {
-                let err = io::Error::last_os_error().raw_os_error();
-                err != Some(libc::ENOSYS)
-            } else {
-                true
-            };
-            AVAILABLE.store(available, Ordering::Relaxed);
-            info!("OsRng: using {}", if available { "getrandom" } else { "/dev/urandom" });
-        });
-
-        AVAILABLE.load(Ordering::Relaxed)
-    }
-}
-
-
-#[cfg(target_os = "netbsd")]
-mod imp {
-    use Error;
-    use super::random_device;
-    use super::OsRngImpl;
-
-    use std::fs::File;
-    use std::io::Read;
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng { initialized: bool }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            random_device::open("/dev/urandom", &|p| File::open(p))?;
-            Ok(OsRng { initialized: false })
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            random_device::read(dest)
-        }
-
-        // Read a single byte from `/dev/random` to determine if the OS RNG is
-        // already seeded. NetBSD always blocks if not yet ready.
-        fn test_initialized(&mut self, dest: &mut [u8], _blocking: bool)
-            -> Result<usize, Error>
-        {
-            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
-            if !self.initialized {
-                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
-            }
-            if self.initialized { return Ok(0); }
-
-            info!("OsRng: testing random device /dev/random");
-            let mut file =
-                File::open("/dev/random").map_err(random_device::map_err)?;
-            file.read(&mut dest[..1]).map_err(random_device::map_err)?;
-
-            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
-            self.initialized = true;
-            Ok(1)
-        }
-
-        fn method_str(&self) -> &'static str { "/dev/urandom" }
-    }
-}
-
-
-#[cfg(any(target_os = "dragonfly",
-          target_os = "haiku",
-          target_os = "emscripten"))]
-mod imp {
-    use Error;
-    use super::random_device;
-    use super::OsRngImpl;
-    use std::fs::File;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng();
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            random_device::open("/dev/random", &|p| File::open(p))?;
-            Ok(OsRng())
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            random_device::read(dest)
-        }
-
-        #[cfg(target_os = "emscripten")]
-        fn max_chunk_size(&self) -> usize {
-            // `Crypto.getRandomValues` documents `dest` should be at most 65536
-            // bytes. `crypto.randomBytes` documents: "To minimize threadpool
-            // task length variation, partition large randomBytes requests when
-            // doing so as part of fulfilling a client request.
-            65536
-        }
-
-        fn method_str(&self) -> &'static str { "/dev/random" }
-    }
-}
-
-
-// Read from `/dev/random`, with chunks of limited size (1040 bytes).
-// `/dev/random` uses the Hash_DRBG with SHA512 algorithm from NIST SP 800-90A.
-// `/dev/urandom` uses the FIPS 186-2 algorithm, which is considered less
-// secure. We choose to read from `/dev/random`.
-//
-// Since Solaris 11.3 the `getrandom` syscall is available. To make sure we can
-// compile on both Solaris and on OpenSolaris derivatives, that do not have the
-// function, we do a direct syscall instead of calling a library function.
-//
-// We have no way to differentiate between Solaris, illumos, SmartOS, etc.
-#[cfg(target_os = "solaris")]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::random_device;
-    use super::OsRngImpl;
-
-    use std::io;
-    use std::io::Read;
-    use std::fs::{File, OpenOptions};
-    use std::os::unix::fs::OpenOptionsExt;
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng {
-        method: OsRngMethod,
-        initialized: bool,
-    }
-
-    #[derive(Clone, Debug)]
-    enum OsRngMethod {
-        GetRandom,
-        RandomDevice,
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            if is_getrandom_available() {
-                return Ok(OsRng { method: OsRngMethod::GetRandom,
-                                  initialized: false });
-            }
-            let open = |p| OpenOptions::new()
-                .read(true)
-                .custom_flags(libc::O_NONBLOCK)
-                .open(p);
-            random_device::open("/dev/random", &open)?;
-            Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            match self.method {
-                OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
-                OsRngMethod::RandomDevice => random_device::read(dest),
-            }
-        }
-
-        fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
-            -> Result<usize, Error>
-        {
-            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
-            if !self.initialized {
-                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
-            }
-            if self.initialized { return Ok(0); }
-
-            let chunk_len = ::core::cmp::min(1024, dest.len());
-            let dest = &mut dest[..chunk_len];
-
-            match self.method {
-                OsRngMethod::GetRandom => getrandom_try_fill(dest, blocking)?,
-                OsRngMethod::RandomDevice => {
-                    if blocking {
-                        info!("OsRng: testing random device /dev/random");
-                        // We already have a non-blocking handle, but now need a
-                        // blocking one. Not much choice except opening it twice
-                        let mut file = File::open("/dev/random")
-                            .map_err(random_device::map_err)?;
-                        file.read(dest).map_err(random_device::map_err)?;
-                    } else {
-                        self.fill_chunk(dest)?;
-                    }
-                }
-            };
-            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
-            self.initialized = true;
-            Ok(chunk_len)
-        }
-
-        fn max_chunk_size(&self) -> usize {
-            // The documentation says 1024 is the maximum for getrandom, but
-            // 1040 for /dev/random.
-            1024
-        }
-
-        fn method_str(&self) -> &'static str {
-            match self.method {
-                OsRngMethod::GetRandom => "getrandom",
-                OsRngMethod::RandomDevice => "/dev/random",
-            }
-        }
-    }
-
-    fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
-        extern "C" {
-            fn syscall(number: libc::c_long, ...) -> libc::c_long;
-        }
-
-        const SYS_GETRANDOM: libc::c_long = 143;
-        const GRND_NONBLOCK: libc::c_uint = 0x0001;
-        const GRND_RANDOM: libc::c_uint = 0x0002;
-
-        unsafe {
-            syscall(SYS_GETRANDOM, buf.as_mut_ptr(), buf.len(),
-                    if blocking { 0 } else { GRND_NONBLOCK } | GRND_RANDOM)
-        }
-    }
-
-    fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
-        let result = getrandom(dest, blocking);
-        if result == -1 || result == 0 {
-            let err = io::Error::last_os_error();
-            let kind = err.kind();
-            if kind == io::ErrorKind::WouldBlock {
-                return Err(Error::with_cause(
-                    ErrorKind::NotReady,
-                    "getrandom not ready",
-                    err,
-                ));
-            } else {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "unexpected getrandom error",
-                    err,
-                ));
-            }
-        } else if result != dest.len() as i64 {
-            return Err(Error::new(ErrorKind::Unavailable,
-                                  "unexpected getrandom error"));
-        }
-        Ok(())
-    }
-
-    fn is_getrandom_available() -> bool {
-        use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-        use std::sync::{Once, ONCE_INIT};
-
-        static CHECKER: Once = ONCE_INIT;
-        static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
-
-        CHECKER.call_once(|| {
-            debug!("OsRng: testing getrandom");
-            let mut buf: [u8; 0] = [];
-            let result = getrandom(&mut buf, false);
-            let available = if result == -1 {
-                let err = io::Error::last_os_error().raw_os_error();
-                err != Some(libc::ENOSYS)
-            } else {
-                true
-            };
-            AVAILABLE.store(available, Ordering::Relaxed);
-            info!("OsRng: using {}", if available { "getrandom" } else { "/dev/random" });
-        });
-
-        AVAILABLE.load(Ordering::Relaxed)
-    }
-}
-
-
-#[cfg(target_os = "cloudabi")]
-mod imp {
-    extern crate cloudabi;
-
-    use std::io;
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let errno = unsafe { cloudabi::random_get(dest) };
-            if errno == cloudabi::errno::SUCCESS {
-                Ok(())
-            } else {
-                // Cloudlibc provides its own `strerror` implementation so we
-                // can use `from_raw_os_error` here.
-                Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "random_get() system call failed",
-                    io::Error::from_raw_os_error(errno as i32),
-                ))
-            }
-        }
-
-        fn method_str(&self) -> &'static str { "cloudabi::random_get" }
-    }
-}
-
-
-#[cfg(any(target_os = "macos", target_os = "ios"))]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::io;
-    use self::libc::{c_int, size_t};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    enum SecRandom {}
-
-    #[allow(non_upper_case_globals)]
-    const kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;
-
-    #[link(name = "Security", kind = "framework")]
-    extern {
-        fn SecRandomCopyBytes(rnd: *const SecRandom,
-                              count: size_t, bytes: *mut u8) -> c_int;
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let ret = unsafe {
-                SecRandomCopyBytes(kSecRandomDefault,
-                                   dest.len() as size_t,
-                                   dest.as_mut_ptr())
-            };
-            if ret == -1 {
-                Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "couldn't generate random bytes",
-                    io::Error::last_os_error()))
-            } else {
-                Ok(())
-            }
-        }
-
-        fn method_str(&self) -> &'static str { "SecRandomCopyBytes" }
-    }
-}
-
-
-#[cfg(target_os = "freebsd")]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::ptr;
-    use std::io;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let mib = [libc::CTL_KERN, libc::KERN_ARND];
-            let mut len = dest.len();
-            let ret = unsafe {
-                libc::sysctl(mib.as_ptr(), mib.len() as libc::c_uint,
-                             dest.as_mut_ptr() as *mut _, &mut len,
-                             ptr::null(), 0)
-            };
-            if ret == -1 || len != dest.len() {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "kern.arandom sysctl failed",
-                    io::Error::last_os_error()));
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize { 256 }
-
-        fn method_str(&self) -> &'static str { "kern.arandom" }
-    }
-}
-
-
-#[cfg(any(target_os = "openbsd", target_os = "bitrig"))]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::io;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let ret = unsafe {
-                libc::getentropy(dest.as_mut_ptr() as *mut libc::c_void, dest.len())
-            };
-            if ret == -1 {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "getentropy failed",
-                    io::Error::last_os_error()));
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize { 256 }
-
-        fn method_str(&self) -> &'static str { "getentropy" }
-    }
-}
-
-
-#[cfg(target_os = "redox")]
-mod imp {
-    use Error;
-    use super::random_device;
-    use super::OsRngImpl;
-    use std::fs::File;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng();
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            random_device::open("rand:", &|p| File::open(p))?;
-            Ok(OsRng())
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            random_device::read(dest)
-        }
-
-        fn method_str(&self) -> &'static str { "'rand:'" }
-    }
-}
-
-
-#[cfg(target_os = "fuchsia")]
-mod imp {
-    extern crate fuchsia_zircon;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let mut read = 0;
-            while read < dest.len() {
-                match fuchsia_zircon::cprng_draw(&mut dest[read..]) {
-                    Ok(actual) => read += actual,
-                    Err(e) => {
-                        return Err(Error::with_cause(
-                            ErrorKind::Unavailable,
-                            "cprng_draw failed",
-                            e.into_io_error()));
-                    }
-                };
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize {
-            fuchsia_zircon::sys::ZX_CPRNG_DRAW_MAX_LEN
-        }
-
-        fn method_str(&self) -> &'static str { "cprng_draw" }
-    }
-}
-
-
-#[cfg(windows)]
-mod imp {
-    extern crate winapi;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::io;
-
-    use self::winapi::shared::minwindef::ULONG;
-    use self::winapi::um::ntsecapi::RtlGenRandom;
-    use self::winapi::um::winnt::PVOID;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let ret = unsafe {
-                RtlGenRandom(dest.as_mut_ptr() as PVOID, dest.len() as ULONG)
-            };
-            if ret == 0 {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "couldn't generate random bytes",
-                    io::Error::last_os_error()));
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize { <ULONG>::max_value() as usize }
-
-        fn method_str(&self) -> &'static str { "RtlGenRandom" }
-    }
-}
-
-
-#[cfg(all(target_arch = "wasm32",
-          not(target_os = "emscripten"),
-          feature = "stdweb"))]
-mod imp {
-    use std::mem;
-    use stdweb::unstable::TryInto;
-    use stdweb::web::error::Error as WebError;
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    enum OsRngMethod {
-        Browser,
-        Node
-    }
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng(OsRngMethod);
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            let result = js! {
-                try {
-                    if (
-                        typeof self === "object" &&
-                        typeof self.crypto === "object" &&
-                        typeof self.crypto.getRandomValues === "function"
-                    ) {
-                        return { success: true, ty: 1 };
-                    }
-
-                    if (typeof require("crypto").randomBytes === "function") {
-                        return { success: true, ty: 2 };
-                    }
-
-                    return { success: false, error: new Error("not supported") };
-                } catch(err) {
-                    return { success: false, error: err };
-                }
-            };
-
-            if js!{ return @{ result.as_ref() }.success } == true {
-                let ty = js!{ return @{ result }.ty };
-
-                if ty == 1 { Ok(OsRng(OsRngMethod::Browser)) }
-                else if ty == 2 { Ok(OsRng(OsRngMethod::Node)) }
-                else { unreachable!() }
-            } else {
-                let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-                Err(Error::with_cause(ErrorKind::Unavailable, "WASM Error", err))
-            }
-        }
-
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            assert_eq!(mem::size_of::<usize>(), 4);
-
-            let len = dest.len() as u32;
-            let ptr = dest.as_mut_ptr() as i32;
-
-            let result = match self.0 {
-                OsRngMethod::Browser => js! {
-                    try {
-                        let array = new Uint8Array(@{ len });
-                        self.crypto.getRandomValues(array);
-                        HEAPU8.set(array, @{ ptr });
-
-                        return { success: true };
-                    } catch(err) {
-                        return { success: false, error: err };
-                    }
-                },
-                OsRngMethod::Node => js! {
-                    try {
-                        let bytes = require("crypto").randomBytes(@{ len });
-                        HEAPU8.set(new Uint8Array(bytes), @{ ptr });
-
-                        return { success: true };
-                    } catch(err) {
-                        return { success: false, error: err };
-                    }
-                }
-            };
-
-            if js!{ return @{ result.as_ref() }.success } == true {
-                Ok(())
-            } else {
-                let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-                Err(Error::with_cause(ErrorKind::Unexpected, "WASM Error", err))
-            }
-        }
-
-        fn max_chunk_size(&self) -> usize { 65536 }
-
-        fn method_str(&self) -> &'static str {
-            match self.0 {
-                OsRngMethod::Browser => "Crypto.getRandomValues",
-                OsRngMethod::Node => "crypto.randomBytes",
-            }
-        }
-    }
-}
-
-#[cfg(all(target_arch = "wasm32",
-          not(target_os = "emscripten"),
-          not(feature = "stdweb"),
-          feature = "wasm-bindgen"))]
-mod imp {
-    use __wbg_shims::*;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    pub enum OsRng {
-        Node(NodeCrypto),
-        Browser(BrowserCrypto),
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            // First up we need to detect if we're running in node.js or a
-            // browser. To do this we get ahold of the `this` object (in a bit
-            // of a roundabout fashion).
-            //
-            // Once we have `this` we look at its `self` property, which is
-            // only defined on the web (either a main window or web worker).
-            let this = Function::new("return this").call(&JsValue::undefined());
-            assert!(this != JsValue::undefined());
-            let this = This::from(this);
-            let is_browser = this.self_() != JsValue::undefined();
-
-            if !is_browser {
-                return Ok(OsRng::Node(node_require("crypto")))
-            }
-
-            // If `self` is defined then we're in a browser somehow (main window
-            // or web worker). Here we want to try to use
-            // `crypto.getRandomValues`, but if `crypto` isn't defined we assume
-            // we're in an older web browser and the OS RNG isn't available.
-            let crypto = this.crypto();
-            if crypto.is_undefined() {
-                let msg = "self.crypto is undefined";
-                return Err(Error::new(ErrorKind::Unavailable, msg))
-            }
-
-            // Test if `crypto.getRandomValues` is undefined as well
-            let crypto: BrowserCrypto = crypto.into();
-            if crypto.get_random_values_fn().is_undefined() {
-                let msg = "crypto.getRandomValues is undefined";
-                return Err(Error::new(ErrorKind::Unavailable, msg))
-            }
-
-            // Ok! `self.crypto.getRandomValues` is a defined value, so let's
-            // assume we can do browser crypto.
-            Ok(OsRng::Browser(crypto))
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            match *self {
-                OsRng::Node(ref n) => n.random_fill_sync(dest),
-                OsRng::Browser(ref n) => n.get_random_values(dest),
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize {
-            match *self {
-                OsRng::Node(_) => usize::max_value(),
-                OsRng::Browser(_) => {
-                    // see https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
-                    //
-                    // where it says:
-                    //
-                    // > A QuotaExceededError DOMException is thrown if the
-                    // > requested length is greater than 65536 bytes.
-                    65536
-                }
-            }
-        }
-
-        fn method_str(&self) -> &'static str {
-            match *self {
-                OsRng::Node(_) => "crypto.randomFillSync",
-                OsRng::Browser(_) => "crypto.getRandomValues",
-            }
-        }
-    }
-}
-
-
-#[cfg(test)]
-mod test {
-    use RngCore;
-    use super::OsRng;
-
-    #[test]
-    fn test_os_rng() {
-        let mut r = OsRng::new().unwrap();
-
-        r.next_u32();
-        r.next_u64();
-
-        let mut v1 = [0u8; 1000];
-        r.fill_bytes(&mut v1);
-
-        let mut v2 = [0u8; 1000];
-        r.fill_bytes(&mut v2);
-
-        let mut n_diff_bits = 0;
-        for i in 0..v1.len() {
-            n_diff_bits += (v1[i] ^ v2[i]).count_ones();
-        }
-
-        // Check at least 1 bit per byte differs. p(failure) < 1e-1000 with random input.
-        assert!(n_diff_bits >= v1.len() as u32);
-    }
-
-    #[test]
-    fn test_os_rng_empty() {
-        let mut r = OsRng::new().unwrap();
-
-        let mut empty = [0u8; 0];
-        r.fill_bytes(&mut empty);
-    }
-
-    #[test]
-    fn test_os_rng_huge() {
-        let mut r = OsRng::new().unwrap();
-
-        let mut huge = [0u8; 100_000];
-        r.fill_bytes(&mut huge);
-    }
-
-    #[cfg(not(any(target_arch = "wasm32", target_arch = "asmjs")))]
-    #[test]
-    fn test_os_rng_tasks() {
-        use std::sync::mpsc::channel;
-        use std::thread;
-
-        let mut txs = vec!();
-        for _ in 0..20 {
-            let (tx, rx) = channel();
-            txs.push(tx);
-
-            thread::spawn(move|| {
-                // wait until all the tasks are ready to go.
-                rx.recv().unwrap();
-
-                // deschedule to attempt to interleave things as much
-                // as possible (XXX: is this a good test?)
-                let mut r = OsRng::new().unwrap();
-                thread::yield_now();
-                let mut v = [0u8; 1000];
-
-                for _ in 0..100 {
-                    r.next_u32();
-                    thread::yield_now();
-                    r.next_u64();
-                    thread::yield_now();
-                    r.fill_bytes(&mut v);
-                    thread::yield_now();
-                }
-            });
-        }
-
-        // start all the tasks
-        for tx in txs.iter() {
-            tx.send(()).unwrap();
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/small.rs cargo-0.33.0/vendor/rand/src/rngs/small.rs
--- cargo-0.32.0/vendor/rand/src/rngs/small.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/small.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,9 +10,9 @@
 
 use {RngCore, SeedableRng, Error};
 
-#[cfg(all(rust_1_26, target_pointer_width = "64"))]
+#[cfg(all(all(rustc_1_26, not(target_os = "emscripten")), target_pointer_width = "64"))]
 type Rng = ::rand_pcg::Pcg64Mcg;
-#[cfg(not(all(rust_1_26, target_pointer_width = "64")))]
+#[cfg(not(all(all(rustc_1_26, not(target_os = "emscripten")), target_pointer_width = "64")))]
 type Rng = ::rand_pcg::Pcg32;
 
 /// An RNG recommended when small state, cheap initialization and good
@@ -24,11 +24,13 @@
 /// future library versions may use a different internal generator with
 /// different output. Further, this generator may not be portable and can
 /// produce different output depending on the architecture. If you require
-/// reproducible output, use a named RNG. Refer to the documentation on the
-/// [`prng` module](../prng/index.html).
-///
-/// The current algorithm is [`Pcg64Mcg`] on 64-bit platforms with Rust version
-/// 1.26 and later, or [`Pcg32`] otherwise.
+/// reproducible output, use a named RNG.
+/// Refer to [The Book](https://rust-random.github.io/book/guide-rngs.html).
+/// 
+///
+/// The current algorithm is [`Pcg64Mcg`][rand_pcg::Pcg64Mcg] on 64-bit platforms with Rust version
+/// 1.26 and later, or [`Pcg32`][rand_pcg::Pcg32] otherwise. Both are found in
+/// the [rand_pcg] crate.
 ///
 /// # Examples
 ///
@@ -64,11 +66,10 @@
 ///     .collect();
 /// ```
 ///
-/// [`FromEntropy`]: ../trait.FromEntropy.html
-/// [`StdRng`]: struct.StdRng.html
-/// [`thread_rng`]: ../fn.thread_rng.html
-/// [`Pcg64Mcg`]: ../../rand_pcg/type.Pcg64Mcg.html
-/// [`Pcg32`]: ../../rand_pcg/type.Pcg32.html
+/// [`FromEntropy`]: crate::FromEntropy
+/// [`StdRng`]: crate::rngs::StdRng
+/// [`thread_rng`]: crate::thread_rng
+/// [rand_pcg]: https://crates.io/crates/rand_pcg
 #[derive(Clone, Debug)]
 pub struct SmallRng(Rng);
 
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/std.rs cargo-0.33.0/vendor/rand/src/rngs/std.rs
--- cargo-0.32.0/vendor/rand/src/rngs/std.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/std.rs	2019-02-06 04:11:58.000000000 +0000
@@ -15,16 +15,20 @@
 /// on the current platform, to be statistically strong and unpredictable
 /// (meaning a cryptographically secure PRNG).
 ///
-/// The current algorithm used on all platforms is [HC-128].
+/// The current algorithm used on all platforms is [HC-128], found in the
+/// [rand_hc] crate.
 ///
 /// Reproducibility of output from this generator is however not required, thus
 /// future library versions may use a different internal generator with
 /// different output. Further, this generator may not be portable and can
 /// produce different output depending on the architecture. If you require
-/// reproducible output, use a named RNG, for example [`ChaChaRng`].
+/// reproducible output, use a named RNG, for example [`ChaChaRng`] from the
+/// [rand_chacha] crate.
 ///
-/// [HC-128]: ../../rand_hc/struct.Hc128Rng.html
-/// [`ChaChaRng`]: ../../rand_chacha/struct.ChaChaRng.html
+/// [HC-128]: rand_hc::Hc128Rng
+/// [`ChaChaRng`]: rand_chacha::ChaChaRng
+/// [rand_hc]: https://crates.io/crates/rand_hc
+/// [rand_chacha]: https://crates.io/crates/rand_chacha
 #[derive(Clone, Debug)]
 pub struct StdRng(Hc128Rng);
 
diff -Nru cargo-0.32.0/vendor/rand/src/rngs/thread.rs cargo-0.33.0/vendor/rand/src/rngs/thread.rs
--- cargo-0.32.0/vendor/rand/src/rngs/thread.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/rngs/thread.rs	2019-02-06 04:11:58.000000000 +0000
@@ -64,11 +64,9 @@
 /// Cloning this handle just produces a new reference to the same thread-local
 /// generator.
 /// 
-/// [`thread_rng`]: ../fn.thread_rng.html
-/// [`ReseedingRng`]: adapter/struct.ReseedingRng.html
-/// [`StdRng`]: struct.StdRng.html
-/// [`EntropyRng`]: struct.EntropyRng.html
-/// [HC-128]: ../../rand_hc/struct.Hc128Rng.html
+/// [`ReseedingRng`]: crate::rngs::adapter::ReseedingRng
+/// [`StdRng`]: crate::rngs::StdRng
+/// [HC-128]: rand_hc::Hc128Rng
 #[derive(Clone, Debug)]
 pub struct ThreadRng {
     // use of raw pointer implies type is neither Send nor Sync
@@ -87,18 +85,23 @@
     }
 );
 
-/// Retrieve the lazily-initialized thread-local random number
-/// generator, seeded by the system. Intended to be used in method
-/// chaining style, e.g. `thread_rng().gen::<i32>()`, or cached locally, e.g.
-/// `let mut rng = thread_rng();`.
+/// Retrieve the lazily-initialized thread-local random number generator,
+/// seeded by the system. Intended to be used in method chaining style,
+/// e.g. `thread_rng().gen::<i32>()`, or cached locally, e.g.
+/// `let mut rng = thread_rng();`.  Invoked by the `Default` trait, making
+/// `ThreadRng::default()` equivelent.
 ///
 /// For more information see [`ThreadRng`].
-///
-/// [`ThreadRng`]: rngs/struct.ThreadRng.html
 pub fn thread_rng() -> ThreadRng {
     ThreadRng { rng: THREAD_RNG_KEY.with(|t| t.get()) }
 }
 
+impl Default for ThreadRng {
+    fn default() -> ThreadRng {
+        ::prelude::thread_rng()
+    }
+}
+
 impl RngCore for ThreadRng {
     #[inline(always)]
     fn next_u32(&mut self) -> u32 {
@@ -125,7 +128,6 @@
 #[cfg(test)]
 mod test {
     #[test]
-    #[cfg(not(feature="stdweb"))]
     fn test_thread_rng() {
         use Rng;
         let mut r = ::thread_rng();
diff -Nru cargo-0.32.0/vendor/rand/src/seq/index.rs cargo-0.33.0/vendor/rand/src/seq/index.rs
--- cargo-0.32.0/vendor/rand/src/seq/index.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/seq/index.rs	2019-02-06 04:11:58.000000000 +0000
@@ -39,7 +39,7 @@
 
     /// Return the value at the given `index`.
     ///
-    /// (Note: we cannot implement `std::ops::Index` because of lifetime
+    /// (Note: we cannot implement [`std::ops::Index`] because of lifetime
     /// restrictions.)
     pub fn index(&self, index: usize) -> usize {
         match self {
diff -Nru cargo-0.32.0/vendor/rand/src/seq/mod.rs cargo-0.33.0/vendor/rand/src/seq/mod.rs
--- cargo-0.32.0/vendor/rand/src/seq/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand/src/seq/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -98,7 +98,7 @@
     /// // 50% chance to print 'a', 25% chance to print 'b', 25% chance to print 'c'
     /// println!("{:?}", choices.choose_weighted(&mut rng, |item| item.1).unwrap().0);
     /// ```
-    /// [`choose`]: trait.SliceRandom.html#method.choose
+    /// [`choose`]: SliceRandom::choose
     #[cfg(feature = "alloc")]
     fn choose_weighted<R, F, B, X>(&self, rng: &mut R, weight: F) -> Result<&Self::Item, WeightedError>
         where R: Rng + ?Sized,
@@ -117,8 +117,8 @@
     ///
     /// See also [`choose_weighted`].
     ///
-    /// [`choose_mut`]: trait.SliceRandom.html#method.choose_mut
-    /// [`choose_weighted`]: trait.SliceRandom.html#method.choose_weighted
+    /// [`choose_mut`]: SliceRandom::choose_mut
+    /// [`choose_weighted`]: SliceRandom::choose_weighted
     #[cfg(feature = "alloc")]
     fn choose_weighted_mut<R, F, B, X>(&mut self, rng: &mut R, weight: F) -> Result<&mut Self::Item, WeightedError>
         where R: Rng + ?Sized,
@@ -181,8 +181,8 @@
     /// This likely consumes multiple random numbers, but the exact number
     /// is unspecified.
     ///
-    /// [`choose`]: trait.SliceRandom.html#method.choose
-    /// [`choose_mut`]: trait.SliceRandom.html#method.choose_mut
+    /// [`choose`]: SliceRandom::method.choose
+    /// [`choose_mut`]: SliceRandom::choose_mut
     fn choose<R>(mut self, rng: &mut R) -> Option<Self::Item>
         where R: Rng + ?Sized
     {
@@ -406,8 +406,7 @@
 impl<I> IteratorRandom for I where I: Iterator + Sized {}
 
 
-/// Iterator over multiple choices, as returned by [`SliceRandom::choose_multiple](
-/// trait.SliceRandom.html#method.choose_multiple).
+/// Iterator over multiple choices, as returned by [`SliceRandom::choose_multiple]
 #[cfg(feature = "alloc")]
 #[derive(Debug)]
 pub struct SliceChooseIter<'a, S: ?Sized + 'a, T: 'a> {
@@ -443,8 +442,6 @@
 /// Randomly sample `amount` elements from a finite iterator.
 ///
 /// Deprecated: use [`IteratorRandom::choose_multiple`] instead.
-/// 
-/// [`IteratorRandom::choose_multiple`]: trait.IteratorRandom.html#method.choose_multiple
 #[cfg(feature = "alloc")]
 #[deprecated(since="0.6.0", note="use IteratorRandom::choose_multiple instead")]
 pub fn sample_iter<T, I, R>(rng: &mut R, iterable: I, amount: usize) -> Result<Vec<T>, Vec<T>>
@@ -470,8 +467,6 @@
 /// Panics if `amount > slice.len()`
 ///
 /// Deprecated: use [`SliceRandom::choose_multiple`] instead.
-/// 
-/// [`SliceRandom::choose_multiple`]: trait.SliceRandom.html#method.choose_multiple
 #[cfg(feature = "alloc")]
 #[deprecated(since="0.6.0", note="use SliceRandom::choose_multiple instead")]
 pub fn sample_slice<R, T>(rng: &mut R, slice: &[T], amount: usize) -> Vec<T>
@@ -494,8 +489,6 @@
 /// Panics if `amount > slice.len()`
 ///
 /// Deprecated: use [`SliceRandom::choose_multiple`] instead.
-/// 
-/// [`SliceRandom::choose_multiple`]: trait.SliceRandom.html#method.choose_multiple
 #[cfg(feature = "alloc")]
 #[deprecated(since="0.6.0", note="use SliceRandom::choose_multiple instead")]
 pub fn sample_slice_ref<'a, R, T>(rng: &mut R, slice: &'a [T], amount: usize) -> Vec<&'a T>
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/appveyor.yml cargo-0.33.0/vendor/rand-0.5.5/appveyor.yml
--- cargo-0.32.0/vendor/rand-0.5.5/appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-environment:
-
-  # At the time this was added AppVeyor was having troubles with checking
-  # revocation of SSL certificates of sites like static.rust-lang.org and what
-  # we think is crates.io. The libcurl HTTP client by default checks for
-  # revocation on Windows and according to a mailing list [1] this can be
-  # disabled.
-  #
-  # The `CARGO_HTTP_CHECK_REVOKE` env var here tells cargo to disable SSL
-  # revocation checking on Windows in libcurl. Note, though, that rustup, which
-  # we're using to download Rust here, also uses libcurl as the default backend.
-  # Unlike Cargo, however, rustup doesn't have a mechanism to disable revocation
-  # checking. To get rustup working we set `RUSTUP_USE_HYPER` which forces it to
-  # use the Hyper instead of libcurl backend. Both Hyper and libcurl use
-  # schannel on Windows but it appears that Hyper configures it slightly
-  # differently such that revocation checking isn't turned on by default.
-  #
-  # [1]: https://curl.haxx.se/mail/lib-2016-03/0202.html
-  RUSTUP_USE_HYPER: 1
-  CARGO_HTTP_CHECK_REVOKE: false
-
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  - TARGET: i686-pc-windows-msvc
-install:
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo test --all # cannot use --all and --features together
-  - cargo test --all --benches
-  - cargo test --features serde1,log,nightly
-  - cargo test --tests --no-default-features --features=alloc,serde1
-  - cargo test --package rand_core --no-default-features --features=alloc,serde1
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/benches/distributions.rs cargo-0.33.0/vendor/rand-0.5.5/benches/distributions.rs
--- cargo-0.32.0/vendor/rand-0.5.5/benches/distributions.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/benches/distributions.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-#![feature(test)]
-#![cfg_attr(all(feature="i128_support", feature="nightly"), allow(stable_features))] // stable since 2018-03-27
-#![cfg_attr(all(feature="i128_support", feature="nightly"), feature(i128_type, i128))]
-
-extern crate test;
-extern crate rand;
-
-const RAND_BENCH_N: u64 = 1000;
-
-use std::mem::size_of;
-use test::Bencher;
-
-use rand::{Rng, FromEntropy, XorShiftRng};
-use rand::distributions::*;
-
-macro_rules! distr_int {
-    ($fnn:ident, $ty:ty, $distr:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = XorShiftRng::from_entropy();
-            let distr = $distr;
-
-            b.iter(|| {
-                let mut accum = 0 as $ty;
-                for _ in 0..::RAND_BENCH_N {
-                    let x: $ty = distr.sample(&mut rng);
-                    accum = accum.wrapping_add(x);
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
-        }
-    }
-}
-
-macro_rules! distr_float {
-    ($fnn:ident, $ty:ty, $distr:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = XorShiftRng::from_entropy();
-            let distr = $distr;
-
-            b.iter(|| {
-                let mut accum = 0.0;
-                for _ in 0..::RAND_BENCH_N {
-                    let x: $ty = distr.sample(&mut rng);
-                    accum += x;
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
-        }
-    }
-}
-
-macro_rules! distr {
-    ($fnn:ident, $ty:ty, $distr:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = XorShiftRng::from_entropy();
-            let distr = $distr;
-
-            b.iter(|| {
-                let mut accum = 0u32;
-                for _ in 0..::RAND_BENCH_N {
-                    let x: $ty = distr.sample(&mut rng);
-                    accum = accum.wrapping_add(x as u32);
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
-        }
-    }
-}
-
-// uniform
-distr_int!(distr_uniform_i8, i8, Uniform::new(20i8, 100));
-distr_int!(distr_uniform_i16, i16, Uniform::new(-500i16, 2000));
-distr_int!(distr_uniform_i32, i32, Uniform::new(-200_000_000i32, 800_000_000));
-distr_int!(distr_uniform_i64, i64, Uniform::new(3i64, 123_456_789_123));
-#[cfg(feature = "i128_support")]
-distr_int!(distr_uniform_i128, i128, Uniform::new(-123_456_789_123i128, 123_456_789_123_456_789));
-
-distr_float!(distr_uniform_f32, f32, Uniform::new(2.26f32, 2.319));
-distr_float!(distr_uniform_f64, f64, Uniform::new(2.26f64, 2.319));
-
-// standard
-distr_int!(distr_standard_i8, i8, Standard);
-distr_int!(distr_standard_i16, i16, Standard);
-distr_int!(distr_standard_i32, i32, Standard);
-distr_int!(distr_standard_i64, i64, Standard);
-#[cfg(feature = "i128_support")]
-distr_int!(distr_standard_i128, i128, Standard);
-
-distr!(distr_standard_bool, bool, Standard);
-distr!(distr_standard_alphanumeric, char, Alphanumeric);
-distr!(distr_standard_codepoint, char, Standard);
-
-distr_float!(distr_standard_f32, f32, Standard);
-distr_float!(distr_standard_f64, f64, Standard);
-distr_float!(distr_open01_f32, f32, Open01);
-distr_float!(distr_open01_f64, f64, Open01);
-distr_float!(distr_openclosed01_f32, f32, OpenClosed01);
-distr_float!(distr_openclosed01_f64, f64, OpenClosed01);
-
-// distributions
-distr_float!(distr_exp, f64, Exp::new(1.23 * 4.56));
-distr_float!(distr_normal, f64, Normal::new(-1.23, 4.56));
-distr_float!(distr_log_normal, f64, LogNormal::new(-1.23, 4.56));
-distr_float!(distr_gamma_large_shape, f64, Gamma::new(10., 1.0));
-distr_float!(distr_gamma_small_shape, f64, Gamma::new(0.1, 1.0));
-distr_float!(distr_cauchy, f64, Cauchy::new(4.2, 6.9));
-distr_int!(distr_binomial, u64, Binomial::new(20, 0.7));
-distr_int!(distr_poisson, u64, Poisson::new(4.0));
-distr!(distr_bernoulli, bool, Bernoulli::new(0.18));
-
-
-// construct and sample from a range
-macro_rules! gen_range_int {
-    ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = XorShiftRng::from_entropy();
-
-            b.iter(|| {
-                let mut high = $high;
-                let mut accum: $ty = 0;
-                for _ in 0..::RAND_BENCH_N {
-                    accum = accum.wrapping_add(rng.gen_range($low, high));
-                    // force recalculation of range each time
-                    high = high.wrapping_add(1) & std::$ty::MAX;
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
-        }
-    }
-}
-
-gen_range_int!(gen_range_i8, i8, -20i8, 100);
-gen_range_int!(gen_range_i16, i16, -500i16, 2000);
-gen_range_int!(gen_range_i32, i32, -200_000_000i32, 800_000_000);
-gen_range_int!(gen_range_i64, i64, 3i64, 123_456_789_123);
-#[cfg(feature = "i128_support")]
-gen_range_int!(gen_range_i128, i128, -12345678901234i128, 123_456_789_123_456_789);
-
-#[bench]
-fn dist_iter(b: &mut Bencher) {
-    let mut rng = XorShiftRng::from_entropy();
-    let distr = Normal::new(-2.71828, 3.14159);
-    let mut iter = distr.sample_iter(&mut rng);
-
-    b.iter(|| {
-        let mut accum = 0.0;
-        for _ in 0..::RAND_BENCH_N {
-            accum += iter.next().unwrap();
-        }
-        accum
-    });
-    b.bytes = size_of::<f64>() as u64 * ::RAND_BENCH_N;
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/benches/generators.rs cargo-0.33.0/vendor/rand-0.5.5/benches/generators.rs
--- cargo-0.32.0/vendor/rand-0.5.5/benches/generators.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/benches/generators.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-#![feature(test)]
-
-extern crate test;
-extern crate rand;
-
-const RAND_BENCH_N: u64 = 1000;
-const BYTES_LEN: usize = 1024;
-
-use std::mem::size_of;
-use test::{black_box, Bencher};
-
-use rand::prelude::*;
-use rand::prng::{XorShiftRng, Hc128Rng, IsaacRng, Isaac64Rng, ChaChaRng};
-use rand::prng::hc128::Hc128Core;
-use rand::rngs::adapter::ReseedingRng;
-use rand::rngs::{OsRng, JitterRng, EntropyRng};
-
-macro_rules! gen_bytes {
-    ($fnn:ident, $gen:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = $gen;
-            let mut buf = [0u8; BYTES_LEN];
-            b.iter(|| {
-                for _ in 0..RAND_BENCH_N {
-                    rng.fill_bytes(&mut buf);
-                    black_box(buf);
-                }
-            });
-            b.bytes = BYTES_LEN as u64 * RAND_BENCH_N;
-        }
-    }
-}
-
-gen_bytes!(gen_bytes_xorshift, XorShiftRng::from_entropy());
-gen_bytes!(gen_bytes_chacha20, ChaChaRng::from_entropy());
-gen_bytes!(gen_bytes_hc128, Hc128Rng::from_entropy());
-gen_bytes!(gen_bytes_isaac, IsaacRng::from_entropy());
-gen_bytes!(gen_bytes_isaac64, Isaac64Rng::from_entropy());
-gen_bytes!(gen_bytes_std, StdRng::from_entropy());
-gen_bytes!(gen_bytes_small, SmallRng::from_entropy());
-gen_bytes!(gen_bytes_os, OsRng::new().unwrap());
-
-macro_rules! gen_uint {
-    ($fnn:ident, $ty:ty, $gen:expr) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = $gen;
-            b.iter(|| {
-                let mut accum: $ty = 0;
-                for _ in 0..RAND_BENCH_N {
-                    accum = accum.wrapping_add(rng.gen::<$ty>());
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
-        }
-    }
-}
-
-gen_uint!(gen_u32_xorshift, u32, XorShiftRng::from_entropy());
-gen_uint!(gen_u32_chacha20, u32, ChaChaRng::from_entropy());
-gen_uint!(gen_u32_hc128, u32, Hc128Rng::from_entropy());
-gen_uint!(gen_u32_isaac, u32, IsaacRng::from_entropy());
-gen_uint!(gen_u32_isaac64, u32, Isaac64Rng::from_entropy());
-gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
-gen_uint!(gen_u32_small, u32, SmallRng::from_entropy());
-gen_uint!(gen_u32_os, u32, OsRng::new().unwrap());
-
-gen_uint!(gen_u64_xorshift, u64, XorShiftRng::from_entropy());
-gen_uint!(gen_u64_chacha20, u64, ChaChaRng::from_entropy());
-gen_uint!(gen_u64_hc128, u64, Hc128Rng::from_entropy());
-gen_uint!(gen_u64_isaac, u64, IsaacRng::from_entropy());
-gen_uint!(gen_u64_isaac64, u64, Isaac64Rng::from_entropy());
-gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
-gen_uint!(gen_u64_small, u64, SmallRng::from_entropy());
-gen_uint!(gen_u64_os, u64, OsRng::new().unwrap());
-
-// Do not test JitterRng like the others by running it RAND_BENCH_N times per,
-// measurement, because it is way too slow. Only run it once.
-#[bench]
-fn gen_u64_jitter(b: &mut Bencher) {
-    let mut rng = JitterRng::new().unwrap();
-    b.iter(|| {
-        rng.gen::<u64>()
-    });
-    b.bytes = size_of::<u64>() as u64;
-}
-
-macro_rules! init_gen {
-    ($fnn:ident, $gen:ident) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = XorShiftRng::from_entropy();
-            b.iter(|| {
-                let r2 = $gen::from_rng(&mut rng).unwrap();
-                r2
-            });
-        }
-    }
-}
-
-init_gen!(init_xorshift, XorShiftRng);
-init_gen!(init_hc128, Hc128Rng);
-init_gen!(init_isaac, IsaacRng);
-init_gen!(init_isaac64, Isaac64Rng);
-init_gen!(init_chacha, ChaChaRng);
-
-#[bench]
-fn init_jitter(b: &mut Bencher) {
-    b.iter(|| {
-        JitterRng::new().unwrap()
-    });
-}
-
-
-const RESEEDING_THRESHOLD: u64 = 1024*1024*1024; // something high enough to get
-                                                 // deterministic measurements
-
-#[bench]
-fn reseeding_hc128_bytes(b: &mut Bencher) {
-    let mut rng = ReseedingRng::new(Hc128Core::from_entropy(),
-                                    RESEEDING_THRESHOLD,
-                                    EntropyRng::new());
-    let mut buf = [0u8; BYTES_LEN];
-    b.iter(|| {
-        for _ in 0..RAND_BENCH_N {
-            rng.fill_bytes(&mut buf);
-            black_box(buf);
-        }
-    });
-    b.bytes = BYTES_LEN as u64 * RAND_BENCH_N;
-}
-
-macro_rules! reseeding_uint {
-    ($fnn:ident, $ty:ty) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = ReseedingRng::new(Hc128Core::from_entropy(),
-                                            RESEEDING_THRESHOLD,
-                                            EntropyRng::new());
-            b.iter(|| {
-                let mut accum: $ty = 0;
-                for _ in 0..RAND_BENCH_N {
-                    accum = accum.wrapping_add(rng.gen::<$ty>());
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
-        }
-    }
-}
-
-reseeding_uint!(reseeding_hc128_u32, u32);
-reseeding_uint!(reseeding_hc128_u64, u64);
-
-
-macro_rules! threadrng_uint {
-    ($fnn:ident, $ty:ty) => {
-        #[bench]
-        fn $fnn(b: &mut Bencher) {
-            let mut rng = thread_rng();
-            b.iter(|| {
-                let mut accum: $ty = 0;
-                for _ in 0..RAND_BENCH_N {
-                    accum = accum.wrapping_add(rng.gen::<$ty>());
-                }
-                accum
-            });
-            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
-        }
-    }
-}
-
-threadrng_uint!(thread_rng_u32, u32);
-threadrng_uint!(thread_rng_u64, u64);
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/benches/misc.rs cargo-0.33.0/vendor/rand-0.5.5/benches/misc.rs
--- cargo-0.32.0/vendor/rand-0.5.5/benches/misc.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/benches/misc.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-#![feature(test)]
-
-extern crate test;
-extern crate rand;
-
-const RAND_BENCH_N: u64 = 1000;
-
-use test::Bencher;
-
-use rand::prelude::*;
-use rand::seq::*;
-
-#[bench]
-fn misc_gen_bool_const(b: &mut Bencher) {
-    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        for _ in 0..::RAND_BENCH_N {
-            accum ^= rng.gen_bool(0.18);
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_gen_bool_var(b: &mut Bencher) {
-    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        let mut p = 0.18;
-        for _ in 0..::RAND_BENCH_N {
-            accum ^= rng.gen_bool(p);
-            p += 0.0001;
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_bernoulli_const(b: &mut Bencher) {
-    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
-    let d = rand::distributions::Bernoulli::new(0.18);
-    b.iter(|| {
-        // Can be evaluated at compile time.
-        let mut accum = true;
-        for _ in 0..::RAND_BENCH_N {
-            accum ^= rng.sample(d);
-        }
-        accum
-    })
-}
-
-#[bench]
-fn misc_bernoulli_var(b: &mut Bencher) {
-    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let mut accum = true;
-        let mut p = 0.18;
-        for _ in 0..::RAND_BENCH_N {
-            let d = rand::distributions::Bernoulli::new(p);
-            accum ^= rng.sample(d);
-            p += 0.0001;
-        }
-        accum
-    })
-}
-
-macro_rules! sample_binomial {
-    ($name:ident, $n:expr, $p:expr) => {
-        #[bench]
-        fn $name(b: &mut Bencher) {
-            let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-            let (n, p) = ($n, $p);
-            b.iter(|| {
-                let d = rand::distributions::Binomial::new(n, p);
-                rng.sample(d)
-            })
-        }
-    }
-}
-
-sample_binomial!(misc_binomial_1, 1, 0.9);
-sample_binomial!(misc_binomial_10, 10, 0.9);
-sample_binomial!(misc_binomial_100, 100, 0.99);
-sample_binomial!(misc_binomial_1000, 1000, 0.01);
-sample_binomial!(misc_binomial_1e12, 1000_000_000_000, 0.2);
-
-#[bench]
-fn misc_shuffle_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x : &mut [usize] = &mut [1; 100];
-    b.iter(|| {
-        rng.shuffle(x);
-        x[0]
-    })
-}
-
-#[bench]
-fn misc_sample_iter_10_of_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x : &[usize] = &[1; 100];
-    b.iter(|| {
-        sample_iter(&mut rng, x, 10).unwrap_or_else(|e| e)
-    })
-}
-
-#[bench]
-fn misc_sample_slice_10_of_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x : &[usize] = &[1; 100];
-    b.iter(|| {
-        sample_slice(&mut rng, x, 10)
-    })
-}
-
-#[bench]
-fn misc_sample_slice_ref_10_of_100(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x : &[usize] = &[1; 100];
-    b.iter(|| {
-        sample_slice_ref(&mut rng, x, 10)
-    })
-}
-
-macro_rules! sample_indices {
-    ($name:ident, $amount:expr, $length:expr) => {
-        #[bench]
-        fn $name(b: &mut Bencher) {
-            let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-            b.iter(|| {
-                sample_indices(&mut rng, $length, $amount)
-            })
-        }
-    }
-}
-
-sample_indices!(misc_sample_indices_10_of_1k, 10, 1000);
-sample_indices!(misc_sample_indices_50_of_1k, 50, 1000);
-sample_indices!(misc_sample_indices_100_of_1k, 100, 1000);
-
-#[bench]
-fn gen_1k_iter_repeat(b: &mut Bencher) {
-    use std::iter;
-    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let v: Vec<u64> = iter::repeat(()).map(|()| rng.gen()).take(128).collect();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-#[allow(deprecated)]
-fn gen_1k_gen_iter(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let v: Vec<u64> = rng.gen_iter().take(128).collect();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-fn gen_1k_sample_iter(b: &mut Bencher) {
-    use rand::distributions::{Distribution, Standard};
-    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-fn gen_1k_gen_array(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-    b.iter(|| {
-        // max supported array length is 32!
-        let v: [[u64; 32]; 4] = rng.gen();
-        v
-    });
-    b.bytes = 1024;
-}
-
-#[bench]
-fn gen_1k_fill(b: &mut Bencher) {
-    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
-    let mut buf = [0u64; 128];
-    b.iter(|| {
-        rng.fill(&mut buf[..]);
-        buf
-    });
-    b.bytes = 1024;
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/.cargo-checksum.json cargo-0.33.0/vendor/rand-0.5.5/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand-0.5.5/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/Cargo.toml cargo-0.33.0/vendor/rand-0.5.5/Cargo.toml
--- cargo-0.32.0/vendor/rand-0.5.5/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "rand"
-version = "0.5.5"
-authors = ["The Rust Project Developers"]
-description = "Random number generators and other randomness functionality.\n"
-homepage = "https://crates.io/crates/rand"
-documentation = "https://docs.rs/rand"
-readme = "README.md"
-keywords = ["random", "rng"]
-categories = ["algorithms", "no-std"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-lang-nursery/rand"
-[package.metadata.docs.rs]
-all-features = true
-[dependencies.log]
-version = "0.4"
-optional = true
-
-[dependencies.rand_core]
-version = "0.2"
-default-features = false
-
-[dependencies.serde]
-version = "1"
-optional = true
-
-[dependencies.serde_derive]
-version = "1"
-optional = true
-[dev-dependencies.bincode]
-version = "1.0"
-
-[features]
-alloc = ["rand_core/alloc"]
-default = ["std"]
-i128_support = []
-nightly = ["i128_support"]
-serde1 = ["serde", "serde_derive", "rand_core/serde1"]
-std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-zircon"]
-[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
-version = "0.0.3"
-optional = true
-[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-zircon]
-version = "0.3.2"
-optional = true
-[target."cfg(unix)".dependencies.libc]
-version = "0.2"
-optional = true
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["minwindef", "ntsecapi", "profileapi", "winnt"]
-optional = true
-[target.wasm32-unknown-unknown.dependencies.stdweb]
-version = "0.4"
-optional = true
-[badges.appveyor]
-repository = "alexcrichton/rand"
-
-[badges.travis-ci]
-repository = "rust-lang-nursery/rand"
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/CHANGELOG.md cargo-0.33.0/vendor/rand-0.5.5/CHANGELOG.md
--- cargo-0.32.0/vendor/rand-0.5.5/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,406 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-A [separate changelog is kept for rand_core](rand_core/CHANGELOG.md).
-
-You may also find the [Update Guide](UPDATING.md) useful.
-
-## [0.5.5] - 2018-08-07
-### Documentation
-- Fix links in documentation (#582)
-
-## [0.5.4] - 2018-07-11
-### Platform support
-- Make `OsRng` work via WASM/stdweb for WebWorkers
-
-## [0.5.3] - 2018-06-26
-### Platform support
-- OpenBSD, Bitrig: fix compilation (broken in 0.5.1) (#530)
-
-## [0.5.2] - 2018-06-18
-### Platform support
-- Hide `OsRng` and `JitterRng` on unsupported platforms (#512; fixes #503).
-
-## [0.5.1] - 2018-06-08
-
-### New distributions
-- Added Cauchy distribution. (#474, #486)
-- Added Pareto distribution. (#495)
-
-### Platform support and `OsRng`
-- Remove blanket Unix implementation. (#484)
-- Remove Wasm unimplemented stub. (#484)
-- Dragonfly BSD: read from `/dev/random`. (#484)
-- Bitrig: use `getentropy` like OpenBSD. (#484)
-- Solaris: (untested) use `getrandom` if available, otherwise `/dev/random`. (#484)
-- Emscripten, `stdweb`: split the read up in chunks. (#484)
-- Emscripten, Haiku: don't do an extra blocking read from `/dev/random`. (#484)
-- Linux, NetBSD, Solaris: read in blocking mode on first use in `fill_bytes`. (#484)
-- Fuchsia, CloudABI: fix compilation (broken in Rand 0.5). (#484)
-
-## [0.5.0] - 2018-05-21
-
-### Crate features and organisation
-- Minimum Rust version update: 1.22.0. (#239)
-- Create a separate `rand_core` crate. (#288)
-- Deprecate `rand_derive`. (#256)
-- Add `prelude` (and module reorganisation). (#435)
-- Add `log` feature. Logging is now available in `JitterRng`, `OsRng`, `EntropyRng` and `ReseedingRng`. (#246)
-- Add `serde1` feature for some PRNGs. (#189)
-- `stdweb` feature for `OsRng` support on WASM via stdweb. (#272, #336)
-
-### `Rng` trait
-- Split `Rng` in `RngCore` and `Rng` extension trait.
-  `next_u32`, `next_u64` and `fill_bytes` are now part of `RngCore`. (#265)
-- Add `Rng::sample`. (#256)
-- Deprecate `Rng::gen_weighted_bool`. (#308)
-- Add `Rng::gen_bool`. (#308)
-- Remove `Rng::next_f32` and `Rng::next_f64`. (#273)
-- Add optimized `Rng::fill` and `Rng::try_fill` methods. (#247)
-- Deprecate `Rng::gen_iter`. (#286)
-- Deprecate `Rng::gen_ascii_chars`. (#279)
-
-### `rand_core` crate
-- `rand` now depends on new `rand_core` crate (#288)
-- `RngCore` and `SeedableRng` are now part of `rand_core`. (#288)
-- Add modules to help implementing RNGs `impl` and `le`. (#209, #228)
-- Add `Error` and `ErrorKind`. (#225)
-- Add `CryptoRng` marker trait. (#273)
-- Add `BlockRngCore` trait. (#281)
-- Add `BlockRng` and `BlockRng64` wrappers to help implementations. (#281, #325)
-- Revise the `SeedableRng` trait. (#233)
-- Remove default implementations for `RngCore::next_u64` and `RngCore::fill_bytes`. (#288)
-- Add `RngCore::try_fill_bytes`. (#225)
-
-### Other traits and types
-- Add `FromEntropy` trait. (#233, #375)
-- Add `SmallRng` wrapper. (#296)
-- Rewrite `ReseedingRng` to only work with `BlockRngCore` (substantial performance improvement). (#281)
-- Deprecate `weak_rng`. Use `SmallRng` instead. (#296)
-- Deprecate `AsciiGenerator`. (#279)
-
-### Random number generators
-- Switch `StdRng` and `thread_rng` to HC-128. (#277)
-- `StdRng` must now be created with `from_entropy` instead of `new`
-- Change `thread_rng` reseeding threshold to 32 MiB. (#277)
-- PRNGs no longer implement `Copy`. (#209)
-- `Debug` implementations no longer show internals. (#209)
-- Implement `Clone` for `ReseedingRng`, `JitterRng`, OsRng`. (#383, #384)
-- Implement serialization for `XorShiftRng`, `IsaacRng` and `Isaac64Rng` under the `serde1` feature. (#189)
-- Implement `BlockRngCore` for `ChaChaCore` and `Hc128Core`. (#281)
-- All PRNGs are now portable across big- and little-endian architectures. (#209)
-- `Isaac64Rng::next_u32` no longer throws away half the results. (#209)
-- Add `IsaacRng::new_from_u64` and `Isaac64Rng::new_from_u64`. (#209)
-- Add the HC-128 CSPRNG `Hc128Rng`. (#210)
-- Change ChaCha20 to have 64-bit counter and 64-bit stream. (#349)
-- Changes to `JitterRng` to get its size down from 2112 to 24 bytes. (#251)
-- Various performance improvements to all PRNGs.
-
-### Platform support and `OsRng`
-- Add support for CloudABI. (#224)
-- Remove support for NaCl. (#225)
-- WASM support for `OsRng` via stdweb, behind the `stdweb` feature. (#272, #336)
-- Use `getrandom` on more platforms for Linux, and on Android. (#338)
-- Use the `SecRandomCopyBytes` interface on macOS. (#322)
-- On systems that do not have a syscall interface, only keep a single file descriptor open for `OsRng`. (#239)
-- On Unix, first try a single read from `/dev/random`, then `/dev/urandom`. (#338)
-- Better error handling and reporting in `OsRng` (using new error type). (#225)
-- `OsRng` now uses non-blocking when available. (#225)
-- Add `EntropyRng`, which provides `OsRng`, but has `JitterRng` as a fallback. (#235)
-
-### Distributions
-- New `Distribution` trait. (#256)
-- Add `Distribution::sample_iter` and `Rng::::sample_iter`. (#361)
-- Deprecate `Rand`, `Sample` and `IndependentSample` traits. (#256)
-- Add a `Standard` distribution (replaces most `Rand` implementations). (#256)
-- Add `Binomial` and `Poisson` distributions. (#96)
-- Add `Bernoulli` dsitribution. (#411)
-- Add `Alphanumeric` distribution. (#279)
-- Remove `Closed01` distribution, add `OpenClosed01`. (#274, #420)
-- Rework `Range` type, making it possible to implement it for user types. (#274)
-- Rename `Range` to `Uniform`. (#395)
-- Add `Uniform::new_inclusive` for inclusive ranges. (#274)
-- Use widening multiply method for much faster integer range reduction. (#274)
-- `Standard` distribution for `char` uses `Uniform` internally. (#274)
-- `Standard` distribution for `bool` uses sign test. (#274)
-- Implement `Standard` distribution for `Wrapping<T>`. (#436)
-- Implement `Uniform` distribution for `Duration`. (#427)
-
-
-## [0.4.2] - 2018-01-06
-### Changed
-- Use `winapi` on Windows
-- Update for Fuchsia OS
-- Remove dev-dependency on `log`
-
-
-## [0.4.1] - 2017-12-17
-### Added
-- `no_std` support
-
-
-## [0.4.0-pre.0] - 2017-12-11
-### Added
-- `JitterRng` added as a high-quality alternative entropy source using the
-  system timer
-- new `seq` module with `sample_iter`, `sample_slice`, etc.
-- WASM support via dummy implementations (fail at run-time)
-- Additional benchmarks, covering generators and new seq code
-
-### Changed
-- `thread_rng` uses `JitterRng` if seeding from system time fails
-  (slower but more secure than previous method)
-
-### Deprecated
-  - `sample` function deprecated (replaced by `sample_iter`)
-
-
-## [0.3.20] - 2018-01-06
-### Changed
-- Remove dev-dependency on `log`
-- Update `fuchsia-zircon` dependency to 0.3.2
-
-
-## [0.3.19] - 2017-12-27
-### Changed
-- Require `log <= 0.3.8` for dev builds
-- Update `fuchsia-zircon` dependency to 0.3
-- Fix broken links in docs (to unblock compiler docs testing CI)
-
-
-## [0.3.18] - 2017-11-06
-### Changed
-- `thread_rng` is seeded from the system time if `OsRng` fails
-- `weak_rng` now uses `thread_rng` internally
-
-
-## [0.3.17] - 2017-10-07
-### Changed
- - Fuchsia: Magenta was renamed Zircon
-
-## [0.3.16] - 2017-07-27
-### Added
-- Implement Debug for mote non-public types
-- implement `Rand` for (i|u)i128
-- Support for Fuchsia
-
-### Changed
-- Add inline attribute to SampleRange::construct_range.
-  This improves the benchmark for sample in 11% and for shuffle in 16%.
-- Use `RtlGenRandom` instead of `CryptGenRandom`
-
-
-## [0.3.15] - 2016-11-26
-### Added
-- Add `Rng` trait method `choose_mut`
-- Redox support
-
-### Changed
-- Use `arc4rand` for `OsRng` on FreeBSD.
-- Use `arc4random(3)` for `OsRng` on OpenBSD.
-
-### Fixed
-- Fix filling buffers 4 GiB or larger with `OsRng::fill_bytes` on Windows
-
-
-## [0.3.14] - 2016-02-13
-### Fixed
-- Inline definitions from winapi/advapi32, wich decreases build times
-
-
-## [0.3.13] - 2016-01-09
-### Fixed
-- Compatible with Rust 1.7.0-nightly (needed some extra type annotations)
-
-
-## [0.3.12] - 2015-11-09
-### Changed
-- Replaced the methods in `next_f32` and `next_f64` with the technique described
-  Saito & Matsumoto at MCQMC'08. The new method should exhibit a slightly more
-  uniform distribution.
-- Depend on libc 0.2
-
-### Fixed
-- Fix iterator protocol issue in `rand::sample`
-
-
-## [0.3.11] - 2015-08-31
-### Added
-- Implement `Rand` for arrays with n <= 32
-
-
-## [0.3.10] - 2015-08-17
-### Added
-- Support for NaCl platforms
-
-### Changed
-- Allow `Rng` to be `?Sized`, impl for `&mut R` and `Box<R>` where `R: ?Sized + Rng`
-
-
-## [0.3.9] - 2015-06-18
-### Changed
-- Use `winapi` for Windows API things
-
-### Fixed
-- Fixed test on stable/nightly
-- Fix `getrandom` syscall number for aarch64-unknown-linux-gnu
-
-
-## [0.3.8] - 2015-04-23
-### Changed
-- `log` is a dev dependency
-
-### Fixed
-- Fix race condition of atomics in `is_getrandom_available`
-
-
-## [0.3.7] - 2015-04-03
-### Fixed
-- Derive Copy/Clone changes
-
-
-## [0.3.6] - 2015-04-02
-### Changed
-- Move to stable Rust!
-
-
-## [0.3.5] - 2015-04-01
-### Fixed
-- Compatible with Rust master
-
-
-## [0.3.4] - 2015-03-31
-### Added
-- Implement Clone for `Weighted`
-
-### Fixed
-- Compatible with Rust master
-
-
-## [0.3.3] - 2015-03-26
-### Fixed
-- Fix compile on Windows
-
-
-## [0.3.2] - 2015-03-26
-
-
-## [0.3.1] - 2015-03-26
-### Fixed
-- Fix compile on Windows
-
-
-## [0.3.0] - 2015-03-25
-### Changed
-- Update to use log version 0.3.x
-
-
-## [0.2.1] - 2015-03-22
-### Fixed
-- Compatible with Rust master
-- Fixed iOS compilation
-
-
-## [0.2.0] - 2015-03-06
-### Fixed
-- Compatible with Rust master (move from `old_io` to `std::io`)
-
-
-## [0.1.4] - 2015-03-04
-### Fixed
-- Compatible with Rust master (use wrapping ops)
-
-
-## [0.1.3] - 2015-02-20
-### Fixed
-- Compatible with Rust master
-
-### Removed
-- Removed Copy implementations from RNGs
-
-
-## [0.1.2] - 2015-02-03
-### Added
-- Imported functionality from `std::rand`, including:
-  - `StdRng`, `SeedableRng`, `TreadRng`, `weak_rng()`
-  - `ReaderRng`: A wrapper around any Reader to treat it as an RNG.
-- Imported documentation from `std::rand`
-- Imported tests from `std::rand`
-
-
-## [0.1.1] - 2015-02-03
-### Added
-- Migrate to a cargo-compatible directory structure.
-
-### Fixed
-- Do not use entropy during `gen_weighted_bool(1)`
-
-
-## [Rust 0.12.0] - 2014-10-09
-### Added
-- Impl Rand for tuples of arity 11 and 12
-- Include ChaCha pseudorandom generator
-- Add `next_f64` and `next_f32` to Rng
-- Implement Clone for PRNGs
-
-### Changed
-- Rename `TaskRng` to `ThreadRng` and `task_rng` to `thread_rng` (since a
-  runtime is removed from Rust).
-
-### Fixed
-- Improved performance of ISAAC and ISAAC64 by 30% and 12 % respectively, by
-  informing the optimiser that indexing is never out-of-bounds.
-
-### Removed
-- Removed the Deprecated `choose_option`
-
-
-## [Rust 0.11.0] - 2014-07-02
-### Added
-- document when to use `OSRng` in cryptographic context, and explain why we use `/dev/urandom` instead of `/dev/random`
-- `Rng::gen_iter()` which will return an infinite stream of random values
-- `Rng::gen_ascii_chars()` which will return an infinite stream of random ascii characters
-
-### Changed
-- Now only depends on libcore!
-- Remove `Rng.choose()`, rename `Rng.choose_option()` to `.choose()`
-- Rename OSRng to OsRng
-- The WeightedChoice structure is no longer built with a `Vec<Weighted<T>>`,
-  but rather a `&mut [Weighted<T>]`. This means that the WeightedChoice
-  structure now has a lifetime associated with it.
-- The `sample` method on `Rng` has been moved to a top-level function in the
-  `rand` module due to its dependence on `Vec`.
-
-### Removed
-- `Rng::gen_vec()` was removed. Previous behavior can be regained with
-  `rng.gen_iter().take(n).collect()`
-- `Rng::gen_ascii_str()` was removed. Previous behavior can be regained with
-  `rng.gen_ascii_chars().take(n).collect()`
-- {IsaacRng, Isaac64Rng, XorShiftRng}::new() have all been removed. These all
-  relied on being able to use an OSRng for seeding, but this is no longer
-  available in librand (where these types are defined). To retain the same
-  functionality, these types now implement the `Rand` trait so they can be
-  generated with a random seed from another random number generator. This allows
-  the stdlib to use an OSRng to create seeded instances of these RNGs.
-- Rand implementations for `Box<T>` and `@T` were removed. These seemed to be
-  pretty rare in the codebase, and it allows for librand to not depend on
-  liballoc.  Additionally, other pointer types like Rc<T> and Arc<T> were not
-  supported.
-- Remove a slew of old deprecated functions
-
-
-## [Rust 0.10] - 2014-04-03
-### Changed
-- replace `Rng.shuffle's` functionality with `.shuffle_mut`
-- bubble up IO errors when creating an OSRng
-
-### Fixed
-- Use `fill()` instead of `read()`
-- Rewrite OsRng in Rust for windows
-
-## [0.10-pre] - 2014-03-02
-### Added
-- Seperate `rand` out of the standard library
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/CONTRIBUTING.md cargo-0.33.0/vendor/rand-0.5.5/CONTRIBUTING.md
--- cargo-0.32.0/vendor/rand-0.5.5/CONTRIBUTING.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-# Contributing to Rand
-
-Thank you for your interest in contributing to Rand!
-
-The following is a list of notes and tips for when you want to contribute to
-Rand with a pull request.
-
-If you want to make major changes, it is usually best to open an issue to
-discuss the idea first.
-
-Rand doesn't (yet) use rustfmt. It is best to follow the style of the
-surrounding code, and try to keep an 80 character line limit.
-
-
-## Documentation
-
-We especially welcome documentation PRs.
-
-As of Rust 1.25 there are differences in how stable and nightly render
-documentation links. Make sure it works on stable, then nightly should be good
-too. One Travis CI build checks for dead links using `cargo-deadlinks`. If you
-want to run the check locally:
-```sh
-cargo install cargo-deadlinks
-# It is recommended to remove left-over files from previous compilations
-rm -rf /target/doc
-cargo doc --no-deps
-cargo deadlinks --dir target/doc
-```
-
-When making changes to code examples in the documentation, make sure they build
-with:
-```sh
-cargo test --doc
-```
-
-A helpful command to rebuild documentation automatically on save (only works on
-Linux):
-```
-while inotifywait -r -e close_write src/ rand_core/; do cargo doc; done
-```
-
-
-## Testing
-
-Rand already contains a number of unit tests, but could use more. Also the
-existing ones could use clean-up. Any work on the tests is appreciated.
-
-Not every change or new bit of functionality requires tests, but if you can
-think of a test that adds value, please add it.
-
-Depending on the code you change, test with one of:
-```sh
-cargo test
-cargo test --package rand_core
-# Test log, serde and 128-bit support
-cargo test --features serde1,log,nightly
-```
-
-We want to be able to not only run the unit tests with `std` available, but also
-without. Because `thread_rng()` and `FromEntropy` are not available without the
-`std` feature, you may have to disable a new test with `#[cfg(feature="std")]`.
-In other cases using `::test::rng` with a constant seed is a good option:
-```rust
-let mut rng = ::test::rng(528); // just pick some number
-```
-
-Only the unit tests should work in `no_std` mode, we don't want to complicate
-the doc-tests. Run the tests with:
-```sh
-# Test no_std support
-cargo test --lib --no-default-features
-cargo test --package rand_core --no-default-features
-
-# Test no_std+alloc support; requires nightly
-cargo test --lib --no-default-features --features alloc
-```
-
-
-## Benchmarking
-
-A lot of code in Rand is performance-sensitive, most of it is expected to be
-used in hot loops in some libraries/applications. If you change code in the
-`rngs`, `prngs` or `distributions` modules, especially when you see an 'obvious
-cleanup', make sure the benchmarks do not regress. It is nice to report the
-benchmark results in the PR (or to report nothing's changed).
-
-```sh
-# Benchmarks (requires nightly)
-cargo bench
-# Some benchmarks have a faster path with i128_support
-cargo bench --features=nightly
-```
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/examples/monte-carlo.rs cargo-0.33.0/vendor/rand-0.5.5/examples/monte-carlo.rs
--- cargo-0.32.0/vendor/rand-0.5.5/examples/monte-carlo.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/examples/monte-carlo.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-// Copyright 2013-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! # Monte Carlo estimation of π
-//!
-//! Imagine that we have a square with sides of length 2 and a unit circle
-//! (radius = 1), both centered at the origin. The areas are:
-//! 
-//! ```text
-//!     area of circle  = πr² = π * r * r = π
-//!     area of square  = 2² = 4
-//! ```
-//!
-//! The circle is entirely within the square, so if we sample many points
-//! randomly from the square, roughly π / 4 of them should be inside the circle.
-//!
-//! We can use the above fact to estimate the value of π: pick many points in
-//! the square at random, calculate the fraction that fall within the circle,
-//! and multiply this fraction by 4.
-
-#![cfg(feature="std")]
-
-
-extern crate rand;
-
-use rand::distributions::{Distribution, Uniform};
-
-fn main() {
-   let range = Uniform::new(-1.0f64, 1.0);
-   let mut rng = rand::thread_rng();
-
-   let total = 1_000_000;
-   let mut in_circle = 0;
-
-   for _ in 0..total {
-       let a = range.sample(&mut rng);
-       let b = range.sample(&mut rng);
-       if a*a + b*b <= 1.0 {
-           in_circle += 1;
-       }
-   }
-
-   // prints something close to 3.14159...
-   println!("π is approximately {}", 4. * (in_circle as f64) / (total as f64));
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/examples/monty-hall.rs cargo-0.33.0/vendor/rand-0.5.5/examples/monty-hall.rs
--- cargo-0.32.0/vendor/rand-0.5.5/examples/monty-hall.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/examples/monty-hall.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-// Copyright 2013-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! ## Monty Hall Problem
-//!
-//! This is a simulation of the [Monty Hall Problem][]:
-//!
-//! > Suppose you're on a game show, and you're given the choice of three doors:
-//! > Behind one door is a car; behind the others, goats. You pick a door, say
-//! > No. 1, and the host, who knows what's behind the doors, opens another
-//! > door, say No. 3, which has a goat. He then says to you, "Do you want to
-//! > pick door No. 2?" Is it to your advantage to switch your choice?
-//!
-//! The rather unintuitive answer is that you will have a 2/3 chance of winning
-//! if you switch and a 1/3 chance of winning if you don't, so it's better to
-//! switch.
-//!
-//! This program will simulate the game show and with large enough simulation
-//! steps it will indeed confirm that it is better to switch.
-//!
-//! [Monty Hall Problem]: https://en.wikipedia.org/wiki/Monty_Hall_problem
-
-#![cfg(feature="std")]
-
-
-extern crate rand;
-
-use rand::Rng;
-use rand::distributions::{Distribution, Uniform};
-
-struct SimulationResult {
-    win: bool,
-    switch: bool,
-}
-
-// Run a single simulation of the Monty Hall problem.
-fn simulate<R: Rng>(random_door: &Uniform<u32>, rng: &mut R)
-                    -> SimulationResult {
-    let car = random_door.sample(rng);
-
-    // This is our initial choice
-    let mut choice = random_door.sample(rng);
-
-    // The game host opens a door
-    let open = game_host_open(car, choice, rng);
-
-    // Shall we switch?
-    let switch = rng.gen();
-    if switch {
-        choice = switch_door(choice, open);
-    }
-
-    SimulationResult { win: choice == car, switch }
-}
-
-// Returns the door the game host opens given our choice and knowledge of
-// where the car is. The game host will never open the door with the car.
-fn game_host_open<R: Rng>(car: u32, choice: u32, rng: &mut R) -> u32 {
-    let choices = free_doors(&[car, choice]);
-    rand::seq::sample_slice(rng, &choices, 1)[0]
-}
-
-// Returns the door we switch to, given our current choice and
-// the open door. There will only be one valid door.
-fn switch_door(choice: u32, open: u32) -> u32 {
-    free_doors(&[choice, open])[0]
-}
-
-fn free_doors(blocked: &[u32]) -> Vec<u32> {
-    (0..3).filter(|x| !blocked.contains(x)).collect()
-}
-
-fn main() {
-    // The estimation will be more accurate with more simulations
-    let num_simulations = 10000;
-
-    let mut rng = rand::thread_rng();
-    let random_door = Uniform::new(0u32, 3);
-
-    let (mut switch_wins, mut switch_losses) = (0, 0);
-    let (mut keep_wins, mut keep_losses) = (0, 0);
-
-    println!("Running {} simulations...", num_simulations);
-    for _ in 0..num_simulations {
-        let result = simulate(&random_door, &mut rng);
-
-        match (result.win, result.switch) {
-            (true, true) => switch_wins += 1,
-            (true, false) => keep_wins += 1,
-            (false, true) => switch_losses += 1,
-            (false, false) => keep_losses += 1,
-        }
-    }
-
-    let total_switches = switch_wins + switch_losses;
-    let total_keeps = keep_wins + keep_losses;
-
-    println!("Switched door {} times with {} wins and {} losses",
-             total_switches, switch_wins, switch_losses);
-
-    println!("Kept our choice {} times with {} wins and {} losses",
-             total_keeps, keep_wins, keep_losses);
-
-    // With a large number of simulations, the values should converge to
-    // 0.667 and 0.333 respectively.
-    println!("Estimated chance to win if we switch: {}",
-             switch_wins as f32 / total_switches as f32);
-    println!("Estimated chance to win if we don't: {}",
-             keep_wins as f32 / total_keeps as f32);
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/LICENSE-APACHE cargo-0.33.0/vendor/rand-0.5.5/LICENSE-APACHE
--- cargo-0.32.0/vendor/rand-0.5.5/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     https://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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
-
-	https://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.
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/LICENSE-MIT cargo-0.33.0/vendor/rand-0.5.5/LICENSE-MIT
--- cargo-0.32.0/vendor/rand-0.5.5/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2014 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/README.md cargo-0.33.0/vendor/rand-0.5.5/README.md
--- cargo-0.32.0/vendor/rand-0.5.5/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-# Rand
-
-[![Build Status](https://travis-ci.org/rust-lang-nursery/rand.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-lang-nursery/rand?svg=true)](https://ci.appveyor.com/project/alexcrichton/rand)
-[![Latest version](https://img.shields.io/crates/v/rand.svg)](https://crates.io/crates/rand)
-[![Documentation](https://docs.rs/rand/badge.svg)](https://docs.rs/rand)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-yellow.svg)](https://github.com/rust-lang-nursery/rand#rust-version-requirements)
-
-A Rust library for random number generation.
-
-Rand provides utilities to generate random numbers, to convert them to useful
-types and distributions, and some randomness-related algorithms.
-
-The core random number generation traits of Rand live in the [rand_core](
-https://crates.io/crates/rand_core) crate; this crate is most useful when
-implementing RNGs.
-
-API reference:
-[master branch](https://rust-lang-nursery.github.io/rand/rand/index.html),
-[by release](https://docs.rs/rand/0.5).
-
-## Usage
-
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-rand = "0.5"
-```
-
-and this to your crate root:
-
-```rust
-extern crate rand;
-
-use rand::prelude::*;
-
-fn main() {
-  // basic usage with random():
-  let x: u8 = random();
-  println!("{}", x);
-
-  let y = random::<f64>();
-  println!("{}", y);
-
-  if random() { // generates a boolean
-      println!("Heads!");
-  }
-
-  // normal usage needs both an RNG and a function to generate the appropriate
-  // type, range, distribution, etc.
-  let mut rng = thread_rng();
-  if rng.gen() { // random bool
-      let x: f64 = rng.gen(); // random number in range [0, 1)
-      println!("x is: {}", x);
-      let ch = rng.gen::<char>(); // Sometimes you need type annotation
-      println!("char is: {}", ch);
-      println!("Number from 0 to 9: {}", rng.gen_range(0, 10));
-  }
-}
-```
-
-## Functionality
-
-The Rand crate provides:
-
-- A convenient to use default RNG, `thread_rng`: an automatically seeded,
-  crypto-grade generator stored in thread-local memory.
-- Pseudo-random number generators: `StdRng`, `SmallRng`, `prng` module.
-- Functionality for seeding PRNGs: the `FromEntropy` trait, and as sources of
-  external randomness `EntropyRng`, `OsRng` and `JitterRng`.
-- Most content from [`rand_core`](https://crates.io/crates/rand_core)
-  (re-exported): base random number generator traits and error-reporting types.
-- 'Distributions' producing many different types of random values:
-  - A `Standard` distribution for integers, floats, and derived types including
-    tuples, arrays and `Option`
-  - Unbiased sampling from specified `Uniform` ranges.
-  - Sampling from exponential/normal/gamma distributions.
-  - Sampling from binomial/poisson distributions.
-  - `gen_bool` aka Bernoulli distribution.
-- `seq`-uence related functionality:
-  - Sampling a subset of elements.
-  - Randomly shuffling a list.
-
-
-## Versions
-
-Version 0.5 is the latest version and contains many breaking changes.
-See [the Upgrade Guide](UPDATING.md) for guidance on updating from previous
-versions.
-
-Version 0.4 was released in December 2017. It contains almost no breaking
-changes since the 0.3 series.
-
-For more details, see the [changelog](CHANGELOG.md).
-
-### Rust version requirements
-
-The 0.5 release of Rand requires **Rustc version 1.22 or greater**.
-Rand 0.4 and 0.3 (since approx. June 2017) require Rustc version 1.15 or
-greater. Subsets of the Rand code may work with older Rust versions, but this
-is not supported.
-
-Travis CI always has a build with a pinned version of Rustc matching the oldest
-supported Rust release. The current policy is that this can be updated in any
-Rand release if required, but the change must be noted in the changelog.
-
-
-## Crate Features
-
-Rand is built with only the `std` feature enabled by default. The following
-optional features are available:
-
-- `alloc` can be used instead of `std` to provide `Vec` and `Box`.
-- `i128_support` enables support for generating `u128` and `i128` values.
-- `log` enables some logging via the `log` crate.
-- `nightly` enables all unstable features (`i128_support`).
-- `serde1` enables serialization for some types, via Serde version 1.
-- `stdweb` enables support for `OsRng` on `wasm-unknown-unknown` via `stdweb`
-  combined with `cargo-web`.
-
-`no_std` mode is activated by setting `default-features = false`; this removes
-functionality depending on `std`:
-
-- `thread_rng()`, and `random()` are not available, as they require thread-local
-  storage and an entropy source.
-- `OsRng` and `EntropyRng` are unavailable.
-- `JitterRng` code is still present, but a nanosecond timer must be provided via
-  `JitterRng::new_with_timer`
-- Since no external entropy is available, it is not possible to create
-  generators with fresh seeds using the `FromEntropy` trait (user must provide
-  a seed).
-- Exponential, normal and gamma type distributions are unavailable since `exp`
-  and `log` functions are not provided in `core`.
-- The `seq`-uence module is unavailable, as it requires `Vec`.
-
-
-# License
-
-Rand is distributed under the terms of both the MIT license and the
-Apache License (Version 2.0).
-
-See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/bernoulli.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/bernoulli.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/bernoulli.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/bernoulli.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-//! The Bernoulli distribution.
-
-use Rng;
-use distributions::Distribution;
-
-/// The Bernoulli distribution.
-///
-/// This is a special case of the Binomial distribution where `n = 1`.
-///
-/// # Example
-///
-/// ```rust
-/// use rand::distributions::{Bernoulli, Distribution};
-///
-/// let d = Bernoulli::new(0.3);
-/// let v = d.sample(&mut rand::thread_rng());
-/// println!("{} is from a Bernoulli distribution", v);
-/// ```
-///
-/// # Precision
-///
-/// This `Bernoulli` distribution uses 64 bits from the RNG (a `u64`),
-/// so only probabilities that are multiples of 2<sup>-64</sup> can be
-/// represented.
-#[derive(Clone, Copy, Debug)]
-pub struct Bernoulli {
-    /// Probability of success, relative to the maximal integer.
-    p_int: u64,
-}
-
-impl Bernoulli {
-    /// Construct a new `Bernoulli` with the given probability of success `p`.
-    ///
-    /// # Panics
-    ///
-    /// If `p < 0` or `p > 1`.
-    ///
-    /// # Precision
-    ///
-    /// For `p = 1.0`, the resulting distribution will always generate true.
-    /// For `p = 0.0`, the resulting distribution will always generate false.
-    ///
-    /// This method is accurate for any input `p` in the range `[0, 1]` which is
-    /// a multiple of 2<sup>-64</sup>. (Note that not all multiples of
-    /// 2<sup>-64</sup> in `[0, 1]` can be represented as a `f64`.)
-    #[inline]
-    pub fn new(p: f64) -> Bernoulli {
-        assert!((p >= 0.0) & (p <= 1.0), "Bernoulli::new not called with 0 <= p <= 0");
-        // Technically, this should be 2^64 or `u64::MAX + 1` because we compare
-        // using `<` when sampling. However, `u64::MAX` rounds to an `f64`
-        // larger than `u64::MAX` anyway.
-        const MAX_P_INT: f64 = ::core::u64::MAX as f64;
-        let p_int = if p < 1.0 {
-            (p * MAX_P_INT) as u64
-        } else {
-            // Avoid overflow: `MAX_P_INT` cannot be represented as u64.
-            ::core::u64::MAX
-        };
-        Bernoulli { p_int }
-    }
-}
-
-impl Distribution<bool> for Bernoulli {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> bool {
-        // Make sure to always return true for p = 1.0.
-        if self.p_int == ::core::u64::MAX {
-            return true;
-        }
-        let r: u64 = rng.gen();
-        r < self.p_int
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use Rng;
-    use distributions::Distribution;
-    use super::Bernoulli;
-
-    #[test]
-    fn test_trivial() {
-        let mut r = ::test::rng(1);
-        let always_false = Bernoulli::new(0.0);
-        let always_true = Bernoulli::new(1.0);
-        for _ in 0..5 {
-            assert_eq!(r.sample::<bool, _>(&always_false), false);
-            assert_eq!(r.sample::<bool, _>(&always_true), true);
-            assert_eq!(Distribution::<bool>::sample(&always_false, &mut r), false);
-            assert_eq!(Distribution::<bool>::sample(&always_true, &mut r), true);
-        }
-    }
-
-    #[test]
-    fn test_average() {
-        const P: f64 = 0.3;
-        let d = Bernoulli::new(P);
-        const N: u32 = 10_000_000;
-
-        let mut sum: u32 = 0;
-        let mut rng = ::test::rng(2);
-        for _ in 0..N {
-            if d.sample(&mut rng) {
-                sum += 1;
-            }
-        }
-        let avg = (sum as f64) / (N as f64);
-
-        assert!((avg - P).abs() < 1e-3);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/binomial.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/binomial.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/binomial.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/binomial.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The binomial distribution.
-
-use Rng;
-use distributions::{Distribution, Bernoulli, Cauchy};
-use distributions::log_gamma::log_gamma;
-
-/// The binomial distribution `Binomial(n, p)`.
-///
-/// This distribution has density function:
-/// `f(k) = n!/(k! (n-k)!) p^k (1-p)^(n-k)` for `k >= 0`.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Binomial, Distribution};
-///
-/// let bin = Binomial::new(20, 0.3);
-/// let v = bin.sample(&mut rand::thread_rng());
-/// println!("{} is from a binomial distribution", v);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Binomial {
-    /// Number of trials.
-    n: u64,
-    /// Probability of success.
-    p: f64,
-}
-
-impl Binomial {
-    /// Construct a new `Binomial` with the given shape parameters `n` (number
-    /// of trials) and `p` (probability of success).
-    ///
-    /// Panics if `p < 0` or `p > 1`.
-    pub fn new(n: u64, p: f64) -> Binomial {
-        assert!(p >= 0.0, "Binomial::new called with p < 0");
-        assert!(p <= 1.0, "Binomial::new called with p > 1");
-        Binomial { n, p }
-    }
-}
-
-impl Distribution<u64> for Binomial {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
-        // Handle these values directly.
-        if self.p == 0.0 {
-            return 0;
-        } else if self.p == 1.0 {
-            return self.n;
-        }
-        
-        // For low n, it is faster to sample directly. For both methods,
-        // performance is independent of p. On Intel Haswell CPU this method
-        // appears to be faster for approx n < 300.
-        if self.n < 300 {
-            let mut result = 0;
-            let d = Bernoulli::new(self.p);
-            for _ in 0 .. self.n {
-                result += rng.sample(d) as u32;
-            }
-            return result as u64;
-        }
-        
-        // binomial distribution is symmetrical with respect to p -> 1-p, k -> n-k
-        // switch p so that it is less than 0.5 - this allows for lower expected values
-        // we will just invert the result at the end
-        let p = if self.p <= 0.5 {
-            self.p
-        } else {
-            1.0 - self.p
-        };
-
-        // prepare some cached values
-        let float_n = self.n as f64;
-        let ln_fact_n = log_gamma(float_n + 1.0);
-        let pc = 1.0 - p;
-        let log_p = p.ln();
-        let log_pc = pc.ln();
-        let expected = self.n as f64 * p;
-        let sq = (expected * (2.0 * pc)).sqrt();
-
-        let mut lresult;
-
-        // we use the Cauchy distribution as the comparison distribution
-        // f(x) ~ 1/(1+x^2)
-        let cauchy = Cauchy::new(0.0, 1.0);
-        loop {
-            let mut comp_dev: f64;
-            loop {
-                // draw from the Cauchy distribution
-                comp_dev = rng.sample(cauchy);
-                // shift the peak of the comparison ditribution
-                lresult = expected + sq * comp_dev;
-                // repeat the drawing until we are in the range of possible values
-                if lresult >= 0.0 && lresult < float_n + 1.0 {
-                    break;
-                }
-            }
-
-            // the result should be discrete
-            lresult = lresult.floor();
-
-            let log_binomial_dist = ln_fact_n - log_gamma(lresult+1.0) -
-                log_gamma(float_n - lresult + 1.0) + lresult*log_p + (float_n - lresult)*log_pc;
-            // this is the binomial probability divided by the comparison probability
-            // we will generate a uniform random value and if it is larger than this,
-            // we interpret it as a value falling out of the distribution and repeat
-            let comparison_coeff = (log_binomial_dist.exp() * sq) * (1.2 * (1.0 + comp_dev*comp_dev));
-
-            if comparison_coeff >= rng.gen() {
-                break;
-            }
-        }
-
-        // invert the result for p < 0.5
-        if p != self.p {
-            self.n - lresult as u64
-        } else {
-            lresult as u64
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use Rng;
-    use distributions::Distribution;
-    use super::Binomial;
-
-    fn test_binomial_mean_and_variance<R: Rng>(n: u64, p: f64, rng: &mut R) {
-        let binomial = Binomial::new(n, p);
-
-        let expected_mean = n as f64 * p;
-        let expected_variance = n as f64 * p * (1.0 - p);
-
-        let mut results = [0.0; 1000];
-        for i in results.iter_mut() { *i = binomial.sample(rng) as f64; }
-
-        let mean = results.iter().sum::<f64>() / results.len() as f64;
-        assert!((mean as f64 - expected_mean).abs() < expected_mean / 50.0);
-
-        let variance =
-            results.iter().map(|x| (x - mean) * (x - mean)).sum::<f64>()
-            / results.len() as f64;
-        assert!((variance - expected_variance).abs() < expected_variance / 10.0);
-    }
-
-    #[test]
-    fn test_binomial() {
-        let mut rng = ::test::rng(351);
-        test_binomial_mean_and_variance(150, 0.1, &mut rng);
-        test_binomial_mean_and_variance(70, 0.6, &mut rng);
-        test_binomial_mean_and_variance(40, 0.5, &mut rng);
-        test_binomial_mean_and_variance(20, 0.7, &mut rng);
-        test_binomial_mean_and_variance(20, 0.5, &mut rng);
-    }
-
-    #[test]
-    fn test_binomial_end_points() {
-        let mut rng = ::test::rng(352);
-        assert_eq!(rng.sample(Binomial::new(20, 0.0)), 0);
-        assert_eq!(rng.sample(Binomial::new(20, 1.0)), 20);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_binomial_invalid_lambda_neg() {
-        Binomial::new(20, -10.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/cauchy.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/cauchy.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/cauchy.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/cauchy.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Cauchy distribution.
-
-use Rng;
-use distributions::Distribution;
-use std::f64::consts::PI;
-
-/// The Cauchy distribution `Cauchy(median, scale)`.
-///
-/// This distribution has a density function:
-/// `f(x) = 1 / (pi * scale * (1 + ((x - median) / scale)^2))`
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Cauchy, Distribution};
-///
-/// let cau = Cauchy::new(2.0, 5.0);
-/// let v = cau.sample(&mut rand::thread_rng());
-/// println!("{} is from a Cauchy(2, 5) distribution", v);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Cauchy {
-    median: f64,
-    scale: f64
-}
-
-impl Cauchy {
-    /// Construct a new `Cauchy` with the given shape parameters
-    /// `median` the peak location and `scale` the scale factor.
-    /// Panics if `scale <= 0`.
-    pub fn new(median: f64, scale: f64) -> Cauchy {
-        assert!(scale > 0.0, "Cauchy::new called with scale factor <= 0");
-        Cauchy {
-            median,
-            scale
-        }
-    }
-}
-
-impl Distribution<f64> for Cauchy {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        // sample from [0, 1)
-        let x = rng.gen::<f64>();
-        // get standard cauchy random number
-        // note that π/2 is not exactly representable, even if x=0.5 the result is finite
-        let comp_dev = (PI * x).tan();
-        // shift and scale according to parameters
-        let result = self.median + self.scale * comp_dev;
-        result
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use distributions::Distribution;
-    use super::Cauchy;
-
-    fn median(mut numbers: &mut [f64]) -> f64 {
-        sort(&mut numbers);
-        let mid = numbers.len() / 2;
-        numbers[mid]
-    }
-
-    fn sort(numbers: &mut [f64]) {
-        numbers.sort_by(|a, b| a.partial_cmp(b).unwrap());
-    }
-
-    #[test]
-    fn test_cauchy_median() {
-        let cauchy = Cauchy::new(10.0, 5.0);
-        let mut rng = ::test::rng(123);
-        let mut numbers: [f64; 1000] = [0.0; 1000];
-        for i in 0..1000 {
-            numbers[i] = cauchy.sample(&mut rng);
-        }
-        let median = median(&mut numbers);
-        println!("Cauchy median: {}", median);
-        assert!((median - 10.0).abs() < 0.5); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    fn test_cauchy_mean() {
-        let cauchy = Cauchy::new(10.0, 5.0);
-        let mut rng = ::test::rng(123);
-        let mut sum = 0.0;
-        for _ in 0..1000 {
-            sum += cauchy.sample(&mut rng);
-        }
-        let mean = sum / 1000.0;
-        println!("Cauchy mean: {}", mean);
-        // for a Cauchy distribution the mean should not converge
-        assert!((mean - 10.0).abs() > 0.5); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_cauchy_invalid_scale_zero() {
-        Cauchy::new(0.0, 0.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_cauchy_invalid_scale_neg() {
-        Cauchy::new(0.0, -10.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/exponential.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/exponential.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/exponential.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/exponential.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The exponential distribution.
-
-use {Rng};
-use distributions::{ziggurat, ziggurat_tables, Distribution};
-
-/// Samples floating-point numbers according to the exponential distribution,
-/// with rate parameter `λ = 1`. This is equivalent to `Exp::new(1.0)` or
-/// sampling with `-rng.gen::<f64>().ln()`, but faster.
-///
-/// See `Exp` for the general exponential distribution.
-///
-/// Implemented via the ZIGNOR variant[^1] of the Ziggurat method. The exact
-/// description in the paper was adjusted to use tables for the exponential
-/// distribution rather than normal.
-///
-/// [^1]: Jurgen A. Doornik (2005). [*An Improved Ziggurat Method to
-///       Generate Normal Random Samples*](
-///       https://www.doornik.com/research/ziggurat.pdf).
-///       Nuffield College, Oxford
-///
-/// # Example
-/// ```
-/// use rand::prelude::*;
-/// use rand::distributions::Exp1;
-///
-/// let val: f64 = SmallRng::from_entropy().sample(Exp1);
-/// println!("{}", val);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Exp1;
-
-// This could be done via `-rng.gen::<f64>().ln()` but that is slower.
-impl Distribution<f64> for Exp1 {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        #[inline]
-        fn pdf(x: f64) -> f64 {
-            (-x).exp()
-        }
-        #[inline]
-        fn zero_case<R: Rng + ?Sized>(rng: &mut R, _u: f64) -> f64 {
-            ziggurat_tables::ZIG_EXP_R - rng.gen::<f64>().ln()
-        }
-
-        ziggurat(rng, false,
-                 &ziggurat_tables::ZIG_EXP_X,
-                 &ziggurat_tables::ZIG_EXP_F,
-                 pdf, zero_case)
-    }
-}
-
-/// The exponential distribution `Exp(lambda)`.
-///
-/// This distribution has density function: `f(x) = lambda * exp(-lambda * x)`
-/// for `x > 0`.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Exp, Distribution};
-///
-/// let exp = Exp::new(2.0);
-/// let v = exp.sample(&mut rand::thread_rng());
-/// println!("{} is from a Exp(2) distribution", v);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Exp {
-    /// `lambda` stored as `1/lambda`, since this is what we scale by.
-    lambda_inverse: f64
-}
-
-impl Exp {
-    /// Construct a new `Exp` with the given shape parameter
-    /// `lambda`. Panics if `lambda <= 0`.
-    #[inline]
-    pub fn new(lambda: f64) -> Exp {
-        assert!(lambda > 0.0, "Exp::new called with `lambda` <= 0");
-        Exp { lambda_inverse: 1.0 / lambda }
-    }
-}
-
-impl Distribution<f64> for Exp {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let n: f64 = rng.sample(Exp1);
-        n * self.lambda_inverse
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use distributions::Distribution;
-    use super::Exp;
-
-    #[test]
-    fn test_exp() {
-        let exp = Exp::new(10.0);
-        let mut rng = ::test::rng(221);
-        for _ in 0..1000 {
-            assert!(exp.sample(&mut rng) >= 0.0);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_exp_invalid_lambda_zero() {
-        Exp::new(0.0);
-    }
-    #[test]
-    #[should_panic]
-    fn test_exp_invalid_lambda_neg() {
-        Exp::new(-10.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/float.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/float.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/float.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/float.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Basic floating-point number distributions
-
-use core::mem;
-use Rng;
-use distributions::{Distribution, Standard};
-
-/// A distribution to sample floating point numbers uniformly in the half-open
-/// interval `(0, 1]`, i.e. including 1 but not 0.
-///
-/// All values that can be generated are of the form `n * ε/2`. For `f32`
-/// the 23 most significant random bits of a `u32` are used and for `f64` the
-/// 53 most significant bits of a `u64` are used. The conversion uses the
-/// multiplicative method.
-///
-/// See also: [`Standard`] which samples from `[0, 1)`, [`Open01`]
-/// which samples from `(0, 1)` and [`Uniform`] which samples from arbitrary
-/// ranges.
-///
-/// # Example
-/// ```
-/// use rand::{thread_rng, Rng};
-/// use rand::distributions::OpenClosed01;
-///
-/// let val: f32 = thread_rng().sample(OpenClosed01);
-/// println!("f32 from (0, 1): {}", val);
-/// ```
-///
-/// [`Standard`]: struct.Standard.html
-/// [`Open01`]: struct.Open01.html
-/// [`Uniform`]: uniform/struct.Uniform.html
-#[derive(Clone, Copy, Debug)]
-pub struct OpenClosed01;
-
-/// A distribution to sample floating point numbers uniformly in the open
-/// interval `(0, 1)`, i.e. not including either endpoint.
-///
-/// All values that can be generated are of the form `n * ε + ε/2`. For `f32`
-/// the 22 most significant random bits of an `u32` are used, for `f64` 52 from
-/// an `u64`. The conversion uses a transmute-based method.
-///
-/// See also: [`Standard`] which samples from `[0, 1)`, [`OpenClosed01`]
-/// which samples from `(0, 1]` and [`Uniform`] which samples from arbitrary
-/// ranges.
-///
-/// # Example
-/// ```
-/// use rand::{thread_rng, Rng};
-/// use rand::distributions::Open01;
-///
-/// let val: f32 = thread_rng().sample(Open01);
-/// println!("f32 from (0, 1): {}", val);
-/// ```
-///
-/// [`Standard`]: struct.Standard.html
-/// [`OpenClosed01`]: struct.OpenClosed01.html
-/// [`Uniform`]: uniform/struct.Uniform.html
-#[derive(Clone, Copy, Debug)]
-pub struct Open01;
-
-
-pub(crate) trait IntoFloat {
-    type F;
-
-    /// Helper method to combine the fraction and a contant exponent into a
-    /// float.
-    ///
-    /// Only the least significant bits of `self` may be set, 23 for `f32` and
-    /// 52 for `f64`.
-    /// The resulting value will fall in a range that depends on the exponent.
-    /// As an example the range with exponent 0 will be
-    /// [2<sup>0</sup>..2<sup>1</sup>), which is [1..2).
-    fn into_float_with_exponent(self, exponent: i32) -> Self::F;
-}
-
-macro_rules! float_impls {
-    ($ty:ty, $uty:ty, $fraction_bits:expr, $exponent_bias:expr) => {
-        impl IntoFloat for $uty {
-            type F = $ty;
-            #[inline(always)]
-            fn into_float_with_exponent(self, exponent: i32) -> $ty {
-                // The exponent is encoded using an offset-binary representation
-                let exponent_bits =
-                    (($exponent_bias + exponent) as $uty) << $fraction_bits;
-                unsafe { mem::transmute(self | exponent_bits) }
-            }
-        }
-
-        impl Distribution<$ty> for Standard {
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
-                // Multiply-based method; 24/53 random bits; [0, 1) interval.
-                // We use the most significant bits because for simple RNGs
-                // those are usually more random.
-                let float_size = mem::size_of::<$ty>() * 8;
-                let precision = $fraction_bits + 1;
-                let scale = 1.0 / ((1 as $uty << precision) as $ty);
-
-                let value: $uty = rng.gen();
-                scale * (value >> (float_size - precision)) as $ty
-            }
-        }
-
-        impl Distribution<$ty> for OpenClosed01 {
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
-                // Multiply-based method; 24/53 random bits; (0, 1] interval.
-                // We use the most significant bits because for simple RNGs
-                // those are usually more random.
-                let float_size = mem::size_of::<$ty>() * 8;
-                let precision = $fraction_bits + 1;
-                let scale = 1.0 / ((1 as $uty << precision) as $ty);
-
-                let value: $uty = rng.gen();
-                let value = value >> (float_size - precision);
-                // Add 1 to shift up; will not overflow because of right-shift:
-                scale * (value + 1) as $ty
-            }
-        }
-
-        impl Distribution<$ty> for Open01 {
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
-                // Transmute-based method; 23/52 random bits; (0, 1) interval.
-                // We use the most significant bits because for simple RNGs
-                // those are usually more random.
-                const EPSILON: $ty = 1.0 / (1u64 << $fraction_bits) as $ty;
-                let float_size = mem::size_of::<$ty>() * 8;
-
-                let value: $uty = rng.gen();
-                let fraction = value >> (float_size - $fraction_bits);
-                fraction.into_float_with_exponent(0) - (1.0 - EPSILON / 2.0)
-            }
-        }
-    }
-}
-float_impls! { f32, u32, 23, 127 }
-float_impls! { f64, u64, 52, 1023 }
-
-
-#[cfg(test)]
-mod tests {
-    use Rng;
-    use distributions::{Open01, OpenClosed01};
-    use rngs::mock::StepRng;
-
-    const EPSILON32: f32 = ::core::f32::EPSILON;
-    const EPSILON64: f64 = ::core::f64::EPSILON;
-
-    #[test]
-    fn standard_fp_edge_cases() {
-        let mut zeros = StepRng::new(0, 0);
-        assert_eq!(zeros.gen::<f32>(), 0.0);
-        assert_eq!(zeros.gen::<f64>(), 0.0);
-
-        let mut one32 = StepRng::new(1 << 8, 0);
-        assert_eq!(one32.gen::<f32>(), EPSILON32 / 2.0);
-
-        let mut one64 = StepRng::new(1 << 11, 0);
-        assert_eq!(one64.gen::<f64>(), EPSILON64 / 2.0);
-
-        let mut max = StepRng::new(!0, 0);
-        assert_eq!(max.gen::<f32>(), 1.0 - EPSILON32 / 2.0);
-        assert_eq!(max.gen::<f64>(), 1.0 - EPSILON64 / 2.0);
-    }
-
-    #[test]
-    fn openclosed01_edge_cases() {
-        let mut zeros = StepRng::new(0, 0);
-        assert_eq!(zeros.sample::<f32, _>(OpenClosed01), 0.0 + EPSILON32 / 2.0);
-        assert_eq!(zeros.sample::<f64, _>(OpenClosed01), 0.0 + EPSILON64 / 2.0);
-
-        let mut one32 = StepRng::new(1 << 8, 0);
-        assert_eq!(one32.sample::<f32, _>(OpenClosed01), EPSILON32);
-
-        let mut one64 = StepRng::new(1 << 11, 0);
-        assert_eq!(one64.sample::<f64, _>(OpenClosed01), EPSILON64);
-
-        let mut max = StepRng::new(!0, 0);
-        assert_eq!(max.sample::<f32, _>(OpenClosed01), 1.0);
-        assert_eq!(max.sample::<f64, _>(OpenClosed01), 1.0);
-    }
-
-    #[test]
-    fn open01_edge_cases() {
-        let mut zeros = StepRng::new(0, 0);
-        assert_eq!(zeros.sample::<f32, _>(Open01), 0.0 + EPSILON32 / 2.0);
-        assert_eq!(zeros.sample::<f64, _>(Open01), 0.0 + EPSILON64 / 2.0);
-
-        let mut one32 = StepRng::new(1 << 9, 0);
-        assert_eq!(one32.sample::<f32, _>(Open01), EPSILON32 / 2.0 * 3.0);
-
-        let mut one64 = StepRng::new(1 << 12, 0);
-        assert_eq!(one64.sample::<f64, _>(Open01), EPSILON64 / 2.0 * 3.0);
-
-        let mut max = StepRng::new(!0, 0);
-        assert_eq!(max.sample::<f32, _>(Open01), 1.0 - EPSILON32 / 2.0);
-        assert_eq!(max.sample::<f64, _>(Open01), 1.0 - EPSILON64 / 2.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/gamma.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/gamma.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/gamma.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/gamma.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,360 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Gamma and derived distributions.
-
-use self::GammaRepr::*;
-use self::ChiSquaredRepr::*;
-
-use Rng;
-use distributions::normal::StandardNormal;
-use distributions::{Distribution, Exp, Open01};
-
-/// The Gamma distribution `Gamma(shape, scale)` distribution.
-///
-/// The density function of this distribution is
-///
-/// ```text
-/// f(x) =  x^(k - 1) * exp(-x / θ) / (Γ(k) * θ^k)
-/// ```
-///
-/// where `Γ` is the Gamma function, `k` is the shape and `θ` is the
-/// scale and both `k` and `θ` are strictly positive.
-///
-/// The algorithm used is that described by Marsaglia & Tsang 2000[^1],
-/// falling back to directly sampling from an Exponential for `shape
-/// == 1`, and using the boosting technique described in that paper for
-/// `shape < 1`.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Distribution, Gamma};
-///
-/// let gamma = Gamma::new(2.0, 5.0);
-/// let v = gamma.sample(&mut rand::thread_rng());
-/// println!("{} is from a Gamma(2, 5) distribution", v);
-/// ```
-///
-/// [^1]: George Marsaglia and Wai Wan Tsang. 2000. "A Simple Method for
-///       Generating Gamma Variables" *ACM Trans. Math. Softw.* 26, 3
-///       (September 2000), 363-372.
-///       DOI:[10.1145/358407.358414](https://doi.acm.org/10.1145/358407.358414)
-#[derive(Clone, Copy, Debug)]
-pub struct Gamma {
-    repr: GammaRepr,
-}
-
-#[derive(Clone, Copy, Debug)]
-enum GammaRepr {
-    Large(GammaLargeShape),
-    One(Exp),
-    Small(GammaSmallShape)
-}
-
-// These two helpers could be made public, but saving the
-// match-on-Gamma-enum branch from using them directly (e.g. if one
-// knows that the shape is always > 1) doesn't appear to be much
-// faster.
-
-/// Gamma distribution where the shape parameter is less than 1.
-///
-/// Note, samples from this require a compulsory floating-point `pow`
-/// call, which makes it significantly slower than sampling from a
-/// gamma distribution where the shape parameter is greater than or
-/// equal to 1.
-///
-/// See `Gamma` for sampling from a Gamma distribution with general
-/// shape parameters.
-#[derive(Clone, Copy, Debug)]
-struct GammaSmallShape {
-    inv_shape: f64,
-    large_shape: GammaLargeShape
-}
-
-/// Gamma distribution where the shape parameter is larger than 1.
-///
-/// See `Gamma` for sampling from a Gamma distribution with general
-/// shape parameters.
-#[derive(Clone, Copy, Debug)]
-struct GammaLargeShape {
-    scale: f64,
-    c: f64,
-    d: f64
-}
-
-impl Gamma {
-    /// Construct an object representing the `Gamma(shape, scale)`
-    /// distribution.
-    ///
-    /// Panics if `shape <= 0` or `scale <= 0`.
-    #[inline]
-    pub fn new(shape: f64, scale: f64) -> Gamma {
-        assert!(shape > 0.0, "Gamma::new called with shape <= 0");
-        assert!(scale > 0.0, "Gamma::new called with scale <= 0");
-
-        let repr = if shape == 1.0 {
-            One(Exp::new(1.0 / scale))
-        } else if shape < 1.0 {
-            Small(GammaSmallShape::new_raw(shape, scale))
-        } else {
-            Large(GammaLargeShape::new_raw(shape, scale))
-        };
-        Gamma { repr }
-    }
-}
-
-impl GammaSmallShape {
-    fn new_raw(shape: f64, scale: f64) -> GammaSmallShape {
-        GammaSmallShape {
-            inv_shape: 1. / shape,
-            large_shape: GammaLargeShape::new_raw(shape + 1.0, scale)
-        }
-    }
-}
-
-impl GammaLargeShape {
-    fn new_raw(shape: f64, scale: f64) -> GammaLargeShape {
-        let d = shape - 1. / 3.;
-        GammaLargeShape {
-            scale,
-            c: 1. / (9. * d).sqrt(),
-            d
-        }
-    }
-}
-
-impl Distribution<f64> for Gamma {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        match self.repr {
-            Small(ref g) => g.sample(rng),
-            One(ref g) => g.sample(rng),
-            Large(ref g) => g.sample(rng),
-        }
-    }
-}
-impl Distribution<f64> for GammaSmallShape {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let u: f64 = rng.sample(Open01);
-
-        self.large_shape.sample(rng) * u.powf(self.inv_shape)
-    }
-}
-impl Distribution<f64> for GammaLargeShape {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        loop {
-            let x = rng.sample(StandardNormal);
-            let v_cbrt = 1.0 + self.c * x;
-            if v_cbrt <= 0.0 { // a^3 <= 0 iff a <= 0
-                continue
-            }
-
-            let v = v_cbrt * v_cbrt * v_cbrt;
-            let u: f64 = rng.sample(Open01);
-
-            let x_sqr = x * x;
-            if u < 1.0 - 0.0331 * x_sqr * x_sqr ||
-                u.ln() < 0.5 * x_sqr + self.d * (1.0 - v + v.ln()) {
-                return self.d * v * self.scale
-            }
-        }
-    }
-}
-
-/// The chi-squared distribution `χ²(k)`, where `k` is the degrees of
-/// freedom.
-///
-/// For `k > 0` integral, this distribution is the sum of the squares
-/// of `k` independent standard normal random variables. For other
-/// `k`, this uses the equivalent characterisation
-/// `χ²(k) = Gamma(k/2, 2)`.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{ChiSquared, Distribution};
-///
-/// let chi = ChiSquared::new(11.0);
-/// let v = chi.sample(&mut rand::thread_rng());
-/// println!("{} is from a χ²(11) distribution", v)
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct ChiSquared {
-    repr: ChiSquaredRepr,
-}
-
-#[derive(Clone, Copy, Debug)]
-enum ChiSquaredRepr {
-    // k == 1, Gamma(alpha, ..) is particularly slow for alpha < 1,
-    // e.g. when alpha = 1/2 as it would be for this case, so special-
-    // casing and using the definition of N(0,1)^2 is faster.
-    DoFExactlyOne,
-    DoFAnythingElse(Gamma),
-}
-
-impl ChiSquared {
-    /// Create a new chi-squared distribution with degrees-of-freedom
-    /// `k`. Panics if `k < 0`.
-    pub fn new(k: f64) -> ChiSquared {
-        let repr = if k == 1.0 {
-            DoFExactlyOne
-        } else {
-            assert!(k > 0.0, "ChiSquared::new called with `k` < 0");
-            DoFAnythingElse(Gamma::new(0.5 * k, 2.0))
-        };
-        ChiSquared { repr }
-    }
-}
-impl Distribution<f64> for ChiSquared {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        match self.repr {
-            DoFExactlyOne => {
-                // k == 1 => N(0,1)^2
-                let norm = rng.sample(StandardNormal);
-                norm * norm
-            }
-            DoFAnythingElse(ref g) => g.sample(rng)
-        }
-    }
-}
-
-/// The Fisher F distribution `F(m, n)`.
-///
-/// This distribution is equivalent to the ratio of two normalised
-/// chi-squared distributions, that is, `F(m,n) = (χ²(m)/m) /
-/// (χ²(n)/n)`.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{FisherF, Distribution};
-///
-/// let f = FisherF::new(2.0, 32.0);
-/// let v = f.sample(&mut rand::thread_rng());
-/// println!("{} is from an F(2, 32) distribution", v)
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct FisherF {
-    numer: ChiSquared,
-    denom: ChiSquared,
-    // denom_dof / numer_dof so that this can just be a straight
-    // multiplication, rather than a division.
-    dof_ratio: f64,
-}
-
-impl FisherF {
-    /// Create a new `FisherF` distribution, with the given
-    /// parameter. Panics if either `m` or `n` are not positive.
-    pub fn new(m: f64, n: f64) -> FisherF {
-        assert!(m > 0.0, "FisherF::new called with `m < 0`");
-        assert!(n > 0.0, "FisherF::new called with `n < 0`");
-
-        FisherF {
-            numer: ChiSquared::new(m),
-            denom: ChiSquared::new(n),
-            dof_ratio: n / m
-        }
-    }
-}
-impl Distribution<f64> for FisherF {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        self.numer.sample(rng) / self.denom.sample(rng) * self.dof_ratio
-    }
-}
-
-/// The Student t distribution, `t(nu)`, where `nu` is the degrees of
-/// freedom.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{StudentT, Distribution};
-///
-/// let t = StudentT::new(11.0);
-/// let v = t.sample(&mut rand::thread_rng());
-/// println!("{} is from a t(11) distribution", v)
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct StudentT {
-    chi: ChiSquared,
-    dof: f64
-}
-
-impl StudentT {
-    /// Create a new Student t distribution with `n` degrees of
-    /// freedom. Panics if `n <= 0`.
-    pub fn new(n: f64) -> StudentT {
-        assert!(n > 0.0, "StudentT::new called with `n <= 0`");
-        StudentT {
-            chi: ChiSquared::new(n),
-            dof: n
-        }
-    }
-}
-impl Distribution<f64> for StudentT {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let norm = rng.sample(StandardNormal);
-        norm * (self.dof / self.chi.sample(rng)).sqrt()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use distributions::Distribution;
-    use super::{ChiSquared, StudentT, FisherF};
-
-    #[test]
-    fn test_chi_squared_one() {
-        let chi = ChiSquared::new(1.0);
-        let mut rng = ::test::rng(201);
-        for _ in 0..1000 {
-            chi.sample(&mut rng);
-        }
-    }
-    #[test]
-    fn test_chi_squared_small() {
-        let chi = ChiSquared::new(0.5);
-        let mut rng = ::test::rng(202);
-        for _ in 0..1000 {
-            chi.sample(&mut rng);
-        }
-    }
-    #[test]
-    fn test_chi_squared_large() {
-        let chi = ChiSquared::new(30.0);
-        let mut rng = ::test::rng(203);
-        for _ in 0..1000 {
-            chi.sample(&mut rng);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_chi_squared_invalid_dof() {
-        ChiSquared::new(-1.0);
-    }
-
-    #[test]
-    fn test_f() {
-        let f = FisherF::new(2.0, 32.0);
-        let mut rng = ::test::rng(204);
-        for _ in 0..1000 {
-            f.sample(&mut rng);
-        }
-    }
-
-    #[test]
-    fn test_t() {
-        let t = StudentT::new(11.0);
-        let mut rng = ::test::rng(205);
-        for _ in 0..1000 {
-            t.sample(&mut rng);
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/integer.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/integer.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/integer.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/integer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The implementations of the `Standard` distribution for integer types.
-
-use {Rng};
-use distributions::{Distribution, Standard};
-
-impl Distribution<u8> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u8 {
-        rng.next_u32() as u8
-    }
-}
-
-impl Distribution<u16> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u16 {
-        rng.next_u32() as u16
-    }
-}
-
-impl Distribution<u32> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u32 {
-        rng.next_u32()
-    }
-}
-
-impl Distribution<u64> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
-        rng.next_u64()
-    }
-}
-
-#[cfg(feature = "i128_support")]
-impl Distribution<u128> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u128 {
-        // Use LE; we explicitly generate one value before the next.
-        let x = rng.next_u64() as u128;
-        let y = rng.next_u64() as u128;
-        (y << 64) | x
-    }
-}
-
-impl Distribution<usize> for Standard {
-    #[inline]
-    #[cfg(any(target_pointer_width = "32", target_pointer_width = "16"))]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
-        rng.next_u32() as usize
-    }
-
-    #[inline]
-    #[cfg(target_pointer_width = "64")]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
-        rng.next_u64() as usize
-    }
-}
-
-macro_rules! impl_int_from_uint {
-    ($ty:ty, $uty:ty) => {
-        impl Distribution<$ty> for Standard {
-            #[inline]
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
-                rng.gen::<$uty>() as $ty
-            }
-        }
-    }
-}
-
-impl_int_from_uint! { i8, u8 }
-impl_int_from_uint! { i16, u16 }
-impl_int_from_uint! { i32, u32 }
-impl_int_from_uint! { i64, u64 }
-#[cfg(feature = "i128_support")] impl_int_from_uint! { i128, u128 }
-impl_int_from_uint! { isize, usize }
-
-
-#[cfg(test)]
-mod tests {
-    use Rng;
-    use distributions::{Standard};
-    
-    #[test]
-    fn test_integers() {
-        let mut rng = ::test::rng(806);
-        
-        rng.sample::<isize, _>(Standard);
-        rng.sample::<i8, _>(Standard);
-        rng.sample::<i16, _>(Standard);
-        rng.sample::<i32, _>(Standard);
-        rng.sample::<i64, _>(Standard);
-        #[cfg(feature = "i128_support")]
-        rng.sample::<i128, _>(Standard);
-        
-        rng.sample::<usize, _>(Standard);
-        rng.sample::<u8, _>(Standard);
-        rng.sample::<u16, _>(Standard);
-        rng.sample::<u32, _>(Standard);
-        rng.sample::<u64, _>(Standard);
-        #[cfg(feature = "i128_support")]
-        rng.sample::<u128, _>(Standard);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/log_gamma.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/log_gamma.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/log_gamma.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/log_gamma.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-/// Calculates ln(gamma(x)) (natural logarithm of the gamma
-/// function) using the Lanczos approximation.
-///
-/// The approximation expresses the gamma function as:
-/// `gamma(z+1) = sqrt(2*pi)*(z+g+0.5)^(z+0.5)*exp(-z-g-0.5)*Ag(z)`
-/// `g` is an arbitrary constant; we use the approximation with `g=5`.
-///
-/// Noting that `gamma(z+1) = z*gamma(z)` and applying `ln` to both sides:
-/// `ln(gamma(z)) = (z+0.5)*ln(z+g+0.5)-(z+g+0.5) + ln(sqrt(2*pi)*Ag(z)/z)`
-///
-/// `Ag(z)` is an infinite series with coefficients that can be calculated
-/// ahead of time - we use just the first 6 terms, which is good enough
-/// for most purposes.
-pub fn log_gamma(x: f64) -> f64 {
-    // precalculated 6 coefficients for the first 6 terms of the series
-    let coefficients: [f64; 6] = [
-        76.18009172947146,
-        -86.50532032941677,
-        24.01409824083091,
-        -1.231739572450155,
-        0.1208650973866179e-2,
-        -0.5395239384953e-5,
-    ];
-
-    // (x+0.5)*ln(x+g+0.5)-(x+g+0.5)
-    let tmp = x + 5.5;
-    let log = (x + 0.5) * tmp.ln() - tmp;
-
-    // the first few terms of the series for Ag(x)
-    let mut a = 1.000000000190015;
-    let mut denom = x;
-    for coeff in &coefficients {
-        denom += 1.0;
-        a += coeff / denom;
-    }
-
-    // get everything together
-    // a is Ag(x)
-    // 2.5066... is sqrt(2pi)
-    log + (2.5066282746310005 * a / x).ln()
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/mod.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,784 +0,0 @@
-// Copyright 2013-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Generating random samples from probability distributions.
-//!
-//! This module is the home of the [`Distribution`] trait and several of its
-//! implementations. It is the workhorse behind some of the convenient
-//! functionality of the [`Rng`] trait, including [`gen`], [`gen_range`] and
-//! of course [`sample`].
-//!
-//! Abstractly, a [probability distribution] describes the probability of
-//! occurance of each value in its sample space.
-//!
-//! More concretely, an implementation of `Distribution<T>` for type `X` is an
-//! algorithm for choosing values from the sample space (a subset of `T`)
-//! according to the distribution `X` represents, using an external source of
-//! randomness (an RNG supplied to the `sample` function).
-//!
-//! A type `X` may implement `Distribution<T>` for multiple types `T`.
-//! Any type implementing [`Distribution`] is stateless (i.e. immutable),
-//! but it may have internal parameters set at construction time (for example,
-//! [`Uniform`] allows specification of its sample space as a range within `T`).
-//!
-//!
-//! # The `Standard` distribution
-//!
-//! The [`Standard`] distribution is important to mention. This is the
-//! distribution used by [`Rng::gen()`] and represents the "default" way to
-//! produce a random value for many different types, including most primitive
-//! types, tuples, arrays, and a few derived types. See the documentation of
-//! [`Standard`] for more details.
-//!
-//! Implementing `Distribution<T>` for [`Standard`] for user types `T` makes it
-//! possible to generate type `T` with [`Rng::gen()`], and by extension also
-//! with the [`random()`] function.
-//!
-//!
-//! # Distribution to sample from a `Uniform` range
-//!
-//! The [`Uniform`] distribution is more flexible than [`Standard`], but also
-//! more specialised: it supports fewer target types, but allows the sample
-//! space to be specified as an arbitrary range within its target type `T`.
-//! Both [`Standard`] and [`Uniform`] are in some sense uniform distributions.
-//!
-//! Values may be sampled from this distribution using [`Rng::gen_range`] or
-//! by creating a distribution object with [`Uniform::new`],
-//! [`Uniform::new_inclusive`] or `From<Range>`. When the range limits are not
-//! known at compile time it is typically faster to reuse an existing
-//! distribution object than to call [`Rng::gen_range`].
-//!
-//! User types `T` may also implement `Distribution<T>` for [`Uniform`],
-//! although this is less straightforward than for [`Standard`] (see the
-//! documentation in the [`uniform` module]. Doing so enables generation of
-//! values of type `T` with  [`Rng::gen_range`].
-//!
-//!
-//! # Other distributions
-//!
-//! There are surprisingly many ways to uniformly generate random floats. A
-//! range between 0 and 1 is standard, but the exact bounds (open vs closed)
-//! and accuracy differ. In addition to the [`Standard`] distribution Rand offers
-//! [`Open01`] and [`OpenClosed01`]. See [Floating point implementation] for
-//! more details.
-//!
-//! [`Alphanumeric`] is a simple distribution to sample random letters and
-//! numbers of the `char` type; in contrast [`Standard`] may sample any valid
-//! `char`.
-//!
-//!
-//! # Non-uniform probability distributions
-//!
-//! Rand currently provides the following probability distributions:
-//!
-//! - Related to real-valued quantities that grow linearly
-//!   (e.g. errors, offsets):
-//!   - [`Normal`] distribution, and [`StandardNormal`] as a primitive
-//!   - [`Cauchy`] distribution
-//! - Related to Bernoulli trials (yes/no events, with a given probability):
-//!   - [`Binomial`] distribution
-//!   - [`Bernoulli`] distribution, similar to [`Rng::gen_bool`].
-//! - Related to positive real-valued quantities that grow exponentially
-//!   (e.g. prices, incomes, populations):
-//!   - [`LogNormal`] distribution
-//! - Related to the occurrence of independent events at a given rate:
-//!   - [`Poisson`] distribution
-//!   - [`Exp`]onential distribution, and [`Exp1`] as a primitive
-//! - Gamma and derived distributions:
-//!   - [`Gamma`] distribution
-//!   - [`ChiSquared`] distribution
-//!   - [`StudentT`] distribution
-//!   - [`FisherF`] distribution
-//!
-//!
-//! # Examples
-//!
-//! Sampling from a distribution:
-//!
-//! ```
-//! use rand::{thread_rng, Rng};
-//! use rand::distributions::Exp;
-//!
-//! let exp = Exp::new(2.0);
-//! let v = thread_rng().sample(exp);
-//! println!("{} is from an Exp(2) distribution", v);
-//! ```
-//!
-//! Implementing the [`Standard`] distribution for a user type:
-//!
-//! ```
-//! # #![allow(dead_code)]
-//! use rand::Rng;
-//! use rand::distributions::{Distribution, Standard};
-//!
-//! struct MyF32 {
-//!     x: f32,
-//! }
-//!
-//! impl Distribution<MyF32> for Standard {
-//!     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> MyF32 {
-//!         MyF32 { x: rng.gen() }
-//!     }
-//! }
-//! ```
-//!
-//!
-//! [probability distribution]: https://en.wikipedia.org/wiki/Probability_distribution
-//! [`Distribution`]: trait.Distribution.html
-//! [`gen_range`]: ../trait.Rng.html#method.gen_range
-//! [`gen`]: ../trait.Rng.html#method.gen
-//! [`sample`]: ../trait.Rng.html#method.sample
-//! [`new_inclusive`]: struct.Uniform.html#method.new_inclusive
-//! [`random()`]: ../fn.random.html
-//! [`Rng::gen_bool`]: ../trait.Rng.html#method.gen_bool
-//! [`Rng::gen_range`]: ../trait.Rng.html#method.gen_range
-//! [`Rng::gen()`]: ../trait.Rng.html#method.gen
-//! [`Rng`]: ../trait.Rng.html
-//! [`uniform` module]: uniform/index.html
-//! [Floating point implementation]: struct.Standard.html#floating-point-implementation
-// distributions
-//! [`Alphanumeric`]: struct.Alphanumeric.html
-//! [`Bernoulli`]: struct.Bernoulli.html
-//! [`Binomial`]: struct.Binomial.html
-//! [`Cauchy`]: struct.Cauchy.html
-//! [`ChiSquared`]: struct.ChiSquared.html
-//! [`Exp`]: struct.Exp.html
-//! [`Exp1`]: struct.Exp1.html
-//! [`FisherF`]: struct.FisherF.html
-//! [`Gamma`]: struct.Gamma.html
-//! [`LogNormal`]: struct.LogNormal.html
-//! [`Normal`]: struct.Normal.html
-//! [`Open01`]: struct.Open01.html
-//! [`OpenClosed01`]: struct.OpenClosed01.html
-//! [`Pareto`]: struct.Pareto.html
-//! [`Poisson`]: struct.Poisson.html
-//! [`Standard`]: struct.Standard.html
-//! [`StandardNormal`]: struct.StandardNormal.html
-//! [`StudentT`]: struct.StudentT.html
-//! [`Uniform`]: struct.Uniform.html
-//! [`Uniform::new`]: struct.Uniform.html#method.new
-//! [`Uniform::new_inclusive`]: struct.Uniform.html#method.new_inclusive
-
-use Rng;
-
-#[doc(inline)] pub use self::other::Alphanumeric;
-#[doc(inline)] pub use self::uniform::Uniform;
-#[doc(inline)] pub use self::float::{OpenClosed01, Open01};
-#[deprecated(since="0.5.0", note="use Uniform instead")]
-pub use self::uniform::Uniform as Range;
-#[cfg(feature="std")]
-#[doc(inline)] pub use self::gamma::{Gamma, ChiSquared, FisherF, StudentT};
-#[cfg(feature="std")]
-#[doc(inline)] pub use self::normal::{Normal, LogNormal, StandardNormal};
-#[cfg(feature="std")]
-#[doc(inline)] pub use self::exponential::{Exp, Exp1};
-#[cfg(feature="std")]
-#[doc(inline)] pub use self::pareto::Pareto;
-#[cfg(feature = "std")]
-#[doc(inline)] pub use self::poisson::Poisson;
-#[cfg(feature = "std")]
-#[doc(inline)] pub use self::binomial::Binomial;
-#[doc(inline)] pub use self::bernoulli::Bernoulli;
-#[cfg(feature = "std")]
-#[doc(inline)] pub use self::cauchy::Cauchy;
-
-pub mod uniform;
-#[cfg(feature="std")]
-#[doc(hidden)] pub mod gamma;
-#[cfg(feature="std")]
-#[doc(hidden)] pub mod normal;
-#[cfg(feature="std")]
-#[doc(hidden)] pub mod exponential;
-#[cfg(feature="std")]
-#[doc(hidden)] pub mod pareto;
-#[cfg(feature = "std")]
-#[doc(hidden)] pub mod poisson;
-#[cfg(feature = "std")]
-#[doc(hidden)] pub mod binomial;
-#[doc(hidden)] pub mod bernoulli;
-#[cfg(feature = "std")]
-#[doc(hidden)] pub mod cauchy;
-
-mod float;
-mod integer;
-#[cfg(feature="std")]
-mod log_gamma;
-mod other;
-#[cfg(feature="std")]
-mod ziggurat_tables;
-#[cfg(feature="std")]
-use distributions::float::IntoFloat;
-
-/// Types that can be used to create a random instance of `Support`.
-#[deprecated(since="0.5.0", note="use Distribution instead")]
-pub trait Sample<Support> {
-    /// Generate a random value of `Support`, using `rng` as the
-    /// source of randomness.
-    fn sample<R: Rng>(&mut self, rng: &mut R) -> Support;
-}
-
-/// `Sample`s that do not require keeping track of state.
-///
-/// Since no state is recorded, each sample is (statistically)
-/// independent of all others, assuming the `Rng` used has this
-/// property.
-#[allow(deprecated)]
-#[deprecated(since="0.5.0", note="use Distribution instead")]
-pub trait IndependentSample<Support>: Sample<Support> {
-    /// Generate a random value.
-    fn ind_sample<R: Rng>(&self, &mut R) -> Support;
-}
-
-/// DEPRECATED: Use `distributions::uniform` instead.
-#[deprecated(since="0.5.0", note="use uniform instead")]
-pub mod range {
-    pub use distributions::uniform::Uniform as Range;
-    pub use distributions::uniform::SampleUniform as SampleRange;
-}
-
-#[allow(deprecated)]
-mod impls {
-    use Rng;
-    use distributions::{Distribution, Sample, IndependentSample,
-            WeightedChoice};
-    #[cfg(feature="std")]
-    use distributions::exponential::Exp;
-    #[cfg(feature="std")]
-    use distributions::gamma::{Gamma, ChiSquared, FisherF, StudentT};
-    #[cfg(feature="std")]
-    use distributions::normal::{Normal, LogNormal};
-    use distributions::range::{Range, SampleRange};
-    
-    impl<'a, T: Clone> Sample<T> for WeightedChoice<'a, T> {
-        fn sample<R: Rng>(&mut self, rng: &mut R) -> T {
-            Distribution::sample(self, rng)
-        }
-    }
-    impl<'a, T: Clone> IndependentSample<T> for WeightedChoice<'a, T> {
-        fn ind_sample<R: Rng>(&self, rng: &mut R) -> T {
-            Distribution::sample(self, rng)
-        }
-    }
-    
-    impl<T: SampleRange> Sample<T> for Range<T> {
-        fn sample<R: Rng>(&mut self, rng: &mut R) -> T {
-            Distribution::sample(self, rng)
-        }
-    }
-    impl<T: SampleRange> IndependentSample<T> for Range<T> {
-        fn ind_sample<R: Rng>(&self, rng: &mut R) -> T {
-            Distribution::sample(self, rng)
-        }
-    }
-    
-    #[cfg(feature="std")]
-    macro_rules! impl_f64 {
-        ($($name: ident), *) => {
-            $(
-                impl Sample<f64> for $name {
-                    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 {
-                        Distribution::sample(self, rng)
-                    }
-                }
-                impl IndependentSample<f64> for $name {
-                    fn ind_sample<R: Rng>(&self, rng: &mut R) -> f64 {
-                        Distribution::sample(self, rng)
-                    }
-                }
-            )*
-        }
-    }
-    #[cfg(feature="std")]
-    impl_f64!(Exp, Gamma, ChiSquared, FisherF, StudentT, Normal, LogNormal);
-}
-
-/// Types (distributions) that can be used to create a random instance of `T`.
-///
-/// It is possible to sample from a distribution through both the
-/// `Distribution` and [`Rng`] traits, via `distr.sample(&mut rng)` and
-/// `rng.sample(distr)`. They also both offer the [`sample_iter`] method, which
-/// produces an iterator that samples from the distribution.
-///
-/// All implementations are expected to be immutable; this has the significant
-/// advantage of not needing to consider thread safety, and for most
-/// distributions efficient state-less sampling algorithms are available.
-///
-/// [`Rng`]: ../trait.Rng.html
-/// [`sample_iter`]: trait.Distribution.html#method.sample_iter
-pub trait Distribution<T> {
-    /// Generate a random value of `T`, using `rng` as the source of randomness.
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T;
-
-    /// Create an iterator that generates random values of `T`, using `rng` as
-    /// the source of randomness.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::thread_rng;
-    /// use rand::distributions::{Distribution, Alphanumeric, Uniform, Standard};
-    ///
-    /// let mut rng = thread_rng();
-    ///
-    /// // Vec of 16 x f32:
-    /// let v: Vec<f32> = Standard.sample_iter(&mut rng).take(16).collect();
-    ///
-    /// // String:
-    /// let s: String = Alphanumeric.sample_iter(&mut rng).take(7).collect();
-    ///
-    /// // Dice-rolling:
-    /// let die_range = Uniform::new_inclusive(1, 6);
-    /// let mut roll_die = die_range.sample_iter(&mut rng);
-    /// while roll_die.next().unwrap() != 6 {
-    ///     println!("Not a 6; rolling again!");
-    /// }
-    /// ```
-    fn sample_iter<'a, R>(&'a self, rng: &'a mut R) -> DistIter<'a, Self, R, T>
-        where Self: Sized, R: Rng
-    {
-        DistIter {
-            distr: self,
-            rng: rng,
-            phantom: ::core::marker::PhantomData,
-        }
-    }
-}
-
-impl<'a, T, D: Distribution<T>> Distribution<T> for &'a D {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T {
-        (*self).sample(rng)
-    }
-}
-
-
-/// An iterator that generates random values of `T` with distribution `D`,
-/// using `R` as the source of randomness.
-///
-/// This `struct` is created by the [`sample_iter`] method on [`Distribution`].
-/// See its documentation for more.
-///
-/// [`Distribution`]: trait.Distribution.html
-/// [`sample_iter`]: trait.Distribution.html#method.sample_iter
-#[derive(Debug)]
-pub struct DistIter<'a, D: 'a, R: 'a, T> {
-    distr: &'a D,
-    rng: &'a mut R,
-    phantom: ::core::marker::PhantomData<T>,
-}
-
-impl<'a, D, R, T> Iterator for DistIter<'a, D, R, T>
-    where D: Distribution<T>, R: Rng + 'a
-{
-    type Item = T;
-
-    #[inline(always)]
-    fn next(&mut self) -> Option<T> {
-        Some(self.distr.sample(self.rng))
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (usize::max_value(), None)
-    }
-}
-
-
-/// A generic random value distribution, implemented for many primitive types.
-/// Usually generates values with a numerically uniform distribution, and with a
-/// range appropriate to the type.
-/// 
-/// ## Built-in Implementations
-///
-/// Assuming the provided `Rng` is well-behaved, these implementations
-/// generate values with the following ranges and distributions:
-///
-/// * Integers (`i32`, `u32`, `isize`, `usize`, etc.): Uniformly distributed
-///   over all values of the type.
-/// * `char`: Uniformly distributed over all Unicode scalar values, i.e. all
-///   code points in the range `0...0x10_FFFF`, except for the range
-///   `0xD800...0xDFFF` (the surrogate code points). This includes
-///   unassigned/reserved code points.
-/// * `bool`: Generates `false` or `true`, each with probability 0.5.
-/// * Floating point types (`f32` and `f64`): Uniformly distributed in the
-///   half-open range `[0, 1)`. See notes below.
-/// * Wrapping integers (`Wrapping<T>`), besides the type identical to their
-///   normal integer variants.
-///
-/// The following aggregate types also implement the distribution `Standard` as
-/// long as their component types implement it:
-///
-/// * Tuples and arrays: Each element of the tuple or array is generated
-///   independently, using the `Standard` distribution recursively.
-/// * `Option<T>` where `Standard` is implemented for `T`: Returns `None` with
-///   probability 0.5; otherwise generates a random `x: T` and returns `Some(x)`.
-///
-/// # Example
-/// ```
-/// use rand::prelude::*;
-/// use rand::distributions::Standard;
-///
-/// let val: f32 = SmallRng::from_entropy().sample(Standard);
-/// println!("f32 from [0, 1): {}", val);
-/// ```
-///
-/// # Floating point implementation
-/// The floating point implementations for `Standard` generate a random value in
-/// the half-open interval `[0, 1)`, i.e. including 0 but not 1.
-///
-/// All values that can be generated are of the form `n * ε/2`. For `f32`
-/// the 23 most significant random bits of a `u32` are used and for `f64` the
-/// 53 most significant bits of a `u64` are used. The conversion uses the
-/// multiplicative method: `(rng.gen::<$uty>() >> N) as $ty * (ε/2)`.
-///
-/// See also: [`Open01`] which samples from `(0, 1)`, [`OpenClosed01`] which
-/// samples from `(0, 1]` and `Rng::gen_range(0, 1)` which also samples from
-/// `[0, 1)`. Note that `Open01` and `gen_range` (which uses [`Uniform`]) use
-/// transmute-based methods which yield 1 bit less precision but may perform
-/// faster on some architectures (on modern Intel CPUs all methods have
-/// approximately equal performance).
-///
-/// [`Open01`]: struct.Open01.html
-/// [`OpenClosed01`]: struct.OpenClosed01.html
-/// [`Uniform`]: uniform/struct.Uniform.html
-#[derive(Clone, Copy, Debug)]
-pub struct Standard;
-
-#[allow(deprecated)]
-impl<T> ::Rand for T where Standard: Distribution<T> {
-    fn rand<R: Rng>(rng: &mut R) -> Self {
-        Standard.sample(rng)
-    }
-}
-
-
-/// A value with a particular weight for use with `WeightedChoice`.
-#[derive(Copy, Clone, Debug)]
-pub struct Weighted<T> {
-    /// The numerical weight of this item
-    pub weight: u32,
-    /// The actual item which is being weighted
-    pub item: T,
-}
-
-/// A distribution that selects from a finite collection of weighted items.
-///
-/// Each item has an associated weight that influences how likely it
-/// is to be chosen: higher weight is more likely.
-///
-/// The `Clone` restriction is a limitation of the `Distribution` trait.
-/// Note that `&T` is (cheaply) `Clone` for all `T`, as is `u32`, so one can
-/// store references or indices into another vector.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Weighted, WeightedChoice, Distribution};
-///
-/// let mut items = vec!(Weighted { weight: 2, item: 'a' },
-///                      Weighted { weight: 4, item: 'b' },
-///                      Weighted { weight: 1, item: 'c' });
-/// let wc = WeightedChoice::new(&mut items);
-/// let mut rng = rand::thread_rng();
-/// for _ in 0..16 {
-///      // on average prints 'a' 4 times, 'b' 8 and 'c' twice.
-///      println!("{}", wc.sample(&mut rng));
-/// }
-/// ```
-#[derive(Debug)]
-pub struct WeightedChoice<'a, T:'a> {
-    items: &'a mut [Weighted<T>],
-    weight_range: Uniform<u32>,
-}
-
-impl<'a, T: Clone> WeightedChoice<'a, T> {
-    /// Create a new `WeightedChoice`.
-    ///
-    /// Panics if:
-    ///
-    /// - `items` is empty
-    /// - the total weight is 0
-    /// - the total weight is larger than a `u32` can contain.
-    pub fn new(items: &'a mut [Weighted<T>]) -> WeightedChoice<'a, T> {
-        // strictly speaking, this is subsumed by the total weight == 0 case
-        assert!(!items.is_empty(), "WeightedChoice::new called with no items");
-
-        let mut running_total: u32 = 0;
-
-        // we convert the list from individual weights to cumulative
-        // weights so we can binary search. This *could* drop elements
-        // with weight == 0 as an optimisation.
-        for item in items.iter_mut() {
-            running_total = match running_total.checked_add(item.weight) {
-                Some(n) => n,
-                None => panic!("WeightedChoice::new called with a total weight \
-                               larger than a u32 can contain")
-            };
-
-            item.weight = running_total;
-        }
-        assert!(running_total != 0, "WeightedChoice::new called with a total weight of 0");
-
-        WeightedChoice {
-            items,
-            // we're likely to be generating numbers in this range
-            // relatively often, so might as well cache it
-            weight_range: Uniform::new(0, running_total)
-        }
-    }
-}
-
-impl<'a, T: Clone> Distribution<T> for WeightedChoice<'a, T> {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T {
-        // we want to find the first element that has cumulative
-        // weight > sample_weight, which we do by binary since the
-        // cumulative weights of self.items are sorted.
-
-        // choose a weight in [0, total_weight)
-        let sample_weight = self.weight_range.sample(rng);
-
-        // short circuit when it's the first item
-        if sample_weight < self.items[0].weight {
-            return self.items[0].item.clone();
-        }
-
-        let mut idx = 0;
-        let mut modifier = self.items.len();
-
-        // now we know that every possibility has an element to the
-        // left, so we can just search for the last element that has
-        // cumulative weight <= sample_weight, then the next one will
-        // be "it". (Note that this greatest element will never be the
-        // last element of the vector, since sample_weight is chosen
-        // in [0, total_weight) and the cumulative weight of the last
-        // one is exactly the total weight.)
-        while modifier > 1 {
-            let i = idx + modifier / 2;
-            if self.items[i].weight <= sample_weight {
-                // we're small, so look to the right, but allow this
-                // exact element still.
-                idx = i;
-                // we need the `/ 2` to round up otherwise we'll drop
-                // the trailing elements when `modifier` is odd.
-                modifier += 1;
-            } else {
-                // otherwise we're too big, so go left. (i.e. do
-                // nothing)
-            }
-            modifier /= 2;
-        }
-        self.items[idx + 1].item.clone()
-    }
-}
-
-/// Sample a random number using the Ziggurat method (specifically the
-/// ZIGNOR variant from Doornik 2005). Most of the arguments are
-/// directly from the paper:
-///
-/// * `rng`: source of randomness
-/// * `symmetric`: whether this is a symmetric distribution, or one-sided with P(x < 0) = 0.
-/// * `X`: the $x_i$ abscissae.
-/// * `F`: precomputed values of the PDF at the $x_i$, (i.e. $f(x_i)$)
-/// * `F_DIFF`: precomputed values of $f(x_i) - f(x_{i+1})$
-/// * `pdf`: the probability density function
-/// * `zero_case`: manual sampling from the tail when we chose the
-///    bottom box (i.e. i == 0)
-
-// the perf improvement (25-50%) is definitely worth the extra code
-// size from force-inlining.
-#[cfg(feature="std")]
-#[inline(always)]
-fn ziggurat<R: Rng + ?Sized, P, Z>(
-            rng: &mut R,
-            symmetric: bool,
-            x_tab: ziggurat_tables::ZigTable,
-            f_tab: ziggurat_tables::ZigTable,
-            mut pdf: P,
-            mut zero_case: Z)
-            -> f64 where P: FnMut(f64) -> f64, Z: FnMut(&mut R, f64) -> f64 {
-    loop {
-        // As an optimisation we re-implement the conversion to a f64.
-        // From the remaining 12 most significant bits we use 8 to construct `i`.
-        // This saves us generating a whole extra random number, while the added
-        // precision of using 64 bits for f64 does not buy us much.
-        let bits = rng.next_u64();
-        let i = bits as usize & 0xff;
-
-        let u = if symmetric {
-            // Convert to a value in the range [2,4) and substract to get [-1,1)
-            // We can't convert to an open range directly, that would require
-            // substracting `3.0 - EPSILON`, which is not representable.
-            // It is possible with an extra step, but an open range does not
-            // seem neccesary for the ziggurat algorithm anyway.
-            (bits >> 12).into_float_with_exponent(1) - 3.0
-        } else {
-            // Convert to a value in the range [1,2) and substract to get (0,1)
-            (bits >> 12).into_float_with_exponent(0)
-            - (1.0 - ::core::f64::EPSILON / 2.0)
-        };
-        let x = u * x_tab[i];
-
-        let test_x = if symmetric { x.abs() } else {x};
-
-        // algebraically equivalent to |u| < x_tab[i+1]/x_tab[i] (or u < x_tab[i+1]/x_tab[i])
-        if test_x < x_tab[i + 1] {
-            return x;
-        }
-        if i == 0 {
-            return zero_case(rng, u);
-        }
-        // algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1
-        if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen::<f64>() < pdf(x) {
-            return x;
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use Rng;
-    use rngs::mock::StepRng;
-    use super::{WeightedChoice, Weighted, Distribution};
-
-    #[test]
-    fn test_weighted_choice() {
-        // this makes assumptions about the internal implementation of
-        // WeightedChoice. It may fail when the implementation in
-        // `distributions::uniform::UniformInt` changes.
-
-        macro_rules! t {
-            ($items:expr, $expected:expr) => {{
-                let mut items = $items;
-                let mut total_weight = 0;
-                for item in &items { total_weight += item.weight; }
-
-                let wc = WeightedChoice::new(&mut items);
-                let expected = $expected;
-
-                // Use extremely large steps between the random numbers, because
-                // we test with small ranges and `UniformInt` is designed to prefer
-                // the most significant bits.
-                let mut rng = StepRng::new(0, !0 / (total_weight as u64));
-
-                for &val in expected.iter() {
-                    assert_eq!(wc.sample(&mut rng), val)
-                }
-            }}
-        }
-
-        t!([Weighted { weight: 1, item: 10}], [10]);
-
-        // skip some
-        t!([Weighted { weight: 0, item: 20},
-            Weighted { weight: 2, item: 21},
-            Weighted { weight: 0, item: 22},
-            Weighted { weight: 1, item: 23}],
-           [21, 21, 23]);
-
-        // different weights
-        t!([Weighted { weight: 4, item: 30},
-            Weighted { weight: 3, item: 31}],
-           [30, 31, 30, 31, 30, 31, 30]);
-
-        // check that we're binary searching
-        // correctly with some vectors of odd
-        // length.
-        t!([Weighted { weight: 1, item: 40},
-            Weighted { weight: 1, item: 41},
-            Weighted { weight: 1, item: 42},
-            Weighted { weight: 1, item: 43},
-            Weighted { weight: 1, item: 44}],
-           [40, 41, 42, 43, 44]);
-        t!([Weighted { weight: 1, item: 50},
-            Weighted { weight: 1, item: 51},
-            Weighted { weight: 1, item: 52},
-            Weighted { weight: 1, item: 53},
-            Weighted { weight: 1, item: 54},
-            Weighted { weight: 1, item: 55},
-            Weighted { weight: 1, item: 56}],
-           [50, 54, 51, 55, 52, 56, 53]);
-    }
-
-    #[test]
-    fn test_weighted_clone_initialization() {
-        let initial : Weighted<u32> = Weighted {weight: 1, item: 1};
-        let clone = initial.clone();
-        assert_eq!(initial.weight, clone.weight);
-        assert_eq!(initial.item, clone.item);
-    }
-
-    #[test] #[should_panic]
-    fn test_weighted_clone_change_weight() {
-        let initial : Weighted<u32> = Weighted {weight: 1, item: 1};
-        let mut clone = initial.clone();
-        clone.weight = 5;
-        assert_eq!(initial.weight, clone.weight);
-    }
-
-    #[test] #[should_panic]
-    fn test_weighted_clone_change_item() {
-        let initial : Weighted<u32> = Weighted {weight: 1, item: 1};
-        let mut clone = initial.clone();
-        clone.item = 5;
-        assert_eq!(initial.item, clone.item);
-
-    }
-
-    #[test] #[should_panic]
-    fn test_weighted_choice_no_items() {
-        WeightedChoice::<isize>::new(&mut []);
-    }
-    #[test] #[should_panic]
-    fn test_weighted_choice_zero_weight() {
-        WeightedChoice::new(&mut [Weighted { weight: 0, item: 0},
-                                  Weighted { weight: 0, item: 1}]);
-    }
-    #[test] #[should_panic]
-    fn test_weighted_choice_weight_overflows() {
-        let x = ::core::u32::MAX / 2; // x + x + 2 is the overflow
-        WeightedChoice::new(&mut [Weighted { weight: x, item: 0 },
-                                  Weighted { weight: 1, item: 1 },
-                                  Weighted { weight: x, item: 2 },
-                                  Weighted { weight: 1, item: 3 }]);
-    }
-    
-    #[test] #[allow(deprecated)]
-    fn test_backwards_compat_sample() {
-        use distributions::{Sample, IndependentSample};
-        
-        struct Constant<T> { val: T }
-        impl<T: Copy> Sample<T> for Constant<T> {
-            fn sample<R: Rng>(&mut self, _: &mut R) -> T { self.val }
-        }
-        impl<T: Copy> IndependentSample<T> for Constant<T> {
-            fn ind_sample<R: Rng>(&self, _: &mut R) -> T { self.val }
-        }
-        
-        let mut sampler = Constant{ val: 293 };
-        assert_eq!(sampler.sample(&mut ::test::rng(233)), 293);
-        assert_eq!(sampler.ind_sample(&mut ::test::rng(234)), 293);
-    }
-    
-    #[cfg(feature="std")]
-    #[test] #[allow(deprecated)]
-    fn test_backwards_compat_exp() {
-        use distributions::{IndependentSample, Exp};
-        let sampler = Exp::new(1.0);
-        sampler.ind_sample(&mut ::test::rng(235));
-    }
-
-    #[cfg(feature="std")]
-    #[test]
-    fn test_distributions_iter() {
-        use distributions::Normal;
-        let mut rng = ::test::rng(210);
-        let distr = Normal::new(10.0, 10.0);
-        let results: Vec<_> = distr.sample_iter(&mut rng).take(100).collect();
-        println!("{:?}", results);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/normal.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/normal.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/normal.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/normal.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The normal and derived distributions.
-
-use Rng;
-use distributions::{ziggurat, ziggurat_tables, Distribution, Open01};
-
-/// Samples floating-point numbers according to the normal distribution
-/// `N(0, 1)` (a.k.a. a standard normal, or Gaussian). This is equivalent to
-/// `Normal::new(0.0, 1.0)` but faster.
-///
-/// See `Normal` for the general normal distribution.
-///
-/// Implemented via the ZIGNOR variant[^1] of the Ziggurat method.
-///
-/// [^1]: Jurgen A. Doornik (2005). [*An Improved Ziggurat Method to
-///       Generate Normal Random Samples*](
-///       https://www.doornik.com/research/ziggurat.pdf).
-///       Nuffield College, Oxford
-///
-/// # Example
-/// ```
-/// use rand::prelude::*;
-/// use rand::distributions::StandardNormal;
-///
-/// let val: f64 = SmallRng::from_entropy().sample(StandardNormal);
-/// println!("{}", val);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct StandardNormal;
-
-impl Distribution<f64> for StandardNormal {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        #[inline]
-        fn pdf(x: f64) -> f64 {
-            (-x*x/2.0).exp()
-        }
-        #[inline]
-        fn zero_case<R: Rng + ?Sized>(rng: &mut R, u: f64) -> f64 {
-            // compute a random number in the tail by hand
-
-            // strange initial conditions, because the loop is not
-            // do-while, so the condition should be true on the first
-            // run, they get overwritten anyway (0 < 1, so these are
-            // good).
-            let mut x = 1.0f64;
-            let mut y = 0.0f64;
-
-            while -2.0 * y < x * x {
-                let x_: f64 = rng.sample(Open01);
-                let y_: f64 = rng.sample(Open01);
-
-                x = x_.ln() / ziggurat_tables::ZIG_NORM_R;
-                y = y_.ln();
-            }
-
-            if u < 0.0 { x - ziggurat_tables::ZIG_NORM_R } else { ziggurat_tables::ZIG_NORM_R - x }
-        }
-
-        ziggurat(rng, true, // this is symmetric
-                 &ziggurat_tables::ZIG_NORM_X,
-                 &ziggurat_tables::ZIG_NORM_F,
-                 pdf, zero_case)
-    }
-}
-
-/// The normal distribution `N(mean, std_dev**2)`.
-///
-/// This uses the ZIGNOR variant of the Ziggurat method, see `StandardNormal`
-/// for more details.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Normal, Distribution};
-///
-/// // mean 2, standard deviation 3
-/// let normal = Normal::new(2.0, 3.0);
-/// let v = normal.sample(&mut rand::thread_rng());
-/// println!("{} is from a N(2, 9) distribution", v)
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Normal {
-    mean: f64,
-    std_dev: f64,
-}
-
-impl Normal {
-    /// Construct a new `Normal` distribution with the given mean and
-    /// standard deviation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `std_dev < 0`.
-    #[inline]
-    pub fn new(mean: f64, std_dev: f64) -> Normal {
-        assert!(std_dev >= 0.0, "Normal::new called with `std_dev` < 0");
-        Normal {
-            mean,
-            std_dev
-        }
-    }
-}
-impl Distribution<f64> for Normal {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let n = rng.sample(StandardNormal);
-        self.mean + self.std_dev * n
-    }
-}
-
-
-/// The log-normal distribution `ln N(mean, std_dev**2)`.
-///
-/// If `X` is log-normal distributed, then `ln(X)` is `N(mean, std_dev**2)`
-/// distributed.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{LogNormal, Distribution};
-///
-/// // mean 2, standard deviation 3
-/// let log_normal = LogNormal::new(2.0, 3.0);
-/// let v = log_normal.sample(&mut rand::thread_rng());
-/// println!("{} is from an ln N(2, 9) distribution", v)
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct LogNormal {
-    norm: Normal
-}
-
-impl LogNormal {
-    /// Construct a new `LogNormal` distribution with the given mean
-    /// and standard deviation.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `std_dev < 0`.
-    #[inline]
-    pub fn new(mean: f64, std_dev: f64) -> LogNormal {
-        assert!(std_dev >= 0.0, "LogNormal::new called with `std_dev` < 0");
-        LogNormal { norm: Normal::new(mean, std_dev) }
-    }
-}
-impl Distribution<f64> for LogNormal {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        self.norm.sample(rng).exp()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use distributions::Distribution;
-    use super::{Normal, LogNormal};
-
-    #[test]
-    fn test_normal() {
-        let norm = Normal::new(10.0, 10.0);
-        let mut rng = ::test::rng(210);
-        for _ in 0..1000 {
-            norm.sample(&mut rng);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_normal_invalid_sd() {
-        Normal::new(10.0, -1.0);
-    }
-
-
-    #[test]
-    fn test_log_normal() {
-        let lnorm = LogNormal::new(10.0, 10.0);
-        let mut rng = ::test::rng(211);
-        for _ in 0..1000 {
-            lnorm.sample(&mut rng);
-        }
-    }
-    #[test]
-    #[should_panic]
-    fn test_log_normal_invalid_sd() {
-        LogNormal::new(10.0, -1.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/other.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/other.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/other.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/other.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The implementations of the `Standard` distribution for other built-in types.
-
-use core::char;
-use core::num::Wrapping;
-
-use {Rng};
-use distributions::{Distribution, Standard, Uniform};
-
-// ----- Sampling distributions -----
-
-/// Sample a `char`, uniformly distributed over ASCII letters and numbers:
-/// a-z, A-Z and 0-9.
-/// 
-/// # Example
-///
-/// ```
-/// use std::iter;
-/// use rand::{Rng, thread_rng};
-/// use rand::distributions::Alphanumeric;
-/// 
-/// let mut rng = thread_rng();
-/// let chars: String = iter::repeat(())
-///         .map(|()| rng.sample(Alphanumeric))
-///         .take(7)
-///         .collect();
-/// println!("Random chars: {}", chars);
-/// ```
-#[derive(Debug)]
-pub struct Alphanumeric;
-
-
-// ----- Implementations of distributions -----
-
-impl Distribution<char> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> char {
-        let range = Uniform::new(0u32, 0x11_0000);
-        loop {
-            match char::from_u32(range.sample(rng)) {
-                Some(c) => return c,
-                // About 0.2% of numbers in the range 0..0x110000 are invalid
-                // codepoints (surrogates).
-                None => {}
-            }
-        }
-    }
-}
-
-impl Distribution<char> for Alphanumeric {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> char {
-        const RANGE: u32 = 26 + 26 + 10;
-        const GEN_ASCII_STR_CHARSET: &[u8] =
-            b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
-                abcdefghijklmnopqrstuvwxyz\
-                0123456789";
-        // We can pick from 62 characters. This is so close to a power of 2, 64,
-        // that we can do better than `Uniform`. Use a simple bitshift and
-        // rejection sampling. We do not use a bitmask, because for small RNGs
-        // the most significant bits are usually of higher quality.
-        loop {
-            let var = rng.next_u32() >> (32 - 6);
-            if var < RANGE {
-                return GEN_ASCII_STR_CHARSET[var as usize] as char
-            }
-        }
-    }
-}
-
-impl Distribution<bool> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> bool {
-        // We can compare against an arbitrary bit of an u32 to get a bool.
-        // Because the least significant bits of a lower quality RNG can have
-        // simple patterns, we compare against the most significant bit. This is
-        // easiest done using a sign test.
-        (rng.next_u32() as i32) < 0
-    }
-}
-
-macro_rules! tuple_impl {
-    // use variables to indicate the arity of the tuple
-    ($($tyvar:ident),* ) => {
-        // the trailing commas are for the 1 tuple
-        impl< $( $tyvar ),* >
-            Distribution<( $( $tyvar ),* , )>
-            for Standard
-            where $( Standard: Distribution<$tyvar> ),*
-        {
-            #[inline]
-            fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> ( $( $tyvar ),* , ) {
-                (
-                    // use the $tyvar's to get the appropriate number of
-                    // repeats (they're not actually needed)
-                    $(
-                        _rng.gen::<$tyvar>()
-                    ),*
-                    ,
-                )
-            }
-        }
-    }
-}
-
-impl Distribution<()> for Standard {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, _: &mut R) -> () { () }
-}
-tuple_impl!{A}
-tuple_impl!{A, B}
-tuple_impl!{A, B, C}
-tuple_impl!{A, B, C, D}
-tuple_impl!{A, B, C, D, E}
-tuple_impl!{A, B, C, D, E, F}
-tuple_impl!{A, B, C, D, E, F, G}
-tuple_impl!{A, B, C, D, E, F, G, H}
-tuple_impl!{A, B, C, D, E, F, G, H, I}
-tuple_impl!{A, B, C, D, E, F, G, H, I, J}
-tuple_impl!{A, B, C, D, E, F, G, H, I, J, K}
-tuple_impl!{A, B, C, D, E, F, G, H, I, J, K, L}
-
-macro_rules! array_impl {
-    // recursive, given at least one type parameter:
-    {$n:expr, $t:ident, $($ts:ident,)*} => {
-        array_impl!{($n - 1), $($ts,)*}
-
-        impl<T> Distribution<[T; $n]> for Standard where Standard: Distribution<T> {
-            #[inline]
-            fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> [T; $n] {
-                [_rng.gen::<$t>(), $(_rng.gen::<$ts>()),*]
-            }
-        }
-    };
-    // empty case:
-    {$n:expr,} => {
-        impl<T> Distribution<[T; $n]> for Standard {
-            fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> [T; $n] { [] }
-        }
-    };
-}
-
-array_impl!{32, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,}
-
-impl<T> Distribution<Option<T>> for Standard where Standard: Distribution<T> {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Option<T> {
-        // UFCS is needed here: https://github.com/rust-lang/rust/issues/24066
-        if rng.gen::<bool>() {
-            Some(rng.gen())
-        } else {
-            None
-        }
-    }
-}
-
-impl<T> Distribution<Wrapping<T>> for Standard where Standard: Distribution<T> {
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Wrapping<T> {
-        Wrapping(rng.gen())
-    }
-}
-
-
-#[cfg(test)]
-mod tests {
-    use {Rng, RngCore, Standard};
-    use distributions::Alphanumeric;
-    #[cfg(all(not(feature="std"), feature="alloc"))] use alloc::string::String;
-
-    #[test]
-    fn test_misc() {
-        let rng: &mut RngCore = &mut ::test::rng(820);
-        
-        rng.sample::<char, _>(Standard);
-        rng.sample::<bool, _>(Standard);
-    }
-    
-    #[cfg(feature="alloc")]
-    #[test]
-    fn test_chars() {
-        use core::iter;
-        let mut rng = ::test::rng(805);
-
-        // Test by generating a relatively large number of chars, so we also
-        // take the rejection sampling path.
-        let word: String = iter::repeat(())
-                .map(|()| rng.gen::<char>()).take(1000).collect();
-        assert!(word.len() != 0);
-    }
-
-    #[test]
-    fn test_alphanumeric() {
-        let mut rng = ::test::rng(806);
-
-        // Test by generating a relatively large number of chars, so we also
-        // take the rejection sampling path.
-        let mut incorrect = false;
-        for _ in 0..100 {
-            let c = rng.sample(Alphanumeric);
-            incorrect |= !((c >= '0' && c <= '9') ||
-                           (c >= 'A' && c <= 'Z') ||
-                           (c >= 'a' && c <= 'z') );
-        }
-        assert!(incorrect == false);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/pareto.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/pareto.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/pareto.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/pareto.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Pareto distribution.
-
-use Rng;
-use distributions::{Distribution, OpenClosed01};
-
-/// Samples floating-point numbers according to the Pareto distribution
-///
-/// # Example
-/// ```
-/// use rand::prelude::*;
-/// use rand::distributions::Pareto;
-///
-/// let val: f64 = SmallRng::from_entropy().sample(Pareto::new(1., 2.));
-/// println!("{}", val);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Pareto {
-    scale: f64,
-    inv_neg_shape: f64,
-}
-
-impl Pareto {
-    /// Construct a new Pareto distribution with given `scale` and `shape`.
-    ///
-    /// In the literature, `scale` is commonly written as x<sub>m</sub> or k and
-    /// `shape` is often written as α.
-    ///
-    /// # Panics
-    ///
-    /// `scale` and `shape` have to be non-zero and positive.
-    pub fn new(scale: f64, shape: f64) -> Pareto {
-        assert!((scale > 0.) & (shape > 0.));
-        Pareto { scale, inv_neg_shape: -1.0 / shape }
-    }
-}
-
-impl Distribution<f64> for Pareto {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
-        let u: f64 = rng.sample(OpenClosed01);
-        self.scale * u.powf(self.inv_neg_shape)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use distributions::Distribution;
-    use super::Pareto;
-
-    #[test]
-    #[should_panic]
-    fn invalid() {
-        Pareto::new(0., 0.);
-    }
-
-    #[test]
-    fn sample() {
-        let scale = 1.0;
-        let shape = 2.0;
-        let d = Pareto::new(scale, shape);
-        let mut rng = ::test::rng(1);
-        for _ in 0..1000 {
-            let r = d.sample(&mut rng);
-            assert!(r >= scale);
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/poisson.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/poisson.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/poisson.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/poisson.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The Poisson distribution.
-
-use Rng;
-use distributions::{Distribution, Cauchy};
-use distributions::log_gamma::log_gamma;
-
-/// The Poisson distribution `Poisson(lambda)`.
-///
-/// This distribution has a density function:
-/// `f(k) = lambda^k * exp(-lambda) / k!` for `k >= 0`.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Poisson, Distribution};
-///
-/// let poi = Poisson::new(2.0);
-/// let v = poi.sample(&mut rand::thread_rng());
-/// println!("{} is from a Poisson(2) distribution", v);
-/// ```
-#[derive(Clone, Copy, Debug)]
-pub struct Poisson {
-    lambda: f64,
-    // precalculated values
-    exp_lambda: f64,
-    log_lambda: f64,
-    sqrt_2lambda: f64,
-    magic_val: f64,
-}
-
-impl Poisson {
-    /// Construct a new `Poisson` with the given shape parameter
-    /// `lambda`. Panics if `lambda <= 0`.
-    pub fn new(lambda: f64) -> Poisson {
-        assert!(lambda > 0.0, "Poisson::new called with lambda <= 0");
-        let log_lambda = lambda.ln();
-        Poisson {
-            lambda,
-            exp_lambda: (-lambda).exp(),
-            log_lambda,
-            sqrt_2lambda: (2.0 * lambda).sqrt(),
-            magic_val: lambda * log_lambda - log_gamma(1.0 + lambda),
-        }
-    }
-}
-
-impl Distribution<u64> for Poisson {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
-        // using the algorithm from Numerical Recipes in C
-
-        // for low expected values use the Knuth method
-        if self.lambda < 12.0 {
-            let mut result = 0;
-            let mut p = 1.0;
-            while p > self.exp_lambda {
-                p *= rng.gen::<f64>();
-                result += 1;
-            }
-            result - 1
-        }
-        // high expected values - rejection method
-        else {
-            let mut int_result: u64;
-
-            // we use the Cauchy distribution as the comparison distribution
-            // f(x) ~ 1/(1+x^2)
-            let cauchy = Cauchy::new(0.0, 1.0);
-
-            loop {
-                let mut result;
-                let mut comp_dev;
-
-                loop {
-                    // draw from the Cauchy distribution
-                    comp_dev = rng.sample(cauchy);
-                    // shift the peak of the comparison ditribution
-                    result = self.sqrt_2lambda * comp_dev + self.lambda;
-                    // repeat the drawing until we are in the range of possible values
-                    if result >= 0.0 {
-                        break;
-                    }
-                }
-                // now the result is a random variable greater than 0 with Cauchy distribution
-                // the result should be an integer value
-                result = result.floor();
-                int_result = result as u64;
-
-                // this is the ratio of the Poisson distribution to the comparison distribution
-                // the magic value scales the distribution function to a range of approximately 0-1
-                // since it is not exact, we multiply the ratio by 0.9 to avoid ratios greater than 1
-                // this doesn't change the resulting distribution, only increases the rate of failed drawings
-                let check = 0.9 * (1.0 + comp_dev * comp_dev)
-                    * (result * self.log_lambda - log_gamma(1.0 + result) - self.magic_val).exp();
-
-                // check with uniform random value - if below the threshold, we are within the target distribution
-                if rng.gen::<f64>() <= check {
-                    break;
-                }
-            }
-            int_result
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use distributions::Distribution;
-    use super::Poisson;
-
-    #[test]
-    fn test_poisson_10() {
-        let poisson = Poisson::new(10.0);
-        let mut rng = ::test::rng(123);
-        let mut sum = 0;
-        for _ in 0..1000 {
-            sum += poisson.sample(&mut rng);
-        }
-        let avg = (sum as f64) / 1000.0;
-        println!("Poisson average: {}", avg);
-        assert!((avg - 10.0).abs() < 0.5); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    fn test_poisson_15() {
-        // Take the 'high expected values' path
-        let poisson = Poisson::new(15.0);
-        let mut rng = ::test::rng(123);
-        let mut sum = 0;
-        for _ in 0..1000 {
-            sum += poisson.sample(&mut rng);
-        }
-        let avg = (sum as f64) / 1000.0;
-        println!("Poisson average: {}", avg);
-        assert!((avg - 15.0).abs() < 0.5); // not 100% certain, but probable enough
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_poisson_invalid_lambda_zero() {
-        Poisson::new(0.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_poisson_invalid_lambda_neg() {
-        Poisson::new(-10.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/uniform.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/uniform.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/uniform.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/uniform.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,856 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A distribution uniformly sampling numbers within a given range.
-//!
-//! [`Uniform`] is the standard distribution to sample uniformly from a range;
-//! e.g. `Uniform::new_inclusive(1, 6)` can sample integers from 1 to 6, like a
-//! standard die. [`Rng::gen_range`] supports any type supported by
-//! [`Uniform`].
-//!
-//! This distribution is provided with support for several primitive types
-//! (all integer and floating-point types) as well as `std::time::Duration`,
-//! and supports extension to user-defined types via a type-specific *back-end*
-//! implementation.
-//!
-//! The types [`UniformInt`], [`UniformFloat`] and [`UniformDuration`] are the
-//! back-ends supporting sampling from primitive integer and floating-point
-//! ranges as well as from `std::time::Duration`; these types do not normally
-//! need to be used directly (unless implementing a derived back-end).
-//!
-//! # Example usage
-//!
-//! ```
-//! use rand::{Rng, thread_rng};
-//! use rand::distributions::Uniform;
-//! 
-//! let mut rng = thread_rng();
-//! let side = Uniform::new(-10.0, 10.0);
-//! 
-//! // sample between 1 and 10 points
-//! for _ in 0..rng.gen_range(1, 11) {
-//!     // sample a point from the square with sides -10 - 10 in two dimensions
-//!     let (x, y) = (rng.sample(side), rng.sample(side));
-//!     println!("Point: {}, {}", x, y);
-//! }
-//! ```
-//!
-//! # Extending `Uniform` to support a custom type
-//!
-//! To extend [`Uniform`] to support your own types, write a back-end which
-//! implements the [`UniformSampler`] trait, then implement the [`SampleUniform`]
-//! helper trait to "register" your back-end. See the `MyF32` example below.
-//!
-//! At a minimum, the back-end needs to store any parameters needed for sampling
-//! (e.g. the target range) and implement `new`, `new_inclusive` and `sample`.
-//! Those methods should include an assert to check the range is valid (i.e.
-//! `low < high`). The example below merely wraps another back-end.
-//!
-//! ```
-//! use rand::prelude::*;
-//! use rand::distributions::uniform::{Uniform, SampleUniform,
-//!         UniformSampler, UniformFloat};
-//!
-//! struct MyF32(f32);
-//!
-//! #[derive(Clone, Copy, Debug)]
-//! struct UniformMyF32 {
-//!     inner: UniformFloat<f32>,
-//! }
-//!
-//! impl UniformSampler for UniformMyF32 {
-//!     type X = MyF32;
-//!     fn new(low: Self::X, high: Self::X) -> Self {
-//!         UniformMyF32 {
-//!             inner: UniformFloat::<f32>::new(low.0, high.0),
-//!         }
-//!     }
-//!     fn new_inclusive(low: Self::X, high: Self::X) -> Self {
-//!         UniformSampler::new(low, high)
-//!     }
-//!     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
-//!         MyF32(self.inner.sample(rng))
-//!     }
-//! }
-//!
-//! impl SampleUniform for MyF32 {
-//!     type Sampler = UniformMyF32;
-//! }
-//!
-//! let (low, high) = (MyF32(17.0f32), MyF32(22.0f32));
-//! let uniform = Uniform::new(low, high);
-//! let x = uniform.sample(&mut thread_rng());
-//! ```
-//!
-//! [`Uniform`]: struct.Uniform.html
-//! [`Rng::gen_range`]: ../../trait.Rng.html#method.gen_range
-//! [`SampleUniform`]: trait.SampleUniform.html
-//! [`UniformSampler`]: trait.UniformSampler.html
-//! [`UniformInt`]: struct.UniformInt.html
-//! [`UniformFloat`]: struct.UniformFloat.html
-//! [`UniformDuration`]: struct.UniformDuration.html
-
-#[cfg(feature = "std")]
-use std::time::Duration;
-
-use Rng;
-use distributions::Distribution;
-use distributions::float::IntoFloat;
-
-/// Sample values uniformly between two bounds.
-///
-/// [`Uniform::new`] and [`Uniform::new_inclusive`] construct a uniform
-/// distribution sampling from the given range; these functions may do extra
-/// work up front to make sampling of multiple values faster.
-///
-/// When sampling from a constant range, many calculations can happen at
-/// compile-time and all methods should be fast; for floating-point ranges and
-/// the full range of integer types this should have comparable performance to
-/// the `Standard` distribution.
-///
-/// Steps are taken to avoid bias which might be present in naive
-/// implementations; for example `rng.gen::<u8>() % 170` samples from the range
-/// `[0, 169]` but is twice as likely to select numbers less than 85 than other
-/// values. Further, the implementations here give more weight to the high-bits
-/// generated by the RNG than the low bits, since with some RNGs the low-bits
-/// are of lower quality than the high bits.
-///
-/// Implementations should attempt to sample in `[low, high)` for
-/// `Uniform::new(low, high)`, i.e., excluding `high`, but this may be very
-/// difficult. All the primitive integer types satisfy this property, and the
-/// float types normally satisfy it, but rounding may mean `high` can occur.
-///
-/// # Example
-///
-/// ```
-/// use rand::distributions::{Distribution, Uniform};
-///
-/// fn main() {
-///     let between = Uniform::from(10..10000);
-///     let mut rng = rand::thread_rng();
-///     let mut sum = 0;
-///     for _ in 0..1000 {
-///         sum += between.sample(&mut rng);
-///     }
-///     println!("{}", sum);
-/// }
-/// ```
-///
-/// [`Uniform::new`]: struct.Uniform.html#method.new
-/// [`Uniform::new_inclusive`]: struct.Uniform.html#method.new_inclusive
-/// [`new`]: struct.Uniform.html#method.new
-/// [`new_inclusive`]: struct.Uniform.html#method.new_inclusive
-#[derive(Clone, Copy, Debug)]
-pub struct Uniform<X: SampleUniform> {
-    inner: X::Sampler,
-}
-
-impl<X: SampleUniform> Uniform<X> {
-    /// Create a new `Uniform` instance which samples uniformly from the half
-    /// open range `[low, high)` (excluding `high`). Panics if `low >= high`.
-    pub fn new(low: X, high: X) -> Uniform<X> {
-        Uniform { inner: X::Sampler::new(low, high) }
-    }
-
-    /// Create a new `Uniform` instance which samples uniformly from the closed
-    /// range `[low, high]` (inclusive). Panics if `low > high`.
-    pub fn new_inclusive(low: X, high: X) -> Uniform<X> {
-        Uniform { inner: X::Sampler::new_inclusive(low, high) }
-    }
-}
-
-impl<X: SampleUniform> Distribution<X> for Uniform<X> {
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> X {
-        self.inner.sample(rng)
-    }
-}
-
-/// Helper trait for creating objects using the correct implementation of
-/// [`UniformSampler`] for the sampling type.
-///
-/// See the [module documentation] on how to implement [`Uniform`] range
-/// sampling for a custom type.
-///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [module documentation]: index.html
-/// [`Uniform`]: struct.Uniform.html
-pub trait SampleUniform: Sized {
-    /// The `UniformSampler` implementation supporting type `X`.
-    type Sampler: UniformSampler<X = Self>;
-}
-
-/// Helper trait handling actual uniform sampling.
-///
-/// See the [module documentation] on how to implement [`Uniform`] range
-/// sampling for a custom type.
-///
-/// Implementation of [`sample_single`] is optional, and is only useful when
-/// the implementation can be faster than `Self::new(low, high).sample(rng)`.
-///
-/// [module documentation]: index.html
-/// [`Uniform`]: struct.Uniform.html
-/// [`sample_single`]: trait.UniformSampler.html#method.sample_single
-pub trait UniformSampler: Sized {
-    /// The type sampled by this implementation.
-    type X;
-
-    /// Construct self, with inclusive lower bound and exclusive upper bound
-    /// `[low, high)`.
-    ///
-    /// Usually users should not call this directly but instead use
-    /// `Uniform::new`, which asserts that `low < high` before calling this.
-    fn new(low: Self::X, high: Self::X) -> Self;
-
-    /// Construct self, with inclusive bounds `[low, high]`.
-    ///
-    /// Usually users should not call this directly but instead use
-    /// `Uniform::new_inclusive`, which asserts that `low <= high` before
-    /// calling this.
-    fn new_inclusive(low: Self::X, high: Self::X) -> Self;
-
-    /// Sample a value.
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X;
-
-    /// Sample a single value uniformly from a range with inclusive lower bound
-    /// and exclusive upper bound `[low, high)`.
-    ///
-    /// Usually users should not call this directly but instead use
-    /// `Uniform::sample_single`, which asserts that `low < high` before calling
-    /// this.
-    ///
-    /// Via this method, implementations can provide a method optimized for
-    /// sampling only a single value from the specified range. The default
-    /// implementation simply calls `UniformSampler::new` then `sample` on the
-    /// result.
-    fn sample_single<R: Rng + ?Sized>(low: Self::X, high: Self::X, rng: &mut R)
-        -> Self::X
-    {
-        let uniform: Self = UniformSampler::new(low, high);
-        uniform.sample(rng)
-    }
-}
-
-impl<X: SampleUniform> From<::core::ops::Range<X>> for Uniform<X> {
-    fn from(r: ::core::ops::Range<X>) -> Uniform<X> {
-        Uniform::new(r.start, r.end)
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// What follows are all back-ends.
-
-
-/// The back-end implementing [`UniformSampler`] for integer types.
-///
-/// Unless you are implementing [`UniformSampler`] for your own type, this type
-/// should not be used directly, use [`Uniform`] instead.
-///
-/// # Implementation notes
-///
-/// For a closed range, the number of possible numbers we should generate is
-/// `range = (high - low + 1)`. It is not possible to end up with a uniform
-/// distribution if we map *all* the random integers that can be generated to
-/// this range. We have to map integers from a `zone` that is a multiple of the
-/// range. The rest of the integers, that cause a bias, are rejected.
-///
-/// The problem with `range` is that to cover the full range of the type, it has
-/// to store `unsigned_max + 1`, which can't be represented. But if the range
-/// covers the full range of the type, no modulus is needed. A range of size 0
-/// can't exist, so we use that to represent this special case. Wrapping
-/// arithmetic even makes representing `unsigned_max + 1` as 0 simple.
-///
-/// We don't calculate `zone` directly, but first calculate the number of
-/// integers to reject. To handle `unsigned_max + 1` not fitting in the type,
-/// we use:
-/// `ints_to_reject = (unsigned_max + 1) % range;`
-/// `ints_to_reject = (unsigned_max - range + 1) % range;`
-///
-/// The smallest integer PRNGs generate is `u32`. That is why for small integer
-/// sizes (`i8`/`u8` and `i16`/`u16`) there is an optimization: don't pick the
-/// largest zone that can fit in the small type, but pick the largest zone that
-/// can fit in an `u32`. `ints_to_reject` is always less than half the size of
-/// the small integer. This means the first bit of `zone` is always 1, and so
-/// are all the other preceding bits of a larger integer. The easiest way to
-/// grow the `zone` for the larger type is to simply sign extend it.
-///
-/// An alternative to using a modulus is widening multiply: After a widening
-/// multiply by `range`, the result is in the high word. Then comparing the low
-/// word against `zone` makes sure our distribution is uniform.
-///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [`Uniform`]: struct.Uniform.html
-#[derive(Clone, Copy, Debug)]
-pub struct UniformInt<X> {
-    low: X,
-    range: X,
-    zone: X,
-}
-
-macro_rules! uniform_int_impl {
-    ($ty:ty, $signed:ty, $unsigned:ident,
-     $i_large:ident, $u_large:ident) => {
-        impl SampleUniform for $ty {
-            type Sampler = UniformInt<$ty>;
-        }
-
-        impl UniformSampler for UniformInt<$ty> {
-            // We play free and fast with unsigned vs signed here
-            // (when $ty is signed), but that's fine, since the
-            // contract of this macro is for $ty and $unsigned to be
-            // "bit-equal", so casting between them is a no-op.
-
-            type X = $ty;
-
-            #[inline] // if the range is constant, this helps LLVM to do the
-                      // calculations at compile-time.
-            fn new(low: Self::X, high: Self::X) -> Self {
-                assert!(low < high, "Uniform::new called with `low >= high`");
-                UniformSampler::new_inclusive(low, high - 1)
-            }
-
-            #[inline] // if the range is constant, this helps LLVM to do the
-                      // calculations at compile-time.
-            fn new_inclusive(low: Self::X, high: Self::X) -> Self {
-                assert!(low <= high,
-                        "Uniform::new_inclusive called with `low > high`");
-                let unsigned_max = ::core::$unsigned::MAX;
-
-                let range = high.wrapping_sub(low).wrapping_add(1) as $unsigned;
-                let ints_to_reject =
-                    if range > 0 {
-                        (unsigned_max - range + 1) % range
-                    } else {
-                        0
-                    };
-                let zone = unsigned_max - ints_to_reject;
-
-                UniformInt {
-                    low: low,
-                    // These are really $unsigned values, but store as $ty:
-                    range: range as $ty,
-                    zone: zone as $ty
-                }
-            }
-
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
-                let range = self.range as $unsigned as $u_large;
-                if range > 0 {
-                    // Grow `zone` to fit a type of at least 32 bits, by
-                    // sign-extending it (the first bit is always 1, so are all
-                    // the preceding bits of the larger type).
-                    // For types that already have the right size, all the
-                    // casting is a no-op.
-                    let zone = self.zone as $signed as $i_large as $u_large;
-                    loop {
-                        let v: $u_large = rng.gen();
-                        let (hi, lo) = v.wmul(range);
-                        if lo <= zone {
-                            return self.low.wrapping_add(hi as $ty);
-                        }
-                    }
-                } else {
-                    // Sample from the entire integer range.
-                    rng.gen()
-                }
-            }
-
-            fn sample_single<R: Rng + ?Sized>(low: Self::X,
-                                              high: Self::X,
-                                              rng: &mut R) -> Self::X
-            {
-                assert!(low < high,
-                        "Uniform::sample_single called with low >= high");
-                let range = high.wrapping_sub(low) as $unsigned as $u_large;
-                let zone =
-                    if ::core::$unsigned::MAX <= ::core::u16::MAX as $unsigned {
-                        // Using a modulus is faster than the approximation for
-                        // i8 and i16. I suppose we trade the cost of one
-                        // modulus for near-perfect branch prediction.
-                        let unsigned_max: $u_large = ::core::$u_large::MAX;
-                        let ints_to_reject = (unsigned_max - range + 1) % range;
-                        unsigned_max - ints_to_reject
-                    } else {
-                        // conservative but fast approximation
-                       range << range.leading_zeros()
-                    };
-
-                loop {
-                    let v: $u_large = rng.gen();
-                    let (hi, lo) = v.wmul(range);
-                    if lo <= zone {
-                        return low.wrapping_add(hi as $ty);
-                    }
-                }
-            }
-        }
-    }
-}
-
-uniform_int_impl! { i8, i8, u8, i32, u32 }
-uniform_int_impl! { i16, i16, u16, i32, u32 }
-uniform_int_impl! { i32, i32, u32, i32, u32 }
-uniform_int_impl! { i64, i64, u64, i64, u64 }
-#[cfg(feature = "i128_support")]
-uniform_int_impl! { i128, i128, u128, u128, u128 }
-uniform_int_impl! { isize, isize, usize, isize, usize }
-uniform_int_impl! { u8, i8, u8, i32, u32 }
-uniform_int_impl! { u16, i16, u16, i32, u32 }
-uniform_int_impl! { u32, i32, u32, i32, u32 }
-uniform_int_impl! { u64, i64, u64, i64, u64 }
-uniform_int_impl! { usize, isize, usize, isize, usize }
-#[cfg(feature = "i128_support")]
-uniform_int_impl! { u128, u128, u128, i128, u128 }
-
-
-trait WideningMultiply<RHS = Self> {
-    type Output;
-
-    fn wmul(self, x: RHS) -> Self::Output;
-}
-
-macro_rules! wmul_impl {
-    ($ty:ty, $wide:ty, $shift:expr) => {
-        impl WideningMultiply for $ty {
-            type Output = ($ty, $ty);
-
-            #[inline(always)]
-            fn wmul(self, x: $ty) -> Self::Output {
-                let tmp = (self as $wide) * (x as $wide);
-                ((tmp >> $shift) as $ty, tmp as $ty)
-            }
-        }
-    }
-}
-wmul_impl! { u8, u16, 8 }
-wmul_impl! { u16, u32, 16 }
-wmul_impl! { u32, u64, 32 }
-#[cfg(feature = "i128_support")]
-wmul_impl! { u64, u128, 64 }
-
-// This code is a translation of the __mulddi3 function in LLVM's
-// compiler-rt. It is an optimised variant of the common method
-// `(a + b) * (c + d) = ac + ad + bc + bd`.
-//
-// For some reason LLVM can optimise the C version very well, but
-// keeps shuffeling registers in this Rust translation.
-macro_rules! wmul_impl_large {
-    ($ty:ty, $half:expr) => {
-        impl WideningMultiply for $ty {
-            type Output = ($ty, $ty);
-
-            #[inline(always)]
-            fn wmul(self, b: $ty) -> Self::Output {
-                const LOWER_MASK: $ty = !0 >> $half;
-                let mut low = (self & LOWER_MASK).wrapping_mul(b & LOWER_MASK);
-                let mut t = low >> $half;
-                low &= LOWER_MASK;
-                t += (self >> $half).wrapping_mul(b & LOWER_MASK);
-                low += (t & LOWER_MASK) << $half;
-                let mut high = t >> $half;
-                t = low >> $half;
-                low &= LOWER_MASK;
-                t += (b >> $half).wrapping_mul(self & LOWER_MASK);
-                low += (t & LOWER_MASK) << $half;
-                high += t >> $half;
-                high += (self >> $half).wrapping_mul(b >> $half);
-
-                (high, low)
-            }
-        }
-    }
-}
-#[cfg(not(feature = "i128_support"))]
-wmul_impl_large! { u64, 32 }
-#[cfg(feature = "i128_support")]
-wmul_impl_large! { u128, 64 }
-
-macro_rules! wmul_impl_usize {
-    ($ty:ty) => {
-        impl WideningMultiply for usize {
-            type Output = (usize, usize);
-
-            #[inline(always)]
-            fn wmul(self, x: usize) -> Self::Output {
-                let (high, low) = (self as $ty).wmul(x as $ty);
-                (high as usize, low as usize)
-            }
-        }
-    }
-}
-#[cfg(target_pointer_width = "32")]
-wmul_impl_usize! { u32 }
-#[cfg(target_pointer_width = "64")]
-wmul_impl_usize! { u64 }
-
-
-
-/// The back-end implementing [`UniformSampler`] for floating-point types.
-///
-/// Unless you are implementing [`UniformSampler`] for your own type, this type
-/// should not be used directly, use [`Uniform`] instead.
-///
-/// # Implementation notes
-///
-/// Instead of generating a float in the `[0, 1)` range using [`Standard`], the
-/// `UniformFloat` implementation converts the output of an PRNG itself. This
-/// way one or two steps can be optimized out.
-///
-/// The floats are first converted to a value in the `[1, 2)` interval using a
-/// transmute-based method, and then mapped to the expected range with a
-/// multiply and addition. Values produced this way have what equals 22 bits of
-/// random digits for an `f32`, and 52 for an `f64`.
-///
-/// Currently there is no difference between [`new`] and [`new_inclusive`],
-/// because the boundaries of a floats range are a bit of a fuzzy concept due to
-/// rounding errors.
-///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [`new`]: trait.UniformSampler.html#tymethod.new
-/// [`new_inclusive`]: trait.UniformSampler.html#tymethod.new_inclusive
-/// [`Uniform`]: struct.Uniform.html
-/// [`Standard`]: ../struct.Standard.html
-#[derive(Clone, Copy, Debug)]
-pub struct UniformFloat<X> {
-    scale: X,
-    offset: X,
-}
-
-macro_rules! uniform_float_impl {
-    ($ty:ty, $bits_to_discard:expr, $next_u:ident) => {
-        impl SampleUniform for $ty {
-            type Sampler = UniformFloat<$ty>;
-        }
-
-        impl UniformSampler for UniformFloat<$ty> {
-            type X = $ty;
-
-            fn new(low: Self::X, high: Self::X) -> Self {
-                assert!(low < high, "Uniform::new called with `low >= high`");
-                let scale = high - low;
-                let offset = low - scale;
-                UniformFloat {
-                    scale: scale,
-                    offset: offset,
-                }
-            }
-
-            fn new_inclusive(low: Self::X, high: Self::X) -> Self {
-                assert!(low <= high,
-                        "Uniform::new_inclusive called with `low > high`");
-                let scale = high - low;
-                let offset = low - scale;
-                UniformFloat {
-                    scale: scale,
-                    offset: offset,
-                }
-            }
-
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
-                // Generate a value in the range [1, 2)
-                let value1_2 = (rng.$next_u() >> $bits_to_discard)
-                               .into_float_with_exponent(0);
-                // We don't use `f64::mul_add`, because it is not available with
-                // `no_std`. Furthermore, it is slower for some targets (but
-                // faster for others). However, the order of multiplication and
-                // addition is important, because on some platforms (e.g. ARM)
-                // it will be optimized to a single (non-FMA) instruction.
-                value1_2 * self.scale + self.offset
-            }
-
-            fn sample_single<R: Rng + ?Sized>(low: Self::X,
-                                              high: Self::X,
-                                              rng: &mut R) -> Self::X {
-                assert!(low < high,
-                        "Uniform::sample_single called with low >= high");
-                let scale = high - low;
-                let offset = low - scale;
-                // Generate a value in the range [1, 2)
-                let value1_2 = (rng.$next_u() >> $bits_to_discard)
-                               .into_float_with_exponent(0);
-                // Doing multiply before addition allows some architectures to
-                // use a single instruction.
-                value1_2 * scale + offset
-            }
-        }
-    }
-}
-
-uniform_float_impl! { f32, 32 - 23, next_u32 }
-uniform_float_impl! { f64, 64 - 52, next_u64 }
-
-
-
-/// The back-end implementing [`UniformSampler`] for `Duration`.
-///
-/// Unless you are implementing [`UniformSampler`] for your own types, this type
-/// should not be used directly, use [`Uniform`] instead.
-///
-/// [`UniformSampler`]: trait.UniformSampler.html
-/// [`Uniform`]: struct.Uniform.html
-#[cfg(feature = "std")]
-#[derive(Clone, Copy, Debug)]
-pub struct UniformDuration {
-    offset: Duration,
-    mode: UniformDurationMode,
-}
-
-#[cfg(feature = "std")]
-#[derive(Debug, Copy, Clone)]
-enum UniformDurationMode {
-    Small {
-        nanos: Uniform<u64>,
-    },
-    Large {
-        size: Duration,
-        secs: Uniform<u64>,
-    }
-}
-
-#[cfg(feature = "std")]
-impl SampleUniform for Duration {
-    type Sampler = UniformDuration;
-}
-
-#[cfg(feature = "std")]
-impl UniformSampler for UniformDuration {
-    type X = Duration;
-
-    #[inline]
-    fn new(low: Duration, high: Duration) -> UniformDuration {
-        assert!(low < high, "Uniform::new called with `low >= high`");
-        UniformDuration::new_inclusive(low, high - Duration::new(0, 1))
-    }
-
-    #[inline]
-    fn new_inclusive(low: Duration, high: Duration) -> UniformDuration {
-        assert!(low <= high, "Uniform::new_inclusive called with `low > high`");
-        let size = high - low;
-        let nanos = size
-            .as_secs()
-            .checked_mul(1_000_000_000)
-            .and_then(|n| n.checked_add(size.subsec_nanos() as u64));
-
-        let mode = match nanos {
-            Some(nanos) => {
-                UniformDurationMode::Small {
-                    nanos: Uniform::new_inclusive(0, nanos),
-                }
-            }
-            None => {
-                UniformDurationMode::Large {
-                    size: size,
-                    secs: Uniform::new_inclusive(0, size.as_secs()),
-                }
-            }
-        };
-
-        UniformDuration {
-            mode,
-            offset: low,
-        }
-    }
-
-    #[inline]
-    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Duration {
-        let d = match self.mode {
-            UniformDurationMode::Small { nanos } => {
-                let nanos = nanos.sample(rng);
-                Duration::new(nanos / 1_000_000_000, (nanos % 1_000_000_000) as u32)
-            }
-            UniformDurationMode::Large { size, secs } => {
-                // constant folding means this is at least as fast as `gen_range`
-                let nano_range = Uniform::new(0, 1_000_000_000);
-                loop {
-                    let d = Duration::new(secs.sample(rng), nano_range.sample(rng));
-                    if d <= size {
-                        break d;
-                    }
-                }
-            }
-        };
-
-        self.offset + d
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use Rng;
-    use distributions::uniform::{Uniform, UniformSampler, UniformFloat, SampleUniform};
-
-    #[should_panic]
-    #[test]
-    fn test_uniform_bad_limits_equal_int() {
-        Uniform::new(10, 10);
-    }
-
-    #[should_panic]
-    #[test]
-    fn test_uniform_bad_limits_equal_float() {
-        Uniform::new(10., 10.);
-    }
-
-    #[test]
-    fn test_uniform_good_limits_equal_int() {
-        let mut rng = ::test::rng(804);
-        let dist = Uniform::new_inclusive(10, 10);
-        for _ in 0..20 {
-            assert_eq!(rng.sample(dist), 10);
-        }
-    }
-
-    #[test]
-    fn test_uniform_good_limits_equal_float() {
-        let mut rng = ::test::rng(805);
-        let dist = Uniform::new_inclusive(10., 10.);
-        for _ in 0..20 {
-            assert_eq!(rng.sample(dist), 10.);
-        }
-    }
-
-    #[should_panic]
-    #[test]
-    fn test_uniform_bad_limits_flipped_int() {
-        Uniform::new(10, 5);
-    }
-
-    #[should_panic]
-    #[test]
-    fn test_uniform_bad_limits_flipped_float() {
-        Uniform::new(10., 5.);
-    }
-
-    #[test]
-    fn test_integers() {
-        let mut rng = ::test::rng(251);
-        macro_rules! t {
-            ($($ty:ident),*) => {{
-                $(
-                   let v: &[($ty, $ty)] = &[(0, 10),
-                                            (10, 127),
-                                            (::core::$ty::MIN, ::core::$ty::MAX)];
-                   for &(low, high) in v.iter() {
-                        let my_uniform = Uniform::new(low, high);
-                        for _ in 0..1000 {
-                            let v: $ty = rng.sample(my_uniform);
-                            assert!(low <= v && v < high);
-                        }
-
-                        let my_uniform = Uniform::new_inclusive(low, high);
-                        for _ in 0..1000 {
-                            let v: $ty = rng.sample(my_uniform);
-                            assert!(low <= v && v <= high);
-                        }
-
-                        for _ in 0..1000 {
-                            let v: $ty = rng.gen_range(low, high);
-                            assert!(low <= v && v < high);
-                        }
-                    }
-                 )*
-            }}
-        }
-        t!(i8, i16, i32, i64, isize,
-           u8, u16, u32, u64, usize);
-        #[cfg(feature = "i128_support")]
-        t!(i128, u128)
-    }
-
-    #[test]
-    fn test_floats() {
-        let mut rng = ::test::rng(252);
-        macro_rules! t {
-            ($($ty:ty),*) => {{
-                $(
-                   let v: &[($ty, $ty)] = &[(0.0, 100.0),
-                                            (-1e35, -1e25),
-                                            (1e-35, 1e-25),
-                                            (-1e35, 1e35)];
-                   for &(low, high) in v.iter() {
-                        let my_uniform = Uniform::new(low, high);
-                        for _ in 0..1000 {
-                            let v: $ty = rng.sample(my_uniform);
-                            assert!(low <= v && v < high);
-                        }
-                    }
-                 )*
-            }}
-        }
-
-        t!(f32, f64)
-    }
-
-    #[test]
-    #[cfg(feature = "std")]
-    fn test_durations() {
-        use std::time::Duration;
-
-        let mut rng = ::test::rng(253);
-
-        let v = &[(Duration::new(10, 50000), Duration::new(100, 1234)),
-                  (Duration::new(0, 100), Duration::new(1, 50)),
-                  (Duration::new(0, 0), Duration::new(u64::max_value(), 999_999_999))];
-        for &(low, high) in v.iter() {
-            let my_uniform = Uniform::new(low, high);
-            for _ in 0..1000 {
-                let v = rng.sample(my_uniform);
-                assert!(low <= v && v < high);
-            }
-        }
-    }
-
-    #[test]
-    fn test_custom_uniform() {
-        #[derive(Clone, Copy, PartialEq, PartialOrd)]
-        struct MyF32 {
-            x: f32,
-        }
-        #[derive(Clone, Copy, Debug)]
-        struct UniformMyF32 {
-            inner: UniformFloat<f32>,
-        }
-        impl UniformSampler for UniformMyF32 {
-            type X = MyF32;
-            fn new(low: Self::X, high: Self::X) -> Self {
-                UniformMyF32 {
-                    inner: UniformFloat::<f32>::new(low.x, high.x),
-                }
-            }
-            fn new_inclusive(low: Self::X, high: Self::X) -> Self {
-                UniformSampler::new(low, high)
-            }
-            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
-                MyF32 { x: self.inner.sample(rng) }
-            }
-        }
-        impl SampleUniform for MyF32 {
-            type Sampler = UniformMyF32;
-        }
-
-        let (low, high) = (MyF32{ x: 17.0f32 }, MyF32{ x: 22.0f32 });
-        let uniform = Uniform::new(low, high);
-        let mut rng = ::test::rng(804);
-        for _ in 0..100 {
-            let x: MyF32 = rng.sample(uniform);
-            assert!(low <= x && x < high);
-        }
-    }
-
-    #[test]
-    fn test_uniform_from_std_range() {
-        let r = Uniform::from(2u32..7);
-        assert_eq!(r.inner.low, 2);
-        assert_eq!(r.inner.range, 5);
-        let r = Uniform::from(2.0f64..7.0);
-        assert_eq!(r.inner.offset, -3.0);
-        assert_eq!(r.inner.scale, 5.0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/distributions/ziggurat_tables.rs cargo-0.33.0/vendor/rand-0.5.5/src/distributions/ziggurat_tables.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/distributions/ziggurat_tables.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/distributions/ziggurat_tables.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Tables for distributions which are sampled using the ziggurat
-// algorithm. Autogenerated by `ziggurat_tables.py`.
-
-pub type ZigTable = &'static [f64; 257];
-pub const ZIG_NORM_R: f64 = 3.654152885361008796;
-pub static ZIG_NORM_X: [f64; 257] =
-    [3.910757959537090045, 3.654152885361008796, 3.449278298560964462, 3.320244733839166074,
-     3.224575052047029100, 3.147889289517149969, 3.083526132001233044, 3.027837791768635434,
-     2.978603279880844834, 2.934366867207854224, 2.894121053612348060, 2.857138730872132548,
-     2.822877396825325125, 2.790921174000785765, 2.760944005278822555, 2.732685359042827056,
-     2.705933656121858100, 2.680514643284522158, 2.656283037575502437, 2.633116393630324570,
-     2.610910518487548515, 2.589575986706995181, 2.569035452680536569, 2.549221550323460761,
-     2.530075232158516929, 2.511544441625342294, 2.493583041269680667, 2.476149939669143318,
-     2.459208374333311298, 2.442725318198956774, 2.426670984935725972, 2.411018413899685520,
-     2.395743119780480601, 2.380822795170626005, 2.366237056715818632, 2.351967227377659952,
-     2.337996148795031370, 2.324308018869623016, 2.310888250599850036, 2.297723348901329565,
-     2.284800802722946056, 2.272108990226823888, 2.259637095172217780, 2.247375032945807760,
-     2.235313384928327984, 2.223443340090905718, 2.211756642882544366, 2.200245546609647995,
-     2.188902771624720689, 2.177721467738641614, 2.166695180352645966, 2.155817819875063268,
-     2.145083634046203613, 2.134487182844320152, 2.124023315687815661, 2.113687150684933957,
-     2.103474055713146829, 2.093379631137050279, 2.083399693996551783, 2.073530263516978778,
-     2.063767547809956415, 2.054107931648864849, 2.044547965215732788, 2.035084353727808715,
-     2.025713947862032960, 2.016433734904371722, 2.007240830558684852, 1.998132471356564244,
-     1.989106007615571325, 1.980158896898598364, 1.971288697931769640, 1.962493064942461896,
-     1.953769742382734043, 1.945116560006753925, 1.936531428273758904, 1.928012334050718257,
-     1.919557336591228847, 1.911164563769282232, 1.902832208548446369, 1.894558525668710081,
-     1.886341828534776388, 1.878180486290977669, 1.870072921069236838, 1.862017605397632281,
-     1.854013059758148119, 1.846057850283119750, 1.838150586580728607, 1.830289919680666566,
-     1.822474540091783224, 1.814703175964167636, 1.806974591348693426, 1.799287584547580199,
-     1.791640986550010028, 1.784033659547276329, 1.776464495522344977, 1.768932414909077933,
-     1.761436365316706665, 1.753975320315455111, 1.746548278279492994, 1.739154261283669012,
-     1.731792314050707216, 1.724461502945775715, 1.717160915015540690, 1.709889657069006086,
-     1.702646854797613907, 1.695431651932238548, 1.688243209434858727, 1.681080704722823338,
-     1.673943330923760353, 1.666830296159286684, 1.659740822855789499, 1.652674147080648526,
-     1.645629517902360339, 1.638606196773111146, 1.631603456932422036, 1.624620582830568427,
-     1.617656869570534228, 1.610711622367333673, 1.603784156023583041, 1.596873794420261339,
-     1.589979870021648534, 1.583101723393471438, 1.576238702733332886, 1.569390163412534456,
-     1.562555467528439657, 1.555733983466554893, 1.548925085471535512, 1.542128153226347553,
-     1.535342571438843118, 1.528567729435024614, 1.521803020758293101, 1.515047842773992404,
-     1.508301596278571965, 1.501563685112706548, 1.494833515777718391, 1.488110497054654369,
-     1.481394039625375747, 1.474683555695025516, 1.467978458615230908, 1.461278162507407830,
-     1.454582081885523293, 1.447889631277669675, 1.441200224845798017, 1.434513276002946425,
-     1.427828197027290358, 1.421144398672323117, 1.414461289772464658, 1.407778276843371534,
-     1.401094763676202559, 1.394410150925071257, 1.387723835686884621, 1.381035211072741964,
-     1.374343665770030531, 1.367648583594317957, 1.360949343030101844, 1.354245316759430606,
-     1.347535871177359290, 1.340820365893152122, 1.334098153216083604, 1.327368577624624679,
-     1.320630975217730096, 1.313884673146868964, 1.307128989027353860, 1.300363230327433728,
-     1.293586693733517645, 1.286798664489786415, 1.279998415710333237, 1.273185207661843732,
-     1.266358287014688333, 1.259516886060144225, 1.252660221891297887, 1.245787495544997903,
-     1.238897891102027415, 1.231990574742445110, 1.225064693752808020, 1.218119375481726552,
-     1.211153726239911244, 1.204166830140560140, 1.197157747875585931, 1.190125515422801650,
-     1.183069142678760732, 1.175987612011489825, 1.168879876726833800, 1.161744859441574240,
-     1.154581450355851802, 1.147388505416733873, 1.140164844363995789, 1.132909248648336975,
-     1.125620459211294389, 1.118297174115062909, 1.110938046009249502, 1.103541679420268151,
-     1.096106627847603487, 1.088631390649514197, 1.081114409698889389, 1.073554065787871714,
-     1.065948674757506653, 1.058296483326006454, 1.050595664586207123, 1.042844313139370538,
-     1.035040439828605274, 1.027181966030751292, 1.019266717460529215, 1.011292417434978441,
-     1.003256679539591412, 0.995156999629943084, 0.986990747093846266, 0.978755155288937750,
-     0.970447311058864615, 0.962064143217605250, 0.953602409875572654, 0.945058684462571130,
-     0.936429340280896860, 0.927710533396234771, 0.918898183643734989, 0.909987953490768997,
-     0.900975224455174528, 0.891855070726792376, 0.882622229578910122, 0.873271068082494550,
-     0.863795545546826915, 0.854189171001560554, 0.844444954902423661, 0.834555354079518752,
-     0.824512208745288633, 0.814306670128064347, 0.803929116982664893, 0.793369058833152785,
-     0.782615023299588763, 0.771654424216739354, 0.760473406422083165, 0.749056662009581653,
-     0.737387211425838629, 0.725446140901303549, 0.713212285182022732, 0.700661841097584448,
-     0.687767892786257717, 0.674499822827436479, 0.660822574234205984, 0.646695714884388928,
-     0.632072236375024632, 0.616896989996235545, 0.601104617743940417, 0.584616766093722262,
-     0.567338257040473026, 0.549151702313026790, 0.529909720646495108, 0.509423329585933393,
-     0.487443966121754335, 0.463634336771763245, 0.437518402186662658, 0.408389134588000746,
-     0.375121332850465727, 0.335737519180459465, 0.286174591747260509, 0.215241895913273806,
-     0.000000000000000000];
-pub static ZIG_NORM_F: [f64; 257] =
-    [0.000477467764586655, 0.001260285930498598, 0.002609072746106363, 0.004037972593371872,
-     0.005522403299264754, 0.007050875471392110, 0.008616582769422917, 0.010214971439731100,
-     0.011842757857943104, 0.013497450601780807, 0.015177088307982072, 0.016880083152595839,
-     0.018605121275783350, 0.020351096230109354, 0.022117062707379922, 0.023902203305873237,
-     0.025705804008632656, 0.027527235669693315, 0.029365939758230111, 0.031221417192023690,
-     0.033093219458688698, 0.034980941461833073, 0.036884215688691151, 0.038802707404656918,
-     0.040736110656078753, 0.042684144916619378, 0.044646552251446536, 0.046623094902089664,
-     0.048613553216035145, 0.050617723861121788, 0.052635418276973649, 0.054666461325077916,
-     0.056710690106399467, 0.058767952921137984, 0.060838108349751806, 0.062921024437977854,
-     0.065016577971470438, 0.067124653828023989, 0.069245144397250269, 0.071377949059141965,
-     0.073522973714240991, 0.075680130359194964, 0.077849336702372207, 0.080030515814947509,
-     0.082223595813495684, 0.084428509570654661, 0.086645194450867782, 0.088873592068594229,
-     0.091113648066700734, 0.093365311913026619, 0.095628536713353335, 0.097903279039215627,
-     0.100189498769172020, 0.102487158942306270, 0.104796225622867056, 0.107116667775072880,
-     0.109448457147210021, 0.111791568164245583, 0.114145977828255210, 0.116511665626037014,
-     0.118888613443345698, 0.121276805485235437, 0.123676228202051403, 0.126086870220650349,
-     0.128508722280473636, 0.130941777174128166, 0.133386029692162844, 0.135841476571757352,
-     0.138308116449064322, 0.140785949814968309, 0.143274978974047118, 0.145775208006537926,
-     0.148286642733128721, 0.150809290682410169, 0.153343161060837674, 0.155888264725064563,
-     0.158444614156520225, 0.161012223438117663, 0.163591108232982951, 0.166181285765110071,
-     0.168782774801850333, 0.171395595638155623, 0.174019770082499359, 0.176655321444406654,
-     0.179302274523530397, 0.181960655600216487, 0.184630492427504539, 0.187311814224516926,
-     0.190004651671193070, 0.192709036904328807, 0.195425003514885592, 0.198152586546538112,
-     0.200891822495431333, 0.203642749311121501, 0.206405406398679298, 0.209179834621935651,
-     0.211966076307852941, 0.214764175252008499, 0.217574176725178370, 0.220396127481011589,
-     0.223230075764789593, 0.226076071323264877, 0.228934165415577484, 0.231804410825248525,
-     0.234686861873252689, 0.237581574432173676, 0.240488605941449107, 0.243408015423711988,
-     0.246339863502238771, 0.249284212419516704, 0.252241126056943765, 0.255210669955677150,
-     0.258192911338648023, 0.261187919133763713, 0.264195763998317568, 0.267216518344631837,
-     0.270250256366959984, 0.273297054069675804, 0.276356989296781264, 0.279430141762765316,
-     0.282516593084849388, 0.285616426816658109, 0.288729728483353931, 0.291856585618280984,
-     0.294997087801162572, 0.298151326697901342, 0.301319396102034120, 0.304501391977896274,
-     0.307697412505553769, 0.310907558127563710, 0.314131931597630143, 0.317370638031222396,
-     0.320623784958230129, 0.323891482377732021, 0.327173842814958593, 0.330470981380537099,
-     0.333783015832108509, 0.337110066638412809, 0.340452257045945450, 0.343809713148291340,
-     0.347182563958251478, 0.350570941482881204, 0.353974980801569250, 0.357394820147290515,
-     0.360830600991175754, 0.364282468130549597, 0.367750569780596226, 0.371235057669821344,
-     0.374736087139491414, 0.378253817247238111, 0.381788410875031348, 0.385340034841733958,
-     0.388908860020464597, 0.392495061461010764, 0.396098818517547080, 0.399720314981931668,
-     0.403359739222868885, 0.407017284331247953, 0.410693148271983222, 0.414387534042706784,
-     0.418100649839684591, 0.421832709231353298, 0.425583931339900579, 0.429354541031341519,
-     0.433144769114574058, 0.436954852549929273, 0.440785034667769915, 0.444635565397727750,
-     0.448506701509214067, 0.452398706863882505, 0.456311852680773566, 0.460246417814923481,
-     0.464202689050278838, 0.468180961407822172, 0.472181538469883255, 0.476204732721683788,
-     0.480250865911249714, 0.484320269428911598, 0.488413284707712059, 0.492530263646148658,
-     0.496671569054796314, 0.500837575128482149, 0.505028667945828791, 0.509245245998136142,
-     0.513487720749743026, 0.517756517232200619, 0.522052074674794864, 0.526374847174186700,
-     0.530725304406193921, 0.535103932383019565, 0.539511234259544614, 0.543947731192649941,
-     0.548413963257921133, 0.552910490428519918, 0.557437893621486324, 0.561996775817277916,
-     0.566587763258951771, 0.571211506738074970, 0.575868682975210544, 0.580559996103683473,
-     0.585286179266300333, 0.590047996335791969, 0.594846243770991268, 0.599681752622167719,
-     0.604555390700549533, 0.609468064928895381, 0.614420723892076803, 0.619414360609039205,
-     0.624450015550274240, 0.629528779928128279, 0.634651799290960050, 0.639820277456438991,
-     0.645035480824251883, 0.650298743114294586, 0.655611470583224665, 0.660975147780241357,
-     0.666391343912380640, 0.671861719900766374, 0.677388036222513090, 0.682972161648791376,
-     0.688616083008527058, 0.694321916130032579, 0.700091918140490099, 0.705928501336797409,
-     0.711834248882358467, 0.717811932634901395, 0.723864533472881599, 0.729995264565802437,
-     0.736207598131266683, 0.742505296344636245, 0.748892447223726720, 0.755373506511754500,
-     0.761953346841546475, 0.768637315803334831, 0.775431304986138326, 0.782341832659861902,
-     0.789376143571198563, 0.796542330428254619, 0.803849483176389490, 0.811307874318219935,
-     0.818929191609414797, 0.826726833952094231, 0.834716292992930375, 0.842915653118441077,
-     0.851346258465123684, 0.860033621203008636, 0.869008688043793165, 0.878309655816146839,
-     0.887984660763399880, 0.898095921906304051, 0.908726440060562912, 0.919991505048360247,
-     0.932060075968990209, 0.945198953453078028, 0.959879091812415930, 0.977101701282731328,
-     1.000000000000000000];
-pub const ZIG_EXP_R: f64 = 7.697117470131050077;
-pub static ZIG_EXP_X: [f64; 257] =
-    [8.697117470131052741, 7.697117470131050077, 6.941033629377212577, 6.478378493832569696,
-     6.144164665772472667, 5.882144315795399869, 5.666410167454033697, 5.482890627526062488,
-     5.323090505754398016, 5.181487281301500047, 5.054288489981304089, 4.938777085901250530,
-     4.832939741025112035, 4.735242996601741083, 4.644491885420085175, 4.559737061707351380,
-     4.480211746528421912, 4.405287693473573185, 4.334443680317273007, 4.267242480277365857,
-     4.203313713735184365, 4.142340865664051464, 4.084051310408297830, 4.028208544647936762,
-     3.974606066673788796, 3.923062500135489739, 3.873417670399509127, 3.825529418522336744,
-     3.779270992411667862, 3.734528894039797375, 3.691201090237418825, 3.649195515760853770,
-     3.608428813128909507, 3.568825265648337020, 3.530315889129343354, 3.492837654774059608,
-     3.456332821132760191, 3.420748357251119920, 3.386035442460300970, 3.352149030900109405,
-     3.319047470970748037, 3.286692171599068679, 3.255047308570449882, 3.224079565286264160,
-     3.193757903212240290, 3.164053358025972873, 3.134938858084440394, 3.106389062339824481,
-     3.078380215254090224, 3.050890016615455114, 3.023897504455676621, 2.997382949516130601,
-     2.971327759921089662, 2.945714394895045718, 2.920526286512740821, 2.895747768600141825,
-     2.871364012015536371, 2.847360965635188812, 2.823725302450035279, 2.800444370250737780,
-     2.777506146439756574, 2.754899196562344610, 2.732612636194700073, 2.710636095867928752,
-     2.688959688741803689, 2.667573980773266573, 2.646469963151809157, 2.625639026797788489,
-     2.605072938740835564, 2.584763820214140750, 2.564704126316905253, 2.544886627111869970,
-     2.525304390037828028, 2.505950763528594027, 2.486819361740209455, 2.467904050297364815,
-     2.449198932978249754, 2.430698339264419694, 2.412396812688870629, 2.394289099921457886,
-     2.376370140536140596, 2.358635057409337321, 2.341079147703034380, 2.323697874390196372,
-     2.306486858283579799, 2.289441870532269441, 2.272558825553154804, 2.255833774367219213,
-     2.239262898312909034, 2.222842503111036816, 2.206569013257663858, 2.190438966723220027,
-     2.174449009937774679, 2.158595893043885994, 2.142876465399842001, 2.127287671317368289,
-     2.111826546019042183, 2.096490211801715020, 2.081275874393225145, 2.066180819490575526,
-     2.051202409468584786, 2.036338080248769611, 2.021585338318926173, 2.006941757894518563,
-     1.992404978213576650, 1.977972700957360441, 1.963642687789548313, 1.949412758007184943,
-     1.935280786297051359, 1.921244700591528076, 1.907302480018387536, 1.893452152939308242,
-     1.879691795072211180, 1.866019527692827973, 1.852433515911175554, 1.838931967018879954,
-     1.825513128903519799, 1.812175288526390649, 1.798916770460290859, 1.785735935484126014,
-     1.772631179231305643, 1.759600930889074766, 1.746643651946074405, 1.733757834985571566,
-     1.720942002521935299, 1.708194705878057773, 1.695514524101537912, 1.682900062917553896,
-     1.670349953716452118, 1.657862852574172763, 1.645437439303723659, 1.633072416535991334,
-     1.620766508828257901, 1.608518461798858379, 1.596327041286483395, 1.584191032532688892,
-     1.572109239386229707, 1.560080483527888084, 1.548103603714513499, 1.536177455041032092,
-     1.524300908219226258, 1.512472848872117082, 1.500692176842816750, 1.488957805516746058,
-     1.477268661156133867, 1.465623682245745352, 1.454021818848793446, 1.442462031972012504,
-     1.430943292938879674, 1.419464582769983219, 1.408024891569535697, 1.396623217917042137,
-     1.385258568263121992, 1.373929956328490576, 1.362636402505086775, 1.351376933258335189,
-     1.340150580529504643, 1.328956381137116560, 1.317793376176324749, 1.306660610415174117,
-     1.295557131686601027, 1.284481990275012642, 1.273434238296241139, 1.262412929069615330,
-     1.251417116480852521, 1.240445854334406572, 1.229498195693849105, 1.218573192208790124,
-     1.207669893426761121, 1.196787346088403092, 1.185924593404202199, 1.175080674310911677,
-     1.164254622705678921, 1.153445466655774743, 1.142652227581672841, 1.131873919411078511,
-     1.121109547701330200, 1.110358108727411031, 1.099618588532597308, 1.088889961938546813,
-     1.078171191511372307, 1.067461226479967662, 1.056759001602551429, 1.046063435977044209,
-     1.035373431790528542, 1.024687873002617211, 1.014005623957096480, 1.003325527915696735,
-     0.992646405507275897, 0.981967053085062602, 0.971286240983903260, 0.960602711668666509,
-     0.949915177764075969, 0.939222319955262286, 0.928522784747210395, 0.917815182070044311,
-     0.907098082715690257, 0.896370015589889935, 0.885629464761751528, 0.874874866291025066,
-     0.864104604811004484, 0.853317009842373353, 0.842510351810368485, 0.831682837734273206,
-     0.820832606554411814, 0.809957724057418282, 0.799056177355487174, 0.788125868869492430,
-     0.777164609759129710, 0.766170112735434672, 0.755139984181982249, 0.744071715500508102,
-     0.732962673584365398, 0.721810090308756203, 0.710611050909655040, 0.699362481103231959,
-     0.688061132773747808, 0.676703568029522584, 0.665286141392677943, 0.653804979847664947,
-     0.642255960424536365, 0.630634684933490286, 0.618936451394876075, 0.607156221620300030,
-     0.595288584291502887, 0.583327712748769489, 0.571267316532588332, 0.559100585511540626,
-     0.546820125163310577, 0.534417881237165604, 0.521885051592135052, 0.509211982443654398,
-     0.496388045518671162, 0.483401491653461857, 0.470239275082169006, 0.456886840931420235,
-     0.443327866073552401, 0.429543940225410703, 0.415514169600356364, 0.401214678896277765,
-     0.386617977941119573, 0.371692145329917234, 0.356399760258393816, 0.340696481064849122,
-     0.324529117016909452, 0.307832954674932158, 0.290527955491230394, 0.272513185478464703,
-     0.253658363385912022, 0.233790483059674731, 0.212671510630966620, 0.189958689622431842,
-     0.165127622564187282, 0.137304980940012589, 0.104838507565818778, 0.063852163815001570,
-     0.000000000000000000];
-pub static ZIG_EXP_F: [f64; 257] =
-    [0.000167066692307963, 0.000454134353841497, 0.000967269282327174, 0.001536299780301573,
-     0.002145967743718907, 0.002788798793574076, 0.003460264777836904, 0.004157295120833797,
-     0.004877655983542396, 0.005619642207205489, 0.006381905937319183, 0.007163353183634991,
-     0.007963077438017043, 0.008780314985808977, 0.009614413642502212, 0.010464810181029981,
-     0.011331013597834600, 0.012212592426255378, 0.013109164931254991, 0.014020391403181943,
-     0.014945968011691148, 0.015885621839973156, 0.016839106826039941, 0.017806200410911355,
-     0.018786700744696024, 0.019780424338009740, 0.020787204072578114, 0.021806887504283581,
-     0.022839335406385240, 0.023884420511558174, 0.024942026419731787, 0.026012046645134221,
-     0.027094383780955803, 0.028188948763978646, 0.029295660224637411, 0.030414443910466622,
-     0.031545232172893622, 0.032687963508959555, 0.033842582150874358, 0.035009037697397431,
-     0.036187284781931443, 0.037377282772959382, 0.038578995503074871, 0.039792391023374139,
-     0.041017441380414840, 0.042254122413316254, 0.043502413568888197, 0.044762297732943289,
-     0.046033761076175184, 0.047316792913181561, 0.048611385573379504, 0.049917534282706379,
-     0.051235237055126281, 0.052564494593071685, 0.053905310196046080, 0.055257689676697030,
-     0.056621641283742870, 0.057997175631200659, 0.059384305633420280, 0.060783046445479660,
-     0.062193415408541036, 0.063615431999807376, 0.065049117786753805, 0.066494496385339816,
-     0.067951593421936643, 0.069420436498728783, 0.070901055162371843, 0.072393480875708752,
-     0.073897746992364746, 0.075413888734058410, 0.076941943170480517, 0.078481949201606435,
-     0.080033947542319905, 0.081597980709237419, 0.083174093009632397, 0.084762330532368146,
-     0.086362741140756927, 0.087975374467270231, 0.089600281910032886, 0.091237516631040197,
-     0.092887133556043569, 0.094549189376055873, 0.096223742550432825, 0.097910853311492213,
-     0.099610583670637132, 0.101322997425953631, 0.103048160171257702, 0.104786139306570145,
-     0.106537004050001632, 0.108300825451033755, 0.110077676405185357, 0.111867631670056283,
-     0.113670767882744286, 0.115487163578633506, 0.117316899211555525, 0.119160057175327641,
-     0.121016721826674792, 0.122886979509545108, 0.124770918580830933, 0.126668629437510671,
-     0.128580204545228199, 0.130505738468330773, 0.132445327901387494, 0.134399071702213602,
-     0.136367070926428829, 0.138349428863580176, 0.140346251074862399, 0.142357645432472146,
-     0.144383722160634720, 0.146424593878344889, 0.148480375643866735, 0.150551185001039839,
-     0.152637142027442801, 0.154738369384468027, 0.156854992369365148, 0.158987138969314129,
-     0.161134939917591952, 0.163298528751901734, 0.165478041874935922, 0.167673618617250081,
-     0.169885401302527550, 0.172113535315319977, 0.174358169171353411, 0.176619454590494829,
-     0.178897546572478278, 0.181192603475496261, 0.183504787097767436, 0.185834262762197083,
-     0.188181199404254262, 0.190545769663195363, 0.192928149976771296, 0.195328520679563189,
-     0.197747066105098818, 0.200183974691911210, 0.202639439093708962, 0.205113656293837654,
-     0.207606827724221982, 0.210119159388988230, 0.212650861992978224, 0.215202151075378628,
-     0.217773247148700472, 0.220364375843359439, 0.222975768058120111, 0.225607660116683956,
-     0.228260293930716618, 0.230933917169627356, 0.233628783437433291, 0.236345152457059560,
-     0.239083290262449094, 0.241843469398877131, 0.244625969131892024, 0.247431075665327543,
-     0.250259082368862240, 0.253110290015629402, 0.255985007030415324, 0.258883549749016173,
-     0.261806242689362922, 0.264753418835062149, 0.267725419932044739, 0.270722596799059967,
-     0.273745309652802915, 0.276793928448517301, 0.279868833236972869, 0.282970414538780746,
-     0.286099073737076826, 0.289255223489677693, 0.292439288161892630, 0.295651704281261252,
-     0.298892921015581847, 0.302163400675693528, 0.305463619244590256, 0.308794066934560185,
-     0.312155248774179606, 0.315547685227128949, 0.318971912844957239, 0.322428484956089223,
-     0.325917972393556354, 0.329440964264136438, 0.332998068761809096, 0.336589914028677717,
-     0.340217149066780189, 0.343880444704502575, 0.347580494621637148, 0.351318016437483449,
-     0.355093752866787626, 0.358908472948750001, 0.362762973354817997, 0.366658079781514379,
-     0.370594648435146223, 0.374573567615902381, 0.378595759409581067, 0.382662181496010056,
-     0.386773829084137932, 0.390931736984797384, 0.395136981833290435, 0.399390684475231350,
-     0.403694012530530555, 0.408048183152032673, 0.412454465997161457, 0.416914186433003209,
-     0.421428728997616908, 0.425999541143034677, 0.430628137288459167, 0.435316103215636907,
-     0.440065100842354173, 0.444876873414548846, 0.449753251162755330, 0.454696157474615836,
-     0.459707615642138023, 0.464789756250426511, 0.469944825283960310, 0.475175193037377708,
-     0.480483363930454543, 0.485871987341885248, 0.491343869594032867, 0.496901987241549881,
-     0.502549501841348056, 0.508289776410643213, 0.514126393814748894, 0.520063177368233931,
-     0.526104213983620062, 0.532253880263043655, 0.538516872002862246, 0.544898237672440056,
-     0.551403416540641733, 0.558038282262587892, 0.564809192912400615, 0.571723048664826150,
-     0.578787358602845359, 0.586010318477268366, 0.593400901691733762, 0.600968966365232560,
-     0.608725382079622346, 0.616682180915207878, 0.624852738703666200, 0.633251994214366398,
-     0.641896716427266423, 0.650805833414571433, 0.660000841079000145, 0.669506316731925177,
-     0.679350572264765806, 0.689566496117078431, 0.700192655082788606, 0.711274760805076456,
-     0.722867659593572465, 0.735038092431424039, 0.747868621985195658, 0.761463388849896838,
-     0.775956852040116218, 0.791527636972496285, 0.808421651523009044, 0.826993296643051101,
-     0.847785500623990496, 0.871704332381204705, 0.900469929925747703, 0.938143680862176477,
-     1.000000000000000000];
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/lib.rs cargo-0.33.0/vendor/rand-0.5.5/src/lib.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1252 +0,0 @@
-// Copyright 2013-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Utilities for random number generation
-//!
-//! Rand provides utilities to generate random numbers, to convert them to
-//! useful types and distributions, and some randomness-related algorithms.
-//!
-//! # Basic usage
-//!
-//! To get you started quickly, the easiest and highest-level way to get
-//! a random value is to use [`random()`].
-//!
-//! ```
-//! let x: u8 = rand::random();
-//! println!("{}", x);
-//!
-//! let y = rand::random::<f64>();
-//! println!("{}", y);
-//!
-//! if rand::random() { // generates a boolean
-//!     println!("Heads!");
-//! }
-//! ```
-//!
-//! This supports generating most common types but is not very flexible, thus
-//! you probably want to learn a bit more about the Rand library.
-//!
-//!
-//! # The two-step process to get a random value
-//!
-//! Generating random values is typically a two-step process:
-//!
-//! - get some *random data* (an integer or bit/byte sequence) from a random
-//!   number generator (RNG);
-//! - use some function to transform that *data* into the type of value you want
-//!   (this function is an implementation of some *distribution* describing the
-//!   kind of value produced).
-//!
-//! Rand represents the first step with the [`RngCore`] trait and the second
-//! step via a combination of the [`Rng`] extension trait and the
-//! [`distributions` module].
-//! In practice you probably won't use [`RngCore`] directly unless you are
-//! implementing a random number generator (RNG).
-//!
-//! There are many kinds of RNGs, with different trade-offs. You can read more
-//! about them in the [`rngs` module] and even more in the [`prng` module],
-//! however, often you can just use [`thread_rng()`]. This function
-//! automatically initializes an RNG in thread-local memory, then returns a
-//! reference to it. It is fast, good quality, and secure (unpredictable).
-//!
-//! To turn the output of the RNG into something usable, you usually want to use
-//! the methods from the [`Rng`] trait. Some of the most useful methods are:
-//!
-//! - [`gen`] generates a random value appropriate for the type (just like
-//!   [`random()`]). For integers this is normally the full representable range
-//!   (e.g. from `0u32` to `std::u32::MAX`), for floats this is between 0 and 1,
-//!   and some other types are supported, including arrays and tuples. See the
-//!   [`Standard`] distribution which provides the implementations.
-//! - [`gen_range`] samples from a specific range of values; this is like
-//!   [`gen`] but with specific upper and lower bounds.
-//! - [`sample`] samples directly from some distribution.
-//!
-//! [`random()`] is defined using just the above: `thread_rng().gen()`.
-//!
-//! ## Distributions
-//!
-//! What are distributions, you ask? Specifying only the type and range of
-//! values (known as the *sample space*) is not enough; samples must also have
-//! a *probability distribution*, describing the relative probability of
-//! sampling each value in that space.
-//!
-//! In many cases a *uniform* distribution is used, meaning roughly that each
-//! value is equally likely (or for "continuous" types like floats, that each
-//! equal-sized sub-range has the same probability of containing a sample).
-//! [`gen`] and [`gen_range`] both use statistically uniform distributions.
-//!
-//! The [`distributions` module] provides implementations
-//! of some other distributions, including Normal, Log-Normal and Exponential.
-//! 
-//! It is worth noting that the functionality already mentioned is implemented
-//! with distributions: [`gen`] samples values using the [`Standard`]
-//! distribution, while [`gen_range`] uses [`Uniform`].
-//!
-//! ## Importing (prelude)
-//!
-//! The most convenient way to import items from Rand is to use the [prelude].
-//! This includes the most important parts of Rand, but only those unlikely to
-//! cause name conflicts.
-//!
-//! Note that Rand 0.5 has significantly changed the module organization and
-//! contents relative to previous versions. Where possible old names have been
-//! kept (but are hidden in the documentation), however these will be removed
-//! in the future. We therefore recommend migrating to use the prelude or the
-//! new module organization in your imports.
-//!
-//!
-//! ## Examples
-//!
-//! ```
-//! use rand::prelude::*;
-//!
-//! // thread_rng is often the most convenient source of randomness:
-//! let mut rng = thread_rng();
-//! 
-//! if rng.gen() { // random bool
-//!     let x: f64 = rng.gen(); // random number in range [0, 1)
-//!     println!("x is: {}", x);
-//!     let ch = rng.gen::<char>(); // using type annotation
-//!     println!("char is: {}", ch);
-//!     println!("Number from 0 to 9: {}", rng.gen_range(0, 10));
-//! }
-//! ```
-//!
-//!
-//! # More functionality
-//!
-//! The [`Rng`] trait includes a few more methods not mentioned above:
-//!
-//! - [`Rng::sample_iter`] allows iterating over values from a chosen
-//!   distribution.
-//! - [`Rng::gen_bool`] generates boolean "events" with a given probability.
-//! - [`Rng::fill`] and [`Rng::try_fill`] are fast alternatives to fill a slice
-//!   of integers.
-//! - [`Rng::shuffle`] randomly shuffles elements in a slice.
-//! - [`Rng::choose`] picks one element at random from a slice.
-//!
-//! For more slice/sequence related functionality, look in the [`seq` module].
-//!
-//! There is also [`distributions::WeightedChoice`], which can be used to pick
-//! elements at random with some probability. But it does not work well at the
-//! moment and is going through a redesign.
-//!
-//!
-//! # Error handling
-//!
-//! Error handling in Rand is a compromise between simplicity and necessity.
-//! Most RNGs and sampling functions will never produce errors, and making these
-//! able to handle errors would add significant overhead (to code complexity
-//! and ergonomics of usage at least, and potentially also performance,
-//! depending on the approach).
-//! However, external RNGs can fail, and being able to handle this is important.
-//!
-//! It has therefore been decided that *most* methods should not return a
-//! `Result` type, with as exceptions [`Rng::try_fill`],
-//! [`RngCore::try_fill_bytes`], and [`SeedableRng::from_rng`].
-//!
-//! Note that it is the RNG that panics when it fails but is not used through a
-//! method that can report errors. Currently Rand contains only three RNGs that
-//! can return an error (and thus may panic), and documents this property:
-//! [`OsRng`], [`EntropyRng`] and [`ReadRng`]. Other RNGs, like [`ThreadRng`]
-//! and [`StdRng`], can be used with all methods without concern.
-//!
-//! One further problem is that if Rand is unable to get any external randomness
-//! when initializing an RNG with [`EntropyRng`], it will panic in
-//! [`FromEntropy::from_entropy`], and notably in [`thread_rng()`]. Except by
-//! compromising security, this problem is as unsolvable as running out of
-//! memory.
-//!
-//!
-//! # Distinction between Rand and `rand_core`
-//!
-//! The [`rand_core`] crate provides the necessary traits and functionality for
-//! implementing RNGs; this includes the [`RngCore`] and [`SeedableRng`] traits
-//! and the [`Error`] type.
-//! Crates implementing RNGs should depend on [`rand_core`].
-//!
-//! Applications and libraries consuming random values are encouraged to use the
-//! Rand crate, which re-exports the common parts of [`rand_core`].
-//!
-//!
-//! # More examples
-//!
-//! For some inspiration, see the examples:
-//!
-//! - [Monte Carlo estimation of π](
-//!   https://github.com/rust-lang-nursery/rand/blob/master/examples/monte-carlo.rs)
-//! - [Monty Hall Problem](
-//!    https://github.com/rust-lang-nursery/rand/blob/master/examples/monty-hall.rs)
-//!
-//!
-//! [`distributions` module]: distributions/index.html
-//! [`distributions::WeightedChoice`]: distributions/struct.WeightedChoice.html
-//! [`FromEntropy::from_entropy`]: trait.FromEntropy.html#tymethod.from_entropy
-//! [`EntropyRng`]: rngs/struct.EntropyRng.html
-//! [`Error`]: struct.Error.html
-//! [`gen_range`]: trait.Rng.html#method.gen_range
-//! [`gen`]: trait.Rng.html#method.gen
-//! [`OsRng`]: rngs/struct.OsRng.html
-//! [prelude]: prelude/index.html
-//! [`rand_core`]: https://crates.io/crates/rand_core
-//! [`random()`]: fn.random.html
-//! [`ReadRng`]: rngs/adapter/struct.ReadRng.html
-//! [`Rng::choose`]: trait.Rng.html#method.choose
-//! [`Rng::fill`]: trait.Rng.html#method.fill
-//! [`Rng::gen_bool`]: trait.Rng.html#method.gen_bool
-//! [`Rng::gen`]: trait.Rng.html#method.gen
-//! [`Rng::sample_iter`]: trait.Rng.html#method.sample_iter
-//! [`Rng::shuffle`]: trait.Rng.html#method.shuffle
-//! [`RngCore`]: trait.RngCore.html
-//! [`RngCore::try_fill_bytes`]: trait.RngCore.html#method.try_fill_bytes
-//! [`rngs` module]: rngs/index.html
-//! [`prng` module]: prng/index.html
-//! [`Rng`]: trait.Rng.html
-//! [`Rng::try_fill`]: trait.Rng.html#method.try_fill
-//! [`sample`]: trait.Rng.html#method.sample
-//! [`SeedableRng`]: trait.SeedableRng.html
-//! [`SeedableRng::from_rng`]: trait.SeedableRng.html#method.from_rng
-//! [`seq` module]: seq/index.html
-//! [`SmallRng`]: rngs/struct.SmallRng.html
-//! [`StdRng`]: rngs/struct.StdRng.html
-//! [`thread_rng()`]: fn.thread_rng.html
-//! [`ThreadRng`]: rngs/struct.ThreadRng.html
-//! [`Standard`]: distributions/struct.Standard.html
-//! [`Uniform`]: distributions/struct.Uniform.html
-
-
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/rand/0.5.5")]
-
-#![deny(missing_docs)]
-#![deny(missing_debug_implementations)]
-#![doc(test(attr(allow(unused_variables), deny(warnings))))]
-
-#![cfg_attr(not(feature="std"), no_std)]
-#![cfg_attr(all(feature="alloc", not(feature="std")), feature(alloc))]
-#![cfg_attr(all(feature="i128_support", feature="nightly"), allow(stable_features))] // stable since 2018-03-27
-#![cfg_attr(all(feature="i128_support", feature="nightly"), feature(i128_type, i128))]
-#![cfg_attr(feature = "stdweb", recursion_limit="128")]
-
-#[cfg(feature="std")] extern crate std as core;
-#[cfg(all(feature = "alloc", not(feature="std")))] extern crate alloc;
-
-#[cfg(test)] #[cfg(feature="serde1")] extern crate bincode;
-#[cfg(feature="serde1")] extern crate serde;
-#[cfg(feature="serde1")] #[macro_use] extern crate serde_derive;
-
-#[cfg(all(target_arch="wasm32", not(target_os="emscripten"), feature="stdweb"))]
-#[macro_use]
-extern crate stdweb;
-
-extern crate rand_core;
-
-#[cfg(feature = "log")] #[macro_use] extern crate log;
-#[allow(unused)]
-#[cfg(not(feature = "log"))] macro_rules! trace { ($($x:tt)*) => () }
-#[allow(unused)]
-#[cfg(not(feature = "log"))] macro_rules! debug { ($($x:tt)*) => () }
-#[allow(unused)]
-#[cfg(not(feature = "log"))] macro_rules! info { ($($x:tt)*) => () }
-#[allow(unused)]
-#[cfg(not(feature = "log"))] macro_rules! warn { ($($x:tt)*) => () }
-#[allow(unused)]
-#[cfg(not(feature = "log"))] macro_rules! error { ($($x:tt)*) => () }
-
-
-// Re-exports from rand_core
-pub use rand_core::{RngCore, CryptoRng, SeedableRng};
-pub use rand_core::{ErrorKind, Error};
-
-// Public exports
-#[cfg(feature="std")] pub use rngs::thread::thread_rng;
-
-// Public modules
-pub mod distributions;
-pub mod prelude;
-pub mod prng;
-pub mod rngs;
-#[cfg(feature = "alloc")] pub mod seq;
-
-////////////////////////////////////////////////////////////////////////////////
-// Compatibility re-exports. Documentation is hidden; will be removed eventually.
-
-#[cfg(feature="std")] #[doc(hidden)] pub use rngs::adapter::read;
-#[doc(hidden)] pub use rngs::adapter::ReseedingRng;
-
-#[allow(deprecated)]
-#[cfg(feature="std")] #[doc(hidden)] pub use rngs::EntropyRng;
-
-#[allow(deprecated)]
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb")
-)))]
-#[doc(hidden)]
-pub use rngs::OsRng;
-
-#[doc(hidden)] pub use prng::{ChaChaRng, IsaacRng, Isaac64Rng, XorShiftRng};
-#[doc(hidden)] pub use rngs::StdRng;
-
-
-#[allow(deprecated)]
-#[doc(hidden)]
-pub mod jitter {
-    pub use rngs::{JitterRng, TimerError};
-}
-#[allow(deprecated)]
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb")
-)))]
-#[doc(hidden)]
-pub mod os {
-    pub use rngs::OsRng;
-}
-#[allow(deprecated)]
-#[doc(hidden)]
-pub mod chacha {
-    //! The ChaCha random number generator.
-    pub use prng::ChaChaRng;
-}
-#[doc(hidden)]
-pub mod isaac {
-    //! The ISAAC random number generator.
-    pub use prng::{IsaacRng, Isaac64Rng};
-}
-
-#[cfg(feature="std")] #[doc(hidden)] pub use rngs::ThreadRng;
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-use core::{marker, mem, slice};
-use distributions::{Distribution, Standard};
-use distributions::uniform::{SampleUniform, UniformSampler};
-
-
-/// A type that can be randomly generated using an [`Rng`].
-/// 
-/// This is merely an adapter around the [`Standard`] distribution for
-/// convenience and backwards-compatibility.
-/// 
-/// [`Rng`]: trait.Rng.html
-/// [`Standard`]: distributions/struct.Standard.html
-#[deprecated(since="0.5.0", note="replaced by distributions::Standard")]
-pub trait Rand : Sized {
-    /// Generates a random instance of this type using the specified source of
-    /// randomness.
-    fn rand<R: Rng>(rng: &mut R) -> Self;
-}
-
-/// An automatically-implemented extension trait on [`RngCore`] providing high-level
-/// generic methods for sampling values and other convenience methods.
-/// 
-/// This is the primary trait to use when generating random values.
-/// 
-/// # Generic usage
-/// 
-/// The basic pattern is `fn foo<R: Rng + ?Sized>(rng: &mut R)`. Some
-/// things are worth noting here:
-/// 
-/// - Since `Rng: RngCore` and every `RngCore` implements `Rng`, it makes no
-///   difference whether we use `R: Rng` or `R: RngCore`.
-/// - The `+ ?Sized` un-bounding allows functions to be called directly on
-///   type-erased references; i.e. `foo(r)` where `r: &mut RngCore`. Without
-///   this it would be necessary to write `foo(&mut r)`.
-/// 
-/// An alternative pattern is possible: `fn foo<R: Rng>(rng: R)`. This has some
-/// trade-offs. It allows the argument to be consumed directly without a `&mut`
-/// (which is how `from_rng(thread_rng())` works); also it still works directly
-/// on references (including type-erased references). Unfortunately within the
-/// function `foo` it is not known whether `rng` is a reference type or not,
-/// hence many uses of `rng` require an extra reference, either explicitly
-/// (`distr.sample(&mut rng)`) or implicitly (`rng.gen()`); one may hope the
-/// optimiser can remove redundant references later.
-/// 
-/// Example:
-/// 
-/// ```
-/// # use rand::thread_rng;
-/// use rand::Rng;
-/// 
-/// fn foo<R: Rng + ?Sized>(rng: &mut R) -> f32 {
-///     rng.gen()
-/// }
-///
-/// # let v = foo(&mut thread_rng());
-/// ```
-/// 
-/// [`RngCore`]: trait.RngCore.html
-pub trait Rng: RngCore {
-    /// Return a random value supporting the [`Standard`] distribution.
-    ///
-    /// [`Standard`]: distributions/struct.Standard.html
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let x: u32 = rng.gen();
-    /// println!("{}", x);
-    /// println!("{:?}", rng.gen::<(f64, bool)>());
-    /// ```
-    #[inline]
-    fn gen<T>(&mut self) -> T where Standard: Distribution<T> {
-        Standard.sample(self)
-    }
-
-    /// Generate a random value in the range [`low`, `high`), i.e. inclusive of
-    /// `low` and exclusive of `high`.
-    ///
-    /// This function is optimised for the case that only a single sample is
-    /// made from the given range. See also the [`Uniform`] distribution
-    /// type which may be faster if sampling from the same range repeatedly.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `low >= high`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let n: u32 = rng.gen_range(0, 10);
-    /// println!("{}", n);
-    /// let m: f64 = rng.gen_range(-40.0f64, 1.3e5f64);
-    /// println!("{}", m);
-    /// ```
-    ///
-    /// [`Uniform`]: distributions/uniform/struct.Uniform.html
-    fn gen_range<T: PartialOrd + SampleUniform>(&mut self, low: T, high: T) -> T {
-        T::Sampler::sample_single(low, high, self)
-    }
-
-    /// Sample a new value, using the given distribution.
-    ///
-    /// ### Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    /// use rand::distributions::Uniform;
-    ///
-    /// let mut rng = thread_rng();
-    /// let x = rng.sample(Uniform::new(10u32, 15));
-    /// // Type annotation requires two types, the type and distribution; the
-    /// // distribution can be inferred.
-    /// let y = rng.sample::<u16, _>(Uniform::new(10, 15));
-    /// ```
-    fn sample<T, D: Distribution<T>>(&mut self, distr: D) -> T {
-        distr.sample(self)
-    }
-
-    /// Create an iterator that generates values using the given distribution.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    /// use rand::distributions::{Alphanumeric, Uniform, Standard};
-    ///
-    /// let mut rng = thread_rng();
-    ///
-    /// // Vec of 16 x f32:
-    /// let v: Vec<f32> = thread_rng().sample_iter(&Standard).take(16).collect();
-    ///
-    /// // String:
-    /// let s: String = rng.sample_iter(&Alphanumeric).take(7).collect();
-    ///
-    /// // Combined values
-    /// println!("{:?}", thread_rng().sample_iter(&Standard).take(5)
-    ///                              .collect::<Vec<(f64, bool)>>());
-    ///
-    /// // Dice-rolling:
-    /// let die_range = Uniform::new_inclusive(1, 6);
-    /// let mut roll_die = rng.sample_iter(&die_range);
-    /// while roll_die.next().unwrap() != 6 {
-    ///     println!("Not a 6; rolling again!");
-    /// }
-    /// ```
-    fn sample_iter<'a, T, D: Distribution<T>>(&'a mut self, distr: &'a D)
-        -> distributions::DistIter<'a, D, Self, T> where Self: Sized
-    {
-        distr.sample_iter(self)
-    }
-
-    /// Fill `dest` entirely with random bytes (uniform value distribution),
-    /// where `dest` is any type supporting [`AsByteSliceMut`], namely slices
-    /// and arrays over primitive integer types (`i8`, `i16`, `u32`, etc.).
-    ///
-    /// On big-endian platforms this performs byte-swapping to ensure
-    /// portability of results from reproducible generators.
-    ///
-    /// This uses [`fill_bytes`] internally which may handle some RNG errors
-    /// implicitly (e.g. waiting if the OS generator is not ready), but panics
-    /// on other errors. See also [`try_fill`] which returns errors.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut arr = [0i8; 20];
-    /// thread_rng().fill(&mut arr[..]);
-    /// ```
-    ///
-    /// [`fill_bytes`]: trait.RngCore.html#method.fill_bytes
-    /// [`try_fill`]: trait.Rng.html#method.try_fill
-    /// [`AsByteSliceMut`]: trait.AsByteSliceMut.html
-    fn fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) {
-        self.fill_bytes(dest.as_byte_slice_mut());
-        dest.to_le();
-    }
-
-    /// Fill `dest` entirely with random bytes (uniform value distribution),
-    /// where `dest` is any type supporting [`AsByteSliceMut`], namely slices
-    /// and arrays over primitive integer types (`i8`, `i16`, `u32`, etc.).
-    ///
-    /// On big-endian platforms this performs byte-swapping to ensure
-    /// portability of results from reproducible generators.
-    ///
-    /// This uses [`try_fill_bytes`] internally and forwards all RNG errors. In
-    /// some cases errors may be resolvable; see [`ErrorKind`] and
-    /// documentation for the RNG in use. If you do not plan to handle these
-    /// errors you may prefer to use [`fill`].
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # use rand::Error;
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// # fn try_inner() -> Result<(), Error> {
-    /// let mut arr = [0u64; 4];
-    /// thread_rng().try_fill(&mut arr[..])?;
-    /// # Ok(())
-    /// # }
-    ///
-    /// # try_inner().unwrap()
-    /// ```
-    ///
-    /// [`ErrorKind`]: enum.ErrorKind.html
-    /// [`try_fill_bytes`]: trait.RngCore.html#method.try_fill_bytes
-    /// [`fill`]: trait.Rng.html#method.fill
-    /// [`AsByteSliceMut`]: trait.AsByteSliceMut.html
-    fn try_fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) -> Result<(), Error> {
-        self.try_fill_bytes(dest.as_byte_slice_mut())?;
-        dest.to_le();
-        Ok(())
-    }
-
-    /// Return a bool with a probability `p` of being true.
-    ///
-    /// This is a wrapper around [`distributions::Bernoulli`].
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// println!("{}", rng.gen_bool(1.0 / 3.0));
-    /// ```
-    ///
-    /// # Panics
-    ///
-    /// If `p` < 0 or `p` > 1.
-    ///
-    /// [`distributions::Bernoulli`]: distributions/bernoulli/struct.Bernoulli.html
-    #[inline]
-    fn gen_bool(&mut self, p: f64) -> bool {
-        let d = distributions::Bernoulli::new(p);
-        self.sample(d)
-    }
-
-    /// Return a random element from `values`.
-    ///
-    /// Return `None` if `values` is empty.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let choices = [1, 2, 4, 8, 16, 32];
-    /// let mut rng = thread_rng();
-    /// println!("{:?}", rng.choose(&choices));
-    /// assert_eq!(rng.choose(&choices[..0]), None);
-    /// ```
-    fn choose<'a, T>(&mut self, values: &'a [T]) -> Option<&'a T> {
-        if values.is_empty() {
-            None
-        } else {
-            Some(&values[self.gen_range(0, values.len())])
-        }
-    }
-
-    /// Return a mutable pointer to a random element from `values`.
-    ///
-    /// Return `None` if `values` is empty.
-    fn choose_mut<'a, T>(&mut self, values: &'a mut [T]) -> Option<&'a mut T> {
-        if values.is_empty() {
-            None
-        } else {
-            let len = values.len();
-            Some(&mut values[self.gen_range(0, len)])
-        }
-    }
-
-    /// Shuffle a mutable slice in place.
-    ///
-    /// This applies Durstenfeld's algorithm for the [Fisher–Yates shuffle](
-    /// https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm)
-    /// which produces an unbiased permutation.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let mut y = [1, 2, 3];
-    /// rng.shuffle(&mut y);
-    /// println!("{:?}", y);
-    /// rng.shuffle(&mut y);
-    /// println!("{:?}", y);
-    /// ```
-    fn shuffle<T>(&mut self, values: &mut [T]) {
-        let mut i = values.len();
-        while i >= 2 {
-            // invariant: elements with index >= i have been locked in place.
-            i -= 1;
-            // lock element i in place.
-            values.swap(i, self.gen_range(0, i + 1));
-        }
-    }
-
-    /// Return an iterator that will yield an infinite number of randomly
-    /// generated items.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #![allow(deprecated)]
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// let x = rng.gen_iter::<u32>().take(10).collect::<Vec<u32>>();
-    /// println!("{:?}", x);
-    /// println!("{:?}", rng.gen_iter::<(f64, bool)>().take(5)
-    ///                     .collect::<Vec<(f64, bool)>>());
-    /// ```
-    #[allow(deprecated)]
-    #[deprecated(since="0.5.0", note="use Rng::sample_iter(&Standard) instead")]
-    fn gen_iter<T>(&mut self) -> Generator<T, &mut Self> where Standard: Distribution<T> {
-        Generator { rng: self, _marker: marker::PhantomData }
-    }
-
-    /// Return a bool with a 1 in n chance of true
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #![allow(deprecated)]
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let mut rng = thread_rng();
-    /// assert_eq!(rng.gen_weighted_bool(0), true);
-    /// assert_eq!(rng.gen_weighted_bool(1), true);
-    /// // Just like `rng.gen::<bool>()` a 50-50% chance, but using a slower
-    /// // method with different results.
-    /// println!("{}", rng.gen_weighted_bool(2));
-    /// // First meaningful use of `gen_weighted_bool`.
-    /// println!("{}", rng.gen_weighted_bool(3));
-    /// ```
-    #[deprecated(since="0.5.0", note="use gen_bool instead")]
-    fn gen_weighted_bool(&mut self, n: u32) -> bool {
-        // Short-circuit after `n <= 1` to avoid panic in `gen_range`
-        n <= 1 || self.gen_range(0, n) == 0
-    }
-
-    /// Return an iterator of random characters from the set A-Z,a-z,0-9.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # #![allow(deprecated)]
-    /// use rand::{thread_rng, Rng};
-    ///
-    /// let s: String = thread_rng().gen_ascii_chars().take(10).collect();
-    /// println!("{}", s);
-    /// ```
-    #[allow(deprecated)]
-    #[deprecated(since="0.5.0", note="use sample_iter(&Alphanumeric) instead")]
-    fn gen_ascii_chars(&mut self) -> AsciiGenerator<&mut Self> {
-        AsciiGenerator { rng: self }
-    }
-}
-
-impl<R: RngCore + ?Sized> Rng for R {}
-
-/// Trait for casting types to byte slices
-/// 
-/// This is used by the [`fill`] and [`try_fill`] methods.
-/// 
-/// [`fill`]: trait.Rng.html#method.fill
-/// [`try_fill`]: trait.Rng.html#method.try_fill
-pub trait AsByteSliceMut {
-    /// Return a mutable reference to self as a byte slice
-    fn as_byte_slice_mut(&mut self) -> &mut [u8];
-    
-    /// Call `to_le` on each element (i.e. byte-swap on Big Endian platforms).
-    fn to_le(&mut self);
-}
-
-impl AsByteSliceMut for [u8] {
-    fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-        self
-    }
-    
-    fn to_le(&mut self) {}
-}
-
-macro_rules! impl_as_byte_slice {
-    ($t:ty) => {
-        impl AsByteSliceMut for [$t] {
-            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-                if self.len() == 0 {
-                    unsafe {
-                        // must not use null pointer
-                        slice::from_raw_parts_mut(0x1 as *mut u8, 0)
-                    }
-                } else {
-                    unsafe {
-                        slice::from_raw_parts_mut(&mut self[0]
-                            as *mut $t
-                            as *mut u8,
-                            self.len() * mem::size_of::<$t>()
-                        )
-                    }
-                }
-            }
-            
-            fn to_le(&mut self) {
-                for x in self {
-                    *x = x.to_le();
-                }
-            }
-        }
-    }
-}
-
-impl_as_byte_slice!(u16);
-impl_as_byte_slice!(u32);
-impl_as_byte_slice!(u64);
-#[cfg(feature="i128_support")] impl_as_byte_slice!(u128);
-impl_as_byte_slice!(usize);
-impl_as_byte_slice!(i8);
-impl_as_byte_slice!(i16);
-impl_as_byte_slice!(i32);
-impl_as_byte_slice!(i64);
-#[cfg(feature="i128_support")] impl_as_byte_slice!(i128);
-impl_as_byte_slice!(isize);
-
-macro_rules! impl_as_byte_slice_arrays {
-    ($n:expr,) => {};
-    ($n:expr, $N:ident, $($NN:ident,)*) => {
-        impl_as_byte_slice_arrays!($n - 1, $($NN,)*);
-        
-        impl<T> AsByteSliceMut for [T; $n] where [T]: AsByteSliceMut {
-            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-                self[..].as_byte_slice_mut()
-            }
-
-            fn to_le(&mut self) {
-                self[..].to_le()
-            }
-        }
-    };
-    (!div $n:expr,) => {};
-    (!div $n:expr, $N:ident, $($NN:ident,)*) => {
-        impl_as_byte_slice_arrays!(!div $n / 2, $($NN,)*);
-
-        impl<T> AsByteSliceMut for [T; $n] where [T]: AsByteSliceMut {
-            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
-                self[..].as_byte_slice_mut()
-            }
-            
-            fn to_le(&mut self) {
-                self[..].to_le()
-            }
-        }
-    };
-}
-impl_as_byte_slice_arrays!(32, N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,);
-impl_as_byte_slice_arrays!(!div 4096, N,N,N,N,N,N,N,);
-
-/// Iterator which will generate a stream of random items.
-///
-/// This iterator is created via the [`gen_iter`] method on [`Rng`].
-///
-/// [`gen_iter`]: trait.Rng.html#method.gen_iter
-/// [`Rng`]: trait.Rng.html
-#[derive(Debug)]
-#[allow(deprecated)]
-#[deprecated(since="0.5.0", note="use Rng::sample_iter instead")]
-pub struct Generator<T, R: RngCore> {
-    rng: R,
-    _marker: marker::PhantomData<fn() -> T>,
-}
-
-#[allow(deprecated)]
-impl<T, R: RngCore> Iterator for Generator<T, R> where Standard: Distribution<T> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<T> {
-        Some(self.rng.gen())
-    }
-}
-
-/// Iterator which will continuously generate random ascii characters.
-///
-/// This iterator is created via the [`gen_ascii_chars`] method on [`Rng`].
-///
-/// [`gen_ascii_chars`]: trait.Rng.html#method.gen_ascii_chars
-/// [`Rng`]: trait.Rng.html
-#[derive(Debug)]
-#[allow(deprecated)]
-#[deprecated(since="0.5.0", note="use distributions::Alphanumeric instead")]
-pub struct AsciiGenerator<R: RngCore> {
-    rng: R,
-}
-
-#[allow(deprecated)]
-impl<R: RngCore> Iterator for AsciiGenerator<R> {
-    type Item = char;
-
-    fn next(&mut self) -> Option<char> {
-        const GEN_ASCII_STR_CHARSET: &[u8] =
-            b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
-              abcdefghijklmnopqrstuvwxyz\
-              0123456789";
-        Some(*self.rng.choose(GEN_ASCII_STR_CHARSET).unwrap() as char)
-    }
-}
-
-
-/// A convenience extension to [`SeedableRng`] allowing construction from fresh
-/// entropy. This trait is automatically implemented for any PRNG implementing
-/// [`SeedableRng`] and is not intended to be implemented by users.
-///
-/// This is equivalent to using `SeedableRng::from_rng(EntropyRng::new())` then
-/// unwrapping the result.
-///
-/// Since this is convenient and secure, it is the recommended way to create
-/// PRNGs, though two alternatives may be considered:
-///
-/// *   Deterministic creation using [`SeedableRng::from_seed`] with a fixed seed
-/// *   Seeding from `thread_rng`: `SeedableRng::from_rng(thread_rng())?`;
-///     this will usually be faster and should also be secure, but requires
-///     trusting one extra component.
-///
-/// ## Example
-///
-/// ```
-/// use rand::{Rng, FromEntropy};
-/// use rand::rngs::StdRng;
-///
-/// let mut rng = StdRng::from_entropy();
-/// println!("Random die roll: {}", rng.gen_range(1, 7));
-/// ```
-///
-/// [`EntropyRng`]: rngs/struct.EntropyRng.html
-/// [`SeedableRng`]: trait.SeedableRng.html
-/// [`SeedableRng::from_seed`]: trait.SeedableRng.html#tymethod.from_seed
-#[cfg(feature="std")]
-pub trait FromEntropy: SeedableRng {
-    /// Creates a new instance, automatically seeded with fresh entropy.
-    ///
-    /// Normally this will use `OsRng`, but if that fails `JitterRng` will be
-    /// used instead. Both should be suitable for cryptography. It is possible
-    /// that both entropy sources will fail though unlikely; failures would
-    /// almost certainly be platform limitations or build issues, i.e. most
-    /// applications targetting PC/mobile platforms should not need to worry
-    /// about this failing.
-    ///
-    /// # Panics
-    ///
-    /// If all entropy sources fail this will panic. If you need to handle
-    /// errors, use the following code, equivalent aside from error handling:
-    ///
-    /// ```
-    /// # use rand::Error;
-    /// use rand::prelude::*;
-    /// use rand::rngs::EntropyRng;
-    ///
-    /// # fn try_inner() -> Result<(), Error> {
-    /// // This uses StdRng, but is valid for any R: SeedableRng
-    /// let mut rng = StdRng::from_rng(EntropyRng::new())?;
-    ///
-    /// println!("random number: {}", rng.gen_range(1, 10));
-    /// # Ok(())
-    /// # }
-    ///
-    /// # try_inner().unwrap()
-    /// ```
-    fn from_entropy() -> Self;
-}
-
-#[cfg(feature="std")]
-impl<R: SeedableRng> FromEntropy for R {
-    fn from_entropy() -> R {
-        R::from_rng(EntropyRng::new()).unwrap_or_else(|err|
-            panic!("FromEntropy::from_entropy() failed: {}", err))
-    }
-}
-
-
-/// DEPRECATED: use [`SmallRng`] instead.
-///
-/// Create a weak random number generator with a default algorithm and seed.
-///
-/// It returns the fastest `Rng` algorithm currently available in Rust without
-/// consideration for cryptography or security. If you require a specifically
-/// seeded `Rng` for consistency over time you should pick one algorithm and
-/// create the `Rng` yourself.
-///
-/// This will seed the generator with randomness from `thread_rng`.
-///
-/// [`SmallRng`]: rngs/struct.SmallRng.html
-#[deprecated(since="0.5.0", note="removed in favor of SmallRng")]
-#[cfg(feature="std")]
-pub fn weak_rng() -> XorShiftRng {
-    XorShiftRng::from_rng(thread_rng()).unwrap_or_else(|err|
-        panic!("weak_rng failed: {:?}", err))
-}
-
-/// Generates a random value using the thread-local random number generator.
-///
-/// This is simply a shortcut for `thread_rng().gen()`. See [`thread_rng`] for
-/// documentation of the entropy source and [`Standard`] for documentation of
-/// distributions and type-specific generation.
-///
-/// # Examples
-///
-/// ```
-/// let x = rand::random::<u8>();
-/// println!("{}", x);
-///
-/// let y = rand::random::<f64>();
-/// println!("{}", y);
-///
-/// if rand::random() { // generates a boolean
-///     println!("Better lucky than good!");
-/// }
-/// ```
-///
-/// If you're calling `random()` in a loop, caching the generator as in the
-/// following example can increase performance.
-///
-/// ```
-/// # #![allow(deprecated)]
-/// use rand::Rng;
-///
-/// let mut v = vec![1, 2, 3];
-///
-/// for x in v.iter_mut() {
-///     *x = rand::random()
-/// }
-///
-/// // can be made faster by caching thread_rng
-///
-/// let mut rng = rand::thread_rng();
-///
-/// for x in v.iter_mut() {
-///     *x = rng.gen();
-/// }
-/// ```
-///
-/// [`thread_rng`]: fn.thread_rng.html
-/// [`Standard`]: distributions/struct.Standard.html
-#[cfg(feature="std")]
-#[inline]
-pub fn random<T>() -> T where Standard: Distribution<T> {
-    thread_rng().gen()
-}
-
-/// DEPRECATED: use `seq::sample_iter` instead.
-///
-/// Randomly sample up to `amount` elements from a finite iterator.
-/// The order of elements in the sample is not random.
-///
-/// # Example
-///
-/// ```
-/// # #![allow(deprecated)]
-/// use rand::{thread_rng, sample};
-///
-/// let mut rng = thread_rng();
-/// let sample = sample(&mut rng, 1..100, 5);
-/// println!("{:?}", sample);
-/// ```
-#[cfg(feature="std")]
-#[inline]
-#[deprecated(since="0.4.0", note="renamed to seq::sample_iter")]
-pub fn sample<T, I, R>(rng: &mut R, iterable: I, amount: usize) -> Vec<T>
-    where I: IntoIterator<Item=T>,
-          R: Rng,
-{
-    // the legacy sample didn't care whether amount was met
-    seq::sample_iter(rng, iterable, amount)
-        .unwrap_or_else(|e| e)
-}
-
-#[cfg(test)]
-mod test {
-    use rngs::mock::StepRng;
-    use super::*;
-    #[cfg(all(not(feature="std"), feature="alloc"))] use alloc::boxed::Box;
-
-    pub struct TestRng<R> { inner: R }
-
-    impl<R: RngCore> RngCore for TestRng<R> {
-        fn next_u32(&mut self) -> u32 {
-            self.inner.next_u32()
-        }
-        fn next_u64(&mut self) -> u64 {
-            self.inner.next_u64()
-        }
-        fn fill_bytes(&mut self, dest: &mut [u8]) {
-            self.inner.fill_bytes(dest)
-        }
-        fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            self.inner.try_fill_bytes(dest)
-        }
-    }
-
-    pub fn rng(seed: u64) -> TestRng<StdRng> {
-        // TODO: use from_hashable
-        let mut state = seed;
-        let mut seed = <StdRng as SeedableRng>::Seed::default();
-        for x in seed.iter_mut() {
-            // PCG algorithm
-            const MUL: u64 = 6364136223846793005;
-            const INC: u64 = 11634580027462260723;
-            let oldstate = state;
-            state = oldstate.wrapping_mul(MUL).wrapping_add(INC);
-
-            let xorshifted = (((oldstate >> 18) ^ oldstate) >> 27) as u32;
-            let rot = (oldstate >> 59) as u32;
-            *x = xorshifted.rotate_right(rot) as u8;
-        }
-        TestRng { inner: StdRng::from_seed(seed) }
-    }
-
-    #[test]
-    fn test_fill_bytes_default() {
-        let mut r = StepRng::new(0x11_22_33_44_55_66_77_88, 0);
-
-        // check every remainder mod 8, both in small and big vectors.
-        let lengths = [0, 1, 2, 3, 4, 5, 6, 7,
-                       80, 81, 82, 83, 84, 85, 86, 87];
-        for &n in lengths.iter() {
-            let mut buffer = [0u8; 87];
-            let v = &mut buffer[0..n];
-            r.fill_bytes(v);
-
-            // use this to get nicer error messages.
-            for (i, &byte) in v.iter().enumerate() {
-                if byte == 0 {
-                    panic!("byte {} of {} is zero", i, n)
-                }
-            }
-        }
-    }
-    
-    #[test]
-    fn test_fill() {
-        let x = 9041086907909331047;    // a random u64
-        let mut rng = StepRng::new(x, 0);
-        
-        // Convert to byte sequence and back to u64; byte-swap twice if BE.
-        let mut array = [0u64; 2];
-        rng.fill(&mut array[..]);
-        assert_eq!(array, [x, x]);
-        assert_eq!(rng.next_u64(), x);
-        
-        // Convert to bytes then u32 in LE order
-        let mut array = [0u32; 2];
-        rng.fill(&mut array[..]);
-        assert_eq!(array, [x as u32, (x >> 32) as u32]);
-        assert_eq!(rng.next_u32(), x as u32);
-    }
-    
-    #[test]
-    fn test_fill_empty() {
-        let mut array = [0u32; 0];
-        let mut rng = StepRng::new(0, 1);
-        rng.fill(&mut array);
-        rng.fill(&mut array[..]);
-    }
-
-    #[test]
-    fn test_gen_range() {
-        let mut r = rng(101);
-        for _ in 0..1000 {
-            let a = r.gen_range(-3, 42);
-            assert!(a >= -3 && a < 42);
-            assert_eq!(r.gen_range(0, 1), 0);
-            assert_eq!(r.gen_range(-12, -11), -12);
-        }
-
-        for _ in 0..1000 {
-            let a = r.gen_range(10, 42);
-            assert!(a >= 10 && a < 42);
-            assert_eq!(r.gen_range(0, 1), 0);
-            assert_eq!(r.gen_range(3_000_000, 3_000_001), 3_000_000);
-        }
-
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_gen_range_panic_int() {
-        let mut r = rng(102);
-        r.gen_range(5, -2);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_gen_range_panic_usize() {
-        let mut r = rng(103);
-        r.gen_range(5, 2);
-    }
-
-    #[test]
-    #[allow(deprecated)]
-    fn test_gen_weighted_bool() {
-        let mut r = rng(104);
-        assert_eq!(r.gen_weighted_bool(0), true);
-        assert_eq!(r.gen_weighted_bool(1), true);
-    }
-
-    #[test]
-    fn test_gen_bool() {
-        let mut r = rng(105);
-        for _ in 0..5 {
-            assert_eq!(r.gen_bool(0.0), false);
-            assert_eq!(r.gen_bool(1.0), true);
-        }
-    }
-
-    #[test]
-    fn test_choose() {
-        let mut r = rng(107);
-        assert_eq!(r.choose(&[1, 1, 1]).map(|&x|x), Some(1));
-
-        let v: &[isize] = &[];
-        assert_eq!(r.choose(v), None);
-    }
-
-    #[test]
-    fn test_shuffle() {
-        let mut r = rng(108);
-        let empty: &mut [isize] = &mut [];
-        r.shuffle(empty);
-        let mut one = [1];
-        r.shuffle(&mut one);
-        let b: &[_] = &[1];
-        assert_eq!(one, b);
-
-        let mut two = [1, 2];
-        r.shuffle(&mut two);
-        assert!(two == [1, 2] || two == [2, 1]);
-
-        let mut x = [1, 1, 1];
-        r.shuffle(&mut x);
-        let b: &[_] = &[1, 1, 1];
-        assert_eq!(x, b);
-    }
-
-    #[test]
-    fn test_rng_trait_object() {
-        use distributions::{Distribution, Standard};
-        let mut rng = rng(109);
-        let mut r = &mut rng as &mut RngCore;
-        r.next_u32();
-        r.gen::<i32>();
-        let mut v = [1, 1, 1];
-        r.shuffle(&mut v);
-        let b: &[_] = &[1, 1, 1];
-        assert_eq!(v, b);
-        assert_eq!(r.gen_range(0, 1), 0);
-        let _c: u8 = Standard.sample(&mut r);
-    }
-
-    #[test]
-    #[cfg(feature="alloc")]
-    fn test_rng_boxed_trait() {
-        use distributions::{Distribution, Standard};
-        let rng = rng(110);
-        let mut r = Box::new(rng) as Box<RngCore>;
-        r.next_u32();
-        r.gen::<i32>();
-        let mut v = [1, 1, 1];
-        r.shuffle(&mut v);
-        let b: &[_] = &[1, 1, 1];
-        assert_eq!(v, b);
-        assert_eq!(r.gen_range(0, 1), 0);
-        let _c: u8 = Standard.sample(&mut r);
-    }
-    
-    #[test]
-    #[cfg(feature="std")]
-    fn test_random() {
-        // not sure how to test this aside from just getting some values
-        let _n : usize = random();
-        let _f : f32 = random();
-        let _o : Option<Option<i8>> = random();
-        let _many : ((),
-                     (usize,
-                      isize,
-                      Option<(u32, (bool,))>),
-                     (u8, i8, u16, i16, u32, i32, u64, i64),
-                     (f32, (f64, (f64,)))) = random();
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prelude.rs cargo-0.33.0/vendor/rand-0.5.5/src/prelude.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prelude.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prelude.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Convenience re-export of common members
-//!
-//! Like the standard library's prelude, this module simplifies importing of
-//! common items. Unlike the standard prelude, the contents of this module must
-//! be imported manually:
-//!
-//! ```
-//! use rand::prelude::*;
-//! # let _ = StdRng::from_entropy();
-//! # let mut r = SmallRng::from_rng(thread_rng()).unwrap();
-//! # let _: f32 = r.gen();
-//! ```
-
-#[doc(no_inline)] pub use distributions::Distribution;
-#[doc(no_inline)] pub use rngs::{SmallRng, StdRng};
-#[doc(no_inline)] #[cfg(feature="std")] pub use rngs::ThreadRng;
-#[doc(no_inline)] pub use {Rng, RngCore, CryptoRng, SeedableRng};
-#[doc(no_inline)] #[cfg(feature="std")] pub use {FromEntropy, random, thread_rng};
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/chacha.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/chacha.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/chacha.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/chacha.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,477 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://www.rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The ChaCha random number generator.
-
-use core::fmt;
-use rand_core::{CryptoRng, RngCore, SeedableRng, Error, le};
-use rand_core::block::{BlockRngCore, BlockRng};
-
-const SEED_WORDS: usize = 8; // 8 words for the 256-bit key
-const STATE_WORDS: usize = 16;
-
-/// A cryptographically secure random number generator that uses the ChaCha
-/// algorithm.
-///
-/// ChaCha is a stream cipher designed by Daniel J. Bernstein [^1], that we use
-/// as an RNG. It is an improved variant of the Salsa20 cipher family, which was
-/// selected as one of the "stream ciphers suitable for widespread adoption" by
-/// eSTREAM [^2].
-///
-/// ChaCha uses add-rotate-xor (ARX) operations as its basis. These are safe
-/// against timing attacks, although that is mostly a concern for ciphers and
-/// not for RNGs. Also it is very suitable for SIMD implementation.
-/// Here we do not provide a SIMD implementation yet, except for what is
-/// provided by auto-vectorisation.
-///
-/// With the ChaCha algorithm it is possible to choose the number of rounds the
-/// core algorithm should run. The number of rounds is a tradeoff between
-/// performance and security, where 8 rounds is the minimum potentially
-/// secure configuration, and 20 rounds is widely used as a conservative choice.
-/// We use 20 rounds in this implementation, but hope to allow type-level
-/// configuration in the future.
-///
-/// We use a 64-bit counter and 64-bit stream identifier as in Benstein's
-/// implementation [^1] except that we use a stream identifier in place of a
-/// nonce. A 64-bit counter over 64-byte (16 word) blocks allows 1 ZiB of output
-/// before cycling, and the stream identifier allows 2<sup>64</sup> unique
-/// streams of output per seed. Both counter and stream are initialized to zero
-/// but may be set via [`set_word_pos`] and [`set_stream`].
-///
-/// The word layout is:
-///
-/// ```text
-/// constant constant constant constant
-/// seed     seed     seed     seed
-/// seed     seed     seed     seed
-/// counter  counter  nonce    nonce
-/// ```
-///
-/// This implementation uses an output buffer of sixteen `u32` words, and uses
-/// [`BlockRng`] to implement the [`RngCore`] methods.
-///
-/// [^1]: D. J. Bernstein, [*ChaCha, a variant of Salsa20*](
-///       https://cr.yp.to/chacha.html)
-///
-/// [^2]: [eSTREAM: the ECRYPT Stream Cipher Project](
-///       http://www.ecrypt.eu.org/stream/)
-///
-/// [`set_word_pos`]: #method.set_word_pos
-/// [`set_stream`]: #method.set_stream
-/// [`BlockRng`]: ../../../rand_core/block/struct.BlockRng.html
-/// [`RngCore`]: ../../trait.RngCore.html
-#[derive(Clone, Debug)]
-pub struct ChaChaRng(BlockRng<ChaChaCore>);
-
-impl RngCore for ChaChaRng {
-    #[inline]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    #[inline]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest)
-    }
-
-    #[inline]
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl SeedableRng for ChaChaRng {
-    type Seed = <ChaChaCore as SeedableRng>::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        ChaChaRng(BlockRng::<ChaChaCore>::from_seed(seed))
-    }
-
-    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
-        BlockRng::<ChaChaCore>::from_rng(rng).map(ChaChaRng)
-    }
-}
-
-impl CryptoRng for ChaChaRng {}
-
-impl ChaChaRng {
-    /// Create an ChaCha random number generator using the default
-    /// fixed key of 8 zero words.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #![allow(deprecated)]
-    /// use rand::{RngCore, ChaChaRng};
-    ///
-    /// let mut ra = ChaChaRng::new_unseeded();
-    /// println!("{:?}", ra.next_u32());
-    /// println!("{:?}", ra.next_u32());
-    /// ```
-    ///
-    /// Since this equivalent to a RNG with a fixed seed, repeated executions
-    /// of an unseeded RNG will produce the same result. This code sample will
-    /// consistently produce:
-    ///
-    /// - 2917185654
-    /// - 2419978656
-    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
-    pub fn new_unseeded() -> ChaChaRng {
-        ChaChaRng::from_seed([0; SEED_WORDS*4])
-    }
-
-    /// Get the offset from the start of the stream, in 32-bit words.
-    /// 
-    /// Since the generated blocks are 16 words (2<sup>4</sup>) long and the
-    /// counter is 64-bits, the offset is a 68-bit number. Sub-word offsets are
-    /// not supported, hence the result can simply be multiplied by 4 to get a
-    /// byte-offset.
-    /// 
-    /// Note: this function is currently only available when the `i128_support`
-    /// feature is enabled. In the future this will be enabled by default.
-    #[cfg(feature = "i128_support")]
-    pub fn get_word_pos(&self) -> u128 {
-        let mut c = (self.0.core.state[13] as u64) << 32
-                  | (self.0.core.state[12] as u64);
-        let mut index = self.0.index();
-        // c is the end of the last block generated, unless index is at end
-        if index >= STATE_WORDS {
-            index = 0;
-        } else {
-            c = c.wrapping_sub(1);
-        }
-        ((c as u128) << 4) | (index as u128)
-    }
-
-    /// Set the offset from the start of the stream, in 32-bit words.
-    /// 
-    /// As with `get_word_pos`, we use a 68-bit number. Since the generator
-    /// simply cycles at the end of its period (1 ZiB), we ignore the upper
-    /// 60 bits.
-    /// 
-    /// Note: this function is currently only available when the `i128_support`
-    /// feature is enabled. In the future this will be enabled by default.
-    #[cfg(feature = "i128_support")]
-    pub fn set_word_pos(&mut self, word_offset: u128) {
-        let index = (word_offset as usize) & 0xF;
-        let counter = (word_offset >> 4) as u64;
-        self.0.core.state[12] = counter as u32;
-        self.0.core.state[13] = (counter >> 32) as u32;
-        if index != 0 {
-            self.0.generate_and_set(index); // also increments counter
-        } else {
-            self.0.reset();
-        }
-    }
-
-    /// Set the stream number.
-    ///
-    /// This is initialized to zero; 2<sup>64</sup> unique streams of output
-    /// are available per seed/key.
-    /// 
-    /// Note that in order to reproduce ChaCha output with a specific 64-bit
-    /// nonce, one can convert that nonce to a `u64` in little-endian fashion
-    /// and pass to this function. In theory a 96-bit nonce can be used by
-    /// passing the last 64-bits to this function and using the first 32-bits as
-    /// the most significant half of the 64-bit counter (which may be set
-    /// indirectly via `set_word_pos`), but this is not directly supported.
-    pub fn set_stream(&mut self, stream: u64) {
-        let index = self.0.index();
-        self.0.core.state[14] = stream as u32;
-        self.0.core.state[15] = (stream >> 32) as u32;
-        if index < STATE_WORDS {
-            // we need to regenerate a partial result buffer
-            {
-                // reverse of counter adjustment in generate()
-                if self.0.core.state[12] == 0 {
-                    self.0.core.state[13] = self.0.core.state[13].wrapping_sub(1);
-                }
-                self.0.core.state[12] = self.0.core.state[12].wrapping_sub(1);
-            }
-            self.0.generate_and_set(index);
-        }
-    }
-}
-
-/// The core of `ChaChaRng`, used with `BlockRng`.
-#[derive(Clone)]
-pub struct ChaChaCore {
-    state: [u32; STATE_WORDS],
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for ChaChaCore {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ChaChaCore {{}}")
-    }
-}
-
-macro_rules! quarter_round{
-    ($a: expr, $b: expr, $c: expr, $d: expr) => {{
-        $a = $a.wrapping_add($b); $d ^= $a; $d = $d.rotate_left(16);
-        $c = $c.wrapping_add($d); $b ^= $c; $b = $b.rotate_left(12);
-        $a = $a.wrapping_add($b); $d ^= $a; $d = $d.rotate_left( 8);
-        $c = $c.wrapping_add($d); $b ^= $c; $b = $b.rotate_left( 7);
-    }}
-}
-
-macro_rules! double_round{
-    ($x: expr) => {{
-        // Column round
-        quarter_round!($x[ 0], $x[ 4], $x[ 8], $x[12]);
-        quarter_round!($x[ 1], $x[ 5], $x[ 9], $x[13]);
-        quarter_round!($x[ 2], $x[ 6], $x[10], $x[14]);
-        quarter_round!($x[ 3], $x[ 7], $x[11], $x[15]);
-        // Diagonal round
-        quarter_round!($x[ 0], $x[ 5], $x[10], $x[15]);
-        quarter_round!($x[ 1], $x[ 6], $x[11], $x[12]);
-        quarter_round!($x[ 2], $x[ 7], $x[ 8], $x[13]);
-        quarter_round!($x[ 3], $x[ 4], $x[ 9], $x[14]);
-    }}
-}
-
-impl BlockRngCore for ChaChaCore {
-    type Item = u32;
-    type Results = [u32; STATE_WORDS];
-
-    fn generate(&mut self, results: &mut Self::Results) {
-        // For some reason extracting this part into a separate function
-        // improves performance by 50%.
-        fn core(results: &mut [u32; STATE_WORDS],
-                state: &[u32; STATE_WORDS])
-        {
-            let mut tmp = *state;
-            let rounds = 20;
-            for _ in 0..rounds / 2 {
-                double_round!(tmp);
-            }
-            for i in 0..STATE_WORDS {
-                results[i] = tmp[i].wrapping_add(state[i]);
-            }
-        }
-
-        core(results, &self.state);
-
-        // update 64-bit counter
-        self.state[12] = self.state[12].wrapping_add(1);
-        if self.state[12] != 0 { return; };
-        self.state[13] = self.state[13].wrapping_add(1);
-    }
-}
-
-impl SeedableRng for ChaChaCore {
-    type Seed = [u8; SEED_WORDS*4];
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        let mut seed_le = [0u32; SEED_WORDS];
-        le::read_u32_into(&seed, &mut seed_le);
-        Self {
-            state: [0x61707865, 0x3320646E, 0x79622D32, 0x6B206574, // constants
-                    seed_le[0], seed_le[1], seed_le[2], seed_le[3], // seed
-                    seed_le[4], seed_le[5], seed_le[6], seed_le[7], // seed
-                    0, 0, 0, 0], // counter
-         }
-    }
-}
-
-impl CryptoRng for ChaChaCore {}
-
-impl From<ChaChaCore> for ChaChaRng {
-    fn from(core: ChaChaCore) -> Self {
-        ChaChaRng(BlockRng::new(core))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use {RngCore, SeedableRng};
-    use super::ChaChaRng;
-
-    #[test]
-    fn test_chacha_construction() {
-        let seed = [0,0,0,0,0,0,0,0,
-            1,0,0,0,0,0,0,0,
-            2,0,0,0,0,0,0,0,
-            3,0,0,0,0,0,0,0];
-        let mut rng1 = ChaChaRng::from_seed(seed);
-        assert_eq!(rng1.next_u32(), 137206642);
-
-        let mut rng2 = ChaChaRng::from_rng(rng1).unwrap();
-        assert_eq!(rng2.next_u32(), 1325750369);
-    }
-
-    #[test]
-    fn test_chacha_true_values_a() {
-        // Test vectors 1 and 2 from
-        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
-        let seed = [0u8; 32];
-        let mut rng = ChaChaRng::from_seed(seed);
-
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0xade0b876, 0x903df1a0, 0xe56a5d40, 0x28bd8653,
-                        0xb819d2bd, 0x1aed8da0, 0xccef36a8, 0xc70d778b,
-                        0x7c5941da, 0x8d485751, 0x3fe02477, 0x374ad8b8,
-                        0xf4b8436a, 0x1ca11815, 0x69b687c3, 0x8665eeb2];
-        assert_eq!(results, expected);
-
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0xbee7079f, 0x7a385155, 0x7c97ba98, 0x0d082d73,
-                        0xa0290fcb, 0x6965e348, 0x3e53c612, 0xed7aee32,
-                        0x7621b729, 0x434ee69c, 0xb03371d5, 0xd539d874,
-                        0x281fed31, 0x45fb0a51, 0x1f0ae1ac, 0x6f4d794b];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_chacha_true_values_b() {
-        // Test vector 3 from
-        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
-        let seed = [0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 1];
-        let mut rng = ChaChaRng::from_seed(seed);
-
-        // Skip block 0
-        for _ in 0..16 { rng.next_u32(); }
-
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0x2452eb3a, 0x9249f8ec, 0x8d829d9b, 0xddd4ceb1,
-                        0xe8252083, 0x60818b01, 0xf38422b8, 0x5aaa49c9,
-                        0xbb00ca8e, 0xda3ba7b4, 0xc4b592d1, 0xfdf2732f,
-                        0x4436274e, 0x2561b3c8, 0xebdd4aa6, 0xa0136c00];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    #[cfg(feature = "i128_support")]
-    fn test_chacha_true_values_c() {
-        // Test vector 4 from
-        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
-        let seed = [0, 0xff, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0];
-        let expected = [0xfb4dd572, 0x4bc42ef1, 0xdf922636, 0x327f1394,
-                        0xa78dea8f, 0x5e269039, 0xa1bebbc1, 0xcaf09aae,
-                        0xa25ab213, 0x48a6b46c, 0x1b9d9bcb, 0x092c5be6,
-                        0x546ca624, 0x1bec45d5, 0x87f47473, 0x96f0992e];
-        let expected_end = 3 * 16;
-        let mut results = [0u32; 16];
-
-        // Test block 2 by skipping block 0 and 1
-        let mut rng1 = ChaChaRng::from_seed(seed);
-        for _ in 0..32 { rng1.next_u32(); }
-        for i in results.iter_mut() { *i = rng1.next_u32(); }
-        assert_eq!(results, expected);
-        assert_eq!(rng1.get_word_pos(), expected_end);
-
-        // Test block 2 by using `set_word_pos`
-        let mut rng2 = ChaChaRng::from_seed(seed);
-        rng2.set_word_pos(2 * 16);
-        for i in results.iter_mut() { *i = rng2.next_u32(); }
-        assert_eq!(results, expected);
-        assert_eq!(rng2.get_word_pos(), expected_end);
-        
-        // Test skipping behaviour with other types
-        let mut buf = [0u8; 32];
-        rng2.fill_bytes(&mut buf[..]);
-        assert_eq!(rng2.get_word_pos(), expected_end + 8);
-        rng2.fill_bytes(&mut buf[0..25]);
-        assert_eq!(rng2.get_word_pos(), expected_end + 15);
-        rng2.next_u64();
-        assert_eq!(rng2.get_word_pos(), expected_end + 17);
-        rng2.next_u32();
-        rng2.next_u64();
-        assert_eq!(rng2.get_word_pos(), expected_end + 20);
-        rng2.fill_bytes(&mut buf[0..1]);
-        assert_eq!(rng2.get_word_pos(), expected_end + 21);
-    }
-
-    #[test]
-    fn test_chacha_multiple_blocks() {
-        let seed = [0,0,0,0, 1,0,0,0, 2,0,0,0, 3,0,0,0, 4,0,0,0, 5,0,0,0, 6,0,0,0, 7,0,0,0];
-        let mut rng = ChaChaRng::from_seed(seed);
-
-        // Store the 17*i-th 32-bit word,
-        // i.e., the i-th word of the i-th 16-word block
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() {
-            *i = rng.next_u32();
-            for _ in 0..16 {
-                rng.next_u32();
-            }
-        }
-        let expected = [0xf225c81a, 0x6ab1be57, 0x04d42951, 0x70858036,
-                        0x49884684, 0x64efec72, 0x4be2d186, 0x3615b384,
-                        0x11cfa18e, 0xd3c50049, 0x75c775f6, 0x434c6530,
-                        0x2c5bad8f, 0x898881dc, 0x5f1c86d9, 0xc1f8e7f4];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_chacha_true_bytes() {
-        let seed = [0u8; 32];
-        let mut rng = ChaChaRng::from_seed(seed);
-        let mut results = [0u8; 32];
-        rng.fill_bytes(&mut results);
-        let expected = [118, 184, 224, 173, 160, 241, 61, 144,
-                        64, 93, 106, 229, 83, 134, 189, 40,
-                        189, 210, 25, 184, 160, 141, 237, 26,
-                        168, 54, 239, 204, 139, 119, 13, 199];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_chacha_nonce() {
-        // Test vector 5 from
-        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
-        // Although we do not support setting a nonce, we try it here anyway so
-        // we can use this test vector.
-        let seed = [0u8; 32];
-        let mut rng = ChaChaRng::from_seed(seed);
-        // 96-bit nonce in LE order is: 0,0,0,0, 0,0,0,0, 0,0,0,2
-        rng.set_stream(2u64 << (24 + 32));
-
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0x374dc6c2, 0x3736d58c, 0xb904e24a, 0xcd3f93ef,
-                        0x88228b1a, 0x96a4dfb3, 0x5b76ab72, 0xc727ee54,
-                        0x0e0e978a, 0xf3145c95, 0x1b748ea8, 0xf786c297,
-                        0x99c28f5f, 0x628314e8, 0x398a19fa, 0x6ded1b53];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_chacha_clone_streams() {
-        let seed = [0,0,0,0, 1,0,0,0, 2,0,0,0, 3,0,0,0, 4,0,0,0, 5,0,0,0, 6,0,0,0, 7,0,0,0];
-        let mut rng = ChaChaRng::from_seed(seed);
-        let mut clone = rng.clone();
-        for _ in 0..16 {
-            assert_eq!(rng.next_u64(), clone.next_u64());
-        }
-        
-        rng.set_stream(51);
-        for _ in 0..7 {
-            assert!(rng.next_u32() != clone.next_u32());
-        }
-        clone.set_stream(51);   // switch part way through block
-        for _ in 7..16 {
-            assert_eq!(rng.next_u32(), clone.next_u32());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/hc128.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/hc128.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/hc128.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/hc128.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,464 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://www.rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The HC-128 random number generator.
-
-use core::fmt;
-use rand_core::{CryptoRng, RngCore, SeedableRng, Error, le};
-use rand_core::block::{BlockRngCore, BlockRng};
-
-const SEED_WORDS: usize = 8; // 128 bit key followed by 128 bit iv
-
-/// A cryptographically secure random number generator that uses the HC-128
-/// algorithm.
-///
-/// HC-128 is a stream cipher designed by Hongjun Wu[^1], that we use as an
-/// RNG. It is selected as one of the "stream ciphers suitable for widespread
-/// adoption" by eSTREAM[^2].
-///
-/// HC-128 is an array based RNG. In this it is similar to RC-4 and ISAAC before
-/// it, but those have never been proven cryptographically secure (or have even
-/// been significantly compromised, as in the case of RC-4[^5]).
-///
-/// Because HC-128 works with simple indexing into a large array and with a few
-/// operations that parallelize well, it has very good performance. The size of
-/// the array it needs, 4kb, can however be a disadvantage.
-///
-/// This implementation is not based on the version of HC-128 submitted to the
-/// eSTREAM contest, but on a later version by the author with a few small
-/// improvements from December 15, 2009[^3].
-///
-/// HC-128 has no known weaknesses that are easier to exploit than doing a
-/// brute-force search of 2<sup>128</sup>. A very comprehensive analysis of the
-/// current state of known attacks / weaknesses of HC-128 is given in *Some
-/// Results On Analysis And Implementation Of HC-128 Stream Cipher*[^4].
-///
-/// The average cycle length is expected to be
-/// 2<sup>1024*32+10-1</sup> = 2<sup>32777</sup>.
-/// We support seeding with a 256-bit array, which matches the 128-bit key
-/// concatenated with a 128-bit IV from the stream cipher.
-///
-/// This implementation uses an output buffer of sixteen `u32` words, and uses
-/// [`BlockRng`] to implement the [`RngCore`] methods.
-///
-/// ## References
-/// [^1]: Hongjun Wu (2008). ["The Stream Cipher HC-128"](
-///       http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf).
-///       *The eSTREAM Finalists*, LNCS 4986, pp. 39–47, Springer-Verlag.
-///
-/// [^2]: [eSTREAM: the ECRYPT Stream Cipher Project](
-///       http://www.ecrypt.eu.org/stream/)
-///
-/// [^3]: Hongjun Wu, [Stream Ciphers HC-128 and HC-256](
-///       https://www.ntu.edu.sg/home/wuhj/research/hc/index.html)
-///
-/// [^4]: Shashwat Raizada (January 2015),["Some Results On Analysis And
-///       Implementation Of HC-128 Stream Cipher"](
-///       http://library.isical.ac.in:8080/jspui/bitstream/123456789/6636/1/TH431.pdf).
-///
-/// [^5]: Internet Engineering Task Force (February 2015),
-///       ["Prohibiting RC4 Cipher Suites"](https://tools.ietf.org/html/rfc7465).
-///
-/// [`BlockRng`]: ../../../rand_core/block/struct.BlockRng.html
-/// [`RngCore`]: ../../trait.RngCore.html
-#[derive(Clone, Debug)]
-pub struct Hc128Rng(BlockRng<Hc128Core>);
-
-impl RngCore for Hc128Rng {
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl SeedableRng for Hc128Rng {
-    type Seed = <Hc128Core as SeedableRng>::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        Hc128Rng(BlockRng::<Hc128Core>::from_seed(seed))
-    }
-
-    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
-        BlockRng::<Hc128Core>::from_rng(rng).map(Hc128Rng)
-    }
-}
-
-impl CryptoRng for Hc128Rng {}
-
-/// The core of `Hc128Rng`, used with `BlockRng`.
-#[derive(Clone)]
-pub struct Hc128Core {
-    t: [u32; 1024],
-    counter1024: usize,
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for Hc128Core {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Hc128Core {{}}")
-    }
-}
-
-impl BlockRngCore for Hc128Core {
-    type Item = u32;
-    type Results = [u32; 16];
-
-    fn generate(&mut self, results: &mut Self::Results) {
-        assert!(self.counter1024 % 16 == 0);
-
-        let cc = self.counter1024 % 512;
-        let dd = (cc + 16) % 512;
-        let ee = cc.wrapping_sub(16) % 512;
-
-        if self.counter1024 & 512 == 0 {
-            // P block
-            results[0]  = self.step_p(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
-            results[1]  = self.step_p(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
-            results[2]  = self.step_p(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
-            results[3]  = self.step_p(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
-            results[4]  = self.step_p(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
-            results[5]  = self.step_p(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
-            results[6]  = self.step_p(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
-            results[7]  = self.step_p(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
-            results[8]  = self.step_p(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
-            results[9]  = self.step_p(cc+9,  cc+10, cc+6,  ee+15, ee+13);
-            results[10] = self.step_p(cc+10, cc+11, cc+7,  cc+0,  ee+14);
-            results[11] = self.step_p(cc+11, cc+12, cc+8,  cc+1,  ee+15);
-            results[12] = self.step_p(cc+12, cc+13, cc+9,  cc+2,  cc+0);
-            results[13] = self.step_p(cc+13, cc+14, cc+10, cc+3,  cc+1);
-            results[14] = self.step_p(cc+14, cc+15, cc+11, cc+4,  cc+2);
-            results[15] = self.step_p(cc+15, dd+0,  cc+12, cc+5,  cc+3);
-        } else {
-            // Q block
-            results[0]  = self.step_q(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
-            results[1]  = self.step_q(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
-            results[2]  = self.step_q(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
-            results[3]  = self.step_q(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
-            results[4]  = self.step_q(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
-            results[5]  = self.step_q(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
-            results[6]  = self.step_q(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
-            results[7]  = self.step_q(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
-            results[8]  = self.step_q(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
-            results[9]  = self.step_q(cc+9,  cc+10, cc+6,  ee+15, ee+13);
-            results[10] = self.step_q(cc+10, cc+11, cc+7,  cc+0,  ee+14);
-            results[11] = self.step_q(cc+11, cc+12, cc+8,  cc+1,  ee+15);
-            results[12] = self.step_q(cc+12, cc+13, cc+9,  cc+2,  cc+0);
-            results[13] = self.step_q(cc+13, cc+14, cc+10, cc+3,  cc+1);
-            results[14] = self.step_q(cc+14, cc+15, cc+11, cc+4,  cc+2);
-            results[15] = self.step_q(cc+15, dd+0,  cc+12, cc+5,  cc+3);
-        }
-        self.counter1024 = self.counter1024.wrapping_add(16);
-    }
-}
-
-impl Hc128Core {
-    // One step of HC-128, update P and generate 32 bits keystream
-    #[inline(always)]
-    fn step_p(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize)
-         -> u32
-    {
-        let (p, q) = self.t.split_at_mut(512);
-        // FIXME: it would be great if we the bounds checks here could be
-        // optimized out, and we would not need unsafe.
-        // This improves performance by about 7%.
-        unsafe {
-            let temp0 = p.get_unchecked(i511).rotate_right(23);
-            let temp1 = p.get_unchecked(i3).rotate_right(10);
-            let temp2 = p.get_unchecked(i10).rotate_right(8);
-            *p.get_unchecked_mut(i) = p.get_unchecked(i)
-                                       .wrapping_add(temp2)
-                                       .wrapping_add(temp0 ^ temp1);
-            let temp3 = {
-                // The h1 function in HC-128
-                let a = *p.get_unchecked(i12) as u8;
-                let c = (p.get_unchecked(i12) >> 16) as u8;
-                q[a as usize].wrapping_add(q[256 + c as usize])
-            };
-            temp3 ^ p.get_unchecked(i)
-        }
-    }
-
-    // One step of HC-128, update Q and generate 32 bits keystream
-    // Similar to `step_p`, but `p` and `q` are swapped, and the rotates are to
-    // the left instead of to the right.
-    #[inline(always)]
-    fn step_q(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize)
-         -> u32
-    {
-        let (p, q) = self.t.split_at_mut(512);
-        unsafe {
-            let temp0 = q.get_unchecked(i511).rotate_left(23);
-            let temp1 = q.get_unchecked(i3).rotate_left(10);
-            let temp2 = q.get_unchecked(i10).rotate_left(8);
-            *q.get_unchecked_mut(i) = q.get_unchecked(i)
-                                       .wrapping_add(temp2)
-                                       .wrapping_add(temp0 ^ temp1);
-            let temp3 = {
-                // The h2 function in HC-128
-                let a = *q.get_unchecked(i12) as u8;
-                let c = (q.get_unchecked(i12) >> 16) as u8;
-                p[a as usize].wrapping_add(p[256 + c as usize])
-            };
-            temp3 ^ q.get_unchecked(i)
-        }
-    }
-
-    fn sixteen_steps(&mut self) {
-        assert!(self.counter1024 % 16 == 0);
-
-        let cc = self.counter1024 % 512;
-        let dd = (cc + 16) % 512;
-        let ee = cc.wrapping_sub(16) % 512;
-
-        if self.counter1024 < 512 {
-            // P block
-            self.t[cc+0]  = self.step_p(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
-            self.t[cc+1]  = self.step_p(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
-            self.t[cc+2]  = self.step_p(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
-            self.t[cc+3]  = self.step_p(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
-            self.t[cc+4]  = self.step_p(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
-            self.t[cc+5]  = self.step_p(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
-            self.t[cc+6]  = self.step_p(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
-            self.t[cc+7]  = self.step_p(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
-            self.t[cc+8]  = self.step_p(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
-            self.t[cc+9]  = self.step_p(cc+9,  cc+10, cc+6,  ee+15, ee+13);
-            self.t[cc+10] = self.step_p(cc+10, cc+11, cc+7,  cc+0,  ee+14);
-            self.t[cc+11] = self.step_p(cc+11, cc+12, cc+8,  cc+1,  ee+15);
-            self.t[cc+12] = self.step_p(cc+12, cc+13, cc+9,  cc+2,  cc+0);
-            self.t[cc+13] = self.step_p(cc+13, cc+14, cc+10, cc+3,  cc+1);
-            self.t[cc+14] = self.step_p(cc+14, cc+15, cc+11, cc+4,  cc+2);
-            self.t[cc+15] = self.step_p(cc+15, dd+0,  cc+12, cc+5,  cc+3);
-        } else {
-            // Q block
-            self.t[cc+512+0]  = self.step_q(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
-            self.t[cc+512+1]  = self.step_q(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
-            self.t[cc+512+2]  = self.step_q(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
-            self.t[cc+512+3]  = self.step_q(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
-            self.t[cc+512+4]  = self.step_q(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
-            self.t[cc+512+5]  = self.step_q(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
-            self.t[cc+512+6]  = self.step_q(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
-            self.t[cc+512+7]  = self.step_q(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
-            self.t[cc+512+8]  = self.step_q(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
-            self.t[cc+512+9]  = self.step_q(cc+9,  cc+10, cc+6,  ee+15, ee+13);
-            self.t[cc+512+10] = self.step_q(cc+10, cc+11, cc+7,  cc+0,  ee+14);
-            self.t[cc+512+11] = self.step_q(cc+11, cc+12, cc+8,  cc+1,  ee+15);
-            self.t[cc+512+12] = self.step_q(cc+12, cc+13, cc+9,  cc+2,  cc+0);
-            self.t[cc+512+13] = self.step_q(cc+13, cc+14, cc+10, cc+3,  cc+1);
-            self.t[cc+512+14] = self.step_q(cc+14, cc+15, cc+11, cc+4,  cc+2);
-            self.t[cc+512+15] = self.step_q(cc+15, dd+0,  cc+12, cc+5,  cc+3);
-        }
-        self.counter1024 += 16;
-    }
-
-    // Initialize an HC-128 random number generator. The seed has to be
-    // 256 bits in length (`[u32; 8]`), matching the 128 bit `key` followed by
-    // 128 bit `iv` when HC-128 where to be used as a stream cipher.
-    fn init(seed: [u32; SEED_WORDS]) -> Self {
-        #[inline]
-        fn f1(x: u32) -> u32 {
-            x.rotate_right(7) ^ x.rotate_right(18) ^ (x >> 3)
-        }
-
-        #[inline]
-        fn f2(x: u32) -> u32 {
-            x.rotate_right(17) ^ x.rotate_right(19) ^ (x >> 10)
-        }
-
-        let mut t = [0u32; 1024];
-
-        // Expand the key and iv into P and Q
-        let (key, iv) = seed.split_at(4);
-        t[..4].copy_from_slice(key);
-        t[4..8].copy_from_slice(key);
-        t[8..12].copy_from_slice(iv);
-        t[12..16].copy_from_slice(iv);
-
-        // Generate the 256 intermediate values W[16] ... W[256+16-1], and
-        // copy the last 16 generated values to the start op P.
-        for i in 16..256+16 {
-            t[i] = f2(t[i-2]).wrapping_add(t[i-7]).wrapping_add(f1(t[i-15]))
-                   .wrapping_add(t[i-16]).wrapping_add(i as u32);
-        }
-        {
-            let (p1, p2) = t.split_at_mut(256);
-            p1[0..16].copy_from_slice(&p2[0..16]);
-        }
-
-        // Generate both the P and Q tables
-        for i in 16..1024 {
-            t[i] = f2(t[i-2]).wrapping_add(t[i-7]).wrapping_add(f1(t[i-15]))
-                   .wrapping_add(t[i-16]).wrapping_add(256 + i as u32);
-        }
-
-        let mut core = Self { t, counter1024: 0 };
-
-        // run the cipher 1024 steps
-        for _ in 0..64 { core.sixteen_steps() };
-        core.counter1024 = 0;
-        core
-    }
-}
-
-impl SeedableRng for Hc128Core {
-    type Seed = [u8; SEED_WORDS*4];
-
-    /// Create an HC-128 random number generator with a seed. The seed has to be
-    /// 256 bits in length, matching the 128 bit `key` followed by 128 bit `iv`
-    /// when HC-128 where to be used as a stream cipher.
-    fn from_seed(seed: Self::Seed) -> Self {
-        let mut seed_u32 = [0u32; SEED_WORDS];
-        le::read_u32_into(&seed, &mut seed_u32);
-        Self::init(seed_u32)
-    }
-}
-
-impl CryptoRng for Hc128Core {}
-
-#[cfg(test)]
-mod test {
-    use {RngCore, SeedableRng};
-    use super::Hc128Rng;
-
-    #[test]
-    // Test vector 1 from the paper "The Stream Cipher HC-128"
-    fn test_hc128_true_values_a() {
-        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
-        let mut rng = Hc128Rng::from_seed(seed);
-
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0x73150082, 0x3bfd03a0, 0xfb2fd77f, 0xaa63af0e,
-                        0xde122fc6, 0xa7dc29b6, 0x62a68527, 0x8b75ec68,
-                        0x9036db1e, 0x81896005, 0x00ade078, 0x491fbf9a,
-                        0x1cdc3013, 0x6c3d6e24, 0x90f664b2, 0x9cd57102];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    // Test vector 2 from the paper "The Stream Cipher HC-128"
-    fn test_hc128_true_values_b() {
-        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
-                    1,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
-        let mut rng = Hc128Rng::from_seed(seed);
-
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0xc01893d5, 0xb7dbe958, 0x8f65ec98, 0x64176604,
-                        0x36fc6724, 0xc82c6eec, 0x1b1c38a7, 0xc9b42a95,
-                        0x323ef123, 0x0a6a908b, 0xce757b68, 0x9f14f7bb,
-                        0xe4cde011, 0xaeb5173f, 0x89608c94, 0xb5cf46ca];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    // Test vector 3 from the paper "The Stream Cipher HC-128"
-    fn test_hc128_true_values_c() {
-        let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
-        let mut rng = Hc128Rng::from_seed(seed);
-
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected = [0x518251a4, 0x04b4930a, 0xb02af931, 0x0639f032,
-                        0xbcb4a47a, 0x5722480b, 0x2bf99f72, 0xcdc0e566,
-                        0x310f0c56, 0xd3cc83e8, 0x663db8ef, 0x62dfe07f,
-                        0x593e1790, 0xc5ceaa9c, 0xab03806f, 0xc9a6e5a0];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_hc128_true_values_u64() {
-        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
-        let mut rng = Hc128Rng::from_seed(seed);
-
-        let mut results = [0u64; 8];
-        for i in results.iter_mut() { *i = rng.next_u64(); }
-        let expected = [0x3bfd03a073150082, 0xaa63af0efb2fd77f,
-                        0xa7dc29b6de122fc6, 0x8b75ec6862a68527,
-                        0x818960059036db1e, 0x491fbf9a00ade078,
-                        0x6c3d6e241cdc3013, 0x9cd5710290f664b2];
-        assert_eq!(results, expected);
-
-        // The RNG operates in a P block of 512 results and next a Q block.
-        // After skipping 2*800 u32 results we end up somewhere in the Q block
-        // of the second round
-        for _ in 0..800 { rng.next_u64(); }
-
-        for i in results.iter_mut() { *i = rng.next_u64(); }
-        let expected = [0xd8c4d6ca84d0fc10, 0xf16a5d91dc66e8e7,
-                        0xd800de5bc37a8653, 0x7bae1f88c0dfbb4c,
-                        0x3bfe1f374e6d4d14, 0x424b55676be3fa06,
-                        0xe3a1e8758cbff579, 0x417f7198c5652bcd];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_hc128_true_values_bytes() {
-        let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
-        let mut rng = Hc128Rng::from_seed(seed);
-        let expected = [0x31, 0xf9, 0x2a, 0xb0, 0x32, 0xf0, 0x39, 0x06,
-                 0x7a, 0xa4, 0xb4, 0xbc, 0x0b, 0x48, 0x22, 0x57,
-                 0x72, 0x9f, 0xf9, 0x2b, 0x66, 0xe5, 0xc0, 0xcd,
-                 0x56, 0x0c, 0x0f, 0x31, 0xe8, 0x83, 0xcc, 0xd3,
-                 0xef, 0xb8, 0x3d, 0x66, 0x7f, 0xe0, 0xdf, 0x62,
-                 0x90, 0x17, 0x3e, 0x59, 0x9c, 0xaa, 0xce, 0xc5,
-                 0x6f, 0x80, 0x03, 0xab, 0xa0, 0xe5, 0xa6, 0xc9,
-                 0x60, 0x95, 0x84, 0x7a, 0xa5, 0x68, 0x5a, 0x84,
-                 0xea, 0xd5, 0xf3, 0xea, 0x73, 0xa9, 0xad, 0x01,
-                 0x79, 0x7d, 0xbe, 0x9f, 0xea, 0xe3, 0xf9, 0x74,
-                 0x0e, 0xda, 0x2f, 0xa0, 0xe4, 0x7b, 0x4b, 0x1b,
-                 0xdd, 0x17, 0x69, 0x4a, 0xfe, 0x9f, 0x56, 0x95,
-                 0xad, 0x83, 0x6b, 0x9d, 0x60, 0xa1, 0x99, 0x96,
-                 0x90, 0x00, 0x66, 0x7f, 0xfa, 0x7e, 0x65, 0xe9,
-                 0xac, 0x8b, 0x92, 0x34, 0x77, 0xb4, 0x23, 0xd0,
-                 0xb9, 0xab, 0xb1, 0x47, 0x7d, 0x4a, 0x13, 0x0a];
-
-        // Pick a somewhat large buffer so we can test filling with the
-        // remainder from `state.results`, directly filling the buffer, and
-        // filling the remainder of the buffer.
-        let mut buffer = [0u8; 16*4*2];
-        // Consume a value so that we have a remainder.
-        assert!(rng.next_u64() == 0x04b4930a518251a4);
-        rng.fill_bytes(&mut buffer);
-
-        // [u8; 128] doesn't implement PartialEq
-        assert_eq!(buffer.len(), expected.len());
-        for (b, e) in buffer.iter().zip(expected.iter()) {
-            assert_eq!(b, e);
-        }
-    }
-
-    #[test]
-    fn test_hc128_clone() {
-        let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
-        let mut rng1 = Hc128Rng::from_seed(seed);
-        let mut rng2 = rng1.clone();
-        for _ in 0..16 {
-            assert_eq!(rng1.next_u32(), rng2.next_u32());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/isaac64.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/isaac64.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/isaac64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/isaac64.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,478 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The ISAAC-64 random number generator.
-
-use core::{fmt, slice};
-use core::num::Wrapping as w;
-use rand_core::{RngCore, SeedableRng, Error, le};
-use rand_core::block::{BlockRngCore, BlockRng64};
-use prng::isaac_array::IsaacArray;
-
-#[allow(non_camel_case_types)]
-type w64 = w<u64>;
-
-const RAND_SIZE_LEN: usize = 8;
-const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
-
-/// A random number generator that uses ISAAC-64, the 64-bit variant of the
-/// ISAAC algorithm.
-///
-/// ISAAC stands for "Indirection, Shift, Accumulate, Add, and Count" which are
-/// the principal bitwise operations employed. It is the most advanced of a
-/// series of array based random number generator designed by Robert Jenkins
-/// in 1996[^1].
-///
-/// ISAAC-64 is mostly similar to ISAAC. Because it operates on 64-bit integers
-/// instead of 32-bit, it uses twice as much memory to hold its state and
-/// results. Also it uses different constants for shifts and indirect indexing,
-/// optimized to give good results for 64bit arithmetic.
-///
-/// ISAAC-64 is notably fast and produces excellent quality random numbers for
-/// non-cryptographic applications.
-///
-/// In spite of being designed with cryptographic security in mind, ISAAC hasn't
-/// been stringently cryptanalyzed and thus cryptographers do not not
-/// consensually trust it to be secure. When looking for a secure RNG, prefer
-/// [`Hc128Rng`] instead, which, like ISAAC, is an array-based RNG and one of
-/// the stream-ciphers selected the by eSTREAM contest.
-///
-/// ## Overview of the ISAAC-64 algorithm:
-/// (in pseudo-code)
-///
-/// ```text
-/// Input: a, b, c, s[256] // state
-/// Output: r[256] // results
-///
-/// mix(a,i) = !(a ^ a << 21)  if i = 0 mod 4
-///              a ^ a >>  5   if i = 1 mod 4
-///              a ^ a << 12   if i = 2 mod 4
-///              a ^ a >> 33   if i = 3 mod 4
-///
-/// c = c + 1
-/// b = b + c
-///
-/// for i in 0..256 {
-///     x = s_[i]
-///     a = mix(a,i) + s[i+128 mod 256]
-///     y = a + b + s[x>>3 mod 256]
-///     s[i] = y
-///     b = x + s[y>>11 mod 256]
-///     r[i] = b
-/// }
-/// ```
-///
-/// This implementation uses [`BlockRng64`] to implement the [`RngCore`] methods.
-///
-/// See for more information the documentation of [`IsaacRng`].
-///
-/// [^1]: Bob Jenkins, [*ISAAC and RC4*](
-///       http://burtleburtle.net/bob/rand/isaac.html)
-///
-/// [`IsaacRng`]: ../isaac/struct.IsaacRng.html
-/// [`Hc128Rng`]: ../hc128/struct.Hc128Rng.html
-/// [`BlockRng64`]: ../../../rand_core/block/struct.BlockRng64.html
-/// [`RngCore`]: ../../trait.RngCore.html
-#[derive(Clone, Debug)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct Isaac64Rng(BlockRng64<Isaac64Core>);
-
-impl RngCore for Isaac64Rng {
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl SeedableRng for Isaac64Rng {
-    type Seed = <Isaac64Core as SeedableRng>::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        Isaac64Rng(BlockRng64::<Isaac64Core>::from_seed(seed))
-    }
-
-    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
-        BlockRng64::<Isaac64Core>::from_rng(rng).map(|rng| Isaac64Rng(rng))
-    }
-}
-
-impl Isaac64Rng {
-    /// Create a 64-bit ISAAC random number generator using the
-    /// default fixed seed.
-    ///
-    /// DEPRECATED. `Isaac64Rng::new_from_u64(0)` will produce identical results.
-    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
-    pub fn new_unseeded() -> Self {
-        Self::new_from_u64(0)
-    }
-
-    /// Create an ISAAC-64 random number generator using an `u64` as seed.
-    /// If `seed == 0` this will produce the same stream of random numbers as
-    /// the reference implementation when used unseeded.
-    pub fn new_from_u64(seed: u64) -> Self {
-        Isaac64Rng(BlockRng64::new(Isaac64Core::new_from_u64(seed)))
-    }
-}
-
-/// The core of `Isaac64Rng`, used with `BlockRng`.
-#[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct Isaac64Core {
-    #[cfg_attr(feature="serde1",serde(with="super::isaac_array::isaac_array_serde"))]
-    mem: [w64; RAND_SIZE],
-    a: w64,
-    b: w64,
-    c: w64,
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for Isaac64Core {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Isaac64Core {{}}")
-    }
-}
-
-impl BlockRngCore for Isaac64Core {
-    type Item = u64;
-    type Results = IsaacArray<Self::Item>;
-
-    /// Refills the output buffer, `results`. See also the pseudocode desciption
-    /// of the algorithm in the [`Isaac64Rng`] documentation.
-    ///
-    /// Optimisations used (similar to the reference implementation):
-    /// 
-    /// - The loop is unrolled 4 times, once for every constant of mix().
-    /// - The contents of the main loop are moved to a function `rngstep`, to
-    ///   reduce code duplication.
-    /// - We use local variables for a and b, which helps with optimisations.
-    /// - We split the main loop in two, one that operates over 0..128 and one
-    ///   over 128..256. This way we can optimise out the addition and modulus
-    ///   from `s[i+128 mod 256]`.
-    /// - We maintain one index `i` and add `m` or `m2` as base (m2 for the
-    ///   `s[i+128 mod 256]`), relying on the optimizer to turn it into pointer
-    ///   arithmetic.
-    /// - We fill `results` backwards. The reference implementation reads values
-    ///   from `results` in reverse. We read them in the normal direction, to
-    ///   make `fill_bytes` a memcopy. To maintain compatibility we fill in
-    ///   reverse.
-    /// 
-    /// [`Isaac64Rng`]: struct.Isaac64Rng.html
-    fn generate(&mut self, results: &mut IsaacArray<Self::Item>) {
-        self.c += w(1);
-        // abbreviations
-        let mut a = self.a;
-        let mut b = self.b + self.c;
-        const MIDPOINT: usize = RAND_SIZE / 2;
-
-        #[inline]
-        fn ind(mem:&[w64; RAND_SIZE], v: w64, amount: usize) -> w64 {
-            let index = (v >> amount).0 as usize % RAND_SIZE;
-            mem[index]
-        }
-
-        #[inline]
-        fn rngstep(mem: &mut [w64; RAND_SIZE],
-                   results: &mut [u64; RAND_SIZE],
-                   mix: w64,
-                   a: &mut w64,
-                   b: &mut w64,
-                   base: usize,
-                   m: usize,
-                   m2: usize) {
-            let x = mem[base + m];
-            *a = mix + mem[base + m2];
-            let y = *a + *b + ind(&mem, x, 3);
-            mem[base + m] = y;
-            *b = x + ind(&mem, y, 3 + RAND_SIZE_LEN);
-            results[RAND_SIZE - 1 - base - m] = (*b).0;
-        }
-
-        let mut m = 0;
-        let mut m2 = MIDPOINT;
-        for i in (0..MIDPOINT/4).map(|i| i * 4) {
-            rngstep(&mut self.mem, results, !(a ^ (a << 21)), &mut a, &mut b, i + 0, m, m2);
-            rngstep(&mut self.mem, results,   a ^ (a >> 5 ),  &mut a, &mut b, i + 1, m, m2);
-            rngstep(&mut self.mem, results,   a ^ (a << 12),  &mut a, &mut b, i + 2, m, m2);
-            rngstep(&mut self.mem, results,   a ^ (a >> 33),  &mut a, &mut b, i + 3, m, m2);
-        }
-
-        m = MIDPOINT;
-        m2 = 0;
-        for i in (0..MIDPOINT/4).map(|i| i * 4) {
-            rngstep(&mut self.mem, results, !(a ^ (a << 21)), &mut a, &mut b, i + 0, m, m2);
-            rngstep(&mut self.mem, results,   a ^ (a >> 5 ),  &mut a, &mut b, i + 1, m, m2);
-            rngstep(&mut self.mem, results,   a ^ (a << 12),  &mut a, &mut b, i + 2, m, m2);
-            rngstep(&mut self.mem, results,   a ^ (a >> 33),  &mut a, &mut b, i + 3, m, m2);
-        }
-
-        self.a = a;
-        self.b = b;
-    }
-}
-
-impl Isaac64Core {
-    /// Create a new ISAAC-64 random number generator.
-    fn init(mut mem: [w64; RAND_SIZE], rounds: u32) -> Self {
-        fn mix(a: &mut w64, b: &mut w64, c: &mut w64, d: &mut w64,
-               e: &mut w64, f: &mut w64, g: &mut w64, h: &mut w64) {
-            *a -= *e; *f ^= *h >> 9;  *h += *a;
-            *b -= *f; *g ^= *a << 9;  *a += *b;
-            *c -= *g; *h ^= *b >> 23; *b += *c;
-            *d -= *h; *a ^= *c << 15; *c += *d;
-            *e -= *a; *b ^= *d >> 14; *d += *e;
-            *f -= *b; *c ^= *e << 20; *e += *f;
-            *g -= *c; *d ^= *f >> 17; *f += *g;
-            *h -= *d; *e ^= *g << 14; *g += *h;
-        }
-
-        // These numbers are the result of initializing a...h with the
-        // fractional part of the golden ratio in binary (0x9e3779b97f4a7c13)
-        // and applying mix() 4 times.
-        let mut a = w(0x647c4677a2884b7c);
-        let mut b = w(0xb9f8b322c73ac862);
-        let mut c = w(0x8c0ea5053d4712a0);
-        let mut d = w(0xb29b2e824a595524);
-        let mut e = w(0x82f053db8355e0ce);
-        let mut f = w(0x48fe4a0fa5a09315);
-        let mut g = w(0xae985bf2cbfc89ed);
-        let mut h = w(0x98f5704f6c44c0ab);
-
-        // Normally this should do two passes, to make all of the seed effect
-        // all of `mem`
-        for _ in 0..rounds {
-            for i in (0..RAND_SIZE/8).map(|i| i * 8) {
-                a += mem[i  ]; b += mem[i+1];
-                c += mem[i+2]; d += mem[i+3];
-                e += mem[i+4]; f += mem[i+5];
-                g += mem[i+6]; h += mem[i+7];
-                mix(&mut a, &mut b, &mut c, &mut d,
-                    &mut e, &mut f, &mut g, &mut h);
-                mem[i  ] = a; mem[i+1] = b;
-                mem[i+2] = c; mem[i+3] = d;
-                mem[i+4] = e; mem[i+5] = f;
-                mem[i+6] = g; mem[i+7] = h;
-            }
-        }
-
-        Self { mem, a: w(0), b: w(0), c: w(0) }
-    }
-
-    /// Create an ISAAC-64 random number generator using an `u64` as seed.
-    /// If `seed == 0` this will produce the same stream of random numbers as
-    /// the reference implementation when used unseeded.
-    pub fn new_from_u64(seed: u64) -> Self {
-        let mut key = [w(0); RAND_SIZE];
-        key[0] = w(seed);
-        // Initialize with only one pass.
-        // A second pass does not improve the quality here, because all of the
-        // seed was already available in the first round.
-        // Not doing the second pass has the small advantage that if
-        // `seed == 0` this method produces exactly the same state as the
-        // reference implementation when used unseeded.
-        Self::init(key, 1)
-    }
-}
-
-impl SeedableRng for Isaac64Core {
-    type Seed = [u8; 32];
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        let mut seed_u64 = [0u64; 4];
-        le::read_u64_into(&seed, &mut seed_u64);
-        // Convert the seed to `Wrapping<u64>` and zero-extend to `RAND_SIZE`.
-        let mut seed_extended = [w(0); RAND_SIZE];
-        for (x, y) in seed_extended.iter_mut().zip(seed_u64.iter()) {
-            *x = w(*y);
-        }
-        Self::init(seed_extended, 2)
-    }
-
-    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
-        // Custom `from_rng` implementation that fills a seed with the same size
-        // as the entire state.
-        let mut seed = [w(0u64); RAND_SIZE];
-        unsafe {
-            let ptr = seed.as_mut_ptr() as *mut u8;
-            let slice = slice::from_raw_parts_mut(ptr, RAND_SIZE * 8);
-            rng.try_fill_bytes(slice)?;
-        }
-        for i in seed.iter_mut() {
-            *i = w(i.0.to_le());
-        }
-
-        Ok(Self::init(seed, 2))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use {RngCore, SeedableRng};
-    use super::Isaac64Rng;
-
-    #[test]
-    fn test_isaac64_construction() {
-        // Test that various construction techniques produce a working RNG.
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng1 = Isaac64Rng::from_seed(seed);
-        assert_eq!(rng1.next_u64(), 14964555543728284049);
-
-        let mut rng2 = Isaac64Rng::from_rng(rng1).unwrap();
-        assert_eq!(rng2.next_u64(), 919595328260451758);
-    }
-
-    #[test]
-    fn test_isaac64_true_values_64() {
-        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
-                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
-        let mut rng1 = Isaac64Rng::from_seed(seed);
-        let mut results = [0u64; 10];
-        for i in results.iter_mut() { *i = rng1.next_u64(); }
-        let expected = [
-                   15071495833797886820, 7720185633435529318,
-                   10836773366498097981, 5414053799617603544,
-                   12890513357046278984, 17001051845652595546,
-                   9240803642279356310, 12558996012687158051,
-                   14673053937227185542, 1677046725350116783];
-        assert_eq!(results, expected);
-
-        let seed = [57,48,0,0, 0,0,0,0, 50,9,1,0, 0,0,0,0,
-                    49,212,0,0, 0,0,0,0, 148,38,0,0, 0,0,0,0];
-        let mut rng2 = Isaac64Rng::from_seed(seed);
-        // skip forward to the 10000th number
-        for _ in 0..10000 { rng2.next_u64(); }
-
-        for i in results.iter_mut() { *i = rng2.next_u64(); }
-        let expected = [
-            18143823860592706164, 8491801882678285927, 2699425367717515619,
-            17196852593171130876, 2606123525235546165, 15790932315217671084,
-            596345674630742204, 9947027391921273664, 11788097613744130851,
-            10391409374914919106];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac64_true_values_32() {
-        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
-                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
-        let mut rng = Isaac64Rng::from_seed(seed);
-        let mut results = [0u32; 12];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        // Subset of above values, as an LE u32 sequence
-        let expected = [
-                    3477963620, 3509106075,
-                    687845478, 1797495790,
-                    227048253, 2523132918,
-                    4044335064, 1260557630,
-                    4079741768, 3001306521,
-                    69157722, 3958365844];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac64_true_values_mixed() {
-        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
-                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
-        let mut rng = Isaac64Rng::from_seed(seed);
-        // Test alternating between `next_u64` and `next_u32` works as expected.
-        // Values are the same as `test_isaac64_true_values` and
-        // `test_isaac64_true_values_32`.
-        assert_eq!(rng.next_u64(), 15071495833797886820);
-        assert_eq!(rng.next_u32(), 687845478);
-        assert_eq!(rng.next_u32(), 1797495790);
-        assert_eq!(rng.next_u64(), 10836773366498097981);
-        assert_eq!(rng.next_u32(), 4044335064);
-        // Skip one u32
-        assert_eq!(rng.next_u64(), 12890513357046278984);
-        assert_eq!(rng.next_u32(), 69157722);
-    }
-
-    #[test]
-    fn test_isaac64_true_bytes() {
-        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
-                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
-        let mut rng = Isaac64Rng::from_seed(seed);
-        let mut results = [0u8; 32];
-        rng.fill_bytes(&mut results);
-        // Same as first values in test_isaac64_true_values as bytes in LE order
-        let expected = [100, 131, 77, 207, 155, 181, 40, 209,
-                        102, 176, 255, 40, 238, 155, 35, 107,
-                        61, 123, 136, 13, 246, 243, 99, 150,
-                        216, 167, 15, 241, 62, 149, 34, 75];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac64_new_uninitialized() {
-        // Compare the results from initializing `IsaacRng` with
-        // `new_from_u64(0)`, to make sure it is the same as the reference
-        // implementation when used uninitialized.
-        // Note: We only test the first 16 integers, not the full 256 of the
-        // first block.
-        let mut rng = Isaac64Rng::new_from_u64(0);
-        let mut results = [0u64; 16];
-        for i in results.iter_mut() { *i = rng.next_u64(); }
-        let expected: [u64; 16] = [
-            0xF67DFBA498E4937C, 0x84A5066A9204F380, 0xFEE34BD5F5514DBB,
-            0x4D1664739B8F80D6, 0x8607459AB52A14AA, 0x0E78BC5A98529E49,
-            0xFE5332822AD13777, 0x556C27525E33D01A, 0x08643CA615F3149F,
-            0xD0771FAF3CB04714, 0x30E86F68A37B008D, 0x3074EBC0488A3ADF,
-            0x270645EA7A2790BC, 0x5601A0A8D3763C6A, 0x2F83071F53F325DD,
-            0xB9090F3D42D2D2EA];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac64_clone() {
-        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
-                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
-        let mut rng1 = Isaac64Rng::from_seed(seed);
-        let mut rng2 = rng1.clone();
-        for _ in 0..16 {
-            assert_eq!(rng1.next_u64(), rng2.next_u64());
-        }
-    }
-
-    #[test]
-    #[cfg(all(feature="serde1", feature="std"))]
-    fn test_isaac64_serde() {
-        use bincode;
-        use std::io::{BufWriter, BufReader};
-
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng = Isaac64Rng::from_seed(seed);
-
-        let buf: Vec<u8> = Vec::new();
-        let mut buf = BufWriter::new(buf);
-        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
-
-        let buf = buf.into_inner().unwrap();
-        let mut read = BufReader::new(&buf[..]);
-        let mut deserialized: Isaac64Rng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
-
-        for _ in 0..300 { // more than the 256 buffered results
-            assert_eq!(rng.next_u64(), deserialized.next_u64());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/isaac_array.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/isaac_array.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/isaac_array.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/isaac_array.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! ISAAC helper functions for 256-element arrays.
-
-// Terrible workaround because arrays with more than 32 elements do not
-// implement `AsRef`, `Default`, `Serialize`, `Deserialize`, or any other
-// traits for that matter.
-
-#[cfg(feature="serde1")] use serde::{Serialize, Deserialize};
-
-const RAND_SIZE_LEN: usize = 8;
-const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
-
-
-#[derive(Copy, Clone)]
-#[allow(missing_debug_implementations)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct IsaacArray<T> {
-    #[cfg_attr(feature="serde1",serde(with="isaac_array_serde"))]
-    #[cfg_attr(feature="serde1", serde(bound(
-        serialize = "T: Serialize",
-        deserialize = "T: Deserialize<'de> + Copy + Default")))]
-    inner: [T; RAND_SIZE]
-}
-
-impl<T> ::core::convert::AsRef<[T]> for IsaacArray<T> {
-    #[inline(always)]
-    fn as_ref(&self) -> &[T] {
-        &self.inner[..]
-    }
-}
-
-impl<T> ::core::convert::AsMut<[T]> for IsaacArray<T> {
-    #[inline(always)]
-    fn as_mut(&mut self) -> &mut [T] {
-        &mut self.inner[..]
-    }
-}
-
-impl<T> ::core::ops::Deref for IsaacArray<T> {
-    type Target = [T; RAND_SIZE];
-    #[inline(always)]
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl<T> ::core::ops::DerefMut for IsaacArray<T> {
-    #[inline(always)]
-    fn deref_mut(&mut self) -> &mut [T; RAND_SIZE] {
-        &mut self.inner
-    }
-}
-
-impl<T> ::core::default::Default for IsaacArray<T> where T: Copy + Default {
-    fn default() -> IsaacArray<T> {
-        IsaacArray { inner: [T::default(); RAND_SIZE] }
-    }
-}
-
-
-#[cfg(feature="serde1")]
-pub(super) mod isaac_array_serde {
-    const RAND_SIZE_LEN: usize = 8;
-    const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
-
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-    use serde::de::{Visitor,SeqAccess};
-    use serde::de;
-
-    use core::fmt;
-
-    pub fn serialize<T, S>(arr: &[T;RAND_SIZE], ser: S) -> Result<S::Ok, S::Error>
-    where
-        T: Serialize,
-        S: Serializer
-    {
-        use serde::ser::SerializeTuple;
-
-        let mut seq = ser.serialize_tuple(RAND_SIZE)?;
-
-        for e in arr.iter() {
-            seq.serialize_element(&e)?;
-        }
-
-        seq.end()
-    }
-
-    #[inline]
-    pub fn deserialize<'de, T, D>(de: D) -> Result<[T;RAND_SIZE], D::Error>
-    where
-        T: Deserialize<'de>+Default+Copy,
-        D: Deserializer<'de>,
-    {
-        use core::marker::PhantomData;
-        struct ArrayVisitor<T> {
-            _pd: PhantomData<T>,
-        };
-        impl<'de,T> Visitor<'de> for ArrayVisitor<T>
-        where
-            T: Deserialize<'de>+Default+Copy
-        {
-            type Value = [T; RAND_SIZE];
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str("Isaac state array")
-            }
-
-            #[inline]
-            fn visit_seq<A>(self, mut seq: A) -> Result<[T; RAND_SIZE], A::Error>
-            where
-                A: SeqAccess<'de>,
-            {
-                let mut out = [Default::default();RAND_SIZE];
-
-                for i in 0..RAND_SIZE {
-                    match seq.next_element()? {
-                        Some(val) => out[i] = val,
-                        None => return Err(de::Error::invalid_length(i, &self)),
-                    };
-                }
-
-                Ok(out)
-            }
-        }
-
-        de.deserialize_tuple(RAND_SIZE, ArrayVisitor{_pd: PhantomData})
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/isaac.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/isaac.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/isaac.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/isaac.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,486 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The ISAAC random number generator.
-
-use core::{fmt, slice};
-use core::num::Wrapping as w;
-use rand_core::{RngCore, SeedableRng, Error, le};
-use rand_core::block::{BlockRngCore, BlockRng};
-use prng::isaac_array::IsaacArray;
-
-#[allow(non_camel_case_types)]
-type w32 = w<u32>;
-
-const RAND_SIZE_LEN: usize = 8;
-const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
-
-/// A random number generator that uses the ISAAC algorithm.
-///
-/// ISAAC stands for "Indirection, Shift, Accumulate, Add, and Count" which are
-/// the principal bitwise operations employed. It is the most advanced of a
-/// series of array based random number generator designed by Robert Jenkins
-/// in 1996[^1][^2].
-///
-/// ISAAC is notably fast and produces excellent quality random numbers for
-/// non-cryptographic applications.
-///
-/// In spite of being designed with cryptographic security in mind, ISAAC hasn't
-/// been stringently cryptanalyzed and thus cryptographers do not not
-/// consensually trust it to be secure. When looking for a secure RNG, prefer
-/// [`Hc128Rng`] instead, which, like ISAAC, is an array-based RNG and one of
-/// the stream-ciphers selected the by eSTREAM contest.
-///
-/// In 2006 an improvement to ISAAC was suggested by Jean-Philippe Aumasson,
-/// named ISAAC+[^3]. But because the specification is not complete, because
-/// there is no good implementation, and because the suggested bias may not
-/// exist, it is not implemented here.
-///
-/// ## Overview of the ISAAC algorithm:
-/// (in pseudo-code)
-///
-/// ```text
-/// Input: a, b, c, s[256] // state
-/// Output: r[256]         // results
-///
-/// mix(a,i) = a ^ a << 13   if i = 0 mod 4
-///            a ^ a >>  6   if i = 1 mod 4
-///            a ^ a <<  2   if i = 2 mod 4
-///            a ^ a >> 16   if i = 3 mod 4
-///
-/// c = c + 1
-/// b = b + c
-///
-/// for i in 0..256 {
-///     x = s_[i]
-///     a = f(a,i) + s[i+128 mod 256]
-///     y = a + b + s[x>>2 mod 256]
-///     s[i] = y
-///     b = x + s[y>>10 mod 256]
-///     r[i] = b
-/// }
-/// ```
-///
-/// Numbers are generated in blocks of 256. This means the function above only
-/// runs once every 256 times you ask for a next random number. In all other
-/// circumstances the last element of the results array is returned.
-///
-/// ISAAC therefore needs a lot of memory, relative to other non-crypto RNGs.
-/// 2 * 256 * 4 = 2 kb to hold the state and results.
-///
-/// This implementation uses [`BlockRng`] to implement the [`RngCore`] methods.
-///
-/// ## References
-/// [^1]: Bob Jenkins, [*ISAAC: A fast cryptographic random number generator*](
-///       http://burtleburtle.net/bob/rand/isaacafa.html)
-///
-/// [^2]: Bob Jenkins, [*ISAAC and RC4*](
-///       http://burtleburtle.net/bob/rand/isaac.html)
-///
-/// [^3]: Jean-Philippe Aumasson, [*On the pseudo-random generator ISAAC*](
-///       https://eprint.iacr.org/2006/438)
-///
-/// [`Hc128Rng`]: ../hc128/struct.Hc128Rng.html
-/// [`BlockRng`]: ../../../rand_core/block/struct.BlockRng.html
-/// [`RngCore`]: ../../trait.RngCore.html
-#[derive(Clone, Debug)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct IsaacRng(BlockRng<IsaacCore>);
-
-impl RngCore for IsaacRng {
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl SeedableRng for IsaacRng {
-    type Seed = <IsaacCore as SeedableRng>::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        IsaacRng(BlockRng::<IsaacCore>::from_seed(seed))
-    }
-
-    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
-        BlockRng::<IsaacCore>::from_rng(rng).map(|rng| IsaacRng(rng))
-    }
-}
-
-impl IsaacRng {
-    /// Create an ISAAC random number generator using the default
-    /// fixed seed.
-    ///
-    /// DEPRECATED. `IsaacRng::new_from_u64(0)` will produce identical results.
-    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
-    pub fn new_unseeded() -> Self {
-        Self::new_from_u64(0)
-    }
-
-    /// Create an ISAAC random number generator using an `u64` as seed.
-    /// If `seed == 0` this will produce the same stream of random numbers as
-    /// the reference implementation when used unseeded.
-    pub fn new_from_u64(seed: u64) -> Self {
-        IsaacRng(BlockRng::new(IsaacCore::new_from_u64(seed)))
-    }
-}
-
-/// The core of `IsaacRng`, used with `BlockRng`.
-#[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct IsaacCore {
-    #[cfg_attr(feature="serde1",serde(with="super::isaac_array::isaac_array_serde"))]
-    mem: [w32; RAND_SIZE],
-    a: w32,
-    b: w32,
-    c: w32,
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for IsaacCore {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "IsaacCore {{}}")
-    }
-}
-
-impl BlockRngCore for IsaacCore {
-    type Item = u32;
-    type Results = IsaacArray<Self::Item>;
-
-    /// Refills the output buffer, `results`. See also the pseudocode desciption
-    /// of the algorithm in the [`IsaacRng`] documentation.
-    ///
-    /// Optimisations used (similar to the reference implementation):
-    /// 
-    /// - The loop is unrolled 4 times, once for every constant of mix().
-    /// - The contents of the main loop are moved to a function `rngstep`, to
-    ///   reduce code duplication.
-    /// - We use local variables for a and b, which helps with optimisations.
-    /// - We split the main loop in two, one that operates over 0..128 and one
-    ///   over 128..256. This way we can optimise out the addition and modulus
-    ///   from `s[i+128 mod 256]`.
-    /// - We maintain one index `i` and add `m` or `m2` as base (m2 for the
-    ///   `s[i+128 mod 256]`), relying on the optimizer to turn it into pointer
-    ///   arithmetic.
-    /// - We fill `results` backwards. The reference implementation reads values
-    ///   from `results` in reverse. We read them in the normal direction, to
-    ///   make `fill_bytes` a memcopy. To maintain compatibility we fill in
-    ///   reverse.
-    /// 
-    /// [`IsaacRng`]: struct.IsaacRng.html
-    fn generate(&mut self, results: &mut IsaacArray<Self::Item>) {
-        self.c += w(1);
-        // abbreviations
-        let mut a = self.a;
-        let mut b = self.b + self.c;
-        const MIDPOINT: usize = RAND_SIZE / 2;
-
-        #[inline]
-        fn ind(mem:&[w32; RAND_SIZE], v: w32, amount: usize) -> w32 {
-            let index = (v >> amount).0 as usize % RAND_SIZE;
-            mem[index]
-        }
-
-        #[inline]
-        fn rngstep(mem: &mut [w32; RAND_SIZE],
-                   results: &mut [u32; RAND_SIZE],
-                   mix: w32,
-                   a: &mut w32,
-                   b: &mut w32,
-                   base: usize,
-                   m: usize,
-                   m2: usize) {
-            let x = mem[base + m];
-            *a = mix + mem[base + m2];
-            let y = *a + *b + ind(&mem, x, 2);
-            mem[base + m] = y;
-            *b = x + ind(&mem, y, 2 + RAND_SIZE_LEN);
-            results[RAND_SIZE - 1 - base - m] = (*b).0;
-        }
-
-        let mut m = 0;
-        let mut m2 = MIDPOINT;
-        for i in (0..MIDPOINT/4).map(|i| i * 4) {
-            rngstep(&mut self.mem, results, a ^ (a << 13), &mut a, &mut b, i + 0, m, m2);
-            rngstep(&mut self.mem, results, a ^ (a >> 6 ),  &mut a, &mut b, i + 1, m, m2);
-            rngstep(&mut self.mem, results, a ^ (a << 2 ),  &mut a, &mut b, i + 2, m, m2);
-            rngstep(&mut self.mem, results, a ^ (a >> 16),  &mut a, &mut b, i + 3, m, m2);
-        }
-
-        m = MIDPOINT;
-        m2 = 0;
-        for i in (0..MIDPOINT/4).map(|i| i * 4) {
-            rngstep(&mut self.mem, results, a ^ (a << 13), &mut a, &mut b, i + 0, m, m2);
-            rngstep(&mut self.mem, results, a ^ (a >> 6 ),  &mut a, &mut b, i + 1, m, m2);
-            rngstep(&mut self.mem, results, a ^ (a << 2 ),  &mut a, &mut b, i + 2, m, m2);
-            rngstep(&mut self.mem, results, a ^ (a >> 16),  &mut a, &mut b, i + 3, m, m2);
-        }
-
-        self.a = a;
-        self.b = b;
-    }
-}
-
-impl IsaacCore {
-    /// Create a new ISAAC random number generator.
-    ///
-    /// The author Bob Jenkins describes how to best initialize ISAAC here:
-    /// <https://rt.cpan.org/Public/Bug/Display.html?id=64324>
-    /// The answer is included here just in case:
-    ///
-    /// "No, you don't need a full 8192 bits of seed data. Normal key sizes will
-    /// do fine, and they should have their expected strength (eg a 40-bit key
-    /// will take as much time to brute force as 40-bit keys usually will). You
-    /// could fill the remainder with 0, but set the last array element to the
-    /// length of the key provided (to distinguish keys that differ only by
-    /// different amounts of 0 padding). You do still need to call `randinit()`
-    /// to make sure the initial state isn't uniform-looking."
-    /// "After publishing ISAAC, I wanted to limit the key to half the size of
-    /// `r[]`, and repeat it twice. That would have made it hard to provide a
-    /// key that sets the whole internal state to anything convenient. But I'd
-    /// already published it."
-    ///
-    /// And his answer to the question "For my code, would repeating the key
-    /// over and over to fill 256 integers be a better solution than
-    /// zero-filling, or would they essentially be the same?":
-    /// "If the seed is under 32 bytes, they're essentially the same, otherwise
-    /// repeating the seed would be stronger. randinit() takes a chunk of 32
-    /// bytes, mixes it, and combines that with the next 32 bytes, et cetera.
-    /// Then loops over all the elements the same way a second time."
-    #[inline]
-    fn init(mut mem: [w32; RAND_SIZE], rounds: u32) -> Self {
-        fn mix(a: &mut w32, b: &mut w32, c: &mut w32, d: &mut w32,
-               e: &mut w32, f: &mut w32, g: &mut w32, h: &mut w32) {
-            *a ^= *b << 11; *d += *a; *b += *c;
-            *b ^= *c >> 2;  *e += *b; *c += *d;
-            *c ^= *d << 8;  *f += *c; *d += *e;
-            *d ^= *e >> 16; *g += *d; *e += *f;
-            *e ^= *f << 10; *h += *e; *f += *g;
-            *f ^= *g >> 4;  *a += *f; *g += *h;
-            *g ^= *h << 8;  *b += *g; *h += *a;
-            *h ^= *a >> 9;  *c += *h; *a += *b;
-        }
-
-        // These numbers are the result of initializing a...h with the
-        // fractional part of the golden ratio in binary (0x9e3779b9)
-        // and applying mix() 4 times.
-        let mut a = w(0x1367df5a);
-        let mut b = w(0x95d90059);
-        let mut c = w(0xc3163e4b);
-        let mut d = w(0x0f421ad8);
-        let mut e = w(0xd92a4a78);
-        let mut f = w(0xa51a3c49);
-        let mut g = w(0xc4efea1b);
-        let mut h = w(0x30609119);
-
-        // Normally this should do two passes, to make all of the seed effect
-        // all of `mem`
-        for _ in 0..rounds {
-            for i in (0..RAND_SIZE/8).map(|i| i * 8) {
-                a += mem[i  ]; b += mem[i+1];
-                c += mem[i+2]; d += mem[i+3];
-                e += mem[i+4]; f += mem[i+5];
-                g += mem[i+6]; h += mem[i+7];
-                mix(&mut a, &mut b, &mut c, &mut d,
-                    &mut e, &mut f, &mut g, &mut h);
-                mem[i  ] = a; mem[i+1] = b;
-                mem[i+2] = c; mem[i+3] = d;
-                mem[i+4] = e; mem[i+5] = f;
-                mem[i+6] = g; mem[i+7] = h;
-            }
-        }
-
-        Self { mem, a: w(0), b: w(0), c: w(0) }
-    }
-
-    /// Create an ISAAC random number generator using an `u64` as seed.
-    /// If `seed == 0` this will produce the same stream of random numbers as
-    /// the reference implementation when used unseeded.
-    fn new_from_u64(seed: u64) -> Self {
-        let mut key = [w(0); RAND_SIZE];
-        key[0] = w(seed as u32);
-        key[1] = w((seed >> 32) as u32);
-        // Initialize with only one pass.
-        // A second pass does not improve the quality here, because all of the
-        // seed was already available in the first round.
-        // Not doing the second pass has the small advantage that if
-        // `seed == 0` this method produces exactly the same state as the
-        // reference implementation when used unseeded.
-        Self::init(key, 1)
-    }
-}
-
-impl SeedableRng for IsaacCore {
-    type Seed = [u8; 32];
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        let mut seed_u32 = [0u32; 8];
-        le::read_u32_into(&seed, &mut seed_u32);
-        // Convert the seed to `Wrapping<u32>` and zero-extend to `RAND_SIZE`.
-        let mut seed_extended = [w(0); RAND_SIZE];
-        for (x, y) in seed_extended.iter_mut().zip(seed_u32.iter()) {
-            *x = w(*y);
-        }
-        Self::init(seed_extended, 2)
-    }
-
-    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
-        // Custom `from_rng` implementation that fills a seed with the same size
-        // as the entire state.
-        let mut seed = [w(0u32); RAND_SIZE];
-        unsafe {
-            let ptr = seed.as_mut_ptr() as *mut u8;
-
-            let slice = slice::from_raw_parts_mut(ptr, RAND_SIZE * 4);
-            rng.try_fill_bytes(slice)?;
-        }
-        for i in seed.iter_mut() {
-            *i = w(i.0.to_le());
-        }
-
-        Ok(Self::init(seed, 2))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use {RngCore, SeedableRng};
-    use super::IsaacRng;
-
-    #[test]
-    fn test_isaac_construction() {
-        // Test that various construction techniques produce a working RNG.
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng1 = IsaacRng::from_seed(seed);
-        assert_eq!(rng1.next_u32(), 2869442790);
-
-        let mut rng2 = IsaacRng::from_rng(rng1).unwrap();
-        assert_eq!(rng2.next_u32(), 3094074039);
-    }
-
-    #[test]
-    fn test_isaac_true_values_32() {
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng1 = IsaacRng::from_seed(seed);
-        let mut results = [0u32; 10];
-        for i in results.iter_mut() { *i = rng1.next_u32(); }
-        let expected = [
-            2558573138, 873787463, 263499565, 2103644246, 3595684709,
-            4203127393, 264982119, 2765226902, 2737944514, 3900253796];
-        assert_eq!(results, expected);
-
-        let seed = [57,48,0,0, 50,9,1,0, 49,212,0,0, 148,38,0,0,
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng2 = IsaacRng::from_seed(seed);
-        // skip forward to the 10000th number
-        for _ in 0..10000 { rng2.next_u32(); }
-
-        for i in results.iter_mut() { *i = rng2.next_u32(); }
-        let expected = [
-            3676831399, 3183332890, 2834741178, 3854698763, 2717568474,
-            1576568959, 3507990155, 179069555, 141456972, 2478885421];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac_true_values_64() {
-        // As above, using little-endian versions of above values
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                    57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng = IsaacRng::from_seed(seed);
-        let mut results = [0u64; 5];
-        for i in results.iter_mut() { *i = rng.next_u64(); }
-        let expected = [
-            3752888579798383186, 9035083239252078381,18052294697452424037,
-            11876559110374379111, 16751462502657800130];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac_true_bytes() {
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng = IsaacRng::from_seed(seed);
-        let mut results = [0u8; 32];
-        rng.fill_bytes(&mut results);
-        // Same as first values in test_isaac_true_values as bytes in LE order
-        let expected = [82, 186, 128, 152, 71, 240, 20, 52,
-                        45, 175, 180, 15, 86, 16, 99, 125,
-                        101, 203, 81, 214, 97, 162, 134, 250,
-                        103, 78, 203, 15, 150, 3, 210, 164];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac_new_uninitialized() {
-        // Compare the results from initializing `IsaacRng` with
-        // `new_from_u64(0)`, to make sure it is the same as the reference
-        // implementation when used uninitialized.
-        // Note: We only test the first 16 integers, not the full 256 of the
-        // first block.
-        let mut rng = IsaacRng::new_from_u64(0);
-        let mut results = [0u32; 16];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected: [u32; 16] = [
-            0x71D71FD2, 0xB54ADAE7, 0xD4788559, 0xC36129FA,
-            0x21DC1EA9, 0x3CB879CA, 0xD83B237F, 0xFA3CE5BD,
-            0x8D048509, 0xD82E9489, 0xDB452848, 0xCA20E846,
-            0x500F972E, 0x0EEFF940, 0x00D6B993, 0xBC12C17F];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_isaac_clone() {
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng1 = IsaacRng::from_seed(seed);
-        let mut rng2 = rng1.clone();
-        for _ in 0..16 {
-            assert_eq!(rng1.next_u32(), rng2.next_u32());
-        }
-    }
-
-    #[test]
-    #[cfg(all(feature="serde1", feature="std"))]
-    fn test_isaac_serde() {
-        use bincode;
-        use std::io::{BufWriter, BufReader};
-
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng = IsaacRng::from_seed(seed);
-
-        let buf: Vec<u8> = Vec::new();
-        let mut buf = BufWriter::new(buf);
-        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
-
-        let buf = buf.into_inner().unwrap();
-        let mut read = BufReader::new(&buf[..]);
-        let mut deserialized: IsaacRng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
-
-        for _ in 0..300 { // more than the 256 buffered results
-            assert_eq!(rng.next_u32(), deserialized.next_u32());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/mod.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,330 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Pseudo-random number generators.
-//!
-//! Pseudo-random number generators are algorithms to produce apparently random
-//! numbers deterministically, and usually fairly quickly. See the documentation
-//! of the [`rngs` module] for some introduction to PRNGs.
-//!
-//! As mentioned there, PRNGs fall in two broad categories:
-//!
-//! - [basic PRNGs], primarily designed for simulations
-//! - [CSPRNGs], primarily designed for cryptography
-//!
-//! In simple terms, the basic PRNGs are often predictable; CSPRNGs should not
-//! be predictable *when used correctly*.
-//! 
-//! Contents of this documentation:
-//!
-//! 1. [The generators](#the-generators)
-//! 1. [Performance and size](#performance)
-//! 1. [Quality and cycle length](#quality)
-//! 1. [Security](#security)
-//! 1. [Extra features](#extra-features)
-//! 1. [Further reading](#further-reading)
-//!
-//!
-//! # The generators
-//!
-//! ## Basic pseudo-random number generators (PRNGs)
-//!
-//! The goal of regular, non-cryptographic PRNGs is usually to find a good
-//! balance between simplicity, quality, memory usage and performance. These
-//! algorithms are very important to Monte Carlo simulations, and also suitable
-//! for several other problems such as randomized algorithms and games (except
-//! where there is a risk of players predicting the next output value from
-//! previous values, in which case a CSPRNG should be used).
-//!
-//! Currently Rand provides only one PRNG, and not a very good one at that:
-//!
-//! | name | full name | performance | memory | quality | period | features |
-//! |------|-----------|-------------|--------|---------|--------|----------|
-//! | [`XorShiftRng`] | Xorshift 32/128 | ★★★☆☆ | 16 bytes | ★☆☆☆☆ | `u32` * 2<sup>128</sup> - 1 | — |
-//!
-// Quality stars [not rendered in documentation]:
-// 5. reserved for crypto-level (e.g. ChaCha8, ISAAC)
-// 4. good performance on TestU01 and PractRand, good theory
-//    (e.g. PCG, truncated Xorshift*)
-// 3. good performance on TestU01 and PractRand, but "falling through the
-//    cracks" or insufficient theory (e.g. SFC, Xoshiro)
-// 2. imperfect performance on tests or other limiting properties, but not
-//    terrible (e.g. Xoroshiro128+)
-// 1. clear deficiencies in test results, cycle length, theory, or other
-//    properties (e.g. Xorshift)
-//
-// Performance stars [not rendered in documentation]:
-// Meant to give an indication of relative performance. Roughly follows a log
-// scale, based on the performance of `next_u64` on a current i5/i7:
-// - 5. 8000 MB/s+
-// - 4. 4000 MB/s+
-// - 3. 2000 MB/s+
-// - 2. 1000 MB/s+
-// - 1. < 1000 MB/s
-//
-//! ## Cryptographically secure pseudo-random number generators (CSPRNGs)
-//!
-//! CSPRNGs have much higher requirements than basic PRNGs. The primary
-//! consideration is security. Performance and simplicity are also important,
-//! but in general CSPRNGs are more complex and slower than regular PRNGs.
-//! Quality is no longer a concern, as it is a requirement for a
-//! CSPRNG that the output is basically indistinguishable from true randomness
-//! since any bias or correlation makes the output more predictable.
-//!
-//! There is a close relationship between CSPRNGs and cryptographic ciphers.
-//! Any block cipher can be turned into a CSPRNG by encrypting a counter. Stream
-//! ciphers are basically a CSPRNG and a combining operation, usually XOR. This
-//! means that we can easily use any stream cipher as a CSPRNG.
-//!
-//! Rand currently provides two trustworthy CSPRNGs and two CSPRNG-like PRNGs:
-//!
-//! | name | full name |  performance | initialization | memory | predictability | forward secrecy |
-//! |------|-----------|--------------|--------------|----------|----------------|-------------------------|
-//! | [`ChaChaRng`] | ChaCha20 | ★☆☆☆☆ | fast | 136 bytes | secure | no |
-//! | [`Hc128Rng`] | HC-128 | ★★☆☆☆ | slow | 4176 bytes | secure | no |
-//! | [`IsaacRng`] | ISAAC | ★★☆☆☆ | slow | 2072 bytes | unknown | unknown |
-//! | [`Isaac64Rng`] | ISAAC-64 | ★★☆☆☆ | slow | 4136 bytes| unknown | unknown |
-//!
-//! It should be noted that the ISAAC generators are only included for
-//! historical reasons, they have been with the Rust language since the very
-//! beginning. They have good quality output and no attacks are known, but have
-//! received little attention from cryptography experts.
-//!
-//!
-//! # Performance
-//!
-//! First it has to be said most PRNGs are very fast, and will rarely be a
-//! performance bottleneck.
-//!
-//! Performance of basic PRNGs is a bit of a subtle thing. It depends a lot on
-//! the CPU architecture (32 vs. 64 bits), inlining, and also on the number of
-//! available registers. This often causes the performance to be affected by
-//! surrounding code due to inlining and other usage of registers.
-//!
-//! When choosing a PRNG for performance it is important to benchmark your own
-//! application due to interactions between PRNGs and surrounding code and
-//! dependence on the CPU architecture as well as the impact of the size of
-//! data requested. Because of all this, we do not include performance numbers
-//! here but merely a qualitative rating.
-//!
-//! CSPRNGs are a little different in that they typically generate a block of
-//! output in a cache, and pull outputs from the cache. This allows them to have
-//! good amortised performance, and reduces or completely removes the influence
-//! of surrounding code on the CSPRNG performance.
-//!
-//! ### Worst-case performance
-//! Because CSPRNGs usually produce a block of values into a cache, they have
-//! poor worst case performance (in contrast to basic PRNGs, where the
-//! performance is usually quite regular).
-//!
-//! ## State size
-//!
-//! Simple PRNGs often use very little memory, commonly only a few words, where
-//! a *word* is usually either `u32` or `u64`. This is not true for all
-//! non-cryptographic PRNGs however, for example the historically popular
-//! Mersenne Twister MT19937 algorithm requires 2.5 kB of state.
-//!
-//! CSPRNGs typically require more memory; since the seed size is recommended
-//! to be at least 192 bits and some more may be required for the algorithm,
-//! 256 bits would be approximately the minimum secure size. In practice,
-//! CSPRNGs tend to use quite a bit more, [`ChaChaRng`] is relatively small with
-//! 136 bytes of state.
-//! 
-//! ## Initialization time
-//!
-//! The time required to initialize new generators varies significantly. Many
-//! simple PRNGs and even some cryptographic ones (including [`ChaChaRng`])
-//! only need to copy the seed value and some constants into their state, and
-//! thus can be constructed very quickly. In contrast, CSPRNGs with large state
-//! require an expensive key-expansion.
-//!
-//! # Quality
-//!
-//! Many basic PRNGs are not much more than a couple of bitwise and arithmetic
-//! operations. Their simplicity gives good performance, but also means there
-//! are small regularities hidden in the generated random number stream.
-//!
-//! How much do those hidden regularities matter? That is hard to say, and
-//! depends on how the RNG gets used. If there happen to be correlations between
-//! the random numbers and the algorithm they are used in, the results can be
-//! wrong or misleading.
-//!
-//! A random number generator can be considered good if it gives the correct
-//! results in as many applications as possible. The quality of PRNG
-//! algorithms can be evaluated to some extend analytically, to determine the
-//! cycle length and to rule out some correlations. Then there are empirical
-//! test suites designed to test how well a PRNG performs on a wide range of
-//! possible uses, the latest and most complete of which are [TestU01] and
-//! [PractRand].
-//!
-//! CSPRNGs tend to be more complex, and have an explicit requirement to be
-//! unpredictable. This implies there must be no obvious correlations between
-//! output values.
-//!
-//! ### Quality stars:
-//! PRNGs with 3 stars or more should be good enough for any purpose.
-//! 1 or 2 stars may be good enough for typical apps and games, but do not work
-//! well with all algorithms.
-//!
-//! ## Period
-//!
-//! The *period* or *cycle length* of a PRNG is the number of values that can be
-//! generated after which it starts repeating the same random number stream.
-//! Many PRNGs have a fixed-size period, but for some only an expected average
-//! cycle length can be given, where the exact length depends on the seed.
-//!
-//! On today's hardware, even a fast RNG with a cycle length of *only*
-//! 2<sup>64</sup> can be used for centuries before cycling. Yet we recommend a
-//! period of 2<sup>128</sup> or more, which most modern PRNGs satisfy.
-//! Alternatively a PRNG with shorter period but support for multiple streams
-//! may be chosen. There are two reasons for this, as follows.
-//!
-//! If we see the entire period of an RNG as one long random number stream,
-//! every independently seeded RNG returns a slice of that stream. When multiple
-//! RNG are seeded randomly, there is an increasingly large chance to end up
-//! with a partially overlapping slice of the stream.
-//!
-//! If the period of the RNG is 2<sup>128</sup>, and an application consumes
-//! 2<sup>48</sup> values, it then takes about 2<sup>32</sup> random
-//! initializations to have a chance of 1 in a million to repeat part of an
-//! already used stream. This seems good enough for common usage of
-//! non-cryptographic generators, hence the recommendation of at least
-//! 2<sup>128</sup>. As an estimate, the chance of any overlap in a period of
-//! size `p` with `n` independent seeds and `u` values used per seed is
-//! approximately `1 - e^(-u * n^2 / (2 * p))`.
-//!
-//! Further, it is not recommended to use the full period of an RNG. Many
-//! PRNGs have a property called *k-dimensional equidistribution*, meaning that
-//! for values of some size (potentially larger than the output size), all
-//! possible values are produced the same number of times over the generator's
-//! period. This is not a property of true randomness. This is known as the
-//! generalized birthday problem, see the [PCG paper] for a good explanation.
-//! This results in a noticable bias on output after generating more values
-//! than the square root of the period (after 2<sup>64</sup> values for a
-//! period of 2<sup>128</sup>).
-//!
-//!
-//! # Security
-//!
-//! ## Predictability
-//!
-//! From the context of any PRNG, one can ask the question *given some previous
-//! output from the PRNG, is it possible to predict the next output value?*
-//! This is an important property in any situation where there might be an
-//! adversary.
-//!
-//! Regular PRNGs tend to be predictable, although with varying difficulty. In
-//! some cases prediction is trivial, for example plain Xorshift outputs part of
-//! its state without mutation, and prediction is as simple as seeding a new
-//! Xorshift generator from four `u32` outputs. Other generators, like
-//! [PCG](http://www.pcg-random.org/predictability.html) and truncated Xorshift*
-//! are harder to predict, but not outside the realm of common mathematics and a
-//! desktop PC.
-//!
-//! The basic security that CSPRNGs must provide is the infeasibility to predict
-//! output. This requirement is formalized as the [next-bit test]; this is
-//! roughly stated as: given the first *k* bits of a random sequence, the
-//! sequence satisfies the next-bit test if there is no algorithm able to
-//! predict the next bit using reasonable computing power.
-//!
-//! A further security that *some* CSPRNGs provide is forward secrecy:
-//! in the event that the CSPRNGs state is revealed at some point, it must be
-//! infeasible to reconstruct previous states or output. Note that many CSPRNGs
-//! *do not* have forward secrecy in their usual formulations.
-//!
-//! As an outsider it is hard to get a good idea about the security of an
-//! algorithm. People in the field of cryptography spend a lot of effort
-//! analyzing existing designs, and what was once considered good may now turn
-//! out to be weaker. Generally it is best to use algorithms well-analyzed by
-//! experts, such as those recommended by NIST or ECRYPT.
-//!
-//! ## State and seeding
-//!
-//! It is worth noting that a CSPRNG's security relies absolutely on being
-//! seeded with a secure random key. Should the key be known or guessable, all
-//! output of the CSPRNG is easy to guess. This implies that the seed should
-//! come from a trusted source; usually either the OS or another CSPRNG. Our
-//! seeding helper trait, [`FromEntropy`], and the source it uses
-//! ([`EntropyRng`]), should be secure. Additionally, [`ThreadRng`] is a CSPRNG,
-//! thus it is acceptable to seed from this (although for security applications
-//! fresh/external entropy should be preferred).
-//!
-//! Further, it should be obvious that the internal state of a CSPRNG must be
-//! kept secret. With that in mind, our implementations do not provide direct
-//! access to most of their internal state, and `Debug` implementations do not
-//! print any internal state. This does not fully protect CSPRNG state; code
-//! within the same process may read this memory (and we allow cloning and
-//! serialisation of CSPRNGs for convenience). Further, a running process may be
-//! forked by the operating system, which may leave both processes with a copy
-//! of the same generator.
-//!
-//! ## Not a crypto library
-//!
-//! It should be emphasised that this is not a cryptography library; although
-//! Rand does take some measures to provide secure random numbers, it does not
-//! necessarily take all recommended measures. Further, cryptographic processes
-//! such as encryption and authentication are complex and must be implemented
-//! very carefully to avoid flaws and resist known attacks. It is therefore
-//! recommended to use specialized libraries where possible, for example
-//! [openssl], [ring] and the [RustCrypto libraries].
-//!
-//!
-//! # Extra features
-//!
-//! Some PRNGs may provide extra features, like:
-//!
-//! - Support for multiple streams, which can help with parallel tasks.
-//! - The ability to jump or seek around in the random number stream;
-//!   with large periood this can be used as an alternative to streams.
-//!
-//!
-//! # Further reading
-//!
-//! There is quite a lot that can be said about PRNGs. The [PCG paper] is a
-//! very approachable explaining more concepts.
-//!
-//! A good paper about RNG quality is
-//! ["Good random number generators are (not so) easy to find"](
-//! http://random.mat.sbg.ac.at/results/peter/A19final.pdf) by P. Hellekalek.
-//!
-//!
-//! [`rngs` module]: ../rngs/index.html
-//! [basic PRNGs]: #basic-pseudo-random-number-generators-prngs
-//! [CSPRNGs]: #cryptographically-secure-pseudo-random-number-generators-csprngs
-//! [`XorShiftRng`]: struct.XorShiftRng.html
-//! [`ChaChaRng`]: chacha/struct.ChaChaRng.html
-//! [`Hc128Rng`]: hc128/struct.Hc128Rng.html
-//! [`IsaacRng`]: isaac/struct.IsaacRng.html
-//! [`Isaac64Rng`]: isaac64/struct.Isaac64Rng.html
-//! [`ThreadRng`]: ../rngs/struct.ThreadRng.html
-//! [`FromEntropy`]: ../trait.FromEntropy.html
-//! [`EntropyRng`]: ../rngs/struct.EntropyRng.html
-//! [TestU01]: http://simul.iro.umontreal.ca/testu01/tu01.html
-//! [PractRand]: http://pracrand.sourceforge.net/
-//! [PCG paper]: http://www.pcg-random.org/pdf/hmc-cs-2014-0905.pdf
-//! [openssl]: https://crates.io/crates/openssl
-//! [ring]: https://crates.io/crates/ring
-//! [RustCrypto libraries]: https://github.com/RustCrypto
-//! [next-bit test]: https://en.wikipedia.org/wiki/Next-bit_test
-
-
-pub mod chacha;
-pub mod hc128;
-pub mod isaac;
-pub mod isaac64;
-mod xorshift;
-
-mod isaac_array;
-
-pub use self::chacha::ChaChaRng;
-pub use self::hc128::Hc128Rng;
-pub use self::isaac::IsaacRng;
-pub use self::isaac64::Isaac64Rng;
-pub use self::xorshift::XorShiftRng;
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/prng/xorshift.rs cargo-0.33.0/vendor/rand-0.5.5/src/prng/xorshift.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/prng/xorshift.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/prng/xorshift.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Xorshift generators
-
-use core::num::Wrapping as w;
-use core::{fmt, slice};
-use rand_core::{RngCore, SeedableRng, Error, impls, le};
-
-/// An Xorshift random number generator.
-///
-/// The Xorshift[^1] algorithm is not suitable for cryptographic purposes
-/// but is very fast. If you do not know for sure that it fits your
-/// requirements, use a more secure one such as `IsaacRng` or `OsRng`.
-///
-/// [^1]: Marsaglia, George (July 2003).
-///       ["Xorshift RNGs"](https://www.jstatsoft.org/v08/i14/paper).
-///       *Journal of Statistical Software*. Vol. 8 (Issue 14).
-#[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize,Deserialize))]
-pub struct XorShiftRng {
-    x: w<u32>,
-    y: w<u32>,
-    z: w<u32>,
-    w: w<u32>,
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for XorShiftRng {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "XorShiftRng {{}}")
-    }
-}
-
-impl XorShiftRng {
-    /// Creates a new XorShiftRng instance which is not seeded.
-    ///
-    /// The initial values of this RNG are constants, so all generators created
-    /// by this function will yield the same stream of random numbers. It is
-    /// highly recommended that this is created through `SeedableRng` instead of
-    /// this function
-    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
-    pub fn new_unseeded() -> XorShiftRng {
-        XorShiftRng {
-            x: w(0x193a6754),
-            y: w(0xa8a7d469),
-            z: w(0x97830e05),
-            w: w(0x113ba7bb),
-        }
-    }
-}
-
-impl RngCore for XorShiftRng {
-    #[inline]
-    fn next_u32(&mut self) -> u32 {
-        let x = self.x;
-        let t = x ^ (x << 11);
-        self.x = self.y;
-        self.y = self.z;
-        self.z = self.w;
-        let w_ = self.w;
-        self.w = w_ ^ (w_ >> 19) ^ (t ^ (t >> 8));
-        self.w.0
-    }
-
-    #[inline]
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_u32(self)
-    }
-
-    #[inline]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        impls::fill_bytes_via_next(self, dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
-    }
-}
-
-impl SeedableRng for XorShiftRng {
-    type Seed = [u8; 16];
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        let mut seed_u32 = [0u32; 4];
-        le::read_u32_into(&seed, &mut seed_u32);
-
-        // Xorshift cannot be seeded with 0 and we cannot return an Error, but
-        // also do not wish to panic (because a random seed can legitimately be
-        // 0); our only option is therefore to use a preset value.
-        if seed_u32.iter().all(|&x| x == 0) {
-            seed_u32 = [0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED];
-        }
-
-        XorShiftRng {
-            x: w(seed_u32[0]),
-            y: w(seed_u32[1]),
-            z: w(seed_u32[2]),
-            w: w(seed_u32[3]),
-        }
-    }
-
-    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
-        let mut seed_u32 = [0u32; 4];
-        loop {
-            unsafe {
-                let ptr = seed_u32.as_mut_ptr() as *mut u8;
-
-                let slice = slice::from_raw_parts_mut(ptr, 4 * 4);
-                rng.try_fill_bytes(slice)?;
-            }
-            if !seed_u32.iter().all(|&x| x == 0) { break; }
-        }
-
-        Ok(XorShiftRng {
-            x: w(seed_u32[0]),
-            y: w(seed_u32[1]),
-            z: w(seed_u32[2]),
-            w: w(seed_u32[3]),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use {RngCore, SeedableRng};
-    use super::XorShiftRng;
-
-    #[test]
-    fn test_xorshift_construction() {
-        // Test that various construction techniques produce a working RNG.
-        let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
-        let mut rng1 = XorShiftRng::from_seed(seed);
-        assert_eq!(rng1.next_u64(), 4325440999699518727);
-
-        let _rng2 = XorShiftRng::from_rng(rng1).unwrap();
-        // Note: we cannot test the state of _rng2 because from_rng does not
-        // fix Endianness. This is allowed in the trait specification.
-    }
-
-    #[test]
-    fn test_xorshift_true_values() {
-        let seed = [16,15,14,13, 12,11,10,9, 8,7,6,5, 4,3,2,1];
-        let mut rng = XorShiftRng::from_seed(seed);
-
-        let mut results = [0u32; 9];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected: [u32; 9] = [
-            2081028795, 620940381, 269070770, 16943764, 854422573, 29242889,
-            1550291885, 1227154591, 271695242];
-        assert_eq!(results, expected);
-
-        let mut results = [0u64; 9];
-        for i in results.iter_mut() { *i = rng.next_u64(); }
-        let expected: [u64; 9] = [
-            9247529084182843387, 8321512596129439293, 14104136531997710878,
-            6848554330849612046, 343577296533772213, 17828467390962600268,
-            9847333257685787782, 7717352744383350108, 1133407547287910111];
-        assert_eq!(results, expected);
-
-        let mut results = [0u8; 32];
-        rng.fill_bytes(&mut results);
-        let expected = [102, 57, 212, 16, 233, 130, 49, 183,
-                        158, 187, 44, 203, 63, 149, 45, 17,
-                        117, 129, 131, 160, 70, 121, 158, 155,
-                        224, 209, 192, 53, 10, 62, 57, 72];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_xorshift_zero_seed() {
-        // Xorshift does not work with an all zero seed.
-        // Assert it does not panic.
-        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng = XorShiftRng::from_seed(seed);
-        let a = rng.next_u64();
-        let b = rng.next_u64();
-        assert!(a != 0);
-        assert!(b != a);
-    }
-
-    #[test]
-    fn test_xorshift_clone() {
-        let seed = [1,2,3,4, 5,5,7,8, 8,7,6,5, 4,3,2,1];
-        let mut rng1 = XorShiftRng::from_seed(seed);
-        let mut rng2 = rng1.clone();
-        for _ in 0..16 {
-            assert_eq!(rng1.next_u64(), rng2.next_u64());
-        }
-    }
-
-    #[cfg(all(feature="serde1", feature="std"))]
-    #[test]
-    fn test_xorshift_serde() {
-        use bincode;
-        use std::io::{BufWriter, BufReader};
-
-        let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
-        let mut rng = XorShiftRng::from_seed(seed);
-
-        let buf: Vec<u8> = Vec::new();
-        let mut buf = BufWriter::new(buf);
-        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
-
-        let buf = buf.into_inner().unwrap();
-        let mut read = BufReader::new(&buf[..]);
-        let mut deserialized: XorShiftRng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
-
-        assert_eq!(rng.x, deserialized.x);
-        assert_eq!(rng.y, deserialized.y);
-        assert_eq!(rng.z, deserialized.z);
-        assert_eq!(rng.w, deserialized.w);
-
-        for _ in 0..16 {
-            assert_eq!(rng.next_u64(), deserialized.next_u64());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/adapter/mod.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/adapter/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/adapter/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/adapter/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Wrappers / adapters forming RNGs
-
-#[cfg(feature="std")] #[doc(hidden)] pub mod read;
-mod reseeding;
-
-#[cfg(feature="std")] pub use self::read::ReadRng;
-pub use self::reseeding::ReseedingRng;
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/adapter/read.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/adapter/read.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/adapter/read.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/adapter/read.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A wrapper around any Read to treat it as an RNG.
-
-use std::io::Read;
-
-use rand_core::{RngCore, Error, ErrorKind, impls};
-
-
-/// An RNG that reads random bytes straight from any type supporting
-/// `std::io::Read`, for example files.
-///
-/// This will work best with an infinite reader, but that is not required.
-///
-/// This can be used with `/dev/urandom` on Unix but it is recommended to use
-/// [`OsRng`] instead.
-///
-/// # Panics
-///
-/// `ReadRng` uses `std::io::read_exact`, which retries on interrupts. All other
-/// errors from the underlying reader, including when it does not have enough
-/// data, will only be reported through [`try_fill_bytes`]. The other
-/// [`RngCore`] methods will panic in case of an error.
-///
-/// # Example
-///
-/// ```
-/// use rand::{read, Rng};
-///
-/// let data = vec![1, 2, 3, 4, 5, 6, 7, 8];
-/// let mut rng = read::ReadRng::new(&data[..]);
-/// println!("{:x}", rng.gen::<u32>());
-/// ```
-///
-/// [`OsRng`]: ../struct.OsRng.html
-/// [`RngCore`]: ../../trait.RngCore.html
-/// [`try_fill_bytes`]: ../../trait.RngCore.html#method.tymethod.try_fill_bytes
-#[derive(Debug)]
-pub struct ReadRng<R> {
-    reader: R
-}
-
-impl<R: Read> ReadRng<R> {
-    /// Create a new `ReadRng` from a `Read`.
-    pub fn new(r: R) -> ReadRng<R> {
-        ReadRng {
-            reader: r
-        }
-    }
-}
-
-impl<R: Read> RngCore for ReadRng<R> {
-    fn next_u32(&mut self) -> u32 {
-        impls::next_u32_via_fill(self)
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_fill(self)
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.try_fill_bytes(dest).unwrap_or_else(|err|
-                panic!("reading random bytes from Read implementation failed; error: {}", err));
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        if dest.len() == 0 { return Ok(()); }
-        // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
-        self.reader.read_exact(dest).map_err(|err| {
-            match err.kind() {
-                ::std::io::ErrorKind::UnexpectedEof => Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "not enough bytes available, reached end of source", err),
-                _ => Error::with_cause(ErrorKind::Unavailable,
-                    "error reading from Read source", err)
-            }
-        })
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::ReadRng;
-    use {RngCore, ErrorKind};
-
-    #[test]
-    fn test_reader_rng_u64() {
-        // transmute from the target to avoid endianness concerns.
-        let v = vec![0u8, 0, 0, 0, 0, 0, 0, 1,
-                     0  , 0, 0, 0, 0, 0, 0, 2,
-                     0,   0, 0, 0, 0, 0, 0, 3];
-        let mut rng = ReadRng::new(&v[..]);
-
-        assert_eq!(rng.next_u64(), 1_u64.to_be());
-        assert_eq!(rng.next_u64(), 2_u64.to_be());
-        assert_eq!(rng.next_u64(), 3_u64.to_be());
-    }
-
-    #[test]
-    fn test_reader_rng_u32() {
-        let v = vec![0u8, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3];
-        let mut rng = ReadRng::new(&v[..]);
-
-        assert_eq!(rng.next_u32(), 1_u32.to_be());
-        assert_eq!(rng.next_u32(), 2_u32.to_be());
-        assert_eq!(rng.next_u32(), 3_u32.to_be());
-    }
-
-    #[test]
-    fn test_reader_rng_fill_bytes() {
-        let v = [1u8, 2, 3, 4, 5, 6, 7, 8];
-        let mut w = [0u8; 8];
-
-        let mut rng = ReadRng::new(&v[..]);
-        rng.fill_bytes(&mut w);
-
-        assert!(v == w);
-    }
-
-    #[test]
-    fn test_reader_rng_insufficient_bytes() {
-        let v = [1u8, 2, 3, 4, 5, 6, 7, 8];
-        let mut w = [0u8; 9];
-
-        let mut rng = ReadRng::new(&v[..]);
-
-        assert!(rng.try_fill_bytes(&mut w).err().unwrap().kind == ErrorKind::Unavailable);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/adapter/reseeding.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/adapter/reseeding.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/adapter/reseeding.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/adapter/reseeding.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A wrapper around another PRNG that reseeds it after it
-//! generates a certain number of random bytes.
-
-use core::mem::size_of;
-
-use rand_core::{RngCore, CryptoRng, SeedableRng, Error, ErrorKind};
-use rand_core::block::{BlockRngCore, BlockRng};
-
-/// A wrapper around any PRNG which reseeds the underlying PRNG after it has
-/// generated a certain number of random bytes.
-///
-/// When the RNG gets cloned, the clone is reseeded on first use.
-///
-/// Reseeding is never strictly *necessary*. Cryptographic PRNGs don't have a
-/// limited number of bytes they can output, or at least not a limit reachable
-/// in any practical way. There is no such thing as 'running out of entropy'.
-///
-/// Some small non-cryptographic PRNGs can have very small periods, for
-/// example less than 2<sup>64</sup>. Would reseeding help to ensure that you do
-/// not wrap around at the end of the period? A period of 2<sup>64</sup> still
-/// takes several centuries of CPU-years on current hardware. Reseeding will
-/// actually make things worse, because the reseeded PRNG will just continue
-/// somewhere else *in the same period*, with a high chance of overlapping with
-/// previously used parts of it.
-///
-/// # When should you use `ReseedingRng`?
-///
-/// - Reseeding can be seen as some form of 'security in depth'. Even if in the
-///   future a cryptographic weakness is found in the CSPRNG being used,
-///   occasionally reseeding should make exploiting it much more difficult or
-///   even impossible.
-/// - It can be used as a poor man's cryptography (not recommended, just use a
-///   good CSPRNG). Previous implementations of `thread_rng` for example used
-///   `ReseedingRng` with the ISAAC RNG. That algorithm, although apparently
-///   strong and with no known attack, does not come with any proof of security
-///   and does not meet the current standards for a cryptographically secure
-///   PRNG. By reseeding it frequently (every 32 kiB) it seems safe to assume
-///   there is no attack that can operate on the tiny window between reseeds.
-///
-/// # Error handling
-///
-/// Although extremely unlikely, reseeding the wrapped PRNG can fail.
-/// `ReseedingRng` will never panic but try to handle the error intelligently
-/// through some combination of retrying and delaying reseeding until later.
-/// If handling the source error fails `ReseedingRng` will continue generating
-/// data from the wrapped PRNG without reseeding.
-#[derive(Debug)]
-pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
-where R: BlockRngCore + SeedableRng,
-      Rsdr: RngCore;
-
-impl<R, Rsdr> ReseedingRng<R, Rsdr>
-where R: BlockRngCore + SeedableRng,
-      Rsdr: RngCore
-{
-    /// Create a new `ReseedingRng` with the given parameters.
-    ///
-    /// # Arguments
-    ///
-    /// * `rng`: the random number generator to use.
-    /// * `threshold`: the number of generated bytes after which to reseed the RNG.
-    /// * `reseeder`: the RNG to use for reseeding.
-    pub fn new(rng: R, threshold: u64, reseeder: Rsdr) -> Self {
-        ReseedingRng(BlockRng::new(ReseedingCore::new(rng, threshold, reseeder)))
-    }
-
-    /// Reseed the internal PRNG.
-    pub fn reseed(&mut self) -> Result<(), Error> {
-        self.0.core.reseed()
-    }
-}
-
-// TODO: this should be implemented for any type where the inner type
-// implements RngCore, but we can't specify that because ReseedingCore is private
-impl<R, Rsdr: RngCore> RngCore for ReseedingRng<R, Rsdr>
-where R: BlockRngCore<Item = u32> + SeedableRng,
-    <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>
-{
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl<R, Rsdr> Clone for ReseedingRng<R, Rsdr>
-where R: BlockRngCore + SeedableRng + Clone,
-      Rsdr: RngCore + Clone
-{
-    fn clone(&self) -> ReseedingRng<R, Rsdr> {
-        // Recreating `BlockRng` seems easier than cloning it and resetting
-        // the index.
-        ReseedingRng(BlockRng::new(self.0.core.clone()))
-    }
-}
-
-impl<R, Rsdr> CryptoRng for ReseedingRng<R, Rsdr>
-where R: BlockRngCore + SeedableRng + CryptoRng,
-      Rsdr: RngCore + CryptoRng {}
-
-#[derive(Debug)]
-struct ReseedingCore<R, Rsdr> {
-    inner: R,
-    reseeder: Rsdr,
-    threshold: i64,
-    bytes_until_reseed: i64,
-}
-
-impl<R, Rsdr> BlockRngCore for ReseedingCore<R, Rsdr>
-where R: BlockRngCore + SeedableRng,
-      Rsdr: RngCore
-{
-    type Item = <R as BlockRngCore>::Item;
-    type Results = <R as BlockRngCore>::Results;
-
-    fn generate(&mut self, results: &mut Self::Results) {
-        if self.bytes_until_reseed <= 0 {
-            // We get better performance by not calling only `auto_reseed` here
-            // and continuing with the rest of the function, but by directly
-            // returning from a non-inlined function.
-            return self.reseed_and_generate(results);
-        }
-        let num_bytes = results.as_ref().len() * size_of::<Self::Item>();
-        self.bytes_until_reseed -= num_bytes as i64;
-        self.inner.generate(results);
-    }
-}
-
-impl<R, Rsdr> ReseedingCore<R, Rsdr>
-where R: BlockRngCore + SeedableRng,
-      Rsdr: RngCore
-{
-    /// Create a new `ReseedingCore` with the given parameters.
-    ///
-    /// # Arguments
-    ///
-    /// * `rng`: the random number generator to use.
-    /// * `threshold`: the number of generated bytes after which to reseed the RNG.
-    /// * `reseeder`: the RNG to use for reseeding.
-    pub fn new(rng: R, threshold: u64, reseeder: Rsdr) -> Self {
-        assert!(threshold <= ::core::i64::MAX as u64);
-        ReseedingCore {
-            inner: rng,
-            reseeder,
-            threshold: threshold as i64,
-            bytes_until_reseed: threshold as i64,
-        }
-    }
-
-    /// Reseed the internal PRNG.
-    fn reseed(&mut self) -> Result<(), Error> {
-        R::from_rng(&mut self.reseeder).map(|result| {
-            self.bytes_until_reseed = self.threshold;
-            self.inner = result
-        })
-    }
-
-    #[inline(never)]
-    fn reseed_and_generate(&mut self,
-                           results: &mut <Self as BlockRngCore>::Results)
-    {
-        trace!("Reseeding RNG after {} generated bytes",
-               self.threshold - self.bytes_until_reseed);
-        let threshold = if let Err(e) = self.reseed()  {
-            let delay = match e.kind {
-                ErrorKind::Transient => 0,
-                kind @ _ if kind.should_retry() => self.threshold >> 8,
-                _ => self.threshold,
-            };
-            warn!("Reseeding RNG delayed reseeding by {} bytes due to \
-                    error from source: {}", delay, e);
-            delay
-        } else {
-            self.threshold
-        };
-        
-        let num_bytes = results.as_ref().len() * size_of::<<R as BlockRngCore>::Item>();
-        self.bytes_until_reseed = threshold - num_bytes as i64;
-        self.inner.generate(results);
-    }
-}
-
-impl<R, Rsdr> Clone for ReseedingCore<R, Rsdr>
-where R: BlockRngCore + SeedableRng + Clone,
-      Rsdr: RngCore + Clone
-{
-    fn clone(&self) -> ReseedingCore<R, Rsdr> {
-        ReseedingCore {
-            inner: self.inner.clone(),
-            reseeder: self.reseeder.clone(),
-            threshold: self.threshold,
-            bytes_until_reseed: 0, // reseed clone on first use
-        }
-    }
-}
-
-impl<R, Rsdr> CryptoRng for ReseedingCore<R, Rsdr>
-where R: BlockRngCore + SeedableRng + CryptoRng,
-      Rsdr: RngCore + CryptoRng {}
-
-#[cfg(test)]
-mod test {
-    use {Rng, SeedableRng};
-    use prng::chacha::ChaChaCore;
-    use rngs::mock::StepRng;
-    use super::ReseedingRng;
-
-    #[test]
-    fn test_reseeding() {
-        let mut zero = StepRng::new(0, 0);
-        let rng = ChaChaCore::from_rng(&mut zero).unwrap();
-        let mut reseeding = ReseedingRng::new(rng, 32*4, zero);
-
-        // Currently we only support for arrays up to length 32.
-        // TODO: cannot generate seq via Rng::gen because it uses different alg
-        let mut buf = [0u32; 32]; // Needs to be a multiple of the RNGs result
-                                  // size to test exactly.
-        reseeding.fill(&mut buf);
-        let seq = buf;
-        for _ in 0..10 {
-            reseeding.fill(&mut buf);
-            assert_eq!(buf, seq);
-        }
-    }
-
-    #[test]
-    fn test_clone_reseeding() {
-        let mut zero = StepRng::new(0, 0);
-        let rng = ChaChaCore::from_rng(&mut zero).unwrap();
-        let mut rng1 = ReseedingRng::new(rng, 32*4, zero);
-
-        let first: u32 = rng1.gen();
-        for _ in 0..10 { let _ = rng1.gen::<u32>(); }
-
-        let mut rng2 = rng1.clone();
-        assert_eq!(first, rng2.gen::<u32>());
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/entropy.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/entropy.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/entropy.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/entropy.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,296 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Entropy generator, or wrapper around external generators
-
-use rand_core::{RngCore, CryptoRng, Error, ErrorKind, impls};
-#[allow(unused)]
-use rngs;
-
-/// An interface returning random data from external source(s), provided
-/// specifically for securely seeding algorithmic generators (PRNGs).
-///
-/// Where possible, `EntropyRng` retrieves random data from the operating
-/// system's interface for random numbers ([`OsRng`]); if that fails it will
-/// fall back to the [`JitterRng`] entropy collector. In the latter case it will
-/// still try to use [`OsRng`] on the next usage.
-///
-/// If no secure source of entropy is available `EntropyRng` will panic on use;
-/// i.e. it should never output predictable data.
-/// 
-/// This is either a little slow ([`OsRng`] requires a system call) or extremely
-/// slow ([`JitterRng`] must use significant CPU time to generate sufficient
-/// jitter); for better performance it is common to seed a local PRNG from
-/// external entropy then primarily use the local PRNG ([`thread_rng`] is
-/// provided as a convenient, local, automatically-seeded CSPRNG).
-///
-/// # Panics
-///
-/// On most systems, like Windows, Linux, macOS and *BSD on common hardware, it
-/// is highly unlikely for both [`OsRng`] and [`JitterRng`] to fail. But on
-/// combinations like webassembly without Emscripten or stdweb both sources are
-/// unavailable. If both sources fail, only [`try_fill_bytes`] is able to
-/// report the error, and only the one from `OsRng`. The other [`RngCore`]
-/// methods will panic in case of an error.
-///
-/// [`OsRng`]: struct.OsRng.html
-/// [`JitterRng`]: jitter/struct.JitterRng.html
-/// [`thread_rng`]: ../fn.thread_rng.html
-/// [`RngCore`]: ../trait.RngCore.html
-/// [`try_fill_bytes`]: ../trait.RngCore.html#method.tymethod.try_fill_bytes
-#[derive(Debug)]
-pub struct EntropyRng {
-    source: Source,
-}
-
-#[derive(Debug)]
-enum Source {
-    Os(Os),
-    Custom(Custom),
-    Jitter(Jitter),
-    None,
-}
-
-impl EntropyRng {
-    /// Create a new `EntropyRng`.
-    ///
-    /// This method will do no system calls or other initialization routines,
-    /// those are done on first use. This is done to make `new` infallible,
-    /// and `try_fill_bytes` the only place to report errors.
-    pub fn new() -> Self {
-        EntropyRng { source: Source::None }
-    }
-}
-
-impl Default for EntropyRng {
-    fn default() -> Self {
-        EntropyRng::new()
-    }
-}
-
-impl RngCore for EntropyRng {
-    fn next_u32(&mut self) -> u32 {
-        impls::next_u32_via_fill(self)
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_fill(self)
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.try_fill_bytes(dest).unwrap_or_else(|err|
-                panic!("all entropy sources failed; first error: {}", err))
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        let mut reported_error = None;
-
-        if let Source::Os(ref mut os_rng) = self.source {
-            match os_rng.fill(dest) {
-                Ok(()) => return Ok(()),
-                Err(err) => {
-                    warn!("EntropyRng: OsRng failed \
-                          [trying other entropy sources]: {}", err);
-                    reported_error = Some(err);
-                },
-            }
-        } else if Os::is_supported() {
-            match Os::new_and_fill(dest) {
-                Ok(os_rng) => {
-                    debug!("EntropyRng: using OsRng");
-                    self.source = Source::Os(os_rng);
-                    return Ok(());
-                },
-                Err(err) => { reported_error = reported_error.or(Some(err)) },
-            }
-        }
-
-        if let Source::Custom(ref mut rng) = self.source {
-            match rng.fill(dest) {
-                Ok(()) => return Ok(()),
-                Err(err) => {
-                    warn!("EntropyRng: custom entropy source failed \
-                          [trying other entropy sources]: {}", err);
-                    reported_error = Some(err);
-                },
-            }
-        } else if Custom::is_supported() {
-            match Custom::new_and_fill(dest) {
-                Ok(custom) => {
-                    debug!("EntropyRng: using custom entropy source");
-                    self.source = Source::Custom(custom);
-                    return Ok(());
-                },
-                Err(err) => { reported_error = reported_error.or(Some(err)) },
-            }
-        }
-
-        if let Source::Jitter(ref mut jitter_rng) = self.source {
-            match jitter_rng.fill(dest) {
-                Ok(()) => return Ok(()),
-                Err(err) => {
-                    warn!("EntropyRng: JitterRng failed: {}", err);
-                    reported_error = Some(err);
-                },
-            }
-        } else if Jitter::is_supported() {
-            match Jitter::new_and_fill(dest) {
-                Ok(jitter_rng) => {
-                    debug!("EntropyRng: using JitterRng");
-                    self.source = Source::Jitter(jitter_rng);
-                    return Ok(());
-                },
-                Err(err) => { reported_error = reported_error.or(Some(err)) },
-            }
-        }
-
-        if let Some(err) = reported_error {
-            Err(Error::with_cause(ErrorKind::Unavailable,
-                                  "All entropy sources failed",
-                                  err))
-        } else {
-            Err(Error::new(ErrorKind::Unavailable,
-                           "No entropy sources available"))
-        }
-    }
-}
-
-impl CryptoRng for EntropyRng {}
-
-
-
-trait EntropySource {
-    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error>
-        where Self: Sized;
-
-    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error>;
-
-    fn is_supported() -> bool { true }
-}
-
-#[allow(unused)]
-#[derive(Clone, Debug)]
-struct NoSource;
-
-#[allow(unused)]
-impl EntropySource for NoSource {
-    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
-        Err(Error::new(ErrorKind::Unavailable, "Source not supported"))
-    }
-
-    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        unreachable!()
-    }
-
-    fn is_supported() -> bool { false }
-}
-
-
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb")
-)))]
-#[derive(Clone, Debug)]
-pub struct Os(rngs::OsRng);
-
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb")
-)))]
-impl EntropySource for Os {
-    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
-        let mut rng = rngs::OsRng::new()?;
-        rng.try_fill_bytes(dest)?;
-        Ok(Os(rng))
-    }
-
-    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-#[cfg(not(all(feature="std",
-              any(target_os = "linux", target_os = "android",
-                  target_os = "netbsd",
-                  target_os = "dragonfly",
-                  target_os = "haiku",
-                  target_os = "emscripten",
-                  target_os = "solaris",
-                  target_os = "cloudabi",
-                  target_os = "macos", target_os = "ios",
-                  target_os = "freebsd",
-                  target_os = "openbsd", target_os = "bitrig",
-                  target_os = "redox",
-                  target_os = "fuchsia",
-                  windows,
-                  all(target_arch = "wasm32", feature = "stdweb")
-))))]
-type Os = NoSource;
-
-
-type Custom = NoSource;
-
-
-#[cfg(not(target_arch = "wasm32"))]
-#[derive(Clone, Debug)]
-pub struct Jitter(rngs::JitterRng);
-
-#[cfg(not(target_arch = "wasm32"))]
-impl EntropySource for Jitter {
-    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
-        let mut rng = rngs::JitterRng::new()?;
-        rng.try_fill_bytes(dest)?;
-        Ok(Jitter(rng))
-    }
-
-    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-type Jitter = NoSource;
-
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_entropy() {
-        let mut rng = EntropyRng::new();
-        let n = (rng.next_u32() ^ rng.next_u32()).count_ones();
-        assert!(n >= 2);    // p(failure) approx 1e-7
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/jitter.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/jitter.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/jitter.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/jitter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,887 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-//
-// Based on jitterentropy-library, http://www.chronox.de/jent.html.
-// Copyright Stephan Mueller <smueller@chronox.de>, 2014 - 2017.
-//
-// With permission from Stephan Mueller to relicense the Rust translation under
-// the MIT license.
-
-//! Non-physical true random number generator based on timing jitter.
-
-// Note: the C implementation of `Jitterentropy` relies on being compiled
-// without optimizations. This implementation goes through lengths to make the
-// compiler not optimize out code which does influence timing jitter, but is
-// technically dead code.
-
-use rand_core::{RngCore, CryptoRng, Error, ErrorKind, impls};
-
-use core::{fmt, mem, ptr};
-#[cfg(all(feature="std", not(target_arch = "wasm32")))]
-use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
-
-const MEMORY_BLOCKS: usize = 64;
-const MEMORY_BLOCKSIZE: usize = 32;
-const MEMORY_SIZE: usize = MEMORY_BLOCKS * MEMORY_BLOCKSIZE;
-
-/// A true random number generator based on jitter in the CPU execution time,
-/// and jitter in memory access time.
-///
-/// This is a true random number generator, as opposed to pseudo-random
-/// generators. Random numbers generated by `JitterRng` can be seen as fresh
-/// entropy. A consequence is that is orders of magnitude slower than [`OsRng`]
-/// and PRNGs (about 10<sup>3</sup>..10<sup>6</sup> slower).
-///
-/// There are very few situations where using this RNG is appropriate. Only very
-/// few applications require true entropy. A normal PRNG can be statistically
-/// indistinguishable, and a cryptographic PRNG should also be as impossible to
-/// predict.
-///
-/// Use of `JitterRng` is recommended for initializing cryptographic PRNGs when
-/// [`OsRng`] is not available.
-///
-/// `JitterRng` can be used without the standard library, but not conveniently,
-/// you must provide a high-precision timer and carefully have to follow the
-/// instructions of [`new_with_timer`].
-///
-/// This implementation is based on
-/// [Jitterentropy](http://www.chronox.de/jent.html) version 2.1.0.
-///
-/// Note: There is no accurate timer available on Wasm platforms, to help
-/// prevent fingerprinting or timing side-channel attacks. Therefore
-/// [`JitterRng::new()`] is not available on Wasm.
-///
-/// # Quality testing
-///
-/// [`JitterRng::new()`] has build-in, but limited, quality testing, however
-/// before using `JitterRng` on untested hardware, or after changes that could
-/// effect how the code is optimized (such as a new LLVM version), it is
-/// recommend to run the much more stringent
-/// [NIST SP 800-90B Entropy Estimation Suite](
-/// https://github.com/usnistgov/SP800-90B_EntropyAssessment).
-///
-/// Use the following code using [`timer_stats`] to collect the data:
-///
-/// ```no_run
-/// use rand::jitter::JitterRng;
-/// #
-/// # use std::error::Error;
-/// # use std::fs::File;
-/// # use std::io::Write;
-/// #
-/// # fn try_main() -> Result<(), Box<Error>> {
-/// let mut rng = JitterRng::new()?;
-///
-/// // 1_000_000 results are required for the
-/// // NIST SP 800-90B Entropy Estimation Suite
-/// const ROUNDS: usize = 1_000_000;
-/// let mut deltas_variable: Vec<u8> = Vec::with_capacity(ROUNDS);
-/// let mut deltas_minimal: Vec<u8> = Vec::with_capacity(ROUNDS);
-///
-/// for _ in 0..ROUNDS {
-///     deltas_variable.push(rng.timer_stats(true) as u8);
-///     deltas_minimal.push(rng.timer_stats(false) as u8);
-/// }
-///
-/// // Write out after the statistics collection loop, to not disturb the
-/// // test results.
-/// File::create("jitter_rng_var.bin")?.write(&deltas_variable)?;
-/// File::create("jitter_rng_min.bin")?.write(&deltas_minimal)?;
-/// #
-/// # Ok(())
-/// # }
-/// #
-/// # fn main() {
-/// #     try_main().unwrap();
-/// # }
-/// ```
-///
-/// This will produce two files: `jitter_rng_var.bin` and `jitter_rng_min.bin`.
-/// Run the Entropy Estimation Suite in three configurations, as outlined below.
-/// Every run has two steps. One step to produce an estimation, another to
-/// validate the estimation.
-///
-/// 1. Estimate the expected amount of entropy that is at least available with
-///    each round of the entropy collector. This number should be greater than
-///    the amount estimated with `64 / test_timer()`.
-///    ```sh
-///    python noniid_main.py -v jitter_rng_var.bin 8
-///    restart.py -v jitter_rng_var.bin 8 <min-entropy>
-///    ```
-/// 2. Estimate the expected amount of entropy that is available in the last 4
-///    bits of the timer delta after running noice sources. Note that a value of
-///    `3.70` is the minimum estimated entropy for true randomness.
-///    ```sh
-///    python noniid_main.py -v -u 4 jitter_rng_var.bin 4
-///    restart.py -v -u 4 jitter_rng_var.bin 4 <min-entropy>
-///    ```
-/// 3. Estimate the expected amount of entropy that is available to the entropy
-///    collector if both noice sources only run their minimal number of times.
-///    This measures the absolute worst-case, and gives a lower bound for the
-///    available entropy.
-///    ```sh
-///    python noniid_main.py -v -u 4 jitter_rng_min.bin 4
-///    restart.py -v -u 4 jitter_rng_min.bin 4 <min-entropy>
-///    ```
-///
-/// [`OsRng`]: struct.OsRng.html
-/// [`JitterRng::new()`]: struct.JitterRng.html#method.new
-/// [`new_with_timer`]: struct.JitterRng.html#method.new_with_timer
-/// [`timer_stats`]: struct.JitterRng.html#method.timer_stats
-pub struct JitterRng {
-    data: u64, // Actual random number
-    // Number of rounds to run the entropy collector per 64 bits
-    rounds: u8,
-    // Timer used by `measure_jitter`
-    timer: fn() -> u64,
-    // Memory for the Memory Access noise source
-    mem_prev_index: u16,
-    // Make `next_u32` not waste 32 bits
-    data_half_used: bool,
-}
-
-// Note: `JitterRng` maintains a small 64-bit entropy pool. With every
-// `generate` 64 new bits should be integrated in the pool. If a round of
-// `generate` were to collect less than the expected 64 bit, then the returned
-// value, and the new state of the entropy pool, would be in some way related to
-// the initial state. It is therefore better if the initial state of the entropy
-// pool is different on each call to `generate`. This has a few implications:
-// - `generate` should be called once before using `JitterRng` to produce the
-//   first usable value (this is done by default in `new`);
-// - We do not zero the entropy pool after generating a result. The reference
-//   implementation also does not support zeroing, but recommends generating a
-//   new value without using it if you want to protect a previously generated
-//   'secret' value from someone inspecting the memory;
-// - Implementing `Clone` seems acceptable, as it would not cause the systematic
-//   bias a constant might cause. Only instead of one value that could be
-//   potentially related to the same initial state, there are now two.
-
-// Entropy collector state.
-// These values are not necessary to preserve across runs.
-struct EcState {
-    // Previous time stamp to determine the timer delta
-    prev_time: u64,
-    // Deltas used for the stuck test
-    last_delta: i32,
-    last_delta2: i32,
-    // Memory for the Memory Access noise source
-    mem: [u8; MEMORY_SIZE],
-}
-
-impl EcState {
-    // Stuck test by checking the:
-    // - 1st derivation of the jitter measurement (time delta)
-    // - 2nd derivation of the jitter measurement (delta of time deltas)
-    // - 3rd derivation of the jitter measurement (delta of delta of time
-    //   deltas)
-    //
-    // All values must always be non-zero.
-    // This test is a heuristic to see whether the last measurement holds
-    // entropy.
-    fn stuck(&mut self, current_delta: i32) -> bool {
-        let delta2 = self.last_delta - current_delta;
-        let delta3 = delta2 - self.last_delta2;
-
-        self.last_delta = current_delta;
-        self.last_delta2 = delta2;
-
-        current_delta == 0 || delta2 == 0 || delta3 == 0
-    }
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for JitterRng {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "JitterRng {{}}")
-    }
-}
-
-impl Clone for JitterRng {
-    fn clone(&self) -> JitterRng {
-        JitterRng {
-            data: self.data,
-            rounds: self.rounds,
-            timer: self.timer,
-            mem_prev_index: self.mem_prev_index,
-            // The 32 bits that may still be unused from the previous round are
-            // for the original to use, not for the clone.
-            data_half_used: false,
-        }
-    }
-}
-
-/// An error that can occur when [`JitterRng::test_timer`] fails.
-///
-/// [`JitterRng::test_timer`]: struct.JitterRng.html#method.test_timer
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum TimerError {
-    /// No timer available.
-    NoTimer,
-    /// Timer too coarse to use as an entropy source.
-    CoarseTimer,
-    /// Timer is not monotonically increasing.
-    NotMonotonic,
-    /// Variations of deltas of time too small.
-    TinyVariantions,
-    /// Too many stuck results (indicating no added entropy).
-    TooManyStuck,
-    #[doc(hidden)]
-    __Nonexhaustive,
-}
-
-impl TimerError {
-    fn description(&self) -> &'static str {
-        match *self {
-            TimerError::NoTimer => "no timer available",
-            TimerError::CoarseTimer => "coarse timer",
-            TimerError::NotMonotonic => "timer not monotonic",
-            TimerError::TinyVariantions => "time delta variations too small",
-            TimerError::TooManyStuck => "too many stuck results",
-            TimerError::__Nonexhaustive => unreachable!(),
-        }
-    }
-}
-
-impl fmt::Display for TimerError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.description())
-    }
-}
-
-#[cfg(feature="std")]
-impl ::std::error::Error for TimerError {
-    fn description(&self) -> &str {
-        self.description()
-    }
-}
-
-impl From<TimerError> for Error {
-    fn from(err: TimerError) -> Error {
-        // Timer check is already quite permissive of failures so we don't
-        // expect false-positive failures, i.e. any error is irrecoverable.
-        Error::with_cause(ErrorKind::Unavailable,
-                              "timer jitter failed basic quality tests", err)
-    }
-}
-
-// Initialise to zero; must be positive
-#[cfg(all(feature="std", not(target_arch = "wasm32")))]
-static JITTER_ROUNDS: AtomicUsize = ATOMIC_USIZE_INIT;
-
-impl JitterRng {
-    /// Create a new `JitterRng`. Makes use of `std::time` for a timer, or a
-    /// platform-specific function with higher accuracy if necessary and
-    /// available.
-    ///
-    /// During initialization CPU execution timing jitter is measured a few
-    /// hundred times. If this does not pass basic quality tests, an error is
-    /// returned. The test result is cached to make subsequent calls faster.
-    #[cfg(all(feature="std", not(target_arch = "wasm32")))]
-    pub fn new() -> Result<JitterRng, TimerError> {
-        let mut state = JitterRng::new_with_timer(platform::get_nstime);
-        let mut rounds = JITTER_ROUNDS.load(Ordering::Relaxed) as u8;
-        if rounds == 0 {
-            // No result yet: run test.
-            // This allows the timer test to run multiple times; we don't care.
-            rounds = state.test_timer()?;
-            JITTER_ROUNDS.store(rounds as usize, Ordering::Relaxed);
-            info!("JitterRng: using {} rounds per u64 output", rounds);
-        }
-        state.set_rounds(rounds);
-
-        // Fill `data` with a non-zero value.
-        state.gen_entropy();
-        Ok(state)
-    }
-
-    /// Create a new `JitterRng`.
-    /// A custom timer can be supplied, making it possible to use `JitterRng` in
-    /// `no_std` environments.
-    ///
-    /// The timer must have nanosecond precision.
-    ///
-    /// This method is more low-level than `new()`. It is the responsibility of
-    /// the caller to run [`test_timer`] before using any numbers generated with
-    /// `JitterRng`, and optionally call [`set_rounds`]. Also it is important to
-    /// consume at least one `u64` before using the first result to initialize
-    /// the entropy collection pool.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # use rand::{Rng, Error};
-    /// use rand::jitter::JitterRng;
-    ///
-    /// # fn try_inner() -> Result<(), Error> {
-    /// fn get_nstime() -> u64 {
-    ///     use std::time::{SystemTime, UNIX_EPOCH};
-    ///
-    ///     let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
-    ///     // The correct way to calculate the current time is
-    ///     // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
-    ///     // But this is faster, and the difference in terms of entropy is
-    ///     // negligible (log2(10^9) == 29.9).
-    ///     dur.as_secs() << 30 | dur.subsec_nanos() as u64
-    /// }
-    ///
-    /// let mut rng = JitterRng::new_with_timer(get_nstime);
-    /// let rounds = rng.test_timer()?;
-    /// rng.set_rounds(rounds); // optional
-    /// let _ = rng.gen::<u64>();
-    ///
-    /// // Ready for use
-    /// let v: u64 = rng.gen();
-    /// # Ok(())
-    /// # }
-    ///
-    /// # let _ = try_inner();
-    /// ```
-    ///
-    /// [`test_timer`]: struct.JitterRng.html#method.test_timer
-    /// [`set_rounds`]: struct.JitterRng.html#method.set_rounds
-    pub fn new_with_timer(timer: fn() -> u64) -> JitterRng {
-        JitterRng {
-            data: 0,
-            rounds: 64,
-            timer,
-            mem_prev_index: 0,
-            data_half_used: false,
-        }
-    }
-
-    /// Configures how many rounds are used to generate each 64-bit value.
-    /// This must be greater than zero, and has a big impact on performance
-    /// and output quality.
-    ///
-    /// [`new_with_timer`] conservatively uses 64 rounds, but often less rounds
-    /// can be used. The `test_timer()` function returns the minimum number of
-    /// rounds required for full strength (platform dependent), so one may use
-    /// `rng.set_rounds(rng.test_timer()?);` or cache the value.
-    ///
-    /// [`new_with_timer`]: struct.JitterRng.html#method.new_with_timer
-    pub fn set_rounds(&mut self, rounds: u8) {
-        assert!(rounds > 0);
-        self.rounds = rounds;
-    }
-
-    // Calculate a random loop count used for the next round of an entropy
-    // collection, based on bits from a fresh value from the timer.
-    //
-    // The timer is folded to produce a number that contains at most `n_bits`
-    // bits.
-    //
-    // Note: A constant should be added to the resulting random loop count to
-    // prevent loops that run 0 times.
-    #[inline(never)]
-    fn random_loop_cnt(&mut self, n_bits: u32) -> u32 {
-        let mut rounds = 0;
-
-        let mut time = (self.timer)();
-        // Mix with the current state of the random number balance the random
-        // loop counter a bit more.
-        time ^= self.data;
-
-        // We fold the time value as much as possible to ensure that as many
-        // bits of the time stamp are included as possible.
-        let folds = (64 + n_bits - 1) / n_bits;
-        let mask = (1 << n_bits) - 1;
-        for _ in 0..folds {
-            rounds ^= time & mask;
-            time >>= n_bits;
-        }
-
-        rounds as u32
-    }
-
-    // CPU jitter noise source
-    // Noise source based on the CPU execution time jitter
-    //
-    // This function injects the individual bits of the time value into the
-    // entropy pool using an LFSR.
-    //
-    // The code is deliberately inefficient with respect to the bit shifting.
-    // This function not only acts as folding operation, but this function's
-    // execution is used to measure the CPU execution time jitter. Any change to
-    // the loop in this function implies that careful retesting must be done.
-    #[inline(never)]
-    fn lfsr_time(&mut self, time: u64, var_rounds: bool) {
-        fn lfsr(mut data: u64, time: u64) -> u64{
-            for i in 1..65 {
-                let mut tmp = time << (64 - i);
-                tmp >>= 64 - 1;
-
-                // Fibonacci LSFR with polynomial of
-                // x^64 + x^61 + x^56 + x^31 + x^28 + x^23 + 1 which is
-                // primitive according to
-                // http://poincare.matf.bg.ac.rs/~ezivkovm/publications/primpol1.pdf
-                // (the shift values are the polynomial values minus one
-                // due to counting bits from 0 to 63). As the current
-                // position is always the LSB, the polynomial only needs
-                // to shift data in from the left without wrap.
-                data ^= tmp;
-                data ^= (data >> 63) & 1;
-                data ^= (data >> 60) & 1;
-                data ^= (data >> 55) & 1;
-                data ^= (data >> 30) & 1;
-                data ^= (data >> 27) & 1;
-                data ^= (data >> 22) & 1;
-                data = data.rotate_left(1);
-            }
-            data
-        }
-
-        // Note: in the reference implementation only the last round effects
-        // `self.data`, all the other results are ignored. To make sure the
-        // other rounds are not optimised out, we first run all but the last
-        // round on a throw-away value instead of the real `self.data`.
-        let mut lfsr_loop_cnt = 0;
-        if var_rounds { lfsr_loop_cnt = self.random_loop_cnt(4) };
-
-        let mut throw_away: u64 = 0;
-        for _ in 0..lfsr_loop_cnt {
-            throw_away = lfsr(throw_away, time);
-        }
-        black_box(throw_away);
-
-        self.data = lfsr(self.data, time);
-    }
-
-    // Memory Access noise source
-    // This is a noise source based on variations in memory access times
-    //
-    // This function performs memory accesses which will add to the timing
-    // variations due to an unknown amount of CPU wait states that need to be
-    // added when accessing memory. The memory size should be larger than the L1
-    // caches as outlined in the documentation and the associated testing.
-    //
-    // The L1 cache has a very high bandwidth, albeit its access rate is usually
-    // slower than accessing CPU registers. Therefore, L1 accesses only add
-    // minimal variations as the CPU has hardly to wait. Starting with L2,
-    // significant variations are added because L2 typically does not belong to
-    // the CPU any more and therefore a wider range of CPU wait states is
-    // necessary for accesses. L3 and real memory accesses have even a wider
-    // range of wait states. However, to reliably access either L3 or memory,
-    // the `self.mem` memory must be quite large which is usually not desirable.
-    #[inline(never)]
-    fn memaccess(&mut self, mem: &mut [u8; MEMORY_SIZE], var_rounds: bool) {
-        let mut acc_loop_cnt = 128;
-        if var_rounds { acc_loop_cnt += self.random_loop_cnt(4) };
-
-        let mut index = self.mem_prev_index as usize;
-        for _ in 0..acc_loop_cnt {
-            // Addition of memblocksize - 1 to index with wrap around logic to
-            // ensure that every memory location is hit evenly.
-            // The modulus also allows the compiler to remove the indexing
-            // bounds check.
-            index = (index + MEMORY_BLOCKSIZE - 1) % MEMORY_SIZE;
-
-            // memory access: just add 1 to one byte
-            // memory access implies read from and write to memory location
-            mem[index] = mem[index].wrapping_add(1);
-        }
-        self.mem_prev_index = index as u16;
-    }
-
-    // This is the heart of the entropy generation: calculate time deltas and
-    // use the CPU jitter in the time deltas. The jitter is injected into the
-    // entropy pool.
-    //
-    // Ensure that `ec.prev_time` is primed before using the output of this
-    // function. This can be done by calling this function and not using its
-    // result.
-    fn measure_jitter(&mut self, ec: &mut EcState) -> Option<()> {
-        // Invoke one noise source before time measurement to add variations
-        self.memaccess(&mut ec.mem, true);
-
-        // Get time stamp and calculate time delta to previous
-        // invocation to measure the timing variations
-        let time = (self.timer)();
-        // Note: wrapping_sub combined with a cast to `i64` generates a correct
-        // delta, even in the unlikely case this is a timer that is not strictly
-        // monotonic.
-        let current_delta = time.wrapping_sub(ec.prev_time) as i64 as i32;
-        ec.prev_time = time;
-
-        // Call the next noise source which also injects the data
-        self.lfsr_time(current_delta as u64, true);
-
-        // Check whether we have a stuck measurement (i.e. does the last
-        // measurement holds entropy?).
-        if ec.stuck(current_delta) { return None };
-
-        // Rotate the data buffer by a prime number (any odd number would
-        // do) to ensure that every bit position of the input time stamp
-        // has an even chance of being merged with a bit position in the
-        // entropy pool. We do not use one here as the adjacent bits in
-        // successive time deltas may have some form of dependency. The
-        // chosen value of 7 implies that the low 7 bits of the next
-        // time delta value is concatenated with the current time delta.
-        self.data = self.data.rotate_left(7);
-
-        Some(())
-    }
-
-    // Shuffle the pool a bit by mixing some value with a bijective function
-    // (XOR) into the pool.
-    //
-    // The function generates a mixer value that depends on the bits set and
-    // the location of the set bits in the random number generated by the
-    // entropy source. Therefore, based on the generated random number, this
-    // mixer value can have 2^64 different values. That mixer value is
-    // initialized with the first two SHA-1 constants. After obtaining the
-    // mixer value, it is XORed into the random number.
-    //
-    // The mixer value is not assumed to contain any entropy. But due to the
-    // XOR operation, it can also not destroy any entropy present in the
-    // entropy pool.
-    #[inline(never)]
-    fn stir_pool(&mut self) {
-        // This constant is derived from the first two 32 bit initialization
-        // vectors of SHA-1 as defined in FIPS 180-4 section 5.3.1
-        // The order does not really matter as we do not rely on the specific
-        // numbers. We just pick the SHA-1 constants as they have a good mix of
-        // bit set and unset.
-        const CONSTANT: u64 = 0x67452301efcdab89;
-
-        // The start value of the mixer variable is derived from the third
-        // and fourth 32 bit initialization vector of SHA-1 as defined in
-        // FIPS 180-4 section 5.3.1
-        let mut mixer = 0x98badcfe10325476;
-
-        // This is a constant time function to prevent leaking timing
-        // information about the random number.
-        // The normal code is:
-        // ```
-        // for i in 0..64 {
-        //     if ((self.data >> i) & 1) == 1 { mixer ^= CONSTANT; }
-        // }
-        // ```
-        // This is a bit fragile, as LLVM really wants to use branches here, and
-        // we rely on it to not recognise the opportunity.
-        for i in 0..64 {
-            let apply = (self.data >> i) & 1;
-            let mask = !apply.wrapping_sub(1);
-            mixer ^= CONSTANT & mask;
-            mixer = mixer.rotate_left(1);
-        }
-
-        self.data ^= mixer;
-    }
-
-    fn gen_entropy(&mut self) -> u64 {
-        trace!("JitterRng: collecting entropy");
-
-        // Prime `ec.prev_time`, and run the noice sources to make sure the
-        // first loop round collects the expected entropy.
-        let mut ec = EcState {
-            prev_time: (self.timer)(),
-            last_delta: 0,
-            last_delta2: 0,
-            mem: [0; MEMORY_SIZE],
-        };
-        let _ = self.measure_jitter(&mut ec);
-
-        for _ in 0..self.rounds {
-            // If a stuck measurement is received, repeat measurement
-            // Note: we do not guard against an infinite loop, that would mean
-            // the timer suddenly became broken.
-            while self.measure_jitter(&mut ec).is_none() {}
-        }
-
-        // Do a single read from `self.mem` to make sure the Memory Access noise
-        // source is not optimised out.
-        black_box(ec.mem[0]);
-
-        self.stir_pool();
-        self.data
-    }
-    
-    /// Basic quality tests on the timer, by measuring CPU timing jitter a few
-    /// hundred times.
-    ///
-    /// If succesful, this will return the estimated number of rounds necessary
-    /// to collect 64 bits of entropy. Otherwise a [`TimerError`] with the cause
-    /// of the failure will be returned.
-    ///
-    /// [`TimerError`]: enum.TimerError.html
-    pub fn test_timer(&mut self) -> Result<u8, TimerError> {
-        debug!("JitterRng: testing timer ...");
-        // We could add a check for system capabilities such as `clock_getres`
-        // or check for `CONFIG_X86_TSC`, but it does not make much sense as the
-        // following sanity checks verify that we have a high-resolution timer.
-
-        let mut delta_sum = 0;
-        let mut old_delta = 0;
-
-        let mut time_backwards = 0;
-        let mut count_mod = 0;
-        let mut count_stuck = 0;
-
-        let mut ec = EcState {
-            prev_time: (self.timer)(),
-            last_delta: 0,
-            last_delta2: 0,
-            mem: [0; MEMORY_SIZE],
-        };
-
-        // TESTLOOPCOUNT needs some loops to identify edge systems.
-        // 100 is definitely too little.
-        const TESTLOOPCOUNT: u64 = 300;
-        const CLEARCACHE: u64 = 100;
-
-        for i in 0..(CLEARCACHE + TESTLOOPCOUNT) {
-            // Measure time delta of core entropy collection logic
-            let time = (self.timer)();
-            self.memaccess(&mut ec.mem, true);
-            self.lfsr_time(time, true);
-            let time2 = (self.timer)();
-
-            // Test whether timer works
-            if time == 0 || time2 == 0 {
-                return Err(TimerError::NoTimer);
-            }
-            let delta = time2.wrapping_sub(time) as i64 as i32;
-
-            // Test whether timer is fine grained enough to provide delta even
-            // when called shortly after each other -- this implies that we also
-            // have a high resolution timer
-            if delta == 0 {
-                return Err(TimerError::CoarseTimer);
-            }
-
-            // Up to here we did not modify any variable that will be
-            // evaluated later, but we already performed some work. Thus we
-            // already have had an impact on the caches, branch prediction,
-            // etc. with the goal to clear it to get the worst case
-            // measurements.
-            if i < CLEARCACHE { continue; }
-
-            if ec.stuck(delta) { count_stuck += 1; }
-
-            // Test whether we have an increasing timer.
-            if !(time2 > time) { time_backwards += 1; }
-
-            // Count the number of times the counter increases in steps of 100ns
-            // or greater.
-            if (delta % 100) == 0 { count_mod += 1; }
-
-            // Ensure that we have a varying delta timer which is necessary for
-            // the calculation of entropy -- perform this check only after the
-            // first loop is executed as we need to prime the old_delta value
-            delta_sum += (delta - old_delta).abs() as u64;
-            old_delta = delta;
-        }
-
-        // Do a single read from `self.mem` to make sure the Memory Access noise
-        // source is not optimised out.
-        black_box(ec.mem[0]);
-
-        // We allow the time to run backwards for up to three times.
-        // This can happen if the clock is being adjusted by NTP operations.
-        // If such an operation just happens to interfere with our test, it
-        // should not fail. The value of 3 should cover the NTP case being
-        // performed during our test run.
-        if time_backwards > 3 {
-            return Err(TimerError::NotMonotonic);
-        }
-
-        // Test that the available amount of entropy per round does not get to
-        // low. We expect 1 bit of entropy per round as a reasonable minimum
-        // (although less is possible, it means the collector loop has to run
-        // much more often).
-        // `assert!(delta_average >= log2(1))`
-        // `assert!(delta_sum / TESTLOOPCOUNT >= 1)`
-        // `assert!(delta_sum >= TESTLOOPCOUNT)`
-        if delta_sum < TESTLOOPCOUNT {
-            return Err(TimerError::TinyVariantions);
-        }
-
-        // Ensure that we have variations in the time stamp below 100 for at
-        // least 10% of all checks -- on some platforms, the counter increments
-        // in multiples of 100, but not always
-        if count_mod > (TESTLOOPCOUNT * 9 / 10) {
-            return Err(TimerError::CoarseTimer);
-        }
-
-        // If we have more than 90% stuck results, then this Jitter RNG is
-        // likely to not work well.
-        if count_stuck > (TESTLOOPCOUNT * 9 / 10) {
-            return Err(TimerError::TooManyStuck);
-        }
-
-        // Estimate the number of `measure_jitter` rounds necessary for 64 bits
-        // of entropy.
-        //
-        // We don't try very hard to come up with a good estimate of the
-        // available bits of entropy per round here for two reasons:
-        // 1. Simple estimates of the available bits (like Shannon entropy) are
-        //    too optimistic.
-        // 2. Unless we want to waste a lot of time during intialization, there
-        //    only a small number of samples are available.
-        //
-        // Therefore we use a very simple and conservative estimate:
-        // `let bits_of_entropy = log2(delta_average) / 2`.
-        //
-        // The number of rounds `measure_jitter` should run to collect 64 bits
-        // of entropy is `64 / bits_of_entropy`.
-        let delta_average = delta_sum / TESTLOOPCOUNT;
-
-        if delta_average >= 16 {
-            let log2 = 64 - delta_average.leading_zeros();
-            // Do something similar to roundup(64/(log2/2)):
-            Ok( ((64u32 * 2 + log2 - 1) / log2) as u8)
-        } else {
-            // For values < 16 the rounding error becomes too large, use a
-            // lookup table.
-            // Values 0 and 1 are invalid, and filtered out by the
-            // `delta_sum < TESTLOOPCOUNT` test above.
-            let log2_lookup = [0,  0, 128, 81, 64, 56, 50, 46,
-                               43, 41, 39, 38, 36, 35, 34, 33];
-            Ok(log2_lookup[delta_average as usize])
-        }
-    }
-
-    /// Statistical test: return the timer delta of one normal run of the
-    /// `JitterRng` entropy collector.
-    ///
-    /// Setting `var_rounds` to `true` will execute the memory access and the
-    /// CPU jitter noice sources a variable amount of times (just like a real
-    /// `JitterRng` round).
-    ///
-    /// Setting `var_rounds` to `false` will execute the noice sources the
-    /// minimal number of times. This can be used to measure the minimum amount
-    /// of entropy one round of the entropy collector can collect in the worst
-    /// case.
-    ///
-    /// See [Quality testing](struct.JitterRng.html#quality-testing) on how to
-    /// use `timer_stats` to test the quality of `JitterRng`.
-    pub fn timer_stats(&mut self, var_rounds: bool) -> i64 {
-        let mut mem = [0; MEMORY_SIZE];
-
-        let time = (self.timer)();
-        self.memaccess(&mut mem, var_rounds);
-        self.lfsr_time(time, var_rounds);
-        let time2 = (self.timer)();
-        time2.wrapping_sub(time) as i64
-    }
-}
-
-#[cfg(feature="std")]
-mod platform {
-    #[cfg(not(any(target_os = "macos", target_os = "ios",
-                  target_os = "windows",
-                  target_arch = "wasm32")))]
-    pub fn get_nstime() -> u64 {
-        use std::time::{SystemTime, UNIX_EPOCH};
-
-        let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
-        // The correct way to calculate the current time is
-        // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
-        // But this is faster, and the difference in terms of entropy is
-        // negligible (log2(10^9) == 29.9).
-        dur.as_secs() << 30 | dur.subsec_nanos() as u64
-    }
-
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
-    pub fn get_nstime() -> u64 {
-        extern crate libc;
-        // On Mac OS and iOS std::time::SystemTime only has 1000ns resolution.
-        // We use `mach_absolute_time` instead. This provides a CPU dependent
-        // unit, to get real nanoseconds the result should by multiplied by
-        // numer/denom from `mach_timebase_info`.
-        // But we are not interested in the exact nanoseconds, just entropy. So
-        // we use the raw result.
-        unsafe { libc::mach_absolute_time() }
-    }
-
-    #[cfg(target_os = "windows")]
-    pub fn get_nstime() -> u64 {
-        extern crate winapi;
-        unsafe {
-            let mut t = super::mem::zeroed();
-            winapi::um::profileapi::QueryPerformanceCounter(&mut t);
-            *t.QuadPart() as u64
-        }
-    }
-}
-
-// A function that is opaque to the optimizer to assist in avoiding dead-code
-// elimination. Taken from `bencher`.
-fn black_box<T>(dummy: T) -> T {
-    unsafe {
-        let ret = ptr::read_volatile(&dummy);
-        mem::forget(dummy);
-        ret
-    }
-}
-
-impl RngCore for JitterRng {
-    fn next_u32(&mut self) -> u32 {
-        // We want to use both parts of the generated entropy
-        if self.data_half_used {
-            self.data_half_used = false;
-            (self.data >> 32) as u32
-        } else {
-            self.data = self.next_u64();
-            self.data_half_used = true;
-            self.data as u32
-        }
-    }
-
-    fn next_u64(&mut self) -> u64 {
-       self.data_half_used = false;
-       self.gen_entropy()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        // Fill using `next_u32`. This is faster for filling small slices (four
-        // bytes or less), while the overhead is negligible.
-        //
-        // This is done especially for wrappers that implement `next_u32`
-        // themselves via `fill_bytes`.
-        impls::fill_bytes_via_next(self, dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
-    }
-}
-
-impl CryptoRng for JitterRng {}
-
-#[cfg(test)]
-mod test_jitter_init {
-    use jitter::JitterRng;
-
-    #[cfg(all(feature="std", not(target_arch = "wasm32")))]
-    #[test]
-    fn test_jitter_init() {
-        use RngCore;
-        // Because this is a debug build, measurements here are not representive
-        // of the final release build.
-        // Don't fail this test if initializing `JitterRng` fails because of a
-        // bad timer (the timer from the standard library may not have enough
-        // accuracy on all platforms).
-        match JitterRng::new() {
-            Ok(ref mut rng) => {
-                // false positives are possible, but extremely unlikely
-                assert!(rng.next_u32() | rng.next_u32() != 0);
-            },
-            Err(_) => {},
-        }
-    }
-
-    #[test]
-    fn test_jitter_bad_timer() {
-        fn bad_timer() -> u64 { 0 }
-        let mut rng = JitterRng::new_with_timer(bad_timer);
-        assert!(rng.test_timer().is_err());
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/mock.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/mock.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/mock.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/mock.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Mock random number generator
-
-use rand_core::{RngCore, Error, impls};
-
-/// A simple implementation of `RngCore` for testing purposes.
-/// 
-/// This generates an arithmetic sequence (i.e. adds a constant each step)
-/// over a `u64` number, using wrapping arithmetic. If the increment is 0
-/// the generator yields a constant.
-/// 
-/// ```
-/// use rand::Rng;
-/// use rand::rngs::mock::StepRng;
-/// 
-/// let mut my_rng = StepRng::new(2, 1);
-/// let sample: [u64; 3] = my_rng.gen();
-/// assert_eq!(sample, [2, 3, 4]);
-/// ```
-#[derive(Debug, Clone)]
-pub struct StepRng {
-    v: u64,
-    a: u64,
-}
-
-impl StepRng {
-    /// Create a `StepRng`, yielding an arithmetic sequence starting with
-    /// `initial` and incremented by `increment` each time.
-    pub fn new(initial: u64, increment: u64) -> Self {
-        StepRng { v: initial, a: increment }
-    }
-}
-
-impl RngCore for StepRng {
-    fn next_u32(&mut self) -> u32 {
-        self.next_u64() as u32
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        let result = self.v;
-        self.v = self.v.wrapping_add(self.a);
-        result
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        impls::fill_bytes_via_next(self, dest);
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/mod.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Random number generators and adapters for common usage:
-//!
-//! - [`ThreadRng`], a fast, secure, auto-seeded thread-local generator
-//! - [`StdRng`] and [`SmallRng`], algorithms to cover typical usage
-//! - [`EntropyRng`], [`OsRng`] and [`JitterRng`] as entropy sources
-//! - [`mock::StepRng`] as a simple counter for tests
-//! - [`adapter::ReadRng`] to read from a file/stream
-//!
-//! # Background — Random number generators (RNGs)
-//!
-//! Computers are inherently deterministic, so to get *random* numbers one
-//! either has to use a hardware generator or collect bits of *entropy* from
-//! various sources (e.g. event timestamps, or jitter). This is a relatively
-//! slow and complicated operation.
-//!
-//! Generally the operating system will collect some entropy, remove bias, and
-//! use that to seed its own PRNG; [`OsRng`] provides an interface to this.
-//! [`JitterRng`] is an entropy collector included with Rand that measures
-//! jitter in the CPU execution time, and jitter in memory access time.
-//! [`EntropyRng`] is a wrapper that uses the best entropy source that is
-//! available.
-//!
-//! ## Pseudo-random number generators
-//!
-//! What is commonly used instead of "true" random number renerators, are
-//! *pseudo-random number generators* (PRNGs), deterministic algorithms that
-//! produce an infinite stream of pseudo-random numbers from a small random
-//! seed. PRNGs are faster, and have better provable properties. The numbers
-//! produced can be statistically of very high quality and can be impossible to
-//! predict. (They can also have obvious correlations and be trivial to predict;
-//! quality varies.)
-//!
-//! There are two different types of PRNGs: those developed for simulations
-//! and statistics, and those developed for use in cryptography; the latter are
-//! called Cryptographically Secure PRNGs (CSPRNG or CPRNG). Both types can
-//! have good statistical quality but the latter also have to be impossible to
-//! predict, even after seeing many previous output values. Rand provides a good
-//! default algorithm from each class:
-//!
-//! - [`SmallRng`] is a PRNG chosen for low memory usage, high performance and
-//!   good statistical quality.
-//!   The current algorithm (plain Xorshift) unfortunately performs
-//!   poorly in statistical quality test suites (TestU01 and PractRand) and will
-//!   be replaced in the next major release.
-//! - [`StdRng`] is a CSPRNG chosen for good performance and trust of security
-//!   (based on reviews, maturity and usage). The current algorithm is HC-128,
-//!   which is one of the recommendations by ECRYPT's eSTREAM project.
-//!
-//! The above PRNGs do not cover all use-cases; more algorithms can be found in
-//! the [`prng` module], as well as in several other crates. For example, you
-//! may wish a CSPRNG with significantly lower memory usage than [`StdRng`]
-//! while being less concerned about performance, in which case [`ChaChaRng`]
-//! is a good choice.
-//!
-//! One complexity is that the internal state of a PRNG must change with every
-//! generated number. For APIs this generally means a mutable reference to the
-//! state of the PRNG has to be passed around.
-//!
-//! A solution is [`ThreadRng`]. This is a thread-local implementation of
-//! [`StdRng`] with automatic seeding on first use. It is the best choice if you
-//! "just" want a convenient, secure, fast random number source. Use via the
-//! [`thread_rng`] function, which gets a reference to the current thread's
-//! local instance.
-//!
-//! ## Seeding
-//!
-//! As mentioned above, PRNGs require a random seed in order to produce random
-//! output. This is especially important for CSPRNGs, which are still
-//! deterministic algorithms, thus can only be secure if their seed value is
-//! also secure. To seed a PRNG, use one of:
-//!
-//! - [`FromEntropy::from_entropy`]; this is the most convenient way to seed
-//!   with fresh, secure random data.
-//! - [`SeedableRng::from_rng`]; this allows seeding from another PRNG or
-//!   from an entropy source such as [`EntropyRng`].
-//! - [`SeedableRng::from_seed`]; this is mostly useful if you wish to be able
-//!   to reproduce the output sequence by using a fixed seed. (Don't use
-//!   [`StdRng`] or [`SmallRng`] in this case since different algorithms may be
-//!   used by future versions of Rand; use an algorithm from the
-//!   [`prng` module].)
-//!
-//! ## Conclusion
-//!
-//! - [`thread_rng`] is what you often want to use.
-//! - If you want more control, flexibility, or better performance, use
-//!   [`StdRng`], [`SmallRng`] or an algorithm from the [`prng` module].
-//! - Use [`FromEntropy::from_entropy`] to seed new PRNGs.
-//! - If you need reproducibility, use [`SeedableRng::from_seed`] combined with
-//!   a named PRNG.
-//!
-//! More information and notes on cryptographic security can be found
-//! in the [`prng` module].
-//!
-//! ## Examples
-//!
-//! Examples of seeding PRNGs:
-//!
-//! ```
-//! use rand::prelude::*;
-//! # use rand::Error;
-//!
-//! // StdRng seeded securely by the OS or local entropy collector:
-//! let mut rng = StdRng::from_entropy();
-//! # let v: u32 = rng.gen();
-//!
-//! // SmallRng seeded from thread_rng:
-//! # fn try_inner() -> Result<(), Error> {
-//! let mut rng = SmallRng::from_rng(thread_rng())?;
-//! # let v: u32 = rng.gen();
-//! # Ok(())
-//! # }
-//! # try_inner().unwrap();
-//!
-//! // SmallRng seeded by a constant, for deterministic results:
-//! let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16]; // byte array
-//! let mut rng = SmallRng::from_seed(seed);
-//! # let v: u32 = rng.gen();
-//! ```
-//!
-//!
-//! # Implementing custom RNGs
-//!
-//! If you want to implement custom RNG, see the [`rand_core`] crate. The RNG
-//! will have to implement the [`RngCore`] trait, where the [`Rng`] trait is
-//! build on top of.
-//!
-//! If the RNG needs seeding, also implement the [`SeedableRng`] trait.
-//!
-//! [`CryptoRng`] is a marker trait cryptographically secure PRNGs can
-//! implement.
-//!
-//!
-// This module:
-//! [`ThreadRng`]: struct.ThreadRng.html
-//! [`StdRng`]: struct.StdRng.html
-//! [`SmallRng`]: struct.SmallRng.html
-//! [`EntropyRng`]: struct.EntropyRng.html
-//! [`OsRng`]: struct.OsRng.html
-//! [`JitterRng`]: struct.JitterRng.html
-// Other traits and functions:
-//! [`rand_core`]: https://crates.io/crates/rand_core
-//! [`prng` module]: ../prng/index.html
-//! [`CryptoRng`]: ../trait.CryptoRng.html
-//! [`FromEntropy`]: ../trait.FromEntropy.html
-//! [`FromEntropy::from_entropy`]: ../trait.FromEntropy.html#tymethod.from_entropy
-//! [`RngCore`]: ../trait.RngCore.html
-//! [`Rng`]: ../trait.Rng.html
-//! [`SeedableRng`]: ../trait.SeedableRng.html
-//! [`SeedableRng::from_rng`]: ../trait.SeedableRng.html#tymethod.from_rng
-//! [`SeedableRng::from_seed`]: ../trait.SeedableRng.html#tymethod.from_seed
-//! [`thread_rng`]: ../fn.thread_rng.html
-//! [`mock::StepRng`]: mock/struct.StepRng.html
-//! [`adapter::ReadRng`]: adapter/struct.ReadRng.html
-//! [`ChaChaRng`]: ../prng/chacha/struct.ChaChaRng.html
-
-pub mod adapter;
-
-#[cfg(feature="std")] mod entropy;
-#[doc(hidden)] pub mod jitter;
-pub mod mock;   // Public so we don't export `StepRng` directly, making it a bit
-                // more clear it is intended for testing.
-mod small;
-mod std;
-#[cfg(feature="std")] pub(crate) mod thread;
-
-
-pub use self::jitter::{JitterRng, TimerError};
-#[cfg(feature="std")] pub use self::entropy::EntropyRng;
-
-pub use self::small::SmallRng;
-pub use self::std::StdRng;
-#[cfg(feature="std")] pub use self::thread::ThreadRng;
-
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb")
-)))]
-mod os;
-
-#[cfg(all(feature="std",
-          any(target_os = "linux", target_os = "android",
-              target_os = "netbsd",
-              target_os = "dragonfly",
-              target_os = "haiku",
-              target_os = "emscripten",
-              target_os = "solaris",
-              target_os = "cloudabi",
-              target_os = "macos", target_os = "ios",
-              target_os = "freebsd",
-              target_os = "openbsd", target_os = "bitrig",
-              target_os = "redox",
-              target_os = "fuchsia",
-              windows,
-              all(target_arch = "wasm32", feature = "stdweb")
-)))]
-pub use self::os::OsRng;
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/os.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/os.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/os.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/os.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1186 +0,0 @@
-// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Interface to the random number generator of the operating system.
-
-use std::fmt;
-use rand_core::{CryptoRng, RngCore, Error, impls};
-
-/// A random number generator that retrieves randomness straight from the
-/// operating system.
-///
-/// This is the preferred external source of entropy for most applications.
-/// Commonly it is used to initialize a user-space RNG, which can then be used
-/// to generate random values with much less overhead than `OsRng`.
-///
-/// You may prefer to use [`EntropyRng`] instead of `OsRng`. It is unlikely, but
-/// not entirely theoretical, for `OsRng` to fail. In such cases [`EntropyRng`]
-/// falls back on a good alternative entropy source.
-///
-/// `OsRng::new()` is guaranteed to be very cheap (after the first successful
-/// call), and will never consume more than one file handle per process.
-///
-/// # Platform sources
-///
-/// | OS               | interface
-/// |------------------|---------------------------------------------------------
-/// | Linux, Android   | [`getrandom`][1] system call if available, otherwise [`/dev/urandom`][2] after reading from `/dev/random` once
-/// | Windows          | [`RtlGenRandom`][3]
-/// | macOS, iOS       | [`SecRandomCopyBytes`][4]
-/// | FreeBSD          | [`kern.arandom`][5]
-/// | OpenBSD, Bitrig  | [`getentropy`][6]
-/// | NetBSD           | [`/dev/urandom`][7] after reading from `/dev/random` once
-/// | Dragonfly BSD    | [`/dev/random`][8]
-/// | Solaris, illumos | [`getrandom`][9] system call if available, otherwise [`/dev/random`][10]
-/// | Fuchsia OS       | [`cprng_draw`][11]
-/// | Redox            | [`rand:`][12]
-/// | CloudABI         | [`random_get`][13]
-/// | Haiku            | `/dev/random` (identical to `/dev/urandom`)
-/// | Web browsers     | [`Crypto.getRandomValues`][14] (see [Support for WebAssembly and ams.js][14])
-/// | Node.js          | [`crypto.randomBytes`][15] (see [Support for WebAssembly and ams.js][16])
-///
-/// Rand doesn't have a blanket implementation for all Unix-like operating
-/// systems that reads from `/dev/urandom`. This ensures all supported operating
-/// systems are using the recommended interface and respect maximum buffer
-/// sizes.
-///
-/// ## Support for WebAssembly and ams.js
-///
-/// The three Emscripten targets `asmjs-unknown-emscripten`,
-/// `wasm32-unknown-emscripten` and `wasm32-experimental-emscripten` use
-/// Emscripten's emulation of `/dev/random` on web browsers and Node.js.
-/// Unfortunately it falls back to the insecure `Math.random()` if a browser
-/// doesn't support [`Crypto.getRandomValues`][12].
-///
-/// The bare Wasm target `wasm32-unknown-unknown` tries to call the javascript
-/// methods directly, using `stdweb` in combination with `cargo-web`.
-/// `wasm-bindgen` is not yet supported.
-///
-/// ## Early boot
-///
-/// It is possible that early in the boot process the OS hasn't had enough time
-/// yet to collect entropy to securely seed its RNG, especially on virtual
-/// machines.
-///
-/// Some operating systems always block the thread until the RNG is securely
-/// seeded. This can take anywhere from a few seconds to more than a minute.
-/// Others make a best effort to use a seed from before the shutdown and don't
-/// document much.
-///
-/// A few, Linux, NetBSD and Solaris, offer a choice between blocking, and
-/// getting an error. With `try_fill_bytes` we choose to get the error
-/// ([`ErrorKind::NotReady`]), while the other methods use a blocking interface.
-///
-/// On Linux (when the `genrandom` system call is not available) and on NetBSD
-/// reading from `/dev/urandom` never blocks, even when the OS hasn't collected
-/// enough entropy yet. As a countermeasure we try to do a single read from
-/// `/dev/random` until we know the OS RNG is initialized (and store this in a
-/// global static).
-///
-/// # Panics
-///
-/// `OsRng` is extremely unlikely to fail if `OsRng::new()`, and one read from
-/// it, where succesfull. But in case it does fail, only [`try_fill_bytes`] is
-/// able to report the cause. Depending on the error the other [`RngCore`]
-/// methods will retry several times, and panic in case the error remains.
-///
-/// [`EntropyRng`]: struct.EntropyRng.html
-/// [`RngCore`]: ../trait.RngCore.html
-/// [`try_fill_bytes`]: ../trait.RngCore.html#method.tymethod.try_fill_bytes
-/// [`ErrorKind::NotReady`]: ../enum.ErrorKind.html#variant.NotReady
-///
-/// [1]: http://man7.org/linux/man-pages/man2/getrandom.2.html
-/// [2]: http://man7.org/linux/man-pages/man4/urandom.4.html
-/// [3]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx
-/// [4]: https://developer.apple.com/documentation/security/1399291-secrandomcopybytes?language=objc
-/// [5]: https://www.freebsd.org/cgi/man.cgi?query=random&sektion=4
-/// [6]: https://man.openbsd.org/getentropy.2
-/// [7]: http://netbsd.gw.com/cgi-bin/man-cgi?random+4+NetBSD-current
-/// [8]: https://leaf.dragonflybsd.org/cgi/web-man?command=random&section=4
-/// [9]: https://docs.oracle.com/cd/E88353_01/html/E37841/getrandom-2.html
-/// [10]: https://docs.oracle.com/cd/E86824_01/html/E54777/random-7d.html
-/// [11]: https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_draw.md
-/// [12]: https://github.com/redox-os/randd/blob/master/src/main.rs
-/// [13]: https://github.com/NuxiNL/cloudabi/blob/v0.20/cloudabi.txt#L1826
-/// [14]: https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
-/// [15]: https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback
-/// [16]: #support-for-webassembly-and-amsjs
-
-
-#[derive(Clone)]
-pub struct OsRng(imp::OsRng);
-
-impl fmt::Debug for OsRng {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl OsRng {
-    /// Create a new `OsRng`.
-    pub fn new() -> Result<OsRng, Error> {
-        imp::OsRng::new().map(OsRng)
-    }
-}
-
-impl CryptoRng for OsRng {}
-
-impl RngCore for OsRng {
-    fn next_u32(&mut self) -> u32 {
-        impls::next_u32_via_fill(self)
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_fill(self)
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        use std::{time, thread};
-
-        // We cannot return Err(..), so we try to handle before panicking.
-        const MAX_RETRY_PERIOD: u32 = 10; // max 10s
-        const WAIT_DUR_MS: u32 = 100; // retry every 100ms
-        let wait_dur = time::Duration::from_millis(WAIT_DUR_MS as u64);
-        const RETRY_LIMIT: u32 = (MAX_RETRY_PERIOD * 1000) / WAIT_DUR_MS;
-        const TRANSIENT_RETRIES: u32 = 8;
-        let mut err_count = 0;
-        let mut error_logged = false;
-
-        // Maybe block until the OS RNG is initialized
-        let mut read = 0;
-        if let Ok(n) = self.0.test_initialized(dest, true) { read = n };
-        let dest = &mut dest[read..];
-
-        loop {
-            if let Err(e) = self.try_fill_bytes(dest) {
-                if err_count >= RETRY_LIMIT {
-                    error!("OsRng failed too many times; last error: {}", e);
-                    panic!("OsRng failed too many times; last error: {}", e);
-                }
-
-                if e.kind.should_wait() {
-                    if !error_logged {
-                        warn!("OsRng failed; waiting up to {}s and retrying. Error: {}",
-                                MAX_RETRY_PERIOD, e);
-                        error_logged = true;
-                    }
-                    err_count += 1;
-                    thread::sleep(wait_dur);
-                    continue;
-                } else if e.kind.should_retry() {
-                    if !error_logged {
-                        warn!("OsRng failed; retrying up to {} times. Error: {}",
-                                TRANSIENT_RETRIES, e);
-                        error_logged = true;
-                    }
-                    err_count += (RETRY_LIMIT + TRANSIENT_RETRIES - 1)
-                            / TRANSIENT_RETRIES;    // round up
-                    continue;
-                } else {
-                    error!("OsRng failed: {}", e);
-                    panic!("OsRng fatal error: {}", e);
-                }
-            }
-
-            break;
-        }
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        // Some systems do not support reading 0 random bytes.
-        // (And why waste a system call?)
-        if dest.len() == 0 { return Ok(()); }
-
-        let read = self.0.test_initialized(dest, false)?;
-        let dest = &mut dest[read..];
-
-        let max = self.0.max_chunk_size();
-        if dest.len() <= max {
-            trace!("OsRng: reading {} bytes via {}",
-                   dest.len(), self.0.method_str());
-        } else {
-            trace!("OsRng: reading {} bytes via {} in {} chunks of {} bytes",
-                   dest.len(), self.0.method_str(), (dest.len() + max) / max, max);
-        }
-        for slice in dest.chunks_mut(max) {
-            self.0.fill_chunk(slice)?;
-        }
-        Ok(())
-    }
-}
-
-trait OsRngImpl where Self: Sized {
-    // Create a new `OsRng` platform interface.
-    fn new() -> Result<Self, Error>;
-
-    // Fill a chunk with random bytes.
-    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error>;
-
-    // Test whether the OS RNG is initialized. This method may not be possible
-    // to support cheaply (or at all) on all operating systems.
-    //
-    // If `blocking` is set, this will cause the OS the block execution until
-    // its RNG is initialized.
-    //
-    // Random values that are read while this are stored in `dest`, the amount
-    // of read bytes is returned.
-    fn test_initialized(&mut self, _dest: &mut [u8], _blocking: bool)
-        -> Result<usize, Error> { Ok(0) }
-
-    // Maximum chunk size supported.
-    fn max_chunk_size(&self) -> usize { ::core::usize::MAX }
-
-    // Name of the OS interface (used for logging).
-    fn method_str(&self) -> &'static str;
-}
-
-
-
-
-// Helper functions to read from a random device such as `/dev/urandom`.
-//
-// All instances use a single internal file handle, to prevent possible
-// exhaustion of file descriptors.
-#[cfg(any(target_os = "linux", target_os = "android",
-          target_os = "netbsd", target_os = "dragonfly",
-          target_os = "solaris", target_os = "redox",
-          target_os = "haiku", target_os = "emscripten"))]
-mod random_device {
-    use {Error, ErrorKind};
-    use std::fs::File;
-    use std::io;
-    use std::io::Read;
-    use std::sync::{Once, Mutex, ONCE_INIT};
-
-    // TODO: remove outer Option when `Mutex::new(None)` is a constant expression
-    static mut READ_RNG_FILE: Option<Mutex<Option<File>>> = None;
-    static READ_RNG_ONCE: Once = ONCE_INIT;
-
-    #[allow(unused)]
-    pub fn open<F>(path: &'static str, open_fn: F) -> Result<(), Error>
-        where F: Fn(&'static str) -> Result<File, io::Error>
-    {
-        READ_RNG_ONCE.call_once(|| {
-            unsafe { READ_RNG_FILE = Some(Mutex::new(None)) }
-        });
-
-        // We try opening the file outside the `call_once` fn because we cannot
-        // clone the error, thus we must retry on failure.
-
-        let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
-        let mut guard = mutex.lock().unwrap();
-        if (*guard).is_none() {
-            info!("OsRng: opening random device {}", path);
-            let file = open_fn(path).map_err(map_err)?;
-            *guard = Some(file);
-        };
-        Ok(())
-    }
-
-    pub fn read(dest: &mut [u8]) -> Result<(), Error> {
-        // We expect this function only to be used after `random_device::open`
-        // was succesful. Therefore we can assume that our memory was set with a
-        // valid object.
-        let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
-        let mut guard = mutex.lock().unwrap();
-        let file = (*guard).as_mut().unwrap();
-
-        // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
-        file.read_exact(dest).map_err(|err| {
-            Error::with_cause(ErrorKind::Unavailable,
-                              "error reading random device", err)
-        })
-
-    }
-
-    pub fn map_err(err: io::Error) -> Error {
-        match err.kind() {
-            io::ErrorKind::Interrupted =>
-                    Error::new(ErrorKind::Transient, "interrupted"),
-            io::ErrorKind::WouldBlock =>
-                    Error::with_cause(ErrorKind::NotReady,
-                    "OS RNG not yet seeded", err),
-            _ => Error::with_cause(ErrorKind::Unavailable,
-                    "error while opening random device", err)
-        }
-    }
-}
-
-
-#[cfg(any(target_os = "linux", target_os = "android"))]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::random_device;
-    use super::OsRngImpl;
-
-    use std::io;
-    use std::io::Read;
-    use std::fs::{File, OpenOptions};
-    use std::os::unix::fs::OpenOptionsExt;
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-    use std::sync::{Once, ONCE_INIT};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng {
-        method: OsRngMethod,
-        initialized: bool,
-    }
-
-    #[derive(Clone, Debug)]
-    enum OsRngMethod {
-        GetRandom,
-        RandomDevice,
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            if is_getrandom_available() {
-                return Ok(OsRng { method: OsRngMethod::GetRandom,
-                                  initialized: false });
-            }
-            random_device::open("/dev/urandom", &|p| File::open(p))?;
-            Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            match self.method {
-                OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
-                OsRngMethod::RandomDevice => random_device::read(dest),
-            }
-        }
-
-        fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
-            -> Result<usize, Error>
-        {
-            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
-            if !self.initialized {
-                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
-            }
-            if self.initialized { return Ok(0); }
-
-            let result = match self.method {
-                OsRngMethod::GetRandom => {
-                    getrandom_try_fill(dest, blocking)?;
-                    Ok(dest.len())
-                }
-                OsRngMethod::RandomDevice => {
-                    info!("OsRng: testing random device /dev/random");
-                    let mut file = OpenOptions::new()
-                        .read(true)
-                        .custom_flags(if blocking { 0 } else { libc::O_NONBLOCK })
-                        .open("/dev/random")
-                        .map_err(random_device::map_err)?;
-                    file.read(&mut dest[..1]).map_err(random_device::map_err)?;
-                    Ok(1)
-                }
-            };
-            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
-            self.initialized = true;
-            result
-        }
-
-        fn method_str(&self) -> &'static str {
-            match self.method {
-                OsRngMethod::GetRandom => "getrandom",
-                OsRngMethod::RandomDevice => "/dev/urandom",
-            }
-        }
-    }
-
-    #[cfg(target_arch = "x86_64")]
-    const NR_GETRANDOM: libc::c_long = 318;
-    #[cfg(target_arch = "x86")]
-    const NR_GETRANDOM: libc::c_long = 355;
-    #[cfg(target_arch = "arm")]
-    const NR_GETRANDOM: libc::c_long = 384;
-    #[cfg(target_arch = "aarch64")]
-    const NR_GETRANDOM: libc::c_long = 278;
-     #[cfg(target_arch = "s390x")]
-    const NR_GETRANDOM: libc::c_long = 349;
-    #[cfg(target_arch = "powerpc")]
-    const NR_GETRANDOM: libc::c_long = 359;
-    #[cfg(target_arch = "mips")] // old ABI
-    const NR_GETRANDOM: libc::c_long = 4353;
-    #[cfg(target_arch = "mips64")]
-    const NR_GETRANDOM: libc::c_long = 5313;
-    #[cfg(not(any(target_arch = "x86_64", target_arch = "x86",
-                  target_arch = "arm", target_arch = "aarch64",
-                  target_arch = "s390x", target_arch = "powerpc",
-                  target_arch = "mips", target_arch = "mips64")))]
-    const NR_GETRANDOM: libc::c_long = 0;
-
-    fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
-        extern "C" {
-            fn syscall(number: libc::c_long, ...) -> libc::c_long;
-        }
-        const GRND_NONBLOCK: libc::c_uint = 0x0001;
-
-        if NR_GETRANDOM == 0 { return -1 };
-
-        unsafe {
-            syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(),
-                    if blocking { 0 } else { GRND_NONBLOCK })
-        }
-    }
-
-    fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
-        let mut read = 0;
-        while read < dest.len() {
-            let result = getrandom(&mut dest[read..], blocking);
-            if result == -1 {
-                let err = io::Error::last_os_error();
-                let kind = err.kind();
-                if kind == io::ErrorKind::Interrupted {
-                    continue;
-                } else if kind == io::ErrorKind::WouldBlock {
-                    return Err(Error::with_cause(
-                        ErrorKind::NotReady,
-                        "getrandom not ready",
-                        err,
-                    ));
-                } else {
-                    return Err(Error::with_cause(
-                        ErrorKind::Unavailable,
-                        "unexpected getrandom error",
-                        err,
-                    ));
-                }
-            } else {
-                read += result as usize;
-            }
-        }
-        Ok(())
-    }
-
-    fn is_getrandom_available() -> bool {
-        static CHECKER: Once = ONCE_INIT;
-        static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
-
-        if NR_GETRANDOM == 0 { return false };
-
-        CHECKER.call_once(|| {
-            debug!("OsRng: testing getrandom");
-            let mut buf: [u8; 0] = [];
-            let result = getrandom(&mut buf, false);
-            let available = if result == -1 {
-                let err = io::Error::last_os_error().raw_os_error();
-                err != Some(libc::ENOSYS)
-            } else {
-                true
-            };
-            AVAILABLE.store(available, Ordering::Relaxed);
-            info!("OsRng: using {}", if available { "getrandom" } else { "/dev/urandom" });
-        });
-
-        AVAILABLE.load(Ordering::Relaxed)
-    }
-}
-
-
-#[cfg(target_os = "netbsd")]
-mod imp {
-    use Error;
-    use super::random_device;
-    use super::OsRngImpl;
-
-    use std::fs::File;
-    use std::io::Read;
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng { initialized: bool }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            random_device::open("/dev/urandom", &|p| File::open(p))?;
-            Ok(OsRng { initialized: false })
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            random_device::read(dest)
-        }
-
-        // Read a single byte from `/dev/random` to determine if the OS RNG is
-        // already seeded. NetBSD always blocks if not yet ready.
-        fn test_initialized(&mut self, dest: &mut [u8], _blocking: bool)
-            -> Result<usize, Error>
-        {
-            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
-            if !self.initialized {
-                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
-            }
-            if self.initialized { return Ok(0); }
-
-            info!("OsRng: testing random device /dev/random");
-            let mut file =
-                File::open("/dev/random").map_err(random_device::map_err)?;
-            file.read(&mut dest[..1]).map_err(random_device::map_err)?;
-
-            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
-            self.initialized = true;
-            Ok(1)
-        }
-
-        fn method_str(&self) -> &'static str { "/dev/urandom" }
-    }
-}
-
-
-#[cfg(any(target_os = "dragonfly",
-          target_os = "haiku",
-          target_os = "emscripten"))]
-mod imp {
-    use Error;
-    use super::random_device;
-    use super::OsRngImpl;
-    use std::fs::File;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng();
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            random_device::open("/dev/random", &|p| File::open(p))?;
-            Ok(OsRng())
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            random_device::read(dest)
-        }
-
-        #[cfg(target_os = "emscripten")]
-        fn max_chunk_size(&self) -> usize {
-            // `Crypto.getRandomValues` documents `dest` should be at most 65536
-            // bytes. `crypto.randomBytes` documents: "To minimize threadpool
-            // task length variation, partition large randomBytes requests when
-            // doing so as part of fulfilling a client request.
-            65536
-        }
-
-        fn method_str(&self) -> &'static str { "/dev/random" }
-    }
-}
-
-
-// Read from `/dev/random`, with chunks of limited size (1040 bytes).
-// `/dev/random` uses the Hash_DRBG with SHA512 algorithm from NIST SP 800-90A.
-// `/dev/urandom` uses the FIPS 186-2 algorithm, which is considered less
-// secure. We choose to read from `/dev/random`.
-//
-// Since Solaris 11.3 the `getrandom` syscall is available. To make sure we can
-// compile on both Solaris and on OpenSolaris derivatives, that do not have the
-// function, we do a direct syscall instead of calling a library function.
-//
-// We have no way to differentiate between Solaris, illumos, SmartOS, etc.
-#[cfg(target_os = "solaris")]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::random_device;
-    use super::OsRngImpl;
-
-    use std::io;
-    use std::io::Read;
-    use std::fs::{File, OpenOptions};
-    use std::os::unix::fs::OpenOptionsExt;
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng {
-        method: OsRngMethod,
-        initialized: bool,
-    }
-
-    #[derive(Clone, Debug)]
-    enum OsRngMethod {
-        GetRandom,
-        RandomDevice,
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            if is_getrandom_available() {
-                return Ok(OsRng { method: OsRngMethod::GetRandom,
-                                  initialized: false });
-            }
-            let open = |p| OpenOptions::new()
-                .read(true)
-                .custom_flags(libc::O_NONBLOCK)
-                .open(p);
-            random_device::open("/dev/random", &open)?;
-            Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            match self.method {
-                OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
-                OsRngMethod::RandomDevice => random_device::read(dest),
-            }
-        }
-
-        fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
-            -> Result<usize, Error>
-        {
-            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
-            if !self.initialized {
-                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
-            }
-            if self.initialized { return Ok(0); }
-
-            let chunk_len = ::core::cmp::min(1024, dest.len());
-            let dest = &mut dest[..chunk_len];
-
-            match self.method {
-                OsRngMethod::GetRandom => getrandom_try_fill(dest, blocking)?,
-                OsRngMethod::RandomDevice => {
-                    if blocking {
-                        info!("OsRng: testing random device /dev/random");
-                        // We already have a non-blocking handle, but now need a
-                        // blocking one. Not much choice except opening it twice
-                        let mut file = File::open("/dev/random")
-                            .map_err(random_device::map_err)?;
-                        file.read(dest).map_err(random_device::map_err)?;
-                    } else {
-                        self.fill_chunk(dest)?;
-                    }
-                }
-            };
-            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
-            self.initialized = true;
-            Ok(chunk_len)
-        }
-
-        fn max_chunk_size(&self) -> usize {
-            // The documentation says 1024 is the maximum for getrandom, but
-            // 1040 for /dev/random.
-            1024
-        }
-
-        fn method_str(&self) -> &'static str {
-            match self.method {
-                OsRngMethod::GetRandom => "getrandom",
-                OsRngMethod::RandomDevice => "/dev/random",
-            }
-        }
-    }
-
-    fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
-        extern "C" {
-            fn syscall(number: libc::c_long, ...) -> libc::c_long;
-        }
-
-        const SYS_GETRANDOM: libc::c_long = 143;
-        const GRND_NONBLOCK: libc::c_uint = 0x0001;
-        const GRND_RANDOM: libc::c_uint = 0x0002;
-
-        unsafe {
-            syscall(SYS_GETRANDOM, buf.as_mut_ptr(), buf.len(),
-                    if blocking { 0 } else { GRND_NONBLOCK } | GRND_RANDOM)
-        }
-    }
-
-    fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
-        let result = getrandom(dest, blocking);
-        if result == -1 || result == 0 {
-            let err = io::Error::last_os_error();
-            let kind = err.kind();
-            if kind == io::ErrorKind::WouldBlock {
-                return Err(Error::with_cause(
-                    ErrorKind::NotReady,
-                    "getrandom not ready",
-                    err,
-                ));
-            } else {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "unexpected getrandom error",
-                    err,
-                ));
-            }
-        } else if result != dest.len() as i64 {
-            return Err(Error::new(ErrorKind::Unavailable,
-                                  "unexpected getrandom error"));
-        }
-        Ok(())
-    }
-
-    fn is_getrandom_available() -> bool {
-        use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
-        use std::sync::{Once, ONCE_INIT};
-
-        static CHECKER: Once = ONCE_INIT;
-        static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
-
-        CHECKER.call_once(|| {
-            debug!("OsRng: testing getrandom");
-            let mut buf: [u8; 0] = [];
-            let result = getrandom(&mut buf, false);
-            let available = if result == -1 {
-                let err = io::Error::last_os_error().raw_os_error();
-                err != Some(libc::ENOSYS)
-            } else {
-                true
-            };
-            AVAILABLE.store(available, Ordering::Relaxed);
-            info!("OsRng: using {}", if available { "getrandom" } else { "/dev/random" });
-        });
-
-        AVAILABLE.load(Ordering::Relaxed)
-    }
-}
-
-
-#[cfg(target_os = "cloudabi")]
-mod imp {
-    extern crate cloudabi;
-
-    use std::io;
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let errno = unsafe { cloudabi::random_get(dest) };
-            if errno == cloudabi::errno::SUCCESS {
-                Ok(())
-            } else {
-                // Cloudlibc provides its own `strerror` implementation so we
-                // can use `from_raw_os_error` here.
-                Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "random_get() system call failed",
-                    io::Error::from_raw_os_error(errno as i32),
-                ))
-            }
-        }
-
-        fn method_str(&self) -> &'static str { "cloudabi::random_get" }
-    }
-}
-
-
-#[cfg(any(target_os = "macos", target_os = "ios"))]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::io;
-    use self::libc::{c_int, size_t};
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    enum SecRandom {}
-
-    #[allow(non_upper_case_globals)]
-    const kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;
-
-    #[link(name = "Security", kind = "framework")]
-    extern {
-        fn SecRandomCopyBytes(rnd: *const SecRandom,
-                              count: size_t, bytes: *mut u8) -> c_int;
-    }
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let ret = unsafe {
-                SecRandomCopyBytes(kSecRandomDefault,
-                                   dest.len() as size_t,
-                                   dest.as_mut_ptr())
-            };
-            if ret == -1 {
-                Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "couldn't generate random bytes",
-                    io::Error::last_os_error()))
-            } else {
-                Ok(())
-            }
-        }
-
-        fn method_str(&self) -> &'static str { "SecRandomCopyBytes" }
-    }
-}
-
-
-#[cfg(target_os = "freebsd")]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::ptr;
-    use std::io;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let mib = [libc::CTL_KERN, libc::KERN_ARND];
-            let mut len = dest.len();
-            let ret = unsafe {
-                libc::sysctl(mib.as_ptr(), mib.len() as libc::c_uint,
-                             dest.as_mut_ptr() as *mut _, &mut len,
-                             ptr::null(), 0)
-            };
-            if ret == -1 || len != dest.len() {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "kern.arandom sysctl failed",
-                    io::Error::last_os_error()));
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize { 256 }
-
-        fn method_str(&self) -> &'static str { "kern.arandom" }
-    }
-}
-
-
-#[cfg(any(target_os = "openbsd", target_os = "bitrig"))]
-mod imp {
-    extern crate libc;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::io;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let ret = unsafe {
-                libc::getentropy(dest.as_mut_ptr() as *mut libc::c_void, dest.len())
-            };
-            if ret == -1 {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "getentropy failed",
-                    io::Error::last_os_error()));
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize { 256 }
-
-        fn method_str(&self) -> &'static str { "getentropy" }
-    }
-}
-
-
-#[cfg(target_os = "redox")]
-mod imp {
-    use Error;
-    use super::random_device;
-    use super::OsRngImpl;
-    use std::fs::File;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng();
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            random_device::open("rand:", &|p| File::open(p))?;
-            Ok(OsRng())
-        }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            random_device::read(dest)
-        }
-
-        fn method_str(&self) -> &'static str { "'rand:'" }
-    }
-}
-
-
-#[cfg(target_os = "fuchsia")]
-mod imp {
-    extern crate fuchsia_zircon;
-
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let mut read = 0;
-            while read < dest.len() {
-                match fuchsia_zircon::cprng_draw(&mut dest[read..]) {
-                    Ok(actual) => read += actual,
-                    Err(e) => {
-                        return Err(Error::with_cause(
-                            ErrorKind::Unavailable,
-                            "cprng_draw failed",
-                            e.into_io_error()));
-                    }
-                };
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize {
-            fuchsia_zircon::sys::ZX_CPRNG_DRAW_MAX_LEN
-        }
-
-        fn method_str(&self) -> &'static str { "cprng_draw" }
-    }
-}
-
-
-#[cfg(windows)]
-mod imp {
-    extern crate winapi;
-    
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    use std::io;
-
-    use self::winapi::shared::minwindef::ULONG;
-    use self::winapi::um::ntsecapi::RtlGenRandom;
-    use self::winapi::um::winnt::PVOID;
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng;
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            let ret = unsafe {
-                RtlGenRandom(dest.as_mut_ptr() as PVOID, dest.len() as ULONG)
-            };
-            if ret == 0 {
-                return Err(Error::with_cause(
-                    ErrorKind::Unavailable,
-                    "couldn't generate random bytes",
-                    io::Error::last_os_error()));
-            }
-            Ok(())
-        }
-
-        fn max_chunk_size(&self) -> usize { <ULONG>::max_value() as usize }
-
-        fn method_str(&self) -> &'static str { "RtlGenRandom" }
-    }
-}
-
-
-#[cfg(all(target_arch = "wasm32",
-          not(target_os = "emscripten"),
-          feature = "stdweb"))]
-mod imp {
-    use std::mem;
-    use stdweb::unstable::TryInto;
-    use stdweb::web::error::Error as WebError;
-    use {Error, ErrorKind};
-    use super::OsRngImpl;
-
-    #[derive(Clone, Debug)]
-    enum OsRngMethod {
-        Browser,
-        Node
-    }
-
-    #[derive(Clone, Debug)]
-    pub struct OsRng(OsRngMethod);
-
-    impl OsRngImpl for OsRng {
-        fn new() -> Result<OsRng, Error> {
-            let result = js! {
-                try {
-                    if (
-                        typeof self === "object" &&
-                        typeof self.crypto === "object" &&
-                        typeof self.crypto.getRandomValues === "function"
-                    ) {
-                        return { success: true, ty: 1 };
-                    }
-
-                    if (typeof require("crypto").randomBytes === "function") {
-                        return { success: true, ty: 2 };
-                    }
-
-                    return { success: false, error: new Error("not supported") };
-                } catch(err) {
-                    return { success: false, error: err };
-                }
-            };
-
-            if js!{ return @{ result.as_ref() }.success } == true {
-                let ty = js!{ return @{ result }.ty };
-
-                if ty == 1 { Ok(OsRng(OsRngMethod::Browser)) }
-                else if ty == 2 { Ok(OsRng(OsRngMethod::Node)) }
-                else { unreachable!() }
-            } else {
-                let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-                Err(Error::with_cause(ErrorKind::Unavailable, "WASM Error", err))
-            }
-        }
-
-
-        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-            assert_eq!(mem::size_of::<usize>(), 4);
-
-            let len = dest.len() as u32;
-            let ptr = dest.as_mut_ptr() as i32;
-
-            let result = match self.0 {
-                OsRngMethod::Browser => js! {
-                    try {
-                        let array = new Uint8Array(@{ len });
-                        self.crypto.getRandomValues(array);
-                        HEAPU8.set(array, @{ ptr });
-
-                        return { success: true };
-                    } catch(err) {
-                        return { success: false, error: err };
-                    }
-                },
-                OsRngMethod::Node => js! {
-                    try {
-                        let bytes = require("crypto").randomBytes(@{ len });
-                        HEAPU8.set(new Uint8Array(bytes), @{ ptr });
-
-                        return { success: true };
-                    } catch(err) {
-                        return { success: false, error: err };
-                    }
-                }
-            };
-
-            if js!{ return @{ result.as_ref() }.success } == true {
-                Ok(())
-            } else {
-                let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-                Err(Error::with_cause(ErrorKind::Unexpected, "WASM Error", err))
-            }
-        }
-
-        fn max_chunk_size(&self) -> usize { 65536 }
-
-        fn method_str(&self) -> &'static str {
-            match self.0 {
-                OsRngMethod::Browser => "Crypto.getRandomValues",
-                OsRngMethod::Node => "crypto.randomBytes",
-            }
-        }
-    }
-}
-
-
-#[cfg(test)]
-mod test {
-    use RngCore;
-    use OsRng;
-
-    #[test]
-    fn test_os_rng() {
-        let mut r = OsRng::new().unwrap();
-
-        r.next_u32();
-        r.next_u64();
-
-        let mut v1 = [0u8; 1000];
-        r.fill_bytes(&mut v1);
-
-        let mut v2 = [0u8; 1000];
-        r.fill_bytes(&mut v2);
-
-        let mut n_diff_bits = 0;
-        for i in 0..v1.len() {
-            n_diff_bits += (v1[i] ^ v2[i]).count_ones();
-        }
-
-        // Check at least 1 bit per byte differs. p(failure) < 1e-1000 with random input.
-        assert!(n_diff_bits >= v1.len() as u32);
-    }
-
-    #[test]
-    fn test_os_rng_empty() {
-        let mut r = OsRng::new().unwrap();
-
-        let mut empty = [0u8; 0];
-        r.fill_bytes(&mut empty);
-    }
-
-    #[test]
-    fn test_os_rng_huge() {
-        let mut r = OsRng::new().unwrap();
-
-        let mut huge = [0u8; 100_000];
-        r.fill_bytes(&mut huge);
-    }
-
-    #[cfg(not(any(target_arch = "wasm32", target_arch = "asmjs")))]
-    #[test]
-    fn test_os_rng_tasks() {
-        use std::sync::mpsc::channel;
-        use std::thread;
-
-        let mut txs = vec!();
-        for _ in 0..20 {
-            let (tx, rx) = channel();
-            txs.push(tx);
-
-            thread::spawn(move|| {
-                // wait until all the tasks are ready to go.
-                rx.recv().unwrap();
-
-                // deschedule to attempt to interleave things as much
-                // as possible (XXX: is this a good test?)
-                let mut r = OsRng::new().unwrap();
-                thread::yield_now();
-                let mut v = [0u8; 1000];
-
-                for _ in 0..100 {
-                    r.next_u32();
-                    thread::yield_now();
-                    r.next_u64();
-                    thread::yield_now();
-                    r.fill_bytes(&mut v);
-                    thread::yield_now();
-                }
-            });
-        }
-
-        // start all the tasks
-        for tx in txs.iter() {
-            tx.send(()).unwrap();
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/small.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/small.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/small.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/small.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A small fast RNG
-
-use {RngCore, SeedableRng, Error};
-use prng::XorShiftRng;
-
-/// An RNG recommended when small state, cheap initialization and good
-/// performance are required. The PRNG algorithm in `SmallRng` is chosen to be
-/// efficient on the current platform, **without consideration for cryptography
-/// or security**. The size of its state is much smaller than for [`StdRng`].
-///
-/// Reproducibility of output from this generator is however not required, thus
-/// future library versions may use a different internal generator with
-/// different output. Further, this generator may not be portable and can
-/// produce different output depending on the architecture. If you require
-/// reproducible output, use a named RNG, for example [`XorShiftRng`].
-///
-/// The current algorithm used on all platforms is [Xorshift].
-///
-/// # Examples
-///
-/// Initializing `SmallRng` with a random seed can be done using [`FromEntropy`]:
-///
-/// ```
-/// # use rand::Rng;
-/// use rand::FromEntropy;
-/// use rand::rngs::SmallRng;
-///
-/// // Create small, cheap to initialize and fast RNG with a random seed.
-/// // The randomness is supplied by the operating system.
-/// let mut small_rng = SmallRng::from_entropy();
-/// # let v: u32 = small_rng.gen();
-/// ```
-///
-/// When initializing a lot of `SmallRng`'s, using [`thread_rng`] can be more
-/// efficient:
-///
-/// ```
-/// use std::iter;
-/// use rand::{SeedableRng, thread_rng};
-/// use rand::rngs::SmallRng;
-///
-/// // Create a big, expensive to initialize and slower, but unpredictable RNG.
-/// // This is cached and done only once per thread.
-/// let mut thread_rng = thread_rng();
-/// // Create small, cheap to initialize and fast RNGs with random seeds.
-/// // One can generally assume this won't fail.
-/// let rngs: Vec<SmallRng> = iter::repeat(())
-///     .map(|()| SmallRng::from_rng(&mut thread_rng).unwrap())
-///     .take(10)
-///     .collect();
-/// ```
-///
-/// [`FromEntropy`]: ../trait.FromEntropy.html
-/// [`StdRng`]: struct.StdRng.html
-/// [`thread_rng`]: ../fn.thread_rng.html
-/// [Xorshift]: ../prng/struct.XorShiftRng.html
-/// [`XorShiftRng`]: ../prng/struct.XorShiftRng.html
-#[derive(Clone, Debug)]
-pub struct SmallRng(XorShiftRng);
-
-impl RngCore for SmallRng {
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest);
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl SeedableRng for SmallRng {
-    type Seed = <XorShiftRng as SeedableRng>::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        SmallRng(XorShiftRng::from_seed(seed))
-    }
-
-    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
-        XorShiftRng::from_rng(rng).map(SmallRng)
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/std.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/std.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/std.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/std.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The standard RNG
-
-use {RngCore, CryptoRng, Error, SeedableRng};
-use prng::Hc128Rng;
-
-/// The standard RNG. The PRNG algorithm in `StdRng` is chosen to be efficient
-/// on the current platform, to be statistically strong and unpredictable
-/// (meaning a cryptographically secure PRNG).
-///
-/// The current algorithm used on all platforms is [HC-128].
-///
-/// Reproducibility of output from this generator is however not required, thus
-/// future library versions may use a different internal generator with
-/// different output. Further, this generator may not be portable and can
-/// produce different output depending on the architecture. If you require
-/// reproducible output, use a named RNG, for example [`ChaChaRng`].
-///
-/// [HC-128]: ../prng/hc128/struct.Hc128Rng.html
-/// [`ChaChaRng`]: ../prng/chacha/struct.ChaChaRng.html
-#[derive(Clone, Debug)]
-pub struct StdRng(Hc128Rng);
-
-impl RngCore for StdRng {
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest);
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.0.try_fill_bytes(dest)
-    }
-}
-
-impl SeedableRng for StdRng {
-    type Seed = <Hc128Rng as SeedableRng>::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        StdRng(Hc128Rng::from_seed(seed))
-    }
-
-    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
-        Hc128Rng::from_rng(rng).map(StdRng)
-    }
-}
-
-impl CryptoRng for StdRng {}
-
-
-#[cfg(test)]
-mod test {
-    use {RngCore, SeedableRng};
-    use rngs::StdRng;
-
-    #[test]
-    fn test_stdrng_construction() {
-        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
-                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng1 = StdRng::from_seed(seed);
-        assert_eq!(rng1.next_u64(), 15759097995037006553);
-
-        let mut rng2 = StdRng::from_rng(rng1).unwrap();
-        assert_eq!(rng2.next_u64(), 6766915756997287454);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/rngs/thread.rs cargo-0.33.0/vendor/rand-0.5.5/src/rngs/thread.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/rngs/thread.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/rngs/thread.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Thread-local random number generator
-
-use std::cell::UnsafeCell;
-use std::rc::Rc;
-
-use {RngCore, CryptoRng, SeedableRng, Error};
-use rngs::adapter::ReseedingRng;
-use rngs::EntropyRng;
-use prng::hc128::Hc128Core;
-
-// Rationale for using `UnsafeCell` in `ThreadRng`:
-//
-// Previously we used a `RefCell`, with an overhead of ~15%. There will only
-// ever be one mutable reference to the interior of the `UnsafeCell`, because
-// we only have such a reference inside `next_u32`, `next_u64`, etc. Within a
-// single thread (which is the definition of `ThreadRng`), there will only ever
-// be one of these methods active at a time.
-//
-// A possible scenario where there could be multiple mutable references is if
-// `ThreadRng` is used inside `next_u32` and co. But the implementation is
-// completely under our control. We just have to ensure none of them use
-// `ThreadRng` internally, which is nonsensical anyway. We should also never run
-// `ThreadRng` in destructors of its implementation, which is also nonsensical.
-//
-// The additional `Rc` is not strictly neccesary, and could be removed. For now
-// it ensures `ThreadRng` stays `!Send` and `!Sync`, and implements `Clone`.
-
-
-// Number of generated bytes after which to reseed `TreadRng`.
-//
-// The time it takes to reseed HC-128 is roughly equivalent to generating 7 KiB.
-// We pick a treshold here that is large enough to not reduce the average
-// performance too much, but also small enough to not make reseeding something
-// that basically never happens.
-const THREAD_RNG_RESEED_THRESHOLD: u64 = 32*1024*1024; // 32 MiB
-
-/// The type returned by [`thread_rng`], essentially just a reference to the
-/// PRNG in thread-local memory.
-///
-/// `ThreadRng` uses [`ReseedingRng`] wrapping the same PRNG as [`StdRng`],
-/// which is reseeded after generating 32 MiB of random data. A single instance
-/// is cached per thread and the returned `ThreadRng` is a reference to this
-/// instance — hence `ThreadRng` is neither `Send` nor `Sync` but is safe to use
-/// within a single thread. This RNG is seeded and reseeded via [`EntropyRng`]
-/// as required.
-///
-/// Note that the reseeding is done as an extra precaution against entropy
-/// leaks and is in theory unnecessary — to predict `ThreadRng`'s output, an
-/// attacker would have to either determine most of the RNG's seed or internal
-/// state, or crack the algorithm used.
-///
-/// Like [`StdRng`], `ThreadRng` is a cryptographically secure PRNG. The current
-/// algorithm used is [HC-128], which is an array-based PRNG that trades memory
-/// usage for better performance. This makes it similar to ISAAC, the algorithm
-/// used in `ThreadRng` before rand 0.5.
-///
-/// Cloning this handle just produces a new reference to the same thread-local
-/// generator.
-/// 
-/// [`thread_rng`]: ../fn.thread_rng.html
-/// [`ReseedingRng`]: adapter/struct.ReseedingRng.html
-/// [`StdRng`]: struct.StdRng.html
-/// [`EntropyRng`]: struct.EntropyRng.html
-/// [HC-128]: ../prng/hc128/struct.Hc128Rng.html
-#[derive(Clone, Debug)]
-pub struct ThreadRng {
-    rng: Rc<UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>>>,
-}
-
-thread_local!(
-    static THREAD_RNG_KEY: Rc<UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>>> = {
-        let mut entropy_source = EntropyRng::new();
-        let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
-                panic!("could not initialize thread_rng: {}", err));
-        let rng = ReseedingRng::new(r,
-                                    THREAD_RNG_RESEED_THRESHOLD,
-                                    entropy_source);
-        Rc::new(UnsafeCell::new(rng))
-    }
-);
-
-/// Retrieve the lazily-initialized thread-local random number
-/// generator, seeded by the system. Intended to be used in method
-/// chaining style, e.g. `thread_rng().gen::<i32>()`, or cached locally, e.g.
-/// `let mut rng = thread_rng();`.
-///
-/// For more information see [`ThreadRng`].
-///
-/// [`ThreadRng`]: rngs/struct.ThreadRng.html
-pub fn thread_rng() -> ThreadRng {
-    ThreadRng { rng: THREAD_RNG_KEY.with(|t| t.clone()) }
-}
-
-impl RngCore for ThreadRng {
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        unsafe { (*self.rng.get()).next_u32() }
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        unsafe { (*self.rng.get()).next_u64() }
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        unsafe { (*self.rng.get()).fill_bytes(dest) }
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        unsafe { (*self.rng.get()).try_fill_bytes(dest) }
-    }
-}
-
-impl CryptoRng for ThreadRng {}
-
-
-#[cfg(test)]
-mod test {
-    #[test]
-    #[cfg(not(feature="stdweb"))]
-    fn test_thread_rng() {
-        use Rng;
-        let mut r = ::thread_rng();
-        r.gen::<i32>();
-        let mut v = [1, 1, 1];
-        r.shuffle(&mut v);
-        let b: &[_] = &[1, 1, 1];
-        assert_eq!(v, b);
-        assert_eq!(r.gen_range(0, 1), 0);
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/src/seq.rs cargo-0.33.0/vendor/rand-0.5.5/src/seq.rs
--- cargo-0.32.0/vendor/rand-0.5.5/src/seq.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/src/seq.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,334 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Functions for randomly accessing and sampling sequences.
-
-use super::Rng;
-
-// This crate is only enabled when either std or alloc is available.
-#[cfg(all(feature="alloc", not(feature="std")))] use alloc::vec::Vec;
-// BTreeMap is not as fast in tests, but better than nothing.
-#[cfg(feature="std")] use std::collections::HashMap;
-#[cfg(all(feature="alloc", not(feature="std")))] use alloc::collections::BTreeMap;
-
-/// Randomly sample `amount` elements from a finite iterator.
-///
-/// The following can be returned:
-///
-/// - `Ok`: `Vec` of `amount` non-repeating randomly sampled elements. The order is not random.
-/// - `Err`: `Vec` of all the elements from `iterable` in sequential order. This happens when the
-///   length of `iterable` was less than `amount`. This is considered an error since exactly
-///   `amount` elements is typically expected.
-///
-/// This implementation uses `O(len(iterable))` time and `O(amount)` memory.
-///
-/// # Example
-///
-/// ```
-/// use rand::{thread_rng, seq};
-///
-/// let mut rng = thread_rng();
-/// let sample = seq::sample_iter(&mut rng, 1..100, 5).unwrap();
-/// println!("{:?}", sample);
-/// ```
-pub fn sample_iter<T, I, R>(rng: &mut R, iterable: I, amount: usize) -> Result<Vec<T>, Vec<T>>
-    where I: IntoIterator<Item=T>,
-          R: Rng + ?Sized,
-{
-    let mut iter = iterable.into_iter();
-    let mut reservoir = Vec::with_capacity(amount);
-    reservoir.extend(iter.by_ref().take(amount));
-
-    // Continue unless the iterator was exhausted
-    //
-    // note: this prevents iterators that "restart" from causing problems.
-    // If the iterator stops once, then so do we.
-    if reservoir.len() == amount {
-        for (i, elem) in iter.enumerate() {
-            let k = rng.gen_range(0, i + 1 + amount);
-            if let Some(spot) = reservoir.get_mut(k) {
-                *spot = elem;
-            }
-        }
-        Ok(reservoir)
-    } else {
-        // Don't hang onto extra memory. There is a corner case where
-        // `amount` was much less than `len(iterable)`.
-        reservoir.shrink_to_fit();
-        Err(reservoir)
-    }
-}
-
-/// Randomly sample exactly `amount` values from `slice`.
-///
-/// The values are non-repeating and in random order.
-///
-/// This implementation uses `O(amount)` time and memory.
-///
-/// Panics if `amount > slice.len()`
-///
-/// # Example
-///
-/// ```
-/// use rand::{thread_rng, seq};
-///
-/// let mut rng = thread_rng();
-/// let values = vec![5, 6, 1, 3, 4, 6, 7];
-/// println!("{:?}", seq::sample_slice(&mut rng, &values, 3));
-/// ```
-pub fn sample_slice<R, T>(rng: &mut R, slice: &[T], amount: usize) -> Vec<T>
-    where R: Rng + ?Sized,
-          T: Clone
-{
-    let indices = sample_indices(rng, slice.len(), amount);
-
-    let mut out = Vec::with_capacity(amount);
-    out.extend(indices.iter().map(|i| slice[*i].clone()));
-    out
-}
-
-/// Randomly sample exactly `amount` references from `slice`.
-///
-/// The references are non-repeating and in random order.
-///
-/// This implementation uses `O(amount)` time and memory.
-///
-/// Panics if `amount > slice.len()`
-///
-/// # Example
-///
-/// ```
-/// use rand::{thread_rng, seq};
-///
-/// let mut rng = thread_rng();
-/// let values = vec![5, 6, 1, 3, 4, 6, 7];
-/// println!("{:?}", seq::sample_slice_ref(&mut rng, &values, 3));
-/// ```
-pub fn sample_slice_ref<'a, R, T>(rng: &mut R, slice: &'a [T], amount: usize) -> Vec<&'a T>
-    where R: Rng + ?Sized
-{
-    let indices = sample_indices(rng, slice.len(), amount);
-
-    let mut out = Vec::with_capacity(amount);
-    out.extend(indices.iter().map(|i| &slice[*i]));
-    out
-}
-
-/// Randomly sample exactly `amount` indices from `0..length`.
-///
-/// The values are non-repeating and in random order.
-///
-/// This implementation uses `O(amount)` time and memory.
-///
-/// This method is used internally by the slice sampling methods, but it can sometimes be useful to
-/// have the indices themselves so this is provided as an alternative.
-///
-/// Panics if `amount > length`
-pub fn sample_indices<R>(rng: &mut R, length: usize, amount: usize) -> Vec<usize>
-    where R: Rng + ?Sized,
-{
-    if amount > length {
-        panic!("`amount` must be less than or equal to `slice.len()`");
-    }
-
-    // We are going to have to allocate at least `amount` for the output no matter what. However,
-    // if we use the `cached` version we will have to allocate `amount` as a HashMap as well since
-    // it inserts an element for every loop.
-    //
-    // Therefore, if `amount >= length / 2` then inplace will be both faster and use less memory.
-    // In fact, benchmarks show the inplace version is faster for length up to about 20 times
-    // faster than amount.
-    //
-    // TODO: there is probably even more fine-tuning that can be done here since
-    // `HashMap::with_capacity(amount)` probably allocates more than `amount` in practice,
-    // and a trade off could probably be made between memory/cpu, since hashmap operations
-    // are slower than array index swapping.
-    if amount >= length / 20 {
-        sample_indices_inplace(rng, length, amount)
-    } else {
-        sample_indices_cache(rng, length, amount)
-    }
-}
-
-/// Sample an amount of indices using an inplace partial fisher yates method.
-///
-/// This allocates the entire `length` of indices and randomizes only the first `amount`.
-/// It then truncates to `amount` and returns.
-///
-/// This is better than using a `HashMap` "cache" when `amount >= length / 2`
-/// since it does not require allocating an extra cache and is much faster.
-fn sample_indices_inplace<R>(rng: &mut R, length: usize, amount: usize) -> Vec<usize>
-    where R: Rng + ?Sized,
-{
-    debug_assert!(amount <= length);
-    let mut indices: Vec<usize> = Vec::with_capacity(length);
-    indices.extend(0..length);
-    for i in 0..amount {
-        let j: usize = rng.gen_range(i, length);
-        indices.swap(i, j);
-    }
-    indices.truncate(amount);
-    debug_assert_eq!(indices.len(), amount);
-    indices
-}
-
-
-/// This method performs a partial fisher-yates on a range of indices using a
-/// `HashMap` as a cache to record potential collisions.
-///
-/// The cache avoids allocating the entire `length` of values. This is especially useful when
-/// `amount <<< length`, i.e. select 3 non-repeating from `1_000_000`
-fn sample_indices_cache<R>(
-    rng: &mut R,
-    length: usize,
-    amount: usize,
-) -> Vec<usize>
-    where R: Rng + ?Sized,
-{
-    debug_assert!(amount <= length);
-    #[cfg(feature="std")] let mut cache = HashMap::with_capacity(amount);
-    #[cfg(not(feature="std"))] let mut cache = BTreeMap::new();
-    let mut out = Vec::with_capacity(amount);
-    for i in 0..amount {
-        let j: usize = rng.gen_range(i, length);
-
-        // equiv: let tmp = slice[i];
-        let tmp = match cache.get(&i) {
-            Some(e) => *e,
-            None => i,
-        };
-
-        // equiv: slice[i] = slice[j];
-        let x = match cache.get(&j) {
-            Some(x) => *x,
-            None => j,
-        };
-
-        // equiv: slice[j] = tmp;
-        cache.insert(j, tmp);
-
-        // note that in the inplace version, slice[i] is automatically "returned" value
-        out.push(x);
-    }
-    debug_assert_eq!(out.len(), amount);
-    out
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use {XorShiftRng, Rng, SeedableRng};
-    #[cfg(not(feature="std"))]
-    use alloc::vec::Vec;
-
-    #[test]
-    fn test_sample_iter() {
-        let min_val = 1;
-        let max_val = 100;
-
-        let mut r = ::test::rng(401);
-        let vals = (min_val..max_val).collect::<Vec<i32>>();
-        let small_sample = sample_iter(&mut r, vals.iter(), 5).unwrap();
-        let large_sample = sample_iter(&mut r, vals.iter(), vals.len() + 5).unwrap_err();
-
-        assert_eq!(small_sample.len(), 5);
-        assert_eq!(large_sample.len(), vals.len());
-        // no randomization happens when amount >= len
-        assert_eq!(large_sample, vals.iter().collect::<Vec<_>>());
-
-        assert!(small_sample.iter().all(|e| {
-            **e >= min_val && **e <= max_val
-        }));
-    }
-    #[test]
-    fn test_sample_slice_boundaries() {
-        let empty: &[u8] = &[];
-
-        let mut r = ::test::rng(402);
-
-        // sample 0 items
-        assert_eq!(&sample_slice(&mut r, empty, 0)[..], [0u8; 0]);
-        assert_eq!(&sample_slice(&mut r, &[42, 2, 42], 0)[..], [0u8; 0]);
-
-        // sample 1 item
-        assert_eq!(&sample_slice(&mut r, &[42], 1)[..], [42]);
-        let v = sample_slice(&mut r, &[1, 42], 1)[0];
-        assert!(v == 1 || v == 42);
-
-        // sample "all" the items
-        let v = sample_slice(&mut r, &[42, 133], 2);
-        assert!(&v[..] == [42, 133] || v[..] == [133, 42]);
-
-        assert_eq!(&sample_indices_inplace(&mut r, 0, 0)[..], [0usize; 0]);
-        assert_eq!(&sample_indices_inplace(&mut r, 1, 0)[..], [0usize; 0]);
-        assert_eq!(&sample_indices_inplace(&mut r, 1, 1)[..], [0]);
-
-        assert_eq!(&sample_indices_cache(&mut r, 0, 0)[..], [0usize; 0]);
-        assert_eq!(&sample_indices_cache(&mut r, 1, 0)[..], [0usize; 0]);
-        assert_eq!(&sample_indices_cache(&mut r, 1, 1)[..], [0]);
-
-        // Make sure lucky 777's aren't lucky
-        let slice = &[42, 777];
-        let mut num_42 = 0;
-        let total = 1000;
-        for _ in 0..total {
-            let v = sample_slice(&mut r, slice, 1);
-            assert_eq!(v.len(), 1);
-            let v = v[0];
-            assert!(v == 42 || v == 777);
-            if v == 42 {
-                num_42 += 1;
-            }
-        }
-        let ratio_42 = num_42 as f64 / 1000 as f64;
-        assert!(0.4 <= ratio_42 || ratio_42 <= 0.6, "{}", ratio_42);
-    }
-
-    #[test]
-    fn test_sample_slice() {
-        let xor_rng = XorShiftRng::from_seed;
-
-        let max_range = 100;
-        let mut r = ::test::rng(403);
-
-        for length in 1usize..max_range {
-            let amount = r.gen_range(0, length);
-            let mut seed = [0u8; 16];
-            r.fill(&mut seed);
-
-            // assert that the two index methods give exactly the same result
-            let inplace = sample_indices_inplace(
-                &mut xor_rng(seed), length, amount);
-            let cache = sample_indices_cache(
-                &mut xor_rng(seed), length, amount);
-            assert_eq!(inplace, cache);
-
-            // assert the basics work
-            let regular = sample_indices(
-                &mut xor_rng(seed), length, amount);
-            assert_eq!(regular.len(), amount);
-            assert!(regular.iter().all(|e| *e < length));
-            assert_eq!(regular, inplace);
-
-            // also test that sampling the slice works
-            let vec: Vec<usize> = (0..length).collect();
-            {
-                let result = sample_slice(&mut xor_rng(seed), &vec, amount);
-                assert_eq!(result, regular);
-            }
-
-            {
-                let result = sample_slice_ref(&mut xor_rng(seed), &vec, amount);
-                let expected = regular.iter().map(|v| v).collect::<Vec<_>>();
-                assert_eq!(result, expected);
-            }
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/tests/bool.rs cargo-0.33.0/vendor/rand-0.5.5/tests/bool.rs
--- cargo-0.32.0/vendor/rand-0.5.5/tests/bool.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/tests/bool.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#![no_std]
-
-extern crate rand;
-
-use rand::SeedableRng;
-use rand::rngs::SmallRng;
-use rand::distributions::{Distribution, Bernoulli};
-
-/// This test should make sure that we don't accidentally have undefined
-/// behavior for large propabilties due to
-/// https://github.com/rust-lang/rust/issues/10184.
-/// Expressions like `1.0*(u64::MAX as f64) as u64` have to be avoided.
-#[test]
-fn large_probability() {
-    let p = 1. - ::core::f64::EPSILON / 2.;
-    assert!(p < 1.);
-    let d = Bernoulli::new(p);
-    let mut rng = SmallRng::from_seed(
-        [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
-    for _ in 0..10 {
-        assert!(d.sample(&mut rng), "extremely unlikely to fail by accident");
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/.travis.yml cargo-0.33.0/vendor/rand-0.5.5/.travis.yml
--- cargo-0.32.0/vendor/rand-0.5.5/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-language: rust
-sudo: false
-
-# We aim to test all the following in any combination:
-# - standard tests, benches, documentation, all available features
-# - pinned stable, latest stable, beta and nightly Rust releases
-# - Linux, OS X, Android, iOS, bare metal (i.e. no_std)
-# - x86_64, ARMv7, a Big-Endian arch (MIPS)
-matrix:
-  include:
-    - rust: 1.22.0
-      install:
-      script:
-        - cargo test --tests --no-default-features
-        - cargo test --package rand_core --no-default-features
-        - cargo test --features serde1,log
-    - rust: stable
-      os: osx
-      install:
-      script:
-        - cargo test --tests --no-default-features
-        - cargo test --package rand_core --no-default-features
-        - cargo test --features serde1,log
-    - rust: beta
-      install:
-      script:
-        - cargo test --tests --no-default-features
-        - cargo test --package rand_core --no-default-features
-        - cargo test --features serde1,log
-    - rust: nightly
-      install:
-        - cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo test --tests --no-default-features --features=alloc
-        - cargo test --package rand_core --no-default-features --features=alloc,serde1
-        - cargo test --features serde1,log,nightly,alloc
-        - cargo test --all --benches
-        # remove cached documentation, otherwise files from previous PRs can get included
-        - rm -rf target/doc
-        - cargo doc --no-deps --all --all-features
-        - cargo deadlinks --dir target/doc
-      after_success:
-        - travis-cargo --only nightly doc-upload
-
-    - rust: nightly
-      install:
-        - rustup target add wasm32-unknown-unknown
-        # Use cargo-update since we need a real update-or-install command
-        # Only install if not already installed:
-        #- cargo --list | egrep "\binstall-update$" -q || cargo install cargo-update
-        #- cargo install-update -i cargo-web
-        # Cargo has errors with sub-commands so ignore updating for now:
-        - cargo --list | egrep "^\s*web$" -q || cargo install cargo-web
-      script:
-        - cargo web test --target wasm32-unknown-unknown --nodejs --features=stdweb
-
-    - rust: nightly
-      install:
-        - rustup target add thumbv6m-none-eabi
-      script:
-        # Bare metal target; no std; only works on nightly
-        - cargo build --no-default-features --target thumbv6m-none-eabi --release
-
-    # Trust cross-built/emulated targets. We must repeat all non-default values.
-    - rust: stable
-      sudo: required
-      dist: trusty
-      services: docker
-      env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
-    - rust: stable
-      sudo: required
-      dist: trusty
-      services: docker
-      env: TARGET=mips-unknown-linux-gnu
-    - rust: stable
-      sudo: required
-      dist: trusty
-      services: docker
-      env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
-    - rust: stable
-      os: osx
-      sudo: required
-      dist: trusty
-      services: docker
-      env: TARGET=armv7-apple-ios DISABLE_TESTS=1
-
-before_install:
-  - set -e
-  - rustup self update
-
-# Used by all Trust targets; others must override:
-install:
-  - sh utils/ci/install.sh
-  - source ~/.cargo/env || true
-script:
-  - bash utils/ci/script.sh
-
-after_script: set +e
-
-cache: cargo
-before_cache:
-  # Travis can't cache files that are not readable by "others"
-  - chmod -R a+r $HOME/.cargo
-
-env:
-  global:
-    secure: "BdDntVHSompN+Qxz5Rz45VI4ZqhD72r6aPl166FADlnkIwS6N6FLWdqs51O7G5CpoMXEDvyYrjmRMZe/GYLIG9cmqmn/wUrWPO+PauGiIuG/D2dmfuUNvSTRcIe7UQLXrfP3yyfZPgqsH6pSnNEVopquQKy3KjzqepgriOJtbyY="
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/UPDATING.md cargo-0.33.0/vendor/rand-0.5.5/UPDATING.md
--- cargo-0.32.0/vendor/rand-0.5.5/UPDATING.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/UPDATING.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-# Update Guide
-
-This guide gives a few more details than the [changelog], in particular giving
-guidance on how to use new features and migrate away from old ones.
-
-[changelog]: CHANGELOG.md
-
-## Rand 0.5
-
-The 0.5 release has quite significant changes over the 0.4 release; as such,
-it may be worth reading through the following coverage of breaking changes.
-This release also contains many optimisations, which are not detailed below.
-
-### Crates
-
-We have a new crate: `rand_core`! This crate houses some important traits,
-`RngCore`, `BlockRngCore`, `SeedableRng` and `CryptoRng`, the error types, as
-well as two modules with helpers for implementations: `le` and `impls`. It is
-recommended that implementations of generators use the `rand_core` crate while
-other users use only the `rand` crate, which re-exports most parts of `rand_core`.
-
-The `rand_derive` crate has been deprecated due to very low usage and
-deprecation of `Rand`.
-
-### Features
-
-Several new Cargo feature flags have been added:
-
--   `alloc`, used without `std`, allows use of `Box` and `Vec`
--   `serde1` adds serialization support to some PRNGs
--   `log` adds logging in a few places (primarily to `OsRng` and `JitterRng`)
-
-### `Rng` and friends (core traits)
-
-`Rng` trait has been split into two traits, a "back end" `RngCore` (implemented
-by generators) and a "front end" `Rng` implementing all the convenient extension
-methods.
-
-Implementations of generators must `impl RngCore` instead. Usage of `rand_core`
-for implementations is encouraged; the `rand_core::{le, impls}` modules may
-prove useful.
-
-Users of `Rng` *who don't need to implement it* won't need to make so many
-changes; often users can forget about `RngCore` and only import `Rng`. Instead
-of `RngCore::next_u32()` / `next_u64()` users should prefer `Rng::gen()`, and
-instead of `RngCore::fill_bytes(dest)`, `Rng::fill(dest)` can be used.
-
-#### `Rng` / `RngCore` methods
-
-To allow error handling from fallible sources (e.g. `OsRng`), a new
-`RngCore::try_fill_bytes` method has been added; for example `EntropyRng` uses
-this mechanism to fall back to `JitterRng` if `OsRng` fails, and various
-handlers produce better error messages.
-As before, the other methods will panic on failure, but since these are usually
-used with algorithmic generators which are usually infallible, this is
-considered an appropriate compromise.
-
-A few methods from the old `Rng` have been removed or deprecated:
-
--   `next_f32` and `next_f64`; these are no longer implementable by generators;
-    use `gen` instead
--   `gen_iter`; users may instead use standard iterators with closures:
-    `::std::iter::repeat(()).map(|()| rng.gen())`
--   `gen_ascii_chars`; use `repeat` as above and `rng.sample(Alphanumeric)`
--   `gen_weighted_bool(n)`; use `gen_bool(1.0 / n)` instead
-
-`Rng` has a few new methods:
-
--   `sample(distr)` is a shortcut for `distr.sample(rng)` for any `Distribution`
--   `gen_bool(p)` generates a boolean with probability `p` of being true
--   `fill` and `try_fill`, corresponding to `fill_bytes` and `try_fill_bytes`
-    respectively (i.e. the only difference is error handling); these can fill
-    and integer slice / array directly, and provide better performance
-    than `gen()`
-
-#### Constructing PRNGs
-
-##### New randomly-initialised PRNGs
-
-A new trait has been added: `FromEntropy`. This is automatically implemented for
-any type supporting `SeedableRng`, and provides construction from fresh, strong
-entropy:
-
-```rust
-use rand::{ChaChaRng, FromEntropy};
-
-let mut rng = ChaChaRng::from_entropy();
-```
-
-##### Seeding PRNGs
-
-The `SeedableRng` trait has been modified to include the seed type via an
-associated type (`SeedableRng::Seed`) instead of a template parameter
-(`SeedableRng<Seed>`). Additionally, all PRNGs now seed from a byte-array
-(`[u8; N]` for some fixed N). This allows generic handling of PRNG seeding
-which was not previously possible.
-
-PRNGs are no longer constructed from other PRNGs via `Rand` support / `gen()`,
-but through `SeedableRng::from_rng`, which allows error handling and is
-intentionally explicit.
-
-`SeedableRng::reseed` has been removed since it has no utility over `from_seed`
-and its performance advantage is questionable.
-
-Implementations of `SeedableRng` may need to change their `Seed` type to a
-byte-array; this restriction has been made to ensure portable handling of
-Endianness. Helper functions are available in `rand_core::le` to read `u32` and
-`u64` values from byte arrays.
-
-#### Block-based PRNGs
-
-rand_core has a new helper trait, `BlockRngCore`, and implementation,
-`BlockRng`. These are for use by generators which generate a block of random
-data at a time instead of word-sized values. Using this trait and implementation
-has two advantages: optimised `RngCore` methods are provided, and the PRNG can
-be used with `ReseedingRng` with very low overhead.
-
-#### Cryptographic RNGs
-
-A new trait has been added: `CryptoRng`. This is purely a marker trait to
-indicate which generators should be suitable for cryptography, e.g.
-`fn foo<R: Rng + CryptoRng>(rng: &mut R)`. *Suitability for cryptographic
-use cannot be guaranteed.*
-
-### Error handling
-
-A new `Error` type has been added, designed explicitly for no-std compatibility,
-simplicity, and enough flexibility for our uses (carrying a `cause` when
-possible):
-```rust
-pub struct Error {
-    pub kind: ErrorKind,
-    pub msg: &'static str,
-    // some fields omitted
-}
-```
-The associated `ErrorKind` allows broad classification of errors into permanent,
-unexpected, transient and not-yet-ready kinds.
-
-The following use the new error type:
-
--   `RngCore::try_fill_bytes`
--   `Rng::try_fill`
--   `OsRng::new`
--   `JitterRng::new`
-
-### External generators
-
-We have a new generator, `EntropyRng`, which wraps `OsRng` and `JitterRng`
-(preferring to use the former, but falling back to the latter if necessary).
-This allows easy construction with fallback via `SeedableRng::from_rng`,
-e.g. `IsaacRng::from_rng(EntropyRng::new())?`. This is equivalent to using
-`FromEntropy` except for error handling.
-
-It is recommended to use `EntropyRng` over `OsRng` to avoid errors on platforms
-with broken system generator, but it should be noted that the `JitterRng`
-fallback is very slow.
-
-### PRNGs
-
-*Pseudo-Random Number Generators* (i.e. deterministic algorithmic generators)
-have had a few changes since 0.4, and are now housed in the `prng` module
-(old names remain temporarily available for compatibility; eventually these
-generators will likely be housed outside the `rand` crate).
-
-All PRNGs now do not implement `Copy` to prevent accidental copying of the
-generator's state (and thus repetitions of generated values). Explicit cloning
-via `Clone` is still available. All PRNGs now have a custom implementation of
-`Debug` which does not print any internal state; this helps avoid accidentally
-leaking cryptographic generator state in log files. External PRNG
-implementations are advised to follow this pattern (see also doc on `RngCore`).
-
-`SmallRng` has been added as a wrapper, currently around `XorShiftRng` (but
-likely another algorithm soon). This is for uses where small state and fast
-initialisation are important but cryptographic strength is not required.
-(Actual performance of generation varies by benchmark; dependending on usage
-this may or may not be the fastest algorithm, but will always be fast.)
-
-#### `ReseedingRng`
-
-The `ReseedingRng` wrapper has been signficantly altered to reduce overhead.
-Unfortunately the new `ReseedingRng` is not compatible with all RNGs, but only
-those using `BlockRngCore`.
-
-#### ISAAC PRNGs
-
-The `IsaacRng` and `Isaac64Rng` PRNGs now have an additional construction
-method: `new_from_u64(seed)`. 64 bits of state is insufficient for cryptography
-but may be of use in simulations and games. This will likely be superceeded by
-a method to construct any PRNG from any hashable object in the future.
-
-#### HC-128
-
-This is a new cryptographic generator, selected as one of the "stream ciphers
-suitable for widespread adoption" by eSTREAM. This is now the default
-cryptographic generator, used by `StdRng` and `thread_rng()`.
-
-### Helper functions/traits
-
-The `Rand` trait has been deprecated. Instead, users are encouraged to use
-`Standard` which is a real distribution and supports the same sampling as
-`Rand`. `Rng::gen()` now uses `Standard` and should work exactly as before.
-See the documentation of the `distributions` module on how to implement
-`Distribution<T>` for `Standard` for user types `T`
-
-`weak_rng()` has been deprecated; use `SmallRng::from_entropy()` instead.
-
-### Distributions
-
-The `Sample` and `IndependentSample` traits have been replaced by a single
-trait, `Distribution`. This is largely equivalent to `IndependentSample`, but
-with `ind_sample` replaced by just `sample`. Support for mutable distributions
-has been dropped; although it appears there may be a few genuine uses, these
-are not used widely enough to justify the existance of two independent traits
-or of having to provide mutable access to a distribution object. Both `Sample`
-and `IndependentSample` are still available, but deprecated; they will be
-removed in a future release.
-
-`Distribution::sample` (as well as several other functions) can now be called
-directly on type-erased (unsized) RNGs.
-
-`RandSample` has been removed (see `Rand` deprecation and new `Standard`
-distribution).
-
-The `Closed01` wrapper has been removed, but `OpenClosed01` has been added.
-
-#### Uniform distributions
-
-Two new distributions are available:
-
--   `Standard` produces uniformly-distributed samples for many different types,
-    and acts as a replacement for `Rand`
--   `Alphanumeric` samples `char`s from the ranges `a-z A-Z 0-9`
-
-##### Ranges
-
-The `Range` distribution has been heavily adapted, and renamed to `Uniform`:
-
--   `Uniform::new(low, high)` remains (half open `[low, high)`)
--   `Uniform::new_inclusive(low, high)` has been added, including `high` in the sample range
--   `Uniform::sample_single(low, high, rng)` is a faster variant for single usage sampling from `[low, high)`
-
-`Uniform` can now be implemented for user-defined types; see the `uniform` module.
-
-#### Non-uniform distributions
-
-Two distributions have been added:
-
--   Poisson, modelling the number of events expected from a constant-rate
-    source within a fixed time interval (e.g. nuclear decay)
--   Binomial, modelling the outcome of a fixed number of yes-no trials
-
-The sampling methods are based on those in "Numerical Recipes in C".
-
-##### Exponential and Normal distributions
-
-The main `Exp` and `Normal` distributions are unchanged, however the
-"standard" versions, `Exp1` and `StandardNormal` are no longer wrapper types,
-but full distributions. Instead of writing `let Exp1(x) = rng.gen();` you now
-write `let x = rng.sample(Exp1);`.
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/utils/ci/install.sh cargo-0.33.0/vendor/rand-0.5.5/utils/ci/install.sh
--- cargo-0.32.0/vendor/rand-0.5.5/utils/ci/install.sh	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/utils/ci/install.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-# From https://github.com/japaric/trust
-
-set -ex
-
-main() {
-    local target=
-    if [ $TRAVIS_OS_NAME = linux ]; then
-        target=x86_64-unknown-linux-musl
-        sort=sort
-    else
-        target=x86_64-apple-darwin
-        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
-    fi
-
-    # Builds for iOS are done on OSX, but require the specific target to be
-    # installed.
-    case $TARGET in
-        aarch64-apple-ios)
-            rustup target install aarch64-apple-ios
-            ;;
-        armv7-apple-ios)
-            rustup target install armv7-apple-ios
-            ;;
-        armv7s-apple-ios)
-            rustup target install armv7s-apple-ios
-            ;;
-        i386-apple-ios)
-            rustup target install i386-apple-ios
-            ;;
-        x86_64-apple-ios)
-            rustup target install x86_64-apple-ios
-            ;;
-    esac
-
-    # This fetches latest stable release
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
-                       | cut -d/ -f3 \
-                       | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
-                       | tail -n1)
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- \
-           --force \
-           --git japaric/cross \
-           --tag $tag \
-           --target $target
-}
-
-main
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/utils/ci/script.sh cargo-0.33.0/vendor/rand-0.5.5/utils/ci/script.sh
--- cargo-0.32.0/vendor/rand-0.5.5/utils/ci/script.sh	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/utils/ci/script.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# Derived from https://github.com/japaric/trust
-
-set -ex
-
-main() {
-    if [ ! -z $DISABLE_TESTS ]; then    # tests are disabled
-        cross build --no-default-features --target $TARGET --release
-        if [ -z $DISABLE_STD ]; then    # std is enabled
-            cross build --features log,serde1 --target $TARGET
-        fi
-        return
-    fi
-
-    if [ ! -z $NIGHTLY ]; then  # have nightly Rust
-        cross test --tests --no-default-features --features alloc --target $TARGET
-        cross test --package rand_core --no-default-features --features alloc --target $TARGET
-        cross test --features serde1,log,nightly,alloc --target $TARGET
-        cross test --all --benches --target $TARGET
-    else    # have stable Rust
-        cross test --tests --no-default-features --target $TARGET
-        cross test --package rand_core --no-default-features --target $TARGET
-        cross test --features serde1,log --target $TARGET
-    fi
-}
-
-# we don't run the "test phase" when doing deploys
-if [ -z $TRAVIS_TAG ]; then
-    main
-fi
diff -Nru cargo-0.32.0/vendor/rand-0.5.5/utils/ziggurat_tables.py cargo-0.33.0/vendor/rand-0.5.5/utils/ziggurat_tables.py
--- cargo-0.32.0/vendor/rand-0.5.5/utils/ziggurat_tables.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.5/utils/ziggurat_tables.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# https://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
-# This creates the tables used for distributions implemented using the
-# ziggurat algorithm in `rand::distributions;`. They are
-# (basically) the tables as used in the ZIGNOR variant (Doornik 2005).
-# They are changed rarely, so the generated file should be checked in
-# to git.
-#
-# It creates 3 tables: X as in the paper, F which is f(x_i), and
-# F_DIFF which is f(x_i) - f(x_{i-1}). The latter two are just cached
-# values which is not done in that paper (but is done in other
-# variants). Note that the adZigR table is unnecessary because of
-# algebra.
-#
-# It is designed to be compatible with Python 2 and 3.
-
-from math import exp, sqrt, log, floor
-import random
-
-# The order should match the return value of `tables`
-TABLE_NAMES = ['X', 'F']
-
-# The actual length of the table is 1 more, to stop
-# index-out-of-bounds errors. This should match the bitwise operation
-# to find `i` in `zigurrat` in `libstd/rand/mod.rs`. Also the *_R and
-# *_V constants below depend on this value.
-TABLE_LEN = 256
-
-# equivalent to `zigNorInit` in Doornik2005, but generalised to any
-# distribution. r = dR, v = dV, f = probability density function,
-# f_inv = inverse of f
-def tables(r, v, f, f_inv):
-    # compute the x_i
-    xvec = [0]*(TABLE_LEN+1)
-
-    xvec[0] = v / f(r)
-    xvec[1] = r
-
-    for i in range(2, TABLE_LEN):
-        last = xvec[i-1]
-        xvec[i] = f_inv(v / last + f(last))
-
-    # cache the f's
-    fvec = [0]*(TABLE_LEN+1)
-    for i in range(TABLE_LEN+1):
-        fvec[i] = f(xvec[i])
-
-    return xvec, fvec
-
-# Distributions
-# N(0, 1)
-def norm_f(x):
-    return exp(-x*x/2.0)
-def norm_f_inv(y):
-    return sqrt(-2.0*log(y))
-
-NORM_R = 3.6541528853610088
-NORM_V = 0.00492867323399
-
-NORM = tables(NORM_R, NORM_V,
-              norm_f, norm_f_inv)
-
-# Exp(1)
-def exp_f(x):
-    return exp(-x)
-def exp_f_inv(y):
-    return -log(y)
-
-EXP_R = 7.69711747013104972
-EXP_V = 0.0039496598225815571993
-
-EXP = tables(EXP_R, EXP_V,
-             exp_f, exp_f_inv)
-
-
-# Output the tables/constants/types
-
-def render_static(name, type, value):
-    # no space or
-    return 'pub static %s: %s =%s;\n' % (name, type, value)
-
-# static `name`: [`type`, .. `len(values)`] =
-#     [values[0], ..., values[3],
-#      values[4], ..., values[7],
-#      ... ];
-def render_table(name, values):
-    rows = []
-    # 4 values on each row
-    for i in range(0, len(values), 4):
-        row = values[i:i+4]
-        rows.append(', '.join('%.18f' % f for f in row))
-
-    rendered = '\n    [%s]' % ',\n     '.join(rows)
-    return render_static(name, '[f64, .. %d]' % len(values), rendered)
-
-
-with open('ziggurat_tables.rs', 'w') as f:
-    f.write('''// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Tables for distributions which are sampled using the ziggurat
-// algorithm. Autogenerated by `ziggurat_tables.py`.
-
-pub type ZigTable = &\'static [f64, .. %d];
-'''  % (TABLE_LEN + 1))
-    for name, tables, r in [('NORM', NORM, NORM_R),
-                            ('EXP', EXP, EXP_R)]:
-        f.write(render_static('ZIG_%s_R' % name, 'f64', ' %.18f' % r))
-        for (tabname, table) in zip(TABLE_NAMES, tables):
-            f.write(render_table('ZIG_%s_%s' % (name, tabname), table))
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/appveyor.yml cargo-0.33.0/vendor/rand-0.5.6/appveyor.yml
--- cargo-0.32.0/vendor/rand-0.5.6/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/appveyor.yml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,39 @@
+environment:
+
+  # At the time this was added AppVeyor was having troubles with checking
+  # revocation of SSL certificates of sites like static.rust-lang.org and what
+  # we think is crates.io. The libcurl HTTP client by default checks for
+  # revocation on Windows and according to a mailing list [1] this can be
+  # disabled.
+  #
+  # The `CARGO_HTTP_CHECK_REVOKE` env var here tells cargo to disable SSL
+  # revocation checking on Windows in libcurl. Note, though, that rustup, which
+  # we're using to download Rust here, also uses libcurl as the default backend.
+  # Unlike Cargo, however, rustup doesn't have a mechanism to disable revocation
+  # checking. To get rustup working we set `RUSTUP_USE_HYPER` which forces it to
+  # use the Hyper instead of libcurl backend. Both Hyper and libcurl use
+  # schannel on Windows but it appears that Hyper configures it slightly
+  # differently such that revocation checking isn't turned on by default.
+  #
+  # [1]: https://curl.haxx.se/mail/lib-2016-03/0202.html
+  RUSTUP_USE_HYPER: 1
+  CARGO_HTTP_CHECK_REVOKE: false
+
+  matrix:
+  - TARGET: x86_64-pc-windows-msvc
+  - TARGET: i686-pc-windows-msvc
+install:
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustc -V
+  - cargo -V
+
+build: false
+
+test_script:
+  - cargo test --all # cannot use --all and --features together
+  - cargo test --all --benches
+  - cargo test --features serde1,log,nightly
+  - cargo test --tests --no-default-features --features=alloc,serde1
+  - cargo test --package rand_core --no-default-features --features=alloc,serde1
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/benches/distributions.rs cargo-0.33.0/vendor/rand-0.5.6/benches/distributions.rs
--- cargo-0.32.0/vendor/rand-0.5.6/benches/distributions.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/benches/distributions.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,161 @@
+#![feature(test)]
+#![cfg_attr(all(feature="i128_support", feature="nightly"), allow(stable_features))] // stable since 2018-03-27
+#![cfg_attr(all(feature="i128_support", feature="nightly"), feature(i128_type, i128))]
+
+extern crate test;
+extern crate rand;
+
+const RAND_BENCH_N: u64 = 1000;
+
+use std::mem::size_of;
+use test::Bencher;
+
+use rand::{Rng, FromEntropy, XorShiftRng};
+use rand::distributions::*;
+
+macro_rules! distr_int {
+    ($fnn:ident, $ty:ty, $distr:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = XorShiftRng::from_entropy();
+            let distr = $distr;
+
+            b.iter(|| {
+                let mut accum = 0 as $ty;
+                for _ in 0..::RAND_BENCH_N {
+                    let x: $ty = distr.sample(&mut rng);
+                    accum = accum.wrapping_add(x);
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
+        }
+    }
+}
+
+macro_rules! distr_float {
+    ($fnn:ident, $ty:ty, $distr:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = XorShiftRng::from_entropy();
+            let distr = $distr;
+
+            b.iter(|| {
+                let mut accum = 0.0;
+                for _ in 0..::RAND_BENCH_N {
+                    let x: $ty = distr.sample(&mut rng);
+                    accum += x;
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
+        }
+    }
+}
+
+macro_rules! distr {
+    ($fnn:ident, $ty:ty, $distr:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = XorShiftRng::from_entropy();
+            let distr = $distr;
+
+            b.iter(|| {
+                let mut accum = 0u32;
+                for _ in 0..::RAND_BENCH_N {
+                    let x: $ty = distr.sample(&mut rng);
+                    accum = accum.wrapping_add(x as u32);
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
+        }
+    }
+}
+
+// uniform
+distr_int!(distr_uniform_i8, i8, Uniform::new(20i8, 100));
+distr_int!(distr_uniform_i16, i16, Uniform::new(-500i16, 2000));
+distr_int!(distr_uniform_i32, i32, Uniform::new(-200_000_000i32, 800_000_000));
+distr_int!(distr_uniform_i64, i64, Uniform::new(3i64, 123_456_789_123));
+#[cfg(feature = "i128_support")]
+distr_int!(distr_uniform_i128, i128, Uniform::new(-123_456_789_123i128, 123_456_789_123_456_789));
+
+distr_float!(distr_uniform_f32, f32, Uniform::new(2.26f32, 2.319));
+distr_float!(distr_uniform_f64, f64, Uniform::new(2.26f64, 2.319));
+
+// standard
+distr_int!(distr_standard_i8, i8, Standard);
+distr_int!(distr_standard_i16, i16, Standard);
+distr_int!(distr_standard_i32, i32, Standard);
+distr_int!(distr_standard_i64, i64, Standard);
+#[cfg(feature = "i128_support")]
+distr_int!(distr_standard_i128, i128, Standard);
+
+distr!(distr_standard_bool, bool, Standard);
+distr!(distr_standard_alphanumeric, char, Alphanumeric);
+distr!(distr_standard_codepoint, char, Standard);
+
+distr_float!(distr_standard_f32, f32, Standard);
+distr_float!(distr_standard_f64, f64, Standard);
+distr_float!(distr_open01_f32, f32, Open01);
+distr_float!(distr_open01_f64, f64, Open01);
+distr_float!(distr_openclosed01_f32, f32, OpenClosed01);
+distr_float!(distr_openclosed01_f64, f64, OpenClosed01);
+
+// distributions
+distr_float!(distr_exp, f64, Exp::new(1.23 * 4.56));
+distr_float!(distr_normal, f64, Normal::new(-1.23, 4.56));
+distr_float!(distr_log_normal, f64, LogNormal::new(-1.23, 4.56));
+distr_float!(distr_gamma_large_shape, f64, Gamma::new(10., 1.0));
+distr_float!(distr_gamma_small_shape, f64, Gamma::new(0.1, 1.0));
+distr_float!(distr_cauchy, f64, Cauchy::new(4.2, 6.9));
+distr_int!(distr_binomial, u64, Binomial::new(20, 0.7));
+distr_int!(distr_poisson, u64, Poisson::new(4.0));
+distr!(distr_bernoulli, bool, Bernoulli::new(0.18));
+
+
+// construct and sample from a range
+macro_rules! gen_range_int {
+    ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = XorShiftRng::from_entropy();
+
+            b.iter(|| {
+                let mut high = $high;
+                let mut accum: $ty = 0;
+                for _ in 0..::RAND_BENCH_N {
+                    accum = accum.wrapping_add(rng.gen_range($low, high));
+                    // force recalculation of range each time
+                    high = high.wrapping_add(1) & std::$ty::MAX;
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * ::RAND_BENCH_N;
+        }
+    }
+}
+
+gen_range_int!(gen_range_i8, i8, -20i8, 100);
+gen_range_int!(gen_range_i16, i16, -500i16, 2000);
+gen_range_int!(gen_range_i32, i32, -200_000_000i32, 800_000_000);
+gen_range_int!(gen_range_i64, i64, 3i64, 123_456_789_123);
+#[cfg(feature = "i128_support")]
+gen_range_int!(gen_range_i128, i128, -12345678901234i128, 123_456_789_123_456_789);
+
+#[bench]
+fn dist_iter(b: &mut Bencher) {
+    let mut rng = XorShiftRng::from_entropy();
+    let distr = Normal::new(-2.71828, 3.14159);
+    let mut iter = distr.sample_iter(&mut rng);
+
+    b.iter(|| {
+        let mut accum = 0.0;
+        for _ in 0..::RAND_BENCH_N {
+            accum += iter.next().unwrap();
+        }
+        accum
+    });
+    b.bytes = size_of::<f64>() as u64 * ::RAND_BENCH_N;
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/benches/generators.rs cargo-0.33.0/vendor/rand-0.5.6/benches/generators.rs
--- cargo-0.32.0/vendor/rand-0.5.6/benches/generators.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/benches/generators.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,176 @@
+#![feature(test)]
+
+extern crate test;
+extern crate rand;
+
+const RAND_BENCH_N: u64 = 1000;
+const BYTES_LEN: usize = 1024;
+
+use std::mem::size_of;
+use test::{black_box, Bencher};
+
+use rand::prelude::*;
+use rand::prng::{XorShiftRng, Hc128Rng, IsaacRng, Isaac64Rng, ChaChaRng};
+use rand::prng::hc128::Hc128Core;
+use rand::rngs::adapter::ReseedingRng;
+use rand::rngs::{OsRng, JitterRng, EntropyRng};
+
+macro_rules! gen_bytes {
+    ($fnn:ident, $gen:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = $gen;
+            let mut buf = [0u8; BYTES_LEN];
+            b.iter(|| {
+                for _ in 0..RAND_BENCH_N {
+                    rng.fill_bytes(&mut buf);
+                    black_box(buf);
+                }
+            });
+            b.bytes = BYTES_LEN as u64 * RAND_BENCH_N;
+        }
+    }
+}
+
+gen_bytes!(gen_bytes_xorshift, XorShiftRng::from_entropy());
+gen_bytes!(gen_bytes_chacha20, ChaChaRng::from_entropy());
+gen_bytes!(gen_bytes_hc128, Hc128Rng::from_entropy());
+gen_bytes!(gen_bytes_isaac, IsaacRng::from_entropy());
+gen_bytes!(gen_bytes_isaac64, Isaac64Rng::from_entropy());
+gen_bytes!(gen_bytes_std, StdRng::from_entropy());
+gen_bytes!(gen_bytes_small, SmallRng::from_entropy());
+gen_bytes!(gen_bytes_os, OsRng::new().unwrap());
+
+macro_rules! gen_uint {
+    ($fnn:ident, $ty:ty, $gen:expr) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = $gen;
+            b.iter(|| {
+                let mut accum: $ty = 0;
+                for _ in 0..RAND_BENCH_N {
+                    accum = accum.wrapping_add(rng.gen::<$ty>());
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
+        }
+    }
+}
+
+gen_uint!(gen_u32_xorshift, u32, XorShiftRng::from_entropy());
+gen_uint!(gen_u32_chacha20, u32, ChaChaRng::from_entropy());
+gen_uint!(gen_u32_hc128, u32, Hc128Rng::from_entropy());
+gen_uint!(gen_u32_isaac, u32, IsaacRng::from_entropy());
+gen_uint!(gen_u32_isaac64, u32, Isaac64Rng::from_entropy());
+gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
+gen_uint!(gen_u32_small, u32, SmallRng::from_entropy());
+gen_uint!(gen_u32_os, u32, OsRng::new().unwrap());
+
+gen_uint!(gen_u64_xorshift, u64, XorShiftRng::from_entropy());
+gen_uint!(gen_u64_chacha20, u64, ChaChaRng::from_entropy());
+gen_uint!(gen_u64_hc128, u64, Hc128Rng::from_entropy());
+gen_uint!(gen_u64_isaac, u64, IsaacRng::from_entropy());
+gen_uint!(gen_u64_isaac64, u64, Isaac64Rng::from_entropy());
+gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
+gen_uint!(gen_u64_small, u64, SmallRng::from_entropy());
+gen_uint!(gen_u64_os, u64, OsRng::new().unwrap());
+
+// Do not test JitterRng like the others by running it RAND_BENCH_N times per,
+// measurement, because it is way too slow. Only run it once.
+#[bench]
+fn gen_u64_jitter(b: &mut Bencher) {
+    let mut rng = JitterRng::new().unwrap();
+    b.iter(|| {
+        rng.gen::<u64>()
+    });
+    b.bytes = size_of::<u64>() as u64;
+}
+
+macro_rules! init_gen {
+    ($fnn:ident, $gen:ident) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = XorShiftRng::from_entropy();
+            b.iter(|| {
+                let r2 = $gen::from_rng(&mut rng).unwrap();
+                r2
+            });
+        }
+    }
+}
+
+init_gen!(init_xorshift, XorShiftRng);
+init_gen!(init_hc128, Hc128Rng);
+init_gen!(init_isaac, IsaacRng);
+init_gen!(init_isaac64, Isaac64Rng);
+init_gen!(init_chacha, ChaChaRng);
+
+#[bench]
+fn init_jitter(b: &mut Bencher) {
+    b.iter(|| {
+        JitterRng::new().unwrap()
+    });
+}
+
+
+const RESEEDING_THRESHOLD: u64 = 1024*1024*1024; // something high enough to get
+                                                 // deterministic measurements
+
+#[bench]
+fn reseeding_hc128_bytes(b: &mut Bencher) {
+    let mut rng = ReseedingRng::new(Hc128Core::from_entropy(),
+                                    RESEEDING_THRESHOLD,
+                                    EntropyRng::new());
+    let mut buf = [0u8; BYTES_LEN];
+    b.iter(|| {
+        for _ in 0..RAND_BENCH_N {
+            rng.fill_bytes(&mut buf);
+            black_box(buf);
+        }
+    });
+    b.bytes = BYTES_LEN as u64 * RAND_BENCH_N;
+}
+
+macro_rules! reseeding_uint {
+    ($fnn:ident, $ty:ty) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = ReseedingRng::new(Hc128Core::from_entropy(),
+                                            RESEEDING_THRESHOLD,
+                                            EntropyRng::new());
+            b.iter(|| {
+                let mut accum: $ty = 0;
+                for _ in 0..RAND_BENCH_N {
+                    accum = accum.wrapping_add(rng.gen::<$ty>());
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
+        }
+    }
+}
+
+reseeding_uint!(reseeding_hc128_u32, u32);
+reseeding_uint!(reseeding_hc128_u64, u64);
+
+
+macro_rules! threadrng_uint {
+    ($fnn:ident, $ty:ty) => {
+        #[bench]
+        fn $fnn(b: &mut Bencher) {
+            let mut rng = thread_rng();
+            b.iter(|| {
+                let mut accum: $ty = 0;
+                for _ in 0..RAND_BENCH_N {
+                    accum = accum.wrapping_add(rng.gen::<$ty>());
+                }
+                accum
+            });
+            b.bytes = size_of::<$ty>() as u64 * RAND_BENCH_N;
+        }
+    }
+}
+
+threadrng_uint!(thread_rng_u32, u32);
+threadrng_uint!(thread_rng_u64, u64);
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/benches/misc.rs cargo-0.33.0/vendor/rand-0.5.6/benches/misc.rs
--- cargo-0.32.0/vendor/rand-0.5.6/benches/misc.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/benches/misc.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,194 @@
+#![feature(test)]
+
+extern crate test;
+extern crate rand;
+
+const RAND_BENCH_N: u64 = 1000;
+
+use test::Bencher;
+
+use rand::prelude::*;
+use rand::seq::*;
+
+#[bench]
+fn misc_gen_bool_const(b: &mut Bencher) {
+    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        let mut accum = true;
+        for _ in 0..::RAND_BENCH_N {
+            accum ^= rng.gen_bool(0.18);
+        }
+        accum
+    })
+}
+
+#[bench]
+fn misc_gen_bool_var(b: &mut Bencher) {
+    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        let mut accum = true;
+        let mut p = 0.18;
+        for _ in 0..::RAND_BENCH_N {
+            accum ^= rng.gen_bool(p);
+            p += 0.0001;
+        }
+        accum
+    })
+}
+
+#[bench]
+fn misc_bernoulli_const(b: &mut Bencher) {
+    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
+    let d = rand::distributions::Bernoulli::new(0.18);
+    b.iter(|| {
+        // Can be evaluated at compile time.
+        let mut accum = true;
+        for _ in 0..::RAND_BENCH_N {
+            accum ^= rng.sample(d);
+        }
+        accum
+    })
+}
+
+#[bench]
+fn misc_bernoulli_var(b: &mut Bencher) {
+    let mut rng = StdRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        let mut accum = true;
+        let mut p = 0.18;
+        for _ in 0..::RAND_BENCH_N {
+            let d = rand::distributions::Bernoulli::new(p);
+            accum ^= rng.sample(d);
+            p += 0.0001;
+        }
+        accum
+    })
+}
+
+macro_rules! sample_binomial {
+    ($name:ident, $n:expr, $p:expr) => {
+        #[bench]
+        fn $name(b: &mut Bencher) {
+            let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
+            let (n, p) = ($n, $p);
+            b.iter(|| {
+                let d = rand::distributions::Binomial::new(n, p);
+                rng.sample(d)
+            })
+        }
+    }
+}
+
+sample_binomial!(misc_binomial_1, 1, 0.9);
+sample_binomial!(misc_binomial_10, 10, 0.9);
+sample_binomial!(misc_binomial_100, 100, 0.99);
+sample_binomial!(misc_binomial_1000, 1000, 0.01);
+sample_binomial!(misc_binomial_1e12, 1000_000_000_000, 0.2);
+
+#[bench]
+fn misc_shuffle_100(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
+    let x : &mut [usize] = &mut [1; 100];
+    b.iter(|| {
+        rng.shuffle(x);
+        x[0]
+    })
+}
+
+#[bench]
+fn misc_sample_iter_10_of_100(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
+    let x : &[usize] = &[1; 100];
+    b.iter(|| {
+        sample_iter(&mut rng, x, 10).unwrap_or_else(|e| e)
+    })
+}
+
+#[bench]
+fn misc_sample_slice_10_of_100(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
+    let x : &[usize] = &[1; 100];
+    b.iter(|| {
+        sample_slice(&mut rng, x, 10)
+    })
+}
+
+#[bench]
+fn misc_sample_slice_ref_10_of_100(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
+    let x : &[usize] = &[1; 100];
+    b.iter(|| {
+        sample_slice_ref(&mut rng, x, 10)
+    })
+}
+
+macro_rules! sample_indices {
+    ($name:ident, $amount:expr, $length:expr) => {
+        #[bench]
+        fn $name(b: &mut Bencher) {
+            let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
+            b.iter(|| {
+                sample_indices(&mut rng, $length, $amount)
+            })
+        }
+    }
+}
+
+sample_indices!(misc_sample_indices_10_of_1k, 10, 1000);
+sample_indices!(misc_sample_indices_50_of_1k, 50, 1000);
+sample_indices!(misc_sample_indices_100_of_1k, 100, 1000);
+
+#[bench]
+fn gen_1k_iter_repeat(b: &mut Bencher) {
+    use std::iter;
+    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        let v: Vec<u64> = iter::repeat(()).map(|()| rng.gen()).take(128).collect();
+        v
+    });
+    b.bytes = 1024;
+}
+
+#[bench]
+#[allow(deprecated)]
+fn gen_1k_gen_iter(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        let v: Vec<u64> = rng.gen_iter().take(128).collect();
+        v
+    });
+    b.bytes = 1024;
+}
+
+#[bench]
+fn gen_1k_sample_iter(b: &mut Bencher) {
+    use rand::distributions::{Distribution, Standard};
+    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
+        v
+    });
+    b.bytes = 1024;
+}
+
+#[bench]
+fn gen_1k_gen_array(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
+    b.iter(|| {
+        // max supported array length is 32!
+        let v: [[u64; 32]; 4] = rng.gen();
+        v
+    });
+    b.bytes = 1024;
+}
+
+#[bench]
+fn gen_1k_fill(b: &mut Bencher) {
+    let mut rng = SmallRng::from_rng(&mut thread_rng()).unwrap();
+    let mut buf = [0u64; 128];
+    b.iter(|| {
+        rng.fill(&mut buf[..]);
+        buf
+    });
+    b.bytes = 1024;
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/.cargo-checksum.json cargo-0.33.0/vendor/rand-0.5.6/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand-0.5.6/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/Cargo.toml cargo-0.33.0/vendor/rand-0.5.6/Cargo.toml
--- cargo-0.32.0/vendor/rand-0.5.6/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,72 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "rand"
+version = "0.5.6"
+authors = ["The Rust Project Developers"]
+description = "Random number generators and other randomness functionality.\n"
+homepage = "https://crates.io/crates/rand"
+documentation = "https://docs.rs/rand"
+readme = "README.md"
+keywords = ["random", "rng"]
+categories = ["algorithms", "no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-lang-nursery/rand"
+[package.metadata.docs.rs]
+all-features = true
+[dependencies.log]
+version = "0.4"
+optional = true
+
+[dependencies.rand_core]
+version = "0.3"
+default-features = false
+
+[dependencies.serde]
+version = "1"
+optional = true
+
+[dependencies.serde_derive]
+version = "1"
+optional = true
+[dev-dependencies.bincode]
+version = "1.0"
+
+[features]
+alloc = ["rand_core/alloc"]
+default = ["std"]
+i128_support = []
+nightly = ["i128_support"]
+serde1 = ["serde", "serde_derive", "rand_core/serde1"]
+std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-cprng"]
+[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
+version = "0.0.3"
+optional = true
+[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-cprng]
+version = "0.1.0"
+optional = true
+[target."cfg(unix)".dependencies.libc]
+version = "0.2"
+optional = true
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3"
+features = ["minwindef", "ntsecapi", "profileapi", "winnt"]
+optional = true
+[target.wasm32-unknown-unknown.dependencies.stdweb]
+version = "0.4"
+optional = true
+[badges.appveyor]
+repository = "alexcrichton/rand"
+
+[badges.travis-ci]
+repository = "rust-lang-nursery/rand"
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/CHANGELOG.md cargo-0.33.0/vendor/rand-0.5.6/CHANGELOG.md
--- cargo-0.32.0/vendor/rand-0.5.6/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,422 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+A [separate changelog is kept for rand_core](rand_core/CHANGELOG.md).
+
+You may also find the [Update Guide](UPDATING.md) useful.
+
+
+## [0.5.6] - 2019-01-25
+### Platforms
+- Fuchsia: Replaced fuchsia-zircon with fuchsia-cprng
+
+
+## [0.5.5] - 2018-08-07
+### Documentation
+- Fix links in documentation (#582)
+
+
+## [0.5.4] - 2018-07-11
+### Platform support
+- Make `OsRng` work via WASM/stdweb for WebWorkers
+
+
+## [0.5.3] - 2018-06-26
+### Platform support
+- OpenBSD, Bitrig: fix compilation (broken in 0.5.1) (#530)
+
+
+## [0.5.2] - 2018-06-18
+### Platform support
+- Hide `OsRng` and `JitterRng` on unsupported platforms (#512; fixes #503).
+
+
+## [0.5.1] - 2018-06-08
+
+### New distributions
+- Added Cauchy distribution. (#474, #486)
+- Added Pareto distribution. (#495)
+
+### Platform support and `OsRng`
+- Remove blanket Unix implementation. (#484)
+- Remove Wasm unimplemented stub. (#484)
+- Dragonfly BSD: read from `/dev/random`. (#484)
+- Bitrig: use `getentropy` like OpenBSD. (#484)
+- Solaris: (untested) use `getrandom` if available, otherwise `/dev/random`. (#484)
+- Emscripten, `stdweb`: split the read up in chunks. (#484)
+- Emscripten, Haiku: don't do an extra blocking read from `/dev/random`. (#484)
+- Linux, NetBSD, Solaris: read in blocking mode on first use in `fill_bytes`. (#484)
+- Fuchsia, CloudABI: fix compilation (broken in Rand 0.5). (#484)
+
+
+## [0.5.0] - 2018-05-21
+
+### Crate features and organisation
+- Minimum Rust version update: 1.22.0. (#239)
+- Create a separate `rand_core` crate. (#288)
+- Deprecate `rand_derive`. (#256)
+- Add `prelude` (and module reorganisation). (#435)
+- Add `log` feature. Logging is now available in `JitterRng`, `OsRng`, `EntropyRng` and `ReseedingRng`. (#246)
+- Add `serde1` feature for some PRNGs. (#189)
+- `stdweb` feature for `OsRng` support on WASM via stdweb. (#272, #336)
+
+### `Rng` trait
+- Split `Rng` in `RngCore` and `Rng` extension trait.
+  `next_u32`, `next_u64` and `fill_bytes` are now part of `RngCore`. (#265)
+- Add `Rng::sample`. (#256)
+- Deprecate `Rng::gen_weighted_bool`. (#308)
+- Add `Rng::gen_bool`. (#308)
+- Remove `Rng::next_f32` and `Rng::next_f64`. (#273)
+- Add optimized `Rng::fill` and `Rng::try_fill` methods. (#247)
+- Deprecate `Rng::gen_iter`. (#286)
+- Deprecate `Rng::gen_ascii_chars`. (#279)
+
+### `rand_core` crate
+- `rand` now depends on new `rand_core` crate (#288)
+- `RngCore` and `SeedableRng` are now part of `rand_core`. (#288)
+- Add modules to help implementing RNGs `impl` and `le`. (#209, #228)
+- Add `Error` and `ErrorKind`. (#225)
+- Add `CryptoRng` marker trait. (#273)
+- Add `BlockRngCore` trait. (#281)
+- Add `BlockRng` and `BlockRng64` wrappers to help implementations. (#281, #325)
+- Revise the `SeedableRng` trait. (#233)
+- Remove default implementations for `RngCore::next_u64` and `RngCore::fill_bytes`. (#288)
+- Add `RngCore::try_fill_bytes`. (#225)
+
+### Other traits and types
+- Add `FromEntropy` trait. (#233, #375)
+- Add `SmallRng` wrapper. (#296)
+- Rewrite `ReseedingRng` to only work with `BlockRngCore` (substantial performance improvement). (#281)
+- Deprecate `weak_rng`. Use `SmallRng` instead. (#296)
+- Deprecate `AsciiGenerator`. (#279)
+
+### Random number generators
+- Switch `StdRng` and `thread_rng` to HC-128. (#277)
+- `StdRng` must now be created with `from_entropy` instead of `new`
+- Change `thread_rng` reseeding threshold to 32 MiB. (#277)
+- PRNGs no longer implement `Copy`. (#209)
+- `Debug` implementations no longer show internals. (#209)
+- Implement `Clone` for `ReseedingRng`, `JitterRng`, OsRng`. (#383, #384)
+- Implement serialization for `XorShiftRng`, `IsaacRng` and `Isaac64Rng` under the `serde1` feature. (#189)
+- Implement `BlockRngCore` for `ChaChaCore` and `Hc128Core`. (#281)
+- All PRNGs are now portable across big- and little-endian architectures. (#209)
+- `Isaac64Rng::next_u32` no longer throws away half the results. (#209)
+- Add `IsaacRng::new_from_u64` and `Isaac64Rng::new_from_u64`. (#209)
+- Add the HC-128 CSPRNG `Hc128Rng`. (#210)
+- Change ChaCha20 to have 64-bit counter and 64-bit stream. (#349)
+- Changes to `JitterRng` to get its size down from 2112 to 24 bytes. (#251)
+- Various performance improvements to all PRNGs.
+
+### Platform support and `OsRng`
+- Add support for CloudABI. (#224)
+- Remove support for NaCl. (#225)
+- WASM support for `OsRng` via stdweb, behind the `stdweb` feature. (#272, #336)
+- Use `getrandom` on more platforms for Linux, and on Android. (#338)
+- Use the `SecRandomCopyBytes` interface on macOS. (#322)
+- On systems that do not have a syscall interface, only keep a single file descriptor open for `OsRng`. (#239)
+- On Unix, first try a single read from `/dev/random`, then `/dev/urandom`. (#338)
+- Better error handling and reporting in `OsRng` (using new error type). (#225)
+- `OsRng` now uses non-blocking when available. (#225)
+- Add `EntropyRng`, which provides `OsRng`, but has `JitterRng` as a fallback. (#235)
+
+### Distributions
+- New `Distribution` trait. (#256)
+- Add `Distribution::sample_iter` and `Rng::::sample_iter`. (#361)
+- Deprecate `Rand`, `Sample` and `IndependentSample` traits. (#256)
+- Add a `Standard` distribution (replaces most `Rand` implementations). (#256)
+- Add `Binomial` and `Poisson` distributions. (#96)
+- Add `Bernoulli` dsitribution. (#411)
+- Add `Alphanumeric` distribution. (#279)
+- Remove `Closed01` distribution, add `OpenClosed01`. (#274, #420)
+- Rework `Range` type, making it possible to implement it for user types. (#274)
+- Rename `Range` to `Uniform`. (#395)
+- Add `Uniform::new_inclusive` for inclusive ranges. (#274)
+- Use widening multiply method for much faster integer range reduction. (#274)
+- `Standard` distribution for `char` uses `Uniform` internally. (#274)
+- `Standard` distribution for `bool` uses sign test. (#274)
+- Implement `Standard` distribution for `Wrapping<T>`. (#436)
+- Implement `Uniform` distribution for `Duration`. (#427)
+
+
+## [0.4.3] - 2018-08-16
+### Fixed
+- Use correct syscall number for PowerPC (#589)
+
+
+## [0.4.2] - 2018-01-06
+### Changed
+- Use `winapi` on Windows
+- Update for Fuchsia OS
+- Remove dev-dependency on `log`
+
+
+## [0.4.1] - 2017-12-17
+### Added
+- `no_std` support
+
+
+## [0.4.0-pre.0] - 2017-12-11
+### Added
+- `JitterRng` added as a high-quality alternative entropy source using the
+  system timer
+- new `seq` module with `sample_iter`, `sample_slice`, etc.
+- WASM support via dummy implementations (fail at run-time)
+- Additional benchmarks, covering generators and new seq code
+
+### Changed
+- `thread_rng` uses `JitterRng` if seeding from system time fails
+  (slower but more secure than previous method)
+
+### Deprecated
+  - `sample` function deprecated (replaced by `sample_iter`)
+
+
+## [0.3.20] - 2018-01-06
+### Changed
+- Remove dev-dependency on `log`
+- Update `fuchsia-zircon` dependency to 0.3.2
+
+
+## [0.3.19] - 2017-12-27
+### Changed
+- Require `log <= 0.3.8` for dev builds
+- Update `fuchsia-zircon` dependency to 0.3
+- Fix broken links in docs (to unblock compiler docs testing CI)
+
+
+## [0.3.18] - 2017-11-06
+### Changed
+- `thread_rng` is seeded from the system time if `OsRng` fails
+- `weak_rng` now uses `thread_rng` internally
+
+
+## [0.3.17] - 2017-10-07
+### Changed
+ - Fuchsia: Magenta was renamed Zircon
+
+## [0.3.16] - 2017-07-27
+### Added
+- Implement Debug for mote non-public types
+- implement `Rand` for (i|u)i128
+- Support for Fuchsia
+
+### Changed
+- Add inline attribute to SampleRange::construct_range.
+  This improves the benchmark for sample in 11% and for shuffle in 16%.
+- Use `RtlGenRandom` instead of `CryptGenRandom`
+
+
+## [0.3.15] - 2016-11-26
+### Added
+- Add `Rng` trait method `choose_mut`
+- Redox support
+
+### Changed
+- Use `arc4rand` for `OsRng` on FreeBSD.
+- Use `arc4random(3)` for `OsRng` on OpenBSD.
+
+### Fixed
+- Fix filling buffers 4 GiB or larger with `OsRng::fill_bytes` on Windows
+
+
+## [0.3.14] - 2016-02-13
+### Fixed
+- Inline definitions from winapi/advapi32, wich decreases build times
+
+
+## [0.3.13] - 2016-01-09
+### Fixed
+- Compatible with Rust 1.7.0-nightly (needed some extra type annotations)
+
+
+## [0.3.12] - 2015-11-09
+### Changed
+- Replaced the methods in `next_f32` and `next_f64` with the technique described
+  Saito & Matsumoto at MCQMC'08. The new method should exhibit a slightly more
+  uniform distribution.
+- Depend on libc 0.2
+
+### Fixed
+- Fix iterator protocol issue in `rand::sample`
+
+
+## [0.3.11] - 2015-08-31
+### Added
+- Implement `Rand` for arrays with n <= 32
+
+
+## [0.3.10] - 2015-08-17
+### Added
+- Support for NaCl platforms
+
+### Changed
+- Allow `Rng` to be `?Sized`, impl for `&mut R` and `Box<R>` where `R: ?Sized + Rng`
+
+
+## [0.3.9] - 2015-06-18
+### Changed
+- Use `winapi` for Windows API things
+
+### Fixed
+- Fixed test on stable/nightly
+- Fix `getrandom` syscall number for aarch64-unknown-linux-gnu
+
+
+## [0.3.8] - 2015-04-23
+### Changed
+- `log` is a dev dependency
+
+### Fixed
+- Fix race condition of atomics in `is_getrandom_available`
+
+
+## [0.3.7] - 2015-04-03
+### Fixed
+- Derive Copy/Clone changes
+
+
+## [0.3.6] - 2015-04-02
+### Changed
+- Move to stable Rust!
+
+
+## [0.3.5] - 2015-04-01
+### Fixed
+- Compatible with Rust master
+
+
+## [0.3.4] - 2015-03-31
+### Added
+- Implement Clone for `Weighted`
+
+### Fixed
+- Compatible with Rust master
+
+
+## [0.3.3] - 2015-03-26
+### Fixed
+- Fix compile on Windows
+
+
+## [0.3.2] - 2015-03-26
+
+
+## [0.3.1] - 2015-03-26
+### Fixed
+- Fix compile on Windows
+
+
+## [0.3.0] - 2015-03-25
+### Changed
+- Update to use log version 0.3.x
+
+
+## [0.2.1] - 2015-03-22
+### Fixed
+- Compatible with Rust master
+- Fixed iOS compilation
+
+
+## [0.2.0] - 2015-03-06
+### Fixed
+- Compatible with Rust master (move from `old_io` to `std::io`)
+
+
+## [0.1.4] - 2015-03-04
+### Fixed
+- Compatible with Rust master (use wrapping ops)
+
+
+## [0.1.3] - 2015-02-20
+### Fixed
+- Compatible with Rust master
+
+### Removed
+- Removed Copy implementations from RNGs
+
+
+## [0.1.2] - 2015-02-03
+### Added
+- Imported functionality from `std::rand`, including:
+  - `StdRng`, `SeedableRng`, `TreadRng`, `weak_rng()`
+  - `ReaderRng`: A wrapper around any Reader to treat it as an RNG.
+- Imported documentation from `std::rand`
+- Imported tests from `std::rand`
+
+
+## [0.1.1] - 2015-02-03
+### Added
+- Migrate to a cargo-compatible directory structure.
+
+### Fixed
+- Do not use entropy during `gen_weighted_bool(1)`
+
+
+## [Rust 0.12.0] - 2014-10-09
+### Added
+- Impl Rand for tuples of arity 11 and 12
+- Include ChaCha pseudorandom generator
+- Add `next_f64` and `next_f32` to Rng
+- Implement Clone for PRNGs
+
+### Changed
+- Rename `TaskRng` to `ThreadRng` and `task_rng` to `thread_rng` (since a
+  runtime is removed from Rust).
+
+### Fixed
+- Improved performance of ISAAC and ISAAC64 by 30% and 12 % respectively, by
+  informing the optimiser that indexing is never out-of-bounds.
+
+### Removed
+- Removed the Deprecated `choose_option`
+
+
+## [Rust 0.11.0] - 2014-07-02
+### Added
+- document when to use `OSRng` in cryptographic context, and explain why we use `/dev/urandom` instead of `/dev/random`
+- `Rng::gen_iter()` which will return an infinite stream of random values
+- `Rng::gen_ascii_chars()` which will return an infinite stream of random ascii characters
+
+### Changed
+- Now only depends on libcore!
+- Remove `Rng.choose()`, rename `Rng.choose_option()` to `.choose()`
+- Rename OSRng to OsRng
+- The WeightedChoice structure is no longer built with a `Vec<Weighted<T>>`,
+  but rather a `&mut [Weighted<T>]`. This means that the WeightedChoice
+  structure now has a lifetime associated with it.
+- The `sample` method on `Rng` has been moved to a top-level function in the
+  `rand` module due to its dependence on `Vec`.
+
+### Removed
+- `Rng::gen_vec()` was removed. Previous behavior can be regained with
+  `rng.gen_iter().take(n).collect()`
+- `Rng::gen_ascii_str()` was removed. Previous behavior can be regained with
+  `rng.gen_ascii_chars().take(n).collect()`
+- {IsaacRng, Isaac64Rng, XorShiftRng}::new() have all been removed. These all
+  relied on being able to use an OSRng for seeding, but this is no longer
+  available in librand (where these types are defined). To retain the same
+  functionality, these types now implement the `Rand` trait so they can be
+  generated with a random seed from another random number generator. This allows
+  the stdlib to use an OSRng to create seeded instances of these RNGs.
+- Rand implementations for `Box<T>` and `@T` were removed. These seemed to be
+  pretty rare in the codebase, and it allows for librand to not depend on
+  liballoc.  Additionally, other pointer types like Rc<T> and Arc<T> were not
+  supported.
+- Remove a slew of old deprecated functions
+
+
+## [Rust 0.10] - 2014-04-03
+### Changed
+- replace `Rng.shuffle's` functionality with `.shuffle_mut`
+- bubble up IO errors when creating an OSRng
+
+### Fixed
+- Use `fill()` instead of `read()`
+- Rewrite OsRng in Rust for windows
+
+## [0.10-pre] - 2014-03-02
+### Added
+- Seperate `rand` out of the standard library
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/CONTRIBUTING.md cargo-0.33.0/vendor/rand-0.5.6/CONTRIBUTING.md
--- cargo-0.32.0/vendor/rand-0.5.6/CONTRIBUTING.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/CONTRIBUTING.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,93 @@
+# Contributing to Rand
+
+Thank you for your interest in contributing to Rand!
+
+The following is a list of notes and tips for when you want to contribute to
+Rand with a pull request.
+
+If you want to make major changes, it is usually best to open an issue to
+discuss the idea first.
+
+Rand doesn't (yet) use rustfmt. It is best to follow the style of the
+surrounding code, and try to keep an 80 character line limit.
+
+
+## Documentation
+
+We especially welcome documentation PRs.
+
+As of Rust 1.25 there are differences in how stable and nightly render
+documentation links. Make sure it works on stable, then nightly should be good
+too. One Travis CI build checks for dead links using `cargo-deadlinks`. If you
+want to run the check locally:
+```sh
+cargo install cargo-deadlinks
+# It is recommended to remove left-over files from previous compilations
+rm -rf /target/doc
+cargo doc --no-deps
+cargo deadlinks --dir target/doc
+```
+
+When making changes to code examples in the documentation, make sure they build
+with:
+```sh
+cargo test --doc
+```
+
+A helpful command to rebuild documentation automatically on save (only works on
+Linux):
+```
+while inotifywait -r -e close_write src/ rand_core/; do cargo doc; done
+```
+
+
+## Testing
+
+Rand already contains a number of unit tests, but could use more. Also the
+existing ones could use clean-up. Any work on the tests is appreciated.
+
+Not every change or new bit of functionality requires tests, but if you can
+think of a test that adds value, please add it.
+
+Depending on the code you change, test with one of:
+```sh
+cargo test
+cargo test --package rand_core
+# Test log, serde and 128-bit support
+cargo test --features serde1,log,nightly
+```
+
+We want to be able to not only run the unit tests with `std` available, but also
+without. Because `thread_rng()` and `FromEntropy` are not available without the
+`std` feature, you may have to disable a new test with `#[cfg(feature="std")]`.
+In other cases using `::test::rng` with a constant seed is a good option:
+```rust
+let mut rng = ::test::rng(528); // just pick some number
+```
+
+Only the unit tests should work in `no_std` mode, we don't want to complicate
+the doc-tests. Run the tests with:
+```sh
+# Test no_std support
+cargo test --lib --no-default-features
+cargo test --package rand_core --no-default-features
+
+# Test no_std+alloc support; requires nightly
+cargo test --lib --no-default-features --features alloc
+```
+
+
+## Benchmarking
+
+A lot of code in Rand is performance-sensitive, most of it is expected to be
+used in hot loops in some libraries/applications. If you change code in the
+`rngs`, `prngs` or `distributions` modules, especially when you see an 'obvious
+cleanup', make sure the benchmarks do not regress. It is nice to report the
+benchmark results in the PR (or to report nothing's changed).
+
+```sh
+# Benchmarks (requires nightly)
+cargo bench
+# Some benchmarks have a faster path with i128_support
+cargo bench --features=nightly
+```
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/examples/monte-carlo.rs cargo-0.33.0/vendor/rand-0.5.6/examples/monte-carlo.rs
--- cargo-0.32.0/vendor/rand-0.5.6/examples/monte-carlo.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/examples/monte-carlo.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,52 @@
+// Copyright 2013-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! # Monte Carlo estimation of π
+//!
+//! Imagine that we have a square with sides of length 2 and a unit circle
+//! (radius = 1), both centered at the origin. The areas are:
+//! 
+//! ```text
+//!     area of circle  = πr² = π * r * r = π
+//!     area of square  = 2² = 4
+//! ```
+//!
+//! The circle is entirely within the square, so if we sample many points
+//! randomly from the square, roughly π / 4 of them should be inside the circle.
+//!
+//! We can use the above fact to estimate the value of π: pick many points in
+//! the square at random, calculate the fraction that fall within the circle,
+//! and multiply this fraction by 4.
+
+#![cfg(feature="std")]
+
+
+extern crate rand;
+
+use rand::distributions::{Distribution, Uniform};
+
+fn main() {
+   let range = Uniform::new(-1.0f64, 1.0);
+   let mut rng = rand::thread_rng();
+
+   let total = 1_000_000;
+   let mut in_circle = 0;
+
+   for _ in 0..total {
+       let a = range.sample(&mut rng);
+       let b = range.sample(&mut rng);
+       if a*a + b*b <= 1.0 {
+           in_circle += 1;
+       }
+   }
+
+   // prints something close to 3.14159...
+   println!("π is approximately {}", 4. * (in_circle as f64) / (total as f64));
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/examples/monty-hall.rs cargo-0.33.0/vendor/rand-0.5.6/examples/monty-hall.rs
--- cargo-0.32.0/vendor/rand-0.5.6/examples/monty-hall.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/examples/monty-hall.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,117 @@
+// Copyright 2013-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! ## Monty Hall Problem
+//!
+//! This is a simulation of the [Monty Hall Problem][]:
+//!
+//! > Suppose you're on a game show, and you're given the choice of three doors:
+//! > Behind one door is a car; behind the others, goats. You pick a door, say
+//! > No. 1, and the host, who knows what's behind the doors, opens another
+//! > door, say No. 3, which has a goat. He then says to you, "Do you want to
+//! > pick door No. 2?" Is it to your advantage to switch your choice?
+//!
+//! The rather unintuitive answer is that you will have a 2/3 chance of winning
+//! if you switch and a 1/3 chance of winning if you don't, so it's better to
+//! switch.
+//!
+//! This program will simulate the game show and with large enough simulation
+//! steps it will indeed confirm that it is better to switch.
+//!
+//! [Monty Hall Problem]: https://en.wikipedia.org/wiki/Monty_Hall_problem
+
+#![cfg(feature="std")]
+
+
+extern crate rand;
+
+use rand::Rng;
+use rand::distributions::{Distribution, Uniform};
+
+struct SimulationResult {
+    win: bool,
+    switch: bool,
+}
+
+// Run a single simulation of the Monty Hall problem.
+fn simulate<R: Rng>(random_door: &Uniform<u32>, rng: &mut R)
+                    -> SimulationResult {
+    let car = random_door.sample(rng);
+
+    // This is our initial choice
+    let mut choice = random_door.sample(rng);
+
+    // The game host opens a door
+    let open = game_host_open(car, choice, rng);
+
+    // Shall we switch?
+    let switch = rng.gen();
+    if switch {
+        choice = switch_door(choice, open);
+    }
+
+    SimulationResult { win: choice == car, switch }
+}
+
+// Returns the door the game host opens given our choice and knowledge of
+// where the car is. The game host will never open the door with the car.
+fn game_host_open<R: Rng>(car: u32, choice: u32, rng: &mut R) -> u32 {
+    let choices = free_doors(&[car, choice]);
+    rand::seq::sample_slice(rng, &choices, 1)[0]
+}
+
+// Returns the door we switch to, given our current choice and
+// the open door. There will only be one valid door.
+fn switch_door(choice: u32, open: u32) -> u32 {
+    free_doors(&[choice, open])[0]
+}
+
+fn free_doors(blocked: &[u32]) -> Vec<u32> {
+    (0..3).filter(|x| !blocked.contains(x)).collect()
+}
+
+fn main() {
+    // The estimation will be more accurate with more simulations
+    let num_simulations = 10000;
+
+    let mut rng = rand::thread_rng();
+    let random_door = Uniform::new(0u32, 3);
+
+    let (mut switch_wins, mut switch_losses) = (0, 0);
+    let (mut keep_wins, mut keep_losses) = (0, 0);
+
+    println!("Running {} simulations...", num_simulations);
+    for _ in 0..num_simulations {
+        let result = simulate(&random_door, &mut rng);
+
+        match (result.win, result.switch) {
+            (true, true) => switch_wins += 1,
+            (true, false) => keep_wins += 1,
+            (false, true) => switch_losses += 1,
+            (false, false) => keep_losses += 1,
+        }
+    }
+
+    let total_switches = switch_wins + switch_losses;
+    let total_keeps = keep_wins + keep_losses;
+
+    println!("Switched door {} times with {} wins and {} losses",
+             total_switches, switch_wins, switch_losses);
+
+    println!("Kept our choice {} times with {} wins and {} losses",
+             total_keeps, keep_wins, keep_losses);
+
+    // With a large number of simulations, the values should converge to
+    // 0.667 and 0.333 respectively.
+    println!("Estimated chance to win if we switch: {}",
+             switch_wins as f32 / total_switches as f32);
+    println!("Estimated chance to win if we don't: {}",
+             keep_wins as f32 / total_keeps as f32);
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/LICENSE-APACHE cargo-0.33.0/vendor/rand-0.5.6/LICENSE-APACHE
--- cargo-0.32.0/vendor/rand-0.5.6/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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
+
+	https://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.
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/LICENSE-MIT cargo-0.33.0/vendor/rand-0.5.6/LICENSE-MIT
--- cargo-0.32.0/vendor/rand-0.5.6/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/README.md cargo-0.33.0/vendor/rand-0.5.6/README.md
--- cargo-0.32.0/vendor/rand-0.5.6/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,143 @@
+# Rand
+
+[![Build Status](https://travis-ci.org/rust-lang-nursery/rand.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/rand)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-lang-nursery/rand?svg=true)](https://ci.appveyor.com/project/alexcrichton/rand)
+[![Latest version](https://img.shields.io/crates/v/rand.svg)](https://crates.io/crates/rand)
+[![Documentation](https://docs.rs/rand/badge.svg)](https://docs.rs/rand)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-yellow.svg)](https://github.com/rust-lang-nursery/rand#rust-version-requirements)
+
+A Rust library for random number generation.
+
+Rand provides utilities to generate random numbers, to convert them to useful
+types and distributions, and some randomness-related algorithms.
+
+The core random number generation traits of Rand live in the [rand_core](
+https://crates.io/crates/rand_core) crate; this crate is most useful when
+implementing RNGs.
+
+API reference:
+[master branch](https://rust-lang-nursery.github.io/rand/rand/index.html),
+[by release](https://docs.rs/rand/0.5).
+
+## Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+rand = "0.5"
+```
+
+and this to your crate root:
+
+```rust
+extern crate rand;
+
+use rand::prelude::*;
+
+fn main() {
+  // basic usage with random():
+  let x: u8 = random();
+  println!("{}", x);
+
+  let y = random::<f64>();
+  println!("{}", y);
+
+  if random() { // generates a boolean
+      println!("Heads!");
+  }
+
+  // normal usage needs both an RNG and a function to generate the appropriate
+  // type, range, distribution, etc.
+  let mut rng = thread_rng();
+  if rng.gen() { // random bool
+      let x: f64 = rng.gen(); // random number in range [0, 1)
+      println!("x is: {}", x);
+      let ch = rng.gen::<char>(); // Sometimes you need type annotation
+      println!("char is: {}", ch);
+      println!("Number from 0 to 9: {}", rng.gen_range(0, 10));
+  }
+}
+```
+
+## Functionality
+
+The Rand crate provides:
+
+- A convenient to use default RNG, `thread_rng`: an automatically seeded,
+  crypto-grade generator stored in thread-local memory.
+- Pseudo-random number generators: `StdRng`, `SmallRng`, `prng` module.
+- Functionality for seeding PRNGs: the `FromEntropy` trait, and as sources of
+  external randomness `EntropyRng`, `OsRng` and `JitterRng`.
+- Most content from [`rand_core`](https://crates.io/crates/rand_core)
+  (re-exported): base random number generator traits and error-reporting types.
+- 'Distributions' producing many different types of random values:
+  - A `Standard` distribution for integers, floats, and derived types including
+    tuples, arrays and `Option`
+  - Unbiased sampling from specified `Uniform` ranges.
+  - Sampling from exponential/normal/gamma distributions.
+  - Sampling from binomial/poisson distributions.
+  - `gen_bool` aka Bernoulli distribution.
+- `seq`-uence related functionality:
+  - Sampling a subset of elements.
+  - Randomly shuffling a list.
+
+
+## Versions
+
+Version 0.5 is the latest version and contains many breaking changes.
+See [the Upgrade Guide](UPDATING.md) for guidance on updating from previous
+versions.
+
+Version 0.4 was released in December 2017. It contains almost no breaking
+changes since the 0.3 series.
+
+For more details, see the [changelog](CHANGELOG.md).
+
+### Rust version requirements
+
+The 0.5 release of Rand requires **Rustc version 1.22 or greater**.
+Rand 0.4 and 0.3 (since approx. June 2017) require Rustc version 1.15 or
+greater. Subsets of the Rand code may work with older Rust versions, but this
+is not supported.
+
+Travis CI always has a build with a pinned version of Rustc matching the oldest
+supported Rust release. The current policy is that this can be updated in any
+Rand release if required, but the change must be noted in the changelog.
+
+
+## Crate Features
+
+Rand is built with only the `std` feature enabled by default. The following
+optional features are available:
+
+- `alloc` can be used instead of `std` to provide `Vec` and `Box`.
+- `i128_support` enables support for generating `u128` and `i128` values.
+- `log` enables some logging via the `log` crate.
+- `nightly` enables all unstable features (`i128_support`).
+- `serde1` enables serialization for some types, via Serde version 1.
+- `stdweb` enables support for `OsRng` on `wasm-unknown-unknown` via `stdweb`
+  combined with `cargo-web`.
+
+`no_std` mode is activated by setting `default-features = false`; this removes
+functionality depending on `std`:
+
+- `thread_rng()`, and `random()` are not available, as they require thread-local
+  storage and an entropy source.
+- `OsRng` and `EntropyRng` are unavailable.
+- `JitterRng` code is still present, but a nanosecond timer must be provided via
+  `JitterRng::new_with_timer`
+- Since no external entropy is available, it is not possible to create
+  generators with fresh seeds using the `FromEntropy` trait (user must provide
+  a seed).
+- Exponential, normal and gamma type distributions are unavailable since `exp`
+  and `log` functions are not provided in `core`.
+- The `seq`-uence module is unavailable, as it requires `Vec`.
+
+
+# License
+
+Rand is distributed under the terms of both the MIT license and the
+Apache License (Version 2.0).
+
+See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/bernoulli.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/bernoulli.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/bernoulli.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/bernoulli.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,120 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+//! The Bernoulli distribution.
+
+use Rng;
+use distributions::Distribution;
+
+/// The Bernoulli distribution.
+///
+/// This is a special case of the Binomial distribution where `n = 1`.
+///
+/// # Example
+///
+/// ```rust
+/// use rand::distributions::{Bernoulli, Distribution};
+///
+/// let d = Bernoulli::new(0.3);
+/// let v = d.sample(&mut rand::thread_rng());
+/// println!("{} is from a Bernoulli distribution", v);
+/// ```
+///
+/// # Precision
+///
+/// This `Bernoulli` distribution uses 64 bits from the RNG (a `u64`),
+/// so only probabilities that are multiples of 2<sup>-64</sup> can be
+/// represented.
+#[derive(Clone, Copy, Debug)]
+pub struct Bernoulli {
+    /// Probability of success, relative to the maximal integer.
+    p_int: u64,
+}
+
+impl Bernoulli {
+    /// Construct a new `Bernoulli` with the given probability of success `p`.
+    ///
+    /// # Panics
+    ///
+    /// If `p < 0` or `p > 1`.
+    ///
+    /// # Precision
+    ///
+    /// For `p = 1.0`, the resulting distribution will always generate true.
+    /// For `p = 0.0`, the resulting distribution will always generate false.
+    ///
+    /// This method is accurate for any input `p` in the range `[0, 1]` which is
+    /// a multiple of 2<sup>-64</sup>. (Note that not all multiples of
+    /// 2<sup>-64</sup> in `[0, 1]` can be represented as a `f64`.)
+    #[inline]
+    pub fn new(p: f64) -> Bernoulli {
+        assert!((p >= 0.0) & (p <= 1.0), "Bernoulli::new not called with 0 <= p <= 0");
+        // Technically, this should be 2^64 or `u64::MAX + 1` because we compare
+        // using `<` when sampling. However, `u64::MAX` rounds to an `f64`
+        // larger than `u64::MAX` anyway.
+        const MAX_P_INT: f64 = ::core::u64::MAX as f64;
+        let p_int = if p < 1.0 {
+            (p * MAX_P_INT) as u64
+        } else {
+            // Avoid overflow: `MAX_P_INT` cannot be represented as u64.
+            ::core::u64::MAX
+        };
+        Bernoulli { p_int }
+    }
+}
+
+impl Distribution<bool> for Bernoulli {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> bool {
+        // Make sure to always return true for p = 1.0.
+        if self.p_int == ::core::u64::MAX {
+            return true;
+        }
+        let r: u64 = rng.gen();
+        r < self.p_int
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use Rng;
+    use distributions::Distribution;
+    use super::Bernoulli;
+
+    #[test]
+    fn test_trivial() {
+        let mut r = ::test::rng(1);
+        let always_false = Bernoulli::new(0.0);
+        let always_true = Bernoulli::new(1.0);
+        for _ in 0..5 {
+            assert_eq!(r.sample::<bool, _>(&always_false), false);
+            assert_eq!(r.sample::<bool, _>(&always_true), true);
+            assert_eq!(Distribution::<bool>::sample(&always_false, &mut r), false);
+            assert_eq!(Distribution::<bool>::sample(&always_true, &mut r), true);
+        }
+    }
+
+    #[test]
+    fn test_average() {
+        const P: f64 = 0.3;
+        let d = Bernoulli::new(P);
+        const N: u32 = 10_000_000;
+
+        let mut sum: u32 = 0;
+        let mut rng = ::test::rng(2);
+        for _ in 0..N {
+            if d.sample(&mut rng) {
+                sum += 1;
+            }
+        }
+        let avg = (sum as f64) / (N as f64);
+
+        assert!((avg - P).abs() < 1e-3);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/binomial.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/binomial.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/binomial.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/binomial.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,178 @@
+// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The binomial distribution.
+
+use Rng;
+use distributions::{Distribution, Bernoulli, Cauchy};
+use distributions::log_gamma::log_gamma;
+
+/// The binomial distribution `Binomial(n, p)`.
+///
+/// This distribution has density function:
+/// `f(k) = n!/(k! (n-k)!) p^k (1-p)^(n-k)` for `k >= 0`.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Binomial, Distribution};
+///
+/// let bin = Binomial::new(20, 0.3);
+/// let v = bin.sample(&mut rand::thread_rng());
+/// println!("{} is from a binomial distribution", v);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Binomial {
+    /// Number of trials.
+    n: u64,
+    /// Probability of success.
+    p: f64,
+}
+
+impl Binomial {
+    /// Construct a new `Binomial` with the given shape parameters `n` (number
+    /// of trials) and `p` (probability of success).
+    ///
+    /// Panics if `p < 0` or `p > 1`.
+    pub fn new(n: u64, p: f64) -> Binomial {
+        assert!(p >= 0.0, "Binomial::new called with p < 0");
+        assert!(p <= 1.0, "Binomial::new called with p > 1");
+        Binomial { n, p }
+    }
+}
+
+impl Distribution<u64> for Binomial {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
+        // Handle these values directly.
+        if self.p == 0.0 {
+            return 0;
+        } else if self.p == 1.0 {
+            return self.n;
+        }
+        
+        // For low n, it is faster to sample directly. For both methods,
+        // performance is independent of p. On Intel Haswell CPU this method
+        // appears to be faster for approx n < 300.
+        if self.n < 300 {
+            let mut result = 0;
+            let d = Bernoulli::new(self.p);
+            for _ in 0 .. self.n {
+                result += rng.sample(d) as u32;
+            }
+            return result as u64;
+        }
+        
+        // binomial distribution is symmetrical with respect to p -> 1-p, k -> n-k
+        // switch p so that it is less than 0.5 - this allows for lower expected values
+        // we will just invert the result at the end
+        let p = if self.p <= 0.5 {
+            self.p
+        } else {
+            1.0 - self.p
+        };
+
+        // prepare some cached values
+        let float_n = self.n as f64;
+        let ln_fact_n = log_gamma(float_n + 1.0);
+        let pc = 1.0 - p;
+        let log_p = p.ln();
+        let log_pc = pc.ln();
+        let expected = self.n as f64 * p;
+        let sq = (expected * (2.0 * pc)).sqrt();
+
+        let mut lresult;
+
+        // we use the Cauchy distribution as the comparison distribution
+        // f(x) ~ 1/(1+x^2)
+        let cauchy = Cauchy::new(0.0, 1.0);
+        loop {
+            let mut comp_dev: f64;
+            loop {
+                // draw from the Cauchy distribution
+                comp_dev = rng.sample(cauchy);
+                // shift the peak of the comparison ditribution
+                lresult = expected + sq * comp_dev;
+                // repeat the drawing until we are in the range of possible values
+                if lresult >= 0.0 && lresult < float_n + 1.0 {
+                    break;
+                }
+            }
+
+            // the result should be discrete
+            lresult = lresult.floor();
+
+            let log_binomial_dist = ln_fact_n - log_gamma(lresult+1.0) -
+                log_gamma(float_n - lresult + 1.0) + lresult*log_p + (float_n - lresult)*log_pc;
+            // this is the binomial probability divided by the comparison probability
+            // we will generate a uniform random value and if it is larger than this,
+            // we interpret it as a value falling out of the distribution and repeat
+            let comparison_coeff = (log_binomial_dist.exp() * sq) * (1.2 * (1.0 + comp_dev*comp_dev));
+
+            if comparison_coeff >= rng.gen() {
+                break;
+            }
+        }
+
+        // invert the result for p < 0.5
+        if p != self.p {
+            self.n - lresult as u64
+        } else {
+            lresult as u64
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use Rng;
+    use distributions::Distribution;
+    use super::Binomial;
+
+    fn test_binomial_mean_and_variance<R: Rng>(n: u64, p: f64, rng: &mut R) {
+        let binomial = Binomial::new(n, p);
+
+        let expected_mean = n as f64 * p;
+        let expected_variance = n as f64 * p * (1.0 - p);
+
+        let mut results = [0.0; 1000];
+        for i in results.iter_mut() { *i = binomial.sample(rng) as f64; }
+
+        let mean = results.iter().sum::<f64>() / results.len() as f64;
+        assert!((mean as f64 - expected_mean).abs() < expected_mean / 50.0);
+
+        let variance =
+            results.iter().map(|x| (x - mean) * (x - mean)).sum::<f64>()
+            / results.len() as f64;
+        assert!((variance - expected_variance).abs() < expected_variance / 10.0);
+    }
+
+    #[test]
+    fn test_binomial() {
+        let mut rng = ::test::rng(351);
+        test_binomial_mean_and_variance(150, 0.1, &mut rng);
+        test_binomial_mean_and_variance(70, 0.6, &mut rng);
+        test_binomial_mean_and_variance(40, 0.5, &mut rng);
+        test_binomial_mean_and_variance(20, 0.7, &mut rng);
+        test_binomial_mean_and_variance(20, 0.5, &mut rng);
+    }
+
+    #[test]
+    fn test_binomial_end_points() {
+        let mut rng = ::test::rng(352);
+        assert_eq!(rng.sample(Binomial::new(20, 0.0)), 0);
+        assert_eq!(rng.sample(Binomial::new(20, 1.0)), 20);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_binomial_invalid_lambda_neg() {
+        Binomial::new(20, -10.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/cauchy.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/cauchy.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/cauchy.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/cauchy.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,116 @@
+// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The Cauchy distribution.
+
+use Rng;
+use distributions::Distribution;
+use std::f64::consts::PI;
+
+/// The Cauchy distribution `Cauchy(median, scale)`.
+///
+/// This distribution has a density function:
+/// `f(x) = 1 / (pi * scale * (1 + ((x - median) / scale)^2))`
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Cauchy, Distribution};
+///
+/// let cau = Cauchy::new(2.0, 5.0);
+/// let v = cau.sample(&mut rand::thread_rng());
+/// println!("{} is from a Cauchy(2, 5) distribution", v);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Cauchy {
+    median: f64,
+    scale: f64
+}
+
+impl Cauchy {
+    /// Construct a new `Cauchy` with the given shape parameters
+    /// `median` the peak location and `scale` the scale factor.
+    /// Panics if `scale <= 0`.
+    pub fn new(median: f64, scale: f64) -> Cauchy {
+        assert!(scale > 0.0, "Cauchy::new called with scale factor <= 0");
+        Cauchy {
+            median,
+            scale
+        }
+    }
+}
+
+impl Distribution<f64> for Cauchy {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        // sample from [0, 1)
+        let x = rng.gen::<f64>();
+        // get standard cauchy random number
+        // note that π/2 is not exactly representable, even if x=0.5 the result is finite
+        let comp_dev = (PI * x).tan();
+        // shift and scale according to parameters
+        let result = self.median + self.scale * comp_dev;
+        result
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use distributions::Distribution;
+    use super::Cauchy;
+
+    fn median(mut numbers: &mut [f64]) -> f64 {
+        sort(&mut numbers);
+        let mid = numbers.len() / 2;
+        numbers[mid]
+    }
+
+    fn sort(numbers: &mut [f64]) {
+        numbers.sort_by(|a, b| a.partial_cmp(b).unwrap());
+    }
+
+    #[test]
+    fn test_cauchy_median() {
+        let cauchy = Cauchy::new(10.0, 5.0);
+        let mut rng = ::test::rng(123);
+        let mut numbers: [f64; 1000] = [0.0; 1000];
+        for i in 0..1000 {
+            numbers[i] = cauchy.sample(&mut rng);
+        }
+        let median = median(&mut numbers);
+        println!("Cauchy median: {}", median);
+        assert!((median - 10.0).abs() < 0.5); // not 100% certain, but probable enough
+    }
+
+    #[test]
+    fn test_cauchy_mean() {
+        let cauchy = Cauchy::new(10.0, 5.0);
+        let mut rng = ::test::rng(123);
+        let mut sum = 0.0;
+        for _ in 0..1000 {
+            sum += cauchy.sample(&mut rng);
+        }
+        let mean = sum / 1000.0;
+        println!("Cauchy mean: {}", mean);
+        // for a Cauchy distribution the mean should not converge
+        assert!((mean - 10.0).abs() > 0.5); // not 100% certain, but probable enough
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_cauchy_invalid_scale_zero() {
+        Cauchy::new(0.0, 0.0);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_cauchy_invalid_scale_neg() {
+        Cauchy::new(0.0, -10.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/exponential.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/exponential.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/exponential.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/exponential.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,122 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The exponential distribution.
+
+use {Rng};
+use distributions::{ziggurat, ziggurat_tables, Distribution};
+
+/// Samples floating-point numbers according to the exponential distribution,
+/// with rate parameter `λ = 1`. This is equivalent to `Exp::new(1.0)` or
+/// sampling with `-rng.gen::<f64>().ln()`, but faster.
+///
+/// See `Exp` for the general exponential distribution.
+///
+/// Implemented via the ZIGNOR variant[^1] of the Ziggurat method. The exact
+/// description in the paper was adjusted to use tables for the exponential
+/// distribution rather than normal.
+///
+/// [^1]: Jurgen A. Doornik (2005). [*An Improved Ziggurat Method to
+///       Generate Normal Random Samples*](
+///       https://www.doornik.com/research/ziggurat.pdf).
+///       Nuffield College, Oxford
+///
+/// # Example
+/// ```
+/// use rand::prelude::*;
+/// use rand::distributions::Exp1;
+///
+/// let val: f64 = SmallRng::from_entropy().sample(Exp1);
+/// println!("{}", val);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Exp1;
+
+// This could be done via `-rng.gen::<f64>().ln()` but that is slower.
+impl Distribution<f64> for Exp1 {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        #[inline]
+        fn pdf(x: f64) -> f64 {
+            (-x).exp()
+        }
+        #[inline]
+        fn zero_case<R: Rng + ?Sized>(rng: &mut R, _u: f64) -> f64 {
+            ziggurat_tables::ZIG_EXP_R - rng.gen::<f64>().ln()
+        }
+
+        ziggurat(rng, false,
+                 &ziggurat_tables::ZIG_EXP_X,
+                 &ziggurat_tables::ZIG_EXP_F,
+                 pdf, zero_case)
+    }
+}
+
+/// The exponential distribution `Exp(lambda)`.
+///
+/// This distribution has density function: `f(x) = lambda * exp(-lambda * x)`
+/// for `x > 0`.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Exp, Distribution};
+///
+/// let exp = Exp::new(2.0);
+/// let v = exp.sample(&mut rand::thread_rng());
+/// println!("{} is from a Exp(2) distribution", v);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Exp {
+    /// `lambda` stored as `1/lambda`, since this is what we scale by.
+    lambda_inverse: f64
+}
+
+impl Exp {
+    /// Construct a new `Exp` with the given shape parameter
+    /// `lambda`. Panics if `lambda <= 0`.
+    #[inline]
+    pub fn new(lambda: f64) -> Exp {
+        assert!(lambda > 0.0, "Exp::new called with `lambda` <= 0");
+        Exp { lambda_inverse: 1.0 / lambda }
+    }
+}
+
+impl Distribution<f64> for Exp {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        let n: f64 = rng.sample(Exp1);
+        n * self.lambda_inverse
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use distributions::Distribution;
+    use super::Exp;
+
+    #[test]
+    fn test_exp() {
+        let exp = Exp::new(10.0);
+        let mut rng = ::test::rng(221);
+        for _ in 0..1000 {
+            assert!(exp.sample(&mut rng) >= 0.0);
+        }
+    }
+    #[test]
+    #[should_panic]
+    fn test_exp_invalid_lambda_zero() {
+        Exp::new(0.0);
+    }
+    #[test]
+    #[should_panic]
+    fn test_exp_invalid_lambda_neg() {
+        Exp::new(-10.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/float.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/float.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/float.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/float.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,206 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Basic floating-point number distributions
+
+use core::mem;
+use Rng;
+use distributions::{Distribution, Standard};
+
+/// A distribution to sample floating point numbers uniformly in the half-open
+/// interval `(0, 1]`, i.e. including 1 but not 0.
+///
+/// All values that can be generated are of the form `n * ε/2`. For `f32`
+/// the 23 most significant random bits of a `u32` are used and for `f64` the
+/// 53 most significant bits of a `u64` are used. The conversion uses the
+/// multiplicative method.
+///
+/// See also: [`Standard`] which samples from `[0, 1)`, [`Open01`]
+/// which samples from `(0, 1)` and [`Uniform`] which samples from arbitrary
+/// ranges.
+///
+/// # Example
+/// ```
+/// use rand::{thread_rng, Rng};
+/// use rand::distributions::OpenClosed01;
+///
+/// let val: f32 = thread_rng().sample(OpenClosed01);
+/// println!("f32 from (0, 1): {}", val);
+/// ```
+///
+/// [`Standard`]: struct.Standard.html
+/// [`Open01`]: struct.Open01.html
+/// [`Uniform`]: uniform/struct.Uniform.html
+#[derive(Clone, Copy, Debug)]
+pub struct OpenClosed01;
+
+/// A distribution to sample floating point numbers uniformly in the open
+/// interval `(0, 1)`, i.e. not including either endpoint.
+///
+/// All values that can be generated are of the form `n * ε + ε/2`. For `f32`
+/// the 22 most significant random bits of an `u32` are used, for `f64` 52 from
+/// an `u64`. The conversion uses a transmute-based method.
+///
+/// See also: [`Standard`] which samples from `[0, 1)`, [`OpenClosed01`]
+/// which samples from `(0, 1]` and [`Uniform`] which samples from arbitrary
+/// ranges.
+///
+/// # Example
+/// ```
+/// use rand::{thread_rng, Rng};
+/// use rand::distributions::Open01;
+///
+/// let val: f32 = thread_rng().sample(Open01);
+/// println!("f32 from (0, 1): {}", val);
+/// ```
+///
+/// [`Standard`]: struct.Standard.html
+/// [`OpenClosed01`]: struct.OpenClosed01.html
+/// [`Uniform`]: uniform/struct.Uniform.html
+#[derive(Clone, Copy, Debug)]
+pub struct Open01;
+
+
+pub(crate) trait IntoFloat {
+    type F;
+
+    /// Helper method to combine the fraction and a contant exponent into a
+    /// float.
+    ///
+    /// Only the least significant bits of `self` may be set, 23 for `f32` and
+    /// 52 for `f64`.
+    /// The resulting value will fall in a range that depends on the exponent.
+    /// As an example the range with exponent 0 will be
+    /// [2<sup>0</sup>..2<sup>1</sup>), which is [1..2).
+    fn into_float_with_exponent(self, exponent: i32) -> Self::F;
+}
+
+macro_rules! float_impls {
+    ($ty:ty, $uty:ty, $fraction_bits:expr, $exponent_bias:expr) => {
+        impl IntoFloat for $uty {
+            type F = $ty;
+            #[inline(always)]
+            fn into_float_with_exponent(self, exponent: i32) -> $ty {
+                // The exponent is encoded using an offset-binary representation
+                let exponent_bits =
+                    (($exponent_bias + exponent) as $uty) << $fraction_bits;
+                unsafe { mem::transmute(self | exponent_bits) }
+            }
+        }
+
+        impl Distribution<$ty> for Standard {
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
+                // Multiply-based method; 24/53 random bits; [0, 1) interval.
+                // We use the most significant bits because for simple RNGs
+                // those are usually more random.
+                let float_size = mem::size_of::<$ty>() * 8;
+                let precision = $fraction_bits + 1;
+                let scale = 1.0 / ((1 as $uty << precision) as $ty);
+
+                let value: $uty = rng.gen();
+                scale * (value >> (float_size - precision)) as $ty
+            }
+        }
+
+        impl Distribution<$ty> for OpenClosed01 {
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
+                // Multiply-based method; 24/53 random bits; (0, 1] interval.
+                // We use the most significant bits because for simple RNGs
+                // those are usually more random.
+                let float_size = mem::size_of::<$ty>() * 8;
+                let precision = $fraction_bits + 1;
+                let scale = 1.0 / ((1 as $uty << precision) as $ty);
+
+                let value: $uty = rng.gen();
+                let value = value >> (float_size - precision);
+                // Add 1 to shift up; will not overflow because of right-shift:
+                scale * (value + 1) as $ty
+            }
+        }
+
+        impl Distribution<$ty> for Open01 {
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
+                // Transmute-based method; 23/52 random bits; (0, 1) interval.
+                // We use the most significant bits because for simple RNGs
+                // those are usually more random.
+                const EPSILON: $ty = 1.0 / (1u64 << $fraction_bits) as $ty;
+                let float_size = mem::size_of::<$ty>() * 8;
+
+                let value: $uty = rng.gen();
+                let fraction = value >> (float_size - $fraction_bits);
+                fraction.into_float_with_exponent(0) - (1.0 - EPSILON / 2.0)
+            }
+        }
+    }
+}
+float_impls! { f32, u32, 23, 127 }
+float_impls! { f64, u64, 52, 1023 }
+
+
+#[cfg(test)]
+mod tests {
+    use Rng;
+    use distributions::{Open01, OpenClosed01};
+    use rngs::mock::StepRng;
+
+    const EPSILON32: f32 = ::core::f32::EPSILON;
+    const EPSILON64: f64 = ::core::f64::EPSILON;
+
+    #[test]
+    fn standard_fp_edge_cases() {
+        let mut zeros = StepRng::new(0, 0);
+        assert_eq!(zeros.gen::<f32>(), 0.0);
+        assert_eq!(zeros.gen::<f64>(), 0.0);
+
+        let mut one32 = StepRng::new(1 << 8, 0);
+        assert_eq!(one32.gen::<f32>(), EPSILON32 / 2.0);
+
+        let mut one64 = StepRng::new(1 << 11, 0);
+        assert_eq!(one64.gen::<f64>(), EPSILON64 / 2.0);
+
+        let mut max = StepRng::new(!0, 0);
+        assert_eq!(max.gen::<f32>(), 1.0 - EPSILON32 / 2.0);
+        assert_eq!(max.gen::<f64>(), 1.0 - EPSILON64 / 2.0);
+    }
+
+    #[test]
+    fn openclosed01_edge_cases() {
+        let mut zeros = StepRng::new(0, 0);
+        assert_eq!(zeros.sample::<f32, _>(OpenClosed01), 0.0 + EPSILON32 / 2.0);
+        assert_eq!(zeros.sample::<f64, _>(OpenClosed01), 0.0 + EPSILON64 / 2.0);
+
+        let mut one32 = StepRng::new(1 << 8, 0);
+        assert_eq!(one32.sample::<f32, _>(OpenClosed01), EPSILON32);
+
+        let mut one64 = StepRng::new(1 << 11, 0);
+        assert_eq!(one64.sample::<f64, _>(OpenClosed01), EPSILON64);
+
+        let mut max = StepRng::new(!0, 0);
+        assert_eq!(max.sample::<f32, _>(OpenClosed01), 1.0);
+        assert_eq!(max.sample::<f64, _>(OpenClosed01), 1.0);
+    }
+
+    #[test]
+    fn open01_edge_cases() {
+        let mut zeros = StepRng::new(0, 0);
+        assert_eq!(zeros.sample::<f32, _>(Open01), 0.0 + EPSILON32 / 2.0);
+        assert_eq!(zeros.sample::<f64, _>(Open01), 0.0 + EPSILON64 / 2.0);
+
+        let mut one32 = StepRng::new(1 << 9, 0);
+        assert_eq!(one32.sample::<f32, _>(Open01), EPSILON32 / 2.0 * 3.0);
+
+        let mut one64 = StepRng::new(1 << 12, 0);
+        assert_eq!(one64.sample::<f64, _>(Open01), EPSILON64 / 2.0 * 3.0);
+
+        let mut max = StepRng::new(!0, 0);
+        assert_eq!(max.sample::<f32, _>(Open01), 1.0 - EPSILON32 / 2.0);
+        assert_eq!(max.sample::<f64, _>(Open01), 1.0 - EPSILON64 / 2.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/gamma.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/gamma.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/gamma.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/gamma.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,360 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The Gamma and derived distributions.
+
+use self::GammaRepr::*;
+use self::ChiSquaredRepr::*;
+
+use Rng;
+use distributions::normal::StandardNormal;
+use distributions::{Distribution, Exp, Open01};
+
+/// The Gamma distribution `Gamma(shape, scale)` distribution.
+///
+/// The density function of this distribution is
+///
+/// ```text
+/// f(x) =  x^(k - 1) * exp(-x / θ) / (Γ(k) * θ^k)
+/// ```
+///
+/// where `Γ` is the Gamma function, `k` is the shape and `θ` is the
+/// scale and both `k` and `θ` are strictly positive.
+///
+/// The algorithm used is that described by Marsaglia & Tsang 2000[^1],
+/// falling back to directly sampling from an Exponential for `shape
+/// == 1`, and using the boosting technique described in that paper for
+/// `shape < 1`.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Distribution, Gamma};
+///
+/// let gamma = Gamma::new(2.0, 5.0);
+/// let v = gamma.sample(&mut rand::thread_rng());
+/// println!("{} is from a Gamma(2, 5) distribution", v);
+/// ```
+///
+/// [^1]: George Marsaglia and Wai Wan Tsang. 2000. "A Simple Method for
+///       Generating Gamma Variables" *ACM Trans. Math. Softw.* 26, 3
+///       (September 2000), 363-372.
+///       DOI:[10.1145/358407.358414](https://doi.acm.org/10.1145/358407.358414)
+#[derive(Clone, Copy, Debug)]
+pub struct Gamma {
+    repr: GammaRepr,
+}
+
+#[derive(Clone, Copy, Debug)]
+enum GammaRepr {
+    Large(GammaLargeShape),
+    One(Exp),
+    Small(GammaSmallShape)
+}
+
+// These two helpers could be made public, but saving the
+// match-on-Gamma-enum branch from using them directly (e.g. if one
+// knows that the shape is always > 1) doesn't appear to be much
+// faster.
+
+/// Gamma distribution where the shape parameter is less than 1.
+///
+/// Note, samples from this require a compulsory floating-point `pow`
+/// call, which makes it significantly slower than sampling from a
+/// gamma distribution where the shape parameter is greater than or
+/// equal to 1.
+///
+/// See `Gamma` for sampling from a Gamma distribution with general
+/// shape parameters.
+#[derive(Clone, Copy, Debug)]
+struct GammaSmallShape {
+    inv_shape: f64,
+    large_shape: GammaLargeShape
+}
+
+/// Gamma distribution where the shape parameter is larger than 1.
+///
+/// See `Gamma` for sampling from a Gamma distribution with general
+/// shape parameters.
+#[derive(Clone, Copy, Debug)]
+struct GammaLargeShape {
+    scale: f64,
+    c: f64,
+    d: f64
+}
+
+impl Gamma {
+    /// Construct an object representing the `Gamma(shape, scale)`
+    /// distribution.
+    ///
+    /// Panics if `shape <= 0` or `scale <= 0`.
+    #[inline]
+    pub fn new(shape: f64, scale: f64) -> Gamma {
+        assert!(shape > 0.0, "Gamma::new called with shape <= 0");
+        assert!(scale > 0.0, "Gamma::new called with scale <= 0");
+
+        let repr = if shape == 1.0 {
+            One(Exp::new(1.0 / scale))
+        } else if shape < 1.0 {
+            Small(GammaSmallShape::new_raw(shape, scale))
+        } else {
+            Large(GammaLargeShape::new_raw(shape, scale))
+        };
+        Gamma { repr }
+    }
+}
+
+impl GammaSmallShape {
+    fn new_raw(shape: f64, scale: f64) -> GammaSmallShape {
+        GammaSmallShape {
+            inv_shape: 1. / shape,
+            large_shape: GammaLargeShape::new_raw(shape + 1.0, scale)
+        }
+    }
+}
+
+impl GammaLargeShape {
+    fn new_raw(shape: f64, scale: f64) -> GammaLargeShape {
+        let d = shape - 1. / 3.;
+        GammaLargeShape {
+            scale,
+            c: 1. / (9. * d).sqrt(),
+            d
+        }
+    }
+}
+
+impl Distribution<f64> for Gamma {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        match self.repr {
+            Small(ref g) => g.sample(rng),
+            One(ref g) => g.sample(rng),
+            Large(ref g) => g.sample(rng),
+        }
+    }
+}
+impl Distribution<f64> for GammaSmallShape {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        let u: f64 = rng.sample(Open01);
+
+        self.large_shape.sample(rng) * u.powf(self.inv_shape)
+    }
+}
+impl Distribution<f64> for GammaLargeShape {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        loop {
+            let x = rng.sample(StandardNormal);
+            let v_cbrt = 1.0 + self.c * x;
+            if v_cbrt <= 0.0 { // a^3 <= 0 iff a <= 0
+                continue
+            }
+
+            let v = v_cbrt * v_cbrt * v_cbrt;
+            let u: f64 = rng.sample(Open01);
+
+            let x_sqr = x * x;
+            if u < 1.0 - 0.0331 * x_sqr * x_sqr ||
+                u.ln() < 0.5 * x_sqr + self.d * (1.0 - v + v.ln()) {
+                return self.d * v * self.scale
+            }
+        }
+    }
+}
+
+/// The chi-squared distribution `χ²(k)`, where `k` is the degrees of
+/// freedom.
+///
+/// For `k > 0` integral, this distribution is the sum of the squares
+/// of `k` independent standard normal random variables. For other
+/// `k`, this uses the equivalent characterisation
+/// `χ²(k) = Gamma(k/2, 2)`.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{ChiSquared, Distribution};
+///
+/// let chi = ChiSquared::new(11.0);
+/// let v = chi.sample(&mut rand::thread_rng());
+/// println!("{} is from a χ²(11) distribution", v)
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct ChiSquared {
+    repr: ChiSquaredRepr,
+}
+
+#[derive(Clone, Copy, Debug)]
+enum ChiSquaredRepr {
+    // k == 1, Gamma(alpha, ..) is particularly slow for alpha < 1,
+    // e.g. when alpha = 1/2 as it would be for this case, so special-
+    // casing and using the definition of N(0,1)^2 is faster.
+    DoFExactlyOne,
+    DoFAnythingElse(Gamma),
+}
+
+impl ChiSquared {
+    /// Create a new chi-squared distribution with degrees-of-freedom
+    /// `k`. Panics if `k < 0`.
+    pub fn new(k: f64) -> ChiSquared {
+        let repr = if k == 1.0 {
+            DoFExactlyOne
+        } else {
+            assert!(k > 0.0, "ChiSquared::new called with `k` < 0");
+            DoFAnythingElse(Gamma::new(0.5 * k, 2.0))
+        };
+        ChiSquared { repr }
+    }
+}
+impl Distribution<f64> for ChiSquared {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        match self.repr {
+            DoFExactlyOne => {
+                // k == 1 => N(0,1)^2
+                let norm = rng.sample(StandardNormal);
+                norm * norm
+            }
+            DoFAnythingElse(ref g) => g.sample(rng)
+        }
+    }
+}
+
+/// The Fisher F distribution `F(m, n)`.
+///
+/// This distribution is equivalent to the ratio of two normalised
+/// chi-squared distributions, that is, `F(m,n) = (χ²(m)/m) /
+/// (χ²(n)/n)`.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{FisherF, Distribution};
+///
+/// let f = FisherF::new(2.0, 32.0);
+/// let v = f.sample(&mut rand::thread_rng());
+/// println!("{} is from an F(2, 32) distribution", v)
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct FisherF {
+    numer: ChiSquared,
+    denom: ChiSquared,
+    // denom_dof / numer_dof so that this can just be a straight
+    // multiplication, rather than a division.
+    dof_ratio: f64,
+}
+
+impl FisherF {
+    /// Create a new `FisherF` distribution, with the given
+    /// parameter. Panics if either `m` or `n` are not positive.
+    pub fn new(m: f64, n: f64) -> FisherF {
+        assert!(m > 0.0, "FisherF::new called with `m < 0`");
+        assert!(n > 0.0, "FisherF::new called with `n < 0`");
+
+        FisherF {
+            numer: ChiSquared::new(m),
+            denom: ChiSquared::new(n),
+            dof_ratio: n / m
+        }
+    }
+}
+impl Distribution<f64> for FisherF {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        self.numer.sample(rng) / self.denom.sample(rng) * self.dof_ratio
+    }
+}
+
+/// The Student t distribution, `t(nu)`, where `nu` is the degrees of
+/// freedom.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{StudentT, Distribution};
+///
+/// let t = StudentT::new(11.0);
+/// let v = t.sample(&mut rand::thread_rng());
+/// println!("{} is from a t(11) distribution", v)
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct StudentT {
+    chi: ChiSquared,
+    dof: f64
+}
+
+impl StudentT {
+    /// Create a new Student t distribution with `n` degrees of
+    /// freedom. Panics if `n <= 0`.
+    pub fn new(n: f64) -> StudentT {
+        assert!(n > 0.0, "StudentT::new called with `n <= 0`");
+        StudentT {
+            chi: ChiSquared::new(n),
+            dof: n
+        }
+    }
+}
+impl Distribution<f64> for StudentT {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        let norm = rng.sample(StandardNormal);
+        norm * (self.dof / self.chi.sample(rng)).sqrt()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use distributions::Distribution;
+    use super::{ChiSquared, StudentT, FisherF};
+
+    #[test]
+    fn test_chi_squared_one() {
+        let chi = ChiSquared::new(1.0);
+        let mut rng = ::test::rng(201);
+        for _ in 0..1000 {
+            chi.sample(&mut rng);
+        }
+    }
+    #[test]
+    fn test_chi_squared_small() {
+        let chi = ChiSquared::new(0.5);
+        let mut rng = ::test::rng(202);
+        for _ in 0..1000 {
+            chi.sample(&mut rng);
+        }
+    }
+    #[test]
+    fn test_chi_squared_large() {
+        let chi = ChiSquared::new(30.0);
+        let mut rng = ::test::rng(203);
+        for _ in 0..1000 {
+            chi.sample(&mut rng);
+        }
+    }
+    #[test]
+    #[should_panic]
+    fn test_chi_squared_invalid_dof() {
+        ChiSquared::new(-1.0);
+    }
+
+    #[test]
+    fn test_f() {
+        let f = FisherF::new(2.0, 32.0);
+        let mut rng = ::test::rng(204);
+        for _ in 0..1000 {
+            f.sample(&mut rng);
+        }
+    }
+
+    #[test]
+    fn test_t() {
+        let t = StudentT::new(11.0);
+        let mut rng = ::test::rng(205);
+        for _ in 0..1000 {
+            t.sample(&mut rng);
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/integer.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/integer.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/integer.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/integer.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,113 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The implementations of the `Standard` distribution for integer types.
+
+use {Rng};
+use distributions::{Distribution, Standard};
+
+impl Distribution<u8> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u8 {
+        rng.next_u32() as u8
+    }
+}
+
+impl Distribution<u16> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u16 {
+        rng.next_u32() as u16
+    }
+}
+
+impl Distribution<u32> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u32 {
+        rng.next_u32()
+    }
+}
+
+impl Distribution<u64> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
+        rng.next_u64()
+    }
+}
+
+#[cfg(feature = "i128_support")]
+impl Distribution<u128> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u128 {
+        // Use LE; we explicitly generate one value before the next.
+        let x = rng.next_u64() as u128;
+        let y = rng.next_u64() as u128;
+        (y << 64) | x
+    }
+}
+
+impl Distribution<usize> for Standard {
+    #[inline]
+    #[cfg(any(target_pointer_width = "32", target_pointer_width = "16"))]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
+        rng.next_u32() as usize
+    }
+
+    #[inline]
+    #[cfg(target_pointer_width = "64")]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> usize {
+        rng.next_u64() as usize
+    }
+}
+
+macro_rules! impl_int_from_uint {
+    ($ty:ty, $uty:ty) => {
+        impl Distribution<$ty> for Standard {
+            #[inline]
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $ty {
+                rng.gen::<$uty>() as $ty
+            }
+        }
+    }
+}
+
+impl_int_from_uint! { i8, u8 }
+impl_int_from_uint! { i16, u16 }
+impl_int_from_uint! { i32, u32 }
+impl_int_from_uint! { i64, u64 }
+#[cfg(feature = "i128_support")] impl_int_from_uint! { i128, u128 }
+impl_int_from_uint! { isize, usize }
+
+
+#[cfg(test)]
+mod tests {
+    use Rng;
+    use distributions::{Standard};
+    
+    #[test]
+    fn test_integers() {
+        let mut rng = ::test::rng(806);
+        
+        rng.sample::<isize, _>(Standard);
+        rng.sample::<i8, _>(Standard);
+        rng.sample::<i16, _>(Standard);
+        rng.sample::<i32, _>(Standard);
+        rng.sample::<i64, _>(Standard);
+        #[cfg(feature = "i128_support")]
+        rng.sample::<i128, _>(Standard);
+        
+        rng.sample::<usize, _>(Standard);
+        rng.sample::<u8, _>(Standard);
+        rng.sample::<u16, _>(Standard);
+        rng.sample::<u32, _>(Standard);
+        rng.sample::<u64, _>(Standard);
+        #[cfg(feature = "i128_support")]
+        rng.sample::<u128, _>(Standard);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/log_gamma.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/log_gamma.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/log_gamma.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/log_gamma.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,51 @@
+// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+/// Calculates ln(gamma(x)) (natural logarithm of the gamma
+/// function) using the Lanczos approximation.
+///
+/// The approximation expresses the gamma function as:
+/// `gamma(z+1) = sqrt(2*pi)*(z+g+0.5)^(z+0.5)*exp(-z-g-0.5)*Ag(z)`
+/// `g` is an arbitrary constant; we use the approximation with `g=5`.
+///
+/// Noting that `gamma(z+1) = z*gamma(z)` and applying `ln` to both sides:
+/// `ln(gamma(z)) = (z+0.5)*ln(z+g+0.5)-(z+g+0.5) + ln(sqrt(2*pi)*Ag(z)/z)`
+///
+/// `Ag(z)` is an infinite series with coefficients that can be calculated
+/// ahead of time - we use just the first 6 terms, which is good enough
+/// for most purposes.
+pub fn log_gamma(x: f64) -> f64 {
+    // precalculated 6 coefficients for the first 6 terms of the series
+    let coefficients: [f64; 6] = [
+        76.18009172947146,
+        -86.50532032941677,
+        24.01409824083091,
+        -1.231739572450155,
+        0.1208650973866179e-2,
+        -0.5395239384953e-5,
+    ];
+
+    // (x+0.5)*ln(x+g+0.5)-(x+g+0.5)
+    let tmp = x + 5.5;
+    let log = (x + 0.5) * tmp.ln() - tmp;
+
+    // the first few terms of the series for Ag(x)
+    let mut a = 1.000000000190015;
+    let mut denom = x;
+    for coeff in &coefficients {
+        denom += 1.0;
+        a += coeff / denom;
+    }
+
+    // get everything together
+    // a is Ag(x)
+    // 2.5066... is sqrt(2pi)
+    log + (2.5066282746310005 * a / x).ln()
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/mod.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,784 @@
+// Copyright 2013-2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Generating random samples from probability distributions.
+//!
+//! This module is the home of the [`Distribution`] trait and several of its
+//! implementations. It is the workhorse behind some of the convenient
+//! functionality of the [`Rng`] trait, including [`gen`], [`gen_range`] and
+//! of course [`sample`].
+//!
+//! Abstractly, a [probability distribution] describes the probability of
+//! occurance of each value in its sample space.
+//!
+//! More concretely, an implementation of `Distribution<T>` for type `X` is an
+//! algorithm for choosing values from the sample space (a subset of `T`)
+//! according to the distribution `X` represents, using an external source of
+//! randomness (an RNG supplied to the `sample` function).
+//!
+//! A type `X` may implement `Distribution<T>` for multiple types `T`.
+//! Any type implementing [`Distribution`] is stateless (i.e. immutable),
+//! but it may have internal parameters set at construction time (for example,
+//! [`Uniform`] allows specification of its sample space as a range within `T`).
+//!
+//!
+//! # The `Standard` distribution
+//!
+//! The [`Standard`] distribution is important to mention. This is the
+//! distribution used by [`Rng::gen()`] and represents the "default" way to
+//! produce a random value for many different types, including most primitive
+//! types, tuples, arrays, and a few derived types. See the documentation of
+//! [`Standard`] for more details.
+//!
+//! Implementing `Distribution<T>` for [`Standard`] for user types `T` makes it
+//! possible to generate type `T` with [`Rng::gen()`], and by extension also
+//! with the [`random()`] function.
+//!
+//!
+//! # Distribution to sample from a `Uniform` range
+//!
+//! The [`Uniform`] distribution is more flexible than [`Standard`], but also
+//! more specialised: it supports fewer target types, but allows the sample
+//! space to be specified as an arbitrary range within its target type `T`.
+//! Both [`Standard`] and [`Uniform`] are in some sense uniform distributions.
+//!
+//! Values may be sampled from this distribution using [`Rng::gen_range`] or
+//! by creating a distribution object with [`Uniform::new`],
+//! [`Uniform::new_inclusive`] or `From<Range>`. When the range limits are not
+//! known at compile time it is typically faster to reuse an existing
+//! distribution object than to call [`Rng::gen_range`].
+//!
+//! User types `T` may also implement `Distribution<T>` for [`Uniform`],
+//! although this is less straightforward than for [`Standard`] (see the
+//! documentation in the [`uniform` module]. Doing so enables generation of
+//! values of type `T` with  [`Rng::gen_range`].
+//!
+//!
+//! # Other distributions
+//!
+//! There are surprisingly many ways to uniformly generate random floats. A
+//! range between 0 and 1 is standard, but the exact bounds (open vs closed)
+//! and accuracy differ. In addition to the [`Standard`] distribution Rand offers
+//! [`Open01`] and [`OpenClosed01`]. See [Floating point implementation] for
+//! more details.
+//!
+//! [`Alphanumeric`] is a simple distribution to sample random letters and
+//! numbers of the `char` type; in contrast [`Standard`] may sample any valid
+//! `char`.
+//!
+//!
+//! # Non-uniform probability distributions
+//!
+//! Rand currently provides the following probability distributions:
+//!
+//! - Related to real-valued quantities that grow linearly
+//!   (e.g. errors, offsets):
+//!   - [`Normal`] distribution, and [`StandardNormal`] as a primitive
+//!   - [`Cauchy`] distribution
+//! - Related to Bernoulli trials (yes/no events, with a given probability):
+//!   - [`Binomial`] distribution
+//!   - [`Bernoulli`] distribution, similar to [`Rng::gen_bool`].
+//! - Related to positive real-valued quantities that grow exponentially
+//!   (e.g. prices, incomes, populations):
+//!   - [`LogNormal`] distribution
+//! - Related to the occurrence of independent events at a given rate:
+//!   - [`Poisson`] distribution
+//!   - [`Exp`]onential distribution, and [`Exp1`] as a primitive
+//! - Gamma and derived distributions:
+//!   - [`Gamma`] distribution
+//!   - [`ChiSquared`] distribution
+//!   - [`StudentT`] distribution
+//!   - [`FisherF`] distribution
+//!
+//!
+//! # Examples
+//!
+//! Sampling from a distribution:
+//!
+//! ```
+//! use rand::{thread_rng, Rng};
+//! use rand::distributions::Exp;
+//!
+//! let exp = Exp::new(2.0);
+//! let v = thread_rng().sample(exp);
+//! println!("{} is from an Exp(2) distribution", v);
+//! ```
+//!
+//! Implementing the [`Standard`] distribution for a user type:
+//!
+//! ```
+//! # #![allow(dead_code)]
+//! use rand::Rng;
+//! use rand::distributions::{Distribution, Standard};
+//!
+//! struct MyF32 {
+//!     x: f32,
+//! }
+//!
+//! impl Distribution<MyF32> for Standard {
+//!     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> MyF32 {
+//!         MyF32 { x: rng.gen() }
+//!     }
+//! }
+//! ```
+//!
+//!
+//! [probability distribution]: https://en.wikipedia.org/wiki/Probability_distribution
+//! [`Distribution`]: trait.Distribution.html
+//! [`gen_range`]: ../trait.Rng.html#method.gen_range
+//! [`gen`]: ../trait.Rng.html#method.gen
+//! [`sample`]: ../trait.Rng.html#method.sample
+//! [`new_inclusive`]: struct.Uniform.html#method.new_inclusive
+//! [`random()`]: ../fn.random.html
+//! [`Rng::gen_bool`]: ../trait.Rng.html#method.gen_bool
+//! [`Rng::gen_range`]: ../trait.Rng.html#method.gen_range
+//! [`Rng::gen()`]: ../trait.Rng.html#method.gen
+//! [`Rng`]: ../trait.Rng.html
+//! [`uniform` module]: uniform/index.html
+//! [Floating point implementation]: struct.Standard.html#floating-point-implementation
+// distributions
+//! [`Alphanumeric`]: struct.Alphanumeric.html
+//! [`Bernoulli`]: struct.Bernoulli.html
+//! [`Binomial`]: struct.Binomial.html
+//! [`Cauchy`]: struct.Cauchy.html
+//! [`ChiSquared`]: struct.ChiSquared.html
+//! [`Exp`]: struct.Exp.html
+//! [`Exp1`]: struct.Exp1.html
+//! [`FisherF`]: struct.FisherF.html
+//! [`Gamma`]: struct.Gamma.html
+//! [`LogNormal`]: struct.LogNormal.html
+//! [`Normal`]: struct.Normal.html
+//! [`Open01`]: struct.Open01.html
+//! [`OpenClosed01`]: struct.OpenClosed01.html
+//! [`Pareto`]: struct.Pareto.html
+//! [`Poisson`]: struct.Poisson.html
+//! [`Standard`]: struct.Standard.html
+//! [`StandardNormal`]: struct.StandardNormal.html
+//! [`StudentT`]: struct.StudentT.html
+//! [`Uniform`]: struct.Uniform.html
+//! [`Uniform::new`]: struct.Uniform.html#method.new
+//! [`Uniform::new_inclusive`]: struct.Uniform.html#method.new_inclusive
+
+use Rng;
+
+#[doc(inline)] pub use self::other::Alphanumeric;
+#[doc(inline)] pub use self::uniform::Uniform;
+#[doc(inline)] pub use self::float::{OpenClosed01, Open01};
+#[deprecated(since="0.5.0", note="use Uniform instead")]
+pub use self::uniform::Uniform as Range;
+#[cfg(feature="std")]
+#[doc(inline)] pub use self::gamma::{Gamma, ChiSquared, FisherF, StudentT};
+#[cfg(feature="std")]
+#[doc(inline)] pub use self::normal::{Normal, LogNormal, StandardNormal};
+#[cfg(feature="std")]
+#[doc(inline)] pub use self::exponential::{Exp, Exp1};
+#[cfg(feature="std")]
+#[doc(inline)] pub use self::pareto::Pareto;
+#[cfg(feature = "std")]
+#[doc(inline)] pub use self::poisson::Poisson;
+#[cfg(feature = "std")]
+#[doc(inline)] pub use self::binomial::Binomial;
+#[doc(inline)] pub use self::bernoulli::Bernoulli;
+#[cfg(feature = "std")]
+#[doc(inline)] pub use self::cauchy::Cauchy;
+
+pub mod uniform;
+#[cfg(feature="std")]
+#[doc(hidden)] pub mod gamma;
+#[cfg(feature="std")]
+#[doc(hidden)] pub mod normal;
+#[cfg(feature="std")]
+#[doc(hidden)] pub mod exponential;
+#[cfg(feature="std")]
+#[doc(hidden)] pub mod pareto;
+#[cfg(feature = "std")]
+#[doc(hidden)] pub mod poisson;
+#[cfg(feature = "std")]
+#[doc(hidden)] pub mod binomial;
+#[doc(hidden)] pub mod bernoulli;
+#[cfg(feature = "std")]
+#[doc(hidden)] pub mod cauchy;
+
+mod float;
+mod integer;
+#[cfg(feature="std")]
+mod log_gamma;
+mod other;
+#[cfg(feature="std")]
+mod ziggurat_tables;
+#[cfg(feature="std")]
+use distributions::float::IntoFloat;
+
+/// Types that can be used to create a random instance of `Support`.
+#[deprecated(since="0.5.0", note="use Distribution instead")]
+pub trait Sample<Support> {
+    /// Generate a random value of `Support`, using `rng` as the
+    /// source of randomness.
+    fn sample<R: Rng>(&mut self, rng: &mut R) -> Support;
+}
+
+/// `Sample`s that do not require keeping track of state.
+///
+/// Since no state is recorded, each sample is (statistically)
+/// independent of all others, assuming the `Rng` used has this
+/// property.
+#[allow(deprecated)]
+#[deprecated(since="0.5.0", note="use Distribution instead")]
+pub trait IndependentSample<Support>: Sample<Support> {
+    /// Generate a random value.
+    fn ind_sample<R: Rng>(&self, &mut R) -> Support;
+}
+
+/// DEPRECATED: Use `distributions::uniform` instead.
+#[deprecated(since="0.5.0", note="use uniform instead")]
+pub mod range {
+    pub use distributions::uniform::Uniform as Range;
+    pub use distributions::uniform::SampleUniform as SampleRange;
+}
+
+#[allow(deprecated)]
+mod impls {
+    use Rng;
+    use distributions::{Distribution, Sample, IndependentSample,
+            WeightedChoice};
+    #[cfg(feature="std")]
+    use distributions::exponential::Exp;
+    #[cfg(feature="std")]
+    use distributions::gamma::{Gamma, ChiSquared, FisherF, StudentT};
+    #[cfg(feature="std")]
+    use distributions::normal::{Normal, LogNormal};
+    use distributions::range::{Range, SampleRange};
+    
+    impl<'a, T: Clone> Sample<T> for WeightedChoice<'a, T> {
+        fn sample<R: Rng>(&mut self, rng: &mut R) -> T {
+            Distribution::sample(self, rng)
+        }
+    }
+    impl<'a, T: Clone> IndependentSample<T> for WeightedChoice<'a, T> {
+        fn ind_sample<R: Rng>(&self, rng: &mut R) -> T {
+            Distribution::sample(self, rng)
+        }
+    }
+    
+    impl<T: SampleRange> Sample<T> for Range<T> {
+        fn sample<R: Rng>(&mut self, rng: &mut R) -> T {
+            Distribution::sample(self, rng)
+        }
+    }
+    impl<T: SampleRange> IndependentSample<T> for Range<T> {
+        fn ind_sample<R: Rng>(&self, rng: &mut R) -> T {
+            Distribution::sample(self, rng)
+        }
+    }
+    
+    #[cfg(feature="std")]
+    macro_rules! impl_f64 {
+        ($($name: ident), *) => {
+            $(
+                impl Sample<f64> for $name {
+                    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 {
+                        Distribution::sample(self, rng)
+                    }
+                }
+                impl IndependentSample<f64> for $name {
+                    fn ind_sample<R: Rng>(&self, rng: &mut R) -> f64 {
+                        Distribution::sample(self, rng)
+                    }
+                }
+            )*
+        }
+    }
+    #[cfg(feature="std")]
+    impl_f64!(Exp, Gamma, ChiSquared, FisherF, StudentT, Normal, LogNormal);
+}
+
+/// Types (distributions) that can be used to create a random instance of `T`.
+///
+/// It is possible to sample from a distribution through both the
+/// `Distribution` and [`Rng`] traits, via `distr.sample(&mut rng)` and
+/// `rng.sample(distr)`. They also both offer the [`sample_iter`] method, which
+/// produces an iterator that samples from the distribution.
+///
+/// All implementations are expected to be immutable; this has the significant
+/// advantage of not needing to consider thread safety, and for most
+/// distributions efficient state-less sampling algorithms are available.
+///
+/// [`Rng`]: ../trait.Rng.html
+/// [`sample_iter`]: trait.Distribution.html#method.sample_iter
+pub trait Distribution<T> {
+    /// Generate a random value of `T`, using `rng` as the source of randomness.
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T;
+
+    /// Create an iterator that generates random values of `T`, using `rng` as
+    /// the source of randomness.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::thread_rng;
+    /// use rand::distributions::{Distribution, Alphanumeric, Uniform, Standard};
+    ///
+    /// let mut rng = thread_rng();
+    ///
+    /// // Vec of 16 x f32:
+    /// let v: Vec<f32> = Standard.sample_iter(&mut rng).take(16).collect();
+    ///
+    /// // String:
+    /// let s: String = Alphanumeric.sample_iter(&mut rng).take(7).collect();
+    ///
+    /// // Dice-rolling:
+    /// let die_range = Uniform::new_inclusive(1, 6);
+    /// let mut roll_die = die_range.sample_iter(&mut rng);
+    /// while roll_die.next().unwrap() != 6 {
+    ///     println!("Not a 6; rolling again!");
+    /// }
+    /// ```
+    fn sample_iter<'a, R>(&'a self, rng: &'a mut R) -> DistIter<'a, Self, R, T>
+        where Self: Sized, R: Rng
+    {
+        DistIter {
+            distr: self,
+            rng: rng,
+            phantom: ::core::marker::PhantomData,
+        }
+    }
+}
+
+impl<'a, T, D: Distribution<T>> Distribution<T> for &'a D {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T {
+        (*self).sample(rng)
+    }
+}
+
+
+/// An iterator that generates random values of `T` with distribution `D`,
+/// using `R` as the source of randomness.
+///
+/// This `struct` is created by the [`sample_iter`] method on [`Distribution`].
+/// See its documentation for more.
+///
+/// [`Distribution`]: trait.Distribution.html
+/// [`sample_iter`]: trait.Distribution.html#method.sample_iter
+#[derive(Debug)]
+pub struct DistIter<'a, D: 'a, R: 'a, T> {
+    distr: &'a D,
+    rng: &'a mut R,
+    phantom: ::core::marker::PhantomData<T>,
+}
+
+impl<'a, D, R, T> Iterator for DistIter<'a, D, R, T>
+    where D: Distribution<T>, R: Rng + 'a
+{
+    type Item = T;
+
+    #[inline(always)]
+    fn next(&mut self) -> Option<T> {
+        Some(self.distr.sample(self.rng))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (usize::max_value(), None)
+    }
+}
+
+
+/// A generic random value distribution, implemented for many primitive types.
+/// Usually generates values with a numerically uniform distribution, and with a
+/// range appropriate to the type.
+/// 
+/// ## Built-in Implementations
+///
+/// Assuming the provided `Rng` is well-behaved, these implementations
+/// generate values with the following ranges and distributions:
+///
+/// * Integers (`i32`, `u32`, `isize`, `usize`, etc.): Uniformly distributed
+///   over all values of the type.
+/// * `char`: Uniformly distributed over all Unicode scalar values, i.e. all
+///   code points in the range `0...0x10_FFFF`, except for the range
+///   `0xD800...0xDFFF` (the surrogate code points). This includes
+///   unassigned/reserved code points.
+/// * `bool`: Generates `false` or `true`, each with probability 0.5.
+/// * Floating point types (`f32` and `f64`): Uniformly distributed in the
+///   half-open range `[0, 1)`. See notes below.
+/// * Wrapping integers (`Wrapping<T>`), besides the type identical to their
+///   normal integer variants.
+///
+/// The following aggregate types also implement the distribution `Standard` as
+/// long as their component types implement it:
+///
+/// * Tuples and arrays: Each element of the tuple or array is generated
+///   independently, using the `Standard` distribution recursively.
+/// * `Option<T>` where `Standard` is implemented for `T`: Returns `None` with
+///   probability 0.5; otherwise generates a random `x: T` and returns `Some(x)`.
+///
+/// # Example
+/// ```
+/// use rand::prelude::*;
+/// use rand::distributions::Standard;
+///
+/// let val: f32 = SmallRng::from_entropy().sample(Standard);
+/// println!("f32 from [0, 1): {}", val);
+/// ```
+///
+/// # Floating point implementation
+/// The floating point implementations for `Standard` generate a random value in
+/// the half-open interval `[0, 1)`, i.e. including 0 but not 1.
+///
+/// All values that can be generated are of the form `n * ε/2`. For `f32`
+/// the 23 most significant random bits of a `u32` are used and for `f64` the
+/// 53 most significant bits of a `u64` are used. The conversion uses the
+/// multiplicative method: `(rng.gen::<$uty>() >> N) as $ty * (ε/2)`.
+///
+/// See also: [`Open01`] which samples from `(0, 1)`, [`OpenClosed01`] which
+/// samples from `(0, 1]` and `Rng::gen_range(0, 1)` which also samples from
+/// `[0, 1)`. Note that `Open01` and `gen_range` (which uses [`Uniform`]) use
+/// transmute-based methods which yield 1 bit less precision but may perform
+/// faster on some architectures (on modern Intel CPUs all methods have
+/// approximately equal performance).
+///
+/// [`Open01`]: struct.Open01.html
+/// [`OpenClosed01`]: struct.OpenClosed01.html
+/// [`Uniform`]: uniform/struct.Uniform.html
+#[derive(Clone, Copy, Debug)]
+pub struct Standard;
+
+#[allow(deprecated)]
+impl<T> ::Rand for T where Standard: Distribution<T> {
+    fn rand<R: Rng>(rng: &mut R) -> Self {
+        Standard.sample(rng)
+    }
+}
+
+
+/// A value with a particular weight for use with `WeightedChoice`.
+#[derive(Copy, Clone, Debug)]
+pub struct Weighted<T> {
+    /// The numerical weight of this item
+    pub weight: u32,
+    /// The actual item which is being weighted
+    pub item: T,
+}
+
+/// A distribution that selects from a finite collection of weighted items.
+///
+/// Each item has an associated weight that influences how likely it
+/// is to be chosen: higher weight is more likely.
+///
+/// The `Clone` restriction is a limitation of the `Distribution` trait.
+/// Note that `&T` is (cheaply) `Clone` for all `T`, as is `u32`, so one can
+/// store references or indices into another vector.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Weighted, WeightedChoice, Distribution};
+///
+/// let mut items = vec!(Weighted { weight: 2, item: 'a' },
+///                      Weighted { weight: 4, item: 'b' },
+///                      Weighted { weight: 1, item: 'c' });
+/// let wc = WeightedChoice::new(&mut items);
+/// let mut rng = rand::thread_rng();
+/// for _ in 0..16 {
+///      // on average prints 'a' 4 times, 'b' 8 and 'c' twice.
+///      println!("{}", wc.sample(&mut rng));
+/// }
+/// ```
+#[derive(Debug)]
+pub struct WeightedChoice<'a, T:'a> {
+    items: &'a mut [Weighted<T>],
+    weight_range: Uniform<u32>,
+}
+
+impl<'a, T: Clone> WeightedChoice<'a, T> {
+    /// Create a new `WeightedChoice`.
+    ///
+    /// Panics if:
+    ///
+    /// - `items` is empty
+    /// - the total weight is 0
+    /// - the total weight is larger than a `u32` can contain.
+    pub fn new(items: &'a mut [Weighted<T>]) -> WeightedChoice<'a, T> {
+        // strictly speaking, this is subsumed by the total weight == 0 case
+        assert!(!items.is_empty(), "WeightedChoice::new called with no items");
+
+        let mut running_total: u32 = 0;
+
+        // we convert the list from individual weights to cumulative
+        // weights so we can binary search. This *could* drop elements
+        // with weight == 0 as an optimisation.
+        for item in items.iter_mut() {
+            running_total = match running_total.checked_add(item.weight) {
+                Some(n) => n,
+                None => panic!("WeightedChoice::new called with a total weight \
+                               larger than a u32 can contain")
+            };
+
+            item.weight = running_total;
+        }
+        assert!(running_total != 0, "WeightedChoice::new called with a total weight of 0");
+
+        WeightedChoice {
+            items,
+            // we're likely to be generating numbers in this range
+            // relatively often, so might as well cache it
+            weight_range: Uniform::new(0, running_total)
+        }
+    }
+}
+
+impl<'a, T: Clone> Distribution<T> for WeightedChoice<'a, T> {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> T {
+        // we want to find the first element that has cumulative
+        // weight > sample_weight, which we do by binary since the
+        // cumulative weights of self.items are sorted.
+
+        // choose a weight in [0, total_weight)
+        let sample_weight = self.weight_range.sample(rng);
+
+        // short circuit when it's the first item
+        if sample_weight < self.items[0].weight {
+            return self.items[0].item.clone();
+        }
+
+        let mut idx = 0;
+        let mut modifier = self.items.len();
+
+        // now we know that every possibility has an element to the
+        // left, so we can just search for the last element that has
+        // cumulative weight <= sample_weight, then the next one will
+        // be "it". (Note that this greatest element will never be the
+        // last element of the vector, since sample_weight is chosen
+        // in [0, total_weight) and the cumulative weight of the last
+        // one is exactly the total weight.)
+        while modifier > 1 {
+            let i = idx + modifier / 2;
+            if self.items[i].weight <= sample_weight {
+                // we're small, so look to the right, but allow this
+                // exact element still.
+                idx = i;
+                // we need the `/ 2` to round up otherwise we'll drop
+                // the trailing elements when `modifier` is odd.
+                modifier += 1;
+            } else {
+                // otherwise we're too big, so go left. (i.e. do
+                // nothing)
+            }
+            modifier /= 2;
+        }
+        self.items[idx + 1].item.clone()
+    }
+}
+
+/// Sample a random number using the Ziggurat method (specifically the
+/// ZIGNOR variant from Doornik 2005). Most of the arguments are
+/// directly from the paper:
+///
+/// * `rng`: source of randomness
+/// * `symmetric`: whether this is a symmetric distribution, or one-sided with P(x < 0) = 0.
+/// * `X`: the $x_i$ abscissae.
+/// * `F`: precomputed values of the PDF at the $x_i$, (i.e. $f(x_i)$)
+/// * `F_DIFF`: precomputed values of $f(x_i) - f(x_{i+1})$
+/// * `pdf`: the probability density function
+/// * `zero_case`: manual sampling from the tail when we chose the
+///    bottom box (i.e. i == 0)
+
+// the perf improvement (25-50%) is definitely worth the extra code
+// size from force-inlining.
+#[cfg(feature="std")]
+#[inline(always)]
+fn ziggurat<R: Rng + ?Sized, P, Z>(
+            rng: &mut R,
+            symmetric: bool,
+            x_tab: ziggurat_tables::ZigTable,
+            f_tab: ziggurat_tables::ZigTable,
+            mut pdf: P,
+            mut zero_case: Z)
+            -> f64 where P: FnMut(f64) -> f64, Z: FnMut(&mut R, f64) -> f64 {
+    loop {
+        // As an optimisation we re-implement the conversion to a f64.
+        // From the remaining 12 most significant bits we use 8 to construct `i`.
+        // This saves us generating a whole extra random number, while the added
+        // precision of using 64 bits for f64 does not buy us much.
+        let bits = rng.next_u64();
+        let i = bits as usize & 0xff;
+
+        let u = if symmetric {
+            // Convert to a value in the range [2,4) and substract to get [-1,1)
+            // We can't convert to an open range directly, that would require
+            // substracting `3.0 - EPSILON`, which is not representable.
+            // It is possible with an extra step, but an open range does not
+            // seem neccesary for the ziggurat algorithm anyway.
+            (bits >> 12).into_float_with_exponent(1) - 3.0
+        } else {
+            // Convert to a value in the range [1,2) and substract to get (0,1)
+            (bits >> 12).into_float_with_exponent(0)
+            - (1.0 - ::core::f64::EPSILON / 2.0)
+        };
+        let x = u * x_tab[i];
+
+        let test_x = if symmetric { x.abs() } else {x};
+
+        // algebraically equivalent to |u| < x_tab[i+1]/x_tab[i] (or u < x_tab[i+1]/x_tab[i])
+        if test_x < x_tab[i + 1] {
+            return x;
+        }
+        if i == 0 {
+            return zero_case(rng, u);
+        }
+        // algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1
+        if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen::<f64>() < pdf(x) {
+            return x;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use Rng;
+    use rngs::mock::StepRng;
+    use super::{WeightedChoice, Weighted, Distribution};
+
+    #[test]
+    fn test_weighted_choice() {
+        // this makes assumptions about the internal implementation of
+        // WeightedChoice. It may fail when the implementation in
+        // `distributions::uniform::UniformInt` changes.
+
+        macro_rules! t {
+            ($items:expr, $expected:expr) => {{
+                let mut items = $items;
+                let mut total_weight = 0;
+                for item in &items { total_weight += item.weight; }
+
+                let wc = WeightedChoice::new(&mut items);
+                let expected = $expected;
+
+                // Use extremely large steps between the random numbers, because
+                // we test with small ranges and `UniformInt` is designed to prefer
+                // the most significant bits.
+                let mut rng = StepRng::new(0, !0 / (total_weight as u64));
+
+                for &val in expected.iter() {
+                    assert_eq!(wc.sample(&mut rng), val)
+                }
+            }}
+        }
+
+        t!([Weighted { weight: 1, item: 10}], [10]);
+
+        // skip some
+        t!([Weighted { weight: 0, item: 20},
+            Weighted { weight: 2, item: 21},
+            Weighted { weight: 0, item: 22},
+            Weighted { weight: 1, item: 23}],
+           [21, 21, 23]);
+
+        // different weights
+        t!([Weighted { weight: 4, item: 30},
+            Weighted { weight: 3, item: 31}],
+           [30, 31, 30, 31, 30, 31, 30]);
+
+        // check that we're binary searching
+        // correctly with some vectors of odd
+        // length.
+        t!([Weighted { weight: 1, item: 40},
+            Weighted { weight: 1, item: 41},
+            Weighted { weight: 1, item: 42},
+            Weighted { weight: 1, item: 43},
+            Weighted { weight: 1, item: 44}],
+           [40, 41, 42, 43, 44]);
+        t!([Weighted { weight: 1, item: 50},
+            Weighted { weight: 1, item: 51},
+            Weighted { weight: 1, item: 52},
+            Weighted { weight: 1, item: 53},
+            Weighted { weight: 1, item: 54},
+            Weighted { weight: 1, item: 55},
+            Weighted { weight: 1, item: 56}],
+           [50, 54, 51, 55, 52, 56, 53]);
+    }
+
+    #[test]
+    fn test_weighted_clone_initialization() {
+        let initial : Weighted<u32> = Weighted {weight: 1, item: 1};
+        let clone = initial.clone();
+        assert_eq!(initial.weight, clone.weight);
+        assert_eq!(initial.item, clone.item);
+    }
+
+    #[test] #[should_panic]
+    fn test_weighted_clone_change_weight() {
+        let initial : Weighted<u32> = Weighted {weight: 1, item: 1};
+        let mut clone = initial.clone();
+        clone.weight = 5;
+        assert_eq!(initial.weight, clone.weight);
+    }
+
+    #[test] #[should_panic]
+    fn test_weighted_clone_change_item() {
+        let initial : Weighted<u32> = Weighted {weight: 1, item: 1};
+        let mut clone = initial.clone();
+        clone.item = 5;
+        assert_eq!(initial.item, clone.item);
+
+    }
+
+    #[test] #[should_panic]
+    fn test_weighted_choice_no_items() {
+        WeightedChoice::<isize>::new(&mut []);
+    }
+    #[test] #[should_panic]
+    fn test_weighted_choice_zero_weight() {
+        WeightedChoice::new(&mut [Weighted { weight: 0, item: 0},
+                                  Weighted { weight: 0, item: 1}]);
+    }
+    #[test] #[should_panic]
+    fn test_weighted_choice_weight_overflows() {
+        let x = ::core::u32::MAX / 2; // x + x + 2 is the overflow
+        WeightedChoice::new(&mut [Weighted { weight: x, item: 0 },
+                                  Weighted { weight: 1, item: 1 },
+                                  Weighted { weight: x, item: 2 },
+                                  Weighted { weight: 1, item: 3 }]);
+    }
+    
+    #[test] #[allow(deprecated)]
+    fn test_backwards_compat_sample() {
+        use distributions::{Sample, IndependentSample};
+        
+        struct Constant<T> { val: T }
+        impl<T: Copy> Sample<T> for Constant<T> {
+            fn sample<R: Rng>(&mut self, _: &mut R) -> T { self.val }
+        }
+        impl<T: Copy> IndependentSample<T> for Constant<T> {
+            fn ind_sample<R: Rng>(&self, _: &mut R) -> T { self.val }
+        }
+        
+        let mut sampler = Constant{ val: 293 };
+        assert_eq!(sampler.sample(&mut ::test::rng(233)), 293);
+        assert_eq!(sampler.ind_sample(&mut ::test::rng(234)), 293);
+    }
+    
+    #[cfg(feature="std")]
+    #[test] #[allow(deprecated)]
+    fn test_backwards_compat_exp() {
+        use distributions::{IndependentSample, Exp};
+        let sampler = Exp::new(1.0);
+        sampler.ind_sample(&mut ::test::rng(235));
+    }
+
+    #[cfg(feature="std")]
+    #[test]
+    fn test_distributions_iter() {
+        use distributions::Normal;
+        let mut rng = ::test::rng(210);
+        let distr = Normal::new(10.0, 10.0);
+        let results: Vec<_> = distr.sample_iter(&mut rng).take(100).collect();
+        println!("{:?}", results);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/normal.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/normal.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/normal.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/normal.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,192 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The normal and derived distributions.
+
+use Rng;
+use distributions::{ziggurat, ziggurat_tables, Distribution, Open01};
+
+/// Samples floating-point numbers according to the normal distribution
+/// `N(0, 1)` (a.k.a. a standard normal, or Gaussian). This is equivalent to
+/// `Normal::new(0.0, 1.0)` but faster.
+///
+/// See `Normal` for the general normal distribution.
+///
+/// Implemented via the ZIGNOR variant[^1] of the Ziggurat method.
+///
+/// [^1]: Jurgen A. Doornik (2005). [*An Improved Ziggurat Method to
+///       Generate Normal Random Samples*](
+///       https://www.doornik.com/research/ziggurat.pdf).
+///       Nuffield College, Oxford
+///
+/// # Example
+/// ```
+/// use rand::prelude::*;
+/// use rand::distributions::StandardNormal;
+///
+/// let val: f64 = SmallRng::from_entropy().sample(StandardNormal);
+/// println!("{}", val);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct StandardNormal;
+
+impl Distribution<f64> for StandardNormal {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        #[inline]
+        fn pdf(x: f64) -> f64 {
+            (-x*x/2.0).exp()
+        }
+        #[inline]
+        fn zero_case<R: Rng + ?Sized>(rng: &mut R, u: f64) -> f64 {
+            // compute a random number in the tail by hand
+
+            // strange initial conditions, because the loop is not
+            // do-while, so the condition should be true on the first
+            // run, they get overwritten anyway (0 < 1, so these are
+            // good).
+            let mut x = 1.0f64;
+            let mut y = 0.0f64;
+
+            while -2.0 * y < x * x {
+                let x_: f64 = rng.sample(Open01);
+                let y_: f64 = rng.sample(Open01);
+
+                x = x_.ln() / ziggurat_tables::ZIG_NORM_R;
+                y = y_.ln();
+            }
+
+            if u < 0.0 { x - ziggurat_tables::ZIG_NORM_R } else { ziggurat_tables::ZIG_NORM_R - x }
+        }
+
+        ziggurat(rng, true, // this is symmetric
+                 &ziggurat_tables::ZIG_NORM_X,
+                 &ziggurat_tables::ZIG_NORM_F,
+                 pdf, zero_case)
+    }
+}
+
+/// The normal distribution `N(mean, std_dev**2)`.
+///
+/// This uses the ZIGNOR variant of the Ziggurat method, see `StandardNormal`
+/// for more details.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Normal, Distribution};
+///
+/// // mean 2, standard deviation 3
+/// let normal = Normal::new(2.0, 3.0);
+/// let v = normal.sample(&mut rand::thread_rng());
+/// println!("{} is from a N(2, 9) distribution", v)
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Normal {
+    mean: f64,
+    std_dev: f64,
+}
+
+impl Normal {
+    /// Construct a new `Normal` distribution with the given mean and
+    /// standard deviation.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `std_dev < 0`.
+    #[inline]
+    pub fn new(mean: f64, std_dev: f64) -> Normal {
+        assert!(std_dev >= 0.0, "Normal::new called with `std_dev` < 0");
+        Normal {
+            mean,
+            std_dev
+        }
+    }
+}
+impl Distribution<f64> for Normal {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        let n = rng.sample(StandardNormal);
+        self.mean + self.std_dev * n
+    }
+}
+
+
+/// The log-normal distribution `ln N(mean, std_dev**2)`.
+///
+/// If `X` is log-normal distributed, then `ln(X)` is `N(mean, std_dev**2)`
+/// distributed.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{LogNormal, Distribution};
+///
+/// // mean 2, standard deviation 3
+/// let log_normal = LogNormal::new(2.0, 3.0);
+/// let v = log_normal.sample(&mut rand::thread_rng());
+/// println!("{} is from an ln N(2, 9) distribution", v)
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct LogNormal {
+    norm: Normal
+}
+
+impl LogNormal {
+    /// Construct a new `LogNormal` distribution with the given mean
+    /// and standard deviation.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `std_dev < 0`.
+    #[inline]
+    pub fn new(mean: f64, std_dev: f64) -> LogNormal {
+        assert!(std_dev >= 0.0, "LogNormal::new called with `std_dev` < 0");
+        LogNormal { norm: Normal::new(mean, std_dev) }
+    }
+}
+impl Distribution<f64> for LogNormal {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        self.norm.sample(rng).exp()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use distributions::Distribution;
+    use super::{Normal, LogNormal};
+
+    #[test]
+    fn test_normal() {
+        let norm = Normal::new(10.0, 10.0);
+        let mut rng = ::test::rng(210);
+        for _ in 0..1000 {
+            norm.sample(&mut rng);
+        }
+    }
+    #[test]
+    #[should_panic]
+    fn test_normal_invalid_sd() {
+        Normal::new(10.0, -1.0);
+    }
+
+
+    #[test]
+    fn test_log_normal() {
+        let lnorm = LogNormal::new(10.0, 10.0);
+        let mut rng = ::test::rng(211);
+        for _ in 0..1000 {
+            lnorm.sample(&mut rng);
+        }
+    }
+    #[test]
+    #[should_panic]
+    fn test_log_normal_invalid_sd() {
+        LogNormal::new(10.0, -1.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/other.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/other.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/other.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/other.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,215 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The implementations of the `Standard` distribution for other built-in types.
+
+use core::char;
+use core::num::Wrapping;
+
+use {Rng};
+use distributions::{Distribution, Standard, Uniform};
+
+// ----- Sampling distributions -----
+
+/// Sample a `char`, uniformly distributed over ASCII letters and numbers:
+/// a-z, A-Z and 0-9.
+/// 
+/// # Example
+///
+/// ```
+/// use std::iter;
+/// use rand::{Rng, thread_rng};
+/// use rand::distributions::Alphanumeric;
+/// 
+/// let mut rng = thread_rng();
+/// let chars: String = iter::repeat(())
+///         .map(|()| rng.sample(Alphanumeric))
+///         .take(7)
+///         .collect();
+/// println!("Random chars: {}", chars);
+/// ```
+#[derive(Debug)]
+pub struct Alphanumeric;
+
+
+// ----- Implementations of distributions -----
+
+impl Distribution<char> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> char {
+        let range = Uniform::new(0u32, 0x11_0000);
+        loop {
+            match char::from_u32(range.sample(rng)) {
+                Some(c) => return c,
+                // About 0.2% of numbers in the range 0..0x110000 are invalid
+                // codepoints (surrogates).
+                None => {}
+            }
+        }
+    }
+}
+
+impl Distribution<char> for Alphanumeric {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> char {
+        const RANGE: u32 = 26 + 26 + 10;
+        const GEN_ASCII_STR_CHARSET: &[u8] =
+            b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+                abcdefghijklmnopqrstuvwxyz\
+                0123456789";
+        // We can pick from 62 characters. This is so close to a power of 2, 64,
+        // that we can do better than `Uniform`. Use a simple bitshift and
+        // rejection sampling. We do not use a bitmask, because for small RNGs
+        // the most significant bits are usually of higher quality.
+        loop {
+            let var = rng.next_u32() >> (32 - 6);
+            if var < RANGE {
+                return GEN_ASCII_STR_CHARSET[var as usize] as char
+            }
+        }
+    }
+}
+
+impl Distribution<bool> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> bool {
+        // We can compare against an arbitrary bit of an u32 to get a bool.
+        // Because the least significant bits of a lower quality RNG can have
+        // simple patterns, we compare against the most significant bit. This is
+        // easiest done using a sign test.
+        (rng.next_u32() as i32) < 0
+    }
+}
+
+macro_rules! tuple_impl {
+    // use variables to indicate the arity of the tuple
+    ($($tyvar:ident),* ) => {
+        // the trailing commas are for the 1 tuple
+        impl< $( $tyvar ),* >
+            Distribution<( $( $tyvar ),* , )>
+            for Standard
+            where $( Standard: Distribution<$tyvar> ),*
+        {
+            #[inline]
+            fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> ( $( $tyvar ),* , ) {
+                (
+                    // use the $tyvar's to get the appropriate number of
+                    // repeats (they're not actually needed)
+                    $(
+                        _rng.gen::<$tyvar>()
+                    ),*
+                    ,
+                )
+            }
+        }
+    }
+}
+
+impl Distribution<()> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, _: &mut R) -> () { () }
+}
+tuple_impl!{A}
+tuple_impl!{A, B}
+tuple_impl!{A, B, C}
+tuple_impl!{A, B, C, D}
+tuple_impl!{A, B, C, D, E}
+tuple_impl!{A, B, C, D, E, F}
+tuple_impl!{A, B, C, D, E, F, G}
+tuple_impl!{A, B, C, D, E, F, G, H}
+tuple_impl!{A, B, C, D, E, F, G, H, I}
+tuple_impl!{A, B, C, D, E, F, G, H, I, J}
+tuple_impl!{A, B, C, D, E, F, G, H, I, J, K}
+tuple_impl!{A, B, C, D, E, F, G, H, I, J, K, L}
+
+macro_rules! array_impl {
+    // recursive, given at least one type parameter:
+    {$n:expr, $t:ident, $($ts:ident,)*} => {
+        array_impl!{($n - 1), $($ts,)*}
+
+        impl<T> Distribution<[T; $n]> for Standard where Standard: Distribution<T> {
+            #[inline]
+            fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> [T; $n] {
+                [_rng.gen::<$t>(), $(_rng.gen::<$ts>()),*]
+            }
+        }
+    };
+    // empty case:
+    {$n:expr,} => {
+        impl<T> Distribution<[T; $n]> for Standard {
+            fn sample<R: Rng + ?Sized>(&self, _rng: &mut R) -> [T; $n] { [] }
+        }
+    };
+}
+
+array_impl!{32, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T,}
+
+impl<T> Distribution<Option<T>> for Standard where Standard: Distribution<T> {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Option<T> {
+        // UFCS is needed here: https://github.com/rust-lang/rust/issues/24066
+        if rng.gen::<bool>() {
+            Some(rng.gen())
+        } else {
+            None
+        }
+    }
+}
+
+impl<T> Distribution<Wrapping<T>> for Standard where Standard: Distribution<T> {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Wrapping<T> {
+        Wrapping(rng.gen())
+    }
+}
+
+
+#[cfg(test)]
+mod tests {
+    use {Rng, RngCore, Standard};
+    use distributions::Alphanumeric;
+    #[cfg(all(not(feature="std"), feature="alloc"))] use alloc::string::String;
+
+    #[test]
+    fn test_misc() {
+        let rng: &mut RngCore = &mut ::test::rng(820);
+        
+        rng.sample::<char, _>(Standard);
+        rng.sample::<bool, _>(Standard);
+    }
+    
+    #[cfg(feature="alloc")]
+    #[test]
+    fn test_chars() {
+        use core::iter;
+        let mut rng = ::test::rng(805);
+
+        // Test by generating a relatively large number of chars, so we also
+        // take the rejection sampling path.
+        let word: String = iter::repeat(())
+                .map(|()| rng.gen::<char>()).take(1000).collect();
+        assert!(word.len() != 0);
+    }
+
+    #[test]
+    fn test_alphanumeric() {
+        let mut rng = ::test::rng(806);
+
+        // Test by generating a relatively large number of chars, so we also
+        // take the rejection sampling path.
+        let mut incorrect = false;
+        for _ in 0..100 {
+            let c = rng.sample(Alphanumeric);
+            incorrect |= !((c >= '0' && c <= '9') ||
+                           (c >= 'A' && c <= 'Z') ||
+                           (c >= 'a' && c <= 'z') );
+        }
+        assert!(incorrect == false);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/pareto.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/pareto.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/pareto.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/pareto.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,76 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The Pareto distribution.
+
+use Rng;
+use distributions::{Distribution, OpenClosed01};
+
+/// Samples floating-point numbers according to the Pareto distribution
+///
+/// # Example
+/// ```
+/// use rand::prelude::*;
+/// use rand::distributions::Pareto;
+///
+/// let val: f64 = SmallRng::from_entropy().sample(Pareto::new(1., 2.));
+/// println!("{}", val);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Pareto {
+    scale: f64,
+    inv_neg_shape: f64,
+}
+
+impl Pareto {
+    /// Construct a new Pareto distribution with given `scale` and `shape`.
+    ///
+    /// In the literature, `scale` is commonly written as x<sub>m</sub> or k and
+    /// `shape` is often written as α.
+    ///
+    /// # Panics
+    ///
+    /// `scale` and `shape` have to be non-zero and positive.
+    pub fn new(scale: f64, shape: f64) -> Pareto {
+        assert!((scale > 0.) & (shape > 0.));
+        Pareto { scale, inv_neg_shape: -1.0 / shape }
+    }
+}
+
+impl Distribution<f64> for Pareto {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
+        let u: f64 = rng.sample(OpenClosed01);
+        self.scale * u.powf(self.inv_neg_shape)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use distributions::Distribution;
+    use super::Pareto;
+
+    #[test]
+    #[should_panic]
+    fn invalid() {
+        Pareto::new(0., 0.);
+    }
+
+    #[test]
+    fn sample() {
+        let scale = 1.0;
+        let shape = 2.0;
+        let d = Pareto::new(scale, shape);
+        let mut rng = ::test::rng(1);
+        for _ in 0..1000 {
+            let r = d.sample(&mut rng);
+            assert!(r >= scale);
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/poisson.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/poisson.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/poisson.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/poisson.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,158 @@
+// Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The Poisson distribution.
+
+use Rng;
+use distributions::{Distribution, Cauchy};
+use distributions::log_gamma::log_gamma;
+
+/// The Poisson distribution `Poisson(lambda)`.
+///
+/// This distribution has a density function:
+/// `f(k) = lambda^k * exp(-lambda) / k!` for `k >= 0`.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Poisson, Distribution};
+///
+/// let poi = Poisson::new(2.0);
+/// let v = poi.sample(&mut rand::thread_rng());
+/// println!("{} is from a Poisson(2) distribution", v);
+/// ```
+#[derive(Clone, Copy, Debug)]
+pub struct Poisson {
+    lambda: f64,
+    // precalculated values
+    exp_lambda: f64,
+    log_lambda: f64,
+    sqrt_2lambda: f64,
+    magic_val: f64,
+}
+
+impl Poisson {
+    /// Construct a new `Poisson` with the given shape parameter
+    /// `lambda`. Panics if `lambda <= 0`.
+    pub fn new(lambda: f64) -> Poisson {
+        assert!(lambda > 0.0, "Poisson::new called with lambda <= 0");
+        let log_lambda = lambda.ln();
+        Poisson {
+            lambda,
+            exp_lambda: (-lambda).exp(),
+            log_lambda,
+            sqrt_2lambda: (2.0 * lambda).sqrt(),
+            magic_val: lambda * log_lambda - log_gamma(1.0 + lambda),
+        }
+    }
+}
+
+impl Distribution<u64> for Poisson {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u64 {
+        // using the algorithm from Numerical Recipes in C
+
+        // for low expected values use the Knuth method
+        if self.lambda < 12.0 {
+            let mut result = 0;
+            let mut p = 1.0;
+            while p > self.exp_lambda {
+                p *= rng.gen::<f64>();
+                result += 1;
+            }
+            result - 1
+        }
+        // high expected values - rejection method
+        else {
+            let mut int_result: u64;
+
+            // we use the Cauchy distribution as the comparison distribution
+            // f(x) ~ 1/(1+x^2)
+            let cauchy = Cauchy::new(0.0, 1.0);
+
+            loop {
+                let mut result;
+                let mut comp_dev;
+
+                loop {
+                    // draw from the Cauchy distribution
+                    comp_dev = rng.sample(cauchy);
+                    // shift the peak of the comparison ditribution
+                    result = self.sqrt_2lambda * comp_dev + self.lambda;
+                    // repeat the drawing until we are in the range of possible values
+                    if result >= 0.0 {
+                        break;
+                    }
+                }
+                // now the result is a random variable greater than 0 with Cauchy distribution
+                // the result should be an integer value
+                result = result.floor();
+                int_result = result as u64;
+
+                // this is the ratio of the Poisson distribution to the comparison distribution
+                // the magic value scales the distribution function to a range of approximately 0-1
+                // since it is not exact, we multiply the ratio by 0.9 to avoid ratios greater than 1
+                // this doesn't change the resulting distribution, only increases the rate of failed drawings
+                let check = 0.9 * (1.0 + comp_dev * comp_dev)
+                    * (result * self.log_lambda - log_gamma(1.0 + result) - self.magic_val).exp();
+
+                // check with uniform random value - if below the threshold, we are within the target distribution
+                if rng.gen::<f64>() <= check {
+                    break;
+                }
+            }
+            int_result
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use distributions::Distribution;
+    use super::Poisson;
+
+    #[test]
+    fn test_poisson_10() {
+        let poisson = Poisson::new(10.0);
+        let mut rng = ::test::rng(123);
+        let mut sum = 0;
+        for _ in 0..1000 {
+            sum += poisson.sample(&mut rng);
+        }
+        let avg = (sum as f64) / 1000.0;
+        println!("Poisson average: {}", avg);
+        assert!((avg - 10.0).abs() < 0.5); // not 100% certain, but probable enough
+    }
+
+    #[test]
+    fn test_poisson_15() {
+        // Take the 'high expected values' path
+        let poisson = Poisson::new(15.0);
+        let mut rng = ::test::rng(123);
+        let mut sum = 0;
+        for _ in 0..1000 {
+            sum += poisson.sample(&mut rng);
+        }
+        let avg = (sum as f64) / 1000.0;
+        println!("Poisson average: {}", avg);
+        assert!((avg - 15.0).abs() < 0.5); // not 100% certain, but probable enough
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_poisson_invalid_lambda_zero() {
+        Poisson::new(0.0);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_poisson_invalid_lambda_neg() {
+        Poisson::new(-10.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/uniform.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/uniform.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/uniform.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/uniform.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,856 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! A distribution uniformly sampling numbers within a given range.
+//!
+//! [`Uniform`] is the standard distribution to sample uniformly from a range;
+//! e.g. `Uniform::new_inclusive(1, 6)` can sample integers from 1 to 6, like a
+//! standard die. [`Rng::gen_range`] supports any type supported by
+//! [`Uniform`].
+//!
+//! This distribution is provided with support for several primitive types
+//! (all integer and floating-point types) as well as `std::time::Duration`,
+//! and supports extension to user-defined types via a type-specific *back-end*
+//! implementation.
+//!
+//! The types [`UniformInt`], [`UniformFloat`] and [`UniformDuration`] are the
+//! back-ends supporting sampling from primitive integer and floating-point
+//! ranges as well as from `std::time::Duration`; these types do not normally
+//! need to be used directly (unless implementing a derived back-end).
+//!
+//! # Example usage
+//!
+//! ```
+//! use rand::{Rng, thread_rng};
+//! use rand::distributions::Uniform;
+//! 
+//! let mut rng = thread_rng();
+//! let side = Uniform::new(-10.0, 10.0);
+//! 
+//! // sample between 1 and 10 points
+//! for _ in 0..rng.gen_range(1, 11) {
+//!     // sample a point from the square with sides -10 - 10 in two dimensions
+//!     let (x, y) = (rng.sample(side), rng.sample(side));
+//!     println!("Point: {}, {}", x, y);
+//! }
+//! ```
+//!
+//! # Extending `Uniform` to support a custom type
+//!
+//! To extend [`Uniform`] to support your own types, write a back-end which
+//! implements the [`UniformSampler`] trait, then implement the [`SampleUniform`]
+//! helper trait to "register" your back-end. See the `MyF32` example below.
+//!
+//! At a minimum, the back-end needs to store any parameters needed for sampling
+//! (e.g. the target range) and implement `new`, `new_inclusive` and `sample`.
+//! Those methods should include an assert to check the range is valid (i.e.
+//! `low < high`). The example below merely wraps another back-end.
+//!
+//! ```
+//! use rand::prelude::*;
+//! use rand::distributions::uniform::{Uniform, SampleUniform,
+//!         UniformSampler, UniformFloat};
+//!
+//! struct MyF32(f32);
+//!
+//! #[derive(Clone, Copy, Debug)]
+//! struct UniformMyF32 {
+//!     inner: UniformFloat<f32>,
+//! }
+//!
+//! impl UniformSampler for UniformMyF32 {
+//!     type X = MyF32;
+//!     fn new(low: Self::X, high: Self::X) -> Self {
+//!         UniformMyF32 {
+//!             inner: UniformFloat::<f32>::new(low.0, high.0),
+//!         }
+//!     }
+//!     fn new_inclusive(low: Self::X, high: Self::X) -> Self {
+//!         UniformSampler::new(low, high)
+//!     }
+//!     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+//!         MyF32(self.inner.sample(rng))
+//!     }
+//! }
+//!
+//! impl SampleUniform for MyF32 {
+//!     type Sampler = UniformMyF32;
+//! }
+//!
+//! let (low, high) = (MyF32(17.0f32), MyF32(22.0f32));
+//! let uniform = Uniform::new(low, high);
+//! let x = uniform.sample(&mut thread_rng());
+//! ```
+//!
+//! [`Uniform`]: struct.Uniform.html
+//! [`Rng::gen_range`]: ../../trait.Rng.html#method.gen_range
+//! [`SampleUniform`]: trait.SampleUniform.html
+//! [`UniformSampler`]: trait.UniformSampler.html
+//! [`UniformInt`]: struct.UniformInt.html
+//! [`UniformFloat`]: struct.UniformFloat.html
+//! [`UniformDuration`]: struct.UniformDuration.html
+
+#[cfg(feature = "std")]
+use std::time::Duration;
+
+use Rng;
+use distributions::Distribution;
+use distributions::float::IntoFloat;
+
+/// Sample values uniformly between two bounds.
+///
+/// [`Uniform::new`] and [`Uniform::new_inclusive`] construct a uniform
+/// distribution sampling from the given range; these functions may do extra
+/// work up front to make sampling of multiple values faster.
+///
+/// When sampling from a constant range, many calculations can happen at
+/// compile-time and all methods should be fast; for floating-point ranges and
+/// the full range of integer types this should have comparable performance to
+/// the `Standard` distribution.
+///
+/// Steps are taken to avoid bias which might be present in naive
+/// implementations; for example `rng.gen::<u8>() % 170` samples from the range
+/// `[0, 169]` but is twice as likely to select numbers less than 85 than other
+/// values. Further, the implementations here give more weight to the high-bits
+/// generated by the RNG than the low bits, since with some RNGs the low-bits
+/// are of lower quality than the high bits.
+///
+/// Implementations should attempt to sample in `[low, high)` for
+/// `Uniform::new(low, high)`, i.e., excluding `high`, but this may be very
+/// difficult. All the primitive integer types satisfy this property, and the
+/// float types normally satisfy it, but rounding may mean `high` can occur.
+///
+/// # Example
+///
+/// ```
+/// use rand::distributions::{Distribution, Uniform};
+///
+/// fn main() {
+///     let between = Uniform::from(10..10000);
+///     let mut rng = rand::thread_rng();
+///     let mut sum = 0;
+///     for _ in 0..1000 {
+///         sum += between.sample(&mut rng);
+///     }
+///     println!("{}", sum);
+/// }
+/// ```
+///
+/// [`Uniform::new`]: struct.Uniform.html#method.new
+/// [`Uniform::new_inclusive`]: struct.Uniform.html#method.new_inclusive
+/// [`new`]: struct.Uniform.html#method.new
+/// [`new_inclusive`]: struct.Uniform.html#method.new_inclusive
+#[derive(Clone, Copy, Debug)]
+pub struct Uniform<X: SampleUniform> {
+    inner: X::Sampler,
+}
+
+impl<X: SampleUniform> Uniform<X> {
+    /// Create a new `Uniform` instance which samples uniformly from the half
+    /// open range `[low, high)` (excluding `high`). Panics if `low >= high`.
+    pub fn new(low: X, high: X) -> Uniform<X> {
+        Uniform { inner: X::Sampler::new(low, high) }
+    }
+
+    /// Create a new `Uniform` instance which samples uniformly from the closed
+    /// range `[low, high]` (inclusive). Panics if `low > high`.
+    pub fn new_inclusive(low: X, high: X) -> Uniform<X> {
+        Uniform { inner: X::Sampler::new_inclusive(low, high) }
+    }
+}
+
+impl<X: SampleUniform> Distribution<X> for Uniform<X> {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> X {
+        self.inner.sample(rng)
+    }
+}
+
+/// Helper trait for creating objects using the correct implementation of
+/// [`UniformSampler`] for the sampling type.
+///
+/// See the [module documentation] on how to implement [`Uniform`] range
+/// sampling for a custom type.
+///
+/// [`UniformSampler`]: trait.UniformSampler.html
+/// [module documentation]: index.html
+/// [`Uniform`]: struct.Uniform.html
+pub trait SampleUniform: Sized {
+    /// The `UniformSampler` implementation supporting type `X`.
+    type Sampler: UniformSampler<X = Self>;
+}
+
+/// Helper trait handling actual uniform sampling.
+///
+/// See the [module documentation] on how to implement [`Uniform`] range
+/// sampling for a custom type.
+///
+/// Implementation of [`sample_single`] is optional, and is only useful when
+/// the implementation can be faster than `Self::new(low, high).sample(rng)`.
+///
+/// [module documentation]: index.html
+/// [`Uniform`]: struct.Uniform.html
+/// [`sample_single`]: trait.UniformSampler.html#method.sample_single
+pub trait UniformSampler: Sized {
+    /// The type sampled by this implementation.
+    type X;
+
+    /// Construct self, with inclusive lower bound and exclusive upper bound
+    /// `[low, high)`.
+    ///
+    /// Usually users should not call this directly but instead use
+    /// `Uniform::new`, which asserts that `low < high` before calling this.
+    fn new(low: Self::X, high: Self::X) -> Self;
+
+    /// Construct self, with inclusive bounds `[low, high]`.
+    ///
+    /// Usually users should not call this directly but instead use
+    /// `Uniform::new_inclusive`, which asserts that `low <= high` before
+    /// calling this.
+    fn new_inclusive(low: Self::X, high: Self::X) -> Self;
+
+    /// Sample a value.
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X;
+
+    /// Sample a single value uniformly from a range with inclusive lower bound
+    /// and exclusive upper bound `[low, high)`.
+    ///
+    /// Usually users should not call this directly but instead use
+    /// `Uniform::sample_single`, which asserts that `low < high` before calling
+    /// this.
+    ///
+    /// Via this method, implementations can provide a method optimized for
+    /// sampling only a single value from the specified range. The default
+    /// implementation simply calls `UniformSampler::new` then `sample` on the
+    /// result.
+    fn sample_single<R: Rng + ?Sized>(low: Self::X, high: Self::X, rng: &mut R)
+        -> Self::X
+    {
+        let uniform: Self = UniformSampler::new(low, high);
+        uniform.sample(rng)
+    }
+}
+
+impl<X: SampleUniform> From<::core::ops::Range<X>> for Uniform<X> {
+    fn from(r: ::core::ops::Range<X>) -> Uniform<X> {
+        Uniform::new(r.start, r.end)
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// What follows are all back-ends.
+
+
+/// The back-end implementing [`UniformSampler`] for integer types.
+///
+/// Unless you are implementing [`UniformSampler`] for your own type, this type
+/// should not be used directly, use [`Uniform`] instead.
+///
+/// # Implementation notes
+///
+/// For a closed range, the number of possible numbers we should generate is
+/// `range = (high - low + 1)`. It is not possible to end up with a uniform
+/// distribution if we map *all* the random integers that can be generated to
+/// this range. We have to map integers from a `zone` that is a multiple of the
+/// range. The rest of the integers, that cause a bias, are rejected.
+///
+/// The problem with `range` is that to cover the full range of the type, it has
+/// to store `unsigned_max + 1`, which can't be represented. But if the range
+/// covers the full range of the type, no modulus is needed. A range of size 0
+/// can't exist, so we use that to represent this special case. Wrapping
+/// arithmetic even makes representing `unsigned_max + 1` as 0 simple.
+///
+/// We don't calculate `zone` directly, but first calculate the number of
+/// integers to reject. To handle `unsigned_max + 1` not fitting in the type,
+/// we use:
+/// `ints_to_reject = (unsigned_max + 1) % range;`
+/// `ints_to_reject = (unsigned_max - range + 1) % range;`
+///
+/// The smallest integer PRNGs generate is `u32`. That is why for small integer
+/// sizes (`i8`/`u8` and `i16`/`u16`) there is an optimization: don't pick the
+/// largest zone that can fit in the small type, but pick the largest zone that
+/// can fit in an `u32`. `ints_to_reject` is always less than half the size of
+/// the small integer. This means the first bit of `zone` is always 1, and so
+/// are all the other preceding bits of a larger integer. The easiest way to
+/// grow the `zone` for the larger type is to simply sign extend it.
+///
+/// An alternative to using a modulus is widening multiply: After a widening
+/// multiply by `range`, the result is in the high word. Then comparing the low
+/// word against `zone` makes sure our distribution is uniform.
+///
+/// [`UniformSampler`]: trait.UniformSampler.html
+/// [`Uniform`]: struct.Uniform.html
+#[derive(Clone, Copy, Debug)]
+pub struct UniformInt<X> {
+    low: X,
+    range: X,
+    zone: X,
+}
+
+macro_rules! uniform_int_impl {
+    ($ty:ty, $signed:ty, $unsigned:ident,
+     $i_large:ident, $u_large:ident) => {
+        impl SampleUniform for $ty {
+            type Sampler = UniformInt<$ty>;
+        }
+
+        impl UniformSampler for UniformInt<$ty> {
+            // We play free and fast with unsigned vs signed here
+            // (when $ty is signed), but that's fine, since the
+            // contract of this macro is for $ty and $unsigned to be
+            // "bit-equal", so casting between them is a no-op.
+
+            type X = $ty;
+
+            #[inline] // if the range is constant, this helps LLVM to do the
+                      // calculations at compile-time.
+            fn new(low: Self::X, high: Self::X) -> Self {
+                assert!(low < high, "Uniform::new called with `low >= high`");
+                UniformSampler::new_inclusive(low, high - 1)
+            }
+
+            #[inline] // if the range is constant, this helps LLVM to do the
+                      // calculations at compile-time.
+            fn new_inclusive(low: Self::X, high: Self::X) -> Self {
+                assert!(low <= high,
+                        "Uniform::new_inclusive called with `low > high`");
+                let unsigned_max = ::core::$unsigned::MAX;
+
+                let range = high.wrapping_sub(low).wrapping_add(1) as $unsigned;
+                let ints_to_reject =
+                    if range > 0 {
+                        (unsigned_max - range + 1) % range
+                    } else {
+                        0
+                    };
+                let zone = unsigned_max - ints_to_reject;
+
+                UniformInt {
+                    low: low,
+                    // These are really $unsigned values, but store as $ty:
+                    range: range as $ty,
+                    zone: zone as $ty
+                }
+            }
+
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+                let range = self.range as $unsigned as $u_large;
+                if range > 0 {
+                    // Grow `zone` to fit a type of at least 32 bits, by
+                    // sign-extending it (the first bit is always 1, so are all
+                    // the preceding bits of the larger type).
+                    // For types that already have the right size, all the
+                    // casting is a no-op.
+                    let zone = self.zone as $signed as $i_large as $u_large;
+                    loop {
+                        let v: $u_large = rng.gen();
+                        let (hi, lo) = v.wmul(range);
+                        if lo <= zone {
+                            return self.low.wrapping_add(hi as $ty);
+                        }
+                    }
+                } else {
+                    // Sample from the entire integer range.
+                    rng.gen()
+                }
+            }
+
+            fn sample_single<R: Rng + ?Sized>(low: Self::X,
+                                              high: Self::X,
+                                              rng: &mut R) -> Self::X
+            {
+                assert!(low < high,
+                        "Uniform::sample_single called with low >= high");
+                let range = high.wrapping_sub(low) as $unsigned as $u_large;
+                let zone =
+                    if ::core::$unsigned::MAX <= ::core::u16::MAX as $unsigned {
+                        // Using a modulus is faster than the approximation for
+                        // i8 and i16. I suppose we trade the cost of one
+                        // modulus for near-perfect branch prediction.
+                        let unsigned_max: $u_large = ::core::$u_large::MAX;
+                        let ints_to_reject = (unsigned_max - range + 1) % range;
+                        unsigned_max - ints_to_reject
+                    } else {
+                        // conservative but fast approximation
+                       range << range.leading_zeros()
+                    };
+
+                loop {
+                    let v: $u_large = rng.gen();
+                    let (hi, lo) = v.wmul(range);
+                    if lo <= zone {
+                        return low.wrapping_add(hi as $ty);
+                    }
+                }
+            }
+        }
+    }
+}
+
+uniform_int_impl! { i8, i8, u8, i32, u32 }
+uniform_int_impl! { i16, i16, u16, i32, u32 }
+uniform_int_impl! { i32, i32, u32, i32, u32 }
+uniform_int_impl! { i64, i64, u64, i64, u64 }
+#[cfg(feature = "i128_support")]
+uniform_int_impl! { i128, i128, u128, u128, u128 }
+uniform_int_impl! { isize, isize, usize, isize, usize }
+uniform_int_impl! { u8, i8, u8, i32, u32 }
+uniform_int_impl! { u16, i16, u16, i32, u32 }
+uniform_int_impl! { u32, i32, u32, i32, u32 }
+uniform_int_impl! { u64, i64, u64, i64, u64 }
+uniform_int_impl! { usize, isize, usize, isize, usize }
+#[cfg(feature = "i128_support")]
+uniform_int_impl! { u128, u128, u128, i128, u128 }
+
+
+trait WideningMultiply<RHS = Self> {
+    type Output;
+
+    fn wmul(self, x: RHS) -> Self::Output;
+}
+
+macro_rules! wmul_impl {
+    ($ty:ty, $wide:ty, $shift:expr) => {
+        impl WideningMultiply for $ty {
+            type Output = ($ty, $ty);
+
+            #[inline(always)]
+            fn wmul(self, x: $ty) -> Self::Output {
+                let tmp = (self as $wide) * (x as $wide);
+                ((tmp >> $shift) as $ty, tmp as $ty)
+            }
+        }
+    }
+}
+wmul_impl! { u8, u16, 8 }
+wmul_impl! { u16, u32, 16 }
+wmul_impl! { u32, u64, 32 }
+#[cfg(feature = "i128_support")]
+wmul_impl! { u64, u128, 64 }
+
+// This code is a translation of the __mulddi3 function in LLVM's
+// compiler-rt. It is an optimised variant of the common method
+// `(a + b) * (c + d) = ac + ad + bc + bd`.
+//
+// For some reason LLVM can optimise the C version very well, but
+// keeps shuffeling registers in this Rust translation.
+macro_rules! wmul_impl_large {
+    ($ty:ty, $half:expr) => {
+        impl WideningMultiply for $ty {
+            type Output = ($ty, $ty);
+
+            #[inline(always)]
+            fn wmul(self, b: $ty) -> Self::Output {
+                const LOWER_MASK: $ty = !0 >> $half;
+                let mut low = (self & LOWER_MASK).wrapping_mul(b & LOWER_MASK);
+                let mut t = low >> $half;
+                low &= LOWER_MASK;
+                t += (self >> $half).wrapping_mul(b & LOWER_MASK);
+                low += (t & LOWER_MASK) << $half;
+                let mut high = t >> $half;
+                t = low >> $half;
+                low &= LOWER_MASK;
+                t += (b >> $half).wrapping_mul(self & LOWER_MASK);
+                low += (t & LOWER_MASK) << $half;
+                high += t >> $half;
+                high += (self >> $half).wrapping_mul(b >> $half);
+
+                (high, low)
+            }
+        }
+    }
+}
+#[cfg(not(feature = "i128_support"))]
+wmul_impl_large! { u64, 32 }
+#[cfg(feature = "i128_support")]
+wmul_impl_large! { u128, 64 }
+
+macro_rules! wmul_impl_usize {
+    ($ty:ty) => {
+        impl WideningMultiply for usize {
+            type Output = (usize, usize);
+
+            #[inline(always)]
+            fn wmul(self, x: usize) -> Self::Output {
+                let (high, low) = (self as $ty).wmul(x as $ty);
+                (high as usize, low as usize)
+            }
+        }
+    }
+}
+#[cfg(target_pointer_width = "32")]
+wmul_impl_usize! { u32 }
+#[cfg(target_pointer_width = "64")]
+wmul_impl_usize! { u64 }
+
+
+
+/// The back-end implementing [`UniformSampler`] for floating-point types.
+///
+/// Unless you are implementing [`UniformSampler`] for your own type, this type
+/// should not be used directly, use [`Uniform`] instead.
+///
+/// # Implementation notes
+///
+/// Instead of generating a float in the `[0, 1)` range using [`Standard`], the
+/// `UniformFloat` implementation converts the output of an PRNG itself. This
+/// way one or two steps can be optimized out.
+///
+/// The floats are first converted to a value in the `[1, 2)` interval using a
+/// transmute-based method, and then mapped to the expected range with a
+/// multiply and addition. Values produced this way have what equals 22 bits of
+/// random digits for an `f32`, and 52 for an `f64`.
+///
+/// Currently there is no difference between [`new`] and [`new_inclusive`],
+/// because the boundaries of a floats range are a bit of a fuzzy concept due to
+/// rounding errors.
+///
+/// [`UniformSampler`]: trait.UniformSampler.html
+/// [`new`]: trait.UniformSampler.html#tymethod.new
+/// [`new_inclusive`]: trait.UniformSampler.html#tymethod.new_inclusive
+/// [`Uniform`]: struct.Uniform.html
+/// [`Standard`]: ../struct.Standard.html
+#[derive(Clone, Copy, Debug)]
+pub struct UniformFloat<X> {
+    scale: X,
+    offset: X,
+}
+
+macro_rules! uniform_float_impl {
+    ($ty:ty, $bits_to_discard:expr, $next_u:ident) => {
+        impl SampleUniform for $ty {
+            type Sampler = UniformFloat<$ty>;
+        }
+
+        impl UniformSampler for UniformFloat<$ty> {
+            type X = $ty;
+
+            fn new(low: Self::X, high: Self::X) -> Self {
+                assert!(low < high, "Uniform::new called with `low >= high`");
+                let scale = high - low;
+                let offset = low - scale;
+                UniformFloat {
+                    scale: scale,
+                    offset: offset,
+                }
+            }
+
+            fn new_inclusive(low: Self::X, high: Self::X) -> Self {
+                assert!(low <= high,
+                        "Uniform::new_inclusive called with `low > high`");
+                let scale = high - low;
+                let offset = low - scale;
+                UniformFloat {
+                    scale: scale,
+                    offset: offset,
+                }
+            }
+
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+                // Generate a value in the range [1, 2)
+                let value1_2 = (rng.$next_u() >> $bits_to_discard)
+                               .into_float_with_exponent(0);
+                // We don't use `f64::mul_add`, because it is not available with
+                // `no_std`. Furthermore, it is slower for some targets (but
+                // faster for others). However, the order of multiplication and
+                // addition is important, because on some platforms (e.g. ARM)
+                // it will be optimized to a single (non-FMA) instruction.
+                value1_2 * self.scale + self.offset
+            }
+
+            fn sample_single<R: Rng + ?Sized>(low: Self::X,
+                                              high: Self::X,
+                                              rng: &mut R) -> Self::X {
+                assert!(low < high,
+                        "Uniform::sample_single called with low >= high");
+                let scale = high - low;
+                let offset = low - scale;
+                // Generate a value in the range [1, 2)
+                let value1_2 = (rng.$next_u() >> $bits_to_discard)
+                               .into_float_with_exponent(0);
+                // Doing multiply before addition allows some architectures to
+                // use a single instruction.
+                value1_2 * scale + offset
+            }
+        }
+    }
+}
+
+uniform_float_impl! { f32, 32 - 23, next_u32 }
+uniform_float_impl! { f64, 64 - 52, next_u64 }
+
+
+
+/// The back-end implementing [`UniformSampler`] for `Duration`.
+///
+/// Unless you are implementing [`UniformSampler`] for your own types, this type
+/// should not be used directly, use [`Uniform`] instead.
+///
+/// [`UniformSampler`]: trait.UniformSampler.html
+/// [`Uniform`]: struct.Uniform.html
+#[cfg(feature = "std")]
+#[derive(Clone, Copy, Debug)]
+pub struct UniformDuration {
+    offset: Duration,
+    mode: UniformDurationMode,
+}
+
+#[cfg(feature = "std")]
+#[derive(Debug, Copy, Clone)]
+enum UniformDurationMode {
+    Small {
+        nanos: Uniform<u64>,
+    },
+    Large {
+        size: Duration,
+        secs: Uniform<u64>,
+    }
+}
+
+#[cfg(feature = "std")]
+impl SampleUniform for Duration {
+    type Sampler = UniformDuration;
+}
+
+#[cfg(feature = "std")]
+impl UniformSampler for UniformDuration {
+    type X = Duration;
+
+    #[inline]
+    fn new(low: Duration, high: Duration) -> UniformDuration {
+        assert!(low < high, "Uniform::new called with `low >= high`");
+        UniformDuration::new_inclusive(low, high - Duration::new(0, 1))
+    }
+
+    #[inline]
+    fn new_inclusive(low: Duration, high: Duration) -> UniformDuration {
+        assert!(low <= high, "Uniform::new_inclusive called with `low > high`");
+        let size = high - low;
+        let nanos = size
+            .as_secs()
+            .checked_mul(1_000_000_000)
+            .and_then(|n| n.checked_add(size.subsec_nanos() as u64));
+
+        let mode = match nanos {
+            Some(nanos) => {
+                UniformDurationMode::Small {
+                    nanos: Uniform::new_inclusive(0, nanos),
+                }
+            }
+            None => {
+                UniformDurationMode::Large {
+                    size: size,
+                    secs: Uniform::new_inclusive(0, size.as_secs()),
+                }
+            }
+        };
+
+        UniformDuration {
+            mode,
+            offset: low,
+        }
+    }
+
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Duration {
+        let d = match self.mode {
+            UniformDurationMode::Small { nanos } => {
+                let nanos = nanos.sample(rng);
+                Duration::new(nanos / 1_000_000_000, (nanos % 1_000_000_000) as u32)
+            }
+            UniformDurationMode::Large { size, secs } => {
+                // constant folding means this is at least as fast as `gen_range`
+                let nano_range = Uniform::new(0, 1_000_000_000);
+                loop {
+                    let d = Duration::new(secs.sample(rng), nano_range.sample(rng));
+                    if d <= size {
+                        break d;
+                    }
+                }
+            }
+        };
+
+        self.offset + d
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use Rng;
+    use distributions::uniform::{Uniform, UniformSampler, UniformFloat, SampleUniform};
+
+    #[should_panic]
+    #[test]
+    fn test_uniform_bad_limits_equal_int() {
+        Uniform::new(10, 10);
+    }
+
+    #[should_panic]
+    #[test]
+    fn test_uniform_bad_limits_equal_float() {
+        Uniform::new(10., 10.);
+    }
+
+    #[test]
+    fn test_uniform_good_limits_equal_int() {
+        let mut rng = ::test::rng(804);
+        let dist = Uniform::new_inclusive(10, 10);
+        for _ in 0..20 {
+            assert_eq!(rng.sample(dist), 10);
+        }
+    }
+
+    #[test]
+    fn test_uniform_good_limits_equal_float() {
+        let mut rng = ::test::rng(805);
+        let dist = Uniform::new_inclusive(10., 10.);
+        for _ in 0..20 {
+            assert_eq!(rng.sample(dist), 10.);
+        }
+    }
+
+    #[should_panic]
+    #[test]
+    fn test_uniform_bad_limits_flipped_int() {
+        Uniform::new(10, 5);
+    }
+
+    #[should_panic]
+    #[test]
+    fn test_uniform_bad_limits_flipped_float() {
+        Uniform::new(10., 5.);
+    }
+
+    #[test]
+    fn test_integers() {
+        let mut rng = ::test::rng(251);
+        macro_rules! t {
+            ($($ty:ident),*) => {{
+                $(
+                   let v: &[($ty, $ty)] = &[(0, 10),
+                                            (10, 127),
+                                            (::core::$ty::MIN, ::core::$ty::MAX)];
+                   for &(low, high) in v.iter() {
+                        let my_uniform = Uniform::new(low, high);
+                        for _ in 0..1000 {
+                            let v: $ty = rng.sample(my_uniform);
+                            assert!(low <= v && v < high);
+                        }
+
+                        let my_uniform = Uniform::new_inclusive(low, high);
+                        for _ in 0..1000 {
+                            let v: $ty = rng.sample(my_uniform);
+                            assert!(low <= v && v <= high);
+                        }
+
+                        for _ in 0..1000 {
+                            let v: $ty = rng.gen_range(low, high);
+                            assert!(low <= v && v < high);
+                        }
+                    }
+                 )*
+            }}
+        }
+        t!(i8, i16, i32, i64, isize,
+           u8, u16, u32, u64, usize);
+        #[cfg(feature = "i128_support")]
+        t!(i128, u128)
+    }
+
+    #[test]
+    fn test_floats() {
+        let mut rng = ::test::rng(252);
+        macro_rules! t {
+            ($($ty:ty),*) => {{
+                $(
+                   let v: &[($ty, $ty)] = &[(0.0, 100.0),
+                                            (-1e35, -1e25),
+                                            (1e-35, 1e-25),
+                                            (-1e35, 1e35)];
+                   for &(low, high) in v.iter() {
+                        let my_uniform = Uniform::new(low, high);
+                        for _ in 0..1000 {
+                            let v: $ty = rng.sample(my_uniform);
+                            assert!(low <= v && v < high);
+                        }
+                    }
+                 )*
+            }}
+        }
+
+        t!(f32, f64)
+    }
+
+    #[test]
+    #[cfg(feature = "std")]
+    fn test_durations() {
+        use std::time::Duration;
+
+        let mut rng = ::test::rng(253);
+
+        let v = &[(Duration::new(10, 50000), Duration::new(100, 1234)),
+                  (Duration::new(0, 100), Duration::new(1, 50)),
+                  (Duration::new(0, 0), Duration::new(u64::max_value(), 999_999_999))];
+        for &(low, high) in v.iter() {
+            let my_uniform = Uniform::new(low, high);
+            for _ in 0..1000 {
+                let v = rng.sample(my_uniform);
+                assert!(low <= v && v < high);
+            }
+        }
+    }
+
+    #[test]
+    fn test_custom_uniform() {
+        #[derive(Clone, Copy, PartialEq, PartialOrd)]
+        struct MyF32 {
+            x: f32,
+        }
+        #[derive(Clone, Copy, Debug)]
+        struct UniformMyF32 {
+            inner: UniformFloat<f32>,
+        }
+        impl UniformSampler for UniformMyF32 {
+            type X = MyF32;
+            fn new(low: Self::X, high: Self::X) -> Self {
+                UniformMyF32 {
+                    inner: UniformFloat::<f32>::new(low.x, high.x),
+                }
+            }
+            fn new_inclusive(low: Self::X, high: Self::X) -> Self {
+                UniformSampler::new(low, high)
+            }
+            fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+                MyF32 { x: self.inner.sample(rng) }
+            }
+        }
+        impl SampleUniform for MyF32 {
+            type Sampler = UniformMyF32;
+        }
+
+        let (low, high) = (MyF32{ x: 17.0f32 }, MyF32{ x: 22.0f32 });
+        let uniform = Uniform::new(low, high);
+        let mut rng = ::test::rng(804);
+        for _ in 0..100 {
+            let x: MyF32 = rng.sample(uniform);
+            assert!(low <= x && x < high);
+        }
+    }
+
+    #[test]
+    fn test_uniform_from_std_range() {
+        let r = Uniform::from(2u32..7);
+        assert_eq!(r.inner.low, 2);
+        assert_eq!(r.inner.range, 5);
+        let r = Uniform::from(2.0f64..7.0);
+        assert_eq!(r.inner.offset, -3.0);
+        assert_eq!(r.inner.scale, 5.0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/distributions/ziggurat_tables.rs cargo-0.33.0/vendor/rand-0.5.6/src/distributions/ziggurat_tables.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/distributions/ziggurat_tables.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/distributions/ziggurat_tables.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,280 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Tables for distributions which are sampled using the ziggurat
+// algorithm. Autogenerated by `ziggurat_tables.py`.
+
+pub type ZigTable = &'static [f64; 257];
+pub const ZIG_NORM_R: f64 = 3.654152885361008796;
+pub static ZIG_NORM_X: [f64; 257] =
+    [3.910757959537090045, 3.654152885361008796, 3.449278298560964462, 3.320244733839166074,
+     3.224575052047029100, 3.147889289517149969, 3.083526132001233044, 3.027837791768635434,
+     2.978603279880844834, 2.934366867207854224, 2.894121053612348060, 2.857138730872132548,
+     2.822877396825325125, 2.790921174000785765, 2.760944005278822555, 2.732685359042827056,
+     2.705933656121858100, 2.680514643284522158, 2.656283037575502437, 2.633116393630324570,
+     2.610910518487548515, 2.589575986706995181, 2.569035452680536569, 2.549221550323460761,
+     2.530075232158516929, 2.511544441625342294, 2.493583041269680667, 2.476149939669143318,
+     2.459208374333311298, 2.442725318198956774, 2.426670984935725972, 2.411018413899685520,
+     2.395743119780480601, 2.380822795170626005, 2.366237056715818632, 2.351967227377659952,
+     2.337996148795031370, 2.324308018869623016, 2.310888250599850036, 2.297723348901329565,
+     2.284800802722946056, 2.272108990226823888, 2.259637095172217780, 2.247375032945807760,
+     2.235313384928327984, 2.223443340090905718, 2.211756642882544366, 2.200245546609647995,
+     2.188902771624720689, 2.177721467738641614, 2.166695180352645966, 2.155817819875063268,
+     2.145083634046203613, 2.134487182844320152, 2.124023315687815661, 2.113687150684933957,
+     2.103474055713146829, 2.093379631137050279, 2.083399693996551783, 2.073530263516978778,
+     2.063767547809956415, 2.054107931648864849, 2.044547965215732788, 2.035084353727808715,
+     2.025713947862032960, 2.016433734904371722, 2.007240830558684852, 1.998132471356564244,
+     1.989106007615571325, 1.980158896898598364, 1.971288697931769640, 1.962493064942461896,
+     1.953769742382734043, 1.945116560006753925, 1.936531428273758904, 1.928012334050718257,
+     1.919557336591228847, 1.911164563769282232, 1.902832208548446369, 1.894558525668710081,
+     1.886341828534776388, 1.878180486290977669, 1.870072921069236838, 1.862017605397632281,
+     1.854013059758148119, 1.846057850283119750, 1.838150586580728607, 1.830289919680666566,
+     1.822474540091783224, 1.814703175964167636, 1.806974591348693426, 1.799287584547580199,
+     1.791640986550010028, 1.784033659547276329, 1.776464495522344977, 1.768932414909077933,
+     1.761436365316706665, 1.753975320315455111, 1.746548278279492994, 1.739154261283669012,
+     1.731792314050707216, 1.724461502945775715, 1.717160915015540690, 1.709889657069006086,
+     1.702646854797613907, 1.695431651932238548, 1.688243209434858727, 1.681080704722823338,
+     1.673943330923760353, 1.666830296159286684, 1.659740822855789499, 1.652674147080648526,
+     1.645629517902360339, 1.638606196773111146, 1.631603456932422036, 1.624620582830568427,
+     1.617656869570534228, 1.610711622367333673, 1.603784156023583041, 1.596873794420261339,
+     1.589979870021648534, 1.583101723393471438, 1.576238702733332886, 1.569390163412534456,
+     1.562555467528439657, 1.555733983466554893, 1.548925085471535512, 1.542128153226347553,
+     1.535342571438843118, 1.528567729435024614, 1.521803020758293101, 1.515047842773992404,
+     1.508301596278571965, 1.501563685112706548, 1.494833515777718391, 1.488110497054654369,
+     1.481394039625375747, 1.474683555695025516, 1.467978458615230908, 1.461278162507407830,
+     1.454582081885523293, 1.447889631277669675, 1.441200224845798017, 1.434513276002946425,
+     1.427828197027290358, 1.421144398672323117, 1.414461289772464658, 1.407778276843371534,
+     1.401094763676202559, 1.394410150925071257, 1.387723835686884621, 1.381035211072741964,
+     1.374343665770030531, 1.367648583594317957, 1.360949343030101844, 1.354245316759430606,
+     1.347535871177359290, 1.340820365893152122, 1.334098153216083604, 1.327368577624624679,
+     1.320630975217730096, 1.313884673146868964, 1.307128989027353860, 1.300363230327433728,
+     1.293586693733517645, 1.286798664489786415, 1.279998415710333237, 1.273185207661843732,
+     1.266358287014688333, 1.259516886060144225, 1.252660221891297887, 1.245787495544997903,
+     1.238897891102027415, 1.231990574742445110, 1.225064693752808020, 1.218119375481726552,
+     1.211153726239911244, 1.204166830140560140, 1.197157747875585931, 1.190125515422801650,
+     1.183069142678760732, 1.175987612011489825, 1.168879876726833800, 1.161744859441574240,
+     1.154581450355851802, 1.147388505416733873, 1.140164844363995789, 1.132909248648336975,
+     1.125620459211294389, 1.118297174115062909, 1.110938046009249502, 1.103541679420268151,
+     1.096106627847603487, 1.088631390649514197, 1.081114409698889389, 1.073554065787871714,
+     1.065948674757506653, 1.058296483326006454, 1.050595664586207123, 1.042844313139370538,
+     1.035040439828605274, 1.027181966030751292, 1.019266717460529215, 1.011292417434978441,
+     1.003256679539591412, 0.995156999629943084, 0.986990747093846266, 0.978755155288937750,
+     0.970447311058864615, 0.962064143217605250, 0.953602409875572654, 0.945058684462571130,
+     0.936429340280896860, 0.927710533396234771, 0.918898183643734989, 0.909987953490768997,
+     0.900975224455174528, 0.891855070726792376, 0.882622229578910122, 0.873271068082494550,
+     0.863795545546826915, 0.854189171001560554, 0.844444954902423661, 0.834555354079518752,
+     0.824512208745288633, 0.814306670128064347, 0.803929116982664893, 0.793369058833152785,
+     0.782615023299588763, 0.771654424216739354, 0.760473406422083165, 0.749056662009581653,
+     0.737387211425838629, 0.725446140901303549, 0.713212285182022732, 0.700661841097584448,
+     0.687767892786257717, 0.674499822827436479, 0.660822574234205984, 0.646695714884388928,
+     0.632072236375024632, 0.616896989996235545, 0.601104617743940417, 0.584616766093722262,
+     0.567338257040473026, 0.549151702313026790, 0.529909720646495108, 0.509423329585933393,
+     0.487443966121754335, 0.463634336771763245, 0.437518402186662658, 0.408389134588000746,
+     0.375121332850465727, 0.335737519180459465, 0.286174591747260509, 0.215241895913273806,
+     0.000000000000000000];
+pub static ZIG_NORM_F: [f64; 257] =
+    [0.000477467764586655, 0.001260285930498598, 0.002609072746106363, 0.004037972593371872,
+     0.005522403299264754, 0.007050875471392110, 0.008616582769422917, 0.010214971439731100,
+     0.011842757857943104, 0.013497450601780807, 0.015177088307982072, 0.016880083152595839,
+     0.018605121275783350, 0.020351096230109354, 0.022117062707379922, 0.023902203305873237,
+     0.025705804008632656, 0.027527235669693315, 0.029365939758230111, 0.031221417192023690,
+     0.033093219458688698, 0.034980941461833073, 0.036884215688691151, 0.038802707404656918,
+     0.040736110656078753, 0.042684144916619378, 0.044646552251446536, 0.046623094902089664,
+     0.048613553216035145, 0.050617723861121788, 0.052635418276973649, 0.054666461325077916,
+     0.056710690106399467, 0.058767952921137984, 0.060838108349751806, 0.062921024437977854,
+     0.065016577971470438, 0.067124653828023989, 0.069245144397250269, 0.071377949059141965,
+     0.073522973714240991, 0.075680130359194964, 0.077849336702372207, 0.080030515814947509,
+     0.082223595813495684, 0.084428509570654661, 0.086645194450867782, 0.088873592068594229,
+     0.091113648066700734, 0.093365311913026619, 0.095628536713353335, 0.097903279039215627,
+     0.100189498769172020, 0.102487158942306270, 0.104796225622867056, 0.107116667775072880,
+     0.109448457147210021, 0.111791568164245583, 0.114145977828255210, 0.116511665626037014,
+     0.118888613443345698, 0.121276805485235437, 0.123676228202051403, 0.126086870220650349,
+     0.128508722280473636, 0.130941777174128166, 0.133386029692162844, 0.135841476571757352,
+     0.138308116449064322, 0.140785949814968309, 0.143274978974047118, 0.145775208006537926,
+     0.148286642733128721, 0.150809290682410169, 0.153343161060837674, 0.155888264725064563,
+     0.158444614156520225, 0.161012223438117663, 0.163591108232982951, 0.166181285765110071,
+     0.168782774801850333, 0.171395595638155623, 0.174019770082499359, 0.176655321444406654,
+     0.179302274523530397, 0.181960655600216487, 0.184630492427504539, 0.187311814224516926,
+     0.190004651671193070, 0.192709036904328807, 0.195425003514885592, 0.198152586546538112,
+     0.200891822495431333, 0.203642749311121501, 0.206405406398679298, 0.209179834621935651,
+     0.211966076307852941, 0.214764175252008499, 0.217574176725178370, 0.220396127481011589,
+     0.223230075764789593, 0.226076071323264877, 0.228934165415577484, 0.231804410825248525,
+     0.234686861873252689, 0.237581574432173676, 0.240488605941449107, 0.243408015423711988,
+     0.246339863502238771, 0.249284212419516704, 0.252241126056943765, 0.255210669955677150,
+     0.258192911338648023, 0.261187919133763713, 0.264195763998317568, 0.267216518344631837,
+     0.270250256366959984, 0.273297054069675804, 0.276356989296781264, 0.279430141762765316,
+     0.282516593084849388, 0.285616426816658109, 0.288729728483353931, 0.291856585618280984,
+     0.294997087801162572, 0.298151326697901342, 0.301319396102034120, 0.304501391977896274,
+     0.307697412505553769, 0.310907558127563710, 0.314131931597630143, 0.317370638031222396,
+     0.320623784958230129, 0.323891482377732021, 0.327173842814958593, 0.330470981380537099,
+     0.333783015832108509, 0.337110066638412809, 0.340452257045945450, 0.343809713148291340,
+     0.347182563958251478, 0.350570941482881204, 0.353974980801569250, 0.357394820147290515,
+     0.360830600991175754, 0.364282468130549597, 0.367750569780596226, 0.371235057669821344,
+     0.374736087139491414, 0.378253817247238111, 0.381788410875031348, 0.385340034841733958,
+     0.388908860020464597, 0.392495061461010764, 0.396098818517547080, 0.399720314981931668,
+     0.403359739222868885, 0.407017284331247953, 0.410693148271983222, 0.414387534042706784,
+     0.418100649839684591, 0.421832709231353298, 0.425583931339900579, 0.429354541031341519,
+     0.433144769114574058, 0.436954852549929273, 0.440785034667769915, 0.444635565397727750,
+     0.448506701509214067, 0.452398706863882505, 0.456311852680773566, 0.460246417814923481,
+     0.464202689050278838, 0.468180961407822172, 0.472181538469883255, 0.476204732721683788,
+     0.480250865911249714, 0.484320269428911598, 0.488413284707712059, 0.492530263646148658,
+     0.496671569054796314, 0.500837575128482149, 0.505028667945828791, 0.509245245998136142,
+     0.513487720749743026, 0.517756517232200619, 0.522052074674794864, 0.526374847174186700,
+     0.530725304406193921, 0.535103932383019565, 0.539511234259544614, 0.543947731192649941,
+     0.548413963257921133, 0.552910490428519918, 0.557437893621486324, 0.561996775817277916,
+     0.566587763258951771, 0.571211506738074970, 0.575868682975210544, 0.580559996103683473,
+     0.585286179266300333, 0.590047996335791969, 0.594846243770991268, 0.599681752622167719,
+     0.604555390700549533, 0.609468064928895381, 0.614420723892076803, 0.619414360609039205,
+     0.624450015550274240, 0.629528779928128279, 0.634651799290960050, 0.639820277456438991,
+     0.645035480824251883, 0.650298743114294586, 0.655611470583224665, 0.660975147780241357,
+     0.666391343912380640, 0.671861719900766374, 0.677388036222513090, 0.682972161648791376,
+     0.688616083008527058, 0.694321916130032579, 0.700091918140490099, 0.705928501336797409,
+     0.711834248882358467, 0.717811932634901395, 0.723864533472881599, 0.729995264565802437,
+     0.736207598131266683, 0.742505296344636245, 0.748892447223726720, 0.755373506511754500,
+     0.761953346841546475, 0.768637315803334831, 0.775431304986138326, 0.782341832659861902,
+     0.789376143571198563, 0.796542330428254619, 0.803849483176389490, 0.811307874318219935,
+     0.818929191609414797, 0.826726833952094231, 0.834716292992930375, 0.842915653118441077,
+     0.851346258465123684, 0.860033621203008636, 0.869008688043793165, 0.878309655816146839,
+     0.887984660763399880, 0.898095921906304051, 0.908726440060562912, 0.919991505048360247,
+     0.932060075968990209, 0.945198953453078028, 0.959879091812415930, 0.977101701282731328,
+     1.000000000000000000];
+pub const ZIG_EXP_R: f64 = 7.697117470131050077;
+pub static ZIG_EXP_X: [f64; 257] =
+    [8.697117470131052741, 7.697117470131050077, 6.941033629377212577, 6.478378493832569696,
+     6.144164665772472667, 5.882144315795399869, 5.666410167454033697, 5.482890627526062488,
+     5.323090505754398016, 5.181487281301500047, 5.054288489981304089, 4.938777085901250530,
+     4.832939741025112035, 4.735242996601741083, 4.644491885420085175, 4.559737061707351380,
+     4.480211746528421912, 4.405287693473573185, 4.334443680317273007, 4.267242480277365857,
+     4.203313713735184365, 4.142340865664051464, 4.084051310408297830, 4.028208544647936762,
+     3.974606066673788796, 3.923062500135489739, 3.873417670399509127, 3.825529418522336744,
+     3.779270992411667862, 3.734528894039797375, 3.691201090237418825, 3.649195515760853770,
+     3.608428813128909507, 3.568825265648337020, 3.530315889129343354, 3.492837654774059608,
+     3.456332821132760191, 3.420748357251119920, 3.386035442460300970, 3.352149030900109405,
+     3.319047470970748037, 3.286692171599068679, 3.255047308570449882, 3.224079565286264160,
+     3.193757903212240290, 3.164053358025972873, 3.134938858084440394, 3.106389062339824481,
+     3.078380215254090224, 3.050890016615455114, 3.023897504455676621, 2.997382949516130601,
+     2.971327759921089662, 2.945714394895045718, 2.920526286512740821, 2.895747768600141825,
+     2.871364012015536371, 2.847360965635188812, 2.823725302450035279, 2.800444370250737780,
+     2.777506146439756574, 2.754899196562344610, 2.732612636194700073, 2.710636095867928752,
+     2.688959688741803689, 2.667573980773266573, 2.646469963151809157, 2.625639026797788489,
+     2.605072938740835564, 2.584763820214140750, 2.564704126316905253, 2.544886627111869970,
+     2.525304390037828028, 2.505950763528594027, 2.486819361740209455, 2.467904050297364815,
+     2.449198932978249754, 2.430698339264419694, 2.412396812688870629, 2.394289099921457886,
+     2.376370140536140596, 2.358635057409337321, 2.341079147703034380, 2.323697874390196372,
+     2.306486858283579799, 2.289441870532269441, 2.272558825553154804, 2.255833774367219213,
+     2.239262898312909034, 2.222842503111036816, 2.206569013257663858, 2.190438966723220027,
+     2.174449009937774679, 2.158595893043885994, 2.142876465399842001, 2.127287671317368289,
+     2.111826546019042183, 2.096490211801715020, 2.081275874393225145, 2.066180819490575526,
+     2.051202409468584786, 2.036338080248769611, 2.021585338318926173, 2.006941757894518563,
+     1.992404978213576650, 1.977972700957360441, 1.963642687789548313, 1.949412758007184943,
+     1.935280786297051359, 1.921244700591528076, 1.907302480018387536, 1.893452152939308242,
+     1.879691795072211180, 1.866019527692827973, 1.852433515911175554, 1.838931967018879954,
+     1.825513128903519799, 1.812175288526390649, 1.798916770460290859, 1.785735935484126014,
+     1.772631179231305643, 1.759600930889074766, 1.746643651946074405, 1.733757834985571566,
+     1.720942002521935299, 1.708194705878057773, 1.695514524101537912, 1.682900062917553896,
+     1.670349953716452118, 1.657862852574172763, 1.645437439303723659, 1.633072416535991334,
+     1.620766508828257901, 1.608518461798858379, 1.596327041286483395, 1.584191032532688892,
+     1.572109239386229707, 1.560080483527888084, 1.548103603714513499, 1.536177455041032092,
+     1.524300908219226258, 1.512472848872117082, 1.500692176842816750, 1.488957805516746058,
+     1.477268661156133867, 1.465623682245745352, 1.454021818848793446, 1.442462031972012504,
+     1.430943292938879674, 1.419464582769983219, 1.408024891569535697, 1.396623217917042137,
+     1.385258568263121992, 1.373929956328490576, 1.362636402505086775, 1.351376933258335189,
+     1.340150580529504643, 1.328956381137116560, 1.317793376176324749, 1.306660610415174117,
+     1.295557131686601027, 1.284481990275012642, 1.273434238296241139, 1.262412929069615330,
+     1.251417116480852521, 1.240445854334406572, 1.229498195693849105, 1.218573192208790124,
+     1.207669893426761121, 1.196787346088403092, 1.185924593404202199, 1.175080674310911677,
+     1.164254622705678921, 1.153445466655774743, 1.142652227581672841, 1.131873919411078511,
+     1.121109547701330200, 1.110358108727411031, 1.099618588532597308, 1.088889961938546813,
+     1.078171191511372307, 1.067461226479967662, 1.056759001602551429, 1.046063435977044209,
+     1.035373431790528542, 1.024687873002617211, 1.014005623957096480, 1.003325527915696735,
+     0.992646405507275897, 0.981967053085062602, 0.971286240983903260, 0.960602711668666509,
+     0.949915177764075969, 0.939222319955262286, 0.928522784747210395, 0.917815182070044311,
+     0.907098082715690257, 0.896370015589889935, 0.885629464761751528, 0.874874866291025066,
+     0.864104604811004484, 0.853317009842373353, 0.842510351810368485, 0.831682837734273206,
+     0.820832606554411814, 0.809957724057418282, 0.799056177355487174, 0.788125868869492430,
+     0.777164609759129710, 0.766170112735434672, 0.755139984181982249, 0.744071715500508102,
+     0.732962673584365398, 0.721810090308756203, 0.710611050909655040, 0.699362481103231959,
+     0.688061132773747808, 0.676703568029522584, 0.665286141392677943, 0.653804979847664947,
+     0.642255960424536365, 0.630634684933490286, 0.618936451394876075, 0.607156221620300030,
+     0.595288584291502887, 0.583327712748769489, 0.571267316532588332, 0.559100585511540626,
+     0.546820125163310577, 0.534417881237165604, 0.521885051592135052, 0.509211982443654398,
+     0.496388045518671162, 0.483401491653461857, 0.470239275082169006, 0.456886840931420235,
+     0.443327866073552401, 0.429543940225410703, 0.415514169600356364, 0.401214678896277765,
+     0.386617977941119573, 0.371692145329917234, 0.356399760258393816, 0.340696481064849122,
+     0.324529117016909452, 0.307832954674932158, 0.290527955491230394, 0.272513185478464703,
+     0.253658363385912022, 0.233790483059674731, 0.212671510630966620, 0.189958689622431842,
+     0.165127622564187282, 0.137304980940012589, 0.104838507565818778, 0.063852163815001570,
+     0.000000000000000000];
+pub static ZIG_EXP_F: [f64; 257] =
+    [0.000167066692307963, 0.000454134353841497, 0.000967269282327174, 0.001536299780301573,
+     0.002145967743718907, 0.002788798793574076, 0.003460264777836904, 0.004157295120833797,
+     0.004877655983542396, 0.005619642207205489, 0.006381905937319183, 0.007163353183634991,
+     0.007963077438017043, 0.008780314985808977, 0.009614413642502212, 0.010464810181029981,
+     0.011331013597834600, 0.012212592426255378, 0.013109164931254991, 0.014020391403181943,
+     0.014945968011691148, 0.015885621839973156, 0.016839106826039941, 0.017806200410911355,
+     0.018786700744696024, 0.019780424338009740, 0.020787204072578114, 0.021806887504283581,
+     0.022839335406385240, 0.023884420511558174, 0.024942026419731787, 0.026012046645134221,
+     0.027094383780955803, 0.028188948763978646, 0.029295660224637411, 0.030414443910466622,
+     0.031545232172893622, 0.032687963508959555, 0.033842582150874358, 0.035009037697397431,
+     0.036187284781931443, 0.037377282772959382, 0.038578995503074871, 0.039792391023374139,
+     0.041017441380414840, 0.042254122413316254, 0.043502413568888197, 0.044762297732943289,
+     0.046033761076175184, 0.047316792913181561, 0.048611385573379504, 0.049917534282706379,
+     0.051235237055126281, 0.052564494593071685, 0.053905310196046080, 0.055257689676697030,
+     0.056621641283742870, 0.057997175631200659, 0.059384305633420280, 0.060783046445479660,
+     0.062193415408541036, 0.063615431999807376, 0.065049117786753805, 0.066494496385339816,
+     0.067951593421936643, 0.069420436498728783, 0.070901055162371843, 0.072393480875708752,
+     0.073897746992364746, 0.075413888734058410, 0.076941943170480517, 0.078481949201606435,
+     0.080033947542319905, 0.081597980709237419, 0.083174093009632397, 0.084762330532368146,
+     0.086362741140756927, 0.087975374467270231, 0.089600281910032886, 0.091237516631040197,
+     0.092887133556043569, 0.094549189376055873, 0.096223742550432825, 0.097910853311492213,
+     0.099610583670637132, 0.101322997425953631, 0.103048160171257702, 0.104786139306570145,
+     0.106537004050001632, 0.108300825451033755, 0.110077676405185357, 0.111867631670056283,
+     0.113670767882744286, 0.115487163578633506, 0.117316899211555525, 0.119160057175327641,
+     0.121016721826674792, 0.122886979509545108, 0.124770918580830933, 0.126668629437510671,
+     0.128580204545228199, 0.130505738468330773, 0.132445327901387494, 0.134399071702213602,
+     0.136367070926428829, 0.138349428863580176, 0.140346251074862399, 0.142357645432472146,
+     0.144383722160634720, 0.146424593878344889, 0.148480375643866735, 0.150551185001039839,
+     0.152637142027442801, 0.154738369384468027, 0.156854992369365148, 0.158987138969314129,
+     0.161134939917591952, 0.163298528751901734, 0.165478041874935922, 0.167673618617250081,
+     0.169885401302527550, 0.172113535315319977, 0.174358169171353411, 0.176619454590494829,
+     0.178897546572478278, 0.181192603475496261, 0.183504787097767436, 0.185834262762197083,
+     0.188181199404254262, 0.190545769663195363, 0.192928149976771296, 0.195328520679563189,
+     0.197747066105098818, 0.200183974691911210, 0.202639439093708962, 0.205113656293837654,
+     0.207606827724221982, 0.210119159388988230, 0.212650861992978224, 0.215202151075378628,
+     0.217773247148700472, 0.220364375843359439, 0.222975768058120111, 0.225607660116683956,
+     0.228260293930716618, 0.230933917169627356, 0.233628783437433291, 0.236345152457059560,
+     0.239083290262449094, 0.241843469398877131, 0.244625969131892024, 0.247431075665327543,
+     0.250259082368862240, 0.253110290015629402, 0.255985007030415324, 0.258883549749016173,
+     0.261806242689362922, 0.264753418835062149, 0.267725419932044739, 0.270722596799059967,
+     0.273745309652802915, 0.276793928448517301, 0.279868833236972869, 0.282970414538780746,
+     0.286099073737076826, 0.289255223489677693, 0.292439288161892630, 0.295651704281261252,
+     0.298892921015581847, 0.302163400675693528, 0.305463619244590256, 0.308794066934560185,
+     0.312155248774179606, 0.315547685227128949, 0.318971912844957239, 0.322428484956089223,
+     0.325917972393556354, 0.329440964264136438, 0.332998068761809096, 0.336589914028677717,
+     0.340217149066780189, 0.343880444704502575, 0.347580494621637148, 0.351318016437483449,
+     0.355093752866787626, 0.358908472948750001, 0.362762973354817997, 0.366658079781514379,
+     0.370594648435146223, 0.374573567615902381, 0.378595759409581067, 0.382662181496010056,
+     0.386773829084137932, 0.390931736984797384, 0.395136981833290435, 0.399390684475231350,
+     0.403694012530530555, 0.408048183152032673, 0.412454465997161457, 0.416914186433003209,
+     0.421428728997616908, 0.425999541143034677, 0.430628137288459167, 0.435316103215636907,
+     0.440065100842354173, 0.444876873414548846, 0.449753251162755330, 0.454696157474615836,
+     0.459707615642138023, 0.464789756250426511, 0.469944825283960310, 0.475175193037377708,
+     0.480483363930454543, 0.485871987341885248, 0.491343869594032867, 0.496901987241549881,
+     0.502549501841348056, 0.508289776410643213, 0.514126393814748894, 0.520063177368233931,
+     0.526104213983620062, 0.532253880263043655, 0.538516872002862246, 0.544898237672440056,
+     0.551403416540641733, 0.558038282262587892, 0.564809192912400615, 0.571723048664826150,
+     0.578787358602845359, 0.586010318477268366, 0.593400901691733762, 0.600968966365232560,
+     0.608725382079622346, 0.616682180915207878, 0.624852738703666200, 0.633251994214366398,
+     0.641896716427266423, 0.650805833414571433, 0.660000841079000145, 0.669506316731925177,
+     0.679350572264765806, 0.689566496117078431, 0.700192655082788606, 0.711274760805076456,
+     0.722867659593572465, 0.735038092431424039, 0.747868621985195658, 0.761463388849896838,
+     0.775956852040116218, 0.791527636972496285, 0.808421651523009044, 0.826993296643051101,
+     0.847785500623990496, 0.871704332381204705, 0.900469929925747703, 0.938143680862176477,
+     1.000000000000000000];
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/lib.rs cargo-0.33.0/vendor/rand-0.5.6/src/lib.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1238 @@
+// Copyright 2013-2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Utilities for random number generation
+//!
+//! Rand provides utilities to generate random numbers, to convert them to
+//! useful types and distributions, and some randomness-related algorithms.
+//!
+//! # Basic usage
+//!
+//! To get you started quickly, the easiest and highest-level way to get
+//! a random value is to use [`random()`].
+//!
+//! ```
+//! let x: u8 = rand::random();
+//! println!("{}", x);
+//!
+//! let y = rand::random::<f64>();
+//! println!("{}", y);
+//!
+//! if rand::random() { // generates a boolean
+//!     println!("Heads!");
+//! }
+//! ```
+//!
+//! This supports generating most common types but is not very flexible, thus
+//! you probably want to learn a bit more about the Rand library.
+//!
+//!
+//! # The two-step process to get a random value
+//!
+//! Generating random values is typically a two-step process:
+//!
+//! - get some *random data* (an integer or bit/byte sequence) from a random
+//!   number generator (RNG);
+//! - use some function to transform that *data* into the type of value you want
+//!   (this function is an implementation of some *distribution* describing the
+//!   kind of value produced).
+//!
+//! Rand represents the first step with the [`RngCore`] trait and the second
+//! step via a combination of the [`Rng`] extension trait and the
+//! [`distributions` module].
+//! In practice you probably won't use [`RngCore`] directly unless you are
+//! implementing a random number generator (RNG).
+//!
+//! There are many kinds of RNGs, with different trade-offs. You can read more
+//! about them in the [`rngs` module] and even more in the [`prng` module],
+//! however, often you can just use [`thread_rng()`]. This function
+//! automatically initializes an RNG in thread-local memory, then returns a
+//! reference to it. It is fast, good quality, and secure (unpredictable).
+//!
+//! To turn the output of the RNG into something usable, you usually want to use
+//! the methods from the [`Rng`] trait. Some of the most useful methods are:
+//!
+//! - [`gen`] generates a random value appropriate for the type (just like
+//!   [`random()`]). For integers this is normally the full representable range
+//!   (e.g. from `0u32` to `std::u32::MAX`), for floats this is between 0 and 1,
+//!   and some other types are supported, including arrays and tuples. See the
+//!   [`Standard`] distribution which provides the implementations.
+//! - [`gen_range`] samples from a specific range of values; this is like
+//!   [`gen`] but with specific upper and lower bounds.
+//! - [`sample`] samples directly from some distribution.
+//!
+//! [`random()`] is defined using just the above: `thread_rng().gen()`.
+//!
+//! ## Distributions
+//!
+//! What are distributions, you ask? Specifying only the type and range of
+//! values (known as the *sample space*) is not enough; samples must also have
+//! a *probability distribution*, describing the relative probability of
+//! sampling each value in that space.
+//!
+//! In many cases a *uniform* distribution is used, meaning roughly that each
+//! value is equally likely (or for "continuous" types like floats, that each
+//! equal-sized sub-range has the same probability of containing a sample).
+//! [`gen`] and [`gen_range`] both use statistically uniform distributions.
+//!
+//! The [`distributions` module] provides implementations
+//! of some other distributions, including Normal, Log-Normal and Exponential.
+//! 
+//! It is worth noting that the functionality already mentioned is implemented
+//! with distributions: [`gen`] samples values using the [`Standard`]
+//! distribution, while [`gen_range`] uses [`Uniform`].
+//!
+//! ## Importing (prelude)
+//!
+//! The most convenient way to import items from Rand is to use the [prelude].
+//! This includes the most important parts of Rand, but only those unlikely to
+//! cause name conflicts.
+//!
+//! Note that Rand 0.5 has significantly changed the module organization and
+//! contents relative to previous versions. Where possible old names have been
+//! kept (but are hidden in the documentation), however these will be removed
+//! in the future. We therefore recommend migrating to use the prelude or the
+//! new module organization in your imports.
+//!
+//!
+//! ## Examples
+//!
+//! ```
+//! use rand::prelude::*;
+//!
+//! // thread_rng is often the most convenient source of randomness:
+//! let mut rng = thread_rng();
+//! 
+//! if rng.gen() { // random bool
+//!     let x: f64 = rng.gen(); // random number in range [0, 1)
+//!     println!("x is: {}", x);
+//!     let ch = rng.gen::<char>(); // using type annotation
+//!     println!("char is: {}", ch);
+//!     println!("Number from 0 to 9: {}", rng.gen_range(0, 10));
+//! }
+//! ```
+//!
+//!
+//! # More functionality
+//!
+//! The [`Rng`] trait includes a few more methods not mentioned above:
+//!
+//! - [`Rng::sample_iter`] allows iterating over values from a chosen
+//!   distribution.
+//! - [`Rng::gen_bool`] generates boolean "events" with a given probability.
+//! - [`Rng::fill`] and [`Rng::try_fill`] are fast alternatives to fill a slice
+//!   of integers.
+//! - [`Rng::shuffle`] randomly shuffles elements in a slice.
+//! - [`Rng::choose`] picks one element at random from a slice.
+//!
+//! For more slice/sequence related functionality, look in the [`seq` module].
+//!
+//! There is also [`distributions::WeightedChoice`], which can be used to pick
+//! elements at random with some probability. But it does not work well at the
+//! moment and is going through a redesign.
+//!
+//!
+//! # Error handling
+//!
+//! Error handling in Rand is a compromise between simplicity and necessity.
+//! Most RNGs and sampling functions will never produce errors, and making these
+//! able to handle errors would add significant overhead (to code complexity
+//! and ergonomics of usage at least, and potentially also performance,
+//! depending on the approach).
+//! However, external RNGs can fail, and being able to handle this is important.
+//!
+//! It has therefore been decided that *most* methods should not return a
+//! `Result` type, with as exceptions [`Rng::try_fill`],
+//! [`RngCore::try_fill_bytes`], and [`SeedableRng::from_rng`].
+//!
+//! Note that it is the RNG that panics when it fails but is not used through a
+//! method that can report errors. Currently Rand contains only three RNGs that
+//! can return an error (and thus may panic), and documents this property:
+//! [`OsRng`], [`EntropyRng`] and [`ReadRng`]. Other RNGs, like [`ThreadRng`]
+//! and [`StdRng`], can be used with all methods without concern.
+//!
+//! One further problem is that if Rand is unable to get any external randomness
+//! when initializing an RNG with [`EntropyRng`], it will panic in
+//! [`FromEntropy::from_entropy`], and notably in [`thread_rng()`]. Except by
+//! compromising security, this problem is as unsolvable as running out of
+//! memory.
+//!
+//!
+//! # Distinction between Rand and `rand_core`
+//!
+//! The [`rand_core`] crate provides the necessary traits and functionality for
+//! implementing RNGs; this includes the [`RngCore`] and [`SeedableRng`] traits
+//! and the [`Error`] type.
+//! Crates implementing RNGs should depend on [`rand_core`].
+//!
+//! Applications and libraries consuming random values are encouraged to use the
+//! Rand crate, which re-exports the common parts of [`rand_core`].
+//!
+//!
+//! # More examples
+//!
+//! For some inspiration, see the examples:
+//!
+//! - [Monte Carlo estimation of π](
+//!   https://github.com/rust-lang-nursery/rand/blob/master/examples/monte-carlo.rs)
+//! - [Monty Hall Problem](
+//!    https://github.com/rust-lang-nursery/rand/blob/master/examples/monty-hall.rs)
+//!
+//!
+//! [`distributions` module]: distributions/index.html
+//! [`distributions::WeightedChoice`]: distributions/struct.WeightedChoice.html
+//! [`FromEntropy::from_entropy`]: trait.FromEntropy.html#tymethod.from_entropy
+//! [`EntropyRng`]: rngs/struct.EntropyRng.html
+//! [`Error`]: struct.Error.html
+//! [`gen_range`]: trait.Rng.html#method.gen_range
+//! [`gen`]: trait.Rng.html#method.gen
+//! [`OsRng`]: rngs/struct.OsRng.html
+//! [prelude]: prelude/index.html
+//! [`rand_core`]: https://crates.io/crates/rand_core
+//! [`random()`]: fn.random.html
+//! [`ReadRng`]: rngs/adapter/struct.ReadRng.html
+//! [`Rng::choose`]: trait.Rng.html#method.choose
+//! [`Rng::fill`]: trait.Rng.html#method.fill
+//! [`Rng::gen_bool`]: trait.Rng.html#method.gen_bool
+//! [`Rng::gen`]: trait.Rng.html#method.gen
+//! [`Rng::sample_iter`]: trait.Rng.html#method.sample_iter
+//! [`Rng::shuffle`]: trait.Rng.html#method.shuffle
+//! [`RngCore`]: trait.RngCore.html
+//! [`RngCore::try_fill_bytes`]: trait.RngCore.html#method.try_fill_bytes
+//! [`rngs` module]: rngs/index.html
+//! [`prng` module]: prng/index.html
+//! [`Rng`]: trait.Rng.html
+//! [`Rng::try_fill`]: trait.Rng.html#method.try_fill
+//! [`sample`]: trait.Rng.html#method.sample
+//! [`SeedableRng`]: trait.SeedableRng.html
+//! [`SeedableRng::from_rng`]: trait.SeedableRng.html#method.from_rng
+//! [`seq` module]: seq/index.html
+//! [`SmallRng`]: rngs/struct.SmallRng.html
+//! [`StdRng`]: rngs/struct.StdRng.html
+//! [`thread_rng()`]: fn.thread_rng.html
+//! [`ThreadRng`]: rngs/struct.ThreadRng.html
+//! [`Standard`]: distributions/struct.Standard.html
+//! [`Uniform`]: distributions/struct.Uniform.html
+
+
+#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+       html_root_url = "https://docs.rs/rand/0.5.6")]
+
+#![deny(missing_docs)]
+#![deny(missing_debug_implementations)]
+#![doc(test(attr(allow(unused_variables), deny(warnings))))]
+
+#![cfg_attr(not(feature="std"), no_std)]
+#![cfg_attr(all(feature="alloc", not(feature="std")), feature(alloc))]
+#![cfg_attr(all(feature="i128_support", feature="nightly"), allow(stable_features))] // stable since 2018-03-27
+#![cfg_attr(all(feature="i128_support", feature="nightly"), feature(i128_type, i128))]
+#![cfg_attr(feature = "stdweb", recursion_limit="128")]
+
+#[cfg(feature="std")] extern crate std as core;
+#[cfg(all(feature = "alloc", not(feature="std")))] extern crate alloc;
+
+#[cfg(test)] #[cfg(feature="serde1")] extern crate bincode;
+#[cfg(feature="serde1")] extern crate serde;
+#[cfg(feature="serde1")] #[macro_use] extern crate serde_derive;
+
+#[cfg(all(target_arch="wasm32", not(target_os="emscripten"), feature="stdweb"))]
+#[macro_use]
+extern crate stdweb;
+
+extern crate rand_core;
+
+#[cfg(feature = "log")] #[macro_use] extern crate log;
+#[allow(unused)]
+#[cfg(not(feature = "log"))] macro_rules! trace { ($($x:tt)*) => () }
+#[allow(unused)]
+#[cfg(not(feature = "log"))] macro_rules! debug { ($($x:tt)*) => () }
+#[allow(unused)]
+#[cfg(not(feature = "log"))] macro_rules! info { ($($x:tt)*) => () }
+#[allow(unused)]
+#[cfg(not(feature = "log"))] macro_rules! warn { ($($x:tt)*) => () }
+#[allow(unused)]
+#[cfg(not(feature = "log"))] macro_rules! error { ($($x:tt)*) => () }
+
+
+// Re-exports from rand_core
+pub use rand_core::{RngCore, CryptoRng, SeedableRng};
+pub use rand_core::{ErrorKind, Error};
+
+// Public exports
+#[cfg(feature="std")] pub use rngs::thread::thread_rng;
+
+// Public modules
+pub mod distributions;
+pub mod prelude;
+pub mod prng;
+pub mod rngs;
+#[cfg(feature = "alloc")] pub mod seq;
+
+////////////////////////////////////////////////////////////////////////////////
+// Compatibility re-exports. Documentation is hidden; will be removed eventually.
+
+#[cfg(feature="std")] #[doc(hidden)] pub use rngs::adapter::read;
+#[doc(hidden)] pub use rngs::adapter::ReseedingRng;
+
+#[allow(deprecated)]
+#[cfg(feature="std")] #[doc(hidden)] pub use rngs::EntropyRng;
+
+#[allow(deprecated)]
+#[cfg(all(feature="std",
+          any(target_os = "linux", target_os = "android",
+              target_os = "netbsd",
+              target_os = "dragonfly",
+              target_os = "haiku",
+              target_os = "emscripten",
+              target_os = "solaris",
+              target_os = "cloudabi",
+              target_os = "macos", target_os = "ios",
+              target_os = "freebsd",
+              target_os = "openbsd", target_os = "bitrig",
+              target_os = "redox",
+              target_os = "fuchsia",
+              windows,
+              all(target_arch = "wasm32", feature = "stdweb")
+)))]
+#[doc(hidden)]
+pub use rngs::OsRng;
+
+#[doc(hidden)] pub use prng::{ChaChaRng, IsaacRng, Isaac64Rng, XorShiftRng};
+#[doc(hidden)] pub use rngs::StdRng;
+
+
+#[allow(deprecated)]
+#[doc(hidden)]
+pub mod jitter {
+    pub use rngs::{JitterRng, TimerError};
+}
+#[allow(deprecated)]
+#[cfg(all(feature="std",
+          any(target_os = "linux", target_os = "android",
+              target_os = "netbsd",
+              target_os = "dragonfly",
+              target_os = "haiku",
+              target_os = "emscripten",
+              target_os = "solaris",
+              target_os = "cloudabi",
+              target_os = "macos", target_os = "ios",
+              target_os = "freebsd",
+              target_os = "openbsd", target_os = "bitrig",
+              target_os = "redox",
+              target_os = "fuchsia",
+              windows,
+              all(target_arch = "wasm32", feature = "stdweb")
+)))]
+#[doc(hidden)]
+pub mod os {
+    pub use rngs::OsRng;
+}
+#[allow(deprecated)]
+#[doc(hidden)]
+pub mod chacha {
+    //! The ChaCha random number generator.
+    pub use prng::ChaChaRng;
+}
+#[doc(hidden)]
+pub mod isaac {
+    //! The ISAAC random number generator.
+    pub use prng::{IsaacRng, Isaac64Rng};
+}
+
+#[cfg(feature="std")] #[doc(hidden)] pub use rngs::ThreadRng;
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+use core::{marker, mem, slice};
+use distributions::{Distribution, Standard};
+use distributions::uniform::{SampleUniform, UniformSampler};
+
+
+/// A type that can be randomly generated using an [`Rng`].
+/// 
+/// This is merely an adapter around the [`Standard`] distribution for
+/// convenience and backwards-compatibility.
+/// 
+/// [`Rng`]: trait.Rng.html
+/// [`Standard`]: distributions/struct.Standard.html
+#[deprecated(since="0.5.0", note="replaced by distributions::Standard")]
+pub trait Rand : Sized {
+    /// Generates a random instance of this type using the specified source of
+    /// randomness.
+    fn rand<R: Rng>(rng: &mut R) -> Self;
+}
+
+/// An automatically-implemented extension trait on [`RngCore`] providing high-level
+/// generic methods for sampling values and other convenience methods.
+/// 
+/// This is the primary trait to use when generating random values.
+/// 
+/// # Generic usage
+/// 
+/// The basic pattern is `fn foo<R: Rng + ?Sized>(rng: &mut R)`. Some
+/// things are worth noting here:
+/// 
+/// - Since `Rng: RngCore` and every `RngCore` implements `Rng`, it makes no
+///   difference whether we use `R: Rng` or `R: RngCore`.
+/// - The `+ ?Sized` un-bounding allows functions to be called directly on
+///   type-erased references; i.e. `foo(r)` where `r: &mut RngCore`. Without
+///   this it would be necessary to write `foo(&mut r)`.
+/// 
+/// An alternative pattern is possible: `fn foo<R: Rng>(rng: R)`. This has some
+/// trade-offs. It allows the argument to be consumed directly without a `&mut`
+/// (which is how `from_rng(thread_rng())` works); also it still works directly
+/// on references (including type-erased references). Unfortunately within the
+/// function `foo` it is not known whether `rng` is a reference type or not,
+/// hence many uses of `rng` require an extra reference, either explicitly
+/// (`distr.sample(&mut rng)`) or implicitly (`rng.gen()`); one may hope the
+/// optimiser can remove redundant references later.
+/// 
+/// Example:
+/// 
+/// ```
+/// # use rand::thread_rng;
+/// use rand::Rng;
+/// 
+/// fn foo<R: Rng + ?Sized>(rng: &mut R) -> f32 {
+///     rng.gen()
+/// }
+///
+/// # let v = foo(&mut thread_rng());
+/// ```
+/// 
+/// [`RngCore`]: trait.RngCore.html
+pub trait Rng: RngCore {
+    /// Return a random value supporting the [`Standard`] distribution.
+    ///
+    /// [`Standard`]: distributions/struct.Standard.html
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// let x: u32 = rng.gen();
+    /// println!("{}", x);
+    /// println!("{:?}", rng.gen::<(f64, bool)>());
+    /// ```
+    #[inline]
+    fn gen<T>(&mut self) -> T where Standard: Distribution<T> {
+        Standard.sample(self)
+    }
+
+    /// Generate a random value in the range [`low`, `high`), i.e. inclusive of
+    /// `low` and exclusive of `high`.
+    ///
+    /// This function is optimised for the case that only a single sample is
+    /// made from the given range. See also the [`Uniform`] distribution
+    /// type which may be faster if sampling from the same range repeatedly.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `low >= high`.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// let n: u32 = rng.gen_range(0, 10);
+    /// println!("{}", n);
+    /// let m: f64 = rng.gen_range(-40.0f64, 1.3e5f64);
+    /// println!("{}", m);
+    /// ```
+    ///
+    /// [`Uniform`]: distributions/uniform/struct.Uniform.html
+    fn gen_range<T: PartialOrd + SampleUniform>(&mut self, low: T, high: T) -> T {
+        T::Sampler::sample_single(low, high, self)
+    }
+
+    /// Sample a new value, using the given distribution.
+    ///
+    /// ### Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    /// use rand::distributions::Uniform;
+    ///
+    /// let mut rng = thread_rng();
+    /// let x = rng.sample(Uniform::new(10u32, 15));
+    /// // Type annotation requires two types, the type and distribution; the
+    /// // distribution can be inferred.
+    /// let y = rng.sample::<u16, _>(Uniform::new(10, 15));
+    /// ```
+    fn sample<T, D: Distribution<T>>(&mut self, distr: D) -> T {
+        distr.sample(self)
+    }
+
+    /// Create an iterator that generates values using the given distribution.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    /// use rand::distributions::{Alphanumeric, Uniform, Standard};
+    ///
+    /// let mut rng = thread_rng();
+    ///
+    /// // Vec of 16 x f32:
+    /// let v: Vec<f32> = thread_rng().sample_iter(&Standard).take(16).collect();
+    ///
+    /// // String:
+    /// let s: String = rng.sample_iter(&Alphanumeric).take(7).collect();
+    ///
+    /// // Combined values
+    /// println!("{:?}", thread_rng().sample_iter(&Standard).take(5)
+    ///                              .collect::<Vec<(f64, bool)>>());
+    ///
+    /// // Dice-rolling:
+    /// let die_range = Uniform::new_inclusive(1, 6);
+    /// let mut roll_die = rng.sample_iter(&die_range);
+    /// while roll_die.next().unwrap() != 6 {
+    ///     println!("Not a 6; rolling again!");
+    /// }
+    /// ```
+    fn sample_iter<'a, T, D: Distribution<T>>(&'a mut self, distr: &'a D)
+        -> distributions::DistIter<'a, D, Self, T> where Self: Sized
+    {
+        distr.sample_iter(self)
+    }
+
+    /// Fill `dest` entirely with random bytes (uniform value distribution),
+    /// where `dest` is any type supporting [`AsByteSliceMut`], namely slices
+    /// and arrays over primitive integer types (`i8`, `i16`, `u32`, etc.).
+    ///
+    /// On big-endian platforms this performs byte-swapping to ensure
+    /// portability of results from reproducible generators.
+    ///
+    /// This uses [`fill_bytes`] internally which may handle some RNG errors
+    /// implicitly (e.g. waiting if the OS generator is not ready), but panics
+    /// on other errors. See also [`try_fill`] which returns errors.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut arr = [0i8; 20];
+    /// thread_rng().fill(&mut arr[..]);
+    /// ```
+    ///
+    /// [`fill_bytes`]: trait.RngCore.html#method.fill_bytes
+    /// [`try_fill`]: trait.Rng.html#method.try_fill
+    /// [`AsByteSliceMut`]: trait.AsByteSliceMut.html
+    fn fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) {
+        self.fill_bytes(dest.as_byte_slice_mut());
+        dest.to_le();
+    }
+
+    /// Fill `dest` entirely with random bytes (uniform value distribution),
+    /// where `dest` is any type supporting [`AsByteSliceMut`], namely slices
+    /// and arrays over primitive integer types (`i8`, `i16`, `u32`, etc.).
+    ///
+    /// On big-endian platforms this performs byte-swapping to ensure
+    /// portability of results from reproducible generators.
+    ///
+    /// This uses [`try_fill_bytes`] internally and forwards all RNG errors. In
+    /// some cases errors may be resolvable; see [`ErrorKind`] and
+    /// documentation for the RNG in use. If you do not plan to handle these
+    /// errors you may prefer to use [`fill`].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use rand::Error;
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// # fn try_inner() -> Result<(), Error> {
+    /// let mut arr = [0u64; 4];
+    /// thread_rng().try_fill(&mut arr[..])?;
+    /// # Ok(())
+    /// # }
+    ///
+    /// # try_inner().unwrap()
+    /// ```
+    ///
+    /// [`ErrorKind`]: enum.ErrorKind.html
+    /// [`try_fill_bytes`]: trait.RngCore.html#method.try_fill_bytes
+    /// [`fill`]: trait.Rng.html#method.fill
+    /// [`AsByteSliceMut`]: trait.AsByteSliceMut.html
+    fn try_fill<T: AsByteSliceMut + ?Sized>(&mut self, dest: &mut T) -> Result<(), Error> {
+        self.try_fill_bytes(dest.as_byte_slice_mut())?;
+        dest.to_le();
+        Ok(())
+    }
+
+    /// Return a bool with a probability `p` of being true.
+    ///
+    /// This is a wrapper around [`distributions::Bernoulli`].
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// println!("{}", rng.gen_bool(1.0 / 3.0));
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// If `p` < 0 or `p` > 1.
+    ///
+    /// [`distributions::Bernoulli`]: distributions/bernoulli/struct.Bernoulli.html
+    #[inline]
+    fn gen_bool(&mut self, p: f64) -> bool {
+        let d = distributions::Bernoulli::new(p);
+        self.sample(d)
+    }
+
+    /// Return a random element from `values`.
+    ///
+    /// Return `None` if `values` is empty.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let choices = [1, 2, 4, 8, 16, 32];
+    /// let mut rng = thread_rng();
+    /// println!("{:?}", rng.choose(&choices));
+    /// assert_eq!(rng.choose(&choices[..0]), None);
+    /// ```
+    fn choose<'a, T>(&mut self, values: &'a [T]) -> Option<&'a T> {
+        if values.is_empty() {
+            None
+        } else {
+            Some(&values[self.gen_range(0, values.len())])
+        }
+    }
+
+    /// Return a mutable pointer to a random element from `values`.
+    ///
+    /// Return `None` if `values` is empty.
+    fn choose_mut<'a, T>(&mut self, values: &'a mut [T]) -> Option<&'a mut T> {
+        if values.is_empty() {
+            None
+        } else {
+            let len = values.len();
+            Some(&mut values[self.gen_range(0, len)])
+        }
+    }
+
+    /// Shuffle a mutable slice in place.
+    ///
+    /// This applies Durstenfeld's algorithm for the [Fisher–Yates shuffle](
+    /// https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm)
+    /// which produces an unbiased permutation.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// let mut y = [1, 2, 3];
+    /// rng.shuffle(&mut y);
+    /// println!("{:?}", y);
+    /// rng.shuffle(&mut y);
+    /// println!("{:?}", y);
+    /// ```
+    fn shuffle<T>(&mut self, values: &mut [T]) {
+        let mut i = values.len();
+        while i >= 2 {
+            // invariant: elements with index >= i have been locked in place.
+            i -= 1;
+            // lock element i in place.
+            values.swap(i, self.gen_range(0, i + 1));
+        }
+    }
+
+    /// Return an iterator that will yield an infinite number of randomly
+    /// generated items.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #![allow(deprecated)]
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// let x = rng.gen_iter::<u32>().take(10).collect::<Vec<u32>>();
+    /// println!("{:?}", x);
+    /// println!("{:?}", rng.gen_iter::<(f64, bool)>().take(5)
+    ///                     .collect::<Vec<(f64, bool)>>());
+    /// ```
+    #[allow(deprecated)]
+    #[deprecated(since="0.5.0", note="use Rng::sample_iter(&Standard) instead")]
+    fn gen_iter<T>(&mut self) -> Generator<T, &mut Self> where Standard: Distribution<T> {
+        Generator { rng: self, _marker: marker::PhantomData }
+    }
+
+    /// Return a bool with a 1 in n chance of true
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #![allow(deprecated)]
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let mut rng = thread_rng();
+    /// assert_eq!(rng.gen_weighted_bool(0), true);
+    /// assert_eq!(rng.gen_weighted_bool(1), true);
+    /// // Just like `rng.gen::<bool>()` a 50-50% chance, but using a slower
+    /// // method with different results.
+    /// println!("{}", rng.gen_weighted_bool(2));
+    /// // First meaningful use of `gen_weighted_bool`.
+    /// println!("{}", rng.gen_weighted_bool(3));
+    /// ```
+    #[deprecated(since="0.5.0", note="use gen_bool instead")]
+    fn gen_weighted_bool(&mut self, n: u32) -> bool {
+        // Short-circuit after `n <= 1` to avoid panic in `gen_range`
+        n <= 1 || self.gen_range(0, n) == 0
+    }
+
+    /// Return an iterator of random characters from the set A-Z,a-z,0-9.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # #![allow(deprecated)]
+    /// use rand::{thread_rng, Rng};
+    ///
+    /// let s: String = thread_rng().gen_ascii_chars().take(10).collect();
+    /// println!("{}", s);
+    /// ```
+    #[allow(deprecated)]
+    #[deprecated(since="0.5.0", note="use sample_iter(&Alphanumeric) instead")]
+    fn gen_ascii_chars(&mut self) -> AsciiGenerator<&mut Self> {
+        AsciiGenerator { rng: self }
+    }
+}
+
+impl<R: RngCore + ?Sized> Rng for R {}
+
+/// Trait for casting types to byte slices
+/// 
+/// This is used by the [`fill`] and [`try_fill`] methods.
+/// 
+/// [`fill`]: trait.Rng.html#method.fill
+/// [`try_fill`]: trait.Rng.html#method.try_fill
+pub trait AsByteSliceMut {
+    /// Return a mutable reference to self as a byte slice
+    fn as_byte_slice_mut(&mut self) -> &mut [u8];
+    
+    /// Call `to_le` on each element (i.e. byte-swap on Big Endian platforms).
+    fn to_le(&mut self);
+}
+
+impl AsByteSliceMut for [u8] {
+    fn as_byte_slice_mut(&mut self) -> &mut [u8] {
+        self
+    }
+    
+    fn to_le(&mut self) {}
+}
+
+macro_rules! impl_as_byte_slice {
+    ($t:ty) => {
+        impl AsByteSliceMut for [$t] {
+            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
+                if self.len() == 0 {
+                    unsafe {
+                        // must not use null pointer
+                        slice::from_raw_parts_mut(0x1 as *mut u8, 0)
+                    }
+                } else {
+                    unsafe {
+                        slice::from_raw_parts_mut(&mut self[0]
+                            as *mut $t
+                            as *mut u8,
+                            self.len() * mem::size_of::<$t>()
+                        )
+                    }
+                }
+            }
+            
+            fn to_le(&mut self) {
+                for x in self {
+                    *x = x.to_le();
+                }
+            }
+        }
+    }
+}
+
+impl_as_byte_slice!(u16);
+impl_as_byte_slice!(u32);
+impl_as_byte_slice!(u64);
+#[cfg(feature="i128_support")] impl_as_byte_slice!(u128);
+impl_as_byte_slice!(usize);
+impl_as_byte_slice!(i8);
+impl_as_byte_slice!(i16);
+impl_as_byte_slice!(i32);
+impl_as_byte_slice!(i64);
+#[cfg(feature="i128_support")] impl_as_byte_slice!(i128);
+impl_as_byte_slice!(isize);
+
+macro_rules! impl_as_byte_slice_arrays {
+    ($n:expr,) => {};
+    ($n:expr, $N:ident, $($NN:ident,)*) => {
+        impl_as_byte_slice_arrays!($n - 1, $($NN,)*);
+        
+        impl<T> AsByteSliceMut for [T; $n] where [T]: AsByteSliceMut {
+            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
+                self[..].as_byte_slice_mut()
+            }
+
+            fn to_le(&mut self) {
+                self[..].to_le()
+            }
+        }
+    };
+    (!div $n:expr,) => {};
+    (!div $n:expr, $N:ident, $($NN:ident,)*) => {
+        impl_as_byte_slice_arrays!(!div $n / 2, $($NN,)*);
+
+        impl<T> AsByteSliceMut for [T; $n] where [T]: AsByteSliceMut {
+            fn as_byte_slice_mut(&mut self) -> &mut [u8] {
+                self[..].as_byte_slice_mut()
+            }
+            
+            fn to_le(&mut self) {
+                self[..].to_le()
+            }
+        }
+    };
+}
+impl_as_byte_slice_arrays!(32, N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,);
+impl_as_byte_slice_arrays!(!div 4096, N,N,N,N,N,N,N,);
+
+/// Iterator which will generate a stream of random items.
+///
+/// This iterator is created via the [`gen_iter`] method on [`Rng`].
+///
+/// [`gen_iter`]: trait.Rng.html#method.gen_iter
+/// [`Rng`]: trait.Rng.html
+#[derive(Debug)]
+#[allow(deprecated)]
+#[deprecated(since="0.5.0", note="use Rng::sample_iter instead")]
+pub struct Generator<T, R: RngCore> {
+    rng: R,
+    _marker: marker::PhantomData<fn() -> T>,
+}
+
+#[allow(deprecated)]
+impl<T, R: RngCore> Iterator for Generator<T, R> where Standard: Distribution<T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<T> {
+        Some(self.rng.gen())
+    }
+}
+
+/// Iterator which will continuously generate random ascii characters.
+///
+/// This iterator is created via the [`gen_ascii_chars`] method on [`Rng`].
+///
+/// [`gen_ascii_chars`]: trait.Rng.html#method.gen_ascii_chars
+/// [`Rng`]: trait.Rng.html
+#[derive(Debug)]
+#[allow(deprecated)]
+#[deprecated(since="0.5.0", note="use distributions::Alphanumeric instead")]
+pub struct AsciiGenerator<R: RngCore> {
+    rng: R,
+}
+
+#[allow(deprecated)]
+impl<R: RngCore> Iterator for AsciiGenerator<R> {
+    type Item = char;
+
+    fn next(&mut self) -> Option<char> {
+        const GEN_ASCII_STR_CHARSET: &[u8] =
+            b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+              abcdefghijklmnopqrstuvwxyz\
+              0123456789";
+        Some(*self.rng.choose(GEN_ASCII_STR_CHARSET).unwrap() as char)
+    }
+}
+
+
+/// A convenience extension to [`SeedableRng`] allowing construction from fresh
+/// entropy. This trait is automatically implemented for any PRNG implementing
+/// [`SeedableRng`] and is not intended to be implemented by users.
+///
+/// This is equivalent to using `SeedableRng::from_rng(EntropyRng::new())` then
+/// unwrapping the result.
+///
+/// Since this is convenient and secure, it is the recommended way to create
+/// PRNGs, though two alternatives may be considered:
+///
+/// *   Deterministic creation using [`SeedableRng::from_seed`] with a fixed seed
+/// *   Seeding from `thread_rng`: `SeedableRng::from_rng(thread_rng())?`;
+///     this will usually be faster and should also be secure, but requires
+///     trusting one extra component.
+///
+/// ## Example
+///
+/// ```
+/// use rand::{Rng, FromEntropy};
+/// use rand::rngs::StdRng;
+///
+/// let mut rng = StdRng::from_entropy();
+/// println!("Random die roll: {}", rng.gen_range(1, 7));
+/// ```
+///
+/// [`EntropyRng`]: rngs/struct.EntropyRng.html
+/// [`SeedableRng`]: trait.SeedableRng.html
+/// [`SeedableRng::from_seed`]: trait.SeedableRng.html#tymethod.from_seed
+#[cfg(feature="std")]
+pub trait FromEntropy: SeedableRng {
+    /// Creates a new instance, automatically seeded with fresh entropy.
+    ///
+    /// Normally this will use `OsRng`, but if that fails `JitterRng` will be
+    /// used instead. Both should be suitable for cryptography. It is possible
+    /// that both entropy sources will fail though unlikely; failures would
+    /// almost certainly be platform limitations or build issues, i.e. most
+    /// applications targetting PC/mobile platforms should not need to worry
+    /// about this failing.
+    ///
+    /// # Panics
+    ///
+    /// If all entropy sources fail this will panic. If you need to handle
+    /// errors, use the following code, equivalent aside from error handling:
+    ///
+    /// ```
+    /// # use rand::Error;
+    /// use rand::prelude::*;
+    /// use rand::rngs::EntropyRng;
+    ///
+    /// # fn try_inner() -> Result<(), Error> {
+    /// // This uses StdRng, but is valid for any R: SeedableRng
+    /// let mut rng = StdRng::from_rng(EntropyRng::new())?;
+    ///
+    /// println!("random number: {}", rng.gen_range(1, 10));
+    /// # Ok(())
+    /// # }
+    ///
+    /// # try_inner().unwrap()
+    /// ```
+    fn from_entropy() -> Self;
+}
+
+#[cfg(feature="std")]
+impl<R: SeedableRng> FromEntropy for R {
+    fn from_entropy() -> R {
+        R::from_rng(EntropyRng::new()).unwrap_or_else(|err|
+            panic!("FromEntropy::from_entropy() failed: {}", err))
+    }
+}
+
+
+/// DEPRECATED: use [`SmallRng`] instead.
+///
+/// Create a weak random number generator with a default algorithm and seed.
+///
+/// It returns the fastest `Rng` algorithm currently available in Rust without
+/// consideration for cryptography or security. If you require a specifically
+/// seeded `Rng` for consistency over time you should pick one algorithm and
+/// create the `Rng` yourself.
+///
+/// This will seed the generator with randomness from `thread_rng`.
+///
+/// [`SmallRng`]: rngs/struct.SmallRng.html
+#[deprecated(since="0.5.0", note="removed in favor of SmallRng")]
+#[cfg(feature="std")]
+pub fn weak_rng() -> XorShiftRng {
+    XorShiftRng::from_rng(thread_rng()).unwrap_or_else(|err|
+        panic!("weak_rng failed: {:?}", err))
+}
+
+/// Generates a random value using the thread-local random number generator.
+///
+/// This is simply a shortcut for `thread_rng().gen()`. See [`thread_rng`] for
+/// documentation of the entropy source and [`Standard`] for documentation of
+/// distributions and type-specific generation.
+///
+/// # Examples
+///
+/// ```
+/// let x = rand::random::<u8>();
+/// println!("{}", x);
+///
+/// let y = rand::random::<f64>();
+/// println!("{}", y);
+///
+/// if rand::random() { // generates a boolean
+///     println!("Better lucky than good!");
+/// }
+/// ```
+///
+/// If you're calling `random()` in a loop, caching the generator as in the
+/// following example can increase performance.
+///
+/// ```
+/// # #![allow(deprecated)]
+/// use rand::Rng;
+///
+/// let mut v = vec![1, 2, 3];
+///
+/// for x in v.iter_mut() {
+///     *x = rand::random()
+/// }
+///
+/// // can be made faster by caching thread_rng
+///
+/// let mut rng = rand::thread_rng();
+///
+/// for x in v.iter_mut() {
+///     *x = rng.gen();
+/// }
+/// ```
+///
+/// [`thread_rng`]: fn.thread_rng.html
+/// [`Standard`]: distributions/struct.Standard.html
+#[cfg(feature="std")]
+#[inline]
+pub fn random<T>() -> T where Standard: Distribution<T> {
+    thread_rng().gen()
+}
+
+/// DEPRECATED: use `seq::sample_iter` instead.
+///
+/// Randomly sample up to `amount` elements from a finite iterator.
+/// The order of elements in the sample is not random.
+///
+/// # Example
+///
+/// ```
+/// # #![allow(deprecated)]
+/// use rand::{thread_rng, sample};
+///
+/// let mut rng = thread_rng();
+/// let sample = sample(&mut rng, 1..100, 5);
+/// println!("{:?}", sample);
+/// ```
+#[cfg(feature="std")]
+#[inline]
+#[deprecated(since="0.4.0", note="renamed to seq::sample_iter")]
+pub fn sample<T, I, R>(rng: &mut R, iterable: I, amount: usize) -> Vec<T>
+    where I: IntoIterator<Item=T>,
+          R: Rng,
+{
+    // the legacy sample didn't care whether amount was met
+    seq::sample_iter(rng, iterable, amount)
+        .unwrap_or_else(|e| e)
+}
+
+#[cfg(test)]
+mod test {
+    use rngs::mock::StepRng;
+    use super::*;
+    #[cfg(all(not(feature="std"), feature="alloc"))] use alloc::boxed::Box;
+
+    pub struct TestRng<R> { inner: R }
+
+    impl<R: RngCore> RngCore for TestRng<R> {
+        fn next_u32(&mut self) -> u32 {
+            self.inner.next_u32()
+        }
+        fn next_u64(&mut self) -> u64 {
+            self.inner.next_u64()
+        }
+        fn fill_bytes(&mut self, dest: &mut [u8]) {
+            self.inner.fill_bytes(dest)
+        }
+        fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            self.inner.try_fill_bytes(dest)
+        }
+    }
+
+    pub fn rng(seed: u64) -> TestRng<StdRng> {
+        TestRng { inner: StdRng::seed_from_u64(seed) }
+    }
+
+    #[test]
+    fn test_fill_bytes_default() {
+        let mut r = StepRng::new(0x11_22_33_44_55_66_77_88, 0);
+
+        // check every remainder mod 8, both in small and big vectors.
+        let lengths = [0, 1, 2, 3, 4, 5, 6, 7,
+                       80, 81, 82, 83, 84, 85, 86, 87];
+        for &n in lengths.iter() {
+            let mut buffer = [0u8; 87];
+            let v = &mut buffer[0..n];
+            r.fill_bytes(v);
+
+            // use this to get nicer error messages.
+            for (i, &byte) in v.iter().enumerate() {
+                if byte == 0 {
+                    panic!("byte {} of {} is zero", i, n)
+                }
+            }
+        }
+    }
+    
+    #[test]
+    fn test_fill() {
+        let x = 9041086907909331047;    // a random u64
+        let mut rng = StepRng::new(x, 0);
+        
+        // Convert to byte sequence and back to u64; byte-swap twice if BE.
+        let mut array = [0u64; 2];
+        rng.fill(&mut array[..]);
+        assert_eq!(array, [x, x]);
+        assert_eq!(rng.next_u64(), x);
+        
+        // Convert to bytes then u32 in LE order
+        let mut array = [0u32; 2];
+        rng.fill(&mut array[..]);
+        assert_eq!(array, [x as u32, (x >> 32) as u32]);
+        assert_eq!(rng.next_u32(), x as u32);
+    }
+    
+    #[test]
+    fn test_fill_empty() {
+        let mut array = [0u32; 0];
+        let mut rng = StepRng::new(0, 1);
+        rng.fill(&mut array);
+        rng.fill(&mut array[..]);
+    }
+
+    #[test]
+    fn test_gen_range() {
+        let mut r = rng(101);
+        for _ in 0..1000 {
+            let a = r.gen_range(-3, 42);
+            assert!(a >= -3 && a < 42);
+            assert_eq!(r.gen_range(0, 1), 0);
+            assert_eq!(r.gen_range(-12, -11), -12);
+        }
+
+        for _ in 0..1000 {
+            let a = r.gen_range(10, 42);
+            assert!(a >= 10 && a < 42);
+            assert_eq!(r.gen_range(0, 1), 0);
+            assert_eq!(r.gen_range(3_000_000, 3_000_001), 3_000_000);
+        }
+
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_gen_range_panic_int() {
+        let mut r = rng(102);
+        r.gen_range(5, -2);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_gen_range_panic_usize() {
+        let mut r = rng(103);
+        r.gen_range(5, 2);
+    }
+
+    #[test]
+    #[allow(deprecated)]
+    fn test_gen_weighted_bool() {
+        let mut r = rng(104);
+        assert_eq!(r.gen_weighted_bool(0), true);
+        assert_eq!(r.gen_weighted_bool(1), true);
+    }
+
+    #[test]
+    fn test_gen_bool() {
+        let mut r = rng(105);
+        for _ in 0..5 {
+            assert_eq!(r.gen_bool(0.0), false);
+            assert_eq!(r.gen_bool(1.0), true);
+        }
+    }
+
+    #[test]
+    fn test_choose() {
+        let mut r = rng(107);
+        assert_eq!(r.choose(&[1, 1, 1]).map(|&x|x), Some(1));
+
+        let v: &[isize] = &[];
+        assert_eq!(r.choose(v), None);
+    }
+
+    #[test]
+    fn test_shuffle() {
+        let mut r = rng(108);
+        let empty: &mut [isize] = &mut [];
+        r.shuffle(empty);
+        let mut one = [1];
+        r.shuffle(&mut one);
+        let b: &[_] = &[1];
+        assert_eq!(one, b);
+
+        let mut two = [1, 2];
+        r.shuffle(&mut two);
+        assert!(two == [1, 2] || two == [2, 1]);
+
+        let mut x = [1, 1, 1];
+        r.shuffle(&mut x);
+        let b: &[_] = &[1, 1, 1];
+        assert_eq!(x, b);
+    }
+
+    #[test]
+    fn test_rng_trait_object() {
+        use distributions::{Distribution, Standard};
+        let mut rng = rng(109);
+        let mut r = &mut rng as &mut RngCore;
+        r.next_u32();
+        r.gen::<i32>();
+        let mut v = [1, 1, 1];
+        r.shuffle(&mut v);
+        let b: &[_] = &[1, 1, 1];
+        assert_eq!(v, b);
+        assert_eq!(r.gen_range(0, 1), 0);
+        let _c: u8 = Standard.sample(&mut r);
+    }
+
+    #[test]
+    #[cfg(feature="alloc")]
+    fn test_rng_boxed_trait() {
+        use distributions::{Distribution, Standard};
+        let rng = rng(110);
+        let mut r = Box::new(rng) as Box<RngCore>;
+        r.next_u32();
+        r.gen::<i32>();
+        let mut v = [1, 1, 1];
+        r.shuffle(&mut v);
+        let b: &[_] = &[1, 1, 1];
+        assert_eq!(v, b);
+        assert_eq!(r.gen_range(0, 1), 0);
+        let _c: u8 = Standard.sample(&mut r);
+    }
+    
+    #[test]
+    #[cfg(feature="std")]
+    fn test_random() {
+        // not sure how to test this aside from just getting some values
+        let _n : usize = random();
+        let _f : f32 = random();
+        let _o : Option<Option<i8>> = random();
+        let _many : ((),
+                     (usize,
+                      isize,
+                      Option<(u32, (bool,))>),
+                     (u8, i8, u16, i16, u32, i32, u64, i64),
+                     (f32, (f64, (f64,)))) = random();
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prelude.rs cargo-0.33.0/vendor/rand-0.5.6/src/prelude.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prelude.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prelude.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,28 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Convenience re-export of common members
+//!
+//! Like the standard library's prelude, this module simplifies importing of
+//! common items. Unlike the standard prelude, the contents of this module must
+//! be imported manually:
+//!
+//! ```
+//! use rand::prelude::*;
+//! # let _ = StdRng::from_entropy();
+//! # let mut r = SmallRng::from_rng(thread_rng()).unwrap();
+//! # let _: f32 = r.gen();
+//! ```
+
+#[doc(no_inline)] pub use distributions::Distribution;
+#[doc(no_inline)] pub use rngs::{SmallRng, StdRng};
+#[doc(no_inline)] #[cfg(feature="std")] pub use rngs::ThreadRng;
+#[doc(no_inline)] pub use {Rng, RngCore, CryptoRng, SeedableRng};
+#[doc(no_inline)] #[cfg(feature="std")] pub use {FromEntropy, random, thread_rng};
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/chacha.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/chacha.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/chacha.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/chacha.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,477 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://www.rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The ChaCha random number generator.
+
+use core::fmt;
+use rand_core::{CryptoRng, RngCore, SeedableRng, Error, le};
+use rand_core::block::{BlockRngCore, BlockRng};
+
+const SEED_WORDS: usize = 8; // 8 words for the 256-bit key
+const STATE_WORDS: usize = 16;
+
+/// A cryptographically secure random number generator that uses the ChaCha
+/// algorithm.
+///
+/// ChaCha is a stream cipher designed by Daniel J. Bernstein [^1], that we use
+/// as an RNG. It is an improved variant of the Salsa20 cipher family, which was
+/// selected as one of the "stream ciphers suitable for widespread adoption" by
+/// eSTREAM [^2].
+///
+/// ChaCha uses add-rotate-xor (ARX) operations as its basis. These are safe
+/// against timing attacks, although that is mostly a concern for ciphers and
+/// not for RNGs. Also it is very suitable for SIMD implementation.
+/// Here we do not provide a SIMD implementation yet, except for what is
+/// provided by auto-vectorisation.
+///
+/// With the ChaCha algorithm it is possible to choose the number of rounds the
+/// core algorithm should run. The number of rounds is a tradeoff between
+/// performance and security, where 8 rounds is the minimum potentially
+/// secure configuration, and 20 rounds is widely used as a conservative choice.
+/// We use 20 rounds in this implementation, but hope to allow type-level
+/// configuration in the future.
+///
+/// We use a 64-bit counter and 64-bit stream identifier as in Benstein's
+/// implementation [^1] except that we use a stream identifier in place of a
+/// nonce. A 64-bit counter over 64-byte (16 word) blocks allows 1 ZiB of output
+/// before cycling, and the stream identifier allows 2<sup>64</sup> unique
+/// streams of output per seed. Both counter and stream are initialized to zero
+/// but may be set via [`set_word_pos`] and [`set_stream`].
+///
+/// The word layout is:
+///
+/// ```text
+/// constant constant constant constant
+/// seed     seed     seed     seed
+/// seed     seed     seed     seed
+/// counter  counter  nonce    nonce
+/// ```
+///
+/// This implementation uses an output buffer of sixteen `u32` words, and uses
+/// [`BlockRng`] to implement the [`RngCore`] methods.
+///
+/// [^1]: D. J. Bernstein, [*ChaCha, a variant of Salsa20*](
+///       https://cr.yp.to/chacha.html)
+///
+/// [^2]: [eSTREAM: the ECRYPT Stream Cipher Project](
+///       http://www.ecrypt.eu.org/stream/)
+///
+/// [`set_word_pos`]: #method.set_word_pos
+/// [`set_stream`]: #method.set_stream
+/// [`BlockRng`]: ../../../rand_core/block/struct.BlockRng.html
+/// [`RngCore`]: ../../trait.RngCore.html
+#[derive(Clone, Debug)]
+pub struct ChaChaRng(BlockRng<ChaChaCore>);
+
+impl RngCore for ChaChaRng {
+    #[inline]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    #[inline]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest)
+    }
+
+    #[inline]
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl SeedableRng for ChaChaRng {
+    type Seed = <ChaChaCore as SeedableRng>::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        ChaChaRng(BlockRng::<ChaChaCore>::from_seed(seed))
+    }
+
+    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
+        BlockRng::<ChaChaCore>::from_rng(rng).map(ChaChaRng)
+    }
+}
+
+impl CryptoRng for ChaChaRng {}
+
+impl ChaChaRng {
+    /// Create an ChaCha random number generator using the default
+    /// fixed key of 8 zero words.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #![allow(deprecated)]
+    /// use rand::{RngCore, ChaChaRng};
+    ///
+    /// let mut ra = ChaChaRng::new_unseeded();
+    /// println!("{:?}", ra.next_u32());
+    /// println!("{:?}", ra.next_u32());
+    /// ```
+    ///
+    /// Since this equivalent to a RNG with a fixed seed, repeated executions
+    /// of an unseeded RNG will produce the same result. This code sample will
+    /// consistently produce:
+    ///
+    /// - 2917185654
+    /// - 2419978656
+    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
+    pub fn new_unseeded() -> ChaChaRng {
+        ChaChaRng::from_seed([0; SEED_WORDS*4])
+    }
+
+    /// Get the offset from the start of the stream, in 32-bit words.
+    /// 
+    /// Since the generated blocks are 16 words (2<sup>4</sup>) long and the
+    /// counter is 64-bits, the offset is a 68-bit number. Sub-word offsets are
+    /// not supported, hence the result can simply be multiplied by 4 to get a
+    /// byte-offset.
+    /// 
+    /// Note: this function is currently only available when the `i128_support`
+    /// feature is enabled. In the future this will be enabled by default.
+    #[cfg(feature = "i128_support")]
+    pub fn get_word_pos(&self) -> u128 {
+        let mut c = (self.0.core.state[13] as u64) << 32
+                  | (self.0.core.state[12] as u64);
+        let mut index = self.0.index();
+        // c is the end of the last block generated, unless index is at end
+        if index >= STATE_WORDS {
+            index = 0;
+        } else {
+            c = c.wrapping_sub(1);
+        }
+        ((c as u128) << 4) | (index as u128)
+    }
+
+    /// Set the offset from the start of the stream, in 32-bit words.
+    /// 
+    /// As with `get_word_pos`, we use a 68-bit number. Since the generator
+    /// simply cycles at the end of its period (1 ZiB), we ignore the upper
+    /// 60 bits.
+    /// 
+    /// Note: this function is currently only available when the `i128_support`
+    /// feature is enabled. In the future this will be enabled by default.
+    #[cfg(feature = "i128_support")]
+    pub fn set_word_pos(&mut self, word_offset: u128) {
+        let index = (word_offset as usize) & 0xF;
+        let counter = (word_offset >> 4) as u64;
+        self.0.core.state[12] = counter as u32;
+        self.0.core.state[13] = (counter >> 32) as u32;
+        if index != 0 {
+            self.0.generate_and_set(index); // also increments counter
+        } else {
+            self.0.reset();
+        }
+    }
+
+    /// Set the stream number.
+    ///
+    /// This is initialized to zero; 2<sup>64</sup> unique streams of output
+    /// are available per seed/key.
+    /// 
+    /// Note that in order to reproduce ChaCha output with a specific 64-bit
+    /// nonce, one can convert that nonce to a `u64` in little-endian fashion
+    /// and pass to this function. In theory a 96-bit nonce can be used by
+    /// passing the last 64-bits to this function and using the first 32-bits as
+    /// the most significant half of the 64-bit counter (which may be set
+    /// indirectly via `set_word_pos`), but this is not directly supported.
+    pub fn set_stream(&mut self, stream: u64) {
+        let index = self.0.index();
+        self.0.core.state[14] = stream as u32;
+        self.0.core.state[15] = (stream >> 32) as u32;
+        if index < STATE_WORDS {
+            // we need to regenerate a partial result buffer
+            {
+                // reverse of counter adjustment in generate()
+                if self.0.core.state[12] == 0 {
+                    self.0.core.state[13] = self.0.core.state[13].wrapping_sub(1);
+                }
+                self.0.core.state[12] = self.0.core.state[12].wrapping_sub(1);
+            }
+            self.0.generate_and_set(index);
+        }
+    }
+}
+
+/// The core of `ChaChaRng`, used with `BlockRng`.
+#[derive(Clone)]
+pub struct ChaChaCore {
+    state: [u32; STATE_WORDS],
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for ChaChaCore {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "ChaChaCore {{}}")
+    }
+}
+
+macro_rules! quarter_round{
+    ($a: expr, $b: expr, $c: expr, $d: expr) => {{
+        $a = $a.wrapping_add($b); $d ^= $a; $d = $d.rotate_left(16);
+        $c = $c.wrapping_add($d); $b ^= $c; $b = $b.rotate_left(12);
+        $a = $a.wrapping_add($b); $d ^= $a; $d = $d.rotate_left( 8);
+        $c = $c.wrapping_add($d); $b ^= $c; $b = $b.rotate_left( 7);
+    }}
+}
+
+macro_rules! double_round{
+    ($x: expr) => {{
+        // Column round
+        quarter_round!($x[ 0], $x[ 4], $x[ 8], $x[12]);
+        quarter_round!($x[ 1], $x[ 5], $x[ 9], $x[13]);
+        quarter_round!($x[ 2], $x[ 6], $x[10], $x[14]);
+        quarter_round!($x[ 3], $x[ 7], $x[11], $x[15]);
+        // Diagonal round
+        quarter_round!($x[ 0], $x[ 5], $x[10], $x[15]);
+        quarter_round!($x[ 1], $x[ 6], $x[11], $x[12]);
+        quarter_round!($x[ 2], $x[ 7], $x[ 8], $x[13]);
+        quarter_round!($x[ 3], $x[ 4], $x[ 9], $x[14]);
+    }}
+}
+
+impl BlockRngCore for ChaChaCore {
+    type Item = u32;
+    type Results = [u32; STATE_WORDS];
+
+    fn generate(&mut self, results: &mut Self::Results) {
+        // For some reason extracting this part into a separate function
+        // improves performance by 50%.
+        fn core(results: &mut [u32; STATE_WORDS],
+                state: &[u32; STATE_WORDS])
+        {
+            let mut tmp = *state;
+            let rounds = 20;
+            for _ in 0..rounds / 2 {
+                double_round!(tmp);
+            }
+            for i in 0..STATE_WORDS {
+                results[i] = tmp[i].wrapping_add(state[i]);
+            }
+        }
+
+        core(results, &self.state);
+
+        // update 64-bit counter
+        self.state[12] = self.state[12].wrapping_add(1);
+        if self.state[12] != 0 { return; };
+        self.state[13] = self.state[13].wrapping_add(1);
+    }
+}
+
+impl SeedableRng for ChaChaCore {
+    type Seed = [u8; SEED_WORDS*4];
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        let mut seed_le = [0u32; SEED_WORDS];
+        le::read_u32_into(&seed, &mut seed_le);
+        Self {
+            state: [0x61707865, 0x3320646E, 0x79622D32, 0x6B206574, // constants
+                    seed_le[0], seed_le[1], seed_le[2], seed_le[3], // seed
+                    seed_le[4], seed_le[5], seed_le[6], seed_le[7], // seed
+                    0, 0, 0, 0], // counter
+         }
+    }
+}
+
+impl CryptoRng for ChaChaCore {}
+
+impl From<ChaChaCore> for ChaChaRng {
+    fn from(core: ChaChaCore) -> Self {
+        ChaChaRng(BlockRng::new(core))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use {RngCore, SeedableRng};
+    use super::ChaChaRng;
+
+    #[test]
+    fn test_chacha_construction() {
+        let seed = [0,0,0,0,0,0,0,0,
+            1,0,0,0,0,0,0,0,
+            2,0,0,0,0,0,0,0,
+            3,0,0,0,0,0,0,0];
+        let mut rng1 = ChaChaRng::from_seed(seed);
+        assert_eq!(rng1.next_u32(), 137206642);
+
+        let mut rng2 = ChaChaRng::from_rng(rng1).unwrap();
+        assert_eq!(rng2.next_u32(), 1325750369);
+    }
+
+    #[test]
+    fn test_chacha_true_values_a() {
+        // Test vectors 1 and 2 from
+        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
+        let seed = [0u8; 32];
+        let mut rng = ChaChaRng::from_seed(seed);
+
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0xade0b876, 0x903df1a0, 0xe56a5d40, 0x28bd8653,
+                        0xb819d2bd, 0x1aed8da0, 0xccef36a8, 0xc70d778b,
+                        0x7c5941da, 0x8d485751, 0x3fe02477, 0x374ad8b8,
+                        0xf4b8436a, 0x1ca11815, 0x69b687c3, 0x8665eeb2];
+        assert_eq!(results, expected);
+
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0xbee7079f, 0x7a385155, 0x7c97ba98, 0x0d082d73,
+                        0xa0290fcb, 0x6965e348, 0x3e53c612, 0xed7aee32,
+                        0x7621b729, 0x434ee69c, 0xb03371d5, 0xd539d874,
+                        0x281fed31, 0x45fb0a51, 0x1f0ae1ac, 0x6f4d794b];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_chacha_true_values_b() {
+        // Test vector 3 from
+        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
+        let seed = [0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 1];
+        let mut rng = ChaChaRng::from_seed(seed);
+
+        // Skip block 0
+        for _ in 0..16 { rng.next_u32(); }
+
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0x2452eb3a, 0x9249f8ec, 0x8d829d9b, 0xddd4ceb1,
+                        0xe8252083, 0x60818b01, 0xf38422b8, 0x5aaa49c9,
+                        0xbb00ca8e, 0xda3ba7b4, 0xc4b592d1, 0xfdf2732f,
+                        0x4436274e, 0x2561b3c8, 0xebdd4aa6, 0xa0136c00];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    #[cfg(feature = "i128_support")]
+    fn test_chacha_true_values_c() {
+        // Test vector 4 from
+        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
+        let seed = [0, 0xff, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0];
+        let expected = [0xfb4dd572, 0x4bc42ef1, 0xdf922636, 0x327f1394,
+                        0xa78dea8f, 0x5e269039, 0xa1bebbc1, 0xcaf09aae,
+                        0xa25ab213, 0x48a6b46c, 0x1b9d9bcb, 0x092c5be6,
+                        0x546ca624, 0x1bec45d5, 0x87f47473, 0x96f0992e];
+        let expected_end = 3 * 16;
+        let mut results = [0u32; 16];
+
+        // Test block 2 by skipping block 0 and 1
+        let mut rng1 = ChaChaRng::from_seed(seed);
+        for _ in 0..32 { rng1.next_u32(); }
+        for i in results.iter_mut() { *i = rng1.next_u32(); }
+        assert_eq!(results, expected);
+        assert_eq!(rng1.get_word_pos(), expected_end);
+
+        // Test block 2 by using `set_word_pos`
+        let mut rng2 = ChaChaRng::from_seed(seed);
+        rng2.set_word_pos(2 * 16);
+        for i in results.iter_mut() { *i = rng2.next_u32(); }
+        assert_eq!(results, expected);
+        assert_eq!(rng2.get_word_pos(), expected_end);
+        
+        // Test skipping behaviour with other types
+        let mut buf = [0u8; 32];
+        rng2.fill_bytes(&mut buf[..]);
+        assert_eq!(rng2.get_word_pos(), expected_end + 8);
+        rng2.fill_bytes(&mut buf[0..25]);
+        assert_eq!(rng2.get_word_pos(), expected_end + 15);
+        rng2.next_u64();
+        assert_eq!(rng2.get_word_pos(), expected_end + 17);
+        rng2.next_u32();
+        rng2.next_u64();
+        assert_eq!(rng2.get_word_pos(), expected_end + 20);
+        rng2.fill_bytes(&mut buf[0..1]);
+        assert_eq!(rng2.get_word_pos(), expected_end + 21);
+    }
+
+    #[test]
+    fn test_chacha_multiple_blocks() {
+        let seed = [0,0,0,0, 1,0,0,0, 2,0,0,0, 3,0,0,0, 4,0,0,0, 5,0,0,0, 6,0,0,0, 7,0,0,0];
+        let mut rng = ChaChaRng::from_seed(seed);
+
+        // Store the 17*i-th 32-bit word,
+        // i.e., the i-th word of the i-th 16-word block
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() {
+            *i = rng.next_u32();
+            for _ in 0..16 {
+                rng.next_u32();
+            }
+        }
+        let expected = [0xf225c81a, 0x6ab1be57, 0x04d42951, 0x70858036,
+                        0x49884684, 0x64efec72, 0x4be2d186, 0x3615b384,
+                        0x11cfa18e, 0xd3c50049, 0x75c775f6, 0x434c6530,
+                        0x2c5bad8f, 0x898881dc, 0x5f1c86d9, 0xc1f8e7f4];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_chacha_true_bytes() {
+        let seed = [0u8; 32];
+        let mut rng = ChaChaRng::from_seed(seed);
+        let mut results = [0u8; 32];
+        rng.fill_bytes(&mut results);
+        let expected = [118, 184, 224, 173, 160, 241, 61, 144,
+                        64, 93, 106, 229, 83, 134, 189, 40,
+                        189, 210, 25, 184, 160, 141, 237, 26,
+                        168, 54, 239, 204, 139, 119, 13, 199];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_chacha_nonce() {
+        // Test vector 5 from
+        // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
+        // Although we do not support setting a nonce, we try it here anyway so
+        // we can use this test vector.
+        let seed = [0u8; 32];
+        let mut rng = ChaChaRng::from_seed(seed);
+        // 96-bit nonce in LE order is: 0,0,0,0, 0,0,0,0, 0,0,0,2
+        rng.set_stream(2u64 << (24 + 32));
+
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0x374dc6c2, 0x3736d58c, 0xb904e24a, 0xcd3f93ef,
+                        0x88228b1a, 0x96a4dfb3, 0x5b76ab72, 0xc727ee54,
+                        0x0e0e978a, 0xf3145c95, 0x1b748ea8, 0xf786c297,
+                        0x99c28f5f, 0x628314e8, 0x398a19fa, 0x6ded1b53];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_chacha_clone_streams() {
+        let seed = [0,0,0,0, 1,0,0,0, 2,0,0,0, 3,0,0,0, 4,0,0,0, 5,0,0,0, 6,0,0,0, 7,0,0,0];
+        let mut rng = ChaChaRng::from_seed(seed);
+        let mut clone = rng.clone();
+        for _ in 0..16 {
+            assert_eq!(rng.next_u64(), clone.next_u64());
+        }
+        
+        rng.set_stream(51);
+        for _ in 0..7 {
+            assert!(rng.next_u32() != clone.next_u32());
+        }
+        clone.set_stream(51);   // switch part way through block
+        for _ in 7..16 {
+            assert_eq!(rng.next_u32(), clone.next_u32());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/hc128.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/hc128.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/hc128.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/hc128.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,464 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://www.rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The HC-128 random number generator.
+
+use core::fmt;
+use rand_core::{CryptoRng, RngCore, SeedableRng, Error, le};
+use rand_core::block::{BlockRngCore, BlockRng};
+
+const SEED_WORDS: usize = 8; // 128 bit key followed by 128 bit iv
+
+/// A cryptographically secure random number generator that uses the HC-128
+/// algorithm.
+///
+/// HC-128 is a stream cipher designed by Hongjun Wu[^1], that we use as an
+/// RNG. It is selected as one of the "stream ciphers suitable for widespread
+/// adoption" by eSTREAM[^2].
+///
+/// HC-128 is an array based RNG. In this it is similar to RC-4 and ISAAC before
+/// it, but those have never been proven cryptographically secure (or have even
+/// been significantly compromised, as in the case of RC-4[^5]).
+///
+/// Because HC-128 works with simple indexing into a large array and with a few
+/// operations that parallelize well, it has very good performance. The size of
+/// the array it needs, 4kb, can however be a disadvantage.
+///
+/// This implementation is not based on the version of HC-128 submitted to the
+/// eSTREAM contest, but on a later version by the author with a few small
+/// improvements from December 15, 2009[^3].
+///
+/// HC-128 has no known weaknesses that are easier to exploit than doing a
+/// brute-force search of 2<sup>128</sup>. A very comprehensive analysis of the
+/// current state of known attacks / weaknesses of HC-128 is given in *Some
+/// Results On Analysis And Implementation Of HC-128 Stream Cipher*[^4].
+///
+/// The average cycle length is expected to be
+/// 2<sup>1024*32+10-1</sup> = 2<sup>32777</sup>.
+/// We support seeding with a 256-bit array, which matches the 128-bit key
+/// concatenated with a 128-bit IV from the stream cipher.
+///
+/// This implementation uses an output buffer of sixteen `u32` words, and uses
+/// [`BlockRng`] to implement the [`RngCore`] methods.
+///
+/// ## References
+/// [^1]: Hongjun Wu (2008). ["The Stream Cipher HC-128"](
+///       http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf).
+///       *The eSTREAM Finalists*, LNCS 4986, pp. 39–47, Springer-Verlag.
+///
+/// [^2]: [eSTREAM: the ECRYPT Stream Cipher Project](
+///       http://www.ecrypt.eu.org/stream/)
+///
+/// [^3]: Hongjun Wu, [Stream Ciphers HC-128 and HC-256](
+///       https://www.ntu.edu.sg/home/wuhj/research/hc/index.html)
+///
+/// [^4]: Shashwat Raizada (January 2015),["Some Results On Analysis And
+///       Implementation Of HC-128 Stream Cipher"](
+///       http://library.isical.ac.in:8080/jspui/bitstream/123456789/6636/1/TH431.pdf).
+///
+/// [^5]: Internet Engineering Task Force (February 2015),
+///       ["Prohibiting RC4 Cipher Suites"](https://tools.ietf.org/html/rfc7465).
+///
+/// [`BlockRng`]: ../../../rand_core/block/struct.BlockRng.html
+/// [`RngCore`]: ../../trait.RngCore.html
+#[derive(Clone, Debug)]
+pub struct Hc128Rng(BlockRng<Hc128Core>);
+
+impl RngCore for Hc128Rng {
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl SeedableRng for Hc128Rng {
+    type Seed = <Hc128Core as SeedableRng>::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        Hc128Rng(BlockRng::<Hc128Core>::from_seed(seed))
+    }
+
+    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
+        BlockRng::<Hc128Core>::from_rng(rng).map(Hc128Rng)
+    }
+}
+
+impl CryptoRng for Hc128Rng {}
+
+/// The core of `Hc128Rng`, used with `BlockRng`.
+#[derive(Clone)]
+pub struct Hc128Core {
+    t: [u32; 1024],
+    counter1024: usize,
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for Hc128Core {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "Hc128Core {{}}")
+    }
+}
+
+impl BlockRngCore for Hc128Core {
+    type Item = u32;
+    type Results = [u32; 16];
+
+    fn generate(&mut self, results: &mut Self::Results) {
+        assert!(self.counter1024 % 16 == 0);
+
+        let cc = self.counter1024 % 512;
+        let dd = (cc + 16) % 512;
+        let ee = cc.wrapping_sub(16) % 512;
+
+        if self.counter1024 & 512 == 0 {
+            // P block
+            results[0]  = self.step_p(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
+            results[1]  = self.step_p(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
+            results[2]  = self.step_p(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
+            results[3]  = self.step_p(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
+            results[4]  = self.step_p(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
+            results[5]  = self.step_p(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
+            results[6]  = self.step_p(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
+            results[7]  = self.step_p(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
+            results[8]  = self.step_p(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
+            results[9]  = self.step_p(cc+9,  cc+10, cc+6,  ee+15, ee+13);
+            results[10] = self.step_p(cc+10, cc+11, cc+7,  cc+0,  ee+14);
+            results[11] = self.step_p(cc+11, cc+12, cc+8,  cc+1,  ee+15);
+            results[12] = self.step_p(cc+12, cc+13, cc+9,  cc+2,  cc+0);
+            results[13] = self.step_p(cc+13, cc+14, cc+10, cc+3,  cc+1);
+            results[14] = self.step_p(cc+14, cc+15, cc+11, cc+4,  cc+2);
+            results[15] = self.step_p(cc+15, dd+0,  cc+12, cc+5,  cc+3);
+        } else {
+            // Q block
+            results[0]  = self.step_q(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
+            results[1]  = self.step_q(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
+            results[2]  = self.step_q(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
+            results[3]  = self.step_q(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
+            results[4]  = self.step_q(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
+            results[5]  = self.step_q(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
+            results[6]  = self.step_q(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
+            results[7]  = self.step_q(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
+            results[8]  = self.step_q(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
+            results[9]  = self.step_q(cc+9,  cc+10, cc+6,  ee+15, ee+13);
+            results[10] = self.step_q(cc+10, cc+11, cc+7,  cc+0,  ee+14);
+            results[11] = self.step_q(cc+11, cc+12, cc+8,  cc+1,  ee+15);
+            results[12] = self.step_q(cc+12, cc+13, cc+9,  cc+2,  cc+0);
+            results[13] = self.step_q(cc+13, cc+14, cc+10, cc+3,  cc+1);
+            results[14] = self.step_q(cc+14, cc+15, cc+11, cc+4,  cc+2);
+            results[15] = self.step_q(cc+15, dd+0,  cc+12, cc+5,  cc+3);
+        }
+        self.counter1024 = self.counter1024.wrapping_add(16);
+    }
+}
+
+impl Hc128Core {
+    // One step of HC-128, update P and generate 32 bits keystream
+    #[inline(always)]
+    fn step_p(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize)
+         -> u32
+    {
+        let (p, q) = self.t.split_at_mut(512);
+        // FIXME: it would be great if we the bounds checks here could be
+        // optimized out, and we would not need unsafe.
+        // This improves performance by about 7%.
+        unsafe {
+            let temp0 = p.get_unchecked(i511).rotate_right(23);
+            let temp1 = p.get_unchecked(i3).rotate_right(10);
+            let temp2 = p.get_unchecked(i10).rotate_right(8);
+            *p.get_unchecked_mut(i) = p.get_unchecked(i)
+                                       .wrapping_add(temp2)
+                                       .wrapping_add(temp0 ^ temp1);
+            let temp3 = {
+                // The h1 function in HC-128
+                let a = *p.get_unchecked(i12) as u8;
+                let c = (p.get_unchecked(i12) >> 16) as u8;
+                q[a as usize].wrapping_add(q[256 + c as usize])
+            };
+            temp3 ^ p.get_unchecked(i)
+        }
+    }
+
+    // One step of HC-128, update Q and generate 32 bits keystream
+    // Similar to `step_p`, but `p` and `q` are swapped, and the rotates are to
+    // the left instead of to the right.
+    #[inline(always)]
+    fn step_q(&mut self, i: usize, i511: usize, i3: usize, i10: usize, i12: usize)
+         -> u32
+    {
+        let (p, q) = self.t.split_at_mut(512);
+        unsafe {
+            let temp0 = q.get_unchecked(i511).rotate_left(23);
+            let temp1 = q.get_unchecked(i3).rotate_left(10);
+            let temp2 = q.get_unchecked(i10).rotate_left(8);
+            *q.get_unchecked_mut(i) = q.get_unchecked(i)
+                                       .wrapping_add(temp2)
+                                       .wrapping_add(temp0 ^ temp1);
+            let temp3 = {
+                // The h2 function in HC-128
+                let a = *q.get_unchecked(i12) as u8;
+                let c = (q.get_unchecked(i12) >> 16) as u8;
+                p[a as usize].wrapping_add(p[256 + c as usize])
+            };
+            temp3 ^ q.get_unchecked(i)
+        }
+    }
+
+    fn sixteen_steps(&mut self) {
+        assert!(self.counter1024 % 16 == 0);
+
+        let cc = self.counter1024 % 512;
+        let dd = (cc + 16) % 512;
+        let ee = cc.wrapping_sub(16) % 512;
+
+        if self.counter1024 < 512 {
+            // P block
+            self.t[cc+0]  = self.step_p(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
+            self.t[cc+1]  = self.step_p(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
+            self.t[cc+2]  = self.step_p(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
+            self.t[cc+3]  = self.step_p(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
+            self.t[cc+4]  = self.step_p(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
+            self.t[cc+5]  = self.step_p(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
+            self.t[cc+6]  = self.step_p(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
+            self.t[cc+7]  = self.step_p(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
+            self.t[cc+8]  = self.step_p(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
+            self.t[cc+9]  = self.step_p(cc+9,  cc+10, cc+6,  ee+15, ee+13);
+            self.t[cc+10] = self.step_p(cc+10, cc+11, cc+7,  cc+0,  ee+14);
+            self.t[cc+11] = self.step_p(cc+11, cc+12, cc+8,  cc+1,  ee+15);
+            self.t[cc+12] = self.step_p(cc+12, cc+13, cc+9,  cc+2,  cc+0);
+            self.t[cc+13] = self.step_p(cc+13, cc+14, cc+10, cc+3,  cc+1);
+            self.t[cc+14] = self.step_p(cc+14, cc+15, cc+11, cc+4,  cc+2);
+            self.t[cc+15] = self.step_p(cc+15, dd+0,  cc+12, cc+5,  cc+3);
+        } else {
+            // Q block
+            self.t[cc+512+0]  = self.step_q(cc+0,  cc+1,  ee+13, ee+6,  ee+4);
+            self.t[cc+512+1]  = self.step_q(cc+1,  cc+2,  ee+14, ee+7,  ee+5);
+            self.t[cc+512+2]  = self.step_q(cc+2,  cc+3,  ee+15, ee+8,  ee+6);
+            self.t[cc+512+3]  = self.step_q(cc+3,  cc+4,  cc+0,  ee+9,  ee+7);
+            self.t[cc+512+4]  = self.step_q(cc+4,  cc+5,  cc+1,  ee+10, ee+8);
+            self.t[cc+512+5]  = self.step_q(cc+5,  cc+6,  cc+2,  ee+11, ee+9);
+            self.t[cc+512+6]  = self.step_q(cc+6,  cc+7,  cc+3,  ee+12, ee+10);
+            self.t[cc+512+7]  = self.step_q(cc+7,  cc+8,  cc+4,  ee+13, ee+11);
+            self.t[cc+512+8]  = self.step_q(cc+8,  cc+9,  cc+5,  ee+14, ee+12);
+            self.t[cc+512+9]  = self.step_q(cc+9,  cc+10, cc+6,  ee+15, ee+13);
+            self.t[cc+512+10] = self.step_q(cc+10, cc+11, cc+7,  cc+0,  ee+14);
+            self.t[cc+512+11] = self.step_q(cc+11, cc+12, cc+8,  cc+1,  ee+15);
+            self.t[cc+512+12] = self.step_q(cc+12, cc+13, cc+9,  cc+2,  cc+0);
+            self.t[cc+512+13] = self.step_q(cc+13, cc+14, cc+10, cc+3,  cc+1);
+            self.t[cc+512+14] = self.step_q(cc+14, cc+15, cc+11, cc+4,  cc+2);
+            self.t[cc+512+15] = self.step_q(cc+15, dd+0,  cc+12, cc+5,  cc+3);
+        }
+        self.counter1024 += 16;
+    }
+
+    // Initialize an HC-128 random number generator. The seed has to be
+    // 256 bits in length (`[u32; 8]`), matching the 128 bit `key` followed by
+    // 128 bit `iv` when HC-128 where to be used as a stream cipher.
+    fn init(seed: [u32; SEED_WORDS]) -> Self {
+        #[inline]
+        fn f1(x: u32) -> u32 {
+            x.rotate_right(7) ^ x.rotate_right(18) ^ (x >> 3)
+        }
+
+        #[inline]
+        fn f2(x: u32) -> u32 {
+            x.rotate_right(17) ^ x.rotate_right(19) ^ (x >> 10)
+        }
+
+        let mut t = [0u32; 1024];
+
+        // Expand the key and iv into P and Q
+        let (key, iv) = seed.split_at(4);
+        t[..4].copy_from_slice(key);
+        t[4..8].copy_from_slice(key);
+        t[8..12].copy_from_slice(iv);
+        t[12..16].copy_from_slice(iv);
+
+        // Generate the 256 intermediate values W[16] ... W[256+16-1], and
+        // copy the last 16 generated values to the start op P.
+        for i in 16..256+16 {
+            t[i] = f2(t[i-2]).wrapping_add(t[i-7]).wrapping_add(f1(t[i-15]))
+                   .wrapping_add(t[i-16]).wrapping_add(i as u32);
+        }
+        {
+            let (p1, p2) = t.split_at_mut(256);
+            p1[0..16].copy_from_slice(&p2[0..16]);
+        }
+
+        // Generate both the P and Q tables
+        for i in 16..1024 {
+            t[i] = f2(t[i-2]).wrapping_add(t[i-7]).wrapping_add(f1(t[i-15]))
+                   .wrapping_add(t[i-16]).wrapping_add(256 + i as u32);
+        }
+
+        let mut core = Self { t, counter1024: 0 };
+
+        // run the cipher 1024 steps
+        for _ in 0..64 { core.sixteen_steps() };
+        core.counter1024 = 0;
+        core
+    }
+}
+
+impl SeedableRng for Hc128Core {
+    type Seed = [u8; SEED_WORDS*4];
+
+    /// Create an HC-128 random number generator with a seed. The seed has to be
+    /// 256 bits in length, matching the 128 bit `key` followed by 128 bit `iv`
+    /// when HC-128 where to be used as a stream cipher.
+    fn from_seed(seed: Self::Seed) -> Self {
+        let mut seed_u32 = [0u32; SEED_WORDS];
+        le::read_u32_into(&seed, &mut seed_u32);
+        Self::init(seed_u32)
+    }
+}
+
+impl CryptoRng for Hc128Core {}
+
+#[cfg(test)]
+mod test {
+    use {RngCore, SeedableRng};
+    use super::Hc128Rng;
+
+    #[test]
+    // Test vector 1 from the paper "The Stream Cipher HC-128"
+    fn test_hc128_true_values_a() {
+        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
+        let mut rng = Hc128Rng::from_seed(seed);
+
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0x73150082, 0x3bfd03a0, 0xfb2fd77f, 0xaa63af0e,
+                        0xde122fc6, 0xa7dc29b6, 0x62a68527, 0x8b75ec68,
+                        0x9036db1e, 0x81896005, 0x00ade078, 0x491fbf9a,
+                        0x1cdc3013, 0x6c3d6e24, 0x90f664b2, 0x9cd57102];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    // Test vector 2 from the paper "The Stream Cipher HC-128"
+    fn test_hc128_true_values_b() {
+        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
+                    1,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
+        let mut rng = Hc128Rng::from_seed(seed);
+
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0xc01893d5, 0xb7dbe958, 0x8f65ec98, 0x64176604,
+                        0x36fc6724, 0xc82c6eec, 0x1b1c38a7, 0xc9b42a95,
+                        0x323ef123, 0x0a6a908b, 0xce757b68, 0x9f14f7bb,
+                        0xe4cde011, 0xaeb5173f, 0x89608c94, 0xb5cf46ca];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    // Test vector 3 from the paper "The Stream Cipher HC-128"
+    fn test_hc128_true_values_c() {
+        let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
+        let mut rng = Hc128Rng::from_seed(seed);
+
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected = [0x518251a4, 0x04b4930a, 0xb02af931, 0x0639f032,
+                        0xbcb4a47a, 0x5722480b, 0x2bf99f72, 0xcdc0e566,
+                        0x310f0c56, 0xd3cc83e8, 0x663db8ef, 0x62dfe07f,
+                        0x593e1790, 0xc5ceaa9c, 0xab03806f, 0xc9a6e5a0];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_hc128_true_values_u64() {
+        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
+        let mut rng = Hc128Rng::from_seed(seed);
+
+        let mut results = [0u64; 8];
+        for i in results.iter_mut() { *i = rng.next_u64(); }
+        let expected = [0x3bfd03a073150082, 0xaa63af0efb2fd77f,
+                        0xa7dc29b6de122fc6, 0x8b75ec6862a68527,
+                        0x818960059036db1e, 0x491fbf9a00ade078,
+                        0x6c3d6e241cdc3013, 0x9cd5710290f664b2];
+        assert_eq!(results, expected);
+
+        // The RNG operates in a P block of 512 results and next a Q block.
+        // After skipping 2*800 u32 results we end up somewhere in the Q block
+        // of the second round
+        for _ in 0..800 { rng.next_u64(); }
+
+        for i in results.iter_mut() { *i = rng.next_u64(); }
+        let expected = [0xd8c4d6ca84d0fc10, 0xf16a5d91dc66e8e7,
+                        0xd800de5bc37a8653, 0x7bae1f88c0dfbb4c,
+                        0x3bfe1f374e6d4d14, 0x424b55676be3fa06,
+                        0xe3a1e8758cbff579, 0x417f7198c5652bcd];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_hc128_true_values_bytes() {
+        let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
+        let mut rng = Hc128Rng::from_seed(seed);
+        let expected = [0x31, 0xf9, 0x2a, 0xb0, 0x32, 0xf0, 0x39, 0x06,
+                 0x7a, 0xa4, 0xb4, 0xbc, 0x0b, 0x48, 0x22, 0x57,
+                 0x72, 0x9f, 0xf9, 0x2b, 0x66, 0xe5, 0xc0, 0xcd,
+                 0x56, 0x0c, 0x0f, 0x31, 0xe8, 0x83, 0xcc, 0xd3,
+                 0xef, 0xb8, 0x3d, 0x66, 0x7f, 0xe0, 0xdf, 0x62,
+                 0x90, 0x17, 0x3e, 0x59, 0x9c, 0xaa, 0xce, 0xc5,
+                 0x6f, 0x80, 0x03, 0xab, 0xa0, 0xe5, 0xa6, 0xc9,
+                 0x60, 0x95, 0x84, 0x7a, 0xa5, 0x68, 0x5a, 0x84,
+                 0xea, 0xd5, 0xf3, 0xea, 0x73, 0xa9, 0xad, 0x01,
+                 0x79, 0x7d, 0xbe, 0x9f, 0xea, 0xe3, 0xf9, 0x74,
+                 0x0e, 0xda, 0x2f, 0xa0, 0xe4, 0x7b, 0x4b, 0x1b,
+                 0xdd, 0x17, 0x69, 0x4a, 0xfe, 0x9f, 0x56, 0x95,
+                 0xad, 0x83, 0x6b, 0x9d, 0x60, 0xa1, 0x99, 0x96,
+                 0x90, 0x00, 0x66, 0x7f, 0xfa, 0x7e, 0x65, 0xe9,
+                 0xac, 0x8b, 0x92, 0x34, 0x77, 0xb4, 0x23, 0xd0,
+                 0xb9, 0xab, 0xb1, 0x47, 0x7d, 0x4a, 0x13, 0x0a];
+
+        // Pick a somewhat large buffer so we can test filling with the
+        // remainder from `state.results`, directly filling the buffer, and
+        // filling the remainder of the buffer.
+        let mut buffer = [0u8; 16*4*2];
+        // Consume a value so that we have a remainder.
+        assert!(rng.next_u64() == 0x04b4930a518251a4);
+        rng.fill_bytes(&mut buffer);
+
+        // [u8; 128] doesn't implement PartialEq
+        assert_eq!(buffer.len(), expected.len());
+        for (b, e) in buffer.iter().zip(expected.iter()) {
+            assert_eq!(b, e);
+        }
+    }
+
+    #[test]
+    fn test_hc128_clone() {
+        let seed = [0x55,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // key
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]; // iv
+        let mut rng1 = Hc128Rng::from_seed(seed);
+        let mut rng2 = rng1.clone();
+        for _ in 0..16 {
+            assert_eq!(rng1.next_u32(), rng2.next_u32());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/isaac64.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/isaac64.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/isaac64.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/isaac64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,491 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The ISAAC-64 random number generator.
+
+use core::{fmt, slice};
+use core::num::Wrapping as w;
+use rand_core::{RngCore, SeedableRng, Error, le};
+use rand_core::block::{BlockRngCore, BlockRng64};
+use prng::isaac_array::IsaacArray;
+
+#[allow(non_camel_case_types)]
+type w64 = w<u64>;
+
+const RAND_SIZE_LEN: usize = 8;
+const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
+
+/// A random number generator that uses ISAAC-64, the 64-bit variant of the
+/// ISAAC algorithm.
+///
+/// ISAAC stands for "Indirection, Shift, Accumulate, Add, and Count" which are
+/// the principal bitwise operations employed. It is the most advanced of a
+/// series of array based random number generator designed by Robert Jenkins
+/// in 1996[^1].
+///
+/// ISAAC-64 is mostly similar to ISAAC. Because it operates on 64-bit integers
+/// instead of 32-bit, it uses twice as much memory to hold its state and
+/// results. Also it uses different constants for shifts and indirect indexing,
+/// optimized to give good results for 64bit arithmetic.
+///
+/// ISAAC-64 is notably fast and produces excellent quality random numbers for
+/// non-cryptographic applications.
+///
+/// In spite of being designed with cryptographic security in mind, ISAAC hasn't
+/// been stringently cryptanalyzed and thus cryptographers do not not
+/// consensually trust it to be secure. When looking for a secure RNG, prefer
+/// [`Hc128Rng`] instead, which, like ISAAC, is an array-based RNG and one of
+/// the stream-ciphers selected the by eSTREAM contest.
+///
+/// ## Overview of the ISAAC-64 algorithm:
+/// (in pseudo-code)
+///
+/// ```text
+/// Input: a, b, c, s[256] // state
+/// Output: r[256] // results
+///
+/// mix(a,i) = !(a ^ a << 21)  if i = 0 mod 4
+///              a ^ a >>  5   if i = 1 mod 4
+///              a ^ a << 12   if i = 2 mod 4
+///              a ^ a >> 33   if i = 3 mod 4
+///
+/// c = c + 1
+/// b = b + c
+///
+/// for i in 0..256 {
+///     x = s_[i]
+///     a = mix(a,i) + s[i+128 mod 256]
+///     y = a + b + s[x>>3 mod 256]
+///     s[i] = y
+///     b = x + s[y>>11 mod 256]
+///     r[i] = b
+/// }
+/// ```
+///
+/// This implementation uses [`BlockRng64`] to implement the [`RngCore`] methods.
+///
+/// See for more information the documentation of [`IsaacRng`].
+///
+/// [^1]: Bob Jenkins, [*ISAAC and RC4*](
+///       http://burtleburtle.net/bob/rand/isaac.html)
+///
+/// [`IsaacRng`]: ../isaac/struct.IsaacRng.html
+/// [`Hc128Rng`]: ../hc128/struct.Hc128Rng.html
+/// [`BlockRng64`]: ../../../rand_core/block/struct.BlockRng64.html
+/// [`RngCore`]: ../../trait.RngCore.html
+#[derive(Clone, Debug)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct Isaac64Rng(BlockRng64<Isaac64Core>);
+
+impl RngCore for Isaac64Rng {
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl SeedableRng for Isaac64Rng {
+    type Seed = <Isaac64Core as SeedableRng>::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        Isaac64Rng(BlockRng64::<Isaac64Core>::from_seed(seed))
+    }
+
+    /// Create an ISAAC random number generator using an `u64` as seed.
+    /// If `seed == 0` this will produce the same stream of random numbers as
+    /// the reference implementation when used unseeded.
+    fn seed_from_u64(seed: u64) -> Self {
+        Isaac64Rng(BlockRng64::<Isaac64Core>::seed_from_u64(seed))
+    }
+
+    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
+        BlockRng64::<Isaac64Core>::from_rng(rng).map(|rng| Isaac64Rng(rng))
+    }
+}
+
+impl Isaac64Rng {
+    /// Create a 64-bit ISAAC random number generator using the
+    /// default fixed seed.
+    ///
+    /// DEPRECATED. `Isaac64Rng::new_from_u64(0)` will produce identical results.
+    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
+    pub fn new_unseeded() -> Self {
+        Self::seed_from_u64(0)
+    }
+
+    /// Create an ISAAC-64 random number generator using an `u64` as seed.
+    /// If `seed == 0` this will produce the same stream of random numbers as
+    /// the reference implementation when used unseeded.
+    #[deprecated(since="0.6.0", note="use SeedableRng::seed_from_u64 instead")]
+    pub fn new_from_u64(seed: u64) -> Self {
+        Self::seed_from_u64(seed)
+    }
+}
+
+/// The core of `Isaac64Rng`, used with `BlockRng`.
+#[derive(Clone)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct Isaac64Core {
+    #[cfg_attr(feature="serde1",serde(with="super::isaac_array::isaac_array_serde"))]
+    mem: [w64; RAND_SIZE],
+    a: w64,
+    b: w64,
+    c: w64,
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for Isaac64Core {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "Isaac64Core {{}}")
+    }
+}
+
+impl BlockRngCore for Isaac64Core {
+    type Item = u64;
+    type Results = IsaacArray<Self::Item>;
+
+    /// Refills the output buffer, `results`. See also the pseudocode desciption
+    /// of the algorithm in the [`Isaac64Rng`] documentation.
+    ///
+    /// Optimisations used (similar to the reference implementation):
+    /// 
+    /// - The loop is unrolled 4 times, once for every constant of mix().
+    /// - The contents of the main loop are moved to a function `rngstep`, to
+    ///   reduce code duplication.
+    /// - We use local variables for a and b, which helps with optimisations.
+    /// - We split the main loop in two, one that operates over 0..128 and one
+    ///   over 128..256. This way we can optimise out the addition and modulus
+    ///   from `s[i+128 mod 256]`.
+    /// - We maintain one index `i` and add `m` or `m2` as base (m2 for the
+    ///   `s[i+128 mod 256]`), relying on the optimizer to turn it into pointer
+    ///   arithmetic.
+    /// - We fill `results` backwards. The reference implementation reads values
+    ///   from `results` in reverse. We read them in the normal direction, to
+    ///   make `fill_bytes` a memcopy. To maintain compatibility we fill in
+    ///   reverse.
+    /// 
+    /// [`Isaac64Rng`]: struct.Isaac64Rng.html
+    fn generate(&mut self, results: &mut IsaacArray<Self::Item>) {
+        self.c += w(1);
+        // abbreviations
+        let mut a = self.a;
+        let mut b = self.b + self.c;
+        const MIDPOINT: usize = RAND_SIZE / 2;
+
+        #[inline]
+        fn ind(mem:&[w64; RAND_SIZE], v: w64, amount: usize) -> w64 {
+            let index = (v >> amount).0 as usize % RAND_SIZE;
+            mem[index]
+        }
+
+        #[inline]
+        fn rngstep(mem: &mut [w64; RAND_SIZE],
+                   results: &mut [u64; RAND_SIZE],
+                   mix: w64,
+                   a: &mut w64,
+                   b: &mut w64,
+                   base: usize,
+                   m: usize,
+                   m2: usize) {
+            let x = mem[base + m];
+            *a = mix + mem[base + m2];
+            let y = *a + *b + ind(&mem, x, 3);
+            mem[base + m] = y;
+            *b = x + ind(&mem, y, 3 + RAND_SIZE_LEN);
+            results[RAND_SIZE - 1 - base - m] = (*b).0;
+        }
+
+        let mut m = 0;
+        let mut m2 = MIDPOINT;
+        for i in (0..MIDPOINT/4).map(|i| i * 4) {
+            rngstep(&mut self.mem, results, !(a ^ (a << 21)), &mut a, &mut b, i + 0, m, m2);
+            rngstep(&mut self.mem, results,   a ^ (a >> 5 ),  &mut a, &mut b, i + 1, m, m2);
+            rngstep(&mut self.mem, results,   a ^ (a << 12),  &mut a, &mut b, i + 2, m, m2);
+            rngstep(&mut self.mem, results,   a ^ (a >> 33),  &mut a, &mut b, i + 3, m, m2);
+        }
+
+        m = MIDPOINT;
+        m2 = 0;
+        for i in (0..MIDPOINT/4).map(|i| i * 4) {
+            rngstep(&mut self.mem, results, !(a ^ (a << 21)), &mut a, &mut b, i + 0, m, m2);
+            rngstep(&mut self.mem, results,   a ^ (a >> 5 ),  &mut a, &mut b, i + 1, m, m2);
+            rngstep(&mut self.mem, results,   a ^ (a << 12),  &mut a, &mut b, i + 2, m, m2);
+            rngstep(&mut self.mem, results,   a ^ (a >> 33),  &mut a, &mut b, i + 3, m, m2);
+        }
+
+        self.a = a;
+        self.b = b;
+    }
+}
+
+impl Isaac64Core {
+    /// Create a new ISAAC-64 random number generator.
+    fn init(mut mem: [w64; RAND_SIZE], rounds: u32) -> Self {
+        fn mix(a: &mut w64, b: &mut w64, c: &mut w64, d: &mut w64,
+               e: &mut w64, f: &mut w64, g: &mut w64, h: &mut w64) {
+            *a -= *e; *f ^= *h >> 9;  *h += *a;
+            *b -= *f; *g ^= *a << 9;  *a += *b;
+            *c -= *g; *h ^= *b >> 23; *b += *c;
+            *d -= *h; *a ^= *c << 15; *c += *d;
+            *e -= *a; *b ^= *d >> 14; *d += *e;
+            *f -= *b; *c ^= *e << 20; *e += *f;
+            *g -= *c; *d ^= *f >> 17; *f += *g;
+            *h -= *d; *e ^= *g << 14; *g += *h;
+        }
+
+        // These numbers are the result of initializing a...h with the
+        // fractional part of the golden ratio in binary (0x9e3779b97f4a7c13)
+        // and applying mix() 4 times.
+        let mut a = w(0x647c4677a2884b7c);
+        let mut b = w(0xb9f8b322c73ac862);
+        let mut c = w(0x8c0ea5053d4712a0);
+        let mut d = w(0xb29b2e824a595524);
+        let mut e = w(0x82f053db8355e0ce);
+        let mut f = w(0x48fe4a0fa5a09315);
+        let mut g = w(0xae985bf2cbfc89ed);
+        let mut h = w(0x98f5704f6c44c0ab);
+
+        // Normally this should do two passes, to make all of the seed effect
+        // all of `mem`
+        for _ in 0..rounds {
+            for i in (0..RAND_SIZE/8).map(|i| i * 8) {
+                a += mem[i  ]; b += mem[i+1];
+                c += mem[i+2]; d += mem[i+3];
+                e += mem[i+4]; f += mem[i+5];
+                g += mem[i+6]; h += mem[i+7];
+                mix(&mut a, &mut b, &mut c, &mut d,
+                    &mut e, &mut f, &mut g, &mut h);
+                mem[i  ] = a; mem[i+1] = b;
+                mem[i+2] = c; mem[i+3] = d;
+                mem[i+4] = e; mem[i+5] = f;
+                mem[i+6] = g; mem[i+7] = h;
+            }
+        }
+
+        Self { mem, a: w(0), b: w(0), c: w(0) }
+    }
+
+    /// Create an ISAAC-64 random number generator using an `u64` as seed.
+    /// If `seed == 0` this will produce the same stream of random numbers as
+    /// the reference implementation when used unseeded.
+    #[deprecated(since="0.6.0", note="use SeedableRng::seed_from_u64 instead")]
+    pub fn new_from_u64(seed: u64) -> Self {
+        Self::seed_from_u64(seed)
+    }
+}
+
+impl SeedableRng for Isaac64Core {
+    type Seed = [u8; 32];
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        let mut seed_u64 = [0u64; 4];
+        le::read_u64_into(&seed, &mut seed_u64);
+        // Convert the seed to `Wrapping<u64>` and zero-extend to `RAND_SIZE`.
+        let mut seed_extended = [w(0); RAND_SIZE];
+        for (x, y) in seed_extended.iter_mut().zip(seed_u64.iter()) {
+            *x = w(*y);
+        }
+        Self::init(seed_extended, 2)
+    }
+    
+    fn seed_from_u64(seed: u64) -> Self {
+        let mut key = [w(0); RAND_SIZE];
+        key[0] = w(seed);
+        // Initialize with only one pass.
+        // A second pass does not improve the quality here, because all of the
+        // seed was already available in the first round.
+        // Not doing the second pass has the small advantage that if
+        // `seed == 0` this method produces exactly the same state as the
+        // reference implementation when used unseeded.
+        Self::init(key, 1)
+    }
+
+    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
+        // Custom `from_rng` implementation that fills a seed with the same size
+        // as the entire state.
+        let mut seed = [w(0u64); RAND_SIZE];
+        unsafe {
+            let ptr = seed.as_mut_ptr() as *mut u8;
+            let slice = slice::from_raw_parts_mut(ptr, RAND_SIZE * 8);
+            rng.try_fill_bytes(slice)?;
+        }
+        for i in seed.iter_mut() {
+            *i = w(i.0.to_le());
+        }
+
+        Ok(Self::init(seed, 2))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use {RngCore, SeedableRng};
+    use super::Isaac64Rng;
+
+    #[test]
+    fn test_isaac64_construction() {
+        // Test that various construction techniques produce a working RNG.
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng1 = Isaac64Rng::from_seed(seed);
+        assert_eq!(rng1.next_u64(), 14964555543728284049);
+
+        let mut rng2 = Isaac64Rng::from_rng(rng1).unwrap();
+        assert_eq!(rng2.next_u64(), 919595328260451758);
+    }
+
+    #[test]
+    fn test_isaac64_true_values_64() {
+        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
+                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
+        let mut rng1 = Isaac64Rng::from_seed(seed);
+        let mut results = [0u64; 10];
+        for i in results.iter_mut() { *i = rng1.next_u64(); }
+        let expected = [
+                   15071495833797886820, 7720185633435529318,
+                   10836773366498097981, 5414053799617603544,
+                   12890513357046278984, 17001051845652595546,
+                   9240803642279356310, 12558996012687158051,
+                   14673053937227185542, 1677046725350116783];
+        assert_eq!(results, expected);
+
+        let seed = [57,48,0,0, 0,0,0,0, 50,9,1,0, 0,0,0,0,
+                    49,212,0,0, 0,0,0,0, 148,38,0,0, 0,0,0,0];
+        let mut rng2 = Isaac64Rng::from_seed(seed);
+        // skip forward to the 10000th number
+        for _ in 0..10000 { rng2.next_u64(); }
+
+        for i in results.iter_mut() { *i = rng2.next_u64(); }
+        let expected = [
+            18143823860592706164, 8491801882678285927, 2699425367717515619,
+            17196852593171130876, 2606123525235546165, 15790932315217671084,
+            596345674630742204, 9947027391921273664, 11788097613744130851,
+            10391409374914919106];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac64_true_values_32() {
+        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
+                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
+        let mut rng = Isaac64Rng::from_seed(seed);
+        let mut results = [0u32; 12];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        // Subset of above values, as an LE u32 sequence
+        let expected = [
+                    3477963620, 3509106075,
+                    687845478, 1797495790,
+                    227048253, 2523132918,
+                    4044335064, 1260557630,
+                    4079741768, 3001306521,
+                    69157722, 3958365844];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac64_true_values_mixed() {
+        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
+                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
+        let mut rng = Isaac64Rng::from_seed(seed);
+        // Test alternating between `next_u64` and `next_u32` works as expected.
+        // Values are the same as `test_isaac64_true_values` and
+        // `test_isaac64_true_values_32`.
+        assert_eq!(rng.next_u64(), 15071495833797886820);
+        assert_eq!(rng.next_u32(), 687845478);
+        assert_eq!(rng.next_u32(), 1797495790);
+        assert_eq!(rng.next_u64(), 10836773366498097981);
+        assert_eq!(rng.next_u32(), 4044335064);
+        // Skip one u32
+        assert_eq!(rng.next_u64(), 12890513357046278984);
+        assert_eq!(rng.next_u32(), 69157722);
+    }
+
+    #[test]
+    fn test_isaac64_true_bytes() {
+        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
+                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
+        let mut rng = Isaac64Rng::from_seed(seed);
+        let mut results = [0u8; 32];
+        rng.fill_bytes(&mut results);
+        // Same as first values in test_isaac64_true_values as bytes in LE order
+        let expected = [100, 131, 77, 207, 155, 181, 40, 209,
+                        102, 176, 255, 40, 238, 155, 35, 107,
+                        61, 123, 136, 13, 246, 243, 99, 150,
+                        216, 167, 15, 241, 62, 149, 34, 75];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac64_new_uninitialized() {
+        // Compare the results from initializing `IsaacRng` with
+        // `seed_from_u64(0)`, to make sure it is the same as the reference
+        // implementation when used uninitialized.
+        // Note: We only test the first 16 integers, not the full 256 of the
+        // first block.
+        let mut rng = Isaac64Rng::seed_from_u64(0);
+        let mut results = [0u64; 16];
+        for i in results.iter_mut() { *i = rng.next_u64(); }
+        let expected: [u64; 16] = [
+            0xF67DFBA498E4937C, 0x84A5066A9204F380, 0xFEE34BD5F5514DBB,
+            0x4D1664739B8F80D6, 0x8607459AB52A14AA, 0x0E78BC5A98529E49,
+            0xFE5332822AD13777, 0x556C27525E33D01A, 0x08643CA615F3149F,
+            0xD0771FAF3CB04714, 0x30E86F68A37B008D, 0x3074EBC0488A3ADF,
+            0x270645EA7A2790BC, 0x5601A0A8D3763C6A, 0x2F83071F53F325DD,
+            0xB9090F3D42D2D2EA];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac64_clone() {
+        let seed = [1,0,0,0, 0,0,0,0, 23,0,0,0, 0,0,0,0,
+                    200,1,0,0, 0,0,0,0, 210,30,0,0, 0,0,0,0];
+        let mut rng1 = Isaac64Rng::from_seed(seed);
+        let mut rng2 = rng1.clone();
+        for _ in 0..16 {
+            assert_eq!(rng1.next_u64(), rng2.next_u64());
+        }
+    }
+
+    #[test]
+    #[cfg(all(feature="serde1", feature="std"))]
+    fn test_isaac64_serde() {
+        use bincode;
+        use std::io::{BufWriter, BufReader};
+
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng = Isaac64Rng::from_seed(seed);
+
+        let buf: Vec<u8> = Vec::new();
+        let mut buf = BufWriter::new(buf);
+        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
+
+        let buf = buf.into_inner().unwrap();
+        let mut read = BufReader::new(&buf[..]);
+        let mut deserialized: Isaac64Rng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
+
+        for _ in 0..300 { // more than the 256 buffered results
+            assert_eq!(rng.next_u64(), deserialized.next_u64());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/isaac_array.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/isaac_array.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/isaac_array.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/isaac_array.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,137 @@
+// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! ISAAC helper functions for 256-element arrays.
+
+// Terrible workaround because arrays with more than 32 elements do not
+// implement `AsRef`, `Default`, `Serialize`, `Deserialize`, or any other
+// traits for that matter.
+
+#[cfg(feature="serde1")] use serde::{Serialize, Deserialize};
+
+const RAND_SIZE_LEN: usize = 8;
+const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
+
+
+#[derive(Copy, Clone)]
+#[allow(missing_debug_implementations)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct IsaacArray<T> {
+    #[cfg_attr(feature="serde1",serde(with="isaac_array_serde"))]
+    #[cfg_attr(feature="serde1", serde(bound(
+        serialize = "T: Serialize",
+        deserialize = "T: Deserialize<'de> + Copy + Default")))]
+    inner: [T; RAND_SIZE]
+}
+
+impl<T> ::core::convert::AsRef<[T]> for IsaacArray<T> {
+    #[inline(always)]
+    fn as_ref(&self) -> &[T] {
+        &self.inner[..]
+    }
+}
+
+impl<T> ::core::convert::AsMut<[T]> for IsaacArray<T> {
+    #[inline(always)]
+    fn as_mut(&mut self) -> &mut [T] {
+        &mut self.inner[..]
+    }
+}
+
+impl<T> ::core::ops::Deref for IsaacArray<T> {
+    type Target = [T; RAND_SIZE];
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<T> ::core::ops::DerefMut for IsaacArray<T> {
+    #[inline(always)]
+    fn deref_mut(&mut self) -> &mut [T; RAND_SIZE] {
+        &mut self.inner
+    }
+}
+
+impl<T> ::core::default::Default for IsaacArray<T> where T: Copy + Default {
+    fn default() -> IsaacArray<T> {
+        IsaacArray { inner: [T::default(); RAND_SIZE] }
+    }
+}
+
+
+#[cfg(feature="serde1")]
+pub(super) mod isaac_array_serde {
+    const RAND_SIZE_LEN: usize = 8;
+    const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
+
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+    use serde::de::{Visitor,SeqAccess};
+    use serde::de;
+
+    use core::fmt;
+
+    pub fn serialize<T, S>(arr: &[T;RAND_SIZE], ser: S) -> Result<S::Ok, S::Error>
+    where
+        T: Serialize,
+        S: Serializer
+    {
+        use serde::ser::SerializeTuple;
+
+        let mut seq = ser.serialize_tuple(RAND_SIZE)?;
+
+        for e in arr.iter() {
+            seq.serialize_element(&e)?;
+        }
+
+        seq.end()
+    }
+
+    #[inline]
+    pub fn deserialize<'de, T, D>(de: D) -> Result<[T;RAND_SIZE], D::Error>
+    where
+        T: Deserialize<'de>+Default+Copy,
+        D: Deserializer<'de>,
+    {
+        use core::marker::PhantomData;
+        struct ArrayVisitor<T> {
+            _pd: PhantomData<T>,
+        };
+        impl<'de,T> Visitor<'de> for ArrayVisitor<T>
+        where
+            T: Deserialize<'de>+Default+Copy
+        {
+            type Value = [T; RAND_SIZE];
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("Isaac state array")
+            }
+
+            #[inline]
+            fn visit_seq<A>(self, mut seq: A) -> Result<[T; RAND_SIZE], A::Error>
+            where
+                A: SeqAccess<'de>,
+            {
+                let mut out = [Default::default();RAND_SIZE];
+
+                for i in 0..RAND_SIZE {
+                    match seq.next_element()? {
+                        Some(val) => out[i] = val,
+                        None => return Err(de::Error::invalid_length(i, &self)),
+                    };
+                }
+
+                Ok(out)
+            }
+        }
+
+        de.deserialize_tuple(RAND_SIZE, ArrayVisitor{_pd: PhantomData})
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/isaac.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/isaac.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/isaac.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/isaac.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,494 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The ISAAC random number generator.
+
+use core::{fmt, slice};
+use core::num::Wrapping as w;
+use rand_core::{RngCore, SeedableRng, Error, le};
+use rand_core::block::{BlockRngCore, BlockRng};
+use prng::isaac_array::IsaacArray;
+
+#[allow(non_camel_case_types)]
+type w32 = w<u32>;
+
+const RAND_SIZE_LEN: usize = 8;
+const RAND_SIZE: usize = 1 << RAND_SIZE_LEN;
+
+/// A random number generator that uses the ISAAC algorithm.
+///
+/// ISAAC stands for "Indirection, Shift, Accumulate, Add, and Count" which are
+/// the principal bitwise operations employed. It is the most advanced of a
+/// series of array based random number generator designed by Robert Jenkins
+/// in 1996[^1][^2].
+///
+/// ISAAC is notably fast and produces excellent quality random numbers for
+/// non-cryptographic applications.
+///
+/// In spite of being designed with cryptographic security in mind, ISAAC hasn't
+/// been stringently cryptanalyzed and thus cryptographers do not not
+/// consensually trust it to be secure. When looking for a secure RNG, prefer
+/// [`Hc128Rng`] instead, which, like ISAAC, is an array-based RNG and one of
+/// the stream-ciphers selected the by eSTREAM contest.
+///
+/// In 2006 an improvement to ISAAC was suggested by Jean-Philippe Aumasson,
+/// named ISAAC+[^3]. But because the specification is not complete, because
+/// there is no good implementation, and because the suggested bias may not
+/// exist, it is not implemented here.
+///
+/// ## Overview of the ISAAC algorithm:
+/// (in pseudo-code)
+///
+/// ```text
+/// Input: a, b, c, s[256] // state
+/// Output: r[256]         // results
+///
+/// mix(a,i) = a ^ a << 13   if i = 0 mod 4
+///            a ^ a >>  6   if i = 1 mod 4
+///            a ^ a <<  2   if i = 2 mod 4
+///            a ^ a >> 16   if i = 3 mod 4
+///
+/// c = c + 1
+/// b = b + c
+///
+/// for i in 0..256 {
+///     x = s_[i]
+///     a = f(a,i) + s[i+128 mod 256]
+///     y = a + b + s[x>>2 mod 256]
+///     s[i] = y
+///     b = x + s[y>>10 mod 256]
+///     r[i] = b
+/// }
+/// ```
+///
+/// Numbers are generated in blocks of 256. This means the function above only
+/// runs once every 256 times you ask for a next random number. In all other
+/// circumstances the last element of the results array is returned.
+///
+/// ISAAC therefore needs a lot of memory, relative to other non-crypto RNGs.
+/// 2 * 256 * 4 = 2 kb to hold the state and results.
+///
+/// This implementation uses [`BlockRng`] to implement the [`RngCore`] methods.
+///
+/// ## References
+/// [^1]: Bob Jenkins, [*ISAAC: A fast cryptographic random number generator*](
+///       http://burtleburtle.net/bob/rand/isaacafa.html)
+///
+/// [^2]: Bob Jenkins, [*ISAAC and RC4*](
+///       http://burtleburtle.net/bob/rand/isaac.html)
+///
+/// [^3]: Jean-Philippe Aumasson, [*On the pseudo-random generator ISAAC*](
+///       https://eprint.iacr.org/2006/438)
+///
+/// [`Hc128Rng`]: ../hc128/struct.Hc128Rng.html
+/// [`BlockRng`]: ../../../rand_core/block/struct.BlockRng.html
+/// [`RngCore`]: ../../trait.RngCore.html
+#[derive(Clone, Debug)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct IsaacRng(BlockRng<IsaacCore>);
+
+impl RngCore for IsaacRng {
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl SeedableRng for IsaacRng {
+    type Seed = <IsaacCore as SeedableRng>::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        IsaacRng(BlockRng::<IsaacCore>::from_seed(seed))
+    }
+    
+    /// Create an ISAAC random number generator using an `u64` as seed.
+    /// If `seed == 0` this will produce the same stream of random numbers as
+    /// the reference implementation when used unseeded.
+    fn seed_from_u64(seed: u64) -> Self {
+        IsaacRng(BlockRng::<IsaacCore>::seed_from_u64(seed))
+    }
+
+    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
+        BlockRng::<IsaacCore>::from_rng(rng).map(|rng| IsaacRng(rng))
+    }
+}
+
+impl IsaacRng {
+    /// Create an ISAAC random number generator using the default
+    /// fixed seed.
+    ///
+    /// DEPRECATED. `IsaacRng::new_from_u64(0)` will produce identical results.
+    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
+    pub fn new_unseeded() -> Self {
+        Self::seed_from_u64(0)
+    }
+
+    /// Create an ISAAC random number generator using an `u64` as seed.
+    /// If `seed == 0` this will produce the same stream of random numbers as
+    /// the reference implementation when used unseeded.
+    #[deprecated(since="0.6.0", note="use SeedableRng::seed_from_u64 instead")]
+    pub fn new_from_u64(seed: u64) -> Self {
+        Self::seed_from_u64(seed)
+    }
+}
+
+/// The core of `IsaacRng`, used with `BlockRng`.
+#[derive(Clone)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct IsaacCore {
+    #[cfg_attr(feature="serde1",serde(with="super::isaac_array::isaac_array_serde"))]
+    mem: [w32; RAND_SIZE],
+    a: w32,
+    b: w32,
+    c: w32,
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for IsaacCore {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "IsaacCore {{}}")
+    }
+}
+
+impl BlockRngCore for IsaacCore {
+    type Item = u32;
+    type Results = IsaacArray<Self::Item>;
+
+    /// Refills the output buffer, `results`. See also the pseudocode desciption
+    /// of the algorithm in the [`IsaacRng`] documentation.
+    ///
+    /// Optimisations used (similar to the reference implementation):
+    /// 
+    /// - The loop is unrolled 4 times, once for every constant of mix().
+    /// - The contents of the main loop are moved to a function `rngstep`, to
+    ///   reduce code duplication.
+    /// - We use local variables for a and b, which helps with optimisations.
+    /// - We split the main loop in two, one that operates over 0..128 and one
+    ///   over 128..256. This way we can optimise out the addition and modulus
+    ///   from `s[i+128 mod 256]`.
+    /// - We maintain one index `i` and add `m` or `m2` as base (m2 for the
+    ///   `s[i+128 mod 256]`), relying on the optimizer to turn it into pointer
+    ///   arithmetic.
+    /// - We fill `results` backwards. The reference implementation reads values
+    ///   from `results` in reverse. We read them in the normal direction, to
+    ///   make `fill_bytes` a memcopy. To maintain compatibility we fill in
+    ///   reverse.
+    /// 
+    /// [`IsaacRng`]: struct.IsaacRng.html
+    fn generate(&mut self, results: &mut IsaacArray<Self::Item>) {
+        self.c += w(1);
+        // abbreviations
+        let mut a = self.a;
+        let mut b = self.b + self.c;
+        const MIDPOINT: usize = RAND_SIZE / 2;
+
+        #[inline]
+        fn ind(mem:&[w32; RAND_SIZE], v: w32, amount: usize) -> w32 {
+            let index = (v >> amount).0 as usize % RAND_SIZE;
+            mem[index]
+        }
+
+        #[inline]
+        fn rngstep(mem: &mut [w32; RAND_SIZE],
+                   results: &mut [u32; RAND_SIZE],
+                   mix: w32,
+                   a: &mut w32,
+                   b: &mut w32,
+                   base: usize,
+                   m: usize,
+                   m2: usize) {
+            let x = mem[base + m];
+            *a = mix + mem[base + m2];
+            let y = *a + *b + ind(&mem, x, 2);
+            mem[base + m] = y;
+            *b = x + ind(&mem, y, 2 + RAND_SIZE_LEN);
+            results[RAND_SIZE - 1 - base - m] = (*b).0;
+        }
+
+        let mut m = 0;
+        let mut m2 = MIDPOINT;
+        for i in (0..MIDPOINT/4).map(|i| i * 4) {
+            rngstep(&mut self.mem, results, a ^ (a << 13), &mut a, &mut b, i + 0, m, m2);
+            rngstep(&mut self.mem, results, a ^ (a >> 6 ),  &mut a, &mut b, i + 1, m, m2);
+            rngstep(&mut self.mem, results, a ^ (a << 2 ),  &mut a, &mut b, i + 2, m, m2);
+            rngstep(&mut self.mem, results, a ^ (a >> 16),  &mut a, &mut b, i + 3, m, m2);
+        }
+
+        m = MIDPOINT;
+        m2 = 0;
+        for i in (0..MIDPOINT/4).map(|i| i * 4) {
+            rngstep(&mut self.mem, results, a ^ (a << 13), &mut a, &mut b, i + 0, m, m2);
+            rngstep(&mut self.mem, results, a ^ (a >> 6 ),  &mut a, &mut b, i + 1, m, m2);
+            rngstep(&mut self.mem, results, a ^ (a << 2 ),  &mut a, &mut b, i + 2, m, m2);
+            rngstep(&mut self.mem, results, a ^ (a >> 16),  &mut a, &mut b, i + 3, m, m2);
+        }
+
+        self.a = a;
+        self.b = b;
+    }
+}
+
+impl IsaacCore {
+    /// Create a new ISAAC random number generator.
+    ///
+    /// The author Bob Jenkins describes how to best initialize ISAAC here:
+    /// <https://rt.cpan.org/Public/Bug/Display.html?id=64324>
+    /// The answer is included here just in case:
+    ///
+    /// "No, you don't need a full 8192 bits of seed data. Normal key sizes will
+    /// do fine, and they should have their expected strength (eg a 40-bit key
+    /// will take as much time to brute force as 40-bit keys usually will). You
+    /// could fill the remainder with 0, but set the last array element to the
+    /// length of the key provided (to distinguish keys that differ only by
+    /// different amounts of 0 padding). You do still need to call `randinit()`
+    /// to make sure the initial state isn't uniform-looking."
+    /// "After publishing ISAAC, I wanted to limit the key to half the size of
+    /// `r[]`, and repeat it twice. That would have made it hard to provide a
+    /// key that sets the whole internal state to anything convenient. But I'd
+    /// already published it."
+    ///
+    /// And his answer to the question "For my code, would repeating the key
+    /// over and over to fill 256 integers be a better solution than
+    /// zero-filling, or would they essentially be the same?":
+    /// "If the seed is under 32 bytes, they're essentially the same, otherwise
+    /// repeating the seed would be stronger. randinit() takes a chunk of 32
+    /// bytes, mixes it, and combines that with the next 32 bytes, et cetera.
+    /// Then loops over all the elements the same way a second time."
+    #[inline]
+    fn init(mut mem: [w32; RAND_SIZE], rounds: u32) -> Self {
+        fn mix(a: &mut w32, b: &mut w32, c: &mut w32, d: &mut w32,
+               e: &mut w32, f: &mut w32, g: &mut w32, h: &mut w32) {
+            *a ^= *b << 11; *d += *a; *b += *c;
+            *b ^= *c >> 2;  *e += *b; *c += *d;
+            *c ^= *d << 8;  *f += *c; *d += *e;
+            *d ^= *e >> 16; *g += *d; *e += *f;
+            *e ^= *f << 10; *h += *e; *f += *g;
+            *f ^= *g >> 4;  *a += *f; *g += *h;
+            *g ^= *h << 8;  *b += *g; *h += *a;
+            *h ^= *a >> 9;  *c += *h; *a += *b;
+        }
+
+        // These numbers are the result of initializing a...h with the
+        // fractional part of the golden ratio in binary (0x9e3779b9)
+        // and applying mix() 4 times.
+        let mut a = w(0x1367df5a);
+        let mut b = w(0x95d90059);
+        let mut c = w(0xc3163e4b);
+        let mut d = w(0x0f421ad8);
+        let mut e = w(0xd92a4a78);
+        let mut f = w(0xa51a3c49);
+        let mut g = w(0xc4efea1b);
+        let mut h = w(0x30609119);
+
+        // Normally this should do two passes, to make all of the seed effect
+        // all of `mem`
+        for _ in 0..rounds {
+            for i in (0..RAND_SIZE/8).map(|i| i * 8) {
+                a += mem[i  ]; b += mem[i+1];
+                c += mem[i+2]; d += mem[i+3];
+                e += mem[i+4]; f += mem[i+5];
+                g += mem[i+6]; h += mem[i+7];
+                mix(&mut a, &mut b, &mut c, &mut d,
+                    &mut e, &mut f, &mut g, &mut h);
+                mem[i  ] = a; mem[i+1] = b;
+                mem[i+2] = c; mem[i+3] = d;
+                mem[i+4] = e; mem[i+5] = f;
+                mem[i+6] = g; mem[i+7] = h;
+            }
+        }
+
+        Self { mem, a: w(0), b: w(0), c: w(0) }
+    }
+}
+
+impl SeedableRng for IsaacCore {
+    type Seed = [u8; 32];
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        let mut seed_u32 = [0u32; 8];
+        le::read_u32_into(&seed, &mut seed_u32);
+        // Convert the seed to `Wrapping<u32>` and zero-extend to `RAND_SIZE`.
+        let mut seed_extended = [w(0); RAND_SIZE];
+        for (x, y) in seed_extended.iter_mut().zip(seed_u32.iter()) {
+            *x = w(*y);
+        }
+        Self::init(seed_extended, 2)
+    }
+    
+    /// Create an ISAAC random number generator using an `u64` as seed.
+    /// If `seed == 0` this will produce the same stream of random numbers as
+    /// the reference implementation when used unseeded.
+    fn seed_from_u64(seed: u64) -> Self {
+        let mut key = [w(0); RAND_SIZE];
+        key[0] = w(seed as u32);
+        key[1] = w((seed >> 32) as u32);
+        // Initialize with only one pass.
+        // A second pass does not improve the quality here, because all of the
+        // seed was already available in the first round.
+        // Not doing the second pass has the small advantage that if
+        // `seed == 0` this method produces exactly the same state as the
+        // reference implementation when used unseeded.
+        Self::init(key, 1)
+    }
+
+    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
+        // Custom `from_rng` implementation that fills a seed with the same size
+        // as the entire state.
+        let mut seed = [w(0u32); RAND_SIZE];
+        unsafe {
+            let ptr = seed.as_mut_ptr() as *mut u8;
+
+            let slice = slice::from_raw_parts_mut(ptr, RAND_SIZE * 4);
+            rng.try_fill_bytes(slice)?;
+        }
+        for i in seed.iter_mut() {
+            *i = w(i.0.to_le());
+        }
+
+        Ok(Self::init(seed, 2))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use {RngCore, SeedableRng};
+    use super::IsaacRng;
+
+    #[test]
+    fn test_isaac_construction() {
+        // Test that various construction techniques produce a working RNG.
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng1 = IsaacRng::from_seed(seed);
+        assert_eq!(rng1.next_u32(), 2869442790);
+
+        let mut rng2 = IsaacRng::from_rng(rng1).unwrap();
+        assert_eq!(rng2.next_u32(), 3094074039);
+    }
+
+    #[test]
+    fn test_isaac_true_values_32() {
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng1 = IsaacRng::from_seed(seed);
+        let mut results = [0u32; 10];
+        for i in results.iter_mut() { *i = rng1.next_u32(); }
+        let expected = [
+            2558573138, 873787463, 263499565, 2103644246, 3595684709,
+            4203127393, 264982119, 2765226902, 2737944514, 3900253796];
+        assert_eq!(results, expected);
+
+        let seed = [57,48,0,0, 50,9,1,0, 49,212,0,0, 148,38,0,0,
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng2 = IsaacRng::from_seed(seed);
+        // skip forward to the 10000th number
+        for _ in 0..10000 { rng2.next_u32(); }
+
+        for i in results.iter_mut() { *i = rng2.next_u32(); }
+        let expected = [
+            3676831399, 3183332890, 2834741178, 3854698763, 2717568474,
+            1576568959, 3507990155, 179069555, 141456972, 2478885421];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac_true_values_64() {
+        // As above, using little-endian versions of above values
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                    57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng = IsaacRng::from_seed(seed);
+        let mut results = [0u64; 5];
+        for i in results.iter_mut() { *i = rng.next_u64(); }
+        let expected = [
+            3752888579798383186, 9035083239252078381,18052294697452424037,
+            11876559110374379111, 16751462502657800130];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac_true_bytes() {
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng = IsaacRng::from_seed(seed);
+        let mut results = [0u8; 32];
+        rng.fill_bytes(&mut results);
+        // Same as first values in test_isaac_true_values as bytes in LE order
+        let expected = [82, 186, 128, 152, 71, 240, 20, 52,
+                        45, 175, 180, 15, 86, 16, 99, 125,
+                        101, 203, 81, 214, 97, 162, 134, 250,
+                        103, 78, 203, 15, 150, 3, 210, 164];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac_new_uninitialized() {
+        // Compare the results from initializing `IsaacRng` with
+        // `seed_from_u64(0)`, to make sure it is the same as the reference
+        // implementation when used uninitialized.
+        // Note: We only test the first 16 integers, not the full 256 of the
+        // first block.
+        let mut rng = IsaacRng::seed_from_u64(0);
+        let mut results = [0u32; 16];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected: [u32; 16] = [
+            0x71D71FD2, 0xB54ADAE7, 0xD4788559, 0xC36129FA,
+            0x21DC1EA9, 0x3CB879CA, 0xD83B237F, 0xFA3CE5BD,
+            0x8D048509, 0xD82E9489, 0xDB452848, 0xCA20E846,
+            0x500F972E, 0x0EEFF940, 0x00D6B993, 0xBC12C17F];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_isaac_clone() {
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng1 = IsaacRng::from_seed(seed);
+        let mut rng2 = rng1.clone();
+        for _ in 0..16 {
+            assert_eq!(rng1.next_u32(), rng2.next_u32());
+        }
+    }
+
+    #[test]
+    #[cfg(all(feature="serde1", feature="std"))]
+    fn test_isaac_serde() {
+        use bincode;
+        use std::io::{BufWriter, BufReader};
+
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                     57,48,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng = IsaacRng::from_seed(seed);
+
+        let buf: Vec<u8> = Vec::new();
+        let mut buf = BufWriter::new(buf);
+        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
+
+        let buf = buf.into_inner().unwrap();
+        let mut read = BufReader::new(&buf[..]);
+        let mut deserialized: IsaacRng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
+
+        for _ in 0..300 { // more than the 256 buffered results
+            assert_eq!(rng.next_u32(), deserialized.next_u32());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/mod.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,330 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Pseudo-random number generators.
+//!
+//! Pseudo-random number generators are algorithms to produce apparently random
+//! numbers deterministically, and usually fairly quickly. See the documentation
+//! of the [`rngs` module] for some introduction to PRNGs.
+//!
+//! As mentioned there, PRNGs fall in two broad categories:
+//!
+//! - [basic PRNGs], primarily designed for simulations
+//! - [CSPRNGs], primarily designed for cryptography
+//!
+//! In simple terms, the basic PRNGs are often predictable; CSPRNGs should not
+//! be predictable *when used correctly*.
+//! 
+//! Contents of this documentation:
+//!
+//! 1. [The generators](#the-generators)
+//! 1. [Performance and size](#performance)
+//! 1. [Quality and cycle length](#quality)
+//! 1. [Security](#security)
+//! 1. [Extra features](#extra-features)
+//! 1. [Further reading](#further-reading)
+//!
+//!
+//! # The generators
+//!
+//! ## Basic pseudo-random number generators (PRNGs)
+//!
+//! The goal of regular, non-cryptographic PRNGs is usually to find a good
+//! balance between simplicity, quality, memory usage and performance. These
+//! algorithms are very important to Monte Carlo simulations, and also suitable
+//! for several other problems such as randomized algorithms and games (except
+//! where there is a risk of players predicting the next output value from
+//! previous values, in which case a CSPRNG should be used).
+//!
+//! Currently Rand provides only one PRNG, and not a very good one at that:
+//!
+//! | name | full name | performance | memory | quality | period | features |
+//! |------|-----------|-------------|--------|---------|--------|----------|
+//! | [`XorShiftRng`] | Xorshift 32/128 | ★★★☆☆ | 16 bytes | ★☆☆☆☆ | `u32` * 2<sup>128</sup> - 1 | — |
+//!
+// Quality stars [not rendered in documentation]:
+// 5. reserved for crypto-level (e.g. ChaCha8, ISAAC)
+// 4. good performance on TestU01 and PractRand, good theory
+//    (e.g. PCG, truncated Xorshift*)
+// 3. good performance on TestU01 and PractRand, but "falling through the
+//    cracks" or insufficient theory (e.g. SFC, Xoshiro)
+// 2. imperfect performance on tests or other limiting properties, but not
+//    terrible (e.g. Xoroshiro128+)
+// 1. clear deficiencies in test results, cycle length, theory, or other
+//    properties (e.g. Xorshift)
+//
+// Performance stars [not rendered in documentation]:
+// Meant to give an indication of relative performance. Roughly follows a log
+// scale, based on the performance of `next_u64` on a current i5/i7:
+// - 5. 8000 MB/s+
+// - 4. 4000 MB/s+
+// - 3. 2000 MB/s+
+// - 2. 1000 MB/s+
+// - 1. < 1000 MB/s
+//
+//! ## Cryptographically secure pseudo-random number generators (CSPRNGs)
+//!
+//! CSPRNGs have much higher requirements than basic PRNGs. The primary
+//! consideration is security. Performance and simplicity are also important,
+//! but in general CSPRNGs are more complex and slower than regular PRNGs.
+//! Quality is no longer a concern, as it is a requirement for a
+//! CSPRNG that the output is basically indistinguishable from true randomness
+//! since any bias or correlation makes the output more predictable.
+//!
+//! There is a close relationship between CSPRNGs and cryptographic ciphers.
+//! Any block cipher can be turned into a CSPRNG by encrypting a counter. Stream
+//! ciphers are basically a CSPRNG and a combining operation, usually XOR. This
+//! means that we can easily use any stream cipher as a CSPRNG.
+//!
+//! Rand currently provides two trustworthy CSPRNGs and two CSPRNG-like PRNGs:
+//!
+//! | name | full name |  performance | initialization | memory | predictability | forward secrecy |
+//! |------|-----------|--------------|--------------|----------|----------------|-------------------------|
+//! | [`ChaChaRng`] | ChaCha20 | ★☆☆☆☆ | fast | 136 bytes | secure | no |
+//! | [`Hc128Rng`] | HC-128 | ★★☆☆☆ | slow | 4176 bytes | secure | no |
+//! | [`IsaacRng`] | ISAAC | ★★☆☆☆ | slow | 2072 bytes | unknown | unknown |
+//! | [`Isaac64Rng`] | ISAAC-64 | ★★☆☆☆ | slow | 4136 bytes| unknown | unknown |
+//!
+//! It should be noted that the ISAAC generators are only included for
+//! historical reasons, they have been with the Rust language since the very
+//! beginning. They have good quality output and no attacks are known, but have
+//! received little attention from cryptography experts.
+//!
+//!
+//! # Performance
+//!
+//! First it has to be said most PRNGs are very fast, and will rarely be a
+//! performance bottleneck.
+//!
+//! Performance of basic PRNGs is a bit of a subtle thing. It depends a lot on
+//! the CPU architecture (32 vs. 64 bits), inlining, and also on the number of
+//! available registers. This often causes the performance to be affected by
+//! surrounding code due to inlining and other usage of registers.
+//!
+//! When choosing a PRNG for performance it is important to benchmark your own
+//! application due to interactions between PRNGs and surrounding code and
+//! dependence on the CPU architecture as well as the impact of the size of
+//! data requested. Because of all this, we do not include performance numbers
+//! here but merely a qualitative rating.
+//!
+//! CSPRNGs are a little different in that they typically generate a block of
+//! output in a cache, and pull outputs from the cache. This allows them to have
+//! good amortised performance, and reduces or completely removes the influence
+//! of surrounding code on the CSPRNG performance.
+//!
+//! ### Worst-case performance
+//! Because CSPRNGs usually produce a block of values into a cache, they have
+//! poor worst case performance (in contrast to basic PRNGs, where the
+//! performance is usually quite regular).
+//!
+//! ## State size
+//!
+//! Simple PRNGs often use very little memory, commonly only a few words, where
+//! a *word* is usually either `u32` or `u64`. This is not true for all
+//! non-cryptographic PRNGs however, for example the historically popular
+//! Mersenne Twister MT19937 algorithm requires 2.5 kB of state.
+//!
+//! CSPRNGs typically require more memory; since the seed size is recommended
+//! to be at least 192 bits and some more may be required for the algorithm,
+//! 256 bits would be approximately the minimum secure size. In practice,
+//! CSPRNGs tend to use quite a bit more, [`ChaChaRng`] is relatively small with
+//! 136 bytes of state.
+//! 
+//! ## Initialization time
+//!
+//! The time required to initialize new generators varies significantly. Many
+//! simple PRNGs and even some cryptographic ones (including [`ChaChaRng`])
+//! only need to copy the seed value and some constants into their state, and
+//! thus can be constructed very quickly. In contrast, CSPRNGs with large state
+//! require an expensive key-expansion.
+//!
+//! # Quality
+//!
+//! Many basic PRNGs are not much more than a couple of bitwise and arithmetic
+//! operations. Their simplicity gives good performance, but also means there
+//! are small regularities hidden in the generated random number stream.
+//!
+//! How much do those hidden regularities matter? That is hard to say, and
+//! depends on how the RNG gets used. If there happen to be correlations between
+//! the random numbers and the algorithm they are used in, the results can be
+//! wrong or misleading.
+//!
+//! A random number generator can be considered good if it gives the correct
+//! results in as many applications as possible. The quality of PRNG
+//! algorithms can be evaluated to some extend analytically, to determine the
+//! cycle length and to rule out some correlations. Then there are empirical
+//! test suites designed to test how well a PRNG performs on a wide range of
+//! possible uses, the latest and most complete of which are [TestU01] and
+//! [PractRand].
+//!
+//! CSPRNGs tend to be more complex, and have an explicit requirement to be
+//! unpredictable. This implies there must be no obvious correlations between
+//! output values.
+//!
+//! ### Quality stars:
+//! PRNGs with 3 stars or more should be good enough for any purpose.
+//! 1 or 2 stars may be good enough for typical apps and games, but do not work
+//! well with all algorithms.
+//!
+//! ## Period
+//!
+//! The *period* or *cycle length* of a PRNG is the number of values that can be
+//! generated after which it starts repeating the same random number stream.
+//! Many PRNGs have a fixed-size period, but for some only an expected average
+//! cycle length can be given, where the exact length depends on the seed.
+//!
+//! On today's hardware, even a fast RNG with a cycle length of *only*
+//! 2<sup>64</sup> can be used for centuries before cycling. Yet we recommend a
+//! period of 2<sup>128</sup> or more, which most modern PRNGs satisfy.
+//! Alternatively a PRNG with shorter period but support for multiple streams
+//! may be chosen. There are two reasons for this, as follows.
+//!
+//! If we see the entire period of an RNG as one long random number stream,
+//! every independently seeded RNG returns a slice of that stream. When multiple
+//! RNG are seeded randomly, there is an increasingly large chance to end up
+//! with a partially overlapping slice of the stream.
+//!
+//! If the period of the RNG is 2<sup>128</sup>, and an application consumes
+//! 2<sup>48</sup> values, it then takes about 2<sup>32</sup> random
+//! initializations to have a chance of 1 in a million to repeat part of an
+//! already used stream. This seems good enough for common usage of
+//! non-cryptographic generators, hence the recommendation of at least
+//! 2<sup>128</sup>. As an estimate, the chance of any overlap in a period of
+//! size `p` with `n` independent seeds and `u` values used per seed is
+//! approximately `1 - e^(-u * n^2 / (2 * p))`.
+//!
+//! Further, it is not recommended to use the full period of an RNG. Many
+//! PRNGs have a property called *k-dimensional equidistribution*, meaning that
+//! for values of some size (potentially larger than the output size), all
+//! possible values are produced the same number of times over the generator's
+//! period. This is not a property of true randomness. This is known as the
+//! generalized birthday problem, see the [PCG paper] for a good explanation.
+//! This results in a noticable bias on output after generating more values
+//! than the square root of the period (after 2<sup>64</sup> values for a
+//! period of 2<sup>128</sup>).
+//!
+//!
+//! # Security
+//!
+//! ## Predictability
+//!
+//! From the context of any PRNG, one can ask the question *given some previous
+//! output from the PRNG, is it possible to predict the next output value?*
+//! This is an important property in any situation where there might be an
+//! adversary.
+//!
+//! Regular PRNGs tend to be predictable, although with varying difficulty. In
+//! some cases prediction is trivial, for example plain Xorshift outputs part of
+//! its state without mutation, and prediction is as simple as seeding a new
+//! Xorshift generator from four `u32` outputs. Other generators, like
+//! [PCG](http://www.pcg-random.org/predictability.html) and truncated Xorshift*
+//! are harder to predict, but not outside the realm of common mathematics and a
+//! desktop PC.
+//!
+//! The basic security that CSPRNGs must provide is the infeasibility to predict
+//! output. This requirement is formalized as the [next-bit test]; this is
+//! roughly stated as: given the first *k* bits of a random sequence, the
+//! sequence satisfies the next-bit test if there is no algorithm able to
+//! predict the next bit using reasonable computing power.
+//!
+//! A further security that *some* CSPRNGs provide is forward secrecy:
+//! in the event that the CSPRNGs state is revealed at some point, it must be
+//! infeasible to reconstruct previous states or output. Note that many CSPRNGs
+//! *do not* have forward secrecy in their usual formulations.
+//!
+//! As an outsider it is hard to get a good idea about the security of an
+//! algorithm. People in the field of cryptography spend a lot of effort
+//! analyzing existing designs, and what was once considered good may now turn
+//! out to be weaker. Generally it is best to use algorithms well-analyzed by
+//! experts, such as those recommended by NIST or ECRYPT.
+//!
+//! ## State and seeding
+//!
+//! It is worth noting that a CSPRNG's security relies absolutely on being
+//! seeded with a secure random key. Should the key be known or guessable, all
+//! output of the CSPRNG is easy to guess. This implies that the seed should
+//! come from a trusted source; usually either the OS or another CSPRNG. Our
+//! seeding helper trait, [`FromEntropy`], and the source it uses
+//! ([`EntropyRng`]), should be secure. Additionally, [`ThreadRng`] is a CSPRNG,
+//! thus it is acceptable to seed from this (although for security applications
+//! fresh/external entropy should be preferred).
+//!
+//! Further, it should be obvious that the internal state of a CSPRNG must be
+//! kept secret. With that in mind, our implementations do not provide direct
+//! access to most of their internal state, and `Debug` implementations do not
+//! print any internal state. This does not fully protect CSPRNG state; code
+//! within the same process may read this memory (and we allow cloning and
+//! serialisation of CSPRNGs for convenience). Further, a running process may be
+//! forked by the operating system, which may leave both processes with a copy
+//! of the same generator.
+//!
+//! ## Not a crypto library
+//!
+//! It should be emphasised that this is not a cryptography library; although
+//! Rand does take some measures to provide secure random numbers, it does not
+//! necessarily take all recommended measures. Further, cryptographic processes
+//! such as encryption and authentication are complex and must be implemented
+//! very carefully to avoid flaws and resist known attacks. It is therefore
+//! recommended to use specialized libraries where possible, for example
+//! [openssl], [ring] and the [RustCrypto libraries].
+//!
+//!
+//! # Extra features
+//!
+//! Some PRNGs may provide extra features, like:
+//!
+//! - Support for multiple streams, which can help with parallel tasks.
+//! - The ability to jump or seek around in the random number stream;
+//!   with large periood this can be used as an alternative to streams.
+//!
+//!
+//! # Further reading
+//!
+//! There is quite a lot that can be said about PRNGs. The [PCG paper] is a
+//! very approachable explaining more concepts.
+//!
+//! A good paper about RNG quality is
+//! ["Good random number generators are (not so) easy to find"](
+//! http://random.mat.sbg.ac.at/results/peter/A19final.pdf) by P. Hellekalek.
+//!
+//!
+//! [`rngs` module]: ../rngs/index.html
+//! [basic PRNGs]: #basic-pseudo-random-number-generators-prngs
+//! [CSPRNGs]: #cryptographically-secure-pseudo-random-number-generators-csprngs
+//! [`XorShiftRng`]: struct.XorShiftRng.html
+//! [`ChaChaRng`]: chacha/struct.ChaChaRng.html
+//! [`Hc128Rng`]: hc128/struct.Hc128Rng.html
+//! [`IsaacRng`]: isaac/struct.IsaacRng.html
+//! [`Isaac64Rng`]: isaac64/struct.Isaac64Rng.html
+//! [`ThreadRng`]: ../rngs/struct.ThreadRng.html
+//! [`FromEntropy`]: ../trait.FromEntropy.html
+//! [`EntropyRng`]: ../rngs/struct.EntropyRng.html
+//! [TestU01]: http://simul.iro.umontreal.ca/testu01/tu01.html
+//! [PractRand]: http://pracrand.sourceforge.net/
+//! [PCG paper]: http://www.pcg-random.org/pdf/hmc-cs-2014-0905.pdf
+//! [openssl]: https://crates.io/crates/openssl
+//! [ring]: https://crates.io/crates/ring
+//! [RustCrypto libraries]: https://github.com/RustCrypto
+//! [next-bit test]: https://en.wikipedia.org/wiki/Next-bit_test
+
+
+pub mod chacha;
+pub mod hc128;
+pub mod isaac;
+pub mod isaac64;
+mod xorshift;
+
+mod isaac_array;
+
+pub use self::chacha::ChaChaRng;
+pub use self::hc128::Hc128Rng;
+pub use self::isaac::IsaacRng;
+pub use self::isaac64::Isaac64Rng;
+pub use self::xorshift::XorShiftRng;
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/prng/xorshift.rs cargo-0.33.0/vendor/rand-0.5.6/src/prng/xorshift.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/prng/xorshift.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/prng/xorshift.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,225 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Xorshift generators
+
+use core::num::Wrapping as w;
+use core::{fmt, slice};
+use rand_core::{RngCore, SeedableRng, Error, impls, le};
+
+/// An Xorshift random number generator.
+///
+/// The Xorshift[^1] algorithm is not suitable for cryptographic purposes
+/// but is very fast. If you do not know for sure that it fits your
+/// requirements, use a more secure one such as `IsaacRng` or `OsRng`.
+///
+/// [^1]: Marsaglia, George (July 2003).
+///       ["Xorshift RNGs"](https://www.jstatsoft.org/v08/i14/paper).
+///       *Journal of Statistical Software*. Vol. 8 (Issue 14).
+#[derive(Clone)]
+#[cfg_attr(feature="serde1", derive(Serialize,Deserialize))]
+pub struct XorShiftRng {
+    x: w<u32>,
+    y: w<u32>,
+    z: w<u32>,
+    w: w<u32>,
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for XorShiftRng {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "XorShiftRng {{}}")
+    }
+}
+
+impl XorShiftRng {
+    /// Creates a new XorShiftRng instance which is not seeded.
+    ///
+    /// The initial values of this RNG are constants, so all generators created
+    /// by this function will yield the same stream of random numbers. It is
+    /// highly recommended that this is created through `SeedableRng` instead of
+    /// this function
+    #[deprecated(since="0.5.0", note="use the FromEntropy or SeedableRng trait")]
+    pub fn new_unseeded() -> XorShiftRng {
+        XorShiftRng {
+            x: w(0x193a6754),
+            y: w(0xa8a7d469),
+            z: w(0x97830e05),
+            w: w(0x113ba7bb),
+        }
+    }
+}
+
+impl RngCore for XorShiftRng {
+    #[inline]
+    fn next_u32(&mut self) -> u32 {
+        let x = self.x;
+        let t = x ^ (x << 11);
+        self.x = self.y;
+        self.y = self.z;
+        self.z = self.w;
+        let w_ = self.w;
+        self.w = w_ ^ (w_ >> 19) ^ (t ^ (t >> 8));
+        self.w.0
+    }
+
+    #[inline]
+    fn next_u64(&mut self) -> u64 {
+        impls::next_u64_via_u32(self)
+    }
+
+    #[inline]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        impls::fill_bytes_via_next(self, dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        Ok(self.fill_bytes(dest))
+    }
+}
+
+impl SeedableRng for XorShiftRng {
+    type Seed = [u8; 16];
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        let mut seed_u32 = [0u32; 4];
+        le::read_u32_into(&seed, &mut seed_u32);
+
+        // Xorshift cannot be seeded with 0 and we cannot return an Error, but
+        // also do not wish to panic (because a random seed can legitimately be
+        // 0); our only option is therefore to use a preset value.
+        if seed_u32.iter().all(|&x| x == 0) {
+            seed_u32 = [0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED];
+        }
+
+        XorShiftRng {
+            x: w(seed_u32[0]),
+            y: w(seed_u32[1]),
+            z: w(seed_u32[2]),
+            w: w(seed_u32[3]),
+        }
+    }
+
+    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
+        let mut seed_u32 = [0u32; 4];
+        loop {
+            unsafe {
+                let ptr = seed_u32.as_mut_ptr() as *mut u8;
+
+                let slice = slice::from_raw_parts_mut(ptr, 4 * 4);
+                rng.try_fill_bytes(slice)?;
+            }
+            if !seed_u32.iter().all(|&x| x == 0) { break; }
+        }
+
+        Ok(XorShiftRng {
+            x: w(seed_u32[0]),
+            y: w(seed_u32[1]),
+            z: w(seed_u32[2]),
+            w: w(seed_u32[3]),
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use {RngCore, SeedableRng};
+    use super::XorShiftRng;
+
+    #[test]
+    fn test_xorshift_construction() {
+        // Test that various construction techniques produce a working RNG.
+        let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
+        let mut rng1 = XorShiftRng::from_seed(seed);
+        assert_eq!(rng1.next_u64(), 4325440999699518727);
+
+        let _rng2 = XorShiftRng::from_rng(rng1).unwrap();
+        // Note: we cannot test the state of _rng2 because from_rng does not
+        // fix Endianness. This is allowed in the trait specification.
+    }
+
+    #[test]
+    fn test_xorshift_true_values() {
+        let seed = [16,15,14,13, 12,11,10,9, 8,7,6,5, 4,3,2,1];
+        let mut rng = XorShiftRng::from_seed(seed);
+
+        let mut results = [0u32; 9];
+        for i in results.iter_mut() { *i = rng.next_u32(); }
+        let expected: [u32; 9] = [
+            2081028795, 620940381, 269070770, 16943764, 854422573, 29242889,
+            1550291885, 1227154591, 271695242];
+        assert_eq!(results, expected);
+
+        let mut results = [0u64; 9];
+        for i in results.iter_mut() { *i = rng.next_u64(); }
+        let expected: [u64; 9] = [
+            9247529084182843387, 8321512596129439293, 14104136531997710878,
+            6848554330849612046, 343577296533772213, 17828467390962600268,
+            9847333257685787782, 7717352744383350108, 1133407547287910111];
+        assert_eq!(results, expected);
+
+        let mut results = [0u8; 32];
+        rng.fill_bytes(&mut results);
+        let expected = [102, 57, 212, 16, 233, 130, 49, 183,
+                        158, 187, 44, 203, 63, 149, 45, 17,
+                        117, 129, 131, 160, 70, 121, 158, 155,
+                        224, 209, 192, 53, 10, 62, 57, 72];
+        assert_eq!(results, expected);
+    }
+
+    #[test]
+    fn test_xorshift_zero_seed() {
+        // Xorshift does not work with an all zero seed.
+        // Assert it does not panic.
+        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng = XorShiftRng::from_seed(seed);
+        let a = rng.next_u64();
+        let b = rng.next_u64();
+        assert!(a != 0);
+        assert!(b != a);
+    }
+
+    #[test]
+    fn test_xorshift_clone() {
+        let seed = [1,2,3,4, 5,5,7,8, 8,7,6,5, 4,3,2,1];
+        let mut rng1 = XorShiftRng::from_seed(seed);
+        let mut rng2 = rng1.clone();
+        for _ in 0..16 {
+            assert_eq!(rng1.next_u64(), rng2.next_u64());
+        }
+    }
+
+    #[cfg(all(feature="serde1", feature="std"))]
+    #[test]
+    fn test_xorshift_serde() {
+        use bincode;
+        use std::io::{BufWriter, BufReader};
+
+        let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
+        let mut rng = XorShiftRng::from_seed(seed);
+
+        let buf: Vec<u8> = Vec::new();
+        let mut buf = BufWriter::new(buf);
+        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
+
+        let buf = buf.into_inner().unwrap();
+        let mut read = BufReader::new(&buf[..]);
+        let mut deserialized: XorShiftRng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
+
+        assert_eq!(rng.x, deserialized.x);
+        assert_eq!(rng.y, deserialized.y);
+        assert_eq!(rng.z, deserialized.z);
+        assert_eq!(rng.w, deserialized.w);
+
+        for _ in 0..16 {
+            assert_eq!(rng.next_u64(), deserialized.next_u64());
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/adapter/mod.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/adapter/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/adapter/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/adapter/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,17 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Wrappers / adapters forming RNGs
+
+#[cfg(feature="std")] #[doc(hidden)] pub mod read;
+mod reseeding;
+
+#[cfg(feature="std")] pub use self::read::ReadRng;
+pub use self::reseeding::ReseedingRng;
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/adapter/read.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/adapter/read.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/adapter/read.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/adapter/read.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,137 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! A wrapper around any Read to treat it as an RNG.
+
+use std::io::Read;
+
+use rand_core::{RngCore, Error, ErrorKind, impls};
+
+
+/// An RNG that reads random bytes straight from any type supporting
+/// `std::io::Read`, for example files.
+///
+/// This will work best with an infinite reader, but that is not required.
+///
+/// This can be used with `/dev/urandom` on Unix but it is recommended to use
+/// [`OsRng`] instead.
+///
+/// # Panics
+///
+/// `ReadRng` uses `std::io::read_exact`, which retries on interrupts. All other
+/// errors from the underlying reader, including when it does not have enough
+/// data, will only be reported through [`try_fill_bytes`]. The other
+/// [`RngCore`] methods will panic in case of an error.
+///
+/// # Example
+///
+/// ```
+/// use rand::{read, Rng};
+///
+/// let data = vec![1, 2, 3, 4, 5, 6, 7, 8];
+/// let mut rng = read::ReadRng::new(&data[..]);
+/// println!("{:x}", rng.gen::<u32>());
+/// ```
+///
+/// [`OsRng`]: ../struct.OsRng.html
+/// [`RngCore`]: ../../trait.RngCore.html
+/// [`try_fill_bytes`]: ../../trait.RngCore.html#method.tymethod.try_fill_bytes
+#[derive(Debug)]
+pub struct ReadRng<R> {
+    reader: R
+}
+
+impl<R: Read> ReadRng<R> {
+    /// Create a new `ReadRng` from a `Read`.
+    pub fn new(r: R) -> ReadRng<R> {
+        ReadRng {
+            reader: r
+        }
+    }
+}
+
+impl<R: Read> RngCore for ReadRng<R> {
+    fn next_u32(&mut self) -> u32 {
+        impls::next_u32_via_fill(self)
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        impls::next_u64_via_fill(self)
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.try_fill_bytes(dest).unwrap_or_else(|err|
+                panic!("reading random bytes from Read implementation failed; error: {}", err));
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        if dest.len() == 0 { return Ok(()); }
+        // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
+        self.reader.read_exact(dest).map_err(|err| {
+            match err.kind() {
+                ::std::io::ErrorKind::UnexpectedEof => Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "not enough bytes available, reached end of source", err),
+                _ => Error::with_cause(ErrorKind::Unavailable,
+                    "error reading from Read source", err)
+            }
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::ReadRng;
+    use {RngCore, ErrorKind};
+
+    #[test]
+    fn test_reader_rng_u64() {
+        // transmute from the target to avoid endianness concerns.
+        let v = vec![0u8, 0, 0, 0, 0, 0, 0, 1,
+                     0  , 0, 0, 0, 0, 0, 0, 2,
+                     0,   0, 0, 0, 0, 0, 0, 3];
+        let mut rng = ReadRng::new(&v[..]);
+
+        assert_eq!(rng.next_u64(), 1_u64.to_be());
+        assert_eq!(rng.next_u64(), 2_u64.to_be());
+        assert_eq!(rng.next_u64(), 3_u64.to_be());
+    }
+
+    #[test]
+    fn test_reader_rng_u32() {
+        let v = vec![0u8, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3];
+        let mut rng = ReadRng::new(&v[..]);
+
+        assert_eq!(rng.next_u32(), 1_u32.to_be());
+        assert_eq!(rng.next_u32(), 2_u32.to_be());
+        assert_eq!(rng.next_u32(), 3_u32.to_be());
+    }
+
+    #[test]
+    fn test_reader_rng_fill_bytes() {
+        let v = [1u8, 2, 3, 4, 5, 6, 7, 8];
+        let mut w = [0u8; 8];
+
+        let mut rng = ReadRng::new(&v[..]);
+        rng.fill_bytes(&mut w);
+
+        assert!(v == w);
+    }
+
+    #[test]
+    fn test_reader_rng_insufficient_bytes() {
+        let v = [1u8, 2, 3, 4, 5, 6, 7, 8];
+        let mut w = [0u8; 9];
+
+        let mut rng = ReadRng::new(&v[..]);
+
+        assert!(rng.try_fill_bytes(&mut w).err().unwrap().kind == ErrorKind::Unavailable);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/adapter/reseeding.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/adapter/reseeding.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/adapter/reseeding.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/adapter/reseeding.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,260 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! A wrapper around another PRNG that reseeds it after it
+//! generates a certain number of random bytes.
+
+use core::mem::size_of;
+
+use rand_core::{RngCore, CryptoRng, SeedableRng, Error, ErrorKind};
+use rand_core::block::{BlockRngCore, BlockRng};
+
+/// A wrapper around any PRNG which reseeds the underlying PRNG after it has
+/// generated a certain number of random bytes.
+///
+/// When the RNG gets cloned, the clone is reseeded on first use.
+///
+/// Reseeding is never strictly *necessary*. Cryptographic PRNGs don't have a
+/// limited number of bytes they can output, or at least not a limit reachable
+/// in any practical way. There is no such thing as 'running out of entropy'.
+///
+/// Some small non-cryptographic PRNGs can have very small periods, for
+/// example less than 2<sup>64</sup>. Would reseeding help to ensure that you do
+/// not wrap around at the end of the period? A period of 2<sup>64</sup> still
+/// takes several centuries of CPU-years on current hardware. Reseeding will
+/// actually make things worse, because the reseeded PRNG will just continue
+/// somewhere else *in the same period*, with a high chance of overlapping with
+/// previously used parts of it.
+///
+/// # When should you use `ReseedingRng`?
+///
+/// - Reseeding can be seen as some form of 'security in depth'. Even if in the
+///   future a cryptographic weakness is found in the CSPRNG being used,
+///   occasionally reseeding should make exploiting it much more difficult or
+///   even impossible.
+/// - It can be used as a poor man's cryptography (not recommended, just use a
+///   good CSPRNG). Previous implementations of `thread_rng` for example used
+///   `ReseedingRng` with the ISAAC RNG. That algorithm, although apparently
+///   strong and with no known attack, does not come with any proof of security
+///   and does not meet the current standards for a cryptographically secure
+///   PRNG. By reseeding it frequently (every 32 kiB) it seems safe to assume
+///   there is no attack that can operate on the tiny window between reseeds.
+///
+/// # Error handling
+///
+/// Although extremely unlikely, reseeding the wrapped PRNG can fail.
+/// `ReseedingRng` will never panic but try to handle the error intelligently
+/// through some combination of retrying and delaying reseeding until later.
+/// If handling the source error fails `ReseedingRng` will continue generating
+/// data from the wrapped PRNG without reseeding.
+#[derive(Debug)]
+pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
+where R: BlockRngCore + SeedableRng,
+      Rsdr: RngCore;
+
+impl<R, Rsdr> ReseedingRng<R, Rsdr>
+where R: BlockRngCore + SeedableRng,
+      Rsdr: RngCore
+{
+    /// Create a new `ReseedingRng` with the given parameters.
+    ///
+    /// # Arguments
+    ///
+    /// * `rng`: the random number generator to use.
+    /// * `threshold`: the number of generated bytes after which to reseed the RNG.
+    /// * `reseeder`: the RNG to use for reseeding.
+    pub fn new(rng: R, threshold: u64, reseeder: Rsdr) -> Self {
+        ReseedingRng(BlockRng::new(ReseedingCore::new(rng, threshold, reseeder)))
+    }
+
+    /// Reseed the internal PRNG.
+    pub fn reseed(&mut self) -> Result<(), Error> {
+        self.0.core.reseed()
+    }
+}
+
+// TODO: this should be implemented for any type where the inner type
+// implements RngCore, but we can't specify that because ReseedingCore is private
+impl<R, Rsdr: RngCore> RngCore for ReseedingRng<R, Rsdr>
+where R: BlockRngCore<Item = u32> + SeedableRng,
+    <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>
+{
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl<R, Rsdr> Clone for ReseedingRng<R, Rsdr>
+where R: BlockRngCore + SeedableRng + Clone,
+      Rsdr: RngCore + Clone
+{
+    fn clone(&self) -> ReseedingRng<R, Rsdr> {
+        // Recreating `BlockRng` seems easier than cloning it and resetting
+        // the index.
+        ReseedingRng(BlockRng::new(self.0.core.clone()))
+    }
+}
+
+impl<R, Rsdr> CryptoRng for ReseedingRng<R, Rsdr>
+where R: BlockRngCore + SeedableRng + CryptoRng,
+      Rsdr: RngCore + CryptoRng {}
+
+#[derive(Debug)]
+struct ReseedingCore<R, Rsdr> {
+    inner: R,
+    reseeder: Rsdr,
+    threshold: i64,
+    bytes_until_reseed: i64,
+}
+
+impl<R, Rsdr> BlockRngCore for ReseedingCore<R, Rsdr>
+where R: BlockRngCore + SeedableRng,
+      Rsdr: RngCore
+{
+    type Item = <R as BlockRngCore>::Item;
+    type Results = <R as BlockRngCore>::Results;
+
+    fn generate(&mut self, results: &mut Self::Results) {
+        if self.bytes_until_reseed <= 0 {
+            // We get better performance by not calling only `auto_reseed` here
+            // and continuing with the rest of the function, but by directly
+            // returning from a non-inlined function.
+            return self.reseed_and_generate(results);
+        }
+        let num_bytes = results.as_ref().len() * size_of::<Self::Item>();
+        self.bytes_until_reseed -= num_bytes as i64;
+        self.inner.generate(results);
+    }
+}
+
+impl<R, Rsdr> ReseedingCore<R, Rsdr>
+where R: BlockRngCore + SeedableRng,
+      Rsdr: RngCore
+{
+    /// Create a new `ReseedingCore` with the given parameters.
+    ///
+    /// # Arguments
+    ///
+    /// * `rng`: the random number generator to use.
+    /// * `threshold`: the number of generated bytes after which to reseed the RNG.
+    /// * `reseeder`: the RNG to use for reseeding.
+    pub fn new(rng: R, threshold: u64, reseeder: Rsdr) -> Self {
+        assert!(threshold <= ::core::i64::MAX as u64);
+        ReseedingCore {
+            inner: rng,
+            reseeder,
+            threshold: threshold as i64,
+            bytes_until_reseed: threshold as i64,
+        }
+    }
+
+    /// Reseed the internal PRNG.
+    fn reseed(&mut self) -> Result<(), Error> {
+        R::from_rng(&mut self.reseeder).map(|result| {
+            self.bytes_until_reseed = self.threshold;
+            self.inner = result
+        })
+    }
+
+    #[inline(never)]
+    fn reseed_and_generate(&mut self,
+                           results: &mut <Self as BlockRngCore>::Results)
+    {
+        trace!("Reseeding RNG after {} generated bytes",
+               self.threshold - self.bytes_until_reseed);
+        let threshold = if let Err(e) = self.reseed()  {
+            let delay = match e.kind {
+                ErrorKind::Transient => 0,
+                kind @ _ if kind.should_retry() => self.threshold >> 8,
+                _ => self.threshold,
+            };
+            warn!("Reseeding RNG delayed reseeding by {} bytes due to \
+                    error from source: {}", delay, e);
+            delay
+        } else {
+            self.threshold
+        };
+        
+        let num_bytes = results.as_ref().len() * size_of::<<R as BlockRngCore>::Item>();
+        self.bytes_until_reseed = threshold - num_bytes as i64;
+        self.inner.generate(results);
+    }
+}
+
+impl<R, Rsdr> Clone for ReseedingCore<R, Rsdr>
+where R: BlockRngCore + SeedableRng + Clone,
+      Rsdr: RngCore + Clone
+{
+    fn clone(&self) -> ReseedingCore<R, Rsdr> {
+        ReseedingCore {
+            inner: self.inner.clone(),
+            reseeder: self.reseeder.clone(),
+            threshold: self.threshold,
+            bytes_until_reseed: 0, // reseed clone on first use
+        }
+    }
+}
+
+impl<R, Rsdr> CryptoRng for ReseedingCore<R, Rsdr>
+where R: BlockRngCore + SeedableRng + CryptoRng,
+      Rsdr: RngCore + CryptoRng {}
+
+#[cfg(test)]
+mod test {
+    use {Rng, SeedableRng};
+    use prng::chacha::ChaChaCore;
+    use rngs::mock::StepRng;
+    use super::ReseedingRng;
+
+    #[test]
+    fn test_reseeding() {
+        let mut zero = StepRng::new(0, 0);
+        let rng = ChaChaCore::from_rng(&mut zero).unwrap();
+        let mut reseeding = ReseedingRng::new(rng, 32*4, zero);
+
+        // Currently we only support for arrays up to length 32.
+        // TODO: cannot generate seq via Rng::gen because it uses different alg
+        let mut buf = [0u32; 32]; // Needs to be a multiple of the RNGs result
+                                  // size to test exactly.
+        reseeding.fill(&mut buf);
+        let seq = buf;
+        for _ in 0..10 {
+            reseeding.fill(&mut buf);
+            assert_eq!(buf, seq);
+        }
+    }
+
+    #[test]
+    fn test_clone_reseeding() {
+        let mut zero = StepRng::new(0, 0);
+        let rng = ChaChaCore::from_rng(&mut zero).unwrap();
+        let mut rng1 = ReseedingRng::new(rng, 32*4, zero);
+
+        let first: u32 = rng1.gen();
+        for _ in 0..10 { let _ = rng1.gen::<u32>(); }
+
+        let mut rng2 = rng1.clone();
+        assert_eq!(first, rng2.gen::<u32>());
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/entropy.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/entropy.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/entropy.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/entropy.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,296 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Entropy generator, or wrapper around external generators
+
+use rand_core::{RngCore, CryptoRng, Error, ErrorKind, impls};
+#[allow(unused)]
+use rngs;
+
+/// An interface returning random data from external source(s), provided
+/// specifically for securely seeding algorithmic generators (PRNGs).
+///
+/// Where possible, `EntropyRng` retrieves random data from the operating
+/// system's interface for random numbers ([`OsRng`]); if that fails it will
+/// fall back to the [`JitterRng`] entropy collector. In the latter case it will
+/// still try to use [`OsRng`] on the next usage.
+///
+/// If no secure source of entropy is available `EntropyRng` will panic on use;
+/// i.e. it should never output predictable data.
+/// 
+/// This is either a little slow ([`OsRng`] requires a system call) or extremely
+/// slow ([`JitterRng`] must use significant CPU time to generate sufficient
+/// jitter); for better performance it is common to seed a local PRNG from
+/// external entropy then primarily use the local PRNG ([`thread_rng`] is
+/// provided as a convenient, local, automatically-seeded CSPRNG).
+///
+/// # Panics
+///
+/// On most systems, like Windows, Linux, macOS and *BSD on common hardware, it
+/// is highly unlikely for both [`OsRng`] and [`JitterRng`] to fail. But on
+/// combinations like webassembly without Emscripten or stdweb both sources are
+/// unavailable. If both sources fail, only [`try_fill_bytes`] is able to
+/// report the error, and only the one from `OsRng`. The other [`RngCore`]
+/// methods will panic in case of an error.
+///
+/// [`OsRng`]: struct.OsRng.html
+/// [`JitterRng`]: jitter/struct.JitterRng.html
+/// [`thread_rng`]: ../fn.thread_rng.html
+/// [`RngCore`]: ../trait.RngCore.html
+/// [`try_fill_bytes`]: ../trait.RngCore.html#method.tymethod.try_fill_bytes
+#[derive(Debug)]
+pub struct EntropyRng {
+    source: Source,
+}
+
+#[derive(Debug)]
+enum Source {
+    Os(Os),
+    Custom(Custom),
+    Jitter(Jitter),
+    None,
+}
+
+impl EntropyRng {
+    /// Create a new `EntropyRng`.
+    ///
+    /// This method will do no system calls or other initialization routines,
+    /// those are done on first use. This is done to make `new` infallible,
+    /// and `try_fill_bytes` the only place to report errors.
+    pub fn new() -> Self {
+        EntropyRng { source: Source::None }
+    }
+}
+
+impl Default for EntropyRng {
+    fn default() -> Self {
+        EntropyRng::new()
+    }
+}
+
+impl RngCore for EntropyRng {
+    fn next_u32(&mut self) -> u32 {
+        impls::next_u32_via_fill(self)
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        impls::next_u64_via_fill(self)
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.try_fill_bytes(dest).unwrap_or_else(|err|
+                panic!("all entropy sources failed; first error: {}", err))
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        let mut reported_error = None;
+
+        if let Source::Os(ref mut os_rng) = self.source {
+            match os_rng.fill(dest) {
+                Ok(()) => return Ok(()),
+                Err(err) => {
+                    warn!("EntropyRng: OsRng failed \
+                          [trying other entropy sources]: {}", err);
+                    reported_error = Some(err);
+                },
+            }
+        } else if Os::is_supported() {
+            match Os::new_and_fill(dest) {
+                Ok(os_rng) => {
+                    debug!("EntropyRng: using OsRng");
+                    self.source = Source::Os(os_rng);
+                    return Ok(());
+                },
+                Err(err) => { reported_error = reported_error.or(Some(err)) },
+            }
+        }
+
+        if let Source::Custom(ref mut rng) = self.source {
+            match rng.fill(dest) {
+                Ok(()) => return Ok(()),
+                Err(err) => {
+                    warn!("EntropyRng: custom entropy source failed \
+                          [trying other entropy sources]: {}", err);
+                    reported_error = Some(err);
+                },
+            }
+        } else if Custom::is_supported() {
+            match Custom::new_and_fill(dest) {
+                Ok(custom) => {
+                    debug!("EntropyRng: using custom entropy source");
+                    self.source = Source::Custom(custom);
+                    return Ok(());
+                },
+                Err(err) => { reported_error = reported_error.or(Some(err)) },
+            }
+        }
+
+        if let Source::Jitter(ref mut jitter_rng) = self.source {
+            match jitter_rng.fill(dest) {
+                Ok(()) => return Ok(()),
+                Err(err) => {
+                    warn!("EntropyRng: JitterRng failed: {}", err);
+                    reported_error = Some(err);
+                },
+            }
+        } else if Jitter::is_supported() {
+            match Jitter::new_and_fill(dest) {
+                Ok(jitter_rng) => {
+                    debug!("EntropyRng: using JitterRng");
+                    self.source = Source::Jitter(jitter_rng);
+                    return Ok(());
+                },
+                Err(err) => { reported_error = reported_error.or(Some(err)) },
+            }
+        }
+
+        if let Some(err) = reported_error {
+            Err(Error::with_cause(ErrorKind::Unavailable,
+                                  "All entropy sources failed",
+                                  err))
+        } else {
+            Err(Error::new(ErrorKind::Unavailable,
+                           "No entropy sources available"))
+        }
+    }
+}
+
+impl CryptoRng for EntropyRng {}
+
+
+
+trait EntropySource {
+    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error>
+        where Self: Sized;
+
+    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error>;
+
+    fn is_supported() -> bool { true }
+}
+
+#[allow(unused)]
+#[derive(Clone, Debug)]
+struct NoSource;
+
+#[allow(unused)]
+impl EntropySource for NoSource {
+    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
+        Err(Error::new(ErrorKind::Unavailable, "Source not supported"))
+    }
+
+    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        unreachable!()
+    }
+
+    fn is_supported() -> bool { false }
+}
+
+
+#[cfg(all(feature="std",
+          any(target_os = "linux", target_os = "android",
+              target_os = "netbsd",
+              target_os = "dragonfly",
+              target_os = "haiku",
+              target_os = "emscripten",
+              target_os = "solaris",
+              target_os = "cloudabi",
+              target_os = "macos", target_os = "ios",
+              target_os = "freebsd",
+              target_os = "openbsd", target_os = "bitrig",
+              target_os = "redox",
+              target_os = "fuchsia",
+              windows,
+              all(target_arch = "wasm32", feature = "stdweb")
+)))]
+#[derive(Clone, Debug)]
+pub struct Os(rngs::OsRng);
+
+#[cfg(all(feature="std",
+          any(target_os = "linux", target_os = "android",
+              target_os = "netbsd",
+              target_os = "dragonfly",
+              target_os = "haiku",
+              target_os = "emscripten",
+              target_os = "solaris",
+              target_os = "cloudabi",
+              target_os = "macos", target_os = "ios",
+              target_os = "freebsd",
+              target_os = "openbsd", target_os = "bitrig",
+              target_os = "redox",
+              target_os = "fuchsia",
+              windows,
+              all(target_arch = "wasm32", feature = "stdweb")
+)))]
+impl EntropySource for Os {
+    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
+        let mut rng = rngs::OsRng::new()?;
+        rng.try_fill_bytes(dest)?;
+        Ok(Os(rng))
+    }
+
+    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+#[cfg(not(all(feature="std",
+              any(target_os = "linux", target_os = "android",
+                  target_os = "netbsd",
+                  target_os = "dragonfly",
+                  target_os = "haiku",
+                  target_os = "emscripten",
+                  target_os = "solaris",
+                  target_os = "cloudabi",
+                  target_os = "macos", target_os = "ios",
+                  target_os = "freebsd",
+                  target_os = "openbsd", target_os = "bitrig",
+                  target_os = "redox",
+                  target_os = "fuchsia",
+                  windows,
+                  all(target_arch = "wasm32", feature = "stdweb")
+))))]
+type Os = NoSource;
+
+
+type Custom = NoSource;
+
+
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Clone, Debug)]
+pub struct Jitter(rngs::JitterRng);
+
+#[cfg(not(target_arch = "wasm32"))]
+impl EntropySource for Jitter {
+    fn new_and_fill(dest: &mut [u8]) -> Result<Self, Error> {
+        let mut rng = rngs::JitterRng::new()?;
+        rng.try_fill_bytes(dest)?;
+        Ok(Jitter(rng))
+    }
+
+    fn fill(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+type Jitter = NoSource;
+
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_entropy() {
+        let mut rng = EntropyRng::new();
+        let n = (rng.next_u32() ^ rng.next_u32()).count_ones();
+        assert!(n >= 2);    // p(failure) approx 1e-7
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/jitter.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/jitter.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/jitter.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/jitter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,887 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+//
+// Based on jitterentropy-library, http://www.chronox.de/jent.html.
+// Copyright Stephan Mueller <smueller@chronox.de>, 2014 - 2017.
+//
+// With permission from Stephan Mueller to relicense the Rust translation under
+// the MIT license.
+
+//! Non-physical true random number generator based on timing jitter.
+
+// Note: the C implementation of `Jitterentropy` relies on being compiled
+// without optimizations. This implementation goes through lengths to make the
+// compiler not optimize out code which does influence timing jitter, but is
+// technically dead code.
+
+use rand_core::{RngCore, CryptoRng, Error, ErrorKind, impls};
+
+use core::{fmt, mem, ptr};
+#[cfg(all(feature="std", not(target_arch = "wasm32")))]
+use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+
+const MEMORY_BLOCKS: usize = 64;
+const MEMORY_BLOCKSIZE: usize = 32;
+const MEMORY_SIZE: usize = MEMORY_BLOCKS * MEMORY_BLOCKSIZE;
+
+/// A true random number generator based on jitter in the CPU execution time,
+/// and jitter in memory access time.
+///
+/// This is a true random number generator, as opposed to pseudo-random
+/// generators. Random numbers generated by `JitterRng` can be seen as fresh
+/// entropy. A consequence is that is orders of magnitude slower than [`OsRng`]
+/// and PRNGs (about 10<sup>3</sup>..10<sup>6</sup> slower).
+///
+/// There are very few situations where using this RNG is appropriate. Only very
+/// few applications require true entropy. A normal PRNG can be statistically
+/// indistinguishable, and a cryptographic PRNG should also be as impossible to
+/// predict.
+///
+/// Use of `JitterRng` is recommended for initializing cryptographic PRNGs when
+/// [`OsRng`] is not available.
+///
+/// `JitterRng` can be used without the standard library, but not conveniently,
+/// you must provide a high-precision timer and carefully have to follow the
+/// instructions of [`new_with_timer`].
+///
+/// This implementation is based on
+/// [Jitterentropy](http://www.chronox.de/jent.html) version 2.1.0.
+///
+/// Note: There is no accurate timer available on Wasm platforms, to help
+/// prevent fingerprinting or timing side-channel attacks. Therefore
+/// [`JitterRng::new()`] is not available on Wasm.
+///
+/// # Quality testing
+///
+/// [`JitterRng::new()`] has build-in, but limited, quality testing, however
+/// before using `JitterRng` on untested hardware, or after changes that could
+/// effect how the code is optimized (such as a new LLVM version), it is
+/// recommend to run the much more stringent
+/// [NIST SP 800-90B Entropy Estimation Suite](
+/// https://github.com/usnistgov/SP800-90B_EntropyAssessment).
+///
+/// Use the following code using [`timer_stats`] to collect the data:
+///
+/// ```no_run
+/// use rand::jitter::JitterRng;
+/// #
+/// # use std::error::Error;
+/// # use std::fs::File;
+/// # use std::io::Write;
+/// #
+/// # fn try_main() -> Result<(), Box<Error>> {
+/// let mut rng = JitterRng::new()?;
+///
+/// // 1_000_000 results are required for the
+/// // NIST SP 800-90B Entropy Estimation Suite
+/// const ROUNDS: usize = 1_000_000;
+/// let mut deltas_variable: Vec<u8> = Vec::with_capacity(ROUNDS);
+/// let mut deltas_minimal: Vec<u8> = Vec::with_capacity(ROUNDS);
+///
+/// for _ in 0..ROUNDS {
+///     deltas_variable.push(rng.timer_stats(true) as u8);
+///     deltas_minimal.push(rng.timer_stats(false) as u8);
+/// }
+///
+/// // Write out after the statistics collection loop, to not disturb the
+/// // test results.
+/// File::create("jitter_rng_var.bin")?.write(&deltas_variable)?;
+/// File::create("jitter_rng_min.bin")?.write(&deltas_minimal)?;
+/// #
+/// # Ok(())
+/// # }
+/// #
+/// # fn main() {
+/// #     try_main().unwrap();
+/// # }
+/// ```
+///
+/// This will produce two files: `jitter_rng_var.bin` and `jitter_rng_min.bin`.
+/// Run the Entropy Estimation Suite in three configurations, as outlined below.
+/// Every run has two steps. One step to produce an estimation, another to
+/// validate the estimation.
+///
+/// 1. Estimate the expected amount of entropy that is at least available with
+///    each round of the entropy collector. This number should be greater than
+///    the amount estimated with `64 / test_timer()`.
+///    ```sh
+///    python noniid_main.py -v jitter_rng_var.bin 8
+///    restart.py -v jitter_rng_var.bin 8 <min-entropy>
+///    ```
+/// 2. Estimate the expected amount of entropy that is available in the last 4
+///    bits of the timer delta after running noice sources. Note that a value of
+///    `3.70` is the minimum estimated entropy for true randomness.
+///    ```sh
+///    python noniid_main.py -v -u 4 jitter_rng_var.bin 4
+///    restart.py -v -u 4 jitter_rng_var.bin 4 <min-entropy>
+///    ```
+/// 3. Estimate the expected amount of entropy that is available to the entropy
+///    collector if both noice sources only run their minimal number of times.
+///    This measures the absolute worst-case, and gives a lower bound for the
+///    available entropy.
+///    ```sh
+///    python noniid_main.py -v -u 4 jitter_rng_min.bin 4
+///    restart.py -v -u 4 jitter_rng_min.bin 4 <min-entropy>
+///    ```
+///
+/// [`OsRng`]: struct.OsRng.html
+/// [`JitterRng::new()`]: struct.JitterRng.html#method.new
+/// [`new_with_timer`]: struct.JitterRng.html#method.new_with_timer
+/// [`timer_stats`]: struct.JitterRng.html#method.timer_stats
+pub struct JitterRng {
+    data: u64, // Actual random number
+    // Number of rounds to run the entropy collector per 64 bits
+    rounds: u8,
+    // Timer used by `measure_jitter`
+    timer: fn() -> u64,
+    // Memory for the Memory Access noise source
+    mem_prev_index: u16,
+    // Make `next_u32` not waste 32 bits
+    data_half_used: bool,
+}
+
+// Note: `JitterRng` maintains a small 64-bit entropy pool. With every
+// `generate` 64 new bits should be integrated in the pool. If a round of
+// `generate` were to collect less than the expected 64 bit, then the returned
+// value, and the new state of the entropy pool, would be in some way related to
+// the initial state. It is therefore better if the initial state of the entropy
+// pool is different on each call to `generate`. This has a few implications:
+// - `generate` should be called once before using `JitterRng` to produce the
+//   first usable value (this is done by default in `new`);
+// - We do not zero the entropy pool after generating a result. The reference
+//   implementation also does not support zeroing, but recommends generating a
+//   new value without using it if you want to protect a previously generated
+//   'secret' value from someone inspecting the memory;
+// - Implementing `Clone` seems acceptable, as it would not cause the systematic
+//   bias a constant might cause. Only instead of one value that could be
+//   potentially related to the same initial state, there are now two.
+
+// Entropy collector state.
+// These values are not necessary to preserve across runs.
+struct EcState {
+    // Previous time stamp to determine the timer delta
+    prev_time: u64,
+    // Deltas used for the stuck test
+    last_delta: i32,
+    last_delta2: i32,
+    // Memory for the Memory Access noise source
+    mem: [u8; MEMORY_SIZE],
+}
+
+impl EcState {
+    // Stuck test by checking the:
+    // - 1st derivation of the jitter measurement (time delta)
+    // - 2nd derivation of the jitter measurement (delta of time deltas)
+    // - 3rd derivation of the jitter measurement (delta of delta of time
+    //   deltas)
+    //
+    // All values must always be non-zero.
+    // This test is a heuristic to see whether the last measurement holds
+    // entropy.
+    fn stuck(&mut self, current_delta: i32) -> bool {
+        let delta2 = self.last_delta - current_delta;
+        let delta3 = delta2 - self.last_delta2;
+
+        self.last_delta = current_delta;
+        self.last_delta2 = delta2;
+
+        current_delta == 0 || delta2 == 0 || delta3 == 0
+    }
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for JitterRng {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "JitterRng {{}}")
+    }
+}
+
+impl Clone for JitterRng {
+    fn clone(&self) -> JitterRng {
+        JitterRng {
+            data: self.data,
+            rounds: self.rounds,
+            timer: self.timer,
+            mem_prev_index: self.mem_prev_index,
+            // The 32 bits that may still be unused from the previous round are
+            // for the original to use, not for the clone.
+            data_half_used: false,
+        }
+    }
+}
+
+/// An error that can occur when [`JitterRng::test_timer`] fails.
+///
+/// [`JitterRng::test_timer`]: struct.JitterRng.html#method.test_timer
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TimerError {
+    /// No timer available.
+    NoTimer,
+    /// Timer too coarse to use as an entropy source.
+    CoarseTimer,
+    /// Timer is not monotonically increasing.
+    NotMonotonic,
+    /// Variations of deltas of time too small.
+    TinyVariantions,
+    /// Too many stuck results (indicating no added entropy).
+    TooManyStuck,
+    #[doc(hidden)]
+    __Nonexhaustive,
+}
+
+impl TimerError {
+    fn description(&self) -> &'static str {
+        match *self {
+            TimerError::NoTimer => "no timer available",
+            TimerError::CoarseTimer => "coarse timer",
+            TimerError::NotMonotonic => "timer not monotonic",
+            TimerError::TinyVariantions => "time delta variations too small",
+            TimerError::TooManyStuck => "too many stuck results",
+            TimerError::__Nonexhaustive => unreachable!(),
+        }
+    }
+}
+
+impl fmt::Display for TimerError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.description())
+    }
+}
+
+#[cfg(feature="std")]
+impl ::std::error::Error for TimerError {
+    fn description(&self) -> &str {
+        self.description()
+    }
+}
+
+impl From<TimerError> for Error {
+    fn from(err: TimerError) -> Error {
+        // Timer check is already quite permissive of failures so we don't
+        // expect false-positive failures, i.e. any error is irrecoverable.
+        Error::with_cause(ErrorKind::Unavailable,
+                              "timer jitter failed basic quality tests", err)
+    }
+}
+
+// Initialise to zero; must be positive
+#[cfg(all(feature="std", not(target_arch = "wasm32")))]
+static JITTER_ROUNDS: AtomicUsize = ATOMIC_USIZE_INIT;
+
+impl JitterRng {
+    /// Create a new `JitterRng`. Makes use of `std::time` for a timer, or a
+    /// platform-specific function with higher accuracy if necessary and
+    /// available.
+    ///
+    /// During initialization CPU execution timing jitter is measured a few
+    /// hundred times. If this does not pass basic quality tests, an error is
+    /// returned. The test result is cached to make subsequent calls faster.
+    #[cfg(all(feature="std", not(target_arch = "wasm32")))]
+    pub fn new() -> Result<JitterRng, TimerError> {
+        let mut state = JitterRng::new_with_timer(platform::get_nstime);
+        let mut rounds = JITTER_ROUNDS.load(Ordering::Relaxed) as u8;
+        if rounds == 0 {
+            // No result yet: run test.
+            // This allows the timer test to run multiple times; we don't care.
+            rounds = state.test_timer()?;
+            JITTER_ROUNDS.store(rounds as usize, Ordering::Relaxed);
+            info!("JitterRng: using {} rounds per u64 output", rounds);
+        }
+        state.set_rounds(rounds);
+
+        // Fill `data` with a non-zero value.
+        state.gen_entropy();
+        Ok(state)
+    }
+
+    /// Create a new `JitterRng`.
+    /// A custom timer can be supplied, making it possible to use `JitterRng` in
+    /// `no_std` environments.
+    ///
+    /// The timer must have nanosecond precision.
+    ///
+    /// This method is more low-level than `new()`. It is the responsibility of
+    /// the caller to run [`test_timer`] before using any numbers generated with
+    /// `JitterRng`, and optionally call [`set_rounds`]. Also it is important to
+    /// consume at least one `u64` before using the first result to initialize
+    /// the entropy collection pool.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use rand::{Rng, Error};
+    /// use rand::jitter::JitterRng;
+    ///
+    /// # fn try_inner() -> Result<(), Error> {
+    /// fn get_nstime() -> u64 {
+    ///     use std::time::{SystemTime, UNIX_EPOCH};
+    ///
+    ///     let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+    ///     // The correct way to calculate the current time is
+    ///     // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
+    ///     // But this is faster, and the difference in terms of entropy is
+    ///     // negligible (log2(10^9) == 29.9).
+    ///     dur.as_secs() << 30 | dur.subsec_nanos() as u64
+    /// }
+    ///
+    /// let mut rng = JitterRng::new_with_timer(get_nstime);
+    /// let rounds = rng.test_timer()?;
+    /// rng.set_rounds(rounds); // optional
+    /// let _ = rng.gen::<u64>();
+    ///
+    /// // Ready for use
+    /// let v: u64 = rng.gen();
+    /// # Ok(())
+    /// # }
+    ///
+    /// # let _ = try_inner();
+    /// ```
+    ///
+    /// [`test_timer`]: struct.JitterRng.html#method.test_timer
+    /// [`set_rounds`]: struct.JitterRng.html#method.set_rounds
+    pub fn new_with_timer(timer: fn() -> u64) -> JitterRng {
+        JitterRng {
+            data: 0,
+            rounds: 64,
+            timer,
+            mem_prev_index: 0,
+            data_half_used: false,
+        }
+    }
+
+    /// Configures how many rounds are used to generate each 64-bit value.
+    /// This must be greater than zero, and has a big impact on performance
+    /// and output quality.
+    ///
+    /// [`new_with_timer`] conservatively uses 64 rounds, but often less rounds
+    /// can be used. The `test_timer()` function returns the minimum number of
+    /// rounds required for full strength (platform dependent), so one may use
+    /// `rng.set_rounds(rng.test_timer()?);` or cache the value.
+    ///
+    /// [`new_with_timer`]: struct.JitterRng.html#method.new_with_timer
+    pub fn set_rounds(&mut self, rounds: u8) {
+        assert!(rounds > 0);
+        self.rounds = rounds;
+    }
+
+    // Calculate a random loop count used for the next round of an entropy
+    // collection, based on bits from a fresh value from the timer.
+    //
+    // The timer is folded to produce a number that contains at most `n_bits`
+    // bits.
+    //
+    // Note: A constant should be added to the resulting random loop count to
+    // prevent loops that run 0 times.
+    #[inline(never)]
+    fn random_loop_cnt(&mut self, n_bits: u32) -> u32 {
+        let mut rounds = 0;
+
+        let mut time = (self.timer)();
+        // Mix with the current state of the random number balance the random
+        // loop counter a bit more.
+        time ^= self.data;
+
+        // We fold the time value as much as possible to ensure that as many
+        // bits of the time stamp are included as possible.
+        let folds = (64 + n_bits - 1) / n_bits;
+        let mask = (1 << n_bits) - 1;
+        for _ in 0..folds {
+            rounds ^= time & mask;
+            time >>= n_bits;
+        }
+
+        rounds as u32
+    }
+
+    // CPU jitter noise source
+    // Noise source based on the CPU execution time jitter
+    //
+    // This function injects the individual bits of the time value into the
+    // entropy pool using an LFSR.
+    //
+    // The code is deliberately inefficient with respect to the bit shifting.
+    // This function not only acts as folding operation, but this function's
+    // execution is used to measure the CPU execution time jitter. Any change to
+    // the loop in this function implies that careful retesting must be done.
+    #[inline(never)]
+    fn lfsr_time(&mut self, time: u64, var_rounds: bool) {
+        fn lfsr(mut data: u64, time: u64) -> u64{
+            for i in 1..65 {
+                let mut tmp = time << (64 - i);
+                tmp >>= 64 - 1;
+
+                // Fibonacci LSFR with polynomial of
+                // x^64 + x^61 + x^56 + x^31 + x^28 + x^23 + 1 which is
+                // primitive according to
+                // http://poincare.matf.bg.ac.rs/~ezivkovm/publications/primpol1.pdf
+                // (the shift values are the polynomial values minus one
+                // due to counting bits from 0 to 63). As the current
+                // position is always the LSB, the polynomial only needs
+                // to shift data in from the left without wrap.
+                data ^= tmp;
+                data ^= (data >> 63) & 1;
+                data ^= (data >> 60) & 1;
+                data ^= (data >> 55) & 1;
+                data ^= (data >> 30) & 1;
+                data ^= (data >> 27) & 1;
+                data ^= (data >> 22) & 1;
+                data = data.rotate_left(1);
+            }
+            data
+        }
+
+        // Note: in the reference implementation only the last round effects
+        // `self.data`, all the other results are ignored. To make sure the
+        // other rounds are not optimised out, we first run all but the last
+        // round on a throw-away value instead of the real `self.data`.
+        let mut lfsr_loop_cnt = 0;
+        if var_rounds { lfsr_loop_cnt = self.random_loop_cnt(4) };
+
+        let mut throw_away: u64 = 0;
+        for _ in 0..lfsr_loop_cnt {
+            throw_away = lfsr(throw_away, time);
+        }
+        black_box(throw_away);
+
+        self.data = lfsr(self.data, time);
+    }
+
+    // Memory Access noise source
+    // This is a noise source based on variations in memory access times
+    //
+    // This function performs memory accesses which will add to the timing
+    // variations due to an unknown amount of CPU wait states that need to be
+    // added when accessing memory. The memory size should be larger than the L1
+    // caches as outlined in the documentation and the associated testing.
+    //
+    // The L1 cache has a very high bandwidth, albeit its access rate is usually
+    // slower than accessing CPU registers. Therefore, L1 accesses only add
+    // minimal variations as the CPU has hardly to wait. Starting with L2,
+    // significant variations are added because L2 typically does not belong to
+    // the CPU any more and therefore a wider range of CPU wait states is
+    // necessary for accesses. L3 and real memory accesses have even a wider
+    // range of wait states. However, to reliably access either L3 or memory,
+    // the `self.mem` memory must be quite large which is usually not desirable.
+    #[inline(never)]
+    fn memaccess(&mut self, mem: &mut [u8; MEMORY_SIZE], var_rounds: bool) {
+        let mut acc_loop_cnt = 128;
+        if var_rounds { acc_loop_cnt += self.random_loop_cnt(4) };
+
+        let mut index = self.mem_prev_index as usize;
+        for _ in 0..acc_loop_cnt {
+            // Addition of memblocksize - 1 to index with wrap around logic to
+            // ensure that every memory location is hit evenly.
+            // The modulus also allows the compiler to remove the indexing
+            // bounds check.
+            index = (index + MEMORY_BLOCKSIZE - 1) % MEMORY_SIZE;
+
+            // memory access: just add 1 to one byte
+            // memory access implies read from and write to memory location
+            mem[index] = mem[index].wrapping_add(1);
+        }
+        self.mem_prev_index = index as u16;
+    }
+
+    // This is the heart of the entropy generation: calculate time deltas and
+    // use the CPU jitter in the time deltas. The jitter is injected into the
+    // entropy pool.
+    //
+    // Ensure that `ec.prev_time` is primed before using the output of this
+    // function. This can be done by calling this function and not using its
+    // result.
+    fn measure_jitter(&mut self, ec: &mut EcState) -> Option<()> {
+        // Invoke one noise source before time measurement to add variations
+        self.memaccess(&mut ec.mem, true);
+
+        // Get time stamp and calculate time delta to previous
+        // invocation to measure the timing variations
+        let time = (self.timer)();
+        // Note: wrapping_sub combined with a cast to `i64` generates a correct
+        // delta, even in the unlikely case this is a timer that is not strictly
+        // monotonic.
+        let current_delta = time.wrapping_sub(ec.prev_time) as i64 as i32;
+        ec.prev_time = time;
+
+        // Call the next noise source which also injects the data
+        self.lfsr_time(current_delta as u64, true);
+
+        // Check whether we have a stuck measurement (i.e. does the last
+        // measurement holds entropy?).
+        if ec.stuck(current_delta) { return None };
+
+        // Rotate the data buffer by a prime number (any odd number would
+        // do) to ensure that every bit position of the input time stamp
+        // has an even chance of being merged with a bit position in the
+        // entropy pool. We do not use one here as the adjacent bits in
+        // successive time deltas may have some form of dependency. The
+        // chosen value of 7 implies that the low 7 bits of the next
+        // time delta value is concatenated with the current time delta.
+        self.data = self.data.rotate_left(7);
+
+        Some(())
+    }
+
+    // Shuffle the pool a bit by mixing some value with a bijective function
+    // (XOR) into the pool.
+    //
+    // The function generates a mixer value that depends on the bits set and
+    // the location of the set bits in the random number generated by the
+    // entropy source. Therefore, based on the generated random number, this
+    // mixer value can have 2^64 different values. That mixer value is
+    // initialized with the first two SHA-1 constants. After obtaining the
+    // mixer value, it is XORed into the random number.
+    //
+    // The mixer value is not assumed to contain any entropy. But due to the
+    // XOR operation, it can also not destroy any entropy present in the
+    // entropy pool.
+    #[inline(never)]
+    fn stir_pool(&mut self) {
+        // This constant is derived from the first two 32 bit initialization
+        // vectors of SHA-1 as defined in FIPS 180-4 section 5.3.1
+        // The order does not really matter as we do not rely on the specific
+        // numbers. We just pick the SHA-1 constants as they have a good mix of
+        // bit set and unset.
+        const CONSTANT: u64 = 0x67452301efcdab89;
+
+        // The start value of the mixer variable is derived from the third
+        // and fourth 32 bit initialization vector of SHA-1 as defined in
+        // FIPS 180-4 section 5.3.1
+        let mut mixer = 0x98badcfe10325476;
+
+        // This is a constant time function to prevent leaking timing
+        // information about the random number.
+        // The normal code is:
+        // ```
+        // for i in 0..64 {
+        //     if ((self.data >> i) & 1) == 1 { mixer ^= CONSTANT; }
+        // }
+        // ```
+        // This is a bit fragile, as LLVM really wants to use branches here, and
+        // we rely on it to not recognise the opportunity.
+        for i in 0..64 {
+            let apply = (self.data >> i) & 1;
+            let mask = !apply.wrapping_sub(1);
+            mixer ^= CONSTANT & mask;
+            mixer = mixer.rotate_left(1);
+        }
+
+        self.data ^= mixer;
+    }
+
+    fn gen_entropy(&mut self) -> u64 {
+        trace!("JitterRng: collecting entropy");
+
+        // Prime `ec.prev_time`, and run the noice sources to make sure the
+        // first loop round collects the expected entropy.
+        let mut ec = EcState {
+            prev_time: (self.timer)(),
+            last_delta: 0,
+            last_delta2: 0,
+            mem: [0; MEMORY_SIZE],
+        };
+        let _ = self.measure_jitter(&mut ec);
+
+        for _ in 0..self.rounds {
+            // If a stuck measurement is received, repeat measurement
+            // Note: we do not guard against an infinite loop, that would mean
+            // the timer suddenly became broken.
+            while self.measure_jitter(&mut ec).is_none() {}
+        }
+
+        // Do a single read from `self.mem` to make sure the Memory Access noise
+        // source is not optimised out.
+        black_box(ec.mem[0]);
+
+        self.stir_pool();
+        self.data
+    }
+    
+    /// Basic quality tests on the timer, by measuring CPU timing jitter a few
+    /// hundred times.
+    ///
+    /// If succesful, this will return the estimated number of rounds necessary
+    /// to collect 64 bits of entropy. Otherwise a [`TimerError`] with the cause
+    /// of the failure will be returned.
+    ///
+    /// [`TimerError`]: enum.TimerError.html
+    pub fn test_timer(&mut self) -> Result<u8, TimerError> {
+        debug!("JitterRng: testing timer ...");
+        // We could add a check for system capabilities such as `clock_getres`
+        // or check for `CONFIG_X86_TSC`, but it does not make much sense as the
+        // following sanity checks verify that we have a high-resolution timer.
+
+        let mut delta_sum = 0;
+        let mut old_delta = 0;
+
+        let mut time_backwards = 0;
+        let mut count_mod = 0;
+        let mut count_stuck = 0;
+
+        let mut ec = EcState {
+            prev_time: (self.timer)(),
+            last_delta: 0,
+            last_delta2: 0,
+            mem: [0; MEMORY_SIZE],
+        };
+
+        // TESTLOOPCOUNT needs some loops to identify edge systems.
+        // 100 is definitely too little.
+        const TESTLOOPCOUNT: u64 = 300;
+        const CLEARCACHE: u64 = 100;
+
+        for i in 0..(CLEARCACHE + TESTLOOPCOUNT) {
+            // Measure time delta of core entropy collection logic
+            let time = (self.timer)();
+            self.memaccess(&mut ec.mem, true);
+            self.lfsr_time(time, true);
+            let time2 = (self.timer)();
+
+            // Test whether timer works
+            if time == 0 || time2 == 0 {
+                return Err(TimerError::NoTimer);
+            }
+            let delta = time2.wrapping_sub(time) as i64 as i32;
+
+            // Test whether timer is fine grained enough to provide delta even
+            // when called shortly after each other -- this implies that we also
+            // have a high resolution timer
+            if delta == 0 {
+                return Err(TimerError::CoarseTimer);
+            }
+
+            // Up to here we did not modify any variable that will be
+            // evaluated later, but we already performed some work. Thus we
+            // already have had an impact on the caches, branch prediction,
+            // etc. with the goal to clear it to get the worst case
+            // measurements.
+            if i < CLEARCACHE { continue; }
+
+            if ec.stuck(delta) { count_stuck += 1; }
+
+            // Test whether we have an increasing timer.
+            if !(time2 > time) { time_backwards += 1; }
+
+            // Count the number of times the counter increases in steps of 100ns
+            // or greater.
+            if (delta % 100) == 0 { count_mod += 1; }
+
+            // Ensure that we have a varying delta timer which is necessary for
+            // the calculation of entropy -- perform this check only after the
+            // first loop is executed as we need to prime the old_delta value
+            delta_sum += (delta - old_delta).abs() as u64;
+            old_delta = delta;
+        }
+
+        // Do a single read from `self.mem` to make sure the Memory Access noise
+        // source is not optimised out.
+        black_box(ec.mem[0]);
+
+        // We allow the time to run backwards for up to three times.
+        // This can happen if the clock is being adjusted by NTP operations.
+        // If such an operation just happens to interfere with our test, it
+        // should not fail. The value of 3 should cover the NTP case being
+        // performed during our test run.
+        if time_backwards > 3 {
+            return Err(TimerError::NotMonotonic);
+        }
+
+        // Test that the available amount of entropy per round does not get to
+        // low. We expect 1 bit of entropy per round as a reasonable minimum
+        // (although less is possible, it means the collector loop has to run
+        // much more often).
+        // `assert!(delta_average >= log2(1))`
+        // `assert!(delta_sum / TESTLOOPCOUNT >= 1)`
+        // `assert!(delta_sum >= TESTLOOPCOUNT)`
+        if delta_sum < TESTLOOPCOUNT {
+            return Err(TimerError::TinyVariantions);
+        }
+
+        // Ensure that we have variations in the time stamp below 100 for at
+        // least 10% of all checks -- on some platforms, the counter increments
+        // in multiples of 100, but not always
+        if count_mod > (TESTLOOPCOUNT * 9 / 10) {
+            return Err(TimerError::CoarseTimer);
+        }
+
+        // If we have more than 90% stuck results, then this Jitter RNG is
+        // likely to not work well.
+        if count_stuck > (TESTLOOPCOUNT * 9 / 10) {
+            return Err(TimerError::TooManyStuck);
+        }
+
+        // Estimate the number of `measure_jitter` rounds necessary for 64 bits
+        // of entropy.
+        //
+        // We don't try very hard to come up with a good estimate of the
+        // available bits of entropy per round here for two reasons:
+        // 1. Simple estimates of the available bits (like Shannon entropy) are
+        //    too optimistic.
+        // 2. Unless we want to waste a lot of time during intialization, there
+        //    only a small number of samples are available.
+        //
+        // Therefore we use a very simple and conservative estimate:
+        // `let bits_of_entropy = log2(delta_average) / 2`.
+        //
+        // The number of rounds `measure_jitter` should run to collect 64 bits
+        // of entropy is `64 / bits_of_entropy`.
+        let delta_average = delta_sum / TESTLOOPCOUNT;
+
+        if delta_average >= 16 {
+            let log2 = 64 - delta_average.leading_zeros();
+            // Do something similar to roundup(64/(log2/2)):
+            Ok( ((64u32 * 2 + log2 - 1) / log2) as u8)
+        } else {
+            // For values < 16 the rounding error becomes too large, use a
+            // lookup table.
+            // Values 0 and 1 are invalid, and filtered out by the
+            // `delta_sum < TESTLOOPCOUNT` test above.
+            let log2_lookup = [0,  0, 128, 81, 64, 56, 50, 46,
+                               43, 41, 39, 38, 36, 35, 34, 33];
+            Ok(log2_lookup[delta_average as usize])
+        }
+    }
+
+    /// Statistical test: return the timer delta of one normal run of the
+    /// `JitterRng` entropy collector.
+    ///
+    /// Setting `var_rounds` to `true` will execute the memory access and the
+    /// CPU jitter noice sources a variable amount of times (just like a real
+    /// `JitterRng` round).
+    ///
+    /// Setting `var_rounds` to `false` will execute the noice sources the
+    /// minimal number of times. This can be used to measure the minimum amount
+    /// of entropy one round of the entropy collector can collect in the worst
+    /// case.
+    ///
+    /// See [Quality testing](struct.JitterRng.html#quality-testing) on how to
+    /// use `timer_stats` to test the quality of `JitterRng`.
+    pub fn timer_stats(&mut self, var_rounds: bool) -> i64 {
+        let mut mem = [0; MEMORY_SIZE];
+
+        let time = (self.timer)();
+        self.memaccess(&mut mem, var_rounds);
+        self.lfsr_time(time, var_rounds);
+        let time2 = (self.timer)();
+        time2.wrapping_sub(time) as i64
+    }
+}
+
+#[cfg(feature="std")]
+mod platform {
+    #[cfg(not(any(target_os = "macos", target_os = "ios",
+                  target_os = "windows",
+                  target_arch = "wasm32")))]
+    pub fn get_nstime() -> u64 {
+        use std::time::{SystemTime, UNIX_EPOCH};
+
+        let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+        // The correct way to calculate the current time is
+        // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
+        // But this is faster, and the difference in terms of entropy is
+        // negligible (log2(10^9) == 29.9).
+        dur.as_secs() << 30 | dur.subsec_nanos() as u64
+    }
+
+    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    pub fn get_nstime() -> u64 {
+        extern crate libc;
+        // On Mac OS and iOS std::time::SystemTime only has 1000ns resolution.
+        // We use `mach_absolute_time` instead. This provides a CPU dependent
+        // unit, to get real nanoseconds the result should by multiplied by
+        // numer/denom from `mach_timebase_info`.
+        // But we are not interested in the exact nanoseconds, just entropy. So
+        // we use the raw result.
+        unsafe { libc::mach_absolute_time() }
+    }
+
+    #[cfg(target_os = "windows")]
+    pub fn get_nstime() -> u64 {
+        extern crate winapi;
+        unsafe {
+            let mut t = super::mem::zeroed();
+            winapi::um::profileapi::QueryPerformanceCounter(&mut t);
+            *t.QuadPart() as u64
+        }
+    }
+}
+
+// A function that is opaque to the optimizer to assist in avoiding dead-code
+// elimination. Taken from `bencher`.
+fn black_box<T>(dummy: T) -> T {
+    unsafe {
+        let ret = ptr::read_volatile(&dummy);
+        mem::forget(dummy);
+        ret
+    }
+}
+
+impl RngCore for JitterRng {
+    fn next_u32(&mut self) -> u32 {
+        // We want to use both parts of the generated entropy
+        if self.data_half_used {
+            self.data_half_used = false;
+            (self.data >> 32) as u32
+        } else {
+            self.data = self.next_u64();
+            self.data_half_used = true;
+            self.data as u32
+        }
+    }
+
+    fn next_u64(&mut self) -> u64 {
+       self.data_half_used = false;
+       self.gen_entropy()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        // Fill using `next_u32`. This is faster for filling small slices (four
+        // bytes or less), while the overhead is negligible.
+        //
+        // This is done especially for wrappers that implement `next_u32`
+        // themselves via `fill_bytes`.
+        impls::fill_bytes_via_next(self, dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        Ok(self.fill_bytes(dest))
+    }
+}
+
+impl CryptoRng for JitterRng {}
+
+#[cfg(test)]
+mod test_jitter_init {
+    use jitter::JitterRng;
+
+    #[cfg(all(feature="std", not(target_arch = "wasm32")))]
+    #[test]
+    fn test_jitter_init() {
+        use RngCore;
+        // Because this is a debug build, measurements here are not representive
+        // of the final release build.
+        // Don't fail this test if initializing `JitterRng` fails because of a
+        // bad timer (the timer from the standard library may not have enough
+        // accuracy on all platforms).
+        match JitterRng::new() {
+            Ok(ref mut rng) => {
+                // false positives are possible, but extremely unlikely
+                assert!(rng.next_u32() | rng.next_u32() != 0);
+            },
+            Err(_) => {},
+        }
+    }
+
+    #[test]
+    fn test_jitter_bad_timer() {
+        fn bad_timer() -> u64 { 0 }
+        let mut rng = JitterRng::new_with_timer(bad_timer);
+        assert!(rng.test_timer().is_err());
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/mock.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/mock.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/mock.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/mock.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,61 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Mock random number generator
+
+use rand_core::{RngCore, Error, impls};
+
+/// A simple implementation of `RngCore` for testing purposes.
+/// 
+/// This generates an arithmetic sequence (i.e. adds a constant each step)
+/// over a `u64` number, using wrapping arithmetic. If the increment is 0
+/// the generator yields a constant.
+/// 
+/// ```
+/// use rand::Rng;
+/// use rand::rngs::mock::StepRng;
+/// 
+/// let mut my_rng = StepRng::new(2, 1);
+/// let sample: [u64; 3] = my_rng.gen();
+/// assert_eq!(sample, [2, 3, 4]);
+/// ```
+#[derive(Debug, Clone)]
+pub struct StepRng {
+    v: u64,
+    a: u64,
+}
+
+impl StepRng {
+    /// Create a `StepRng`, yielding an arithmetic sequence starting with
+    /// `initial` and incremented by `increment` each time.
+    pub fn new(initial: u64, increment: u64) -> Self {
+        StepRng { v: initial, a: increment }
+    }
+}
+
+impl RngCore for StepRng {
+    fn next_u32(&mut self) -> u32 {
+        self.next_u64() as u32
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        let result = self.v;
+        self.v = self.v.wrapping_add(self.a);
+        result
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        impls::fill_bytes_via_next(self, dest);
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        Ok(self.fill_bytes(dest))
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/mod.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/mod.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,218 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Random number generators and adapters for common usage:
+//!
+//! - [`ThreadRng`], a fast, secure, auto-seeded thread-local generator
+//! - [`StdRng`] and [`SmallRng`], algorithms to cover typical usage
+//! - [`EntropyRng`], [`OsRng`] and [`JitterRng`] as entropy sources
+//! - [`mock::StepRng`] as a simple counter for tests
+//! - [`adapter::ReadRng`] to read from a file/stream
+//!
+//! # Background — Random number generators (RNGs)
+//!
+//! Computers are inherently deterministic, so to get *random* numbers one
+//! either has to use a hardware generator or collect bits of *entropy* from
+//! various sources (e.g. event timestamps, or jitter). This is a relatively
+//! slow and complicated operation.
+//!
+//! Generally the operating system will collect some entropy, remove bias, and
+//! use that to seed its own PRNG; [`OsRng`] provides an interface to this.
+//! [`JitterRng`] is an entropy collector included with Rand that measures
+//! jitter in the CPU execution time, and jitter in memory access time.
+//! [`EntropyRng`] is a wrapper that uses the best entropy source that is
+//! available.
+//!
+//! ## Pseudo-random number generators
+//!
+//! What is commonly used instead of "true" random number renerators, are
+//! *pseudo-random number generators* (PRNGs), deterministic algorithms that
+//! produce an infinite stream of pseudo-random numbers from a small random
+//! seed. PRNGs are faster, and have better provable properties. The numbers
+//! produced can be statistically of very high quality and can be impossible to
+//! predict. (They can also have obvious correlations and be trivial to predict;
+//! quality varies.)
+//!
+//! There are two different types of PRNGs: those developed for simulations
+//! and statistics, and those developed for use in cryptography; the latter are
+//! called Cryptographically Secure PRNGs (CSPRNG or CPRNG). Both types can
+//! have good statistical quality but the latter also have to be impossible to
+//! predict, even after seeing many previous output values. Rand provides a good
+//! default algorithm from each class:
+//!
+//! - [`SmallRng`] is a PRNG chosen for low memory usage, high performance and
+//!   good statistical quality.
+//!   The current algorithm (plain Xorshift) unfortunately performs
+//!   poorly in statistical quality test suites (TestU01 and PractRand) and will
+//!   be replaced in the next major release.
+//! - [`StdRng`] is a CSPRNG chosen for good performance and trust of security
+//!   (based on reviews, maturity and usage). The current algorithm is HC-128,
+//!   which is one of the recommendations by ECRYPT's eSTREAM project.
+//!
+//! The above PRNGs do not cover all use-cases; more algorithms can be found in
+//! the [`prng` module], as well as in several other crates. For example, you
+//! may wish a CSPRNG with significantly lower memory usage than [`StdRng`]
+//! while being less concerned about performance, in which case [`ChaChaRng`]
+//! is a good choice.
+//!
+//! One complexity is that the internal state of a PRNG must change with every
+//! generated number. For APIs this generally means a mutable reference to the
+//! state of the PRNG has to be passed around.
+//!
+//! A solution is [`ThreadRng`]. This is a thread-local implementation of
+//! [`StdRng`] with automatic seeding on first use. It is the best choice if you
+//! "just" want a convenient, secure, fast random number source. Use via the
+//! [`thread_rng`] function, which gets a reference to the current thread's
+//! local instance.
+//!
+//! ## Seeding
+//!
+//! As mentioned above, PRNGs require a random seed in order to produce random
+//! output. This is especially important for CSPRNGs, which are still
+//! deterministic algorithms, thus can only be secure if their seed value is
+//! also secure. To seed a PRNG, use one of:
+//!
+//! - [`FromEntropy::from_entropy`]; this is the most convenient way to seed
+//!   with fresh, secure random data.
+//! - [`SeedableRng::from_rng`]; this allows seeding from another PRNG or
+//!   from an entropy source such as [`EntropyRng`].
+//! - [`SeedableRng::from_seed`]; this is mostly useful if you wish to be able
+//!   to reproduce the output sequence by using a fixed seed. (Don't use
+//!   [`StdRng`] or [`SmallRng`] in this case since different algorithms may be
+//!   used by future versions of Rand; use an algorithm from the
+//!   [`prng` module].)
+//!
+//! ## Conclusion
+//!
+//! - [`thread_rng`] is what you often want to use.
+//! - If you want more control, flexibility, or better performance, use
+//!   [`StdRng`], [`SmallRng`] or an algorithm from the [`prng` module].
+//! - Use [`FromEntropy::from_entropy`] to seed new PRNGs.
+//! - If you need reproducibility, use [`SeedableRng::from_seed`] combined with
+//!   a named PRNG.
+//!
+//! More information and notes on cryptographic security can be found
+//! in the [`prng` module].
+//!
+//! ## Examples
+//!
+//! Examples of seeding PRNGs:
+//!
+//! ```
+//! use rand::prelude::*;
+//! # use rand::Error;
+//!
+//! // StdRng seeded securely by the OS or local entropy collector:
+//! let mut rng = StdRng::from_entropy();
+//! # let v: u32 = rng.gen();
+//!
+//! // SmallRng seeded from thread_rng:
+//! # fn try_inner() -> Result<(), Error> {
+//! let mut rng = SmallRng::from_rng(thread_rng())?;
+//! # let v: u32 = rng.gen();
+//! # Ok(())
+//! # }
+//! # try_inner().unwrap();
+//!
+//! // SmallRng seeded by a constant, for deterministic results:
+//! let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16]; // byte array
+//! let mut rng = SmallRng::from_seed(seed);
+//! # let v: u32 = rng.gen();
+//! ```
+//!
+//!
+//! # Implementing custom RNGs
+//!
+//! If you want to implement custom RNG, see the [`rand_core`] crate. The RNG
+//! will have to implement the [`RngCore`] trait, where the [`Rng`] trait is
+//! build on top of.
+//!
+//! If the RNG needs seeding, also implement the [`SeedableRng`] trait.
+//!
+//! [`CryptoRng`] is a marker trait cryptographically secure PRNGs can
+//! implement.
+//!
+//!
+// This module:
+//! [`ThreadRng`]: struct.ThreadRng.html
+//! [`StdRng`]: struct.StdRng.html
+//! [`SmallRng`]: struct.SmallRng.html
+//! [`EntropyRng`]: struct.EntropyRng.html
+//! [`OsRng`]: struct.OsRng.html
+//! [`JitterRng`]: struct.JitterRng.html
+// Other traits and functions:
+//! [`rand_core`]: https://crates.io/crates/rand_core
+//! [`prng` module]: ../prng/index.html
+//! [`CryptoRng`]: ../trait.CryptoRng.html
+//! [`FromEntropy`]: ../trait.FromEntropy.html
+//! [`FromEntropy::from_entropy`]: ../trait.FromEntropy.html#tymethod.from_entropy
+//! [`RngCore`]: ../trait.RngCore.html
+//! [`Rng`]: ../trait.Rng.html
+//! [`SeedableRng`]: ../trait.SeedableRng.html
+//! [`SeedableRng::from_rng`]: ../trait.SeedableRng.html#tymethod.from_rng
+//! [`SeedableRng::from_seed`]: ../trait.SeedableRng.html#tymethod.from_seed
+//! [`thread_rng`]: ../fn.thread_rng.html
+//! [`mock::StepRng`]: mock/struct.StepRng.html
+//! [`adapter::ReadRng`]: adapter/struct.ReadRng.html
+//! [`ChaChaRng`]: ../prng/chacha/struct.ChaChaRng.html
+
+pub mod adapter;
+
+#[cfg(feature="std")] mod entropy;
+#[doc(hidden)] pub mod jitter;
+pub mod mock;   // Public so we don't export `StepRng` directly, making it a bit
+                // more clear it is intended for testing.
+mod small;
+mod std;
+#[cfg(feature="std")] pub(crate) mod thread;
+
+
+pub use self::jitter::{JitterRng, TimerError};
+#[cfg(feature="std")] pub use self::entropy::EntropyRng;
+
+pub use self::small::SmallRng;
+pub use self::std::StdRng;
+#[cfg(feature="std")] pub use self::thread::ThreadRng;
+
+#[cfg(all(feature="std",
+          any(target_os = "linux", target_os = "android",
+              target_os = "netbsd",
+              target_os = "dragonfly",
+              target_os = "haiku",
+              target_os = "emscripten",
+              target_os = "solaris",
+              target_os = "cloudabi",
+              target_os = "macos", target_os = "ios",
+              target_os = "freebsd",
+              target_os = "openbsd", target_os = "bitrig",
+              target_os = "redox",
+              target_os = "fuchsia",
+              windows,
+              all(target_arch = "wasm32", feature = "stdweb")
+)))]
+mod os;
+
+#[cfg(all(feature="std",
+          any(target_os = "linux", target_os = "android",
+              target_os = "netbsd",
+              target_os = "dragonfly",
+              target_os = "haiku",
+              target_os = "emscripten",
+              target_os = "solaris",
+              target_os = "cloudabi",
+              target_os = "macos", target_os = "ios",
+              target_os = "freebsd",
+              target_os = "openbsd", target_os = "bitrig",
+              target_os = "redox",
+              target_os = "fuchsia",
+              windows,
+              all(target_arch = "wasm32", feature = "stdweb")
+)))]
+pub use self::os::OsRng;
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/os.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/os.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/os.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/os.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1171 @@
+// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Interface to the random number generator of the operating system.
+
+use std::fmt;
+use rand_core::{CryptoRng, RngCore, Error, impls};
+
+/// A random number generator that retrieves randomness straight from the
+/// operating system.
+///
+/// This is the preferred external source of entropy for most applications.
+/// Commonly it is used to initialize a user-space RNG, which can then be used
+/// to generate random values with much less overhead than `OsRng`.
+///
+/// You may prefer to use [`EntropyRng`] instead of `OsRng`. It is unlikely, but
+/// not entirely theoretical, for `OsRng` to fail. In such cases [`EntropyRng`]
+/// falls back on a good alternative entropy source.
+///
+/// `OsRng::new()` is guaranteed to be very cheap (after the first successful
+/// call), and will never consume more than one file handle per process.
+///
+/// # Platform sources
+///
+/// | OS               | interface
+/// |------------------|---------------------------------------------------------
+/// | Linux, Android   | [`getrandom`][1] system call if available, otherwise [`/dev/urandom`][2] after reading from `/dev/random` once
+/// | Windows          | [`RtlGenRandom`][3]
+/// | macOS, iOS       | [`SecRandomCopyBytes`][4]
+/// | FreeBSD          | [`kern.arandom`][5]
+/// | OpenBSD, Bitrig  | [`getentropy`][6]
+/// | NetBSD           | [`/dev/urandom`][7] after reading from `/dev/random` once
+/// | Dragonfly BSD    | [`/dev/random`][8]
+/// | Solaris, illumos | [`getrandom`][9] system call if available, otherwise [`/dev/random`][10]
+/// | Fuchsia OS       | [`cprng_draw`][11]
+/// | Redox            | [`rand:`][12]
+/// | CloudABI         | [`random_get`][13]
+/// | Haiku            | `/dev/random` (identical to `/dev/urandom`)
+/// | Web browsers     | [`Crypto.getRandomValues`][14] (see [Support for WebAssembly and ams.js][14])
+/// | Node.js          | [`crypto.randomBytes`][15] (see [Support for WebAssembly and ams.js][16])
+///
+/// Rand doesn't have a blanket implementation for all Unix-like operating
+/// systems that reads from `/dev/urandom`. This ensures all supported operating
+/// systems are using the recommended interface and respect maximum buffer
+/// sizes.
+///
+/// ## Support for WebAssembly and ams.js
+///
+/// The three Emscripten targets `asmjs-unknown-emscripten`,
+/// `wasm32-unknown-emscripten` and `wasm32-experimental-emscripten` use
+/// Emscripten's emulation of `/dev/random` on web browsers and Node.js.
+/// Unfortunately it falls back to the insecure `Math.random()` if a browser
+/// doesn't support [`Crypto.getRandomValues`][12].
+///
+/// The bare Wasm target `wasm32-unknown-unknown` tries to call the javascript
+/// methods directly, using `stdweb` in combination with `cargo-web`.
+/// `wasm-bindgen` is not yet supported.
+///
+/// ## Early boot
+///
+/// It is possible that early in the boot process the OS hasn't had enough time
+/// yet to collect entropy to securely seed its RNG, especially on virtual
+/// machines.
+///
+/// Some operating systems always block the thread until the RNG is securely
+/// seeded. This can take anywhere from a few seconds to more than a minute.
+/// Others make a best effort to use a seed from before the shutdown and don't
+/// document much.
+///
+/// A few, Linux, NetBSD and Solaris, offer a choice between blocking, and
+/// getting an error. With `try_fill_bytes` we choose to get the error
+/// ([`ErrorKind::NotReady`]), while the other methods use a blocking interface.
+///
+/// On Linux (when the `genrandom` system call is not available) and on NetBSD
+/// reading from `/dev/urandom` never blocks, even when the OS hasn't collected
+/// enough entropy yet. As a countermeasure we try to do a single read from
+/// `/dev/random` until we know the OS RNG is initialized (and store this in a
+/// global static).
+///
+/// # Panics
+///
+/// `OsRng` is extremely unlikely to fail if `OsRng::new()`, and one read from
+/// it, where succesfull. But in case it does fail, only [`try_fill_bytes`] is
+/// able to report the cause. Depending on the error the other [`RngCore`]
+/// methods will retry several times, and panic in case the error remains.
+///
+/// [`EntropyRng`]: struct.EntropyRng.html
+/// [`RngCore`]: ../trait.RngCore.html
+/// [`try_fill_bytes`]: ../trait.RngCore.html#method.tymethod.try_fill_bytes
+/// [`ErrorKind::NotReady`]: ../enum.ErrorKind.html#variant.NotReady
+///
+/// [1]: http://man7.org/linux/man-pages/man2/getrandom.2.html
+/// [2]: http://man7.org/linux/man-pages/man4/urandom.4.html
+/// [3]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx
+/// [4]: https://developer.apple.com/documentation/security/1399291-secrandomcopybytes?language=objc
+/// [5]: https://www.freebsd.org/cgi/man.cgi?query=random&sektion=4
+/// [6]: https://man.openbsd.org/getentropy.2
+/// [7]: http://netbsd.gw.com/cgi-bin/man-cgi?random+4+NetBSD-current
+/// [8]: https://leaf.dragonflybsd.org/cgi/web-man?command=random&section=4
+/// [9]: https://docs.oracle.com/cd/E88353_01/html/E37841/getrandom-2.html
+/// [10]: https://docs.oracle.com/cd/E86824_01/html/E54777/random-7d.html
+/// [11]: https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_draw.md
+/// [12]: https://github.com/redox-os/randd/blob/master/src/main.rs
+/// [13]: https://github.com/NuxiNL/cloudabi/blob/v0.20/cloudabi.txt#L1826
+/// [14]: https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
+/// [15]: https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback
+/// [16]: #support-for-webassembly-and-amsjs
+
+
+#[derive(Clone)]
+pub struct OsRng(imp::OsRng);
+
+impl fmt::Debug for OsRng {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl OsRng {
+    /// Create a new `OsRng`.
+    pub fn new() -> Result<OsRng, Error> {
+        imp::OsRng::new().map(OsRng)
+    }
+}
+
+impl CryptoRng for OsRng {}
+
+impl RngCore for OsRng {
+    fn next_u32(&mut self) -> u32 {
+        impls::next_u32_via_fill(self)
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        impls::next_u64_via_fill(self)
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        use std::{time, thread};
+
+        // We cannot return Err(..), so we try to handle before panicking.
+        const MAX_RETRY_PERIOD: u32 = 10; // max 10s
+        const WAIT_DUR_MS: u32 = 100; // retry every 100ms
+        let wait_dur = time::Duration::from_millis(WAIT_DUR_MS as u64);
+        const RETRY_LIMIT: u32 = (MAX_RETRY_PERIOD * 1000) / WAIT_DUR_MS;
+        const TRANSIENT_RETRIES: u32 = 8;
+        let mut err_count = 0;
+        let mut error_logged = false;
+
+        // Maybe block until the OS RNG is initialized
+        let mut read = 0;
+        if let Ok(n) = self.0.test_initialized(dest, true) { read = n };
+        let dest = &mut dest[read..];
+
+        loop {
+            if let Err(e) = self.try_fill_bytes(dest) {
+                if err_count >= RETRY_LIMIT {
+                    error!("OsRng failed too many times; last error: {}", e);
+                    panic!("OsRng failed too many times; last error: {}", e);
+                }
+
+                if e.kind.should_wait() {
+                    if !error_logged {
+                        warn!("OsRng failed; waiting up to {}s and retrying. Error: {}",
+                                MAX_RETRY_PERIOD, e);
+                        error_logged = true;
+                    }
+                    err_count += 1;
+                    thread::sleep(wait_dur);
+                    continue;
+                } else if e.kind.should_retry() {
+                    if !error_logged {
+                        warn!("OsRng failed; retrying up to {} times. Error: {}",
+                                TRANSIENT_RETRIES, e);
+                        error_logged = true;
+                    }
+                    err_count += (RETRY_LIMIT + TRANSIENT_RETRIES - 1)
+                            / TRANSIENT_RETRIES;    // round up
+                    continue;
+                } else {
+                    error!("OsRng failed: {}", e);
+                    panic!("OsRng fatal error: {}", e);
+                }
+            }
+
+            break;
+        }
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        // Some systems do not support reading 0 random bytes.
+        // (And why waste a system call?)
+        if dest.len() == 0 { return Ok(()); }
+
+        let read = self.0.test_initialized(dest, false)?;
+        let dest = &mut dest[read..];
+
+        let max = self.0.max_chunk_size();
+        if dest.len() <= max {
+            trace!("OsRng: reading {} bytes via {}",
+                   dest.len(), self.0.method_str());
+        } else {
+            trace!("OsRng: reading {} bytes via {} in {} chunks of {} bytes",
+                   dest.len(), self.0.method_str(), (dest.len() + max) / max, max);
+        }
+        for slice in dest.chunks_mut(max) {
+            self.0.fill_chunk(slice)?;
+        }
+        Ok(())
+    }
+}
+
+trait OsRngImpl where Self: Sized {
+    // Create a new `OsRng` platform interface.
+    fn new() -> Result<Self, Error>;
+
+    // Fill a chunk with random bytes.
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error>;
+
+    // Test whether the OS RNG is initialized. This method may not be possible
+    // to support cheaply (or at all) on all operating systems.
+    //
+    // If `blocking` is set, this will cause the OS the block execution until
+    // its RNG is initialized.
+    //
+    // Random values that are read while this are stored in `dest`, the amount
+    // of read bytes is returned.
+    fn test_initialized(&mut self, _dest: &mut [u8], _blocking: bool)
+        -> Result<usize, Error> { Ok(0) }
+
+    // Maximum chunk size supported.
+    fn max_chunk_size(&self) -> usize { ::core::usize::MAX }
+
+    // Name of the OS interface (used for logging).
+    fn method_str(&self) -> &'static str;
+}
+
+
+
+
+// Helper functions to read from a random device such as `/dev/urandom`.
+//
+// All instances use a single internal file handle, to prevent possible
+// exhaustion of file descriptors.
+#[cfg(any(target_os = "linux", target_os = "android",
+          target_os = "netbsd", target_os = "dragonfly",
+          target_os = "solaris", target_os = "redox",
+          target_os = "haiku", target_os = "emscripten"))]
+mod random_device {
+    use {Error, ErrorKind};
+    use std::fs::File;
+    use std::io;
+    use std::io::Read;
+    use std::sync::{Once, Mutex, ONCE_INIT};
+
+    // TODO: remove outer Option when `Mutex::new(None)` is a constant expression
+    static mut READ_RNG_FILE: Option<Mutex<Option<File>>> = None;
+    static READ_RNG_ONCE: Once = ONCE_INIT;
+
+    #[allow(unused)]
+    pub fn open<F>(path: &'static str, open_fn: F) -> Result<(), Error>
+        where F: Fn(&'static str) -> Result<File, io::Error>
+    {
+        READ_RNG_ONCE.call_once(|| {
+            unsafe { READ_RNG_FILE = Some(Mutex::new(None)) }
+        });
+
+        // We try opening the file outside the `call_once` fn because we cannot
+        // clone the error, thus we must retry on failure.
+
+        let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
+        let mut guard = mutex.lock().unwrap();
+        if (*guard).is_none() {
+            info!("OsRng: opening random device {}", path);
+            let file = open_fn(path).map_err(map_err)?;
+            *guard = Some(file);
+        };
+        Ok(())
+    }
+
+    pub fn read(dest: &mut [u8]) -> Result<(), Error> {
+        // We expect this function only to be used after `random_device::open`
+        // was succesful. Therefore we can assume that our memory was set with a
+        // valid object.
+        let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
+        let mut guard = mutex.lock().unwrap();
+        let file = (*guard).as_mut().unwrap();
+
+        // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
+        file.read_exact(dest).map_err(|err| {
+            Error::with_cause(ErrorKind::Unavailable,
+                              "error reading random device", err)
+        })
+
+    }
+
+    pub fn map_err(err: io::Error) -> Error {
+        match err.kind() {
+            io::ErrorKind::Interrupted =>
+                    Error::new(ErrorKind::Transient, "interrupted"),
+            io::ErrorKind::WouldBlock =>
+                    Error::with_cause(ErrorKind::NotReady,
+                    "OS RNG not yet seeded", err),
+            _ => Error::with_cause(ErrorKind::Unavailable,
+                    "error while opening random device", err)
+        }
+    }
+}
+
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+mod imp {
+    extern crate libc;
+
+    use {Error, ErrorKind};
+    use super::random_device;
+    use super::OsRngImpl;
+
+    use std::io;
+    use std::io::Read;
+    use std::fs::{File, OpenOptions};
+    use std::os::unix::fs::OpenOptionsExt;
+    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+    use std::sync::{Once, ONCE_INIT};
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng {
+        method: OsRngMethod,
+        initialized: bool,
+    }
+
+    #[derive(Clone, Debug)]
+    enum OsRngMethod {
+        GetRandom,
+        RandomDevice,
+    }
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            if is_getrandom_available() {
+                return Ok(OsRng { method: OsRngMethod::GetRandom,
+                                  initialized: false });
+            }
+            random_device::open("/dev/urandom", &|p| File::open(p))?;
+            Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
+        }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            match self.method {
+                OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
+                OsRngMethod::RandomDevice => random_device::read(dest),
+            }
+        }
+
+        fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
+            -> Result<usize, Error>
+        {
+            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
+            if !self.initialized {
+                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
+            }
+            if self.initialized { return Ok(0); }
+
+            let result = match self.method {
+                OsRngMethod::GetRandom => {
+                    getrandom_try_fill(dest, blocking)?;
+                    Ok(dest.len())
+                }
+                OsRngMethod::RandomDevice => {
+                    info!("OsRng: testing random device /dev/random");
+                    let mut file = OpenOptions::new()
+                        .read(true)
+                        .custom_flags(if blocking { 0 } else { libc::O_NONBLOCK })
+                        .open("/dev/random")
+                        .map_err(random_device::map_err)?;
+                    file.read(&mut dest[..1]).map_err(random_device::map_err)?;
+                    Ok(1)
+                }
+            };
+            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
+            self.initialized = true;
+            result
+        }
+
+        fn method_str(&self) -> &'static str {
+            match self.method {
+                OsRngMethod::GetRandom => "getrandom",
+                OsRngMethod::RandomDevice => "/dev/urandom",
+            }
+        }
+    }
+
+    #[cfg(target_arch = "x86_64")]
+    const NR_GETRANDOM: libc::c_long = 318;
+    #[cfg(target_arch = "x86")]
+    const NR_GETRANDOM: libc::c_long = 355;
+    #[cfg(target_arch = "arm")]
+    const NR_GETRANDOM: libc::c_long = 384;
+    #[cfg(target_arch = "aarch64")]
+    const NR_GETRANDOM: libc::c_long = 278;
+     #[cfg(target_arch = "s390x")]
+    const NR_GETRANDOM: libc::c_long = 349;
+    #[cfg(target_arch = "powerpc")]
+    const NR_GETRANDOM: libc::c_long = 359;
+    #[cfg(target_arch = "mips")] // old ABI
+    const NR_GETRANDOM: libc::c_long = 4353;
+    #[cfg(target_arch = "mips64")]
+    const NR_GETRANDOM: libc::c_long = 5313;
+    #[cfg(not(any(target_arch = "x86_64", target_arch = "x86",
+                  target_arch = "arm", target_arch = "aarch64",
+                  target_arch = "s390x", target_arch = "powerpc",
+                  target_arch = "mips", target_arch = "mips64")))]
+    const NR_GETRANDOM: libc::c_long = 0;
+
+    fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
+        extern "C" {
+            fn syscall(number: libc::c_long, ...) -> libc::c_long;
+        }
+        const GRND_NONBLOCK: libc::c_uint = 0x0001;
+
+        if NR_GETRANDOM == 0 { return -1 };
+
+        unsafe {
+            syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(),
+                    if blocking { 0 } else { GRND_NONBLOCK })
+        }
+    }
+
+    fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
+        let mut read = 0;
+        while read < dest.len() {
+            let result = getrandom(&mut dest[read..], blocking);
+            if result == -1 {
+                let err = io::Error::last_os_error();
+                let kind = err.kind();
+                if kind == io::ErrorKind::Interrupted {
+                    continue;
+                } else if kind == io::ErrorKind::WouldBlock {
+                    return Err(Error::with_cause(
+                        ErrorKind::NotReady,
+                        "getrandom not ready",
+                        err,
+                    ));
+                } else {
+                    return Err(Error::with_cause(
+                        ErrorKind::Unavailable,
+                        "unexpected getrandom error",
+                        err,
+                    ));
+                }
+            } else {
+                read += result as usize;
+            }
+        }
+        Ok(())
+    }
+
+    fn is_getrandom_available() -> bool {
+        static CHECKER: Once = ONCE_INIT;
+        static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
+
+        if NR_GETRANDOM == 0 { return false };
+
+        CHECKER.call_once(|| {
+            debug!("OsRng: testing getrandom");
+            let mut buf: [u8; 0] = [];
+            let result = getrandom(&mut buf, false);
+            let available = if result == -1 {
+                let err = io::Error::last_os_error().raw_os_error();
+                err != Some(libc::ENOSYS)
+            } else {
+                true
+            };
+            AVAILABLE.store(available, Ordering::Relaxed);
+            info!("OsRng: using {}", if available { "getrandom" } else { "/dev/urandom" });
+        });
+
+        AVAILABLE.load(Ordering::Relaxed)
+    }
+}
+
+
+#[cfg(target_os = "netbsd")]
+mod imp {
+    use Error;
+    use super::random_device;
+    use super::OsRngImpl;
+
+    use std::fs::File;
+    use std::io::Read;
+    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng { initialized: bool }
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            random_device::open("/dev/urandom", &|p| File::open(p))?;
+            Ok(OsRng { initialized: false })
+        }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            random_device::read(dest)
+        }
+
+        // Read a single byte from `/dev/random` to determine if the OS RNG is
+        // already seeded. NetBSD always blocks if not yet ready.
+        fn test_initialized(&mut self, dest: &mut [u8], _blocking: bool)
+            -> Result<usize, Error>
+        {
+            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
+            if !self.initialized {
+                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
+            }
+            if self.initialized { return Ok(0); }
+
+            info!("OsRng: testing random device /dev/random");
+            let mut file =
+                File::open("/dev/random").map_err(random_device::map_err)?;
+            file.read(&mut dest[..1]).map_err(random_device::map_err)?;
+
+            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
+            self.initialized = true;
+            Ok(1)
+        }
+
+        fn method_str(&self) -> &'static str { "/dev/urandom" }
+    }
+}
+
+
+#[cfg(any(target_os = "dragonfly",
+          target_os = "haiku",
+          target_os = "emscripten"))]
+mod imp {
+    use Error;
+    use super::random_device;
+    use super::OsRngImpl;
+    use std::fs::File;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng();
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            random_device::open("/dev/random", &|p| File::open(p))?;
+            Ok(OsRng())
+        }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            random_device::read(dest)
+        }
+
+        #[cfg(target_os = "emscripten")]
+        fn max_chunk_size(&self) -> usize {
+            // `Crypto.getRandomValues` documents `dest` should be at most 65536
+            // bytes. `crypto.randomBytes` documents: "To minimize threadpool
+            // task length variation, partition large randomBytes requests when
+            // doing so as part of fulfilling a client request.
+            65536
+        }
+
+        fn method_str(&self) -> &'static str { "/dev/random" }
+    }
+}
+
+
+// Read from `/dev/random`, with chunks of limited size (1040 bytes).
+// `/dev/random` uses the Hash_DRBG with SHA512 algorithm from NIST SP 800-90A.
+// `/dev/urandom` uses the FIPS 186-2 algorithm, which is considered less
+// secure. We choose to read from `/dev/random`.
+//
+// Since Solaris 11.3 the `getrandom` syscall is available. To make sure we can
+// compile on both Solaris and on OpenSolaris derivatives, that do not have the
+// function, we do a direct syscall instead of calling a library function.
+//
+// We have no way to differentiate between Solaris, illumos, SmartOS, etc.
+#[cfg(target_os = "solaris")]
+mod imp {
+    extern crate libc;
+
+    use {Error, ErrorKind};
+    use super::random_device;
+    use super::OsRngImpl;
+
+    use std::io;
+    use std::io::Read;
+    use std::fs::{File, OpenOptions};
+    use std::os::unix::fs::OpenOptionsExt;
+    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng {
+        method: OsRngMethod,
+        initialized: bool,
+    }
+
+    #[derive(Clone, Debug)]
+    enum OsRngMethod {
+        GetRandom,
+        RandomDevice,
+    }
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            if is_getrandom_available() {
+                return Ok(OsRng { method: OsRngMethod::GetRandom,
+                                  initialized: false });
+            }
+            let open = |p| OpenOptions::new()
+                .read(true)
+                .custom_flags(libc::O_NONBLOCK)
+                .open(p);
+            random_device::open("/dev/random", &open)?;
+            Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
+        }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            match self.method {
+                OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
+                OsRngMethod::RandomDevice => random_device::read(dest),
+            }
+        }
+
+        fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
+            -> Result<usize, Error>
+        {
+            static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
+            if !self.initialized {
+                self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
+            }
+            if self.initialized { return Ok(0); }
+
+            let chunk_len = ::core::cmp::min(1024, dest.len());
+            let dest = &mut dest[..chunk_len];
+
+            match self.method {
+                OsRngMethod::GetRandom => getrandom_try_fill(dest, blocking)?,
+                OsRngMethod::RandomDevice => {
+                    if blocking {
+                        info!("OsRng: testing random device /dev/random");
+                        // We already have a non-blocking handle, but now need a
+                        // blocking one. Not much choice except opening it twice
+                        let mut file = File::open("/dev/random")
+                            .map_err(random_device::map_err)?;
+                        file.read(dest).map_err(random_device::map_err)?;
+                    } else {
+                        self.fill_chunk(dest)?;
+                    }
+                }
+            };
+            OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
+            self.initialized = true;
+            Ok(chunk_len)
+        }
+
+        fn max_chunk_size(&self) -> usize {
+            // The documentation says 1024 is the maximum for getrandom, but
+            // 1040 for /dev/random.
+            1024
+        }
+
+        fn method_str(&self) -> &'static str {
+            match self.method {
+                OsRngMethod::GetRandom => "getrandom",
+                OsRngMethod::RandomDevice => "/dev/random",
+            }
+        }
+    }
+
+    fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
+        extern "C" {
+            fn syscall(number: libc::c_long, ...) -> libc::c_long;
+        }
+
+        const SYS_GETRANDOM: libc::c_long = 143;
+        const GRND_NONBLOCK: libc::c_uint = 0x0001;
+        const GRND_RANDOM: libc::c_uint = 0x0002;
+
+        unsafe {
+            syscall(SYS_GETRANDOM, buf.as_mut_ptr(), buf.len(),
+                    if blocking { 0 } else { GRND_NONBLOCK } | GRND_RANDOM)
+        }
+    }
+
+    fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
+        let result = getrandom(dest, blocking);
+        if result == -1 || result == 0 {
+            let err = io::Error::last_os_error();
+            let kind = err.kind();
+            if kind == io::ErrorKind::WouldBlock {
+                return Err(Error::with_cause(
+                    ErrorKind::NotReady,
+                    "getrandom not ready",
+                    err,
+                ));
+            } else {
+                return Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "unexpected getrandom error",
+                    err,
+                ));
+            }
+        } else if result != dest.len() as i64 {
+            return Err(Error::new(ErrorKind::Unavailable,
+                                  "unexpected getrandom error"));
+        }
+        Ok(())
+    }
+
+    fn is_getrandom_available() -> bool {
+        use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+        use std::sync::{Once, ONCE_INIT};
+
+        static CHECKER: Once = ONCE_INIT;
+        static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
+
+        CHECKER.call_once(|| {
+            debug!("OsRng: testing getrandom");
+            let mut buf: [u8; 0] = [];
+            let result = getrandom(&mut buf, false);
+            let available = if result == -1 {
+                let err = io::Error::last_os_error().raw_os_error();
+                err != Some(libc::ENOSYS)
+            } else {
+                true
+            };
+            AVAILABLE.store(available, Ordering::Relaxed);
+            info!("OsRng: using {}", if available { "getrandom" } else { "/dev/random" });
+        });
+
+        AVAILABLE.load(Ordering::Relaxed)
+    }
+}
+
+
+#[cfg(target_os = "cloudabi")]
+mod imp {
+    extern crate cloudabi;
+
+    use std::io;
+    use {Error, ErrorKind};
+    use super::OsRngImpl;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            let errno = unsafe { cloudabi::random_get(dest) };
+            if errno == cloudabi::errno::SUCCESS {
+                Ok(())
+            } else {
+                // Cloudlibc provides its own `strerror` implementation so we
+                // can use `from_raw_os_error` here.
+                Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "random_get() system call failed",
+                    io::Error::from_raw_os_error(errno as i32),
+                ))
+            }
+        }
+
+        fn method_str(&self) -> &'static str { "cloudabi::random_get" }
+    }
+}
+
+
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+mod imp {
+    extern crate libc;
+
+    use {Error, ErrorKind};
+    use super::OsRngImpl;
+
+    use std::io;
+    use self::libc::{c_int, size_t};
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    enum SecRandom {}
+
+    #[allow(non_upper_case_globals)]
+    const kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;
+
+    #[link(name = "Security", kind = "framework")]
+    extern {
+        fn SecRandomCopyBytes(rnd: *const SecRandom,
+                              count: size_t, bytes: *mut u8) -> c_int;
+    }
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            let ret = unsafe {
+                SecRandomCopyBytes(kSecRandomDefault,
+                                   dest.len() as size_t,
+                                   dest.as_mut_ptr())
+            };
+            if ret == -1 {
+                Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "couldn't generate random bytes",
+                    io::Error::last_os_error()))
+            } else {
+                Ok(())
+            }
+        }
+
+        fn method_str(&self) -> &'static str { "SecRandomCopyBytes" }
+    }
+}
+
+
+#[cfg(target_os = "freebsd")]
+mod imp {
+    extern crate libc;
+
+    use {Error, ErrorKind};
+    use super::OsRngImpl;
+
+    use std::ptr;
+    use std::io;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            let mib = [libc::CTL_KERN, libc::KERN_ARND];
+            let mut len = dest.len();
+            let ret = unsafe {
+                libc::sysctl(mib.as_ptr(), mib.len() as libc::c_uint,
+                             dest.as_mut_ptr() as *mut _, &mut len,
+                             ptr::null(), 0)
+            };
+            if ret == -1 || len != dest.len() {
+                return Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "kern.arandom sysctl failed",
+                    io::Error::last_os_error()));
+            }
+            Ok(())
+        }
+
+        fn max_chunk_size(&self) -> usize { 256 }
+
+        fn method_str(&self) -> &'static str { "kern.arandom" }
+    }
+}
+
+
+#[cfg(any(target_os = "openbsd", target_os = "bitrig"))]
+mod imp {
+    extern crate libc;
+
+    use {Error, ErrorKind};
+    use super::OsRngImpl;
+
+    use std::io;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            let ret = unsafe {
+                libc::getentropy(dest.as_mut_ptr() as *mut libc::c_void, dest.len())
+            };
+            if ret == -1 {
+                return Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "getentropy failed",
+                    io::Error::last_os_error()));
+            }
+            Ok(())
+        }
+
+        fn max_chunk_size(&self) -> usize { 256 }
+
+        fn method_str(&self) -> &'static str { "getentropy" }
+    }
+}
+
+
+#[cfg(target_os = "redox")]
+mod imp {
+    use Error;
+    use super::random_device;
+    use super::OsRngImpl;
+    use std::fs::File;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng();
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            random_device::open("rand:", &|p| File::open(p))?;
+            Ok(OsRng())
+        }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            random_device::read(dest)
+        }
+
+        fn method_str(&self) -> &'static str { "'rand:'" }
+    }
+}
+
+
+#[cfg(target_os = "fuchsia")]
+mod imp {
+    extern crate fuchsia_cprng;
+
+    use Error;
+    use super::OsRngImpl;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            fuchsia_cprng::cprng_draw(dest);
+            Ok(())
+        }
+
+        fn method_str(&self) -> &'static str { "cprng_draw" }
+    }
+}
+
+
+#[cfg(windows)]
+mod imp {
+    extern crate winapi;
+    
+    use {Error, ErrorKind};
+    use super::OsRngImpl;
+
+    use std::io;
+
+    use self::winapi::shared::minwindef::ULONG;
+    use self::winapi::um::ntsecapi::RtlGenRandom;
+    use self::winapi::um::winnt::PVOID;
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            let ret = unsafe {
+                RtlGenRandom(dest.as_mut_ptr() as PVOID, dest.len() as ULONG)
+            };
+            if ret == 0 {
+                return Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "couldn't generate random bytes",
+                    io::Error::last_os_error()));
+            }
+            Ok(())
+        }
+
+        fn max_chunk_size(&self) -> usize { <ULONG>::max_value() as usize }
+
+        fn method_str(&self) -> &'static str { "RtlGenRandom" }
+    }
+}
+
+
+#[cfg(all(target_arch = "wasm32",
+          not(target_os = "emscripten"),
+          feature = "stdweb"))]
+mod imp {
+    use std::mem;
+    use stdweb::unstable::TryInto;
+    use stdweb::web::error::Error as WebError;
+    use {Error, ErrorKind};
+    use super::OsRngImpl;
+
+    #[derive(Clone, Debug)]
+    enum OsRngMethod {
+        Browser,
+        Node
+    }
+
+    #[derive(Clone, Debug)]
+    pub struct OsRng(OsRngMethod);
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            let result = js! {
+                try {
+                    if (
+                        typeof self === "object" &&
+                        typeof self.crypto === "object" &&
+                        typeof self.crypto.getRandomValues === "function"
+                    ) {
+                        return { success: true, ty: 1 };
+                    }
+
+                    if (typeof require("crypto").randomBytes === "function") {
+                        return { success: true, ty: 2 };
+                    }
+
+                    return { success: false, error: new Error("not supported") };
+                } catch(err) {
+                    return { success: false, error: err };
+                }
+            };
+
+            if js!{ return @{ result.as_ref() }.success } == true {
+                let ty = js!{ return @{ result }.ty };
+
+                if ty == 1 { Ok(OsRng(OsRngMethod::Browser)) }
+                else if ty == 2 { Ok(OsRng(OsRngMethod::Node)) }
+                else { unreachable!() }
+            } else {
+                let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
+                Err(Error::with_cause(ErrorKind::Unavailable, "WASM Error", err))
+            }
+        }
+
+
+        fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+            assert_eq!(mem::size_of::<usize>(), 4);
+
+            let len = dest.len() as u32;
+            let ptr = dest.as_mut_ptr() as i32;
+
+            let result = match self.0 {
+                OsRngMethod::Browser => js! {
+                    try {
+                        let array = new Uint8Array(@{ len });
+                        self.crypto.getRandomValues(array);
+                        HEAPU8.set(array, @{ ptr });
+
+                        return { success: true };
+                    } catch(err) {
+                        return { success: false, error: err };
+                    }
+                },
+                OsRngMethod::Node => js! {
+                    try {
+                        let bytes = require("crypto").randomBytes(@{ len });
+                        HEAPU8.set(new Uint8Array(bytes), @{ ptr });
+
+                        return { success: true };
+                    } catch(err) {
+                        return { success: false, error: err };
+                    }
+                }
+            };
+
+            if js!{ return @{ result.as_ref() }.success } == true {
+                Ok(())
+            } else {
+                let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
+                Err(Error::with_cause(ErrorKind::Unexpected, "WASM Error", err))
+            }
+        }
+
+        fn max_chunk_size(&self) -> usize { 65536 }
+
+        fn method_str(&self) -> &'static str {
+            match self.0 {
+                OsRngMethod::Browser => "Crypto.getRandomValues",
+                OsRngMethod::Node => "crypto.randomBytes",
+            }
+        }
+    }
+}
+
+
+#[cfg(test)]
+mod test {
+    use RngCore;
+    use OsRng;
+
+    #[test]
+    fn test_os_rng() {
+        let mut r = OsRng::new().unwrap();
+
+        r.next_u32();
+        r.next_u64();
+
+        let mut v1 = [0u8; 1000];
+        r.fill_bytes(&mut v1);
+
+        let mut v2 = [0u8; 1000];
+        r.fill_bytes(&mut v2);
+
+        let mut n_diff_bits = 0;
+        for i in 0..v1.len() {
+            n_diff_bits += (v1[i] ^ v2[i]).count_ones();
+        }
+
+        // Check at least 1 bit per byte differs. p(failure) < 1e-1000 with random input.
+        assert!(n_diff_bits >= v1.len() as u32);
+    }
+
+    #[test]
+    fn test_os_rng_empty() {
+        let mut r = OsRng::new().unwrap();
+
+        let mut empty = [0u8; 0];
+        r.fill_bytes(&mut empty);
+    }
+
+    #[test]
+    fn test_os_rng_huge() {
+        let mut r = OsRng::new().unwrap();
+
+        let mut huge = [0u8; 100_000];
+        r.fill_bytes(&mut huge);
+    }
+
+    #[cfg(not(any(target_arch = "wasm32", target_arch = "asmjs")))]
+    #[test]
+    fn test_os_rng_tasks() {
+        use std::sync::mpsc::channel;
+        use std::thread;
+
+        let mut txs = vec!();
+        for _ in 0..20 {
+            let (tx, rx) = channel();
+            txs.push(tx);
+
+            thread::spawn(move|| {
+                // wait until all the tasks are ready to go.
+                rx.recv().unwrap();
+
+                // deschedule to attempt to interleave things as much
+                // as possible (XXX: is this a good test?)
+                let mut r = OsRng::new().unwrap();
+                thread::yield_now();
+                let mut v = [0u8; 1000];
+
+                for _ in 0..100 {
+                    r.next_u32();
+                    thread::yield_now();
+                    r.next_u64();
+                    thread::yield_now();
+                    r.fill_bytes(&mut v);
+                    thread::yield_now();
+                }
+            });
+        }
+
+        // start all the tasks
+        for tx in txs.iter() {
+            tx.send(()).unwrap();
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/small.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/small.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/small.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/small.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,101 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! A small fast RNG
+
+use {RngCore, SeedableRng, Error};
+use prng::XorShiftRng;
+
+/// An RNG recommended when small state, cheap initialization and good
+/// performance are required. The PRNG algorithm in `SmallRng` is chosen to be
+/// efficient on the current platform, **without consideration for cryptography
+/// or security**. The size of its state is much smaller than for [`StdRng`].
+///
+/// Reproducibility of output from this generator is however not required, thus
+/// future library versions may use a different internal generator with
+/// different output. Further, this generator may not be portable and can
+/// produce different output depending on the architecture. If you require
+/// reproducible output, use a named RNG, for example [`XorShiftRng`].
+///
+/// The current algorithm used on all platforms is [Xorshift].
+///
+/// # Examples
+///
+/// Initializing `SmallRng` with a random seed can be done using [`FromEntropy`]:
+///
+/// ```
+/// # use rand::Rng;
+/// use rand::FromEntropy;
+/// use rand::rngs::SmallRng;
+///
+/// // Create small, cheap to initialize and fast RNG with a random seed.
+/// // The randomness is supplied by the operating system.
+/// let mut small_rng = SmallRng::from_entropy();
+/// # let v: u32 = small_rng.gen();
+/// ```
+///
+/// When initializing a lot of `SmallRng`'s, using [`thread_rng`] can be more
+/// efficient:
+///
+/// ```
+/// use std::iter;
+/// use rand::{SeedableRng, thread_rng};
+/// use rand::rngs::SmallRng;
+///
+/// // Create a big, expensive to initialize and slower, but unpredictable RNG.
+/// // This is cached and done only once per thread.
+/// let mut thread_rng = thread_rng();
+/// // Create small, cheap to initialize and fast RNGs with random seeds.
+/// // One can generally assume this won't fail.
+/// let rngs: Vec<SmallRng> = iter::repeat(())
+///     .map(|()| SmallRng::from_rng(&mut thread_rng).unwrap())
+///     .take(10)
+///     .collect();
+/// ```
+///
+/// [`FromEntropy`]: ../trait.FromEntropy.html
+/// [`StdRng`]: struct.StdRng.html
+/// [`thread_rng`]: ../fn.thread_rng.html
+/// [Xorshift]: ../prng/struct.XorShiftRng.html
+/// [`XorShiftRng`]: ../prng/struct.XorShiftRng.html
+#[derive(Clone, Debug)]
+pub struct SmallRng(XorShiftRng);
+
+impl RngCore for SmallRng {
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest);
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl SeedableRng for SmallRng {
+    type Seed = <XorShiftRng as SeedableRng>::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        SmallRng(XorShiftRng::from_seed(seed))
+    }
+
+    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
+        XorShiftRng::from_rng(rng).map(SmallRng)
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/std.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/std.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/std.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/std.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,83 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The standard RNG
+
+use {RngCore, CryptoRng, Error, SeedableRng};
+use prng::Hc128Rng;
+
+/// The standard RNG. The PRNG algorithm in `StdRng` is chosen to be efficient
+/// on the current platform, to be statistically strong and unpredictable
+/// (meaning a cryptographically secure PRNG).
+///
+/// The current algorithm used on all platforms is [HC-128].
+///
+/// Reproducibility of output from this generator is however not required, thus
+/// future library versions may use a different internal generator with
+/// different output. Further, this generator may not be portable and can
+/// produce different output depending on the architecture. If you require
+/// reproducible output, use a named RNG, for example [`ChaChaRng`].
+///
+/// [HC-128]: ../prng/hc128/struct.Hc128Rng.html
+/// [`ChaChaRng`]: ../prng/chacha/struct.ChaChaRng.html
+#[derive(Clone, Debug)]
+pub struct StdRng(Hc128Rng);
+
+impl RngCore for StdRng {
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        self.0.next_u32()
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        self.0.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.0.fill_bytes(dest);
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.0.try_fill_bytes(dest)
+    }
+}
+
+impl SeedableRng for StdRng {
+    type Seed = <Hc128Rng as SeedableRng>::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        StdRng(Hc128Rng::from_seed(seed))
+    }
+
+    fn from_rng<R: RngCore>(rng: R) -> Result<Self, Error> {
+        Hc128Rng::from_rng(rng).map(StdRng)
+    }
+}
+
+impl CryptoRng for StdRng {}
+
+
+#[cfg(test)]
+mod test {
+    use {RngCore, SeedableRng};
+    use rngs::StdRng;
+
+    #[test]
+    fn test_stdrng_construction() {
+        let seed = [1,0,0,0, 23,0,0,0, 200,1,0,0, 210,30,0,0,
+                    0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+        let mut rng1 = StdRng::from_seed(seed);
+        assert_eq!(rng1.next_u64(), 15759097995037006553);
+
+        let mut rng2 = StdRng::from_rng(rng1).unwrap();
+        assert_eq!(rng2.next_u64(), 6766915756997287454);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/rngs/thread.rs cargo-0.33.0/vendor/rand-0.5.6/src/rngs/thread.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/rngs/thread.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/rngs/thread.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,141 @@
+// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Thread-local random number generator
+
+use std::cell::UnsafeCell;
+use std::rc::Rc;
+
+use {RngCore, CryptoRng, SeedableRng, Error};
+use rngs::adapter::ReseedingRng;
+use rngs::EntropyRng;
+use prng::hc128::Hc128Core;
+
+// Rationale for using `UnsafeCell` in `ThreadRng`:
+//
+// Previously we used a `RefCell`, with an overhead of ~15%. There will only
+// ever be one mutable reference to the interior of the `UnsafeCell`, because
+// we only have such a reference inside `next_u32`, `next_u64`, etc. Within a
+// single thread (which is the definition of `ThreadRng`), there will only ever
+// be one of these methods active at a time.
+//
+// A possible scenario where there could be multiple mutable references is if
+// `ThreadRng` is used inside `next_u32` and co. But the implementation is
+// completely under our control. We just have to ensure none of them use
+// `ThreadRng` internally, which is nonsensical anyway. We should also never run
+// `ThreadRng` in destructors of its implementation, which is also nonsensical.
+//
+// The additional `Rc` is not strictly neccesary, and could be removed. For now
+// it ensures `ThreadRng` stays `!Send` and `!Sync`, and implements `Clone`.
+
+
+// Number of generated bytes after which to reseed `TreadRng`.
+//
+// The time it takes to reseed HC-128 is roughly equivalent to generating 7 KiB.
+// We pick a treshold here that is large enough to not reduce the average
+// performance too much, but also small enough to not make reseeding something
+// that basically never happens.
+const THREAD_RNG_RESEED_THRESHOLD: u64 = 32*1024*1024; // 32 MiB
+
+/// The type returned by [`thread_rng`], essentially just a reference to the
+/// PRNG in thread-local memory.
+///
+/// `ThreadRng` uses [`ReseedingRng`] wrapping the same PRNG as [`StdRng`],
+/// which is reseeded after generating 32 MiB of random data. A single instance
+/// is cached per thread and the returned `ThreadRng` is a reference to this
+/// instance — hence `ThreadRng` is neither `Send` nor `Sync` but is safe to use
+/// within a single thread. This RNG is seeded and reseeded via [`EntropyRng`]
+/// as required.
+///
+/// Note that the reseeding is done as an extra precaution against entropy
+/// leaks and is in theory unnecessary — to predict `ThreadRng`'s output, an
+/// attacker would have to either determine most of the RNG's seed or internal
+/// state, or crack the algorithm used.
+///
+/// Like [`StdRng`], `ThreadRng` is a cryptographically secure PRNG. The current
+/// algorithm used is [HC-128], which is an array-based PRNG that trades memory
+/// usage for better performance. This makes it similar to ISAAC, the algorithm
+/// used in `ThreadRng` before rand 0.5.
+///
+/// Cloning this handle just produces a new reference to the same thread-local
+/// generator.
+/// 
+/// [`thread_rng`]: ../fn.thread_rng.html
+/// [`ReseedingRng`]: adapter/struct.ReseedingRng.html
+/// [`StdRng`]: struct.StdRng.html
+/// [`EntropyRng`]: struct.EntropyRng.html
+/// [HC-128]: ../prng/hc128/struct.Hc128Rng.html
+#[derive(Clone, Debug)]
+pub struct ThreadRng {
+    rng: Rc<UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>>>,
+}
+
+thread_local!(
+    static THREAD_RNG_KEY: Rc<UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>>> = {
+        let mut entropy_source = EntropyRng::new();
+        let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
+                panic!("could not initialize thread_rng: {}", err));
+        let rng = ReseedingRng::new(r,
+                                    THREAD_RNG_RESEED_THRESHOLD,
+                                    entropy_source);
+        Rc::new(UnsafeCell::new(rng))
+    }
+);
+
+/// Retrieve the lazily-initialized thread-local random number
+/// generator, seeded by the system. Intended to be used in method
+/// chaining style, e.g. `thread_rng().gen::<i32>()`, or cached locally, e.g.
+/// `let mut rng = thread_rng();`.
+///
+/// For more information see [`ThreadRng`].
+///
+/// [`ThreadRng`]: rngs/struct.ThreadRng.html
+pub fn thread_rng() -> ThreadRng {
+    ThreadRng { rng: THREAD_RNG_KEY.with(|t| t.clone()) }
+}
+
+impl RngCore for ThreadRng {
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        unsafe { (*self.rng.get()).next_u32() }
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        unsafe { (*self.rng.get()).next_u64() }
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        unsafe { (*self.rng.get()).fill_bytes(dest) }
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        unsafe { (*self.rng.get()).try_fill_bytes(dest) }
+    }
+}
+
+impl CryptoRng for ThreadRng {}
+
+
+#[cfg(test)]
+mod test {
+    #[test]
+    #[cfg(not(feature="stdweb"))]
+    fn test_thread_rng() {
+        use Rng;
+        let mut r = ::thread_rng();
+        r.gen::<i32>();
+        let mut v = [1, 1, 1];
+        r.shuffle(&mut v);
+        let b: &[_] = &[1, 1, 1];
+        assert_eq!(v, b);
+        assert_eq!(r.gen_range(0, 1), 0);
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/src/seq.rs cargo-0.33.0/vendor/rand-0.5.6/src/seq.rs
--- cargo-0.32.0/vendor/rand-0.5.6/src/seq.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/src/seq.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,334 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Functions for randomly accessing and sampling sequences.
+
+use super::Rng;
+
+// This crate is only enabled when either std or alloc is available.
+#[cfg(all(feature="alloc", not(feature="std")))] use alloc::vec::Vec;
+// BTreeMap is not as fast in tests, but better than nothing.
+#[cfg(feature="std")] use std::collections::HashMap;
+#[cfg(all(feature="alloc", not(feature="std")))] use alloc::collections::BTreeMap;
+
+/// Randomly sample `amount` elements from a finite iterator.
+///
+/// The following can be returned:
+///
+/// - `Ok`: `Vec` of `amount` non-repeating randomly sampled elements. The order is not random.
+/// - `Err`: `Vec` of all the elements from `iterable` in sequential order. This happens when the
+///   length of `iterable` was less than `amount`. This is considered an error since exactly
+///   `amount` elements is typically expected.
+///
+/// This implementation uses `O(len(iterable))` time and `O(amount)` memory.
+///
+/// # Example
+///
+/// ```
+/// use rand::{thread_rng, seq};
+///
+/// let mut rng = thread_rng();
+/// let sample = seq::sample_iter(&mut rng, 1..100, 5).unwrap();
+/// println!("{:?}", sample);
+/// ```
+pub fn sample_iter<T, I, R>(rng: &mut R, iterable: I, amount: usize) -> Result<Vec<T>, Vec<T>>
+    where I: IntoIterator<Item=T>,
+          R: Rng + ?Sized,
+{
+    let mut iter = iterable.into_iter();
+    let mut reservoir = Vec::with_capacity(amount);
+    reservoir.extend(iter.by_ref().take(amount));
+
+    // Continue unless the iterator was exhausted
+    //
+    // note: this prevents iterators that "restart" from causing problems.
+    // If the iterator stops once, then so do we.
+    if reservoir.len() == amount {
+        for (i, elem) in iter.enumerate() {
+            let k = rng.gen_range(0, i + 1 + amount);
+            if let Some(spot) = reservoir.get_mut(k) {
+                *spot = elem;
+            }
+        }
+        Ok(reservoir)
+    } else {
+        // Don't hang onto extra memory. There is a corner case where
+        // `amount` was much less than `len(iterable)`.
+        reservoir.shrink_to_fit();
+        Err(reservoir)
+    }
+}
+
+/// Randomly sample exactly `amount` values from `slice`.
+///
+/// The values are non-repeating and in random order.
+///
+/// This implementation uses `O(amount)` time and memory.
+///
+/// Panics if `amount > slice.len()`
+///
+/// # Example
+///
+/// ```
+/// use rand::{thread_rng, seq};
+///
+/// let mut rng = thread_rng();
+/// let values = vec![5, 6, 1, 3, 4, 6, 7];
+/// println!("{:?}", seq::sample_slice(&mut rng, &values, 3));
+/// ```
+pub fn sample_slice<R, T>(rng: &mut R, slice: &[T], amount: usize) -> Vec<T>
+    where R: Rng + ?Sized,
+          T: Clone
+{
+    let indices = sample_indices(rng, slice.len(), amount);
+
+    let mut out = Vec::with_capacity(amount);
+    out.extend(indices.iter().map(|i| slice[*i].clone()));
+    out
+}
+
+/// Randomly sample exactly `amount` references from `slice`.
+///
+/// The references are non-repeating and in random order.
+///
+/// This implementation uses `O(amount)` time and memory.
+///
+/// Panics if `amount > slice.len()`
+///
+/// # Example
+///
+/// ```
+/// use rand::{thread_rng, seq};
+///
+/// let mut rng = thread_rng();
+/// let values = vec![5, 6, 1, 3, 4, 6, 7];
+/// println!("{:?}", seq::sample_slice_ref(&mut rng, &values, 3));
+/// ```
+pub fn sample_slice_ref<'a, R, T>(rng: &mut R, slice: &'a [T], amount: usize) -> Vec<&'a T>
+    where R: Rng + ?Sized
+{
+    let indices = sample_indices(rng, slice.len(), amount);
+
+    let mut out = Vec::with_capacity(amount);
+    out.extend(indices.iter().map(|i| &slice[*i]));
+    out
+}
+
+/// Randomly sample exactly `amount` indices from `0..length`.
+///
+/// The values are non-repeating and in random order.
+///
+/// This implementation uses `O(amount)` time and memory.
+///
+/// This method is used internally by the slice sampling methods, but it can sometimes be useful to
+/// have the indices themselves so this is provided as an alternative.
+///
+/// Panics if `amount > length`
+pub fn sample_indices<R>(rng: &mut R, length: usize, amount: usize) -> Vec<usize>
+    where R: Rng + ?Sized,
+{
+    if amount > length {
+        panic!("`amount` must be less than or equal to `slice.len()`");
+    }
+
+    // We are going to have to allocate at least `amount` for the output no matter what. However,
+    // if we use the `cached` version we will have to allocate `amount` as a HashMap as well since
+    // it inserts an element for every loop.
+    //
+    // Therefore, if `amount >= length / 2` then inplace will be both faster and use less memory.
+    // In fact, benchmarks show the inplace version is faster for length up to about 20 times
+    // faster than amount.
+    //
+    // TODO: there is probably even more fine-tuning that can be done here since
+    // `HashMap::with_capacity(amount)` probably allocates more than `amount` in practice,
+    // and a trade off could probably be made between memory/cpu, since hashmap operations
+    // are slower than array index swapping.
+    if amount >= length / 20 {
+        sample_indices_inplace(rng, length, amount)
+    } else {
+        sample_indices_cache(rng, length, amount)
+    }
+}
+
+/// Sample an amount of indices using an inplace partial fisher yates method.
+///
+/// This allocates the entire `length` of indices and randomizes only the first `amount`.
+/// It then truncates to `amount` and returns.
+///
+/// This is better than using a `HashMap` "cache" when `amount >= length / 2`
+/// since it does not require allocating an extra cache and is much faster.
+fn sample_indices_inplace<R>(rng: &mut R, length: usize, amount: usize) -> Vec<usize>
+    where R: Rng + ?Sized,
+{
+    debug_assert!(amount <= length);
+    let mut indices: Vec<usize> = Vec::with_capacity(length);
+    indices.extend(0..length);
+    for i in 0..amount {
+        let j: usize = rng.gen_range(i, length);
+        indices.swap(i, j);
+    }
+    indices.truncate(amount);
+    debug_assert_eq!(indices.len(), amount);
+    indices
+}
+
+
+/// This method performs a partial fisher-yates on a range of indices using a
+/// `HashMap` as a cache to record potential collisions.
+///
+/// The cache avoids allocating the entire `length` of values. This is especially useful when
+/// `amount <<< length`, i.e. select 3 non-repeating from `1_000_000`
+fn sample_indices_cache<R>(
+    rng: &mut R,
+    length: usize,
+    amount: usize,
+) -> Vec<usize>
+    where R: Rng + ?Sized,
+{
+    debug_assert!(amount <= length);
+    #[cfg(feature="std")] let mut cache = HashMap::with_capacity(amount);
+    #[cfg(not(feature="std"))] let mut cache = BTreeMap::new();
+    let mut out = Vec::with_capacity(amount);
+    for i in 0..amount {
+        let j: usize = rng.gen_range(i, length);
+
+        // equiv: let tmp = slice[i];
+        let tmp = match cache.get(&i) {
+            Some(e) => *e,
+            None => i,
+        };
+
+        // equiv: slice[i] = slice[j];
+        let x = match cache.get(&j) {
+            Some(x) => *x,
+            None => j,
+        };
+
+        // equiv: slice[j] = tmp;
+        cache.insert(j, tmp);
+
+        // note that in the inplace version, slice[i] is automatically "returned" value
+        out.push(x);
+    }
+    debug_assert_eq!(out.len(), amount);
+    out
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use {XorShiftRng, Rng, SeedableRng};
+    #[cfg(not(feature="std"))]
+    use alloc::vec::Vec;
+
+    #[test]
+    fn test_sample_iter() {
+        let min_val = 1;
+        let max_val = 100;
+
+        let mut r = ::test::rng(401);
+        let vals = (min_val..max_val).collect::<Vec<i32>>();
+        let small_sample = sample_iter(&mut r, vals.iter(), 5).unwrap();
+        let large_sample = sample_iter(&mut r, vals.iter(), vals.len() + 5).unwrap_err();
+
+        assert_eq!(small_sample.len(), 5);
+        assert_eq!(large_sample.len(), vals.len());
+        // no randomization happens when amount >= len
+        assert_eq!(large_sample, vals.iter().collect::<Vec<_>>());
+
+        assert!(small_sample.iter().all(|e| {
+            **e >= min_val && **e <= max_val
+        }));
+    }
+    #[test]
+    fn test_sample_slice_boundaries() {
+        let empty: &[u8] = &[];
+
+        let mut r = ::test::rng(402);
+
+        // sample 0 items
+        assert_eq!(&sample_slice(&mut r, empty, 0)[..], [0u8; 0]);
+        assert_eq!(&sample_slice(&mut r, &[42, 2, 42], 0)[..], [0u8; 0]);
+
+        // sample 1 item
+        assert_eq!(&sample_slice(&mut r, &[42], 1)[..], [42]);
+        let v = sample_slice(&mut r, &[1, 42], 1)[0];
+        assert!(v == 1 || v == 42);
+
+        // sample "all" the items
+        let v = sample_slice(&mut r, &[42, 133], 2);
+        assert!(&v[..] == [42, 133] || v[..] == [133, 42]);
+
+        assert_eq!(&sample_indices_inplace(&mut r, 0, 0)[..], [0usize; 0]);
+        assert_eq!(&sample_indices_inplace(&mut r, 1, 0)[..], [0usize; 0]);
+        assert_eq!(&sample_indices_inplace(&mut r, 1, 1)[..], [0]);
+
+        assert_eq!(&sample_indices_cache(&mut r, 0, 0)[..], [0usize; 0]);
+        assert_eq!(&sample_indices_cache(&mut r, 1, 0)[..], [0usize; 0]);
+        assert_eq!(&sample_indices_cache(&mut r, 1, 1)[..], [0]);
+
+        // Make sure lucky 777's aren't lucky
+        let slice = &[42, 777];
+        let mut num_42 = 0;
+        let total = 1000;
+        for _ in 0..total {
+            let v = sample_slice(&mut r, slice, 1);
+            assert_eq!(v.len(), 1);
+            let v = v[0];
+            assert!(v == 42 || v == 777);
+            if v == 42 {
+                num_42 += 1;
+            }
+        }
+        let ratio_42 = num_42 as f64 / 1000 as f64;
+        assert!(0.4 <= ratio_42 || ratio_42 <= 0.6, "{}", ratio_42);
+    }
+
+    #[test]
+    fn test_sample_slice() {
+        let xor_rng = XorShiftRng::from_seed;
+
+        let max_range = 100;
+        let mut r = ::test::rng(403);
+
+        for length in 1usize..max_range {
+            let amount = r.gen_range(0, length);
+            let mut seed = [0u8; 16];
+            r.fill(&mut seed);
+
+            // assert that the two index methods give exactly the same result
+            let inplace = sample_indices_inplace(
+                &mut xor_rng(seed), length, amount);
+            let cache = sample_indices_cache(
+                &mut xor_rng(seed), length, amount);
+            assert_eq!(inplace, cache);
+
+            // assert the basics work
+            let regular = sample_indices(
+                &mut xor_rng(seed), length, amount);
+            assert_eq!(regular.len(), amount);
+            assert!(regular.iter().all(|e| *e < length));
+            assert_eq!(regular, inplace);
+
+            // also test that sampling the slice works
+            let vec: Vec<usize> = (0..length).collect();
+            {
+                let result = sample_slice(&mut xor_rng(seed), &vec, amount);
+                assert_eq!(result, regular);
+            }
+
+            {
+                let result = sample_slice_ref(&mut xor_rng(seed), &vec, amount);
+                let expected = regular.iter().map(|v| v).collect::<Vec<_>>();
+                assert_eq!(result, expected);
+            }
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/tests/bool.rs cargo-0.33.0/vendor/rand-0.5.6/tests/bool.rs
--- cargo-0.32.0/vendor/rand-0.5.6/tests/bool.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/tests/bool.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,23 @@
+#![no_std]
+
+extern crate rand;
+
+use rand::SeedableRng;
+use rand::rngs::SmallRng;
+use rand::distributions::{Distribution, Bernoulli};
+
+/// This test should make sure that we don't accidentally have undefined
+/// behavior for large propabilties due to
+/// https://github.com/rust-lang/rust/issues/10184.
+/// Expressions like `1.0*(u64::MAX as f64) as u64` have to be avoided.
+#[test]
+fn large_probability() {
+    let p = 1. - ::core::f64::EPSILON / 2.;
+    assert!(p < 1.);
+    let d = Bernoulli::new(p);
+    let mut rng = SmallRng::from_seed(
+        [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
+    for _ in 0..10 {
+        assert!(d.sample(&mut rng), "extremely unlikely to fail by accident");
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/UPDATING.md cargo-0.33.0/vendor/rand-0.5.6/UPDATING.md
--- cargo-0.32.0/vendor/rand-0.5.6/UPDATING.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/UPDATING.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,260 @@
+# Update Guide
+
+This guide gives a few more details than the [changelog], in particular giving
+guidance on how to use new features and migrate away from old ones.
+
+[changelog]: CHANGELOG.md
+
+## Rand 0.5
+
+The 0.5 release has quite significant changes over the 0.4 release; as such,
+it may be worth reading through the following coverage of breaking changes.
+This release also contains many optimisations, which are not detailed below.
+
+### Crates
+
+We have a new crate: `rand_core`! This crate houses some important traits,
+`RngCore`, `BlockRngCore`, `SeedableRng` and `CryptoRng`, the error types, as
+well as two modules with helpers for implementations: `le` and `impls`. It is
+recommended that implementations of generators use the `rand_core` crate while
+other users use only the `rand` crate, which re-exports most parts of `rand_core`.
+
+The `rand_derive` crate has been deprecated due to very low usage and
+deprecation of `Rand`.
+
+### Features
+
+Several new Cargo feature flags have been added:
+
+-   `alloc`, used without `std`, allows use of `Box` and `Vec`
+-   `serde1` adds serialization support to some PRNGs
+-   `log` adds logging in a few places (primarily to `OsRng` and `JitterRng`)
+
+### `Rng` and friends (core traits)
+
+`Rng` trait has been split into two traits, a "back end" `RngCore` (implemented
+by generators) and a "front end" `Rng` implementing all the convenient extension
+methods.
+
+Implementations of generators must `impl RngCore` instead. Usage of `rand_core`
+for implementations is encouraged; the `rand_core::{le, impls}` modules may
+prove useful.
+
+Users of `Rng` *who don't need to implement it* won't need to make so many
+changes; often users can forget about `RngCore` and only import `Rng`. Instead
+of `RngCore::next_u32()` / `next_u64()` users should prefer `Rng::gen()`, and
+instead of `RngCore::fill_bytes(dest)`, `Rng::fill(dest)` can be used.
+
+#### `Rng` / `RngCore` methods
+
+To allow error handling from fallible sources (e.g. `OsRng`), a new
+`RngCore::try_fill_bytes` method has been added; for example `EntropyRng` uses
+this mechanism to fall back to `JitterRng` if `OsRng` fails, and various
+handlers produce better error messages.
+As before, the other methods will panic on failure, but since these are usually
+used with algorithmic generators which are usually infallible, this is
+considered an appropriate compromise.
+
+A few methods from the old `Rng` have been removed or deprecated:
+
+-   `next_f32` and `next_f64`; these are no longer implementable by generators;
+    use `gen` instead
+-   `gen_iter`; users may instead use standard iterators with closures:
+    `::std::iter::repeat(()).map(|()| rng.gen())`
+-   `gen_ascii_chars`; use `repeat` as above and `rng.sample(Alphanumeric)`
+-   `gen_weighted_bool(n)`; use `gen_bool(1.0 / n)` instead
+
+`Rng` has a few new methods:
+
+-   `sample(distr)` is a shortcut for `distr.sample(rng)` for any `Distribution`
+-   `gen_bool(p)` generates a boolean with probability `p` of being true
+-   `fill` and `try_fill`, corresponding to `fill_bytes` and `try_fill_bytes`
+    respectively (i.e. the only difference is error handling); these can fill
+    and integer slice / array directly, and provide better performance
+    than `gen()`
+
+#### Constructing PRNGs
+
+##### New randomly-initialised PRNGs
+
+A new trait has been added: `FromEntropy`. This is automatically implemented for
+any type supporting `SeedableRng`, and provides construction from fresh, strong
+entropy:
+
+```rust
+use rand::{ChaChaRng, FromEntropy};
+
+let mut rng = ChaChaRng::from_entropy();
+```
+
+##### Seeding PRNGs
+
+The `SeedableRng` trait has been modified to include the seed type via an
+associated type (`SeedableRng::Seed`) instead of a template parameter
+(`SeedableRng<Seed>`). Additionally, all PRNGs now seed from a byte-array
+(`[u8; N]` for some fixed N). This allows generic handling of PRNG seeding
+which was not previously possible.
+
+PRNGs are no longer constructed from other PRNGs via `Rand` support / `gen()`,
+but through `SeedableRng::from_rng`, which allows error handling and is
+intentionally explicit.
+
+`SeedableRng::reseed` has been removed since it has no utility over `from_seed`
+and its performance advantage is questionable.
+
+Implementations of `SeedableRng` may need to change their `Seed` type to a
+byte-array; this restriction has been made to ensure portable handling of
+Endianness. Helper functions are available in `rand_core::le` to read `u32` and
+`u64` values from byte arrays.
+
+#### Block-based PRNGs
+
+rand_core has a new helper trait, `BlockRngCore`, and implementation,
+`BlockRng`. These are for use by generators which generate a block of random
+data at a time instead of word-sized values. Using this trait and implementation
+has two advantages: optimised `RngCore` methods are provided, and the PRNG can
+be used with `ReseedingRng` with very low overhead.
+
+#### Cryptographic RNGs
+
+A new trait has been added: `CryptoRng`. This is purely a marker trait to
+indicate which generators should be suitable for cryptography, e.g.
+`fn foo<R: Rng + CryptoRng>(rng: &mut R)`. *Suitability for cryptographic
+use cannot be guaranteed.*
+
+### Error handling
+
+A new `Error` type has been added, designed explicitly for no-std compatibility,
+simplicity, and enough flexibility for our uses (carrying a `cause` when
+possible):
+```rust
+pub struct Error {
+    pub kind: ErrorKind,
+    pub msg: &'static str,
+    // some fields omitted
+}
+```
+The associated `ErrorKind` allows broad classification of errors into permanent,
+unexpected, transient and not-yet-ready kinds.
+
+The following use the new error type:
+
+-   `RngCore::try_fill_bytes`
+-   `Rng::try_fill`
+-   `OsRng::new`
+-   `JitterRng::new`
+
+### External generators
+
+We have a new generator, `EntropyRng`, which wraps `OsRng` and `JitterRng`
+(preferring to use the former, but falling back to the latter if necessary).
+This allows easy construction with fallback via `SeedableRng::from_rng`,
+e.g. `IsaacRng::from_rng(EntropyRng::new())?`. This is equivalent to using
+`FromEntropy` except for error handling.
+
+It is recommended to use `EntropyRng` over `OsRng` to avoid errors on platforms
+with broken system generator, but it should be noted that the `JitterRng`
+fallback is very slow.
+
+### PRNGs
+
+*Pseudo-Random Number Generators* (i.e. deterministic algorithmic generators)
+have had a few changes since 0.4, and are now housed in the `prng` module
+(old names remain temporarily available for compatibility; eventually these
+generators will likely be housed outside the `rand` crate).
+
+All PRNGs now do not implement `Copy` to prevent accidental copying of the
+generator's state (and thus repetitions of generated values). Explicit cloning
+via `Clone` is still available. All PRNGs now have a custom implementation of
+`Debug` which does not print any internal state; this helps avoid accidentally
+leaking cryptographic generator state in log files. External PRNG
+implementations are advised to follow this pattern (see also doc on `RngCore`).
+
+`SmallRng` has been added as a wrapper, currently around `XorShiftRng` (but
+likely another algorithm soon). This is for uses where small state and fast
+initialisation are important but cryptographic strength is not required.
+(Actual performance of generation varies by benchmark; dependending on usage
+this may or may not be the fastest algorithm, but will always be fast.)
+
+#### `ReseedingRng`
+
+The `ReseedingRng` wrapper has been signficantly altered to reduce overhead.
+Unfortunately the new `ReseedingRng` is not compatible with all RNGs, but only
+those using `BlockRngCore`.
+
+#### ISAAC PRNGs
+
+The `IsaacRng` and `Isaac64Rng` PRNGs now have an additional construction
+method: `new_from_u64(seed)`. 64 bits of state is insufficient for cryptography
+but may be of use in simulations and games. This will likely be superceeded by
+a method to construct any PRNG from any hashable object in the future.
+
+#### HC-128
+
+This is a new cryptographic generator, selected as one of the "stream ciphers
+suitable for widespread adoption" by eSTREAM. This is now the default
+cryptographic generator, used by `StdRng` and `thread_rng()`.
+
+### Helper functions/traits
+
+The `Rand` trait has been deprecated. Instead, users are encouraged to use
+`Standard` which is a real distribution and supports the same sampling as
+`Rand`. `Rng::gen()` now uses `Standard` and should work exactly as before.
+See the documentation of the `distributions` module on how to implement
+`Distribution<T>` for `Standard` for user types `T`
+
+`weak_rng()` has been deprecated; use `SmallRng::from_entropy()` instead.
+
+### Distributions
+
+The `Sample` and `IndependentSample` traits have been replaced by a single
+trait, `Distribution`. This is largely equivalent to `IndependentSample`, but
+with `ind_sample` replaced by just `sample`. Support for mutable distributions
+has been dropped; although it appears there may be a few genuine uses, these
+are not used widely enough to justify the existance of two independent traits
+or of having to provide mutable access to a distribution object. Both `Sample`
+and `IndependentSample` are still available, but deprecated; they will be
+removed in a future release.
+
+`Distribution::sample` (as well as several other functions) can now be called
+directly on type-erased (unsized) RNGs.
+
+`RandSample` has been removed (see `Rand` deprecation and new `Standard`
+distribution).
+
+The `Closed01` wrapper has been removed, but `OpenClosed01` has been added.
+
+#### Uniform distributions
+
+Two new distributions are available:
+
+-   `Standard` produces uniformly-distributed samples for many different types,
+    and acts as a replacement for `Rand`
+-   `Alphanumeric` samples `char`s from the ranges `a-z A-Z 0-9`
+
+##### Ranges
+
+The `Range` distribution has been heavily adapted, and renamed to `Uniform`:
+
+-   `Uniform::new(low, high)` remains (half open `[low, high)`)
+-   `Uniform::new_inclusive(low, high)` has been added, including `high` in the sample range
+-   `Uniform::sample_single(low, high, rng)` is a faster variant for single usage sampling from `[low, high)`
+
+`Uniform` can now be implemented for user-defined types; see the `uniform` module.
+
+#### Non-uniform distributions
+
+Two distributions have been added:
+
+-   Poisson, modelling the number of events expected from a constant-rate
+    source within a fixed time interval (e.g. nuclear decay)
+-   Binomial, modelling the outcome of a fixed number of yes-no trials
+
+The sampling methods are based on those in "Numerical Recipes in C".
+
+##### Exponential and Normal distributions
+
+The main `Exp` and `Normal` distributions are unchanged, however the
+"standard" versions, `Exp1` and `StandardNormal` are no longer wrapper types,
+but full distributions. Instead of writing `let Exp1(x) = rng.gen();` you now
+write `let x = rng.sample(Exp1);`.
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/utils/ci/install.sh cargo-0.33.0/vendor/rand-0.5.6/utils/ci/install.sh
--- cargo-0.32.0/vendor/rand-0.5.6/utils/ci/install.sh	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/utils/ci/install.sh	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,49 @@
+# From https://github.com/japaric/trust
+
+set -ex
+
+main() {
+    local target=
+    if [ $TRAVIS_OS_NAME = linux ]; then
+        target=x86_64-unknown-linux-musl
+        sort=sort
+    else
+        target=x86_64-apple-darwin
+        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
+    fi
+
+    # Builds for iOS are done on OSX, but require the specific target to be
+    # installed.
+    case $TARGET in
+        aarch64-apple-ios)
+            rustup target install aarch64-apple-ios
+            ;;
+        armv7-apple-ios)
+            rustup target install armv7-apple-ios
+            ;;
+        armv7s-apple-ios)
+            rustup target install armv7s-apple-ios
+            ;;
+        i386-apple-ios)
+            rustup target install i386-apple-ios
+            ;;
+        x86_64-apple-ios)
+            rustup target install x86_64-apple-ios
+            ;;
+    esac
+
+    # This fetches latest stable release
+    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+                       | cut -d/ -f3 \
+                       | grep -E '^v[0.1.0-9.]+$' \
+                       | $sort --version-sort \
+                       | tail -n1)
+    curl -LSfs https://japaric.github.io/trust/install.sh | \
+        sh -s -- \
+           --force \
+           --git japaric/cross \
+           --tag $tag \
+           --target $target
+}
+
+main
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/utils/ci/script.sh cargo-0.33.0/vendor/rand-0.5.6/utils/ci/script.sh
--- cargo-0.32.0/vendor/rand-0.5.6/utils/ci/script.sh	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/utils/ci/script.sh	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,29 @@
+# Derived from https://github.com/japaric/trust
+
+set -ex
+
+main() {
+    if [ ! -z $DISABLE_TESTS ]; then    # tests are disabled
+        cross build --no-default-features --target $TARGET --release
+        if [ -z $DISABLE_STD ]; then    # std is enabled
+            cross build --features log,serde1 --target $TARGET
+        fi
+        return
+    fi
+
+    if [ ! -z $NIGHTLY ]; then  # have nightly Rust
+        cross test --tests --no-default-features --features alloc --target $TARGET
+        cross test --package rand_core --no-default-features --features alloc --target $TARGET
+        cross test --features serde1,log,nightly,alloc --target $TARGET
+        cross test --all --benches --target $TARGET
+    else    # have stable Rust
+        cross test --tests --no-default-features --target $TARGET
+        cross test --package rand_core --no-default-features --target $TARGET
+        cross test --features serde1,log --target $TARGET
+    fi
+}
+
+# we don't run the "test phase" when doing deploys
+if [ -z $TRAVIS_TAG ]; then
+    main
+fi
diff -Nru cargo-0.32.0/vendor/rand-0.5.6/utils/ziggurat_tables.py cargo-0.33.0/vendor/rand-0.5.6/utils/ziggurat_tables.py
--- cargo-0.32.0/vendor/rand-0.5.6/utils/ziggurat_tables.py	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand-0.5.6/utils/ziggurat_tables.py	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,127 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# https://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+# This creates the tables used for distributions implemented using the
+# ziggurat algorithm in `rand::distributions;`. They are
+# (basically) the tables as used in the ZIGNOR variant (Doornik 2005).
+# They are changed rarely, so the generated file should be checked in
+# to git.
+#
+# It creates 3 tables: X as in the paper, F which is f(x_i), and
+# F_DIFF which is f(x_i) - f(x_{i-1}). The latter two are just cached
+# values which is not done in that paper (but is done in other
+# variants). Note that the adZigR table is unnecessary because of
+# algebra.
+#
+# It is designed to be compatible with Python 2 and 3.
+
+from math import exp, sqrt, log, floor
+import random
+
+# The order should match the return value of `tables`
+TABLE_NAMES = ['X', 'F']
+
+# The actual length of the table is 1 more, to stop
+# index-out-of-bounds errors. This should match the bitwise operation
+# to find `i` in `zigurrat` in `libstd/rand/mod.rs`. Also the *_R and
+# *_V constants below depend on this value.
+TABLE_LEN = 256
+
+# equivalent to `zigNorInit` in Doornik2005, but generalised to any
+# distribution. r = dR, v = dV, f = probability density function,
+# f_inv = inverse of f
+def tables(r, v, f, f_inv):
+    # compute the x_i
+    xvec = [0]*(TABLE_LEN+1)
+
+    xvec[0] = v / f(r)
+    xvec[1] = r
+
+    for i in range(2, TABLE_LEN):
+        last = xvec[i-1]
+        xvec[i] = f_inv(v / last + f(last))
+
+    # cache the f's
+    fvec = [0]*(TABLE_LEN+1)
+    for i in range(TABLE_LEN+1):
+        fvec[i] = f(xvec[i])
+
+    return xvec, fvec
+
+# Distributions
+# N(0, 1)
+def norm_f(x):
+    return exp(-x*x/2.0)
+def norm_f_inv(y):
+    return sqrt(-2.0*log(y))
+
+NORM_R = 3.6541528853610088
+NORM_V = 0.00492867323399
+
+NORM = tables(NORM_R, NORM_V,
+              norm_f, norm_f_inv)
+
+# Exp(1)
+def exp_f(x):
+    return exp(-x)
+def exp_f_inv(y):
+    return -log(y)
+
+EXP_R = 7.69711747013104972
+EXP_V = 0.0039496598225815571993
+
+EXP = tables(EXP_R, EXP_V,
+             exp_f, exp_f_inv)
+
+
+# Output the tables/constants/types
+
+def render_static(name, type, value):
+    # no space or
+    return 'pub static %s: %s =%s;\n' % (name, type, value)
+
+# static `name`: [`type`, .. `len(values)`] =
+#     [values[0], ..., values[3],
+#      values[4], ..., values[7],
+#      ... ];
+def render_table(name, values):
+    rows = []
+    # 4 values on each row
+    for i in range(0, len(values), 4):
+        row = values[i:i+4]
+        rows.append(', '.join('%.18f' % f for f in row))
+
+    rendered = '\n    [%s]' % ',\n     '.join(rows)
+    return render_static(name, '[f64, .. %d]' % len(values), rendered)
+
+
+with open('ziggurat_tables.rs', 'w') as f:
+    f.write('''// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// https://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Tables for distributions which are sampled using the ziggurat
+// algorithm. Autogenerated by `ziggurat_tables.py`.
+
+pub type ZigTable = &\'static [f64, .. %d];
+'''  % (TABLE_LEN + 1))
+    for name, tables, r in [('NORM', NORM, NORM_R),
+                            ('EXP', EXP, EXP_R)]:
+        f.write(render_static('ZIG_%s_R' % name, 'f64', ' %.18f' % r))
+        for (tabname, table) in zip(TABLE_NAMES, tables):
+            f.write(render_table('ZIG_%s_%s' % (name, tabname), table))
diff -Nru cargo-0.32.0/vendor/rand_chacha/build.rs cargo-0.33.0/vendor/rand_chacha/build.rs
--- cargo-0.32.0/vendor/rand_chacha/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,8 +1,7 @@
-extern crate rustc_version;
-use rustc_version::{version, Version};
+extern crate autocfg;
 
 fn main() {
-    if version().unwrap() >= Version::parse("1.26.0").unwrap() {
-        println!("cargo:rustc-cfg=rust_1_26");
-    }
+    println!("cargo:rerun-if-changed=build.rs");
+    let ac = autocfg::new();
+    ac.emit_rustc_version(1, 26);
 }
diff -Nru cargo-0.32.0/vendor/rand_chacha/.cargo-checksum.json cargo-0.33.0/vendor/rand_chacha/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_chacha/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a"}
\ No newline at end of file
+{"files":{},"package":"556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_chacha/Cargo.toml cargo-0.33.0/vendor/rand_chacha/Cargo.toml
--- cargo-0.32.0/vendor/rand_chacha/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,12 +12,12 @@
 
 [package]
 name = "rand_chacha"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["The Rand Project Developers", "The Rust Project Developers"]
 build = "build.rs"
 description = "ChaCha random number generator\n"
 homepage = "https://crates.io/crates/rand_chacha"
-documentation = "https://docs.rs/rand_chacha"
+documentation = "https://rust-random.github.io/rand/rand_chacha"
 readme = "README.md"
 keywords = ["random", "rng", "chacha"]
 categories = ["algorithms", "no-std"]
@@ -26,8 +26,8 @@
 [dependencies.rand_core]
 version = ">=0.2, <0.4"
 default-features = false
-[build-dependencies.rustc_version]
-version = "0.2"
+[build-dependencies.autocfg]
+version = "0.1"
 [badges.appveyor]
 repository = "rust-random/rand"
 
diff -Nru cargo-0.32.0/vendor/rand_chacha/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_chacha/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_chacha/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "ded3fd85a1b91752d382b749cfc5070ab8103e35"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_chacha/CHANGELOG.md cargo-0.33.0/vendor/rand_chacha/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_chacha/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -4,5 +4,9 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.1] - 2019-01-04
+- Disable `i128` and `u128` if the `target_os` is `emscripten` (#671: work-around Emscripten limitation)
+- Update readme and doc links
+
 ## [0.1.0] - 2018-10-17
 - Pulled out of the Rand crate
diff -Nru cargo-0.32.0/vendor/rand_chacha/README.md cargo-0.33.0/vendor/rand_chacha/README.md
--- cargo-0.32.0/vendor/rand_chacha/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -3,9 +3,10 @@
 [![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
 [![Latest version](https://img.shields.io/crates/v/rand_chacha.svg)](https://crates.io/crates/rand_chacha)
-[![Documentation](https://docs.rs/rand_chacha/badge.svg)](https://docs.rs/rand_chacha)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-yellow.svg)](https://github.com/rust-random/rand#rust-version-requirements)
-[![License](https://img.shields.io/crates/l/rand_chacha.svg)](https://github.com/rust-random/rand/tree/master/rand_chacha#license)
+[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_chacha)
+[![API](https://docs.rs/rand_chacha/badge.svg)](https://docs.rs/rand_chacha)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
 A cryptographically secure random number generator that uses the ChaCha
 algorithm.
@@ -15,11 +16,11 @@
 selected as one of the "stream ciphers suitable for widespread adoption" by
 eSTREAM[^2].
 
-Documentation:
-[master branch](https://rust-random.github.io/rand/rand_chacha/index.html),
-[by release](https://docs.rs/rand_chacha)
+Links:
 
-[Changelog](CHANGELOG.md)
+-   [API documentation (master)](https://rust-random.github.io/rand/rand_chacha)
+-   [API documentation (docs.rs)](https://docs.rs/rand_chacha)
+-   [Changelog](CHANGELOG.md)
 
 [rand]: https://crates.io/crates/rand
 [^1]: D. J. Bernstein, [*ChaCha, a variant of Salsa20*](
diff -Nru cargo-0.32.0/vendor/rand_chacha/src/chacha.rs cargo-0.33.0/vendor/rand_chacha/src/chacha.rs
--- cargo-0.32.0/vendor/rand_chacha/src/chacha.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/src/chacha.rs	2019-02-06 04:11:58.000000000 +0000
@@ -114,7 +114,7 @@
     /// byte-offset.
     ///
     /// Note: this function is currently only available with Rust 1.26 or later.
-    #[cfg(rust_1_26)]
+    #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
     pub fn get_word_pos(&self) -> u128 {
         let mut c = (self.0.core.state[13] as u64) << 32
                   | (self.0.core.state[12] as u64);
@@ -135,7 +135,7 @@
     /// 60 bits.
     ///
     /// Note: this function is currently only available with Rust 1.26 or later.
-    #[cfg(rust_1_26)]
+    #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
     pub fn set_word_pos(&mut self, word_offset: u128) {
         let index = (word_offset as usize) & 0xF;
         let counter = (word_offset >> 4) as u64;
@@ -330,7 +330,7 @@
     }
 
     #[test]
-    #[cfg(rust_1_26)]
+    #[cfg(all(rustc_1_26, not(target_os = "emscripten")))]
     fn test_chacha_true_values_c() {
         // Test vector 4 from
         // https://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
diff -Nru cargo-0.32.0/vendor/rand_chacha/src/lib.rs cargo-0.33.0/vendor/rand_chacha/src/lib.rs
--- cargo-0.32.0/vendor/rand_chacha/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_chacha/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,7 +10,7 @@
 
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
        html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/rand_chacha/0.1.0")]
+       html_root_url = "https://rust-random.github.io/rand/")]
 
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
diff -Nru cargo-0.32.0/vendor/rand_core/.cargo-checksum.json cargo-0.33.0/vendor/rand_core/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_core/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"}
\ No newline at end of file
+{"files":{},"package":"d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_core/Cargo.toml cargo-0.33.0/vendor/rand_core/Cargo.toml
--- cargo-0.32.0/vendor/rand_core/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,11 +12,11 @@
 
 [package]
 name = "rand_core"
-version = "0.3.0"
-authors = ["The Rust Project Developers"]
+version = "0.4.0"
+authors = ["The Rand Project Developers", "The Rust Project Developers"]
 description = "Core random number generator traits and tools for implementation.\n"
 homepage = "https://crates.io/crates/rand_core"
-documentation = "https://docs.rs/rand_core"
+documentation = "https://rust-random.github.io/rand/rand_core"
 readme = "README.md"
 keywords = ["random", "rng"]
 categories = ["algorithms", "no-std"]
@@ -32,11 +32,10 @@
 
 [features]
 alloc = []
-default = ["std"]
 serde1 = ["serde", "serde_derive"]
 std = ["alloc"]
 [badges.appveyor]
-repository = "dhardy/rand"
+repository = "rust-random/rand"
 
 [badges.travis-ci]
 repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand_core/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_core/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_core/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "317651c9f0240ed3305d2ae61a7f4aac4c513ad6"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_core/CHANGELOG.md cargo-0.33.0/vendor/rand_core/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_core/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -4,6 +4,9 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - 2019-01-24
+- Disable the `std` feature by default (#702)
+
 ## [0.3.0] - 2018-09-24
 - Add `SeedableRng::seed_from_u64` for convenient seeding. (#537)
 
diff -Nru cargo-0.32.0/vendor/rand_core/LICENSE-MIT cargo-0.33.0/vendor/rand_core/LICENSE-MIT
--- cargo-0.32.0/vendor/rand_core/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -1,3 +1,4 @@
+Copyright 2018 Developers of the Rand project
 Copyright (c) 2014 The Rust Project Developers
 
 Permission is hereby granted, free of charge, to any
diff -Nru cargo-0.32.0/vendor/rand_core/README.md cargo-0.33.0/vendor/rand_core/README.md
--- cargo-0.32.0/vendor/rand_core/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,12 @@
 # rand_core
 
 [![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/dhardy/rand)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
 [![Latest version](https://img.shields.io/crates/v/rand_core.svg)](https://crates.io/crates/rand_core)
-[![Documentation](https://docs.rs/rand_core/badge.svg)](https://docs.rs/rand_core)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-yellow.svg)](https://github.com/rust-random/rand#rust-version-requirements)
-[![License](https://img.shields.io/crates/l/rand_core.svg)](https://github.com/rust-random/rand/tree/master/rand_core#license)
+[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_core)
+[![API](https://docs.rs/rand_core/badge.svg)](https://docs.rs/rand_core)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
 Core traits and error types of the [rand] library, plus tools for implementing
 RNGs.
@@ -20,11 +21,11 @@
 point, list permutations and secure initialisation of RNGs). Most users should
 prefer to use the main [rand] crate.
 
-Documentation:
-[master branch](https://rust-random.github.io/rand/rand_core/index.html),
-[by release](https://docs.rs/rand_core)
+Links:
 
-[Changelog](CHANGELOG.md)
+-   [API documentation (master)](https://rust-random.github.io/rand/rand_core)
+-   [API documentation (docs.rs)](https://docs.rs/rand_core)
+-   [Changelog](CHANGELOG.md)
 
 [rand]: https://crates.io/crates/rand
 
@@ -43,13 +44,14 @@
 
 `rand_core` supports `no_std` and `alloc`-only configurations, as well as full
 `std` functionality. The differences between `no_std` and full `std` are small,
-comprising `RngCore` support for `Box<R>` types where `R: RngCore`, as well as
+comprising `RngCore` support for `Box<R>` types where `R: RngCore`,
+`std::io::Read` support for types supporting `RngCore`, and
 extensions to the `Error` type's functionality.
 
-Due to [rust-lang/cargo#1596](https://github.com/rust-lang/cargo/issues/1596),
-`rand_core` is built without `std` support by default. Since features are
-unioned across the whole dependency tree, any crate using `rand` with its
-default features will also enable `std` support in `rand_core`.
+The `std` feature is *not enabled by default*. This is primarily to avoid build
+problems where one crate implicitly requires `rand_core` with `std` support and
+another crate requires `rand` *without* `std` support. However, the `rand` crate
+continues to enable `std` support by default, both for itself and `rand_core`.
 
 The `serde1` feature can be used to derive `Serialize` and `Deserialize` for RNG
 implementations that use the `BlockRng` or `BlockRng64` wrappers.
diff -Nru cargo-0.32.0/vendor/rand_core/src/block.rs cargo-0.33.0/vendor/rand_core/src/block.rs
--- cargo-0.32.0/vendor/rand_core/src/block.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/src/block.rs	2019-02-06 04:11:58.000000000 +0000
@@ -16,40 +16,39 @@
 //! implementations only need to concern themselves with generation of the
 //! block, not the various [`RngCore`] methods (especially [`fill_bytes`], where
 //! the optimal implementations are not trivial), and this allows
-//! [`ReseedingRng`] perform periodic reseeding with very low overhead.
+//! `ReseedingRng` (see [`rand`](https://docs.rs/rand) crate) perform periodic
+//! reseeding with very low overhead.
 //!
 //! # Example
-//! 
+//!
 //! ```norun
 //! use rand_core::block::{BlockRngCore, BlockRng};
-//! 
+//!
 //! struct MyRngCore;
-//! 
+//!
 //! impl BlockRngCore for MyRngCore {
 //!     type Results = [u32; 16];
-//!     
+//!
 //!     fn generate(&mut self, results: &mut Self::Results) {
 //!         unimplemented!()
 //!     }
 //! }
-//! 
+//!
 //! impl SeedableRng for MyRngCore {
 //!     type Seed = unimplemented!();
 //!     fn from_seed(seed: Self::Seed) -> Self {
 //!         unimplemented!()
 //!     }
 //! }
-//! 
+//!
 //! // optionally, also implement CryptoRng for MyRngCore
-//! 
+//!
 //! // Final RNG.
 //! type MyRng = BlockRng<u32, MyRngCore>;
 //! ```
-//! 
-//! [`BlockRngCore`]: trait.BlockRngCore.html
-//! [`RngCore`]: ../trait.RngCore.html
-//! [`fill_bytes`]: ../trait.RngCore.html#tymethod.fill_bytes
-//! [`ReseedingRng`]: ../../rand/rngs/adapter/struct.ReseedingRng.html
+//!
+//! [`BlockRngCore`]: crate::block::BlockRngCore
+//! [`fill_bytes`]: RngCore::fill_bytes
 
 use core::convert::AsRef;
 use core::fmt;
@@ -59,12 +58,12 @@
 /// A trait for RNGs which do not generate random numbers individually, but in
 /// blocks (typically `[u32; N]`). This technique is commonly used by
 /// cryptographic RNGs to improve performance.
-/// 
-/// See the [module documentation](index.html) for details.
+///
+/// See the [module][crate::block] documentation for details.
 pub trait BlockRngCore {
     /// Results element type, e.g. `u32`.
     type Item;
-    
+
     /// Results type. This is the 'block' an RNG implementing `BlockRngCore`
     /// generates, which will usually be an array like `[u32; 16]`.
     type Results: AsRef<[Self::Item]> + AsMut<[Self::Item]> + Default;
@@ -105,15 +104,10 @@
 ///
 /// For easy initialization `BlockRng` also implements [`SeedableRng`].
 ///
-/// [`BlockRngCore`]: BlockRngCore.t.html
-/// [`BlockRngCore::generate`]: trait.BlockRngCore.html#tymethod.generate
-/// [`BlockRng64`]: struct.BlockRng64.html
-/// [`RngCore`]: ../RngCore.t.html
-/// [`next_u32`]: ../trait.RngCore.html#tymethod.next_u32
-/// [`next_u64`]: ../trait.RngCore.html#tymethod.next_u64
-/// [`fill_bytes`]: ../trait.RngCore.html#tymethod.fill_bytes
-/// [`try_fill_bytes`]: ../trait.RngCore.html#tymethod.try_fill_bytes
-/// [`SeedableRng`]: ../SeedableRng.t.html
+/// [`next_u32`]: RngCore::next_u32
+/// [`next_u64`]: RngCore::next_u64
+/// [`fill_bytes`]: RngCore::fill_bytes
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Clone)]
 #[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
 pub struct BlockRng<R: BlockRngCore + ?Sized> {
@@ -147,7 +141,7 @@
     }
 
     /// Get the index into the result buffer.
-    /// 
+    ///
     /// If this is equal to or larger than the size of the result buffer then
     /// the buffer is "empty" and `generate()` must be called to produce new
     /// results.
@@ -314,13 +308,10 @@
 /// values. If the requested length is not a multiple of 8, some bytes will be
 /// discarded.
 ///
-/// [`BlockRngCore`]: BlockRngCore.t.html
-/// [`RngCore`]: ../RngCore.t.html
-/// [`next_u32`]: ../trait.RngCore.html#tymethod.next_u32
-/// [`next_u64`]: ../trait.RngCore.html#tymethod.next_u64
-/// [`fill_bytes`]: ../trait.RngCore.html#tymethod.fill_bytes
-/// [`try_fill_bytes`]: ../trait.RngCore.html#tymethod.try_fill_bytes
-/// [`BlockRng`]: struct.BlockRng.html
+/// [`next_u32`]: RngCore::next_u32
+/// [`next_u64`]: RngCore::next_u64
+/// [`fill_bytes`]: RngCore::fill_bytes
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
 #[derive(Clone)]
 #[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
 pub struct BlockRng64<R: BlockRngCore + ?Sized> {
diff -Nru cargo-0.32.0/vendor/rand_core/src/lib.rs cargo-0.33.0/vendor/rand_core/src/lib.rs
--- cargo-0.32.0/vendor/rand_core/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,33 +8,28 @@
 // except according to those terms.
 
 //! Random number generation traits
-//! 
+//!
 //! This crate is mainly of interest to crates publishing implementations of
-//! [`RngCore`]. Other users are encouraged to use the [rand] crate instead
+//! [`RngCore`]. Other users are encouraged to use the [`rand`] crate instead
 //! which re-exports the main traits and error types.
 //!
 //! [`RngCore`] is the core trait implemented by algorithmic pseudo-random number
 //! generators and external random-number sources.
-//! 
+//!
 //! [`SeedableRng`] is an extension trait for construction from fixed seeds and
 //! other random number generators.
-//! 
+//!
 //! [`Error`] is provided for error-handling. It is safe to use in `no_std`
 //! environments.
-//! 
+//!
 //! The [`impls`] and [`le`] sub-modules include a few small functions to assist
 //! implementation of [`RngCore`].
-//! 
-//! [rand]: https://crates.io/crates/rand
-//! [`RngCore`]: trait.RngCore.html
-//! [`SeedableRng`]: trait.SeedableRng.html
-//! [`Error`]: struct.Error.html
-//! [`impls`]: impls/index.html
-//! [`le`]: le/index.html
+//!
+//! [`rand`]: https://docs.rs/rand
 
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
        html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/rand_core/0.3.0")]
+       html_root_url = "https://rust-random.github.io/rand/")]
 
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
@@ -65,34 +60,34 @@
 
 
 /// The core of a random number generator.
-/// 
+///
 /// This trait encapsulates the low-level functionality common to all
 /// generators, and is the "back end", to be implemented by generators.
-/// End users should normally use [`Rng`] from the [rand] crate, which is
-/// automatically implemented for every type implementing `RngCore`.
-/// 
+/// End users should normally use the `Rng` trait from the [`rand`] crate,
+/// which is automatically implemented for every type implementing `RngCore`.
+///
 /// Three different methods for generating random data are provided since the
 /// optimal implementation of each is dependent on the type of generator. There
 /// is no required relationship between the output of each; e.g. many
 /// implementations of [`fill_bytes`] consume a whole number of `u32` or `u64`
 /// values and drop any remaining unused bytes.
-/// 
+///
 /// The [`try_fill_bytes`] method is a variant of [`fill_bytes`] allowing error
 /// handling; it is not deemed sufficiently useful to add equivalents for
 /// [`next_u32`] or [`next_u64`] since the latter methods are almost always used
 /// with algorithmic generators (PRNGs), which are normally infallible.
-/// 
+///
 /// Algorithmic generators implementing [`SeedableRng`] should normally have
 /// *portable, reproducible* output, i.e. fix Endianness when converting values
 /// to avoid platform differences, and avoid making any changes which affect
 /// output (except by communicating that the release has breaking changes).
-/// 
+///
 /// Typically implementators will implement only one of the methods available
 /// in this trait directly, then use the helper functions from the
-/// [`rand_core::impls`] module to implement the other methods.
-/// 
+/// [`impls`] module to implement the other methods.
+///
 /// It is recommended that implementations also implement:
-/// 
+///
 /// - `Debug` with a custom implementation which *does not* print any internal
 ///   state (at least, [`CryptoRng`]s should not risk leaking state through
 ///   `Debug`).
@@ -104,72 +99,69 @@
 ///   implement [`SeedableRng`], to guide users towards proper seeding.
 ///   External / hardware RNGs can choose to implement `Default`.
 /// - `Eq` and `PartialEq` could be implemented, but are probably not useful.
-/// 
+///
 /// # Example
-/// 
+///
 /// A simple example, obviously not generating very *random* output:
-/// 
+///
 /// ```
 /// #![allow(dead_code)]
 /// use rand_core::{RngCore, Error, impls};
-/// 
+///
 /// struct CountingRng(u64);
-/// 
+///
 /// impl RngCore for CountingRng {
 ///     fn next_u32(&mut self) -> u32 {
 ///         self.next_u64() as u32
 ///     }
-///     
+///
 ///     fn next_u64(&mut self) -> u64 {
 ///         self.0 += 1;
 ///         self.0
 ///     }
-///     
+///
 ///     fn fill_bytes(&mut self, dest: &mut [u8]) {
 ///         impls::fill_bytes_via_next(self, dest)
 ///     }
-///     
+///
 ///     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
 ///         Ok(self.fill_bytes(dest))
 ///     }
 /// }
 /// ```
-/// 
-/// [rand]: https://crates.io/crates/rand
-/// [`Rng`]: ../rand/trait.Rng.html
-/// [`SeedableRng`]: trait.SeedableRng.html
-/// [`rand_core::impls`]: ../rand_core/impls/index.html
-/// [`try_fill_bytes`]: trait.RngCore.html#tymethod.try_fill_bytes
-/// [`fill_bytes`]: trait.RngCore.html#tymethod.fill_bytes
-/// [`next_u32`]: trait.RngCore.html#tymethod.next_u32
-/// [`next_u64`]: trait.RngCore.html#tymethod.next_u64
-/// [`CryptoRng`]: trait.CryptoRng.html
+///
+/// [`rand`]: https://docs.rs/rand
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
+/// [`fill_bytes`]: RngCore::fill_bytes
+/// [`next_u32`]: RngCore::next_u32
+/// [`next_u64`]: RngCore::next_u64
 pub trait RngCore {
     /// Return the next random `u32`.
     ///
     /// RNGs must implement at least one method from this trait directly. In
     /// the case this method is not implemented directly, it can be implemented
-    /// using `self.next_u64() as u32` or
-    /// [via `fill_bytes`](../rand_core/impls/fn.next_u32_via_fill.html).
+    /// using `self.next_u64() as u32` or via
+    /// [`fill_bytes`][impls::next_u32_via_fill].
     fn next_u32(&mut self) -> u32;
 
     /// Return the next random `u64`.
     ///
     /// RNGs must implement at least one method from this trait directly. In
     /// the case this method is not implemented directly, it can be implemented
-    /// [via `next_u32`](../rand_core/impls/fn.next_u64_via_u32.html) or
-    /// [via `fill_bytes`](../rand_core/impls/fn.next_u64_via_fill.html).
+    /// via [`next_u32`][impls::next_u64_via_u32] or via
+    /// [`fill_bytes`][impls::next_u64_via_fill].
     fn next_u64(&mut self) -> u64;
 
     /// Fill `dest` with random data.
     ///
     /// RNGs must implement at least one method from this trait directly. In
     /// the case this method is not implemented directly, it can be implemented
-    /// [via `next_u*`](../rand_core/impls/fn.fill_bytes_via_next.html) or
-    /// via `try_fill_bytes`; if this generator can fail the implementation
-    /// must choose how best to handle errors here (e.g. panic with a
-    /// descriptive message or log a warning and retry a few times).
-    /// 
+    /// via [`next_u*`][impls::fill_bytes_via_next] or
+    /// via [`try_fill_bytes`][RngCore::try_fill_bytes]; if this generator can
+    /// fail the implementation must choose how best to handle errors here
+    /// (e.g. panic with a descriptive message or log a warning and retry a few
+    /// times).
+    ///
     /// This method should guarantee that `dest` is entirely filled
     /// with new data, and may panic if this is impossible
     /// (e.g. reading past the end of a file that is being used as the
@@ -182,51 +174,50 @@
     /// generating random data thus making this the primary method implemented
     /// by external (true) RNGs (e.g. `OsRng`) which can fail. It may be used
     /// directly to generate keys and to seed (infallible) PRNGs.
-    /// 
+    ///
     /// Other than error handling, this method is identical to [`fill_bytes`];
     /// thus this may be implemented using `Ok(self.fill_bytes(dest))` or
     /// `fill_bytes` may be implemented with
     /// `self.try_fill_bytes(dest).unwrap()` or more specific error handling.
-    /// 
-    /// [`fill_bytes`]: trait.RngCore.html#method.fill_bytes
+    ///
+    /// [`fill_bytes`]: RngCore::fill_bytes
     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error>;
 }
 
 /// A marker trait used to indicate that an [`RngCore`] or [`BlockRngCore`]
 /// implementation is supposed to be cryptographically secure.
-/// 
+///
 /// *Cryptographically secure generators*, also known as *CSPRNGs*, should
 /// satisfy an additional properties over other generators: given the first
 /// *k* bits of an algorithm's output
 /// sequence, it should not be possible using polynomial-time algorithms to
 /// predict the next bit with probability significantly greater than 50%.
-/// 
+///
 /// Some generators may satisfy an additional property, however this is not
 /// required by this trait: if the CSPRNG's state is revealed, it should not be
 /// computationally-feasible to reconstruct output prior to this. Some other
 /// generators allow backwards-computation and are consided *reversible*.
-/// 
+///
 /// Note that this trait is provided for guidance only and cannot guarantee
 /// suitability for cryptographic applications. In general it should only be
 /// implemented for well-reviewed code implementing well-regarded algorithms.
-/// 
+///
 /// Note also that use of a `CryptoRng` does not protect against other
 /// weaknesses such as seeding from a weak entropy source or leaking state.
-/// 
-/// [`RngCore`]: trait.RngCore.html
-/// [`BlockRngCore`]: ../rand_core/block/trait.BlockRngCore.html
+///
+/// [`BlockRngCore`]: block::BlockRngCore
 pub trait CryptoRng {}
 
 /// A random number generator that can be explicitly seeded.
 ///
 /// This trait encapsulates the low-level functionality common to all
 /// pseudo-random number generators (PRNGs, or algorithmic generators).
-/// 
-/// The [`rand::FromEntropy`] trait is automatically implemented for every type
-/// implementing `SeedableRng`, providing a convenient `from_entropy()`
-/// constructor.
-/// 
-/// [`rand::FromEntropy`]: ../rand/trait.FromEntropy.html
+///
+/// The `FromEntropy` trait from the [`rand`] crate is automatically
+/// implemented for every type implementing `SeedableRng`, providing
+/// a convenient `from_entropy()` constructor.
+///
+/// [`rand`]: https://docs.rs/rand
 pub trait SeedableRng: Sized {
     /// Seed type, which is restricted to types mutably-dereferencable as `u8`
     /// arrays (we recommend `[u8; N]` for some `N`).
@@ -297,17 +288,17 @@
     /// for example `0xBAD5EEDu32` or `0x0DDB1A5E5BAD5EEDu64` ("odd biases? bad
     /// seed"). This is assuming only a small number of values must be rejected.
     fn from_seed(seed: Self::Seed) -> Self;
-    
+
     /// Create a new PRNG using a `u64` seed.
-    /// 
+    ///
     /// This is a convenience-wrapper around `from_seed` to allow construction
     /// of any `SeedableRng` from a simple `u64` value. It is designed such that
     /// low Hamming Weight numbers like 0 and 1 can be used and should still
     /// result in good, independent seeds to the PRNG which is returned.
-    /// 
+    ///
     /// This **is not suitable for cryptography**, as should be clear given that
     /// the input size is only 64 bits.
-    /// 
+    ///
     /// Implementations for PRNGs *may* provide their own implementations of
     /// this function, but the default implementation should be good enough for
     /// all purposes. *Changing* the implementation of this function should be
@@ -316,33 +307,33 @@
         // We use PCG32 to generate a u32 sequence, and copy to the seed
         const MUL: u64 = 6364136223846793005;
         const INC: u64 = 11634580027462260723;
-        
+
         let mut seed = Self::Seed::default();
         for chunk in seed.as_mut().chunks_mut(4) {
             // We advance the state first (to get away from the input value,
             // in case it has low Hamming Weight).
             state = state.wrapping_mul(MUL).wrapping_add(INC);
-            
+
             // Use PCG output function with to_le to generate x:
             let xorshifted = (((state >> 18) ^ state) >> 27) as u32;
             let rot = (state >> 59) as u32;
             let x = xorshifted.rotate_right(rot).to_le();
-            
+
             unsafe {
                 let p = &x as *const u32 as *const u8;
                 copy_nonoverlapping(p, chunk.as_mut_ptr(), chunk.len());
             }
         }
-        
+
         Self::from_seed(seed)
     }
-    
+
     /// Create a new PRNG seeded from another `Rng`.
     ///
     /// This is the recommended way to initialize PRNGs with fresh entropy. The
-    /// [`FromEntropy`] trait provides a convenient `from_entropy` method
-    /// based on `from_rng`.
-    /// 
+    /// `FromEntropy` trait from the [`rand`] crate provides a convenient
+    /// `from_entropy` method based on `from_rng`.
+    ///
     /// Usage of this method is not recommended when reproducibility is required
     /// since implementing PRNGs are not required to fix Endianness and are
     /// allowed to modify implementations in new releases.
@@ -354,9 +345,9 @@
     /// results if their seed numbers are small or if there is a simple pattern
     /// between them.
     ///
-    /// Prefer to seed from a strong external entropy source like [`OsRng`] or
-    /// from a cryptographic PRNG; if creating a new generator for cryptographic
-    /// uses you *must* seed from a strong source.
+    /// Prefer to seed from a strong external entropy source like `OsRng` from
+    /// the [`rand_os`] crate or from a cryptographic PRNG; if creating a new
+    /// generator for cryptographic uses you *must* seed from a strong source.
     ///
     /// Seeding a small PRNG from another small PRNG is possible, but
     /// something to be careful with. An extreme example of how this can go
@@ -366,9 +357,9 @@
     ///
     /// PRNG implementations are allowed to assume that a good RNG is provided
     /// for seeding, and that it is cryptographically secure when appropriate.
-    /// 
-    /// [`FromEntropy`]: ../rand/trait.FromEntropy.html
-    /// [`OsRng`]: ../rand/rngs/struct.OsRng.html
+    ///
+    /// [`rand`]: https://docs.rs/rand
+    /// [`rand_os`]: https://docs.rs/rand_os
     fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
         let mut seed = Self::Seed::default();
         rng.try_fill_bytes(seed.as_mut())?;
@@ -445,7 +436,7 @@
 #[cfg(test)]
 mod test {
     use super::*;
-    
+
     #[test]
     fn test_seed_from_u64() {
         struct SeedableNum(u64);
@@ -457,7 +448,7 @@
                 SeedableNum(x[0])
             }
         }
-        
+
         const N: usize = 8;
         const SEEDS: [u64; N] = [0u64, 1, 2, 3, 4, 8, 16, -1i64 as u64];
         let mut results = [0u64; N];
@@ -465,21 +456,21 @@
             let SeedableNum(x) = SeedableNum::seed_from_u64(*seed);
             results[i] = x;
         }
-        
+
         for (i1, r1) in results.iter().enumerate() {
             let weight = r1.count_ones();
             // This is the binomial distribution B(64, 0.5), so chance of
             // weight < 20 is binocdf(19, 64, 0.5) = 7.8e-4, and same for
             // weight > 44.
             assert!(weight >= 20 && weight <= 44);
-            
+
             for (i2, r2) in results.iter().enumerate() {
                 if i1 == i2 { continue; }
                 let diff_weight = (r1 ^ r2).count_ones();
                 assert!(diff_weight >= 20);
             }
         }
-        
+
         // value-breakage test:
         assert_eq!(results[0], 5029875928683246316);
     }
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/.cargo-checksum.json cargo-0.33.0/vendor/rand_core-0.2.2/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_core-0.2.2/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/Cargo.toml cargo-0.33.0/vendor/rand_core-0.2.2/Cargo.toml
--- cargo-0.32.0/vendor/rand_core-0.2.2/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "rand_core"
-version = "0.2.2"
-authors = ["The Rust Project Developers"]
-description = "Core random number generator traits and tools for implementation.\n"
-homepage = "https://crates.io/crates/rand_core"
-documentation = "https://docs.rs/rand_core"
-readme = "README.md"
-keywords = ["random", "rng"]
-categories = ["algorithms", "no-std"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-random/rand"
-[dependencies.rand_core]
-version = "0.3"
-default-features = false
-
-[features]
-alloc = ["rand_core/alloc"]
-serde1 = ["rand_core/serde1"]
-std = ["rand_core/std"]
-[badges.appveyor]
-repository = "rust-random/rand"
-
-[badges.travis-ci]
-repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_core-0.2.2/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_core-0.2.2/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "8648fec641b478244d8ef993cd9686500b4c699f"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/CHANGELOG.md cargo-0.33.0/vendor/rand_core-0.2.2/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_core-0.2.2/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [0.2.2] - 2018-10-03
-Create a compatibility shim around 0.3.
-
-## [0.2.1] - 2018-06-08
-- References to a `CryptoRng` now also implement `CryptoRng`. (#470)
-
-## [0.2.0] - 2018-05-21
-- Enable the `std` feature by default. (#409)
-- Remove `BlockRng{64}::inner` and `BlockRng::inner_mut`; instead making `core` public
-- Add `BlockRng{64}::index` and `BlockRng{64}::generate_and_set`. (#374, #419)
-- Change `BlockRngCore::Results` bound to also require `AsMut<[Self::Item]>`. (#419)
-- Implement `std::io::Read` for RngCore. (#434)
-
-## [0.1.0] - 2018-04-17
-(Split out of the Rand crate, changes here are relative to rand 0.4.2)
-- `RngCore` and `SeedableRng` are now part of `rand_core`. (#288)
-- Add modules to help implementing RNGs `impl` and `le`. (#209, #228)
-- Add `Error` and `ErrorKind`. (#225)
-- Add `CryptoRng` marker trait. (#273)
-- Add `BlockRngCore` trait. (#281)
-- Add `BlockRng` and `BlockRng64` wrappers to help implementations. (#281, #325)
-- Revise the `SeedableRng` trait. (#233)
-- Remove default implementations for `RngCore::next_u64` and `RngCore::fill_bytes`. (#288)
-- Add `RngCore::try_fill_bytes`. (#225)
-
-## [0.0.1] - 2017-09-14 (yanked)
-Experimental version as part of the rand crate refactor.
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/LICENSE-APACHE cargo-0.33.0/vendor/rand_core-0.2.2/LICENSE-APACHE
--- cargo-0.32.0/vendor/rand_core-0.2.2/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     https://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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
-
-	https://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.
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/LICENSE-MIT cargo-0.33.0/vendor/rand_core-0.2.2/LICENSE-MIT
--- cargo-0.32.0/vendor/rand_core-0.2.2/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2014 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/README.md cargo-0.33.0/vendor/rand_core-0.2.2/README.md
--- cargo-0.32.0/vendor/rand_core-0.2.2/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-# rand_core
-
-[![Build Status](https://travis-ci.org/rust-lang-nursery/rand.svg)](https://travis-ci.org/rust-lang-nursery/rand)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-lang-nursery/rand?svg=true)](https://ci.appveyor.com/project/alexcrichton/rand)
-[![Latest version](https://img.shields.io/crates/v/rand_core.svg)](https://crates.io/crates/rand_core)
-[![Documentation](https://docs.rs/rand_core/badge.svg)](https://docs.rs/rand_core)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-yellow.svg)](https://github.com/rust-lang-nursery/rand#rust-version-requirements)
-
-Core traits and error types of the [rand] library, plus tools for implementing
-RNGs.
-
-This version of `rand_core` is a compatibility shim around version 0.3.
-
-This crate is intended for use when implementing the core trait, `RngCore`; it
-defines the core traits to be implemented as well as several small functions to
-aid in their implementation and types required for error handling.
-
-The main [rand] crate re-exports most items defined in this crate, along with
-tools to convert the integer samples generated by `RngCore` to many different
-applications (including sampling from restricted ranges, conversion to floating
-point, list permutations and secure initialisation of RNGs). Most users should
-prefer to use the main [rand] crate.
-
-Documentation:
-[master branch](https://rust-lang-nursery.github.io/rand/rand_core/index.html),
-[by release](https://docs.rs/rand_core)
-
-[Changelog](CHANGELOG.md)
-
-[rand]: https://crates.io/crates/rand
-
-
-## Functionality
-
-The `rand_core` crate provides:
-
--   base random number generator traits
--   error-reporting types
--   functionality to aid implementation of RNGs
-
-The traits and error types are also available via `rand`.
-
-## Crate Features
-
-`rand_core` supports `no_std` and `alloc`-only configurations, as well as full
-`std` functionality. The differences between `no_std` and full `std` are small,
-comprising `RngCore` support for `Box<R>` types where `R: RngCore`, as well as
-extensions to the `Error` type's functionality.
-
-Due to [rust-lang/cargo#1596](https://github.com/rust-lang/cargo/issues/1596),
-`rand_core` is built without `std` support by default. Since features are
-unioned across the whole dependency tree, any crate using `rand` with its
-default features will also enable `std` support in `rand_core`.
-
-The `serde1` feature can be used to derive `Serialize` and `Deserialize` for RNG
-implementations that use the `BlockRng` or `BlockRng64` wrappers.
-
-
-# License
-
-`rand_core` is distributed under the terms of both the MIT license and the
-Apache License (Version 2.0).
-
-See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/src/block.rs cargo-0.33.0/vendor/rand_core-0.2.2/src/block.rs
--- cargo-0.32.0/vendor/rand_core-0.2.2/src/block.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/src/block.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,502 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! The `BlockRngCore` trait and implementation helpers
-//!
-//! The [`BlockRngCore`] trait exists to assist in the implementation of RNGs
-//! which generate a block of data in a cache instead of returning generated
-//! values directly.
-//!
-//! Usage of this trait is optional, but provides two advantages:
-//! implementations only need to concern themselves with generation of the
-//! block, not the various [`RngCore`] methods (especially [`fill_bytes`], where
-//! the optimal implementations are not trivial), and this allows
-//! [`ReseedingRng`] perform periodic reseeding with very low overhead.
-//!
-//! # Example
-//! 
-//! ```norun
-//! use rand_core::block::{BlockRngCore, BlockRng};
-//! 
-//! struct MyRngCore;
-//! 
-//! impl BlockRngCore for MyRngCore {
-//!     type Results = [u32; 16];
-//!     
-//!     fn generate(&mut self, results: &mut Self::Results) {
-//!         unimplemented!()
-//!     }
-//! }
-//! 
-//! impl SeedableRng for MyRngCore {
-//!     type Seed = unimplemented!();
-//!     fn from_seed(seed: Self::Seed) -> Self {
-//!         unimplemented!()
-//!     }
-//! }
-//! 
-//! // optionally, also implement CryptoRng for MyRngCore
-//! 
-//! // Final RNG.
-//! type MyRng = BlockRng<u32, MyRngCore>;
-//! ```
-//! 
-//! [`BlockRngCore`]: trait.BlockRngCore.html
-//! [`RngCore`]: ../trait.RngCore.html
-//! [`fill_bytes`]: ../trait.RngCore.html#tymethod.fill_bytes
-//! [`ReseedingRng`]: ../../rand/rngs/adapter/struct.ReseedingRng.html
-
-use core::convert::AsRef;
-use core::fmt;
-use {RngCore, CryptoRng, SeedableRng, Error};
-use impls::{fill_via_u32_chunks, fill_via_u64_chunks};
-
-/// A trait for RNGs which do not generate random numbers individually, but in
-/// blocks (typically `[u32; N]`). This technique is commonly used by
-/// cryptographic RNGs to improve performance.
-/// 
-/// See the [module documentation](index.html) for details.
-pub trait BlockRngCore {
-    /// Results element type, e.g. `u32`.
-    type Item;
-    
-    /// Results type. This is the 'block' an RNG implementing `BlockRngCore`
-    /// generates, which will usually be an array like `[u32; 16]`.
-    type Results: AsRef<[Self::Item]> + AsMut<[Self::Item]> + Default;
-
-    /// Generate a new block of results.
-    fn generate(&mut self, results: &mut Self::Results);
-}
-
-
-/// A wrapper type implementing [`RngCore`] for some type implementing
-/// [`BlockRngCore`] with `u32` array buffer; i.e. this can be used to implement
-/// a full RNG from just a `generate` function.
-///
-/// The `core` field may be accessed directly but the results buffer may not.
-/// PRNG implementations can simply use a type alias
-/// (`pub type MyRng = BlockRng<MyRngCore>;`) but might prefer to use a
-/// wrapper type (`pub struct MyRng(BlockRng<MyRngCore>);`); the latter must
-/// re-implement `RngCore` but hides the implementation details and allows
-/// extra functionality to be defined on the RNG
-/// (e.g. `impl MyRng { fn set_stream(...){...} }`).
-///
-/// `BlockRng` has heavily optimized implementations of the [`RngCore`] methods
-/// reading values from the results buffer, as well as
-/// calling [`BlockRngCore::generate`] directly on the output array when
-/// [`fill_bytes`] / [`try_fill_bytes`] is called on a large array. These methods
-/// also handle the bookkeeping of when to generate a new batch of values.
-///
-/// No whole generated `u32` values are thown away and all values are consumed
-/// in-order. [`next_u32`] simply takes the next available `u32` value.
-/// [`next_u64`] is implemented by combining two `u32` values, least
-/// significant first. [`fill_bytes`] and [`try_fill_bytes`] consume a whole
-/// number of `u32` values, converting each `u32` to a byte slice in
-/// little-endian order. If the requested byte length is not a multiple of 4,
-/// some bytes will be discarded.
-///
-/// See also [`BlockRng64`] which uses `u64` array buffers. Currently there is
-/// no direct support for other buffer types.
-///
-/// For easy initialization `BlockRng` also implements [`SeedableRng`].
-///
-/// [`BlockRngCore`]: BlockRngCore.t.html
-/// [`BlockRngCore::generate`]: trait.BlockRngCore.html#tymethod.generate
-/// [`BlockRng64`]: struct.BlockRng64.html
-/// [`RngCore`]: ../RngCore.t.html
-/// [`next_u32`]: ../trait.RngCore.html#tymethod.next_u32
-/// [`next_u64`]: ../trait.RngCore.html#tymethod.next_u64
-/// [`fill_bytes`]: ../trait.RngCore.html#tymethod.fill_bytes
-/// [`try_fill_bytes`]: ../trait.RngCore.html#tymethod.try_fill_bytes
-/// [`SeedableRng`]: ../SeedableRng.t.html
-#[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct BlockRng<R: BlockRngCore + ?Sized> {
-    results: R::Results,
-    index: usize,
-    /// The *core* part of the RNG, implementing the `generate` function.
-    pub core: R,
-}
-
-// Custom Debug implementation that does not expose the contents of `results`.
-impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng<R> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("BlockRng")
-           .field("core", &self.core)
-           .field("result_len", &self.results.as_ref().len())
-           .field("index", &self.index)
-           .finish()
-    }
-}
-
-impl<R: BlockRngCore> BlockRng<R> {
-    /// Create a new `BlockRng` from an existing RNG implementing
-    /// `BlockRngCore`. Results will be generated on first use.
-    pub fn new(core: R) -> BlockRng<R>{
-        let results_empty = R::Results::default();
-        BlockRng {
-            core,
-            index: results_empty.as_ref().len(),
-            results: results_empty,
-        }
-    }
-
-    /// Get the index into the result buffer.
-    /// 
-    /// If this is equal to or larger than the size of the result buffer then
-    /// the buffer is "empty" and `generate()` must be called to produce new
-    /// results.
-    pub fn index(&self) -> usize {
-        self.index
-    }
-
-    /// Reset the number of available results.
-    /// This will force a new set of results to be generated on next use.
-    pub fn reset(&mut self) {
-        self.index = self.results.as_ref().len();
-    }
-
-    /// Generate a new set of results immediately, setting the index to the
-    /// given value.
-    pub fn generate_and_set(&mut self, index: usize) {
-        assert!(index < self.results.as_ref().len());
-        self.core.generate(&mut self.results);
-        self.index = index;
-    }
-}
-
-impl<R: BlockRngCore<Item=u32>> RngCore for BlockRng<R>
-where <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>
-{
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        if self.index >= self.results.as_ref().len() {
-            self.generate_and_set(0);
-        }
-
-        let value = self.results.as_ref()[self.index];
-        self.index += 1;
-        value
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        let read_u64 = |results: &[u32], index| {
-            if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
-                // requires little-endian CPU supporting unaligned reads:
-                unsafe { *(&results[index] as *const u32 as *const u64) }
-            } else {
-                let x = u64::from(results[index]);
-                let y = u64::from(results[index + 1]);
-                (y << 32) | x
-            }
-        };
-
-        let len = self.results.as_ref().len();
-
-        let index = self.index;
-        if index < len-1 {
-            self.index += 2;
-            // Read an u64 from the current index
-            read_u64(self.results.as_ref(), index)
-        } else if index >= len {
-            self.generate_and_set(2);
-            read_u64(self.results.as_ref(), 0)
-        } else {
-            let x = u64::from(self.results.as_ref()[len-1]);
-            self.generate_and_set(1);
-            let y = u64::from(self.results.as_ref()[0]);
-            (y << 32) | x
-        }
-    }
-
-    // As an optimization we try to write directly into the output buffer.
-    // This is only enabled for little-endian platforms where unaligned writes
-    // are known to be safe and fast.
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        let mut filled = 0;
-
-        // Continue filling from the current set of results
-        if self.index < self.results.as_ref().len() {
-            let (consumed_u32, filled_u8) =
-                fill_via_u32_chunks(&self.results.as_ref()[self.index..],
-                                    dest);
-
-            self.index += consumed_u32;
-            filled += filled_u8;
-        }
-
-        let len_remainder =
-            (dest.len() - filled) % (self.results.as_ref().len() * 4);
-        let end_direct = dest.len() - len_remainder;
-
-        while filled < end_direct {
-            let dest_u32: &mut R::Results = unsafe {
-                &mut *(dest[filled..].as_mut_ptr() as
-                *mut <R as BlockRngCore>::Results)
-            };
-            self.core.generate(dest_u32);
-            filled += self.results.as_ref().len() * 4;
-            self.index = self.results.as_ref().len();
-        }
-
-        if len_remainder > 0 {
-            self.core.generate(&mut self.results);
-            let (consumed_u32, _) =
-                fill_via_u32_chunks(self.results.as_ref(),
-                                    &mut dest[filled..]);
-
-            self.index = consumed_u32;
-        }
-    }
-
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        let mut read_len = 0;
-        while read_len < dest.len() {
-            if self.index >= self.results.as_ref().len() {
-                self.generate_and_set(0);
-            }
-            let (consumed_u32, filled_u8) =
-                fill_via_u32_chunks(&self.results.as_ref()[self.index..],
-                                    &mut dest[read_len..]);
-
-            self.index += consumed_u32;
-            read_len += filled_u8;
-        }
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        self.fill_bytes(dest);
-        Ok(())
-    }
-}
-
-impl<R: BlockRngCore + SeedableRng> SeedableRng for BlockRng<R> {
-    type Seed = R::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        Self::new(R::from_seed(seed))
-    }
-
-    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
-        Ok(Self::new(R::from_rng(rng)?))
-    }
-}
-
-
-
-/// A wrapper type implementing [`RngCore`] for some type implementing
-/// [`BlockRngCore`] with `u64` array buffer; i.e. this can be used to implement
-/// a full RNG from just a `generate` function.
-///
-/// This is similar to [`BlockRng`], but specialized for algorithms that operate
-/// on `u64` values.
-///
-/// No whole generated `u64` values are thrown away and all values are consumed
-/// in-order. [`next_u64`] simply takes the next available `u64` value.
-/// [`next_u32`] is however a bit special: half of a `u64` is consumed, leaving
-/// the other half in the buffer. If the next function called is [`next_u32`]
-/// then the other half is then consumed, however both [`next_u64`] and
-/// [`fill_bytes`] discard the rest of any half-consumed `u64`s when called.
-///
-/// [`fill_bytes`] and [`try_fill_bytes`] consume a whole number of `u64`
-/// values. If the requested length is not a multiple of 8, some bytes will be
-/// discarded.
-///
-/// [`BlockRngCore`]: BlockRngCore.t.html
-/// [`RngCore`]: ../RngCore.t.html
-/// [`next_u32`]: ../trait.RngCore.html#tymethod.next_u32
-/// [`next_u64`]: ../trait.RngCore.html#tymethod.next_u64
-/// [`fill_bytes`]: ../trait.RngCore.html#tymethod.fill_bytes
-/// [`try_fill_bytes`]: ../trait.RngCore.html#tymethod.try_fill_bytes
-/// [`BlockRng`]: struct.BlockRng.html
-#[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
-pub struct BlockRng64<R: BlockRngCore + ?Sized> {
-    results: R::Results,
-    index: usize,
-    half_used: bool, // true if only half of the previous result is used
-    /// The *core* part of the RNG, implementing the `generate` function.
-    pub core: R,
-}
-
-// Custom Debug implementation that does not expose the contents of `results`.
-impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng64<R> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.debug_struct("BlockRng64")
-           .field("core", &self.core)
-           .field("result_len", &self.results.as_ref().len())
-           .field("index", &self.index)
-           .field("half_used", &self.half_used)
-           .finish()
-    }
-}
-
-impl<R: BlockRngCore> BlockRng64<R> {
-    /// Create a new `BlockRng` from an existing RNG implementing
-    /// `BlockRngCore`. Results will be generated on first use.
-    pub fn new(core: R) -> BlockRng64<R>{
-        let results_empty = R::Results::default();
-        BlockRng64 {
-            core,
-            index: results_empty.as_ref().len(),
-            half_used: false,
-            results: results_empty,
-        }
-    }
-
-    /// Get the index into the result buffer.
-    ///
-    /// If this is equal to or larger than the size of the result buffer then
-    /// the buffer is "empty" and `generate()` must be called to produce new
-    /// results.
-    pub fn index(&self) -> usize {
-        self.index
-    }
-
-    /// Reset the number of available results.
-    /// This will force a new set of results to be generated on next use.
-    pub fn reset(&mut self) {
-        self.index = self.results.as_ref().len();
-        self.half_used = false;
-    }
-
-    /// Generate a new set of results immediately, setting the index to the
-    /// given value.
-    pub fn generate_and_set(&mut self, index: usize) {
-        assert!(index < self.results.as_ref().len());
-        self.core.generate(&mut self.results);
-        self.index = index;
-        self.half_used = false;
-    }
-}
-
-impl<R: BlockRngCore<Item=u64>> RngCore for BlockRng64<R>
-where <R as BlockRngCore>::Results: AsRef<[u64]> + AsMut<[u64]>
-{
-    #[inline(always)]
-    fn next_u32(&mut self) -> u32 {
-        let mut index = self.index * 2 - self.half_used as usize;
-        if index >= self.results.as_ref().len() * 2 {
-            self.core.generate(&mut self.results);
-            self.index = 0;
-            // `self.half_used` is by definition `false`
-            self.half_used = false;
-            index = 0;
-        }
-
-        self.half_used = !self.half_used;
-        self.index += self.half_used as usize;
-
-        // Index as if this is a u32 slice.
-        unsafe {
-            let results =
-                &*(self.results.as_ref() as *const [u64] as *const [u32]);
-            if cfg!(target_endian = "little") {
-                *results.get_unchecked(index)
-            } else {
-                *results.get_unchecked(index ^ 1)
-            }
-        }
-    }
-
-    #[inline(always)]
-    fn next_u64(&mut self) -> u64 {
-        if self.index >= self.results.as_ref().len() {
-            self.core.generate(&mut self.results);
-            self.index = 0;
-        }
-
-        let value = self.results.as_ref()[self.index];
-        self.index += 1;
-        self.half_used = false;
-        value
-    }
-
-    // As an optimization we try to write directly into the output buffer.
-    // This is only enabled for little-endian platforms where unaligned writes
-    // are known to be safe and fast.
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        let mut filled = 0;
-        self.half_used = false;
-
-        // Continue filling from the current set of results
-        if self.index < self.results.as_ref().len() {
-            let (consumed_u64, filled_u8) =
-                fill_via_u64_chunks(&self.results.as_ref()[self.index..],
-                                    dest);
-
-            self.index += consumed_u64;
-            filled += filled_u8;
-        }
-
-        let len_remainder =
-            (dest.len() - filled) % (self.results.as_ref().len() * 8);
-        let end_direct = dest.len() - len_remainder;
-
-        while filled < end_direct {
-            let dest_u64: &mut R::Results = unsafe {
-                ::core::mem::transmute(dest[filled..].as_mut_ptr())
-            };
-            self.core.generate(dest_u64);
-            filled += self.results.as_ref().len() * 8;
-            self.index = self.results.as_ref().len();
-        }
-
-        if len_remainder > 0 {
-            self.core.generate(&mut self.results);
-            let (consumed_u64, _) =
-                fill_via_u64_chunks(&mut self.results.as_ref(),
-                                    &mut dest[filled..]);
-
-            self.index = consumed_u64;
-        }
-    }
-
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        let mut read_len = 0;
-        self.half_used = false;
-        while read_len < dest.len() {
-            if self.index as usize >= self.results.as_ref().len() {
-                self.core.generate(&mut self.results);
-                self.index = 0;
-            }
-
-            let (consumed_u64, filled_u8) =
-                fill_via_u64_chunks(&self.results.as_ref()[self.index as usize..],
-                                    &mut dest[read_len..]);
-
-            self.index += consumed_u64;
-            read_len += filled_u8;
-        }
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
-    }
-}
-
-impl<R: BlockRngCore + SeedableRng> SeedableRng for BlockRng64<R> {
-    type Seed = R::Seed;
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        Self::new(R::from_seed(seed))
-    }
-
-    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
-        Ok(Self::new(R::from_rng(rng)?))
-    }
-}
-
-impl<R: BlockRngCore + CryptoRng> CryptoRng for BlockRng<R> {}
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/src/error.rs cargo-0.33.0/vendor/rand_core-0.2.2/src/error.rs
--- cargo-0.32.0/vendor/rand_core-0.2.2/src/error.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Error types
-
-use core::fmt;
-
-#[cfg(feature="std")]
-use std::error::Error as stdError;
-#[cfg(feature="std")]
-use std::io;
-
-/// Error kind which can be matched over.
-#[derive(PartialEq, Eq, Debug, Copy, Clone)]
-pub enum ErrorKind {
-    /// Feature is not available; not recoverable.
-    /// 
-    /// This is the most permanent failure type and implies the error cannot be
-    /// resolved simply by retrying (e.g. the feature may not exist in this
-    /// build of the application or on the current platform).
-    Unavailable,
-    /// General failure; there may be a chance of recovery on retry.
-    /// 
-    /// This is the catch-all kind for errors from known and unknown sources
-    /// which do not have a more specific kind / handling method.
-    /// 
-    /// It is suggested to retry a couple of times or retry later when
-    /// handling; some error sources may be able to resolve themselves,
-    /// although this is not likely.
-    Unexpected,
-    /// A transient failure which likely can be resolved or worked around.
-    /// 
-    /// This error kind exists for a few specific cases where it is known that
-    /// the error likely can be resolved internally, but is reported anyway.
-    Transient,
-    /// Not ready yet: recommended to try again a little later.
-    /// 
-    /// This error kind implies the generator needs more time or needs some
-    /// other part of the application to do something else first before it is
-    /// ready for use; for example this may be used by external generators
-    /// which require time for initialization.
-    NotReady,
-    #[doc(hidden)]
-    __Nonexhaustive,
-}
-
-impl ErrorKind {
-    /// True if this kind of error may resolve itself on retry.
-    /// 
-    /// See also `should_wait()`.
-    pub fn should_retry(self) -> bool {
-        self != ErrorKind::Unavailable
-    }
-    
-    /// True if we should retry but wait before retrying
-    /// 
-    /// This implies `should_retry()` is true.
-    pub fn should_wait(self) -> bool {
-        self == ErrorKind::NotReady
-    }
-    
-    /// A description of this error kind
-    pub fn description(self) -> &'static str {
-        match self {
-            ErrorKind::Unavailable => "permanently unavailable",
-            ErrorKind::Unexpected => "unexpected failure",
-            ErrorKind::Transient => "transient failure",
-            ErrorKind::NotReady => "not ready yet",
-            ErrorKind::__Nonexhaustive => unreachable!(),
-        }
-    }
-}
-
-
-/// Error type of random number generators
-/// 
-/// This is a relatively simple error type, designed for compatibility with and
-/// without the Rust `std` library. It embeds a "kind" code, a message (static
-/// string only), and an optional chained cause (`std` only). The `kind` and
-/// `msg` fields can be accessed directly; cause can be accessed via
-/// `std::error::Error::cause` or `Error::take_cause`. Construction can only be
-/// done via `Error::new` or `Error::with_cause`.
-#[derive(Debug)]
-pub struct Error {
-    /// The error kind
-    pub kind: ErrorKind,
-    /// The error message
-    pub msg: &'static str,
-    #[cfg(feature="std")]
-    cause: Option<Box<stdError + Send + Sync>>,
-}
-
-impl Error {
-    /// Create a new instance, with specified kind and a message.
-    pub fn new(kind: ErrorKind, msg: &'static str) -> Self {
-        #[cfg(feature="std")] {
-            Error { kind, msg, cause: None }
-        }
-        #[cfg(not(feature="std"))] {
-            Error { kind, msg }
-        }
-    }
-    
-    /// Create a new instance, with specified kind, message, and a
-    /// chained cause.
-    /// 
-    /// Note: `stdError` is an alias for `std::error::Error`.
-    /// 
-    /// If not targetting `std` (i.e. `no_std`), this function is replaced by
-    /// another with the same prototype, except that there are no bounds on the
-    /// type `E` (because both `Box` and `stdError` are unavailable), and the
-    /// `cause` is ignored.
-    #[cfg(feature="std")]
-    pub fn with_cause<E>(kind: ErrorKind, msg: &'static str, cause: E) -> Self
-        where E: Into<Box<stdError + Send + Sync>>
-    {
-        Error { kind, msg, cause: Some(cause.into()) }
-    }
-    
-    /// Create a new instance, with specified kind, message, and a
-    /// chained cause.
-    /// 
-    /// In `no_std` mode the *cause* is ignored.
-    #[cfg(not(feature="std"))]
-    pub fn with_cause<E>(kind: ErrorKind, msg: &'static str, _cause: E) -> Self {
-        Error { kind, msg }
-    }
-    
-    /// Take the cause, if any. This allows the embedded cause to be extracted.
-    /// This uses `Option::take`, leaving `self` with no cause.
-    #[cfg(feature="std")]
-    pub fn take_cause(&mut self) -> Option<Box<stdError + Send + Sync>> {
-        self.cause.take()
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        #[cfg(feature="std")] {
-            if let Some(ref cause) = self.cause {
-                return write!(f, "{} ({}); cause: {}",
-                        self.msg, self.kind.description(), cause);
-            }
-        }
-        write!(f, "{} ({})", self.msg, self.kind.description())
-    }
-}
-
-#[cfg(feature="std")]
-impl stdError for Error {
-    fn description(&self) -> &str {
-        self.msg
-    }
-
-    fn cause(&self) -> Option<&stdError> {
-        self.cause.as_ref().map(|e| e.as_ref() as &stdError)
-    }
-}
-
-#[cfg(feature="std")]
-impl From<Error> for io::Error {
-    fn from(error: Error) -> Self {
-        use std::io::ErrorKind::*;
-        match error.kind {
-            ErrorKind::Unavailable => io::Error::new(NotFound, error),
-            ErrorKind::Unexpected |
-            ErrorKind::Transient => io::Error::new(Other, error),
-            ErrorKind::NotReady => io::Error::new(WouldBlock, error),
-            ErrorKind::__Nonexhaustive => unreachable!(),
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/src/impls.rs cargo-0.33.0/vendor/rand_core-0.2.2/src/impls.rs
--- cargo-0.32.0/vendor/rand_core-0.2.2/src/impls.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/src/impls.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-// Copyright 2013-2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Helper functions for implementing `RngCore` functions.
-//!
-//! For cross-platform reproducibility, these functions all use Little Endian:
-//! least-significant part first. For example, `next_u64_via_u32` takes `u32`
-//! values `x, y`, then outputs `(y << 32) | x`. To implement `next_u32`
-//! from `next_u64` in little-endian order, one should use `next_u64() as u32`.
-//!
-//! Byte-swapping (like the std `to_le` functions) is only needed to convert
-//! to/from byte sequences, and since its purpose is reproducibility,
-//! non-reproducible sources (e.g. `OsRng`) need not bother with it.
-
-use core::intrinsics::transmute;
-use core::ptr::copy_nonoverlapping;
-use core::slice;
-use core::cmp::min;
-use core::mem::size_of;
-use RngCore;
-
-
-/// Implement `next_u64` via `next_u32`, little-endian order.
-pub fn next_u64_via_u32<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
-    // Use LE; we explicitly generate one value before the next.
-    let x = u64::from(rng.next_u32());
-    let y = u64::from(rng.next_u32());
-    (y << 32) | x
-}
-
-/// Implement `fill_bytes` via `next_u64` and `next_u32`, little-endian order.
-///
-/// The fastest way to fill a slice is usually to work as long as possible with
-/// integers. That is why this method mostly uses `next_u64`, and only when
-/// there are 4 or less bytes remaining at the end of the slice it uses
-/// `next_u32` once.
-pub fn fill_bytes_via_next<R: RngCore + ?Sized>(rng: &mut R, dest: &mut [u8]) {
-    let mut left = dest;
-    while left.len() >= 8 {
-        let (l, r) = {left}.split_at_mut(8);
-        left = r;
-        let chunk: [u8; 8] = unsafe {
-            transmute(rng.next_u64().to_le())
-        };
-        l.copy_from_slice(&chunk);
-    }
-    let n = left.len();
-    if n > 4 {
-        let chunk: [u8; 8] = unsafe {
-            transmute(rng.next_u64().to_le())
-        };
-        left.copy_from_slice(&chunk[..n]);
-    } else if n > 0 {
-        let chunk: [u8; 4] = unsafe {
-            transmute(rng.next_u32().to_le())
-        };
-        left.copy_from_slice(&chunk[..n]);
-    }
-}
-
-macro_rules! impl_uint_from_fill {
-    ($rng:expr, $ty:ty, $N:expr) => ({
-        debug_assert!($N == size_of::<$ty>());
-
-        let mut int: $ty = 0;
-        unsafe {
-            let ptr = &mut int as *mut $ty as *mut u8;
-            let slice = slice::from_raw_parts_mut(ptr, $N);
-            $rng.fill_bytes(slice);
-        }
-        int
-    });
-}
-
-macro_rules! fill_via_chunks {
-    ($src:expr, $dst:expr, $ty:ty, $size:expr) => ({
-        let chunk_size_u8 = min($src.len() * $size, $dst.len());
-        let chunk_size = (chunk_size_u8 + $size - 1) / $size;
-        if cfg!(target_endian="little") {
-            unsafe {
-                copy_nonoverlapping(
-                    $src.as_ptr() as *const u8,
-                    $dst.as_mut_ptr(),
-                    chunk_size_u8);
-            }
-        } else {
-            for (&n, chunk) in $src.iter().zip($dst.chunks_mut($size)) {
-                let tmp = n.to_le();
-                let src_ptr = &tmp as *const $ty as *const u8;
-                unsafe {
-                    copy_nonoverlapping(src_ptr,
-                                        chunk.as_mut_ptr(),
-                                        chunk.len());
-                }
-            }
-        }
-
-        (chunk_size, chunk_size_u8)
-    });
-}
-
-/// Implement `fill_bytes` by reading chunks from the output buffer of a block
-/// based RNG.
-///
-/// The return values are `(consumed_u32, filled_u8)`.
-///
-/// `filled_u8` is the number of filled bytes in `dest`, which may be less than
-/// the length of `dest`.
-/// `consumed_u32` is the number of words consumed from `src`, which is the same
-/// as `filled_u8 / 4` rounded up.
-///
-/// # Example
-/// (from `IsaacRng`)
-///
-/// ```ignore
-/// fn fill_bytes(&mut self, dest: &mut [u8]) {
-///     let mut read_len = 0;
-///     while read_len < dest.len() {
-///         if self.index >= self.rsl.len() {
-///             self.isaac();
-///         }
-///
-///         let (consumed_u32, filled_u8) =
-///             impls::fill_via_u32_chunks(&mut self.rsl[self.index..],
-///                                        &mut dest[read_len..]);
-///
-///         self.index += consumed_u32;
-///         read_len += filled_u8;
-///     }
-/// }
-/// ```
-pub fn fill_via_u32_chunks(src: &[u32], dest: &mut [u8]) -> (usize, usize) {
-    fill_via_chunks!(src, dest, u32, 4)
-}
-
-/// Implement `fill_bytes` by reading chunks from the output buffer of a block
-/// based RNG.
-///
-/// The return values are `(consumed_u64, filled_u8)`.
-/// `filled_u8` is the number of filled bytes in `dest`, which may be less than
-/// the length of `dest`.
-/// `consumed_u64` is the number of words consumed from `src`, which is the same
-/// as `filled_u8 / 8` rounded up.
-///
-/// See `fill_via_u32_chunks` for an example.
-pub fn fill_via_u64_chunks(src: &[u64], dest: &mut [u8]) -> (usize, usize) {
-    fill_via_chunks!(src, dest, u64, 8)
-}
-
-/// Implement `next_u32` via `fill_bytes`, little-endian order.
-pub fn next_u32_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u32 {
-    impl_uint_from_fill!(rng, u32, 4)
-}
-
-/// Implement `next_u64` via `fill_bytes`, little-endian order.
-pub fn next_u64_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
-    impl_uint_from_fill!(rng, u64, 8)
-}
-
-// TODO: implement tests for the above
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/src/le.rs cargo-0.33.0/vendor/rand_core-0.2.2/src/le.rs
--- cargo-0.32.0/vendor/rand_core-0.2.2/src/le.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/src/le.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Little-Endian utilities
-//! 
-//! Little-Endian order has been chosen for internal usage; this makes some
-//! useful functions available.
-
-use core::ptr;
-
-macro_rules! read_slice {
-    ($src:expr, $dst:expr, $size:expr, $which:ident) => {{
-        assert_eq!($src.len(), $size * $dst.len());
-
-        unsafe {
-            ptr::copy_nonoverlapping(
-                $src.as_ptr(),
-                $dst.as_mut_ptr() as *mut u8,
-                $src.len());
-        }
-        for v in $dst.iter_mut() {
-            *v = v.$which();
-        }
-    }};
-}
-
-/// Reads unsigned 32 bit integers from `src` into `dst`.
-/// Borrowed from the `byteorder` crate.
-#[inline]
-pub fn read_u32_into(src: &[u8], dst: &mut [u32]) {
-    read_slice!(src, dst, 4, to_le);
-}
-
-/// Reads unsigned 64 bit integers from `src` into `dst`.
-/// Borrowed from the `byteorder` crate.
-#[inline]
-pub fn read_u64_into(src: &[u8], dst: &mut [u64]) {
-    read_slice!(src, dst, 8, to_le);
-}
-
-#[test]
-fn test_read() {
-    let bytes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
-    
-    let mut buf = [0u32; 4];
-    read_u32_into(&bytes, &mut buf);
-    assert_eq!(buf[0], 0x04030201);
-    assert_eq!(buf[3], 0x100F0E0D);
-    
-    let mut buf = [0u32; 3];
-    read_u32_into(&bytes[1..13], &mut buf);  // unaligned
-    assert_eq!(buf[0], 0x05040302);
-    assert_eq!(buf[2], 0x0D0C0B0A);
-    
-    let mut buf = [0u64; 2];
-    read_u64_into(&bytes, &mut buf);
-    assert_eq!(buf[0], 0x0807060504030201);
-    assert_eq!(buf[1], 0x100F0E0D0C0B0A09);
-    
-    let mut buf = [0u64; 1];
-    read_u64_into(&bytes[7..15], &mut buf); // unaligned
-    assert_eq!(buf[0], 0x0F0E0D0C0B0A0908);
-}
diff -Nru cargo-0.32.0/vendor/rand_core-0.2.2/src/lib.rs cargo-0.33.0/vendor/rand_core-0.2.2/src/lib.rs
--- cargo-0.32.0/vendor/rand_core-0.2.2/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.2.2/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-// Copyright 2017-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// https://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Random number generation traits
-//! 
-//! This version of `rand_core` is a compatibility shim around version 0.3.
-//! 
-//! This crate is mainly of interest to crates publishing implementations of
-//! [`RngCore`]. Other users are encouraged to use the [rand] crate instead
-//! which re-exports the main traits and error types.
-//!
-//! [`RngCore`] is the core trait implemented by algorithmic pseudo-random number
-//! generators and external random-number sources.
-//! 
-//! [`SeedableRng`] is an extension trait for construction from fixed seeds and
-//! other random number generators.
-//! 
-//! [`Error`] is provided for error-handling. It is safe to use in `no_std`
-//! environments.
-//! 
-//! The [`impls`] and [`le`] sub-modules include a few small functions to assist
-//! implementation of [`RngCore`].
-//! 
-//! [rand]: https://crates.io/crates/rand
-//! [`RngCore`]: trait.RngCore.html
-//! [`SeedableRng`]: trait.SeedableRng.html
-//! [`Error`]: struct.Error.html
-//! [`impls`]: impls/index.html
-//! [`le`]: le/index.html
-
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/rand_core/0.2.2")]
-
-#![deny(missing_docs)]
-#![deny(missing_debug_implementations)]
-#![doc(test(attr(allow(unused_variables), deny(warnings))))]
-
-#![no_std]
-
-extern crate rand_core as core3;
-
-pub use core3::{ErrorKind, Error};
-pub use core3::{block, impls, le};
-pub use core3::{RngCore, CryptoRng, SeedableRng};
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/.cargo-checksum.json cargo-0.33.0/vendor/rand_core-0.3.1/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_core-0.3.1/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/Cargo.toml cargo-0.33.0/vendor/rand_core-0.3.1/Cargo.toml
--- cargo-0.32.0/vendor/rand_core-0.3.1/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,37 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "rand_core"
+version = "0.3.1"
+authors = ["The Rand Project Developers", "The Rust Project Developers"]
+description = "Core random number generator traits and tools for implementation.\n"
+homepage = "https://crates.io/crates/rand_core"
+documentation = "https://rust-random.github.io/rand/rand_core"
+readme = "README.md"
+keywords = ["random", "rng"]
+categories = ["algorithms", "no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-random/rand"
+[dependencies.rand_core]
+version = "0.4"
+
+[features]
+alloc = ["rand_core/alloc"]
+default = ["std"]
+serde1 = ["rand_core/serde1"]
+std = ["rand_core/std"]
+[badges.appveyor]
+repository = "rust-random/rand"
+
+[badges.travis-ci]
+repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/CHANGELOG.md cargo-0.33.0/vendor/rand_core-0.3.1/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_core-0.3.1/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,36 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.3.1] - 2019-01-25
+- Compatibility shim around version 0.4
+
+## [0.3.0] - 2018-09-24
+- Add `SeedableRng::seed_from_u64` for convenient seeding. (#537)
+
+## [0.2.1] - 2018-06-08
+- References to a `CryptoRng` now also implement `CryptoRng`. (#470)
+
+## [0.2.0] - 2018-05-21
+- Enable the `std` feature by default. (#409)
+- Remove `BlockRng{64}::inner` and `BlockRng::inner_mut`; instead making `core` public
+- Add `BlockRng{64}::index` and `BlockRng{64}::generate_and_set`. (#374, #419)
+- Change `BlockRngCore::Results` bound to also require `AsMut<[Self::Item]>`. (#419)
+- Implement `std::io::Read` for RngCore. (#434)
+
+## [0.1.0] - 2018-04-17
+(Split out of the Rand crate, changes here are relative to rand 0.4.2)
+- `RngCore` and `SeedableRng` are now part of `rand_core`. (#288)
+- Add modules to help implementing RNGs `impl` and `le`. (#209, #228)
+- Add `Error` and `ErrorKind`. (#225)
+- Add `CryptoRng` marker trait. (#273)
+- Add `BlockRngCore` trait. (#281)
+- Add `BlockRng` and `BlockRng64` wrappers to help implementations. (#281, #325)
+- Revise the `SeedableRng` trait. (#233)
+- Remove default implementations for `RngCore::next_u64` and `RngCore::fill_bytes`. (#288)
+- Add `RngCore::try_fill_bytes`. (#225)
+
+## [0.0.1] - 2017-09-14 (yanked)
+Experimental version as part of the rand crate refactor.
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/COPYRIGHT cargo-0.33.0/vendor/rand_core-0.3.1/COPYRIGHT
--- cargo-0.32.0/vendor/rand_core-0.3.1/COPYRIGHT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/COPYRIGHT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+Copyrights in the Rand project are retained by their contributors. No
+copyright assignment is required to contribute to the Rand project.
+
+For full authorship information, see the version control history.
+
+Except as otherwise noted (below and/or in individual files), Rand is
+licensed under the Apache License, Version 2.0 <LICENSE-APACHE> or
+<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+<LICENSE-MIT> or <http://opensource.org/licenses/MIT>, at your option.
+
+The Rand project includes code from the Rust project
+published under these same licenses.
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/LICENSE-APACHE cargo-0.33.0/vendor/rand_core-0.3.1/LICENSE-APACHE
--- cargo-0.32.0/vendor/rand_core-0.3.1/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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
+
+	https://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.
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/LICENSE-MIT cargo-0.33.0/vendor/rand_core-0.3.1/LICENSE-MIT
--- cargo-0.32.0/vendor/rand_core-0.3.1/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,26 @@
+Copyright 2018 Developers of the Rand project
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/README.md cargo-0.33.0/vendor/rand_core-0.3.1/README.md
--- cargo-0.32.0/vendor/rand_core-0.3.1/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,65 @@
+# rand_core
+
+[![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Latest version](https://img.shields.io/crates/v/rand_core.svg)](https://crates.io/crates/rand_core)
+[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_core)
+[![API](https://docs.rs/rand_core/badge.svg)](https://docs.rs/rand_core)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+
+Core traits and error types of the [rand] library, plus tools for implementing
+RNGs.
+
+This crate is intended for use when implementing the core trait, `RngCore`; it
+defines the core traits to be implemented as well as several small functions to
+aid in their implementation and types required for error handling.
+
+The main [rand] crate re-exports most items defined in this crate, along with
+tools to convert the integer samples generated by `RngCore` to many different
+applications (including sampling from restricted ranges, conversion to floating
+point, list permutations and secure initialisation of RNGs). Most users should
+prefer to use the main [rand] crate.
+
+Links:
+
+-   [API documentation (master)](https://rust-random.github.io/rand/rand_core)
+-   [API documentation (docs.rs)](https://docs.rs/rand_core)
+-   [Changelog](CHANGELOG.md)
+
+[rand]: https://crates.io/crates/rand
+
+
+## Functionality
+
+The `rand_core` crate provides:
+
+-   base random number generator traits
+-   error-reporting types
+-   functionality to aid implementation of RNGs
+
+The traits and error types are also available via `rand`.
+
+## Crate Features
+
+`rand_core` supports `no_std` and `alloc`-only configurations, as well as full
+`std` functionality. The differences between `no_std` and full `std` are small,
+comprising `RngCore` support for `Box<R>` types where `R: RngCore`, as well as
+extensions to the `Error` type's functionality.
+
+Due to [rust-lang/cargo#1596](https://github.com/rust-lang/cargo/issues/1596),
+`rand_core` is built without `std` support by default. Since features are
+unioned across the whole dependency tree, any crate using `rand` with its
+default features will also enable `std` support in `rand_core`.
+
+The `serde1` feature can be used to derive `Serialize` and `Deserialize` for RNG
+implementations that use the `BlockRng` or `BlockRng64` wrappers.
+
+
+# License
+
+`rand_core` is distributed under the terms of both the MIT license and the
+Apache License (Version 2.0).
+
+See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT), and
+[COPYRIGHT](COPYRIGHT) for details.
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/src/block.rs cargo-0.33.0/vendor/rand_core-0.3.1/src/block.rs
--- cargo-0.32.0/vendor/rand_core-0.3.1/src/block.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/src/block.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,499 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The `BlockRngCore` trait and implementation helpers
+//!
+//! The [`BlockRngCore`] trait exists to assist in the implementation of RNGs
+//! which generate a block of data in a cache instead of returning generated
+//! values directly.
+//!
+//! Usage of this trait is optional, but provides two advantages:
+//! implementations only need to concern themselves with generation of the
+//! block, not the various [`RngCore`] methods (especially [`fill_bytes`], where
+//! the optimal implementations are not trivial), and this allows
+//! `ReseedingRng` (see [`rand`](https://docs.rs/rand) crate) perform periodic
+//! reseeding with very low overhead.
+//!
+//! # Example
+//!
+//! ```norun
+//! use rand_core::block::{BlockRngCore, BlockRng};
+//!
+//! struct MyRngCore;
+//!
+//! impl BlockRngCore for MyRngCore {
+//!     type Results = [u32; 16];
+//!
+//!     fn generate(&mut self, results: &mut Self::Results) {
+//!         unimplemented!()
+//!     }
+//! }
+//!
+//! impl SeedableRng for MyRngCore {
+//!     type Seed = unimplemented!();
+//!     fn from_seed(seed: Self::Seed) -> Self {
+//!         unimplemented!()
+//!     }
+//! }
+//!
+//! // optionally, also implement CryptoRng for MyRngCore
+//!
+//! // Final RNG.
+//! type MyRng = BlockRng<u32, MyRngCore>;
+//! ```
+//!
+//! [`BlockRngCore`]: crate::block::BlockRngCore
+//! [`fill_bytes`]: RngCore::fill_bytes
+
+use core::convert::AsRef;
+use core::fmt;
+use {RngCore, CryptoRng, SeedableRng, Error};
+use impls::{fill_via_u32_chunks, fill_via_u64_chunks};
+
+/// A trait for RNGs which do not generate random numbers individually, but in
+/// blocks (typically `[u32; N]`). This technique is commonly used by
+/// cryptographic RNGs to improve performance.
+///
+/// See the [module][crate::block] documentation for details.
+pub trait BlockRngCore {
+    /// Results element type, e.g. `u32`.
+    type Item;
+
+    /// Results type. This is the 'block' an RNG implementing `BlockRngCore`
+    /// generates, which will usually be an array like `[u32; 16]`.
+    type Results: AsRef<[Self::Item]> + AsMut<[Self::Item]> + Default;
+
+    /// Generate a new block of results.
+    fn generate(&mut self, results: &mut Self::Results);
+}
+
+
+/// A wrapper type implementing [`RngCore`] for some type implementing
+/// [`BlockRngCore`] with `u32` array buffer; i.e. this can be used to implement
+/// a full RNG from just a `generate` function.
+///
+/// The `core` field may be accessed directly but the results buffer may not.
+/// PRNG implementations can simply use a type alias
+/// (`pub type MyRng = BlockRng<MyRngCore>;`) but might prefer to use a
+/// wrapper type (`pub struct MyRng(BlockRng<MyRngCore>);`); the latter must
+/// re-implement `RngCore` but hides the implementation details and allows
+/// extra functionality to be defined on the RNG
+/// (e.g. `impl MyRng { fn set_stream(...){...} }`).
+///
+/// `BlockRng` has heavily optimized implementations of the [`RngCore`] methods
+/// reading values from the results buffer, as well as
+/// calling [`BlockRngCore::generate`] directly on the output array when
+/// [`fill_bytes`] / [`try_fill_bytes`] is called on a large array. These methods
+/// also handle the bookkeeping of when to generate a new batch of values.
+///
+/// No whole generated `u32` values are thown away and all values are consumed
+/// in-order. [`next_u32`] simply takes the next available `u32` value.
+/// [`next_u64`] is implemented by combining two `u32` values, least
+/// significant first. [`fill_bytes`] and [`try_fill_bytes`] consume a whole
+/// number of `u32` values, converting each `u32` to a byte slice in
+/// little-endian order. If the requested byte length is not a multiple of 4,
+/// some bytes will be discarded.
+///
+/// See also [`BlockRng64`] which uses `u64` array buffers. Currently there is
+/// no direct support for other buffer types.
+///
+/// For easy initialization `BlockRng` also implements [`SeedableRng`].
+///
+/// [`next_u32`]: RngCore::next_u32
+/// [`next_u64`]: RngCore::next_u64
+/// [`fill_bytes`]: RngCore::fill_bytes
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
+#[derive(Clone)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct BlockRng<R: BlockRngCore + ?Sized> {
+    results: R::Results,
+    index: usize,
+    /// The *core* part of the RNG, implementing the `generate` function.
+    pub core: R,
+}
+
+// Custom Debug implementation that does not expose the contents of `results`.
+impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng<R> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("BlockRng")
+           .field("core", &self.core)
+           .field("result_len", &self.results.as_ref().len())
+           .field("index", &self.index)
+           .finish()
+    }
+}
+
+impl<R: BlockRngCore> BlockRng<R> {
+    /// Create a new `BlockRng` from an existing RNG implementing
+    /// `BlockRngCore`. Results will be generated on first use.
+    pub fn new(core: R) -> BlockRng<R>{
+        let results_empty = R::Results::default();
+        BlockRng {
+            core,
+            index: results_empty.as_ref().len(),
+            results: results_empty,
+        }
+    }
+
+    /// Get the index into the result buffer.
+    ///
+    /// If this is equal to or larger than the size of the result buffer then
+    /// the buffer is "empty" and `generate()` must be called to produce new
+    /// results.
+    pub fn index(&self) -> usize {
+        self.index
+    }
+
+    /// Reset the number of available results.
+    /// This will force a new set of results to be generated on next use.
+    pub fn reset(&mut self) {
+        self.index = self.results.as_ref().len();
+    }
+
+    /// Generate a new set of results immediately, setting the index to the
+    /// given value.
+    pub fn generate_and_set(&mut self, index: usize) {
+        assert!(index < self.results.as_ref().len());
+        self.core.generate(&mut self.results);
+        self.index = index;
+    }
+}
+
+impl<R: BlockRngCore<Item=u32>> RngCore for BlockRng<R>
+where <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>
+{
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        if self.index >= self.results.as_ref().len() {
+            self.generate_and_set(0);
+        }
+
+        let value = self.results.as_ref()[self.index];
+        self.index += 1;
+        value
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        let read_u64 = |results: &[u32], index| {
+            if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
+                // requires little-endian CPU supporting unaligned reads:
+                unsafe { *(&results[index] as *const u32 as *const u64) }
+            } else {
+                let x = u64::from(results[index]);
+                let y = u64::from(results[index + 1]);
+                (y << 32) | x
+            }
+        };
+
+        let len = self.results.as_ref().len();
+
+        let index = self.index;
+        if index < len-1 {
+            self.index += 2;
+            // Read an u64 from the current index
+            read_u64(self.results.as_ref(), index)
+        } else if index >= len {
+            self.generate_and_set(2);
+            read_u64(self.results.as_ref(), 0)
+        } else {
+            let x = u64::from(self.results.as_ref()[len-1]);
+            self.generate_and_set(1);
+            let y = u64::from(self.results.as_ref()[0]);
+            (y << 32) | x
+        }
+    }
+
+    // As an optimization we try to write directly into the output buffer.
+    // This is only enabled for little-endian platforms where unaligned writes
+    // are known to be safe and fast.
+    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        let mut filled = 0;
+
+        // Continue filling from the current set of results
+        if self.index < self.results.as_ref().len() {
+            let (consumed_u32, filled_u8) =
+                fill_via_u32_chunks(&self.results.as_ref()[self.index..],
+                                    dest);
+
+            self.index += consumed_u32;
+            filled += filled_u8;
+        }
+
+        let len_remainder =
+            (dest.len() - filled) % (self.results.as_ref().len() * 4);
+        let end_direct = dest.len() - len_remainder;
+
+        while filled < end_direct {
+            let dest_u32: &mut R::Results = unsafe {
+                &mut *(dest[filled..].as_mut_ptr() as
+                *mut <R as BlockRngCore>::Results)
+            };
+            self.core.generate(dest_u32);
+            filled += self.results.as_ref().len() * 4;
+            self.index = self.results.as_ref().len();
+        }
+
+        if len_remainder > 0 {
+            self.core.generate(&mut self.results);
+            let (consumed_u32, _) =
+                fill_via_u32_chunks(self.results.as_ref(),
+                                    &mut dest[filled..]);
+
+            self.index = consumed_u32;
+        }
+    }
+
+    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        let mut read_len = 0;
+        while read_len < dest.len() {
+            if self.index >= self.results.as_ref().len() {
+                self.generate_and_set(0);
+            }
+            let (consumed_u32, filled_u8) =
+                fill_via_u32_chunks(&self.results.as_ref()[self.index..],
+                                    &mut dest[read_len..]);
+
+            self.index += consumed_u32;
+            read_len += filled_u8;
+        }
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.fill_bytes(dest);
+        Ok(())
+    }
+}
+
+impl<R: BlockRngCore + SeedableRng> SeedableRng for BlockRng<R> {
+    type Seed = R::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        Self::new(R::from_seed(seed))
+    }
+
+    fn seed_from_u64(seed: u64) -> Self {
+        Self::new(R::seed_from_u64(seed))
+    }
+
+    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
+        Ok(Self::new(R::from_rng(rng)?))
+    }
+}
+
+
+
+/// A wrapper type implementing [`RngCore`] for some type implementing
+/// [`BlockRngCore`] with `u64` array buffer; i.e. this can be used to implement
+/// a full RNG from just a `generate` function.
+///
+/// This is similar to [`BlockRng`], but specialized for algorithms that operate
+/// on `u64` values.
+///
+/// No whole generated `u64` values are thrown away and all values are consumed
+/// in-order. [`next_u64`] simply takes the next available `u64` value.
+/// [`next_u32`] is however a bit special: half of a `u64` is consumed, leaving
+/// the other half in the buffer. If the next function called is [`next_u32`]
+/// then the other half is then consumed, however both [`next_u64`] and
+/// [`fill_bytes`] discard the rest of any half-consumed `u64`s when called.
+///
+/// [`fill_bytes`] and [`try_fill_bytes`] consume a whole number of `u64`
+/// values. If the requested length is not a multiple of 8, some bytes will be
+/// discarded.
+///
+/// [`next_u32`]: RngCore::next_u32
+/// [`next_u64`]: RngCore::next_u64
+/// [`fill_bytes`]: RngCore::fill_bytes
+/// [`try_fill_bytes`]: RngCore::try_fill_bytes
+#[derive(Clone)]
+#[cfg_attr(feature="serde1", derive(Serialize, Deserialize))]
+pub struct BlockRng64<R: BlockRngCore + ?Sized> {
+    results: R::Results,
+    index: usize,
+    half_used: bool, // true if only half of the previous result is used
+    /// The *core* part of the RNG, implementing the `generate` function.
+    pub core: R,
+}
+
+// Custom Debug implementation that does not expose the contents of `results`.
+impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng64<R> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("BlockRng64")
+           .field("core", &self.core)
+           .field("result_len", &self.results.as_ref().len())
+           .field("index", &self.index)
+           .field("half_used", &self.half_used)
+           .finish()
+    }
+}
+
+impl<R: BlockRngCore> BlockRng64<R> {
+    /// Create a new `BlockRng` from an existing RNG implementing
+    /// `BlockRngCore`. Results will be generated on first use.
+    pub fn new(core: R) -> BlockRng64<R>{
+        let results_empty = R::Results::default();
+        BlockRng64 {
+            core,
+            index: results_empty.as_ref().len(),
+            half_used: false,
+            results: results_empty,
+        }
+    }
+
+    /// Get the index into the result buffer.
+    ///
+    /// If this is equal to or larger than the size of the result buffer then
+    /// the buffer is "empty" and `generate()` must be called to produce new
+    /// results.
+    pub fn index(&self) -> usize {
+        self.index
+    }
+
+    /// Reset the number of available results.
+    /// This will force a new set of results to be generated on next use.
+    pub fn reset(&mut self) {
+        self.index = self.results.as_ref().len();
+        self.half_used = false;
+    }
+
+    /// Generate a new set of results immediately, setting the index to the
+    /// given value.
+    pub fn generate_and_set(&mut self, index: usize) {
+        assert!(index < self.results.as_ref().len());
+        self.core.generate(&mut self.results);
+        self.index = index;
+        self.half_used = false;
+    }
+}
+
+impl<R: BlockRngCore<Item=u64>> RngCore for BlockRng64<R>
+where <R as BlockRngCore>::Results: AsRef<[u64]> + AsMut<[u64]>
+{
+    #[inline(always)]
+    fn next_u32(&mut self) -> u32 {
+        let mut index = self.index * 2 - self.half_used as usize;
+        if index >= self.results.as_ref().len() * 2 {
+            self.core.generate(&mut self.results);
+            self.index = 0;
+            // `self.half_used` is by definition `false`
+            self.half_used = false;
+            index = 0;
+        }
+
+        self.half_used = !self.half_used;
+        self.index += self.half_used as usize;
+
+        // Index as if this is a u32 slice.
+        unsafe {
+            let results =
+                &*(self.results.as_ref() as *const [u64] as *const [u32]);
+            if cfg!(target_endian = "little") {
+                *results.get_unchecked(index)
+            } else {
+                *results.get_unchecked(index ^ 1)
+            }
+        }
+    }
+
+    #[inline(always)]
+    fn next_u64(&mut self) -> u64 {
+        if self.index >= self.results.as_ref().len() {
+            self.core.generate(&mut self.results);
+            self.index = 0;
+        }
+
+        let value = self.results.as_ref()[self.index];
+        self.index += 1;
+        self.half_used = false;
+        value
+    }
+
+    // As an optimization we try to write directly into the output buffer.
+    // This is only enabled for little-endian platforms where unaligned writes
+    // are known to be safe and fast.
+    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        let mut filled = 0;
+        self.half_used = false;
+
+        // Continue filling from the current set of results
+        if self.index < self.results.as_ref().len() {
+            let (consumed_u64, filled_u8) =
+                fill_via_u64_chunks(&self.results.as_ref()[self.index..],
+                                    dest);
+
+            self.index += consumed_u64;
+            filled += filled_u8;
+        }
+
+        let len_remainder =
+            (dest.len() - filled) % (self.results.as_ref().len() * 8);
+        let end_direct = dest.len() - len_remainder;
+
+        while filled < end_direct {
+            let dest_u64: &mut R::Results = unsafe {
+                ::core::mem::transmute(dest[filled..].as_mut_ptr())
+            };
+            self.core.generate(dest_u64);
+            filled += self.results.as_ref().len() * 8;
+            self.index = self.results.as_ref().len();
+        }
+
+        if len_remainder > 0 {
+            self.core.generate(&mut self.results);
+            let (consumed_u64, _) =
+                fill_via_u64_chunks(&mut self.results.as_ref(),
+                                    &mut dest[filled..]);
+
+            self.index = consumed_u64;
+        }
+    }
+
+    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        let mut read_len = 0;
+        self.half_used = false;
+        while read_len < dest.len() {
+            if self.index as usize >= self.results.as_ref().len() {
+                self.core.generate(&mut self.results);
+                self.index = 0;
+            }
+
+            let (consumed_u64, filled_u8) =
+                fill_via_u64_chunks(&self.results.as_ref()[self.index as usize..],
+                                    &mut dest[read_len..]);
+
+            self.index += consumed_u64;
+            read_len += filled_u8;
+        }
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        Ok(self.fill_bytes(dest))
+    }
+}
+
+impl<R: BlockRngCore + SeedableRng> SeedableRng for BlockRng64<R> {
+    type Seed = R::Seed;
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        Self::new(R::from_seed(seed))
+    }
+
+    fn seed_from_u64(seed: u64) -> Self {
+        Self::new(R::seed_from_u64(seed))
+    }
+
+    fn from_rng<S: RngCore>(rng: S) -> Result<Self, Error> {
+        Ok(Self::new(R::from_rng(rng)?))
+    }
+}
+
+impl<R: BlockRngCore + CryptoRng> CryptoRng for BlockRng<R> {}
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/src/error.rs cargo-0.33.0/vendor/rand_core-0.3.1/src/error.rs
--- cargo-0.32.0/vendor/rand_core-0.3.1/src/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/src/error.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,177 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Error types
+
+use core::fmt;
+
+#[cfg(feature="std")]
+use std::error::Error as stdError;
+#[cfg(feature="std")]
+use std::io;
+
+/// Error kind which can be matched over.
+#[derive(PartialEq, Eq, Debug, Copy, Clone)]
+pub enum ErrorKind {
+    /// Feature is not available; not recoverable.
+    /// 
+    /// This is the most permanent failure type and implies the error cannot be
+    /// resolved simply by retrying (e.g. the feature may not exist in this
+    /// build of the application or on the current platform).
+    Unavailable,
+    /// General failure; there may be a chance of recovery on retry.
+    /// 
+    /// This is the catch-all kind for errors from known and unknown sources
+    /// which do not have a more specific kind / handling method.
+    /// 
+    /// It is suggested to retry a couple of times or retry later when
+    /// handling; some error sources may be able to resolve themselves,
+    /// although this is not likely.
+    Unexpected,
+    /// A transient failure which likely can be resolved or worked around.
+    /// 
+    /// This error kind exists for a few specific cases where it is known that
+    /// the error likely can be resolved internally, but is reported anyway.
+    Transient,
+    /// Not ready yet: recommended to try again a little later.
+    /// 
+    /// This error kind implies the generator needs more time or needs some
+    /// other part of the application to do something else first before it is
+    /// ready for use; for example this may be used by external generators
+    /// which require time for initialization.
+    NotReady,
+    #[doc(hidden)]
+    __Nonexhaustive,
+}
+
+impl ErrorKind {
+    /// True if this kind of error may resolve itself on retry.
+    /// 
+    /// See also `should_wait()`.
+    pub fn should_retry(self) -> bool {
+        self != ErrorKind::Unavailable
+    }
+    
+    /// True if we should retry but wait before retrying
+    /// 
+    /// This implies `should_retry()` is true.
+    pub fn should_wait(self) -> bool {
+        self == ErrorKind::NotReady
+    }
+    
+    /// A description of this error kind
+    pub fn description(self) -> &'static str {
+        match self {
+            ErrorKind::Unavailable => "permanently unavailable",
+            ErrorKind::Unexpected => "unexpected failure",
+            ErrorKind::Transient => "transient failure",
+            ErrorKind::NotReady => "not ready yet",
+            ErrorKind::__Nonexhaustive => unreachable!(),
+        }
+    }
+}
+
+
+/// Error type of random number generators
+/// 
+/// This is a relatively simple error type, designed for compatibility with and
+/// without the Rust `std` library. It embeds a "kind" code, a message (static
+/// string only), and an optional chained cause (`std` only). The `kind` and
+/// `msg` fields can be accessed directly; cause can be accessed via
+/// `std::error::Error::cause` or `Error::take_cause`. Construction can only be
+/// done via `Error::new` or `Error::with_cause`.
+#[derive(Debug)]
+pub struct Error {
+    /// The error kind
+    pub kind: ErrorKind,
+    /// The error message
+    pub msg: &'static str,
+    #[cfg(feature="std")]
+    cause: Option<Box<stdError + Send + Sync>>,
+}
+
+impl Error {
+    /// Create a new instance, with specified kind and a message.
+    pub fn new(kind: ErrorKind, msg: &'static str) -> Self {
+        #[cfg(feature="std")] {
+            Error { kind, msg, cause: None }
+        }
+        #[cfg(not(feature="std"))] {
+            Error { kind, msg }
+        }
+    }
+    
+    /// Create a new instance, with specified kind, message, and a
+    /// chained cause.
+    /// 
+    /// Note: `stdError` is an alias for `std::error::Error`.
+    /// 
+    /// If not targetting `std` (i.e. `no_std`), this function is replaced by
+    /// another with the same prototype, except that there are no bounds on the
+    /// type `E` (because both `Box` and `stdError` are unavailable), and the
+    /// `cause` is ignored.
+    #[cfg(feature="std")]
+    pub fn with_cause<E>(kind: ErrorKind, msg: &'static str, cause: E) -> Self
+        where E: Into<Box<stdError + Send + Sync>>
+    {
+        Error { kind, msg, cause: Some(cause.into()) }
+    }
+    
+    /// Create a new instance, with specified kind, message, and a
+    /// chained cause.
+    /// 
+    /// In `no_std` mode the *cause* is ignored.
+    #[cfg(not(feature="std"))]
+    pub fn with_cause<E>(kind: ErrorKind, msg: &'static str, _cause: E) -> Self {
+        Error { kind, msg }
+    }
+    
+    /// Take the cause, if any. This allows the embedded cause to be extracted.
+    /// This uses `Option::take`, leaving `self` with no cause.
+    #[cfg(feature="std")]
+    pub fn take_cause(&mut self) -> Option<Box<stdError + Send + Sync>> {
+        self.cause.take()
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[cfg(feature="std")] {
+            if let Some(ref cause) = self.cause {
+                return write!(f, "{} ({}); cause: {}",
+                        self.msg, self.kind.description(), cause);
+            }
+        }
+        write!(f, "{} ({})", self.msg, self.kind.description())
+    }
+}
+
+#[cfg(feature="std")]
+impl stdError for Error {
+    fn description(&self) -> &str {
+        self.msg
+    }
+
+    fn cause(&self) -> Option<&stdError> {
+        self.cause.as_ref().map(|e| e.as_ref() as &stdError)
+    }
+}
+
+#[cfg(feature="std")]
+impl From<Error> for io::Error {
+    fn from(error: Error) -> Self {
+        use std::io::ErrorKind::*;
+        match error.kind {
+            ErrorKind::Unavailable => io::Error::new(NotFound, error),
+            ErrorKind::Unexpected |
+            ErrorKind::Transient => io::Error::new(Other, error),
+            ErrorKind::NotReady => io::Error::new(WouldBlock, error),
+            ErrorKind::__Nonexhaustive => unreachable!(),
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/src/impls.rs cargo-0.33.0/vendor/rand_core-0.3.1/src/impls.rs
--- cargo-0.32.0/vendor/rand_core-0.3.1/src/impls.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/src/impls.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,165 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Helper functions for implementing `RngCore` functions.
+//!
+//! For cross-platform reproducibility, these functions all use Little Endian:
+//! least-significant part first. For example, `next_u64_via_u32` takes `u32`
+//! values `x, y`, then outputs `(y << 32) | x`. To implement `next_u32`
+//! from `next_u64` in little-endian order, one should use `next_u64() as u32`.
+//!
+//! Byte-swapping (like the std `to_le` functions) is only needed to convert
+//! to/from byte sequences, and since its purpose is reproducibility,
+//! non-reproducible sources (e.g. `OsRng`) need not bother with it.
+
+use core::intrinsics::transmute;
+use core::ptr::copy_nonoverlapping;
+use core::slice;
+use core::cmp::min;
+use core::mem::size_of;
+use RngCore;
+
+
+/// Implement `next_u64` via `next_u32`, little-endian order.
+pub fn next_u64_via_u32<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
+    // Use LE; we explicitly generate one value before the next.
+    let x = u64::from(rng.next_u32());
+    let y = u64::from(rng.next_u32());
+    (y << 32) | x
+}
+
+/// Implement `fill_bytes` via `next_u64` and `next_u32`, little-endian order.
+///
+/// The fastest way to fill a slice is usually to work as long as possible with
+/// integers. That is why this method mostly uses `next_u64`, and only when
+/// there are 4 or less bytes remaining at the end of the slice it uses
+/// `next_u32` once.
+pub fn fill_bytes_via_next<R: RngCore + ?Sized>(rng: &mut R, dest: &mut [u8]) {
+    let mut left = dest;
+    while left.len() >= 8 {
+        let (l, r) = {left}.split_at_mut(8);
+        left = r;
+        let chunk: [u8; 8] = unsafe {
+            transmute(rng.next_u64().to_le())
+        };
+        l.copy_from_slice(&chunk);
+    }
+    let n = left.len();
+    if n > 4 {
+        let chunk: [u8; 8] = unsafe {
+            transmute(rng.next_u64().to_le())
+        };
+        left.copy_from_slice(&chunk[..n]);
+    } else if n > 0 {
+        let chunk: [u8; 4] = unsafe {
+            transmute(rng.next_u32().to_le())
+        };
+        left.copy_from_slice(&chunk[..n]);
+    }
+}
+
+macro_rules! impl_uint_from_fill {
+    ($rng:expr, $ty:ty, $N:expr) => ({
+        debug_assert!($N == size_of::<$ty>());
+
+        let mut int: $ty = 0;
+        unsafe {
+            let ptr = &mut int as *mut $ty as *mut u8;
+            let slice = slice::from_raw_parts_mut(ptr, $N);
+            $rng.fill_bytes(slice);
+        }
+        int
+    });
+}
+
+macro_rules! fill_via_chunks {
+    ($src:expr, $dst:expr, $ty:ty, $size:expr) => ({
+        let chunk_size_u8 = min($src.len() * $size, $dst.len());
+        let chunk_size = (chunk_size_u8 + $size - 1) / $size;
+        if cfg!(target_endian="little") {
+            unsafe {
+                copy_nonoverlapping(
+                    $src.as_ptr() as *const u8,
+                    $dst.as_mut_ptr(),
+                    chunk_size_u8);
+            }
+        } else {
+            for (&n, chunk) in $src.iter().zip($dst.chunks_mut($size)) {
+                let tmp = n.to_le();
+                let src_ptr = &tmp as *const $ty as *const u8;
+                unsafe {
+                    copy_nonoverlapping(src_ptr,
+                                        chunk.as_mut_ptr(),
+                                        chunk.len());
+                }
+            }
+        }
+
+        (chunk_size, chunk_size_u8)
+    });
+}
+
+/// Implement `fill_bytes` by reading chunks from the output buffer of a block
+/// based RNG.
+///
+/// The return values are `(consumed_u32, filled_u8)`.
+///
+/// `filled_u8` is the number of filled bytes in `dest`, which may be less than
+/// the length of `dest`.
+/// `consumed_u32` is the number of words consumed from `src`, which is the same
+/// as `filled_u8 / 4` rounded up.
+///
+/// # Example
+/// (from `IsaacRng`)
+///
+/// ```ignore
+/// fn fill_bytes(&mut self, dest: &mut [u8]) {
+///     let mut read_len = 0;
+///     while read_len < dest.len() {
+///         if self.index >= self.rsl.len() {
+///             self.isaac();
+///         }
+///
+///         let (consumed_u32, filled_u8) =
+///             impls::fill_via_u32_chunks(&mut self.rsl[self.index..],
+///                                        &mut dest[read_len..]);
+///
+///         self.index += consumed_u32;
+///         read_len += filled_u8;
+///     }
+/// }
+/// ```
+pub fn fill_via_u32_chunks(src: &[u32], dest: &mut [u8]) -> (usize, usize) {
+    fill_via_chunks!(src, dest, u32, 4)
+}
+
+/// Implement `fill_bytes` by reading chunks from the output buffer of a block
+/// based RNG.
+///
+/// The return values are `(consumed_u64, filled_u8)`.
+/// `filled_u8` is the number of filled bytes in `dest`, which may be less than
+/// the length of `dest`.
+/// `consumed_u64` is the number of words consumed from `src`, which is the same
+/// as `filled_u8 / 8` rounded up.
+///
+/// See `fill_via_u32_chunks` for an example.
+pub fn fill_via_u64_chunks(src: &[u64], dest: &mut [u8]) -> (usize, usize) {
+    fill_via_chunks!(src, dest, u64, 8)
+}
+
+/// Implement `next_u32` via `fill_bytes`, little-endian order.
+pub fn next_u32_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u32 {
+    impl_uint_from_fill!(rng, u32, 4)
+}
+
+/// Implement `next_u64` via `fill_bytes`, little-endian order.
+pub fn next_u64_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
+    impl_uint_from_fill!(rng, u64, 8)
+}
+
+// TODO: implement tests for the above
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/src/le.rs cargo-0.33.0/vendor/rand_core-0.3.1/src/le.rs
--- cargo-0.32.0/vendor/rand_core-0.3.1/src/le.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/src/le.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,68 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Little-Endian utilities
+//! 
+//! Little-Endian order has been chosen for internal usage; this makes some
+//! useful functions available.
+
+use core::ptr;
+
+macro_rules! read_slice {
+    ($src:expr, $dst:expr, $size:expr, $which:ident) => {{
+        assert_eq!($src.len(), $size * $dst.len());
+
+        unsafe {
+            ptr::copy_nonoverlapping(
+                $src.as_ptr(),
+                $dst.as_mut_ptr() as *mut u8,
+                $src.len());
+        }
+        for v in $dst.iter_mut() {
+            *v = v.$which();
+        }
+    }};
+}
+
+/// Reads unsigned 32 bit integers from `src` into `dst`.
+/// Borrowed from the `byteorder` crate.
+#[inline]
+pub fn read_u32_into(src: &[u8], dst: &mut [u32]) {
+    read_slice!(src, dst, 4, to_le);
+}
+
+/// Reads unsigned 64 bit integers from `src` into `dst`.
+/// Borrowed from the `byteorder` crate.
+#[inline]
+pub fn read_u64_into(src: &[u8], dst: &mut [u64]) {
+    read_slice!(src, dst, 8, to_le);
+}
+
+#[test]
+fn test_read() {
+    let bytes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
+    
+    let mut buf = [0u32; 4];
+    read_u32_into(&bytes, &mut buf);
+    assert_eq!(buf[0], 0x04030201);
+    assert_eq!(buf[3], 0x100F0E0D);
+    
+    let mut buf = [0u32; 3];
+    read_u32_into(&bytes[1..13], &mut buf);  // unaligned
+    assert_eq!(buf[0], 0x05040302);
+    assert_eq!(buf[2], 0x0D0C0B0A);
+    
+    let mut buf = [0u64; 2];
+    read_u64_into(&bytes, &mut buf);
+    assert_eq!(buf[0], 0x0807060504030201);
+    assert_eq!(buf[1], 0x100F0E0D0C0B0A09);
+    
+    let mut buf = [0u64; 1];
+    read_u64_into(&bytes[7..15], &mut buf); // unaligned
+    assert_eq!(buf[0], 0x0F0E0D0C0B0A0908);
+}
diff -Nru cargo-0.32.0/vendor/rand_core-0.3.1/src/lib.rs cargo-0.33.0/vendor/rand_core-0.3.1/src/lib.rs
--- cargo-0.32.0/vendor/rand_core-0.3.1/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_core-0.3.1/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,46 @@
+// Copyright 2018 Developers of the Rand project.
+// Copyright 2017-2018 The Rust Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Random number generation traits
+//!
+//! This version of `rand_core` is a compatibility shim around version 0.3.
+//!
+//! This crate is mainly of interest to crates publishing implementations of
+//! [`RngCore`]. Other users are encouraged to use the [`rand`] crate instead
+//! which re-exports the main traits and error types.
+//!
+//! [`RngCore`] is the core trait implemented by algorithmic pseudo-random number
+//! generators and external random-number sources.
+//!
+//! [`SeedableRng`] is an extension trait for construction from fixed seeds and
+//! other random number generators.
+//!
+//! [`Error`] is provided for error-handling. It is safe to use in `no_std`
+//! environments.
+//!
+//! The [`impls`] and [`le`] sub-modules include a few small functions to assist
+//! implementation of [`RngCore`].
+//!
+//! [`rand`]: https://docs.rs/rand
+
+#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+       html_root_url = "https://rust-random.github.io/rand/")]
+
+#![deny(missing_docs)]
+#![deny(missing_debug_implementations)]
+#![doc(test(attr(allow(unused_variables), deny(warnings))))]
+
+#![no_std]
+
+extern crate rand_core as core4;
+
+pub use core4::{ErrorKind, Error};
+pub use core4::{block, impls, le};
+pub use core4::{RngCore, CryptoRng, SeedableRng};
diff -Nru cargo-0.32.0/vendor/rand_hc/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_hc/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_hc/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_hc/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "d9a960f8de48ca430eedbc1be9a9d851c212b647"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_isaac/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_isaac/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_isaac/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_isaac/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "6add2fd439f959989ee371b3eab94607fe173ece"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_jitter/benches/mod.rs cargo-0.33.0/vendor/rand_jitter/benches/mod.rs
--- cargo-0.32.0/vendor/rand_jitter/benches/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/benches/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,18 @@
+#![feature(test)]
+extern crate test;
+extern crate rand_jitter;
+
+use test::Bencher;
+use rand_jitter::rand_core::RngCore;
+
+#[bench]
+fn bench_add_two(b: &mut Bencher) {
+    let mut rng = rand_jitter::JitterRng::new().unwrap();
+    let mut buf = [0u8; 1024];
+    b.iter(|| {
+        rng.fill_bytes(&mut buf[..]);
+        test::black_box(&buf);
+    });
+    b.bytes = buf.len() as u64;
+}
+
diff -Nru cargo-0.32.0/vendor/rand_jitter/.cargo-checksum.json cargo-0.33.0/vendor/rand_jitter/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_jitter/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"080723c6145e37503a2224f801f252e14ac5531cb450f4502698542d188cb3c0"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_jitter/Cargo.toml cargo-0.33.0/vendor/rand_jitter/Cargo.toml
--- cargo-0.32.0/vendor/rand_jitter/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,41 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "rand_jitter"
+version = "0.1.2"
+authors = ["The Rand Project Developers"]
+description = "Random number generator based on timing jitter"
+documentation = "https://docs.rs/rand_jitter"
+readme = "README.md"
+keywords = ["random", "rng", "os"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-random/rand"
+[dependencies.log]
+version = "0.4"
+optional = true
+
+[dependencies.rand_core]
+version = "0.4"
+
+[features]
+std = ["rand_core/std"]
+[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.libc]
+version = "0.2"
+[target."cfg(target_os = \"windows\")".dependencies.winapi]
+version = "0.3"
+features = ["profileapi"]
+[badges.appveyor]
+repository = "rust-random/rand"
+
+[badges.travis-ci]
+repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand_jitter/CHANGELOG.md cargo-0.33.0/vendor/rand_jitter/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_jitter/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,15 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.1.2] - 2019-01-31
+- Fix for older rustc compilers on Windows (#722)
+
+## [0.1.1] - 2019-01-29
+- Fix for older rustc compilers on Mac OSX / iOS (#720)
+- Misc. doc fixes
+
+## [0.1.0] - 2019-01-24
+Initial release.
diff -Nru cargo-0.32.0/vendor/rand_jitter/COPYRIGHT cargo-0.33.0/vendor/rand_jitter/COPYRIGHT
--- cargo-0.32.0/vendor/rand_jitter/COPYRIGHT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/COPYRIGHT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+Copyrights in the Rand project are retained by their contributors. No
+copyright assignment is required to contribute to the Rand project.
+
+For full authorship information, see the version control history.
+
+Except as otherwise noted (below and/or in individual files), Rand is
+licensed under the Apache License, Version 2.0 <LICENSE-APACHE> or
+<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+<LICENSE-MIT> or <http://opensource.org/licenses/MIT>, at your option.
+
+The Rand project includes code from the Rust project
+published under these same licenses.
diff -Nru cargo-0.32.0/vendor/rand_jitter/LICENSE-APACHE cargo-0.33.0/vendor/rand_jitter/LICENSE-APACHE
--- cargo-0.32.0/vendor/rand_jitter/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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
+
+	https://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.
diff -Nru cargo-0.32.0/vendor/rand_jitter/LICENSE-MIT cargo-0.33.0/vendor/rand_jitter/LICENSE-MIT
--- cargo-0.32.0/vendor/rand_jitter/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,26 @@
+Copyright 2018 Developers of the Rand project
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rand_jitter/README.md cargo-0.33.0/vendor/rand_jitter/README.md
--- cargo-0.32.0/vendor/rand_jitter/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,104 @@
+# rand_jitter
+[![Build Status](https://travis-ci.org/rust-random/rand.svg?branch=master)](https://travis-ci.org/rust-random/rand)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Latest version](https://img.shields.io/crates/v/rand_os.svg)](https://crates.io/crates/rand_jitter)
+[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_jitter)
+[![API](https://docs.rs/rand_os/badge.svg)](https://docs.rs/rand_jitter)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+
+Non-physical true random number generator based on timing jitter.
+
+This crate depends on [rand_core](https://crates.io/crates/rand_core) and is
+part of the [Rand project](https://github.com/rust-random/rand).
+
+This crate aims to support all of Rust's `std` platforms with a system-provided
+entropy source. Unlike other Rand crates, this crate does not support `no_std`
+(handling this gracefully is a current discussion topic).
+
+Links:
+
+-   [API documentation (master)](https://rust-random.github.io/rand/rand_jitter)
+-   [API documentation (docs.rs)](https://docs.rs/rand_jitter)
+-   [Changelog](CHANGELOG.md)
+
+## Features
+
+This crate has optional `std` support which is *disabled by default*;
+this feature is required to provide the `JitterRng::new` function;
+without `std` support a timer must be supplied via `JitterRng::new_with_timer`.
+
+## Quality testing
+
+`JitterRng::new()` has build-in, but limited, quality testing, however
+before using `JitterRng` on untested hardware, or after changes that could
+effect how the code is optimized (such as a new LLVM version), it is
+recommend to run the much more stringent
+[NIST SP 800-90B Entropy Estimation Suite](https://github.com/usnistgov/SP800-90B_EntropyAssessment).
+
+Use the following code using `timer_stats` to collect the data:
+
+```rust
+use rand_jitter::JitterRng;
+
+use std::error::Error;
+use std::fs::File;
+use std::io::Write;
+
+fn main() -> Result<(), Box<Error>> {
+    let mut rng = JitterRng::new()?;
+
+    // 1_000_000 results are required for the
+    // NIST SP 800-90B Entropy Estimation Suite
+    const ROUNDS: usize = 1_000_000;
+    let mut deltas_variable: Vec<u8> = Vec::with_capacity(ROUNDS);
+    let mut deltas_minimal: Vec<u8> = Vec::with_capacity(ROUNDS);
+
+    for _ in 0..ROUNDS {
+        deltas_variable.push(rng.timer_stats(true) as u8);
+        deltas_minimal.push(rng.timer_stats(false) as u8);
+    }
+
+    // Write out after the statistics collection loop, to not disturb the
+    // test results.
+    File::create("jitter_rng_var.bin")?.write(&deltas_variable)?;
+    File::create("jitter_rng_min.bin")?.write(&deltas_minimal)?;
+    Ok(())
+}
+```
+
+This will produce two files: `jitter_rng_var.bin` and `jitter_rng_min.bin`.
+Run the Entropy Estimation Suite in three configurations, as outlined below.
+Every run has two steps. One step to produce an estimation, another to
+validate the estimation.
+
+1. Estimate the expected amount of entropy that is at least available with
+   each round of the entropy collector. This number should be greater than
+   the amount estimated with `64 / test_timer()`.
+   ```sh
+   python noniid_main.py -v jitter_rng_var.bin 8
+   restart.py -v jitter_rng_var.bin 8 <min-entropy>
+   ```
+2. Estimate the expected amount of entropy that is available in the last 4
+   bits of the timer delta after running noice sources. Note that a value of
+   `3.70` is the minimum estimated entropy for true randomness.
+   ```sh
+   python noniid_main.py -v -u 4 jitter_rng_var.bin 4
+   restart.py -v -u 4 jitter_rng_var.bin 4 <min-entropy>
+   ```
+3. Estimate the expected amount of entropy that is available to the entropy
+   collector if both noise sources only run their minimal number of times.
+   This measures the absolute worst-case, and gives a lower bound for the
+   available entropy.
+   ```sh
+   python noniid_main.py -v -u 4 jitter_rng_min.bin 4
+   restart.py -v -u 4 jitter_rng_min.bin 4 <min-entropy>
+   ```
+
+## License
+
+`rand_jitter` is distributed under the terms of both the MIT license and the
+Apache License (Version 2.0).
+
+See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT), and
+[COPYRIGHT](COPYRIGHT) for details.
diff -Nru cargo-0.32.0/vendor/rand_jitter/src/dummy_log.rs cargo-0.33.0/vendor/rand_jitter/src/dummy_log.rs
--- cargo-0.32.0/vendor/rand_jitter/src/dummy_log.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/src/dummy_log.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,10 @@
+#[allow(unused)]
+macro_rules! trace { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! debug { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! info { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! warn { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! error { ($($x:tt)*) => () }
diff -Nru cargo-0.32.0/vendor/rand_jitter/src/error.rs cargo-0.33.0/vendor/rand_jitter/src/error.rs
--- cargo-0.32.0/vendor/rand_jitter/src/error.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/src/error.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,66 @@
+// Copyright 2018 Developers of the Rand project.
+// Copyright 2013-2015 The Rust Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use rand_core::{Error, ErrorKind};
+use core::fmt;
+
+/// An error that can occur when [`JitterRng::test_timer`] fails.
+///
+/// [`JitterRng::test_timer`]: crate::JitterRng::test_timer
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TimerError {
+    /// No timer available.
+    NoTimer,
+    /// Timer too coarse to use as an entropy source.
+    CoarseTimer,
+    /// Timer is not monotonically increasing.
+    NotMonotonic,
+    /// Variations of deltas of time too small.
+    TinyVariantions,
+    /// Too many stuck results (indicating no added entropy).
+    TooManyStuck,
+    #[doc(hidden)]
+    __Nonexhaustive,
+}
+
+impl TimerError {
+    fn description(&self) -> &'static str {
+        match *self {
+            TimerError::NoTimer => "no timer available",
+            TimerError::CoarseTimer => "coarse timer",
+            TimerError::NotMonotonic => "timer not monotonic",
+            TimerError::TinyVariantions => "time delta variations too small",
+            TimerError::TooManyStuck => "too many stuck results",
+            TimerError::__Nonexhaustive => unreachable!(),
+        }
+    }
+}
+
+impl fmt::Display for TimerError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.description())
+    }
+}
+
+#[cfg(feature = "std")]
+impl ::std::error::Error for TimerError {
+    fn description(&self) -> &str {
+        self.description()
+    }
+}
+
+impl From<TimerError> for Error {
+    fn from(err: TimerError) -> Error {
+        // Timer check is already quite permissive of failures so we don't
+        // expect false-positive failures, i.e. any error is irrecoverable.
+        Error::with_cause(ErrorKind::Unavailable,
+                              "timer jitter failed basic quality tests", err)
+    }
+}
+
diff -Nru cargo-0.32.0/vendor/rand_jitter/src/lib.rs cargo-0.33.0/vendor/rand_jitter/src/lib.rs
--- cargo-0.32.0/vendor/rand_jitter/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,714 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+//
+// Based on jitterentropy-library, http://www.chronox.de/jent.html.
+// Copyright Stephan Mueller <smueller@chronox.de>, 2014 - 2017.
+//
+// With permission from Stephan Mueller to relicense the Rust translation under
+// the MIT license.
+
+//! Non-physical true random number generator based on timing jitter.
+//!
+//! This is a true random number generator, as opposed to pseudo-random
+//! generators. Random numbers generated by `JitterRng` can be seen as fresh
+//! entropy. A consequence is that it is orders of magnitude slower than `OsRng`
+//! and PRNGs (about 10<sup>3</sup>..10<sup>6</sup> slower).
+//!
+//! There are very few situations where using this RNG is appropriate. Only very
+//! few applications require true entropy. A normal PRNG can be statistically
+//! indistinguishable, and a cryptographic PRNG should also be as impossible to
+//! predict.
+//!
+//! Use of `JitterRng` is recommended for initializing cryptographic PRNGs when
+//! `OsRng` is not available.
+//!
+//! `JitterRng` can be used without the standard library, but not conveniently,
+//! you must provide a high-precision timer and carefully have to follow the
+//! instructions of [`JitterRng::new_with_timer`].
+//!
+//! This implementation is based on [Jitterentropy] version 2.1.0.
+//!
+//! Note: There is no accurate timer available on WASM platforms, to help
+//! prevent fingerprinting or timing side-channel attacks. Therefore
+//! [`JitterRng::new()`] is not available on WASM. It is also unavailable
+//! with disabled `std` feature.
+//!
+//! [Jitterentropy]: http://www.chronox.de/jent.html
+
+#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+       html_root_url = "https://rust-random.github.io/rand/")]
+
+#![deny(missing_docs)]
+#![deny(missing_debug_implementations)]
+#![doc(test(attr(allow(unused_variables), deny(warnings))))]
+
+// Note: the C implementation of `Jitterentropy` relies on being compiled
+// without optimizations. This implementation goes through lengths to make the
+// compiler not optimize out code which does influence timing jitter, but is
+// technically dead code.
+#![no_std]
+pub extern crate rand_core;
+#[cfg(feature = "std")]
+extern crate std;
+#[cfg(feature = "log")]
+#[macro_use] extern crate log;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+extern crate libc;
+#[cfg(target_os = "windows")]
+extern crate winapi;
+
+
+#[cfg(not(feature = "log"))]
+#[macro_use] mod dummy_log;
+#[cfg(feature = "std")]
+mod platform;
+mod error;
+
+use rand_core::{RngCore, CryptoRng, Error, impls};
+pub use error::TimerError;
+
+use core::{fmt, mem, ptr};
+#[cfg(feature = "std")]
+use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+
+const MEMORY_BLOCKS: usize = 64;
+const MEMORY_BLOCKSIZE: usize = 32;
+const MEMORY_SIZE: usize = MEMORY_BLOCKS * MEMORY_BLOCKSIZE;
+
+/// A true random number generator based on jitter in the CPU execution time,
+/// and jitter in memory access time.
+pub struct JitterRng {
+    data: u64, // Actual random number
+    // Number of rounds to run the entropy collector per 64 bits
+    rounds: u8,
+    // Timer used by `measure_jitter`
+    timer: fn() -> u64,
+    // Memory for the Memory Access noise source
+    mem_prev_index: u16,
+    // Make `next_u32` not waste 32 bits
+    data_half_used: bool,
+}
+
+// Note: `JitterRng` maintains a small 64-bit entropy pool. With every
+// `generate` 64 new bits should be integrated in the pool. If a round of
+// `generate` were to collect less than the expected 64 bit, then the returned
+// value, and the new state of the entropy pool, would be in some way related to
+// the initial state. It is therefore better if the initial state of the entropy
+// pool is different on each call to `generate`. This has a few implications:
+// - `generate` should be called once before using `JitterRng` to produce the
+//   first usable value (this is done by default in `new`);
+// - We do not zero the entropy pool after generating a result. The reference
+//   implementation also does not support zeroing, but recommends generating a
+//   new value without using it if you want to protect a previously generated
+//   'secret' value from someone inspecting the memory;
+// - Implementing `Clone` seems acceptable, as it would not cause the systematic
+//   bias a constant might cause. Only instead of one value that could be
+//   potentially related to the same initial state, there are now two.
+
+// Entropy collector state.
+// These values are not necessary to preserve across runs.
+struct EcState {
+    // Previous time stamp to determine the timer delta
+    prev_time: u64,
+    // Deltas used for the stuck test
+    last_delta: i32,
+    last_delta2: i32,
+    // Memory for the Memory Access noise source
+    mem: [u8; MEMORY_SIZE],
+}
+
+impl EcState {
+    // Stuck test by checking the:
+    // - 1st derivation of the jitter measurement (time delta)
+    // - 2nd derivation of the jitter measurement (delta of time deltas)
+    // - 3rd derivation of the jitter measurement (delta of delta of time
+    //   deltas)
+    //
+    // All values must always be non-zero.
+    // This test is a heuristic to see whether the last measurement holds
+    // entropy.
+    fn stuck(&mut self, current_delta: i32) -> bool {
+        let delta2 = self.last_delta - current_delta;
+        let delta3 = delta2 - self.last_delta2;
+
+        self.last_delta = current_delta;
+        self.last_delta2 = delta2;
+
+        current_delta == 0 || delta2 == 0 || delta3 == 0
+    }
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for JitterRng {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "JitterRng {{}}")
+    }
+}
+
+impl Clone for JitterRng {
+    fn clone(&self) -> JitterRng {
+        JitterRng {
+            data: self.data,
+            rounds: self.rounds,
+            timer: self.timer,
+            mem_prev_index: self.mem_prev_index,
+            // The 32 bits that may still be unused from the previous round are
+            // for the original to use, not for the clone.
+            data_half_used: false,
+        }
+    }
+}
+
+// Initialise to zero; must be positive
+#[cfg(all(feature = "std", not(target_arch = "wasm32")))]
+static JITTER_ROUNDS: AtomicUsize = ATOMIC_USIZE_INIT;
+
+impl JitterRng {
+    /// Create a new `JitterRng`. Makes use of `std::time` for a timer, or a
+    /// platform-specific function with higher accuracy if necessary and
+    /// available.
+    ///
+    /// During initialization CPU execution timing jitter is measured a few
+    /// hundred times. If this does not pass basic quality tests, an error is
+    /// returned. The test result is cached to make subsequent calls faster.
+    #[cfg(all(feature = "std", not(target_arch = "wasm32")))]
+    pub fn new() -> Result<JitterRng, TimerError> {
+        if cfg!(target_arch = "wasm32") {
+            return Err(TimerError::NoTimer);
+        }
+        let mut state = JitterRng::new_with_timer(platform::get_nstime);
+        let mut rounds = JITTER_ROUNDS.load(Ordering::Relaxed) as u8;
+        if rounds == 0 {
+            // No result yet: run test.
+            // This allows the timer test to run multiple times; we don't care.
+            rounds = state.test_timer()?;
+            JITTER_ROUNDS.store(rounds as usize, Ordering::Relaxed);
+            info!("JitterRng: using {} rounds per u64 output", rounds);
+        }
+        state.set_rounds(rounds);
+
+        // Fill `data` with a non-zero value.
+        state.gen_entropy();
+        Ok(state)
+    }
+
+    /// Create a new `JitterRng`.
+    /// A custom timer can be supplied, making it possible to use `JitterRng` in
+    /// `no_std` environments.
+    ///
+    /// The timer must have nanosecond precision.
+    ///
+    /// This method is more low-level than `new()`. It is the responsibility of
+    /// the caller to run [`test_timer`] before using any numbers generated with
+    /// `JitterRng`, and optionally call [`set_rounds`]. Also it is important to
+    /// consume at least one `u64` before using the first result to initialize
+    /// the entropy collection pool.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use rand_jitter::rand_core::{RngCore, Error};
+    /// use rand_jitter::JitterRng;
+    ///
+    /// # fn try_inner() -> Result<(), Error> {
+    /// fn get_nstime() -> u64 {
+    ///     use std::time::{SystemTime, UNIX_EPOCH};
+    ///
+    ///     let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+    ///     // The correct way to calculate the current time is
+    ///     // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
+    ///     // But this is faster, and the difference in terms of entropy is
+    ///     // negligible (log2(10^9) == 29.9).
+    ///     dur.as_secs() << 30 | dur.subsec_nanos() as u64
+    /// }
+    ///
+    /// let mut rng = JitterRng::new_with_timer(get_nstime);
+    /// let rounds = rng.test_timer()?;
+    /// rng.set_rounds(rounds); // optional
+    /// let _ = rng.next_u64();
+    ///
+    /// // Ready for use
+    /// let v: u64 = rng.next_u64();
+    /// # Ok(())
+    /// # }
+    ///
+    /// # let _ = try_inner();
+    /// ```
+    ///
+    /// [`test_timer`]: JitterRng::test_timer
+    /// [`set_rounds`]: JitterRng::set_rounds
+    pub fn new_with_timer(timer: fn() -> u64) -> JitterRng {
+        JitterRng {
+            data: 0,
+            rounds: 64,
+            timer,
+            mem_prev_index: 0,
+            data_half_used: false,
+        }
+    }
+
+    /// Configures how many rounds are used to generate each 64-bit value.
+    /// This must be greater than zero, and has a big impact on performance
+    /// and output quality.
+    ///
+    /// [`new_with_timer`] conservatively uses 64 rounds, but often less rounds
+    /// can be used. The `test_timer()` function returns the minimum number of
+    /// rounds required for full strength (platform dependent), so one may use
+    /// `rng.set_rounds(rng.test_timer()?);` or cache the value.
+    ///
+    /// [`new_with_timer`]: JitterRng::new_with_timer
+    pub fn set_rounds(&mut self, rounds: u8) {
+        assert!(rounds > 0);
+        self.rounds = rounds;
+    }
+
+    // Calculate a random loop count used for the next round of an entropy
+    // collection, based on bits from a fresh value from the timer.
+    //
+    // The timer is folded to produce a number that contains at most `n_bits`
+    // bits.
+    //
+    // Note: A constant should be added to the resulting random loop count to
+    // prevent loops that run 0 times.
+    #[inline(never)]
+    fn random_loop_cnt(&mut self, n_bits: u32) -> u32 {
+        let mut rounds = 0;
+
+        let mut time = (self.timer)();
+        // Mix with the current state of the random number balance the random
+        // loop counter a bit more.
+        time ^= self.data;
+
+        // We fold the time value as much as possible to ensure that as many
+        // bits of the time stamp are included as possible.
+        let folds = (64 + n_bits - 1) / n_bits;
+        let mask = (1 << n_bits) - 1;
+        for _ in 0..folds {
+            rounds ^= time & mask;
+            time >>= n_bits;
+        }
+
+        rounds as u32
+    }
+
+    // CPU jitter noise source
+    // Noise source based on the CPU execution time jitter
+    //
+    // This function injects the individual bits of the time value into the
+    // entropy pool using an LFSR.
+    //
+    // The code is deliberately inefficient with respect to the bit shifting.
+    // This function not only acts as folding operation, but this function's
+    // execution is used to measure the CPU execution time jitter. Any change to
+    // the loop in this function implies that careful retesting must be done.
+    #[inline(never)]
+    fn lfsr_time(&mut self, time: u64, var_rounds: bool) {
+        fn lfsr(mut data: u64, time: u64) -> u64{
+            for i in 1..65 {
+                let mut tmp = time << (64 - i);
+                tmp >>= 64 - 1;
+
+                // Fibonacci LSFR with polynomial of
+                // x^64 + x^61 + x^56 + x^31 + x^28 + x^23 + 1 which is
+                // primitive according to
+                // http://poincare.matf.bg.ac.rs/~ezivkovm/publications/primpol1.pdf
+                // (the shift values are the polynomial values minus one
+                // due to counting bits from 0 to 63). As the current
+                // position is always the LSB, the polynomial only needs
+                // to shift data in from the left without wrap.
+                data ^= tmp;
+                data ^= (data >> 63) & 1;
+                data ^= (data >> 60) & 1;
+                data ^= (data >> 55) & 1;
+                data ^= (data >> 30) & 1;
+                data ^= (data >> 27) & 1;
+                data ^= (data >> 22) & 1;
+                data = data.rotate_left(1);
+            }
+            data
+        }
+
+        // Note: in the reference implementation only the last round effects
+        // `self.data`, all the other results are ignored. To make sure the
+        // other rounds are not optimised out, we first run all but the last
+        // round on a throw-away value instead of the real `self.data`.
+        let mut lfsr_loop_cnt = 0;
+        if var_rounds { lfsr_loop_cnt = self.random_loop_cnt(4) };
+
+        let mut throw_away: u64 = 0;
+        for _ in 0..lfsr_loop_cnt {
+            throw_away = lfsr(throw_away, time);
+        }
+        black_box(throw_away);
+
+        self.data = lfsr(self.data, time);
+    }
+
+    // Memory Access noise source
+    // This is a noise source based on variations in memory access times
+    //
+    // This function performs memory accesses which will add to the timing
+    // variations due to an unknown amount of CPU wait states that need to be
+    // added when accessing memory. The memory size should be larger than the L1
+    // caches as outlined in the documentation and the associated testing.
+    //
+    // The L1 cache has a very high bandwidth, albeit its access rate is usually
+    // slower than accessing CPU registers. Therefore, L1 accesses only add
+    // minimal variations as the CPU has hardly to wait. Starting with L2,
+    // significant variations are added because L2 typically does not belong to
+    // the CPU any more and therefore a wider range of CPU wait states is
+    // necessary for accesses. L3 and real memory accesses have even a wider
+    // range of wait states. However, to reliably access either L3 or memory,
+    // the `self.mem` memory must be quite large which is usually not desirable.
+    #[inline(never)]
+    fn memaccess(&mut self, mem: &mut [u8; MEMORY_SIZE], var_rounds: bool) {
+        let mut acc_loop_cnt = 128;
+        if var_rounds { acc_loop_cnt += self.random_loop_cnt(4) };
+
+        let mut index = self.mem_prev_index as usize;
+        for _ in 0..acc_loop_cnt {
+            // Addition of memblocksize - 1 to index with wrap around logic to
+            // ensure that every memory location is hit evenly.
+            // The modulus also allows the compiler to remove the indexing
+            // bounds check.
+            index = (index + MEMORY_BLOCKSIZE - 1) % MEMORY_SIZE;
+
+            // memory access: just add 1 to one byte
+            // memory access implies read from and write to memory location
+            mem[index] = mem[index].wrapping_add(1);
+        }
+        self.mem_prev_index = index as u16;
+    }
+
+    // This is the heart of the entropy generation: calculate time deltas and
+    // use the CPU jitter in the time deltas. The jitter is injected into the
+    // entropy pool.
+    //
+    // Ensure that `ec.prev_time` is primed before using the output of this
+    // function. This can be done by calling this function and not using its
+    // result.
+    fn measure_jitter(&mut self, ec: &mut EcState) -> Option<()> {
+        // Invoke one noise source before time measurement to add variations
+        self.memaccess(&mut ec.mem, true);
+
+        // Get time stamp and calculate time delta to previous
+        // invocation to measure the timing variations
+        let time = (self.timer)();
+        // Note: wrapping_sub combined with a cast to `i64` generates a correct
+        // delta, even in the unlikely case this is a timer that is not strictly
+        // monotonic.
+        let current_delta = time.wrapping_sub(ec.prev_time) as i64 as i32;
+        ec.prev_time = time;
+
+        // Call the next noise source which also injects the data
+        self.lfsr_time(current_delta as u64, true);
+
+        // Check whether we have a stuck measurement (i.e. does the last
+        // measurement holds entropy?).
+        if ec.stuck(current_delta) { return None };
+
+        // Rotate the data buffer by a prime number (any odd number would
+        // do) to ensure that every bit position of the input time stamp
+        // has an even chance of being merged with a bit position in the
+        // entropy pool. We do not use one here as the adjacent bits in
+        // successive time deltas may have some form of dependency. The
+        // chosen value of 7 implies that the low 7 bits of the next
+        // time delta value is concatenated with the current time delta.
+        self.data = self.data.rotate_left(7);
+
+        Some(())
+    }
+
+    // Shuffle the pool a bit by mixing some value with a bijective function
+    // (XOR) into the pool.
+    //
+    // The function generates a mixer value that depends on the bits set and
+    // the location of the set bits in the random number generated by the
+    // entropy source. Therefore, based on the generated random number, this
+    // mixer value can have 2^64 different values. That mixer value is
+    // initialized with the first two SHA-1 constants. After obtaining the
+    // mixer value, it is XORed into the random number.
+    //
+    // The mixer value is not assumed to contain any entropy. But due to the
+    // XOR operation, it can also not destroy any entropy present in the
+    // entropy pool.
+    #[inline(never)]
+    fn stir_pool(&mut self) {
+        // This constant is derived from the first two 32 bit initialization
+        // vectors of SHA-1 as defined in FIPS 180-4 section 5.3.1
+        // The order does not really matter as we do not rely on the specific
+        // numbers. We just pick the SHA-1 constants as they have a good mix of
+        // bit set and unset.
+        const CONSTANT: u64 = 0x67452301efcdab89;
+
+        // The start value of the mixer variable is derived from the third
+        // and fourth 32 bit initialization vector of SHA-1 as defined in
+        // FIPS 180-4 section 5.3.1
+        let mut mixer = 0x98badcfe10325476;
+
+        // This is a constant time function to prevent leaking timing
+        // information about the random number.
+        // The normal code is:
+        // ```
+        // for i in 0..64 {
+        //     if ((self.data >> i) & 1) == 1 { mixer ^= CONSTANT; }
+        // }
+        // ```
+        // This is a bit fragile, as LLVM really wants to use branches here, and
+        // we rely on it to not recognise the opportunity.
+        for i in 0..64 {
+            let apply = (self.data >> i) & 1;
+            let mask = !apply.wrapping_sub(1);
+            mixer ^= CONSTANT & mask;
+            mixer = mixer.rotate_left(1);
+        }
+
+        self.data ^= mixer;
+    }
+
+    fn gen_entropy(&mut self) -> u64 {
+        trace!("JitterRng: collecting entropy");
+
+        // Prime `ec.prev_time`, and run the noice sources to make sure the
+        // first loop round collects the expected entropy.
+        let mut ec = EcState {
+            prev_time: (self.timer)(),
+            last_delta: 0,
+            last_delta2: 0,
+            mem: [0; MEMORY_SIZE],
+        };
+        let _ = self.measure_jitter(&mut ec);
+
+        for _ in 0..self.rounds {
+            // If a stuck measurement is received, repeat measurement
+            // Note: we do not guard against an infinite loop, that would mean
+            // the timer suddenly became broken.
+            while self.measure_jitter(&mut ec).is_none() {}
+        }
+
+        // Do a single read from `self.mem` to make sure the Memory Access noise
+        // source is not optimised out.
+        black_box(ec.mem[0]);
+
+        self.stir_pool();
+        self.data
+    }
+
+    /// Basic quality tests on the timer, by measuring CPU timing jitter a few
+    /// hundred times.
+    ///
+    /// If succesful, this will return the estimated number of rounds necessary
+    /// to collect 64 bits of entropy. Otherwise a [`TimerError`] with the cause
+    /// of the failure will be returned.
+    pub fn test_timer(&mut self) -> Result<u8, TimerError> {
+        debug!("JitterRng: testing timer ...");
+        // We could add a check for system capabilities such as `clock_getres`
+        // or check for `CONFIG_X86_TSC`, but it does not make much sense as the
+        // following sanity checks verify that we have a high-resolution timer.
+
+        let mut delta_sum = 0;
+        let mut old_delta = 0;
+
+        let mut time_backwards = 0;
+        let mut count_mod = 0;
+        let mut count_stuck = 0;
+
+        let mut ec = EcState {
+            prev_time: (self.timer)(),
+            last_delta: 0,
+            last_delta2: 0,
+            mem: [0; MEMORY_SIZE],
+        };
+
+        // TESTLOOPCOUNT needs some loops to identify edge systems.
+        // 100 is definitely too little.
+        const TESTLOOPCOUNT: u64 = 300;
+        const CLEARCACHE: u64 = 100;
+
+        for i in 0..(CLEARCACHE + TESTLOOPCOUNT) {
+            // Measure time delta of core entropy collection logic
+            let time = (self.timer)();
+            self.memaccess(&mut ec.mem, true);
+            self.lfsr_time(time, true);
+            let time2 = (self.timer)();
+
+            // Test whether timer works
+            if time == 0 || time2 == 0 {
+                return Err(TimerError::NoTimer);
+            }
+            let delta = time2.wrapping_sub(time) as i64 as i32;
+
+            // Test whether timer is fine grained enough to provide delta even
+            // when called shortly after each other -- this implies that we also
+            // have a high resolution timer
+            if delta == 0 {
+                return Err(TimerError::CoarseTimer);
+            }
+
+            // Up to here we did not modify any variable that will be
+            // evaluated later, but we already performed some work. Thus we
+            // already have had an impact on the caches, branch prediction,
+            // etc. with the goal to clear it to get the worst case
+            // measurements.
+            if i < CLEARCACHE { continue; }
+
+            if ec.stuck(delta) { count_stuck += 1; }
+
+            // Test whether we have an increasing timer.
+            if !(time2 > time) { time_backwards += 1; }
+
+            // Count the number of times the counter increases in steps of 100ns
+            // or greater.
+            if (delta % 100) == 0 { count_mod += 1; }
+
+            // Ensure that we have a varying delta timer which is necessary for
+            // the calculation of entropy -- perform this check only after the
+            // first loop is executed as we need to prime the old_delta value
+            delta_sum += (delta - old_delta).abs() as u64;
+            old_delta = delta;
+        }
+
+        // Do a single read from `self.mem` to make sure the Memory Access noise
+        // source is not optimised out.
+        black_box(ec.mem[0]);
+
+        // We allow the time to run backwards for up to three times.
+        // This can happen if the clock is being adjusted by NTP operations.
+        // If such an operation just happens to interfere with our test, it
+        // should not fail. The value of 3 should cover the NTP case being
+        // performed during our test run.
+        if time_backwards > 3 {
+            return Err(TimerError::NotMonotonic);
+        }
+
+        // Test that the available amount of entropy per round does not get to
+        // low. We expect 1 bit of entropy per round as a reasonable minimum
+        // (although less is possible, it means the collector loop has to run
+        // much more often).
+        // `assert!(delta_average >= log2(1))`
+        // `assert!(delta_sum / TESTLOOPCOUNT >= 1)`
+        // `assert!(delta_sum >= TESTLOOPCOUNT)`
+        if delta_sum < TESTLOOPCOUNT {
+            return Err(TimerError::TinyVariantions);
+        }
+
+        // Ensure that we have variations in the time stamp below 100 for at
+        // least 10% of all checks -- on some platforms, the counter increments
+        // in multiples of 100, but not always
+        if count_mod > (TESTLOOPCOUNT * 9 / 10) {
+            return Err(TimerError::CoarseTimer);
+        }
+
+        // If we have more than 90% stuck results, then this Jitter RNG is
+        // likely to not work well.
+        if count_stuck > (TESTLOOPCOUNT * 9 / 10) {
+            return Err(TimerError::TooManyStuck);
+        }
+
+        // Estimate the number of `measure_jitter` rounds necessary for 64 bits
+        // of entropy.
+        //
+        // We don't try very hard to come up with a good estimate of the
+        // available bits of entropy per round here for two reasons:
+        // 1. Simple estimates of the available bits (like Shannon entropy) are
+        //    too optimistic.
+        // 2. Unless we want to waste a lot of time during intialization, there
+        //    only a small number of samples are available.
+        //
+        // Therefore we use a very simple and conservative estimate:
+        // `let bits_of_entropy = log2(delta_average) / 2`.
+        //
+        // The number of rounds `measure_jitter` should run to collect 64 bits
+        // of entropy is `64 / bits_of_entropy`.
+        let delta_average = delta_sum / TESTLOOPCOUNT;
+
+        if delta_average >= 16 {
+            let log2 = 64 - delta_average.leading_zeros();
+            // Do something similar to roundup(64/(log2/2)):
+            Ok( ((64u32 * 2 + log2 - 1) / log2) as u8)
+        } else {
+            // For values < 16 the rounding error becomes too large, use a
+            // lookup table.
+            // Values 0 and 1 are invalid, and filtered out by the
+            // `delta_sum < TESTLOOPCOUNT` test above.
+            let log2_lookup = [0,  0, 128, 81, 64, 56, 50, 46,
+                               43, 41, 39, 38, 36, 35, 34, 33];
+            Ok(log2_lookup[delta_average as usize])
+        }
+    }
+
+    /// Statistical test: return the timer delta of one normal run of the
+    /// `JitterRng` entropy collector.
+    ///
+    /// Setting `var_rounds` to `true` will execute the memory access and the
+    /// CPU jitter noice sources a variable amount of times (just like a real
+    /// `JitterRng` round).
+    ///
+    /// Setting `var_rounds` to `false` will execute the noice sources the
+    /// minimal number of times. This can be used to measure the minimum amount
+    /// of entropy one round of the entropy collector can collect in the worst
+    /// case.
+    ///
+    /// See this crate's README on how to use `timer_stats` to test the quality
+    /// of `JitterRng`.
+    pub fn timer_stats(&mut self, var_rounds: bool) -> i64 {
+        let mut mem = [0; MEMORY_SIZE];
+
+        let time = (self.timer)();
+        self.memaccess(&mut mem, var_rounds);
+        self.lfsr_time(time, var_rounds);
+        let time2 = (self.timer)();
+        time2.wrapping_sub(time) as i64
+    }
+}
+
+// A function that is opaque to the optimizer to assist in avoiding dead-code
+// elimination. Taken from `bencher`.
+fn black_box<T>(dummy: T) -> T {
+    unsafe {
+        let ret = ptr::read_volatile(&dummy);
+        mem::forget(dummy);
+        ret
+    }
+}
+
+impl RngCore for JitterRng {
+    fn next_u32(&mut self) -> u32 {
+        // We want to use both parts of the generated entropy
+        if self.data_half_used {
+            self.data_half_used = false;
+            (self.data >> 32) as u32
+        } else {
+            self.data = self.next_u64();
+            self.data_half_used = true;
+            self.data as u32
+        }
+    }
+
+    fn next_u64(&mut self) -> u64 {
+       self.data_half_used = false;
+       self.gen_entropy()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        // Fill using `next_u32`. This is faster for filling small slices (four
+        // bytes or less), while the overhead is negligible.
+        //
+        // This is done especially for wrappers that implement `next_u32`
+        // themselves via `fill_bytes`.
+        impls::fill_bytes_via_next(self, dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        Ok(self.fill_bytes(dest))
+    }
+}
+
+impl CryptoRng for JitterRng {}
+
diff -Nru cargo-0.32.0/vendor/rand_jitter/src/platform.rs cargo-0.33.0/vendor/rand_jitter/src/platform.rs
--- cargo-0.32.0/vendor/rand_jitter/src/platform.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/src/platform.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,44 @@
+// Copyright 2018 Developers of the Rand project.
+// Copyright 2013-2015 The Rust Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "windows")))]
+pub fn get_nstime() -> u64 {
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+    // The correct way to calculate the current time is
+    // `dur.as_secs() * 1_000_000_000 + dur.subsec_nanos() as u64`
+    // But this is faster, and the difference in terms of entropy is
+    // negligible (log2(10^9) == 29.9).
+    dur.as_secs() << 30 | dur.subsec_nanos() as u64
+}
+
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+pub fn get_nstime() -> u64 {
+    use libc;
+    
+    // On Mac OS and iOS std::time::SystemTime only has 1000ns resolution.
+    // We use `mach_absolute_time` instead. This provides a CPU dependent
+    // unit, to get real nanoseconds the result should by multiplied by
+    // numer/denom from `mach_timebase_info`.
+    // But we are not interested in the exact nanoseconds, just entropy. So
+    // we use the raw result.
+    unsafe { libc::mach_absolute_time() }
+}
+
+#[cfg(target_os = "windows")]
+pub fn get_nstime() -> u64 {
+    use winapi;
+
+    unsafe {
+        let mut t = super::mem::zeroed();
+        winapi::um::profileapi::QueryPerformanceCounter(&mut t);
+        *t.QuadPart() as u64
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_jitter/tests/mod.rs cargo-0.33.0/vendor/rand_jitter/tests/mod.rs
--- cargo-0.32.0/vendor/rand_jitter/tests/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_jitter/tests/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,31 @@
+extern crate rand_jitter;
+extern crate rand_core;
+
+use rand_jitter::JitterRng;
+#[cfg(feature = "std")]
+use rand_core::RngCore;
+
+#[cfg(feature = "std")]
+#[test]
+fn test_jitter_init() {
+    // Because this is a debug build, measurements here are not representive
+    // of the final release build.
+    // Don't fail this test if initializing `JitterRng` fails because of a
+    // bad timer (the timer from the standard library may not have enough
+    // accuracy on all platforms).
+    match JitterRng::new() {
+        Ok(ref mut rng) => {
+            // false positives are possible, but extremely unlikely
+            assert!(rng.next_u32() | rng.next_u32() != 0);
+        },
+        Err(_) => {},
+    }
+}
+
+#[test]
+fn test_jitter_bad_timer() {
+    fn bad_timer() -> u64 { 0 }
+    let mut rng = JitterRng::new_with_timer(bad_timer);
+    assert!(rng.test_timer().is_err());
+}
+
diff -Nru cargo-0.32.0/vendor/rand_os/.cargo-checksum.json cargo-0.33.0/vendor/rand_os/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_os/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_os/Cargo.toml cargo-0.33.0/vendor/rand_os/Cargo.toml
--- cargo-0.32.0/vendor/rand_os/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,53 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "rand_os"
+version = "0.1.2"
+authors = ["The Rand Project Developers"]
+description = "OS backed Random Number Generator"
+homepage = "https://crates.io/crates/rand_os"
+documentation = "https://docs.rs/rand_os"
+readme = "README.md"
+keywords = ["random", "rng", "os"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-random/rand"
+[dependencies.log]
+version = "0.4"
+optional = true
+
+[dependencies.rand_core]
+version = "0.4"
+features = ["std"]
+[target."cfg(target_env = \"sgx\")".dependencies.rdrand]
+version = "0.4.0"
+[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
+version = "0.0.3"
+[target."cfg(target_os = \"fuchsia\")".dependencies.fuchsia-cprng]
+version = "0.1.0"
+[target."cfg(unix)".dependencies.libc]
+version = "0.2"
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3"
+features = ["minwindef", "ntsecapi", "winnt"]
+[target.wasm32-unknown-unknown.dependencies.stdweb]
+version = "0.4"
+optional = true
+
+[target.wasm32-unknown-unknown.dependencies.wasm-bindgen]
+version = "0.2.12"
+optional = true
+[badges.appveyor]
+repository = "rust-random/rand"
+
+[badges.travis-ci]
+repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand_os/CHANGELOG.md cargo-0.33.0/vendor/rand_os/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_os/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,17 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [0.1.2] - 2019-01-28
+### Changes
+- Fuchsia: Replaced fuchsia-zircon with fuchsia-cprng
+
+## [0.1.1] - 2019-01-08
+### Additions
+- Add support for x86_64-fortanix-unknown-sgx target (#670)
+
+## [0.1.0] - 2019-01-04
+Initial release.
diff -Nru cargo-0.32.0/vendor/rand_os/COPYRIGHT cargo-0.33.0/vendor/rand_os/COPYRIGHT
--- cargo-0.32.0/vendor/rand_os/COPYRIGHT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/COPYRIGHT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+Copyrights in the Rand project are retained by their contributors. No
+copyright assignment is required to contribute to the Rand project.
+
+For full authorship information, see the version control history.
+
+Except as otherwise noted (below and/or in individual files), Rand is
+licensed under the Apache License, Version 2.0 <LICENSE-APACHE> or
+<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+<LICENSE-MIT> or <http://opensource.org/licenses/MIT>, at your option.
+
+The Rand project includes code from the Rust project
+published under these same licenses.
diff -Nru cargo-0.32.0/vendor/rand_os/LICENSE-APACHE cargo-0.33.0/vendor/rand_os/LICENSE-APACHE
--- cargo-0.32.0/vendor/rand_os/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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
+
+	https://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.
diff -Nru cargo-0.32.0/vendor/rand_os/LICENSE-MIT cargo-0.33.0/vendor/rand_os/LICENSE-MIT
--- cargo-0.32.0/vendor/rand_os/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,26 @@
+Copyright 2018 Developers of the Rand project
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rand_os/README.md cargo-0.33.0/vendor/rand_os/README.md
--- cargo-0.32.0/vendor/rand_os/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,33 @@
+# rand_os
+
+[![Build Status](https://travis-ci.org/rust-random/rand.svg?branch=master)](https://travis-ci.org/rust-random/rand)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
+[![Latest version](https://img.shields.io/crates/v/rand_os.svg)](https://crates.io/crates/rand_os)
+[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_os)
+[![API](https://docs.rs/rand_os/badge.svg)](https://docs.rs/rand_os)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
+
+A random number generator that retrieves randomness straight from the
+operating system.
+
+This crate depends on [rand_core](https://crates.io/crates/rand_core) and is
+part of the [Rand project](https://github.com/rust-random/rand).
+
+This crate aims to support all of Rust's `std` platforms with a system-provided
+entropy source. Unlike other Rand crates, this crate does not support `no_std`
+(handling this gracefully is a current discussion topic).
+
+Links:
+
+-   [API documentation (master)](https://rust-random.github.io/rand/rand_os)
+-   [API documentation (docs.rs)](https://docs.rs/rand_os)
+-   [Changelog](CHANGELOG.md)
+
+## License
+
+`rand_os` is distributed under the terms of both the MIT license and the
+Apache License (Version 2.0).
+
+See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT), and
+[COPYRIGHT](COPYRIGHT) for details.
diff -Nru cargo-0.32.0/vendor/rand_os/src/cloudabi.rs cargo-0.33.0/vendor/rand_os/src/cloudabi.rs
--- cargo-0.32.0/vendor/rand_os/src/cloudabi.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/cloudabi.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,39 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for CloudABI
+
+extern crate cloudabi;
+
+use std::io;
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+
+#[derive(Clone, Debug)]
+pub struct OsRng;
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        let errno = unsafe { cloudabi::random_get(dest) };
+        if errno == cloudabi::errno::SUCCESS {
+            Ok(())
+        } else {
+            // Cloudlibc provides its own `strerror` implementation so we
+            // can use `from_raw_os_error` here.
+            Err(Error::with_cause(
+                ErrorKind::Unavailable,
+                "random_get() system call failed",
+                io::Error::from_raw_os_error(errno as i32),
+            ))
+        }
+    }
+
+    fn method_str(&self) -> &'static str { "cloudabi::random_get" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/dragonfly_haiku_emscripten.rs cargo-0.33.0/vendor/rand_os/src/dragonfly_haiku_emscripten.rs
--- cargo-0.32.0/vendor/rand_os/src/dragonfly_haiku_emscripten.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/dragonfly_haiku_emscripten.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,39 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for DragonFly / Haiku / Emscripten
+
+use rand_core::Error;
+use super::random_device;
+use super::OsRngImpl;
+use std::fs::File;
+
+#[derive(Clone, Debug)]
+pub struct OsRng();
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        random_device::open("/dev/random", &|p| File::open(p))?;
+        Ok(OsRng())
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        random_device::read(dest)
+    }
+
+    #[cfg(target_os = "emscripten")]
+    fn max_chunk_size(&self) -> usize {
+        // `Crypto.getRandomValues` documents `dest` should be at most 65536
+        // bytes. `crypto.randomBytes` documents: "To minimize threadpool
+        // task length variation, partition large randomBytes requests when
+        // doing so as part of fulfilling a client request.
+        65536
+    }
+
+    fn method_str(&self) -> &'static str { "/dev/random" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/dummy_log.rs cargo-0.33.0/vendor/rand_os/src/dummy_log.rs
--- cargo-0.32.0/vendor/rand_os/src/dummy_log.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/dummy_log.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,10 @@
+#[allow(unused)]
+macro_rules! trace { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! debug { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! info { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! warn { ($($x:tt)*) => () }
+#[allow(unused)]
+macro_rules! error { ($($x:tt)*) => () }
diff -Nru cargo-0.32.0/vendor/rand_os/src/freebsd.rs cargo-0.33.0/vendor/rand_os/src/freebsd.rs
--- cargo-0.32.0/vendor/rand_os/src/freebsd.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/freebsd.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,45 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for FreeBSD
+
+extern crate libc;
+
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+
+use std::ptr;
+use std::io;
+
+#[derive(Clone, Debug)]
+pub struct OsRng;
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        let mib = [libc::CTL_KERN, libc::KERN_ARND];
+        let mut len = dest.len();
+        let ret = unsafe {
+            libc::sysctl(mib.as_ptr(), mib.len() as libc::c_uint,
+                         dest.as_mut_ptr() as *mut _, &mut len,
+                         ptr::null(), 0)
+        };
+        if ret == -1 || len != dest.len() {
+            return Err(Error::with_cause(
+                ErrorKind::Unavailable,
+                "kern.arandom sysctl failed",
+                io::Error::last_os_error()));
+        }
+        Ok(())
+    }
+
+    fn max_chunk_size(&self) -> usize { 256 }
+
+    fn method_str(&self) -> &'static str { "kern.arandom" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/fuchsia.rs cargo-0.33.0/vendor/rand_os/src/fuchsia.rs
--- cargo-0.32.0/vendor/rand_os/src/fuchsia.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/fuchsia.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,28 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for Fuchsia Zircon
+
+extern crate fuchsia_cprng;
+
+use rand_core::Error;
+use super::OsRngImpl;
+
+#[derive(Clone, Debug)]
+pub struct OsRng;
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        fuchsia_cprng::cprng_draw(dest);
+        Ok(())
+    }
+
+    fn method_str(&self) -> &'static str { "cprng_draw" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/lib.rs cargo-0.33.0/vendor/rand_os/src/lib.rs
--- cargo-0.32.0/vendor/rand_os/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,438 @@
+// Copyright 2018 Developers of the Rand project.
+// Copyright 2013-2015 The Rust Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Interface to the random number generator of the operating system.
+//!
+//! [`OsRng`] is the preferred external source of entropy for most applications.
+//! Commonly it is used to initialize a user-space RNG, which can then be used
+//! to generate random values with much less overhead than `OsRng`.
+//!
+//! You may prefer to use [`EntropyRng`] instead of `OsRng`. It is unlikely, but
+//! not entirely theoretical, for `OsRng` to fail. In such cases [`EntropyRng`]
+//! falls back on a good alternative entropy source.
+//!
+//! [`OsRng::new()`] is guaranteed to be very cheap (after the first successful
+//! call), and will never consume more than one file handle per process.
+//!
+//! # Usage example
+//! ```
+//! use rand_os::OsRng;
+//! use rand_os::rand_core::RngCore;
+//!
+//! let mut os_rng = OsRng::new().unwrap();
+//! let mut key = [0u8; 16];
+//! os_rng.fill_bytes(&mut key);
+//! let random_u64 = os_rng.next_u64();
+//! ```
+//!
+//! # Platform sources
+//!
+//! | OS               | interface
+//! |------------------|---------------------------------------------------------
+//! | Linux, Android   | [`getrandom`][1] system call if available, otherwise [`/dev/urandom`][2] after reading from `/dev/random` once
+//! | Windows          | [`RtlGenRandom`][3]
+//! | macOS, iOS       | [`SecRandomCopyBytes`][4]
+//! | FreeBSD          | [`kern.arandom`][5]
+//! | OpenBSD, Bitrig  | [`getentropy`][6]
+//! | NetBSD           | [`/dev/urandom`][7] after reading from `/dev/random` once
+//! | Dragonfly BSD    | [`/dev/random`][8]
+//! | Solaris, illumos | [`getrandom`][9] system call if available, otherwise [`/dev/random`][10]
+//! | Fuchsia OS       | [`cprng_draw`][11]
+//! | Redox            | [`rand:`][12]
+//! | CloudABI         | [`random_get`][13]
+//! | Haiku            | `/dev/random` (identical to `/dev/urandom`)
+//! | Web browsers     | [`Crypto.getRandomValues`][14] (see [Support for WebAssembly and ams.js][14])
+//! | Node.js          | [`crypto.randomBytes`][15] (see [Support for WebAssembly and ams.js][16])
+//!
+//! Rand doesn't have a blanket implementation for all Unix-like operating
+//! systems that reads from `/dev/urandom`. This ensures all supported operating
+//! systems are using the recommended interface and respect maximum buffer
+//! sizes.
+//!
+//! ## Support for WebAssembly and ams.js
+//!
+//! The three Emscripten targets `asmjs-unknown-emscripten`,
+//! `wasm32-unknown-emscripten` and `wasm32-experimental-emscripten` use
+//! Emscripten's emulation of `/dev/random` on web browsers and Node.js.
+//!
+//! The bare WASM target `wasm32-unknown-unknown` tries to call the javascript
+//! methods directly, using either `stdweb` or `wasm-bindgen` depending on what
+//! features are activated for this crate. Note that if both features are
+//! enabled `wasm-bindgen` will be used.
+//!
+//! ## Early boot
+//!
+//! It is possible that early in the boot process the OS hasn't had enough time
+//! yet to collect entropy to securely seed its RNG, especially on virtual
+//! machines.
+//!
+//! Some operating systems always block the thread until the RNG is securely
+//! seeded. This can take anywhere from a few seconds to more than a minute.
+//! Others make a best effort to use a seed from before the shutdown and don't
+//! document much.
+//!
+//! A few, Linux, NetBSD and Solaris, offer a choice between blocking, and
+//! getting an error. With `try_fill_bytes` we choose to get the error
+//! ([`ErrorKind::NotReady`]), while the other methods use a blocking interface.
+//!
+//! On Linux (when the `genrandom` system call is not available) and on NetBSD
+//! reading from `/dev/urandom` never blocks, even when the OS hasn't collected
+//! enough entropy yet. As a countermeasure we try to do a single read from
+//! `/dev/random` until we know the OS RNG is initialized (and store this in a
+//! global static).
+//!
+//! # Panics and error handling
+//!
+//! We cannot guarantee that `OsRng` will fail, but if it does, it will likely
+//! be either when `OsRng::new()` is first called or when data is first read.
+//! If you wish to catch errors early, then test reading of at least one byte
+//! from `OsRng` via [`try_fill_bytes`]. If this succeeds, it is extremely
+//! unlikely that any further errors will occur.
+//! 
+//! Only [`try_fill_bytes`] is able to report the cause of an error; the other
+//! [`RngCore`] methods may (depending on the error kind) retry several times,
+//! but must eventually panic if the error persists.
+//!
+//! [`EntropyRng`]: ../rand/rngs/struct.EntropyRng.html
+//! [`try_fill_bytes`]: RngCore::try_fill_bytes
+//! [`ErrorKind::NotReady`]: rand_core::ErrorKind
+//!
+//! [1]: http://man7.org/linux/man-pages/man2/getrandom.2.html
+//! [2]: http://man7.org/linux/man-pages/man4/urandom.4.html
+//! [3]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx
+//! [4]: https://developer.apple.com/documentation/security/1399291-secrandomcopybytes?language=objc
+//! [5]: https://www.freebsd.org/cgi/man.cgi?query=random&sektion=4
+//! [6]: https://man.openbsd.org/getentropy.2
+//! [7]: http://netbsd.gw.com/cgi-bin/man-cgi?random+4+NetBSD-current
+//! [8]: https://leaf.dragonflybsd.org/cgi/web-man?command=random&section=4
+//! [9]: https://docs.oracle.com/cd/E88353_01/html/E37841/getrandom-2.html
+//! [10]: https://docs.oracle.com/cd/E86824_01/html/E54777/random-7d.html
+//! [11]: https://fuchsia.googlesource.com/zircon/+/HEAD/docs/syscalls/cprng_draw.md
+//! [12]: https://github.com/redox-os/randd/blob/master/src/main.rs
+//! [13]: https://github.com/NuxiNL/cloudabi/blob/v0.20/cloudabi.txt#L1826
+//! [14]: https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
+//! [15]: https://nodejs.org/api/crypto.html#crypto_crypto_randombytes_size_callback
+//! [16]: #support-for-webassembly-and-amsjs
+#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+       html_root_url = "https://rust-random.github.io/rand/")]
+#![deny(missing_docs)]
+#![deny(missing_debug_implementations)]
+#![doc(test(attr(allow(unused_variables), deny(warnings))))]
+
+#![cfg_attr(feature = "stdweb", recursion_limit="128")]
+
+pub extern crate rand_core;
+#[cfg(feature = "log")]
+#[macro_use] extern crate log;
+
+// We have to do it here because we load macros
+#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten"),
+          feature = "wasm-bindgen"))]
+extern crate wasm_bindgen;
+#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten"),
+          not(feature = "wasm-bindgen"),
+          feature = "stdweb"))]
+#[macro_use] extern crate stdweb;
+
+#[cfg(target_env = "sgx")]
+extern crate rdrand;
+
+#[cfg(not(feature = "log"))]
+#[macro_use]
+mod dummy_log;
+
+use std::fmt;
+use rand_core::{CryptoRng, RngCore, Error, impls};
+
+/// A random number generator that retrieves randomness straight from the
+/// operating system.
+#[derive(Clone)]
+pub struct OsRng(imp::OsRng);
+
+impl fmt::Debug for OsRng {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl OsRng {
+    /// Create a new `OsRng`.
+    pub fn new() -> Result<OsRng, Error> {
+        imp::OsRng::new().map(OsRng)
+    }
+}
+
+impl CryptoRng for OsRng {}
+
+impl RngCore for OsRng {
+    fn next_u32(&mut self) -> u32 {
+        impls::next_u32_via_fill(self)
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        impls::next_u64_via_fill(self)
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        use std::{time, thread};
+
+        // We cannot return Err(..), so we try to handle before panicking.
+        const MAX_RETRY_PERIOD: u32 = 10; // max 10s
+        const WAIT_DUR_MS: u32 = 100; // retry every 100ms
+        let wait_dur = time::Duration::from_millis(WAIT_DUR_MS as u64);
+        const RETRY_LIMIT: u32 = (MAX_RETRY_PERIOD * 1000) / WAIT_DUR_MS;
+        const TRANSIENT_RETRIES: u32 = 8;
+        let mut err_count = 0;
+        let mut error_logged = false;
+
+        // Maybe block until the OS RNG is initialized
+        let mut read = 0;
+        if let Ok(n) = self.0.test_initialized(dest, true) { read = n };
+        let dest = &mut dest[read..];
+
+        loop {
+            if let Err(e) = self.try_fill_bytes(dest) {
+                if err_count >= RETRY_LIMIT {
+                    error!("OsRng failed too many times; last error: {}", e);
+                    panic!("OsRng failed too many times; last error: {}", e);
+                }
+
+                if e.kind.should_wait() {
+                    if !error_logged {
+                        warn!("OsRng failed; waiting up to {}s and retrying. Error: {}",
+                                MAX_RETRY_PERIOD, e);
+                        error_logged = true;
+                    }
+                    err_count += 1;
+                    thread::sleep(wait_dur);
+                    continue;
+                } else if e.kind.should_retry() {
+                    if !error_logged {
+                        warn!("OsRng failed; retrying up to {} times. Error: {}",
+                                TRANSIENT_RETRIES, e);
+                        error_logged = true;
+                    }
+                    err_count += (RETRY_LIMIT + TRANSIENT_RETRIES - 1)
+                            / TRANSIENT_RETRIES;    // round up
+                    continue;
+                } else {
+                    error!("OsRng failed: {}", e);
+                    panic!("OsRng fatal error: {}", e);
+                }
+            }
+
+            break;
+        }
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        // Some systems do not support reading 0 random bytes.
+        // (And why waste a system call?)
+        if dest.len() == 0 { return Ok(()); }
+
+        let read = self.0.test_initialized(dest, false)?;
+        let dest = &mut dest[read..];
+
+        let max = self.0.max_chunk_size();
+        if dest.len() <= max {
+            trace!("OsRng: reading {} bytes via {}",
+                   dest.len(), self.0.method_str());
+        } else {
+            trace!("OsRng: reading {} bytes via {} in {} chunks of {} bytes",
+                   dest.len(), self.0.method_str(), (dest.len() + max) / max, max);
+        }
+        for slice in dest.chunks_mut(max) {
+            self.0.fill_chunk(slice)?;
+        }
+        Ok(())
+    }
+}
+
+trait OsRngImpl where Self: Sized {
+    // Create a new `OsRng` platform interface.
+    fn new() -> Result<Self, Error>;
+
+    // Fill a chunk with random bytes.
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error>;
+
+    // Test whether the OS RNG is initialized. This method may not be possible
+    // to support cheaply (or at all) on all operating systems.
+    //
+    // If `blocking` is set, this will cause the OS the block execution until
+    // its RNG is initialized.
+    //
+    // Random values that are read while this are stored in `dest`, the amount
+    // of read bytes is returned.
+    fn test_initialized(&mut self, _dest: &mut [u8], _blocking: bool)
+        -> Result<usize, Error> { Ok(0) }
+
+    // Maximum chunk size supported.
+    fn max_chunk_size(&self) -> usize { ::std::usize::MAX }
+
+    // Name of the OS interface (used for logging).
+    fn method_str(&self) -> &'static str;
+}
+
+#[cfg(any(target_os = "linux", target_os = "android",
+          target_os = "netbsd", target_os = "dragonfly",
+          target_os = "solaris", target_os = "redox",
+          target_os = "haiku", target_os = "emscripten"))]
+mod random_device;
+
+macro_rules! mod_use {
+    ($cond:meta, $module:ident) => {
+        #[$cond]
+        mod $module;
+        #[$cond]
+        use $module as imp;
+    }
+}
+
+mod_use!(cfg(target_os = "android"), linux_android);
+mod_use!(cfg(target_os = "bitrig"), openbsd_bitrig);
+mod_use!(cfg(target_os = "cloudabi"), cloudabi);
+mod_use!(cfg(target_os = "dragonfly"), dragonfly_haiku_emscripten);
+mod_use!(cfg(target_os = "emscripten"), dragonfly_haiku_emscripten);
+mod_use!(cfg(target_os = "freebsd"), freebsd);
+mod_use!(cfg(target_os = "fuchsia"), fuchsia);
+mod_use!(cfg(target_os = "haiku"), dragonfly_haiku_emscripten);
+mod_use!(cfg(target_os = "ios"), macos);
+mod_use!(cfg(target_os = "linux"), linux_android);
+mod_use!(cfg(target_os = "macos"), macos);
+mod_use!(cfg(target_os = "netbsd"), netbsd);
+mod_use!(cfg(target_os = "openbsd"), openbsd_bitrig);
+mod_use!(cfg(target_os = "redox"), redox);
+mod_use!(cfg(target_os = "solaris"), solaris);
+mod_use!(cfg(windows), windows);
+mod_use!(cfg(target_env = "sgx"), sgx);
+
+mod_use!(
+    cfg(all(
+        target_arch = "wasm32",
+        not(target_os = "emscripten"),
+        feature = "wasm-bindgen"
+    )),
+    wasm32_bindgen
+);
+
+mod_use!(
+    cfg(all(
+        target_arch = "wasm32",
+        not(target_os = "emscripten"),
+        not(feature = "wasm-bindgen"),
+        feature = "stdweb",
+    )),
+    wasm32_stdweb
+);
+
+/// Per #678 we use run-time failure where WASM bindings are missing
+#[cfg(all(
+    target_arch = "wasm32",
+    not(target_os = "emscripten"),
+    not(feature = "wasm-bindgen"),
+    not(feature = "stdweb"),
+))]
+mod imp {
+    use rand_core::{Error, ErrorKind};
+    use super::OsRngImpl;
+    
+    #[derive(Clone, Debug)]
+    pub struct OsRng;
+
+    impl OsRngImpl for OsRng {
+        fn new() -> Result<OsRng, Error> {
+            Err(Error::new(ErrorKind::Unavailable,
+                "OsRng: support for wasm32 requires emscripten, stdweb or wasm-bindgen"))
+        }
+
+        fn fill_chunk(&mut self, _dest: &mut [u8]) -> Result<(), Error> {
+            unimplemented!()
+        }
+
+        fn method_str(&self) -> &'static str { unimplemented!() }
+    }
+}
+
+#[cfg(not(any(
+    target_os = "android",
+    target_os = "bitrig",
+    target_os = "cloudabi",
+    target_os = "dragonfly",
+    target_os = "emscripten",
+    target_os = "freebsd",
+    target_os = "fuchsia",
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "linux",
+    target_os = "macos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "redox",
+    target_os = "solaris",
+    windows,
+    target_arch = "wasm32",
+    target_env = "sgx"
+)))]
+compile_error!("OS RNG support is not available for this platform");
+
+// Due to rustwasm/wasm-bindgen#201 this can't be defined in the inner os
+// modules, so hack around it for now and place it at the root.
+#[cfg(all(feature = "wasm-bindgen", target_arch = "wasm32"))]
+#[doc(hidden)]
+#[allow(missing_debug_implementations)]
+pub mod __wbg_shims {
+
+    // `extern { type Foo; }` isn't supported on 1.22 syntactically, so use a
+    // macro to work around that.
+    macro_rules! rust_122_compat {
+        ($($t:tt)*) => ($($t)*)
+    }
+
+    rust_122_compat! {
+        extern crate wasm_bindgen;
+
+        pub use wasm_bindgen::prelude::*;
+
+        #[wasm_bindgen]
+        extern "C" {
+            pub type Function;
+            #[wasm_bindgen(constructor)]
+            pub fn new(s: &str) -> Function;
+            #[wasm_bindgen(method)]
+            pub fn call(this: &Function, self_: &JsValue) -> JsValue;
+
+            pub type This;
+            #[wasm_bindgen(method, getter, structural, js_name = self)]
+            pub fn self_(me: &This) -> JsValue;
+            #[wasm_bindgen(method, getter, structural)]
+            pub fn crypto(me: &This) -> JsValue;
+
+            #[derive(Clone, Debug)]
+            pub type BrowserCrypto;
+
+            // TODO: these `structural` annotations here ideally wouldn't be here to
+            // avoid a JS shim, but for now with feature detection they're
+            // unavoidable.
+            #[wasm_bindgen(method, js_name = getRandomValues, structural, getter)]
+            pub fn get_random_values_fn(me: &BrowserCrypto) -> JsValue;
+            #[wasm_bindgen(method, js_name = getRandomValues, structural)]
+            pub fn get_random_values(me: &BrowserCrypto, buf: &mut [u8]);
+
+            #[wasm_bindgen(js_name = require)]
+            pub fn node_require(s: &str) -> NodeCrypto;
+
+            #[derive(Clone, Debug)]
+            pub type NodeCrypto;
+
+            #[wasm_bindgen(method, js_name = randomFillSync, structural)]
+            pub fn random_fill_sync(me: &NodeCrypto, buf: &mut [u8]);
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/linux_android.rs cargo-0.33.0/vendor/rand_os/src/linux_android.rs
--- cargo-0.32.0/vendor/rand_os/src/linux_android.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/linux_android.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,182 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for Linux / Android
+
+extern crate libc;
+
+use rand_core::{Error, ErrorKind};
+use super::random_device;
+use super::OsRngImpl;
+
+use std::io;
+use std::io::Read;
+use std::fs::{File, OpenOptions};
+use std::os::unix::fs::OpenOptionsExt;
+use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+use std::sync::{Once, ONCE_INIT};
+
+#[derive(Clone, Debug)]
+pub struct OsRng {
+    method: OsRngMethod,
+    initialized: bool,
+}
+
+#[derive(Clone, Debug)]
+enum OsRngMethod {
+    GetRandom,
+    RandomDevice,
+}
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        if is_getrandom_available() {
+            return Ok(OsRng { method: OsRngMethod::GetRandom,
+                              initialized: false });
+        }
+        random_device::open("/dev/urandom", &|p| File::open(p))?;
+        Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        match self.method {
+            OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
+            OsRngMethod::RandomDevice => random_device::read(dest),
+        }
+    }
+
+    fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
+        -> Result<usize, Error>
+    {
+        static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
+        if !self.initialized {
+            self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
+        }
+        if self.initialized { return Ok(0); }
+
+        let result = match self.method {
+            OsRngMethod::GetRandom => {
+                getrandom_try_fill(dest, blocking)?;
+                Ok(dest.len())
+            }
+            OsRngMethod::RandomDevice => {
+                info!("OsRng: testing random device /dev/random");
+                let mut file = OpenOptions::new()
+                    .read(true)
+                    .custom_flags(if blocking { 0 } else { libc::O_NONBLOCK })
+                    .open("/dev/random")
+                    .map_err(random_device::map_err)?;
+                file.read(&mut dest[..1]).map_err(random_device::map_err)?;
+                Ok(1)
+            }
+        };
+        OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
+        self.initialized = true;
+        result
+    }
+
+    fn method_str(&self) -> &'static str {
+        match self.method {
+            OsRngMethod::GetRandom => "getrandom",
+            OsRngMethod::RandomDevice => "/dev/urandom",
+        }
+    }
+}
+
+#[cfg(target_arch = "x86_64")]
+const NR_GETRANDOM: libc::c_long = 318;
+#[cfg(target_arch = "x86")]
+const NR_GETRANDOM: libc::c_long = 355;
+#[cfg(target_arch = "arm")]
+const NR_GETRANDOM: libc::c_long = 384;
+#[cfg(target_arch = "aarch64")]
+const NR_GETRANDOM: libc::c_long = 278;
+ #[cfg(target_arch = "s390x")]
+const NR_GETRANDOM: libc::c_long = 349;
+#[cfg(target_arch = "powerpc")]
+const NR_GETRANDOM: libc::c_long = 359;
+#[cfg(target_arch = "powerpc64")]
+const NR_GETRANDOM: libc::c_long = 359;
+#[cfg(target_arch = "mips")] // old ABI
+const NR_GETRANDOM: libc::c_long = 4353;
+#[cfg(target_arch = "mips64")]
+const NR_GETRANDOM: libc::c_long = 5313;
+#[cfg(target_arch = "sparc")]
+const NR_GETRANDOM: libc::c_long = 347;
+#[cfg(target_arch = "sparc64")]
+const NR_GETRANDOM: libc::c_long = 347;
+#[cfg(not(any(target_arch = "x86_64", target_arch = "x86",
+              target_arch = "arm", target_arch = "aarch64",
+              target_arch = "s390x", target_arch = "powerpc",
+              target_arch = "powerpc64", target_arch = "mips",
+              target_arch = "mips64", target_arch = "sparc",
+              target_arch = "sparc64")))]
+const NR_GETRANDOM: libc::c_long = 0;
+
+fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
+    const GRND_NONBLOCK: libc::c_uint = 0x0001;
+
+    if NR_GETRANDOM == 0 { return -1 };
+
+    unsafe {
+        libc::syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(),
+                      if blocking { 0 } else { GRND_NONBLOCK })
+    }
+}
+
+fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
+    let mut read = 0;
+    while read < dest.len() {
+        let result = getrandom(&mut dest[read..], blocking);
+        if result == -1 {
+            let err = io::Error::last_os_error();
+            let kind = err.kind();
+            if kind == io::ErrorKind::Interrupted {
+                continue;
+            } else if kind == io::ErrorKind::WouldBlock {
+                return Err(Error::with_cause(
+                    ErrorKind::NotReady,
+                    "getrandom not ready",
+                    err,
+                ));
+            } else {
+                return Err(Error::with_cause(
+                    ErrorKind::Unavailable,
+                    "unexpected getrandom error",
+                    err,
+                ));
+            }
+        } else {
+            read += result as usize;
+        }
+    }
+    Ok(())
+}
+
+fn is_getrandom_available() -> bool {
+    static CHECKER: Once = ONCE_INIT;
+    static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
+
+    if NR_GETRANDOM == 0 { return false };
+
+    CHECKER.call_once(|| {
+        debug!("OsRng: testing getrandom");
+        let mut buf: [u8; 0] = [];
+        let result = getrandom(&mut buf, false);
+        let available = if result == -1 {
+            let err = io::Error::last_os_error().raw_os_error();
+            err != Some(libc::ENOSYS)
+        } else {
+            true
+        };
+        AVAILABLE.store(available, Ordering::Relaxed);
+        info!("OsRng: using {}", if available { "getrandom" } else { "/dev/urandom" });
+    });
+
+    AVAILABLE.load(Ordering::Relaxed)
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/macos.rs cargo-0.33.0/vendor/rand_os/src/macos.rs
--- cargo-0.32.0/vendor/rand_os/src/macos.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/macos.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,53 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for MacOS / iOS
+
+extern crate libc;
+
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+
+use std::io;
+use self::libc::{c_int, size_t};
+
+#[derive(Clone, Debug)]
+pub struct OsRng;
+
+enum SecRandom {}
+
+#[allow(non_upper_case_globals)]
+const kSecRandomDefault: *const SecRandom = 0 as *const SecRandom;
+
+#[link(name = "Security", kind = "framework")]
+extern {
+    fn SecRandomCopyBytes(rnd: *const SecRandom,
+                          count: size_t, bytes: *mut u8) -> c_int;
+}
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        let ret = unsafe {
+            SecRandomCopyBytes(kSecRandomDefault,
+                               dest.len() as size_t,
+                               dest.as_mut_ptr())
+        };
+        if ret == -1 {
+            Err(Error::with_cause(
+                ErrorKind::Unavailable,
+                "couldn't generate random bytes",
+                io::Error::last_os_error()))
+        } else {
+            Ok(())
+        }
+    }
+
+    fn method_str(&self) -> &'static str { "SecRandomCopyBytes" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/netbsd.rs cargo-0.33.0/vendor/rand_os/src/netbsd.rs
--- cargo-0.32.0/vendor/rand_os/src/netbsd.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/netbsd.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,54 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for NetBSD
+
+use rand_core::Error;
+use super::random_device;
+use super::OsRngImpl;
+
+use std::fs::File;
+use std::io::Read;
+use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+
+#[derive(Clone, Debug)]
+pub struct OsRng { initialized: bool }
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        random_device::open("/dev/urandom", &|p| File::open(p))?;
+        Ok(OsRng { initialized: false })
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        random_device::read(dest)
+    }
+
+    // Read a single byte from `/dev/random` to determine if the OS RNG is
+    // already seeded. NetBSD always blocks if not yet ready.
+    fn test_initialized(&mut self, dest: &mut [u8], _blocking: bool)
+        -> Result<usize, Error>
+    {
+        static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
+        if !self.initialized {
+            self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
+        }
+        if self.initialized { return Ok(0); }
+
+        info!("OsRng: testing random device /dev/random");
+        let mut file =
+            File::open("/dev/random").map_err(random_device::map_err)?;
+        file.read(&mut dest[..1]).map_err(random_device::map_err)?;
+
+        OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
+        self.initialized = true;
+        Ok(1)
+    }
+
+    fn method_str(&self) -> &'static str { "/dev/urandom" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/openbsd_bitrig.rs cargo-0.33.0/vendor/rand_os/src/openbsd_bitrig.rs
--- cargo-0.32.0/vendor/rand_os/src/openbsd_bitrig.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/openbsd_bitrig.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,40 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for OpenBSD / Bitrig
+
+extern crate libc;
+
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+
+use std::io;
+
+#[derive(Clone, Debug)]
+pub struct OsRng;
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        let ret = unsafe {
+            libc::getentropy(dest.as_mut_ptr() as *mut libc::c_void, dest.len())
+        };
+        if ret == -1 {
+            return Err(Error::with_cause(
+                ErrorKind::Unavailable,
+                "getentropy failed",
+                io::Error::last_os_error()));
+        }
+        Ok(())
+    }
+
+    fn max_chunk_size(&self) -> usize { 256 }
+
+    fn method_str(&self) -> &'static str { "getentropy" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/random_device.rs cargo-0.33.0/vendor/rand_os/src/random_device.rs
--- cargo-0.32.0/vendor/rand_os/src/random_device.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/random_device.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,70 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Helper functions to read from a random device such as `/dev/urandom`.
+//!
+//! All instances use a single internal file handle, to prevent possible
+//! exhaustion of file descriptors.
+use rand_core::{Error, ErrorKind};
+use std::fs::File;
+use std::io;
+use std::io::Read;
+use std::sync::{Once, Mutex, ONCE_INIT};
+
+// TODO: remove outer Option when `Mutex::new(None)` is a constant expression
+static mut READ_RNG_FILE: Option<Mutex<Option<File>>> = None;
+static READ_RNG_ONCE: Once = ONCE_INIT;
+
+#[allow(unused)]
+pub fn open<F>(path: &'static str, open_fn: F) -> Result<(), Error>
+    where F: Fn(&'static str) -> Result<File, io::Error>
+{
+    READ_RNG_ONCE.call_once(|| {
+        unsafe { READ_RNG_FILE = Some(Mutex::new(None)) }
+    });
+
+    // We try opening the file outside the `call_once` fn because we cannot
+    // clone the error, thus we must retry on failure.
+
+    let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
+    let mut guard = mutex.lock().unwrap();
+    if (*guard).is_none() {
+        info!("OsRng: opening random device {}", path);
+        let file = open_fn(path).map_err(map_err)?;
+        *guard = Some(file);
+    };
+    Ok(())
+}
+
+pub fn read(dest: &mut [u8]) -> Result<(), Error> {
+    // We expect this function only to be used after `random_device::open`
+    // was succesful. Therefore we can assume that our memory was set with a
+    // valid object.
+    let mutex = unsafe { READ_RNG_FILE.as_ref().unwrap() };
+    let mut guard = mutex.lock().unwrap();
+    let file = (*guard).as_mut().unwrap();
+
+    // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
+    file.read_exact(dest).map_err(|err| {
+        Error::with_cause(ErrorKind::Unavailable,
+                          "error reading random device", err)
+    })
+
+}
+
+pub fn map_err(err: io::Error) -> Error {
+    match err.kind() {
+        io::ErrorKind::Interrupted =>
+                Error::new(ErrorKind::Transient, "interrupted"),
+        io::ErrorKind::WouldBlock =>
+                Error::with_cause(ErrorKind::NotReady,
+                "OS RNG not yet seeded", err),
+        _ => Error::with_cause(ErrorKind::Unavailable,
+                "error while opening random device", err)
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/redox.rs cargo-0.33.0/vendor/rand_os/src/redox.rs
--- cargo-0.32.0/vendor/rand_os/src/redox.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/redox.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,30 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for Redox
+
+use rand_core::Error;
+use super::random_device;
+use super::OsRngImpl;
+use std::fs::File;
+
+#[derive(Clone, Debug)]
+pub struct OsRng();
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        random_device::open("rand:", &|p| File::open(p))?;
+        Ok(OsRng())
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        random_device::read(dest)
+    }
+
+    fn method_str(&self) -> &'static str { "'rand:'" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/sgx.rs cargo-0.33.0/vendor/rand_os/src/sgx.rs
--- cargo-0.32.0/vendor/rand_os/src/sgx.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/sgx.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,38 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use super::OsRngImpl;
+use Error;
+use rdrand::RdRand;
+use rand_core::RngCore;
+use std::fmt::{Debug, Formatter, Result as FmtResult};
+
+#[derive(Clone)]
+pub struct OsRng{
+    gen: RdRand
+}
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        let rng = RdRand::new()?;
+        Ok(OsRng{ gen: rng })
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.gen.try_fill_bytes(dest)
+    }
+
+    fn method_str(&self) -> &'static str { "RDRAND" }
+}
+
+impl Debug for OsRng {
+    fn fmt(&self, f: &mut Formatter) -> FmtResult {
+        f.debug_struct("OsRng")
+            .finish()
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/solaris.rs cargo-0.33.0/vendor/rand_os/src/solaris.rs
--- cargo-0.32.0/vendor/rand_os/src/solaris.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/solaris.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,175 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for the Solaris family
+//!
+//! Read from `/dev/random`, with chunks of limited size (1040 bytes).
+//! `/dev/random` uses the Hash_DRBG with SHA512 algorithm from NIST SP 800-90A.
+//! `/dev/urandom` uses the FIPS 186-2 algorithm, which is considered less
+//! secure. We choose to read from `/dev/random`.
+//!
+//! Since Solaris 11.3 the `getrandom` syscall is available. To make sure we can
+//! compile on both Solaris and on OpenSolaris derivatives, that do not have the
+//! function, we do a direct syscall instead of calling a library function.
+//!
+//! We have no way to differentiate between Solaris, illumos, SmartOS, etc.
+extern crate libc;
+
+use rand_core::{Error, ErrorKind};
+use super::random_device;
+use super::OsRngImpl;
+
+use std::io;
+use std::io::Read;
+use std::fs::{File, OpenOptions};
+use std::os::unix::fs::OpenOptionsExt;
+use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+use std::cmp;
+
+#[derive(Clone, Debug)]
+pub struct OsRng {
+    method: OsRngMethod,
+    initialized: bool,
+}
+
+#[derive(Clone, Debug)]
+enum OsRngMethod {
+    GetRandom,
+    RandomDevice,
+}
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        if is_getrandom_available() {
+            return Ok(OsRng { method: OsRngMethod::GetRandom,
+                              initialized: false });
+        }
+        let open = |p| OpenOptions::new()
+            .read(true)
+            .custom_flags(libc::O_NONBLOCK)
+            .open(p);
+        random_device::open("/dev/random", &open)?;
+        Ok(OsRng { method: OsRngMethod::RandomDevice, initialized: false })
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        match self.method {
+            OsRngMethod::GetRandom => getrandom_try_fill(dest, false),
+            OsRngMethod::RandomDevice => random_device::read(dest),
+        }
+    }
+
+    fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
+        -> Result<usize, Error>
+    {
+        static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
+        if !self.initialized {
+            self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
+        }
+        if self.initialized { return Ok(0); }
+
+        let chunk_len = cmp::min(1024, dest.len());
+        let dest = &mut dest[..chunk_len];
+
+        match self.method {
+            OsRngMethod::GetRandom => getrandom_try_fill(dest, blocking)?,
+            OsRngMethod::RandomDevice => {
+                if blocking {
+                    info!("OsRng: testing random device /dev/random");
+                    // We already have a non-blocking handle, but now need a
+                    // blocking one. Not much choice except opening it twice
+                    let mut file = File::open("/dev/random")
+                        .map_err(random_device::map_err)?;
+                    file.read(dest).map_err(random_device::map_err)?;
+                } else {
+                    self.fill_chunk(dest)?;
+                }
+            }
+        };
+        OS_RNG_INITIALIZED.store(true, Ordering::Relaxed);
+        self.initialized = true;
+        Ok(chunk_len)
+    }
+
+    fn max_chunk_size(&self) -> usize {
+        // The documentation says 1024 is the maximum for getrandom, but
+        // 1040 for /dev/random.
+        1024
+    }
+
+    fn method_str(&self) -> &'static str {
+        match self.method {
+            OsRngMethod::GetRandom => "getrandom",
+            OsRngMethod::RandomDevice => "/dev/random",
+        }
+    }
+}
+
+fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
+    extern "C" {
+        fn syscall(number: libc::c_long, ...) -> libc::c_long;
+    }
+
+    const SYS_GETRANDOM: libc::c_long = 143;
+    const GRND_NONBLOCK: libc::c_uint = 0x0001;
+    const GRND_RANDOM: libc::c_uint = 0x0002;
+
+    unsafe {
+        syscall(SYS_GETRANDOM, buf.as_mut_ptr(), buf.len(),
+                if blocking { 0 } else { GRND_NONBLOCK } | GRND_RANDOM)
+    }
+}
+
+fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
+    let result = getrandom(dest, blocking);
+    if result == -1 || result == 0 {
+        let err = io::Error::last_os_error();
+        let kind = err.kind();
+        if kind == io::ErrorKind::WouldBlock {
+            return Err(Error::with_cause(
+                ErrorKind::NotReady,
+                "getrandom not ready",
+                err,
+            ));
+        } else {
+            return Err(Error::with_cause(
+                ErrorKind::Unavailable,
+                "unexpected getrandom error",
+                err,
+            ));
+        }
+    } else if result != dest.len() as i64 {
+        return Err(Error::new(ErrorKind::Unavailable,
+                              "unexpected getrandom error"));
+    }
+    Ok(())
+}
+
+fn is_getrandom_available() -> bool {
+    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+    use std::sync::{Once, ONCE_INIT};
+
+    static CHECKER: Once = ONCE_INIT;
+    static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
+
+    CHECKER.call_once(|| {
+        debug!("OsRng: testing getrandom");
+        let mut buf: [u8; 0] = [];
+        let result = getrandom(&mut buf, false);
+        let available = if result == -1 {
+            let err = io::Error::last_os_error().raw_os_error();
+            err != Some(libc::ENOSYS)
+        } else {
+            true
+        };
+        AVAILABLE.store(available, Ordering::Relaxed);
+        info!("OsRng: using {}", if available { "getrandom" } else { "/dev/random" });
+    });
+
+    AVAILABLE.load(Ordering::Relaxed)
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/wasm32_bindgen.rs cargo-0.33.0/vendor/rand_os/src/wasm32_bindgen.rs
--- cargo-0.32.0/vendor/rand_os/src/wasm32_bindgen.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/wasm32_bindgen.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,92 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for WASM via wasm-bindgen
+
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+use super::__wbg_shims::*;
+
+use wasm_bindgen::prelude::*;
+
+
+#[derive(Clone, Debug)]
+pub enum OsRng {
+    Node(NodeCrypto),
+    Browser(BrowserCrypto),
+}
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        // First up we need to detect if we're running in node.js or a
+        // browser. To do this we get ahold of the `this` object (in a bit
+        // of a roundabout fashion).
+        //
+        // Once we have `this` we look at its `self` property, which is
+        // only defined on the web (either a main window or web worker).
+        let this = Function::new("return this").call(&JsValue::undefined());
+        assert!(this != JsValue::undefined());
+        let this = This::from(this);
+        let is_browser = this.self_() != JsValue::undefined();
+
+        if !is_browser {
+            return Ok(OsRng::Node(node_require("crypto")))
+        }
+
+        // If `self` is defined then we're in a browser somehow (main window
+        // or web worker). Here we want to try to use
+        // `crypto.getRandomValues`, but if `crypto` isn't defined we assume
+        // we're in an older web browser and the OS RNG isn't available.
+        let crypto = this.crypto();
+        if crypto.is_undefined() {
+            let msg = "self.crypto is undefined";
+            return Err(Error::new(ErrorKind::Unavailable, msg))
+        }
+
+        // Test if `crypto.getRandomValues` is undefined as well
+        let crypto: BrowserCrypto = crypto.into();
+        if crypto.get_random_values_fn().is_undefined() {
+            let msg = "crypto.getRandomValues is undefined";
+            return Err(Error::new(ErrorKind::Unavailable, msg))
+        }
+
+        // Ok! `self.crypto.getRandomValues` is a defined value, so let's
+        // assume we can do browser crypto.
+        Ok(OsRng::Browser(crypto))
+    }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        match *self {
+            OsRng::Node(ref n) => n.random_fill_sync(dest),
+            OsRng::Browser(ref n) => n.get_random_values(dest),
+        }
+        Ok(())
+    }
+
+    fn max_chunk_size(&self) -> usize {
+        match *self {
+            OsRng::Node(_) => usize::max_value(),
+            OsRng::Browser(_) => {
+                // see https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
+                //
+                // where it says:
+                //
+                // > A QuotaExceededError DOMException is thrown if the
+                // > requested length is greater than 65536 bytes.
+                65536
+            }
+        }
+    }
+
+    fn method_str(&self) -> &'static str {
+        match *self {
+            OsRng::Node(_) => "crypto.randomFillSync",
+            OsRng::Browser(_) => "crypto.getRandomValues",
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/wasm32_stdweb.rs cargo-0.33.0/vendor/rand_os/src/wasm32_stdweb.rs
--- cargo-0.32.0/vendor/rand_os/src/wasm32_stdweb.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/wasm32_stdweb.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,107 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for WASM via stdweb
+
+use std::mem;
+use stdweb::unstable::TryInto;
+use stdweb::web::error::Error as WebError;
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+
+#[derive(Clone, Debug)]
+enum OsRngMethod {
+    Browser,
+    Node
+}
+
+#[derive(Clone, Debug)]
+pub struct OsRng(OsRngMethod);
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> {
+        let result = js! {
+            try {
+                if (
+                    typeof self === "object" &&
+                    typeof self.crypto === "object" &&
+                    typeof self.crypto.getRandomValues === "function"
+                ) {
+                    return { success: true, ty: 1 };
+                }
+
+                if (typeof require("crypto").randomBytes === "function") {
+                    return { success: true, ty: 2 };
+                }
+
+                return { success: false, error: new Error("not supported") };
+            } catch(err) {
+                return { success: false, error: err };
+            }
+        };
+
+        if js!{ return @{ result.as_ref() }.success } == true {
+            let ty = js!{ return @{ result }.ty };
+
+            if ty == 1 { Ok(OsRng(OsRngMethod::Browser)) }
+            else if ty == 2 { Ok(OsRng(OsRngMethod::Node)) }
+            else { unreachable!() }
+        } else {
+            let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
+            Err(Error::with_cause(ErrorKind::Unavailable, "WASM Error", err))
+        }
+    }
+
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        assert_eq!(mem::size_of::<usize>(), 4);
+
+        let len = dest.len() as u32;
+        let ptr = dest.as_mut_ptr() as i32;
+
+        let result = match self.0 {
+            OsRngMethod::Browser => js! {
+                try {
+                    let array = new Uint8Array(@{ len });
+                    self.crypto.getRandomValues(array);
+                    HEAPU8.set(array, @{ ptr });
+
+                    return { success: true };
+                } catch(err) {
+                    return { success: false, error: err };
+                }
+            },
+            OsRngMethod::Node => js! {
+                try {
+                    let bytes = require("crypto").randomBytes(@{ len });
+                    HEAPU8.set(new Uint8Array(bytes), @{ ptr });
+
+                    return { success: true };
+                } catch(err) {
+                    return { success: false, error: err };
+                }
+            }
+        };
+
+        if js!{ return @{ result.as_ref() }.success } == true {
+            Ok(())
+        } else {
+            let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
+            Err(Error::with_cause(ErrorKind::Unexpected, "WASM Error", err))
+        }
+    }
+
+    fn max_chunk_size(&self) -> usize { 65536 }
+
+    fn method_str(&self) -> &'static str {
+        match self.0 {
+            OsRngMethod::Browser => "Crypto.getRandomValues",
+            OsRngMethod::Node => "crypto.randomBytes",
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/src/windows.rs cargo-0.33.0/vendor/rand_os/src/windows.rs
--- cargo-0.32.0/vendor/rand_os/src/windows.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/src/windows.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,44 @@
+// Copyright 2018 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementation for Windows
+
+extern crate winapi;
+
+use rand_core::{Error, ErrorKind};
+use super::OsRngImpl;
+
+use std::io;
+
+use self::winapi::shared::minwindef::ULONG;
+use self::winapi::um::ntsecapi::RtlGenRandom;
+use self::winapi::um::winnt::PVOID;
+
+#[derive(Clone, Debug)]
+pub struct OsRng;
+
+impl OsRngImpl for OsRng {
+    fn new() -> Result<OsRng, Error> { Ok(OsRng) }
+
+    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        let ret = unsafe {
+            RtlGenRandom(dest.as_mut_ptr() as PVOID, dest.len() as ULONG)
+        };
+        if ret == 0 {
+            return Err(Error::with_cause(
+                ErrorKind::Unavailable,
+                "couldn't generate random bytes",
+                io::Error::last_os_error()));
+        }
+        Ok(())
+    }
+
+    fn max_chunk_size(&self) -> usize { <ULONG>::max_value() as usize }
+
+    fn method_str(&self) -> &'static str { "RtlGenRandom" }
+}
diff -Nru cargo-0.32.0/vendor/rand_os/tests/mod.rs cargo-0.33.0/vendor/rand_os/tests/mod.rs
--- cargo-0.32.0/vendor/rand_os/tests/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_os/tests/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,80 @@
+extern crate rand_os;
+
+use rand_os::rand_core::RngCore;
+use rand_os::OsRng;
+
+#[test]
+fn test_os_rng() {
+    let mut r = OsRng::new().unwrap();
+
+    r.next_u32();
+    r.next_u64();
+
+    let mut v1 = [0u8; 1000];
+    r.fill_bytes(&mut v1);
+
+    let mut v2 = [0u8; 1000];
+    r.fill_bytes(&mut v2);
+
+    let mut n_diff_bits = 0;
+    for i in 0..v1.len() {
+        n_diff_bits += (v1[i] ^ v2[i]).count_ones();
+    }
+
+    // Check at least 1 bit per byte differs. p(failure) < 1e-1000 with random input.
+    assert!(n_diff_bits >= v1.len() as u32);
+}
+
+#[test]
+fn test_os_rng_empty() {
+    let mut r = OsRng::new().unwrap();
+
+    let mut empty = [0u8; 0];
+    r.fill_bytes(&mut empty);
+}
+
+#[test]
+fn test_os_rng_huge() {
+    let mut r = OsRng::new().unwrap();
+
+    let mut huge = [0u8; 100_000];
+    r.fill_bytes(&mut huge);
+}
+
+#[cfg(not(any(target_arch = "wasm32", target_arch = "asmjs")))]
+#[test]
+fn test_os_rng_tasks() {
+    use std::sync::mpsc::channel;
+    use std::thread;
+
+    let mut txs = vec!();
+    for _ in 0..20 {
+        let (tx, rx) = channel();
+        txs.push(tx);
+
+        thread::spawn(move|| {
+            // wait until all the tasks are ready to go.
+            rx.recv().unwrap();
+
+            // deschedule to attempt to interleave things as much
+            // as possible (XXX: is this a good test?)
+            let mut r = OsRng::new().unwrap();
+            thread::yield_now();
+            let mut v = [0u8; 1000];
+
+            for _ in 0..100 {
+                r.next_u32();
+                thread::yield_now();
+                r.next_u64();
+                thread::yield_now();
+                r.fill_bytes(&mut v);
+                thread::yield_now();
+            }
+        });
+    }
+
+    // start all the tasks
+    for tx in txs.iter() {
+        tx.send(()).unwrap();
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_pcg/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_pcg/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_pcg/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_pcg/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "b934f973c98af38798c1b7ea3c754e6335e0511b"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_xorshift/.cargo-checksum.json cargo-0.33.0/vendor/rand_xorshift/.cargo-checksum.json
--- cargo-0.32.0/vendor/rand_xorshift/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3"}
\ No newline at end of file
+{"files":{},"package":"cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rand_xorshift/Cargo.toml cargo-0.33.0/vendor/rand_xorshift/Cargo.toml
--- cargo-0.32.0/vendor/rand_xorshift/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,16 +12,16 @@
 
 [package]
 name = "rand_xorshift"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["The Rand Project Developers", "The Rust Project Developers"]
 description = "Xorshift random number generator\n"
 homepage = "https://crates.io/crates/rand_xorshift"
-documentation = "https://docs.rs/rand_xorshift"
+documentation = "https://rust-random.github.io/rand/rand_xorshift"
 readme = "README.md"
 keywords = ["random", "rng", "xorshift"]
 categories = ["algorithms", "no-std"]
 license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-random/small-rngs"
+repository = "https://github.com/rust-random/rand"
 [dependencies.rand_core]
 version = ">=0.2, <0.4"
 default-features = false
@@ -39,7 +39,7 @@
 [features]
 serde1 = ["serde", "serde_derive"]
 [badges.appveyor]
-repository = "rust-random/small-rngs"
+repository = "rust-random/rand"
 
 [badges.travis-ci]
-repository = "rust-random/small-rngs"
+repository = "rust-random/rand"
diff -Nru cargo-0.32.0/vendor/rand_xorshift/.cargo_vcs_info.json cargo-0.33.0/vendor/rand_xorshift/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/rand_xorshift/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "a17fa3862823a9538a3a000b7d7ab770e37c7e07"
-  }
-}
diff -Nru cargo-0.32.0/vendor/rand_xorshift/CHANGELOG.md cargo-0.33.0/vendor/rand_xorshift/CHANGELOG.md
--- cargo-0.32.0/vendor/rand_xorshift/CHANGELOG.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -4,5 +4,8 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - 2018-10-04
+## [0.1.1] - 2019-01-04
+- Reorganise code and tests; tweak doc
+
+## [0.1.0] - 2018-07-16
 - Pulled out of the Rand crate
diff -Nru cargo-0.32.0/vendor/rand_xorshift/README.md cargo-0.33.0/vendor/rand_xorshift/README.md
--- cargo-0.32.0/vendor/rand_xorshift/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,12 @@
 # rand_xorshift
 
-[![Build Status](https://travis-ci.org/rust-random/small-rngs.svg)](https://travis-ci.org/rust-random/small-rngs)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/small-rngs?svg=true)](https://ci.appveyor.com/project/rust-random/small-rngs)
+[![Build Status](https://travis-ci.org/rust-random/rand.svg)](https://travis-ci.org/rust-random/rand)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-random/rand?svg=true)](https://ci.appveyor.com/project/rust-random/rand)
 [![Latest version](https://img.shields.io/crates/v/rand_xorshift.svg)](https://crates.io/crates/rand_xorshift)
-[![Documentation](https://docs.rs/rand_xorshift/badge.svg)](https://docs.rs/rand_xorshift)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-yellow.svg)](https://github.com/rust-random/rand#rust-version-requirements)
-[![License](https://img.shields.io/crates/l/rand_xorshift.svg)](https://github.com/rust-random/small-rngs/tree/master/rand_xorshift#license)
+[![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/)
+[![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_xorshift)
+[![API](https://docs.rs/rand_xorshift/badge.svg)](https://docs.rs/rand_xorshift)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.22+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements)
 
 Implements the Xorshift random number generator.
 
@@ -17,11 +18,11 @@
       ["Xorshift RNGs"](https://www.jstatsoft.org/v08/i14/paper).
       *Journal of Statistical Software*. Vol. 8 (Issue 14).
 
-Documentation:
-[master branch](https://rust-random.github.io/small-rngs/rand_xorshift/index.html),
-[by release](https://docs.rs/rand_xorshift)
+Links:
 
-[Changelog](CHANGELOG.md)
+-   [API documentation (master)](https://rust-random.github.io/rand/rand_xorshift)
+-   [API documentation (docs.rs)](https://docs.rs/rand_xorshift)
+-   [Changelog](CHANGELOG.md)
 
 [rand]: https://crates.io/crates/rand
 
diff -Nru cargo-0.32.0/vendor/rand_xorshift/src/lib.rs cargo-0.33.0/vendor/rand_xorshift/src/lib.rs
--- cargo-0.32.0/vendor/rand_xorshift/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,23 +10,114 @@
 
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
        html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/rand_xorshift/0.1.0")]
+       html_root_url = "https://rust-random.github.io/rand/")]
 
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
-#![doc(test(attr(allow(unused_variables), deny(warnings))))]
 
-#![cfg_attr(not(all(feature="serde1", test)), no_std)]
+#![no_std]
 
 extern crate rand_core;
 
 #[cfg(feature="serde1")] extern crate serde;
 #[cfg(feature="serde1")] #[macro_use] extern crate serde_derive;
 
-// To test serialization we need bincode and the standard library
-#[cfg(all(feature="serde1", test))] extern crate bincode;
-#[cfg(all(feature="serde1", test))] extern crate std as core;
-
-mod xorshift;
-
-pub use self::xorshift::XorShiftRng;
+use core::num::Wrapping as w;
+use core::{fmt, slice};
+use rand_core::{RngCore, SeedableRng, Error, impls, le};
+
+/// An Xorshift random number generator.
+///
+/// The Xorshift[^1] algorithm is not suitable for cryptographic purposes
+/// but is very fast. If you do not know for sure that it fits your
+/// requirements, use a more secure one such as `StdRng` or `OsRng`.
+///
+/// [^1]: Marsaglia, George (July 2003).
+///       ["Xorshift RNGs"](https://www.jstatsoft.org/v08/i14/paper).
+///       *Journal of Statistical Software*. Vol. 8 (Issue 14).
+#[derive(Clone)]
+#[cfg_attr(feature="serde1", derive(Serialize,Deserialize))]
+pub struct XorShiftRng {
+    x: w<u32>,
+    y: w<u32>,
+    z: w<u32>,
+    w: w<u32>,
+}
+
+// Custom Debug implementation that does not expose the internal state
+impl fmt::Debug for XorShiftRng {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "XorShiftRng {{}}")
+    }
+}
+
+impl RngCore for XorShiftRng {
+    #[inline]
+    fn next_u32(&mut self) -> u32 {
+        let x = self.x;
+        let t = x ^ (x << 11);
+        self.x = self.y;
+        self.y = self.z;
+        self.z = self.w;
+        let w_ = self.w;
+        self.w = w_ ^ (w_ >> 19) ^ (t ^ (t >> 8));
+        self.w.0
+    }
+
+    #[inline]
+    fn next_u64(&mut self) -> u64 {
+        impls::next_u64_via_u32(self)
+    }
+
+    #[inline]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        impls::fill_bytes_via_next(self, dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        Ok(self.fill_bytes(dest))
+    }
+}
+
+impl SeedableRng for XorShiftRng {
+    type Seed = [u8; 16];
+
+    fn from_seed(seed: Self::Seed) -> Self {
+        let mut seed_u32 = [0u32; 4];
+        le::read_u32_into(&seed, &mut seed_u32);
+
+        // Xorshift cannot be seeded with 0 and we cannot return an Error, but
+        // also do not wish to panic (because a random seed can legitimately be
+        // 0); our only option is therefore to use a preset value.
+        if seed_u32.iter().all(|&x| x == 0) {
+            seed_u32 = [0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED];
+        }
+
+        XorShiftRng {
+            x: w(seed_u32[0]),
+            y: w(seed_u32[1]),
+            z: w(seed_u32[2]),
+            w: w(seed_u32[3]),
+        }
+    }
+
+    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
+        let mut seed_u32 = [0u32; 4];
+        loop {
+            unsafe {
+                let ptr = seed_u32.as_mut_ptr() as *mut u8;
+
+                let slice = slice::from_raw_parts_mut(ptr, 4 * 4);
+                rng.try_fill_bytes(slice)?;
+            }
+            if !seed_u32.iter().all(|&x| x == 0) { break; }
+        }
+
+        Ok(XorShiftRng {
+            x: w(seed_u32[0]),
+            y: w(seed_u32[1]),
+            z: w(seed_u32[2]),
+            w: w(seed_u32[3]),
+        })
+    }
+}
diff -Nru cargo-0.32.0/vendor/rand_xorshift/src/xorshift.rs cargo-0.33.0/vendor/rand_xorshift/src/xorshift.rs
--- cargo-0.32.0/vendor/rand_xorshift/src/xorshift.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/src/xorshift.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-// Copyright 2017 The Rust Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Xorshift generators
-
-use core::num::Wrapping as w;
-use core::{fmt, slice};
-use rand_core::{RngCore, SeedableRng, Error, impls, le};
-
-/// An Xorshift random number generator.
-///
-/// The Xorshift[^1] algorithm is not suitable for cryptographic purposes
-/// but is very fast. If you do not know for sure that it fits your
-/// requirements, use a more secure one such as `StdRng` or `OsRng`.
-///
-/// [^1]: Marsaglia, George (July 2003).
-///       ["Xorshift RNGs"](https://www.jstatsoft.org/v08/i14/paper).
-///       *Journal of Statistical Software*. Vol. 8 (Issue 14).
-#[derive(Clone)]
-#[cfg_attr(feature="serde1", derive(Serialize,Deserialize))]
-pub struct XorShiftRng {
-    x: w<u32>,
-    y: w<u32>,
-    z: w<u32>,
-    w: w<u32>,
-}
-
-// Custom Debug implementation that does not expose the internal state
-impl fmt::Debug for XorShiftRng {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "XorShiftRng {{}}")
-    }
-}
-
-impl RngCore for XorShiftRng {
-    #[inline]
-    fn next_u32(&mut self) -> u32 {
-        let x = self.x;
-        let t = x ^ (x << 11);
-        self.x = self.y;
-        self.y = self.z;
-        self.z = self.w;
-        let w_ = self.w;
-        self.w = w_ ^ (w_ >> 19) ^ (t ^ (t >> 8));
-        self.w.0
-    }
-
-    #[inline]
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_u32(self)
-    }
-
-    #[inline]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        impls::fill_bytes_via_next(self, dest)
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
-    }
-}
-
-impl SeedableRng for XorShiftRng {
-    type Seed = [u8; 16];
-
-    fn from_seed(seed: Self::Seed) -> Self {
-        let mut seed_u32 = [0u32; 4];
-        le::read_u32_into(&seed, &mut seed_u32);
-
-        // Xorshift cannot be seeded with 0 and we cannot return an Error, but
-        // also do not wish to panic (because a random seed can legitimately be
-        // 0); our only option is therefore to use a preset value.
-        if seed_u32.iter().all(|&x| x == 0) {
-            seed_u32 = [0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED, 0xBAD_5EED];
-        }
-
-        XorShiftRng {
-            x: w(seed_u32[0]),
-            y: w(seed_u32[1]),
-            z: w(seed_u32[2]),
-            w: w(seed_u32[3]),
-        }
-    }
-
-    fn from_rng<R: RngCore>(mut rng: R) -> Result<Self, Error> {
-        let mut seed_u32 = [0u32; 4];
-        loop {
-            unsafe {
-                let ptr = seed_u32.as_mut_ptr() as *mut u8;
-
-                let slice = slice::from_raw_parts_mut(ptr, 4 * 4);
-                rng.try_fill_bytes(slice)?;
-            }
-            if !seed_u32.iter().all(|&x| x == 0) { break; }
-        }
-
-        Ok(XorShiftRng {
-            x: w(seed_u32[0]),
-            y: w(seed_u32[1]),
-            z: w(seed_u32[2]),
-            w: w(seed_u32[3]),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ::rand_core::{RngCore, SeedableRng};
-    use super::XorShiftRng;
-
-    #[test]
-    fn test_xorshift_construction() {
-        // Test that various construction techniques produce a working RNG.
-        let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
-        let mut rng1 = XorShiftRng::from_seed(seed);
-        assert_eq!(rng1.next_u64(), 4325440999699518727);
-
-        let _rng2 = XorShiftRng::from_rng(rng1).unwrap();
-        // Note: we cannot test the state of _rng2 because from_rng does not
-        // fix Endianness. This is allowed in the trait specification.
-    }
-
-    #[test]
-    fn test_xorshift_true_values() {
-        let seed = [16,15,14,13, 12,11,10,9, 8,7,6,5, 4,3,2,1];
-        let mut rng = XorShiftRng::from_seed(seed);
-
-        let mut results = [0u32; 9];
-        for i in results.iter_mut() { *i = rng.next_u32(); }
-        let expected: [u32; 9] = [
-            2081028795, 620940381, 269070770, 16943764, 854422573, 29242889,
-            1550291885, 1227154591, 271695242];
-        assert_eq!(results, expected);
-
-        let mut results = [0u64; 9];
-        for i in results.iter_mut() { *i = rng.next_u64(); }
-        let expected: [u64; 9] = [
-            9247529084182843387, 8321512596129439293, 14104136531997710878,
-            6848554330849612046, 343577296533772213, 17828467390962600268,
-            9847333257685787782, 7717352744383350108, 1133407547287910111];
-        assert_eq!(results, expected);
-
-        let mut results = [0u8; 32];
-        rng.fill_bytes(&mut results);
-        let expected = [102, 57, 212, 16, 233, 130, 49, 183,
-                        158, 187, 44, 203, 63, 149, 45, 17,
-                        117, 129, 131, 160, 70, 121, 158, 155,
-                        224, 209, 192, 53, 10, 62, 57, 72];
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_xorshift_zero_seed() {
-        // Xorshift does not work with an all zero seed.
-        // Assert it does not panic.
-        let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
-        let mut rng = XorShiftRng::from_seed(seed);
-        let a = rng.next_u64();
-        let b = rng.next_u64();
-        assert!(a != 0);
-        assert!(b != a);
-    }
-
-    #[test]
-    fn test_xorshift_clone() {
-        let seed = [1,2,3,4, 5,5,7,8, 8,7,6,5, 4,3,2,1];
-        let mut rng1 = XorShiftRng::from_seed(seed);
-        let mut rng2 = rng1.clone();
-        for _ in 0..16 {
-            assert_eq!(rng1.next_u64(), rng2.next_u64());
-        }
-    }
-
-    #[cfg(feature="serde1")]
-    #[test]
-    fn test_xorshift_serde() {
-        use bincode;
-        use std::io::{BufWriter, BufReader};
-
-        let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
-        let mut rng = XorShiftRng::from_seed(seed);
-
-        let buf: Vec<u8> = Vec::new();
-        let mut buf = BufWriter::new(buf);
-        bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
-
-        let buf = buf.into_inner().unwrap();
-        let mut read = BufReader::new(&buf[..]);
-        let mut deserialized: XorShiftRng = bincode::deserialize_from(&mut read).expect("Could not deserialize");
-
-        assert_eq!(rng.x, deserialized.x);
-        assert_eq!(rng.y, deserialized.y);
-        assert_eq!(rng.z, deserialized.z);
-        assert_eq!(rng.w, deserialized.w);
-
-        for _ in 0..16 {
-            assert_eq!(rng.next_u64(), deserialized.next_u64());
-        }
-    }
-}
diff -Nru cargo-0.32.0/vendor/rand_xorshift/tests/mod.rs cargo-0.33.0/vendor/rand_xorshift/tests/mod.rs
--- cargo-0.32.0/vendor/rand_xorshift/tests/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rand_xorshift/tests/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,92 @@
+extern crate rand_core;
+extern crate rand_xorshift;
+#[cfg(all(feature="serde1", test))] extern crate bincode;
+
+use rand_core::{RngCore, SeedableRng};
+use rand_xorshift::XorShiftRng;
+
+#[test]
+fn test_xorshift_construction() {
+    // Test that various construction techniques produce a working RNG.
+    let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
+    let mut rng1 = XorShiftRng::from_seed(seed);
+    assert_eq!(rng1.next_u64(), 4325440999699518727);
+
+    let _rng2 = XorShiftRng::from_rng(rng1).unwrap();
+    // Note: we cannot test the state of _rng2 because from_rng does not
+    // fix Endianness. This is allowed in the trait specification.
+}
+
+#[test]
+fn test_xorshift_true_values() {
+    let seed = [16,15,14,13, 12,11,10,9, 8,7,6,5, 4,3,2,1];
+    let mut rng = XorShiftRng::from_seed(seed);
+
+    let mut results = [0u32; 9];
+    for i in results.iter_mut() { *i = rng.next_u32(); }
+    let expected: [u32; 9] = [
+        2081028795, 620940381, 269070770, 16943764, 854422573, 29242889,
+        1550291885, 1227154591, 271695242];
+    assert_eq!(results, expected);
+
+    let mut results = [0u64; 9];
+    for i in results.iter_mut() { *i = rng.next_u64(); }
+    let expected: [u64; 9] = [
+        9247529084182843387, 8321512596129439293, 14104136531997710878,
+        6848554330849612046, 343577296533772213, 17828467390962600268,
+        9847333257685787782, 7717352744383350108, 1133407547287910111];
+    assert_eq!(results, expected);
+
+    let mut results = [0u8; 32];
+    rng.fill_bytes(&mut results);
+    let expected = [102, 57, 212, 16, 233, 130, 49, 183,
+                    158, 187, 44, 203, 63, 149, 45, 17,
+                    117, 129, 131, 160, 70, 121, 158, 155,
+                    224, 209, 192, 53, 10, 62, 57, 72];
+    assert_eq!(results, expected);
+}
+
+#[test]
+fn test_xorshift_zero_seed() {
+    // Xorshift does not work with an all zero seed.
+    // Assert it does not panic.
+    let seed = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0];
+    let mut rng = XorShiftRng::from_seed(seed);
+    let a = rng.next_u64();
+    let b = rng.next_u64();
+    assert!(a != 0);
+    assert!(b != a);
+}
+
+#[test]
+fn test_xorshift_clone() {
+    let seed = [1,2,3,4, 5,5,7,8, 8,7,6,5, 4,3,2,1];
+    let mut rng1 = XorShiftRng::from_seed(seed);
+    let mut rng2 = rng1.clone();
+    for _ in 0..16 {
+        assert_eq!(rng1.next_u64(), rng2.next_u64());
+    }
+}
+
+#[cfg(feature="serde1")]
+#[test]
+fn test_xorshift_serde() {
+    use bincode;
+    use std::io::{BufWriter, BufReader};
+
+    let seed = [1,2,3,4, 5,6,7,8, 9,10,11,12, 13,14,15,16];
+    let mut rng = XorShiftRng::from_seed(seed);
+
+    let buf: Vec<u8> = Vec::new();
+    let mut buf = BufWriter::new(buf);
+    bincode::serialize_into(&mut buf, &rng).expect("Could not serialize");
+
+    let buf = buf.into_inner().unwrap();
+    let mut read = BufReader::new(&buf[..]);
+    let mut deserialized: XorShiftRng = bincode::deserialize_from(&mut read)
+        .expect("Could not deserialize");
+
+    for _ in 0..16 {
+        assert_eq!(rng.next_u64(), deserialized.next_u64());
+    }
+}
diff -Nru cargo-0.32.0/vendor/rdrand/appveyor.yml cargo-0.33.0/vendor/rdrand/appveyor.yml
--- cargo-0.32.0/vendor/rdrand/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/appveyor.yml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,27 @@
+environment:
+  matrix:
+  - TARGET: 1.30.0-x86_64-pc-windows-msvc
+  - TARGET: 1.30.0-i686-pc-windows-msvc
+  - TARGET: 1.30.0-x86_64-pc-windows-gnu
+  - TARGET: 1.30.0-i686-pc-windows-gnu
+  - TARGET: nightly-x86_64-pc-windows-msvc
+  - TARGET: nightly-i686-pc-windows-msvc
+install:
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe" -FileName "rust.exe"
+  - ps: .\rust.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
+  - ps: $env:PATH="$env:PATH;C:\rust\bin"
+  - rustc -vV
+  - cargo -vV
+build: off
+
+test_script:
+- cargo test
+- cargo test --no-default-features
+
+for:
+- matrix:
+    only:
+      - TARGET: nightly-x86_64-pc-windows-msvc
+      - TARGET: nightly-i686-pc-windows-msvc
+  test_script:
+    - cargo bench
diff -Nru cargo-0.32.0/vendor/rdrand/benches/rdrand.rs cargo-0.33.0/vendor/rdrand/benches/rdrand.rs
--- cargo-0.32.0/vendor/rdrand/benches/rdrand.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/benches/rdrand.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,49 @@
+#![feature(test)]
+extern crate rand_core;
+extern crate rdrand;
+extern crate test;
+
+use rand_core::RngCore;
+use test::Bencher;
+
+#[bench]
+fn bench_u16(b : &mut Bencher) {
+    if let Ok(gen) = rdrand::RdRand::new() {
+        b.bytes = 2;
+        b.iter(|| {
+            gen.try_next_u16().unwrap()
+        });
+    }
+}
+
+#[bench]
+fn bench_u32(b : &mut Bencher) {
+    if let Ok(mut gen) = rdrand::RdRand::new() {
+        b.bytes = 4;
+        b.iter(|| {
+            gen.next_u32()
+        });
+    }
+}
+
+#[bench]
+fn bench_u64(b : &mut Bencher) {
+    if let Ok(mut gen) = rdrand::RdRand::new() {
+        b.bytes = 8;
+        b.iter(|| {
+            gen.next_u64()
+        });
+    }
+}
+
+#[bench]
+fn bench_fill(b : &mut Bencher) {
+    if let Ok(mut gen) = rdrand::RdRand::new() {
+        let mut buffer = [0; 128];
+        b.bytes = 128;
+        b.iter(|| {
+            gen.fill_bytes(&mut buffer);
+            buffer
+        });
+    }
+}
diff -Nru cargo-0.32.0/vendor/rdrand/benches/rdseed.rs cargo-0.33.0/vendor/rdrand/benches/rdseed.rs
--- cargo-0.32.0/vendor/rdrand/benches/rdseed.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/benches/rdseed.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,49 @@
+#![feature(test)]
+extern crate rand_core;
+extern crate rdrand;
+extern crate test;
+
+use rand_core::RngCore;
+use test::Bencher;
+
+#[bench]
+fn bench_rdseed_u16(b : &mut Bencher) {
+    if let Ok(gen) = rdrand::RdSeed::new() {
+        b.bytes = 2;
+        b.iter(|| {
+            gen.try_next_u16().unwrap()
+        });
+    }
+}
+
+#[bench]
+fn bench_rdseed_u32(b : &mut Bencher) {
+    if let Ok(mut gen) = rdrand::RdSeed::new() {
+        b.bytes = 4;
+        b.iter(|| {
+            gen.next_u32()
+        });
+    }
+}
+
+#[bench]
+fn bench_rdseed_u64(b : &mut Bencher) {
+    if let Ok(mut gen) = rdrand::RdSeed::new() {
+        b.bytes = 8;
+        b.iter(|| {
+            gen.next_u64()
+        });
+    }
+}
+
+#[bench]
+fn bench_fill(b : &mut Bencher) {
+    if let Ok(mut gen) = rdrand::RdSeed::new() {
+        let mut buffer = [0; 128];
+        b.bytes = 128;
+        b.iter(|| {
+            gen.fill_bytes(&mut buffer);
+            buffer
+        });
+    }
+}
diff -Nru cargo-0.32.0/vendor/rdrand/benches/std.rs cargo-0.33.0/vendor/rdrand/benches/std.rs
--- cargo-0.32.0/vendor/rdrand/benches/std.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/benches/std.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,31 @@
+// #![feature(test)]
+// extern crate rand;
+// extern crate test;
+//
+// use test::Bencher;
+// use test::black_box;
+// use rand::Rng;
+// use rand::StdRng;
+// use rand::OsRng;
+//
+// // OsRng is supposed to be the default for crypto uses.
+// #[bench]
+// fn bench_osrng_u64(b : &mut Bencher) {
+//     if let Ok(mut gen) = OsRng::new() {
+//         b.bytes = 8;
+//         b.iter(|| {
+//             black_box(gen.next_u64());
+//         });
+//     }
+// }
+//
+// // StdRng is the default for everything else.
+// #[bench]
+// fn bench_stdrng_u64(b : &mut Bencher) {
+//     if let Ok(mut gen) = StdRng::new() {
+//         b.bytes = 8;
+//         b.iter(|| {
+//             gen.next_u64();
+//         });
+//     }
+// }
diff -Nru cargo-0.32.0/vendor/rdrand/.cargo-checksum.json cargo-0.33.0/vendor/rdrand/.cargo-checksum.json
--- cargo-0.32.0/vendor/rdrand/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rdrand/Cargo.toml cargo-0.33.0/vendor/rdrand/Cargo.toml
--- cargo-0.32.0/vendor/rdrand/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,28 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "rdrand"
+version = "0.4.0"
+authors = ["Simonas Kazlauskas <rdrand@kazlauskas.me>"]
+description = "An implementation of random number generator based on rdrand and rdseed instructions"
+documentation = "https://docs.rs/rdrand/0.4.0/"
+keywords = ["rand", "rdrand", "rdseed", "random"]
+license = "ISC"
+repository = "https://github.com/nagisa/rust_rdrand/"
+[dependencies.rand_core]
+version = "0.3"
+default-features = false
+
+[features]
+default = ["std"]
+std = []
diff -Nru cargo-0.32.0/vendor/rdrand/LICENSE cargo-0.33.0/vendor/rdrand/LICENSE
--- cargo-0.32.0/vendor/rdrand/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/LICENSE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,12 @@
+Copyright © 2014, Simonas Kazlauskas
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without
+fee is hereby granted, provided that the above copyright notice and this permission notice appear
+in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
diff -Nru cargo-0.32.0/vendor/rdrand/README.mkd cargo-0.33.0/vendor/rdrand/README.mkd
--- cargo-0.32.0/vendor/rdrand/README.mkd	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/README.mkd	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,8 @@
+An implementation of random number generators based on `rdrand` and `rdseed` instructions.
+
+The random number generators provided by this crate are fairly slow (the latency for these
+instructions is pretty high), but provide high quality random bits. Caveat is: neither AMD’s
+nor Intel’s designs are public and therefore are not verifiable for lack of backdoors.
+
+Unless you know what you are doing, use the random number generators provided by the `rand`
+crate (such as `EntropyRng`) instead.
diff -Nru cargo-0.32.0/vendor/rdrand/src/changelog.rs cargo-0.33.0/vendor/rdrand/src/changelog.rs
--- cargo-0.32.0/vendor/rdrand/src/changelog.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/src/changelog.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,25 @@
+//! Project changelog
+
+/// ## Breaking changes
+///
+/// Crate gained an enabled-by-default `std` feature. If you relied on rdrand being `core`-able
+/// change your dependency to appear as such:
+///
+/// ```toml
+/// rdrand = { version = "0.4", default-features = false }
+/// ```
+///
+/// This is done so that an advantage of the common feature detection functionality could be
+/// employed by users that are not constrained by `core`. This functionality is faster, caches the
+/// results and is shared between all users of the functionality.
+///
+/// For `core` usage the feature detection has also been improved and will not be done if e.g.
+/// crate is built with `rdrand` instructions enabled globally.
+pub mod r0_4_0 {}
+
+/// Crate now works on stable!
+///
+/// ## Breaking changes
+///
+/// * Updated to `rand_core = ^0.3`.
+pub mod r0_3_0 {}
diff -Nru cargo-0.32.0/vendor/rdrand/src/lib.rs cargo-0.33.0/vendor/rdrand/src/lib.rs
--- cargo-0.32.0/vendor/rdrand/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/rdrand/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,472 @@
+// Copyright © 2014, Simonas Kazlauskas <rdrand@kazlauskas.me>
+//
+// Permission to use, copy, modify, and/or distribute this software for any purpose with or without
+// fee is hereby granted, provided that the above copyright notice and this permission notice
+// appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+// SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+// OF THIS SOFTWARE.
+//! An implementation of random number generators based on `rdrand` and `rdseed` instructions.
+//!
+//! The random number generators provided by this crate are fairly slow (the latency for these
+//! instructions is pretty high), but provide high quality random bits. Caveat is: neither AMD’s
+//! nor Intel’s designs are public and therefore are not verifiable for lack of backdoors.
+//!
+//! Unless you know what you are doing, use the random number generators provided by the `rand`
+//! crate (such as `OsRng`) instead.
+//!
+//! Here are a measurements for select processor architectures. Check [Agner’s instruction tables]
+//! for up-to-date listings.
+//!
+//! <table>
+//!   <tr>
+//!     <th>Architecture</th>
+//!     <th colspan="3">Latency (cycles)</th>
+//!     <th>Maximum throughput (per core)</th>
+//!   </tr>
+//!   <tr>
+//!     <td></td>
+//!     <td>u16</td>
+//!     <td>u32</td>
+//!     <td>u64</td>
+//!     <td></td>
+//!   </tr>
+//!   <tr>
+//!     <td>AMD Ryzen</td>
+//!     <td>~1200</td>
+//!     <td>~1200</td>
+//!     <td>~2500</td>
+//!     <td>~12MB/s @ 3.7GHz</td>
+//!   </tr>
+//!   <tr>
+//!     <td>Intel Skylake</td>
+//!     <td>460</td>
+//!     <td>460</td>
+//!     <td>460</td>
+//!     <td>~72MB/s @ 4.2GHz</td>
+//!   </tr>
+//!   <tr>
+//!     <td>Intel Haswell</td>
+//!     <td>320</td>
+//!     <td>320</td>
+//!     <td>320</td>
+//!     <td>~110MB/s @ 4.4GHz</td>
+//!   </tr>
+//! </table>
+//!
+//! [Agner’s instruction tables]: http://agner.org/optimize/
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate rand_core;
+
+#[cfg(feature = "std")]
+extern crate core;
+
+pub mod changelog;
+
+use rand_core::{RngCore, CryptoRng, Error, ErrorKind};
+use core::slice;
+
+const RETRY_LIMIT: u8 = 127;
+
+#[cold]
+#[inline(never)]
+pub(crate) fn busy_loop_fail() -> ! {
+    panic!("hardware generator failure");
+}
+
+/// A cryptographically secure statistically uniform, non-periodic and non-deterministic random bit
+/// generator.
+///
+/// Note that this generator may be implemented using a deterministic algorithm that is reseeded
+/// routinely from a non-deterministic entropy source to achieve the desirable properties.
+///
+/// This generator is a viable replacement to any generator, however, since nobody has audited
+/// Intel or AMD hardware yet, the usual disclaimers as to their suitability apply.
+///
+/// It is potentially faster than `OsRng`, but is only supported on more recent Intel (Ivy Bridge
+/// and later) and AMD (Ryzen and later) processors.
+#[derive(Clone, Copy)]
+pub struct RdRand(());
+
+/// A cryptographically secure non-deterministic random bit generator.
+///
+/// This generator produces high-entropy output and is suited to seed other pseudo-random
+/// generators.
+///
+/// This instruction currently is only available in Intel Broadwell (and later) and AMD Ryzen
+/// processors.
+///
+/// This generator is not intended for general random number generation purposes and should be used
+/// to seed other generators implementing [rand_core::SeedableRng].
+#[derive(Clone, Copy)]
+pub struct RdSeed(());
+
+impl CryptoRng for RdRand {}
+impl CryptoRng for RdSeed {}
+
+mod arch {
+    #[cfg(target_arch = "x86_64")]
+    pub use core::arch::x86_64::*;
+    #[cfg(target_arch = "x86")]
+    pub use core::arch::x86::*;
+
+    #[cfg(target_arch = "x86")]
+    pub(crate) unsafe fn _rdrand64_step(dest: &mut u64) -> i32 {
+        let mut ret1: u32 = ::core::mem::uninitialized();
+        let mut ret2: u32 = ::core::mem::uninitialized();
+        if _rdrand32_step(&mut ret1) != 0 && _rdrand32_step(&mut ret2) != 0 {
+            *dest = (ret1 as u64) << 32 | (ret2 as u64);
+            1
+        } else {
+            0
+        }
+    }
+
+    #[cfg(target_arch = "x86")]
+    pub(crate) unsafe fn _rdseed64_step(dest: &mut u64) -> i32 {
+        let mut ret1: u32 = ::core::mem::uninitialized();
+        let mut ret2: u32 = ::core::mem::uninitialized();
+        if _rdseed32_step(&mut ret1) != 0 && _rdseed32_step(&mut ret2) != 0 {
+            *dest = (ret1 as u64) << 32 | (ret2 as u64);
+            1
+        } else {
+            0
+        }
+    }
+}
+
+#[cfg(not(feature = "std"))]
+macro_rules! is_x86_feature_detected {
+    ("rdrand") => {{
+        if cfg!(target_feature="rdrand") {
+            true
+        } else if cfg!(target_env = "sgx") {
+            false
+        } else {
+            const FLAG : u32 = 1 << 30;
+            unsafe { ::arch::__cpuid(1).ecx & FLAG == FLAG }
+        }
+    }};
+    ("rdseed") => {{
+        if cfg!(target_feature = "rdseed") {
+            true
+        } else if cfg!(target_env = "sgx") {
+            false
+        } else {
+            const FLAG : u32 = 1 << 18;
+            unsafe { ::arch::__cpuid(7).ebx & FLAG == FLAG }
+        }
+    }};
+}
+
+macro_rules! loop_rand {
+    ($el: ty, $step: path) => { {
+        let mut idx = 0;
+        loop {
+            let mut el: $el = ::core::mem::uninitialized();
+            if $step(&mut el) != 0 {
+                break Some(el);
+            } else if idx == RETRY_LIMIT {
+                break None;
+            }
+            idx += 1;
+        }
+    } }
+}
+
+macro_rules! impl_rand {
+    ($gen:ident, $feat:tt, $step16: path, $step32:path, $step64:path,
+     maxstep = $maxstep:path, maxty = $maxty: ty) => {
+        impl $gen {
+            /// Create a new instance of the random number generator.
+            ///
+            /// This constructor checks whether the CPU the program is running on supports the
+            /// instruction necessary for this generator to operate. If the instruction is not
+            /// supported, an error is returned.
+            pub fn new() -> Result<Self, Error> {
+                if is_x86_feature_detected!($feat) {
+                    Ok($gen(()))
+                } else {
+                    Err(Error::new(rand_core::ErrorKind::Unavailable,
+                                   "the instruction is not supported"))
+                }
+            }
+
+            /// Generate a single random `u16` value.
+            ///
+            /// The underlying instruction may fail for variety reasons (such as actual hardware
+            /// failure or exhausted entropy), however the exact reason for the failure is not
+            /// usually exposed.
+            ///
+            /// This method will retry calling the instruction a few times, however if all the
+            /// attempts fail, it will return `None`.
+            ///
+            /// In case `None` is returned, the caller should assume that an non-recoverable
+            /// hardware failure has occured and use another random number genrator instead.
+            #[inline(always)]
+            pub fn try_next_u16(&self) -> Option<u16> {
+                #[target_feature(enable = $feat)]
+                unsafe fn imp()
+                -> Option<u16> {
+                    loop_rand!(u16, $step16)
+                }
+                unsafe { imp() }
+            }
+
+            /// Generate a single random `u32` value.
+            ///
+            /// The underlying instruction may fail for variety reasons (such as actual hardware
+            /// failure or exhausted entropy), however the exact reason for the failure is not
+            /// usually exposed.
+            ///
+            /// This method will retry calling the instruction a few times, however if all the
+            /// attempts fail, it will return `None`.
+            ///
+            /// In case `None` is returned, the caller should assume that an non-recoverable
+            /// hardware failure has occured and use another random number genrator instead.
+            #[inline(always)]
+            pub fn try_next_u32(&self) -> Option<u32> {
+                #[target_feature(enable = $feat)]
+                unsafe fn imp()
+                -> Option<u32> {
+                    loop_rand!(u32, $step32)
+                }
+                unsafe { imp() }
+            }
+
+            /// Generate a single random `u64` value.
+            ///
+            /// The underlying instruction may fail for variety reasons (such as actual hardware
+            /// failure or exhausted entropy), however the exact reason for the failure is not
+            /// usually exposed.
+            ///
+            /// This method will retry calling the instruction a few times, however if all the
+            /// attempts fail, it will return `None`.
+            ///
+            /// In case `None` is returned, the caller should assume that an non-recoverable
+            /// hardware failure has occured and use another random number genrator instead.
+            ///
+            /// Note, that on 32-bit targets, there’s no underlying instruction to generate a
+            /// 64-bit number, so it is emulated with the 32-bit version of the instruction.
+            #[inline(always)]
+            pub fn try_next_u64(&self) -> Option<u64> {
+                #[target_feature(enable = $feat)]
+                unsafe fn imp()
+                -> Option<u64> {
+                    loop_rand!(u64, $step64)
+                }
+                unsafe { imp() }
+            }
+        }
+
+        impl RngCore for $gen {
+            /// Generate a single random `u32` value.
+            ///
+            /// The underlying instruction may fail for variety reasons (such as actual hardware
+            /// failure or exhausted entropy), however the exact reason for the failure is not
+            /// usually exposed.
+            ///
+            /// # Panic
+            ///
+            /// This method will retry calling the instruction a few times, however if all the
+            /// attempts fail, it will `panic`.
+            ///
+            /// In case `panic` occurs, the caller should assume that an non-recoverable
+            /// hardware failure has occured and use another random number genrator instead.
+            #[inline(always)]
+            fn next_u32(&mut self) -> u32 {
+                if let Some(result) = self.try_next_u32() {
+                    result
+                } else {
+                    busy_loop_fail()
+                }
+            }
+
+            /// Generate a single random `u64` value.
+            ///
+            /// The underlying instruction may fail for variety reasons (such as actual hardware
+            /// failure or exhausted entropy), however the exact reason for the failure is not
+            /// usually exposed.
+            ///
+            /// Note, that on 32-bit targets, there’s no underlying instruction to generate a
+            /// 64-bit number, so it is emulated with the 32-bit version of the instruction.
+            ///
+            /// # Panic
+            ///
+            /// This method will retry calling the instruction a few times, however if all the
+            /// attempts fail, it will `panic`.
+            ///
+            /// In case `panic` occurs, the caller should assume that an non-recoverable
+            /// hardware failure has occured and use another random number genrator instead.
+            #[inline(always)]
+            fn next_u64(&mut self) -> u64 {
+                if let Some(result) = self.try_next_u64() {
+                    result
+                } else {
+                    busy_loop_fail()
+                }
+            }
+
+            /// Fill a buffer `dest` with random data.
+            ///
+            /// See `try_fill_bytes` for a more extensive documentation.
+            ///
+            /// # Panic
+            ///
+            /// This method will panic any time `try_fill_bytes` would return an error.
+            #[inline(always)]
+            fn fill_bytes(&mut self, dest: &mut [u8]) {
+                if let Err(_) = self.try_fill_bytes(dest) {
+                    busy_loop_fail()
+                }
+            }
+
+            /// Fill a buffer `dest` with random data.
+            ///
+            /// This method will use the most appropriate variant of the instruction available on
+            /// the machine to achieve the greatest single-core throughput, however it has a
+            /// slightly higher setup cost than the plain `next_u32` or `next_u64` methods.
+            ///
+            /// The underlying instruction may fail for variety reasons (such as actual hardware
+            /// failure or exhausted entropy), however the exact reason for the failure is not
+            /// usually exposed.
+            ///
+            /// This method will retry calling the instruction a few times, however if all the
+            /// attempts fail, it will return an error.
+            ///
+            /// If an error is returned, the caller should assume that an non-recoverable hardware
+            /// failure has occured and use another random number genrator instead.
+            #[inline(always)]
+            fn try_fill_bytes(&mut self, dest: &mut [u8])
+            -> Result<(), Error> {
+                #[target_feature(enable = $feat)]
+                unsafe fn imp(dest: &mut [u8])
+                -> Result<(), Error>
+                {
+                    unsafe fn imp_less_fast(mut dest: &mut [u8], word: &mut $maxty,
+                                            buffer: &mut &[u8])
+                    -> Result<(), Error>
+                    {
+                        while !dest.is_empty() {
+                            if buffer.is_empty() {
+                                if let Some(w) = loop_rand!($maxty, $maxstep) {
+                                    *word = w;
+                                    *buffer = slice::from_raw_parts(
+                                        word as *const _ as *const u8,
+                                        ::core::mem::size_of::<$maxty>()
+                                    );
+                                } else {
+                                    return Err(Error::new(ErrorKind::Unexpected,
+                                                          "hardware generator failure"));
+                                }
+                            }
+
+                            let len = dest.len().min(buffer.len());
+                            let (copy_src, leftover) = buffer.split_at(len);
+                            let (copy_dest, dest_leftover) = { dest }.split_at_mut(len);
+                            *buffer = leftover;
+                            dest = dest_leftover;
+                            ::core::ptr::copy_nonoverlapping(
+                                copy_src.as_ptr(), copy_dest.as_mut_ptr(), len
+                            );
+                        }
+                        Ok(())
+                    }
+
+                    let destlen = dest.len();
+                    if destlen > ::core::mem::size_of::<$maxty>() {
+                            let (left, mid, right) = dest.align_to_mut();
+                            let mut word = 0;
+                            let mut buffer: &[u8] = &[];
+
+                            for el in mid {
+                                if let Some(val) = loop_rand!($maxty, $maxstep) {
+                                    *el = val;
+                                } else {
+                                    return Err(Error::new(ErrorKind::Unexpected,
+                                                          "hardware generator failure"));
+                                }
+                            }
+
+                            imp_less_fast(left, &mut word, &mut buffer)?;
+                            imp_less_fast(right, &mut word, &mut buffer)
+                    } else {
+                        let mut word = 0;
+                        let mut buffer: &[u8] = &[];
+                        imp_less_fast(dest, &mut word, &mut buffer)
+                    }
+                }
+                unsafe { imp(dest) }
+            }
+        }
+    }
+}
+
+#[cfg(target_arch = "x86_64")]
+impl_rand!(RdRand, "rdrand",
+           ::arch::_rdrand16_step, ::arch::_rdrand32_step, ::arch::_rdrand64_step,
+           maxstep = ::arch::_rdrand64_step, maxty = u64);
+#[cfg(target_arch = "x86_64")]
+impl_rand!(RdSeed, "rdseed",
+           ::arch::_rdseed16_step, ::arch::_rdseed32_step, ::arch::_rdseed64_step,
+           maxstep = ::arch::_rdseed64_step, maxty = u64);
+#[cfg(target_arch = "x86")]
+impl_rand!(RdRand, "rdrand",
+           ::arch::_rdrand16_step, ::arch::_rdrand32_step, ::arch::_rdrand64_step,
+           maxstep = ::arch::_rdrand32_step, maxty = u32);
+#[cfg(target_arch = "x86")]
+impl_rand!(RdSeed, "rdseed",
+           ::arch::_rdseed16_step, ::arch::_rdseed32_step, ::arch::_rdseed64_step,
+           maxstep = ::arch::_rdseed32_step, maxty = u32);
+
+#[test]
+fn rdrand_works() {
+    let _ = RdRand::new().map(|mut r| {
+        r.next_u32();
+        r.next_u64();
+    });
+}
+
+#[test]
+fn fill_fills_all_bytes() {
+    let _ = RdRand::new().map(|mut r| {
+        let mut peach;
+        let mut banana;
+        let mut start = 0;
+        let mut end = 128;
+        'outer: while start < end {
+            banana = [0; 128];
+            for _ in 0..512 {
+                peach = [0; 128];
+                r.fill_bytes(&mut peach[start..end]);
+                for (b, p) in banana.iter_mut().zip(peach.iter()) {
+                    *b = *b | *p;
+                }
+                if (&banana[start..end]).iter().all(|x| *x != 0) {
+                    assert!(banana[..start].iter().all(|x| *x == 0), "all other values must be 0");
+                    assert!(banana[end..].iter().all(|x| *x == 0), "all other values must be 0");
+                    if start < 17 {
+                        start += 1;
+                    } else {
+                        end -= 3;
+                    }
+                    continue 'outer;
+                }
+            }
+            panic!("wow, we broke it? {} {} {:?}", start, end, &banana[..])
+        }
+    });
+}
+
+#[test]
+fn rdseed_works() {
+    let _ = RdSeed::new().map(|mut r| {
+        r.next_u32();
+        r.next_u64();
+    });
+}
diff -Nru cargo-0.32.0/vendor/redox_syscall/.cargo-checksum.json cargo-0.33.0/vendor/redox_syscall/.cargo-checksum.json
--- cargo-0.32.0/vendor/redox_syscall/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"679da7508e9a6390aeaf7fbd02a800fdc64b73fe2204dd2c8ae66d22d9d5ad5d"}
\ No newline at end of file
+{"files":{},"package":"423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/redox_syscall/Cargo.toml cargo-0.33.0/vendor/redox_syscall/Cargo.toml
--- cargo-0.32.0/vendor/redox_syscall/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "redox_syscall"
-version = "0.1.43"
+version = "0.1.51"
 authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 description = "A Rust library to access raw Redox system calls"
 documentation = "https://docs.rs/redox_syscall"
diff -Nru cargo-0.32.0/vendor/redox_syscall/.cargo_vcs_info.json cargo-0.33.0/vendor/redox_syscall/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/redox_syscall/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "47f7b3abf01a80386ee4374c7a81e7f6b9755d32"
-  }
-}
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/arch/x86_64.rs cargo-0.33.0/vendor/redox_syscall/src/arch/x86_64.rs
--- cargo-0.32.0/vendor/redox_syscall/src/arch/x86_64.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/arch/x86_64.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,20 +1,20 @@
 use super::error::{Error, Result};
 
 pub unsafe fn syscall0(mut a: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
         : "{rax}"(a)
-        : "memory"
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
 }
 
 pub unsafe fn syscall1(mut a: usize, b: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
@@ -22,9 +22,9 @@
 
 // Clobbers all registers - special for clone
 pub unsafe fn syscall1_clobber(mut a: usize, b: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b)
+        : "{rax}"(a), "{rdi}"(b)
         : "memory", "rbx", "rcx", "rdx", "rsi", "rdi", "r8",
           "r9", "r10", "r11", "r12", "r13", "r14", "r15"
         : "intel", "volatile");
@@ -33,30 +33,30 @@
 }
 
 pub unsafe fn syscall2(mut a: usize, b: usize, c: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
 }
 
 pub unsafe fn syscall3(mut a: usize, b: usize, c: usize, d: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c), "{rdx}"(d)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
 }
 
 pub unsafe fn syscall4(mut a: usize, b: usize, c: usize, d: usize, e: usize) -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c), "{rdx}"(d), "{rsi}"(e)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d), "{r10}"(e)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
@@ -64,10 +64,10 @@
 
 pub unsafe fn syscall5(mut a: usize, b: usize, c: usize, d: usize, e: usize, f: usize)
                        -> Result<usize> {
-    asm!("int 0x80"
+    asm!("syscall"
         : "={rax}"(a)
-        : "{rax}"(a), "{rbx}"(b), "{rcx}"(c), "{rdx}"(d), "{rsi}"(e), "{rdi}"(f)
-        : "memory"
+        : "{rax}"(a), "{rdi}"(b), "{rsi}"(c), "{rdx}"(d), "{r10}"(e), "{r8}"(f)
+        : "rcx", "r11", "memory"
         : "intel", "volatile");
 
     Error::demux(a)
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/call.rs cargo-0.33.0/vendor/redox_syscall/src/call.rs
--- cargo-0.32.0/vendor/redox_syscall/src/call.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/call.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,5 @@
 use super::arch::*;
-use super::data::{SigAction, Stat, StatVfs, TimeSpec};
+use super::data::{Map, SigAction, Stat, StatVfs, TimeSpec};
 use super::error::Result;
 use super::number::*;
 
@@ -100,8 +100,8 @@
 }
 
 /// Map a file into memory
-pub unsafe fn fmap(fd: usize, offset: usize, size: usize) -> Result<usize> {
-    syscall3(SYS_FMAP, fd, offset, size)
+pub unsafe fn fmap(fd: usize, map: &Map) -> Result<usize> {
+    syscall3(SYS_FMAP, fd, map as *const Map as usize, mem::size_of::<Map>())
 }
 
 /// Unmap a memory-mapped file
@@ -230,6 +230,11 @@
     unsafe { syscall2(SYS_MKNS, schemes.as_ptr() as usize, schemes.len()) }
 }
 
+/// Change mapping flags
+pub unsafe fn mprotect(addr: usize, size: usize, flags: usize) -> Result<usize> {
+    syscall3(SYS_MPROTECT, addr, size, flags)
+}
+
 /// Sleep for the time specified in `req`
 pub fn nanosleep(req: &TimeSpec, rem: &mut TimeSpec) -> Result<usize> {
     unsafe { syscall2(SYS_NANOSLEEP, req as *const TimeSpec as usize,
@@ -322,6 +327,13 @@
                       restorer as usize) }
 }
 
+/// Get and/or set signal masks
+pub fn sigprocmask(how: usize, set: Option<&[u64; 2]>, oldset: Option<&mut [u64; 2]>) -> Result<usize> {
+    unsafe { syscall3(SYS_SIGPROCMASK, how,
+                      set.map(|x| x as *const _).unwrap_or_else(ptr::null) as usize,
+                      oldset.map(|x| x as *mut _).unwrap_or_else(ptr::null_mut) as usize) }
+}
+
 // Return from signal handler
 pub fn sigreturn() -> Result<usize> {
     unsafe { syscall0(SYS_SIGRETURN) }
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/data.rs cargo-0.33.0/vendor/redox_syscall/src/data.rs
--- cargo-0.32.0/vendor/redox_syscall/src/data.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/data.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2,6 +2,7 @@
 use core::{mem, slice};
 
 #[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
 pub struct Event {
     pub id: usize,
     pub flags: usize,
@@ -24,6 +25,57 @@
         }
     }
 }
+
+#[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
+pub struct ITimerSpec {
+    pub it_interval: TimeSpec,
+    pub it_value: TimeSpec,
+}
+
+impl Deref for ITimerSpec {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const ITimerSpec as *const u8,
+                                  mem::size_of::<ITimerSpec>()) as &[u8]
+        }
+    }
+}
+
+impl DerefMut for ITimerSpec {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut ITimerSpec as *mut u8,
+                                      mem::size_of::<ITimerSpec>()) as &mut [u8]
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, Default)]
+#[repr(C)]
+pub struct Map {
+    pub offset: usize,
+    pub size: usize,
+    pub flags: usize,
+}
+
+impl Deref for Map {
+    type Target = [u8];
+    fn deref(&self) -> &[u8] {
+        unsafe {
+            slice::from_raw_parts(self as *const Map as *const u8, mem::size_of::<Map>()) as &[u8]
+        }
+    }
+}
+
+impl DerefMut for Map {
+    fn deref_mut(&mut self) -> &mut [u8] {
+        unsafe {
+            slice::from_raw_parts_mut(self as *mut Map as *mut u8, mem::size_of::<Map>()) as &mut [u8]
+        }
+    }
+}
 
 #[derive(Copy, Clone, Debug, Default)]
 #[repr(C)]
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/flag.rs cargo-0.33.0/vendor/redox_syscall/src/flag.rs
--- cargo-0.32.0/vendor/redox_syscall/src/flag.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/flag.rs	2019-02-06 04:11:58.000000000 +0000
@@ -22,8 +22,8 @@
 pub const FUTEX_WAKE: usize = 1;
 pub const FUTEX_REQUEUE: usize = 2;
 
-pub const MAP_WRITE: usize = 1;
-pub const MAP_WRITE_COMBINE: usize = 2;
+pub const MAP_SHARED: usize = 0x0001;
+pub const MAP_PRIVATE: usize = 0x0002;
 
 pub const MODE_TYPE: u16 = 0xF000;
 pub const MODE_DIR: u16 = 0x4000;
@@ -55,6 +55,14 @@
 pub const O_NOFOLLOW: usize =   0x8000_0000;
 pub const O_ACCMODE: usize =    O_RDONLY | O_WRONLY | O_RDWR;
 
+pub const PHYSMAP_WRITE: usize = 1;
+pub const PHYSMAP_WRITE_COMBINE: usize = 2;
+
+pub const PROT_NONE: usize = 0x0000_0000;
+pub const PROT_EXEC: usize = 0x0001_0000;
+pub const PROT_WRITE: usize = 0x0002_0000;
+pub const PROT_READ: usize = 0x0004_0000;
+
 pub const SEEK_SET: usize = 0;
 pub const SEEK_CUR: usize = 1;
 pub const SEEK_END: usize = 2;
@@ -94,6 +102,10 @@
 pub const SIG_DFL: usize = 0;
 pub const SIG_IGN: usize = 1;
 
+pub const SIG_BLOCK: usize = 0;
+pub const SIG_UNBLOCK: usize = 1;
+pub const SIG_SETMASK: usize = 2;
+
 pub const SA_NOCLDSTOP: usize = 0x00000001;
 pub const SA_NOCLDWAIT: usize = 0x00000002;
 pub const SA_SIGINFO: usize =   0x00000004;
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/io/dma.rs cargo-0.33.0/vendor/redox_syscall/src/io/dma.rs
--- cargo-0.32.0/vendor/redox_syscall/src/io/dma.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/io/dma.rs	2019-02-06 04:11:58.000000000 +0000
@@ -32,7 +32,7 @@
 impl<T> Dma<T> {
     pub fn new(value: T) -> Result<Dma<T>> {
         let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { ::physmap(phys.address, phys.size, ::MAP_WRITE)? } as *mut T;
+        let virt = unsafe { ::physmap(phys.address, phys.size, ::PHYSMAP_WRITE)? } as *mut T;
         unsafe { ptr::write(virt, value); }
         Ok(Dma {
             phys: phys,
@@ -42,7 +42,7 @@
 
     pub fn zeroed() -> Result<Dma<T>> {
         let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { ::physmap(phys.address, phys.size, ::MAP_WRITE)? } as *mut T;
+        let virt = unsafe { ::physmap(phys.address, phys.size, ::PHYSMAP_WRITE)? } as *mut T;
         unsafe { ptr::write_bytes(virt as *mut u8, 0, phys.size); }
         Ok(Dma {
             phys: phys,
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/number.rs cargo-0.33.0/vendor/redox_syscall/src/number.rs
--- cargo-0.32.0/vendor/redox_syscall/src/number.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/number.rs	2019-02-06 04:11:58.000000000 +0000
@@ -27,7 +27,7 @@
 pub const SYS_FCNTL: usize =    SYS_CLASS_FILE | 55;
 pub const SYS_FEVENT: usize =   SYS_CLASS_FILE | 927;
 pub const SYS_FEXEC: usize =    SYS_CLASS_FILE | 11;
-pub const SYS_FMAP: usize =     SYS_CLASS_FILE | 90;
+pub const SYS_FMAP: usize =     SYS_CLASS_FILE | SYS_ARG_SLICE | 90;
 pub const SYS_FUNMAP: usize =   SYS_CLASS_FILE | 91;
 pub const SYS_FPATH: usize =    SYS_CLASS_FILE | SYS_ARG_MSLICE | 928;
 pub const SYS_FRENAME: usize =  SYS_CLASS_FILE | SYS_ARG_PATH | 38;
@@ -55,6 +55,7 @@
 pub const SYS_GETUID: usize =   199;
 pub const SYS_IOPL: usize =     110;
 pub const SYS_KILL: usize =     37;
+pub const SYS_MPROTECT: usize = 125;
 pub const SYS_MKNS: usize =     984;
 pub const SYS_NANOSLEEP: usize =162;
 pub const SYS_PHYSALLOC: usize =945;
@@ -68,6 +69,7 @@
 pub const SYS_SETRENS: usize =  952;
 pub const SYS_SETREUID: usize = 203;
 pub const SYS_SIGACTION: usize =67;
+pub const SYS_SIGPROCMASK:usize=126;
 pub const SYS_SIGRETURN: usize =119;
 pub const SYS_UMASK: usize =    60;
 pub const SYS_WAITPID: usize =  7;
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme_block_mut.rs cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme_block_mut.rs
--- cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme_block_mut.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme_block_mut.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,7 +20,11 @@
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
             SYS_FEVENT => self.fevent(packet.b, packet.c),
-            SYS_FMAP => self.fmap(packet.b, packet.c, packet.d),
+            SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
+                self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
@@ -111,7 +115,7 @@
     }
 
     #[allow(unused_variables)]
-    fn fmap(&mut self, id: usize, offset: usize, size: usize) -> Result<Option<usize>> {
+    fn fmap(&mut self, id: usize, map: &Map) -> Result<Option<usize>> {
         Err(Error::new(EBADF))
     }
 
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme_block.rs cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme_block.rs
--- cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme_block.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme_block.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,7 +20,11 @@
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
             SYS_FEVENT => self.fevent(packet.b, packet.c),
-            SYS_FMAP => self.fmap(packet.b, packet.c, packet.d),
+            SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
+                self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
@@ -111,7 +115,7 @@
     }
 
     #[allow(unused_variables)]
-    fn fmap(&self, id: usize, offset: usize, size: usize) -> Result<Option<usize>> {
+    fn fmap(&self, id: usize, map: &Map) -> Result<Option<usize>> {
         Err(Error::new(EBADF))
     }
 
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme_mut.rs cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme_mut.rs
--- cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme_mut.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme_mut.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,7 +20,11 @@
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
             SYS_FEVENT => self.fevent(packet.b, packet.c),
-            SYS_FMAP => self.fmap(packet.b, packet.c, packet.d),
+            SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
+                self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
@@ -111,7 +115,7 @@
     }
 
     #[allow(unused_variables)]
-    fn fmap(&mut self, id: usize, offset: usize, size: usize) -> Result<usize> {
+    fn fmap(&mut self, id: usize, map: &Map) -> Result<usize> {
         Err(Error::new(EBADF))
     }
 
diff -Nru cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme.rs cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme.rs
--- cargo-0.32.0/vendor/redox_syscall/src/scheme/scheme.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/redox_syscall/src/scheme/scheme.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,7 +20,11 @@
             SYS_FCHOWN => self.fchown(packet.b, packet.c as u32, packet.d as u32),
             SYS_FCNTL => self.fcntl(packet.b, packet.c, packet.d),
             SYS_FEVENT => self.fevent(packet.b, packet.c),
-            SYS_FMAP => self.fmap(packet.b, packet.c, packet.d),
+            SYS_FMAP => if packet.d >= mem::size_of::<Map>() {
+                self.fmap(packet.b, unsafe { &*(packet.c as *const Map) })
+            } else {
+                Err(Error::new(EFAULT))
+            },
             SYS_FPATH => self.fpath(packet.b, unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) }),
             SYS_FRENAME => self.frename(packet.b, unsafe { slice::from_raw_parts(packet.c as *const u8, packet.d) }, packet.uid, packet.gid),
             SYS_FSTAT => if packet.d >= mem::size_of::<Stat>() {
@@ -111,7 +115,7 @@
     }
 
     #[allow(unused_variables)]
-    fn fmap(&self, id: usize, offset: usize, size: usize) -> Result<usize> {
+    fn fmap(&self, id: usize, map: &Map) -> Result<usize> {
         Err(Error::new(EBADF))
     }
 
diff -Nru cargo-0.32.0/vendor/regex/.cargo_vcs_info.json cargo-0.33.0/vendor/regex/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/regex/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/regex/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "d4b9419ed41907d5e8b43166ce7aef77e6fb93d9"
-  }
-}
diff -Nru cargo-0.32.0/vendor/regex-syntax/.cargo-checksum.json cargo-0.33.0/vendor/regex-syntax/.cargo-checksum.json
--- cargo-0.32.0/vendor/regex-syntax/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/regex-syntax/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"}
\ No newline at end of file
+{"files":{},"package":"8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/regex-syntax/Cargo.toml cargo-0.33.0/vendor/regex-syntax/Cargo.toml
--- cargo-0.32.0/vendor/regex-syntax/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/regex-syntax/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "regex-syntax"
-version = "0.6.4"
+version = "0.6.5"
 authors = ["The Rust Project Developers"]
 description = "A regular expression parser."
 homepage = "https://github.com/rust-lang/regex"
diff -Nru cargo-0.32.0/vendor/regex-syntax/.cargo_vcs_info.json cargo-0.33.0/vendor/regex-syntax/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/regex-syntax/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/regex-syntax/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "b77e3fca8a320dbb0ba93637d13f63f41e011a0f"
-  }
-}
diff -Nru cargo-0.32.0/vendor/regex-syntax/src/hir/mod.rs cargo-0.33.0/vendor/regex-syntax/src/hir/mod.rs
--- cargo-0.32.0/vendor/regex-syntax/src/hir/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/regex-syntax/src/hir/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -222,6 +222,8 @@
         info.set_all_assertions(true);
         info.set_anchored_start(false);
         info.set_anchored_end(false);
+        info.set_line_anchored_start(false);
+        info.set_line_anchored_end(false);
         info.set_any_anchored_start(false);
         info.set_any_anchored_end(false);
         info.set_match_empty(true);
@@ -246,6 +248,8 @@
         info.set_all_assertions(false);
         info.set_anchored_start(false);
         info.set_anchored_end(false);
+        info.set_line_anchored_start(false);
+        info.set_line_anchored_end(false);
         info.set_any_anchored_start(false);
         info.set_any_anchored_end(false);
         info.set_match_empty(false);
@@ -262,6 +266,8 @@
         info.set_all_assertions(false);
         info.set_anchored_start(false);
         info.set_anchored_end(false);
+        info.set_line_anchored_start(false);
+        info.set_line_anchored_end(false);
         info.set_any_anchored_start(false);
         info.set_any_anchored_end(false);
         info.set_match_empty(false);
@@ -278,17 +284,27 @@
         info.set_all_assertions(true);
         info.set_anchored_start(false);
         info.set_anchored_end(false);
+        info.set_line_anchored_start(false);
+        info.set_line_anchored_end(false);
         info.set_any_anchored_start(false);
         info.set_any_anchored_end(false);
         info.set_match_empty(true);
         if let Anchor::StartText = anchor {
             info.set_anchored_start(true);
+            info.set_line_anchored_start(true);
             info.set_any_anchored_start(true);
         }
         if let Anchor::EndText = anchor {
             info.set_anchored_end(true);
+            info.set_line_anchored_end(true);
             info.set_any_anchored_end(true);
         }
+        if let Anchor::StartLine = anchor {
+            info.set_line_anchored_start(true);
+        }
+        if let Anchor::EndLine = anchor {
+            info.set_line_anchored_end(true);
+        }
         Hir {
             kind: HirKind::Anchor(anchor),
             info: info,
@@ -302,6 +318,8 @@
         info.set_all_assertions(true);
         info.set_anchored_start(false);
         info.set_anchored_end(false);
+        info.set_line_anchored_start(false);
+        info.set_line_anchored_end(false);
         info.set_any_anchored_start(false);
         info.set_any_anchored_end(false);
         // A negated word boundary matches the empty string, but a normal
@@ -330,6 +348,12 @@
         info.set_anchored_end(
             !rep.is_match_empty() && rep.hir.is_anchored_end()
         );
+        info.set_line_anchored_start(
+            !rep.is_match_empty() && rep.hir.is_anchored_start()
+        );
+        info.set_line_anchored_end(
+            !rep.is_match_empty() && rep.hir.is_anchored_end()
+        );
         info.set_any_anchored_start(rep.hir.is_any_anchored_start());
         info.set_any_anchored_end(rep.hir.is_any_anchored_end());
         info.set_match_empty(rep.is_match_empty() || rep.hir.is_match_empty());
@@ -346,6 +370,8 @@
         info.set_all_assertions(group.hir.is_all_assertions());
         info.set_anchored_start(group.hir.is_anchored_start());
         info.set_anchored_end(group.hir.is_anchored_end());
+        info.set_line_anchored_start(group.hir.is_line_anchored_start());
+        info.set_line_anchored_end(group.hir.is_line_anchored_end());
         info.set_any_anchored_start(group.hir.is_any_anchored_start());
         info.set_any_anchored_end(group.hir.is_any_anchored_end());
         info.set_match_empty(group.hir.is_match_empty());
@@ -361,7 +387,7 @@
     pub fn concat(mut exprs: Vec<Hir>) -> Hir {
         match exprs.len() {
             0 => Hir::empty(),
-            1 => exprs.pop().unwrap(),
+            1 => { exprs.pop().unwrap() }
             _ => {
                 let mut info = HirInfo::new();
                 info.set_always_utf8(true);
@@ -418,6 +444,24 @@
                         .any(|e| {
                             e.is_anchored_end()
                         }));
+                // Repeat the process for line anchors.
+                info.set_line_anchored_start(
+                    exprs.iter()
+                        .take_while(|e| {
+                            e.is_line_anchored_start() || e.is_all_assertions()
+                        })
+                        .any(|e| {
+                            e.is_line_anchored_start()
+                        }));
+                info.set_line_anchored_end(
+                    exprs.iter()
+                        .rev()
+                        .take_while(|e| {
+                            e.is_line_anchored_end() || e.is_all_assertions()
+                        })
+                        .any(|e| {
+                            e.is_line_anchored_end()
+                        }));
                 Hir {
                     kind: HirKind::Concat(exprs),
                     info: info,
@@ -439,6 +483,8 @@
                 info.set_all_assertions(true);
                 info.set_anchored_start(true);
                 info.set_anchored_end(true);
+                info.set_line_anchored_start(true);
+                info.set_line_anchored_end(true);
                 info.set_any_anchored_start(false);
                 info.set_any_anchored_end(false);
                 info.set_match_empty(false);
@@ -457,6 +503,14 @@
                     let x = info.is_anchored_end() && e.is_anchored_end();
                     info.set_anchored_end(x);
 
+                    let x = info.is_line_anchored_start()
+                        && e.is_line_anchored_start();
+                    info.set_line_anchored_start(x);
+
+                    let x = info.is_line_anchored_end()
+                        && e.is_line_anchored_end();
+                    info.set_line_anchored_end(x);
+
                     let x =
                         info.is_any_anchored_start()
                         || e.is_any_anchored_start();
@@ -551,6 +605,32 @@
         self.info.is_anchored_end()
     }
 
+    /// Return true if and only if this HIR is required to match from the
+    /// beginning of text or the beginning of a line. This includes expressions
+    /// like `^foo`, `(?m)^foo`, `^(foo|bar)`, `^(foo|bar)`, `(?m)^foo|^bar`
+    /// but not `^foo|bar` or `(?m)^foo|bar`.
+    ///
+    /// Note that if `is_anchored_start` is `true`, then
+    /// `is_line_anchored_start` will also be `true`. The reverse implication
+    /// is not true. For example, `(?m)^foo` is line anchored, but not
+    /// `is_anchored_start`.
+    pub fn is_line_anchored_start(&self) -> bool {
+        self.info.is_line_anchored_start()
+    }
+
+    /// Return true if and only if this HIR is required to match at the
+    /// end of text or the end of a line. This includes expressions like
+    /// `foo$`, `(?m)foo$`, `(foo|bar)$`, `(?m)(foo|bar)$`, `foo$|bar$`,
+    /// `(?m)(foo|bar)$`, but not `foo$|bar` or `(?m)foo$|bar`.
+    ///
+    /// Note that if `is_anchored_end` is `true`, then
+    /// `is_line_anchored_end` will also be `true`. The reverse implication
+    /// is not true. For example, `(?m)foo$` is line anchored, but not
+    /// `is_anchored_end`.
+    pub fn is_line_anchored_end(&self) -> bool {
+        self.info.is_line_anchored_end()
+    }
+
     /// Return true if and only if this HIR contains any sub-expression that
     /// is required to match at the beginning of text. Specifically, this
     /// returns true if the `^` symbol (when multiline mode is disabled) or the
@@ -1299,7 +1379,7 @@
     ///
     /// If more attributes need to be added, it is OK to increase the size of
     /// this as appropriate.
-    bools: u8,
+    bools: u16,
 }
 
 // A simple macro for defining bitfield accessors/mutators.
@@ -1330,9 +1410,11 @@
     define_bool!(1, is_all_assertions, set_all_assertions);
     define_bool!(2, is_anchored_start, set_anchored_start);
     define_bool!(3, is_anchored_end, set_anchored_end);
-    define_bool!(4, is_any_anchored_start, set_any_anchored_start);
-    define_bool!(5, is_any_anchored_end, set_any_anchored_end);
-    define_bool!(6, is_match_empty, set_match_empty);
+    define_bool!(4, is_line_anchored_start, set_line_anchored_start);
+    define_bool!(5, is_line_anchored_end, set_line_anchored_end);
+    define_bool!(6, is_any_anchored_start, set_any_anchored_start);
+    define_bool!(7, is_any_anchored_end, set_any_anchored_end);
+    define_bool!(8, is_match_empty, set_match_empty);
 }
 
 #[cfg(test)]
diff -Nru cargo-0.32.0/vendor/regex-syntax/src/hir/translate.rs cargo-0.33.0/vendor/regex-syntax/src/hir/translate.rs
--- cargo-0.32.0/vendor/regex-syntax/src/hir/translate.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/regex-syntax/src/hir/translate.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2414,40 +2414,68 @@
         // Positive examples.
         assert!(t(r"^").is_anchored_start());
         assert!(t(r"$").is_anchored_end());
+        assert!(t(r"^").is_line_anchored_start());
+        assert!(t(r"$").is_line_anchored_end());
 
         assert!(t(r"^^").is_anchored_start());
         assert!(t(r"$$").is_anchored_end());
+        assert!(t(r"^^").is_line_anchored_start());
+        assert!(t(r"$$").is_line_anchored_end());
 
         assert!(t(r"^$").is_anchored_start());
         assert!(t(r"^$").is_anchored_end());
+        assert!(t(r"^$").is_line_anchored_start());
+        assert!(t(r"^$").is_line_anchored_end());
 
         assert!(t(r"^foo").is_anchored_start());
         assert!(t(r"foo$").is_anchored_end());
+        assert!(t(r"^foo").is_line_anchored_start());
+        assert!(t(r"foo$").is_line_anchored_end());
 
         assert!(t(r"^foo|^bar").is_anchored_start());
         assert!(t(r"foo$|bar$").is_anchored_end());
+        assert!(t(r"^foo|^bar").is_line_anchored_start());
+        assert!(t(r"foo$|bar$").is_line_anchored_end());
 
         assert!(t(r"^(foo|bar)").is_anchored_start());
         assert!(t(r"(foo|bar)$").is_anchored_end());
+        assert!(t(r"^(foo|bar)").is_line_anchored_start());
+        assert!(t(r"(foo|bar)$").is_line_anchored_end());
 
         assert!(t(r"^+").is_anchored_start());
         assert!(t(r"$+").is_anchored_end());
+        assert!(t(r"^+").is_line_anchored_start());
+        assert!(t(r"$+").is_line_anchored_end());
         assert!(t(r"^++").is_anchored_start());
         assert!(t(r"$++").is_anchored_end());
+        assert!(t(r"^++").is_line_anchored_start());
+        assert!(t(r"$++").is_line_anchored_end());
         assert!(t(r"(^)+").is_anchored_start());
         assert!(t(r"($)+").is_anchored_end());
+        assert!(t(r"(^)+").is_line_anchored_start());
+        assert!(t(r"($)+").is_line_anchored_end());
 
         assert!(t(r"$^").is_anchored_start());
-        assert!(t(r"$^").is_anchored_end());
+        assert!(t(r"$^").is_anchored_start());
+        assert!(t(r"$^").is_line_anchored_end());
+        assert!(t(r"$^").is_line_anchored_end());
         assert!(t(r"$^|^$").is_anchored_start());
         assert!(t(r"$^|^$").is_anchored_end());
+        assert!(t(r"$^|^$").is_line_anchored_start());
+        assert!(t(r"$^|^$").is_line_anchored_end());
 
         assert!(t(r"\b^").is_anchored_start());
         assert!(t(r"$\b").is_anchored_end());
+        assert!(t(r"\b^").is_line_anchored_start());
+        assert!(t(r"$\b").is_line_anchored_end());
         assert!(t(r"^(?m:^)").is_anchored_start());
         assert!(t(r"(?m:$)$").is_anchored_end());
+        assert!(t(r"^(?m:^)").is_line_anchored_start());
+        assert!(t(r"(?m:$)$").is_line_anchored_end());
         assert!(t(r"(?m:^)^").is_anchored_start());
         assert!(t(r"$(?m:$)").is_anchored_end());
+        assert!(t(r"(?m:^)^").is_line_anchored_start());
+        assert!(t(r"$(?m:$)").is_line_anchored_end());
 
         // Negative examples.
         assert!(!t(r"(?m)^").is_anchored_start());
@@ -2459,21 +2487,53 @@
 
         assert!(!t(r"a^").is_anchored_start());
         assert!(!t(r"$a").is_anchored_start());
+        assert!(!t(r"a^").is_line_anchored_start());
+        assert!(!t(r"$a").is_line_anchored_start());
 
-        assert!(!t(r"a^").is_anchored_start());
-        assert!(!t(r"$a").is_anchored_start());
+        assert!(!t(r"a^").is_anchored_end());
+        assert!(!t(r"$a").is_anchored_end());
+        assert!(!t(r"a^").is_line_anchored_end());
+        assert!(!t(r"$a").is_line_anchored_end());
 
         assert!(!t(r"^foo|bar").is_anchored_start());
         assert!(!t(r"foo|bar$").is_anchored_end());
+        assert!(!t(r"^foo|bar").is_line_anchored_start());
+        assert!(!t(r"foo|bar$").is_line_anchored_end());
 
         assert!(!t(r"^*").is_anchored_start());
         assert!(!t(r"$*").is_anchored_end());
+        assert!(!t(r"^*").is_line_anchored_start());
+        assert!(!t(r"$*").is_line_anchored_end());
         assert!(!t(r"^*+").is_anchored_start());
         assert!(!t(r"$*+").is_anchored_end());
+        assert!(!t(r"^*+").is_line_anchored_start());
+        assert!(!t(r"$*+").is_line_anchored_end());
         assert!(!t(r"^+*").is_anchored_start());
         assert!(!t(r"$+*").is_anchored_end());
+        assert!(!t(r"^+*").is_line_anchored_start());
+        assert!(!t(r"$+*").is_line_anchored_end());
         assert!(!t(r"(^)*").is_anchored_start());
         assert!(!t(r"($)*").is_anchored_end());
+        assert!(!t(r"(^)*").is_line_anchored_start());
+        assert!(!t(r"($)*").is_line_anchored_end());
+    }
+
+    #[test]
+    fn analysis_is_line_anchored() {
+        assert!(t(r"(?m)^(foo|bar)").is_line_anchored_start());
+        assert!(t(r"(?m)(foo|bar)$").is_line_anchored_end());
+
+        assert!(t(r"(?m)^foo|^bar").is_line_anchored_start());
+        assert!(t(r"(?m)foo$|bar$").is_line_anchored_end());
+
+        assert!(t(r"(?m)^").is_line_anchored_start());
+        assert!(t(r"(?m)$").is_line_anchored_end());
+
+        assert!(t(r"(?m:^$)|$^").is_line_anchored_start());
+        assert!(t(r"(?m:^$)|$^").is_line_anchored_end());
+
+        assert!(t(r"$^|(?m:^$)").is_line_anchored_start());
+        assert!(t(r"$^|(?m:^$)").is_line_anchored_end());
     }
 
     #[test]
diff -Nru cargo-0.32.0/vendor/rustc-demangle/.cargo-checksum.json cargo-0.33.0/vendor/rustc-demangle/.cargo-checksum.json
--- cargo-0.32.0/vendor/rustc-demangle/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustc-demangle/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"}
\ No newline at end of file
+{"files":{},"package":"adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rustc-demangle/Cargo.toml cargo-0.33.0/vendor/rustc-demangle/Cargo.toml
--- cargo-0.32.0/vendor/rustc-demangle/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustc-demangle/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "rustc-demangle"
-version = "0.1.9"
+version = "0.1.13"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Rust compiler symbol demangling.\n"
 homepage = "https://github.com/alexcrichton/rustc-demangle"
diff -Nru cargo-0.32.0/vendor/rustc-demangle/src/lib.rs cargo-0.33.0/vendor/rustc-demangle/src/lib.rs
--- cargo-0.32.0/vendor/rustc-demangle/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustc-demangle/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -283,7 +283,7 @@
                     }
                 } else if rest.starts_with('$') {
                     macro_rules! demangle {
-                        ($($pat:expr => $demangled:expr),*) => ({
+                        ($($pat:expr => $demangled:expr,)*) => ({
                             $(if rest.starts_with($pat) {
                                 try!(f.write_str($demangled));
                                 rest = &rest[$pat.len()..];
@@ -319,7 +319,8 @@
                         "$u7d$" => "}",
                         "$u3b$" => ";",
                         "$u2b$" => "+",
-                        "$u22$" => "\""
+                        "$u21$" => "!",
+                        "$u22$" => "\"",
                     }
                 } else {
                     let idx = match rest.char_indices().find(|&(_, c)| c == '$' || c == '.') {
@@ -364,7 +365,14 @@
 
     fn ok(sym: &str, expected: &str) -> bool {
         match super::try_demangle(sym) {
-            Ok(s) => s.to_string() == expected,
+            Ok(s) => {
+                if s.to_string() == expected  {
+                    true
+                } else {
+                    println!("\n{}\n!=\n{}\n", s, expected);
+                    false
+                }
+            }
             Err(_) => {
                 println!("error demangling");
                 false
@@ -498,4 +506,12 @@
     fn handle_assoc_types() {
         t!("_ZN151_$LT$alloc..boxed..Box$LT$alloc..boxed..FnBox$LT$A$C$$u20$Output$u3d$R$GT$$u20$$u2b$$u20$$u27$a$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$9call_once17h69e8f44b3723e1caE", "<alloc::boxed::Box<alloc::boxed::FnBox<A, Output=R> + 'a> as core::ops::function::FnOnce<A>>::call_once::h69e8f44b3723e1ca");
     }
+
+    #[test]
+    fn handle_bang() {
+        t!(
+            "_ZN88_$LT$core..result..Result$LT$$u21$$C$$u20$E$GT$$u20$as$u20$std..process..Termination$GT$6report17hfc41d0da4a40b3e8E",
+            "<core::result::Result<!, E> as std::process::Termination>::report::hfc41d0da4a40b3e8"
+        );
+    }
 }
diff -Nru cargo-0.32.0/vendor/rustc-demangle/.travis.yml cargo-0.33.0/vendor/rustc-demangle/.travis.yml
--- cargo-0.32.0/vendor/rustc-demangle/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustc-demangle/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo build
-  - cargo test
-  - cargo doc
-after_success:
-  - travis-cargo --only nightly doc-upload
-notifications:
-  email:
-    on_success: never
-env:
-  global:
-    secure: "VWE8DaftZLOj34USRPiq2jyFV1xWrPJP0lgMVWPGF52soyWV6L5FyMlbk00GvKH8y5h0urtuVFmInsLKz1E96eTLbD7Efa2snjSlOWMsTaWy3yq0NNuPraMWiXUkjDBxW3DTV47HN9thYA7TbrM35A0XGr7fXKl4CPT/UKEo2nNZPb2Y2XYaD6RID1sXMOvemOERGu7Lnq8dQ/PdGWWkpTV4FVsmq2wTyyZnzsEFsK0r/wqEPPHSl8r3NH6Rid9kCMw3h1d9s1eYSqzP09/fYfjy+X/6iGV9dL5WUQFL7xG7WjfZZG/e87lAxbXx+jXTlncdvXjm4BmIOYHeEMK9N5D3qE5C1gIIU+tk6ZuVKBLWMQJnAIDJKCsVdUhAXtWqbFK4djvNJUml1rIOF/CVUeynBVtacJ8nlxyh61XvDHbZGSBFBR2odEkhUaLzw/t/zqOIYd0u+mjtM4pX1nZ+ZFIMqVFsNTfVWWMDLyRVBNiAoHCdn/ug+mJJaYE3mZ2q1wPPqJVFffyaZVyg97zFO0y9v5ASHjb/7nYlIPoDGDPDUuoscuw5IYf+6CoCi7EgGqg5v7X1BsBXSYK+XfzOvrAqP31ixNGyVJEcBjAaJXwopx6KVIqWe71eHJDX68VeI0ncfCPDDQIReKA7MBhq5PzRDzr4iRHZAhNyuKgo+Fo="
diff -Nru cargo-0.32.0/vendor/rustc_version/.travis.yml cargo-0.33.0/vendor/rustc_version/.travis.yml
--- cargo-0.32.0/vendor/rustc_version/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustc_version/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-language: rust
-rust:
-- nightly
-- beta
-- stable
-before_script:
-- |
-  pip install 'travis-cargo<0.2' --user &&
-  export PATH=$HOME/.local/bin:$PATH
-script:
-- |
-  travis-cargo build &&
-  travis-cargo test &&
-  travis-cargo bench &&
-  travis-cargo --only stable doc
-after_success:
-- travis-cargo --only stable doc-upload
-env:
-  global:
-  - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-  - secure: mxQyrd6tyvcC10H7crLgKSSRHwquSnLb5mjzaj8iXf4mkooKpoRaffIiwmGf0IACQUN3nKlA6D6irfD2CqaFiUiUav8RqeAd8FjHFTlYu0nKZkqB1iGZBA7/JrW7mlGJIdmNIbzVRoPRQI/lY/730M/eqxIAb+9/xaSktkD2cJYGUikdiyeTm8idezkB+BOOWIN20yopLWzmBIVs7doQJOA0ewqMlEduwn6axvEk17r9qlSgucywDsTvDWkXSAuYldyJU4PdFez4t10sGsXx+TKfbwcaRmwaOj/MImZUVCtQvutEW9Hb/2hJXjCN2uefZ64BfodKn3wyB7ie7PgOixsLkqoR01d/qbfDsWGg/4iLi3DCq5bVtWJoCCT4lS8kfwi8D8HmvcoCQnT+CdU4LhlV9aHTSEMx0SEJW0DHYE/RnoqJjCj+QsK4ji7HAnyYWVwSGYJfnrL0EAwKararAzKY/vABStJKu1IlBzKCsjIQ+0hMpqnFiWldhfRHt/rYhBtK+HYXElamc8xpF/taK8E40NSHDgC+4TciTAZtyAXOWiMhXS0653U3hvJqYY/LtHmobpIqc1XkHe53gQ0QrBd6UsyUN9FjWOLxvPUx4zcyNFJHXcFiwevfK6gYF+OXepVu8TznAQLSP7ToA7KXbhSSVQDM+7UFVcT41VgDbGY=
diff -Nru cargo-0.32.0/vendor/rustfix/.appveyor.yml cargo-0.33.0/vendor/rustfix/.appveyor.yml
--- cargo-0.32.0/vendor/rustfix/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-environment:
-  matrix:
-    - TARGET: x86_64-pc-windows-msvc
-
-install:
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -V
-  - cargo -V
-  - del rustup-init.exe
-
-build: false
-
-test_script:
-  - cargo test --all
diff -Nru cargo-0.32.0/vendor/rustfix/.cargo-checksum.json cargo-0.33.0/vendor/rustfix/.cargo-checksum.json
--- cargo-0.32.0/vendor/rustfix/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"756567f00f7d89c9f89a5c401b8b1caaa122e27240b9eaadd0bb52ee0b680b1b"}
\ No newline at end of file
+{"files":{},"package":"af7c21531a91512a4a51b490be6ba1c8eff34fdda0dc5bf87dc28d86748aac56"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/rustfix/Cargo.toml cargo-0.33.0/vendor/rustfix/Cargo.toml
--- cargo-0.32.0/vendor/rustfix/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "rustfix"
-version = "0.4.2"
+version = "0.4.4"
 authors = ["Pascal Hertleif <killercup@gmail.com>", "Oliver Schneider <oli-obk@users.noreply.github.com>"]
 exclude = ["etc/*", "examples/*", "tests/*"]
 description = "Automatically apply the suggestions made by rustc"
@@ -21,7 +21,7 @@
 license = "Apache-2.0/MIT"
 repository = "https://github.com/rust-lang-nursery/rustfix"
 [dependencies.failure]
-version = "0.1.1"
+version = "0.1.2"
 
 [dependencies.log]
 version = "0.4.1"
diff -Nru cargo-0.32.0/vendor/rustfix/.editorconfig cargo-0.33.0/vendor/rustfix/.editorconfig
--- cargo-0.32.0/vendor/rustfix/.editorconfig	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/.editorconfig	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-
-[*.rs]
-indent_style = space
-indent_size = 4
-
-[*.toml]
-indent_style = space
-indent_size = 4
-
-[*.md]
-trim_trailing_whitespace = false
diff -Nru cargo-0.32.0/vendor/rustfix/Readme.md cargo-0.33.0/vendor/rustfix/Readme.md
--- cargo-0.32.0/vendor/rustfix/Readme.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/Readme.md	2019-02-06 04:11:58.000000000 +0000
@@ -25,7 +25,7 @@
 ## Using `cargo fix` to transition to Rust 2018
 
 Instructions on how to use this tool to transition a crate to Rust 2018 can be
-found [in the Rust Edition Guide.](https://rust-lang-nursery.github.io/edition-guide/editions/transitioning.html)
+found [in the Rust Edition Guide.](https://rust-lang-nursery.github.io/edition-guide/editions/transitioning-an-existing-project-to-a-new-edition.html)
 
 ## License
 
diff -Nru cargo-0.32.0/vendor/rustfix/src/diagnostics.rs cargo-0.33.0/vendor/rustfix/src/diagnostics.rs
--- cargo-0.32.0/vendor/rustfix/src/diagnostics.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/src/diagnostics.rs	2019-02-06 04:11:58.000000000 +0000
@@ -15,7 +15,7 @@
     /// The message as rustc would render it. Currently this is only
     /// `Some` for "suggestions", but eventually it will include all
     /// snippets.
-    rendered: Option<String>,
+    pub rendered: Option<String>,
 }
 
 #[derive(Deserialize, Debug)]
diff -Nru cargo-0.32.0/vendor/rustfix/.travis.yml cargo-0.33.0/vendor/rustfix/.travis.yml
--- cargo-0.32.0/vendor/rustfix/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rustfix/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-language: rust
-rust:
-  - nightly
-script:
-  - cargo test --all
-  - cargo test --all -- --ignored
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/rusty-fork/.travis.yml cargo-0.33.0/vendor/rusty-fork/.travis.yml
--- cargo-0.32.0/vendor/rusty-fork/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/rusty-fork/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-language: rust
-sudo: false
-dist: trusty
-rust:
-- 1.22.1
-- stable
-- beta
-- nightly
-
-cache: cargo
diff -Nru cargo-0.32.0/vendor/ryu/.cargo_vcs_info.json cargo-0.33.0/vendor/ryu/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/ryu/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ryu/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "5edafe24373c9884609fc2e04c0eba0770df47a8"
-  }
-}
diff -Nru cargo-0.32.0/vendor/ryu/.travis.yml cargo-0.33.0/vendor/ryu/.travis.yml
--- cargo-0.32.0/vendor/ryu/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ryu/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-language: rust
-
-rust:
-  - nightly
-  - beta
-  - stable
-
-matrix:
-  include:
-    - rust: 1.15.0
-      script:
-        - cargo build
-        - cargo build --features small
diff -Nru cargo-0.32.0/vendor/same-file/.cargo_vcs_info.json cargo-0.33.0/vendor/same-file/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/same-file/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/same-file/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "f553ec5b520764d2f63ddae89789e7f418dd4fc3"
-  }
-}
diff -Nru cargo-0.32.0/vendor/schannel/.cargo_vcs_info.json cargo-0.33.0/vendor/schannel/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/schannel/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/schannel/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "d46a4dafe2147c44b53cba91cc3fd999ee28f21e"
-  }
-}
diff -Nru cargo-0.32.0/vendor/scopeguard/.travis.yml cargo-0.33.0/vendor/scopeguard/.travis.yml
--- cargo-0.32.0/vendor/scopeguard/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/scopeguard/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-language: rust
-sudo: false
-
-rust:
-  - 1.11.0
-  - stable
-  - beta
-  - nightly
-
-branches:
-  only:
-    - master
-
-# the main build
-script:
-  - |
-      cargo build --no-default-features &&
-      cargo build &&
-      ([ "$TRAVIS_RUST_VERSION" != "1.11.0" ] && cargo test ) || cargo test --lib
diff -Nru cargo-0.32.0/vendor/semver/.travis.yml cargo-0.33.0/vendor/semver/.travis.yml
--- cargo-0.32.0/vendor/semver/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/semver/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-language: rust
-rust:
-  - nightly
-  - beta
-  - stable
-sudo: false
-script:
-  - cargo build --verbose
-  - cargo test --verbose --features ci
-addons:
-  apt:
-    sources:
-      - kalakris-cmake
-    packages:
-      - cmake
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/serde/build.rs cargo-0.33.0/vendor/serde/build.rs
--- cargo-0.32.0/vendor/serde/build.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/build.rs	2019-02-06 04:11:58.000000000 +0000
@@ -14,6 +14,15 @@
     let target = env::var("TARGET").unwrap();
     let emscripten = target == "asmjs-unknown-emscripten" || target == "wasm32-unknown-emscripten";
 
+    // std::collections::Bound was stabilized in Rust 1.17
+    // but it was moved to core::ops later in Rust 1.26:
+    // https://doc.rust-lang.org/core/ops/enum.Bound.html
+    if minor >= 26 {
+        println!("cargo:rustc-cfg=ops_bound");
+    } else if minor >= 17 && cfg!(feature = "std") {
+        println!("cargo:rustc-cfg=collections_bound");
+    }
+
     // CString::into_boxed_c_str stabilized in Rust 1.20:
     // https://doc.rust-lang.org/std/ffi/struct.CString.html#method.into_boxed_c_str
     if minor >= 20 {
diff -Nru cargo-0.32.0/vendor/serde/.cargo-checksum.json cargo-0.33.0/vendor/serde/.cargo-checksum.json
--- cargo-0.32.0/vendor/serde/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"6fa52f19aee12441d5ad11c9a00459122bd8f98707cadf9778c540674f1935b6"}
\ No newline at end of file
+{"files":{},"package":"2e20fde37801e83c891a2dc4ebd3b81f0da4d1fb67a9e0a2a3b921e2536a58ee"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/serde/Cargo.toml cargo-0.33.0/vendor/serde/Cargo.toml
--- cargo-0.32.0/vendor/serde/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "serde"
-version = "1.0.82"
+version = "1.0.87"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 build = "build.rs"
 include = ["Cargo.toml", "build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
@@ -24,6 +24,8 @@
 categories = ["encoding"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/serde-rs/serde"
+[package.metadata.playground]
+features = ["derive", "rc"]
 [dependencies.serde_derive]
 version = "1.0"
 optional = true
diff -Nru cargo-0.32.0/vendor/serde/.cargo_vcs_info.json cargo-0.33.0/vendor/serde/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/serde/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "c2591e9b39ae36954699380a5b881963a581a8be"
-  }
-}
diff -Nru cargo-0.32.0/vendor/serde/crates-io.md cargo-0.33.0/vendor/serde/crates-io.md
--- cargo-0.32.0/vendor/serde/crates-io.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/crates-io.md	2019-02-06 04:11:58.000000000 +0000
@@ -16,11 +16,7 @@
 ## Serde in action
 
 ```rust
-#[macro_use]
-extern crate serde_derive;
-
-extern crate serde;
-extern crate serde_json;
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct Point {
diff -Nru cargo-0.32.0/vendor/serde/README.md cargo-0.33.0/vendor/serde/README.md
--- cargo-0.32.0/vendor/serde/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -25,19 +25,17 @@
 <details>
 <summary>
 Click to show Cargo.toml.
-<a href="https://play.rust-lang.org/?gist=9003c5b88c1f4989941925d7190c6eec" target="_blank">Run this code in the playground.</a>
+<a href="https://play.rust-lang.org/?edition=2018&gist=72755f28f99afc95e01d63174b28c1f5" target="_blank">Run this code in the playground.</a>
 </summary>
 
 ```toml
 [dependencies]
 
 # The core APIs, including the Serialize and Deserialize traits. Always
-# required when using Serde.
-serde = "1.0"
-
-# Support for #[derive(Serialize, Deserialize)]. Required if you want Serde
-# to work for structs and enums defined in your crate.
-serde_derive = "1.0"
+# required when using Serde. The "derive" feature is only required when
+# using #[derive(Serialize, Deserialize)] to make Serde work with structs
+# and enums defined in your crate.
+serde = { version = "1.0", features = ["derive"] }
 
 # Each data format lives in its own crate; the sample code below uses JSON
 # but you may be using a different one.
@@ -48,11 +46,7 @@
 <p></p>
 
 ```rust
-#[macro_use]
-extern crate serde_derive;
-
-extern crate serde;
-extern crate serde_json;
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct Point {
diff -Nru cargo-0.32.0/vendor/serde/src/de/ignored_any.rs cargo-0.33.0/vendor/serde/src/de/ignored_any.rs
--- cargo-0.32.0/vendor/serde/src/de/ignored_any.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/de/ignored_any.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,7 +8,7 @@
 /// any type, except that it does not store any information about the data that
 /// gets deserialized.
 ///
-/// ```rust
+/// ```edition2018
 /// use std::fmt;
 /// use std::marker::PhantomData;
 ///
@@ -21,7 +21,7 @@
 /// ///
 /// /// For example to deserialize only the element at index 3:
 /// ///
-/// /// ```rust
+/// /// ```
 /// /// NthElement::new(3).deserialize(deserializer)
 /// /// ```
 /// pub struct NthElement<T> {
diff -Nru cargo-0.32.0/vendor/serde/src/de/impls.rs cargo-0.33.0/vendor/serde/src/de/impls.rs
--- cargo-0.32.0/vendor/serde/src/de/impls.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/de/impls.rs	2019-02-06 04:11:58.000000000 +0000
@@ -2269,6 +2269,117 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#[cfg(any(ops_bound, collections_bound))]
+impl<'de, T> Deserialize<'de> for Bound<T>
+where
+    T: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        enum Field {
+            Unbounded,
+            Included,
+            Excluded,
+        }
+
+        impl<'de> Deserialize<'de> for Field {
+            #[inline]
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: Deserializer<'de>,
+            {
+                struct FieldVisitor;
+
+                impl<'de> Visitor<'de> for FieldVisitor {
+                    type Value = Field;
+
+                    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                        formatter.write_str("`Unbounded`, `Included` or `Excluded`")
+                    }
+
+                    fn visit_u32<E>(self, value: u32) -> Result<Self::Value, E>
+                    where
+                        E: Error,
+                    {
+                        match value {
+                            0 => Ok(Field::Unbounded),
+                            1 => Ok(Field::Included),
+                            2 => Ok(Field::Excluded),
+                            _ => Err(Error::invalid_value(
+                                Unexpected::Unsigned(value as u64),
+                                &self,
+                            )),
+                        }
+                    }
+
+                    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+                    where
+                        E: Error,
+                    {
+                        match value {
+                            "Unbounded" => Ok(Field::Unbounded),
+                            "Included" => Ok(Field::Included),
+                            "Excluded" => Ok(Field::Excluded),
+                            _ => Err(Error::unknown_variant(value, VARIANTS)),
+                        }
+                    }
+
+                    fn visit_bytes<E>(self, value: &[u8]) -> Result<Self::Value, E>
+                    where
+                        E: Error,
+                    {
+                        match value {
+                            b"Unbounded" => Ok(Field::Unbounded),
+                            b"Included" => Ok(Field::Included),
+                            b"Excluded" => Ok(Field::Excluded),
+                            _ => match str::from_utf8(value) {
+                                Ok(value) => Err(Error::unknown_variant(value, VARIANTS)),
+                                Err(_) => {
+                                    Err(Error::invalid_value(Unexpected::Bytes(value), &self))
+                                }
+                            },
+                        }
+                    }
+                }
+
+                deserializer.deserialize_identifier(FieldVisitor)
+            }
+        }
+
+        struct BoundVisitor<T>(PhantomData<Bound<T>>);
+
+        impl<'de, T> Visitor<'de> for BoundVisitor<T>
+        where
+            T: Deserialize<'de>,
+        {
+            type Value = Bound<T>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("enum Bound")
+            }
+
+            fn visit_enum<A>(self, data: A) -> Result<Self::Value, A::Error>
+            where
+                A: EnumAccess<'de>,
+            {
+                match try!(data.variant()) {
+                    (Field::Unbounded, v) => v.unit_variant().map(|()| Bound::Unbounded),
+                    (Field::Included, v) => v.newtype_variant().map(Bound::Included),
+                    (Field::Excluded, v) => v.newtype_variant().map(Bound::Excluded),
+                }
+            }
+        }
+
+        const VARIANTS: &'static [&'static str] = &["Unbounded", "Included", "Excluded"];
+
+        deserializer.deserialize_enum("Bound", VARIANTS, BoundVisitor(PhantomData))
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 macro_rules! nonzero_integers {
     ( $( $T: ident, )+ ) => {
         $(
diff -Nru cargo-0.32.0/vendor/serde/src/de/mod.rs cargo-0.33.0/vendor/serde/src/de/mod.rs
--- cargo-0.32.0/vendor/serde/src/de/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/de/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -89,6 +89,7 @@
 //!    - PathBuf
 //!    - Range\<T\>
 //!    - RangeInclusive\<T\>
+//!    - Bound\<T\>
 //!    - num::NonZero*
 //!    - `!` *(unstable)*
 //!  - **Net types**:
@@ -153,7 +154,7 @@
             ///
             /// The message should not be capitalized and should not end with a period.
             ///
-            /// ```rust
+            /// ```edition2018
             /// # use std::str::FromStr;
             /// #
             /// # struct IpAddr;
@@ -173,7 +174,7 @@
             ///     where
             ///         D: Deserializer<'de>,
             ///     {
-            ///         let s = try!(String::deserialize(deserializer));
+            ///         let s = String::deserialize(deserializer)?;
             ///         s.parse().map_err(de::Error::custom)
             ///     }
             /// }
@@ -237,12 +238,16 @@
             #[cold]
             fn unknown_variant(variant: &str, expected: &'static [&'static str]) -> Self {
                 if expected.is_empty() {
-                    Error::custom(format_args!("unknown variant `{}`, there are no variants",
-                                               variant))
+                    Error::custom(format_args!(
+                        "unknown variant `{}`, there are no variants",
+                        variant
+                    ))
                 } else {
-                    Error::custom(format_args!("unknown variant `{}`, expected {}",
-                                               variant,
-                                               OneOf { names: expected }))
+                    Error::custom(format_args!(
+                        "unknown variant `{}`, expected {}",
+                        variant,
+                        OneOf { names: expected }
+                    ))
                 }
             }
 
@@ -251,12 +256,16 @@
             #[cold]
             fn unknown_field(field: &str, expected: &'static [&'static str]) -> Self {
                 if expected.is_empty() {
-                    Error::custom(format_args!("unknown field `{}`, there are no fields",
-                                               field))
+                    Error::custom(format_args!(
+                        "unknown field `{}`, there are no fields",
+                        field
+                    ))
                 } else {
-                    Error::custom(format_args!("unknown field `{}`, expected {}",
-                                               field,
-                                               OneOf { names: expected }))
+                    Error::custom(format_args!(
+                        "unknown field `{}`, expected {}",
+                        field,
+                        OneOf { names: expected }
+                    ))
                 }
             }
 
@@ -290,7 +299,7 @@
 /// This is used as an argument to the `invalid_type`, `invalid_value`, and
 /// `invalid_length` methods of the `Error` trait to build error messages.
 ///
-/// ```rust
+/// ```edition2018
 /// # use std::fmt;
 /// #
 /// # use serde::de::{self, Unexpected, Visitor};
@@ -415,7 +424,7 @@
 /// Within the context of a `Visitor` implementation, the `Visitor` itself
 /// (`&self`) is an implementation of this trait.
 ///
-/// ```rust
+/// ```edition2018
 /// # use std::fmt;
 /// #
 /// # use serde::de::{self, Unexpected, Visitor};
@@ -440,7 +449,7 @@
 ///
 /// Outside of a `Visitor`, `&"..."` can be used.
 ///
-/// ```rust
+/// ```edition2018
 /// # use serde::de::{self, Unexpected};
 /// #
 /// # fn example<E>() -> Result<(), E>
@@ -561,7 +570,7 @@
 /// from the input string, but a `from_reader` function may only deserialize
 /// owned data.
 ///
-/// ```rust
+/// ```edition2018
 /// # use serde::de::{Deserialize, DeserializeOwned};
 /// # use std::io::{Read, Result};
 /// #
@@ -600,7 +609,7 @@
 ///
 /// The canonical API for stateless deserialization looks like this:
 ///
-/// ```rust
+/// ```edition2018
 /// # use serde::Deserialize;
 /// #
 /// # enum Error {}
@@ -614,7 +623,7 @@
 /// Adjusting an API like this to support stateful deserialization is a matter
 /// of accepting a seed as input:
 ///
-/// ```rust
+/// ```edition2018
 /// # use serde::de::DeserializeSeed;
 /// #
 /// # enum Error {}
@@ -647,7 +656,7 @@
 /// into it. This requires stateful deserialization using the `DeserializeSeed`
 /// trait.
 ///
-/// ```rust
+/// ```edition2018
 /// use std::fmt;
 /// use std::marker::PhantomData;
 ///
@@ -1137,7 +1146,7 @@
     /// human-readable one and binary formats like Bincode will prefer the
     /// compact one.
     ///
-    /// ```
+    /// ```edition2018
     /// # use std::ops::Add;
     /// # use std::str::FromStr;
     /// #
@@ -1214,7 +1223,7 @@
 ///
 /// # Example
 ///
-/// ```rust
+/// ```edition2018
 /// # use std::fmt;
 /// #
 /// # use serde::de::{self, Unexpected, Visitor};
@@ -1255,7 +1264,7 @@
     /// "an integer between 0 and 64". The message should not be capitalized and
     /// should not end with a period.
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use std::fmt;
     /// #
     /// # struct S {
@@ -1996,7 +2005,7 @@
     /// If the data contains a different type of variant, the following
     /// `invalid_type` error should be constructed:
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected};
     /// #
     /// # struct X;
@@ -2036,7 +2045,7 @@
     /// If the data contains a different type of variant, the following
     /// `invalid_type` error should be constructed:
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected};
     /// #
     /// # struct X;
@@ -2092,7 +2101,7 @@
     /// If the data contains a different type of variant, the following
     /// `invalid_type` error should be constructed:
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected};
     /// #
     /// # struct X;
@@ -2139,7 +2148,7 @@
     /// If the data contains a different type of variant, the following
     /// `invalid_type` error should be constructed:
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected};
     /// #
     /// # struct X;
@@ -2199,14 +2208,10 @@
 ///
 /// # Example
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate serde_derive;
-///
-/// extern crate serde;
-///
+/// ```edition2018
 /// use std::str::FromStr;
-/// use serde::de::{value, Deserialize, IntoDeserializer};
+/// use serde::Deserialize;
+/// use serde::de::{value, IntoDeserializer};
 ///
 /// #[derive(Deserialize)]
 /// enum Setting {
@@ -2221,8 +2226,6 @@
 ///         Self::deserialize(s.into_deserializer())
 ///     }
 /// }
-/// #
-/// # fn main() {}
 /// ```
 pub trait IntoDeserializer<'de, E: Error = value::Error> {
     /// The type of the deserializer being converted into.
diff -Nru cargo-0.32.0/vendor/serde/src/de/value.rs cargo-0.33.0/vendor/serde/src/de/value.rs
--- cargo-0.32.0/vendor/serde/src/de/value.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/de/value.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,14 +1,10 @@
 //! Building blocks for deserializing basic values using the `IntoDeserializer`
 //! trait.
 //!
-//! ```rust
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
-//! extern crate serde;
-//!
+//! ```edition2018
 //! use std::str::FromStr;
-//! use serde::de::{value, Deserialize, IntoDeserializer};
+//! use serde::Deserialize;
+//! use serde::de::{value, IntoDeserializer};
 //!
 //! #[derive(Deserialize)]
 //! enum Setting {
@@ -23,8 +19,6 @@
 //!         Self::deserialize(s.into_deserializer())
 //!     }
 //! }
-//! #
-//! # fn main() {}
 //! ```
 
 use lib::*;
diff -Nru cargo-0.32.0/vendor/serde/src/integer128.rs cargo-0.33.0/vendor/serde/src/integer128.rs
--- cargo-0.32.0/vendor/serde/src/integer128.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/integer128.rs	2019-02-06 04:11:58.000000000 +0000
@@ -9,14 +9,12 @@
 /// do not need to bother with this macro and may assume support for 128-bit
 /// integers.
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate serde;
-///
-/// use serde::Serializer;
+/// ```edition2018
 /// # use serde::private::ser::Error;
 /// #
 /// # struct MySerializer;
+/// #
+/// use serde::{serde_if_integer128, Serializer};
 ///
 /// impl Serializer for MySerializer {
 ///     type Ok = ();
@@ -41,20 +39,18 @@
 ///         }
 ///     }
 /// #
-/// #     __serialize_unimplemented! {
+/// #     serde::__serialize_unimplemented! {
 /// #         bool i8 i16 i32 u8 u16 u32 u64 f32 f64 char str bytes none some
 /// #         unit unit_struct unit_variant newtype_struct newtype_variant seq
 /// #         tuple tuple_struct tuple_variant map struct struct_variant
 /// #     }
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// When Serde is built with support for 128-bit integers, this macro expands
 /// transparently into just the input tokens.
 ///
-/// ```rust
+/// ```edition2018
 /// macro_rules! serde_if_integer128 {
 ///     ($($tt:tt)*) => {
 ///         $($tt)*
@@ -65,7 +61,7 @@
 /// When built without support for 128-bit integers, this macro expands to
 /// nothing.
 ///
-/// ```rust
+/// ```edition2018
 /// macro_rules! serde_if_integer128 {
 ///     ($($tt:tt)*) => {};
 /// }
diff -Nru cargo-0.32.0/vendor/serde/src/lib.rs cargo-0.33.0/vendor/serde/src/lib.rs
--- cargo-0.32.0/vendor/serde/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -75,7 +75,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.82")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.87")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Unstable functionality only if the user asks for it. For tracking and
@@ -86,52 +86,35 @@
 #![cfg_attr(feature = "alloc", feature(alloc))]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
-// Whitelisted clippy lints
+// Ignored clippy and clippy_pedantic lints
 #![cfg_attr(
     feature = "cargo-clippy",
     allow(
-        cast_lossless,
+        // not available in our oldest supported compiler
         const_static_lifetime,
-        doc_markdown,
-        linkedlist,
-        needless_pass_by_value,
+        empty_enum,
         redundant_field_names,
+        // integer and float ser/de requires these sorts of casts
+        cast_possible_truncation,
+        cast_possible_wrap,
+        cast_precision_loss,
+        cast_sign_loss,
+        // things are often more readable this way
+        cast_lossless,
+        module_name_repetitions,
+        single_match_else,
         type_complexity,
-        unreadable_literal,
-        zero_prefixed_literal
+        use_self,
+        zero_prefixed_literal,
+        // not practical
+        needless_pass_by_value,
+        similar_names,
+        // preference
+        doc_markdown,
     )
 )]
-// Whitelisted clippy_pedantic lints
-#![cfg_attr(feature = "cargo-clippy", allow(
-// integer and float ser/de requires these sorts of casts
-    cast_possible_truncation,
-    cast_possible_wrap,
-    cast_precision_loss,
-    cast_sign_loss,
-// simplifies some macros
-    invalid_upcast_comparisons,
-// things are often more readable this way
-    decimal_literal_representation,
-    option_unwrap_used,
-    result_unwrap_used,
-    shadow_reuse,
-    single_match_else,
-    stutter,
-    use_self,
-// not practical
-    indexing_slicing,
-    many_single_char_names,
-    missing_docs_in_private_items,
-    similar_names,
-// alternative is not stable
-    empty_enum,
-    use_debug,
-))]
-// Blacklisted Rust lints.
-//
-// Compiler bug involving unused_imports:
-// https://github.com/rust-lang/rust/issues/51661
-#![deny(missing_docs, /*unused_imports*/)]
+// Rustc lints.
+#![deny(missing_docs, unused_imports)]
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -224,6 +207,12 @@
 
     #[cfg(range_inclusive)]
     pub use self::core::ops::RangeInclusive;
+
+    #[cfg(all(feature = "std", collections_bound))]
+    pub use std::collections::Bound;
+
+    #[cfg(ops_bound)]
+    pub use self::core::ops::Bound;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -252,40 +241,6 @@
 
 // Re-export #[derive(Serialize, Deserialize)].
 //
-// This is a workaround for https://github.com/rust-lang/cargo/issues/1286.
-// Without this re-export, crates that put Serde derives behind a cfg_attr would
-// need to use some silly feature name that depends on both serde and
-// serde_derive.
-//
-//     [features]
-//     serde-impls = ["serde", "serde_derive"]
-//
-//     [dependencies]
-//     serde = { version = "1.0", optional = true }
-//     serde_derive = { version = "1.0", optional = true }
-//
-//     # Used like this:
-//     # #[cfg(feature = "serde-impls")]
-//     # #[macro_use]
-//     # extern crate serde_derive;
-//     #
-//     # #[cfg_attr(feature = "serde-impls", derive(Serialize, Deserialize))]
-//     # struct S { /* ... */ }
-//
-// The re-exported derives allow crates to use "serde" as the name of their
-// Serde feature which is more intuitive.
-//
-//     [dependencies]
-//     serde = { version = "1.0", optional = true, features = ["derive"] }
-//
-//     # Used like this:
-//     # #[cfg(feature = "serde")]
-//     # #[macro_use]
-//     # extern crate serde;
-//     #
-//     # #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-//     # struct S { /* ... */ }
-//
 // The reason re-exporting is not enabled by default is that disabling it would
 // be annoying for crates that provide handwritten impls or data formats. They
 // would need to disable default features and then explicitly re-enable std.
diff -Nru cargo-0.32.0/vendor/serde/src/macros.rs cargo-0.33.0/vendor/serde/src/macros.rs
--- cargo-0.32.0/vendor/serde/src/macros.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/macros.rs	2019-02-06 04:11:58.000000000 +0000
@@ -11,10 +11,8 @@
 /// input. This requires repetitive implementations of all the [`Deserializer`]
 /// trait methods.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde;
-/// #
+/// ```edition2018
+/// # use serde::forward_to_deserialize_any;
 /// # use serde::de::{value, Deserializer, Visitor};
 /// #
 /// # struct MyDeserializer;
@@ -43,18 +41,14 @@
 /// #         tuple_struct map struct enum identifier ignored_any
 /// #     }
 /// # }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// The `forward_to_deserialize_any!` macro implements these simple forwarding
 /// methods so that they forward directly to [`Deserializer::deserialize_any`].
 /// You can choose which methods to forward.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde;
-/// #
+/// ```edition2018
+/// # use serde::forward_to_deserialize_any;
 /// # use serde::de::{value, Deserializer, Visitor};
 /// #
 /// # struct MyDeserializer;
@@ -77,8 +71,6 @@
 ///         tuple_struct map struct enum identifier ignored_any
 ///     }
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// The macro assumes the convention that your `Deserializer` lifetime parameter
@@ -86,12 +78,10 @@
 /// called `V`. A different type parameter and a different lifetime can be
 /// specified explicitly if necessary.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde;
-/// #
+/// ```edition2018
 /// # use std::marker::PhantomData;
 /// #
+/// # use serde::forward_to_deserialize_any;
 /// # use serde::de::{value, Deserializer, Visitor};
 /// #
 /// # struct MyDeserializer<V>(PhantomData<V>);
@@ -113,8 +103,6 @@
 ///     tuple_struct map struct enum identifier ignored_any
 /// }
 /// # }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// [`Deserializer`]: trait.Deserializer.html
diff -Nru cargo-0.32.0/vendor/serde/src/ser/impls.rs cargo-0.33.0/vendor/serde/src/ser/impls.rs
--- cargo-0.32.0/vendor/serde/src/ser/impls.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/ser/impls.rs	2019-02-06 04:11:58.000000000 +0000
@@ -256,6 +256,29 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#[cfg(any(ops_bound, collections_bound))]
+impl<T> Serialize for Bound<T>
+where
+    T: Serialize,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match *self {
+            Bound::Unbounded => serializer.serialize_unit_variant("Bound", 0, "Unbounded"),
+            Bound::Included(ref value) => {
+                serializer.serialize_newtype_variant("Bound", 1, "Included", value)
+            }
+            Bound::Excluded(ref value) => {
+                serializer.serialize_newtype_variant("Bound", 2, "Excluded", value)
+            }
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 impl Serialize for () {
     #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
diff -Nru cargo-0.32.0/vendor/serde/src/ser/impossible.rs cargo-0.33.0/vendor/serde/src/ser/impossible.rs
--- cargo-0.32.0/vendor/serde/src/ser/impossible.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/ser/impossible.rs	2019-02-06 04:11:58.000000000 +0000
@@ -15,10 +15,7 @@
 /// [`SerializeTuple`], [`SerializeTupleStruct`], [`SerializeTupleVariant`],
 /// [`SerializeMap`], [`SerializeStruct`], and [`SerializeStructVariant`].
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde;
-/// #
+/// ```edition2018
 /// # use serde::ser::{Serializer, Impossible};
 /// # use serde::private::ser::Error;
 /// #
@@ -44,14 +41,12 @@
 ///     }
 ///
 ///     /* other Serializer methods */
-/// #     __serialize_unimplemented! {
+/// #     serde::__serialize_unimplemented! {
 /// #         bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str bytes none some
 /// #         unit unit_struct unit_variant newtype_struct newtype_variant
 /// #         tuple tuple_struct tuple_variant map struct struct_variant
 /// #     }
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// [`Serializer`]: trait.Serializer.html
diff -Nru cargo-0.32.0/vendor/serde/src/ser/mod.rs cargo-0.33.0/vendor/serde/src/ser/mod.rs
--- cargo-0.32.0/vendor/serde/src/ser/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde/src/ser/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -84,6 +84,7 @@
 //!    - PathBuf
 //!    - Range\<T\>
 //!    - RangeInclusive\<T\>
+//!    - Bound\<T\>
 //!    - num::NonZero*
 //!    - `!` *(unstable)*
 //!  - **Net types**:
@@ -137,7 +138,7 @@
             /// For example, a filesystem [`Path`] may refuse to serialize
             /// itself if it contains invalid UTF-8 data.
             ///
-            /// ```rust
+            /// ```edition2018
             /// # struct Path;
             /// #
             /// # impl Path {
@@ -210,7 +211,7 @@
     /// See the [Implementing `Serialize`] section of the manual for more
     /// information about how to implement this method.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, SerializeStruct, Serializer};
     ///
     /// struct Person {
@@ -377,13 +378,10 @@
 
     /// Serialize a `bool` value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for bool {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -393,8 +391,6 @@
     ///         serializer.serialize_bool(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error>;
 
@@ -404,13 +400,10 @@
     /// reasonable implementation would be to cast the value to `i64` and
     /// forward to `serialize_i64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for i8 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -420,8 +413,6 @@
     ///         serializer.serialize_i8(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error>;
 
@@ -431,13 +422,10 @@
     /// reasonable implementation would be to cast the value to `i64` and
     /// forward to `serialize_i64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for i16 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -447,8 +435,6 @@
     ///         serializer.serialize_i16(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error>;
 
@@ -458,13 +444,10 @@
     /// reasonable implementation would be to cast the value to `i64` and
     /// forward to `serialize_i64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for i32 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -474,20 +457,15 @@
     ///         serializer.serialize_i32(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error>;
 
     /// Serialize an `i64` value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for i64 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -497,21 +475,16 @@
     ///         serializer.serialize_i64(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error>;
 
     serde_if_integer128! {
         /// Serialize an `i128` value.
         ///
-        /// ```rust
-        /// # #[macro_use]
-        /// # extern crate serde;
-        /// #
+        /// ```edition2018
         /// # use serde::Serializer;
         /// #
-        /// # __private_serialize!();
+        /// # serde::__private_serialize!();
         /// #
         /// impl Serialize for i128 {
         ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -521,8 +494,6 @@
         ///         serializer.serialize_i128(*self)
         ///     }
         /// }
-        /// #
-        /// # fn main() {}
         /// ```
         ///
         /// This method is available only on Rust compiler versions >=1.26. The
@@ -539,13 +510,10 @@
     /// reasonable implementation would be to cast the value to `u64` and
     /// forward to `serialize_u64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for u8 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -555,8 +523,6 @@
     ///         serializer.serialize_u8(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error>;
 
@@ -566,13 +532,10 @@
     /// reasonable implementation would be to cast the value to `u64` and
     /// forward to `serialize_u64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for u16 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -582,8 +545,6 @@
     ///         serializer.serialize_u16(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error>;
 
@@ -593,13 +554,10 @@
     /// reasonable implementation would be to cast the value to `u64` and
     /// forward to `serialize_u64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for u32 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -609,20 +567,15 @@
     ///         serializer.serialize_u32(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error>;
 
     /// Serialize a `u64` value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for u64 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -632,21 +585,16 @@
     ///         serializer.serialize_u64(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error>;
 
     serde_if_integer128! {
         /// Serialize a `u128` value.
         ///
-        /// ```rust
-        /// # #[macro_use]
-        /// # extern crate serde;
-        /// #
+        /// ```edition2018
         /// # use serde::Serializer;
         /// #
-        /// # __private_serialize!();
+        /// # serde::__private_serialize!();
         /// #
         /// impl Serialize for u128 {
         ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -656,8 +604,6 @@
         ///         serializer.serialize_u128(*self)
         ///     }
         /// }
-        /// #
-        /// # fn main() {}
         /// ```
         ///
         /// This method is available only on Rust compiler versions >=1.26. The
@@ -674,13 +620,10 @@
     /// reasonable implementation would be to cast the value to `f64` and
     /// forward to `serialize_f64`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for f32 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -690,20 +633,15 @@
     ///         serializer.serialize_f32(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_f32(self, v: f32) -> Result<Self::Ok, Self::Error>;
 
     /// Serialize an `f64` value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for f64 {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -713,8 +651,6 @@
     ///         serializer.serialize_f64(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error>;
 
@@ -723,13 +659,10 @@
     /// If the format does not support characters, it is reasonable to serialize
     /// it as a single element `str` or a `u32`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for char {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -739,20 +672,15 @@
     ///         serializer.serialize_char(*self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error>;
 
     /// Serialize a `&str`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for str {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -762,8 +690,6 @@
     ///         serializer.serialize_str(self)
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error>;
 
@@ -775,10 +701,7 @@
     /// `serialize_seq`. If forwarded, the implementation looks usually just
     /// like this:
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::ser::{Serializer, SerializeSeq};
     /// # use serde::private::ser::Error;
     /// #
@@ -796,22 +719,18 @@
     ///     seq.end()
     /// }
     /// #
-    /// #     __serialize_unimplemented! {
+    /// #     serde::__serialize_unimplemented! {
     /// #         bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str none some
     /// #         unit unit_struct unit_variant newtype_struct newtype_variant
     /// #         seq tuple tuple_struct tuple_variant map struct struct_variant
     /// #     }
     /// # }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error>;
 
     /// Serialize a [`None`] value.
     ///
-    /// ```rust
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::{Serialize, Serializer};
     /// #
     /// # enum Option<T> {
@@ -819,7 +738,7 @@
     /// #     None,
     /// # }
     /// #
-    /// # use Option::{Some, None};
+    /// # use self::Option::{Some, None};
     /// #
     /// impl<T> Serialize for Option<T>
     /// where
@@ -844,9 +763,7 @@
 
     /// Serialize a [`Some(T)`] value.
     ///
-    /// ```rust
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::{Serialize, Serializer};
     /// #
     /// # enum Option<T> {
@@ -854,7 +771,7 @@
     /// #     None,
     /// # }
     /// #
-    /// # use Option::{Some, None};
+    /// # use self::Option::{Some, None};
     /// #
     /// impl<T> Serialize for Option<T>
     /// where
@@ -881,13 +798,10 @@
 
     /// Serialize a `()` value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde;
-    /// #
+    /// ```edition2018
     /// # use serde::Serializer;
     /// #
-    /// # __private_serialize!();
+    /// # serde::__private_serialize!();
     /// #
     /// impl Serialize for () {
     ///     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -897,8 +811,6 @@
     ///         serializer.serialize_unit()
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn serialize_unit(self) -> Result<Self::Ok, Self::Error>;
 
@@ -906,7 +818,7 @@
     ///
     /// A reasonable implementation would be to forward to `serialize_unit`.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::{Serialize, Serializer};
     ///
     /// struct Nothing;
@@ -928,7 +840,7 @@
     /// this variant within the enum, and the `variant` is the name of the
     /// variant.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::{Serialize, Serializer};
     ///
     /// enum E {
@@ -961,7 +873,7 @@
     /// wrappers around the data they contain. A reasonable implementation would
     /// be to forward to `value.serialize(self)`.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::{Serialize, Serializer};
     ///
     /// struct Millimeters(u8);
@@ -989,7 +901,7 @@
     /// this variant within the enum, and the `variant` is the name of the
     /// variant. The `value` is the data contained within this newtype variant.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::{Serialize, Serializer};
     ///
     /// enum E {
@@ -1027,7 +939,7 @@
     /// not be computable before the sequence is iterated. Some serializers only
     /// support sequences whose length is known up front.
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use std::marker::PhantomData;
     /// #
     /// # struct Vec<T>(PhantomData<T>);
@@ -1072,7 +984,7 @@
     /// This call must be followed by zero or more calls to `serialize_element`,
     /// then a call to `end`.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, Serializer, SerializeTuple};
     ///
     /// # mod fool {
@@ -1102,7 +1014,7 @@
     /// }
     /// ```
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, SerializeTuple, Serializer};
     ///
     /// const VRAM_SIZE: usize = 386;
@@ -1130,7 +1042,7 @@
     /// The `name` is the name of the tuple struct and the `len` is the number
     /// of data fields that will be serialized.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, SerializeTupleStruct, Serializer};
     ///
     /// struct Rgb(u8, u8, u8);
@@ -1162,7 +1074,7 @@
     /// this variant within the enum, the `variant` is the name of the variant,
     /// and the `len` is the number of data fields that will be serialized.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, SerializeTupleVariant, Serializer};
     ///
     /// enum E {
@@ -1208,7 +1120,7 @@
     /// be computable before the map is iterated. Some serializers only support
     /// maps whose length is known up front.
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use std::marker::PhantomData;
     /// #
     /// # struct HashMap<K, V>(PhantomData<K>, PhantomData<V>);
@@ -1256,7 +1168,7 @@
     /// The `name` is the name of the struct and the `len` is the number of
     /// data fields that will be serialized.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, SerializeStruct, Serializer};
     ///
     /// struct Rgb {
@@ -1292,7 +1204,7 @@
     /// this variant within the enum, the `variant` is the name of the variant,
     /// and the `len` is the number of data fields that will be serialized.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::ser::{Serialize, SerializeStructVariant, Serializer};
     ///
     /// enum E {
@@ -1334,7 +1246,7 @@
     /// using [`serialize_seq`]. Implementors should not need to override this
     /// method.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::{Serialize, Serializer};
     ///
     /// struct SecretlyOneHigher {
@@ -1371,7 +1283,7 @@
     /// using [`serialize_map`]. Implementors should not need to override this
     /// method.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde::{Serialize, Serializer};
     /// use std::collections::BTreeSet;
     ///
@@ -1411,7 +1323,7 @@
     /// delegates to [`serialize_str`]. Serializers are encouraged to provide a
     /// more efficient implementation if possible.
     ///
-    /// ```rust
+    /// ```edition2018
     /// # struct DateTime;
     /// #
     /// # impl DateTime {
@@ -1452,7 +1364,7 @@
     /// of this method. If no more sensible behavior is possible, the
     /// implementation is expected to return an error.
     ///
-    /// ```rust
+    /// ```edition2018
     /// # struct DateTime;
     /// #
     /// # impl DateTime {
@@ -1487,7 +1399,7 @@
     /// human-readable one and binary formats like Bincode will prefer the
     /// compact one.
     ///
-    /// ```
+    /// ```edition2018
     /// # use std::fmt::{self, Display};
     /// #
     /// # struct Timestamp;
@@ -1536,7 +1448,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// # use std::marker::PhantomData;
 /// #
 /// # struct Vec<T>(PhantomData<T>);
@@ -1600,7 +1512,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// use serde::ser::{Serialize, Serializer, SerializeTuple};
 ///
 /// # mod fool {
@@ -1630,7 +1542,7 @@
 /// }
 /// ```
 ///
-/// ```rust
+/// ```edition2018
 /// # use std::marker::PhantomData;
 /// #
 /// # struct Array<T>(PhantomData<T>);
@@ -1700,7 +1612,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// use serde::ser::{Serialize, SerializeTupleStruct, Serializer};
 ///
 /// struct Rgb(u8, u8, u8);
@@ -1745,7 +1657,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// use serde::ser::{Serialize, SerializeTupleVariant, Serializer};
 ///
 /// enum E {
@@ -1803,7 +1715,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// # use std::marker::PhantomData;
 /// #
 /// # struct HashMap<K, V>(PhantomData<K>, PhantomData<V>);
@@ -1914,7 +1826,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// use serde::ser::{Serialize, SerializeStruct, Serializer};
 ///
 /// struct Rgb {
@@ -1974,7 +1886,7 @@
 ///
 /// # Example use
 ///
-/// ```rust
+/// ```edition2018
 /// use serde::ser::{Serialize, SerializeStructVariant, Serializer};
 ///
 /// enum E {
diff -Nru cargo-0.32.0/vendor/serde_derive/.cargo-checksum.json cargo-0.33.0/vendor/serde_derive/.cargo-checksum.json
--- cargo-0.32.0/vendor/serde_derive/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"96a7f9496ac65a2db5929afa087b54f8fc5008dcfbe48a8874ed20049b0d6154"}
\ No newline at end of file
+{"files":{},"package":"633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/serde_derive/Cargo.toml cargo-0.33.0/vendor/serde_derive/Cargo.toml
--- cargo-0.32.0/vendor/serde_derive/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "serde_derive"
-version = "1.0.82"
+version = "1.0.87"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 include = ["Cargo.toml", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
diff -Nru cargo-0.32.0/vendor/serde_derive/.cargo_vcs_info.json cargo-0.33.0/vendor/serde_derive/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/serde_derive/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "c2591e9b39ae36954699380a5b881963a581a8be"
-  }
-}
diff -Nru cargo-0.32.0/vendor/serde_derive/crates-io.md cargo-0.33.0/vendor/serde_derive/crates-io.md
--- cargo-0.32.0/vendor/serde_derive/crates-io.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/crates-io.md	2019-02-06 04:11:58.000000000 +0000
@@ -16,11 +16,7 @@
 ## Serde in action
 
 ```rust
-#[macro_use]
-extern crate serde_derive;
-
-extern crate serde;
-extern crate serde_json;
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct Point {
diff -Nru cargo-0.32.0/vendor/serde_derive/README.md cargo-0.33.0/vendor/serde_derive/README.md
--- cargo-0.32.0/vendor/serde_derive/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -25,19 +25,17 @@
 <details>
 <summary>
 Click to show Cargo.toml.
-<a href="https://play.rust-lang.org/?gist=9003c5b88c1f4989941925d7190c6eec" target="_blank">Run this code in the playground.</a>
+<a href="https://play.rust-lang.org/?edition=2018&gist=72755f28f99afc95e01d63174b28c1f5" target="_blank">Run this code in the playground.</a>
 </summary>
 
 ```toml
 [dependencies]
 
 # The core APIs, including the Serialize and Deserialize traits. Always
-# required when using Serde.
-serde = "1.0"
-
-# Support for #[derive(Serialize, Deserialize)]. Required if you want Serde
-# to work for structs and enums defined in your crate.
-serde_derive = "1.0"
+# required when using Serde. The "derive" feature is only required when
+# using #[derive(Serialize, Deserialize)] to make Serde work with structs
+# and enums defined in your crate.
+serde = { version = "1.0", features = ["derive"] }
 
 # Each data format lives in its own crate; the sample code below uses JSON
 # but you may be using a different one.
@@ -48,11 +46,7 @@
 <p></p>
 
 ```rust
-#[macro_use]
-extern crate serde_derive;
-
-extern crate serde;
-extern crate serde_json;
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct Point {
diff -Nru cargo-0.32.0/vendor/serde_derive/src/de.rs cargo-0.33.0/vendor/serde_derive/src/de.rs
--- cargo-0.32.0/vendor/serde_derive/src/de.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/de.rs	2019-02-06 04:11:58.000000000 +0000
@@ -5,11 +5,11 @@
 use syn::{self, Ident, Index, Member};
 
 use bound;
+use dummy;
 use fragment::{Expr, Fragment, Match, Stmts};
 use internals::ast::{Container, Data, Field, Style, Variant};
 use internals::{attr, Ctxt, Derive};
 use pretend;
-use try;
 
 use std::collections::BTreeSet;
 
@@ -25,11 +25,6 @@
     let ident = &cont.ident;
     let params = Parameters::new(&cont);
     let (de_impl_generics, _, ty_generics, where_clause) = split_with_de_lifetime(&params);
-    let suffix = ident.to_string().trim_left_matches("r#").to_owned();
-    let dummy_const = Ident::new(
-        &format!("_IMPL_DESERIALIZE_FOR_{}", suffix),
-        Span::call_site(),
-    );
     let body = Stmts(deserialize_body(&cont, &params));
     let delife = params.borrowed.de_lifetime();
 
@@ -65,19 +60,7 @@
         }
     };
 
-    let try_replacement = try::replacement();
-    let generated = quote! {
-        #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
-        const #dummy_const: () = {
-            #[allow(unknown_lints)]
-            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
-            #[allow(rust_2018_idioms)]
-            extern crate serde as _serde;
-            #try_replacement
-            #impl_block
-        };
-    };
-    Ok(generated)
+    Ok(dummy::wrap_in_const("DESERIALIZE", ident, impl_block))
 }
 
 fn precondition(cx: &Ctxt, cont: &Container) {
@@ -1145,37 +1128,33 @@
     cattrs: &attr::Container,
 ) -> Fragment {
     match *cattrs.tag() {
-        attr::EnumTag::External => deserialize_externally_tagged_enum(params, variants, cattrs),
-        attr::EnumTag::Internal { ref tag } => {
+        attr::TagType::External => deserialize_externally_tagged_enum(params, variants, cattrs),
+        attr::TagType::Internal { ref tag } => {
             deserialize_internally_tagged_enum(params, variants, cattrs, tag)
         }
-        attr::EnumTag::Adjacent {
+        attr::TagType::Adjacent {
             ref tag,
             ref content,
         } => deserialize_adjacently_tagged_enum(params, variants, cattrs, tag, content),
-        attr::EnumTag::None => deserialize_untagged_enum(params, variants, cattrs),
+        attr::TagType::None => deserialize_untagged_enum(params, variants, cattrs),
     }
 }
 
-fn deserialize_externally_tagged_enum(
-    params: &Parameters,
+fn prepare_enum_variant_enum(
     variants: &[Variant],
     cattrs: &attr::Container,
-) -> Fragment {
-    let this = &params.this;
-    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
-        split_with_de_lifetime(params);
-    let delife = params.borrowed.de_lifetime();
-
-    let type_name = cattrs.name().deserialize_name();
-
-    let expecting = format!("enum {}", params.type_name());
-
+) -> (TokenStream, Stmts) {
     let variant_names_idents: Vec<_> = variants
         .iter()
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)))
+        .map(|(i, variant)| {
+            (
+                variant.attrs.name().deserialize_name(),
+                field_i(i),
+                variant.attrs.aliases(),
+            )
+        })
         .collect();
 
     let other_idx = variants
@@ -1183,7 +1162,7 @@
         .position(|ref variant| variant.attrs.other());
 
     let variants_stmt = {
-        let variant_names = variant_names_idents.iter().map(|&(ref name, _)| name);
+        let variant_names = variant_names_idents.iter().map(|&(ref name, _, _)| name);
         quote! {
             const VARIANTS: &'static [&'static str] = &[ #(#variant_names),* ];
         }
@@ -1196,6 +1175,24 @@
         other_idx,
     ));
 
+    (variants_stmt, variant_visitor)
+}
+
+fn deserialize_externally_tagged_enum(
+    params: &Parameters,
+    variants: &[Variant],
+    cattrs: &attr::Container,
+) -> Fragment {
+    let this = &params.this;
+    let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
+        split_with_de_lifetime(params);
+    let delife = params.borrowed.de_lifetime();
+
+    let type_name = cattrs.name().deserialize_name();
+    let expecting = format!("enum {}", params.type_name());
+
+    let (variants_stmt, variant_visitor) = prepare_enum_variant_enum(variants, cattrs);
+
     // Match arms to extract a variant from a string
     let variant_arms = variants
         .iter()
@@ -1260,11 +1257,15 @@
 
         #variants_stmt
 
-        _serde::Deserializer::deserialize_enum(__deserializer, #type_name, VARIANTS,
-                                               __Visitor {
-                                                   marker: _serde::export::PhantomData::<#this #ty_generics>,
-                                                   lifetime: _serde::export::PhantomData,
-                                               })
+        _serde::Deserializer::deserialize_enum(
+            __deserializer,
+            #type_name,
+            VARIANTS,
+            __Visitor {
+                marker: _serde::export::PhantomData::<#this #ty_generics>,
+                lifetime: _serde::export::PhantomData,
+            },
+        )
     }
 }
 
@@ -1274,30 +1275,7 @@
     cattrs: &attr::Container,
     tag: &str,
 ) -> Fragment {
-    let variant_names_idents: Vec<_> = variants
-        .iter()
-        .enumerate()
-        .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)))
-        .collect();
-
-    let other_idx = variants
-        .iter()
-        .position(|ref variant| variant.attrs.other());
-
-    let variants_stmt = {
-        let variant_names = variant_names_idents.iter().map(|&(ref name, _)| name);
-        quote! {
-            const VARIANTS: &'static [&'static str] = &[ #(#variant_names),* ];
-        }
-    };
-
-    let variant_visitor = Stmts(deserialize_generated_identifier(
-        &variant_names_idents,
-        cattrs,
-        true,
-        other_idx,
-    ));
+    let (variants_stmt, variant_visitor) = prepare_enum_variant_enum(variants, cattrs);
 
     // Match arms to extract a variant from a string
     let variant_arms = variants
@@ -1348,30 +1326,7 @@
         split_with_de_lifetime(params);
     let delife = params.borrowed.de_lifetime();
 
-    let variant_names_idents: Vec<_> = variants
-        .iter()
-        .enumerate()
-        .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-        .map(|(i, variant)| (variant.attrs.name().deserialize_name(), field_i(i)))
-        .collect();
-
-    let other_idx = variants
-        .iter()
-        .position(|ref variant| variant.attrs.other());
-
-    let variants_stmt = {
-        let variant_names = variant_names_idents.iter().map(|&(ref name, _)| name);
-        quote! {
-            const VARIANTS: &'static [&'static str] = &[ #(#variant_names),* ];
-        }
-    };
-
-    let variant_visitor = Stmts(deserialize_generated_identifier(
-        &variant_names_idents,
-        cattrs,
-        true,
-        other_idx,
-    ));
+    let (variants_stmt, variant_visitor) = prepare_enum_variant_enum(variants, cattrs);
 
     let variant_arms: &Vec<_> = &variants
         .iter()
@@ -1615,12 +1570,14 @@
                 match try!(_serde::de::SeqAccess::next_element(&mut __seq)) {
                     _serde::export::Some(__field) => {
                         // Visit the second element - the content.
-                        match try!(_serde::de::SeqAccess::next_element_seed(&mut __seq,
-                                __Seed {
-                                    field: __field,
-                                    marker: _serde::export::PhantomData,
-                                    lifetime: _serde::export::PhantomData,
-                                })) {
+                        match try!(_serde::de::SeqAccess::next_element_seed(
+                            &mut __seq,
+                            __Seed {
+                                field: __field,
+                                marker: _serde::export::PhantomData,
+                                lifetime: _serde::export::PhantomData,
+                            },
+                        )) {
                             _serde::export::Some(__ret) => _serde::export::Ok(__ret),
                             // There is no second element.
                             _serde::export::None => {
@@ -1637,11 +1594,15 @@
         }
 
         const FIELDS: &'static [&'static str] = &[#tag, #content];
-        _serde::Deserializer::deserialize_struct(__deserializer, #type_name, FIELDS,
+        _serde::Deserializer::deserialize_struct(
+            __deserializer,
+            #type_name,
+            FIELDS,
             __Visitor {
                 marker: _serde::export::PhantomData::<#this #ty_generics>,
                 lifetime: _serde::export::PhantomData,
-            })
+            },
+        )
     }
 }
 
@@ -1877,13 +1838,13 @@
 }
 
 fn deserialize_generated_identifier(
-    fields: &[(String, Ident)],
+    fields: &[(String, Ident, Vec<String>)],
     cattrs: &attr::Container,
     is_variant: bool,
     other_idx: Option<usize>,
 ) -> Fragment {
     let this = quote!(__Field);
-    let field_idents: &Vec<_> = &fields.iter().map(|&(_, ref ident)| ident).collect();
+    let field_idents: &Vec<_> = &fields.iter().map(|&(_, ref ident, _)| ident).collect();
 
     let (ignore_variant, fallthrough) = if !is_variant && cattrs.has_flatten() {
         let ignore_variant = quote!(__other(_serde::private::de::Content<'de>),);
@@ -1984,11 +1945,12 @@
             (
                 variant.attrs.name().deserialize_name(),
                 variant.ident.clone(),
+                variant.attrs.aliases(),
             )
         })
         .collect();
 
-    let names = names_idents.iter().map(|&(ref name, _)| name);
+    let names = names_idents.iter().map(|&(ref name, _, _)| name);
 
     let names_const = if fallthrough.is_some() {
         None
@@ -2039,24 +2001,33 @@
 
 fn deserialize_identifier(
     this: &TokenStream,
-    fields: &[(String, Ident)],
+    fields: &[(String, Ident, Vec<String>)],
     is_variant: bool,
     fallthrough: Option<TokenStream>,
     collect_other_fields: bool,
 ) -> Fragment {
-    let field_strs = fields.iter().map(|&(ref name, _)| name);
-    let field_borrowed_strs = fields.iter().map(|&(ref name, _)| name);
-    let field_bytes = fields
+    let mut flat_fields = Vec::new();
+    for &(_, ref ident, ref aliases) in fields {
+        flat_fields.extend(aliases.iter().map(|alias| (alias, ident)))
+    }
+
+    let field_strs = flat_fields.iter().map(|&(ref name, _)| name);
+    let field_borrowed_strs = flat_fields.iter().map(|&(ref name, _)| name);
+    let field_bytes = flat_fields
         .iter()
         .map(|&(ref name, _)| Literal::byte_string(name.as_bytes()));
-    let field_borrowed_bytes = fields
+    let field_borrowed_bytes = flat_fields
         .iter()
         .map(|&(ref name, _)| Literal::byte_string(name.as_bytes()));
 
-    let constructors: &Vec<_> = &fields
+    let constructors: &Vec<_> = &flat_fields
         .iter()
         .map(|&(_, ref ident)| quote!(#this::#ident))
         .collect();
+    let main_constructors: &Vec<_> = &fields
+        .iter()
+        .map(|&(_, ref ident, _)| quote!(#this::#ident))
+        .collect();
 
     let expecting = if is_variant {
         "variant identifier"
@@ -2244,11 +2215,12 @@
             {
                 match __value {
                     #(
-                        #variant_indices => _serde::export::Ok(#constructors),
+                        #variant_indices => _serde::export::Ok(#main_constructors),
                     )*
                     _ => _serde::export::Err(_serde::de::Error::invalid_value(
-                                _serde::de::Unexpected::Unsigned(__value),
-                                &#fallthrough_msg))
+                        _serde::de::Unexpected::Unsigned(__value),
+                        &#fallthrough_msg,
+                    ))
                 }
             }
         }
@@ -2306,11 +2278,17 @@
         .iter()
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing())
-        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)))
+        .map(|(i, field)| {
+            (
+                field.attrs.name().deserialize_name(),
+                field_i(i),
+                field.attrs.aliases(),
+            )
+        })
         .collect();
 
     let fields_stmt = {
-        let field_names = field_names_idents.iter().map(|&(ref name, _)| name);
+        let field_names = field_names_idents.iter().map(|&(ref name, _, _)| name);
         quote_block! {
             const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
         }
@@ -2333,7 +2311,13 @@
         .iter()
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing() && !field.attrs.flatten())
-        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)))
+        .map(|(i, field)| {
+            (
+                field.attrs.name().deserialize_name(),
+                field_i(i),
+                field.attrs.aliases(),
+            )
+        })
         .collect();
 
     let field_visitor = deserialize_generated_identifier(&field_names_idents, cattrs, false, None);
@@ -2564,11 +2548,17 @@
         .iter()
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing())
-        .map(|(i, field)| (field.attrs.name().deserialize_name(), field_i(i)))
+        .map(|(i, field)| {
+            (
+                field.attrs.name().deserialize_name(),
+                field_i(i),
+                field.attrs.aliases(),
+            )
+        })
         .collect();
 
     let fields_stmt = {
-        let field_names = field_names_idents.iter().map(|&(ref name, _)| name);
+        let field_names = field_names_idents.iter().map(|&(ref name, _, _)| name);
         quote_block! {
             const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
         }
diff -Nru cargo-0.32.0/vendor/serde_derive/src/dummy.rs cargo-0.33.0/vendor/serde_derive/src/dummy.rs
--- cargo-0.32.0/vendor/serde_derive/src/dummy.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/dummy.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,32 @@
+use proc_macro2::{Ident, Span, TokenStream};
+
+use try;
+
+pub fn wrap_in_const(trait_: &str, ty: &Ident, code: TokenStream) -> TokenStream {
+    let try_replacement = try::replacement();
+
+    let dummy_const = Ident::new(
+        &format!("_IMPL_{}_FOR_{}", trait_, unraw(ty)),
+        Span::call_site(),
+    );
+
+    quote! {
+        #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
+        const #dummy_const: () = {
+            #[allow(unknown_lints)]
+            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
+            #[allow(rust_2018_idioms)]
+            extern crate serde as _serde;
+            #try_replacement
+            #code
+        };
+    }
+}
+
+#[allow(deprecated)]
+fn unraw(ident: &Ident) -> String {
+    // str::trim_start_matches was added in 1.30, trim_left_matches deprecated
+    // in 1.33. We currently support rustc back to 1.15 so we need to continue
+    // to use the deprecated one.
+    ident.to_string().trim_left_matches("r#").to_owned()
+}
diff -Nru cargo-0.32.0/vendor/serde_derive/src/internals/ast.rs cargo-0.33.0/vendor/serde_derive/src/internals/ast.rs
--- cargo-0.32.0/vendor/serde_derive/src/internals/ast.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/internals/ast.rs	2019-02-06 04:11:58.000000000 +0000
@@ -85,12 +85,14 @@
         match data {
             Data::Enum(ref mut variants) => {
                 for variant in variants {
-                    variant.attrs.rename_by_rule(attrs.rename_all());
+                    variant.attrs.rename_by_rules(attrs.rename_all_rules());
                     for field in &mut variant.fields {
                         if field.attrs.flatten() {
                             has_flatten = true;
                         }
-                        field.attrs.rename_by_rule(variant.attrs.rename_all());
+                        field
+                            .attrs
+                            .rename_by_rules(variant.attrs.rename_all_rules());
                     }
                 }
             }
@@ -99,7 +101,7 @@
                     if field.attrs.flatten() {
                         has_flatten = true;
                     }
-                    field.attrs.rename_by_rule(attrs.rename_all());
+                    field.attrs.rename_by_rules(attrs.rename_all_rules());
                 }
             }
         }
diff -Nru cargo-0.32.0/vendor/serde_derive/src/internals/attr.rs cargo-0.33.0/vendor/serde_derive/src/internals/attr.rs
--- cargo-0.32.0/vendor/serde_derive/src/internals/attr.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/internals/attr.rs	2019-02-06 04:11:58.000000000 +0000
@@ -20,7 +20,6 @@
 
 pub use internals::case::RenameRule;
 
-#[derive(Clone)]
 struct Attr<'c, T> {
     cx: &'c Ctxt,
     name: &'static str,
@@ -90,16 +89,95 @@
     }
 }
 
+struct VecAttr<'c, T> {
+    cx: &'c Ctxt,
+    name: &'static str,
+    first_dup_tokens: TokenStream,
+    values: Vec<T>,
+}
+
+impl<'c, T> VecAttr<'c, T> {
+    fn none(cx: &'c Ctxt, name: &'static str) -> Self {
+        VecAttr {
+            cx: cx,
+            name: name,
+            first_dup_tokens: TokenStream::new(),
+            values: Vec::new(),
+        }
+    }
+
+    fn insert<A: ToTokens>(&mut self, obj: A, value: T) {
+        if self.values.len() == 1 {
+            self.first_dup_tokens = obj.into_token_stream();
+        }
+        self.values.push(value);
+    }
+
+    fn at_most_one(mut self) -> Result<Option<T>, ()> {
+        if self.values.len() > 1 {
+            let dup_token = self.first_dup_tokens;
+            self.cx.error_spanned_by(
+                dup_token,
+                format!("duplicate serde attribute `{}`", self.name),
+            );
+            Err(())
+        } else {
+            Ok(self.values.pop())
+        }
+    }
+
+    fn get(self) -> Vec<T> {
+        self.values
+    }
+}
+
 pub struct Name {
     serialize: String,
+    serialize_renamed: bool,
     deserialize: String,
+    deserialize_renamed: bool,
+    deserialize_aliases: Vec<String>,
 }
 
+#[allow(deprecated)]
 fn unraw(ident: &Ident) -> String {
+    // str::trim_start_matches was added in 1.30, trim_left_matches deprecated
+    // in 1.33. We currently support rustc back to 1.15 so we need to continue
+    // to use the deprecated one.
     ident.to_string().trim_left_matches("r#").to_owned()
 }
 
 impl Name {
+    fn from_attrs(
+        source_name: String,
+        ser_name: Attr<String>,
+        de_name: Attr<String>,
+        de_aliases: Option<VecAttr<String>>,
+    ) -> Name {
+        let deserialize_aliases = match de_aliases {
+            Some(de_aliases) => {
+                let mut alias_list = BTreeSet::new();
+                for alias_name in de_aliases.get() {
+                    alias_list.insert(alias_name);
+                }
+                alias_list.into_iter().collect()
+            }
+            None => Vec::new(),
+        };
+
+        let ser_name = ser_name.get();
+        let ser_renamed = ser_name.is_some();
+        let de_name = de_name.get();
+        let de_renamed = de_name.is_some();
+        Name {
+            serialize: ser_name.unwrap_or_else(|| source_name.clone()),
+            serialize_renamed: ser_renamed,
+            deserialize: de_name.unwrap_or(source_name),
+            deserialize_renamed: de_renamed,
+            deserialize_aliases: deserialize_aliases,
+        }
+    }
+
     /// Return the container name for the container when serializing.
     pub fn serialize_name(&self) -> String {
         self.serialize.clone()
@@ -109,6 +187,20 @@
     pub fn deserialize_name(&self) -> String {
         self.deserialize.clone()
     }
+
+    fn deserialize_aliases(&self) -> Vec<String> {
+        let mut aliases = self.deserialize_aliases.clone();
+        let main_name = self.deserialize_name();
+        if !aliases.contains(&main_name) {
+            aliases.push(main_name);
+        }
+        aliases
+    }
+}
+
+pub struct RenameAllRules {
+    serialize: RenameRule,
+    deserialize: RenameRule,
 }
 
 /// Represents struct or enum attribute information.
@@ -117,10 +209,10 @@
     transparent: bool,
     deny_unknown_fields: bool,
     default: Default,
-    rename_all: RenameRule,
+    rename_all_rules: RenameAllRules,
     ser_bound: Option<Vec<syn::WherePredicate>>,
     de_bound: Option<Vec<syn::WherePredicate>>,
-    tag: EnumTag,
+    tag: TagType,
     type_from: Option<syn::Type>,
     type_into: Option<syn::Type>,
     remote: Option<syn::Path>,
@@ -129,7 +221,7 @@
 }
 
 /// Styles of representing an enum.
-pub enum EnumTag {
+pub enum TagType {
     /// The default.
     ///
     /// ```json
@@ -194,7 +286,8 @@
         let mut transparent = BoolAttr::none(cx, "transparent");
         let mut deny_unknown_fields = BoolAttr::none(cx, "deny_unknown_fields");
         let mut default = Attr::none(cx, "default");
-        let mut rename_all = Attr::none(cx, "rename_all");
+        let mut rename_all_ser_rule = Attr::none(cx, "rename_all");
+        let mut rename_all_de_rule = Attr::none(cx, "rename_all");
         let mut ser_bound = Attr::none(cx, "bound");
         let mut de_bound = Attr::none(cx, "bound");
         let mut untagged = BoolAttr::none(cx, "untagged");
@@ -229,7 +322,10 @@
                     Meta(NameValue(ref m)) if m.ident == "rename_all" => {
                         if let Ok(s) = get_lit_str(cx, &m.ident, &m.ident, &m.lit) {
                             match RenameRule::from_str(&s.value()) {
-                                Ok(rename_rule) => rename_all.set(&m.ident, rename_rule),
+                                Ok(rename_rule) => {
+                                    rename_all_ser_rule.set(&m.ident, rename_rule);
+                                    rename_all_de_rule.set(&m.ident, rename_rule);
+                                }
                                 Err(()) => cx.error_spanned_by(
                                     s,
                                     format!(
@@ -242,6 +338,42 @@
                         }
                     }
 
+                    // Parse `#[serde(rename_all(serialize = "foo", deserialize = "bar"))]`
+                    Meta(List(ref m)) if m.ident == "rename_all" => {
+                        if let Ok((ser, de)) = get_renames(cx, &m.nested) {
+                            if let Some(ser) = ser {
+                                match RenameRule::from_str(&ser.value()) {
+                                    Ok(rename_rule) => {
+                                        rename_all_ser_rule.set(&m.ident, rename_rule)
+                                    }
+                                    Err(()) => cx.error_spanned_by(
+                                        ser,
+                                        format!(
+                                            "unknown rename rule for #[serde(rename_all \
+                                             = {:?})]",
+                                            ser.value(),
+                                        ),
+                                    ),
+                                }
+                            }
+                            if let Some(de) = de {
+                                match RenameRule::from_str(&de.value()) {
+                                    Ok(rename_rule) => {
+                                        rename_all_de_rule.set(&m.ident, rename_rule)
+                                    }
+                                    Err(()) => cx.error_spanned_by(
+                                        de,
+                                        format!(
+                                            "unknown rename rule for #[serde(rename_all \
+                                             = {:?})]",
+                                            de.value(),
+                                        ),
+                                    ),
+                                }
+                            }
+                        }
+                    }
+
                     // Parse `#[serde(transparent)]`
                     Meta(Word(ref word)) if word == "transparent" => {
                         transparent.set_true(word);
@@ -361,20 +493,27 @@
                                 syn::Data::Enum(_) => {
                                     internal_tag.set(&m.ident, s.value());
                                 }
-                                syn::Data::Struct(syn::DataStruct {
-                                    ref struct_token, ..
-                                }) => {
-                                    cx.error_spanned_by(
-                                        struct_token,
-                                        "#[serde(tag = \"...\")] can only be used on enums",
-                                    );
+                                syn::Data::Struct(syn::DataStruct { ref fields, .. }) => {
+                                    match *fields {
+                                        syn::Fields::Named(_) => {
+                                            internal_tag.set(&m.ident, s.value());
+                                        }
+                                        syn::Fields::Unnamed(_) | syn::Fields::Unit => {
+                                            cx.error_spanned_by(
+                                                fields,
+                                                "#[serde(tag = \"...\")] can only be used on enums \
+                                                and structs with named fields",
+                                            );
+                                        }
+                                    }
                                 }
                                 syn::Data::Union(syn::DataUnion {
                                     ref union_token, ..
                                 }) => {
                                     cx.error_spanned_by(
                                         union_token,
-                                        "#[serde(tag = \"...\")] can only be used on enums",
+                                        "#[serde(tag = \"...\")] can only be used on enums \
+                                         and structs with named fields",
                                     );
                                 }
                             }
@@ -458,14 +597,14 @@
         }
 
         Container {
-            name: Name {
-                serialize: ser_name.get().unwrap_or_else(|| unraw(&item.ident)),
-                deserialize: de_name.get().unwrap_or_else(|| unraw(&item.ident)),
-            },
+            name: Name::from_attrs(unraw(&item.ident), ser_name, de_name, None),
             transparent: transparent.get(),
             deny_unknown_fields: deny_unknown_fields.get(),
             default: default.get().unwrap_or(Default::None),
-            rename_all: rename_all.get().unwrap_or(RenameRule::None),
+            rename_all_rules: RenameAllRules {
+                serialize: rename_all_ser_rule.get().unwrap_or(RenameRule::None),
+                deserialize: rename_all_de_rule.get().unwrap_or(RenameRule::None),
+            },
             ser_bound: ser_bound.get(),
             de_bound: de_bound.get(),
             tag: decide_tag(cx, item, untagged, internal_tag, content),
@@ -481,8 +620,8 @@
         &self.name
     }
 
-    pub fn rename_all(&self) -> &RenameRule {
-        &self.rename_all
+    pub fn rename_all_rules(&self) -> &RenameAllRules {
+        &self.rename_all_rules
     }
 
     pub fn transparent(&self) -> bool {
@@ -505,7 +644,7 @@
         self.de_bound.as_ref().map(|vec| &vec[..])
     }
 
-    pub fn tag(&self) -> &EnumTag {
+    pub fn tag(&self) -> &TagType {
         &self.tag
     }
 
@@ -540,14 +679,14 @@
     untagged: BoolAttr,
     internal_tag: Attr<String>,
     content: Attr<String>,
-) -> EnumTag {
+) -> TagType {
     match (
         untagged.0.get_with_tokens(),
         internal_tag.get_with_tokens(),
         content.get_with_tokens(),
     ) {
-        (None, None, None) => EnumTag::External,
-        (Some(_), None, None) => EnumTag::None,
+        (None, None, None) => TagType::External,
+        (Some(_), None, None) => TagType::None,
         (None, Some((_, tag)), None) => {
             // Check that there are no tuple variants.
             if let syn::Data::Enum(ref data) = item.data {
@@ -567,7 +706,7 @@
                     }
                 }
             }
-            EnumTag::Internal { tag: tag }
+            TagType::Internal { tag: tag }
         }
         (Some((untagged_tokens, _)), Some((tag_tokens, _)), None) => {
             cx.error_spanned_by(
@@ -578,14 +717,14 @@
                 tag_tokens,
                 "enum cannot be both untagged and internally tagged",
             );
-            EnumTag::External // doesn't matter, will error
+            TagType::External // doesn't matter, will error
         }
         (None, None, Some((content_tokens, _))) => {
             cx.error_spanned_by(
                 content_tokens,
                 "#[serde(tag = \"...\", content = \"...\")] must be used together",
             );
-            EnumTag::External
+            TagType::External
         }
         (Some((untagged_tokens, _)), None, Some((content_tokens, _))) => {
             cx.error_spanned_by(
@@ -596,9 +735,9 @@
                 content_tokens,
                 "untagged enum cannot have #[serde(content = \"...\")]",
             );
-            EnumTag::External
+            TagType::External
         }
-        (None, Some((_, tag)), Some((_, content))) => EnumTag::Adjacent {
+        (None, Some((_, tag)), Some((_, content))) => TagType::Adjacent {
             tag: tag,
             content: content,
         },
@@ -615,7 +754,7 @@
                 content_tokens,
                 "untagged enum cannot have #[serde(tag = \"...\", content = \"...\")]",
             );
-            EnumTag::External
+            TagType::External
         }
     }
 }
@@ -703,9 +842,7 @@
 /// Represents variant attribute information
 pub struct Variant {
     name: Name,
-    ser_renamed: bool,
-    de_renamed: bool,
-    rename_all: RenameRule,
+    rename_all_rules: RenameAllRules,
     ser_bound: Option<Vec<syn::WherePredicate>>,
     de_bound: Option<Vec<syn::WherePredicate>>,
     skip_deserializing: bool,
@@ -720,9 +857,11 @@
     pub fn from_ast(cx: &Ctxt, variant: &syn::Variant) -> Self {
         let mut ser_name = Attr::none(cx, "rename");
         let mut de_name = Attr::none(cx, "rename");
+        let mut de_aliases = VecAttr::none(cx, "rename");
         let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing");
         let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
-        let mut rename_all = Attr::none(cx, "rename_all");
+        let mut rename_all_ser_rule = Attr::none(cx, "rename_all");
+        let mut rename_all_de_rule = Attr::none(cx, "rename_all");
         let mut ser_bound = Attr::none(cx, "bound");
         let mut de_bound = Attr::none(cx, "bound");
         let mut other = BoolAttr::none(cx, "other");
@@ -737,15 +876,26 @@
                     Meta(NameValue(ref m)) if m.ident == "rename" => {
                         if let Ok(s) = get_lit_str(cx, &m.ident, &m.ident, &m.lit) {
                             ser_name.set(&m.ident, s.value());
-                            de_name.set(&m.ident, s.value());
+                            de_name.set_if_none(s.value());
+                            de_aliases.insert(&m.ident, s.value());
                         }
                     }
 
                     // Parse `#[serde(rename(serialize = "foo", deserialize = "bar"))]`
                     Meta(List(ref m)) if m.ident == "rename" => {
-                        if let Ok((ser, de)) = get_renames(cx, &m.nested) {
+                        if let Ok((ser, de)) = get_multiple_renames(cx, &m.nested) {
                             ser_name.set_opt(&m.ident, ser.map(syn::LitStr::value));
-                            de_name.set_opt(&m.ident, de.map(syn::LitStr::value));
+                            for de_value in de {
+                                de_name.set_if_none(de_value.value());
+                                de_aliases.insert(&m.ident, de_value.value());
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(alias = "foo")]`
+                    Meta(NameValue(ref m)) if m.ident == "alias" => {
+                        if let Ok(s) = get_lit_str(cx, &m.ident, &m.ident, &m.lit) {
+                            de_aliases.insert(&m.ident, s.value());
                         }
                     }
 
@@ -753,7 +903,10 @@
                     Meta(NameValue(ref m)) if m.ident == "rename_all" => {
                         if let Ok(s) = get_lit_str(cx, &m.ident, &m.ident, &m.lit) {
                             match RenameRule::from_str(&s.value()) {
-                                Ok(rename_rule) => rename_all.set(&m.ident, rename_rule),
+                                Ok(rename_rule) => {
+                                    rename_all_ser_rule.set(&m.ident, rename_rule);
+                                    rename_all_de_rule.set(&m.ident, rename_rule);
+                                }
                                 Err(()) => cx.error_spanned_by(
                                     s,
                                     format!(
@@ -766,6 +919,42 @@
                         }
                     }
 
+                    // Parse `#[serde(rename_all(serialize = "foo", deserialize = "bar"))]`
+                    Meta(List(ref m)) if m.ident == "rename_all" => {
+                        if let Ok((ser, de)) = get_renames(cx, &m.nested) {
+                            if let Some(ser) = ser {
+                                match RenameRule::from_str(&ser.value()) {
+                                    Ok(rename_rule) => {
+                                        rename_all_ser_rule.set(&m.ident, rename_rule)
+                                    }
+                                    Err(()) => cx.error_spanned_by(
+                                        ser,
+                                        format!(
+                                            "unknown rename rule for #[serde(rename_all \
+                                             = {:?})]",
+                                            ser.value(),
+                                        ),
+                                    ),
+                                }
+                            }
+                            if let Some(de) = de {
+                                match RenameRule::from_str(&de.value()) {
+                                    Ok(rename_rule) => {
+                                        rename_all_de_rule.set(&m.ident, rename_rule)
+                                    }
+                                    Err(()) => cx.error_spanned_by(
+                                        de,
+                                        format!(
+                                            "unknown rename rule for #[serde(rename_all \
+                                             = {:?})]",
+                                            de.value(),
+                                        ),
+                                    ),
+                                }
+                            }
+                        }
+                    }
+
                     // Parse `#[serde(skip)]`
                     Meta(Word(ref word)) if word == "skip" => {
                         skip_serializing.set_true(word);
@@ -864,18 +1053,12 @@
             }
         }
 
-        let ser_name = ser_name.get();
-        let ser_renamed = ser_name.is_some();
-        let de_name = de_name.get();
-        let de_renamed = de_name.is_some();
         Variant {
-            name: Name {
-                serialize: ser_name.unwrap_or_else(|| unraw(&variant.ident)),
-                deserialize: de_name.unwrap_or_else(|| unraw(&variant.ident)),
+            name: Name::from_attrs(unraw(&variant.ident), ser_name, de_name, Some(de_aliases)),
+            rename_all_rules: RenameAllRules {
+                serialize: rename_all_ser_rule.get().unwrap_or(RenameRule::None),
+                deserialize: rename_all_de_rule.get().unwrap_or(RenameRule::None),
             },
-            ser_renamed: ser_renamed,
-            de_renamed: de_renamed,
-            rename_all: rename_all.get().unwrap_or(RenameRule::None),
             ser_bound: ser_bound.get(),
             de_bound: de_bound.get(),
             skip_deserializing: skip_deserializing.get(),
@@ -891,17 +1074,21 @@
         &self.name
     }
 
-    pub fn rename_by_rule(&mut self, rule: &RenameRule) {
-        if !self.ser_renamed {
-            self.name.serialize = rule.apply_to_variant(&self.name.serialize);
+    pub fn aliases(&self) -> Vec<String> {
+        self.name.deserialize_aliases()
+    }
+
+    pub fn rename_by_rules(&mut self, rules: &RenameAllRules) {
+        if !self.name.serialize_renamed {
+            self.name.serialize = rules.serialize.apply_to_variant(&self.name.serialize);
         }
-        if !self.de_renamed {
-            self.name.deserialize = rule.apply_to_variant(&self.name.deserialize);
+        if !self.name.deserialize_renamed {
+            self.name.deserialize = rules.deserialize.apply_to_variant(&self.name.deserialize);
         }
     }
 
-    pub fn rename_all(&self) -> &RenameRule {
-        &self.rename_all
+    pub fn rename_all_rules(&self) -> &RenameAllRules {
+        &self.rename_all_rules
     }
 
     pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
@@ -936,8 +1123,6 @@
 /// Represents field attribute information
 pub struct Field {
     name: Name,
-    ser_renamed: bool,
-    de_renamed: bool,
     skip_serializing: bool,
     skip_deserializing: bool,
     skip_serializing_if: Option<syn::ExprPath>,
@@ -982,6 +1167,7 @@
     ) -> Self {
         let mut ser_name = Attr::none(cx, "rename");
         let mut de_name = Attr::none(cx, "rename");
+        let mut de_aliases = VecAttr::none(cx, "rename");
         let mut skip_serializing = BoolAttr::none(cx, "skip_serializing");
         let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing");
         let mut skip_serializing_if = Attr::none(cx, "skip_serializing_if");
@@ -1015,15 +1201,26 @@
                     Meta(NameValue(ref m)) if m.ident == "rename" => {
                         if let Ok(s) = get_lit_str(cx, &m.ident, &m.ident, &m.lit) {
                             ser_name.set(&m.ident, s.value());
-                            de_name.set(&m.ident, s.value());
+                            de_name.set_if_none(s.value());
+                            de_aliases.insert(&m.ident, s.value());
                         }
                     }
 
                     // Parse `#[serde(rename(serialize = "foo", deserialize = "bar"))]`
                     Meta(List(ref m)) if m.ident == "rename" => {
-                        if let Ok((ser, de)) = get_renames(cx, &m.nested) {
+                        if let Ok((ser, de)) = get_multiple_renames(cx, &m.nested) {
                             ser_name.set_opt(&m.ident, ser.map(syn::LitStr::value));
-                            de_name.set_opt(&m.ident, de.map(syn::LitStr::value));
+                            for de_value in de {
+                                de_name.set_if_none(de_value.value());
+                                de_aliases.insert(&m.ident, de_value.value());
+                            }
+                        }
+                    }
+
+                    // Parse `#[serde(alias = "foo")]`
+                    Meta(NameValue(ref m)) if m.ident == "alias" => {
+                        if let Ok(s) = get_lit_str(cx, &m.ident, &m.ident, &m.lit) {
+                            de_aliases.insert(&m.ident, s.value());
                         }
                     }
 
@@ -1230,17 +1427,8 @@
             collect_lifetimes(&field.ty, &mut borrowed_lifetimes);
         }
 
-        let ser_name = ser_name.get();
-        let ser_renamed = ser_name.is_some();
-        let de_name = de_name.get();
-        let de_renamed = de_name.is_some();
         Field {
-            name: Name {
-                serialize: ser_name.unwrap_or_else(|| ident.clone()),
-                deserialize: de_name.unwrap_or(ident),
-            },
-            ser_renamed: ser_renamed,
-            de_renamed: de_renamed,
+            name: Name::from_attrs(ident, ser_name, de_name, Some(de_aliases)),
             skip_serializing: skip_serializing.get(),
             skip_deserializing: skip_deserializing.get(),
             skip_serializing_if: skip_serializing_if.get(),
@@ -1260,12 +1448,16 @@
         &self.name
     }
 
-    pub fn rename_by_rule(&mut self, rule: &RenameRule) {
-        if !self.ser_renamed {
-            self.name.serialize = rule.apply_to_field(&self.name.serialize);
+    pub fn aliases(&self) -> Vec<String> {
+        self.name.deserialize_aliases()
+    }
+
+    pub fn rename_by_rules(&mut self, rules: &RenameAllRules) {
+        if !self.name.serialize_renamed {
+            self.name.serialize = rules.serialize.apply_to_field(&self.name.serialize);
         }
-        if !self.de_renamed {
-            self.name.deserialize = rule.apply_to_field(&self.name.deserialize);
+        if !self.name.deserialize_renamed {
+            self.name.deserialize = rules.deserialize.apply_to_field(&self.name.deserialize);
         }
     }
 
@@ -1324,31 +1516,31 @@
 
 type SerAndDe<T> = (Option<T>, Option<T>);
 
-fn get_ser_and_de<'a, T, F>(
-    cx: &Ctxt,
+fn get_ser_and_de<'a, 'b, T, F>(
+    cx: &'b Ctxt,
     attr_name: &'static str,
     metas: &'a Punctuated<syn::NestedMeta, Token![,]>,
     f: F,
-) -> Result<SerAndDe<T>, ()>
+) -> Result<(VecAttr<'b, T>, VecAttr<'b, T>), ()>
 where
     T: 'a,
     F: Fn(&Ctxt, &Ident, &Ident, &'a syn::Lit) -> Result<T, ()>,
 {
-    let mut ser_meta = Attr::none(cx, attr_name);
-    let mut de_meta = Attr::none(cx, attr_name);
+    let mut ser_meta = VecAttr::none(cx, attr_name);
+    let mut de_meta = VecAttr::none(cx, attr_name);
     let attr_name = Ident::new(attr_name, Span::call_site());
 
     for meta in metas {
         match *meta {
             Meta(NameValue(ref meta)) if meta.ident == "serialize" => {
                 if let Ok(v) = f(cx, &attr_name, &meta.ident, &meta.lit) {
-                    ser_meta.set(&meta.ident, v);
+                    ser_meta.insert(&meta.ident, v);
                 }
             }
 
             Meta(NameValue(ref meta)) if meta.ident == "deserialize" => {
                 if let Ok(v) = f(cx, &attr_name, &meta.ident, &meta.lit) {
-                    de_meta.set(&meta.ident, v);
+                    de_meta.insert(&meta.ident, v);
                 }
             }
 
@@ -1366,21 +1558,31 @@
         }
     }
 
-    Ok((ser_meta.get(), de_meta.get()))
+    Ok((ser_meta, de_meta))
 }
 
 fn get_renames<'a>(
     cx: &Ctxt,
     items: &'a Punctuated<syn::NestedMeta, Token![,]>,
 ) -> Result<SerAndDe<&'a syn::LitStr>, ()> {
-    get_ser_and_de(cx, "rename", items, get_lit_str)
+    let (ser, de) = try!(get_ser_and_de(cx, "rename", items, get_lit_str));
+    Ok((try!(ser.at_most_one()), try!(de.at_most_one())))
+}
+
+fn get_multiple_renames<'a>(
+    cx: &Ctxt,
+    items: &'a Punctuated<syn::NestedMeta, Token![,]>,
+) -> Result<(Option<&'a syn::LitStr>, Vec<&'a syn::LitStr>), ()> {
+    let (ser, de) = try!(get_ser_and_de(cx, "rename", items, get_lit_str));
+    Ok((try!(ser.at_most_one()), de.get()))
 }
 
 fn get_where_predicates(
     cx: &Ctxt,
     items: &Punctuated<syn::NestedMeta, Token![,]>,
 ) -> Result<SerAndDe<Vec<syn::WherePredicate>>, ()> {
-    get_ser_and_de(cx, "bound", items, parse_lit_into_where)
+    let (ser, de) = try!(get_ser_and_de(cx, "bound", items, parse_lit_into_where));
+    Ok((try!(ser.at_most_one()), try!(de.at_most_one())))
 }
 
 pub fn get_serde_meta_items(attr: &syn::Attribute) -> Option<Vec<syn::NestedMeta>> {
diff -Nru cargo-0.32.0/vendor/serde_derive/src/internals/case.rs cargo-0.33.0/vendor/serde_derive/src/internals/case.rs
--- cargo-0.32.0/vendor/serde_derive/src/internals/case.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/internals/case.rs	2019-02-06 04:11:58.000000000 +0000
@@ -10,7 +10,7 @@
 use self::RenameRule::*;
 
 /// The different possible ways to change case of fields in a struct, or variants in an enum.
-#[derive(PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum RenameRule {
     /// Don't apply a default rename rule.
     None,
diff -Nru cargo-0.32.0/vendor/serde_derive/src/internals/check.rs cargo-0.33.0/vendor/serde_derive/src/internals/check.rs
--- cargo-0.32.0/vendor/serde_derive/src/internals/check.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/internals/check.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,5 @@
 use internals::ast::{Container, Data, Field, Style};
-use internals::attr::{EnumTag, Identifier};
+use internals::attr::{Identifier, TagType};
 use internals::{Ctxt, Derive};
 use syn::{Member, Type};
 
@@ -127,7 +127,7 @@
             }
 
             // Variant with `other` attribute cannot appear in untagged enum
-            (_, Identifier::No, true, &EnumTag::None) => {
+            (_, Identifier::No, true, &TagType::None) => {
                 cx.error_spanned_by(
                     variant.original,
                     "#[serde(other)] cannot appear on untagged enum",
@@ -276,8 +276,8 @@
     };
 
     let tag = match *cont.attrs.tag() {
-        EnumTag::Internal { ref tag } => tag.as_str(),
-        EnumTag::External | EnumTag::Adjacent { .. } | EnumTag::None => return,
+        TagType::Internal { ref tag } => tag.as_str(),
+        TagType::External | TagType::Adjacent { .. } | TagType::None => return,
     };
 
     let diagnose_conflict = || {
@@ -295,12 +295,18 @@
                     let check_de = !field.attrs.skip_deserializing();
                     let name = field.attrs.name();
                     let ser_name = name.serialize_name();
-                    let de_name = name.deserialize_name();
 
-                    if check_ser && ser_name == tag || check_de && de_name == tag {
+                    if check_ser && ser_name == tag {
                         diagnose_conflict();
                         return;
                     }
+
+                    for de_name in field.attrs.aliases() {
+                        if check_de && de_name == tag {
+                            diagnose_conflict();
+                            return;
+                        }
+                    }
                 }
             }
             Style::Unit | Style::Newtype | Style::Tuple => {}
@@ -312,11 +318,11 @@
 /// contents tag must differ, for the same reason.
 fn check_adjacent_tag_conflict(cx: &Ctxt, cont: &Container) {
     let (type_tag, content_tag) = match *cont.attrs.tag() {
-        EnumTag::Adjacent {
+        TagType::Adjacent {
             ref tag,
             ref content,
         } => (tag, content),
-        EnumTag::Internal { .. } | EnumTag::External | EnumTag::None => return,
+        TagType::Internal { .. } | TagType::External | TagType::None => return,
     };
 
     if type_tag == content_tag {
diff -Nru cargo-0.32.0/vendor/serde_derive/src/lib.rs cargo-0.33.0/vendor/serde_derive/src/lib.rs
--- cargo-0.32.0/vendor/serde_derive/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,8 +1,7 @@
 //! This crate provides Serde's two derive macros.
 //!
-//! ```rust
-//! # #[macro_use]
-//! # extern crate serde_derive;
+//! ```edition2018
+//! # use serde_derive::{Serialize, Deserialize};
 //! #
 //! #[derive(Serialize, Deserialize)]
 //! # struct S;
@@ -14,10 +13,10 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.82")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.87")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
-// Whitelisted clippy lints
+// Ignored clippy lints
 #![cfg_attr(
     feature = "cargo-clippy",
     allow(
@@ -26,10 +25,11 @@
         needless_pass_by_value,
         redundant_field_names,
         too_many_arguments,
+        trivially_copy_pass_by_ref,
         used_underscore_binding,
     )
 )]
-// Whitelisted clippy_pedantic lints
+// Ignored clippy_pedantic lints
 #![cfg_attr(
     feature = "cargo-clippy",
     allow(
@@ -40,9 +40,9 @@
         indexing_slicing,
         items_after_statements,
         match_same_arms,
+        module_name_repetitions,
         similar_names,
         single_match_else,
-        stutter,
         unseparated_literal_suffix,
         use_self,
     )
@@ -69,6 +69,7 @@
 mod fragment;
 
 mod de;
+mod dummy;
 mod pretend;
 mod ser;
 mod try;
diff -Nru cargo-0.32.0/vendor/serde_derive/src/ser.rs cargo-0.33.0/vendor/serde_derive/src/ser.rs
--- cargo-0.32.0/vendor/serde_derive/src/ser.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_derive/src/ser.rs	2019-02-06 04:11:58.000000000 +0000
@@ -3,11 +3,11 @@
 use syn::{self, Ident, Index, Member};
 
 use bound;
+use dummy;
 use fragment::{Fragment, Match, Stmts};
 use internals::ast::{Container, Data, Field, Style, Variant};
 use internals::{attr, Ctxt, Derive};
 use pretend;
-use try;
 
 pub fn expand_derive_serialize(input: &syn::DeriveInput) -> Result<TokenStream, Vec<syn::Error>> {
     let ctxt = Ctxt::new();
@@ -21,11 +21,6 @@
     let ident = &cont.ident;
     let params = Parameters::new(&cont);
     let (impl_generics, ty_generics, where_clause) = params.generics.split_for_impl();
-    let suffix = ident.to_string().trim_left_matches("r#").to_owned();
-    let dummy_const = Ident::new(
-        &format!("_IMPL_SERIALIZE_FOR_{}", suffix),
-        Span::call_site(),
-    );
     let body = Stmts(serialize_body(&cont, &params));
 
     let impl_block = if let Some(remote) = cont.attrs.remote() {
@@ -56,19 +51,7 @@
         }
     };
 
-    let try_replacement = try::replacement();
-    let generated = quote! {
-        #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
-        const #dummy_const: () = {
-            #[allow(unknown_lints)]
-            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
-            #[allow(rust_2018_idioms)]
-            extern crate serde as _serde;
-            #try_replacement
-            #impl_block
-        };
-    };
-    Ok(generated)
+    Ok(dummy::wrap_in_const("SERIALIZE", ident, impl_block))
 }
 
 fn precondition(cx: &Ctxt, cont: &Container) {
@@ -306,6 +289,19 @@
     }
 }
 
+fn serialize_struct_tag_field(cattrs: &attr::Container, struct_trait: &StructTrait) -> TokenStream {
+    match *cattrs.tag() {
+        attr::TagType::Internal { ref tag } => {
+            let type_name = cattrs.name().serialize_name();
+            let func = struct_trait.serialize_field(Span::call_site());
+            quote! {
+                try!(#func(&mut __serde_state, #tag, #type_name));
+            }
+        }
+        _ => quote! {},
+    }
+}
+
 fn serialize_struct_as_struct(
     params: &Parameters,
     fields: &[Field],
@@ -316,12 +312,15 @@
 
     let type_name = cattrs.name().serialize_name();
 
+    let tag_field = serialize_struct_tag_field(cattrs, &StructTrait::SerializeStruct);
+    let tag_field_exists = !tag_field.is_empty();
+
     let mut serialized_fields = fields
         .iter()
         .filter(|&field| !field.attrs.skip_serializing())
         .peekable();
 
-    let let_mut = mut_if(serialized_fields.peek().is_some());
+    let let_mut = mut_if(serialized_fields.peek().is_some() || tag_field_exists);
 
     let len = serialized_fields
         .map(|field| match field.attrs.skip_serializing_if() {
@@ -331,10 +330,14 @@
                 quote!(if #path(#field_expr) { 0 } else { 1 })
             }
         })
-        .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
+        .fold(
+            quote!(#tag_field_exists as usize),
+            |sum, expr| quote!(#sum + #expr),
+        );
 
     quote_block! {
         let #let_mut __serde_state = try!(_serde::Serializer::serialize_struct(__serializer, #type_name, #len));
+        #tag_field
         #(#serialize_fields)*
         _serde::ser::SerializeStruct::end(__serde_state)
     }
@@ -348,12 +351,15 @@
     let serialize_fields =
         serialize_struct_visitor(fields, params, false, &StructTrait::SerializeMap);
 
+    let tag_field = serialize_struct_tag_field(cattrs, &StructTrait::SerializeMap);
+    let tag_field_exists = !tag_field.is_empty();
+
     let mut serialized_fields = fields
         .iter()
         .filter(|&field| !field.attrs.skip_serializing())
         .peekable();
 
-    let let_mut = mut_if(serialized_fields.peek().is_some());
+    let let_mut = mut_if(serialized_fields.peek().is_some() || tag_field_exists);
 
     let len = if cattrs.has_flatten() {
         quote!(_serde::export::None)
@@ -366,12 +372,16 @@
                     quote!(if #path(#field_expr) { 0 } else { 1 })
                 }
             })
-            .fold(quote!(0), |sum, expr| quote!(#sum + #expr));
+            .fold(
+                quote!(#tag_field_exists as usize),
+                |sum, expr| quote!(#sum + #expr),
+            );
         quote!(_serde::export::Some(#len))
     };
 
     quote_block! {
         let #let_mut __serde_state = try!(_serde::Serializer::serialize_map(__serializer, #len));
+        #tag_field
         #(#serialize_fields)*
         _serde::ser::SerializeMap::end(__serde_state)
     }
@@ -452,17 +462,17 @@
         };
 
         let body = Match(match *cattrs.tag() {
-            attr::EnumTag::External => {
+            attr::TagType::External => {
                 serialize_externally_tagged_variant(params, variant, variant_index, cattrs)
             }
-            attr::EnumTag::Internal { ref tag } => {
+            attr::TagType::Internal { ref tag } => {
                 serialize_internally_tagged_variant(params, variant, cattrs, tag)
             }
-            attr::EnumTag::Adjacent {
+            attr::TagType::Adjacent {
                 ref tag,
                 ref content,
             } => serialize_adjacently_tagged_variant(params, variant, cattrs, tag, content),
-            attr::EnumTag::None => serialize_untagged_variant(params, variant, cattrs),
+            attr::TagType::None => serialize_untagged_variant(params, variant, cattrs),
         });
 
         quote! {
diff -Nru cargo-0.32.0/vendor/serde_ignored/.travis.yml cargo-0.33.0/vendor/serde_ignored/.travis.yml
--- cargo-0.32.0/vendor/serde_ignored/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_ignored/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-sudo: false
-language: rust
-
-rust:
-  - stable
-  - beta
-  - nightly
-
-script: cargo test
diff -Nru cargo-0.32.0/vendor/serde_json/.cargo-checksum.json cargo-0.33.0/vendor/serde_json/.cargo-checksum.json
--- cargo-0.32.0/vendor/serde_json/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811"}
\ No newline at end of file
+{"files":{},"package":"27dce848e7467aa0e2fcaf0a413641499c0b745452aaca1194d24dedde9e13c9"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/serde_json/Cargo.toml cargo-0.33.0/vendor/serde_json/Cargo.toml
--- cargo-0.32.0/vendor/serde_json/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "serde_json"
-version = "1.0.33"
+version = "1.0.38"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "A JSON serialization file format"
@@ -23,7 +23,7 @@
 license = "MIT/Apache-2.0"
 repository = "https://github.com/serde-rs/json"
 [package.metadata.docs.rs]
-features = ["raw_value"]
+features = ["raw_value", "unbounded_depth"]
 
 [package.metadata.playground]
 features = ["raw_value"]
@@ -49,11 +49,15 @@
 [dev-dependencies.serde_derive]
 version = "1.0"
 
+[dev-dependencies.serde_stacker]
+version = "0.1"
+
 [features]
 arbitrary_precision = []
 default = []
 preserve_order = ["indexmap"]
 raw_value = []
+unbounded_depth = []
 [badges.appveyor]
 repository = "serde-rs/json"
 
diff -Nru cargo-0.32.0/vendor/serde_json/.cargo_vcs_info.json cargo-0.33.0/vendor/serde_json/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/serde_json/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "ffeae2f147c69fde88049904871be54dc456bb70"
-  }
-}
diff -Nru cargo-0.32.0/vendor/serde_json/LICENSE-MIT cargo-0.33.0/vendor/serde_json/LICENSE-MIT
--- cargo-0.32.0/vendor/serde_json/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,3 @@
-Copyright (c) 2014 The Rust Project Developers
-
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the
diff -Nru cargo-0.32.0/vendor/serde_json/README.md cargo-0.33.0/vendor/serde_json/README.md
--- cargo-0.32.0/vendor/serde_json/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -27,18 +27,18 @@
 JSON is a ubiquitous open-standard format that uses human-readable text to
 transmit data objects consisting of key-value pairs.
 
-```json,ignore
+```json
 {
-  "name": "John Doe",
-  "age": 43,
-  "address": {
-    "street": "10 Downing Street",
-    "city": "London"
-  },
-  "phones": [
-    "+44 1234567",
-    "+44 2345678"
-  ]
+    "name": "John Doe",
+    "age": 43,
+    "address": {
+        "street": "10 Downing Street",
+        "city": "London"
+    },
+    "phones": [
+        "+44 1234567",
+        "+44 2345678"
+    ]
 }
 ```
 
@@ -64,7 +64,7 @@
 Any valid JSON data can be manipulated in the following recursive enum
 representation. This data structure is [`serde_json::Value`][value].
 
-```rust,ignore
+```rust
 enum Value {
     Null,
     Bool(bool),
@@ -81,25 +81,24 @@
 [`from_reader`][from_reader] for parsing from any `io::Read` like a File or
 a TCP stream.
 
-<a href="https://play.rust-lang.org/?gist=a266662bc71712e080efbf25ce30f306" target="_blank">
+<a href="https://play.rust-lang.org/?edition=2018&gist=d69d8e3156d4bb81c4461b60b772ab72" target="_blank">
 <img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
 </a>
 
 ```rust
-extern crate serde_json;
+use serde_json::{Result, Value};
 
-use serde_json::{Value, Error};
-
-fn untyped_example() -> Result<(), Error> {
+fn untyped_example() -> Result<()> {
     // Some JSON input data as a &str. Maybe this comes from the user.
-    let data = r#"{
-                    "name": "John Doe",
-                    "age": 43,
-                    "phones": [
-                      "+44 1234567",
-                      "+44 2345678"
-                    ]
-                  }"#;
+    let data = r#"
+        {
+            "name": "John Doe",
+            "age": 43,
+            "phones": [
+                "+44 1234567",
+                "+44 2345678"
+            ]
+        }"#;
 
     // Parse the string of data into serde_json::Value.
     let v: Value = serde_json::from_str(data)?;
@@ -140,18 +139,13 @@
 Serde provides a powerful way of mapping JSON data into Rust data structures
 largely automatically.
 
-<a href="https://play.rust-lang.org/?gist=cff572b80d3f078c942a2151e6020adc" target="_blank">
+<a href="https://play.rust-lang.org/?edition=2018&gist=15cfab66d38ff8a15a9cf1d8d897ac68" target="_blank">
 <img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
 </a>
 
 ```rust
-extern crate serde;
-extern crate serde_json;
-
-#[macro_use]
-extern crate serde_derive;
-
-use serde_json::Error;
+use serde::{Deserialize, Serialize};
+use serde_json::Result;
 
 #[derive(Serialize, Deserialize)]
 struct Person {
@@ -160,16 +154,17 @@
     phones: Vec<String>,
 }
 
-fn typed_example() -> Result<(), Error> {
+fn typed_example() -> Result<()> {
     // Some JSON input data as a &str. Maybe this comes from the user.
-    let data = r#"{
-                    "name": "John Doe",
-                    "age": 43,
-                    "phones": [
-                      "+44 1234567",
-                      "+44 2345678"
-                    ]
-                  }"#;
+    let data = r#"
+        {
+            "name": "John Doe",
+            "age": 43,
+            "phones": [
+                "+44 1234567",
+                "+44 2345678"
+            ]
+        }"#;
 
     // Parse the string of data into a Person object. This is exactly the
     // same function as the one that produced serde_json::Value above, but
@@ -207,23 +202,22 @@
 objects with very natural JSON syntax. In order to use this macro,
 `serde_json` needs to be imported with the `#[macro_use]` attribute.
 
-<a href="https://play.rust-lang.org/?gist=c216d6beabd9429a6ac13b8f88938dfe" target="_blank">
+<a href="https://play.rust-lang.org/?edition=2018&gist=6ccafad431d72b62e77cc34c8e879b24" target="_blank">
 <img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
 </a>
 
 ```rust
-#[macro_use]
-extern crate serde_json;
+use serde_json::json;
 
 fn main() {
     // The type of `john` is `serde_json::Value`
     let john = json!({
-      "name": "John Doe",
-      "age": 43,
-      "phones": [
-        "+44 1234567",
-        "+44 2345678"
-      ]
+        "name": "John Doe",
+        "age": 43,
+        "phones": [
+            "+44 1234567",
+            "+44 2345678"
+        ]
     });
 
     println!("first phone number: {}", john["phones"][0]);
@@ -241,7 +235,7 @@
 will check at compile time that the value you are interpolating is able to
 be represented as JSON.
 
-<a href="https://play.rust-lang.org/?gist=aae3af4d274bd249d1c8a947076355f2" target="_blank">
+<a href="https://play.rust-lang.org/?edition=2018&gist=f9101a6e61dfc9e02c6a67f315ed24f2" target="_blank">
 <img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
 </a>
 
@@ -251,11 +245,11 @@
 
 // The type of `john` is `serde_json::Value`
 let john = json!({
-  "name": full_name,
-  "age": age_last_year + 1,
-  "phones": [
-    format!("+44 {}", random_phone())
-  ]
+    "name": full_name,
+    "age": age_last_year + 1,
+    "phones": [
+        format!("+44 {}", random_phone())
+    ]
 });
 ```
 
@@ -272,18 +266,13 @@
 [`serde_json::to_writer`][to_writer] which serializes to any `io::Write`
 such as a File or a TCP stream.
 
-<a href="https://play.rust-lang.org/?gist=40967ece79921c77fd78ebc8f177c063" target="_blank">
+<a href="https://play.rust-lang.org/?edition=2018&gist=3472242a08ed2ff88a944f2a2283b0ee" target="_blank">
 <img align="right" width="50" src="https://raw.githubusercontent.com/serde-rs/serde-rs.github.io/master/img/run.png">
 </a>
 
 ```rust
-extern crate serde;
-extern crate serde_json;
-
-#[macro_use]
-extern crate serde_derive;
-
-use serde_json::Error;
+use serde::{Deserialize, Serialize};
+use serde_json::Result;
 
 #[derive(Serialize, Deserialize)]
 struct Address {
@@ -291,7 +280,7 @@
     city: String,
 }
 
-fn print_an_address() -> Result<(), Error> {
+fn print_an_address() -> Result<()> {
     // Some data structure.
     let address = Address {
         street: "10 Downing Street".to_owned(),
diff -Nru cargo-0.32.0/vendor/serde_json/src/de.rs cargo-0.33.0/vendor/serde_json/src/de.rs
--- cargo-0.32.0/vendor/serde_json/src/de.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/de.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Deserialize JSON data to a Rust data structure.
 
 use std::io;
@@ -33,6 +25,8 @@
     read: R,
     scratch: Vec<u8>,
     remaining_depth: u8,
+    #[cfg(feature = "unbounded_depth")]
+    disable_recursion_limit: bool,
 }
 
 impl<'de, R> Deserializer<R>
@@ -48,10 +42,23 @@
     ///   - Deserializer::from_bytes
     ///   - Deserializer::from_reader
     pub fn new(read: R) -> Self {
-        Deserializer {
-            read: read,
-            scratch: Vec::new(),
-            remaining_depth: 128,
+        #[cfg(not(feature = "unbounded_depth"))]
+        {
+            Deserializer {
+                read: read,
+                scratch: Vec::new(),
+                remaining_depth: 128,
+            }
+        }
+
+        #[cfg(feature = "unbounded_depth")]
+        {
+            Deserializer {
+                read: read,
+                scratch: Vec::new(),
+                remaining_depth: 128,
+                disable_recursion_limit: false,
+            }
         }
     }
 }
@@ -148,6 +155,54 @@
         }
     }
 
+    /// Parse arbitrarily deep JSON structures without any consideration for
+    /// overflowing the stack.
+    ///
+    /// You will want to provide some other way to protect against stack
+    /// overflows, such as by wrapping your Deserializer in the dynamically
+    /// growing stack adapter provided by the serde_stacker crate. Additionally
+    /// you will need to be careful around other recursive operations on the
+    /// parsed result which may overflow the stack after deserialization has
+    /// completed, including, but not limited to, Display and Debug and Drop
+    /// impls.
+    ///
+    /// *This method is only available if serde_json is built with the
+    /// `"unbounded_depth"` feature.*
+    ///
+    /// # Examples
+    ///
+    /// ```edition2018
+    /// use serde::Deserialize;
+    /// use serde_json::Value;
+    ///
+    /// fn main() {
+    ///     let mut json = String::new();
+    ///     for _ in 0..10000 {
+    ///         json = format!("[{}]", json);
+    ///     }
+    ///
+    ///     let mut deserializer = serde_json::Deserializer::from_str(&json);
+    ///     deserializer.disable_recursion_limit();
+    ///     let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
+    ///     let value = Value::deserialize(deserializer).unwrap();
+    ///
+    ///     carefully_drop_nested_arrays(value);
+    /// }
+    ///
+    /// fn carefully_drop_nested_arrays(value: Value) {
+    ///     let mut stack = vec![value];
+    ///     while let Some(value) = stack.pop() {
+    ///         if let Value::Array(array) = value {
+    ///             stack.extend(array);
+    ///         }
+    ///     }
+    /// }
+    /// ```
+    #[cfg(feature = "unbounded_depth")]
+    pub fn disable_recursion_limit(&mut self) {
+        self.disable_recursion_limit = true;
+    }
+
     fn peek(&mut self) -> Result<Option<u8>> {
         self.read.peek()
     }
@@ -946,39 +1001,39 @@
     }
 }
 
-#[cfg_attr(rustfmt, rustfmt_skip)]
-static POW10: [f64; 309] =
-    [1e000, 1e001, 1e002, 1e003, 1e004, 1e005, 1e006, 1e007, 1e008, 1e009,
-     1e010, 1e011, 1e012, 1e013, 1e014, 1e015, 1e016, 1e017, 1e018, 1e019,
-     1e020, 1e021, 1e022, 1e023, 1e024, 1e025, 1e026, 1e027, 1e028, 1e029,
-     1e030, 1e031, 1e032, 1e033, 1e034, 1e035, 1e036, 1e037, 1e038, 1e039,
-     1e040, 1e041, 1e042, 1e043, 1e044, 1e045, 1e046, 1e047, 1e048, 1e049,
-     1e050, 1e051, 1e052, 1e053, 1e054, 1e055, 1e056, 1e057, 1e058, 1e059,
-     1e060, 1e061, 1e062, 1e063, 1e064, 1e065, 1e066, 1e067, 1e068, 1e069,
-     1e070, 1e071, 1e072, 1e073, 1e074, 1e075, 1e076, 1e077, 1e078, 1e079,
-     1e080, 1e081, 1e082, 1e083, 1e084, 1e085, 1e086, 1e087, 1e088, 1e089,
-     1e090, 1e091, 1e092, 1e093, 1e094, 1e095, 1e096, 1e097, 1e098, 1e099,
-     1e100, 1e101, 1e102, 1e103, 1e104, 1e105, 1e106, 1e107, 1e108, 1e109,
-     1e110, 1e111, 1e112, 1e113, 1e114, 1e115, 1e116, 1e117, 1e118, 1e119,
-     1e120, 1e121, 1e122, 1e123, 1e124, 1e125, 1e126, 1e127, 1e128, 1e129,
-     1e130, 1e131, 1e132, 1e133, 1e134, 1e135, 1e136, 1e137, 1e138, 1e139,
-     1e140, 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149,
-     1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159,
-     1e160, 1e161, 1e162, 1e163, 1e164, 1e165, 1e166, 1e167, 1e168, 1e169,
-     1e170, 1e171, 1e172, 1e173, 1e174, 1e175, 1e176, 1e177, 1e178, 1e179,
-     1e180, 1e181, 1e182, 1e183, 1e184, 1e185, 1e186, 1e187, 1e188, 1e189,
-     1e190, 1e191, 1e192, 1e193, 1e194, 1e195, 1e196, 1e197, 1e198, 1e199,
-     1e200, 1e201, 1e202, 1e203, 1e204, 1e205, 1e206, 1e207, 1e208, 1e209,
-     1e210, 1e211, 1e212, 1e213, 1e214, 1e215, 1e216, 1e217, 1e218, 1e219,
-     1e220, 1e221, 1e222, 1e223, 1e224, 1e225, 1e226, 1e227, 1e228, 1e229,
-     1e230, 1e231, 1e232, 1e233, 1e234, 1e235, 1e236, 1e237, 1e238, 1e239,
-     1e240, 1e241, 1e242, 1e243, 1e244, 1e245, 1e246, 1e247, 1e248, 1e249,
-     1e250, 1e251, 1e252, 1e253, 1e254, 1e255, 1e256, 1e257, 1e258, 1e259,
-     1e260, 1e261, 1e262, 1e263, 1e264, 1e265, 1e266, 1e267, 1e268, 1e269,
-     1e270, 1e271, 1e272, 1e273, 1e274, 1e275, 1e276, 1e277, 1e278, 1e279,
-     1e280, 1e281, 1e282, 1e283, 1e284, 1e285, 1e286, 1e287, 1e288, 1e289,
-     1e290, 1e291, 1e292, 1e293, 1e294, 1e295, 1e296, 1e297, 1e298, 1e299,
-     1e300, 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308];
+static POW10: [f64; 309] = [
+    1e000, 1e001, 1e002, 1e003, 1e004, 1e005, 1e006, 1e007, 1e008, 1e009, //
+    1e010, 1e011, 1e012, 1e013, 1e014, 1e015, 1e016, 1e017, 1e018, 1e019, //
+    1e020, 1e021, 1e022, 1e023, 1e024, 1e025, 1e026, 1e027, 1e028, 1e029, //
+    1e030, 1e031, 1e032, 1e033, 1e034, 1e035, 1e036, 1e037, 1e038, 1e039, //
+    1e040, 1e041, 1e042, 1e043, 1e044, 1e045, 1e046, 1e047, 1e048, 1e049, //
+    1e050, 1e051, 1e052, 1e053, 1e054, 1e055, 1e056, 1e057, 1e058, 1e059, //
+    1e060, 1e061, 1e062, 1e063, 1e064, 1e065, 1e066, 1e067, 1e068, 1e069, //
+    1e070, 1e071, 1e072, 1e073, 1e074, 1e075, 1e076, 1e077, 1e078, 1e079, //
+    1e080, 1e081, 1e082, 1e083, 1e084, 1e085, 1e086, 1e087, 1e088, 1e089, //
+    1e090, 1e091, 1e092, 1e093, 1e094, 1e095, 1e096, 1e097, 1e098, 1e099, //
+    1e100, 1e101, 1e102, 1e103, 1e104, 1e105, 1e106, 1e107, 1e108, 1e109, //
+    1e110, 1e111, 1e112, 1e113, 1e114, 1e115, 1e116, 1e117, 1e118, 1e119, //
+    1e120, 1e121, 1e122, 1e123, 1e124, 1e125, 1e126, 1e127, 1e128, 1e129, //
+    1e130, 1e131, 1e132, 1e133, 1e134, 1e135, 1e136, 1e137, 1e138, 1e139, //
+    1e140, 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149, //
+    1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159, //
+    1e160, 1e161, 1e162, 1e163, 1e164, 1e165, 1e166, 1e167, 1e168, 1e169, //
+    1e170, 1e171, 1e172, 1e173, 1e174, 1e175, 1e176, 1e177, 1e178, 1e179, //
+    1e180, 1e181, 1e182, 1e183, 1e184, 1e185, 1e186, 1e187, 1e188, 1e189, //
+    1e190, 1e191, 1e192, 1e193, 1e194, 1e195, 1e196, 1e197, 1e198, 1e199, //
+    1e200, 1e201, 1e202, 1e203, 1e204, 1e205, 1e206, 1e207, 1e208, 1e209, //
+    1e210, 1e211, 1e212, 1e213, 1e214, 1e215, 1e216, 1e217, 1e218, 1e219, //
+    1e220, 1e221, 1e222, 1e223, 1e224, 1e225, 1e226, 1e227, 1e228, 1e229, //
+    1e230, 1e231, 1e232, 1e233, 1e234, 1e235, 1e236, 1e237, 1e238, 1e239, //
+    1e240, 1e241, 1e242, 1e243, 1e244, 1e245, 1e246, 1e247, 1e248, 1e249, //
+    1e250, 1e251, 1e252, 1e253, 1e254, 1e255, 1e256, 1e257, 1e258, 1e259, //
+    1e260, 1e261, 1e262, 1e263, 1e264, 1e265, 1e266, 1e267, 1e268, 1e269, //
+    1e270, 1e271, 1e272, 1e273, 1e274, 1e275, 1e276, 1e277, 1e278, 1e279, //
+    1e280, 1e281, 1e282, 1e283, 1e284, 1e285, 1e286, 1e287, 1e288, 1e289, //
+    1e290, 1e291, 1e292, 1e293, 1e294, 1e295, 1e296, 1e297, 1e298, 1e299, //
+    1e300, 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308,
+];
 
 macro_rules! deserialize_prim_number {
     ($method:ident) => {
@@ -991,6 +1046,39 @@
     }
 }
 
+#[cfg(not(feature = "unbounded_depth"))]
+macro_rules! if_checking_recursion_limit {
+    ($($body:tt)*) => {
+        $($body)*
+    };
+}
+
+#[cfg(feature = "unbounded_depth")]
+macro_rules! if_checking_recursion_limit {
+    ($this:ident $($body:tt)*) => {
+        if !$this.disable_recursion_limit {
+            $this $($body)*
+        }
+    };
+}
+
+macro_rules! check_recursion {
+    ($this:ident $($body:tt)*) => {
+        if_checking_recursion_limit! {
+            $this.remaining_depth -= 1;
+            if $this.remaining_depth == 0 {
+                return Err($this.peek_error(ErrorCode::RecursionLimitExceeded));
+            }
+        }
+
+        $this $($body)*
+
+        if_checking_recursion_limit! {
+            $this.remaining_depth += 1;
+        }
+    };
+}
+
 impl<'de, 'a, R: Read<'de>> de::Deserializer<'de> for &'a mut Deserializer<R> {
     type Error = Error;
 
@@ -1036,32 +1124,22 @@
                 }
             }
             b'[' => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let ret = visitor.visit_seq(SeqAccess::new(self));
                 }
 
-                self.eat_char();
-                let ret = visitor.visit_seq(SeqAccess::new(self));
-
-                self.remaining_depth += 1;
-
                 match (ret, self.end_seq()) {
                     (Ok(ret), Ok(())) => Ok(ret),
                     (Err(err), _) | (_, Err(err)) => Err(err),
                 }
             }
             b'{' => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let ret = visitor.visit_map(MapAccess::new(self));
                 }
 
-                self.eat_char();
-                let ret = visitor.visit_map(MapAccess::new(self));
-
-                self.remaining_depth += 1;
-
                 match (ret, self.end_map()) {
                     (Ok(ret), Ok(())) => Ok(ret),
                     (Err(err), _) | (_, Err(err)) => Err(err),
@@ -1265,10 +1343,7 @@
     ///
     /// You can use this to parse JSON strings containing invalid UTF-8 bytes.
     ///
-    /// ```rust
-    /// extern crate serde_json;
-    /// extern crate serde_bytes;
-    ///
+    /// ```edition2018
     /// use serde_bytes::ByteBuf;
     ///
     /// fn look_at_bytes() -> Result<(), serde_json::Error> {
@@ -1291,10 +1366,7 @@
     /// to be valid, and `\u` escape sequences are required to represent valid
     /// Unicode code points.
     ///
-    /// ```rust
-    /// extern crate serde_json;
-    /// extern crate serde_bytes;
-    ///
+    /// ```edition2018
     /// use serde_bytes::ByteBuf;
     ///
     /// fn look_at_bytes() {
@@ -1428,16 +1500,11 @@
 
         let value = match peek {
             b'[' => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let ret = visitor.visit_seq(SeqAccess::new(self));
                 }
 
-                self.eat_char();
-                let ret = visitor.visit_seq(SeqAccess::new(self));
-
-                self.remaining_depth += 1;
-
                 match (ret, self.end_seq()) {
                     (Ok(ret), Ok(())) => Ok(ret),
                     (Err(err), _) | (_, Err(err)) => Err(err),
@@ -1484,16 +1551,11 @@
 
         let value = match peek {
             b'{' => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let ret = visitor.visit_map(MapAccess::new(self));
                 }
 
-                self.eat_char();
-                let ret = visitor.visit_map(MapAccess::new(self));
-
-                self.remaining_depth += 1;
-
                 match (ret, self.end_map()) {
                     (Ok(ret), Ok(())) => Ok(ret),
                     (Err(err), _) | (_, Err(err)) => Err(err),
@@ -1526,32 +1588,22 @@
 
         let value = match peek {
             b'[' => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let ret = visitor.visit_seq(SeqAccess::new(self));
                 }
 
-                self.eat_char();
-                let ret = visitor.visit_seq(SeqAccess::new(self));
-
-                self.remaining_depth += 1;
-
                 match (ret, self.end_seq()) {
                     (Ok(ret), Ok(())) => Ok(ret),
                     (Err(err), _) | (_, Err(err)) => Err(err),
                 }
             }
             b'{' => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let ret = visitor.visit_map(MapAccess::new(self));
                 }
 
-                self.eat_char();
-                let ret = visitor.visit_map(MapAccess::new(self));
-
-                self.remaining_depth += 1;
-
                 match (ret, self.end_map()) {
                     (Ok(ret), Ok(())) => Ok(ret),
                     (Err(err), _) | (_, Err(err)) => Err(err),
@@ -1580,16 +1632,11 @@
     {
         match try!(self.parse_whitespace()) {
             Some(b'{') => {
-                self.remaining_depth -= 1;
-                if self.remaining_depth == 0 {
-                    return Err(self.peek_error(ErrorCode::RecursionLimitExceeded));
+                check_recursion! {
+                    self.eat_char();
+                    let value = try!(visitor.visit_enum(VariantAccess::new(self)));
                 }
 
-                self.eat_char();
-                let value = try!(visitor.visit_enum(VariantAccess::new(self)));
-
-                self.remaining_depth += 1;
-
                 match try!(self.parse_whitespace()) {
                     Some(b'}') => {
                         self.eat_char();
@@ -1964,9 +2011,7 @@
 /// The data can consist of any JSON value. Values need to be a self-delineating value e.g.
 /// arrays, objects, or strings, or be followed by whitespace or a self-delineating value.
 ///
-/// ```rust
-/// extern crate serde_json;
-///
+/// ```edition2018
 /// use serde_json::{Deserializer, Value};
 ///
 /// fn main() {
@@ -2014,7 +2059,7 @@
     /// If a stream deserializer returns an EOF error, new data can be joined to
     /// `old_data[stream.byte_offset()..]` to try again.
     ///
-    /// ```rust
+    /// ```edition2018
     /// let data = b"[0] [1] [";
     ///
     /// let de = serde_json::Deserializer::from_slice(data);
@@ -2121,25 +2166,25 @@
 
 /// Deserialize an instance of type `T` from an IO stream of JSON.
 ///
-/// # Errors
+/// The content of the IO stream is deserialized directly from the stream
+/// without being buffered in memory by serde_json.
 ///
-/// This conversion can fail if the structure of the input does not match the
-/// structure expected by `T`, for example if `T` is a struct type but the input
-/// contains something other than a JSON map. It can also fail if the structure
-/// is correct but `T`'s implementation of `Deserialize` decides that something
-/// is wrong with the data, for example required struct fields are missing from
-/// the JSON map or some number is too big to fit in the expected primitive
-/// type.
+/// When reading from a source against which short reads are not efficient, such
+/// as a [`File`], you will want to apply your own buffering because serde_json
+/// will not buffer the input. See [`std::io::BufReader`].
+///
+/// [`File`]: https://doc.rust-lang.org/std/fs/struct.File.html
+/// [`BufReader`]: https://doc.rust-lang.org/std/io/struct.BufReader.html
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate serde_derive;
+/// # Example
 ///
-/// extern crate serde;
-/// extern crate serde_json;
+/// ```edition2018
+/// # use serde_derive::Deserialize;
+/// use serde::Deserialize;
 ///
 /// use std::error::Error;
 /// use std::fs::File;
+/// use std::io::BufReader;
 /// use std::path::Path;
 ///
 /// #[derive(Deserialize, Debug)]
@@ -2149,11 +2194,12 @@
 /// }
 ///
 /// fn read_user_from_file<P: AsRef<Path>>(path: P) -> Result<User, Box<Error>> {
-///     // Open the file in read-only mode.
+///     // Open the file in read-only mode with buffer.
 ///     let file = File::open(path)?;
+///     let reader = BufReader::new(file);
 ///
 ///     // Read the JSON contents of the file as an instance of `User`.
-///     let u = serde_json::from_reader(file)?;
+///     let u = serde_json::from_reader(reader)?;
 ///
 ///     // Return the `User`.
 ///     Ok(u)
@@ -2166,15 +2212,6 @@
 ///     println!("{:#?}", u);
 /// }
 /// ```
-pub fn from_reader<R, T>(rdr: R) -> Result<T>
-where
-    R: io::Read,
-    T: de::DeserializeOwned,
-{
-    from_trait(read::IoRead::new(rdr))
-}
-
-/// Deserialize an instance of type `T` from bytes of JSON text.
 ///
 /// # Errors
 ///
@@ -2185,13 +2222,21 @@
 /// is wrong with the data, for example required struct fields are missing from
 /// the JSON map or some number is too big to fit in the expected primitive
 /// type.
+pub fn from_reader<R, T>(rdr: R) -> Result<T>
+where
+    R: io::Read,
+    T: de::DeserializeOwned,
+{
+    from_trait(read::IoRead::new(rdr))
+}
+
+/// Deserialize an instance of type `T` from bytes of JSON text.
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate serde_derive;
+/// # Example
 ///
-/// extern crate serde;
-/// extern crate serde_json;
+/// ```edition2018
+/// # use serde_derive::Deserialize;
+/// use serde::Deserialize;
 ///
 /// #[derive(Deserialize, Debug)]
 /// struct User {
@@ -2201,23 +2246,16 @@
 ///
 /// fn main() {
 ///     // The type of `j` is `&[u8]`
-///     let j = b"{
-///                 \"fingerprint\": \"0xF9BA143B95FF6D82\",
-///                 \"location\": \"Menlo Park, CA\"
-///               }";
+///     let j = b"
+///         {
+///             \"fingerprint\": \"0xF9BA143B95FF6D82\",
+///             \"location\": \"Menlo Park, CA\"
+///         }";
 ///
 ///     let u: User = serde_json::from_slice(j).unwrap();
 ///     println!("{:#?}", u);
 /// }
 /// ```
-pub fn from_slice<'a, T>(v: &'a [u8]) -> Result<T>
-where
-    T: de::Deserialize<'a>,
-{
-    from_trait(read::SliceRead::new(v))
-}
-
-/// Deserialize an instance of type `T` from a string of JSON text.
 ///
 /// # Errors
 ///
@@ -2228,13 +2266,20 @@
 /// is wrong with the data, for example required struct fields are missing from
 /// the JSON map or some number is too big to fit in the expected primitive
 /// type.
+pub fn from_slice<'a, T>(v: &'a [u8]) -> Result<T>
+where
+    T: de::Deserialize<'a>,
+{
+    from_trait(read::SliceRead::new(v))
+}
+
+/// Deserialize an instance of type `T` from a string of JSON text.
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate serde_derive;
+/// # Example
 ///
-/// extern crate serde;
-/// extern crate serde_json;
+/// ```edition2018
+/// # use serde_derive::Deserialize;
+/// use serde::Deserialize;
 ///
 /// #[derive(Deserialize, Debug)]
 /// struct User {
@@ -2244,15 +2289,26 @@
 ///
 /// fn main() {
 ///     // The type of `j` is `&str`
-///     let j = "{
-///                \"fingerprint\": \"0xF9BA143B95FF6D82\",
-///                \"location\": \"Menlo Park, CA\"
-///              }";
+///     let j = "
+///         {
+///             \"fingerprint\": \"0xF9BA143B95FF6D82\",
+///             \"location\": \"Menlo Park, CA\"
+///         }";
 ///
 ///     let u: User = serde_json::from_str(j).unwrap();
 ///     println!("{:#?}", u);
 /// }
 /// ```
+///
+/// # Errors
+///
+/// This conversion can fail if the structure of the input does not match the
+/// structure expected by `T`, for example if `T` is a struct type but the input
+/// contains something other than a JSON map. It can also fail if the structure
+/// is correct but `T`'s implementation of `Deserialize` decides that something
+/// is wrong with the data, for example required struct fields are missing from
+/// the JSON map or some number is too big to fit in the expected primitive
+/// type.
 pub fn from_str<'a, T>(s: &'a str) -> Result<T>
 where
     T: de::Deserialize<'a>,
diff -Nru cargo-0.32.0/vendor/serde_json/src/error.rs cargo-0.33.0/vendor/serde_json/src/error.rs
--- cargo-0.32.0/vendor/serde_json/src/error.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/error.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,16 +1,9 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! When serializing or deserializing JSON goes wrong.
 
 use std::error;
 use std::fmt::{self, Debug, Display};
 use std::io;
+use std::str::FromStr;
 use std::result;
 
 use serde::de;
@@ -144,7 +137,7 @@
     /// JSON syntax and data errors are turned into `InvalidData` IO errors.
     /// EOF errors are turned into `UnexpectedEof` IO errors.
     ///
-    /// ```rust
+    /// ```edition2018
     /// use std::io;
     ///
     /// enum MyError {
@@ -396,13 +389,7 @@
 impl de::Error for Error {
     #[cold]
     fn custom<T: Display>(msg: T) -> Error {
-        Error {
-            err: Box::new(ErrorImpl {
-                code: ErrorCode::Message(msg.to_string().into_boxed_str()),
-                line: 0,
-                column: 0,
-            }),
-        }
+        make_error(msg.to_string())
     }
 
     #[cold]
@@ -418,12 +405,68 @@
 impl ser::Error for Error {
     #[cold]
     fn custom<T: Display>(msg: T) -> Error {
-        Error {
-            err: Box::new(ErrorImpl {
-                code: ErrorCode::Message(msg.to_string().into_boxed_str()),
-                line: 0,
-                column: 0,
-            }),
-        }
+        make_error(msg.to_string())
+    }
+}
+
+// Parse our own error message that looks like "{} at line {} column {}" to work
+// around erased-serde round-tripping the error through de::Error::custom.
+fn make_error(mut msg: String) -> Error {
+    let (line, column) = parse_line_col(&mut msg).unwrap_or((0, 0));
+    Error {
+        err: Box::new(ErrorImpl {
+            code: ErrorCode::Message(msg.into_boxed_str()),
+            line: line,
+            column: column,
+        }),
+    }
+}
+
+fn parse_line_col(msg: &mut String) -> Option<(usize, usize)> {
+    let start_of_suffix = match msg.rfind(" at line ") {
+        Some(index) => index,
+        None => return None,
+    };
+
+    // Find start and end of line number.
+    let start_of_line = start_of_suffix + " at line ".len();
+    let mut end_of_line = start_of_line;
+    while starts_with_digit(&msg[end_of_line..]) {
+        end_of_line += 1;
+    }
+
+    if !msg[end_of_line..].starts_with(" column ") {
+        return None;
+    }
+
+    // Find start and end of column number.
+    let start_of_column = end_of_line + " column ".len();
+    let mut end_of_column = start_of_column;
+    while starts_with_digit(&msg[end_of_column..]) {
+        end_of_column += 1;
+    }
+
+    if end_of_column < msg.len() {
+        return None;
+    }
+
+    // Parse numbers.
+    let line = match usize::from_str(&msg[start_of_line..end_of_line]) {
+        Ok(line) => line,
+        Err(_) => return None,
+    };
+    let column = match usize::from_str(&msg[start_of_column..end_of_column]) {
+        Ok(column) => column,
+        Err(_) => return None,
+    };
+
+    msg.truncate(start_of_suffix);
+    Some((line, column))
+}
+
+fn starts_with_digit(slice: &str) -> bool {
+    match slice.as_bytes().get(0) {
+        None => false,
+        Some(&byte) => byte >= b'0' && byte <= b'9',
     }
 }
diff -Nru cargo-0.32.0/vendor/serde_json/src/iter.rs cargo-0.33.0/vendor/serde_json/src/iter.rs
--- cargo-0.32.0/vendor/serde_json/src/iter.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/iter.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::io;
 
 pub struct LineColIterator<I> {
diff -Nru cargo-0.32.0/vendor/serde_json/src/lib.rs cargo-0.33.0/vendor/serde_json/src/lib.rs
--- cargo-0.32.0/vendor/serde_json/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,28 +1,20 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! # Serde JSON
 //!
 //! JSON is a ubiquitous open-standard format that uses human-readable text to
 //! transmit data objects consisting of key-value pairs.
 //!
-//! ```json,ignore
+//! ```json
 //! {
-//!   "name": "John Doe",
-//!   "age": 43,
-//!   "address": {
-//!     "street": "10 Downing Street",
-//!     "city": "London"
-//!   },
-//!   "phones": [
-//!     "+44 1234567",
-//!     "+44 2345678"
-//!   ]
+//!     "name": "John Doe",
+//!     "age": 43,
+//!     "address": {
+//!         "street": "10 Downing Street",
+//!         "city": "London"
+//!     },
+//!     "phones": [
+//!         "+44 1234567",
+//!         "+44 2345678"
+//!     ]
 //! }
 //! ```
 //!
@@ -48,7 +40,7 @@
 //! Any valid JSON data can be manipulated in the following recursive enum
 //! representation. This data structure is [`serde_json::Value`][value].
 //!
-//! ```rust
+//! ```edition2018
 //! # use serde_json::{Number, Map};
 //! #
 //! # #[allow(dead_code)]
@@ -68,21 +60,20 @@
 //! [`from_reader`][from_reader] for parsing from any `io::Read` like a File or
 //! a TCP stream.
 //!
-//! ```rust
-//! extern crate serde_json;
+//! ```edition2018
+//! use serde_json::{Result, Value};
 //!
-//! use serde_json::{Value, Error};
-//!
-//! fn untyped_example() -> Result<(), Error> {
+//! fn untyped_example() -> Result<()> {
 //!     // Some JSON input data as a &str. Maybe this comes from the user.
-//!     let data = r#"{
-//!                     "name": "John Doe",
-//!                     "age": 43,
-//!                     "phones": [
-//!                       "+44 1234567",
-//!                       "+44 2345678"
-//!                     ]
-//!                   }"#;
+//!     let data = r#"
+//!         {
+//!             "name": "John Doe",
+//!             "age": 43,
+//!             "phones": [
+//!                 "+44 1234567",
+//!                 "+44 2345678"
+//!             ]
+//!         }"#;
 //!
 //!     // Parse the string of data into serde_json::Value.
 //!     let v: Value = serde_json::from_str(data)?;
@@ -127,14 +118,10 @@
 //! Serde provides a powerful way of mapping JSON data into Rust data structures
 //! largely automatically.
 //!
-//! ```rust
-//! extern crate serde;
-//! extern crate serde_json;
-//!
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
-//! use serde_json::Error;
+//! ```edition2018
+//! # use serde_derive::{Deserialize, Serialize};
+//! use serde::{Deserialize, Serialize};
+//! use serde_json::Result;
 //!
 //! #[derive(Serialize, Deserialize)]
 //! struct Person {
@@ -143,16 +130,17 @@
 //!     phones: Vec<String>,
 //! }
 //!
-//! fn typed_example() -> Result<(), Error> {
+//! fn typed_example() -> Result<()> {
 //!     // Some JSON input data as a &str. Maybe this comes from the user.
-//!     let data = r#"{
-//!                     "name": "John Doe",
-//!                     "age": 43,
-//!                     "phones": [
-//!                       "+44 1234567",
-//!                       "+44 2345678"
-//!                     ]
-//!                   }"#;
+//!     let data = r#"
+//!         {
+//!             "name": "John Doe",
+//!             "age": 43,
+//!             "phones": [
+//!                 "+44 1234567",
+//!                 "+44 2345678"
+//!             ]
+//!         }"#;
 //!
 //!     // Parse the string of data into a Person object. This is exactly the
 //!     // same function as the one that produced serde_json::Value above, but
@@ -194,19 +182,18 @@
 //! objects with very natural JSON syntax. In order to use this macro,
 //! `serde_json` needs to be imported with the `#[macro_use]` attribute.
 //!
-//! ```rust
-//! #[macro_use]
-//! extern crate serde_json;
+//! ```edition2018
+//! use serde_json::json;
 //!
 //! fn main() {
 //!     // The type of `john` is `serde_json::Value`
 //!     let john = json!({
-//!       "name": "John Doe",
-//!       "age": 43,
-//!       "phones": [
-//!         "+44 1234567",
-//!         "+44 2345678"
-//!       ]
+//!         "name": "John Doe",
+//!         "age": 43,
+//!         "phones": [
+//!             "+44 1234567",
+//!             "+44 2345678"
+//!         ]
 //!     });
 //!
 //!     println!("first phone number: {}", john["phones"][0]);
@@ -224,26 +211,22 @@
 //! will check at compile time that the value you are interpolating is able to
 //! be represented as JSON.
 //!
-//! ```rust
-//! # #[macro_use]
-//! # extern crate serde_json;
+//! ```edition2018
+//! # use serde_json::json;
 //! #
 //! # fn random_phone() -> u16 { 0 }
 //! #
-//! # fn main() {
 //! let full_name = "John Doe";
 //! let age_last_year = 42;
 //!
 //! // The type of `john` is `serde_json::Value`
 //! let john = json!({
-//!   "name": full_name,
-//!   "age": age_last_year + 1,
-//!   "phones": [
-//!     format!("+44 {}", random_phone())
-//!   ]
+//!     "name": full_name,
+//!     "age": age_last_year + 1,
+//!     "phones": [
+//!         format!("+44 {}", random_phone())
+//!     ]
 //! });
-//! #     let _ = john;
-//! # }
 //! ```
 //!
 //! This is amazingly convenient but we have the problem we had before with
@@ -259,14 +242,10 @@
 //! [`serde_json::to_writer`][to_writer] which serializes to any `io::Write`
 //! such as a File or a TCP stream.
 //!
-//! ```rust
-//! extern crate serde;
-//! extern crate serde_json;
-//!
-//! #[macro_use]
-//! extern crate serde_derive;
-//!
-//! use serde_json::Error;
+//! ```edition2018
+//! # use serde_derive::{Deserialize, Serialize};
+//! use serde::{Deserialize, Serialize};
+//! use serde_json::Result;
 //!
 //! #[derive(Serialize, Deserialize)]
 //! struct Address {
@@ -274,7 +253,7 @@
 //!     city: String,
 //! }
 //!
-//! fn print_an_address() -> Result<(), Error> {
+//! fn print_an_address() -> Result<()> {
 //!     // Some data structure.
 //!     let address = Address {
 //!         street: "10 Downing Street".to_owned(),
@@ -315,35 +294,26 @@
 //! [macro]: https://docs.serde.rs/serde_json/macro.json.html
 //! [`serde-json-core`]: https://japaric.github.io/serde-json-core/serde_json_core/
 
-#![doc(html_root_url = "https://docs.rs/serde_json/1.0.33")]
+#![doc(html_root_url = "https://docs.rs/serde_json/1.0.38")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(deprecated_cfg_attr, doc_markdown, needless_pass_by_value,)
-)]
+#![cfg_attr(feature = "cargo-clippy", allow(deprecated_cfg_attr, doc_markdown))]
 // Ignored clippy_pedantic lints
 #![cfg_attr(feature = "cargo-clippy", allow(
     // Deserializer::from_str, into_iter
     should_implement_trait,
     // integer and float ser/de requires these sorts of casts
-    cast_possible_truncation,
     cast_possible_wrap,
     cast_precision_loss,
     cast_sign_loss,
-    // string ser/de uses indexing and slicing
-    indexing_slicing,
     // things are often more readable this way
     cast_lossless,
-    shadow_reuse,
+    module_name_repetitions,
     shadow_unrelated,
     single_match_else,
-    stutter,
     use_self,
-    // not practical
-    missing_docs_in_private_items,
-    similar_names,
+    zero_prefixed_literal,
     // we support older compilers
     redundant_field_names,
 ))]
diff -Nru cargo-0.32.0/vendor/serde_json/src/macros.rs cargo-0.33.0/vendor/serde_json/src/macros.rs
--- cargo-0.32.0/vendor/serde_json/src/macros.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/macros.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,18 +1,8 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 /// Construct a `serde_json::Value` from a JSON literal.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde_json;
+/// ```edition2018
+/// # use serde_json::json;
 /// #
-/// # fn main() {
 /// let value = json!({
 ///     "code": 200,
 ///     "success": true,
@@ -23,7 +13,6 @@
 ///         ]
 ///     }
 /// });
-/// # }
 /// ```
 ///
 /// Variables or expressions can be interpolated into the JSON literal. Any type
@@ -33,38 +22,32 @@
 /// interpolated type decides to fail, or if the interpolated type contains a
 /// map with non-string keys, the `json!` macro will panic.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde_json;
+/// ```edition2018
+/// # use serde_json::json;
 /// #
-/// # fn main() {
 /// let code = 200;
 /// let features = vec!["serde", "json"];
 ///
 /// let value = json!({
-///    "code": code,
-///    "success": code == 200,
-///    "payload": {
-///        features[0]: features[1]
-///    }
+///     "code": code,
+///     "success": code == 200,
+///     "payload": {
+///         features[0]: features[1]
+///     }
 /// });
-/// # }
 /// ```
 ///
 /// Trailing commas are allowed inside both arrays and objects.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde_json;
+/// ```edition2018
+/// # use serde_json::json;
 /// #
-/// # fn main() {
 /// let value = json!([
 ///     "notice",
 ///     "the",
 ///     "trailing",
 ///     "comma -->",
 /// ]);
-/// # }
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! json {
diff -Nru cargo-0.32.0/vendor/serde_json/src/map.rs cargo-0.33.0/vendor/serde_json/src/map.rs
--- cargo-0.32.0/vendor/serde_json/src/map.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/map.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! A map of String to serde_json::Value.
 //!
 //! By default the map is backed by a [`BTreeMap`]. Enable the `preserve_order`
@@ -244,7 +236,7 @@
 /// Access an element of this map. Panics if the given key is not present in the
 /// map.
 ///
-/// ```rust
+/// ```edition2018
 /// # use serde_json::Value;
 /// #
 /// # let val = &Value::String("".to_owned());
@@ -272,16 +264,13 @@
 /// Mutably access an element of this map. Panics if the given key is not
 /// present in the map.
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde_json;
+/// ```edition2018
+/// # use serde_json::json;
 /// #
-/// # fn main() {
-/// #     let mut map = serde_json::Map::new();
-/// #     map.insert("key".to_owned(), serde_json::Value::Null);
+/// # let mut map = serde_json::Map::new();
+/// # map.insert("key".to_owned(), serde_json::Value::Null);
 /// #
 /// map["key"] = json!("value");
-/// # }
 /// ```
 impl<'a, Q: ?Sized> ops::IndexMut<&'a Q> for Map<String, Value>
 where
@@ -451,7 +440,7 @@
     ///
     /// # Examples
     ///
-    /// ```rust
+    /// ```edition2018
     /// let mut map = serde_json::Map::new();
     /// assert_eq!(map.entry("serde").key(), &"serde");
     /// ```
@@ -467,16 +456,13 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut map = serde_json::Map::new();
     /// map.entry("serde").or_insert(json!(12));
     ///
     /// assert_eq!(map["serde"], 12);
-    /// # }
     /// ```
     pub fn or_insert(self, default: Value) -> &'a mut Value {
         match self {
@@ -491,16 +477,13 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut map = serde_json::Map::new();
     /// map.entry("serde").or_insert_with(|| json!("hoho"));
     ///
     /// assert_eq!(map["serde"], "hoho".to_owned());
-    /// # }
     /// ```
     pub fn or_insert_with<F>(self, default: F) -> &'a mut Value
     where
@@ -519,7 +502,7 @@
     ///
     /// # Examples
     ///
-    /// ```rust
+    /// ```edition2018
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -541,11 +524,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -556,7 +537,6 @@
     ///     }
     ///     Entry::Occupied(_) => unimplemented!(),
     /// }
-    /// # }
     /// ```
     #[inline]
     pub fn insert(self, value: Value) -> &'a mut Value {
@@ -569,11 +549,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -585,7 +563,6 @@
     ///     }
     ///     Entry::Vacant(_) => unimplemented!(),
     /// }
-    /// # }
     /// ```
     #[inline]
     pub fn key(&self) -> &String {
@@ -596,11 +573,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -612,7 +587,6 @@
     ///     }
     ///     Entry::Vacant(_) => unimplemented!(),
     /// }
-    /// # }
     /// ```
     #[inline]
     pub fn get(&self) -> &Value {
@@ -623,11 +597,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -641,7 +613,6 @@
     /// }
     ///
     /// assert_eq!(map["serde"].as_array().unwrap().len(), 4);
-    /// # }
     /// ```
     #[inline]
     pub fn get_mut(&mut self) -> &mut Value {
@@ -652,11 +623,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -670,7 +639,6 @@
     /// }
     ///
     /// assert_eq!(map["serde"].as_array().unwrap().len(), 4);
-    /// # }
     /// ```
     #[inline]
     pub fn into_mut(self) -> &'a mut Value {
@@ -682,11 +650,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -699,7 +665,6 @@
     ///     }
     ///     Entry::Vacant(_) => unimplemented!(),
     /// }
-    /// # }
     /// ```
     #[inline]
     pub fn insert(&mut self, value: Value) -> Value {
@@ -710,11 +675,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// use serde_json::map::Entry;
     ///
     /// let mut map = serde_json::Map::new();
@@ -726,7 +689,6 @@
     ///     }
     ///     Entry::Vacant(_) => unimplemented!(),
     /// }
-    /// # }
     /// ```
     #[inline]
     pub fn remove(self) -> Value {
diff -Nru cargo-0.32.0/vendor/serde_json/src/number.rs cargo-0.33.0/vendor/serde_json/src/number.rs
--- cargo-0.32.0/vendor/serde_json/src/number.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/number.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use error::Error;
 use serde::de::{self, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -54,11 +46,9 @@
     /// For any Number on which `is_i64` returns true, `as_i64` is guaranteed to
     /// return the integer value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let big = i64::max_value() as u64 + 10;
     /// let v = json!({ "a": 64, "b": big, "c": 256.0 });
     ///
@@ -69,7 +59,6 @@
     ///
     /// // Numbers with a decimal point are not considered integers.
     /// assert!(!v["c"].is_i64());
-    /// # }
     /// ```
     #[inline]
     pub fn is_i64(&self) -> bool {
@@ -88,11 +77,9 @@
     /// For any Number on which `is_u64` returns true, `as_u64` is guaranteed to
     /// return the integer value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 64, "b": -64, "c": 256.0 });
     ///
     /// assert!(v["a"].is_u64());
@@ -102,7 +89,6 @@
     ///
     /// // Numbers with a decimal point are not considered integers.
     /// assert!(!v["c"].is_u64());
-    /// # }
     /// ```
     #[inline]
     pub fn is_u64(&self) -> bool {
@@ -123,11 +109,9 @@
     /// Currently this function returns true if and only if both `is_i64` and
     /// `is_u64` return false but this is not a guarantee in the future.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 256.0, "b": 64, "c": -64 });
     ///
     /// assert!(v["a"].is_f64());
@@ -135,7 +119,6 @@
     /// // Integers.
     /// assert!(!v["b"].is_f64());
     /// assert!(!v["c"].is_f64());
-    /// # }
     /// ```
     #[inline]
     pub fn is_f64(&self) -> bool {
@@ -158,18 +141,15 @@
     /// If the `Number` is an integer, represent it as i64 if possible. Returns
     /// None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let big = i64::max_value() as u64 + 10;
     /// let v = json!({ "a": 64, "b": big, "c": 256.0 });
     ///
     /// assert_eq!(v["a"].as_i64(), Some(64));
     /// assert_eq!(v["b"].as_i64(), None);
     /// assert_eq!(v["c"].as_i64(), None);
-    /// # }
     /// ```
     #[inline]
     pub fn as_i64(&self) -> Option<i64> {
@@ -192,17 +172,14 @@
     /// If the `Number` is an integer, represent it as u64 if possible. Returns
     /// None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 64, "b": -64, "c": 256.0 });
     ///
     /// assert_eq!(v["a"].as_u64(), Some(64));
     /// assert_eq!(v["b"].as_u64(), None);
     /// assert_eq!(v["c"].as_u64(), None);
-    /// # }
     /// ```
     #[inline]
     pub fn as_u64(&self) -> Option<u64> {
@@ -217,17 +194,14 @@
 
     /// Represents the number as f64 if possible. Returns None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 256.0, "b": 64, "c": -64 });
     ///
     /// assert_eq!(v["a"].as_f64(), Some(256.0));
     /// assert_eq!(v["b"].as_f64(), Some(64.0));
     /// assert_eq!(v["c"].as_f64(), Some(-64.0));
-    /// # }
     /// ```
     #[inline]
     pub fn as_f64(&self) -> Option<f64> {
@@ -244,7 +218,7 @@
     /// Converts a finite `f64` to a `Number`. Infinite or NaN values are not JSON
     /// numbers.
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use std::f64;
     /// #
     /// # use serde_json::Number;
@@ -740,6 +714,21 @@
 impl_from_unsigned!(u8, u16, u32, u64, usize);
 impl_from_signed!(i8, i16, i32, i64, isize);
 
+#[cfg(feature = "arbitrary_precision")]
+serde_if_integer128! {
+    impl From<i128> for Number {
+        fn from(i: i128) -> Self {
+            Number { n: i.to_string() }
+        }
+    }
+
+    impl From<u128> for Number {
+        fn from(u: u128) -> Self {
+            Number { n: u.to_string() }
+        }
+    }
+}
+
 impl Number {
     #[cfg(not(feature = "arbitrary_precision"))]
     // Not public API. Should be pub(crate).
diff -Nru cargo-0.32.0/vendor/serde_json/src/raw.rs cargo-0.33.0/vendor/serde_json/src/raw.rs
--- cargo-0.32.0/vendor/serde_json/src/raw.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/raw.rs	2019-02-06 04:11:58.000000000 +0000
@@ -22,11 +22,9 @@
 ///
 /// # Example
 ///
-/// ```
-/// #[macro_use]
-/// extern crate serde_derive;
-/// extern crate serde_json;
-///
+/// ```edition2018
+/// # use serde_derive::{Deserialize, Serialize};
+/// use serde::{Deserialize, Serialize};
 /// use serde_json::{Result, value::RawValue};
 ///
 /// #[derive(Deserialize)]
@@ -71,11 +69,8 @@
 ///
 /// The typical usage of `RawValue` will be in the borrowed form:
 ///
-/// ```
-/// # #[macro_use]
-/// # extern crate serde_derive;
-/// # extern crate serde_json;
-/// #
+/// ```edition2018
+/// # use serde_derive::Deserialize;
 /// # use serde_json::value::RawValue;
 /// #
 /// #[derive(Deserialize)]
@@ -83,8 +78,6 @@
 ///     #[serde(borrow)]
 ///     raw_value: &'a RawValue,
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// The borrowed form is suitable when deserializing through
@@ -99,19 +92,14 @@
 /// [`serde_json::from_slice`]: ../fn.from_slice.html
 /// [`serde_json::from_reader`]: ../fn.from_reader.html
 ///
-/// ```
-/// # #[macro_use]
-/// # extern crate serde_derive;
-/// # extern crate serde_json;
-/// #
+/// ```edition2018
+/// # use serde_derive::Deserialize;
 /// # use serde_json::value::RawValue;
 /// #
 /// #[derive(Deserialize)]
 /// struct SomeStruct {
 ///     raw_value: Box<RawValue>,
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// # Note
@@ -196,11 +184,9 @@
     ///
     /// # Example
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate serde_derive;
-    /// extern crate serde_json;
-    ///
+    /// ```edition2018
+    /// # use serde_derive::Deserialize;
+    /// use serde::Deserialize;
     /// use serde_json::{Result, value::RawValue};
     ///
     /// #[derive(Deserialize)]
diff -Nru cargo-0.32.0/vendor/serde_json/src/read.rs cargo-0.33.0/vendor/serde_json/src/read.rs
--- cargo-0.32.0/vendor/serde_json/src/read.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/read.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::ops::Deref;
 use std::{char, cmp, io, str};
 
@@ -679,33 +671,33 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-const CT: bool = true; // control character \x00...\x1F
-const QU: bool = true; // quote \x22
-const BS: bool = true; // backslash \x5C
-const O: bool = false; // allow unescaped
-
 // Lookup table of bytes that must be escaped. A value of true at index i means
 // that byte i requires an escape sequence in the input.
-#[cfg_attr(rustfmt, rustfmt_skip)]
-static ESCAPE: [bool; 256] = [
-    //   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-    CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, // 0
-    CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, // 1
-     O,  O, QU,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 2
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 3
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 4
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, BS,  O,  O,  O, // 5
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 6
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 7
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 8
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // 9
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // A
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // B
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // C
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // D
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // E
-     O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O, // F
-];
+static ESCAPE: [bool; 256] = {
+    const CT: bool = true; // control character \x00...\x1F
+    const QU: bool = true; // quote \x22
+    const BS: bool = true; // backslash \x5C
+    const __: bool = false; // allow unescaped
+    [
+        //   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+        CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, // 0
+        CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, CT, // 1
+        __, __, QU, __, __, __, __, __, __, __, __, __, __, __, __, __, // 2
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 3
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 4
+        __, __, __, __, __, __, __, __, __, __, __, __, BS, __, __, __, // 5
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 6
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 7
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 8
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 9
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // A
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // B
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // C
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // D
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // E
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // F
+    ]
+};
 
 fn next_or_eof<'de, R: ?Sized + Read<'de>>(read: &mut R) -> Result<u8> {
     match try!(read.next()) {
@@ -834,26 +826,28 @@
     Ok(())
 }
 
-#[cfg_attr(rustfmt, rustfmt_skip)]
-static HEX: [u8; 256] = [
-    //   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 0
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 1
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 2
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9,255,255,255,255,255,255, // 3
-   255, 10, 11, 12, 13, 14, 15,255,255,255,255,255,255,255,255,255, // 4
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 5
-   255, 10, 11, 12, 13, 14, 15,255,255,255,255,255,255,255,255,255, // 6
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 7
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 8
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // 9
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // A
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // B
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // C
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // D
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // E
-   255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, // F
-];
+static HEX: [u8; 256] = {
+    const __: u8 = 255; // not a hex digit
+    [
+        //   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 0
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 1
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 2
+        00, 01, 02, 03, 04, 05, 06, 07, 08, 09, __, __, __, __, __, __, // 3
+        __, 10, 11, 12, 13, 14, 15, __, __, __, __, __, __, __, __, __, // 4
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 5
+        __, 10, 11, 12, 13, 14, 15, __, __, __, __, __, __, __, __, __, // 6
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 7
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 8
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 9
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // A
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // B
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // C
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // D
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // E
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // F
+    ]
+};
 
 fn decode_hex_val(val: u8) -> Option<u16> {
     let n = HEX[val as usize] as u16;
diff -Nru cargo-0.32.0/vendor/serde_json/src/ser.rs cargo-0.33.0/vendor/serde_json/src/ser.rs
--- cargo-0.32.0/vendor/serde_json/src/ser.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/ser.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Serialize a Rust data structure into JSON data.
 
 use std::fmt;
@@ -995,10 +987,22 @@
 
     serde_if_integer128! {
         fn serialize_i128(self, value: i128) -> Result<()> {
-            self.ser
+            try!(self
+                .ser
+                .formatter
+                .begin_string(&mut self.ser.writer)
+                .map_err(Error::io));
+            try!(self
+                .ser
                 .formatter
                 .write_number_str(&mut self.ser.writer, &value.to_string())
-                .map_err(Error::io)
+                .map_err(Error::io));
+            try!(self
+                .ser
+                .formatter
+                .end_string(&mut self.ser.writer)
+                .map_err(Error::io));
+            Ok(())
         }
     }
 
@@ -1080,10 +1084,22 @@
 
     serde_if_integer128! {
         fn serialize_u128(self, value: u128) -> Result<()> {
-            self.ser
+            try!(self
+                .ser
+                .formatter
+                .begin_string(&mut self.ser.writer)
+                .map_err(Error::io));
+            try!(self
+                .ser
                 .formatter
                 .write_number_str(&mut self.ser.writer, &value.to_string())
-                .map_err(Error::io)
+                .map_err(Error::io));
+            try!(self
+                .ser
+                .formatter
+                .end_string(&mut self.ser.writer)
+                .map_err(Error::io));
+            Ok(())
         }
     }
 
@@ -1584,7 +1600,7 @@
             self::RR => CharEscape::CarriageReturn,
             self::QU => CharEscape::Quote,
             self::BS => CharEscape::ReverseSolidus,
-            self::U => CharEscape::AsciiControl(byte),
+            self::UU => CharEscape::AsciiControl(byte),
             _ => unreachable!(),
         }
     }
@@ -2104,29 +2120,29 @@
 const RR: u8 = b'r'; // \x0D
 const QU: u8 = b'"'; // \x22
 const BS: u8 = b'\\'; // \x5C
-const U: u8 = b'u'; // \x00...\x1F except the ones above
+const UU: u8 = b'u'; // \x00...\x1F except the ones above
+const __: u8 = 0;
 
 // Lookup table of escape sequences. A value of b'x' at index i means that byte
 // i is escaped as "\x" in JSON. A value of 0 means that byte i is not escaped.
-#[cfg_attr(rustfmt, rustfmt_skip)]
 static ESCAPE: [u8; 256] = [
-    //  1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-    U,  U,  U,  U,  U,  U,  U,  U, BB, TT, NN,  U, FF, RR,  U,  U, // 0
-    U,  U,  U,  U,  U,  U,  U,  U,  U,  U,  U,  U,  U,  U,  U,  U, // 1
-    0,  0, QU,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 2
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 3
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 4
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, BS,  0,  0,  0, // 5
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 6
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 7
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 8
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 9
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // A
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // B
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // C
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // D
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // E
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // F
+    //   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+    UU, UU, UU, UU, UU, UU, UU, UU, BB, TT, NN, UU, FF, RR, UU, UU, // 0
+    UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, UU, // 1
+    __, __, QU, __, __, __, __, __, __, __, __, __, __, __, __, __, // 2
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 3
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 4
+    __, __, __, __, __, __, __, __, __, __, __, __, BS, __, __, __, // 5
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 6
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 7
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 8
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 9
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // A
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // B
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // C
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // D
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // E
+    __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // F
 ];
 
 /// Serialize the given data structure as JSON into the IO stream.
diff -Nru cargo-0.32.0/vendor/serde_json/src/value/de.rs cargo-0.33.0/vendor/serde_json/src/value/de.rs
--- cargo-0.32.0/vendor/serde_json/src/value/de.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/value/de.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::borrow::Cow;
 use std::fmt;
 use std::slice;
diff -Nru cargo-0.32.0/vendor/serde_json/src/value/from.rs cargo-0.33.0/vendor/serde_json/src/value/from.rs
--- cargo-0.32.0/vendor/serde_json/src/value/from.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/value/from.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::borrow::Cow;
 
 use super::Value;
@@ -29,20 +21,23 @@
     u8 u16 u32 u64 usize
 }
 
+#[cfg(feature = "arbitrary_precision")]
+serde_if_integer128! {
+    from_integer! {
+        i128 u128
+    }
+}
+
 impl From<f32> for Value {
     /// Convert 32-bit floating point number to `Value`
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let f: f32 = 13.37;
     /// let x: Value = f.into();
-    /// # }
     /// ```
     fn from(f: f32) -> Self {
         From::from(f as f64)
@@ -54,15 +49,11 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let f: f64 = 13.37;
     /// let x: Value = f.into();
-    /// # }
     /// ```
     fn from(f: f64) -> Self {
         Number::from_f64(f).map_or(Value::Null, Value::Number)
@@ -74,15 +65,11 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let b = false;
     /// let x: Value = b.into();
-    /// # }
     /// ```
     fn from(f: bool) -> Self {
         Value::Bool(f)
@@ -94,15 +81,11 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let s: String = "lorem".to_string();
     /// let x: Value = s.into();
-    /// # }
     /// ```
     fn from(f: String) -> Self {
         Value::String(f)
@@ -114,15 +97,11 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let s: &str = "lorem";
     /// let x: Value = s.into();
-    /// # }
     /// ```
     fn from(f: &str) -> Self {
         Value::String(f.to_string())
@@ -134,28 +113,20 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     /// use std::borrow::Cow;
     ///
     /// let s: Cow<str> = Cow::Borrowed("lorem");
     /// let x: Value = s.into();
-    /// # }
     /// ```
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     /// use std::borrow::Cow;
     ///
     /// let s: Cow<str> = Cow::Owned("lorem".to_string());
     /// let x: Value = s.into();
-    /// # }
     /// ```
     fn from(f: Cow<'a, str>) -> Self {
         Value::String(f.into_owned())
@@ -167,16 +138,12 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::{Map, Value};
     ///
     /// let mut m = Map::new();
     /// m.insert("Lorem".to_string(), "ipsum".into());
     /// let x: Value = m.into();
-    /// # }
     /// ```
     fn from(f: Map<String, Value>) -> Self {
         Value::Object(f)
@@ -188,15 +155,11 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let v = vec!["lorem", "ipsum", "dolor"];
     /// let x: Value = v.into();
-    /// # }
     /// ```
     fn from(f: Vec<T>) -> Self {
         Value::Array(f.into_iter().map(Into::into).collect())
@@ -208,15 +171,11 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let v: &[&str] = &["lorem", "ipsum", "dolor"];
     /// let x: Value = v.into();
-    /// # }
     /// ```
     fn from(f: &'a [T]) -> Self {
         Value::Array(f.iter().cloned().map(Into::into).collect())
@@ -228,37 +187,25 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let v = std::iter::repeat(42).take(5);
     /// let x: Value = v.collect();
-    /// # }
     /// ```
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// let v: Vec<_> = vec!["lorem", "ipsum", "dolor"];
     /// let x: Value = v.into_iter().collect();
-    /// # }
     /// ```
     ///
-    /// ```rust
-    /// # extern crate serde_json;
-    /// #
-    /// # fn main() {
+    /// ```edition2018
     /// use std::iter::FromIterator;
     /// use serde_json::Value;
     ///
     /// let x: Value = Value::from_iter(vec!["lorem", "ipsum", "dolor"]);
-    /// # }
     /// ```
     fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self {
         Value::Array(iter.into_iter().map(Into::into).collect())
diff -Nru cargo-0.32.0/vendor/serde_json/src/value/index.rs cargo-0.33.0/vendor/serde_json/src/value/index.rs
--- cargo-0.32.0/vendor/serde_json/src/value/index.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/value/index.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::fmt;
 use std::ops;
 
@@ -28,11 +20,9 @@
 ///
 /// # Examples
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde_json;
+/// ```edition2018
+/// # use serde_json::json;
 /// #
-/// # fn main() {
 /// let data = json!({ "inner": [1, 2, 3] });
 ///
 /// // Data is a JSON map so it can be indexed with a string.
@@ -42,7 +32,6 @@
 /// let first = &inner[0];
 ///
 /// assert_eq!(first, 1);
-/// # }
 /// ```
 pub trait Index: private::Sealed {
     /// Return None if the key is not already in the array or object.
@@ -204,11 +193,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let data = json!({
     ///     "x": {
     ///         "y": ["z", "zz"]
@@ -220,7 +207,6 @@
     ///
     /// assert_eq!(data["a"], json!(null)); // returns null for undefined values
     /// assert_eq!(data["a"]["b"], json!(null)); // does not panic
-    /// # }
     /// ```
     fn index(&self, index: I) -> &Value {
         static NULL: Value = Value::Null;
@@ -246,11 +232,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut data = json!({ "x": 0 });
     ///
     /// // replace an existing key
@@ -266,7 +250,6 @@
     /// data["a"]["b"]["c"]["d"] = json!(true);
     ///
     /// println!("{}", data);
-    /// # }
     /// ```
     fn index_mut(&mut self, index: I) -> &mut Value {
         index.index_or_insert(self)
diff -Nru cargo-0.32.0/vendor/serde_json/src/value/mod.rs cargo-0.33.0/vendor/serde_json/src/value/mod.rs
--- cargo-0.32.0/vendor/serde_json/src/value/mod.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/value/mod.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! The Value enum, a loosely typed way of representing any valid JSON value.
 //!
 //! # Constructing JSON
@@ -14,19 +6,18 @@
 //! objects with very natural JSON syntax. In order to use this macro,
 //! `serde_json` needs to be imported with the `#[macro_use]` attribute.
 //!
-//! ```rust
-//! #[macro_use]
-//! extern crate serde_json;
+//! ```edition2018
+//! use serde_json::json;
 //!
 //! fn main() {
 //!     // The type of `john` is `serde_json::Value`
 //!     let john = json!({
-//!       "name": "John Doe",
-//!       "age": 43,
-//!       "phones": [
-//!         "+44 1234567",
-//!         "+44 2345678"
-//!       ]
+//!         "name": "John Doe",
+//!         "age": 43,
+//!         "phones": [
+//!             "+44 1234567",
+//!             "+44 2345678"
+//!         ]
 //!     });
 //!
 //!     println!("first phone number: {}", john["phones"][0]);
@@ -44,26 +35,22 @@
 //! will check at compile time that the value you are interpolating is able to
 //! be represented as JSON.
 //!
-//! ```rust
-//! # #[macro_use]
-//! # extern crate serde_json;
+//! ```edition2018
+//! # use serde_json::json;
 //! #
 //! # fn random_phone() -> u16 { 0 }
 //! #
-//! # fn main() {
 //! let full_name = "John Doe";
 //! let age_last_year = 42;
 //!
 //! // The type of `john` is `serde_json::Value`
 //! let john = json!({
-//!   "name": full_name,
-//!   "age": age_last_year + 1,
-//!   "phones": [
-//!     format!("+44 {}", random_phone())
-//!   ]
+//!     "name": full_name,
+//!     "age": age_last_year + 1,
+//!     "phones": [
+//!         format!("+44 {}", random_phone())
+//!     ]
 //! });
-//! #     let _ = john;
-//! # }
 //! ```
 //!
 //! A string of JSON data can be parsed into a `serde_json::Value` by the
@@ -72,21 +59,20 @@
 //! [`from_reader`][from_reader] for parsing from any `io::Read` like a File or
 //! a TCP stream.
 //!
-//! ```rust
-//! extern crate serde_json;
-//!
-//! use serde_json::{Value, Error};
+//! ```edition2018
+//! use serde_json::{json, Value, Error};
 //!
 //! fn untyped_example() -> Result<(), Error> {
 //!     // Some JSON input data as a &str. Maybe this comes from the user.
-//!     let data = r#"{
-//!                     "name": "John Doe",
-//!                     "age": 43,
-//!                     "phones": [
-//!                       "+44 1234567",
-//!                       "+44 2345678"
-//!                     ]
-//!                   }"#;
+//!     let data = r#"
+//!         {
+//!             "name": "John Doe",
+//!             "age": 43,
+//!             "phones": [
+//!                 "+44 1234567",
+//!                 "+44 2345678"
+//!             ]
+//!         }"#;
 //!
 //!     // Parse the string of data into serde_json::Value.
 //!     let v: Value = serde_json::from_str(data)?;
@@ -133,61 +119,46 @@
 pub enum Value {
     /// Represents a JSON null value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!(null);
-    /// # }
     /// ```
     Null,
 
     /// Represents a JSON boolean.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!(true);
-    /// # }
     /// ```
     Bool(bool),
 
     /// Represents a JSON number, whether integer or floating point.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!(12.5);
-    /// # }
     /// ```
     Number(Number),
 
     /// Represents a JSON string.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!("a string");
-    /// # }
     /// ```
     String(String),
 
     /// Represents a JSON array.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!(["an", "array"]);
-    /// # }
     /// ```
     Array(Vec<Value>),
 
@@ -199,13 +170,10 @@
     /// allows JSON data to be deserialized into a Value and serialized to a
     /// string while retaining the order of map keys in the input.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "an": "object" });
-    /// # }
     /// ```
     Object(Map<String, Value>),
 }
@@ -247,11 +215,9 @@
 impl fmt::Display for Value {
     /// Display a JSON value as a string.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let json = json!({ "city": "London", "street": "10 Downing Street" });
     ///
     /// // Compact format:
@@ -270,7 +236,6 @@
     /// let pretty = format!("{:#}", json);
     /// assert_eq!(pretty,
     ///     "{\n  \"city\": \"London\",\n  \"street\": \"10 Downing Street\"\n}");
-    /// # }
     /// ```
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let alternate = f.alternate();
@@ -302,11 +267,9 @@
     /// number. Also returns `None` if the given key does not exist in the map
     /// or the given index is not within the bounds of the array.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let object = json!({ "A": 65, "B": 66, "C": 67 });
     /// assert_eq!(*object.get("A").unwrap(), json!(65));
     ///
@@ -314,18 +277,15 @@
     /// assert_eq!(*array.get(2).unwrap(), json!("C"));
     ///
     /// assert_eq!(array.get("A"), None);
-    /// # }
     /// ```
     ///
     /// Square brackets can also be used to index into a value in a more concise
     /// way. This returns `Value::Null` in cases where `get` would have returned
     /// `None`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let object = json!({
     ///     "A": ["a", "á", "à"],
     ///     "B": ["b", "b́"],
@@ -335,7 +295,6 @@
     ///
     /// assert_eq!(object["D"], json!(null));
     /// assert_eq!(object[0]["x"]["y"]["z"], json!(null));
-    /// # }
     /// ```
     pub fn get<I: Index>(&self, index: I) -> Option<&Value> {
         index.index_into(self)
@@ -350,17 +309,14 @@
     /// number. Also returns `None` if the given key does not exist in the map
     /// or the given index is not within the bounds of the array.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut object = json!({ "A": 65, "B": 66, "C": 67 });
     /// *object.get_mut("A").unwrap() = json!(69);
     ///
     /// let mut array = json!([ "A", "B", "C" ]);
     /// *array.get_mut(2).unwrap() = json!("D");
-    /// # }
     /// ```
     pub fn get_mut<I: Index>(&mut self, index: I) -> Option<&mut Value> {
         index.index_into_mut(self)
@@ -372,11 +328,9 @@
     /// `as_object_mut` are guaranteed to return the map representation of the
     /// object.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let obj = json!({ "a": { "nested": true }, "b": ["an", "array"] });
     ///
     /// assert!(obj.is_object());
@@ -384,7 +338,6 @@
     ///
     /// // array, not an object
     /// assert!(!obj["b"].is_object());
-    /// # }
     /// ```
     pub fn is_object(&self) -> bool {
         self.as_object().is_some()
@@ -393,11 +346,9 @@
     /// If the `Value` is an Object, returns the associated Map. Returns None
     /// otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": { "nested": true }, "b": ["an", "array"] });
     ///
     /// // The length of `{"nested": true}` is 1 entry.
@@ -405,7 +356,6 @@
     ///
     /// // The array `["an", "array"]` is not an object.
     /// assert_eq!(v["b"].as_object(), None);
-    /// # }
     /// ```
     pub fn as_object(&self) -> Option<&Map<String, Value>> {
         match *self {
@@ -417,17 +367,13 @@
     /// If the `Value` is an Object, returns the associated mutable Map.
     /// Returns None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut v = json!({ "a": { "nested": true } });
     ///
     /// v["a"].as_object_mut().unwrap().clear();
     /// assert_eq!(v, json!({ "a": {} }));
-    /// # }
-    ///
     /// ```
     pub fn as_object_mut(&mut self) -> Option<&mut Map<String, Value>> {
         match *self {
@@ -442,18 +388,15 @@
     /// `as_array_mut` are guaranteed to return the vector representing the
     /// array.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let obj = json!({ "a": ["an", "array"], "b": { "an": "object" } });
     ///
     /// assert!(obj["a"].is_array());
     ///
     /// // an object, not an array
     /// assert!(!obj["b"].is_array());
-    /// # }
     /// ```
     pub fn is_array(&self) -> bool {
         self.as_array().is_some()
@@ -462,11 +405,9 @@
     /// If the `Value` is an Array, returns the associated vector. Returns None
     /// otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": ["an", "array"], "b": { "an": "object" } });
     ///
     /// // The length of `["an", "array"]` is 2 elements.
@@ -474,7 +415,6 @@
     ///
     /// // The object `{"an": "object"}` is not an array.
     /// assert_eq!(v["b"].as_array(), None);
-    /// # }
     /// ```
     pub fn as_array(&self) -> Option<&Vec<Value>> {
         match *self {
@@ -486,16 +426,13 @@
     /// If the `Value` is an Array, returns the associated mutable vector.
     /// Returns None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut v = json!({ "a": ["an", "array"] });
     ///
     /// v["a"].as_array_mut().unwrap().clear();
     /// assert_eq!(v, json!({ "a": [] }));
-    /// # }
     /// ```
     pub fn as_array_mut(&mut self) -> Option<&mut Vec<Value>> {
         match *self {
@@ -509,18 +446,15 @@
     /// For any Value on which `is_string` returns true, `as_str` is guaranteed
     /// to return the string slice.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": "some string", "b": false });
     ///
     /// assert!(v["a"].is_string());
     ///
     /// // The boolean `false` is not a string.
     /// assert!(!v["b"].is_string());
-    /// # }
     /// ```
     pub fn is_string(&self) -> bool {
         self.as_str().is_some()
@@ -529,11 +463,9 @@
     /// If the `Value` is a String, returns the associated str. Returns None
     /// otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": "some string", "b": false });
     ///
     /// assert_eq!(v["a"].as_str(), Some("some string"));
@@ -550,7 +482,6 @@
     /// //
     /// //    The value is: some string
     /// println!("The value is: {}", v["a"].as_str().unwrap());
-    /// # }
     /// ```
     pub fn as_str(&self) -> Option<&str> {
         match *self {
@@ -561,18 +492,15 @@
 
     /// Returns true if the `Value` is a Number. Returns false otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 1, "b": "2" });
     ///
     /// assert!(v["a"].is_number());
     ///
     /// // The string `"2"` is a string, not a number.
     /// assert!(!v["b"].is_number());
-    /// # }
     /// ```
     pub fn is_number(&self) -> bool {
         match *self {
@@ -587,11 +515,9 @@
     /// For any Value on which `is_i64` returns true, `as_i64` is guaranteed to
     /// return the integer value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let big = i64::max_value() as u64 + 10;
     /// let v = json!({ "a": 64, "b": big, "c": 256.0 });
     ///
@@ -602,7 +528,6 @@
     ///
     /// // Numbers with a decimal point are not considered integers.
     /// assert!(!v["c"].is_i64());
-    /// # }
     /// ```
     pub fn is_i64(&self) -> bool {
         match *self {
@@ -616,11 +541,9 @@
     /// For any Value on which `is_u64` returns true, `as_u64` is guaranteed to
     /// return the integer value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 64, "b": -64, "c": 256.0 });
     ///
     /// assert!(v["a"].is_u64());
@@ -630,7 +553,6 @@
     ///
     /// // Numbers with a decimal point are not considered integers.
     /// assert!(!v["c"].is_u64());
-    /// # }
     /// ```
     pub fn is_u64(&self) -> bool {
         match *self {
@@ -647,11 +569,9 @@
     /// Currently this function returns true if and only if both `is_i64` and
     /// `is_u64` return false but this is not a guarantee in the future.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 256.0, "b": 64, "c": -64 });
     ///
     /// assert!(v["a"].is_f64());
@@ -659,7 +579,6 @@
     /// // Integers.
     /// assert!(!v["b"].is_f64());
     /// assert!(!v["c"].is_f64());
-    /// # }
     /// ```
     pub fn is_f64(&self) -> bool {
         match *self {
@@ -671,18 +590,15 @@
     /// If the `Value` is an integer, represent it as i64 if possible. Returns
     /// None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let big = i64::max_value() as u64 + 10;
     /// let v = json!({ "a": 64, "b": big, "c": 256.0 });
     ///
     /// assert_eq!(v["a"].as_i64(), Some(64));
     /// assert_eq!(v["b"].as_i64(), None);
     /// assert_eq!(v["c"].as_i64(), None);
-    /// # }
     /// ```
     pub fn as_i64(&self) -> Option<i64> {
         match *self {
@@ -694,17 +610,14 @@
     /// If the `Value` is an integer, represent it as u64 if possible. Returns
     /// None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 64, "b": -64, "c": 256.0 });
     ///
     /// assert_eq!(v["a"].as_u64(), Some(64));
     /// assert_eq!(v["b"].as_u64(), None);
     /// assert_eq!(v["c"].as_u64(), None);
-    /// # }
     /// ```
     pub fn as_u64(&self) -> Option<u64> {
         match *self {
@@ -716,17 +629,14 @@
     /// If the `Value` is a number, represent it as f64 if possible. Returns
     /// None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": 256.0, "b": 64, "c": -64 });
     ///
     /// assert_eq!(v["a"].as_f64(), Some(256.0));
     /// assert_eq!(v["b"].as_f64(), Some(64.0));
     /// assert_eq!(v["c"].as_f64(), Some(-64.0));
-    /// # }
     /// ```
     pub fn as_f64(&self) -> Option<f64> {
         match *self {
@@ -740,18 +650,15 @@
     /// For any Value on which `is_boolean` returns true, `as_bool` is
     /// guaranteed to return the boolean value.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": false, "b": "false" });
     ///
     /// assert!(v["a"].is_boolean());
     ///
     /// // The string `"false"` is a string, not a boolean.
     /// assert!(!v["b"].is_boolean());
-    /// # }
     /// ```
     pub fn is_boolean(&self) -> bool {
         self.as_bool().is_some()
@@ -760,18 +667,15 @@
     /// If the `Value` is a Boolean, returns the associated bool. Returns None
     /// otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": false, "b": "false" });
     ///
     /// assert_eq!(v["a"].as_bool(), Some(false));
     ///
     /// // The string `"false"` is a string, not a boolean.
     /// assert_eq!(v["b"].as_bool(), None);
-    /// # }
     /// ```
     pub fn as_bool(&self) -> Option<bool> {
         match *self {
@@ -785,18 +689,15 @@
     /// For any Value on which `is_null` returns true, `as_null` is guaranteed
     /// to return `Some(())`.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": null, "b": false });
     ///
     /// assert!(v["a"].is_null());
     ///
     /// // The boolean `false` is not null.
     /// assert!(!v["b"].is_null());
-    /// # }
     /// ```
     pub fn is_null(&self) -> bool {
         self.as_null().is_some()
@@ -804,18 +705,15 @@
 
     /// If the `Value` is a Null, returns (). Returns None otherwise.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let v = json!({ "a": null, "b": false });
     ///
     /// assert_eq!(v["a"].as_null(), Some(()));
     ///
     /// // The boolean `false` is not null.
     /// assert_eq!(v["b"].as_null(), None);
-    /// # }
     /// ```
     pub fn as_null(&self) -> Option<()> {
         match *self {
@@ -838,11 +736,9 @@
     ///
     /// # Examples
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let data = json!({
     ///     "x": {
     ///         "y": ["z", "zz"]
@@ -851,7 +747,6 @@
     ///
     /// assert_eq!(data.pointer("/x/y/1").unwrap(), &json!("zz"));
     /// assert_eq!(data.pointer("/a/b/c"), None);
-    /// # }
     /// ```
     pub fn pointer<'a>(&'a self, pointer: &str) -> Option<&'a Value> {
         if pointer == "" {
@@ -896,9 +791,7 @@
     ///
     /// # Example of Use
     ///
-    /// ```rust
-    /// extern crate serde_json;
-    ///
+    /// ```edition2018
     /// use serde_json::Value;
     ///
     /// fn main() {
@@ -953,15 +846,12 @@
 
     /// Takes the value out of the `Value`, leaving a `Null` in its place.
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate serde_json;
+    /// ```edition2018
+    /// # use serde_json::json;
     /// #
-    /// # fn main() {
     /// let mut v = json!({ "x": "y" });
     /// assert_eq!(v["x"].take(), json!("y"));
     /// assert_eq!(v, json!({ "x": null }));
-    /// # }
     /// ```
     pub fn take(&mut self) -> Value {
         mem::replace(self, Value::Null)
@@ -974,12 +864,8 @@
 ///
 /// # Examples
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate serde_derive;
-/// #
-/// # extern crate serde_json;
-/// #
+/// ```edition2018
+/// # use serde_derive::Deserialize;
 /// use serde_json::Value;
 ///
 /// #[derive(Deserialize)]
@@ -1018,14 +904,12 @@
 /// Convert a `T` into `serde_json::Value` which is an enum that can represent
 /// any valid JSON data.
 ///
-/// ```rust
-/// extern crate serde;
+/// # Example
 ///
-/// #[macro_use]
-/// extern crate serde_derive;
-///
-/// #[macro_use]
-/// extern crate serde_json;
+/// ```edition2018
+/// # use serde_derive::Serialize;
+/// use serde::Serialize;
+/// use serde_json::json;
 ///
 /// use std::error::Error;
 ///
@@ -1043,9 +927,9 @@
 ///
 ///     // The type of `expected` is `serde_json::Value`
 ///     let expected = json!({
-///                            "fingerprint": "0xF9BA143B95FF6D82",
-///                            "location": "Menlo Park, CA",
-///                          });
+///         "fingerprint": "0xF9BA143B95FF6D82",
+///         "location": "Menlo Park, CA",
+///     });
 ///
 ///     let v = serde_json::to_value(u).unwrap();
 ///     assert_eq!(v, expected);
@@ -1063,9 +947,7 @@
 /// This conversion can fail if `T`'s implementation of `Serialize` decides to
 /// fail, or if `T` contains a map with non-string keys.
 ///
-/// ```rust
-/// extern crate serde_json;
-///
+/// ```edition2018
 /// use std::collections::BTreeMap;
 ///
 /// fn main() {
@@ -1087,22 +969,12 @@
 
 /// Interpret a `serde_json::Value` as an instance of type `T`.
 ///
-/// This conversion can fail if the structure of the Value does not match the
-/// structure expected by `T`, for example if `T` is a struct type but the Value
-/// contains something other than a JSON map. It can also fail if the structure
-/// is correct but `T`'s implementation of `Deserialize` decides that something
-/// is wrong with the data, for example required struct fields are missing from
-/// the JSON map or some number is too big to fit in the expected primitive
-/// type.
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate serde_json;
-///
-/// #[macro_use]
-/// extern crate serde_derive;
+/// # Example
 ///
-/// extern crate serde;
+/// ```edition2018
+/// # use serde_derive::Deserialize;
+/// use serde::Deserialize;
+/// use serde_json::json;
 ///
 /// #[derive(Deserialize, Debug)]
 /// struct User {
@@ -1113,14 +985,24 @@
 /// fn main() {
 ///     // The type of `j` is `serde_json::Value`
 ///     let j = json!({
-///                     "fingerprint": "0xF9BA143B95FF6D82",
-///                     "location": "Menlo Park, CA"
-///                   });
+///         "fingerprint": "0xF9BA143B95FF6D82",
+///         "location": "Menlo Park, CA"
+///     });
 ///
 ///     let u: User = serde_json::from_value(j).unwrap();
 ///     println!("{:#?}", u);
 /// }
 /// ```
+///
+/// # Errors
+///
+/// This conversion can fail if the structure of the Value does not match the
+/// structure expected by `T`, for example if `T` is a struct type but the Value
+/// contains something other than a JSON map. It can also fail if the structure
+/// is correct but `T`'s implementation of `Deserialize` decides that something
+/// is wrong with the data, for example required struct fields are missing from
+/// the JSON map or some number is too big to fit in the expected primitive
+/// type.
 pub fn from_value<T>(value: Value) -> Result<T, Error>
 where
     T: DeserializeOwned,
diff -Nru cargo-0.32.0/vendor/serde_json/src/value/partial_eq.rs cargo-0.33.0/vendor/serde_json/src/value/partial_eq.rs
--- cargo-0.32.0/vendor/serde_json/src/value/partial_eq.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/value/partial_eq.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::Value;
 
 fn eq_i64(value: &Value, other: i64) -> bool {
diff -Nru cargo-0.32.0/vendor/serde_json/src/value/ser.rs cargo-0.33.0/vendor/serde_json/src/value/ser.rs
--- cargo-0.32.0/vendor/serde_json/src/value/ser.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/serde_json/src/value/ser.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2017 Serde Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use serde::ser::Impossible;
 use serde::{self, Serialize};
 
@@ -77,6 +69,13 @@
         Ok(Value::Number(value.into()))
     }
 
+    #[cfg(feature = "arbitrary_precision")]
+    serde_if_integer128! {
+        fn serialize_i128(self, value: i128) -> Result<Value, Error> {
+            Ok(Value::Number(value.into()))
+        }
+    }
+
     #[inline]
     fn serialize_u8(self, value: u8) -> Result<Value, Error> {
         self.serialize_u64(value as u64)
@@ -97,6 +96,13 @@
         Ok(Value::Number(value.into()))
     }
 
+    #[cfg(feature = "arbitrary_precision")]
+    serde_if_integer128! {
+        fn serialize_u128(self, value: u128) -> Result<Value, Error> {
+            Ok(Value::Number(value.into()))
+        }
+    }
+
     #[inline]
     fn serialize_f32(self, value: f32) -> Result<Value, Error> {
         self.serialize_f64(value as f64)
diff -Nru cargo-0.32.0/vendor/shell-escape/.travis.yml cargo-0.33.0/vendor/shell-escape/.travis.yml
--- cargo-0.32.0/vendor/shell-escape/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/shell-escape/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-language: rust
-cache: cargo
-rust:
-- nightly
-- 1.13.0
-script:
-- cargo test
diff -Nru cargo-0.32.0/vendor/smallvec/.cargo-checksum.json cargo-0.33.0/vendor/smallvec/.cargo-checksum.json
--- cargo-0.32.0/vendor/smallvec/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/smallvec/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"}
\ No newline at end of file
+{"files":{},"package":"88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/smallvec/Cargo.toml cargo-0.33.0/vendor/smallvec/Cargo.toml
--- cargo-0.32.0/vendor/smallvec/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/smallvec/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "smallvec"
-version = "0.6.7"
+version = "0.6.8"
 authors = ["Simon Sapin <simon.sapin@exyr.org>"]
 description = "'Small vector' optimization: store up to a small number of items on the stack"
 documentation = "https://doc.servo.org/smallvec/"
diff -Nru cargo-0.32.0/vendor/smallvec/.cargo_vcs_info.json cargo-0.33.0/vendor/smallvec/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/smallvec/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/smallvec/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "e244d0ab3bb6947fd1afd6720f9a246e514fc8fd"
-  }
-}
diff -Nru cargo-0.32.0/vendor/smallvec/lib.rs cargo-0.33.0/vendor/smallvec/lib.rs
--- cargo-0.32.0/vendor/smallvec/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/smallvec/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -60,7 +60,6 @@
 use std::hash::{Hash, Hasher};
 use std::iter::{IntoIterator, FromIterator, repeat};
 use std::mem;
-#[cfg(not(feature = "union"))]
 use std::mem::ManuallyDrop;
 use std::ops;
 use std::ptr;
@@ -268,9 +267,8 @@
 }
 
 #[cfg(feature = "union")]
-#[allow(unions_with_drop_fields)]
 union SmallVecData<A: Array> {
-    inline: A,
+    inline: ManuallyDrop<A>,
     heap: (*mut A::Item, usize),
 }
 
@@ -286,10 +284,10 @@
     }
     #[inline]
     fn from_inline(inline: A) -> SmallVecData<A> {
-        SmallVecData { inline }
+        SmallVecData { inline: ManuallyDrop::new(inline) }
     }
     #[inline]
-    unsafe fn into_inline(self) -> A { self.inline }
+    unsafe fn into_inline(self) -> A { ManuallyDrop::into_inner(self.inline) }
     #[inline]
     unsafe fn heap(&self) -> (*mut A::Item, usize) {
         self.heap
@@ -1342,18 +1340,16 @@
         self.reserve(lower_size_bound);
 
         unsafe {
-            let len = self.len();
-            let ptr = self.as_mut_ptr().offset(len as isize);
-            let mut count = 0;
-            while count < lower_size_bound {
+            let (ptr, len_ptr, cap) = self.triple_mut();
+            let mut len = SetLenOnDrop::new(len_ptr);
+            while len.get() < cap {
                 if let Some(out) = iter.next() {
-                    ptr::write(ptr.offset(count as isize), out);
-                    count += 1;
+                    ptr::write(ptr.offset(len.get() as isize), out);
+                    len.increment_len(1);
                 } else {
                     break;
                 }
             }
-            self.set_len(len + count);
         }
 
         for elem in iter {
@@ -1563,6 +1559,11 @@
     }
 
     #[inline]
+    fn get(&self) -> usize {
+        self.local_len
+    }
+
+    #[inline]
     fn increment_len(&mut self, increment: usize) {
         self.local_len += increment;
     }
diff -Nru cargo-0.32.0/vendor/smallvec/.travis.yml cargo-0.33.0/vendor/smallvec/.travis.yml
--- cargo-0.32.0/vendor/smallvec/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/smallvec/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-language: rust
-rust:
-  - 1.20.0
-  - nightly
-  - beta
-  - stable
-script: |
-  cargo build --verbose &&
-  cargo test --verbose &&
-  cargo test --verbose --features serde &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo check --verbose --no-default-features) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --features union) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --all-features) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo bench --verbose bench)
diff -Nru cargo-0.32.0/vendor/socket2/.appveyor.yml cargo-0.33.0/vendor/socket2/.appveyor.yml
--- cargo-0.32.0/vendor/socket2/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/socket2/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-install:
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo test
-  - cargo test --features reuseport
diff -Nru cargo-0.32.0/vendor/socket2/.travis.yml cargo-0.33.0/vendor/socket2/.travis.yml
--- cargo-0.32.0/vendor/socket2/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/socket2/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: 1.21.0
-    - rust: stable
-    - os: osx
-    - rust: beta
-    - rust: nightly
-
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo doc --no-deps --all-features
-      after_success:
-        - travis-cargo --only nightly doc-upload
-
-    - rust: nightly
-      before_script:
-        - rustup target add x86_64-unknown-redox --toolchain nightly
-      script:
-        - cargo check --target x86_64-unknown-redox
-
-script:
-  - cargo test
-  - cargo test --features "reuseport unix pair"
-
-env:
-  global:
-    secure: "qibsiOrfM/GjYgYFXycSqKMwIK9ZR4cvHZsSqTtqrtxGq5Q7jTwMqdDl8KHDgX1a4it4tGay+7joex8k2zL6OQ+FljQGQq54EDiGw82HWix/fBpOMjMszw+GEDMG/9hUSb6HFdzAKLPAsBRvIs2QteJ60GhL/w4Z/EmfHlVKMnVsYUjfBf5BNlkv8yFvRMY6QqL+F85N7dDQ7JAgdiP79jR7LP8IlCEu/8pgSrf9pSqAHSC1Co1CaN8uhhMlcIIOZ5qYAK4Xty26r2EDzPm5Lw2Bd7a4maN0x+Be2DJvrnX30QkJNNU1XhxYkeZEeUCYAlUhBE5nBHpyyrbAxv+rJodPeyRl5EVpyqi8htPVmcnuA2XpNoHCud7CnzxaFytGvAC5kp0EgS7f3ac4hTnZXCfP0CvnT5UyWfWv9yLwQycdYcAsV4TnKxVAw4ykApGey+h0dyIM2VnzRPOo9D2ZS+JpzPHtx/PXD7aN7IungfTj4PmT+i00QNzkzJR9BqYKmEDBUcz6MLctg4D6xChhN8Go4hvk22F0RVyvEg1MAvXc07EKeWXG/VZ+H2frcPEceMGRBBHiOfOEE/2utNYgvIcmQxd1hvbm3cQOIjeXU2rGneN86cSmx7zNlfOyJUoBfsgGvSEzRxUueibUCaujB/El70HGrMlTnXeERiyd/2Y="
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/stable_deref_trait/.cargo-checksum.json cargo-0.33.0/vendor/stable_deref_trait/.cargo-checksum.json
--- cargo-0.32.0/vendor/stable_deref_trait/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/stable_deref_trait/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/stable_deref_trait/Cargo.toml cargo-0.33.0/vendor/stable_deref_trait/Cargo.toml
--- cargo-0.32.0/vendor/stable_deref_trait/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/stable_deref_trait/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "stable_deref_trait"
-version = "1.1.1"
-authors = ["Robert Grosse <n210241048576@gmail.com>"]
-description = "An unsafe marker trait for types like Box and Rc that dereference to a stable address even when moved, and hence can be used with libraries such as owning_ref and rental.\n"
-documentation = "https://docs.rs/stable_deref_trait/1.1.1/stable_deref_trait"
-readme = "README.md"
-categories = ["memory-management", "no-std"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/storyyeller/stable_deref_trait"
-
-[features]
-alloc = []
-default = ["std"]
-std = []
diff -Nru cargo-0.32.0/vendor/stable_deref_trait/LICENSE-APACHE cargo-0.33.0/vendor/stable_deref_trait/LICENSE-APACHE
--- cargo-0.32.0/vendor/stable_deref_trait/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/stable_deref_trait/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/stable_deref_trait/LICENSE-MIT cargo-0.33.0/vendor/stable_deref_trait/LICENSE-MIT
--- cargo-0.32.0/vendor/stable_deref_trait/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/stable_deref_trait/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2017 Robert Grosse
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/stable_deref_trait/README.md cargo-0.33.0/vendor/stable_deref_trait/README.md
--- cargo-0.32.0/vendor/stable_deref_trait/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/stable_deref_trait/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-This crate defines an unsafe marker trait, StableDeref, for container types which deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.
-
-It is intended to be used by crates such as [owning_ref](https://crates.io/crates/owning_ref) and [rental](https://crates.io/crates/rental), as well as library authors who wish to make their code interoperable with such crates. For example, if you write a custom Vec type, you can implement StableDeref, and then users will be able to use your custom Vec type together with owning_ref and rental.
-
-no_std support can be enabled by disabling default features (specifically "std"). In this case, the trait will not be implemented for the std types mentioned above, but you can still use it for your own types.
-
-Enable the "alloc" feature (with default-features disabled) to have this trait be implemented for the above types from the built-in `alloc` crate, specifically
-* `alloc::boxed::Box`
-* `alloc::vec::Vec`
-* `alloc::rc::Rc`
-* `alloc::arc::Arc`
-* `alloc::string::String`
-
-For example, this crate can be built with alloc support via the following command:
-`cargo build --no-default-features --features alloc`
-
-Or added as a `Cargo.toml` dependency as follows:
-```
-[dependencies.stable_deref_trait]
-version = "<version>"
-default-features = false
-features = [ "alloc" ]
-```
diff -Nru cargo-0.32.0/vendor/stable_deref_trait/src/lib.rs cargo-0.33.0/vendor/stable_deref_trait/src/lib.rs
--- cargo-0.32.0/vendor/stable_deref_trait/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/stable_deref_trait/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-// Copyright 2017 Robert Grosse
-
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-/*!
-This module defines an unsafe marker trait, StableDeref, for container types that deref to a fixed address which is valid even when the containing type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. Additionally, it defines CloneStableDeref for types like Rc where clones deref to the same address.
-
-It is intended to be used by crates such as [owning_ref](https://crates.io/crates/owning_ref) and [rental](https://crates.io/crates/rental), as well as library authors who wish to make their code interoperable with such crates. For example, if you write a custom Vec type, you can implement StableDeref, and then users will be able to use your custom type together with owning_ref and rental.
-
-no_std support can be enabled by disabling default features (specifically "std"). In this case, the trait will not be implemented for the std types mentioned above, but you can still use it for your own types.
-*/
-
-#![cfg_attr(feature = "alloc", feature(alloc))]
-
-#![cfg_attr(not(feature = "std"), no_std)]
-
-#[cfg(feature = "std")]
-extern crate core;
-
-#[cfg(feature = "alloc")]
-extern crate alloc;
-
-use core::ops::Deref;
-
-
-/**
-An unsafe marker trait for types that deref to a stable address, even when moved. For example, this is implemented by Box, Vec, Rc, Arc and String, among others. Even when a Box is moved, the underlying storage remains at a fixed location.
-
-More specifically, implementors must ensure that the result of calling deref() is valid for the lifetime of the object, not just the lifetime of the borrow, and that the deref is valid even if the object is moved. Also, it must be valid even after invoking arbitrary &self methods or doing anything transitively accessible from &Self. If Self also implements DerefMut, the same restrictions apply to deref_mut() and it must remain valid if anything transitively accessible from the result of deref_mut() is mutated/called. Additionally, multiple calls to deref, (and deref_mut if implemented) must return the same address. No requirements are placed on &mut self methods other than deref_mut() and drop(), if applicable.
-
-Basically, it must be valid to convert the result of deref() to a pointer, and later dereference that pointer, as long as the original object is still live, even if it has been moved or &self methods have been called on it. If DerefMut is also implemented, it must be valid to get pointers from deref() and deref_mut() and dereference them while the object is live, as long as you don't simultaneously dereference both of them.
-
-Additionally, Deref and DerefMut implementations must not panic, but users of the trait are not allowed to rely on this fact (so that this restriction can be removed later without breaking backwards compatibility, should the need arise).
-
-Here are some examples to help illustrate the requirements for implementing this trait:
-
-```
-# use std::ops::Deref;
-struct Foo(u8);
-impl Deref for Foo {
-    type Target = u8;
-    fn deref(&self) -> &Self::Target { &self.0 }
-}
-```
-
-Foo cannot implement StableDeref because the int will move when Foo is moved, invalidating the result of deref().
-
-```
-# use std::ops::Deref;
-struct Foo(Box<u8>);
-impl Deref for Foo {
-    type Target = u8;
-    fn deref(&self) -> &Self::Target { &*self.0 }
-}
-```
-
-Foo can safely implement StableDeref, due to the use of Box.
-
-
-```
-# use std::ops::Deref;
-# use std::ops::DerefMut;
-# use std::rc::Rc;
-#[derive(Clone)]
-struct Foo(Rc<u8>);
-impl Deref for Foo {
-    type Target = u8;
-    fn deref(&self) -> &Self::Target { &*self.0 }
-}
-impl DerefMut for Foo {
-    fn deref_mut(&mut self) -> &mut Self::Target { Rc::make_mut(&mut self.0) }
-}
-```
-
-This is a simple implementation of copy-on-write: Foo's deref_mut will copy the underlying int if it is not uniquely owned, ensuring unique access at the point where deref_mut() returns. However, Foo cannot implement StableDeref because calling deref_mut(), followed by clone().deref() will result in mutable and immutable references to the same location. Note that if the DerefMut implementation were removed, Foo could safely implement StableDeref. Likewise, if the Clone implementation were removed, it would be safe to implement StableDeref, although Foo would not be very useful in that case, (without clones, the rc will always be uniquely owned).
-
-
-```
-# use std::ops::Deref;
-struct Foo;
-impl Deref for Foo {
-    type Target = str;
-    fn deref(&self) -> &Self::Target { &"Hello" }
-}
-```
-Foo can safely implement StableDeref. It doesn't own the data being derefed, but the data is gaurenteed to live long enough, due to it being 'static.
-
-```
-# use std::ops::Deref;
-# use std::cell::Cell;
-struct Foo(Cell<bool>);
-impl Deref for Foo {
-    type Target = str;
-    fn deref(&self) -> &Self::Target {
-        let b = self.0.get();
-        self.0.set(!b);
-        if b { &"Hello" } else { &"World" }
-    }
-}
-```
-Foo cannot safely implement StableDeref, even though every possible result of deref lives long enough. In order to safely implement StableAddress, multiple calls to deref must return the same result.
-
-```
-# use std::ops::Deref;
-# use std::ops::DerefMut;
-struct Foo(Box<(u8, u8)>);
-impl Deref for Foo {
-    type Target = u8;
-    fn deref(&self) -> &Self::Target { &self.0.deref().0 }
-}
-impl DerefMut for Foo {
-    fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0.deref_mut().1 }
-}
-```
-
-Foo cannot implement StableDeref because deref and deref_mut return different addresses.
-
-
-*/
-pub unsafe trait StableDeref: Deref {}
-
-/**
-An unsafe marker trait for types where clones deref to the same address. This has all the requirements of StableDeref, and additionally requires that after calling clone(), both the old and new value deref to the same address. For example, Rc and Arc implement CloneStableDeref, but Box and Vec do not.
-
-Note that a single type should never implement both DerefMut and CloneStableDeref. If it did, this would let you get two mutable references to the same location, by cloning and then calling deref_mut() on both values.
-*/
-pub unsafe trait CloneStableDeref: StableDeref + Clone {}
-
-/////////////////////////////////////////////////////////////////////////////
-// std types integration
-/////////////////////////////////////////////////////////////////////////////
-
-#[cfg(all(feature = "std", not(feature = "alloc")))]
-use std::boxed::Box;
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::boxed::Box;
-
-#[cfg(all(feature = "std", not(feature = "alloc")))]
-use std::rc::Rc;
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::rc::Rc;
-
-#[cfg(all(feature = "std", not(feature = "alloc")))]
-use std::sync::Arc;
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::sync::Arc;
-
-#[cfg(all(feature = "std", not(feature = "alloc")))]
-use std::vec::Vec;
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::vec::Vec;
-
-#[cfg(all(feature = "std", not(feature = "alloc")))]
-use std::string::String;
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::string::String;
-
-
-#[cfg(feature = "std")]
-use std::sync::{MutexGuard, RwLockReadGuard, RwLockWriteGuard};
-
-#[cfg(feature = "std")]
-use std::cell::{Ref, RefMut};
-#[cfg(not(feature = "std"))]
-use core::cell::{Ref, RefMut};
-
-
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<T: ?Sized> StableDeref for Box<T> {}
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<T> StableDeref for Vec<T> {}
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl StableDeref for String {}
-
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<T: ?Sized> StableDeref for Rc<T> {}
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<T: ?Sized> CloneStableDeref for Rc<T> {}
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<T: ?Sized> StableDeref for Arc<T> {}
-#[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<T: ?Sized> CloneStableDeref for Arc<T> {}
-
-// #[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<'a, T: ?Sized> StableDeref for Ref<'a, T> {}
-// #[cfg(any(feature = "std", feature = "alloc"))]
-unsafe impl<'a, T: ?Sized> StableDeref for RefMut<'a, T> {}
-#[cfg(feature = "std")]
-unsafe impl<'a, T: ?Sized> StableDeref for MutexGuard<'a, T> {}
-#[cfg(feature = "std")]
-unsafe impl<'a, T: ?Sized> StableDeref for RwLockReadGuard<'a, T> {}
-#[cfg(feature = "std")]
-unsafe impl<'a, T: ?Sized> StableDeref for RwLockWriteGuard<'a, T> {}
-
-unsafe impl<'a, T: ?Sized> StableDeref for &'a T {}
-unsafe impl<'a, T: ?Sized> CloneStableDeref for &'a T {}
-unsafe impl<'a, T: ?Sized> StableDeref for &'a mut T {}
diff -Nru cargo-0.32.0/vendor/strsim/.editorconfig cargo-0.33.0/vendor/strsim/.editorconfig
--- cargo-0.32.0/vendor/strsim/.editorconfig	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/strsim/.editorconfig	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_brace_style = K&R
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-max_line_length = 80
-trim_trailing_whitespace = true
-
diff -Nru cargo-0.32.0/vendor/strsim/.travis.yml cargo-0.33.0/vendor/strsim/.travis.yml
--- cargo-0.32.0/vendor/strsim/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/strsim/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-language: rust
-
-rust:
-    - nightly
-    - beta
-    - stable
-
-matrix:
-    allow_failures:
-        - rust: nightly
-
diff -Nru cargo-0.32.0/vendor/syn/.cargo-checksum.json cargo-0.33.0/vendor/syn/.cargo-checksum.json
--- cargo-0.32.0/vendor/syn/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7"}
\ No newline at end of file
+{"files":{},"package":"f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/syn/Cargo.toml cargo-0.33.0/vendor/syn/Cargo.toml
--- cargo-0.32.0/vendor/syn/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "syn"
-version = "0.15.22"
+version = "0.15.26"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 include = ["/Cargo.toml", "/src/**/*.rs", "/README.md", "/LICENSE-APACHE", "/LICENSE-MIT"]
 description = "Parser for Rust source code"
diff -Nru cargo-0.32.0/vendor/syn/.cargo_vcs_info.json cargo-0.33.0/vendor/syn/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/syn/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "dd08f48cd6293ac43cc763d67409396bb97027b6"
-  }
-}
diff -Nru cargo-0.32.0/vendor/syn/LICENSE-MIT cargo-0.33.0/vendor/syn/LICENSE-MIT
--- cargo-0.32.0/vendor/syn/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -1,5 +1,3 @@
-Copyright (c) 2018 Syn Developers
-
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the
diff -Nru cargo-0.32.0/vendor/syn/README.md cargo-0.33.0/vendor/syn/README.md
--- cargo-0.32.0/vendor/syn/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -81,12 +81,9 @@
 
 ```rust
 extern crate proc_macro;
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
 
 use proc_macro::TokenStream;
+use quote::quote;
 use syn::{parse_macro_input, DeriveInput};
 
 #[proc_macro_derive(MyMacro)]
diff -Nru cargo-0.32.0/vendor/syn/src/attr.rs cargo-0.33.0/vendor/syn/src/attr.rs
--- cargo-0.32.0/vendor/syn/src/attr.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/attr.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use punctuated::Punctuated;
 
@@ -77,11 +69,8 @@
     /// [`Attribute::parse_outer`]: #method.parse_outer
     /// [`Attribute::parse_inner`]: #method.parse_inner
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{Attribute, Ident, Result};
+    /// ```edition2018
+    /// use syn::{Attribute, Ident, Result, Token};
     /// use syn::parse::{Parse, ParseStream};
     ///
     /// // Parses a unit struct with attributes.
@@ -105,8 +94,6 @@
     ///         })
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub struct Attribute #manual_extra_traits {
         pub pound_token: Token![#],
@@ -483,7 +470,7 @@
 /// For example if we are developing an attribute macro that is intended to be
 /// invoked on function items as follows:
 ///
-/// ```rust
+/// ```edition2018
 /// # const IGNORE: &str = stringify! {
 /// #[my_attribute(path = "/v1/refresh")]
 /// # };
@@ -495,14 +482,11 @@
 /// The implementation of this macro would want to parse its attribute arguments
 /// as type `AttributeArgs`.
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
+/// ```edition2018
 /// extern crate proc_macro;
 ///
 /// use proc_macro::TokenStream;
-/// use syn::{AttributeArgs, ItemFn};
+/// use syn::{parse_macro_input, AttributeArgs, ItemFn};
 ///
 /// # const IGNORE: &str = stringify! {
 /// #[proc_macro_attribute]
@@ -514,8 +498,6 @@
 ///     /* ... */
 /// #   "".parse().unwrap()
 /// }
-/// #
-/// # fn main() {}
 /// ```
 pub type AttributeArgs = Vec<NestedMeta>;
 
diff -Nru cargo-0.32.0/vendor/syn/src/buffer.rs cargo-0.33.0/vendor/syn/src/buffer.rs
--- cargo-0.32.0/vendor/syn/src/buffer.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/buffer.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,19 +1,11 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! A stably addressed token buffer supporting efficient traversal based on a
 //! cheaply copyable cursor.
 //!
 //! *This module is available if Syn is built with the `"parsing"` feature.*
 
-// This module is heavily commented as it contains the only unsafe code in Syn,
-// and caution should be used when editing it. The public-facing interface is
-// 100% safe but the implementation is fragile internally.
+// This module is heavily commented as it contains most of the unsafe code in
+// Syn, and caution should be used when editing it. The public-facing interface
+// is 100% safe but the implementation is fragile internally.
 
 #[cfg(all(
     not(all(target_arch = "wasm32", target_os = "unknown")),
@@ -25,6 +17,7 @@
 use std::marker::PhantomData;
 use std::ptr;
 
+use private;
 use Lifetime;
 
 /// Internal type which is used instead of `TokenTree` to represent a token tree
@@ -353,3 +346,21 @@
         }
     }
 }
+
+impl private {
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn open_span_of_group(cursor: Cursor) -> Span {
+        match *cursor.entry() {
+            Entry::Group(ref group, _) => group.span_open(),
+            _ => cursor.span(),
+        }
+    }
+
+    #[cfg(procmacro2_semver_exempt)]
+    pub fn close_span_of_group(cursor: Cursor) -> Span {
+        match *cursor.entry() {
+            Entry::Group(ref group, _) => group.span_close(),
+            _ => cursor.span(),
+        }
+    }
+}
diff -Nru cargo-0.32.0/vendor/syn/src/data.rs cargo-0.33.0/vendor/syn/src/data.rs
--- cargo-0.32.0/vendor/syn/src/data.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/data.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use punctuated::Punctuated;
 
diff -Nru cargo-0.32.0/vendor/syn/src/derive.rs cargo-0.33.0/vendor/syn/src/derive.rs
--- cargo-0.32.0/vendor/syn/src/derive.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/derive.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use punctuated::Punctuated;
 
diff -Nru cargo-0.32.0/vendor/syn/src/error.rs cargo-0.33.0/vendor/syn/src/error.rs
--- cargo-0.32.0/vendor/syn/src/error.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/error.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std;
 use std::fmt::{self, Display};
 use std::iter::FromIterator;
@@ -18,6 +10,8 @@
 
 #[cfg(feature = "parsing")]
 use buffer::Cursor;
+#[cfg(all(procmacro2_semver_exempt, feature = "parsing"))]
+use private;
 use thread::ThreadBound;
 
 /// The result of a Syn parser.
@@ -59,11 +53,8 @@
     ///
     /// # Example
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{Error, Ident, LitStr, Result};
+    /// ```edition2018
+    /// use syn::{Error, Ident, LitStr, Result, Token};
     /// use syn::parse::ParseStream;
     ///
     /// // Parses input that looks like `name = "string"` where the key must be
@@ -80,8 +71,6 @@
     ///     let s: LitStr = input.parse()?;
     ///     Ok(s)
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn new<T: Display>(span: Span, message: T) -> Self {
         Error {
@@ -184,7 +173,11 @@
     if cursor.eof() {
         Error::new(scope, format!("unexpected end of input, {}", message))
     } else {
-        Error::new(cursor.span(), message)
+        #[cfg(procmacro2_semver_exempt)]
+        let span = private::open_span_of_group(cursor);
+        #[cfg(not(procmacro2_semver_exempt))]
+        let span = cursor.span();
+        Error::new(span, message)
     }
 }
 
diff -Nru cargo-0.32.0/vendor/syn/src/expr.rs cargo-0.33.0/vendor/syn/src/expr.rs
--- cargo-0.32.0/vendor/syn/src/expr.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/expr.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use proc_macro2::{Span, TokenStream};
 use punctuated::Punctuated;
@@ -27,7 +19,7 @@
     /// This type is a syntax tree enum. In Syn this and other syntax tree enums
     /// are designed to be traversed using the following rebinding idiom.
     ///
-    /// ```
+    /// ```edition2018
     /// # use syn::Expr;
     /// #
     /// # fn example(expr: Expr) {
@@ -60,7 +52,7 @@
     ///
     /// The pattern is similar if the input expression is borrowed:
     ///
-    /// ```
+    /// ```edition2018
     /// # use syn::Expr;
     /// #
     /// # fn example(expr: &Expr) {
@@ -74,7 +66,7 @@
     ///
     /// This approach avoids repeating the variant names twice on every line.
     ///
-    /// ```
+    /// ```edition2018
     /// # use syn::{Expr, ExprMethodCall};
     /// #
     /// # fn example(expr: Expr) {
@@ -89,7 +81,7 @@
     /// In general, the name to which a syntax tree enum variant is bound should
     /// be a suitable name for the complete syntax tree enum type.
     ///
-    /// ```
+    /// ```edition2018
     /// # use syn::{Expr, ExprField};
     /// #
     /// # fn example(discriminant: &ExprField) {
@@ -919,7 +911,7 @@
     ///
     /// As in:
     ///
-    /// ```rust
+    /// ```edition2018
     /// # fn f() -> bool {
     /// #     let n = 0;
     /// match n {
@@ -1783,6 +1775,7 @@
             let_token: input.parse()?,
             pats: {
                 let mut pats = Punctuated::new();
+                input.parse::<Option<Token![|]>>()?;
                 let value: Pat = input.parse()?;
                 pats.push_value(value);
                 while input.peek(Token![|]) && !input.peek(Token![||]) && !input.peek(Token![|=]) {
@@ -2299,11 +2292,8 @@
         ///
         /// # Example
         ///
-        /// ```
-        /// #[macro_use]
-        /// extern crate syn;
-        ///
-        /// use syn::{token, Attribute, Block, Ident, Result, Stmt};
+        /// ```edition2018
+        /// use syn::{braced, token, Attribute, Block, Ident, Result, Stmt, Token};
         /// use syn::parse::{Parse, ParseStream};
         ///
         /// // Parse a function with no generics or parameter list.
@@ -2345,8 +2335,6 @@
         ///         })
         ///     }
         /// }
-        /// #
-        /// # fn main() {}
         /// ```
         pub fn parse_within(input: ParseStream) -> Result<Vec<Stmt>> {
             let mut stmts = Vec::new();
diff -Nru cargo-0.32.0/vendor/syn/src/ext.rs cargo-0.33.0/vendor/syn/src/ext.rs
--- cargo-0.32.0/vendor/syn/src/ext.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/ext.rs	2019-02-06 04:11:58.000000000 +0000
@@ -17,11 +17,8 @@
     /// This is useful when parsing a DSL which allows Rust keywords as
     /// identifiers.
     ///
-    /// ```rust
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{Error, Ident, Result};
+    /// ```edition2018
+    /// use syn::{Error, Ident, Result, Token};
     /// use syn::ext::IdentExt;
     /// use syn::parse::ParseStream;
     ///
@@ -41,8 +38,6 @@
     ///     let name = input.call(Ident::parse_any)?;
     ///     Ok(name)
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     fn parse_any(input: ParseStream) -> Result<Self>;
 }
diff -Nru cargo-0.32.0/vendor/syn/src/file.rs cargo-0.33.0/vendor/syn/src/file.rs
--- cargo-0.32.0/vendor/syn/src/file.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/file.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 
 ast_struct! {
@@ -18,9 +10,7 @@
     /// Parse a Rust source file into a `syn::File` and print out a debug
     /// representation of the syntax tree.
     ///
-    /// ```
-    /// # extern crate syn;
-    /// #
+    /// ```edition2018
     /// use std::env;
     /// use std::fs::File;
     /// use std::io::Read;
diff -Nru cargo-0.32.0/vendor/syn/src/generics.rs cargo-0.33.0/vendor/syn/src/generics.rs
--- cargo-0.32.0/vendor/syn/src/generics.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/generics.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use punctuated::{Iter, IterMut, Punctuated};
 
@@ -300,14 +292,9 @@
     /// Split a type's generics into the pieces required for impl'ing a trait
     /// for that type.
     ///
-    /// ```
-    /// # #[macro_use]
-    /// # extern crate quote;
-    /// #
-    /// # extern crate proc_macro2;
-    /// # extern crate syn;
-    /// #
+    /// ```edition2018
     /// # use proc_macro2::{Span, Ident};
+    /// # use quote::quote;
     /// #
     /// # fn main() {
     /// #     let generics: syn::Generics = Default::default();
diff -Nru cargo-0.32.0/vendor/syn/src/gen_helper.rs cargo-0.33.0/vendor/syn/src/gen_helper.rs
--- cargo-0.32.0/vendor/syn/src/gen_helper.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/gen_helper.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[cfg(feature = "fold")]
 pub mod fold {
     use fold::Fold;
diff -Nru cargo-0.32.0/vendor/syn/src/group.rs cargo-0.33.0/vendor/syn/src/group.rs
--- cargo-0.32.0/vendor/syn/src/group.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/group.rs	2019-02-06 04:11:58.000000000 +0000
@@ -74,9 +74,13 @@
 fn parse_delimited(input: ParseStream, delimiter: Delimiter) -> Result<(Span, ParseBuffer)> {
     input.step(|cursor| {
         if let Some((content, span, rest)) = cursor.group(delimiter) {
-            let unexpected = private::get_unexpected(input);
+            #[cfg(procmacro2_semver_exempt)]
+            let scope = private::close_span_of_group(*cursor);
+            #[cfg(not(procmacro2_semver_exempt))]
+            let scope = span;
             let nested = private::advance_step_cursor(cursor, content);
-            let content = private::new_parse_buffer(span, nested, unexpected);
+            let unexpected = private::get_unexpected(input);
+            let content = private::new_parse_buffer(scope, nested, unexpected);
             Ok(((span, content), rest))
         } else {
             let message = match delimiter {
@@ -94,14 +98,10 @@
 ///
 /// # Example
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate quote;
+/// ```edition2018
+/// # use quote::quote;
 /// #
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{token, Ident, Result, Type};
+/// use syn::{parenthesized, token, Ident, Result, Token, Type};
 /// use syn::parse::{Parse, ParseStream};
 /// use syn::punctuated::Punctuated;
 ///
@@ -155,13 +155,10 @@
 ///
 /// # Example
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate quote;
+/// ```edition2018
+/// # use quote::quote;
 /// #
-/// #[macro_use]
-/// extern crate syn;
-/// use syn::{token, Ident, Result, Type};
+/// use syn::{braced, token, Ident, Result, Token, Type};
 /// use syn::parse::{Parse, ParseStream};
 /// use syn::punctuated::Punctuated;
 ///
@@ -236,17 +233,11 @@
 ///
 /// # Example
 ///
-/// ```rust
-/// # #[macro_use]
-/// # extern crate quote;
+/// ```edition2018
+/// # use quote::quote;
 /// #
-/// #[macro_use]
-/// extern crate syn;
-///
-/// extern crate proc_macro2;
-///
 /// use proc_macro2::TokenStream;
-/// use syn::{token, Result};
+/// use syn::{bracketed, token, Result, Token};
 /// use syn::parse::{Parse, ParseStream};
 ///
 /// // Parse an outer attribute like:
diff -Nru cargo-0.32.0/vendor/syn/src/item.rs cargo-0.33.0/vendor/syn/src/item.rs
--- cargo-0.32.0/vendor/syn/src/item.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/item.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use derive::{Data, DeriveInput};
 use proc_macro2::TokenStream;
@@ -770,6 +762,8 @@
 
     use ext::IdentExt;
     use parse::{Parse, ParseStream, Result};
+    use proc_macro2::{Punct, Spacing, TokenTree};
+    use std::iter::FromIterator;
 
     impl Parse for Item {
         fn parse(input: ParseStream) -> Result<Self> {
@@ -903,17 +897,54 @@
     // TODO: figure out the actual grammar; is body required to be braced?
     impl Parse for ItemMacro2 {
         fn parse(input: ParseStream) -> Result<Self> {
+            let attrs = input.call(Attribute::parse_outer)?;
+            let vis: Visibility = input.parse()?;
+            let macro_token: Token![macro] = input.parse()?;
+            let ident: Ident = input.parse()?;
+
+            let paren_token;
             let args;
+            let brace_token;
             let body;
+            let lookahead = input.lookahead1();
+            if lookahead.peek(token::Paren) {
+                let paren_content;
+                paren_token = parenthesized!(paren_content in input);
+                args = paren_content.parse()?;
+
+                let brace_content;
+                brace_token = braced!(brace_content in input);
+                body = brace_content.parse()?;
+            } else if lookahead.peek(token::Brace) {
+                // Hack: the ItemMacro2 syntax tree will need to change so that
+                // we can store None for the args.
+                //
+                // https://github.com/dtolnay/syn/issues/548
+                //
+                // For now, store some sentinel tokens that are otherwise
+                // illegal.
+                paren_token = token::Paren::default();
+                args = TokenStream::from_iter(vec![
+                    TokenTree::Punct(Punct::new('$', Spacing::Alone)),
+                    TokenTree::Punct(Punct::new('$', Spacing::Alone)),
+                ]);
+
+                let brace_content;
+                brace_token = braced!(brace_content in input);
+                body = brace_content.parse()?;
+            } else {
+                return Err(lookahead.error());
+            }
+
             Ok(ItemMacro2 {
-                attrs: input.call(Attribute::parse_outer)?,
-                vis: input.parse()?,
-                macro_token: input.parse()?,
-                ident: input.parse()?,
-                paren_token: parenthesized!(args in input),
-                args: args.parse()?,
-                brace_token: braced!(body in input),
-                body: body.parse()?,
+                attrs: attrs,
+                vis: vis,
+                macro_token: macro_token,
+                ident: ident,
+                paren_token: paren_token,
+                args: args,
+                brace_token: brace_token,
+                body: body,
             })
         }
     }
@@ -925,7 +956,13 @@
                 vis: input.parse()?,
                 extern_token: input.parse()?,
                 crate_token: input.parse()?,
-                ident: input.parse()?,
+                ident: {
+                    if input.peek(Token![self]) {
+                        input.call(Ident::parse_any)?
+                    } else {
+                        input.parse()?
+                    }
+                },
                 rename: {
                     if input.peek(Token![as]) {
                         let as_token: Token![as] = input.parse()?;
@@ -2319,9 +2356,14 @@
             self.vis.to_tokens(tokens);
             self.macro_token.to_tokens(tokens);
             self.ident.to_tokens(tokens);
-            self.paren_token.surround(tokens, |tokens| {
-                self.args.to_tokens(tokens);
-            });
+
+            // Hack: see comment in impl Parse for ItemMacro2.
+            if self.args.to_string() != "$ $" {
+                self.paren_token.surround(tokens, |tokens| {
+                    self.args.to_tokens(tokens);
+                });
+            }
+
             self.brace_token.surround(tokens, |tokens| {
                 self.body.to_tokens(tokens);
             });
diff -Nru cargo-0.32.0/vendor/syn/src/keyword.rs cargo-0.33.0/vendor/syn/src/keyword.rs
--- cargo-0.32.0/vendor/syn/src/keyword.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/keyword.rs	2019-02-06 04:11:58.000000000 +0000
@@ -7,15 +7,10 @@
 /// module called `kw` or `keyword` and that the resulting parser be invoked
 /// with a `kw::` or `keyword::` prefix.
 ///
-/// ```
-/// # #[macro_use]
-/// # extern crate syn;
-/// #
+/// ```edition2018
 /// mod kw {
-///     custom_keyword!(whatever);
+///     syn::custom_keyword!(whatever);
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// The generated syntax tree node supports the following operations just like
@@ -48,16 +43,13 @@
 /// identifier that is not a keyword, these can be declared as custom keywords
 /// by crates that need to use them as such.
 ///
-/// ```
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{LitBool, LitStr, Result};
+/// ```edition2018
+/// use syn::{LitBool, LitStr, Result, Token};
 /// use syn::parse::{Parse, ParseStream};
 ///
 /// mod kw {
-///     custom_keyword!(bool);
-///     custom_keyword!(str);
+///     syn::custom_keyword!(bool);
+///     syn::custom_keyword!(str);
 /// }
 ///
 /// enum Argument {
@@ -93,12 +85,11 @@
 ///         }
 ///     }
 /// }
-/// #
-/// # fn main() {}
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! custom_keyword {
     ($ident:ident) => {
+        #[allow(non_camel_case_types)]
         pub struct $ident {
             pub span: $crate::export::Span,
         }
diff -Nru cargo-0.32.0/vendor/syn/src/lib.rs cargo-0.33.0/vendor/syn/src/lib.rs
--- cargo-0.32.0/vendor/syn/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Syn is a parsing library for parsing a stream of Rust tokens into a syntax
 //! tree of Rust source code.
 //!
@@ -72,16 +64,12 @@
 //! proc-macro = true
 //! ```
 //!
-//! ```rust
-//! #[macro_use]
-//! extern crate quote;
-//! #[macro_use]
-//! extern crate syn;
-//!
+//! ```edition2018
 //! extern crate proc_macro;
 //!
 //! use proc_macro::TokenStream;
-//! use syn::DeriveInput;
+//! use quote::quote;
+//! use syn::{parse_macro_input, DeriveInput};
 //!
 //! # const IGNORE_TOKENS: &str = stringify! {
 //! #[proc_macro_derive(MyMacro)]
@@ -98,8 +86,6 @@
 //!     // Hand the output tokens back to the compiler
 //!     TokenStream::from(expanded)
 //! }
-//! #
-//! # fn main() {}
 //! ```
 //!
 //! The [`heapsize`] example directory shows a complete working Macros 1.1
@@ -109,7 +95,7 @@
 //!
 //! [`heapsize`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize
 //!
-//! ```rust
+//! ```edition2018
 //! pub trait HeapSize {
 //!     /// Total number of bytes of heap memory owned by `self`.
 //!     fn heap_size_of_children(&self) -> usize;
@@ -119,7 +105,7 @@
 //! The custom derive allows users to write `#[derive(HeapSize)]` on data
 //! structures in their program.
 //!
-//! ```rust
+//! ```edition2018
 //! # const IGNORE_TOKENS: &str = stringify! {
 //! #[derive(HeapSize)]
 //! # };
@@ -137,7 +123,7 @@
 //! compiler's error messages are displayed in user code. Consider the error the
 //! user sees if one of their field types does not implement `HeapSize`.
 //!
-//! ```rust
+//! ```edition2018
 //! # const IGNORE_TOKENS: &str = stringify! {
 //! #[derive(HeapSize)]
 //! # };
@@ -171,7 +157,7 @@
 //! The example reimplements the popular `lazy_static` crate from crates.io as a
 //! procedural macro.
 //!
-//! ```
+//! ```edition2018
 //! # macro_rules! lazy_static {
 //! #     ($($tt:tt)*) => {}
 //! # }
@@ -236,7 +222,7 @@
 //!   dynamic library libproc_macro from rustc toolchain.
 
 // Syn types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/syn/0.15.22")]
+#![doc(html_root_url = "https://docs.rs/syn/0.15.26")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints.
@@ -265,10 +251,10 @@
         empty_enum,
         if_not_else,
         items_after_statements,
+        module_name_repetitions,
         shadow_unrelated,
         similar_names,
         single_match_else,
-        stutter,
         unseparated_literal_suffix,
         use_self,
         used_underscore_binding,
@@ -441,7 +427,7 @@
     ///
     /// [`Visit`]: trait.Visit.html
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
     /// #
     /// pub trait Visit<'ast> {
@@ -477,7 +463,7 @@
     ///
     /// [`VisitMut`]: trait.VisitMut.html
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
     /// #
     /// pub trait VisitMut {
@@ -513,7 +499,7 @@
     ///
     /// [`Fold`]: trait.Fold.html
     ///
-    /// ```rust
+    /// ```edition2018
     /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
     /// #
     /// pub trait Fold {
@@ -596,14 +582,11 @@
 ///
 /// # Examples
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate quote;
-///
+/// ```edition2018
 /// extern crate proc_macro;
-/// extern crate syn;
 ///
 /// use proc_macro::TokenStream;
+/// use quote::quote;
 /// use syn::DeriveInput;
 ///
 /// # const IGNORE_TOKENS: &str = stringify! {
@@ -621,8 +604,6 @@
 ///     // Convert into a token stream and return it
 ///     expanded.into()
 /// }
-/// #
-/// # fn main() {}
 /// ```
 #[cfg(all(
     not(all(target_arch = "wasm32", target_os = "unknown")),
@@ -661,9 +642,7 @@
 ///
 /// # Examples
 ///
-/// ```rust
-/// # extern crate syn;
-/// #
+/// ```edition2018
 /// use syn::{Expr, Result};
 ///
 /// fn run() -> Result<()> {
@@ -673,7 +652,9 @@
 ///     Ok(())
 /// }
 /// #
-/// # fn main() { run().unwrap() }
+/// # fn main() {
+/// #     run().unwrap();
+/// # }
 /// ```
 #[cfg(feature = "parsing")]
 pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
@@ -695,9 +676,7 @@
 ///
 /// # Examples
 ///
-/// ```rust,no_run
-/// # extern crate syn;
-/// #
+/// ```edition2018,no_run
 /// use std::error::Error;
 /// use std::fs::File;
 /// use std::io::Read;
@@ -716,7 +695,9 @@
 ///     Ok(())
 /// }
 /// #
-/// # fn main() { run().unwrap() }
+/// # fn main() {
+/// #     run().unwrap();
+/// # }
 /// ```
 #[cfg(all(feature = "parsing", feature = "full"))]
 pub fn parse_file(mut content: &str) -> Result<File> {
diff -Nru cargo-0.32.0/vendor/syn/src/lifetime.rs cargo-0.33.0/vendor/syn/src/lifetime.rs
--- cargo-0.32.0/vendor/syn/src/lifetime.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/lifetime.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::cmp::Ordering;
 use std::fmt::{self, Display};
 use std::hash::{Hash, Hasher};
@@ -43,10 +35,7 @@
     ///
     /// # Invocation
     ///
-    /// ```
-    /// # extern crate proc_macro2;
-    /// # extern crate syn;
-    /// #
+    /// ```edition2018
     /// # use proc_macro2::Span;
     /// # use syn::Lifetime;
     /// #
diff -Nru cargo-0.32.0/vendor/syn/src/lit.rs cargo-0.33.0/vendor/syn/src/lit.rs
--- cargo-0.32.0/vendor/syn/src/lit.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/lit.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use proc_macro2::{Literal, Span};
 use std::str;
 
@@ -129,10 +121,7 @@
     ///
     /// # Example
     ///
-    /// ```
-    /// # extern crate proc_macro2;
-    /// # extern crate syn;
-    /// #
+    /// ```edition2018
     /// use proc_macro2::Span;
     /// use syn::{Attribute, Error, Ident, Lit, Meta, MetaNameValue, Path, Result};
     ///
diff -Nru cargo-0.32.0/vendor/syn/src/lookahead.rs cargo-0.33.0/vendor/syn/src/lookahead.rs
--- cargo-0.32.0/vendor/syn/src/lookahead.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/lookahead.rs	2019-02-06 04:11:58.000000000 +0000
@@ -21,11 +21,8 @@
 ///
 /// # Example
 ///
-/// ```
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, Result, TypeParam};
+/// ```edition2018
+/// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, Result, Token, TypeParam};
 /// use syn::parse::{Parse, ParseStream};
 ///
 /// // A generic parameter, a single one of the comma-separated elements inside
@@ -59,8 +56,6 @@
 ///         }
 ///     }
 /// }
-/// #
-/// # fn main() {}
 /// ```
 pub struct Lookahead1<'a> {
     scope: Span,
diff -Nru cargo-0.32.0/vendor/syn/src/macros.rs cargo-0.33.0/vendor/syn/src/macros.rs
--- cargo-0.32.0/vendor/syn/src/macros.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/macros.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[cfg(any(feature = "full", feature = "derive"))]
 macro_rules! ast_struct {
     (
diff -Nru cargo-0.32.0/vendor/syn/src/mac.rs cargo-0.33.0/vendor/syn/src/mac.rs
--- cargo-0.32.0/vendor/syn/src/mac.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/mac.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use proc_macro2::TokenStream;
 #[cfg(feature = "parsing")]
diff -Nru cargo-0.32.0/vendor/syn/src/op.rs cargo-0.33.0/vendor/syn/src/op.rs
--- cargo-0.32.0/vendor/syn/src/op.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/op.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 ast_enum! {
     /// A binary operator: `+`, `+=`, `&`.
     ///
diff -Nru cargo-0.32.0/vendor/syn/src/parse_macro_input.rs cargo-0.33.0/vendor/syn/src/parse_macro_input.rs
--- cargo-0.32.0/vendor/syn/src/parse_macro_input.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/parse_macro_input.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,14 +8,11 @@
 ///
 /// # Intended usage
 ///
-/// ```rust
-/// #[macro_use]
-/// extern crate syn;
-///
+/// ```edition2018
 /// extern crate proc_macro;
 ///
 /// use proc_macro::TokenStream;
-/// use syn::Result;
+/// use syn::{parse_macro_input, Result};
 /// use syn::parse::{Parse, ParseStream};
 ///
 /// struct MyMacroInput {
@@ -38,8 +35,6 @@
 ///     /* ... */
 /// #   "".parse().unwrap()
 /// }
-/// #
-/// # fn main() {}
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! parse_macro_input {
diff -Nru cargo-0.32.0/vendor/syn/src/parse_quote.rs cargo-0.33.0/vendor/syn/src/parse_quote.rs
--- cargo-0.32.0/vendor/syn/src/parse_quote.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/parse_quote.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,13 +8,9 @@
 ///
 /// [`Parse`]: parse/trait.Parse.html
 ///
-/// ```
-/// #[macro_use]
-/// extern crate quote;
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::Stmt;
+/// ```edition2018
+/// use quote::quote;
+/// use syn::{parse_quote, Stmt};
 ///
 /// fn main() {
 ///     let name = quote!(v);
@@ -37,13 +33,8 @@
 /// The following helper function adds a bound `T: HeapSize` to every type
 /// parameter `T` in the input generics.
 ///
-/// ```
-#[cfg_attr(not(syn_can_call_macro_by_path), doc = " #[macro_use]")]
-#[cfg_attr(not(syn_can_call_macro_by_path), doc = " extern crate quote;")]
-/// #[macro_use]
-/// extern crate syn;
-///
-/// use syn::{Generics, GenericParam};
+/// ```edition2018
+/// use syn::{parse_quote, Generics, GenericParam};
 ///
 /// // Add a bound `T: HeapSize` to every type parameter T.
 /// fn add_trait_bounds(mut generics: Generics) -> Generics {
@@ -54,8 +45,6 @@
 ///     }
 ///     generics
 /// }
-/// #
-/// # fn main() {}
 /// ```
 ///
 /// # Special cases
diff -Nru cargo-0.32.0/vendor/syn/src/parse.rs cargo-0.33.0/vendor/syn/src/parse.rs
--- cargo-0.32.0/vendor/syn/src/parse.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/parse.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Parsing interface for parsing a token stream into a syntax tree node.
 //!
 //! Parsing in Syn is built on parser functions that take in a [`ParseStream`]
@@ -33,14 +25,11 @@
 //!
 //! [`parse_macro_input!`]: ../macro.parse_macro_input.html
 //!
-//! ```
-//! #[macro_use]
-//! extern crate syn;
-//!
+//! ```edition2018
 //! extern crate proc_macro;
 //!
 //! use proc_macro::TokenStream;
-//! use syn::{token, Field, Ident, Result};
+//! use syn::{braced, parse_macro_input, token, Field, Ident, Result, Token};
 //! use syn::parse::{Parse, ParseStream};
 //! use syn::punctuated::Punctuated;
 //!
@@ -98,8 +87,6 @@
 //!     /* ... */
 //! #   "".parse().unwrap()
 //! }
-//! #
-//! # fn main() {}
 //! ```
 //!
 //! # The `syn::parse*` functions
@@ -114,7 +101,7 @@
 //! [`syn::parse_str`]: ../fn.parse_str.html
 //! [`Parse`]: trait.Parse.html
 //!
-//! ```
+//! ```edition2018
 //! use syn::Type;
 //!
 //! # fn run_parser() -> syn::Result<()> {
@@ -145,9 +132,8 @@
 //! The `Parse` trait is not implemented in these cases because there is no good
 //! behavior to consider the default.
 //!
-//! ```compile_fail
+//! ```edition2018,compile_fail
 //! # extern crate proc_macro;
-//! # extern crate syn;
 //! #
 //! # use syn::punctuated::Punctuated;
 //! # use syn::{PathSegment, Result, Token};
@@ -168,39 +154,34 @@
 //!
 //! [`Parser`]: trait.Parser.html
 //!
-//! ```
-//! #[macro_use]
-//! extern crate syn;
-//!
-//! extern crate proc_macro2;
+//! ```edition2018
+//! extern crate proc_macro;
 //!
-//! use proc_macro2::TokenStream;
+//! use proc_macro::TokenStream;
 //! use syn::parse::Parser;
 //! use syn::punctuated::Punctuated;
-//! use syn::{Attribute, Expr, PathSegment};
+//! use syn::{Attribute, Expr, PathSegment, Result, Token};
 //!
-//! # fn run_parsers() -> syn::Result<()> {
-//! #     let tokens = TokenStream::new().into();
-//! // Parse a nonempty sequence of path segments separated by `::` punctuation
-//! // with no trailing punctuation.
-//! let parser = Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty;
-//! let path = parser.parse(tokens)?;
-//!
-//! #     let tokens = TokenStream::new().into();
-//! // Parse a possibly empty sequence of expressions terminated by commas with
-//! // an optional trailing punctuation.
-//! let parser = Punctuated::<Expr, Token![,]>::parse_terminated;
-//! let args = parser.parse(tokens)?;
-//!
-//! #     let tokens = TokenStream::new().into();
-//! // Parse zero or more outer attributes but not inner attributes.
-//! let parser = Attribute::parse_outer;
-//! let attrs = parser.parse(tokens)?;
-//! #
-//! #     Ok(())
-//! # }
-//! #
-//! # fn main() {}
+//! fn call_some_parser_methods(input: TokenStream) -> Result<()> {
+//!     // Parse a nonempty sequence of path segments separated by `::` punctuation
+//!     // with no trailing punctuation.
+//!     let tokens = input.clone();
+//!     let parser = Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty;
+//!     let _path = parser.parse(tokens)?;
+//!
+//!     // Parse a possibly empty sequence of expressions terminated by commas with
+//!     // an optional trailing punctuation.
+//!     let tokens = input.clone();
+//!     let parser = Punctuated::<Expr, Token![,]>::parse_terminated;
+//!     let _args = parser.parse(tokens)?;
+//!
+//!     // Parse zero or more outer attributes but not inner attributes.
+//!     let tokens = input.clone();
+//!     let parser = Attribute::parse_outer;
+//!     let _attrs = parser.parse(tokens)?;
+//!
+//!     Ok(())
+//! }
 //! ```
 //!
 //! ---
@@ -253,6 +234,19 @@
 ///
 /// `ParseStream` is the input type for all parser functions in Syn. They have
 /// the signature `fn(ParseStream) -> Result<T>`.
+///
+/// ## Calling a parser function
+///
+/// There is no public way to construct a `ParseBuffer`. Instead, if you are
+/// looking to invoke a parser function that requires `ParseStream` as input,
+/// you will need to go through one of the public parsing entry points.
+///
+/// - The [`parse_macro_input!`] macro if parsing input of a procedural macro;
+/// - One of [the `syn::parse*` functions][syn-parse]; or
+/// - A method of the [`Parser`] trait.
+///
+/// [`parse_macro_input!`]: ../macro.parse_macro_input.html
+/// [syn-parse]: index.html#the-synparse-functions
 pub struct ParseBuffer<'a> {
     scope: Span,
     // Instead of Cell<Cursor<'a>> so that ParseBuffer<'a> is covariant in 'a.
@@ -299,10 +293,7 @@
 ///
 /// # Example
 ///
-/// ```
-/// # extern crate proc_macro2;
-/// # extern crate syn;
-/// #
+/// ```edition2018
 /// use proc_macro2::TokenTree;
 /// use syn::Result;
 /// use syn::parse::ParseStream;
@@ -325,7 +316,6 @@
 ///     })
 /// }
 /// #
-/// #
 /// # fn remainder_after_skipping_past_next_at(
 /// #     input: ParseStream,
 /// # ) -> Result<proc_macro2::TokenStream> {
@@ -437,11 +427,8 @@
     ///
     /// [`Attribute::parse_outer`]: ../struct.Attribute.html#method.parse_outer
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{Attribute, Ident, Result};
+    /// ```edition2018
+    /// use syn::{Attribute, Ident, Result, Token};
     /// use syn::parse::{Parse, ParseStream};
     ///
     /// // Parses a unit struct with attributes.
@@ -465,8 +452,6 @@
     ///         })
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn call<T>(&self, function: fn(ParseStream) -> Result<T>) -> Result<T> {
         function(self)
@@ -493,11 +478,8 @@
     /// In this example we finish parsing the list of supertraits when the next
     /// token in the input is either `where` or an opening curly brace.
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{token, Generics, Ident, Result, TypeParamBound};
+    /// ```edition2018
+    /// use syn::{braced, token, Generics, Ident, Result, Token, TypeParamBound};
     /// use syn::parse::{Parse, ParseStream};
     /// use syn::punctuated::Punctuated;
     ///
@@ -545,8 +527,6 @@
     ///         })
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn peek<T: Peek>(&self, token: T) -> bool {
         let _ = token;
@@ -565,11 +545,8 @@
     /// union` and a macro invocation that looks like `union::some_macro! { ...
     /// }`. In other words `union` is a contextual keyword.
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{Ident, ItemUnion, Macro, Result};
+    /// ```edition2018
+    /// use syn::{Ident, ItemUnion, Macro, Result, Token};
     /// use syn::parse::{Parse, ParseStream};
     ///
     /// // Parses either a union or a macro invocation.
@@ -589,8 +566,6 @@
     ///         }
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn peek2<T: Peek>(&self, token: T) -> bool {
         let ahead = self.fork();
@@ -611,14 +586,10 @@
     ///
     /// # Example
     ///
-    /// ```rust
-    /// # #[macro_use]
-    /// # extern crate quote;
+    /// ```edition2018
+    /// # use quote::quote;
     /// #
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{token, Ident, Result, Type};
+    /// use syn::{parenthesized, token, Ident, Result, Token, Type};
     /// use syn::parse::{Parse, ParseStream};
     /// use syn::punctuated::Punctuated;
     ///
@@ -667,11 +638,8 @@
     ///
     /// # Example
     ///
-    /// ```rust
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{token, Ident, Item, Result};
+    /// ```edition2018
+    /// use syn::{braced, token, Ident, Item, Result, Token};
     /// use syn::parse::{Parse, ParseStream};
     ///
     /// // Parses a Rust `mod m { ... }` containing zero or more items.
@@ -699,8 +667,6 @@
     ///         })
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn is_empty(&self) -> bool {
         self.cursor().eof()
@@ -711,11 +677,8 @@
     ///
     /// # Example
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, Result, TypeParam};
+    /// ```edition2018
+    /// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, Result, Token, TypeParam};
     /// use syn::parse::{Parse, ParseStream};
     ///
     /// // A generic parameter, a single one of the comma-separated elements inside
@@ -749,8 +712,6 @@
     ///         }
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn lookahead1(&self) -> Lookahead1<'a> {
         lookahead::new(self.scope, self.cursor())
@@ -766,7 +727,7 @@
     /// is if your macro ends up parsing a large amount of content more than
     /// once.
     ///
-    /// ```
+    /// ```edition2018
     /// # use syn::{Expr, Result};
     /// # use syn::parse::ParseStream;
     /// #
@@ -803,7 +764,7 @@
     /// needs to distinguish parentheses that specify visibility restrictions
     /// from parentheses that form part of a tuple type.
     ///
-    /// ```
+    /// ```edition2018
     /// # struct A;
     /// # struct B;
     /// # struct C;
@@ -820,11 +781,8 @@
     /// parentheses after the `pub` keyword. This is a small bounded amount of
     /// work performed against the forked parse stream.
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{token, Ident, Path, Result};
+    /// ```edition2018
+    /// use syn::{parenthesized, token, Ident, Path, Result, Token};
     /// use syn::ext::IdentExt;
     /// use syn::parse::{Parse, ParseStream};
     ///
@@ -878,8 +836,6 @@
     ///         })
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn fork(&self) -> Self {
         ParseBuffer {
@@ -896,11 +852,8 @@
     ///
     /// # Example
     ///
-    /// ```
-    /// #[macro_use]
-    /// extern crate syn;
-    ///
-    /// use syn::{Expr, Result};
+    /// ```edition2018
+    /// use syn::{Expr, Result, Token};
     /// use syn::parse::{Parse, ParseStream};
     ///
     /// // Some kind of loop: `while` or `for` or `loop`.
@@ -922,8 +875,6 @@
     ///         }
     ///     }
     /// }
-    /// #
-    /// # fn main() {}
     /// ```
     pub fn error<T: Display>(&self, message: T) -> Error {
         error::new_at(self.scope, self.cursor(), message)
@@ -938,10 +889,7 @@
     ///
     /// # Example
     ///
-    /// ```
-    /// # extern crate proc_macro2;
-    /// # extern crate syn;
-    /// #
+    /// ```edition2018
     /// use proc_macro2::TokenTree;
     /// use syn::Result;
     /// use syn::parse::ParseStream;
@@ -1101,10 +1049,16 @@
     type Output;
 
     /// Parse a proc-macro2 token stream into the chosen syntax tree node.
+    ///
+    /// This function will check that the input is fully parsed. If there are
+    /// any unparsed tokens at the end of the stream, an error is returned.
     fn parse2(self, tokens: TokenStream) -> Result<Self::Output>;
 
     /// Parse tokens of source code into the chosen syntax tree node.
     ///
+    /// This function will check that the input is fully parsed. If there are
+    /// any unparsed tokens at the end of the stream, an error is returned.
+    ///
     /// *This method is available if Syn is built with both the `"parsing"` and
     /// `"proc-macro"` features.*
     #[cfg(all(
@@ -1117,6 +1071,9 @@
 
     /// Parse a string of Rust code into the chosen syntax tree node.
     ///
+    /// This function will check that the input is fully parsed. If there are
+    /// any unparsed tokens at the end of the string, an error is returned.
+    ///
     /// # Hygiene
     ///
     /// Every span in the resulting syntax tree will be set to resolve at the
diff -Nru cargo-0.32.0/vendor/syn/src/path.rs cargo-0.33.0/vendor/syn/src/path.rs
--- cargo-0.32.0/vendor/syn/src/path.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/path.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use punctuated::Punctuated;
 
@@ -366,11 +358,8 @@
         ///
         /// # Example
         ///
-        /// ```
-        /// #[macro_use]
-        /// extern crate syn;
-        ///
-        /// use syn::{Path, Result};
+        /// ```edition2018
+        /// use syn::{Path, Result, Token};
         /// use syn::parse::{Parse, ParseStream};
         ///
         /// // A simplified single `use` statement like:
@@ -394,8 +383,6 @@
         ///         })
         ///     }
         /// }
-        /// #
-        /// # fn main() {}
         /// ```
         pub fn parse_mod_style(input: ParseStream) -> Result<Self> {
             Ok(Path {
diff -Nru cargo-0.32.0/vendor/syn/src/punctuated.rs cargo-0.33.0/vendor/syn/src/punctuated.rs
--- cargo-0.32.0/vendor/syn/src/punctuated.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/punctuated.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! A punctuated sequence of syntax tree nodes separated by punctuation.
 //!
 //! Lots of things in Rust are punctuated sequences.
diff -Nru cargo-0.32.0/vendor/syn/src/spanned.rs cargo-0.33.0/vendor/syn/src/spanned.rs
--- cargo-0.32.0/vendor/syn/src/spanned.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/spanned.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! A trait that can provide the `Span` of the complete contents of a syntax
 //! tree node.
 //!
@@ -28,16 +20,12 @@
 //! The following macro code takes a variable `ty` of type `Type` and produces a
 //! static assertion that `Sync` is implemented for that type.
 //!
-//! ```
+//! ```edition2018
 //! # extern crate proc_macro;
-//! # extern crate proc_macro2;
-//! # extern crate syn;
 //! #
-//! #[macro_use]
-//! extern crate quote;
-//!
 //! use proc_macro::TokenStream;
 //! use proc_macro2::Span;
+//! use quote::quote_spanned;
 //! use syn::Type;
 //! use syn::spanned::Spanned;
 //!
@@ -59,8 +47,6 @@
 //! # fn get_a_type() -> Type {
 //! #     unimplemented!()
 //! # }
-//! #
-//! # fn main() {}
 //! ```
 //!
 //! By inserting this `assert_sync` fragment into the output code generated by
diff -Nru cargo-0.32.0/vendor/syn/src/token.rs cargo-0.33.0/vendor/syn/src/token.rs
--- cargo-0.32.0/vendor/syn/src/token.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/token.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 //! Tokens representing Rust punctuation, keywords, and delimiters.
 //!
 //! The type names in this module can be difficult to keep straight, so we
@@ -20,11 +12,8 @@
 //!
 //! [`ItemStatic`]: ../struct.ItemStatic.html
 //!
-//! ```
-//! # #[macro_use]
-//! # extern crate syn;
-//! #
-//! # use syn::{Attribute, Expr, Ident, Type, Visibility};
+//! ```edition2018
+//! # use syn::{Attribute, Expr, Ident, Token, Type, Visibility};
 //! #
 //! pub struct ItemStatic {
 //!     pub attrs: Vec<Attribute>,
@@ -38,8 +27,6 @@
 //!     pub expr: Box<Expr>,
 //!     pub semi_token: Token![;],
 //! }
-//! #
-//! # fn main() {}
 //! ```
 //!
 //! # Parsing
@@ -53,9 +40,7 @@
 //! [`bracketed!`]: ../macro.bracketed.html
 //! [`braced!`]: ../macro.braced.html
 //!
-//! ```
-//! # extern crate syn;
-//! #
+//! ```edition2018
 //! use syn::{Attribute, Result};
 //! use syn::parse::{Parse, ParseStream};
 //! #
@@ -82,8 +67,6 @@
 //!         # unimplemented!()
 //!     }
 //! }
-//! #
-//! # fn main() {}
 //! ```
 
 use std;
diff -Nru cargo-0.32.0/vendor/syn/src/tt.rs cargo-0.33.0/vendor/syn/src/tt.rs
--- cargo-0.32.0/vendor/syn/src/tt.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/tt.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use std::hash::{Hash, Hasher};
 
 use proc_macro2::{Delimiter, TokenStream, TokenTree};
diff -Nru cargo-0.32.0/vendor/syn/src/ty.rs cargo-0.33.0/vendor/syn/src/ty.rs
--- cargo-0.32.0/vendor/syn/src/ty.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/syn/src/ty.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1,11 +1,3 @@
-// Copyright 2018 Syn Developers
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use super::*;
 use proc_macro2::TokenStream;
 use punctuated::Punctuated;
diff -Nru cargo-0.32.0/vendor/synstructure/.cargo_vcs_info.json cargo-0.33.0/vendor/synstructure/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/synstructure/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/synstructure/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "7b2f07739ce9971b0c5fbdb253e48d446ab58585"
-  }
-}
diff -Nru cargo-0.32.0/vendor/tar/.cargo_vcs_info.json cargo-0.33.0/vendor/tar/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/tar/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/tar/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "8417a7c3694b39fc32bf936533635c20e764166b"
-  }
-}
diff -Nru cargo-0.32.0/vendor/tar/.travis.yml cargo-0.33.0/vendor/tar/.travis.yml
--- cargo-0.32.0/vendor/tar/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/tar/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-language: rust
-sudo: false
-
-matrix:
-  include:
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-    - rust: 1.21.0
-
-    # Code coverage + documentation
-    - rust: nightly
-      before_script:
-        - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-      script:
-        - cargo build
-        - rustdoc --test README.md -L target/debug -L target/debug/deps
-        - cargo doc --no-deps
-      after_success:
-        - travis-cargo --only nightly doc-upload
-        - travis-cargo coveralls --no-sudo
-      addons:
-        apt:
-          packages:
-            - libcurl4-openssl-dev
-            - libelf-dev
-            - libdw-dev
-      env:
-        global:
-          - secure: "BkV2h2/dkKFUBhdiN3CvUt/zVdIsLhqlVIpS5uV5mQNyiQyZQ+czCmxvAoBF0r6ER6gdbUwvtBVTZ9fT+JmdpxcRJB7/oJ535MYRVkng13GjmDjj3y4KbGZdKsXgNpWPk5EbpFYZ6VdJ6LnEOBEE2aWbAbHwXgWxDCQtlgTeoXQ="
-          - RUSTFLAGS='-C link-dead-code'
-
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo test --verbose --no-default-features
-
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/tempfile/.cargo_vcs_info.json cargo-0.33.0/vendor/tempfile/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/tempfile/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/tempfile/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "7c099e9a22255b7888d8be49b8118bc0ba2f083c"
-  }
-}
diff -Nru cargo-0.32.0/vendor/termcolor/.cargo_vcs_info.json cargo-0.33.0/vendor/termcolor/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/termcolor/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/termcolor/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "a250e4650a4cc5a4d418acab57d3cf44d522b2ec"
-  }
-}
diff -Nru cargo-0.32.0/vendor/termion/.travis.yml cargo-0.33.0/vendor/termion/.travis.yml
--- cargo-0.32.0/vendor/termion/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/termion/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-language: rust
-cache: cargo
-rust:
-    - stable
-    - beta
-    - nightly
-os:
-    - linux
-    - osx
-script:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then FAKETTY="script -q /dev/null"; fi
-    - $FAKETTY cargo build --verbose
-    - $FAKETTY cargo test --verbose
-    - $FAKETTY cargo test --release --verbose
diff -Nru cargo-0.32.0/vendor/textwrap/.appveyor.yml cargo-0.33.0/vendor/textwrap/.appveyor.yml
--- cargo-0.32.0/vendor/textwrap/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/textwrap/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-environment:
-  matrix:
-  - TOOLCHAIN: stable
-  - TOOLCHAIN: nightly
-
-matrix:
-  allow_failures:
-    - TOOLCHAIN: nightly
-
-install:
-  - ps: Start-FileDownload 'https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe'
-  - rustup-init.exe -y --default-toolchain %TOOLCHAIN%
-  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
-
-build_script:
-  - cargo build --verbose --all-features
-
-test_script:
-  - cargo test --verbose --all-features
-
-cache:
-  - '%USERPROFILE%\.cargo'
-  - target
diff -Nru cargo-0.32.0/vendor/textwrap/.travis.yml cargo-0.33.0/vendor/textwrap/.travis.yml
--- cargo-0.32.0/vendor/textwrap/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/textwrap/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-language: rust
-
-rust:
-  - stable
-  - beta
-  - nightly
-  - 1.17.0
-
-cache: cargo
-
-script:
-  - cargo build --verbose --features "$FEATURES"
-  - cargo test --verbose --features "$FEATURES"
-
-env:
-  - FEATURES="term_size"
-  - FEATURES="hyphenation"
-
-matrix:
-  allow_failures:
-    - rust: nightly
diff -Nru cargo-0.32.0/vendor/thread_local/.travis.yml cargo-0.33.0/vendor/thread_local/.travis.yml
--- cargo-0.32.0/vendor/thread_local/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/thread_local/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-language: rust
-sudo: false
-
-rust:
-- nightly
-- beta
-- stable
-- 1.21.0
-
-before_script:
-- |
-  pip install 'travis-cargo<0.2' --user &&
-  export PATH=$HOME/.local/bin:$PATH
-
-script:
-- travis-cargo build
-- travis-cargo test
-- travis-cargo bench
-- travis-cargo doc -- --no-deps
-
-after_success:
-- travis-cargo --only nightly doc-upload
-
-env:
-  global:
-  - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-
-notifications:
-  email: false
diff -Nru cargo-0.32.0/vendor/time/appveyor.yml cargo-0.33.0/vendor/time/appveyor.yml
--- cargo-0.32.0/vendor/time/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/appveyor.yml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,17 @@
+environment:
+  matrix:
+  - TARGET: x86_64-pc-windows-msvc
+  - TARGET: i686-pc-windows-msvc
+  - TARGET: i686-pc-windows-gnu
+install:
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
+  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
+  - SET PATH=%PATH%;C:\MinGW\bin
+  - rustc -V
+  - cargo -V
+
+build: false
+
+test_script:
+  - cargo test --verbose
diff -Nru cargo-0.32.0/vendor/time/benches/precise_time_ns.rs cargo-0.33.0/vendor/time/benches/precise_time_ns.rs
--- cargo-0.32.0/vendor/time/benches/precise_time_ns.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/benches/precise_time_ns.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,14 @@
+#![feature(test)]
+
+extern crate test;
+extern crate time;
+
+use test::Bencher;
+
+#[bench]
+fn bench_precise_time_ns(b: &mut Bencher) {
+    b.iter(|| {
+        time::precise_time_ns();
+        time::precise_time_ns();
+    });
+}
diff -Nru cargo-0.32.0/vendor/time/.cargo-checksum.json cargo-0.33.0/vendor/time/.cargo-checksum.json
--- cargo-0.32.0/vendor/time/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/time/Cargo.toml cargo-0.33.0/vendor/time/Cargo.toml
--- cargo-0.32.0/vendor/time/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,43 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "time"
+version = "0.1.42"
+authors = ["The Rust Project Developers"]
+description = "Utilities for working with time-related functions in Rust.\n"
+homepage = "https://github.com/rust-lang/time"
+documentation = "https://doc.rust-lang.org/time"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-lang/time"
+[dependencies.libc]
+version = "0.2.1"
+
+[dependencies.rustc-serialize]
+version = "0.3"
+optional = true
+[dev-dependencies.log]
+version = "0.4"
+
+[dev-dependencies.winapi]
+version = "0.3.0"
+features = ["std", "processthreadsapi", "winbase"]
+[target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
+version = "0.1"
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3.0"
+features = ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sysinfoapi", "timezoneapi"]
+[badges.appveyor]
+repository = "alexcrichton/time"
+
+[badges.travis-ci]
+repository = "rust-lang-deprecated/time"
diff -Nru cargo-0.32.0/vendor/time/LICENSE-APACHE cargo-0.33.0/vendor/time/LICENSE-APACHE
--- cargo-0.32.0/vendor/time/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/LICENSE-APACHE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
diff -Nru cargo-0.32.0/vendor/time/LICENSE-MIT cargo-0.33.0/vendor/time/LICENSE-MIT
--- cargo-0.32.0/vendor/time/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/LICENSE-MIT	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2014 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/time/README.md cargo-0.33.0/vendor/time/README.md
--- cargo-0.32.0/vendor/time/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,30 @@
+time
+====
+
+Utilities for working with time-related functions in Rust
+
+[![Build Status](https://travis-ci.org/rust-lang-deprecated/time.svg?branch=master)](https://travis-ci.org/rust-lang-deprecated/time)
+[![Build status](https://ci.appveyor.com/api/projects/status/55m7rbaj9a5v3ad7?svg=true)](https://ci.appveyor.com/project/alexcrichton/time)
+
+[Documentation](https://doc.rust-lang.org/time)
+
+## Notes
+
+This library is no longer actively maintained, but bugfixes will be added ([details](https://github.com/rust-lang-deprecated/time/issues/136)).
+
+In case you're looking for something a little fresher and more actively maintained have a look at the [`chrono`](https://github.com/lifthrasiir/rust-chrono) crate.
+
+## Usage
+
+Put this in your `Cargo.toml`:
+
+```toml
+[dependencies]
+time = "0.1"
+```
+
+And this in your crate root:
+
+```rust
+extern crate time;
+```
diff -Nru cargo-0.32.0/vendor/time/src/display.rs cargo-0.33.0/vendor/time/src/display.rs
--- cargo-0.32.0/vendor/time/src/display.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/src/display.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,260 @@
+use std::fmt::{self, Write};
+
+use super::{TmFmt, Tm, Fmt};
+
+impl<'a> fmt::Display for TmFmt<'a> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self.format {
+            Fmt::Str(ref s) => {
+                let mut chars = s.chars();
+                while let Some(ch) = chars.next() {
+                    if ch == '%' {
+                        // we've already validated that % always precedes
+                        // another char
+                        try!(parse_type(fmt, chars.next().unwrap(), self.tm));
+                    } else {
+                        try!(fmt.write_char(ch));
+                    }
+                }
+
+                Ok(())
+            }
+            Fmt::Ctime => self.tm.to_local().asctime().fmt(fmt),
+            Fmt::Rfc3339 => {
+                if self.tm.tm_utcoff == 0 {
+                    TmFmt {
+                        tm: self.tm,
+                        format: Fmt::Str("%Y-%m-%dT%H:%M:%SZ"),
+                    }.fmt(fmt)
+                } else {
+                    let s = TmFmt {
+                        tm: self.tm,
+                        format: Fmt::Str("%Y-%m-%dT%H:%M:%S"),
+                    };
+                    let sign = if self.tm.tm_utcoff > 0 { '+' } else { '-' };
+                    let mut m = abs(self.tm.tm_utcoff) / 60;
+                    let h = m / 60;
+                    m -= h * 60;
+                    write!(fmt, "{}{}{:02}:{:02}", s, sign, h, m)
+                }
+            }
+        }
+    }
+}
+
+fn is_leap_year(year: i32) -> bool {
+    (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0))
+}
+
+fn days_in_year(year: i32) -> i32 {
+    if is_leap_year(year) { 366 }
+    else                  { 365 }
+}
+
+fn iso_week_days(yday: i32, wday: i32) -> i32 {
+    /* The number of days from the first day of the first ISO week of this
+    * year to the year day YDAY with week day WDAY.
+    * ISO weeks start on Monday. The first ISO week has the year's first
+    * Thursday.
+    * YDAY may be as small as yday_minimum.
+    */
+    let iso_week_start_wday: i32 = 1;                     /* Monday */
+    let iso_week1_wday: i32 = 4;                          /* Thursday */
+    let yday_minimum: i32 = 366;
+    /* Add enough to the first operand of % to make it nonnegative. */
+    let big_enough_multiple_of_7: i32 = (yday_minimum / 7 + 2) * 7;
+
+    yday - (yday - wday + iso_week1_wday + big_enough_multiple_of_7) % 7
+        + iso_week1_wday - iso_week_start_wday
+}
+
+fn iso_week(fmt: &mut fmt::Formatter, ch:char, tm: &Tm) -> fmt::Result {
+    let mut year = tm.tm_year + 1900;
+    let mut days = iso_week_days(tm.tm_yday, tm.tm_wday);
+
+    if days < 0 {
+        /* This ISO week belongs to the previous year. */
+        year -= 1;
+        days = iso_week_days(tm.tm_yday + (days_in_year(year)), tm.tm_wday);
+    } else {
+        let d = iso_week_days(tm.tm_yday - (days_in_year(year)),
+                              tm.tm_wday);
+        if 0 <= d {
+            /* This ISO week belongs to the next year. */
+            year += 1;
+            days = d;
+        }
+    }
+
+    match ch {
+        'G' => write!(fmt, "{}", year),
+        'g' => write!(fmt, "{:02}", (year % 100 + 100) % 100),
+        'V' => write!(fmt, "{:02}", days / 7 + 1),
+        _ => Ok(())
+    }
+}
+
+fn parse_type(fmt: &mut fmt::Formatter, ch: char, tm: &Tm) -> fmt::Result {
+    match ch {
+        'A' => fmt.write_str(match tm.tm_wday {
+            0 => "Sunday",
+            1 => "Monday",
+            2 => "Tuesday",
+            3 => "Wednesday",
+            4 => "Thursday",
+            5 => "Friday",
+            6 => "Saturday",
+            _ => unreachable!(),
+        }),
+        'a' => fmt.write_str(match tm.tm_wday {
+            0 => "Sun",
+            1 => "Mon",
+            2 => "Tue",
+            3 => "Wed",
+            4 => "Thu",
+            5 => "Fri",
+            6 => "Sat",
+            _ => unreachable!(),
+        }),
+        'B' => fmt.write_str(match tm.tm_mon {
+            0 => "January",
+            1 => "February",
+            2 => "March",
+            3 => "April",
+            4 => "May",
+            5 => "June",
+            6 => "July",
+            7 => "August",
+            8 => "September",
+            9 => "October",
+            10 => "November",
+            11 => "December",
+            _ => unreachable!(),
+        }),
+        'b' | 'h' => fmt.write_str(match tm.tm_mon {
+            0 => "Jan",
+            1 => "Feb",
+            2 => "Mar",
+            3 => "Apr",
+            4 => "May",
+            5 => "Jun",
+            6 => "Jul",
+            7 => "Aug",
+            8 => "Sep",
+            9 => "Oct",
+            10 => "Nov",
+            11 => "Dec",
+            _  => unreachable!(),
+        }),
+        'C' => write!(fmt, "{:02}", (tm.tm_year + 1900) / 100),
+        'c' => {
+            try!(parse_type(fmt, 'a', tm));
+            try!(fmt.write_str(" "));
+            try!(parse_type(fmt, 'b', tm));
+            try!(fmt.write_str(" "));
+            try!(parse_type(fmt, 'e', tm));
+            try!(fmt.write_str(" "));
+            try!(parse_type(fmt, 'T', tm));
+            try!(fmt.write_str(" "));
+            parse_type(fmt, 'Y', tm)
+        }
+        'D' | 'x' => {
+            try!(parse_type(fmt, 'm', tm));
+            try!(fmt.write_str("/"));
+            try!(parse_type(fmt, 'd', tm));
+            try!(fmt.write_str("/"));
+            parse_type(fmt, 'y', tm)
+        }
+        'd' => write!(fmt, "{:02}", tm.tm_mday),
+        'e' => write!(fmt, "{:2}", tm.tm_mday),
+        'f' => write!(fmt, "{:09}", tm.tm_nsec),
+        'F' => {
+            try!(parse_type(fmt, 'Y', tm));
+            try!(fmt.write_str("-"));
+            try!(parse_type(fmt, 'm', tm));
+            try!(fmt.write_str("-"));
+            parse_type(fmt, 'd', tm)
+        }
+        'G' => iso_week(fmt, 'G', tm),
+        'g' => iso_week(fmt, 'g', tm),
+        'H' => write!(fmt, "{:02}", tm.tm_hour),
+        'I' => {
+            let mut h = tm.tm_hour;
+            if h == 0 { h = 12 }
+            if h > 12 { h -= 12 }
+            write!(fmt, "{:02}", h)
+        }
+        'j' => write!(fmt, "{:03}", tm.tm_yday + 1),
+        'k' => write!(fmt, "{:2}", tm.tm_hour),
+        'l' => {
+            let mut h = tm.tm_hour;
+            if h == 0 { h = 12 }
+            if h > 12 { h -= 12 }
+            write!(fmt, "{:2}", h)
+        }
+        'M' => write!(fmt, "{:02}", tm.tm_min),
+        'm' => write!(fmt, "{:02}", tm.tm_mon + 1),
+        'n' => fmt.write_str("\n"),
+        'P' => fmt.write_str(if tm.tm_hour < 12 { "am" } else { "pm" }),
+        'p' => fmt.write_str(if (tm.tm_hour) < 12 { "AM" } else { "PM" }),
+        'R' => {
+            try!(parse_type(fmt, 'H', tm));
+            try!(fmt.write_str(":"));
+            parse_type(fmt, 'M', tm)
+        }
+        'r' => {
+            try!(parse_type(fmt, 'I', tm));
+            try!(fmt.write_str(":"));
+            try!(parse_type(fmt, 'M', tm));
+            try!(fmt.write_str(":"));
+            try!(parse_type(fmt, 'S', tm));
+            try!(fmt.write_str(" "));
+            parse_type(fmt, 'p', tm)
+        }
+        'S' => write!(fmt, "{:02}", tm.tm_sec),
+        's' => write!(fmt, "{}", tm.to_timespec().sec),
+        'T' | 'X' => {
+            try!(parse_type(fmt, 'H', tm));
+            try!(fmt.write_str(":"));
+            try!(parse_type(fmt, 'M', tm));
+            try!(fmt.write_str(":"));
+            parse_type(fmt, 'S', tm)
+        }
+        't' => fmt.write_str("\t"),
+        'U' => write!(fmt, "{:02}", (tm.tm_yday - tm.tm_wday + 7) / 7),
+        'u' => {
+            let i = tm.tm_wday;
+            write!(fmt, "{}", (if i == 0 { 7 } else { i }))
+        }
+        'V' => iso_week(fmt, 'V', tm),
+        'v' => {
+            try!(parse_type(fmt, 'e', tm));
+            try!(fmt.write_str("-"));
+            try!(parse_type(fmt, 'b', tm));
+            try!(fmt.write_str("-"));
+            parse_type(fmt, 'Y', tm)
+        }
+        'W' => {
+            write!(fmt, "{:02}", (tm.tm_yday - (tm.tm_wday - 1 + 7) % 7 + 7) / 7)
+        }
+        'w' => write!(fmt, "{}", tm.tm_wday),
+        'Y' => write!(fmt, "{}", tm.tm_year + 1900),
+        'y' => write!(fmt, "{:02}", (tm.tm_year + 1900) % 100),
+        // FIXME (#2350): support locale
+        'Z' => fmt.write_str(if tm.tm_utcoff == 0 { "UTC"} else { "" }),
+        'z' => {
+            let sign = if tm.tm_utcoff > 0 { '+' } else { '-' };
+            let mut m = abs(tm.tm_utcoff) / 60;
+            let h = m / 60;
+            m -= h * 60;
+            write!(fmt, "{}{:02}{:02}", sign, h, m)
+        }
+        '+' => write!(fmt, "{}", tm.rfc3339()),
+        '%' => fmt.write_str("%"),
+        _   => unreachable!(),
+    }
+}
+
+fn abs(i: i32) -> i32 {
+    if i < 0 {-i} else {i}
+}
diff -Nru cargo-0.32.0/vendor/time/src/duration.rs cargo-0.33.0/vendor/time/src/duration.rs
--- cargo-0.32.0/vendor/time/src/duration.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/src/duration.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,654 @@
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Temporal quantification
+
+use std::{fmt, i64};
+use std::error::Error;
+use std::ops::{Add, Sub, Mul, Div, Neg, FnOnce};
+use std::time::Duration as StdDuration;
+
+/// The number of nanoseconds in a microsecond.
+const NANOS_PER_MICRO: i32 = 1000;
+/// The number of nanoseconds in a millisecond.
+const NANOS_PER_MILLI: i32 = 1000_000;
+/// The number of nanoseconds in seconds.
+const NANOS_PER_SEC: i32 = 1_000_000_000;
+/// The number of microseconds per second.
+const MICROS_PER_SEC: i64 = 1000_000;
+/// The number of milliseconds per second.
+const MILLIS_PER_SEC: i64 = 1000;
+/// The number of seconds in a minute.
+const SECS_PER_MINUTE: i64 = 60;
+/// The number of seconds in an hour.
+const SECS_PER_HOUR: i64 = 3600;
+/// The number of (non-leap) seconds in days.
+const SECS_PER_DAY: i64 = 86400;
+/// The number of (non-leap) seconds in a week.
+const SECS_PER_WEEK: i64 = 604800;
+
+macro_rules! try_opt {
+    ($e:expr) => (match $e { Some(v) => v, None => return None })
+}
+
+
+/// ISO 8601 time duration with nanosecond precision.
+/// This also allows for the negative duration; see individual methods for details.
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+pub struct Duration {
+    secs: i64,
+    nanos: i32, // Always 0 <= nanos < NANOS_PER_SEC
+}
+
+/// The minimum possible `Duration`: `i64::MIN` milliseconds.
+pub const MIN: Duration = Duration {
+    secs: i64::MIN / MILLIS_PER_SEC - 1,
+    nanos: NANOS_PER_SEC + (i64::MIN % MILLIS_PER_SEC) as i32 * NANOS_PER_MILLI
+};
+
+/// The maximum possible `Duration`: `i64::MAX` milliseconds.
+pub const MAX: Duration = Duration {
+    secs: i64::MAX / MILLIS_PER_SEC,
+    nanos: (i64::MAX % MILLIS_PER_SEC) as i32 * NANOS_PER_MILLI
+};
+
+impl Duration {
+    /// Makes a new `Duration` with given number of weeks.
+    /// Equivalent to `Duration::seconds(weeks * 7 * 24 * 60 * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn weeks(weeks: i64) -> Duration {
+        let secs = weeks.checked_mul(SECS_PER_WEEK).expect("Duration::weeks out of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of days.
+    /// Equivalent to `Duration::seconds(days * 24 * 60 * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn days(days: i64) -> Duration {
+        let secs = days.checked_mul(SECS_PER_DAY).expect("Duration::days out of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of hours.
+    /// Equivalent to `Duration::seconds(hours * 60 * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn hours(hours: i64) -> Duration {
+        let secs = hours.checked_mul(SECS_PER_HOUR).expect("Duration::hours ouf of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of minutes.
+    /// Equivalent to `Duration::seconds(minutes * 60)` with overflow checks.
+    /// Panics when the duration is out of bounds.
+    #[inline]
+    pub fn minutes(minutes: i64) -> Duration {
+        let secs = minutes.checked_mul(SECS_PER_MINUTE).expect("Duration::minutes out of bounds");
+        Duration::seconds(secs)
+    }
+
+    /// Makes a new `Duration` with given number of seconds.
+    /// Panics when the duration is more than `i64::MAX` milliseconds
+    /// or less than `i64::MIN` milliseconds.
+    #[inline]
+    pub fn seconds(seconds: i64) -> Duration {
+        let d = Duration { secs: seconds, nanos: 0 };
+        if d < MIN || d > MAX {
+            panic!("Duration::seconds out of bounds");
+        }
+        d
+    }
+
+    /// Makes a new `Duration` with given number of milliseconds.
+    #[inline]
+    pub fn milliseconds(milliseconds: i64) -> Duration {
+        let (secs, millis) = div_mod_floor_64(milliseconds, MILLIS_PER_SEC);
+        let nanos = millis as i32 * NANOS_PER_MILLI;
+        Duration { secs: secs, nanos: nanos }
+    }
+
+    /// Makes a new `Duration` with given number of microseconds.
+    #[inline]
+    pub fn microseconds(microseconds: i64) -> Duration {
+        let (secs, micros) = div_mod_floor_64(microseconds, MICROS_PER_SEC);
+        let nanos = micros as i32 * NANOS_PER_MICRO;
+        Duration { secs: secs, nanos: nanos }
+    }
+
+    /// Makes a new `Duration` with given number of nanoseconds.
+    #[inline]
+    pub fn nanoseconds(nanos: i64) -> Duration {
+        let (secs, nanos) = div_mod_floor_64(nanos, NANOS_PER_SEC as i64);
+        Duration { secs: secs, nanos: nanos as i32 }
+    }
+
+    /// Runs a closure, returning the duration of time it took to run the
+    /// closure.
+    pub fn span<F>(f: F) -> Duration where F: FnOnce() {
+        let before = super::precise_time_ns();
+        f();
+        Duration::nanoseconds((super::precise_time_ns() - before) as i64)
+    }
+
+    /// Returns the total number of whole weeks in the duration.
+    #[inline]
+    pub fn num_weeks(&self) -> i64 {
+        self.num_days() / 7
+    }
+
+    /// Returns the total number of whole days in the duration.
+    pub fn num_days(&self) -> i64 {
+        self.num_seconds() / SECS_PER_DAY
+    }
+
+    /// Returns the total number of whole hours in the duration.
+    #[inline]
+    pub fn num_hours(&self) -> i64 {
+        self.num_seconds() / SECS_PER_HOUR
+    }
+
+    /// Returns the total number of whole minutes in the duration.
+    #[inline]
+    pub fn num_minutes(&self) -> i64 {
+        self.num_seconds() / SECS_PER_MINUTE
+    }
+
+    /// Returns the total number of whole seconds in the duration.
+    pub fn num_seconds(&self) -> i64 {
+        // If secs is negative, nanos should be subtracted from the duration.
+        if self.secs < 0 && self.nanos > 0 {
+            self.secs + 1
+        } else {
+            self.secs
+        }
+    }
+
+    /// Returns the number of nanoseconds such that
+    /// `nanos_mod_sec() + num_seconds() * NANOS_PER_SEC` is the total number of
+    /// nanoseconds in the duration.
+    fn nanos_mod_sec(&self) -> i32 {
+        if self.secs < 0 && self.nanos > 0 {
+            self.nanos - NANOS_PER_SEC
+        } else {
+            self.nanos
+        }
+    }
+
+    /// Returns the total number of whole milliseconds in the duration,
+    pub fn num_milliseconds(&self) -> i64 {
+        // A proper Duration will not overflow, because MIN and MAX are defined
+        // such that the range is exactly i64 milliseconds.
+        let secs_part = self.num_seconds() * MILLIS_PER_SEC;
+        let nanos_part = self.nanos_mod_sec() / NANOS_PER_MILLI;
+        secs_part + nanos_part as i64
+    }
+
+    /// Returns the total number of whole microseconds in the duration,
+    /// or `None` on overflow (exceeding 2<sup>63</sup> microseconds in either direction).
+    pub fn num_microseconds(&self) -> Option<i64> {
+        let secs_part = try_opt!(self.num_seconds().checked_mul(MICROS_PER_SEC));
+        let nanos_part = self.nanos_mod_sec() / NANOS_PER_MICRO;
+        secs_part.checked_add(nanos_part as i64)
+    }
+
+    /// Returns the total number of whole nanoseconds in the duration,
+    /// or `None` on overflow (exceeding 2<sup>63</sup> nanoseconds in either direction).
+    pub fn num_nanoseconds(&self) -> Option<i64> {
+        let secs_part = try_opt!(self.num_seconds().checked_mul(NANOS_PER_SEC as i64));
+        let nanos_part = self.nanos_mod_sec();
+        secs_part.checked_add(nanos_part as i64)
+    }
+
+    /// Add two durations, returning `None` if overflow occurred.
+    pub fn checked_add(&self, rhs: &Duration) -> Option<Duration> {
+        let mut secs = try_opt!(self.secs.checked_add(rhs.secs));
+        let mut nanos = self.nanos + rhs.nanos;
+        if nanos >= NANOS_PER_SEC {
+            nanos -= NANOS_PER_SEC;
+            secs = try_opt!(secs.checked_add(1));
+        }
+        let d = Duration { secs: secs, nanos: nanos };
+        // Even if d is within the bounds of i64 seconds,
+        // it might still overflow i64 milliseconds.
+        if d < MIN || d > MAX { None } else { Some(d) }
+    }
+
+    /// Subtract two durations, returning `None` if overflow occurred.
+    pub fn checked_sub(&self, rhs: &Duration) -> Option<Duration> {
+        let mut secs = try_opt!(self.secs.checked_sub(rhs.secs));
+        let mut nanos = self.nanos - rhs.nanos;
+        if nanos < 0 {
+            nanos += NANOS_PER_SEC;
+            secs = try_opt!(secs.checked_sub(1));
+        }
+        let d = Duration { secs: secs, nanos: nanos };
+        // Even if d is within the bounds of i64 seconds,
+        // it might still overflow i64 milliseconds.
+        if d < MIN || d > MAX { None } else { Some(d) }
+    }
+
+    /// The minimum possible `Duration`: `i64::MIN` milliseconds.
+    #[inline]
+    pub fn min_value() -> Duration { MIN }
+
+    /// The maximum possible `Duration`: `i64::MAX` milliseconds.
+    #[inline]
+    pub fn max_value() -> Duration { MAX }
+
+    /// A duration where the stored seconds and nanoseconds are equal to zero.
+    #[inline]
+    pub fn zero() -> Duration {
+        Duration { secs: 0, nanos: 0 }
+    }
+
+    /// Returns `true` if the duration equals `Duration::zero()`.
+    #[inline]
+    pub fn is_zero(&self) -> bool {
+        self.secs == 0 && self.nanos == 0
+    }
+
+    /// Creates a `time::Duration` object from `std::time::Duration`
+    ///
+    /// This function errors when original duration is larger than the maximum
+    /// value supported for this type.
+    pub fn from_std(duration: StdDuration) -> Result<Duration, OutOfRangeError> {
+        // We need to check secs as u64 before coercing to i64
+        if duration.as_secs() > MAX.secs as u64 {
+            return Err(OutOfRangeError(()));
+        }
+        let d = Duration {
+            secs: duration.as_secs() as i64,
+            nanos: duration.subsec_nanos() as i32,
+        };
+        if d > MAX {
+            return Err(OutOfRangeError(()));
+        }
+        Ok(d)
+    }
+
+    /// Creates a `std::time::Duration` object from `time::Duration`
+    ///
+    /// This function errors when duration is less than zero. As standard
+    /// library implementation is limited to non-negative values.
+    pub fn to_std(&self) -> Result<StdDuration, OutOfRangeError> {
+        if self.secs < 0 {
+            return Err(OutOfRangeError(()));
+        }
+        Ok(StdDuration::new(self.secs as u64, self.nanos as u32))
+    }
+
+    /// Returns the raw value of duration.
+    #[cfg(target_env = "sgx")]
+    pub(crate) fn raw(&self) -> (i64, i32) {
+        (self.secs, self.nanos)
+    }
+}
+
+impl Neg for Duration {
+    type Output = Duration;
+
+    #[inline]
+    fn neg(self) -> Duration {
+        if self.nanos == 0 {
+            Duration { secs: -self.secs, nanos: 0 }
+        } else {
+            Duration { secs: -self.secs - 1, nanos: NANOS_PER_SEC - self.nanos }
+        }
+    }
+}
+
+impl Add for Duration {
+    type Output = Duration;
+
+    fn add(self, rhs: Duration) -> Duration {
+        let mut secs = self.secs + rhs.secs;
+        let mut nanos = self.nanos + rhs.nanos;
+        if nanos >= NANOS_PER_SEC {
+            nanos -= NANOS_PER_SEC;
+            secs += 1;
+        }
+        Duration { secs: secs, nanos: nanos }
+    }
+}
+
+impl Sub for Duration {
+    type Output = Duration;
+
+    fn sub(self, rhs: Duration) -> Duration {
+        let mut secs = self.secs - rhs.secs;
+        let mut nanos = self.nanos - rhs.nanos;
+        if nanos < 0 {
+            nanos += NANOS_PER_SEC;
+            secs -= 1;
+        }
+        Duration { secs: secs, nanos: nanos }
+    }
+}
+
+impl Mul<i32> for Duration {
+    type Output = Duration;
+
+    fn mul(self, rhs: i32) -> Duration {
+        // Multiply nanoseconds as i64, because it cannot overflow that way.
+        let total_nanos = self.nanos as i64 * rhs as i64;
+        let (extra_secs, nanos) = div_mod_floor_64(total_nanos, NANOS_PER_SEC as i64);
+        let secs = self.secs * rhs as i64 + extra_secs;
+        Duration { secs: secs, nanos: nanos as i32 }
+    }
+}
+
+impl Div<i32> for Duration {
+    type Output = Duration;
+
+    fn div(self, rhs: i32) -> Duration {
+        let mut secs = self.secs / rhs as i64;
+        let carry = self.secs - secs * rhs as i64;
+        let extra_nanos = carry * NANOS_PER_SEC as i64 / rhs as i64;
+        let mut nanos = self.nanos / rhs + extra_nanos as i32;
+        if nanos >= NANOS_PER_SEC {
+            nanos -= NANOS_PER_SEC;
+            secs += 1;
+        }
+        if nanos < 0 {
+            nanos += NANOS_PER_SEC;
+            secs -= 1;
+        }
+        Duration { secs: secs, nanos: nanos }
+    }
+}
+
+impl fmt::Display for Duration {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // technically speaking, negative duration is not valid ISO 8601,
+        // but we need to print it anyway.
+        let (abs, sign) = if self.secs < 0 { (-*self, "-") } else { (*self, "") };
+
+        let days = abs.secs / SECS_PER_DAY;
+        let secs = abs.secs - days * SECS_PER_DAY;
+        let hasdate = days != 0;
+        let hastime = (secs != 0 || abs.nanos != 0) || !hasdate;
+
+        try!(write!(f, "{}P", sign));
+
+        if hasdate {
+            try!(write!(f, "{}D", days));
+        }
+        if hastime {
+            if abs.nanos == 0 {
+                try!(write!(f, "T{}S", secs));
+            } else if abs.nanos % NANOS_PER_MILLI == 0 {
+                try!(write!(f, "T{}.{:03}S", secs, abs.nanos / NANOS_PER_MILLI));
+            } else if abs.nanos % NANOS_PER_MICRO == 0 {
+                try!(write!(f, "T{}.{:06}S", secs, abs.nanos / NANOS_PER_MICRO));
+            } else {
+                try!(write!(f, "T{}.{:09}S", secs, abs.nanos));
+            }
+        }
+        Ok(())
+    }
+}
+
+/// Represents error when converting `Duration` to/from a standard library
+/// implementation
+///
+/// The `std::time::Duration` supports a range from zero to `u64::MAX`
+/// *seconds*, while this module supports signed range of up to
+/// `i64::MAX` of *milliseconds*.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct OutOfRangeError(());
+
+impl fmt::Display for OutOfRangeError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.description())
+    }
+}
+
+impl Error for OutOfRangeError {
+    fn description(&self) -> &str {
+        "Source duration value is out of range for the target type"
+    }
+}
+
+// Copied from libnum
+#[inline]
+fn div_mod_floor_64(this: i64, other: i64) -> (i64, i64) {
+    (div_floor_64(this, other), mod_floor_64(this, other))
+}
+
+#[inline]
+fn div_floor_64(this: i64, other: i64) -> i64 {
+    match div_rem_64(this, other) {
+        (d, r) if (r > 0 && other < 0)
+               || (r < 0 && other > 0) => d - 1,
+        (d, _)                         => d,
+    }
+}
+
+#[inline]
+fn mod_floor_64(this: i64, other: i64) -> i64 {
+    match this % other {
+        r if (r > 0 && other < 0)
+          || (r < 0 && other > 0) => r + other,
+        r                         => r,
+    }
+}
+
+#[inline]
+fn div_rem_64(this: i64, other: i64) -> (i64, i64) {
+    (this / other, this % other)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Duration, MIN, MAX, OutOfRangeError};
+    use std::{i32, i64};
+    use std::time::Duration as StdDuration;
+
+    #[test]
+    fn test_duration() {
+        assert!(Duration::seconds(1) != Duration::zero());
+        assert_eq!(Duration::seconds(1) + Duration::seconds(2), Duration::seconds(3));
+        assert_eq!(Duration::seconds(86399) + Duration::seconds(4),
+                   Duration::days(1) + Duration::seconds(3));
+        assert_eq!(Duration::days(10) - Duration::seconds(1000), Duration::seconds(863000));
+        assert_eq!(Duration::days(10) - Duration::seconds(1000000), Duration::seconds(-136000));
+        assert_eq!(Duration::days(2) + Duration::seconds(86399) +
+                   Duration::nanoseconds(1234567890),
+                   Duration::days(3) + Duration::nanoseconds(234567890));
+        assert_eq!(-Duration::days(3), Duration::days(-3));
+        assert_eq!(-(Duration::days(3) + Duration::seconds(70)),
+                   Duration::days(-4) + Duration::seconds(86400-70));
+    }
+
+    #[test]
+    fn test_duration_num_days() {
+        assert_eq!(Duration::zero().num_days(), 0);
+        assert_eq!(Duration::days(1).num_days(), 1);
+        assert_eq!(Duration::days(-1).num_days(), -1);
+        assert_eq!(Duration::seconds(86399).num_days(), 0);
+        assert_eq!(Duration::seconds(86401).num_days(), 1);
+        assert_eq!(Duration::seconds(-86399).num_days(), 0);
+        assert_eq!(Duration::seconds(-86401).num_days(), -1);
+        assert_eq!(Duration::days(i32::MAX as i64).num_days(), i32::MAX as i64);
+        assert_eq!(Duration::days(i32::MIN as i64).num_days(), i32::MIN as i64);
+    }
+
+    #[test]
+    fn test_duration_num_seconds() {
+        assert_eq!(Duration::zero().num_seconds(), 0);
+        assert_eq!(Duration::seconds(1).num_seconds(), 1);
+        assert_eq!(Duration::seconds(-1).num_seconds(), -1);
+        assert_eq!(Duration::milliseconds(999).num_seconds(), 0);
+        assert_eq!(Duration::milliseconds(1001).num_seconds(), 1);
+        assert_eq!(Duration::milliseconds(-999).num_seconds(), 0);
+        assert_eq!(Duration::milliseconds(-1001).num_seconds(), -1);
+    }
+
+    #[test]
+    fn test_duration_num_milliseconds() {
+        assert_eq!(Duration::zero().num_milliseconds(), 0);
+        assert_eq!(Duration::milliseconds(1).num_milliseconds(), 1);
+        assert_eq!(Duration::milliseconds(-1).num_milliseconds(), -1);
+        assert_eq!(Duration::microseconds(999).num_milliseconds(), 0);
+        assert_eq!(Duration::microseconds(1001).num_milliseconds(), 1);
+        assert_eq!(Duration::microseconds(-999).num_milliseconds(), 0);
+        assert_eq!(Duration::microseconds(-1001).num_milliseconds(), -1);
+        assert_eq!(Duration::milliseconds(i64::MAX).num_milliseconds(), i64::MAX);
+        assert_eq!(Duration::milliseconds(i64::MIN).num_milliseconds(), i64::MIN);
+        assert_eq!(MAX.num_milliseconds(), i64::MAX);
+        assert_eq!(MIN.num_milliseconds(), i64::MIN);
+    }
+
+    #[test]
+    fn test_duration_num_microseconds() {
+        assert_eq!(Duration::zero().num_microseconds(), Some(0));
+        assert_eq!(Duration::microseconds(1).num_microseconds(), Some(1));
+        assert_eq!(Duration::microseconds(-1).num_microseconds(), Some(-1));
+        assert_eq!(Duration::nanoseconds(999).num_microseconds(), Some(0));
+        assert_eq!(Duration::nanoseconds(1001).num_microseconds(), Some(1));
+        assert_eq!(Duration::nanoseconds(-999).num_microseconds(), Some(0));
+        assert_eq!(Duration::nanoseconds(-1001).num_microseconds(), Some(-1));
+        assert_eq!(Duration::microseconds(i64::MAX).num_microseconds(), Some(i64::MAX));
+        assert_eq!(Duration::microseconds(i64::MIN).num_microseconds(), Some(i64::MIN));
+        assert_eq!(MAX.num_microseconds(), None);
+        assert_eq!(MIN.num_microseconds(), None);
+
+        // overflow checks
+        const MICROS_PER_DAY: i64 = 86400_000_000;
+        assert_eq!(Duration::days(i64::MAX / MICROS_PER_DAY).num_microseconds(),
+                   Some(i64::MAX / MICROS_PER_DAY * MICROS_PER_DAY));
+        assert_eq!(Duration::days(i64::MIN / MICROS_PER_DAY).num_microseconds(),
+                   Some(i64::MIN / MICROS_PER_DAY * MICROS_PER_DAY));
+        assert_eq!(Duration::days(i64::MAX / MICROS_PER_DAY + 1).num_microseconds(), None);
+        assert_eq!(Duration::days(i64::MIN / MICROS_PER_DAY - 1).num_microseconds(), None);
+    }
+
+    #[test]
+    fn test_duration_num_nanoseconds() {
+        assert_eq!(Duration::zero().num_nanoseconds(), Some(0));
+        assert_eq!(Duration::nanoseconds(1).num_nanoseconds(), Some(1));
+        assert_eq!(Duration::nanoseconds(-1).num_nanoseconds(), Some(-1));
+        assert_eq!(Duration::nanoseconds(i64::MAX).num_nanoseconds(), Some(i64::MAX));
+        assert_eq!(Duration::nanoseconds(i64::MIN).num_nanoseconds(), Some(i64::MIN));
+        assert_eq!(MAX.num_nanoseconds(), None);
+        assert_eq!(MIN.num_nanoseconds(), None);
+
+        // overflow checks
+        const NANOS_PER_DAY: i64 = 86400_000_000_000;
+        assert_eq!(Duration::days(i64::MAX / NANOS_PER_DAY).num_nanoseconds(),
+                   Some(i64::MAX / NANOS_PER_DAY * NANOS_PER_DAY));
+        assert_eq!(Duration::days(i64::MIN / NANOS_PER_DAY).num_nanoseconds(),
+                   Some(i64::MIN / NANOS_PER_DAY * NANOS_PER_DAY));
+        assert_eq!(Duration::days(i64::MAX / NANOS_PER_DAY + 1).num_nanoseconds(), None);
+        assert_eq!(Duration::days(i64::MIN / NANOS_PER_DAY - 1).num_nanoseconds(), None);
+    }
+
+    #[test]
+    fn test_duration_checked_ops() {
+        assert_eq!(Duration::milliseconds(i64::MAX - 1).checked_add(&Duration::microseconds(999)),
+                   Some(Duration::milliseconds(i64::MAX - 2) + Duration::microseconds(1999)));
+        assert!(Duration::milliseconds(i64::MAX).checked_add(&Duration::microseconds(1000))
+                                                .is_none());
+
+        assert_eq!(Duration::milliseconds(i64::MIN).checked_sub(&Duration::milliseconds(0)),
+                   Some(Duration::milliseconds(i64::MIN)));
+        assert!(Duration::milliseconds(i64::MIN).checked_sub(&Duration::milliseconds(1))
+                                                .is_none());
+    }
+
+    #[test]
+    fn test_duration_mul() {
+        assert_eq!(Duration::zero() * i32::MAX, Duration::zero());
+        assert_eq!(Duration::zero() * i32::MIN, Duration::zero());
+        assert_eq!(Duration::nanoseconds(1) * 0, Duration::zero());
+        assert_eq!(Duration::nanoseconds(1) * 1, Duration::nanoseconds(1));
+        assert_eq!(Duration::nanoseconds(1) * 1_000_000_000, Duration::seconds(1));
+        assert_eq!(Duration::nanoseconds(1) * -1_000_000_000, -Duration::seconds(1));
+        assert_eq!(-Duration::nanoseconds(1) * 1_000_000_000, -Duration::seconds(1));
+        assert_eq!(Duration::nanoseconds(30) * 333_333_333,
+                   Duration::seconds(10) - Duration::nanoseconds(10));
+        assert_eq!((Duration::nanoseconds(1) + Duration::seconds(1) + Duration::days(1)) * 3,
+                   Duration::nanoseconds(3) + Duration::seconds(3) + Duration::days(3));
+        assert_eq!(Duration::milliseconds(1500) * -2, Duration::seconds(-3));
+        assert_eq!(Duration::milliseconds(-1500) * 2, Duration::seconds(-3));
+    }
+
+    #[test]
+    fn test_duration_div() {
+        assert_eq!(Duration::zero() / i32::MAX, Duration::zero());
+        assert_eq!(Duration::zero() / i32::MIN, Duration::zero());
+        assert_eq!(Duration::nanoseconds(123_456_789) / 1, Duration::nanoseconds(123_456_789));
+        assert_eq!(Duration::nanoseconds(123_456_789) / -1, -Duration::nanoseconds(123_456_789));
+        assert_eq!(-Duration::nanoseconds(123_456_789) / -1, Duration::nanoseconds(123_456_789));
+        assert_eq!(-Duration::nanoseconds(123_456_789) / 1, -Duration::nanoseconds(123_456_789));
+        assert_eq!(Duration::seconds(1) / 3, Duration::nanoseconds(333_333_333));
+        assert_eq!(Duration::seconds(4) / 3, Duration::nanoseconds(1_333_333_333));
+        assert_eq!(Duration::seconds(-1) / 2, Duration::milliseconds(-500));
+        assert_eq!(Duration::seconds(1) / -2, Duration::milliseconds(-500));
+        assert_eq!(Duration::seconds(-1) / -2, Duration::milliseconds(500));
+        assert_eq!(Duration::seconds(-4) / 3, Duration::nanoseconds(-1_333_333_333));
+        assert_eq!(Duration::seconds(-4) / -3, Duration::nanoseconds(1_333_333_333));
+    }
+
+    #[test]
+    fn test_duration_fmt() {
+        assert_eq!(Duration::zero().to_string(), "PT0S");
+        assert_eq!(Duration::days(42).to_string(), "P42D");
+        assert_eq!(Duration::days(-42).to_string(), "-P42D");
+        assert_eq!(Duration::seconds(42).to_string(), "PT42S");
+        assert_eq!(Duration::milliseconds(42).to_string(), "PT0.042S");
+        assert_eq!(Duration::microseconds(42).to_string(), "PT0.000042S");
+        assert_eq!(Duration::nanoseconds(42).to_string(), "PT0.000000042S");
+        assert_eq!((Duration::days(7) + Duration::milliseconds(6543)).to_string(),
+                   "P7DT6.543S");
+        assert_eq!(Duration::seconds(-86401).to_string(), "-P1DT1S");
+        assert_eq!(Duration::nanoseconds(-1).to_string(), "-PT0.000000001S");
+
+        // the format specifier should have no effect on `Duration`
+        assert_eq!(format!("{:30}", Duration::days(1) + Duration::milliseconds(2345)),
+                   "P1DT2.345S");
+    }
+
+    #[test]
+    fn test_to_std() {
+        assert_eq!(Duration::seconds(1).to_std(), Ok(StdDuration::new(1, 0)));
+        assert_eq!(Duration::seconds(86401).to_std(), Ok(StdDuration::new(86401, 0)));
+        assert_eq!(Duration::milliseconds(123).to_std(), Ok(StdDuration::new(0, 123000000)));
+        assert_eq!(Duration::milliseconds(123765).to_std(), Ok(StdDuration::new(123, 765000000)));
+        assert_eq!(Duration::nanoseconds(777).to_std(), Ok(StdDuration::new(0, 777)));
+        assert_eq!(MAX.to_std(), Ok(StdDuration::new(9223372036854775, 807000000)));
+        assert_eq!(Duration::seconds(-1).to_std(),
+                   Err(OutOfRangeError(())));
+        assert_eq!(Duration::milliseconds(-1).to_std(),
+                   Err(OutOfRangeError(())));
+    }
+
+    #[test]
+    fn test_from_std() {
+        assert_eq!(Ok(Duration::seconds(1)),
+                   Duration::from_std(StdDuration::new(1, 0)));
+        assert_eq!(Ok(Duration::seconds(86401)),
+                   Duration::from_std(StdDuration::new(86401, 0)));
+        assert_eq!(Ok(Duration::milliseconds(123)),
+                   Duration::from_std(StdDuration::new(0, 123000000)));
+        assert_eq!(Ok(Duration::milliseconds(123765)),
+                   Duration::from_std(StdDuration::new(123, 765000000)));
+        assert_eq!(Ok(Duration::nanoseconds(777)),
+                   Duration::from_std(StdDuration::new(0, 777)));
+        assert_eq!(Ok(MAX),
+                   Duration::from_std(StdDuration::new(9223372036854775, 807000000)));
+        assert_eq!(Duration::from_std(StdDuration::new(9223372036854776, 0)),
+                   Err(OutOfRangeError(())));
+        assert_eq!(Duration::from_std(StdDuration::new(9223372036854775, 807000001)),
+                   Err(OutOfRangeError(())));
+    }
+}
diff -Nru cargo-0.32.0/vendor/time/src/lib.rs cargo-0.33.0/vendor/time/src/lib.rs
--- cargo-0.32.0/vendor/time/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1276 @@
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Simple time handling.
+//!
+//! # Usage
+//!
+//! This crate is [on crates.io](https://crates.io/crates/time) and can be
+//! used by adding `time` to the dependencies in your project's `Cargo.toml`.
+//!
+//! ```toml
+//! [dependencies]
+//! time = "0.1"
+//! ```
+//!
+//! And this in your crate root:
+//!
+//! ```rust
+//! extern crate time;
+//! ```
+//!
+//! This crate uses the same syntax for format strings as the
+//! [`strftime()`](http://man7.org/linux/man-pages/man3/strftime.3.html)
+//! function from the C standard library.
+
+#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
+       html_favicon_url = "https://www.rust-lang.org/favicon.ico",
+       html_root_url = "https://doc.rust-lang.org/time/")]
+#![allow(trivial_numeric_casts)]
+#![cfg_attr(test, deny(warnings))]
+
+#[cfg(target_os = "redox")] extern crate syscall;
+#[cfg(unix)] extern crate libc;
+#[cfg(windows)] extern crate winapi;
+#[cfg(feature = "rustc-serialize")] extern crate rustc_serialize;
+
+#[cfg(test)] #[macro_use] extern crate log;
+
+use std::cmp::Ordering;
+use std::error::Error;
+use std::fmt;
+use std::ops::{Add, Sub};
+
+pub use duration::{Duration, OutOfRangeError};
+
+use self::ParseError::{InvalidDay, InvalidDayOfMonth, InvalidDayOfWeek,
+                       InvalidDayOfYear, InvalidFormatSpecifier, InvalidHour,
+                       InvalidMinute, InvalidMonth, InvalidSecond, InvalidTime,
+                       InvalidYear, InvalidZoneOffset, InvalidSecondsSinceEpoch,
+                       MissingFormatConverter, UnexpectedCharacter};
+
+pub use parse::strptime;
+
+mod display;
+mod duration;
+mod parse;
+mod sys;
+
+static NSEC_PER_SEC: i32 = 1_000_000_000;
+
+/// A record specifying a time value in seconds and nanoseconds, where
+/// nanoseconds represent the offset from the given second.
+///
+/// For example a timespec of 1.2 seconds after the beginning of the epoch would
+/// be represented as {sec: 1, nsec: 200000000}.
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+#[cfg_attr(feature = "rustc-serialize", derive(RustcEncodable, RustcDecodable))]
+pub struct Timespec { pub sec: i64, pub nsec: i32 }
+/*
+ * Timespec assumes that pre-epoch Timespecs have negative sec and positive
+ * nsec fields. Darwin's and Linux's struct timespec functions handle pre-
+ * epoch timestamps using a "two steps back, one step forward" representation,
+ * though the man pages do not actually document this. For example, the time
+ * -1.2 seconds before the epoch is represented by `Timespec { sec: -2_i64,
+ * nsec: 800_000_000 }`.
+ */
+impl Timespec {
+    pub fn new(sec: i64, nsec: i32) -> Timespec {
+        assert!(nsec >= 0 && nsec < NSEC_PER_SEC);
+        Timespec { sec: sec, nsec: nsec }
+    }
+}
+
+impl Add<Duration> for Timespec {
+    type Output = Timespec;
+
+    fn add(self, other: Duration) -> Timespec {
+        let d_sec = other.num_seconds();
+        // It is safe to unwrap the nanoseconds, because there cannot be
+        // more than one second left, which fits in i64 and in i32.
+        let d_nsec = (other - Duration::seconds(d_sec))
+                     .num_nanoseconds().unwrap() as i32;
+        let mut sec = self.sec + d_sec;
+        let mut nsec = self.nsec + d_nsec;
+        if nsec >= NSEC_PER_SEC {
+            nsec -= NSEC_PER_SEC;
+            sec += 1;
+        } else if nsec < 0 {
+            nsec += NSEC_PER_SEC;
+            sec -= 1;
+        }
+        Timespec::new(sec, nsec)
+    }
+}
+
+impl Sub<Duration> for Timespec {
+    type Output = Timespec;
+
+    fn sub(self, other: Duration) -> Timespec {
+        let d_sec = other.num_seconds();
+        // It is safe to unwrap the nanoseconds, because there cannot be
+        // more than one second left, which fits in i64 and in i32.
+        let d_nsec = (other - Duration::seconds(d_sec))
+                     .num_nanoseconds().unwrap() as i32;
+        let mut sec = self.sec - d_sec;
+        let mut nsec = self.nsec - d_nsec;
+        if nsec >= NSEC_PER_SEC {
+            nsec -= NSEC_PER_SEC;
+            sec += 1;
+        } else if nsec < 0 {
+            nsec += NSEC_PER_SEC;
+            sec -= 1;
+        }
+        Timespec::new(sec, nsec)
+    }
+}
+
+impl Sub<Timespec> for Timespec {
+    type Output = Duration;
+
+    fn sub(self, other: Timespec) -> Duration {
+        let sec = self.sec - other.sec;
+        let nsec = self.nsec - other.nsec;
+        Duration::seconds(sec) + Duration::nanoseconds(nsec as i64)
+    }
+}
+
+/**
+ * Returns the current time as a `timespec` containing the seconds and
+ * nanoseconds since 1970-01-01T00:00:00Z.
+ */
+pub fn get_time() -> Timespec {
+    let (sec, nsec) = sys::get_time();
+    Timespec::new(sec, nsec)
+}
+
+
+/**
+ * Returns the current value of a high-resolution performance counter
+ * in nanoseconds since an unspecified epoch.
+ */
+#[inline]
+pub fn precise_time_ns() -> u64 {
+    sys::get_precise_ns()
+}
+
+
+/**
+ * Returns the current value of a high-resolution performance counter
+ * in seconds since an unspecified epoch.
+ */
+pub fn precise_time_s() -> f64 {
+    return (precise_time_ns() as f64) / 1000000000.;
+}
+
+/// An opaque structure representing a moment in time.
+///
+/// The only operation that can be performed on a `PreciseTime` is the
+/// calculation of the `Duration` of time that lies between them.
+///
+/// # Examples
+///
+/// Repeatedly call a function for 1 second:
+///
+/// ```rust
+/// use time::{Duration, PreciseTime};
+/// # fn do_some_work() {}
+///
+/// let start = PreciseTime::now();
+///
+/// while start.to(PreciseTime::now()) < Duration::seconds(1) {
+///     do_some_work();
+/// }
+/// ```
+#[derive(Copy, Clone)]
+pub struct PreciseTime(u64);
+
+impl PreciseTime {
+    /// Returns a `PreciseTime` representing the current moment in time.
+    pub fn now() -> PreciseTime {
+        PreciseTime(precise_time_ns())
+    }
+
+    /// Returns a `Duration` representing the span of time from the value of
+    /// `self` to the value of `later`.
+    ///
+    /// # Notes
+    ///
+    /// If `later` represents a time before `self`, the result of this method
+    /// is unspecified.
+    ///
+    /// If `later` represents a time more than 293 years after `self`, the
+    /// result of this method is unspecified.
+    #[inline]
+    pub fn to(&self, later: PreciseTime) -> Duration {
+        // NB: even if later is less than self due to overflow, this will work
+        // since the subtraction will underflow properly as well.
+        //
+        // We could deal with the overflow when casting to an i64, but all that
+        // gets us is the ability to handle intervals of up to 584 years, which
+        // seems not very useful :)
+        Duration::nanoseconds((later.0 - self.0) as i64)
+    }
+}
+
+/// A structure representing a moment in time.
+///
+/// `SteadyTime`s are generated by a "steady" clock, that is, a clock which
+/// never experiences discontinuous jumps and for which time always flows at
+/// the same rate.
+///
+/// # Examples
+///
+/// Repeatedly call a function for 1 second:
+///
+/// ```rust
+/// # use time::{Duration, SteadyTime};
+/// # fn do_some_work() {}
+/// let start = SteadyTime::now();
+///
+/// while SteadyTime::now() - start < Duration::seconds(1) {
+///     do_some_work();
+/// }
+/// ```
+#[derive(Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug)]
+pub struct SteadyTime(sys::SteadyTime);
+
+impl SteadyTime {
+    /// Returns a `SteadyTime` representing the current moment in time.
+    pub fn now() -> SteadyTime {
+        SteadyTime(sys::SteadyTime::now())
+    }
+}
+
+impl fmt::Display for SteadyTime {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        // TODO: needs a display customization
+        fmt::Debug::fmt(self, fmt)
+    }
+}
+
+impl Sub for SteadyTime {
+    type Output = Duration;
+
+    fn sub(self, other: SteadyTime) -> Duration {
+        self.0 - other.0
+    }
+}
+
+impl Sub<Duration> for SteadyTime {
+    type Output = SteadyTime;
+
+    fn sub(self, other: Duration) -> SteadyTime {
+        SteadyTime(self.0 - other)
+    }
+}
+
+impl Add<Duration> for SteadyTime {
+    type Output = SteadyTime;
+
+    fn add(self, other: Duration) -> SteadyTime {
+        SteadyTime(self.0 + other)
+    }
+}
+
+#[cfg(not(any(windows, target_env = "sgx")))]
+pub fn tzset() {
+    extern { fn tzset(); }
+    unsafe { tzset() }
+}
+
+
+#[cfg(any(windows, target_env = "sgx"))]
+pub fn tzset() {}
+
+/// Holds a calendar date and time broken down into its components (year, month,
+/// day, and so on), also called a broken-down time value.
+// FIXME: use c_int instead of i32?
+#[repr(C)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
+#[cfg_attr(feature = "rustc-serialize", derive(RustcEncodable, RustcDecodable))]
+pub struct Tm {
+    /// Seconds after the minute - [0, 60]
+    pub tm_sec: i32,
+
+    /// Minutes after the hour - [0, 59]
+    pub tm_min: i32,
+
+    /// Hours after midnight - [0, 23]
+    pub tm_hour: i32,
+
+    /// Day of the month - [1, 31]
+    pub tm_mday: i32,
+
+    /// Months since January - [0, 11]
+    pub tm_mon: i32,
+
+    /// Years since 1900
+    pub tm_year: i32,
+
+    /// Days since Sunday - [0, 6]. 0 = Sunday, 1 = Monday, ..., 6 = Saturday.
+    pub tm_wday: i32,
+
+    /// Days since January 1 - [0, 365]
+    pub tm_yday: i32,
+
+    /// Daylight Saving Time flag.
+    ///
+    /// This value is positive if Daylight Saving Time is in effect, zero if
+    /// Daylight Saving Time is not in effect, and negative if this information
+    /// is not available.
+    pub tm_isdst: i32,
+
+    /// Identifies the time zone that was used to compute this broken-down time
+    /// value, including any adjustment for Daylight Saving Time. This is the
+    /// number of seconds east of UTC. For example, for U.S. Pacific Daylight
+    /// Time, the value is `-7*60*60 = -25200`.
+    pub tm_utcoff: i32,
+
+    /// Nanoseconds after the second - [0, 10<sup>9</sup> - 1]
+    pub tm_nsec: i32,
+}
+
+impl Add<Duration> for Tm {
+    type Output = Tm;
+
+    /// The resulting Tm is in UTC.
+    // FIXME:  The resulting Tm should have the same timezone as `self`;
+    // however, we need a function such as `at_tm(clock: Timespec, offset: i32)`
+    // for this.
+    fn add(self, other: Duration) -> Tm {
+        at_utc(self.to_timespec() + other)
+    }
+}
+
+impl Sub<Duration> for Tm {
+    type Output = Tm;
+
+    /// The resulting Tm is in UTC.
+    // FIXME:  The resulting Tm should have the same timezone as `self`;
+    // however, we need a function such as `at_tm(clock: Timespec, offset: i32)`
+    // for this.
+    fn sub(self, other: Duration) -> Tm {
+        at_utc(self.to_timespec() - other)
+    }
+}
+
+impl Sub<Tm> for Tm {
+    type Output = Duration;
+
+    fn sub(self, other: Tm) -> Duration {
+        self.to_timespec() - other.to_timespec()
+    }
+}
+
+impl PartialOrd for Tm {
+    fn partial_cmp(&self, other: &Tm) -> Option<Ordering> {
+        self.to_timespec().partial_cmp(&other.to_timespec())
+    }
+}
+
+impl Ord for Tm {
+    fn cmp(&self, other: &Tm) -> Ordering {
+        self.to_timespec().cmp(&other.to_timespec())
+    }
+}
+
+pub fn empty_tm() -> Tm {
+    Tm {
+        tm_sec: 0,
+        tm_min: 0,
+        tm_hour: 0,
+        tm_mday: 0,
+        tm_mon: 0,
+        tm_year: 0,
+        tm_wday: 0,
+        tm_yday: 0,
+        tm_isdst: 0,
+        tm_utcoff: 0,
+        tm_nsec: 0,
+    }
+}
+
+/// Returns the specified time in UTC
+pub fn at_utc(clock: Timespec) -> Tm {
+    let Timespec { sec, nsec } = clock;
+    let mut tm = empty_tm();
+    sys::time_to_utc_tm(sec, &mut tm);
+    tm.tm_nsec = nsec;
+    tm
+}
+
+/// Returns the current time in UTC
+pub fn now_utc() -> Tm {
+    at_utc(get_time())
+}
+
+/// Returns the specified time in the local timezone
+pub fn at(clock: Timespec) -> Tm {
+    let Timespec { sec, nsec } = clock;
+    let mut tm = empty_tm();
+    sys::time_to_local_tm(sec, &mut tm);
+    tm.tm_nsec = nsec;
+    tm
+}
+
+/// Returns the current time in the local timezone
+pub fn now() -> Tm {
+    at(get_time())
+}
+
+impl Tm {
+    /// Convert time to the seconds from January 1, 1970
+    pub fn to_timespec(&self) -> Timespec {
+        let sec = match self.tm_utcoff {
+            0 => sys::utc_tm_to_time(self),
+            _ => sys::local_tm_to_time(self)
+        };
+
+        Timespec::new(sec, self.tm_nsec)
+    }
+
+    /// Convert time to the local timezone
+    pub fn to_local(&self) -> Tm {
+        at(self.to_timespec())
+    }
+
+    /// Convert time to the UTC
+    pub fn to_utc(&self) -> Tm {
+        match self.tm_utcoff {
+            0 => *self,
+            _ => at_utc(self.to_timespec())
+        }
+    }
+
+    /**
+     * Returns a TmFmt that outputs according to the `asctime` format in ISO
+     * C, in the local timezone.
+     *
+     * Example: "Thu Jan  1 00:00:00 1970"
+     */
+    pub fn ctime(&self) -> TmFmt {
+        TmFmt {
+            tm: self,
+            format: Fmt::Ctime,
+        }
+    }
+
+    /**
+     * Returns a TmFmt that outputs according to the `asctime` format in ISO
+     * C.
+     *
+     * Example: "Thu Jan  1 00:00:00 1970"
+     */
+    pub fn asctime(&self) -> TmFmt {
+        TmFmt {
+            tm: self,
+            format: Fmt::Str("%c"),
+        }
+    }
+
+    /// Formats the time according to the format string.
+    pub fn strftime<'a>(&'a self, format: &'a str) -> Result<TmFmt<'a>, ParseError> {
+        validate_format(TmFmt {
+            tm: self,
+            format: Fmt::Str(format),
+        })
+    }
+
+    /**
+     * Returns a TmFmt that outputs according to RFC 822.
+     *
+     * local: "Thu, 22 Mar 2012 07:53:18 PST"
+     * utc:   "Thu, 22 Mar 2012 14:53:18 GMT"
+     */
+    pub fn rfc822(&self) -> TmFmt {
+        let fmt = if self.tm_utcoff == 0 {
+            "%a, %d %b %Y %T GMT"
+        } else {
+            "%a, %d %b %Y %T %Z"
+        };
+        TmFmt {
+            tm: self,
+            format: Fmt::Str(fmt),
+        }
+    }
+
+    /**
+     * Returns a TmFmt that outputs according to RFC 822 with Zulu time.
+     *
+     * local: "Thu, 22 Mar 2012 07:53:18 -0700"
+     * utc:   "Thu, 22 Mar 2012 14:53:18 -0000"
+     */
+    pub fn rfc822z(&self) -> TmFmt {
+        TmFmt {
+            tm: self,
+            format: Fmt::Str("%a, %d %b %Y %T %z"),
+        }
+    }
+
+    /**
+     * Returns a TmFmt that outputs according to RFC 3339. RFC 3339 is
+     * compatible with ISO 8601.
+     *
+     * local: "2012-02-22T07:53:18-07:00"
+     * utc:   "2012-02-22T14:53:18Z"
+     */
+    pub fn rfc3339<'a>(&'a self) -> TmFmt {
+        TmFmt {
+            tm: self,
+            format: Fmt::Rfc3339,
+        }
+    }
+}
+
+#[derive(Copy, PartialEq, Debug, Clone)]
+pub enum ParseError {
+    InvalidSecond,
+    InvalidMinute,
+    InvalidHour,
+    InvalidDay,
+    InvalidMonth,
+    InvalidYear,
+    InvalidDayOfWeek,
+    InvalidDayOfMonth,
+    InvalidDayOfYear,
+    InvalidZoneOffset,
+    InvalidTime,
+    InvalidSecondsSinceEpoch,
+    MissingFormatConverter,
+    InvalidFormatSpecifier(char),
+    UnexpectedCharacter(char, char),
+}
+
+impl fmt::Display for ParseError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            InvalidFormatSpecifier(ch) => {
+                write!(f, "{}: %{}", self.description(), ch)
+            }
+            UnexpectedCharacter(a, b) => {
+                write!(f, "expected: `{}`, found: `{}`", a, b)
+            }
+            _ => write!(f, "{}", self.description())
+        }
+    }
+}
+
+impl Error for ParseError {
+    fn description(&self) -> &str {
+        match *self {
+            InvalidSecond => "Invalid second.",
+            InvalidMinute => "Invalid minute.",
+            InvalidHour => "Invalid hour.",
+            InvalidDay => "Invalid day.",
+            InvalidMonth => "Invalid month.",
+            InvalidYear => "Invalid year.",
+            InvalidDayOfWeek => "Invalid day of the week.",
+            InvalidDayOfMonth => "Invalid day of the month.",
+            InvalidDayOfYear => "Invalid day of the year.",
+            InvalidZoneOffset => "Invalid zone offset.",
+            InvalidTime => "Invalid time.",
+            InvalidSecondsSinceEpoch => "Invalid seconds since epoch.",
+            MissingFormatConverter => "missing format converter after `%`",
+            InvalidFormatSpecifier(..) => "invalid format specifier",
+            UnexpectedCharacter(..) => "Unexpected character.",
+        }
+    }
+}
+
+/// A wrapper around a `Tm` and format string that implements Display.
+#[derive(Debug)]
+pub struct TmFmt<'a> {
+    tm: &'a Tm,
+    format: Fmt<'a>
+}
+
+#[derive(Debug)]
+enum Fmt<'a> {
+    Str(&'a str),
+    Rfc3339,
+    Ctime,
+}
+
+fn validate_format<'a>(fmt: TmFmt<'a>) -> Result<TmFmt<'a>, ParseError> {
+
+    match (fmt.tm.tm_wday, fmt.tm.tm_mon) {
+        (0...6, 0...11) => (),
+        (_wday, 0...11) => return Err(InvalidDayOfWeek),
+        (0...6, _mon) => return Err(InvalidMonth),
+        _ => return Err(InvalidDay)
+    }
+    match fmt.format {
+        Fmt::Str(ref s) => {
+            let mut chars = s.chars();
+            loop {
+                match chars.next() {
+                    Some('%') => {
+                        match chars.next() {
+                            Some('A') | Some('a') | Some('B') | Some('b') |
+                            Some('C') | Some('c') | Some('D') | Some('d') |
+                            Some('e') | Some('F') | Some('f') | Some('G') |
+                            Some('g') | Some('H') | Some('h') | Some('I') |
+                            Some('j') | Some('k') | Some('l') | Some('M') |
+                            Some('m') | Some('n') | Some('P') | Some('p') |
+                            Some('R') | Some('r') | Some('S') | Some('s') |
+                            Some('T') | Some('t') | Some('U') | Some('u') |
+                            Some('V') | Some('v') | Some('W') | Some('w') |
+                            Some('X') | Some('x') | Some('Y') | Some('y') |
+                            Some('Z') | Some('z') | Some('+') | Some('%') => (),
+
+                            Some(c) => return Err(InvalidFormatSpecifier(c)),
+                            None => return Err(MissingFormatConverter),
+                        }
+                    },
+                    None => break,
+                    _ => ()
+                }
+            }
+        },
+        _ => ()
+    }
+    Ok(fmt)
+}
+
+/// Formats the time according to the format string.
+pub fn strftime(format: &str, tm: &Tm) -> Result<String, ParseError> {
+    tm.strftime(format).map(|fmt| fmt.to_string())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Timespec, get_time, precise_time_ns, precise_time_s,
+                at_utc, at, strptime, PreciseTime, SteadyTime, ParseError, Duration};
+    use super::ParseError::{InvalidTime, InvalidYear, MissingFormatConverter,
+                            InvalidFormatSpecifier};
+
+    use std::sync::{Once, ONCE_INIT, Mutex, MutexGuard, LockResult};
+    use std::mem;
+
+    struct TzReset {
+        _tzreset: ::sys::TzReset,
+        _lock: LockResult<MutexGuard<'static, ()>>,
+    }
+
+    fn set_time_zone_la_or_london(london: bool) -> TzReset {
+        // Lock manages current timezone because some tests require LA some
+        // London
+        static mut LOCK: *mut Mutex<()> = 0 as *mut _;
+        static INIT: Once = ONCE_INIT;
+
+        unsafe {
+            INIT.call_once(|| {
+                LOCK = mem::transmute(Box::new(Mutex::new(())));
+            });
+
+            let timezone_lock = (*LOCK).lock();
+            let reset_func = if london {
+                ::sys::set_london_with_dst_time_zone()
+            } else {
+                ::sys::set_los_angeles_time_zone()
+            };
+            TzReset {
+                _lock: timezone_lock,
+                _tzreset: reset_func,
+            }
+        }
+    }
+
+    fn set_time_zone() -> TzReset {
+        set_time_zone_la_or_london(false)
+    }
+
+    fn set_time_zone_london_dst() -> TzReset {
+        set_time_zone_la_or_london(true)
+    }
+
+    #[test]
+    fn test_get_time() {
+        static SOME_RECENT_DATE: i64 = 1325376000i64; // 2012-01-01T00:00:00Z
+        static SOME_FUTURE_DATE: i64 = 1577836800i64; // 2020-01-01T00:00:00Z
+
+        let tv1 = get_time();
+        debug!("tv1={} sec + {} nsec", tv1.sec, tv1.nsec);
+
+        assert!(tv1.sec > SOME_RECENT_DATE);
+        assert!(tv1.nsec < 1000000000i32);
+
+        let tv2 = get_time();
+        debug!("tv2={} sec + {} nsec", tv2.sec, tv2.nsec);
+
+        assert!(tv2.sec >= tv1.sec);
+        assert!(tv2.sec < SOME_FUTURE_DATE);
+        assert!(tv2.nsec < 1000000000i32);
+        if tv2.sec == tv1.sec {
+            assert!(tv2.nsec >= tv1.nsec);
+        }
+    }
+
+    #[test]
+    fn test_precise_time() {
+        let s0 = precise_time_s();
+        debug!("s0={} sec", s0);
+        assert!(s0 > 0.);
+
+        let ns0 = precise_time_ns();
+        let ns1 = precise_time_ns();
+        debug!("ns0={} ns", ns0);
+        debug!("ns1={} ns", ns1);
+        assert!(ns1 >= ns0);
+
+        let ns2 = precise_time_ns();
+        debug!("ns2={} ns", ns2);
+        assert!(ns2 >= ns1);
+    }
+
+    #[test]
+    fn test_precise_time_to() {
+        let t0 = PreciseTime(1000);
+        let t1 = PreciseTime(1023);
+        assert_eq!(Duration::nanoseconds(23), t0.to(t1));
+    }
+
+    #[test]
+    fn test_at_utc() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let utc = at_utc(time);
+
+        assert_eq!(utc.tm_sec, 30);
+        assert_eq!(utc.tm_min, 31);
+        assert_eq!(utc.tm_hour, 23);
+        assert_eq!(utc.tm_mday, 13);
+        assert_eq!(utc.tm_mon, 1);
+        assert_eq!(utc.tm_year, 109);
+        assert_eq!(utc.tm_wday, 5);
+        assert_eq!(utc.tm_yday, 43);
+        assert_eq!(utc.tm_isdst, 0);
+        assert_eq!(utc.tm_utcoff, 0);
+        assert_eq!(utc.tm_nsec, 54321);
+    }
+
+    #[test]
+    fn test_at() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let local = at(time);
+
+        debug!("time_at: {:?}", local);
+
+        assert_eq!(local.tm_sec, 30);
+        assert_eq!(local.tm_min, 31);
+        assert_eq!(local.tm_hour, 15);
+        assert_eq!(local.tm_mday, 13);
+        assert_eq!(local.tm_mon, 1);
+        assert_eq!(local.tm_year, 109);
+        assert_eq!(local.tm_wday, 5);
+        assert_eq!(local.tm_yday, 43);
+        assert_eq!(local.tm_isdst, 0);
+        assert_eq!(local.tm_utcoff, -28800);
+        assert_eq!(local.tm_nsec, 54321);
+    }
+
+    #[test]
+    fn test_to_timespec() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let utc = at_utc(time);
+
+        assert_eq!(utc.to_timespec(), time);
+        assert_eq!(utc.to_local().to_timespec(), time);
+    }
+
+    #[test]
+    fn test_conversions() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let utc = at_utc(time);
+        let local = at(time);
+
+        assert!(local.to_local() == local);
+        assert!(local.to_utc() == utc);
+        assert!(local.to_utc().to_local() == local);
+        assert!(utc.to_utc() == utc);
+        assert!(utc.to_local() == local);
+        assert!(utc.to_local().to_utc() == utc);
+    }
+
+    #[test]
+    fn test_strptime() {
+        let _reset = set_time_zone();
+
+        match strptime("", "") {
+            Ok(ref tm) => {
+                assert!(tm.tm_sec == 0);
+                assert!(tm.tm_min == 0);
+                assert!(tm.tm_hour == 0);
+                assert!(tm.tm_mday == 0);
+                assert!(tm.tm_mon == 0);
+                assert!(tm.tm_year == 0);
+                assert!(tm.tm_wday == 0);
+                assert!(tm.tm_isdst == 0);
+                assert!(tm.tm_utcoff == 0);
+                assert!(tm.tm_nsec == 0);
+            }
+            Err(_) => ()
+        }
+
+        let format = "%a %b %e %T.%f %Y";
+        assert_eq!(strptime("", format), Err(ParseError::InvalidDay));
+        assert_eq!(strptime("Fri Feb 13 15:31:30", format),
+                   Err(InvalidTime));
+
+        match strptime("Fri Feb 13 15:31:30.01234 2009", format) {
+            Err(e) => panic!("{}", e),
+            Ok(ref tm) => {
+                assert_eq!(tm.tm_sec, 30);
+                assert_eq!(tm.tm_min, 31);
+                assert_eq!(tm.tm_hour, 15);
+                assert_eq!(tm.tm_mday, 13);
+                assert_eq!(tm.tm_mon, 1);
+                assert_eq!(tm.tm_year, 109);
+                assert_eq!(tm.tm_wday, 5);
+                assert_eq!(tm.tm_yday, 0);
+                assert_eq!(tm.tm_isdst, 0);
+                assert_eq!(tm.tm_utcoff, 0);
+                assert_eq!(tm.tm_nsec, 12340000);
+            }
+        }
+
+        fn test(s: &str, format: &str) -> bool {
+            match strptime(s, format) {
+              Ok(tm) => {
+                tm.strftime(format).unwrap().to_string() == s.to_string()
+              },
+              Err(e) => panic!("{:?},  s={:?}, format={:?}", e, s, format)
+            }
+        }
+
+        fn test_oneway(s : &str, format : &str) -> bool {
+            match strptime(s, format) {
+              Ok(_) => {
+                // oneway tests are used when reformatting the parsed Tm
+                // back into a string can generate a different string
+                // from the original (i.e. leading zeroes)
+                true
+              },
+              Err(e) => panic!("{:?},  s={:?}, format={:?}", e, s, format)
+            }
+        }
+
+        let days = [
+            "Sunday".to_string(),
+            "Monday".to_string(),
+            "Tuesday".to_string(),
+            "Wednesday".to_string(),
+            "Thursday".to_string(),
+            "Friday".to_string(),
+            "Saturday".to_string()
+        ];
+        for day in days.iter() {
+            assert!(test(&day, "%A"));
+        }
+
+        let days = [
+            "Sun".to_string(),
+            "Mon".to_string(),
+            "Tue".to_string(),
+            "Wed".to_string(),
+            "Thu".to_string(),
+            "Fri".to_string(),
+            "Sat".to_string()
+        ];
+        for day in days.iter() {
+            assert!(test(&day, "%a"));
+        }
+
+        let months = [
+            "January".to_string(),
+            "February".to_string(),
+            "March".to_string(),
+            "April".to_string(),
+            "May".to_string(),
+            "June".to_string(),
+            "July".to_string(),
+            "August".to_string(),
+            "September".to_string(),
+            "October".to_string(),
+            "November".to_string(),
+            "December".to_string()
+        ];
+        for day in months.iter() {
+            assert!(test(&day, "%B"));
+        }
+
+        let months = [
+            "Jan".to_string(),
+            "Feb".to_string(),
+            "Mar".to_string(),
+            "Apr".to_string(),
+            "May".to_string(),
+            "Jun".to_string(),
+            "Jul".to_string(),
+            "Aug".to_string(),
+            "Sep".to_string(),
+            "Oct".to_string(),
+            "Nov".to_string(),
+            "Dec".to_string()
+        ];
+        for day in months.iter() {
+            assert!(test(&day, "%b"));
+        }
+
+        assert!(test("19", "%C"));
+        assert!(test("Fri Feb  3 23:31:30 2009", "%c"));
+        assert!(test("Fri Feb 13 23:31:30 2009", "%c"));
+        assert!(test("02/13/09", "%D"));
+        assert!(test("03", "%d"));
+        assert!(test("13", "%d"));
+        assert!(test(" 3", "%e"));
+        assert!(test("13", "%e"));
+        assert!(test("2009-02-13", "%F"));
+        assert!(test("03", "%H"));
+        assert!(test("13", "%H"));
+        assert!(test("03", "%I")); // FIXME (#2350): flesh out
+        assert!(test("11", "%I")); // FIXME (#2350): flesh out
+        assert!(test("044", "%j"));
+        assert!(test(" 3", "%k"));
+        assert!(test("13", "%k"));
+        assert!(test(" 1", "%l"));
+        assert!(test("11", "%l"));
+        assert!(test("03", "%M"));
+        assert!(test("13", "%M"));
+        assert!(test("\n", "%n"));
+        assert!(test("am", "%P"));
+        assert!(test("pm", "%P"));
+        assert!(test("AM", "%p"));
+        assert!(test("PM", "%p"));
+        assert!(test("23:31", "%R"));
+        assert!(test("11:31:30 AM", "%r"));
+        assert!(test("11:31:30 PM", "%r"));
+        assert!(test("03", "%S"));
+        assert!(test("13", "%S"));
+        assert!(test("15:31:30", "%T"));
+        assert!(test("\t", "%t"));
+        assert!(test("1", "%u"));
+        assert!(test("7", "%u"));
+        assert!(test("13-Feb-2009", "%v"));
+        assert!(test("0", "%w"));
+        assert!(test("6", "%w"));
+        assert!(test("2009", "%Y"));
+        assert!(test("09", "%y"));
+
+        assert!(test_oneway("3",  "%d"));
+        assert!(test_oneway("3",  "%H"));
+        assert!(test_oneway("3",  "%e"));
+        assert!(test_oneway("3",  "%M"));
+        assert!(test_oneway("3",  "%S"));
+
+        assert!(strptime("-0000", "%z").unwrap().tm_utcoff == 0);
+        assert!(strptime("-00:00", "%z").unwrap().tm_utcoff == 0);
+        assert!(strptime("Z", "%z").unwrap().tm_utcoff == 0);
+        assert_eq!(-28800, strptime("-0800", "%z").unwrap().tm_utcoff);
+        assert_eq!(-28800, strptime("-08:00", "%z").unwrap().tm_utcoff);
+        assert_eq!(28800, strptime("+0800", "%z").unwrap().tm_utcoff);
+        assert_eq!(28800, strptime("+08:00", "%z").unwrap().tm_utcoff);
+        assert_eq!(5400, strptime("+0130", "%z").unwrap().tm_utcoff);
+        assert_eq!(5400, strptime("+01:30", "%z").unwrap().tm_utcoff);
+        assert!(test("%", "%%"));
+
+        // Test for #7256
+        assert_eq!(strptime("360", "%Y-%m-%d"), Err(InvalidYear));
+
+        // Test for epoch seconds parsing
+        {
+            assert!(test("1428035610", "%s"));
+            let tm = strptime("1428035610", "%s").unwrap();
+            assert_eq!(tm.tm_utcoff, 0);
+            assert_eq!(tm.tm_isdst, 0);
+            assert_eq!(tm.tm_yday, 92);
+            assert_eq!(tm.tm_wday, 5);
+            assert_eq!(tm.tm_year, 115);
+            assert_eq!(tm.tm_mon, 3);
+            assert_eq!(tm.tm_mday, 3);
+            assert_eq!(tm.tm_hour, 4);
+        }
+    }
+
+    #[test]
+    fn test_asctime() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let utc   = at_utc(time);
+        let local = at(time);
+
+        debug!("test_ctime: {} {}", utc.asctime(), local.asctime());
+
+        assert_eq!(utc.asctime().to_string(), "Fri Feb 13 23:31:30 2009".to_string());
+        assert_eq!(local.asctime().to_string(), "Fri Feb 13 15:31:30 2009".to_string());
+    }
+
+    #[test]
+    fn test_ctime() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let utc   = at_utc(time);
+        let local = at(time);
+
+        debug!("test_ctime: {} {}", utc.ctime(), local.ctime());
+
+        assert_eq!(utc.ctime().to_string(), "Fri Feb 13 15:31:30 2009".to_string());
+        assert_eq!(local.ctime().to_string(), "Fri Feb 13 15:31:30 2009".to_string());
+    }
+
+    #[test]
+    fn test_strftime() {
+        let _reset = set_time_zone();
+
+        let time = Timespec::new(1234567890, 54321);
+        let utc = at_utc(time);
+        let local = at(time);
+
+        assert_eq!(local.strftime("").unwrap().to_string(), "".to_string());
+        assert_eq!(local.strftime("%A").unwrap().to_string(), "Friday".to_string());
+        assert_eq!(local.strftime("%a").unwrap().to_string(), "Fri".to_string());
+        assert_eq!(local.strftime("%B").unwrap().to_string(), "February".to_string());
+        assert_eq!(local.strftime("%b").unwrap().to_string(), "Feb".to_string());
+        assert_eq!(local.strftime("%C").unwrap().to_string(), "20".to_string());
+        assert_eq!(local.strftime("%c").unwrap().to_string(),
+                   "Fri Feb 13 15:31:30 2009".to_string());
+        assert_eq!(local.strftime("%D").unwrap().to_string(), "02/13/09".to_string());
+        assert_eq!(local.strftime("%d").unwrap().to_string(), "13".to_string());
+        assert_eq!(local.strftime("%e").unwrap().to_string(), "13".to_string());
+        assert_eq!(local.strftime("%F").unwrap().to_string(), "2009-02-13".to_string());
+        assert_eq!(local.strftime("%f").unwrap().to_string(), "000054321".to_string());
+        assert_eq!(local.strftime("%G").unwrap().to_string(), "2009".to_string());
+        assert_eq!(local.strftime("%g").unwrap().to_string(), "09".to_string());
+        assert_eq!(local.strftime("%H").unwrap().to_string(), "15".to_string());
+        assert_eq!(local.strftime("%h").unwrap().to_string(), "Feb".to_string());
+        assert_eq!(local.strftime("%I").unwrap().to_string(), "03".to_string());
+        assert_eq!(local.strftime("%j").unwrap().to_string(), "044".to_string());
+        assert_eq!(local.strftime("%k").unwrap().to_string(), "15".to_string());
+        assert_eq!(local.strftime("%l").unwrap().to_string(), " 3".to_string());
+        assert_eq!(local.strftime("%M").unwrap().to_string(), "31".to_string());
+        assert_eq!(local.strftime("%m").unwrap().to_string(), "02".to_string());
+        assert_eq!(local.strftime("%n").unwrap().to_string(), "\n".to_string());
+        assert_eq!(local.strftime("%P").unwrap().to_string(), "pm".to_string());
+        assert_eq!(local.strftime("%p").unwrap().to_string(), "PM".to_string());
+        assert_eq!(local.strftime("%R").unwrap().to_string(), "15:31".to_string());
+        assert_eq!(local.strftime("%r").unwrap().to_string(), "03:31:30 PM".to_string());
+        assert_eq!(local.strftime("%S").unwrap().to_string(), "30".to_string());
+        assert_eq!(local.strftime("%s").unwrap().to_string(), "1234567890".to_string());
+        assert_eq!(local.strftime("%T").unwrap().to_string(), "15:31:30".to_string());
+        assert_eq!(local.strftime("%t").unwrap().to_string(), "\t".to_string());
+        assert_eq!(local.strftime("%U").unwrap().to_string(), "06".to_string());
+        assert_eq!(local.strftime("%u").unwrap().to_string(), "5".to_string());
+        assert_eq!(local.strftime("%V").unwrap().to_string(), "07".to_string());
+        assert_eq!(local.strftime("%v").unwrap().to_string(), "13-Feb-2009".to_string());
+        assert_eq!(local.strftime("%W").unwrap().to_string(), "06".to_string());
+        assert_eq!(local.strftime("%w").unwrap().to_string(), "5".to_string());
+        // FIXME (#2350): support locale
+        assert_eq!(local.strftime("%X").unwrap().to_string(), "15:31:30".to_string());
+        // FIXME (#2350): support locale
+        assert_eq!(local.strftime("%x").unwrap().to_string(), "02/13/09".to_string());
+        assert_eq!(local.strftime("%Y").unwrap().to_string(), "2009".to_string());
+        assert_eq!(local.strftime("%y").unwrap().to_string(), "09".to_string());
+        // FIXME (#2350): support locale
+        assert_eq!(local.strftime("%Z").unwrap().to_string(), "".to_string());
+        assert_eq!(local.strftime("%z").unwrap().to_string(), "-0800".to_string());
+        assert_eq!(local.strftime("%+").unwrap().to_string(),
+                   "2009-02-13T15:31:30-08:00".to_string());
+        assert_eq!(local.strftime("%%").unwrap().to_string(), "%".to_string());
+
+         let invalid_specifiers = ["%E", "%J", "%K", "%L", "%N", "%O", "%o", "%Q", "%q"];
+        for &sp in invalid_specifiers.iter() {
+            assert_eq!(local.strftime(sp).unwrap_err(),
+                       InvalidFormatSpecifier(sp[1..].chars().next().unwrap()));
+        }
+        assert_eq!(local.strftime("%").unwrap_err(), MissingFormatConverter);
+        assert_eq!(local.strftime("%A %").unwrap_err(), MissingFormatConverter);
+
+        assert_eq!(local.asctime().to_string(), "Fri Feb 13 15:31:30 2009".to_string());
+        assert_eq!(local.ctime().to_string(), "Fri Feb 13 15:31:30 2009".to_string());
+        assert_eq!(local.rfc822z().to_string(), "Fri, 13 Feb 2009 15:31:30 -0800".to_string());
+        assert_eq!(local.rfc3339().to_string(), "2009-02-13T15:31:30-08:00".to_string());
+
+        assert_eq!(utc.asctime().to_string(), "Fri Feb 13 23:31:30 2009".to_string());
+        assert_eq!(utc.ctime().to_string(), "Fri Feb 13 15:31:30 2009".to_string());
+        assert_eq!(utc.rfc822().to_string(), "Fri, 13 Feb 2009 23:31:30 GMT".to_string());
+        assert_eq!(utc.rfc822z().to_string(), "Fri, 13 Feb 2009 23:31:30 -0000".to_string());
+        assert_eq!(utc.rfc3339().to_string(), "2009-02-13T23:31:30Z".to_string());
+    }
+
+    #[test]
+    fn test_timespec_eq_ord() {
+        let a = &Timespec::new(-2, 1);
+        let b = &Timespec::new(-1, 2);
+        let c = &Timespec::new(1, 2);
+        let d = &Timespec::new(2, 1);
+        let e = &Timespec::new(2, 1);
+
+        assert!(d.eq(e));
+        assert!(c.ne(e));
+
+        assert!(a.lt(b));
+        assert!(b.lt(c));
+        assert!(c.lt(d));
+
+        assert!(a.le(b));
+        assert!(b.le(c));
+        assert!(c.le(d));
+        assert!(d.le(e));
+        assert!(e.le(d));
+
+        assert!(b.ge(a));
+        assert!(c.ge(b));
+        assert!(d.ge(c));
+        assert!(e.ge(d));
+        assert!(d.ge(e));
+
+        assert!(b.gt(a));
+        assert!(c.gt(b));
+        assert!(d.gt(c));
+    }
+
+    #[test]
+    #[allow(deprecated)]
+    fn test_timespec_hash() {
+        use std::hash::{Hash, Hasher};
+
+        let c = &Timespec::new(3, 2);
+        let d = &Timespec::new(2, 1);
+        let e = &Timespec::new(2, 1);
+
+        let mut hasher = ::std::hash::SipHasher::new();
+
+        let d_hash:u64 = {
+          d.hash(&mut hasher);
+          hasher.finish()
+        };
+
+        hasher = ::std::hash::SipHasher::new();
+
+        let e_hash:u64 = {
+          e.hash(&mut hasher);
+          hasher.finish()
+        };
+
+        hasher = ::std::hash::SipHasher::new();
+
+        let c_hash:u64 = {
+          c.hash(&mut hasher);
+          hasher.finish()
+        };
+
+        assert_eq!(d_hash, e_hash);
+        assert!(c_hash != e_hash);
+    }
+
+    #[test]
+    fn test_timespec_add() {
+        let a = Timespec::new(1, 2);
+        let b = Duration::seconds(2) + Duration::nanoseconds(3);
+        let c = a + b;
+        assert_eq!(c.sec, 3);
+        assert_eq!(c.nsec, 5);
+
+        let p = Timespec::new(1, super::NSEC_PER_SEC - 2);
+        let q = Duration::seconds(2) + Duration::nanoseconds(2);
+        let r = p + q;
+        assert_eq!(r.sec, 4);
+        assert_eq!(r.nsec, 0);
+
+        let u = Timespec::new(1, super::NSEC_PER_SEC - 2);
+        let v = Duration::seconds(2) + Duration::nanoseconds(3);
+        let w = u + v;
+        assert_eq!(w.sec, 4);
+        assert_eq!(w.nsec, 1);
+
+        let k = Timespec::new(1, 0);
+        let l = Duration::nanoseconds(-1);
+        let m = k + l;
+        assert_eq!(m.sec, 0);
+        assert_eq!(m.nsec, 999_999_999);
+    }
+
+    #[test]
+    fn test_timespec_sub() {
+        let a = Timespec::new(2, 3);
+        let b = Timespec::new(1, 2);
+        let c = a - b;
+        assert_eq!(c.num_nanoseconds(), Some(super::NSEC_PER_SEC as i64 + 1));
+
+        let p = Timespec::new(2, 0);
+        let q = Timespec::new(1, 2);
+        let r = p - q;
+        assert_eq!(r.num_nanoseconds(), Some(super::NSEC_PER_SEC as i64 - 2));
+
+        let u = Timespec::new(1, 2);
+        let v = Timespec::new(2, 3);
+        let w = u - v;
+        assert_eq!(w.num_nanoseconds(), Some(-super::NSEC_PER_SEC as i64 - 1));
+    }
+
+    #[test]
+    fn test_time_sub() {
+        let a = ::now();
+        let b = at(a.to_timespec() + Duration::seconds(5));
+        let c = b - a;
+        assert_eq!(c.num_nanoseconds(), Some(super::NSEC_PER_SEC as i64 * 5));
+    }
+
+    #[test]
+    fn test_steadytime_sub() {
+        let a = SteadyTime::now();
+        let b = a + Duration::seconds(1);
+        assert_eq!(b - a, Duration::seconds(1));
+        assert_eq!(a - b, Duration::seconds(-1));
+    }
+
+    #[test]
+    fn test_date_before_1970() {
+        let early = strptime("1901-01-06", "%F").unwrap();
+        let late = strptime("2000-01-01", "%F").unwrap();
+        assert!(early < late);
+    }
+
+    #[test]
+    fn test_dst() {
+        let _reset = set_time_zone_london_dst();
+        let utc_in_feb = strptime("2015-02-01Z", "%F%z").unwrap();
+        let utc_in_jun = strptime("2015-06-01Z", "%F%z").unwrap();
+        let utc_in_nov = strptime("2015-11-01Z", "%F%z").unwrap();
+        let local_in_feb = utc_in_feb.to_local();
+        let local_in_jun = utc_in_jun.to_local();
+        let local_in_nov = utc_in_nov.to_local();
+
+        assert_eq!(local_in_feb.tm_mon, 1);
+        assert_eq!(local_in_feb.tm_hour, 0);
+        assert_eq!(local_in_feb.tm_utcoff, 0);
+        assert_eq!(local_in_feb.tm_isdst, 0);
+
+        assert_eq!(local_in_jun.tm_mon, 5);
+        assert_eq!(local_in_jun.tm_hour, 1);
+        assert_eq!(local_in_jun.tm_utcoff, 3600);
+        assert_eq!(local_in_jun.tm_isdst, 1);
+
+        assert_eq!(local_in_nov.tm_mon, 10);
+        assert_eq!(local_in_nov.tm_hour, 0);
+        assert_eq!(local_in_nov.tm_utcoff, 0);
+        assert_eq!(local_in_nov.tm_isdst, 0)
+    }
+}
diff -Nru cargo-0.32.0/vendor/time/src/parse.rs cargo-0.33.0/vendor/time/src/parse.rs
--- cargo-0.32.0/vendor/time/src/parse.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/src/parse.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,394 @@
+use super::{Timespec, Tm, at_utc, ParseError, NSEC_PER_SEC};
+
+/// Parses the time from the string according to the format string.
+pub fn strptime(mut s: &str, format: &str) -> Result<Tm, ParseError> {
+    let mut tm = Tm {
+        tm_sec: 0,
+        tm_min: 0,
+        tm_hour: 0,
+        tm_mday: 0,
+        tm_mon: 0,
+        tm_year: 0,
+        tm_wday: 0,
+        tm_yday: 0,
+        tm_isdst: 0,
+        tm_utcoff: 0,
+        tm_nsec: 0,
+    };
+    let mut chars = format.chars();
+
+    while let Some(ch) = chars.next() {
+        if ch == '%' {
+            if let Some(ch) = chars.next() {
+                try!(parse_type(&mut s, ch, &mut tm));
+            }
+        } else {
+            try!(parse_char(&mut s, ch));
+        }
+    }
+
+    Ok(tm)
+}
+
+fn parse_type(s: &mut &str, ch: char, tm: &mut Tm) -> Result<(), ParseError> {
+    match ch {
+        'A' => match match_strs(s, &[("Sunday", 0),
+                                     ("Monday", 1),
+                                     ("Tuesday", 2),
+                                     ("Wednesday", 3),
+                                     ("Thursday", 4),
+                                     ("Friday", 5),
+                                     ("Saturday", 6)]) {
+            Some(v) => { tm.tm_wday = v; Ok(()) }
+            None => Err(ParseError::InvalidDay)
+        },
+        'a' => match match_strs(s, &[("Sun", 0),
+                                     ("Mon", 1),
+                                     ("Tue", 2),
+                                     ("Wed", 3),
+                                     ("Thu", 4),
+                                     ("Fri", 5),
+                                     ("Sat", 6)]) {
+            Some(v) => { tm.tm_wday = v; Ok(()) }
+            None => Err(ParseError::InvalidDay)
+        },
+        'B' => match match_strs(s, &[("January", 0),
+                                     ("February", 1),
+                                     ("March", 2),
+                                     ("April", 3),
+                                     ("May", 4),
+                                     ("June", 5),
+                                     ("July", 6),
+                                     ("August", 7),
+                                     ("September", 8),
+                                     ("October", 9),
+                                     ("November", 10),
+                                     ("December", 11)]) {
+            Some(v) => { tm.tm_mon = v; Ok(()) }
+            None => Err(ParseError::InvalidMonth)
+        },
+        'b' | 'h' => match match_strs(s, &[("Jan", 0),
+                                           ("Feb", 1),
+                                           ("Mar", 2),
+                                           ("Apr", 3),
+                                           ("May", 4),
+                                           ("Jun", 5),
+                                           ("Jul", 6),
+                                           ("Aug", 7),
+                                           ("Sep", 8),
+                                           ("Oct", 9),
+                                           ("Nov", 10),
+                                           ("Dec", 11)]) {
+            Some(v) => { tm.tm_mon = v; Ok(()) }
+            None => Err(ParseError::InvalidMonth)
+        },
+        'C' => match match_digits_in_range(s, 1, 2, false, 0, 99) {
+            Some(v) => { tm.tm_year += (v * 100) - 1900; Ok(()) }
+            None => Err(ParseError::InvalidYear)
+        },
+        'c' => {
+            parse_type(s, 'a', tm)
+                .and_then(|()| parse_char(s, ' '))
+                .and_then(|()| parse_type(s, 'b', tm))
+                .and_then(|()| parse_char(s, ' '))
+                .and_then(|()| parse_type(s, 'e', tm))
+                .and_then(|()| parse_char(s, ' '))
+                .and_then(|()| parse_type(s, 'T', tm))
+                .and_then(|()| parse_char(s, ' '))
+                .and_then(|()| parse_type(s, 'Y', tm))
+        }
+        'D' | 'x' => {
+            parse_type(s, 'm', tm)
+                .and_then(|()| parse_char(s, '/'))
+                .and_then(|()| parse_type(s, 'd', tm))
+                .and_then(|()| parse_char(s, '/'))
+                .and_then(|()| parse_type(s, 'y', tm))
+        }
+        'd' => match match_digits_in_range(s, 1, 2, false, 1, 31) {
+            Some(v) => { tm.tm_mday = v; Ok(()) }
+            None => Err(ParseError::InvalidDayOfMonth)
+        },
+        'e' => match match_digits_in_range(s, 1, 2, true, 1, 31) {
+            Some(v) => { tm.tm_mday = v; Ok(()) }
+            None => Err(ParseError::InvalidDayOfMonth)
+        },
+        'f' => {
+            tm.tm_nsec = match_fractional_seconds(s);
+            Ok(())
+        }
+        'F' => {
+            parse_type(s, 'Y', tm)
+                .and_then(|()| parse_char(s, '-'))
+                .and_then(|()| parse_type(s, 'm', tm))
+                .and_then(|()| parse_char(s, '-'))
+                .and_then(|()| parse_type(s, 'd', tm))
+        }
+        'H' => {
+            match match_digits_in_range(s, 1, 2, false, 0, 23) {
+                Some(v) => { tm.tm_hour = v; Ok(()) }
+                None => Err(ParseError::InvalidHour)
+            }
+        }
+        'I' => {
+            match match_digits_in_range(s, 1, 2, false, 1, 12) {
+                Some(v) => { tm.tm_hour = if v == 12 { 0 } else { v }; Ok(()) }
+                None => Err(ParseError::InvalidHour)
+            }
+        }
+        'j' => {
+            match match_digits_in_range(s, 1, 3, false, 1, 366) {
+                Some(v) => { tm.tm_yday = v - 1; Ok(()) }
+                None => Err(ParseError::InvalidDayOfYear)
+            }
+        }
+        'k' => {
+            match match_digits_in_range(s, 1, 2, true, 0, 23) {
+                Some(v) => { tm.tm_hour = v; Ok(()) }
+                None => Err(ParseError::InvalidHour)
+            }
+        }
+        'l' => {
+            match match_digits_in_range(s, 1, 2, true, 1, 12) {
+                Some(v) => { tm.tm_hour = if v == 12 { 0 } else { v }; Ok(()) }
+                None => Err(ParseError::InvalidHour)
+            }
+        }
+        'M' => {
+            match match_digits_in_range(s, 1, 2, false, 0, 59) {
+                Some(v) => { tm.tm_min = v; Ok(()) }
+                None => Err(ParseError::InvalidMinute)
+            }
+        }
+        'm' => {
+            match match_digits_in_range(s, 1, 2, false, 1, 12) {
+                Some(v) => { tm.tm_mon = v - 1; Ok(()) }
+                None => Err(ParseError::InvalidMonth)
+            }
+        }
+        'n' => parse_char(s, '\n'),
+        'P' => match match_strs(s, &[("am", 0), ("pm", 12)]) {
+            Some(v) => { tm.tm_hour += v; Ok(()) }
+            None => Err(ParseError::InvalidHour)
+        },
+        'p' => match match_strs(s, &[("AM", 0), ("PM", 12)]) {
+            Some(v) => { tm.tm_hour += v; Ok(()) }
+            None => Err(ParseError::InvalidHour)
+        },
+        'R' => {
+            parse_type(s, 'H', tm)
+                .and_then(|()| parse_char(s, ':'))
+                .and_then(|()| parse_type(s, 'M', tm))
+        }
+        'r' => {
+            parse_type(s, 'I', tm)
+                .and_then(|()| parse_char(s, ':'))
+                .and_then(|()| parse_type(s, 'M', tm))
+                .and_then(|()| parse_char(s, ':'))
+                .and_then(|()| parse_type(s, 'S', tm))
+                .and_then(|()| parse_char(s, ' '))
+                .and_then(|()| parse_type(s, 'p', tm))
+        }
+        's' => {
+            match match_digits_i64(s, 1, 18, false) {
+                Some(v) => {
+                    *tm = at_utc(Timespec::new(v, 0));
+                    Ok(())
+                },
+                None => Err(ParseError::InvalidSecondsSinceEpoch)
+            }
+        }
+        'S' => {
+            match match_digits_in_range(s, 1, 2, false, 0, 60) {
+                Some(v) => { tm.tm_sec = v; Ok(()) }
+                None => Err(ParseError::InvalidSecond)
+            }
+        }
+        //'s' {}
+        'T' | 'X' => {
+            parse_type(s, 'H', tm)
+                .and_then(|()| parse_char(s, ':'))
+                .and_then(|()| parse_type(s, 'M', tm))
+                .and_then(|()| parse_char(s, ':'))
+                .and_then(|()| parse_type(s, 'S', tm))
+        }
+        't' => parse_char(s, '\t'),
+        'u' => {
+            match match_digits_in_range(s, 1, 1, false, 1, 7) {
+                Some(v) => { tm.tm_wday = if v == 7 { 0 } else { v }; Ok(()) }
+                None => Err(ParseError::InvalidDayOfWeek)
+            }
+        }
+        'v' => {
+            parse_type(s, 'e', tm)
+                .and_then(|()| parse_char(s, '-'))
+                .and_then(|()| parse_type(s, 'b', tm))
+                .and_then(|()| parse_char(s, '-'))
+                .and_then(|()| parse_type(s, 'Y', tm))
+        }
+        //'W' {}
+        'w' => {
+            match match_digits_in_range(s, 1, 1, false, 0, 6) {
+                Some(v) => { tm.tm_wday = v; Ok(()) }
+                None => Err(ParseError::InvalidDayOfWeek)
+            }
+        }
+        'Y' => {
+            match match_digits(s, 4, 4, false) {
+                Some(v) => { tm.tm_year = v - 1900; Ok(()) }
+                None => Err(ParseError::InvalidYear)
+            }
+        }
+        'y' => {
+            match match_digits_in_range(s, 1, 2, false, 0, 99) {
+                Some(v) => { tm.tm_year = v; Ok(()) }
+                None => Err(ParseError::InvalidYear)
+            }
+        }
+        'Z' => {
+            if match_str(s, "UTC") || match_str(s, "GMT") {
+                tm.tm_utcoff = 0;
+                Ok(())
+            } else {
+                // It's odd, but to maintain compatibility with c's
+                // strptime we ignore the timezone.
+                for (i, ch) in s.char_indices() {
+                    if ch == ' ' {
+                        *s = &s[i..];
+                        return Ok(())
+                    }
+                }
+                *s = "";
+                Ok(())
+            }
+        }
+        'z' => {
+            if parse_char(s, 'Z').is_ok() {
+                tm.tm_utcoff = 0;
+                Ok(())
+            } else {
+                let sign = if parse_char(s, '+').is_ok() {1}
+                           else if parse_char(s, '-').is_ok() {-1}
+                           else { return Err(ParseError::InvalidZoneOffset) };
+
+                let hours;
+                let minutes;
+
+                match match_digits(s, 2, 2, false) {
+                    Some(h) => hours = h,
+                    None => return Err(ParseError::InvalidZoneOffset)
+                }
+
+                // consume the colon if its present,
+                // just ignore it otherwise
+                let _ = parse_char(s, ':');
+
+                match match_digits(s, 2, 2, false) {
+                    Some(m) => minutes = m,
+                    None => return Err(ParseError::InvalidZoneOffset)
+                }
+
+                tm.tm_utcoff = sign * (hours * 60 * 60 + minutes * 60);
+                Ok(())
+            }
+        }
+        '%' => parse_char(s, '%'),
+        ch => Err(ParseError::InvalidFormatSpecifier(ch))
+    }
+}
+
+
+fn match_str(s: &mut &str, needle: &str) -> bool {
+    if s.starts_with(needle) {
+        *s = &s[needle.len()..];
+        true
+    } else {
+        false
+    }
+}
+
+fn match_strs(ss: &mut &str, strs: &[(&str, i32)]) -> Option<i32> {
+    for &(needle, value) in strs.iter() {
+        if match_str(ss, needle) {
+            return Some(value)
+        }
+    }
+    None
+}
+
+fn match_digits(ss: &mut &str, min_digits : usize, max_digits: usize, ws: bool) -> Option<i32> {
+    match match_digits_i64(ss, min_digits, max_digits, ws) {
+        Some(v) => Some(v as i32),
+        None => None
+    }
+}
+
+fn match_digits_i64(ss: &mut &str, min_digits : usize, max_digits: usize, ws: bool) -> Option<i64> {
+    let mut value : i64 = 0;
+    let mut n = 0;
+    if ws {
+        let s2 = ss.trim_left_matches(" ");
+        n = ss.len() - s2.len();
+        if n > max_digits { return None }
+    }
+    let chars = ss[n..].char_indices();
+    for (_, ch) in chars.take(max_digits - n) {
+        match ch {
+            '0' ... '9' => value = value * 10 + (ch as i64 - '0' as i64),
+            _ => break,
+        }
+        n += 1;
+    }
+
+    if n >= min_digits && n <= max_digits {
+        *ss = &ss[n..];
+        Some(value)
+    } else {
+        None
+    }
+}
+
+fn match_fractional_seconds(ss: &mut &str) -> i32 {
+    let mut value = 0;
+    let mut multiplier = NSEC_PER_SEC / 10;
+
+    let mut chars = ss.char_indices();
+    let orig = *ss;
+    for (i, ch) in &mut chars {
+        *ss = &orig[i..];
+        match ch {
+            '0' ... '9' => {
+                // This will drop digits after the nanoseconds place
+                let digit = ch as i32 - '0' as i32;
+                value += digit * multiplier;
+                multiplier /= 10;
+            }
+            _ => break
+        }
+    }
+
+    value
+}
+
+fn match_digits_in_range(ss: &mut &str,
+                         min_digits : usize, max_digits : usize,
+                         ws: bool, min: i32, max: i32) -> Option<i32> {
+    let before = *ss;
+    match match_digits(ss, min_digits, max_digits, ws) {
+        Some(val) if val >= min && val <= max => Some(val),
+        _ => { *ss = before; None }
+    }
+}
+
+fn parse_char(s: &mut &str, c: char) -> Result<(), ParseError> {
+    match s.char_indices().next() {
+        Some((i, c2)) => {
+            if c == c2 {
+                *s = &s[i + c2.len_utf8()..];
+                Ok(())
+            } else {
+                Err(ParseError::UnexpectedCharacter(c, c2))
+            }
+        }
+        None => Err(ParseError::InvalidTime),
+    }
+}
diff -Nru cargo-0.32.0/vendor/time/src/sys.rs cargo-0.33.0/vendor/time/src/sys.rs
--- cargo-0.32.0/vendor/time/src/sys.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/time/src/sys.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1048 @@
+#![allow(bad_style)]
+
+pub use self::inner::*;
+
+#[cfg(any(
+    all(target_arch = "wasm32", not(target_os = "emscripten")),
+    target_os = "redox",
+    target_env = "sgx"
+))]
+mod common {
+    use Tm;
+
+    pub fn time_to_tm(ts: i64, tm: &mut Tm) {
+        let leapyear = |year| -> bool {
+            year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
+        };
+
+        static _ytab: [[i64; 12]; 2] = [
+            [ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ],
+            [ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
+        ];
+
+        let mut year = 1970;
+
+        let dayclock = ts % 86400;
+        let mut dayno = ts / 86400;
+
+        tm.tm_sec = (dayclock % 60) as i32;
+        tm.tm_min = ((dayclock % 3600) / 60) as i32;
+        tm.tm_hour = (dayclock / 3600) as i32;
+        tm.tm_wday = ((dayno + 4) % 7) as i32;
+        loop {
+            let yearsize = if leapyear(year) {
+                366
+            } else {
+                365
+            };
+            if dayno >= yearsize {
+                    dayno -= yearsize;
+                    year += 1;
+            } else {
+                break;
+            }
+        }
+        tm.tm_year = (year - 1900) as i32;
+        tm.tm_yday = dayno as i32;
+        let mut mon = 0;
+        while dayno >= _ytab[if leapyear(year) { 1 } else { 0 }][mon] {
+                dayno -= _ytab[if leapyear(year) { 1 } else { 0 }][mon];
+                mon += 1;
+        }
+        tm.tm_mon = mon as i32;
+        tm.tm_mday = dayno as i32 + 1;
+        tm.tm_isdst = 0;
+    }
+
+    pub fn tm_to_time(tm: &Tm) -> i64 {
+        let mut y = tm.tm_year as i64 + 1900;
+        let mut m = tm.tm_mon as i64 + 1;
+        if m <= 2 {
+            y -= 1;
+            m += 12;
+        }
+        let d = tm.tm_mday as i64;
+        let h = tm.tm_hour as i64;
+        let mi = tm.tm_min as i64;
+        let s = tm.tm_sec as i64;
+        (365*y + y/4 - y/100 + y/400 + 3*(m+1)/5 + 30*m + d - 719561)
+            * 86400 + 3600 * h + 60 * mi + s
+    }
+}
+
+#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
+mod inner {
+    use std::ops::{Add, Sub};
+    use Tm;
+    use Duration;
+    use super::common::{time_to_tm, tm_to_time};
+
+    #[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
+    pub struct SteadyTime;
+
+    pub fn time_to_utc_tm(sec: i64, tm: &mut Tm) {
+        time_to_tm(sec, tm);
+    }
+
+    pub fn time_to_local_tm(sec: i64, tm: &mut Tm) {
+        // FIXME: Add timezone logic
+        time_to_tm(sec, tm);
+    }
+
+    pub fn utc_tm_to_time(tm: &Tm) -> i64 {
+        tm_to_time(tm)
+    }
+
+    pub fn local_tm_to_time(tm: &Tm) -> i64 {
+        // FIXME: Add timezone logic
+        tm_to_time(tm)
+    }
+
+    pub fn get_time() -> (i64, i32) {
+        unimplemented!()
+    }
+
+    pub fn get_precise_ns() -> u64 {
+        unimplemented!()
+    }
+
+    impl SteadyTime {
+        pub fn now() -> SteadyTime {
+            unimplemented!()
+        }
+    }
+
+    impl Sub for SteadyTime {
+        type Output = Duration;
+        fn sub(self, _other: SteadyTime) -> Duration {
+            unimplemented!()
+        }
+    }
+
+    impl Sub<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn sub(self, _other: Duration) -> SteadyTime {
+            unimplemented!()
+        }
+    }
+
+    impl Add<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn add(self, _other: Duration) -> SteadyTime {
+            unimplemented!()
+        }
+    }
+}
+
+#[cfg(target_os = "redox")]
+mod inner {
+    use std::fmt;
+    use std::cmp::Ordering;
+    use std::ops::{Add, Sub};
+    use syscall;
+    use super::common::{time_to_tm, tm_to_time};
+
+    use Duration;
+    use Tm;
+
+    pub fn time_to_utc_tm(sec: i64, tm: &mut Tm) {
+        time_to_tm(sec, tm);
+    }
+
+    pub fn time_to_local_tm(sec: i64, tm: &mut Tm) {
+        // FIXME: Add timezone logic
+        time_to_tm(sec, tm);
+    }
+
+    pub fn utc_tm_to_time(tm: &Tm) -> i64 {
+        tm_to_time(tm)
+    }
+
+    pub fn local_tm_to_time(tm: &Tm) -> i64 {
+        // FIXME: Add timezone logic
+        tm_to_time(tm)
+    }
+
+    pub fn get_time() -> (i64, i32) {
+        let mut tv = syscall::TimeSpec { tv_sec: 0, tv_nsec: 0 };
+        syscall::clock_gettime(syscall::CLOCK_REALTIME, &mut tv).unwrap();
+        (tv.tv_sec as i64, tv.tv_nsec as i32)
+    }
+
+    pub fn get_precise_ns() -> u64 {
+        let mut ts = syscall::TimeSpec { tv_sec: 0, tv_nsec: 0 };
+        syscall::clock_gettime(syscall::CLOCK_MONOTONIC, &mut ts).unwrap();
+        (ts.tv_sec as u64) * 1000000000 + (ts.tv_nsec as u64)
+    }
+
+    #[derive(Copy)]
+    pub struct SteadyTime {
+        t: syscall::TimeSpec,
+    }
+
+    impl fmt::Debug for SteadyTime {
+        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            write!(fmt, "SteadyTime {{ tv_sec: {:?}, tv_nsec: {:?} }}",
+                   self.t.tv_sec, self.t.tv_nsec)
+        }
+    }
+
+    impl Clone for SteadyTime {
+        fn clone(&self) -> SteadyTime {
+            SteadyTime { t: self.t }
+        }
+    }
+
+    impl SteadyTime {
+        pub fn now() -> SteadyTime {
+            let mut t = SteadyTime {
+                t: syscall::TimeSpec {
+                    tv_sec: 0,
+                    tv_nsec: 0,
+                }
+            };
+            syscall::clock_gettime(syscall::CLOCK_MONOTONIC, &mut t.t).unwrap();
+            t
+        }
+    }
+
+    impl Sub for SteadyTime {
+        type Output = Duration;
+        fn sub(self, other: SteadyTime) -> Duration {
+            if self.t.tv_nsec >= other.t.tv_nsec {
+                Duration::seconds(self.t.tv_sec as i64 - other.t.tv_sec as i64) +
+                    Duration::nanoseconds(self.t.tv_nsec as i64 - other.t.tv_nsec as i64)
+            } else {
+                Duration::seconds(self.t.tv_sec as i64 - 1 - other.t.tv_sec as i64) +
+                    Duration::nanoseconds(self.t.tv_nsec as i64 + ::NSEC_PER_SEC as i64 -
+                                          other.t.tv_nsec as i64)
+            }
+        }
+    }
+
+    impl Sub<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn sub(self, other: Duration) -> SteadyTime {
+            self + -other
+        }
+    }
+
+    impl Add<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn add(mut self, other: Duration) -> SteadyTime {
+            let seconds = other.num_seconds();
+            let nanoseconds = other - Duration::seconds(seconds);
+            let nanoseconds = nanoseconds.num_nanoseconds().unwrap();
+            self.t.tv_sec += seconds;
+            self.t.tv_nsec += nanoseconds as i32;
+            if self.t.tv_nsec >= ::NSEC_PER_SEC {
+                self.t.tv_nsec -= ::NSEC_PER_SEC;
+                self.t.tv_sec += 1;
+            } else if self.t.tv_nsec < 0 {
+                self.t.tv_sec -= 1;
+                self.t.tv_nsec += ::NSEC_PER_SEC;
+            }
+            self
+        }
+    }
+
+    impl PartialOrd for SteadyTime {
+        fn partial_cmp(&self, other: &SteadyTime) -> Option<Ordering> {
+            Some(self.cmp(other))
+        }
+    }
+
+    impl Ord for SteadyTime {
+        fn cmp(&self, other: &SteadyTime) -> Ordering {
+            match self.t.tv_sec.cmp(&other.t.tv_sec) {
+                Ordering::Equal => self.t.tv_nsec.cmp(&other.t.tv_nsec),
+                ord => ord
+            }
+        }
+    }
+
+    impl PartialEq for SteadyTime {
+        fn eq(&self, other: &SteadyTime) -> bool {
+            self.t.tv_sec == other.t.tv_sec &&
+                self.t.tv_nsec == other.t.tv_nsec
+        }
+    }
+
+    impl Eq for SteadyTime {}
+}
+
+#[cfg(target_env = "sgx")]
+mod inner {
+    use std::ops::{Add, Sub};
+    use Tm;
+    use Duration;
+    use super::common::{time_to_tm, tm_to_time};
+    use std::time::SystemTime;
+
+    /// The number of nanoseconds in seconds.
+    const NANOS_PER_SEC: u64 = 1_000_000_000;
+
+    #[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
+    pub struct SteadyTime {
+        t: Duration
+    }
+
+    pub fn time_to_utc_tm(sec: i64, tm: &mut Tm) {
+        time_to_tm(sec, tm);
+    }
+
+    pub fn time_to_local_tm(sec: i64, tm: &mut Tm) {
+        // FIXME: Add timezone logic
+        time_to_tm(sec, tm);
+    }
+
+    pub fn utc_tm_to_time(tm: &Tm) -> i64 {
+        tm_to_time(tm)
+    }
+
+    pub fn local_tm_to_time(tm: &Tm) -> i64 {
+        // FIXME: Add timezone logic
+        tm_to_time(tm)
+    }
+
+    pub fn get_time() -> (i64, i32) {
+        SteadyTime::now().t.raw()
+    }
+
+    pub fn get_precise_ns() -> u64 {
+        // This unwrap is safe because current time is well ahead of UNIX_EPOCH, unless system clock is adjusted backward.
+        let std_duration = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap();
+        std_duration.as_secs() * NANOS_PER_SEC + std_duration.subsec_nanos() as u64
+    }
+
+    impl SteadyTime {
+        pub fn now() -> SteadyTime {
+            // This unwrap is safe because current time is well ahead of UNIX_EPOCH, unless system clock is adjusted backward.
+            let std_duration = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap();
+            // This unwrap is safe because duration is well within the limits of i64.
+            let duration = Duration::from_std(std_duration).unwrap();
+            SteadyTime { t: duration }
+        }
+    }
+
+    impl Sub for SteadyTime {
+        type Output = Duration;
+        fn sub(self, other: SteadyTime) -> Duration {
+            self.t - other.t
+        }
+    }
+
+    impl Sub<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn sub(self, other: Duration) -> SteadyTime {
+            SteadyTime { t: self.t - other }
+        }
+    }
+
+    impl Add<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn add(self, other: Duration) -> SteadyTime {
+            SteadyTime { t: self.t + other }
+        }
+    }
+}
+
+#[cfg(unix)]
+mod inner {
+    use libc::{self, time_t};
+    use std::mem;
+    use std::io;
+    use Tm;
+
+    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    pub use self::mac::*;
+    #[cfg(all(not(target_os = "macos"), not(target_os = "ios")))]
+    pub use self::unix::*;
+
+    #[cfg(target_os = "solaris")]
+    extern {
+        static timezone: time_t;
+        static altzone: time_t;
+    }
+
+    fn rust_tm_to_tm(rust_tm: &Tm, tm: &mut libc::tm) {
+        tm.tm_sec = rust_tm.tm_sec;
+        tm.tm_min = rust_tm.tm_min;
+        tm.tm_hour = rust_tm.tm_hour;
+        tm.tm_mday = rust_tm.tm_mday;
+        tm.tm_mon = rust_tm.tm_mon;
+        tm.tm_year = rust_tm.tm_year;
+        tm.tm_wday = rust_tm.tm_wday;
+        tm.tm_yday = rust_tm.tm_yday;
+        tm.tm_isdst = rust_tm.tm_isdst;
+    }
+
+    fn tm_to_rust_tm(tm: &libc::tm, utcoff: i32, rust_tm: &mut Tm) {
+        rust_tm.tm_sec = tm.tm_sec;
+        rust_tm.tm_min = tm.tm_min;
+        rust_tm.tm_hour = tm.tm_hour;
+        rust_tm.tm_mday = tm.tm_mday;
+        rust_tm.tm_mon = tm.tm_mon;
+        rust_tm.tm_year = tm.tm_year;
+        rust_tm.tm_wday = tm.tm_wday;
+        rust_tm.tm_yday = tm.tm_yday;
+        rust_tm.tm_isdst = tm.tm_isdst;
+        rust_tm.tm_utcoff = utcoff;
+    }
+
+    #[cfg(any(target_os = "nacl", target_os = "solaris"))]
+    unsafe fn timegm(tm: *mut libc::tm) -> time_t {
+        use std::env::{set_var, var_os, remove_var};
+        extern {
+            fn tzset();
+        }
+
+        let ret;
+
+        let current_tz = var_os("TZ");
+        set_var("TZ", "UTC");
+        tzset();
+
+        ret = libc::mktime(tm);
+
+        if let Some(tz) = current_tz {
+            set_var("TZ", tz);
+        } else {
+            remove_var("TZ");
+        }
+        tzset();
+
+        ret
+    }
+
+    pub fn time_to_utc_tm(sec: i64, tm: &mut Tm) {
+        unsafe {
+            let sec = sec as time_t;
+            let mut out = mem::zeroed();
+            if libc::gmtime_r(&sec, &mut out).is_null() {
+                panic!("gmtime_r failed: {}", io::Error::last_os_error());
+            }
+            tm_to_rust_tm(&out, 0, tm);
+        }
+    }
+
+    pub fn time_to_local_tm(sec: i64, tm: &mut Tm) {
+        unsafe {
+            let sec = sec as time_t;
+            let mut out = mem::zeroed();
+            if libc::localtime_r(&sec, &mut out).is_null() {
+                panic!("localtime_r failed: {}", io::Error::last_os_error());
+            }
+            #[cfg(target_os = "solaris")]
+            let gmtoff = {
+                ::tzset();
+                // < 0 means we don't know; assume we're not in DST.
+                if out.tm_isdst == 0 {
+                    // timezone is seconds west of UTC, tm_gmtoff is seconds east
+                    -timezone
+                } else if out.tm_isdst > 0 {
+                    -altzone
+                } else {
+                    -timezone
+                }
+            };
+            #[cfg(not(target_os = "solaris"))]
+            let gmtoff = out.tm_gmtoff;
+            tm_to_rust_tm(&out, gmtoff as i32, tm);
+        }
+    }
+
+    pub fn utc_tm_to_time(rust_tm: &Tm) -> i64 {
+        #[cfg(all(target_os = "android", target_pointer_width = "32"))]
+        use libc::timegm64 as timegm;
+        #[cfg(not(any(all(target_os = "android", target_pointer_width = "32"), target_os = "nacl", target_os = "solaris")))]
+        use libc::timegm;
+
+        let mut tm = unsafe { mem::zeroed() };
+        rust_tm_to_tm(rust_tm, &mut tm);
+        unsafe { timegm(&mut tm) as i64 }
+    }
+
+    pub fn local_tm_to_time(rust_tm: &Tm) -> i64 {
+        let mut tm = unsafe { mem::zeroed() };
+        rust_tm_to_tm(rust_tm, &mut tm);
+        unsafe { libc::mktime(&mut tm) as i64 }
+    }
+
+    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    mod mac {
+        use libc::{self, timeval, mach_timebase_info};
+        use std::sync::{Once, ONCE_INIT};
+        use std::ops::{Add, Sub};
+        use Duration;
+
+        fn info() -> &'static mach_timebase_info {
+            static mut INFO: mach_timebase_info = mach_timebase_info {
+                numer: 0,
+                denom: 0,
+            };
+            static ONCE: Once = ONCE_INIT;
+
+            unsafe {
+                ONCE.call_once(|| {
+                    mach_timebase_info(&mut INFO);
+                });
+                &INFO
+            }
+        }
+
+        pub fn get_time() -> (i64, i32) {
+            use std::ptr;
+            let mut tv = timeval { tv_sec: 0, tv_usec: 0 };
+            unsafe { libc::gettimeofday(&mut tv, ptr::null_mut()); }
+            (tv.tv_sec as i64, tv.tv_usec * 1000)
+        }
+
+        #[inline]
+        pub fn get_precise_ns() -> u64 {
+            unsafe {
+                let time = libc::mach_absolute_time();
+                let info = info();
+                time * info.numer as u64 / info.denom as u64
+            }
+        }
+
+        #[derive(Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug)]
+        pub struct SteadyTime { t: u64 }
+
+        impl SteadyTime {
+            pub fn now() -> SteadyTime {
+                SteadyTime { t: get_precise_ns() }
+            }
+        }
+        impl Sub for SteadyTime {
+            type Output = Duration;
+            fn sub(self, other: SteadyTime) -> Duration {
+                Duration::nanoseconds(self.t as i64 - other.t as i64)
+            }
+        }
+        impl Sub<Duration> for SteadyTime {
+            type Output = SteadyTime;
+            fn sub(self, other: Duration) -> SteadyTime {
+                self + -other
+            }
+        }
+        impl Add<Duration> for SteadyTime {
+            type Output = SteadyTime;
+            fn add(self, other: Duration) -> SteadyTime {
+                let delta = other.num_nanoseconds().unwrap();
+                SteadyTime {
+                    t: (self.t as i64 + delta) as u64
+                }
+            }
+        }
+    }
+
+    #[cfg(test)]
+    pub struct TzReset;
+
+    #[cfg(test)]
+    pub fn set_los_angeles_time_zone() -> TzReset {
+        use std::env;
+        env::set_var("TZ", "America/Los_Angeles");
+        ::tzset();
+        TzReset
+    }
+
+    #[cfg(test)]
+    pub fn set_london_with_dst_time_zone() -> TzReset {
+        use std::env;
+        env::set_var("TZ", "Europe/London");
+        ::tzset();
+        TzReset
+    }
+
+    #[cfg(all(not(target_os = "macos"), not(target_os = "ios")))]
+    mod unix {
+        use std::fmt;
+        use std::cmp::Ordering;
+        use std::ops::{Add, Sub};
+        use libc;
+
+        use Duration;
+
+        pub fn get_time() -> (i64, i32) {
+            let mut tv = libc::timespec { tv_sec: 0, tv_nsec: 0 };
+            unsafe { libc::clock_gettime(libc::CLOCK_REALTIME, &mut tv); }
+            (tv.tv_sec as i64, tv.tv_nsec as i32)
+        }
+
+        pub fn get_precise_ns() -> u64 {
+            let mut ts = libc::timespec { tv_sec: 0, tv_nsec: 0 };
+            unsafe {
+                libc::clock_gettime(libc::CLOCK_MONOTONIC, &mut ts);
+            }
+            (ts.tv_sec as u64) * 1000000000 + (ts.tv_nsec as u64)
+        }
+
+        #[derive(Copy)]
+        pub struct SteadyTime {
+            t: libc::timespec,
+        }
+
+        impl fmt::Debug for SteadyTime {
+            fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+                write!(fmt, "SteadyTime {{ tv_sec: {:?}, tv_nsec: {:?} }}",
+                       self.t.tv_sec, self.t.tv_nsec)
+            }
+        }
+
+        impl Clone for SteadyTime {
+            fn clone(&self) -> SteadyTime {
+                SteadyTime { t: self.t }
+            }
+        }
+
+        impl SteadyTime {
+            pub fn now() -> SteadyTime {
+                let mut t = SteadyTime {
+                    t: libc::timespec {
+                        tv_sec: 0,
+                        tv_nsec: 0,
+                    }
+                };
+                unsafe {
+                    assert_eq!(0, libc::clock_gettime(libc::CLOCK_MONOTONIC,
+                                                      &mut t.t));
+                }
+                t
+            }
+        }
+
+        impl Sub for SteadyTime {
+            type Output = Duration;
+            fn sub(self, other: SteadyTime) -> Duration {
+                if self.t.tv_nsec >= other.t.tv_nsec {
+                    Duration::seconds(self.t.tv_sec as i64 - other.t.tv_sec as i64) +
+                        Duration::nanoseconds(self.t.tv_nsec as i64 - other.t.tv_nsec as i64)
+                } else {
+                    Duration::seconds(self.t.tv_sec as i64 - 1 - other.t.tv_sec as i64) +
+                        Duration::nanoseconds(self.t.tv_nsec as i64 + ::NSEC_PER_SEC as i64 -
+                                              other.t.tv_nsec as i64)
+                }
+            }
+        }
+
+        impl Sub<Duration> for SteadyTime {
+            type Output = SteadyTime;
+            fn sub(self, other: Duration) -> SteadyTime {
+                self + -other
+            }
+        }
+
+        impl Add<Duration> for SteadyTime {
+            type Output = SteadyTime;
+            fn add(mut self, other: Duration) -> SteadyTime {
+                let seconds = other.num_seconds();
+                let nanoseconds = other - Duration::seconds(seconds);
+                let nanoseconds = nanoseconds.num_nanoseconds().unwrap();
+
+                #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
+                type nsec = i64;
+                #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
+                type nsec = libc::c_long;
+
+                self.t.tv_sec += seconds as libc::time_t;
+                self.t.tv_nsec += nanoseconds as nsec;
+                if self.t.tv_nsec >= ::NSEC_PER_SEC as nsec {
+                    self.t.tv_nsec -= ::NSEC_PER_SEC as nsec;
+                    self.t.tv_sec += 1;
+                } else if self.t.tv_nsec < 0 {
+                    self.t.tv_sec -= 1;
+                    self.t.tv_nsec += ::NSEC_PER_SEC as nsec;
+                }
+                self
+            }
+        }
+
+        impl PartialOrd for SteadyTime {
+            fn partial_cmp(&self, other: &SteadyTime) -> Option<Ordering> {
+                Some(self.cmp(other))
+            }
+        }
+
+        impl Ord for SteadyTime {
+            fn cmp(&self, other: &SteadyTime) -> Ordering {
+                match self.t.tv_sec.cmp(&other.t.tv_sec) {
+                    Ordering::Equal => self.t.tv_nsec.cmp(&other.t.tv_nsec),
+                    ord => ord
+                }
+            }
+        }
+
+        impl PartialEq for SteadyTime {
+            fn eq(&self, other: &SteadyTime) -> bool {
+                self.t.tv_sec == other.t.tv_sec &&
+                    self.t.tv_nsec == other.t.tv_nsec
+            }
+        }
+
+        impl Eq for SteadyTime {}
+
+    }
+}
+
+#[cfg(windows)]
+#[allow(non_snake_case)]
+mod inner {
+    use std::io;
+    use std::mem;
+    use std::sync::{Once, ONCE_INIT};
+    use std::ops::{Add, Sub};
+    use {Tm, Duration};
+
+    use winapi::um::winnt::*;
+    use winapi::shared::minwindef::*;
+    use winapi::um::minwinbase::SYSTEMTIME;
+    use winapi::um::profileapi::*;
+    use winapi::um::timezoneapi::*;
+    use winapi::um::sysinfoapi::GetSystemTimeAsFileTime;
+
+    fn frequency() -> i64 {
+        static mut FREQUENCY: i64 = 0;
+        static ONCE: Once = ONCE_INIT;
+
+        unsafe {
+            ONCE.call_once(|| {
+                let mut l = i64_to_large_integer(0);
+                QueryPerformanceFrequency(&mut l);
+                FREQUENCY = large_integer_to_i64(l);
+            });
+            FREQUENCY
+        }
+    }
+
+    fn i64_to_large_integer(i: i64) -> LARGE_INTEGER {
+        unsafe {
+            let mut large_integer: LARGE_INTEGER = mem::zeroed();
+            *large_integer.QuadPart_mut() = i;
+            large_integer
+        }
+    }
+
+    fn large_integer_to_i64(l: LARGE_INTEGER) -> i64 {
+        unsafe {
+            *l.QuadPart()
+        }
+    }
+
+    const HECTONANOSECS_IN_SEC: i64 = 10_000_000;
+    const HECTONANOSEC_TO_UNIX_EPOCH: i64 = 11_644_473_600 * HECTONANOSECS_IN_SEC;
+
+    fn time_to_file_time(sec: i64) -> FILETIME {
+        let t = (((sec * HECTONANOSECS_IN_SEC) + HECTONANOSEC_TO_UNIX_EPOCH)) as u64;
+        FILETIME {
+            dwLowDateTime: t as DWORD,
+            dwHighDateTime: (t >> 32) as DWORD
+        }
+    }
+
+    fn file_time_as_u64(ft: &FILETIME) -> u64 {
+        ((ft.dwHighDateTime as u64) << 32) | (ft.dwLowDateTime as u64)
+    }
+
+    fn file_time_to_nsec(ft: &FILETIME) -> i32 {
+        let t = file_time_as_u64(ft) as i64;
+        ((t % HECTONANOSECS_IN_SEC) * 100) as i32
+    }
+
+    fn file_time_to_unix_seconds(ft: &FILETIME) -> i64 {
+        let t = file_time_as_u64(ft) as i64;
+        ((t - HECTONANOSEC_TO_UNIX_EPOCH) / HECTONANOSECS_IN_SEC) as i64
+    }
+
+    fn system_time_to_file_time(sys: &SYSTEMTIME) -> FILETIME {
+        unsafe {
+            let mut ft = mem::zeroed();
+            SystemTimeToFileTime(sys, &mut ft);
+            ft
+        }
+    }
+
+    fn tm_to_system_time(tm: &Tm) -> SYSTEMTIME {
+        let mut sys: SYSTEMTIME = unsafe { mem::zeroed() };
+        sys.wSecond = tm.tm_sec as WORD;
+        sys.wMinute = tm.tm_min as WORD;
+        sys.wHour = tm.tm_hour as WORD;
+        sys.wDay = tm.tm_mday as WORD;
+        sys.wDayOfWeek = tm.tm_wday as WORD;
+        sys.wMonth = (tm.tm_mon + 1) as WORD;
+        sys.wYear = (tm.tm_year + 1900) as WORD;
+        sys
+    }
+
+    fn system_time_to_tm(sys: &SYSTEMTIME, tm: &mut Tm) {
+        tm.tm_sec = sys.wSecond as i32;
+        tm.tm_min = sys.wMinute as i32;
+        tm.tm_hour = sys.wHour as i32;
+        tm.tm_mday = sys.wDay as i32;
+        tm.tm_wday = sys.wDayOfWeek as i32;
+        tm.tm_mon = (sys.wMonth - 1) as i32;
+        tm.tm_year = (sys.wYear - 1900) as i32;
+        tm.tm_yday = yday(tm.tm_year, tm.tm_mon + 1, tm.tm_mday);
+
+        fn yday(year: i32, month: i32, day: i32) -> i32 {
+            let leap = if month > 2 {
+                if year % 4 == 0 { 1 } else { 2 }
+            } else {
+                0
+            };
+            let july = if month > 7 { 1 } else { 0 };
+
+            (month - 1) * 30 + month / 2 + (day - 1) - leap + july
+        }
+    }
+
+    macro_rules! call {
+        ($name:ident($($arg:expr),*)) => {
+            if $name($($arg),*) == 0 {
+                panic!(concat!(stringify!($name), " failed with: {}"),
+                       io::Error::last_os_error());
+            }
+        }
+    }
+
+    pub fn time_to_utc_tm(sec: i64, tm: &mut Tm) {
+        let mut out = unsafe { mem::zeroed() };
+        let ft = time_to_file_time(sec);
+        unsafe {
+            call!(FileTimeToSystemTime(&ft, &mut out));
+        }
+        system_time_to_tm(&out, tm);
+        tm.tm_utcoff = 0;
+    }
+
+    pub fn time_to_local_tm(sec: i64, tm: &mut Tm) {
+        let ft = time_to_file_time(sec);
+        unsafe {
+            let mut utc = mem::zeroed();
+            let mut local = mem::zeroed();
+            call!(FileTimeToSystemTime(&ft, &mut utc));
+            call!(SystemTimeToTzSpecificLocalTime(0 as *const _,
+                                                  &mut utc, &mut local));
+            system_time_to_tm(&local, tm);
+
+            let local = system_time_to_file_time(&local);
+            let local_sec = file_time_to_unix_seconds(&local);
+
+            let mut tz = mem::zeroed();
+            GetTimeZoneInformation(&mut tz);
+
+            // SystemTimeToTzSpecificLocalTime already applied the biases so
+            // check if it non standard
+            tm.tm_utcoff = (local_sec - sec) as i32;
+            tm.tm_isdst = if tm.tm_utcoff == -60 * (tz.Bias + tz.StandardBias) {
+                0
+            } else {
+                1
+            };
+        }
+    }
+
+    pub fn utc_tm_to_time(tm: &Tm) -> i64 {
+        unsafe {
+            let mut ft = mem::zeroed();
+            let sys_time = tm_to_system_time(tm);
+            call!(SystemTimeToFileTime(&sys_time, &mut ft));
+            file_time_to_unix_seconds(&ft)
+        }
+    }
+
+    pub fn local_tm_to_time(tm: &Tm) -> i64 {
+        unsafe {
+            let mut ft = mem::zeroed();
+            let mut utc = mem::zeroed();
+            let mut sys_time = tm_to_system_time(tm);
+            call!(TzSpecificLocalTimeToSystemTime(0 as *mut _,
+                                                  &mut sys_time, &mut utc));
+            call!(SystemTimeToFileTime(&utc, &mut ft));
+            file_time_to_unix_seconds(&ft)
+        }
+    }
+
+    pub fn get_time() -> (i64, i32) {
+        unsafe {
+            let mut ft = mem::zeroed();
+            GetSystemTimeAsFileTime(&mut ft);
+            (file_time_to_unix_seconds(&ft), file_time_to_nsec(&ft))
+        }
+    }
+
+    pub fn get_precise_ns() -> u64 {
+        let mut ticks = i64_to_large_integer(0);
+        unsafe {
+            assert!(QueryPerformanceCounter(&mut ticks) == 1);
+        }
+        mul_div_i64(large_integer_to_i64(ticks), 1000000000, frequency()) as u64
+
+    }
+
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+    pub struct SteadyTime {
+        t: i64,
+    }
+
+    impl SteadyTime {
+        pub fn now() -> SteadyTime {
+            let mut l = i64_to_large_integer(0);
+            unsafe { QueryPerformanceCounter(&mut l); }
+            SteadyTime { t : large_integer_to_i64(l) }
+        }
+    }
+
+    impl Sub for SteadyTime {
+        type Output = Duration;
+        fn sub(self, other: SteadyTime) -> Duration {
+            let diff = self.t as i64 - other.t as i64;
+            Duration::nanoseconds(mul_div_i64(diff, 1000000000,
+                                              frequency()))
+        }
+    }
+
+    impl Sub<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn sub(self, other: Duration) -> SteadyTime {
+            self + -other
+        }
+    }
+
+    impl Add<Duration> for SteadyTime {
+        type Output = SteadyTime;
+        fn add(mut self, other: Duration) -> SteadyTime {
+            self.t += (other.num_microseconds().unwrap() * frequency() /
+                       1_000_000) as i64;
+            self
+        }
+    }
+
+    #[cfg(test)]
+    pub struct TzReset {
+        old: TIME_ZONE_INFORMATION,
+    }
+
+    #[cfg(test)]
+    impl Drop for TzReset {
+        fn drop(&mut self) {
+            unsafe {
+                call!(SetTimeZoneInformation(&self.old));
+            }
+        }
+    }
+
+    #[cfg(test)]
+    pub fn set_los_angeles_time_zone() -> TzReset {
+        acquire_privileges();
+
+        unsafe {
+            let mut tz = mem::zeroed::<TIME_ZONE_INFORMATION>();
+            GetTimeZoneInformation(&mut tz);
+            let ret = TzReset { old: tz };
+            tz.Bias = 60 * 8;
+            call!(SetTimeZoneInformation(&tz));
+            return ret
+        }
+    }
+
+    #[cfg(test)]
+    pub fn set_london_with_dst_time_zone() -> TzReset {
+        acquire_privileges();
+
+        unsafe {
+            let mut tz = mem::zeroed::<TIME_ZONE_INFORMATION>();
+            GetTimeZoneInformation(&mut tz);
+            let ret = TzReset { old: tz };
+            // Since date set precisely this is 2015's dates
+            tz.Bias = 0;
+            tz.DaylightBias = -60;
+            tz.DaylightDate.wYear = 0;
+            tz.DaylightDate.wMonth = 3;
+            tz.DaylightDate.wDayOfWeek = 0;
+            tz.DaylightDate.wDay = 5;
+            tz.DaylightDate.wHour = 2;
+            tz.StandardBias = 0;
+            tz.StandardDate.wYear = 0;
+            tz.StandardDate.wMonth = 10;
+            tz.StandardDate.wDayOfWeek = 0;
+            tz.StandardDate.wDay = 5;
+            tz.StandardDate.wHour = 2;
+            call!(SetTimeZoneInformation(&tz));
+            return ret
+        }
+    }
+
+    // Ensures that this process has the necessary privileges to set a new time
+    // zone, and this is all transcribed from:
+    // https://msdn.microsoft.com/en-us/library/windows/desktop/ms724944%28v=vs.85%29.aspx
+    #[cfg(test)]
+    fn acquire_privileges() {
+        use std::sync::{ONCE_INIT, Once};
+        use winapi::um::processthreadsapi::*;
+        use winapi::um::winbase::LookupPrivilegeValueA;
+        const SE_PRIVILEGE_ENABLED: DWORD = 2;
+        static INIT: Once = ONCE_INIT;
+
+        // TODO: FIXME
+        extern "system" {
+            fn AdjustTokenPrivileges(
+                TokenHandle: HANDLE, DisableAllPrivileges: BOOL, NewState: PTOKEN_PRIVILEGES,
+                BufferLength: DWORD, PreviousState: PTOKEN_PRIVILEGES, ReturnLength: PDWORD,
+            ) -> BOOL;
+        }
+
+        #[repr(C)]
+        struct TKP {
+            tkp: TOKEN_PRIVILEGES,
+            laa: LUID_AND_ATTRIBUTES,
+        }
+
+        INIT.call_once(|| unsafe {
+            let mut hToken = 0 as *mut _;
+            call!(OpenProcessToken(GetCurrentProcess(),
+                                   TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
+                                   &mut hToken));
+
+            let mut tkp = mem::zeroed::<TKP>();
+            assert_eq!(tkp.tkp.Privileges.len(), 0);
+            let c = ::std::ffi::CString::new("SeTimeZonePrivilege").unwrap();
+            call!(LookupPrivilegeValueA(0 as *const _, c.as_ptr(),
+                                        &mut tkp.laa.Luid));
+            tkp.tkp.PrivilegeCount = 1;
+            tkp.laa.Attributes = SE_PRIVILEGE_ENABLED;
+            call!(AdjustTokenPrivileges(hToken, FALSE, &mut tkp.tkp, 0,
+                                        0 as *mut _, 0 as *mut _));
+        });
+    }
+
+
+
+    // Computes (value*numer)/denom without overflow, as long as both
+    // (numer*denom) and the overall result fit into i64 (which is the case
+    // for our time conversions).
+    fn mul_div_i64(value: i64, numer: i64, denom: i64) -> i64 {
+        let q = value / denom;
+        let r = value % denom;
+        // Decompose value as (value/denom*denom + value%denom),
+        // substitute into (value*numer)/denom and simplify.
+        // r < denom, so (denom*numer) is the upper bound of (r*numer)
+        q * numer + r * numer / denom
+    }
+
+    #[test]
+    fn test_muldiv() {
+        assert_eq!(mul_div_i64( 1_000_000_000_001, 1_000_000_000, 1_000_000),
+                   1_000_000_000_001_000);
+        assert_eq!(mul_div_i64(-1_000_000_000_001, 1_000_000_000, 1_000_000),
+                   -1_000_000_000_001_000);
+        assert_eq!(mul_div_i64(-1_000_000_000_001,-1_000_000_000, 1_000_000),
+                   1_000_000_000_001_000);
+        assert_eq!(mul_div_i64( 1_000_000_000_001, 1_000_000_000,-1_000_000),
+                   -1_000_000_000_001_000);
+        assert_eq!(mul_div_i64( 1_000_000_000_001,-1_000_000_000,-1_000_000),
+                   1_000_000_000_001_000);
+    }
+}
diff -Nru cargo-0.32.0/vendor/toml/.cargo_vcs_info.json cargo-0.33.0/vendor/toml/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/toml/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/toml/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "1ef180d06ed4ec207c41b2595feaca84959e709e"
-  }
-}
diff -Nru cargo-0.32.0/vendor/toml/.travis.yml cargo-0.33.0/vendor/toml/.travis.yml
--- cargo-0.32.0/vendor/toml/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/toml/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-language: rust
-rust:
-  - 1.15.0
-  - stable
-  - beta
-  - nightly
-sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo test
-  - cargo test --manifest-path test-suite/Cargo.toml
-  - rustdoc --test README.md -L target
-  - test "$TRAVIS_RUST_VERSION" != "1.15.0" && cargo doc --no-deps || echo "skipping cargo doc"
-after_success:
-  - travis-cargo --only nightly doc-upload
-  - travis-cargo coveralls --no-sudo
-env:
-  global:
-    secure: "IDm3Oc3bmIL4/6zixovwkuTkbinqWnKdLfeuKTtHqT4ZbVy+rxTDQBgLGfVngymjciHWkJnvQ8/2nT3/KW4MPNY9Sqt3NfWvO7vj9cXypeNeJ4xFrVK49F7CMM4KTCeSMlDKR1C0TVYGgxFIViLtBw/imivl9fk6J489eKv36sA="
-
-notifications:
-  email:
-    on_success: never
-addons:
-  apt:
-    packages:
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
diff -Nru cargo-0.32.0/vendor/typenum/build/main.rs cargo-0.33.0/vendor/typenum/build/main.rs
--- cargo-0.32.0/vendor/typenum/build/main.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/build/main.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,179 @@
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::Path;
+use std::fmt;
+
+#[cfg(tests)]
+mod tests;
+mod op;
+
+pub enum UIntCode {
+    Term,
+    Zero(Box<UIntCode>),
+    One(Box<UIntCode>),
+}
+
+pub enum IntCode {
+    Zero,
+    Pos(Box<UIntCode>),
+    Neg(Box<UIntCode>),
+}
+
+impl fmt::Display for UIntCode {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            UIntCode::Term => write!(f, "UTerm"),
+            UIntCode::Zero(ref inner) => write!(f, "UInt<{}, B0>", inner),
+            UIntCode::One(ref inner) => write!(f, "UInt<{}, B1>", inner),
+        }
+    }
+}
+
+impl fmt::Display for IntCode {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            IntCode::Zero => write!(f, "Z0"),
+            IntCode::Pos(ref inner) => write!(f, "PInt<{}>", inner),
+            IntCode::Neg(ref inner) => write!(f, "NInt<{}>", inner),
+        }
+    }
+}
+
+pub fn gen_uint(u: u64) -> UIntCode {
+    let mut result = UIntCode::Term;
+    let mut x = 1u64 << 63;
+    while x > u {
+        x >>= 1
+    }
+    while x > 0 {
+        result = if x & u > 0 {
+            UIntCode::One(Box::new(result))
+        } else {
+            UIntCode::Zero(Box::new(result))
+        };
+        x >>= 1;
+    }
+    result
+}
+
+pub fn gen_int(i: i64) -> IntCode {
+    if i > 0 {
+        IntCode::Pos(Box::new(gen_uint(i as u64)))
+    } else if i < 0 {
+        IntCode::Neg(Box::new(gen_uint(i.abs() as u64)))
+    } else {
+        IntCode::Zero
+    }
+}
+
+#[cfg_attr(feature="no_std", deprecated(
+    since="1.3.0",
+    note="the `no_std` flag is no longer necessary and will be removed in the future"))]
+pub fn no_std() {}
+
+// fixme: get a warning when testing without this
+#[allow(dead_code)]
+fn main() {
+    let highest: u64 = 1024;
+
+    let first2: u32 = (highest as f64).log(2.0) as u32 + 1;
+    let first10: u32 = (highest as f64).log(10.0) as u32 + 1;
+    let uints = (0..(highest + 1))
+        .chain((first2..64).map(|i| 2u64.pow(i)))
+        .chain((first10..20).map(|i| 10u64.pow(i)));
+
+    let out_dir = env::var("OUT_DIR").unwrap();
+    let dest = Path::new(&out_dir).join("consts.rs");
+
+    let mut f = File::create(&dest).unwrap();
+
+    no_std();
+
+    // Header stuff here!
+    write!(
+        f,
+        "
+/**
+Type aliases for many constants.
+
+This file is generated by typenum's build script.
+
+For unsigned integers, the format is `U` followed by the number. We define aliases for
+
+- Numbers 0 through {highest}
+- Powers of 2 below `u64::MAX`
+- Powers of 10 below `u64::MAX`
+
+These alias definitions look like this:
+
+```rust
+use typenum::{{B0, B1, UInt, UTerm}};
+
+# #[allow(dead_code)]
+type U6 = UInt<UInt<UInt<UTerm, B1>, B1>, B0>;
+```
+
+For positive signed integers, the format is `P` followed by the number and for negative
+signed integers it is `N` followed by the number. For the signed integer zero, we use
+`Z0`. We define aliases for
+
+- Numbers -{highest} through {highest}
+- Powers of 2 between `i64::MIN` and `i64::MAX`
+- Powers of 10 between `i64::MIN` and `i64::MAX`
+
+These alias definitions look like this:
+
+```rust
+use typenum::{{B0, B1, UInt, UTerm, PInt, NInt}};
+
+# #[allow(dead_code)]
+type P6 = PInt<UInt<UInt<UInt<UTerm, B1>, B1>, B0>>;
+# #[allow(dead_code)]
+type N6 = NInt<UInt<UInt<UInt<UTerm, B1>, B1>, B0>>;
+```
+
+# Example
+```rust
+# #[allow(unused_imports)]
+use typenum::{{U0, U1, U2, U3, U4, U5, U6}};
+# #[allow(unused_imports)]
+use typenum::{{N3, N2, N1, Z0, P1, P2, P3}};
+# #[allow(unused_imports)]
+use typenum::{{U774, N17, N10000, P1024, P4096}};
+```
+
+We also define the aliases `False` and `True` for `B0` and `B1`, respectively.
+*/
+#[allow(missing_docs)]
+pub mod consts {{
+    use uint::{{UInt, UTerm}};
+    use int::{{PInt, NInt}};
+
+    pub use bit::{{B0, B1}};
+    pub use int::Z0;
+
+    pub type True = B1;
+    pub type False = B0;
+",
+        highest = highest
+    ).unwrap();
+
+    for u in uints {
+        write!(f, "    pub type U{} = {};\n", u, gen_uint(u)).unwrap();
+        if u <= ::std::i64::MAX as u64 && u != 0 {
+            let i = u as i64;
+            write!(
+                f,
+                "    pub type P{i} = PInt<U{i}>; pub type N{i} = NInt<U{i}>;\n",
+                i = i
+            ).unwrap();
+        }
+    }
+    write!(f, "}}").unwrap();
+
+    #[cfg(tests)]
+    tests::build_tests().unwrap();
+
+    op::write_op_macro().unwrap();
+}
diff -Nru cargo-0.32.0/vendor/typenum/build/op.rs cargo-0.33.0/vendor/typenum/build/op.rs
--- cargo-0.32.0/vendor/typenum/build/op.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/build/op.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,533 @@
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+enum OpType {
+    Operator,
+    Function,
+}
+
+use self::OpType::*;
+
+struct Op {
+    token: &'static str,
+    operator: &'static str,
+    example: (&'static str, &'static str),
+    precedence: u8,
+    n_args: u8,
+    op_type: OpType,
+}
+
+pub fn write_op_macro() -> ::std::io::Result<()> {
+    let out_dir = ::std::env::var("OUT_DIR").unwrap();
+    let dest = ::std::path::Path::new(&out_dir).join("op.rs");
+    let mut f = ::std::fs::File::create(&dest).unwrap();
+
+    // Operator precedence is taken from
+    // https://doc.rust-lang.org/reference.html#operator-precedence
+    //
+    // We choose 16 as the highest precedence (functions are set to 255 but it doesn't matter
+    // for them).  We also only use operators that are left associative so we don't have to worry
+    // about that.
+    let ops = &[
+        Op {
+            token: "*",
+            operator: "Prod",
+            example: ("P2 * P3", "P6"),
+            precedence: 16,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "/",
+            operator: "Quot",
+            example: ("P6 / P2", "P3"),
+            precedence: 16,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "%",
+            operator: "Mod",
+            example: ("P5 % P3", "P2"),
+            precedence: 16,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "+",
+            operator: "Sum",
+            example: ("P2 + P3", "P5"),
+            precedence: 15,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "-",
+            operator: "Diff",
+            example: ("P2 - P3", "N1"),
+            precedence: 15,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "<<",
+            operator: "Shleft",
+            example: ("U1 << U5", "U32"),
+            precedence: 14,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: ">>",
+            operator: "Shright",
+            example: ("U32 >> U5", "U1"),
+            precedence: 14,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "&",
+            operator: "And",
+            example: ("U5 & U3", "U1"),
+            precedence: 13,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "^",
+            operator: "Xor",
+            example: ("U5 ^ U3", "U6"),
+            precedence: 12,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "|",
+            operator: "Or",
+            example: ("U5 | U3", "U7"),
+            precedence: 11,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "==",
+            operator: "Eq",
+            example: ("P5 == P3 + P2", "True"),
+            precedence: 10,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "!=",
+            operator: "NotEq",
+            example: ("P5 != P3 + P2", "False"),
+            precedence: 10,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "<=",
+            operator: "LeEq",
+            example: ("P6 <= P3 + P2", "False"),
+            precedence: 10,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: ">=",
+            operator: "GrEq",
+            example: ("P6 >= P3 + P2", "True"),
+            precedence: 10,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "<",
+            operator: "Le",
+            example: ("P4 < P3 + P2", "True"),
+            precedence: 10,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: ">",
+            operator: "Gr",
+            example: ("P5 < P3 + P2", "False"),
+            precedence: 10,
+            n_args: 2,
+            op_type: Operator,
+        },
+        Op {
+            token: "cmp",
+            operator: "Compare",
+            example: ("cmp(P2, P3)", "Less"),
+            precedence: !0,
+            n_args: 2,
+            op_type: Function,
+        },
+        Op {
+            token: "sqr",
+            operator: "Square",
+            example: ("sqr(P2)", "P4"),
+            precedence: !0,
+            n_args: 1,
+            op_type: Function,
+        },
+        Op {
+            token: "abs",
+            operator: "AbsVal",
+            example: ("abs(N2)", "P2"),
+            precedence: !0,
+            n_args: 1,
+            op_type: Function,
+        },
+        Op {
+            token: "cube",
+            operator: "Cube",
+            example: ("cube(P2)", "P8"),
+            precedence: !0,
+            n_args: 1,
+            op_type: Function,
+        },
+        Op {
+            token: "pow",
+            operator: "Exp",
+            example: ("pow(P2, P3)", "P8"),
+            precedence: !0,
+            n_args: 2,
+            op_type: Function,
+        },
+        Op {
+            token: "min",
+            operator: "Minimum",
+            example: ("min(P2, P3)", "P2"),
+            precedence: !0,
+            n_args: 2,
+            op_type: Function,
+        },
+        Op {
+            token: "max",
+            operator: "Maximum",
+            example: ("max(P2, P3)", "P3"),
+            precedence: !0,
+            n_args: 2,
+            op_type: Function,
+        },
+    ];
+
+    use std::io::Write;
+    write!(
+        f,
+        "
+/**
+Convenient type operations.
+
+Any types representing values must be able to be expressed as `ident`s. That means they need to be
+in scope.
+
+For example, `P5` is okay, but `typenum::P5` is not.
+
+You may combine operators arbitrarily, although doing so excessively may require raising the
+recursion limit.
+
+# Example
+```rust
+#![recursion_limit=\"128\"]
+#[macro_use] extern crate typenum;
+use typenum::consts::*;
+
+fn main() {{
+    assert_type!(
+        op!(min((P1 - P2) * (N3 + N7), P5 * (P3 + P4)) == P10)
+    );
+}}
+```
+Operators are evaluated based on the operator precedence outlined
+[here](https://doc.rust-lang.org/reference.html#operator-precedence).
+
+The full list of supported operators and functions is as follows:
+
+{}
+
+They all expand to type aliases defined in the `operator_aliases` module. Here is an expanded list,
+including examples:
+
+",
+        ops.iter()
+            .map(|op| format!("`{}`", op.token))
+            .collect::<Vec<_>>()
+            .join(", ")
+    )?;
+
+    //write!(f, "Token | Alias | Example\n ===|===|===\n")?;
+
+    for op in ops.iter() {
+        write!(
+            f,
+            "---\nOperator `{token}`. Expands to `{operator}`.
+
+```rust
+# #[macro_use] extern crate typenum;
+# use typenum::*;
+# fn main() {{
+assert_type_eq!(op!({ex0}), {ex1});
+# }}
+```\n
+",
+            token = op.token,
+            operator = op.operator,
+            ex0 = op.example.0,
+            ex1 = op.example.1
+        )?;
+    }
+
+    write!(
+        f,
+        "*/
+#[macro_export]
+macro_rules! op {{
+    ($($tail:tt)*) => ( __op_internal__!($($tail)*) );
+}}
+
+    #[doc(hidden)]
+    #[macro_export]
+    macro_rules! __op_internal__ {{
+"
+    )?;
+
+    // We first us the shunting-yard algorithm to produce our tokens in Polish notation.
+    // See: https://en.wikipedia.org/wiki/Shunting-yard_algorithm
+
+    // Note: Due to macro asymmetry, "the top of the stack" refers to the first element, not the
+    // last
+
+    // -----------------------------------------------------------------------------------------
+    // Stage 1: There are tokens to be read:
+
+    // -------
+    // Case 1: Token is a function => Push it onto the stack:
+    for fun in ops.iter().filter(|f| f.op_type == Function) {
+        write!(
+            f,
+            "
+(@stack[$($stack:ident,)*] @queue[$($queue:ident,)*] @tail: {f_token} $($tail:tt)*) => (
+    __op_internal__!(@stack[{f_op}, $($stack,)*] @queue[$($queue,)*] @tail: $($tail)*)
+);",
+            f_token = fun.token,
+            f_op = fun.operator
+        )?;
+    }
+
+    // -------
+    // Case 2: Token is a comma => Until the top of the stack is a LParen,
+    //                             Pop operators from stack to queue
+
+    // Base case: Top of stack is LParen, ditch comma and continue
+    write!(
+        f,
+        "
+(@stack[LParen, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail: , $($tail:tt)*) => (
+    __op_internal__!(@stack[LParen, $($stack,)*] @queue[$($queue,)*] @tail: $($tail)*)
+);"
+    )?;
+    // Recursive case: Not LParen, pop from stack to queue
+    write!(
+        f,
+        "
+(@stack[$stack_top:ident, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail: , $($tail:tt)*) => (
+    __op_internal__!(@stack[$($stack,)*] @queue[$stack_top, $($queue,)*] @tail: , $($tail)*)
+);"
+    )?;
+
+    // -------
+    // Case 3: Token is an operator, o1:
+    for o1 in ops.iter().filter(|op| op.op_type == Operator) {
+        // If top of stack is operator o2 with o1.precedence <= o2.precedence,
+        // Then pop o2 off stack onto queue:
+        for o2 in ops.iter()
+            .filter(|op| op.op_type == Operator)
+            .filter(|o2| o1.precedence <= o2.precedence)
+        {
+            write!(
+                f,
+                "
+(@stack[{o2_op}, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail: {o1_token} $($tail:tt)*) => (
+    __op_internal__!(@stack[$($stack,)*] @queue[{o2_op}, $($queue,)*] @tail: {o1_token} $($tail)*)
+);",
+                o2_op = o2.operator,
+                o1_token = o1.token
+            )?;
+        }
+        // Base case: push o1 onto stack
+        write!(
+            f,
+            "
+(@stack[$($stack:ident,)*] @queue[$($queue:ident,)*] @tail: {o1_token} $($tail:tt)*) => (
+    __op_internal__!(@stack[{o1_op}, $($stack,)*] @queue[$($queue,)*] @tail: $($tail)*)
+);",
+            o1_op = o1.operator,
+            o1_token = o1.token
+        )?;
+    }
+
+    // -------
+    // Case 4: Token is "(": push it onto stack as "LParen". Also convert the ")" to "RParen" to
+    // appease the macro gods:
+    write!(
+        f,
+        "
+(@stack[$($stack:ident,)*] @queue[$($queue:ident,)*] @tail: ( $($stuff:tt)* ) $($tail:tt)* )
+ => (
+    __op_internal__!(@stack[LParen, $($stack,)*] @queue[$($queue,)*]
+                     @tail: $($stuff)* RParen $($tail)*)
+);"
+    )?;
+
+    // -------
+    // Case 5: Token is "RParen":
+    //     1. Pop from stack to queue until we see an "LParen",
+    //     2. Kill the "LParen",
+    //     3. If the top of the stack is a function, pop it onto the queue
+    // 2. Base case:
+    write!(
+        f,
+        "
+(@stack[LParen, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail: RParen $($tail:tt)*) => (
+    __op_internal__!(@rp3 @stack[$($stack,)*] @queue[$($queue,)*] @tail: $($tail)*)
+);"
+    )?;
+    // 1. Recursive case:
+    write!(
+        f,
+        "
+(@stack[$stack_top:ident, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail: RParen $($tail:tt)*)
+ => (
+    __op_internal__!(@stack[$($stack,)*] @queue[$stack_top, $($queue,)*] @tail: RParen $($tail)*)
+);"
+    )?;
+    // 3. Check for function:
+    for fun in ops.iter().filter(|f| f.op_type == Function) {
+        write!(
+            f,
+            "
+(@rp3 @stack[{fun_op}, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail: $($tail:tt)*) => (
+    __op_internal__!(@stack[$($stack,)*] @queue[{fun_op}, $($queue,)*] @tail: $($tail)*)
+);",
+            fun_op = fun.operator
+        )?;
+    }
+    // 3. If no function found:
+    write!(
+        f,
+        "
+(@rp3 @stack[$($stack:ident,)*] @queue[$($queue:ident,)*] @tail: $($tail:tt)*) => (
+    __op_internal__!(@stack[$($stack,)*] @queue[$($queue,)*] @tail: $($tail)*)
+);"
+    )?;
+
+    // -------
+    // Case 6: Token is a number: Push it onto the queue
+    write!(
+        f,
+        "
+(@stack[$($stack:ident,)*] @queue[$($queue:ident,)*] @tail: $num:ident $($tail:tt)*) => (
+    __op_internal__!(@stack[$($stack,)*] @queue[$num, $($queue,)*] @tail: $($tail)*)
+);"
+    )?;
+
+    // -------
+    // Case 7: Out of tokens:
+    // Base case: Stack empty: Start evaluating
+    write!(
+        f,
+        "
+(@stack[] @queue[$($queue:ident,)*] @tail: ) => (
+    __op_internal__!(@reverse[] @input: $($queue,)*)
+);"
+    )?;
+    // Recursive case: Pop stack to queue
+    write!(
+        f,
+        "
+(@stack[$stack_top:ident, $($stack:ident,)*] @queue[$($queue:ident,)*] @tail:) => (
+    __op_internal__!(@stack[$($stack,)*] @queue[$stack_top, $($queue,)*] @tail: )
+);"
+    )?;
+
+    // -----------------------------------------------------------------------------------------
+    // Stage 2: Reverse so we have RPN
+    write!(
+        f,
+        "
+(@reverse[$($revved:ident,)*] @input: $head:ident, $($tail:ident,)* ) => (
+    __op_internal__!(@reverse[$head, $($revved,)*] @input: $($tail,)*)
+);"
+    )?;
+    write!(
+        f,
+        "
+(@reverse[$($revved:ident,)*] @input: ) => (
+    __op_internal__!(@eval @stack[] @input[$($revved,)*])
+);"
+    )?;
+
+    // -----------------------------------------------------------------------------------------
+    // Stage 3: Evaluate in Reverse Polish Notation
+    // Operators / Operators with 2 args:
+    for op in ops.iter().filter(|op| op.n_args == 2) {
+        // Note: We have to switch $a and $b here, otherwise non-commutative functions are backwards
+        write!(
+            f,
+            "
+(@eval @stack[$a:ty, $b:ty, $($stack:ty,)*] @input[{op}, $($tail:ident,)*]) => (
+    __op_internal__!(@eval @stack[$crate::{op}<$b, $a>, $($stack,)*] @input[$($tail,)*])
+);",
+            op = op.operator
+        )?;
+    }
+    // Operators with 1 arg:
+    for op in ops.iter().filter(|op| op.n_args == 1) {
+        write!(
+            f,
+            "
+(@eval @stack[$a:ty, $($stack:ty,)*] @input[{op}, $($tail:ident,)*]) => (
+    __op_internal__!(@eval @stack[$crate::{op}<$a>, $($stack,)*] @input[$($tail,)*])
+);",
+            op = op.operator
+        )?;
+    }
+
+    // Wasn't a function or operator, so must be a value => push onto stack
+    write!(
+        f,
+        "
+(@eval @stack[$($stack:ty,)*] @input[$head:ident, $($tail:ident,)*]) => (
+    __op_internal__!(@eval @stack[$head, $($stack,)*] @input[$($tail,)*])
+);"
+    )?;
+
+    // No input left:
+    write!(
+        f,
+        "
+(@eval @stack[$stack:ty,] @input[]) => (
+    $stack
+);"
+    )?;
+
+    // -----------------------------------------------------------------------------------------
+    // Stage 0: Get it started
+    write!(
+        f,
+        "
+($($tail:tt)* ) => (
+    __op_internal__!(@stack[] @queue[] @tail: $($tail)*)
+);"
+    )?;
+
+    write!(
+        f,
+        "
+}}"
+    )?;
+
+    Ok(())
+}
diff -Nru cargo-0.32.0/vendor/typenum/build/tests.rs cargo-0.33.0/vendor/typenum/build/tests.rs
--- cargo-0.32.0/vendor/typenum/build/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/build/tests.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,301 @@
+use std::{env, fmt, fs, io, path};
+
+use super::{gen_int, gen_uint};
+
+fn sign(i: i64) -> char {
+    if i > 0 {
+        'P'
+    } else if i < 0 {
+        'N'
+    } else {
+        '_'
+    }
+}
+
+struct UIntTest {
+    a: u64,
+    op: &'static str,
+    b: Option<u64>,
+    r: u64,
+}
+
+impl fmt::Display for UIntTest {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.b {
+            Some(b) => write!(
+                f,
+                "
+#[test]
+#[allow(non_snake_case)]
+fn test_{a}_{op}_{b}() {{
+    type A = {gen_a};
+    type B = {gen_b};
+    type U{r} = {result};
+
+    #[allow(non_camel_case_types)]
+    type U{a}{op}U{b} = <<A as {op}<B>>::Output as Same<U{r}>>::Output;
+
+    assert_eq!(<U{a}{op}U{b} as Unsigned>::to_u64(), <U{r} as Unsigned>::to_u64());
+}}",
+                gen_a = gen_uint(self.a),
+                gen_b = gen_uint(b),
+                r = self.r,
+                result = gen_uint(self.r),
+                a = self.a,
+                b = b,
+                op = self.op
+            ),
+            None => write!(
+                f,
+                "
+#[test]
+#[allow(non_snake_case)]
+fn test_{a}_{op}() {{
+    type A = {gen_a};
+    type U{r} = {result};
+
+    #[allow(non_camel_case_types)]
+    type {op}U{a} = <<A as {op}>::Output as Same<U{r}>>::Output;
+    assert_eq!(<{op}U{a} as Unsigned>::to_u64(), <U{r} as Unsigned>::to_u64());
+}}",
+                gen_a = gen_uint(self.a),
+                r = self.r,
+                result = gen_uint(self.r),
+                a = self.a,
+                op = self.op
+            ),
+        }
+    }
+}
+
+fn uint_binary_test(a: u64, op: &'static str, b: u64, result: u64) -> UIntTest {
+    UIntTest {
+        a: a,
+        op: op,
+        b: Option::Some(b),
+        r: result,
+    }
+}
+
+// fn uint_unary_test(op: &'static str, a: u64, result: u64) -> UIntTest {
+//     UIntTest { a: a, op: op, b: Option::None, r: result }
+// }
+
+struct IntBinaryTest {
+    a: i64,
+    op: &'static str,
+    b: i64,
+    r: i64,
+}
+
+impl fmt::Display for IntBinaryTest {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "
+#[test]
+#[allow(non_snake_case)]
+fn test_{sa}{a}_{op}_{sb}{b}() {{
+    type A = {gen_a};
+    type B = {gen_b};
+    type {sr}{r} = {result};
+
+    #[allow(non_camel_case_types)]
+    type {sa}{a}{op}{sb}{b} = <<A as {op}<B>>::Output as Same<{sr}{r}>>::Output;
+
+    assert_eq!(<{sa}{a}{op}{sb}{b} as Integer>::to_i64(), <{sr}{r} as Integer>::to_i64());
+}}",
+            gen_a = gen_int(self.a),
+            gen_b = gen_int(self.b),
+            r = self.r.abs(),
+            sr = sign(self.r),
+            result = gen_int(self.r),
+            a = self.a.abs(),
+            b = self.b.abs(),
+            sa = sign(self.a),
+            sb = sign(self.b),
+            op = self.op
+        )
+    }
+}
+
+fn int_binary_test(a: i64, op: &'static str, b: i64, result: i64) -> IntBinaryTest {
+    IntBinaryTest {
+        a: a,
+        op: op,
+        b: b,
+        r: result,
+    }
+}
+
+struct IntUnaryTest {
+    op: &'static str,
+    a: i64,
+    r: i64,
+}
+
+impl fmt::Display for IntUnaryTest {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "
+#[test]
+#[allow(non_snake_case)]
+fn test_{sa}{a}_{op}() {{
+    type A = {gen_a};
+    type {sr}{r} = {result};
+
+    #[allow(non_camel_case_types)]
+    type {op}{sa}{a} = <<A as {op}>::Output as Same<{sr}{r}>>::Output;
+    assert_eq!(<{op}{sa}{a} as Integer>::to_i64(), <{sr}{r} as Integer>::to_i64());
+}}",
+            gen_a = gen_int(self.a),
+            r = self.r.abs(),
+            sr = sign(self.r),
+            result = gen_int(self.r),
+            a = self.a.abs(),
+            sa = sign(self.a),
+            op = self.op
+        )
+    }
+}
+
+fn int_unary_test(op: &'static str, a: i64, result: i64) -> IntUnaryTest {
+    IntUnaryTest {
+        op: op,
+        a: a,
+        r: result,
+    }
+}
+
+fn uint_cmp_test(a: u64, b: u64) -> String {
+    format!(
+        "
+#[test]
+#[allow(non_snake_case)]
+fn test_{a}_cmp_{b}() {{
+    type A = {gen_a};
+    type B = {gen_b};
+
+    #[allow(non_camel_case_types)]
+    type U{a}CmpU{b} = <A as Cmp<B>>::Output;
+    assert_eq!(<U{a}CmpU{b} as Ord>::to_ordering(), Ordering::{result:?});
+}}",
+        a = a,
+        b = b,
+        gen_a = gen_uint(a),
+        gen_b = gen_uint(b),
+        result = a.cmp(&b)
+    )
+}
+
+fn int_cmp_test(a: i64, b: i64) -> String {
+    format!(
+        "
+#[test]
+#[allow(non_snake_case)]
+fn test_{sa}{a}_cmp_{sb}{b}() {{
+    type A = {gen_a};
+    type B = {gen_b};
+
+    #[allow(non_camel_case_types)]
+    type {sa}{a}Cmp{sb}{b} = <A as Cmp<B>>::Output;
+    assert_eq!(<{sa}{a}Cmp{sb}{b} as Ord>::to_ordering(), Ordering::{result:?});
+}}",
+        a = a.abs(),
+        b = b.abs(),
+        sa = sign(a),
+        sb = sign(b),
+        gen_a = gen_int(a),
+        gen_b = gen_int(b),
+        result = a.cmp(&b)
+    )
+}
+
+pub fn build_tests() -> Result<(), Box<::std::error::Error>> {
+    // will test all permutations of number pairs up to this (and down to its opposite for ints)
+    let high: i64 = 5;
+
+    let uints = (0u64..high as u64 + 1).flat_map(|a| (a..a + 1).cycle().zip(0..high as u64 + 1));
+    let ints = (-high..high + 1).flat_map(|a| (a..a + 1).cycle().zip(-high..high + 1));
+
+    let out_dir = env::var("OUT_DIR")?;
+    let dest = path::Path::new(&out_dir).join("tests.rs");
+    let f = fs::File::create(&dest)?;
+    let mut writer = io::BufWriter::new(&f);
+    use std::io::Write;
+    writer.write(
+        b"
+extern crate typenum;
+
+use std::ops::*;
+use std::cmp::Ordering;
+use typenum::*;
+",
+    )?;
+    use std::cmp;
+    // uint operators:
+    for (a, b) in uints {
+        write!(writer, "{}", uint_binary_test(a, "BitAnd", b, a & b))?;
+        write!(writer, "{}", uint_binary_test(a, "BitOr", b, a | b))?;
+        write!(writer, "{}", uint_binary_test(a, "BitXor", b, a ^ b))?;
+        write!(writer, "{}", uint_binary_test(a, "Shl", b, a << b))?;
+        write!(writer, "{}", uint_binary_test(a, "Shr", b, a >> b))?;
+        write!(writer, "{}", uint_binary_test(a, "Add", b, a + b))?;
+        write!(writer, "{}", uint_binary_test(a, "Min", b, cmp::min(a, b)))?;
+        write!(writer, "{}", uint_binary_test(a, "Max", b, cmp::max(a, b)))?;
+        if a >= b {
+            write!(writer, "{}", uint_binary_test(a, "Sub", b, a - b))?;
+        }
+        write!(writer, "{}", uint_binary_test(a, "Mul", b, a * b))?;
+        if b != 0 {
+            write!(writer, "{}", uint_binary_test(a, "Div", b, a / b))?;
+            write!(writer, "{}", uint_binary_test(a, "Rem", b, a % b))?;
+            if a % b == 0 {
+                write!(writer, "{}", uint_binary_test(a, "PartialDiv", b, a / b))?;
+            }
+        }
+        write!(writer, "{}", uint_binary_test(a, "Pow", b, a.pow(b as u32)))?;
+        write!(writer, "{}", uint_cmp_test(a, b))?;
+    }
+    // int operators:
+    for (a, b) in ints {
+        write!(writer, "{}", int_binary_test(a, "Add", b, a + b))?;
+        write!(writer, "{}", int_binary_test(a, "Sub", b, a - b))?;
+        write!(writer, "{}", int_binary_test(a, "Mul", b, a * b))?;
+        write!(writer, "{}", int_binary_test(a, "Min", b, cmp::min(a, b)))?;
+        write!(writer, "{}", int_binary_test(a, "Max", b, cmp::max(a, b)))?;
+        if b != 0 {
+            write!(writer, "{}", int_binary_test(a, "Div", b, a / b))?;
+            write!(writer, "{}", int_binary_test(a, "Rem", b, a % b))?;
+            if a % b == 0 {
+                write!(writer, "{}", int_binary_test(a, "PartialDiv", b, a / b))?;
+            }
+        }
+        if b >= 0 || a.abs() == 1 {
+            let result = if b < 0 {
+                if a == 1 {
+                    a
+                } else if a == -1 {
+                    a.pow((-b) as u32)
+                } else {
+                    unreachable!()
+                }
+            } else {
+                a.pow(b as u32)
+            };
+            write!(writer, "{}", int_binary_test(a, "Pow", b, result))?;
+        }
+        write!(writer, "{}", int_cmp_test(a, b))?;
+    }
+
+    // int unary operators:
+    for n in -high..high + 1 {
+        write!(writer, "{}", int_unary_test("Neg", n, -n))?;
+        write!(writer, "{}", int_unary_test("Abs", n, n.abs()))?;
+    }
+
+    writer.flush()?;
+
+    Ok(())
+}
diff -Nru cargo-0.32.0/vendor/typenum/.cargo-checksum.json cargo-0.33.0/vendor/typenum/.cargo-checksum.json
--- cargo-0.32.0/vendor/typenum/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1 @@
+{"files":{},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/typenum/Cargo.toml cargo-0.33.0/vendor/typenum/Cargo.toml
--- cargo-0.32.0/vendor/typenum/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,31 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "typenum"
+version = "1.10.0"
+authors = ["Paho Lurie-Gregg <paho@paholg.com>", "Andre Bogus <bogusandre@gmail.com>"]
+build = "build/main.rs"
+description = "Typenum is a Rust library for type-level numbers evaluated at compile time. It currently supports bits, unsigned integers, and signed integers. It also provides a type-level array of type-level numbers, but its implementation is incomplete."
+documentation = "https://docs.rs/typenum"
+readme = "README.md"
+categories = ["no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/paholg/typenum"
+
+[lib]
+name = "typenum"
+
+[features]
+i128 = []
+no_std = []
+strict = []
diff -Nru cargo-0.32.0/vendor/typenum/CHANGELOG.md cargo-0.33.0/vendor/typenum/CHANGELOG.md
--- cargo-0.32.0/vendor/typenum/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/CHANGELOG.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,56 @@
+# Changelog
+
+This project follows semantic versioning.
+
+### 1.10.0 (2018-03-11)
+- [added] The `PowerOfTwo` marker trait.
+- [added] Associated constants for `Bit`, `Unsigned`, and `Integer`.
+
+### 1.9.0 (2017-05-14)
+- [added] The `Abs` type operater and corresponding `AbsVal` alias.
+- [added] The feature `i128` that enables creating 128-bit integers from typenums.
+- [added] The `assert_type!` and `assert_type_eq!` macros.
+- [added] Operators to the `op!` macro, including those performed by `cmp!`.
+- [fixed] Bug in `op!` macro involving functions and convoluted expressions.
+- [deprecated] The `cmp!` macro.
+
+### 1.8.0 (2017-04-12)
+- [added] The `op!` macro for conveniently performing type-level operations.
+- [added] The `cmp!` macro for conveniently performing type-level comparisons.
+- [added] Some comparison type-operators that are used by the `cmp!` macro.
+
+### 1.7.0 (2017-03-24)
+- [added] Type operators `Min` and `Max` with accompanying aliases `Minimum` and `Maximum`
+
+### 1.6.0 (2017-02-24)
+- [fixed] Bug in `Array` division.
+- [fixed] Bug where `Rem` would sometimes exit early with the wrong answer.
+- [added] `PartialDiv` operator that performs division as a partial function -- it's defined only
+  when there is no remainder.
+
+### 1.5.2 (2017-02-04)
+- [fixed] Bug between `Div` implementation and type system.
+
+### 1.5.1 (2016-11-08)
+- [fixed] Expanded implementation of `Pow` for primitives.
+
+### 1.5.0 (2016-11-03)
+- [added] Functions to the `Pow` and `Len` traits. This is *technically* a breaking change, but it
+  would only break someone's code if they have a custom impl for `Pow`. I would be very surprised
+  if that is anyone other than me.
+
+### 1.4.0 (2016-10-29)
+- [added] Type-level arrays of type-level integers. (PR #66)
+- [added] The types in this crate are now instantiable. (Issue #67, PR #68)
+
+### 1.3.1 (2016-03-31)
+- [fixed] Bug with recent nightlies.
+
+### 1.3.0 (2016-02-07)
+- [changed] Removed dependency on libstd. (Issue #53, PR #55)
+- [changed] Reorganized module structure. (PR #57)
+
+### 1.2.0 (2016-01-03)
+- [added] This change log!
+- [added] Convenience type aliases for operators. (Issue #48, PR #50)
+- [added] Types in this crate now derive all possible traits. (Issue #42, PR #51)
diff -Nru cargo-0.32.0/vendor/typenum/LICENSE cargo-0.33.0/vendor/typenum/LICENSE
--- cargo-0.32.0/vendor/typenum/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/LICENSE	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Paho Lurie-Gregg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -Nru cargo-0.32.0/vendor/typenum/README.md cargo-0.33.0/vendor/typenum/README.md
--- cargo-0.32.0/vendor/typenum/README.md	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,42 @@
+[![crates.io](https://img.shields.io/crates/v/typenum.svg)](https://crates.io/crates/typenum)
+[![Build Status](https://travis-ci.org/paholg/typenum.svg?branch=master)](https://travis-ci.org/paholg/typenum)
+
+Typenum
+=====
+
+Typenum is a Rust library for type-level numbers evaluated at compile time. It currently
+supports bits, unsigned integers, and signed integers.
+
+Typenum depends only on libcore, and so is suitable for use on any platform!
+
+For the full documentation, go [here](https://docs.rs/typenum).
+
+### Importing
+
+While `typenum` is divided into several modules, they are all re-exported through the crate root,
+so you can import anything contained herein with `use typenum::whatever;`, ignoring the
+crate structure.
+
+You may also find it useful to treat the `consts` module as a prelude, perfoming a glob import.
+
+### Example
+
+Here is a trivial example of `typenum`'s use:
+
+```rust
+use typenum::{Sum, Exp, Integer, N2, P3, P4};
+
+type X = Sum<P3, P4>;
+assert_eq!(<X as Integer>::to_i32(), 7);
+
+type Y = Exp<N2, P3>;
+assert_eq!(<Y as Integer>::to_i32(), -8);
+```
+
+For a non-trivial example of its use, see one of the crates that depends on it. The full
+list is [here](https://crates.io/crates/typenum/reverse_dependencies). Of note are
+[dimensioned](https://crates.io/crates/dimensioned/) which does compile-time type
+checking for arbitrary unit systems and
+[generic-array](https://crates.io/crates/generic-array/) which provides arrays whose
+length you can generically refer to.
+
diff -Nru cargo-0.32.0/vendor/typenum/src/array.rs cargo-0.33.0/vendor/typenum/src/array.rs
--- cargo-0.32.0/vendor/typenum/src/array.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/array.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,282 @@
+//! A type-level array of type-level numbers.
+//!
+//! It is not very featureful right now, and should be considered a work in progress.
+
+use core::marker::PhantomData;
+use core::ops::{Add, Div, Mul, Sub};
+
+use super::*;
+
+/// The terminating type for type arrays.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug)]
+pub struct ATerm;
+
+impl TypeArray for ATerm {}
+
+/// `TArr` is a type that acts as an array of types. It is defined similarly to `UInt`, only its
+/// values can be more than bits, and it is designed to act as an array. So you can only add two if
+/// they have the same number of elements, for example.
+///
+/// This array is only really designed to contain `Integer` types. If you use it with others, you
+/// may find it lacking functionality.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug)]
+pub struct TArr<V, A> {
+    _marker: PhantomData<(V, A)>,
+}
+
+impl<V, A> TypeArray for TArr<V, A> {}
+
+/// Create a new type-level arrray. Only usable on Rust 1.13.0 or newer.
+///
+/// There's not a whole lot you can do with it right now.
+///
+/// # Example
+/// ```rust
+/// #[macro_use]
+/// extern crate typenum;
+/// use typenum::consts::*;
+///
+/// type Array = tarr![P3, N4, Z0, P38];
+/// # fn main() { let _: Array; }
+#[macro_export]
+macro_rules! tarr {
+    () => ( $crate::ATerm );
+    ($n:ty) => ( $crate::TArr<$n, $crate::ATerm> );
+    ($n:ty,) => ( $crate::TArr<$n, $crate::ATerm> );
+    ($n:ty, $($tail:ty),+) => ( $crate::TArr<$n, tarr![$($tail),+]> );
+    ($n:ty, $($tail:ty),+,) => ( $crate::TArr<$n, tarr![$($tail),+]> );
+}
+
+// ---------------------------------------------------------------------------------------
+// Length
+
+/// Length of `ATerm` by itself is 0
+impl Len for ATerm {
+    type Output = U0;
+    fn len(&self) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Size of a `TypeArray`
+impl<V, A> Len for TArr<V, A>
+where
+    A: Len,
+    Length<A>: Add<B1>,
+    Sum<Length<A>, B1>: Unsigned,
+{
+    type Output = Add1<Length<A>>;
+    fn len(&self) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Add arrays
+// Note that two arrays are only addable if they are the same length.
+
+impl Add<ATerm> for ATerm {
+    type Output = ATerm;
+    fn add(self, _: ATerm) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<Al, Vl, Ar, Vr> Add<TArr<Vr, Ar>> for TArr<Vl, Al>
+where
+    Al: Add<Ar>,
+    Vl: Add<Vr>,
+{
+    type Output = TArr<Sum<Vl, Vr>, Sum<Al, Ar>>;
+    fn add(self, _: TArr<Vr, Ar>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Subtract arrays
+// Note that two arrays are only subtractable if they are the same length.
+
+impl Sub<ATerm> for ATerm {
+    type Output = ATerm;
+    fn sub(self, _: ATerm) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<Vl, Al, Vr, Ar> Sub<TArr<Vr, Ar>> for TArr<Vl, Al>
+where
+    Vl: Sub<Vr>,
+    Al: Sub<Ar>,
+{
+    type Output = TArr<Diff<Vl, Vr>, Diff<Al, Ar>>;
+    fn sub(self, _: TArr<Vr, Ar>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Multiply an array by a scalar
+
+impl<Rhs> Mul<Rhs> for ATerm {
+    type Output = ATerm;
+    fn mul(self, _: Rhs) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<V, A, Rhs> Mul<Rhs> for TArr<V, A>
+where
+    V: Mul<Rhs>,
+    A: Mul<Rhs>,
+{
+    type Output = TArr<Prod<V, Rhs>, Prod<A, Rhs>>;
+    fn mul(self, _: Rhs) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+impl Mul<ATerm> for Z0 {
+    type Output = ATerm;
+    fn mul(self, _: ATerm) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<U> Mul<ATerm> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    type Output = ATerm;
+    fn mul(self, _: ATerm) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<U> Mul<ATerm> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    type Output = ATerm;
+    fn mul(self, _: ATerm) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<V, A> Mul<TArr<V, A>> for Z0
+where
+    Z0: Mul<A>,
+{
+    type Output = TArr<Z0, Prod<Z0, A>>;
+    fn mul(self, _: TArr<V, A>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+impl<V, A, U> Mul<TArr<V, A>> for PInt<U>
+where
+    U: Unsigned + NonZero,
+    PInt<U>: Mul<A> + Mul<V>,
+{
+    type Output = TArr<Prod<PInt<U>, V>, Prod<PInt<U>, A>>;
+    fn mul(self, _: TArr<V, A>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+impl<V, A, U> Mul<TArr<V, A>> for NInt<U>
+where
+    U: Unsigned + NonZero,
+    NInt<U>: Mul<A> + Mul<V>,
+{
+    type Output = TArr<Prod<NInt<U>, V>, Prod<NInt<U>, A>>;
+    fn mul(self, _: TArr<V, A>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Divide an array by a scalar
+
+impl<Rhs> Div<Rhs> for ATerm {
+    type Output = ATerm;
+    fn div(self, _: Rhs) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<V, A, Rhs> Div<Rhs> for TArr<V, A>
+where
+    V: Div<Rhs>,
+    A: Div<Rhs>,
+{
+    type Output = TArr<Quot<V, Rhs>, Quot<A, Rhs>>;
+    fn div(self, _: Rhs) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Partial Divide an array by a scalar
+
+impl<Rhs> PartialDiv<Rhs> for ATerm {
+    type Output = ATerm;
+    fn partial_div(self, _: Rhs) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<V, A, Rhs> PartialDiv<Rhs> for TArr<V, A>
+where
+    V: PartialDiv<Rhs>,
+    A: PartialDiv<Rhs>,
+{
+    type Output = TArr<PartialQuot<V, Rhs>, PartialQuot<A, Rhs>>;
+    fn partial_div(self, _: Rhs) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Modulo an array by a scalar
+use core::ops::Rem;
+
+impl<Rhs> Rem<Rhs> for ATerm {
+    type Output = ATerm;
+    fn rem(self, _: Rhs) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<V, A, Rhs> Rem<Rhs> for TArr<V, A>
+where
+    V: Rem<Rhs>,
+    A: Rem<Rhs>,
+{
+    type Output = TArr<Mod<V, Rhs>, Mod<A, Rhs>>;
+    fn rem(self, _: Rhs) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Negate an array
+use core::ops::Neg;
+
+impl Neg for ATerm {
+    type Output = ATerm;
+    fn neg(self) -> Self::Output {
+        ATerm
+    }
+}
+
+impl<V, A> Neg for TArr<V, A>
+where
+    V: Neg,
+    A: Neg,
+{
+    type Output = TArr<Negate<V>, Negate<A>>;
+    fn neg(self) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
diff -Nru cargo-0.32.0/vendor/typenum/src/bit.rs cargo-0.33.0/vendor/typenum/src/bit.rs
--- cargo-0.32.0/vendor/typenum/src/bit.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/bit.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,272 @@
+//! Type-level bits.
+//!
+//! These are rather simple and are used as the building blocks of the
+//! other number types in this crate.
+//!
+//!
+//! **Type operators** implemented:
+//!
+//! - From `core::ops`: `BitAnd`, `BitOr`, `BitXor`, and `Not`.
+//! - From `typenum`: `Same` and `Cmp`.
+//!
+
+use core::ops::{BitAnd, BitOr, BitXor, Not};
+use {Cmp, Equal, Greater, Less, NonZero, PowerOfTwo};
+
+pub use marker_traits::Bit;
+
+/// The type-level bit 0.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct B0;
+
+impl B0 {
+    /// Instantiates a singleton representing this bit.
+    #[inline]
+    pub fn new() -> B0 {
+        B0
+    }
+}
+
+/// The type-level bit 1.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct B1;
+
+impl B1 {
+    /// Instantiates a singleton representing this bit.
+    #[inline]
+    pub fn new() -> B1 {
+        B1
+    }
+}
+
+impl Bit for B0 {
+    const U8: u8 = 0;
+    const BOOL: bool = false;
+
+    #[inline]
+    fn to_u8() -> u8 {
+        0
+    }
+    #[inline]
+    fn to_bool() -> bool {
+        false
+    }
+}
+
+impl Bit for B1 {
+    const U8: u8 = 1;
+    const BOOL: bool = true;
+
+    #[inline]
+    fn to_u8() -> u8 {
+        1
+    }
+    #[inline]
+    fn to_bool() -> bool {
+        true
+    }
+}
+
+impl NonZero for B1 {}
+impl PowerOfTwo for B1 {}
+
+/// Not of 0 (!0 = 1)
+impl Not for B0 {
+    type Output = B1;
+    fn not(self) -> Self::Output {
+        B1
+    }
+}
+/// Not of 1 (!1 = 0)
+impl Not for B1 {
+    type Output = B0;
+    fn not(self) -> Self::Output {
+        B0
+    }
+}
+
+/// And with 0 ( 0 & B = 0)
+impl<Rhs: Bit> BitAnd<Rhs> for B0 {
+    type Output = B0;
+    fn bitand(self, _: Rhs) -> Self::Output {
+        B0
+    }
+}
+
+/// And with 1 ( 1 & 0 = 0)
+impl BitAnd<B0> for B1 {
+    type Output = B0;
+    fn bitand(self, _: B0) -> Self::Output {
+        B0
+    }
+}
+
+/// And with 1 ( 1 & 1 = 1)
+impl BitAnd<B1> for B1 {
+    type Output = B1;
+    fn bitand(self, _: B1) -> Self::Output {
+        B1
+    }
+}
+
+/// Or with 0 ( 0 | 0 = 0)
+impl BitOr<B0> for B0 {
+    type Output = B0;
+    fn bitor(self, _: B0) -> Self::Output {
+        B0
+    }
+}
+
+/// Or with 0 ( 0 | 1 = 1)
+impl BitOr<B1> for B0 {
+    type Output = B1;
+    fn bitor(self, _: B1) -> Self::Output {
+        B1
+    }
+}
+
+/// Or with 1 ( 1 | B = 1)
+impl<Rhs: Bit> BitOr<Rhs> for B1 {
+    type Output = B1;
+    fn bitor(self, _: Rhs) -> Self::Output {
+        B1
+    }
+}
+
+/// Xor between 0 and 0 ( 0 ^ 0 = 0)
+impl BitXor<B0> for B0 {
+    type Output = B0;
+    fn bitxor(self, _: B0) -> Self::Output {
+        B0
+    }
+}
+/// Xor between 1 and 0 ( 1 ^ 0 = 1)
+impl BitXor<B0> for B1 {
+    type Output = B1;
+    fn bitxor(self, _: B0) -> Self::Output {
+        B1
+    }
+}
+/// Xor between 0 and 1 ( 0 ^ 1 = 1)
+impl BitXor<B1> for B0 {
+    type Output = B1;
+    fn bitxor(self, _: B1) -> Self::Output {
+        B1
+    }
+}
+/// Xor between 1 and 1 ( 1 ^ 1 = 0)
+impl BitXor<B1> for B1 {
+    type Output = B0;
+    fn bitxor(self, _: B1) -> Self::Output {
+        B0
+    }
+}
+
+#[cfg(tests)]
+mod tests {
+    // macro for testing operation results. Uses `Same` to ensure the types are equal and
+    // not just the values they evaluate to.
+    macro_rules! test_bit_op {
+        ($op:ident $Lhs:ident = $Answer:ident) => (
+            {
+                type Test = <<$Lhs as $op>::Output as ::Same<$Answer>>::Output;
+                assert_eq!(<$Answer as Bit>::to_u8(), <Test as Bit>::to_u8());
+            }
+        );
+        ($Lhs:ident $op:ident $Rhs:ident = $Answer:ident) => (
+            {
+                type Test = <<$Lhs as $op<$Rhs>>::Output as ::Same<$Answer>>::Output;
+                assert_eq!(<$Answer as Bit>::to_u8(), <Test as Bit>::to_u8());
+            }
+        );
+    }
+
+    #[test]
+    fn bit_operations() {
+        test_bit_op!(Not B0 = B1);
+        test_bit_op!(Not B1 = B0);
+
+        test_bit_op!(B0 BitAnd B0 = B0);
+        test_bit_op!(B0 BitAnd B1 = B0);
+        test_bit_op!(B1 BitAnd B0 = B0);
+        test_bit_op!(B1 BitAnd B1 = B1);
+
+        test_bit_op!(B0 BitOr B0 = B0);
+        test_bit_op!(B0 BitOr B1 = B1);
+        test_bit_op!(B1 BitOr B0 = B1);
+        test_bit_op!(B1 BitOr B1 = B1);
+
+        test_bit_op!(B0 BitXor B0 = B0);
+        test_bit_op!(B0 BitXor B1 = B1);
+        test_bit_op!(B1 BitXor B0 = B1);
+        test_bit_op!(B1 BitXor B1 = B0);
+    }
+}
+
+impl Cmp<B0> for B0 {
+    type Output = Equal;
+}
+
+impl Cmp<B1> for B0 {
+    type Output = Less;
+}
+
+impl Cmp<B0> for B1 {
+    type Output = Greater;
+}
+
+impl Cmp<B1> for B1 {
+    type Output = Equal;
+}
+
+use Min;
+impl Min<B0> for B0 {
+    type Output = B0;
+    fn min(self, _: B0) -> B0 {
+        self
+    }
+}
+impl Min<B1> for B0 {
+    type Output = B0;
+    fn min(self, _: B1) -> B0 {
+        self
+    }
+}
+impl Min<B0> for B1 {
+    type Output = B0;
+    fn min(self, rhs: B0) -> B0 {
+        rhs
+    }
+}
+impl Min<B1> for B1 {
+    type Output = B1;
+    fn min(self, _: B1) -> B1 {
+        self
+    }
+}
+
+use Max;
+impl Max<B0> for B0 {
+    type Output = B0;
+    fn max(self, _: B0) -> B0 {
+        self
+    }
+}
+impl Max<B1> for B0 {
+    type Output = B1;
+    fn max(self, rhs: B1) -> B1 {
+        rhs
+    }
+}
+impl Max<B0> for B1 {
+    type Output = B1;
+    fn max(self, _: B0) -> B1 {
+        self
+    }
+}
+impl Max<B1> for B1 {
+    type Output = B1;
+    fn max(self, _: B1) -> B1 {
+        self
+    }
+}
diff -Nru cargo-0.32.0/vendor/typenum/src/int.rs cargo-0.33.0/vendor/typenum/src/int.rs
--- cargo-0.32.0/vendor/typenum/src/int.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/int.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,935 @@
+//! Type-level signed integers.
+//!
+//!
+//! Type **operators** implemented:
+//!
+//! From `core::ops`: `Add`, `Sub`, `Mul`, `Div`, and `Rem`.
+//! From `typenum`: `Same`, `Cmp`, and `Pow`.
+//!
+//! Rather than directly using the structs defined in this module, it is recommended that
+//! you import and use the relevant aliases from the [consts](../consts/index.html) module.
+//!
+//! Note that operators that work on the underlying structure of the number are
+//! intentionally not implemented. This is because this implementation of signed integers
+//! does *not* use twos-complement, and implementing them would require making arbitrary
+//! choices, causing the results of such operators to be difficult to reason about.
+//!
+//! # Example
+//! ```rust
+//! use std::ops::{Add, Sub, Mul, Div, Rem};
+//! use typenum::{Integer, N3, P2};
+//!
+//! assert_eq!(<N3 as Add<P2>>::Output::to_i32(), -1);
+//! assert_eq!(<N3 as Sub<P2>>::Output::to_i32(), -5);
+//! assert_eq!(<N3 as Mul<P2>>::Output::to_i32(), -6);
+//! assert_eq!(<N3 as Div<P2>>::Output::to_i32(), -1);
+//! assert_eq!(<N3 as Rem<P2>>::Output::to_i32(), -1);
+//! ```
+//!
+
+use core::ops::{Add, Div, Mul, Neg, Rem, Sub};
+use core::marker::PhantomData;
+
+use {Cmp, Equal, Greater, Less, NonZero, Pow, PowerOfTwo};
+use uint::{UInt, Unsigned};
+use bit::{B0, B1, Bit};
+use private::{PrivateDivInt, PrivateIntegerAdd, PrivateRem};
+use consts::{N1, P1, U0, U1};
+
+pub use marker_traits::Integer;
+
+/// Type-level signed integers with positive sign.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct PInt<U: Unsigned + NonZero> {
+    _marker: PhantomData<U>,
+}
+
+/// Type-level signed integers with negative sign.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct NInt<U: Unsigned + NonZero> {
+    _marker: PhantomData<U>,
+}
+
+impl<U: Unsigned + NonZero> PInt<U> {
+    /// Instantiates a singleton representing this strictly positive integer.
+    #[inline]
+    pub fn new() -> PInt<U> {
+        PInt {
+            _marker: PhantomData,
+        }
+    }
+}
+
+impl<U: Unsigned + NonZero> NInt<U> {
+    /// Instantiates a singleton representing this strictly negative integer.
+    #[inline]
+    pub fn new() -> NInt<U> {
+        NInt {
+            _marker: PhantomData,
+        }
+    }
+}
+
+/// The type-level signed integer 0.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct Z0;
+
+impl Z0 {
+    /// Instantiates a singleton representing the integer 0.
+    #[inline]
+    pub fn new() -> Z0 {
+        Z0
+    }
+}
+
+impl<U: Unsigned + NonZero> NonZero for PInt<U> {}
+impl<U: Unsigned + NonZero> NonZero for NInt<U> {}
+
+impl<U: Unsigned + NonZero + PowerOfTwo> PowerOfTwo for PInt<U> {}
+
+impl Integer for Z0 {
+    const I8: i8 = 0;
+    const I16: i16 = 0;
+    const I32: i32 = 0;
+    const I64: i64 = 0;
+    #[cfg(feature = "i128")]
+    const I128: i128 = 0;
+    const ISIZE: isize = 0;
+
+    #[inline]
+    fn to_i8() -> i8 {
+        0
+    }
+    #[inline]
+    fn to_i16() -> i16 {
+        0
+    }
+    #[inline]
+    fn to_i32() -> i32 {
+        0
+    }
+    #[inline]
+    fn to_i64() -> i64 {
+        0
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_i128() -> i128 {
+        0
+    }
+    #[inline]
+    fn to_isize() -> isize {
+        0
+    }
+}
+
+impl<U: Unsigned + NonZero> Integer for PInt<U> {
+    const I8: i8 = U::I8;
+    const I16: i16 = U::I16;
+    const I32: i32 = U::I32;
+    const I64: i64 = U::I64;
+    #[cfg(feature = "i128")]
+    const I128: i128 = U::I128;
+    const ISIZE: isize = U::ISIZE;
+
+    #[inline]
+    fn to_i8() -> i8 {
+        <U as Unsigned>::to_i8()
+    }
+    #[inline]
+    fn to_i16() -> i16 {
+        <U as Unsigned>::to_i16()
+    }
+    #[inline]
+    fn to_i32() -> i32 {
+        <U as Unsigned>::to_i32()
+    }
+    #[inline]
+    fn to_i64() -> i64 {
+        <U as Unsigned>::to_i64()
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_i128() -> i128 {
+        <U as Unsigned>::to_i128()
+    }
+    #[inline]
+    fn to_isize() -> isize {
+        <U as Unsigned>::to_isize()
+    }
+}
+
+impl<U: Unsigned + NonZero> Integer for NInt<U> {
+    const I8: i8 = -U::I8;
+    const I16: i16 = -U::I16;
+    const I32: i32 = -U::I32;
+    const I64: i64 = -U::I64;
+    #[cfg(feature = "i128")]
+    const I128: i128 = -U::I128;
+    const ISIZE: isize = -U::ISIZE;
+
+    #[inline]
+    fn to_i8() -> i8 {
+        -<U as Unsigned>::to_i8()
+    }
+    #[inline]
+    fn to_i16() -> i16 {
+        -<U as Unsigned>::to_i16()
+    }
+    #[inline]
+    fn to_i32() -> i32 {
+        -<U as Unsigned>::to_i32()
+    }
+    #[inline]
+    fn to_i64() -> i64 {
+        -<U as Unsigned>::to_i64()
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_i128() -> i128 {
+        -<U as Unsigned>::to_i128()
+    }
+    #[inline]
+    fn to_isize() -> isize {
+        -<U as Unsigned>::to_isize()
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Neg
+
+/// `-Z0 = Z0`
+impl Neg for Z0 {
+    type Output = Z0;
+    fn neg(self) -> Self::Output {
+        Z0
+    }
+}
+
+/// `-PInt = NInt`
+impl<U: Unsigned + NonZero> Neg for PInt<U> {
+    type Output = NInt<U>;
+    fn neg(self) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// `-NInt = PInt`
+impl<U: Unsigned + NonZero> Neg for NInt<U> {
+    type Output = PInt<U>;
+    fn neg(self) -> Self::Output {
+        PInt::new()
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Add
+
+/// `Z0 + I = I`
+impl<I: Integer> Add<I> for Z0 {
+    type Output = I;
+    fn add(self, _: I) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `PInt + Z0 = PInt`
+impl<U: Unsigned + NonZero> Add<Z0> for PInt<U> {
+    type Output = PInt<U>;
+    fn add(self, _: Z0) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// `NInt + Z0 = NInt`
+impl<U: Unsigned + NonZero> Add<Z0> for NInt<U> {
+    type Output = NInt<U>;
+    fn add(self, _: Z0) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// `P(Ul) + P(Ur) = P(Ul + Ur)`
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Add<PInt<Ur>> for PInt<Ul>
+where
+    Ul: Add<Ur>,
+    <Ul as Add<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<Ul as Add<Ur>>::Output>;
+    fn add(self, _: PInt<Ur>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// `N(Ul) + N(Ur) = N(Ul + Ur)`
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Add<NInt<Ur>> for NInt<Ul>
+where
+    Ul: Add<Ur>,
+    <Ul as Add<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = NInt<<Ul as Add<Ur>>::Output>;
+    fn add(self, _: NInt<Ur>) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// `P(Ul) + N(Ur)`: We resolve this with our `PrivateAdd`
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Add<NInt<Ur>> for PInt<Ul>
+where
+    Ul: Cmp<Ur> + PrivateIntegerAdd<<Ul as Cmp<Ur>>::Output, Ur>,
+{
+    type Output = <Ul as PrivateIntegerAdd<<Ul as Cmp<Ur>>::Output, Ur>>::Output;
+    fn add(self, _: NInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `N(Ul) + P(Ur)`: We resolve this with our `PrivateAdd`
+// We just do the same thing as above, swapping Lhs and Rhs
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Add<PInt<Ur>> for NInt<Ul>
+where
+    Ur: Cmp<Ul> + PrivateIntegerAdd<<Ur as Cmp<Ul>>::Output, Ul>,
+{
+    type Output = <Ur as PrivateIntegerAdd<<Ur as Cmp<Ul>>::Output, Ul>>::Output;
+    fn add(self, _: PInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `P + N = 0` where `P == N`
+impl<N: Unsigned, P: Unsigned> PrivateIntegerAdd<Equal, N> for P {
+    type Output = Z0;
+}
+
+/// `P + N = Positive` where `P > N`
+impl<N: Unsigned, P: Unsigned> PrivateIntegerAdd<Greater, N> for P
+where
+    P: Sub<N>,
+    <P as Sub<N>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<P as Sub<N>>::Output>;
+}
+
+/// `P + N = Negative` where `P < N`
+impl<N: Unsigned, P: Unsigned> PrivateIntegerAdd<Less, N> for P
+where
+    N: Sub<P>,
+    <N as Sub<P>>::Output: Unsigned + NonZero,
+{
+    type Output = NInt<<N as Sub<P>>::Output>;
+}
+
+// ---------------------------------------------------------------------------------------
+// Sub
+
+/// `Z0 - Z0 = Z0`
+impl Sub<Z0> for Z0 {
+    type Output = Z0;
+    fn sub(self, _: Z0) -> Self::Output {
+        Z0
+    }
+}
+
+/// `Z0 - P = N`
+impl<U: Unsigned + NonZero> Sub<PInt<U>> for Z0 {
+    type Output = NInt<U>;
+    fn sub(self, _: PInt<U>) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// `Z0 - N = P`
+impl<U: Unsigned + NonZero> Sub<NInt<U>> for Z0 {
+    type Output = PInt<U>;
+    fn sub(self, _: NInt<U>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// `PInt - Z0 = PInt`
+impl<U: Unsigned + NonZero> Sub<Z0> for PInt<U> {
+    type Output = PInt<U>;
+    fn sub(self, _: Z0) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// `NInt - Z0 = NInt`
+impl<U: Unsigned + NonZero> Sub<Z0> for NInt<U> {
+    type Output = NInt<U>;
+    fn sub(self, _: Z0) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// `P(Ul) - N(Ur) = P(Ul + Ur)`
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Sub<NInt<Ur>> for PInt<Ul>
+where
+    Ul: Add<Ur>,
+    <Ul as Add<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<Ul as Add<Ur>>::Output>;
+    fn sub(self, _: NInt<Ur>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// `N(Ul) - P(Ur) = N(Ul + Ur)`
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Sub<PInt<Ur>> for NInt<Ul>
+where
+    Ul: Add<Ur>,
+    <Ul as Add<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = NInt<<Ul as Add<Ur>>::Output>;
+    fn sub(self, _: PInt<Ur>) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// `P(Ul) - P(Ur)`: We resolve this with our `PrivateAdd`
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Sub<PInt<Ur>> for PInt<Ul>
+where
+    Ul: Cmp<Ur> + PrivateIntegerAdd<<Ul as Cmp<Ur>>::Output, Ur>,
+{
+    type Output = <Ul as PrivateIntegerAdd<<Ul as Cmp<Ur>>::Output, Ur>>::Output;
+    fn sub(self, _: PInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `N(Ul) - N(Ur)`: We resolve this with our `PrivateAdd`
+// We just do the same thing as above, swapping Lhs and Rhs
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Sub<NInt<Ur>> for NInt<Ul>
+where
+    Ur: Cmp<Ul> + PrivateIntegerAdd<<Ur as Cmp<Ul>>::Output, Ul>,
+{
+    type Output = <Ur as PrivateIntegerAdd<<Ur as Cmp<Ul>>::Output, Ul>>::Output;
+    fn sub(self, _: NInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Mul
+
+/// `Z0 * I = Z0`
+impl<I: Integer> Mul<I> for Z0 {
+    type Output = Z0;
+    fn mul(self, _: I) -> Self::Output {
+        Z0
+    }
+}
+
+/// `P * Z0 = Z0`
+impl<U: Unsigned + NonZero> Mul<Z0> for PInt<U> {
+    type Output = Z0;
+    fn mul(self, _: Z0) -> Self::Output {
+        Z0
+    }
+}
+
+/// `N * Z0 = Z0`
+impl<U: Unsigned + NonZero> Mul<Z0> for NInt<U> {
+    type Output = Z0;
+    fn mul(self, _: Z0) -> Self::Output {
+        Z0
+    }
+}
+
+/// P(Ul) * P(Ur) = P(Ul * Ur)
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Mul<PInt<Ur>> for PInt<Ul>
+where
+    Ul: Mul<Ur>,
+    <Ul as Mul<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<Ul as Mul<Ur>>::Output>;
+    fn mul(self, _: PInt<Ur>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// N(Ul) * N(Ur) = P(Ul * Ur)
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Mul<NInt<Ur>> for NInt<Ul>
+where
+    Ul: Mul<Ur>,
+    <Ul as Mul<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<Ul as Mul<Ur>>::Output>;
+    fn mul(self, _: NInt<Ur>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// P(Ul) * N(Ur) = N(Ul * Ur)
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Mul<NInt<Ur>> for PInt<Ul>
+where
+    Ul: Mul<Ur>,
+    <Ul as Mul<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = NInt<<Ul as Mul<Ur>>::Output>;
+    fn mul(self, _: NInt<Ur>) -> Self::Output {
+        NInt::new()
+    }
+}
+
+/// N(Ul) * P(Ur) = N(Ul * Ur)
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Mul<PInt<Ur>> for NInt<Ul>
+where
+    Ul: Mul<Ur>,
+    <Ul as Mul<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = NInt<<Ul as Mul<Ur>>::Output>;
+    fn mul(self, _: PInt<Ur>) -> Self::Output {
+        NInt::new()
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Div
+
+/// `Z0 / I = Z0` where `I != 0`
+impl<I: Integer + NonZero> Div<I> for Z0 {
+    type Output = Z0;
+    fn div(self, _: I) -> Self::Output {
+        Z0
+    }
+}
+
+macro_rules! impl_int_div {
+    ($A:ident, $B:ident, $R:ident) => (
+        /// `$A<Ul> / $B<Ur> = $R<Ul / Ur>`
+        impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Div<$B<Ur>> for $A<Ul>
+            where Ul: Cmp<Ur>,
+                  $A<Ul>: PrivateDivInt<<Ul as Cmp<Ur>>::Output, $B<Ur>>
+        {
+            type Output = <$A<Ul> as PrivateDivInt<
+                <Ul as Cmp<Ur>>::Output,
+                $B<Ur>>>::Output;
+            fn div(self, _: $B<Ur>) -> Self::Output {
+                unsafe { ::core::mem::uninitialized() }
+            }
+        }
+        impl<Ul, Ur> PrivateDivInt<Less, $B<Ur>> for $A<Ul>
+            where Ul: Unsigned + NonZero, Ur: Unsigned + NonZero,
+        {
+            type Output = Z0;
+        }
+        impl<Ul, Ur> PrivateDivInt<Equal, $B<Ur>> for $A<Ul>
+            where Ul: Unsigned + NonZero, Ur: Unsigned + NonZero,
+        {
+            type Output = $R<U1>;
+        }
+        impl<Ul, Ur> PrivateDivInt<Greater, $B<Ur>> for $A<Ul>
+            where Ul: Unsigned + NonZero + Div<Ur>,
+                  Ur: Unsigned + NonZero,
+                  <Ul as Div<Ur>>::Output: Unsigned + NonZero,
+        {
+            type Output = $R<<Ul as Div<Ur>>::Output>;
+        }
+        );
+}
+
+impl_int_div!(PInt, PInt, PInt);
+impl_int_div!(PInt, NInt, NInt);
+impl_int_div!(NInt, PInt, NInt);
+impl_int_div!(NInt, NInt, PInt);
+
+// ---------------------------------------------------------------------------------------
+// PartialDiv
+
+use {PartialDiv, Quot};
+
+impl<M, N> PartialDiv<N> for M
+where
+    M: Integer + Div<N> + Rem<N, Output = Z0>,
+{
+    type Output = Quot<M, N>;
+    fn partial_div(self, _: N) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Cmp
+
+/// 0 == 0
+impl Cmp<Z0> for Z0 {
+    type Output = Equal;
+}
+
+/// 0 > -X
+impl<U: Unsigned + NonZero> Cmp<NInt<U>> for Z0 {
+    type Output = Greater;
+}
+
+/// 0 < X
+impl<U: Unsigned + NonZero> Cmp<PInt<U>> for Z0 {
+    type Output = Less;
+}
+
+/// X > 0
+impl<U: Unsigned + NonZero> Cmp<Z0> for PInt<U> {
+    type Output = Greater;
+}
+
+/// -X < 0
+impl<U: Unsigned + NonZero> Cmp<Z0> for NInt<U> {
+    type Output = Less;
+}
+
+/// -X < Y
+impl<P: Unsigned + NonZero, N: Unsigned + NonZero> Cmp<PInt<P>> for NInt<N> {
+    type Output = Less;
+}
+
+/// X > - Y
+impl<P: Unsigned + NonZero, N: Unsigned + NonZero> Cmp<NInt<N>> for PInt<P> {
+    type Output = Greater;
+}
+
+/// X <==> Y
+impl<Pl: Cmp<Pr> + Unsigned + NonZero, Pr: Unsigned + NonZero> Cmp<PInt<Pr>> for PInt<Pl> {
+    type Output = <Pl as Cmp<Pr>>::Output;
+}
+
+/// -X <==> -Y
+impl<Nl: Unsigned + NonZero, Nr: Cmp<Nl> + Unsigned + NonZero> Cmp<NInt<Nr>> for NInt<Nl> {
+    type Output = <Nr as Cmp<Nl>>::Output;
+}
+
+// ---------------------------------------------------------------------------------------
+// Rem
+
+/// `Z0 % I = Z0` where `I != 0`
+impl<I: Integer + NonZero> Rem<I> for Z0 {
+    type Output = Z0;
+    fn rem(self, _: I) -> Self::Output {
+        Z0
+    }
+}
+
+macro_rules! impl_int_rem {
+    ($A:ident, $B:ident, $R:ident) => (
+        /// `$A<Ul> % $B<Ur> = $R<Ul % Ur>`
+        impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Rem<$B<Ur>> for $A<Ul>
+            where Ul: Rem<Ur>,
+                  $A<Ul>: PrivateRem<<Ul as Rem<Ur>>::Output, $B<Ur>>
+        {
+            type Output = <$A<Ul> as PrivateRem<
+                <Ul as Rem<Ur>>::Output,
+                $B<Ur>>>::Output;
+            fn rem(self, _: $B<Ur>) -> Self::Output {
+                unsafe { ::core::mem::uninitialized() }
+            }
+        }
+        impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> PrivateRem<U0, $B<Ur>> for $A<Ul> {
+            type Output = Z0;
+        }
+        impl<Ul, Ur, U, B> PrivateRem<UInt<U, B>, $B<Ur>> for $A<Ul>
+            where Ul: Unsigned + NonZero, Ur: Unsigned + NonZero, U: Unsigned, B: Bit,
+        {
+            type Output = $R<UInt<U, B>>;
+        }
+        );
+}
+
+impl_int_rem!(PInt, PInt, PInt);
+impl_int_rem!(PInt, NInt, PInt);
+impl_int_rem!(NInt, PInt, NInt);
+impl_int_rem!(NInt, NInt, NInt);
+
+// ---------------------------------------------------------------------------------------
+// Pow
+
+/// 0^0 = 1
+impl Pow<Z0> for Z0 {
+    type Output = P1;
+    fn powi(self, _: Z0) -> Self::Output {
+        P1::new()
+    }
+}
+
+/// 0^P = 0
+impl<U: Unsigned + NonZero> Pow<PInt<U>> for Z0 {
+    type Output = Z0;
+    fn powi(self, _: PInt<U>) -> Self::Output {
+        Z0
+    }
+}
+
+/// 0^N = 0
+impl<U: Unsigned + NonZero> Pow<NInt<U>> for Z0 {
+    type Output = Z0;
+    fn powi(self, _: NInt<U>) -> Self::Output {
+        Z0
+    }
+}
+
+/// 1^N = 1
+impl<U: Unsigned + NonZero> Pow<NInt<U>> for P1 {
+    type Output = P1;
+    fn powi(self, _: NInt<U>) -> Self::Output {
+        P1::new()
+    }
+}
+
+/// (-1)^N = 1 if N is even
+impl<U: Unsigned> Pow<NInt<UInt<U, B0>>> for N1 {
+    type Output = P1;
+    fn powi(self, _: NInt<UInt<U, B0>>) -> Self::Output {
+        P1::new()
+    }
+}
+
+/// (-1)^N = -1 if N is odd
+impl<U: Unsigned> Pow<NInt<UInt<U, B1>>> for N1 {
+    type Output = N1;
+    fn powi(self, _: NInt<UInt<U, B1>>) -> Self::Output {
+        N1::new()
+    }
+}
+
+/// P^0 = 1
+impl<U: Unsigned + NonZero> Pow<Z0> for PInt<U> {
+    type Output = P1;
+    fn powi(self, _: Z0) -> Self::Output {
+        P1::new()
+    }
+}
+
+/// N^0 = 1
+impl<U: Unsigned + NonZero> Pow<Z0> for NInt<U> {
+    type Output = P1;
+    fn powi(self, _: Z0) -> Self::Output {
+        P1::new()
+    }
+}
+
+/// P(Ul)^P(Ur) = P(Ul^Ur)
+impl<Ul: Unsigned + NonZero, Ur: Unsigned + NonZero> Pow<PInt<Ur>> for PInt<Ul>
+where
+    Ul: Pow<Ur>,
+    <Ul as Pow<Ur>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<Ul as Pow<Ur>>::Output>;
+    fn powi(self, _: PInt<Ur>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// N(Ul)^P(Ur) = P(Ul^Ur) if Ur is even
+impl<Ul: Unsigned + NonZero, Ur: Unsigned> Pow<PInt<UInt<Ur, B0>>> for NInt<Ul>
+where
+    Ul: Pow<UInt<Ur, B0>>,
+    <Ul as Pow<UInt<Ur, B0>>>::Output: Unsigned + NonZero,
+{
+    type Output = PInt<<Ul as Pow<UInt<Ur, B0>>>::Output>;
+    fn powi(self, _: PInt<UInt<Ur, B0>>) -> Self::Output {
+        PInt::new()
+    }
+}
+
+/// N(Ul)^P(Ur) = N(Ul^Ur) if Ur is odd
+impl<Ul: Unsigned + NonZero, Ur: Unsigned> Pow<PInt<UInt<Ur, B1>>> for NInt<Ul>
+where
+    Ul: Pow<UInt<Ur, B1>>,
+    <Ul as Pow<UInt<Ur, B1>>>::Output: Unsigned + NonZero,
+{
+    type Output = NInt<<Ul as Pow<UInt<Ur, B1>>>::Output>;
+    fn powi(self, _: PInt<UInt<Ur, B1>>) -> Self::Output {
+        NInt::new()
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Min
+use {Max, Maximum, Min, Minimum};
+
+impl Min<Z0> for Z0 {
+    type Output = Z0;
+    fn min(self, _: Z0) -> Self::Output {
+        self
+    }
+}
+
+impl<U> Min<PInt<U>> for Z0
+where
+    U: Unsigned + NonZero,
+{
+    type Output = Z0;
+    fn min(self, _: PInt<U>) -> Self::Output {
+        self
+    }
+}
+
+impl<U> Min<NInt<U>> for Z0
+where
+    U: Unsigned + NonZero,
+{
+    type Output = NInt<U>;
+    fn min(self, rhs: NInt<U>) -> Self::Output {
+        rhs
+    }
+}
+
+impl<U> Min<Z0> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    type Output = Z0;
+    fn min(self, rhs: Z0) -> Self::Output {
+        rhs
+    }
+}
+
+impl<U> Min<Z0> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    type Output = NInt<U>;
+    fn min(self, _: Z0) -> Self::Output {
+        self
+    }
+}
+
+impl<Ul, Ur> Min<PInt<Ur>> for PInt<Ul>
+where
+    Ul: Unsigned + NonZero + Min<Ur>,
+    Ur: Unsigned + NonZero,
+    Minimum<Ul, Ur>: Unsigned + NonZero,
+{
+    type Output = PInt<Minimum<Ul, Ur>>;
+    fn min(self, _: PInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+impl<Ul, Ur> Min<PInt<Ur>> for NInt<Ul>
+where
+    Ul: Unsigned + NonZero,
+    Ur: Unsigned + NonZero,
+{
+    type Output = NInt<Ul>;
+    fn min(self, _: PInt<Ur>) -> Self::Output {
+        self
+    }
+}
+
+impl<Ul, Ur> Min<NInt<Ur>> for PInt<Ul>
+where
+    Ul: Unsigned + NonZero,
+    Ur: Unsigned + NonZero,
+{
+    type Output = NInt<Ur>;
+    fn min(self, rhs: NInt<Ur>) -> Self::Output {
+        rhs
+    }
+}
+
+impl<Ul, Ur> Min<NInt<Ur>> for NInt<Ul>
+where
+    Ul: Unsigned + NonZero + Max<Ur>,
+    Ur: Unsigned + NonZero,
+    Maximum<Ul, Ur>: Unsigned + NonZero,
+{
+    type Output = NInt<Maximum<Ul, Ur>>;
+    fn min(self, _: NInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Max
+
+impl Max<Z0> for Z0 {
+    type Output = Z0;
+    fn max(self, _: Z0) -> Self::Output {
+        self
+    }
+}
+
+impl<U> Max<PInt<U>> for Z0
+where
+    U: Unsigned + NonZero,
+{
+    type Output = PInt<U>;
+    fn max(self, rhs: PInt<U>) -> Self::Output {
+        rhs
+    }
+}
+
+impl<U> Max<NInt<U>> for Z0
+where
+    U: Unsigned + NonZero,
+{
+    type Output = Z0;
+    fn max(self, _: NInt<U>) -> Self::Output {
+        self
+    }
+}
+
+impl<U> Max<Z0> for PInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    type Output = PInt<U>;
+    fn max(self, _: Z0) -> Self::Output {
+        self
+    }
+}
+
+impl<U> Max<Z0> for NInt<U>
+where
+    U: Unsigned + NonZero,
+{
+    type Output = Z0;
+    fn max(self, rhs: Z0) -> Self::Output {
+        rhs
+    }
+}
+
+impl<Ul, Ur> Max<PInt<Ur>> for PInt<Ul>
+where
+    Ul: Unsigned + NonZero + Max<Ur>,
+    Ur: Unsigned + NonZero,
+    Maximum<Ul, Ur>: Unsigned + NonZero,
+{
+    type Output = PInt<Maximum<Ul, Ur>>;
+    fn max(self, _: PInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+impl<Ul, Ur> Max<PInt<Ur>> for NInt<Ul>
+where
+    Ul: Unsigned + NonZero,
+    Ur: Unsigned + NonZero,
+{
+    type Output = PInt<Ur>;
+    fn max(self, rhs: PInt<Ur>) -> Self::Output {
+        rhs
+    }
+}
+
+impl<Ul, Ur> Max<NInt<Ur>> for PInt<Ul>
+where
+    Ul: Unsigned + NonZero,
+    Ur: Unsigned + NonZero,
+{
+    type Output = PInt<Ul>;
+    fn max(self, _: NInt<Ur>) -> Self::Output {
+        self
+    }
+}
+
+impl<Ul, Ur> Max<NInt<Ur>> for NInt<Ul>
+where
+    Ul: Unsigned + NonZero + Min<Ur>,
+    Ur: Unsigned + NonZero,
+    Minimum<Ul, Ur>: Unsigned + NonZero,
+{
+    type Output = NInt<Minimum<Ul, Ur>>;
+    fn max(self, _: NInt<Ur>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
diff -Nru cargo-0.32.0/vendor/typenum/src/lib.rs cargo-0.33.0/vendor/typenum/src/lib.rs
--- cargo-0.32.0/vendor/typenum/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,135 @@
+//! This crate provides type-level numbers evaluated at compile time. It depends only on libcore.
+//!
+//! The traits defined or used in this crate are used in a typical manner. They can be divided into
+//! two categories: **marker traits** and **type operators**.
+//!
+//! Many of the marker traits have functions defined, but they all do essentially the same thing:
+//! convert a type into its runtime counterpart, and are really just there for debugging. For
+//! example,
+//!
+//! ```rust
+//! use typenum::{N4, Integer};
+//!
+//! assert_eq!(N4::to_i32(), -4);
+//! ```
+//!
+//! **Type operators** are traits that behave as functions at the type level. These are the meat of
+//! this library. Where possible, traits defined in libcore have been used, but their attached
+//! functions have not been implemented.
+//!
+//! For example, the `Add` trait is implemented for both unsigned and signed integers, but the
+//! `add` function is not. As there are never any objects of the types defined here, it wouldn't
+//! make sense to implement it. What is important is its associated type `Output`, which is where
+//! the addition happens.
+//!
+//! ```rust
+//! use std::ops::Add;
+//! use typenum::{Integer, P3, P4};
+//!
+//! type X = <P3 as Add<P4>>::Output;
+//! assert_eq!(<X as Integer>::to_i32(), 7);
+//! ```
+//!
+//! In addition, helper aliases are defined for type operators. For example, the above snippet
+//! could be replaced with
+//!
+//! ```rust
+//! use typenum::{Sum, Integer, P3, P4};
+//!
+//! type X = Sum<P3, P4>;
+//! assert_eq!(<X as Integer>::to_i32(), 7);
+//! ```
+//!
+//! Documented in each module is the full list of type operators implemented.
+//!
+
+#![no_std]
+#![warn(missing_docs)]
+#![cfg_attr(feature = "i128", feature(i128_type))]
+#![cfg_attr(feature = "strict", deny(missing_docs))]
+#![cfg_attr(feature = "strict", deny(warnings))]
+#![cfg_attr(feature = "cargo-clippy", deny(clippy))]
+#![cfg_attr(feature = "cargo-clippy",
+            allow(type_complexity, len_without_is_empty, new_without_default_derive))]
+
+// For debugging macros:
+// #![feature(trace_macros)]
+// trace_macros!(true);
+
+use core::cmp::Ordering;
+
+include!(concat!(env!("OUT_DIR"), "/consts.rs"));
+include!(concat!(env!("OUT_DIR"), "/op.rs"));
+pub mod bit;
+pub mod uint;
+pub mod int;
+pub mod private;
+pub mod marker_traits;
+pub mod type_operators;
+pub mod operator_aliases;
+
+pub mod array;
+
+pub use consts::*;
+pub use marker_traits::*;
+pub use type_operators::*;
+pub use operator_aliases::*;
+
+pub use uint::{UInt, UTerm};
+pub use int::{NInt, PInt};
+pub use array::{ATerm, TArr};
+
+/// A potential output from `Cmp`, this is the type equivalent to the enum variant
+/// `core::cmp::Ordering::Greater`.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct Greater;
+
+/// A potential output from `Cmp`, this is the type equivalent to the enum variant
+/// `core::cmp::Ordering::Less`.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct Less;
+
+/// A potential output from `Cmp`, this is the type equivalent to the enum variant
+/// `core::cmp::Ordering::Equal`.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct Equal;
+
+/// Returns `core::cmp::Ordering::Greater`
+impl Ord for Greater {
+    #[inline]
+    fn to_ordering() -> Ordering {
+        Ordering::Greater
+    }
+}
+
+/// Returns `core::cmp::Ordering::Less`
+impl Ord for Less {
+    #[inline]
+    fn to_ordering() -> Ordering {
+        Ordering::Less
+    }
+}
+
+/// Returns `core::cmp::Ordering::Equal`
+impl Ord for Equal {
+    #[inline]
+    fn to_ordering() -> Ordering {
+        Ordering::Equal
+    }
+}
+
+/// Asserts that two types are the same.
+#[macro_export]
+macro_rules! assert_type_eq {
+    ($a:ty, $b:ty) => (
+        let _: <$a as $crate::Same<$b>>::Output;
+    );
+}
+
+/// Asserts that a type is `True`, aka `B1`.
+#[macro_export]
+macro_rules! assert_type {
+    ($a:ty) => (
+        let _: <$a as $crate::Same<True>>::Output;
+    );
+}
diff -Nru cargo-0.32.0/vendor/typenum/src/marker_traits.rs cargo-0.33.0/vendor/typenum/src/marker_traits.rs
--- cargo-0.32.0/vendor/typenum/src/marker_traits.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/marker_traits.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,194 @@
+//! All of the **marker traits** used in typenum.
+//!
+//! Note that the definition here for marker traits is slightly different than
+//! the conventional one -- we include traits with functions that convert a type
+//! to the corresponding value, as well as associated constants that do the
+//! same.
+//!
+//! For example, the `Integer` trait includes the function (among others) `fn
+//! to_i32() -> i32` and the associated constant `I32` so that one can do this:
+//!
+//! ```
+//! use typenum::{N42, Integer};
+//!
+//! assert_eq!(-42, N42::to_i32());
+//! assert_eq!(-42, N42::I32);
+//! ```
+//!
+
+/// A **marker trait** to designate that a type is not zero. All number types in this
+/// crate implement `NonZero` except `B0`, `U0`, and `Z0`.
+pub trait NonZero {}
+
+/// A **Marker trait** for the types `Greater`, `Equal`, and `Less`.
+///
+/// This trait should not be implemented for anything outside this crate.
+pub trait Ord {
+    #[allow(missing_docs)]
+    fn to_ordering() -> ::core::cmp::Ordering;
+}
+
+/// The **marker trait** for compile time bits.
+///
+/// This trait should not be implemented for anything outside this crate.
+pub trait Bit {
+    #[allow(missing_docs)]
+    const U8: u8;
+    #[allow(missing_docs)]
+    const BOOL: bool;
+
+    #[allow(missing_docs)]
+    fn to_u8() -> u8;
+    #[allow(missing_docs)]
+    fn to_bool() -> bool;
+}
+
+/// The **marker trait** for compile time unsigned integers.
+///
+/// This trait should not be implemented for anything outside this crate.
+///
+/// # Example
+/// ```rust
+/// use typenum::{U3, Unsigned};
+///
+/// assert_eq!(U3::to_u32(), 3);
+/// assert_eq!(U3::I32, 3);
+/// ```
+pub trait Unsigned {
+    #[allow(missing_docs)]
+    const U8: u8;
+    #[allow(missing_docs)]
+    const U16: u16;
+    #[allow(missing_docs)]
+    const U32: u32;
+    #[allow(missing_docs)]
+    const U64: u64;
+    #[cfg(feature = "i128")]
+    #[allow(missing_docs)]
+    const U128: u128;
+    #[allow(missing_docs)]
+    const USIZE: usize;
+
+    #[allow(missing_docs)]
+    const I8: i8;
+    #[allow(missing_docs)]
+    const I16: i16;
+    #[allow(missing_docs)]
+    const I32: i32;
+    #[allow(missing_docs)]
+    const I64: i64;
+    #[cfg(feature = "i128")]
+    #[allow(missing_docs)]
+    const I128: i128;
+    #[allow(missing_docs)]
+    const ISIZE: isize;
+
+    #[allow(missing_docs)]
+    fn to_u8() -> u8;
+    #[allow(missing_docs)]
+    fn to_u16() -> u16;
+    #[allow(missing_docs)]
+    fn to_u32() -> u32;
+    #[allow(missing_docs)]
+    fn to_u64() -> u64;
+    #[cfg(feature = "i128")]
+    #[allow(missing_docs)]
+    fn to_u128() -> u128;
+    #[allow(missing_docs)]
+    fn to_usize() -> usize;
+
+    #[allow(missing_docs)]
+    fn to_i8() -> i8;
+    #[allow(missing_docs)]
+    fn to_i16() -> i16;
+    #[allow(missing_docs)]
+    fn to_i32() -> i32;
+    #[allow(missing_docs)]
+    fn to_i64() -> i64;
+    #[cfg(feature = "i128")]
+    #[allow(missing_docs)]
+    fn to_i128() -> i128;
+    #[allow(missing_docs)]
+    fn to_isize() -> isize;
+}
+
+/// The **marker trait** for compile time signed integers.
+///
+/// This trait should not be implemented for anything outside this crate.
+///
+/// # Example
+/// ```rust
+/// use typenum::{P3, Integer};
+///
+/// assert_eq!(P3::to_i32(), 3);
+/// assert_eq!(P3::I32, 3);
+/// ```
+pub trait Integer {
+    #[allow(missing_docs)]
+    const I8: i8;
+    #[allow(missing_docs)]
+    const I16: i16;
+    #[allow(missing_docs)]
+    const I32: i32;
+    #[allow(missing_docs)]
+    const I64: i64;
+    #[cfg(feature = "i128")]
+    #[allow(missing_docs)]
+    const I128: i128;
+    #[allow(missing_docs)]
+    const ISIZE: isize;
+
+    #[allow(missing_docs)]
+    fn to_i8() -> i8;
+    #[allow(missing_docs)]
+    fn to_i16() -> i16;
+    #[allow(missing_docs)]
+    fn to_i32() -> i32;
+    #[allow(missing_docs)]
+    fn to_i64() -> i64;
+    #[cfg(feature = "i128")]
+    #[allow(missing_docs)]
+    fn to_i128() -> i128;
+    #[allow(missing_docs)]
+    fn to_isize() -> isize;
+}
+
+/// The **marker trait** for type-level arrays of type-level numbers.
+///
+/// This trait should not be implemented for anything outside this crate.
+///
+/// Someday, it may contain an associated constant to produce a runtime array,
+/// like the other marker traits here. However, that is blocked by [this
+/// issue](https://github.com/rust-lang/rust/issues/44168).
+pub trait TypeArray {}
+
+/// The **marker trait** for type-level numbers which are a power of two.
+///
+/// This trait should not be implemented for anything outside this crate.
+///
+/// # Examples
+///
+/// Here's a working example:
+///
+/// ```rust
+/// use typenum::{P4, P8, PowerOfTwo};
+///
+/// fn only_p2<P: PowerOfTwo>() { }
+///
+/// only_p2::<P4>();
+/// only_p2::<P8>();
+/// ```
+///
+/// Numbers which are not a power of two will fail to compile in this example:
+///
+/// ```rust,compile_fail
+/// use typenum::{P9, P511, P1023, PowerOfTwo};
+///
+/// fn only_p2<P: PowerOfTwo>() { }
+///
+/// only_p2::<P9>();
+/// only_p2::<P511>();
+/// only_p2::<P1023>();
+/// ```
+
+pub trait PowerOfTwo {}
diff -Nru cargo-0.32.0/vendor/typenum/src/operator_aliases.rs cargo-0.33.0/vendor/typenum/src/operator_aliases.rs
--- cargo-0.32.0/vendor/typenum/src/operator_aliases.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/operator_aliases.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,98 @@
+//! Aliases for the type operators used in this crate.
+
+//! Their purpose is to increase the ergonomics of performing operations on the types defined
+//! here. For even more ergonomics, consider using the `op!` macro instead.
+//!
+//! For example, type `X` and type `Y` are the same here:
+//!
+//! ```rust
+//! # #[macro_use] extern crate typenum;
+//! # fn main() {
+//! use std::ops::Mul;
+//! use typenum::{Prod, P5, P7};
+//!
+//! type X = <P7 as Mul<P5>>::Output;
+//! type Y = Prod<P7, P5>;
+//!
+//! assert_type_eq!(X, Y);
+//! # }
+//! ```
+//!
+//!
+
+// Aliases!!!
+use core::ops::{Add, BitAnd, BitOr, BitXor, Div, Mul, Neg, Rem, Shl, Shr, Sub};
+use type_operators::{Abs, Cmp, Len, Max, Min, PartialDiv, Pow};
+
+/// Alias for the associated type of `BitAnd`: `And<A, B> = <A as BitAnd<B>>::Output`
+pub type And<A, B> = <A as BitAnd<B>>::Output;
+/// Alias for the associated type of `BitOr`: `Or<A, B> = <A as BitOr<B>>::Output`
+pub type Or<A, B> = <A as BitOr<B>>::Output;
+/// Alias for the associated type of `BitXor`: `Xor<A, B> = <A as BitXor<B>>::Output`
+pub type Xor<A, B> = <A as BitXor<B>>::Output;
+
+/// Alias for the associated type of `Shl`: `Shleft<A, B> = <A as Shl<B>>::Output`
+pub type Shleft<A, B> = <A as Shl<B>>::Output;
+/// Alias for the associated type of `Shr`: `Shright<A, B> = <A as Shr<B>>::Output`
+pub type Shright<A, B> = <A as Shr<B>>::Output;
+
+/// Alias for the associated type of `Add`: `Sum<A, B> = <A as Add<B>>::Output`
+pub type Sum<A, B> = <A as Add<B>>::Output;
+/// Alias for the associated type of `Sub`: `Diff<A, B> = <A as Sub<B>>::Output`
+pub type Diff<A, B> = <A as Sub<B>>::Output;
+/// Alias for the associated type of `Mul`: `Prod<A, B> = <A as Mul<B>>::Output`
+pub type Prod<A, B> = <A as Mul<B>>::Output;
+/// Alias for the associated type of `Div`: `Quot<A, B> = <A as Div<B>>::Output`
+pub type Quot<A, B> = <A as Div<B>>::Output;
+/// Alias for the associated type of `Rem`: `Mod<A, B> = <A as Rem<B>>::Output`
+pub type Mod<A, B> = <A as Rem<B>>::Output;
+
+/// Alias for the associated type of
+/// `PartialDiv`: `PartialQuot<A, B> = <A as PartialDiv<B>>::Output`
+pub type PartialQuot<A, B> = <A as PartialDiv<B>>::Output;
+
+/// Alias for the associated type of `Neg`: `Negate<A> = <A as Neg>::Output`
+pub type Negate<A> = <A as Neg>::Output;
+
+/// Alias for the associated type of `Abs`: `AbsVal<A> = <A as Abs>::Output`
+pub type AbsVal<A> = <A as Abs>::Output;
+
+/// Alias for the associated type of `Pow`: `Exp<A, B> = <A as Pow<B>>::Output`
+pub type Exp<A, B> = <A as Pow<B>>::Output;
+
+/// Alias to make it easy to add 1: `Add1<A> = <A as Add<B1>>::Output`
+pub type Add1<A> = <A as Add<::bit::B1>>::Output;
+/// Alias to make it easy to subtract 1: `Sub1<A> = <A as Sub<B1>>::Output`
+pub type Sub1<A> = <A as Sub<::bit::B1>>::Output;
+
+/// Alias to make it easy to square. `Square<A> = <A as Mul<A>>::Output`
+pub type Square<A> = <A as Mul>::Output;
+/// Alias to make it easy to cube. `Cube<A> = <Square<A> as Mul<A>>::Output`
+pub type Cube<A> = <Square<A> as Mul<A>>::Output;
+
+/// Alias for the associated type of `Cmp`: `Compare<A, B> = <A as Cmp<B>>::Output`
+pub type Compare<A, B> = <A as Cmp<B>>::Output;
+
+/// Alias for the associated type of `Len`: `Length<A> = <A as Len>::Output`
+pub type Length<T> = <T as Len>::Output;
+
+/// Alias for the associated type of `Min`: `Minimum<A, B> = <A as Min<B>>::Output`
+pub type Minimum<A, B> = <A as Min<B>>::Output;
+
+/// Alias for the associated type of `Max`: `Maximum<A, B> = <A as Max<B>>::Output`
+pub type Maximum<A, B> = <A as Max<B>>::Output;
+
+use type_operators::{IsEqual, IsGreater, IsGreaterOrEqual, IsLess, IsLessOrEqual, IsNotEqual};
+/// Alias for the associated type of `IsLess`: `Le<A, B> = <A as IsLess<B>>::Output`
+pub type Le<A, B> = <A as IsLess<B>>::Output;
+/// Alias for the associated type of `IsEqual`: `Eq<A, B> = <A as IsEqual<B>>::Output`
+pub type Eq<A, B> = <A as IsEqual<B>>::Output;
+/// Alias for the associated type of `IsGreater`: `Gr<A, B> = <A as IsGreater<B>>::Output`
+pub type Gr<A, B> = <A as IsGreater<B>>::Output;
+/// Alias for the associated type of `IsGreaterOrEqual`:
+/// `GrEq<A, B> = <A as IsGreaterOrEqual<B>>::Output`
+pub type GrEq<A, B> = <A as IsGreaterOrEqual<B>>::Output;
+/// Alias for the associated type of `IsLessOrEqual`: `LeEq<A, B> = <A as IsLessOrEqual<B>>::Output`
+pub type LeEq<A, B> = <A as IsLessOrEqual<B>>::Output;
+/// Alias for the associated type of `IsNotEqual`: `NotEq<A, B> = <A as IsNotEqual<B>>::Output`
+pub type NotEq<A, B> = <A as IsNotEqual<B>>::Output;
diff -Nru cargo-0.32.0/vendor/typenum/src/private.rs cargo-0.33.0/vendor/typenum/src/private.rs
--- cargo-0.32.0/vendor/typenum/src/private.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/private.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,361 @@
+//! **Ignore me!** This module is for things that are conceptually private but that must
+//! be made public for typenum to work correctly.
+//!
+//! Unless you are working on typenum itself, **there is no need to view anything here**.
+//!
+//! Certainly don't implement any of the traits here for anything.
+//!
+//!
+//! Just look away.
+//!
+//!
+//! Loooooooooooooooooooooooooooooooooook awaaaaaaaaaaaayyyyyyyyyyyyyyyyyyyyyyyyyyyyy...
+//!
+//!
+//! If you do manage to find something of use in here, please let me know. If you can make a
+//! compelling case, it may be moved out of __private.
+//!
+//! Note: Aliases for private type operators will all be named simply that operator followed
+//! by an abbreviated name of its associated type.
+//!
+
+#![doc(hidden)]
+
+// use ::{Sub};
+use bit::{B0, B1, Bit};
+use uint::{UInt, UTerm, Unsigned};
+
+/// Convenience trait. Calls `Invert` -> `TrimTrailingZeros` -> `Invert`
+pub trait Trim {
+    type Output;
+}
+pub type TrimOut<A> = <A as Trim>::Output;
+
+/// Gets rid of all zeros until it hits a one.
+
+// ONLY IMPLEMENT FOR INVERTED NUMBERS!
+pub trait TrimTrailingZeros {
+    type Output;
+}
+pub type TrimTrailingZerosOut<A> = <A as TrimTrailingZeros>::Output;
+
+/// Converts between standard numbers and inverted ones that have the most significant
+/// digit on the outside.
+pub trait Invert {
+    type Output;
+}
+pub type InvertOut<A> = <A as Invert>::Output;
+
+/// Doubly private! Called by invert to make the magic happen once its done the first step.
+/// The Rhs is what we've got so far.
+pub trait PrivateInvert<Rhs> {
+    type Output;
+}
+pub type PrivateInvertOut<A, Rhs> = <A as PrivateInvert<Rhs>>::Output;
+
+/// Terminating character for `InvertedUInt`s
+pub enum InvertedUTerm {}
+
+/// Inverted `UInt` (has most significant digit on the outside)
+pub struct InvertedUInt<IU: InvertedUnsigned, B: Bit> {
+    _marker: (IU, B),
+}
+
+/// Does the real anding for `UInt`s; `And` just calls this and then `Trim`.
+pub trait PrivateAnd<Rhs = Self> {
+    type Output;
+}
+pub type PrivateAndOut<A, Rhs> = <A as PrivateAnd<Rhs>>::Output;
+
+/// Does the real xoring for `UInt`s; `Xor` just calls this and then `Trim`.
+pub trait PrivateXor<Rhs = Self> {
+    type Output;
+}
+pub type PrivateXorOut<A, Rhs> = <A as PrivateXor<Rhs>>::Output;
+
+/// Does the real subtraction for `UInt`s; `Sub` just calls this and then `Trim`.
+pub trait PrivateSub<Rhs = Self> {
+    type Output;
+}
+pub type PrivateSubOut<A, Rhs> = <A as PrivateSub<Rhs>>::Output;
+
+/// Used for addition of signed integers; `C = P.cmp(N)`
+/// Assumes `P = Self` is positive and `N` is negative
+/// where `P` and `N` are both passed as unsigned integers
+pub trait PrivateIntegerAdd<C, N> {
+    type Output;
+}
+pub type PrivateIntegerAddOut<P, C, N> = <P as PrivateIntegerAdd<C, N>>::Output;
+
+pub trait PrivatePow<Y, N> {
+    type Output;
+}
+pub type PrivatePowOut<A, Y, N> = <A as PrivatePow<Y, N>>::Output;
+
+/// Performs `Shl` on `Lhs` so that `SizeOf(Lhs) = SizeOf(Rhs)`
+/// Fails if `SizeOf(Lhs) > SizeOf(Rhs)`
+pub trait ShiftDiff<Rhs> {
+    type Output;
+}
+pub type ShiftDiffOut<A, Rhs> = <A as ShiftDiff<Rhs>>::Output;
+
+/// Gives `SizeOf(Lhs) - SizeOf(Rhs)`
+pub trait BitDiff<Rhs> {
+    type Output;
+}
+pub type BitDiffOut<A, Rhs> = <A as BitDiff<Rhs>>::Output;
+
+/// Inverted unsigned numbers
+pub trait InvertedUnsigned {
+    fn to_u64() -> u64;
+}
+
+impl InvertedUnsigned for InvertedUTerm {
+    fn to_u64() -> u64 {
+        0
+    }
+}
+
+impl<IU: InvertedUnsigned, B: Bit> InvertedUnsigned for InvertedUInt<IU, B> {
+    fn to_u64() -> u64 {
+        u64::from(B::to_u8()) | IU::to_u64() << 1
+    }
+}
+
+impl Invert for UTerm {
+    type Output = InvertedUTerm;
+}
+
+impl<U: Unsigned, B: Bit> Invert for UInt<U, B>
+where
+    U: PrivateInvert<InvertedUInt<InvertedUTerm, B>>,
+{
+    type Output = PrivateInvertOut<U, InvertedUInt<InvertedUTerm, B>>;
+}
+
+impl<IU: InvertedUnsigned> PrivateInvert<IU> for UTerm {
+    type Output = IU;
+}
+
+impl<IU: InvertedUnsigned, U: Unsigned, B: Bit> PrivateInvert<IU> for UInt<U, B>
+where
+    U: PrivateInvert<InvertedUInt<IU, B>>,
+{
+    type Output = PrivateInvertOut<U, InvertedUInt<IU, B>>;
+}
+
+#[test]
+fn test_inversion() {
+    type Test4 = <::consts::U4 as Invert>::Output;
+    type Test5 = <::consts::U5 as Invert>::Output;
+    type Test12 = <::consts::U12 as Invert>::Output;
+    type Test16 = <::consts::U16 as Invert>::Output;
+
+    assert_eq!(1, <Test4 as InvertedUnsigned>::to_u64());
+    assert_eq!(5, <Test5 as InvertedUnsigned>::to_u64());
+    assert_eq!(3, <Test12 as InvertedUnsigned>::to_u64());
+    assert_eq!(1, <Test16 as InvertedUnsigned>::to_u64());
+}
+
+impl Invert for InvertedUTerm {
+    type Output = UTerm;
+}
+
+impl<IU: InvertedUnsigned, B: Bit> Invert for InvertedUInt<IU, B>
+where
+    IU: PrivateInvert<UInt<UTerm, B>>,
+{
+    type Output = <IU as PrivateInvert<UInt<UTerm, B>>>::Output;
+}
+
+impl<U: Unsigned> PrivateInvert<U> for InvertedUTerm {
+    type Output = U;
+}
+
+impl<U: Unsigned, IU: InvertedUnsigned, B: Bit> PrivateInvert<U> for InvertedUInt<IU, B>
+where
+    IU: PrivateInvert<UInt<U, B>>,
+{
+    type Output = <IU as PrivateInvert<UInt<U, B>>>::Output;
+}
+
+#[test]
+fn test_double_inversion() {
+    type Test4 = <<::consts::U4 as Invert>::Output as Invert>::Output;
+    type Test5 = <<::consts::U5 as Invert>::Output as Invert>::Output;
+    type Test12 = <<::consts::U12 as Invert>::Output as Invert>::Output;
+    type Test16 = <<::consts::U16 as Invert>::Output as Invert>::Output;
+
+    assert_eq!(4, <Test4 as Unsigned>::to_u64());
+    assert_eq!(5, <Test5 as Unsigned>::to_u64());
+    assert_eq!(12, <Test12 as Unsigned>::to_u64());
+    assert_eq!(16, <Test16 as Unsigned>::to_u64());
+}
+
+impl TrimTrailingZeros for InvertedUTerm {
+    type Output = InvertedUTerm;
+}
+
+impl<IU: InvertedUnsigned> TrimTrailingZeros for InvertedUInt<IU, B1> {
+    type Output = Self;
+}
+
+impl<IU: InvertedUnsigned> TrimTrailingZeros for InvertedUInt<IU, B0>
+where
+    IU: TrimTrailingZeros,
+{
+    type Output = <IU as TrimTrailingZeros>::Output;
+}
+
+impl<U: Unsigned> Trim for U
+where
+    U: Invert,
+    <U as Invert>::Output: TrimTrailingZeros,
+    <<U as Invert>::Output as TrimTrailingZeros>::Output: Invert,
+{
+    type Output = <<<U as Invert>::Output as TrimTrailingZeros>::Output as Invert>::Output;
+}
+
+// Note: Trimming is tested when we do subtraction.
+
+pub trait PrivateCmp<Rhs, SoFar> {
+    type Output;
+}
+pub type PrivateCmpOut<A, Rhs, SoFar> = <A as PrivateCmp<Rhs, SoFar>>::Output;
+
+// Set Bit
+pub trait PrivateSetBit<I, B> {
+    type Output;
+}
+pub type PrivateSetBitOut<N, I, B> = <N as PrivateSetBit<I, B>>::Output;
+
+// Div
+pub trait PrivateDiv<N, D, Q, R, I> {
+    type Quotient;
+    type Remainder;
+}
+
+pub type PrivateDivQuot<N, D, Q, R, I> = <() as PrivateDiv<N, D, Q, R, I>>::Quotient;
+pub type PrivateDivRem<N, D, Q, R, I> = <() as PrivateDiv<N, D, Q, R, I>>::Remainder;
+
+pub trait PrivateDivIf<N, D, Q, R, I, RcmpD> {
+    type Quotient;
+    type Remainder;
+}
+
+pub type PrivateDivIfQuot<N, D, Q, R, I, RcmpD> =
+    <() as PrivateDivIf<N, D, Q, R, I, RcmpD>>::Quotient;
+pub type PrivateDivIfRem<N, D, Q, R, I, RcmpD> =
+    <() as PrivateDivIf<N, D, Q, R, I, RcmpD>>::Remainder;
+
+// Div for signed ints
+pub trait PrivateDivInt<C, Divisor> {
+    type Output;
+}
+pub type PrivateDivIntOut<A, C, Divisor> = <A as PrivateDivInt<C, Divisor>>::Output;
+
+pub trait PrivateRem<URem, Divisor> {
+    type Output;
+}
+pub type PrivateRemOut<A, URem, Divisor> = <A as PrivateRem<URem, Divisor>>::Output;
+
+// min max
+pub trait PrivateMin<Rhs, CmpResult> {
+    type Output;
+    fn private_min(self, rhs: Rhs) -> Self::Output;
+}
+pub type PrivateMinOut<A, B, CmpResult> = <A as PrivateMin<B, CmpResult>>::Output;
+
+pub trait PrivateMax<Rhs, CmpResult> {
+    type Output;
+    fn private_max(self, rhs: Rhs) -> Self::Output;
+}
+pub type PrivateMaxOut<A, B, CmpResult> = <A as PrivateMax<B, CmpResult>>::Output;
+
+// Comparisons
+
+use {Equal, False, Greater, Less, True};
+
+pub trait IsLessPrivate<Rhs, Cmp> {
+    type Output: Bit;
+}
+
+impl<A, B> IsLessPrivate<B, Less> for A {
+    type Output = True;
+}
+impl<A, B> IsLessPrivate<B, Equal> for A {
+    type Output = False;
+}
+impl<A, B> IsLessPrivate<B, Greater> for A {
+    type Output = False;
+}
+
+pub trait IsEqualPrivate<Rhs, Cmp> {
+    type Output: Bit;
+}
+
+impl<A, B> IsEqualPrivate<B, Less> for A {
+    type Output = False;
+}
+impl<A, B> IsEqualPrivate<B, Equal> for A {
+    type Output = True;
+}
+impl<A, B> IsEqualPrivate<B, Greater> for A {
+    type Output = False;
+}
+
+pub trait IsGreaterPrivate<Rhs, Cmp> {
+    type Output: Bit;
+}
+
+impl<A, B> IsGreaterPrivate<B, Less> for A {
+    type Output = False;
+}
+impl<A, B> IsGreaterPrivate<B, Equal> for A {
+    type Output = False;
+}
+impl<A, B> IsGreaterPrivate<B, Greater> for A {
+    type Output = True;
+}
+
+pub trait IsLessOrEqualPrivate<Rhs, Cmp> {
+    type Output: Bit;
+}
+
+impl<A, B> IsLessOrEqualPrivate<B, Less> for A {
+    type Output = True;
+}
+impl<A, B> IsLessOrEqualPrivate<B, Equal> for A {
+    type Output = True;
+}
+impl<A, B> IsLessOrEqualPrivate<B, Greater> for A {
+    type Output = False;
+}
+
+pub trait IsNotEqualPrivate<Rhs, Cmp> {
+    type Output: Bit;
+}
+
+impl<A, B> IsNotEqualPrivate<B, Less> for A {
+    type Output = True;
+}
+impl<A, B> IsNotEqualPrivate<B, Equal> for A {
+    type Output = False;
+}
+impl<A, B> IsNotEqualPrivate<B, Greater> for A {
+    type Output = True;
+}
+
+pub trait IsGreaterOrEqualPrivate<Rhs, Cmp> {
+    type Output: Bit;
+}
+
+impl<A, B> IsGreaterOrEqualPrivate<B, Less> for A {
+    type Output = False;
+}
+impl<A, B> IsGreaterOrEqualPrivate<B, Equal> for A {
+    type Output = True;
+}
+impl<A, B> IsGreaterOrEqualPrivate<B, Greater> for A {
+    type Output = True;
+}
diff -Nru cargo-0.32.0/vendor/typenum/src/type_operators.rs cargo-0.33.0/vendor/typenum/src/type_operators.rs
--- cargo-0.32.0/vendor/typenum/src/type_operators.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/type_operators.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,500 @@
+//! Useful **type operators** that are not defined in `core::ops`.
+//!
+
+use {Bit, NInt, NonZero, PInt, UInt, UTerm, Unsigned, Z0};
+
+/// A **type operator** that ensures that `Rhs` is the same as `Self`, it is mainly useful
+/// for writing macros that can take arbitrary binary or unary operators.
+///
+/// `Same` is implemented generically for all types; it should never need to be implemented
+/// for anything else.
+///
+/// Note that Rust lazily evaluates types, so this will only fail for two different types if
+/// the `Output` is used.
+///
+/// # Example
+/// ```rust
+/// use typenum::{Same, U4, U5, Unsigned};
+///
+/// assert_eq!(<U5 as Same<U5>>::Output::to_u32(), 5);
+///
+/// // Only an error if we use it:
+/// # #[allow(dead_code)]
+/// type Undefined = <U5 as Same<U4>>::Output;
+/// // Compiler error:
+/// // Undefined::to_u32();
+/// ```
+pub trait Same<Rhs = Self> {
+    /// Should always be `Self`
+    type Output;
+}
+
+impl<T> Same<T> for T {
+    type Output = T;
+}
+
+/// A **type operator** that returns the absolute value.
+///
+/// # Example
+/// ```rust
+/// use typenum::{Abs, N5, Integer};
+///
+/// assert_eq!(<N5 as Abs>::Output::to_i32(), 5);
+/// ```
+pub trait Abs {
+    /// The absolute value.
+    type Output;
+}
+
+impl Abs for Z0 {
+    type Output = Z0;
+}
+
+impl<U: Unsigned + NonZero> Abs for PInt<U> {
+    type Output = Self;
+}
+
+impl<U: Unsigned + NonZero> Abs for NInt<U> {
+    type Output = PInt<U>;
+}
+
+/// A **type operator** that provides exponentiation by repeated squaring.
+///
+/// # Example
+/// ```rust
+/// use typenum::{Pow, N3, P3, Integer};
+///
+/// assert_eq!(<N3 as Pow<P3>>::Output::to_i32(), -27);
+/// ```
+pub trait Pow<Exp> {
+    /// The result of the exponentiation.
+    type Output;
+    /// This function isn't used in this crate, but may be useful for others.
+    /// It is implemented for primitives.
+    ///
+    /// # Example
+    /// ```rust
+    /// use typenum::{Pow, U3};
+    ///
+    /// let a = 7u32.powi(U3::new());
+    /// let b = 7u32.pow(3);
+    /// assert_eq!(a, b);
+    ///
+    /// let x = 3.0.powi(U3::new());
+    /// let y = 27.0;
+    /// assert_eq!(x, y);
+    /// ```
+    fn powi(self, exp: Exp) -> Self::Output;
+}
+
+macro_rules! impl_pow_f {
+    ($t: ty) => (
+        impl Pow<UTerm> for $t {
+            type Output = $t;
+            #[inline]
+            fn powi(self, _: UTerm) -> Self::Output {
+                1.0
+            }
+        }
+
+        impl<U: Unsigned, B: Bit> Pow<UInt<U, B>> for $t {
+            type Output = $t;
+            // powi is unstable in core, so we have to write this function ourselves.
+            // copied from num::pow::pow
+            #[inline]
+            fn powi(self, _: UInt<U, B>) -> Self::Output {
+                let mut exp = <UInt<U, B> as Unsigned>::to_u32();
+                let mut base = self;
+
+                if exp == 0 { return 1.0 }
+
+                while exp & 1 == 0 {
+                    base *= base;
+                    exp >>= 1;
+                }
+                if exp == 1 { return base }
+
+                let mut acc = base.clone();
+                while exp > 1 {
+                    exp >>= 1;
+                    base *= base;
+                    if exp & 1 == 1 {
+                        acc *= base.clone();
+                    }
+                }
+                acc
+            }
+        }
+
+        impl Pow<Z0> for $t {
+            type Output = $t;
+            #[inline]
+            fn powi(self, _: Z0) -> Self::Output {
+                1.0
+            }
+        }
+
+        impl<U: Unsigned + NonZero> Pow<PInt<U>> for $t {
+            type Output = $t;
+            // powi is unstable in core, so we have to write this function ourselves.
+            // copied from num::pow::pow
+            #[inline]
+            fn powi(self, _: PInt<U>) -> Self::Output {
+                let mut exp = U::to_u32();
+                let mut base = self;
+
+                if exp == 0 { return 1.0 }
+
+                while exp & 1 == 0 {
+                    base *= base;
+                    exp >>= 1;
+                }
+                if exp == 1 { return base }
+
+                let mut acc = base.clone();
+                while exp > 1 {
+                    exp >>= 1;
+                    base *= base;
+                    if exp & 1 == 1 {
+                        acc *= base.clone();
+                    }
+                }
+                acc
+            }
+        }
+    );
+}
+
+impl_pow_f!(f32);
+impl_pow_f!(f64);
+
+macro_rules! impl_pow_i {
+    () => ();
+    ($t: ty $(, $tail:tt)*) => (
+        impl Pow<UTerm> for $t {
+            type Output = $t;
+            #[inline]
+            fn powi(self, _: UTerm) -> Self::Output {
+                1
+            }
+        }
+
+        impl<U: Unsigned, B: Bit> Pow<UInt<U, B>> for $t {
+            type Output = $t;
+            #[inline]
+            fn powi(self, _: UInt<U, B>) -> Self::Output {
+                self.pow(<UInt<U, B> as Unsigned>::to_u32())
+            }
+        }
+
+        impl Pow<Z0> for $t {
+            type Output = $t;
+            #[inline]
+            fn powi(self, _: Z0) -> Self::Output {
+                1
+            }
+        }
+
+        impl<U: Unsigned + NonZero> Pow<PInt<U>> for $t {
+            type Output = $t;
+            #[inline]
+            fn powi(self, _: PInt<U>) -> Self::Output {
+                self.pow(U::to_u32())
+            }
+        }
+
+        impl_pow_i!($($tail),*);
+    );
+}
+
+impl_pow_i!(u8, u16, u32, u64, usize, i8, i16, i32, i64, isize);
+#[cfg(feature = "i128")]
+impl_pow_i!(u128, i128);
+
+#[test]
+fn pow_test() {
+    use consts::*;
+    let z0 = Z0::new();
+    let p3 = P3::new();
+
+    let u0 = U0::new();
+    let u3 = U3::new();
+
+    macro_rules! check {
+        ($x:ident) => (
+            assert_eq!($x.powi(z0), 1);
+            assert_eq!($x.powi(u0), 1);
+
+            assert_eq!($x.powi(p3), $x*$x*$x);
+            assert_eq!($x.powi(u3), $x*$x*$x);
+        );
+        ($x:ident, $f:ident) => (
+            assert!((<$f as Pow<Z0>>::powi(*$x, z0) - 1.0).abs() < ::core::$f::EPSILON);
+            assert!((<$f as Pow<U0>>::powi(*$x, u0) - 1.0).abs() < ::core::$f::EPSILON);
+
+            assert!((<$f as Pow<P3>>::powi(*$x, p3) - $x*$x*$x).abs() < ::core::$f::EPSILON);
+            assert!((<$f as Pow<U3>>::powi(*$x, u3) - $x*$x*$x).abs() < ::core::$f::EPSILON);
+        );
+    }
+
+    for x in &[0i8, -3, 2] {
+        check!(x);
+    }
+    for x in &[0u8, 1, 5] {
+        check!(x);
+    }
+    for x in &[0usize, 1, 5, 40] {
+        check!(x);
+    }
+    for x in &[0isize, 1, 2, -30, -22, 48] {
+        check!(x);
+    }
+    for x in &[0.0f32, 2.2, -3.5, 378.223] {
+        check!(x, f32);
+    }
+    for x in &[0.0f64, 2.2, -3.5, -2387.2, 234.22] {
+        check!(x, f64);
+    }
+}
+
+/// A **type operator** for comparing `Self` and `Rhs`. It provides a similar functionality to
+/// the function
+/// [`core::cmp::Ord::cmp`](https://doc.rust-lang.org/nightly/core/cmp/trait.Ord.html#tymethod.cmp)
+/// but for types.
+///
+/// # Example
+/// ```rust
+/// use typenum::{Cmp, Ord, N3, P2, P5};
+/// use std::cmp::Ordering;
+///
+/// assert_eq!(<P2 as Cmp<N3>>::Output::to_ordering(), Ordering::Greater);
+/// assert_eq!(<P2 as Cmp<P2>>::Output::to_ordering(), Ordering::Equal);
+/// assert_eq!(<P2 as Cmp<P5>>::Output::to_ordering(), Ordering::Less);
+pub trait Cmp<Rhs = Self> {
+    /// The result of the comparison. It should only ever be one of `Greater`, `Less`, or `Equal`.
+    type Output;
+}
+
+/// A **type operator** that gives the length of an `Array` or the number of bits in a `UInt`.
+pub trait Len {
+    /// The length as a type-level unsigned integer.
+    type Output: ::Unsigned;
+    /// This function isn't used in this crate, but may be useful for others.
+    fn len(&self) -> Self::Output;
+}
+
+/// Division as a partial function. This **type operator** performs division just as `Div`, but is
+/// only defined when the result is an integer (i.e. there is no remainder).
+pub trait PartialDiv<Rhs = Self> {
+    /// The type of the result of the division
+    type Output;
+    /// Method for performing the division
+    fn partial_div(self, _: Rhs) -> Self::Output;
+}
+
+/// A **type operator** that returns the minimum of `Self` and `Rhs`.
+pub trait Min<Rhs = Self> {
+    /// The type of the minimum of `Self` and `Rhs`
+    type Output;
+    /// Method returning the minimum
+    fn min(self, rhs: Rhs) -> Self::Output;
+}
+
+/// A **type operator** that returns the maximum of `Self` and `Rhs`.
+pub trait Max<Rhs = Self> {
+    /// The type of the maximum of `Self` and `Rhs`
+    type Output;
+    /// Method returning the maximum
+    fn max(self, rhs: Rhs) -> Self::Output;
+}
+
+use Compare;
+
+/// A **type operator** that returns `True` if `Self < Rhs`, otherwise returns `False`.
+pub trait IsLess<Rhs = Self> {
+    /// The type representing either `True` or `False`
+    type Output: Bit;
+    /// Method returning `True` or `False`.
+    fn is_less(self, rhs: Rhs) -> Self::Output;
+}
+
+use private::IsLessPrivate;
+impl<A, B> IsLess<B> for A
+where
+    A: Cmp<B> + IsLessPrivate<B, Compare<A, B>>,
+{
+    type Output = <A as IsLessPrivate<B, Compare<A, B>>>::Output;
+
+    fn is_less(self, _: B) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// A **type operator** that returns `True` if `Self == Rhs`, otherwise returns `False`.
+pub trait IsEqual<Rhs = Self> {
+    /// The type representing either `True` or `False`
+    type Output: Bit;
+    /// Method returning `True` or `False`.
+    fn is_equal(self, rhs: Rhs) -> Self::Output;
+}
+
+use private::IsEqualPrivate;
+impl<A, B> IsEqual<B> for A
+where
+    A: Cmp<B> + IsEqualPrivate<B, Compare<A, B>>,
+{
+    type Output = <A as IsEqualPrivate<B, Compare<A, B>>>::Output;
+
+    fn is_equal(self, _: B) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// A **type operator** that returns `True` if `Self > Rhs`, otherwise returns `False`.
+pub trait IsGreater<Rhs = Self> {
+    /// The type representing either `True` or `False`
+    type Output: Bit;
+    /// Method returning `True` or `False`.
+    fn is_greater(self, rhs: Rhs) -> Self::Output;
+}
+
+use private::IsGreaterPrivate;
+impl<A, B> IsGreater<B> for A
+where
+    A: Cmp<B> + IsGreaterPrivate<B, Compare<A, B>>,
+{
+    type Output = <A as IsGreaterPrivate<B, Compare<A, B>>>::Output;
+
+    fn is_greater(self, _: B) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// A **type operator** that returns `True` if `Self <= Rhs`, otherwise returns `False`.
+pub trait IsLessOrEqual<Rhs = Self> {
+    /// The type representing either `True` or `False`
+    type Output: Bit;
+    /// Method returning `True` or `False`.
+    fn is_less_or_equal(self, rhs: Rhs) -> Self::Output;
+}
+
+use private::IsLessOrEqualPrivate;
+impl<A, B> IsLessOrEqual<B> for A
+where
+    A: Cmp<B> + IsLessOrEqualPrivate<B, Compare<A, B>>,
+{
+    type Output = <A as IsLessOrEqualPrivate<B, Compare<A, B>>>::Output;
+
+    fn is_less_or_equal(self, _: B) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// A **type operator** that returns `True` if `Self != Rhs`, otherwise returns `False`.
+pub trait IsNotEqual<Rhs = Self> {
+    /// The type representing either `True` or `False`
+    type Output: Bit;
+    /// Method returning `True` or `False`.
+    fn is_not_equal(self, rhs: Rhs) -> Self::Output;
+}
+
+use private::IsNotEqualPrivate;
+impl<A, B> IsNotEqual<B> for A
+where
+    A: Cmp<B> + IsNotEqualPrivate<B, Compare<A, B>>,
+{
+    type Output = <A as IsNotEqualPrivate<B, Compare<A, B>>>::Output;
+
+    fn is_not_equal(self, _: B) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// A **type operator** that returns `True` if `Self >= Rhs`, otherwise returns `False`.
+pub trait IsGreaterOrEqual<Rhs = Self> {
+    /// The type representing either `True` or `False`
+    type Output: Bit;
+    /// Method returning `True` or `False`.
+    fn is_greater_or_equal(self, rhs: Rhs) -> Self::Output;
+}
+
+use private::IsGreaterOrEqualPrivate;
+impl<A, B> IsGreaterOrEqual<B> for A
+where
+    A: Cmp<B> + IsGreaterOrEqualPrivate<B, Compare<A, B>>,
+{
+    type Output = <A as IsGreaterOrEqualPrivate<B, Compare<A, B>>>::Output;
+
+    fn is_greater_or_equal(self, _: B) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/**
+A convenience macro for comparing type numbers. Use `op!` instead.
+
+Due to the intricacies of the macro system, if the left-hand operand is more complex than a simple
+`ident`, you must place a comma between it and the comparison sign.
+
+For example, you can do `cmp!(P5 > P3)` or `cmp!(typenum::P5, > typenum::P3)` but not
+`cmp!(typenum::P5 > typenum::P3)`.
+
+The result of this comparison will always be one of `True` (aka `B1`) or `False` (aka `B0`).
+
+# Example
+```rust
+#[macro_use] extern crate typenum;
+use typenum::consts::*;
+use typenum::Bit;
+
+fn main() {
+type Result = cmp!(P9 == op!(P1 + P2 * (P2 - N2)));
+assert_eq!(Result::to_bool(), true);
+}
+```
+ */
+#[deprecated(since = "1.9.0", note = "use the `op!` macro instead")]
+#[macro_export]
+macro_rules! cmp {
+    ($a:ident < $b:ty) => (
+        <$a as $crate::IsLess<$b>>::Output
+    );
+    ($a:ty, < $b:ty) => (
+        <$a as $crate::IsLess<$b>>::Output
+    );
+
+    ($a:ident == $b:ty) => (
+        <$a as $crate::IsEqual<$b>>::Output
+    );
+    ($a:ty, == $b:ty) => (
+        <$a as $crate::IsEqual<$b>>::Output
+    );
+
+    ($a:ident > $b:ty) => (
+        <$a as $crate::IsGreater<$b>>::Output
+    );
+    ($a:ty, > $b:ty) => (
+        <$a as $crate::IsGreater<$b>>::Output
+    );
+
+    ($a:ident <= $b:ty) => (
+        <$a as $crate::IsLessOrEqual<$b>>::Output
+    );
+    ($a:ty, <= $b:ty) => (
+        <$a as $crate::IsLessOrEqual<$b>>::Output
+    );
+
+    ($a:ident != $b:ty) => (
+        <$a as $crate::IsNotEqual<$b>>::Output
+    );
+    ($a:ty, != $b:ty) => (
+        <$a as $crate::IsNotEqual<$b>>::Output
+    );
+
+    ($a:ident >= $b:ty) => (
+        <$a as $crate::IsGreaterOrEqual<$b>>::Output
+    );
+    ($a:ty, >= $b:ty) => (
+        <$a as $crate::IsGreaterOrEqual<$b>>::Output
+    );
+}
diff -Nru cargo-0.32.0/vendor/typenum/src/uint.rs cargo-0.33.0/vendor/typenum/src/uint.rs
--- cargo-0.32.0/vendor/typenum/src/uint.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/src/uint.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,1572 @@
+//! Type-level unsigned integers.
+//!
+//!
+//! **Type operators** implemented:
+//!
+//! From `core::ops`: `BitAnd`, `BitOr`, `BitXor`, `Shl`, `Shr`, `Add`, `Sub`,
+//!                 `Mul`, `Div`, and `Rem`.
+//! From `typenum`: `Same`, `Cmp`, and `Pow`.
+//!
+//! Rather than directly using the structs defined in this module, it is recommended that
+//! you import and use the relevant aliases from the [consts](../consts/index.html) module.
+//!
+//! # Example
+//! ```rust
+//! use std::ops::{BitAnd, BitOr, BitXor, Shl, Shr, Add, Sub, Mul, Div, Rem};
+//! use typenum::{Unsigned, U1, U2, U3, U4};
+//!
+//! assert_eq!(<U3 as BitAnd<U2>>::Output::to_u32(), 2);
+//! assert_eq!(<U3 as BitOr<U4>>::Output::to_u32(), 7);
+//! assert_eq!(<U3 as BitXor<U2>>::Output::to_u32(), 1);
+//! assert_eq!(<U3 as Shl<U1>>::Output::to_u32(), 6);
+//! assert_eq!(<U3 as Shr<U1>>::Output::to_u32(), 1);
+//! assert_eq!(<U3 as Add<U2>>::Output::to_u32(), 5);
+//! assert_eq!(<U3 as Sub<U2>>::Output::to_u32(), 1);
+//! assert_eq!(<U3 as Mul<U2>>::Output::to_u32(), 6);
+//! assert_eq!(<U3 as Div<U2>>::Output::to_u32(), 1);
+//! assert_eq!(<U3 as Rem<U2>>::Output::to_u32(), 1);
+//! ```
+//!
+
+use core::ops::{Add, BitAnd, BitOr, BitXor, Mul, Shl, Shr, Sub};
+use core::marker::PhantomData;
+use {Cmp, Equal, Greater, Len, Less, NonZero, Ord, Pow};
+
+use bit::{B0, B1, Bit};
+
+use private::{BitDiff, PrivateAnd, PrivateCmp, PrivatePow, PrivateSub, PrivateXor, Trim};
+
+use private::{BitDiffOut, PrivateAndOut, PrivateCmpOut, PrivatePowOut, PrivateSubOut,
+              PrivateXorOut, TrimOut};
+
+use consts::{U0, U1};
+use {Add1, Length, Or, Prod, Shleft, Shright, Square, Sub1, Sum};
+
+pub use marker_traits::{PowerOfTwo, Unsigned};
+
+/// The terminating type for `UInt`; it always comes after the most significant
+/// bit. `UTerm` by itself represents zero, which is aliased to `U0`.
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct UTerm;
+
+impl UTerm {
+    /// Instantiates a singleton representing this unsigned integer.
+    #[inline]
+    pub fn new() -> UTerm {
+        UTerm
+    }
+}
+
+impl Unsigned for UTerm {
+    const U8: u8 = 0;
+    const U16: u16 = 0;
+    const U32: u32 = 0;
+    const U64: u64 = 0;
+    #[cfg(feature = "i128")]
+    const U128: u128 = 0;
+    const USIZE: usize = 0;
+
+    const I8: i8 = 0;
+    const I16: i16 = 0;
+    const I32: i32 = 0;
+    const I64: i64 = 0;
+    #[cfg(feature = "i128")]
+    const I128: i128 = 0;
+    const ISIZE: isize = 0;
+
+    #[inline]
+    fn to_u8() -> u8 {
+        0
+    }
+    #[inline]
+    fn to_u16() -> u16 {
+        0
+    }
+    #[inline]
+    fn to_u32() -> u32 {
+        0
+    }
+    #[inline]
+    fn to_u64() -> u64 {
+        0
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_u128() -> u128 {
+        0
+    }
+    #[inline]
+    fn to_usize() -> usize {
+        0
+    }
+
+    #[inline]
+    fn to_i8() -> i8 {
+        0
+    }
+    #[inline]
+    fn to_i16() -> i16 {
+        0
+    }
+    #[inline]
+    fn to_i32() -> i32 {
+        0
+    }
+    #[inline]
+    fn to_i64() -> i64 {
+        0
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_i128() -> i128 {
+        0
+    }
+    #[inline]
+    fn to_isize() -> isize {
+        0
+    }
+}
+
+/// `UInt` is defined recursively, where `B` is the least significant bit and `U` is the rest
+/// of the number. Conceptually, `U` should be bound by the trait `Unsigned` and `B` should
+/// be bound by the trait `Bit`, but enforcing these bounds causes linear instead of
+/// logrithmic scaling in some places, so they are left off for now. They may be enforced in
+/// future.
+///
+/// In order to keep numbers unique, leading zeros are not allowed, so `UInt<UTerm, B0>` is
+/// forbidden.
+///
+/// # Example
+/// ```rust
+/// use typenum::{B0, B1, UInt, UTerm};
+///
+/// # #[allow(dead_code)]
+/// type U6 = UInt<UInt<UInt<UTerm, B1>, B1>, B0>;
+/// ```
+#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
+pub struct UInt<U, B> {
+    _marker: PhantomData<(U, B)>,
+}
+
+impl<U: Unsigned, B: Bit> UInt<U, B> {
+    /// Instantiates a singleton representing this unsigned integer.
+    #[inline]
+    pub fn new() -> UInt<U, B> {
+        UInt {
+            _marker: PhantomData,
+        }
+    }
+}
+
+impl<U: Unsigned, B: Bit> Unsigned for UInt<U, B> {
+    const U8: u8 = B::U8 | U::U8 << 1;
+    const U16: u16 = B::U8 as u16 | U::U16 << 1;
+    const U32: u32 = B::U8 as u32 | U::U32 << 1;
+    const U64: u64 = B::U8 as u64 | U::U64 << 1;
+    #[cfg(feature = "i128")]
+    const U128: u128 = B::U8 as u128 | U::U128 << 1;
+    const USIZE: usize = B::U8 as usize | U::USIZE << 1;
+
+    const I8: i8 = B::U8 as i8 | U::I8 << 1;
+    const I16: i16 = B::U8 as i16 | U::I16 << 1;
+    const I32: i32 = B::U8 as i32 | U::I32 << 1;
+    const I64: i64 = B::U8 as i64 | U::I64 << 1;
+    #[cfg(feature = "i128")]
+    const I128: i128 = B::U8 as i128 | U::I128 << 1;
+    const ISIZE: isize = B::U8 as isize | U::ISIZE << 1;
+
+    #[inline]
+    fn to_u8() -> u8 {
+        B::to_u8() | U::to_u8() << 1
+    }
+    #[inline]
+    fn to_u16() -> u16 {
+        u16::from(B::to_u8()) | U::to_u16() << 1
+    }
+    #[inline]
+    fn to_u32() -> u32 {
+        u32::from(B::to_u8()) | U::to_u32() << 1
+    }
+    #[inline]
+    fn to_u64() -> u64 {
+        u64::from(B::to_u8()) | U::to_u64() << 1
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_u128() -> u128 {
+        u128::from(B::to_u8()) | U::to_u128() << 1
+    }
+    #[inline]
+    fn to_usize() -> usize {
+        usize::from(B::to_u8()) | U::to_usize() << 1
+    }
+
+    #[inline]
+    fn to_i8() -> i8 {
+        B::to_u8() as i8 | U::to_i8() << 1
+    }
+    #[inline]
+    fn to_i16() -> i16 {
+        i16::from(B::to_u8()) | U::to_i16() << 1
+    }
+    #[inline]
+    fn to_i32() -> i32 {
+        i32::from(B::to_u8()) | U::to_i32() << 1
+    }
+    #[inline]
+    fn to_i64() -> i64 {
+        i64::from(B::to_u8()) | U::to_i64() << 1
+    }
+    #[cfg(feature = "i128")]
+    #[inline]
+    fn to_i128() -> i128 {
+        i128::from(B::to_u8()) | U::to_i128() << 1
+    }
+    #[inline]
+    fn to_isize() -> isize {
+        B::to_u8() as isize | U::to_isize() << 1
+    }
+}
+
+impl<U: Unsigned, B: Bit> NonZero for UInt<U, B> {}
+
+impl PowerOfTwo for UInt<UTerm, B1> {}
+impl<U: Unsigned + PowerOfTwo> PowerOfTwo for UInt<U, B0> {}
+
+// ---------------------------------------------------------------------------------------
+// Getting length of unsigned integers, which is defined as the number of bits before `UTerm`
+
+/// Length of `UTerm` by itself is 0
+impl Len for UTerm {
+    type Output = U0;
+    fn len(&self) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Length of a bit is 1
+impl<U: Unsigned, B: Bit> Len for UInt<U, B>
+where
+    U: Len,
+    Length<U>: Add<B1>,
+    Add1<Length<U>>: Unsigned,
+{
+    type Output = Add1<Length<U>>;
+    fn len(&self) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Adding bits to unsigned integers
+
+/// `UTerm + B0 = UTerm`
+impl Add<B0> for UTerm {
+    type Output = UTerm;
+    fn add(self, _: B0) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `U + B0 = U`
+impl<U: Unsigned, B: Bit> Add<B0> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn add(self, _: B0) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UTerm + B1 = UInt<UTerm, B1>`
+impl Add<B1> for UTerm {
+    type Output = UInt<UTerm, B1>;
+    fn add(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<U, B0> + B1 = UInt<U + B1>`
+impl<U: Unsigned> Add<B1> for UInt<U, B0> {
+    type Output = UInt<U, B1>;
+    fn add(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<U, B1> + B1 = UInt<U + B1, B0>`
+impl<U: Unsigned> Add<B1> for UInt<U, B1>
+where
+    U: Add<B1>,
+    Add1<U>: Unsigned,
+{
+    type Output = UInt<Add1<U>, B0>;
+    fn add(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Adding unsigned integers
+
+/// `UTerm + U = U`
+impl<U: Unsigned> Add<U> for UTerm {
+    type Output = U;
+    fn add(self, _: U) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<U, B> + UTerm = UInt<U, B>`
+impl<U: Unsigned, B: Bit> Add<UTerm> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn add(self, _: UTerm) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<Ul, B0> + UInt<Ur, B0> = UInt<Ul + Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> Add<UInt<Ur, B0>> for UInt<Ul, B0>
+where
+    Ul: Add<Ur>,
+{
+    type Output = UInt<Sum<Ul, Ur>, B0>;
+    fn add(self, _: UInt<Ur, B0>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B0> + UInt<Ur, B1> = UInt<Ul + Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> Add<UInt<Ur, B1>> for UInt<Ul, B0>
+where
+    Ul: Add<Ur>,
+{
+    type Output = UInt<Sum<Ul, Ur>, B1>;
+    fn add(self, _: UInt<Ur, B1>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B1> + UInt<Ur, B0> = UInt<Ul + Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> Add<UInt<Ur, B0>> for UInt<Ul, B1>
+where
+    Ul: Add<Ur>,
+{
+    type Output = UInt<Sum<Ul, Ur>, B1>;
+    fn add(self, _: UInt<Ur, B0>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B1> + UInt<Ur, B1> = UInt<(Ul + Ur) + B1, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> Add<UInt<Ur, B1>> for UInt<Ul, B1>
+where
+    Ul: Add<Ur>,
+    Sum<Ul, Ur>: Add<B1>,
+{
+    type Output = UInt<Add1<Sum<Ul, Ur>>, B0>;
+    fn add(self, _: UInt<Ur, B1>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Subtracting bits from unsigned integers
+
+/// `UTerm - B0 = Term`
+impl Sub<B0> for UTerm {
+    type Output = UTerm;
+    fn sub(self, _: B0) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UInt - B0 = UInt`
+impl<U: Unsigned, B: Bit> Sub<B0> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn sub(self, _: B0) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<U, B1> - B1 = UInt<U, B0>`
+impl<U: Unsigned, B: Bit> Sub<B1> for UInt<UInt<U, B>, B1> {
+    type Output = UInt<UInt<U, B>, B0>;
+    fn sub(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<UTerm, B1> - B1 = UTerm`
+impl Sub<B1> for UInt<UTerm, B1> {
+    type Output = UTerm;
+    fn sub(self, _: B1) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UInt<U, B0> - B1 = UInt<U - B1, B1>`
+impl<U: Unsigned> Sub<B1> for UInt<U, B0>
+where
+    U: Sub<B1>,
+    Sub1<U>: Unsigned,
+{
+    type Output = UInt<Sub1<U>, B1>;
+    fn sub(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Subtracting unsigned integers
+
+/// `UTerm - UTerm = UTerm`
+impl Sub<UTerm> for UTerm {
+    type Output = UTerm;
+    fn sub(self, _: UTerm) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Subtracting unsigned integers. We just do our `PrivateSub` and then `Trim` the output.
+impl<Ul: Unsigned, Bl: Bit, Ur: Unsigned> Sub<Ur> for UInt<Ul, Bl>
+where
+    UInt<Ul, Bl>: PrivateSub<Ur>,
+    PrivateSubOut<UInt<Ul, Bl>, Ur>: Trim,
+{
+    type Output = TrimOut<PrivateSubOut<UInt<Ul, Bl>, Ur>>;
+    fn sub(self, _: Ur) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `U - UTerm = U`
+impl<U: Unsigned> PrivateSub<UTerm> for U {
+    type Output = U;
+}
+
+/// `UInt<Ul, B0> - UInt<Ur, B0> = UInt<Ul - Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateSub<UInt<Ur, B0>> for UInt<Ul, B0>
+where
+    Ul: PrivateSub<Ur>,
+{
+    type Output = UInt<PrivateSubOut<Ul, Ur>, B0>;
+}
+
+/// `UInt<Ul, B0> - UInt<Ur, B1> = UInt<(Ul - Ur) - B1, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateSub<UInt<Ur, B1>> for UInt<Ul, B0>
+where
+    Ul: PrivateSub<Ur>,
+    PrivateSubOut<Ul, Ur>: Sub<B1>,
+{
+    type Output = UInt<Sub1<PrivateSubOut<Ul, Ur>>, B1>;
+}
+
+/// `UInt<Ul, B1> - UInt<Ur, B0> = UInt<Ul - Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateSub<UInt<Ur, B0>> for UInt<Ul, B1>
+where
+    Ul: PrivateSub<Ur>,
+{
+    type Output = UInt<PrivateSubOut<Ul, Ur>, B1>;
+}
+
+/// `UInt<Ul, B1> - UInt<Ur, B1> = UInt<Ul - Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateSub<UInt<Ur, B1>> for UInt<Ul, B1>
+where
+    Ul: PrivateSub<Ur>,
+{
+    type Output = UInt<PrivateSubOut<Ul, Ur>, B0>;
+}
+
+// ---------------------------------------------------------------------------------------
+// And unsigned integers
+
+/// 0 & X = 0
+impl<Ur: Unsigned> BitAnd<Ur> for UTerm {
+    type Output = UTerm;
+    fn bitand(self, _: Ur) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Anding unsigned integers.
+/// We use our `PrivateAnd` operator and then `Trim` the output.
+impl<Ul: Unsigned, Bl: Bit, Ur: Unsigned> BitAnd<Ur> for UInt<Ul, Bl>
+where
+    UInt<Ul, Bl>: PrivateAnd<Ur>,
+    PrivateAndOut<UInt<Ul, Bl>, Ur>: Trim,
+{
+    type Output = TrimOut<PrivateAndOut<UInt<Ul, Bl>, Ur>>;
+    fn bitand(self, _: Ur) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UTerm & X = UTerm`
+impl<U: Unsigned> PrivateAnd<U> for UTerm {
+    type Output = UTerm;
+}
+
+/// `X & UTerm = UTerm`
+impl<B: Bit, U: Unsigned> PrivateAnd<UTerm> for UInt<U, B> {
+    type Output = UTerm;
+}
+
+/// `UInt<Ul, B0> & UInt<Ur, B0> = UInt<Ul & Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateAnd<UInt<Ur, B0>> for UInt<Ul, B0>
+where
+    Ul: PrivateAnd<Ur>,
+{
+    type Output = UInt<PrivateAndOut<Ul, Ur>, B0>;
+}
+
+/// `UInt<Ul, B0> & UInt<Ur, B1> = UInt<Ul & Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateAnd<UInt<Ur, B1>> for UInt<Ul, B0>
+where
+    Ul: PrivateAnd<Ur>,
+{
+    type Output = UInt<PrivateAndOut<Ul, Ur>, B0>;
+}
+
+/// `UInt<Ul, B1> & UInt<Ur, B0> = UInt<Ul & Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateAnd<UInt<Ur, B0>> for UInt<Ul, B1>
+where
+    Ul: PrivateAnd<Ur>,
+{
+    type Output = UInt<PrivateAndOut<Ul, Ur>, B0>;
+}
+
+/// `UInt<Ul, B1> & UInt<Ur, B1> = UInt<Ul & Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateAnd<UInt<Ur, B1>> for UInt<Ul, B1>
+where
+    Ul: PrivateAnd<Ur>,
+{
+    type Output = UInt<PrivateAndOut<Ul, Ur>, B1>;
+}
+
+// ---------------------------------------------------------------------------------------
+// Or unsigned integers
+
+/// `UTerm | X = X`
+impl<U: Unsigned> BitOr<U> for UTerm {
+    type Output = U;
+    fn bitor(self, _: U) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+///  `X | UTerm = X`
+impl<B: Bit, U: Unsigned> BitOr<UTerm> for UInt<U, B> {
+    type Output = Self;
+    fn bitor(self, _: UTerm) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<Ul, B0> | UInt<Ur, B0> = UInt<Ul | Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> BitOr<UInt<Ur, B0>> for UInt<Ul, B0>
+where
+    Ul: BitOr<Ur>,
+{
+    type Output = UInt<<Ul as BitOr<Ur>>::Output, B0>;
+    fn bitor(self, _: UInt<Ur, B0>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B0> | UInt<Ur, B1> = UInt<Ul | Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> BitOr<UInt<Ur, B1>> for UInt<Ul, B0>
+where
+    Ul: BitOr<Ur>,
+{
+    type Output = UInt<Or<Ul, Ur>, B1>;
+    fn bitor(self, _: UInt<Ur, B1>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B1> | UInt<Ur, B0> = UInt<Ul | Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> BitOr<UInt<Ur, B0>> for UInt<Ul, B1>
+where
+    Ul: BitOr<Ur>,
+{
+    type Output = UInt<Or<Ul, Ur>, B1>;
+    fn bitor(self, _: UInt<Ur, B0>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B1> | UInt<Ur, B1> = UInt<Ul | Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> BitOr<UInt<Ur, B1>> for UInt<Ul, B1>
+where
+    Ul: BitOr<Ur>,
+{
+    type Output = UInt<Or<Ul, Ur>, B1>;
+    fn bitor(self, _: UInt<Ur, B1>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Xor unsigned integers
+
+/// 0 ^ X = X
+impl<Ur: Unsigned> BitXor<Ur> for UTerm {
+    type Output = Ur;
+    fn bitxor(self, _: Ur) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// Xoring unsigned integers.
+/// We use our `PrivateXor` operator and then `Trim` the output.
+impl<Ul: Unsigned, Bl: Bit, Ur: Unsigned> BitXor<Ur> for UInt<Ul, Bl>
+where
+    UInt<Ul, Bl>: PrivateXor<Ur>,
+    PrivateXorOut<UInt<Ul, Bl>, Ur>: Trim,
+{
+    type Output = TrimOut<PrivateXorOut<UInt<Ul, Bl>, Ur>>;
+    fn bitxor(self, _: Ur) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UTerm ^ X = X`
+impl<U: Unsigned> PrivateXor<U> for UTerm {
+    type Output = U;
+}
+
+/// `X ^ UTerm = X`
+impl<B: Bit, U: Unsigned> PrivateXor<UTerm> for UInt<U, B> {
+    type Output = Self;
+}
+
+/// `UInt<Ul, B0> ^ UInt<Ur, B0> = UInt<Ul ^ Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateXor<UInt<Ur, B0>> for UInt<Ul, B0>
+where
+    Ul: PrivateXor<Ur>,
+{
+    type Output = UInt<PrivateXorOut<Ul, Ur>, B0>;
+}
+
+/// `UInt<Ul, B0> ^ UInt<Ur, B1> = UInt<Ul ^ Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateXor<UInt<Ur, B1>> for UInt<Ul, B0>
+where
+    Ul: PrivateXor<Ur>,
+{
+    type Output = UInt<PrivateXorOut<Ul, Ur>, B1>;
+}
+
+/// `UInt<Ul, B1> ^ UInt<Ur, B0> = UInt<Ul ^ Ur, B1>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateXor<UInt<Ur, B0>> for UInt<Ul, B1>
+where
+    Ul: PrivateXor<Ur>,
+{
+    type Output = UInt<PrivateXorOut<Ul, Ur>, B1>;
+}
+
+/// `UInt<Ul, B1> ^ UInt<Ur, B1> = UInt<Ul ^ Ur, B0>`
+impl<Ul: Unsigned, Ur: Unsigned> PrivateXor<UInt<Ur, B1>> for UInt<Ul, B1>
+where
+    Ul: PrivateXor<Ur>,
+{
+    type Output = UInt<PrivateXorOut<Ul, Ur>, B0>;
+}
+
+// ---------------------------------------------------------------------------------------
+// Shl unsigned integers
+
+/// Shifting `UTerm` by a 0 bit: `UTerm << B0 = UTerm`
+impl Shl<B0> for UTerm {
+    type Output = UTerm;
+    fn shl(self, _: B0) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Shifting `UTerm` by a 1 bit: `UTerm << B1 = UTerm`
+impl Shl<B1> for UTerm {
+    type Output = UTerm;
+    fn shl(self, _: B1) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Shifting left any unsigned by a zero bit: `U << B0 = U`
+impl<U: Unsigned, B: Bit> Shl<B0> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn shl(self, _: B0) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// Shifting left a `UInt` by a one bit: `UInt<U, B> << B1 = UInt<UInt<U, B>, B0>`
+impl<U: Unsigned, B: Bit> Shl<B1> for UInt<U, B> {
+    type Output = UInt<UInt<U, B>, B0>;
+    fn shl(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// Shifting left `UInt` by `UTerm`: `UInt<U, B> << UTerm = UInt<U, B>`
+impl<U: Unsigned, B: Bit> Shl<UTerm> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn shl(self, _: UTerm) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// Shifting left `UTerm` by an unsigned integer: `UTerm << U = UTerm`
+impl<U: Unsigned> Shl<U> for UTerm {
+    type Output = UTerm;
+    fn shl(self, _: U) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Shifting left `UInt` by `UInt`: `X << Y` = `UInt(X, B0) << (Y - 1)`
+impl<U: Unsigned, B: Bit, Ur: Unsigned, Br: Bit> Shl<UInt<Ur, Br>> for UInt<U, B>
+where
+    UInt<Ur, Br>: Sub<B1>,
+    UInt<UInt<U, B>, B0>: Shl<Sub1<UInt<Ur, Br>>>,
+{
+    type Output = Shleft<UInt<UInt<U, B>, B0>, Sub1<UInt<Ur, Br>>>;
+    fn shl(self, _: UInt<Ur, Br>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Shr unsigned integers
+
+/// Shifting right a `UTerm` by an unsigned integer: `UTerm >> U = UTerm`
+impl<U: Unsigned> Shr<U> for UTerm {
+    type Output = UTerm;
+    fn shr(self, _: U) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Shifting right `UInt` by `UTerm`: `UInt<U, B> >> UTerm = UInt<U, B>`
+impl<U: Unsigned, B: Bit> Shr<UTerm> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn shr(self, _: UTerm) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// Shifting right `UTerm` by a 0 bit: `UTerm >> B0 = UTerm`
+impl Shr<B0> for UTerm {
+    type Output = UTerm;
+    fn shr(self, _: B0) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Shifting right `UTerm` by a 1 bit: `UTerm >> B1 = UTerm`
+impl Shr<B1> for UTerm {
+    type Output = UTerm;
+    fn shr(self, _: B1) -> Self::Output {
+        UTerm
+    }
+}
+
+/// Shifting right any unsigned by a zero bit: `U >> B0 = U`
+impl<U: Unsigned, B: Bit> Shr<B0> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn shr(self, _: B0) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// Shifting right a `UInt` by a 1 bit: `UInt<U, B> >> B1 = U`
+impl<U: Unsigned, B: Bit> Shr<B1> for UInt<U, B> {
+    type Output = U;
+    fn shr(self, _: B1) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// Shifting right `UInt` by `UInt`: `UInt(U, B) >> Y` = `U >> (Y - 1)`
+impl<U: Unsigned, B: Bit, Ur: Unsigned, Br: Bit> Shr<UInt<Ur, Br>> for UInt<U, B>
+where
+    UInt<Ur, Br>: Sub<B1>,
+    U: Shr<Sub1<UInt<Ur, Br>>>,
+{
+    type Output = Shright<U, Sub1<UInt<Ur, Br>>>;
+    fn shr(self, _: UInt<Ur, Br>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Multiply unsigned integers
+
+/// `UInt * B0 = UTerm`
+impl<U: Unsigned, B: Bit> Mul<B0> for UInt<U, B> {
+    type Output = UTerm;
+    fn mul(self, _: B0) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UTerm * B0 = UTerm`
+impl Mul<B0> for UTerm {
+    type Output = UTerm;
+    fn mul(self, _: B0) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UTerm * B1 = UTerm`
+impl Mul<B1> for UTerm {
+    type Output = UTerm;
+    fn mul(self, _: B1) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UInt * B1 = UInt`
+impl<U: Unsigned, B: Bit> Mul<B1> for UInt<U, B> {
+    type Output = UInt<U, B>;
+    fn mul(self, _: B1) -> Self::Output {
+        UInt::new()
+    }
+}
+
+/// `UInt<U, B> * UTerm = UTerm`
+impl<U: Unsigned, B: Bit> Mul<UTerm> for UInt<U, B> {
+    type Output = UTerm;
+    fn mul(self, _: UTerm) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UTerm * U = UTerm`
+impl<U: Unsigned> Mul<U> for UTerm {
+    type Output = UTerm;
+    fn mul(self, _: U) -> Self::Output {
+        UTerm
+    }
+}
+
+/// `UInt<Ul, B0> * UInt<Ur, B> = UInt<(Ul * UInt<Ur, B>), B0>`
+impl<Ul: Unsigned, B: Bit, Ur: Unsigned> Mul<UInt<Ur, B>> for UInt<Ul, B0>
+where
+    Ul: Mul<UInt<Ur, B>>,
+{
+    type Output = UInt<Prod<Ul, UInt<Ur, B>>, B0>;
+    fn mul(self, _: UInt<Ur, B>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+/// `UInt<Ul, B1> * UInt<Ur, B> = UInt<(Ul * UInt<Ur, B>), B0> + UInt<Ur, B>`
+impl<Ul: Unsigned, B: Bit, Ur: Unsigned> Mul<UInt<Ur, B>> for UInt<Ul, B1>
+where
+    Ul: Mul<UInt<Ur, B>>,
+    UInt<Prod<Ul, UInt<Ur, B>>, B0>: Add<UInt<Ur, B>>,
+{
+    type Output = Sum<UInt<Prod<Ul, UInt<Ur, B>>, B0>, UInt<Ur, B>>;
+    fn mul(self, _: UInt<Ur, B>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Compare unsigned integers
+
+/// Zero == Zero
+impl Cmp<UTerm> for UTerm {
+    type Output = Equal;
+}
+
+/// Nonzero > Zero
+impl<U: Unsigned, B: Bit> Cmp<UTerm> for UInt<U, B> {
+    type Output = Greater;
+}
+
+/// Zero < Nonzero
+impl<U: Unsigned, B: Bit> Cmp<UInt<U, B>> for UTerm {
+    type Output = Less;
+}
+
+/// `UInt<Ul, B0>` cmp with `UInt<Ur, B0>`: `SoFar` is `Equal`
+impl<Ul: Unsigned, Ur: Unsigned> Cmp<UInt<Ur, B0>> for UInt<Ul, B0>
+where
+    Ul: PrivateCmp<Ur, Equal>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, Equal>;
+}
+
+/// `UInt<Ul, B1>` cmp with `UInt<Ur, B1>`: `SoFar` is `Equal`
+impl<Ul: Unsigned, Ur: Unsigned> Cmp<UInt<Ur, B1>> for UInt<Ul, B1>
+where
+    Ul: PrivateCmp<Ur, Equal>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, Equal>;
+}
+
+/// `UInt<Ul, B0>` cmp with `UInt<Ur, B1>`: `SoFar` is `Less`
+impl<Ul: Unsigned, Ur: Unsigned> Cmp<UInt<Ur, B1>> for UInt<Ul, B0>
+where
+    Ul: PrivateCmp<Ur, Less>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, Less>;
+}
+
+/// `UInt<Ul, B1>` cmp with `UInt<Ur, B0>`: `SoFar` is `Greater`
+impl<Ul: Unsigned, Ur: Unsigned> Cmp<UInt<Ur, B0>> for UInt<Ul, B1>
+where
+    Ul: PrivateCmp<Ur, Greater>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, Greater>;
+}
+
+/// Comparing non-terimal bits, with both having bit `B0`.
+/// These are `Equal`, so we propogate `SoFar`.
+impl<Ul, Ur, SoFar> PrivateCmp<UInt<Ur, B0>, SoFar> for UInt<Ul, B0>
+where
+    Ul: Unsigned,
+    Ur: Unsigned,
+    SoFar: Ord,
+    Ul: PrivateCmp<Ur, SoFar>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, SoFar>;
+}
+
+/// Comparing non-terimal bits, with both having bit `B1`.
+/// These are `Equal`, so we propogate `SoFar`.
+impl<Ul, Ur, SoFar> PrivateCmp<UInt<Ur, B1>, SoFar> for UInt<Ul, B1>
+where
+    Ul: Unsigned,
+    Ur: Unsigned,
+    SoFar: Ord,
+    Ul: PrivateCmp<Ur, SoFar>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, SoFar>;
+}
+
+/// Comparing non-terimal bits, with `Lhs` having bit `B0` and `Rhs` having bit `B1`.
+/// `SoFar`, Lhs is `Less`.
+impl<Ul, Ur, SoFar> PrivateCmp<UInt<Ur, B1>, SoFar> for UInt<Ul, B0>
+where
+    Ul: Unsigned,
+    Ur: Unsigned,
+    SoFar: Ord,
+    Ul: PrivateCmp<Ur, Less>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, Less>;
+}
+
+/// Comparing non-terimal bits, with `Lhs` having bit `B1` and `Rhs` having bit `B0`.
+/// `SoFar`, Lhs is `Greater`.
+impl<Ul, Ur, SoFar> PrivateCmp<UInt<Ur, B0>, SoFar> for UInt<Ul, B1>
+where
+    Ul: Unsigned,
+    Ur: Unsigned,
+    SoFar: Ord,
+    Ul: PrivateCmp<Ur, Greater>,
+{
+    type Output = PrivateCmpOut<Ul, Ur, Greater>;
+}
+
+/// Got to the end of just the `Lhs`. It's `Less`.
+impl<U: Unsigned, B: Bit, SoFar: Ord> PrivateCmp<UInt<U, B>, SoFar> for UTerm {
+    type Output = Less;
+}
+
+/// Got to the end of just the `Rhs`. `Lhs` is `Greater`.
+impl<U: Unsigned, B: Bit, SoFar: Ord> PrivateCmp<UTerm, SoFar> for UInt<U, B> {
+    type Output = Greater;
+}
+
+/// Got to the end of both! Return `SoFar`
+impl<SoFar: Ord> PrivateCmp<UTerm, SoFar> for UTerm {
+    type Output = SoFar;
+}
+
+// ---------------------------------------------------------------------------------------
+// Getting difference in number of bits
+
+impl<Ul, Bl, Ur, Br> BitDiff<UInt<Ur, Br>> for UInt<Ul, Bl>
+where
+    Ul: Unsigned,
+    Bl: Bit,
+    Ur: Unsigned,
+    Br: Bit,
+    Ul: BitDiff<Ur>,
+{
+    type Output = BitDiffOut<Ul, Ur>;
+}
+
+impl<Ul> BitDiff<UTerm> for Ul
+where
+    Ul: Unsigned + Len,
+{
+    type Output = Length<Ul>;
+}
+
+// ---------------------------------------------------------------------------------------
+// Shifting one number until it's the size of another
+use private::ShiftDiff;
+impl<Ul: Unsigned, Ur: Unsigned> ShiftDiff<Ur> for Ul
+where
+    Ur: BitDiff<Ul>,
+    Ul: Shl<BitDiffOut<Ur, Ul>>,
+{
+    type Output = Shleft<Ul, BitDiffOut<Ur, Ul>>;
+}
+
+// ---------------------------------------------------------------------------------------
+// Powers of unsigned integers
+
+/// X^N
+impl<X: Unsigned, N: Unsigned> Pow<N> for X
+where
+    X: PrivatePow<U1, N>,
+{
+    type Output = PrivatePowOut<X, U1, N>;
+    fn powi(self, _: N) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+impl<Y: Unsigned, X: Unsigned> PrivatePow<Y, U0> for X {
+    type Output = Y;
+}
+
+impl<Y: Unsigned, X: Unsigned> PrivatePow<Y, U1> for X
+where
+    X: Mul<Y>,
+{
+    type Output = Prod<X, Y>;
+}
+
+/// N is even
+impl<Y: Unsigned, U: Unsigned, B: Bit, X: Unsigned> PrivatePow<Y, UInt<UInt<U, B>, B0>> for X
+where
+    X: Mul,
+    Square<X>: PrivatePow<Y, UInt<U, B>>,
+{
+    type Output = PrivatePowOut<Square<X>, Y, UInt<U, B>>;
+}
+
+/// N is odd
+impl<Y: Unsigned, U: Unsigned, B: Bit, X: Unsigned> PrivatePow<Y, UInt<UInt<U, B>, B1>> for X
+where
+    X: Mul + Mul<Y>,
+    Square<X>: PrivatePow<Prod<X, Y>, UInt<U, B>>,
+{
+    type Output = PrivatePowOut<Square<X>, Prod<X, Y>, UInt<U, B>>;
+}
+
+// -----------------------------------------
+// GetBit
+
+#[allow(missing_docs)]
+pub trait GetBit<I> {
+    #[allow(missing_docs)]
+    type Output;
+}
+
+#[allow(missing_docs)]
+pub type GetBitOut<N, I> = <N as GetBit<I>>::Output;
+
+// Base case
+impl<Un, Bn> GetBit<U0> for UInt<Un, Bn> {
+    type Output = Bn;
+}
+
+// Recursion case
+impl<Un, Bn, Ui, Bi> GetBit<UInt<Ui, Bi>> for UInt<Un, Bn>
+where
+    UInt<Ui, Bi>: Sub<B1>,
+    Un: GetBit<Sub1<UInt<Ui, Bi>>>,
+{
+    type Output = GetBitOut<Un, Sub1<UInt<Ui, Bi>>>;
+}
+
+// Ran out of bits
+impl<I> GetBit<I> for UTerm {
+    type Output = B0;
+}
+
+#[test]
+fn test_get_bit() {
+    use consts::*;
+    use Same;
+    type T1 = <GetBitOut<U2, U0> as Same<B0>>::Output;
+    type T2 = <GetBitOut<U2, U1> as Same<B1>>::Output;
+    type T3 = <GetBitOut<U2, U2> as Same<B0>>::Output;
+
+    <T1 as Bit>::to_bool();
+    <T2 as Bit>::to_bool();
+    <T3 as Bit>::to_bool();
+}
+
+// -----------------------------------------
+// SetBit
+
+/// A **type operator** that, when implemented for unsigned integer `N`, sets the bit at position
+/// `I` to `B`.
+pub trait SetBit<I, B> {
+    #[allow(missing_docs)]
+    type Output;
+}
+/// Alias for the result of calling `SetBit`: `SetBitOut<N, I, B> = <N as SetBit<I, B>>::Output`.
+pub type SetBitOut<N, I, B> = <N as SetBit<I, B>>::Output;
+
+use private::{PrivateSetBit, PrivateSetBitOut};
+
+// Call private one then trim it
+impl<N, I, B> SetBit<I, B> for N
+where
+    N: PrivateSetBit<I, B>,
+    PrivateSetBitOut<N, I, B>: Trim,
+{
+    type Output = TrimOut<PrivateSetBitOut<N, I, B>>;
+}
+
+// Base case
+impl<Un, Bn, B> PrivateSetBit<U0, B> for UInt<Un, Bn> {
+    type Output = UInt<Un, B>;
+}
+
+// Recursion case
+impl<Un, Bn, Ui, Bi, B> PrivateSetBit<UInt<Ui, Bi>, B> for UInt<Un, Bn>
+where
+    UInt<Ui, Bi>: Sub<B1>,
+    Un: PrivateSetBit<Sub1<UInt<Ui, Bi>>, B>,
+{
+    type Output = UInt<PrivateSetBitOut<Un, Sub1<UInt<Ui, Bi>>, B>, Bn>;
+}
+
+// Ran out of bits, setting B0
+impl<I> PrivateSetBit<I, B0> for UTerm {
+    type Output = UTerm;
+}
+
+// Ran out of bits, setting B1
+impl<I> PrivateSetBit<I, B1> for UTerm
+where
+    U1: Shl<I>,
+{
+    type Output = Shleft<U1, I>;
+}
+
+#[test]
+fn test_set_bit() {
+    use consts::*;
+    use Same;
+    type T1 = <SetBitOut<U2, U0, B0> as Same<U2>>::Output;
+    type T2 = <SetBitOut<U2, U0, B1> as Same<U3>>::Output;
+    type T3 = <SetBitOut<U2, U1, B0> as Same<U0>>::Output;
+    type T4 = <SetBitOut<U2, U1, B1> as Same<U2>>::Output;
+    type T5 = <SetBitOut<U2, U2, B0> as Same<U2>>::Output;
+    type T6 = <SetBitOut<U2, U2, B1> as Same<U6>>::Output;
+    type T7 = <SetBitOut<U2, U3, B0> as Same<U2>>::Output;
+    type T8 = <SetBitOut<U2, U3, B1> as Same<U10>>::Output;
+    type T9 = <SetBitOut<U2, U4, B0> as Same<U2>>::Output;
+    type T10 = <SetBitOut<U2, U4, B1> as Same<U18>>::Output;
+
+    type T11 = <SetBitOut<U3, U0, B0> as Same<U2>>::Output;
+
+    <T1 as Unsigned>::to_u32();
+    <T2 as Unsigned>::to_u32();
+    <T3 as Unsigned>::to_u32();
+    <T4 as Unsigned>::to_u32();
+    <T5 as Unsigned>::to_u32();
+    <T6 as Unsigned>::to_u32();
+    <T7 as Unsigned>::to_u32();
+    <T8 as Unsigned>::to_u32();
+    <T9 as Unsigned>::to_u32();
+    <T10 as Unsigned>::to_u32();
+    <T11 as Unsigned>::to_u32();
+}
+
+// -----------------------------------------
+
+// Division algorithm:
+// We have N / D:
+// let Q = 0, R = 0
+// NBits = len(N)
+// for I in NBits-1..0:
+//   R <<=1
+//   R[0] = N[i]
+//   let C = R.cmp(D)
+//   if C == Equal or Greater:
+//     R -= D
+//     Q[i] = 1
+
+#[cfg(tests)]
+mod tests {
+    macro_rules! test_div {
+        ($a:ident / $b:ident = $c:ident) => (
+            {
+                type R = Quot<$a, $b>;
+                assert_eq!(<R as Unsigned>::to_usize(), $c::to_usize());
+            }
+        );
+    }
+    #[test]
+    fn test_div() {
+        use consts::*;
+        use {Quot, Same};
+
+        test_div!(U0 / U1 = U0);
+        test_div!(U1 / U1 = U1);
+        test_div!(U2 / U1 = U2);
+        test_div!(U3 / U1 = U3);
+        test_div!(U4 / U1 = U4);
+
+        test_div!(U0 / U2 = U0);
+        test_div!(U1 / U2 = U0);
+        test_div!(U2 / U2 = U1);
+        test_div!(U3 / U2 = U1);
+        test_div!(U4 / U2 = U2);
+        test_div!(U6 / U2 = U3);
+        test_div!(U7 / U2 = U3);
+
+        type T = <SetBitOut<U0, U1, B1> as Same<U2>>::Output;
+        <T as Unsigned>::to_u32();
+    }
+}
+// -----------------------------------------
+// Div
+use core::ops::Div;
+
+// 0 // N
+impl<Ur: Unsigned, Br: Bit> Div<UInt<Ur, Br>> for UTerm {
+    type Output = UTerm;
+    fn div(self, _: UInt<Ur, Br>) -> Self::Output {
+        UTerm
+    }
+}
+
+// M // N
+impl<Ul: Unsigned, Bl: Bit, Ur: Unsigned, Br: Bit> Div<UInt<Ur, Br>> for UInt<Ul, Bl>
+where
+    UInt<Ul, Bl>: Len,
+    Length<UInt<Ul, Bl>>: Sub<B1>,
+    (): PrivateDiv<UInt<Ul, Bl>, UInt<Ur, Br>, U0, U0, Sub1<Length<UInt<Ul, Bl>>>>,
+{
+    type Output = PrivateDivQuot<UInt<Ul, Bl>, UInt<Ur, Br>, U0, U0, Sub1<Length<UInt<Ul, Bl>>>>;
+    fn div(self, _: UInt<Ur, Br>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// -----------------------------------------
+// Rem
+use core::ops::Rem;
+
+// 0 % N
+impl<Ur: Unsigned, Br: Bit> Rem<UInt<Ur, Br>> for UTerm {
+    type Output = UTerm;
+    fn rem(self, _: UInt<Ur, Br>) -> Self::Output {
+        UTerm
+    }
+}
+
+// M % N
+impl<Ul: Unsigned, Bl: Bit, Ur: Unsigned, Br: Bit> Rem<UInt<Ur, Br>> for UInt<Ul, Bl>
+where
+    UInt<Ul, Bl>: Len,
+    Length<UInt<Ul, Bl>>: Sub<B1>,
+    (): PrivateDiv<UInt<Ul, Bl>, UInt<Ur, Br>, U0, U0, Sub1<Length<UInt<Ul, Bl>>>>,
+{
+    type Output = PrivateDivRem<UInt<Ul, Bl>, UInt<Ur, Br>, U0, U0, Sub1<Length<UInt<Ul, Bl>>>>;
+    fn rem(self, _: UInt<Ur, Br>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// -----------------------------------------
+// PrivateDiv
+use private::{PrivateDiv, PrivateDivQuot, PrivateDivRem};
+
+use Compare;
+// R == 0: We set R = UInt<UTerm, N[i]>, then call out to PrivateDivIf for the if statement
+impl<N, D, Q, I> PrivateDiv<N, D, Q, U0, I> for ()
+where
+    N: GetBit<I>,
+    UInt<UTerm, GetBitOut<N, I>>: Trim,
+    TrimOut<UInt<UTerm, GetBitOut<N, I>>>: Cmp<D>,
+    (): PrivateDivIf<
+        N,
+        D,
+        Q,
+        TrimOut<UInt<UTerm, GetBitOut<N, I>>>,
+        I,
+        Compare<TrimOut<UInt<UTerm, GetBitOut<N, I>>>, D>,
+    >,
+{
+    type Quotient = PrivateDivIfQuot<
+        N,
+        D,
+        Q,
+        TrimOut<UInt<UTerm, GetBitOut<N, I>>>,
+        I,
+        Compare<TrimOut<UInt<UTerm, GetBitOut<N, I>>>, D>,
+    >;
+    type Remainder = PrivateDivIfRem<
+        N,
+        D,
+        Q,
+        TrimOut<UInt<UTerm, GetBitOut<N, I>>>,
+        I,
+        Compare<TrimOut<UInt<UTerm, GetBitOut<N, I>>>, D>,
+    >;
+}
+
+// R > 0: We perform R <<= 1 and R[0] = N[i], then call out to PrivateDivIf for the if statement
+impl<N, D, Q, Ur, Br, I> PrivateDiv<N, D, Q, UInt<Ur, Br>, I> for ()
+where
+    N: GetBit<I>,
+    UInt<UInt<Ur, Br>, GetBitOut<N, I>>: Cmp<D>,
+    (): PrivateDivIf<
+        N,
+        D,
+        Q,
+        UInt<UInt<Ur, Br>, GetBitOut<N, I>>,
+        I,
+        Compare<UInt<UInt<Ur, Br>, GetBitOut<N, I>>, D>,
+    >,
+{
+    type Quotient = PrivateDivIfQuot<
+        N,
+        D,
+        Q,
+        UInt<UInt<Ur, Br>, GetBitOut<N, I>>,
+        I,
+        Compare<UInt<UInt<Ur, Br>, GetBitOut<N, I>>, D>,
+    >;
+    type Remainder = PrivateDivIfRem<
+        N,
+        D,
+        Q,
+        UInt<UInt<Ur, Br>, GetBitOut<N, I>>,
+        I,
+        Compare<UInt<UInt<Ur, Br>, GetBitOut<N, I>>, D>,
+    >;
+}
+
+// -----------------------------------------
+// PrivateDivIf
+
+use private::{PrivateDivIf, PrivateDivIfQuot, PrivateDivIfRem};
+
+// R < D, I > 0, we do nothing and recurse
+impl<N, D, Q, R, Ui, Bi> PrivateDivIf<N, D, Q, R, UInt<Ui, Bi>, Less> for ()
+where
+    UInt<Ui, Bi>: Sub<B1>,
+    (): PrivateDiv<N, D, Q, R, Sub1<UInt<Ui, Bi>>>,
+{
+    type Quotient = PrivateDivQuot<N, D, Q, R, Sub1<UInt<Ui, Bi>>>;
+    type Remainder = PrivateDivRem<N, D, Q, R, Sub1<UInt<Ui, Bi>>>;
+}
+
+// R == D, I > 0, we set R = 0, Q[I] = 1 and recurse
+impl<N, D, Q, R, Ui, Bi> PrivateDivIf<N, D, Q, R, UInt<Ui, Bi>, Equal> for ()
+where
+    UInt<Ui, Bi>: Sub<B1>,
+    Q: SetBit<UInt<Ui, Bi>, B1>,
+    (): PrivateDiv<N, D, SetBitOut<Q, UInt<Ui, Bi>, B1>, U0, Sub1<UInt<Ui, Bi>>>,
+{
+    type Quotient = PrivateDivQuot<N, D, SetBitOut<Q, UInt<Ui, Bi>, B1>, U0, Sub1<UInt<Ui, Bi>>>;
+    type Remainder = PrivateDivRem<N, D, SetBitOut<Q, UInt<Ui, Bi>, B1>, U0, Sub1<UInt<Ui, Bi>>>;
+}
+
+use Diff;
+// R > D, I > 0, we set R -= D, Q[I] = 1 and recurse
+impl<N, D, Q, R, Ui, Bi> PrivateDivIf<N, D, Q, R, UInt<Ui, Bi>, Greater> for ()
+where
+    UInt<Ui, Bi>: Sub<B1>,
+    R: Sub<D>,
+    Q: SetBit<UInt<Ui, Bi>, B1>,
+    (): PrivateDiv<N, D, SetBitOut<Q, UInt<Ui, Bi>, B1>, Diff<R, D>, Sub1<UInt<Ui, Bi>>>,
+{
+    type Quotient =
+        PrivateDivQuot<N, D, SetBitOut<Q, UInt<Ui, Bi>, B1>, Diff<R, D>, Sub1<UInt<Ui, Bi>>>;
+    type Remainder =
+        PrivateDivRem<N, D, SetBitOut<Q, UInt<Ui, Bi>, B1>, Diff<R, D>, Sub1<UInt<Ui, Bi>>>;
+}
+
+// R < D, I == 0: we do nothing, and return
+impl<N, D, Q, R> PrivateDivIf<N, D, Q, R, U0, Less> for () {
+    type Quotient = Q;
+    type Remainder = R;
+}
+
+// R == D, I == 0: we set R = 0, Q[I] = 1, and return
+impl<N, D, Q, R> PrivateDivIf<N, D, Q, R, U0, Equal> for ()
+where
+    Q: SetBit<U0, B1>,
+{
+    type Quotient = SetBitOut<Q, U0, B1>;
+    type Remainder = U0;
+}
+
+// R > D, I == 0: We set R -= D, Q[I] = 1, and return
+impl<N, D, Q, R> PrivateDivIf<N, D, Q, R, U0, Greater> for ()
+where
+    R: Sub<D>,
+    Q: SetBit<U0, B1>,
+{
+    type Quotient = SetBitOut<Q, U0, B1>;
+    type Remainder = Diff<R, D>;
+}
+
+// -----------------------------------------
+// PartialDiv
+use {PartialDiv, Quot};
+impl<Ur: Unsigned, Br: Bit> PartialDiv<UInt<Ur, Br>> for UTerm {
+    type Output = UTerm;
+    fn partial_div(self, _: UInt<Ur, Br>) -> Self::Output {
+        UTerm
+    }
+}
+
+// M / N
+impl<Ul: Unsigned, Bl: Bit, Ur: Unsigned, Br: Bit> PartialDiv<UInt<Ur, Br>> for UInt<Ul, Bl>
+where
+    UInt<Ul, Bl>: Div<UInt<Ur, Br>> + Rem<UInt<Ur, Br>, Output = U0>,
+{
+    type Output = Quot<UInt<Ul, Bl>, UInt<Ur, Br>>;
+    fn partial_div(self, _: UInt<Ur, Br>) -> Self::Output {
+        unsafe { ::core::mem::uninitialized() }
+    }
+}
+
+// -----------------------------------------
+// PrivateMin
+use private::{PrivateMin, PrivateMinOut};
+
+impl<U, B, Ur> PrivateMin<Ur, Equal> for UInt<U, B>
+where
+    Ur: Unsigned,
+    U: Unsigned,
+    B: Bit,
+{
+    type Output = UInt<U, B>;
+    fn private_min(self, _: Ur) -> Self::Output {
+        self
+    }
+}
+
+impl<U, B, Ur> PrivateMin<Ur, Less> for UInt<U, B>
+where
+    Ur: Unsigned,
+    U: Unsigned,
+    B: Bit,
+{
+    type Output = UInt<U, B>;
+    fn private_min(self, _: Ur) -> Self::Output {
+        self
+    }
+}
+
+impl<U, B, Ur> PrivateMin<Ur, Greater> for UInt<U, B>
+where
+    Ur: Unsigned,
+    U: Unsigned,
+    B: Bit,
+{
+    type Output = Ur;
+    fn private_min(self, rhs: Ur) -> Self::Output {
+        rhs
+    }
+}
+
+// -----------------------------------------
+// Min
+use Min;
+
+impl<U> Min<U> for UTerm
+where
+    U: Unsigned,
+{
+    type Output = UTerm;
+    fn min(self, _: U) -> Self::Output {
+        self
+    }
+}
+
+impl<U, B, Ur> Min<Ur> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+    Ur: Unsigned,
+    UInt<U, B>: Cmp<Ur> + PrivateMin<Ur, Compare<UInt<U, B>, Ur>>,
+{
+    type Output = PrivateMinOut<UInt<U, B>, Ur, Compare<UInt<U, B>, Ur>>;
+    fn min(self, rhs: Ur) -> Self::Output {
+        self.private_min(rhs)
+    }
+}
+
+// -----------------------------------------
+// PrivateMax
+use private::{PrivateMax, PrivateMaxOut};
+
+impl<U, B, Ur> PrivateMax<Ur, Equal> for UInt<U, B>
+where
+    Ur: Unsigned,
+    U: Unsigned,
+    B: Bit,
+{
+    type Output = UInt<U, B>;
+    fn private_max(self, _: Ur) -> Self::Output {
+        self
+    }
+}
+
+impl<U, B, Ur> PrivateMax<Ur, Less> for UInt<U, B>
+where
+    Ur: Unsigned,
+    U: Unsigned,
+    B: Bit,
+{
+    type Output = Ur;
+    fn private_max(self, rhs: Ur) -> Self::Output {
+        rhs
+    }
+}
+
+impl<U, B, Ur> PrivateMax<Ur, Greater> for UInt<U, B>
+where
+    Ur: Unsigned,
+    U: Unsigned,
+    B: Bit,
+{
+    type Output = UInt<U, B>;
+    fn private_max(self, _: Ur) -> Self::Output {
+        self
+    }
+}
+
+// -----------------------------------------
+// Max
+use Max;
+
+impl<U> Max<U> for UTerm
+where
+    U: Unsigned,
+{
+    type Output = U;
+    fn max(self, rhs: U) -> Self::Output {
+        rhs
+    }
+}
+
+impl<U, B, Ur> Max<Ur> for UInt<U, B>
+where
+    U: Unsigned,
+    B: Bit,
+    Ur: Unsigned,
+    UInt<U, B>: Cmp<Ur> + PrivateMax<Ur, Compare<UInt<U, B>, Ur>>,
+{
+    type Output = PrivateMaxOut<UInt<U, B>, Ur, Compare<UInt<U, B>, Ur>>;
+    fn max(self, rhs: Ur) -> Self::Output {
+        self.private_max(rhs)
+    }
+}
diff -Nru cargo-0.32.0/vendor/typenum/tests/test.rs cargo-0.33.0/vendor/typenum/tests/test.rs
--- cargo-0.32.0/vendor/typenum/tests/test.rs	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.33.0/vendor/typenum/tests/test.rs	2019-02-06 04:11:58.000000000 +0000
@@ -0,0 +1,2 @@
+#[cfg(tests)]
+include!(concat!(env!("OUT_DIR"), "/tests.rs"));
diff -Nru cargo-0.32.0/vendor/ucd-util/.cargo_vcs_info.json cargo-0.33.0/vendor/ucd-util/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/ucd-util/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/ucd-util/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "22beb628882e699882620abb8de90eb637473341"
-  }
-}
diff -Nru cargo-0.32.0/vendor/unicode-bidi/.appveyor.yml cargo-0.33.0/vendor/unicode-bidi/.appveyor.yml
--- cargo-0.32.0/vendor/unicode-bidi/.appveyor.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-bidi/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-install:
-  - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.exe'
-  - rust-nightly-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
-  - rustc -V
-  - cargo -V
-  - git submodule update --init --recursive
-
-build: false
-
-environment:
-    RUST_BACKTRACE: full
-
-test_script:
-  - cargo build --verbose --all
-  - cargo doc   --verbose --all --no-deps
-
-  - cargo test  --verbose --all
-  - cargo test  --verbose --all --features serde
diff -Nru cargo-0.32.0/vendor/unicode-bidi/Cargo.lock cargo-0.33.0/vendor/unicode-bidi/Cargo.lock
--- cargo-0.32.0/vendor/unicode-bidi/Cargo.lock	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-bidi/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-[[package]]
-name = "dtoa"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "flame"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "flamer"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "flame 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "lazy_static"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "matches"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
-version = "1.0.62"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "serde_derive 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.62"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_test"
-version = "1.0.62"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "serde 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread-id"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-dependencies = [
- "flame 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "flamer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_test 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
-"checksum flame 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "742b046d7320354cd719d846800b6741300b9f9174d7ec5b2da853af9e7e78e1"
-"checksum flamer 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6caa1f27851a6fb08ad5dc8b2310d9c5a266179bbb596720b68ab9b570b1766"
-"checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682"
-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)" = "ac8ebf8343a981e2fa97042b14768f02ed3e1d602eac06cae6166df3c8ced206"
-"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
-"checksum proc-macro2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a45f2f0ae0b5757f6fe9e68745ba25f5246aea3598984ed81d013865873c1f84"
-"checksum quote 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e53eeda07ddbd8b057dde66d9beded11d0dfda13f0db0769e6b71d6bcf2074e"
-"checksum redox_syscall 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "0a12d51a5b5fd700e6c757f15877685bfa04fd7eb60c108f01d045cafa0073c2"
-"checksum serde 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)" = "44d9552562673a8ea8757f5b77ccd794b54dd6841d2def71e9936f293ee81c72"
-"checksum serde_derive 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)" = "9503e0851dc4398d7f7ee1da227f9c9b9cf82718eb239ab10847b1de6e2a5777"
-"checksum serde_json 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "ee382a792fabc5d720630aeafe1a4c69abe3d32aaaa5dbba6762fd8246d1bbe3"
-"checksum serde_test 1.0.62 (registry+https://github.com/rust-lang/crates.io-index)" = "33fc757cbe59aaa5f583aecc919aadf2e8001bc55a37e012d319bb01ade56a10"
-"checksum syn 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99d991a9e7c33123925e511baab68f7ec25c3795962fe326a2395e5a42a614f0"
-"checksum thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru cargo-0.32.0/vendor/unicode-bidi/.rustfmt.toml cargo-0.33.0/vendor/unicode-bidi/.rustfmt.toml
--- cargo-0.32.0/vendor/unicode-bidi/.rustfmt.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-bidi/.rustfmt.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-array_layout = "Block"
-array_width = 80
-fn_args_layout = "Block"
-fn_brace_style = "SameLineWhere"
-fn_call_style = "Block"
-generics_indent = "Block"
diff -Nru cargo-0.32.0/vendor/unicode-bidi/.travis.yml cargo-0.33.0/vendor/unicode-bidi/.travis.yml
--- cargo-0.32.0/vendor/unicode-bidi/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-bidi/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-language: rust
-sudo: false
-os: linux
-dist: trusty
-
-rust:
-  - nightly
-  - beta
-  - stable
-  - 1.17.0
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rust: nightly
-
-notifications:
-  webhooks: http://build.servo.org:54856/travis
-  email:
-    on_success: never
-
-env:
-  global:
-    - RUST_BACKTRACE=full
-
-script:
-  - cargo build --verbose
-  - cargo doc   --verbose --no-deps
-
-  - cargo test  --verbose
-  - cargo test  --verbose --features 'serde'
-  - cargo test  --verbose --features 'with_serde'
-
-  - test "$TRAVIS_RUST_VERSION" != "nightly" ||
-    cargo bench --verbose --features 'bench_it'
-
-  - test "$TRAVIS_RUST_VERSION" != "nightly" ||
-    cargo run   --verbose --features 'flame_it' --example 'flame_udhr'
diff -Nru cargo-0.32.0/vendor/unicode-normalization/benches/bench.rs cargo-0.33.0/vendor/unicode-normalization/benches/bench.rs
--- cargo-0.32.0/vendor/unicode-normalization/benches/bench.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/benches/bench.rs	2019-02-06 04:11:58.000000000 +0000
@@ -3,6 +3,7 @@
 extern crate unicode_normalization;
 extern crate test;
 
+use std::fs;
 use test::Bencher;
 use unicode_normalization::UnicodeNormalization;
 
@@ -81,6 +82,40 @@
 }
 
 #[bench]
+fn bench_nfc_long(b: &mut Bencher) {
+    let long = fs::read_to_string("benches/long.txt").unwrap();
+    b.iter(|| long.nfc().count());
+}
+
+#[bench]
+fn bench_nfd_long(b: &mut Bencher) {
+    let long = fs::read_to_string("benches/long.txt").unwrap();
+    b.iter(|| long.nfd().count());
+}
+
+#[bench]
+fn bench_nfkc_ascii(b: &mut Bencher) {
+    b.iter(|| ASCII.nfkc().count());
+}
+
+#[bench]
+fn bench_nfkd_ascii(b: &mut Bencher) {
+    b.iter(|| ASCII.nfkd().count());
+}
+
+#[bench]
+fn bench_nfkc_long(b: &mut Bencher) {
+    let long = fs::read_to_string("benches/long.txt").unwrap();
+    b.iter(|| long.nfkc().count());
+}
+
+#[bench]
+fn bench_nfkd_long(b: &mut Bencher) {
+    let long = fs::read_to_string("benches/long.txt").unwrap();
+    b.iter(|| long.nfkd().count());
+}
+
+#[bench]
 fn bench_streamsafe_ascii(b: &mut Bencher) {
     b.iter(|| ASCII.stream_safe().count());
 }
diff -Nru cargo-0.32.0/vendor/unicode-normalization/.cargo-checksum.json cargo-0.33.0/vendor/unicode-normalization/.cargo-checksum.json
--- cargo-0.32.0/vendor/unicode-normalization/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"}
\ No newline at end of file
+{"files":{},"package":"141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/unicode-normalization/Cargo.toml cargo-0.33.0/vendor/unicode-normalization/Cargo.toml
--- cargo-0.32.0/vendor/unicode-normalization/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,13 +12,15 @@
 
 [package]
 name = "unicode-normalization"
-version = "0.1.7"
+version = "0.1.8"
 authors = ["kwantam <kwantam@gmail.com>"]
-exclude = ["target/*", "Cargo.lock", "scripts/tmp", "*.txt"]
+exclude = ["target/*", "Cargo.lock", "scripts/tmp", "*.txt", "src/normalization_tests.rs", "src/test.rs"]
 description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"
 homepage = "https://github.com/unicode-rs/unicode-normalization"
-documentation = "https://unicode-rs.github.io/unicode-normalization"
+documentation = "https://docs.rs/unicode-normalization/"
 readme = "README.md"
 keywords = ["text", "unicode", "normalization", "decomposition", "recomposition"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/unicode-rs/unicode-normalization"
+[dependencies.smallvec]
+version = "0.6"
diff -Nru cargo-0.32.0/vendor/unicode-normalization/README.md cargo-0.33.0/vendor/unicode-normalization/README.md
--- cargo-0.32.0/vendor/unicode-normalization/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -1,10 +1,13 @@
+# unicode-normalization
+
+[![Build Status](https://travis-ci.org/unicode-rs/unicode-normalization.svg)](https://travis-ci.org/unicode-rs/unicode-normalization)
+[![Docs](https://docs.rs/unicode-normalization/badge.svg)](https://docs.rs/unicode-normalization/)
+
 Unicode character composition and decomposition utilities
 as described in
 [Unicode Standard Annex #15](http://www.unicode.org/reports/tr15/).
 
-[![Build Status](https://travis-ci.org/unicode-rs/unicode-normalization.svg)](https://travis-ci.org/unicode-rs/unicode-normalization)
-
-[Documentation](https://unicode-rs.github.io/unicode-normalization/unicode_normalization/index.html)
+This crate requires Rust 1.21+.
 
 ```rust
 extern crate unicode_normalization;
@@ -21,12 +24,12 @@
 }
 ```
 
-# crates.io
+## crates.io
 
 You can use this package in your project by adding the following
 to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-unicode-normalization = "0.1.7"
+unicode-normalization = "0.1.8"
 ```
diff -Nru cargo-0.32.0/vendor/unicode-normalization/scripts/unicode.py cargo-0.33.0/vendor/unicode-normalization/scripts/unicode.py
--- cargo-0.32.0/vendor/unicode-normalization/scripts/unicode.py	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/scripts/unicode.py	2019-02-06 04:11:58.000000000 +0000
@@ -315,14 +315,19 @@
     for table, name in tables:
         out.write("#[inline]\n")
         out.write("pub fn %s_fully_decomposed(c: char) -> Option<&'static [char]> {\n" % name)
-        out.write("    match c {\n")
+        # The "Some" constructor is around the match statement here, because
+        # putting it into the individual arms would make the item_bodies
+        # checking of rustc takes almost twice as long, and it's already pretty
+        # slow because of the huge number of match arms and the fact that there
+        # is a borrow inside each arm
+        out.write("    Some(match c {\n")
 
         for char, chars in sorted(table.items()):
             d = ", ".join("'\u{%s}'" % hexify(c) for c in chars)
-            out.write("        '\u{%s}' => Some(&[%s]),\n" % (hexify(char), d))
+            out.write("        '\u{%s}' => &[%s],\n" % (hexify(char), d))
 
-        out.write("        _ => None,\n")
-        out.write("    }\n")
+        out.write("        _ => return None,\n")
+        out.write("    })\n")
         out.write("}\n")
         out.write("\n")
 
@@ -347,12 +352,24 @@
     gen_qc_match(prop_tables['NFC_QC'], out)
     out.write("}\n")
 
+def gen_nfkc_qc(prop_tables, out):
+    out.write("#[inline]\n")
+    out.write("pub fn qc_nfkc(c: char) -> IsNormalized {\n")
+    gen_qc_match(prop_tables['NFKC_QC'], out)
+    out.write("}\n")
+
 def gen_nfd_qc(prop_tables, out):
     out.write("#[inline]\n")
     out.write("pub fn qc_nfd(c: char) -> IsNormalized {\n")
     gen_qc_match(prop_tables['NFD_QC'], out)
     out.write("}\n")
 
+def gen_nfkd_qc(prop_tables, out):
+    out.write("#[inline]\n")
+    out.write("pub fn qc_nfkd(c: char) -> IsNormalized {\n")
+    gen_qc_match(prop_tables['NFKD_QC'], out)
+    out.write("}\n")
+
 def gen_combining_mark(general_category_mark, out):
     out.write("#[inline]\n")
     out.write("pub fn is_combining_mark(c: char) -> bool {\n")
@@ -441,9 +458,15 @@
         gen_nfc_qc(data.norm_props, out)
         out.write("\n")
 
+        gen_nfkc_qc(data.norm_props, out)
+        out.write("\n")
+
         gen_nfd_qc(data.norm_props, out)
         out.write("\n")
 
+        gen_nfkd_qc(data.norm_props, out)
+        out.write("\n")
+
         gen_stream_safe(data.ss_leading, data.ss_trailing, out)
         out.write("\n")
 
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/decompose.rs cargo-0.33.0/vendor/unicode-normalization/src/decompose.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/decompose.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/decompose.rs	2019-02-06 04:11:58.000000000 +0000
@@ -7,40 +7,42 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+use smallvec::SmallVec;
 use std::fmt::{self, Write};
+use std::iter::Fuse;
+use std::ops::Range;
 
 #[derive(Clone)]
 enum DecompositionType {
     Canonical,
-    Compatible
+    Compatible,
 }
 
 /// External iterator for a string decomposition's characters.
 #[derive(Clone)]
 pub struct Decompositions<I> {
     kind: DecompositionType,
-    iter: I,
-    done: bool,
+    iter: Fuse<I>,
 
     // This buffer stores pairs of (canonical combining class, character),
     // pushed onto the end in text order.
     //
-    // It's split into two contiguous regions by the `ready` offset.  The first
-    // `ready` pairs are sorted and ready to emit on demand.  The "pending"
-    // suffix afterwards still needs more characters for us to be able to sort
-    // in canonical order and is not safe to emit.
-    buffer: Vec<(u8, char)>,
-    ready: usize,
+    // It's divided into up to three sections:
+    // 1) A prefix that is free space;
+    // 2) "Ready" characters which are sorted and ready to emit on demand;
+    // 3) A "pending" block which stills needs more characters for us to be able
+    //    to sort in canonical order and is not safe to emit.
+    buffer: SmallVec<[(u8, char); 4]>,
+    ready: Range<usize>,
 }
 
 #[inline]
 pub fn new_canonical<I: Iterator<Item=char>>(iter: I) -> Decompositions<I> {
     Decompositions {
         kind: self::DecompositionType::Canonical,
-        iter: iter,
-        done: false,
-        buffer: Vec::new(),
-        ready: 0,
+        iter: iter.fuse(),
+        buffer: SmallVec::new(),
+        ready: 0..0,
     }
 }
 
@@ -48,10 +50,9 @@
 pub fn new_compatible<I: Iterator<Item=char>>(iter: I) -> Decompositions<I> {
     Decompositions {
         kind: self::DecompositionType::Compatible,
-        iter: iter,
-        done: false,
-        buffer: Vec::new(),
-        ready: 0,
+        iter: iter.fuse(),
+        buffer: SmallVec::new(),
+        ready: 0..0,
     }
 }
 
@@ -59,31 +60,41 @@
     #[inline]
     fn push_back(&mut self, ch: char) {
         let class = super::char::canonical_combining_class(ch);
+
         if class == 0 {
             self.sort_pending();
         }
+
         self.buffer.push((class, ch));
     }
 
     #[inline]
     fn sort_pending(&mut self) {
-        if self.ready == 0 && self.buffer.is_empty() {
-            return;
-        }
-
         // NB: `sort_by_key` is stable, so it will preserve the original text's
         // order within a combining class.
-        self.buffer[self.ready..].sort_by_key(|k| k.0);
-        self.ready = self.buffer.len();
+        self.buffer[self.ready.end..].sort_by_key(|k| k.0);
+        self.ready.end = self.buffer.len();
     }
 
     #[inline]
-    fn pop_front(&mut self) -> Option<char> {
-        if self.ready == 0 {
-            None
+    fn reset_buffer(&mut self) {
+        // Equivalent to `self.buffer.drain(0..self.ready.end)` (if SmallVec
+        // supported this API)
+        let pending = self.buffer.len() - self.ready.end;
+        for i in 0..pending {
+            self.buffer[i] = self.buffer[i + self.ready.end];
+        }
+        self.buffer.truncate(pending);
+        self.ready = 0..0;
+    }
+
+    #[inline]
+    fn increment_next_ready(&mut self) {
+        let next = self.ready.start + 1;
+        if next == self.ready.end {
+            self.reset_buffer();
         } else {
-            self.ready -= 1;
-            Some(self.buffer.remove(0).1)
+            self.ready.start = next;
         }
     }
 }
@@ -93,21 +104,43 @@
 
     #[inline]
     fn next(&mut self) -> Option<char> {
-        while self.ready == 0 && !self.done {
+        while self.ready.end == 0 {
             match (self.iter.next(), &self.kind) {
                 (Some(ch), &DecompositionType::Canonical) => {
                     super::char::decompose_canonical(ch, |d| self.push_back(d));
-                },
+                }
                 (Some(ch), &DecompositionType::Compatible) => {
                     super::char::decompose_compatible(ch, |d| self.push_back(d));
-                },
+                }
                 (None, _) => {
-                    self.sort_pending();
-                    self.done = true;
-                },
+                    if self.buffer.is_empty() {
+                        return None;
+                    } else {
+                        self.sort_pending();
+
+                        // This implementation means that we can call `next`
+                        // on an exhausted iterator; the last outer `next` call
+                        // will result in an inner `next` call. To make this
+                        // safe, we use `fuse`.
+                        break;
+                    }
+                }
             }
         }
-        self.pop_front()
+
+        // We can assume here that, if `self.ready.end` is greater than zero,
+        // it's also greater than `self.ready.start`. That's because we only
+        // increment `self.ready.start` inside `increment_next_ready`, and
+        // whenever it reaches equality with `self.ready.end`, we reset both
+        // to zero, maintaining the invariant that:
+        //      self.ready.start < self.ready.end || self.ready.end == self.ready.start == 0
+        //
+        // This less-than-obviously-safe implementation is chosen for performance,
+        // minimizing the number & complexity of branches in `next` in the common
+        // case of buffering then unbuffering a single character with each call.
+        let (_, ch) = self.buffer[self.ready.start];
+        self.increment_next_ready();
+        Some(ch)
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/lib.rs cargo-0.33.0/vendor/unicode-normalization/src/lib.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/lib.rs	2019-02-06 04:11:58.000000000 +0000
@@ -34,23 +34,29 @@
 //!
 //! ```toml
 //! [dependencies]
-//! unicode-normalization = "0.1.7"
+//! unicode-normalization = "0.1.8"
 //! ```
 
 #![deny(missing_docs, unsafe_code)]
 #![doc(html_logo_url = "https://unicode-rs.github.io/unicode-rs_sm.png",
        html_favicon_url = "https://unicode-rs.github.io/unicode-rs_sm.png")]
 
+extern crate smallvec;
+
 pub use tables::UNICODE_VERSION;
 pub use decompose::Decompositions;
 pub use quick_check::{
     IsNormalized,
     is_nfc,
     is_nfc_quick,
+    is_nfkc,
+    is_nfkc_quick,
     is_nfc_stream_safe,
     is_nfc_stream_safe_quick,
     is_nfd,
     is_nfd_quick,
+    is_nfkd,
+    is_nfkd_quick,
     is_nfd_stream_safe,
     is_nfd_stream_safe_quick,
 };
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/normalization_tests.rs cargo-0.33.0/vendor/unicode-normalization/src/normalization_tests.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/normalization_tests.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/normalization_tests.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,131078 +0,0 @@
-// Copyright 2012-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
-
-#![allow(missing_docs)]
-#[derive(Debug)]
-pub struct NormalizationTest {
-    pub source: &'static str,
-    pub nfc: &'static str,
-    pub nfd: &'static str,
-    pub nfkc: &'static str,
-    pub nfkd: &'static str,
-}
-
-pub const NORMALIZATION_TESTS: &[NormalizationTest] = &[
-    NormalizationTest {
-        source: "\u{1E0A}",
-        nfc: "\u{1E0A}",
-        nfd: "\u{0044}\u{0307}",
-        nfkc: "\u{1E0A}",
-        nfkd: "\u{0044}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0C}",
-        nfc: "\u{1E0C}",
-        nfd: "\u{0044}\u{0323}",
-        nfkc: "\u{1E0C}",
-        nfkd: "\u{0044}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E0A}\u{0323}",
-        nfc: "\u{1E0C}\u{0307}",
-        nfd: "\u{0044}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{0307}",
-        nfkd: "\u{0044}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0C}\u{0307}",
-        nfc: "\u{1E0C}\u{0307}",
-        nfd: "\u{0044}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{0307}",
-        nfkd: "\u{0044}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0044}\u{0307}\u{0323}",
-        nfc: "\u{1E0C}\u{0307}",
-        nfd: "\u{0044}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{0307}",
-        nfkd: "\u{0044}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0044}\u{0323}\u{0307}",
-        nfc: "\u{1E0C}\u{0307}",
-        nfd: "\u{0044}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{0307}",
-        nfkd: "\u{0044}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0A}\u{031B}",
-        nfc: "\u{1E0A}\u{031B}",
-        nfd: "\u{0044}\u{031B}\u{0307}",
-        nfkc: "\u{1E0A}\u{031B}",
-        nfkd: "\u{0044}\u{031B}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0C}\u{031B}",
-        nfc: "\u{1E0C}\u{031B}",
-        nfd: "\u{0044}\u{031B}\u{0323}",
-        nfkc: "\u{1E0C}\u{031B}",
-        nfkd: "\u{0044}\u{031B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E0A}\u{031B}\u{0323}",
-        nfc: "\u{1E0C}\u{031B}\u{0307}",
-        nfd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{031B}\u{0307}",
-        nfkd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0C}\u{031B}\u{0307}",
-        nfc: "\u{1E0C}\u{031B}\u{0307}",
-        nfd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{031B}\u{0307}",
-        nfkd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0044}\u{031B}\u{0307}\u{0323}",
-        nfc: "\u{1E0C}\u{031B}\u{0307}",
-        nfd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{031B}\u{0307}",
-        nfkd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0044}\u{031B}\u{0323}\u{0307}",
-        nfc: "\u{1E0C}\u{031B}\u{0307}",
-        nfd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-        nfkc: "\u{1E0C}\u{031B}\u{0307}",
-        nfkd: "\u{0044}\u{031B}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{00C8}",
-        nfc: "\u{00C8}",
-        nfd: "\u{0045}\u{0300}",
-        nfkc: "\u{00C8}",
-        nfkd: "\u{0045}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0112}",
-        nfc: "\u{0112}",
-        nfd: "\u{0045}\u{0304}",
-        nfkc: "\u{0112}",
-        nfkd: "\u{0045}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0045}\u{0300}",
-        nfc: "\u{00C8}",
-        nfd: "\u{0045}\u{0300}",
-        nfkc: "\u{00C8}",
-        nfkd: "\u{0045}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0045}\u{0304}",
-        nfc: "\u{0112}",
-        nfd: "\u{0045}\u{0304}",
-        nfkc: "\u{0112}",
-        nfkd: "\u{0045}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E14}",
-        nfc: "\u{1E14}",
-        nfd: "\u{0045}\u{0304}\u{0300}",
-        nfkc: "\u{1E14}",
-        nfkd: "\u{0045}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0112}\u{0300}",
-        nfc: "\u{1E14}",
-        nfd: "\u{0045}\u{0304}\u{0300}",
-        nfkc: "\u{1E14}",
-        nfkd: "\u{0045}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E14}\u{0304}",
-        nfc: "\u{1E14}\u{0304}",
-        nfd: "\u{0045}\u{0304}\u{0300}\u{0304}",
-        nfkc: "\u{1E14}\u{0304}",
-        nfkd: "\u{0045}\u{0304}\u{0300}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0045}\u{0304}\u{0300}",
-        nfc: "\u{1E14}",
-        nfd: "\u{0045}\u{0304}\u{0300}",
-        nfkc: "\u{1E14}",
-        nfkd: "\u{0045}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0045}\u{0300}\u{0304}",
-        nfc: "\u{00C8}\u{0304}",
-        nfd: "\u{0045}\u{0300}\u{0304}",
-        nfkc: "\u{00C8}\u{0304}",
-        nfkd: "\u{0045}\u{0300}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{05B8}\u{05B9}\u{05B1}\u{0591}\u{05C3}\u{05B0}\u{05AC}\u{059F}",
-        nfc: "\u{05B1}\u{05B8}\u{05B9}\u{0591}\u{05C3}\u{05B0}\u{05AC}\u{059F}",
-        nfd: "\u{05B1}\u{05B8}\u{05B9}\u{0591}\u{05C3}\u{05B0}\u{05AC}\u{059F}",
-        nfkc: "\u{05B1}\u{05B8}\u{05B9}\u{0591}\u{05C3}\u{05B0}\u{05AC}\u{059F}",
-        nfkd: "\u{05B1}\u{05B8}\u{05B9}\u{0591}\u{05C3}\u{05B0}\u{05AC}\u{059F}",
-    },
-    NormalizationTest {
-        source: "\u{0592}\u{05B7}\u{05BC}\u{05A5}\u{05B0}\u{05C0}\u{05C4}\u{05AD}",
-        nfc: "\u{05B0}\u{05B7}\u{05BC}\u{05A5}\u{0592}\u{05C0}\u{05AD}\u{05C4}",
-        nfd: "\u{05B0}\u{05B7}\u{05BC}\u{05A5}\u{0592}\u{05C0}\u{05AD}\u{05C4}",
-        nfkc: "\u{05B0}\u{05B7}\u{05BC}\u{05A5}\u{0592}\u{05C0}\u{05AD}\u{05C4}",
-        nfkd: "\u{05B0}\u{05B7}\u{05BC}\u{05A5}\u{0592}\u{05C0}\u{05AD}\u{05C4}",
-    },
-    NormalizationTest {
-        source: "\u{1100}\u{AC00}\u{11A8}",
-        nfc: "\u{1100}\u{AC01}",
-        nfd: "\u{1100}\u{1100}\u{1161}\u{11A8}",
-        nfkc: "\u{1100}\u{AC01}",
-        nfkd: "\u{1100}\u{1100}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{1100}\u{AC00}\u{11A8}\u{11A8}",
-        nfc: "\u{1100}\u{AC01}\u{11A8}",
-        nfd: "\u{1100}\u{1100}\u{1161}\u{11A8}\u{11A8}",
-        nfkc: "\u{1100}\u{AC01}\u{11A8}",
-        nfkd: "\u{1100}\u{1100}\u{1161}\u{11A8}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{00A0}",
-        nfc: "\u{00A0}",
-        nfd: "\u{00A0}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{00A8}",
-        nfc: "\u{00A8}",
-        nfd: "\u{00A8}",
-        nfkc: "\u{0020}\u{0308}",
-        nfkd: "\u{0020}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00AA}",
-        nfc: "\u{00AA}",
-        nfd: "\u{00AA}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{00AF}",
-        nfc: "\u{00AF}",
-        nfd: "\u{00AF}",
-        nfkc: "\u{0020}\u{0304}",
-        nfkd: "\u{0020}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{00B2}",
-        nfc: "\u{00B2}",
-        nfd: "\u{00B2}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{00B3}",
-        nfc: "\u{00B3}",
-        nfd: "\u{00B3}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{00B4}",
-        nfc: "\u{00B4}",
-        nfd: "\u{00B4}",
-        nfkc: "\u{0020}\u{0301}",
-        nfkd: "\u{0020}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00B5}",
-        nfc: "\u{00B5}",
-        nfd: "\u{00B5}",
-        nfkc: "\u{03BC}",
-        nfkd: "\u{03BC}",
-    },
-    NormalizationTest {
-        source: "\u{00B8}",
-        nfc: "\u{00B8}",
-        nfd: "\u{00B8}",
-        nfkc: "\u{0020}\u{0327}",
-        nfkd: "\u{0020}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{00B9}",
-        nfc: "\u{00B9}",
-        nfd: "\u{00B9}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{00BA}",
-        nfc: "\u{00BA}",
-        nfd: "\u{00BA}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{00BC}",
-        nfc: "\u{00BC}",
-        nfd: "\u{00BC}",
-        nfkc: "\u{0031}\u{2044}\u{0034}",
-        nfkd: "\u{0031}\u{2044}\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{00BD}",
-        nfc: "\u{00BD}",
-        nfd: "\u{00BD}",
-        nfkc: "\u{0031}\u{2044}\u{0032}",
-        nfkd: "\u{0031}\u{2044}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{00BE}",
-        nfc: "\u{00BE}",
-        nfd: "\u{00BE}",
-        nfkc: "\u{0033}\u{2044}\u{0034}",
-        nfkd: "\u{0033}\u{2044}\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{00C0}",
-        nfc: "\u{00C0}",
-        nfd: "\u{0041}\u{0300}",
-        nfkc: "\u{00C0}",
-        nfkd: "\u{0041}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00C1}",
-        nfc: "\u{00C1}",
-        nfd: "\u{0041}\u{0301}",
-        nfkc: "\u{00C1}",
-        nfkd: "\u{0041}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00C2}",
-        nfc: "\u{00C2}",
-        nfd: "\u{0041}\u{0302}",
-        nfkc: "\u{00C2}",
-        nfkd: "\u{0041}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00C3}",
-        nfc: "\u{00C3}",
-        nfd: "\u{0041}\u{0303}",
-        nfkc: "\u{00C3}",
-        nfkd: "\u{0041}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{00C4}",
-        nfc: "\u{00C4}",
-        nfd: "\u{0041}\u{0308}",
-        nfkc: "\u{00C4}",
-        nfkd: "\u{0041}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00C5}",
-        nfc: "\u{00C5}",
-        nfd: "\u{0041}\u{030A}",
-        nfkc: "\u{00C5}",
-        nfkd: "\u{0041}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{00C7}",
-        nfc: "\u{00C7}",
-        nfd: "\u{0043}\u{0327}",
-        nfkc: "\u{00C7}",
-        nfkd: "\u{0043}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{00C8}",
-        nfc: "\u{00C8}",
-        nfd: "\u{0045}\u{0300}",
-        nfkc: "\u{00C8}",
-        nfkd: "\u{0045}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00C9}",
-        nfc: "\u{00C9}",
-        nfd: "\u{0045}\u{0301}",
-        nfkc: "\u{00C9}",
-        nfkd: "\u{0045}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00CA}",
-        nfc: "\u{00CA}",
-        nfd: "\u{0045}\u{0302}",
-        nfkc: "\u{00CA}",
-        nfkd: "\u{0045}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00CB}",
-        nfc: "\u{00CB}",
-        nfd: "\u{0045}\u{0308}",
-        nfkc: "\u{00CB}",
-        nfkd: "\u{0045}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00CC}",
-        nfc: "\u{00CC}",
-        nfd: "\u{0049}\u{0300}",
-        nfkc: "\u{00CC}",
-        nfkd: "\u{0049}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00CD}",
-        nfc: "\u{00CD}",
-        nfd: "\u{0049}\u{0301}",
-        nfkc: "\u{00CD}",
-        nfkd: "\u{0049}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00CE}",
-        nfc: "\u{00CE}",
-        nfd: "\u{0049}\u{0302}",
-        nfkc: "\u{00CE}",
-        nfkd: "\u{0049}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00CF}",
-        nfc: "\u{00CF}",
-        nfd: "\u{0049}\u{0308}",
-        nfkc: "\u{00CF}",
-        nfkd: "\u{0049}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00D1}",
-        nfc: "\u{00D1}",
-        nfd: "\u{004E}\u{0303}",
-        nfkc: "\u{00D1}",
-        nfkd: "\u{004E}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{00D2}",
-        nfc: "\u{00D2}",
-        nfd: "\u{004F}\u{0300}",
-        nfkc: "\u{00D2}",
-        nfkd: "\u{004F}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00D3}",
-        nfc: "\u{00D3}",
-        nfd: "\u{004F}\u{0301}",
-        nfkc: "\u{00D3}",
-        nfkd: "\u{004F}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00D4}",
-        nfc: "\u{00D4}",
-        nfd: "\u{004F}\u{0302}",
-        nfkc: "\u{00D4}",
-        nfkd: "\u{004F}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00D5}",
-        nfc: "\u{00D5}",
-        nfd: "\u{004F}\u{0303}",
-        nfkc: "\u{00D5}",
-        nfkd: "\u{004F}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{00D6}",
-        nfc: "\u{00D6}",
-        nfd: "\u{004F}\u{0308}",
-        nfkc: "\u{00D6}",
-        nfkd: "\u{004F}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00D9}",
-        nfc: "\u{00D9}",
-        nfd: "\u{0055}\u{0300}",
-        nfkc: "\u{00D9}",
-        nfkd: "\u{0055}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00DA}",
-        nfc: "\u{00DA}",
-        nfd: "\u{0055}\u{0301}",
-        nfkc: "\u{00DA}",
-        nfkd: "\u{0055}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00DB}",
-        nfc: "\u{00DB}",
-        nfd: "\u{0055}\u{0302}",
-        nfkc: "\u{00DB}",
-        nfkd: "\u{0055}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00DC}",
-        nfc: "\u{00DC}",
-        nfd: "\u{0055}\u{0308}",
-        nfkc: "\u{00DC}",
-        nfkd: "\u{0055}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00DD}",
-        nfc: "\u{00DD}",
-        nfd: "\u{0059}\u{0301}",
-        nfkc: "\u{00DD}",
-        nfkd: "\u{0059}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00E0}",
-        nfc: "\u{00E0}",
-        nfd: "\u{0061}\u{0300}",
-        nfkc: "\u{00E0}",
-        nfkd: "\u{0061}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00E1}",
-        nfc: "\u{00E1}",
-        nfd: "\u{0061}\u{0301}",
-        nfkc: "\u{00E1}",
-        nfkd: "\u{0061}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00E2}",
-        nfc: "\u{00E2}",
-        nfd: "\u{0061}\u{0302}",
-        nfkc: "\u{00E2}",
-        nfkd: "\u{0061}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00E3}",
-        nfc: "\u{00E3}",
-        nfd: "\u{0061}\u{0303}",
-        nfkc: "\u{00E3}",
-        nfkd: "\u{0061}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{00E4}",
-        nfc: "\u{00E4}",
-        nfd: "\u{0061}\u{0308}",
-        nfkc: "\u{00E4}",
-        nfkd: "\u{0061}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00E5}",
-        nfc: "\u{00E5}",
-        nfd: "\u{0061}\u{030A}",
-        nfkc: "\u{00E5}",
-        nfkd: "\u{0061}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{00E7}",
-        nfc: "\u{00E7}",
-        nfd: "\u{0063}\u{0327}",
-        nfkc: "\u{00E7}",
-        nfkd: "\u{0063}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{00E8}",
-        nfc: "\u{00E8}",
-        nfd: "\u{0065}\u{0300}",
-        nfkc: "\u{00E8}",
-        nfkd: "\u{0065}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00E9}",
-        nfc: "\u{00E9}",
-        nfd: "\u{0065}\u{0301}",
-        nfkc: "\u{00E9}",
-        nfkd: "\u{0065}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00EA}",
-        nfc: "\u{00EA}",
-        nfd: "\u{0065}\u{0302}",
-        nfkc: "\u{00EA}",
-        nfkd: "\u{0065}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00EB}",
-        nfc: "\u{00EB}",
-        nfd: "\u{0065}\u{0308}",
-        nfkc: "\u{00EB}",
-        nfkd: "\u{0065}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00EC}",
-        nfc: "\u{00EC}",
-        nfd: "\u{0069}\u{0300}",
-        nfkc: "\u{00EC}",
-        nfkd: "\u{0069}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00ED}",
-        nfc: "\u{00ED}",
-        nfd: "\u{0069}\u{0301}",
-        nfkc: "\u{00ED}",
-        nfkd: "\u{0069}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00EE}",
-        nfc: "\u{00EE}",
-        nfd: "\u{0069}\u{0302}",
-        nfkc: "\u{00EE}",
-        nfkd: "\u{0069}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00EF}",
-        nfc: "\u{00EF}",
-        nfd: "\u{0069}\u{0308}",
-        nfkc: "\u{00EF}",
-        nfkd: "\u{0069}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00F1}",
-        nfc: "\u{00F1}",
-        nfd: "\u{006E}\u{0303}",
-        nfkc: "\u{00F1}",
-        nfkd: "\u{006E}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{00F2}",
-        nfc: "\u{00F2}",
-        nfd: "\u{006F}\u{0300}",
-        nfkc: "\u{00F2}",
-        nfkd: "\u{006F}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00F3}",
-        nfc: "\u{00F3}",
-        nfd: "\u{006F}\u{0301}",
-        nfkc: "\u{00F3}",
-        nfkd: "\u{006F}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00F4}",
-        nfc: "\u{00F4}",
-        nfd: "\u{006F}\u{0302}",
-        nfkc: "\u{00F4}",
-        nfkd: "\u{006F}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00F5}",
-        nfc: "\u{00F5}",
-        nfd: "\u{006F}\u{0303}",
-        nfkc: "\u{00F5}",
-        nfkd: "\u{006F}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{00F6}",
-        nfc: "\u{00F6}",
-        nfd: "\u{006F}\u{0308}",
-        nfkc: "\u{00F6}",
-        nfkd: "\u{006F}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00F9}",
-        nfc: "\u{00F9}",
-        nfd: "\u{0075}\u{0300}",
-        nfkc: "\u{00F9}",
-        nfkd: "\u{0075}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{00FA}",
-        nfc: "\u{00FA}",
-        nfd: "\u{0075}\u{0301}",
-        nfkc: "\u{00FA}",
-        nfkd: "\u{0075}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00FB}",
-        nfc: "\u{00FB}",
-        nfd: "\u{0075}\u{0302}",
-        nfkc: "\u{00FB}",
-        nfkd: "\u{0075}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{00FC}",
-        nfc: "\u{00FC}",
-        nfd: "\u{0075}\u{0308}",
-        nfkc: "\u{00FC}",
-        nfkd: "\u{0075}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{00FD}",
-        nfc: "\u{00FD}",
-        nfd: "\u{0079}\u{0301}",
-        nfkc: "\u{00FD}",
-        nfkd: "\u{0079}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{00FF}",
-        nfc: "\u{00FF}",
-        nfd: "\u{0079}\u{0308}",
-        nfkc: "\u{00FF}",
-        nfkd: "\u{0079}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{0100}",
-        nfc: "\u{0100}",
-        nfd: "\u{0041}\u{0304}",
-        nfkc: "\u{0100}",
-        nfkd: "\u{0041}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0101}",
-        nfc: "\u{0101}",
-        nfd: "\u{0061}\u{0304}",
-        nfkc: "\u{0101}",
-        nfkd: "\u{0061}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0102}",
-        nfc: "\u{0102}",
-        nfd: "\u{0041}\u{0306}",
-        nfkc: "\u{0102}",
-        nfkd: "\u{0041}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0103}",
-        nfc: "\u{0103}",
-        nfd: "\u{0061}\u{0306}",
-        nfkc: "\u{0103}",
-        nfkd: "\u{0061}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0104}",
-        nfc: "\u{0104}",
-        nfd: "\u{0041}\u{0328}",
-        nfkc: "\u{0104}",
-        nfkd: "\u{0041}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{0105}",
-        nfc: "\u{0105}",
-        nfd: "\u{0061}\u{0328}",
-        nfkc: "\u{0105}",
-        nfkd: "\u{0061}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{0106}",
-        nfc: "\u{0106}",
-        nfd: "\u{0043}\u{0301}",
-        nfkc: "\u{0106}",
-        nfkd: "\u{0043}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0107}",
-        nfc: "\u{0107}",
-        nfd: "\u{0063}\u{0301}",
-        nfkc: "\u{0107}",
-        nfkd: "\u{0063}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0108}",
-        nfc: "\u{0108}",
-        nfd: "\u{0043}\u{0302}",
-        nfkc: "\u{0108}",
-        nfkd: "\u{0043}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0109}",
-        nfc: "\u{0109}",
-        nfd: "\u{0063}\u{0302}",
-        nfkc: "\u{0109}",
-        nfkd: "\u{0063}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{010A}",
-        nfc: "\u{010A}",
-        nfd: "\u{0043}\u{0307}",
-        nfkc: "\u{010A}",
-        nfkd: "\u{0043}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{010B}",
-        nfc: "\u{010B}",
-        nfd: "\u{0063}\u{0307}",
-        nfkc: "\u{010B}",
-        nfkd: "\u{0063}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{010C}",
-        nfc: "\u{010C}",
-        nfd: "\u{0043}\u{030C}",
-        nfkc: "\u{010C}",
-        nfkd: "\u{0043}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{010D}",
-        nfc: "\u{010D}",
-        nfd: "\u{0063}\u{030C}",
-        nfkc: "\u{010D}",
-        nfkd: "\u{0063}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{010E}",
-        nfc: "\u{010E}",
-        nfd: "\u{0044}\u{030C}",
-        nfkc: "\u{010E}",
-        nfkd: "\u{0044}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{010F}",
-        nfc: "\u{010F}",
-        nfd: "\u{0064}\u{030C}",
-        nfkc: "\u{010F}",
-        nfkd: "\u{0064}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0112}",
-        nfc: "\u{0112}",
-        nfd: "\u{0045}\u{0304}",
-        nfkc: "\u{0112}",
-        nfkd: "\u{0045}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0113}",
-        nfc: "\u{0113}",
-        nfd: "\u{0065}\u{0304}",
-        nfkc: "\u{0113}",
-        nfkd: "\u{0065}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0114}",
-        nfc: "\u{0114}",
-        nfd: "\u{0045}\u{0306}",
-        nfkc: "\u{0114}",
-        nfkd: "\u{0045}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0115}",
-        nfc: "\u{0115}",
-        nfd: "\u{0065}\u{0306}",
-        nfkc: "\u{0115}",
-        nfkd: "\u{0065}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0116}",
-        nfc: "\u{0116}",
-        nfd: "\u{0045}\u{0307}",
-        nfkc: "\u{0116}",
-        nfkd: "\u{0045}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0117}",
-        nfc: "\u{0117}",
-        nfd: "\u{0065}\u{0307}",
-        nfkc: "\u{0117}",
-        nfkd: "\u{0065}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0118}",
-        nfc: "\u{0118}",
-        nfd: "\u{0045}\u{0328}",
-        nfkc: "\u{0118}",
-        nfkd: "\u{0045}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{0119}",
-        nfc: "\u{0119}",
-        nfd: "\u{0065}\u{0328}",
-        nfkc: "\u{0119}",
-        nfkd: "\u{0065}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{011A}",
-        nfc: "\u{011A}",
-        nfd: "\u{0045}\u{030C}",
-        nfkc: "\u{011A}",
-        nfkd: "\u{0045}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{011B}",
-        nfc: "\u{011B}",
-        nfd: "\u{0065}\u{030C}",
-        nfkc: "\u{011B}",
-        nfkd: "\u{0065}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{011C}",
-        nfc: "\u{011C}",
-        nfd: "\u{0047}\u{0302}",
-        nfkc: "\u{011C}",
-        nfkd: "\u{0047}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{011D}",
-        nfc: "\u{011D}",
-        nfd: "\u{0067}\u{0302}",
-        nfkc: "\u{011D}",
-        nfkd: "\u{0067}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{011E}",
-        nfc: "\u{011E}",
-        nfd: "\u{0047}\u{0306}",
-        nfkc: "\u{011E}",
-        nfkd: "\u{0047}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{011F}",
-        nfc: "\u{011F}",
-        nfd: "\u{0067}\u{0306}",
-        nfkc: "\u{011F}",
-        nfkd: "\u{0067}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0120}",
-        nfc: "\u{0120}",
-        nfd: "\u{0047}\u{0307}",
-        nfkc: "\u{0120}",
-        nfkd: "\u{0047}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0121}",
-        nfc: "\u{0121}",
-        nfd: "\u{0067}\u{0307}",
-        nfkc: "\u{0121}",
-        nfkd: "\u{0067}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0122}",
-        nfc: "\u{0122}",
-        nfd: "\u{0047}\u{0327}",
-        nfkc: "\u{0122}",
-        nfkd: "\u{0047}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0123}",
-        nfc: "\u{0123}",
-        nfd: "\u{0067}\u{0327}",
-        nfkc: "\u{0123}",
-        nfkd: "\u{0067}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0124}",
-        nfc: "\u{0124}",
-        nfd: "\u{0048}\u{0302}",
-        nfkc: "\u{0124}",
-        nfkd: "\u{0048}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0125}",
-        nfc: "\u{0125}",
-        nfd: "\u{0068}\u{0302}",
-        nfkc: "\u{0125}",
-        nfkd: "\u{0068}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0128}",
-        nfc: "\u{0128}",
-        nfd: "\u{0049}\u{0303}",
-        nfkc: "\u{0128}",
-        nfkd: "\u{0049}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{0129}",
-        nfc: "\u{0129}",
-        nfd: "\u{0069}\u{0303}",
-        nfkc: "\u{0129}",
-        nfkd: "\u{0069}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{012A}",
-        nfc: "\u{012A}",
-        nfd: "\u{0049}\u{0304}",
-        nfkc: "\u{012A}",
-        nfkd: "\u{0049}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{012B}",
-        nfc: "\u{012B}",
-        nfd: "\u{0069}\u{0304}",
-        nfkc: "\u{012B}",
-        nfkd: "\u{0069}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{012C}",
-        nfc: "\u{012C}",
-        nfd: "\u{0049}\u{0306}",
-        nfkc: "\u{012C}",
-        nfkd: "\u{0049}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{012D}",
-        nfc: "\u{012D}",
-        nfd: "\u{0069}\u{0306}",
-        nfkc: "\u{012D}",
-        nfkd: "\u{0069}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{012E}",
-        nfc: "\u{012E}",
-        nfd: "\u{0049}\u{0328}",
-        nfkc: "\u{012E}",
-        nfkd: "\u{0049}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{012F}",
-        nfc: "\u{012F}",
-        nfd: "\u{0069}\u{0328}",
-        nfkc: "\u{012F}",
-        nfkd: "\u{0069}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{0130}",
-        nfc: "\u{0130}",
-        nfd: "\u{0049}\u{0307}",
-        nfkc: "\u{0130}",
-        nfkd: "\u{0049}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0132}",
-        nfc: "\u{0132}",
-        nfd: "\u{0132}",
-        nfkc: "\u{0049}\u{004A}",
-        nfkd: "\u{0049}\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{0133}",
-        nfc: "\u{0133}",
-        nfd: "\u{0133}",
-        nfkc: "\u{0069}\u{006A}",
-        nfkd: "\u{0069}\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{0134}",
-        nfc: "\u{0134}",
-        nfd: "\u{004A}\u{0302}",
-        nfkc: "\u{0134}",
-        nfkd: "\u{004A}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0135}",
-        nfc: "\u{0135}",
-        nfd: "\u{006A}\u{0302}",
-        nfkc: "\u{0135}",
-        nfkd: "\u{006A}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0136}",
-        nfc: "\u{0136}",
-        nfd: "\u{004B}\u{0327}",
-        nfkc: "\u{0136}",
-        nfkd: "\u{004B}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0137}",
-        nfc: "\u{0137}",
-        nfd: "\u{006B}\u{0327}",
-        nfkc: "\u{0137}",
-        nfkd: "\u{006B}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0139}",
-        nfc: "\u{0139}",
-        nfd: "\u{004C}\u{0301}",
-        nfkc: "\u{0139}",
-        nfkd: "\u{004C}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{013A}",
-        nfc: "\u{013A}",
-        nfd: "\u{006C}\u{0301}",
-        nfkc: "\u{013A}",
-        nfkd: "\u{006C}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{013B}",
-        nfc: "\u{013B}",
-        nfd: "\u{004C}\u{0327}",
-        nfkc: "\u{013B}",
-        nfkd: "\u{004C}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{013C}",
-        nfc: "\u{013C}",
-        nfd: "\u{006C}\u{0327}",
-        nfkc: "\u{013C}",
-        nfkd: "\u{006C}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{013D}",
-        nfc: "\u{013D}",
-        nfd: "\u{004C}\u{030C}",
-        nfkc: "\u{013D}",
-        nfkd: "\u{004C}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{013E}",
-        nfc: "\u{013E}",
-        nfd: "\u{006C}\u{030C}",
-        nfkc: "\u{013E}",
-        nfkd: "\u{006C}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{013F}",
-        nfc: "\u{013F}",
-        nfd: "\u{013F}",
-        nfkc: "\u{004C}\u{00B7}",
-        nfkd: "\u{004C}\u{00B7}",
-    },
-    NormalizationTest {
-        source: "\u{0140}",
-        nfc: "\u{0140}",
-        nfd: "\u{0140}",
-        nfkc: "\u{006C}\u{00B7}",
-        nfkd: "\u{006C}\u{00B7}",
-    },
-    NormalizationTest {
-        source: "\u{0143}",
-        nfc: "\u{0143}",
-        nfd: "\u{004E}\u{0301}",
-        nfkc: "\u{0143}",
-        nfkd: "\u{004E}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0144}",
-        nfc: "\u{0144}",
-        nfd: "\u{006E}\u{0301}",
-        nfkc: "\u{0144}",
-        nfkd: "\u{006E}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0145}",
-        nfc: "\u{0145}",
-        nfd: "\u{004E}\u{0327}",
-        nfkc: "\u{0145}",
-        nfkd: "\u{004E}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0146}",
-        nfc: "\u{0146}",
-        nfd: "\u{006E}\u{0327}",
-        nfkc: "\u{0146}",
-        nfkd: "\u{006E}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0147}",
-        nfc: "\u{0147}",
-        nfd: "\u{004E}\u{030C}",
-        nfkc: "\u{0147}",
-        nfkd: "\u{004E}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0148}",
-        nfc: "\u{0148}",
-        nfd: "\u{006E}\u{030C}",
-        nfkc: "\u{0148}",
-        nfkd: "\u{006E}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0149}",
-        nfc: "\u{0149}",
-        nfd: "\u{0149}",
-        nfkc: "\u{02BC}\u{006E}",
-        nfkd: "\u{02BC}\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{014C}",
-        nfc: "\u{014C}",
-        nfd: "\u{004F}\u{0304}",
-        nfkc: "\u{014C}",
-        nfkd: "\u{004F}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{014D}",
-        nfc: "\u{014D}",
-        nfd: "\u{006F}\u{0304}",
-        nfkc: "\u{014D}",
-        nfkd: "\u{006F}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{014E}",
-        nfc: "\u{014E}",
-        nfd: "\u{004F}\u{0306}",
-        nfkc: "\u{014E}",
-        nfkd: "\u{004F}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{014F}",
-        nfc: "\u{014F}",
-        nfd: "\u{006F}\u{0306}",
-        nfkc: "\u{014F}",
-        nfkd: "\u{006F}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0150}",
-        nfc: "\u{0150}",
-        nfd: "\u{004F}\u{030B}",
-        nfkc: "\u{0150}",
-        nfkd: "\u{004F}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{0151}",
-        nfc: "\u{0151}",
-        nfd: "\u{006F}\u{030B}",
-        nfkc: "\u{0151}",
-        nfkd: "\u{006F}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{0154}",
-        nfc: "\u{0154}",
-        nfd: "\u{0052}\u{0301}",
-        nfkc: "\u{0154}",
-        nfkd: "\u{0052}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0155}",
-        nfc: "\u{0155}",
-        nfd: "\u{0072}\u{0301}",
-        nfkc: "\u{0155}",
-        nfkd: "\u{0072}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0156}",
-        nfc: "\u{0156}",
-        nfd: "\u{0052}\u{0327}",
-        nfkc: "\u{0156}",
-        nfkd: "\u{0052}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0157}",
-        nfc: "\u{0157}",
-        nfd: "\u{0072}\u{0327}",
-        nfkc: "\u{0157}",
-        nfkd: "\u{0072}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0158}",
-        nfc: "\u{0158}",
-        nfd: "\u{0052}\u{030C}",
-        nfkc: "\u{0158}",
-        nfkd: "\u{0052}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0159}",
-        nfc: "\u{0159}",
-        nfd: "\u{0072}\u{030C}",
-        nfkc: "\u{0159}",
-        nfkd: "\u{0072}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{015A}",
-        nfc: "\u{015A}",
-        nfd: "\u{0053}\u{0301}",
-        nfkc: "\u{015A}",
-        nfkd: "\u{0053}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{015B}",
-        nfc: "\u{015B}",
-        nfd: "\u{0073}\u{0301}",
-        nfkc: "\u{015B}",
-        nfkd: "\u{0073}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{015C}",
-        nfc: "\u{015C}",
-        nfd: "\u{0053}\u{0302}",
-        nfkc: "\u{015C}",
-        nfkd: "\u{0053}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{015D}",
-        nfc: "\u{015D}",
-        nfd: "\u{0073}\u{0302}",
-        nfkc: "\u{015D}",
-        nfkd: "\u{0073}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{015E}",
-        nfc: "\u{015E}",
-        nfd: "\u{0053}\u{0327}",
-        nfkc: "\u{015E}",
-        nfkd: "\u{0053}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{015F}",
-        nfc: "\u{015F}",
-        nfd: "\u{0073}\u{0327}",
-        nfkc: "\u{015F}",
-        nfkd: "\u{0073}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0160}",
-        nfc: "\u{0160}",
-        nfd: "\u{0053}\u{030C}",
-        nfkc: "\u{0160}",
-        nfkd: "\u{0053}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0161}",
-        nfc: "\u{0161}",
-        nfd: "\u{0073}\u{030C}",
-        nfkc: "\u{0161}",
-        nfkd: "\u{0073}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0162}",
-        nfc: "\u{0162}",
-        nfd: "\u{0054}\u{0327}",
-        nfkc: "\u{0162}",
-        nfkd: "\u{0054}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0163}",
-        nfc: "\u{0163}",
-        nfd: "\u{0074}\u{0327}",
-        nfkc: "\u{0163}",
-        nfkd: "\u{0074}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0164}",
-        nfc: "\u{0164}",
-        nfd: "\u{0054}\u{030C}",
-        nfkc: "\u{0164}",
-        nfkd: "\u{0054}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0165}",
-        nfc: "\u{0165}",
-        nfd: "\u{0074}\u{030C}",
-        nfkc: "\u{0165}",
-        nfkd: "\u{0074}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0168}",
-        nfc: "\u{0168}",
-        nfd: "\u{0055}\u{0303}",
-        nfkc: "\u{0168}",
-        nfkd: "\u{0055}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{0169}",
-        nfc: "\u{0169}",
-        nfd: "\u{0075}\u{0303}",
-        nfkc: "\u{0169}",
-        nfkd: "\u{0075}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{016A}",
-        nfc: "\u{016A}",
-        nfd: "\u{0055}\u{0304}",
-        nfkc: "\u{016A}",
-        nfkd: "\u{0055}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{016B}",
-        nfc: "\u{016B}",
-        nfd: "\u{0075}\u{0304}",
-        nfkc: "\u{016B}",
-        nfkd: "\u{0075}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{016C}",
-        nfc: "\u{016C}",
-        nfd: "\u{0055}\u{0306}",
-        nfkc: "\u{016C}",
-        nfkd: "\u{0055}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{016D}",
-        nfc: "\u{016D}",
-        nfd: "\u{0075}\u{0306}",
-        nfkc: "\u{016D}",
-        nfkd: "\u{0075}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{016E}",
-        nfc: "\u{016E}",
-        nfd: "\u{0055}\u{030A}",
-        nfkc: "\u{016E}",
-        nfkd: "\u{0055}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{016F}",
-        nfc: "\u{016F}",
-        nfd: "\u{0075}\u{030A}",
-        nfkc: "\u{016F}",
-        nfkd: "\u{0075}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{0170}",
-        nfc: "\u{0170}",
-        nfd: "\u{0055}\u{030B}",
-        nfkc: "\u{0170}",
-        nfkd: "\u{0055}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{0171}",
-        nfc: "\u{0171}",
-        nfd: "\u{0075}\u{030B}",
-        nfkc: "\u{0171}",
-        nfkd: "\u{0075}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{0172}",
-        nfc: "\u{0172}",
-        nfd: "\u{0055}\u{0328}",
-        nfkc: "\u{0172}",
-        nfkd: "\u{0055}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{0173}",
-        nfc: "\u{0173}",
-        nfd: "\u{0075}\u{0328}",
-        nfkc: "\u{0173}",
-        nfkd: "\u{0075}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{0174}",
-        nfc: "\u{0174}",
-        nfd: "\u{0057}\u{0302}",
-        nfkc: "\u{0174}",
-        nfkd: "\u{0057}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0175}",
-        nfc: "\u{0175}",
-        nfd: "\u{0077}\u{0302}",
-        nfkc: "\u{0175}",
-        nfkd: "\u{0077}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0176}",
-        nfc: "\u{0176}",
-        nfd: "\u{0059}\u{0302}",
-        nfkc: "\u{0176}",
-        nfkd: "\u{0059}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0177}",
-        nfc: "\u{0177}",
-        nfd: "\u{0079}\u{0302}",
-        nfkc: "\u{0177}",
-        nfkd: "\u{0079}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{0178}",
-        nfc: "\u{0178}",
-        nfd: "\u{0059}\u{0308}",
-        nfkc: "\u{0178}",
-        nfkd: "\u{0059}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{0179}",
-        nfc: "\u{0179}",
-        nfd: "\u{005A}\u{0301}",
-        nfkc: "\u{0179}",
-        nfkd: "\u{005A}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{017A}",
-        nfc: "\u{017A}",
-        nfd: "\u{007A}\u{0301}",
-        nfkc: "\u{017A}",
-        nfkd: "\u{007A}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{017B}",
-        nfc: "\u{017B}",
-        nfd: "\u{005A}\u{0307}",
-        nfkc: "\u{017B}",
-        nfkd: "\u{005A}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{017C}",
-        nfc: "\u{017C}",
-        nfd: "\u{007A}\u{0307}",
-        nfkc: "\u{017C}",
-        nfkd: "\u{007A}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{017D}",
-        nfc: "\u{017D}",
-        nfd: "\u{005A}\u{030C}",
-        nfkc: "\u{017D}",
-        nfkd: "\u{005A}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{017E}",
-        nfc: "\u{017E}",
-        nfd: "\u{007A}\u{030C}",
-        nfkc: "\u{017E}",
-        nfkd: "\u{007A}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{017F}",
-        nfc: "\u{017F}",
-        nfd: "\u{017F}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{01A0}",
-        nfc: "\u{01A0}",
-        nfd: "\u{004F}\u{031B}",
-        nfkc: "\u{01A0}",
-        nfkd: "\u{004F}\u{031B}",
-    },
-    NormalizationTest {
-        source: "\u{01A1}",
-        nfc: "\u{01A1}",
-        nfd: "\u{006F}\u{031B}",
-        nfkc: "\u{01A1}",
-        nfkd: "\u{006F}\u{031B}",
-    },
-    NormalizationTest {
-        source: "\u{01AF}",
-        nfc: "\u{01AF}",
-        nfd: "\u{0055}\u{031B}",
-        nfkc: "\u{01AF}",
-        nfkd: "\u{0055}\u{031B}",
-    },
-    NormalizationTest {
-        source: "\u{01B0}",
-        nfc: "\u{01B0}",
-        nfd: "\u{0075}\u{031B}",
-        nfkc: "\u{01B0}",
-        nfkd: "\u{0075}\u{031B}",
-    },
-    NormalizationTest {
-        source: "\u{01C4}",
-        nfc: "\u{01C4}",
-        nfd: "\u{01C4}",
-        nfkc: "\u{0044}\u{017D}",
-        nfkd: "\u{0044}\u{005A}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01C5}",
-        nfc: "\u{01C5}",
-        nfd: "\u{01C5}",
-        nfkc: "\u{0044}\u{017E}",
-        nfkd: "\u{0044}\u{007A}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01C6}",
-        nfc: "\u{01C6}",
-        nfd: "\u{01C6}",
-        nfkc: "\u{0064}\u{017E}",
-        nfkd: "\u{0064}\u{007A}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01C7}",
-        nfc: "\u{01C7}",
-        nfd: "\u{01C7}",
-        nfkc: "\u{004C}\u{004A}",
-        nfkd: "\u{004C}\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{01C8}",
-        nfc: "\u{01C8}",
-        nfd: "\u{01C8}",
-        nfkc: "\u{004C}\u{006A}",
-        nfkd: "\u{004C}\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{01C9}",
-        nfc: "\u{01C9}",
-        nfd: "\u{01C9}",
-        nfkc: "\u{006C}\u{006A}",
-        nfkd: "\u{006C}\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{01CA}",
-        nfc: "\u{01CA}",
-        nfd: "\u{01CA}",
-        nfkc: "\u{004E}\u{004A}",
-        nfkd: "\u{004E}\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{01CB}",
-        nfc: "\u{01CB}",
-        nfd: "\u{01CB}",
-        nfkc: "\u{004E}\u{006A}",
-        nfkd: "\u{004E}\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{01CC}",
-        nfc: "\u{01CC}",
-        nfd: "\u{01CC}",
-        nfkc: "\u{006E}\u{006A}",
-        nfkd: "\u{006E}\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{01CD}",
-        nfc: "\u{01CD}",
-        nfd: "\u{0041}\u{030C}",
-        nfkc: "\u{01CD}",
-        nfkd: "\u{0041}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01CE}",
-        nfc: "\u{01CE}",
-        nfd: "\u{0061}\u{030C}",
-        nfkc: "\u{01CE}",
-        nfkd: "\u{0061}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01CF}",
-        nfc: "\u{01CF}",
-        nfd: "\u{0049}\u{030C}",
-        nfkc: "\u{01CF}",
-        nfkd: "\u{0049}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01D0}",
-        nfc: "\u{01D0}",
-        nfd: "\u{0069}\u{030C}",
-        nfkc: "\u{01D0}",
-        nfkd: "\u{0069}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01D1}",
-        nfc: "\u{01D1}",
-        nfd: "\u{004F}\u{030C}",
-        nfkc: "\u{01D1}",
-        nfkd: "\u{004F}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01D2}",
-        nfc: "\u{01D2}",
-        nfd: "\u{006F}\u{030C}",
-        nfkc: "\u{01D2}",
-        nfkd: "\u{006F}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01D3}",
-        nfc: "\u{01D3}",
-        nfd: "\u{0055}\u{030C}",
-        nfkc: "\u{01D3}",
-        nfkd: "\u{0055}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01D4}",
-        nfc: "\u{01D4}",
-        nfd: "\u{0075}\u{030C}",
-        nfkc: "\u{01D4}",
-        nfkd: "\u{0075}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01D5}",
-        nfc: "\u{01D5}",
-        nfd: "\u{0055}\u{0308}\u{0304}",
-        nfkc: "\u{01D5}",
-        nfkd: "\u{0055}\u{0308}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01D6}",
-        nfc: "\u{01D6}",
-        nfd: "\u{0075}\u{0308}\u{0304}",
-        nfkc: "\u{01D6}",
-        nfkd: "\u{0075}\u{0308}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01D7}",
-        nfc: "\u{01D7}",
-        nfd: "\u{0055}\u{0308}\u{0301}",
-        nfkc: "\u{01D7}",
-        nfkd: "\u{0055}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01D8}",
-        nfc: "\u{01D8}",
-        nfd: "\u{0075}\u{0308}\u{0301}",
-        nfkc: "\u{01D8}",
-        nfkd: "\u{0075}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01D9}",
-        nfc: "\u{01D9}",
-        nfd: "\u{0055}\u{0308}\u{030C}",
-        nfkc: "\u{01D9}",
-        nfkd: "\u{0055}\u{0308}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01DA}",
-        nfc: "\u{01DA}",
-        nfd: "\u{0075}\u{0308}\u{030C}",
-        nfkc: "\u{01DA}",
-        nfkd: "\u{0075}\u{0308}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01DB}",
-        nfc: "\u{01DB}",
-        nfd: "\u{0055}\u{0308}\u{0300}",
-        nfkc: "\u{01DB}",
-        nfkd: "\u{0055}\u{0308}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{01DC}",
-        nfc: "\u{01DC}",
-        nfd: "\u{0075}\u{0308}\u{0300}",
-        nfkc: "\u{01DC}",
-        nfkd: "\u{0075}\u{0308}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{01DE}",
-        nfc: "\u{01DE}",
-        nfd: "\u{0041}\u{0308}\u{0304}",
-        nfkc: "\u{01DE}",
-        nfkd: "\u{0041}\u{0308}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01DF}",
-        nfc: "\u{01DF}",
-        nfd: "\u{0061}\u{0308}\u{0304}",
-        nfkc: "\u{01DF}",
-        nfkd: "\u{0061}\u{0308}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01E0}",
-        nfc: "\u{01E0}",
-        nfd: "\u{0041}\u{0307}\u{0304}",
-        nfkc: "\u{01E0}",
-        nfkd: "\u{0041}\u{0307}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01E1}",
-        nfc: "\u{01E1}",
-        nfd: "\u{0061}\u{0307}\u{0304}",
-        nfkc: "\u{01E1}",
-        nfkd: "\u{0061}\u{0307}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01E2}",
-        nfc: "\u{01E2}",
-        nfd: "\u{00C6}\u{0304}",
-        nfkc: "\u{01E2}",
-        nfkd: "\u{00C6}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01E3}",
-        nfc: "\u{01E3}",
-        nfd: "\u{00E6}\u{0304}",
-        nfkc: "\u{01E3}",
-        nfkd: "\u{00E6}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01E6}",
-        nfc: "\u{01E6}",
-        nfd: "\u{0047}\u{030C}",
-        nfkc: "\u{01E6}",
-        nfkd: "\u{0047}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01E7}",
-        nfc: "\u{01E7}",
-        nfd: "\u{0067}\u{030C}",
-        nfkc: "\u{01E7}",
-        nfkd: "\u{0067}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01E8}",
-        nfc: "\u{01E8}",
-        nfd: "\u{004B}\u{030C}",
-        nfkc: "\u{01E8}",
-        nfkd: "\u{004B}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01E9}",
-        nfc: "\u{01E9}",
-        nfd: "\u{006B}\u{030C}",
-        nfkc: "\u{01E9}",
-        nfkd: "\u{006B}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01EA}",
-        nfc: "\u{01EA}",
-        nfd: "\u{004F}\u{0328}",
-        nfkc: "\u{01EA}",
-        nfkd: "\u{004F}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{01EB}",
-        nfc: "\u{01EB}",
-        nfd: "\u{006F}\u{0328}",
-        nfkc: "\u{01EB}",
-        nfkd: "\u{006F}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{01EC}",
-        nfc: "\u{01EC}",
-        nfd: "\u{004F}\u{0328}\u{0304}",
-        nfkc: "\u{01EC}",
-        nfkd: "\u{004F}\u{0328}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01ED}",
-        nfc: "\u{01ED}",
-        nfd: "\u{006F}\u{0328}\u{0304}",
-        nfkc: "\u{01ED}",
-        nfkd: "\u{006F}\u{0328}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{01EE}",
-        nfc: "\u{01EE}",
-        nfd: "\u{01B7}\u{030C}",
-        nfkc: "\u{01EE}",
-        nfkd: "\u{01B7}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01EF}",
-        nfc: "\u{01EF}",
-        nfd: "\u{0292}\u{030C}",
-        nfkc: "\u{01EF}",
-        nfkd: "\u{0292}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01F0}",
-        nfc: "\u{01F0}",
-        nfd: "\u{006A}\u{030C}",
-        nfkc: "\u{01F0}",
-        nfkd: "\u{006A}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{01F1}",
-        nfc: "\u{01F1}",
-        nfd: "\u{01F1}",
-        nfkc: "\u{0044}\u{005A}",
-        nfkd: "\u{0044}\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{01F2}",
-        nfc: "\u{01F2}",
-        nfd: "\u{01F2}",
-        nfkc: "\u{0044}\u{007A}",
-        nfkd: "\u{0044}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{01F3}",
-        nfc: "\u{01F3}",
-        nfd: "\u{01F3}",
-        nfkc: "\u{0064}\u{007A}",
-        nfkd: "\u{0064}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{01F4}",
-        nfc: "\u{01F4}",
-        nfd: "\u{0047}\u{0301}",
-        nfkc: "\u{01F4}",
-        nfkd: "\u{0047}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01F5}",
-        nfc: "\u{01F5}",
-        nfd: "\u{0067}\u{0301}",
-        nfkc: "\u{01F5}",
-        nfkd: "\u{0067}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01F8}",
-        nfc: "\u{01F8}",
-        nfd: "\u{004E}\u{0300}",
-        nfkc: "\u{01F8}",
-        nfkd: "\u{004E}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{01F9}",
-        nfc: "\u{01F9}",
-        nfd: "\u{006E}\u{0300}",
-        nfkc: "\u{01F9}",
-        nfkd: "\u{006E}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{01FA}",
-        nfc: "\u{01FA}",
-        nfd: "\u{0041}\u{030A}\u{0301}",
-        nfkc: "\u{01FA}",
-        nfkd: "\u{0041}\u{030A}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01FB}",
-        nfc: "\u{01FB}",
-        nfd: "\u{0061}\u{030A}\u{0301}",
-        nfkc: "\u{01FB}",
-        nfkd: "\u{0061}\u{030A}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01FC}",
-        nfc: "\u{01FC}",
-        nfd: "\u{00C6}\u{0301}",
-        nfkc: "\u{01FC}",
-        nfkd: "\u{00C6}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01FD}",
-        nfc: "\u{01FD}",
-        nfd: "\u{00E6}\u{0301}",
-        nfkc: "\u{01FD}",
-        nfkd: "\u{00E6}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01FE}",
-        nfc: "\u{01FE}",
-        nfd: "\u{00D8}\u{0301}",
-        nfkc: "\u{01FE}",
-        nfkd: "\u{00D8}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{01FF}",
-        nfc: "\u{01FF}",
-        nfd: "\u{00F8}\u{0301}",
-        nfkc: "\u{01FF}",
-        nfkd: "\u{00F8}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0200}",
-        nfc: "\u{0200}",
-        nfd: "\u{0041}\u{030F}",
-        nfkc: "\u{0200}",
-        nfkd: "\u{0041}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0201}",
-        nfc: "\u{0201}",
-        nfd: "\u{0061}\u{030F}",
-        nfkc: "\u{0201}",
-        nfkd: "\u{0061}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0202}",
-        nfc: "\u{0202}",
-        nfd: "\u{0041}\u{0311}",
-        nfkc: "\u{0202}",
-        nfkd: "\u{0041}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0203}",
-        nfc: "\u{0203}",
-        nfd: "\u{0061}\u{0311}",
-        nfkc: "\u{0203}",
-        nfkd: "\u{0061}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0204}",
-        nfc: "\u{0204}",
-        nfd: "\u{0045}\u{030F}",
-        nfkc: "\u{0204}",
-        nfkd: "\u{0045}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0205}",
-        nfc: "\u{0205}",
-        nfd: "\u{0065}\u{030F}",
-        nfkc: "\u{0205}",
-        nfkd: "\u{0065}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0206}",
-        nfc: "\u{0206}",
-        nfd: "\u{0045}\u{0311}",
-        nfkc: "\u{0206}",
-        nfkd: "\u{0045}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0207}",
-        nfc: "\u{0207}",
-        nfd: "\u{0065}\u{0311}",
-        nfkc: "\u{0207}",
-        nfkd: "\u{0065}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0208}",
-        nfc: "\u{0208}",
-        nfd: "\u{0049}\u{030F}",
-        nfkc: "\u{0208}",
-        nfkd: "\u{0049}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0209}",
-        nfc: "\u{0209}",
-        nfd: "\u{0069}\u{030F}",
-        nfkc: "\u{0209}",
-        nfkd: "\u{0069}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{020A}",
-        nfc: "\u{020A}",
-        nfd: "\u{0049}\u{0311}",
-        nfkc: "\u{020A}",
-        nfkd: "\u{0049}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{020B}",
-        nfc: "\u{020B}",
-        nfd: "\u{0069}\u{0311}",
-        nfkc: "\u{020B}",
-        nfkd: "\u{0069}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{020C}",
-        nfc: "\u{020C}",
-        nfd: "\u{004F}\u{030F}",
-        nfkc: "\u{020C}",
-        nfkd: "\u{004F}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{020D}",
-        nfc: "\u{020D}",
-        nfd: "\u{006F}\u{030F}",
-        nfkc: "\u{020D}",
-        nfkd: "\u{006F}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{020E}",
-        nfc: "\u{020E}",
-        nfd: "\u{004F}\u{0311}",
-        nfkc: "\u{020E}",
-        nfkd: "\u{004F}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{020F}",
-        nfc: "\u{020F}",
-        nfd: "\u{006F}\u{0311}",
-        nfkc: "\u{020F}",
-        nfkd: "\u{006F}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0210}",
-        nfc: "\u{0210}",
-        nfd: "\u{0052}\u{030F}",
-        nfkc: "\u{0210}",
-        nfkd: "\u{0052}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0211}",
-        nfc: "\u{0211}",
-        nfd: "\u{0072}\u{030F}",
-        nfkc: "\u{0211}",
-        nfkd: "\u{0072}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0212}",
-        nfc: "\u{0212}",
-        nfd: "\u{0052}\u{0311}",
-        nfkc: "\u{0212}",
-        nfkd: "\u{0052}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0213}",
-        nfc: "\u{0213}",
-        nfd: "\u{0072}\u{0311}",
-        nfkc: "\u{0213}",
-        nfkd: "\u{0072}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0214}",
-        nfc: "\u{0214}",
-        nfd: "\u{0055}\u{030F}",
-        nfkc: "\u{0214}",
-        nfkd: "\u{0055}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0215}",
-        nfc: "\u{0215}",
-        nfd: "\u{0075}\u{030F}",
-        nfkc: "\u{0215}",
-        nfkd: "\u{0075}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0216}",
-        nfc: "\u{0216}",
-        nfd: "\u{0055}\u{0311}",
-        nfkc: "\u{0216}",
-        nfkd: "\u{0055}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0217}",
-        nfc: "\u{0217}",
-        nfd: "\u{0075}\u{0311}",
-        nfkc: "\u{0217}",
-        nfkd: "\u{0075}\u{0311}",
-    },
-    NormalizationTest {
-        source: "\u{0218}",
-        nfc: "\u{0218}",
-        nfd: "\u{0053}\u{0326}",
-        nfkc: "\u{0218}",
-        nfkd: "\u{0053}\u{0326}",
-    },
-    NormalizationTest {
-        source: "\u{0219}",
-        nfc: "\u{0219}",
-        nfd: "\u{0073}\u{0326}",
-        nfkc: "\u{0219}",
-        nfkd: "\u{0073}\u{0326}",
-    },
-    NormalizationTest {
-        source: "\u{021A}",
-        nfc: "\u{021A}",
-        nfd: "\u{0054}\u{0326}",
-        nfkc: "\u{021A}",
-        nfkd: "\u{0054}\u{0326}",
-    },
-    NormalizationTest {
-        source: "\u{021B}",
-        nfc: "\u{021B}",
-        nfd: "\u{0074}\u{0326}",
-        nfkc: "\u{021B}",
-        nfkd: "\u{0074}\u{0326}",
-    },
-    NormalizationTest {
-        source: "\u{021E}",
-        nfc: "\u{021E}",
-        nfd: "\u{0048}\u{030C}",
-        nfkc: "\u{021E}",
-        nfkd: "\u{0048}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{021F}",
-        nfc: "\u{021F}",
-        nfd: "\u{0068}\u{030C}",
-        nfkc: "\u{021F}",
-        nfkd: "\u{0068}\u{030C}",
-    },
-    NormalizationTest {
-        source: "\u{0226}",
-        nfc: "\u{0226}",
-        nfd: "\u{0041}\u{0307}",
-        nfkc: "\u{0226}",
-        nfkd: "\u{0041}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0227}",
-        nfc: "\u{0227}",
-        nfd: "\u{0061}\u{0307}",
-        nfkc: "\u{0227}",
-        nfkd: "\u{0061}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0228}",
-        nfc: "\u{0228}",
-        nfd: "\u{0045}\u{0327}",
-        nfkc: "\u{0228}",
-        nfkd: "\u{0045}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{0229}",
-        nfc: "\u{0229}",
-        nfd: "\u{0065}\u{0327}",
-        nfkc: "\u{0229}",
-        nfkd: "\u{0065}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{022A}",
-        nfc: "\u{022A}",
-        nfd: "\u{004F}\u{0308}\u{0304}",
-        nfkc: "\u{022A}",
-        nfkd: "\u{004F}\u{0308}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{022B}",
-        nfc: "\u{022B}",
-        nfd: "\u{006F}\u{0308}\u{0304}",
-        nfkc: "\u{022B}",
-        nfkd: "\u{006F}\u{0308}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{022C}",
-        nfc: "\u{022C}",
-        nfd: "\u{004F}\u{0303}\u{0304}",
-        nfkc: "\u{022C}",
-        nfkd: "\u{004F}\u{0303}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{022D}",
-        nfc: "\u{022D}",
-        nfd: "\u{006F}\u{0303}\u{0304}",
-        nfkc: "\u{022D}",
-        nfkd: "\u{006F}\u{0303}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{022E}",
-        nfc: "\u{022E}",
-        nfd: "\u{004F}\u{0307}",
-        nfkc: "\u{022E}",
-        nfkd: "\u{004F}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{022F}",
-        nfc: "\u{022F}",
-        nfd: "\u{006F}\u{0307}",
-        nfkc: "\u{022F}",
-        nfkd: "\u{006F}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{0230}",
-        nfc: "\u{0230}",
-        nfd: "\u{004F}\u{0307}\u{0304}",
-        nfkc: "\u{0230}",
-        nfkd: "\u{004F}\u{0307}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0231}",
-        nfc: "\u{0231}",
-        nfd: "\u{006F}\u{0307}\u{0304}",
-        nfkc: "\u{0231}",
-        nfkd: "\u{006F}\u{0307}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0232}",
-        nfc: "\u{0232}",
-        nfd: "\u{0059}\u{0304}",
-        nfkc: "\u{0232}",
-        nfkd: "\u{0059}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{0233}",
-        nfc: "\u{0233}",
-        nfd: "\u{0079}\u{0304}",
-        nfkc: "\u{0233}",
-        nfkd: "\u{0079}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{02B0}",
-        nfc: "\u{02B0}",
-        nfd: "\u{02B0}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{02B1}",
-        nfc: "\u{02B1}",
-        nfd: "\u{02B1}",
-        nfkc: "\u{0266}",
-        nfkd: "\u{0266}",
-    },
-    NormalizationTest {
-        source: "\u{02B2}",
-        nfc: "\u{02B2}",
-        nfd: "\u{02B2}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{02B3}",
-        nfc: "\u{02B3}",
-        nfd: "\u{02B3}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{02B4}",
-        nfc: "\u{02B4}",
-        nfd: "\u{02B4}",
-        nfkc: "\u{0279}",
-        nfkd: "\u{0279}",
-    },
-    NormalizationTest {
-        source: "\u{02B5}",
-        nfc: "\u{02B5}",
-        nfd: "\u{02B5}",
-        nfkc: "\u{027B}",
-        nfkd: "\u{027B}",
-    },
-    NormalizationTest {
-        source: "\u{02B6}",
-        nfc: "\u{02B6}",
-        nfd: "\u{02B6}",
-        nfkc: "\u{0281}",
-        nfkd: "\u{0281}",
-    },
-    NormalizationTest {
-        source: "\u{02B7}",
-        nfc: "\u{02B7}",
-        nfd: "\u{02B7}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{02B8}",
-        nfc: "\u{02B8}",
-        nfd: "\u{02B8}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{02D8}",
-        nfc: "\u{02D8}",
-        nfd: "\u{02D8}",
-        nfkc: "\u{0020}\u{0306}",
-        nfkd: "\u{0020}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{02D9}",
-        nfc: "\u{02D9}",
-        nfd: "\u{02D9}",
-        nfkc: "\u{0020}\u{0307}",
-        nfkd: "\u{0020}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{02DA}",
-        nfc: "\u{02DA}",
-        nfd: "\u{02DA}",
-        nfkc: "\u{0020}\u{030A}",
-        nfkd: "\u{0020}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{02DB}",
-        nfc: "\u{02DB}",
-        nfd: "\u{02DB}",
-        nfkc: "\u{0020}\u{0328}",
-        nfkd: "\u{0020}\u{0328}",
-    },
-    NormalizationTest {
-        source: "\u{02DC}",
-        nfc: "\u{02DC}",
-        nfd: "\u{02DC}",
-        nfkc: "\u{0020}\u{0303}",
-        nfkd: "\u{0020}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{02DD}",
-        nfc: "\u{02DD}",
-        nfd: "\u{02DD}",
-        nfkc: "\u{0020}\u{030B}",
-        nfkd: "\u{0020}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{02E0}",
-        nfc: "\u{02E0}",
-        nfd: "\u{02E0}",
-        nfkc: "\u{0263}",
-        nfkd: "\u{0263}",
-    },
-    NormalizationTest {
-        source: "\u{02E1}",
-        nfc: "\u{02E1}",
-        nfd: "\u{02E1}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{02E2}",
-        nfc: "\u{02E2}",
-        nfd: "\u{02E2}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{02E3}",
-        nfc: "\u{02E3}",
-        nfd: "\u{02E3}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{02E4}",
-        nfc: "\u{02E4}",
-        nfd: "\u{02E4}",
-        nfkc: "\u{0295}",
-        nfkd: "\u{0295}",
-    },
-    NormalizationTest {
-        source: "\u{0340}",
-        nfc: "\u{0300}",
-        nfd: "\u{0300}",
-        nfkc: "\u{0300}",
-        nfkd: "\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0341}",
-        nfc: "\u{0301}",
-        nfd: "\u{0301}",
-        nfkc: "\u{0301}",
-        nfkd: "\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0343}",
-        nfc: "\u{0313}",
-        nfd: "\u{0313}",
-        nfkc: "\u{0313}",
-        nfkd: "\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{0344}",
-        nfc: "\u{0308}\u{0301}",
-        nfd: "\u{0308}\u{0301}",
-        nfkc: "\u{0308}\u{0301}",
-        nfkd: "\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0374}",
-        nfc: "\u{02B9}",
-        nfd: "\u{02B9}",
-        nfkc: "\u{02B9}",
-        nfkd: "\u{02B9}",
-    },
-    NormalizationTest {
-        source: "\u{037A}",
-        nfc: "\u{037A}",
-        nfd: "\u{037A}",
-        nfkc: "\u{0020}\u{0345}",
-        nfkd: "\u{0020}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{037E}",
-        nfc: "\u{003B}",
-        nfd: "\u{003B}",
-        nfkc: "\u{003B}",
-        nfkd: "\u{003B}",
-    },
-    NormalizationTest {
-        source: "\u{0384}",
-        nfc: "\u{0384}",
-        nfd: "\u{0384}",
-        nfkc: "\u{0020}\u{0301}",
-        nfkd: "\u{0020}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0385}",
-        nfc: "\u{0385}",
-        nfd: "\u{00A8}\u{0301}",
-        nfkc: "\u{0020}\u{0308}\u{0301}",
-        nfkd: "\u{0020}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0386}",
-        nfc: "\u{0386}",
-        nfd: "\u{0391}\u{0301}",
-        nfkc: "\u{0386}",
-        nfkd: "\u{0391}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0387}",
-        nfc: "\u{00B7}",
-        nfd: "\u{00B7}",
-        nfkc: "\u{00B7}",
-        nfkd: "\u{00B7}",
-    },
-    NormalizationTest {
-        source: "\u{0388}",
-        nfc: "\u{0388}",
-        nfd: "\u{0395}\u{0301}",
-        nfkc: "\u{0388}",
-        nfkd: "\u{0395}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0389}",
-        nfc: "\u{0389}",
-        nfd: "\u{0397}\u{0301}",
-        nfkc: "\u{0389}",
-        nfkd: "\u{0397}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{038A}",
-        nfc: "\u{038A}",
-        nfd: "\u{0399}\u{0301}",
-        nfkc: "\u{038A}",
-        nfkd: "\u{0399}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{038C}",
-        nfc: "\u{038C}",
-        nfd: "\u{039F}\u{0301}",
-        nfkc: "\u{038C}",
-        nfkd: "\u{039F}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{038E}",
-        nfc: "\u{038E}",
-        nfd: "\u{03A5}\u{0301}",
-        nfkc: "\u{038E}",
-        nfkd: "\u{03A5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{038F}",
-        nfc: "\u{038F}",
-        nfd: "\u{03A9}\u{0301}",
-        nfkc: "\u{038F}",
-        nfkd: "\u{03A9}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0390}",
-        nfc: "\u{0390}",
-        nfd: "\u{03B9}\u{0308}\u{0301}",
-        nfkc: "\u{0390}",
-        nfkd: "\u{03B9}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03AA}",
-        nfc: "\u{03AA}",
-        nfd: "\u{0399}\u{0308}",
-        nfkc: "\u{03AA}",
-        nfkd: "\u{0399}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{03AB}",
-        nfc: "\u{03AB}",
-        nfd: "\u{03A5}\u{0308}",
-        nfkc: "\u{03AB}",
-        nfkd: "\u{03A5}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{03AC}",
-        nfc: "\u{03AC}",
-        nfd: "\u{03B1}\u{0301}",
-        nfkc: "\u{03AC}",
-        nfkd: "\u{03B1}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03AD}",
-        nfc: "\u{03AD}",
-        nfd: "\u{03B5}\u{0301}",
-        nfkc: "\u{03AD}",
-        nfkd: "\u{03B5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03AE}",
-        nfc: "\u{03AE}",
-        nfd: "\u{03B7}\u{0301}",
-        nfkc: "\u{03AE}",
-        nfkd: "\u{03B7}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03AF}",
-        nfc: "\u{03AF}",
-        nfd: "\u{03B9}\u{0301}",
-        nfkc: "\u{03AF}",
-        nfkd: "\u{03B9}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03B0}",
-        nfc: "\u{03B0}",
-        nfd: "\u{03C5}\u{0308}\u{0301}",
-        nfkc: "\u{03B0}",
-        nfkd: "\u{03C5}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03CA}",
-        nfc: "\u{03CA}",
-        nfd: "\u{03B9}\u{0308}",
-        nfkc: "\u{03CA}",
-        nfkd: "\u{03B9}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{03CB}",
-        nfc: "\u{03CB}",
-        nfd: "\u{03C5}\u{0308}",
-        nfkc: "\u{03CB}",
-        nfkd: "\u{03C5}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{03CC}",
-        nfc: "\u{03CC}",
-        nfd: "\u{03BF}\u{0301}",
-        nfkc: "\u{03CC}",
-        nfkd: "\u{03BF}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03CD}",
-        nfc: "\u{03CD}",
-        nfd: "\u{03C5}\u{0301}",
-        nfkc: "\u{03CD}",
-        nfkd: "\u{03C5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03CE}",
-        nfc: "\u{03CE}",
-        nfd: "\u{03C9}\u{0301}",
-        nfkc: "\u{03CE}",
-        nfkd: "\u{03C9}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03D0}",
-        nfc: "\u{03D0}",
-        nfd: "\u{03D0}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{03D1}",
-        nfc: "\u{03D1}",
-        nfd: "\u{03D1}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{03D2}",
-        nfc: "\u{03D2}",
-        nfd: "\u{03D2}",
-        nfkc: "\u{03A5}",
-        nfkd: "\u{03A5}",
-    },
-    NormalizationTest {
-        source: "\u{03D3}",
-        nfc: "\u{03D3}",
-        nfd: "\u{03D2}\u{0301}",
-        nfkc: "\u{038E}",
-        nfkd: "\u{03A5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{03D4}",
-        nfc: "\u{03D4}",
-        nfd: "\u{03D2}\u{0308}",
-        nfkc: "\u{03AB}",
-        nfkd: "\u{03A5}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{03D5}",
-        nfc: "\u{03D5}",
-        nfd: "\u{03D5}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{03D6}",
-        nfc: "\u{03D6}",
-        nfd: "\u{03D6}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{03F0}",
-        nfc: "\u{03F0}",
-        nfd: "\u{03F0}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{03F1}",
-        nfc: "\u{03F1}",
-        nfd: "\u{03F1}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{03F2}",
-        nfc: "\u{03F2}",
-        nfd: "\u{03F2}",
-        nfkc: "\u{03C2}",
-        nfkd: "\u{03C2}",
-    },
-    NormalizationTest {
-        source: "\u{03F4}",
-        nfc: "\u{03F4}",
-        nfd: "\u{03F4}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{03F5}",
-        nfc: "\u{03F5}",
-        nfd: "\u{03F5}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{03F9}",
-        nfc: "\u{03F9}",
-        nfd: "\u{03F9}",
-        nfkc: "\u{03A3}",
-        nfkd: "\u{03A3}",
-    },
-    NormalizationTest {
-        source: "\u{0400}",
-        nfc: "\u{0400}",
-        nfd: "\u{0415}\u{0300}",
-        nfkc: "\u{0400}",
-        nfkd: "\u{0415}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0401}",
-        nfc: "\u{0401}",
-        nfd: "\u{0415}\u{0308}",
-        nfkc: "\u{0401}",
-        nfkd: "\u{0415}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{0403}",
-        nfc: "\u{0403}",
-        nfd: "\u{0413}\u{0301}",
-        nfkc: "\u{0403}",
-        nfkd: "\u{0413}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0407}",
-        nfc: "\u{0407}",
-        nfd: "\u{0406}\u{0308}",
-        nfkc: "\u{0407}",
-        nfkd: "\u{0406}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{040C}",
-        nfc: "\u{040C}",
-        nfd: "\u{041A}\u{0301}",
-        nfkc: "\u{040C}",
-        nfkd: "\u{041A}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{040D}",
-        nfc: "\u{040D}",
-        nfd: "\u{0418}\u{0300}",
-        nfkc: "\u{040D}",
-        nfkd: "\u{0418}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{040E}",
-        nfc: "\u{040E}",
-        nfd: "\u{0423}\u{0306}",
-        nfkc: "\u{040E}",
-        nfkd: "\u{0423}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0419}",
-        nfc: "\u{0419}",
-        nfd: "\u{0418}\u{0306}",
-        nfkc: "\u{0419}",
-        nfkd: "\u{0418}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0439}",
-        nfc: "\u{0439}",
-        nfd: "\u{0438}\u{0306}",
-        nfkc: "\u{0439}",
-        nfkd: "\u{0438}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0450}",
-        nfc: "\u{0450}",
-        nfd: "\u{0435}\u{0300}",
-        nfkc: "\u{0450}",
-        nfkd: "\u{0435}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{0451}",
-        nfc: "\u{0451}",
-        nfd: "\u{0435}\u{0308}",
-        nfkc: "\u{0451}",
-        nfkd: "\u{0435}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{0453}",
-        nfc: "\u{0453}",
-        nfd: "\u{0433}\u{0301}",
-        nfkc: "\u{0453}",
-        nfkd: "\u{0433}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{0457}",
-        nfc: "\u{0457}",
-        nfd: "\u{0456}\u{0308}",
-        nfkc: "\u{0457}",
-        nfkd: "\u{0456}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{045C}",
-        nfc: "\u{045C}",
-        nfd: "\u{043A}\u{0301}",
-        nfkc: "\u{045C}",
-        nfkd: "\u{043A}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{045D}",
-        nfc: "\u{045D}",
-        nfd: "\u{0438}\u{0300}",
-        nfkc: "\u{045D}",
-        nfkd: "\u{0438}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{045E}",
-        nfc: "\u{045E}",
-        nfd: "\u{0443}\u{0306}",
-        nfkc: "\u{045E}",
-        nfkd: "\u{0443}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{0476}",
-        nfc: "\u{0476}",
-        nfd: "\u{0474}\u{030F}",
-        nfkc: "\u{0476}",
-        nfkd: "\u{0474}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{0477}",
-        nfc: "\u{0477}",
-        nfd: "\u{0475}\u{030F}",
-        nfkc: "\u{0477}",
-        nfkd: "\u{0475}\u{030F}",
-    },
-    NormalizationTest {
-        source: "\u{04C1}",
-        nfc: "\u{04C1}",
-        nfd: "\u{0416}\u{0306}",
-        nfkc: "\u{04C1}",
-        nfkd: "\u{0416}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{04C2}",
-        nfc: "\u{04C2}",
-        nfd: "\u{0436}\u{0306}",
-        nfkc: "\u{04C2}",
-        nfkd: "\u{0436}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{04D0}",
-        nfc: "\u{04D0}",
-        nfd: "\u{0410}\u{0306}",
-        nfkc: "\u{04D0}",
-        nfkd: "\u{0410}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{04D1}",
-        nfc: "\u{04D1}",
-        nfd: "\u{0430}\u{0306}",
-        nfkc: "\u{04D1}",
-        nfkd: "\u{0430}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{04D2}",
-        nfc: "\u{04D2}",
-        nfd: "\u{0410}\u{0308}",
-        nfkc: "\u{04D2}",
-        nfkd: "\u{0410}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04D3}",
-        nfc: "\u{04D3}",
-        nfd: "\u{0430}\u{0308}",
-        nfkc: "\u{04D3}",
-        nfkd: "\u{0430}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04D6}",
-        nfc: "\u{04D6}",
-        nfd: "\u{0415}\u{0306}",
-        nfkc: "\u{04D6}",
-        nfkd: "\u{0415}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{04D7}",
-        nfc: "\u{04D7}",
-        nfd: "\u{0435}\u{0306}",
-        nfkc: "\u{04D7}",
-        nfkd: "\u{0435}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{04DA}",
-        nfc: "\u{04DA}",
-        nfd: "\u{04D8}\u{0308}",
-        nfkc: "\u{04DA}",
-        nfkd: "\u{04D8}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04DB}",
-        nfc: "\u{04DB}",
-        nfd: "\u{04D9}\u{0308}",
-        nfkc: "\u{04DB}",
-        nfkd: "\u{04D9}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04DC}",
-        nfc: "\u{04DC}",
-        nfd: "\u{0416}\u{0308}",
-        nfkc: "\u{04DC}",
-        nfkd: "\u{0416}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04DD}",
-        nfc: "\u{04DD}",
-        nfd: "\u{0436}\u{0308}",
-        nfkc: "\u{04DD}",
-        nfkd: "\u{0436}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04DE}",
-        nfc: "\u{04DE}",
-        nfd: "\u{0417}\u{0308}",
-        nfkc: "\u{04DE}",
-        nfkd: "\u{0417}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04DF}",
-        nfc: "\u{04DF}",
-        nfd: "\u{0437}\u{0308}",
-        nfkc: "\u{04DF}",
-        nfkd: "\u{0437}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04E2}",
-        nfc: "\u{04E2}",
-        nfd: "\u{0418}\u{0304}",
-        nfkc: "\u{04E2}",
-        nfkd: "\u{0418}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{04E3}",
-        nfc: "\u{04E3}",
-        nfd: "\u{0438}\u{0304}",
-        nfkc: "\u{04E3}",
-        nfkd: "\u{0438}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{04E4}",
-        nfc: "\u{04E4}",
-        nfd: "\u{0418}\u{0308}",
-        nfkc: "\u{04E4}",
-        nfkd: "\u{0418}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04E5}",
-        nfc: "\u{04E5}",
-        nfd: "\u{0438}\u{0308}",
-        nfkc: "\u{04E5}",
-        nfkd: "\u{0438}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04E6}",
-        nfc: "\u{04E6}",
-        nfd: "\u{041E}\u{0308}",
-        nfkc: "\u{04E6}",
-        nfkd: "\u{041E}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04E7}",
-        nfc: "\u{04E7}",
-        nfd: "\u{043E}\u{0308}",
-        nfkc: "\u{04E7}",
-        nfkd: "\u{043E}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04EA}",
-        nfc: "\u{04EA}",
-        nfd: "\u{04E8}\u{0308}",
-        nfkc: "\u{04EA}",
-        nfkd: "\u{04E8}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04EB}",
-        nfc: "\u{04EB}",
-        nfd: "\u{04E9}\u{0308}",
-        nfkc: "\u{04EB}",
-        nfkd: "\u{04E9}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04EC}",
-        nfc: "\u{04EC}",
-        nfd: "\u{042D}\u{0308}",
-        nfkc: "\u{04EC}",
-        nfkd: "\u{042D}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04ED}",
-        nfc: "\u{04ED}",
-        nfd: "\u{044D}\u{0308}",
-        nfkc: "\u{04ED}",
-        nfkd: "\u{044D}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04EE}",
-        nfc: "\u{04EE}",
-        nfd: "\u{0423}\u{0304}",
-        nfkc: "\u{04EE}",
-        nfkd: "\u{0423}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{04EF}",
-        nfc: "\u{04EF}",
-        nfd: "\u{0443}\u{0304}",
-        nfkc: "\u{04EF}",
-        nfkd: "\u{0443}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{04F0}",
-        nfc: "\u{04F0}",
-        nfd: "\u{0423}\u{0308}",
-        nfkc: "\u{04F0}",
-        nfkd: "\u{0423}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04F1}",
-        nfc: "\u{04F1}",
-        nfd: "\u{0443}\u{0308}",
-        nfkc: "\u{04F1}",
-        nfkd: "\u{0443}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04F2}",
-        nfc: "\u{04F2}",
-        nfd: "\u{0423}\u{030B}",
-        nfkc: "\u{04F2}",
-        nfkd: "\u{0423}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{04F3}",
-        nfc: "\u{04F3}",
-        nfd: "\u{0443}\u{030B}",
-        nfkc: "\u{04F3}",
-        nfkd: "\u{0443}\u{030B}",
-    },
-    NormalizationTest {
-        source: "\u{04F4}",
-        nfc: "\u{04F4}",
-        nfd: "\u{0427}\u{0308}",
-        nfkc: "\u{04F4}",
-        nfkd: "\u{0427}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04F5}",
-        nfc: "\u{04F5}",
-        nfd: "\u{0447}\u{0308}",
-        nfkc: "\u{04F5}",
-        nfkd: "\u{0447}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04F8}",
-        nfc: "\u{04F8}",
-        nfd: "\u{042B}\u{0308}",
-        nfkc: "\u{04F8}",
-        nfkd: "\u{042B}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{04F9}",
-        nfc: "\u{04F9}",
-        nfd: "\u{044B}\u{0308}",
-        nfkc: "\u{04F9}",
-        nfkd: "\u{044B}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{0587}",
-        nfc: "\u{0587}",
-        nfd: "\u{0587}",
-        nfkc: "\u{0565}\u{0582}",
-        nfkd: "\u{0565}\u{0582}",
-    },
-    NormalizationTest {
-        source: "\u{0622}",
-        nfc: "\u{0622}",
-        nfd: "\u{0627}\u{0653}",
-        nfkc: "\u{0622}",
-        nfkd: "\u{0627}\u{0653}",
-    },
-    NormalizationTest {
-        source: "\u{0623}",
-        nfc: "\u{0623}",
-        nfd: "\u{0627}\u{0654}",
-        nfkc: "\u{0623}",
-        nfkd: "\u{0627}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{0624}",
-        nfc: "\u{0624}",
-        nfd: "\u{0648}\u{0654}",
-        nfkc: "\u{0624}",
-        nfkd: "\u{0648}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{0625}",
-        nfc: "\u{0625}",
-        nfd: "\u{0627}\u{0655}",
-        nfkc: "\u{0625}",
-        nfkd: "\u{0627}\u{0655}",
-    },
-    NormalizationTest {
-        source: "\u{0626}",
-        nfc: "\u{0626}",
-        nfd: "\u{064A}\u{0654}",
-        nfkc: "\u{0626}",
-        nfkd: "\u{064A}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{0675}",
-        nfc: "\u{0675}",
-        nfd: "\u{0675}",
-        nfkc: "\u{0627}\u{0674}",
-        nfkd: "\u{0627}\u{0674}",
-    },
-    NormalizationTest {
-        source: "\u{0676}",
-        nfc: "\u{0676}",
-        nfd: "\u{0676}",
-        nfkc: "\u{0648}\u{0674}",
-        nfkd: "\u{0648}\u{0674}",
-    },
-    NormalizationTest {
-        source: "\u{0677}",
-        nfc: "\u{0677}",
-        nfd: "\u{0677}",
-        nfkc: "\u{06C7}\u{0674}",
-        nfkd: "\u{06C7}\u{0674}",
-    },
-    NormalizationTest {
-        source: "\u{0678}",
-        nfc: "\u{0678}",
-        nfd: "\u{0678}",
-        nfkc: "\u{064A}\u{0674}",
-        nfkd: "\u{064A}\u{0674}",
-    },
-    NormalizationTest {
-        source: "\u{06C0}",
-        nfc: "\u{06C0}",
-        nfd: "\u{06D5}\u{0654}",
-        nfkc: "\u{06C0}",
-        nfkd: "\u{06D5}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{06C2}",
-        nfc: "\u{06C2}",
-        nfd: "\u{06C1}\u{0654}",
-        nfkc: "\u{06C2}",
-        nfkd: "\u{06C1}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{06D3}",
-        nfc: "\u{06D3}",
-        nfd: "\u{06D2}\u{0654}",
-        nfkc: "\u{06D3}",
-        nfkd: "\u{06D2}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{0929}",
-        nfc: "\u{0929}",
-        nfd: "\u{0928}\u{093C}",
-        nfkc: "\u{0929}",
-        nfkd: "\u{0928}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{0931}",
-        nfc: "\u{0931}",
-        nfd: "\u{0930}\u{093C}",
-        nfkc: "\u{0931}",
-        nfkd: "\u{0930}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{0934}",
-        nfc: "\u{0934}",
-        nfd: "\u{0933}\u{093C}",
-        nfkc: "\u{0934}",
-        nfkd: "\u{0933}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{0958}",
-        nfc: "\u{0915}\u{093C}",
-        nfd: "\u{0915}\u{093C}",
-        nfkc: "\u{0915}\u{093C}",
-        nfkd: "\u{0915}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{0959}",
-        nfc: "\u{0916}\u{093C}",
-        nfd: "\u{0916}\u{093C}",
-        nfkc: "\u{0916}\u{093C}",
-        nfkd: "\u{0916}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{095A}",
-        nfc: "\u{0917}\u{093C}",
-        nfd: "\u{0917}\u{093C}",
-        nfkc: "\u{0917}\u{093C}",
-        nfkd: "\u{0917}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{095B}",
-        nfc: "\u{091C}\u{093C}",
-        nfd: "\u{091C}\u{093C}",
-        nfkc: "\u{091C}\u{093C}",
-        nfkd: "\u{091C}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{095C}",
-        nfc: "\u{0921}\u{093C}",
-        nfd: "\u{0921}\u{093C}",
-        nfkc: "\u{0921}\u{093C}",
-        nfkd: "\u{0921}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{095D}",
-        nfc: "\u{0922}\u{093C}",
-        nfd: "\u{0922}\u{093C}",
-        nfkc: "\u{0922}\u{093C}",
-        nfkd: "\u{0922}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{095E}",
-        nfc: "\u{092B}\u{093C}",
-        nfd: "\u{092B}\u{093C}",
-        nfkc: "\u{092B}\u{093C}",
-        nfkd: "\u{092B}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{095F}",
-        nfc: "\u{092F}\u{093C}",
-        nfd: "\u{092F}\u{093C}",
-        nfkc: "\u{092F}\u{093C}",
-        nfkd: "\u{092F}\u{093C}",
-    },
-    NormalizationTest {
-        source: "\u{09CB}",
-        nfc: "\u{09CB}",
-        nfd: "\u{09C7}\u{09BE}",
-        nfkc: "\u{09CB}",
-        nfkd: "\u{09C7}\u{09BE}",
-    },
-    NormalizationTest {
-        source: "\u{09CC}",
-        nfc: "\u{09CC}",
-        nfd: "\u{09C7}\u{09D7}",
-        nfkc: "\u{09CC}",
-        nfkd: "\u{09C7}\u{09D7}",
-    },
-    NormalizationTest {
-        source: "\u{09DC}",
-        nfc: "\u{09A1}\u{09BC}",
-        nfd: "\u{09A1}\u{09BC}",
-        nfkc: "\u{09A1}\u{09BC}",
-        nfkd: "\u{09A1}\u{09BC}",
-    },
-    NormalizationTest {
-        source: "\u{09DD}",
-        nfc: "\u{09A2}\u{09BC}",
-        nfd: "\u{09A2}\u{09BC}",
-        nfkc: "\u{09A2}\u{09BC}",
-        nfkd: "\u{09A2}\u{09BC}",
-    },
-    NormalizationTest {
-        source: "\u{09DF}",
-        nfc: "\u{09AF}\u{09BC}",
-        nfd: "\u{09AF}\u{09BC}",
-        nfkc: "\u{09AF}\u{09BC}",
-        nfkd: "\u{09AF}\u{09BC}",
-    },
-    NormalizationTest {
-        source: "\u{0A33}",
-        nfc: "\u{0A32}\u{0A3C}",
-        nfd: "\u{0A32}\u{0A3C}",
-        nfkc: "\u{0A32}\u{0A3C}",
-        nfkd: "\u{0A32}\u{0A3C}",
-    },
-    NormalizationTest {
-        source: "\u{0A36}",
-        nfc: "\u{0A38}\u{0A3C}",
-        nfd: "\u{0A38}\u{0A3C}",
-        nfkc: "\u{0A38}\u{0A3C}",
-        nfkd: "\u{0A38}\u{0A3C}",
-    },
-    NormalizationTest {
-        source: "\u{0A59}",
-        nfc: "\u{0A16}\u{0A3C}",
-        nfd: "\u{0A16}\u{0A3C}",
-        nfkc: "\u{0A16}\u{0A3C}",
-        nfkd: "\u{0A16}\u{0A3C}",
-    },
-    NormalizationTest {
-        source: "\u{0A5A}",
-        nfc: "\u{0A17}\u{0A3C}",
-        nfd: "\u{0A17}\u{0A3C}",
-        nfkc: "\u{0A17}\u{0A3C}",
-        nfkd: "\u{0A17}\u{0A3C}",
-    },
-    NormalizationTest {
-        source: "\u{0A5B}",
-        nfc: "\u{0A1C}\u{0A3C}",
-        nfd: "\u{0A1C}\u{0A3C}",
-        nfkc: "\u{0A1C}\u{0A3C}",
-        nfkd: "\u{0A1C}\u{0A3C}",
-    },
-    NormalizationTest {
-        source: "\u{0A5E}",
-        nfc: "\u{0A2B}\u{0A3C}",
-        nfd: "\u{0A2B}\u{0A3C}",
-        nfkc: "\u{0A2B}\u{0A3C}",
-        nfkd: "\u{0A2B}\u{0A3C}",
-    },
-    NormalizationTest {
-        source: "\u{0B48}",
-        nfc: "\u{0B48}",
-        nfd: "\u{0B47}\u{0B56}",
-        nfkc: "\u{0B48}",
-        nfkd: "\u{0B47}\u{0B56}",
-    },
-    NormalizationTest {
-        source: "\u{0B4B}",
-        nfc: "\u{0B4B}",
-        nfd: "\u{0B47}\u{0B3E}",
-        nfkc: "\u{0B4B}",
-        nfkd: "\u{0B47}\u{0B3E}",
-    },
-    NormalizationTest {
-        source: "\u{0B4C}",
-        nfc: "\u{0B4C}",
-        nfd: "\u{0B47}\u{0B57}",
-        nfkc: "\u{0B4C}",
-        nfkd: "\u{0B47}\u{0B57}",
-    },
-    NormalizationTest {
-        source: "\u{0B5C}",
-        nfc: "\u{0B21}\u{0B3C}",
-        nfd: "\u{0B21}\u{0B3C}",
-        nfkc: "\u{0B21}\u{0B3C}",
-        nfkd: "\u{0B21}\u{0B3C}",
-    },
-    NormalizationTest {
-        source: "\u{0B5D}",
-        nfc: "\u{0B22}\u{0B3C}",
-        nfd: "\u{0B22}\u{0B3C}",
-        nfkc: "\u{0B22}\u{0B3C}",
-        nfkd: "\u{0B22}\u{0B3C}",
-    },
-    NormalizationTest {
-        source: "\u{0B94}",
-        nfc: "\u{0B94}",
-        nfd: "\u{0B92}\u{0BD7}",
-        nfkc: "\u{0B94}",
-        nfkd: "\u{0B92}\u{0BD7}",
-    },
-    NormalizationTest {
-        source: "\u{0BCA}",
-        nfc: "\u{0BCA}",
-        nfd: "\u{0BC6}\u{0BBE}",
-        nfkc: "\u{0BCA}",
-        nfkd: "\u{0BC6}\u{0BBE}",
-    },
-    NormalizationTest {
-        source: "\u{0BCB}",
-        nfc: "\u{0BCB}",
-        nfd: "\u{0BC7}\u{0BBE}",
-        nfkc: "\u{0BCB}",
-        nfkd: "\u{0BC7}\u{0BBE}",
-    },
-    NormalizationTest {
-        source: "\u{0BCC}",
-        nfc: "\u{0BCC}",
-        nfd: "\u{0BC6}\u{0BD7}",
-        nfkc: "\u{0BCC}",
-        nfkd: "\u{0BC6}\u{0BD7}",
-    },
-    NormalizationTest {
-        source: "\u{0C48}",
-        nfc: "\u{0C48}",
-        nfd: "\u{0C46}\u{0C56}",
-        nfkc: "\u{0C48}",
-        nfkd: "\u{0C46}\u{0C56}",
-    },
-    NormalizationTest {
-        source: "\u{0CC0}",
-        nfc: "\u{0CC0}",
-        nfd: "\u{0CBF}\u{0CD5}",
-        nfkc: "\u{0CC0}",
-        nfkd: "\u{0CBF}\u{0CD5}",
-    },
-    NormalizationTest {
-        source: "\u{0CC7}",
-        nfc: "\u{0CC7}",
-        nfd: "\u{0CC6}\u{0CD5}",
-        nfkc: "\u{0CC7}",
-        nfkd: "\u{0CC6}\u{0CD5}",
-    },
-    NormalizationTest {
-        source: "\u{0CC8}",
-        nfc: "\u{0CC8}",
-        nfd: "\u{0CC6}\u{0CD6}",
-        nfkc: "\u{0CC8}",
-        nfkd: "\u{0CC6}\u{0CD6}",
-    },
-    NormalizationTest {
-        source: "\u{0CCA}",
-        nfc: "\u{0CCA}",
-        nfd: "\u{0CC6}\u{0CC2}",
-        nfkc: "\u{0CCA}",
-        nfkd: "\u{0CC6}\u{0CC2}",
-    },
-    NormalizationTest {
-        source: "\u{0CCB}",
-        nfc: "\u{0CCB}",
-        nfd: "\u{0CC6}\u{0CC2}\u{0CD5}",
-        nfkc: "\u{0CCB}",
-        nfkd: "\u{0CC6}\u{0CC2}\u{0CD5}",
-    },
-    NormalizationTest {
-        source: "\u{0D4A}",
-        nfc: "\u{0D4A}",
-        nfd: "\u{0D46}\u{0D3E}",
-        nfkc: "\u{0D4A}",
-        nfkd: "\u{0D46}\u{0D3E}",
-    },
-    NormalizationTest {
-        source: "\u{0D4B}",
-        nfc: "\u{0D4B}",
-        nfd: "\u{0D47}\u{0D3E}",
-        nfkc: "\u{0D4B}",
-        nfkd: "\u{0D47}\u{0D3E}",
-    },
-    NormalizationTest {
-        source: "\u{0D4C}",
-        nfc: "\u{0D4C}",
-        nfd: "\u{0D46}\u{0D57}",
-        nfkc: "\u{0D4C}",
-        nfkd: "\u{0D46}\u{0D57}",
-    },
-    NormalizationTest {
-        source: "\u{0DDA}",
-        nfc: "\u{0DDA}",
-        nfd: "\u{0DD9}\u{0DCA}",
-        nfkc: "\u{0DDA}",
-        nfkd: "\u{0DD9}\u{0DCA}",
-    },
-    NormalizationTest {
-        source: "\u{0DDC}",
-        nfc: "\u{0DDC}",
-        nfd: "\u{0DD9}\u{0DCF}",
-        nfkc: "\u{0DDC}",
-        nfkd: "\u{0DD9}\u{0DCF}",
-    },
-    NormalizationTest {
-        source: "\u{0DDD}",
-        nfc: "\u{0DDD}",
-        nfd: "\u{0DD9}\u{0DCF}\u{0DCA}",
-        nfkc: "\u{0DDD}",
-        nfkd: "\u{0DD9}\u{0DCF}\u{0DCA}",
-    },
-    NormalizationTest {
-        source: "\u{0DDE}",
-        nfc: "\u{0DDE}",
-        nfd: "\u{0DD9}\u{0DDF}",
-        nfkc: "\u{0DDE}",
-        nfkd: "\u{0DD9}\u{0DDF}",
-    },
-    NormalizationTest {
-        source: "\u{0E33}",
-        nfc: "\u{0E33}",
-        nfd: "\u{0E33}",
-        nfkc: "\u{0E4D}\u{0E32}",
-        nfkd: "\u{0E4D}\u{0E32}",
-    },
-    NormalizationTest {
-        source: "\u{0EB3}",
-        nfc: "\u{0EB3}",
-        nfd: "\u{0EB3}",
-        nfkc: "\u{0ECD}\u{0EB2}",
-        nfkd: "\u{0ECD}\u{0EB2}",
-    },
-    NormalizationTest {
-        source: "\u{0EDC}",
-        nfc: "\u{0EDC}",
-        nfd: "\u{0EDC}",
-        nfkc: "\u{0EAB}\u{0E99}",
-        nfkd: "\u{0EAB}\u{0E99}",
-    },
-    NormalizationTest {
-        source: "\u{0EDD}",
-        nfc: "\u{0EDD}",
-        nfd: "\u{0EDD}",
-        nfkc: "\u{0EAB}\u{0EA1}",
-        nfkd: "\u{0EAB}\u{0EA1}",
-    },
-    NormalizationTest {
-        source: "\u{0F0C}",
-        nfc: "\u{0F0C}",
-        nfd: "\u{0F0C}",
-        nfkc: "\u{0F0B}",
-        nfkd: "\u{0F0B}",
-    },
-    NormalizationTest {
-        source: "\u{0F43}",
-        nfc: "\u{0F42}\u{0FB7}",
-        nfd: "\u{0F42}\u{0FB7}",
-        nfkc: "\u{0F42}\u{0FB7}",
-        nfkd: "\u{0F42}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F4D}",
-        nfc: "\u{0F4C}\u{0FB7}",
-        nfd: "\u{0F4C}\u{0FB7}",
-        nfkc: "\u{0F4C}\u{0FB7}",
-        nfkd: "\u{0F4C}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F52}",
-        nfc: "\u{0F51}\u{0FB7}",
-        nfd: "\u{0F51}\u{0FB7}",
-        nfkc: "\u{0F51}\u{0FB7}",
-        nfkd: "\u{0F51}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F57}",
-        nfc: "\u{0F56}\u{0FB7}",
-        nfd: "\u{0F56}\u{0FB7}",
-        nfkc: "\u{0F56}\u{0FB7}",
-        nfkd: "\u{0F56}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F5C}",
-        nfc: "\u{0F5B}\u{0FB7}",
-        nfd: "\u{0F5B}\u{0FB7}",
-        nfkc: "\u{0F5B}\u{0FB7}",
-        nfkd: "\u{0F5B}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F69}",
-        nfc: "\u{0F40}\u{0FB5}",
-        nfd: "\u{0F40}\u{0FB5}",
-        nfkc: "\u{0F40}\u{0FB5}",
-        nfkd: "\u{0F40}\u{0FB5}",
-    },
-    NormalizationTest {
-        source: "\u{0F73}",
-        nfc: "\u{0F71}\u{0F72}",
-        nfd: "\u{0F71}\u{0F72}",
-        nfkc: "\u{0F71}\u{0F72}",
-        nfkd: "\u{0F71}\u{0F72}",
-    },
-    NormalizationTest {
-        source: "\u{0F75}",
-        nfc: "\u{0F71}\u{0F74}",
-        nfd: "\u{0F71}\u{0F74}",
-        nfkc: "\u{0F71}\u{0F74}",
-        nfkd: "\u{0F71}\u{0F74}",
-    },
-    NormalizationTest {
-        source: "\u{0F76}",
-        nfc: "\u{0FB2}\u{0F80}",
-        nfd: "\u{0FB2}\u{0F80}",
-        nfkc: "\u{0FB2}\u{0F80}",
-        nfkd: "\u{0FB2}\u{0F80}",
-    },
-    NormalizationTest {
-        source: "\u{0F77}",
-        nfc: "\u{0F77}",
-        nfd: "\u{0F77}",
-        nfkc: "\u{0FB2}\u{0F71}\u{0F80}",
-        nfkd: "\u{0FB2}\u{0F71}\u{0F80}",
-    },
-    NormalizationTest {
-        source: "\u{0F78}",
-        nfc: "\u{0FB3}\u{0F80}",
-        nfd: "\u{0FB3}\u{0F80}",
-        nfkc: "\u{0FB3}\u{0F80}",
-        nfkd: "\u{0FB3}\u{0F80}",
-    },
-    NormalizationTest {
-        source: "\u{0F79}",
-        nfc: "\u{0F79}",
-        nfd: "\u{0F79}",
-        nfkc: "\u{0FB3}\u{0F71}\u{0F80}",
-        nfkd: "\u{0FB3}\u{0F71}\u{0F80}",
-    },
-    NormalizationTest {
-        source: "\u{0F81}",
-        nfc: "\u{0F71}\u{0F80}",
-        nfd: "\u{0F71}\u{0F80}",
-        nfkc: "\u{0F71}\u{0F80}",
-        nfkd: "\u{0F71}\u{0F80}",
-    },
-    NormalizationTest {
-        source: "\u{0F93}",
-        nfc: "\u{0F92}\u{0FB7}",
-        nfd: "\u{0F92}\u{0FB7}",
-        nfkc: "\u{0F92}\u{0FB7}",
-        nfkd: "\u{0F92}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F9D}",
-        nfc: "\u{0F9C}\u{0FB7}",
-        nfd: "\u{0F9C}\u{0FB7}",
-        nfkc: "\u{0F9C}\u{0FB7}",
-        nfkd: "\u{0F9C}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FA2}",
-        nfc: "\u{0FA1}\u{0FB7}",
-        nfd: "\u{0FA1}\u{0FB7}",
-        nfkc: "\u{0FA1}\u{0FB7}",
-        nfkd: "\u{0FA1}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FA7}",
-        nfc: "\u{0FA6}\u{0FB7}",
-        nfd: "\u{0FA6}\u{0FB7}",
-        nfkc: "\u{0FA6}\u{0FB7}",
-        nfkd: "\u{0FA6}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FAC}",
-        nfc: "\u{0FAB}\u{0FB7}",
-        nfd: "\u{0FAB}\u{0FB7}",
-        nfkc: "\u{0FAB}\u{0FB7}",
-        nfkd: "\u{0FAB}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FB9}",
-        nfc: "\u{0F90}\u{0FB5}",
-        nfd: "\u{0F90}\u{0FB5}",
-        nfkc: "\u{0F90}\u{0FB5}",
-        nfkd: "\u{0F90}\u{0FB5}",
-    },
-    NormalizationTest {
-        source: "\u{1026}",
-        nfc: "\u{1026}",
-        nfd: "\u{1025}\u{102E}",
-        nfkc: "\u{1026}",
-        nfkd: "\u{1025}\u{102E}",
-    },
-    NormalizationTest {
-        source: "\u{10FC}",
-        nfc: "\u{10FC}",
-        nfd: "\u{10FC}",
-        nfkc: "\u{10DC}",
-        nfkd: "\u{10DC}",
-    },
-    NormalizationTest {
-        source: "\u{1B06}",
-        nfc: "\u{1B06}",
-        nfd: "\u{1B05}\u{1B35}",
-        nfkc: "\u{1B06}",
-        nfkd: "\u{1B05}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B08}",
-        nfc: "\u{1B08}",
-        nfd: "\u{1B07}\u{1B35}",
-        nfkc: "\u{1B08}",
-        nfkd: "\u{1B07}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B0A}",
-        nfc: "\u{1B0A}",
-        nfd: "\u{1B09}\u{1B35}",
-        nfkc: "\u{1B0A}",
-        nfkd: "\u{1B09}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B0C}",
-        nfc: "\u{1B0C}",
-        nfd: "\u{1B0B}\u{1B35}",
-        nfkc: "\u{1B0C}",
-        nfkd: "\u{1B0B}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B0E}",
-        nfc: "\u{1B0E}",
-        nfd: "\u{1B0D}\u{1B35}",
-        nfkc: "\u{1B0E}",
-        nfkd: "\u{1B0D}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B12}",
-        nfc: "\u{1B12}",
-        nfd: "\u{1B11}\u{1B35}",
-        nfkc: "\u{1B12}",
-        nfkd: "\u{1B11}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B3B}",
-        nfc: "\u{1B3B}",
-        nfd: "\u{1B3A}\u{1B35}",
-        nfkc: "\u{1B3B}",
-        nfkd: "\u{1B3A}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B3D}",
-        nfc: "\u{1B3D}",
-        nfd: "\u{1B3C}\u{1B35}",
-        nfkc: "\u{1B3D}",
-        nfkd: "\u{1B3C}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B40}",
-        nfc: "\u{1B40}",
-        nfd: "\u{1B3E}\u{1B35}",
-        nfkc: "\u{1B40}",
-        nfkd: "\u{1B3E}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B41}",
-        nfc: "\u{1B41}",
-        nfd: "\u{1B3F}\u{1B35}",
-        nfkc: "\u{1B41}",
-        nfkd: "\u{1B3F}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B43}",
-        nfc: "\u{1B43}",
-        nfd: "\u{1B42}\u{1B35}",
-        nfkc: "\u{1B43}",
-        nfkd: "\u{1B42}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1D2C}",
-        nfc: "\u{1D2C}",
-        nfd: "\u{1D2C}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D2D}",
-        nfc: "\u{1D2D}",
-        nfd: "\u{1D2D}",
-        nfkc: "\u{00C6}",
-        nfkd: "\u{00C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D2E}",
-        nfc: "\u{1D2E}",
-        nfd: "\u{1D2E}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D30}",
-        nfc: "\u{1D30}",
-        nfd: "\u{1D30}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D31}",
-        nfc: "\u{1D31}",
-        nfd: "\u{1D31}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D32}",
-        nfc: "\u{1D32}",
-        nfd: "\u{1D32}",
-        nfkc: "\u{018E}",
-        nfkd: "\u{018E}",
-    },
-    NormalizationTest {
-        source: "\u{1D33}",
-        nfc: "\u{1D33}",
-        nfd: "\u{1D33}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D34}",
-        nfc: "\u{1D34}",
-        nfd: "\u{1D34}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D35}",
-        nfc: "\u{1D35}",
-        nfd: "\u{1D35}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D36}",
-        nfc: "\u{1D36}",
-        nfd: "\u{1D36}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D37}",
-        nfc: "\u{1D37}",
-        nfd: "\u{1D37}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D38}",
-        nfc: "\u{1D38}",
-        nfd: "\u{1D38}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D39}",
-        nfc: "\u{1D39}",
-        nfd: "\u{1D39}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D3A}",
-        nfc: "\u{1D3A}",
-        nfd: "\u{1D3A}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D3C}",
-        nfc: "\u{1D3C}",
-        nfd: "\u{1D3C}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D3D}",
-        nfc: "\u{1D3D}",
-        nfd: "\u{1D3D}",
-        nfkc: "\u{0222}",
-        nfkd: "\u{0222}",
-    },
-    NormalizationTest {
-        source: "\u{1D3E}",
-        nfc: "\u{1D3E}",
-        nfd: "\u{1D3E}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D3F}",
-        nfc: "\u{1D3F}",
-        nfd: "\u{1D3F}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D40}",
-        nfc: "\u{1D40}",
-        nfd: "\u{1D40}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D41}",
-        nfc: "\u{1D41}",
-        nfd: "\u{1D41}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D42}",
-        nfc: "\u{1D42}",
-        nfd: "\u{1D42}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D43}",
-        nfc: "\u{1D43}",
-        nfd: "\u{1D43}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D44}",
-        nfc: "\u{1D44}",
-        nfd: "\u{1D44}",
-        nfkc: "\u{0250}",
-        nfkd: "\u{0250}",
-    },
-    NormalizationTest {
-        source: "\u{1D45}",
-        nfc: "\u{1D45}",
-        nfd: "\u{1D45}",
-        nfkc: "\u{0251}",
-        nfkd: "\u{0251}",
-    },
-    NormalizationTest {
-        source: "\u{1D46}",
-        nfc: "\u{1D46}",
-        nfd: "\u{1D46}",
-        nfkc: "\u{1D02}",
-        nfkd: "\u{1D02}",
-    },
-    NormalizationTest {
-        source: "\u{1D47}",
-        nfc: "\u{1D47}",
-        nfd: "\u{1D47}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D48}",
-        nfc: "\u{1D48}",
-        nfd: "\u{1D48}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D49}",
-        nfc: "\u{1D49}",
-        nfd: "\u{1D49}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D4A}",
-        nfc: "\u{1D4A}",
-        nfd: "\u{1D4A}",
-        nfkc: "\u{0259}",
-        nfkd: "\u{0259}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B}",
-        nfc: "\u{1D4B}",
-        nfd: "\u{1D4B}",
-        nfkc: "\u{025B}",
-        nfkd: "\u{025B}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C}",
-        nfc: "\u{1D4C}",
-        nfd: "\u{1D4C}",
-        nfkc: "\u{025C}",
-        nfkd: "\u{025C}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D}",
-        nfc: "\u{1D4D}",
-        nfd: "\u{1D4D}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F}",
-        nfc: "\u{1D4F}",
-        nfd: "\u{1D4F}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D50}",
-        nfc: "\u{1D50}",
-        nfd: "\u{1D50}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D51}",
-        nfc: "\u{1D51}",
-        nfd: "\u{1D51}",
-        nfkc: "\u{014B}",
-        nfkd: "\u{014B}",
-    },
-    NormalizationTest {
-        source: "\u{1D52}",
-        nfc: "\u{1D52}",
-        nfd: "\u{1D52}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D53}",
-        nfc: "\u{1D53}",
-        nfd: "\u{1D53}",
-        nfkc: "\u{0254}",
-        nfkd: "\u{0254}",
-    },
-    NormalizationTest {
-        source: "\u{1D54}",
-        nfc: "\u{1D54}",
-        nfd: "\u{1D54}",
-        nfkc: "\u{1D16}",
-        nfkd: "\u{1D16}",
-    },
-    NormalizationTest {
-        source: "\u{1D55}",
-        nfc: "\u{1D55}",
-        nfd: "\u{1D55}",
-        nfkc: "\u{1D17}",
-        nfkd: "\u{1D17}",
-    },
-    NormalizationTest {
-        source: "\u{1D56}",
-        nfc: "\u{1D56}",
-        nfd: "\u{1D56}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D57}",
-        nfc: "\u{1D57}",
-        nfd: "\u{1D57}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D58}",
-        nfc: "\u{1D58}",
-        nfd: "\u{1D58}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D59}",
-        nfc: "\u{1D59}",
-        nfd: "\u{1D59}",
-        nfkc: "\u{1D1D}",
-        nfkd: "\u{1D1D}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A}",
-        nfc: "\u{1D5A}",
-        nfd: "\u{1D5A}",
-        nfkc: "\u{026F}",
-        nfkd: "\u{026F}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B}",
-        nfc: "\u{1D5B}",
-        nfd: "\u{1D5B}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C}",
-        nfc: "\u{1D5C}",
-        nfd: "\u{1D5C}",
-        nfkc: "\u{1D25}",
-        nfkd: "\u{1D25}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D}",
-        nfc: "\u{1D5D}",
-        nfd: "\u{1D5D}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E}",
-        nfc: "\u{1D5E}",
-        nfd: "\u{1D5E}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F}",
-        nfc: "\u{1D5F}",
-        nfd: "\u{1D5F}",
-        nfkc: "\u{03B4}",
-        nfkd: "\u{03B4}",
-    },
-    NormalizationTest {
-        source: "\u{1D60}",
-        nfc: "\u{1D60}",
-        nfd: "\u{1D60}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D61}",
-        nfc: "\u{1D61}",
-        nfd: "\u{1D61}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D62}",
-        nfc: "\u{1D62}",
-        nfd: "\u{1D62}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D63}",
-        nfc: "\u{1D63}",
-        nfd: "\u{1D63}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D64}",
-        nfc: "\u{1D64}",
-        nfd: "\u{1D64}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D65}",
-        nfc: "\u{1D65}",
-        nfd: "\u{1D65}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D66}",
-        nfc: "\u{1D66}",
-        nfd: "\u{1D66}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D67}",
-        nfc: "\u{1D67}",
-        nfd: "\u{1D67}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D68}",
-        nfc: "\u{1D68}",
-        nfd: "\u{1D68}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D69}",
-        nfc: "\u{1D69}",
-        nfd: "\u{1D69}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A}",
-        nfc: "\u{1D6A}",
-        nfd: "\u{1D6A}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D78}",
-        nfc: "\u{1D78}",
-        nfd: "\u{1D78}",
-        nfkc: "\u{043D}",
-        nfkd: "\u{043D}",
-    },
-    NormalizationTest {
-        source: "\u{1D9B}",
-        nfc: "\u{1D9B}",
-        nfd: "\u{1D9B}",
-        nfkc: "\u{0252}",
-        nfkd: "\u{0252}",
-    },
-    NormalizationTest {
-        source: "\u{1D9C}",
-        nfc: "\u{1D9C}",
-        nfd: "\u{1D9C}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D9D}",
-        nfc: "\u{1D9D}",
-        nfd: "\u{1D9D}",
-        nfkc: "\u{0255}",
-        nfkd: "\u{0255}",
-    },
-    NormalizationTest {
-        source: "\u{1D9E}",
-        nfc: "\u{1D9E}",
-        nfd: "\u{1D9E}",
-        nfkc: "\u{00F0}",
-        nfkd: "\u{00F0}",
-    },
-    NormalizationTest {
-        source: "\u{1D9F}",
-        nfc: "\u{1D9F}",
-        nfd: "\u{1D9F}",
-        nfkc: "\u{025C}",
-        nfkd: "\u{025C}",
-    },
-    NormalizationTest {
-        source: "\u{1DA0}",
-        nfc: "\u{1DA0}",
-        nfd: "\u{1DA0}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1DA1}",
-        nfc: "\u{1DA1}",
-        nfd: "\u{1DA1}",
-        nfkc: "\u{025F}",
-        nfkd: "\u{025F}",
-    },
-    NormalizationTest {
-        source: "\u{1DA2}",
-        nfc: "\u{1DA2}",
-        nfd: "\u{1DA2}",
-        nfkc: "\u{0261}",
-        nfkd: "\u{0261}",
-    },
-    NormalizationTest {
-        source: "\u{1DA3}",
-        nfc: "\u{1DA3}",
-        nfd: "\u{1DA3}",
-        nfkc: "\u{0265}",
-        nfkd: "\u{0265}",
-    },
-    NormalizationTest {
-        source: "\u{1DA4}",
-        nfc: "\u{1DA4}",
-        nfd: "\u{1DA4}",
-        nfkc: "\u{0268}",
-        nfkd: "\u{0268}",
-    },
-    NormalizationTest {
-        source: "\u{1DA5}",
-        nfc: "\u{1DA5}",
-        nfd: "\u{1DA5}",
-        nfkc: "\u{0269}",
-        nfkd: "\u{0269}",
-    },
-    NormalizationTest {
-        source: "\u{1DA6}",
-        nfc: "\u{1DA6}",
-        nfd: "\u{1DA6}",
-        nfkc: "\u{026A}",
-        nfkd: "\u{026A}",
-    },
-    NormalizationTest {
-        source: "\u{1DA7}",
-        nfc: "\u{1DA7}",
-        nfd: "\u{1DA7}",
-        nfkc: "\u{1D7B}",
-        nfkd: "\u{1D7B}",
-    },
-    NormalizationTest {
-        source: "\u{1DA8}",
-        nfc: "\u{1DA8}",
-        nfd: "\u{1DA8}",
-        nfkc: "\u{029D}",
-        nfkd: "\u{029D}",
-    },
-    NormalizationTest {
-        source: "\u{1DA9}",
-        nfc: "\u{1DA9}",
-        nfd: "\u{1DA9}",
-        nfkc: "\u{026D}",
-        nfkd: "\u{026D}",
-    },
-    NormalizationTest {
-        source: "\u{1DAA}",
-        nfc: "\u{1DAA}",
-        nfd: "\u{1DAA}",
-        nfkc: "\u{1D85}",
-        nfkd: "\u{1D85}",
-    },
-    NormalizationTest {
-        source: "\u{1DAB}",
-        nfc: "\u{1DAB}",
-        nfd: "\u{1DAB}",
-        nfkc: "\u{029F}",
-        nfkd: "\u{029F}",
-    },
-    NormalizationTest {
-        source: "\u{1DAC}",
-        nfc: "\u{1DAC}",
-        nfd: "\u{1DAC}",
-        nfkc: "\u{0271}",
-        nfkd: "\u{0271}",
-    },
-    NormalizationTest {
-        source: "\u{1DAD}",
-        nfc: "\u{1DAD}",
-        nfd: "\u{1DAD}",
-        nfkc: "\u{0270}",
-        nfkd: "\u{0270}",
-    },
-    NormalizationTest {
-        source: "\u{1DAE}",
-        nfc: "\u{1DAE}",
-        nfd: "\u{1DAE}",
-        nfkc: "\u{0272}",
-        nfkd: "\u{0272}",
-    },
-    NormalizationTest {
-        source: "\u{1DAF}",
-        nfc: "\u{1DAF}",
-        nfd: "\u{1DAF}",
-        nfkc: "\u{0273}",
-        nfkd: "\u{0273}",
-    },
-    NormalizationTest {
-        source: "\u{1DB0}",
-        nfc: "\u{1DB0}",
-        nfd: "\u{1DB0}",
-        nfkc: "\u{0274}",
-        nfkd: "\u{0274}",
-    },
-    NormalizationTest {
-        source: "\u{1DB1}",
-        nfc: "\u{1DB1}",
-        nfd: "\u{1DB1}",
-        nfkc: "\u{0275}",
-        nfkd: "\u{0275}",
-    },
-    NormalizationTest {
-        source: "\u{1DB2}",
-        nfc: "\u{1DB2}",
-        nfd: "\u{1DB2}",
-        nfkc: "\u{0278}",
-        nfkd: "\u{0278}",
-    },
-    NormalizationTest {
-        source: "\u{1DB3}",
-        nfc: "\u{1DB3}",
-        nfd: "\u{1DB3}",
-        nfkc: "\u{0282}",
-        nfkd: "\u{0282}",
-    },
-    NormalizationTest {
-        source: "\u{1DB4}",
-        nfc: "\u{1DB4}",
-        nfd: "\u{1DB4}",
-        nfkc: "\u{0283}",
-        nfkd: "\u{0283}",
-    },
-    NormalizationTest {
-        source: "\u{1DB5}",
-        nfc: "\u{1DB5}",
-        nfd: "\u{1DB5}",
-        nfkc: "\u{01AB}",
-        nfkd: "\u{01AB}",
-    },
-    NormalizationTest {
-        source: "\u{1DB6}",
-        nfc: "\u{1DB6}",
-        nfd: "\u{1DB6}",
-        nfkc: "\u{0289}",
-        nfkd: "\u{0289}",
-    },
-    NormalizationTest {
-        source: "\u{1DB7}",
-        nfc: "\u{1DB7}",
-        nfd: "\u{1DB7}",
-        nfkc: "\u{028A}",
-        nfkd: "\u{028A}",
-    },
-    NormalizationTest {
-        source: "\u{1DB8}",
-        nfc: "\u{1DB8}",
-        nfd: "\u{1DB8}",
-        nfkc: "\u{1D1C}",
-        nfkd: "\u{1D1C}",
-    },
-    NormalizationTest {
-        source: "\u{1DB9}",
-        nfc: "\u{1DB9}",
-        nfd: "\u{1DB9}",
-        nfkc: "\u{028B}",
-        nfkd: "\u{028B}",
-    },
-    NormalizationTest {
-        source: "\u{1DBA}",
-        nfc: "\u{1DBA}",
-        nfd: "\u{1DBA}",
-        nfkc: "\u{028C}",
-        nfkd: "\u{028C}",
-    },
-    NormalizationTest {
-        source: "\u{1DBB}",
-        nfc: "\u{1DBB}",
-        nfd: "\u{1DBB}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1DBC}",
-        nfc: "\u{1DBC}",
-        nfd: "\u{1DBC}",
-        nfkc: "\u{0290}",
-        nfkd: "\u{0290}",
-    },
-    NormalizationTest {
-        source: "\u{1DBD}",
-        nfc: "\u{1DBD}",
-        nfd: "\u{1DBD}",
-        nfkc: "\u{0291}",
-        nfkd: "\u{0291}",
-    },
-    NormalizationTest {
-        source: "\u{1DBE}",
-        nfc: "\u{1DBE}",
-        nfd: "\u{1DBE}",
-        nfkc: "\u{0292}",
-        nfkd: "\u{0292}",
-    },
-    NormalizationTest {
-        source: "\u{1DBF}",
-        nfc: "\u{1DBF}",
-        nfd: "\u{1DBF}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1E00}",
-        nfc: "\u{1E00}",
-        nfd: "\u{0041}\u{0325}",
-        nfkc: "\u{1E00}",
-        nfkd: "\u{0041}\u{0325}",
-    },
-    NormalizationTest {
-        source: "\u{1E01}",
-        nfc: "\u{1E01}",
-        nfd: "\u{0061}\u{0325}",
-        nfkc: "\u{1E01}",
-        nfkd: "\u{0061}\u{0325}",
-    },
-    NormalizationTest {
-        source: "\u{1E02}",
-        nfc: "\u{1E02}",
-        nfd: "\u{0042}\u{0307}",
-        nfkc: "\u{1E02}",
-        nfkd: "\u{0042}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E03}",
-        nfc: "\u{1E03}",
-        nfd: "\u{0062}\u{0307}",
-        nfkc: "\u{1E03}",
-        nfkd: "\u{0062}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E04}",
-        nfc: "\u{1E04}",
-        nfd: "\u{0042}\u{0323}",
-        nfkc: "\u{1E04}",
-        nfkd: "\u{0042}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E05}",
-        nfc: "\u{1E05}",
-        nfd: "\u{0062}\u{0323}",
-        nfkc: "\u{1E05}",
-        nfkd: "\u{0062}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E06}",
-        nfc: "\u{1E06}",
-        nfd: "\u{0042}\u{0331}",
-        nfkc: "\u{1E06}",
-        nfkd: "\u{0042}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E07}",
-        nfc: "\u{1E07}",
-        nfd: "\u{0062}\u{0331}",
-        nfkc: "\u{1E07}",
-        nfkd: "\u{0062}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E08}",
-        nfc: "\u{1E08}",
-        nfd: "\u{0043}\u{0327}\u{0301}",
-        nfkc: "\u{1E08}",
-        nfkd: "\u{0043}\u{0327}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E09}",
-        nfc: "\u{1E09}",
-        nfd: "\u{0063}\u{0327}\u{0301}",
-        nfkc: "\u{1E09}",
-        nfkd: "\u{0063}\u{0327}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E0A}",
-        nfc: "\u{1E0A}",
-        nfd: "\u{0044}\u{0307}",
-        nfkc: "\u{1E0A}",
-        nfkd: "\u{0044}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0B}",
-        nfc: "\u{1E0B}",
-        nfd: "\u{0064}\u{0307}",
-        nfkc: "\u{1E0B}",
-        nfkd: "\u{0064}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E0C}",
-        nfc: "\u{1E0C}",
-        nfd: "\u{0044}\u{0323}",
-        nfkc: "\u{1E0C}",
-        nfkd: "\u{0044}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E0D}",
-        nfc: "\u{1E0D}",
-        nfd: "\u{0064}\u{0323}",
-        nfkc: "\u{1E0D}",
-        nfkd: "\u{0064}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E0E}",
-        nfc: "\u{1E0E}",
-        nfd: "\u{0044}\u{0331}",
-        nfkc: "\u{1E0E}",
-        nfkd: "\u{0044}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E0F}",
-        nfc: "\u{1E0F}",
-        nfd: "\u{0064}\u{0331}",
-        nfkc: "\u{1E0F}",
-        nfkd: "\u{0064}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E10}",
-        nfc: "\u{1E10}",
-        nfd: "\u{0044}\u{0327}",
-        nfkc: "\u{1E10}",
-        nfkd: "\u{0044}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{1E11}",
-        nfc: "\u{1E11}",
-        nfd: "\u{0064}\u{0327}",
-        nfkc: "\u{1E11}",
-        nfkd: "\u{0064}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{1E12}",
-        nfc: "\u{1E12}",
-        nfd: "\u{0044}\u{032D}",
-        nfkc: "\u{1E12}",
-        nfkd: "\u{0044}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E13}",
-        nfc: "\u{1E13}",
-        nfd: "\u{0064}\u{032D}",
-        nfkc: "\u{1E13}",
-        nfkd: "\u{0064}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E14}",
-        nfc: "\u{1E14}",
-        nfd: "\u{0045}\u{0304}\u{0300}",
-        nfkc: "\u{1E14}",
-        nfkd: "\u{0045}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E15}",
-        nfc: "\u{1E15}",
-        nfd: "\u{0065}\u{0304}\u{0300}",
-        nfkc: "\u{1E15}",
-        nfkd: "\u{0065}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E16}",
-        nfc: "\u{1E16}",
-        nfd: "\u{0045}\u{0304}\u{0301}",
-        nfkc: "\u{1E16}",
-        nfkd: "\u{0045}\u{0304}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E17}",
-        nfc: "\u{1E17}",
-        nfd: "\u{0065}\u{0304}\u{0301}",
-        nfkc: "\u{1E17}",
-        nfkd: "\u{0065}\u{0304}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E18}",
-        nfc: "\u{1E18}",
-        nfd: "\u{0045}\u{032D}",
-        nfkc: "\u{1E18}",
-        nfkd: "\u{0045}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E19}",
-        nfc: "\u{1E19}",
-        nfd: "\u{0065}\u{032D}",
-        nfkc: "\u{1E19}",
-        nfkd: "\u{0065}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E1A}",
-        nfc: "\u{1E1A}",
-        nfd: "\u{0045}\u{0330}",
-        nfkc: "\u{1E1A}",
-        nfkd: "\u{0045}\u{0330}",
-    },
-    NormalizationTest {
-        source: "\u{1E1B}",
-        nfc: "\u{1E1B}",
-        nfd: "\u{0065}\u{0330}",
-        nfkc: "\u{1E1B}",
-        nfkd: "\u{0065}\u{0330}",
-    },
-    NormalizationTest {
-        source: "\u{1E1C}",
-        nfc: "\u{1E1C}",
-        nfd: "\u{0045}\u{0327}\u{0306}",
-        nfkc: "\u{1E1C}",
-        nfkd: "\u{0045}\u{0327}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1E1D}",
-        nfc: "\u{1E1D}",
-        nfd: "\u{0065}\u{0327}\u{0306}",
-        nfkc: "\u{1E1D}",
-        nfkd: "\u{0065}\u{0327}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1E1E}",
-        nfc: "\u{1E1E}",
-        nfd: "\u{0046}\u{0307}",
-        nfkc: "\u{1E1E}",
-        nfkd: "\u{0046}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E1F}",
-        nfc: "\u{1E1F}",
-        nfd: "\u{0066}\u{0307}",
-        nfkc: "\u{1E1F}",
-        nfkd: "\u{0066}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E20}",
-        nfc: "\u{1E20}",
-        nfd: "\u{0047}\u{0304}",
-        nfkc: "\u{1E20}",
-        nfkd: "\u{0047}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E21}",
-        nfc: "\u{1E21}",
-        nfd: "\u{0067}\u{0304}",
-        nfkc: "\u{1E21}",
-        nfkd: "\u{0067}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E22}",
-        nfc: "\u{1E22}",
-        nfd: "\u{0048}\u{0307}",
-        nfkc: "\u{1E22}",
-        nfkd: "\u{0048}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E23}",
-        nfc: "\u{1E23}",
-        nfd: "\u{0068}\u{0307}",
-        nfkc: "\u{1E23}",
-        nfkd: "\u{0068}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E24}",
-        nfc: "\u{1E24}",
-        nfd: "\u{0048}\u{0323}",
-        nfkc: "\u{1E24}",
-        nfkd: "\u{0048}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E25}",
-        nfc: "\u{1E25}",
-        nfd: "\u{0068}\u{0323}",
-        nfkc: "\u{1E25}",
-        nfkd: "\u{0068}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E26}",
-        nfc: "\u{1E26}",
-        nfd: "\u{0048}\u{0308}",
-        nfkc: "\u{1E26}",
-        nfkd: "\u{0048}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E27}",
-        nfc: "\u{1E27}",
-        nfd: "\u{0068}\u{0308}",
-        nfkc: "\u{1E27}",
-        nfkd: "\u{0068}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E28}",
-        nfc: "\u{1E28}",
-        nfd: "\u{0048}\u{0327}",
-        nfkc: "\u{1E28}",
-        nfkd: "\u{0048}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{1E29}",
-        nfc: "\u{1E29}",
-        nfd: "\u{0068}\u{0327}",
-        nfkc: "\u{1E29}",
-        nfkd: "\u{0068}\u{0327}",
-    },
-    NormalizationTest {
-        source: "\u{1E2A}",
-        nfc: "\u{1E2A}",
-        nfd: "\u{0048}\u{032E}",
-        nfkc: "\u{1E2A}",
-        nfkd: "\u{0048}\u{032E}",
-    },
-    NormalizationTest {
-        source: "\u{1E2B}",
-        nfc: "\u{1E2B}",
-        nfd: "\u{0068}\u{032E}",
-        nfkc: "\u{1E2B}",
-        nfkd: "\u{0068}\u{032E}",
-    },
-    NormalizationTest {
-        source: "\u{1E2C}",
-        nfc: "\u{1E2C}",
-        nfd: "\u{0049}\u{0330}",
-        nfkc: "\u{1E2C}",
-        nfkd: "\u{0049}\u{0330}",
-    },
-    NormalizationTest {
-        source: "\u{1E2D}",
-        nfc: "\u{1E2D}",
-        nfd: "\u{0069}\u{0330}",
-        nfkc: "\u{1E2D}",
-        nfkd: "\u{0069}\u{0330}",
-    },
-    NormalizationTest {
-        source: "\u{1E2E}",
-        nfc: "\u{1E2E}",
-        nfd: "\u{0049}\u{0308}\u{0301}",
-        nfkc: "\u{1E2E}",
-        nfkd: "\u{0049}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E2F}",
-        nfc: "\u{1E2F}",
-        nfd: "\u{0069}\u{0308}\u{0301}",
-        nfkc: "\u{1E2F}",
-        nfkd: "\u{0069}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E30}",
-        nfc: "\u{1E30}",
-        nfd: "\u{004B}\u{0301}",
-        nfkc: "\u{1E30}",
-        nfkd: "\u{004B}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E31}",
-        nfc: "\u{1E31}",
-        nfd: "\u{006B}\u{0301}",
-        nfkc: "\u{1E31}",
-        nfkd: "\u{006B}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E32}",
-        nfc: "\u{1E32}",
-        nfd: "\u{004B}\u{0323}",
-        nfkc: "\u{1E32}",
-        nfkd: "\u{004B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E33}",
-        nfc: "\u{1E33}",
-        nfd: "\u{006B}\u{0323}",
-        nfkc: "\u{1E33}",
-        nfkd: "\u{006B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E34}",
-        nfc: "\u{1E34}",
-        nfd: "\u{004B}\u{0331}",
-        nfkc: "\u{1E34}",
-        nfkd: "\u{004B}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E35}",
-        nfc: "\u{1E35}",
-        nfd: "\u{006B}\u{0331}",
-        nfkc: "\u{1E35}",
-        nfkd: "\u{006B}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E36}",
-        nfc: "\u{1E36}",
-        nfd: "\u{004C}\u{0323}",
-        nfkc: "\u{1E36}",
-        nfkd: "\u{004C}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E37}",
-        nfc: "\u{1E37}",
-        nfd: "\u{006C}\u{0323}",
-        nfkc: "\u{1E37}",
-        nfkd: "\u{006C}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E38}",
-        nfc: "\u{1E38}",
-        nfd: "\u{004C}\u{0323}\u{0304}",
-        nfkc: "\u{1E38}",
-        nfkd: "\u{004C}\u{0323}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E39}",
-        nfc: "\u{1E39}",
-        nfd: "\u{006C}\u{0323}\u{0304}",
-        nfkc: "\u{1E39}",
-        nfkd: "\u{006C}\u{0323}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E3A}",
-        nfc: "\u{1E3A}",
-        nfd: "\u{004C}\u{0331}",
-        nfkc: "\u{1E3A}",
-        nfkd: "\u{004C}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E3B}",
-        nfc: "\u{1E3B}",
-        nfd: "\u{006C}\u{0331}",
-        nfkc: "\u{1E3B}",
-        nfkd: "\u{006C}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E3C}",
-        nfc: "\u{1E3C}",
-        nfd: "\u{004C}\u{032D}",
-        nfkc: "\u{1E3C}",
-        nfkd: "\u{004C}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E3D}",
-        nfc: "\u{1E3D}",
-        nfd: "\u{006C}\u{032D}",
-        nfkc: "\u{1E3D}",
-        nfkd: "\u{006C}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E3E}",
-        nfc: "\u{1E3E}",
-        nfd: "\u{004D}\u{0301}",
-        nfkc: "\u{1E3E}",
-        nfkd: "\u{004D}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E3F}",
-        nfc: "\u{1E3F}",
-        nfd: "\u{006D}\u{0301}",
-        nfkc: "\u{1E3F}",
-        nfkd: "\u{006D}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E40}",
-        nfc: "\u{1E40}",
-        nfd: "\u{004D}\u{0307}",
-        nfkc: "\u{1E40}",
-        nfkd: "\u{004D}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E41}",
-        nfc: "\u{1E41}",
-        nfd: "\u{006D}\u{0307}",
-        nfkc: "\u{1E41}",
-        nfkd: "\u{006D}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E42}",
-        nfc: "\u{1E42}",
-        nfd: "\u{004D}\u{0323}",
-        nfkc: "\u{1E42}",
-        nfkd: "\u{004D}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E43}",
-        nfc: "\u{1E43}",
-        nfd: "\u{006D}\u{0323}",
-        nfkc: "\u{1E43}",
-        nfkd: "\u{006D}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E44}",
-        nfc: "\u{1E44}",
-        nfd: "\u{004E}\u{0307}",
-        nfkc: "\u{1E44}",
-        nfkd: "\u{004E}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E45}",
-        nfc: "\u{1E45}",
-        nfd: "\u{006E}\u{0307}",
-        nfkc: "\u{1E45}",
-        nfkd: "\u{006E}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E46}",
-        nfc: "\u{1E46}",
-        nfd: "\u{004E}\u{0323}",
-        nfkc: "\u{1E46}",
-        nfkd: "\u{004E}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E47}",
-        nfc: "\u{1E47}",
-        nfd: "\u{006E}\u{0323}",
-        nfkc: "\u{1E47}",
-        nfkd: "\u{006E}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E48}",
-        nfc: "\u{1E48}",
-        nfd: "\u{004E}\u{0331}",
-        nfkc: "\u{1E48}",
-        nfkd: "\u{004E}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E49}",
-        nfc: "\u{1E49}",
-        nfd: "\u{006E}\u{0331}",
-        nfkc: "\u{1E49}",
-        nfkd: "\u{006E}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E4A}",
-        nfc: "\u{1E4A}",
-        nfd: "\u{004E}\u{032D}",
-        nfkc: "\u{1E4A}",
-        nfkd: "\u{004E}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E4B}",
-        nfc: "\u{1E4B}",
-        nfd: "\u{006E}\u{032D}",
-        nfkc: "\u{1E4B}",
-        nfkd: "\u{006E}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E4C}",
-        nfc: "\u{1E4C}",
-        nfd: "\u{004F}\u{0303}\u{0301}",
-        nfkc: "\u{1E4C}",
-        nfkd: "\u{004F}\u{0303}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E4D}",
-        nfc: "\u{1E4D}",
-        nfd: "\u{006F}\u{0303}\u{0301}",
-        nfkc: "\u{1E4D}",
-        nfkd: "\u{006F}\u{0303}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E4E}",
-        nfc: "\u{1E4E}",
-        nfd: "\u{004F}\u{0303}\u{0308}",
-        nfkc: "\u{1E4E}",
-        nfkd: "\u{004F}\u{0303}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E4F}",
-        nfc: "\u{1E4F}",
-        nfd: "\u{006F}\u{0303}\u{0308}",
-        nfkc: "\u{1E4F}",
-        nfkd: "\u{006F}\u{0303}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E50}",
-        nfc: "\u{1E50}",
-        nfd: "\u{004F}\u{0304}\u{0300}",
-        nfkc: "\u{1E50}",
-        nfkd: "\u{004F}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E51}",
-        nfc: "\u{1E51}",
-        nfd: "\u{006F}\u{0304}\u{0300}",
-        nfkc: "\u{1E51}",
-        nfkd: "\u{006F}\u{0304}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E52}",
-        nfc: "\u{1E52}",
-        nfd: "\u{004F}\u{0304}\u{0301}",
-        nfkc: "\u{1E52}",
-        nfkd: "\u{004F}\u{0304}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E53}",
-        nfc: "\u{1E53}",
-        nfd: "\u{006F}\u{0304}\u{0301}",
-        nfkc: "\u{1E53}",
-        nfkd: "\u{006F}\u{0304}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E54}",
-        nfc: "\u{1E54}",
-        nfd: "\u{0050}\u{0301}",
-        nfkc: "\u{1E54}",
-        nfkd: "\u{0050}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E55}",
-        nfc: "\u{1E55}",
-        nfd: "\u{0070}\u{0301}",
-        nfkc: "\u{1E55}",
-        nfkd: "\u{0070}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E56}",
-        nfc: "\u{1E56}",
-        nfd: "\u{0050}\u{0307}",
-        nfkc: "\u{1E56}",
-        nfkd: "\u{0050}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E57}",
-        nfc: "\u{1E57}",
-        nfd: "\u{0070}\u{0307}",
-        nfkc: "\u{1E57}",
-        nfkd: "\u{0070}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E58}",
-        nfc: "\u{1E58}",
-        nfd: "\u{0052}\u{0307}",
-        nfkc: "\u{1E58}",
-        nfkd: "\u{0052}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E59}",
-        nfc: "\u{1E59}",
-        nfd: "\u{0072}\u{0307}",
-        nfkc: "\u{1E59}",
-        nfkd: "\u{0072}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E5A}",
-        nfc: "\u{1E5A}",
-        nfd: "\u{0052}\u{0323}",
-        nfkc: "\u{1E5A}",
-        nfkd: "\u{0052}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E5B}",
-        nfc: "\u{1E5B}",
-        nfd: "\u{0072}\u{0323}",
-        nfkc: "\u{1E5B}",
-        nfkd: "\u{0072}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E5C}",
-        nfc: "\u{1E5C}",
-        nfd: "\u{0052}\u{0323}\u{0304}",
-        nfkc: "\u{1E5C}",
-        nfkd: "\u{0052}\u{0323}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E5D}",
-        nfc: "\u{1E5D}",
-        nfd: "\u{0072}\u{0323}\u{0304}",
-        nfkc: "\u{1E5D}",
-        nfkd: "\u{0072}\u{0323}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1E5E}",
-        nfc: "\u{1E5E}",
-        nfd: "\u{0052}\u{0331}",
-        nfkc: "\u{1E5E}",
-        nfkd: "\u{0052}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E5F}",
-        nfc: "\u{1E5F}",
-        nfd: "\u{0072}\u{0331}",
-        nfkc: "\u{1E5F}",
-        nfkd: "\u{0072}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E60}",
-        nfc: "\u{1E60}",
-        nfd: "\u{0053}\u{0307}",
-        nfkc: "\u{1E60}",
-        nfkd: "\u{0053}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E61}",
-        nfc: "\u{1E61}",
-        nfd: "\u{0073}\u{0307}",
-        nfkc: "\u{1E61}",
-        nfkd: "\u{0073}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E62}",
-        nfc: "\u{1E62}",
-        nfd: "\u{0053}\u{0323}",
-        nfkc: "\u{1E62}",
-        nfkd: "\u{0053}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E63}",
-        nfc: "\u{1E63}",
-        nfd: "\u{0073}\u{0323}",
-        nfkc: "\u{1E63}",
-        nfkd: "\u{0073}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E64}",
-        nfc: "\u{1E64}",
-        nfd: "\u{0053}\u{0301}\u{0307}",
-        nfkc: "\u{1E64}",
-        nfkd: "\u{0053}\u{0301}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E65}",
-        nfc: "\u{1E65}",
-        nfd: "\u{0073}\u{0301}\u{0307}",
-        nfkc: "\u{1E65}",
-        nfkd: "\u{0073}\u{0301}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E66}",
-        nfc: "\u{1E66}",
-        nfd: "\u{0053}\u{030C}\u{0307}",
-        nfkc: "\u{1E66}",
-        nfkd: "\u{0053}\u{030C}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E67}",
-        nfc: "\u{1E67}",
-        nfd: "\u{0073}\u{030C}\u{0307}",
-        nfkc: "\u{1E67}",
-        nfkd: "\u{0073}\u{030C}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E68}",
-        nfc: "\u{1E68}",
-        nfd: "\u{0053}\u{0323}\u{0307}",
-        nfkc: "\u{1E68}",
-        nfkd: "\u{0053}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E69}",
-        nfc: "\u{1E69}",
-        nfd: "\u{0073}\u{0323}\u{0307}",
-        nfkc: "\u{1E69}",
-        nfkd: "\u{0073}\u{0323}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E6A}",
-        nfc: "\u{1E6A}",
-        nfd: "\u{0054}\u{0307}",
-        nfkc: "\u{1E6A}",
-        nfkd: "\u{0054}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E6B}",
-        nfc: "\u{1E6B}",
-        nfd: "\u{0074}\u{0307}",
-        nfkc: "\u{1E6B}",
-        nfkd: "\u{0074}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E6C}",
-        nfc: "\u{1E6C}",
-        nfd: "\u{0054}\u{0323}",
-        nfkc: "\u{1E6C}",
-        nfkd: "\u{0054}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E6D}",
-        nfc: "\u{1E6D}",
-        nfd: "\u{0074}\u{0323}",
-        nfkc: "\u{1E6D}",
-        nfkd: "\u{0074}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E6E}",
-        nfc: "\u{1E6E}",
-        nfd: "\u{0054}\u{0331}",
-        nfkc: "\u{1E6E}",
-        nfkd: "\u{0054}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E6F}",
-        nfc: "\u{1E6F}",
-        nfd: "\u{0074}\u{0331}",
-        nfkc: "\u{1E6F}",
-        nfkd: "\u{0074}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E70}",
-        nfc: "\u{1E70}",
-        nfd: "\u{0054}\u{032D}",
-        nfkc: "\u{1E70}",
-        nfkd: "\u{0054}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E71}",
-        nfc: "\u{1E71}",
-        nfd: "\u{0074}\u{032D}",
-        nfkc: "\u{1E71}",
-        nfkd: "\u{0074}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E72}",
-        nfc: "\u{1E72}",
-        nfd: "\u{0055}\u{0324}",
-        nfkc: "\u{1E72}",
-        nfkd: "\u{0055}\u{0324}",
-    },
-    NormalizationTest {
-        source: "\u{1E73}",
-        nfc: "\u{1E73}",
-        nfd: "\u{0075}\u{0324}",
-        nfkc: "\u{1E73}",
-        nfkd: "\u{0075}\u{0324}",
-    },
-    NormalizationTest {
-        source: "\u{1E74}",
-        nfc: "\u{1E74}",
-        nfd: "\u{0055}\u{0330}",
-        nfkc: "\u{1E74}",
-        nfkd: "\u{0055}\u{0330}",
-    },
-    NormalizationTest {
-        source: "\u{1E75}",
-        nfc: "\u{1E75}",
-        nfd: "\u{0075}\u{0330}",
-        nfkc: "\u{1E75}",
-        nfkd: "\u{0075}\u{0330}",
-    },
-    NormalizationTest {
-        source: "\u{1E76}",
-        nfc: "\u{1E76}",
-        nfd: "\u{0055}\u{032D}",
-        nfkc: "\u{1E76}",
-        nfkd: "\u{0055}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E77}",
-        nfc: "\u{1E77}",
-        nfd: "\u{0075}\u{032D}",
-        nfkc: "\u{1E77}",
-        nfkd: "\u{0075}\u{032D}",
-    },
-    NormalizationTest {
-        source: "\u{1E78}",
-        nfc: "\u{1E78}",
-        nfd: "\u{0055}\u{0303}\u{0301}",
-        nfkc: "\u{1E78}",
-        nfkd: "\u{0055}\u{0303}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E79}",
-        nfc: "\u{1E79}",
-        nfd: "\u{0075}\u{0303}\u{0301}",
-        nfkc: "\u{1E79}",
-        nfkd: "\u{0075}\u{0303}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E7A}",
-        nfc: "\u{1E7A}",
-        nfd: "\u{0055}\u{0304}\u{0308}",
-        nfkc: "\u{1E7A}",
-        nfkd: "\u{0055}\u{0304}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E7B}",
-        nfc: "\u{1E7B}",
-        nfd: "\u{0075}\u{0304}\u{0308}",
-        nfkc: "\u{1E7B}",
-        nfkd: "\u{0075}\u{0304}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E7C}",
-        nfc: "\u{1E7C}",
-        nfd: "\u{0056}\u{0303}",
-        nfkc: "\u{1E7C}",
-        nfkd: "\u{0056}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1E7D}",
-        nfc: "\u{1E7D}",
-        nfd: "\u{0076}\u{0303}",
-        nfkc: "\u{1E7D}",
-        nfkd: "\u{0076}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1E7E}",
-        nfc: "\u{1E7E}",
-        nfd: "\u{0056}\u{0323}",
-        nfkc: "\u{1E7E}",
-        nfkd: "\u{0056}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E7F}",
-        nfc: "\u{1E7F}",
-        nfd: "\u{0076}\u{0323}",
-        nfkc: "\u{1E7F}",
-        nfkd: "\u{0076}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E80}",
-        nfc: "\u{1E80}",
-        nfd: "\u{0057}\u{0300}",
-        nfkc: "\u{1E80}",
-        nfkd: "\u{0057}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E81}",
-        nfc: "\u{1E81}",
-        nfd: "\u{0077}\u{0300}",
-        nfkc: "\u{1E81}",
-        nfkd: "\u{0077}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1E82}",
-        nfc: "\u{1E82}",
-        nfd: "\u{0057}\u{0301}",
-        nfkc: "\u{1E82}",
-        nfkd: "\u{0057}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E83}",
-        nfc: "\u{1E83}",
-        nfd: "\u{0077}\u{0301}",
-        nfkc: "\u{1E83}",
-        nfkd: "\u{0077}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1E84}",
-        nfc: "\u{1E84}",
-        nfd: "\u{0057}\u{0308}",
-        nfkc: "\u{1E84}",
-        nfkd: "\u{0057}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E85}",
-        nfc: "\u{1E85}",
-        nfd: "\u{0077}\u{0308}",
-        nfkc: "\u{1E85}",
-        nfkd: "\u{0077}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E86}",
-        nfc: "\u{1E86}",
-        nfd: "\u{0057}\u{0307}",
-        nfkc: "\u{1E86}",
-        nfkd: "\u{0057}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E87}",
-        nfc: "\u{1E87}",
-        nfd: "\u{0077}\u{0307}",
-        nfkc: "\u{1E87}",
-        nfkd: "\u{0077}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E88}",
-        nfc: "\u{1E88}",
-        nfd: "\u{0057}\u{0323}",
-        nfkc: "\u{1E88}",
-        nfkd: "\u{0057}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E89}",
-        nfc: "\u{1E89}",
-        nfd: "\u{0077}\u{0323}",
-        nfkc: "\u{1E89}",
-        nfkd: "\u{0077}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E8A}",
-        nfc: "\u{1E8A}",
-        nfd: "\u{0058}\u{0307}",
-        nfkc: "\u{1E8A}",
-        nfkd: "\u{0058}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E8B}",
-        nfc: "\u{1E8B}",
-        nfd: "\u{0078}\u{0307}",
-        nfkc: "\u{1E8B}",
-        nfkd: "\u{0078}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E8C}",
-        nfc: "\u{1E8C}",
-        nfd: "\u{0058}\u{0308}",
-        nfkc: "\u{1E8C}",
-        nfkd: "\u{0058}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E8D}",
-        nfc: "\u{1E8D}",
-        nfd: "\u{0078}\u{0308}",
-        nfkc: "\u{1E8D}",
-        nfkd: "\u{0078}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E8E}",
-        nfc: "\u{1E8E}",
-        nfd: "\u{0059}\u{0307}",
-        nfkc: "\u{1E8E}",
-        nfkd: "\u{0059}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E8F}",
-        nfc: "\u{1E8F}",
-        nfd: "\u{0079}\u{0307}",
-        nfkc: "\u{1E8F}",
-        nfkd: "\u{0079}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1E90}",
-        nfc: "\u{1E90}",
-        nfd: "\u{005A}\u{0302}",
-        nfkc: "\u{1E90}",
-        nfkd: "\u{005A}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1E91}",
-        nfc: "\u{1E91}",
-        nfd: "\u{007A}\u{0302}",
-        nfkc: "\u{1E91}",
-        nfkd: "\u{007A}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1E92}",
-        nfc: "\u{1E92}",
-        nfd: "\u{005A}\u{0323}",
-        nfkc: "\u{1E92}",
-        nfkd: "\u{005A}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E93}",
-        nfc: "\u{1E93}",
-        nfd: "\u{007A}\u{0323}",
-        nfkc: "\u{1E93}",
-        nfkd: "\u{007A}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1E94}",
-        nfc: "\u{1E94}",
-        nfd: "\u{005A}\u{0331}",
-        nfkc: "\u{1E94}",
-        nfkd: "\u{005A}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E95}",
-        nfc: "\u{1E95}",
-        nfd: "\u{007A}\u{0331}",
-        nfkc: "\u{1E95}",
-        nfkd: "\u{007A}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E96}",
-        nfc: "\u{1E96}",
-        nfd: "\u{0068}\u{0331}",
-        nfkc: "\u{1E96}",
-        nfkd: "\u{0068}\u{0331}",
-    },
-    NormalizationTest {
-        source: "\u{1E97}",
-        nfc: "\u{1E97}",
-        nfd: "\u{0074}\u{0308}",
-        nfkc: "\u{1E97}",
-        nfkd: "\u{0074}\u{0308}",
-    },
-    NormalizationTest {
-        source: "\u{1E98}",
-        nfc: "\u{1E98}",
-        nfd: "\u{0077}\u{030A}",
-        nfkc: "\u{1E98}",
-        nfkd: "\u{0077}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{1E99}",
-        nfc: "\u{1E99}",
-        nfd: "\u{0079}\u{030A}",
-        nfkc: "\u{1E99}",
-        nfkd: "\u{0079}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{1E9A}",
-        nfc: "\u{1E9A}",
-        nfd: "\u{1E9A}",
-        nfkc: "\u{0061}\u{02BE}",
-        nfkd: "\u{0061}\u{02BE}",
-    },
-    NormalizationTest {
-        source: "\u{1E9B}",
-        nfc: "\u{1E9B}",
-        nfd: "\u{017F}\u{0307}",
-        nfkc: "\u{1E61}",
-        nfkd: "\u{0073}\u{0307}",
-    },
-    NormalizationTest {
-        source: "\u{1EA0}",
-        nfc: "\u{1EA0}",
-        nfd: "\u{0041}\u{0323}",
-        nfkc: "\u{1EA0}",
-        nfkd: "\u{0041}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EA1}",
-        nfc: "\u{1EA1}",
-        nfd: "\u{0061}\u{0323}",
-        nfkc: "\u{1EA1}",
-        nfkd: "\u{0061}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EA2}",
-        nfc: "\u{1EA2}",
-        nfd: "\u{0041}\u{0309}",
-        nfkc: "\u{1EA2}",
-        nfkd: "\u{0041}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EA3}",
-        nfc: "\u{1EA3}",
-        nfd: "\u{0061}\u{0309}",
-        nfkc: "\u{1EA3}",
-        nfkd: "\u{0061}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EA4}",
-        nfc: "\u{1EA4}",
-        nfd: "\u{0041}\u{0302}\u{0301}",
-        nfkc: "\u{1EA4}",
-        nfkd: "\u{0041}\u{0302}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EA5}",
-        nfc: "\u{1EA5}",
-        nfd: "\u{0061}\u{0302}\u{0301}",
-        nfkc: "\u{1EA5}",
-        nfkd: "\u{0061}\u{0302}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EA6}",
-        nfc: "\u{1EA6}",
-        nfd: "\u{0041}\u{0302}\u{0300}",
-        nfkc: "\u{1EA6}",
-        nfkd: "\u{0041}\u{0302}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EA7}",
-        nfc: "\u{1EA7}",
-        nfd: "\u{0061}\u{0302}\u{0300}",
-        nfkc: "\u{1EA7}",
-        nfkd: "\u{0061}\u{0302}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EA8}",
-        nfc: "\u{1EA8}",
-        nfd: "\u{0041}\u{0302}\u{0309}",
-        nfkc: "\u{1EA8}",
-        nfkd: "\u{0041}\u{0302}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EA9}",
-        nfc: "\u{1EA9}",
-        nfd: "\u{0061}\u{0302}\u{0309}",
-        nfkc: "\u{1EA9}",
-        nfkd: "\u{0061}\u{0302}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EAA}",
-        nfc: "\u{1EAA}",
-        nfd: "\u{0041}\u{0302}\u{0303}",
-        nfkc: "\u{1EAA}",
-        nfkd: "\u{0041}\u{0302}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EAB}",
-        nfc: "\u{1EAB}",
-        nfd: "\u{0061}\u{0302}\u{0303}",
-        nfkc: "\u{1EAB}",
-        nfkd: "\u{0061}\u{0302}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EAC}",
-        nfc: "\u{1EAC}",
-        nfd: "\u{0041}\u{0323}\u{0302}",
-        nfkc: "\u{1EAC}",
-        nfkd: "\u{0041}\u{0323}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1EAD}",
-        nfc: "\u{1EAD}",
-        nfd: "\u{0061}\u{0323}\u{0302}",
-        nfkc: "\u{1EAD}",
-        nfkd: "\u{0061}\u{0323}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1EAE}",
-        nfc: "\u{1EAE}",
-        nfd: "\u{0041}\u{0306}\u{0301}",
-        nfkc: "\u{1EAE}",
-        nfkd: "\u{0041}\u{0306}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EAF}",
-        nfc: "\u{1EAF}",
-        nfd: "\u{0061}\u{0306}\u{0301}",
-        nfkc: "\u{1EAF}",
-        nfkd: "\u{0061}\u{0306}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EB0}",
-        nfc: "\u{1EB0}",
-        nfd: "\u{0041}\u{0306}\u{0300}",
-        nfkc: "\u{1EB0}",
-        nfkd: "\u{0041}\u{0306}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EB1}",
-        nfc: "\u{1EB1}",
-        nfd: "\u{0061}\u{0306}\u{0300}",
-        nfkc: "\u{1EB1}",
-        nfkd: "\u{0061}\u{0306}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EB2}",
-        nfc: "\u{1EB2}",
-        nfd: "\u{0041}\u{0306}\u{0309}",
-        nfkc: "\u{1EB2}",
-        nfkd: "\u{0041}\u{0306}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EB3}",
-        nfc: "\u{1EB3}",
-        nfd: "\u{0061}\u{0306}\u{0309}",
-        nfkc: "\u{1EB3}",
-        nfkd: "\u{0061}\u{0306}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EB4}",
-        nfc: "\u{1EB4}",
-        nfd: "\u{0041}\u{0306}\u{0303}",
-        nfkc: "\u{1EB4}",
-        nfkd: "\u{0041}\u{0306}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EB5}",
-        nfc: "\u{1EB5}",
-        nfd: "\u{0061}\u{0306}\u{0303}",
-        nfkc: "\u{1EB5}",
-        nfkd: "\u{0061}\u{0306}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EB6}",
-        nfc: "\u{1EB6}",
-        nfd: "\u{0041}\u{0323}\u{0306}",
-        nfkc: "\u{1EB6}",
-        nfkd: "\u{0041}\u{0323}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1EB7}",
-        nfc: "\u{1EB7}",
-        nfd: "\u{0061}\u{0323}\u{0306}",
-        nfkc: "\u{1EB7}",
-        nfkd: "\u{0061}\u{0323}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1EB8}",
-        nfc: "\u{1EB8}",
-        nfd: "\u{0045}\u{0323}",
-        nfkc: "\u{1EB8}",
-        nfkd: "\u{0045}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EB9}",
-        nfc: "\u{1EB9}",
-        nfd: "\u{0065}\u{0323}",
-        nfkc: "\u{1EB9}",
-        nfkd: "\u{0065}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EBA}",
-        nfc: "\u{1EBA}",
-        nfd: "\u{0045}\u{0309}",
-        nfkc: "\u{1EBA}",
-        nfkd: "\u{0045}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EBB}",
-        nfc: "\u{1EBB}",
-        nfd: "\u{0065}\u{0309}",
-        nfkc: "\u{1EBB}",
-        nfkd: "\u{0065}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EBC}",
-        nfc: "\u{1EBC}",
-        nfd: "\u{0045}\u{0303}",
-        nfkc: "\u{1EBC}",
-        nfkd: "\u{0045}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EBD}",
-        nfc: "\u{1EBD}",
-        nfd: "\u{0065}\u{0303}",
-        nfkc: "\u{1EBD}",
-        nfkd: "\u{0065}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EBE}",
-        nfc: "\u{1EBE}",
-        nfd: "\u{0045}\u{0302}\u{0301}",
-        nfkc: "\u{1EBE}",
-        nfkd: "\u{0045}\u{0302}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EBF}",
-        nfc: "\u{1EBF}",
-        nfd: "\u{0065}\u{0302}\u{0301}",
-        nfkc: "\u{1EBF}",
-        nfkd: "\u{0065}\u{0302}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EC0}",
-        nfc: "\u{1EC0}",
-        nfd: "\u{0045}\u{0302}\u{0300}",
-        nfkc: "\u{1EC0}",
-        nfkd: "\u{0045}\u{0302}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EC1}",
-        nfc: "\u{1EC1}",
-        nfd: "\u{0065}\u{0302}\u{0300}",
-        nfkc: "\u{1EC1}",
-        nfkd: "\u{0065}\u{0302}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EC2}",
-        nfc: "\u{1EC2}",
-        nfd: "\u{0045}\u{0302}\u{0309}",
-        nfkc: "\u{1EC2}",
-        nfkd: "\u{0045}\u{0302}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EC3}",
-        nfc: "\u{1EC3}",
-        nfd: "\u{0065}\u{0302}\u{0309}",
-        nfkc: "\u{1EC3}",
-        nfkd: "\u{0065}\u{0302}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EC4}",
-        nfc: "\u{1EC4}",
-        nfd: "\u{0045}\u{0302}\u{0303}",
-        nfkc: "\u{1EC4}",
-        nfkd: "\u{0045}\u{0302}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EC5}",
-        nfc: "\u{1EC5}",
-        nfd: "\u{0065}\u{0302}\u{0303}",
-        nfkc: "\u{1EC5}",
-        nfkd: "\u{0065}\u{0302}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EC6}",
-        nfc: "\u{1EC6}",
-        nfd: "\u{0045}\u{0323}\u{0302}",
-        nfkc: "\u{1EC6}",
-        nfkd: "\u{0045}\u{0323}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1EC7}",
-        nfc: "\u{1EC7}",
-        nfd: "\u{0065}\u{0323}\u{0302}",
-        nfkc: "\u{1EC7}",
-        nfkd: "\u{0065}\u{0323}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1EC8}",
-        nfc: "\u{1EC8}",
-        nfd: "\u{0049}\u{0309}",
-        nfkc: "\u{1EC8}",
-        nfkd: "\u{0049}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EC9}",
-        nfc: "\u{1EC9}",
-        nfd: "\u{0069}\u{0309}",
-        nfkc: "\u{1EC9}",
-        nfkd: "\u{0069}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1ECA}",
-        nfc: "\u{1ECA}",
-        nfd: "\u{0049}\u{0323}",
-        nfkc: "\u{1ECA}",
-        nfkd: "\u{0049}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1ECB}",
-        nfc: "\u{1ECB}",
-        nfd: "\u{0069}\u{0323}",
-        nfkc: "\u{1ECB}",
-        nfkd: "\u{0069}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1ECC}",
-        nfc: "\u{1ECC}",
-        nfd: "\u{004F}\u{0323}",
-        nfkc: "\u{1ECC}",
-        nfkd: "\u{004F}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1ECD}",
-        nfc: "\u{1ECD}",
-        nfd: "\u{006F}\u{0323}",
-        nfkc: "\u{1ECD}",
-        nfkd: "\u{006F}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1ECE}",
-        nfc: "\u{1ECE}",
-        nfd: "\u{004F}\u{0309}",
-        nfkc: "\u{1ECE}",
-        nfkd: "\u{004F}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1ECF}",
-        nfc: "\u{1ECF}",
-        nfd: "\u{006F}\u{0309}",
-        nfkc: "\u{1ECF}",
-        nfkd: "\u{006F}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1ED0}",
-        nfc: "\u{1ED0}",
-        nfd: "\u{004F}\u{0302}\u{0301}",
-        nfkc: "\u{1ED0}",
-        nfkd: "\u{004F}\u{0302}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1ED1}",
-        nfc: "\u{1ED1}",
-        nfd: "\u{006F}\u{0302}\u{0301}",
-        nfkc: "\u{1ED1}",
-        nfkd: "\u{006F}\u{0302}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1ED2}",
-        nfc: "\u{1ED2}",
-        nfd: "\u{004F}\u{0302}\u{0300}",
-        nfkc: "\u{1ED2}",
-        nfkd: "\u{004F}\u{0302}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1ED3}",
-        nfc: "\u{1ED3}",
-        nfd: "\u{006F}\u{0302}\u{0300}",
-        nfkc: "\u{1ED3}",
-        nfkd: "\u{006F}\u{0302}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1ED4}",
-        nfc: "\u{1ED4}",
-        nfd: "\u{004F}\u{0302}\u{0309}",
-        nfkc: "\u{1ED4}",
-        nfkd: "\u{004F}\u{0302}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1ED5}",
-        nfc: "\u{1ED5}",
-        nfd: "\u{006F}\u{0302}\u{0309}",
-        nfkc: "\u{1ED5}",
-        nfkd: "\u{006F}\u{0302}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1ED6}",
-        nfc: "\u{1ED6}",
-        nfd: "\u{004F}\u{0302}\u{0303}",
-        nfkc: "\u{1ED6}",
-        nfkd: "\u{004F}\u{0302}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1ED7}",
-        nfc: "\u{1ED7}",
-        nfd: "\u{006F}\u{0302}\u{0303}",
-        nfkc: "\u{1ED7}",
-        nfkd: "\u{006F}\u{0302}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1ED8}",
-        nfc: "\u{1ED8}",
-        nfd: "\u{004F}\u{0323}\u{0302}",
-        nfkc: "\u{1ED8}",
-        nfkd: "\u{004F}\u{0323}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1ED9}",
-        nfc: "\u{1ED9}",
-        nfd: "\u{006F}\u{0323}\u{0302}",
-        nfkc: "\u{1ED9}",
-        nfkd: "\u{006F}\u{0323}\u{0302}",
-    },
-    NormalizationTest {
-        source: "\u{1EDA}",
-        nfc: "\u{1EDA}",
-        nfd: "\u{004F}\u{031B}\u{0301}",
-        nfkc: "\u{1EDA}",
-        nfkd: "\u{004F}\u{031B}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EDB}",
-        nfc: "\u{1EDB}",
-        nfd: "\u{006F}\u{031B}\u{0301}",
-        nfkc: "\u{1EDB}",
-        nfkd: "\u{006F}\u{031B}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EDC}",
-        nfc: "\u{1EDC}",
-        nfd: "\u{004F}\u{031B}\u{0300}",
-        nfkc: "\u{1EDC}",
-        nfkd: "\u{004F}\u{031B}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EDD}",
-        nfc: "\u{1EDD}",
-        nfd: "\u{006F}\u{031B}\u{0300}",
-        nfkc: "\u{1EDD}",
-        nfkd: "\u{006F}\u{031B}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EDE}",
-        nfc: "\u{1EDE}",
-        nfd: "\u{004F}\u{031B}\u{0309}",
-        nfkc: "\u{1EDE}",
-        nfkd: "\u{004F}\u{031B}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EDF}",
-        nfc: "\u{1EDF}",
-        nfd: "\u{006F}\u{031B}\u{0309}",
-        nfkc: "\u{1EDF}",
-        nfkd: "\u{006F}\u{031B}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0}",
-        nfc: "\u{1EE0}",
-        nfd: "\u{004F}\u{031B}\u{0303}",
-        nfkc: "\u{1EE0}",
-        nfkd: "\u{004F}\u{031B}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1}",
-        nfc: "\u{1EE1}",
-        nfd: "\u{006F}\u{031B}\u{0303}",
-        nfkc: "\u{1EE1}",
-        nfkd: "\u{006F}\u{031B}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2}",
-        nfc: "\u{1EE2}",
-        nfd: "\u{004F}\u{031B}\u{0323}",
-        nfkc: "\u{1EE2}",
-        nfkd: "\u{004F}\u{031B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EE3}",
-        nfc: "\u{1EE3}",
-        nfd: "\u{006F}\u{031B}\u{0323}",
-        nfkc: "\u{1EE3}",
-        nfkd: "\u{006F}\u{031B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EE4}",
-        nfc: "\u{1EE4}",
-        nfd: "\u{0055}\u{0323}",
-        nfkc: "\u{1EE4}",
-        nfkd: "\u{0055}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EE5}",
-        nfc: "\u{1EE5}",
-        nfd: "\u{0075}\u{0323}",
-        nfkc: "\u{1EE5}",
-        nfkd: "\u{0075}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EE6}",
-        nfc: "\u{1EE6}",
-        nfd: "\u{0055}\u{0309}",
-        nfkc: "\u{1EE6}",
-        nfkd: "\u{0055}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EE7}",
-        nfc: "\u{1EE7}",
-        nfd: "\u{0075}\u{0309}",
-        nfkc: "\u{1EE7}",
-        nfkd: "\u{0075}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EE8}",
-        nfc: "\u{1EE8}",
-        nfd: "\u{0055}\u{031B}\u{0301}",
-        nfkc: "\u{1EE8}",
-        nfkd: "\u{0055}\u{031B}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EE9}",
-        nfc: "\u{1EE9}",
-        nfd: "\u{0075}\u{031B}\u{0301}",
-        nfkc: "\u{1EE9}",
-        nfkd: "\u{0075}\u{031B}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA}",
-        nfc: "\u{1EEA}",
-        nfd: "\u{0055}\u{031B}\u{0300}",
-        nfkc: "\u{1EEA}",
-        nfkd: "\u{0055}\u{031B}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB}",
-        nfc: "\u{1EEB}",
-        nfd: "\u{0075}\u{031B}\u{0300}",
-        nfkc: "\u{1EEB}",
-        nfkd: "\u{0075}\u{031B}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EEC}",
-        nfc: "\u{1EEC}",
-        nfd: "\u{0055}\u{031B}\u{0309}",
-        nfkc: "\u{1EEC}",
-        nfkd: "\u{0055}\u{031B}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EED}",
-        nfc: "\u{1EED}",
-        nfd: "\u{0075}\u{031B}\u{0309}",
-        nfkc: "\u{1EED}",
-        nfkd: "\u{0075}\u{031B}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EEE}",
-        nfc: "\u{1EEE}",
-        nfd: "\u{0055}\u{031B}\u{0303}",
-        nfkc: "\u{1EEE}",
-        nfkd: "\u{0055}\u{031B}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EEF}",
-        nfc: "\u{1EEF}",
-        nfd: "\u{0075}\u{031B}\u{0303}",
-        nfkc: "\u{1EEF}",
-        nfkd: "\u{0075}\u{031B}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EF0}",
-        nfc: "\u{1EF0}",
-        nfd: "\u{0055}\u{031B}\u{0323}",
-        nfkc: "\u{1EF0}",
-        nfkd: "\u{0055}\u{031B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EF1}",
-        nfc: "\u{1EF1}",
-        nfd: "\u{0075}\u{031B}\u{0323}",
-        nfkc: "\u{1EF1}",
-        nfkd: "\u{0075}\u{031B}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EF2}",
-        nfc: "\u{1EF2}",
-        nfd: "\u{0059}\u{0300}",
-        nfkc: "\u{1EF2}",
-        nfkd: "\u{0059}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EF3}",
-        nfc: "\u{1EF3}",
-        nfd: "\u{0079}\u{0300}",
-        nfkc: "\u{1EF3}",
-        nfkd: "\u{0079}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1EF4}",
-        nfc: "\u{1EF4}",
-        nfd: "\u{0059}\u{0323}",
-        nfkc: "\u{1EF4}",
-        nfkd: "\u{0059}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EF5}",
-        nfc: "\u{1EF5}",
-        nfd: "\u{0079}\u{0323}",
-        nfkc: "\u{1EF5}",
-        nfkd: "\u{0079}\u{0323}",
-    },
-    NormalizationTest {
-        source: "\u{1EF6}",
-        nfc: "\u{1EF6}",
-        nfd: "\u{0059}\u{0309}",
-        nfkc: "\u{1EF6}",
-        nfkd: "\u{0059}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EF7}",
-        nfc: "\u{1EF7}",
-        nfd: "\u{0079}\u{0309}",
-        nfkc: "\u{1EF7}",
-        nfkd: "\u{0079}\u{0309}",
-    },
-    NormalizationTest {
-        source: "\u{1EF8}",
-        nfc: "\u{1EF8}",
-        nfd: "\u{0059}\u{0303}",
-        nfkc: "\u{1EF8}",
-        nfkd: "\u{0059}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1EF9}",
-        nfc: "\u{1EF9}",
-        nfd: "\u{0079}\u{0303}",
-        nfkc: "\u{1EF9}",
-        nfkd: "\u{0079}\u{0303}",
-    },
-    NormalizationTest {
-        source: "\u{1F00}",
-        nfc: "\u{1F00}",
-        nfd: "\u{03B1}\u{0313}",
-        nfkc: "\u{1F00}",
-        nfkd: "\u{03B1}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F01}",
-        nfc: "\u{1F01}",
-        nfd: "\u{03B1}\u{0314}",
-        nfkc: "\u{1F01}",
-        nfkd: "\u{03B1}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F02}",
-        nfc: "\u{1F02}",
-        nfd: "\u{03B1}\u{0313}\u{0300}",
-        nfkc: "\u{1F02}",
-        nfkd: "\u{03B1}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F03}",
-        nfc: "\u{1F03}",
-        nfd: "\u{03B1}\u{0314}\u{0300}",
-        nfkc: "\u{1F03}",
-        nfkd: "\u{03B1}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F04}",
-        nfc: "\u{1F04}",
-        nfd: "\u{03B1}\u{0313}\u{0301}",
-        nfkc: "\u{1F04}",
-        nfkd: "\u{03B1}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F05}",
-        nfc: "\u{1F05}",
-        nfd: "\u{03B1}\u{0314}\u{0301}",
-        nfkc: "\u{1F05}",
-        nfkd: "\u{03B1}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F06}",
-        nfc: "\u{1F06}",
-        nfd: "\u{03B1}\u{0313}\u{0342}",
-        nfkc: "\u{1F06}",
-        nfkd: "\u{03B1}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F07}",
-        nfc: "\u{1F07}",
-        nfd: "\u{03B1}\u{0314}\u{0342}",
-        nfkc: "\u{1F07}",
-        nfkd: "\u{03B1}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F08}",
-        nfc: "\u{1F08}",
-        nfd: "\u{0391}\u{0313}",
-        nfkc: "\u{1F08}",
-        nfkd: "\u{0391}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F09}",
-        nfc: "\u{1F09}",
-        nfd: "\u{0391}\u{0314}",
-        nfkc: "\u{1F09}",
-        nfkd: "\u{0391}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F0A}",
-        nfc: "\u{1F0A}",
-        nfd: "\u{0391}\u{0313}\u{0300}",
-        nfkc: "\u{1F0A}",
-        nfkd: "\u{0391}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F0B}",
-        nfc: "\u{1F0B}",
-        nfd: "\u{0391}\u{0314}\u{0300}",
-        nfkc: "\u{1F0B}",
-        nfkd: "\u{0391}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F0C}",
-        nfc: "\u{1F0C}",
-        nfd: "\u{0391}\u{0313}\u{0301}",
-        nfkc: "\u{1F0C}",
-        nfkd: "\u{0391}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F0D}",
-        nfc: "\u{1F0D}",
-        nfd: "\u{0391}\u{0314}\u{0301}",
-        nfkc: "\u{1F0D}",
-        nfkd: "\u{0391}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F0E}",
-        nfc: "\u{1F0E}",
-        nfd: "\u{0391}\u{0313}\u{0342}",
-        nfkc: "\u{1F0E}",
-        nfkd: "\u{0391}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F0F}",
-        nfc: "\u{1F0F}",
-        nfd: "\u{0391}\u{0314}\u{0342}",
-        nfkc: "\u{1F0F}",
-        nfkd: "\u{0391}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F10}",
-        nfc: "\u{1F10}",
-        nfd: "\u{03B5}\u{0313}",
-        nfkc: "\u{1F10}",
-        nfkd: "\u{03B5}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F11}",
-        nfc: "\u{1F11}",
-        nfd: "\u{03B5}\u{0314}",
-        nfkc: "\u{1F11}",
-        nfkd: "\u{03B5}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F12}",
-        nfc: "\u{1F12}",
-        nfd: "\u{03B5}\u{0313}\u{0300}",
-        nfkc: "\u{1F12}",
-        nfkd: "\u{03B5}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F13}",
-        nfc: "\u{1F13}",
-        nfd: "\u{03B5}\u{0314}\u{0300}",
-        nfkc: "\u{1F13}",
-        nfkd: "\u{03B5}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F14}",
-        nfc: "\u{1F14}",
-        nfd: "\u{03B5}\u{0313}\u{0301}",
-        nfkc: "\u{1F14}",
-        nfkd: "\u{03B5}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F15}",
-        nfc: "\u{1F15}",
-        nfd: "\u{03B5}\u{0314}\u{0301}",
-        nfkc: "\u{1F15}",
-        nfkd: "\u{03B5}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F18}",
-        nfc: "\u{1F18}",
-        nfd: "\u{0395}\u{0313}",
-        nfkc: "\u{1F18}",
-        nfkd: "\u{0395}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F19}",
-        nfc: "\u{1F19}",
-        nfd: "\u{0395}\u{0314}",
-        nfkc: "\u{1F19}",
-        nfkd: "\u{0395}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F1A}",
-        nfc: "\u{1F1A}",
-        nfd: "\u{0395}\u{0313}\u{0300}",
-        nfkc: "\u{1F1A}",
-        nfkd: "\u{0395}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F1B}",
-        nfc: "\u{1F1B}",
-        nfd: "\u{0395}\u{0314}\u{0300}",
-        nfkc: "\u{1F1B}",
-        nfkd: "\u{0395}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F1C}",
-        nfc: "\u{1F1C}",
-        nfd: "\u{0395}\u{0313}\u{0301}",
-        nfkc: "\u{1F1C}",
-        nfkd: "\u{0395}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F1D}",
-        nfc: "\u{1F1D}",
-        nfd: "\u{0395}\u{0314}\u{0301}",
-        nfkc: "\u{1F1D}",
-        nfkd: "\u{0395}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F20}",
-        nfc: "\u{1F20}",
-        nfd: "\u{03B7}\u{0313}",
-        nfkc: "\u{1F20}",
-        nfkd: "\u{03B7}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F21}",
-        nfc: "\u{1F21}",
-        nfd: "\u{03B7}\u{0314}",
-        nfkc: "\u{1F21}",
-        nfkd: "\u{03B7}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F22}",
-        nfc: "\u{1F22}",
-        nfd: "\u{03B7}\u{0313}\u{0300}",
-        nfkc: "\u{1F22}",
-        nfkd: "\u{03B7}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F23}",
-        nfc: "\u{1F23}",
-        nfd: "\u{03B7}\u{0314}\u{0300}",
-        nfkc: "\u{1F23}",
-        nfkd: "\u{03B7}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F24}",
-        nfc: "\u{1F24}",
-        nfd: "\u{03B7}\u{0313}\u{0301}",
-        nfkc: "\u{1F24}",
-        nfkd: "\u{03B7}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F25}",
-        nfc: "\u{1F25}",
-        nfd: "\u{03B7}\u{0314}\u{0301}",
-        nfkc: "\u{1F25}",
-        nfkd: "\u{03B7}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F26}",
-        nfc: "\u{1F26}",
-        nfd: "\u{03B7}\u{0313}\u{0342}",
-        nfkc: "\u{1F26}",
-        nfkd: "\u{03B7}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F27}",
-        nfc: "\u{1F27}",
-        nfd: "\u{03B7}\u{0314}\u{0342}",
-        nfkc: "\u{1F27}",
-        nfkd: "\u{03B7}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F28}",
-        nfc: "\u{1F28}",
-        nfd: "\u{0397}\u{0313}",
-        nfkc: "\u{1F28}",
-        nfkd: "\u{0397}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F29}",
-        nfc: "\u{1F29}",
-        nfd: "\u{0397}\u{0314}",
-        nfkc: "\u{1F29}",
-        nfkd: "\u{0397}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F2A}",
-        nfc: "\u{1F2A}",
-        nfd: "\u{0397}\u{0313}\u{0300}",
-        nfkc: "\u{1F2A}",
-        nfkd: "\u{0397}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F2B}",
-        nfc: "\u{1F2B}",
-        nfd: "\u{0397}\u{0314}\u{0300}",
-        nfkc: "\u{1F2B}",
-        nfkd: "\u{0397}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F2C}",
-        nfc: "\u{1F2C}",
-        nfd: "\u{0397}\u{0313}\u{0301}",
-        nfkc: "\u{1F2C}",
-        nfkd: "\u{0397}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F2D}",
-        nfc: "\u{1F2D}",
-        nfd: "\u{0397}\u{0314}\u{0301}",
-        nfkc: "\u{1F2D}",
-        nfkd: "\u{0397}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F2E}",
-        nfc: "\u{1F2E}",
-        nfd: "\u{0397}\u{0313}\u{0342}",
-        nfkc: "\u{1F2E}",
-        nfkd: "\u{0397}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F2F}",
-        nfc: "\u{1F2F}",
-        nfd: "\u{0397}\u{0314}\u{0342}",
-        nfkc: "\u{1F2F}",
-        nfkd: "\u{0397}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F30}",
-        nfc: "\u{1F30}",
-        nfd: "\u{03B9}\u{0313}",
-        nfkc: "\u{1F30}",
-        nfkd: "\u{03B9}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F31}",
-        nfc: "\u{1F31}",
-        nfd: "\u{03B9}\u{0314}",
-        nfkc: "\u{1F31}",
-        nfkd: "\u{03B9}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F32}",
-        nfc: "\u{1F32}",
-        nfd: "\u{03B9}\u{0313}\u{0300}",
-        nfkc: "\u{1F32}",
-        nfkd: "\u{03B9}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F33}",
-        nfc: "\u{1F33}",
-        nfd: "\u{03B9}\u{0314}\u{0300}",
-        nfkc: "\u{1F33}",
-        nfkd: "\u{03B9}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F34}",
-        nfc: "\u{1F34}",
-        nfd: "\u{03B9}\u{0313}\u{0301}",
-        nfkc: "\u{1F34}",
-        nfkd: "\u{03B9}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F35}",
-        nfc: "\u{1F35}",
-        nfd: "\u{03B9}\u{0314}\u{0301}",
-        nfkc: "\u{1F35}",
-        nfkd: "\u{03B9}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F36}",
-        nfc: "\u{1F36}",
-        nfd: "\u{03B9}\u{0313}\u{0342}",
-        nfkc: "\u{1F36}",
-        nfkd: "\u{03B9}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F37}",
-        nfc: "\u{1F37}",
-        nfd: "\u{03B9}\u{0314}\u{0342}",
-        nfkc: "\u{1F37}",
-        nfkd: "\u{03B9}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F38}",
-        nfc: "\u{1F38}",
-        nfd: "\u{0399}\u{0313}",
-        nfkc: "\u{1F38}",
-        nfkd: "\u{0399}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F39}",
-        nfc: "\u{1F39}",
-        nfd: "\u{0399}\u{0314}",
-        nfkc: "\u{1F39}",
-        nfkd: "\u{0399}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F3A}",
-        nfc: "\u{1F3A}",
-        nfd: "\u{0399}\u{0313}\u{0300}",
-        nfkc: "\u{1F3A}",
-        nfkd: "\u{0399}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F3B}",
-        nfc: "\u{1F3B}",
-        nfd: "\u{0399}\u{0314}\u{0300}",
-        nfkc: "\u{1F3B}",
-        nfkd: "\u{0399}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F3C}",
-        nfc: "\u{1F3C}",
-        nfd: "\u{0399}\u{0313}\u{0301}",
-        nfkc: "\u{1F3C}",
-        nfkd: "\u{0399}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F3D}",
-        nfc: "\u{1F3D}",
-        nfd: "\u{0399}\u{0314}\u{0301}",
-        nfkc: "\u{1F3D}",
-        nfkd: "\u{0399}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F3E}",
-        nfc: "\u{1F3E}",
-        nfd: "\u{0399}\u{0313}\u{0342}",
-        nfkc: "\u{1F3E}",
-        nfkd: "\u{0399}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F3F}",
-        nfc: "\u{1F3F}",
-        nfd: "\u{0399}\u{0314}\u{0342}",
-        nfkc: "\u{1F3F}",
-        nfkd: "\u{0399}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F40}",
-        nfc: "\u{1F40}",
-        nfd: "\u{03BF}\u{0313}",
-        nfkc: "\u{1F40}",
-        nfkd: "\u{03BF}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F41}",
-        nfc: "\u{1F41}",
-        nfd: "\u{03BF}\u{0314}",
-        nfkc: "\u{1F41}",
-        nfkd: "\u{03BF}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F42}",
-        nfc: "\u{1F42}",
-        nfd: "\u{03BF}\u{0313}\u{0300}",
-        nfkc: "\u{1F42}",
-        nfkd: "\u{03BF}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F43}",
-        nfc: "\u{1F43}",
-        nfd: "\u{03BF}\u{0314}\u{0300}",
-        nfkc: "\u{1F43}",
-        nfkd: "\u{03BF}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F44}",
-        nfc: "\u{1F44}",
-        nfd: "\u{03BF}\u{0313}\u{0301}",
-        nfkc: "\u{1F44}",
-        nfkd: "\u{03BF}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F45}",
-        nfc: "\u{1F45}",
-        nfd: "\u{03BF}\u{0314}\u{0301}",
-        nfkc: "\u{1F45}",
-        nfkd: "\u{03BF}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F48}",
-        nfc: "\u{1F48}",
-        nfd: "\u{039F}\u{0313}",
-        nfkc: "\u{1F48}",
-        nfkd: "\u{039F}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F49}",
-        nfc: "\u{1F49}",
-        nfd: "\u{039F}\u{0314}",
-        nfkc: "\u{1F49}",
-        nfkd: "\u{039F}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F4A}",
-        nfc: "\u{1F4A}",
-        nfd: "\u{039F}\u{0313}\u{0300}",
-        nfkc: "\u{1F4A}",
-        nfkd: "\u{039F}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F4B}",
-        nfc: "\u{1F4B}",
-        nfd: "\u{039F}\u{0314}\u{0300}",
-        nfkc: "\u{1F4B}",
-        nfkd: "\u{039F}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F4C}",
-        nfc: "\u{1F4C}",
-        nfd: "\u{039F}\u{0313}\u{0301}",
-        nfkc: "\u{1F4C}",
-        nfkd: "\u{039F}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F4D}",
-        nfc: "\u{1F4D}",
-        nfd: "\u{039F}\u{0314}\u{0301}",
-        nfkc: "\u{1F4D}",
-        nfkd: "\u{039F}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F50}",
-        nfc: "\u{1F50}",
-        nfd: "\u{03C5}\u{0313}",
-        nfkc: "\u{1F50}",
-        nfkd: "\u{03C5}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F51}",
-        nfc: "\u{1F51}",
-        nfd: "\u{03C5}\u{0314}",
-        nfkc: "\u{1F51}",
-        nfkd: "\u{03C5}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F52}",
-        nfc: "\u{1F52}",
-        nfd: "\u{03C5}\u{0313}\u{0300}",
-        nfkc: "\u{1F52}",
-        nfkd: "\u{03C5}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F53}",
-        nfc: "\u{1F53}",
-        nfd: "\u{03C5}\u{0314}\u{0300}",
-        nfkc: "\u{1F53}",
-        nfkd: "\u{03C5}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F54}",
-        nfc: "\u{1F54}",
-        nfd: "\u{03C5}\u{0313}\u{0301}",
-        nfkc: "\u{1F54}",
-        nfkd: "\u{03C5}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F55}",
-        nfc: "\u{1F55}",
-        nfd: "\u{03C5}\u{0314}\u{0301}",
-        nfkc: "\u{1F55}",
-        nfkd: "\u{03C5}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F56}",
-        nfc: "\u{1F56}",
-        nfd: "\u{03C5}\u{0313}\u{0342}",
-        nfkc: "\u{1F56}",
-        nfkd: "\u{03C5}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F57}",
-        nfc: "\u{1F57}",
-        nfd: "\u{03C5}\u{0314}\u{0342}",
-        nfkc: "\u{1F57}",
-        nfkd: "\u{03C5}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F59}",
-        nfc: "\u{1F59}",
-        nfd: "\u{03A5}\u{0314}",
-        nfkc: "\u{1F59}",
-        nfkd: "\u{03A5}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F5B}",
-        nfc: "\u{1F5B}",
-        nfd: "\u{03A5}\u{0314}\u{0300}",
-        nfkc: "\u{1F5B}",
-        nfkd: "\u{03A5}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F5D}",
-        nfc: "\u{1F5D}",
-        nfd: "\u{03A5}\u{0314}\u{0301}",
-        nfkc: "\u{1F5D}",
-        nfkd: "\u{03A5}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F5F}",
-        nfc: "\u{1F5F}",
-        nfd: "\u{03A5}\u{0314}\u{0342}",
-        nfkc: "\u{1F5F}",
-        nfkd: "\u{03A5}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F60}",
-        nfc: "\u{1F60}",
-        nfd: "\u{03C9}\u{0313}",
-        nfkc: "\u{1F60}",
-        nfkd: "\u{03C9}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F61}",
-        nfc: "\u{1F61}",
-        nfd: "\u{03C9}\u{0314}",
-        nfkc: "\u{1F61}",
-        nfkd: "\u{03C9}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F62}",
-        nfc: "\u{1F62}",
-        nfd: "\u{03C9}\u{0313}\u{0300}",
-        nfkc: "\u{1F62}",
-        nfkd: "\u{03C9}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F63}",
-        nfc: "\u{1F63}",
-        nfd: "\u{03C9}\u{0314}\u{0300}",
-        nfkc: "\u{1F63}",
-        nfkd: "\u{03C9}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F64}",
-        nfc: "\u{1F64}",
-        nfd: "\u{03C9}\u{0313}\u{0301}",
-        nfkc: "\u{1F64}",
-        nfkd: "\u{03C9}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F65}",
-        nfc: "\u{1F65}",
-        nfd: "\u{03C9}\u{0314}\u{0301}",
-        nfkc: "\u{1F65}",
-        nfkd: "\u{03C9}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F66}",
-        nfc: "\u{1F66}",
-        nfd: "\u{03C9}\u{0313}\u{0342}",
-        nfkc: "\u{1F66}",
-        nfkd: "\u{03C9}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F67}",
-        nfc: "\u{1F67}",
-        nfd: "\u{03C9}\u{0314}\u{0342}",
-        nfkc: "\u{1F67}",
-        nfkd: "\u{03C9}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F68}",
-        nfc: "\u{1F68}",
-        nfd: "\u{03A9}\u{0313}",
-        nfkc: "\u{1F68}",
-        nfkd: "\u{03A9}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1F69}",
-        nfc: "\u{1F69}",
-        nfd: "\u{03A9}\u{0314}",
-        nfkc: "\u{1F69}",
-        nfkd: "\u{03A9}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1F6A}",
-        nfc: "\u{1F6A}",
-        nfd: "\u{03A9}\u{0313}\u{0300}",
-        nfkc: "\u{1F6A}",
-        nfkd: "\u{03A9}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F6B}",
-        nfc: "\u{1F6B}",
-        nfd: "\u{03A9}\u{0314}\u{0300}",
-        nfkc: "\u{1F6B}",
-        nfkd: "\u{03A9}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F6C}",
-        nfc: "\u{1F6C}",
-        nfd: "\u{03A9}\u{0313}\u{0301}",
-        nfkc: "\u{1F6C}",
-        nfkd: "\u{03A9}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F6D}",
-        nfc: "\u{1F6D}",
-        nfd: "\u{03A9}\u{0314}\u{0301}",
-        nfkc: "\u{1F6D}",
-        nfkd: "\u{03A9}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F6E}",
-        nfc: "\u{1F6E}",
-        nfd: "\u{03A9}\u{0313}\u{0342}",
-        nfkc: "\u{1F6E}",
-        nfkd: "\u{03A9}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F6F}",
-        nfc: "\u{1F6F}",
-        nfd: "\u{03A9}\u{0314}\u{0342}",
-        nfkc: "\u{1F6F}",
-        nfkd: "\u{03A9}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1F70}",
-        nfc: "\u{1F70}",
-        nfd: "\u{03B1}\u{0300}",
-        nfkc: "\u{1F70}",
-        nfkd: "\u{03B1}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F71}",
-        nfc: "\u{03AC}",
-        nfd: "\u{03B1}\u{0301}",
-        nfkc: "\u{03AC}",
-        nfkd: "\u{03B1}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F72}",
-        nfc: "\u{1F72}",
-        nfd: "\u{03B5}\u{0300}",
-        nfkc: "\u{1F72}",
-        nfkd: "\u{03B5}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F73}",
-        nfc: "\u{03AD}",
-        nfd: "\u{03B5}\u{0301}",
-        nfkc: "\u{03AD}",
-        nfkd: "\u{03B5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F74}",
-        nfc: "\u{1F74}",
-        nfd: "\u{03B7}\u{0300}",
-        nfkc: "\u{1F74}",
-        nfkd: "\u{03B7}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F75}",
-        nfc: "\u{03AE}",
-        nfd: "\u{03B7}\u{0301}",
-        nfkc: "\u{03AE}",
-        nfkd: "\u{03B7}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F76}",
-        nfc: "\u{1F76}",
-        nfd: "\u{03B9}\u{0300}",
-        nfkc: "\u{1F76}",
-        nfkd: "\u{03B9}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F77}",
-        nfc: "\u{03AF}",
-        nfd: "\u{03B9}\u{0301}",
-        nfkc: "\u{03AF}",
-        nfkd: "\u{03B9}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F78}",
-        nfc: "\u{1F78}",
-        nfd: "\u{03BF}\u{0300}",
-        nfkc: "\u{1F78}",
-        nfkd: "\u{03BF}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F79}",
-        nfc: "\u{03CC}",
-        nfd: "\u{03BF}\u{0301}",
-        nfkc: "\u{03CC}",
-        nfkd: "\u{03BF}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F7A}",
-        nfc: "\u{1F7A}",
-        nfd: "\u{03C5}\u{0300}",
-        nfkc: "\u{1F7A}",
-        nfkd: "\u{03C5}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F7B}",
-        nfc: "\u{03CD}",
-        nfd: "\u{03C5}\u{0301}",
-        nfkc: "\u{03CD}",
-        nfkd: "\u{03C5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F7C}",
-        nfc: "\u{1F7C}",
-        nfd: "\u{03C9}\u{0300}",
-        nfkc: "\u{1F7C}",
-        nfkd: "\u{03C9}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1F7D}",
-        nfc: "\u{03CE}",
-        nfd: "\u{03C9}\u{0301}",
-        nfkc: "\u{03CE}",
-        nfkd: "\u{03C9}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1F80}",
-        nfc: "\u{1F80}",
-        nfd: "\u{03B1}\u{0313}\u{0345}",
-        nfkc: "\u{1F80}",
-        nfkd: "\u{03B1}\u{0313}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F81}",
-        nfc: "\u{1F81}",
-        nfd: "\u{03B1}\u{0314}\u{0345}",
-        nfkc: "\u{1F81}",
-        nfkd: "\u{03B1}\u{0314}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F82}",
-        nfc: "\u{1F82}",
-        nfd: "\u{03B1}\u{0313}\u{0300}\u{0345}",
-        nfkc: "\u{1F82}",
-        nfkd: "\u{03B1}\u{0313}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F83}",
-        nfc: "\u{1F83}",
-        nfd: "\u{03B1}\u{0314}\u{0300}\u{0345}",
-        nfkc: "\u{1F83}",
-        nfkd: "\u{03B1}\u{0314}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F84}",
-        nfc: "\u{1F84}",
-        nfd: "\u{03B1}\u{0313}\u{0301}\u{0345}",
-        nfkc: "\u{1F84}",
-        nfkd: "\u{03B1}\u{0313}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F85}",
-        nfc: "\u{1F85}",
-        nfd: "\u{03B1}\u{0314}\u{0301}\u{0345}",
-        nfkc: "\u{1F85}",
-        nfkd: "\u{03B1}\u{0314}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F86}",
-        nfc: "\u{1F86}",
-        nfd: "\u{03B1}\u{0313}\u{0342}\u{0345}",
-        nfkc: "\u{1F86}",
-        nfkd: "\u{03B1}\u{0313}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F87}",
-        nfc: "\u{1F87}",
-        nfd: "\u{03B1}\u{0314}\u{0342}\u{0345}",
-        nfkc: "\u{1F87}",
-        nfkd: "\u{03B1}\u{0314}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F88}",
-        nfc: "\u{1F88}",
-        nfd: "\u{0391}\u{0313}\u{0345}",
-        nfkc: "\u{1F88}",
-        nfkd: "\u{0391}\u{0313}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F89}",
-        nfc: "\u{1F89}",
-        nfd: "\u{0391}\u{0314}\u{0345}",
-        nfkc: "\u{1F89}",
-        nfkd: "\u{0391}\u{0314}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F8A}",
-        nfc: "\u{1F8A}",
-        nfd: "\u{0391}\u{0313}\u{0300}\u{0345}",
-        nfkc: "\u{1F8A}",
-        nfkd: "\u{0391}\u{0313}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F8B}",
-        nfc: "\u{1F8B}",
-        nfd: "\u{0391}\u{0314}\u{0300}\u{0345}",
-        nfkc: "\u{1F8B}",
-        nfkd: "\u{0391}\u{0314}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F8C}",
-        nfc: "\u{1F8C}",
-        nfd: "\u{0391}\u{0313}\u{0301}\u{0345}",
-        nfkc: "\u{1F8C}",
-        nfkd: "\u{0391}\u{0313}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F8D}",
-        nfc: "\u{1F8D}",
-        nfd: "\u{0391}\u{0314}\u{0301}\u{0345}",
-        nfkc: "\u{1F8D}",
-        nfkd: "\u{0391}\u{0314}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F8E}",
-        nfc: "\u{1F8E}",
-        nfd: "\u{0391}\u{0313}\u{0342}\u{0345}",
-        nfkc: "\u{1F8E}",
-        nfkd: "\u{0391}\u{0313}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F8F}",
-        nfc: "\u{1F8F}",
-        nfd: "\u{0391}\u{0314}\u{0342}\u{0345}",
-        nfkc: "\u{1F8F}",
-        nfkd: "\u{0391}\u{0314}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F90}",
-        nfc: "\u{1F90}",
-        nfd: "\u{03B7}\u{0313}\u{0345}",
-        nfkc: "\u{1F90}",
-        nfkd: "\u{03B7}\u{0313}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F91}",
-        nfc: "\u{1F91}",
-        nfd: "\u{03B7}\u{0314}\u{0345}",
-        nfkc: "\u{1F91}",
-        nfkd: "\u{03B7}\u{0314}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F92}",
-        nfc: "\u{1F92}",
-        nfd: "\u{03B7}\u{0313}\u{0300}\u{0345}",
-        nfkc: "\u{1F92}",
-        nfkd: "\u{03B7}\u{0313}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F93}",
-        nfc: "\u{1F93}",
-        nfd: "\u{03B7}\u{0314}\u{0300}\u{0345}",
-        nfkc: "\u{1F93}",
-        nfkd: "\u{03B7}\u{0314}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F94}",
-        nfc: "\u{1F94}",
-        nfd: "\u{03B7}\u{0313}\u{0301}\u{0345}",
-        nfkc: "\u{1F94}",
-        nfkd: "\u{03B7}\u{0313}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F95}",
-        nfc: "\u{1F95}",
-        nfd: "\u{03B7}\u{0314}\u{0301}\u{0345}",
-        nfkc: "\u{1F95}",
-        nfkd: "\u{03B7}\u{0314}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F96}",
-        nfc: "\u{1F96}",
-        nfd: "\u{03B7}\u{0313}\u{0342}\u{0345}",
-        nfkc: "\u{1F96}",
-        nfkd: "\u{03B7}\u{0313}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F97}",
-        nfc: "\u{1F97}",
-        nfd: "\u{03B7}\u{0314}\u{0342}\u{0345}",
-        nfkc: "\u{1F97}",
-        nfkd: "\u{03B7}\u{0314}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F98}",
-        nfc: "\u{1F98}",
-        nfd: "\u{0397}\u{0313}\u{0345}",
-        nfkc: "\u{1F98}",
-        nfkd: "\u{0397}\u{0313}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F99}",
-        nfc: "\u{1F99}",
-        nfd: "\u{0397}\u{0314}\u{0345}",
-        nfkc: "\u{1F99}",
-        nfkd: "\u{0397}\u{0314}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F9A}",
-        nfc: "\u{1F9A}",
-        nfd: "\u{0397}\u{0313}\u{0300}\u{0345}",
-        nfkc: "\u{1F9A}",
-        nfkd: "\u{0397}\u{0313}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F9B}",
-        nfc: "\u{1F9B}",
-        nfd: "\u{0397}\u{0314}\u{0300}\u{0345}",
-        nfkc: "\u{1F9B}",
-        nfkd: "\u{0397}\u{0314}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F9C}",
-        nfc: "\u{1F9C}",
-        nfd: "\u{0397}\u{0313}\u{0301}\u{0345}",
-        nfkc: "\u{1F9C}",
-        nfkd: "\u{0397}\u{0313}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F9D}",
-        nfc: "\u{1F9D}",
-        nfd: "\u{0397}\u{0314}\u{0301}\u{0345}",
-        nfkc: "\u{1F9D}",
-        nfkd: "\u{0397}\u{0314}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F9E}",
-        nfc: "\u{1F9E}",
-        nfd: "\u{0397}\u{0313}\u{0342}\u{0345}",
-        nfkc: "\u{1F9E}",
-        nfkd: "\u{0397}\u{0313}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1F9F}",
-        nfc: "\u{1F9F}",
-        nfd: "\u{0397}\u{0314}\u{0342}\u{0345}",
-        nfkc: "\u{1F9F}",
-        nfkd: "\u{0397}\u{0314}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA0}",
-        nfc: "\u{1FA0}",
-        nfd: "\u{03C9}\u{0313}\u{0345}",
-        nfkc: "\u{1FA0}",
-        nfkd: "\u{03C9}\u{0313}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA1}",
-        nfc: "\u{1FA1}",
-        nfd: "\u{03C9}\u{0314}\u{0345}",
-        nfkc: "\u{1FA1}",
-        nfkd: "\u{03C9}\u{0314}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA2}",
-        nfc: "\u{1FA2}",
-        nfd: "\u{03C9}\u{0313}\u{0300}\u{0345}",
-        nfkc: "\u{1FA2}",
-        nfkd: "\u{03C9}\u{0313}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA3}",
-        nfc: "\u{1FA3}",
-        nfd: "\u{03C9}\u{0314}\u{0300}\u{0345}",
-        nfkc: "\u{1FA3}",
-        nfkd: "\u{03C9}\u{0314}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA4}",
-        nfc: "\u{1FA4}",
-        nfd: "\u{03C9}\u{0313}\u{0301}\u{0345}",
-        nfkc: "\u{1FA4}",
-        nfkd: "\u{03C9}\u{0313}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA5}",
-        nfc: "\u{1FA5}",
-        nfd: "\u{03C9}\u{0314}\u{0301}\u{0345}",
-        nfkc: "\u{1FA5}",
-        nfkd: "\u{03C9}\u{0314}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA6}",
-        nfc: "\u{1FA6}",
-        nfd: "\u{03C9}\u{0313}\u{0342}\u{0345}",
-        nfkc: "\u{1FA6}",
-        nfkd: "\u{03C9}\u{0313}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA7}",
-        nfc: "\u{1FA7}",
-        nfd: "\u{03C9}\u{0314}\u{0342}\u{0345}",
-        nfkc: "\u{1FA7}",
-        nfkd: "\u{03C9}\u{0314}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA8}",
-        nfc: "\u{1FA8}",
-        nfd: "\u{03A9}\u{0313}\u{0345}",
-        nfkc: "\u{1FA8}",
-        nfkd: "\u{03A9}\u{0313}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FA9}",
-        nfc: "\u{1FA9}",
-        nfd: "\u{03A9}\u{0314}\u{0345}",
-        nfkc: "\u{1FA9}",
-        nfkd: "\u{03A9}\u{0314}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FAA}",
-        nfc: "\u{1FAA}",
-        nfd: "\u{03A9}\u{0313}\u{0300}\u{0345}",
-        nfkc: "\u{1FAA}",
-        nfkd: "\u{03A9}\u{0313}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FAB}",
-        nfc: "\u{1FAB}",
-        nfd: "\u{03A9}\u{0314}\u{0300}\u{0345}",
-        nfkc: "\u{1FAB}",
-        nfkd: "\u{03A9}\u{0314}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FAC}",
-        nfc: "\u{1FAC}",
-        nfd: "\u{03A9}\u{0313}\u{0301}\u{0345}",
-        nfkc: "\u{1FAC}",
-        nfkd: "\u{03A9}\u{0313}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FAD}",
-        nfc: "\u{1FAD}",
-        nfd: "\u{03A9}\u{0314}\u{0301}\u{0345}",
-        nfkc: "\u{1FAD}",
-        nfkd: "\u{03A9}\u{0314}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FAE}",
-        nfc: "\u{1FAE}",
-        nfd: "\u{03A9}\u{0313}\u{0342}\u{0345}",
-        nfkc: "\u{1FAE}",
-        nfkd: "\u{03A9}\u{0313}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FAF}",
-        nfc: "\u{1FAF}",
-        nfd: "\u{03A9}\u{0314}\u{0342}\u{0345}",
-        nfkc: "\u{1FAF}",
-        nfkd: "\u{03A9}\u{0314}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FB0}",
-        nfc: "\u{1FB0}",
-        nfd: "\u{03B1}\u{0306}",
-        nfkc: "\u{1FB0}",
-        nfkd: "\u{03B1}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1FB1}",
-        nfc: "\u{1FB1}",
-        nfd: "\u{03B1}\u{0304}",
-        nfkc: "\u{1FB1}",
-        nfkd: "\u{03B1}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1FB2}",
-        nfc: "\u{1FB2}",
-        nfd: "\u{03B1}\u{0300}\u{0345}",
-        nfkc: "\u{1FB2}",
-        nfkd: "\u{03B1}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FB3}",
-        nfc: "\u{1FB3}",
-        nfd: "\u{03B1}\u{0345}",
-        nfkc: "\u{1FB3}",
-        nfkd: "\u{03B1}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FB4}",
-        nfc: "\u{1FB4}",
-        nfd: "\u{03B1}\u{0301}\u{0345}",
-        nfkc: "\u{1FB4}",
-        nfkd: "\u{03B1}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FB6}",
-        nfc: "\u{1FB6}",
-        nfd: "\u{03B1}\u{0342}",
-        nfkc: "\u{1FB6}",
-        nfkd: "\u{03B1}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FB7}",
-        nfc: "\u{1FB7}",
-        nfd: "\u{03B1}\u{0342}\u{0345}",
-        nfkc: "\u{1FB7}",
-        nfkd: "\u{03B1}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FB8}",
-        nfc: "\u{1FB8}",
-        nfd: "\u{0391}\u{0306}",
-        nfkc: "\u{1FB8}",
-        nfkd: "\u{0391}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1FB9}",
-        nfc: "\u{1FB9}",
-        nfd: "\u{0391}\u{0304}",
-        nfkc: "\u{1FB9}",
-        nfkd: "\u{0391}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1FBA}",
-        nfc: "\u{1FBA}",
-        nfd: "\u{0391}\u{0300}",
-        nfkc: "\u{1FBA}",
-        nfkd: "\u{0391}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FBB}",
-        nfc: "\u{0386}",
-        nfd: "\u{0391}\u{0301}",
-        nfkc: "\u{0386}",
-        nfkd: "\u{0391}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FBC}",
-        nfc: "\u{1FBC}",
-        nfd: "\u{0391}\u{0345}",
-        nfkc: "\u{1FBC}",
-        nfkd: "\u{0391}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FBD}",
-        nfc: "\u{1FBD}",
-        nfd: "\u{1FBD}",
-        nfkc: "\u{0020}\u{0313}",
-        nfkd: "\u{0020}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1FBE}",
-        nfc: "\u{03B9}",
-        nfd: "\u{03B9}",
-        nfkc: "\u{03B9}",
-        nfkd: "\u{03B9}",
-    },
-    NormalizationTest {
-        source: "\u{1FBF}",
-        nfc: "\u{1FBF}",
-        nfd: "\u{1FBF}",
-        nfkc: "\u{0020}\u{0313}",
-        nfkd: "\u{0020}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1FC0}",
-        nfc: "\u{1FC0}",
-        nfd: "\u{1FC0}",
-        nfkc: "\u{0020}\u{0342}",
-        nfkd: "\u{0020}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FC1}",
-        nfc: "\u{1FC1}",
-        nfd: "\u{00A8}\u{0342}",
-        nfkc: "\u{0020}\u{0308}\u{0342}",
-        nfkd: "\u{0020}\u{0308}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FC2}",
-        nfc: "\u{1FC2}",
-        nfd: "\u{03B7}\u{0300}\u{0345}",
-        nfkc: "\u{1FC2}",
-        nfkd: "\u{03B7}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FC3}",
-        nfc: "\u{1FC3}",
-        nfd: "\u{03B7}\u{0345}",
-        nfkc: "\u{1FC3}",
-        nfkd: "\u{03B7}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FC4}",
-        nfc: "\u{1FC4}",
-        nfd: "\u{03B7}\u{0301}\u{0345}",
-        nfkc: "\u{1FC4}",
-        nfkd: "\u{03B7}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FC6}",
-        nfc: "\u{1FC6}",
-        nfd: "\u{03B7}\u{0342}",
-        nfkc: "\u{1FC6}",
-        nfkd: "\u{03B7}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FC7}",
-        nfc: "\u{1FC7}",
-        nfd: "\u{03B7}\u{0342}\u{0345}",
-        nfkc: "\u{1FC7}",
-        nfkd: "\u{03B7}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FC8}",
-        nfc: "\u{1FC8}",
-        nfd: "\u{0395}\u{0300}",
-        nfkc: "\u{1FC8}",
-        nfkd: "\u{0395}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FC9}",
-        nfc: "\u{0388}",
-        nfd: "\u{0395}\u{0301}",
-        nfkc: "\u{0388}",
-        nfkd: "\u{0395}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FCA}",
-        nfc: "\u{1FCA}",
-        nfd: "\u{0397}\u{0300}",
-        nfkc: "\u{1FCA}",
-        nfkd: "\u{0397}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FCB}",
-        nfc: "\u{0389}",
-        nfd: "\u{0397}\u{0301}",
-        nfkc: "\u{0389}",
-        nfkd: "\u{0397}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FCC}",
-        nfc: "\u{1FCC}",
-        nfd: "\u{0397}\u{0345}",
-        nfkc: "\u{1FCC}",
-        nfkd: "\u{0397}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FCD}",
-        nfc: "\u{1FCD}",
-        nfd: "\u{1FBF}\u{0300}",
-        nfkc: "\u{0020}\u{0313}\u{0300}",
-        nfkd: "\u{0020}\u{0313}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FCE}",
-        nfc: "\u{1FCE}",
-        nfd: "\u{1FBF}\u{0301}",
-        nfkc: "\u{0020}\u{0313}\u{0301}",
-        nfkd: "\u{0020}\u{0313}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FCF}",
-        nfc: "\u{1FCF}",
-        nfd: "\u{1FBF}\u{0342}",
-        nfkc: "\u{0020}\u{0313}\u{0342}",
-        nfkd: "\u{0020}\u{0313}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FD0}",
-        nfc: "\u{1FD0}",
-        nfd: "\u{03B9}\u{0306}",
-        nfkc: "\u{1FD0}",
-        nfkd: "\u{03B9}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1FD1}",
-        nfc: "\u{1FD1}",
-        nfd: "\u{03B9}\u{0304}",
-        nfkc: "\u{1FD1}",
-        nfkd: "\u{03B9}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1FD2}",
-        nfc: "\u{1FD2}",
-        nfd: "\u{03B9}\u{0308}\u{0300}",
-        nfkc: "\u{1FD2}",
-        nfkd: "\u{03B9}\u{0308}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FD3}",
-        nfc: "\u{0390}",
-        nfd: "\u{03B9}\u{0308}\u{0301}",
-        nfkc: "\u{0390}",
-        nfkd: "\u{03B9}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FD6}",
-        nfc: "\u{1FD6}",
-        nfd: "\u{03B9}\u{0342}",
-        nfkc: "\u{1FD6}",
-        nfkd: "\u{03B9}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FD7}",
-        nfc: "\u{1FD7}",
-        nfd: "\u{03B9}\u{0308}\u{0342}",
-        nfkc: "\u{1FD7}",
-        nfkd: "\u{03B9}\u{0308}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FD8}",
-        nfc: "\u{1FD8}",
-        nfd: "\u{0399}\u{0306}",
-        nfkc: "\u{1FD8}",
-        nfkd: "\u{0399}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1FD9}",
-        nfc: "\u{1FD9}",
-        nfd: "\u{0399}\u{0304}",
-        nfkc: "\u{1FD9}",
-        nfkd: "\u{0399}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1FDA}",
-        nfc: "\u{1FDA}",
-        nfd: "\u{0399}\u{0300}",
-        nfkc: "\u{1FDA}",
-        nfkd: "\u{0399}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FDB}",
-        nfc: "\u{038A}",
-        nfd: "\u{0399}\u{0301}",
-        nfkc: "\u{038A}",
-        nfkd: "\u{0399}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FDD}",
-        nfc: "\u{1FDD}",
-        nfd: "\u{1FFE}\u{0300}",
-        nfkc: "\u{0020}\u{0314}\u{0300}",
-        nfkd: "\u{0020}\u{0314}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FDE}",
-        nfc: "\u{1FDE}",
-        nfd: "\u{1FFE}\u{0301}",
-        nfkc: "\u{0020}\u{0314}\u{0301}",
-        nfkd: "\u{0020}\u{0314}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FDF}",
-        nfc: "\u{1FDF}",
-        nfd: "\u{1FFE}\u{0342}",
-        nfkc: "\u{0020}\u{0314}\u{0342}",
-        nfkd: "\u{0020}\u{0314}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FE0}",
-        nfc: "\u{1FE0}",
-        nfd: "\u{03C5}\u{0306}",
-        nfkc: "\u{1FE0}",
-        nfkd: "\u{03C5}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1FE1}",
-        nfc: "\u{1FE1}",
-        nfd: "\u{03C5}\u{0304}",
-        nfkc: "\u{1FE1}",
-        nfkd: "\u{03C5}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1FE2}",
-        nfc: "\u{1FE2}",
-        nfd: "\u{03C5}\u{0308}\u{0300}",
-        nfkc: "\u{1FE2}",
-        nfkd: "\u{03C5}\u{0308}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FE3}",
-        nfc: "\u{03B0}",
-        nfd: "\u{03C5}\u{0308}\u{0301}",
-        nfkc: "\u{03B0}",
-        nfkd: "\u{03C5}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FE4}",
-        nfc: "\u{1FE4}",
-        nfd: "\u{03C1}\u{0313}",
-        nfkc: "\u{1FE4}",
-        nfkd: "\u{03C1}\u{0313}",
-    },
-    NormalizationTest {
-        source: "\u{1FE5}",
-        nfc: "\u{1FE5}",
-        nfd: "\u{03C1}\u{0314}",
-        nfkc: "\u{1FE5}",
-        nfkd: "\u{03C1}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1FE6}",
-        nfc: "\u{1FE6}",
-        nfd: "\u{03C5}\u{0342}",
-        nfkc: "\u{1FE6}",
-        nfkd: "\u{03C5}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FE7}",
-        nfc: "\u{1FE7}",
-        nfd: "\u{03C5}\u{0308}\u{0342}",
-        nfkc: "\u{1FE7}",
-        nfkd: "\u{03C5}\u{0308}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FE8}",
-        nfc: "\u{1FE8}",
-        nfd: "\u{03A5}\u{0306}",
-        nfkc: "\u{1FE8}",
-        nfkd: "\u{03A5}\u{0306}",
-    },
-    NormalizationTest {
-        source: "\u{1FE9}",
-        nfc: "\u{1FE9}",
-        nfd: "\u{03A5}\u{0304}",
-        nfkc: "\u{1FE9}",
-        nfkd: "\u{03A5}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{1FEA}",
-        nfc: "\u{1FEA}",
-        nfd: "\u{03A5}\u{0300}",
-        nfkc: "\u{1FEA}",
-        nfkd: "\u{03A5}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FEB}",
-        nfc: "\u{038E}",
-        nfd: "\u{03A5}\u{0301}",
-        nfkc: "\u{038E}",
-        nfkd: "\u{03A5}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FEC}",
-        nfc: "\u{1FEC}",
-        nfd: "\u{03A1}\u{0314}",
-        nfkc: "\u{1FEC}",
-        nfkd: "\u{03A1}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{1FED}",
-        nfc: "\u{1FED}",
-        nfd: "\u{00A8}\u{0300}",
-        nfkc: "\u{0020}\u{0308}\u{0300}",
-        nfkd: "\u{0020}\u{0308}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FEE}",
-        nfc: "\u{0385}",
-        nfd: "\u{00A8}\u{0301}",
-        nfkc: "\u{0020}\u{0308}\u{0301}",
-        nfkd: "\u{0020}\u{0308}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FEF}",
-        nfc: "\u{0060}",
-        nfd: "\u{0060}",
-        nfkc: "\u{0060}",
-        nfkd: "\u{0060}",
-    },
-    NormalizationTest {
-        source: "\u{1FF2}",
-        nfc: "\u{1FF2}",
-        nfd: "\u{03C9}\u{0300}\u{0345}",
-        nfkc: "\u{1FF2}",
-        nfkd: "\u{03C9}\u{0300}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FF3}",
-        nfc: "\u{1FF3}",
-        nfd: "\u{03C9}\u{0345}",
-        nfkc: "\u{1FF3}",
-        nfkd: "\u{03C9}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FF4}",
-        nfc: "\u{1FF4}",
-        nfd: "\u{03C9}\u{0301}\u{0345}",
-        nfkc: "\u{1FF4}",
-        nfkd: "\u{03C9}\u{0301}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FF6}",
-        nfc: "\u{1FF6}",
-        nfd: "\u{03C9}\u{0342}",
-        nfkc: "\u{1FF6}",
-        nfkd: "\u{03C9}\u{0342}",
-    },
-    NormalizationTest {
-        source: "\u{1FF7}",
-        nfc: "\u{1FF7}",
-        nfd: "\u{03C9}\u{0342}\u{0345}",
-        nfkc: "\u{1FF7}",
-        nfkd: "\u{03C9}\u{0342}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FF8}",
-        nfc: "\u{1FF8}",
-        nfd: "\u{039F}\u{0300}",
-        nfkc: "\u{1FF8}",
-        nfkd: "\u{039F}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FF9}",
-        nfc: "\u{038C}",
-        nfd: "\u{039F}\u{0301}",
-        nfkc: "\u{038C}",
-        nfkd: "\u{039F}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FFA}",
-        nfc: "\u{1FFA}",
-        nfd: "\u{03A9}\u{0300}",
-        nfkc: "\u{1FFA}",
-        nfkd: "\u{03A9}\u{0300}",
-    },
-    NormalizationTest {
-        source: "\u{1FFB}",
-        nfc: "\u{038F}",
-        nfd: "\u{03A9}\u{0301}",
-        nfkc: "\u{038F}",
-        nfkd: "\u{03A9}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FFC}",
-        nfc: "\u{1FFC}",
-        nfd: "\u{03A9}\u{0345}",
-        nfkc: "\u{1FFC}",
-        nfkd: "\u{03A9}\u{0345}",
-    },
-    NormalizationTest {
-        source: "\u{1FFD}",
-        nfc: "\u{00B4}",
-        nfd: "\u{00B4}",
-        nfkc: "\u{0020}\u{0301}",
-        nfkd: "\u{0020}\u{0301}",
-    },
-    NormalizationTest {
-        source: "\u{1FFE}",
-        nfc: "\u{1FFE}",
-        nfd: "\u{1FFE}",
-        nfkc: "\u{0020}\u{0314}",
-        nfkd: "\u{0020}\u{0314}",
-    },
-    NormalizationTest {
-        source: "\u{2000}",
-        nfc: "\u{2002}",
-        nfd: "\u{2002}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2001}",
-        nfc: "\u{2003}",
-        nfd: "\u{2003}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2002}",
-        nfc: "\u{2002}",
-        nfd: "\u{2002}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2003}",
-        nfc: "\u{2003}",
-        nfd: "\u{2003}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2004}",
-        nfc: "\u{2004}",
-        nfd: "\u{2004}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2005}",
-        nfc: "\u{2005}",
-        nfd: "\u{2005}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2006}",
-        nfc: "\u{2006}",
-        nfd: "\u{2006}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2007}",
-        nfc: "\u{2007}",
-        nfd: "\u{2007}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2008}",
-        nfc: "\u{2008}",
-        nfd: "\u{2008}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2009}",
-        nfc: "\u{2009}",
-        nfd: "\u{2009}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{200A}",
-        nfc: "\u{200A}",
-        nfd: "\u{200A}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2011}",
-        nfc: "\u{2011}",
-        nfd: "\u{2011}",
-        nfkc: "\u{2010}",
-        nfkd: "\u{2010}",
-    },
-    NormalizationTest {
-        source: "\u{2017}",
-        nfc: "\u{2017}",
-        nfd: "\u{2017}",
-        nfkc: "\u{0020}\u{0333}",
-        nfkd: "\u{0020}\u{0333}",
-    },
-    NormalizationTest {
-        source: "\u{2024}",
-        nfc: "\u{2024}",
-        nfd: "\u{2024}",
-        nfkc: "\u{002E}",
-        nfkd: "\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2025}",
-        nfc: "\u{2025}",
-        nfd: "\u{2025}",
-        nfkc: "\u{002E}\u{002E}",
-        nfkd: "\u{002E}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2026}",
-        nfc: "\u{2026}",
-        nfd: "\u{2026}",
-        nfkc: "\u{002E}\u{002E}\u{002E}",
-        nfkd: "\u{002E}\u{002E}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{202F}",
-        nfc: "\u{202F}",
-        nfd: "\u{202F}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2033}",
-        nfc: "\u{2033}",
-        nfd: "\u{2033}",
-        nfkc: "\u{2032}\u{2032}",
-        nfkd: "\u{2032}\u{2032}",
-    },
-    NormalizationTest {
-        source: "\u{2034}",
-        nfc: "\u{2034}",
-        nfd: "\u{2034}",
-        nfkc: "\u{2032}\u{2032}\u{2032}",
-        nfkd: "\u{2032}\u{2032}\u{2032}",
-    },
-    NormalizationTest {
-        source: "\u{2036}",
-        nfc: "\u{2036}",
-        nfd: "\u{2036}",
-        nfkc: "\u{2035}\u{2035}",
-        nfkd: "\u{2035}\u{2035}",
-    },
-    NormalizationTest {
-        source: "\u{2037}",
-        nfc: "\u{2037}",
-        nfd: "\u{2037}",
-        nfkc: "\u{2035}\u{2035}\u{2035}",
-        nfkd: "\u{2035}\u{2035}\u{2035}",
-    },
-    NormalizationTest {
-        source: "\u{203C}",
-        nfc: "\u{203C}",
-        nfd: "\u{203C}",
-        nfkc: "\u{0021}\u{0021}",
-        nfkd: "\u{0021}\u{0021}",
-    },
-    NormalizationTest {
-        source: "\u{203E}",
-        nfc: "\u{203E}",
-        nfd: "\u{203E}",
-        nfkc: "\u{0020}\u{0305}",
-        nfkd: "\u{0020}\u{0305}",
-    },
-    NormalizationTest {
-        source: "\u{2047}",
-        nfc: "\u{2047}",
-        nfd: "\u{2047}",
-        nfkc: "\u{003F}\u{003F}",
-        nfkd: "\u{003F}\u{003F}",
-    },
-    NormalizationTest {
-        source: "\u{2048}",
-        nfc: "\u{2048}",
-        nfd: "\u{2048}",
-        nfkc: "\u{003F}\u{0021}",
-        nfkd: "\u{003F}\u{0021}",
-    },
-    NormalizationTest {
-        source: "\u{2049}",
-        nfc: "\u{2049}",
-        nfd: "\u{2049}",
-        nfkc: "\u{0021}\u{003F}",
-        nfkd: "\u{0021}\u{003F}",
-    },
-    NormalizationTest {
-        source: "\u{2057}",
-        nfc: "\u{2057}",
-        nfd: "\u{2057}",
-        nfkc: "\u{2032}\u{2032}\u{2032}\u{2032}",
-        nfkd: "\u{2032}\u{2032}\u{2032}\u{2032}",
-    },
-    NormalizationTest {
-        source: "\u{205F}",
-        nfc: "\u{205F}",
-        nfd: "\u{205F}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{2070}",
-        nfc: "\u{2070}",
-        nfd: "\u{2070}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{2071}",
-        nfc: "\u{2071}",
-        nfd: "\u{2071}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2074}",
-        nfc: "\u{2074}",
-        nfd: "\u{2074}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{2075}",
-        nfc: "\u{2075}",
-        nfd: "\u{2075}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2076}",
-        nfc: "\u{2076}",
-        nfd: "\u{2076}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{2077}",
-        nfc: "\u{2077}",
-        nfd: "\u{2077}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{2078}",
-        nfc: "\u{2078}",
-        nfd: "\u{2078}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{2079}",
-        nfc: "\u{2079}",
-        nfd: "\u{2079}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{207A}",
-        nfc: "\u{207A}",
-        nfd: "\u{207A}",
-        nfkc: "\u{002B}",
-        nfkd: "\u{002B}",
-    },
-    NormalizationTest {
-        source: "\u{207B}",
-        nfc: "\u{207B}",
-        nfd: "\u{207B}",
-        nfkc: "\u{2212}",
-        nfkd: "\u{2212}",
-    },
-    NormalizationTest {
-        source: "\u{207C}",
-        nfc: "\u{207C}",
-        nfd: "\u{207C}",
-        nfkc: "\u{003D}",
-        nfkd: "\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{207D}",
-        nfc: "\u{207D}",
-        nfd: "\u{207D}",
-        nfkc: "\u{0028}",
-        nfkd: "\u{0028}",
-    },
-    NormalizationTest {
-        source: "\u{207E}",
-        nfc: "\u{207E}",
-        nfd: "\u{207E}",
-        nfkc: "\u{0029}",
-        nfkd: "\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{207F}",
-        nfc: "\u{207F}",
-        nfd: "\u{207F}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{2080}",
-        nfc: "\u{2080}",
-        nfd: "\u{2080}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{2081}",
-        nfc: "\u{2081}",
-        nfd: "\u{2081}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{2082}",
-        nfc: "\u{2082}",
-        nfd: "\u{2082}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{2083}",
-        nfc: "\u{2083}",
-        nfd: "\u{2083}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{2084}",
-        nfc: "\u{2084}",
-        nfd: "\u{2084}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{2085}",
-        nfc: "\u{2085}",
-        nfd: "\u{2085}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2086}",
-        nfc: "\u{2086}",
-        nfd: "\u{2086}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{2087}",
-        nfc: "\u{2087}",
-        nfd: "\u{2087}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{2088}",
-        nfc: "\u{2088}",
-        nfd: "\u{2088}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{2089}",
-        nfc: "\u{2089}",
-        nfd: "\u{2089}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{208A}",
-        nfc: "\u{208A}",
-        nfd: "\u{208A}",
-        nfkc: "\u{002B}",
-        nfkd: "\u{002B}",
-    },
-    NormalizationTest {
-        source: "\u{208B}",
-        nfc: "\u{208B}",
-        nfd: "\u{208B}",
-        nfkc: "\u{2212}",
-        nfkd: "\u{2212}",
-    },
-    NormalizationTest {
-        source: "\u{208C}",
-        nfc: "\u{208C}",
-        nfd: "\u{208C}",
-        nfkc: "\u{003D}",
-        nfkd: "\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{208D}",
-        nfc: "\u{208D}",
-        nfd: "\u{208D}",
-        nfkc: "\u{0028}",
-        nfkd: "\u{0028}",
-    },
-    NormalizationTest {
-        source: "\u{208E}",
-        nfc: "\u{208E}",
-        nfd: "\u{208E}",
-        nfkc: "\u{0029}",
-        nfkd: "\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2090}",
-        nfc: "\u{2090}",
-        nfd: "\u{2090}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{2091}",
-        nfc: "\u{2091}",
-        nfd: "\u{2091}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{2092}",
-        nfc: "\u{2092}",
-        nfd: "\u{2092}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{2093}",
-        nfc: "\u{2093}",
-        nfd: "\u{2093}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{2094}",
-        nfc: "\u{2094}",
-        nfd: "\u{2094}",
-        nfkc: "\u{0259}",
-        nfkd: "\u{0259}",
-    },
-    NormalizationTest {
-        source: "\u{2095}",
-        nfc: "\u{2095}",
-        nfd: "\u{2095}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{2096}",
-        nfc: "\u{2096}",
-        nfd: "\u{2096}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{2097}",
-        nfc: "\u{2097}",
-        nfd: "\u{2097}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{2098}",
-        nfc: "\u{2098}",
-        nfd: "\u{2098}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{2099}",
-        nfc: "\u{2099}",
-        nfd: "\u{2099}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{209A}",
-        nfc: "\u{209A}",
-        nfd: "\u{209A}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{209B}",
-        nfc: "\u{209B}",
-        nfd: "\u{209B}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{209C}",
-        nfc: "\u{209C}",
-        nfd: "\u{209C}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{20A8}",
-        nfc: "\u{20A8}",
-        nfd: "\u{20A8}",
-        nfkc: "\u{0052}\u{0073}",
-        nfkd: "\u{0052}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{2100}",
-        nfc: "\u{2100}",
-        nfd: "\u{2100}",
-        nfkc: "\u{0061}\u{002F}\u{0063}",
-        nfkd: "\u{0061}\u{002F}\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{2101}",
-        nfc: "\u{2101}",
-        nfd: "\u{2101}",
-        nfkc: "\u{0061}\u{002F}\u{0073}",
-        nfkd: "\u{0061}\u{002F}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{2102}",
-        nfc: "\u{2102}",
-        nfd: "\u{2102}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{2103}",
-        nfc: "\u{2103}",
-        nfd: "\u{2103}",
-        nfkc: "\u{00B0}\u{0043}",
-        nfkd: "\u{00B0}\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{2105}",
-        nfc: "\u{2105}",
-        nfd: "\u{2105}",
-        nfkc: "\u{0063}\u{002F}\u{006F}",
-        nfkd: "\u{0063}\u{002F}\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{2106}",
-        nfc: "\u{2106}",
-        nfd: "\u{2106}",
-        nfkc: "\u{0063}\u{002F}\u{0075}",
-        nfkd: "\u{0063}\u{002F}\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{2107}",
-        nfc: "\u{2107}",
-        nfd: "\u{2107}",
-        nfkc: "\u{0190}",
-        nfkd: "\u{0190}",
-    },
-    NormalizationTest {
-        source: "\u{2109}",
-        nfc: "\u{2109}",
-        nfd: "\u{2109}",
-        nfkc: "\u{00B0}\u{0046}",
-        nfkd: "\u{00B0}\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{210A}",
-        nfc: "\u{210A}",
-        nfd: "\u{210A}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{210B}",
-        nfc: "\u{210B}",
-        nfd: "\u{210B}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{210C}",
-        nfc: "\u{210C}",
-        nfd: "\u{210C}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{210D}",
-        nfc: "\u{210D}",
-        nfd: "\u{210D}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{210E}",
-        nfc: "\u{210E}",
-        nfd: "\u{210E}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{210F}",
-        nfc: "\u{210F}",
-        nfd: "\u{210F}",
-        nfkc: "\u{0127}",
-        nfkd: "\u{0127}",
-    },
-    NormalizationTest {
-        source: "\u{2110}",
-        nfc: "\u{2110}",
-        nfd: "\u{2110}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2111}",
-        nfc: "\u{2111}",
-        nfd: "\u{2111}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2112}",
-        nfc: "\u{2112}",
-        nfd: "\u{2112}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{2113}",
-        nfc: "\u{2113}",
-        nfd: "\u{2113}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{2115}",
-        nfc: "\u{2115}",
-        nfd: "\u{2115}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{2116}",
-        nfc: "\u{2116}",
-        nfd: "\u{2116}",
-        nfkc: "\u{004E}\u{006F}",
-        nfkd: "\u{004E}\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{2119}",
-        nfc: "\u{2119}",
-        nfd: "\u{2119}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{211A}",
-        nfc: "\u{211A}",
-        nfd: "\u{211A}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{211B}",
-        nfc: "\u{211B}",
-        nfd: "\u{211B}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{211C}",
-        nfc: "\u{211C}",
-        nfd: "\u{211C}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{211D}",
-        nfc: "\u{211D}",
-        nfd: "\u{211D}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{2120}",
-        nfc: "\u{2120}",
-        nfd: "\u{2120}",
-        nfkc: "\u{0053}\u{004D}",
-        nfkd: "\u{0053}\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{2121}",
-        nfc: "\u{2121}",
-        nfd: "\u{2121}",
-        nfkc: "\u{0054}\u{0045}\u{004C}",
-        nfkd: "\u{0054}\u{0045}\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{2122}",
-        nfc: "\u{2122}",
-        nfd: "\u{2122}",
-        nfkc: "\u{0054}\u{004D}",
-        nfkd: "\u{0054}\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{2124}",
-        nfc: "\u{2124}",
-        nfd: "\u{2124}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{2126}",
-        nfc: "\u{03A9}",
-        nfd: "\u{03A9}",
-        nfkc: "\u{03A9}",
-        nfkd: "\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{2128}",
-        nfc: "\u{2128}",
-        nfd: "\u{2128}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{212A}",
-        nfc: "\u{004B}",
-        nfd: "\u{004B}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{212B}",
-        nfc: "\u{00C5}",
-        nfd: "\u{0041}\u{030A}",
-        nfkc: "\u{00C5}",
-        nfkd: "\u{0041}\u{030A}",
-    },
-    NormalizationTest {
-        source: "\u{212C}",
-        nfc: "\u{212C}",
-        nfd: "\u{212C}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{212D}",
-        nfc: "\u{212D}",
-        nfd: "\u{212D}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{212F}",
-        nfc: "\u{212F}",
-        nfd: "\u{212F}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{2130}",
-        nfc: "\u{2130}",
-        nfd: "\u{2130}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{2131}",
-        nfc: "\u{2131}",
-        nfd: "\u{2131}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{2133}",
-        nfc: "\u{2133}",
-        nfd: "\u{2133}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{2134}",
-        nfc: "\u{2134}",
-        nfd: "\u{2134}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{2135}",
-        nfc: "\u{2135}",
-        nfd: "\u{2135}",
-        nfkc: "\u{05D0}",
-        nfkd: "\u{05D0}",
-    },
-    NormalizationTest {
-        source: "\u{2136}",
-        nfc: "\u{2136}",
-        nfd: "\u{2136}",
-        nfkc: "\u{05D1}",
-        nfkd: "\u{05D1}",
-    },
-    NormalizationTest {
-        source: "\u{2137}",
-        nfc: "\u{2137}",
-        nfd: "\u{2137}",
-        nfkc: "\u{05D2}",
-        nfkd: "\u{05D2}",
-    },
-    NormalizationTest {
-        source: "\u{2138}",
-        nfc: "\u{2138}",
-        nfd: "\u{2138}",
-        nfkc: "\u{05D3}",
-        nfkd: "\u{05D3}",
-    },
-    NormalizationTest {
-        source: "\u{2139}",
-        nfc: "\u{2139}",
-        nfd: "\u{2139}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{213B}",
-        nfc: "\u{213B}",
-        nfd: "\u{213B}",
-        nfkc: "\u{0046}\u{0041}\u{0058}",
-        nfkd: "\u{0046}\u{0041}\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{213C}",
-        nfc: "\u{213C}",
-        nfd: "\u{213C}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{213D}",
-        nfc: "\u{213D}",
-        nfd: "\u{213D}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{213E}",
-        nfc: "\u{213E}",
-        nfd: "\u{213E}",
-        nfkc: "\u{0393}",
-        nfkd: "\u{0393}",
-    },
-    NormalizationTest {
-        source: "\u{213F}",
-        nfc: "\u{213F}",
-        nfd: "\u{213F}",
-        nfkc: "\u{03A0}",
-        nfkd: "\u{03A0}",
-    },
-    NormalizationTest {
-        source: "\u{2140}",
-        nfc: "\u{2140}",
-        nfd: "\u{2140}",
-        nfkc: "\u{2211}",
-        nfkd: "\u{2211}",
-    },
-    NormalizationTest {
-        source: "\u{2145}",
-        nfc: "\u{2145}",
-        nfd: "\u{2145}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{2146}",
-        nfc: "\u{2146}",
-        nfd: "\u{2146}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{2147}",
-        nfc: "\u{2147}",
-        nfd: "\u{2147}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{2148}",
-        nfc: "\u{2148}",
-        nfd: "\u{2148}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2149}",
-        nfc: "\u{2149}",
-        nfd: "\u{2149}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{2150}",
-        nfc: "\u{2150}",
-        nfd: "\u{2150}",
-        nfkc: "\u{0031}\u{2044}\u{0037}",
-        nfkd: "\u{0031}\u{2044}\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{2151}",
-        nfc: "\u{2151}",
-        nfd: "\u{2151}",
-        nfkc: "\u{0031}\u{2044}\u{0039}",
-        nfkd: "\u{0031}\u{2044}\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{2152}",
-        nfc: "\u{2152}",
-        nfd: "\u{2152}",
-        nfkc: "\u{0031}\u{2044}\u{0031}\u{0030}",
-        nfkd: "\u{0031}\u{2044}\u{0031}\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{2153}",
-        nfc: "\u{2153}",
-        nfd: "\u{2153}",
-        nfkc: "\u{0031}\u{2044}\u{0033}",
-        nfkd: "\u{0031}\u{2044}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{2154}",
-        nfc: "\u{2154}",
-        nfd: "\u{2154}",
-        nfkc: "\u{0032}\u{2044}\u{0033}",
-        nfkd: "\u{0032}\u{2044}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{2155}",
-        nfc: "\u{2155}",
-        nfd: "\u{2155}",
-        nfkc: "\u{0031}\u{2044}\u{0035}",
-        nfkd: "\u{0031}\u{2044}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2156}",
-        nfc: "\u{2156}",
-        nfd: "\u{2156}",
-        nfkc: "\u{0032}\u{2044}\u{0035}",
-        nfkd: "\u{0032}\u{2044}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2157}",
-        nfc: "\u{2157}",
-        nfd: "\u{2157}",
-        nfkc: "\u{0033}\u{2044}\u{0035}",
-        nfkd: "\u{0033}\u{2044}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2158}",
-        nfc: "\u{2158}",
-        nfd: "\u{2158}",
-        nfkc: "\u{0034}\u{2044}\u{0035}",
-        nfkd: "\u{0034}\u{2044}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2159}",
-        nfc: "\u{2159}",
-        nfd: "\u{2159}",
-        nfkc: "\u{0031}\u{2044}\u{0036}",
-        nfkd: "\u{0031}\u{2044}\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{215A}",
-        nfc: "\u{215A}",
-        nfd: "\u{215A}",
-        nfkc: "\u{0035}\u{2044}\u{0036}",
-        nfkd: "\u{0035}\u{2044}\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{215B}",
-        nfc: "\u{215B}",
-        nfd: "\u{215B}",
-        nfkc: "\u{0031}\u{2044}\u{0038}",
-        nfkd: "\u{0031}\u{2044}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{215C}",
-        nfc: "\u{215C}",
-        nfd: "\u{215C}",
-        nfkc: "\u{0033}\u{2044}\u{0038}",
-        nfkd: "\u{0033}\u{2044}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{215D}",
-        nfc: "\u{215D}",
-        nfd: "\u{215D}",
-        nfkc: "\u{0035}\u{2044}\u{0038}",
-        nfkd: "\u{0035}\u{2044}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{215E}",
-        nfc: "\u{215E}",
-        nfd: "\u{215E}",
-        nfkc: "\u{0037}\u{2044}\u{0038}",
-        nfkd: "\u{0037}\u{2044}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{215F}",
-        nfc: "\u{215F}",
-        nfd: "\u{215F}",
-        nfkc: "\u{0031}\u{2044}",
-        nfkd: "\u{0031}\u{2044}",
-    },
-    NormalizationTest {
-        source: "\u{2160}",
-        nfc: "\u{2160}",
-        nfd: "\u{2160}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2161}",
-        nfc: "\u{2161}",
-        nfd: "\u{2161}",
-        nfkc: "\u{0049}\u{0049}",
-        nfkd: "\u{0049}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2162}",
-        nfc: "\u{2162}",
-        nfd: "\u{2162}",
-        nfkc: "\u{0049}\u{0049}\u{0049}",
-        nfkd: "\u{0049}\u{0049}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2163}",
-        nfc: "\u{2163}",
-        nfd: "\u{2163}",
-        nfkc: "\u{0049}\u{0056}",
-        nfkd: "\u{0049}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{2164}",
-        nfc: "\u{2164}",
-        nfd: "\u{2164}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{2165}",
-        nfc: "\u{2165}",
-        nfd: "\u{2165}",
-        nfkc: "\u{0056}\u{0049}",
-        nfkd: "\u{0056}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2166}",
-        nfc: "\u{2166}",
-        nfd: "\u{2166}",
-        nfkc: "\u{0056}\u{0049}\u{0049}",
-        nfkd: "\u{0056}\u{0049}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2167}",
-        nfc: "\u{2167}",
-        nfd: "\u{2167}",
-        nfkc: "\u{0056}\u{0049}\u{0049}\u{0049}",
-        nfkd: "\u{0056}\u{0049}\u{0049}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{2168}",
-        nfc: "\u{2168}",
-        nfd: "\u{2168}",
-        nfkc: "\u{0049}\u{0058}",
-        nfkd: "\u{0049}\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{2169}",
-        nfc: "\u{2169}",
-        nfd: "\u{2169}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{216A}",
-        nfc: "\u{216A}",
-        nfd: "\u{216A}",
-        nfkc: "\u{0058}\u{0049}",
-        nfkd: "\u{0058}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{216B}",
-        nfc: "\u{216B}",
-        nfd: "\u{216B}",
-        nfkc: "\u{0058}\u{0049}\u{0049}",
-        nfkd: "\u{0058}\u{0049}\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{216C}",
-        nfc: "\u{216C}",
-        nfd: "\u{216C}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{216D}",
-        nfc: "\u{216D}",
-        nfd: "\u{216D}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{216E}",
-        nfc: "\u{216E}",
-        nfd: "\u{216E}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{216F}",
-        nfc: "\u{216F}",
-        nfd: "\u{216F}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{2170}",
-        nfc: "\u{2170}",
-        nfd: "\u{2170}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2171}",
-        nfc: "\u{2171}",
-        nfd: "\u{2171}",
-        nfkc: "\u{0069}\u{0069}",
-        nfkd: "\u{0069}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2172}",
-        nfc: "\u{2172}",
-        nfd: "\u{2172}",
-        nfkc: "\u{0069}\u{0069}\u{0069}",
-        nfkd: "\u{0069}\u{0069}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2173}",
-        nfc: "\u{2173}",
-        nfd: "\u{2173}",
-        nfkc: "\u{0069}\u{0076}",
-        nfkd: "\u{0069}\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{2174}",
-        nfc: "\u{2174}",
-        nfd: "\u{2174}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{2175}",
-        nfc: "\u{2175}",
-        nfd: "\u{2175}",
-        nfkc: "\u{0076}\u{0069}",
-        nfkd: "\u{0076}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2176}",
-        nfc: "\u{2176}",
-        nfd: "\u{2176}",
-        nfkc: "\u{0076}\u{0069}\u{0069}",
-        nfkd: "\u{0076}\u{0069}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2177}",
-        nfc: "\u{2177}",
-        nfd: "\u{2177}",
-        nfkc: "\u{0076}\u{0069}\u{0069}\u{0069}",
-        nfkd: "\u{0076}\u{0069}\u{0069}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{2178}",
-        nfc: "\u{2178}",
-        nfd: "\u{2178}",
-        nfkc: "\u{0069}\u{0078}",
-        nfkd: "\u{0069}\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{2179}",
-        nfc: "\u{2179}",
-        nfd: "\u{2179}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{217A}",
-        nfc: "\u{217A}",
-        nfd: "\u{217A}",
-        nfkc: "\u{0078}\u{0069}",
-        nfkd: "\u{0078}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{217B}",
-        nfc: "\u{217B}",
-        nfd: "\u{217B}",
-        nfkc: "\u{0078}\u{0069}\u{0069}",
-        nfkd: "\u{0078}\u{0069}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{217C}",
-        nfc: "\u{217C}",
-        nfd: "\u{217C}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{217D}",
-        nfc: "\u{217D}",
-        nfd: "\u{217D}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{217E}",
-        nfc: "\u{217E}",
-        nfd: "\u{217E}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{217F}",
-        nfc: "\u{217F}",
-        nfd: "\u{217F}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{2189}",
-        nfc: "\u{2189}",
-        nfd: "\u{2189}",
-        nfkc: "\u{0030}\u{2044}\u{0033}",
-        nfkd: "\u{0030}\u{2044}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{219A}",
-        nfc: "\u{219A}",
-        nfd: "\u{2190}\u{0338}",
-        nfkc: "\u{219A}",
-        nfkd: "\u{2190}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{219B}",
-        nfc: "\u{219B}",
-        nfd: "\u{2192}\u{0338}",
-        nfkc: "\u{219B}",
-        nfkd: "\u{2192}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{21AE}",
-        nfc: "\u{21AE}",
-        nfd: "\u{2194}\u{0338}",
-        nfkc: "\u{21AE}",
-        nfkd: "\u{2194}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{21CD}",
-        nfc: "\u{21CD}",
-        nfd: "\u{21D0}\u{0338}",
-        nfkc: "\u{21CD}",
-        nfkd: "\u{21D0}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{21CE}",
-        nfc: "\u{21CE}",
-        nfd: "\u{21D4}\u{0338}",
-        nfkc: "\u{21CE}",
-        nfkd: "\u{21D4}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{21CF}",
-        nfc: "\u{21CF}",
-        nfd: "\u{21D2}\u{0338}",
-        nfkc: "\u{21CF}",
-        nfkd: "\u{21D2}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2204}",
-        nfc: "\u{2204}",
-        nfd: "\u{2203}\u{0338}",
-        nfkc: "\u{2204}",
-        nfkd: "\u{2203}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2209}",
-        nfc: "\u{2209}",
-        nfd: "\u{2208}\u{0338}",
-        nfkc: "\u{2209}",
-        nfkd: "\u{2208}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{220C}",
-        nfc: "\u{220C}",
-        nfd: "\u{220B}\u{0338}",
-        nfkc: "\u{220C}",
-        nfkd: "\u{220B}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2224}",
-        nfc: "\u{2224}",
-        nfd: "\u{2223}\u{0338}",
-        nfkc: "\u{2224}",
-        nfkd: "\u{2223}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2226}",
-        nfc: "\u{2226}",
-        nfd: "\u{2225}\u{0338}",
-        nfkc: "\u{2226}",
-        nfkd: "\u{2225}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{222C}",
-        nfc: "\u{222C}",
-        nfd: "\u{222C}",
-        nfkc: "\u{222B}\u{222B}",
-        nfkd: "\u{222B}\u{222B}",
-    },
-    NormalizationTest {
-        source: "\u{222D}",
-        nfc: "\u{222D}",
-        nfd: "\u{222D}",
-        nfkc: "\u{222B}\u{222B}\u{222B}",
-        nfkd: "\u{222B}\u{222B}\u{222B}",
-    },
-    NormalizationTest {
-        source: "\u{222F}",
-        nfc: "\u{222F}",
-        nfd: "\u{222F}",
-        nfkc: "\u{222E}\u{222E}",
-        nfkd: "\u{222E}\u{222E}",
-    },
-    NormalizationTest {
-        source: "\u{2230}",
-        nfc: "\u{2230}",
-        nfd: "\u{2230}",
-        nfkc: "\u{222E}\u{222E}\u{222E}",
-        nfkd: "\u{222E}\u{222E}\u{222E}",
-    },
-    NormalizationTest {
-        source: "\u{2241}",
-        nfc: "\u{2241}",
-        nfd: "\u{223C}\u{0338}",
-        nfkc: "\u{2241}",
-        nfkd: "\u{223C}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2244}",
-        nfc: "\u{2244}",
-        nfd: "\u{2243}\u{0338}",
-        nfkc: "\u{2244}",
-        nfkd: "\u{2243}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2247}",
-        nfc: "\u{2247}",
-        nfd: "\u{2245}\u{0338}",
-        nfkc: "\u{2247}",
-        nfkd: "\u{2245}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2249}",
-        nfc: "\u{2249}",
-        nfd: "\u{2248}\u{0338}",
-        nfkc: "\u{2249}",
-        nfkd: "\u{2248}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2260}",
-        nfc: "\u{2260}",
-        nfd: "\u{003D}\u{0338}",
-        nfkc: "\u{2260}",
-        nfkd: "\u{003D}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2262}",
-        nfc: "\u{2262}",
-        nfd: "\u{2261}\u{0338}",
-        nfkc: "\u{2262}",
-        nfkd: "\u{2261}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{226D}",
-        nfc: "\u{226D}",
-        nfd: "\u{224D}\u{0338}",
-        nfkc: "\u{226D}",
-        nfkd: "\u{224D}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{226E}",
-        nfc: "\u{226E}",
-        nfd: "\u{003C}\u{0338}",
-        nfkc: "\u{226E}",
-        nfkd: "\u{003C}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{226F}",
-        nfc: "\u{226F}",
-        nfd: "\u{003E}\u{0338}",
-        nfkc: "\u{226F}",
-        nfkd: "\u{003E}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2270}",
-        nfc: "\u{2270}",
-        nfd: "\u{2264}\u{0338}",
-        nfkc: "\u{2270}",
-        nfkd: "\u{2264}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2271}",
-        nfc: "\u{2271}",
-        nfd: "\u{2265}\u{0338}",
-        nfkc: "\u{2271}",
-        nfkd: "\u{2265}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2274}",
-        nfc: "\u{2274}",
-        nfd: "\u{2272}\u{0338}",
-        nfkc: "\u{2274}",
-        nfkd: "\u{2272}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2275}",
-        nfc: "\u{2275}",
-        nfd: "\u{2273}\u{0338}",
-        nfkc: "\u{2275}",
-        nfkd: "\u{2273}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2278}",
-        nfc: "\u{2278}",
-        nfd: "\u{2276}\u{0338}",
-        nfkc: "\u{2278}",
-        nfkd: "\u{2276}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2279}",
-        nfc: "\u{2279}",
-        nfd: "\u{2277}\u{0338}",
-        nfkc: "\u{2279}",
-        nfkd: "\u{2277}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2280}",
-        nfc: "\u{2280}",
-        nfd: "\u{227A}\u{0338}",
-        nfkc: "\u{2280}",
-        nfkd: "\u{227A}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2281}",
-        nfc: "\u{2281}",
-        nfd: "\u{227B}\u{0338}",
-        nfkc: "\u{2281}",
-        nfkd: "\u{227B}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2284}",
-        nfc: "\u{2284}",
-        nfd: "\u{2282}\u{0338}",
-        nfkc: "\u{2284}",
-        nfkd: "\u{2282}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2285}",
-        nfc: "\u{2285}",
-        nfd: "\u{2283}\u{0338}",
-        nfkc: "\u{2285}",
-        nfkd: "\u{2283}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2288}",
-        nfc: "\u{2288}",
-        nfd: "\u{2286}\u{0338}",
-        nfkc: "\u{2288}",
-        nfkd: "\u{2286}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2289}",
-        nfc: "\u{2289}",
-        nfd: "\u{2287}\u{0338}",
-        nfkc: "\u{2289}",
-        nfkd: "\u{2287}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22AC}",
-        nfc: "\u{22AC}",
-        nfd: "\u{22A2}\u{0338}",
-        nfkc: "\u{22AC}",
-        nfkd: "\u{22A2}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22AD}",
-        nfc: "\u{22AD}",
-        nfd: "\u{22A8}\u{0338}",
-        nfkc: "\u{22AD}",
-        nfkd: "\u{22A8}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22AE}",
-        nfc: "\u{22AE}",
-        nfd: "\u{22A9}\u{0338}",
-        nfkc: "\u{22AE}",
-        nfkd: "\u{22A9}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22AF}",
-        nfc: "\u{22AF}",
-        nfd: "\u{22AB}\u{0338}",
-        nfkc: "\u{22AF}",
-        nfkd: "\u{22AB}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22E0}",
-        nfc: "\u{22E0}",
-        nfd: "\u{227C}\u{0338}",
-        nfkc: "\u{22E0}",
-        nfkd: "\u{227C}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22E1}",
-        nfc: "\u{22E1}",
-        nfd: "\u{227D}\u{0338}",
-        nfkc: "\u{22E1}",
-        nfkd: "\u{227D}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22E2}",
-        nfc: "\u{22E2}",
-        nfd: "\u{2291}\u{0338}",
-        nfkc: "\u{22E2}",
-        nfkd: "\u{2291}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22E3}",
-        nfc: "\u{22E3}",
-        nfd: "\u{2292}\u{0338}",
-        nfkc: "\u{22E3}",
-        nfkd: "\u{2292}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22EA}",
-        nfc: "\u{22EA}",
-        nfd: "\u{22B2}\u{0338}",
-        nfkc: "\u{22EA}",
-        nfkd: "\u{22B2}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22EB}",
-        nfc: "\u{22EB}",
-        nfd: "\u{22B3}\u{0338}",
-        nfkc: "\u{22EB}",
-        nfkd: "\u{22B3}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22EC}",
-        nfc: "\u{22EC}",
-        nfd: "\u{22B4}\u{0338}",
-        nfkc: "\u{22EC}",
-        nfkd: "\u{22B4}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{22ED}",
-        nfc: "\u{22ED}",
-        nfd: "\u{22B5}\u{0338}",
-        nfkc: "\u{22ED}",
-        nfkd: "\u{22B5}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2329}",
-        nfc: "\u{3008}",
-        nfd: "\u{3008}",
-        nfkc: "\u{3008}",
-        nfkd: "\u{3008}",
-    },
-    NormalizationTest {
-        source: "\u{232A}",
-        nfc: "\u{3009}",
-        nfd: "\u{3009}",
-        nfkc: "\u{3009}",
-        nfkd: "\u{3009}",
-    },
-    NormalizationTest {
-        source: "\u{2460}",
-        nfc: "\u{2460}",
-        nfd: "\u{2460}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{2461}",
-        nfc: "\u{2461}",
-        nfd: "\u{2461}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{2462}",
-        nfc: "\u{2462}",
-        nfd: "\u{2462}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{2463}",
-        nfc: "\u{2463}",
-        nfd: "\u{2463}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{2464}",
-        nfc: "\u{2464}",
-        nfd: "\u{2464}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{2465}",
-        nfc: "\u{2465}",
-        nfd: "\u{2465}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{2466}",
-        nfc: "\u{2466}",
-        nfd: "\u{2466}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{2467}",
-        nfc: "\u{2467}",
-        nfd: "\u{2467}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{2468}",
-        nfc: "\u{2468}",
-        nfd: "\u{2468}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{2469}",
-        nfc: "\u{2469}",
-        nfd: "\u{2469}",
-        nfkc: "\u{0031}\u{0030}",
-        nfkd: "\u{0031}\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{246A}",
-        nfc: "\u{246A}",
-        nfd: "\u{246A}",
-        nfkc: "\u{0031}\u{0031}",
-        nfkd: "\u{0031}\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{246B}",
-        nfc: "\u{246B}",
-        nfd: "\u{246B}",
-        nfkc: "\u{0031}\u{0032}",
-        nfkd: "\u{0031}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{246C}",
-        nfc: "\u{246C}",
-        nfd: "\u{246C}",
-        nfkc: "\u{0031}\u{0033}",
-        nfkd: "\u{0031}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{246D}",
-        nfc: "\u{246D}",
-        nfd: "\u{246D}",
-        nfkc: "\u{0031}\u{0034}",
-        nfkd: "\u{0031}\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{246E}",
-        nfc: "\u{246E}",
-        nfd: "\u{246E}",
-        nfkc: "\u{0031}\u{0035}",
-        nfkd: "\u{0031}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{246F}",
-        nfc: "\u{246F}",
-        nfd: "\u{246F}",
-        nfkc: "\u{0031}\u{0036}",
-        nfkd: "\u{0031}\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{2470}",
-        nfc: "\u{2470}",
-        nfd: "\u{2470}",
-        nfkc: "\u{0031}\u{0037}",
-        nfkd: "\u{0031}\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{2471}",
-        nfc: "\u{2471}",
-        nfd: "\u{2471}",
-        nfkc: "\u{0031}\u{0038}",
-        nfkd: "\u{0031}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{2472}",
-        nfc: "\u{2472}",
-        nfd: "\u{2472}",
-        nfkc: "\u{0031}\u{0039}",
-        nfkd: "\u{0031}\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{2473}",
-        nfc: "\u{2473}",
-        nfd: "\u{2473}",
-        nfkc: "\u{0032}\u{0030}",
-        nfkd: "\u{0032}\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{2474}",
-        nfc: "\u{2474}",
-        nfd: "\u{2474}",
-        nfkc: "\u{0028}\u{0031}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2475}",
-        nfc: "\u{2475}",
-        nfd: "\u{2475}",
-        nfkc: "\u{0028}\u{0032}\u{0029}",
-        nfkd: "\u{0028}\u{0032}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2476}",
-        nfc: "\u{2476}",
-        nfd: "\u{2476}",
-        nfkc: "\u{0028}\u{0033}\u{0029}",
-        nfkd: "\u{0028}\u{0033}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2477}",
-        nfc: "\u{2477}",
-        nfd: "\u{2477}",
-        nfkc: "\u{0028}\u{0034}\u{0029}",
-        nfkd: "\u{0028}\u{0034}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2478}",
-        nfc: "\u{2478}",
-        nfd: "\u{2478}",
-        nfkc: "\u{0028}\u{0035}\u{0029}",
-        nfkd: "\u{0028}\u{0035}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2479}",
-        nfc: "\u{2479}",
-        nfd: "\u{2479}",
-        nfkc: "\u{0028}\u{0036}\u{0029}",
-        nfkd: "\u{0028}\u{0036}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{247A}",
-        nfc: "\u{247A}",
-        nfd: "\u{247A}",
-        nfkc: "\u{0028}\u{0037}\u{0029}",
-        nfkd: "\u{0028}\u{0037}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{247B}",
-        nfc: "\u{247B}",
-        nfd: "\u{247B}",
-        nfkc: "\u{0028}\u{0038}\u{0029}",
-        nfkd: "\u{0028}\u{0038}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{247C}",
-        nfc: "\u{247C}",
-        nfd: "\u{247C}",
-        nfkc: "\u{0028}\u{0039}\u{0029}",
-        nfkd: "\u{0028}\u{0039}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{247D}",
-        nfc: "\u{247D}",
-        nfd: "\u{247D}",
-        nfkc: "\u{0028}\u{0031}\u{0030}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0030}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{247E}",
-        nfc: "\u{247E}",
-        nfd: "\u{247E}",
-        nfkc: "\u{0028}\u{0031}\u{0031}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0031}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{247F}",
-        nfc: "\u{247F}",
-        nfd: "\u{247F}",
-        nfkc: "\u{0028}\u{0031}\u{0032}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0032}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2480}",
-        nfc: "\u{2480}",
-        nfd: "\u{2480}",
-        nfkc: "\u{0028}\u{0031}\u{0033}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0033}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2481}",
-        nfc: "\u{2481}",
-        nfd: "\u{2481}",
-        nfkc: "\u{0028}\u{0031}\u{0034}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0034}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2482}",
-        nfc: "\u{2482}",
-        nfd: "\u{2482}",
-        nfkc: "\u{0028}\u{0031}\u{0035}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0035}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2483}",
-        nfc: "\u{2483}",
-        nfd: "\u{2483}",
-        nfkc: "\u{0028}\u{0031}\u{0036}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0036}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2484}",
-        nfc: "\u{2484}",
-        nfd: "\u{2484}",
-        nfkc: "\u{0028}\u{0031}\u{0037}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0037}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2485}",
-        nfc: "\u{2485}",
-        nfd: "\u{2485}",
-        nfkc: "\u{0028}\u{0031}\u{0038}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0038}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2486}",
-        nfc: "\u{2486}",
-        nfd: "\u{2486}",
-        nfkc: "\u{0028}\u{0031}\u{0039}\u{0029}",
-        nfkd: "\u{0028}\u{0031}\u{0039}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2487}",
-        nfc: "\u{2487}",
-        nfd: "\u{2487}",
-        nfkc: "\u{0028}\u{0032}\u{0030}\u{0029}",
-        nfkd: "\u{0028}\u{0032}\u{0030}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{2488}",
-        nfc: "\u{2488}",
-        nfd: "\u{2488}",
-        nfkc: "\u{0031}\u{002E}",
-        nfkd: "\u{0031}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2489}",
-        nfc: "\u{2489}",
-        nfd: "\u{2489}",
-        nfkc: "\u{0032}\u{002E}",
-        nfkd: "\u{0032}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{248A}",
-        nfc: "\u{248A}",
-        nfd: "\u{248A}",
-        nfkc: "\u{0033}\u{002E}",
-        nfkd: "\u{0033}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{248B}",
-        nfc: "\u{248B}",
-        nfd: "\u{248B}",
-        nfkc: "\u{0034}\u{002E}",
-        nfkd: "\u{0034}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{248C}",
-        nfc: "\u{248C}",
-        nfd: "\u{248C}",
-        nfkc: "\u{0035}\u{002E}",
-        nfkd: "\u{0035}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{248D}",
-        nfc: "\u{248D}",
-        nfd: "\u{248D}",
-        nfkc: "\u{0036}\u{002E}",
-        nfkd: "\u{0036}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{248E}",
-        nfc: "\u{248E}",
-        nfd: "\u{248E}",
-        nfkc: "\u{0037}\u{002E}",
-        nfkd: "\u{0037}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{248F}",
-        nfc: "\u{248F}",
-        nfd: "\u{248F}",
-        nfkc: "\u{0038}\u{002E}",
-        nfkd: "\u{0038}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2490}",
-        nfc: "\u{2490}",
-        nfd: "\u{2490}",
-        nfkc: "\u{0039}\u{002E}",
-        nfkd: "\u{0039}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2491}",
-        nfc: "\u{2491}",
-        nfd: "\u{2491}",
-        nfkc: "\u{0031}\u{0030}\u{002E}",
-        nfkd: "\u{0031}\u{0030}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2492}",
-        nfc: "\u{2492}",
-        nfd: "\u{2492}",
-        nfkc: "\u{0031}\u{0031}\u{002E}",
-        nfkd: "\u{0031}\u{0031}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2493}",
-        nfc: "\u{2493}",
-        nfd: "\u{2493}",
-        nfkc: "\u{0031}\u{0032}\u{002E}",
-        nfkd: "\u{0031}\u{0032}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2494}",
-        nfc: "\u{2494}",
-        nfd: "\u{2494}",
-        nfkc: "\u{0031}\u{0033}\u{002E}",
-        nfkd: "\u{0031}\u{0033}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2495}",
-        nfc: "\u{2495}",
-        nfd: "\u{2495}",
-        nfkc: "\u{0031}\u{0034}\u{002E}",
-        nfkd: "\u{0031}\u{0034}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2496}",
-        nfc: "\u{2496}",
-        nfd: "\u{2496}",
-        nfkc: "\u{0031}\u{0035}\u{002E}",
-        nfkd: "\u{0031}\u{0035}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2497}",
-        nfc: "\u{2497}",
-        nfd: "\u{2497}",
-        nfkc: "\u{0031}\u{0036}\u{002E}",
-        nfkd: "\u{0031}\u{0036}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2498}",
-        nfc: "\u{2498}",
-        nfd: "\u{2498}",
-        nfkc: "\u{0031}\u{0037}\u{002E}",
-        nfkd: "\u{0031}\u{0037}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{2499}",
-        nfc: "\u{2499}",
-        nfd: "\u{2499}",
-        nfkc: "\u{0031}\u{0038}\u{002E}",
-        nfkd: "\u{0031}\u{0038}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{249A}",
-        nfc: "\u{249A}",
-        nfd: "\u{249A}",
-        nfkc: "\u{0031}\u{0039}\u{002E}",
-        nfkd: "\u{0031}\u{0039}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{249B}",
-        nfc: "\u{249B}",
-        nfd: "\u{249B}",
-        nfkc: "\u{0032}\u{0030}\u{002E}",
-        nfkd: "\u{0032}\u{0030}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{249C}",
-        nfc: "\u{249C}",
-        nfd: "\u{249C}",
-        nfkc: "\u{0028}\u{0061}\u{0029}",
-        nfkd: "\u{0028}\u{0061}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{249D}",
-        nfc: "\u{249D}",
-        nfd: "\u{249D}",
-        nfkc: "\u{0028}\u{0062}\u{0029}",
-        nfkd: "\u{0028}\u{0062}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{249E}",
-        nfc: "\u{249E}",
-        nfd: "\u{249E}",
-        nfkc: "\u{0028}\u{0063}\u{0029}",
-        nfkd: "\u{0028}\u{0063}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{249F}",
-        nfc: "\u{249F}",
-        nfd: "\u{249F}",
-        nfkc: "\u{0028}\u{0064}\u{0029}",
-        nfkd: "\u{0028}\u{0064}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A0}",
-        nfc: "\u{24A0}",
-        nfd: "\u{24A0}",
-        nfkc: "\u{0028}\u{0065}\u{0029}",
-        nfkd: "\u{0028}\u{0065}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A1}",
-        nfc: "\u{24A1}",
-        nfd: "\u{24A1}",
-        nfkc: "\u{0028}\u{0066}\u{0029}",
-        nfkd: "\u{0028}\u{0066}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A2}",
-        nfc: "\u{24A2}",
-        nfd: "\u{24A2}",
-        nfkc: "\u{0028}\u{0067}\u{0029}",
-        nfkd: "\u{0028}\u{0067}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A3}",
-        nfc: "\u{24A3}",
-        nfd: "\u{24A3}",
-        nfkc: "\u{0028}\u{0068}\u{0029}",
-        nfkd: "\u{0028}\u{0068}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A4}",
-        nfc: "\u{24A4}",
-        nfd: "\u{24A4}",
-        nfkc: "\u{0028}\u{0069}\u{0029}",
-        nfkd: "\u{0028}\u{0069}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A5}",
-        nfc: "\u{24A5}",
-        nfd: "\u{24A5}",
-        nfkc: "\u{0028}\u{006A}\u{0029}",
-        nfkd: "\u{0028}\u{006A}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A6}",
-        nfc: "\u{24A6}",
-        nfd: "\u{24A6}",
-        nfkc: "\u{0028}\u{006B}\u{0029}",
-        nfkd: "\u{0028}\u{006B}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A7}",
-        nfc: "\u{24A7}",
-        nfd: "\u{24A7}",
-        nfkc: "\u{0028}\u{006C}\u{0029}",
-        nfkd: "\u{0028}\u{006C}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A8}",
-        nfc: "\u{24A8}",
-        nfd: "\u{24A8}",
-        nfkc: "\u{0028}\u{006D}\u{0029}",
-        nfkd: "\u{0028}\u{006D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24A9}",
-        nfc: "\u{24A9}",
-        nfd: "\u{24A9}",
-        nfkc: "\u{0028}\u{006E}\u{0029}",
-        nfkd: "\u{0028}\u{006E}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24AA}",
-        nfc: "\u{24AA}",
-        nfd: "\u{24AA}",
-        nfkc: "\u{0028}\u{006F}\u{0029}",
-        nfkd: "\u{0028}\u{006F}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24AB}",
-        nfc: "\u{24AB}",
-        nfd: "\u{24AB}",
-        nfkc: "\u{0028}\u{0070}\u{0029}",
-        nfkd: "\u{0028}\u{0070}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24AC}",
-        nfc: "\u{24AC}",
-        nfd: "\u{24AC}",
-        nfkc: "\u{0028}\u{0071}\u{0029}",
-        nfkd: "\u{0028}\u{0071}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24AD}",
-        nfc: "\u{24AD}",
-        nfd: "\u{24AD}",
-        nfkc: "\u{0028}\u{0072}\u{0029}",
-        nfkd: "\u{0028}\u{0072}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24AE}",
-        nfc: "\u{24AE}",
-        nfd: "\u{24AE}",
-        nfkc: "\u{0028}\u{0073}\u{0029}",
-        nfkd: "\u{0028}\u{0073}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24AF}",
-        nfc: "\u{24AF}",
-        nfd: "\u{24AF}",
-        nfkc: "\u{0028}\u{0074}\u{0029}",
-        nfkd: "\u{0028}\u{0074}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B0}",
-        nfc: "\u{24B0}",
-        nfd: "\u{24B0}",
-        nfkc: "\u{0028}\u{0075}\u{0029}",
-        nfkd: "\u{0028}\u{0075}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B1}",
-        nfc: "\u{24B1}",
-        nfd: "\u{24B1}",
-        nfkc: "\u{0028}\u{0076}\u{0029}",
-        nfkd: "\u{0028}\u{0076}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B2}",
-        nfc: "\u{24B2}",
-        nfd: "\u{24B2}",
-        nfkc: "\u{0028}\u{0077}\u{0029}",
-        nfkd: "\u{0028}\u{0077}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B3}",
-        nfc: "\u{24B3}",
-        nfd: "\u{24B3}",
-        nfkc: "\u{0028}\u{0078}\u{0029}",
-        nfkd: "\u{0028}\u{0078}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B4}",
-        nfc: "\u{24B4}",
-        nfd: "\u{24B4}",
-        nfkc: "\u{0028}\u{0079}\u{0029}",
-        nfkd: "\u{0028}\u{0079}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B5}",
-        nfc: "\u{24B5}",
-        nfd: "\u{24B5}",
-        nfkc: "\u{0028}\u{007A}\u{0029}",
-        nfkd: "\u{0028}\u{007A}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{24B6}",
-        nfc: "\u{24B6}",
-        nfd: "\u{24B6}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{24B7}",
-        nfc: "\u{24B7}",
-        nfd: "\u{24B7}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{24B8}",
-        nfc: "\u{24B8}",
-        nfd: "\u{24B8}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{24B9}",
-        nfc: "\u{24B9}",
-        nfd: "\u{24B9}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{24BA}",
-        nfc: "\u{24BA}",
-        nfd: "\u{24BA}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{24BB}",
-        nfc: "\u{24BB}",
-        nfd: "\u{24BB}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{24BC}",
-        nfc: "\u{24BC}",
-        nfd: "\u{24BC}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{24BD}",
-        nfc: "\u{24BD}",
-        nfd: "\u{24BD}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{24BE}",
-        nfc: "\u{24BE}",
-        nfd: "\u{24BE}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{24BF}",
-        nfc: "\u{24BF}",
-        nfd: "\u{24BF}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{24C0}",
-        nfc: "\u{24C0}",
-        nfd: "\u{24C0}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{24C1}",
-        nfc: "\u{24C1}",
-        nfd: "\u{24C1}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{24C2}",
-        nfc: "\u{24C2}",
-        nfd: "\u{24C2}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{24C3}",
-        nfc: "\u{24C3}",
-        nfd: "\u{24C3}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{24C4}",
-        nfc: "\u{24C4}",
-        nfd: "\u{24C4}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{24C5}",
-        nfc: "\u{24C5}",
-        nfd: "\u{24C5}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{24C6}",
-        nfc: "\u{24C6}",
-        nfd: "\u{24C6}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{24C7}",
-        nfc: "\u{24C7}",
-        nfd: "\u{24C7}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{24C8}",
-        nfc: "\u{24C8}",
-        nfd: "\u{24C8}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{24C9}",
-        nfc: "\u{24C9}",
-        nfd: "\u{24C9}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{24CA}",
-        nfc: "\u{24CA}",
-        nfd: "\u{24CA}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{24CB}",
-        nfc: "\u{24CB}",
-        nfd: "\u{24CB}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{24CC}",
-        nfc: "\u{24CC}",
-        nfd: "\u{24CC}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{24CD}",
-        nfc: "\u{24CD}",
-        nfd: "\u{24CD}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{24CE}",
-        nfc: "\u{24CE}",
-        nfd: "\u{24CE}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{24CF}",
-        nfc: "\u{24CF}",
-        nfd: "\u{24CF}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{24D0}",
-        nfc: "\u{24D0}",
-        nfd: "\u{24D0}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{24D1}",
-        nfc: "\u{24D1}",
-        nfd: "\u{24D1}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{24D2}",
-        nfc: "\u{24D2}",
-        nfd: "\u{24D2}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{24D3}",
-        nfc: "\u{24D3}",
-        nfd: "\u{24D3}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{24D4}",
-        nfc: "\u{24D4}",
-        nfd: "\u{24D4}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{24D5}",
-        nfc: "\u{24D5}",
-        nfd: "\u{24D5}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{24D6}",
-        nfc: "\u{24D6}",
-        nfd: "\u{24D6}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{24D7}",
-        nfc: "\u{24D7}",
-        nfd: "\u{24D7}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{24D8}",
-        nfc: "\u{24D8}",
-        nfd: "\u{24D8}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{24D9}",
-        nfc: "\u{24D9}",
-        nfd: "\u{24D9}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{24DA}",
-        nfc: "\u{24DA}",
-        nfd: "\u{24DA}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{24DB}",
-        nfc: "\u{24DB}",
-        nfd: "\u{24DB}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{24DC}",
-        nfc: "\u{24DC}",
-        nfd: "\u{24DC}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{24DD}",
-        nfc: "\u{24DD}",
-        nfd: "\u{24DD}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{24DE}",
-        nfc: "\u{24DE}",
-        nfd: "\u{24DE}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{24DF}",
-        nfc: "\u{24DF}",
-        nfd: "\u{24DF}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{24E0}",
-        nfc: "\u{24E0}",
-        nfd: "\u{24E0}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{24E1}",
-        nfc: "\u{24E1}",
-        nfd: "\u{24E1}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{24E2}",
-        nfc: "\u{24E2}",
-        nfd: "\u{24E2}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{24E3}",
-        nfc: "\u{24E3}",
-        nfd: "\u{24E3}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{24E4}",
-        nfc: "\u{24E4}",
-        nfd: "\u{24E4}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{24E5}",
-        nfc: "\u{24E5}",
-        nfd: "\u{24E5}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{24E6}",
-        nfc: "\u{24E6}",
-        nfd: "\u{24E6}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{24E7}",
-        nfc: "\u{24E7}",
-        nfd: "\u{24E7}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{24E8}",
-        nfc: "\u{24E8}",
-        nfd: "\u{24E8}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{24E9}",
-        nfc: "\u{24E9}",
-        nfd: "\u{24E9}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{24EA}",
-        nfc: "\u{24EA}",
-        nfd: "\u{24EA}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{2A0C}",
-        nfc: "\u{2A0C}",
-        nfd: "\u{2A0C}",
-        nfkc: "\u{222B}\u{222B}\u{222B}\u{222B}",
-        nfkd: "\u{222B}\u{222B}\u{222B}\u{222B}",
-    },
-    NormalizationTest {
-        source: "\u{2A74}",
-        nfc: "\u{2A74}",
-        nfd: "\u{2A74}",
-        nfkc: "\u{003A}\u{003A}\u{003D}",
-        nfkd: "\u{003A}\u{003A}\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{2A75}",
-        nfc: "\u{2A75}",
-        nfd: "\u{2A75}",
-        nfkc: "\u{003D}\u{003D}",
-        nfkd: "\u{003D}\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{2A76}",
-        nfc: "\u{2A76}",
-        nfd: "\u{2A76}",
-        nfkc: "\u{003D}\u{003D}\u{003D}",
-        nfkd: "\u{003D}\u{003D}\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{2ADC}",
-        nfc: "\u{2ADD}\u{0338}",
-        nfd: "\u{2ADD}\u{0338}",
-        nfkc: "\u{2ADD}\u{0338}",
-        nfkd: "\u{2ADD}\u{0338}",
-    },
-    NormalizationTest {
-        source: "\u{2C7C}",
-        nfc: "\u{2C7C}",
-        nfd: "\u{2C7C}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{2C7D}",
-        nfc: "\u{2C7D}",
-        nfd: "\u{2C7D}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{2D6F}",
-        nfc: "\u{2D6F}",
-        nfd: "\u{2D6F}",
-        nfkc: "\u{2D61}",
-        nfkd: "\u{2D61}",
-    },
-    NormalizationTest {
-        source: "\u{2E9F}",
-        nfc: "\u{2E9F}",
-        nfd: "\u{2E9F}",
-        nfkc: "\u{6BCD}",
-        nfkd: "\u{6BCD}",
-    },
-    NormalizationTest {
-        source: "\u{2EF3}",
-        nfc: "\u{2EF3}",
-        nfd: "\u{2EF3}",
-        nfkc: "\u{9F9F}",
-        nfkd: "\u{9F9F}",
-    },
-    NormalizationTest {
-        source: "\u{2F00}",
-        nfc: "\u{2F00}",
-        nfd: "\u{2F00}",
-        nfkc: "\u{4E00}",
-        nfkd: "\u{4E00}",
-    },
-    NormalizationTest {
-        source: "\u{2F01}",
-        nfc: "\u{2F01}",
-        nfd: "\u{2F01}",
-        nfkc: "\u{4E28}",
-        nfkd: "\u{4E28}",
-    },
-    NormalizationTest {
-        source: "\u{2F02}",
-        nfc: "\u{2F02}",
-        nfd: "\u{2F02}",
-        nfkc: "\u{4E36}",
-        nfkd: "\u{4E36}",
-    },
-    NormalizationTest {
-        source: "\u{2F03}",
-        nfc: "\u{2F03}",
-        nfd: "\u{2F03}",
-        nfkc: "\u{4E3F}",
-        nfkd: "\u{4E3F}",
-    },
-    NormalizationTest {
-        source: "\u{2F04}",
-        nfc: "\u{2F04}",
-        nfd: "\u{2F04}",
-        nfkc: "\u{4E59}",
-        nfkd: "\u{4E59}",
-    },
-    NormalizationTest {
-        source: "\u{2F05}",
-        nfc: "\u{2F05}",
-        nfd: "\u{2F05}",
-        nfkc: "\u{4E85}",
-        nfkd: "\u{4E85}",
-    },
-    NormalizationTest {
-        source: "\u{2F06}",
-        nfc: "\u{2F06}",
-        nfd: "\u{2F06}",
-        nfkc: "\u{4E8C}",
-        nfkd: "\u{4E8C}",
-    },
-    NormalizationTest {
-        source: "\u{2F07}",
-        nfc: "\u{2F07}",
-        nfd: "\u{2F07}",
-        nfkc: "\u{4EA0}",
-        nfkd: "\u{4EA0}",
-    },
-    NormalizationTest {
-        source: "\u{2F08}",
-        nfc: "\u{2F08}",
-        nfd: "\u{2F08}",
-        nfkc: "\u{4EBA}",
-        nfkd: "\u{4EBA}",
-    },
-    NormalizationTest {
-        source: "\u{2F09}",
-        nfc: "\u{2F09}",
-        nfd: "\u{2F09}",
-        nfkc: "\u{513F}",
-        nfkd: "\u{513F}",
-    },
-    NormalizationTest {
-        source: "\u{2F0A}",
-        nfc: "\u{2F0A}",
-        nfd: "\u{2F0A}",
-        nfkc: "\u{5165}",
-        nfkd: "\u{5165}",
-    },
-    NormalizationTest {
-        source: "\u{2F0B}",
-        nfc: "\u{2F0B}",
-        nfd: "\u{2F0B}",
-        nfkc: "\u{516B}",
-        nfkd: "\u{516B}",
-    },
-    NormalizationTest {
-        source: "\u{2F0C}",
-        nfc: "\u{2F0C}",
-        nfd: "\u{2F0C}",
-        nfkc: "\u{5182}",
-        nfkd: "\u{5182}",
-    },
-    NormalizationTest {
-        source: "\u{2F0D}",
-        nfc: "\u{2F0D}",
-        nfd: "\u{2F0D}",
-        nfkc: "\u{5196}",
-        nfkd: "\u{5196}",
-    },
-    NormalizationTest {
-        source: "\u{2F0E}",
-        nfc: "\u{2F0E}",
-        nfd: "\u{2F0E}",
-        nfkc: "\u{51AB}",
-        nfkd: "\u{51AB}",
-    },
-    NormalizationTest {
-        source: "\u{2F0F}",
-        nfc: "\u{2F0F}",
-        nfd: "\u{2F0F}",
-        nfkc: "\u{51E0}",
-        nfkd: "\u{51E0}",
-    },
-    NormalizationTest {
-        source: "\u{2F10}",
-        nfc: "\u{2F10}",
-        nfd: "\u{2F10}",
-        nfkc: "\u{51F5}",
-        nfkd: "\u{51F5}",
-    },
-    NormalizationTest {
-        source: "\u{2F11}",
-        nfc: "\u{2F11}",
-        nfd: "\u{2F11}",
-        nfkc: "\u{5200}",
-        nfkd: "\u{5200}",
-    },
-    NormalizationTest {
-        source: "\u{2F12}",
-        nfc: "\u{2F12}",
-        nfd: "\u{2F12}",
-        nfkc: "\u{529B}",
-        nfkd: "\u{529B}",
-    },
-    NormalizationTest {
-        source: "\u{2F13}",
-        nfc: "\u{2F13}",
-        nfd: "\u{2F13}",
-        nfkc: "\u{52F9}",
-        nfkd: "\u{52F9}",
-    },
-    NormalizationTest {
-        source: "\u{2F14}",
-        nfc: "\u{2F14}",
-        nfd: "\u{2F14}",
-        nfkc: "\u{5315}",
-        nfkd: "\u{5315}",
-    },
-    NormalizationTest {
-        source: "\u{2F15}",
-        nfc: "\u{2F15}",
-        nfd: "\u{2F15}",
-        nfkc: "\u{531A}",
-        nfkd: "\u{531A}",
-    },
-    NormalizationTest {
-        source: "\u{2F16}",
-        nfc: "\u{2F16}",
-        nfd: "\u{2F16}",
-        nfkc: "\u{5338}",
-        nfkd: "\u{5338}",
-    },
-    NormalizationTest {
-        source: "\u{2F17}",
-        nfc: "\u{2F17}",
-        nfd: "\u{2F17}",
-        nfkc: "\u{5341}",
-        nfkd: "\u{5341}",
-    },
-    NormalizationTest {
-        source: "\u{2F18}",
-        nfc: "\u{2F18}",
-        nfd: "\u{2F18}",
-        nfkc: "\u{535C}",
-        nfkd: "\u{535C}",
-    },
-    NormalizationTest {
-        source: "\u{2F19}",
-        nfc: "\u{2F19}",
-        nfd: "\u{2F19}",
-        nfkc: "\u{5369}",
-        nfkd: "\u{5369}",
-    },
-    NormalizationTest {
-        source: "\u{2F1A}",
-        nfc: "\u{2F1A}",
-        nfd: "\u{2F1A}",
-        nfkc: "\u{5382}",
-        nfkd: "\u{5382}",
-    },
-    NormalizationTest {
-        source: "\u{2F1B}",
-        nfc: "\u{2F1B}",
-        nfd: "\u{2F1B}",
-        nfkc: "\u{53B6}",
-        nfkd: "\u{53B6}",
-    },
-    NormalizationTest {
-        source: "\u{2F1C}",
-        nfc: "\u{2F1C}",
-        nfd: "\u{2F1C}",
-        nfkc: "\u{53C8}",
-        nfkd: "\u{53C8}",
-    },
-    NormalizationTest {
-        source: "\u{2F1D}",
-        nfc: "\u{2F1D}",
-        nfd: "\u{2F1D}",
-        nfkc: "\u{53E3}",
-        nfkd: "\u{53E3}",
-    },
-    NormalizationTest {
-        source: "\u{2F1E}",
-        nfc: "\u{2F1E}",
-        nfd: "\u{2F1E}",
-        nfkc: "\u{56D7}",
-        nfkd: "\u{56D7}",
-    },
-    NormalizationTest {
-        source: "\u{2F1F}",
-        nfc: "\u{2F1F}",
-        nfd: "\u{2F1F}",
-        nfkc: "\u{571F}",
-        nfkd: "\u{571F}",
-    },
-    NormalizationTest {
-        source: "\u{2F20}",
-        nfc: "\u{2F20}",
-        nfd: "\u{2F20}",
-        nfkc: "\u{58EB}",
-        nfkd: "\u{58EB}",
-    },
-    NormalizationTest {
-        source: "\u{2F21}",
-        nfc: "\u{2F21}",
-        nfd: "\u{2F21}",
-        nfkc: "\u{5902}",
-        nfkd: "\u{5902}",
-    },
-    NormalizationTest {
-        source: "\u{2F22}",
-        nfc: "\u{2F22}",
-        nfd: "\u{2F22}",
-        nfkc: "\u{590A}",
-        nfkd: "\u{590A}",
-    },
-    NormalizationTest {
-        source: "\u{2F23}",
-        nfc: "\u{2F23}",
-        nfd: "\u{2F23}",
-        nfkc: "\u{5915}",
-        nfkd: "\u{5915}",
-    },
-    NormalizationTest {
-        source: "\u{2F24}",
-        nfc: "\u{2F24}",
-        nfd: "\u{2F24}",
-        nfkc: "\u{5927}",
-        nfkd: "\u{5927}",
-    },
-    NormalizationTest {
-        source: "\u{2F25}",
-        nfc: "\u{2F25}",
-        nfd: "\u{2F25}",
-        nfkc: "\u{5973}",
-        nfkd: "\u{5973}",
-    },
-    NormalizationTest {
-        source: "\u{2F26}",
-        nfc: "\u{2F26}",
-        nfd: "\u{2F26}",
-        nfkc: "\u{5B50}",
-        nfkd: "\u{5B50}",
-    },
-    NormalizationTest {
-        source: "\u{2F27}",
-        nfc: "\u{2F27}",
-        nfd: "\u{2F27}",
-        nfkc: "\u{5B80}",
-        nfkd: "\u{5B80}",
-    },
-    NormalizationTest {
-        source: "\u{2F28}",
-        nfc: "\u{2F28}",
-        nfd: "\u{2F28}",
-        nfkc: "\u{5BF8}",
-        nfkd: "\u{5BF8}",
-    },
-    NormalizationTest {
-        source: "\u{2F29}",
-        nfc: "\u{2F29}",
-        nfd: "\u{2F29}",
-        nfkc: "\u{5C0F}",
-        nfkd: "\u{5C0F}",
-    },
-    NormalizationTest {
-        source: "\u{2F2A}",
-        nfc: "\u{2F2A}",
-        nfd: "\u{2F2A}",
-        nfkc: "\u{5C22}",
-        nfkd: "\u{5C22}",
-    },
-    NormalizationTest {
-        source: "\u{2F2B}",
-        nfc: "\u{2F2B}",
-        nfd: "\u{2F2B}",
-        nfkc: "\u{5C38}",
-        nfkd: "\u{5C38}",
-    },
-    NormalizationTest {
-        source: "\u{2F2C}",
-        nfc: "\u{2F2C}",
-        nfd: "\u{2F2C}",
-        nfkc: "\u{5C6E}",
-        nfkd: "\u{5C6E}",
-    },
-    NormalizationTest {
-        source: "\u{2F2D}",
-        nfc: "\u{2F2D}",
-        nfd: "\u{2F2D}",
-        nfkc: "\u{5C71}",
-        nfkd: "\u{5C71}",
-    },
-    NormalizationTest {
-        source: "\u{2F2E}",
-        nfc: "\u{2F2E}",
-        nfd: "\u{2F2E}",
-        nfkc: "\u{5DDB}",
-        nfkd: "\u{5DDB}",
-    },
-    NormalizationTest {
-        source: "\u{2F2F}",
-        nfc: "\u{2F2F}",
-        nfd: "\u{2F2F}",
-        nfkc: "\u{5DE5}",
-        nfkd: "\u{5DE5}",
-    },
-    NormalizationTest {
-        source: "\u{2F30}",
-        nfc: "\u{2F30}",
-        nfd: "\u{2F30}",
-        nfkc: "\u{5DF1}",
-        nfkd: "\u{5DF1}",
-    },
-    NormalizationTest {
-        source: "\u{2F31}",
-        nfc: "\u{2F31}",
-        nfd: "\u{2F31}",
-        nfkc: "\u{5DFE}",
-        nfkd: "\u{5DFE}",
-    },
-    NormalizationTest {
-        source: "\u{2F32}",
-        nfc: "\u{2F32}",
-        nfd: "\u{2F32}",
-        nfkc: "\u{5E72}",
-        nfkd: "\u{5E72}",
-    },
-    NormalizationTest {
-        source: "\u{2F33}",
-        nfc: "\u{2F33}",
-        nfd: "\u{2F33}",
-        nfkc: "\u{5E7A}",
-        nfkd: "\u{5E7A}",
-    },
-    NormalizationTest {
-        source: "\u{2F34}",
-        nfc: "\u{2F34}",
-        nfd: "\u{2F34}",
-        nfkc: "\u{5E7F}",
-        nfkd: "\u{5E7F}",
-    },
-    NormalizationTest {
-        source: "\u{2F35}",
-        nfc: "\u{2F35}",
-        nfd: "\u{2F35}",
-        nfkc: "\u{5EF4}",
-        nfkd: "\u{5EF4}",
-    },
-    NormalizationTest {
-        source: "\u{2F36}",
-        nfc: "\u{2F36}",
-        nfd: "\u{2F36}",
-        nfkc: "\u{5EFE}",
-        nfkd: "\u{5EFE}",
-    },
-    NormalizationTest {
-        source: "\u{2F37}",
-        nfc: "\u{2F37}",
-        nfd: "\u{2F37}",
-        nfkc: "\u{5F0B}",
-        nfkd: "\u{5F0B}",
-    },
-    NormalizationTest {
-        source: "\u{2F38}",
-        nfc: "\u{2F38}",
-        nfd: "\u{2F38}",
-        nfkc: "\u{5F13}",
-        nfkd: "\u{5F13}",
-    },
-    NormalizationTest {
-        source: "\u{2F39}",
-        nfc: "\u{2F39}",
-        nfd: "\u{2F39}",
-        nfkc: "\u{5F50}",
-        nfkd: "\u{5F50}",
-    },
-    NormalizationTest {
-        source: "\u{2F3A}",
-        nfc: "\u{2F3A}",
-        nfd: "\u{2F3A}",
-        nfkc: "\u{5F61}",
-        nfkd: "\u{5F61}",
-    },
-    NormalizationTest {
-        source: "\u{2F3B}",
-        nfc: "\u{2F3B}",
-        nfd: "\u{2F3B}",
-        nfkc: "\u{5F73}",
-        nfkd: "\u{5F73}",
-    },
-    NormalizationTest {
-        source: "\u{2F3C}",
-        nfc: "\u{2F3C}",
-        nfd: "\u{2F3C}",
-        nfkc: "\u{5FC3}",
-        nfkd: "\u{5FC3}",
-    },
-    NormalizationTest {
-        source: "\u{2F3D}",
-        nfc: "\u{2F3D}",
-        nfd: "\u{2F3D}",
-        nfkc: "\u{6208}",
-        nfkd: "\u{6208}",
-    },
-    NormalizationTest {
-        source: "\u{2F3E}",
-        nfc: "\u{2F3E}",
-        nfd: "\u{2F3E}",
-        nfkc: "\u{6236}",
-        nfkd: "\u{6236}",
-    },
-    NormalizationTest {
-        source: "\u{2F3F}",
-        nfc: "\u{2F3F}",
-        nfd: "\u{2F3F}",
-        nfkc: "\u{624B}",
-        nfkd: "\u{624B}",
-    },
-    NormalizationTest {
-        source: "\u{2F40}",
-        nfc: "\u{2F40}",
-        nfd: "\u{2F40}",
-        nfkc: "\u{652F}",
-        nfkd: "\u{652F}",
-    },
-    NormalizationTest {
-        source: "\u{2F41}",
-        nfc: "\u{2F41}",
-        nfd: "\u{2F41}",
-        nfkc: "\u{6534}",
-        nfkd: "\u{6534}",
-    },
-    NormalizationTest {
-        source: "\u{2F42}",
-        nfc: "\u{2F42}",
-        nfd: "\u{2F42}",
-        nfkc: "\u{6587}",
-        nfkd: "\u{6587}",
-    },
-    NormalizationTest {
-        source: "\u{2F43}",
-        nfc: "\u{2F43}",
-        nfd: "\u{2F43}",
-        nfkc: "\u{6597}",
-        nfkd: "\u{6597}",
-    },
-    NormalizationTest {
-        source: "\u{2F44}",
-        nfc: "\u{2F44}",
-        nfd: "\u{2F44}",
-        nfkc: "\u{65A4}",
-        nfkd: "\u{65A4}",
-    },
-    NormalizationTest {
-        source: "\u{2F45}",
-        nfc: "\u{2F45}",
-        nfd: "\u{2F45}",
-        nfkc: "\u{65B9}",
-        nfkd: "\u{65B9}",
-    },
-    NormalizationTest {
-        source: "\u{2F46}",
-        nfc: "\u{2F46}",
-        nfd: "\u{2F46}",
-        nfkc: "\u{65E0}",
-        nfkd: "\u{65E0}",
-    },
-    NormalizationTest {
-        source: "\u{2F47}",
-        nfc: "\u{2F47}",
-        nfd: "\u{2F47}",
-        nfkc: "\u{65E5}",
-        nfkd: "\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{2F48}",
-        nfc: "\u{2F48}",
-        nfd: "\u{2F48}",
-        nfkc: "\u{66F0}",
-        nfkd: "\u{66F0}",
-    },
-    NormalizationTest {
-        source: "\u{2F49}",
-        nfc: "\u{2F49}",
-        nfd: "\u{2F49}",
-        nfkc: "\u{6708}",
-        nfkd: "\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{2F4A}",
-        nfc: "\u{2F4A}",
-        nfd: "\u{2F4A}",
-        nfkc: "\u{6728}",
-        nfkd: "\u{6728}",
-    },
-    NormalizationTest {
-        source: "\u{2F4B}",
-        nfc: "\u{2F4B}",
-        nfd: "\u{2F4B}",
-        nfkc: "\u{6B20}",
-        nfkd: "\u{6B20}",
-    },
-    NormalizationTest {
-        source: "\u{2F4C}",
-        nfc: "\u{2F4C}",
-        nfd: "\u{2F4C}",
-        nfkc: "\u{6B62}",
-        nfkd: "\u{6B62}",
-    },
-    NormalizationTest {
-        source: "\u{2F4D}",
-        nfc: "\u{2F4D}",
-        nfd: "\u{2F4D}",
-        nfkc: "\u{6B79}",
-        nfkd: "\u{6B79}",
-    },
-    NormalizationTest {
-        source: "\u{2F4E}",
-        nfc: "\u{2F4E}",
-        nfd: "\u{2F4E}",
-        nfkc: "\u{6BB3}",
-        nfkd: "\u{6BB3}",
-    },
-    NormalizationTest {
-        source: "\u{2F4F}",
-        nfc: "\u{2F4F}",
-        nfd: "\u{2F4F}",
-        nfkc: "\u{6BCB}",
-        nfkd: "\u{6BCB}",
-    },
-    NormalizationTest {
-        source: "\u{2F50}",
-        nfc: "\u{2F50}",
-        nfd: "\u{2F50}",
-        nfkc: "\u{6BD4}",
-        nfkd: "\u{6BD4}",
-    },
-    NormalizationTest {
-        source: "\u{2F51}",
-        nfc: "\u{2F51}",
-        nfd: "\u{2F51}",
-        nfkc: "\u{6BDB}",
-        nfkd: "\u{6BDB}",
-    },
-    NormalizationTest {
-        source: "\u{2F52}",
-        nfc: "\u{2F52}",
-        nfd: "\u{2F52}",
-        nfkc: "\u{6C0F}",
-        nfkd: "\u{6C0F}",
-    },
-    NormalizationTest {
-        source: "\u{2F53}",
-        nfc: "\u{2F53}",
-        nfd: "\u{2F53}",
-        nfkc: "\u{6C14}",
-        nfkd: "\u{6C14}",
-    },
-    NormalizationTest {
-        source: "\u{2F54}",
-        nfc: "\u{2F54}",
-        nfd: "\u{2F54}",
-        nfkc: "\u{6C34}",
-        nfkd: "\u{6C34}",
-    },
-    NormalizationTest {
-        source: "\u{2F55}",
-        nfc: "\u{2F55}",
-        nfd: "\u{2F55}",
-        nfkc: "\u{706B}",
-        nfkd: "\u{706B}",
-    },
-    NormalizationTest {
-        source: "\u{2F56}",
-        nfc: "\u{2F56}",
-        nfd: "\u{2F56}",
-        nfkc: "\u{722A}",
-        nfkd: "\u{722A}",
-    },
-    NormalizationTest {
-        source: "\u{2F57}",
-        nfc: "\u{2F57}",
-        nfd: "\u{2F57}",
-        nfkc: "\u{7236}",
-        nfkd: "\u{7236}",
-    },
-    NormalizationTest {
-        source: "\u{2F58}",
-        nfc: "\u{2F58}",
-        nfd: "\u{2F58}",
-        nfkc: "\u{723B}",
-        nfkd: "\u{723B}",
-    },
-    NormalizationTest {
-        source: "\u{2F59}",
-        nfc: "\u{2F59}",
-        nfd: "\u{2F59}",
-        nfkc: "\u{723F}",
-        nfkd: "\u{723F}",
-    },
-    NormalizationTest {
-        source: "\u{2F5A}",
-        nfc: "\u{2F5A}",
-        nfd: "\u{2F5A}",
-        nfkc: "\u{7247}",
-        nfkd: "\u{7247}",
-    },
-    NormalizationTest {
-        source: "\u{2F5B}",
-        nfc: "\u{2F5B}",
-        nfd: "\u{2F5B}",
-        nfkc: "\u{7259}",
-        nfkd: "\u{7259}",
-    },
-    NormalizationTest {
-        source: "\u{2F5C}",
-        nfc: "\u{2F5C}",
-        nfd: "\u{2F5C}",
-        nfkc: "\u{725B}",
-        nfkd: "\u{725B}",
-    },
-    NormalizationTest {
-        source: "\u{2F5D}",
-        nfc: "\u{2F5D}",
-        nfd: "\u{2F5D}",
-        nfkc: "\u{72AC}",
-        nfkd: "\u{72AC}",
-    },
-    NormalizationTest {
-        source: "\u{2F5E}",
-        nfc: "\u{2F5E}",
-        nfd: "\u{2F5E}",
-        nfkc: "\u{7384}",
-        nfkd: "\u{7384}",
-    },
-    NormalizationTest {
-        source: "\u{2F5F}",
-        nfc: "\u{2F5F}",
-        nfd: "\u{2F5F}",
-        nfkc: "\u{7389}",
-        nfkd: "\u{7389}",
-    },
-    NormalizationTest {
-        source: "\u{2F60}",
-        nfc: "\u{2F60}",
-        nfd: "\u{2F60}",
-        nfkc: "\u{74DC}",
-        nfkd: "\u{74DC}",
-    },
-    NormalizationTest {
-        source: "\u{2F61}",
-        nfc: "\u{2F61}",
-        nfd: "\u{2F61}",
-        nfkc: "\u{74E6}",
-        nfkd: "\u{74E6}",
-    },
-    NormalizationTest {
-        source: "\u{2F62}",
-        nfc: "\u{2F62}",
-        nfd: "\u{2F62}",
-        nfkc: "\u{7518}",
-        nfkd: "\u{7518}",
-    },
-    NormalizationTest {
-        source: "\u{2F63}",
-        nfc: "\u{2F63}",
-        nfd: "\u{2F63}",
-        nfkc: "\u{751F}",
-        nfkd: "\u{751F}",
-    },
-    NormalizationTest {
-        source: "\u{2F64}",
-        nfc: "\u{2F64}",
-        nfd: "\u{2F64}",
-        nfkc: "\u{7528}",
-        nfkd: "\u{7528}",
-    },
-    NormalizationTest {
-        source: "\u{2F65}",
-        nfc: "\u{2F65}",
-        nfd: "\u{2F65}",
-        nfkc: "\u{7530}",
-        nfkd: "\u{7530}",
-    },
-    NormalizationTest {
-        source: "\u{2F66}",
-        nfc: "\u{2F66}",
-        nfd: "\u{2F66}",
-        nfkc: "\u{758B}",
-        nfkd: "\u{758B}",
-    },
-    NormalizationTest {
-        source: "\u{2F67}",
-        nfc: "\u{2F67}",
-        nfd: "\u{2F67}",
-        nfkc: "\u{7592}",
-        nfkd: "\u{7592}",
-    },
-    NormalizationTest {
-        source: "\u{2F68}",
-        nfc: "\u{2F68}",
-        nfd: "\u{2F68}",
-        nfkc: "\u{7676}",
-        nfkd: "\u{7676}",
-    },
-    NormalizationTest {
-        source: "\u{2F69}",
-        nfc: "\u{2F69}",
-        nfd: "\u{2F69}",
-        nfkc: "\u{767D}",
-        nfkd: "\u{767D}",
-    },
-    NormalizationTest {
-        source: "\u{2F6A}",
-        nfc: "\u{2F6A}",
-        nfd: "\u{2F6A}",
-        nfkc: "\u{76AE}",
-        nfkd: "\u{76AE}",
-    },
-    NormalizationTest {
-        source: "\u{2F6B}",
-        nfc: "\u{2F6B}",
-        nfd: "\u{2F6B}",
-        nfkc: "\u{76BF}",
-        nfkd: "\u{76BF}",
-    },
-    NormalizationTest {
-        source: "\u{2F6C}",
-        nfc: "\u{2F6C}",
-        nfd: "\u{2F6C}",
-        nfkc: "\u{76EE}",
-        nfkd: "\u{76EE}",
-    },
-    NormalizationTest {
-        source: "\u{2F6D}",
-        nfc: "\u{2F6D}",
-        nfd: "\u{2F6D}",
-        nfkc: "\u{77DB}",
-        nfkd: "\u{77DB}",
-    },
-    NormalizationTest {
-        source: "\u{2F6E}",
-        nfc: "\u{2F6E}",
-        nfd: "\u{2F6E}",
-        nfkc: "\u{77E2}",
-        nfkd: "\u{77E2}",
-    },
-    NormalizationTest {
-        source: "\u{2F6F}",
-        nfc: "\u{2F6F}",
-        nfd: "\u{2F6F}",
-        nfkc: "\u{77F3}",
-        nfkd: "\u{77F3}",
-    },
-    NormalizationTest {
-        source: "\u{2F70}",
-        nfc: "\u{2F70}",
-        nfd: "\u{2F70}",
-        nfkc: "\u{793A}",
-        nfkd: "\u{793A}",
-    },
-    NormalizationTest {
-        source: "\u{2F71}",
-        nfc: "\u{2F71}",
-        nfd: "\u{2F71}",
-        nfkc: "\u{79B8}",
-        nfkd: "\u{79B8}",
-    },
-    NormalizationTest {
-        source: "\u{2F72}",
-        nfc: "\u{2F72}",
-        nfd: "\u{2F72}",
-        nfkc: "\u{79BE}",
-        nfkd: "\u{79BE}",
-    },
-    NormalizationTest {
-        source: "\u{2F73}",
-        nfc: "\u{2F73}",
-        nfd: "\u{2F73}",
-        nfkc: "\u{7A74}",
-        nfkd: "\u{7A74}",
-    },
-    NormalizationTest {
-        source: "\u{2F74}",
-        nfc: "\u{2F74}",
-        nfd: "\u{2F74}",
-        nfkc: "\u{7ACB}",
-        nfkd: "\u{7ACB}",
-    },
-    NormalizationTest {
-        source: "\u{2F75}",
-        nfc: "\u{2F75}",
-        nfd: "\u{2F75}",
-        nfkc: "\u{7AF9}",
-        nfkd: "\u{7AF9}",
-    },
-    NormalizationTest {
-        source: "\u{2F76}",
-        nfc: "\u{2F76}",
-        nfd: "\u{2F76}",
-        nfkc: "\u{7C73}",
-        nfkd: "\u{7C73}",
-    },
-    NormalizationTest {
-        source: "\u{2F77}",
-        nfc: "\u{2F77}",
-        nfd: "\u{2F77}",
-        nfkc: "\u{7CF8}",
-        nfkd: "\u{7CF8}",
-    },
-    NormalizationTest {
-        source: "\u{2F78}",
-        nfc: "\u{2F78}",
-        nfd: "\u{2F78}",
-        nfkc: "\u{7F36}",
-        nfkd: "\u{7F36}",
-    },
-    NormalizationTest {
-        source: "\u{2F79}",
-        nfc: "\u{2F79}",
-        nfd: "\u{2F79}",
-        nfkc: "\u{7F51}",
-        nfkd: "\u{7F51}",
-    },
-    NormalizationTest {
-        source: "\u{2F7A}",
-        nfc: "\u{2F7A}",
-        nfd: "\u{2F7A}",
-        nfkc: "\u{7F8A}",
-        nfkd: "\u{7F8A}",
-    },
-    NormalizationTest {
-        source: "\u{2F7B}",
-        nfc: "\u{2F7B}",
-        nfd: "\u{2F7B}",
-        nfkc: "\u{7FBD}",
-        nfkd: "\u{7FBD}",
-    },
-    NormalizationTest {
-        source: "\u{2F7C}",
-        nfc: "\u{2F7C}",
-        nfd: "\u{2F7C}",
-        nfkc: "\u{8001}",
-        nfkd: "\u{8001}",
-    },
-    NormalizationTest {
-        source: "\u{2F7D}",
-        nfc: "\u{2F7D}",
-        nfd: "\u{2F7D}",
-        nfkc: "\u{800C}",
-        nfkd: "\u{800C}",
-    },
-    NormalizationTest {
-        source: "\u{2F7E}",
-        nfc: "\u{2F7E}",
-        nfd: "\u{2F7E}",
-        nfkc: "\u{8012}",
-        nfkd: "\u{8012}",
-    },
-    NormalizationTest {
-        source: "\u{2F7F}",
-        nfc: "\u{2F7F}",
-        nfd: "\u{2F7F}",
-        nfkc: "\u{8033}",
-        nfkd: "\u{8033}",
-    },
-    NormalizationTest {
-        source: "\u{2F80}",
-        nfc: "\u{2F80}",
-        nfd: "\u{2F80}",
-        nfkc: "\u{807F}",
-        nfkd: "\u{807F}",
-    },
-    NormalizationTest {
-        source: "\u{2F81}",
-        nfc: "\u{2F81}",
-        nfd: "\u{2F81}",
-        nfkc: "\u{8089}",
-        nfkd: "\u{8089}",
-    },
-    NormalizationTest {
-        source: "\u{2F82}",
-        nfc: "\u{2F82}",
-        nfd: "\u{2F82}",
-        nfkc: "\u{81E3}",
-        nfkd: "\u{81E3}",
-    },
-    NormalizationTest {
-        source: "\u{2F83}",
-        nfc: "\u{2F83}",
-        nfd: "\u{2F83}",
-        nfkc: "\u{81EA}",
-        nfkd: "\u{81EA}",
-    },
-    NormalizationTest {
-        source: "\u{2F84}",
-        nfc: "\u{2F84}",
-        nfd: "\u{2F84}",
-        nfkc: "\u{81F3}",
-        nfkd: "\u{81F3}",
-    },
-    NormalizationTest {
-        source: "\u{2F85}",
-        nfc: "\u{2F85}",
-        nfd: "\u{2F85}",
-        nfkc: "\u{81FC}",
-        nfkd: "\u{81FC}",
-    },
-    NormalizationTest {
-        source: "\u{2F86}",
-        nfc: "\u{2F86}",
-        nfd: "\u{2F86}",
-        nfkc: "\u{820C}",
-        nfkd: "\u{820C}",
-    },
-    NormalizationTest {
-        source: "\u{2F87}",
-        nfc: "\u{2F87}",
-        nfd: "\u{2F87}",
-        nfkc: "\u{821B}",
-        nfkd: "\u{821B}",
-    },
-    NormalizationTest {
-        source: "\u{2F88}",
-        nfc: "\u{2F88}",
-        nfd: "\u{2F88}",
-        nfkc: "\u{821F}",
-        nfkd: "\u{821F}",
-    },
-    NormalizationTest {
-        source: "\u{2F89}",
-        nfc: "\u{2F89}",
-        nfd: "\u{2F89}",
-        nfkc: "\u{826E}",
-        nfkd: "\u{826E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A}",
-        nfc: "\u{2F8A}",
-        nfd: "\u{2F8A}",
-        nfkc: "\u{8272}",
-        nfkd: "\u{8272}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B}",
-        nfc: "\u{2F8B}",
-        nfd: "\u{2F8B}",
-        nfkc: "\u{8278}",
-        nfkd: "\u{8278}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C}",
-        nfc: "\u{2F8C}",
-        nfd: "\u{2F8C}",
-        nfkc: "\u{864D}",
-        nfkd: "\u{864D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D}",
-        nfc: "\u{2F8D}",
-        nfd: "\u{2F8D}",
-        nfkc: "\u{866B}",
-        nfkd: "\u{866B}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E}",
-        nfc: "\u{2F8E}",
-        nfd: "\u{2F8E}",
-        nfkc: "\u{8840}",
-        nfkd: "\u{8840}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F}",
-        nfc: "\u{2F8F}",
-        nfd: "\u{2F8F}",
-        nfkc: "\u{884C}",
-        nfkd: "\u{884C}",
-    },
-    NormalizationTest {
-        source: "\u{2F90}",
-        nfc: "\u{2F90}",
-        nfd: "\u{2F90}",
-        nfkc: "\u{8863}",
-        nfkd: "\u{8863}",
-    },
-    NormalizationTest {
-        source: "\u{2F91}",
-        nfc: "\u{2F91}",
-        nfd: "\u{2F91}",
-        nfkc: "\u{897E}",
-        nfkd: "\u{897E}",
-    },
-    NormalizationTest {
-        source: "\u{2F92}",
-        nfc: "\u{2F92}",
-        nfd: "\u{2F92}",
-        nfkc: "\u{898B}",
-        nfkd: "\u{898B}",
-    },
-    NormalizationTest {
-        source: "\u{2F93}",
-        nfc: "\u{2F93}",
-        nfd: "\u{2F93}",
-        nfkc: "\u{89D2}",
-        nfkd: "\u{89D2}",
-    },
-    NormalizationTest {
-        source: "\u{2F94}",
-        nfc: "\u{2F94}",
-        nfd: "\u{2F94}",
-        nfkc: "\u{8A00}",
-        nfkd: "\u{8A00}",
-    },
-    NormalizationTest {
-        source: "\u{2F95}",
-        nfc: "\u{2F95}",
-        nfd: "\u{2F95}",
-        nfkc: "\u{8C37}",
-        nfkd: "\u{8C37}",
-    },
-    NormalizationTest {
-        source: "\u{2F96}",
-        nfc: "\u{2F96}",
-        nfd: "\u{2F96}",
-        nfkc: "\u{8C46}",
-        nfkd: "\u{8C46}",
-    },
-    NormalizationTest {
-        source: "\u{2F97}",
-        nfc: "\u{2F97}",
-        nfd: "\u{2F97}",
-        nfkc: "\u{8C55}",
-        nfkd: "\u{8C55}",
-    },
-    NormalizationTest {
-        source: "\u{2F98}",
-        nfc: "\u{2F98}",
-        nfd: "\u{2F98}",
-        nfkc: "\u{8C78}",
-        nfkd: "\u{8C78}",
-    },
-    NormalizationTest {
-        source: "\u{2F99}",
-        nfc: "\u{2F99}",
-        nfd: "\u{2F99}",
-        nfkc: "\u{8C9D}",
-        nfkd: "\u{8C9D}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A}",
-        nfc: "\u{2F9A}",
-        nfd: "\u{2F9A}",
-        nfkc: "\u{8D64}",
-        nfkd: "\u{8D64}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B}",
-        nfc: "\u{2F9B}",
-        nfd: "\u{2F9B}",
-        nfkc: "\u{8D70}",
-        nfkd: "\u{8D70}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C}",
-        nfc: "\u{2F9C}",
-        nfd: "\u{2F9C}",
-        nfkc: "\u{8DB3}",
-        nfkd: "\u{8DB3}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D}",
-        nfc: "\u{2F9D}",
-        nfd: "\u{2F9D}",
-        nfkc: "\u{8EAB}",
-        nfkd: "\u{8EAB}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E}",
-        nfc: "\u{2F9E}",
-        nfd: "\u{2F9E}",
-        nfkc: "\u{8ECA}",
-        nfkd: "\u{8ECA}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F}",
-        nfc: "\u{2F9F}",
-        nfd: "\u{2F9F}",
-        nfkc: "\u{8F9B}",
-        nfkd: "\u{8F9B}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0}",
-        nfc: "\u{2FA0}",
-        nfd: "\u{2FA0}",
-        nfkc: "\u{8FB0}",
-        nfkd: "\u{8FB0}",
-    },
-    NormalizationTest {
-        source: "\u{2FA1}",
-        nfc: "\u{2FA1}",
-        nfd: "\u{2FA1}",
-        nfkc: "\u{8FB5}",
-        nfkd: "\u{8FB5}",
-    },
-    NormalizationTest {
-        source: "\u{2FA2}",
-        nfc: "\u{2FA2}",
-        nfd: "\u{2FA2}",
-        nfkc: "\u{9091}",
-        nfkd: "\u{9091}",
-    },
-    NormalizationTest {
-        source: "\u{2FA3}",
-        nfc: "\u{2FA3}",
-        nfd: "\u{2FA3}",
-        nfkc: "\u{9149}",
-        nfkd: "\u{9149}",
-    },
-    NormalizationTest {
-        source: "\u{2FA4}",
-        nfc: "\u{2FA4}",
-        nfd: "\u{2FA4}",
-        nfkc: "\u{91C6}",
-        nfkd: "\u{91C6}",
-    },
-    NormalizationTest {
-        source: "\u{2FA5}",
-        nfc: "\u{2FA5}",
-        nfd: "\u{2FA5}",
-        nfkc: "\u{91CC}",
-        nfkd: "\u{91CC}",
-    },
-    NormalizationTest {
-        source: "\u{2FA6}",
-        nfc: "\u{2FA6}",
-        nfd: "\u{2FA6}",
-        nfkc: "\u{91D1}",
-        nfkd: "\u{91D1}",
-    },
-    NormalizationTest {
-        source: "\u{2FA7}",
-        nfc: "\u{2FA7}",
-        nfd: "\u{2FA7}",
-        nfkc: "\u{9577}",
-        nfkd: "\u{9577}",
-    },
-    NormalizationTest {
-        source: "\u{2FA8}",
-        nfc: "\u{2FA8}",
-        nfd: "\u{2FA8}",
-        nfkc: "\u{9580}",
-        nfkd: "\u{9580}",
-    },
-    NormalizationTest {
-        source: "\u{2FA9}",
-        nfc: "\u{2FA9}",
-        nfd: "\u{2FA9}",
-        nfkc: "\u{961C}",
-        nfkd: "\u{961C}",
-    },
-    NormalizationTest {
-        source: "\u{2FAA}",
-        nfc: "\u{2FAA}",
-        nfd: "\u{2FAA}",
-        nfkc: "\u{96B6}",
-        nfkd: "\u{96B6}",
-    },
-    NormalizationTest {
-        source: "\u{2FAB}",
-        nfc: "\u{2FAB}",
-        nfd: "\u{2FAB}",
-        nfkc: "\u{96B9}",
-        nfkd: "\u{96B9}",
-    },
-    NormalizationTest {
-        source: "\u{2FAC}",
-        nfc: "\u{2FAC}",
-        nfd: "\u{2FAC}",
-        nfkc: "\u{96E8}",
-        nfkd: "\u{96E8}",
-    },
-    NormalizationTest {
-        source: "\u{2FAD}",
-        nfc: "\u{2FAD}",
-        nfd: "\u{2FAD}",
-        nfkc: "\u{9751}",
-        nfkd: "\u{9751}",
-    },
-    NormalizationTest {
-        source: "\u{2FAE}",
-        nfc: "\u{2FAE}",
-        nfd: "\u{2FAE}",
-        nfkc: "\u{975E}",
-        nfkd: "\u{975E}",
-    },
-    NormalizationTest {
-        source: "\u{2FAF}",
-        nfc: "\u{2FAF}",
-        nfd: "\u{2FAF}",
-        nfkc: "\u{9762}",
-        nfkd: "\u{9762}",
-    },
-    NormalizationTest {
-        source: "\u{2FB0}",
-        nfc: "\u{2FB0}",
-        nfd: "\u{2FB0}",
-        nfkc: "\u{9769}",
-        nfkd: "\u{9769}",
-    },
-    NormalizationTest {
-        source: "\u{2FB1}",
-        nfc: "\u{2FB1}",
-        nfd: "\u{2FB1}",
-        nfkc: "\u{97CB}",
-        nfkd: "\u{97CB}",
-    },
-    NormalizationTest {
-        source: "\u{2FB2}",
-        nfc: "\u{2FB2}",
-        nfd: "\u{2FB2}",
-        nfkc: "\u{97ED}",
-        nfkd: "\u{97ED}",
-    },
-    NormalizationTest {
-        source: "\u{2FB3}",
-        nfc: "\u{2FB3}",
-        nfd: "\u{2FB3}",
-        nfkc: "\u{97F3}",
-        nfkd: "\u{97F3}",
-    },
-    NormalizationTest {
-        source: "\u{2FB4}",
-        nfc: "\u{2FB4}",
-        nfd: "\u{2FB4}",
-        nfkc: "\u{9801}",
-        nfkd: "\u{9801}",
-    },
-    NormalizationTest {
-        source: "\u{2FB5}",
-        nfc: "\u{2FB5}",
-        nfd: "\u{2FB5}",
-        nfkc: "\u{98A8}",
-        nfkd: "\u{98A8}",
-    },
-    NormalizationTest {
-        source: "\u{2FB6}",
-        nfc: "\u{2FB6}",
-        nfd: "\u{2FB6}",
-        nfkc: "\u{98DB}",
-        nfkd: "\u{98DB}",
-    },
-    NormalizationTest {
-        source: "\u{2FB7}",
-        nfc: "\u{2FB7}",
-        nfd: "\u{2FB7}",
-        nfkc: "\u{98DF}",
-        nfkd: "\u{98DF}",
-    },
-    NormalizationTest {
-        source: "\u{2FB8}",
-        nfc: "\u{2FB8}",
-        nfd: "\u{2FB8}",
-        nfkc: "\u{9996}",
-        nfkd: "\u{9996}",
-    },
-    NormalizationTest {
-        source: "\u{2FB9}",
-        nfc: "\u{2FB9}",
-        nfd: "\u{2FB9}",
-        nfkc: "\u{9999}",
-        nfkd: "\u{9999}",
-    },
-    NormalizationTest {
-        source: "\u{2FBA}",
-        nfc: "\u{2FBA}",
-        nfd: "\u{2FBA}",
-        nfkc: "\u{99AC}",
-        nfkd: "\u{99AC}",
-    },
-    NormalizationTest {
-        source: "\u{2FBB}",
-        nfc: "\u{2FBB}",
-        nfd: "\u{2FBB}",
-        nfkc: "\u{9AA8}",
-        nfkd: "\u{9AA8}",
-    },
-    NormalizationTest {
-        source: "\u{2FBC}",
-        nfc: "\u{2FBC}",
-        nfd: "\u{2FBC}",
-        nfkc: "\u{9AD8}",
-        nfkd: "\u{9AD8}",
-    },
-    NormalizationTest {
-        source: "\u{2FBD}",
-        nfc: "\u{2FBD}",
-        nfd: "\u{2FBD}",
-        nfkc: "\u{9ADF}",
-        nfkd: "\u{9ADF}",
-    },
-    NormalizationTest {
-        source: "\u{2FBE}",
-        nfc: "\u{2FBE}",
-        nfd: "\u{2FBE}",
-        nfkc: "\u{9B25}",
-        nfkd: "\u{9B25}",
-    },
-    NormalizationTest {
-        source: "\u{2FBF}",
-        nfc: "\u{2FBF}",
-        nfd: "\u{2FBF}",
-        nfkc: "\u{9B2F}",
-        nfkd: "\u{9B2F}",
-    },
-    NormalizationTest {
-        source: "\u{2FC0}",
-        nfc: "\u{2FC0}",
-        nfd: "\u{2FC0}",
-        nfkc: "\u{9B32}",
-        nfkd: "\u{9B32}",
-    },
-    NormalizationTest {
-        source: "\u{2FC1}",
-        nfc: "\u{2FC1}",
-        nfd: "\u{2FC1}",
-        nfkc: "\u{9B3C}",
-        nfkd: "\u{9B3C}",
-    },
-    NormalizationTest {
-        source: "\u{2FC2}",
-        nfc: "\u{2FC2}",
-        nfd: "\u{2FC2}",
-        nfkc: "\u{9B5A}",
-        nfkd: "\u{9B5A}",
-    },
-    NormalizationTest {
-        source: "\u{2FC3}",
-        nfc: "\u{2FC3}",
-        nfd: "\u{2FC3}",
-        nfkc: "\u{9CE5}",
-        nfkd: "\u{9CE5}",
-    },
-    NormalizationTest {
-        source: "\u{2FC4}",
-        nfc: "\u{2FC4}",
-        nfd: "\u{2FC4}",
-        nfkc: "\u{9E75}",
-        nfkd: "\u{9E75}",
-    },
-    NormalizationTest {
-        source: "\u{2FC5}",
-        nfc: "\u{2FC5}",
-        nfd: "\u{2FC5}",
-        nfkc: "\u{9E7F}",
-        nfkd: "\u{9E7F}",
-    },
-    NormalizationTest {
-        source: "\u{2FC6}",
-        nfc: "\u{2FC6}",
-        nfd: "\u{2FC6}",
-        nfkc: "\u{9EA5}",
-        nfkd: "\u{9EA5}",
-    },
-    NormalizationTest {
-        source: "\u{2FC7}",
-        nfc: "\u{2FC7}",
-        nfd: "\u{2FC7}",
-        nfkc: "\u{9EBB}",
-        nfkd: "\u{9EBB}",
-    },
-    NormalizationTest {
-        source: "\u{2FC8}",
-        nfc: "\u{2FC8}",
-        nfd: "\u{2FC8}",
-        nfkc: "\u{9EC3}",
-        nfkd: "\u{9EC3}",
-    },
-    NormalizationTest {
-        source: "\u{2FC9}",
-        nfc: "\u{2FC9}",
-        nfd: "\u{2FC9}",
-        nfkc: "\u{9ECD}",
-        nfkd: "\u{9ECD}",
-    },
-    NormalizationTest {
-        source: "\u{2FCA}",
-        nfc: "\u{2FCA}",
-        nfd: "\u{2FCA}",
-        nfkc: "\u{9ED1}",
-        nfkd: "\u{9ED1}",
-    },
-    NormalizationTest {
-        source: "\u{2FCB}",
-        nfc: "\u{2FCB}",
-        nfd: "\u{2FCB}",
-        nfkc: "\u{9EF9}",
-        nfkd: "\u{9EF9}",
-    },
-    NormalizationTest {
-        source: "\u{2FCC}",
-        nfc: "\u{2FCC}",
-        nfd: "\u{2FCC}",
-        nfkc: "\u{9EFD}",
-        nfkd: "\u{9EFD}",
-    },
-    NormalizationTest {
-        source: "\u{2FCD}",
-        nfc: "\u{2FCD}",
-        nfd: "\u{2FCD}",
-        nfkc: "\u{9F0E}",
-        nfkd: "\u{9F0E}",
-    },
-    NormalizationTest {
-        source: "\u{2FCE}",
-        nfc: "\u{2FCE}",
-        nfd: "\u{2FCE}",
-        nfkc: "\u{9F13}",
-        nfkd: "\u{9F13}",
-    },
-    NormalizationTest {
-        source: "\u{2FCF}",
-        nfc: "\u{2FCF}",
-        nfd: "\u{2FCF}",
-        nfkc: "\u{9F20}",
-        nfkd: "\u{9F20}",
-    },
-    NormalizationTest {
-        source: "\u{2FD0}",
-        nfc: "\u{2FD0}",
-        nfd: "\u{2FD0}",
-        nfkc: "\u{9F3B}",
-        nfkd: "\u{9F3B}",
-    },
-    NormalizationTest {
-        source: "\u{2FD1}",
-        nfc: "\u{2FD1}",
-        nfd: "\u{2FD1}",
-        nfkc: "\u{9F4A}",
-        nfkd: "\u{9F4A}",
-    },
-    NormalizationTest {
-        source: "\u{2FD2}",
-        nfc: "\u{2FD2}",
-        nfd: "\u{2FD2}",
-        nfkc: "\u{9F52}",
-        nfkd: "\u{9F52}",
-    },
-    NormalizationTest {
-        source: "\u{2FD3}",
-        nfc: "\u{2FD3}",
-        nfd: "\u{2FD3}",
-        nfkc: "\u{9F8D}",
-        nfkd: "\u{9F8D}",
-    },
-    NormalizationTest {
-        source: "\u{2FD4}",
-        nfc: "\u{2FD4}",
-        nfd: "\u{2FD4}",
-        nfkc: "\u{9F9C}",
-        nfkd: "\u{9F9C}",
-    },
-    NormalizationTest {
-        source: "\u{2FD5}",
-        nfc: "\u{2FD5}",
-        nfd: "\u{2FD5}",
-        nfkc: "\u{9FA0}",
-        nfkd: "\u{9FA0}",
-    },
-    NormalizationTest {
-        source: "\u{3000}",
-        nfc: "\u{3000}",
-        nfd: "\u{3000}",
-        nfkc: "\u{0020}",
-        nfkd: "\u{0020}",
-    },
-    NormalizationTest {
-        source: "\u{3036}",
-        nfc: "\u{3036}",
-        nfd: "\u{3036}",
-        nfkc: "\u{3012}",
-        nfkd: "\u{3012}",
-    },
-    NormalizationTest {
-        source: "\u{3038}",
-        nfc: "\u{3038}",
-        nfd: "\u{3038}",
-        nfkc: "\u{5341}",
-        nfkd: "\u{5341}",
-    },
-    NormalizationTest {
-        source: "\u{3039}",
-        nfc: "\u{3039}",
-        nfd: "\u{3039}",
-        nfkc: "\u{5344}",
-        nfkd: "\u{5344}",
-    },
-    NormalizationTest {
-        source: "\u{303A}",
-        nfc: "\u{303A}",
-        nfd: "\u{303A}",
-        nfkc: "\u{5345}",
-        nfkd: "\u{5345}",
-    },
-    NormalizationTest {
-        source: "\u{304C}",
-        nfc: "\u{304C}",
-        nfd: "\u{304B}\u{3099}",
-        nfkc: "\u{304C}",
-        nfkd: "\u{304B}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{304E}",
-        nfc: "\u{304E}",
-        nfd: "\u{304D}\u{3099}",
-        nfkc: "\u{304E}",
-        nfkd: "\u{304D}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3050}",
-        nfc: "\u{3050}",
-        nfd: "\u{304F}\u{3099}",
-        nfkc: "\u{3050}",
-        nfkd: "\u{304F}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3052}",
-        nfc: "\u{3052}",
-        nfd: "\u{3051}\u{3099}",
-        nfkc: "\u{3052}",
-        nfkd: "\u{3051}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3054}",
-        nfc: "\u{3054}",
-        nfd: "\u{3053}\u{3099}",
-        nfkc: "\u{3054}",
-        nfkd: "\u{3053}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3056}",
-        nfc: "\u{3056}",
-        nfd: "\u{3055}\u{3099}",
-        nfkc: "\u{3056}",
-        nfkd: "\u{3055}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3058}",
-        nfc: "\u{3058}",
-        nfd: "\u{3057}\u{3099}",
-        nfkc: "\u{3058}",
-        nfkd: "\u{3057}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{305A}",
-        nfc: "\u{305A}",
-        nfd: "\u{3059}\u{3099}",
-        nfkc: "\u{305A}",
-        nfkd: "\u{3059}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{305C}",
-        nfc: "\u{305C}",
-        nfd: "\u{305B}\u{3099}",
-        nfkc: "\u{305C}",
-        nfkd: "\u{305B}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{305E}",
-        nfc: "\u{305E}",
-        nfd: "\u{305D}\u{3099}",
-        nfkc: "\u{305E}",
-        nfkd: "\u{305D}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3060}",
-        nfc: "\u{3060}",
-        nfd: "\u{305F}\u{3099}",
-        nfkc: "\u{3060}",
-        nfkd: "\u{305F}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3062}",
-        nfc: "\u{3062}",
-        nfd: "\u{3061}\u{3099}",
-        nfkc: "\u{3062}",
-        nfkd: "\u{3061}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3065}",
-        nfc: "\u{3065}",
-        nfd: "\u{3064}\u{3099}",
-        nfkc: "\u{3065}",
-        nfkd: "\u{3064}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3067}",
-        nfc: "\u{3067}",
-        nfd: "\u{3066}\u{3099}",
-        nfkc: "\u{3067}",
-        nfkd: "\u{3066}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3069}",
-        nfc: "\u{3069}",
-        nfd: "\u{3068}\u{3099}",
-        nfkc: "\u{3069}",
-        nfkd: "\u{3068}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3070}",
-        nfc: "\u{3070}",
-        nfd: "\u{306F}\u{3099}",
-        nfkc: "\u{3070}",
-        nfkd: "\u{306F}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3071}",
-        nfc: "\u{3071}",
-        nfd: "\u{306F}\u{309A}",
-        nfkc: "\u{3071}",
-        nfkd: "\u{306F}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{3073}",
-        nfc: "\u{3073}",
-        nfd: "\u{3072}\u{3099}",
-        nfkc: "\u{3073}",
-        nfkd: "\u{3072}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3074}",
-        nfc: "\u{3074}",
-        nfd: "\u{3072}\u{309A}",
-        nfkc: "\u{3074}",
-        nfkd: "\u{3072}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{3076}",
-        nfc: "\u{3076}",
-        nfd: "\u{3075}\u{3099}",
-        nfkc: "\u{3076}",
-        nfkd: "\u{3075}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3077}",
-        nfc: "\u{3077}",
-        nfd: "\u{3075}\u{309A}",
-        nfkc: "\u{3077}",
-        nfkd: "\u{3075}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{3079}",
-        nfc: "\u{3079}",
-        nfd: "\u{3078}\u{3099}",
-        nfkc: "\u{3079}",
-        nfkd: "\u{3078}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{307A}",
-        nfc: "\u{307A}",
-        nfd: "\u{3078}\u{309A}",
-        nfkc: "\u{307A}",
-        nfkd: "\u{3078}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{307C}",
-        nfc: "\u{307C}",
-        nfd: "\u{307B}\u{3099}",
-        nfkc: "\u{307C}",
-        nfkd: "\u{307B}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{307D}",
-        nfc: "\u{307D}",
-        nfd: "\u{307B}\u{309A}",
-        nfkc: "\u{307D}",
-        nfkd: "\u{307B}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{3094}",
-        nfc: "\u{3094}",
-        nfd: "\u{3046}\u{3099}",
-        nfkc: "\u{3094}",
-        nfkd: "\u{3046}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{309B}",
-        nfc: "\u{309B}",
-        nfd: "\u{309B}",
-        nfkc: "\u{0020}\u{3099}",
-        nfkd: "\u{0020}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{309C}",
-        nfc: "\u{309C}",
-        nfd: "\u{309C}",
-        nfkc: "\u{0020}\u{309A}",
-        nfkd: "\u{0020}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{309E}",
-        nfc: "\u{309E}",
-        nfd: "\u{309D}\u{3099}",
-        nfkc: "\u{309E}",
-        nfkd: "\u{309D}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{309F}",
-        nfc: "\u{309F}",
-        nfd: "\u{309F}",
-        nfkc: "\u{3088}\u{308A}",
-        nfkd: "\u{3088}\u{308A}",
-    },
-    NormalizationTest {
-        source: "\u{30AC}",
-        nfc: "\u{30AC}",
-        nfd: "\u{30AB}\u{3099}",
-        nfkc: "\u{30AC}",
-        nfkd: "\u{30AB}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30AE}",
-        nfc: "\u{30AE}",
-        nfd: "\u{30AD}\u{3099}",
-        nfkc: "\u{30AE}",
-        nfkd: "\u{30AD}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30B0}",
-        nfc: "\u{30B0}",
-        nfd: "\u{30AF}\u{3099}",
-        nfkc: "\u{30B0}",
-        nfkd: "\u{30AF}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30B2}",
-        nfc: "\u{30B2}",
-        nfd: "\u{30B1}\u{3099}",
-        nfkc: "\u{30B2}",
-        nfkd: "\u{30B1}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30B4}",
-        nfc: "\u{30B4}",
-        nfd: "\u{30B3}\u{3099}",
-        nfkc: "\u{30B4}",
-        nfkd: "\u{30B3}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30B6}",
-        nfc: "\u{30B6}",
-        nfd: "\u{30B5}\u{3099}",
-        nfkc: "\u{30B6}",
-        nfkd: "\u{30B5}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30B8}",
-        nfc: "\u{30B8}",
-        nfd: "\u{30B7}\u{3099}",
-        nfkc: "\u{30B8}",
-        nfkd: "\u{30B7}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30BA}",
-        nfc: "\u{30BA}",
-        nfd: "\u{30B9}\u{3099}",
-        nfkc: "\u{30BA}",
-        nfkd: "\u{30B9}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30BC}",
-        nfc: "\u{30BC}",
-        nfd: "\u{30BB}\u{3099}",
-        nfkc: "\u{30BC}",
-        nfkd: "\u{30BB}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30BE}",
-        nfc: "\u{30BE}",
-        nfd: "\u{30BD}\u{3099}",
-        nfkc: "\u{30BE}",
-        nfkd: "\u{30BD}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30C0}",
-        nfc: "\u{30C0}",
-        nfd: "\u{30BF}\u{3099}",
-        nfkc: "\u{30C0}",
-        nfkd: "\u{30BF}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30C2}",
-        nfc: "\u{30C2}",
-        nfd: "\u{30C1}\u{3099}",
-        nfkc: "\u{30C2}",
-        nfkd: "\u{30C1}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30C5}",
-        nfc: "\u{30C5}",
-        nfd: "\u{30C4}\u{3099}",
-        nfkc: "\u{30C5}",
-        nfkd: "\u{30C4}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30C7}",
-        nfc: "\u{30C7}",
-        nfd: "\u{30C6}\u{3099}",
-        nfkc: "\u{30C7}",
-        nfkd: "\u{30C6}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30C9}",
-        nfc: "\u{30C9}",
-        nfd: "\u{30C8}\u{3099}",
-        nfkc: "\u{30C9}",
-        nfkd: "\u{30C8}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30D0}",
-        nfc: "\u{30D0}",
-        nfd: "\u{30CF}\u{3099}",
-        nfkc: "\u{30D0}",
-        nfkd: "\u{30CF}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30D1}",
-        nfc: "\u{30D1}",
-        nfd: "\u{30CF}\u{309A}",
-        nfkc: "\u{30D1}",
-        nfkd: "\u{30CF}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{30D3}",
-        nfc: "\u{30D3}",
-        nfd: "\u{30D2}\u{3099}",
-        nfkc: "\u{30D3}",
-        nfkd: "\u{30D2}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30D4}",
-        nfc: "\u{30D4}",
-        nfd: "\u{30D2}\u{309A}",
-        nfkc: "\u{30D4}",
-        nfkd: "\u{30D2}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{30D6}",
-        nfc: "\u{30D6}",
-        nfd: "\u{30D5}\u{3099}",
-        nfkc: "\u{30D6}",
-        nfkd: "\u{30D5}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30D7}",
-        nfc: "\u{30D7}",
-        nfd: "\u{30D5}\u{309A}",
-        nfkc: "\u{30D7}",
-        nfkd: "\u{30D5}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{30D9}",
-        nfc: "\u{30D9}",
-        nfd: "\u{30D8}\u{3099}",
-        nfkc: "\u{30D9}",
-        nfkd: "\u{30D8}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30DA}",
-        nfc: "\u{30DA}",
-        nfd: "\u{30D8}\u{309A}",
-        nfkc: "\u{30DA}",
-        nfkd: "\u{30D8}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{30DC}",
-        nfc: "\u{30DC}",
-        nfd: "\u{30DB}\u{3099}",
-        nfkc: "\u{30DC}",
-        nfkd: "\u{30DB}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30DD}",
-        nfc: "\u{30DD}",
-        nfd: "\u{30DB}\u{309A}",
-        nfkc: "\u{30DD}",
-        nfkd: "\u{30DB}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{30F4}",
-        nfc: "\u{30F4}",
-        nfd: "\u{30A6}\u{3099}",
-        nfkc: "\u{30F4}",
-        nfkd: "\u{30A6}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30F7}",
-        nfc: "\u{30F7}",
-        nfd: "\u{30EF}\u{3099}",
-        nfkc: "\u{30F7}",
-        nfkd: "\u{30EF}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30F8}",
-        nfc: "\u{30F8}",
-        nfd: "\u{30F0}\u{3099}",
-        nfkc: "\u{30F8}",
-        nfkd: "\u{30F0}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30F9}",
-        nfc: "\u{30F9}",
-        nfd: "\u{30F1}\u{3099}",
-        nfkc: "\u{30F9}",
-        nfkd: "\u{30F1}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30FA}",
-        nfc: "\u{30FA}",
-        nfd: "\u{30F2}\u{3099}",
-        nfkc: "\u{30FA}",
-        nfkd: "\u{30F2}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30FE}",
-        nfc: "\u{30FE}",
-        nfd: "\u{30FD}\u{3099}",
-        nfkc: "\u{30FE}",
-        nfkd: "\u{30FD}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{30FF}",
-        nfc: "\u{30FF}",
-        nfd: "\u{30FF}",
-        nfkc: "\u{30B3}\u{30C8}",
-        nfkd: "\u{30B3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{3131}",
-        nfc: "\u{3131}",
-        nfd: "\u{3131}",
-        nfkc: "\u{1100}",
-        nfkd: "\u{1100}",
-    },
-    NormalizationTest {
-        source: "\u{3132}",
-        nfc: "\u{3132}",
-        nfd: "\u{3132}",
-        nfkc: "\u{1101}",
-        nfkd: "\u{1101}",
-    },
-    NormalizationTest {
-        source: "\u{3133}",
-        nfc: "\u{3133}",
-        nfd: "\u{3133}",
-        nfkc: "\u{11AA}",
-        nfkd: "\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{3134}",
-        nfc: "\u{3134}",
-        nfd: "\u{3134}",
-        nfkc: "\u{1102}",
-        nfkd: "\u{1102}",
-    },
-    NormalizationTest {
-        source: "\u{3135}",
-        nfc: "\u{3135}",
-        nfd: "\u{3135}",
-        nfkc: "\u{11AC}",
-        nfkd: "\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{3136}",
-        nfc: "\u{3136}",
-        nfd: "\u{3136}",
-        nfkc: "\u{11AD}",
-        nfkd: "\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{3137}",
-        nfc: "\u{3137}",
-        nfd: "\u{3137}",
-        nfkc: "\u{1103}",
-        nfkd: "\u{1103}",
-    },
-    NormalizationTest {
-        source: "\u{3138}",
-        nfc: "\u{3138}",
-        nfd: "\u{3138}",
-        nfkc: "\u{1104}",
-        nfkd: "\u{1104}",
-    },
-    NormalizationTest {
-        source: "\u{3139}",
-        nfc: "\u{3139}",
-        nfd: "\u{3139}",
-        nfkc: "\u{1105}",
-        nfkd: "\u{1105}",
-    },
-    NormalizationTest {
-        source: "\u{313A}",
-        nfc: "\u{313A}",
-        nfd: "\u{313A}",
-        nfkc: "\u{11B0}",
-        nfkd: "\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{313B}",
-        nfc: "\u{313B}",
-        nfd: "\u{313B}",
-        nfkc: "\u{11B1}",
-        nfkd: "\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{313C}",
-        nfc: "\u{313C}",
-        nfd: "\u{313C}",
-        nfkc: "\u{11B2}",
-        nfkd: "\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{313D}",
-        nfc: "\u{313D}",
-        nfd: "\u{313D}",
-        nfkc: "\u{11B3}",
-        nfkd: "\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{313E}",
-        nfc: "\u{313E}",
-        nfd: "\u{313E}",
-        nfkc: "\u{11B4}",
-        nfkd: "\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{313F}",
-        nfc: "\u{313F}",
-        nfd: "\u{313F}",
-        nfkc: "\u{11B5}",
-        nfkd: "\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{3140}",
-        nfc: "\u{3140}",
-        nfd: "\u{3140}",
-        nfkc: "\u{111A}",
-        nfkd: "\u{111A}",
-    },
-    NormalizationTest {
-        source: "\u{3141}",
-        nfc: "\u{3141}",
-        nfd: "\u{3141}",
-        nfkc: "\u{1106}",
-        nfkd: "\u{1106}",
-    },
-    NormalizationTest {
-        source: "\u{3142}",
-        nfc: "\u{3142}",
-        nfd: "\u{3142}",
-        nfkc: "\u{1107}",
-        nfkd: "\u{1107}",
-    },
-    NormalizationTest {
-        source: "\u{3143}",
-        nfc: "\u{3143}",
-        nfd: "\u{3143}",
-        nfkc: "\u{1108}",
-        nfkd: "\u{1108}",
-    },
-    NormalizationTest {
-        source: "\u{3144}",
-        nfc: "\u{3144}",
-        nfd: "\u{3144}",
-        nfkc: "\u{1121}",
-        nfkd: "\u{1121}",
-    },
-    NormalizationTest {
-        source: "\u{3145}",
-        nfc: "\u{3145}",
-        nfd: "\u{3145}",
-        nfkc: "\u{1109}",
-        nfkd: "\u{1109}",
-    },
-    NormalizationTest {
-        source: "\u{3146}",
-        nfc: "\u{3146}",
-        nfd: "\u{3146}",
-        nfkc: "\u{110A}",
-        nfkd: "\u{110A}",
-    },
-    NormalizationTest {
-        source: "\u{3147}",
-        nfc: "\u{3147}",
-        nfd: "\u{3147}",
-        nfkc: "\u{110B}",
-        nfkd: "\u{110B}",
-    },
-    NormalizationTest {
-        source: "\u{3148}",
-        nfc: "\u{3148}",
-        nfd: "\u{3148}",
-        nfkc: "\u{110C}",
-        nfkd: "\u{110C}",
-    },
-    NormalizationTest {
-        source: "\u{3149}",
-        nfc: "\u{3149}",
-        nfd: "\u{3149}",
-        nfkc: "\u{110D}",
-        nfkd: "\u{110D}",
-    },
-    NormalizationTest {
-        source: "\u{314A}",
-        nfc: "\u{314A}",
-        nfd: "\u{314A}",
-        nfkc: "\u{110E}",
-        nfkd: "\u{110E}",
-    },
-    NormalizationTest {
-        source: "\u{314B}",
-        nfc: "\u{314B}",
-        nfd: "\u{314B}",
-        nfkc: "\u{110F}",
-        nfkd: "\u{110F}",
-    },
-    NormalizationTest {
-        source: "\u{314C}",
-        nfc: "\u{314C}",
-        nfd: "\u{314C}",
-        nfkc: "\u{1110}",
-        nfkd: "\u{1110}",
-    },
-    NormalizationTest {
-        source: "\u{314D}",
-        nfc: "\u{314D}",
-        nfd: "\u{314D}",
-        nfkc: "\u{1111}",
-        nfkd: "\u{1111}",
-    },
-    NormalizationTest {
-        source: "\u{314E}",
-        nfc: "\u{314E}",
-        nfd: "\u{314E}",
-        nfkc: "\u{1112}",
-        nfkd: "\u{1112}",
-    },
-    NormalizationTest {
-        source: "\u{314F}",
-        nfc: "\u{314F}",
-        nfd: "\u{314F}",
-        nfkc: "\u{1161}",
-        nfkd: "\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3150}",
-        nfc: "\u{3150}",
-        nfd: "\u{3150}",
-        nfkc: "\u{1162}",
-        nfkd: "\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{3151}",
-        nfc: "\u{3151}",
-        nfd: "\u{3151}",
-        nfkc: "\u{1163}",
-        nfkd: "\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{3152}",
-        nfc: "\u{3152}",
-        nfd: "\u{3152}",
-        nfkc: "\u{1164}",
-        nfkd: "\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{3153}",
-        nfc: "\u{3153}",
-        nfd: "\u{3153}",
-        nfkc: "\u{1165}",
-        nfkd: "\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{3154}",
-        nfc: "\u{3154}",
-        nfd: "\u{3154}",
-        nfkc: "\u{1166}",
-        nfkd: "\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{3155}",
-        nfc: "\u{3155}",
-        nfd: "\u{3155}",
-        nfkc: "\u{1167}",
-        nfkd: "\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{3156}",
-        nfc: "\u{3156}",
-        nfd: "\u{3156}",
-        nfkc: "\u{1168}",
-        nfkd: "\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{3157}",
-        nfc: "\u{3157}",
-        nfd: "\u{3157}",
-        nfkc: "\u{1169}",
-        nfkd: "\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{3158}",
-        nfc: "\u{3158}",
-        nfd: "\u{3158}",
-        nfkc: "\u{116A}",
-        nfkd: "\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{3159}",
-        nfc: "\u{3159}",
-        nfd: "\u{3159}",
-        nfkc: "\u{116B}",
-        nfkd: "\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{315A}",
-        nfc: "\u{315A}",
-        nfd: "\u{315A}",
-        nfkc: "\u{116C}",
-        nfkd: "\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{315B}",
-        nfc: "\u{315B}",
-        nfd: "\u{315B}",
-        nfkc: "\u{116D}",
-        nfkd: "\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{315C}",
-        nfc: "\u{315C}",
-        nfd: "\u{315C}",
-        nfkc: "\u{116E}",
-        nfkd: "\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{315D}",
-        nfc: "\u{315D}",
-        nfd: "\u{315D}",
-        nfkc: "\u{116F}",
-        nfkd: "\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{315E}",
-        nfc: "\u{315E}",
-        nfd: "\u{315E}",
-        nfkc: "\u{1170}",
-        nfkd: "\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{315F}",
-        nfc: "\u{315F}",
-        nfd: "\u{315F}",
-        nfkc: "\u{1171}",
-        nfkd: "\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{3160}",
-        nfc: "\u{3160}",
-        nfd: "\u{3160}",
-        nfkc: "\u{1172}",
-        nfkd: "\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{3161}",
-        nfc: "\u{3161}",
-        nfd: "\u{3161}",
-        nfkc: "\u{1173}",
-        nfkd: "\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{3162}",
-        nfc: "\u{3162}",
-        nfd: "\u{3162}",
-        nfkc: "\u{1174}",
-        nfkd: "\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{3163}",
-        nfc: "\u{3163}",
-        nfd: "\u{3163}",
-        nfkc: "\u{1175}",
-        nfkd: "\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{3164}",
-        nfc: "\u{3164}",
-        nfd: "\u{3164}",
-        nfkc: "\u{1160}",
-        nfkd: "\u{1160}",
-    },
-    NormalizationTest {
-        source: "\u{3165}",
-        nfc: "\u{3165}",
-        nfd: "\u{3165}",
-        nfkc: "\u{1114}",
-        nfkd: "\u{1114}",
-    },
-    NormalizationTest {
-        source: "\u{3166}",
-        nfc: "\u{3166}",
-        nfd: "\u{3166}",
-        nfkc: "\u{1115}",
-        nfkd: "\u{1115}",
-    },
-    NormalizationTest {
-        source: "\u{3167}",
-        nfc: "\u{3167}",
-        nfd: "\u{3167}",
-        nfkc: "\u{11C7}",
-        nfkd: "\u{11C7}",
-    },
-    NormalizationTest {
-        source: "\u{3168}",
-        nfc: "\u{3168}",
-        nfd: "\u{3168}",
-        nfkc: "\u{11C8}",
-        nfkd: "\u{11C8}",
-    },
-    NormalizationTest {
-        source: "\u{3169}",
-        nfc: "\u{3169}",
-        nfd: "\u{3169}",
-        nfkc: "\u{11CC}",
-        nfkd: "\u{11CC}",
-    },
-    NormalizationTest {
-        source: "\u{316A}",
-        nfc: "\u{316A}",
-        nfd: "\u{316A}",
-        nfkc: "\u{11CE}",
-        nfkd: "\u{11CE}",
-    },
-    NormalizationTest {
-        source: "\u{316B}",
-        nfc: "\u{316B}",
-        nfd: "\u{316B}",
-        nfkc: "\u{11D3}",
-        nfkd: "\u{11D3}",
-    },
-    NormalizationTest {
-        source: "\u{316C}",
-        nfc: "\u{316C}",
-        nfd: "\u{316C}",
-        nfkc: "\u{11D7}",
-        nfkd: "\u{11D7}",
-    },
-    NormalizationTest {
-        source: "\u{316D}",
-        nfc: "\u{316D}",
-        nfd: "\u{316D}",
-        nfkc: "\u{11D9}",
-        nfkd: "\u{11D9}",
-    },
-    NormalizationTest {
-        source: "\u{316E}",
-        nfc: "\u{316E}",
-        nfd: "\u{316E}",
-        nfkc: "\u{111C}",
-        nfkd: "\u{111C}",
-    },
-    NormalizationTest {
-        source: "\u{316F}",
-        nfc: "\u{316F}",
-        nfd: "\u{316F}",
-        nfkc: "\u{11DD}",
-        nfkd: "\u{11DD}",
-    },
-    NormalizationTest {
-        source: "\u{3170}",
-        nfc: "\u{3170}",
-        nfd: "\u{3170}",
-        nfkc: "\u{11DF}",
-        nfkd: "\u{11DF}",
-    },
-    NormalizationTest {
-        source: "\u{3171}",
-        nfc: "\u{3171}",
-        nfd: "\u{3171}",
-        nfkc: "\u{111D}",
-        nfkd: "\u{111D}",
-    },
-    NormalizationTest {
-        source: "\u{3172}",
-        nfc: "\u{3172}",
-        nfd: "\u{3172}",
-        nfkc: "\u{111E}",
-        nfkd: "\u{111E}",
-    },
-    NormalizationTest {
-        source: "\u{3173}",
-        nfc: "\u{3173}",
-        nfd: "\u{3173}",
-        nfkc: "\u{1120}",
-        nfkd: "\u{1120}",
-    },
-    NormalizationTest {
-        source: "\u{3174}",
-        nfc: "\u{3174}",
-        nfd: "\u{3174}",
-        nfkc: "\u{1122}",
-        nfkd: "\u{1122}",
-    },
-    NormalizationTest {
-        source: "\u{3175}",
-        nfc: "\u{3175}",
-        nfd: "\u{3175}",
-        nfkc: "\u{1123}",
-        nfkd: "\u{1123}",
-    },
-    NormalizationTest {
-        source: "\u{3176}",
-        nfc: "\u{3176}",
-        nfd: "\u{3176}",
-        nfkc: "\u{1127}",
-        nfkd: "\u{1127}",
-    },
-    NormalizationTest {
-        source: "\u{3177}",
-        nfc: "\u{3177}",
-        nfd: "\u{3177}",
-        nfkc: "\u{1129}",
-        nfkd: "\u{1129}",
-    },
-    NormalizationTest {
-        source: "\u{3178}",
-        nfc: "\u{3178}",
-        nfd: "\u{3178}",
-        nfkc: "\u{112B}",
-        nfkd: "\u{112B}",
-    },
-    NormalizationTest {
-        source: "\u{3179}",
-        nfc: "\u{3179}",
-        nfd: "\u{3179}",
-        nfkc: "\u{112C}",
-        nfkd: "\u{112C}",
-    },
-    NormalizationTest {
-        source: "\u{317A}",
-        nfc: "\u{317A}",
-        nfd: "\u{317A}",
-        nfkc: "\u{112D}",
-        nfkd: "\u{112D}",
-    },
-    NormalizationTest {
-        source: "\u{317B}",
-        nfc: "\u{317B}",
-        nfd: "\u{317B}",
-        nfkc: "\u{112E}",
-        nfkd: "\u{112E}",
-    },
-    NormalizationTest {
-        source: "\u{317C}",
-        nfc: "\u{317C}",
-        nfd: "\u{317C}",
-        nfkc: "\u{112F}",
-        nfkd: "\u{112F}",
-    },
-    NormalizationTest {
-        source: "\u{317D}",
-        nfc: "\u{317D}",
-        nfd: "\u{317D}",
-        nfkc: "\u{1132}",
-        nfkd: "\u{1132}",
-    },
-    NormalizationTest {
-        source: "\u{317E}",
-        nfc: "\u{317E}",
-        nfd: "\u{317E}",
-        nfkc: "\u{1136}",
-        nfkd: "\u{1136}",
-    },
-    NormalizationTest {
-        source: "\u{317F}",
-        nfc: "\u{317F}",
-        nfd: "\u{317F}",
-        nfkc: "\u{1140}",
-        nfkd: "\u{1140}",
-    },
-    NormalizationTest {
-        source: "\u{3180}",
-        nfc: "\u{3180}",
-        nfd: "\u{3180}",
-        nfkc: "\u{1147}",
-        nfkd: "\u{1147}",
-    },
-    NormalizationTest {
-        source: "\u{3181}",
-        nfc: "\u{3181}",
-        nfd: "\u{3181}",
-        nfkc: "\u{114C}",
-        nfkd: "\u{114C}",
-    },
-    NormalizationTest {
-        source: "\u{3182}",
-        nfc: "\u{3182}",
-        nfd: "\u{3182}",
-        nfkc: "\u{11F1}",
-        nfkd: "\u{11F1}",
-    },
-    NormalizationTest {
-        source: "\u{3183}",
-        nfc: "\u{3183}",
-        nfd: "\u{3183}",
-        nfkc: "\u{11F2}",
-        nfkd: "\u{11F2}",
-    },
-    NormalizationTest {
-        source: "\u{3184}",
-        nfc: "\u{3184}",
-        nfd: "\u{3184}",
-        nfkc: "\u{1157}",
-        nfkd: "\u{1157}",
-    },
-    NormalizationTest {
-        source: "\u{3185}",
-        nfc: "\u{3185}",
-        nfd: "\u{3185}",
-        nfkc: "\u{1158}",
-        nfkd: "\u{1158}",
-    },
-    NormalizationTest {
-        source: "\u{3186}",
-        nfc: "\u{3186}",
-        nfd: "\u{3186}",
-        nfkc: "\u{1159}",
-        nfkd: "\u{1159}",
-    },
-    NormalizationTest {
-        source: "\u{3187}",
-        nfc: "\u{3187}",
-        nfd: "\u{3187}",
-        nfkc: "\u{1184}",
-        nfkd: "\u{1184}",
-    },
-    NormalizationTest {
-        source: "\u{3188}",
-        nfc: "\u{3188}",
-        nfd: "\u{3188}",
-        nfkc: "\u{1185}",
-        nfkd: "\u{1185}",
-    },
-    NormalizationTest {
-        source: "\u{3189}",
-        nfc: "\u{3189}",
-        nfd: "\u{3189}",
-        nfkc: "\u{1188}",
-        nfkd: "\u{1188}",
-    },
-    NormalizationTest {
-        source: "\u{318A}",
-        nfc: "\u{318A}",
-        nfd: "\u{318A}",
-        nfkc: "\u{1191}",
-        nfkd: "\u{1191}",
-    },
-    NormalizationTest {
-        source: "\u{318B}",
-        nfc: "\u{318B}",
-        nfd: "\u{318B}",
-        nfkc: "\u{1192}",
-        nfkd: "\u{1192}",
-    },
-    NormalizationTest {
-        source: "\u{318C}",
-        nfc: "\u{318C}",
-        nfd: "\u{318C}",
-        nfkc: "\u{1194}",
-        nfkd: "\u{1194}",
-    },
-    NormalizationTest {
-        source: "\u{318D}",
-        nfc: "\u{318D}",
-        nfd: "\u{318D}",
-        nfkc: "\u{119E}",
-        nfkd: "\u{119E}",
-    },
-    NormalizationTest {
-        source: "\u{318E}",
-        nfc: "\u{318E}",
-        nfd: "\u{318E}",
-        nfkc: "\u{11A1}",
-        nfkd: "\u{11A1}",
-    },
-    NormalizationTest {
-        source: "\u{3192}",
-        nfc: "\u{3192}",
-        nfd: "\u{3192}",
-        nfkc: "\u{4E00}",
-        nfkd: "\u{4E00}",
-    },
-    NormalizationTest {
-        source: "\u{3193}",
-        nfc: "\u{3193}",
-        nfd: "\u{3193}",
-        nfkc: "\u{4E8C}",
-        nfkd: "\u{4E8C}",
-    },
-    NormalizationTest {
-        source: "\u{3194}",
-        nfc: "\u{3194}",
-        nfd: "\u{3194}",
-        nfkc: "\u{4E09}",
-        nfkd: "\u{4E09}",
-    },
-    NormalizationTest {
-        source: "\u{3195}",
-        nfc: "\u{3195}",
-        nfd: "\u{3195}",
-        nfkc: "\u{56DB}",
-        nfkd: "\u{56DB}",
-    },
-    NormalizationTest {
-        source: "\u{3196}",
-        nfc: "\u{3196}",
-        nfd: "\u{3196}",
-        nfkc: "\u{4E0A}",
-        nfkd: "\u{4E0A}",
-    },
-    NormalizationTest {
-        source: "\u{3197}",
-        nfc: "\u{3197}",
-        nfd: "\u{3197}",
-        nfkc: "\u{4E2D}",
-        nfkd: "\u{4E2D}",
-    },
-    NormalizationTest {
-        source: "\u{3198}",
-        nfc: "\u{3198}",
-        nfd: "\u{3198}",
-        nfkc: "\u{4E0B}",
-        nfkd: "\u{4E0B}",
-    },
-    NormalizationTest {
-        source: "\u{3199}",
-        nfc: "\u{3199}",
-        nfd: "\u{3199}",
-        nfkc: "\u{7532}",
-        nfkd: "\u{7532}",
-    },
-    NormalizationTest {
-        source: "\u{319A}",
-        nfc: "\u{319A}",
-        nfd: "\u{319A}",
-        nfkc: "\u{4E59}",
-        nfkd: "\u{4E59}",
-    },
-    NormalizationTest {
-        source: "\u{319B}",
-        nfc: "\u{319B}",
-        nfd: "\u{319B}",
-        nfkc: "\u{4E19}",
-        nfkd: "\u{4E19}",
-    },
-    NormalizationTest {
-        source: "\u{319C}",
-        nfc: "\u{319C}",
-        nfd: "\u{319C}",
-        nfkc: "\u{4E01}",
-        nfkd: "\u{4E01}",
-    },
-    NormalizationTest {
-        source: "\u{319D}",
-        nfc: "\u{319D}",
-        nfd: "\u{319D}",
-        nfkc: "\u{5929}",
-        nfkd: "\u{5929}",
-    },
-    NormalizationTest {
-        source: "\u{319E}",
-        nfc: "\u{319E}",
-        nfd: "\u{319E}",
-        nfkc: "\u{5730}",
-        nfkd: "\u{5730}",
-    },
-    NormalizationTest {
-        source: "\u{319F}",
-        nfc: "\u{319F}",
-        nfd: "\u{319F}",
-        nfkc: "\u{4EBA}",
-        nfkd: "\u{4EBA}",
-    },
-    NormalizationTest {
-        source: "\u{3200}",
-        nfc: "\u{3200}",
-        nfd: "\u{3200}",
-        nfkc: "\u{0028}\u{1100}\u{0029}",
-        nfkd: "\u{0028}\u{1100}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3201}",
-        nfc: "\u{3201}",
-        nfd: "\u{3201}",
-        nfkc: "\u{0028}\u{1102}\u{0029}",
-        nfkd: "\u{0028}\u{1102}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3202}",
-        nfc: "\u{3202}",
-        nfd: "\u{3202}",
-        nfkc: "\u{0028}\u{1103}\u{0029}",
-        nfkd: "\u{0028}\u{1103}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3203}",
-        nfc: "\u{3203}",
-        nfd: "\u{3203}",
-        nfkc: "\u{0028}\u{1105}\u{0029}",
-        nfkd: "\u{0028}\u{1105}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3204}",
-        nfc: "\u{3204}",
-        nfd: "\u{3204}",
-        nfkc: "\u{0028}\u{1106}\u{0029}",
-        nfkd: "\u{0028}\u{1106}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3205}",
-        nfc: "\u{3205}",
-        nfd: "\u{3205}",
-        nfkc: "\u{0028}\u{1107}\u{0029}",
-        nfkd: "\u{0028}\u{1107}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3206}",
-        nfc: "\u{3206}",
-        nfd: "\u{3206}",
-        nfkc: "\u{0028}\u{1109}\u{0029}",
-        nfkd: "\u{0028}\u{1109}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3207}",
-        nfc: "\u{3207}",
-        nfd: "\u{3207}",
-        nfkc: "\u{0028}\u{110B}\u{0029}",
-        nfkd: "\u{0028}\u{110B}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3208}",
-        nfc: "\u{3208}",
-        nfd: "\u{3208}",
-        nfkc: "\u{0028}\u{110C}\u{0029}",
-        nfkd: "\u{0028}\u{110C}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3209}",
-        nfc: "\u{3209}",
-        nfd: "\u{3209}",
-        nfkc: "\u{0028}\u{110E}\u{0029}",
-        nfkd: "\u{0028}\u{110E}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{320A}",
-        nfc: "\u{320A}",
-        nfd: "\u{320A}",
-        nfkc: "\u{0028}\u{110F}\u{0029}",
-        nfkd: "\u{0028}\u{110F}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{320B}",
-        nfc: "\u{320B}",
-        nfd: "\u{320B}",
-        nfkc: "\u{0028}\u{1110}\u{0029}",
-        nfkd: "\u{0028}\u{1110}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{320C}",
-        nfc: "\u{320C}",
-        nfd: "\u{320C}",
-        nfkc: "\u{0028}\u{1111}\u{0029}",
-        nfkd: "\u{0028}\u{1111}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{320D}",
-        nfc: "\u{320D}",
-        nfd: "\u{320D}",
-        nfkc: "\u{0028}\u{1112}\u{0029}",
-        nfkd: "\u{0028}\u{1112}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{320E}",
-        nfc: "\u{320E}",
-        nfd: "\u{320E}",
-        nfkc: "\u{0028}\u{AC00}\u{0029}",
-        nfkd: "\u{0028}\u{1100}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{320F}",
-        nfc: "\u{320F}",
-        nfd: "\u{320F}",
-        nfkc: "\u{0028}\u{B098}\u{0029}",
-        nfkd: "\u{0028}\u{1102}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3210}",
-        nfc: "\u{3210}",
-        nfd: "\u{3210}",
-        nfkc: "\u{0028}\u{B2E4}\u{0029}",
-        nfkd: "\u{0028}\u{1103}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3211}",
-        nfc: "\u{3211}",
-        nfd: "\u{3211}",
-        nfkc: "\u{0028}\u{B77C}\u{0029}",
-        nfkd: "\u{0028}\u{1105}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3212}",
-        nfc: "\u{3212}",
-        nfd: "\u{3212}",
-        nfkc: "\u{0028}\u{B9C8}\u{0029}",
-        nfkd: "\u{0028}\u{1106}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3213}",
-        nfc: "\u{3213}",
-        nfd: "\u{3213}",
-        nfkc: "\u{0028}\u{BC14}\u{0029}",
-        nfkd: "\u{0028}\u{1107}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3214}",
-        nfc: "\u{3214}",
-        nfd: "\u{3214}",
-        nfkc: "\u{0028}\u{C0AC}\u{0029}",
-        nfkd: "\u{0028}\u{1109}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3215}",
-        nfc: "\u{3215}",
-        nfd: "\u{3215}",
-        nfkc: "\u{0028}\u{C544}\u{0029}",
-        nfkd: "\u{0028}\u{110B}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3216}",
-        nfc: "\u{3216}",
-        nfd: "\u{3216}",
-        nfkc: "\u{0028}\u{C790}\u{0029}",
-        nfkd: "\u{0028}\u{110C}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3217}",
-        nfc: "\u{3217}",
-        nfd: "\u{3217}",
-        nfkc: "\u{0028}\u{CC28}\u{0029}",
-        nfkd: "\u{0028}\u{110E}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3218}",
-        nfc: "\u{3218}",
-        nfd: "\u{3218}",
-        nfkc: "\u{0028}\u{CE74}\u{0029}",
-        nfkd: "\u{0028}\u{110F}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3219}",
-        nfc: "\u{3219}",
-        nfd: "\u{3219}",
-        nfkc: "\u{0028}\u{D0C0}\u{0029}",
-        nfkd: "\u{0028}\u{1110}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{321A}",
-        nfc: "\u{321A}",
-        nfd: "\u{321A}",
-        nfkc: "\u{0028}\u{D30C}\u{0029}",
-        nfkd: "\u{0028}\u{1111}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{321B}",
-        nfc: "\u{321B}",
-        nfd: "\u{321B}",
-        nfkc: "\u{0028}\u{D558}\u{0029}",
-        nfkd: "\u{0028}\u{1112}\u{1161}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{321C}",
-        nfc: "\u{321C}",
-        nfd: "\u{321C}",
-        nfkc: "\u{0028}\u{C8FC}\u{0029}",
-        nfkd: "\u{0028}\u{110C}\u{116E}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{321D}",
-        nfc: "\u{321D}",
-        nfd: "\u{321D}",
-        nfkc: "\u{0028}\u{C624}\u{C804}\u{0029}",
-        nfkd: "\u{0028}\u{110B}\u{1169}\u{110C}\u{1165}\u{11AB}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{321E}",
-        nfc: "\u{321E}",
-        nfd: "\u{321E}",
-        nfkc: "\u{0028}\u{C624}\u{D6C4}\u{0029}",
-        nfkd: "\u{0028}\u{110B}\u{1169}\u{1112}\u{116E}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3220}",
-        nfc: "\u{3220}",
-        nfd: "\u{3220}",
-        nfkc: "\u{0028}\u{4E00}\u{0029}",
-        nfkd: "\u{0028}\u{4E00}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3221}",
-        nfc: "\u{3221}",
-        nfd: "\u{3221}",
-        nfkc: "\u{0028}\u{4E8C}\u{0029}",
-        nfkd: "\u{0028}\u{4E8C}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3222}",
-        nfc: "\u{3222}",
-        nfd: "\u{3222}",
-        nfkc: "\u{0028}\u{4E09}\u{0029}",
-        nfkd: "\u{0028}\u{4E09}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3223}",
-        nfc: "\u{3223}",
-        nfd: "\u{3223}",
-        nfkc: "\u{0028}\u{56DB}\u{0029}",
-        nfkd: "\u{0028}\u{56DB}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3224}",
-        nfc: "\u{3224}",
-        nfd: "\u{3224}",
-        nfkc: "\u{0028}\u{4E94}\u{0029}",
-        nfkd: "\u{0028}\u{4E94}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3225}",
-        nfc: "\u{3225}",
-        nfd: "\u{3225}",
-        nfkc: "\u{0028}\u{516D}\u{0029}",
-        nfkd: "\u{0028}\u{516D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3226}",
-        nfc: "\u{3226}",
-        nfd: "\u{3226}",
-        nfkc: "\u{0028}\u{4E03}\u{0029}",
-        nfkd: "\u{0028}\u{4E03}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3227}",
-        nfc: "\u{3227}",
-        nfd: "\u{3227}",
-        nfkc: "\u{0028}\u{516B}\u{0029}",
-        nfkd: "\u{0028}\u{516B}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3228}",
-        nfc: "\u{3228}",
-        nfd: "\u{3228}",
-        nfkc: "\u{0028}\u{4E5D}\u{0029}",
-        nfkd: "\u{0028}\u{4E5D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3229}",
-        nfc: "\u{3229}",
-        nfd: "\u{3229}",
-        nfkc: "\u{0028}\u{5341}\u{0029}",
-        nfkd: "\u{0028}\u{5341}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{322A}",
-        nfc: "\u{322A}",
-        nfd: "\u{322A}",
-        nfkc: "\u{0028}\u{6708}\u{0029}",
-        nfkd: "\u{0028}\u{6708}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{322B}",
-        nfc: "\u{322B}",
-        nfd: "\u{322B}",
-        nfkc: "\u{0028}\u{706B}\u{0029}",
-        nfkd: "\u{0028}\u{706B}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{322C}",
-        nfc: "\u{322C}",
-        nfd: "\u{322C}",
-        nfkc: "\u{0028}\u{6C34}\u{0029}",
-        nfkd: "\u{0028}\u{6C34}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{322D}",
-        nfc: "\u{322D}",
-        nfd: "\u{322D}",
-        nfkc: "\u{0028}\u{6728}\u{0029}",
-        nfkd: "\u{0028}\u{6728}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{322E}",
-        nfc: "\u{322E}",
-        nfd: "\u{322E}",
-        nfkc: "\u{0028}\u{91D1}\u{0029}",
-        nfkd: "\u{0028}\u{91D1}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{322F}",
-        nfc: "\u{322F}",
-        nfd: "\u{322F}",
-        nfkc: "\u{0028}\u{571F}\u{0029}",
-        nfkd: "\u{0028}\u{571F}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3230}",
-        nfc: "\u{3230}",
-        nfd: "\u{3230}",
-        nfkc: "\u{0028}\u{65E5}\u{0029}",
-        nfkd: "\u{0028}\u{65E5}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3231}",
-        nfc: "\u{3231}",
-        nfd: "\u{3231}",
-        nfkc: "\u{0028}\u{682A}\u{0029}",
-        nfkd: "\u{0028}\u{682A}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3232}",
-        nfc: "\u{3232}",
-        nfd: "\u{3232}",
-        nfkc: "\u{0028}\u{6709}\u{0029}",
-        nfkd: "\u{0028}\u{6709}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3233}",
-        nfc: "\u{3233}",
-        nfd: "\u{3233}",
-        nfkc: "\u{0028}\u{793E}\u{0029}",
-        nfkd: "\u{0028}\u{793E}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3234}",
-        nfc: "\u{3234}",
-        nfd: "\u{3234}",
-        nfkc: "\u{0028}\u{540D}\u{0029}",
-        nfkd: "\u{0028}\u{540D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3235}",
-        nfc: "\u{3235}",
-        nfd: "\u{3235}",
-        nfkc: "\u{0028}\u{7279}\u{0029}",
-        nfkd: "\u{0028}\u{7279}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3236}",
-        nfc: "\u{3236}",
-        nfd: "\u{3236}",
-        nfkc: "\u{0028}\u{8CA1}\u{0029}",
-        nfkd: "\u{0028}\u{8CA1}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3237}",
-        nfc: "\u{3237}",
-        nfd: "\u{3237}",
-        nfkc: "\u{0028}\u{795D}\u{0029}",
-        nfkd: "\u{0028}\u{795D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3238}",
-        nfc: "\u{3238}",
-        nfd: "\u{3238}",
-        nfkc: "\u{0028}\u{52B4}\u{0029}",
-        nfkd: "\u{0028}\u{52B4}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3239}",
-        nfc: "\u{3239}",
-        nfd: "\u{3239}",
-        nfkc: "\u{0028}\u{4EE3}\u{0029}",
-        nfkd: "\u{0028}\u{4EE3}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{323A}",
-        nfc: "\u{323A}",
-        nfd: "\u{323A}",
-        nfkc: "\u{0028}\u{547C}\u{0029}",
-        nfkd: "\u{0028}\u{547C}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{323B}",
-        nfc: "\u{323B}",
-        nfd: "\u{323B}",
-        nfkc: "\u{0028}\u{5B66}\u{0029}",
-        nfkd: "\u{0028}\u{5B66}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{323C}",
-        nfc: "\u{323C}",
-        nfd: "\u{323C}",
-        nfkc: "\u{0028}\u{76E3}\u{0029}",
-        nfkd: "\u{0028}\u{76E3}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{323D}",
-        nfc: "\u{323D}",
-        nfd: "\u{323D}",
-        nfkc: "\u{0028}\u{4F01}\u{0029}",
-        nfkd: "\u{0028}\u{4F01}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{323E}",
-        nfc: "\u{323E}",
-        nfd: "\u{323E}",
-        nfkc: "\u{0028}\u{8CC7}\u{0029}",
-        nfkd: "\u{0028}\u{8CC7}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{323F}",
-        nfc: "\u{323F}",
-        nfd: "\u{323F}",
-        nfkc: "\u{0028}\u{5354}\u{0029}",
-        nfkd: "\u{0028}\u{5354}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3240}",
-        nfc: "\u{3240}",
-        nfd: "\u{3240}",
-        nfkc: "\u{0028}\u{796D}\u{0029}",
-        nfkd: "\u{0028}\u{796D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3241}",
-        nfc: "\u{3241}",
-        nfd: "\u{3241}",
-        nfkc: "\u{0028}\u{4F11}\u{0029}",
-        nfkd: "\u{0028}\u{4F11}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3242}",
-        nfc: "\u{3242}",
-        nfd: "\u{3242}",
-        nfkc: "\u{0028}\u{81EA}\u{0029}",
-        nfkd: "\u{0028}\u{81EA}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3243}",
-        nfc: "\u{3243}",
-        nfd: "\u{3243}",
-        nfkc: "\u{0028}\u{81F3}\u{0029}",
-        nfkd: "\u{0028}\u{81F3}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{3244}",
-        nfc: "\u{3244}",
-        nfd: "\u{3244}",
-        nfkc: "\u{554F}",
-        nfkd: "\u{554F}",
-    },
-    NormalizationTest {
-        source: "\u{3245}",
-        nfc: "\u{3245}",
-        nfd: "\u{3245}",
-        nfkc: "\u{5E7C}",
-        nfkd: "\u{5E7C}",
-    },
-    NormalizationTest {
-        source: "\u{3246}",
-        nfc: "\u{3246}",
-        nfd: "\u{3246}",
-        nfkc: "\u{6587}",
-        nfkd: "\u{6587}",
-    },
-    NormalizationTest {
-        source: "\u{3247}",
-        nfc: "\u{3247}",
-        nfd: "\u{3247}",
-        nfkc: "\u{7B8F}",
-        nfkd: "\u{7B8F}",
-    },
-    NormalizationTest {
-        source: "\u{3250}",
-        nfc: "\u{3250}",
-        nfd: "\u{3250}",
-        nfkc: "\u{0050}\u{0054}\u{0045}",
-        nfkd: "\u{0050}\u{0054}\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{3251}",
-        nfc: "\u{3251}",
-        nfd: "\u{3251}",
-        nfkc: "\u{0032}\u{0031}",
-        nfkd: "\u{0032}\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{3252}",
-        nfc: "\u{3252}",
-        nfd: "\u{3252}",
-        nfkc: "\u{0032}\u{0032}",
-        nfkd: "\u{0032}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{3253}",
-        nfc: "\u{3253}",
-        nfd: "\u{3253}",
-        nfkc: "\u{0032}\u{0033}",
-        nfkd: "\u{0032}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{3254}",
-        nfc: "\u{3254}",
-        nfd: "\u{3254}",
-        nfkc: "\u{0032}\u{0034}",
-        nfkd: "\u{0032}\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{3255}",
-        nfc: "\u{3255}",
-        nfd: "\u{3255}",
-        nfkc: "\u{0032}\u{0035}",
-        nfkd: "\u{0032}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{3256}",
-        nfc: "\u{3256}",
-        nfd: "\u{3256}",
-        nfkc: "\u{0032}\u{0036}",
-        nfkd: "\u{0032}\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{3257}",
-        nfc: "\u{3257}",
-        nfd: "\u{3257}",
-        nfkc: "\u{0032}\u{0037}",
-        nfkd: "\u{0032}\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{3258}",
-        nfc: "\u{3258}",
-        nfd: "\u{3258}",
-        nfkc: "\u{0032}\u{0038}",
-        nfkd: "\u{0032}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{3259}",
-        nfc: "\u{3259}",
-        nfd: "\u{3259}",
-        nfkc: "\u{0032}\u{0039}",
-        nfkd: "\u{0032}\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{325A}",
-        nfc: "\u{325A}",
-        nfd: "\u{325A}",
-        nfkc: "\u{0033}\u{0030}",
-        nfkd: "\u{0033}\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{325B}",
-        nfc: "\u{325B}",
-        nfd: "\u{325B}",
-        nfkc: "\u{0033}\u{0031}",
-        nfkd: "\u{0033}\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{325C}",
-        nfc: "\u{325C}",
-        nfd: "\u{325C}",
-        nfkc: "\u{0033}\u{0032}",
-        nfkd: "\u{0033}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{325D}",
-        nfc: "\u{325D}",
-        nfd: "\u{325D}",
-        nfkc: "\u{0033}\u{0033}",
-        nfkd: "\u{0033}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{325E}",
-        nfc: "\u{325E}",
-        nfd: "\u{325E}",
-        nfkc: "\u{0033}\u{0034}",
-        nfkd: "\u{0033}\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{325F}",
-        nfc: "\u{325F}",
-        nfd: "\u{325F}",
-        nfkc: "\u{0033}\u{0035}",
-        nfkd: "\u{0033}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{3260}",
-        nfc: "\u{3260}",
-        nfd: "\u{3260}",
-        nfkc: "\u{1100}",
-        nfkd: "\u{1100}",
-    },
-    NormalizationTest {
-        source: "\u{3261}",
-        nfc: "\u{3261}",
-        nfd: "\u{3261}",
-        nfkc: "\u{1102}",
-        nfkd: "\u{1102}",
-    },
-    NormalizationTest {
-        source: "\u{3262}",
-        nfc: "\u{3262}",
-        nfd: "\u{3262}",
-        nfkc: "\u{1103}",
-        nfkd: "\u{1103}",
-    },
-    NormalizationTest {
-        source: "\u{3263}",
-        nfc: "\u{3263}",
-        nfd: "\u{3263}",
-        nfkc: "\u{1105}",
-        nfkd: "\u{1105}",
-    },
-    NormalizationTest {
-        source: "\u{3264}",
-        nfc: "\u{3264}",
-        nfd: "\u{3264}",
-        nfkc: "\u{1106}",
-        nfkd: "\u{1106}",
-    },
-    NormalizationTest {
-        source: "\u{3265}",
-        nfc: "\u{3265}",
-        nfd: "\u{3265}",
-        nfkc: "\u{1107}",
-        nfkd: "\u{1107}",
-    },
-    NormalizationTest {
-        source: "\u{3266}",
-        nfc: "\u{3266}",
-        nfd: "\u{3266}",
-        nfkc: "\u{1109}",
-        nfkd: "\u{1109}",
-    },
-    NormalizationTest {
-        source: "\u{3267}",
-        nfc: "\u{3267}",
-        nfd: "\u{3267}",
-        nfkc: "\u{110B}",
-        nfkd: "\u{110B}",
-    },
-    NormalizationTest {
-        source: "\u{3268}",
-        nfc: "\u{3268}",
-        nfd: "\u{3268}",
-        nfkc: "\u{110C}",
-        nfkd: "\u{110C}",
-    },
-    NormalizationTest {
-        source: "\u{3269}",
-        nfc: "\u{3269}",
-        nfd: "\u{3269}",
-        nfkc: "\u{110E}",
-        nfkd: "\u{110E}",
-    },
-    NormalizationTest {
-        source: "\u{326A}",
-        nfc: "\u{326A}",
-        nfd: "\u{326A}",
-        nfkc: "\u{110F}",
-        nfkd: "\u{110F}",
-    },
-    NormalizationTest {
-        source: "\u{326B}",
-        nfc: "\u{326B}",
-        nfd: "\u{326B}",
-        nfkc: "\u{1110}",
-        nfkd: "\u{1110}",
-    },
-    NormalizationTest {
-        source: "\u{326C}",
-        nfc: "\u{326C}",
-        nfd: "\u{326C}",
-        nfkc: "\u{1111}",
-        nfkd: "\u{1111}",
-    },
-    NormalizationTest {
-        source: "\u{326D}",
-        nfc: "\u{326D}",
-        nfd: "\u{326D}",
-        nfkc: "\u{1112}",
-        nfkd: "\u{1112}",
-    },
-    NormalizationTest {
-        source: "\u{326E}",
-        nfc: "\u{326E}",
-        nfd: "\u{326E}",
-        nfkc: "\u{AC00}",
-        nfkd: "\u{1100}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{326F}",
-        nfc: "\u{326F}",
-        nfd: "\u{326F}",
-        nfkc: "\u{B098}",
-        nfkd: "\u{1102}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3270}",
-        nfc: "\u{3270}",
-        nfd: "\u{3270}",
-        nfkc: "\u{B2E4}",
-        nfkd: "\u{1103}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3271}",
-        nfc: "\u{3271}",
-        nfd: "\u{3271}",
-        nfkc: "\u{B77C}",
-        nfkd: "\u{1105}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3272}",
-        nfc: "\u{3272}",
-        nfd: "\u{3272}",
-        nfkc: "\u{B9C8}",
-        nfkd: "\u{1106}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3273}",
-        nfc: "\u{3273}",
-        nfd: "\u{3273}",
-        nfkc: "\u{BC14}",
-        nfkd: "\u{1107}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3274}",
-        nfc: "\u{3274}",
-        nfd: "\u{3274}",
-        nfkc: "\u{C0AC}",
-        nfkd: "\u{1109}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3275}",
-        nfc: "\u{3275}",
-        nfd: "\u{3275}",
-        nfkc: "\u{C544}",
-        nfkd: "\u{110B}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3276}",
-        nfc: "\u{3276}",
-        nfd: "\u{3276}",
-        nfkc: "\u{C790}",
-        nfkd: "\u{110C}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3277}",
-        nfc: "\u{3277}",
-        nfd: "\u{3277}",
-        nfkc: "\u{CC28}",
-        nfkd: "\u{110E}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3278}",
-        nfc: "\u{3278}",
-        nfd: "\u{3278}",
-        nfkc: "\u{CE74}",
-        nfkd: "\u{110F}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{3279}",
-        nfc: "\u{3279}",
-        nfd: "\u{3279}",
-        nfkc: "\u{D0C0}",
-        nfkd: "\u{1110}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{327A}",
-        nfc: "\u{327A}",
-        nfd: "\u{327A}",
-        nfkc: "\u{D30C}",
-        nfkd: "\u{1111}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{327B}",
-        nfc: "\u{327B}",
-        nfd: "\u{327B}",
-        nfkc: "\u{D558}",
-        nfkd: "\u{1112}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{327C}",
-        nfc: "\u{327C}",
-        nfd: "\u{327C}",
-        nfkc: "\u{CC38}\u{ACE0}",
-        nfkd: "\u{110E}\u{1161}\u{11B7}\u{1100}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{327D}",
-        nfc: "\u{327D}",
-        nfd: "\u{327D}",
-        nfkc: "\u{C8FC}\u{C758}",
-        nfkd: "\u{110C}\u{116E}\u{110B}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{327E}",
-        nfc: "\u{327E}",
-        nfd: "\u{327E}",
-        nfkc: "\u{C6B0}",
-        nfkd: "\u{110B}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{3280}",
-        nfc: "\u{3280}",
-        nfd: "\u{3280}",
-        nfkc: "\u{4E00}",
-        nfkd: "\u{4E00}",
-    },
-    NormalizationTest {
-        source: "\u{3281}",
-        nfc: "\u{3281}",
-        nfd: "\u{3281}",
-        nfkc: "\u{4E8C}",
-        nfkd: "\u{4E8C}",
-    },
-    NormalizationTest {
-        source: "\u{3282}",
-        nfc: "\u{3282}",
-        nfd: "\u{3282}",
-        nfkc: "\u{4E09}",
-        nfkd: "\u{4E09}",
-    },
-    NormalizationTest {
-        source: "\u{3283}",
-        nfc: "\u{3283}",
-        nfd: "\u{3283}",
-        nfkc: "\u{56DB}",
-        nfkd: "\u{56DB}",
-    },
-    NormalizationTest {
-        source: "\u{3284}",
-        nfc: "\u{3284}",
-        nfd: "\u{3284}",
-        nfkc: "\u{4E94}",
-        nfkd: "\u{4E94}",
-    },
-    NormalizationTest {
-        source: "\u{3285}",
-        nfc: "\u{3285}",
-        nfd: "\u{3285}",
-        nfkc: "\u{516D}",
-        nfkd: "\u{516D}",
-    },
-    NormalizationTest {
-        source: "\u{3286}",
-        nfc: "\u{3286}",
-        nfd: "\u{3286}",
-        nfkc: "\u{4E03}",
-        nfkd: "\u{4E03}",
-    },
-    NormalizationTest {
-        source: "\u{3287}",
-        nfc: "\u{3287}",
-        nfd: "\u{3287}",
-        nfkc: "\u{516B}",
-        nfkd: "\u{516B}",
-    },
-    NormalizationTest {
-        source: "\u{3288}",
-        nfc: "\u{3288}",
-        nfd: "\u{3288}",
-        nfkc: "\u{4E5D}",
-        nfkd: "\u{4E5D}",
-    },
-    NormalizationTest {
-        source: "\u{3289}",
-        nfc: "\u{3289}",
-        nfd: "\u{3289}",
-        nfkc: "\u{5341}",
-        nfkd: "\u{5341}",
-    },
-    NormalizationTest {
-        source: "\u{328A}",
-        nfc: "\u{328A}",
-        nfd: "\u{328A}",
-        nfkc: "\u{6708}",
-        nfkd: "\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{328B}",
-        nfc: "\u{328B}",
-        nfd: "\u{328B}",
-        nfkc: "\u{706B}",
-        nfkd: "\u{706B}",
-    },
-    NormalizationTest {
-        source: "\u{328C}",
-        nfc: "\u{328C}",
-        nfd: "\u{328C}",
-        nfkc: "\u{6C34}",
-        nfkd: "\u{6C34}",
-    },
-    NormalizationTest {
-        source: "\u{328D}",
-        nfc: "\u{328D}",
-        nfd: "\u{328D}",
-        nfkc: "\u{6728}",
-        nfkd: "\u{6728}",
-    },
-    NormalizationTest {
-        source: "\u{328E}",
-        nfc: "\u{328E}",
-        nfd: "\u{328E}",
-        nfkc: "\u{91D1}",
-        nfkd: "\u{91D1}",
-    },
-    NormalizationTest {
-        source: "\u{328F}",
-        nfc: "\u{328F}",
-        nfd: "\u{328F}",
-        nfkc: "\u{571F}",
-        nfkd: "\u{571F}",
-    },
-    NormalizationTest {
-        source: "\u{3290}",
-        nfc: "\u{3290}",
-        nfd: "\u{3290}",
-        nfkc: "\u{65E5}",
-        nfkd: "\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{3291}",
-        nfc: "\u{3291}",
-        nfd: "\u{3291}",
-        nfkc: "\u{682A}",
-        nfkd: "\u{682A}",
-    },
-    NormalizationTest {
-        source: "\u{3292}",
-        nfc: "\u{3292}",
-        nfd: "\u{3292}",
-        nfkc: "\u{6709}",
-        nfkd: "\u{6709}",
-    },
-    NormalizationTest {
-        source: "\u{3293}",
-        nfc: "\u{3293}",
-        nfd: "\u{3293}",
-        nfkc: "\u{793E}",
-        nfkd: "\u{793E}",
-    },
-    NormalizationTest {
-        source: "\u{3294}",
-        nfc: "\u{3294}",
-        nfd: "\u{3294}",
-        nfkc: "\u{540D}",
-        nfkd: "\u{540D}",
-    },
-    NormalizationTest {
-        source: "\u{3295}",
-        nfc: "\u{3295}",
-        nfd: "\u{3295}",
-        nfkc: "\u{7279}",
-        nfkd: "\u{7279}",
-    },
-    NormalizationTest {
-        source: "\u{3296}",
-        nfc: "\u{3296}",
-        nfd: "\u{3296}",
-        nfkc: "\u{8CA1}",
-        nfkd: "\u{8CA1}",
-    },
-    NormalizationTest {
-        source: "\u{3297}",
-        nfc: "\u{3297}",
-        nfd: "\u{3297}",
-        nfkc: "\u{795D}",
-        nfkd: "\u{795D}",
-    },
-    NormalizationTest {
-        source: "\u{3298}",
-        nfc: "\u{3298}",
-        nfd: "\u{3298}",
-        nfkc: "\u{52B4}",
-        nfkd: "\u{52B4}",
-    },
-    NormalizationTest {
-        source: "\u{3299}",
-        nfc: "\u{3299}",
-        nfd: "\u{3299}",
-        nfkc: "\u{79D8}",
-        nfkd: "\u{79D8}",
-    },
-    NormalizationTest {
-        source: "\u{329A}",
-        nfc: "\u{329A}",
-        nfd: "\u{329A}",
-        nfkc: "\u{7537}",
-        nfkd: "\u{7537}",
-    },
-    NormalizationTest {
-        source: "\u{329B}",
-        nfc: "\u{329B}",
-        nfd: "\u{329B}",
-        nfkc: "\u{5973}",
-        nfkd: "\u{5973}",
-    },
-    NormalizationTest {
-        source: "\u{329C}",
-        nfc: "\u{329C}",
-        nfd: "\u{329C}",
-        nfkc: "\u{9069}",
-        nfkd: "\u{9069}",
-    },
-    NormalizationTest {
-        source: "\u{329D}",
-        nfc: "\u{329D}",
-        nfd: "\u{329D}",
-        nfkc: "\u{512A}",
-        nfkd: "\u{512A}",
-    },
-    NormalizationTest {
-        source: "\u{329E}",
-        nfc: "\u{329E}",
-        nfd: "\u{329E}",
-        nfkc: "\u{5370}",
-        nfkd: "\u{5370}",
-    },
-    NormalizationTest {
-        source: "\u{329F}",
-        nfc: "\u{329F}",
-        nfd: "\u{329F}",
-        nfkc: "\u{6CE8}",
-        nfkd: "\u{6CE8}",
-    },
-    NormalizationTest {
-        source: "\u{32A0}",
-        nfc: "\u{32A0}",
-        nfd: "\u{32A0}",
-        nfkc: "\u{9805}",
-        nfkd: "\u{9805}",
-    },
-    NormalizationTest {
-        source: "\u{32A1}",
-        nfc: "\u{32A1}",
-        nfd: "\u{32A1}",
-        nfkc: "\u{4F11}",
-        nfkd: "\u{4F11}",
-    },
-    NormalizationTest {
-        source: "\u{32A2}",
-        nfc: "\u{32A2}",
-        nfd: "\u{32A2}",
-        nfkc: "\u{5199}",
-        nfkd: "\u{5199}",
-    },
-    NormalizationTest {
-        source: "\u{32A3}",
-        nfc: "\u{32A3}",
-        nfd: "\u{32A3}",
-        nfkc: "\u{6B63}",
-        nfkd: "\u{6B63}",
-    },
-    NormalizationTest {
-        source: "\u{32A4}",
-        nfc: "\u{32A4}",
-        nfd: "\u{32A4}",
-        nfkc: "\u{4E0A}",
-        nfkd: "\u{4E0A}",
-    },
-    NormalizationTest {
-        source: "\u{32A5}",
-        nfc: "\u{32A5}",
-        nfd: "\u{32A5}",
-        nfkc: "\u{4E2D}",
-        nfkd: "\u{4E2D}",
-    },
-    NormalizationTest {
-        source: "\u{32A6}",
-        nfc: "\u{32A6}",
-        nfd: "\u{32A6}",
-        nfkc: "\u{4E0B}",
-        nfkd: "\u{4E0B}",
-    },
-    NormalizationTest {
-        source: "\u{32A7}",
-        nfc: "\u{32A7}",
-        nfd: "\u{32A7}",
-        nfkc: "\u{5DE6}",
-        nfkd: "\u{5DE6}",
-    },
-    NormalizationTest {
-        source: "\u{32A8}",
-        nfc: "\u{32A8}",
-        nfd: "\u{32A8}",
-        nfkc: "\u{53F3}",
-        nfkd: "\u{53F3}",
-    },
-    NormalizationTest {
-        source: "\u{32A9}",
-        nfc: "\u{32A9}",
-        nfd: "\u{32A9}",
-        nfkc: "\u{533B}",
-        nfkd: "\u{533B}",
-    },
-    NormalizationTest {
-        source: "\u{32AA}",
-        nfc: "\u{32AA}",
-        nfd: "\u{32AA}",
-        nfkc: "\u{5B97}",
-        nfkd: "\u{5B97}",
-    },
-    NormalizationTest {
-        source: "\u{32AB}",
-        nfc: "\u{32AB}",
-        nfd: "\u{32AB}",
-        nfkc: "\u{5B66}",
-        nfkd: "\u{5B66}",
-    },
-    NormalizationTest {
-        source: "\u{32AC}",
-        nfc: "\u{32AC}",
-        nfd: "\u{32AC}",
-        nfkc: "\u{76E3}",
-        nfkd: "\u{76E3}",
-    },
-    NormalizationTest {
-        source: "\u{32AD}",
-        nfc: "\u{32AD}",
-        nfd: "\u{32AD}",
-        nfkc: "\u{4F01}",
-        nfkd: "\u{4F01}",
-    },
-    NormalizationTest {
-        source: "\u{32AE}",
-        nfc: "\u{32AE}",
-        nfd: "\u{32AE}",
-        nfkc: "\u{8CC7}",
-        nfkd: "\u{8CC7}",
-    },
-    NormalizationTest {
-        source: "\u{32AF}",
-        nfc: "\u{32AF}",
-        nfd: "\u{32AF}",
-        nfkc: "\u{5354}",
-        nfkd: "\u{5354}",
-    },
-    NormalizationTest {
-        source: "\u{32B0}",
-        nfc: "\u{32B0}",
-        nfd: "\u{32B0}",
-        nfkc: "\u{591C}",
-        nfkd: "\u{591C}",
-    },
-    NormalizationTest {
-        source: "\u{32B1}",
-        nfc: "\u{32B1}",
-        nfd: "\u{32B1}",
-        nfkc: "\u{0033}\u{0036}",
-        nfkd: "\u{0033}\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{32B2}",
-        nfc: "\u{32B2}",
-        nfd: "\u{32B2}",
-        nfkc: "\u{0033}\u{0037}",
-        nfkd: "\u{0033}\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{32B3}",
-        nfc: "\u{32B3}",
-        nfd: "\u{32B3}",
-        nfkc: "\u{0033}\u{0038}",
-        nfkd: "\u{0033}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{32B4}",
-        nfc: "\u{32B4}",
-        nfd: "\u{32B4}",
-        nfkc: "\u{0033}\u{0039}",
-        nfkd: "\u{0033}\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{32B5}",
-        nfc: "\u{32B5}",
-        nfd: "\u{32B5}",
-        nfkc: "\u{0034}\u{0030}",
-        nfkd: "\u{0034}\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{32B6}",
-        nfc: "\u{32B6}",
-        nfd: "\u{32B6}",
-        nfkc: "\u{0034}\u{0031}",
-        nfkd: "\u{0034}\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{32B7}",
-        nfc: "\u{32B7}",
-        nfd: "\u{32B7}",
-        nfkc: "\u{0034}\u{0032}",
-        nfkd: "\u{0034}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{32B8}",
-        nfc: "\u{32B8}",
-        nfd: "\u{32B8}",
-        nfkc: "\u{0034}\u{0033}",
-        nfkd: "\u{0034}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{32B9}",
-        nfc: "\u{32B9}",
-        nfd: "\u{32B9}",
-        nfkc: "\u{0034}\u{0034}",
-        nfkd: "\u{0034}\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{32BA}",
-        nfc: "\u{32BA}",
-        nfd: "\u{32BA}",
-        nfkc: "\u{0034}\u{0035}",
-        nfkd: "\u{0034}\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{32BB}",
-        nfc: "\u{32BB}",
-        nfd: "\u{32BB}",
-        nfkc: "\u{0034}\u{0036}",
-        nfkd: "\u{0034}\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{32BC}",
-        nfc: "\u{32BC}",
-        nfd: "\u{32BC}",
-        nfkc: "\u{0034}\u{0037}",
-        nfkd: "\u{0034}\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{32BD}",
-        nfc: "\u{32BD}",
-        nfd: "\u{32BD}",
-        nfkc: "\u{0034}\u{0038}",
-        nfkd: "\u{0034}\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{32BE}",
-        nfc: "\u{32BE}",
-        nfd: "\u{32BE}",
-        nfkc: "\u{0034}\u{0039}",
-        nfkd: "\u{0034}\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{32BF}",
-        nfc: "\u{32BF}",
-        nfd: "\u{32BF}",
-        nfkc: "\u{0035}\u{0030}",
-        nfkd: "\u{0035}\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{32C0}",
-        nfc: "\u{32C0}",
-        nfd: "\u{32C0}",
-        nfkc: "\u{0031}\u{6708}",
-        nfkd: "\u{0031}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C1}",
-        nfc: "\u{32C1}",
-        nfd: "\u{32C1}",
-        nfkc: "\u{0032}\u{6708}",
-        nfkd: "\u{0032}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C2}",
-        nfc: "\u{32C2}",
-        nfd: "\u{32C2}",
-        nfkc: "\u{0033}\u{6708}",
-        nfkd: "\u{0033}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C3}",
-        nfc: "\u{32C3}",
-        nfd: "\u{32C3}",
-        nfkc: "\u{0034}\u{6708}",
-        nfkd: "\u{0034}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C4}",
-        nfc: "\u{32C4}",
-        nfd: "\u{32C4}",
-        nfkc: "\u{0035}\u{6708}",
-        nfkd: "\u{0035}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C5}",
-        nfc: "\u{32C5}",
-        nfd: "\u{32C5}",
-        nfkc: "\u{0036}\u{6708}",
-        nfkd: "\u{0036}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C6}",
-        nfc: "\u{32C6}",
-        nfd: "\u{32C6}",
-        nfkc: "\u{0037}\u{6708}",
-        nfkd: "\u{0037}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C7}",
-        nfc: "\u{32C7}",
-        nfd: "\u{32C7}",
-        nfkc: "\u{0038}\u{6708}",
-        nfkd: "\u{0038}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C8}",
-        nfc: "\u{32C8}",
-        nfd: "\u{32C8}",
-        nfkc: "\u{0039}\u{6708}",
-        nfkd: "\u{0039}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32C9}",
-        nfc: "\u{32C9}",
-        nfd: "\u{32C9}",
-        nfkc: "\u{0031}\u{0030}\u{6708}",
-        nfkd: "\u{0031}\u{0030}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32CA}",
-        nfc: "\u{32CA}",
-        nfd: "\u{32CA}",
-        nfkc: "\u{0031}\u{0031}\u{6708}",
-        nfkd: "\u{0031}\u{0031}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32CB}",
-        nfc: "\u{32CB}",
-        nfd: "\u{32CB}",
-        nfkc: "\u{0031}\u{0032}\u{6708}",
-        nfkd: "\u{0031}\u{0032}\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{32CC}",
-        nfc: "\u{32CC}",
-        nfd: "\u{32CC}",
-        nfkc: "\u{0048}\u{0067}",
-        nfkd: "\u{0048}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{32CD}",
-        nfc: "\u{32CD}",
-        nfd: "\u{32CD}",
-        nfkc: "\u{0065}\u{0072}\u{0067}",
-        nfkd: "\u{0065}\u{0072}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{32CE}",
-        nfc: "\u{32CE}",
-        nfd: "\u{32CE}",
-        nfkc: "\u{0065}\u{0056}",
-        nfkd: "\u{0065}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{32CF}",
-        nfc: "\u{32CF}",
-        nfd: "\u{32CF}",
-        nfkc: "\u{004C}\u{0054}\u{0044}",
-        nfkd: "\u{004C}\u{0054}\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{32D0}",
-        nfc: "\u{32D0}",
-        nfd: "\u{32D0}",
-        nfkc: "\u{30A2}",
-        nfkd: "\u{30A2}",
-    },
-    NormalizationTest {
-        source: "\u{32D1}",
-        nfc: "\u{32D1}",
-        nfd: "\u{32D1}",
-        nfkc: "\u{30A4}",
-        nfkd: "\u{30A4}",
-    },
-    NormalizationTest {
-        source: "\u{32D2}",
-        nfc: "\u{32D2}",
-        nfd: "\u{32D2}",
-        nfkc: "\u{30A6}",
-        nfkd: "\u{30A6}",
-    },
-    NormalizationTest {
-        source: "\u{32D3}",
-        nfc: "\u{32D3}",
-        nfd: "\u{32D3}",
-        nfkc: "\u{30A8}",
-        nfkd: "\u{30A8}",
-    },
-    NormalizationTest {
-        source: "\u{32D4}",
-        nfc: "\u{32D4}",
-        nfd: "\u{32D4}",
-        nfkc: "\u{30AA}",
-        nfkd: "\u{30AA}",
-    },
-    NormalizationTest {
-        source: "\u{32D5}",
-        nfc: "\u{32D5}",
-        nfd: "\u{32D5}",
-        nfkc: "\u{30AB}",
-        nfkd: "\u{30AB}",
-    },
-    NormalizationTest {
-        source: "\u{32D6}",
-        nfc: "\u{32D6}",
-        nfd: "\u{32D6}",
-        nfkc: "\u{30AD}",
-        nfkd: "\u{30AD}",
-    },
-    NormalizationTest {
-        source: "\u{32D7}",
-        nfc: "\u{32D7}",
-        nfd: "\u{32D7}",
-        nfkc: "\u{30AF}",
-        nfkd: "\u{30AF}",
-    },
-    NormalizationTest {
-        source: "\u{32D8}",
-        nfc: "\u{32D8}",
-        nfd: "\u{32D8}",
-        nfkc: "\u{30B1}",
-        nfkd: "\u{30B1}",
-    },
-    NormalizationTest {
-        source: "\u{32D9}",
-        nfc: "\u{32D9}",
-        nfd: "\u{32D9}",
-        nfkc: "\u{30B3}",
-        nfkd: "\u{30B3}",
-    },
-    NormalizationTest {
-        source: "\u{32DA}",
-        nfc: "\u{32DA}",
-        nfd: "\u{32DA}",
-        nfkc: "\u{30B5}",
-        nfkd: "\u{30B5}",
-    },
-    NormalizationTest {
-        source: "\u{32DB}",
-        nfc: "\u{32DB}",
-        nfd: "\u{32DB}",
-        nfkc: "\u{30B7}",
-        nfkd: "\u{30B7}",
-    },
-    NormalizationTest {
-        source: "\u{32DC}",
-        nfc: "\u{32DC}",
-        nfd: "\u{32DC}",
-        nfkc: "\u{30B9}",
-        nfkd: "\u{30B9}",
-    },
-    NormalizationTest {
-        source: "\u{32DD}",
-        nfc: "\u{32DD}",
-        nfd: "\u{32DD}",
-        nfkc: "\u{30BB}",
-        nfkd: "\u{30BB}",
-    },
-    NormalizationTest {
-        source: "\u{32DE}",
-        nfc: "\u{32DE}",
-        nfd: "\u{32DE}",
-        nfkc: "\u{30BD}",
-        nfkd: "\u{30BD}",
-    },
-    NormalizationTest {
-        source: "\u{32DF}",
-        nfc: "\u{32DF}",
-        nfd: "\u{32DF}",
-        nfkc: "\u{30BF}",
-        nfkd: "\u{30BF}",
-    },
-    NormalizationTest {
-        source: "\u{32E0}",
-        nfc: "\u{32E0}",
-        nfd: "\u{32E0}",
-        nfkc: "\u{30C1}",
-        nfkd: "\u{30C1}",
-    },
-    NormalizationTest {
-        source: "\u{32E1}",
-        nfc: "\u{32E1}",
-        nfd: "\u{32E1}",
-        nfkc: "\u{30C4}",
-        nfkd: "\u{30C4}",
-    },
-    NormalizationTest {
-        source: "\u{32E2}",
-        nfc: "\u{32E2}",
-        nfd: "\u{32E2}",
-        nfkc: "\u{30C6}",
-        nfkd: "\u{30C6}",
-    },
-    NormalizationTest {
-        source: "\u{32E3}",
-        nfc: "\u{32E3}",
-        nfd: "\u{32E3}",
-        nfkc: "\u{30C8}",
-        nfkd: "\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{32E4}",
-        nfc: "\u{32E4}",
-        nfd: "\u{32E4}",
-        nfkc: "\u{30CA}",
-        nfkd: "\u{30CA}",
-    },
-    NormalizationTest {
-        source: "\u{32E5}",
-        nfc: "\u{32E5}",
-        nfd: "\u{32E5}",
-        nfkc: "\u{30CB}",
-        nfkd: "\u{30CB}",
-    },
-    NormalizationTest {
-        source: "\u{32E6}",
-        nfc: "\u{32E6}",
-        nfd: "\u{32E6}",
-        nfkc: "\u{30CC}",
-        nfkd: "\u{30CC}",
-    },
-    NormalizationTest {
-        source: "\u{32E7}",
-        nfc: "\u{32E7}",
-        nfd: "\u{32E7}",
-        nfkc: "\u{30CD}",
-        nfkd: "\u{30CD}",
-    },
-    NormalizationTest {
-        source: "\u{32E8}",
-        nfc: "\u{32E8}",
-        nfd: "\u{32E8}",
-        nfkc: "\u{30CE}",
-        nfkd: "\u{30CE}",
-    },
-    NormalizationTest {
-        source: "\u{32E9}",
-        nfc: "\u{32E9}",
-        nfd: "\u{32E9}",
-        nfkc: "\u{30CF}",
-        nfkd: "\u{30CF}",
-    },
-    NormalizationTest {
-        source: "\u{32EA}",
-        nfc: "\u{32EA}",
-        nfd: "\u{32EA}",
-        nfkc: "\u{30D2}",
-        nfkd: "\u{30D2}",
-    },
-    NormalizationTest {
-        source: "\u{32EB}",
-        nfc: "\u{32EB}",
-        nfd: "\u{32EB}",
-        nfkc: "\u{30D5}",
-        nfkd: "\u{30D5}",
-    },
-    NormalizationTest {
-        source: "\u{32EC}",
-        nfc: "\u{32EC}",
-        nfd: "\u{32EC}",
-        nfkc: "\u{30D8}",
-        nfkd: "\u{30D8}",
-    },
-    NormalizationTest {
-        source: "\u{32ED}",
-        nfc: "\u{32ED}",
-        nfd: "\u{32ED}",
-        nfkc: "\u{30DB}",
-        nfkd: "\u{30DB}",
-    },
-    NormalizationTest {
-        source: "\u{32EE}",
-        nfc: "\u{32EE}",
-        nfd: "\u{32EE}",
-        nfkc: "\u{30DE}",
-        nfkd: "\u{30DE}",
-    },
-    NormalizationTest {
-        source: "\u{32EF}",
-        nfc: "\u{32EF}",
-        nfd: "\u{32EF}",
-        nfkc: "\u{30DF}",
-        nfkd: "\u{30DF}",
-    },
-    NormalizationTest {
-        source: "\u{32F0}",
-        nfc: "\u{32F0}",
-        nfd: "\u{32F0}",
-        nfkc: "\u{30E0}",
-        nfkd: "\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{32F1}",
-        nfc: "\u{32F1}",
-        nfd: "\u{32F1}",
-        nfkc: "\u{30E1}",
-        nfkd: "\u{30E1}",
-    },
-    NormalizationTest {
-        source: "\u{32F2}",
-        nfc: "\u{32F2}",
-        nfd: "\u{32F2}",
-        nfkc: "\u{30E2}",
-        nfkd: "\u{30E2}",
-    },
-    NormalizationTest {
-        source: "\u{32F3}",
-        nfc: "\u{32F3}",
-        nfd: "\u{32F3}",
-        nfkc: "\u{30E4}",
-        nfkd: "\u{30E4}",
-    },
-    NormalizationTest {
-        source: "\u{32F4}",
-        nfc: "\u{32F4}",
-        nfd: "\u{32F4}",
-        nfkc: "\u{30E6}",
-        nfkd: "\u{30E6}",
-    },
-    NormalizationTest {
-        source: "\u{32F5}",
-        nfc: "\u{32F5}",
-        nfd: "\u{32F5}",
-        nfkc: "\u{30E8}",
-        nfkd: "\u{30E8}",
-    },
-    NormalizationTest {
-        source: "\u{32F6}",
-        nfc: "\u{32F6}",
-        nfd: "\u{32F6}",
-        nfkc: "\u{30E9}",
-        nfkd: "\u{30E9}",
-    },
-    NormalizationTest {
-        source: "\u{32F7}",
-        nfc: "\u{32F7}",
-        nfd: "\u{32F7}",
-        nfkc: "\u{30EA}",
-        nfkd: "\u{30EA}",
-    },
-    NormalizationTest {
-        source: "\u{32F8}",
-        nfc: "\u{32F8}",
-        nfd: "\u{32F8}",
-        nfkc: "\u{30EB}",
-        nfkd: "\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{32F9}",
-        nfc: "\u{32F9}",
-        nfd: "\u{32F9}",
-        nfkc: "\u{30EC}",
-        nfkd: "\u{30EC}",
-    },
-    NormalizationTest {
-        source: "\u{32FA}",
-        nfc: "\u{32FA}",
-        nfd: "\u{32FA}",
-        nfkc: "\u{30ED}",
-        nfkd: "\u{30ED}",
-    },
-    NormalizationTest {
-        source: "\u{32FB}",
-        nfc: "\u{32FB}",
-        nfd: "\u{32FB}",
-        nfkc: "\u{30EF}",
-        nfkd: "\u{30EF}",
-    },
-    NormalizationTest {
-        source: "\u{32FC}",
-        nfc: "\u{32FC}",
-        nfd: "\u{32FC}",
-        nfkc: "\u{30F0}",
-        nfkd: "\u{30F0}",
-    },
-    NormalizationTest {
-        source: "\u{32FD}",
-        nfc: "\u{32FD}",
-        nfd: "\u{32FD}",
-        nfkc: "\u{30F1}",
-        nfkd: "\u{30F1}",
-    },
-    NormalizationTest {
-        source: "\u{32FE}",
-        nfc: "\u{32FE}",
-        nfd: "\u{32FE}",
-        nfkc: "\u{30F2}",
-        nfkd: "\u{30F2}",
-    },
-    NormalizationTest {
-        source: "\u{3300}",
-        nfc: "\u{3300}",
-        nfd: "\u{3300}",
-        nfkc: "\u{30A2}\u{30D1}\u{30FC}\u{30C8}",
-        nfkd: "\u{30A2}\u{30CF}\u{309A}\u{30FC}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{3301}",
-        nfc: "\u{3301}",
-        nfd: "\u{3301}",
-        nfkc: "\u{30A2}\u{30EB}\u{30D5}\u{30A1}",
-        nfkd: "\u{30A2}\u{30EB}\u{30D5}\u{30A1}",
-    },
-    NormalizationTest {
-        source: "\u{3302}",
-        nfc: "\u{3302}",
-        nfd: "\u{3302}",
-        nfkc: "\u{30A2}\u{30F3}\u{30DA}\u{30A2}",
-        nfkd: "\u{30A2}\u{30F3}\u{30D8}\u{309A}\u{30A2}",
-    },
-    NormalizationTest {
-        source: "\u{3303}",
-        nfc: "\u{3303}",
-        nfd: "\u{3303}",
-        nfkc: "\u{30A2}\u{30FC}\u{30EB}",
-        nfkd: "\u{30A2}\u{30FC}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3304}",
-        nfc: "\u{3304}",
-        nfd: "\u{3304}",
-        nfkc: "\u{30A4}\u{30CB}\u{30F3}\u{30B0}",
-        nfkd: "\u{30A4}\u{30CB}\u{30F3}\u{30AF}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3305}",
-        nfc: "\u{3305}",
-        nfd: "\u{3305}",
-        nfkc: "\u{30A4}\u{30F3}\u{30C1}",
-        nfkd: "\u{30A4}\u{30F3}\u{30C1}",
-    },
-    NormalizationTest {
-        source: "\u{3306}",
-        nfc: "\u{3306}",
-        nfd: "\u{3306}",
-        nfkc: "\u{30A6}\u{30A9}\u{30F3}",
-        nfkd: "\u{30A6}\u{30A9}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3307}",
-        nfc: "\u{3307}",
-        nfd: "\u{3307}",
-        nfkc: "\u{30A8}\u{30B9}\u{30AF}\u{30FC}\u{30C9}",
-        nfkd: "\u{30A8}\u{30B9}\u{30AF}\u{30FC}\u{30C8}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3308}",
-        nfc: "\u{3308}",
-        nfd: "\u{3308}",
-        nfkc: "\u{30A8}\u{30FC}\u{30AB}\u{30FC}",
-        nfkd: "\u{30A8}\u{30FC}\u{30AB}\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{3309}",
-        nfc: "\u{3309}",
-        nfd: "\u{3309}",
-        nfkc: "\u{30AA}\u{30F3}\u{30B9}",
-        nfkd: "\u{30AA}\u{30F3}\u{30B9}",
-    },
-    NormalizationTest {
-        source: "\u{330A}",
-        nfc: "\u{330A}",
-        nfd: "\u{330A}",
-        nfkc: "\u{30AA}\u{30FC}\u{30E0}",
-        nfkd: "\u{30AA}\u{30FC}\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{330B}",
-        nfc: "\u{330B}",
-        nfd: "\u{330B}",
-        nfkc: "\u{30AB}\u{30A4}\u{30EA}",
-        nfkd: "\u{30AB}\u{30A4}\u{30EA}",
-    },
-    NormalizationTest {
-        source: "\u{330C}",
-        nfc: "\u{330C}",
-        nfd: "\u{330C}",
-        nfkc: "\u{30AB}\u{30E9}\u{30C3}\u{30C8}",
-        nfkd: "\u{30AB}\u{30E9}\u{30C3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{330D}",
-        nfc: "\u{330D}",
-        nfd: "\u{330D}",
-        nfkc: "\u{30AB}\u{30ED}\u{30EA}\u{30FC}",
-        nfkd: "\u{30AB}\u{30ED}\u{30EA}\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{330E}",
-        nfc: "\u{330E}",
-        nfd: "\u{330E}",
-        nfkc: "\u{30AC}\u{30ED}\u{30F3}",
-        nfkd: "\u{30AB}\u{3099}\u{30ED}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{330F}",
-        nfc: "\u{330F}",
-        nfd: "\u{330F}",
-        nfkc: "\u{30AC}\u{30F3}\u{30DE}",
-        nfkd: "\u{30AB}\u{3099}\u{30F3}\u{30DE}",
-    },
-    NormalizationTest {
-        source: "\u{3310}",
-        nfc: "\u{3310}",
-        nfd: "\u{3310}",
-        nfkc: "\u{30AE}\u{30AC}",
-        nfkd: "\u{30AD}\u{3099}\u{30AB}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3311}",
-        nfc: "\u{3311}",
-        nfd: "\u{3311}",
-        nfkc: "\u{30AE}\u{30CB}\u{30FC}",
-        nfkd: "\u{30AD}\u{3099}\u{30CB}\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{3312}",
-        nfc: "\u{3312}",
-        nfd: "\u{3312}",
-        nfkc: "\u{30AD}\u{30E5}\u{30EA}\u{30FC}",
-        nfkd: "\u{30AD}\u{30E5}\u{30EA}\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{3313}",
-        nfc: "\u{3313}",
-        nfd: "\u{3313}",
-        nfkc: "\u{30AE}\u{30EB}\u{30C0}\u{30FC}",
-        nfkd: "\u{30AD}\u{3099}\u{30EB}\u{30BF}\u{3099}\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{3314}",
-        nfc: "\u{3314}",
-        nfd: "\u{3314}",
-        nfkc: "\u{30AD}\u{30ED}",
-        nfkd: "\u{30AD}\u{30ED}",
-    },
-    NormalizationTest {
-        source: "\u{3315}",
-        nfc: "\u{3315}",
-        nfd: "\u{3315}",
-        nfkc: "\u{30AD}\u{30ED}\u{30B0}\u{30E9}\u{30E0}",
-        nfkd: "\u{30AD}\u{30ED}\u{30AF}\u{3099}\u{30E9}\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{3316}",
-        nfc: "\u{3316}",
-        nfd: "\u{3316}",
-        nfkc: "\u{30AD}\u{30ED}\u{30E1}\u{30FC}\u{30C8}\u{30EB}",
-        nfkd: "\u{30AD}\u{30ED}\u{30E1}\u{30FC}\u{30C8}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3317}",
-        nfc: "\u{3317}",
-        nfd: "\u{3317}",
-        nfkc: "\u{30AD}\u{30ED}\u{30EF}\u{30C3}\u{30C8}",
-        nfkd: "\u{30AD}\u{30ED}\u{30EF}\u{30C3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{3318}",
-        nfc: "\u{3318}",
-        nfd: "\u{3318}",
-        nfkc: "\u{30B0}\u{30E9}\u{30E0}",
-        nfkd: "\u{30AF}\u{3099}\u{30E9}\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{3319}",
-        nfc: "\u{3319}",
-        nfd: "\u{3319}",
-        nfkc: "\u{30B0}\u{30E9}\u{30E0}\u{30C8}\u{30F3}",
-        nfkd: "\u{30AF}\u{3099}\u{30E9}\u{30E0}\u{30C8}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{331A}",
-        nfc: "\u{331A}",
-        nfd: "\u{331A}",
-        nfkc: "\u{30AF}\u{30EB}\u{30BC}\u{30A4}\u{30ED}",
-        nfkd: "\u{30AF}\u{30EB}\u{30BB}\u{3099}\u{30A4}\u{30ED}",
-    },
-    NormalizationTest {
-        source: "\u{331B}",
-        nfc: "\u{331B}",
-        nfd: "\u{331B}",
-        nfkc: "\u{30AF}\u{30ED}\u{30FC}\u{30CD}",
-        nfkd: "\u{30AF}\u{30ED}\u{30FC}\u{30CD}",
-    },
-    NormalizationTest {
-        source: "\u{331C}",
-        nfc: "\u{331C}",
-        nfd: "\u{331C}",
-        nfkc: "\u{30B1}\u{30FC}\u{30B9}",
-        nfkd: "\u{30B1}\u{30FC}\u{30B9}",
-    },
-    NormalizationTest {
-        source: "\u{331D}",
-        nfc: "\u{331D}",
-        nfd: "\u{331D}",
-        nfkc: "\u{30B3}\u{30EB}\u{30CA}",
-        nfkd: "\u{30B3}\u{30EB}\u{30CA}",
-    },
-    NormalizationTest {
-        source: "\u{331E}",
-        nfc: "\u{331E}",
-        nfd: "\u{331E}",
-        nfkc: "\u{30B3}\u{30FC}\u{30DD}",
-        nfkd: "\u{30B3}\u{30FC}\u{30DB}\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{331F}",
-        nfc: "\u{331F}",
-        nfd: "\u{331F}",
-        nfkc: "\u{30B5}\u{30A4}\u{30AF}\u{30EB}",
-        nfkd: "\u{30B5}\u{30A4}\u{30AF}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3320}",
-        nfc: "\u{3320}",
-        nfd: "\u{3320}",
-        nfkc: "\u{30B5}\u{30F3}\u{30C1}\u{30FC}\u{30E0}",
-        nfkd: "\u{30B5}\u{30F3}\u{30C1}\u{30FC}\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{3321}",
-        nfc: "\u{3321}",
-        nfd: "\u{3321}",
-        nfkc: "\u{30B7}\u{30EA}\u{30F3}\u{30B0}",
-        nfkd: "\u{30B7}\u{30EA}\u{30F3}\u{30AF}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3322}",
-        nfc: "\u{3322}",
-        nfd: "\u{3322}",
-        nfkc: "\u{30BB}\u{30F3}\u{30C1}",
-        nfkd: "\u{30BB}\u{30F3}\u{30C1}",
-    },
-    NormalizationTest {
-        source: "\u{3323}",
-        nfc: "\u{3323}",
-        nfd: "\u{3323}",
-        nfkc: "\u{30BB}\u{30F3}\u{30C8}",
-        nfkd: "\u{30BB}\u{30F3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{3324}",
-        nfc: "\u{3324}",
-        nfd: "\u{3324}",
-        nfkc: "\u{30C0}\u{30FC}\u{30B9}",
-        nfkd: "\u{30BF}\u{3099}\u{30FC}\u{30B9}",
-    },
-    NormalizationTest {
-        source: "\u{3325}",
-        nfc: "\u{3325}",
-        nfd: "\u{3325}",
-        nfkc: "\u{30C7}\u{30B7}",
-        nfkd: "\u{30C6}\u{3099}\u{30B7}",
-    },
-    NormalizationTest {
-        source: "\u{3326}",
-        nfc: "\u{3326}",
-        nfd: "\u{3326}",
-        nfkc: "\u{30C9}\u{30EB}",
-        nfkd: "\u{30C8}\u{3099}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3327}",
-        nfc: "\u{3327}",
-        nfd: "\u{3327}",
-        nfkc: "\u{30C8}\u{30F3}",
-        nfkd: "\u{30C8}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3328}",
-        nfc: "\u{3328}",
-        nfd: "\u{3328}",
-        nfkc: "\u{30CA}\u{30CE}",
-        nfkd: "\u{30CA}\u{30CE}",
-    },
-    NormalizationTest {
-        source: "\u{3329}",
-        nfc: "\u{3329}",
-        nfd: "\u{3329}",
-        nfkc: "\u{30CE}\u{30C3}\u{30C8}",
-        nfkd: "\u{30CE}\u{30C3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{332A}",
-        nfc: "\u{332A}",
-        nfd: "\u{332A}",
-        nfkc: "\u{30CF}\u{30A4}\u{30C4}",
-        nfkd: "\u{30CF}\u{30A4}\u{30C4}",
-    },
-    NormalizationTest {
-        source: "\u{332B}",
-        nfc: "\u{332B}",
-        nfd: "\u{332B}",
-        nfkc: "\u{30D1}\u{30FC}\u{30BB}\u{30F3}\u{30C8}",
-        nfkd: "\u{30CF}\u{309A}\u{30FC}\u{30BB}\u{30F3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{332C}",
-        nfc: "\u{332C}",
-        nfd: "\u{332C}",
-        nfkc: "\u{30D1}\u{30FC}\u{30C4}",
-        nfkd: "\u{30CF}\u{309A}\u{30FC}\u{30C4}",
-    },
-    NormalizationTest {
-        source: "\u{332D}",
-        nfc: "\u{332D}",
-        nfd: "\u{332D}",
-        nfkc: "\u{30D0}\u{30FC}\u{30EC}\u{30EB}",
-        nfkd: "\u{30CF}\u{3099}\u{30FC}\u{30EC}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{332E}",
-        nfc: "\u{332E}",
-        nfd: "\u{332E}",
-        nfkc: "\u{30D4}\u{30A2}\u{30B9}\u{30C8}\u{30EB}",
-        nfkd: "\u{30D2}\u{309A}\u{30A2}\u{30B9}\u{30C8}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{332F}",
-        nfc: "\u{332F}",
-        nfd: "\u{332F}",
-        nfkc: "\u{30D4}\u{30AF}\u{30EB}",
-        nfkd: "\u{30D2}\u{309A}\u{30AF}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3330}",
-        nfc: "\u{3330}",
-        nfd: "\u{3330}",
-        nfkc: "\u{30D4}\u{30B3}",
-        nfkd: "\u{30D2}\u{309A}\u{30B3}",
-    },
-    NormalizationTest {
-        source: "\u{3331}",
-        nfc: "\u{3331}",
-        nfd: "\u{3331}",
-        nfkc: "\u{30D3}\u{30EB}",
-        nfkd: "\u{30D2}\u{3099}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3332}",
-        nfc: "\u{3332}",
-        nfd: "\u{3332}",
-        nfkc: "\u{30D5}\u{30A1}\u{30E9}\u{30C3}\u{30C9}",
-        nfkd: "\u{30D5}\u{30A1}\u{30E9}\u{30C3}\u{30C8}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3333}",
-        nfc: "\u{3333}",
-        nfd: "\u{3333}",
-        nfkc: "\u{30D5}\u{30A3}\u{30FC}\u{30C8}",
-        nfkd: "\u{30D5}\u{30A3}\u{30FC}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{3334}",
-        nfc: "\u{3334}",
-        nfd: "\u{3334}",
-        nfkc: "\u{30D6}\u{30C3}\u{30B7}\u{30A7}\u{30EB}",
-        nfkd: "\u{30D5}\u{3099}\u{30C3}\u{30B7}\u{30A7}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3335}",
-        nfc: "\u{3335}",
-        nfd: "\u{3335}",
-        nfkc: "\u{30D5}\u{30E9}\u{30F3}",
-        nfkd: "\u{30D5}\u{30E9}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3336}",
-        nfc: "\u{3336}",
-        nfd: "\u{3336}",
-        nfkc: "\u{30D8}\u{30AF}\u{30BF}\u{30FC}\u{30EB}",
-        nfkd: "\u{30D8}\u{30AF}\u{30BF}\u{30FC}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3337}",
-        nfc: "\u{3337}",
-        nfd: "\u{3337}",
-        nfkc: "\u{30DA}\u{30BD}",
-        nfkd: "\u{30D8}\u{309A}\u{30BD}",
-    },
-    NormalizationTest {
-        source: "\u{3338}",
-        nfc: "\u{3338}",
-        nfd: "\u{3338}",
-        nfkc: "\u{30DA}\u{30CB}\u{30D2}",
-        nfkd: "\u{30D8}\u{309A}\u{30CB}\u{30D2}",
-    },
-    NormalizationTest {
-        source: "\u{3339}",
-        nfc: "\u{3339}",
-        nfd: "\u{3339}",
-        nfkc: "\u{30D8}\u{30EB}\u{30C4}",
-        nfkd: "\u{30D8}\u{30EB}\u{30C4}",
-    },
-    NormalizationTest {
-        source: "\u{333A}",
-        nfc: "\u{333A}",
-        nfd: "\u{333A}",
-        nfkc: "\u{30DA}\u{30F3}\u{30B9}",
-        nfkd: "\u{30D8}\u{309A}\u{30F3}\u{30B9}",
-    },
-    NormalizationTest {
-        source: "\u{333B}",
-        nfc: "\u{333B}",
-        nfd: "\u{333B}",
-        nfkc: "\u{30DA}\u{30FC}\u{30B8}",
-        nfkd: "\u{30D8}\u{309A}\u{30FC}\u{30B7}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{333C}",
-        nfc: "\u{333C}",
-        nfd: "\u{333C}",
-        nfkc: "\u{30D9}\u{30FC}\u{30BF}",
-        nfkd: "\u{30D8}\u{3099}\u{30FC}\u{30BF}",
-    },
-    NormalizationTest {
-        source: "\u{333D}",
-        nfc: "\u{333D}",
-        nfd: "\u{333D}",
-        nfkc: "\u{30DD}\u{30A4}\u{30F3}\u{30C8}",
-        nfkd: "\u{30DB}\u{309A}\u{30A4}\u{30F3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{333E}",
-        nfc: "\u{333E}",
-        nfd: "\u{333E}",
-        nfkc: "\u{30DC}\u{30EB}\u{30C8}",
-        nfkd: "\u{30DB}\u{3099}\u{30EB}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{333F}",
-        nfc: "\u{333F}",
-        nfd: "\u{333F}",
-        nfkc: "\u{30DB}\u{30F3}",
-        nfkd: "\u{30DB}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3340}",
-        nfc: "\u{3340}",
-        nfd: "\u{3340}",
-        nfkc: "\u{30DD}\u{30F3}\u{30C9}",
-        nfkd: "\u{30DB}\u{309A}\u{30F3}\u{30C8}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{3341}",
-        nfc: "\u{3341}",
-        nfd: "\u{3341}",
-        nfkc: "\u{30DB}\u{30FC}\u{30EB}",
-        nfkd: "\u{30DB}\u{30FC}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3342}",
-        nfc: "\u{3342}",
-        nfd: "\u{3342}",
-        nfkc: "\u{30DB}\u{30FC}\u{30F3}",
-        nfkd: "\u{30DB}\u{30FC}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3343}",
-        nfc: "\u{3343}",
-        nfd: "\u{3343}",
-        nfkc: "\u{30DE}\u{30A4}\u{30AF}\u{30ED}",
-        nfkd: "\u{30DE}\u{30A4}\u{30AF}\u{30ED}",
-    },
-    NormalizationTest {
-        source: "\u{3344}",
-        nfc: "\u{3344}",
-        nfd: "\u{3344}",
-        nfkc: "\u{30DE}\u{30A4}\u{30EB}",
-        nfkd: "\u{30DE}\u{30A4}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3345}",
-        nfc: "\u{3345}",
-        nfd: "\u{3345}",
-        nfkc: "\u{30DE}\u{30C3}\u{30CF}",
-        nfkd: "\u{30DE}\u{30C3}\u{30CF}",
-    },
-    NormalizationTest {
-        source: "\u{3346}",
-        nfc: "\u{3346}",
-        nfd: "\u{3346}",
-        nfkc: "\u{30DE}\u{30EB}\u{30AF}",
-        nfkd: "\u{30DE}\u{30EB}\u{30AF}",
-    },
-    NormalizationTest {
-        source: "\u{3347}",
-        nfc: "\u{3347}",
-        nfd: "\u{3347}",
-        nfkc: "\u{30DE}\u{30F3}\u{30B7}\u{30E7}\u{30F3}",
-        nfkd: "\u{30DE}\u{30F3}\u{30B7}\u{30E7}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3348}",
-        nfc: "\u{3348}",
-        nfd: "\u{3348}",
-        nfkc: "\u{30DF}\u{30AF}\u{30ED}\u{30F3}",
-        nfkd: "\u{30DF}\u{30AF}\u{30ED}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3349}",
-        nfc: "\u{3349}",
-        nfd: "\u{3349}",
-        nfkc: "\u{30DF}\u{30EA}",
-        nfkd: "\u{30DF}\u{30EA}",
-    },
-    NormalizationTest {
-        source: "\u{334A}",
-        nfc: "\u{334A}",
-        nfd: "\u{334A}",
-        nfkc: "\u{30DF}\u{30EA}\u{30D0}\u{30FC}\u{30EB}",
-        nfkd: "\u{30DF}\u{30EA}\u{30CF}\u{3099}\u{30FC}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{334B}",
-        nfc: "\u{334B}",
-        nfd: "\u{334B}",
-        nfkc: "\u{30E1}\u{30AC}",
-        nfkd: "\u{30E1}\u{30AB}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{334C}",
-        nfc: "\u{334C}",
-        nfd: "\u{334C}",
-        nfkc: "\u{30E1}\u{30AC}\u{30C8}\u{30F3}",
-        nfkd: "\u{30E1}\u{30AB}\u{3099}\u{30C8}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{334D}",
-        nfc: "\u{334D}",
-        nfd: "\u{334D}",
-        nfkc: "\u{30E1}\u{30FC}\u{30C8}\u{30EB}",
-        nfkd: "\u{30E1}\u{30FC}\u{30C8}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{334E}",
-        nfc: "\u{334E}",
-        nfd: "\u{334E}",
-        nfkc: "\u{30E4}\u{30FC}\u{30C9}",
-        nfkd: "\u{30E4}\u{30FC}\u{30C8}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{334F}",
-        nfc: "\u{334F}",
-        nfd: "\u{334F}",
-        nfkc: "\u{30E4}\u{30FC}\u{30EB}",
-        nfkd: "\u{30E4}\u{30FC}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3350}",
-        nfc: "\u{3350}",
-        nfd: "\u{3350}",
-        nfkc: "\u{30E6}\u{30A2}\u{30F3}",
-        nfkd: "\u{30E6}\u{30A2}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3351}",
-        nfc: "\u{3351}",
-        nfd: "\u{3351}",
-        nfkc: "\u{30EA}\u{30C3}\u{30C8}\u{30EB}",
-        nfkd: "\u{30EA}\u{30C3}\u{30C8}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3352}",
-        nfc: "\u{3352}",
-        nfd: "\u{3352}",
-        nfkc: "\u{30EA}\u{30E9}",
-        nfkd: "\u{30EA}\u{30E9}",
-    },
-    NormalizationTest {
-        source: "\u{3353}",
-        nfc: "\u{3353}",
-        nfd: "\u{3353}",
-        nfkc: "\u{30EB}\u{30D4}\u{30FC}",
-        nfkd: "\u{30EB}\u{30D2}\u{309A}\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{3354}",
-        nfc: "\u{3354}",
-        nfd: "\u{3354}",
-        nfkc: "\u{30EB}\u{30FC}\u{30D6}\u{30EB}",
-        nfkd: "\u{30EB}\u{30FC}\u{30D5}\u{3099}\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{3355}",
-        nfc: "\u{3355}",
-        nfd: "\u{3355}",
-        nfkc: "\u{30EC}\u{30E0}",
-        nfkd: "\u{30EC}\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{3356}",
-        nfc: "\u{3356}",
-        nfd: "\u{3356}",
-        nfkc: "\u{30EC}\u{30F3}\u{30C8}\u{30B2}\u{30F3}",
-        nfkd: "\u{30EC}\u{30F3}\u{30C8}\u{30B1}\u{3099}\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{3357}",
-        nfc: "\u{3357}",
-        nfd: "\u{3357}",
-        nfkc: "\u{30EF}\u{30C3}\u{30C8}",
-        nfkd: "\u{30EF}\u{30C3}\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{3358}",
-        nfc: "\u{3358}",
-        nfd: "\u{3358}",
-        nfkc: "\u{0030}\u{70B9}",
-        nfkd: "\u{0030}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3359}",
-        nfc: "\u{3359}",
-        nfd: "\u{3359}",
-        nfkc: "\u{0031}\u{70B9}",
-        nfkd: "\u{0031}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{335A}",
-        nfc: "\u{335A}",
-        nfd: "\u{335A}",
-        nfkc: "\u{0032}\u{70B9}",
-        nfkd: "\u{0032}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{335B}",
-        nfc: "\u{335B}",
-        nfd: "\u{335B}",
-        nfkc: "\u{0033}\u{70B9}",
-        nfkd: "\u{0033}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{335C}",
-        nfc: "\u{335C}",
-        nfd: "\u{335C}",
-        nfkc: "\u{0034}\u{70B9}",
-        nfkd: "\u{0034}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{335D}",
-        nfc: "\u{335D}",
-        nfd: "\u{335D}",
-        nfkc: "\u{0035}\u{70B9}",
-        nfkd: "\u{0035}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{335E}",
-        nfc: "\u{335E}",
-        nfd: "\u{335E}",
-        nfkc: "\u{0036}\u{70B9}",
-        nfkd: "\u{0036}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{335F}",
-        nfc: "\u{335F}",
-        nfd: "\u{335F}",
-        nfkc: "\u{0037}\u{70B9}",
-        nfkd: "\u{0037}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3360}",
-        nfc: "\u{3360}",
-        nfd: "\u{3360}",
-        nfkc: "\u{0038}\u{70B9}",
-        nfkd: "\u{0038}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3361}",
-        nfc: "\u{3361}",
-        nfd: "\u{3361}",
-        nfkc: "\u{0039}\u{70B9}",
-        nfkd: "\u{0039}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3362}",
-        nfc: "\u{3362}",
-        nfd: "\u{3362}",
-        nfkc: "\u{0031}\u{0030}\u{70B9}",
-        nfkd: "\u{0031}\u{0030}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3363}",
-        nfc: "\u{3363}",
-        nfd: "\u{3363}",
-        nfkc: "\u{0031}\u{0031}\u{70B9}",
-        nfkd: "\u{0031}\u{0031}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3364}",
-        nfc: "\u{3364}",
-        nfd: "\u{3364}",
-        nfkc: "\u{0031}\u{0032}\u{70B9}",
-        nfkd: "\u{0031}\u{0032}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3365}",
-        nfc: "\u{3365}",
-        nfd: "\u{3365}",
-        nfkc: "\u{0031}\u{0033}\u{70B9}",
-        nfkd: "\u{0031}\u{0033}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3366}",
-        nfc: "\u{3366}",
-        nfd: "\u{3366}",
-        nfkc: "\u{0031}\u{0034}\u{70B9}",
-        nfkd: "\u{0031}\u{0034}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3367}",
-        nfc: "\u{3367}",
-        nfd: "\u{3367}",
-        nfkc: "\u{0031}\u{0035}\u{70B9}",
-        nfkd: "\u{0031}\u{0035}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3368}",
-        nfc: "\u{3368}",
-        nfd: "\u{3368}",
-        nfkc: "\u{0031}\u{0036}\u{70B9}",
-        nfkd: "\u{0031}\u{0036}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3369}",
-        nfc: "\u{3369}",
-        nfd: "\u{3369}",
-        nfkc: "\u{0031}\u{0037}\u{70B9}",
-        nfkd: "\u{0031}\u{0037}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{336A}",
-        nfc: "\u{336A}",
-        nfd: "\u{336A}",
-        nfkc: "\u{0031}\u{0038}\u{70B9}",
-        nfkd: "\u{0031}\u{0038}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{336B}",
-        nfc: "\u{336B}",
-        nfd: "\u{336B}",
-        nfkc: "\u{0031}\u{0039}\u{70B9}",
-        nfkd: "\u{0031}\u{0039}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{336C}",
-        nfc: "\u{336C}",
-        nfd: "\u{336C}",
-        nfkc: "\u{0032}\u{0030}\u{70B9}",
-        nfkd: "\u{0032}\u{0030}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{336D}",
-        nfc: "\u{336D}",
-        nfd: "\u{336D}",
-        nfkc: "\u{0032}\u{0031}\u{70B9}",
-        nfkd: "\u{0032}\u{0031}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{336E}",
-        nfc: "\u{336E}",
-        nfd: "\u{336E}",
-        nfkc: "\u{0032}\u{0032}\u{70B9}",
-        nfkd: "\u{0032}\u{0032}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{336F}",
-        nfc: "\u{336F}",
-        nfd: "\u{336F}",
-        nfkc: "\u{0032}\u{0033}\u{70B9}",
-        nfkd: "\u{0032}\u{0033}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3370}",
-        nfc: "\u{3370}",
-        nfd: "\u{3370}",
-        nfkc: "\u{0032}\u{0034}\u{70B9}",
-        nfkd: "\u{0032}\u{0034}\u{70B9}",
-    },
-    NormalizationTest {
-        source: "\u{3371}",
-        nfc: "\u{3371}",
-        nfd: "\u{3371}",
-        nfkc: "\u{0068}\u{0050}\u{0061}",
-        nfkd: "\u{0068}\u{0050}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{3372}",
-        nfc: "\u{3372}",
-        nfd: "\u{3372}",
-        nfkc: "\u{0064}\u{0061}",
-        nfkd: "\u{0064}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{3373}",
-        nfc: "\u{3373}",
-        nfd: "\u{3373}",
-        nfkc: "\u{0041}\u{0055}",
-        nfkd: "\u{0041}\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{3374}",
-        nfc: "\u{3374}",
-        nfd: "\u{3374}",
-        nfkc: "\u{0062}\u{0061}\u{0072}",
-        nfkd: "\u{0062}\u{0061}\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{3375}",
-        nfc: "\u{3375}",
-        nfd: "\u{3375}",
-        nfkc: "\u{006F}\u{0056}",
-        nfkd: "\u{006F}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{3376}",
-        nfc: "\u{3376}",
-        nfd: "\u{3376}",
-        nfkc: "\u{0070}\u{0063}",
-        nfkd: "\u{0070}\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{3377}",
-        nfc: "\u{3377}",
-        nfd: "\u{3377}",
-        nfkc: "\u{0064}\u{006D}",
-        nfkd: "\u{0064}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{3378}",
-        nfc: "\u{3378}",
-        nfd: "\u{3378}",
-        nfkc: "\u{0064}\u{006D}\u{0032}",
-        nfkd: "\u{0064}\u{006D}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{3379}",
-        nfc: "\u{3379}",
-        nfd: "\u{3379}",
-        nfkc: "\u{0064}\u{006D}\u{0033}",
-        nfkd: "\u{0064}\u{006D}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{337A}",
-        nfc: "\u{337A}",
-        nfd: "\u{337A}",
-        nfkc: "\u{0049}\u{0055}",
-        nfkd: "\u{0049}\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{337B}",
-        nfc: "\u{337B}",
-        nfd: "\u{337B}",
-        nfkc: "\u{5E73}\u{6210}",
-        nfkd: "\u{5E73}\u{6210}",
-    },
-    NormalizationTest {
-        source: "\u{337C}",
-        nfc: "\u{337C}",
-        nfd: "\u{337C}",
-        nfkc: "\u{662D}\u{548C}",
-        nfkd: "\u{662D}\u{548C}",
-    },
-    NormalizationTest {
-        source: "\u{337D}",
-        nfc: "\u{337D}",
-        nfd: "\u{337D}",
-        nfkc: "\u{5927}\u{6B63}",
-        nfkd: "\u{5927}\u{6B63}",
-    },
-    NormalizationTest {
-        source: "\u{337E}",
-        nfc: "\u{337E}",
-        nfd: "\u{337E}",
-        nfkc: "\u{660E}\u{6CBB}",
-        nfkd: "\u{660E}\u{6CBB}",
-    },
-    NormalizationTest {
-        source: "\u{337F}",
-        nfc: "\u{337F}",
-        nfd: "\u{337F}",
-        nfkc: "\u{682A}\u{5F0F}\u{4F1A}\u{793E}",
-        nfkd: "\u{682A}\u{5F0F}\u{4F1A}\u{793E}",
-    },
-    NormalizationTest {
-        source: "\u{3380}",
-        nfc: "\u{3380}",
-        nfd: "\u{3380}",
-        nfkc: "\u{0070}\u{0041}",
-        nfkd: "\u{0070}\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{3381}",
-        nfc: "\u{3381}",
-        nfd: "\u{3381}",
-        nfkc: "\u{006E}\u{0041}",
-        nfkd: "\u{006E}\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{3382}",
-        nfc: "\u{3382}",
-        nfd: "\u{3382}",
-        nfkc: "\u{03BC}\u{0041}",
-        nfkd: "\u{03BC}\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{3383}",
-        nfc: "\u{3383}",
-        nfd: "\u{3383}",
-        nfkc: "\u{006D}\u{0041}",
-        nfkd: "\u{006D}\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{3384}",
-        nfc: "\u{3384}",
-        nfd: "\u{3384}",
-        nfkc: "\u{006B}\u{0041}",
-        nfkd: "\u{006B}\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{3385}",
-        nfc: "\u{3385}",
-        nfd: "\u{3385}",
-        nfkc: "\u{004B}\u{0042}",
-        nfkd: "\u{004B}\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{3386}",
-        nfc: "\u{3386}",
-        nfd: "\u{3386}",
-        nfkc: "\u{004D}\u{0042}",
-        nfkd: "\u{004D}\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{3387}",
-        nfc: "\u{3387}",
-        nfd: "\u{3387}",
-        nfkc: "\u{0047}\u{0042}",
-        nfkd: "\u{0047}\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{3388}",
-        nfc: "\u{3388}",
-        nfd: "\u{3388}",
-        nfkc: "\u{0063}\u{0061}\u{006C}",
-        nfkd: "\u{0063}\u{0061}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{3389}",
-        nfc: "\u{3389}",
-        nfd: "\u{3389}",
-        nfkc: "\u{006B}\u{0063}\u{0061}\u{006C}",
-        nfkd: "\u{006B}\u{0063}\u{0061}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{338A}",
-        nfc: "\u{338A}",
-        nfd: "\u{338A}",
-        nfkc: "\u{0070}\u{0046}",
-        nfkd: "\u{0070}\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{338B}",
-        nfc: "\u{338B}",
-        nfd: "\u{338B}",
-        nfkc: "\u{006E}\u{0046}",
-        nfkd: "\u{006E}\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{338C}",
-        nfc: "\u{338C}",
-        nfd: "\u{338C}",
-        nfkc: "\u{03BC}\u{0046}",
-        nfkd: "\u{03BC}\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{338D}",
-        nfc: "\u{338D}",
-        nfd: "\u{338D}",
-        nfkc: "\u{03BC}\u{0067}",
-        nfkd: "\u{03BC}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{338E}",
-        nfc: "\u{338E}",
-        nfd: "\u{338E}",
-        nfkc: "\u{006D}\u{0067}",
-        nfkd: "\u{006D}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{338F}",
-        nfc: "\u{338F}",
-        nfd: "\u{338F}",
-        nfkc: "\u{006B}\u{0067}",
-        nfkd: "\u{006B}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{3390}",
-        nfc: "\u{3390}",
-        nfd: "\u{3390}",
-        nfkc: "\u{0048}\u{007A}",
-        nfkd: "\u{0048}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{3391}",
-        nfc: "\u{3391}",
-        nfd: "\u{3391}",
-        nfkc: "\u{006B}\u{0048}\u{007A}",
-        nfkd: "\u{006B}\u{0048}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{3392}",
-        nfc: "\u{3392}",
-        nfd: "\u{3392}",
-        nfkc: "\u{004D}\u{0048}\u{007A}",
-        nfkd: "\u{004D}\u{0048}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{3393}",
-        nfc: "\u{3393}",
-        nfd: "\u{3393}",
-        nfkc: "\u{0047}\u{0048}\u{007A}",
-        nfkd: "\u{0047}\u{0048}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{3394}",
-        nfc: "\u{3394}",
-        nfd: "\u{3394}",
-        nfkc: "\u{0054}\u{0048}\u{007A}",
-        nfkd: "\u{0054}\u{0048}\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{3395}",
-        nfc: "\u{3395}",
-        nfd: "\u{3395}",
-        nfkc: "\u{03BC}\u{006C}",
-        nfkd: "\u{03BC}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{3396}",
-        nfc: "\u{3396}",
-        nfd: "\u{3396}",
-        nfkc: "\u{006D}\u{006C}",
-        nfkd: "\u{006D}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{3397}",
-        nfc: "\u{3397}",
-        nfd: "\u{3397}",
-        nfkc: "\u{0064}\u{006C}",
-        nfkd: "\u{0064}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{3398}",
-        nfc: "\u{3398}",
-        nfd: "\u{3398}",
-        nfkc: "\u{006B}\u{006C}",
-        nfkd: "\u{006B}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{3399}",
-        nfc: "\u{3399}",
-        nfd: "\u{3399}",
-        nfkc: "\u{0066}\u{006D}",
-        nfkd: "\u{0066}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{339A}",
-        nfc: "\u{339A}",
-        nfd: "\u{339A}",
-        nfkc: "\u{006E}\u{006D}",
-        nfkd: "\u{006E}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{339B}",
-        nfc: "\u{339B}",
-        nfd: "\u{339B}",
-        nfkc: "\u{03BC}\u{006D}",
-        nfkd: "\u{03BC}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{339C}",
-        nfc: "\u{339C}",
-        nfd: "\u{339C}",
-        nfkc: "\u{006D}\u{006D}",
-        nfkd: "\u{006D}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{339D}",
-        nfc: "\u{339D}",
-        nfd: "\u{339D}",
-        nfkc: "\u{0063}\u{006D}",
-        nfkd: "\u{0063}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{339E}",
-        nfc: "\u{339E}",
-        nfd: "\u{339E}",
-        nfkc: "\u{006B}\u{006D}",
-        nfkd: "\u{006B}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{339F}",
-        nfc: "\u{339F}",
-        nfd: "\u{339F}",
-        nfkc: "\u{006D}\u{006D}\u{0032}",
-        nfkd: "\u{006D}\u{006D}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{33A0}",
-        nfc: "\u{33A0}",
-        nfd: "\u{33A0}",
-        nfkc: "\u{0063}\u{006D}\u{0032}",
-        nfkd: "\u{0063}\u{006D}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{33A1}",
-        nfc: "\u{33A1}",
-        nfd: "\u{33A1}",
-        nfkc: "\u{006D}\u{0032}",
-        nfkd: "\u{006D}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{33A2}",
-        nfc: "\u{33A2}",
-        nfd: "\u{33A2}",
-        nfkc: "\u{006B}\u{006D}\u{0032}",
-        nfkd: "\u{006B}\u{006D}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{33A3}",
-        nfc: "\u{33A3}",
-        nfd: "\u{33A3}",
-        nfkc: "\u{006D}\u{006D}\u{0033}",
-        nfkd: "\u{006D}\u{006D}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{33A4}",
-        nfc: "\u{33A4}",
-        nfd: "\u{33A4}",
-        nfkc: "\u{0063}\u{006D}\u{0033}",
-        nfkd: "\u{0063}\u{006D}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{33A5}",
-        nfc: "\u{33A5}",
-        nfd: "\u{33A5}",
-        nfkc: "\u{006D}\u{0033}",
-        nfkd: "\u{006D}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{33A6}",
-        nfc: "\u{33A6}",
-        nfd: "\u{33A6}",
-        nfkc: "\u{006B}\u{006D}\u{0033}",
-        nfkd: "\u{006B}\u{006D}\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{33A7}",
-        nfc: "\u{33A7}",
-        nfd: "\u{33A7}",
-        nfkc: "\u{006D}\u{2215}\u{0073}",
-        nfkd: "\u{006D}\u{2215}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{33A8}",
-        nfc: "\u{33A8}",
-        nfd: "\u{33A8}",
-        nfkc: "\u{006D}\u{2215}\u{0073}\u{0032}",
-        nfkd: "\u{006D}\u{2215}\u{0073}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{33A9}",
-        nfc: "\u{33A9}",
-        nfd: "\u{33A9}",
-        nfkc: "\u{0050}\u{0061}",
-        nfkd: "\u{0050}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{33AA}",
-        nfc: "\u{33AA}",
-        nfd: "\u{33AA}",
-        nfkc: "\u{006B}\u{0050}\u{0061}",
-        nfkd: "\u{006B}\u{0050}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{33AB}",
-        nfc: "\u{33AB}",
-        nfd: "\u{33AB}",
-        nfkc: "\u{004D}\u{0050}\u{0061}",
-        nfkd: "\u{004D}\u{0050}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{33AC}",
-        nfc: "\u{33AC}",
-        nfd: "\u{33AC}",
-        nfkc: "\u{0047}\u{0050}\u{0061}",
-        nfkd: "\u{0047}\u{0050}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{33AD}",
-        nfc: "\u{33AD}",
-        nfd: "\u{33AD}",
-        nfkc: "\u{0072}\u{0061}\u{0064}",
-        nfkd: "\u{0072}\u{0061}\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{33AE}",
-        nfc: "\u{33AE}",
-        nfd: "\u{33AE}",
-        nfkc: "\u{0072}\u{0061}\u{0064}\u{2215}\u{0073}",
-        nfkd: "\u{0072}\u{0061}\u{0064}\u{2215}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{33AF}",
-        nfc: "\u{33AF}",
-        nfd: "\u{33AF}",
-        nfkc: "\u{0072}\u{0061}\u{0064}\u{2215}\u{0073}\u{0032}",
-        nfkd: "\u{0072}\u{0061}\u{0064}\u{2215}\u{0073}\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{33B0}",
-        nfc: "\u{33B0}",
-        nfd: "\u{33B0}",
-        nfkc: "\u{0070}\u{0073}",
-        nfkd: "\u{0070}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{33B1}",
-        nfc: "\u{33B1}",
-        nfd: "\u{33B1}",
-        nfkc: "\u{006E}\u{0073}",
-        nfkd: "\u{006E}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{33B2}",
-        nfc: "\u{33B2}",
-        nfd: "\u{33B2}",
-        nfkc: "\u{03BC}\u{0073}",
-        nfkd: "\u{03BC}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{33B3}",
-        nfc: "\u{33B3}",
-        nfd: "\u{33B3}",
-        nfkc: "\u{006D}\u{0073}",
-        nfkd: "\u{006D}\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{33B4}",
-        nfc: "\u{33B4}",
-        nfd: "\u{33B4}",
-        nfkc: "\u{0070}\u{0056}",
-        nfkd: "\u{0070}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{33B5}",
-        nfc: "\u{33B5}",
-        nfd: "\u{33B5}",
-        nfkc: "\u{006E}\u{0056}",
-        nfkd: "\u{006E}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{33B6}",
-        nfc: "\u{33B6}",
-        nfd: "\u{33B6}",
-        nfkc: "\u{03BC}\u{0056}",
-        nfkd: "\u{03BC}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{33B7}",
-        nfc: "\u{33B7}",
-        nfd: "\u{33B7}",
-        nfkc: "\u{006D}\u{0056}",
-        nfkd: "\u{006D}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{33B8}",
-        nfc: "\u{33B8}",
-        nfd: "\u{33B8}",
-        nfkc: "\u{006B}\u{0056}",
-        nfkd: "\u{006B}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{33B9}",
-        nfc: "\u{33B9}",
-        nfd: "\u{33B9}",
-        nfkc: "\u{004D}\u{0056}",
-        nfkd: "\u{004D}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{33BA}",
-        nfc: "\u{33BA}",
-        nfd: "\u{33BA}",
-        nfkc: "\u{0070}\u{0057}",
-        nfkd: "\u{0070}\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{33BB}",
-        nfc: "\u{33BB}",
-        nfd: "\u{33BB}",
-        nfkc: "\u{006E}\u{0057}",
-        nfkd: "\u{006E}\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{33BC}",
-        nfc: "\u{33BC}",
-        nfd: "\u{33BC}",
-        nfkc: "\u{03BC}\u{0057}",
-        nfkd: "\u{03BC}\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{33BD}",
-        nfc: "\u{33BD}",
-        nfd: "\u{33BD}",
-        nfkc: "\u{006D}\u{0057}",
-        nfkd: "\u{006D}\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{33BE}",
-        nfc: "\u{33BE}",
-        nfd: "\u{33BE}",
-        nfkc: "\u{006B}\u{0057}",
-        nfkd: "\u{006B}\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{33BF}",
-        nfc: "\u{33BF}",
-        nfd: "\u{33BF}",
-        nfkc: "\u{004D}\u{0057}",
-        nfkd: "\u{004D}\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{33C0}",
-        nfc: "\u{33C0}",
-        nfd: "\u{33C0}",
-        nfkc: "\u{006B}\u{03A9}",
-        nfkd: "\u{006B}\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{33C1}",
-        nfc: "\u{33C1}",
-        nfd: "\u{33C1}",
-        nfkc: "\u{004D}\u{03A9}",
-        nfkd: "\u{004D}\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{33C2}",
-        nfc: "\u{33C2}",
-        nfd: "\u{33C2}",
-        nfkc: "\u{0061}\u{002E}\u{006D}\u{002E}",
-        nfkd: "\u{0061}\u{002E}\u{006D}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{33C3}",
-        nfc: "\u{33C3}",
-        nfd: "\u{33C3}",
-        nfkc: "\u{0042}\u{0071}",
-        nfkd: "\u{0042}\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{33C4}",
-        nfc: "\u{33C4}",
-        nfd: "\u{33C4}",
-        nfkc: "\u{0063}\u{0063}",
-        nfkd: "\u{0063}\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{33C5}",
-        nfc: "\u{33C5}",
-        nfd: "\u{33C5}",
-        nfkc: "\u{0063}\u{0064}",
-        nfkd: "\u{0063}\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{33C6}",
-        nfc: "\u{33C6}",
-        nfd: "\u{33C6}",
-        nfkc: "\u{0043}\u{2215}\u{006B}\u{0067}",
-        nfkd: "\u{0043}\u{2215}\u{006B}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{33C7}",
-        nfc: "\u{33C7}",
-        nfd: "\u{33C7}",
-        nfkc: "\u{0043}\u{006F}\u{002E}",
-        nfkd: "\u{0043}\u{006F}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{33C8}",
-        nfc: "\u{33C8}",
-        nfd: "\u{33C8}",
-        nfkc: "\u{0064}\u{0042}",
-        nfkd: "\u{0064}\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{33C9}",
-        nfc: "\u{33C9}",
-        nfd: "\u{33C9}",
-        nfkc: "\u{0047}\u{0079}",
-        nfkd: "\u{0047}\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{33CA}",
-        nfc: "\u{33CA}",
-        nfd: "\u{33CA}",
-        nfkc: "\u{0068}\u{0061}",
-        nfkd: "\u{0068}\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{33CB}",
-        nfc: "\u{33CB}",
-        nfd: "\u{33CB}",
-        nfkc: "\u{0048}\u{0050}",
-        nfkd: "\u{0048}\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{33CC}",
-        nfc: "\u{33CC}",
-        nfd: "\u{33CC}",
-        nfkc: "\u{0069}\u{006E}",
-        nfkd: "\u{0069}\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{33CD}",
-        nfc: "\u{33CD}",
-        nfd: "\u{33CD}",
-        nfkc: "\u{004B}\u{004B}",
-        nfkd: "\u{004B}\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{33CE}",
-        nfc: "\u{33CE}",
-        nfd: "\u{33CE}",
-        nfkc: "\u{004B}\u{004D}",
-        nfkd: "\u{004B}\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{33CF}",
-        nfc: "\u{33CF}",
-        nfd: "\u{33CF}",
-        nfkc: "\u{006B}\u{0074}",
-        nfkd: "\u{006B}\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{33D0}",
-        nfc: "\u{33D0}",
-        nfd: "\u{33D0}",
-        nfkc: "\u{006C}\u{006D}",
-        nfkd: "\u{006C}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{33D1}",
-        nfc: "\u{33D1}",
-        nfd: "\u{33D1}",
-        nfkc: "\u{006C}\u{006E}",
-        nfkd: "\u{006C}\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{33D2}",
-        nfc: "\u{33D2}",
-        nfd: "\u{33D2}",
-        nfkc: "\u{006C}\u{006F}\u{0067}",
-        nfkd: "\u{006C}\u{006F}\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{33D3}",
-        nfc: "\u{33D3}",
-        nfd: "\u{33D3}",
-        nfkc: "\u{006C}\u{0078}",
-        nfkd: "\u{006C}\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{33D4}",
-        nfc: "\u{33D4}",
-        nfd: "\u{33D4}",
-        nfkc: "\u{006D}\u{0062}",
-        nfkd: "\u{006D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{33D5}",
-        nfc: "\u{33D5}",
-        nfd: "\u{33D5}",
-        nfkc: "\u{006D}\u{0069}\u{006C}",
-        nfkd: "\u{006D}\u{0069}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{33D6}",
-        nfc: "\u{33D6}",
-        nfd: "\u{33D6}",
-        nfkc: "\u{006D}\u{006F}\u{006C}",
-        nfkd: "\u{006D}\u{006F}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{33D7}",
-        nfc: "\u{33D7}",
-        nfd: "\u{33D7}",
-        nfkc: "\u{0050}\u{0048}",
-        nfkd: "\u{0050}\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{33D8}",
-        nfc: "\u{33D8}",
-        nfd: "\u{33D8}",
-        nfkc: "\u{0070}\u{002E}\u{006D}\u{002E}",
-        nfkd: "\u{0070}\u{002E}\u{006D}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{33D9}",
-        nfc: "\u{33D9}",
-        nfd: "\u{33D9}",
-        nfkc: "\u{0050}\u{0050}\u{004D}",
-        nfkd: "\u{0050}\u{0050}\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{33DA}",
-        nfc: "\u{33DA}",
-        nfd: "\u{33DA}",
-        nfkc: "\u{0050}\u{0052}",
-        nfkd: "\u{0050}\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{33DB}",
-        nfc: "\u{33DB}",
-        nfd: "\u{33DB}",
-        nfkc: "\u{0073}\u{0072}",
-        nfkd: "\u{0073}\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{33DC}",
-        nfc: "\u{33DC}",
-        nfd: "\u{33DC}",
-        nfkc: "\u{0053}\u{0076}",
-        nfkd: "\u{0053}\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{33DD}",
-        nfc: "\u{33DD}",
-        nfd: "\u{33DD}",
-        nfkc: "\u{0057}\u{0062}",
-        nfkd: "\u{0057}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{33DE}",
-        nfc: "\u{33DE}",
-        nfd: "\u{33DE}",
-        nfkc: "\u{0056}\u{2215}\u{006D}",
-        nfkd: "\u{0056}\u{2215}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{33DF}",
-        nfc: "\u{33DF}",
-        nfd: "\u{33DF}",
-        nfkc: "\u{0041}\u{2215}\u{006D}",
-        nfkd: "\u{0041}\u{2215}\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{33E0}",
-        nfc: "\u{33E0}",
-        nfd: "\u{33E0}",
-        nfkc: "\u{0031}\u{65E5}",
-        nfkd: "\u{0031}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E1}",
-        nfc: "\u{33E1}",
-        nfd: "\u{33E1}",
-        nfkc: "\u{0032}\u{65E5}",
-        nfkd: "\u{0032}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E2}",
-        nfc: "\u{33E2}",
-        nfd: "\u{33E2}",
-        nfkc: "\u{0033}\u{65E5}",
-        nfkd: "\u{0033}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E3}",
-        nfc: "\u{33E3}",
-        nfd: "\u{33E3}",
-        nfkc: "\u{0034}\u{65E5}",
-        nfkd: "\u{0034}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E4}",
-        nfc: "\u{33E4}",
-        nfd: "\u{33E4}",
-        nfkc: "\u{0035}\u{65E5}",
-        nfkd: "\u{0035}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E5}",
-        nfc: "\u{33E5}",
-        nfd: "\u{33E5}",
-        nfkc: "\u{0036}\u{65E5}",
-        nfkd: "\u{0036}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E6}",
-        nfc: "\u{33E6}",
-        nfd: "\u{33E6}",
-        nfkc: "\u{0037}\u{65E5}",
-        nfkd: "\u{0037}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E7}",
-        nfc: "\u{33E7}",
-        nfd: "\u{33E7}",
-        nfkc: "\u{0038}\u{65E5}",
-        nfkd: "\u{0038}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E8}",
-        nfc: "\u{33E8}",
-        nfd: "\u{33E8}",
-        nfkc: "\u{0039}\u{65E5}",
-        nfkd: "\u{0039}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33E9}",
-        nfc: "\u{33E9}",
-        nfd: "\u{33E9}",
-        nfkc: "\u{0031}\u{0030}\u{65E5}",
-        nfkd: "\u{0031}\u{0030}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33EA}",
-        nfc: "\u{33EA}",
-        nfd: "\u{33EA}",
-        nfkc: "\u{0031}\u{0031}\u{65E5}",
-        nfkd: "\u{0031}\u{0031}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33EB}",
-        nfc: "\u{33EB}",
-        nfd: "\u{33EB}",
-        nfkc: "\u{0031}\u{0032}\u{65E5}",
-        nfkd: "\u{0031}\u{0032}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33EC}",
-        nfc: "\u{33EC}",
-        nfd: "\u{33EC}",
-        nfkc: "\u{0031}\u{0033}\u{65E5}",
-        nfkd: "\u{0031}\u{0033}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33ED}",
-        nfc: "\u{33ED}",
-        nfd: "\u{33ED}",
-        nfkc: "\u{0031}\u{0034}\u{65E5}",
-        nfkd: "\u{0031}\u{0034}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33EE}",
-        nfc: "\u{33EE}",
-        nfd: "\u{33EE}",
-        nfkc: "\u{0031}\u{0035}\u{65E5}",
-        nfkd: "\u{0031}\u{0035}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33EF}",
-        nfc: "\u{33EF}",
-        nfd: "\u{33EF}",
-        nfkc: "\u{0031}\u{0036}\u{65E5}",
-        nfkd: "\u{0031}\u{0036}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F0}",
-        nfc: "\u{33F0}",
-        nfd: "\u{33F0}",
-        nfkc: "\u{0031}\u{0037}\u{65E5}",
-        nfkd: "\u{0031}\u{0037}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F1}",
-        nfc: "\u{33F1}",
-        nfd: "\u{33F1}",
-        nfkc: "\u{0031}\u{0038}\u{65E5}",
-        nfkd: "\u{0031}\u{0038}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F2}",
-        nfc: "\u{33F2}",
-        nfd: "\u{33F2}",
-        nfkc: "\u{0031}\u{0039}\u{65E5}",
-        nfkd: "\u{0031}\u{0039}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F3}",
-        nfc: "\u{33F3}",
-        nfd: "\u{33F3}",
-        nfkc: "\u{0032}\u{0030}\u{65E5}",
-        nfkd: "\u{0032}\u{0030}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F4}",
-        nfc: "\u{33F4}",
-        nfd: "\u{33F4}",
-        nfkc: "\u{0032}\u{0031}\u{65E5}",
-        nfkd: "\u{0032}\u{0031}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F5}",
-        nfc: "\u{33F5}",
-        nfd: "\u{33F5}",
-        nfkc: "\u{0032}\u{0032}\u{65E5}",
-        nfkd: "\u{0032}\u{0032}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F6}",
-        nfc: "\u{33F6}",
-        nfd: "\u{33F6}",
-        nfkc: "\u{0032}\u{0033}\u{65E5}",
-        nfkd: "\u{0032}\u{0033}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F7}",
-        nfc: "\u{33F7}",
-        nfd: "\u{33F7}",
-        nfkc: "\u{0032}\u{0034}\u{65E5}",
-        nfkd: "\u{0032}\u{0034}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F8}",
-        nfc: "\u{33F8}",
-        nfd: "\u{33F8}",
-        nfkc: "\u{0032}\u{0035}\u{65E5}",
-        nfkd: "\u{0032}\u{0035}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33F9}",
-        nfc: "\u{33F9}",
-        nfd: "\u{33F9}",
-        nfkc: "\u{0032}\u{0036}\u{65E5}",
-        nfkd: "\u{0032}\u{0036}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33FA}",
-        nfc: "\u{33FA}",
-        nfd: "\u{33FA}",
-        nfkc: "\u{0032}\u{0037}\u{65E5}",
-        nfkd: "\u{0032}\u{0037}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33FB}",
-        nfc: "\u{33FB}",
-        nfd: "\u{33FB}",
-        nfkc: "\u{0032}\u{0038}\u{65E5}",
-        nfkd: "\u{0032}\u{0038}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33FC}",
-        nfc: "\u{33FC}",
-        nfd: "\u{33FC}",
-        nfkc: "\u{0032}\u{0039}\u{65E5}",
-        nfkd: "\u{0032}\u{0039}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33FD}",
-        nfc: "\u{33FD}",
-        nfd: "\u{33FD}",
-        nfkc: "\u{0033}\u{0030}\u{65E5}",
-        nfkd: "\u{0033}\u{0030}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33FE}",
-        nfc: "\u{33FE}",
-        nfd: "\u{33FE}",
-        nfkc: "\u{0033}\u{0031}\u{65E5}",
-        nfkd: "\u{0033}\u{0031}\u{65E5}",
-    },
-    NormalizationTest {
-        source: "\u{33FF}",
-        nfc: "\u{33FF}",
-        nfd: "\u{33FF}",
-        nfkc: "\u{0067}\u{0061}\u{006C}",
-        nfkd: "\u{0067}\u{0061}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{A69C}",
-        nfc: "\u{A69C}",
-        nfd: "\u{A69C}",
-        nfkc: "\u{044A}",
-        nfkd: "\u{044A}",
-    },
-    NormalizationTest {
-        source: "\u{A69D}",
-        nfc: "\u{A69D}",
-        nfd: "\u{A69D}",
-        nfkc: "\u{044C}",
-        nfkd: "\u{044C}",
-    },
-    NormalizationTest {
-        source: "\u{A770}",
-        nfc: "\u{A770}",
-        nfd: "\u{A770}",
-        nfkc: "\u{A76F}",
-        nfkd: "\u{A76F}",
-    },
-    NormalizationTest {
-        source: "\u{A7F8}",
-        nfc: "\u{A7F8}",
-        nfd: "\u{A7F8}",
-        nfkc: "\u{0126}",
-        nfkd: "\u{0126}",
-    },
-    NormalizationTest {
-        source: "\u{A7F9}",
-        nfc: "\u{A7F9}",
-        nfd: "\u{A7F9}",
-        nfkc: "\u{0153}",
-        nfkd: "\u{0153}",
-    },
-    NormalizationTest {
-        source: "\u{AB5C}",
-        nfc: "\u{AB5C}",
-        nfd: "\u{AB5C}",
-        nfkc: "\u{A727}",
-        nfkd: "\u{A727}",
-    },
-    NormalizationTest {
-        source: "\u{AB5D}",
-        nfc: "\u{AB5D}",
-        nfd: "\u{AB5D}",
-        nfkc: "\u{AB37}",
-        nfkd: "\u{AB37}",
-    },
-    NormalizationTest {
-        source: "\u{AB5E}",
-        nfc: "\u{AB5E}",
-        nfd: "\u{AB5E}",
-        nfkc: "\u{026B}",
-        nfkd: "\u{026B}",
-    },
-    NormalizationTest {
-        source: "\u{AB5F}",
-        nfc: "\u{AB5F}",
-        nfd: "\u{AB5F}",
-        nfkc: "\u{AB52}",
-        nfkd: "\u{AB52}",
-    },
-    NormalizationTest {
-        source: "\u{AC00}",
-        nfc: "\u{AC00}",
-        nfd: "\u{1100}\u{1161}",
-        nfkc: "\u{AC00}",
-        nfkd: "\u{1100}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{AC01}",
-        nfc: "\u{AC01}",
-        nfd: "\u{1100}\u{1161}\u{11A8}",
-        nfkc: "\u{AC01}",
-        nfkd: "\u{1100}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AC02}",
-        nfc: "\u{AC02}",
-        nfd: "\u{1100}\u{1161}\u{11A9}",
-        nfkc: "\u{AC02}",
-        nfkd: "\u{1100}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AC03}",
-        nfc: "\u{AC03}",
-        nfd: "\u{1100}\u{1161}\u{11AA}",
-        nfkc: "\u{AC03}",
-        nfkd: "\u{1100}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AC04}",
-        nfc: "\u{AC04}",
-        nfd: "\u{1100}\u{1161}\u{11AB}",
-        nfkc: "\u{AC04}",
-        nfkd: "\u{1100}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AC05}",
-        nfc: "\u{AC05}",
-        nfd: "\u{1100}\u{1161}\u{11AC}",
-        nfkc: "\u{AC05}",
-        nfkd: "\u{1100}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AC06}",
-        nfc: "\u{AC06}",
-        nfd: "\u{1100}\u{1161}\u{11AD}",
-        nfkc: "\u{AC06}",
-        nfkd: "\u{1100}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AC07}",
-        nfc: "\u{AC07}",
-        nfd: "\u{1100}\u{1161}\u{11AE}",
-        nfkc: "\u{AC07}",
-        nfkd: "\u{1100}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AC08}",
-        nfc: "\u{AC08}",
-        nfd: "\u{1100}\u{1161}\u{11AF}",
-        nfkc: "\u{AC08}",
-        nfkd: "\u{1100}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AC09}",
-        nfc: "\u{AC09}",
-        nfd: "\u{1100}\u{1161}\u{11B0}",
-        nfkc: "\u{AC09}",
-        nfkd: "\u{1100}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AC0A}",
-        nfc: "\u{AC0A}",
-        nfd: "\u{1100}\u{1161}\u{11B1}",
-        nfkc: "\u{AC0A}",
-        nfkd: "\u{1100}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AC0B}",
-        nfc: "\u{AC0B}",
-        nfd: "\u{1100}\u{1161}\u{11B2}",
-        nfkc: "\u{AC0B}",
-        nfkd: "\u{1100}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AC0C}",
-        nfc: "\u{AC0C}",
-        nfd: "\u{1100}\u{1161}\u{11B3}",
-        nfkc: "\u{AC0C}",
-        nfkd: "\u{1100}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AC0D}",
-        nfc: "\u{AC0D}",
-        nfd: "\u{1100}\u{1161}\u{11B4}",
-        nfkc: "\u{AC0D}",
-        nfkd: "\u{1100}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AC0E}",
-        nfc: "\u{AC0E}",
-        nfd: "\u{1100}\u{1161}\u{11B5}",
-        nfkc: "\u{AC0E}",
-        nfkd: "\u{1100}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AC0F}",
-        nfc: "\u{AC0F}",
-        nfd: "\u{1100}\u{1161}\u{11B6}",
-        nfkc: "\u{AC0F}",
-        nfkd: "\u{1100}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AC10}",
-        nfc: "\u{AC10}",
-        nfd: "\u{1100}\u{1161}\u{11B7}",
-        nfkc: "\u{AC10}",
-        nfkd: "\u{1100}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AC11}",
-        nfc: "\u{AC11}",
-        nfd: "\u{1100}\u{1161}\u{11B8}",
-        nfkc: "\u{AC11}",
-        nfkd: "\u{1100}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AC12}",
-        nfc: "\u{AC12}",
-        nfd: "\u{1100}\u{1161}\u{11B9}",
-        nfkc: "\u{AC12}",
-        nfkd: "\u{1100}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AC13}",
-        nfc: "\u{AC13}",
-        nfd: "\u{1100}\u{1161}\u{11BA}",
-        nfkc: "\u{AC13}",
-        nfkd: "\u{1100}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AC14}",
-        nfc: "\u{AC14}",
-        nfd: "\u{1100}\u{1161}\u{11BB}",
-        nfkc: "\u{AC14}",
-        nfkd: "\u{1100}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AC15}",
-        nfc: "\u{AC15}",
-        nfd: "\u{1100}\u{1161}\u{11BC}",
-        nfkc: "\u{AC15}",
-        nfkd: "\u{1100}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AC16}",
-        nfc: "\u{AC16}",
-        nfd: "\u{1100}\u{1161}\u{11BD}",
-        nfkc: "\u{AC16}",
-        nfkd: "\u{1100}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AC17}",
-        nfc: "\u{AC17}",
-        nfd: "\u{1100}\u{1161}\u{11BE}",
-        nfkc: "\u{AC17}",
-        nfkd: "\u{1100}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AC18}",
-        nfc: "\u{AC18}",
-        nfd: "\u{1100}\u{1161}\u{11BF}",
-        nfkc: "\u{AC18}",
-        nfkd: "\u{1100}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AC19}",
-        nfc: "\u{AC19}",
-        nfd: "\u{1100}\u{1161}\u{11C0}",
-        nfkc: "\u{AC19}",
-        nfkd: "\u{1100}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AC1A}",
-        nfc: "\u{AC1A}",
-        nfd: "\u{1100}\u{1161}\u{11C1}",
-        nfkc: "\u{AC1A}",
-        nfkd: "\u{1100}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AC1B}",
-        nfc: "\u{AC1B}",
-        nfd: "\u{1100}\u{1161}\u{11C2}",
-        nfkc: "\u{AC1B}",
-        nfkd: "\u{1100}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AC1C}",
-        nfc: "\u{AC1C}",
-        nfd: "\u{1100}\u{1162}",
-        nfkc: "\u{AC1C}",
-        nfkd: "\u{1100}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{AC1D}",
-        nfc: "\u{AC1D}",
-        nfd: "\u{1100}\u{1162}\u{11A8}",
-        nfkc: "\u{AC1D}",
-        nfkd: "\u{1100}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AC1E}",
-        nfc: "\u{AC1E}",
-        nfd: "\u{1100}\u{1162}\u{11A9}",
-        nfkc: "\u{AC1E}",
-        nfkd: "\u{1100}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AC1F}",
-        nfc: "\u{AC1F}",
-        nfd: "\u{1100}\u{1162}\u{11AA}",
-        nfkc: "\u{AC1F}",
-        nfkd: "\u{1100}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AC20}",
-        nfc: "\u{AC20}",
-        nfd: "\u{1100}\u{1162}\u{11AB}",
-        nfkc: "\u{AC20}",
-        nfkd: "\u{1100}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AC21}",
-        nfc: "\u{AC21}",
-        nfd: "\u{1100}\u{1162}\u{11AC}",
-        nfkc: "\u{AC21}",
-        nfkd: "\u{1100}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AC22}",
-        nfc: "\u{AC22}",
-        nfd: "\u{1100}\u{1162}\u{11AD}",
-        nfkc: "\u{AC22}",
-        nfkd: "\u{1100}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AC23}",
-        nfc: "\u{AC23}",
-        nfd: "\u{1100}\u{1162}\u{11AE}",
-        nfkc: "\u{AC23}",
-        nfkd: "\u{1100}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AC24}",
-        nfc: "\u{AC24}",
-        nfd: "\u{1100}\u{1162}\u{11AF}",
-        nfkc: "\u{AC24}",
-        nfkd: "\u{1100}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AC25}",
-        nfc: "\u{AC25}",
-        nfd: "\u{1100}\u{1162}\u{11B0}",
-        nfkc: "\u{AC25}",
-        nfkd: "\u{1100}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AC26}",
-        nfc: "\u{AC26}",
-        nfd: "\u{1100}\u{1162}\u{11B1}",
-        nfkc: "\u{AC26}",
-        nfkd: "\u{1100}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AC27}",
-        nfc: "\u{AC27}",
-        nfd: "\u{1100}\u{1162}\u{11B2}",
-        nfkc: "\u{AC27}",
-        nfkd: "\u{1100}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AC28}",
-        nfc: "\u{AC28}",
-        nfd: "\u{1100}\u{1162}\u{11B3}",
-        nfkc: "\u{AC28}",
-        nfkd: "\u{1100}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AC29}",
-        nfc: "\u{AC29}",
-        nfd: "\u{1100}\u{1162}\u{11B4}",
-        nfkc: "\u{AC29}",
-        nfkd: "\u{1100}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AC2A}",
-        nfc: "\u{AC2A}",
-        nfd: "\u{1100}\u{1162}\u{11B5}",
-        nfkc: "\u{AC2A}",
-        nfkd: "\u{1100}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AC2B}",
-        nfc: "\u{AC2B}",
-        nfd: "\u{1100}\u{1162}\u{11B6}",
-        nfkc: "\u{AC2B}",
-        nfkd: "\u{1100}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AC2C}",
-        nfc: "\u{AC2C}",
-        nfd: "\u{1100}\u{1162}\u{11B7}",
-        nfkc: "\u{AC2C}",
-        nfkd: "\u{1100}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AC2D}",
-        nfc: "\u{AC2D}",
-        nfd: "\u{1100}\u{1162}\u{11B8}",
-        nfkc: "\u{AC2D}",
-        nfkd: "\u{1100}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AC2E}",
-        nfc: "\u{AC2E}",
-        nfd: "\u{1100}\u{1162}\u{11B9}",
-        nfkc: "\u{AC2E}",
-        nfkd: "\u{1100}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AC2F}",
-        nfc: "\u{AC2F}",
-        nfd: "\u{1100}\u{1162}\u{11BA}",
-        nfkc: "\u{AC2F}",
-        nfkd: "\u{1100}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AC30}",
-        nfc: "\u{AC30}",
-        nfd: "\u{1100}\u{1162}\u{11BB}",
-        nfkc: "\u{AC30}",
-        nfkd: "\u{1100}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AC31}",
-        nfc: "\u{AC31}",
-        nfd: "\u{1100}\u{1162}\u{11BC}",
-        nfkc: "\u{AC31}",
-        nfkd: "\u{1100}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AC32}",
-        nfc: "\u{AC32}",
-        nfd: "\u{1100}\u{1162}\u{11BD}",
-        nfkc: "\u{AC32}",
-        nfkd: "\u{1100}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AC33}",
-        nfc: "\u{AC33}",
-        nfd: "\u{1100}\u{1162}\u{11BE}",
-        nfkc: "\u{AC33}",
-        nfkd: "\u{1100}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AC34}",
-        nfc: "\u{AC34}",
-        nfd: "\u{1100}\u{1162}\u{11BF}",
-        nfkc: "\u{AC34}",
-        nfkd: "\u{1100}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AC35}",
-        nfc: "\u{AC35}",
-        nfd: "\u{1100}\u{1162}\u{11C0}",
-        nfkc: "\u{AC35}",
-        nfkd: "\u{1100}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AC36}",
-        nfc: "\u{AC36}",
-        nfd: "\u{1100}\u{1162}\u{11C1}",
-        nfkc: "\u{AC36}",
-        nfkd: "\u{1100}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AC37}",
-        nfc: "\u{AC37}",
-        nfd: "\u{1100}\u{1162}\u{11C2}",
-        nfkc: "\u{AC37}",
-        nfkd: "\u{1100}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AC38}",
-        nfc: "\u{AC38}",
-        nfd: "\u{1100}\u{1163}",
-        nfkc: "\u{AC38}",
-        nfkd: "\u{1100}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{AC39}",
-        nfc: "\u{AC39}",
-        nfd: "\u{1100}\u{1163}\u{11A8}",
-        nfkc: "\u{AC39}",
-        nfkd: "\u{1100}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AC3A}",
-        nfc: "\u{AC3A}",
-        nfd: "\u{1100}\u{1163}\u{11A9}",
-        nfkc: "\u{AC3A}",
-        nfkd: "\u{1100}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AC3B}",
-        nfc: "\u{AC3B}",
-        nfd: "\u{1100}\u{1163}\u{11AA}",
-        nfkc: "\u{AC3B}",
-        nfkd: "\u{1100}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AC3C}",
-        nfc: "\u{AC3C}",
-        nfd: "\u{1100}\u{1163}\u{11AB}",
-        nfkc: "\u{AC3C}",
-        nfkd: "\u{1100}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AC3D}",
-        nfc: "\u{AC3D}",
-        nfd: "\u{1100}\u{1163}\u{11AC}",
-        nfkc: "\u{AC3D}",
-        nfkd: "\u{1100}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AC3E}",
-        nfc: "\u{AC3E}",
-        nfd: "\u{1100}\u{1163}\u{11AD}",
-        nfkc: "\u{AC3E}",
-        nfkd: "\u{1100}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AC3F}",
-        nfc: "\u{AC3F}",
-        nfd: "\u{1100}\u{1163}\u{11AE}",
-        nfkc: "\u{AC3F}",
-        nfkd: "\u{1100}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AC40}",
-        nfc: "\u{AC40}",
-        nfd: "\u{1100}\u{1163}\u{11AF}",
-        nfkc: "\u{AC40}",
-        nfkd: "\u{1100}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AC41}",
-        nfc: "\u{AC41}",
-        nfd: "\u{1100}\u{1163}\u{11B0}",
-        nfkc: "\u{AC41}",
-        nfkd: "\u{1100}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AC42}",
-        nfc: "\u{AC42}",
-        nfd: "\u{1100}\u{1163}\u{11B1}",
-        nfkc: "\u{AC42}",
-        nfkd: "\u{1100}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AC43}",
-        nfc: "\u{AC43}",
-        nfd: "\u{1100}\u{1163}\u{11B2}",
-        nfkc: "\u{AC43}",
-        nfkd: "\u{1100}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AC44}",
-        nfc: "\u{AC44}",
-        nfd: "\u{1100}\u{1163}\u{11B3}",
-        nfkc: "\u{AC44}",
-        nfkd: "\u{1100}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AC45}",
-        nfc: "\u{AC45}",
-        nfd: "\u{1100}\u{1163}\u{11B4}",
-        nfkc: "\u{AC45}",
-        nfkd: "\u{1100}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AC46}",
-        nfc: "\u{AC46}",
-        nfd: "\u{1100}\u{1163}\u{11B5}",
-        nfkc: "\u{AC46}",
-        nfkd: "\u{1100}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AC47}",
-        nfc: "\u{AC47}",
-        nfd: "\u{1100}\u{1163}\u{11B6}",
-        nfkc: "\u{AC47}",
-        nfkd: "\u{1100}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AC48}",
-        nfc: "\u{AC48}",
-        nfd: "\u{1100}\u{1163}\u{11B7}",
-        nfkc: "\u{AC48}",
-        nfkd: "\u{1100}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AC49}",
-        nfc: "\u{AC49}",
-        nfd: "\u{1100}\u{1163}\u{11B8}",
-        nfkc: "\u{AC49}",
-        nfkd: "\u{1100}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AC4A}",
-        nfc: "\u{AC4A}",
-        nfd: "\u{1100}\u{1163}\u{11B9}",
-        nfkc: "\u{AC4A}",
-        nfkd: "\u{1100}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AC4B}",
-        nfc: "\u{AC4B}",
-        nfd: "\u{1100}\u{1163}\u{11BA}",
-        nfkc: "\u{AC4B}",
-        nfkd: "\u{1100}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AC4C}",
-        nfc: "\u{AC4C}",
-        nfd: "\u{1100}\u{1163}\u{11BB}",
-        nfkc: "\u{AC4C}",
-        nfkd: "\u{1100}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AC4D}",
-        nfc: "\u{AC4D}",
-        nfd: "\u{1100}\u{1163}\u{11BC}",
-        nfkc: "\u{AC4D}",
-        nfkd: "\u{1100}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AC4E}",
-        nfc: "\u{AC4E}",
-        nfd: "\u{1100}\u{1163}\u{11BD}",
-        nfkc: "\u{AC4E}",
-        nfkd: "\u{1100}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AC4F}",
-        nfc: "\u{AC4F}",
-        nfd: "\u{1100}\u{1163}\u{11BE}",
-        nfkc: "\u{AC4F}",
-        nfkd: "\u{1100}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AC50}",
-        nfc: "\u{AC50}",
-        nfd: "\u{1100}\u{1163}\u{11BF}",
-        nfkc: "\u{AC50}",
-        nfkd: "\u{1100}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AC51}",
-        nfc: "\u{AC51}",
-        nfd: "\u{1100}\u{1163}\u{11C0}",
-        nfkc: "\u{AC51}",
-        nfkd: "\u{1100}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AC52}",
-        nfc: "\u{AC52}",
-        nfd: "\u{1100}\u{1163}\u{11C1}",
-        nfkc: "\u{AC52}",
-        nfkd: "\u{1100}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AC53}",
-        nfc: "\u{AC53}",
-        nfd: "\u{1100}\u{1163}\u{11C2}",
-        nfkc: "\u{AC53}",
-        nfkd: "\u{1100}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AC54}",
-        nfc: "\u{AC54}",
-        nfd: "\u{1100}\u{1164}",
-        nfkc: "\u{AC54}",
-        nfkd: "\u{1100}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{AC55}",
-        nfc: "\u{AC55}",
-        nfd: "\u{1100}\u{1164}\u{11A8}",
-        nfkc: "\u{AC55}",
-        nfkd: "\u{1100}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AC56}",
-        nfc: "\u{AC56}",
-        nfd: "\u{1100}\u{1164}\u{11A9}",
-        nfkc: "\u{AC56}",
-        nfkd: "\u{1100}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AC57}",
-        nfc: "\u{AC57}",
-        nfd: "\u{1100}\u{1164}\u{11AA}",
-        nfkc: "\u{AC57}",
-        nfkd: "\u{1100}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AC58}",
-        nfc: "\u{AC58}",
-        nfd: "\u{1100}\u{1164}\u{11AB}",
-        nfkc: "\u{AC58}",
-        nfkd: "\u{1100}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AC59}",
-        nfc: "\u{AC59}",
-        nfd: "\u{1100}\u{1164}\u{11AC}",
-        nfkc: "\u{AC59}",
-        nfkd: "\u{1100}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AC5A}",
-        nfc: "\u{AC5A}",
-        nfd: "\u{1100}\u{1164}\u{11AD}",
-        nfkc: "\u{AC5A}",
-        nfkd: "\u{1100}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AC5B}",
-        nfc: "\u{AC5B}",
-        nfd: "\u{1100}\u{1164}\u{11AE}",
-        nfkc: "\u{AC5B}",
-        nfkd: "\u{1100}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AC5C}",
-        nfc: "\u{AC5C}",
-        nfd: "\u{1100}\u{1164}\u{11AF}",
-        nfkc: "\u{AC5C}",
-        nfkd: "\u{1100}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AC5D}",
-        nfc: "\u{AC5D}",
-        nfd: "\u{1100}\u{1164}\u{11B0}",
-        nfkc: "\u{AC5D}",
-        nfkd: "\u{1100}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AC5E}",
-        nfc: "\u{AC5E}",
-        nfd: "\u{1100}\u{1164}\u{11B1}",
-        nfkc: "\u{AC5E}",
-        nfkd: "\u{1100}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AC5F}",
-        nfc: "\u{AC5F}",
-        nfd: "\u{1100}\u{1164}\u{11B2}",
-        nfkc: "\u{AC5F}",
-        nfkd: "\u{1100}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AC60}",
-        nfc: "\u{AC60}",
-        nfd: "\u{1100}\u{1164}\u{11B3}",
-        nfkc: "\u{AC60}",
-        nfkd: "\u{1100}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AC61}",
-        nfc: "\u{AC61}",
-        nfd: "\u{1100}\u{1164}\u{11B4}",
-        nfkc: "\u{AC61}",
-        nfkd: "\u{1100}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AC62}",
-        nfc: "\u{AC62}",
-        nfd: "\u{1100}\u{1164}\u{11B5}",
-        nfkc: "\u{AC62}",
-        nfkd: "\u{1100}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AC63}",
-        nfc: "\u{AC63}",
-        nfd: "\u{1100}\u{1164}\u{11B6}",
-        nfkc: "\u{AC63}",
-        nfkd: "\u{1100}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AC64}",
-        nfc: "\u{AC64}",
-        nfd: "\u{1100}\u{1164}\u{11B7}",
-        nfkc: "\u{AC64}",
-        nfkd: "\u{1100}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AC65}",
-        nfc: "\u{AC65}",
-        nfd: "\u{1100}\u{1164}\u{11B8}",
-        nfkc: "\u{AC65}",
-        nfkd: "\u{1100}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AC66}",
-        nfc: "\u{AC66}",
-        nfd: "\u{1100}\u{1164}\u{11B9}",
-        nfkc: "\u{AC66}",
-        nfkd: "\u{1100}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AC67}",
-        nfc: "\u{AC67}",
-        nfd: "\u{1100}\u{1164}\u{11BA}",
-        nfkc: "\u{AC67}",
-        nfkd: "\u{1100}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AC68}",
-        nfc: "\u{AC68}",
-        nfd: "\u{1100}\u{1164}\u{11BB}",
-        nfkc: "\u{AC68}",
-        nfkd: "\u{1100}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AC69}",
-        nfc: "\u{AC69}",
-        nfd: "\u{1100}\u{1164}\u{11BC}",
-        nfkc: "\u{AC69}",
-        nfkd: "\u{1100}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AC6A}",
-        nfc: "\u{AC6A}",
-        nfd: "\u{1100}\u{1164}\u{11BD}",
-        nfkc: "\u{AC6A}",
-        nfkd: "\u{1100}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AC6B}",
-        nfc: "\u{AC6B}",
-        nfd: "\u{1100}\u{1164}\u{11BE}",
-        nfkc: "\u{AC6B}",
-        nfkd: "\u{1100}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AC6C}",
-        nfc: "\u{AC6C}",
-        nfd: "\u{1100}\u{1164}\u{11BF}",
-        nfkc: "\u{AC6C}",
-        nfkd: "\u{1100}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AC6D}",
-        nfc: "\u{AC6D}",
-        nfd: "\u{1100}\u{1164}\u{11C0}",
-        nfkc: "\u{AC6D}",
-        nfkd: "\u{1100}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AC6E}",
-        nfc: "\u{AC6E}",
-        nfd: "\u{1100}\u{1164}\u{11C1}",
-        nfkc: "\u{AC6E}",
-        nfkd: "\u{1100}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AC6F}",
-        nfc: "\u{AC6F}",
-        nfd: "\u{1100}\u{1164}\u{11C2}",
-        nfkc: "\u{AC6F}",
-        nfkd: "\u{1100}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AC70}",
-        nfc: "\u{AC70}",
-        nfd: "\u{1100}\u{1165}",
-        nfkc: "\u{AC70}",
-        nfkd: "\u{1100}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{AC71}",
-        nfc: "\u{AC71}",
-        nfd: "\u{1100}\u{1165}\u{11A8}",
-        nfkc: "\u{AC71}",
-        nfkd: "\u{1100}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AC72}",
-        nfc: "\u{AC72}",
-        nfd: "\u{1100}\u{1165}\u{11A9}",
-        nfkc: "\u{AC72}",
-        nfkd: "\u{1100}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AC73}",
-        nfc: "\u{AC73}",
-        nfd: "\u{1100}\u{1165}\u{11AA}",
-        nfkc: "\u{AC73}",
-        nfkd: "\u{1100}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AC74}",
-        nfc: "\u{AC74}",
-        nfd: "\u{1100}\u{1165}\u{11AB}",
-        nfkc: "\u{AC74}",
-        nfkd: "\u{1100}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AC75}",
-        nfc: "\u{AC75}",
-        nfd: "\u{1100}\u{1165}\u{11AC}",
-        nfkc: "\u{AC75}",
-        nfkd: "\u{1100}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AC76}",
-        nfc: "\u{AC76}",
-        nfd: "\u{1100}\u{1165}\u{11AD}",
-        nfkc: "\u{AC76}",
-        nfkd: "\u{1100}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AC77}",
-        nfc: "\u{AC77}",
-        nfd: "\u{1100}\u{1165}\u{11AE}",
-        nfkc: "\u{AC77}",
-        nfkd: "\u{1100}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AC78}",
-        nfc: "\u{AC78}",
-        nfd: "\u{1100}\u{1165}\u{11AF}",
-        nfkc: "\u{AC78}",
-        nfkd: "\u{1100}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AC79}",
-        nfc: "\u{AC79}",
-        nfd: "\u{1100}\u{1165}\u{11B0}",
-        nfkc: "\u{AC79}",
-        nfkd: "\u{1100}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AC7A}",
-        nfc: "\u{AC7A}",
-        nfd: "\u{1100}\u{1165}\u{11B1}",
-        nfkc: "\u{AC7A}",
-        nfkd: "\u{1100}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AC7B}",
-        nfc: "\u{AC7B}",
-        nfd: "\u{1100}\u{1165}\u{11B2}",
-        nfkc: "\u{AC7B}",
-        nfkd: "\u{1100}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AC7C}",
-        nfc: "\u{AC7C}",
-        nfd: "\u{1100}\u{1165}\u{11B3}",
-        nfkc: "\u{AC7C}",
-        nfkd: "\u{1100}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AC7D}",
-        nfc: "\u{AC7D}",
-        nfd: "\u{1100}\u{1165}\u{11B4}",
-        nfkc: "\u{AC7D}",
-        nfkd: "\u{1100}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AC7E}",
-        nfc: "\u{AC7E}",
-        nfd: "\u{1100}\u{1165}\u{11B5}",
-        nfkc: "\u{AC7E}",
-        nfkd: "\u{1100}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AC7F}",
-        nfc: "\u{AC7F}",
-        nfd: "\u{1100}\u{1165}\u{11B6}",
-        nfkc: "\u{AC7F}",
-        nfkd: "\u{1100}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AC80}",
-        nfc: "\u{AC80}",
-        nfd: "\u{1100}\u{1165}\u{11B7}",
-        nfkc: "\u{AC80}",
-        nfkd: "\u{1100}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AC81}",
-        nfc: "\u{AC81}",
-        nfd: "\u{1100}\u{1165}\u{11B8}",
-        nfkc: "\u{AC81}",
-        nfkd: "\u{1100}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AC82}",
-        nfc: "\u{AC82}",
-        nfd: "\u{1100}\u{1165}\u{11B9}",
-        nfkc: "\u{AC82}",
-        nfkd: "\u{1100}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AC83}",
-        nfc: "\u{AC83}",
-        nfd: "\u{1100}\u{1165}\u{11BA}",
-        nfkc: "\u{AC83}",
-        nfkd: "\u{1100}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AC84}",
-        nfc: "\u{AC84}",
-        nfd: "\u{1100}\u{1165}\u{11BB}",
-        nfkc: "\u{AC84}",
-        nfkd: "\u{1100}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AC85}",
-        nfc: "\u{AC85}",
-        nfd: "\u{1100}\u{1165}\u{11BC}",
-        nfkc: "\u{AC85}",
-        nfkd: "\u{1100}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AC86}",
-        nfc: "\u{AC86}",
-        nfd: "\u{1100}\u{1165}\u{11BD}",
-        nfkc: "\u{AC86}",
-        nfkd: "\u{1100}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AC87}",
-        nfc: "\u{AC87}",
-        nfd: "\u{1100}\u{1165}\u{11BE}",
-        nfkc: "\u{AC87}",
-        nfkd: "\u{1100}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AC88}",
-        nfc: "\u{AC88}",
-        nfd: "\u{1100}\u{1165}\u{11BF}",
-        nfkc: "\u{AC88}",
-        nfkd: "\u{1100}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AC89}",
-        nfc: "\u{AC89}",
-        nfd: "\u{1100}\u{1165}\u{11C0}",
-        nfkc: "\u{AC89}",
-        nfkd: "\u{1100}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AC8A}",
-        nfc: "\u{AC8A}",
-        nfd: "\u{1100}\u{1165}\u{11C1}",
-        nfkc: "\u{AC8A}",
-        nfkd: "\u{1100}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AC8B}",
-        nfc: "\u{AC8B}",
-        nfd: "\u{1100}\u{1165}\u{11C2}",
-        nfkc: "\u{AC8B}",
-        nfkd: "\u{1100}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AC8C}",
-        nfc: "\u{AC8C}",
-        nfd: "\u{1100}\u{1166}",
-        nfkc: "\u{AC8C}",
-        nfkd: "\u{1100}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{AC8D}",
-        nfc: "\u{AC8D}",
-        nfd: "\u{1100}\u{1166}\u{11A8}",
-        nfkc: "\u{AC8D}",
-        nfkd: "\u{1100}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AC8E}",
-        nfc: "\u{AC8E}",
-        nfd: "\u{1100}\u{1166}\u{11A9}",
-        nfkc: "\u{AC8E}",
-        nfkd: "\u{1100}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AC8F}",
-        nfc: "\u{AC8F}",
-        nfd: "\u{1100}\u{1166}\u{11AA}",
-        nfkc: "\u{AC8F}",
-        nfkd: "\u{1100}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AC90}",
-        nfc: "\u{AC90}",
-        nfd: "\u{1100}\u{1166}\u{11AB}",
-        nfkc: "\u{AC90}",
-        nfkd: "\u{1100}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AC91}",
-        nfc: "\u{AC91}",
-        nfd: "\u{1100}\u{1166}\u{11AC}",
-        nfkc: "\u{AC91}",
-        nfkd: "\u{1100}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AC92}",
-        nfc: "\u{AC92}",
-        nfd: "\u{1100}\u{1166}\u{11AD}",
-        nfkc: "\u{AC92}",
-        nfkd: "\u{1100}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AC93}",
-        nfc: "\u{AC93}",
-        nfd: "\u{1100}\u{1166}\u{11AE}",
-        nfkc: "\u{AC93}",
-        nfkd: "\u{1100}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AC94}",
-        nfc: "\u{AC94}",
-        nfd: "\u{1100}\u{1166}\u{11AF}",
-        nfkc: "\u{AC94}",
-        nfkd: "\u{1100}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AC95}",
-        nfc: "\u{AC95}",
-        nfd: "\u{1100}\u{1166}\u{11B0}",
-        nfkc: "\u{AC95}",
-        nfkd: "\u{1100}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AC96}",
-        nfc: "\u{AC96}",
-        nfd: "\u{1100}\u{1166}\u{11B1}",
-        nfkc: "\u{AC96}",
-        nfkd: "\u{1100}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AC97}",
-        nfc: "\u{AC97}",
-        nfd: "\u{1100}\u{1166}\u{11B2}",
-        nfkc: "\u{AC97}",
-        nfkd: "\u{1100}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AC98}",
-        nfc: "\u{AC98}",
-        nfd: "\u{1100}\u{1166}\u{11B3}",
-        nfkc: "\u{AC98}",
-        nfkd: "\u{1100}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AC99}",
-        nfc: "\u{AC99}",
-        nfd: "\u{1100}\u{1166}\u{11B4}",
-        nfkc: "\u{AC99}",
-        nfkd: "\u{1100}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AC9A}",
-        nfc: "\u{AC9A}",
-        nfd: "\u{1100}\u{1166}\u{11B5}",
-        nfkc: "\u{AC9A}",
-        nfkd: "\u{1100}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AC9B}",
-        nfc: "\u{AC9B}",
-        nfd: "\u{1100}\u{1166}\u{11B6}",
-        nfkc: "\u{AC9B}",
-        nfkd: "\u{1100}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AC9C}",
-        nfc: "\u{AC9C}",
-        nfd: "\u{1100}\u{1166}\u{11B7}",
-        nfkc: "\u{AC9C}",
-        nfkd: "\u{1100}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AC9D}",
-        nfc: "\u{AC9D}",
-        nfd: "\u{1100}\u{1166}\u{11B8}",
-        nfkc: "\u{AC9D}",
-        nfkd: "\u{1100}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AC9E}",
-        nfc: "\u{AC9E}",
-        nfd: "\u{1100}\u{1166}\u{11B9}",
-        nfkc: "\u{AC9E}",
-        nfkd: "\u{1100}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AC9F}",
-        nfc: "\u{AC9F}",
-        nfd: "\u{1100}\u{1166}\u{11BA}",
-        nfkc: "\u{AC9F}",
-        nfkd: "\u{1100}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ACA0}",
-        nfc: "\u{ACA0}",
-        nfd: "\u{1100}\u{1166}\u{11BB}",
-        nfkc: "\u{ACA0}",
-        nfkd: "\u{1100}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ACA1}",
-        nfc: "\u{ACA1}",
-        nfd: "\u{1100}\u{1166}\u{11BC}",
-        nfkc: "\u{ACA1}",
-        nfkd: "\u{1100}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ACA2}",
-        nfc: "\u{ACA2}",
-        nfd: "\u{1100}\u{1166}\u{11BD}",
-        nfkc: "\u{ACA2}",
-        nfkd: "\u{1100}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ACA3}",
-        nfc: "\u{ACA3}",
-        nfd: "\u{1100}\u{1166}\u{11BE}",
-        nfkc: "\u{ACA3}",
-        nfkd: "\u{1100}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ACA4}",
-        nfc: "\u{ACA4}",
-        nfd: "\u{1100}\u{1166}\u{11BF}",
-        nfkc: "\u{ACA4}",
-        nfkd: "\u{1100}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ACA5}",
-        nfc: "\u{ACA5}",
-        nfd: "\u{1100}\u{1166}\u{11C0}",
-        nfkc: "\u{ACA5}",
-        nfkd: "\u{1100}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ACA6}",
-        nfc: "\u{ACA6}",
-        nfd: "\u{1100}\u{1166}\u{11C1}",
-        nfkc: "\u{ACA6}",
-        nfkd: "\u{1100}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ACA7}",
-        nfc: "\u{ACA7}",
-        nfd: "\u{1100}\u{1166}\u{11C2}",
-        nfkc: "\u{ACA7}",
-        nfkd: "\u{1100}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ACA8}",
-        nfc: "\u{ACA8}",
-        nfd: "\u{1100}\u{1167}",
-        nfkc: "\u{ACA8}",
-        nfkd: "\u{1100}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{ACA9}",
-        nfc: "\u{ACA9}",
-        nfd: "\u{1100}\u{1167}\u{11A8}",
-        nfkc: "\u{ACA9}",
-        nfkd: "\u{1100}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ACAA}",
-        nfc: "\u{ACAA}",
-        nfd: "\u{1100}\u{1167}\u{11A9}",
-        nfkc: "\u{ACAA}",
-        nfkd: "\u{1100}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ACAB}",
-        nfc: "\u{ACAB}",
-        nfd: "\u{1100}\u{1167}\u{11AA}",
-        nfkc: "\u{ACAB}",
-        nfkd: "\u{1100}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ACAC}",
-        nfc: "\u{ACAC}",
-        nfd: "\u{1100}\u{1167}\u{11AB}",
-        nfkc: "\u{ACAC}",
-        nfkd: "\u{1100}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ACAD}",
-        nfc: "\u{ACAD}",
-        nfd: "\u{1100}\u{1167}\u{11AC}",
-        nfkc: "\u{ACAD}",
-        nfkd: "\u{1100}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ACAE}",
-        nfc: "\u{ACAE}",
-        nfd: "\u{1100}\u{1167}\u{11AD}",
-        nfkc: "\u{ACAE}",
-        nfkd: "\u{1100}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ACAF}",
-        nfc: "\u{ACAF}",
-        nfd: "\u{1100}\u{1167}\u{11AE}",
-        nfkc: "\u{ACAF}",
-        nfkd: "\u{1100}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ACB0}",
-        nfc: "\u{ACB0}",
-        nfd: "\u{1100}\u{1167}\u{11AF}",
-        nfkc: "\u{ACB0}",
-        nfkd: "\u{1100}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{ACB1}",
-        nfc: "\u{ACB1}",
-        nfd: "\u{1100}\u{1167}\u{11B0}",
-        nfkc: "\u{ACB1}",
-        nfkd: "\u{1100}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{ACB2}",
-        nfc: "\u{ACB2}",
-        nfd: "\u{1100}\u{1167}\u{11B1}",
-        nfkc: "\u{ACB2}",
-        nfkd: "\u{1100}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{ACB3}",
-        nfc: "\u{ACB3}",
-        nfd: "\u{1100}\u{1167}\u{11B2}",
-        nfkc: "\u{ACB3}",
-        nfkd: "\u{1100}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{ACB4}",
-        nfc: "\u{ACB4}",
-        nfd: "\u{1100}\u{1167}\u{11B3}",
-        nfkc: "\u{ACB4}",
-        nfkd: "\u{1100}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{ACB5}",
-        nfc: "\u{ACB5}",
-        nfd: "\u{1100}\u{1167}\u{11B4}",
-        nfkc: "\u{ACB5}",
-        nfkd: "\u{1100}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{ACB6}",
-        nfc: "\u{ACB6}",
-        nfd: "\u{1100}\u{1167}\u{11B5}",
-        nfkc: "\u{ACB6}",
-        nfkd: "\u{1100}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ACB7}",
-        nfc: "\u{ACB7}",
-        nfd: "\u{1100}\u{1167}\u{11B6}",
-        nfkc: "\u{ACB7}",
-        nfkd: "\u{1100}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{ACB8}",
-        nfc: "\u{ACB8}",
-        nfd: "\u{1100}\u{1167}\u{11B7}",
-        nfkc: "\u{ACB8}",
-        nfkd: "\u{1100}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{ACB9}",
-        nfc: "\u{ACB9}",
-        nfd: "\u{1100}\u{1167}\u{11B8}",
-        nfkc: "\u{ACB9}",
-        nfkd: "\u{1100}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{ACBA}",
-        nfc: "\u{ACBA}",
-        nfd: "\u{1100}\u{1167}\u{11B9}",
-        nfkc: "\u{ACBA}",
-        nfkd: "\u{1100}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{ACBB}",
-        nfc: "\u{ACBB}",
-        nfd: "\u{1100}\u{1167}\u{11BA}",
-        nfkc: "\u{ACBB}",
-        nfkd: "\u{1100}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ACBC}",
-        nfc: "\u{ACBC}",
-        nfd: "\u{1100}\u{1167}\u{11BB}",
-        nfkc: "\u{ACBC}",
-        nfkd: "\u{1100}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ACBD}",
-        nfc: "\u{ACBD}",
-        nfd: "\u{1100}\u{1167}\u{11BC}",
-        nfkc: "\u{ACBD}",
-        nfkd: "\u{1100}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ACBE}",
-        nfc: "\u{ACBE}",
-        nfd: "\u{1100}\u{1167}\u{11BD}",
-        nfkc: "\u{ACBE}",
-        nfkd: "\u{1100}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ACBF}",
-        nfc: "\u{ACBF}",
-        nfd: "\u{1100}\u{1167}\u{11BE}",
-        nfkc: "\u{ACBF}",
-        nfkd: "\u{1100}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ACC0}",
-        nfc: "\u{ACC0}",
-        nfd: "\u{1100}\u{1167}\u{11BF}",
-        nfkc: "\u{ACC0}",
-        nfkd: "\u{1100}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ACC1}",
-        nfc: "\u{ACC1}",
-        nfd: "\u{1100}\u{1167}\u{11C0}",
-        nfkc: "\u{ACC1}",
-        nfkd: "\u{1100}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ACC2}",
-        nfc: "\u{ACC2}",
-        nfd: "\u{1100}\u{1167}\u{11C1}",
-        nfkc: "\u{ACC2}",
-        nfkd: "\u{1100}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ACC3}",
-        nfc: "\u{ACC3}",
-        nfd: "\u{1100}\u{1167}\u{11C2}",
-        nfkc: "\u{ACC3}",
-        nfkd: "\u{1100}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ACC4}",
-        nfc: "\u{ACC4}",
-        nfd: "\u{1100}\u{1168}",
-        nfkc: "\u{ACC4}",
-        nfkd: "\u{1100}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{ACC5}",
-        nfc: "\u{ACC5}",
-        nfd: "\u{1100}\u{1168}\u{11A8}",
-        nfkc: "\u{ACC5}",
-        nfkd: "\u{1100}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ACC6}",
-        nfc: "\u{ACC6}",
-        nfd: "\u{1100}\u{1168}\u{11A9}",
-        nfkc: "\u{ACC6}",
-        nfkd: "\u{1100}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ACC7}",
-        nfc: "\u{ACC7}",
-        nfd: "\u{1100}\u{1168}\u{11AA}",
-        nfkc: "\u{ACC7}",
-        nfkd: "\u{1100}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ACC8}",
-        nfc: "\u{ACC8}",
-        nfd: "\u{1100}\u{1168}\u{11AB}",
-        nfkc: "\u{ACC8}",
-        nfkd: "\u{1100}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ACC9}",
-        nfc: "\u{ACC9}",
-        nfd: "\u{1100}\u{1168}\u{11AC}",
-        nfkc: "\u{ACC9}",
-        nfkd: "\u{1100}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ACCA}",
-        nfc: "\u{ACCA}",
-        nfd: "\u{1100}\u{1168}\u{11AD}",
-        nfkc: "\u{ACCA}",
-        nfkd: "\u{1100}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ACCB}",
-        nfc: "\u{ACCB}",
-        nfd: "\u{1100}\u{1168}\u{11AE}",
-        nfkc: "\u{ACCB}",
-        nfkd: "\u{1100}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ACCC}",
-        nfc: "\u{ACCC}",
-        nfd: "\u{1100}\u{1168}\u{11AF}",
-        nfkc: "\u{ACCC}",
-        nfkd: "\u{1100}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{ACCD}",
-        nfc: "\u{ACCD}",
-        nfd: "\u{1100}\u{1168}\u{11B0}",
-        nfkc: "\u{ACCD}",
-        nfkd: "\u{1100}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{ACCE}",
-        nfc: "\u{ACCE}",
-        nfd: "\u{1100}\u{1168}\u{11B1}",
-        nfkc: "\u{ACCE}",
-        nfkd: "\u{1100}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{ACCF}",
-        nfc: "\u{ACCF}",
-        nfd: "\u{1100}\u{1168}\u{11B2}",
-        nfkc: "\u{ACCF}",
-        nfkd: "\u{1100}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{ACD0}",
-        nfc: "\u{ACD0}",
-        nfd: "\u{1100}\u{1168}\u{11B3}",
-        nfkc: "\u{ACD0}",
-        nfkd: "\u{1100}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{ACD1}",
-        nfc: "\u{ACD1}",
-        nfd: "\u{1100}\u{1168}\u{11B4}",
-        nfkc: "\u{ACD1}",
-        nfkd: "\u{1100}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{ACD2}",
-        nfc: "\u{ACD2}",
-        nfd: "\u{1100}\u{1168}\u{11B5}",
-        nfkc: "\u{ACD2}",
-        nfkd: "\u{1100}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ACD3}",
-        nfc: "\u{ACD3}",
-        nfd: "\u{1100}\u{1168}\u{11B6}",
-        nfkc: "\u{ACD3}",
-        nfkd: "\u{1100}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{ACD4}",
-        nfc: "\u{ACD4}",
-        nfd: "\u{1100}\u{1168}\u{11B7}",
-        nfkc: "\u{ACD4}",
-        nfkd: "\u{1100}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{ACD5}",
-        nfc: "\u{ACD5}",
-        nfd: "\u{1100}\u{1168}\u{11B8}",
-        nfkc: "\u{ACD5}",
-        nfkd: "\u{1100}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{ACD6}",
-        nfc: "\u{ACD6}",
-        nfd: "\u{1100}\u{1168}\u{11B9}",
-        nfkc: "\u{ACD6}",
-        nfkd: "\u{1100}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{ACD7}",
-        nfc: "\u{ACD7}",
-        nfd: "\u{1100}\u{1168}\u{11BA}",
-        nfkc: "\u{ACD7}",
-        nfkd: "\u{1100}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ACD8}",
-        nfc: "\u{ACD8}",
-        nfd: "\u{1100}\u{1168}\u{11BB}",
-        nfkc: "\u{ACD8}",
-        nfkd: "\u{1100}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ACD9}",
-        nfc: "\u{ACD9}",
-        nfd: "\u{1100}\u{1168}\u{11BC}",
-        nfkc: "\u{ACD9}",
-        nfkd: "\u{1100}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ACDA}",
-        nfc: "\u{ACDA}",
-        nfd: "\u{1100}\u{1168}\u{11BD}",
-        nfkc: "\u{ACDA}",
-        nfkd: "\u{1100}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ACDB}",
-        nfc: "\u{ACDB}",
-        nfd: "\u{1100}\u{1168}\u{11BE}",
-        nfkc: "\u{ACDB}",
-        nfkd: "\u{1100}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ACDC}",
-        nfc: "\u{ACDC}",
-        nfd: "\u{1100}\u{1168}\u{11BF}",
-        nfkc: "\u{ACDC}",
-        nfkd: "\u{1100}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ACDD}",
-        nfc: "\u{ACDD}",
-        nfd: "\u{1100}\u{1168}\u{11C0}",
-        nfkc: "\u{ACDD}",
-        nfkd: "\u{1100}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ACDE}",
-        nfc: "\u{ACDE}",
-        nfd: "\u{1100}\u{1168}\u{11C1}",
-        nfkc: "\u{ACDE}",
-        nfkd: "\u{1100}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ACDF}",
-        nfc: "\u{ACDF}",
-        nfd: "\u{1100}\u{1168}\u{11C2}",
-        nfkc: "\u{ACDF}",
-        nfkd: "\u{1100}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ACE0}",
-        nfc: "\u{ACE0}",
-        nfd: "\u{1100}\u{1169}",
-        nfkc: "\u{ACE0}",
-        nfkd: "\u{1100}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{ACE1}",
-        nfc: "\u{ACE1}",
-        nfd: "\u{1100}\u{1169}\u{11A8}",
-        nfkc: "\u{ACE1}",
-        nfkd: "\u{1100}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ACE2}",
-        nfc: "\u{ACE2}",
-        nfd: "\u{1100}\u{1169}\u{11A9}",
-        nfkc: "\u{ACE2}",
-        nfkd: "\u{1100}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ACE3}",
-        nfc: "\u{ACE3}",
-        nfd: "\u{1100}\u{1169}\u{11AA}",
-        nfkc: "\u{ACE3}",
-        nfkd: "\u{1100}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ACE4}",
-        nfc: "\u{ACE4}",
-        nfd: "\u{1100}\u{1169}\u{11AB}",
-        nfkc: "\u{ACE4}",
-        nfkd: "\u{1100}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ACE5}",
-        nfc: "\u{ACE5}",
-        nfd: "\u{1100}\u{1169}\u{11AC}",
-        nfkc: "\u{ACE5}",
-        nfkd: "\u{1100}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ACE6}",
-        nfc: "\u{ACE6}",
-        nfd: "\u{1100}\u{1169}\u{11AD}",
-        nfkc: "\u{ACE6}",
-        nfkd: "\u{1100}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ACE7}",
-        nfc: "\u{ACE7}",
-        nfd: "\u{1100}\u{1169}\u{11AE}",
-        nfkc: "\u{ACE7}",
-        nfkd: "\u{1100}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ACE8}",
-        nfc: "\u{ACE8}",
-        nfd: "\u{1100}\u{1169}\u{11AF}",
-        nfkc: "\u{ACE8}",
-        nfkd: "\u{1100}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{ACE9}",
-        nfc: "\u{ACE9}",
-        nfd: "\u{1100}\u{1169}\u{11B0}",
-        nfkc: "\u{ACE9}",
-        nfkd: "\u{1100}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{ACEA}",
-        nfc: "\u{ACEA}",
-        nfd: "\u{1100}\u{1169}\u{11B1}",
-        nfkc: "\u{ACEA}",
-        nfkd: "\u{1100}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{ACEB}",
-        nfc: "\u{ACEB}",
-        nfd: "\u{1100}\u{1169}\u{11B2}",
-        nfkc: "\u{ACEB}",
-        nfkd: "\u{1100}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{ACEC}",
-        nfc: "\u{ACEC}",
-        nfd: "\u{1100}\u{1169}\u{11B3}",
-        nfkc: "\u{ACEC}",
-        nfkd: "\u{1100}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{ACED}",
-        nfc: "\u{ACED}",
-        nfd: "\u{1100}\u{1169}\u{11B4}",
-        nfkc: "\u{ACED}",
-        nfkd: "\u{1100}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{ACEE}",
-        nfc: "\u{ACEE}",
-        nfd: "\u{1100}\u{1169}\u{11B5}",
-        nfkc: "\u{ACEE}",
-        nfkd: "\u{1100}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ACEF}",
-        nfc: "\u{ACEF}",
-        nfd: "\u{1100}\u{1169}\u{11B6}",
-        nfkc: "\u{ACEF}",
-        nfkd: "\u{1100}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{ACF0}",
-        nfc: "\u{ACF0}",
-        nfd: "\u{1100}\u{1169}\u{11B7}",
-        nfkc: "\u{ACF0}",
-        nfkd: "\u{1100}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{ACF1}",
-        nfc: "\u{ACF1}",
-        nfd: "\u{1100}\u{1169}\u{11B8}",
-        nfkc: "\u{ACF1}",
-        nfkd: "\u{1100}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{ACF2}",
-        nfc: "\u{ACF2}",
-        nfd: "\u{1100}\u{1169}\u{11B9}",
-        nfkc: "\u{ACF2}",
-        nfkd: "\u{1100}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{ACF3}",
-        nfc: "\u{ACF3}",
-        nfd: "\u{1100}\u{1169}\u{11BA}",
-        nfkc: "\u{ACF3}",
-        nfkd: "\u{1100}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ACF4}",
-        nfc: "\u{ACF4}",
-        nfd: "\u{1100}\u{1169}\u{11BB}",
-        nfkc: "\u{ACF4}",
-        nfkd: "\u{1100}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ACF5}",
-        nfc: "\u{ACF5}",
-        nfd: "\u{1100}\u{1169}\u{11BC}",
-        nfkc: "\u{ACF5}",
-        nfkd: "\u{1100}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ACF6}",
-        nfc: "\u{ACF6}",
-        nfd: "\u{1100}\u{1169}\u{11BD}",
-        nfkc: "\u{ACF6}",
-        nfkd: "\u{1100}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ACF7}",
-        nfc: "\u{ACF7}",
-        nfd: "\u{1100}\u{1169}\u{11BE}",
-        nfkc: "\u{ACF7}",
-        nfkd: "\u{1100}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ACF8}",
-        nfc: "\u{ACF8}",
-        nfd: "\u{1100}\u{1169}\u{11BF}",
-        nfkc: "\u{ACF8}",
-        nfkd: "\u{1100}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ACF9}",
-        nfc: "\u{ACF9}",
-        nfd: "\u{1100}\u{1169}\u{11C0}",
-        nfkc: "\u{ACF9}",
-        nfkd: "\u{1100}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ACFA}",
-        nfc: "\u{ACFA}",
-        nfd: "\u{1100}\u{1169}\u{11C1}",
-        nfkc: "\u{ACFA}",
-        nfkd: "\u{1100}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ACFB}",
-        nfc: "\u{ACFB}",
-        nfd: "\u{1100}\u{1169}\u{11C2}",
-        nfkc: "\u{ACFB}",
-        nfkd: "\u{1100}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ACFC}",
-        nfc: "\u{ACFC}",
-        nfd: "\u{1100}\u{116A}",
-        nfkc: "\u{ACFC}",
-        nfkd: "\u{1100}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{ACFD}",
-        nfc: "\u{ACFD}",
-        nfd: "\u{1100}\u{116A}\u{11A8}",
-        nfkc: "\u{ACFD}",
-        nfkd: "\u{1100}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ACFE}",
-        nfc: "\u{ACFE}",
-        nfd: "\u{1100}\u{116A}\u{11A9}",
-        nfkc: "\u{ACFE}",
-        nfkd: "\u{1100}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ACFF}",
-        nfc: "\u{ACFF}",
-        nfd: "\u{1100}\u{116A}\u{11AA}",
-        nfkc: "\u{ACFF}",
-        nfkd: "\u{1100}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AD00}",
-        nfc: "\u{AD00}",
-        nfd: "\u{1100}\u{116A}\u{11AB}",
-        nfkc: "\u{AD00}",
-        nfkd: "\u{1100}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AD01}",
-        nfc: "\u{AD01}",
-        nfd: "\u{1100}\u{116A}\u{11AC}",
-        nfkc: "\u{AD01}",
-        nfkd: "\u{1100}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AD02}",
-        nfc: "\u{AD02}",
-        nfd: "\u{1100}\u{116A}\u{11AD}",
-        nfkc: "\u{AD02}",
-        nfkd: "\u{1100}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AD03}",
-        nfc: "\u{AD03}",
-        nfd: "\u{1100}\u{116A}\u{11AE}",
-        nfkc: "\u{AD03}",
-        nfkd: "\u{1100}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AD04}",
-        nfc: "\u{AD04}",
-        nfd: "\u{1100}\u{116A}\u{11AF}",
-        nfkc: "\u{AD04}",
-        nfkd: "\u{1100}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AD05}",
-        nfc: "\u{AD05}",
-        nfd: "\u{1100}\u{116A}\u{11B0}",
-        nfkc: "\u{AD05}",
-        nfkd: "\u{1100}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AD06}",
-        nfc: "\u{AD06}",
-        nfd: "\u{1100}\u{116A}\u{11B1}",
-        nfkc: "\u{AD06}",
-        nfkd: "\u{1100}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AD07}",
-        nfc: "\u{AD07}",
-        nfd: "\u{1100}\u{116A}\u{11B2}",
-        nfkc: "\u{AD07}",
-        nfkd: "\u{1100}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AD08}",
-        nfc: "\u{AD08}",
-        nfd: "\u{1100}\u{116A}\u{11B3}",
-        nfkc: "\u{AD08}",
-        nfkd: "\u{1100}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AD09}",
-        nfc: "\u{AD09}",
-        nfd: "\u{1100}\u{116A}\u{11B4}",
-        nfkc: "\u{AD09}",
-        nfkd: "\u{1100}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AD0A}",
-        nfc: "\u{AD0A}",
-        nfd: "\u{1100}\u{116A}\u{11B5}",
-        nfkc: "\u{AD0A}",
-        nfkd: "\u{1100}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AD0B}",
-        nfc: "\u{AD0B}",
-        nfd: "\u{1100}\u{116A}\u{11B6}",
-        nfkc: "\u{AD0B}",
-        nfkd: "\u{1100}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AD0C}",
-        nfc: "\u{AD0C}",
-        nfd: "\u{1100}\u{116A}\u{11B7}",
-        nfkc: "\u{AD0C}",
-        nfkd: "\u{1100}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AD0D}",
-        nfc: "\u{AD0D}",
-        nfd: "\u{1100}\u{116A}\u{11B8}",
-        nfkc: "\u{AD0D}",
-        nfkd: "\u{1100}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AD0E}",
-        nfc: "\u{AD0E}",
-        nfd: "\u{1100}\u{116A}\u{11B9}",
-        nfkc: "\u{AD0E}",
-        nfkd: "\u{1100}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AD0F}",
-        nfc: "\u{AD0F}",
-        nfd: "\u{1100}\u{116A}\u{11BA}",
-        nfkc: "\u{AD0F}",
-        nfkd: "\u{1100}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AD10}",
-        nfc: "\u{AD10}",
-        nfd: "\u{1100}\u{116A}\u{11BB}",
-        nfkc: "\u{AD10}",
-        nfkd: "\u{1100}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AD11}",
-        nfc: "\u{AD11}",
-        nfd: "\u{1100}\u{116A}\u{11BC}",
-        nfkc: "\u{AD11}",
-        nfkd: "\u{1100}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AD12}",
-        nfc: "\u{AD12}",
-        nfd: "\u{1100}\u{116A}\u{11BD}",
-        nfkc: "\u{AD12}",
-        nfkd: "\u{1100}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AD13}",
-        nfc: "\u{AD13}",
-        nfd: "\u{1100}\u{116A}\u{11BE}",
-        nfkc: "\u{AD13}",
-        nfkd: "\u{1100}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AD14}",
-        nfc: "\u{AD14}",
-        nfd: "\u{1100}\u{116A}\u{11BF}",
-        nfkc: "\u{AD14}",
-        nfkd: "\u{1100}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AD15}",
-        nfc: "\u{AD15}",
-        nfd: "\u{1100}\u{116A}\u{11C0}",
-        nfkc: "\u{AD15}",
-        nfkd: "\u{1100}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AD16}",
-        nfc: "\u{AD16}",
-        nfd: "\u{1100}\u{116A}\u{11C1}",
-        nfkc: "\u{AD16}",
-        nfkd: "\u{1100}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AD17}",
-        nfc: "\u{AD17}",
-        nfd: "\u{1100}\u{116A}\u{11C2}",
-        nfkc: "\u{AD17}",
-        nfkd: "\u{1100}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AD18}",
-        nfc: "\u{AD18}",
-        nfd: "\u{1100}\u{116B}",
-        nfkc: "\u{AD18}",
-        nfkd: "\u{1100}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{AD19}",
-        nfc: "\u{AD19}",
-        nfd: "\u{1100}\u{116B}\u{11A8}",
-        nfkc: "\u{AD19}",
-        nfkd: "\u{1100}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AD1A}",
-        nfc: "\u{AD1A}",
-        nfd: "\u{1100}\u{116B}\u{11A9}",
-        nfkc: "\u{AD1A}",
-        nfkd: "\u{1100}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AD1B}",
-        nfc: "\u{AD1B}",
-        nfd: "\u{1100}\u{116B}\u{11AA}",
-        nfkc: "\u{AD1B}",
-        nfkd: "\u{1100}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AD1C}",
-        nfc: "\u{AD1C}",
-        nfd: "\u{1100}\u{116B}\u{11AB}",
-        nfkc: "\u{AD1C}",
-        nfkd: "\u{1100}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AD1D}",
-        nfc: "\u{AD1D}",
-        nfd: "\u{1100}\u{116B}\u{11AC}",
-        nfkc: "\u{AD1D}",
-        nfkd: "\u{1100}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AD1E}",
-        nfc: "\u{AD1E}",
-        nfd: "\u{1100}\u{116B}\u{11AD}",
-        nfkc: "\u{AD1E}",
-        nfkd: "\u{1100}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AD1F}",
-        nfc: "\u{AD1F}",
-        nfd: "\u{1100}\u{116B}\u{11AE}",
-        nfkc: "\u{AD1F}",
-        nfkd: "\u{1100}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AD20}",
-        nfc: "\u{AD20}",
-        nfd: "\u{1100}\u{116B}\u{11AF}",
-        nfkc: "\u{AD20}",
-        nfkd: "\u{1100}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AD21}",
-        nfc: "\u{AD21}",
-        nfd: "\u{1100}\u{116B}\u{11B0}",
-        nfkc: "\u{AD21}",
-        nfkd: "\u{1100}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AD22}",
-        nfc: "\u{AD22}",
-        nfd: "\u{1100}\u{116B}\u{11B1}",
-        nfkc: "\u{AD22}",
-        nfkd: "\u{1100}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AD23}",
-        nfc: "\u{AD23}",
-        nfd: "\u{1100}\u{116B}\u{11B2}",
-        nfkc: "\u{AD23}",
-        nfkd: "\u{1100}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AD24}",
-        nfc: "\u{AD24}",
-        nfd: "\u{1100}\u{116B}\u{11B3}",
-        nfkc: "\u{AD24}",
-        nfkd: "\u{1100}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AD25}",
-        nfc: "\u{AD25}",
-        nfd: "\u{1100}\u{116B}\u{11B4}",
-        nfkc: "\u{AD25}",
-        nfkd: "\u{1100}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AD26}",
-        nfc: "\u{AD26}",
-        nfd: "\u{1100}\u{116B}\u{11B5}",
-        nfkc: "\u{AD26}",
-        nfkd: "\u{1100}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AD27}",
-        nfc: "\u{AD27}",
-        nfd: "\u{1100}\u{116B}\u{11B6}",
-        nfkc: "\u{AD27}",
-        nfkd: "\u{1100}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AD28}",
-        nfc: "\u{AD28}",
-        nfd: "\u{1100}\u{116B}\u{11B7}",
-        nfkc: "\u{AD28}",
-        nfkd: "\u{1100}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AD29}",
-        nfc: "\u{AD29}",
-        nfd: "\u{1100}\u{116B}\u{11B8}",
-        nfkc: "\u{AD29}",
-        nfkd: "\u{1100}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AD2A}",
-        nfc: "\u{AD2A}",
-        nfd: "\u{1100}\u{116B}\u{11B9}",
-        nfkc: "\u{AD2A}",
-        nfkd: "\u{1100}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AD2B}",
-        nfc: "\u{AD2B}",
-        nfd: "\u{1100}\u{116B}\u{11BA}",
-        nfkc: "\u{AD2B}",
-        nfkd: "\u{1100}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AD2C}",
-        nfc: "\u{AD2C}",
-        nfd: "\u{1100}\u{116B}\u{11BB}",
-        nfkc: "\u{AD2C}",
-        nfkd: "\u{1100}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AD2D}",
-        nfc: "\u{AD2D}",
-        nfd: "\u{1100}\u{116B}\u{11BC}",
-        nfkc: "\u{AD2D}",
-        nfkd: "\u{1100}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AD2E}",
-        nfc: "\u{AD2E}",
-        nfd: "\u{1100}\u{116B}\u{11BD}",
-        nfkc: "\u{AD2E}",
-        nfkd: "\u{1100}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AD2F}",
-        nfc: "\u{AD2F}",
-        nfd: "\u{1100}\u{116B}\u{11BE}",
-        nfkc: "\u{AD2F}",
-        nfkd: "\u{1100}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AD30}",
-        nfc: "\u{AD30}",
-        nfd: "\u{1100}\u{116B}\u{11BF}",
-        nfkc: "\u{AD30}",
-        nfkd: "\u{1100}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AD31}",
-        nfc: "\u{AD31}",
-        nfd: "\u{1100}\u{116B}\u{11C0}",
-        nfkc: "\u{AD31}",
-        nfkd: "\u{1100}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AD32}",
-        nfc: "\u{AD32}",
-        nfd: "\u{1100}\u{116B}\u{11C1}",
-        nfkc: "\u{AD32}",
-        nfkd: "\u{1100}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AD33}",
-        nfc: "\u{AD33}",
-        nfd: "\u{1100}\u{116B}\u{11C2}",
-        nfkc: "\u{AD33}",
-        nfkd: "\u{1100}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AD34}",
-        nfc: "\u{AD34}",
-        nfd: "\u{1100}\u{116C}",
-        nfkc: "\u{AD34}",
-        nfkd: "\u{1100}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{AD35}",
-        nfc: "\u{AD35}",
-        nfd: "\u{1100}\u{116C}\u{11A8}",
-        nfkc: "\u{AD35}",
-        nfkd: "\u{1100}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AD36}",
-        nfc: "\u{AD36}",
-        nfd: "\u{1100}\u{116C}\u{11A9}",
-        nfkc: "\u{AD36}",
-        nfkd: "\u{1100}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AD37}",
-        nfc: "\u{AD37}",
-        nfd: "\u{1100}\u{116C}\u{11AA}",
-        nfkc: "\u{AD37}",
-        nfkd: "\u{1100}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AD38}",
-        nfc: "\u{AD38}",
-        nfd: "\u{1100}\u{116C}\u{11AB}",
-        nfkc: "\u{AD38}",
-        nfkd: "\u{1100}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AD39}",
-        nfc: "\u{AD39}",
-        nfd: "\u{1100}\u{116C}\u{11AC}",
-        nfkc: "\u{AD39}",
-        nfkd: "\u{1100}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AD3A}",
-        nfc: "\u{AD3A}",
-        nfd: "\u{1100}\u{116C}\u{11AD}",
-        nfkc: "\u{AD3A}",
-        nfkd: "\u{1100}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AD3B}",
-        nfc: "\u{AD3B}",
-        nfd: "\u{1100}\u{116C}\u{11AE}",
-        nfkc: "\u{AD3B}",
-        nfkd: "\u{1100}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AD3C}",
-        nfc: "\u{AD3C}",
-        nfd: "\u{1100}\u{116C}\u{11AF}",
-        nfkc: "\u{AD3C}",
-        nfkd: "\u{1100}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AD3D}",
-        nfc: "\u{AD3D}",
-        nfd: "\u{1100}\u{116C}\u{11B0}",
-        nfkc: "\u{AD3D}",
-        nfkd: "\u{1100}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AD3E}",
-        nfc: "\u{AD3E}",
-        nfd: "\u{1100}\u{116C}\u{11B1}",
-        nfkc: "\u{AD3E}",
-        nfkd: "\u{1100}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AD3F}",
-        nfc: "\u{AD3F}",
-        nfd: "\u{1100}\u{116C}\u{11B2}",
-        nfkc: "\u{AD3F}",
-        nfkd: "\u{1100}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AD40}",
-        nfc: "\u{AD40}",
-        nfd: "\u{1100}\u{116C}\u{11B3}",
-        nfkc: "\u{AD40}",
-        nfkd: "\u{1100}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AD41}",
-        nfc: "\u{AD41}",
-        nfd: "\u{1100}\u{116C}\u{11B4}",
-        nfkc: "\u{AD41}",
-        nfkd: "\u{1100}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AD42}",
-        nfc: "\u{AD42}",
-        nfd: "\u{1100}\u{116C}\u{11B5}",
-        nfkc: "\u{AD42}",
-        nfkd: "\u{1100}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AD43}",
-        nfc: "\u{AD43}",
-        nfd: "\u{1100}\u{116C}\u{11B6}",
-        nfkc: "\u{AD43}",
-        nfkd: "\u{1100}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AD44}",
-        nfc: "\u{AD44}",
-        nfd: "\u{1100}\u{116C}\u{11B7}",
-        nfkc: "\u{AD44}",
-        nfkd: "\u{1100}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AD45}",
-        nfc: "\u{AD45}",
-        nfd: "\u{1100}\u{116C}\u{11B8}",
-        nfkc: "\u{AD45}",
-        nfkd: "\u{1100}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AD46}",
-        nfc: "\u{AD46}",
-        nfd: "\u{1100}\u{116C}\u{11B9}",
-        nfkc: "\u{AD46}",
-        nfkd: "\u{1100}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AD47}",
-        nfc: "\u{AD47}",
-        nfd: "\u{1100}\u{116C}\u{11BA}",
-        nfkc: "\u{AD47}",
-        nfkd: "\u{1100}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AD48}",
-        nfc: "\u{AD48}",
-        nfd: "\u{1100}\u{116C}\u{11BB}",
-        nfkc: "\u{AD48}",
-        nfkd: "\u{1100}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AD49}",
-        nfc: "\u{AD49}",
-        nfd: "\u{1100}\u{116C}\u{11BC}",
-        nfkc: "\u{AD49}",
-        nfkd: "\u{1100}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AD4A}",
-        nfc: "\u{AD4A}",
-        nfd: "\u{1100}\u{116C}\u{11BD}",
-        nfkc: "\u{AD4A}",
-        nfkd: "\u{1100}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AD4B}",
-        nfc: "\u{AD4B}",
-        nfd: "\u{1100}\u{116C}\u{11BE}",
-        nfkc: "\u{AD4B}",
-        nfkd: "\u{1100}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AD4C}",
-        nfc: "\u{AD4C}",
-        nfd: "\u{1100}\u{116C}\u{11BF}",
-        nfkc: "\u{AD4C}",
-        nfkd: "\u{1100}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AD4D}",
-        nfc: "\u{AD4D}",
-        nfd: "\u{1100}\u{116C}\u{11C0}",
-        nfkc: "\u{AD4D}",
-        nfkd: "\u{1100}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AD4E}",
-        nfc: "\u{AD4E}",
-        nfd: "\u{1100}\u{116C}\u{11C1}",
-        nfkc: "\u{AD4E}",
-        nfkd: "\u{1100}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AD4F}",
-        nfc: "\u{AD4F}",
-        nfd: "\u{1100}\u{116C}\u{11C2}",
-        nfkc: "\u{AD4F}",
-        nfkd: "\u{1100}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AD50}",
-        nfc: "\u{AD50}",
-        nfd: "\u{1100}\u{116D}",
-        nfkc: "\u{AD50}",
-        nfkd: "\u{1100}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{AD51}",
-        nfc: "\u{AD51}",
-        nfd: "\u{1100}\u{116D}\u{11A8}",
-        nfkc: "\u{AD51}",
-        nfkd: "\u{1100}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AD52}",
-        nfc: "\u{AD52}",
-        nfd: "\u{1100}\u{116D}\u{11A9}",
-        nfkc: "\u{AD52}",
-        nfkd: "\u{1100}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AD53}",
-        nfc: "\u{AD53}",
-        nfd: "\u{1100}\u{116D}\u{11AA}",
-        nfkc: "\u{AD53}",
-        nfkd: "\u{1100}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AD54}",
-        nfc: "\u{AD54}",
-        nfd: "\u{1100}\u{116D}\u{11AB}",
-        nfkc: "\u{AD54}",
-        nfkd: "\u{1100}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AD55}",
-        nfc: "\u{AD55}",
-        nfd: "\u{1100}\u{116D}\u{11AC}",
-        nfkc: "\u{AD55}",
-        nfkd: "\u{1100}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AD56}",
-        nfc: "\u{AD56}",
-        nfd: "\u{1100}\u{116D}\u{11AD}",
-        nfkc: "\u{AD56}",
-        nfkd: "\u{1100}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AD57}",
-        nfc: "\u{AD57}",
-        nfd: "\u{1100}\u{116D}\u{11AE}",
-        nfkc: "\u{AD57}",
-        nfkd: "\u{1100}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AD58}",
-        nfc: "\u{AD58}",
-        nfd: "\u{1100}\u{116D}\u{11AF}",
-        nfkc: "\u{AD58}",
-        nfkd: "\u{1100}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AD59}",
-        nfc: "\u{AD59}",
-        nfd: "\u{1100}\u{116D}\u{11B0}",
-        nfkc: "\u{AD59}",
-        nfkd: "\u{1100}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AD5A}",
-        nfc: "\u{AD5A}",
-        nfd: "\u{1100}\u{116D}\u{11B1}",
-        nfkc: "\u{AD5A}",
-        nfkd: "\u{1100}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AD5B}",
-        nfc: "\u{AD5B}",
-        nfd: "\u{1100}\u{116D}\u{11B2}",
-        nfkc: "\u{AD5B}",
-        nfkd: "\u{1100}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AD5C}",
-        nfc: "\u{AD5C}",
-        nfd: "\u{1100}\u{116D}\u{11B3}",
-        nfkc: "\u{AD5C}",
-        nfkd: "\u{1100}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AD5D}",
-        nfc: "\u{AD5D}",
-        nfd: "\u{1100}\u{116D}\u{11B4}",
-        nfkc: "\u{AD5D}",
-        nfkd: "\u{1100}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AD5E}",
-        nfc: "\u{AD5E}",
-        nfd: "\u{1100}\u{116D}\u{11B5}",
-        nfkc: "\u{AD5E}",
-        nfkd: "\u{1100}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AD5F}",
-        nfc: "\u{AD5F}",
-        nfd: "\u{1100}\u{116D}\u{11B6}",
-        nfkc: "\u{AD5F}",
-        nfkd: "\u{1100}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AD60}",
-        nfc: "\u{AD60}",
-        nfd: "\u{1100}\u{116D}\u{11B7}",
-        nfkc: "\u{AD60}",
-        nfkd: "\u{1100}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AD61}",
-        nfc: "\u{AD61}",
-        nfd: "\u{1100}\u{116D}\u{11B8}",
-        nfkc: "\u{AD61}",
-        nfkd: "\u{1100}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AD62}",
-        nfc: "\u{AD62}",
-        nfd: "\u{1100}\u{116D}\u{11B9}",
-        nfkc: "\u{AD62}",
-        nfkd: "\u{1100}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AD63}",
-        nfc: "\u{AD63}",
-        nfd: "\u{1100}\u{116D}\u{11BA}",
-        nfkc: "\u{AD63}",
-        nfkd: "\u{1100}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AD64}",
-        nfc: "\u{AD64}",
-        nfd: "\u{1100}\u{116D}\u{11BB}",
-        nfkc: "\u{AD64}",
-        nfkd: "\u{1100}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AD65}",
-        nfc: "\u{AD65}",
-        nfd: "\u{1100}\u{116D}\u{11BC}",
-        nfkc: "\u{AD65}",
-        nfkd: "\u{1100}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AD66}",
-        nfc: "\u{AD66}",
-        nfd: "\u{1100}\u{116D}\u{11BD}",
-        nfkc: "\u{AD66}",
-        nfkd: "\u{1100}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AD67}",
-        nfc: "\u{AD67}",
-        nfd: "\u{1100}\u{116D}\u{11BE}",
-        nfkc: "\u{AD67}",
-        nfkd: "\u{1100}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AD68}",
-        nfc: "\u{AD68}",
-        nfd: "\u{1100}\u{116D}\u{11BF}",
-        nfkc: "\u{AD68}",
-        nfkd: "\u{1100}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AD69}",
-        nfc: "\u{AD69}",
-        nfd: "\u{1100}\u{116D}\u{11C0}",
-        nfkc: "\u{AD69}",
-        nfkd: "\u{1100}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AD6A}",
-        nfc: "\u{AD6A}",
-        nfd: "\u{1100}\u{116D}\u{11C1}",
-        nfkc: "\u{AD6A}",
-        nfkd: "\u{1100}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AD6B}",
-        nfc: "\u{AD6B}",
-        nfd: "\u{1100}\u{116D}\u{11C2}",
-        nfkc: "\u{AD6B}",
-        nfkd: "\u{1100}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AD6C}",
-        nfc: "\u{AD6C}",
-        nfd: "\u{1100}\u{116E}",
-        nfkc: "\u{AD6C}",
-        nfkd: "\u{1100}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{AD6D}",
-        nfc: "\u{AD6D}",
-        nfd: "\u{1100}\u{116E}\u{11A8}",
-        nfkc: "\u{AD6D}",
-        nfkd: "\u{1100}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AD6E}",
-        nfc: "\u{AD6E}",
-        nfd: "\u{1100}\u{116E}\u{11A9}",
-        nfkc: "\u{AD6E}",
-        nfkd: "\u{1100}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AD6F}",
-        nfc: "\u{AD6F}",
-        nfd: "\u{1100}\u{116E}\u{11AA}",
-        nfkc: "\u{AD6F}",
-        nfkd: "\u{1100}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AD70}",
-        nfc: "\u{AD70}",
-        nfd: "\u{1100}\u{116E}\u{11AB}",
-        nfkc: "\u{AD70}",
-        nfkd: "\u{1100}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AD71}",
-        nfc: "\u{AD71}",
-        nfd: "\u{1100}\u{116E}\u{11AC}",
-        nfkc: "\u{AD71}",
-        nfkd: "\u{1100}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AD72}",
-        nfc: "\u{AD72}",
-        nfd: "\u{1100}\u{116E}\u{11AD}",
-        nfkc: "\u{AD72}",
-        nfkd: "\u{1100}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AD73}",
-        nfc: "\u{AD73}",
-        nfd: "\u{1100}\u{116E}\u{11AE}",
-        nfkc: "\u{AD73}",
-        nfkd: "\u{1100}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AD74}",
-        nfc: "\u{AD74}",
-        nfd: "\u{1100}\u{116E}\u{11AF}",
-        nfkc: "\u{AD74}",
-        nfkd: "\u{1100}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AD75}",
-        nfc: "\u{AD75}",
-        nfd: "\u{1100}\u{116E}\u{11B0}",
-        nfkc: "\u{AD75}",
-        nfkd: "\u{1100}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AD76}",
-        nfc: "\u{AD76}",
-        nfd: "\u{1100}\u{116E}\u{11B1}",
-        nfkc: "\u{AD76}",
-        nfkd: "\u{1100}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AD77}",
-        nfc: "\u{AD77}",
-        nfd: "\u{1100}\u{116E}\u{11B2}",
-        nfkc: "\u{AD77}",
-        nfkd: "\u{1100}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AD78}",
-        nfc: "\u{AD78}",
-        nfd: "\u{1100}\u{116E}\u{11B3}",
-        nfkc: "\u{AD78}",
-        nfkd: "\u{1100}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AD79}",
-        nfc: "\u{AD79}",
-        nfd: "\u{1100}\u{116E}\u{11B4}",
-        nfkc: "\u{AD79}",
-        nfkd: "\u{1100}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AD7A}",
-        nfc: "\u{AD7A}",
-        nfd: "\u{1100}\u{116E}\u{11B5}",
-        nfkc: "\u{AD7A}",
-        nfkd: "\u{1100}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AD7B}",
-        nfc: "\u{AD7B}",
-        nfd: "\u{1100}\u{116E}\u{11B6}",
-        nfkc: "\u{AD7B}",
-        nfkd: "\u{1100}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AD7C}",
-        nfc: "\u{AD7C}",
-        nfd: "\u{1100}\u{116E}\u{11B7}",
-        nfkc: "\u{AD7C}",
-        nfkd: "\u{1100}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AD7D}",
-        nfc: "\u{AD7D}",
-        nfd: "\u{1100}\u{116E}\u{11B8}",
-        nfkc: "\u{AD7D}",
-        nfkd: "\u{1100}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AD7E}",
-        nfc: "\u{AD7E}",
-        nfd: "\u{1100}\u{116E}\u{11B9}",
-        nfkc: "\u{AD7E}",
-        nfkd: "\u{1100}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AD7F}",
-        nfc: "\u{AD7F}",
-        nfd: "\u{1100}\u{116E}\u{11BA}",
-        nfkc: "\u{AD7F}",
-        nfkd: "\u{1100}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AD80}",
-        nfc: "\u{AD80}",
-        nfd: "\u{1100}\u{116E}\u{11BB}",
-        nfkc: "\u{AD80}",
-        nfkd: "\u{1100}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AD81}",
-        nfc: "\u{AD81}",
-        nfd: "\u{1100}\u{116E}\u{11BC}",
-        nfkc: "\u{AD81}",
-        nfkd: "\u{1100}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AD82}",
-        nfc: "\u{AD82}",
-        nfd: "\u{1100}\u{116E}\u{11BD}",
-        nfkc: "\u{AD82}",
-        nfkd: "\u{1100}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AD83}",
-        nfc: "\u{AD83}",
-        nfd: "\u{1100}\u{116E}\u{11BE}",
-        nfkc: "\u{AD83}",
-        nfkd: "\u{1100}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AD84}",
-        nfc: "\u{AD84}",
-        nfd: "\u{1100}\u{116E}\u{11BF}",
-        nfkc: "\u{AD84}",
-        nfkd: "\u{1100}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AD85}",
-        nfc: "\u{AD85}",
-        nfd: "\u{1100}\u{116E}\u{11C0}",
-        nfkc: "\u{AD85}",
-        nfkd: "\u{1100}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AD86}",
-        nfc: "\u{AD86}",
-        nfd: "\u{1100}\u{116E}\u{11C1}",
-        nfkc: "\u{AD86}",
-        nfkd: "\u{1100}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AD87}",
-        nfc: "\u{AD87}",
-        nfd: "\u{1100}\u{116E}\u{11C2}",
-        nfkc: "\u{AD87}",
-        nfkd: "\u{1100}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AD88}",
-        nfc: "\u{AD88}",
-        nfd: "\u{1100}\u{116F}",
-        nfkc: "\u{AD88}",
-        nfkd: "\u{1100}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{AD89}",
-        nfc: "\u{AD89}",
-        nfd: "\u{1100}\u{116F}\u{11A8}",
-        nfkc: "\u{AD89}",
-        nfkd: "\u{1100}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AD8A}",
-        nfc: "\u{AD8A}",
-        nfd: "\u{1100}\u{116F}\u{11A9}",
-        nfkc: "\u{AD8A}",
-        nfkd: "\u{1100}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AD8B}",
-        nfc: "\u{AD8B}",
-        nfd: "\u{1100}\u{116F}\u{11AA}",
-        nfkc: "\u{AD8B}",
-        nfkd: "\u{1100}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AD8C}",
-        nfc: "\u{AD8C}",
-        nfd: "\u{1100}\u{116F}\u{11AB}",
-        nfkc: "\u{AD8C}",
-        nfkd: "\u{1100}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AD8D}",
-        nfc: "\u{AD8D}",
-        nfd: "\u{1100}\u{116F}\u{11AC}",
-        nfkc: "\u{AD8D}",
-        nfkd: "\u{1100}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AD8E}",
-        nfc: "\u{AD8E}",
-        nfd: "\u{1100}\u{116F}\u{11AD}",
-        nfkc: "\u{AD8E}",
-        nfkd: "\u{1100}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AD8F}",
-        nfc: "\u{AD8F}",
-        nfd: "\u{1100}\u{116F}\u{11AE}",
-        nfkc: "\u{AD8F}",
-        nfkd: "\u{1100}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AD90}",
-        nfc: "\u{AD90}",
-        nfd: "\u{1100}\u{116F}\u{11AF}",
-        nfkc: "\u{AD90}",
-        nfkd: "\u{1100}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AD91}",
-        nfc: "\u{AD91}",
-        nfd: "\u{1100}\u{116F}\u{11B0}",
-        nfkc: "\u{AD91}",
-        nfkd: "\u{1100}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AD92}",
-        nfc: "\u{AD92}",
-        nfd: "\u{1100}\u{116F}\u{11B1}",
-        nfkc: "\u{AD92}",
-        nfkd: "\u{1100}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AD93}",
-        nfc: "\u{AD93}",
-        nfd: "\u{1100}\u{116F}\u{11B2}",
-        nfkc: "\u{AD93}",
-        nfkd: "\u{1100}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AD94}",
-        nfc: "\u{AD94}",
-        nfd: "\u{1100}\u{116F}\u{11B3}",
-        nfkc: "\u{AD94}",
-        nfkd: "\u{1100}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AD95}",
-        nfc: "\u{AD95}",
-        nfd: "\u{1100}\u{116F}\u{11B4}",
-        nfkc: "\u{AD95}",
-        nfkd: "\u{1100}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AD96}",
-        nfc: "\u{AD96}",
-        nfd: "\u{1100}\u{116F}\u{11B5}",
-        nfkc: "\u{AD96}",
-        nfkd: "\u{1100}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AD97}",
-        nfc: "\u{AD97}",
-        nfd: "\u{1100}\u{116F}\u{11B6}",
-        nfkc: "\u{AD97}",
-        nfkd: "\u{1100}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AD98}",
-        nfc: "\u{AD98}",
-        nfd: "\u{1100}\u{116F}\u{11B7}",
-        nfkc: "\u{AD98}",
-        nfkd: "\u{1100}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AD99}",
-        nfc: "\u{AD99}",
-        nfd: "\u{1100}\u{116F}\u{11B8}",
-        nfkc: "\u{AD99}",
-        nfkd: "\u{1100}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AD9A}",
-        nfc: "\u{AD9A}",
-        nfd: "\u{1100}\u{116F}\u{11B9}",
-        nfkc: "\u{AD9A}",
-        nfkd: "\u{1100}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AD9B}",
-        nfc: "\u{AD9B}",
-        nfd: "\u{1100}\u{116F}\u{11BA}",
-        nfkc: "\u{AD9B}",
-        nfkd: "\u{1100}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AD9C}",
-        nfc: "\u{AD9C}",
-        nfd: "\u{1100}\u{116F}\u{11BB}",
-        nfkc: "\u{AD9C}",
-        nfkd: "\u{1100}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AD9D}",
-        nfc: "\u{AD9D}",
-        nfd: "\u{1100}\u{116F}\u{11BC}",
-        nfkc: "\u{AD9D}",
-        nfkd: "\u{1100}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AD9E}",
-        nfc: "\u{AD9E}",
-        nfd: "\u{1100}\u{116F}\u{11BD}",
-        nfkc: "\u{AD9E}",
-        nfkd: "\u{1100}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AD9F}",
-        nfc: "\u{AD9F}",
-        nfd: "\u{1100}\u{116F}\u{11BE}",
-        nfkc: "\u{AD9F}",
-        nfkd: "\u{1100}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ADA0}",
-        nfc: "\u{ADA0}",
-        nfd: "\u{1100}\u{116F}\u{11BF}",
-        nfkc: "\u{ADA0}",
-        nfkd: "\u{1100}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ADA1}",
-        nfc: "\u{ADA1}",
-        nfd: "\u{1100}\u{116F}\u{11C0}",
-        nfkc: "\u{ADA1}",
-        nfkd: "\u{1100}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ADA2}",
-        nfc: "\u{ADA2}",
-        nfd: "\u{1100}\u{116F}\u{11C1}",
-        nfkc: "\u{ADA2}",
-        nfkd: "\u{1100}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ADA3}",
-        nfc: "\u{ADA3}",
-        nfd: "\u{1100}\u{116F}\u{11C2}",
-        nfkc: "\u{ADA3}",
-        nfkd: "\u{1100}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ADA4}",
-        nfc: "\u{ADA4}",
-        nfd: "\u{1100}\u{1170}",
-        nfkc: "\u{ADA4}",
-        nfkd: "\u{1100}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{ADA5}",
-        nfc: "\u{ADA5}",
-        nfd: "\u{1100}\u{1170}\u{11A8}",
-        nfkc: "\u{ADA5}",
-        nfkd: "\u{1100}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ADA6}",
-        nfc: "\u{ADA6}",
-        nfd: "\u{1100}\u{1170}\u{11A9}",
-        nfkc: "\u{ADA6}",
-        nfkd: "\u{1100}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ADA7}",
-        nfc: "\u{ADA7}",
-        nfd: "\u{1100}\u{1170}\u{11AA}",
-        nfkc: "\u{ADA7}",
-        nfkd: "\u{1100}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ADA8}",
-        nfc: "\u{ADA8}",
-        nfd: "\u{1100}\u{1170}\u{11AB}",
-        nfkc: "\u{ADA8}",
-        nfkd: "\u{1100}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ADA9}",
-        nfc: "\u{ADA9}",
-        nfd: "\u{1100}\u{1170}\u{11AC}",
-        nfkc: "\u{ADA9}",
-        nfkd: "\u{1100}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ADAA}",
-        nfc: "\u{ADAA}",
-        nfd: "\u{1100}\u{1170}\u{11AD}",
-        nfkc: "\u{ADAA}",
-        nfkd: "\u{1100}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ADAB}",
-        nfc: "\u{ADAB}",
-        nfd: "\u{1100}\u{1170}\u{11AE}",
-        nfkc: "\u{ADAB}",
-        nfkd: "\u{1100}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ADAC}",
-        nfc: "\u{ADAC}",
-        nfd: "\u{1100}\u{1170}\u{11AF}",
-        nfkc: "\u{ADAC}",
-        nfkd: "\u{1100}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{ADAD}",
-        nfc: "\u{ADAD}",
-        nfd: "\u{1100}\u{1170}\u{11B0}",
-        nfkc: "\u{ADAD}",
-        nfkd: "\u{1100}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{ADAE}",
-        nfc: "\u{ADAE}",
-        nfd: "\u{1100}\u{1170}\u{11B1}",
-        nfkc: "\u{ADAE}",
-        nfkd: "\u{1100}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{ADAF}",
-        nfc: "\u{ADAF}",
-        nfd: "\u{1100}\u{1170}\u{11B2}",
-        nfkc: "\u{ADAF}",
-        nfkd: "\u{1100}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{ADB0}",
-        nfc: "\u{ADB0}",
-        nfd: "\u{1100}\u{1170}\u{11B3}",
-        nfkc: "\u{ADB0}",
-        nfkd: "\u{1100}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{ADB1}",
-        nfc: "\u{ADB1}",
-        nfd: "\u{1100}\u{1170}\u{11B4}",
-        nfkc: "\u{ADB1}",
-        nfkd: "\u{1100}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{ADB2}",
-        nfc: "\u{ADB2}",
-        nfd: "\u{1100}\u{1170}\u{11B5}",
-        nfkc: "\u{ADB2}",
-        nfkd: "\u{1100}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ADB3}",
-        nfc: "\u{ADB3}",
-        nfd: "\u{1100}\u{1170}\u{11B6}",
-        nfkc: "\u{ADB3}",
-        nfkd: "\u{1100}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{ADB4}",
-        nfc: "\u{ADB4}",
-        nfd: "\u{1100}\u{1170}\u{11B7}",
-        nfkc: "\u{ADB4}",
-        nfkd: "\u{1100}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{ADB5}",
-        nfc: "\u{ADB5}",
-        nfd: "\u{1100}\u{1170}\u{11B8}",
-        nfkc: "\u{ADB5}",
-        nfkd: "\u{1100}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{ADB6}",
-        nfc: "\u{ADB6}",
-        nfd: "\u{1100}\u{1170}\u{11B9}",
-        nfkc: "\u{ADB6}",
-        nfkd: "\u{1100}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{ADB7}",
-        nfc: "\u{ADB7}",
-        nfd: "\u{1100}\u{1170}\u{11BA}",
-        nfkc: "\u{ADB7}",
-        nfkd: "\u{1100}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ADB8}",
-        nfc: "\u{ADB8}",
-        nfd: "\u{1100}\u{1170}\u{11BB}",
-        nfkc: "\u{ADB8}",
-        nfkd: "\u{1100}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ADB9}",
-        nfc: "\u{ADB9}",
-        nfd: "\u{1100}\u{1170}\u{11BC}",
-        nfkc: "\u{ADB9}",
-        nfkd: "\u{1100}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ADBA}",
-        nfc: "\u{ADBA}",
-        nfd: "\u{1100}\u{1170}\u{11BD}",
-        nfkc: "\u{ADBA}",
-        nfkd: "\u{1100}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ADBB}",
-        nfc: "\u{ADBB}",
-        nfd: "\u{1100}\u{1170}\u{11BE}",
-        nfkc: "\u{ADBB}",
-        nfkd: "\u{1100}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ADBC}",
-        nfc: "\u{ADBC}",
-        nfd: "\u{1100}\u{1170}\u{11BF}",
-        nfkc: "\u{ADBC}",
-        nfkd: "\u{1100}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ADBD}",
-        nfc: "\u{ADBD}",
-        nfd: "\u{1100}\u{1170}\u{11C0}",
-        nfkc: "\u{ADBD}",
-        nfkd: "\u{1100}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ADBE}",
-        nfc: "\u{ADBE}",
-        nfd: "\u{1100}\u{1170}\u{11C1}",
-        nfkc: "\u{ADBE}",
-        nfkd: "\u{1100}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ADBF}",
-        nfc: "\u{ADBF}",
-        nfd: "\u{1100}\u{1170}\u{11C2}",
-        nfkc: "\u{ADBF}",
-        nfkd: "\u{1100}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ADC0}",
-        nfc: "\u{ADC0}",
-        nfd: "\u{1100}\u{1171}",
-        nfkc: "\u{ADC0}",
-        nfkd: "\u{1100}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{ADC1}",
-        nfc: "\u{ADC1}",
-        nfd: "\u{1100}\u{1171}\u{11A8}",
-        nfkc: "\u{ADC1}",
-        nfkd: "\u{1100}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ADC2}",
-        nfc: "\u{ADC2}",
-        nfd: "\u{1100}\u{1171}\u{11A9}",
-        nfkc: "\u{ADC2}",
-        nfkd: "\u{1100}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ADC3}",
-        nfc: "\u{ADC3}",
-        nfd: "\u{1100}\u{1171}\u{11AA}",
-        nfkc: "\u{ADC3}",
-        nfkd: "\u{1100}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ADC4}",
-        nfc: "\u{ADC4}",
-        nfd: "\u{1100}\u{1171}\u{11AB}",
-        nfkc: "\u{ADC4}",
-        nfkd: "\u{1100}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ADC5}",
-        nfc: "\u{ADC5}",
-        nfd: "\u{1100}\u{1171}\u{11AC}",
-        nfkc: "\u{ADC5}",
-        nfkd: "\u{1100}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ADC6}",
-        nfc: "\u{ADC6}",
-        nfd: "\u{1100}\u{1171}\u{11AD}",
-        nfkc: "\u{ADC6}",
-        nfkd: "\u{1100}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ADC7}",
-        nfc: "\u{ADC7}",
-        nfd: "\u{1100}\u{1171}\u{11AE}",
-        nfkc: "\u{ADC7}",
-        nfkd: "\u{1100}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ADC8}",
-        nfc: "\u{ADC8}",
-        nfd: "\u{1100}\u{1171}\u{11AF}",
-        nfkc: "\u{ADC8}",
-        nfkd: "\u{1100}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{ADC9}",
-        nfc: "\u{ADC9}",
-        nfd: "\u{1100}\u{1171}\u{11B0}",
-        nfkc: "\u{ADC9}",
-        nfkd: "\u{1100}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{ADCA}",
-        nfc: "\u{ADCA}",
-        nfd: "\u{1100}\u{1171}\u{11B1}",
-        nfkc: "\u{ADCA}",
-        nfkd: "\u{1100}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{ADCB}",
-        nfc: "\u{ADCB}",
-        nfd: "\u{1100}\u{1171}\u{11B2}",
-        nfkc: "\u{ADCB}",
-        nfkd: "\u{1100}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{ADCC}",
-        nfc: "\u{ADCC}",
-        nfd: "\u{1100}\u{1171}\u{11B3}",
-        nfkc: "\u{ADCC}",
-        nfkd: "\u{1100}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{ADCD}",
-        nfc: "\u{ADCD}",
-        nfd: "\u{1100}\u{1171}\u{11B4}",
-        nfkc: "\u{ADCD}",
-        nfkd: "\u{1100}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{ADCE}",
-        nfc: "\u{ADCE}",
-        nfd: "\u{1100}\u{1171}\u{11B5}",
-        nfkc: "\u{ADCE}",
-        nfkd: "\u{1100}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ADCF}",
-        nfc: "\u{ADCF}",
-        nfd: "\u{1100}\u{1171}\u{11B6}",
-        nfkc: "\u{ADCF}",
-        nfkd: "\u{1100}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{ADD0}",
-        nfc: "\u{ADD0}",
-        nfd: "\u{1100}\u{1171}\u{11B7}",
-        nfkc: "\u{ADD0}",
-        nfkd: "\u{1100}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{ADD1}",
-        nfc: "\u{ADD1}",
-        nfd: "\u{1100}\u{1171}\u{11B8}",
-        nfkc: "\u{ADD1}",
-        nfkd: "\u{1100}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{ADD2}",
-        nfc: "\u{ADD2}",
-        nfd: "\u{1100}\u{1171}\u{11B9}",
-        nfkc: "\u{ADD2}",
-        nfkd: "\u{1100}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{ADD3}",
-        nfc: "\u{ADD3}",
-        nfd: "\u{1100}\u{1171}\u{11BA}",
-        nfkc: "\u{ADD3}",
-        nfkd: "\u{1100}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ADD4}",
-        nfc: "\u{ADD4}",
-        nfd: "\u{1100}\u{1171}\u{11BB}",
-        nfkc: "\u{ADD4}",
-        nfkd: "\u{1100}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ADD5}",
-        nfc: "\u{ADD5}",
-        nfd: "\u{1100}\u{1171}\u{11BC}",
-        nfkc: "\u{ADD5}",
-        nfkd: "\u{1100}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ADD6}",
-        nfc: "\u{ADD6}",
-        nfd: "\u{1100}\u{1171}\u{11BD}",
-        nfkc: "\u{ADD6}",
-        nfkd: "\u{1100}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ADD7}",
-        nfc: "\u{ADD7}",
-        nfd: "\u{1100}\u{1171}\u{11BE}",
-        nfkc: "\u{ADD7}",
-        nfkd: "\u{1100}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ADD8}",
-        nfc: "\u{ADD8}",
-        nfd: "\u{1100}\u{1171}\u{11BF}",
-        nfkc: "\u{ADD8}",
-        nfkd: "\u{1100}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ADD9}",
-        nfc: "\u{ADD9}",
-        nfd: "\u{1100}\u{1171}\u{11C0}",
-        nfkc: "\u{ADD9}",
-        nfkd: "\u{1100}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ADDA}",
-        nfc: "\u{ADDA}",
-        nfd: "\u{1100}\u{1171}\u{11C1}",
-        nfkc: "\u{ADDA}",
-        nfkd: "\u{1100}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ADDB}",
-        nfc: "\u{ADDB}",
-        nfd: "\u{1100}\u{1171}\u{11C2}",
-        nfkc: "\u{ADDB}",
-        nfkd: "\u{1100}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ADDC}",
-        nfc: "\u{ADDC}",
-        nfd: "\u{1100}\u{1172}",
-        nfkc: "\u{ADDC}",
-        nfkd: "\u{1100}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{ADDD}",
-        nfc: "\u{ADDD}",
-        nfd: "\u{1100}\u{1172}\u{11A8}",
-        nfkc: "\u{ADDD}",
-        nfkd: "\u{1100}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ADDE}",
-        nfc: "\u{ADDE}",
-        nfd: "\u{1100}\u{1172}\u{11A9}",
-        nfkc: "\u{ADDE}",
-        nfkd: "\u{1100}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ADDF}",
-        nfc: "\u{ADDF}",
-        nfd: "\u{1100}\u{1172}\u{11AA}",
-        nfkc: "\u{ADDF}",
-        nfkd: "\u{1100}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ADE0}",
-        nfc: "\u{ADE0}",
-        nfd: "\u{1100}\u{1172}\u{11AB}",
-        nfkc: "\u{ADE0}",
-        nfkd: "\u{1100}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ADE1}",
-        nfc: "\u{ADE1}",
-        nfd: "\u{1100}\u{1172}\u{11AC}",
-        nfkc: "\u{ADE1}",
-        nfkd: "\u{1100}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ADE2}",
-        nfc: "\u{ADE2}",
-        nfd: "\u{1100}\u{1172}\u{11AD}",
-        nfkc: "\u{ADE2}",
-        nfkd: "\u{1100}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ADE3}",
-        nfc: "\u{ADE3}",
-        nfd: "\u{1100}\u{1172}\u{11AE}",
-        nfkc: "\u{ADE3}",
-        nfkd: "\u{1100}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ADE4}",
-        nfc: "\u{ADE4}",
-        nfd: "\u{1100}\u{1172}\u{11AF}",
-        nfkc: "\u{ADE4}",
-        nfkd: "\u{1100}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{ADE5}",
-        nfc: "\u{ADE5}",
-        nfd: "\u{1100}\u{1172}\u{11B0}",
-        nfkc: "\u{ADE5}",
-        nfkd: "\u{1100}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{ADE6}",
-        nfc: "\u{ADE6}",
-        nfd: "\u{1100}\u{1172}\u{11B1}",
-        nfkc: "\u{ADE6}",
-        nfkd: "\u{1100}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{ADE7}",
-        nfc: "\u{ADE7}",
-        nfd: "\u{1100}\u{1172}\u{11B2}",
-        nfkc: "\u{ADE7}",
-        nfkd: "\u{1100}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{ADE8}",
-        nfc: "\u{ADE8}",
-        nfd: "\u{1100}\u{1172}\u{11B3}",
-        nfkc: "\u{ADE8}",
-        nfkd: "\u{1100}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{ADE9}",
-        nfc: "\u{ADE9}",
-        nfd: "\u{1100}\u{1172}\u{11B4}",
-        nfkc: "\u{ADE9}",
-        nfkd: "\u{1100}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{ADEA}",
-        nfc: "\u{ADEA}",
-        nfd: "\u{1100}\u{1172}\u{11B5}",
-        nfkc: "\u{ADEA}",
-        nfkd: "\u{1100}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ADEB}",
-        nfc: "\u{ADEB}",
-        nfd: "\u{1100}\u{1172}\u{11B6}",
-        nfkc: "\u{ADEB}",
-        nfkd: "\u{1100}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{ADEC}",
-        nfc: "\u{ADEC}",
-        nfd: "\u{1100}\u{1172}\u{11B7}",
-        nfkc: "\u{ADEC}",
-        nfkd: "\u{1100}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{ADED}",
-        nfc: "\u{ADED}",
-        nfd: "\u{1100}\u{1172}\u{11B8}",
-        nfkc: "\u{ADED}",
-        nfkd: "\u{1100}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{ADEE}",
-        nfc: "\u{ADEE}",
-        nfd: "\u{1100}\u{1172}\u{11B9}",
-        nfkc: "\u{ADEE}",
-        nfkd: "\u{1100}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{ADEF}",
-        nfc: "\u{ADEF}",
-        nfd: "\u{1100}\u{1172}\u{11BA}",
-        nfkc: "\u{ADEF}",
-        nfkd: "\u{1100}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{ADF0}",
-        nfc: "\u{ADF0}",
-        nfd: "\u{1100}\u{1172}\u{11BB}",
-        nfkc: "\u{ADF0}",
-        nfkd: "\u{1100}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{ADF1}",
-        nfc: "\u{ADF1}",
-        nfd: "\u{1100}\u{1172}\u{11BC}",
-        nfkc: "\u{ADF1}",
-        nfkd: "\u{1100}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ADF2}",
-        nfc: "\u{ADF2}",
-        nfd: "\u{1100}\u{1172}\u{11BD}",
-        nfkc: "\u{ADF2}",
-        nfkd: "\u{1100}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{ADF3}",
-        nfc: "\u{ADF3}",
-        nfd: "\u{1100}\u{1172}\u{11BE}",
-        nfkc: "\u{ADF3}",
-        nfkd: "\u{1100}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{ADF4}",
-        nfc: "\u{ADF4}",
-        nfd: "\u{1100}\u{1172}\u{11BF}",
-        nfkc: "\u{ADF4}",
-        nfkd: "\u{1100}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{ADF5}",
-        nfc: "\u{ADF5}",
-        nfd: "\u{1100}\u{1172}\u{11C0}",
-        nfkc: "\u{ADF5}",
-        nfkd: "\u{1100}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{ADF6}",
-        nfc: "\u{ADF6}",
-        nfd: "\u{1100}\u{1172}\u{11C1}",
-        nfkc: "\u{ADF6}",
-        nfkd: "\u{1100}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{ADF7}",
-        nfc: "\u{ADF7}",
-        nfd: "\u{1100}\u{1172}\u{11C2}",
-        nfkc: "\u{ADF7}",
-        nfkd: "\u{1100}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{ADF8}",
-        nfc: "\u{ADF8}",
-        nfd: "\u{1100}\u{1173}",
-        nfkc: "\u{ADF8}",
-        nfkd: "\u{1100}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{ADF9}",
-        nfc: "\u{ADF9}",
-        nfd: "\u{1100}\u{1173}\u{11A8}",
-        nfkc: "\u{ADF9}",
-        nfkd: "\u{1100}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{ADFA}",
-        nfc: "\u{ADFA}",
-        nfd: "\u{1100}\u{1173}\u{11A9}",
-        nfkc: "\u{ADFA}",
-        nfkd: "\u{1100}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{ADFB}",
-        nfc: "\u{ADFB}",
-        nfd: "\u{1100}\u{1173}\u{11AA}",
-        nfkc: "\u{ADFB}",
-        nfkd: "\u{1100}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{ADFC}",
-        nfc: "\u{ADFC}",
-        nfd: "\u{1100}\u{1173}\u{11AB}",
-        nfkc: "\u{ADFC}",
-        nfkd: "\u{1100}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{ADFD}",
-        nfc: "\u{ADFD}",
-        nfd: "\u{1100}\u{1173}\u{11AC}",
-        nfkc: "\u{ADFD}",
-        nfkd: "\u{1100}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{ADFE}",
-        nfc: "\u{ADFE}",
-        nfd: "\u{1100}\u{1173}\u{11AD}",
-        nfkc: "\u{ADFE}",
-        nfkd: "\u{1100}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{ADFF}",
-        nfc: "\u{ADFF}",
-        nfd: "\u{1100}\u{1173}\u{11AE}",
-        nfkc: "\u{ADFF}",
-        nfkd: "\u{1100}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE00}",
-        nfc: "\u{AE00}",
-        nfd: "\u{1100}\u{1173}\u{11AF}",
-        nfkc: "\u{AE00}",
-        nfkd: "\u{1100}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AE01}",
-        nfc: "\u{AE01}",
-        nfd: "\u{1100}\u{1173}\u{11B0}",
-        nfkc: "\u{AE01}",
-        nfkd: "\u{1100}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AE02}",
-        nfc: "\u{AE02}",
-        nfd: "\u{1100}\u{1173}\u{11B1}",
-        nfkc: "\u{AE02}",
-        nfkd: "\u{1100}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AE03}",
-        nfc: "\u{AE03}",
-        nfd: "\u{1100}\u{1173}\u{11B2}",
-        nfkc: "\u{AE03}",
-        nfkd: "\u{1100}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AE04}",
-        nfc: "\u{AE04}",
-        nfd: "\u{1100}\u{1173}\u{11B3}",
-        nfkc: "\u{AE04}",
-        nfkd: "\u{1100}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AE05}",
-        nfc: "\u{AE05}",
-        nfd: "\u{1100}\u{1173}\u{11B4}",
-        nfkc: "\u{AE05}",
-        nfkd: "\u{1100}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AE06}",
-        nfc: "\u{AE06}",
-        nfd: "\u{1100}\u{1173}\u{11B5}",
-        nfkc: "\u{AE06}",
-        nfkd: "\u{1100}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE07}",
-        nfc: "\u{AE07}",
-        nfd: "\u{1100}\u{1173}\u{11B6}",
-        nfkc: "\u{AE07}",
-        nfkd: "\u{1100}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AE08}",
-        nfc: "\u{AE08}",
-        nfd: "\u{1100}\u{1173}\u{11B7}",
-        nfkc: "\u{AE08}",
-        nfkd: "\u{1100}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AE09}",
-        nfc: "\u{AE09}",
-        nfd: "\u{1100}\u{1173}\u{11B8}",
-        nfkc: "\u{AE09}",
-        nfkd: "\u{1100}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AE0A}",
-        nfc: "\u{AE0A}",
-        nfd: "\u{1100}\u{1173}\u{11B9}",
-        nfkc: "\u{AE0A}",
-        nfkd: "\u{1100}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AE0B}",
-        nfc: "\u{AE0B}",
-        nfd: "\u{1100}\u{1173}\u{11BA}",
-        nfkc: "\u{AE0B}",
-        nfkd: "\u{1100}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AE0C}",
-        nfc: "\u{AE0C}",
-        nfd: "\u{1100}\u{1173}\u{11BB}",
-        nfkc: "\u{AE0C}",
-        nfkd: "\u{1100}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AE0D}",
-        nfc: "\u{AE0D}",
-        nfd: "\u{1100}\u{1173}\u{11BC}",
-        nfkc: "\u{AE0D}",
-        nfkd: "\u{1100}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AE0E}",
-        nfc: "\u{AE0E}",
-        nfd: "\u{1100}\u{1173}\u{11BD}",
-        nfkc: "\u{AE0E}",
-        nfkd: "\u{1100}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AE0F}",
-        nfc: "\u{AE0F}",
-        nfd: "\u{1100}\u{1173}\u{11BE}",
-        nfkc: "\u{AE0F}",
-        nfkd: "\u{1100}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AE10}",
-        nfc: "\u{AE10}",
-        nfd: "\u{1100}\u{1173}\u{11BF}",
-        nfkc: "\u{AE10}",
-        nfkd: "\u{1100}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AE11}",
-        nfc: "\u{AE11}",
-        nfd: "\u{1100}\u{1173}\u{11C0}",
-        nfkc: "\u{AE11}",
-        nfkd: "\u{1100}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AE12}",
-        nfc: "\u{AE12}",
-        nfd: "\u{1100}\u{1173}\u{11C1}",
-        nfkc: "\u{AE12}",
-        nfkd: "\u{1100}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AE13}",
-        nfc: "\u{AE13}",
-        nfd: "\u{1100}\u{1173}\u{11C2}",
-        nfkc: "\u{AE13}",
-        nfkd: "\u{1100}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AE14}",
-        nfc: "\u{AE14}",
-        nfd: "\u{1100}\u{1174}",
-        nfkc: "\u{AE14}",
-        nfkd: "\u{1100}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{AE15}",
-        nfc: "\u{AE15}",
-        nfd: "\u{1100}\u{1174}\u{11A8}",
-        nfkc: "\u{AE15}",
-        nfkd: "\u{1100}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AE16}",
-        nfc: "\u{AE16}",
-        nfd: "\u{1100}\u{1174}\u{11A9}",
-        nfkc: "\u{AE16}",
-        nfkd: "\u{1100}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AE17}",
-        nfc: "\u{AE17}",
-        nfd: "\u{1100}\u{1174}\u{11AA}",
-        nfkc: "\u{AE17}",
-        nfkd: "\u{1100}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AE18}",
-        nfc: "\u{AE18}",
-        nfd: "\u{1100}\u{1174}\u{11AB}",
-        nfkc: "\u{AE18}",
-        nfkd: "\u{1100}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AE19}",
-        nfc: "\u{AE19}",
-        nfd: "\u{1100}\u{1174}\u{11AC}",
-        nfkc: "\u{AE19}",
-        nfkd: "\u{1100}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AE1A}",
-        nfc: "\u{AE1A}",
-        nfd: "\u{1100}\u{1174}\u{11AD}",
-        nfkc: "\u{AE1A}",
-        nfkd: "\u{1100}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AE1B}",
-        nfc: "\u{AE1B}",
-        nfd: "\u{1100}\u{1174}\u{11AE}",
-        nfkc: "\u{AE1B}",
-        nfkd: "\u{1100}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE1C}",
-        nfc: "\u{AE1C}",
-        nfd: "\u{1100}\u{1174}\u{11AF}",
-        nfkc: "\u{AE1C}",
-        nfkd: "\u{1100}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AE1D}",
-        nfc: "\u{AE1D}",
-        nfd: "\u{1100}\u{1174}\u{11B0}",
-        nfkc: "\u{AE1D}",
-        nfkd: "\u{1100}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AE1E}",
-        nfc: "\u{AE1E}",
-        nfd: "\u{1100}\u{1174}\u{11B1}",
-        nfkc: "\u{AE1E}",
-        nfkd: "\u{1100}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AE1F}",
-        nfc: "\u{AE1F}",
-        nfd: "\u{1100}\u{1174}\u{11B2}",
-        nfkc: "\u{AE1F}",
-        nfkd: "\u{1100}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AE20}",
-        nfc: "\u{AE20}",
-        nfd: "\u{1100}\u{1174}\u{11B3}",
-        nfkc: "\u{AE20}",
-        nfkd: "\u{1100}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AE21}",
-        nfc: "\u{AE21}",
-        nfd: "\u{1100}\u{1174}\u{11B4}",
-        nfkc: "\u{AE21}",
-        nfkd: "\u{1100}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AE22}",
-        nfc: "\u{AE22}",
-        nfd: "\u{1100}\u{1174}\u{11B5}",
-        nfkc: "\u{AE22}",
-        nfkd: "\u{1100}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE23}",
-        nfc: "\u{AE23}",
-        nfd: "\u{1100}\u{1174}\u{11B6}",
-        nfkc: "\u{AE23}",
-        nfkd: "\u{1100}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AE24}",
-        nfc: "\u{AE24}",
-        nfd: "\u{1100}\u{1174}\u{11B7}",
-        nfkc: "\u{AE24}",
-        nfkd: "\u{1100}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AE25}",
-        nfc: "\u{AE25}",
-        nfd: "\u{1100}\u{1174}\u{11B8}",
-        nfkc: "\u{AE25}",
-        nfkd: "\u{1100}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AE26}",
-        nfc: "\u{AE26}",
-        nfd: "\u{1100}\u{1174}\u{11B9}",
-        nfkc: "\u{AE26}",
-        nfkd: "\u{1100}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AE27}",
-        nfc: "\u{AE27}",
-        nfd: "\u{1100}\u{1174}\u{11BA}",
-        nfkc: "\u{AE27}",
-        nfkd: "\u{1100}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AE28}",
-        nfc: "\u{AE28}",
-        nfd: "\u{1100}\u{1174}\u{11BB}",
-        nfkc: "\u{AE28}",
-        nfkd: "\u{1100}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AE29}",
-        nfc: "\u{AE29}",
-        nfd: "\u{1100}\u{1174}\u{11BC}",
-        nfkc: "\u{AE29}",
-        nfkd: "\u{1100}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AE2A}",
-        nfc: "\u{AE2A}",
-        nfd: "\u{1100}\u{1174}\u{11BD}",
-        nfkc: "\u{AE2A}",
-        nfkd: "\u{1100}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AE2B}",
-        nfc: "\u{AE2B}",
-        nfd: "\u{1100}\u{1174}\u{11BE}",
-        nfkc: "\u{AE2B}",
-        nfkd: "\u{1100}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AE2C}",
-        nfc: "\u{AE2C}",
-        nfd: "\u{1100}\u{1174}\u{11BF}",
-        nfkc: "\u{AE2C}",
-        nfkd: "\u{1100}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AE2D}",
-        nfc: "\u{AE2D}",
-        nfd: "\u{1100}\u{1174}\u{11C0}",
-        nfkc: "\u{AE2D}",
-        nfkd: "\u{1100}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AE2E}",
-        nfc: "\u{AE2E}",
-        nfd: "\u{1100}\u{1174}\u{11C1}",
-        nfkc: "\u{AE2E}",
-        nfkd: "\u{1100}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AE2F}",
-        nfc: "\u{AE2F}",
-        nfd: "\u{1100}\u{1174}\u{11C2}",
-        nfkc: "\u{AE2F}",
-        nfkd: "\u{1100}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AE30}",
-        nfc: "\u{AE30}",
-        nfd: "\u{1100}\u{1175}",
-        nfkc: "\u{AE30}",
-        nfkd: "\u{1100}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{AE31}",
-        nfc: "\u{AE31}",
-        nfd: "\u{1100}\u{1175}\u{11A8}",
-        nfkc: "\u{AE31}",
-        nfkd: "\u{1100}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AE32}",
-        nfc: "\u{AE32}",
-        nfd: "\u{1100}\u{1175}\u{11A9}",
-        nfkc: "\u{AE32}",
-        nfkd: "\u{1100}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AE33}",
-        nfc: "\u{AE33}",
-        nfd: "\u{1100}\u{1175}\u{11AA}",
-        nfkc: "\u{AE33}",
-        nfkd: "\u{1100}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AE34}",
-        nfc: "\u{AE34}",
-        nfd: "\u{1100}\u{1175}\u{11AB}",
-        nfkc: "\u{AE34}",
-        nfkd: "\u{1100}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AE35}",
-        nfc: "\u{AE35}",
-        nfd: "\u{1100}\u{1175}\u{11AC}",
-        nfkc: "\u{AE35}",
-        nfkd: "\u{1100}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AE36}",
-        nfc: "\u{AE36}",
-        nfd: "\u{1100}\u{1175}\u{11AD}",
-        nfkc: "\u{AE36}",
-        nfkd: "\u{1100}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AE37}",
-        nfc: "\u{AE37}",
-        nfd: "\u{1100}\u{1175}\u{11AE}",
-        nfkc: "\u{AE37}",
-        nfkd: "\u{1100}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE38}",
-        nfc: "\u{AE38}",
-        nfd: "\u{1100}\u{1175}\u{11AF}",
-        nfkc: "\u{AE38}",
-        nfkd: "\u{1100}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AE39}",
-        nfc: "\u{AE39}",
-        nfd: "\u{1100}\u{1175}\u{11B0}",
-        nfkc: "\u{AE39}",
-        nfkd: "\u{1100}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AE3A}",
-        nfc: "\u{AE3A}",
-        nfd: "\u{1100}\u{1175}\u{11B1}",
-        nfkc: "\u{AE3A}",
-        nfkd: "\u{1100}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AE3B}",
-        nfc: "\u{AE3B}",
-        nfd: "\u{1100}\u{1175}\u{11B2}",
-        nfkc: "\u{AE3B}",
-        nfkd: "\u{1100}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AE3C}",
-        nfc: "\u{AE3C}",
-        nfd: "\u{1100}\u{1175}\u{11B3}",
-        nfkc: "\u{AE3C}",
-        nfkd: "\u{1100}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AE3D}",
-        nfc: "\u{AE3D}",
-        nfd: "\u{1100}\u{1175}\u{11B4}",
-        nfkc: "\u{AE3D}",
-        nfkd: "\u{1100}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AE3E}",
-        nfc: "\u{AE3E}",
-        nfd: "\u{1100}\u{1175}\u{11B5}",
-        nfkc: "\u{AE3E}",
-        nfkd: "\u{1100}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE3F}",
-        nfc: "\u{AE3F}",
-        nfd: "\u{1100}\u{1175}\u{11B6}",
-        nfkc: "\u{AE3F}",
-        nfkd: "\u{1100}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AE40}",
-        nfc: "\u{AE40}",
-        nfd: "\u{1100}\u{1175}\u{11B7}",
-        nfkc: "\u{AE40}",
-        nfkd: "\u{1100}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AE41}",
-        nfc: "\u{AE41}",
-        nfd: "\u{1100}\u{1175}\u{11B8}",
-        nfkc: "\u{AE41}",
-        nfkd: "\u{1100}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AE42}",
-        nfc: "\u{AE42}",
-        nfd: "\u{1100}\u{1175}\u{11B9}",
-        nfkc: "\u{AE42}",
-        nfkd: "\u{1100}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AE43}",
-        nfc: "\u{AE43}",
-        nfd: "\u{1100}\u{1175}\u{11BA}",
-        nfkc: "\u{AE43}",
-        nfkd: "\u{1100}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AE44}",
-        nfc: "\u{AE44}",
-        nfd: "\u{1100}\u{1175}\u{11BB}",
-        nfkc: "\u{AE44}",
-        nfkd: "\u{1100}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AE45}",
-        nfc: "\u{AE45}",
-        nfd: "\u{1100}\u{1175}\u{11BC}",
-        nfkc: "\u{AE45}",
-        nfkd: "\u{1100}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AE46}",
-        nfc: "\u{AE46}",
-        nfd: "\u{1100}\u{1175}\u{11BD}",
-        nfkc: "\u{AE46}",
-        nfkd: "\u{1100}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AE47}",
-        nfc: "\u{AE47}",
-        nfd: "\u{1100}\u{1175}\u{11BE}",
-        nfkc: "\u{AE47}",
-        nfkd: "\u{1100}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AE48}",
-        nfc: "\u{AE48}",
-        nfd: "\u{1100}\u{1175}\u{11BF}",
-        nfkc: "\u{AE48}",
-        nfkd: "\u{1100}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AE49}",
-        nfc: "\u{AE49}",
-        nfd: "\u{1100}\u{1175}\u{11C0}",
-        nfkc: "\u{AE49}",
-        nfkd: "\u{1100}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AE4A}",
-        nfc: "\u{AE4A}",
-        nfd: "\u{1100}\u{1175}\u{11C1}",
-        nfkc: "\u{AE4A}",
-        nfkd: "\u{1100}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AE4B}",
-        nfc: "\u{AE4B}",
-        nfd: "\u{1100}\u{1175}\u{11C2}",
-        nfkc: "\u{AE4B}",
-        nfkd: "\u{1100}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AE4C}",
-        nfc: "\u{AE4C}",
-        nfd: "\u{1101}\u{1161}",
-        nfkc: "\u{AE4C}",
-        nfkd: "\u{1101}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{AE4D}",
-        nfc: "\u{AE4D}",
-        nfd: "\u{1101}\u{1161}\u{11A8}",
-        nfkc: "\u{AE4D}",
-        nfkd: "\u{1101}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AE4E}",
-        nfc: "\u{AE4E}",
-        nfd: "\u{1101}\u{1161}\u{11A9}",
-        nfkc: "\u{AE4E}",
-        nfkd: "\u{1101}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AE4F}",
-        nfc: "\u{AE4F}",
-        nfd: "\u{1101}\u{1161}\u{11AA}",
-        nfkc: "\u{AE4F}",
-        nfkd: "\u{1101}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AE50}",
-        nfc: "\u{AE50}",
-        nfd: "\u{1101}\u{1161}\u{11AB}",
-        nfkc: "\u{AE50}",
-        nfkd: "\u{1101}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AE51}",
-        nfc: "\u{AE51}",
-        nfd: "\u{1101}\u{1161}\u{11AC}",
-        nfkc: "\u{AE51}",
-        nfkd: "\u{1101}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AE52}",
-        nfc: "\u{AE52}",
-        nfd: "\u{1101}\u{1161}\u{11AD}",
-        nfkc: "\u{AE52}",
-        nfkd: "\u{1101}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AE53}",
-        nfc: "\u{AE53}",
-        nfd: "\u{1101}\u{1161}\u{11AE}",
-        nfkc: "\u{AE53}",
-        nfkd: "\u{1101}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE54}",
-        nfc: "\u{AE54}",
-        nfd: "\u{1101}\u{1161}\u{11AF}",
-        nfkc: "\u{AE54}",
-        nfkd: "\u{1101}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AE55}",
-        nfc: "\u{AE55}",
-        nfd: "\u{1101}\u{1161}\u{11B0}",
-        nfkc: "\u{AE55}",
-        nfkd: "\u{1101}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AE56}",
-        nfc: "\u{AE56}",
-        nfd: "\u{1101}\u{1161}\u{11B1}",
-        nfkc: "\u{AE56}",
-        nfkd: "\u{1101}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AE57}",
-        nfc: "\u{AE57}",
-        nfd: "\u{1101}\u{1161}\u{11B2}",
-        nfkc: "\u{AE57}",
-        nfkd: "\u{1101}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AE58}",
-        nfc: "\u{AE58}",
-        nfd: "\u{1101}\u{1161}\u{11B3}",
-        nfkc: "\u{AE58}",
-        nfkd: "\u{1101}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AE59}",
-        nfc: "\u{AE59}",
-        nfd: "\u{1101}\u{1161}\u{11B4}",
-        nfkc: "\u{AE59}",
-        nfkd: "\u{1101}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AE5A}",
-        nfc: "\u{AE5A}",
-        nfd: "\u{1101}\u{1161}\u{11B5}",
-        nfkc: "\u{AE5A}",
-        nfkd: "\u{1101}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE5B}",
-        nfc: "\u{AE5B}",
-        nfd: "\u{1101}\u{1161}\u{11B6}",
-        nfkc: "\u{AE5B}",
-        nfkd: "\u{1101}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AE5C}",
-        nfc: "\u{AE5C}",
-        nfd: "\u{1101}\u{1161}\u{11B7}",
-        nfkc: "\u{AE5C}",
-        nfkd: "\u{1101}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AE5D}",
-        nfc: "\u{AE5D}",
-        nfd: "\u{1101}\u{1161}\u{11B8}",
-        nfkc: "\u{AE5D}",
-        nfkd: "\u{1101}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AE5E}",
-        nfc: "\u{AE5E}",
-        nfd: "\u{1101}\u{1161}\u{11B9}",
-        nfkc: "\u{AE5E}",
-        nfkd: "\u{1101}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AE5F}",
-        nfc: "\u{AE5F}",
-        nfd: "\u{1101}\u{1161}\u{11BA}",
-        nfkc: "\u{AE5F}",
-        nfkd: "\u{1101}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AE60}",
-        nfc: "\u{AE60}",
-        nfd: "\u{1101}\u{1161}\u{11BB}",
-        nfkc: "\u{AE60}",
-        nfkd: "\u{1101}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AE61}",
-        nfc: "\u{AE61}",
-        nfd: "\u{1101}\u{1161}\u{11BC}",
-        nfkc: "\u{AE61}",
-        nfkd: "\u{1101}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AE62}",
-        nfc: "\u{AE62}",
-        nfd: "\u{1101}\u{1161}\u{11BD}",
-        nfkc: "\u{AE62}",
-        nfkd: "\u{1101}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AE63}",
-        nfc: "\u{AE63}",
-        nfd: "\u{1101}\u{1161}\u{11BE}",
-        nfkc: "\u{AE63}",
-        nfkd: "\u{1101}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AE64}",
-        nfc: "\u{AE64}",
-        nfd: "\u{1101}\u{1161}\u{11BF}",
-        nfkc: "\u{AE64}",
-        nfkd: "\u{1101}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AE65}",
-        nfc: "\u{AE65}",
-        nfd: "\u{1101}\u{1161}\u{11C0}",
-        nfkc: "\u{AE65}",
-        nfkd: "\u{1101}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AE66}",
-        nfc: "\u{AE66}",
-        nfd: "\u{1101}\u{1161}\u{11C1}",
-        nfkc: "\u{AE66}",
-        nfkd: "\u{1101}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AE67}",
-        nfc: "\u{AE67}",
-        nfd: "\u{1101}\u{1161}\u{11C2}",
-        nfkc: "\u{AE67}",
-        nfkd: "\u{1101}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AE68}",
-        nfc: "\u{AE68}",
-        nfd: "\u{1101}\u{1162}",
-        nfkc: "\u{AE68}",
-        nfkd: "\u{1101}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{AE69}",
-        nfc: "\u{AE69}",
-        nfd: "\u{1101}\u{1162}\u{11A8}",
-        nfkc: "\u{AE69}",
-        nfkd: "\u{1101}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AE6A}",
-        nfc: "\u{AE6A}",
-        nfd: "\u{1101}\u{1162}\u{11A9}",
-        nfkc: "\u{AE6A}",
-        nfkd: "\u{1101}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AE6B}",
-        nfc: "\u{AE6B}",
-        nfd: "\u{1101}\u{1162}\u{11AA}",
-        nfkc: "\u{AE6B}",
-        nfkd: "\u{1101}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AE6C}",
-        nfc: "\u{AE6C}",
-        nfd: "\u{1101}\u{1162}\u{11AB}",
-        nfkc: "\u{AE6C}",
-        nfkd: "\u{1101}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AE6D}",
-        nfc: "\u{AE6D}",
-        nfd: "\u{1101}\u{1162}\u{11AC}",
-        nfkc: "\u{AE6D}",
-        nfkd: "\u{1101}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AE6E}",
-        nfc: "\u{AE6E}",
-        nfd: "\u{1101}\u{1162}\u{11AD}",
-        nfkc: "\u{AE6E}",
-        nfkd: "\u{1101}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AE6F}",
-        nfc: "\u{AE6F}",
-        nfd: "\u{1101}\u{1162}\u{11AE}",
-        nfkc: "\u{AE6F}",
-        nfkd: "\u{1101}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE70}",
-        nfc: "\u{AE70}",
-        nfd: "\u{1101}\u{1162}\u{11AF}",
-        nfkc: "\u{AE70}",
-        nfkd: "\u{1101}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AE71}",
-        nfc: "\u{AE71}",
-        nfd: "\u{1101}\u{1162}\u{11B0}",
-        nfkc: "\u{AE71}",
-        nfkd: "\u{1101}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AE72}",
-        nfc: "\u{AE72}",
-        nfd: "\u{1101}\u{1162}\u{11B1}",
-        nfkc: "\u{AE72}",
-        nfkd: "\u{1101}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AE73}",
-        nfc: "\u{AE73}",
-        nfd: "\u{1101}\u{1162}\u{11B2}",
-        nfkc: "\u{AE73}",
-        nfkd: "\u{1101}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AE74}",
-        nfc: "\u{AE74}",
-        nfd: "\u{1101}\u{1162}\u{11B3}",
-        nfkc: "\u{AE74}",
-        nfkd: "\u{1101}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AE75}",
-        nfc: "\u{AE75}",
-        nfd: "\u{1101}\u{1162}\u{11B4}",
-        nfkc: "\u{AE75}",
-        nfkd: "\u{1101}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AE76}",
-        nfc: "\u{AE76}",
-        nfd: "\u{1101}\u{1162}\u{11B5}",
-        nfkc: "\u{AE76}",
-        nfkd: "\u{1101}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE77}",
-        nfc: "\u{AE77}",
-        nfd: "\u{1101}\u{1162}\u{11B6}",
-        nfkc: "\u{AE77}",
-        nfkd: "\u{1101}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AE78}",
-        nfc: "\u{AE78}",
-        nfd: "\u{1101}\u{1162}\u{11B7}",
-        nfkc: "\u{AE78}",
-        nfkd: "\u{1101}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AE79}",
-        nfc: "\u{AE79}",
-        nfd: "\u{1101}\u{1162}\u{11B8}",
-        nfkc: "\u{AE79}",
-        nfkd: "\u{1101}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AE7A}",
-        nfc: "\u{AE7A}",
-        nfd: "\u{1101}\u{1162}\u{11B9}",
-        nfkc: "\u{AE7A}",
-        nfkd: "\u{1101}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AE7B}",
-        nfc: "\u{AE7B}",
-        nfd: "\u{1101}\u{1162}\u{11BA}",
-        nfkc: "\u{AE7B}",
-        nfkd: "\u{1101}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AE7C}",
-        nfc: "\u{AE7C}",
-        nfd: "\u{1101}\u{1162}\u{11BB}",
-        nfkc: "\u{AE7C}",
-        nfkd: "\u{1101}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AE7D}",
-        nfc: "\u{AE7D}",
-        nfd: "\u{1101}\u{1162}\u{11BC}",
-        nfkc: "\u{AE7D}",
-        nfkd: "\u{1101}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AE7E}",
-        nfc: "\u{AE7E}",
-        nfd: "\u{1101}\u{1162}\u{11BD}",
-        nfkc: "\u{AE7E}",
-        nfkd: "\u{1101}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AE7F}",
-        nfc: "\u{AE7F}",
-        nfd: "\u{1101}\u{1162}\u{11BE}",
-        nfkc: "\u{AE7F}",
-        nfkd: "\u{1101}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AE80}",
-        nfc: "\u{AE80}",
-        nfd: "\u{1101}\u{1162}\u{11BF}",
-        nfkc: "\u{AE80}",
-        nfkd: "\u{1101}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AE81}",
-        nfc: "\u{AE81}",
-        nfd: "\u{1101}\u{1162}\u{11C0}",
-        nfkc: "\u{AE81}",
-        nfkd: "\u{1101}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AE82}",
-        nfc: "\u{AE82}",
-        nfd: "\u{1101}\u{1162}\u{11C1}",
-        nfkc: "\u{AE82}",
-        nfkd: "\u{1101}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AE83}",
-        nfc: "\u{AE83}",
-        nfd: "\u{1101}\u{1162}\u{11C2}",
-        nfkc: "\u{AE83}",
-        nfkd: "\u{1101}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AE84}",
-        nfc: "\u{AE84}",
-        nfd: "\u{1101}\u{1163}",
-        nfkc: "\u{AE84}",
-        nfkd: "\u{1101}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{AE85}",
-        nfc: "\u{AE85}",
-        nfd: "\u{1101}\u{1163}\u{11A8}",
-        nfkc: "\u{AE85}",
-        nfkd: "\u{1101}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AE86}",
-        nfc: "\u{AE86}",
-        nfd: "\u{1101}\u{1163}\u{11A9}",
-        nfkc: "\u{AE86}",
-        nfkd: "\u{1101}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AE87}",
-        nfc: "\u{AE87}",
-        nfd: "\u{1101}\u{1163}\u{11AA}",
-        nfkc: "\u{AE87}",
-        nfkd: "\u{1101}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AE88}",
-        nfc: "\u{AE88}",
-        nfd: "\u{1101}\u{1163}\u{11AB}",
-        nfkc: "\u{AE88}",
-        nfkd: "\u{1101}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AE89}",
-        nfc: "\u{AE89}",
-        nfd: "\u{1101}\u{1163}\u{11AC}",
-        nfkc: "\u{AE89}",
-        nfkd: "\u{1101}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AE8A}",
-        nfc: "\u{AE8A}",
-        nfd: "\u{1101}\u{1163}\u{11AD}",
-        nfkc: "\u{AE8A}",
-        nfkd: "\u{1101}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AE8B}",
-        nfc: "\u{AE8B}",
-        nfd: "\u{1101}\u{1163}\u{11AE}",
-        nfkc: "\u{AE8B}",
-        nfkd: "\u{1101}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE8C}",
-        nfc: "\u{AE8C}",
-        nfd: "\u{1101}\u{1163}\u{11AF}",
-        nfkc: "\u{AE8C}",
-        nfkd: "\u{1101}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AE8D}",
-        nfc: "\u{AE8D}",
-        nfd: "\u{1101}\u{1163}\u{11B0}",
-        nfkc: "\u{AE8D}",
-        nfkd: "\u{1101}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AE8E}",
-        nfc: "\u{AE8E}",
-        nfd: "\u{1101}\u{1163}\u{11B1}",
-        nfkc: "\u{AE8E}",
-        nfkd: "\u{1101}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AE8F}",
-        nfc: "\u{AE8F}",
-        nfd: "\u{1101}\u{1163}\u{11B2}",
-        nfkc: "\u{AE8F}",
-        nfkd: "\u{1101}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AE90}",
-        nfc: "\u{AE90}",
-        nfd: "\u{1101}\u{1163}\u{11B3}",
-        nfkc: "\u{AE90}",
-        nfkd: "\u{1101}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AE91}",
-        nfc: "\u{AE91}",
-        nfd: "\u{1101}\u{1163}\u{11B4}",
-        nfkc: "\u{AE91}",
-        nfkd: "\u{1101}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AE92}",
-        nfc: "\u{AE92}",
-        nfd: "\u{1101}\u{1163}\u{11B5}",
-        nfkc: "\u{AE92}",
-        nfkd: "\u{1101}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE93}",
-        nfc: "\u{AE93}",
-        nfd: "\u{1101}\u{1163}\u{11B6}",
-        nfkc: "\u{AE93}",
-        nfkd: "\u{1101}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AE94}",
-        nfc: "\u{AE94}",
-        nfd: "\u{1101}\u{1163}\u{11B7}",
-        nfkc: "\u{AE94}",
-        nfkd: "\u{1101}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AE95}",
-        nfc: "\u{AE95}",
-        nfd: "\u{1101}\u{1163}\u{11B8}",
-        nfkc: "\u{AE95}",
-        nfkd: "\u{1101}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AE96}",
-        nfc: "\u{AE96}",
-        nfd: "\u{1101}\u{1163}\u{11B9}",
-        nfkc: "\u{AE96}",
-        nfkd: "\u{1101}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AE97}",
-        nfc: "\u{AE97}",
-        nfd: "\u{1101}\u{1163}\u{11BA}",
-        nfkc: "\u{AE97}",
-        nfkd: "\u{1101}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AE98}",
-        nfc: "\u{AE98}",
-        nfd: "\u{1101}\u{1163}\u{11BB}",
-        nfkc: "\u{AE98}",
-        nfkd: "\u{1101}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AE99}",
-        nfc: "\u{AE99}",
-        nfd: "\u{1101}\u{1163}\u{11BC}",
-        nfkc: "\u{AE99}",
-        nfkd: "\u{1101}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AE9A}",
-        nfc: "\u{AE9A}",
-        nfd: "\u{1101}\u{1163}\u{11BD}",
-        nfkc: "\u{AE9A}",
-        nfkd: "\u{1101}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AE9B}",
-        nfc: "\u{AE9B}",
-        nfd: "\u{1101}\u{1163}\u{11BE}",
-        nfkc: "\u{AE9B}",
-        nfkd: "\u{1101}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AE9C}",
-        nfc: "\u{AE9C}",
-        nfd: "\u{1101}\u{1163}\u{11BF}",
-        nfkc: "\u{AE9C}",
-        nfkd: "\u{1101}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AE9D}",
-        nfc: "\u{AE9D}",
-        nfd: "\u{1101}\u{1163}\u{11C0}",
-        nfkc: "\u{AE9D}",
-        nfkd: "\u{1101}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AE9E}",
-        nfc: "\u{AE9E}",
-        nfd: "\u{1101}\u{1163}\u{11C1}",
-        nfkc: "\u{AE9E}",
-        nfkd: "\u{1101}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AE9F}",
-        nfc: "\u{AE9F}",
-        nfd: "\u{1101}\u{1163}\u{11C2}",
-        nfkc: "\u{AE9F}",
-        nfkd: "\u{1101}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AEA0}",
-        nfc: "\u{AEA0}",
-        nfd: "\u{1101}\u{1164}",
-        nfkc: "\u{AEA0}",
-        nfkd: "\u{1101}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{AEA1}",
-        nfc: "\u{AEA1}",
-        nfd: "\u{1101}\u{1164}\u{11A8}",
-        nfkc: "\u{AEA1}",
-        nfkd: "\u{1101}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AEA2}",
-        nfc: "\u{AEA2}",
-        nfd: "\u{1101}\u{1164}\u{11A9}",
-        nfkc: "\u{AEA2}",
-        nfkd: "\u{1101}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AEA3}",
-        nfc: "\u{AEA3}",
-        nfd: "\u{1101}\u{1164}\u{11AA}",
-        nfkc: "\u{AEA3}",
-        nfkd: "\u{1101}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AEA4}",
-        nfc: "\u{AEA4}",
-        nfd: "\u{1101}\u{1164}\u{11AB}",
-        nfkc: "\u{AEA4}",
-        nfkd: "\u{1101}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AEA5}",
-        nfc: "\u{AEA5}",
-        nfd: "\u{1101}\u{1164}\u{11AC}",
-        nfkc: "\u{AEA5}",
-        nfkd: "\u{1101}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AEA6}",
-        nfc: "\u{AEA6}",
-        nfd: "\u{1101}\u{1164}\u{11AD}",
-        nfkc: "\u{AEA6}",
-        nfkd: "\u{1101}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AEA7}",
-        nfc: "\u{AEA7}",
-        nfd: "\u{1101}\u{1164}\u{11AE}",
-        nfkc: "\u{AEA7}",
-        nfkd: "\u{1101}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AEA8}",
-        nfc: "\u{AEA8}",
-        nfd: "\u{1101}\u{1164}\u{11AF}",
-        nfkc: "\u{AEA8}",
-        nfkd: "\u{1101}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AEA9}",
-        nfc: "\u{AEA9}",
-        nfd: "\u{1101}\u{1164}\u{11B0}",
-        nfkc: "\u{AEA9}",
-        nfkd: "\u{1101}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AEAA}",
-        nfc: "\u{AEAA}",
-        nfd: "\u{1101}\u{1164}\u{11B1}",
-        nfkc: "\u{AEAA}",
-        nfkd: "\u{1101}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AEAB}",
-        nfc: "\u{AEAB}",
-        nfd: "\u{1101}\u{1164}\u{11B2}",
-        nfkc: "\u{AEAB}",
-        nfkd: "\u{1101}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AEAC}",
-        nfc: "\u{AEAC}",
-        nfd: "\u{1101}\u{1164}\u{11B3}",
-        nfkc: "\u{AEAC}",
-        nfkd: "\u{1101}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AEAD}",
-        nfc: "\u{AEAD}",
-        nfd: "\u{1101}\u{1164}\u{11B4}",
-        nfkc: "\u{AEAD}",
-        nfkd: "\u{1101}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AEAE}",
-        nfc: "\u{AEAE}",
-        nfd: "\u{1101}\u{1164}\u{11B5}",
-        nfkc: "\u{AEAE}",
-        nfkd: "\u{1101}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AEAF}",
-        nfc: "\u{AEAF}",
-        nfd: "\u{1101}\u{1164}\u{11B6}",
-        nfkc: "\u{AEAF}",
-        nfkd: "\u{1101}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AEB0}",
-        nfc: "\u{AEB0}",
-        nfd: "\u{1101}\u{1164}\u{11B7}",
-        nfkc: "\u{AEB0}",
-        nfkd: "\u{1101}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AEB1}",
-        nfc: "\u{AEB1}",
-        nfd: "\u{1101}\u{1164}\u{11B8}",
-        nfkc: "\u{AEB1}",
-        nfkd: "\u{1101}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AEB2}",
-        nfc: "\u{AEB2}",
-        nfd: "\u{1101}\u{1164}\u{11B9}",
-        nfkc: "\u{AEB2}",
-        nfkd: "\u{1101}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AEB3}",
-        nfc: "\u{AEB3}",
-        nfd: "\u{1101}\u{1164}\u{11BA}",
-        nfkc: "\u{AEB3}",
-        nfkd: "\u{1101}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AEB4}",
-        nfc: "\u{AEB4}",
-        nfd: "\u{1101}\u{1164}\u{11BB}",
-        nfkc: "\u{AEB4}",
-        nfkd: "\u{1101}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AEB5}",
-        nfc: "\u{AEB5}",
-        nfd: "\u{1101}\u{1164}\u{11BC}",
-        nfkc: "\u{AEB5}",
-        nfkd: "\u{1101}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AEB6}",
-        nfc: "\u{AEB6}",
-        nfd: "\u{1101}\u{1164}\u{11BD}",
-        nfkc: "\u{AEB6}",
-        nfkd: "\u{1101}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AEB7}",
-        nfc: "\u{AEB7}",
-        nfd: "\u{1101}\u{1164}\u{11BE}",
-        nfkc: "\u{AEB7}",
-        nfkd: "\u{1101}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AEB8}",
-        nfc: "\u{AEB8}",
-        nfd: "\u{1101}\u{1164}\u{11BF}",
-        nfkc: "\u{AEB8}",
-        nfkd: "\u{1101}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AEB9}",
-        nfc: "\u{AEB9}",
-        nfd: "\u{1101}\u{1164}\u{11C0}",
-        nfkc: "\u{AEB9}",
-        nfkd: "\u{1101}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AEBA}",
-        nfc: "\u{AEBA}",
-        nfd: "\u{1101}\u{1164}\u{11C1}",
-        nfkc: "\u{AEBA}",
-        nfkd: "\u{1101}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AEBB}",
-        nfc: "\u{AEBB}",
-        nfd: "\u{1101}\u{1164}\u{11C2}",
-        nfkc: "\u{AEBB}",
-        nfkd: "\u{1101}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AEBC}",
-        nfc: "\u{AEBC}",
-        nfd: "\u{1101}\u{1165}",
-        nfkc: "\u{AEBC}",
-        nfkd: "\u{1101}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{AEBD}",
-        nfc: "\u{AEBD}",
-        nfd: "\u{1101}\u{1165}\u{11A8}",
-        nfkc: "\u{AEBD}",
-        nfkd: "\u{1101}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AEBE}",
-        nfc: "\u{AEBE}",
-        nfd: "\u{1101}\u{1165}\u{11A9}",
-        nfkc: "\u{AEBE}",
-        nfkd: "\u{1101}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AEBF}",
-        nfc: "\u{AEBF}",
-        nfd: "\u{1101}\u{1165}\u{11AA}",
-        nfkc: "\u{AEBF}",
-        nfkd: "\u{1101}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AEC0}",
-        nfc: "\u{AEC0}",
-        nfd: "\u{1101}\u{1165}\u{11AB}",
-        nfkc: "\u{AEC0}",
-        nfkd: "\u{1101}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AEC1}",
-        nfc: "\u{AEC1}",
-        nfd: "\u{1101}\u{1165}\u{11AC}",
-        nfkc: "\u{AEC1}",
-        nfkd: "\u{1101}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AEC2}",
-        nfc: "\u{AEC2}",
-        nfd: "\u{1101}\u{1165}\u{11AD}",
-        nfkc: "\u{AEC2}",
-        nfkd: "\u{1101}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AEC3}",
-        nfc: "\u{AEC3}",
-        nfd: "\u{1101}\u{1165}\u{11AE}",
-        nfkc: "\u{AEC3}",
-        nfkd: "\u{1101}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AEC4}",
-        nfc: "\u{AEC4}",
-        nfd: "\u{1101}\u{1165}\u{11AF}",
-        nfkc: "\u{AEC4}",
-        nfkd: "\u{1101}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AEC5}",
-        nfc: "\u{AEC5}",
-        nfd: "\u{1101}\u{1165}\u{11B0}",
-        nfkc: "\u{AEC5}",
-        nfkd: "\u{1101}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AEC6}",
-        nfc: "\u{AEC6}",
-        nfd: "\u{1101}\u{1165}\u{11B1}",
-        nfkc: "\u{AEC6}",
-        nfkd: "\u{1101}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AEC7}",
-        nfc: "\u{AEC7}",
-        nfd: "\u{1101}\u{1165}\u{11B2}",
-        nfkc: "\u{AEC7}",
-        nfkd: "\u{1101}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AEC8}",
-        nfc: "\u{AEC8}",
-        nfd: "\u{1101}\u{1165}\u{11B3}",
-        nfkc: "\u{AEC8}",
-        nfkd: "\u{1101}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AEC9}",
-        nfc: "\u{AEC9}",
-        nfd: "\u{1101}\u{1165}\u{11B4}",
-        nfkc: "\u{AEC9}",
-        nfkd: "\u{1101}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AECA}",
-        nfc: "\u{AECA}",
-        nfd: "\u{1101}\u{1165}\u{11B5}",
-        nfkc: "\u{AECA}",
-        nfkd: "\u{1101}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AECB}",
-        nfc: "\u{AECB}",
-        nfd: "\u{1101}\u{1165}\u{11B6}",
-        nfkc: "\u{AECB}",
-        nfkd: "\u{1101}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AECC}",
-        nfc: "\u{AECC}",
-        nfd: "\u{1101}\u{1165}\u{11B7}",
-        nfkc: "\u{AECC}",
-        nfkd: "\u{1101}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AECD}",
-        nfc: "\u{AECD}",
-        nfd: "\u{1101}\u{1165}\u{11B8}",
-        nfkc: "\u{AECD}",
-        nfkd: "\u{1101}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AECE}",
-        nfc: "\u{AECE}",
-        nfd: "\u{1101}\u{1165}\u{11B9}",
-        nfkc: "\u{AECE}",
-        nfkd: "\u{1101}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AECF}",
-        nfc: "\u{AECF}",
-        nfd: "\u{1101}\u{1165}\u{11BA}",
-        nfkc: "\u{AECF}",
-        nfkd: "\u{1101}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AED0}",
-        nfc: "\u{AED0}",
-        nfd: "\u{1101}\u{1165}\u{11BB}",
-        nfkc: "\u{AED0}",
-        nfkd: "\u{1101}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AED1}",
-        nfc: "\u{AED1}",
-        nfd: "\u{1101}\u{1165}\u{11BC}",
-        nfkc: "\u{AED1}",
-        nfkd: "\u{1101}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AED2}",
-        nfc: "\u{AED2}",
-        nfd: "\u{1101}\u{1165}\u{11BD}",
-        nfkc: "\u{AED2}",
-        nfkd: "\u{1101}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AED3}",
-        nfc: "\u{AED3}",
-        nfd: "\u{1101}\u{1165}\u{11BE}",
-        nfkc: "\u{AED3}",
-        nfkd: "\u{1101}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AED4}",
-        nfc: "\u{AED4}",
-        nfd: "\u{1101}\u{1165}\u{11BF}",
-        nfkc: "\u{AED4}",
-        nfkd: "\u{1101}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AED5}",
-        nfc: "\u{AED5}",
-        nfd: "\u{1101}\u{1165}\u{11C0}",
-        nfkc: "\u{AED5}",
-        nfkd: "\u{1101}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AED6}",
-        nfc: "\u{AED6}",
-        nfd: "\u{1101}\u{1165}\u{11C1}",
-        nfkc: "\u{AED6}",
-        nfkd: "\u{1101}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AED7}",
-        nfc: "\u{AED7}",
-        nfd: "\u{1101}\u{1165}\u{11C2}",
-        nfkc: "\u{AED7}",
-        nfkd: "\u{1101}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AED8}",
-        nfc: "\u{AED8}",
-        nfd: "\u{1101}\u{1166}",
-        nfkc: "\u{AED8}",
-        nfkd: "\u{1101}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{AED9}",
-        nfc: "\u{AED9}",
-        nfd: "\u{1101}\u{1166}\u{11A8}",
-        nfkc: "\u{AED9}",
-        nfkd: "\u{1101}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AEDA}",
-        nfc: "\u{AEDA}",
-        nfd: "\u{1101}\u{1166}\u{11A9}",
-        nfkc: "\u{AEDA}",
-        nfkd: "\u{1101}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AEDB}",
-        nfc: "\u{AEDB}",
-        nfd: "\u{1101}\u{1166}\u{11AA}",
-        nfkc: "\u{AEDB}",
-        nfkd: "\u{1101}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AEDC}",
-        nfc: "\u{AEDC}",
-        nfd: "\u{1101}\u{1166}\u{11AB}",
-        nfkc: "\u{AEDC}",
-        nfkd: "\u{1101}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AEDD}",
-        nfc: "\u{AEDD}",
-        nfd: "\u{1101}\u{1166}\u{11AC}",
-        nfkc: "\u{AEDD}",
-        nfkd: "\u{1101}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AEDE}",
-        nfc: "\u{AEDE}",
-        nfd: "\u{1101}\u{1166}\u{11AD}",
-        nfkc: "\u{AEDE}",
-        nfkd: "\u{1101}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AEDF}",
-        nfc: "\u{AEDF}",
-        nfd: "\u{1101}\u{1166}\u{11AE}",
-        nfkc: "\u{AEDF}",
-        nfkd: "\u{1101}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AEE0}",
-        nfc: "\u{AEE0}",
-        nfd: "\u{1101}\u{1166}\u{11AF}",
-        nfkc: "\u{AEE0}",
-        nfkd: "\u{1101}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AEE1}",
-        nfc: "\u{AEE1}",
-        nfd: "\u{1101}\u{1166}\u{11B0}",
-        nfkc: "\u{AEE1}",
-        nfkd: "\u{1101}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AEE2}",
-        nfc: "\u{AEE2}",
-        nfd: "\u{1101}\u{1166}\u{11B1}",
-        nfkc: "\u{AEE2}",
-        nfkd: "\u{1101}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AEE3}",
-        nfc: "\u{AEE3}",
-        nfd: "\u{1101}\u{1166}\u{11B2}",
-        nfkc: "\u{AEE3}",
-        nfkd: "\u{1101}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AEE4}",
-        nfc: "\u{AEE4}",
-        nfd: "\u{1101}\u{1166}\u{11B3}",
-        nfkc: "\u{AEE4}",
-        nfkd: "\u{1101}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AEE5}",
-        nfc: "\u{AEE5}",
-        nfd: "\u{1101}\u{1166}\u{11B4}",
-        nfkc: "\u{AEE5}",
-        nfkd: "\u{1101}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AEE6}",
-        nfc: "\u{AEE6}",
-        nfd: "\u{1101}\u{1166}\u{11B5}",
-        nfkc: "\u{AEE6}",
-        nfkd: "\u{1101}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AEE7}",
-        nfc: "\u{AEE7}",
-        nfd: "\u{1101}\u{1166}\u{11B6}",
-        nfkc: "\u{AEE7}",
-        nfkd: "\u{1101}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AEE8}",
-        nfc: "\u{AEE8}",
-        nfd: "\u{1101}\u{1166}\u{11B7}",
-        nfkc: "\u{AEE8}",
-        nfkd: "\u{1101}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AEE9}",
-        nfc: "\u{AEE9}",
-        nfd: "\u{1101}\u{1166}\u{11B8}",
-        nfkc: "\u{AEE9}",
-        nfkd: "\u{1101}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AEEA}",
-        nfc: "\u{AEEA}",
-        nfd: "\u{1101}\u{1166}\u{11B9}",
-        nfkc: "\u{AEEA}",
-        nfkd: "\u{1101}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AEEB}",
-        nfc: "\u{AEEB}",
-        nfd: "\u{1101}\u{1166}\u{11BA}",
-        nfkc: "\u{AEEB}",
-        nfkd: "\u{1101}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AEEC}",
-        nfc: "\u{AEEC}",
-        nfd: "\u{1101}\u{1166}\u{11BB}",
-        nfkc: "\u{AEEC}",
-        nfkd: "\u{1101}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AEED}",
-        nfc: "\u{AEED}",
-        nfd: "\u{1101}\u{1166}\u{11BC}",
-        nfkc: "\u{AEED}",
-        nfkd: "\u{1101}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AEEE}",
-        nfc: "\u{AEEE}",
-        nfd: "\u{1101}\u{1166}\u{11BD}",
-        nfkc: "\u{AEEE}",
-        nfkd: "\u{1101}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AEEF}",
-        nfc: "\u{AEEF}",
-        nfd: "\u{1101}\u{1166}\u{11BE}",
-        nfkc: "\u{AEEF}",
-        nfkd: "\u{1101}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AEF0}",
-        nfc: "\u{AEF0}",
-        nfd: "\u{1101}\u{1166}\u{11BF}",
-        nfkc: "\u{AEF0}",
-        nfkd: "\u{1101}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AEF1}",
-        nfc: "\u{AEF1}",
-        nfd: "\u{1101}\u{1166}\u{11C0}",
-        nfkc: "\u{AEF1}",
-        nfkd: "\u{1101}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AEF2}",
-        nfc: "\u{AEF2}",
-        nfd: "\u{1101}\u{1166}\u{11C1}",
-        nfkc: "\u{AEF2}",
-        nfkd: "\u{1101}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AEF3}",
-        nfc: "\u{AEF3}",
-        nfd: "\u{1101}\u{1166}\u{11C2}",
-        nfkc: "\u{AEF3}",
-        nfkd: "\u{1101}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AEF4}",
-        nfc: "\u{AEF4}",
-        nfd: "\u{1101}\u{1167}",
-        nfkc: "\u{AEF4}",
-        nfkd: "\u{1101}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{AEF5}",
-        nfc: "\u{AEF5}",
-        nfd: "\u{1101}\u{1167}\u{11A8}",
-        nfkc: "\u{AEF5}",
-        nfkd: "\u{1101}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AEF6}",
-        nfc: "\u{AEF6}",
-        nfd: "\u{1101}\u{1167}\u{11A9}",
-        nfkc: "\u{AEF6}",
-        nfkd: "\u{1101}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AEF7}",
-        nfc: "\u{AEF7}",
-        nfd: "\u{1101}\u{1167}\u{11AA}",
-        nfkc: "\u{AEF7}",
-        nfkd: "\u{1101}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AEF8}",
-        nfc: "\u{AEF8}",
-        nfd: "\u{1101}\u{1167}\u{11AB}",
-        nfkc: "\u{AEF8}",
-        nfkd: "\u{1101}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AEF9}",
-        nfc: "\u{AEF9}",
-        nfd: "\u{1101}\u{1167}\u{11AC}",
-        nfkc: "\u{AEF9}",
-        nfkd: "\u{1101}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AEFA}",
-        nfc: "\u{AEFA}",
-        nfd: "\u{1101}\u{1167}\u{11AD}",
-        nfkc: "\u{AEFA}",
-        nfkd: "\u{1101}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AEFB}",
-        nfc: "\u{AEFB}",
-        nfd: "\u{1101}\u{1167}\u{11AE}",
-        nfkc: "\u{AEFB}",
-        nfkd: "\u{1101}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AEFC}",
-        nfc: "\u{AEFC}",
-        nfd: "\u{1101}\u{1167}\u{11AF}",
-        nfkc: "\u{AEFC}",
-        nfkd: "\u{1101}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AEFD}",
-        nfc: "\u{AEFD}",
-        nfd: "\u{1101}\u{1167}\u{11B0}",
-        nfkc: "\u{AEFD}",
-        nfkd: "\u{1101}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AEFE}",
-        nfc: "\u{AEFE}",
-        nfd: "\u{1101}\u{1167}\u{11B1}",
-        nfkc: "\u{AEFE}",
-        nfkd: "\u{1101}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AEFF}",
-        nfc: "\u{AEFF}",
-        nfd: "\u{1101}\u{1167}\u{11B2}",
-        nfkc: "\u{AEFF}",
-        nfkd: "\u{1101}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AF00}",
-        nfc: "\u{AF00}",
-        nfd: "\u{1101}\u{1167}\u{11B3}",
-        nfkc: "\u{AF00}",
-        nfkd: "\u{1101}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AF01}",
-        nfc: "\u{AF01}",
-        nfd: "\u{1101}\u{1167}\u{11B4}",
-        nfkc: "\u{AF01}",
-        nfkd: "\u{1101}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AF02}",
-        nfc: "\u{AF02}",
-        nfd: "\u{1101}\u{1167}\u{11B5}",
-        nfkc: "\u{AF02}",
-        nfkd: "\u{1101}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AF03}",
-        nfc: "\u{AF03}",
-        nfd: "\u{1101}\u{1167}\u{11B6}",
-        nfkc: "\u{AF03}",
-        nfkd: "\u{1101}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AF04}",
-        nfc: "\u{AF04}",
-        nfd: "\u{1101}\u{1167}\u{11B7}",
-        nfkc: "\u{AF04}",
-        nfkd: "\u{1101}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AF05}",
-        nfc: "\u{AF05}",
-        nfd: "\u{1101}\u{1167}\u{11B8}",
-        nfkc: "\u{AF05}",
-        nfkd: "\u{1101}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AF06}",
-        nfc: "\u{AF06}",
-        nfd: "\u{1101}\u{1167}\u{11B9}",
-        nfkc: "\u{AF06}",
-        nfkd: "\u{1101}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AF07}",
-        nfc: "\u{AF07}",
-        nfd: "\u{1101}\u{1167}\u{11BA}",
-        nfkc: "\u{AF07}",
-        nfkd: "\u{1101}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AF08}",
-        nfc: "\u{AF08}",
-        nfd: "\u{1101}\u{1167}\u{11BB}",
-        nfkc: "\u{AF08}",
-        nfkd: "\u{1101}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AF09}",
-        nfc: "\u{AF09}",
-        nfd: "\u{1101}\u{1167}\u{11BC}",
-        nfkc: "\u{AF09}",
-        nfkd: "\u{1101}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF0A}",
-        nfc: "\u{AF0A}",
-        nfd: "\u{1101}\u{1167}\u{11BD}",
-        nfkc: "\u{AF0A}",
-        nfkd: "\u{1101}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AF0B}",
-        nfc: "\u{AF0B}",
-        nfd: "\u{1101}\u{1167}\u{11BE}",
-        nfkc: "\u{AF0B}",
-        nfkd: "\u{1101}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AF0C}",
-        nfc: "\u{AF0C}",
-        nfd: "\u{1101}\u{1167}\u{11BF}",
-        nfkc: "\u{AF0C}",
-        nfkd: "\u{1101}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AF0D}",
-        nfc: "\u{AF0D}",
-        nfd: "\u{1101}\u{1167}\u{11C0}",
-        nfkc: "\u{AF0D}",
-        nfkd: "\u{1101}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AF0E}",
-        nfc: "\u{AF0E}",
-        nfd: "\u{1101}\u{1167}\u{11C1}",
-        nfkc: "\u{AF0E}",
-        nfkd: "\u{1101}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AF0F}",
-        nfc: "\u{AF0F}",
-        nfd: "\u{1101}\u{1167}\u{11C2}",
-        nfkc: "\u{AF0F}",
-        nfkd: "\u{1101}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AF10}",
-        nfc: "\u{AF10}",
-        nfd: "\u{1101}\u{1168}",
-        nfkc: "\u{AF10}",
-        nfkd: "\u{1101}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{AF11}",
-        nfc: "\u{AF11}",
-        nfd: "\u{1101}\u{1168}\u{11A8}",
-        nfkc: "\u{AF11}",
-        nfkd: "\u{1101}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AF12}",
-        nfc: "\u{AF12}",
-        nfd: "\u{1101}\u{1168}\u{11A9}",
-        nfkc: "\u{AF12}",
-        nfkd: "\u{1101}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AF13}",
-        nfc: "\u{AF13}",
-        nfd: "\u{1101}\u{1168}\u{11AA}",
-        nfkc: "\u{AF13}",
-        nfkd: "\u{1101}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AF14}",
-        nfc: "\u{AF14}",
-        nfd: "\u{1101}\u{1168}\u{11AB}",
-        nfkc: "\u{AF14}",
-        nfkd: "\u{1101}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AF15}",
-        nfc: "\u{AF15}",
-        nfd: "\u{1101}\u{1168}\u{11AC}",
-        nfkc: "\u{AF15}",
-        nfkd: "\u{1101}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AF16}",
-        nfc: "\u{AF16}",
-        nfd: "\u{1101}\u{1168}\u{11AD}",
-        nfkc: "\u{AF16}",
-        nfkd: "\u{1101}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AF17}",
-        nfc: "\u{AF17}",
-        nfd: "\u{1101}\u{1168}\u{11AE}",
-        nfkc: "\u{AF17}",
-        nfkd: "\u{1101}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AF18}",
-        nfc: "\u{AF18}",
-        nfd: "\u{1101}\u{1168}\u{11AF}",
-        nfkc: "\u{AF18}",
-        nfkd: "\u{1101}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AF19}",
-        nfc: "\u{AF19}",
-        nfd: "\u{1101}\u{1168}\u{11B0}",
-        nfkc: "\u{AF19}",
-        nfkd: "\u{1101}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AF1A}",
-        nfc: "\u{AF1A}",
-        nfd: "\u{1101}\u{1168}\u{11B1}",
-        nfkc: "\u{AF1A}",
-        nfkd: "\u{1101}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AF1B}",
-        nfc: "\u{AF1B}",
-        nfd: "\u{1101}\u{1168}\u{11B2}",
-        nfkc: "\u{AF1B}",
-        nfkd: "\u{1101}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AF1C}",
-        nfc: "\u{AF1C}",
-        nfd: "\u{1101}\u{1168}\u{11B3}",
-        nfkc: "\u{AF1C}",
-        nfkd: "\u{1101}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AF1D}",
-        nfc: "\u{AF1D}",
-        nfd: "\u{1101}\u{1168}\u{11B4}",
-        nfkc: "\u{AF1D}",
-        nfkd: "\u{1101}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AF1E}",
-        nfc: "\u{AF1E}",
-        nfd: "\u{1101}\u{1168}\u{11B5}",
-        nfkc: "\u{AF1E}",
-        nfkd: "\u{1101}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AF1F}",
-        nfc: "\u{AF1F}",
-        nfd: "\u{1101}\u{1168}\u{11B6}",
-        nfkc: "\u{AF1F}",
-        nfkd: "\u{1101}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AF20}",
-        nfc: "\u{AF20}",
-        nfd: "\u{1101}\u{1168}\u{11B7}",
-        nfkc: "\u{AF20}",
-        nfkd: "\u{1101}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AF21}",
-        nfc: "\u{AF21}",
-        nfd: "\u{1101}\u{1168}\u{11B8}",
-        nfkc: "\u{AF21}",
-        nfkd: "\u{1101}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AF22}",
-        nfc: "\u{AF22}",
-        nfd: "\u{1101}\u{1168}\u{11B9}",
-        nfkc: "\u{AF22}",
-        nfkd: "\u{1101}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AF23}",
-        nfc: "\u{AF23}",
-        nfd: "\u{1101}\u{1168}\u{11BA}",
-        nfkc: "\u{AF23}",
-        nfkd: "\u{1101}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AF24}",
-        nfc: "\u{AF24}",
-        nfd: "\u{1101}\u{1168}\u{11BB}",
-        nfkc: "\u{AF24}",
-        nfkd: "\u{1101}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AF25}",
-        nfc: "\u{AF25}",
-        nfd: "\u{1101}\u{1168}\u{11BC}",
-        nfkc: "\u{AF25}",
-        nfkd: "\u{1101}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF26}",
-        nfc: "\u{AF26}",
-        nfd: "\u{1101}\u{1168}\u{11BD}",
-        nfkc: "\u{AF26}",
-        nfkd: "\u{1101}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AF27}",
-        nfc: "\u{AF27}",
-        nfd: "\u{1101}\u{1168}\u{11BE}",
-        nfkc: "\u{AF27}",
-        nfkd: "\u{1101}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AF28}",
-        nfc: "\u{AF28}",
-        nfd: "\u{1101}\u{1168}\u{11BF}",
-        nfkc: "\u{AF28}",
-        nfkd: "\u{1101}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AF29}",
-        nfc: "\u{AF29}",
-        nfd: "\u{1101}\u{1168}\u{11C0}",
-        nfkc: "\u{AF29}",
-        nfkd: "\u{1101}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AF2A}",
-        nfc: "\u{AF2A}",
-        nfd: "\u{1101}\u{1168}\u{11C1}",
-        nfkc: "\u{AF2A}",
-        nfkd: "\u{1101}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AF2B}",
-        nfc: "\u{AF2B}",
-        nfd: "\u{1101}\u{1168}\u{11C2}",
-        nfkc: "\u{AF2B}",
-        nfkd: "\u{1101}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AF2C}",
-        nfc: "\u{AF2C}",
-        nfd: "\u{1101}\u{1169}",
-        nfkc: "\u{AF2C}",
-        nfkd: "\u{1101}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{AF2D}",
-        nfc: "\u{AF2D}",
-        nfd: "\u{1101}\u{1169}\u{11A8}",
-        nfkc: "\u{AF2D}",
-        nfkd: "\u{1101}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AF2E}",
-        nfc: "\u{AF2E}",
-        nfd: "\u{1101}\u{1169}\u{11A9}",
-        nfkc: "\u{AF2E}",
-        nfkd: "\u{1101}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AF2F}",
-        nfc: "\u{AF2F}",
-        nfd: "\u{1101}\u{1169}\u{11AA}",
-        nfkc: "\u{AF2F}",
-        nfkd: "\u{1101}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AF30}",
-        nfc: "\u{AF30}",
-        nfd: "\u{1101}\u{1169}\u{11AB}",
-        nfkc: "\u{AF30}",
-        nfkd: "\u{1101}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AF31}",
-        nfc: "\u{AF31}",
-        nfd: "\u{1101}\u{1169}\u{11AC}",
-        nfkc: "\u{AF31}",
-        nfkd: "\u{1101}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AF32}",
-        nfc: "\u{AF32}",
-        nfd: "\u{1101}\u{1169}\u{11AD}",
-        nfkc: "\u{AF32}",
-        nfkd: "\u{1101}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AF33}",
-        nfc: "\u{AF33}",
-        nfd: "\u{1101}\u{1169}\u{11AE}",
-        nfkc: "\u{AF33}",
-        nfkd: "\u{1101}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AF34}",
-        nfc: "\u{AF34}",
-        nfd: "\u{1101}\u{1169}\u{11AF}",
-        nfkc: "\u{AF34}",
-        nfkd: "\u{1101}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AF35}",
-        nfc: "\u{AF35}",
-        nfd: "\u{1101}\u{1169}\u{11B0}",
-        nfkc: "\u{AF35}",
-        nfkd: "\u{1101}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AF36}",
-        nfc: "\u{AF36}",
-        nfd: "\u{1101}\u{1169}\u{11B1}",
-        nfkc: "\u{AF36}",
-        nfkd: "\u{1101}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AF37}",
-        nfc: "\u{AF37}",
-        nfd: "\u{1101}\u{1169}\u{11B2}",
-        nfkc: "\u{AF37}",
-        nfkd: "\u{1101}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AF38}",
-        nfc: "\u{AF38}",
-        nfd: "\u{1101}\u{1169}\u{11B3}",
-        nfkc: "\u{AF38}",
-        nfkd: "\u{1101}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AF39}",
-        nfc: "\u{AF39}",
-        nfd: "\u{1101}\u{1169}\u{11B4}",
-        nfkc: "\u{AF39}",
-        nfkd: "\u{1101}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AF3A}",
-        nfc: "\u{AF3A}",
-        nfd: "\u{1101}\u{1169}\u{11B5}",
-        nfkc: "\u{AF3A}",
-        nfkd: "\u{1101}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AF3B}",
-        nfc: "\u{AF3B}",
-        nfd: "\u{1101}\u{1169}\u{11B6}",
-        nfkc: "\u{AF3B}",
-        nfkd: "\u{1101}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AF3C}",
-        nfc: "\u{AF3C}",
-        nfd: "\u{1101}\u{1169}\u{11B7}",
-        nfkc: "\u{AF3C}",
-        nfkd: "\u{1101}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AF3D}",
-        nfc: "\u{AF3D}",
-        nfd: "\u{1101}\u{1169}\u{11B8}",
-        nfkc: "\u{AF3D}",
-        nfkd: "\u{1101}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AF3E}",
-        nfc: "\u{AF3E}",
-        nfd: "\u{1101}\u{1169}\u{11B9}",
-        nfkc: "\u{AF3E}",
-        nfkd: "\u{1101}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AF3F}",
-        nfc: "\u{AF3F}",
-        nfd: "\u{1101}\u{1169}\u{11BA}",
-        nfkc: "\u{AF3F}",
-        nfkd: "\u{1101}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AF40}",
-        nfc: "\u{AF40}",
-        nfd: "\u{1101}\u{1169}\u{11BB}",
-        nfkc: "\u{AF40}",
-        nfkd: "\u{1101}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AF41}",
-        nfc: "\u{AF41}",
-        nfd: "\u{1101}\u{1169}\u{11BC}",
-        nfkc: "\u{AF41}",
-        nfkd: "\u{1101}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF42}",
-        nfc: "\u{AF42}",
-        nfd: "\u{1101}\u{1169}\u{11BD}",
-        nfkc: "\u{AF42}",
-        nfkd: "\u{1101}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AF43}",
-        nfc: "\u{AF43}",
-        nfd: "\u{1101}\u{1169}\u{11BE}",
-        nfkc: "\u{AF43}",
-        nfkd: "\u{1101}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AF44}",
-        nfc: "\u{AF44}",
-        nfd: "\u{1101}\u{1169}\u{11BF}",
-        nfkc: "\u{AF44}",
-        nfkd: "\u{1101}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AF45}",
-        nfc: "\u{AF45}",
-        nfd: "\u{1101}\u{1169}\u{11C0}",
-        nfkc: "\u{AF45}",
-        nfkd: "\u{1101}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AF46}",
-        nfc: "\u{AF46}",
-        nfd: "\u{1101}\u{1169}\u{11C1}",
-        nfkc: "\u{AF46}",
-        nfkd: "\u{1101}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AF47}",
-        nfc: "\u{AF47}",
-        nfd: "\u{1101}\u{1169}\u{11C2}",
-        nfkc: "\u{AF47}",
-        nfkd: "\u{1101}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AF48}",
-        nfc: "\u{AF48}",
-        nfd: "\u{1101}\u{116A}",
-        nfkc: "\u{AF48}",
-        nfkd: "\u{1101}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{AF49}",
-        nfc: "\u{AF49}",
-        nfd: "\u{1101}\u{116A}\u{11A8}",
-        nfkc: "\u{AF49}",
-        nfkd: "\u{1101}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AF4A}",
-        nfc: "\u{AF4A}",
-        nfd: "\u{1101}\u{116A}\u{11A9}",
-        nfkc: "\u{AF4A}",
-        nfkd: "\u{1101}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AF4B}",
-        nfc: "\u{AF4B}",
-        nfd: "\u{1101}\u{116A}\u{11AA}",
-        nfkc: "\u{AF4B}",
-        nfkd: "\u{1101}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AF4C}",
-        nfc: "\u{AF4C}",
-        nfd: "\u{1101}\u{116A}\u{11AB}",
-        nfkc: "\u{AF4C}",
-        nfkd: "\u{1101}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AF4D}",
-        nfc: "\u{AF4D}",
-        nfd: "\u{1101}\u{116A}\u{11AC}",
-        nfkc: "\u{AF4D}",
-        nfkd: "\u{1101}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AF4E}",
-        nfc: "\u{AF4E}",
-        nfd: "\u{1101}\u{116A}\u{11AD}",
-        nfkc: "\u{AF4E}",
-        nfkd: "\u{1101}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AF4F}",
-        nfc: "\u{AF4F}",
-        nfd: "\u{1101}\u{116A}\u{11AE}",
-        nfkc: "\u{AF4F}",
-        nfkd: "\u{1101}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AF50}",
-        nfc: "\u{AF50}",
-        nfd: "\u{1101}\u{116A}\u{11AF}",
-        nfkc: "\u{AF50}",
-        nfkd: "\u{1101}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AF51}",
-        nfc: "\u{AF51}",
-        nfd: "\u{1101}\u{116A}\u{11B0}",
-        nfkc: "\u{AF51}",
-        nfkd: "\u{1101}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AF52}",
-        nfc: "\u{AF52}",
-        nfd: "\u{1101}\u{116A}\u{11B1}",
-        nfkc: "\u{AF52}",
-        nfkd: "\u{1101}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AF53}",
-        nfc: "\u{AF53}",
-        nfd: "\u{1101}\u{116A}\u{11B2}",
-        nfkc: "\u{AF53}",
-        nfkd: "\u{1101}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AF54}",
-        nfc: "\u{AF54}",
-        nfd: "\u{1101}\u{116A}\u{11B3}",
-        nfkc: "\u{AF54}",
-        nfkd: "\u{1101}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AF55}",
-        nfc: "\u{AF55}",
-        nfd: "\u{1101}\u{116A}\u{11B4}",
-        nfkc: "\u{AF55}",
-        nfkd: "\u{1101}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AF56}",
-        nfc: "\u{AF56}",
-        nfd: "\u{1101}\u{116A}\u{11B5}",
-        nfkc: "\u{AF56}",
-        nfkd: "\u{1101}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AF57}",
-        nfc: "\u{AF57}",
-        nfd: "\u{1101}\u{116A}\u{11B6}",
-        nfkc: "\u{AF57}",
-        nfkd: "\u{1101}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AF58}",
-        nfc: "\u{AF58}",
-        nfd: "\u{1101}\u{116A}\u{11B7}",
-        nfkc: "\u{AF58}",
-        nfkd: "\u{1101}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AF59}",
-        nfc: "\u{AF59}",
-        nfd: "\u{1101}\u{116A}\u{11B8}",
-        nfkc: "\u{AF59}",
-        nfkd: "\u{1101}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AF5A}",
-        nfc: "\u{AF5A}",
-        nfd: "\u{1101}\u{116A}\u{11B9}",
-        nfkc: "\u{AF5A}",
-        nfkd: "\u{1101}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AF5B}",
-        nfc: "\u{AF5B}",
-        nfd: "\u{1101}\u{116A}\u{11BA}",
-        nfkc: "\u{AF5B}",
-        nfkd: "\u{1101}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AF5C}",
-        nfc: "\u{AF5C}",
-        nfd: "\u{1101}\u{116A}\u{11BB}",
-        nfkc: "\u{AF5C}",
-        nfkd: "\u{1101}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AF5D}",
-        nfc: "\u{AF5D}",
-        nfd: "\u{1101}\u{116A}\u{11BC}",
-        nfkc: "\u{AF5D}",
-        nfkd: "\u{1101}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF5E}",
-        nfc: "\u{AF5E}",
-        nfd: "\u{1101}\u{116A}\u{11BD}",
-        nfkc: "\u{AF5E}",
-        nfkd: "\u{1101}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AF5F}",
-        nfc: "\u{AF5F}",
-        nfd: "\u{1101}\u{116A}\u{11BE}",
-        nfkc: "\u{AF5F}",
-        nfkd: "\u{1101}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AF60}",
-        nfc: "\u{AF60}",
-        nfd: "\u{1101}\u{116A}\u{11BF}",
-        nfkc: "\u{AF60}",
-        nfkd: "\u{1101}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AF61}",
-        nfc: "\u{AF61}",
-        nfd: "\u{1101}\u{116A}\u{11C0}",
-        nfkc: "\u{AF61}",
-        nfkd: "\u{1101}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AF62}",
-        nfc: "\u{AF62}",
-        nfd: "\u{1101}\u{116A}\u{11C1}",
-        nfkc: "\u{AF62}",
-        nfkd: "\u{1101}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AF63}",
-        nfc: "\u{AF63}",
-        nfd: "\u{1101}\u{116A}\u{11C2}",
-        nfkc: "\u{AF63}",
-        nfkd: "\u{1101}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AF64}",
-        nfc: "\u{AF64}",
-        nfd: "\u{1101}\u{116B}",
-        nfkc: "\u{AF64}",
-        nfkd: "\u{1101}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{AF65}",
-        nfc: "\u{AF65}",
-        nfd: "\u{1101}\u{116B}\u{11A8}",
-        nfkc: "\u{AF65}",
-        nfkd: "\u{1101}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AF66}",
-        nfc: "\u{AF66}",
-        nfd: "\u{1101}\u{116B}\u{11A9}",
-        nfkc: "\u{AF66}",
-        nfkd: "\u{1101}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AF67}",
-        nfc: "\u{AF67}",
-        nfd: "\u{1101}\u{116B}\u{11AA}",
-        nfkc: "\u{AF67}",
-        nfkd: "\u{1101}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AF68}",
-        nfc: "\u{AF68}",
-        nfd: "\u{1101}\u{116B}\u{11AB}",
-        nfkc: "\u{AF68}",
-        nfkd: "\u{1101}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AF69}",
-        nfc: "\u{AF69}",
-        nfd: "\u{1101}\u{116B}\u{11AC}",
-        nfkc: "\u{AF69}",
-        nfkd: "\u{1101}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AF6A}",
-        nfc: "\u{AF6A}",
-        nfd: "\u{1101}\u{116B}\u{11AD}",
-        nfkc: "\u{AF6A}",
-        nfkd: "\u{1101}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AF6B}",
-        nfc: "\u{AF6B}",
-        nfd: "\u{1101}\u{116B}\u{11AE}",
-        nfkc: "\u{AF6B}",
-        nfkd: "\u{1101}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AF6C}",
-        nfc: "\u{AF6C}",
-        nfd: "\u{1101}\u{116B}\u{11AF}",
-        nfkc: "\u{AF6C}",
-        nfkd: "\u{1101}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AF6D}",
-        nfc: "\u{AF6D}",
-        nfd: "\u{1101}\u{116B}\u{11B0}",
-        nfkc: "\u{AF6D}",
-        nfkd: "\u{1101}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AF6E}",
-        nfc: "\u{AF6E}",
-        nfd: "\u{1101}\u{116B}\u{11B1}",
-        nfkc: "\u{AF6E}",
-        nfkd: "\u{1101}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AF6F}",
-        nfc: "\u{AF6F}",
-        nfd: "\u{1101}\u{116B}\u{11B2}",
-        nfkc: "\u{AF6F}",
-        nfkd: "\u{1101}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AF70}",
-        nfc: "\u{AF70}",
-        nfd: "\u{1101}\u{116B}\u{11B3}",
-        nfkc: "\u{AF70}",
-        nfkd: "\u{1101}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AF71}",
-        nfc: "\u{AF71}",
-        nfd: "\u{1101}\u{116B}\u{11B4}",
-        nfkc: "\u{AF71}",
-        nfkd: "\u{1101}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AF72}",
-        nfc: "\u{AF72}",
-        nfd: "\u{1101}\u{116B}\u{11B5}",
-        nfkc: "\u{AF72}",
-        nfkd: "\u{1101}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AF73}",
-        nfc: "\u{AF73}",
-        nfd: "\u{1101}\u{116B}\u{11B6}",
-        nfkc: "\u{AF73}",
-        nfkd: "\u{1101}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AF74}",
-        nfc: "\u{AF74}",
-        nfd: "\u{1101}\u{116B}\u{11B7}",
-        nfkc: "\u{AF74}",
-        nfkd: "\u{1101}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AF75}",
-        nfc: "\u{AF75}",
-        nfd: "\u{1101}\u{116B}\u{11B8}",
-        nfkc: "\u{AF75}",
-        nfkd: "\u{1101}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AF76}",
-        nfc: "\u{AF76}",
-        nfd: "\u{1101}\u{116B}\u{11B9}",
-        nfkc: "\u{AF76}",
-        nfkd: "\u{1101}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AF77}",
-        nfc: "\u{AF77}",
-        nfd: "\u{1101}\u{116B}\u{11BA}",
-        nfkc: "\u{AF77}",
-        nfkd: "\u{1101}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AF78}",
-        nfc: "\u{AF78}",
-        nfd: "\u{1101}\u{116B}\u{11BB}",
-        nfkc: "\u{AF78}",
-        nfkd: "\u{1101}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AF79}",
-        nfc: "\u{AF79}",
-        nfd: "\u{1101}\u{116B}\u{11BC}",
-        nfkc: "\u{AF79}",
-        nfkd: "\u{1101}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF7A}",
-        nfc: "\u{AF7A}",
-        nfd: "\u{1101}\u{116B}\u{11BD}",
-        nfkc: "\u{AF7A}",
-        nfkd: "\u{1101}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AF7B}",
-        nfc: "\u{AF7B}",
-        nfd: "\u{1101}\u{116B}\u{11BE}",
-        nfkc: "\u{AF7B}",
-        nfkd: "\u{1101}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AF7C}",
-        nfc: "\u{AF7C}",
-        nfd: "\u{1101}\u{116B}\u{11BF}",
-        nfkc: "\u{AF7C}",
-        nfkd: "\u{1101}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AF7D}",
-        nfc: "\u{AF7D}",
-        nfd: "\u{1101}\u{116B}\u{11C0}",
-        nfkc: "\u{AF7D}",
-        nfkd: "\u{1101}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AF7E}",
-        nfc: "\u{AF7E}",
-        nfd: "\u{1101}\u{116B}\u{11C1}",
-        nfkc: "\u{AF7E}",
-        nfkd: "\u{1101}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AF7F}",
-        nfc: "\u{AF7F}",
-        nfd: "\u{1101}\u{116B}\u{11C2}",
-        nfkc: "\u{AF7F}",
-        nfkd: "\u{1101}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AF80}",
-        nfc: "\u{AF80}",
-        nfd: "\u{1101}\u{116C}",
-        nfkc: "\u{AF80}",
-        nfkd: "\u{1101}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{AF81}",
-        nfc: "\u{AF81}",
-        nfd: "\u{1101}\u{116C}\u{11A8}",
-        nfkc: "\u{AF81}",
-        nfkd: "\u{1101}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AF82}",
-        nfc: "\u{AF82}",
-        nfd: "\u{1101}\u{116C}\u{11A9}",
-        nfkc: "\u{AF82}",
-        nfkd: "\u{1101}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AF83}",
-        nfc: "\u{AF83}",
-        nfd: "\u{1101}\u{116C}\u{11AA}",
-        nfkc: "\u{AF83}",
-        nfkd: "\u{1101}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AF84}",
-        nfc: "\u{AF84}",
-        nfd: "\u{1101}\u{116C}\u{11AB}",
-        nfkc: "\u{AF84}",
-        nfkd: "\u{1101}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AF85}",
-        nfc: "\u{AF85}",
-        nfd: "\u{1101}\u{116C}\u{11AC}",
-        nfkc: "\u{AF85}",
-        nfkd: "\u{1101}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AF86}",
-        nfc: "\u{AF86}",
-        nfd: "\u{1101}\u{116C}\u{11AD}",
-        nfkc: "\u{AF86}",
-        nfkd: "\u{1101}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AF87}",
-        nfc: "\u{AF87}",
-        nfd: "\u{1101}\u{116C}\u{11AE}",
-        nfkc: "\u{AF87}",
-        nfkd: "\u{1101}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AF88}",
-        nfc: "\u{AF88}",
-        nfd: "\u{1101}\u{116C}\u{11AF}",
-        nfkc: "\u{AF88}",
-        nfkd: "\u{1101}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AF89}",
-        nfc: "\u{AF89}",
-        nfd: "\u{1101}\u{116C}\u{11B0}",
-        nfkc: "\u{AF89}",
-        nfkd: "\u{1101}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AF8A}",
-        nfc: "\u{AF8A}",
-        nfd: "\u{1101}\u{116C}\u{11B1}",
-        nfkc: "\u{AF8A}",
-        nfkd: "\u{1101}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AF8B}",
-        nfc: "\u{AF8B}",
-        nfd: "\u{1101}\u{116C}\u{11B2}",
-        nfkc: "\u{AF8B}",
-        nfkd: "\u{1101}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AF8C}",
-        nfc: "\u{AF8C}",
-        nfd: "\u{1101}\u{116C}\u{11B3}",
-        nfkc: "\u{AF8C}",
-        nfkd: "\u{1101}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AF8D}",
-        nfc: "\u{AF8D}",
-        nfd: "\u{1101}\u{116C}\u{11B4}",
-        nfkc: "\u{AF8D}",
-        nfkd: "\u{1101}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AF8E}",
-        nfc: "\u{AF8E}",
-        nfd: "\u{1101}\u{116C}\u{11B5}",
-        nfkc: "\u{AF8E}",
-        nfkd: "\u{1101}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AF8F}",
-        nfc: "\u{AF8F}",
-        nfd: "\u{1101}\u{116C}\u{11B6}",
-        nfkc: "\u{AF8F}",
-        nfkd: "\u{1101}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AF90}",
-        nfc: "\u{AF90}",
-        nfd: "\u{1101}\u{116C}\u{11B7}",
-        nfkc: "\u{AF90}",
-        nfkd: "\u{1101}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AF91}",
-        nfc: "\u{AF91}",
-        nfd: "\u{1101}\u{116C}\u{11B8}",
-        nfkc: "\u{AF91}",
-        nfkd: "\u{1101}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AF92}",
-        nfc: "\u{AF92}",
-        nfd: "\u{1101}\u{116C}\u{11B9}",
-        nfkc: "\u{AF92}",
-        nfkd: "\u{1101}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AF93}",
-        nfc: "\u{AF93}",
-        nfd: "\u{1101}\u{116C}\u{11BA}",
-        nfkc: "\u{AF93}",
-        nfkd: "\u{1101}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AF94}",
-        nfc: "\u{AF94}",
-        nfd: "\u{1101}\u{116C}\u{11BB}",
-        nfkc: "\u{AF94}",
-        nfkd: "\u{1101}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AF95}",
-        nfc: "\u{AF95}",
-        nfd: "\u{1101}\u{116C}\u{11BC}",
-        nfkc: "\u{AF95}",
-        nfkd: "\u{1101}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF96}",
-        nfc: "\u{AF96}",
-        nfd: "\u{1101}\u{116C}\u{11BD}",
-        nfkc: "\u{AF96}",
-        nfkd: "\u{1101}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AF97}",
-        nfc: "\u{AF97}",
-        nfd: "\u{1101}\u{116C}\u{11BE}",
-        nfkc: "\u{AF97}",
-        nfkd: "\u{1101}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AF98}",
-        nfc: "\u{AF98}",
-        nfd: "\u{1101}\u{116C}\u{11BF}",
-        nfkc: "\u{AF98}",
-        nfkd: "\u{1101}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AF99}",
-        nfc: "\u{AF99}",
-        nfd: "\u{1101}\u{116C}\u{11C0}",
-        nfkc: "\u{AF99}",
-        nfkd: "\u{1101}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AF9A}",
-        nfc: "\u{AF9A}",
-        nfd: "\u{1101}\u{116C}\u{11C1}",
-        nfkc: "\u{AF9A}",
-        nfkd: "\u{1101}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AF9B}",
-        nfc: "\u{AF9B}",
-        nfd: "\u{1101}\u{116C}\u{11C2}",
-        nfkc: "\u{AF9B}",
-        nfkd: "\u{1101}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AF9C}",
-        nfc: "\u{AF9C}",
-        nfd: "\u{1101}\u{116D}",
-        nfkc: "\u{AF9C}",
-        nfkd: "\u{1101}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{AF9D}",
-        nfc: "\u{AF9D}",
-        nfd: "\u{1101}\u{116D}\u{11A8}",
-        nfkc: "\u{AF9D}",
-        nfkd: "\u{1101}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AF9E}",
-        nfc: "\u{AF9E}",
-        nfd: "\u{1101}\u{116D}\u{11A9}",
-        nfkc: "\u{AF9E}",
-        nfkd: "\u{1101}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AF9F}",
-        nfc: "\u{AF9F}",
-        nfd: "\u{1101}\u{116D}\u{11AA}",
-        nfkc: "\u{AF9F}",
-        nfkd: "\u{1101}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AFA0}",
-        nfc: "\u{AFA0}",
-        nfd: "\u{1101}\u{116D}\u{11AB}",
-        nfkc: "\u{AFA0}",
-        nfkd: "\u{1101}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AFA1}",
-        nfc: "\u{AFA1}",
-        nfd: "\u{1101}\u{116D}\u{11AC}",
-        nfkc: "\u{AFA1}",
-        nfkd: "\u{1101}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AFA2}",
-        nfc: "\u{AFA2}",
-        nfd: "\u{1101}\u{116D}\u{11AD}",
-        nfkc: "\u{AFA2}",
-        nfkd: "\u{1101}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AFA3}",
-        nfc: "\u{AFA3}",
-        nfd: "\u{1101}\u{116D}\u{11AE}",
-        nfkc: "\u{AFA3}",
-        nfkd: "\u{1101}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AFA4}",
-        nfc: "\u{AFA4}",
-        nfd: "\u{1101}\u{116D}\u{11AF}",
-        nfkc: "\u{AFA4}",
-        nfkd: "\u{1101}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AFA5}",
-        nfc: "\u{AFA5}",
-        nfd: "\u{1101}\u{116D}\u{11B0}",
-        nfkc: "\u{AFA5}",
-        nfkd: "\u{1101}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AFA6}",
-        nfc: "\u{AFA6}",
-        nfd: "\u{1101}\u{116D}\u{11B1}",
-        nfkc: "\u{AFA6}",
-        nfkd: "\u{1101}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AFA7}",
-        nfc: "\u{AFA7}",
-        nfd: "\u{1101}\u{116D}\u{11B2}",
-        nfkc: "\u{AFA7}",
-        nfkd: "\u{1101}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AFA8}",
-        nfc: "\u{AFA8}",
-        nfd: "\u{1101}\u{116D}\u{11B3}",
-        nfkc: "\u{AFA8}",
-        nfkd: "\u{1101}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AFA9}",
-        nfc: "\u{AFA9}",
-        nfd: "\u{1101}\u{116D}\u{11B4}",
-        nfkc: "\u{AFA9}",
-        nfkd: "\u{1101}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AFAA}",
-        nfc: "\u{AFAA}",
-        nfd: "\u{1101}\u{116D}\u{11B5}",
-        nfkc: "\u{AFAA}",
-        nfkd: "\u{1101}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AFAB}",
-        nfc: "\u{AFAB}",
-        nfd: "\u{1101}\u{116D}\u{11B6}",
-        nfkc: "\u{AFAB}",
-        nfkd: "\u{1101}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AFAC}",
-        nfc: "\u{AFAC}",
-        nfd: "\u{1101}\u{116D}\u{11B7}",
-        nfkc: "\u{AFAC}",
-        nfkd: "\u{1101}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AFAD}",
-        nfc: "\u{AFAD}",
-        nfd: "\u{1101}\u{116D}\u{11B8}",
-        nfkc: "\u{AFAD}",
-        nfkd: "\u{1101}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AFAE}",
-        nfc: "\u{AFAE}",
-        nfd: "\u{1101}\u{116D}\u{11B9}",
-        nfkc: "\u{AFAE}",
-        nfkd: "\u{1101}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AFAF}",
-        nfc: "\u{AFAF}",
-        nfd: "\u{1101}\u{116D}\u{11BA}",
-        nfkc: "\u{AFAF}",
-        nfkd: "\u{1101}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AFB0}",
-        nfc: "\u{AFB0}",
-        nfd: "\u{1101}\u{116D}\u{11BB}",
-        nfkc: "\u{AFB0}",
-        nfkd: "\u{1101}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AFB1}",
-        nfc: "\u{AFB1}",
-        nfd: "\u{1101}\u{116D}\u{11BC}",
-        nfkc: "\u{AFB1}",
-        nfkd: "\u{1101}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AFB2}",
-        nfc: "\u{AFB2}",
-        nfd: "\u{1101}\u{116D}\u{11BD}",
-        nfkc: "\u{AFB2}",
-        nfkd: "\u{1101}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AFB3}",
-        nfc: "\u{AFB3}",
-        nfd: "\u{1101}\u{116D}\u{11BE}",
-        nfkc: "\u{AFB3}",
-        nfkd: "\u{1101}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AFB4}",
-        nfc: "\u{AFB4}",
-        nfd: "\u{1101}\u{116D}\u{11BF}",
-        nfkc: "\u{AFB4}",
-        nfkd: "\u{1101}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AFB5}",
-        nfc: "\u{AFB5}",
-        nfd: "\u{1101}\u{116D}\u{11C0}",
-        nfkc: "\u{AFB5}",
-        nfkd: "\u{1101}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AFB6}",
-        nfc: "\u{AFB6}",
-        nfd: "\u{1101}\u{116D}\u{11C1}",
-        nfkc: "\u{AFB6}",
-        nfkd: "\u{1101}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AFB7}",
-        nfc: "\u{AFB7}",
-        nfd: "\u{1101}\u{116D}\u{11C2}",
-        nfkc: "\u{AFB7}",
-        nfkd: "\u{1101}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AFB8}",
-        nfc: "\u{AFB8}",
-        nfd: "\u{1101}\u{116E}",
-        nfkc: "\u{AFB8}",
-        nfkd: "\u{1101}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{AFB9}",
-        nfc: "\u{AFB9}",
-        nfd: "\u{1101}\u{116E}\u{11A8}",
-        nfkc: "\u{AFB9}",
-        nfkd: "\u{1101}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AFBA}",
-        nfc: "\u{AFBA}",
-        nfd: "\u{1101}\u{116E}\u{11A9}",
-        nfkc: "\u{AFBA}",
-        nfkd: "\u{1101}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AFBB}",
-        nfc: "\u{AFBB}",
-        nfd: "\u{1101}\u{116E}\u{11AA}",
-        nfkc: "\u{AFBB}",
-        nfkd: "\u{1101}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AFBC}",
-        nfc: "\u{AFBC}",
-        nfd: "\u{1101}\u{116E}\u{11AB}",
-        nfkc: "\u{AFBC}",
-        nfkd: "\u{1101}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AFBD}",
-        nfc: "\u{AFBD}",
-        nfd: "\u{1101}\u{116E}\u{11AC}",
-        nfkc: "\u{AFBD}",
-        nfkd: "\u{1101}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AFBE}",
-        nfc: "\u{AFBE}",
-        nfd: "\u{1101}\u{116E}\u{11AD}",
-        nfkc: "\u{AFBE}",
-        nfkd: "\u{1101}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AFBF}",
-        nfc: "\u{AFBF}",
-        nfd: "\u{1101}\u{116E}\u{11AE}",
-        nfkc: "\u{AFBF}",
-        nfkd: "\u{1101}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AFC0}",
-        nfc: "\u{AFC0}",
-        nfd: "\u{1101}\u{116E}\u{11AF}",
-        nfkc: "\u{AFC0}",
-        nfkd: "\u{1101}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AFC1}",
-        nfc: "\u{AFC1}",
-        nfd: "\u{1101}\u{116E}\u{11B0}",
-        nfkc: "\u{AFC1}",
-        nfkd: "\u{1101}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AFC2}",
-        nfc: "\u{AFC2}",
-        nfd: "\u{1101}\u{116E}\u{11B1}",
-        nfkc: "\u{AFC2}",
-        nfkd: "\u{1101}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AFC3}",
-        nfc: "\u{AFC3}",
-        nfd: "\u{1101}\u{116E}\u{11B2}",
-        nfkc: "\u{AFC3}",
-        nfkd: "\u{1101}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AFC4}",
-        nfc: "\u{AFC4}",
-        nfd: "\u{1101}\u{116E}\u{11B3}",
-        nfkc: "\u{AFC4}",
-        nfkd: "\u{1101}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AFC5}",
-        nfc: "\u{AFC5}",
-        nfd: "\u{1101}\u{116E}\u{11B4}",
-        nfkc: "\u{AFC5}",
-        nfkd: "\u{1101}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AFC6}",
-        nfc: "\u{AFC6}",
-        nfd: "\u{1101}\u{116E}\u{11B5}",
-        nfkc: "\u{AFC6}",
-        nfkd: "\u{1101}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AFC7}",
-        nfc: "\u{AFC7}",
-        nfd: "\u{1101}\u{116E}\u{11B6}",
-        nfkc: "\u{AFC7}",
-        nfkd: "\u{1101}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AFC8}",
-        nfc: "\u{AFC8}",
-        nfd: "\u{1101}\u{116E}\u{11B7}",
-        nfkc: "\u{AFC8}",
-        nfkd: "\u{1101}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AFC9}",
-        nfc: "\u{AFC9}",
-        nfd: "\u{1101}\u{116E}\u{11B8}",
-        nfkc: "\u{AFC9}",
-        nfkd: "\u{1101}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AFCA}",
-        nfc: "\u{AFCA}",
-        nfd: "\u{1101}\u{116E}\u{11B9}",
-        nfkc: "\u{AFCA}",
-        nfkd: "\u{1101}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AFCB}",
-        nfc: "\u{AFCB}",
-        nfd: "\u{1101}\u{116E}\u{11BA}",
-        nfkc: "\u{AFCB}",
-        nfkd: "\u{1101}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AFCC}",
-        nfc: "\u{AFCC}",
-        nfd: "\u{1101}\u{116E}\u{11BB}",
-        nfkc: "\u{AFCC}",
-        nfkd: "\u{1101}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AFCD}",
-        nfc: "\u{AFCD}",
-        nfd: "\u{1101}\u{116E}\u{11BC}",
-        nfkc: "\u{AFCD}",
-        nfkd: "\u{1101}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AFCE}",
-        nfc: "\u{AFCE}",
-        nfd: "\u{1101}\u{116E}\u{11BD}",
-        nfkc: "\u{AFCE}",
-        nfkd: "\u{1101}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AFCF}",
-        nfc: "\u{AFCF}",
-        nfd: "\u{1101}\u{116E}\u{11BE}",
-        nfkc: "\u{AFCF}",
-        nfkd: "\u{1101}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AFD0}",
-        nfc: "\u{AFD0}",
-        nfd: "\u{1101}\u{116E}\u{11BF}",
-        nfkc: "\u{AFD0}",
-        nfkd: "\u{1101}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AFD1}",
-        nfc: "\u{AFD1}",
-        nfd: "\u{1101}\u{116E}\u{11C0}",
-        nfkc: "\u{AFD1}",
-        nfkd: "\u{1101}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AFD2}",
-        nfc: "\u{AFD2}",
-        nfd: "\u{1101}\u{116E}\u{11C1}",
-        nfkc: "\u{AFD2}",
-        nfkd: "\u{1101}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AFD3}",
-        nfc: "\u{AFD3}",
-        nfd: "\u{1101}\u{116E}\u{11C2}",
-        nfkc: "\u{AFD3}",
-        nfkd: "\u{1101}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AFD4}",
-        nfc: "\u{AFD4}",
-        nfd: "\u{1101}\u{116F}",
-        nfkc: "\u{AFD4}",
-        nfkd: "\u{1101}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{AFD5}",
-        nfc: "\u{AFD5}",
-        nfd: "\u{1101}\u{116F}\u{11A8}",
-        nfkc: "\u{AFD5}",
-        nfkd: "\u{1101}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AFD6}",
-        nfc: "\u{AFD6}",
-        nfd: "\u{1101}\u{116F}\u{11A9}",
-        nfkc: "\u{AFD6}",
-        nfkd: "\u{1101}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AFD7}",
-        nfc: "\u{AFD7}",
-        nfd: "\u{1101}\u{116F}\u{11AA}",
-        nfkc: "\u{AFD7}",
-        nfkd: "\u{1101}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AFD8}",
-        nfc: "\u{AFD8}",
-        nfd: "\u{1101}\u{116F}\u{11AB}",
-        nfkc: "\u{AFD8}",
-        nfkd: "\u{1101}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AFD9}",
-        nfc: "\u{AFD9}",
-        nfd: "\u{1101}\u{116F}\u{11AC}",
-        nfkc: "\u{AFD9}",
-        nfkd: "\u{1101}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AFDA}",
-        nfc: "\u{AFDA}",
-        nfd: "\u{1101}\u{116F}\u{11AD}",
-        nfkc: "\u{AFDA}",
-        nfkd: "\u{1101}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AFDB}",
-        nfc: "\u{AFDB}",
-        nfd: "\u{1101}\u{116F}\u{11AE}",
-        nfkc: "\u{AFDB}",
-        nfkd: "\u{1101}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AFDC}",
-        nfc: "\u{AFDC}",
-        nfd: "\u{1101}\u{116F}\u{11AF}",
-        nfkc: "\u{AFDC}",
-        nfkd: "\u{1101}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AFDD}",
-        nfc: "\u{AFDD}",
-        nfd: "\u{1101}\u{116F}\u{11B0}",
-        nfkc: "\u{AFDD}",
-        nfkd: "\u{1101}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AFDE}",
-        nfc: "\u{AFDE}",
-        nfd: "\u{1101}\u{116F}\u{11B1}",
-        nfkc: "\u{AFDE}",
-        nfkd: "\u{1101}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AFDF}",
-        nfc: "\u{AFDF}",
-        nfd: "\u{1101}\u{116F}\u{11B2}",
-        nfkc: "\u{AFDF}",
-        nfkd: "\u{1101}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AFE0}",
-        nfc: "\u{AFE0}",
-        nfd: "\u{1101}\u{116F}\u{11B3}",
-        nfkc: "\u{AFE0}",
-        nfkd: "\u{1101}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AFE1}",
-        nfc: "\u{AFE1}",
-        nfd: "\u{1101}\u{116F}\u{11B4}",
-        nfkc: "\u{AFE1}",
-        nfkd: "\u{1101}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AFE2}",
-        nfc: "\u{AFE2}",
-        nfd: "\u{1101}\u{116F}\u{11B5}",
-        nfkc: "\u{AFE2}",
-        nfkd: "\u{1101}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AFE3}",
-        nfc: "\u{AFE3}",
-        nfd: "\u{1101}\u{116F}\u{11B6}",
-        nfkc: "\u{AFE3}",
-        nfkd: "\u{1101}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{AFE4}",
-        nfc: "\u{AFE4}",
-        nfd: "\u{1101}\u{116F}\u{11B7}",
-        nfkc: "\u{AFE4}",
-        nfkd: "\u{1101}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{AFE5}",
-        nfc: "\u{AFE5}",
-        nfd: "\u{1101}\u{116F}\u{11B8}",
-        nfkc: "\u{AFE5}",
-        nfkd: "\u{1101}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{AFE6}",
-        nfc: "\u{AFE6}",
-        nfd: "\u{1101}\u{116F}\u{11B9}",
-        nfkc: "\u{AFE6}",
-        nfkd: "\u{1101}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{AFE7}",
-        nfc: "\u{AFE7}",
-        nfd: "\u{1101}\u{116F}\u{11BA}",
-        nfkc: "\u{AFE7}",
-        nfkd: "\u{1101}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{AFE8}",
-        nfc: "\u{AFE8}",
-        nfd: "\u{1101}\u{116F}\u{11BB}",
-        nfkc: "\u{AFE8}",
-        nfkd: "\u{1101}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{AFE9}",
-        nfc: "\u{AFE9}",
-        nfd: "\u{1101}\u{116F}\u{11BC}",
-        nfkc: "\u{AFE9}",
-        nfkd: "\u{1101}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AFEA}",
-        nfc: "\u{AFEA}",
-        nfd: "\u{1101}\u{116F}\u{11BD}",
-        nfkc: "\u{AFEA}",
-        nfkd: "\u{1101}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{AFEB}",
-        nfc: "\u{AFEB}",
-        nfd: "\u{1101}\u{116F}\u{11BE}",
-        nfkc: "\u{AFEB}",
-        nfkd: "\u{1101}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{AFEC}",
-        nfc: "\u{AFEC}",
-        nfd: "\u{1101}\u{116F}\u{11BF}",
-        nfkc: "\u{AFEC}",
-        nfkd: "\u{1101}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{AFED}",
-        nfc: "\u{AFED}",
-        nfd: "\u{1101}\u{116F}\u{11C0}",
-        nfkc: "\u{AFED}",
-        nfkd: "\u{1101}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{AFEE}",
-        nfc: "\u{AFEE}",
-        nfd: "\u{1101}\u{116F}\u{11C1}",
-        nfkc: "\u{AFEE}",
-        nfkd: "\u{1101}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{AFEF}",
-        nfc: "\u{AFEF}",
-        nfd: "\u{1101}\u{116F}\u{11C2}",
-        nfkc: "\u{AFEF}",
-        nfkd: "\u{1101}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{AFF0}",
-        nfc: "\u{AFF0}",
-        nfd: "\u{1101}\u{1170}",
-        nfkc: "\u{AFF0}",
-        nfkd: "\u{1101}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{AFF1}",
-        nfc: "\u{AFF1}",
-        nfd: "\u{1101}\u{1170}\u{11A8}",
-        nfkc: "\u{AFF1}",
-        nfkd: "\u{1101}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{AFF2}",
-        nfc: "\u{AFF2}",
-        nfd: "\u{1101}\u{1170}\u{11A9}",
-        nfkc: "\u{AFF2}",
-        nfkd: "\u{1101}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{AFF3}",
-        nfc: "\u{AFF3}",
-        nfd: "\u{1101}\u{1170}\u{11AA}",
-        nfkc: "\u{AFF3}",
-        nfkd: "\u{1101}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{AFF4}",
-        nfc: "\u{AFF4}",
-        nfd: "\u{1101}\u{1170}\u{11AB}",
-        nfkc: "\u{AFF4}",
-        nfkd: "\u{1101}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{AFF5}",
-        nfc: "\u{AFF5}",
-        nfd: "\u{1101}\u{1170}\u{11AC}",
-        nfkc: "\u{AFF5}",
-        nfkd: "\u{1101}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{AFF6}",
-        nfc: "\u{AFF6}",
-        nfd: "\u{1101}\u{1170}\u{11AD}",
-        nfkc: "\u{AFF6}",
-        nfkd: "\u{1101}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{AFF7}",
-        nfc: "\u{AFF7}",
-        nfd: "\u{1101}\u{1170}\u{11AE}",
-        nfkc: "\u{AFF7}",
-        nfkd: "\u{1101}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AFF8}",
-        nfc: "\u{AFF8}",
-        nfd: "\u{1101}\u{1170}\u{11AF}",
-        nfkc: "\u{AFF8}",
-        nfkd: "\u{1101}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{AFF9}",
-        nfc: "\u{AFF9}",
-        nfd: "\u{1101}\u{1170}\u{11B0}",
-        nfkc: "\u{AFF9}",
-        nfkd: "\u{1101}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{AFFA}",
-        nfc: "\u{AFFA}",
-        nfd: "\u{1101}\u{1170}\u{11B1}",
-        nfkc: "\u{AFFA}",
-        nfkd: "\u{1101}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{AFFB}",
-        nfc: "\u{AFFB}",
-        nfd: "\u{1101}\u{1170}\u{11B2}",
-        nfkc: "\u{AFFB}",
-        nfkd: "\u{1101}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{AFFC}",
-        nfc: "\u{AFFC}",
-        nfd: "\u{1101}\u{1170}\u{11B3}",
-        nfkc: "\u{AFFC}",
-        nfkd: "\u{1101}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{AFFD}",
-        nfc: "\u{AFFD}",
-        nfd: "\u{1101}\u{1170}\u{11B4}",
-        nfkc: "\u{AFFD}",
-        nfkd: "\u{1101}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{AFFE}",
-        nfc: "\u{AFFE}",
-        nfd: "\u{1101}\u{1170}\u{11B5}",
-        nfkc: "\u{AFFE}",
-        nfkd: "\u{1101}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AFFF}",
-        nfc: "\u{AFFF}",
-        nfd: "\u{1101}\u{1170}\u{11B6}",
-        nfkc: "\u{AFFF}",
-        nfkd: "\u{1101}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B000}",
-        nfc: "\u{B000}",
-        nfd: "\u{1101}\u{1170}\u{11B7}",
-        nfkc: "\u{B000}",
-        nfkd: "\u{1101}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B001}",
-        nfc: "\u{B001}",
-        nfd: "\u{1101}\u{1170}\u{11B8}",
-        nfkc: "\u{B001}",
-        nfkd: "\u{1101}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B002}",
-        nfc: "\u{B002}",
-        nfd: "\u{1101}\u{1170}\u{11B9}",
-        nfkc: "\u{B002}",
-        nfkd: "\u{1101}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B003}",
-        nfc: "\u{B003}",
-        nfd: "\u{1101}\u{1170}\u{11BA}",
-        nfkc: "\u{B003}",
-        nfkd: "\u{1101}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B004}",
-        nfc: "\u{B004}",
-        nfd: "\u{1101}\u{1170}\u{11BB}",
-        nfkc: "\u{B004}",
-        nfkd: "\u{1101}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B005}",
-        nfc: "\u{B005}",
-        nfd: "\u{1101}\u{1170}\u{11BC}",
-        nfkc: "\u{B005}",
-        nfkd: "\u{1101}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B006}",
-        nfc: "\u{B006}",
-        nfd: "\u{1101}\u{1170}\u{11BD}",
-        nfkc: "\u{B006}",
-        nfkd: "\u{1101}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B007}",
-        nfc: "\u{B007}",
-        nfd: "\u{1101}\u{1170}\u{11BE}",
-        nfkc: "\u{B007}",
-        nfkd: "\u{1101}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B008}",
-        nfc: "\u{B008}",
-        nfd: "\u{1101}\u{1170}\u{11BF}",
-        nfkc: "\u{B008}",
-        nfkd: "\u{1101}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B009}",
-        nfc: "\u{B009}",
-        nfd: "\u{1101}\u{1170}\u{11C0}",
-        nfkc: "\u{B009}",
-        nfkd: "\u{1101}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B00A}",
-        nfc: "\u{B00A}",
-        nfd: "\u{1101}\u{1170}\u{11C1}",
-        nfkc: "\u{B00A}",
-        nfkd: "\u{1101}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B00B}",
-        nfc: "\u{B00B}",
-        nfd: "\u{1101}\u{1170}\u{11C2}",
-        nfkc: "\u{B00B}",
-        nfkd: "\u{1101}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B00C}",
-        nfc: "\u{B00C}",
-        nfd: "\u{1101}\u{1171}",
-        nfkc: "\u{B00C}",
-        nfkd: "\u{1101}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{B00D}",
-        nfc: "\u{B00D}",
-        nfd: "\u{1101}\u{1171}\u{11A8}",
-        nfkc: "\u{B00D}",
-        nfkd: "\u{1101}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B00E}",
-        nfc: "\u{B00E}",
-        nfd: "\u{1101}\u{1171}\u{11A9}",
-        nfkc: "\u{B00E}",
-        nfkd: "\u{1101}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B00F}",
-        nfc: "\u{B00F}",
-        nfd: "\u{1101}\u{1171}\u{11AA}",
-        nfkc: "\u{B00F}",
-        nfkd: "\u{1101}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B010}",
-        nfc: "\u{B010}",
-        nfd: "\u{1101}\u{1171}\u{11AB}",
-        nfkc: "\u{B010}",
-        nfkd: "\u{1101}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B011}",
-        nfc: "\u{B011}",
-        nfd: "\u{1101}\u{1171}\u{11AC}",
-        nfkc: "\u{B011}",
-        nfkd: "\u{1101}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B012}",
-        nfc: "\u{B012}",
-        nfd: "\u{1101}\u{1171}\u{11AD}",
-        nfkc: "\u{B012}",
-        nfkd: "\u{1101}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B013}",
-        nfc: "\u{B013}",
-        nfd: "\u{1101}\u{1171}\u{11AE}",
-        nfkc: "\u{B013}",
-        nfkd: "\u{1101}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B014}",
-        nfc: "\u{B014}",
-        nfd: "\u{1101}\u{1171}\u{11AF}",
-        nfkc: "\u{B014}",
-        nfkd: "\u{1101}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B015}",
-        nfc: "\u{B015}",
-        nfd: "\u{1101}\u{1171}\u{11B0}",
-        nfkc: "\u{B015}",
-        nfkd: "\u{1101}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B016}",
-        nfc: "\u{B016}",
-        nfd: "\u{1101}\u{1171}\u{11B1}",
-        nfkc: "\u{B016}",
-        nfkd: "\u{1101}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B017}",
-        nfc: "\u{B017}",
-        nfd: "\u{1101}\u{1171}\u{11B2}",
-        nfkc: "\u{B017}",
-        nfkd: "\u{1101}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B018}",
-        nfc: "\u{B018}",
-        nfd: "\u{1101}\u{1171}\u{11B3}",
-        nfkc: "\u{B018}",
-        nfkd: "\u{1101}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B019}",
-        nfc: "\u{B019}",
-        nfd: "\u{1101}\u{1171}\u{11B4}",
-        nfkc: "\u{B019}",
-        nfkd: "\u{1101}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B01A}",
-        nfc: "\u{B01A}",
-        nfd: "\u{1101}\u{1171}\u{11B5}",
-        nfkc: "\u{B01A}",
-        nfkd: "\u{1101}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B01B}",
-        nfc: "\u{B01B}",
-        nfd: "\u{1101}\u{1171}\u{11B6}",
-        nfkc: "\u{B01B}",
-        nfkd: "\u{1101}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B01C}",
-        nfc: "\u{B01C}",
-        nfd: "\u{1101}\u{1171}\u{11B7}",
-        nfkc: "\u{B01C}",
-        nfkd: "\u{1101}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B01D}",
-        nfc: "\u{B01D}",
-        nfd: "\u{1101}\u{1171}\u{11B8}",
-        nfkc: "\u{B01D}",
-        nfkd: "\u{1101}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B01E}",
-        nfc: "\u{B01E}",
-        nfd: "\u{1101}\u{1171}\u{11B9}",
-        nfkc: "\u{B01E}",
-        nfkd: "\u{1101}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B01F}",
-        nfc: "\u{B01F}",
-        nfd: "\u{1101}\u{1171}\u{11BA}",
-        nfkc: "\u{B01F}",
-        nfkd: "\u{1101}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B020}",
-        nfc: "\u{B020}",
-        nfd: "\u{1101}\u{1171}\u{11BB}",
-        nfkc: "\u{B020}",
-        nfkd: "\u{1101}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B021}",
-        nfc: "\u{B021}",
-        nfd: "\u{1101}\u{1171}\u{11BC}",
-        nfkc: "\u{B021}",
-        nfkd: "\u{1101}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B022}",
-        nfc: "\u{B022}",
-        nfd: "\u{1101}\u{1171}\u{11BD}",
-        nfkc: "\u{B022}",
-        nfkd: "\u{1101}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B023}",
-        nfc: "\u{B023}",
-        nfd: "\u{1101}\u{1171}\u{11BE}",
-        nfkc: "\u{B023}",
-        nfkd: "\u{1101}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B024}",
-        nfc: "\u{B024}",
-        nfd: "\u{1101}\u{1171}\u{11BF}",
-        nfkc: "\u{B024}",
-        nfkd: "\u{1101}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B025}",
-        nfc: "\u{B025}",
-        nfd: "\u{1101}\u{1171}\u{11C0}",
-        nfkc: "\u{B025}",
-        nfkd: "\u{1101}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B026}",
-        nfc: "\u{B026}",
-        nfd: "\u{1101}\u{1171}\u{11C1}",
-        nfkc: "\u{B026}",
-        nfkd: "\u{1101}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B027}",
-        nfc: "\u{B027}",
-        nfd: "\u{1101}\u{1171}\u{11C2}",
-        nfkc: "\u{B027}",
-        nfkd: "\u{1101}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B028}",
-        nfc: "\u{B028}",
-        nfd: "\u{1101}\u{1172}",
-        nfkc: "\u{B028}",
-        nfkd: "\u{1101}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{B029}",
-        nfc: "\u{B029}",
-        nfd: "\u{1101}\u{1172}\u{11A8}",
-        nfkc: "\u{B029}",
-        nfkd: "\u{1101}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B02A}",
-        nfc: "\u{B02A}",
-        nfd: "\u{1101}\u{1172}\u{11A9}",
-        nfkc: "\u{B02A}",
-        nfkd: "\u{1101}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B02B}",
-        nfc: "\u{B02B}",
-        nfd: "\u{1101}\u{1172}\u{11AA}",
-        nfkc: "\u{B02B}",
-        nfkd: "\u{1101}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B02C}",
-        nfc: "\u{B02C}",
-        nfd: "\u{1101}\u{1172}\u{11AB}",
-        nfkc: "\u{B02C}",
-        nfkd: "\u{1101}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B02D}",
-        nfc: "\u{B02D}",
-        nfd: "\u{1101}\u{1172}\u{11AC}",
-        nfkc: "\u{B02D}",
-        nfkd: "\u{1101}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B02E}",
-        nfc: "\u{B02E}",
-        nfd: "\u{1101}\u{1172}\u{11AD}",
-        nfkc: "\u{B02E}",
-        nfkd: "\u{1101}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B02F}",
-        nfc: "\u{B02F}",
-        nfd: "\u{1101}\u{1172}\u{11AE}",
-        nfkc: "\u{B02F}",
-        nfkd: "\u{1101}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B030}",
-        nfc: "\u{B030}",
-        nfd: "\u{1101}\u{1172}\u{11AF}",
-        nfkc: "\u{B030}",
-        nfkd: "\u{1101}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B031}",
-        nfc: "\u{B031}",
-        nfd: "\u{1101}\u{1172}\u{11B0}",
-        nfkc: "\u{B031}",
-        nfkd: "\u{1101}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B032}",
-        nfc: "\u{B032}",
-        nfd: "\u{1101}\u{1172}\u{11B1}",
-        nfkc: "\u{B032}",
-        nfkd: "\u{1101}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B033}",
-        nfc: "\u{B033}",
-        nfd: "\u{1101}\u{1172}\u{11B2}",
-        nfkc: "\u{B033}",
-        nfkd: "\u{1101}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B034}",
-        nfc: "\u{B034}",
-        nfd: "\u{1101}\u{1172}\u{11B3}",
-        nfkc: "\u{B034}",
-        nfkd: "\u{1101}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B035}",
-        nfc: "\u{B035}",
-        nfd: "\u{1101}\u{1172}\u{11B4}",
-        nfkc: "\u{B035}",
-        nfkd: "\u{1101}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B036}",
-        nfc: "\u{B036}",
-        nfd: "\u{1101}\u{1172}\u{11B5}",
-        nfkc: "\u{B036}",
-        nfkd: "\u{1101}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B037}",
-        nfc: "\u{B037}",
-        nfd: "\u{1101}\u{1172}\u{11B6}",
-        nfkc: "\u{B037}",
-        nfkd: "\u{1101}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B038}",
-        nfc: "\u{B038}",
-        nfd: "\u{1101}\u{1172}\u{11B7}",
-        nfkc: "\u{B038}",
-        nfkd: "\u{1101}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B039}",
-        nfc: "\u{B039}",
-        nfd: "\u{1101}\u{1172}\u{11B8}",
-        nfkc: "\u{B039}",
-        nfkd: "\u{1101}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B03A}",
-        nfc: "\u{B03A}",
-        nfd: "\u{1101}\u{1172}\u{11B9}",
-        nfkc: "\u{B03A}",
-        nfkd: "\u{1101}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B03B}",
-        nfc: "\u{B03B}",
-        nfd: "\u{1101}\u{1172}\u{11BA}",
-        nfkc: "\u{B03B}",
-        nfkd: "\u{1101}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B03C}",
-        nfc: "\u{B03C}",
-        nfd: "\u{1101}\u{1172}\u{11BB}",
-        nfkc: "\u{B03C}",
-        nfkd: "\u{1101}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B03D}",
-        nfc: "\u{B03D}",
-        nfd: "\u{1101}\u{1172}\u{11BC}",
-        nfkc: "\u{B03D}",
-        nfkd: "\u{1101}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B03E}",
-        nfc: "\u{B03E}",
-        nfd: "\u{1101}\u{1172}\u{11BD}",
-        nfkc: "\u{B03E}",
-        nfkd: "\u{1101}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B03F}",
-        nfc: "\u{B03F}",
-        nfd: "\u{1101}\u{1172}\u{11BE}",
-        nfkc: "\u{B03F}",
-        nfkd: "\u{1101}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B040}",
-        nfc: "\u{B040}",
-        nfd: "\u{1101}\u{1172}\u{11BF}",
-        nfkc: "\u{B040}",
-        nfkd: "\u{1101}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B041}",
-        nfc: "\u{B041}",
-        nfd: "\u{1101}\u{1172}\u{11C0}",
-        nfkc: "\u{B041}",
-        nfkd: "\u{1101}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B042}",
-        nfc: "\u{B042}",
-        nfd: "\u{1101}\u{1172}\u{11C1}",
-        nfkc: "\u{B042}",
-        nfkd: "\u{1101}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B043}",
-        nfc: "\u{B043}",
-        nfd: "\u{1101}\u{1172}\u{11C2}",
-        nfkc: "\u{B043}",
-        nfkd: "\u{1101}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B044}",
-        nfc: "\u{B044}",
-        nfd: "\u{1101}\u{1173}",
-        nfkc: "\u{B044}",
-        nfkd: "\u{1101}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{B045}",
-        nfc: "\u{B045}",
-        nfd: "\u{1101}\u{1173}\u{11A8}",
-        nfkc: "\u{B045}",
-        nfkd: "\u{1101}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B046}",
-        nfc: "\u{B046}",
-        nfd: "\u{1101}\u{1173}\u{11A9}",
-        nfkc: "\u{B046}",
-        nfkd: "\u{1101}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B047}",
-        nfc: "\u{B047}",
-        nfd: "\u{1101}\u{1173}\u{11AA}",
-        nfkc: "\u{B047}",
-        nfkd: "\u{1101}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B048}",
-        nfc: "\u{B048}",
-        nfd: "\u{1101}\u{1173}\u{11AB}",
-        nfkc: "\u{B048}",
-        nfkd: "\u{1101}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B049}",
-        nfc: "\u{B049}",
-        nfd: "\u{1101}\u{1173}\u{11AC}",
-        nfkc: "\u{B049}",
-        nfkd: "\u{1101}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B04A}",
-        nfc: "\u{B04A}",
-        nfd: "\u{1101}\u{1173}\u{11AD}",
-        nfkc: "\u{B04A}",
-        nfkd: "\u{1101}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B04B}",
-        nfc: "\u{B04B}",
-        nfd: "\u{1101}\u{1173}\u{11AE}",
-        nfkc: "\u{B04B}",
-        nfkd: "\u{1101}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B04C}",
-        nfc: "\u{B04C}",
-        nfd: "\u{1101}\u{1173}\u{11AF}",
-        nfkc: "\u{B04C}",
-        nfkd: "\u{1101}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B04D}",
-        nfc: "\u{B04D}",
-        nfd: "\u{1101}\u{1173}\u{11B0}",
-        nfkc: "\u{B04D}",
-        nfkd: "\u{1101}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B04E}",
-        nfc: "\u{B04E}",
-        nfd: "\u{1101}\u{1173}\u{11B1}",
-        nfkc: "\u{B04E}",
-        nfkd: "\u{1101}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B04F}",
-        nfc: "\u{B04F}",
-        nfd: "\u{1101}\u{1173}\u{11B2}",
-        nfkc: "\u{B04F}",
-        nfkd: "\u{1101}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B050}",
-        nfc: "\u{B050}",
-        nfd: "\u{1101}\u{1173}\u{11B3}",
-        nfkc: "\u{B050}",
-        nfkd: "\u{1101}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B051}",
-        nfc: "\u{B051}",
-        nfd: "\u{1101}\u{1173}\u{11B4}",
-        nfkc: "\u{B051}",
-        nfkd: "\u{1101}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B052}",
-        nfc: "\u{B052}",
-        nfd: "\u{1101}\u{1173}\u{11B5}",
-        nfkc: "\u{B052}",
-        nfkd: "\u{1101}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B053}",
-        nfc: "\u{B053}",
-        nfd: "\u{1101}\u{1173}\u{11B6}",
-        nfkc: "\u{B053}",
-        nfkd: "\u{1101}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B054}",
-        nfc: "\u{B054}",
-        nfd: "\u{1101}\u{1173}\u{11B7}",
-        nfkc: "\u{B054}",
-        nfkd: "\u{1101}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B055}",
-        nfc: "\u{B055}",
-        nfd: "\u{1101}\u{1173}\u{11B8}",
-        nfkc: "\u{B055}",
-        nfkd: "\u{1101}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B056}",
-        nfc: "\u{B056}",
-        nfd: "\u{1101}\u{1173}\u{11B9}",
-        nfkc: "\u{B056}",
-        nfkd: "\u{1101}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B057}",
-        nfc: "\u{B057}",
-        nfd: "\u{1101}\u{1173}\u{11BA}",
-        nfkc: "\u{B057}",
-        nfkd: "\u{1101}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B058}",
-        nfc: "\u{B058}",
-        nfd: "\u{1101}\u{1173}\u{11BB}",
-        nfkc: "\u{B058}",
-        nfkd: "\u{1101}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B059}",
-        nfc: "\u{B059}",
-        nfd: "\u{1101}\u{1173}\u{11BC}",
-        nfkc: "\u{B059}",
-        nfkd: "\u{1101}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B05A}",
-        nfc: "\u{B05A}",
-        nfd: "\u{1101}\u{1173}\u{11BD}",
-        nfkc: "\u{B05A}",
-        nfkd: "\u{1101}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B05B}",
-        nfc: "\u{B05B}",
-        nfd: "\u{1101}\u{1173}\u{11BE}",
-        nfkc: "\u{B05B}",
-        nfkd: "\u{1101}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B05C}",
-        nfc: "\u{B05C}",
-        nfd: "\u{1101}\u{1173}\u{11BF}",
-        nfkc: "\u{B05C}",
-        nfkd: "\u{1101}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B05D}",
-        nfc: "\u{B05D}",
-        nfd: "\u{1101}\u{1173}\u{11C0}",
-        nfkc: "\u{B05D}",
-        nfkd: "\u{1101}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B05E}",
-        nfc: "\u{B05E}",
-        nfd: "\u{1101}\u{1173}\u{11C1}",
-        nfkc: "\u{B05E}",
-        nfkd: "\u{1101}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B05F}",
-        nfc: "\u{B05F}",
-        nfd: "\u{1101}\u{1173}\u{11C2}",
-        nfkc: "\u{B05F}",
-        nfkd: "\u{1101}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B060}",
-        nfc: "\u{B060}",
-        nfd: "\u{1101}\u{1174}",
-        nfkc: "\u{B060}",
-        nfkd: "\u{1101}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{B061}",
-        nfc: "\u{B061}",
-        nfd: "\u{1101}\u{1174}\u{11A8}",
-        nfkc: "\u{B061}",
-        nfkd: "\u{1101}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B062}",
-        nfc: "\u{B062}",
-        nfd: "\u{1101}\u{1174}\u{11A9}",
-        nfkc: "\u{B062}",
-        nfkd: "\u{1101}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B063}",
-        nfc: "\u{B063}",
-        nfd: "\u{1101}\u{1174}\u{11AA}",
-        nfkc: "\u{B063}",
-        nfkd: "\u{1101}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B064}",
-        nfc: "\u{B064}",
-        nfd: "\u{1101}\u{1174}\u{11AB}",
-        nfkc: "\u{B064}",
-        nfkd: "\u{1101}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B065}",
-        nfc: "\u{B065}",
-        nfd: "\u{1101}\u{1174}\u{11AC}",
-        nfkc: "\u{B065}",
-        nfkd: "\u{1101}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B066}",
-        nfc: "\u{B066}",
-        nfd: "\u{1101}\u{1174}\u{11AD}",
-        nfkc: "\u{B066}",
-        nfkd: "\u{1101}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B067}",
-        nfc: "\u{B067}",
-        nfd: "\u{1101}\u{1174}\u{11AE}",
-        nfkc: "\u{B067}",
-        nfkd: "\u{1101}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B068}",
-        nfc: "\u{B068}",
-        nfd: "\u{1101}\u{1174}\u{11AF}",
-        nfkc: "\u{B068}",
-        nfkd: "\u{1101}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B069}",
-        nfc: "\u{B069}",
-        nfd: "\u{1101}\u{1174}\u{11B0}",
-        nfkc: "\u{B069}",
-        nfkd: "\u{1101}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B06A}",
-        nfc: "\u{B06A}",
-        nfd: "\u{1101}\u{1174}\u{11B1}",
-        nfkc: "\u{B06A}",
-        nfkd: "\u{1101}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B06B}",
-        nfc: "\u{B06B}",
-        nfd: "\u{1101}\u{1174}\u{11B2}",
-        nfkc: "\u{B06B}",
-        nfkd: "\u{1101}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B06C}",
-        nfc: "\u{B06C}",
-        nfd: "\u{1101}\u{1174}\u{11B3}",
-        nfkc: "\u{B06C}",
-        nfkd: "\u{1101}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B06D}",
-        nfc: "\u{B06D}",
-        nfd: "\u{1101}\u{1174}\u{11B4}",
-        nfkc: "\u{B06D}",
-        nfkd: "\u{1101}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B06E}",
-        nfc: "\u{B06E}",
-        nfd: "\u{1101}\u{1174}\u{11B5}",
-        nfkc: "\u{B06E}",
-        nfkd: "\u{1101}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B06F}",
-        nfc: "\u{B06F}",
-        nfd: "\u{1101}\u{1174}\u{11B6}",
-        nfkc: "\u{B06F}",
-        nfkd: "\u{1101}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B070}",
-        nfc: "\u{B070}",
-        nfd: "\u{1101}\u{1174}\u{11B7}",
-        nfkc: "\u{B070}",
-        nfkd: "\u{1101}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B071}",
-        nfc: "\u{B071}",
-        nfd: "\u{1101}\u{1174}\u{11B8}",
-        nfkc: "\u{B071}",
-        nfkd: "\u{1101}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B072}",
-        nfc: "\u{B072}",
-        nfd: "\u{1101}\u{1174}\u{11B9}",
-        nfkc: "\u{B072}",
-        nfkd: "\u{1101}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B073}",
-        nfc: "\u{B073}",
-        nfd: "\u{1101}\u{1174}\u{11BA}",
-        nfkc: "\u{B073}",
-        nfkd: "\u{1101}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B074}",
-        nfc: "\u{B074}",
-        nfd: "\u{1101}\u{1174}\u{11BB}",
-        nfkc: "\u{B074}",
-        nfkd: "\u{1101}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B075}",
-        nfc: "\u{B075}",
-        nfd: "\u{1101}\u{1174}\u{11BC}",
-        nfkc: "\u{B075}",
-        nfkd: "\u{1101}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B076}",
-        nfc: "\u{B076}",
-        nfd: "\u{1101}\u{1174}\u{11BD}",
-        nfkc: "\u{B076}",
-        nfkd: "\u{1101}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B077}",
-        nfc: "\u{B077}",
-        nfd: "\u{1101}\u{1174}\u{11BE}",
-        nfkc: "\u{B077}",
-        nfkd: "\u{1101}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B078}",
-        nfc: "\u{B078}",
-        nfd: "\u{1101}\u{1174}\u{11BF}",
-        nfkc: "\u{B078}",
-        nfkd: "\u{1101}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B079}",
-        nfc: "\u{B079}",
-        nfd: "\u{1101}\u{1174}\u{11C0}",
-        nfkc: "\u{B079}",
-        nfkd: "\u{1101}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B07A}",
-        nfc: "\u{B07A}",
-        nfd: "\u{1101}\u{1174}\u{11C1}",
-        nfkc: "\u{B07A}",
-        nfkd: "\u{1101}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B07B}",
-        nfc: "\u{B07B}",
-        nfd: "\u{1101}\u{1174}\u{11C2}",
-        nfkc: "\u{B07B}",
-        nfkd: "\u{1101}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B07C}",
-        nfc: "\u{B07C}",
-        nfd: "\u{1101}\u{1175}",
-        nfkc: "\u{B07C}",
-        nfkd: "\u{1101}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{B07D}",
-        nfc: "\u{B07D}",
-        nfd: "\u{1101}\u{1175}\u{11A8}",
-        nfkc: "\u{B07D}",
-        nfkd: "\u{1101}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B07E}",
-        nfc: "\u{B07E}",
-        nfd: "\u{1101}\u{1175}\u{11A9}",
-        nfkc: "\u{B07E}",
-        nfkd: "\u{1101}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B07F}",
-        nfc: "\u{B07F}",
-        nfd: "\u{1101}\u{1175}\u{11AA}",
-        nfkc: "\u{B07F}",
-        nfkd: "\u{1101}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B080}",
-        nfc: "\u{B080}",
-        nfd: "\u{1101}\u{1175}\u{11AB}",
-        nfkc: "\u{B080}",
-        nfkd: "\u{1101}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B081}",
-        nfc: "\u{B081}",
-        nfd: "\u{1101}\u{1175}\u{11AC}",
-        nfkc: "\u{B081}",
-        nfkd: "\u{1101}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B082}",
-        nfc: "\u{B082}",
-        nfd: "\u{1101}\u{1175}\u{11AD}",
-        nfkc: "\u{B082}",
-        nfkd: "\u{1101}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B083}",
-        nfc: "\u{B083}",
-        nfd: "\u{1101}\u{1175}\u{11AE}",
-        nfkc: "\u{B083}",
-        nfkd: "\u{1101}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B084}",
-        nfc: "\u{B084}",
-        nfd: "\u{1101}\u{1175}\u{11AF}",
-        nfkc: "\u{B084}",
-        nfkd: "\u{1101}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B085}",
-        nfc: "\u{B085}",
-        nfd: "\u{1101}\u{1175}\u{11B0}",
-        nfkc: "\u{B085}",
-        nfkd: "\u{1101}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B086}",
-        nfc: "\u{B086}",
-        nfd: "\u{1101}\u{1175}\u{11B1}",
-        nfkc: "\u{B086}",
-        nfkd: "\u{1101}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B087}",
-        nfc: "\u{B087}",
-        nfd: "\u{1101}\u{1175}\u{11B2}",
-        nfkc: "\u{B087}",
-        nfkd: "\u{1101}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B088}",
-        nfc: "\u{B088}",
-        nfd: "\u{1101}\u{1175}\u{11B3}",
-        nfkc: "\u{B088}",
-        nfkd: "\u{1101}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B089}",
-        nfc: "\u{B089}",
-        nfd: "\u{1101}\u{1175}\u{11B4}",
-        nfkc: "\u{B089}",
-        nfkd: "\u{1101}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B08A}",
-        nfc: "\u{B08A}",
-        nfd: "\u{1101}\u{1175}\u{11B5}",
-        nfkc: "\u{B08A}",
-        nfkd: "\u{1101}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B08B}",
-        nfc: "\u{B08B}",
-        nfd: "\u{1101}\u{1175}\u{11B6}",
-        nfkc: "\u{B08B}",
-        nfkd: "\u{1101}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B08C}",
-        nfc: "\u{B08C}",
-        nfd: "\u{1101}\u{1175}\u{11B7}",
-        nfkc: "\u{B08C}",
-        nfkd: "\u{1101}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B08D}",
-        nfc: "\u{B08D}",
-        nfd: "\u{1101}\u{1175}\u{11B8}",
-        nfkc: "\u{B08D}",
-        nfkd: "\u{1101}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B08E}",
-        nfc: "\u{B08E}",
-        nfd: "\u{1101}\u{1175}\u{11B9}",
-        nfkc: "\u{B08E}",
-        nfkd: "\u{1101}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B08F}",
-        nfc: "\u{B08F}",
-        nfd: "\u{1101}\u{1175}\u{11BA}",
-        nfkc: "\u{B08F}",
-        nfkd: "\u{1101}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B090}",
-        nfc: "\u{B090}",
-        nfd: "\u{1101}\u{1175}\u{11BB}",
-        nfkc: "\u{B090}",
-        nfkd: "\u{1101}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B091}",
-        nfc: "\u{B091}",
-        nfd: "\u{1101}\u{1175}\u{11BC}",
-        nfkc: "\u{B091}",
-        nfkd: "\u{1101}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B092}",
-        nfc: "\u{B092}",
-        nfd: "\u{1101}\u{1175}\u{11BD}",
-        nfkc: "\u{B092}",
-        nfkd: "\u{1101}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B093}",
-        nfc: "\u{B093}",
-        nfd: "\u{1101}\u{1175}\u{11BE}",
-        nfkc: "\u{B093}",
-        nfkd: "\u{1101}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B094}",
-        nfc: "\u{B094}",
-        nfd: "\u{1101}\u{1175}\u{11BF}",
-        nfkc: "\u{B094}",
-        nfkd: "\u{1101}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B095}",
-        nfc: "\u{B095}",
-        nfd: "\u{1101}\u{1175}\u{11C0}",
-        nfkc: "\u{B095}",
-        nfkd: "\u{1101}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B096}",
-        nfc: "\u{B096}",
-        nfd: "\u{1101}\u{1175}\u{11C1}",
-        nfkc: "\u{B096}",
-        nfkd: "\u{1101}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B097}",
-        nfc: "\u{B097}",
-        nfd: "\u{1101}\u{1175}\u{11C2}",
-        nfkc: "\u{B097}",
-        nfkd: "\u{1101}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B098}",
-        nfc: "\u{B098}",
-        nfd: "\u{1102}\u{1161}",
-        nfkc: "\u{B098}",
-        nfkd: "\u{1102}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{B099}",
-        nfc: "\u{B099}",
-        nfd: "\u{1102}\u{1161}\u{11A8}",
-        nfkc: "\u{B099}",
-        nfkd: "\u{1102}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B09A}",
-        nfc: "\u{B09A}",
-        nfd: "\u{1102}\u{1161}\u{11A9}",
-        nfkc: "\u{B09A}",
-        nfkd: "\u{1102}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B09B}",
-        nfc: "\u{B09B}",
-        nfd: "\u{1102}\u{1161}\u{11AA}",
-        nfkc: "\u{B09B}",
-        nfkd: "\u{1102}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B09C}",
-        nfc: "\u{B09C}",
-        nfd: "\u{1102}\u{1161}\u{11AB}",
-        nfkc: "\u{B09C}",
-        nfkd: "\u{1102}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B09D}",
-        nfc: "\u{B09D}",
-        nfd: "\u{1102}\u{1161}\u{11AC}",
-        nfkc: "\u{B09D}",
-        nfkd: "\u{1102}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B09E}",
-        nfc: "\u{B09E}",
-        nfd: "\u{1102}\u{1161}\u{11AD}",
-        nfkc: "\u{B09E}",
-        nfkd: "\u{1102}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B09F}",
-        nfc: "\u{B09F}",
-        nfd: "\u{1102}\u{1161}\u{11AE}",
-        nfkc: "\u{B09F}",
-        nfkd: "\u{1102}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B0A0}",
-        nfc: "\u{B0A0}",
-        nfd: "\u{1102}\u{1161}\u{11AF}",
-        nfkc: "\u{B0A0}",
-        nfkd: "\u{1102}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B0A1}",
-        nfc: "\u{B0A1}",
-        nfd: "\u{1102}\u{1161}\u{11B0}",
-        nfkc: "\u{B0A1}",
-        nfkd: "\u{1102}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B0A2}",
-        nfc: "\u{B0A2}",
-        nfd: "\u{1102}\u{1161}\u{11B1}",
-        nfkc: "\u{B0A2}",
-        nfkd: "\u{1102}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B0A3}",
-        nfc: "\u{B0A3}",
-        nfd: "\u{1102}\u{1161}\u{11B2}",
-        nfkc: "\u{B0A3}",
-        nfkd: "\u{1102}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B0A4}",
-        nfc: "\u{B0A4}",
-        nfd: "\u{1102}\u{1161}\u{11B3}",
-        nfkc: "\u{B0A4}",
-        nfkd: "\u{1102}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B0A5}",
-        nfc: "\u{B0A5}",
-        nfd: "\u{1102}\u{1161}\u{11B4}",
-        nfkc: "\u{B0A5}",
-        nfkd: "\u{1102}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B0A6}",
-        nfc: "\u{B0A6}",
-        nfd: "\u{1102}\u{1161}\u{11B5}",
-        nfkc: "\u{B0A6}",
-        nfkd: "\u{1102}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B0A7}",
-        nfc: "\u{B0A7}",
-        nfd: "\u{1102}\u{1161}\u{11B6}",
-        nfkc: "\u{B0A7}",
-        nfkd: "\u{1102}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B0A8}",
-        nfc: "\u{B0A8}",
-        nfd: "\u{1102}\u{1161}\u{11B7}",
-        nfkc: "\u{B0A8}",
-        nfkd: "\u{1102}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B0A9}",
-        nfc: "\u{B0A9}",
-        nfd: "\u{1102}\u{1161}\u{11B8}",
-        nfkc: "\u{B0A9}",
-        nfkd: "\u{1102}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B0AA}",
-        nfc: "\u{B0AA}",
-        nfd: "\u{1102}\u{1161}\u{11B9}",
-        nfkc: "\u{B0AA}",
-        nfkd: "\u{1102}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B0AB}",
-        nfc: "\u{B0AB}",
-        nfd: "\u{1102}\u{1161}\u{11BA}",
-        nfkc: "\u{B0AB}",
-        nfkd: "\u{1102}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B0AC}",
-        nfc: "\u{B0AC}",
-        nfd: "\u{1102}\u{1161}\u{11BB}",
-        nfkc: "\u{B0AC}",
-        nfkd: "\u{1102}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B0AD}",
-        nfc: "\u{B0AD}",
-        nfd: "\u{1102}\u{1161}\u{11BC}",
-        nfkc: "\u{B0AD}",
-        nfkd: "\u{1102}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B0AE}",
-        nfc: "\u{B0AE}",
-        nfd: "\u{1102}\u{1161}\u{11BD}",
-        nfkc: "\u{B0AE}",
-        nfkd: "\u{1102}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B0AF}",
-        nfc: "\u{B0AF}",
-        nfd: "\u{1102}\u{1161}\u{11BE}",
-        nfkc: "\u{B0AF}",
-        nfkd: "\u{1102}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B0B0}",
-        nfc: "\u{B0B0}",
-        nfd: "\u{1102}\u{1161}\u{11BF}",
-        nfkc: "\u{B0B0}",
-        nfkd: "\u{1102}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B0B1}",
-        nfc: "\u{B0B1}",
-        nfd: "\u{1102}\u{1161}\u{11C0}",
-        nfkc: "\u{B0B1}",
-        nfkd: "\u{1102}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B0B2}",
-        nfc: "\u{B0B2}",
-        nfd: "\u{1102}\u{1161}\u{11C1}",
-        nfkc: "\u{B0B2}",
-        nfkd: "\u{1102}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B0B3}",
-        nfc: "\u{B0B3}",
-        nfd: "\u{1102}\u{1161}\u{11C2}",
-        nfkc: "\u{B0B3}",
-        nfkd: "\u{1102}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B0B4}",
-        nfc: "\u{B0B4}",
-        nfd: "\u{1102}\u{1162}",
-        nfkc: "\u{B0B4}",
-        nfkd: "\u{1102}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{B0B5}",
-        nfc: "\u{B0B5}",
-        nfd: "\u{1102}\u{1162}\u{11A8}",
-        nfkc: "\u{B0B5}",
-        nfkd: "\u{1102}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B0B6}",
-        nfc: "\u{B0B6}",
-        nfd: "\u{1102}\u{1162}\u{11A9}",
-        nfkc: "\u{B0B6}",
-        nfkd: "\u{1102}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B0B7}",
-        nfc: "\u{B0B7}",
-        nfd: "\u{1102}\u{1162}\u{11AA}",
-        nfkc: "\u{B0B7}",
-        nfkd: "\u{1102}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B0B8}",
-        nfc: "\u{B0B8}",
-        nfd: "\u{1102}\u{1162}\u{11AB}",
-        nfkc: "\u{B0B8}",
-        nfkd: "\u{1102}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B0B9}",
-        nfc: "\u{B0B9}",
-        nfd: "\u{1102}\u{1162}\u{11AC}",
-        nfkc: "\u{B0B9}",
-        nfkd: "\u{1102}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B0BA}",
-        nfc: "\u{B0BA}",
-        nfd: "\u{1102}\u{1162}\u{11AD}",
-        nfkc: "\u{B0BA}",
-        nfkd: "\u{1102}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B0BB}",
-        nfc: "\u{B0BB}",
-        nfd: "\u{1102}\u{1162}\u{11AE}",
-        nfkc: "\u{B0BB}",
-        nfkd: "\u{1102}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B0BC}",
-        nfc: "\u{B0BC}",
-        nfd: "\u{1102}\u{1162}\u{11AF}",
-        nfkc: "\u{B0BC}",
-        nfkd: "\u{1102}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B0BD}",
-        nfc: "\u{B0BD}",
-        nfd: "\u{1102}\u{1162}\u{11B0}",
-        nfkc: "\u{B0BD}",
-        nfkd: "\u{1102}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B0BE}",
-        nfc: "\u{B0BE}",
-        nfd: "\u{1102}\u{1162}\u{11B1}",
-        nfkc: "\u{B0BE}",
-        nfkd: "\u{1102}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B0BF}",
-        nfc: "\u{B0BF}",
-        nfd: "\u{1102}\u{1162}\u{11B2}",
-        nfkc: "\u{B0BF}",
-        nfkd: "\u{1102}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B0C0}",
-        nfc: "\u{B0C0}",
-        nfd: "\u{1102}\u{1162}\u{11B3}",
-        nfkc: "\u{B0C0}",
-        nfkd: "\u{1102}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B0C1}",
-        nfc: "\u{B0C1}",
-        nfd: "\u{1102}\u{1162}\u{11B4}",
-        nfkc: "\u{B0C1}",
-        nfkd: "\u{1102}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B0C2}",
-        nfc: "\u{B0C2}",
-        nfd: "\u{1102}\u{1162}\u{11B5}",
-        nfkc: "\u{B0C2}",
-        nfkd: "\u{1102}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B0C3}",
-        nfc: "\u{B0C3}",
-        nfd: "\u{1102}\u{1162}\u{11B6}",
-        nfkc: "\u{B0C3}",
-        nfkd: "\u{1102}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B0C4}",
-        nfc: "\u{B0C4}",
-        nfd: "\u{1102}\u{1162}\u{11B7}",
-        nfkc: "\u{B0C4}",
-        nfkd: "\u{1102}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B0C5}",
-        nfc: "\u{B0C5}",
-        nfd: "\u{1102}\u{1162}\u{11B8}",
-        nfkc: "\u{B0C5}",
-        nfkd: "\u{1102}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B0C6}",
-        nfc: "\u{B0C6}",
-        nfd: "\u{1102}\u{1162}\u{11B9}",
-        nfkc: "\u{B0C6}",
-        nfkd: "\u{1102}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B0C7}",
-        nfc: "\u{B0C7}",
-        nfd: "\u{1102}\u{1162}\u{11BA}",
-        nfkc: "\u{B0C7}",
-        nfkd: "\u{1102}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B0C8}",
-        nfc: "\u{B0C8}",
-        nfd: "\u{1102}\u{1162}\u{11BB}",
-        nfkc: "\u{B0C8}",
-        nfkd: "\u{1102}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B0C9}",
-        nfc: "\u{B0C9}",
-        nfd: "\u{1102}\u{1162}\u{11BC}",
-        nfkc: "\u{B0C9}",
-        nfkd: "\u{1102}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B0CA}",
-        nfc: "\u{B0CA}",
-        nfd: "\u{1102}\u{1162}\u{11BD}",
-        nfkc: "\u{B0CA}",
-        nfkd: "\u{1102}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B0CB}",
-        nfc: "\u{B0CB}",
-        nfd: "\u{1102}\u{1162}\u{11BE}",
-        nfkc: "\u{B0CB}",
-        nfkd: "\u{1102}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B0CC}",
-        nfc: "\u{B0CC}",
-        nfd: "\u{1102}\u{1162}\u{11BF}",
-        nfkc: "\u{B0CC}",
-        nfkd: "\u{1102}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B0CD}",
-        nfc: "\u{B0CD}",
-        nfd: "\u{1102}\u{1162}\u{11C0}",
-        nfkc: "\u{B0CD}",
-        nfkd: "\u{1102}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B0CE}",
-        nfc: "\u{B0CE}",
-        nfd: "\u{1102}\u{1162}\u{11C1}",
-        nfkc: "\u{B0CE}",
-        nfkd: "\u{1102}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B0CF}",
-        nfc: "\u{B0CF}",
-        nfd: "\u{1102}\u{1162}\u{11C2}",
-        nfkc: "\u{B0CF}",
-        nfkd: "\u{1102}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B0D0}",
-        nfc: "\u{B0D0}",
-        nfd: "\u{1102}\u{1163}",
-        nfkc: "\u{B0D0}",
-        nfkd: "\u{1102}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{B0D1}",
-        nfc: "\u{B0D1}",
-        nfd: "\u{1102}\u{1163}\u{11A8}",
-        nfkc: "\u{B0D1}",
-        nfkd: "\u{1102}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B0D2}",
-        nfc: "\u{B0D2}",
-        nfd: "\u{1102}\u{1163}\u{11A9}",
-        nfkc: "\u{B0D2}",
-        nfkd: "\u{1102}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B0D3}",
-        nfc: "\u{B0D3}",
-        nfd: "\u{1102}\u{1163}\u{11AA}",
-        nfkc: "\u{B0D3}",
-        nfkd: "\u{1102}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B0D4}",
-        nfc: "\u{B0D4}",
-        nfd: "\u{1102}\u{1163}\u{11AB}",
-        nfkc: "\u{B0D4}",
-        nfkd: "\u{1102}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B0D5}",
-        nfc: "\u{B0D5}",
-        nfd: "\u{1102}\u{1163}\u{11AC}",
-        nfkc: "\u{B0D5}",
-        nfkd: "\u{1102}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B0D6}",
-        nfc: "\u{B0D6}",
-        nfd: "\u{1102}\u{1163}\u{11AD}",
-        nfkc: "\u{B0D6}",
-        nfkd: "\u{1102}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B0D7}",
-        nfc: "\u{B0D7}",
-        nfd: "\u{1102}\u{1163}\u{11AE}",
-        nfkc: "\u{B0D7}",
-        nfkd: "\u{1102}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B0D8}",
-        nfc: "\u{B0D8}",
-        nfd: "\u{1102}\u{1163}\u{11AF}",
-        nfkc: "\u{B0D8}",
-        nfkd: "\u{1102}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B0D9}",
-        nfc: "\u{B0D9}",
-        nfd: "\u{1102}\u{1163}\u{11B0}",
-        nfkc: "\u{B0D9}",
-        nfkd: "\u{1102}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B0DA}",
-        nfc: "\u{B0DA}",
-        nfd: "\u{1102}\u{1163}\u{11B1}",
-        nfkc: "\u{B0DA}",
-        nfkd: "\u{1102}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B0DB}",
-        nfc: "\u{B0DB}",
-        nfd: "\u{1102}\u{1163}\u{11B2}",
-        nfkc: "\u{B0DB}",
-        nfkd: "\u{1102}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B0DC}",
-        nfc: "\u{B0DC}",
-        nfd: "\u{1102}\u{1163}\u{11B3}",
-        nfkc: "\u{B0DC}",
-        nfkd: "\u{1102}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B0DD}",
-        nfc: "\u{B0DD}",
-        nfd: "\u{1102}\u{1163}\u{11B4}",
-        nfkc: "\u{B0DD}",
-        nfkd: "\u{1102}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B0DE}",
-        nfc: "\u{B0DE}",
-        nfd: "\u{1102}\u{1163}\u{11B5}",
-        nfkc: "\u{B0DE}",
-        nfkd: "\u{1102}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B0DF}",
-        nfc: "\u{B0DF}",
-        nfd: "\u{1102}\u{1163}\u{11B6}",
-        nfkc: "\u{B0DF}",
-        nfkd: "\u{1102}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B0E0}",
-        nfc: "\u{B0E0}",
-        nfd: "\u{1102}\u{1163}\u{11B7}",
-        nfkc: "\u{B0E0}",
-        nfkd: "\u{1102}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B0E1}",
-        nfc: "\u{B0E1}",
-        nfd: "\u{1102}\u{1163}\u{11B8}",
-        nfkc: "\u{B0E1}",
-        nfkd: "\u{1102}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B0E2}",
-        nfc: "\u{B0E2}",
-        nfd: "\u{1102}\u{1163}\u{11B9}",
-        nfkc: "\u{B0E2}",
-        nfkd: "\u{1102}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B0E3}",
-        nfc: "\u{B0E3}",
-        nfd: "\u{1102}\u{1163}\u{11BA}",
-        nfkc: "\u{B0E3}",
-        nfkd: "\u{1102}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B0E4}",
-        nfc: "\u{B0E4}",
-        nfd: "\u{1102}\u{1163}\u{11BB}",
-        nfkc: "\u{B0E4}",
-        nfkd: "\u{1102}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B0E5}",
-        nfc: "\u{B0E5}",
-        nfd: "\u{1102}\u{1163}\u{11BC}",
-        nfkc: "\u{B0E5}",
-        nfkd: "\u{1102}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B0E6}",
-        nfc: "\u{B0E6}",
-        nfd: "\u{1102}\u{1163}\u{11BD}",
-        nfkc: "\u{B0E6}",
-        nfkd: "\u{1102}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B0E7}",
-        nfc: "\u{B0E7}",
-        nfd: "\u{1102}\u{1163}\u{11BE}",
-        nfkc: "\u{B0E7}",
-        nfkd: "\u{1102}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B0E8}",
-        nfc: "\u{B0E8}",
-        nfd: "\u{1102}\u{1163}\u{11BF}",
-        nfkc: "\u{B0E8}",
-        nfkd: "\u{1102}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B0E9}",
-        nfc: "\u{B0E9}",
-        nfd: "\u{1102}\u{1163}\u{11C0}",
-        nfkc: "\u{B0E9}",
-        nfkd: "\u{1102}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B0EA}",
-        nfc: "\u{B0EA}",
-        nfd: "\u{1102}\u{1163}\u{11C1}",
-        nfkc: "\u{B0EA}",
-        nfkd: "\u{1102}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B0EB}",
-        nfc: "\u{B0EB}",
-        nfd: "\u{1102}\u{1163}\u{11C2}",
-        nfkc: "\u{B0EB}",
-        nfkd: "\u{1102}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B0EC}",
-        nfc: "\u{B0EC}",
-        nfd: "\u{1102}\u{1164}",
-        nfkc: "\u{B0EC}",
-        nfkd: "\u{1102}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{B0ED}",
-        nfc: "\u{B0ED}",
-        nfd: "\u{1102}\u{1164}\u{11A8}",
-        nfkc: "\u{B0ED}",
-        nfkd: "\u{1102}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B0EE}",
-        nfc: "\u{B0EE}",
-        nfd: "\u{1102}\u{1164}\u{11A9}",
-        nfkc: "\u{B0EE}",
-        nfkd: "\u{1102}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B0EF}",
-        nfc: "\u{B0EF}",
-        nfd: "\u{1102}\u{1164}\u{11AA}",
-        nfkc: "\u{B0EF}",
-        nfkd: "\u{1102}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B0F0}",
-        nfc: "\u{B0F0}",
-        nfd: "\u{1102}\u{1164}\u{11AB}",
-        nfkc: "\u{B0F0}",
-        nfkd: "\u{1102}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B0F1}",
-        nfc: "\u{B0F1}",
-        nfd: "\u{1102}\u{1164}\u{11AC}",
-        nfkc: "\u{B0F1}",
-        nfkd: "\u{1102}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B0F2}",
-        nfc: "\u{B0F2}",
-        nfd: "\u{1102}\u{1164}\u{11AD}",
-        nfkc: "\u{B0F2}",
-        nfkd: "\u{1102}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B0F3}",
-        nfc: "\u{B0F3}",
-        nfd: "\u{1102}\u{1164}\u{11AE}",
-        nfkc: "\u{B0F3}",
-        nfkd: "\u{1102}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B0F4}",
-        nfc: "\u{B0F4}",
-        nfd: "\u{1102}\u{1164}\u{11AF}",
-        nfkc: "\u{B0F4}",
-        nfkd: "\u{1102}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B0F5}",
-        nfc: "\u{B0F5}",
-        nfd: "\u{1102}\u{1164}\u{11B0}",
-        nfkc: "\u{B0F5}",
-        nfkd: "\u{1102}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B0F6}",
-        nfc: "\u{B0F6}",
-        nfd: "\u{1102}\u{1164}\u{11B1}",
-        nfkc: "\u{B0F6}",
-        nfkd: "\u{1102}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B0F7}",
-        nfc: "\u{B0F7}",
-        nfd: "\u{1102}\u{1164}\u{11B2}",
-        nfkc: "\u{B0F7}",
-        nfkd: "\u{1102}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B0F8}",
-        nfc: "\u{B0F8}",
-        nfd: "\u{1102}\u{1164}\u{11B3}",
-        nfkc: "\u{B0F8}",
-        nfkd: "\u{1102}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B0F9}",
-        nfc: "\u{B0F9}",
-        nfd: "\u{1102}\u{1164}\u{11B4}",
-        nfkc: "\u{B0F9}",
-        nfkd: "\u{1102}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B0FA}",
-        nfc: "\u{B0FA}",
-        nfd: "\u{1102}\u{1164}\u{11B5}",
-        nfkc: "\u{B0FA}",
-        nfkd: "\u{1102}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B0FB}",
-        nfc: "\u{B0FB}",
-        nfd: "\u{1102}\u{1164}\u{11B6}",
-        nfkc: "\u{B0FB}",
-        nfkd: "\u{1102}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B0FC}",
-        nfc: "\u{B0FC}",
-        nfd: "\u{1102}\u{1164}\u{11B7}",
-        nfkc: "\u{B0FC}",
-        nfkd: "\u{1102}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B0FD}",
-        nfc: "\u{B0FD}",
-        nfd: "\u{1102}\u{1164}\u{11B8}",
-        nfkc: "\u{B0FD}",
-        nfkd: "\u{1102}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B0FE}",
-        nfc: "\u{B0FE}",
-        nfd: "\u{1102}\u{1164}\u{11B9}",
-        nfkc: "\u{B0FE}",
-        nfkd: "\u{1102}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B0FF}",
-        nfc: "\u{B0FF}",
-        nfd: "\u{1102}\u{1164}\u{11BA}",
-        nfkc: "\u{B0FF}",
-        nfkd: "\u{1102}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B100}",
-        nfc: "\u{B100}",
-        nfd: "\u{1102}\u{1164}\u{11BB}",
-        nfkc: "\u{B100}",
-        nfkd: "\u{1102}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B101}",
-        nfc: "\u{B101}",
-        nfd: "\u{1102}\u{1164}\u{11BC}",
-        nfkc: "\u{B101}",
-        nfkd: "\u{1102}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B102}",
-        nfc: "\u{B102}",
-        nfd: "\u{1102}\u{1164}\u{11BD}",
-        nfkc: "\u{B102}",
-        nfkd: "\u{1102}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B103}",
-        nfc: "\u{B103}",
-        nfd: "\u{1102}\u{1164}\u{11BE}",
-        nfkc: "\u{B103}",
-        nfkd: "\u{1102}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B104}",
-        nfc: "\u{B104}",
-        nfd: "\u{1102}\u{1164}\u{11BF}",
-        nfkc: "\u{B104}",
-        nfkd: "\u{1102}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B105}",
-        nfc: "\u{B105}",
-        nfd: "\u{1102}\u{1164}\u{11C0}",
-        nfkc: "\u{B105}",
-        nfkd: "\u{1102}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B106}",
-        nfc: "\u{B106}",
-        nfd: "\u{1102}\u{1164}\u{11C1}",
-        nfkc: "\u{B106}",
-        nfkd: "\u{1102}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B107}",
-        nfc: "\u{B107}",
-        nfd: "\u{1102}\u{1164}\u{11C2}",
-        nfkc: "\u{B107}",
-        nfkd: "\u{1102}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B108}",
-        nfc: "\u{B108}",
-        nfd: "\u{1102}\u{1165}",
-        nfkc: "\u{B108}",
-        nfkd: "\u{1102}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{B109}",
-        nfc: "\u{B109}",
-        nfd: "\u{1102}\u{1165}\u{11A8}",
-        nfkc: "\u{B109}",
-        nfkd: "\u{1102}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B10A}",
-        nfc: "\u{B10A}",
-        nfd: "\u{1102}\u{1165}\u{11A9}",
-        nfkc: "\u{B10A}",
-        nfkd: "\u{1102}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B10B}",
-        nfc: "\u{B10B}",
-        nfd: "\u{1102}\u{1165}\u{11AA}",
-        nfkc: "\u{B10B}",
-        nfkd: "\u{1102}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B10C}",
-        nfc: "\u{B10C}",
-        nfd: "\u{1102}\u{1165}\u{11AB}",
-        nfkc: "\u{B10C}",
-        nfkd: "\u{1102}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B10D}",
-        nfc: "\u{B10D}",
-        nfd: "\u{1102}\u{1165}\u{11AC}",
-        nfkc: "\u{B10D}",
-        nfkd: "\u{1102}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B10E}",
-        nfc: "\u{B10E}",
-        nfd: "\u{1102}\u{1165}\u{11AD}",
-        nfkc: "\u{B10E}",
-        nfkd: "\u{1102}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B10F}",
-        nfc: "\u{B10F}",
-        nfd: "\u{1102}\u{1165}\u{11AE}",
-        nfkc: "\u{B10F}",
-        nfkd: "\u{1102}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B110}",
-        nfc: "\u{B110}",
-        nfd: "\u{1102}\u{1165}\u{11AF}",
-        nfkc: "\u{B110}",
-        nfkd: "\u{1102}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B111}",
-        nfc: "\u{B111}",
-        nfd: "\u{1102}\u{1165}\u{11B0}",
-        nfkc: "\u{B111}",
-        nfkd: "\u{1102}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B112}",
-        nfc: "\u{B112}",
-        nfd: "\u{1102}\u{1165}\u{11B1}",
-        nfkc: "\u{B112}",
-        nfkd: "\u{1102}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B113}",
-        nfc: "\u{B113}",
-        nfd: "\u{1102}\u{1165}\u{11B2}",
-        nfkc: "\u{B113}",
-        nfkd: "\u{1102}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B114}",
-        nfc: "\u{B114}",
-        nfd: "\u{1102}\u{1165}\u{11B3}",
-        nfkc: "\u{B114}",
-        nfkd: "\u{1102}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B115}",
-        nfc: "\u{B115}",
-        nfd: "\u{1102}\u{1165}\u{11B4}",
-        nfkc: "\u{B115}",
-        nfkd: "\u{1102}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B116}",
-        nfc: "\u{B116}",
-        nfd: "\u{1102}\u{1165}\u{11B5}",
-        nfkc: "\u{B116}",
-        nfkd: "\u{1102}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B117}",
-        nfc: "\u{B117}",
-        nfd: "\u{1102}\u{1165}\u{11B6}",
-        nfkc: "\u{B117}",
-        nfkd: "\u{1102}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B118}",
-        nfc: "\u{B118}",
-        nfd: "\u{1102}\u{1165}\u{11B7}",
-        nfkc: "\u{B118}",
-        nfkd: "\u{1102}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B119}",
-        nfc: "\u{B119}",
-        nfd: "\u{1102}\u{1165}\u{11B8}",
-        nfkc: "\u{B119}",
-        nfkd: "\u{1102}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B11A}",
-        nfc: "\u{B11A}",
-        nfd: "\u{1102}\u{1165}\u{11B9}",
-        nfkc: "\u{B11A}",
-        nfkd: "\u{1102}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B11B}",
-        nfc: "\u{B11B}",
-        nfd: "\u{1102}\u{1165}\u{11BA}",
-        nfkc: "\u{B11B}",
-        nfkd: "\u{1102}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B11C}",
-        nfc: "\u{B11C}",
-        nfd: "\u{1102}\u{1165}\u{11BB}",
-        nfkc: "\u{B11C}",
-        nfkd: "\u{1102}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B11D}",
-        nfc: "\u{B11D}",
-        nfd: "\u{1102}\u{1165}\u{11BC}",
-        nfkc: "\u{B11D}",
-        nfkd: "\u{1102}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B11E}",
-        nfc: "\u{B11E}",
-        nfd: "\u{1102}\u{1165}\u{11BD}",
-        nfkc: "\u{B11E}",
-        nfkd: "\u{1102}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B11F}",
-        nfc: "\u{B11F}",
-        nfd: "\u{1102}\u{1165}\u{11BE}",
-        nfkc: "\u{B11F}",
-        nfkd: "\u{1102}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B120}",
-        nfc: "\u{B120}",
-        nfd: "\u{1102}\u{1165}\u{11BF}",
-        nfkc: "\u{B120}",
-        nfkd: "\u{1102}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B121}",
-        nfc: "\u{B121}",
-        nfd: "\u{1102}\u{1165}\u{11C0}",
-        nfkc: "\u{B121}",
-        nfkd: "\u{1102}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B122}",
-        nfc: "\u{B122}",
-        nfd: "\u{1102}\u{1165}\u{11C1}",
-        nfkc: "\u{B122}",
-        nfkd: "\u{1102}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B123}",
-        nfc: "\u{B123}",
-        nfd: "\u{1102}\u{1165}\u{11C2}",
-        nfkc: "\u{B123}",
-        nfkd: "\u{1102}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B124}",
-        nfc: "\u{B124}",
-        nfd: "\u{1102}\u{1166}",
-        nfkc: "\u{B124}",
-        nfkd: "\u{1102}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{B125}",
-        nfc: "\u{B125}",
-        nfd: "\u{1102}\u{1166}\u{11A8}",
-        nfkc: "\u{B125}",
-        nfkd: "\u{1102}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B126}",
-        nfc: "\u{B126}",
-        nfd: "\u{1102}\u{1166}\u{11A9}",
-        nfkc: "\u{B126}",
-        nfkd: "\u{1102}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B127}",
-        nfc: "\u{B127}",
-        nfd: "\u{1102}\u{1166}\u{11AA}",
-        nfkc: "\u{B127}",
-        nfkd: "\u{1102}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B128}",
-        nfc: "\u{B128}",
-        nfd: "\u{1102}\u{1166}\u{11AB}",
-        nfkc: "\u{B128}",
-        nfkd: "\u{1102}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B129}",
-        nfc: "\u{B129}",
-        nfd: "\u{1102}\u{1166}\u{11AC}",
-        nfkc: "\u{B129}",
-        nfkd: "\u{1102}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B12A}",
-        nfc: "\u{B12A}",
-        nfd: "\u{1102}\u{1166}\u{11AD}",
-        nfkc: "\u{B12A}",
-        nfkd: "\u{1102}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B12B}",
-        nfc: "\u{B12B}",
-        nfd: "\u{1102}\u{1166}\u{11AE}",
-        nfkc: "\u{B12B}",
-        nfkd: "\u{1102}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B12C}",
-        nfc: "\u{B12C}",
-        nfd: "\u{1102}\u{1166}\u{11AF}",
-        nfkc: "\u{B12C}",
-        nfkd: "\u{1102}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B12D}",
-        nfc: "\u{B12D}",
-        nfd: "\u{1102}\u{1166}\u{11B0}",
-        nfkc: "\u{B12D}",
-        nfkd: "\u{1102}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B12E}",
-        nfc: "\u{B12E}",
-        nfd: "\u{1102}\u{1166}\u{11B1}",
-        nfkc: "\u{B12E}",
-        nfkd: "\u{1102}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B12F}",
-        nfc: "\u{B12F}",
-        nfd: "\u{1102}\u{1166}\u{11B2}",
-        nfkc: "\u{B12F}",
-        nfkd: "\u{1102}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B130}",
-        nfc: "\u{B130}",
-        nfd: "\u{1102}\u{1166}\u{11B3}",
-        nfkc: "\u{B130}",
-        nfkd: "\u{1102}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B131}",
-        nfc: "\u{B131}",
-        nfd: "\u{1102}\u{1166}\u{11B4}",
-        nfkc: "\u{B131}",
-        nfkd: "\u{1102}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B132}",
-        nfc: "\u{B132}",
-        nfd: "\u{1102}\u{1166}\u{11B5}",
-        nfkc: "\u{B132}",
-        nfkd: "\u{1102}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B133}",
-        nfc: "\u{B133}",
-        nfd: "\u{1102}\u{1166}\u{11B6}",
-        nfkc: "\u{B133}",
-        nfkd: "\u{1102}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B134}",
-        nfc: "\u{B134}",
-        nfd: "\u{1102}\u{1166}\u{11B7}",
-        nfkc: "\u{B134}",
-        nfkd: "\u{1102}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B135}",
-        nfc: "\u{B135}",
-        nfd: "\u{1102}\u{1166}\u{11B8}",
-        nfkc: "\u{B135}",
-        nfkd: "\u{1102}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B136}",
-        nfc: "\u{B136}",
-        nfd: "\u{1102}\u{1166}\u{11B9}",
-        nfkc: "\u{B136}",
-        nfkd: "\u{1102}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B137}",
-        nfc: "\u{B137}",
-        nfd: "\u{1102}\u{1166}\u{11BA}",
-        nfkc: "\u{B137}",
-        nfkd: "\u{1102}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B138}",
-        nfc: "\u{B138}",
-        nfd: "\u{1102}\u{1166}\u{11BB}",
-        nfkc: "\u{B138}",
-        nfkd: "\u{1102}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B139}",
-        nfc: "\u{B139}",
-        nfd: "\u{1102}\u{1166}\u{11BC}",
-        nfkc: "\u{B139}",
-        nfkd: "\u{1102}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B13A}",
-        nfc: "\u{B13A}",
-        nfd: "\u{1102}\u{1166}\u{11BD}",
-        nfkc: "\u{B13A}",
-        nfkd: "\u{1102}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B13B}",
-        nfc: "\u{B13B}",
-        nfd: "\u{1102}\u{1166}\u{11BE}",
-        nfkc: "\u{B13B}",
-        nfkd: "\u{1102}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B13C}",
-        nfc: "\u{B13C}",
-        nfd: "\u{1102}\u{1166}\u{11BF}",
-        nfkc: "\u{B13C}",
-        nfkd: "\u{1102}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B13D}",
-        nfc: "\u{B13D}",
-        nfd: "\u{1102}\u{1166}\u{11C0}",
-        nfkc: "\u{B13D}",
-        nfkd: "\u{1102}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B13E}",
-        nfc: "\u{B13E}",
-        nfd: "\u{1102}\u{1166}\u{11C1}",
-        nfkc: "\u{B13E}",
-        nfkd: "\u{1102}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B13F}",
-        nfc: "\u{B13F}",
-        nfd: "\u{1102}\u{1166}\u{11C2}",
-        nfkc: "\u{B13F}",
-        nfkd: "\u{1102}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B140}",
-        nfc: "\u{B140}",
-        nfd: "\u{1102}\u{1167}",
-        nfkc: "\u{B140}",
-        nfkd: "\u{1102}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{B141}",
-        nfc: "\u{B141}",
-        nfd: "\u{1102}\u{1167}\u{11A8}",
-        nfkc: "\u{B141}",
-        nfkd: "\u{1102}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B142}",
-        nfc: "\u{B142}",
-        nfd: "\u{1102}\u{1167}\u{11A9}",
-        nfkc: "\u{B142}",
-        nfkd: "\u{1102}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B143}",
-        nfc: "\u{B143}",
-        nfd: "\u{1102}\u{1167}\u{11AA}",
-        nfkc: "\u{B143}",
-        nfkd: "\u{1102}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B144}",
-        nfc: "\u{B144}",
-        nfd: "\u{1102}\u{1167}\u{11AB}",
-        nfkc: "\u{B144}",
-        nfkd: "\u{1102}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B145}",
-        nfc: "\u{B145}",
-        nfd: "\u{1102}\u{1167}\u{11AC}",
-        nfkc: "\u{B145}",
-        nfkd: "\u{1102}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B146}",
-        nfc: "\u{B146}",
-        nfd: "\u{1102}\u{1167}\u{11AD}",
-        nfkc: "\u{B146}",
-        nfkd: "\u{1102}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B147}",
-        nfc: "\u{B147}",
-        nfd: "\u{1102}\u{1167}\u{11AE}",
-        nfkc: "\u{B147}",
-        nfkd: "\u{1102}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B148}",
-        nfc: "\u{B148}",
-        nfd: "\u{1102}\u{1167}\u{11AF}",
-        nfkc: "\u{B148}",
-        nfkd: "\u{1102}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B149}",
-        nfc: "\u{B149}",
-        nfd: "\u{1102}\u{1167}\u{11B0}",
-        nfkc: "\u{B149}",
-        nfkd: "\u{1102}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B14A}",
-        nfc: "\u{B14A}",
-        nfd: "\u{1102}\u{1167}\u{11B1}",
-        nfkc: "\u{B14A}",
-        nfkd: "\u{1102}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B14B}",
-        nfc: "\u{B14B}",
-        nfd: "\u{1102}\u{1167}\u{11B2}",
-        nfkc: "\u{B14B}",
-        nfkd: "\u{1102}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B14C}",
-        nfc: "\u{B14C}",
-        nfd: "\u{1102}\u{1167}\u{11B3}",
-        nfkc: "\u{B14C}",
-        nfkd: "\u{1102}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B14D}",
-        nfc: "\u{B14D}",
-        nfd: "\u{1102}\u{1167}\u{11B4}",
-        nfkc: "\u{B14D}",
-        nfkd: "\u{1102}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B14E}",
-        nfc: "\u{B14E}",
-        nfd: "\u{1102}\u{1167}\u{11B5}",
-        nfkc: "\u{B14E}",
-        nfkd: "\u{1102}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B14F}",
-        nfc: "\u{B14F}",
-        nfd: "\u{1102}\u{1167}\u{11B6}",
-        nfkc: "\u{B14F}",
-        nfkd: "\u{1102}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B150}",
-        nfc: "\u{B150}",
-        nfd: "\u{1102}\u{1167}\u{11B7}",
-        nfkc: "\u{B150}",
-        nfkd: "\u{1102}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B151}",
-        nfc: "\u{B151}",
-        nfd: "\u{1102}\u{1167}\u{11B8}",
-        nfkc: "\u{B151}",
-        nfkd: "\u{1102}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B152}",
-        nfc: "\u{B152}",
-        nfd: "\u{1102}\u{1167}\u{11B9}",
-        nfkc: "\u{B152}",
-        nfkd: "\u{1102}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B153}",
-        nfc: "\u{B153}",
-        nfd: "\u{1102}\u{1167}\u{11BA}",
-        nfkc: "\u{B153}",
-        nfkd: "\u{1102}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B154}",
-        nfc: "\u{B154}",
-        nfd: "\u{1102}\u{1167}\u{11BB}",
-        nfkc: "\u{B154}",
-        nfkd: "\u{1102}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B155}",
-        nfc: "\u{B155}",
-        nfd: "\u{1102}\u{1167}\u{11BC}",
-        nfkc: "\u{B155}",
-        nfkd: "\u{1102}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B156}",
-        nfc: "\u{B156}",
-        nfd: "\u{1102}\u{1167}\u{11BD}",
-        nfkc: "\u{B156}",
-        nfkd: "\u{1102}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B157}",
-        nfc: "\u{B157}",
-        nfd: "\u{1102}\u{1167}\u{11BE}",
-        nfkc: "\u{B157}",
-        nfkd: "\u{1102}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B158}",
-        nfc: "\u{B158}",
-        nfd: "\u{1102}\u{1167}\u{11BF}",
-        nfkc: "\u{B158}",
-        nfkd: "\u{1102}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B159}",
-        nfc: "\u{B159}",
-        nfd: "\u{1102}\u{1167}\u{11C0}",
-        nfkc: "\u{B159}",
-        nfkd: "\u{1102}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B15A}",
-        nfc: "\u{B15A}",
-        nfd: "\u{1102}\u{1167}\u{11C1}",
-        nfkc: "\u{B15A}",
-        nfkd: "\u{1102}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B15B}",
-        nfc: "\u{B15B}",
-        nfd: "\u{1102}\u{1167}\u{11C2}",
-        nfkc: "\u{B15B}",
-        nfkd: "\u{1102}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B15C}",
-        nfc: "\u{B15C}",
-        nfd: "\u{1102}\u{1168}",
-        nfkc: "\u{B15C}",
-        nfkd: "\u{1102}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{B15D}",
-        nfc: "\u{B15D}",
-        nfd: "\u{1102}\u{1168}\u{11A8}",
-        nfkc: "\u{B15D}",
-        nfkd: "\u{1102}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B15E}",
-        nfc: "\u{B15E}",
-        nfd: "\u{1102}\u{1168}\u{11A9}",
-        nfkc: "\u{B15E}",
-        nfkd: "\u{1102}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B15F}",
-        nfc: "\u{B15F}",
-        nfd: "\u{1102}\u{1168}\u{11AA}",
-        nfkc: "\u{B15F}",
-        nfkd: "\u{1102}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B160}",
-        nfc: "\u{B160}",
-        nfd: "\u{1102}\u{1168}\u{11AB}",
-        nfkc: "\u{B160}",
-        nfkd: "\u{1102}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B161}",
-        nfc: "\u{B161}",
-        nfd: "\u{1102}\u{1168}\u{11AC}",
-        nfkc: "\u{B161}",
-        nfkd: "\u{1102}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B162}",
-        nfc: "\u{B162}",
-        nfd: "\u{1102}\u{1168}\u{11AD}",
-        nfkc: "\u{B162}",
-        nfkd: "\u{1102}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B163}",
-        nfc: "\u{B163}",
-        nfd: "\u{1102}\u{1168}\u{11AE}",
-        nfkc: "\u{B163}",
-        nfkd: "\u{1102}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B164}",
-        nfc: "\u{B164}",
-        nfd: "\u{1102}\u{1168}\u{11AF}",
-        nfkc: "\u{B164}",
-        nfkd: "\u{1102}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B165}",
-        nfc: "\u{B165}",
-        nfd: "\u{1102}\u{1168}\u{11B0}",
-        nfkc: "\u{B165}",
-        nfkd: "\u{1102}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B166}",
-        nfc: "\u{B166}",
-        nfd: "\u{1102}\u{1168}\u{11B1}",
-        nfkc: "\u{B166}",
-        nfkd: "\u{1102}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B167}",
-        nfc: "\u{B167}",
-        nfd: "\u{1102}\u{1168}\u{11B2}",
-        nfkc: "\u{B167}",
-        nfkd: "\u{1102}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B168}",
-        nfc: "\u{B168}",
-        nfd: "\u{1102}\u{1168}\u{11B3}",
-        nfkc: "\u{B168}",
-        nfkd: "\u{1102}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B169}",
-        nfc: "\u{B169}",
-        nfd: "\u{1102}\u{1168}\u{11B4}",
-        nfkc: "\u{B169}",
-        nfkd: "\u{1102}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B16A}",
-        nfc: "\u{B16A}",
-        nfd: "\u{1102}\u{1168}\u{11B5}",
-        nfkc: "\u{B16A}",
-        nfkd: "\u{1102}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B16B}",
-        nfc: "\u{B16B}",
-        nfd: "\u{1102}\u{1168}\u{11B6}",
-        nfkc: "\u{B16B}",
-        nfkd: "\u{1102}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B16C}",
-        nfc: "\u{B16C}",
-        nfd: "\u{1102}\u{1168}\u{11B7}",
-        nfkc: "\u{B16C}",
-        nfkd: "\u{1102}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B16D}",
-        nfc: "\u{B16D}",
-        nfd: "\u{1102}\u{1168}\u{11B8}",
-        nfkc: "\u{B16D}",
-        nfkd: "\u{1102}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B16E}",
-        nfc: "\u{B16E}",
-        nfd: "\u{1102}\u{1168}\u{11B9}",
-        nfkc: "\u{B16E}",
-        nfkd: "\u{1102}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B16F}",
-        nfc: "\u{B16F}",
-        nfd: "\u{1102}\u{1168}\u{11BA}",
-        nfkc: "\u{B16F}",
-        nfkd: "\u{1102}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B170}",
-        nfc: "\u{B170}",
-        nfd: "\u{1102}\u{1168}\u{11BB}",
-        nfkc: "\u{B170}",
-        nfkd: "\u{1102}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B171}",
-        nfc: "\u{B171}",
-        nfd: "\u{1102}\u{1168}\u{11BC}",
-        nfkc: "\u{B171}",
-        nfkd: "\u{1102}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B172}",
-        nfc: "\u{B172}",
-        nfd: "\u{1102}\u{1168}\u{11BD}",
-        nfkc: "\u{B172}",
-        nfkd: "\u{1102}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B173}",
-        nfc: "\u{B173}",
-        nfd: "\u{1102}\u{1168}\u{11BE}",
-        nfkc: "\u{B173}",
-        nfkd: "\u{1102}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B174}",
-        nfc: "\u{B174}",
-        nfd: "\u{1102}\u{1168}\u{11BF}",
-        nfkc: "\u{B174}",
-        nfkd: "\u{1102}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B175}",
-        nfc: "\u{B175}",
-        nfd: "\u{1102}\u{1168}\u{11C0}",
-        nfkc: "\u{B175}",
-        nfkd: "\u{1102}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B176}",
-        nfc: "\u{B176}",
-        nfd: "\u{1102}\u{1168}\u{11C1}",
-        nfkc: "\u{B176}",
-        nfkd: "\u{1102}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B177}",
-        nfc: "\u{B177}",
-        nfd: "\u{1102}\u{1168}\u{11C2}",
-        nfkc: "\u{B177}",
-        nfkd: "\u{1102}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B178}",
-        nfc: "\u{B178}",
-        nfd: "\u{1102}\u{1169}",
-        nfkc: "\u{B178}",
-        nfkd: "\u{1102}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{B179}",
-        nfc: "\u{B179}",
-        nfd: "\u{1102}\u{1169}\u{11A8}",
-        nfkc: "\u{B179}",
-        nfkd: "\u{1102}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B17A}",
-        nfc: "\u{B17A}",
-        nfd: "\u{1102}\u{1169}\u{11A9}",
-        nfkc: "\u{B17A}",
-        nfkd: "\u{1102}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B17B}",
-        nfc: "\u{B17B}",
-        nfd: "\u{1102}\u{1169}\u{11AA}",
-        nfkc: "\u{B17B}",
-        nfkd: "\u{1102}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B17C}",
-        nfc: "\u{B17C}",
-        nfd: "\u{1102}\u{1169}\u{11AB}",
-        nfkc: "\u{B17C}",
-        nfkd: "\u{1102}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B17D}",
-        nfc: "\u{B17D}",
-        nfd: "\u{1102}\u{1169}\u{11AC}",
-        nfkc: "\u{B17D}",
-        nfkd: "\u{1102}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B17E}",
-        nfc: "\u{B17E}",
-        nfd: "\u{1102}\u{1169}\u{11AD}",
-        nfkc: "\u{B17E}",
-        nfkd: "\u{1102}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B17F}",
-        nfc: "\u{B17F}",
-        nfd: "\u{1102}\u{1169}\u{11AE}",
-        nfkc: "\u{B17F}",
-        nfkd: "\u{1102}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B180}",
-        nfc: "\u{B180}",
-        nfd: "\u{1102}\u{1169}\u{11AF}",
-        nfkc: "\u{B180}",
-        nfkd: "\u{1102}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B181}",
-        nfc: "\u{B181}",
-        nfd: "\u{1102}\u{1169}\u{11B0}",
-        nfkc: "\u{B181}",
-        nfkd: "\u{1102}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B182}",
-        nfc: "\u{B182}",
-        nfd: "\u{1102}\u{1169}\u{11B1}",
-        nfkc: "\u{B182}",
-        nfkd: "\u{1102}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B183}",
-        nfc: "\u{B183}",
-        nfd: "\u{1102}\u{1169}\u{11B2}",
-        nfkc: "\u{B183}",
-        nfkd: "\u{1102}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B184}",
-        nfc: "\u{B184}",
-        nfd: "\u{1102}\u{1169}\u{11B3}",
-        nfkc: "\u{B184}",
-        nfkd: "\u{1102}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B185}",
-        nfc: "\u{B185}",
-        nfd: "\u{1102}\u{1169}\u{11B4}",
-        nfkc: "\u{B185}",
-        nfkd: "\u{1102}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B186}",
-        nfc: "\u{B186}",
-        nfd: "\u{1102}\u{1169}\u{11B5}",
-        nfkc: "\u{B186}",
-        nfkd: "\u{1102}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B187}",
-        nfc: "\u{B187}",
-        nfd: "\u{1102}\u{1169}\u{11B6}",
-        nfkc: "\u{B187}",
-        nfkd: "\u{1102}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B188}",
-        nfc: "\u{B188}",
-        nfd: "\u{1102}\u{1169}\u{11B7}",
-        nfkc: "\u{B188}",
-        nfkd: "\u{1102}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B189}",
-        nfc: "\u{B189}",
-        nfd: "\u{1102}\u{1169}\u{11B8}",
-        nfkc: "\u{B189}",
-        nfkd: "\u{1102}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B18A}",
-        nfc: "\u{B18A}",
-        nfd: "\u{1102}\u{1169}\u{11B9}",
-        nfkc: "\u{B18A}",
-        nfkd: "\u{1102}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B18B}",
-        nfc: "\u{B18B}",
-        nfd: "\u{1102}\u{1169}\u{11BA}",
-        nfkc: "\u{B18B}",
-        nfkd: "\u{1102}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B18C}",
-        nfc: "\u{B18C}",
-        nfd: "\u{1102}\u{1169}\u{11BB}",
-        nfkc: "\u{B18C}",
-        nfkd: "\u{1102}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B18D}",
-        nfc: "\u{B18D}",
-        nfd: "\u{1102}\u{1169}\u{11BC}",
-        nfkc: "\u{B18D}",
-        nfkd: "\u{1102}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B18E}",
-        nfc: "\u{B18E}",
-        nfd: "\u{1102}\u{1169}\u{11BD}",
-        nfkc: "\u{B18E}",
-        nfkd: "\u{1102}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B18F}",
-        nfc: "\u{B18F}",
-        nfd: "\u{1102}\u{1169}\u{11BE}",
-        nfkc: "\u{B18F}",
-        nfkd: "\u{1102}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B190}",
-        nfc: "\u{B190}",
-        nfd: "\u{1102}\u{1169}\u{11BF}",
-        nfkc: "\u{B190}",
-        nfkd: "\u{1102}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B191}",
-        nfc: "\u{B191}",
-        nfd: "\u{1102}\u{1169}\u{11C0}",
-        nfkc: "\u{B191}",
-        nfkd: "\u{1102}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B192}",
-        nfc: "\u{B192}",
-        nfd: "\u{1102}\u{1169}\u{11C1}",
-        nfkc: "\u{B192}",
-        nfkd: "\u{1102}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B193}",
-        nfc: "\u{B193}",
-        nfd: "\u{1102}\u{1169}\u{11C2}",
-        nfkc: "\u{B193}",
-        nfkd: "\u{1102}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B194}",
-        nfc: "\u{B194}",
-        nfd: "\u{1102}\u{116A}",
-        nfkc: "\u{B194}",
-        nfkd: "\u{1102}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{B195}",
-        nfc: "\u{B195}",
-        nfd: "\u{1102}\u{116A}\u{11A8}",
-        nfkc: "\u{B195}",
-        nfkd: "\u{1102}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B196}",
-        nfc: "\u{B196}",
-        nfd: "\u{1102}\u{116A}\u{11A9}",
-        nfkc: "\u{B196}",
-        nfkd: "\u{1102}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B197}",
-        nfc: "\u{B197}",
-        nfd: "\u{1102}\u{116A}\u{11AA}",
-        nfkc: "\u{B197}",
-        nfkd: "\u{1102}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B198}",
-        nfc: "\u{B198}",
-        nfd: "\u{1102}\u{116A}\u{11AB}",
-        nfkc: "\u{B198}",
-        nfkd: "\u{1102}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B199}",
-        nfc: "\u{B199}",
-        nfd: "\u{1102}\u{116A}\u{11AC}",
-        nfkc: "\u{B199}",
-        nfkd: "\u{1102}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B19A}",
-        nfc: "\u{B19A}",
-        nfd: "\u{1102}\u{116A}\u{11AD}",
-        nfkc: "\u{B19A}",
-        nfkd: "\u{1102}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B19B}",
-        nfc: "\u{B19B}",
-        nfd: "\u{1102}\u{116A}\u{11AE}",
-        nfkc: "\u{B19B}",
-        nfkd: "\u{1102}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B19C}",
-        nfc: "\u{B19C}",
-        nfd: "\u{1102}\u{116A}\u{11AF}",
-        nfkc: "\u{B19C}",
-        nfkd: "\u{1102}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B19D}",
-        nfc: "\u{B19D}",
-        nfd: "\u{1102}\u{116A}\u{11B0}",
-        nfkc: "\u{B19D}",
-        nfkd: "\u{1102}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B19E}",
-        nfc: "\u{B19E}",
-        nfd: "\u{1102}\u{116A}\u{11B1}",
-        nfkc: "\u{B19E}",
-        nfkd: "\u{1102}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B19F}",
-        nfc: "\u{B19F}",
-        nfd: "\u{1102}\u{116A}\u{11B2}",
-        nfkc: "\u{B19F}",
-        nfkd: "\u{1102}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B1A0}",
-        nfc: "\u{B1A0}",
-        nfd: "\u{1102}\u{116A}\u{11B3}",
-        nfkc: "\u{B1A0}",
-        nfkd: "\u{1102}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B1A1}",
-        nfc: "\u{B1A1}",
-        nfd: "\u{1102}\u{116A}\u{11B4}",
-        nfkc: "\u{B1A1}",
-        nfkd: "\u{1102}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B1A2}",
-        nfc: "\u{B1A2}",
-        nfd: "\u{1102}\u{116A}\u{11B5}",
-        nfkc: "\u{B1A2}",
-        nfkd: "\u{1102}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B1A3}",
-        nfc: "\u{B1A3}",
-        nfd: "\u{1102}\u{116A}\u{11B6}",
-        nfkc: "\u{B1A3}",
-        nfkd: "\u{1102}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B1A4}",
-        nfc: "\u{B1A4}",
-        nfd: "\u{1102}\u{116A}\u{11B7}",
-        nfkc: "\u{B1A4}",
-        nfkd: "\u{1102}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B1A5}",
-        nfc: "\u{B1A5}",
-        nfd: "\u{1102}\u{116A}\u{11B8}",
-        nfkc: "\u{B1A5}",
-        nfkd: "\u{1102}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B1A6}",
-        nfc: "\u{B1A6}",
-        nfd: "\u{1102}\u{116A}\u{11B9}",
-        nfkc: "\u{B1A6}",
-        nfkd: "\u{1102}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B1A7}",
-        nfc: "\u{B1A7}",
-        nfd: "\u{1102}\u{116A}\u{11BA}",
-        nfkc: "\u{B1A7}",
-        nfkd: "\u{1102}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B1A8}",
-        nfc: "\u{B1A8}",
-        nfd: "\u{1102}\u{116A}\u{11BB}",
-        nfkc: "\u{B1A8}",
-        nfkd: "\u{1102}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B1A9}",
-        nfc: "\u{B1A9}",
-        nfd: "\u{1102}\u{116A}\u{11BC}",
-        nfkc: "\u{B1A9}",
-        nfkd: "\u{1102}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B1AA}",
-        nfc: "\u{B1AA}",
-        nfd: "\u{1102}\u{116A}\u{11BD}",
-        nfkc: "\u{B1AA}",
-        nfkd: "\u{1102}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B1AB}",
-        nfc: "\u{B1AB}",
-        nfd: "\u{1102}\u{116A}\u{11BE}",
-        nfkc: "\u{B1AB}",
-        nfkd: "\u{1102}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B1AC}",
-        nfc: "\u{B1AC}",
-        nfd: "\u{1102}\u{116A}\u{11BF}",
-        nfkc: "\u{B1AC}",
-        nfkd: "\u{1102}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B1AD}",
-        nfc: "\u{B1AD}",
-        nfd: "\u{1102}\u{116A}\u{11C0}",
-        nfkc: "\u{B1AD}",
-        nfkd: "\u{1102}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B1AE}",
-        nfc: "\u{B1AE}",
-        nfd: "\u{1102}\u{116A}\u{11C1}",
-        nfkc: "\u{B1AE}",
-        nfkd: "\u{1102}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B1AF}",
-        nfc: "\u{B1AF}",
-        nfd: "\u{1102}\u{116A}\u{11C2}",
-        nfkc: "\u{B1AF}",
-        nfkd: "\u{1102}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B1B0}",
-        nfc: "\u{B1B0}",
-        nfd: "\u{1102}\u{116B}",
-        nfkc: "\u{B1B0}",
-        nfkd: "\u{1102}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{B1B1}",
-        nfc: "\u{B1B1}",
-        nfd: "\u{1102}\u{116B}\u{11A8}",
-        nfkc: "\u{B1B1}",
-        nfkd: "\u{1102}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B1B2}",
-        nfc: "\u{B1B2}",
-        nfd: "\u{1102}\u{116B}\u{11A9}",
-        nfkc: "\u{B1B2}",
-        nfkd: "\u{1102}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B1B3}",
-        nfc: "\u{B1B3}",
-        nfd: "\u{1102}\u{116B}\u{11AA}",
-        nfkc: "\u{B1B3}",
-        nfkd: "\u{1102}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B1B4}",
-        nfc: "\u{B1B4}",
-        nfd: "\u{1102}\u{116B}\u{11AB}",
-        nfkc: "\u{B1B4}",
-        nfkd: "\u{1102}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B1B5}",
-        nfc: "\u{B1B5}",
-        nfd: "\u{1102}\u{116B}\u{11AC}",
-        nfkc: "\u{B1B5}",
-        nfkd: "\u{1102}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B1B6}",
-        nfc: "\u{B1B6}",
-        nfd: "\u{1102}\u{116B}\u{11AD}",
-        nfkc: "\u{B1B6}",
-        nfkd: "\u{1102}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B1B7}",
-        nfc: "\u{B1B7}",
-        nfd: "\u{1102}\u{116B}\u{11AE}",
-        nfkc: "\u{B1B7}",
-        nfkd: "\u{1102}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B1B8}",
-        nfc: "\u{B1B8}",
-        nfd: "\u{1102}\u{116B}\u{11AF}",
-        nfkc: "\u{B1B8}",
-        nfkd: "\u{1102}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B1B9}",
-        nfc: "\u{B1B9}",
-        nfd: "\u{1102}\u{116B}\u{11B0}",
-        nfkc: "\u{B1B9}",
-        nfkd: "\u{1102}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B1BA}",
-        nfc: "\u{B1BA}",
-        nfd: "\u{1102}\u{116B}\u{11B1}",
-        nfkc: "\u{B1BA}",
-        nfkd: "\u{1102}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B1BB}",
-        nfc: "\u{B1BB}",
-        nfd: "\u{1102}\u{116B}\u{11B2}",
-        nfkc: "\u{B1BB}",
-        nfkd: "\u{1102}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B1BC}",
-        nfc: "\u{B1BC}",
-        nfd: "\u{1102}\u{116B}\u{11B3}",
-        nfkc: "\u{B1BC}",
-        nfkd: "\u{1102}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B1BD}",
-        nfc: "\u{B1BD}",
-        nfd: "\u{1102}\u{116B}\u{11B4}",
-        nfkc: "\u{B1BD}",
-        nfkd: "\u{1102}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B1BE}",
-        nfc: "\u{B1BE}",
-        nfd: "\u{1102}\u{116B}\u{11B5}",
-        nfkc: "\u{B1BE}",
-        nfkd: "\u{1102}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B1BF}",
-        nfc: "\u{B1BF}",
-        nfd: "\u{1102}\u{116B}\u{11B6}",
-        nfkc: "\u{B1BF}",
-        nfkd: "\u{1102}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B1C0}",
-        nfc: "\u{B1C0}",
-        nfd: "\u{1102}\u{116B}\u{11B7}",
-        nfkc: "\u{B1C0}",
-        nfkd: "\u{1102}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B1C1}",
-        nfc: "\u{B1C1}",
-        nfd: "\u{1102}\u{116B}\u{11B8}",
-        nfkc: "\u{B1C1}",
-        nfkd: "\u{1102}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B1C2}",
-        nfc: "\u{B1C2}",
-        nfd: "\u{1102}\u{116B}\u{11B9}",
-        nfkc: "\u{B1C2}",
-        nfkd: "\u{1102}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B1C3}",
-        nfc: "\u{B1C3}",
-        nfd: "\u{1102}\u{116B}\u{11BA}",
-        nfkc: "\u{B1C3}",
-        nfkd: "\u{1102}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B1C4}",
-        nfc: "\u{B1C4}",
-        nfd: "\u{1102}\u{116B}\u{11BB}",
-        nfkc: "\u{B1C4}",
-        nfkd: "\u{1102}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B1C5}",
-        nfc: "\u{B1C5}",
-        nfd: "\u{1102}\u{116B}\u{11BC}",
-        nfkc: "\u{B1C5}",
-        nfkd: "\u{1102}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B1C6}",
-        nfc: "\u{B1C6}",
-        nfd: "\u{1102}\u{116B}\u{11BD}",
-        nfkc: "\u{B1C6}",
-        nfkd: "\u{1102}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B1C7}",
-        nfc: "\u{B1C7}",
-        nfd: "\u{1102}\u{116B}\u{11BE}",
-        nfkc: "\u{B1C7}",
-        nfkd: "\u{1102}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B1C8}",
-        nfc: "\u{B1C8}",
-        nfd: "\u{1102}\u{116B}\u{11BF}",
-        nfkc: "\u{B1C8}",
-        nfkd: "\u{1102}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B1C9}",
-        nfc: "\u{B1C9}",
-        nfd: "\u{1102}\u{116B}\u{11C0}",
-        nfkc: "\u{B1C9}",
-        nfkd: "\u{1102}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B1CA}",
-        nfc: "\u{B1CA}",
-        nfd: "\u{1102}\u{116B}\u{11C1}",
-        nfkc: "\u{B1CA}",
-        nfkd: "\u{1102}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B1CB}",
-        nfc: "\u{B1CB}",
-        nfd: "\u{1102}\u{116B}\u{11C2}",
-        nfkc: "\u{B1CB}",
-        nfkd: "\u{1102}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B1CC}",
-        nfc: "\u{B1CC}",
-        nfd: "\u{1102}\u{116C}",
-        nfkc: "\u{B1CC}",
-        nfkd: "\u{1102}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{B1CD}",
-        nfc: "\u{B1CD}",
-        nfd: "\u{1102}\u{116C}\u{11A8}",
-        nfkc: "\u{B1CD}",
-        nfkd: "\u{1102}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B1CE}",
-        nfc: "\u{B1CE}",
-        nfd: "\u{1102}\u{116C}\u{11A9}",
-        nfkc: "\u{B1CE}",
-        nfkd: "\u{1102}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B1CF}",
-        nfc: "\u{B1CF}",
-        nfd: "\u{1102}\u{116C}\u{11AA}",
-        nfkc: "\u{B1CF}",
-        nfkd: "\u{1102}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B1D0}",
-        nfc: "\u{B1D0}",
-        nfd: "\u{1102}\u{116C}\u{11AB}",
-        nfkc: "\u{B1D0}",
-        nfkd: "\u{1102}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B1D1}",
-        nfc: "\u{B1D1}",
-        nfd: "\u{1102}\u{116C}\u{11AC}",
-        nfkc: "\u{B1D1}",
-        nfkd: "\u{1102}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B1D2}",
-        nfc: "\u{B1D2}",
-        nfd: "\u{1102}\u{116C}\u{11AD}",
-        nfkc: "\u{B1D2}",
-        nfkd: "\u{1102}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B1D3}",
-        nfc: "\u{B1D3}",
-        nfd: "\u{1102}\u{116C}\u{11AE}",
-        nfkc: "\u{B1D3}",
-        nfkd: "\u{1102}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B1D4}",
-        nfc: "\u{B1D4}",
-        nfd: "\u{1102}\u{116C}\u{11AF}",
-        nfkc: "\u{B1D4}",
-        nfkd: "\u{1102}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B1D5}",
-        nfc: "\u{B1D5}",
-        nfd: "\u{1102}\u{116C}\u{11B0}",
-        nfkc: "\u{B1D5}",
-        nfkd: "\u{1102}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B1D6}",
-        nfc: "\u{B1D6}",
-        nfd: "\u{1102}\u{116C}\u{11B1}",
-        nfkc: "\u{B1D6}",
-        nfkd: "\u{1102}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B1D7}",
-        nfc: "\u{B1D7}",
-        nfd: "\u{1102}\u{116C}\u{11B2}",
-        nfkc: "\u{B1D7}",
-        nfkd: "\u{1102}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B1D8}",
-        nfc: "\u{B1D8}",
-        nfd: "\u{1102}\u{116C}\u{11B3}",
-        nfkc: "\u{B1D8}",
-        nfkd: "\u{1102}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B1D9}",
-        nfc: "\u{B1D9}",
-        nfd: "\u{1102}\u{116C}\u{11B4}",
-        nfkc: "\u{B1D9}",
-        nfkd: "\u{1102}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B1DA}",
-        nfc: "\u{B1DA}",
-        nfd: "\u{1102}\u{116C}\u{11B5}",
-        nfkc: "\u{B1DA}",
-        nfkd: "\u{1102}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B1DB}",
-        nfc: "\u{B1DB}",
-        nfd: "\u{1102}\u{116C}\u{11B6}",
-        nfkc: "\u{B1DB}",
-        nfkd: "\u{1102}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B1DC}",
-        nfc: "\u{B1DC}",
-        nfd: "\u{1102}\u{116C}\u{11B7}",
-        nfkc: "\u{B1DC}",
-        nfkd: "\u{1102}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B1DD}",
-        nfc: "\u{B1DD}",
-        nfd: "\u{1102}\u{116C}\u{11B8}",
-        nfkc: "\u{B1DD}",
-        nfkd: "\u{1102}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B1DE}",
-        nfc: "\u{B1DE}",
-        nfd: "\u{1102}\u{116C}\u{11B9}",
-        nfkc: "\u{B1DE}",
-        nfkd: "\u{1102}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B1DF}",
-        nfc: "\u{B1DF}",
-        nfd: "\u{1102}\u{116C}\u{11BA}",
-        nfkc: "\u{B1DF}",
-        nfkd: "\u{1102}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B1E0}",
-        nfc: "\u{B1E0}",
-        nfd: "\u{1102}\u{116C}\u{11BB}",
-        nfkc: "\u{B1E0}",
-        nfkd: "\u{1102}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B1E1}",
-        nfc: "\u{B1E1}",
-        nfd: "\u{1102}\u{116C}\u{11BC}",
-        nfkc: "\u{B1E1}",
-        nfkd: "\u{1102}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B1E2}",
-        nfc: "\u{B1E2}",
-        nfd: "\u{1102}\u{116C}\u{11BD}",
-        nfkc: "\u{B1E2}",
-        nfkd: "\u{1102}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B1E3}",
-        nfc: "\u{B1E3}",
-        nfd: "\u{1102}\u{116C}\u{11BE}",
-        nfkc: "\u{B1E3}",
-        nfkd: "\u{1102}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B1E4}",
-        nfc: "\u{B1E4}",
-        nfd: "\u{1102}\u{116C}\u{11BF}",
-        nfkc: "\u{B1E4}",
-        nfkd: "\u{1102}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B1E5}",
-        nfc: "\u{B1E5}",
-        nfd: "\u{1102}\u{116C}\u{11C0}",
-        nfkc: "\u{B1E5}",
-        nfkd: "\u{1102}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B1E6}",
-        nfc: "\u{B1E6}",
-        nfd: "\u{1102}\u{116C}\u{11C1}",
-        nfkc: "\u{B1E6}",
-        nfkd: "\u{1102}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B1E7}",
-        nfc: "\u{B1E7}",
-        nfd: "\u{1102}\u{116C}\u{11C2}",
-        nfkc: "\u{B1E7}",
-        nfkd: "\u{1102}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B1E8}",
-        nfc: "\u{B1E8}",
-        nfd: "\u{1102}\u{116D}",
-        nfkc: "\u{B1E8}",
-        nfkd: "\u{1102}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{B1E9}",
-        nfc: "\u{B1E9}",
-        nfd: "\u{1102}\u{116D}\u{11A8}",
-        nfkc: "\u{B1E9}",
-        nfkd: "\u{1102}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B1EA}",
-        nfc: "\u{B1EA}",
-        nfd: "\u{1102}\u{116D}\u{11A9}",
-        nfkc: "\u{B1EA}",
-        nfkd: "\u{1102}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B1EB}",
-        nfc: "\u{B1EB}",
-        nfd: "\u{1102}\u{116D}\u{11AA}",
-        nfkc: "\u{B1EB}",
-        nfkd: "\u{1102}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B1EC}",
-        nfc: "\u{B1EC}",
-        nfd: "\u{1102}\u{116D}\u{11AB}",
-        nfkc: "\u{B1EC}",
-        nfkd: "\u{1102}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B1ED}",
-        nfc: "\u{B1ED}",
-        nfd: "\u{1102}\u{116D}\u{11AC}",
-        nfkc: "\u{B1ED}",
-        nfkd: "\u{1102}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B1EE}",
-        nfc: "\u{B1EE}",
-        nfd: "\u{1102}\u{116D}\u{11AD}",
-        nfkc: "\u{B1EE}",
-        nfkd: "\u{1102}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B1EF}",
-        nfc: "\u{B1EF}",
-        nfd: "\u{1102}\u{116D}\u{11AE}",
-        nfkc: "\u{B1EF}",
-        nfkd: "\u{1102}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B1F0}",
-        nfc: "\u{B1F0}",
-        nfd: "\u{1102}\u{116D}\u{11AF}",
-        nfkc: "\u{B1F0}",
-        nfkd: "\u{1102}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B1F1}",
-        nfc: "\u{B1F1}",
-        nfd: "\u{1102}\u{116D}\u{11B0}",
-        nfkc: "\u{B1F1}",
-        nfkd: "\u{1102}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B1F2}",
-        nfc: "\u{B1F2}",
-        nfd: "\u{1102}\u{116D}\u{11B1}",
-        nfkc: "\u{B1F2}",
-        nfkd: "\u{1102}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B1F3}",
-        nfc: "\u{B1F3}",
-        nfd: "\u{1102}\u{116D}\u{11B2}",
-        nfkc: "\u{B1F3}",
-        nfkd: "\u{1102}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B1F4}",
-        nfc: "\u{B1F4}",
-        nfd: "\u{1102}\u{116D}\u{11B3}",
-        nfkc: "\u{B1F4}",
-        nfkd: "\u{1102}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B1F5}",
-        nfc: "\u{B1F5}",
-        nfd: "\u{1102}\u{116D}\u{11B4}",
-        nfkc: "\u{B1F5}",
-        nfkd: "\u{1102}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B1F6}",
-        nfc: "\u{B1F6}",
-        nfd: "\u{1102}\u{116D}\u{11B5}",
-        nfkc: "\u{B1F6}",
-        nfkd: "\u{1102}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B1F7}",
-        nfc: "\u{B1F7}",
-        nfd: "\u{1102}\u{116D}\u{11B6}",
-        nfkc: "\u{B1F7}",
-        nfkd: "\u{1102}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B1F8}",
-        nfc: "\u{B1F8}",
-        nfd: "\u{1102}\u{116D}\u{11B7}",
-        nfkc: "\u{B1F8}",
-        nfkd: "\u{1102}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B1F9}",
-        nfc: "\u{B1F9}",
-        nfd: "\u{1102}\u{116D}\u{11B8}",
-        nfkc: "\u{B1F9}",
-        nfkd: "\u{1102}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B1FA}",
-        nfc: "\u{B1FA}",
-        nfd: "\u{1102}\u{116D}\u{11B9}",
-        nfkc: "\u{B1FA}",
-        nfkd: "\u{1102}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B1FB}",
-        nfc: "\u{B1FB}",
-        nfd: "\u{1102}\u{116D}\u{11BA}",
-        nfkc: "\u{B1FB}",
-        nfkd: "\u{1102}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B1FC}",
-        nfc: "\u{B1FC}",
-        nfd: "\u{1102}\u{116D}\u{11BB}",
-        nfkc: "\u{B1FC}",
-        nfkd: "\u{1102}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B1FD}",
-        nfc: "\u{B1FD}",
-        nfd: "\u{1102}\u{116D}\u{11BC}",
-        nfkc: "\u{B1FD}",
-        nfkd: "\u{1102}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B1FE}",
-        nfc: "\u{B1FE}",
-        nfd: "\u{1102}\u{116D}\u{11BD}",
-        nfkc: "\u{B1FE}",
-        nfkd: "\u{1102}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B1FF}",
-        nfc: "\u{B1FF}",
-        nfd: "\u{1102}\u{116D}\u{11BE}",
-        nfkc: "\u{B1FF}",
-        nfkd: "\u{1102}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B200}",
-        nfc: "\u{B200}",
-        nfd: "\u{1102}\u{116D}\u{11BF}",
-        nfkc: "\u{B200}",
-        nfkd: "\u{1102}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B201}",
-        nfc: "\u{B201}",
-        nfd: "\u{1102}\u{116D}\u{11C0}",
-        nfkc: "\u{B201}",
-        nfkd: "\u{1102}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B202}",
-        nfc: "\u{B202}",
-        nfd: "\u{1102}\u{116D}\u{11C1}",
-        nfkc: "\u{B202}",
-        nfkd: "\u{1102}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B203}",
-        nfc: "\u{B203}",
-        nfd: "\u{1102}\u{116D}\u{11C2}",
-        nfkc: "\u{B203}",
-        nfkd: "\u{1102}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B204}",
-        nfc: "\u{B204}",
-        nfd: "\u{1102}\u{116E}",
-        nfkc: "\u{B204}",
-        nfkd: "\u{1102}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{B205}",
-        nfc: "\u{B205}",
-        nfd: "\u{1102}\u{116E}\u{11A8}",
-        nfkc: "\u{B205}",
-        nfkd: "\u{1102}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B206}",
-        nfc: "\u{B206}",
-        nfd: "\u{1102}\u{116E}\u{11A9}",
-        nfkc: "\u{B206}",
-        nfkd: "\u{1102}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B207}",
-        nfc: "\u{B207}",
-        nfd: "\u{1102}\u{116E}\u{11AA}",
-        nfkc: "\u{B207}",
-        nfkd: "\u{1102}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B208}",
-        nfc: "\u{B208}",
-        nfd: "\u{1102}\u{116E}\u{11AB}",
-        nfkc: "\u{B208}",
-        nfkd: "\u{1102}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B209}",
-        nfc: "\u{B209}",
-        nfd: "\u{1102}\u{116E}\u{11AC}",
-        nfkc: "\u{B209}",
-        nfkd: "\u{1102}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B20A}",
-        nfc: "\u{B20A}",
-        nfd: "\u{1102}\u{116E}\u{11AD}",
-        nfkc: "\u{B20A}",
-        nfkd: "\u{1102}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B20B}",
-        nfc: "\u{B20B}",
-        nfd: "\u{1102}\u{116E}\u{11AE}",
-        nfkc: "\u{B20B}",
-        nfkd: "\u{1102}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B20C}",
-        nfc: "\u{B20C}",
-        nfd: "\u{1102}\u{116E}\u{11AF}",
-        nfkc: "\u{B20C}",
-        nfkd: "\u{1102}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B20D}",
-        nfc: "\u{B20D}",
-        nfd: "\u{1102}\u{116E}\u{11B0}",
-        nfkc: "\u{B20D}",
-        nfkd: "\u{1102}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B20E}",
-        nfc: "\u{B20E}",
-        nfd: "\u{1102}\u{116E}\u{11B1}",
-        nfkc: "\u{B20E}",
-        nfkd: "\u{1102}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B20F}",
-        nfc: "\u{B20F}",
-        nfd: "\u{1102}\u{116E}\u{11B2}",
-        nfkc: "\u{B20F}",
-        nfkd: "\u{1102}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B210}",
-        nfc: "\u{B210}",
-        nfd: "\u{1102}\u{116E}\u{11B3}",
-        nfkc: "\u{B210}",
-        nfkd: "\u{1102}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B211}",
-        nfc: "\u{B211}",
-        nfd: "\u{1102}\u{116E}\u{11B4}",
-        nfkc: "\u{B211}",
-        nfkd: "\u{1102}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B212}",
-        nfc: "\u{B212}",
-        nfd: "\u{1102}\u{116E}\u{11B5}",
-        nfkc: "\u{B212}",
-        nfkd: "\u{1102}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B213}",
-        nfc: "\u{B213}",
-        nfd: "\u{1102}\u{116E}\u{11B6}",
-        nfkc: "\u{B213}",
-        nfkd: "\u{1102}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B214}",
-        nfc: "\u{B214}",
-        nfd: "\u{1102}\u{116E}\u{11B7}",
-        nfkc: "\u{B214}",
-        nfkd: "\u{1102}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B215}",
-        nfc: "\u{B215}",
-        nfd: "\u{1102}\u{116E}\u{11B8}",
-        nfkc: "\u{B215}",
-        nfkd: "\u{1102}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B216}",
-        nfc: "\u{B216}",
-        nfd: "\u{1102}\u{116E}\u{11B9}",
-        nfkc: "\u{B216}",
-        nfkd: "\u{1102}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B217}",
-        nfc: "\u{B217}",
-        nfd: "\u{1102}\u{116E}\u{11BA}",
-        nfkc: "\u{B217}",
-        nfkd: "\u{1102}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B218}",
-        nfc: "\u{B218}",
-        nfd: "\u{1102}\u{116E}\u{11BB}",
-        nfkc: "\u{B218}",
-        nfkd: "\u{1102}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B219}",
-        nfc: "\u{B219}",
-        nfd: "\u{1102}\u{116E}\u{11BC}",
-        nfkc: "\u{B219}",
-        nfkd: "\u{1102}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B21A}",
-        nfc: "\u{B21A}",
-        nfd: "\u{1102}\u{116E}\u{11BD}",
-        nfkc: "\u{B21A}",
-        nfkd: "\u{1102}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B21B}",
-        nfc: "\u{B21B}",
-        nfd: "\u{1102}\u{116E}\u{11BE}",
-        nfkc: "\u{B21B}",
-        nfkd: "\u{1102}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B21C}",
-        nfc: "\u{B21C}",
-        nfd: "\u{1102}\u{116E}\u{11BF}",
-        nfkc: "\u{B21C}",
-        nfkd: "\u{1102}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B21D}",
-        nfc: "\u{B21D}",
-        nfd: "\u{1102}\u{116E}\u{11C0}",
-        nfkc: "\u{B21D}",
-        nfkd: "\u{1102}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B21E}",
-        nfc: "\u{B21E}",
-        nfd: "\u{1102}\u{116E}\u{11C1}",
-        nfkc: "\u{B21E}",
-        nfkd: "\u{1102}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B21F}",
-        nfc: "\u{B21F}",
-        nfd: "\u{1102}\u{116E}\u{11C2}",
-        nfkc: "\u{B21F}",
-        nfkd: "\u{1102}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B220}",
-        nfc: "\u{B220}",
-        nfd: "\u{1102}\u{116F}",
-        nfkc: "\u{B220}",
-        nfkd: "\u{1102}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{B221}",
-        nfc: "\u{B221}",
-        nfd: "\u{1102}\u{116F}\u{11A8}",
-        nfkc: "\u{B221}",
-        nfkd: "\u{1102}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B222}",
-        nfc: "\u{B222}",
-        nfd: "\u{1102}\u{116F}\u{11A9}",
-        nfkc: "\u{B222}",
-        nfkd: "\u{1102}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B223}",
-        nfc: "\u{B223}",
-        nfd: "\u{1102}\u{116F}\u{11AA}",
-        nfkc: "\u{B223}",
-        nfkd: "\u{1102}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B224}",
-        nfc: "\u{B224}",
-        nfd: "\u{1102}\u{116F}\u{11AB}",
-        nfkc: "\u{B224}",
-        nfkd: "\u{1102}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B225}",
-        nfc: "\u{B225}",
-        nfd: "\u{1102}\u{116F}\u{11AC}",
-        nfkc: "\u{B225}",
-        nfkd: "\u{1102}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B226}",
-        nfc: "\u{B226}",
-        nfd: "\u{1102}\u{116F}\u{11AD}",
-        nfkc: "\u{B226}",
-        nfkd: "\u{1102}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B227}",
-        nfc: "\u{B227}",
-        nfd: "\u{1102}\u{116F}\u{11AE}",
-        nfkc: "\u{B227}",
-        nfkd: "\u{1102}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B228}",
-        nfc: "\u{B228}",
-        nfd: "\u{1102}\u{116F}\u{11AF}",
-        nfkc: "\u{B228}",
-        nfkd: "\u{1102}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B229}",
-        nfc: "\u{B229}",
-        nfd: "\u{1102}\u{116F}\u{11B0}",
-        nfkc: "\u{B229}",
-        nfkd: "\u{1102}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B22A}",
-        nfc: "\u{B22A}",
-        nfd: "\u{1102}\u{116F}\u{11B1}",
-        nfkc: "\u{B22A}",
-        nfkd: "\u{1102}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B22B}",
-        nfc: "\u{B22B}",
-        nfd: "\u{1102}\u{116F}\u{11B2}",
-        nfkc: "\u{B22B}",
-        nfkd: "\u{1102}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B22C}",
-        nfc: "\u{B22C}",
-        nfd: "\u{1102}\u{116F}\u{11B3}",
-        nfkc: "\u{B22C}",
-        nfkd: "\u{1102}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B22D}",
-        nfc: "\u{B22D}",
-        nfd: "\u{1102}\u{116F}\u{11B4}",
-        nfkc: "\u{B22D}",
-        nfkd: "\u{1102}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B22E}",
-        nfc: "\u{B22E}",
-        nfd: "\u{1102}\u{116F}\u{11B5}",
-        nfkc: "\u{B22E}",
-        nfkd: "\u{1102}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B22F}",
-        nfc: "\u{B22F}",
-        nfd: "\u{1102}\u{116F}\u{11B6}",
-        nfkc: "\u{B22F}",
-        nfkd: "\u{1102}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B230}",
-        nfc: "\u{B230}",
-        nfd: "\u{1102}\u{116F}\u{11B7}",
-        nfkc: "\u{B230}",
-        nfkd: "\u{1102}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B231}",
-        nfc: "\u{B231}",
-        nfd: "\u{1102}\u{116F}\u{11B8}",
-        nfkc: "\u{B231}",
-        nfkd: "\u{1102}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B232}",
-        nfc: "\u{B232}",
-        nfd: "\u{1102}\u{116F}\u{11B9}",
-        nfkc: "\u{B232}",
-        nfkd: "\u{1102}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B233}",
-        nfc: "\u{B233}",
-        nfd: "\u{1102}\u{116F}\u{11BA}",
-        nfkc: "\u{B233}",
-        nfkd: "\u{1102}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B234}",
-        nfc: "\u{B234}",
-        nfd: "\u{1102}\u{116F}\u{11BB}",
-        nfkc: "\u{B234}",
-        nfkd: "\u{1102}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B235}",
-        nfc: "\u{B235}",
-        nfd: "\u{1102}\u{116F}\u{11BC}",
-        nfkc: "\u{B235}",
-        nfkd: "\u{1102}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B236}",
-        nfc: "\u{B236}",
-        nfd: "\u{1102}\u{116F}\u{11BD}",
-        nfkc: "\u{B236}",
-        nfkd: "\u{1102}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B237}",
-        nfc: "\u{B237}",
-        nfd: "\u{1102}\u{116F}\u{11BE}",
-        nfkc: "\u{B237}",
-        nfkd: "\u{1102}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B238}",
-        nfc: "\u{B238}",
-        nfd: "\u{1102}\u{116F}\u{11BF}",
-        nfkc: "\u{B238}",
-        nfkd: "\u{1102}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B239}",
-        nfc: "\u{B239}",
-        nfd: "\u{1102}\u{116F}\u{11C0}",
-        nfkc: "\u{B239}",
-        nfkd: "\u{1102}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B23A}",
-        nfc: "\u{B23A}",
-        nfd: "\u{1102}\u{116F}\u{11C1}",
-        nfkc: "\u{B23A}",
-        nfkd: "\u{1102}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B23B}",
-        nfc: "\u{B23B}",
-        nfd: "\u{1102}\u{116F}\u{11C2}",
-        nfkc: "\u{B23B}",
-        nfkd: "\u{1102}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B23C}",
-        nfc: "\u{B23C}",
-        nfd: "\u{1102}\u{1170}",
-        nfkc: "\u{B23C}",
-        nfkd: "\u{1102}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{B23D}",
-        nfc: "\u{B23D}",
-        nfd: "\u{1102}\u{1170}\u{11A8}",
-        nfkc: "\u{B23D}",
-        nfkd: "\u{1102}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B23E}",
-        nfc: "\u{B23E}",
-        nfd: "\u{1102}\u{1170}\u{11A9}",
-        nfkc: "\u{B23E}",
-        nfkd: "\u{1102}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B23F}",
-        nfc: "\u{B23F}",
-        nfd: "\u{1102}\u{1170}\u{11AA}",
-        nfkc: "\u{B23F}",
-        nfkd: "\u{1102}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B240}",
-        nfc: "\u{B240}",
-        nfd: "\u{1102}\u{1170}\u{11AB}",
-        nfkc: "\u{B240}",
-        nfkd: "\u{1102}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B241}",
-        nfc: "\u{B241}",
-        nfd: "\u{1102}\u{1170}\u{11AC}",
-        nfkc: "\u{B241}",
-        nfkd: "\u{1102}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B242}",
-        nfc: "\u{B242}",
-        nfd: "\u{1102}\u{1170}\u{11AD}",
-        nfkc: "\u{B242}",
-        nfkd: "\u{1102}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B243}",
-        nfc: "\u{B243}",
-        nfd: "\u{1102}\u{1170}\u{11AE}",
-        nfkc: "\u{B243}",
-        nfkd: "\u{1102}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B244}",
-        nfc: "\u{B244}",
-        nfd: "\u{1102}\u{1170}\u{11AF}",
-        nfkc: "\u{B244}",
-        nfkd: "\u{1102}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B245}",
-        nfc: "\u{B245}",
-        nfd: "\u{1102}\u{1170}\u{11B0}",
-        nfkc: "\u{B245}",
-        nfkd: "\u{1102}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B246}",
-        nfc: "\u{B246}",
-        nfd: "\u{1102}\u{1170}\u{11B1}",
-        nfkc: "\u{B246}",
-        nfkd: "\u{1102}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B247}",
-        nfc: "\u{B247}",
-        nfd: "\u{1102}\u{1170}\u{11B2}",
-        nfkc: "\u{B247}",
-        nfkd: "\u{1102}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B248}",
-        nfc: "\u{B248}",
-        nfd: "\u{1102}\u{1170}\u{11B3}",
-        nfkc: "\u{B248}",
-        nfkd: "\u{1102}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B249}",
-        nfc: "\u{B249}",
-        nfd: "\u{1102}\u{1170}\u{11B4}",
-        nfkc: "\u{B249}",
-        nfkd: "\u{1102}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B24A}",
-        nfc: "\u{B24A}",
-        nfd: "\u{1102}\u{1170}\u{11B5}",
-        nfkc: "\u{B24A}",
-        nfkd: "\u{1102}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B24B}",
-        nfc: "\u{B24B}",
-        nfd: "\u{1102}\u{1170}\u{11B6}",
-        nfkc: "\u{B24B}",
-        nfkd: "\u{1102}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B24C}",
-        nfc: "\u{B24C}",
-        nfd: "\u{1102}\u{1170}\u{11B7}",
-        nfkc: "\u{B24C}",
-        nfkd: "\u{1102}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B24D}",
-        nfc: "\u{B24D}",
-        nfd: "\u{1102}\u{1170}\u{11B8}",
-        nfkc: "\u{B24D}",
-        nfkd: "\u{1102}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B24E}",
-        nfc: "\u{B24E}",
-        nfd: "\u{1102}\u{1170}\u{11B9}",
-        nfkc: "\u{B24E}",
-        nfkd: "\u{1102}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B24F}",
-        nfc: "\u{B24F}",
-        nfd: "\u{1102}\u{1170}\u{11BA}",
-        nfkc: "\u{B24F}",
-        nfkd: "\u{1102}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B250}",
-        nfc: "\u{B250}",
-        nfd: "\u{1102}\u{1170}\u{11BB}",
-        nfkc: "\u{B250}",
-        nfkd: "\u{1102}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B251}",
-        nfc: "\u{B251}",
-        nfd: "\u{1102}\u{1170}\u{11BC}",
-        nfkc: "\u{B251}",
-        nfkd: "\u{1102}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B252}",
-        nfc: "\u{B252}",
-        nfd: "\u{1102}\u{1170}\u{11BD}",
-        nfkc: "\u{B252}",
-        nfkd: "\u{1102}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B253}",
-        nfc: "\u{B253}",
-        nfd: "\u{1102}\u{1170}\u{11BE}",
-        nfkc: "\u{B253}",
-        nfkd: "\u{1102}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B254}",
-        nfc: "\u{B254}",
-        nfd: "\u{1102}\u{1170}\u{11BF}",
-        nfkc: "\u{B254}",
-        nfkd: "\u{1102}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B255}",
-        nfc: "\u{B255}",
-        nfd: "\u{1102}\u{1170}\u{11C0}",
-        nfkc: "\u{B255}",
-        nfkd: "\u{1102}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B256}",
-        nfc: "\u{B256}",
-        nfd: "\u{1102}\u{1170}\u{11C1}",
-        nfkc: "\u{B256}",
-        nfkd: "\u{1102}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B257}",
-        nfc: "\u{B257}",
-        nfd: "\u{1102}\u{1170}\u{11C2}",
-        nfkc: "\u{B257}",
-        nfkd: "\u{1102}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B258}",
-        nfc: "\u{B258}",
-        nfd: "\u{1102}\u{1171}",
-        nfkc: "\u{B258}",
-        nfkd: "\u{1102}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{B259}",
-        nfc: "\u{B259}",
-        nfd: "\u{1102}\u{1171}\u{11A8}",
-        nfkc: "\u{B259}",
-        nfkd: "\u{1102}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B25A}",
-        nfc: "\u{B25A}",
-        nfd: "\u{1102}\u{1171}\u{11A9}",
-        nfkc: "\u{B25A}",
-        nfkd: "\u{1102}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B25B}",
-        nfc: "\u{B25B}",
-        nfd: "\u{1102}\u{1171}\u{11AA}",
-        nfkc: "\u{B25B}",
-        nfkd: "\u{1102}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B25C}",
-        nfc: "\u{B25C}",
-        nfd: "\u{1102}\u{1171}\u{11AB}",
-        nfkc: "\u{B25C}",
-        nfkd: "\u{1102}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B25D}",
-        nfc: "\u{B25D}",
-        nfd: "\u{1102}\u{1171}\u{11AC}",
-        nfkc: "\u{B25D}",
-        nfkd: "\u{1102}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B25E}",
-        nfc: "\u{B25E}",
-        nfd: "\u{1102}\u{1171}\u{11AD}",
-        nfkc: "\u{B25E}",
-        nfkd: "\u{1102}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B25F}",
-        nfc: "\u{B25F}",
-        nfd: "\u{1102}\u{1171}\u{11AE}",
-        nfkc: "\u{B25F}",
-        nfkd: "\u{1102}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B260}",
-        nfc: "\u{B260}",
-        nfd: "\u{1102}\u{1171}\u{11AF}",
-        nfkc: "\u{B260}",
-        nfkd: "\u{1102}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B261}",
-        nfc: "\u{B261}",
-        nfd: "\u{1102}\u{1171}\u{11B0}",
-        nfkc: "\u{B261}",
-        nfkd: "\u{1102}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B262}",
-        nfc: "\u{B262}",
-        nfd: "\u{1102}\u{1171}\u{11B1}",
-        nfkc: "\u{B262}",
-        nfkd: "\u{1102}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B263}",
-        nfc: "\u{B263}",
-        nfd: "\u{1102}\u{1171}\u{11B2}",
-        nfkc: "\u{B263}",
-        nfkd: "\u{1102}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B264}",
-        nfc: "\u{B264}",
-        nfd: "\u{1102}\u{1171}\u{11B3}",
-        nfkc: "\u{B264}",
-        nfkd: "\u{1102}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B265}",
-        nfc: "\u{B265}",
-        nfd: "\u{1102}\u{1171}\u{11B4}",
-        nfkc: "\u{B265}",
-        nfkd: "\u{1102}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B266}",
-        nfc: "\u{B266}",
-        nfd: "\u{1102}\u{1171}\u{11B5}",
-        nfkc: "\u{B266}",
-        nfkd: "\u{1102}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B267}",
-        nfc: "\u{B267}",
-        nfd: "\u{1102}\u{1171}\u{11B6}",
-        nfkc: "\u{B267}",
-        nfkd: "\u{1102}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B268}",
-        nfc: "\u{B268}",
-        nfd: "\u{1102}\u{1171}\u{11B7}",
-        nfkc: "\u{B268}",
-        nfkd: "\u{1102}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B269}",
-        nfc: "\u{B269}",
-        nfd: "\u{1102}\u{1171}\u{11B8}",
-        nfkc: "\u{B269}",
-        nfkd: "\u{1102}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B26A}",
-        nfc: "\u{B26A}",
-        nfd: "\u{1102}\u{1171}\u{11B9}",
-        nfkc: "\u{B26A}",
-        nfkd: "\u{1102}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B26B}",
-        nfc: "\u{B26B}",
-        nfd: "\u{1102}\u{1171}\u{11BA}",
-        nfkc: "\u{B26B}",
-        nfkd: "\u{1102}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B26C}",
-        nfc: "\u{B26C}",
-        nfd: "\u{1102}\u{1171}\u{11BB}",
-        nfkc: "\u{B26C}",
-        nfkd: "\u{1102}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B26D}",
-        nfc: "\u{B26D}",
-        nfd: "\u{1102}\u{1171}\u{11BC}",
-        nfkc: "\u{B26D}",
-        nfkd: "\u{1102}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B26E}",
-        nfc: "\u{B26E}",
-        nfd: "\u{1102}\u{1171}\u{11BD}",
-        nfkc: "\u{B26E}",
-        nfkd: "\u{1102}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B26F}",
-        nfc: "\u{B26F}",
-        nfd: "\u{1102}\u{1171}\u{11BE}",
-        nfkc: "\u{B26F}",
-        nfkd: "\u{1102}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B270}",
-        nfc: "\u{B270}",
-        nfd: "\u{1102}\u{1171}\u{11BF}",
-        nfkc: "\u{B270}",
-        nfkd: "\u{1102}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B271}",
-        nfc: "\u{B271}",
-        nfd: "\u{1102}\u{1171}\u{11C0}",
-        nfkc: "\u{B271}",
-        nfkd: "\u{1102}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B272}",
-        nfc: "\u{B272}",
-        nfd: "\u{1102}\u{1171}\u{11C1}",
-        nfkc: "\u{B272}",
-        nfkd: "\u{1102}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B273}",
-        nfc: "\u{B273}",
-        nfd: "\u{1102}\u{1171}\u{11C2}",
-        nfkc: "\u{B273}",
-        nfkd: "\u{1102}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B274}",
-        nfc: "\u{B274}",
-        nfd: "\u{1102}\u{1172}",
-        nfkc: "\u{B274}",
-        nfkd: "\u{1102}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{B275}",
-        nfc: "\u{B275}",
-        nfd: "\u{1102}\u{1172}\u{11A8}",
-        nfkc: "\u{B275}",
-        nfkd: "\u{1102}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B276}",
-        nfc: "\u{B276}",
-        nfd: "\u{1102}\u{1172}\u{11A9}",
-        nfkc: "\u{B276}",
-        nfkd: "\u{1102}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B277}",
-        nfc: "\u{B277}",
-        nfd: "\u{1102}\u{1172}\u{11AA}",
-        nfkc: "\u{B277}",
-        nfkd: "\u{1102}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B278}",
-        nfc: "\u{B278}",
-        nfd: "\u{1102}\u{1172}\u{11AB}",
-        nfkc: "\u{B278}",
-        nfkd: "\u{1102}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B279}",
-        nfc: "\u{B279}",
-        nfd: "\u{1102}\u{1172}\u{11AC}",
-        nfkc: "\u{B279}",
-        nfkd: "\u{1102}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B27A}",
-        nfc: "\u{B27A}",
-        nfd: "\u{1102}\u{1172}\u{11AD}",
-        nfkc: "\u{B27A}",
-        nfkd: "\u{1102}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B27B}",
-        nfc: "\u{B27B}",
-        nfd: "\u{1102}\u{1172}\u{11AE}",
-        nfkc: "\u{B27B}",
-        nfkd: "\u{1102}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B27C}",
-        nfc: "\u{B27C}",
-        nfd: "\u{1102}\u{1172}\u{11AF}",
-        nfkc: "\u{B27C}",
-        nfkd: "\u{1102}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B27D}",
-        nfc: "\u{B27D}",
-        nfd: "\u{1102}\u{1172}\u{11B0}",
-        nfkc: "\u{B27D}",
-        nfkd: "\u{1102}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B27E}",
-        nfc: "\u{B27E}",
-        nfd: "\u{1102}\u{1172}\u{11B1}",
-        nfkc: "\u{B27E}",
-        nfkd: "\u{1102}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B27F}",
-        nfc: "\u{B27F}",
-        nfd: "\u{1102}\u{1172}\u{11B2}",
-        nfkc: "\u{B27F}",
-        nfkd: "\u{1102}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B280}",
-        nfc: "\u{B280}",
-        nfd: "\u{1102}\u{1172}\u{11B3}",
-        nfkc: "\u{B280}",
-        nfkd: "\u{1102}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B281}",
-        nfc: "\u{B281}",
-        nfd: "\u{1102}\u{1172}\u{11B4}",
-        nfkc: "\u{B281}",
-        nfkd: "\u{1102}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B282}",
-        nfc: "\u{B282}",
-        nfd: "\u{1102}\u{1172}\u{11B5}",
-        nfkc: "\u{B282}",
-        nfkd: "\u{1102}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B283}",
-        nfc: "\u{B283}",
-        nfd: "\u{1102}\u{1172}\u{11B6}",
-        nfkc: "\u{B283}",
-        nfkd: "\u{1102}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B284}",
-        nfc: "\u{B284}",
-        nfd: "\u{1102}\u{1172}\u{11B7}",
-        nfkc: "\u{B284}",
-        nfkd: "\u{1102}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B285}",
-        nfc: "\u{B285}",
-        nfd: "\u{1102}\u{1172}\u{11B8}",
-        nfkc: "\u{B285}",
-        nfkd: "\u{1102}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B286}",
-        nfc: "\u{B286}",
-        nfd: "\u{1102}\u{1172}\u{11B9}",
-        nfkc: "\u{B286}",
-        nfkd: "\u{1102}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B287}",
-        nfc: "\u{B287}",
-        nfd: "\u{1102}\u{1172}\u{11BA}",
-        nfkc: "\u{B287}",
-        nfkd: "\u{1102}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B288}",
-        nfc: "\u{B288}",
-        nfd: "\u{1102}\u{1172}\u{11BB}",
-        nfkc: "\u{B288}",
-        nfkd: "\u{1102}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B289}",
-        nfc: "\u{B289}",
-        nfd: "\u{1102}\u{1172}\u{11BC}",
-        nfkc: "\u{B289}",
-        nfkd: "\u{1102}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B28A}",
-        nfc: "\u{B28A}",
-        nfd: "\u{1102}\u{1172}\u{11BD}",
-        nfkc: "\u{B28A}",
-        nfkd: "\u{1102}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B28B}",
-        nfc: "\u{B28B}",
-        nfd: "\u{1102}\u{1172}\u{11BE}",
-        nfkc: "\u{B28B}",
-        nfkd: "\u{1102}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B28C}",
-        nfc: "\u{B28C}",
-        nfd: "\u{1102}\u{1172}\u{11BF}",
-        nfkc: "\u{B28C}",
-        nfkd: "\u{1102}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B28D}",
-        nfc: "\u{B28D}",
-        nfd: "\u{1102}\u{1172}\u{11C0}",
-        nfkc: "\u{B28D}",
-        nfkd: "\u{1102}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B28E}",
-        nfc: "\u{B28E}",
-        nfd: "\u{1102}\u{1172}\u{11C1}",
-        nfkc: "\u{B28E}",
-        nfkd: "\u{1102}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B28F}",
-        nfc: "\u{B28F}",
-        nfd: "\u{1102}\u{1172}\u{11C2}",
-        nfkc: "\u{B28F}",
-        nfkd: "\u{1102}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B290}",
-        nfc: "\u{B290}",
-        nfd: "\u{1102}\u{1173}",
-        nfkc: "\u{B290}",
-        nfkd: "\u{1102}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{B291}",
-        nfc: "\u{B291}",
-        nfd: "\u{1102}\u{1173}\u{11A8}",
-        nfkc: "\u{B291}",
-        nfkd: "\u{1102}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B292}",
-        nfc: "\u{B292}",
-        nfd: "\u{1102}\u{1173}\u{11A9}",
-        nfkc: "\u{B292}",
-        nfkd: "\u{1102}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B293}",
-        nfc: "\u{B293}",
-        nfd: "\u{1102}\u{1173}\u{11AA}",
-        nfkc: "\u{B293}",
-        nfkd: "\u{1102}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B294}",
-        nfc: "\u{B294}",
-        nfd: "\u{1102}\u{1173}\u{11AB}",
-        nfkc: "\u{B294}",
-        nfkd: "\u{1102}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B295}",
-        nfc: "\u{B295}",
-        nfd: "\u{1102}\u{1173}\u{11AC}",
-        nfkc: "\u{B295}",
-        nfkd: "\u{1102}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B296}",
-        nfc: "\u{B296}",
-        nfd: "\u{1102}\u{1173}\u{11AD}",
-        nfkc: "\u{B296}",
-        nfkd: "\u{1102}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B297}",
-        nfc: "\u{B297}",
-        nfd: "\u{1102}\u{1173}\u{11AE}",
-        nfkc: "\u{B297}",
-        nfkd: "\u{1102}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B298}",
-        nfc: "\u{B298}",
-        nfd: "\u{1102}\u{1173}\u{11AF}",
-        nfkc: "\u{B298}",
-        nfkd: "\u{1102}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B299}",
-        nfc: "\u{B299}",
-        nfd: "\u{1102}\u{1173}\u{11B0}",
-        nfkc: "\u{B299}",
-        nfkd: "\u{1102}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B29A}",
-        nfc: "\u{B29A}",
-        nfd: "\u{1102}\u{1173}\u{11B1}",
-        nfkc: "\u{B29A}",
-        nfkd: "\u{1102}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B29B}",
-        nfc: "\u{B29B}",
-        nfd: "\u{1102}\u{1173}\u{11B2}",
-        nfkc: "\u{B29B}",
-        nfkd: "\u{1102}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B29C}",
-        nfc: "\u{B29C}",
-        nfd: "\u{1102}\u{1173}\u{11B3}",
-        nfkc: "\u{B29C}",
-        nfkd: "\u{1102}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B29D}",
-        nfc: "\u{B29D}",
-        nfd: "\u{1102}\u{1173}\u{11B4}",
-        nfkc: "\u{B29D}",
-        nfkd: "\u{1102}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B29E}",
-        nfc: "\u{B29E}",
-        nfd: "\u{1102}\u{1173}\u{11B5}",
-        nfkc: "\u{B29E}",
-        nfkd: "\u{1102}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B29F}",
-        nfc: "\u{B29F}",
-        nfd: "\u{1102}\u{1173}\u{11B6}",
-        nfkc: "\u{B29F}",
-        nfkd: "\u{1102}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B2A0}",
-        nfc: "\u{B2A0}",
-        nfd: "\u{1102}\u{1173}\u{11B7}",
-        nfkc: "\u{B2A0}",
-        nfkd: "\u{1102}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B2A1}",
-        nfc: "\u{B2A1}",
-        nfd: "\u{1102}\u{1173}\u{11B8}",
-        nfkc: "\u{B2A1}",
-        nfkd: "\u{1102}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B2A2}",
-        nfc: "\u{B2A2}",
-        nfd: "\u{1102}\u{1173}\u{11B9}",
-        nfkc: "\u{B2A2}",
-        nfkd: "\u{1102}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B2A3}",
-        nfc: "\u{B2A3}",
-        nfd: "\u{1102}\u{1173}\u{11BA}",
-        nfkc: "\u{B2A3}",
-        nfkd: "\u{1102}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B2A4}",
-        nfc: "\u{B2A4}",
-        nfd: "\u{1102}\u{1173}\u{11BB}",
-        nfkc: "\u{B2A4}",
-        nfkd: "\u{1102}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B2A5}",
-        nfc: "\u{B2A5}",
-        nfd: "\u{1102}\u{1173}\u{11BC}",
-        nfkc: "\u{B2A5}",
-        nfkd: "\u{1102}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B2A6}",
-        nfc: "\u{B2A6}",
-        nfd: "\u{1102}\u{1173}\u{11BD}",
-        nfkc: "\u{B2A6}",
-        nfkd: "\u{1102}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B2A7}",
-        nfc: "\u{B2A7}",
-        nfd: "\u{1102}\u{1173}\u{11BE}",
-        nfkc: "\u{B2A7}",
-        nfkd: "\u{1102}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B2A8}",
-        nfc: "\u{B2A8}",
-        nfd: "\u{1102}\u{1173}\u{11BF}",
-        nfkc: "\u{B2A8}",
-        nfkd: "\u{1102}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B2A9}",
-        nfc: "\u{B2A9}",
-        nfd: "\u{1102}\u{1173}\u{11C0}",
-        nfkc: "\u{B2A9}",
-        nfkd: "\u{1102}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B2AA}",
-        nfc: "\u{B2AA}",
-        nfd: "\u{1102}\u{1173}\u{11C1}",
-        nfkc: "\u{B2AA}",
-        nfkd: "\u{1102}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B2AB}",
-        nfc: "\u{B2AB}",
-        nfd: "\u{1102}\u{1173}\u{11C2}",
-        nfkc: "\u{B2AB}",
-        nfkd: "\u{1102}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B2AC}",
-        nfc: "\u{B2AC}",
-        nfd: "\u{1102}\u{1174}",
-        nfkc: "\u{B2AC}",
-        nfkd: "\u{1102}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{B2AD}",
-        nfc: "\u{B2AD}",
-        nfd: "\u{1102}\u{1174}\u{11A8}",
-        nfkc: "\u{B2AD}",
-        nfkd: "\u{1102}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B2AE}",
-        nfc: "\u{B2AE}",
-        nfd: "\u{1102}\u{1174}\u{11A9}",
-        nfkc: "\u{B2AE}",
-        nfkd: "\u{1102}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B2AF}",
-        nfc: "\u{B2AF}",
-        nfd: "\u{1102}\u{1174}\u{11AA}",
-        nfkc: "\u{B2AF}",
-        nfkd: "\u{1102}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B2B0}",
-        nfc: "\u{B2B0}",
-        nfd: "\u{1102}\u{1174}\u{11AB}",
-        nfkc: "\u{B2B0}",
-        nfkd: "\u{1102}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B2B1}",
-        nfc: "\u{B2B1}",
-        nfd: "\u{1102}\u{1174}\u{11AC}",
-        nfkc: "\u{B2B1}",
-        nfkd: "\u{1102}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B2B2}",
-        nfc: "\u{B2B2}",
-        nfd: "\u{1102}\u{1174}\u{11AD}",
-        nfkc: "\u{B2B2}",
-        nfkd: "\u{1102}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B2B3}",
-        nfc: "\u{B2B3}",
-        nfd: "\u{1102}\u{1174}\u{11AE}",
-        nfkc: "\u{B2B3}",
-        nfkd: "\u{1102}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B2B4}",
-        nfc: "\u{B2B4}",
-        nfd: "\u{1102}\u{1174}\u{11AF}",
-        nfkc: "\u{B2B4}",
-        nfkd: "\u{1102}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B2B5}",
-        nfc: "\u{B2B5}",
-        nfd: "\u{1102}\u{1174}\u{11B0}",
-        nfkc: "\u{B2B5}",
-        nfkd: "\u{1102}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B2B6}",
-        nfc: "\u{B2B6}",
-        nfd: "\u{1102}\u{1174}\u{11B1}",
-        nfkc: "\u{B2B6}",
-        nfkd: "\u{1102}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B2B7}",
-        nfc: "\u{B2B7}",
-        nfd: "\u{1102}\u{1174}\u{11B2}",
-        nfkc: "\u{B2B7}",
-        nfkd: "\u{1102}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B2B8}",
-        nfc: "\u{B2B8}",
-        nfd: "\u{1102}\u{1174}\u{11B3}",
-        nfkc: "\u{B2B8}",
-        nfkd: "\u{1102}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B2B9}",
-        nfc: "\u{B2B9}",
-        nfd: "\u{1102}\u{1174}\u{11B4}",
-        nfkc: "\u{B2B9}",
-        nfkd: "\u{1102}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B2BA}",
-        nfc: "\u{B2BA}",
-        nfd: "\u{1102}\u{1174}\u{11B5}",
-        nfkc: "\u{B2BA}",
-        nfkd: "\u{1102}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B2BB}",
-        nfc: "\u{B2BB}",
-        nfd: "\u{1102}\u{1174}\u{11B6}",
-        nfkc: "\u{B2BB}",
-        nfkd: "\u{1102}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B2BC}",
-        nfc: "\u{B2BC}",
-        nfd: "\u{1102}\u{1174}\u{11B7}",
-        nfkc: "\u{B2BC}",
-        nfkd: "\u{1102}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B2BD}",
-        nfc: "\u{B2BD}",
-        nfd: "\u{1102}\u{1174}\u{11B8}",
-        nfkc: "\u{B2BD}",
-        nfkd: "\u{1102}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B2BE}",
-        nfc: "\u{B2BE}",
-        nfd: "\u{1102}\u{1174}\u{11B9}",
-        nfkc: "\u{B2BE}",
-        nfkd: "\u{1102}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B2BF}",
-        nfc: "\u{B2BF}",
-        nfd: "\u{1102}\u{1174}\u{11BA}",
-        nfkc: "\u{B2BF}",
-        nfkd: "\u{1102}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B2C0}",
-        nfc: "\u{B2C0}",
-        nfd: "\u{1102}\u{1174}\u{11BB}",
-        nfkc: "\u{B2C0}",
-        nfkd: "\u{1102}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B2C1}",
-        nfc: "\u{B2C1}",
-        nfd: "\u{1102}\u{1174}\u{11BC}",
-        nfkc: "\u{B2C1}",
-        nfkd: "\u{1102}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B2C2}",
-        nfc: "\u{B2C2}",
-        nfd: "\u{1102}\u{1174}\u{11BD}",
-        nfkc: "\u{B2C2}",
-        nfkd: "\u{1102}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B2C3}",
-        nfc: "\u{B2C3}",
-        nfd: "\u{1102}\u{1174}\u{11BE}",
-        nfkc: "\u{B2C3}",
-        nfkd: "\u{1102}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B2C4}",
-        nfc: "\u{B2C4}",
-        nfd: "\u{1102}\u{1174}\u{11BF}",
-        nfkc: "\u{B2C4}",
-        nfkd: "\u{1102}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B2C5}",
-        nfc: "\u{B2C5}",
-        nfd: "\u{1102}\u{1174}\u{11C0}",
-        nfkc: "\u{B2C5}",
-        nfkd: "\u{1102}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B2C6}",
-        nfc: "\u{B2C6}",
-        nfd: "\u{1102}\u{1174}\u{11C1}",
-        nfkc: "\u{B2C6}",
-        nfkd: "\u{1102}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B2C7}",
-        nfc: "\u{B2C7}",
-        nfd: "\u{1102}\u{1174}\u{11C2}",
-        nfkc: "\u{B2C7}",
-        nfkd: "\u{1102}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B2C8}",
-        nfc: "\u{B2C8}",
-        nfd: "\u{1102}\u{1175}",
-        nfkc: "\u{B2C8}",
-        nfkd: "\u{1102}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{B2C9}",
-        nfc: "\u{B2C9}",
-        nfd: "\u{1102}\u{1175}\u{11A8}",
-        nfkc: "\u{B2C9}",
-        nfkd: "\u{1102}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B2CA}",
-        nfc: "\u{B2CA}",
-        nfd: "\u{1102}\u{1175}\u{11A9}",
-        nfkc: "\u{B2CA}",
-        nfkd: "\u{1102}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B2CB}",
-        nfc: "\u{B2CB}",
-        nfd: "\u{1102}\u{1175}\u{11AA}",
-        nfkc: "\u{B2CB}",
-        nfkd: "\u{1102}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B2CC}",
-        nfc: "\u{B2CC}",
-        nfd: "\u{1102}\u{1175}\u{11AB}",
-        nfkc: "\u{B2CC}",
-        nfkd: "\u{1102}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B2CD}",
-        nfc: "\u{B2CD}",
-        nfd: "\u{1102}\u{1175}\u{11AC}",
-        nfkc: "\u{B2CD}",
-        nfkd: "\u{1102}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B2CE}",
-        nfc: "\u{B2CE}",
-        nfd: "\u{1102}\u{1175}\u{11AD}",
-        nfkc: "\u{B2CE}",
-        nfkd: "\u{1102}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B2CF}",
-        nfc: "\u{B2CF}",
-        nfd: "\u{1102}\u{1175}\u{11AE}",
-        nfkc: "\u{B2CF}",
-        nfkd: "\u{1102}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B2D0}",
-        nfc: "\u{B2D0}",
-        nfd: "\u{1102}\u{1175}\u{11AF}",
-        nfkc: "\u{B2D0}",
-        nfkd: "\u{1102}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B2D1}",
-        nfc: "\u{B2D1}",
-        nfd: "\u{1102}\u{1175}\u{11B0}",
-        nfkc: "\u{B2D1}",
-        nfkd: "\u{1102}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B2D2}",
-        nfc: "\u{B2D2}",
-        nfd: "\u{1102}\u{1175}\u{11B1}",
-        nfkc: "\u{B2D2}",
-        nfkd: "\u{1102}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B2D3}",
-        nfc: "\u{B2D3}",
-        nfd: "\u{1102}\u{1175}\u{11B2}",
-        nfkc: "\u{B2D3}",
-        nfkd: "\u{1102}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B2D4}",
-        nfc: "\u{B2D4}",
-        nfd: "\u{1102}\u{1175}\u{11B3}",
-        nfkc: "\u{B2D4}",
-        nfkd: "\u{1102}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B2D5}",
-        nfc: "\u{B2D5}",
-        nfd: "\u{1102}\u{1175}\u{11B4}",
-        nfkc: "\u{B2D5}",
-        nfkd: "\u{1102}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B2D6}",
-        nfc: "\u{B2D6}",
-        nfd: "\u{1102}\u{1175}\u{11B5}",
-        nfkc: "\u{B2D6}",
-        nfkd: "\u{1102}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B2D7}",
-        nfc: "\u{B2D7}",
-        nfd: "\u{1102}\u{1175}\u{11B6}",
-        nfkc: "\u{B2D7}",
-        nfkd: "\u{1102}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B2D8}",
-        nfc: "\u{B2D8}",
-        nfd: "\u{1102}\u{1175}\u{11B7}",
-        nfkc: "\u{B2D8}",
-        nfkd: "\u{1102}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B2D9}",
-        nfc: "\u{B2D9}",
-        nfd: "\u{1102}\u{1175}\u{11B8}",
-        nfkc: "\u{B2D9}",
-        nfkd: "\u{1102}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B2DA}",
-        nfc: "\u{B2DA}",
-        nfd: "\u{1102}\u{1175}\u{11B9}",
-        nfkc: "\u{B2DA}",
-        nfkd: "\u{1102}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B2DB}",
-        nfc: "\u{B2DB}",
-        nfd: "\u{1102}\u{1175}\u{11BA}",
-        nfkc: "\u{B2DB}",
-        nfkd: "\u{1102}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B2DC}",
-        nfc: "\u{B2DC}",
-        nfd: "\u{1102}\u{1175}\u{11BB}",
-        nfkc: "\u{B2DC}",
-        nfkd: "\u{1102}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B2DD}",
-        nfc: "\u{B2DD}",
-        nfd: "\u{1102}\u{1175}\u{11BC}",
-        nfkc: "\u{B2DD}",
-        nfkd: "\u{1102}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B2DE}",
-        nfc: "\u{B2DE}",
-        nfd: "\u{1102}\u{1175}\u{11BD}",
-        nfkc: "\u{B2DE}",
-        nfkd: "\u{1102}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B2DF}",
-        nfc: "\u{B2DF}",
-        nfd: "\u{1102}\u{1175}\u{11BE}",
-        nfkc: "\u{B2DF}",
-        nfkd: "\u{1102}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B2E0}",
-        nfc: "\u{B2E0}",
-        nfd: "\u{1102}\u{1175}\u{11BF}",
-        nfkc: "\u{B2E0}",
-        nfkd: "\u{1102}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B2E1}",
-        nfc: "\u{B2E1}",
-        nfd: "\u{1102}\u{1175}\u{11C0}",
-        nfkc: "\u{B2E1}",
-        nfkd: "\u{1102}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B2E2}",
-        nfc: "\u{B2E2}",
-        nfd: "\u{1102}\u{1175}\u{11C1}",
-        nfkc: "\u{B2E2}",
-        nfkd: "\u{1102}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B2E3}",
-        nfc: "\u{B2E3}",
-        nfd: "\u{1102}\u{1175}\u{11C2}",
-        nfkc: "\u{B2E3}",
-        nfkd: "\u{1102}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B2E4}",
-        nfc: "\u{B2E4}",
-        nfd: "\u{1103}\u{1161}",
-        nfkc: "\u{B2E4}",
-        nfkd: "\u{1103}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{B2E5}",
-        nfc: "\u{B2E5}",
-        nfd: "\u{1103}\u{1161}\u{11A8}",
-        nfkc: "\u{B2E5}",
-        nfkd: "\u{1103}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B2E6}",
-        nfc: "\u{B2E6}",
-        nfd: "\u{1103}\u{1161}\u{11A9}",
-        nfkc: "\u{B2E6}",
-        nfkd: "\u{1103}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B2E7}",
-        nfc: "\u{B2E7}",
-        nfd: "\u{1103}\u{1161}\u{11AA}",
-        nfkc: "\u{B2E7}",
-        nfkd: "\u{1103}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B2E8}",
-        nfc: "\u{B2E8}",
-        nfd: "\u{1103}\u{1161}\u{11AB}",
-        nfkc: "\u{B2E8}",
-        nfkd: "\u{1103}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B2E9}",
-        nfc: "\u{B2E9}",
-        nfd: "\u{1103}\u{1161}\u{11AC}",
-        nfkc: "\u{B2E9}",
-        nfkd: "\u{1103}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B2EA}",
-        nfc: "\u{B2EA}",
-        nfd: "\u{1103}\u{1161}\u{11AD}",
-        nfkc: "\u{B2EA}",
-        nfkd: "\u{1103}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B2EB}",
-        nfc: "\u{B2EB}",
-        nfd: "\u{1103}\u{1161}\u{11AE}",
-        nfkc: "\u{B2EB}",
-        nfkd: "\u{1103}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B2EC}",
-        nfc: "\u{B2EC}",
-        nfd: "\u{1103}\u{1161}\u{11AF}",
-        nfkc: "\u{B2EC}",
-        nfkd: "\u{1103}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B2ED}",
-        nfc: "\u{B2ED}",
-        nfd: "\u{1103}\u{1161}\u{11B0}",
-        nfkc: "\u{B2ED}",
-        nfkd: "\u{1103}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B2EE}",
-        nfc: "\u{B2EE}",
-        nfd: "\u{1103}\u{1161}\u{11B1}",
-        nfkc: "\u{B2EE}",
-        nfkd: "\u{1103}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B2EF}",
-        nfc: "\u{B2EF}",
-        nfd: "\u{1103}\u{1161}\u{11B2}",
-        nfkc: "\u{B2EF}",
-        nfkd: "\u{1103}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B2F0}",
-        nfc: "\u{B2F0}",
-        nfd: "\u{1103}\u{1161}\u{11B3}",
-        nfkc: "\u{B2F0}",
-        nfkd: "\u{1103}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B2F1}",
-        nfc: "\u{B2F1}",
-        nfd: "\u{1103}\u{1161}\u{11B4}",
-        nfkc: "\u{B2F1}",
-        nfkd: "\u{1103}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B2F2}",
-        nfc: "\u{B2F2}",
-        nfd: "\u{1103}\u{1161}\u{11B5}",
-        nfkc: "\u{B2F2}",
-        nfkd: "\u{1103}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B2F3}",
-        nfc: "\u{B2F3}",
-        nfd: "\u{1103}\u{1161}\u{11B6}",
-        nfkc: "\u{B2F3}",
-        nfkd: "\u{1103}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B2F4}",
-        nfc: "\u{B2F4}",
-        nfd: "\u{1103}\u{1161}\u{11B7}",
-        nfkc: "\u{B2F4}",
-        nfkd: "\u{1103}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B2F5}",
-        nfc: "\u{B2F5}",
-        nfd: "\u{1103}\u{1161}\u{11B8}",
-        nfkc: "\u{B2F5}",
-        nfkd: "\u{1103}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B2F6}",
-        nfc: "\u{B2F6}",
-        nfd: "\u{1103}\u{1161}\u{11B9}",
-        nfkc: "\u{B2F6}",
-        nfkd: "\u{1103}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B2F7}",
-        nfc: "\u{B2F7}",
-        nfd: "\u{1103}\u{1161}\u{11BA}",
-        nfkc: "\u{B2F7}",
-        nfkd: "\u{1103}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B2F8}",
-        nfc: "\u{B2F8}",
-        nfd: "\u{1103}\u{1161}\u{11BB}",
-        nfkc: "\u{B2F8}",
-        nfkd: "\u{1103}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B2F9}",
-        nfc: "\u{B2F9}",
-        nfd: "\u{1103}\u{1161}\u{11BC}",
-        nfkc: "\u{B2F9}",
-        nfkd: "\u{1103}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B2FA}",
-        nfc: "\u{B2FA}",
-        nfd: "\u{1103}\u{1161}\u{11BD}",
-        nfkc: "\u{B2FA}",
-        nfkd: "\u{1103}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B2FB}",
-        nfc: "\u{B2FB}",
-        nfd: "\u{1103}\u{1161}\u{11BE}",
-        nfkc: "\u{B2FB}",
-        nfkd: "\u{1103}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B2FC}",
-        nfc: "\u{B2FC}",
-        nfd: "\u{1103}\u{1161}\u{11BF}",
-        nfkc: "\u{B2FC}",
-        nfkd: "\u{1103}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B2FD}",
-        nfc: "\u{B2FD}",
-        nfd: "\u{1103}\u{1161}\u{11C0}",
-        nfkc: "\u{B2FD}",
-        nfkd: "\u{1103}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B2FE}",
-        nfc: "\u{B2FE}",
-        nfd: "\u{1103}\u{1161}\u{11C1}",
-        nfkc: "\u{B2FE}",
-        nfkd: "\u{1103}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B2FF}",
-        nfc: "\u{B2FF}",
-        nfd: "\u{1103}\u{1161}\u{11C2}",
-        nfkc: "\u{B2FF}",
-        nfkd: "\u{1103}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B300}",
-        nfc: "\u{B300}",
-        nfd: "\u{1103}\u{1162}",
-        nfkc: "\u{B300}",
-        nfkd: "\u{1103}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{B301}",
-        nfc: "\u{B301}",
-        nfd: "\u{1103}\u{1162}\u{11A8}",
-        nfkc: "\u{B301}",
-        nfkd: "\u{1103}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B302}",
-        nfc: "\u{B302}",
-        nfd: "\u{1103}\u{1162}\u{11A9}",
-        nfkc: "\u{B302}",
-        nfkd: "\u{1103}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B303}",
-        nfc: "\u{B303}",
-        nfd: "\u{1103}\u{1162}\u{11AA}",
-        nfkc: "\u{B303}",
-        nfkd: "\u{1103}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B304}",
-        nfc: "\u{B304}",
-        nfd: "\u{1103}\u{1162}\u{11AB}",
-        nfkc: "\u{B304}",
-        nfkd: "\u{1103}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B305}",
-        nfc: "\u{B305}",
-        nfd: "\u{1103}\u{1162}\u{11AC}",
-        nfkc: "\u{B305}",
-        nfkd: "\u{1103}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B306}",
-        nfc: "\u{B306}",
-        nfd: "\u{1103}\u{1162}\u{11AD}",
-        nfkc: "\u{B306}",
-        nfkd: "\u{1103}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B307}",
-        nfc: "\u{B307}",
-        nfd: "\u{1103}\u{1162}\u{11AE}",
-        nfkc: "\u{B307}",
-        nfkd: "\u{1103}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B308}",
-        nfc: "\u{B308}",
-        nfd: "\u{1103}\u{1162}\u{11AF}",
-        nfkc: "\u{B308}",
-        nfkd: "\u{1103}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B309}",
-        nfc: "\u{B309}",
-        nfd: "\u{1103}\u{1162}\u{11B0}",
-        nfkc: "\u{B309}",
-        nfkd: "\u{1103}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B30A}",
-        nfc: "\u{B30A}",
-        nfd: "\u{1103}\u{1162}\u{11B1}",
-        nfkc: "\u{B30A}",
-        nfkd: "\u{1103}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B30B}",
-        nfc: "\u{B30B}",
-        nfd: "\u{1103}\u{1162}\u{11B2}",
-        nfkc: "\u{B30B}",
-        nfkd: "\u{1103}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B30C}",
-        nfc: "\u{B30C}",
-        nfd: "\u{1103}\u{1162}\u{11B3}",
-        nfkc: "\u{B30C}",
-        nfkd: "\u{1103}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B30D}",
-        nfc: "\u{B30D}",
-        nfd: "\u{1103}\u{1162}\u{11B4}",
-        nfkc: "\u{B30D}",
-        nfkd: "\u{1103}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B30E}",
-        nfc: "\u{B30E}",
-        nfd: "\u{1103}\u{1162}\u{11B5}",
-        nfkc: "\u{B30E}",
-        nfkd: "\u{1103}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B30F}",
-        nfc: "\u{B30F}",
-        nfd: "\u{1103}\u{1162}\u{11B6}",
-        nfkc: "\u{B30F}",
-        nfkd: "\u{1103}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B310}",
-        nfc: "\u{B310}",
-        nfd: "\u{1103}\u{1162}\u{11B7}",
-        nfkc: "\u{B310}",
-        nfkd: "\u{1103}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B311}",
-        nfc: "\u{B311}",
-        nfd: "\u{1103}\u{1162}\u{11B8}",
-        nfkc: "\u{B311}",
-        nfkd: "\u{1103}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B312}",
-        nfc: "\u{B312}",
-        nfd: "\u{1103}\u{1162}\u{11B9}",
-        nfkc: "\u{B312}",
-        nfkd: "\u{1103}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B313}",
-        nfc: "\u{B313}",
-        nfd: "\u{1103}\u{1162}\u{11BA}",
-        nfkc: "\u{B313}",
-        nfkd: "\u{1103}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B314}",
-        nfc: "\u{B314}",
-        nfd: "\u{1103}\u{1162}\u{11BB}",
-        nfkc: "\u{B314}",
-        nfkd: "\u{1103}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B315}",
-        nfc: "\u{B315}",
-        nfd: "\u{1103}\u{1162}\u{11BC}",
-        nfkc: "\u{B315}",
-        nfkd: "\u{1103}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B316}",
-        nfc: "\u{B316}",
-        nfd: "\u{1103}\u{1162}\u{11BD}",
-        nfkc: "\u{B316}",
-        nfkd: "\u{1103}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B317}",
-        nfc: "\u{B317}",
-        nfd: "\u{1103}\u{1162}\u{11BE}",
-        nfkc: "\u{B317}",
-        nfkd: "\u{1103}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B318}",
-        nfc: "\u{B318}",
-        nfd: "\u{1103}\u{1162}\u{11BF}",
-        nfkc: "\u{B318}",
-        nfkd: "\u{1103}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B319}",
-        nfc: "\u{B319}",
-        nfd: "\u{1103}\u{1162}\u{11C0}",
-        nfkc: "\u{B319}",
-        nfkd: "\u{1103}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B31A}",
-        nfc: "\u{B31A}",
-        nfd: "\u{1103}\u{1162}\u{11C1}",
-        nfkc: "\u{B31A}",
-        nfkd: "\u{1103}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B31B}",
-        nfc: "\u{B31B}",
-        nfd: "\u{1103}\u{1162}\u{11C2}",
-        nfkc: "\u{B31B}",
-        nfkd: "\u{1103}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B31C}",
-        nfc: "\u{B31C}",
-        nfd: "\u{1103}\u{1163}",
-        nfkc: "\u{B31C}",
-        nfkd: "\u{1103}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{B31D}",
-        nfc: "\u{B31D}",
-        nfd: "\u{1103}\u{1163}\u{11A8}",
-        nfkc: "\u{B31D}",
-        nfkd: "\u{1103}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B31E}",
-        nfc: "\u{B31E}",
-        nfd: "\u{1103}\u{1163}\u{11A9}",
-        nfkc: "\u{B31E}",
-        nfkd: "\u{1103}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B31F}",
-        nfc: "\u{B31F}",
-        nfd: "\u{1103}\u{1163}\u{11AA}",
-        nfkc: "\u{B31F}",
-        nfkd: "\u{1103}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B320}",
-        nfc: "\u{B320}",
-        nfd: "\u{1103}\u{1163}\u{11AB}",
-        nfkc: "\u{B320}",
-        nfkd: "\u{1103}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B321}",
-        nfc: "\u{B321}",
-        nfd: "\u{1103}\u{1163}\u{11AC}",
-        nfkc: "\u{B321}",
-        nfkd: "\u{1103}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B322}",
-        nfc: "\u{B322}",
-        nfd: "\u{1103}\u{1163}\u{11AD}",
-        nfkc: "\u{B322}",
-        nfkd: "\u{1103}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B323}",
-        nfc: "\u{B323}",
-        nfd: "\u{1103}\u{1163}\u{11AE}",
-        nfkc: "\u{B323}",
-        nfkd: "\u{1103}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B324}",
-        nfc: "\u{B324}",
-        nfd: "\u{1103}\u{1163}\u{11AF}",
-        nfkc: "\u{B324}",
-        nfkd: "\u{1103}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B325}",
-        nfc: "\u{B325}",
-        nfd: "\u{1103}\u{1163}\u{11B0}",
-        nfkc: "\u{B325}",
-        nfkd: "\u{1103}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B326}",
-        nfc: "\u{B326}",
-        nfd: "\u{1103}\u{1163}\u{11B1}",
-        nfkc: "\u{B326}",
-        nfkd: "\u{1103}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B327}",
-        nfc: "\u{B327}",
-        nfd: "\u{1103}\u{1163}\u{11B2}",
-        nfkc: "\u{B327}",
-        nfkd: "\u{1103}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B328}",
-        nfc: "\u{B328}",
-        nfd: "\u{1103}\u{1163}\u{11B3}",
-        nfkc: "\u{B328}",
-        nfkd: "\u{1103}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B329}",
-        nfc: "\u{B329}",
-        nfd: "\u{1103}\u{1163}\u{11B4}",
-        nfkc: "\u{B329}",
-        nfkd: "\u{1103}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B32A}",
-        nfc: "\u{B32A}",
-        nfd: "\u{1103}\u{1163}\u{11B5}",
-        nfkc: "\u{B32A}",
-        nfkd: "\u{1103}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B32B}",
-        nfc: "\u{B32B}",
-        nfd: "\u{1103}\u{1163}\u{11B6}",
-        nfkc: "\u{B32B}",
-        nfkd: "\u{1103}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B32C}",
-        nfc: "\u{B32C}",
-        nfd: "\u{1103}\u{1163}\u{11B7}",
-        nfkc: "\u{B32C}",
-        nfkd: "\u{1103}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B32D}",
-        nfc: "\u{B32D}",
-        nfd: "\u{1103}\u{1163}\u{11B8}",
-        nfkc: "\u{B32D}",
-        nfkd: "\u{1103}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B32E}",
-        nfc: "\u{B32E}",
-        nfd: "\u{1103}\u{1163}\u{11B9}",
-        nfkc: "\u{B32E}",
-        nfkd: "\u{1103}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B32F}",
-        nfc: "\u{B32F}",
-        nfd: "\u{1103}\u{1163}\u{11BA}",
-        nfkc: "\u{B32F}",
-        nfkd: "\u{1103}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B330}",
-        nfc: "\u{B330}",
-        nfd: "\u{1103}\u{1163}\u{11BB}",
-        nfkc: "\u{B330}",
-        nfkd: "\u{1103}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B331}",
-        nfc: "\u{B331}",
-        nfd: "\u{1103}\u{1163}\u{11BC}",
-        nfkc: "\u{B331}",
-        nfkd: "\u{1103}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B332}",
-        nfc: "\u{B332}",
-        nfd: "\u{1103}\u{1163}\u{11BD}",
-        nfkc: "\u{B332}",
-        nfkd: "\u{1103}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B333}",
-        nfc: "\u{B333}",
-        nfd: "\u{1103}\u{1163}\u{11BE}",
-        nfkc: "\u{B333}",
-        nfkd: "\u{1103}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B334}",
-        nfc: "\u{B334}",
-        nfd: "\u{1103}\u{1163}\u{11BF}",
-        nfkc: "\u{B334}",
-        nfkd: "\u{1103}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B335}",
-        nfc: "\u{B335}",
-        nfd: "\u{1103}\u{1163}\u{11C0}",
-        nfkc: "\u{B335}",
-        nfkd: "\u{1103}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B336}",
-        nfc: "\u{B336}",
-        nfd: "\u{1103}\u{1163}\u{11C1}",
-        nfkc: "\u{B336}",
-        nfkd: "\u{1103}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B337}",
-        nfc: "\u{B337}",
-        nfd: "\u{1103}\u{1163}\u{11C2}",
-        nfkc: "\u{B337}",
-        nfkd: "\u{1103}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B338}",
-        nfc: "\u{B338}",
-        nfd: "\u{1103}\u{1164}",
-        nfkc: "\u{B338}",
-        nfkd: "\u{1103}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{B339}",
-        nfc: "\u{B339}",
-        nfd: "\u{1103}\u{1164}\u{11A8}",
-        nfkc: "\u{B339}",
-        nfkd: "\u{1103}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B33A}",
-        nfc: "\u{B33A}",
-        nfd: "\u{1103}\u{1164}\u{11A9}",
-        nfkc: "\u{B33A}",
-        nfkd: "\u{1103}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B33B}",
-        nfc: "\u{B33B}",
-        nfd: "\u{1103}\u{1164}\u{11AA}",
-        nfkc: "\u{B33B}",
-        nfkd: "\u{1103}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B33C}",
-        nfc: "\u{B33C}",
-        nfd: "\u{1103}\u{1164}\u{11AB}",
-        nfkc: "\u{B33C}",
-        nfkd: "\u{1103}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B33D}",
-        nfc: "\u{B33D}",
-        nfd: "\u{1103}\u{1164}\u{11AC}",
-        nfkc: "\u{B33D}",
-        nfkd: "\u{1103}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B33E}",
-        nfc: "\u{B33E}",
-        nfd: "\u{1103}\u{1164}\u{11AD}",
-        nfkc: "\u{B33E}",
-        nfkd: "\u{1103}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B33F}",
-        nfc: "\u{B33F}",
-        nfd: "\u{1103}\u{1164}\u{11AE}",
-        nfkc: "\u{B33F}",
-        nfkd: "\u{1103}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B340}",
-        nfc: "\u{B340}",
-        nfd: "\u{1103}\u{1164}\u{11AF}",
-        nfkc: "\u{B340}",
-        nfkd: "\u{1103}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B341}",
-        nfc: "\u{B341}",
-        nfd: "\u{1103}\u{1164}\u{11B0}",
-        nfkc: "\u{B341}",
-        nfkd: "\u{1103}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B342}",
-        nfc: "\u{B342}",
-        nfd: "\u{1103}\u{1164}\u{11B1}",
-        nfkc: "\u{B342}",
-        nfkd: "\u{1103}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B343}",
-        nfc: "\u{B343}",
-        nfd: "\u{1103}\u{1164}\u{11B2}",
-        nfkc: "\u{B343}",
-        nfkd: "\u{1103}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B344}",
-        nfc: "\u{B344}",
-        nfd: "\u{1103}\u{1164}\u{11B3}",
-        nfkc: "\u{B344}",
-        nfkd: "\u{1103}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B345}",
-        nfc: "\u{B345}",
-        nfd: "\u{1103}\u{1164}\u{11B4}",
-        nfkc: "\u{B345}",
-        nfkd: "\u{1103}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B346}",
-        nfc: "\u{B346}",
-        nfd: "\u{1103}\u{1164}\u{11B5}",
-        nfkc: "\u{B346}",
-        nfkd: "\u{1103}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B347}",
-        nfc: "\u{B347}",
-        nfd: "\u{1103}\u{1164}\u{11B6}",
-        nfkc: "\u{B347}",
-        nfkd: "\u{1103}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B348}",
-        nfc: "\u{B348}",
-        nfd: "\u{1103}\u{1164}\u{11B7}",
-        nfkc: "\u{B348}",
-        nfkd: "\u{1103}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B349}",
-        nfc: "\u{B349}",
-        nfd: "\u{1103}\u{1164}\u{11B8}",
-        nfkc: "\u{B349}",
-        nfkd: "\u{1103}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B34A}",
-        nfc: "\u{B34A}",
-        nfd: "\u{1103}\u{1164}\u{11B9}",
-        nfkc: "\u{B34A}",
-        nfkd: "\u{1103}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B34B}",
-        nfc: "\u{B34B}",
-        nfd: "\u{1103}\u{1164}\u{11BA}",
-        nfkc: "\u{B34B}",
-        nfkd: "\u{1103}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B34C}",
-        nfc: "\u{B34C}",
-        nfd: "\u{1103}\u{1164}\u{11BB}",
-        nfkc: "\u{B34C}",
-        nfkd: "\u{1103}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B34D}",
-        nfc: "\u{B34D}",
-        nfd: "\u{1103}\u{1164}\u{11BC}",
-        nfkc: "\u{B34D}",
-        nfkd: "\u{1103}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B34E}",
-        nfc: "\u{B34E}",
-        nfd: "\u{1103}\u{1164}\u{11BD}",
-        nfkc: "\u{B34E}",
-        nfkd: "\u{1103}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B34F}",
-        nfc: "\u{B34F}",
-        nfd: "\u{1103}\u{1164}\u{11BE}",
-        nfkc: "\u{B34F}",
-        nfkd: "\u{1103}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B350}",
-        nfc: "\u{B350}",
-        nfd: "\u{1103}\u{1164}\u{11BF}",
-        nfkc: "\u{B350}",
-        nfkd: "\u{1103}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B351}",
-        nfc: "\u{B351}",
-        nfd: "\u{1103}\u{1164}\u{11C0}",
-        nfkc: "\u{B351}",
-        nfkd: "\u{1103}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B352}",
-        nfc: "\u{B352}",
-        nfd: "\u{1103}\u{1164}\u{11C1}",
-        nfkc: "\u{B352}",
-        nfkd: "\u{1103}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B353}",
-        nfc: "\u{B353}",
-        nfd: "\u{1103}\u{1164}\u{11C2}",
-        nfkc: "\u{B353}",
-        nfkd: "\u{1103}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B354}",
-        nfc: "\u{B354}",
-        nfd: "\u{1103}\u{1165}",
-        nfkc: "\u{B354}",
-        nfkd: "\u{1103}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{B355}",
-        nfc: "\u{B355}",
-        nfd: "\u{1103}\u{1165}\u{11A8}",
-        nfkc: "\u{B355}",
-        nfkd: "\u{1103}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B356}",
-        nfc: "\u{B356}",
-        nfd: "\u{1103}\u{1165}\u{11A9}",
-        nfkc: "\u{B356}",
-        nfkd: "\u{1103}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B357}",
-        nfc: "\u{B357}",
-        nfd: "\u{1103}\u{1165}\u{11AA}",
-        nfkc: "\u{B357}",
-        nfkd: "\u{1103}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B358}",
-        nfc: "\u{B358}",
-        nfd: "\u{1103}\u{1165}\u{11AB}",
-        nfkc: "\u{B358}",
-        nfkd: "\u{1103}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B359}",
-        nfc: "\u{B359}",
-        nfd: "\u{1103}\u{1165}\u{11AC}",
-        nfkc: "\u{B359}",
-        nfkd: "\u{1103}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B35A}",
-        nfc: "\u{B35A}",
-        nfd: "\u{1103}\u{1165}\u{11AD}",
-        nfkc: "\u{B35A}",
-        nfkd: "\u{1103}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B35B}",
-        nfc: "\u{B35B}",
-        nfd: "\u{1103}\u{1165}\u{11AE}",
-        nfkc: "\u{B35B}",
-        nfkd: "\u{1103}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B35C}",
-        nfc: "\u{B35C}",
-        nfd: "\u{1103}\u{1165}\u{11AF}",
-        nfkc: "\u{B35C}",
-        nfkd: "\u{1103}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B35D}",
-        nfc: "\u{B35D}",
-        nfd: "\u{1103}\u{1165}\u{11B0}",
-        nfkc: "\u{B35D}",
-        nfkd: "\u{1103}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B35E}",
-        nfc: "\u{B35E}",
-        nfd: "\u{1103}\u{1165}\u{11B1}",
-        nfkc: "\u{B35E}",
-        nfkd: "\u{1103}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B35F}",
-        nfc: "\u{B35F}",
-        nfd: "\u{1103}\u{1165}\u{11B2}",
-        nfkc: "\u{B35F}",
-        nfkd: "\u{1103}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B360}",
-        nfc: "\u{B360}",
-        nfd: "\u{1103}\u{1165}\u{11B3}",
-        nfkc: "\u{B360}",
-        nfkd: "\u{1103}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B361}",
-        nfc: "\u{B361}",
-        nfd: "\u{1103}\u{1165}\u{11B4}",
-        nfkc: "\u{B361}",
-        nfkd: "\u{1103}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B362}",
-        nfc: "\u{B362}",
-        nfd: "\u{1103}\u{1165}\u{11B5}",
-        nfkc: "\u{B362}",
-        nfkd: "\u{1103}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B363}",
-        nfc: "\u{B363}",
-        nfd: "\u{1103}\u{1165}\u{11B6}",
-        nfkc: "\u{B363}",
-        nfkd: "\u{1103}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B364}",
-        nfc: "\u{B364}",
-        nfd: "\u{1103}\u{1165}\u{11B7}",
-        nfkc: "\u{B364}",
-        nfkd: "\u{1103}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B365}",
-        nfc: "\u{B365}",
-        nfd: "\u{1103}\u{1165}\u{11B8}",
-        nfkc: "\u{B365}",
-        nfkd: "\u{1103}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B366}",
-        nfc: "\u{B366}",
-        nfd: "\u{1103}\u{1165}\u{11B9}",
-        nfkc: "\u{B366}",
-        nfkd: "\u{1103}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B367}",
-        nfc: "\u{B367}",
-        nfd: "\u{1103}\u{1165}\u{11BA}",
-        nfkc: "\u{B367}",
-        nfkd: "\u{1103}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B368}",
-        nfc: "\u{B368}",
-        nfd: "\u{1103}\u{1165}\u{11BB}",
-        nfkc: "\u{B368}",
-        nfkd: "\u{1103}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B369}",
-        nfc: "\u{B369}",
-        nfd: "\u{1103}\u{1165}\u{11BC}",
-        nfkc: "\u{B369}",
-        nfkd: "\u{1103}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B36A}",
-        nfc: "\u{B36A}",
-        nfd: "\u{1103}\u{1165}\u{11BD}",
-        nfkc: "\u{B36A}",
-        nfkd: "\u{1103}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B36B}",
-        nfc: "\u{B36B}",
-        nfd: "\u{1103}\u{1165}\u{11BE}",
-        nfkc: "\u{B36B}",
-        nfkd: "\u{1103}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B36C}",
-        nfc: "\u{B36C}",
-        nfd: "\u{1103}\u{1165}\u{11BF}",
-        nfkc: "\u{B36C}",
-        nfkd: "\u{1103}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B36D}",
-        nfc: "\u{B36D}",
-        nfd: "\u{1103}\u{1165}\u{11C0}",
-        nfkc: "\u{B36D}",
-        nfkd: "\u{1103}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B36E}",
-        nfc: "\u{B36E}",
-        nfd: "\u{1103}\u{1165}\u{11C1}",
-        nfkc: "\u{B36E}",
-        nfkd: "\u{1103}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B36F}",
-        nfc: "\u{B36F}",
-        nfd: "\u{1103}\u{1165}\u{11C2}",
-        nfkc: "\u{B36F}",
-        nfkd: "\u{1103}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B370}",
-        nfc: "\u{B370}",
-        nfd: "\u{1103}\u{1166}",
-        nfkc: "\u{B370}",
-        nfkd: "\u{1103}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{B371}",
-        nfc: "\u{B371}",
-        nfd: "\u{1103}\u{1166}\u{11A8}",
-        nfkc: "\u{B371}",
-        nfkd: "\u{1103}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B372}",
-        nfc: "\u{B372}",
-        nfd: "\u{1103}\u{1166}\u{11A9}",
-        nfkc: "\u{B372}",
-        nfkd: "\u{1103}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B373}",
-        nfc: "\u{B373}",
-        nfd: "\u{1103}\u{1166}\u{11AA}",
-        nfkc: "\u{B373}",
-        nfkd: "\u{1103}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B374}",
-        nfc: "\u{B374}",
-        nfd: "\u{1103}\u{1166}\u{11AB}",
-        nfkc: "\u{B374}",
-        nfkd: "\u{1103}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B375}",
-        nfc: "\u{B375}",
-        nfd: "\u{1103}\u{1166}\u{11AC}",
-        nfkc: "\u{B375}",
-        nfkd: "\u{1103}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B376}",
-        nfc: "\u{B376}",
-        nfd: "\u{1103}\u{1166}\u{11AD}",
-        nfkc: "\u{B376}",
-        nfkd: "\u{1103}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B377}",
-        nfc: "\u{B377}",
-        nfd: "\u{1103}\u{1166}\u{11AE}",
-        nfkc: "\u{B377}",
-        nfkd: "\u{1103}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B378}",
-        nfc: "\u{B378}",
-        nfd: "\u{1103}\u{1166}\u{11AF}",
-        nfkc: "\u{B378}",
-        nfkd: "\u{1103}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B379}",
-        nfc: "\u{B379}",
-        nfd: "\u{1103}\u{1166}\u{11B0}",
-        nfkc: "\u{B379}",
-        nfkd: "\u{1103}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B37A}",
-        nfc: "\u{B37A}",
-        nfd: "\u{1103}\u{1166}\u{11B1}",
-        nfkc: "\u{B37A}",
-        nfkd: "\u{1103}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B37B}",
-        nfc: "\u{B37B}",
-        nfd: "\u{1103}\u{1166}\u{11B2}",
-        nfkc: "\u{B37B}",
-        nfkd: "\u{1103}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B37C}",
-        nfc: "\u{B37C}",
-        nfd: "\u{1103}\u{1166}\u{11B3}",
-        nfkc: "\u{B37C}",
-        nfkd: "\u{1103}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B37D}",
-        nfc: "\u{B37D}",
-        nfd: "\u{1103}\u{1166}\u{11B4}",
-        nfkc: "\u{B37D}",
-        nfkd: "\u{1103}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B37E}",
-        nfc: "\u{B37E}",
-        nfd: "\u{1103}\u{1166}\u{11B5}",
-        nfkc: "\u{B37E}",
-        nfkd: "\u{1103}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B37F}",
-        nfc: "\u{B37F}",
-        nfd: "\u{1103}\u{1166}\u{11B6}",
-        nfkc: "\u{B37F}",
-        nfkd: "\u{1103}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B380}",
-        nfc: "\u{B380}",
-        nfd: "\u{1103}\u{1166}\u{11B7}",
-        nfkc: "\u{B380}",
-        nfkd: "\u{1103}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B381}",
-        nfc: "\u{B381}",
-        nfd: "\u{1103}\u{1166}\u{11B8}",
-        nfkc: "\u{B381}",
-        nfkd: "\u{1103}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B382}",
-        nfc: "\u{B382}",
-        nfd: "\u{1103}\u{1166}\u{11B9}",
-        nfkc: "\u{B382}",
-        nfkd: "\u{1103}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B383}",
-        nfc: "\u{B383}",
-        nfd: "\u{1103}\u{1166}\u{11BA}",
-        nfkc: "\u{B383}",
-        nfkd: "\u{1103}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B384}",
-        nfc: "\u{B384}",
-        nfd: "\u{1103}\u{1166}\u{11BB}",
-        nfkc: "\u{B384}",
-        nfkd: "\u{1103}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B385}",
-        nfc: "\u{B385}",
-        nfd: "\u{1103}\u{1166}\u{11BC}",
-        nfkc: "\u{B385}",
-        nfkd: "\u{1103}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B386}",
-        nfc: "\u{B386}",
-        nfd: "\u{1103}\u{1166}\u{11BD}",
-        nfkc: "\u{B386}",
-        nfkd: "\u{1103}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B387}",
-        nfc: "\u{B387}",
-        nfd: "\u{1103}\u{1166}\u{11BE}",
-        nfkc: "\u{B387}",
-        nfkd: "\u{1103}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B388}",
-        nfc: "\u{B388}",
-        nfd: "\u{1103}\u{1166}\u{11BF}",
-        nfkc: "\u{B388}",
-        nfkd: "\u{1103}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B389}",
-        nfc: "\u{B389}",
-        nfd: "\u{1103}\u{1166}\u{11C0}",
-        nfkc: "\u{B389}",
-        nfkd: "\u{1103}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B38A}",
-        nfc: "\u{B38A}",
-        nfd: "\u{1103}\u{1166}\u{11C1}",
-        nfkc: "\u{B38A}",
-        nfkd: "\u{1103}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B38B}",
-        nfc: "\u{B38B}",
-        nfd: "\u{1103}\u{1166}\u{11C2}",
-        nfkc: "\u{B38B}",
-        nfkd: "\u{1103}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B38C}",
-        nfc: "\u{B38C}",
-        nfd: "\u{1103}\u{1167}",
-        nfkc: "\u{B38C}",
-        nfkd: "\u{1103}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{B38D}",
-        nfc: "\u{B38D}",
-        nfd: "\u{1103}\u{1167}\u{11A8}",
-        nfkc: "\u{B38D}",
-        nfkd: "\u{1103}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B38E}",
-        nfc: "\u{B38E}",
-        nfd: "\u{1103}\u{1167}\u{11A9}",
-        nfkc: "\u{B38E}",
-        nfkd: "\u{1103}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B38F}",
-        nfc: "\u{B38F}",
-        nfd: "\u{1103}\u{1167}\u{11AA}",
-        nfkc: "\u{B38F}",
-        nfkd: "\u{1103}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B390}",
-        nfc: "\u{B390}",
-        nfd: "\u{1103}\u{1167}\u{11AB}",
-        nfkc: "\u{B390}",
-        nfkd: "\u{1103}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B391}",
-        nfc: "\u{B391}",
-        nfd: "\u{1103}\u{1167}\u{11AC}",
-        nfkc: "\u{B391}",
-        nfkd: "\u{1103}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B392}",
-        nfc: "\u{B392}",
-        nfd: "\u{1103}\u{1167}\u{11AD}",
-        nfkc: "\u{B392}",
-        nfkd: "\u{1103}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B393}",
-        nfc: "\u{B393}",
-        nfd: "\u{1103}\u{1167}\u{11AE}",
-        nfkc: "\u{B393}",
-        nfkd: "\u{1103}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B394}",
-        nfc: "\u{B394}",
-        nfd: "\u{1103}\u{1167}\u{11AF}",
-        nfkc: "\u{B394}",
-        nfkd: "\u{1103}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B395}",
-        nfc: "\u{B395}",
-        nfd: "\u{1103}\u{1167}\u{11B0}",
-        nfkc: "\u{B395}",
-        nfkd: "\u{1103}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B396}",
-        nfc: "\u{B396}",
-        nfd: "\u{1103}\u{1167}\u{11B1}",
-        nfkc: "\u{B396}",
-        nfkd: "\u{1103}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B397}",
-        nfc: "\u{B397}",
-        nfd: "\u{1103}\u{1167}\u{11B2}",
-        nfkc: "\u{B397}",
-        nfkd: "\u{1103}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B398}",
-        nfc: "\u{B398}",
-        nfd: "\u{1103}\u{1167}\u{11B3}",
-        nfkc: "\u{B398}",
-        nfkd: "\u{1103}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B399}",
-        nfc: "\u{B399}",
-        nfd: "\u{1103}\u{1167}\u{11B4}",
-        nfkc: "\u{B399}",
-        nfkd: "\u{1103}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B39A}",
-        nfc: "\u{B39A}",
-        nfd: "\u{1103}\u{1167}\u{11B5}",
-        nfkc: "\u{B39A}",
-        nfkd: "\u{1103}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B39B}",
-        nfc: "\u{B39B}",
-        nfd: "\u{1103}\u{1167}\u{11B6}",
-        nfkc: "\u{B39B}",
-        nfkd: "\u{1103}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B39C}",
-        nfc: "\u{B39C}",
-        nfd: "\u{1103}\u{1167}\u{11B7}",
-        nfkc: "\u{B39C}",
-        nfkd: "\u{1103}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B39D}",
-        nfc: "\u{B39D}",
-        nfd: "\u{1103}\u{1167}\u{11B8}",
-        nfkc: "\u{B39D}",
-        nfkd: "\u{1103}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B39E}",
-        nfc: "\u{B39E}",
-        nfd: "\u{1103}\u{1167}\u{11B9}",
-        nfkc: "\u{B39E}",
-        nfkd: "\u{1103}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B39F}",
-        nfc: "\u{B39F}",
-        nfd: "\u{1103}\u{1167}\u{11BA}",
-        nfkc: "\u{B39F}",
-        nfkd: "\u{1103}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B3A0}",
-        nfc: "\u{B3A0}",
-        nfd: "\u{1103}\u{1167}\u{11BB}",
-        nfkc: "\u{B3A0}",
-        nfkd: "\u{1103}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B3A1}",
-        nfc: "\u{B3A1}",
-        nfd: "\u{1103}\u{1167}\u{11BC}",
-        nfkc: "\u{B3A1}",
-        nfkd: "\u{1103}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B3A2}",
-        nfc: "\u{B3A2}",
-        nfd: "\u{1103}\u{1167}\u{11BD}",
-        nfkc: "\u{B3A2}",
-        nfkd: "\u{1103}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B3A3}",
-        nfc: "\u{B3A3}",
-        nfd: "\u{1103}\u{1167}\u{11BE}",
-        nfkc: "\u{B3A3}",
-        nfkd: "\u{1103}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B3A4}",
-        nfc: "\u{B3A4}",
-        nfd: "\u{1103}\u{1167}\u{11BF}",
-        nfkc: "\u{B3A4}",
-        nfkd: "\u{1103}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B3A5}",
-        nfc: "\u{B3A5}",
-        nfd: "\u{1103}\u{1167}\u{11C0}",
-        nfkc: "\u{B3A5}",
-        nfkd: "\u{1103}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B3A6}",
-        nfc: "\u{B3A6}",
-        nfd: "\u{1103}\u{1167}\u{11C1}",
-        nfkc: "\u{B3A6}",
-        nfkd: "\u{1103}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B3A7}",
-        nfc: "\u{B3A7}",
-        nfd: "\u{1103}\u{1167}\u{11C2}",
-        nfkc: "\u{B3A7}",
-        nfkd: "\u{1103}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B3A8}",
-        nfc: "\u{B3A8}",
-        nfd: "\u{1103}\u{1168}",
-        nfkc: "\u{B3A8}",
-        nfkd: "\u{1103}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{B3A9}",
-        nfc: "\u{B3A9}",
-        nfd: "\u{1103}\u{1168}\u{11A8}",
-        nfkc: "\u{B3A9}",
-        nfkd: "\u{1103}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B3AA}",
-        nfc: "\u{B3AA}",
-        nfd: "\u{1103}\u{1168}\u{11A9}",
-        nfkc: "\u{B3AA}",
-        nfkd: "\u{1103}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B3AB}",
-        nfc: "\u{B3AB}",
-        nfd: "\u{1103}\u{1168}\u{11AA}",
-        nfkc: "\u{B3AB}",
-        nfkd: "\u{1103}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B3AC}",
-        nfc: "\u{B3AC}",
-        nfd: "\u{1103}\u{1168}\u{11AB}",
-        nfkc: "\u{B3AC}",
-        nfkd: "\u{1103}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B3AD}",
-        nfc: "\u{B3AD}",
-        nfd: "\u{1103}\u{1168}\u{11AC}",
-        nfkc: "\u{B3AD}",
-        nfkd: "\u{1103}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B3AE}",
-        nfc: "\u{B3AE}",
-        nfd: "\u{1103}\u{1168}\u{11AD}",
-        nfkc: "\u{B3AE}",
-        nfkd: "\u{1103}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B3AF}",
-        nfc: "\u{B3AF}",
-        nfd: "\u{1103}\u{1168}\u{11AE}",
-        nfkc: "\u{B3AF}",
-        nfkd: "\u{1103}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B3B0}",
-        nfc: "\u{B3B0}",
-        nfd: "\u{1103}\u{1168}\u{11AF}",
-        nfkc: "\u{B3B0}",
-        nfkd: "\u{1103}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B3B1}",
-        nfc: "\u{B3B1}",
-        nfd: "\u{1103}\u{1168}\u{11B0}",
-        nfkc: "\u{B3B1}",
-        nfkd: "\u{1103}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B3B2}",
-        nfc: "\u{B3B2}",
-        nfd: "\u{1103}\u{1168}\u{11B1}",
-        nfkc: "\u{B3B2}",
-        nfkd: "\u{1103}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B3B3}",
-        nfc: "\u{B3B3}",
-        nfd: "\u{1103}\u{1168}\u{11B2}",
-        nfkc: "\u{B3B3}",
-        nfkd: "\u{1103}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B3B4}",
-        nfc: "\u{B3B4}",
-        nfd: "\u{1103}\u{1168}\u{11B3}",
-        nfkc: "\u{B3B4}",
-        nfkd: "\u{1103}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B3B5}",
-        nfc: "\u{B3B5}",
-        nfd: "\u{1103}\u{1168}\u{11B4}",
-        nfkc: "\u{B3B5}",
-        nfkd: "\u{1103}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B3B6}",
-        nfc: "\u{B3B6}",
-        nfd: "\u{1103}\u{1168}\u{11B5}",
-        nfkc: "\u{B3B6}",
-        nfkd: "\u{1103}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B3B7}",
-        nfc: "\u{B3B7}",
-        nfd: "\u{1103}\u{1168}\u{11B6}",
-        nfkc: "\u{B3B7}",
-        nfkd: "\u{1103}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B3B8}",
-        nfc: "\u{B3B8}",
-        nfd: "\u{1103}\u{1168}\u{11B7}",
-        nfkc: "\u{B3B8}",
-        nfkd: "\u{1103}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B3B9}",
-        nfc: "\u{B3B9}",
-        nfd: "\u{1103}\u{1168}\u{11B8}",
-        nfkc: "\u{B3B9}",
-        nfkd: "\u{1103}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B3BA}",
-        nfc: "\u{B3BA}",
-        nfd: "\u{1103}\u{1168}\u{11B9}",
-        nfkc: "\u{B3BA}",
-        nfkd: "\u{1103}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B3BB}",
-        nfc: "\u{B3BB}",
-        nfd: "\u{1103}\u{1168}\u{11BA}",
-        nfkc: "\u{B3BB}",
-        nfkd: "\u{1103}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B3BC}",
-        nfc: "\u{B3BC}",
-        nfd: "\u{1103}\u{1168}\u{11BB}",
-        nfkc: "\u{B3BC}",
-        nfkd: "\u{1103}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B3BD}",
-        nfc: "\u{B3BD}",
-        nfd: "\u{1103}\u{1168}\u{11BC}",
-        nfkc: "\u{B3BD}",
-        nfkd: "\u{1103}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B3BE}",
-        nfc: "\u{B3BE}",
-        nfd: "\u{1103}\u{1168}\u{11BD}",
-        nfkc: "\u{B3BE}",
-        nfkd: "\u{1103}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B3BF}",
-        nfc: "\u{B3BF}",
-        nfd: "\u{1103}\u{1168}\u{11BE}",
-        nfkc: "\u{B3BF}",
-        nfkd: "\u{1103}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B3C0}",
-        nfc: "\u{B3C0}",
-        nfd: "\u{1103}\u{1168}\u{11BF}",
-        nfkc: "\u{B3C0}",
-        nfkd: "\u{1103}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B3C1}",
-        nfc: "\u{B3C1}",
-        nfd: "\u{1103}\u{1168}\u{11C0}",
-        nfkc: "\u{B3C1}",
-        nfkd: "\u{1103}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B3C2}",
-        nfc: "\u{B3C2}",
-        nfd: "\u{1103}\u{1168}\u{11C1}",
-        nfkc: "\u{B3C2}",
-        nfkd: "\u{1103}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B3C3}",
-        nfc: "\u{B3C3}",
-        nfd: "\u{1103}\u{1168}\u{11C2}",
-        nfkc: "\u{B3C3}",
-        nfkd: "\u{1103}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B3C4}",
-        nfc: "\u{B3C4}",
-        nfd: "\u{1103}\u{1169}",
-        nfkc: "\u{B3C4}",
-        nfkd: "\u{1103}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{B3C5}",
-        nfc: "\u{B3C5}",
-        nfd: "\u{1103}\u{1169}\u{11A8}",
-        nfkc: "\u{B3C5}",
-        nfkd: "\u{1103}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B3C6}",
-        nfc: "\u{B3C6}",
-        nfd: "\u{1103}\u{1169}\u{11A9}",
-        nfkc: "\u{B3C6}",
-        nfkd: "\u{1103}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B3C7}",
-        nfc: "\u{B3C7}",
-        nfd: "\u{1103}\u{1169}\u{11AA}",
-        nfkc: "\u{B3C7}",
-        nfkd: "\u{1103}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B3C8}",
-        nfc: "\u{B3C8}",
-        nfd: "\u{1103}\u{1169}\u{11AB}",
-        nfkc: "\u{B3C8}",
-        nfkd: "\u{1103}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B3C9}",
-        nfc: "\u{B3C9}",
-        nfd: "\u{1103}\u{1169}\u{11AC}",
-        nfkc: "\u{B3C9}",
-        nfkd: "\u{1103}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B3CA}",
-        nfc: "\u{B3CA}",
-        nfd: "\u{1103}\u{1169}\u{11AD}",
-        nfkc: "\u{B3CA}",
-        nfkd: "\u{1103}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B3CB}",
-        nfc: "\u{B3CB}",
-        nfd: "\u{1103}\u{1169}\u{11AE}",
-        nfkc: "\u{B3CB}",
-        nfkd: "\u{1103}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B3CC}",
-        nfc: "\u{B3CC}",
-        nfd: "\u{1103}\u{1169}\u{11AF}",
-        nfkc: "\u{B3CC}",
-        nfkd: "\u{1103}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B3CD}",
-        nfc: "\u{B3CD}",
-        nfd: "\u{1103}\u{1169}\u{11B0}",
-        nfkc: "\u{B3CD}",
-        nfkd: "\u{1103}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B3CE}",
-        nfc: "\u{B3CE}",
-        nfd: "\u{1103}\u{1169}\u{11B1}",
-        nfkc: "\u{B3CE}",
-        nfkd: "\u{1103}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B3CF}",
-        nfc: "\u{B3CF}",
-        nfd: "\u{1103}\u{1169}\u{11B2}",
-        nfkc: "\u{B3CF}",
-        nfkd: "\u{1103}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B3D0}",
-        nfc: "\u{B3D0}",
-        nfd: "\u{1103}\u{1169}\u{11B3}",
-        nfkc: "\u{B3D0}",
-        nfkd: "\u{1103}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B3D1}",
-        nfc: "\u{B3D1}",
-        nfd: "\u{1103}\u{1169}\u{11B4}",
-        nfkc: "\u{B3D1}",
-        nfkd: "\u{1103}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B3D2}",
-        nfc: "\u{B3D2}",
-        nfd: "\u{1103}\u{1169}\u{11B5}",
-        nfkc: "\u{B3D2}",
-        nfkd: "\u{1103}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B3D3}",
-        nfc: "\u{B3D3}",
-        nfd: "\u{1103}\u{1169}\u{11B6}",
-        nfkc: "\u{B3D3}",
-        nfkd: "\u{1103}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B3D4}",
-        nfc: "\u{B3D4}",
-        nfd: "\u{1103}\u{1169}\u{11B7}",
-        nfkc: "\u{B3D4}",
-        nfkd: "\u{1103}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B3D5}",
-        nfc: "\u{B3D5}",
-        nfd: "\u{1103}\u{1169}\u{11B8}",
-        nfkc: "\u{B3D5}",
-        nfkd: "\u{1103}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B3D6}",
-        nfc: "\u{B3D6}",
-        nfd: "\u{1103}\u{1169}\u{11B9}",
-        nfkc: "\u{B3D6}",
-        nfkd: "\u{1103}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B3D7}",
-        nfc: "\u{B3D7}",
-        nfd: "\u{1103}\u{1169}\u{11BA}",
-        nfkc: "\u{B3D7}",
-        nfkd: "\u{1103}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B3D8}",
-        nfc: "\u{B3D8}",
-        nfd: "\u{1103}\u{1169}\u{11BB}",
-        nfkc: "\u{B3D8}",
-        nfkd: "\u{1103}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B3D9}",
-        nfc: "\u{B3D9}",
-        nfd: "\u{1103}\u{1169}\u{11BC}",
-        nfkc: "\u{B3D9}",
-        nfkd: "\u{1103}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B3DA}",
-        nfc: "\u{B3DA}",
-        nfd: "\u{1103}\u{1169}\u{11BD}",
-        nfkc: "\u{B3DA}",
-        nfkd: "\u{1103}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B3DB}",
-        nfc: "\u{B3DB}",
-        nfd: "\u{1103}\u{1169}\u{11BE}",
-        nfkc: "\u{B3DB}",
-        nfkd: "\u{1103}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B3DC}",
-        nfc: "\u{B3DC}",
-        nfd: "\u{1103}\u{1169}\u{11BF}",
-        nfkc: "\u{B3DC}",
-        nfkd: "\u{1103}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B3DD}",
-        nfc: "\u{B3DD}",
-        nfd: "\u{1103}\u{1169}\u{11C0}",
-        nfkc: "\u{B3DD}",
-        nfkd: "\u{1103}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B3DE}",
-        nfc: "\u{B3DE}",
-        nfd: "\u{1103}\u{1169}\u{11C1}",
-        nfkc: "\u{B3DE}",
-        nfkd: "\u{1103}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B3DF}",
-        nfc: "\u{B3DF}",
-        nfd: "\u{1103}\u{1169}\u{11C2}",
-        nfkc: "\u{B3DF}",
-        nfkd: "\u{1103}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B3E0}",
-        nfc: "\u{B3E0}",
-        nfd: "\u{1103}\u{116A}",
-        nfkc: "\u{B3E0}",
-        nfkd: "\u{1103}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{B3E1}",
-        nfc: "\u{B3E1}",
-        nfd: "\u{1103}\u{116A}\u{11A8}",
-        nfkc: "\u{B3E1}",
-        nfkd: "\u{1103}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B3E2}",
-        nfc: "\u{B3E2}",
-        nfd: "\u{1103}\u{116A}\u{11A9}",
-        nfkc: "\u{B3E2}",
-        nfkd: "\u{1103}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B3E3}",
-        nfc: "\u{B3E3}",
-        nfd: "\u{1103}\u{116A}\u{11AA}",
-        nfkc: "\u{B3E3}",
-        nfkd: "\u{1103}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B3E4}",
-        nfc: "\u{B3E4}",
-        nfd: "\u{1103}\u{116A}\u{11AB}",
-        nfkc: "\u{B3E4}",
-        nfkd: "\u{1103}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B3E5}",
-        nfc: "\u{B3E5}",
-        nfd: "\u{1103}\u{116A}\u{11AC}",
-        nfkc: "\u{B3E5}",
-        nfkd: "\u{1103}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B3E6}",
-        nfc: "\u{B3E6}",
-        nfd: "\u{1103}\u{116A}\u{11AD}",
-        nfkc: "\u{B3E6}",
-        nfkd: "\u{1103}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B3E7}",
-        nfc: "\u{B3E7}",
-        nfd: "\u{1103}\u{116A}\u{11AE}",
-        nfkc: "\u{B3E7}",
-        nfkd: "\u{1103}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B3E8}",
-        nfc: "\u{B3E8}",
-        nfd: "\u{1103}\u{116A}\u{11AF}",
-        nfkc: "\u{B3E8}",
-        nfkd: "\u{1103}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B3E9}",
-        nfc: "\u{B3E9}",
-        nfd: "\u{1103}\u{116A}\u{11B0}",
-        nfkc: "\u{B3E9}",
-        nfkd: "\u{1103}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B3EA}",
-        nfc: "\u{B3EA}",
-        nfd: "\u{1103}\u{116A}\u{11B1}",
-        nfkc: "\u{B3EA}",
-        nfkd: "\u{1103}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B3EB}",
-        nfc: "\u{B3EB}",
-        nfd: "\u{1103}\u{116A}\u{11B2}",
-        nfkc: "\u{B3EB}",
-        nfkd: "\u{1103}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B3EC}",
-        nfc: "\u{B3EC}",
-        nfd: "\u{1103}\u{116A}\u{11B3}",
-        nfkc: "\u{B3EC}",
-        nfkd: "\u{1103}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B3ED}",
-        nfc: "\u{B3ED}",
-        nfd: "\u{1103}\u{116A}\u{11B4}",
-        nfkc: "\u{B3ED}",
-        nfkd: "\u{1103}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B3EE}",
-        nfc: "\u{B3EE}",
-        nfd: "\u{1103}\u{116A}\u{11B5}",
-        nfkc: "\u{B3EE}",
-        nfkd: "\u{1103}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B3EF}",
-        nfc: "\u{B3EF}",
-        nfd: "\u{1103}\u{116A}\u{11B6}",
-        nfkc: "\u{B3EF}",
-        nfkd: "\u{1103}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B3F0}",
-        nfc: "\u{B3F0}",
-        nfd: "\u{1103}\u{116A}\u{11B7}",
-        nfkc: "\u{B3F0}",
-        nfkd: "\u{1103}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B3F1}",
-        nfc: "\u{B3F1}",
-        nfd: "\u{1103}\u{116A}\u{11B8}",
-        nfkc: "\u{B3F1}",
-        nfkd: "\u{1103}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B3F2}",
-        nfc: "\u{B3F2}",
-        nfd: "\u{1103}\u{116A}\u{11B9}",
-        nfkc: "\u{B3F2}",
-        nfkd: "\u{1103}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B3F3}",
-        nfc: "\u{B3F3}",
-        nfd: "\u{1103}\u{116A}\u{11BA}",
-        nfkc: "\u{B3F3}",
-        nfkd: "\u{1103}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B3F4}",
-        nfc: "\u{B3F4}",
-        nfd: "\u{1103}\u{116A}\u{11BB}",
-        nfkc: "\u{B3F4}",
-        nfkd: "\u{1103}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B3F5}",
-        nfc: "\u{B3F5}",
-        nfd: "\u{1103}\u{116A}\u{11BC}",
-        nfkc: "\u{B3F5}",
-        nfkd: "\u{1103}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B3F6}",
-        nfc: "\u{B3F6}",
-        nfd: "\u{1103}\u{116A}\u{11BD}",
-        nfkc: "\u{B3F6}",
-        nfkd: "\u{1103}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B3F7}",
-        nfc: "\u{B3F7}",
-        nfd: "\u{1103}\u{116A}\u{11BE}",
-        nfkc: "\u{B3F7}",
-        nfkd: "\u{1103}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B3F8}",
-        nfc: "\u{B3F8}",
-        nfd: "\u{1103}\u{116A}\u{11BF}",
-        nfkc: "\u{B3F8}",
-        nfkd: "\u{1103}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B3F9}",
-        nfc: "\u{B3F9}",
-        nfd: "\u{1103}\u{116A}\u{11C0}",
-        nfkc: "\u{B3F9}",
-        nfkd: "\u{1103}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B3FA}",
-        nfc: "\u{B3FA}",
-        nfd: "\u{1103}\u{116A}\u{11C1}",
-        nfkc: "\u{B3FA}",
-        nfkd: "\u{1103}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B3FB}",
-        nfc: "\u{B3FB}",
-        nfd: "\u{1103}\u{116A}\u{11C2}",
-        nfkc: "\u{B3FB}",
-        nfkd: "\u{1103}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B3FC}",
-        nfc: "\u{B3FC}",
-        nfd: "\u{1103}\u{116B}",
-        nfkc: "\u{B3FC}",
-        nfkd: "\u{1103}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{B3FD}",
-        nfc: "\u{B3FD}",
-        nfd: "\u{1103}\u{116B}\u{11A8}",
-        nfkc: "\u{B3FD}",
-        nfkd: "\u{1103}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B3FE}",
-        nfc: "\u{B3FE}",
-        nfd: "\u{1103}\u{116B}\u{11A9}",
-        nfkc: "\u{B3FE}",
-        nfkd: "\u{1103}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B3FF}",
-        nfc: "\u{B3FF}",
-        nfd: "\u{1103}\u{116B}\u{11AA}",
-        nfkc: "\u{B3FF}",
-        nfkd: "\u{1103}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B400}",
-        nfc: "\u{B400}",
-        nfd: "\u{1103}\u{116B}\u{11AB}",
-        nfkc: "\u{B400}",
-        nfkd: "\u{1103}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B401}",
-        nfc: "\u{B401}",
-        nfd: "\u{1103}\u{116B}\u{11AC}",
-        nfkc: "\u{B401}",
-        nfkd: "\u{1103}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B402}",
-        nfc: "\u{B402}",
-        nfd: "\u{1103}\u{116B}\u{11AD}",
-        nfkc: "\u{B402}",
-        nfkd: "\u{1103}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B403}",
-        nfc: "\u{B403}",
-        nfd: "\u{1103}\u{116B}\u{11AE}",
-        nfkc: "\u{B403}",
-        nfkd: "\u{1103}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B404}",
-        nfc: "\u{B404}",
-        nfd: "\u{1103}\u{116B}\u{11AF}",
-        nfkc: "\u{B404}",
-        nfkd: "\u{1103}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B405}",
-        nfc: "\u{B405}",
-        nfd: "\u{1103}\u{116B}\u{11B0}",
-        nfkc: "\u{B405}",
-        nfkd: "\u{1103}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B406}",
-        nfc: "\u{B406}",
-        nfd: "\u{1103}\u{116B}\u{11B1}",
-        nfkc: "\u{B406}",
-        nfkd: "\u{1103}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B407}",
-        nfc: "\u{B407}",
-        nfd: "\u{1103}\u{116B}\u{11B2}",
-        nfkc: "\u{B407}",
-        nfkd: "\u{1103}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B408}",
-        nfc: "\u{B408}",
-        nfd: "\u{1103}\u{116B}\u{11B3}",
-        nfkc: "\u{B408}",
-        nfkd: "\u{1103}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B409}",
-        nfc: "\u{B409}",
-        nfd: "\u{1103}\u{116B}\u{11B4}",
-        nfkc: "\u{B409}",
-        nfkd: "\u{1103}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B40A}",
-        nfc: "\u{B40A}",
-        nfd: "\u{1103}\u{116B}\u{11B5}",
-        nfkc: "\u{B40A}",
-        nfkd: "\u{1103}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B40B}",
-        nfc: "\u{B40B}",
-        nfd: "\u{1103}\u{116B}\u{11B6}",
-        nfkc: "\u{B40B}",
-        nfkd: "\u{1103}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B40C}",
-        nfc: "\u{B40C}",
-        nfd: "\u{1103}\u{116B}\u{11B7}",
-        nfkc: "\u{B40C}",
-        nfkd: "\u{1103}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B40D}",
-        nfc: "\u{B40D}",
-        nfd: "\u{1103}\u{116B}\u{11B8}",
-        nfkc: "\u{B40D}",
-        nfkd: "\u{1103}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B40E}",
-        nfc: "\u{B40E}",
-        nfd: "\u{1103}\u{116B}\u{11B9}",
-        nfkc: "\u{B40E}",
-        nfkd: "\u{1103}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B40F}",
-        nfc: "\u{B40F}",
-        nfd: "\u{1103}\u{116B}\u{11BA}",
-        nfkc: "\u{B40F}",
-        nfkd: "\u{1103}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B410}",
-        nfc: "\u{B410}",
-        nfd: "\u{1103}\u{116B}\u{11BB}",
-        nfkc: "\u{B410}",
-        nfkd: "\u{1103}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B411}",
-        nfc: "\u{B411}",
-        nfd: "\u{1103}\u{116B}\u{11BC}",
-        nfkc: "\u{B411}",
-        nfkd: "\u{1103}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B412}",
-        nfc: "\u{B412}",
-        nfd: "\u{1103}\u{116B}\u{11BD}",
-        nfkc: "\u{B412}",
-        nfkd: "\u{1103}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B413}",
-        nfc: "\u{B413}",
-        nfd: "\u{1103}\u{116B}\u{11BE}",
-        nfkc: "\u{B413}",
-        nfkd: "\u{1103}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B414}",
-        nfc: "\u{B414}",
-        nfd: "\u{1103}\u{116B}\u{11BF}",
-        nfkc: "\u{B414}",
-        nfkd: "\u{1103}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B415}",
-        nfc: "\u{B415}",
-        nfd: "\u{1103}\u{116B}\u{11C0}",
-        nfkc: "\u{B415}",
-        nfkd: "\u{1103}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B416}",
-        nfc: "\u{B416}",
-        nfd: "\u{1103}\u{116B}\u{11C1}",
-        nfkc: "\u{B416}",
-        nfkd: "\u{1103}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B417}",
-        nfc: "\u{B417}",
-        nfd: "\u{1103}\u{116B}\u{11C2}",
-        nfkc: "\u{B417}",
-        nfkd: "\u{1103}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B418}",
-        nfc: "\u{B418}",
-        nfd: "\u{1103}\u{116C}",
-        nfkc: "\u{B418}",
-        nfkd: "\u{1103}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{B419}",
-        nfc: "\u{B419}",
-        nfd: "\u{1103}\u{116C}\u{11A8}",
-        nfkc: "\u{B419}",
-        nfkd: "\u{1103}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B41A}",
-        nfc: "\u{B41A}",
-        nfd: "\u{1103}\u{116C}\u{11A9}",
-        nfkc: "\u{B41A}",
-        nfkd: "\u{1103}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B41B}",
-        nfc: "\u{B41B}",
-        nfd: "\u{1103}\u{116C}\u{11AA}",
-        nfkc: "\u{B41B}",
-        nfkd: "\u{1103}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B41C}",
-        nfc: "\u{B41C}",
-        nfd: "\u{1103}\u{116C}\u{11AB}",
-        nfkc: "\u{B41C}",
-        nfkd: "\u{1103}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B41D}",
-        nfc: "\u{B41D}",
-        nfd: "\u{1103}\u{116C}\u{11AC}",
-        nfkc: "\u{B41D}",
-        nfkd: "\u{1103}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B41E}",
-        nfc: "\u{B41E}",
-        nfd: "\u{1103}\u{116C}\u{11AD}",
-        nfkc: "\u{B41E}",
-        nfkd: "\u{1103}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B41F}",
-        nfc: "\u{B41F}",
-        nfd: "\u{1103}\u{116C}\u{11AE}",
-        nfkc: "\u{B41F}",
-        nfkd: "\u{1103}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B420}",
-        nfc: "\u{B420}",
-        nfd: "\u{1103}\u{116C}\u{11AF}",
-        nfkc: "\u{B420}",
-        nfkd: "\u{1103}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B421}",
-        nfc: "\u{B421}",
-        nfd: "\u{1103}\u{116C}\u{11B0}",
-        nfkc: "\u{B421}",
-        nfkd: "\u{1103}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B422}",
-        nfc: "\u{B422}",
-        nfd: "\u{1103}\u{116C}\u{11B1}",
-        nfkc: "\u{B422}",
-        nfkd: "\u{1103}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B423}",
-        nfc: "\u{B423}",
-        nfd: "\u{1103}\u{116C}\u{11B2}",
-        nfkc: "\u{B423}",
-        nfkd: "\u{1103}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B424}",
-        nfc: "\u{B424}",
-        nfd: "\u{1103}\u{116C}\u{11B3}",
-        nfkc: "\u{B424}",
-        nfkd: "\u{1103}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B425}",
-        nfc: "\u{B425}",
-        nfd: "\u{1103}\u{116C}\u{11B4}",
-        nfkc: "\u{B425}",
-        nfkd: "\u{1103}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B426}",
-        nfc: "\u{B426}",
-        nfd: "\u{1103}\u{116C}\u{11B5}",
-        nfkc: "\u{B426}",
-        nfkd: "\u{1103}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B427}",
-        nfc: "\u{B427}",
-        nfd: "\u{1103}\u{116C}\u{11B6}",
-        nfkc: "\u{B427}",
-        nfkd: "\u{1103}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B428}",
-        nfc: "\u{B428}",
-        nfd: "\u{1103}\u{116C}\u{11B7}",
-        nfkc: "\u{B428}",
-        nfkd: "\u{1103}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B429}",
-        nfc: "\u{B429}",
-        nfd: "\u{1103}\u{116C}\u{11B8}",
-        nfkc: "\u{B429}",
-        nfkd: "\u{1103}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B42A}",
-        nfc: "\u{B42A}",
-        nfd: "\u{1103}\u{116C}\u{11B9}",
-        nfkc: "\u{B42A}",
-        nfkd: "\u{1103}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B42B}",
-        nfc: "\u{B42B}",
-        nfd: "\u{1103}\u{116C}\u{11BA}",
-        nfkc: "\u{B42B}",
-        nfkd: "\u{1103}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B42C}",
-        nfc: "\u{B42C}",
-        nfd: "\u{1103}\u{116C}\u{11BB}",
-        nfkc: "\u{B42C}",
-        nfkd: "\u{1103}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B42D}",
-        nfc: "\u{B42D}",
-        nfd: "\u{1103}\u{116C}\u{11BC}",
-        nfkc: "\u{B42D}",
-        nfkd: "\u{1103}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B42E}",
-        nfc: "\u{B42E}",
-        nfd: "\u{1103}\u{116C}\u{11BD}",
-        nfkc: "\u{B42E}",
-        nfkd: "\u{1103}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B42F}",
-        nfc: "\u{B42F}",
-        nfd: "\u{1103}\u{116C}\u{11BE}",
-        nfkc: "\u{B42F}",
-        nfkd: "\u{1103}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B430}",
-        nfc: "\u{B430}",
-        nfd: "\u{1103}\u{116C}\u{11BF}",
-        nfkc: "\u{B430}",
-        nfkd: "\u{1103}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B431}",
-        nfc: "\u{B431}",
-        nfd: "\u{1103}\u{116C}\u{11C0}",
-        nfkc: "\u{B431}",
-        nfkd: "\u{1103}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B432}",
-        nfc: "\u{B432}",
-        nfd: "\u{1103}\u{116C}\u{11C1}",
-        nfkc: "\u{B432}",
-        nfkd: "\u{1103}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B433}",
-        nfc: "\u{B433}",
-        nfd: "\u{1103}\u{116C}\u{11C2}",
-        nfkc: "\u{B433}",
-        nfkd: "\u{1103}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B434}",
-        nfc: "\u{B434}",
-        nfd: "\u{1103}\u{116D}",
-        nfkc: "\u{B434}",
-        nfkd: "\u{1103}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{B435}",
-        nfc: "\u{B435}",
-        nfd: "\u{1103}\u{116D}\u{11A8}",
-        nfkc: "\u{B435}",
-        nfkd: "\u{1103}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B436}",
-        nfc: "\u{B436}",
-        nfd: "\u{1103}\u{116D}\u{11A9}",
-        nfkc: "\u{B436}",
-        nfkd: "\u{1103}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B437}",
-        nfc: "\u{B437}",
-        nfd: "\u{1103}\u{116D}\u{11AA}",
-        nfkc: "\u{B437}",
-        nfkd: "\u{1103}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B438}",
-        nfc: "\u{B438}",
-        nfd: "\u{1103}\u{116D}\u{11AB}",
-        nfkc: "\u{B438}",
-        nfkd: "\u{1103}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B439}",
-        nfc: "\u{B439}",
-        nfd: "\u{1103}\u{116D}\u{11AC}",
-        nfkc: "\u{B439}",
-        nfkd: "\u{1103}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B43A}",
-        nfc: "\u{B43A}",
-        nfd: "\u{1103}\u{116D}\u{11AD}",
-        nfkc: "\u{B43A}",
-        nfkd: "\u{1103}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B43B}",
-        nfc: "\u{B43B}",
-        nfd: "\u{1103}\u{116D}\u{11AE}",
-        nfkc: "\u{B43B}",
-        nfkd: "\u{1103}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B43C}",
-        nfc: "\u{B43C}",
-        nfd: "\u{1103}\u{116D}\u{11AF}",
-        nfkc: "\u{B43C}",
-        nfkd: "\u{1103}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B43D}",
-        nfc: "\u{B43D}",
-        nfd: "\u{1103}\u{116D}\u{11B0}",
-        nfkc: "\u{B43D}",
-        nfkd: "\u{1103}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B43E}",
-        nfc: "\u{B43E}",
-        nfd: "\u{1103}\u{116D}\u{11B1}",
-        nfkc: "\u{B43E}",
-        nfkd: "\u{1103}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B43F}",
-        nfc: "\u{B43F}",
-        nfd: "\u{1103}\u{116D}\u{11B2}",
-        nfkc: "\u{B43F}",
-        nfkd: "\u{1103}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B440}",
-        nfc: "\u{B440}",
-        nfd: "\u{1103}\u{116D}\u{11B3}",
-        nfkc: "\u{B440}",
-        nfkd: "\u{1103}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B441}",
-        nfc: "\u{B441}",
-        nfd: "\u{1103}\u{116D}\u{11B4}",
-        nfkc: "\u{B441}",
-        nfkd: "\u{1103}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B442}",
-        nfc: "\u{B442}",
-        nfd: "\u{1103}\u{116D}\u{11B5}",
-        nfkc: "\u{B442}",
-        nfkd: "\u{1103}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B443}",
-        nfc: "\u{B443}",
-        nfd: "\u{1103}\u{116D}\u{11B6}",
-        nfkc: "\u{B443}",
-        nfkd: "\u{1103}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B444}",
-        nfc: "\u{B444}",
-        nfd: "\u{1103}\u{116D}\u{11B7}",
-        nfkc: "\u{B444}",
-        nfkd: "\u{1103}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B445}",
-        nfc: "\u{B445}",
-        nfd: "\u{1103}\u{116D}\u{11B8}",
-        nfkc: "\u{B445}",
-        nfkd: "\u{1103}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B446}",
-        nfc: "\u{B446}",
-        nfd: "\u{1103}\u{116D}\u{11B9}",
-        nfkc: "\u{B446}",
-        nfkd: "\u{1103}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B447}",
-        nfc: "\u{B447}",
-        nfd: "\u{1103}\u{116D}\u{11BA}",
-        nfkc: "\u{B447}",
-        nfkd: "\u{1103}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B448}",
-        nfc: "\u{B448}",
-        nfd: "\u{1103}\u{116D}\u{11BB}",
-        nfkc: "\u{B448}",
-        nfkd: "\u{1103}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B449}",
-        nfc: "\u{B449}",
-        nfd: "\u{1103}\u{116D}\u{11BC}",
-        nfkc: "\u{B449}",
-        nfkd: "\u{1103}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B44A}",
-        nfc: "\u{B44A}",
-        nfd: "\u{1103}\u{116D}\u{11BD}",
-        nfkc: "\u{B44A}",
-        nfkd: "\u{1103}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B44B}",
-        nfc: "\u{B44B}",
-        nfd: "\u{1103}\u{116D}\u{11BE}",
-        nfkc: "\u{B44B}",
-        nfkd: "\u{1103}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B44C}",
-        nfc: "\u{B44C}",
-        nfd: "\u{1103}\u{116D}\u{11BF}",
-        nfkc: "\u{B44C}",
-        nfkd: "\u{1103}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B44D}",
-        nfc: "\u{B44D}",
-        nfd: "\u{1103}\u{116D}\u{11C0}",
-        nfkc: "\u{B44D}",
-        nfkd: "\u{1103}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B44E}",
-        nfc: "\u{B44E}",
-        nfd: "\u{1103}\u{116D}\u{11C1}",
-        nfkc: "\u{B44E}",
-        nfkd: "\u{1103}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B44F}",
-        nfc: "\u{B44F}",
-        nfd: "\u{1103}\u{116D}\u{11C2}",
-        nfkc: "\u{B44F}",
-        nfkd: "\u{1103}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B450}",
-        nfc: "\u{B450}",
-        nfd: "\u{1103}\u{116E}",
-        nfkc: "\u{B450}",
-        nfkd: "\u{1103}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{B451}",
-        nfc: "\u{B451}",
-        nfd: "\u{1103}\u{116E}\u{11A8}",
-        nfkc: "\u{B451}",
-        nfkd: "\u{1103}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B452}",
-        nfc: "\u{B452}",
-        nfd: "\u{1103}\u{116E}\u{11A9}",
-        nfkc: "\u{B452}",
-        nfkd: "\u{1103}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B453}",
-        nfc: "\u{B453}",
-        nfd: "\u{1103}\u{116E}\u{11AA}",
-        nfkc: "\u{B453}",
-        nfkd: "\u{1103}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B454}",
-        nfc: "\u{B454}",
-        nfd: "\u{1103}\u{116E}\u{11AB}",
-        nfkc: "\u{B454}",
-        nfkd: "\u{1103}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B455}",
-        nfc: "\u{B455}",
-        nfd: "\u{1103}\u{116E}\u{11AC}",
-        nfkc: "\u{B455}",
-        nfkd: "\u{1103}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B456}",
-        nfc: "\u{B456}",
-        nfd: "\u{1103}\u{116E}\u{11AD}",
-        nfkc: "\u{B456}",
-        nfkd: "\u{1103}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B457}",
-        nfc: "\u{B457}",
-        nfd: "\u{1103}\u{116E}\u{11AE}",
-        nfkc: "\u{B457}",
-        nfkd: "\u{1103}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B458}",
-        nfc: "\u{B458}",
-        nfd: "\u{1103}\u{116E}\u{11AF}",
-        nfkc: "\u{B458}",
-        nfkd: "\u{1103}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B459}",
-        nfc: "\u{B459}",
-        nfd: "\u{1103}\u{116E}\u{11B0}",
-        nfkc: "\u{B459}",
-        nfkd: "\u{1103}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B45A}",
-        nfc: "\u{B45A}",
-        nfd: "\u{1103}\u{116E}\u{11B1}",
-        nfkc: "\u{B45A}",
-        nfkd: "\u{1103}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B45B}",
-        nfc: "\u{B45B}",
-        nfd: "\u{1103}\u{116E}\u{11B2}",
-        nfkc: "\u{B45B}",
-        nfkd: "\u{1103}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B45C}",
-        nfc: "\u{B45C}",
-        nfd: "\u{1103}\u{116E}\u{11B3}",
-        nfkc: "\u{B45C}",
-        nfkd: "\u{1103}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B45D}",
-        nfc: "\u{B45D}",
-        nfd: "\u{1103}\u{116E}\u{11B4}",
-        nfkc: "\u{B45D}",
-        nfkd: "\u{1103}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B45E}",
-        nfc: "\u{B45E}",
-        nfd: "\u{1103}\u{116E}\u{11B5}",
-        nfkc: "\u{B45E}",
-        nfkd: "\u{1103}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B45F}",
-        nfc: "\u{B45F}",
-        nfd: "\u{1103}\u{116E}\u{11B6}",
-        nfkc: "\u{B45F}",
-        nfkd: "\u{1103}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B460}",
-        nfc: "\u{B460}",
-        nfd: "\u{1103}\u{116E}\u{11B7}",
-        nfkc: "\u{B460}",
-        nfkd: "\u{1103}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B461}",
-        nfc: "\u{B461}",
-        nfd: "\u{1103}\u{116E}\u{11B8}",
-        nfkc: "\u{B461}",
-        nfkd: "\u{1103}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B462}",
-        nfc: "\u{B462}",
-        nfd: "\u{1103}\u{116E}\u{11B9}",
-        nfkc: "\u{B462}",
-        nfkd: "\u{1103}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B463}",
-        nfc: "\u{B463}",
-        nfd: "\u{1103}\u{116E}\u{11BA}",
-        nfkc: "\u{B463}",
-        nfkd: "\u{1103}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B464}",
-        nfc: "\u{B464}",
-        nfd: "\u{1103}\u{116E}\u{11BB}",
-        nfkc: "\u{B464}",
-        nfkd: "\u{1103}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B465}",
-        nfc: "\u{B465}",
-        nfd: "\u{1103}\u{116E}\u{11BC}",
-        nfkc: "\u{B465}",
-        nfkd: "\u{1103}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B466}",
-        nfc: "\u{B466}",
-        nfd: "\u{1103}\u{116E}\u{11BD}",
-        nfkc: "\u{B466}",
-        nfkd: "\u{1103}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B467}",
-        nfc: "\u{B467}",
-        nfd: "\u{1103}\u{116E}\u{11BE}",
-        nfkc: "\u{B467}",
-        nfkd: "\u{1103}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B468}",
-        nfc: "\u{B468}",
-        nfd: "\u{1103}\u{116E}\u{11BF}",
-        nfkc: "\u{B468}",
-        nfkd: "\u{1103}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B469}",
-        nfc: "\u{B469}",
-        nfd: "\u{1103}\u{116E}\u{11C0}",
-        nfkc: "\u{B469}",
-        nfkd: "\u{1103}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B46A}",
-        nfc: "\u{B46A}",
-        nfd: "\u{1103}\u{116E}\u{11C1}",
-        nfkc: "\u{B46A}",
-        nfkd: "\u{1103}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B46B}",
-        nfc: "\u{B46B}",
-        nfd: "\u{1103}\u{116E}\u{11C2}",
-        nfkc: "\u{B46B}",
-        nfkd: "\u{1103}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B46C}",
-        nfc: "\u{B46C}",
-        nfd: "\u{1103}\u{116F}",
-        nfkc: "\u{B46C}",
-        nfkd: "\u{1103}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{B46D}",
-        nfc: "\u{B46D}",
-        nfd: "\u{1103}\u{116F}\u{11A8}",
-        nfkc: "\u{B46D}",
-        nfkd: "\u{1103}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B46E}",
-        nfc: "\u{B46E}",
-        nfd: "\u{1103}\u{116F}\u{11A9}",
-        nfkc: "\u{B46E}",
-        nfkd: "\u{1103}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B46F}",
-        nfc: "\u{B46F}",
-        nfd: "\u{1103}\u{116F}\u{11AA}",
-        nfkc: "\u{B46F}",
-        nfkd: "\u{1103}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B470}",
-        nfc: "\u{B470}",
-        nfd: "\u{1103}\u{116F}\u{11AB}",
-        nfkc: "\u{B470}",
-        nfkd: "\u{1103}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B471}",
-        nfc: "\u{B471}",
-        nfd: "\u{1103}\u{116F}\u{11AC}",
-        nfkc: "\u{B471}",
-        nfkd: "\u{1103}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B472}",
-        nfc: "\u{B472}",
-        nfd: "\u{1103}\u{116F}\u{11AD}",
-        nfkc: "\u{B472}",
-        nfkd: "\u{1103}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B473}",
-        nfc: "\u{B473}",
-        nfd: "\u{1103}\u{116F}\u{11AE}",
-        nfkc: "\u{B473}",
-        nfkd: "\u{1103}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B474}",
-        nfc: "\u{B474}",
-        nfd: "\u{1103}\u{116F}\u{11AF}",
-        nfkc: "\u{B474}",
-        nfkd: "\u{1103}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B475}",
-        nfc: "\u{B475}",
-        nfd: "\u{1103}\u{116F}\u{11B0}",
-        nfkc: "\u{B475}",
-        nfkd: "\u{1103}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B476}",
-        nfc: "\u{B476}",
-        nfd: "\u{1103}\u{116F}\u{11B1}",
-        nfkc: "\u{B476}",
-        nfkd: "\u{1103}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B477}",
-        nfc: "\u{B477}",
-        nfd: "\u{1103}\u{116F}\u{11B2}",
-        nfkc: "\u{B477}",
-        nfkd: "\u{1103}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B478}",
-        nfc: "\u{B478}",
-        nfd: "\u{1103}\u{116F}\u{11B3}",
-        nfkc: "\u{B478}",
-        nfkd: "\u{1103}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B479}",
-        nfc: "\u{B479}",
-        nfd: "\u{1103}\u{116F}\u{11B4}",
-        nfkc: "\u{B479}",
-        nfkd: "\u{1103}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B47A}",
-        nfc: "\u{B47A}",
-        nfd: "\u{1103}\u{116F}\u{11B5}",
-        nfkc: "\u{B47A}",
-        nfkd: "\u{1103}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B47B}",
-        nfc: "\u{B47B}",
-        nfd: "\u{1103}\u{116F}\u{11B6}",
-        nfkc: "\u{B47B}",
-        nfkd: "\u{1103}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B47C}",
-        nfc: "\u{B47C}",
-        nfd: "\u{1103}\u{116F}\u{11B7}",
-        nfkc: "\u{B47C}",
-        nfkd: "\u{1103}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B47D}",
-        nfc: "\u{B47D}",
-        nfd: "\u{1103}\u{116F}\u{11B8}",
-        nfkc: "\u{B47D}",
-        nfkd: "\u{1103}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B47E}",
-        nfc: "\u{B47E}",
-        nfd: "\u{1103}\u{116F}\u{11B9}",
-        nfkc: "\u{B47E}",
-        nfkd: "\u{1103}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B47F}",
-        nfc: "\u{B47F}",
-        nfd: "\u{1103}\u{116F}\u{11BA}",
-        nfkc: "\u{B47F}",
-        nfkd: "\u{1103}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B480}",
-        nfc: "\u{B480}",
-        nfd: "\u{1103}\u{116F}\u{11BB}",
-        nfkc: "\u{B480}",
-        nfkd: "\u{1103}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B481}",
-        nfc: "\u{B481}",
-        nfd: "\u{1103}\u{116F}\u{11BC}",
-        nfkc: "\u{B481}",
-        nfkd: "\u{1103}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B482}",
-        nfc: "\u{B482}",
-        nfd: "\u{1103}\u{116F}\u{11BD}",
-        nfkc: "\u{B482}",
-        nfkd: "\u{1103}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B483}",
-        nfc: "\u{B483}",
-        nfd: "\u{1103}\u{116F}\u{11BE}",
-        nfkc: "\u{B483}",
-        nfkd: "\u{1103}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B484}",
-        nfc: "\u{B484}",
-        nfd: "\u{1103}\u{116F}\u{11BF}",
-        nfkc: "\u{B484}",
-        nfkd: "\u{1103}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B485}",
-        nfc: "\u{B485}",
-        nfd: "\u{1103}\u{116F}\u{11C0}",
-        nfkc: "\u{B485}",
-        nfkd: "\u{1103}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B486}",
-        nfc: "\u{B486}",
-        nfd: "\u{1103}\u{116F}\u{11C1}",
-        nfkc: "\u{B486}",
-        nfkd: "\u{1103}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B487}",
-        nfc: "\u{B487}",
-        nfd: "\u{1103}\u{116F}\u{11C2}",
-        nfkc: "\u{B487}",
-        nfkd: "\u{1103}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B488}",
-        nfc: "\u{B488}",
-        nfd: "\u{1103}\u{1170}",
-        nfkc: "\u{B488}",
-        nfkd: "\u{1103}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{B489}",
-        nfc: "\u{B489}",
-        nfd: "\u{1103}\u{1170}\u{11A8}",
-        nfkc: "\u{B489}",
-        nfkd: "\u{1103}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B48A}",
-        nfc: "\u{B48A}",
-        nfd: "\u{1103}\u{1170}\u{11A9}",
-        nfkc: "\u{B48A}",
-        nfkd: "\u{1103}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B48B}",
-        nfc: "\u{B48B}",
-        nfd: "\u{1103}\u{1170}\u{11AA}",
-        nfkc: "\u{B48B}",
-        nfkd: "\u{1103}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B48C}",
-        nfc: "\u{B48C}",
-        nfd: "\u{1103}\u{1170}\u{11AB}",
-        nfkc: "\u{B48C}",
-        nfkd: "\u{1103}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B48D}",
-        nfc: "\u{B48D}",
-        nfd: "\u{1103}\u{1170}\u{11AC}",
-        nfkc: "\u{B48D}",
-        nfkd: "\u{1103}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B48E}",
-        nfc: "\u{B48E}",
-        nfd: "\u{1103}\u{1170}\u{11AD}",
-        nfkc: "\u{B48E}",
-        nfkd: "\u{1103}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B48F}",
-        nfc: "\u{B48F}",
-        nfd: "\u{1103}\u{1170}\u{11AE}",
-        nfkc: "\u{B48F}",
-        nfkd: "\u{1103}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B490}",
-        nfc: "\u{B490}",
-        nfd: "\u{1103}\u{1170}\u{11AF}",
-        nfkc: "\u{B490}",
-        nfkd: "\u{1103}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B491}",
-        nfc: "\u{B491}",
-        nfd: "\u{1103}\u{1170}\u{11B0}",
-        nfkc: "\u{B491}",
-        nfkd: "\u{1103}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B492}",
-        nfc: "\u{B492}",
-        nfd: "\u{1103}\u{1170}\u{11B1}",
-        nfkc: "\u{B492}",
-        nfkd: "\u{1103}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B493}",
-        nfc: "\u{B493}",
-        nfd: "\u{1103}\u{1170}\u{11B2}",
-        nfkc: "\u{B493}",
-        nfkd: "\u{1103}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B494}",
-        nfc: "\u{B494}",
-        nfd: "\u{1103}\u{1170}\u{11B3}",
-        nfkc: "\u{B494}",
-        nfkd: "\u{1103}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B495}",
-        nfc: "\u{B495}",
-        nfd: "\u{1103}\u{1170}\u{11B4}",
-        nfkc: "\u{B495}",
-        nfkd: "\u{1103}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B496}",
-        nfc: "\u{B496}",
-        nfd: "\u{1103}\u{1170}\u{11B5}",
-        nfkc: "\u{B496}",
-        nfkd: "\u{1103}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B497}",
-        nfc: "\u{B497}",
-        nfd: "\u{1103}\u{1170}\u{11B6}",
-        nfkc: "\u{B497}",
-        nfkd: "\u{1103}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B498}",
-        nfc: "\u{B498}",
-        nfd: "\u{1103}\u{1170}\u{11B7}",
-        nfkc: "\u{B498}",
-        nfkd: "\u{1103}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B499}",
-        nfc: "\u{B499}",
-        nfd: "\u{1103}\u{1170}\u{11B8}",
-        nfkc: "\u{B499}",
-        nfkd: "\u{1103}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B49A}",
-        nfc: "\u{B49A}",
-        nfd: "\u{1103}\u{1170}\u{11B9}",
-        nfkc: "\u{B49A}",
-        nfkd: "\u{1103}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B49B}",
-        nfc: "\u{B49B}",
-        nfd: "\u{1103}\u{1170}\u{11BA}",
-        nfkc: "\u{B49B}",
-        nfkd: "\u{1103}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B49C}",
-        nfc: "\u{B49C}",
-        nfd: "\u{1103}\u{1170}\u{11BB}",
-        nfkc: "\u{B49C}",
-        nfkd: "\u{1103}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B49D}",
-        nfc: "\u{B49D}",
-        nfd: "\u{1103}\u{1170}\u{11BC}",
-        nfkc: "\u{B49D}",
-        nfkd: "\u{1103}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B49E}",
-        nfc: "\u{B49E}",
-        nfd: "\u{1103}\u{1170}\u{11BD}",
-        nfkc: "\u{B49E}",
-        nfkd: "\u{1103}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B49F}",
-        nfc: "\u{B49F}",
-        nfd: "\u{1103}\u{1170}\u{11BE}",
-        nfkc: "\u{B49F}",
-        nfkd: "\u{1103}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B4A0}",
-        nfc: "\u{B4A0}",
-        nfd: "\u{1103}\u{1170}\u{11BF}",
-        nfkc: "\u{B4A0}",
-        nfkd: "\u{1103}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B4A1}",
-        nfc: "\u{B4A1}",
-        nfd: "\u{1103}\u{1170}\u{11C0}",
-        nfkc: "\u{B4A1}",
-        nfkd: "\u{1103}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B4A2}",
-        nfc: "\u{B4A2}",
-        nfd: "\u{1103}\u{1170}\u{11C1}",
-        nfkc: "\u{B4A2}",
-        nfkd: "\u{1103}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B4A3}",
-        nfc: "\u{B4A3}",
-        nfd: "\u{1103}\u{1170}\u{11C2}",
-        nfkc: "\u{B4A3}",
-        nfkd: "\u{1103}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B4A4}",
-        nfc: "\u{B4A4}",
-        nfd: "\u{1103}\u{1171}",
-        nfkc: "\u{B4A4}",
-        nfkd: "\u{1103}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{B4A5}",
-        nfc: "\u{B4A5}",
-        nfd: "\u{1103}\u{1171}\u{11A8}",
-        nfkc: "\u{B4A5}",
-        nfkd: "\u{1103}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B4A6}",
-        nfc: "\u{B4A6}",
-        nfd: "\u{1103}\u{1171}\u{11A9}",
-        nfkc: "\u{B4A6}",
-        nfkd: "\u{1103}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B4A7}",
-        nfc: "\u{B4A7}",
-        nfd: "\u{1103}\u{1171}\u{11AA}",
-        nfkc: "\u{B4A7}",
-        nfkd: "\u{1103}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B4A8}",
-        nfc: "\u{B4A8}",
-        nfd: "\u{1103}\u{1171}\u{11AB}",
-        nfkc: "\u{B4A8}",
-        nfkd: "\u{1103}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B4A9}",
-        nfc: "\u{B4A9}",
-        nfd: "\u{1103}\u{1171}\u{11AC}",
-        nfkc: "\u{B4A9}",
-        nfkd: "\u{1103}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B4AA}",
-        nfc: "\u{B4AA}",
-        nfd: "\u{1103}\u{1171}\u{11AD}",
-        nfkc: "\u{B4AA}",
-        nfkd: "\u{1103}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B4AB}",
-        nfc: "\u{B4AB}",
-        nfd: "\u{1103}\u{1171}\u{11AE}",
-        nfkc: "\u{B4AB}",
-        nfkd: "\u{1103}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B4AC}",
-        nfc: "\u{B4AC}",
-        nfd: "\u{1103}\u{1171}\u{11AF}",
-        nfkc: "\u{B4AC}",
-        nfkd: "\u{1103}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B4AD}",
-        nfc: "\u{B4AD}",
-        nfd: "\u{1103}\u{1171}\u{11B0}",
-        nfkc: "\u{B4AD}",
-        nfkd: "\u{1103}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B4AE}",
-        nfc: "\u{B4AE}",
-        nfd: "\u{1103}\u{1171}\u{11B1}",
-        nfkc: "\u{B4AE}",
-        nfkd: "\u{1103}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B4AF}",
-        nfc: "\u{B4AF}",
-        nfd: "\u{1103}\u{1171}\u{11B2}",
-        nfkc: "\u{B4AF}",
-        nfkd: "\u{1103}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B4B0}",
-        nfc: "\u{B4B0}",
-        nfd: "\u{1103}\u{1171}\u{11B3}",
-        nfkc: "\u{B4B0}",
-        nfkd: "\u{1103}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B4B1}",
-        nfc: "\u{B4B1}",
-        nfd: "\u{1103}\u{1171}\u{11B4}",
-        nfkc: "\u{B4B1}",
-        nfkd: "\u{1103}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B4B2}",
-        nfc: "\u{B4B2}",
-        nfd: "\u{1103}\u{1171}\u{11B5}",
-        nfkc: "\u{B4B2}",
-        nfkd: "\u{1103}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B4B3}",
-        nfc: "\u{B4B3}",
-        nfd: "\u{1103}\u{1171}\u{11B6}",
-        nfkc: "\u{B4B3}",
-        nfkd: "\u{1103}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B4B4}",
-        nfc: "\u{B4B4}",
-        nfd: "\u{1103}\u{1171}\u{11B7}",
-        nfkc: "\u{B4B4}",
-        nfkd: "\u{1103}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B4B5}",
-        nfc: "\u{B4B5}",
-        nfd: "\u{1103}\u{1171}\u{11B8}",
-        nfkc: "\u{B4B5}",
-        nfkd: "\u{1103}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B4B6}",
-        nfc: "\u{B4B6}",
-        nfd: "\u{1103}\u{1171}\u{11B9}",
-        nfkc: "\u{B4B6}",
-        nfkd: "\u{1103}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B4B7}",
-        nfc: "\u{B4B7}",
-        nfd: "\u{1103}\u{1171}\u{11BA}",
-        nfkc: "\u{B4B7}",
-        nfkd: "\u{1103}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B4B8}",
-        nfc: "\u{B4B8}",
-        nfd: "\u{1103}\u{1171}\u{11BB}",
-        nfkc: "\u{B4B8}",
-        nfkd: "\u{1103}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B4B9}",
-        nfc: "\u{B4B9}",
-        nfd: "\u{1103}\u{1171}\u{11BC}",
-        nfkc: "\u{B4B9}",
-        nfkd: "\u{1103}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B4BA}",
-        nfc: "\u{B4BA}",
-        nfd: "\u{1103}\u{1171}\u{11BD}",
-        nfkc: "\u{B4BA}",
-        nfkd: "\u{1103}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B4BB}",
-        nfc: "\u{B4BB}",
-        nfd: "\u{1103}\u{1171}\u{11BE}",
-        nfkc: "\u{B4BB}",
-        nfkd: "\u{1103}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B4BC}",
-        nfc: "\u{B4BC}",
-        nfd: "\u{1103}\u{1171}\u{11BF}",
-        nfkc: "\u{B4BC}",
-        nfkd: "\u{1103}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B4BD}",
-        nfc: "\u{B4BD}",
-        nfd: "\u{1103}\u{1171}\u{11C0}",
-        nfkc: "\u{B4BD}",
-        nfkd: "\u{1103}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B4BE}",
-        nfc: "\u{B4BE}",
-        nfd: "\u{1103}\u{1171}\u{11C1}",
-        nfkc: "\u{B4BE}",
-        nfkd: "\u{1103}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B4BF}",
-        nfc: "\u{B4BF}",
-        nfd: "\u{1103}\u{1171}\u{11C2}",
-        nfkc: "\u{B4BF}",
-        nfkd: "\u{1103}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B4C0}",
-        nfc: "\u{B4C0}",
-        nfd: "\u{1103}\u{1172}",
-        nfkc: "\u{B4C0}",
-        nfkd: "\u{1103}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{B4C1}",
-        nfc: "\u{B4C1}",
-        nfd: "\u{1103}\u{1172}\u{11A8}",
-        nfkc: "\u{B4C1}",
-        nfkd: "\u{1103}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B4C2}",
-        nfc: "\u{B4C2}",
-        nfd: "\u{1103}\u{1172}\u{11A9}",
-        nfkc: "\u{B4C2}",
-        nfkd: "\u{1103}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B4C3}",
-        nfc: "\u{B4C3}",
-        nfd: "\u{1103}\u{1172}\u{11AA}",
-        nfkc: "\u{B4C3}",
-        nfkd: "\u{1103}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B4C4}",
-        nfc: "\u{B4C4}",
-        nfd: "\u{1103}\u{1172}\u{11AB}",
-        nfkc: "\u{B4C4}",
-        nfkd: "\u{1103}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B4C5}",
-        nfc: "\u{B4C5}",
-        nfd: "\u{1103}\u{1172}\u{11AC}",
-        nfkc: "\u{B4C5}",
-        nfkd: "\u{1103}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B4C6}",
-        nfc: "\u{B4C6}",
-        nfd: "\u{1103}\u{1172}\u{11AD}",
-        nfkc: "\u{B4C6}",
-        nfkd: "\u{1103}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B4C7}",
-        nfc: "\u{B4C7}",
-        nfd: "\u{1103}\u{1172}\u{11AE}",
-        nfkc: "\u{B4C7}",
-        nfkd: "\u{1103}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B4C8}",
-        nfc: "\u{B4C8}",
-        nfd: "\u{1103}\u{1172}\u{11AF}",
-        nfkc: "\u{B4C8}",
-        nfkd: "\u{1103}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B4C9}",
-        nfc: "\u{B4C9}",
-        nfd: "\u{1103}\u{1172}\u{11B0}",
-        nfkc: "\u{B4C9}",
-        nfkd: "\u{1103}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B4CA}",
-        nfc: "\u{B4CA}",
-        nfd: "\u{1103}\u{1172}\u{11B1}",
-        nfkc: "\u{B4CA}",
-        nfkd: "\u{1103}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B4CB}",
-        nfc: "\u{B4CB}",
-        nfd: "\u{1103}\u{1172}\u{11B2}",
-        nfkc: "\u{B4CB}",
-        nfkd: "\u{1103}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B4CC}",
-        nfc: "\u{B4CC}",
-        nfd: "\u{1103}\u{1172}\u{11B3}",
-        nfkc: "\u{B4CC}",
-        nfkd: "\u{1103}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B4CD}",
-        nfc: "\u{B4CD}",
-        nfd: "\u{1103}\u{1172}\u{11B4}",
-        nfkc: "\u{B4CD}",
-        nfkd: "\u{1103}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B4CE}",
-        nfc: "\u{B4CE}",
-        nfd: "\u{1103}\u{1172}\u{11B5}",
-        nfkc: "\u{B4CE}",
-        nfkd: "\u{1103}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B4CF}",
-        nfc: "\u{B4CF}",
-        nfd: "\u{1103}\u{1172}\u{11B6}",
-        nfkc: "\u{B4CF}",
-        nfkd: "\u{1103}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B4D0}",
-        nfc: "\u{B4D0}",
-        nfd: "\u{1103}\u{1172}\u{11B7}",
-        nfkc: "\u{B4D0}",
-        nfkd: "\u{1103}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B4D1}",
-        nfc: "\u{B4D1}",
-        nfd: "\u{1103}\u{1172}\u{11B8}",
-        nfkc: "\u{B4D1}",
-        nfkd: "\u{1103}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B4D2}",
-        nfc: "\u{B4D2}",
-        nfd: "\u{1103}\u{1172}\u{11B9}",
-        nfkc: "\u{B4D2}",
-        nfkd: "\u{1103}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B4D3}",
-        nfc: "\u{B4D3}",
-        nfd: "\u{1103}\u{1172}\u{11BA}",
-        nfkc: "\u{B4D3}",
-        nfkd: "\u{1103}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B4D4}",
-        nfc: "\u{B4D4}",
-        nfd: "\u{1103}\u{1172}\u{11BB}",
-        nfkc: "\u{B4D4}",
-        nfkd: "\u{1103}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B4D5}",
-        nfc: "\u{B4D5}",
-        nfd: "\u{1103}\u{1172}\u{11BC}",
-        nfkc: "\u{B4D5}",
-        nfkd: "\u{1103}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B4D6}",
-        nfc: "\u{B4D6}",
-        nfd: "\u{1103}\u{1172}\u{11BD}",
-        nfkc: "\u{B4D6}",
-        nfkd: "\u{1103}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B4D7}",
-        nfc: "\u{B4D7}",
-        nfd: "\u{1103}\u{1172}\u{11BE}",
-        nfkc: "\u{B4D7}",
-        nfkd: "\u{1103}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B4D8}",
-        nfc: "\u{B4D8}",
-        nfd: "\u{1103}\u{1172}\u{11BF}",
-        nfkc: "\u{B4D8}",
-        nfkd: "\u{1103}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B4D9}",
-        nfc: "\u{B4D9}",
-        nfd: "\u{1103}\u{1172}\u{11C0}",
-        nfkc: "\u{B4D9}",
-        nfkd: "\u{1103}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B4DA}",
-        nfc: "\u{B4DA}",
-        nfd: "\u{1103}\u{1172}\u{11C1}",
-        nfkc: "\u{B4DA}",
-        nfkd: "\u{1103}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B4DB}",
-        nfc: "\u{B4DB}",
-        nfd: "\u{1103}\u{1172}\u{11C2}",
-        nfkc: "\u{B4DB}",
-        nfkd: "\u{1103}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B4DC}",
-        nfc: "\u{B4DC}",
-        nfd: "\u{1103}\u{1173}",
-        nfkc: "\u{B4DC}",
-        nfkd: "\u{1103}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{B4DD}",
-        nfc: "\u{B4DD}",
-        nfd: "\u{1103}\u{1173}\u{11A8}",
-        nfkc: "\u{B4DD}",
-        nfkd: "\u{1103}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B4DE}",
-        nfc: "\u{B4DE}",
-        nfd: "\u{1103}\u{1173}\u{11A9}",
-        nfkc: "\u{B4DE}",
-        nfkd: "\u{1103}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B4DF}",
-        nfc: "\u{B4DF}",
-        nfd: "\u{1103}\u{1173}\u{11AA}",
-        nfkc: "\u{B4DF}",
-        nfkd: "\u{1103}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B4E0}",
-        nfc: "\u{B4E0}",
-        nfd: "\u{1103}\u{1173}\u{11AB}",
-        nfkc: "\u{B4E0}",
-        nfkd: "\u{1103}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B4E1}",
-        nfc: "\u{B4E1}",
-        nfd: "\u{1103}\u{1173}\u{11AC}",
-        nfkc: "\u{B4E1}",
-        nfkd: "\u{1103}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B4E2}",
-        nfc: "\u{B4E2}",
-        nfd: "\u{1103}\u{1173}\u{11AD}",
-        nfkc: "\u{B4E2}",
-        nfkd: "\u{1103}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B4E3}",
-        nfc: "\u{B4E3}",
-        nfd: "\u{1103}\u{1173}\u{11AE}",
-        nfkc: "\u{B4E3}",
-        nfkd: "\u{1103}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B4E4}",
-        nfc: "\u{B4E4}",
-        nfd: "\u{1103}\u{1173}\u{11AF}",
-        nfkc: "\u{B4E4}",
-        nfkd: "\u{1103}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B4E5}",
-        nfc: "\u{B4E5}",
-        nfd: "\u{1103}\u{1173}\u{11B0}",
-        nfkc: "\u{B4E5}",
-        nfkd: "\u{1103}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B4E6}",
-        nfc: "\u{B4E6}",
-        nfd: "\u{1103}\u{1173}\u{11B1}",
-        nfkc: "\u{B4E6}",
-        nfkd: "\u{1103}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B4E7}",
-        nfc: "\u{B4E7}",
-        nfd: "\u{1103}\u{1173}\u{11B2}",
-        nfkc: "\u{B4E7}",
-        nfkd: "\u{1103}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B4E8}",
-        nfc: "\u{B4E8}",
-        nfd: "\u{1103}\u{1173}\u{11B3}",
-        nfkc: "\u{B4E8}",
-        nfkd: "\u{1103}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B4E9}",
-        nfc: "\u{B4E9}",
-        nfd: "\u{1103}\u{1173}\u{11B4}",
-        nfkc: "\u{B4E9}",
-        nfkd: "\u{1103}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B4EA}",
-        nfc: "\u{B4EA}",
-        nfd: "\u{1103}\u{1173}\u{11B5}",
-        nfkc: "\u{B4EA}",
-        nfkd: "\u{1103}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B4EB}",
-        nfc: "\u{B4EB}",
-        nfd: "\u{1103}\u{1173}\u{11B6}",
-        nfkc: "\u{B4EB}",
-        nfkd: "\u{1103}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B4EC}",
-        nfc: "\u{B4EC}",
-        nfd: "\u{1103}\u{1173}\u{11B7}",
-        nfkc: "\u{B4EC}",
-        nfkd: "\u{1103}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B4ED}",
-        nfc: "\u{B4ED}",
-        nfd: "\u{1103}\u{1173}\u{11B8}",
-        nfkc: "\u{B4ED}",
-        nfkd: "\u{1103}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B4EE}",
-        nfc: "\u{B4EE}",
-        nfd: "\u{1103}\u{1173}\u{11B9}",
-        nfkc: "\u{B4EE}",
-        nfkd: "\u{1103}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B4EF}",
-        nfc: "\u{B4EF}",
-        nfd: "\u{1103}\u{1173}\u{11BA}",
-        nfkc: "\u{B4EF}",
-        nfkd: "\u{1103}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B4F0}",
-        nfc: "\u{B4F0}",
-        nfd: "\u{1103}\u{1173}\u{11BB}",
-        nfkc: "\u{B4F0}",
-        nfkd: "\u{1103}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B4F1}",
-        nfc: "\u{B4F1}",
-        nfd: "\u{1103}\u{1173}\u{11BC}",
-        nfkc: "\u{B4F1}",
-        nfkd: "\u{1103}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B4F2}",
-        nfc: "\u{B4F2}",
-        nfd: "\u{1103}\u{1173}\u{11BD}",
-        nfkc: "\u{B4F2}",
-        nfkd: "\u{1103}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B4F3}",
-        nfc: "\u{B4F3}",
-        nfd: "\u{1103}\u{1173}\u{11BE}",
-        nfkc: "\u{B4F3}",
-        nfkd: "\u{1103}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B4F4}",
-        nfc: "\u{B4F4}",
-        nfd: "\u{1103}\u{1173}\u{11BF}",
-        nfkc: "\u{B4F4}",
-        nfkd: "\u{1103}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B4F5}",
-        nfc: "\u{B4F5}",
-        nfd: "\u{1103}\u{1173}\u{11C0}",
-        nfkc: "\u{B4F5}",
-        nfkd: "\u{1103}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B4F6}",
-        nfc: "\u{B4F6}",
-        nfd: "\u{1103}\u{1173}\u{11C1}",
-        nfkc: "\u{B4F6}",
-        nfkd: "\u{1103}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B4F7}",
-        nfc: "\u{B4F7}",
-        nfd: "\u{1103}\u{1173}\u{11C2}",
-        nfkc: "\u{B4F7}",
-        nfkd: "\u{1103}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B4F8}",
-        nfc: "\u{B4F8}",
-        nfd: "\u{1103}\u{1174}",
-        nfkc: "\u{B4F8}",
-        nfkd: "\u{1103}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{B4F9}",
-        nfc: "\u{B4F9}",
-        nfd: "\u{1103}\u{1174}\u{11A8}",
-        nfkc: "\u{B4F9}",
-        nfkd: "\u{1103}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B4FA}",
-        nfc: "\u{B4FA}",
-        nfd: "\u{1103}\u{1174}\u{11A9}",
-        nfkc: "\u{B4FA}",
-        nfkd: "\u{1103}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B4FB}",
-        nfc: "\u{B4FB}",
-        nfd: "\u{1103}\u{1174}\u{11AA}",
-        nfkc: "\u{B4FB}",
-        nfkd: "\u{1103}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B4FC}",
-        nfc: "\u{B4FC}",
-        nfd: "\u{1103}\u{1174}\u{11AB}",
-        nfkc: "\u{B4FC}",
-        nfkd: "\u{1103}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B4FD}",
-        nfc: "\u{B4FD}",
-        nfd: "\u{1103}\u{1174}\u{11AC}",
-        nfkc: "\u{B4FD}",
-        nfkd: "\u{1103}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B4FE}",
-        nfc: "\u{B4FE}",
-        nfd: "\u{1103}\u{1174}\u{11AD}",
-        nfkc: "\u{B4FE}",
-        nfkd: "\u{1103}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B4FF}",
-        nfc: "\u{B4FF}",
-        nfd: "\u{1103}\u{1174}\u{11AE}",
-        nfkc: "\u{B4FF}",
-        nfkd: "\u{1103}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B500}",
-        nfc: "\u{B500}",
-        nfd: "\u{1103}\u{1174}\u{11AF}",
-        nfkc: "\u{B500}",
-        nfkd: "\u{1103}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B501}",
-        nfc: "\u{B501}",
-        nfd: "\u{1103}\u{1174}\u{11B0}",
-        nfkc: "\u{B501}",
-        nfkd: "\u{1103}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B502}",
-        nfc: "\u{B502}",
-        nfd: "\u{1103}\u{1174}\u{11B1}",
-        nfkc: "\u{B502}",
-        nfkd: "\u{1103}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B503}",
-        nfc: "\u{B503}",
-        nfd: "\u{1103}\u{1174}\u{11B2}",
-        nfkc: "\u{B503}",
-        nfkd: "\u{1103}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B504}",
-        nfc: "\u{B504}",
-        nfd: "\u{1103}\u{1174}\u{11B3}",
-        nfkc: "\u{B504}",
-        nfkd: "\u{1103}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B505}",
-        nfc: "\u{B505}",
-        nfd: "\u{1103}\u{1174}\u{11B4}",
-        nfkc: "\u{B505}",
-        nfkd: "\u{1103}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B506}",
-        nfc: "\u{B506}",
-        nfd: "\u{1103}\u{1174}\u{11B5}",
-        nfkc: "\u{B506}",
-        nfkd: "\u{1103}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B507}",
-        nfc: "\u{B507}",
-        nfd: "\u{1103}\u{1174}\u{11B6}",
-        nfkc: "\u{B507}",
-        nfkd: "\u{1103}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B508}",
-        nfc: "\u{B508}",
-        nfd: "\u{1103}\u{1174}\u{11B7}",
-        nfkc: "\u{B508}",
-        nfkd: "\u{1103}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B509}",
-        nfc: "\u{B509}",
-        nfd: "\u{1103}\u{1174}\u{11B8}",
-        nfkc: "\u{B509}",
-        nfkd: "\u{1103}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B50A}",
-        nfc: "\u{B50A}",
-        nfd: "\u{1103}\u{1174}\u{11B9}",
-        nfkc: "\u{B50A}",
-        nfkd: "\u{1103}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B50B}",
-        nfc: "\u{B50B}",
-        nfd: "\u{1103}\u{1174}\u{11BA}",
-        nfkc: "\u{B50B}",
-        nfkd: "\u{1103}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B50C}",
-        nfc: "\u{B50C}",
-        nfd: "\u{1103}\u{1174}\u{11BB}",
-        nfkc: "\u{B50C}",
-        nfkd: "\u{1103}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B50D}",
-        nfc: "\u{B50D}",
-        nfd: "\u{1103}\u{1174}\u{11BC}",
-        nfkc: "\u{B50D}",
-        nfkd: "\u{1103}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B50E}",
-        nfc: "\u{B50E}",
-        nfd: "\u{1103}\u{1174}\u{11BD}",
-        nfkc: "\u{B50E}",
-        nfkd: "\u{1103}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B50F}",
-        nfc: "\u{B50F}",
-        nfd: "\u{1103}\u{1174}\u{11BE}",
-        nfkc: "\u{B50F}",
-        nfkd: "\u{1103}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B510}",
-        nfc: "\u{B510}",
-        nfd: "\u{1103}\u{1174}\u{11BF}",
-        nfkc: "\u{B510}",
-        nfkd: "\u{1103}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B511}",
-        nfc: "\u{B511}",
-        nfd: "\u{1103}\u{1174}\u{11C0}",
-        nfkc: "\u{B511}",
-        nfkd: "\u{1103}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B512}",
-        nfc: "\u{B512}",
-        nfd: "\u{1103}\u{1174}\u{11C1}",
-        nfkc: "\u{B512}",
-        nfkd: "\u{1103}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B513}",
-        nfc: "\u{B513}",
-        nfd: "\u{1103}\u{1174}\u{11C2}",
-        nfkc: "\u{B513}",
-        nfkd: "\u{1103}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B514}",
-        nfc: "\u{B514}",
-        nfd: "\u{1103}\u{1175}",
-        nfkc: "\u{B514}",
-        nfkd: "\u{1103}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{B515}",
-        nfc: "\u{B515}",
-        nfd: "\u{1103}\u{1175}\u{11A8}",
-        nfkc: "\u{B515}",
-        nfkd: "\u{1103}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B516}",
-        nfc: "\u{B516}",
-        nfd: "\u{1103}\u{1175}\u{11A9}",
-        nfkc: "\u{B516}",
-        nfkd: "\u{1103}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B517}",
-        nfc: "\u{B517}",
-        nfd: "\u{1103}\u{1175}\u{11AA}",
-        nfkc: "\u{B517}",
-        nfkd: "\u{1103}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B518}",
-        nfc: "\u{B518}",
-        nfd: "\u{1103}\u{1175}\u{11AB}",
-        nfkc: "\u{B518}",
-        nfkd: "\u{1103}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B519}",
-        nfc: "\u{B519}",
-        nfd: "\u{1103}\u{1175}\u{11AC}",
-        nfkc: "\u{B519}",
-        nfkd: "\u{1103}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B51A}",
-        nfc: "\u{B51A}",
-        nfd: "\u{1103}\u{1175}\u{11AD}",
-        nfkc: "\u{B51A}",
-        nfkd: "\u{1103}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B51B}",
-        nfc: "\u{B51B}",
-        nfd: "\u{1103}\u{1175}\u{11AE}",
-        nfkc: "\u{B51B}",
-        nfkd: "\u{1103}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B51C}",
-        nfc: "\u{B51C}",
-        nfd: "\u{1103}\u{1175}\u{11AF}",
-        nfkc: "\u{B51C}",
-        nfkd: "\u{1103}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B51D}",
-        nfc: "\u{B51D}",
-        nfd: "\u{1103}\u{1175}\u{11B0}",
-        nfkc: "\u{B51D}",
-        nfkd: "\u{1103}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B51E}",
-        nfc: "\u{B51E}",
-        nfd: "\u{1103}\u{1175}\u{11B1}",
-        nfkc: "\u{B51E}",
-        nfkd: "\u{1103}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B51F}",
-        nfc: "\u{B51F}",
-        nfd: "\u{1103}\u{1175}\u{11B2}",
-        nfkc: "\u{B51F}",
-        nfkd: "\u{1103}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B520}",
-        nfc: "\u{B520}",
-        nfd: "\u{1103}\u{1175}\u{11B3}",
-        nfkc: "\u{B520}",
-        nfkd: "\u{1103}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B521}",
-        nfc: "\u{B521}",
-        nfd: "\u{1103}\u{1175}\u{11B4}",
-        nfkc: "\u{B521}",
-        nfkd: "\u{1103}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B522}",
-        nfc: "\u{B522}",
-        nfd: "\u{1103}\u{1175}\u{11B5}",
-        nfkc: "\u{B522}",
-        nfkd: "\u{1103}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B523}",
-        nfc: "\u{B523}",
-        nfd: "\u{1103}\u{1175}\u{11B6}",
-        nfkc: "\u{B523}",
-        nfkd: "\u{1103}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B524}",
-        nfc: "\u{B524}",
-        nfd: "\u{1103}\u{1175}\u{11B7}",
-        nfkc: "\u{B524}",
-        nfkd: "\u{1103}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B525}",
-        nfc: "\u{B525}",
-        nfd: "\u{1103}\u{1175}\u{11B8}",
-        nfkc: "\u{B525}",
-        nfkd: "\u{1103}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B526}",
-        nfc: "\u{B526}",
-        nfd: "\u{1103}\u{1175}\u{11B9}",
-        nfkc: "\u{B526}",
-        nfkd: "\u{1103}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B527}",
-        nfc: "\u{B527}",
-        nfd: "\u{1103}\u{1175}\u{11BA}",
-        nfkc: "\u{B527}",
-        nfkd: "\u{1103}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B528}",
-        nfc: "\u{B528}",
-        nfd: "\u{1103}\u{1175}\u{11BB}",
-        nfkc: "\u{B528}",
-        nfkd: "\u{1103}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B529}",
-        nfc: "\u{B529}",
-        nfd: "\u{1103}\u{1175}\u{11BC}",
-        nfkc: "\u{B529}",
-        nfkd: "\u{1103}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B52A}",
-        nfc: "\u{B52A}",
-        nfd: "\u{1103}\u{1175}\u{11BD}",
-        nfkc: "\u{B52A}",
-        nfkd: "\u{1103}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B52B}",
-        nfc: "\u{B52B}",
-        nfd: "\u{1103}\u{1175}\u{11BE}",
-        nfkc: "\u{B52B}",
-        nfkd: "\u{1103}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B52C}",
-        nfc: "\u{B52C}",
-        nfd: "\u{1103}\u{1175}\u{11BF}",
-        nfkc: "\u{B52C}",
-        nfkd: "\u{1103}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B52D}",
-        nfc: "\u{B52D}",
-        nfd: "\u{1103}\u{1175}\u{11C0}",
-        nfkc: "\u{B52D}",
-        nfkd: "\u{1103}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B52E}",
-        nfc: "\u{B52E}",
-        nfd: "\u{1103}\u{1175}\u{11C1}",
-        nfkc: "\u{B52E}",
-        nfkd: "\u{1103}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B52F}",
-        nfc: "\u{B52F}",
-        nfd: "\u{1103}\u{1175}\u{11C2}",
-        nfkc: "\u{B52F}",
-        nfkd: "\u{1103}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B530}",
-        nfc: "\u{B530}",
-        nfd: "\u{1104}\u{1161}",
-        nfkc: "\u{B530}",
-        nfkd: "\u{1104}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{B531}",
-        nfc: "\u{B531}",
-        nfd: "\u{1104}\u{1161}\u{11A8}",
-        nfkc: "\u{B531}",
-        nfkd: "\u{1104}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B532}",
-        nfc: "\u{B532}",
-        nfd: "\u{1104}\u{1161}\u{11A9}",
-        nfkc: "\u{B532}",
-        nfkd: "\u{1104}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B533}",
-        nfc: "\u{B533}",
-        nfd: "\u{1104}\u{1161}\u{11AA}",
-        nfkc: "\u{B533}",
-        nfkd: "\u{1104}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B534}",
-        nfc: "\u{B534}",
-        nfd: "\u{1104}\u{1161}\u{11AB}",
-        nfkc: "\u{B534}",
-        nfkd: "\u{1104}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B535}",
-        nfc: "\u{B535}",
-        nfd: "\u{1104}\u{1161}\u{11AC}",
-        nfkc: "\u{B535}",
-        nfkd: "\u{1104}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B536}",
-        nfc: "\u{B536}",
-        nfd: "\u{1104}\u{1161}\u{11AD}",
-        nfkc: "\u{B536}",
-        nfkd: "\u{1104}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B537}",
-        nfc: "\u{B537}",
-        nfd: "\u{1104}\u{1161}\u{11AE}",
-        nfkc: "\u{B537}",
-        nfkd: "\u{1104}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B538}",
-        nfc: "\u{B538}",
-        nfd: "\u{1104}\u{1161}\u{11AF}",
-        nfkc: "\u{B538}",
-        nfkd: "\u{1104}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B539}",
-        nfc: "\u{B539}",
-        nfd: "\u{1104}\u{1161}\u{11B0}",
-        nfkc: "\u{B539}",
-        nfkd: "\u{1104}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B53A}",
-        nfc: "\u{B53A}",
-        nfd: "\u{1104}\u{1161}\u{11B1}",
-        nfkc: "\u{B53A}",
-        nfkd: "\u{1104}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B53B}",
-        nfc: "\u{B53B}",
-        nfd: "\u{1104}\u{1161}\u{11B2}",
-        nfkc: "\u{B53B}",
-        nfkd: "\u{1104}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B53C}",
-        nfc: "\u{B53C}",
-        nfd: "\u{1104}\u{1161}\u{11B3}",
-        nfkc: "\u{B53C}",
-        nfkd: "\u{1104}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B53D}",
-        nfc: "\u{B53D}",
-        nfd: "\u{1104}\u{1161}\u{11B4}",
-        nfkc: "\u{B53D}",
-        nfkd: "\u{1104}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B53E}",
-        nfc: "\u{B53E}",
-        nfd: "\u{1104}\u{1161}\u{11B5}",
-        nfkc: "\u{B53E}",
-        nfkd: "\u{1104}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B53F}",
-        nfc: "\u{B53F}",
-        nfd: "\u{1104}\u{1161}\u{11B6}",
-        nfkc: "\u{B53F}",
-        nfkd: "\u{1104}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B540}",
-        nfc: "\u{B540}",
-        nfd: "\u{1104}\u{1161}\u{11B7}",
-        nfkc: "\u{B540}",
-        nfkd: "\u{1104}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B541}",
-        nfc: "\u{B541}",
-        nfd: "\u{1104}\u{1161}\u{11B8}",
-        nfkc: "\u{B541}",
-        nfkd: "\u{1104}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B542}",
-        nfc: "\u{B542}",
-        nfd: "\u{1104}\u{1161}\u{11B9}",
-        nfkc: "\u{B542}",
-        nfkd: "\u{1104}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B543}",
-        nfc: "\u{B543}",
-        nfd: "\u{1104}\u{1161}\u{11BA}",
-        nfkc: "\u{B543}",
-        nfkd: "\u{1104}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B544}",
-        nfc: "\u{B544}",
-        nfd: "\u{1104}\u{1161}\u{11BB}",
-        nfkc: "\u{B544}",
-        nfkd: "\u{1104}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B545}",
-        nfc: "\u{B545}",
-        nfd: "\u{1104}\u{1161}\u{11BC}",
-        nfkc: "\u{B545}",
-        nfkd: "\u{1104}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B546}",
-        nfc: "\u{B546}",
-        nfd: "\u{1104}\u{1161}\u{11BD}",
-        nfkc: "\u{B546}",
-        nfkd: "\u{1104}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B547}",
-        nfc: "\u{B547}",
-        nfd: "\u{1104}\u{1161}\u{11BE}",
-        nfkc: "\u{B547}",
-        nfkd: "\u{1104}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B548}",
-        nfc: "\u{B548}",
-        nfd: "\u{1104}\u{1161}\u{11BF}",
-        nfkc: "\u{B548}",
-        nfkd: "\u{1104}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B549}",
-        nfc: "\u{B549}",
-        nfd: "\u{1104}\u{1161}\u{11C0}",
-        nfkc: "\u{B549}",
-        nfkd: "\u{1104}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B54A}",
-        nfc: "\u{B54A}",
-        nfd: "\u{1104}\u{1161}\u{11C1}",
-        nfkc: "\u{B54A}",
-        nfkd: "\u{1104}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B54B}",
-        nfc: "\u{B54B}",
-        nfd: "\u{1104}\u{1161}\u{11C2}",
-        nfkc: "\u{B54B}",
-        nfkd: "\u{1104}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B54C}",
-        nfc: "\u{B54C}",
-        nfd: "\u{1104}\u{1162}",
-        nfkc: "\u{B54C}",
-        nfkd: "\u{1104}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{B54D}",
-        nfc: "\u{B54D}",
-        nfd: "\u{1104}\u{1162}\u{11A8}",
-        nfkc: "\u{B54D}",
-        nfkd: "\u{1104}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B54E}",
-        nfc: "\u{B54E}",
-        nfd: "\u{1104}\u{1162}\u{11A9}",
-        nfkc: "\u{B54E}",
-        nfkd: "\u{1104}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B54F}",
-        nfc: "\u{B54F}",
-        nfd: "\u{1104}\u{1162}\u{11AA}",
-        nfkc: "\u{B54F}",
-        nfkd: "\u{1104}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B550}",
-        nfc: "\u{B550}",
-        nfd: "\u{1104}\u{1162}\u{11AB}",
-        nfkc: "\u{B550}",
-        nfkd: "\u{1104}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B551}",
-        nfc: "\u{B551}",
-        nfd: "\u{1104}\u{1162}\u{11AC}",
-        nfkc: "\u{B551}",
-        nfkd: "\u{1104}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B552}",
-        nfc: "\u{B552}",
-        nfd: "\u{1104}\u{1162}\u{11AD}",
-        nfkc: "\u{B552}",
-        nfkd: "\u{1104}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B553}",
-        nfc: "\u{B553}",
-        nfd: "\u{1104}\u{1162}\u{11AE}",
-        nfkc: "\u{B553}",
-        nfkd: "\u{1104}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B554}",
-        nfc: "\u{B554}",
-        nfd: "\u{1104}\u{1162}\u{11AF}",
-        nfkc: "\u{B554}",
-        nfkd: "\u{1104}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B555}",
-        nfc: "\u{B555}",
-        nfd: "\u{1104}\u{1162}\u{11B0}",
-        nfkc: "\u{B555}",
-        nfkd: "\u{1104}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B556}",
-        nfc: "\u{B556}",
-        nfd: "\u{1104}\u{1162}\u{11B1}",
-        nfkc: "\u{B556}",
-        nfkd: "\u{1104}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B557}",
-        nfc: "\u{B557}",
-        nfd: "\u{1104}\u{1162}\u{11B2}",
-        nfkc: "\u{B557}",
-        nfkd: "\u{1104}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B558}",
-        nfc: "\u{B558}",
-        nfd: "\u{1104}\u{1162}\u{11B3}",
-        nfkc: "\u{B558}",
-        nfkd: "\u{1104}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B559}",
-        nfc: "\u{B559}",
-        nfd: "\u{1104}\u{1162}\u{11B4}",
-        nfkc: "\u{B559}",
-        nfkd: "\u{1104}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B55A}",
-        nfc: "\u{B55A}",
-        nfd: "\u{1104}\u{1162}\u{11B5}",
-        nfkc: "\u{B55A}",
-        nfkd: "\u{1104}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B55B}",
-        nfc: "\u{B55B}",
-        nfd: "\u{1104}\u{1162}\u{11B6}",
-        nfkc: "\u{B55B}",
-        nfkd: "\u{1104}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B55C}",
-        nfc: "\u{B55C}",
-        nfd: "\u{1104}\u{1162}\u{11B7}",
-        nfkc: "\u{B55C}",
-        nfkd: "\u{1104}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B55D}",
-        nfc: "\u{B55D}",
-        nfd: "\u{1104}\u{1162}\u{11B8}",
-        nfkc: "\u{B55D}",
-        nfkd: "\u{1104}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B55E}",
-        nfc: "\u{B55E}",
-        nfd: "\u{1104}\u{1162}\u{11B9}",
-        nfkc: "\u{B55E}",
-        nfkd: "\u{1104}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B55F}",
-        nfc: "\u{B55F}",
-        nfd: "\u{1104}\u{1162}\u{11BA}",
-        nfkc: "\u{B55F}",
-        nfkd: "\u{1104}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B560}",
-        nfc: "\u{B560}",
-        nfd: "\u{1104}\u{1162}\u{11BB}",
-        nfkc: "\u{B560}",
-        nfkd: "\u{1104}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B561}",
-        nfc: "\u{B561}",
-        nfd: "\u{1104}\u{1162}\u{11BC}",
-        nfkc: "\u{B561}",
-        nfkd: "\u{1104}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B562}",
-        nfc: "\u{B562}",
-        nfd: "\u{1104}\u{1162}\u{11BD}",
-        nfkc: "\u{B562}",
-        nfkd: "\u{1104}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B563}",
-        nfc: "\u{B563}",
-        nfd: "\u{1104}\u{1162}\u{11BE}",
-        nfkc: "\u{B563}",
-        nfkd: "\u{1104}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B564}",
-        nfc: "\u{B564}",
-        nfd: "\u{1104}\u{1162}\u{11BF}",
-        nfkc: "\u{B564}",
-        nfkd: "\u{1104}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B565}",
-        nfc: "\u{B565}",
-        nfd: "\u{1104}\u{1162}\u{11C0}",
-        nfkc: "\u{B565}",
-        nfkd: "\u{1104}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B566}",
-        nfc: "\u{B566}",
-        nfd: "\u{1104}\u{1162}\u{11C1}",
-        nfkc: "\u{B566}",
-        nfkd: "\u{1104}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B567}",
-        nfc: "\u{B567}",
-        nfd: "\u{1104}\u{1162}\u{11C2}",
-        nfkc: "\u{B567}",
-        nfkd: "\u{1104}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B568}",
-        nfc: "\u{B568}",
-        nfd: "\u{1104}\u{1163}",
-        nfkc: "\u{B568}",
-        nfkd: "\u{1104}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{B569}",
-        nfc: "\u{B569}",
-        nfd: "\u{1104}\u{1163}\u{11A8}",
-        nfkc: "\u{B569}",
-        nfkd: "\u{1104}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B56A}",
-        nfc: "\u{B56A}",
-        nfd: "\u{1104}\u{1163}\u{11A9}",
-        nfkc: "\u{B56A}",
-        nfkd: "\u{1104}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B56B}",
-        nfc: "\u{B56B}",
-        nfd: "\u{1104}\u{1163}\u{11AA}",
-        nfkc: "\u{B56B}",
-        nfkd: "\u{1104}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B56C}",
-        nfc: "\u{B56C}",
-        nfd: "\u{1104}\u{1163}\u{11AB}",
-        nfkc: "\u{B56C}",
-        nfkd: "\u{1104}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B56D}",
-        nfc: "\u{B56D}",
-        nfd: "\u{1104}\u{1163}\u{11AC}",
-        nfkc: "\u{B56D}",
-        nfkd: "\u{1104}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B56E}",
-        nfc: "\u{B56E}",
-        nfd: "\u{1104}\u{1163}\u{11AD}",
-        nfkc: "\u{B56E}",
-        nfkd: "\u{1104}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B56F}",
-        nfc: "\u{B56F}",
-        nfd: "\u{1104}\u{1163}\u{11AE}",
-        nfkc: "\u{B56F}",
-        nfkd: "\u{1104}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B570}",
-        nfc: "\u{B570}",
-        nfd: "\u{1104}\u{1163}\u{11AF}",
-        nfkc: "\u{B570}",
-        nfkd: "\u{1104}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B571}",
-        nfc: "\u{B571}",
-        nfd: "\u{1104}\u{1163}\u{11B0}",
-        nfkc: "\u{B571}",
-        nfkd: "\u{1104}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B572}",
-        nfc: "\u{B572}",
-        nfd: "\u{1104}\u{1163}\u{11B1}",
-        nfkc: "\u{B572}",
-        nfkd: "\u{1104}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B573}",
-        nfc: "\u{B573}",
-        nfd: "\u{1104}\u{1163}\u{11B2}",
-        nfkc: "\u{B573}",
-        nfkd: "\u{1104}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B574}",
-        nfc: "\u{B574}",
-        nfd: "\u{1104}\u{1163}\u{11B3}",
-        nfkc: "\u{B574}",
-        nfkd: "\u{1104}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B575}",
-        nfc: "\u{B575}",
-        nfd: "\u{1104}\u{1163}\u{11B4}",
-        nfkc: "\u{B575}",
-        nfkd: "\u{1104}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B576}",
-        nfc: "\u{B576}",
-        nfd: "\u{1104}\u{1163}\u{11B5}",
-        nfkc: "\u{B576}",
-        nfkd: "\u{1104}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B577}",
-        nfc: "\u{B577}",
-        nfd: "\u{1104}\u{1163}\u{11B6}",
-        nfkc: "\u{B577}",
-        nfkd: "\u{1104}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B578}",
-        nfc: "\u{B578}",
-        nfd: "\u{1104}\u{1163}\u{11B7}",
-        nfkc: "\u{B578}",
-        nfkd: "\u{1104}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B579}",
-        nfc: "\u{B579}",
-        nfd: "\u{1104}\u{1163}\u{11B8}",
-        nfkc: "\u{B579}",
-        nfkd: "\u{1104}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B57A}",
-        nfc: "\u{B57A}",
-        nfd: "\u{1104}\u{1163}\u{11B9}",
-        nfkc: "\u{B57A}",
-        nfkd: "\u{1104}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B57B}",
-        nfc: "\u{B57B}",
-        nfd: "\u{1104}\u{1163}\u{11BA}",
-        nfkc: "\u{B57B}",
-        nfkd: "\u{1104}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B57C}",
-        nfc: "\u{B57C}",
-        nfd: "\u{1104}\u{1163}\u{11BB}",
-        nfkc: "\u{B57C}",
-        nfkd: "\u{1104}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B57D}",
-        nfc: "\u{B57D}",
-        nfd: "\u{1104}\u{1163}\u{11BC}",
-        nfkc: "\u{B57D}",
-        nfkd: "\u{1104}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B57E}",
-        nfc: "\u{B57E}",
-        nfd: "\u{1104}\u{1163}\u{11BD}",
-        nfkc: "\u{B57E}",
-        nfkd: "\u{1104}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B57F}",
-        nfc: "\u{B57F}",
-        nfd: "\u{1104}\u{1163}\u{11BE}",
-        nfkc: "\u{B57F}",
-        nfkd: "\u{1104}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B580}",
-        nfc: "\u{B580}",
-        nfd: "\u{1104}\u{1163}\u{11BF}",
-        nfkc: "\u{B580}",
-        nfkd: "\u{1104}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B581}",
-        nfc: "\u{B581}",
-        nfd: "\u{1104}\u{1163}\u{11C0}",
-        nfkc: "\u{B581}",
-        nfkd: "\u{1104}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B582}",
-        nfc: "\u{B582}",
-        nfd: "\u{1104}\u{1163}\u{11C1}",
-        nfkc: "\u{B582}",
-        nfkd: "\u{1104}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B583}",
-        nfc: "\u{B583}",
-        nfd: "\u{1104}\u{1163}\u{11C2}",
-        nfkc: "\u{B583}",
-        nfkd: "\u{1104}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B584}",
-        nfc: "\u{B584}",
-        nfd: "\u{1104}\u{1164}",
-        nfkc: "\u{B584}",
-        nfkd: "\u{1104}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{B585}",
-        nfc: "\u{B585}",
-        nfd: "\u{1104}\u{1164}\u{11A8}",
-        nfkc: "\u{B585}",
-        nfkd: "\u{1104}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B586}",
-        nfc: "\u{B586}",
-        nfd: "\u{1104}\u{1164}\u{11A9}",
-        nfkc: "\u{B586}",
-        nfkd: "\u{1104}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B587}",
-        nfc: "\u{B587}",
-        nfd: "\u{1104}\u{1164}\u{11AA}",
-        nfkc: "\u{B587}",
-        nfkd: "\u{1104}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B588}",
-        nfc: "\u{B588}",
-        nfd: "\u{1104}\u{1164}\u{11AB}",
-        nfkc: "\u{B588}",
-        nfkd: "\u{1104}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B589}",
-        nfc: "\u{B589}",
-        nfd: "\u{1104}\u{1164}\u{11AC}",
-        nfkc: "\u{B589}",
-        nfkd: "\u{1104}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B58A}",
-        nfc: "\u{B58A}",
-        nfd: "\u{1104}\u{1164}\u{11AD}",
-        nfkc: "\u{B58A}",
-        nfkd: "\u{1104}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B58B}",
-        nfc: "\u{B58B}",
-        nfd: "\u{1104}\u{1164}\u{11AE}",
-        nfkc: "\u{B58B}",
-        nfkd: "\u{1104}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B58C}",
-        nfc: "\u{B58C}",
-        nfd: "\u{1104}\u{1164}\u{11AF}",
-        nfkc: "\u{B58C}",
-        nfkd: "\u{1104}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B58D}",
-        nfc: "\u{B58D}",
-        nfd: "\u{1104}\u{1164}\u{11B0}",
-        nfkc: "\u{B58D}",
-        nfkd: "\u{1104}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B58E}",
-        nfc: "\u{B58E}",
-        nfd: "\u{1104}\u{1164}\u{11B1}",
-        nfkc: "\u{B58E}",
-        nfkd: "\u{1104}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B58F}",
-        nfc: "\u{B58F}",
-        nfd: "\u{1104}\u{1164}\u{11B2}",
-        nfkc: "\u{B58F}",
-        nfkd: "\u{1104}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B590}",
-        nfc: "\u{B590}",
-        nfd: "\u{1104}\u{1164}\u{11B3}",
-        nfkc: "\u{B590}",
-        nfkd: "\u{1104}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B591}",
-        nfc: "\u{B591}",
-        nfd: "\u{1104}\u{1164}\u{11B4}",
-        nfkc: "\u{B591}",
-        nfkd: "\u{1104}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B592}",
-        nfc: "\u{B592}",
-        nfd: "\u{1104}\u{1164}\u{11B5}",
-        nfkc: "\u{B592}",
-        nfkd: "\u{1104}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B593}",
-        nfc: "\u{B593}",
-        nfd: "\u{1104}\u{1164}\u{11B6}",
-        nfkc: "\u{B593}",
-        nfkd: "\u{1104}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B594}",
-        nfc: "\u{B594}",
-        nfd: "\u{1104}\u{1164}\u{11B7}",
-        nfkc: "\u{B594}",
-        nfkd: "\u{1104}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B595}",
-        nfc: "\u{B595}",
-        nfd: "\u{1104}\u{1164}\u{11B8}",
-        nfkc: "\u{B595}",
-        nfkd: "\u{1104}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B596}",
-        nfc: "\u{B596}",
-        nfd: "\u{1104}\u{1164}\u{11B9}",
-        nfkc: "\u{B596}",
-        nfkd: "\u{1104}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B597}",
-        nfc: "\u{B597}",
-        nfd: "\u{1104}\u{1164}\u{11BA}",
-        nfkc: "\u{B597}",
-        nfkd: "\u{1104}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B598}",
-        nfc: "\u{B598}",
-        nfd: "\u{1104}\u{1164}\u{11BB}",
-        nfkc: "\u{B598}",
-        nfkd: "\u{1104}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B599}",
-        nfc: "\u{B599}",
-        nfd: "\u{1104}\u{1164}\u{11BC}",
-        nfkc: "\u{B599}",
-        nfkd: "\u{1104}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B59A}",
-        nfc: "\u{B59A}",
-        nfd: "\u{1104}\u{1164}\u{11BD}",
-        nfkc: "\u{B59A}",
-        nfkd: "\u{1104}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B59B}",
-        nfc: "\u{B59B}",
-        nfd: "\u{1104}\u{1164}\u{11BE}",
-        nfkc: "\u{B59B}",
-        nfkd: "\u{1104}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B59C}",
-        nfc: "\u{B59C}",
-        nfd: "\u{1104}\u{1164}\u{11BF}",
-        nfkc: "\u{B59C}",
-        nfkd: "\u{1104}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B59D}",
-        nfc: "\u{B59D}",
-        nfd: "\u{1104}\u{1164}\u{11C0}",
-        nfkc: "\u{B59D}",
-        nfkd: "\u{1104}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B59E}",
-        nfc: "\u{B59E}",
-        nfd: "\u{1104}\u{1164}\u{11C1}",
-        nfkc: "\u{B59E}",
-        nfkd: "\u{1104}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B59F}",
-        nfc: "\u{B59F}",
-        nfd: "\u{1104}\u{1164}\u{11C2}",
-        nfkc: "\u{B59F}",
-        nfkd: "\u{1104}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B5A0}",
-        nfc: "\u{B5A0}",
-        nfd: "\u{1104}\u{1165}",
-        nfkc: "\u{B5A0}",
-        nfkd: "\u{1104}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{B5A1}",
-        nfc: "\u{B5A1}",
-        nfd: "\u{1104}\u{1165}\u{11A8}",
-        nfkc: "\u{B5A1}",
-        nfkd: "\u{1104}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B5A2}",
-        nfc: "\u{B5A2}",
-        nfd: "\u{1104}\u{1165}\u{11A9}",
-        nfkc: "\u{B5A2}",
-        nfkd: "\u{1104}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B5A3}",
-        nfc: "\u{B5A3}",
-        nfd: "\u{1104}\u{1165}\u{11AA}",
-        nfkc: "\u{B5A3}",
-        nfkd: "\u{1104}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B5A4}",
-        nfc: "\u{B5A4}",
-        nfd: "\u{1104}\u{1165}\u{11AB}",
-        nfkc: "\u{B5A4}",
-        nfkd: "\u{1104}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B5A5}",
-        nfc: "\u{B5A5}",
-        nfd: "\u{1104}\u{1165}\u{11AC}",
-        nfkc: "\u{B5A5}",
-        nfkd: "\u{1104}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B5A6}",
-        nfc: "\u{B5A6}",
-        nfd: "\u{1104}\u{1165}\u{11AD}",
-        nfkc: "\u{B5A6}",
-        nfkd: "\u{1104}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B5A7}",
-        nfc: "\u{B5A7}",
-        nfd: "\u{1104}\u{1165}\u{11AE}",
-        nfkc: "\u{B5A7}",
-        nfkd: "\u{1104}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B5A8}",
-        nfc: "\u{B5A8}",
-        nfd: "\u{1104}\u{1165}\u{11AF}",
-        nfkc: "\u{B5A8}",
-        nfkd: "\u{1104}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B5A9}",
-        nfc: "\u{B5A9}",
-        nfd: "\u{1104}\u{1165}\u{11B0}",
-        nfkc: "\u{B5A9}",
-        nfkd: "\u{1104}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B5AA}",
-        nfc: "\u{B5AA}",
-        nfd: "\u{1104}\u{1165}\u{11B1}",
-        nfkc: "\u{B5AA}",
-        nfkd: "\u{1104}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B5AB}",
-        nfc: "\u{B5AB}",
-        nfd: "\u{1104}\u{1165}\u{11B2}",
-        nfkc: "\u{B5AB}",
-        nfkd: "\u{1104}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B5AC}",
-        nfc: "\u{B5AC}",
-        nfd: "\u{1104}\u{1165}\u{11B3}",
-        nfkc: "\u{B5AC}",
-        nfkd: "\u{1104}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B5AD}",
-        nfc: "\u{B5AD}",
-        nfd: "\u{1104}\u{1165}\u{11B4}",
-        nfkc: "\u{B5AD}",
-        nfkd: "\u{1104}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B5AE}",
-        nfc: "\u{B5AE}",
-        nfd: "\u{1104}\u{1165}\u{11B5}",
-        nfkc: "\u{B5AE}",
-        nfkd: "\u{1104}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B5AF}",
-        nfc: "\u{B5AF}",
-        nfd: "\u{1104}\u{1165}\u{11B6}",
-        nfkc: "\u{B5AF}",
-        nfkd: "\u{1104}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B5B0}",
-        nfc: "\u{B5B0}",
-        nfd: "\u{1104}\u{1165}\u{11B7}",
-        nfkc: "\u{B5B0}",
-        nfkd: "\u{1104}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B5B1}",
-        nfc: "\u{B5B1}",
-        nfd: "\u{1104}\u{1165}\u{11B8}",
-        nfkc: "\u{B5B1}",
-        nfkd: "\u{1104}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B5B2}",
-        nfc: "\u{B5B2}",
-        nfd: "\u{1104}\u{1165}\u{11B9}",
-        nfkc: "\u{B5B2}",
-        nfkd: "\u{1104}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B5B3}",
-        nfc: "\u{B5B3}",
-        nfd: "\u{1104}\u{1165}\u{11BA}",
-        nfkc: "\u{B5B3}",
-        nfkd: "\u{1104}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B5B4}",
-        nfc: "\u{B5B4}",
-        nfd: "\u{1104}\u{1165}\u{11BB}",
-        nfkc: "\u{B5B4}",
-        nfkd: "\u{1104}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B5B5}",
-        nfc: "\u{B5B5}",
-        nfd: "\u{1104}\u{1165}\u{11BC}",
-        nfkc: "\u{B5B5}",
-        nfkd: "\u{1104}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B5B6}",
-        nfc: "\u{B5B6}",
-        nfd: "\u{1104}\u{1165}\u{11BD}",
-        nfkc: "\u{B5B6}",
-        nfkd: "\u{1104}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B5B7}",
-        nfc: "\u{B5B7}",
-        nfd: "\u{1104}\u{1165}\u{11BE}",
-        nfkc: "\u{B5B7}",
-        nfkd: "\u{1104}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B5B8}",
-        nfc: "\u{B5B8}",
-        nfd: "\u{1104}\u{1165}\u{11BF}",
-        nfkc: "\u{B5B8}",
-        nfkd: "\u{1104}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B5B9}",
-        nfc: "\u{B5B9}",
-        nfd: "\u{1104}\u{1165}\u{11C0}",
-        nfkc: "\u{B5B9}",
-        nfkd: "\u{1104}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B5BA}",
-        nfc: "\u{B5BA}",
-        nfd: "\u{1104}\u{1165}\u{11C1}",
-        nfkc: "\u{B5BA}",
-        nfkd: "\u{1104}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B5BB}",
-        nfc: "\u{B5BB}",
-        nfd: "\u{1104}\u{1165}\u{11C2}",
-        nfkc: "\u{B5BB}",
-        nfkd: "\u{1104}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B5BC}",
-        nfc: "\u{B5BC}",
-        nfd: "\u{1104}\u{1166}",
-        nfkc: "\u{B5BC}",
-        nfkd: "\u{1104}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{B5BD}",
-        nfc: "\u{B5BD}",
-        nfd: "\u{1104}\u{1166}\u{11A8}",
-        nfkc: "\u{B5BD}",
-        nfkd: "\u{1104}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B5BE}",
-        nfc: "\u{B5BE}",
-        nfd: "\u{1104}\u{1166}\u{11A9}",
-        nfkc: "\u{B5BE}",
-        nfkd: "\u{1104}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B5BF}",
-        nfc: "\u{B5BF}",
-        nfd: "\u{1104}\u{1166}\u{11AA}",
-        nfkc: "\u{B5BF}",
-        nfkd: "\u{1104}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B5C0}",
-        nfc: "\u{B5C0}",
-        nfd: "\u{1104}\u{1166}\u{11AB}",
-        nfkc: "\u{B5C0}",
-        nfkd: "\u{1104}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B5C1}",
-        nfc: "\u{B5C1}",
-        nfd: "\u{1104}\u{1166}\u{11AC}",
-        nfkc: "\u{B5C1}",
-        nfkd: "\u{1104}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B5C2}",
-        nfc: "\u{B5C2}",
-        nfd: "\u{1104}\u{1166}\u{11AD}",
-        nfkc: "\u{B5C2}",
-        nfkd: "\u{1104}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B5C3}",
-        nfc: "\u{B5C3}",
-        nfd: "\u{1104}\u{1166}\u{11AE}",
-        nfkc: "\u{B5C3}",
-        nfkd: "\u{1104}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B5C4}",
-        nfc: "\u{B5C4}",
-        nfd: "\u{1104}\u{1166}\u{11AF}",
-        nfkc: "\u{B5C4}",
-        nfkd: "\u{1104}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B5C5}",
-        nfc: "\u{B5C5}",
-        nfd: "\u{1104}\u{1166}\u{11B0}",
-        nfkc: "\u{B5C5}",
-        nfkd: "\u{1104}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B5C6}",
-        nfc: "\u{B5C6}",
-        nfd: "\u{1104}\u{1166}\u{11B1}",
-        nfkc: "\u{B5C6}",
-        nfkd: "\u{1104}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B5C7}",
-        nfc: "\u{B5C7}",
-        nfd: "\u{1104}\u{1166}\u{11B2}",
-        nfkc: "\u{B5C7}",
-        nfkd: "\u{1104}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B5C8}",
-        nfc: "\u{B5C8}",
-        nfd: "\u{1104}\u{1166}\u{11B3}",
-        nfkc: "\u{B5C8}",
-        nfkd: "\u{1104}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B5C9}",
-        nfc: "\u{B5C9}",
-        nfd: "\u{1104}\u{1166}\u{11B4}",
-        nfkc: "\u{B5C9}",
-        nfkd: "\u{1104}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B5CA}",
-        nfc: "\u{B5CA}",
-        nfd: "\u{1104}\u{1166}\u{11B5}",
-        nfkc: "\u{B5CA}",
-        nfkd: "\u{1104}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B5CB}",
-        nfc: "\u{B5CB}",
-        nfd: "\u{1104}\u{1166}\u{11B6}",
-        nfkc: "\u{B5CB}",
-        nfkd: "\u{1104}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B5CC}",
-        nfc: "\u{B5CC}",
-        nfd: "\u{1104}\u{1166}\u{11B7}",
-        nfkc: "\u{B5CC}",
-        nfkd: "\u{1104}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B5CD}",
-        nfc: "\u{B5CD}",
-        nfd: "\u{1104}\u{1166}\u{11B8}",
-        nfkc: "\u{B5CD}",
-        nfkd: "\u{1104}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B5CE}",
-        nfc: "\u{B5CE}",
-        nfd: "\u{1104}\u{1166}\u{11B9}",
-        nfkc: "\u{B5CE}",
-        nfkd: "\u{1104}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B5CF}",
-        nfc: "\u{B5CF}",
-        nfd: "\u{1104}\u{1166}\u{11BA}",
-        nfkc: "\u{B5CF}",
-        nfkd: "\u{1104}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B5D0}",
-        nfc: "\u{B5D0}",
-        nfd: "\u{1104}\u{1166}\u{11BB}",
-        nfkc: "\u{B5D0}",
-        nfkd: "\u{1104}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B5D1}",
-        nfc: "\u{B5D1}",
-        nfd: "\u{1104}\u{1166}\u{11BC}",
-        nfkc: "\u{B5D1}",
-        nfkd: "\u{1104}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B5D2}",
-        nfc: "\u{B5D2}",
-        nfd: "\u{1104}\u{1166}\u{11BD}",
-        nfkc: "\u{B5D2}",
-        nfkd: "\u{1104}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B5D3}",
-        nfc: "\u{B5D3}",
-        nfd: "\u{1104}\u{1166}\u{11BE}",
-        nfkc: "\u{B5D3}",
-        nfkd: "\u{1104}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B5D4}",
-        nfc: "\u{B5D4}",
-        nfd: "\u{1104}\u{1166}\u{11BF}",
-        nfkc: "\u{B5D4}",
-        nfkd: "\u{1104}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B5D5}",
-        nfc: "\u{B5D5}",
-        nfd: "\u{1104}\u{1166}\u{11C0}",
-        nfkc: "\u{B5D5}",
-        nfkd: "\u{1104}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B5D6}",
-        nfc: "\u{B5D6}",
-        nfd: "\u{1104}\u{1166}\u{11C1}",
-        nfkc: "\u{B5D6}",
-        nfkd: "\u{1104}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B5D7}",
-        nfc: "\u{B5D7}",
-        nfd: "\u{1104}\u{1166}\u{11C2}",
-        nfkc: "\u{B5D7}",
-        nfkd: "\u{1104}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B5D8}",
-        nfc: "\u{B5D8}",
-        nfd: "\u{1104}\u{1167}",
-        nfkc: "\u{B5D8}",
-        nfkd: "\u{1104}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{B5D9}",
-        nfc: "\u{B5D9}",
-        nfd: "\u{1104}\u{1167}\u{11A8}",
-        nfkc: "\u{B5D9}",
-        nfkd: "\u{1104}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B5DA}",
-        nfc: "\u{B5DA}",
-        nfd: "\u{1104}\u{1167}\u{11A9}",
-        nfkc: "\u{B5DA}",
-        nfkd: "\u{1104}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B5DB}",
-        nfc: "\u{B5DB}",
-        nfd: "\u{1104}\u{1167}\u{11AA}",
-        nfkc: "\u{B5DB}",
-        nfkd: "\u{1104}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B5DC}",
-        nfc: "\u{B5DC}",
-        nfd: "\u{1104}\u{1167}\u{11AB}",
-        nfkc: "\u{B5DC}",
-        nfkd: "\u{1104}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B5DD}",
-        nfc: "\u{B5DD}",
-        nfd: "\u{1104}\u{1167}\u{11AC}",
-        nfkc: "\u{B5DD}",
-        nfkd: "\u{1104}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B5DE}",
-        nfc: "\u{B5DE}",
-        nfd: "\u{1104}\u{1167}\u{11AD}",
-        nfkc: "\u{B5DE}",
-        nfkd: "\u{1104}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B5DF}",
-        nfc: "\u{B5DF}",
-        nfd: "\u{1104}\u{1167}\u{11AE}",
-        nfkc: "\u{B5DF}",
-        nfkd: "\u{1104}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B5E0}",
-        nfc: "\u{B5E0}",
-        nfd: "\u{1104}\u{1167}\u{11AF}",
-        nfkc: "\u{B5E0}",
-        nfkd: "\u{1104}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B5E1}",
-        nfc: "\u{B5E1}",
-        nfd: "\u{1104}\u{1167}\u{11B0}",
-        nfkc: "\u{B5E1}",
-        nfkd: "\u{1104}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B5E2}",
-        nfc: "\u{B5E2}",
-        nfd: "\u{1104}\u{1167}\u{11B1}",
-        nfkc: "\u{B5E2}",
-        nfkd: "\u{1104}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B5E3}",
-        nfc: "\u{B5E3}",
-        nfd: "\u{1104}\u{1167}\u{11B2}",
-        nfkc: "\u{B5E3}",
-        nfkd: "\u{1104}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B5E4}",
-        nfc: "\u{B5E4}",
-        nfd: "\u{1104}\u{1167}\u{11B3}",
-        nfkc: "\u{B5E4}",
-        nfkd: "\u{1104}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B5E5}",
-        nfc: "\u{B5E5}",
-        nfd: "\u{1104}\u{1167}\u{11B4}",
-        nfkc: "\u{B5E5}",
-        nfkd: "\u{1104}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B5E6}",
-        nfc: "\u{B5E6}",
-        nfd: "\u{1104}\u{1167}\u{11B5}",
-        nfkc: "\u{B5E6}",
-        nfkd: "\u{1104}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B5E7}",
-        nfc: "\u{B5E7}",
-        nfd: "\u{1104}\u{1167}\u{11B6}",
-        nfkc: "\u{B5E7}",
-        nfkd: "\u{1104}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B5E8}",
-        nfc: "\u{B5E8}",
-        nfd: "\u{1104}\u{1167}\u{11B7}",
-        nfkc: "\u{B5E8}",
-        nfkd: "\u{1104}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B5E9}",
-        nfc: "\u{B5E9}",
-        nfd: "\u{1104}\u{1167}\u{11B8}",
-        nfkc: "\u{B5E9}",
-        nfkd: "\u{1104}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B5EA}",
-        nfc: "\u{B5EA}",
-        nfd: "\u{1104}\u{1167}\u{11B9}",
-        nfkc: "\u{B5EA}",
-        nfkd: "\u{1104}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B5EB}",
-        nfc: "\u{B5EB}",
-        nfd: "\u{1104}\u{1167}\u{11BA}",
-        nfkc: "\u{B5EB}",
-        nfkd: "\u{1104}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B5EC}",
-        nfc: "\u{B5EC}",
-        nfd: "\u{1104}\u{1167}\u{11BB}",
-        nfkc: "\u{B5EC}",
-        nfkd: "\u{1104}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B5ED}",
-        nfc: "\u{B5ED}",
-        nfd: "\u{1104}\u{1167}\u{11BC}",
-        nfkc: "\u{B5ED}",
-        nfkd: "\u{1104}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B5EE}",
-        nfc: "\u{B5EE}",
-        nfd: "\u{1104}\u{1167}\u{11BD}",
-        nfkc: "\u{B5EE}",
-        nfkd: "\u{1104}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B5EF}",
-        nfc: "\u{B5EF}",
-        nfd: "\u{1104}\u{1167}\u{11BE}",
-        nfkc: "\u{B5EF}",
-        nfkd: "\u{1104}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B5F0}",
-        nfc: "\u{B5F0}",
-        nfd: "\u{1104}\u{1167}\u{11BF}",
-        nfkc: "\u{B5F0}",
-        nfkd: "\u{1104}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B5F1}",
-        nfc: "\u{B5F1}",
-        nfd: "\u{1104}\u{1167}\u{11C0}",
-        nfkc: "\u{B5F1}",
-        nfkd: "\u{1104}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B5F2}",
-        nfc: "\u{B5F2}",
-        nfd: "\u{1104}\u{1167}\u{11C1}",
-        nfkc: "\u{B5F2}",
-        nfkd: "\u{1104}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B5F3}",
-        nfc: "\u{B5F3}",
-        nfd: "\u{1104}\u{1167}\u{11C2}",
-        nfkc: "\u{B5F3}",
-        nfkd: "\u{1104}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B5F4}",
-        nfc: "\u{B5F4}",
-        nfd: "\u{1104}\u{1168}",
-        nfkc: "\u{B5F4}",
-        nfkd: "\u{1104}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{B5F5}",
-        nfc: "\u{B5F5}",
-        nfd: "\u{1104}\u{1168}\u{11A8}",
-        nfkc: "\u{B5F5}",
-        nfkd: "\u{1104}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B5F6}",
-        nfc: "\u{B5F6}",
-        nfd: "\u{1104}\u{1168}\u{11A9}",
-        nfkc: "\u{B5F6}",
-        nfkd: "\u{1104}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B5F7}",
-        nfc: "\u{B5F7}",
-        nfd: "\u{1104}\u{1168}\u{11AA}",
-        nfkc: "\u{B5F7}",
-        nfkd: "\u{1104}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B5F8}",
-        nfc: "\u{B5F8}",
-        nfd: "\u{1104}\u{1168}\u{11AB}",
-        nfkc: "\u{B5F8}",
-        nfkd: "\u{1104}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B5F9}",
-        nfc: "\u{B5F9}",
-        nfd: "\u{1104}\u{1168}\u{11AC}",
-        nfkc: "\u{B5F9}",
-        nfkd: "\u{1104}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B5FA}",
-        nfc: "\u{B5FA}",
-        nfd: "\u{1104}\u{1168}\u{11AD}",
-        nfkc: "\u{B5FA}",
-        nfkd: "\u{1104}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B5FB}",
-        nfc: "\u{B5FB}",
-        nfd: "\u{1104}\u{1168}\u{11AE}",
-        nfkc: "\u{B5FB}",
-        nfkd: "\u{1104}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B5FC}",
-        nfc: "\u{B5FC}",
-        nfd: "\u{1104}\u{1168}\u{11AF}",
-        nfkc: "\u{B5FC}",
-        nfkd: "\u{1104}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B5FD}",
-        nfc: "\u{B5FD}",
-        nfd: "\u{1104}\u{1168}\u{11B0}",
-        nfkc: "\u{B5FD}",
-        nfkd: "\u{1104}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B5FE}",
-        nfc: "\u{B5FE}",
-        nfd: "\u{1104}\u{1168}\u{11B1}",
-        nfkc: "\u{B5FE}",
-        nfkd: "\u{1104}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B5FF}",
-        nfc: "\u{B5FF}",
-        nfd: "\u{1104}\u{1168}\u{11B2}",
-        nfkc: "\u{B5FF}",
-        nfkd: "\u{1104}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B600}",
-        nfc: "\u{B600}",
-        nfd: "\u{1104}\u{1168}\u{11B3}",
-        nfkc: "\u{B600}",
-        nfkd: "\u{1104}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B601}",
-        nfc: "\u{B601}",
-        nfd: "\u{1104}\u{1168}\u{11B4}",
-        nfkc: "\u{B601}",
-        nfkd: "\u{1104}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B602}",
-        nfc: "\u{B602}",
-        nfd: "\u{1104}\u{1168}\u{11B5}",
-        nfkc: "\u{B602}",
-        nfkd: "\u{1104}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B603}",
-        nfc: "\u{B603}",
-        nfd: "\u{1104}\u{1168}\u{11B6}",
-        nfkc: "\u{B603}",
-        nfkd: "\u{1104}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B604}",
-        nfc: "\u{B604}",
-        nfd: "\u{1104}\u{1168}\u{11B7}",
-        nfkc: "\u{B604}",
-        nfkd: "\u{1104}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B605}",
-        nfc: "\u{B605}",
-        nfd: "\u{1104}\u{1168}\u{11B8}",
-        nfkc: "\u{B605}",
-        nfkd: "\u{1104}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B606}",
-        nfc: "\u{B606}",
-        nfd: "\u{1104}\u{1168}\u{11B9}",
-        nfkc: "\u{B606}",
-        nfkd: "\u{1104}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B607}",
-        nfc: "\u{B607}",
-        nfd: "\u{1104}\u{1168}\u{11BA}",
-        nfkc: "\u{B607}",
-        nfkd: "\u{1104}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B608}",
-        nfc: "\u{B608}",
-        nfd: "\u{1104}\u{1168}\u{11BB}",
-        nfkc: "\u{B608}",
-        nfkd: "\u{1104}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B609}",
-        nfc: "\u{B609}",
-        nfd: "\u{1104}\u{1168}\u{11BC}",
-        nfkc: "\u{B609}",
-        nfkd: "\u{1104}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B60A}",
-        nfc: "\u{B60A}",
-        nfd: "\u{1104}\u{1168}\u{11BD}",
-        nfkc: "\u{B60A}",
-        nfkd: "\u{1104}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B60B}",
-        nfc: "\u{B60B}",
-        nfd: "\u{1104}\u{1168}\u{11BE}",
-        nfkc: "\u{B60B}",
-        nfkd: "\u{1104}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B60C}",
-        nfc: "\u{B60C}",
-        nfd: "\u{1104}\u{1168}\u{11BF}",
-        nfkc: "\u{B60C}",
-        nfkd: "\u{1104}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B60D}",
-        nfc: "\u{B60D}",
-        nfd: "\u{1104}\u{1168}\u{11C0}",
-        nfkc: "\u{B60D}",
-        nfkd: "\u{1104}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B60E}",
-        nfc: "\u{B60E}",
-        nfd: "\u{1104}\u{1168}\u{11C1}",
-        nfkc: "\u{B60E}",
-        nfkd: "\u{1104}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B60F}",
-        nfc: "\u{B60F}",
-        nfd: "\u{1104}\u{1168}\u{11C2}",
-        nfkc: "\u{B60F}",
-        nfkd: "\u{1104}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B610}",
-        nfc: "\u{B610}",
-        nfd: "\u{1104}\u{1169}",
-        nfkc: "\u{B610}",
-        nfkd: "\u{1104}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{B611}",
-        nfc: "\u{B611}",
-        nfd: "\u{1104}\u{1169}\u{11A8}",
-        nfkc: "\u{B611}",
-        nfkd: "\u{1104}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B612}",
-        nfc: "\u{B612}",
-        nfd: "\u{1104}\u{1169}\u{11A9}",
-        nfkc: "\u{B612}",
-        nfkd: "\u{1104}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B613}",
-        nfc: "\u{B613}",
-        nfd: "\u{1104}\u{1169}\u{11AA}",
-        nfkc: "\u{B613}",
-        nfkd: "\u{1104}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B614}",
-        nfc: "\u{B614}",
-        nfd: "\u{1104}\u{1169}\u{11AB}",
-        nfkc: "\u{B614}",
-        nfkd: "\u{1104}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B615}",
-        nfc: "\u{B615}",
-        nfd: "\u{1104}\u{1169}\u{11AC}",
-        nfkc: "\u{B615}",
-        nfkd: "\u{1104}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B616}",
-        nfc: "\u{B616}",
-        nfd: "\u{1104}\u{1169}\u{11AD}",
-        nfkc: "\u{B616}",
-        nfkd: "\u{1104}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B617}",
-        nfc: "\u{B617}",
-        nfd: "\u{1104}\u{1169}\u{11AE}",
-        nfkc: "\u{B617}",
-        nfkd: "\u{1104}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B618}",
-        nfc: "\u{B618}",
-        nfd: "\u{1104}\u{1169}\u{11AF}",
-        nfkc: "\u{B618}",
-        nfkd: "\u{1104}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B619}",
-        nfc: "\u{B619}",
-        nfd: "\u{1104}\u{1169}\u{11B0}",
-        nfkc: "\u{B619}",
-        nfkd: "\u{1104}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B61A}",
-        nfc: "\u{B61A}",
-        nfd: "\u{1104}\u{1169}\u{11B1}",
-        nfkc: "\u{B61A}",
-        nfkd: "\u{1104}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B61B}",
-        nfc: "\u{B61B}",
-        nfd: "\u{1104}\u{1169}\u{11B2}",
-        nfkc: "\u{B61B}",
-        nfkd: "\u{1104}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B61C}",
-        nfc: "\u{B61C}",
-        nfd: "\u{1104}\u{1169}\u{11B3}",
-        nfkc: "\u{B61C}",
-        nfkd: "\u{1104}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B61D}",
-        nfc: "\u{B61D}",
-        nfd: "\u{1104}\u{1169}\u{11B4}",
-        nfkc: "\u{B61D}",
-        nfkd: "\u{1104}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B61E}",
-        nfc: "\u{B61E}",
-        nfd: "\u{1104}\u{1169}\u{11B5}",
-        nfkc: "\u{B61E}",
-        nfkd: "\u{1104}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B61F}",
-        nfc: "\u{B61F}",
-        nfd: "\u{1104}\u{1169}\u{11B6}",
-        nfkc: "\u{B61F}",
-        nfkd: "\u{1104}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B620}",
-        nfc: "\u{B620}",
-        nfd: "\u{1104}\u{1169}\u{11B7}",
-        nfkc: "\u{B620}",
-        nfkd: "\u{1104}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B621}",
-        nfc: "\u{B621}",
-        nfd: "\u{1104}\u{1169}\u{11B8}",
-        nfkc: "\u{B621}",
-        nfkd: "\u{1104}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B622}",
-        nfc: "\u{B622}",
-        nfd: "\u{1104}\u{1169}\u{11B9}",
-        nfkc: "\u{B622}",
-        nfkd: "\u{1104}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B623}",
-        nfc: "\u{B623}",
-        nfd: "\u{1104}\u{1169}\u{11BA}",
-        nfkc: "\u{B623}",
-        nfkd: "\u{1104}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B624}",
-        nfc: "\u{B624}",
-        nfd: "\u{1104}\u{1169}\u{11BB}",
-        nfkc: "\u{B624}",
-        nfkd: "\u{1104}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B625}",
-        nfc: "\u{B625}",
-        nfd: "\u{1104}\u{1169}\u{11BC}",
-        nfkc: "\u{B625}",
-        nfkd: "\u{1104}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B626}",
-        nfc: "\u{B626}",
-        nfd: "\u{1104}\u{1169}\u{11BD}",
-        nfkc: "\u{B626}",
-        nfkd: "\u{1104}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B627}",
-        nfc: "\u{B627}",
-        nfd: "\u{1104}\u{1169}\u{11BE}",
-        nfkc: "\u{B627}",
-        nfkd: "\u{1104}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B628}",
-        nfc: "\u{B628}",
-        nfd: "\u{1104}\u{1169}\u{11BF}",
-        nfkc: "\u{B628}",
-        nfkd: "\u{1104}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B629}",
-        nfc: "\u{B629}",
-        nfd: "\u{1104}\u{1169}\u{11C0}",
-        nfkc: "\u{B629}",
-        nfkd: "\u{1104}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B62A}",
-        nfc: "\u{B62A}",
-        nfd: "\u{1104}\u{1169}\u{11C1}",
-        nfkc: "\u{B62A}",
-        nfkd: "\u{1104}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B62B}",
-        nfc: "\u{B62B}",
-        nfd: "\u{1104}\u{1169}\u{11C2}",
-        nfkc: "\u{B62B}",
-        nfkd: "\u{1104}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B62C}",
-        nfc: "\u{B62C}",
-        nfd: "\u{1104}\u{116A}",
-        nfkc: "\u{B62C}",
-        nfkd: "\u{1104}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{B62D}",
-        nfc: "\u{B62D}",
-        nfd: "\u{1104}\u{116A}\u{11A8}",
-        nfkc: "\u{B62D}",
-        nfkd: "\u{1104}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B62E}",
-        nfc: "\u{B62E}",
-        nfd: "\u{1104}\u{116A}\u{11A9}",
-        nfkc: "\u{B62E}",
-        nfkd: "\u{1104}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B62F}",
-        nfc: "\u{B62F}",
-        nfd: "\u{1104}\u{116A}\u{11AA}",
-        nfkc: "\u{B62F}",
-        nfkd: "\u{1104}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B630}",
-        nfc: "\u{B630}",
-        nfd: "\u{1104}\u{116A}\u{11AB}",
-        nfkc: "\u{B630}",
-        nfkd: "\u{1104}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B631}",
-        nfc: "\u{B631}",
-        nfd: "\u{1104}\u{116A}\u{11AC}",
-        nfkc: "\u{B631}",
-        nfkd: "\u{1104}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B632}",
-        nfc: "\u{B632}",
-        nfd: "\u{1104}\u{116A}\u{11AD}",
-        nfkc: "\u{B632}",
-        nfkd: "\u{1104}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B633}",
-        nfc: "\u{B633}",
-        nfd: "\u{1104}\u{116A}\u{11AE}",
-        nfkc: "\u{B633}",
-        nfkd: "\u{1104}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B634}",
-        nfc: "\u{B634}",
-        nfd: "\u{1104}\u{116A}\u{11AF}",
-        nfkc: "\u{B634}",
-        nfkd: "\u{1104}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B635}",
-        nfc: "\u{B635}",
-        nfd: "\u{1104}\u{116A}\u{11B0}",
-        nfkc: "\u{B635}",
-        nfkd: "\u{1104}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B636}",
-        nfc: "\u{B636}",
-        nfd: "\u{1104}\u{116A}\u{11B1}",
-        nfkc: "\u{B636}",
-        nfkd: "\u{1104}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B637}",
-        nfc: "\u{B637}",
-        nfd: "\u{1104}\u{116A}\u{11B2}",
-        nfkc: "\u{B637}",
-        nfkd: "\u{1104}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B638}",
-        nfc: "\u{B638}",
-        nfd: "\u{1104}\u{116A}\u{11B3}",
-        nfkc: "\u{B638}",
-        nfkd: "\u{1104}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B639}",
-        nfc: "\u{B639}",
-        nfd: "\u{1104}\u{116A}\u{11B4}",
-        nfkc: "\u{B639}",
-        nfkd: "\u{1104}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B63A}",
-        nfc: "\u{B63A}",
-        nfd: "\u{1104}\u{116A}\u{11B5}",
-        nfkc: "\u{B63A}",
-        nfkd: "\u{1104}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B63B}",
-        nfc: "\u{B63B}",
-        nfd: "\u{1104}\u{116A}\u{11B6}",
-        nfkc: "\u{B63B}",
-        nfkd: "\u{1104}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B63C}",
-        nfc: "\u{B63C}",
-        nfd: "\u{1104}\u{116A}\u{11B7}",
-        nfkc: "\u{B63C}",
-        nfkd: "\u{1104}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B63D}",
-        nfc: "\u{B63D}",
-        nfd: "\u{1104}\u{116A}\u{11B8}",
-        nfkc: "\u{B63D}",
-        nfkd: "\u{1104}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B63E}",
-        nfc: "\u{B63E}",
-        nfd: "\u{1104}\u{116A}\u{11B9}",
-        nfkc: "\u{B63E}",
-        nfkd: "\u{1104}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B63F}",
-        nfc: "\u{B63F}",
-        nfd: "\u{1104}\u{116A}\u{11BA}",
-        nfkc: "\u{B63F}",
-        nfkd: "\u{1104}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B640}",
-        nfc: "\u{B640}",
-        nfd: "\u{1104}\u{116A}\u{11BB}",
-        nfkc: "\u{B640}",
-        nfkd: "\u{1104}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B641}",
-        nfc: "\u{B641}",
-        nfd: "\u{1104}\u{116A}\u{11BC}",
-        nfkc: "\u{B641}",
-        nfkd: "\u{1104}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B642}",
-        nfc: "\u{B642}",
-        nfd: "\u{1104}\u{116A}\u{11BD}",
-        nfkc: "\u{B642}",
-        nfkd: "\u{1104}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B643}",
-        nfc: "\u{B643}",
-        nfd: "\u{1104}\u{116A}\u{11BE}",
-        nfkc: "\u{B643}",
-        nfkd: "\u{1104}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B644}",
-        nfc: "\u{B644}",
-        nfd: "\u{1104}\u{116A}\u{11BF}",
-        nfkc: "\u{B644}",
-        nfkd: "\u{1104}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B645}",
-        nfc: "\u{B645}",
-        nfd: "\u{1104}\u{116A}\u{11C0}",
-        nfkc: "\u{B645}",
-        nfkd: "\u{1104}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B646}",
-        nfc: "\u{B646}",
-        nfd: "\u{1104}\u{116A}\u{11C1}",
-        nfkc: "\u{B646}",
-        nfkd: "\u{1104}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B647}",
-        nfc: "\u{B647}",
-        nfd: "\u{1104}\u{116A}\u{11C2}",
-        nfkc: "\u{B647}",
-        nfkd: "\u{1104}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B648}",
-        nfc: "\u{B648}",
-        nfd: "\u{1104}\u{116B}",
-        nfkc: "\u{B648}",
-        nfkd: "\u{1104}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{B649}",
-        nfc: "\u{B649}",
-        nfd: "\u{1104}\u{116B}\u{11A8}",
-        nfkc: "\u{B649}",
-        nfkd: "\u{1104}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B64A}",
-        nfc: "\u{B64A}",
-        nfd: "\u{1104}\u{116B}\u{11A9}",
-        nfkc: "\u{B64A}",
-        nfkd: "\u{1104}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B64B}",
-        nfc: "\u{B64B}",
-        nfd: "\u{1104}\u{116B}\u{11AA}",
-        nfkc: "\u{B64B}",
-        nfkd: "\u{1104}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B64C}",
-        nfc: "\u{B64C}",
-        nfd: "\u{1104}\u{116B}\u{11AB}",
-        nfkc: "\u{B64C}",
-        nfkd: "\u{1104}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B64D}",
-        nfc: "\u{B64D}",
-        nfd: "\u{1104}\u{116B}\u{11AC}",
-        nfkc: "\u{B64D}",
-        nfkd: "\u{1104}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B64E}",
-        nfc: "\u{B64E}",
-        nfd: "\u{1104}\u{116B}\u{11AD}",
-        nfkc: "\u{B64E}",
-        nfkd: "\u{1104}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B64F}",
-        nfc: "\u{B64F}",
-        nfd: "\u{1104}\u{116B}\u{11AE}",
-        nfkc: "\u{B64F}",
-        nfkd: "\u{1104}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B650}",
-        nfc: "\u{B650}",
-        nfd: "\u{1104}\u{116B}\u{11AF}",
-        nfkc: "\u{B650}",
-        nfkd: "\u{1104}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B651}",
-        nfc: "\u{B651}",
-        nfd: "\u{1104}\u{116B}\u{11B0}",
-        nfkc: "\u{B651}",
-        nfkd: "\u{1104}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B652}",
-        nfc: "\u{B652}",
-        nfd: "\u{1104}\u{116B}\u{11B1}",
-        nfkc: "\u{B652}",
-        nfkd: "\u{1104}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B653}",
-        nfc: "\u{B653}",
-        nfd: "\u{1104}\u{116B}\u{11B2}",
-        nfkc: "\u{B653}",
-        nfkd: "\u{1104}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B654}",
-        nfc: "\u{B654}",
-        nfd: "\u{1104}\u{116B}\u{11B3}",
-        nfkc: "\u{B654}",
-        nfkd: "\u{1104}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B655}",
-        nfc: "\u{B655}",
-        nfd: "\u{1104}\u{116B}\u{11B4}",
-        nfkc: "\u{B655}",
-        nfkd: "\u{1104}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B656}",
-        nfc: "\u{B656}",
-        nfd: "\u{1104}\u{116B}\u{11B5}",
-        nfkc: "\u{B656}",
-        nfkd: "\u{1104}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B657}",
-        nfc: "\u{B657}",
-        nfd: "\u{1104}\u{116B}\u{11B6}",
-        nfkc: "\u{B657}",
-        nfkd: "\u{1104}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B658}",
-        nfc: "\u{B658}",
-        nfd: "\u{1104}\u{116B}\u{11B7}",
-        nfkc: "\u{B658}",
-        nfkd: "\u{1104}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B659}",
-        nfc: "\u{B659}",
-        nfd: "\u{1104}\u{116B}\u{11B8}",
-        nfkc: "\u{B659}",
-        nfkd: "\u{1104}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B65A}",
-        nfc: "\u{B65A}",
-        nfd: "\u{1104}\u{116B}\u{11B9}",
-        nfkc: "\u{B65A}",
-        nfkd: "\u{1104}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B65B}",
-        nfc: "\u{B65B}",
-        nfd: "\u{1104}\u{116B}\u{11BA}",
-        nfkc: "\u{B65B}",
-        nfkd: "\u{1104}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B65C}",
-        nfc: "\u{B65C}",
-        nfd: "\u{1104}\u{116B}\u{11BB}",
-        nfkc: "\u{B65C}",
-        nfkd: "\u{1104}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B65D}",
-        nfc: "\u{B65D}",
-        nfd: "\u{1104}\u{116B}\u{11BC}",
-        nfkc: "\u{B65D}",
-        nfkd: "\u{1104}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B65E}",
-        nfc: "\u{B65E}",
-        nfd: "\u{1104}\u{116B}\u{11BD}",
-        nfkc: "\u{B65E}",
-        nfkd: "\u{1104}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B65F}",
-        nfc: "\u{B65F}",
-        nfd: "\u{1104}\u{116B}\u{11BE}",
-        nfkc: "\u{B65F}",
-        nfkd: "\u{1104}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B660}",
-        nfc: "\u{B660}",
-        nfd: "\u{1104}\u{116B}\u{11BF}",
-        nfkc: "\u{B660}",
-        nfkd: "\u{1104}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B661}",
-        nfc: "\u{B661}",
-        nfd: "\u{1104}\u{116B}\u{11C0}",
-        nfkc: "\u{B661}",
-        nfkd: "\u{1104}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B662}",
-        nfc: "\u{B662}",
-        nfd: "\u{1104}\u{116B}\u{11C1}",
-        nfkc: "\u{B662}",
-        nfkd: "\u{1104}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B663}",
-        nfc: "\u{B663}",
-        nfd: "\u{1104}\u{116B}\u{11C2}",
-        nfkc: "\u{B663}",
-        nfkd: "\u{1104}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B664}",
-        nfc: "\u{B664}",
-        nfd: "\u{1104}\u{116C}",
-        nfkc: "\u{B664}",
-        nfkd: "\u{1104}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{B665}",
-        nfc: "\u{B665}",
-        nfd: "\u{1104}\u{116C}\u{11A8}",
-        nfkc: "\u{B665}",
-        nfkd: "\u{1104}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B666}",
-        nfc: "\u{B666}",
-        nfd: "\u{1104}\u{116C}\u{11A9}",
-        nfkc: "\u{B666}",
-        nfkd: "\u{1104}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B667}",
-        nfc: "\u{B667}",
-        nfd: "\u{1104}\u{116C}\u{11AA}",
-        nfkc: "\u{B667}",
-        nfkd: "\u{1104}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B668}",
-        nfc: "\u{B668}",
-        nfd: "\u{1104}\u{116C}\u{11AB}",
-        nfkc: "\u{B668}",
-        nfkd: "\u{1104}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B669}",
-        nfc: "\u{B669}",
-        nfd: "\u{1104}\u{116C}\u{11AC}",
-        nfkc: "\u{B669}",
-        nfkd: "\u{1104}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B66A}",
-        nfc: "\u{B66A}",
-        nfd: "\u{1104}\u{116C}\u{11AD}",
-        nfkc: "\u{B66A}",
-        nfkd: "\u{1104}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B66B}",
-        nfc: "\u{B66B}",
-        nfd: "\u{1104}\u{116C}\u{11AE}",
-        nfkc: "\u{B66B}",
-        nfkd: "\u{1104}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B66C}",
-        nfc: "\u{B66C}",
-        nfd: "\u{1104}\u{116C}\u{11AF}",
-        nfkc: "\u{B66C}",
-        nfkd: "\u{1104}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B66D}",
-        nfc: "\u{B66D}",
-        nfd: "\u{1104}\u{116C}\u{11B0}",
-        nfkc: "\u{B66D}",
-        nfkd: "\u{1104}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B66E}",
-        nfc: "\u{B66E}",
-        nfd: "\u{1104}\u{116C}\u{11B1}",
-        nfkc: "\u{B66E}",
-        nfkd: "\u{1104}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B66F}",
-        nfc: "\u{B66F}",
-        nfd: "\u{1104}\u{116C}\u{11B2}",
-        nfkc: "\u{B66F}",
-        nfkd: "\u{1104}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B670}",
-        nfc: "\u{B670}",
-        nfd: "\u{1104}\u{116C}\u{11B3}",
-        nfkc: "\u{B670}",
-        nfkd: "\u{1104}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B671}",
-        nfc: "\u{B671}",
-        nfd: "\u{1104}\u{116C}\u{11B4}",
-        nfkc: "\u{B671}",
-        nfkd: "\u{1104}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B672}",
-        nfc: "\u{B672}",
-        nfd: "\u{1104}\u{116C}\u{11B5}",
-        nfkc: "\u{B672}",
-        nfkd: "\u{1104}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B673}",
-        nfc: "\u{B673}",
-        nfd: "\u{1104}\u{116C}\u{11B6}",
-        nfkc: "\u{B673}",
-        nfkd: "\u{1104}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B674}",
-        nfc: "\u{B674}",
-        nfd: "\u{1104}\u{116C}\u{11B7}",
-        nfkc: "\u{B674}",
-        nfkd: "\u{1104}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B675}",
-        nfc: "\u{B675}",
-        nfd: "\u{1104}\u{116C}\u{11B8}",
-        nfkc: "\u{B675}",
-        nfkd: "\u{1104}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B676}",
-        nfc: "\u{B676}",
-        nfd: "\u{1104}\u{116C}\u{11B9}",
-        nfkc: "\u{B676}",
-        nfkd: "\u{1104}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B677}",
-        nfc: "\u{B677}",
-        nfd: "\u{1104}\u{116C}\u{11BA}",
-        nfkc: "\u{B677}",
-        nfkd: "\u{1104}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B678}",
-        nfc: "\u{B678}",
-        nfd: "\u{1104}\u{116C}\u{11BB}",
-        nfkc: "\u{B678}",
-        nfkd: "\u{1104}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B679}",
-        nfc: "\u{B679}",
-        nfd: "\u{1104}\u{116C}\u{11BC}",
-        nfkc: "\u{B679}",
-        nfkd: "\u{1104}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B67A}",
-        nfc: "\u{B67A}",
-        nfd: "\u{1104}\u{116C}\u{11BD}",
-        nfkc: "\u{B67A}",
-        nfkd: "\u{1104}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B67B}",
-        nfc: "\u{B67B}",
-        nfd: "\u{1104}\u{116C}\u{11BE}",
-        nfkc: "\u{B67B}",
-        nfkd: "\u{1104}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B67C}",
-        nfc: "\u{B67C}",
-        nfd: "\u{1104}\u{116C}\u{11BF}",
-        nfkc: "\u{B67C}",
-        nfkd: "\u{1104}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B67D}",
-        nfc: "\u{B67D}",
-        nfd: "\u{1104}\u{116C}\u{11C0}",
-        nfkc: "\u{B67D}",
-        nfkd: "\u{1104}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B67E}",
-        nfc: "\u{B67E}",
-        nfd: "\u{1104}\u{116C}\u{11C1}",
-        nfkc: "\u{B67E}",
-        nfkd: "\u{1104}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B67F}",
-        nfc: "\u{B67F}",
-        nfd: "\u{1104}\u{116C}\u{11C2}",
-        nfkc: "\u{B67F}",
-        nfkd: "\u{1104}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B680}",
-        nfc: "\u{B680}",
-        nfd: "\u{1104}\u{116D}",
-        nfkc: "\u{B680}",
-        nfkd: "\u{1104}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{B681}",
-        nfc: "\u{B681}",
-        nfd: "\u{1104}\u{116D}\u{11A8}",
-        nfkc: "\u{B681}",
-        nfkd: "\u{1104}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B682}",
-        nfc: "\u{B682}",
-        nfd: "\u{1104}\u{116D}\u{11A9}",
-        nfkc: "\u{B682}",
-        nfkd: "\u{1104}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B683}",
-        nfc: "\u{B683}",
-        nfd: "\u{1104}\u{116D}\u{11AA}",
-        nfkc: "\u{B683}",
-        nfkd: "\u{1104}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B684}",
-        nfc: "\u{B684}",
-        nfd: "\u{1104}\u{116D}\u{11AB}",
-        nfkc: "\u{B684}",
-        nfkd: "\u{1104}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B685}",
-        nfc: "\u{B685}",
-        nfd: "\u{1104}\u{116D}\u{11AC}",
-        nfkc: "\u{B685}",
-        nfkd: "\u{1104}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B686}",
-        nfc: "\u{B686}",
-        nfd: "\u{1104}\u{116D}\u{11AD}",
-        nfkc: "\u{B686}",
-        nfkd: "\u{1104}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B687}",
-        nfc: "\u{B687}",
-        nfd: "\u{1104}\u{116D}\u{11AE}",
-        nfkc: "\u{B687}",
-        nfkd: "\u{1104}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B688}",
-        nfc: "\u{B688}",
-        nfd: "\u{1104}\u{116D}\u{11AF}",
-        nfkc: "\u{B688}",
-        nfkd: "\u{1104}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B689}",
-        nfc: "\u{B689}",
-        nfd: "\u{1104}\u{116D}\u{11B0}",
-        nfkc: "\u{B689}",
-        nfkd: "\u{1104}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B68A}",
-        nfc: "\u{B68A}",
-        nfd: "\u{1104}\u{116D}\u{11B1}",
-        nfkc: "\u{B68A}",
-        nfkd: "\u{1104}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B68B}",
-        nfc: "\u{B68B}",
-        nfd: "\u{1104}\u{116D}\u{11B2}",
-        nfkc: "\u{B68B}",
-        nfkd: "\u{1104}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B68C}",
-        nfc: "\u{B68C}",
-        nfd: "\u{1104}\u{116D}\u{11B3}",
-        nfkc: "\u{B68C}",
-        nfkd: "\u{1104}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B68D}",
-        nfc: "\u{B68D}",
-        nfd: "\u{1104}\u{116D}\u{11B4}",
-        nfkc: "\u{B68D}",
-        nfkd: "\u{1104}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B68E}",
-        nfc: "\u{B68E}",
-        nfd: "\u{1104}\u{116D}\u{11B5}",
-        nfkc: "\u{B68E}",
-        nfkd: "\u{1104}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B68F}",
-        nfc: "\u{B68F}",
-        nfd: "\u{1104}\u{116D}\u{11B6}",
-        nfkc: "\u{B68F}",
-        nfkd: "\u{1104}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B690}",
-        nfc: "\u{B690}",
-        nfd: "\u{1104}\u{116D}\u{11B7}",
-        nfkc: "\u{B690}",
-        nfkd: "\u{1104}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B691}",
-        nfc: "\u{B691}",
-        nfd: "\u{1104}\u{116D}\u{11B8}",
-        nfkc: "\u{B691}",
-        nfkd: "\u{1104}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B692}",
-        nfc: "\u{B692}",
-        nfd: "\u{1104}\u{116D}\u{11B9}",
-        nfkc: "\u{B692}",
-        nfkd: "\u{1104}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B693}",
-        nfc: "\u{B693}",
-        nfd: "\u{1104}\u{116D}\u{11BA}",
-        nfkc: "\u{B693}",
-        nfkd: "\u{1104}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B694}",
-        nfc: "\u{B694}",
-        nfd: "\u{1104}\u{116D}\u{11BB}",
-        nfkc: "\u{B694}",
-        nfkd: "\u{1104}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B695}",
-        nfc: "\u{B695}",
-        nfd: "\u{1104}\u{116D}\u{11BC}",
-        nfkc: "\u{B695}",
-        nfkd: "\u{1104}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B696}",
-        nfc: "\u{B696}",
-        nfd: "\u{1104}\u{116D}\u{11BD}",
-        nfkc: "\u{B696}",
-        nfkd: "\u{1104}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B697}",
-        nfc: "\u{B697}",
-        nfd: "\u{1104}\u{116D}\u{11BE}",
-        nfkc: "\u{B697}",
-        nfkd: "\u{1104}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B698}",
-        nfc: "\u{B698}",
-        nfd: "\u{1104}\u{116D}\u{11BF}",
-        nfkc: "\u{B698}",
-        nfkd: "\u{1104}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B699}",
-        nfc: "\u{B699}",
-        nfd: "\u{1104}\u{116D}\u{11C0}",
-        nfkc: "\u{B699}",
-        nfkd: "\u{1104}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B69A}",
-        nfc: "\u{B69A}",
-        nfd: "\u{1104}\u{116D}\u{11C1}",
-        nfkc: "\u{B69A}",
-        nfkd: "\u{1104}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B69B}",
-        nfc: "\u{B69B}",
-        nfd: "\u{1104}\u{116D}\u{11C2}",
-        nfkc: "\u{B69B}",
-        nfkd: "\u{1104}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B69C}",
-        nfc: "\u{B69C}",
-        nfd: "\u{1104}\u{116E}",
-        nfkc: "\u{B69C}",
-        nfkd: "\u{1104}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{B69D}",
-        nfc: "\u{B69D}",
-        nfd: "\u{1104}\u{116E}\u{11A8}",
-        nfkc: "\u{B69D}",
-        nfkd: "\u{1104}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B69E}",
-        nfc: "\u{B69E}",
-        nfd: "\u{1104}\u{116E}\u{11A9}",
-        nfkc: "\u{B69E}",
-        nfkd: "\u{1104}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B69F}",
-        nfc: "\u{B69F}",
-        nfd: "\u{1104}\u{116E}\u{11AA}",
-        nfkc: "\u{B69F}",
-        nfkd: "\u{1104}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B6A0}",
-        nfc: "\u{B6A0}",
-        nfd: "\u{1104}\u{116E}\u{11AB}",
-        nfkc: "\u{B6A0}",
-        nfkd: "\u{1104}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B6A1}",
-        nfc: "\u{B6A1}",
-        nfd: "\u{1104}\u{116E}\u{11AC}",
-        nfkc: "\u{B6A1}",
-        nfkd: "\u{1104}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B6A2}",
-        nfc: "\u{B6A2}",
-        nfd: "\u{1104}\u{116E}\u{11AD}",
-        nfkc: "\u{B6A2}",
-        nfkd: "\u{1104}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B6A3}",
-        nfc: "\u{B6A3}",
-        nfd: "\u{1104}\u{116E}\u{11AE}",
-        nfkc: "\u{B6A3}",
-        nfkd: "\u{1104}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B6A4}",
-        nfc: "\u{B6A4}",
-        nfd: "\u{1104}\u{116E}\u{11AF}",
-        nfkc: "\u{B6A4}",
-        nfkd: "\u{1104}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B6A5}",
-        nfc: "\u{B6A5}",
-        nfd: "\u{1104}\u{116E}\u{11B0}",
-        nfkc: "\u{B6A5}",
-        nfkd: "\u{1104}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B6A6}",
-        nfc: "\u{B6A6}",
-        nfd: "\u{1104}\u{116E}\u{11B1}",
-        nfkc: "\u{B6A6}",
-        nfkd: "\u{1104}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B6A7}",
-        nfc: "\u{B6A7}",
-        nfd: "\u{1104}\u{116E}\u{11B2}",
-        nfkc: "\u{B6A7}",
-        nfkd: "\u{1104}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B6A8}",
-        nfc: "\u{B6A8}",
-        nfd: "\u{1104}\u{116E}\u{11B3}",
-        nfkc: "\u{B6A8}",
-        nfkd: "\u{1104}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B6A9}",
-        nfc: "\u{B6A9}",
-        nfd: "\u{1104}\u{116E}\u{11B4}",
-        nfkc: "\u{B6A9}",
-        nfkd: "\u{1104}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B6AA}",
-        nfc: "\u{B6AA}",
-        nfd: "\u{1104}\u{116E}\u{11B5}",
-        nfkc: "\u{B6AA}",
-        nfkd: "\u{1104}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B6AB}",
-        nfc: "\u{B6AB}",
-        nfd: "\u{1104}\u{116E}\u{11B6}",
-        nfkc: "\u{B6AB}",
-        nfkd: "\u{1104}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B6AC}",
-        nfc: "\u{B6AC}",
-        nfd: "\u{1104}\u{116E}\u{11B7}",
-        nfkc: "\u{B6AC}",
-        nfkd: "\u{1104}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B6AD}",
-        nfc: "\u{B6AD}",
-        nfd: "\u{1104}\u{116E}\u{11B8}",
-        nfkc: "\u{B6AD}",
-        nfkd: "\u{1104}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B6AE}",
-        nfc: "\u{B6AE}",
-        nfd: "\u{1104}\u{116E}\u{11B9}",
-        nfkc: "\u{B6AE}",
-        nfkd: "\u{1104}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B6AF}",
-        nfc: "\u{B6AF}",
-        nfd: "\u{1104}\u{116E}\u{11BA}",
-        nfkc: "\u{B6AF}",
-        nfkd: "\u{1104}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B6B0}",
-        nfc: "\u{B6B0}",
-        nfd: "\u{1104}\u{116E}\u{11BB}",
-        nfkc: "\u{B6B0}",
-        nfkd: "\u{1104}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B6B1}",
-        nfc: "\u{B6B1}",
-        nfd: "\u{1104}\u{116E}\u{11BC}",
-        nfkc: "\u{B6B1}",
-        nfkd: "\u{1104}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B6B2}",
-        nfc: "\u{B6B2}",
-        nfd: "\u{1104}\u{116E}\u{11BD}",
-        nfkc: "\u{B6B2}",
-        nfkd: "\u{1104}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B6B3}",
-        nfc: "\u{B6B3}",
-        nfd: "\u{1104}\u{116E}\u{11BE}",
-        nfkc: "\u{B6B3}",
-        nfkd: "\u{1104}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B6B4}",
-        nfc: "\u{B6B4}",
-        nfd: "\u{1104}\u{116E}\u{11BF}",
-        nfkc: "\u{B6B4}",
-        nfkd: "\u{1104}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B6B5}",
-        nfc: "\u{B6B5}",
-        nfd: "\u{1104}\u{116E}\u{11C0}",
-        nfkc: "\u{B6B5}",
-        nfkd: "\u{1104}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B6B6}",
-        nfc: "\u{B6B6}",
-        nfd: "\u{1104}\u{116E}\u{11C1}",
-        nfkc: "\u{B6B6}",
-        nfkd: "\u{1104}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B6B7}",
-        nfc: "\u{B6B7}",
-        nfd: "\u{1104}\u{116E}\u{11C2}",
-        nfkc: "\u{B6B7}",
-        nfkd: "\u{1104}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B6B8}",
-        nfc: "\u{B6B8}",
-        nfd: "\u{1104}\u{116F}",
-        nfkc: "\u{B6B8}",
-        nfkd: "\u{1104}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{B6B9}",
-        nfc: "\u{B6B9}",
-        nfd: "\u{1104}\u{116F}\u{11A8}",
-        nfkc: "\u{B6B9}",
-        nfkd: "\u{1104}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B6BA}",
-        nfc: "\u{B6BA}",
-        nfd: "\u{1104}\u{116F}\u{11A9}",
-        nfkc: "\u{B6BA}",
-        nfkd: "\u{1104}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B6BB}",
-        nfc: "\u{B6BB}",
-        nfd: "\u{1104}\u{116F}\u{11AA}",
-        nfkc: "\u{B6BB}",
-        nfkd: "\u{1104}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B6BC}",
-        nfc: "\u{B6BC}",
-        nfd: "\u{1104}\u{116F}\u{11AB}",
-        nfkc: "\u{B6BC}",
-        nfkd: "\u{1104}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B6BD}",
-        nfc: "\u{B6BD}",
-        nfd: "\u{1104}\u{116F}\u{11AC}",
-        nfkc: "\u{B6BD}",
-        nfkd: "\u{1104}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B6BE}",
-        nfc: "\u{B6BE}",
-        nfd: "\u{1104}\u{116F}\u{11AD}",
-        nfkc: "\u{B6BE}",
-        nfkd: "\u{1104}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B6BF}",
-        nfc: "\u{B6BF}",
-        nfd: "\u{1104}\u{116F}\u{11AE}",
-        nfkc: "\u{B6BF}",
-        nfkd: "\u{1104}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B6C0}",
-        nfc: "\u{B6C0}",
-        nfd: "\u{1104}\u{116F}\u{11AF}",
-        nfkc: "\u{B6C0}",
-        nfkd: "\u{1104}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B6C1}",
-        nfc: "\u{B6C1}",
-        nfd: "\u{1104}\u{116F}\u{11B0}",
-        nfkc: "\u{B6C1}",
-        nfkd: "\u{1104}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B6C2}",
-        nfc: "\u{B6C2}",
-        nfd: "\u{1104}\u{116F}\u{11B1}",
-        nfkc: "\u{B6C2}",
-        nfkd: "\u{1104}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B6C3}",
-        nfc: "\u{B6C3}",
-        nfd: "\u{1104}\u{116F}\u{11B2}",
-        nfkc: "\u{B6C3}",
-        nfkd: "\u{1104}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B6C4}",
-        nfc: "\u{B6C4}",
-        nfd: "\u{1104}\u{116F}\u{11B3}",
-        nfkc: "\u{B6C4}",
-        nfkd: "\u{1104}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B6C5}",
-        nfc: "\u{B6C5}",
-        nfd: "\u{1104}\u{116F}\u{11B4}",
-        nfkc: "\u{B6C5}",
-        nfkd: "\u{1104}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B6C6}",
-        nfc: "\u{B6C6}",
-        nfd: "\u{1104}\u{116F}\u{11B5}",
-        nfkc: "\u{B6C6}",
-        nfkd: "\u{1104}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B6C7}",
-        nfc: "\u{B6C7}",
-        nfd: "\u{1104}\u{116F}\u{11B6}",
-        nfkc: "\u{B6C7}",
-        nfkd: "\u{1104}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B6C8}",
-        nfc: "\u{B6C8}",
-        nfd: "\u{1104}\u{116F}\u{11B7}",
-        nfkc: "\u{B6C8}",
-        nfkd: "\u{1104}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B6C9}",
-        nfc: "\u{B6C9}",
-        nfd: "\u{1104}\u{116F}\u{11B8}",
-        nfkc: "\u{B6C9}",
-        nfkd: "\u{1104}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B6CA}",
-        nfc: "\u{B6CA}",
-        nfd: "\u{1104}\u{116F}\u{11B9}",
-        nfkc: "\u{B6CA}",
-        nfkd: "\u{1104}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B6CB}",
-        nfc: "\u{B6CB}",
-        nfd: "\u{1104}\u{116F}\u{11BA}",
-        nfkc: "\u{B6CB}",
-        nfkd: "\u{1104}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B6CC}",
-        nfc: "\u{B6CC}",
-        nfd: "\u{1104}\u{116F}\u{11BB}",
-        nfkc: "\u{B6CC}",
-        nfkd: "\u{1104}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B6CD}",
-        nfc: "\u{B6CD}",
-        nfd: "\u{1104}\u{116F}\u{11BC}",
-        nfkc: "\u{B6CD}",
-        nfkd: "\u{1104}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B6CE}",
-        nfc: "\u{B6CE}",
-        nfd: "\u{1104}\u{116F}\u{11BD}",
-        nfkc: "\u{B6CE}",
-        nfkd: "\u{1104}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B6CF}",
-        nfc: "\u{B6CF}",
-        nfd: "\u{1104}\u{116F}\u{11BE}",
-        nfkc: "\u{B6CF}",
-        nfkd: "\u{1104}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B6D0}",
-        nfc: "\u{B6D0}",
-        nfd: "\u{1104}\u{116F}\u{11BF}",
-        nfkc: "\u{B6D0}",
-        nfkd: "\u{1104}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B6D1}",
-        nfc: "\u{B6D1}",
-        nfd: "\u{1104}\u{116F}\u{11C0}",
-        nfkc: "\u{B6D1}",
-        nfkd: "\u{1104}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B6D2}",
-        nfc: "\u{B6D2}",
-        nfd: "\u{1104}\u{116F}\u{11C1}",
-        nfkc: "\u{B6D2}",
-        nfkd: "\u{1104}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B6D3}",
-        nfc: "\u{B6D3}",
-        nfd: "\u{1104}\u{116F}\u{11C2}",
-        nfkc: "\u{B6D3}",
-        nfkd: "\u{1104}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B6D4}",
-        nfc: "\u{B6D4}",
-        nfd: "\u{1104}\u{1170}",
-        nfkc: "\u{B6D4}",
-        nfkd: "\u{1104}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{B6D5}",
-        nfc: "\u{B6D5}",
-        nfd: "\u{1104}\u{1170}\u{11A8}",
-        nfkc: "\u{B6D5}",
-        nfkd: "\u{1104}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B6D6}",
-        nfc: "\u{B6D6}",
-        nfd: "\u{1104}\u{1170}\u{11A9}",
-        nfkc: "\u{B6D6}",
-        nfkd: "\u{1104}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B6D7}",
-        nfc: "\u{B6D7}",
-        nfd: "\u{1104}\u{1170}\u{11AA}",
-        nfkc: "\u{B6D7}",
-        nfkd: "\u{1104}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B6D8}",
-        nfc: "\u{B6D8}",
-        nfd: "\u{1104}\u{1170}\u{11AB}",
-        nfkc: "\u{B6D8}",
-        nfkd: "\u{1104}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B6D9}",
-        nfc: "\u{B6D9}",
-        nfd: "\u{1104}\u{1170}\u{11AC}",
-        nfkc: "\u{B6D9}",
-        nfkd: "\u{1104}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B6DA}",
-        nfc: "\u{B6DA}",
-        nfd: "\u{1104}\u{1170}\u{11AD}",
-        nfkc: "\u{B6DA}",
-        nfkd: "\u{1104}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B6DB}",
-        nfc: "\u{B6DB}",
-        nfd: "\u{1104}\u{1170}\u{11AE}",
-        nfkc: "\u{B6DB}",
-        nfkd: "\u{1104}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B6DC}",
-        nfc: "\u{B6DC}",
-        nfd: "\u{1104}\u{1170}\u{11AF}",
-        nfkc: "\u{B6DC}",
-        nfkd: "\u{1104}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B6DD}",
-        nfc: "\u{B6DD}",
-        nfd: "\u{1104}\u{1170}\u{11B0}",
-        nfkc: "\u{B6DD}",
-        nfkd: "\u{1104}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B6DE}",
-        nfc: "\u{B6DE}",
-        nfd: "\u{1104}\u{1170}\u{11B1}",
-        nfkc: "\u{B6DE}",
-        nfkd: "\u{1104}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B6DF}",
-        nfc: "\u{B6DF}",
-        nfd: "\u{1104}\u{1170}\u{11B2}",
-        nfkc: "\u{B6DF}",
-        nfkd: "\u{1104}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B6E0}",
-        nfc: "\u{B6E0}",
-        nfd: "\u{1104}\u{1170}\u{11B3}",
-        nfkc: "\u{B6E0}",
-        nfkd: "\u{1104}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B6E1}",
-        nfc: "\u{B6E1}",
-        nfd: "\u{1104}\u{1170}\u{11B4}",
-        nfkc: "\u{B6E1}",
-        nfkd: "\u{1104}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B6E2}",
-        nfc: "\u{B6E2}",
-        nfd: "\u{1104}\u{1170}\u{11B5}",
-        nfkc: "\u{B6E2}",
-        nfkd: "\u{1104}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B6E3}",
-        nfc: "\u{B6E3}",
-        nfd: "\u{1104}\u{1170}\u{11B6}",
-        nfkc: "\u{B6E3}",
-        nfkd: "\u{1104}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B6E4}",
-        nfc: "\u{B6E4}",
-        nfd: "\u{1104}\u{1170}\u{11B7}",
-        nfkc: "\u{B6E4}",
-        nfkd: "\u{1104}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B6E5}",
-        nfc: "\u{B6E5}",
-        nfd: "\u{1104}\u{1170}\u{11B8}",
-        nfkc: "\u{B6E5}",
-        nfkd: "\u{1104}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B6E6}",
-        nfc: "\u{B6E6}",
-        nfd: "\u{1104}\u{1170}\u{11B9}",
-        nfkc: "\u{B6E6}",
-        nfkd: "\u{1104}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B6E7}",
-        nfc: "\u{B6E7}",
-        nfd: "\u{1104}\u{1170}\u{11BA}",
-        nfkc: "\u{B6E7}",
-        nfkd: "\u{1104}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B6E8}",
-        nfc: "\u{B6E8}",
-        nfd: "\u{1104}\u{1170}\u{11BB}",
-        nfkc: "\u{B6E8}",
-        nfkd: "\u{1104}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B6E9}",
-        nfc: "\u{B6E9}",
-        nfd: "\u{1104}\u{1170}\u{11BC}",
-        nfkc: "\u{B6E9}",
-        nfkd: "\u{1104}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B6EA}",
-        nfc: "\u{B6EA}",
-        nfd: "\u{1104}\u{1170}\u{11BD}",
-        nfkc: "\u{B6EA}",
-        nfkd: "\u{1104}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B6EB}",
-        nfc: "\u{B6EB}",
-        nfd: "\u{1104}\u{1170}\u{11BE}",
-        nfkc: "\u{B6EB}",
-        nfkd: "\u{1104}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B6EC}",
-        nfc: "\u{B6EC}",
-        nfd: "\u{1104}\u{1170}\u{11BF}",
-        nfkc: "\u{B6EC}",
-        nfkd: "\u{1104}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B6ED}",
-        nfc: "\u{B6ED}",
-        nfd: "\u{1104}\u{1170}\u{11C0}",
-        nfkc: "\u{B6ED}",
-        nfkd: "\u{1104}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B6EE}",
-        nfc: "\u{B6EE}",
-        nfd: "\u{1104}\u{1170}\u{11C1}",
-        nfkc: "\u{B6EE}",
-        nfkd: "\u{1104}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B6EF}",
-        nfc: "\u{B6EF}",
-        nfd: "\u{1104}\u{1170}\u{11C2}",
-        nfkc: "\u{B6EF}",
-        nfkd: "\u{1104}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B6F0}",
-        nfc: "\u{B6F0}",
-        nfd: "\u{1104}\u{1171}",
-        nfkc: "\u{B6F0}",
-        nfkd: "\u{1104}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{B6F1}",
-        nfc: "\u{B6F1}",
-        nfd: "\u{1104}\u{1171}\u{11A8}",
-        nfkc: "\u{B6F1}",
-        nfkd: "\u{1104}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B6F2}",
-        nfc: "\u{B6F2}",
-        nfd: "\u{1104}\u{1171}\u{11A9}",
-        nfkc: "\u{B6F2}",
-        nfkd: "\u{1104}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B6F3}",
-        nfc: "\u{B6F3}",
-        nfd: "\u{1104}\u{1171}\u{11AA}",
-        nfkc: "\u{B6F3}",
-        nfkd: "\u{1104}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B6F4}",
-        nfc: "\u{B6F4}",
-        nfd: "\u{1104}\u{1171}\u{11AB}",
-        nfkc: "\u{B6F4}",
-        nfkd: "\u{1104}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B6F5}",
-        nfc: "\u{B6F5}",
-        nfd: "\u{1104}\u{1171}\u{11AC}",
-        nfkc: "\u{B6F5}",
-        nfkd: "\u{1104}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B6F6}",
-        nfc: "\u{B6F6}",
-        nfd: "\u{1104}\u{1171}\u{11AD}",
-        nfkc: "\u{B6F6}",
-        nfkd: "\u{1104}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B6F7}",
-        nfc: "\u{B6F7}",
-        nfd: "\u{1104}\u{1171}\u{11AE}",
-        nfkc: "\u{B6F7}",
-        nfkd: "\u{1104}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B6F8}",
-        nfc: "\u{B6F8}",
-        nfd: "\u{1104}\u{1171}\u{11AF}",
-        nfkc: "\u{B6F8}",
-        nfkd: "\u{1104}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B6F9}",
-        nfc: "\u{B6F9}",
-        nfd: "\u{1104}\u{1171}\u{11B0}",
-        nfkc: "\u{B6F9}",
-        nfkd: "\u{1104}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B6FA}",
-        nfc: "\u{B6FA}",
-        nfd: "\u{1104}\u{1171}\u{11B1}",
-        nfkc: "\u{B6FA}",
-        nfkd: "\u{1104}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B6FB}",
-        nfc: "\u{B6FB}",
-        nfd: "\u{1104}\u{1171}\u{11B2}",
-        nfkc: "\u{B6FB}",
-        nfkd: "\u{1104}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B6FC}",
-        nfc: "\u{B6FC}",
-        nfd: "\u{1104}\u{1171}\u{11B3}",
-        nfkc: "\u{B6FC}",
-        nfkd: "\u{1104}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B6FD}",
-        nfc: "\u{B6FD}",
-        nfd: "\u{1104}\u{1171}\u{11B4}",
-        nfkc: "\u{B6FD}",
-        nfkd: "\u{1104}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B6FE}",
-        nfc: "\u{B6FE}",
-        nfd: "\u{1104}\u{1171}\u{11B5}",
-        nfkc: "\u{B6FE}",
-        nfkd: "\u{1104}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B6FF}",
-        nfc: "\u{B6FF}",
-        nfd: "\u{1104}\u{1171}\u{11B6}",
-        nfkc: "\u{B6FF}",
-        nfkd: "\u{1104}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B700}",
-        nfc: "\u{B700}",
-        nfd: "\u{1104}\u{1171}\u{11B7}",
-        nfkc: "\u{B700}",
-        nfkd: "\u{1104}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B701}",
-        nfc: "\u{B701}",
-        nfd: "\u{1104}\u{1171}\u{11B8}",
-        nfkc: "\u{B701}",
-        nfkd: "\u{1104}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B702}",
-        nfc: "\u{B702}",
-        nfd: "\u{1104}\u{1171}\u{11B9}",
-        nfkc: "\u{B702}",
-        nfkd: "\u{1104}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B703}",
-        nfc: "\u{B703}",
-        nfd: "\u{1104}\u{1171}\u{11BA}",
-        nfkc: "\u{B703}",
-        nfkd: "\u{1104}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B704}",
-        nfc: "\u{B704}",
-        nfd: "\u{1104}\u{1171}\u{11BB}",
-        nfkc: "\u{B704}",
-        nfkd: "\u{1104}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B705}",
-        nfc: "\u{B705}",
-        nfd: "\u{1104}\u{1171}\u{11BC}",
-        nfkc: "\u{B705}",
-        nfkd: "\u{1104}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B706}",
-        nfc: "\u{B706}",
-        nfd: "\u{1104}\u{1171}\u{11BD}",
-        nfkc: "\u{B706}",
-        nfkd: "\u{1104}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B707}",
-        nfc: "\u{B707}",
-        nfd: "\u{1104}\u{1171}\u{11BE}",
-        nfkc: "\u{B707}",
-        nfkd: "\u{1104}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B708}",
-        nfc: "\u{B708}",
-        nfd: "\u{1104}\u{1171}\u{11BF}",
-        nfkc: "\u{B708}",
-        nfkd: "\u{1104}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B709}",
-        nfc: "\u{B709}",
-        nfd: "\u{1104}\u{1171}\u{11C0}",
-        nfkc: "\u{B709}",
-        nfkd: "\u{1104}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B70A}",
-        nfc: "\u{B70A}",
-        nfd: "\u{1104}\u{1171}\u{11C1}",
-        nfkc: "\u{B70A}",
-        nfkd: "\u{1104}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B70B}",
-        nfc: "\u{B70B}",
-        nfd: "\u{1104}\u{1171}\u{11C2}",
-        nfkc: "\u{B70B}",
-        nfkd: "\u{1104}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B70C}",
-        nfc: "\u{B70C}",
-        nfd: "\u{1104}\u{1172}",
-        nfkc: "\u{B70C}",
-        nfkd: "\u{1104}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{B70D}",
-        nfc: "\u{B70D}",
-        nfd: "\u{1104}\u{1172}\u{11A8}",
-        nfkc: "\u{B70D}",
-        nfkd: "\u{1104}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B70E}",
-        nfc: "\u{B70E}",
-        nfd: "\u{1104}\u{1172}\u{11A9}",
-        nfkc: "\u{B70E}",
-        nfkd: "\u{1104}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B70F}",
-        nfc: "\u{B70F}",
-        nfd: "\u{1104}\u{1172}\u{11AA}",
-        nfkc: "\u{B70F}",
-        nfkd: "\u{1104}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B710}",
-        nfc: "\u{B710}",
-        nfd: "\u{1104}\u{1172}\u{11AB}",
-        nfkc: "\u{B710}",
-        nfkd: "\u{1104}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B711}",
-        nfc: "\u{B711}",
-        nfd: "\u{1104}\u{1172}\u{11AC}",
-        nfkc: "\u{B711}",
-        nfkd: "\u{1104}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B712}",
-        nfc: "\u{B712}",
-        nfd: "\u{1104}\u{1172}\u{11AD}",
-        nfkc: "\u{B712}",
-        nfkd: "\u{1104}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B713}",
-        nfc: "\u{B713}",
-        nfd: "\u{1104}\u{1172}\u{11AE}",
-        nfkc: "\u{B713}",
-        nfkd: "\u{1104}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B714}",
-        nfc: "\u{B714}",
-        nfd: "\u{1104}\u{1172}\u{11AF}",
-        nfkc: "\u{B714}",
-        nfkd: "\u{1104}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B715}",
-        nfc: "\u{B715}",
-        nfd: "\u{1104}\u{1172}\u{11B0}",
-        nfkc: "\u{B715}",
-        nfkd: "\u{1104}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B716}",
-        nfc: "\u{B716}",
-        nfd: "\u{1104}\u{1172}\u{11B1}",
-        nfkc: "\u{B716}",
-        nfkd: "\u{1104}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B717}",
-        nfc: "\u{B717}",
-        nfd: "\u{1104}\u{1172}\u{11B2}",
-        nfkc: "\u{B717}",
-        nfkd: "\u{1104}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B718}",
-        nfc: "\u{B718}",
-        nfd: "\u{1104}\u{1172}\u{11B3}",
-        nfkc: "\u{B718}",
-        nfkd: "\u{1104}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B719}",
-        nfc: "\u{B719}",
-        nfd: "\u{1104}\u{1172}\u{11B4}",
-        nfkc: "\u{B719}",
-        nfkd: "\u{1104}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B71A}",
-        nfc: "\u{B71A}",
-        nfd: "\u{1104}\u{1172}\u{11B5}",
-        nfkc: "\u{B71A}",
-        nfkd: "\u{1104}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B71B}",
-        nfc: "\u{B71B}",
-        nfd: "\u{1104}\u{1172}\u{11B6}",
-        nfkc: "\u{B71B}",
-        nfkd: "\u{1104}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B71C}",
-        nfc: "\u{B71C}",
-        nfd: "\u{1104}\u{1172}\u{11B7}",
-        nfkc: "\u{B71C}",
-        nfkd: "\u{1104}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B71D}",
-        nfc: "\u{B71D}",
-        nfd: "\u{1104}\u{1172}\u{11B8}",
-        nfkc: "\u{B71D}",
-        nfkd: "\u{1104}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B71E}",
-        nfc: "\u{B71E}",
-        nfd: "\u{1104}\u{1172}\u{11B9}",
-        nfkc: "\u{B71E}",
-        nfkd: "\u{1104}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B71F}",
-        nfc: "\u{B71F}",
-        nfd: "\u{1104}\u{1172}\u{11BA}",
-        nfkc: "\u{B71F}",
-        nfkd: "\u{1104}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B720}",
-        nfc: "\u{B720}",
-        nfd: "\u{1104}\u{1172}\u{11BB}",
-        nfkc: "\u{B720}",
-        nfkd: "\u{1104}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B721}",
-        nfc: "\u{B721}",
-        nfd: "\u{1104}\u{1172}\u{11BC}",
-        nfkc: "\u{B721}",
-        nfkd: "\u{1104}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B722}",
-        nfc: "\u{B722}",
-        nfd: "\u{1104}\u{1172}\u{11BD}",
-        nfkc: "\u{B722}",
-        nfkd: "\u{1104}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B723}",
-        nfc: "\u{B723}",
-        nfd: "\u{1104}\u{1172}\u{11BE}",
-        nfkc: "\u{B723}",
-        nfkd: "\u{1104}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B724}",
-        nfc: "\u{B724}",
-        nfd: "\u{1104}\u{1172}\u{11BF}",
-        nfkc: "\u{B724}",
-        nfkd: "\u{1104}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B725}",
-        nfc: "\u{B725}",
-        nfd: "\u{1104}\u{1172}\u{11C0}",
-        nfkc: "\u{B725}",
-        nfkd: "\u{1104}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B726}",
-        nfc: "\u{B726}",
-        nfd: "\u{1104}\u{1172}\u{11C1}",
-        nfkc: "\u{B726}",
-        nfkd: "\u{1104}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B727}",
-        nfc: "\u{B727}",
-        nfd: "\u{1104}\u{1172}\u{11C2}",
-        nfkc: "\u{B727}",
-        nfkd: "\u{1104}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B728}",
-        nfc: "\u{B728}",
-        nfd: "\u{1104}\u{1173}",
-        nfkc: "\u{B728}",
-        nfkd: "\u{1104}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{B729}",
-        nfc: "\u{B729}",
-        nfd: "\u{1104}\u{1173}\u{11A8}",
-        nfkc: "\u{B729}",
-        nfkd: "\u{1104}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B72A}",
-        nfc: "\u{B72A}",
-        nfd: "\u{1104}\u{1173}\u{11A9}",
-        nfkc: "\u{B72A}",
-        nfkd: "\u{1104}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B72B}",
-        nfc: "\u{B72B}",
-        nfd: "\u{1104}\u{1173}\u{11AA}",
-        nfkc: "\u{B72B}",
-        nfkd: "\u{1104}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B72C}",
-        nfc: "\u{B72C}",
-        nfd: "\u{1104}\u{1173}\u{11AB}",
-        nfkc: "\u{B72C}",
-        nfkd: "\u{1104}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B72D}",
-        nfc: "\u{B72D}",
-        nfd: "\u{1104}\u{1173}\u{11AC}",
-        nfkc: "\u{B72D}",
-        nfkd: "\u{1104}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B72E}",
-        nfc: "\u{B72E}",
-        nfd: "\u{1104}\u{1173}\u{11AD}",
-        nfkc: "\u{B72E}",
-        nfkd: "\u{1104}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B72F}",
-        nfc: "\u{B72F}",
-        nfd: "\u{1104}\u{1173}\u{11AE}",
-        nfkc: "\u{B72F}",
-        nfkd: "\u{1104}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B730}",
-        nfc: "\u{B730}",
-        nfd: "\u{1104}\u{1173}\u{11AF}",
-        nfkc: "\u{B730}",
-        nfkd: "\u{1104}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B731}",
-        nfc: "\u{B731}",
-        nfd: "\u{1104}\u{1173}\u{11B0}",
-        nfkc: "\u{B731}",
-        nfkd: "\u{1104}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B732}",
-        nfc: "\u{B732}",
-        nfd: "\u{1104}\u{1173}\u{11B1}",
-        nfkc: "\u{B732}",
-        nfkd: "\u{1104}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B733}",
-        nfc: "\u{B733}",
-        nfd: "\u{1104}\u{1173}\u{11B2}",
-        nfkc: "\u{B733}",
-        nfkd: "\u{1104}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B734}",
-        nfc: "\u{B734}",
-        nfd: "\u{1104}\u{1173}\u{11B3}",
-        nfkc: "\u{B734}",
-        nfkd: "\u{1104}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B735}",
-        nfc: "\u{B735}",
-        nfd: "\u{1104}\u{1173}\u{11B4}",
-        nfkc: "\u{B735}",
-        nfkd: "\u{1104}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B736}",
-        nfc: "\u{B736}",
-        nfd: "\u{1104}\u{1173}\u{11B5}",
-        nfkc: "\u{B736}",
-        nfkd: "\u{1104}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B737}",
-        nfc: "\u{B737}",
-        nfd: "\u{1104}\u{1173}\u{11B6}",
-        nfkc: "\u{B737}",
-        nfkd: "\u{1104}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B738}",
-        nfc: "\u{B738}",
-        nfd: "\u{1104}\u{1173}\u{11B7}",
-        nfkc: "\u{B738}",
-        nfkd: "\u{1104}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B739}",
-        nfc: "\u{B739}",
-        nfd: "\u{1104}\u{1173}\u{11B8}",
-        nfkc: "\u{B739}",
-        nfkd: "\u{1104}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B73A}",
-        nfc: "\u{B73A}",
-        nfd: "\u{1104}\u{1173}\u{11B9}",
-        nfkc: "\u{B73A}",
-        nfkd: "\u{1104}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B73B}",
-        nfc: "\u{B73B}",
-        nfd: "\u{1104}\u{1173}\u{11BA}",
-        nfkc: "\u{B73B}",
-        nfkd: "\u{1104}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B73C}",
-        nfc: "\u{B73C}",
-        nfd: "\u{1104}\u{1173}\u{11BB}",
-        nfkc: "\u{B73C}",
-        nfkd: "\u{1104}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B73D}",
-        nfc: "\u{B73D}",
-        nfd: "\u{1104}\u{1173}\u{11BC}",
-        nfkc: "\u{B73D}",
-        nfkd: "\u{1104}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B73E}",
-        nfc: "\u{B73E}",
-        nfd: "\u{1104}\u{1173}\u{11BD}",
-        nfkc: "\u{B73E}",
-        nfkd: "\u{1104}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B73F}",
-        nfc: "\u{B73F}",
-        nfd: "\u{1104}\u{1173}\u{11BE}",
-        nfkc: "\u{B73F}",
-        nfkd: "\u{1104}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B740}",
-        nfc: "\u{B740}",
-        nfd: "\u{1104}\u{1173}\u{11BF}",
-        nfkc: "\u{B740}",
-        nfkd: "\u{1104}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B741}",
-        nfc: "\u{B741}",
-        nfd: "\u{1104}\u{1173}\u{11C0}",
-        nfkc: "\u{B741}",
-        nfkd: "\u{1104}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B742}",
-        nfc: "\u{B742}",
-        nfd: "\u{1104}\u{1173}\u{11C1}",
-        nfkc: "\u{B742}",
-        nfkd: "\u{1104}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B743}",
-        nfc: "\u{B743}",
-        nfd: "\u{1104}\u{1173}\u{11C2}",
-        nfkc: "\u{B743}",
-        nfkd: "\u{1104}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B744}",
-        nfc: "\u{B744}",
-        nfd: "\u{1104}\u{1174}",
-        nfkc: "\u{B744}",
-        nfkd: "\u{1104}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{B745}",
-        nfc: "\u{B745}",
-        nfd: "\u{1104}\u{1174}\u{11A8}",
-        nfkc: "\u{B745}",
-        nfkd: "\u{1104}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B746}",
-        nfc: "\u{B746}",
-        nfd: "\u{1104}\u{1174}\u{11A9}",
-        nfkc: "\u{B746}",
-        nfkd: "\u{1104}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B747}",
-        nfc: "\u{B747}",
-        nfd: "\u{1104}\u{1174}\u{11AA}",
-        nfkc: "\u{B747}",
-        nfkd: "\u{1104}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B748}",
-        nfc: "\u{B748}",
-        nfd: "\u{1104}\u{1174}\u{11AB}",
-        nfkc: "\u{B748}",
-        nfkd: "\u{1104}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B749}",
-        nfc: "\u{B749}",
-        nfd: "\u{1104}\u{1174}\u{11AC}",
-        nfkc: "\u{B749}",
-        nfkd: "\u{1104}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B74A}",
-        nfc: "\u{B74A}",
-        nfd: "\u{1104}\u{1174}\u{11AD}",
-        nfkc: "\u{B74A}",
-        nfkd: "\u{1104}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B74B}",
-        nfc: "\u{B74B}",
-        nfd: "\u{1104}\u{1174}\u{11AE}",
-        nfkc: "\u{B74B}",
-        nfkd: "\u{1104}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B74C}",
-        nfc: "\u{B74C}",
-        nfd: "\u{1104}\u{1174}\u{11AF}",
-        nfkc: "\u{B74C}",
-        nfkd: "\u{1104}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B74D}",
-        nfc: "\u{B74D}",
-        nfd: "\u{1104}\u{1174}\u{11B0}",
-        nfkc: "\u{B74D}",
-        nfkd: "\u{1104}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B74E}",
-        nfc: "\u{B74E}",
-        nfd: "\u{1104}\u{1174}\u{11B1}",
-        nfkc: "\u{B74E}",
-        nfkd: "\u{1104}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B74F}",
-        nfc: "\u{B74F}",
-        nfd: "\u{1104}\u{1174}\u{11B2}",
-        nfkc: "\u{B74F}",
-        nfkd: "\u{1104}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B750}",
-        nfc: "\u{B750}",
-        nfd: "\u{1104}\u{1174}\u{11B3}",
-        nfkc: "\u{B750}",
-        nfkd: "\u{1104}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B751}",
-        nfc: "\u{B751}",
-        nfd: "\u{1104}\u{1174}\u{11B4}",
-        nfkc: "\u{B751}",
-        nfkd: "\u{1104}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B752}",
-        nfc: "\u{B752}",
-        nfd: "\u{1104}\u{1174}\u{11B5}",
-        nfkc: "\u{B752}",
-        nfkd: "\u{1104}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B753}",
-        nfc: "\u{B753}",
-        nfd: "\u{1104}\u{1174}\u{11B6}",
-        nfkc: "\u{B753}",
-        nfkd: "\u{1104}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B754}",
-        nfc: "\u{B754}",
-        nfd: "\u{1104}\u{1174}\u{11B7}",
-        nfkc: "\u{B754}",
-        nfkd: "\u{1104}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B755}",
-        nfc: "\u{B755}",
-        nfd: "\u{1104}\u{1174}\u{11B8}",
-        nfkc: "\u{B755}",
-        nfkd: "\u{1104}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B756}",
-        nfc: "\u{B756}",
-        nfd: "\u{1104}\u{1174}\u{11B9}",
-        nfkc: "\u{B756}",
-        nfkd: "\u{1104}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B757}",
-        nfc: "\u{B757}",
-        nfd: "\u{1104}\u{1174}\u{11BA}",
-        nfkc: "\u{B757}",
-        nfkd: "\u{1104}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B758}",
-        nfc: "\u{B758}",
-        nfd: "\u{1104}\u{1174}\u{11BB}",
-        nfkc: "\u{B758}",
-        nfkd: "\u{1104}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B759}",
-        nfc: "\u{B759}",
-        nfd: "\u{1104}\u{1174}\u{11BC}",
-        nfkc: "\u{B759}",
-        nfkd: "\u{1104}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B75A}",
-        nfc: "\u{B75A}",
-        nfd: "\u{1104}\u{1174}\u{11BD}",
-        nfkc: "\u{B75A}",
-        nfkd: "\u{1104}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B75B}",
-        nfc: "\u{B75B}",
-        nfd: "\u{1104}\u{1174}\u{11BE}",
-        nfkc: "\u{B75B}",
-        nfkd: "\u{1104}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B75C}",
-        nfc: "\u{B75C}",
-        nfd: "\u{1104}\u{1174}\u{11BF}",
-        nfkc: "\u{B75C}",
-        nfkd: "\u{1104}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B75D}",
-        nfc: "\u{B75D}",
-        nfd: "\u{1104}\u{1174}\u{11C0}",
-        nfkc: "\u{B75D}",
-        nfkd: "\u{1104}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B75E}",
-        nfc: "\u{B75E}",
-        nfd: "\u{1104}\u{1174}\u{11C1}",
-        nfkc: "\u{B75E}",
-        nfkd: "\u{1104}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B75F}",
-        nfc: "\u{B75F}",
-        nfd: "\u{1104}\u{1174}\u{11C2}",
-        nfkc: "\u{B75F}",
-        nfkd: "\u{1104}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B760}",
-        nfc: "\u{B760}",
-        nfd: "\u{1104}\u{1175}",
-        nfkc: "\u{B760}",
-        nfkd: "\u{1104}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{B761}",
-        nfc: "\u{B761}",
-        nfd: "\u{1104}\u{1175}\u{11A8}",
-        nfkc: "\u{B761}",
-        nfkd: "\u{1104}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B762}",
-        nfc: "\u{B762}",
-        nfd: "\u{1104}\u{1175}\u{11A9}",
-        nfkc: "\u{B762}",
-        nfkd: "\u{1104}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B763}",
-        nfc: "\u{B763}",
-        nfd: "\u{1104}\u{1175}\u{11AA}",
-        nfkc: "\u{B763}",
-        nfkd: "\u{1104}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B764}",
-        nfc: "\u{B764}",
-        nfd: "\u{1104}\u{1175}\u{11AB}",
-        nfkc: "\u{B764}",
-        nfkd: "\u{1104}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B765}",
-        nfc: "\u{B765}",
-        nfd: "\u{1104}\u{1175}\u{11AC}",
-        nfkc: "\u{B765}",
-        nfkd: "\u{1104}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B766}",
-        nfc: "\u{B766}",
-        nfd: "\u{1104}\u{1175}\u{11AD}",
-        nfkc: "\u{B766}",
-        nfkd: "\u{1104}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B767}",
-        nfc: "\u{B767}",
-        nfd: "\u{1104}\u{1175}\u{11AE}",
-        nfkc: "\u{B767}",
-        nfkd: "\u{1104}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B768}",
-        nfc: "\u{B768}",
-        nfd: "\u{1104}\u{1175}\u{11AF}",
-        nfkc: "\u{B768}",
-        nfkd: "\u{1104}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B769}",
-        nfc: "\u{B769}",
-        nfd: "\u{1104}\u{1175}\u{11B0}",
-        nfkc: "\u{B769}",
-        nfkd: "\u{1104}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B76A}",
-        nfc: "\u{B76A}",
-        nfd: "\u{1104}\u{1175}\u{11B1}",
-        nfkc: "\u{B76A}",
-        nfkd: "\u{1104}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B76B}",
-        nfc: "\u{B76B}",
-        nfd: "\u{1104}\u{1175}\u{11B2}",
-        nfkc: "\u{B76B}",
-        nfkd: "\u{1104}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B76C}",
-        nfc: "\u{B76C}",
-        nfd: "\u{1104}\u{1175}\u{11B3}",
-        nfkc: "\u{B76C}",
-        nfkd: "\u{1104}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B76D}",
-        nfc: "\u{B76D}",
-        nfd: "\u{1104}\u{1175}\u{11B4}",
-        nfkc: "\u{B76D}",
-        nfkd: "\u{1104}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B76E}",
-        nfc: "\u{B76E}",
-        nfd: "\u{1104}\u{1175}\u{11B5}",
-        nfkc: "\u{B76E}",
-        nfkd: "\u{1104}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B76F}",
-        nfc: "\u{B76F}",
-        nfd: "\u{1104}\u{1175}\u{11B6}",
-        nfkc: "\u{B76F}",
-        nfkd: "\u{1104}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B770}",
-        nfc: "\u{B770}",
-        nfd: "\u{1104}\u{1175}\u{11B7}",
-        nfkc: "\u{B770}",
-        nfkd: "\u{1104}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B771}",
-        nfc: "\u{B771}",
-        nfd: "\u{1104}\u{1175}\u{11B8}",
-        nfkc: "\u{B771}",
-        nfkd: "\u{1104}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B772}",
-        nfc: "\u{B772}",
-        nfd: "\u{1104}\u{1175}\u{11B9}",
-        nfkc: "\u{B772}",
-        nfkd: "\u{1104}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B773}",
-        nfc: "\u{B773}",
-        nfd: "\u{1104}\u{1175}\u{11BA}",
-        nfkc: "\u{B773}",
-        nfkd: "\u{1104}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B774}",
-        nfc: "\u{B774}",
-        nfd: "\u{1104}\u{1175}\u{11BB}",
-        nfkc: "\u{B774}",
-        nfkd: "\u{1104}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B775}",
-        nfc: "\u{B775}",
-        nfd: "\u{1104}\u{1175}\u{11BC}",
-        nfkc: "\u{B775}",
-        nfkd: "\u{1104}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B776}",
-        nfc: "\u{B776}",
-        nfd: "\u{1104}\u{1175}\u{11BD}",
-        nfkc: "\u{B776}",
-        nfkd: "\u{1104}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B777}",
-        nfc: "\u{B777}",
-        nfd: "\u{1104}\u{1175}\u{11BE}",
-        nfkc: "\u{B777}",
-        nfkd: "\u{1104}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B778}",
-        nfc: "\u{B778}",
-        nfd: "\u{1104}\u{1175}\u{11BF}",
-        nfkc: "\u{B778}",
-        nfkd: "\u{1104}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B779}",
-        nfc: "\u{B779}",
-        nfd: "\u{1104}\u{1175}\u{11C0}",
-        nfkc: "\u{B779}",
-        nfkd: "\u{1104}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B77A}",
-        nfc: "\u{B77A}",
-        nfd: "\u{1104}\u{1175}\u{11C1}",
-        nfkc: "\u{B77A}",
-        nfkd: "\u{1104}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B77B}",
-        nfc: "\u{B77B}",
-        nfd: "\u{1104}\u{1175}\u{11C2}",
-        nfkc: "\u{B77B}",
-        nfkd: "\u{1104}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B77C}",
-        nfc: "\u{B77C}",
-        nfd: "\u{1105}\u{1161}",
-        nfkc: "\u{B77C}",
-        nfkd: "\u{1105}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{B77D}",
-        nfc: "\u{B77D}",
-        nfd: "\u{1105}\u{1161}\u{11A8}",
-        nfkc: "\u{B77D}",
-        nfkd: "\u{1105}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B77E}",
-        nfc: "\u{B77E}",
-        nfd: "\u{1105}\u{1161}\u{11A9}",
-        nfkc: "\u{B77E}",
-        nfkd: "\u{1105}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B77F}",
-        nfc: "\u{B77F}",
-        nfd: "\u{1105}\u{1161}\u{11AA}",
-        nfkc: "\u{B77F}",
-        nfkd: "\u{1105}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B780}",
-        nfc: "\u{B780}",
-        nfd: "\u{1105}\u{1161}\u{11AB}",
-        nfkc: "\u{B780}",
-        nfkd: "\u{1105}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B781}",
-        nfc: "\u{B781}",
-        nfd: "\u{1105}\u{1161}\u{11AC}",
-        nfkc: "\u{B781}",
-        nfkd: "\u{1105}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B782}",
-        nfc: "\u{B782}",
-        nfd: "\u{1105}\u{1161}\u{11AD}",
-        nfkc: "\u{B782}",
-        nfkd: "\u{1105}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B783}",
-        nfc: "\u{B783}",
-        nfd: "\u{1105}\u{1161}\u{11AE}",
-        nfkc: "\u{B783}",
-        nfkd: "\u{1105}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B784}",
-        nfc: "\u{B784}",
-        nfd: "\u{1105}\u{1161}\u{11AF}",
-        nfkc: "\u{B784}",
-        nfkd: "\u{1105}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B785}",
-        nfc: "\u{B785}",
-        nfd: "\u{1105}\u{1161}\u{11B0}",
-        nfkc: "\u{B785}",
-        nfkd: "\u{1105}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B786}",
-        nfc: "\u{B786}",
-        nfd: "\u{1105}\u{1161}\u{11B1}",
-        nfkc: "\u{B786}",
-        nfkd: "\u{1105}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B787}",
-        nfc: "\u{B787}",
-        nfd: "\u{1105}\u{1161}\u{11B2}",
-        nfkc: "\u{B787}",
-        nfkd: "\u{1105}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B788}",
-        nfc: "\u{B788}",
-        nfd: "\u{1105}\u{1161}\u{11B3}",
-        nfkc: "\u{B788}",
-        nfkd: "\u{1105}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B789}",
-        nfc: "\u{B789}",
-        nfd: "\u{1105}\u{1161}\u{11B4}",
-        nfkc: "\u{B789}",
-        nfkd: "\u{1105}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B78A}",
-        nfc: "\u{B78A}",
-        nfd: "\u{1105}\u{1161}\u{11B5}",
-        nfkc: "\u{B78A}",
-        nfkd: "\u{1105}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B78B}",
-        nfc: "\u{B78B}",
-        nfd: "\u{1105}\u{1161}\u{11B6}",
-        nfkc: "\u{B78B}",
-        nfkd: "\u{1105}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B78C}",
-        nfc: "\u{B78C}",
-        nfd: "\u{1105}\u{1161}\u{11B7}",
-        nfkc: "\u{B78C}",
-        nfkd: "\u{1105}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B78D}",
-        nfc: "\u{B78D}",
-        nfd: "\u{1105}\u{1161}\u{11B8}",
-        nfkc: "\u{B78D}",
-        nfkd: "\u{1105}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B78E}",
-        nfc: "\u{B78E}",
-        nfd: "\u{1105}\u{1161}\u{11B9}",
-        nfkc: "\u{B78E}",
-        nfkd: "\u{1105}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B78F}",
-        nfc: "\u{B78F}",
-        nfd: "\u{1105}\u{1161}\u{11BA}",
-        nfkc: "\u{B78F}",
-        nfkd: "\u{1105}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B790}",
-        nfc: "\u{B790}",
-        nfd: "\u{1105}\u{1161}\u{11BB}",
-        nfkc: "\u{B790}",
-        nfkd: "\u{1105}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B791}",
-        nfc: "\u{B791}",
-        nfd: "\u{1105}\u{1161}\u{11BC}",
-        nfkc: "\u{B791}",
-        nfkd: "\u{1105}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B792}",
-        nfc: "\u{B792}",
-        nfd: "\u{1105}\u{1161}\u{11BD}",
-        nfkc: "\u{B792}",
-        nfkd: "\u{1105}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B793}",
-        nfc: "\u{B793}",
-        nfd: "\u{1105}\u{1161}\u{11BE}",
-        nfkc: "\u{B793}",
-        nfkd: "\u{1105}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B794}",
-        nfc: "\u{B794}",
-        nfd: "\u{1105}\u{1161}\u{11BF}",
-        nfkc: "\u{B794}",
-        nfkd: "\u{1105}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B795}",
-        nfc: "\u{B795}",
-        nfd: "\u{1105}\u{1161}\u{11C0}",
-        nfkc: "\u{B795}",
-        nfkd: "\u{1105}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B796}",
-        nfc: "\u{B796}",
-        nfd: "\u{1105}\u{1161}\u{11C1}",
-        nfkc: "\u{B796}",
-        nfkd: "\u{1105}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B797}",
-        nfc: "\u{B797}",
-        nfd: "\u{1105}\u{1161}\u{11C2}",
-        nfkc: "\u{B797}",
-        nfkd: "\u{1105}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B798}",
-        nfc: "\u{B798}",
-        nfd: "\u{1105}\u{1162}",
-        nfkc: "\u{B798}",
-        nfkd: "\u{1105}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{B799}",
-        nfc: "\u{B799}",
-        nfd: "\u{1105}\u{1162}\u{11A8}",
-        nfkc: "\u{B799}",
-        nfkd: "\u{1105}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B79A}",
-        nfc: "\u{B79A}",
-        nfd: "\u{1105}\u{1162}\u{11A9}",
-        nfkc: "\u{B79A}",
-        nfkd: "\u{1105}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B79B}",
-        nfc: "\u{B79B}",
-        nfd: "\u{1105}\u{1162}\u{11AA}",
-        nfkc: "\u{B79B}",
-        nfkd: "\u{1105}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B79C}",
-        nfc: "\u{B79C}",
-        nfd: "\u{1105}\u{1162}\u{11AB}",
-        nfkc: "\u{B79C}",
-        nfkd: "\u{1105}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B79D}",
-        nfc: "\u{B79D}",
-        nfd: "\u{1105}\u{1162}\u{11AC}",
-        nfkc: "\u{B79D}",
-        nfkd: "\u{1105}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B79E}",
-        nfc: "\u{B79E}",
-        nfd: "\u{1105}\u{1162}\u{11AD}",
-        nfkc: "\u{B79E}",
-        nfkd: "\u{1105}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B79F}",
-        nfc: "\u{B79F}",
-        nfd: "\u{1105}\u{1162}\u{11AE}",
-        nfkc: "\u{B79F}",
-        nfkd: "\u{1105}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B7A0}",
-        nfc: "\u{B7A0}",
-        nfd: "\u{1105}\u{1162}\u{11AF}",
-        nfkc: "\u{B7A0}",
-        nfkd: "\u{1105}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B7A1}",
-        nfc: "\u{B7A1}",
-        nfd: "\u{1105}\u{1162}\u{11B0}",
-        nfkc: "\u{B7A1}",
-        nfkd: "\u{1105}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B7A2}",
-        nfc: "\u{B7A2}",
-        nfd: "\u{1105}\u{1162}\u{11B1}",
-        nfkc: "\u{B7A2}",
-        nfkd: "\u{1105}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B7A3}",
-        nfc: "\u{B7A3}",
-        nfd: "\u{1105}\u{1162}\u{11B2}",
-        nfkc: "\u{B7A3}",
-        nfkd: "\u{1105}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B7A4}",
-        nfc: "\u{B7A4}",
-        nfd: "\u{1105}\u{1162}\u{11B3}",
-        nfkc: "\u{B7A4}",
-        nfkd: "\u{1105}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B7A5}",
-        nfc: "\u{B7A5}",
-        nfd: "\u{1105}\u{1162}\u{11B4}",
-        nfkc: "\u{B7A5}",
-        nfkd: "\u{1105}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B7A6}",
-        nfc: "\u{B7A6}",
-        nfd: "\u{1105}\u{1162}\u{11B5}",
-        nfkc: "\u{B7A6}",
-        nfkd: "\u{1105}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B7A7}",
-        nfc: "\u{B7A7}",
-        nfd: "\u{1105}\u{1162}\u{11B6}",
-        nfkc: "\u{B7A7}",
-        nfkd: "\u{1105}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B7A8}",
-        nfc: "\u{B7A8}",
-        nfd: "\u{1105}\u{1162}\u{11B7}",
-        nfkc: "\u{B7A8}",
-        nfkd: "\u{1105}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B7A9}",
-        nfc: "\u{B7A9}",
-        nfd: "\u{1105}\u{1162}\u{11B8}",
-        nfkc: "\u{B7A9}",
-        nfkd: "\u{1105}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B7AA}",
-        nfc: "\u{B7AA}",
-        nfd: "\u{1105}\u{1162}\u{11B9}",
-        nfkc: "\u{B7AA}",
-        nfkd: "\u{1105}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B7AB}",
-        nfc: "\u{B7AB}",
-        nfd: "\u{1105}\u{1162}\u{11BA}",
-        nfkc: "\u{B7AB}",
-        nfkd: "\u{1105}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B7AC}",
-        nfc: "\u{B7AC}",
-        nfd: "\u{1105}\u{1162}\u{11BB}",
-        nfkc: "\u{B7AC}",
-        nfkd: "\u{1105}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B7AD}",
-        nfc: "\u{B7AD}",
-        nfd: "\u{1105}\u{1162}\u{11BC}",
-        nfkc: "\u{B7AD}",
-        nfkd: "\u{1105}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B7AE}",
-        nfc: "\u{B7AE}",
-        nfd: "\u{1105}\u{1162}\u{11BD}",
-        nfkc: "\u{B7AE}",
-        nfkd: "\u{1105}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B7AF}",
-        nfc: "\u{B7AF}",
-        nfd: "\u{1105}\u{1162}\u{11BE}",
-        nfkc: "\u{B7AF}",
-        nfkd: "\u{1105}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B7B0}",
-        nfc: "\u{B7B0}",
-        nfd: "\u{1105}\u{1162}\u{11BF}",
-        nfkc: "\u{B7B0}",
-        nfkd: "\u{1105}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B7B1}",
-        nfc: "\u{B7B1}",
-        nfd: "\u{1105}\u{1162}\u{11C0}",
-        nfkc: "\u{B7B1}",
-        nfkd: "\u{1105}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B7B2}",
-        nfc: "\u{B7B2}",
-        nfd: "\u{1105}\u{1162}\u{11C1}",
-        nfkc: "\u{B7B2}",
-        nfkd: "\u{1105}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B7B3}",
-        nfc: "\u{B7B3}",
-        nfd: "\u{1105}\u{1162}\u{11C2}",
-        nfkc: "\u{B7B3}",
-        nfkd: "\u{1105}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B7B4}",
-        nfc: "\u{B7B4}",
-        nfd: "\u{1105}\u{1163}",
-        nfkc: "\u{B7B4}",
-        nfkd: "\u{1105}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{B7B5}",
-        nfc: "\u{B7B5}",
-        nfd: "\u{1105}\u{1163}\u{11A8}",
-        nfkc: "\u{B7B5}",
-        nfkd: "\u{1105}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B7B6}",
-        nfc: "\u{B7B6}",
-        nfd: "\u{1105}\u{1163}\u{11A9}",
-        nfkc: "\u{B7B6}",
-        nfkd: "\u{1105}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B7B7}",
-        nfc: "\u{B7B7}",
-        nfd: "\u{1105}\u{1163}\u{11AA}",
-        nfkc: "\u{B7B7}",
-        nfkd: "\u{1105}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B7B8}",
-        nfc: "\u{B7B8}",
-        nfd: "\u{1105}\u{1163}\u{11AB}",
-        nfkc: "\u{B7B8}",
-        nfkd: "\u{1105}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B7B9}",
-        nfc: "\u{B7B9}",
-        nfd: "\u{1105}\u{1163}\u{11AC}",
-        nfkc: "\u{B7B9}",
-        nfkd: "\u{1105}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B7BA}",
-        nfc: "\u{B7BA}",
-        nfd: "\u{1105}\u{1163}\u{11AD}",
-        nfkc: "\u{B7BA}",
-        nfkd: "\u{1105}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B7BB}",
-        nfc: "\u{B7BB}",
-        nfd: "\u{1105}\u{1163}\u{11AE}",
-        nfkc: "\u{B7BB}",
-        nfkd: "\u{1105}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B7BC}",
-        nfc: "\u{B7BC}",
-        nfd: "\u{1105}\u{1163}\u{11AF}",
-        nfkc: "\u{B7BC}",
-        nfkd: "\u{1105}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B7BD}",
-        nfc: "\u{B7BD}",
-        nfd: "\u{1105}\u{1163}\u{11B0}",
-        nfkc: "\u{B7BD}",
-        nfkd: "\u{1105}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B7BE}",
-        nfc: "\u{B7BE}",
-        nfd: "\u{1105}\u{1163}\u{11B1}",
-        nfkc: "\u{B7BE}",
-        nfkd: "\u{1105}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B7BF}",
-        nfc: "\u{B7BF}",
-        nfd: "\u{1105}\u{1163}\u{11B2}",
-        nfkc: "\u{B7BF}",
-        nfkd: "\u{1105}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B7C0}",
-        nfc: "\u{B7C0}",
-        nfd: "\u{1105}\u{1163}\u{11B3}",
-        nfkc: "\u{B7C0}",
-        nfkd: "\u{1105}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B7C1}",
-        nfc: "\u{B7C1}",
-        nfd: "\u{1105}\u{1163}\u{11B4}",
-        nfkc: "\u{B7C1}",
-        nfkd: "\u{1105}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B7C2}",
-        nfc: "\u{B7C2}",
-        nfd: "\u{1105}\u{1163}\u{11B5}",
-        nfkc: "\u{B7C2}",
-        nfkd: "\u{1105}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B7C3}",
-        nfc: "\u{B7C3}",
-        nfd: "\u{1105}\u{1163}\u{11B6}",
-        nfkc: "\u{B7C3}",
-        nfkd: "\u{1105}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B7C4}",
-        nfc: "\u{B7C4}",
-        nfd: "\u{1105}\u{1163}\u{11B7}",
-        nfkc: "\u{B7C4}",
-        nfkd: "\u{1105}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B7C5}",
-        nfc: "\u{B7C5}",
-        nfd: "\u{1105}\u{1163}\u{11B8}",
-        nfkc: "\u{B7C5}",
-        nfkd: "\u{1105}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B7C6}",
-        nfc: "\u{B7C6}",
-        nfd: "\u{1105}\u{1163}\u{11B9}",
-        nfkc: "\u{B7C6}",
-        nfkd: "\u{1105}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B7C7}",
-        nfc: "\u{B7C7}",
-        nfd: "\u{1105}\u{1163}\u{11BA}",
-        nfkc: "\u{B7C7}",
-        nfkd: "\u{1105}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B7C8}",
-        nfc: "\u{B7C8}",
-        nfd: "\u{1105}\u{1163}\u{11BB}",
-        nfkc: "\u{B7C8}",
-        nfkd: "\u{1105}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B7C9}",
-        nfc: "\u{B7C9}",
-        nfd: "\u{1105}\u{1163}\u{11BC}",
-        nfkc: "\u{B7C9}",
-        nfkd: "\u{1105}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B7CA}",
-        nfc: "\u{B7CA}",
-        nfd: "\u{1105}\u{1163}\u{11BD}",
-        nfkc: "\u{B7CA}",
-        nfkd: "\u{1105}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B7CB}",
-        nfc: "\u{B7CB}",
-        nfd: "\u{1105}\u{1163}\u{11BE}",
-        nfkc: "\u{B7CB}",
-        nfkd: "\u{1105}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B7CC}",
-        nfc: "\u{B7CC}",
-        nfd: "\u{1105}\u{1163}\u{11BF}",
-        nfkc: "\u{B7CC}",
-        nfkd: "\u{1105}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B7CD}",
-        nfc: "\u{B7CD}",
-        nfd: "\u{1105}\u{1163}\u{11C0}",
-        nfkc: "\u{B7CD}",
-        nfkd: "\u{1105}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B7CE}",
-        nfc: "\u{B7CE}",
-        nfd: "\u{1105}\u{1163}\u{11C1}",
-        nfkc: "\u{B7CE}",
-        nfkd: "\u{1105}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B7CF}",
-        nfc: "\u{B7CF}",
-        nfd: "\u{1105}\u{1163}\u{11C2}",
-        nfkc: "\u{B7CF}",
-        nfkd: "\u{1105}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B7D0}",
-        nfc: "\u{B7D0}",
-        nfd: "\u{1105}\u{1164}",
-        nfkc: "\u{B7D0}",
-        nfkd: "\u{1105}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{B7D1}",
-        nfc: "\u{B7D1}",
-        nfd: "\u{1105}\u{1164}\u{11A8}",
-        nfkc: "\u{B7D1}",
-        nfkd: "\u{1105}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B7D2}",
-        nfc: "\u{B7D2}",
-        nfd: "\u{1105}\u{1164}\u{11A9}",
-        nfkc: "\u{B7D2}",
-        nfkd: "\u{1105}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B7D3}",
-        nfc: "\u{B7D3}",
-        nfd: "\u{1105}\u{1164}\u{11AA}",
-        nfkc: "\u{B7D3}",
-        nfkd: "\u{1105}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B7D4}",
-        nfc: "\u{B7D4}",
-        nfd: "\u{1105}\u{1164}\u{11AB}",
-        nfkc: "\u{B7D4}",
-        nfkd: "\u{1105}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B7D5}",
-        nfc: "\u{B7D5}",
-        nfd: "\u{1105}\u{1164}\u{11AC}",
-        nfkc: "\u{B7D5}",
-        nfkd: "\u{1105}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B7D6}",
-        nfc: "\u{B7D6}",
-        nfd: "\u{1105}\u{1164}\u{11AD}",
-        nfkc: "\u{B7D6}",
-        nfkd: "\u{1105}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B7D7}",
-        nfc: "\u{B7D7}",
-        nfd: "\u{1105}\u{1164}\u{11AE}",
-        nfkc: "\u{B7D7}",
-        nfkd: "\u{1105}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B7D8}",
-        nfc: "\u{B7D8}",
-        nfd: "\u{1105}\u{1164}\u{11AF}",
-        nfkc: "\u{B7D8}",
-        nfkd: "\u{1105}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B7D9}",
-        nfc: "\u{B7D9}",
-        nfd: "\u{1105}\u{1164}\u{11B0}",
-        nfkc: "\u{B7D9}",
-        nfkd: "\u{1105}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B7DA}",
-        nfc: "\u{B7DA}",
-        nfd: "\u{1105}\u{1164}\u{11B1}",
-        nfkc: "\u{B7DA}",
-        nfkd: "\u{1105}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B7DB}",
-        nfc: "\u{B7DB}",
-        nfd: "\u{1105}\u{1164}\u{11B2}",
-        nfkc: "\u{B7DB}",
-        nfkd: "\u{1105}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B7DC}",
-        nfc: "\u{B7DC}",
-        nfd: "\u{1105}\u{1164}\u{11B3}",
-        nfkc: "\u{B7DC}",
-        nfkd: "\u{1105}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B7DD}",
-        nfc: "\u{B7DD}",
-        nfd: "\u{1105}\u{1164}\u{11B4}",
-        nfkc: "\u{B7DD}",
-        nfkd: "\u{1105}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B7DE}",
-        nfc: "\u{B7DE}",
-        nfd: "\u{1105}\u{1164}\u{11B5}",
-        nfkc: "\u{B7DE}",
-        nfkd: "\u{1105}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B7DF}",
-        nfc: "\u{B7DF}",
-        nfd: "\u{1105}\u{1164}\u{11B6}",
-        nfkc: "\u{B7DF}",
-        nfkd: "\u{1105}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B7E0}",
-        nfc: "\u{B7E0}",
-        nfd: "\u{1105}\u{1164}\u{11B7}",
-        nfkc: "\u{B7E0}",
-        nfkd: "\u{1105}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B7E1}",
-        nfc: "\u{B7E1}",
-        nfd: "\u{1105}\u{1164}\u{11B8}",
-        nfkc: "\u{B7E1}",
-        nfkd: "\u{1105}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B7E2}",
-        nfc: "\u{B7E2}",
-        nfd: "\u{1105}\u{1164}\u{11B9}",
-        nfkc: "\u{B7E2}",
-        nfkd: "\u{1105}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B7E3}",
-        nfc: "\u{B7E3}",
-        nfd: "\u{1105}\u{1164}\u{11BA}",
-        nfkc: "\u{B7E3}",
-        nfkd: "\u{1105}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B7E4}",
-        nfc: "\u{B7E4}",
-        nfd: "\u{1105}\u{1164}\u{11BB}",
-        nfkc: "\u{B7E4}",
-        nfkd: "\u{1105}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B7E5}",
-        nfc: "\u{B7E5}",
-        nfd: "\u{1105}\u{1164}\u{11BC}",
-        nfkc: "\u{B7E5}",
-        nfkd: "\u{1105}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B7E6}",
-        nfc: "\u{B7E6}",
-        nfd: "\u{1105}\u{1164}\u{11BD}",
-        nfkc: "\u{B7E6}",
-        nfkd: "\u{1105}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B7E7}",
-        nfc: "\u{B7E7}",
-        nfd: "\u{1105}\u{1164}\u{11BE}",
-        nfkc: "\u{B7E7}",
-        nfkd: "\u{1105}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B7E8}",
-        nfc: "\u{B7E8}",
-        nfd: "\u{1105}\u{1164}\u{11BF}",
-        nfkc: "\u{B7E8}",
-        nfkd: "\u{1105}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B7E9}",
-        nfc: "\u{B7E9}",
-        nfd: "\u{1105}\u{1164}\u{11C0}",
-        nfkc: "\u{B7E9}",
-        nfkd: "\u{1105}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B7EA}",
-        nfc: "\u{B7EA}",
-        nfd: "\u{1105}\u{1164}\u{11C1}",
-        nfkc: "\u{B7EA}",
-        nfkd: "\u{1105}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B7EB}",
-        nfc: "\u{B7EB}",
-        nfd: "\u{1105}\u{1164}\u{11C2}",
-        nfkc: "\u{B7EB}",
-        nfkd: "\u{1105}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B7EC}",
-        nfc: "\u{B7EC}",
-        nfd: "\u{1105}\u{1165}",
-        nfkc: "\u{B7EC}",
-        nfkd: "\u{1105}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{B7ED}",
-        nfc: "\u{B7ED}",
-        nfd: "\u{1105}\u{1165}\u{11A8}",
-        nfkc: "\u{B7ED}",
-        nfkd: "\u{1105}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B7EE}",
-        nfc: "\u{B7EE}",
-        nfd: "\u{1105}\u{1165}\u{11A9}",
-        nfkc: "\u{B7EE}",
-        nfkd: "\u{1105}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B7EF}",
-        nfc: "\u{B7EF}",
-        nfd: "\u{1105}\u{1165}\u{11AA}",
-        nfkc: "\u{B7EF}",
-        nfkd: "\u{1105}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B7F0}",
-        nfc: "\u{B7F0}",
-        nfd: "\u{1105}\u{1165}\u{11AB}",
-        nfkc: "\u{B7F0}",
-        nfkd: "\u{1105}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B7F1}",
-        nfc: "\u{B7F1}",
-        nfd: "\u{1105}\u{1165}\u{11AC}",
-        nfkc: "\u{B7F1}",
-        nfkd: "\u{1105}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B7F2}",
-        nfc: "\u{B7F2}",
-        nfd: "\u{1105}\u{1165}\u{11AD}",
-        nfkc: "\u{B7F2}",
-        nfkd: "\u{1105}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B7F3}",
-        nfc: "\u{B7F3}",
-        nfd: "\u{1105}\u{1165}\u{11AE}",
-        nfkc: "\u{B7F3}",
-        nfkd: "\u{1105}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B7F4}",
-        nfc: "\u{B7F4}",
-        nfd: "\u{1105}\u{1165}\u{11AF}",
-        nfkc: "\u{B7F4}",
-        nfkd: "\u{1105}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B7F5}",
-        nfc: "\u{B7F5}",
-        nfd: "\u{1105}\u{1165}\u{11B0}",
-        nfkc: "\u{B7F5}",
-        nfkd: "\u{1105}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B7F6}",
-        nfc: "\u{B7F6}",
-        nfd: "\u{1105}\u{1165}\u{11B1}",
-        nfkc: "\u{B7F6}",
-        nfkd: "\u{1105}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B7F7}",
-        nfc: "\u{B7F7}",
-        nfd: "\u{1105}\u{1165}\u{11B2}",
-        nfkc: "\u{B7F7}",
-        nfkd: "\u{1105}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B7F8}",
-        nfc: "\u{B7F8}",
-        nfd: "\u{1105}\u{1165}\u{11B3}",
-        nfkc: "\u{B7F8}",
-        nfkd: "\u{1105}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B7F9}",
-        nfc: "\u{B7F9}",
-        nfd: "\u{1105}\u{1165}\u{11B4}",
-        nfkc: "\u{B7F9}",
-        nfkd: "\u{1105}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B7FA}",
-        nfc: "\u{B7FA}",
-        nfd: "\u{1105}\u{1165}\u{11B5}",
-        nfkc: "\u{B7FA}",
-        nfkd: "\u{1105}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B7FB}",
-        nfc: "\u{B7FB}",
-        nfd: "\u{1105}\u{1165}\u{11B6}",
-        nfkc: "\u{B7FB}",
-        nfkd: "\u{1105}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B7FC}",
-        nfc: "\u{B7FC}",
-        nfd: "\u{1105}\u{1165}\u{11B7}",
-        nfkc: "\u{B7FC}",
-        nfkd: "\u{1105}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B7FD}",
-        nfc: "\u{B7FD}",
-        nfd: "\u{1105}\u{1165}\u{11B8}",
-        nfkc: "\u{B7FD}",
-        nfkd: "\u{1105}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B7FE}",
-        nfc: "\u{B7FE}",
-        nfd: "\u{1105}\u{1165}\u{11B9}",
-        nfkc: "\u{B7FE}",
-        nfkd: "\u{1105}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B7FF}",
-        nfc: "\u{B7FF}",
-        nfd: "\u{1105}\u{1165}\u{11BA}",
-        nfkc: "\u{B7FF}",
-        nfkd: "\u{1105}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B800}",
-        nfc: "\u{B800}",
-        nfd: "\u{1105}\u{1165}\u{11BB}",
-        nfkc: "\u{B800}",
-        nfkd: "\u{1105}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B801}",
-        nfc: "\u{B801}",
-        nfd: "\u{1105}\u{1165}\u{11BC}",
-        nfkc: "\u{B801}",
-        nfkd: "\u{1105}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B802}",
-        nfc: "\u{B802}",
-        nfd: "\u{1105}\u{1165}\u{11BD}",
-        nfkc: "\u{B802}",
-        nfkd: "\u{1105}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B803}",
-        nfc: "\u{B803}",
-        nfd: "\u{1105}\u{1165}\u{11BE}",
-        nfkc: "\u{B803}",
-        nfkd: "\u{1105}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B804}",
-        nfc: "\u{B804}",
-        nfd: "\u{1105}\u{1165}\u{11BF}",
-        nfkc: "\u{B804}",
-        nfkd: "\u{1105}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B805}",
-        nfc: "\u{B805}",
-        nfd: "\u{1105}\u{1165}\u{11C0}",
-        nfkc: "\u{B805}",
-        nfkd: "\u{1105}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B806}",
-        nfc: "\u{B806}",
-        nfd: "\u{1105}\u{1165}\u{11C1}",
-        nfkc: "\u{B806}",
-        nfkd: "\u{1105}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B807}",
-        nfc: "\u{B807}",
-        nfd: "\u{1105}\u{1165}\u{11C2}",
-        nfkc: "\u{B807}",
-        nfkd: "\u{1105}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B808}",
-        nfc: "\u{B808}",
-        nfd: "\u{1105}\u{1166}",
-        nfkc: "\u{B808}",
-        nfkd: "\u{1105}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{B809}",
-        nfc: "\u{B809}",
-        nfd: "\u{1105}\u{1166}\u{11A8}",
-        nfkc: "\u{B809}",
-        nfkd: "\u{1105}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B80A}",
-        nfc: "\u{B80A}",
-        nfd: "\u{1105}\u{1166}\u{11A9}",
-        nfkc: "\u{B80A}",
-        nfkd: "\u{1105}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B80B}",
-        nfc: "\u{B80B}",
-        nfd: "\u{1105}\u{1166}\u{11AA}",
-        nfkc: "\u{B80B}",
-        nfkd: "\u{1105}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B80C}",
-        nfc: "\u{B80C}",
-        nfd: "\u{1105}\u{1166}\u{11AB}",
-        nfkc: "\u{B80C}",
-        nfkd: "\u{1105}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B80D}",
-        nfc: "\u{B80D}",
-        nfd: "\u{1105}\u{1166}\u{11AC}",
-        nfkc: "\u{B80D}",
-        nfkd: "\u{1105}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B80E}",
-        nfc: "\u{B80E}",
-        nfd: "\u{1105}\u{1166}\u{11AD}",
-        nfkc: "\u{B80E}",
-        nfkd: "\u{1105}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B80F}",
-        nfc: "\u{B80F}",
-        nfd: "\u{1105}\u{1166}\u{11AE}",
-        nfkc: "\u{B80F}",
-        nfkd: "\u{1105}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B810}",
-        nfc: "\u{B810}",
-        nfd: "\u{1105}\u{1166}\u{11AF}",
-        nfkc: "\u{B810}",
-        nfkd: "\u{1105}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B811}",
-        nfc: "\u{B811}",
-        nfd: "\u{1105}\u{1166}\u{11B0}",
-        nfkc: "\u{B811}",
-        nfkd: "\u{1105}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B812}",
-        nfc: "\u{B812}",
-        nfd: "\u{1105}\u{1166}\u{11B1}",
-        nfkc: "\u{B812}",
-        nfkd: "\u{1105}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B813}",
-        nfc: "\u{B813}",
-        nfd: "\u{1105}\u{1166}\u{11B2}",
-        nfkc: "\u{B813}",
-        nfkd: "\u{1105}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B814}",
-        nfc: "\u{B814}",
-        nfd: "\u{1105}\u{1166}\u{11B3}",
-        nfkc: "\u{B814}",
-        nfkd: "\u{1105}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B815}",
-        nfc: "\u{B815}",
-        nfd: "\u{1105}\u{1166}\u{11B4}",
-        nfkc: "\u{B815}",
-        nfkd: "\u{1105}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B816}",
-        nfc: "\u{B816}",
-        nfd: "\u{1105}\u{1166}\u{11B5}",
-        nfkc: "\u{B816}",
-        nfkd: "\u{1105}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B817}",
-        nfc: "\u{B817}",
-        nfd: "\u{1105}\u{1166}\u{11B6}",
-        nfkc: "\u{B817}",
-        nfkd: "\u{1105}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B818}",
-        nfc: "\u{B818}",
-        nfd: "\u{1105}\u{1166}\u{11B7}",
-        nfkc: "\u{B818}",
-        nfkd: "\u{1105}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B819}",
-        nfc: "\u{B819}",
-        nfd: "\u{1105}\u{1166}\u{11B8}",
-        nfkc: "\u{B819}",
-        nfkd: "\u{1105}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B81A}",
-        nfc: "\u{B81A}",
-        nfd: "\u{1105}\u{1166}\u{11B9}",
-        nfkc: "\u{B81A}",
-        nfkd: "\u{1105}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B81B}",
-        nfc: "\u{B81B}",
-        nfd: "\u{1105}\u{1166}\u{11BA}",
-        nfkc: "\u{B81B}",
-        nfkd: "\u{1105}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B81C}",
-        nfc: "\u{B81C}",
-        nfd: "\u{1105}\u{1166}\u{11BB}",
-        nfkc: "\u{B81C}",
-        nfkd: "\u{1105}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B81D}",
-        nfc: "\u{B81D}",
-        nfd: "\u{1105}\u{1166}\u{11BC}",
-        nfkc: "\u{B81D}",
-        nfkd: "\u{1105}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B81E}",
-        nfc: "\u{B81E}",
-        nfd: "\u{1105}\u{1166}\u{11BD}",
-        nfkc: "\u{B81E}",
-        nfkd: "\u{1105}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B81F}",
-        nfc: "\u{B81F}",
-        nfd: "\u{1105}\u{1166}\u{11BE}",
-        nfkc: "\u{B81F}",
-        nfkd: "\u{1105}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B820}",
-        nfc: "\u{B820}",
-        nfd: "\u{1105}\u{1166}\u{11BF}",
-        nfkc: "\u{B820}",
-        nfkd: "\u{1105}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B821}",
-        nfc: "\u{B821}",
-        nfd: "\u{1105}\u{1166}\u{11C0}",
-        nfkc: "\u{B821}",
-        nfkd: "\u{1105}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B822}",
-        nfc: "\u{B822}",
-        nfd: "\u{1105}\u{1166}\u{11C1}",
-        nfkc: "\u{B822}",
-        nfkd: "\u{1105}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B823}",
-        nfc: "\u{B823}",
-        nfd: "\u{1105}\u{1166}\u{11C2}",
-        nfkc: "\u{B823}",
-        nfkd: "\u{1105}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B824}",
-        nfc: "\u{B824}",
-        nfd: "\u{1105}\u{1167}",
-        nfkc: "\u{B824}",
-        nfkd: "\u{1105}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{B825}",
-        nfc: "\u{B825}",
-        nfd: "\u{1105}\u{1167}\u{11A8}",
-        nfkc: "\u{B825}",
-        nfkd: "\u{1105}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B826}",
-        nfc: "\u{B826}",
-        nfd: "\u{1105}\u{1167}\u{11A9}",
-        nfkc: "\u{B826}",
-        nfkd: "\u{1105}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B827}",
-        nfc: "\u{B827}",
-        nfd: "\u{1105}\u{1167}\u{11AA}",
-        nfkc: "\u{B827}",
-        nfkd: "\u{1105}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B828}",
-        nfc: "\u{B828}",
-        nfd: "\u{1105}\u{1167}\u{11AB}",
-        nfkc: "\u{B828}",
-        nfkd: "\u{1105}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B829}",
-        nfc: "\u{B829}",
-        nfd: "\u{1105}\u{1167}\u{11AC}",
-        nfkc: "\u{B829}",
-        nfkd: "\u{1105}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B82A}",
-        nfc: "\u{B82A}",
-        nfd: "\u{1105}\u{1167}\u{11AD}",
-        nfkc: "\u{B82A}",
-        nfkd: "\u{1105}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B82B}",
-        nfc: "\u{B82B}",
-        nfd: "\u{1105}\u{1167}\u{11AE}",
-        nfkc: "\u{B82B}",
-        nfkd: "\u{1105}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B82C}",
-        nfc: "\u{B82C}",
-        nfd: "\u{1105}\u{1167}\u{11AF}",
-        nfkc: "\u{B82C}",
-        nfkd: "\u{1105}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B82D}",
-        nfc: "\u{B82D}",
-        nfd: "\u{1105}\u{1167}\u{11B0}",
-        nfkc: "\u{B82D}",
-        nfkd: "\u{1105}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B82E}",
-        nfc: "\u{B82E}",
-        nfd: "\u{1105}\u{1167}\u{11B1}",
-        nfkc: "\u{B82E}",
-        nfkd: "\u{1105}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B82F}",
-        nfc: "\u{B82F}",
-        nfd: "\u{1105}\u{1167}\u{11B2}",
-        nfkc: "\u{B82F}",
-        nfkd: "\u{1105}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B830}",
-        nfc: "\u{B830}",
-        nfd: "\u{1105}\u{1167}\u{11B3}",
-        nfkc: "\u{B830}",
-        nfkd: "\u{1105}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B831}",
-        nfc: "\u{B831}",
-        nfd: "\u{1105}\u{1167}\u{11B4}",
-        nfkc: "\u{B831}",
-        nfkd: "\u{1105}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B832}",
-        nfc: "\u{B832}",
-        nfd: "\u{1105}\u{1167}\u{11B5}",
-        nfkc: "\u{B832}",
-        nfkd: "\u{1105}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B833}",
-        nfc: "\u{B833}",
-        nfd: "\u{1105}\u{1167}\u{11B6}",
-        nfkc: "\u{B833}",
-        nfkd: "\u{1105}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B834}",
-        nfc: "\u{B834}",
-        nfd: "\u{1105}\u{1167}\u{11B7}",
-        nfkc: "\u{B834}",
-        nfkd: "\u{1105}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B835}",
-        nfc: "\u{B835}",
-        nfd: "\u{1105}\u{1167}\u{11B8}",
-        nfkc: "\u{B835}",
-        nfkd: "\u{1105}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B836}",
-        nfc: "\u{B836}",
-        nfd: "\u{1105}\u{1167}\u{11B9}",
-        nfkc: "\u{B836}",
-        nfkd: "\u{1105}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B837}",
-        nfc: "\u{B837}",
-        nfd: "\u{1105}\u{1167}\u{11BA}",
-        nfkc: "\u{B837}",
-        nfkd: "\u{1105}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B838}",
-        nfc: "\u{B838}",
-        nfd: "\u{1105}\u{1167}\u{11BB}",
-        nfkc: "\u{B838}",
-        nfkd: "\u{1105}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B839}",
-        nfc: "\u{B839}",
-        nfd: "\u{1105}\u{1167}\u{11BC}",
-        nfkc: "\u{B839}",
-        nfkd: "\u{1105}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B83A}",
-        nfc: "\u{B83A}",
-        nfd: "\u{1105}\u{1167}\u{11BD}",
-        nfkc: "\u{B83A}",
-        nfkd: "\u{1105}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B83B}",
-        nfc: "\u{B83B}",
-        nfd: "\u{1105}\u{1167}\u{11BE}",
-        nfkc: "\u{B83B}",
-        nfkd: "\u{1105}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B83C}",
-        nfc: "\u{B83C}",
-        nfd: "\u{1105}\u{1167}\u{11BF}",
-        nfkc: "\u{B83C}",
-        nfkd: "\u{1105}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B83D}",
-        nfc: "\u{B83D}",
-        nfd: "\u{1105}\u{1167}\u{11C0}",
-        nfkc: "\u{B83D}",
-        nfkd: "\u{1105}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B83E}",
-        nfc: "\u{B83E}",
-        nfd: "\u{1105}\u{1167}\u{11C1}",
-        nfkc: "\u{B83E}",
-        nfkd: "\u{1105}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B83F}",
-        nfc: "\u{B83F}",
-        nfd: "\u{1105}\u{1167}\u{11C2}",
-        nfkc: "\u{B83F}",
-        nfkd: "\u{1105}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B840}",
-        nfc: "\u{B840}",
-        nfd: "\u{1105}\u{1168}",
-        nfkc: "\u{B840}",
-        nfkd: "\u{1105}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{B841}",
-        nfc: "\u{B841}",
-        nfd: "\u{1105}\u{1168}\u{11A8}",
-        nfkc: "\u{B841}",
-        nfkd: "\u{1105}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B842}",
-        nfc: "\u{B842}",
-        nfd: "\u{1105}\u{1168}\u{11A9}",
-        nfkc: "\u{B842}",
-        nfkd: "\u{1105}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B843}",
-        nfc: "\u{B843}",
-        nfd: "\u{1105}\u{1168}\u{11AA}",
-        nfkc: "\u{B843}",
-        nfkd: "\u{1105}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B844}",
-        nfc: "\u{B844}",
-        nfd: "\u{1105}\u{1168}\u{11AB}",
-        nfkc: "\u{B844}",
-        nfkd: "\u{1105}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B845}",
-        nfc: "\u{B845}",
-        nfd: "\u{1105}\u{1168}\u{11AC}",
-        nfkc: "\u{B845}",
-        nfkd: "\u{1105}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B846}",
-        nfc: "\u{B846}",
-        nfd: "\u{1105}\u{1168}\u{11AD}",
-        nfkc: "\u{B846}",
-        nfkd: "\u{1105}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B847}",
-        nfc: "\u{B847}",
-        nfd: "\u{1105}\u{1168}\u{11AE}",
-        nfkc: "\u{B847}",
-        nfkd: "\u{1105}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B848}",
-        nfc: "\u{B848}",
-        nfd: "\u{1105}\u{1168}\u{11AF}",
-        nfkc: "\u{B848}",
-        nfkd: "\u{1105}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B849}",
-        nfc: "\u{B849}",
-        nfd: "\u{1105}\u{1168}\u{11B0}",
-        nfkc: "\u{B849}",
-        nfkd: "\u{1105}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B84A}",
-        nfc: "\u{B84A}",
-        nfd: "\u{1105}\u{1168}\u{11B1}",
-        nfkc: "\u{B84A}",
-        nfkd: "\u{1105}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B84B}",
-        nfc: "\u{B84B}",
-        nfd: "\u{1105}\u{1168}\u{11B2}",
-        nfkc: "\u{B84B}",
-        nfkd: "\u{1105}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B84C}",
-        nfc: "\u{B84C}",
-        nfd: "\u{1105}\u{1168}\u{11B3}",
-        nfkc: "\u{B84C}",
-        nfkd: "\u{1105}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B84D}",
-        nfc: "\u{B84D}",
-        nfd: "\u{1105}\u{1168}\u{11B4}",
-        nfkc: "\u{B84D}",
-        nfkd: "\u{1105}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B84E}",
-        nfc: "\u{B84E}",
-        nfd: "\u{1105}\u{1168}\u{11B5}",
-        nfkc: "\u{B84E}",
-        nfkd: "\u{1105}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B84F}",
-        nfc: "\u{B84F}",
-        nfd: "\u{1105}\u{1168}\u{11B6}",
-        nfkc: "\u{B84F}",
-        nfkd: "\u{1105}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B850}",
-        nfc: "\u{B850}",
-        nfd: "\u{1105}\u{1168}\u{11B7}",
-        nfkc: "\u{B850}",
-        nfkd: "\u{1105}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B851}",
-        nfc: "\u{B851}",
-        nfd: "\u{1105}\u{1168}\u{11B8}",
-        nfkc: "\u{B851}",
-        nfkd: "\u{1105}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B852}",
-        nfc: "\u{B852}",
-        nfd: "\u{1105}\u{1168}\u{11B9}",
-        nfkc: "\u{B852}",
-        nfkd: "\u{1105}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B853}",
-        nfc: "\u{B853}",
-        nfd: "\u{1105}\u{1168}\u{11BA}",
-        nfkc: "\u{B853}",
-        nfkd: "\u{1105}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B854}",
-        nfc: "\u{B854}",
-        nfd: "\u{1105}\u{1168}\u{11BB}",
-        nfkc: "\u{B854}",
-        nfkd: "\u{1105}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B855}",
-        nfc: "\u{B855}",
-        nfd: "\u{1105}\u{1168}\u{11BC}",
-        nfkc: "\u{B855}",
-        nfkd: "\u{1105}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B856}",
-        nfc: "\u{B856}",
-        nfd: "\u{1105}\u{1168}\u{11BD}",
-        nfkc: "\u{B856}",
-        nfkd: "\u{1105}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B857}",
-        nfc: "\u{B857}",
-        nfd: "\u{1105}\u{1168}\u{11BE}",
-        nfkc: "\u{B857}",
-        nfkd: "\u{1105}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B858}",
-        nfc: "\u{B858}",
-        nfd: "\u{1105}\u{1168}\u{11BF}",
-        nfkc: "\u{B858}",
-        nfkd: "\u{1105}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B859}",
-        nfc: "\u{B859}",
-        nfd: "\u{1105}\u{1168}\u{11C0}",
-        nfkc: "\u{B859}",
-        nfkd: "\u{1105}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B85A}",
-        nfc: "\u{B85A}",
-        nfd: "\u{1105}\u{1168}\u{11C1}",
-        nfkc: "\u{B85A}",
-        nfkd: "\u{1105}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B85B}",
-        nfc: "\u{B85B}",
-        nfd: "\u{1105}\u{1168}\u{11C2}",
-        nfkc: "\u{B85B}",
-        nfkd: "\u{1105}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B85C}",
-        nfc: "\u{B85C}",
-        nfd: "\u{1105}\u{1169}",
-        nfkc: "\u{B85C}",
-        nfkd: "\u{1105}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{B85D}",
-        nfc: "\u{B85D}",
-        nfd: "\u{1105}\u{1169}\u{11A8}",
-        nfkc: "\u{B85D}",
-        nfkd: "\u{1105}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B85E}",
-        nfc: "\u{B85E}",
-        nfd: "\u{1105}\u{1169}\u{11A9}",
-        nfkc: "\u{B85E}",
-        nfkd: "\u{1105}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B85F}",
-        nfc: "\u{B85F}",
-        nfd: "\u{1105}\u{1169}\u{11AA}",
-        nfkc: "\u{B85F}",
-        nfkd: "\u{1105}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B860}",
-        nfc: "\u{B860}",
-        nfd: "\u{1105}\u{1169}\u{11AB}",
-        nfkc: "\u{B860}",
-        nfkd: "\u{1105}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B861}",
-        nfc: "\u{B861}",
-        nfd: "\u{1105}\u{1169}\u{11AC}",
-        nfkc: "\u{B861}",
-        nfkd: "\u{1105}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B862}",
-        nfc: "\u{B862}",
-        nfd: "\u{1105}\u{1169}\u{11AD}",
-        nfkc: "\u{B862}",
-        nfkd: "\u{1105}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B863}",
-        nfc: "\u{B863}",
-        nfd: "\u{1105}\u{1169}\u{11AE}",
-        nfkc: "\u{B863}",
-        nfkd: "\u{1105}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B864}",
-        nfc: "\u{B864}",
-        nfd: "\u{1105}\u{1169}\u{11AF}",
-        nfkc: "\u{B864}",
-        nfkd: "\u{1105}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B865}",
-        nfc: "\u{B865}",
-        nfd: "\u{1105}\u{1169}\u{11B0}",
-        nfkc: "\u{B865}",
-        nfkd: "\u{1105}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B866}",
-        nfc: "\u{B866}",
-        nfd: "\u{1105}\u{1169}\u{11B1}",
-        nfkc: "\u{B866}",
-        nfkd: "\u{1105}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B867}",
-        nfc: "\u{B867}",
-        nfd: "\u{1105}\u{1169}\u{11B2}",
-        nfkc: "\u{B867}",
-        nfkd: "\u{1105}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B868}",
-        nfc: "\u{B868}",
-        nfd: "\u{1105}\u{1169}\u{11B3}",
-        nfkc: "\u{B868}",
-        nfkd: "\u{1105}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B869}",
-        nfc: "\u{B869}",
-        nfd: "\u{1105}\u{1169}\u{11B4}",
-        nfkc: "\u{B869}",
-        nfkd: "\u{1105}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B86A}",
-        nfc: "\u{B86A}",
-        nfd: "\u{1105}\u{1169}\u{11B5}",
-        nfkc: "\u{B86A}",
-        nfkd: "\u{1105}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B86B}",
-        nfc: "\u{B86B}",
-        nfd: "\u{1105}\u{1169}\u{11B6}",
-        nfkc: "\u{B86B}",
-        nfkd: "\u{1105}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B86C}",
-        nfc: "\u{B86C}",
-        nfd: "\u{1105}\u{1169}\u{11B7}",
-        nfkc: "\u{B86C}",
-        nfkd: "\u{1105}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B86D}",
-        nfc: "\u{B86D}",
-        nfd: "\u{1105}\u{1169}\u{11B8}",
-        nfkc: "\u{B86D}",
-        nfkd: "\u{1105}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B86E}",
-        nfc: "\u{B86E}",
-        nfd: "\u{1105}\u{1169}\u{11B9}",
-        nfkc: "\u{B86E}",
-        nfkd: "\u{1105}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B86F}",
-        nfc: "\u{B86F}",
-        nfd: "\u{1105}\u{1169}\u{11BA}",
-        nfkc: "\u{B86F}",
-        nfkd: "\u{1105}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B870}",
-        nfc: "\u{B870}",
-        nfd: "\u{1105}\u{1169}\u{11BB}",
-        nfkc: "\u{B870}",
-        nfkd: "\u{1105}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B871}",
-        nfc: "\u{B871}",
-        nfd: "\u{1105}\u{1169}\u{11BC}",
-        nfkc: "\u{B871}",
-        nfkd: "\u{1105}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B872}",
-        nfc: "\u{B872}",
-        nfd: "\u{1105}\u{1169}\u{11BD}",
-        nfkc: "\u{B872}",
-        nfkd: "\u{1105}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B873}",
-        nfc: "\u{B873}",
-        nfd: "\u{1105}\u{1169}\u{11BE}",
-        nfkc: "\u{B873}",
-        nfkd: "\u{1105}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B874}",
-        nfc: "\u{B874}",
-        nfd: "\u{1105}\u{1169}\u{11BF}",
-        nfkc: "\u{B874}",
-        nfkd: "\u{1105}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B875}",
-        nfc: "\u{B875}",
-        nfd: "\u{1105}\u{1169}\u{11C0}",
-        nfkc: "\u{B875}",
-        nfkd: "\u{1105}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B876}",
-        nfc: "\u{B876}",
-        nfd: "\u{1105}\u{1169}\u{11C1}",
-        nfkc: "\u{B876}",
-        nfkd: "\u{1105}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B877}",
-        nfc: "\u{B877}",
-        nfd: "\u{1105}\u{1169}\u{11C2}",
-        nfkc: "\u{B877}",
-        nfkd: "\u{1105}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B878}",
-        nfc: "\u{B878}",
-        nfd: "\u{1105}\u{116A}",
-        nfkc: "\u{B878}",
-        nfkd: "\u{1105}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{B879}",
-        nfc: "\u{B879}",
-        nfd: "\u{1105}\u{116A}\u{11A8}",
-        nfkc: "\u{B879}",
-        nfkd: "\u{1105}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B87A}",
-        nfc: "\u{B87A}",
-        nfd: "\u{1105}\u{116A}\u{11A9}",
-        nfkc: "\u{B87A}",
-        nfkd: "\u{1105}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B87B}",
-        nfc: "\u{B87B}",
-        nfd: "\u{1105}\u{116A}\u{11AA}",
-        nfkc: "\u{B87B}",
-        nfkd: "\u{1105}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B87C}",
-        nfc: "\u{B87C}",
-        nfd: "\u{1105}\u{116A}\u{11AB}",
-        nfkc: "\u{B87C}",
-        nfkd: "\u{1105}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B87D}",
-        nfc: "\u{B87D}",
-        nfd: "\u{1105}\u{116A}\u{11AC}",
-        nfkc: "\u{B87D}",
-        nfkd: "\u{1105}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B87E}",
-        nfc: "\u{B87E}",
-        nfd: "\u{1105}\u{116A}\u{11AD}",
-        nfkc: "\u{B87E}",
-        nfkd: "\u{1105}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B87F}",
-        nfc: "\u{B87F}",
-        nfd: "\u{1105}\u{116A}\u{11AE}",
-        nfkc: "\u{B87F}",
-        nfkd: "\u{1105}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B880}",
-        nfc: "\u{B880}",
-        nfd: "\u{1105}\u{116A}\u{11AF}",
-        nfkc: "\u{B880}",
-        nfkd: "\u{1105}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B881}",
-        nfc: "\u{B881}",
-        nfd: "\u{1105}\u{116A}\u{11B0}",
-        nfkc: "\u{B881}",
-        nfkd: "\u{1105}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B882}",
-        nfc: "\u{B882}",
-        nfd: "\u{1105}\u{116A}\u{11B1}",
-        nfkc: "\u{B882}",
-        nfkd: "\u{1105}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B883}",
-        nfc: "\u{B883}",
-        nfd: "\u{1105}\u{116A}\u{11B2}",
-        nfkc: "\u{B883}",
-        nfkd: "\u{1105}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B884}",
-        nfc: "\u{B884}",
-        nfd: "\u{1105}\u{116A}\u{11B3}",
-        nfkc: "\u{B884}",
-        nfkd: "\u{1105}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B885}",
-        nfc: "\u{B885}",
-        nfd: "\u{1105}\u{116A}\u{11B4}",
-        nfkc: "\u{B885}",
-        nfkd: "\u{1105}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B886}",
-        nfc: "\u{B886}",
-        nfd: "\u{1105}\u{116A}\u{11B5}",
-        nfkc: "\u{B886}",
-        nfkd: "\u{1105}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B887}",
-        nfc: "\u{B887}",
-        nfd: "\u{1105}\u{116A}\u{11B6}",
-        nfkc: "\u{B887}",
-        nfkd: "\u{1105}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B888}",
-        nfc: "\u{B888}",
-        nfd: "\u{1105}\u{116A}\u{11B7}",
-        nfkc: "\u{B888}",
-        nfkd: "\u{1105}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B889}",
-        nfc: "\u{B889}",
-        nfd: "\u{1105}\u{116A}\u{11B8}",
-        nfkc: "\u{B889}",
-        nfkd: "\u{1105}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B88A}",
-        nfc: "\u{B88A}",
-        nfd: "\u{1105}\u{116A}\u{11B9}",
-        nfkc: "\u{B88A}",
-        nfkd: "\u{1105}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B88B}",
-        nfc: "\u{B88B}",
-        nfd: "\u{1105}\u{116A}\u{11BA}",
-        nfkc: "\u{B88B}",
-        nfkd: "\u{1105}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B88C}",
-        nfc: "\u{B88C}",
-        nfd: "\u{1105}\u{116A}\u{11BB}",
-        nfkc: "\u{B88C}",
-        nfkd: "\u{1105}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B88D}",
-        nfc: "\u{B88D}",
-        nfd: "\u{1105}\u{116A}\u{11BC}",
-        nfkc: "\u{B88D}",
-        nfkd: "\u{1105}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B88E}",
-        nfc: "\u{B88E}",
-        nfd: "\u{1105}\u{116A}\u{11BD}",
-        nfkc: "\u{B88E}",
-        nfkd: "\u{1105}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B88F}",
-        nfc: "\u{B88F}",
-        nfd: "\u{1105}\u{116A}\u{11BE}",
-        nfkc: "\u{B88F}",
-        nfkd: "\u{1105}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B890}",
-        nfc: "\u{B890}",
-        nfd: "\u{1105}\u{116A}\u{11BF}",
-        nfkc: "\u{B890}",
-        nfkd: "\u{1105}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B891}",
-        nfc: "\u{B891}",
-        nfd: "\u{1105}\u{116A}\u{11C0}",
-        nfkc: "\u{B891}",
-        nfkd: "\u{1105}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B892}",
-        nfc: "\u{B892}",
-        nfd: "\u{1105}\u{116A}\u{11C1}",
-        nfkc: "\u{B892}",
-        nfkd: "\u{1105}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B893}",
-        nfc: "\u{B893}",
-        nfd: "\u{1105}\u{116A}\u{11C2}",
-        nfkc: "\u{B893}",
-        nfkd: "\u{1105}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B894}",
-        nfc: "\u{B894}",
-        nfd: "\u{1105}\u{116B}",
-        nfkc: "\u{B894}",
-        nfkd: "\u{1105}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{B895}",
-        nfc: "\u{B895}",
-        nfd: "\u{1105}\u{116B}\u{11A8}",
-        nfkc: "\u{B895}",
-        nfkd: "\u{1105}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B896}",
-        nfc: "\u{B896}",
-        nfd: "\u{1105}\u{116B}\u{11A9}",
-        nfkc: "\u{B896}",
-        nfkd: "\u{1105}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B897}",
-        nfc: "\u{B897}",
-        nfd: "\u{1105}\u{116B}\u{11AA}",
-        nfkc: "\u{B897}",
-        nfkd: "\u{1105}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B898}",
-        nfc: "\u{B898}",
-        nfd: "\u{1105}\u{116B}\u{11AB}",
-        nfkc: "\u{B898}",
-        nfkd: "\u{1105}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B899}",
-        nfc: "\u{B899}",
-        nfd: "\u{1105}\u{116B}\u{11AC}",
-        nfkc: "\u{B899}",
-        nfkd: "\u{1105}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B89A}",
-        nfc: "\u{B89A}",
-        nfd: "\u{1105}\u{116B}\u{11AD}",
-        nfkc: "\u{B89A}",
-        nfkd: "\u{1105}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B89B}",
-        nfc: "\u{B89B}",
-        nfd: "\u{1105}\u{116B}\u{11AE}",
-        nfkc: "\u{B89B}",
-        nfkd: "\u{1105}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B89C}",
-        nfc: "\u{B89C}",
-        nfd: "\u{1105}\u{116B}\u{11AF}",
-        nfkc: "\u{B89C}",
-        nfkd: "\u{1105}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B89D}",
-        nfc: "\u{B89D}",
-        nfd: "\u{1105}\u{116B}\u{11B0}",
-        nfkc: "\u{B89D}",
-        nfkd: "\u{1105}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B89E}",
-        nfc: "\u{B89E}",
-        nfd: "\u{1105}\u{116B}\u{11B1}",
-        nfkc: "\u{B89E}",
-        nfkd: "\u{1105}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B89F}",
-        nfc: "\u{B89F}",
-        nfd: "\u{1105}\u{116B}\u{11B2}",
-        nfkc: "\u{B89F}",
-        nfkd: "\u{1105}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B8A0}",
-        nfc: "\u{B8A0}",
-        nfd: "\u{1105}\u{116B}\u{11B3}",
-        nfkc: "\u{B8A0}",
-        nfkd: "\u{1105}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B8A1}",
-        nfc: "\u{B8A1}",
-        nfd: "\u{1105}\u{116B}\u{11B4}",
-        nfkc: "\u{B8A1}",
-        nfkd: "\u{1105}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B8A2}",
-        nfc: "\u{B8A2}",
-        nfd: "\u{1105}\u{116B}\u{11B5}",
-        nfkc: "\u{B8A2}",
-        nfkd: "\u{1105}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B8A3}",
-        nfc: "\u{B8A3}",
-        nfd: "\u{1105}\u{116B}\u{11B6}",
-        nfkc: "\u{B8A3}",
-        nfkd: "\u{1105}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B8A4}",
-        nfc: "\u{B8A4}",
-        nfd: "\u{1105}\u{116B}\u{11B7}",
-        nfkc: "\u{B8A4}",
-        nfkd: "\u{1105}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B8A5}",
-        nfc: "\u{B8A5}",
-        nfd: "\u{1105}\u{116B}\u{11B8}",
-        nfkc: "\u{B8A5}",
-        nfkd: "\u{1105}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B8A6}",
-        nfc: "\u{B8A6}",
-        nfd: "\u{1105}\u{116B}\u{11B9}",
-        nfkc: "\u{B8A6}",
-        nfkd: "\u{1105}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B8A7}",
-        nfc: "\u{B8A7}",
-        nfd: "\u{1105}\u{116B}\u{11BA}",
-        nfkc: "\u{B8A7}",
-        nfkd: "\u{1105}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B8A8}",
-        nfc: "\u{B8A8}",
-        nfd: "\u{1105}\u{116B}\u{11BB}",
-        nfkc: "\u{B8A8}",
-        nfkd: "\u{1105}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B8A9}",
-        nfc: "\u{B8A9}",
-        nfd: "\u{1105}\u{116B}\u{11BC}",
-        nfkc: "\u{B8A9}",
-        nfkd: "\u{1105}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B8AA}",
-        nfc: "\u{B8AA}",
-        nfd: "\u{1105}\u{116B}\u{11BD}",
-        nfkc: "\u{B8AA}",
-        nfkd: "\u{1105}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B8AB}",
-        nfc: "\u{B8AB}",
-        nfd: "\u{1105}\u{116B}\u{11BE}",
-        nfkc: "\u{B8AB}",
-        nfkd: "\u{1105}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B8AC}",
-        nfc: "\u{B8AC}",
-        nfd: "\u{1105}\u{116B}\u{11BF}",
-        nfkc: "\u{B8AC}",
-        nfkd: "\u{1105}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B8AD}",
-        nfc: "\u{B8AD}",
-        nfd: "\u{1105}\u{116B}\u{11C0}",
-        nfkc: "\u{B8AD}",
-        nfkd: "\u{1105}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B8AE}",
-        nfc: "\u{B8AE}",
-        nfd: "\u{1105}\u{116B}\u{11C1}",
-        nfkc: "\u{B8AE}",
-        nfkd: "\u{1105}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B8AF}",
-        nfc: "\u{B8AF}",
-        nfd: "\u{1105}\u{116B}\u{11C2}",
-        nfkc: "\u{B8AF}",
-        nfkd: "\u{1105}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B8B0}",
-        nfc: "\u{B8B0}",
-        nfd: "\u{1105}\u{116C}",
-        nfkc: "\u{B8B0}",
-        nfkd: "\u{1105}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{B8B1}",
-        nfc: "\u{B8B1}",
-        nfd: "\u{1105}\u{116C}\u{11A8}",
-        nfkc: "\u{B8B1}",
-        nfkd: "\u{1105}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B8B2}",
-        nfc: "\u{B8B2}",
-        nfd: "\u{1105}\u{116C}\u{11A9}",
-        nfkc: "\u{B8B2}",
-        nfkd: "\u{1105}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B8B3}",
-        nfc: "\u{B8B3}",
-        nfd: "\u{1105}\u{116C}\u{11AA}",
-        nfkc: "\u{B8B3}",
-        nfkd: "\u{1105}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B8B4}",
-        nfc: "\u{B8B4}",
-        nfd: "\u{1105}\u{116C}\u{11AB}",
-        nfkc: "\u{B8B4}",
-        nfkd: "\u{1105}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B8B5}",
-        nfc: "\u{B8B5}",
-        nfd: "\u{1105}\u{116C}\u{11AC}",
-        nfkc: "\u{B8B5}",
-        nfkd: "\u{1105}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B8B6}",
-        nfc: "\u{B8B6}",
-        nfd: "\u{1105}\u{116C}\u{11AD}",
-        nfkc: "\u{B8B6}",
-        nfkd: "\u{1105}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B8B7}",
-        nfc: "\u{B8B7}",
-        nfd: "\u{1105}\u{116C}\u{11AE}",
-        nfkc: "\u{B8B7}",
-        nfkd: "\u{1105}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B8B8}",
-        nfc: "\u{B8B8}",
-        nfd: "\u{1105}\u{116C}\u{11AF}",
-        nfkc: "\u{B8B8}",
-        nfkd: "\u{1105}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B8B9}",
-        nfc: "\u{B8B9}",
-        nfd: "\u{1105}\u{116C}\u{11B0}",
-        nfkc: "\u{B8B9}",
-        nfkd: "\u{1105}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B8BA}",
-        nfc: "\u{B8BA}",
-        nfd: "\u{1105}\u{116C}\u{11B1}",
-        nfkc: "\u{B8BA}",
-        nfkd: "\u{1105}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B8BB}",
-        nfc: "\u{B8BB}",
-        nfd: "\u{1105}\u{116C}\u{11B2}",
-        nfkc: "\u{B8BB}",
-        nfkd: "\u{1105}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B8BC}",
-        nfc: "\u{B8BC}",
-        nfd: "\u{1105}\u{116C}\u{11B3}",
-        nfkc: "\u{B8BC}",
-        nfkd: "\u{1105}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B8BD}",
-        nfc: "\u{B8BD}",
-        nfd: "\u{1105}\u{116C}\u{11B4}",
-        nfkc: "\u{B8BD}",
-        nfkd: "\u{1105}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B8BE}",
-        nfc: "\u{B8BE}",
-        nfd: "\u{1105}\u{116C}\u{11B5}",
-        nfkc: "\u{B8BE}",
-        nfkd: "\u{1105}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B8BF}",
-        nfc: "\u{B8BF}",
-        nfd: "\u{1105}\u{116C}\u{11B6}",
-        nfkc: "\u{B8BF}",
-        nfkd: "\u{1105}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B8C0}",
-        nfc: "\u{B8C0}",
-        nfd: "\u{1105}\u{116C}\u{11B7}",
-        nfkc: "\u{B8C0}",
-        nfkd: "\u{1105}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B8C1}",
-        nfc: "\u{B8C1}",
-        nfd: "\u{1105}\u{116C}\u{11B8}",
-        nfkc: "\u{B8C1}",
-        nfkd: "\u{1105}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B8C2}",
-        nfc: "\u{B8C2}",
-        nfd: "\u{1105}\u{116C}\u{11B9}",
-        nfkc: "\u{B8C2}",
-        nfkd: "\u{1105}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B8C3}",
-        nfc: "\u{B8C3}",
-        nfd: "\u{1105}\u{116C}\u{11BA}",
-        nfkc: "\u{B8C3}",
-        nfkd: "\u{1105}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B8C4}",
-        nfc: "\u{B8C4}",
-        nfd: "\u{1105}\u{116C}\u{11BB}",
-        nfkc: "\u{B8C4}",
-        nfkd: "\u{1105}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B8C5}",
-        nfc: "\u{B8C5}",
-        nfd: "\u{1105}\u{116C}\u{11BC}",
-        nfkc: "\u{B8C5}",
-        nfkd: "\u{1105}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B8C6}",
-        nfc: "\u{B8C6}",
-        nfd: "\u{1105}\u{116C}\u{11BD}",
-        nfkc: "\u{B8C6}",
-        nfkd: "\u{1105}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B8C7}",
-        nfc: "\u{B8C7}",
-        nfd: "\u{1105}\u{116C}\u{11BE}",
-        nfkc: "\u{B8C7}",
-        nfkd: "\u{1105}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B8C8}",
-        nfc: "\u{B8C8}",
-        nfd: "\u{1105}\u{116C}\u{11BF}",
-        nfkc: "\u{B8C8}",
-        nfkd: "\u{1105}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B8C9}",
-        nfc: "\u{B8C9}",
-        nfd: "\u{1105}\u{116C}\u{11C0}",
-        nfkc: "\u{B8C9}",
-        nfkd: "\u{1105}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B8CA}",
-        nfc: "\u{B8CA}",
-        nfd: "\u{1105}\u{116C}\u{11C1}",
-        nfkc: "\u{B8CA}",
-        nfkd: "\u{1105}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B8CB}",
-        nfc: "\u{B8CB}",
-        nfd: "\u{1105}\u{116C}\u{11C2}",
-        nfkc: "\u{B8CB}",
-        nfkd: "\u{1105}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B8CC}",
-        nfc: "\u{B8CC}",
-        nfd: "\u{1105}\u{116D}",
-        nfkc: "\u{B8CC}",
-        nfkd: "\u{1105}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{B8CD}",
-        nfc: "\u{B8CD}",
-        nfd: "\u{1105}\u{116D}\u{11A8}",
-        nfkc: "\u{B8CD}",
-        nfkd: "\u{1105}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B8CE}",
-        nfc: "\u{B8CE}",
-        nfd: "\u{1105}\u{116D}\u{11A9}",
-        nfkc: "\u{B8CE}",
-        nfkd: "\u{1105}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B8CF}",
-        nfc: "\u{B8CF}",
-        nfd: "\u{1105}\u{116D}\u{11AA}",
-        nfkc: "\u{B8CF}",
-        nfkd: "\u{1105}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B8D0}",
-        nfc: "\u{B8D0}",
-        nfd: "\u{1105}\u{116D}\u{11AB}",
-        nfkc: "\u{B8D0}",
-        nfkd: "\u{1105}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B8D1}",
-        nfc: "\u{B8D1}",
-        nfd: "\u{1105}\u{116D}\u{11AC}",
-        nfkc: "\u{B8D1}",
-        nfkd: "\u{1105}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B8D2}",
-        nfc: "\u{B8D2}",
-        nfd: "\u{1105}\u{116D}\u{11AD}",
-        nfkc: "\u{B8D2}",
-        nfkd: "\u{1105}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B8D3}",
-        nfc: "\u{B8D3}",
-        nfd: "\u{1105}\u{116D}\u{11AE}",
-        nfkc: "\u{B8D3}",
-        nfkd: "\u{1105}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B8D4}",
-        nfc: "\u{B8D4}",
-        nfd: "\u{1105}\u{116D}\u{11AF}",
-        nfkc: "\u{B8D4}",
-        nfkd: "\u{1105}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B8D5}",
-        nfc: "\u{B8D5}",
-        nfd: "\u{1105}\u{116D}\u{11B0}",
-        nfkc: "\u{B8D5}",
-        nfkd: "\u{1105}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B8D6}",
-        nfc: "\u{B8D6}",
-        nfd: "\u{1105}\u{116D}\u{11B1}",
-        nfkc: "\u{B8D6}",
-        nfkd: "\u{1105}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B8D7}",
-        nfc: "\u{B8D7}",
-        nfd: "\u{1105}\u{116D}\u{11B2}",
-        nfkc: "\u{B8D7}",
-        nfkd: "\u{1105}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B8D8}",
-        nfc: "\u{B8D8}",
-        nfd: "\u{1105}\u{116D}\u{11B3}",
-        nfkc: "\u{B8D8}",
-        nfkd: "\u{1105}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B8D9}",
-        nfc: "\u{B8D9}",
-        nfd: "\u{1105}\u{116D}\u{11B4}",
-        nfkc: "\u{B8D9}",
-        nfkd: "\u{1105}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B8DA}",
-        nfc: "\u{B8DA}",
-        nfd: "\u{1105}\u{116D}\u{11B5}",
-        nfkc: "\u{B8DA}",
-        nfkd: "\u{1105}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B8DB}",
-        nfc: "\u{B8DB}",
-        nfd: "\u{1105}\u{116D}\u{11B6}",
-        nfkc: "\u{B8DB}",
-        nfkd: "\u{1105}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B8DC}",
-        nfc: "\u{B8DC}",
-        nfd: "\u{1105}\u{116D}\u{11B7}",
-        nfkc: "\u{B8DC}",
-        nfkd: "\u{1105}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B8DD}",
-        nfc: "\u{B8DD}",
-        nfd: "\u{1105}\u{116D}\u{11B8}",
-        nfkc: "\u{B8DD}",
-        nfkd: "\u{1105}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B8DE}",
-        nfc: "\u{B8DE}",
-        nfd: "\u{1105}\u{116D}\u{11B9}",
-        nfkc: "\u{B8DE}",
-        nfkd: "\u{1105}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B8DF}",
-        nfc: "\u{B8DF}",
-        nfd: "\u{1105}\u{116D}\u{11BA}",
-        nfkc: "\u{B8DF}",
-        nfkd: "\u{1105}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B8E0}",
-        nfc: "\u{B8E0}",
-        nfd: "\u{1105}\u{116D}\u{11BB}",
-        nfkc: "\u{B8E0}",
-        nfkd: "\u{1105}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B8E1}",
-        nfc: "\u{B8E1}",
-        nfd: "\u{1105}\u{116D}\u{11BC}",
-        nfkc: "\u{B8E1}",
-        nfkd: "\u{1105}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B8E2}",
-        nfc: "\u{B8E2}",
-        nfd: "\u{1105}\u{116D}\u{11BD}",
-        nfkc: "\u{B8E2}",
-        nfkd: "\u{1105}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B8E3}",
-        nfc: "\u{B8E3}",
-        nfd: "\u{1105}\u{116D}\u{11BE}",
-        nfkc: "\u{B8E3}",
-        nfkd: "\u{1105}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B8E4}",
-        nfc: "\u{B8E4}",
-        nfd: "\u{1105}\u{116D}\u{11BF}",
-        nfkc: "\u{B8E4}",
-        nfkd: "\u{1105}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B8E5}",
-        nfc: "\u{B8E5}",
-        nfd: "\u{1105}\u{116D}\u{11C0}",
-        nfkc: "\u{B8E5}",
-        nfkd: "\u{1105}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B8E6}",
-        nfc: "\u{B8E6}",
-        nfd: "\u{1105}\u{116D}\u{11C1}",
-        nfkc: "\u{B8E6}",
-        nfkd: "\u{1105}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B8E7}",
-        nfc: "\u{B8E7}",
-        nfd: "\u{1105}\u{116D}\u{11C2}",
-        nfkc: "\u{B8E7}",
-        nfkd: "\u{1105}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B8E8}",
-        nfc: "\u{B8E8}",
-        nfd: "\u{1105}\u{116E}",
-        nfkc: "\u{B8E8}",
-        nfkd: "\u{1105}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{B8E9}",
-        nfc: "\u{B8E9}",
-        nfd: "\u{1105}\u{116E}\u{11A8}",
-        nfkc: "\u{B8E9}",
-        nfkd: "\u{1105}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B8EA}",
-        nfc: "\u{B8EA}",
-        nfd: "\u{1105}\u{116E}\u{11A9}",
-        nfkc: "\u{B8EA}",
-        nfkd: "\u{1105}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B8EB}",
-        nfc: "\u{B8EB}",
-        nfd: "\u{1105}\u{116E}\u{11AA}",
-        nfkc: "\u{B8EB}",
-        nfkd: "\u{1105}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B8EC}",
-        nfc: "\u{B8EC}",
-        nfd: "\u{1105}\u{116E}\u{11AB}",
-        nfkc: "\u{B8EC}",
-        nfkd: "\u{1105}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B8ED}",
-        nfc: "\u{B8ED}",
-        nfd: "\u{1105}\u{116E}\u{11AC}",
-        nfkc: "\u{B8ED}",
-        nfkd: "\u{1105}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B8EE}",
-        nfc: "\u{B8EE}",
-        nfd: "\u{1105}\u{116E}\u{11AD}",
-        nfkc: "\u{B8EE}",
-        nfkd: "\u{1105}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B8EF}",
-        nfc: "\u{B8EF}",
-        nfd: "\u{1105}\u{116E}\u{11AE}",
-        nfkc: "\u{B8EF}",
-        nfkd: "\u{1105}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B8F0}",
-        nfc: "\u{B8F0}",
-        nfd: "\u{1105}\u{116E}\u{11AF}",
-        nfkc: "\u{B8F0}",
-        nfkd: "\u{1105}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B8F1}",
-        nfc: "\u{B8F1}",
-        nfd: "\u{1105}\u{116E}\u{11B0}",
-        nfkc: "\u{B8F1}",
-        nfkd: "\u{1105}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B8F2}",
-        nfc: "\u{B8F2}",
-        nfd: "\u{1105}\u{116E}\u{11B1}",
-        nfkc: "\u{B8F2}",
-        nfkd: "\u{1105}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B8F3}",
-        nfc: "\u{B8F3}",
-        nfd: "\u{1105}\u{116E}\u{11B2}",
-        nfkc: "\u{B8F3}",
-        nfkd: "\u{1105}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B8F4}",
-        nfc: "\u{B8F4}",
-        nfd: "\u{1105}\u{116E}\u{11B3}",
-        nfkc: "\u{B8F4}",
-        nfkd: "\u{1105}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B8F5}",
-        nfc: "\u{B8F5}",
-        nfd: "\u{1105}\u{116E}\u{11B4}",
-        nfkc: "\u{B8F5}",
-        nfkd: "\u{1105}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B8F6}",
-        nfc: "\u{B8F6}",
-        nfd: "\u{1105}\u{116E}\u{11B5}",
-        nfkc: "\u{B8F6}",
-        nfkd: "\u{1105}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B8F7}",
-        nfc: "\u{B8F7}",
-        nfd: "\u{1105}\u{116E}\u{11B6}",
-        nfkc: "\u{B8F7}",
-        nfkd: "\u{1105}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B8F8}",
-        nfc: "\u{B8F8}",
-        nfd: "\u{1105}\u{116E}\u{11B7}",
-        nfkc: "\u{B8F8}",
-        nfkd: "\u{1105}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B8F9}",
-        nfc: "\u{B8F9}",
-        nfd: "\u{1105}\u{116E}\u{11B8}",
-        nfkc: "\u{B8F9}",
-        nfkd: "\u{1105}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B8FA}",
-        nfc: "\u{B8FA}",
-        nfd: "\u{1105}\u{116E}\u{11B9}",
-        nfkc: "\u{B8FA}",
-        nfkd: "\u{1105}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B8FB}",
-        nfc: "\u{B8FB}",
-        nfd: "\u{1105}\u{116E}\u{11BA}",
-        nfkc: "\u{B8FB}",
-        nfkd: "\u{1105}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B8FC}",
-        nfc: "\u{B8FC}",
-        nfd: "\u{1105}\u{116E}\u{11BB}",
-        nfkc: "\u{B8FC}",
-        nfkd: "\u{1105}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B8FD}",
-        nfc: "\u{B8FD}",
-        nfd: "\u{1105}\u{116E}\u{11BC}",
-        nfkc: "\u{B8FD}",
-        nfkd: "\u{1105}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B8FE}",
-        nfc: "\u{B8FE}",
-        nfd: "\u{1105}\u{116E}\u{11BD}",
-        nfkc: "\u{B8FE}",
-        nfkd: "\u{1105}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B8FF}",
-        nfc: "\u{B8FF}",
-        nfd: "\u{1105}\u{116E}\u{11BE}",
-        nfkc: "\u{B8FF}",
-        nfkd: "\u{1105}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B900}",
-        nfc: "\u{B900}",
-        nfd: "\u{1105}\u{116E}\u{11BF}",
-        nfkc: "\u{B900}",
-        nfkd: "\u{1105}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B901}",
-        nfc: "\u{B901}",
-        nfd: "\u{1105}\u{116E}\u{11C0}",
-        nfkc: "\u{B901}",
-        nfkd: "\u{1105}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B902}",
-        nfc: "\u{B902}",
-        nfd: "\u{1105}\u{116E}\u{11C1}",
-        nfkc: "\u{B902}",
-        nfkd: "\u{1105}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B903}",
-        nfc: "\u{B903}",
-        nfd: "\u{1105}\u{116E}\u{11C2}",
-        nfkc: "\u{B903}",
-        nfkd: "\u{1105}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B904}",
-        nfc: "\u{B904}",
-        nfd: "\u{1105}\u{116F}",
-        nfkc: "\u{B904}",
-        nfkd: "\u{1105}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{B905}",
-        nfc: "\u{B905}",
-        nfd: "\u{1105}\u{116F}\u{11A8}",
-        nfkc: "\u{B905}",
-        nfkd: "\u{1105}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B906}",
-        nfc: "\u{B906}",
-        nfd: "\u{1105}\u{116F}\u{11A9}",
-        nfkc: "\u{B906}",
-        nfkd: "\u{1105}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B907}",
-        nfc: "\u{B907}",
-        nfd: "\u{1105}\u{116F}\u{11AA}",
-        nfkc: "\u{B907}",
-        nfkd: "\u{1105}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B908}",
-        nfc: "\u{B908}",
-        nfd: "\u{1105}\u{116F}\u{11AB}",
-        nfkc: "\u{B908}",
-        nfkd: "\u{1105}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B909}",
-        nfc: "\u{B909}",
-        nfd: "\u{1105}\u{116F}\u{11AC}",
-        nfkc: "\u{B909}",
-        nfkd: "\u{1105}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B90A}",
-        nfc: "\u{B90A}",
-        nfd: "\u{1105}\u{116F}\u{11AD}",
-        nfkc: "\u{B90A}",
-        nfkd: "\u{1105}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B90B}",
-        nfc: "\u{B90B}",
-        nfd: "\u{1105}\u{116F}\u{11AE}",
-        nfkc: "\u{B90B}",
-        nfkd: "\u{1105}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B90C}",
-        nfc: "\u{B90C}",
-        nfd: "\u{1105}\u{116F}\u{11AF}",
-        nfkc: "\u{B90C}",
-        nfkd: "\u{1105}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B90D}",
-        nfc: "\u{B90D}",
-        nfd: "\u{1105}\u{116F}\u{11B0}",
-        nfkc: "\u{B90D}",
-        nfkd: "\u{1105}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B90E}",
-        nfc: "\u{B90E}",
-        nfd: "\u{1105}\u{116F}\u{11B1}",
-        nfkc: "\u{B90E}",
-        nfkd: "\u{1105}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B90F}",
-        nfc: "\u{B90F}",
-        nfd: "\u{1105}\u{116F}\u{11B2}",
-        nfkc: "\u{B90F}",
-        nfkd: "\u{1105}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B910}",
-        nfc: "\u{B910}",
-        nfd: "\u{1105}\u{116F}\u{11B3}",
-        nfkc: "\u{B910}",
-        nfkd: "\u{1105}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B911}",
-        nfc: "\u{B911}",
-        nfd: "\u{1105}\u{116F}\u{11B4}",
-        nfkc: "\u{B911}",
-        nfkd: "\u{1105}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B912}",
-        nfc: "\u{B912}",
-        nfd: "\u{1105}\u{116F}\u{11B5}",
-        nfkc: "\u{B912}",
-        nfkd: "\u{1105}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B913}",
-        nfc: "\u{B913}",
-        nfd: "\u{1105}\u{116F}\u{11B6}",
-        nfkc: "\u{B913}",
-        nfkd: "\u{1105}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B914}",
-        nfc: "\u{B914}",
-        nfd: "\u{1105}\u{116F}\u{11B7}",
-        nfkc: "\u{B914}",
-        nfkd: "\u{1105}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B915}",
-        nfc: "\u{B915}",
-        nfd: "\u{1105}\u{116F}\u{11B8}",
-        nfkc: "\u{B915}",
-        nfkd: "\u{1105}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B916}",
-        nfc: "\u{B916}",
-        nfd: "\u{1105}\u{116F}\u{11B9}",
-        nfkc: "\u{B916}",
-        nfkd: "\u{1105}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B917}",
-        nfc: "\u{B917}",
-        nfd: "\u{1105}\u{116F}\u{11BA}",
-        nfkc: "\u{B917}",
-        nfkd: "\u{1105}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B918}",
-        nfc: "\u{B918}",
-        nfd: "\u{1105}\u{116F}\u{11BB}",
-        nfkc: "\u{B918}",
-        nfkd: "\u{1105}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B919}",
-        nfc: "\u{B919}",
-        nfd: "\u{1105}\u{116F}\u{11BC}",
-        nfkc: "\u{B919}",
-        nfkd: "\u{1105}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B91A}",
-        nfc: "\u{B91A}",
-        nfd: "\u{1105}\u{116F}\u{11BD}",
-        nfkc: "\u{B91A}",
-        nfkd: "\u{1105}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B91B}",
-        nfc: "\u{B91B}",
-        nfd: "\u{1105}\u{116F}\u{11BE}",
-        nfkc: "\u{B91B}",
-        nfkd: "\u{1105}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B91C}",
-        nfc: "\u{B91C}",
-        nfd: "\u{1105}\u{116F}\u{11BF}",
-        nfkc: "\u{B91C}",
-        nfkd: "\u{1105}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B91D}",
-        nfc: "\u{B91D}",
-        nfd: "\u{1105}\u{116F}\u{11C0}",
-        nfkc: "\u{B91D}",
-        nfkd: "\u{1105}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B91E}",
-        nfc: "\u{B91E}",
-        nfd: "\u{1105}\u{116F}\u{11C1}",
-        nfkc: "\u{B91E}",
-        nfkd: "\u{1105}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B91F}",
-        nfc: "\u{B91F}",
-        nfd: "\u{1105}\u{116F}\u{11C2}",
-        nfkc: "\u{B91F}",
-        nfkd: "\u{1105}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B920}",
-        nfc: "\u{B920}",
-        nfd: "\u{1105}\u{1170}",
-        nfkc: "\u{B920}",
-        nfkd: "\u{1105}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{B921}",
-        nfc: "\u{B921}",
-        nfd: "\u{1105}\u{1170}\u{11A8}",
-        nfkc: "\u{B921}",
-        nfkd: "\u{1105}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B922}",
-        nfc: "\u{B922}",
-        nfd: "\u{1105}\u{1170}\u{11A9}",
-        nfkc: "\u{B922}",
-        nfkd: "\u{1105}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B923}",
-        nfc: "\u{B923}",
-        nfd: "\u{1105}\u{1170}\u{11AA}",
-        nfkc: "\u{B923}",
-        nfkd: "\u{1105}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B924}",
-        nfc: "\u{B924}",
-        nfd: "\u{1105}\u{1170}\u{11AB}",
-        nfkc: "\u{B924}",
-        nfkd: "\u{1105}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B925}",
-        nfc: "\u{B925}",
-        nfd: "\u{1105}\u{1170}\u{11AC}",
-        nfkc: "\u{B925}",
-        nfkd: "\u{1105}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B926}",
-        nfc: "\u{B926}",
-        nfd: "\u{1105}\u{1170}\u{11AD}",
-        nfkc: "\u{B926}",
-        nfkd: "\u{1105}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B927}",
-        nfc: "\u{B927}",
-        nfd: "\u{1105}\u{1170}\u{11AE}",
-        nfkc: "\u{B927}",
-        nfkd: "\u{1105}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B928}",
-        nfc: "\u{B928}",
-        nfd: "\u{1105}\u{1170}\u{11AF}",
-        nfkc: "\u{B928}",
-        nfkd: "\u{1105}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B929}",
-        nfc: "\u{B929}",
-        nfd: "\u{1105}\u{1170}\u{11B0}",
-        nfkc: "\u{B929}",
-        nfkd: "\u{1105}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B92A}",
-        nfc: "\u{B92A}",
-        nfd: "\u{1105}\u{1170}\u{11B1}",
-        nfkc: "\u{B92A}",
-        nfkd: "\u{1105}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B92B}",
-        nfc: "\u{B92B}",
-        nfd: "\u{1105}\u{1170}\u{11B2}",
-        nfkc: "\u{B92B}",
-        nfkd: "\u{1105}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B92C}",
-        nfc: "\u{B92C}",
-        nfd: "\u{1105}\u{1170}\u{11B3}",
-        nfkc: "\u{B92C}",
-        nfkd: "\u{1105}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B92D}",
-        nfc: "\u{B92D}",
-        nfd: "\u{1105}\u{1170}\u{11B4}",
-        nfkc: "\u{B92D}",
-        nfkd: "\u{1105}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B92E}",
-        nfc: "\u{B92E}",
-        nfd: "\u{1105}\u{1170}\u{11B5}",
-        nfkc: "\u{B92E}",
-        nfkd: "\u{1105}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B92F}",
-        nfc: "\u{B92F}",
-        nfd: "\u{1105}\u{1170}\u{11B6}",
-        nfkc: "\u{B92F}",
-        nfkd: "\u{1105}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B930}",
-        nfc: "\u{B930}",
-        nfd: "\u{1105}\u{1170}\u{11B7}",
-        nfkc: "\u{B930}",
-        nfkd: "\u{1105}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B931}",
-        nfc: "\u{B931}",
-        nfd: "\u{1105}\u{1170}\u{11B8}",
-        nfkc: "\u{B931}",
-        nfkd: "\u{1105}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B932}",
-        nfc: "\u{B932}",
-        nfd: "\u{1105}\u{1170}\u{11B9}",
-        nfkc: "\u{B932}",
-        nfkd: "\u{1105}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B933}",
-        nfc: "\u{B933}",
-        nfd: "\u{1105}\u{1170}\u{11BA}",
-        nfkc: "\u{B933}",
-        nfkd: "\u{1105}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B934}",
-        nfc: "\u{B934}",
-        nfd: "\u{1105}\u{1170}\u{11BB}",
-        nfkc: "\u{B934}",
-        nfkd: "\u{1105}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B935}",
-        nfc: "\u{B935}",
-        nfd: "\u{1105}\u{1170}\u{11BC}",
-        nfkc: "\u{B935}",
-        nfkd: "\u{1105}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B936}",
-        nfc: "\u{B936}",
-        nfd: "\u{1105}\u{1170}\u{11BD}",
-        nfkc: "\u{B936}",
-        nfkd: "\u{1105}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B937}",
-        nfc: "\u{B937}",
-        nfd: "\u{1105}\u{1170}\u{11BE}",
-        nfkc: "\u{B937}",
-        nfkd: "\u{1105}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B938}",
-        nfc: "\u{B938}",
-        nfd: "\u{1105}\u{1170}\u{11BF}",
-        nfkc: "\u{B938}",
-        nfkd: "\u{1105}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B939}",
-        nfc: "\u{B939}",
-        nfd: "\u{1105}\u{1170}\u{11C0}",
-        nfkc: "\u{B939}",
-        nfkd: "\u{1105}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B93A}",
-        nfc: "\u{B93A}",
-        nfd: "\u{1105}\u{1170}\u{11C1}",
-        nfkc: "\u{B93A}",
-        nfkd: "\u{1105}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B93B}",
-        nfc: "\u{B93B}",
-        nfd: "\u{1105}\u{1170}\u{11C2}",
-        nfkc: "\u{B93B}",
-        nfkd: "\u{1105}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B93C}",
-        nfc: "\u{B93C}",
-        nfd: "\u{1105}\u{1171}",
-        nfkc: "\u{B93C}",
-        nfkd: "\u{1105}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{B93D}",
-        nfc: "\u{B93D}",
-        nfd: "\u{1105}\u{1171}\u{11A8}",
-        nfkc: "\u{B93D}",
-        nfkd: "\u{1105}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B93E}",
-        nfc: "\u{B93E}",
-        nfd: "\u{1105}\u{1171}\u{11A9}",
-        nfkc: "\u{B93E}",
-        nfkd: "\u{1105}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B93F}",
-        nfc: "\u{B93F}",
-        nfd: "\u{1105}\u{1171}\u{11AA}",
-        nfkc: "\u{B93F}",
-        nfkd: "\u{1105}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B940}",
-        nfc: "\u{B940}",
-        nfd: "\u{1105}\u{1171}\u{11AB}",
-        nfkc: "\u{B940}",
-        nfkd: "\u{1105}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B941}",
-        nfc: "\u{B941}",
-        nfd: "\u{1105}\u{1171}\u{11AC}",
-        nfkc: "\u{B941}",
-        nfkd: "\u{1105}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B942}",
-        nfc: "\u{B942}",
-        nfd: "\u{1105}\u{1171}\u{11AD}",
-        nfkc: "\u{B942}",
-        nfkd: "\u{1105}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B943}",
-        nfc: "\u{B943}",
-        nfd: "\u{1105}\u{1171}\u{11AE}",
-        nfkc: "\u{B943}",
-        nfkd: "\u{1105}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B944}",
-        nfc: "\u{B944}",
-        nfd: "\u{1105}\u{1171}\u{11AF}",
-        nfkc: "\u{B944}",
-        nfkd: "\u{1105}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B945}",
-        nfc: "\u{B945}",
-        nfd: "\u{1105}\u{1171}\u{11B0}",
-        nfkc: "\u{B945}",
-        nfkd: "\u{1105}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B946}",
-        nfc: "\u{B946}",
-        nfd: "\u{1105}\u{1171}\u{11B1}",
-        nfkc: "\u{B946}",
-        nfkd: "\u{1105}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B947}",
-        nfc: "\u{B947}",
-        nfd: "\u{1105}\u{1171}\u{11B2}",
-        nfkc: "\u{B947}",
-        nfkd: "\u{1105}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B948}",
-        nfc: "\u{B948}",
-        nfd: "\u{1105}\u{1171}\u{11B3}",
-        nfkc: "\u{B948}",
-        nfkd: "\u{1105}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B949}",
-        nfc: "\u{B949}",
-        nfd: "\u{1105}\u{1171}\u{11B4}",
-        nfkc: "\u{B949}",
-        nfkd: "\u{1105}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B94A}",
-        nfc: "\u{B94A}",
-        nfd: "\u{1105}\u{1171}\u{11B5}",
-        nfkc: "\u{B94A}",
-        nfkd: "\u{1105}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B94B}",
-        nfc: "\u{B94B}",
-        nfd: "\u{1105}\u{1171}\u{11B6}",
-        nfkc: "\u{B94B}",
-        nfkd: "\u{1105}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B94C}",
-        nfc: "\u{B94C}",
-        nfd: "\u{1105}\u{1171}\u{11B7}",
-        nfkc: "\u{B94C}",
-        nfkd: "\u{1105}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B94D}",
-        nfc: "\u{B94D}",
-        nfd: "\u{1105}\u{1171}\u{11B8}",
-        nfkc: "\u{B94D}",
-        nfkd: "\u{1105}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B94E}",
-        nfc: "\u{B94E}",
-        nfd: "\u{1105}\u{1171}\u{11B9}",
-        nfkc: "\u{B94E}",
-        nfkd: "\u{1105}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B94F}",
-        nfc: "\u{B94F}",
-        nfd: "\u{1105}\u{1171}\u{11BA}",
-        nfkc: "\u{B94F}",
-        nfkd: "\u{1105}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B950}",
-        nfc: "\u{B950}",
-        nfd: "\u{1105}\u{1171}\u{11BB}",
-        nfkc: "\u{B950}",
-        nfkd: "\u{1105}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B951}",
-        nfc: "\u{B951}",
-        nfd: "\u{1105}\u{1171}\u{11BC}",
-        nfkc: "\u{B951}",
-        nfkd: "\u{1105}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B952}",
-        nfc: "\u{B952}",
-        nfd: "\u{1105}\u{1171}\u{11BD}",
-        nfkc: "\u{B952}",
-        nfkd: "\u{1105}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B953}",
-        nfc: "\u{B953}",
-        nfd: "\u{1105}\u{1171}\u{11BE}",
-        nfkc: "\u{B953}",
-        nfkd: "\u{1105}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B954}",
-        nfc: "\u{B954}",
-        nfd: "\u{1105}\u{1171}\u{11BF}",
-        nfkc: "\u{B954}",
-        nfkd: "\u{1105}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B955}",
-        nfc: "\u{B955}",
-        nfd: "\u{1105}\u{1171}\u{11C0}",
-        nfkc: "\u{B955}",
-        nfkd: "\u{1105}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B956}",
-        nfc: "\u{B956}",
-        nfd: "\u{1105}\u{1171}\u{11C1}",
-        nfkc: "\u{B956}",
-        nfkd: "\u{1105}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B957}",
-        nfc: "\u{B957}",
-        nfd: "\u{1105}\u{1171}\u{11C2}",
-        nfkc: "\u{B957}",
-        nfkd: "\u{1105}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B958}",
-        nfc: "\u{B958}",
-        nfd: "\u{1105}\u{1172}",
-        nfkc: "\u{B958}",
-        nfkd: "\u{1105}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{B959}",
-        nfc: "\u{B959}",
-        nfd: "\u{1105}\u{1172}\u{11A8}",
-        nfkc: "\u{B959}",
-        nfkd: "\u{1105}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B95A}",
-        nfc: "\u{B95A}",
-        nfd: "\u{1105}\u{1172}\u{11A9}",
-        nfkc: "\u{B95A}",
-        nfkd: "\u{1105}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B95B}",
-        nfc: "\u{B95B}",
-        nfd: "\u{1105}\u{1172}\u{11AA}",
-        nfkc: "\u{B95B}",
-        nfkd: "\u{1105}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B95C}",
-        nfc: "\u{B95C}",
-        nfd: "\u{1105}\u{1172}\u{11AB}",
-        nfkc: "\u{B95C}",
-        nfkd: "\u{1105}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B95D}",
-        nfc: "\u{B95D}",
-        nfd: "\u{1105}\u{1172}\u{11AC}",
-        nfkc: "\u{B95D}",
-        nfkd: "\u{1105}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B95E}",
-        nfc: "\u{B95E}",
-        nfd: "\u{1105}\u{1172}\u{11AD}",
-        nfkc: "\u{B95E}",
-        nfkd: "\u{1105}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B95F}",
-        nfc: "\u{B95F}",
-        nfd: "\u{1105}\u{1172}\u{11AE}",
-        nfkc: "\u{B95F}",
-        nfkd: "\u{1105}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B960}",
-        nfc: "\u{B960}",
-        nfd: "\u{1105}\u{1172}\u{11AF}",
-        nfkc: "\u{B960}",
-        nfkd: "\u{1105}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B961}",
-        nfc: "\u{B961}",
-        nfd: "\u{1105}\u{1172}\u{11B0}",
-        nfkc: "\u{B961}",
-        nfkd: "\u{1105}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B962}",
-        nfc: "\u{B962}",
-        nfd: "\u{1105}\u{1172}\u{11B1}",
-        nfkc: "\u{B962}",
-        nfkd: "\u{1105}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B963}",
-        nfc: "\u{B963}",
-        nfd: "\u{1105}\u{1172}\u{11B2}",
-        nfkc: "\u{B963}",
-        nfkd: "\u{1105}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B964}",
-        nfc: "\u{B964}",
-        nfd: "\u{1105}\u{1172}\u{11B3}",
-        nfkc: "\u{B964}",
-        nfkd: "\u{1105}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B965}",
-        nfc: "\u{B965}",
-        nfd: "\u{1105}\u{1172}\u{11B4}",
-        nfkc: "\u{B965}",
-        nfkd: "\u{1105}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B966}",
-        nfc: "\u{B966}",
-        nfd: "\u{1105}\u{1172}\u{11B5}",
-        nfkc: "\u{B966}",
-        nfkd: "\u{1105}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B967}",
-        nfc: "\u{B967}",
-        nfd: "\u{1105}\u{1172}\u{11B6}",
-        nfkc: "\u{B967}",
-        nfkd: "\u{1105}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B968}",
-        nfc: "\u{B968}",
-        nfd: "\u{1105}\u{1172}\u{11B7}",
-        nfkc: "\u{B968}",
-        nfkd: "\u{1105}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B969}",
-        nfc: "\u{B969}",
-        nfd: "\u{1105}\u{1172}\u{11B8}",
-        nfkc: "\u{B969}",
-        nfkd: "\u{1105}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B96A}",
-        nfc: "\u{B96A}",
-        nfd: "\u{1105}\u{1172}\u{11B9}",
-        nfkc: "\u{B96A}",
-        nfkd: "\u{1105}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B96B}",
-        nfc: "\u{B96B}",
-        nfd: "\u{1105}\u{1172}\u{11BA}",
-        nfkc: "\u{B96B}",
-        nfkd: "\u{1105}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B96C}",
-        nfc: "\u{B96C}",
-        nfd: "\u{1105}\u{1172}\u{11BB}",
-        nfkc: "\u{B96C}",
-        nfkd: "\u{1105}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B96D}",
-        nfc: "\u{B96D}",
-        nfd: "\u{1105}\u{1172}\u{11BC}",
-        nfkc: "\u{B96D}",
-        nfkd: "\u{1105}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B96E}",
-        nfc: "\u{B96E}",
-        nfd: "\u{1105}\u{1172}\u{11BD}",
-        nfkc: "\u{B96E}",
-        nfkd: "\u{1105}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B96F}",
-        nfc: "\u{B96F}",
-        nfd: "\u{1105}\u{1172}\u{11BE}",
-        nfkc: "\u{B96F}",
-        nfkd: "\u{1105}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B970}",
-        nfc: "\u{B970}",
-        nfd: "\u{1105}\u{1172}\u{11BF}",
-        nfkc: "\u{B970}",
-        nfkd: "\u{1105}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B971}",
-        nfc: "\u{B971}",
-        nfd: "\u{1105}\u{1172}\u{11C0}",
-        nfkc: "\u{B971}",
-        nfkd: "\u{1105}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B972}",
-        nfc: "\u{B972}",
-        nfd: "\u{1105}\u{1172}\u{11C1}",
-        nfkc: "\u{B972}",
-        nfkd: "\u{1105}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B973}",
-        nfc: "\u{B973}",
-        nfd: "\u{1105}\u{1172}\u{11C2}",
-        nfkc: "\u{B973}",
-        nfkd: "\u{1105}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B974}",
-        nfc: "\u{B974}",
-        nfd: "\u{1105}\u{1173}",
-        nfkc: "\u{B974}",
-        nfkd: "\u{1105}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{B975}",
-        nfc: "\u{B975}",
-        nfd: "\u{1105}\u{1173}\u{11A8}",
-        nfkc: "\u{B975}",
-        nfkd: "\u{1105}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B976}",
-        nfc: "\u{B976}",
-        nfd: "\u{1105}\u{1173}\u{11A9}",
-        nfkc: "\u{B976}",
-        nfkd: "\u{1105}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B977}",
-        nfc: "\u{B977}",
-        nfd: "\u{1105}\u{1173}\u{11AA}",
-        nfkc: "\u{B977}",
-        nfkd: "\u{1105}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B978}",
-        nfc: "\u{B978}",
-        nfd: "\u{1105}\u{1173}\u{11AB}",
-        nfkc: "\u{B978}",
-        nfkd: "\u{1105}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B979}",
-        nfc: "\u{B979}",
-        nfd: "\u{1105}\u{1173}\u{11AC}",
-        nfkc: "\u{B979}",
-        nfkd: "\u{1105}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B97A}",
-        nfc: "\u{B97A}",
-        nfd: "\u{1105}\u{1173}\u{11AD}",
-        nfkc: "\u{B97A}",
-        nfkd: "\u{1105}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B97B}",
-        nfc: "\u{B97B}",
-        nfd: "\u{1105}\u{1173}\u{11AE}",
-        nfkc: "\u{B97B}",
-        nfkd: "\u{1105}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B97C}",
-        nfc: "\u{B97C}",
-        nfd: "\u{1105}\u{1173}\u{11AF}",
-        nfkc: "\u{B97C}",
-        nfkd: "\u{1105}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B97D}",
-        nfc: "\u{B97D}",
-        nfd: "\u{1105}\u{1173}\u{11B0}",
-        nfkc: "\u{B97D}",
-        nfkd: "\u{1105}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B97E}",
-        nfc: "\u{B97E}",
-        nfd: "\u{1105}\u{1173}\u{11B1}",
-        nfkc: "\u{B97E}",
-        nfkd: "\u{1105}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B97F}",
-        nfc: "\u{B97F}",
-        nfd: "\u{1105}\u{1173}\u{11B2}",
-        nfkc: "\u{B97F}",
-        nfkd: "\u{1105}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B980}",
-        nfc: "\u{B980}",
-        nfd: "\u{1105}\u{1173}\u{11B3}",
-        nfkc: "\u{B980}",
-        nfkd: "\u{1105}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B981}",
-        nfc: "\u{B981}",
-        nfd: "\u{1105}\u{1173}\u{11B4}",
-        nfkc: "\u{B981}",
-        nfkd: "\u{1105}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B982}",
-        nfc: "\u{B982}",
-        nfd: "\u{1105}\u{1173}\u{11B5}",
-        nfkc: "\u{B982}",
-        nfkd: "\u{1105}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B983}",
-        nfc: "\u{B983}",
-        nfd: "\u{1105}\u{1173}\u{11B6}",
-        nfkc: "\u{B983}",
-        nfkd: "\u{1105}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B984}",
-        nfc: "\u{B984}",
-        nfd: "\u{1105}\u{1173}\u{11B7}",
-        nfkc: "\u{B984}",
-        nfkd: "\u{1105}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B985}",
-        nfc: "\u{B985}",
-        nfd: "\u{1105}\u{1173}\u{11B8}",
-        nfkc: "\u{B985}",
-        nfkd: "\u{1105}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B986}",
-        nfc: "\u{B986}",
-        nfd: "\u{1105}\u{1173}\u{11B9}",
-        nfkc: "\u{B986}",
-        nfkd: "\u{1105}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B987}",
-        nfc: "\u{B987}",
-        nfd: "\u{1105}\u{1173}\u{11BA}",
-        nfkc: "\u{B987}",
-        nfkd: "\u{1105}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B988}",
-        nfc: "\u{B988}",
-        nfd: "\u{1105}\u{1173}\u{11BB}",
-        nfkc: "\u{B988}",
-        nfkd: "\u{1105}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B989}",
-        nfc: "\u{B989}",
-        nfd: "\u{1105}\u{1173}\u{11BC}",
-        nfkc: "\u{B989}",
-        nfkd: "\u{1105}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B98A}",
-        nfc: "\u{B98A}",
-        nfd: "\u{1105}\u{1173}\u{11BD}",
-        nfkc: "\u{B98A}",
-        nfkd: "\u{1105}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B98B}",
-        nfc: "\u{B98B}",
-        nfd: "\u{1105}\u{1173}\u{11BE}",
-        nfkc: "\u{B98B}",
-        nfkd: "\u{1105}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B98C}",
-        nfc: "\u{B98C}",
-        nfd: "\u{1105}\u{1173}\u{11BF}",
-        nfkc: "\u{B98C}",
-        nfkd: "\u{1105}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B98D}",
-        nfc: "\u{B98D}",
-        nfd: "\u{1105}\u{1173}\u{11C0}",
-        nfkc: "\u{B98D}",
-        nfkd: "\u{1105}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B98E}",
-        nfc: "\u{B98E}",
-        nfd: "\u{1105}\u{1173}\u{11C1}",
-        nfkc: "\u{B98E}",
-        nfkd: "\u{1105}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B98F}",
-        nfc: "\u{B98F}",
-        nfd: "\u{1105}\u{1173}\u{11C2}",
-        nfkc: "\u{B98F}",
-        nfkd: "\u{1105}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B990}",
-        nfc: "\u{B990}",
-        nfd: "\u{1105}\u{1174}",
-        nfkc: "\u{B990}",
-        nfkd: "\u{1105}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{B991}",
-        nfc: "\u{B991}",
-        nfd: "\u{1105}\u{1174}\u{11A8}",
-        nfkc: "\u{B991}",
-        nfkd: "\u{1105}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B992}",
-        nfc: "\u{B992}",
-        nfd: "\u{1105}\u{1174}\u{11A9}",
-        nfkc: "\u{B992}",
-        nfkd: "\u{1105}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B993}",
-        nfc: "\u{B993}",
-        nfd: "\u{1105}\u{1174}\u{11AA}",
-        nfkc: "\u{B993}",
-        nfkd: "\u{1105}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B994}",
-        nfc: "\u{B994}",
-        nfd: "\u{1105}\u{1174}\u{11AB}",
-        nfkc: "\u{B994}",
-        nfkd: "\u{1105}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B995}",
-        nfc: "\u{B995}",
-        nfd: "\u{1105}\u{1174}\u{11AC}",
-        nfkc: "\u{B995}",
-        nfkd: "\u{1105}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B996}",
-        nfc: "\u{B996}",
-        nfd: "\u{1105}\u{1174}\u{11AD}",
-        nfkc: "\u{B996}",
-        nfkd: "\u{1105}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B997}",
-        nfc: "\u{B997}",
-        nfd: "\u{1105}\u{1174}\u{11AE}",
-        nfkc: "\u{B997}",
-        nfkd: "\u{1105}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B998}",
-        nfc: "\u{B998}",
-        nfd: "\u{1105}\u{1174}\u{11AF}",
-        nfkc: "\u{B998}",
-        nfkd: "\u{1105}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B999}",
-        nfc: "\u{B999}",
-        nfd: "\u{1105}\u{1174}\u{11B0}",
-        nfkc: "\u{B999}",
-        nfkd: "\u{1105}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B99A}",
-        nfc: "\u{B99A}",
-        nfd: "\u{1105}\u{1174}\u{11B1}",
-        nfkc: "\u{B99A}",
-        nfkd: "\u{1105}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B99B}",
-        nfc: "\u{B99B}",
-        nfd: "\u{1105}\u{1174}\u{11B2}",
-        nfkc: "\u{B99B}",
-        nfkd: "\u{1105}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B99C}",
-        nfc: "\u{B99C}",
-        nfd: "\u{1105}\u{1174}\u{11B3}",
-        nfkc: "\u{B99C}",
-        nfkd: "\u{1105}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B99D}",
-        nfc: "\u{B99D}",
-        nfd: "\u{1105}\u{1174}\u{11B4}",
-        nfkc: "\u{B99D}",
-        nfkd: "\u{1105}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B99E}",
-        nfc: "\u{B99E}",
-        nfd: "\u{1105}\u{1174}\u{11B5}",
-        nfkc: "\u{B99E}",
-        nfkd: "\u{1105}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B99F}",
-        nfc: "\u{B99F}",
-        nfd: "\u{1105}\u{1174}\u{11B6}",
-        nfkc: "\u{B99F}",
-        nfkd: "\u{1105}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B9A0}",
-        nfc: "\u{B9A0}",
-        nfd: "\u{1105}\u{1174}\u{11B7}",
-        nfkc: "\u{B9A0}",
-        nfkd: "\u{1105}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B9A1}",
-        nfc: "\u{B9A1}",
-        nfd: "\u{1105}\u{1174}\u{11B8}",
-        nfkc: "\u{B9A1}",
-        nfkd: "\u{1105}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B9A2}",
-        nfc: "\u{B9A2}",
-        nfd: "\u{1105}\u{1174}\u{11B9}",
-        nfkc: "\u{B9A2}",
-        nfkd: "\u{1105}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B9A3}",
-        nfc: "\u{B9A3}",
-        nfd: "\u{1105}\u{1174}\u{11BA}",
-        nfkc: "\u{B9A3}",
-        nfkd: "\u{1105}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B9A4}",
-        nfc: "\u{B9A4}",
-        nfd: "\u{1105}\u{1174}\u{11BB}",
-        nfkc: "\u{B9A4}",
-        nfkd: "\u{1105}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B9A5}",
-        nfc: "\u{B9A5}",
-        nfd: "\u{1105}\u{1174}\u{11BC}",
-        nfkc: "\u{B9A5}",
-        nfkd: "\u{1105}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B9A6}",
-        nfc: "\u{B9A6}",
-        nfd: "\u{1105}\u{1174}\u{11BD}",
-        nfkc: "\u{B9A6}",
-        nfkd: "\u{1105}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B9A7}",
-        nfc: "\u{B9A7}",
-        nfd: "\u{1105}\u{1174}\u{11BE}",
-        nfkc: "\u{B9A7}",
-        nfkd: "\u{1105}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B9A8}",
-        nfc: "\u{B9A8}",
-        nfd: "\u{1105}\u{1174}\u{11BF}",
-        nfkc: "\u{B9A8}",
-        nfkd: "\u{1105}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B9A9}",
-        nfc: "\u{B9A9}",
-        nfd: "\u{1105}\u{1174}\u{11C0}",
-        nfkc: "\u{B9A9}",
-        nfkd: "\u{1105}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B9AA}",
-        nfc: "\u{B9AA}",
-        nfd: "\u{1105}\u{1174}\u{11C1}",
-        nfkc: "\u{B9AA}",
-        nfkd: "\u{1105}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B9AB}",
-        nfc: "\u{B9AB}",
-        nfd: "\u{1105}\u{1174}\u{11C2}",
-        nfkc: "\u{B9AB}",
-        nfkd: "\u{1105}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B9AC}",
-        nfc: "\u{B9AC}",
-        nfd: "\u{1105}\u{1175}",
-        nfkc: "\u{B9AC}",
-        nfkd: "\u{1105}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{B9AD}",
-        nfc: "\u{B9AD}",
-        nfd: "\u{1105}\u{1175}\u{11A8}",
-        nfkc: "\u{B9AD}",
-        nfkd: "\u{1105}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B9AE}",
-        nfc: "\u{B9AE}",
-        nfd: "\u{1105}\u{1175}\u{11A9}",
-        nfkc: "\u{B9AE}",
-        nfkd: "\u{1105}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B9AF}",
-        nfc: "\u{B9AF}",
-        nfd: "\u{1105}\u{1175}\u{11AA}",
-        nfkc: "\u{B9AF}",
-        nfkd: "\u{1105}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B9B0}",
-        nfc: "\u{B9B0}",
-        nfd: "\u{1105}\u{1175}\u{11AB}",
-        nfkc: "\u{B9B0}",
-        nfkd: "\u{1105}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B9B1}",
-        nfc: "\u{B9B1}",
-        nfd: "\u{1105}\u{1175}\u{11AC}",
-        nfkc: "\u{B9B1}",
-        nfkd: "\u{1105}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B9B2}",
-        nfc: "\u{B9B2}",
-        nfd: "\u{1105}\u{1175}\u{11AD}",
-        nfkc: "\u{B9B2}",
-        nfkd: "\u{1105}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B9B3}",
-        nfc: "\u{B9B3}",
-        nfd: "\u{1105}\u{1175}\u{11AE}",
-        nfkc: "\u{B9B3}",
-        nfkd: "\u{1105}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B9B4}",
-        nfc: "\u{B9B4}",
-        nfd: "\u{1105}\u{1175}\u{11AF}",
-        nfkc: "\u{B9B4}",
-        nfkd: "\u{1105}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B9B5}",
-        nfc: "\u{B9B5}",
-        nfd: "\u{1105}\u{1175}\u{11B0}",
-        nfkc: "\u{B9B5}",
-        nfkd: "\u{1105}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B9B6}",
-        nfc: "\u{B9B6}",
-        nfd: "\u{1105}\u{1175}\u{11B1}",
-        nfkc: "\u{B9B6}",
-        nfkd: "\u{1105}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B9B7}",
-        nfc: "\u{B9B7}",
-        nfd: "\u{1105}\u{1175}\u{11B2}",
-        nfkc: "\u{B9B7}",
-        nfkd: "\u{1105}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B9B8}",
-        nfc: "\u{B9B8}",
-        nfd: "\u{1105}\u{1175}\u{11B3}",
-        nfkc: "\u{B9B8}",
-        nfkd: "\u{1105}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B9B9}",
-        nfc: "\u{B9B9}",
-        nfd: "\u{1105}\u{1175}\u{11B4}",
-        nfkc: "\u{B9B9}",
-        nfkd: "\u{1105}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B9BA}",
-        nfc: "\u{B9BA}",
-        nfd: "\u{1105}\u{1175}\u{11B5}",
-        nfkc: "\u{B9BA}",
-        nfkd: "\u{1105}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B9BB}",
-        nfc: "\u{B9BB}",
-        nfd: "\u{1105}\u{1175}\u{11B6}",
-        nfkc: "\u{B9BB}",
-        nfkd: "\u{1105}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B9BC}",
-        nfc: "\u{B9BC}",
-        nfd: "\u{1105}\u{1175}\u{11B7}",
-        nfkc: "\u{B9BC}",
-        nfkd: "\u{1105}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B9BD}",
-        nfc: "\u{B9BD}",
-        nfd: "\u{1105}\u{1175}\u{11B8}",
-        nfkc: "\u{B9BD}",
-        nfkd: "\u{1105}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B9BE}",
-        nfc: "\u{B9BE}",
-        nfd: "\u{1105}\u{1175}\u{11B9}",
-        nfkc: "\u{B9BE}",
-        nfkd: "\u{1105}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B9BF}",
-        nfc: "\u{B9BF}",
-        nfd: "\u{1105}\u{1175}\u{11BA}",
-        nfkc: "\u{B9BF}",
-        nfkd: "\u{1105}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B9C0}",
-        nfc: "\u{B9C0}",
-        nfd: "\u{1105}\u{1175}\u{11BB}",
-        nfkc: "\u{B9C0}",
-        nfkd: "\u{1105}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B9C1}",
-        nfc: "\u{B9C1}",
-        nfd: "\u{1105}\u{1175}\u{11BC}",
-        nfkc: "\u{B9C1}",
-        nfkd: "\u{1105}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B9C2}",
-        nfc: "\u{B9C2}",
-        nfd: "\u{1105}\u{1175}\u{11BD}",
-        nfkc: "\u{B9C2}",
-        nfkd: "\u{1105}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B9C3}",
-        nfc: "\u{B9C3}",
-        nfd: "\u{1105}\u{1175}\u{11BE}",
-        nfkc: "\u{B9C3}",
-        nfkd: "\u{1105}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B9C4}",
-        nfc: "\u{B9C4}",
-        nfd: "\u{1105}\u{1175}\u{11BF}",
-        nfkc: "\u{B9C4}",
-        nfkd: "\u{1105}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B9C5}",
-        nfc: "\u{B9C5}",
-        nfd: "\u{1105}\u{1175}\u{11C0}",
-        nfkc: "\u{B9C5}",
-        nfkd: "\u{1105}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B9C6}",
-        nfc: "\u{B9C6}",
-        nfd: "\u{1105}\u{1175}\u{11C1}",
-        nfkc: "\u{B9C6}",
-        nfkd: "\u{1105}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B9C7}",
-        nfc: "\u{B9C7}",
-        nfd: "\u{1105}\u{1175}\u{11C2}",
-        nfkc: "\u{B9C7}",
-        nfkd: "\u{1105}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B9C8}",
-        nfc: "\u{B9C8}",
-        nfd: "\u{1106}\u{1161}",
-        nfkc: "\u{B9C8}",
-        nfkd: "\u{1106}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{B9C9}",
-        nfc: "\u{B9C9}",
-        nfd: "\u{1106}\u{1161}\u{11A8}",
-        nfkc: "\u{B9C9}",
-        nfkd: "\u{1106}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B9CA}",
-        nfc: "\u{B9CA}",
-        nfd: "\u{1106}\u{1161}\u{11A9}",
-        nfkc: "\u{B9CA}",
-        nfkd: "\u{1106}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B9CB}",
-        nfc: "\u{B9CB}",
-        nfd: "\u{1106}\u{1161}\u{11AA}",
-        nfkc: "\u{B9CB}",
-        nfkd: "\u{1106}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B9CC}",
-        nfc: "\u{B9CC}",
-        nfd: "\u{1106}\u{1161}\u{11AB}",
-        nfkc: "\u{B9CC}",
-        nfkd: "\u{1106}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B9CD}",
-        nfc: "\u{B9CD}",
-        nfd: "\u{1106}\u{1161}\u{11AC}",
-        nfkc: "\u{B9CD}",
-        nfkd: "\u{1106}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B9CE}",
-        nfc: "\u{B9CE}",
-        nfd: "\u{1106}\u{1161}\u{11AD}",
-        nfkc: "\u{B9CE}",
-        nfkd: "\u{1106}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B9CF}",
-        nfc: "\u{B9CF}",
-        nfd: "\u{1106}\u{1161}\u{11AE}",
-        nfkc: "\u{B9CF}",
-        nfkd: "\u{1106}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B9D0}",
-        nfc: "\u{B9D0}",
-        nfd: "\u{1106}\u{1161}\u{11AF}",
-        nfkc: "\u{B9D0}",
-        nfkd: "\u{1106}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B9D1}",
-        nfc: "\u{B9D1}",
-        nfd: "\u{1106}\u{1161}\u{11B0}",
-        nfkc: "\u{B9D1}",
-        nfkd: "\u{1106}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B9D2}",
-        nfc: "\u{B9D2}",
-        nfd: "\u{1106}\u{1161}\u{11B1}",
-        nfkc: "\u{B9D2}",
-        nfkd: "\u{1106}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B9D3}",
-        nfc: "\u{B9D3}",
-        nfd: "\u{1106}\u{1161}\u{11B2}",
-        nfkc: "\u{B9D3}",
-        nfkd: "\u{1106}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B9D4}",
-        nfc: "\u{B9D4}",
-        nfd: "\u{1106}\u{1161}\u{11B3}",
-        nfkc: "\u{B9D4}",
-        nfkd: "\u{1106}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B9D5}",
-        nfc: "\u{B9D5}",
-        nfd: "\u{1106}\u{1161}\u{11B4}",
-        nfkc: "\u{B9D5}",
-        nfkd: "\u{1106}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B9D6}",
-        nfc: "\u{B9D6}",
-        nfd: "\u{1106}\u{1161}\u{11B5}",
-        nfkc: "\u{B9D6}",
-        nfkd: "\u{1106}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B9D7}",
-        nfc: "\u{B9D7}",
-        nfd: "\u{1106}\u{1161}\u{11B6}",
-        nfkc: "\u{B9D7}",
-        nfkd: "\u{1106}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B9D8}",
-        nfc: "\u{B9D8}",
-        nfd: "\u{1106}\u{1161}\u{11B7}",
-        nfkc: "\u{B9D8}",
-        nfkd: "\u{1106}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B9D9}",
-        nfc: "\u{B9D9}",
-        nfd: "\u{1106}\u{1161}\u{11B8}",
-        nfkc: "\u{B9D9}",
-        nfkd: "\u{1106}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B9DA}",
-        nfc: "\u{B9DA}",
-        nfd: "\u{1106}\u{1161}\u{11B9}",
-        nfkc: "\u{B9DA}",
-        nfkd: "\u{1106}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B9DB}",
-        nfc: "\u{B9DB}",
-        nfd: "\u{1106}\u{1161}\u{11BA}",
-        nfkc: "\u{B9DB}",
-        nfkd: "\u{1106}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B9DC}",
-        nfc: "\u{B9DC}",
-        nfd: "\u{1106}\u{1161}\u{11BB}",
-        nfkc: "\u{B9DC}",
-        nfkd: "\u{1106}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B9DD}",
-        nfc: "\u{B9DD}",
-        nfd: "\u{1106}\u{1161}\u{11BC}",
-        nfkc: "\u{B9DD}",
-        nfkd: "\u{1106}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B9DE}",
-        nfc: "\u{B9DE}",
-        nfd: "\u{1106}\u{1161}\u{11BD}",
-        nfkc: "\u{B9DE}",
-        nfkd: "\u{1106}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B9DF}",
-        nfc: "\u{B9DF}",
-        nfd: "\u{1106}\u{1161}\u{11BE}",
-        nfkc: "\u{B9DF}",
-        nfkd: "\u{1106}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B9E0}",
-        nfc: "\u{B9E0}",
-        nfd: "\u{1106}\u{1161}\u{11BF}",
-        nfkc: "\u{B9E0}",
-        nfkd: "\u{1106}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B9E1}",
-        nfc: "\u{B9E1}",
-        nfd: "\u{1106}\u{1161}\u{11C0}",
-        nfkc: "\u{B9E1}",
-        nfkd: "\u{1106}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B9E2}",
-        nfc: "\u{B9E2}",
-        nfd: "\u{1106}\u{1161}\u{11C1}",
-        nfkc: "\u{B9E2}",
-        nfkd: "\u{1106}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B9E3}",
-        nfc: "\u{B9E3}",
-        nfd: "\u{1106}\u{1161}\u{11C2}",
-        nfkc: "\u{B9E3}",
-        nfkd: "\u{1106}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{B9E4}",
-        nfc: "\u{B9E4}",
-        nfd: "\u{1106}\u{1162}",
-        nfkc: "\u{B9E4}",
-        nfkd: "\u{1106}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{B9E5}",
-        nfc: "\u{B9E5}",
-        nfd: "\u{1106}\u{1162}\u{11A8}",
-        nfkc: "\u{B9E5}",
-        nfkd: "\u{1106}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{B9E6}",
-        nfc: "\u{B9E6}",
-        nfd: "\u{1106}\u{1162}\u{11A9}",
-        nfkc: "\u{B9E6}",
-        nfkd: "\u{1106}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{B9E7}",
-        nfc: "\u{B9E7}",
-        nfd: "\u{1106}\u{1162}\u{11AA}",
-        nfkc: "\u{B9E7}",
-        nfkd: "\u{1106}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{B9E8}",
-        nfc: "\u{B9E8}",
-        nfd: "\u{1106}\u{1162}\u{11AB}",
-        nfkc: "\u{B9E8}",
-        nfkd: "\u{1106}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{B9E9}",
-        nfc: "\u{B9E9}",
-        nfd: "\u{1106}\u{1162}\u{11AC}",
-        nfkc: "\u{B9E9}",
-        nfkd: "\u{1106}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{B9EA}",
-        nfc: "\u{B9EA}",
-        nfd: "\u{1106}\u{1162}\u{11AD}",
-        nfkc: "\u{B9EA}",
-        nfkd: "\u{1106}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{B9EB}",
-        nfc: "\u{B9EB}",
-        nfd: "\u{1106}\u{1162}\u{11AE}",
-        nfkc: "\u{B9EB}",
-        nfkd: "\u{1106}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B9EC}",
-        nfc: "\u{B9EC}",
-        nfd: "\u{1106}\u{1162}\u{11AF}",
-        nfkc: "\u{B9EC}",
-        nfkd: "\u{1106}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{B9ED}",
-        nfc: "\u{B9ED}",
-        nfd: "\u{1106}\u{1162}\u{11B0}",
-        nfkc: "\u{B9ED}",
-        nfkd: "\u{1106}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{B9EE}",
-        nfc: "\u{B9EE}",
-        nfd: "\u{1106}\u{1162}\u{11B1}",
-        nfkc: "\u{B9EE}",
-        nfkd: "\u{1106}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{B9EF}",
-        nfc: "\u{B9EF}",
-        nfd: "\u{1106}\u{1162}\u{11B2}",
-        nfkc: "\u{B9EF}",
-        nfkd: "\u{1106}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{B9F0}",
-        nfc: "\u{B9F0}",
-        nfd: "\u{1106}\u{1162}\u{11B3}",
-        nfkc: "\u{B9F0}",
-        nfkd: "\u{1106}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{B9F1}",
-        nfc: "\u{B9F1}",
-        nfd: "\u{1106}\u{1162}\u{11B4}",
-        nfkc: "\u{B9F1}",
-        nfkd: "\u{1106}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{B9F2}",
-        nfc: "\u{B9F2}",
-        nfd: "\u{1106}\u{1162}\u{11B5}",
-        nfkc: "\u{B9F2}",
-        nfkd: "\u{1106}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B9F3}",
-        nfc: "\u{B9F3}",
-        nfd: "\u{1106}\u{1162}\u{11B6}",
-        nfkc: "\u{B9F3}",
-        nfkd: "\u{1106}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{B9F4}",
-        nfc: "\u{B9F4}",
-        nfd: "\u{1106}\u{1162}\u{11B7}",
-        nfkc: "\u{B9F4}",
-        nfkd: "\u{1106}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{B9F5}",
-        nfc: "\u{B9F5}",
-        nfd: "\u{1106}\u{1162}\u{11B8}",
-        nfkc: "\u{B9F5}",
-        nfkd: "\u{1106}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{B9F6}",
-        nfc: "\u{B9F6}",
-        nfd: "\u{1106}\u{1162}\u{11B9}",
-        nfkc: "\u{B9F6}",
-        nfkd: "\u{1106}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{B9F7}",
-        nfc: "\u{B9F7}",
-        nfd: "\u{1106}\u{1162}\u{11BA}",
-        nfkc: "\u{B9F7}",
-        nfkd: "\u{1106}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{B9F8}",
-        nfc: "\u{B9F8}",
-        nfd: "\u{1106}\u{1162}\u{11BB}",
-        nfkc: "\u{B9F8}",
-        nfkd: "\u{1106}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{B9F9}",
-        nfc: "\u{B9F9}",
-        nfd: "\u{1106}\u{1162}\u{11BC}",
-        nfkc: "\u{B9F9}",
-        nfkd: "\u{1106}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B9FA}",
-        nfc: "\u{B9FA}",
-        nfd: "\u{1106}\u{1162}\u{11BD}",
-        nfkc: "\u{B9FA}",
-        nfkd: "\u{1106}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{B9FB}",
-        nfc: "\u{B9FB}",
-        nfd: "\u{1106}\u{1162}\u{11BE}",
-        nfkc: "\u{B9FB}",
-        nfkd: "\u{1106}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{B9FC}",
-        nfc: "\u{B9FC}",
-        nfd: "\u{1106}\u{1162}\u{11BF}",
-        nfkc: "\u{B9FC}",
-        nfkd: "\u{1106}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{B9FD}",
-        nfc: "\u{B9FD}",
-        nfd: "\u{1106}\u{1162}\u{11C0}",
-        nfkc: "\u{B9FD}",
-        nfkd: "\u{1106}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{B9FE}",
-        nfc: "\u{B9FE}",
-        nfd: "\u{1106}\u{1162}\u{11C1}",
-        nfkc: "\u{B9FE}",
-        nfkd: "\u{1106}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{B9FF}",
-        nfc: "\u{B9FF}",
-        nfd: "\u{1106}\u{1162}\u{11C2}",
-        nfkc: "\u{B9FF}",
-        nfkd: "\u{1106}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BA00}",
-        nfc: "\u{BA00}",
-        nfd: "\u{1106}\u{1163}",
-        nfkc: "\u{BA00}",
-        nfkd: "\u{1106}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{BA01}",
-        nfc: "\u{BA01}",
-        nfd: "\u{1106}\u{1163}\u{11A8}",
-        nfkc: "\u{BA01}",
-        nfkd: "\u{1106}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BA02}",
-        nfc: "\u{BA02}",
-        nfd: "\u{1106}\u{1163}\u{11A9}",
-        nfkc: "\u{BA02}",
-        nfkd: "\u{1106}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BA03}",
-        nfc: "\u{BA03}",
-        nfd: "\u{1106}\u{1163}\u{11AA}",
-        nfkc: "\u{BA03}",
-        nfkd: "\u{1106}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BA04}",
-        nfc: "\u{BA04}",
-        nfd: "\u{1106}\u{1163}\u{11AB}",
-        nfkc: "\u{BA04}",
-        nfkd: "\u{1106}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BA05}",
-        nfc: "\u{BA05}",
-        nfd: "\u{1106}\u{1163}\u{11AC}",
-        nfkc: "\u{BA05}",
-        nfkd: "\u{1106}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BA06}",
-        nfc: "\u{BA06}",
-        nfd: "\u{1106}\u{1163}\u{11AD}",
-        nfkc: "\u{BA06}",
-        nfkd: "\u{1106}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BA07}",
-        nfc: "\u{BA07}",
-        nfd: "\u{1106}\u{1163}\u{11AE}",
-        nfkc: "\u{BA07}",
-        nfkd: "\u{1106}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BA08}",
-        nfc: "\u{BA08}",
-        nfd: "\u{1106}\u{1163}\u{11AF}",
-        nfkc: "\u{BA08}",
-        nfkd: "\u{1106}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BA09}",
-        nfc: "\u{BA09}",
-        nfd: "\u{1106}\u{1163}\u{11B0}",
-        nfkc: "\u{BA09}",
-        nfkd: "\u{1106}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BA0A}",
-        nfc: "\u{BA0A}",
-        nfd: "\u{1106}\u{1163}\u{11B1}",
-        nfkc: "\u{BA0A}",
-        nfkd: "\u{1106}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BA0B}",
-        nfc: "\u{BA0B}",
-        nfd: "\u{1106}\u{1163}\u{11B2}",
-        nfkc: "\u{BA0B}",
-        nfkd: "\u{1106}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BA0C}",
-        nfc: "\u{BA0C}",
-        nfd: "\u{1106}\u{1163}\u{11B3}",
-        nfkc: "\u{BA0C}",
-        nfkd: "\u{1106}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BA0D}",
-        nfc: "\u{BA0D}",
-        nfd: "\u{1106}\u{1163}\u{11B4}",
-        nfkc: "\u{BA0D}",
-        nfkd: "\u{1106}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BA0E}",
-        nfc: "\u{BA0E}",
-        nfd: "\u{1106}\u{1163}\u{11B5}",
-        nfkc: "\u{BA0E}",
-        nfkd: "\u{1106}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BA0F}",
-        nfc: "\u{BA0F}",
-        nfd: "\u{1106}\u{1163}\u{11B6}",
-        nfkc: "\u{BA0F}",
-        nfkd: "\u{1106}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BA10}",
-        nfc: "\u{BA10}",
-        nfd: "\u{1106}\u{1163}\u{11B7}",
-        nfkc: "\u{BA10}",
-        nfkd: "\u{1106}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BA11}",
-        nfc: "\u{BA11}",
-        nfd: "\u{1106}\u{1163}\u{11B8}",
-        nfkc: "\u{BA11}",
-        nfkd: "\u{1106}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BA12}",
-        nfc: "\u{BA12}",
-        nfd: "\u{1106}\u{1163}\u{11B9}",
-        nfkc: "\u{BA12}",
-        nfkd: "\u{1106}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BA13}",
-        nfc: "\u{BA13}",
-        nfd: "\u{1106}\u{1163}\u{11BA}",
-        nfkc: "\u{BA13}",
-        nfkd: "\u{1106}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BA14}",
-        nfc: "\u{BA14}",
-        nfd: "\u{1106}\u{1163}\u{11BB}",
-        nfkc: "\u{BA14}",
-        nfkd: "\u{1106}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BA15}",
-        nfc: "\u{BA15}",
-        nfd: "\u{1106}\u{1163}\u{11BC}",
-        nfkc: "\u{BA15}",
-        nfkd: "\u{1106}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BA16}",
-        nfc: "\u{BA16}",
-        nfd: "\u{1106}\u{1163}\u{11BD}",
-        nfkc: "\u{BA16}",
-        nfkd: "\u{1106}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BA17}",
-        nfc: "\u{BA17}",
-        nfd: "\u{1106}\u{1163}\u{11BE}",
-        nfkc: "\u{BA17}",
-        nfkd: "\u{1106}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BA18}",
-        nfc: "\u{BA18}",
-        nfd: "\u{1106}\u{1163}\u{11BF}",
-        nfkc: "\u{BA18}",
-        nfkd: "\u{1106}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BA19}",
-        nfc: "\u{BA19}",
-        nfd: "\u{1106}\u{1163}\u{11C0}",
-        nfkc: "\u{BA19}",
-        nfkd: "\u{1106}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BA1A}",
-        nfc: "\u{BA1A}",
-        nfd: "\u{1106}\u{1163}\u{11C1}",
-        nfkc: "\u{BA1A}",
-        nfkd: "\u{1106}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BA1B}",
-        nfc: "\u{BA1B}",
-        nfd: "\u{1106}\u{1163}\u{11C2}",
-        nfkc: "\u{BA1B}",
-        nfkd: "\u{1106}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BA1C}",
-        nfc: "\u{BA1C}",
-        nfd: "\u{1106}\u{1164}",
-        nfkc: "\u{BA1C}",
-        nfkd: "\u{1106}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{BA1D}",
-        nfc: "\u{BA1D}",
-        nfd: "\u{1106}\u{1164}\u{11A8}",
-        nfkc: "\u{BA1D}",
-        nfkd: "\u{1106}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BA1E}",
-        nfc: "\u{BA1E}",
-        nfd: "\u{1106}\u{1164}\u{11A9}",
-        nfkc: "\u{BA1E}",
-        nfkd: "\u{1106}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BA1F}",
-        nfc: "\u{BA1F}",
-        nfd: "\u{1106}\u{1164}\u{11AA}",
-        nfkc: "\u{BA1F}",
-        nfkd: "\u{1106}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BA20}",
-        nfc: "\u{BA20}",
-        nfd: "\u{1106}\u{1164}\u{11AB}",
-        nfkc: "\u{BA20}",
-        nfkd: "\u{1106}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BA21}",
-        nfc: "\u{BA21}",
-        nfd: "\u{1106}\u{1164}\u{11AC}",
-        nfkc: "\u{BA21}",
-        nfkd: "\u{1106}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BA22}",
-        nfc: "\u{BA22}",
-        nfd: "\u{1106}\u{1164}\u{11AD}",
-        nfkc: "\u{BA22}",
-        nfkd: "\u{1106}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BA23}",
-        nfc: "\u{BA23}",
-        nfd: "\u{1106}\u{1164}\u{11AE}",
-        nfkc: "\u{BA23}",
-        nfkd: "\u{1106}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BA24}",
-        nfc: "\u{BA24}",
-        nfd: "\u{1106}\u{1164}\u{11AF}",
-        nfkc: "\u{BA24}",
-        nfkd: "\u{1106}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BA25}",
-        nfc: "\u{BA25}",
-        nfd: "\u{1106}\u{1164}\u{11B0}",
-        nfkc: "\u{BA25}",
-        nfkd: "\u{1106}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BA26}",
-        nfc: "\u{BA26}",
-        nfd: "\u{1106}\u{1164}\u{11B1}",
-        nfkc: "\u{BA26}",
-        nfkd: "\u{1106}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BA27}",
-        nfc: "\u{BA27}",
-        nfd: "\u{1106}\u{1164}\u{11B2}",
-        nfkc: "\u{BA27}",
-        nfkd: "\u{1106}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BA28}",
-        nfc: "\u{BA28}",
-        nfd: "\u{1106}\u{1164}\u{11B3}",
-        nfkc: "\u{BA28}",
-        nfkd: "\u{1106}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BA29}",
-        nfc: "\u{BA29}",
-        nfd: "\u{1106}\u{1164}\u{11B4}",
-        nfkc: "\u{BA29}",
-        nfkd: "\u{1106}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BA2A}",
-        nfc: "\u{BA2A}",
-        nfd: "\u{1106}\u{1164}\u{11B5}",
-        nfkc: "\u{BA2A}",
-        nfkd: "\u{1106}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BA2B}",
-        nfc: "\u{BA2B}",
-        nfd: "\u{1106}\u{1164}\u{11B6}",
-        nfkc: "\u{BA2B}",
-        nfkd: "\u{1106}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BA2C}",
-        nfc: "\u{BA2C}",
-        nfd: "\u{1106}\u{1164}\u{11B7}",
-        nfkc: "\u{BA2C}",
-        nfkd: "\u{1106}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BA2D}",
-        nfc: "\u{BA2D}",
-        nfd: "\u{1106}\u{1164}\u{11B8}",
-        nfkc: "\u{BA2D}",
-        nfkd: "\u{1106}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BA2E}",
-        nfc: "\u{BA2E}",
-        nfd: "\u{1106}\u{1164}\u{11B9}",
-        nfkc: "\u{BA2E}",
-        nfkd: "\u{1106}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BA2F}",
-        nfc: "\u{BA2F}",
-        nfd: "\u{1106}\u{1164}\u{11BA}",
-        nfkc: "\u{BA2F}",
-        nfkd: "\u{1106}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BA30}",
-        nfc: "\u{BA30}",
-        nfd: "\u{1106}\u{1164}\u{11BB}",
-        nfkc: "\u{BA30}",
-        nfkd: "\u{1106}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BA31}",
-        nfc: "\u{BA31}",
-        nfd: "\u{1106}\u{1164}\u{11BC}",
-        nfkc: "\u{BA31}",
-        nfkd: "\u{1106}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BA32}",
-        nfc: "\u{BA32}",
-        nfd: "\u{1106}\u{1164}\u{11BD}",
-        nfkc: "\u{BA32}",
-        nfkd: "\u{1106}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BA33}",
-        nfc: "\u{BA33}",
-        nfd: "\u{1106}\u{1164}\u{11BE}",
-        nfkc: "\u{BA33}",
-        nfkd: "\u{1106}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BA34}",
-        nfc: "\u{BA34}",
-        nfd: "\u{1106}\u{1164}\u{11BF}",
-        nfkc: "\u{BA34}",
-        nfkd: "\u{1106}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BA35}",
-        nfc: "\u{BA35}",
-        nfd: "\u{1106}\u{1164}\u{11C0}",
-        nfkc: "\u{BA35}",
-        nfkd: "\u{1106}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BA36}",
-        nfc: "\u{BA36}",
-        nfd: "\u{1106}\u{1164}\u{11C1}",
-        nfkc: "\u{BA36}",
-        nfkd: "\u{1106}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BA37}",
-        nfc: "\u{BA37}",
-        nfd: "\u{1106}\u{1164}\u{11C2}",
-        nfkc: "\u{BA37}",
-        nfkd: "\u{1106}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BA38}",
-        nfc: "\u{BA38}",
-        nfd: "\u{1106}\u{1165}",
-        nfkc: "\u{BA38}",
-        nfkd: "\u{1106}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{BA39}",
-        nfc: "\u{BA39}",
-        nfd: "\u{1106}\u{1165}\u{11A8}",
-        nfkc: "\u{BA39}",
-        nfkd: "\u{1106}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BA3A}",
-        nfc: "\u{BA3A}",
-        nfd: "\u{1106}\u{1165}\u{11A9}",
-        nfkc: "\u{BA3A}",
-        nfkd: "\u{1106}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BA3B}",
-        nfc: "\u{BA3B}",
-        nfd: "\u{1106}\u{1165}\u{11AA}",
-        nfkc: "\u{BA3B}",
-        nfkd: "\u{1106}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BA3C}",
-        nfc: "\u{BA3C}",
-        nfd: "\u{1106}\u{1165}\u{11AB}",
-        nfkc: "\u{BA3C}",
-        nfkd: "\u{1106}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BA3D}",
-        nfc: "\u{BA3D}",
-        nfd: "\u{1106}\u{1165}\u{11AC}",
-        nfkc: "\u{BA3D}",
-        nfkd: "\u{1106}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BA3E}",
-        nfc: "\u{BA3E}",
-        nfd: "\u{1106}\u{1165}\u{11AD}",
-        nfkc: "\u{BA3E}",
-        nfkd: "\u{1106}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BA3F}",
-        nfc: "\u{BA3F}",
-        nfd: "\u{1106}\u{1165}\u{11AE}",
-        nfkc: "\u{BA3F}",
-        nfkd: "\u{1106}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BA40}",
-        nfc: "\u{BA40}",
-        nfd: "\u{1106}\u{1165}\u{11AF}",
-        nfkc: "\u{BA40}",
-        nfkd: "\u{1106}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BA41}",
-        nfc: "\u{BA41}",
-        nfd: "\u{1106}\u{1165}\u{11B0}",
-        nfkc: "\u{BA41}",
-        nfkd: "\u{1106}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BA42}",
-        nfc: "\u{BA42}",
-        nfd: "\u{1106}\u{1165}\u{11B1}",
-        nfkc: "\u{BA42}",
-        nfkd: "\u{1106}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BA43}",
-        nfc: "\u{BA43}",
-        nfd: "\u{1106}\u{1165}\u{11B2}",
-        nfkc: "\u{BA43}",
-        nfkd: "\u{1106}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BA44}",
-        nfc: "\u{BA44}",
-        nfd: "\u{1106}\u{1165}\u{11B3}",
-        nfkc: "\u{BA44}",
-        nfkd: "\u{1106}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BA45}",
-        nfc: "\u{BA45}",
-        nfd: "\u{1106}\u{1165}\u{11B4}",
-        nfkc: "\u{BA45}",
-        nfkd: "\u{1106}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BA46}",
-        nfc: "\u{BA46}",
-        nfd: "\u{1106}\u{1165}\u{11B5}",
-        nfkc: "\u{BA46}",
-        nfkd: "\u{1106}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BA47}",
-        nfc: "\u{BA47}",
-        nfd: "\u{1106}\u{1165}\u{11B6}",
-        nfkc: "\u{BA47}",
-        nfkd: "\u{1106}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BA48}",
-        nfc: "\u{BA48}",
-        nfd: "\u{1106}\u{1165}\u{11B7}",
-        nfkc: "\u{BA48}",
-        nfkd: "\u{1106}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BA49}",
-        nfc: "\u{BA49}",
-        nfd: "\u{1106}\u{1165}\u{11B8}",
-        nfkc: "\u{BA49}",
-        nfkd: "\u{1106}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BA4A}",
-        nfc: "\u{BA4A}",
-        nfd: "\u{1106}\u{1165}\u{11B9}",
-        nfkc: "\u{BA4A}",
-        nfkd: "\u{1106}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BA4B}",
-        nfc: "\u{BA4B}",
-        nfd: "\u{1106}\u{1165}\u{11BA}",
-        nfkc: "\u{BA4B}",
-        nfkd: "\u{1106}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BA4C}",
-        nfc: "\u{BA4C}",
-        nfd: "\u{1106}\u{1165}\u{11BB}",
-        nfkc: "\u{BA4C}",
-        nfkd: "\u{1106}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BA4D}",
-        nfc: "\u{BA4D}",
-        nfd: "\u{1106}\u{1165}\u{11BC}",
-        nfkc: "\u{BA4D}",
-        nfkd: "\u{1106}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BA4E}",
-        nfc: "\u{BA4E}",
-        nfd: "\u{1106}\u{1165}\u{11BD}",
-        nfkc: "\u{BA4E}",
-        nfkd: "\u{1106}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BA4F}",
-        nfc: "\u{BA4F}",
-        nfd: "\u{1106}\u{1165}\u{11BE}",
-        nfkc: "\u{BA4F}",
-        nfkd: "\u{1106}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BA50}",
-        nfc: "\u{BA50}",
-        nfd: "\u{1106}\u{1165}\u{11BF}",
-        nfkc: "\u{BA50}",
-        nfkd: "\u{1106}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BA51}",
-        nfc: "\u{BA51}",
-        nfd: "\u{1106}\u{1165}\u{11C0}",
-        nfkc: "\u{BA51}",
-        nfkd: "\u{1106}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BA52}",
-        nfc: "\u{BA52}",
-        nfd: "\u{1106}\u{1165}\u{11C1}",
-        nfkc: "\u{BA52}",
-        nfkd: "\u{1106}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BA53}",
-        nfc: "\u{BA53}",
-        nfd: "\u{1106}\u{1165}\u{11C2}",
-        nfkc: "\u{BA53}",
-        nfkd: "\u{1106}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BA54}",
-        nfc: "\u{BA54}",
-        nfd: "\u{1106}\u{1166}",
-        nfkc: "\u{BA54}",
-        nfkd: "\u{1106}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{BA55}",
-        nfc: "\u{BA55}",
-        nfd: "\u{1106}\u{1166}\u{11A8}",
-        nfkc: "\u{BA55}",
-        nfkd: "\u{1106}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BA56}",
-        nfc: "\u{BA56}",
-        nfd: "\u{1106}\u{1166}\u{11A9}",
-        nfkc: "\u{BA56}",
-        nfkd: "\u{1106}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BA57}",
-        nfc: "\u{BA57}",
-        nfd: "\u{1106}\u{1166}\u{11AA}",
-        nfkc: "\u{BA57}",
-        nfkd: "\u{1106}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BA58}",
-        nfc: "\u{BA58}",
-        nfd: "\u{1106}\u{1166}\u{11AB}",
-        nfkc: "\u{BA58}",
-        nfkd: "\u{1106}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BA59}",
-        nfc: "\u{BA59}",
-        nfd: "\u{1106}\u{1166}\u{11AC}",
-        nfkc: "\u{BA59}",
-        nfkd: "\u{1106}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BA5A}",
-        nfc: "\u{BA5A}",
-        nfd: "\u{1106}\u{1166}\u{11AD}",
-        nfkc: "\u{BA5A}",
-        nfkd: "\u{1106}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BA5B}",
-        nfc: "\u{BA5B}",
-        nfd: "\u{1106}\u{1166}\u{11AE}",
-        nfkc: "\u{BA5B}",
-        nfkd: "\u{1106}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BA5C}",
-        nfc: "\u{BA5C}",
-        nfd: "\u{1106}\u{1166}\u{11AF}",
-        nfkc: "\u{BA5C}",
-        nfkd: "\u{1106}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BA5D}",
-        nfc: "\u{BA5D}",
-        nfd: "\u{1106}\u{1166}\u{11B0}",
-        nfkc: "\u{BA5D}",
-        nfkd: "\u{1106}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BA5E}",
-        nfc: "\u{BA5E}",
-        nfd: "\u{1106}\u{1166}\u{11B1}",
-        nfkc: "\u{BA5E}",
-        nfkd: "\u{1106}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BA5F}",
-        nfc: "\u{BA5F}",
-        nfd: "\u{1106}\u{1166}\u{11B2}",
-        nfkc: "\u{BA5F}",
-        nfkd: "\u{1106}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BA60}",
-        nfc: "\u{BA60}",
-        nfd: "\u{1106}\u{1166}\u{11B3}",
-        nfkc: "\u{BA60}",
-        nfkd: "\u{1106}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BA61}",
-        nfc: "\u{BA61}",
-        nfd: "\u{1106}\u{1166}\u{11B4}",
-        nfkc: "\u{BA61}",
-        nfkd: "\u{1106}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BA62}",
-        nfc: "\u{BA62}",
-        nfd: "\u{1106}\u{1166}\u{11B5}",
-        nfkc: "\u{BA62}",
-        nfkd: "\u{1106}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BA63}",
-        nfc: "\u{BA63}",
-        nfd: "\u{1106}\u{1166}\u{11B6}",
-        nfkc: "\u{BA63}",
-        nfkd: "\u{1106}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BA64}",
-        nfc: "\u{BA64}",
-        nfd: "\u{1106}\u{1166}\u{11B7}",
-        nfkc: "\u{BA64}",
-        nfkd: "\u{1106}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BA65}",
-        nfc: "\u{BA65}",
-        nfd: "\u{1106}\u{1166}\u{11B8}",
-        nfkc: "\u{BA65}",
-        nfkd: "\u{1106}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BA66}",
-        nfc: "\u{BA66}",
-        nfd: "\u{1106}\u{1166}\u{11B9}",
-        nfkc: "\u{BA66}",
-        nfkd: "\u{1106}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BA67}",
-        nfc: "\u{BA67}",
-        nfd: "\u{1106}\u{1166}\u{11BA}",
-        nfkc: "\u{BA67}",
-        nfkd: "\u{1106}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BA68}",
-        nfc: "\u{BA68}",
-        nfd: "\u{1106}\u{1166}\u{11BB}",
-        nfkc: "\u{BA68}",
-        nfkd: "\u{1106}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BA69}",
-        nfc: "\u{BA69}",
-        nfd: "\u{1106}\u{1166}\u{11BC}",
-        nfkc: "\u{BA69}",
-        nfkd: "\u{1106}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BA6A}",
-        nfc: "\u{BA6A}",
-        nfd: "\u{1106}\u{1166}\u{11BD}",
-        nfkc: "\u{BA6A}",
-        nfkd: "\u{1106}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BA6B}",
-        nfc: "\u{BA6B}",
-        nfd: "\u{1106}\u{1166}\u{11BE}",
-        nfkc: "\u{BA6B}",
-        nfkd: "\u{1106}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BA6C}",
-        nfc: "\u{BA6C}",
-        nfd: "\u{1106}\u{1166}\u{11BF}",
-        nfkc: "\u{BA6C}",
-        nfkd: "\u{1106}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BA6D}",
-        nfc: "\u{BA6D}",
-        nfd: "\u{1106}\u{1166}\u{11C0}",
-        nfkc: "\u{BA6D}",
-        nfkd: "\u{1106}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BA6E}",
-        nfc: "\u{BA6E}",
-        nfd: "\u{1106}\u{1166}\u{11C1}",
-        nfkc: "\u{BA6E}",
-        nfkd: "\u{1106}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BA6F}",
-        nfc: "\u{BA6F}",
-        nfd: "\u{1106}\u{1166}\u{11C2}",
-        nfkc: "\u{BA6F}",
-        nfkd: "\u{1106}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BA70}",
-        nfc: "\u{BA70}",
-        nfd: "\u{1106}\u{1167}",
-        nfkc: "\u{BA70}",
-        nfkd: "\u{1106}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{BA71}",
-        nfc: "\u{BA71}",
-        nfd: "\u{1106}\u{1167}\u{11A8}",
-        nfkc: "\u{BA71}",
-        nfkd: "\u{1106}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BA72}",
-        nfc: "\u{BA72}",
-        nfd: "\u{1106}\u{1167}\u{11A9}",
-        nfkc: "\u{BA72}",
-        nfkd: "\u{1106}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BA73}",
-        nfc: "\u{BA73}",
-        nfd: "\u{1106}\u{1167}\u{11AA}",
-        nfkc: "\u{BA73}",
-        nfkd: "\u{1106}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BA74}",
-        nfc: "\u{BA74}",
-        nfd: "\u{1106}\u{1167}\u{11AB}",
-        nfkc: "\u{BA74}",
-        nfkd: "\u{1106}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BA75}",
-        nfc: "\u{BA75}",
-        nfd: "\u{1106}\u{1167}\u{11AC}",
-        nfkc: "\u{BA75}",
-        nfkd: "\u{1106}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BA76}",
-        nfc: "\u{BA76}",
-        nfd: "\u{1106}\u{1167}\u{11AD}",
-        nfkc: "\u{BA76}",
-        nfkd: "\u{1106}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BA77}",
-        nfc: "\u{BA77}",
-        nfd: "\u{1106}\u{1167}\u{11AE}",
-        nfkc: "\u{BA77}",
-        nfkd: "\u{1106}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BA78}",
-        nfc: "\u{BA78}",
-        nfd: "\u{1106}\u{1167}\u{11AF}",
-        nfkc: "\u{BA78}",
-        nfkd: "\u{1106}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BA79}",
-        nfc: "\u{BA79}",
-        nfd: "\u{1106}\u{1167}\u{11B0}",
-        nfkc: "\u{BA79}",
-        nfkd: "\u{1106}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BA7A}",
-        nfc: "\u{BA7A}",
-        nfd: "\u{1106}\u{1167}\u{11B1}",
-        nfkc: "\u{BA7A}",
-        nfkd: "\u{1106}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BA7B}",
-        nfc: "\u{BA7B}",
-        nfd: "\u{1106}\u{1167}\u{11B2}",
-        nfkc: "\u{BA7B}",
-        nfkd: "\u{1106}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BA7C}",
-        nfc: "\u{BA7C}",
-        nfd: "\u{1106}\u{1167}\u{11B3}",
-        nfkc: "\u{BA7C}",
-        nfkd: "\u{1106}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BA7D}",
-        nfc: "\u{BA7D}",
-        nfd: "\u{1106}\u{1167}\u{11B4}",
-        nfkc: "\u{BA7D}",
-        nfkd: "\u{1106}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BA7E}",
-        nfc: "\u{BA7E}",
-        nfd: "\u{1106}\u{1167}\u{11B5}",
-        nfkc: "\u{BA7E}",
-        nfkd: "\u{1106}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BA7F}",
-        nfc: "\u{BA7F}",
-        nfd: "\u{1106}\u{1167}\u{11B6}",
-        nfkc: "\u{BA7F}",
-        nfkd: "\u{1106}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BA80}",
-        nfc: "\u{BA80}",
-        nfd: "\u{1106}\u{1167}\u{11B7}",
-        nfkc: "\u{BA80}",
-        nfkd: "\u{1106}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BA81}",
-        nfc: "\u{BA81}",
-        nfd: "\u{1106}\u{1167}\u{11B8}",
-        nfkc: "\u{BA81}",
-        nfkd: "\u{1106}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BA82}",
-        nfc: "\u{BA82}",
-        nfd: "\u{1106}\u{1167}\u{11B9}",
-        nfkc: "\u{BA82}",
-        nfkd: "\u{1106}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BA83}",
-        nfc: "\u{BA83}",
-        nfd: "\u{1106}\u{1167}\u{11BA}",
-        nfkc: "\u{BA83}",
-        nfkd: "\u{1106}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BA84}",
-        nfc: "\u{BA84}",
-        nfd: "\u{1106}\u{1167}\u{11BB}",
-        nfkc: "\u{BA84}",
-        nfkd: "\u{1106}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BA85}",
-        nfc: "\u{BA85}",
-        nfd: "\u{1106}\u{1167}\u{11BC}",
-        nfkc: "\u{BA85}",
-        nfkd: "\u{1106}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BA86}",
-        nfc: "\u{BA86}",
-        nfd: "\u{1106}\u{1167}\u{11BD}",
-        nfkc: "\u{BA86}",
-        nfkd: "\u{1106}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BA87}",
-        nfc: "\u{BA87}",
-        nfd: "\u{1106}\u{1167}\u{11BE}",
-        nfkc: "\u{BA87}",
-        nfkd: "\u{1106}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BA88}",
-        nfc: "\u{BA88}",
-        nfd: "\u{1106}\u{1167}\u{11BF}",
-        nfkc: "\u{BA88}",
-        nfkd: "\u{1106}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BA89}",
-        nfc: "\u{BA89}",
-        nfd: "\u{1106}\u{1167}\u{11C0}",
-        nfkc: "\u{BA89}",
-        nfkd: "\u{1106}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BA8A}",
-        nfc: "\u{BA8A}",
-        nfd: "\u{1106}\u{1167}\u{11C1}",
-        nfkc: "\u{BA8A}",
-        nfkd: "\u{1106}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BA8B}",
-        nfc: "\u{BA8B}",
-        nfd: "\u{1106}\u{1167}\u{11C2}",
-        nfkc: "\u{BA8B}",
-        nfkd: "\u{1106}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BA8C}",
-        nfc: "\u{BA8C}",
-        nfd: "\u{1106}\u{1168}",
-        nfkc: "\u{BA8C}",
-        nfkd: "\u{1106}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{BA8D}",
-        nfc: "\u{BA8D}",
-        nfd: "\u{1106}\u{1168}\u{11A8}",
-        nfkc: "\u{BA8D}",
-        nfkd: "\u{1106}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BA8E}",
-        nfc: "\u{BA8E}",
-        nfd: "\u{1106}\u{1168}\u{11A9}",
-        nfkc: "\u{BA8E}",
-        nfkd: "\u{1106}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BA8F}",
-        nfc: "\u{BA8F}",
-        nfd: "\u{1106}\u{1168}\u{11AA}",
-        nfkc: "\u{BA8F}",
-        nfkd: "\u{1106}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BA90}",
-        nfc: "\u{BA90}",
-        nfd: "\u{1106}\u{1168}\u{11AB}",
-        nfkc: "\u{BA90}",
-        nfkd: "\u{1106}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BA91}",
-        nfc: "\u{BA91}",
-        nfd: "\u{1106}\u{1168}\u{11AC}",
-        nfkc: "\u{BA91}",
-        nfkd: "\u{1106}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BA92}",
-        nfc: "\u{BA92}",
-        nfd: "\u{1106}\u{1168}\u{11AD}",
-        nfkc: "\u{BA92}",
-        nfkd: "\u{1106}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BA93}",
-        nfc: "\u{BA93}",
-        nfd: "\u{1106}\u{1168}\u{11AE}",
-        nfkc: "\u{BA93}",
-        nfkd: "\u{1106}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BA94}",
-        nfc: "\u{BA94}",
-        nfd: "\u{1106}\u{1168}\u{11AF}",
-        nfkc: "\u{BA94}",
-        nfkd: "\u{1106}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BA95}",
-        nfc: "\u{BA95}",
-        nfd: "\u{1106}\u{1168}\u{11B0}",
-        nfkc: "\u{BA95}",
-        nfkd: "\u{1106}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BA96}",
-        nfc: "\u{BA96}",
-        nfd: "\u{1106}\u{1168}\u{11B1}",
-        nfkc: "\u{BA96}",
-        nfkd: "\u{1106}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BA97}",
-        nfc: "\u{BA97}",
-        nfd: "\u{1106}\u{1168}\u{11B2}",
-        nfkc: "\u{BA97}",
-        nfkd: "\u{1106}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BA98}",
-        nfc: "\u{BA98}",
-        nfd: "\u{1106}\u{1168}\u{11B3}",
-        nfkc: "\u{BA98}",
-        nfkd: "\u{1106}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BA99}",
-        nfc: "\u{BA99}",
-        nfd: "\u{1106}\u{1168}\u{11B4}",
-        nfkc: "\u{BA99}",
-        nfkd: "\u{1106}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BA9A}",
-        nfc: "\u{BA9A}",
-        nfd: "\u{1106}\u{1168}\u{11B5}",
-        nfkc: "\u{BA9A}",
-        nfkd: "\u{1106}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BA9B}",
-        nfc: "\u{BA9B}",
-        nfd: "\u{1106}\u{1168}\u{11B6}",
-        nfkc: "\u{BA9B}",
-        nfkd: "\u{1106}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BA9C}",
-        nfc: "\u{BA9C}",
-        nfd: "\u{1106}\u{1168}\u{11B7}",
-        nfkc: "\u{BA9C}",
-        nfkd: "\u{1106}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BA9D}",
-        nfc: "\u{BA9D}",
-        nfd: "\u{1106}\u{1168}\u{11B8}",
-        nfkc: "\u{BA9D}",
-        nfkd: "\u{1106}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BA9E}",
-        nfc: "\u{BA9E}",
-        nfd: "\u{1106}\u{1168}\u{11B9}",
-        nfkc: "\u{BA9E}",
-        nfkd: "\u{1106}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BA9F}",
-        nfc: "\u{BA9F}",
-        nfd: "\u{1106}\u{1168}\u{11BA}",
-        nfkc: "\u{BA9F}",
-        nfkd: "\u{1106}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BAA0}",
-        nfc: "\u{BAA0}",
-        nfd: "\u{1106}\u{1168}\u{11BB}",
-        nfkc: "\u{BAA0}",
-        nfkd: "\u{1106}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BAA1}",
-        nfc: "\u{BAA1}",
-        nfd: "\u{1106}\u{1168}\u{11BC}",
-        nfkc: "\u{BAA1}",
-        nfkd: "\u{1106}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BAA2}",
-        nfc: "\u{BAA2}",
-        nfd: "\u{1106}\u{1168}\u{11BD}",
-        nfkc: "\u{BAA2}",
-        nfkd: "\u{1106}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BAA3}",
-        nfc: "\u{BAA3}",
-        nfd: "\u{1106}\u{1168}\u{11BE}",
-        nfkc: "\u{BAA3}",
-        nfkd: "\u{1106}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BAA4}",
-        nfc: "\u{BAA4}",
-        nfd: "\u{1106}\u{1168}\u{11BF}",
-        nfkc: "\u{BAA4}",
-        nfkd: "\u{1106}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BAA5}",
-        nfc: "\u{BAA5}",
-        nfd: "\u{1106}\u{1168}\u{11C0}",
-        nfkc: "\u{BAA5}",
-        nfkd: "\u{1106}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BAA6}",
-        nfc: "\u{BAA6}",
-        nfd: "\u{1106}\u{1168}\u{11C1}",
-        nfkc: "\u{BAA6}",
-        nfkd: "\u{1106}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BAA7}",
-        nfc: "\u{BAA7}",
-        nfd: "\u{1106}\u{1168}\u{11C2}",
-        nfkc: "\u{BAA7}",
-        nfkd: "\u{1106}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BAA8}",
-        nfc: "\u{BAA8}",
-        nfd: "\u{1106}\u{1169}",
-        nfkc: "\u{BAA8}",
-        nfkd: "\u{1106}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{BAA9}",
-        nfc: "\u{BAA9}",
-        nfd: "\u{1106}\u{1169}\u{11A8}",
-        nfkc: "\u{BAA9}",
-        nfkd: "\u{1106}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BAAA}",
-        nfc: "\u{BAAA}",
-        nfd: "\u{1106}\u{1169}\u{11A9}",
-        nfkc: "\u{BAAA}",
-        nfkd: "\u{1106}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BAAB}",
-        nfc: "\u{BAAB}",
-        nfd: "\u{1106}\u{1169}\u{11AA}",
-        nfkc: "\u{BAAB}",
-        nfkd: "\u{1106}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BAAC}",
-        nfc: "\u{BAAC}",
-        nfd: "\u{1106}\u{1169}\u{11AB}",
-        nfkc: "\u{BAAC}",
-        nfkd: "\u{1106}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BAAD}",
-        nfc: "\u{BAAD}",
-        nfd: "\u{1106}\u{1169}\u{11AC}",
-        nfkc: "\u{BAAD}",
-        nfkd: "\u{1106}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BAAE}",
-        nfc: "\u{BAAE}",
-        nfd: "\u{1106}\u{1169}\u{11AD}",
-        nfkc: "\u{BAAE}",
-        nfkd: "\u{1106}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BAAF}",
-        nfc: "\u{BAAF}",
-        nfd: "\u{1106}\u{1169}\u{11AE}",
-        nfkc: "\u{BAAF}",
-        nfkd: "\u{1106}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BAB0}",
-        nfc: "\u{BAB0}",
-        nfd: "\u{1106}\u{1169}\u{11AF}",
-        nfkc: "\u{BAB0}",
-        nfkd: "\u{1106}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BAB1}",
-        nfc: "\u{BAB1}",
-        nfd: "\u{1106}\u{1169}\u{11B0}",
-        nfkc: "\u{BAB1}",
-        nfkd: "\u{1106}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BAB2}",
-        nfc: "\u{BAB2}",
-        nfd: "\u{1106}\u{1169}\u{11B1}",
-        nfkc: "\u{BAB2}",
-        nfkd: "\u{1106}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BAB3}",
-        nfc: "\u{BAB3}",
-        nfd: "\u{1106}\u{1169}\u{11B2}",
-        nfkc: "\u{BAB3}",
-        nfkd: "\u{1106}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BAB4}",
-        nfc: "\u{BAB4}",
-        nfd: "\u{1106}\u{1169}\u{11B3}",
-        nfkc: "\u{BAB4}",
-        nfkd: "\u{1106}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BAB5}",
-        nfc: "\u{BAB5}",
-        nfd: "\u{1106}\u{1169}\u{11B4}",
-        nfkc: "\u{BAB5}",
-        nfkd: "\u{1106}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BAB6}",
-        nfc: "\u{BAB6}",
-        nfd: "\u{1106}\u{1169}\u{11B5}",
-        nfkc: "\u{BAB6}",
-        nfkd: "\u{1106}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BAB7}",
-        nfc: "\u{BAB7}",
-        nfd: "\u{1106}\u{1169}\u{11B6}",
-        nfkc: "\u{BAB7}",
-        nfkd: "\u{1106}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BAB8}",
-        nfc: "\u{BAB8}",
-        nfd: "\u{1106}\u{1169}\u{11B7}",
-        nfkc: "\u{BAB8}",
-        nfkd: "\u{1106}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BAB9}",
-        nfc: "\u{BAB9}",
-        nfd: "\u{1106}\u{1169}\u{11B8}",
-        nfkc: "\u{BAB9}",
-        nfkd: "\u{1106}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BABA}",
-        nfc: "\u{BABA}",
-        nfd: "\u{1106}\u{1169}\u{11B9}",
-        nfkc: "\u{BABA}",
-        nfkd: "\u{1106}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BABB}",
-        nfc: "\u{BABB}",
-        nfd: "\u{1106}\u{1169}\u{11BA}",
-        nfkc: "\u{BABB}",
-        nfkd: "\u{1106}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BABC}",
-        nfc: "\u{BABC}",
-        nfd: "\u{1106}\u{1169}\u{11BB}",
-        nfkc: "\u{BABC}",
-        nfkd: "\u{1106}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BABD}",
-        nfc: "\u{BABD}",
-        nfd: "\u{1106}\u{1169}\u{11BC}",
-        nfkc: "\u{BABD}",
-        nfkd: "\u{1106}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BABE}",
-        nfc: "\u{BABE}",
-        nfd: "\u{1106}\u{1169}\u{11BD}",
-        nfkc: "\u{BABE}",
-        nfkd: "\u{1106}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BABF}",
-        nfc: "\u{BABF}",
-        nfd: "\u{1106}\u{1169}\u{11BE}",
-        nfkc: "\u{BABF}",
-        nfkd: "\u{1106}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BAC0}",
-        nfc: "\u{BAC0}",
-        nfd: "\u{1106}\u{1169}\u{11BF}",
-        nfkc: "\u{BAC0}",
-        nfkd: "\u{1106}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BAC1}",
-        nfc: "\u{BAC1}",
-        nfd: "\u{1106}\u{1169}\u{11C0}",
-        nfkc: "\u{BAC1}",
-        nfkd: "\u{1106}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BAC2}",
-        nfc: "\u{BAC2}",
-        nfd: "\u{1106}\u{1169}\u{11C1}",
-        nfkc: "\u{BAC2}",
-        nfkd: "\u{1106}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BAC3}",
-        nfc: "\u{BAC3}",
-        nfd: "\u{1106}\u{1169}\u{11C2}",
-        nfkc: "\u{BAC3}",
-        nfkd: "\u{1106}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BAC4}",
-        nfc: "\u{BAC4}",
-        nfd: "\u{1106}\u{116A}",
-        nfkc: "\u{BAC4}",
-        nfkd: "\u{1106}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{BAC5}",
-        nfc: "\u{BAC5}",
-        nfd: "\u{1106}\u{116A}\u{11A8}",
-        nfkc: "\u{BAC5}",
-        nfkd: "\u{1106}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BAC6}",
-        nfc: "\u{BAC6}",
-        nfd: "\u{1106}\u{116A}\u{11A9}",
-        nfkc: "\u{BAC6}",
-        nfkd: "\u{1106}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BAC7}",
-        nfc: "\u{BAC7}",
-        nfd: "\u{1106}\u{116A}\u{11AA}",
-        nfkc: "\u{BAC7}",
-        nfkd: "\u{1106}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BAC8}",
-        nfc: "\u{BAC8}",
-        nfd: "\u{1106}\u{116A}\u{11AB}",
-        nfkc: "\u{BAC8}",
-        nfkd: "\u{1106}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BAC9}",
-        nfc: "\u{BAC9}",
-        nfd: "\u{1106}\u{116A}\u{11AC}",
-        nfkc: "\u{BAC9}",
-        nfkd: "\u{1106}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BACA}",
-        nfc: "\u{BACA}",
-        nfd: "\u{1106}\u{116A}\u{11AD}",
-        nfkc: "\u{BACA}",
-        nfkd: "\u{1106}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BACB}",
-        nfc: "\u{BACB}",
-        nfd: "\u{1106}\u{116A}\u{11AE}",
-        nfkc: "\u{BACB}",
-        nfkd: "\u{1106}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BACC}",
-        nfc: "\u{BACC}",
-        nfd: "\u{1106}\u{116A}\u{11AF}",
-        nfkc: "\u{BACC}",
-        nfkd: "\u{1106}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BACD}",
-        nfc: "\u{BACD}",
-        nfd: "\u{1106}\u{116A}\u{11B0}",
-        nfkc: "\u{BACD}",
-        nfkd: "\u{1106}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BACE}",
-        nfc: "\u{BACE}",
-        nfd: "\u{1106}\u{116A}\u{11B1}",
-        nfkc: "\u{BACE}",
-        nfkd: "\u{1106}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BACF}",
-        nfc: "\u{BACF}",
-        nfd: "\u{1106}\u{116A}\u{11B2}",
-        nfkc: "\u{BACF}",
-        nfkd: "\u{1106}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BAD0}",
-        nfc: "\u{BAD0}",
-        nfd: "\u{1106}\u{116A}\u{11B3}",
-        nfkc: "\u{BAD0}",
-        nfkd: "\u{1106}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BAD1}",
-        nfc: "\u{BAD1}",
-        nfd: "\u{1106}\u{116A}\u{11B4}",
-        nfkc: "\u{BAD1}",
-        nfkd: "\u{1106}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BAD2}",
-        nfc: "\u{BAD2}",
-        nfd: "\u{1106}\u{116A}\u{11B5}",
-        nfkc: "\u{BAD2}",
-        nfkd: "\u{1106}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BAD3}",
-        nfc: "\u{BAD3}",
-        nfd: "\u{1106}\u{116A}\u{11B6}",
-        nfkc: "\u{BAD3}",
-        nfkd: "\u{1106}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BAD4}",
-        nfc: "\u{BAD4}",
-        nfd: "\u{1106}\u{116A}\u{11B7}",
-        nfkc: "\u{BAD4}",
-        nfkd: "\u{1106}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BAD5}",
-        nfc: "\u{BAD5}",
-        nfd: "\u{1106}\u{116A}\u{11B8}",
-        nfkc: "\u{BAD5}",
-        nfkd: "\u{1106}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BAD6}",
-        nfc: "\u{BAD6}",
-        nfd: "\u{1106}\u{116A}\u{11B9}",
-        nfkc: "\u{BAD6}",
-        nfkd: "\u{1106}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BAD7}",
-        nfc: "\u{BAD7}",
-        nfd: "\u{1106}\u{116A}\u{11BA}",
-        nfkc: "\u{BAD7}",
-        nfkd: "\u{1106}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BAD8}",
-        nfc: "\u{BAD8}",
-        nfd: "\u{1106}\u{116A}\u{11BB}",
-        nfkc: "\u{BAD8}",
-        nfkd: "\u{1106}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BAD9}",
-        nfc: "\u{BAD9}",
-        nfd: "\u{1106}\u{116A}\u{11BC}",
-        nfkc: "\u{BAD9}",
-        nfkd: "\u{1106}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BADA}",
-        nfc: "\u{BADA}",
-        nfd: "\u{1106}\u{116A}\u{11BD}",
-        nfkc: "\u{BADA}",
-        nfkd: "\u{1106}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BADB}",
-        nfc: "\u{BADB}",
-        nfd: "\u{1106}\u{116A}\u{11BE}",
-        nfkc: "\u{BADB}",
-        nfkd: "\u{1106}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BADC}",
-        nfc: "\u{BADC}",
-        nfd: "\u{1106}\u{116A}\u{11BF}",
-        nfkc: "\u{BADC}",
-        nfkd: "\u{1106}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BADD}",
-        nfc: "\u{BADD}",
-        nfd: "\u{1106}\u{116A}\u{11C0}",
-        nfkc: "\u{BADD}",
-        nfkd: "\u{1106}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BADE}",
-        nfc: "\u{BADE}",
-        nfd: "\u{1106}\u{116A}\u{11C1}",
-        nfkc: "\u{BADE}",
-        nfkd: "\u{1106}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BADF}",
-        nfc: "\u{BADF}",
-        nfd: "\u{1106}\u{116A}\u{11C2}",
-        nfkc: "\u{BADF}",
-        nfkd: "\u{1106}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BAE0}",
-        nfc: "\u{BAE0}",
-        nfd: "\u{1106}\u{116B}",
-        nfkc: "\u{BAE0}",
-        nfkd: "\u{1106}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{BAE1}",
-        nfc: "\u{BAE1}",
-        nfd: "\u{1106}\u{116B}\u{11A8}",
-        nfkc: "\u{BAE1}",
-        nfkd: "\u{1106}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BAE2}",
-        nfc: "\u{BAE2}",
-        nfd: "\u{1106}\u{116B}\u{11A9}",
-        nfkc: "\u{BAE2}",
-        nfkd: "\u{1106}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BAE3}",
-        nfc: "\u{BAE3}",
-        nfd: "\u{1106}\u{116B}\u{11AA}",
-        nfkc: "\u{BAE3}",
-        nfkd: "\u{1106}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BAE4}",
-        nfc: "\u{BAE4}",
-        nfd: "\u{1106}\u{116B}\u{11AB}",
-        nfkc: "\u{BAE4}",
-        nfkd: "\u{1106}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BAE5}",
-        nfc: "\u{BAE5}",
-        nfd: "\u{1106}\u{116B}\u{11AC}",
-        nfkc: "\u{BAE5}",
-        nfkd: "\u{1106}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BAE6}",
-        nfc: "\u{BAE6}",
-        nfd: "\u{1106}\u{116B}\u{11AD}",
-        nfkc: "\u{BAE6}",
-        nfkd: "\u{1106}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BAE7}",
-        nfc: "\u{BAE7}",
-        nfd: "\u{1106}\u{116B}\u{11AE}",
-        nfkc: "\u{BAE7}",
-        nfkd: "\u{1106}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BAE8}",
-        nfc: "\u{BAE8}",
-        nfd: "\u{1106}\u{116B}\u{11AF}",
-        nfkc: "\u{BAE8}",
-        nfkd: "\u{1106}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BAE9}",
-        nfc: "\u{BAE9}",
-        nfd: "\u{1106}\u{116B}\u{11B0}",
-        nfkc: "\u{BAE9}",
-        nfkd: "\u{1106}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BAEA}",
-        nfc: "\u{BAEA}",
-        nfd: "\u{1106}\u{116B}\u{11B1}",
-        nfkc: "\u{BAEA}",
-        nfkd: "\u{1106}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BAEB}",
-        nfc: "\u{BAEB}",
-        nfd: "\u{1106}\u{116B}\u{11B2}",
-        nfkc: "\u{BAEB}",
-        nfkd: "\u{1106}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BAEC}",
-        nfc: "\u{BAEC}",
-        nfd: "\u{1106}\u{116B}\u{11B3}",
-        nfkc: "\u{BAEC}",
-        nfkd: "\u{1106}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BAED}",
-        nfc: "\u{BAED}",
-        nfd: "\u{1106}\u{116B}\u{11B4}",
-        nfkc: "\u{BAED}",
-        nfkd: "\u{1106}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BAEE}",
-        nfc: "\u{BAEE}",
-        nfd: "\u{1106}\u{116B}\u{11B5}",
-        nfkc: "\u{BAEE}",
-        nfkd: "\u{1106}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BAEF}",
-        nfc: "\u{BAEF}",
-        nfd: "\u{1106}\u{116B}\u{11B6}",
-        nfkc: "\u{BAEF}",
-        nfkd: "\u{1106}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BAF0}",
-        nfc: "\u{BAF0}",
-        nfd: "\u{1106}\u{116B}\u{11B7}",
-        nfkc: "\u{BAF0}",
-        nfkd: "\u{1106}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BAF1}",
-        nfc: "\u{BAF1}",
-        nfd: "\u{1106}\u{116B}\u{11B8}",
-        nfkc: "\u{BAF1}",
-        nfkd: "\u{1106}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BAF2}",
-        nfc: "\u{BAF2}",
-        nfd: "\u{1106}\u{116B}\u{11B9}",
-        nfkc: "\u{BAF2}",
-        nfkd: "\u{1106}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BAF3}",
-        nfc: "\u{BAF3}",
-        nfd: "\u{1106}\u{116B}\u{11BA}",
-        nfkc: "\u{BAF3}",
-        nfkd: "\u{1106}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BAF4}",
-        nfc: "\u{BAF4}",
-        nfd: "\u{1106}\u{116B}\u{11BB}",
-        nfkc: "\u{BAF4}",
-        nfkd: "\u{1106}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BAF5}",
-        nfc: "\u{BAF5}",
-        nfd: "\u{1106}\u{116B}\u{11BC}",
-        nfkc: "\u{BAF5}",
-        nfkd: "\u{1106}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BAF6}",
-        nfc: "\u{BAF6}",
-        nfd: "\u{1106}\u{116B}\u{11BD}",
-        nfkc: "\u{BAF6}",
-        nfkd: "\u{1106}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BAF7}",
-        nfc: "\u{BAF7}",
-        nfd: "\u{1106}\u{116B}\u{11BE}",
-        nfkc: "\u{BAF7}",
-        nfkd: "\u{1106}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BAF8}",
-        nfc: "\u{BAF8}",
-        nfd: "\u{1106}\u{116B}\u{11BF}",
-        nfkc: "\u{BAF8}",
-        nfkd: "\u{1106}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BAF9}",
-        nfc: "\u{BAF9}",
-        nfd: "\u{1106}\u{116B}\u{11C0}",
-        nfkc: "\u{BAF9}",
-        nfkd: "\u{1106}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BAFA}",
-        nfc: "\u{BAFA}",
-        nfd: "\u{1106}\u{116B}\u{11C1}",
-        nfkc: "\u{BAFA}",
-        nfkd: "\u{1106}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BAFB}",
-        nfc: "\u{BAFB}",
-        nfd: "\u{1106}\u{116B}\u{11C2}",
-        nfkc: "\u{BAFB}",
-        nfkd: "\u{1106}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BAFC}",
-        nfc: "\u{BAFC}",
-        nfd: "\u{1106}\u{116C}",
-        nfkc: "\u{BAFC}",
-        nfkd: "\u{1106}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{BAFD}",
-        nfc: "\u{BAFD}",
-        nfd: "\u{1106}\u{116C}\u{11A8}",
-        nfkc: "\u{BAFD}",
-        nfkd: "\u{1106}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BAFE}",
-        nfc: "\u{BAFE}",
-        nfd: "\u{1106}\u{116C}\u{11A9}",
-        nfkc: "\u{BAFE}",
-        nfkd: "\u{1106}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BAFF}",
-        nfc: "\u{BAFF}",
-        nfd: "\u{1106}\u{116C}\u{11AA}",
-        nfkc: "\u{BAFF}",
-        nfkd: "\u{1106}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BB00}",
-        nfc: "\u{BB00}",
-        nfd: "\u{1106}\u{116C}\u{11AB}",
-        nfkc: "\u{BB00}",
-        nfkd: "\u{1106}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BB01}",
-        nfc: "\u{BB01}",
-        nfd: "\u{1106}\u{116C}\u{11AC}",
-        nfkc: "\u{BB01}",
-        nfkd: "\u{1106}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BB02}",
-        nfc: "\u{BB02}",
-        nfd: "\u{1106}\u{116C}\u{11AD}",
-        nfkc: "\u{BB02}",
-        nfkd: "\u{1106}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BB03}",
-        nfc: "\u{BB03}",
-        nfd: "\u{1106}\u{116C}\u{11AE}",
-        nfkc: "\u{BB03}",
-        nfkd: "\u{1106}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BB04}",
-        nfc: "\u{BB04}",
-        nfd: "\u{1106}\u{116C}\u{11AF}",
-        nfkc: "\u{BB04}",
-        nfkd: "\u{1106}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BB05}",
-        nfc: "\u{BB05}",
-        nfd: "\u{1106}\u{116C}\u{11B0}",
-        nfkc: "\u{BB05}",
-        nfkd: "\u{1106}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BB06}",
-        nfc: "\u{BB06}",
-        nfd: "\u{1106}\u{116C}\u{11B1}",
-        nfkc: "\u{BB06}",
-        nfkd: "\u{1106}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BB07}",
-        nfc: "\u{BB07}",
-        nfd: "\u{1106}\u{116C}\u{11B2}",
-        nfkc: "\u{BB07}",
-        nfkd: "\u{1106}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BB08}",
-        nfc: "\u{BB08}",
-        nfd: "\u{1106}\u{116C}\u{11B3}",
-        nfkc: "\u{BB08}",
-        nfkd: "\u{1106}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BB09}",
-        nfc: "\u{BB09}",
-        nfd: "\u{1106}\u{116C}\u{11B4}",
-        nfkc: "\u{BB09}",
-        nfkd: "\u{1106}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BB0A}",
-        nfc: "\u{BB0A}",
-        nfd: "\u{1106}\u{116C}\u{11B5}",
-        nfkc: "\u{BB0A}",
-        nfkd: "\u{1106}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB0B}",
-        nfc: "\u{BB0B}",
-        nfd: "\u{1106}\u{116C}\u{11B6}",
-        nfkc: "\u{BB0B}",
-        nfkd: "\u{1106}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BB0C}",
-        nfc: "\u{BB0C}",
-        nfd: "\u{1106}\u{116C}\u{11B7}",
-        nfkc: "\u{BB0C}",
-        nfkd: "\u{1106}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BB0D}",
-        nfc: "\u{BB0D}",
-        nfd: "\u{1106}\u{116C}\u{11B8}",
-        nfkc: "\u{BB0D}",
-        nfkd: "\u{1106}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BB0E}",
-        nfc: "\u{BB0E}",
-        nfd: "\u{1106}\u{116C}\u{11B9}",
-        nfkc: "\u{BB0E}",
-        nfkd: "\u{1106}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BB0F}",
-        nfc: "\u{BB0F}",
-        nfd: "\u{1106}\u{116C}\u{11BA}",
-        nfkc: "\u{BB0F}",
-        nfkd: "\u{1106}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BB10}",
-        nfc: "\u{BB10}",
-        nfd: "\u{1106}\u{116C}\u{11BB}",
-        nfkc: "\u{BB10}",
-        nfkd: "\u{1106}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BB11}",
-        nfc: "\u{BB11}",
-        nfd: "\u{1106}\u{116C}\u{11BC}",
-        nfkc: "\u{BB11}",
-        nfkd: "\u{1106}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BB12}",
-        nfc: "\u{BB12}",
-        nfd: "\u{1106}\u{116C}\u{11BD}",
-        nfkc: "\u{BB12}",
-        nfkd: "\u{1106}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BB13}",
-        nfc: "\u{BB13}",
-        nfd: "\u{1106}\u{116C}\u{11BE}",
-        nfkc: "\u{BB13}",
-        nfkd: "\u{1106}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BB14}",
-        nfc: "\u{BB14}",
-        nfd: "\u{1106}\u{116C}\u{11BF}",
-        nfkc: "\u{BB14}",
-        nfkd: "\u{1106}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BB15}",
-        nfc: "\u{BB15}",
-        nfd: "\u{1106}\u{116C}\u{11C0}",
-        nfkc: "\u{BB15}",
-        nfkd: "\u{1106}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BB16}",
-        nfc: "\u{BB16}",
-        nfd: "\u{1106}\u{116C}\u{11C1}",
-        nfkc: "\u{BB16}",
-        nfkd: "\u{1106}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BB17}",
-        nfc: "\u{BB17}",
-        nfd: "\u{1106}\u{116C}\u{11C2}",
-        nfkc: "\u{BB17}",
-        nfkd: "\u{1106}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BB18}",
-        nfc: "\u{BB18}",
-        nfd: "\u{1106}\u{116D}",
-        nfkc: "\u{BB18}",
-        nfkd: "\u{1106}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{BB19}",
-        nfc: "\u{BB19}",
-        nfd: "\u{1106}\u{116D}\u{11A8}",
-        nfkc: "\u{BB19}",
-        nfkd: "\u{1106}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BB1A}",
-        nfc: "\u{BB1A}",
-        nfd: "\u{1106}\u{116D}\u{11A9}",
-        nfkc: "\u{BB1A}",
-        nfkd: "\u{1106}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BB1B}",
-        nfc: "\u{BB1B}",
-        nfd: "\u{1106}\u{116D}\u{11AA}",
-        nfkc: "\u{BB1B}",
-        nfkd: "\u{1106}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BB1C}",
-        nfc: "\u{BB1C}",
-        nfd: "\u{1106}\u{116D}\u{11AB}",
-        nfkc: "\u{BB1C}",
-        nfkd: "\u{1106}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BB1D}",
-        nfc: "\u{BB1D}",
-        nfd: "\u{1106}\u{116D}\u{11AC}",
-        nfkc: "\u{BB1D}",
-        nfkd: "\u{1106}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BB1E}",
-        nfc: "\u{BB1E}",
-        nfd: "\u{1106}\u{116D}\u{11AD}",
-        nfkc: "\u{BB1E}",
-        nfkd: "\u{1106}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BB1F}",
-        nfc: "\u{BB1F}",
-        nfd: "\u{1106}\u{116D}\u{11AE}",
-        nfkc: "\u{BB1F}",
-        nfkd: "\u{1106}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BB20}",
-        nfc: "\u{BB20}",
-        nfd: "\u{1106}\u{116D}\u{11AF}",
-        nfkc: "\u{BB20}",
-        nfkd: "\u{1106}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BB21}",
-        nfc: "\u{BB21}",
-        nfd: "\u{1106}\u{116D}\u{11B0}",
-        nfkc: "\u{BB21}",
-        nfkd: "\u{1106}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BB22}",
-        nfc: "\u{BB22}",
-        nfd: "\u{1106}\u{116D}\u{11B1}",
-        nfkc: "\u{BB22}",
-        nfkd: "\u{1106}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BB23}",
-        nfc: "\u{BB23}",
-        nfd: "\u{1106}\u{116D}\u{11B2}",
-        nfkc: "\u{BB23}",
-        nfkd: "\u{1106}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BB24}",
-        nfc: "\u{BB24}",
-        nfd: "\u{1106}\u{116D}\u{11B3}",
-        nfkc: "\u{BB24}",
-        nfkd: "\u{1106}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BB25}",
-        nfc: "\u{BB25}",
-        nfd: "\u{1106}\u{116D}\u{11B4}",
-        nfkc: "\u{BB25}",
-        nfkd: "\u{1106}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BB26}",
-        nfc: "\u{BB26}",
-        nfd: "\u{1106}\u{116D}\u{11B5}",
-        nfkc: "\u{BB26}",
-        nfkd: "\u{1106}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB27}",
-        nfc: "\u{BB27}",
-        nfd: "\u{1106}\u{116D}\u{11B6}",
-        nfkc: "\u{BB27}",
-        nfkd: "\u{1106}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BB28}",
-        nfc: "\u{BB28}",
-        nfd: "\u{1106}\u{116D}\u{11B7}",
-        nfkc: "\u{BB28}",
-        nfkd: "\u{1106}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BB29}",
-        nfc: "\u{BB29}",
-        nfd: "\u{1106}\u{116D}\u{11B8}",
-        nfkc: "\u{BB29}",
-        nfkd: "\u{1106}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BB2A}",
-        nfc: "\u{BB2A}",
-        nfd: "\u{1106}\u{116D}\u{11B9}",
-        nfkc: "\u{BB2A}",
-        nfkd: "\u{1106}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BB2B}",
-        nfc: "\u{BB2B}",
-        nfd: "\u{1106}\u{116D}\u{11BA}",
-        nfkc: "\u{BB2B}",
-        nfkd: "\u{1106}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BB2C}",
-        nfc: "\u{BB2C}",
-        nfd: "\u{1106}\u{116D}\u{11BB}",
-        nfkc: "\u{BB2C}",
-        nfkd: "\u{1106}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BB2D}",
-        nfc: "\u{BB2D}",
-        nfd: "\u{1106}\u{116D}\u{11BC}",
-        nfkc: "\u{BB2D}",
-        nfkd: "\u{1106}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BB2E}",
-        nfc: "\u{BB2E}",
-        nfd: "\u{1106}\u{116D}\u{11BD}",
-        nfkc: "\u{BB2E}",
-        nfkd: "\u{1106}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BB2F}",
-        nfc: "\u{BB2F}",
-        nfd: "\u{1106}\u{116D}\u{11BE}",
-        nfkc: "\u{BB2F}",
-        nfkd: "\u{1106}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BB30}",
-        nfc: "\u{BB30}",
-        nfd: "\u{1106}\u{116D}\u{11BF}",
-        nfkc: "\u{BB30}",
-        nfkd: "\u{1106}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BB31}",
-        nfc: "\u{BB31}",
-        nfd: "\u{1106}\u{116D}\u{11C0}",
-        nfkc: "\u{BB31}",
-        nfkd: "\u{1106}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BB32}",
-        nfc: "\u{BB32}",
-        nfd: "\u{1106}\u{116D}\u{11C1}",
-        nfkc: "\u{BB32}",
-        nfkd: "\u{1106}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BB33}",
-        nfc: "\u{BB33}",
-        nfd: "\u{1106}\u{116D}\u{11C2}",
-        nfkc: "\u{BB33}",
-        nfkd: "\u{1106}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BB34}",
-        nfc: "\u{BB34}",
-        nfd: "\u{1106}\u{116E}",
-        nfkc: "\u{BB34}",
-        nfkd: "\u{1106}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{BB35}",
-        nfc: "\u{BB35}",
-        nfd: "\u{1106}\u{116E}\u{11A8}",
-        nfkc: "\u{BB35}",
-        nfkd: "\u{1106}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BB36}",
-        nfc: "\u{BB36}",
-        nfd: "\u{1106}\u{116E}\u{11A9}",
-        nfkc: "\u{BB36}",
-        nfkd: "\u{1106}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BB37}",
-        nfc: "\u{BB37}",
-        nfd: "\u{1106}\u{116E}\u{11AA}",
-        nfkc: "\u{BB37}",
-        nfkd: "\u{1106}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BB38}",
-        nfc: "\u{BB38}",
-        nfd: "\u{1106}\u{116E}\u{11AB}",
-        nfkc: "\u{BB38}",
-        nfkd: "\u{1106}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BB39}",
-        nfc: "\u{BB39}",
-        nfd: "\u{1106}\u{116E}\u{11AC}",
-        nfkc: "\u{BB39}",
-        nfkd: "\u{1106}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BB3A}",
-        nfc: "\u{BB3A}",
-        nfd: "\u{1106}\u{116E}\u{11AD}",
-        nfkc: "\u{BB3A}",
-        nfkd: "\u{1106}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BB3B}",
-        nfc: "\u{BB3B}",
-        nfd: "\u{1106}\u{116E}\u{11AE}",
-        nfkc: "\u{BB3B}",
-        nfkd: "\u{1106}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BB3C}",
-        nfc: "\u{BB3C}",
-        nfd: "\u{1106}\u{116E}\u{11AF}",
-        nfkc: "\u{BB3C}",
-        nfkd: "\u{1106}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BB3D}",
-        nfc: "\u{BB3D}",
-        nfd: "\u{1106}\u{116E}\u{11B0}",
-        nfkc: "\u{BB3D}",
-        nfkd: "\u{1106}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BB3E}",
-        nfc: "\u{BB3E}",
-        nfd: "\u{1106}\u{116E}\u{11B1}",
-        nfkc: "\u{BB3E}",
-        nfkd: "\u{1106}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BB3F}",
-        nfc: "\u{BB3F}",
-        nfd: "\u{1106}\u{116E}\u{11B2}",
-        nfkc: "\u{BB3F}",
-        nfkd: "\u{1106}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BB40}",
-        nfc: "\u{BB40}",
-        nfd: "\u{1106}\u{116E}\u{11B3}",
-        nfkc: "\u{BB40}",
-        nfkd: "\u{1106}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BB41}",
-        nfc: "\u{BB41}",
-        nfd: "\u{1106}\u{116E}\u{11B4}",
-        nfkc: "\u{BB41}",
-        nfkd: "\u{1106}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BB42}",
-        nfc: "\u{BB42}",
-        nfd: "\u{1106}\u{116E}\u{11B5}",
-        nfkc: "\u{BB42}",
-        nfkd: "\u{1106}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB43}",
-        nfc: "\u{BB43}",
-        nfd: "\u{1106}\u{116E}\u{11B6}",
-        nfkc: "\u{BB43}",
-        nfkd: "\u{1106}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BB44}",
-        nfc: "\u{BB44}",
-        nfd: "\u{1106}\u{116E}\u{11B7}",
-        nfkc: "\u{BB44}",
-        nfkd: "\u{1106}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BB45}",
-        nfc: "\u{BB45}",
-        nfd: "\u{1106}\u{116E}\u{11B8}",
-        nfkc: "\u{BB45}",
-        nfkd: "\u{1106}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BB46}",
-        nfc: "\u{BB46}",
-        nfd: "\u{1106}\u{116E}\u{11B9}",
-        nfkc: "\u{BB46}",
-        nfkd: "\u{1106}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BB47}",
-        nfc: "\u{BB47}",
-        nfd: "\u{1106}\u{116E}\u{11BA}",
-        nfkc: "\u{BB47}",
-        nfkd: "\u{1106}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BB48}",
-        nfc: "\u{BB48}",
-        nfd: "\u{1106}\u{116E}\u{11BB}",
-        nfkc: "\u{BB48}",
-        nfkd: "\u{1106}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BB49}",
-        nfc: "\u{BB49}",
-        nfd: "\u{1106}\u{116E}\u{11BC}",
-        nfkc: "\u{BB49}",
-        nfkd: "\u{1106}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BB4A}",
-        nfc: "\u{BB4A}",
-        nfd: "\u{1106}\u{116E}\u{11BD}",
-        nfkc: "\u{BB4A}",
-        nfkd: "\u{1106}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BB4B}",
-        nfc: "\u{BB4B}",
-        nfd: "\u{1106}\u{116E}\u{11BE}",
-        nfkc: "\u{BB4B}",
-        nfkd: "\u{1106}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BB4C}",
-        nfc: "\u{BB4C}",
-        nfd: "\u{1106}\u{116E}\u{11BF}",
-        nfkc: "\u{BB4C}",
-        nfkd: "\u{1106}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BB4D}",
-        nfc: "\u{BB4D}",
-        nfd: "\u{1106}\u{116E}\u{11C0}",
-        nfkc: "\u{BB4D}",
-        nfkd: "\u{1106}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BB4E}",
-        nfc: "\u{BB4E}",
-        nfd: "\u{1106}\u{116E}\u{11C1}",
-        nfkc: "\u{BB4E}",
-        nfkd: "\u{1106}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BB4F}",
-        nfc: "\u{BB4F}",
-        nfd: "\u{1106}\u{116E}\u{11C2}",
-        nfkc: "\u{BB4F}",
-        nfkd: "\u{1106}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BB50}",
-        nfc: "\u{BB50}",
-        nfd: "\u{1106}\u{116F}",
-        nfkc: "\u{BB50}",
-        nfkd: "\u{1106}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{BB51}",
-        nfc: "\u{BB51}",
-        nfd: "\u{1106}\u{116F}\u{11A8}",
-        nfkc: "\u{BB51}",
-        nfkd: "\u{1106}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BB52}",
-        nfc: "\u{BB52}",
-        nfd: "\u{1106}\u{116F}\u{11A9}",
-        nfkc: "\u{BB52}",
-        nfkd: "\u{1106}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BB53}",
-        nfc: "\u{BB53}",
-        nfd: "\u{1106}\u{116F}\u{11AA}",
-        nfkc: "\u{BB53}",
-        nfkd: "\u{1106}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BB54}",
-        nfc: "\u{BB54}",
-        nfd: "\u{1106}\u{116F}\u{11AB}",
-        nfkc: "\u{BB54}",
-        nfkd: "\u{1106}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BB55}",
-        nfc: "\u{BB55}",
-        nfd: "\u{1106}\u{116F}\u{11AC}",
-        nfkc: "\u{BB55}",
-        nfkd: "\u{1106}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BB56}",
-        nfc: "\u{BB56}",
-        nfd: "\u{1106}\u{116F}\u{11AD}",
-        nfkc: "\u{BB56}",
-        nfkd: "\u{1106}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BB57}",
-        nfc: "\u{BB57}",
-        nfd: "\u{1106}\u{116F}\u{11AE}",
-        nfkc: "\u{BB57}",
-        nfkd: "\u{1106}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BB58}",
-        nfc: "\u{BB58}",
-        nfd: "\u{1106}\u{116F}\u{11AF}",
-        nfkc: "\u{BB58}",
-        nfkd: "\u{1106}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BB59}",
-        nfc: "\u{BB59}",
-        nfd: "\u{1106}\u{116F}\u{11B0}",
-        nfkc: "\u{BB59}",
-        nfkd: "\u{1106}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BB5A}",
-        nfc: "\u{BB5A}",
-        nfd: "\u{1106}\u{116F}\u{11B1}",
-        nfkc: "\u{BB5A}",
-        nfkd: "\u{1106}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BB5B}",
-        nfc: "\u{BB5B}",
-        nfd: "\u{1106}\u{116F}\u{11B2}",
-        nfkc: "\u{BB5B}",
-        nfkd: "\u{1106}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BB5C}",
-        nfc: "\u{BB5C}",
-        nfd: "\u{1106}\u{116F}\u{11B3}",
-        nfkc: "\u{BB5C}",
-        nfkd: "\u{1106}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BB5D}",
-        nfc: "\u{BB5D}",
-        nfd: "\u{1106}\u{116F}\u{11B4}",
-        nfkc: "\u{BB5D}",
-        nfkd: "\u{1106}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BB5E}",
-        nfc: "\u{BB5E}",
-        nfd: "\u{1106}\u{116F}\u{11B5}",
-        nfkc: "\u{BB5E}",
-        nfkd: "\u{1106}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB5F}",
-        nfc: "\u{BB5F}",
-        nfd: "\u{1106}\u{116F}\u{11B6}",
-        nfkc: "\u{BB5F}",
-        nfkd: "\u{1106}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BB60}",
-        nfc: "\u{BB60}",
-        nfd: "\u{1106}\u{116F}\u{11B7}",
-        nfkc: "\u{BB60}",
-        nfkd: "\u{1106}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BB61}",
-        nfc: "\u{BB61}",
-        nfd: "\u{1106}\u{116F}\u{11B8}",
-        nfkc: "\u{BB61}",
-        nfkd: "\u{1106}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BB62}",
-        nfc: "\u{BB62}",
-        nfd: "\u{1106}\u{116F}\u{11B9}",
-        nfkc: "\u{BB62}",
-        nfkd: "\u{1106}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BB63}",
-        nfc: "\u{BB63}",
-        nfd: "\u{1106}\u{116F}\u{11BA}",
-        nfkc: "\u{BB63}",
-        nfkd: "\u{1106}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BB64}",
-        nfc: "\u{BB64}",
-        nfd: "\u{1106}\u{116F}\u{11BB}",
-        nfkc: "\u{BB64}",
-        nfkd: "\u{1106}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BB65}",
-        nfc: "\u{BB65}",
-        nfd: "\u{1106}\u{116F}\u{11BC}",
-        nfkc: "\u{BB65}",
-        nfkd: "\u{1106}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BB66}",
-        nfc: "\u{BB66}",
-        nfd: "\u{1106}\u{116F}\u{11BD}",
-        nfkc: "\u{BB66}",
-        nfkd: "\u{1106}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BB67}",
-        nfc: "\u{BB67}",
-        nfd: "\u{1106}\u{116F}\u{11BE}",
-        nfkc: "\u{BB67}",
-        nfkd: "\u{1106}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BB68}",
-        nfc: "\u{BB68}",
-        nfd: "\u{1106}\u{116F}\u{11BF}",
-        nfkc: "\u{BB68}",
-        nfkd: "\u{1106}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BB69}",
-        nfc: "\u{BB69}",
-        nfd: "\u{1106}\u{116F}\u{11C0}",
-        nfkc: "\u{BB69}",
-        nfkd: "\u{1106}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BB6A}",
-        nfc: "\u{BB6A}",
-        nfd: "\u{1106}\u{116F}\u{11C1}",
-        nfkc: "\u{BB6A}",
-        nfkd: "\u{1106}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BB6B}",
-        nfc: "\u{BB6B}",
-        nfd: "\u{1106}\u{116F}\u{11C2}",
-        nfkc: "\u{BB6B}",
-        nfkd: "\u{1106}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BB6C}",
-        nfc: "\u{BB6C}",
-        nfd: "\u{1106}\u{1170}",
-        nfkc: "\u{BB6C}",
-        nfkd: "\u{1106}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{BB6D}",
-        nfc: "\u{BB6D}",
-        nfd: "\u{1106}\u{1170}\u{11A8}",
-        nfkc: "\u{BB6D}",
-        nfkd: "\u{1106}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BB6E}",
-        nfc: "\u{BB6E}",
-        nfd: "\u{1106}\u{1170}\u{11A9}",
-        nfkc: "\u{BB6E}",
-        nfkd: "\u{1106}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BB6F}",
-        nfc: "\u{BB6F}",
-        nfd: "\u{1106}\u{1170}\u{11AA}",
-        nfkc: "\u{BB6F}",
-        nfkd: "\u{1106}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BB70}",
-        nfc: "\u{BB70}",
-        nfd: "\u{1106}\u{1170}\u{11AB}",
-        nfkc: "\u{BB70}",
-        nfkd: "\u{1106}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BB71}",
-        nfc: "\u{BB71}",
-        nfd: "\u{1106}\u{1170}\u{11AC}",
-        nfkc: "\u{BB71}",
-        nfkd: "\u{1106}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BB72}",
-        nfc: "\u{BB72}",
-        nfd: "\u{1106}\u{1170}\u{11AD}",
-        nfkc: "\u{BB72}",
-        nfkd: "\u{1106}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BB73}",
-        nfc: "\u{BB73}",
-        nfd: "\u{1106}\u{1170}\u{11AE}",
-        nfkc: "\u{BB73}",
-        nfkd: "\u{1106}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BB74}",
-        nfc: "\u{BB74}",
-        nfd: "\u{1106}\u{1170}\u{11AF}",
-        nfkc: "\u{BB74}",
-        nfkd: "\u{1106}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BB75}",
-        nfc: "\u{BB75}",
-        nfd: "\u{1106}\u{1170}\u{11B0}",
-        nfkc: "\u{BB75}",
-        nfkd: "\u{1106}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BB76}",
-        nfc: "\u{BB76}",
-        nfd: "\u{1106}\u{1170}\u{11B1}",
-        nfkc: "\u{BB76}",
-        nfkd: "\u{1106}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BB77}",
-        nfc: "\u{BB77}",
-        nfd: "\u{1106}\u{1170}\u{11B2}",
-        nfkc: "\u{BB77}",
-        nfkd: "\u{1106}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BB78}",
-        nfc: "\u{BB78}",
-        nfd: "\u{1106}\u{1170}\u{11B3}",
-        nfkc: "\u{BB78}",
-        nfkd: "\u{1106}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BB79}",
-        nfc: "\u{BB79}",
-        nfd: "\u{1106}\u{1170}\u{11B4}",
-        nfkc: "\u{BB79}",
-        nfkd: "\u{1106}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BB7A}",
-        nfc: "\u{BB7A}",
-        nfd: "\u{1106}\u{1170}\u{11B5}",
-        nfkc: "\u{BB7A}",
-        nfkd: "\u{1106}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB7B}",
-        nfc: "\u{BB7B}",
-        nfd: "\u{1106}\u{1170}\u{11B6}",
-        nfkc: "\u{BB7B}",
-        nfkd: "\u{1106}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BB7C}",
-        nfc: "\u{BB7C}",
-        nfd: "\u{1106}\u{1170}\u{11B7}",
-        nfkc: "\u{BB7C}",
-        nfkd: "\u{1106}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BB7D}",
-        nfc: "\u{BB7D}",
-        nfd: "\u{1106}\u{1170}\u{11B8}",
-        nfkc: "\u{BB7D}",
-        nfkd: "\u{1106}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BB7E}",
-        nfc: "\u{BB7E}",
-        nfd: "\u{1106}\u{1170}\u{11B9}",
-        nfkc: "\u{BB7E}",
-        nfkd: "\u{1106}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BB7F}",
-        nfc: "\u{BB7F}",
-        nfd: "\u{1106}\u{1170}\u{11BA}",
-        nfkc: "\u{BB7F}",
-        nfkd: "\u{1106}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BB80}",
-        nfc: "\u{BB80}",
-        nfd: "\u{1106}\u{1170}\u{11BB}",
-        nfkc: "\u{BB80}",
-        nfkd: "\u{1106}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BB81}",
-        nfc: "\u{BB81}",
-        nfd: "\u{1106}\u{1170}\u{11BC}",
-        nfkc: "\u{BB81}",
-        nfkd: "\u{1106}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BB82}",
-        nfc: "\u{BB82}",
-        nfd: "\u{1106}\u{1170}\u{11BD}",
-        nfkc: "\u{BB82}",
-        nfkd: "\u{1106}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BB83}",
-        nfc: "\u{BB83}",
-        nfd: "\u{1106}\u{1170}\u{11BE}",
-        nfkc: "\u{BB83}",
-        nfkd: "\u{1106}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BB84}",
-        nfc: "\u{BB84}",
-        nfd: "\u{1106}\u{1170}\u{11BF}",
-        nfkc: "\u{BB84}",
-        nfkd: "\u{1106}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BB85}",
-        nfc: "\u{BB85}",
-        nfd: "\u{1106}\u{1170}\u{11C0}",
-        nfkc: "\u{BB85}",
-        nfkd: "\u{1106}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BB86}",
-        nfc: "\u{BB86}",
-        nfd: "\u{1106}\u{1170}\u{11C1}",
-        nfkc: "\u{BB86}",
-        nfkd: "\u{1106}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BB87}",
-        nfc: "\u{BB87}",
-        nfd: "\u{1106}\u{1170}\u{11C2}",
-        nfkc: "\u{BB87}",
-        nfkd: "\u{1106}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BB88}",
-        nfc: "\u{BB88}",
-        nfd: "\u{1106}\u{1171}",
-        nfkc: "\u{BB88}",
-        nfkd: "\u{1106}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{BB89}",
-        nfc: "\u{BB89}",
-        nfd: "\u{1106}\u{1171}\u{11A8}",
-        nfkc: "\u{BB89}",
-        nfkd: "\u{1106}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BB8A}",
-        nfc: "\u{BB8A}",
-        nfd: "\u{1106}\u{1171}\u{11A9}",
-        nfkc: "\u{BB8A}",
-        nfkd: "\u{1106}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BB8B}",
-        nfc: "\u{BB8B}",
-        nfd: "\u{1106}\u{1171}\u{11AA}",
-        nfkc: "\u{BB8B}",
-        nfkd: "\u{1106}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BB8C}",
-        nfc: "\u{BB8C}",
-        nfd: "\u{1106}\u{1171}\u{11AB}",
-        nfkc: "\u{BB8C}",
-        nfkd: "\u{1106}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BB8D}",
-        nfc: "\u{BB8D}",
-        nfd: "\u{1106}\u{1171}\u{11AC}",
-        nfkc: "\u{BB8D}",
-        nfkd: "\u{1106}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BB8E}",
-        nfc: "\u{BB8E}",
-        nfd: "\u{1106}\u{1171}\u{11AD}",
-        nfkc: "\u{BB8E}",
-        nfkd: "\u{1106}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BB8F}",
-        nfc: "\u{BB8F}",
-        nfd: "\u{1106}\u{1171}\u{11AE}",
-        nfkc: "\u{BB8F}",
-        nfkd: "\u{1106}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BB90}",
-        nfc: "\u{BB90}",
-        nfd: "\u{1106}\u{1171}\u{11AF}",
-        nfkc: "\u{BB90}",
-        nfkd: "\u{1106}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BB91}",
-        nfc: "\u{BB91}",
-        nfd: "\u{1106}\u{1171}\u{11B0}",
-        nfkc: "\u{BB91}",
-        nfkd: "\u{1106}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BB92}",
-        nfc: "\u{BB92}",
-        nfd: "\u{1106}\u{1171}\u{11B1}",
-        nfkc: "\u{BB92}",
-        nfkd: "\u{1106}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BB93}",
-        nfc: "\u{BB93}",
-        nfd: "\u{1106}\u{1171}\u{11B2}",
-        nfkc: "\u{BB93}",
-        nfkd: "\u{1106}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BB94}",
-        nfc: "\u{BB94}",
-        nfd: "\u{1106}\u{1171}\u{11B3}",
-        nfkc: "\u{BB94}",
-        nfkd: "\u{1106}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BB95}",
-        nfc: "\u{BB95}",
-        nfd: "\u{1106}\u{1171}\u{11B4}",
-        nfkc: "\u{BB95}",
-        nfkd: "\u{1106}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BB96}",
-        nfc: "\u{BB96}",
-        nfd: "\u{1106}\u{1171}\u{11B5}",
-        nfkc: "\u{BB96}",
-        nfkd: "\u{1106}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB97}",
-        nfc: "\u{BB97}",
-        nfd: "\u{1106}\u{1171}\u{11B6}",
-        nfkc: "\u{BB97}",
-        nfkd: "\u{1106}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BB98}",
-        nfc: "\u{BB98}",
-        nfd: "\u{1106}\u{1171}\u{11B7}",
-        nfkc: "\u{BB98}",
-        nfkd: "\u{1106}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BB99}",
-        nfc: "\u{BB99}",
-        nfd: "\u{1106}\u{1171}\u{11B8}",
-        nfkc: "\u{BB99}",
-        nfkd: "\u{1106}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BB9A}",
-        nfc: "\u{BB9A}",
-        nfd: "\u{1106}\u{1171}\u{11B9}",
-        nfkc: "\u{BB9A}",
-        nfkd: "\u{1106}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BB9B}",
-        nfc: "\u{BB9B}",
-        nfd: "\u{1106}\u{1171}\u{11BA}",
-        nfkc: "\u{BB9B}",
-        nfkd: "\u{1106}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BB9C}",
-        nfc: "\u{BB9C}",
-        nfd: "\u{1106}\u{1171}\u{11BB}",
-        nfkc: "\u{BB9C}",
-        nfkd: "\u{1106}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BB9D}",
-        nfc: "\u{BB9D}",
-        nfd: "\u{1106}\u{1171}\u{11BC}",
-        nfkc: "\u{BB9D}",
-        nfkd: "\u{1106}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BB9E}",
-        nfc: "\u{BB9E}",
-        nfd: "\u{1106}\u{1171}\u{11BD}",
-        nfkc: "\u{BB9E}",
-        nfkd: "\u{1106}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BB9F}",
-        nfc: "\u{BB9F}",
-        nfd: "\u{1106}\u{1171}\u{11BE}",
-        nfkc: "\u{BB9F}",
-        nfkd: "\u{1106}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BBA0}",
-        nfc: "\u{BBA0}",
-        nfd: "\u{1106}\u{1171}\u{11BF}",
-        nfkc: "\u{BBA0}",
-        nfkd: "\u{1106}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BBA1}",
-        nfc: "\u{BBA1}",
-        nfd: "\u{1106}\u{1171}\u{11C0}",
-        nfkc: "\u{BBA1}",
-        nfkd: "\u{1106}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BBA2}",
-        nfc: "\u{BBA2}",
-        nfd: "\u{1106}\u{1171}\u{11C1}",
-        nfkc: "\u{BBA2}",
-        nfkd: "\u{1106}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BBA3}",
-        nfc: "\u{BBA3}",
-        nfd: "\u{1106}\u{1171}\u{11C2}",
-        nfkc: "\u{BBA3}",
-        nfkd: "\u{1106}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BBA4}",
-        nfc: "\u{BBA4}",
-        nfd: "\u{1106}\u{1172}",
-        nfkc: "\u{BBA4}",
-        nfkd: "\u{1106}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{BBA5}",
-        nfc: "\u{BBA5}",
-        nfd: "\u{1106}\u{1172}\u{11A8}",
-        nfkc: "\u{BBA5}",
-        nfkd: "\u{1106}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BBA6}",
-        nfc: "\u{BBA6}",
-        nfd: "\u{1106}\u{1172}\u{11A9}",
-        nfkc: "\u{BBA6}",
-        nfkd: "\u{1106}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BBA7}",
-        nfc: "\u{BBA7}",
-        nfd: "\u{1106}\u{1172}\u{11AA}",
-        nfkc: "\u{BBA7}",
-        nfkd: "\u{1106}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BBA8}",
-        nfc: "\u{BBA8}",
-        nfd: "\u{1106}\u{1172}\u{11AB}",
-        nfkc: "\u{BBA8}",
-        nfkd: "\u{1106}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BBA9}",
-        nfc: "\u{BBA9}",
-        nfd: "\u{1106}\u{1172}\u{11AC}",
-        nfkc: "\u{BBA9}",
-        nfkd: "\u{1106}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BBAA}",
-        nfc: "\u{BBAA}",
-        nfd: "\u{1106}\u{1172}\u{11AD}",
-        nfkc: "\u{BBAA}",
-        nfkd: "\u{1106}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BBAB}",
-        nfc: "\u{BBAB}",
-        nfd: "\u{1106}\u{1172}\u{11AE}",
-        nfkc: "\u{BBAB}",
-        nfkd: "\u{1106}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BBAC}",
-        nfc: "\u{BBAC}",
-        nfd: "\u{1106}\u{1172}\u{11AF}",
-        nfkc: "\u{BBAC}",
-        nfkd: "\u{1106}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BBAD}",
-        nfc: "\u{BBAD}",
-        nfd: "\u{1106}\u{1172}\u{11B0}",
-        nfkc: "\u{BBAD}",
-        nfkd: "\u{1106}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BBAE}",
-        nfc: "\u{BBAE}",
-        nfd: "\u{1106}\u{1172}\u{11B1}",
-        nfkc: "\u{BBAE}",
-        nfkd: "\u{1106}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BBAF}",
-        nfc: "\u{BBAF}",
-        nfd: "\u{1106}\u{1172}\u{11B2}",
-        nfkc: "\u{BBAF}",
-        nfkd: "\u{1106}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BBB0}",
-        nfc: "\u{BBB0}",
-        nfd: "\u{1106}\u{1172}\u{11B3}",
-        nfkc: "\u{BBB0}",
-        nfkd: "\u{1106}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BBB1}",
-        nfc: "\u{BBB1}",
-        nfd: "\u{1106}\u{1172}\u{11B4}",
-        nfkc: "\u{BBB1}",
-        nfkd: "\u{1106}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BBB2}",
-        nfc: "\u{BBB2}",
-        nfd: "\u{1106}\u{1172}\u{11B5}",
-        nfkc: "\u{BBB2}",
-        nfkd: "\u{1106}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BBB3}",
-        nfc: "\u{BBB3}",
-        nfd: "\u{1106}\u{1172}\u{11B6}",
-        nfkc: "\u{BBB3}",
-        nfkd: "\u{1106}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BBB4}",
-        nfc: "\u{BBB4}",
-        nfd: "\u{1106}\u{1172}\u{11B7}",
-        nfkc: "\u{BBB4}",
-        nfkd: "\u{1106}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BBB5}",
-        nfc: "\u{BBB5}",
-        nfd: "\u{1106}\u{1172}\u{11B8}",
-        nfkc: "\u{BBB5}",
-        nfkd: "\u{1106}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BBB6}",
-        nfc: "\u{BBB6}",
-        nfd: "\u{1106}\u{1172}\u{11B9}",
-        nfkc: "\u{BBB6}",
-        nfkd: "\u{1106}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BBB7}",
-        nfc: "\u{BBB7}",
-        nfd: "\u{1106}\u{1172}\u{11BA}",
-        nfkc: "\u{BBB7}",
-        nfkd: "\u{1106}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BBB8}",
-        nfc: "\u{BBB8}",
-        nfd: "\u{1106}\u{1172}\u{11BB}",
-        nfkc: "\u{BBB8}",
-        nfkd: "\u{1106}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BBB9}",
-        nfc: "\u{BBB9}",
-        nfd: "\u{1106}\u{1172}\u{11BC}",
-        nfkc: "\u{BBB9}",
-        nfkd: "\u{1106}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BBBA}",
-        nfc: "\u{BBBA}",
-        nfd: "\u{1106}\u{1172}\u{11BD}",
-        nfkc: "\u{BBBA}",
-        nfkd: "\u{1106}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BBBB}",
-        nfc: "\u{BBBB}",
-        nfd: "\u{1106}\u{1172}\u{11BE}",
-        nfkc: "\u{BBBB}",
-        nfkd: "\u{1106}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BBBC}",
-        nfc: "\u{BBBC}",
-        nfd: "\u{1106}\u{1172}\u{11BF}",
-        nfkc: "\u{BBBC}",
-        nfkd: "\u{1106}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BBBD}",
-        nfc: "\u{BBBD}",
-        nfd: "\u{1106}\u{1172}\u{11C0}",
-        nfkc: "\u{BBBD}",
-        nfkd: "\u{1106}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BBBE}",
-        nfc: "\u{BBBE}",
-        nfd: "\u{1106}\u{1172}\u{11C1}",
-        nfkc: "\u{BBBE}",
-        nfkd: "\u{1106}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BBBF}",
-        nfc: "\u{BBBF}",
-        nfd: "\u{1106}\u{1172}\u{11C2}",
-        nfkc: "\u{BBBF}",
-        nfkd: "\u{1106}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BBC0}",
-        nfc: "\u{BBC0}",
-        nfd: "\u{1106}\u{1173}",
-        nfkc: "\u{BBC0}",
-        nfkd: "\u{1106}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{BBC1}",
-        nfc: "\u{BBC1}",
-        nfd: "\u{1106}\u{1173}\u{11A8}",
-        nfkc: "\u{BBC1}",
-        nfkd: "\u{1106}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BBC2}",
-        nfc: "\u{BBC2}",
-        nfd: "\u{1106}\u{1173}\u{11A9}",
-        nfkc: "\u{BBC2}",
-        nfkd: "\u{1106}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BBC3}",
-        nfc: "\u{BBC3}",
-        nfd: "\u{1106}\u{1173}\u{11AA}",
-        nfkc: "\u{BBC3}",
-        nfkd: "\u{1106}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BBC4}",
-        nfc: "\u{BBC4}",
-        nfd: "\u{1106}\u{1173}\u{11AB}",
-        nfkc: "\u{BBC4}",
-        nfkd: "\u{1106}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BBC5}",
-        nfc: "\u{BBC5}",
-        nfd: "\u{1106}\u{1173}\u{11AC}",
-        nfkc: "\u{BBC5}",
-        nfkd: "\u{1106}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BBC6}",
-        nfc: "\u{BBC6}",
-        nfd: "\u{1106}\u{1173}\u{11AD}",
-        nfkc: "\u{BBC6}",
-        nfkd: "\u{1106}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BBC7}",
-        nfc: "\u{BBC7}",
-        nfd: "\u{1106}\u{1173}\u{11AE}",
-        nfkc: "\u{BBC7}",
-        nfkd: "\u{1106}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BBC8}",
-        nfc: "\u{BBC8}",
-        nfd: "\u{1106}\u{1173}\u{11AF}",
-        nfkc: "\u{BBC8}",
-        nfkd: "\u{1106}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BBC9}",
-        nfc: "\u{BBC9}",
-        nfd: "\u{1106}\u{1173}\u{11B0}",
-        nfkc: "\u{BBC9}",
-        nfkd: "\u{1106}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BBCA}",
-        nfc: "\u{BBCA}",
-        nfd: "\u{1106}\u{1173}\u{11B1}",
-        nfkc: "\u{BBCA}",
-        nfkd: "\u{1106}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BBCB}",
-        nfc: "\u{BBCB}",
-        nfd: "\u{1106}\u{1173}\u{11B2}",
-        nfkc: "\u{BBCB}",
-        nfkd: "\u{1106}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BBCC}",
-        nfc: "\u{BBCC}",
-        nfd: "\u{1106}\u{1173}\u{11B3}",
-        nfkc: "\u{BBCC}",
-        nfkd: "\u{1106}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BBCD}",
-        nfc: "\u{BBCD}",
-        nfd: "\u{1106}\u{1173}\u{11B4}",
-        nfkc: "\u{BBCD}",
-        nfkd: "\u{1106}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BBCE}",
-        nfc: "\u{BBCE}",
-        nfd: "\u{1106}\u{1173}\u{11B5}",
-        nfkc: "\u{BBCE}",
-        nfkd: "\u{1106}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BBCF}",
-        nfc: "\u{BBCF}",
-        nfd: "\u{1106}\u{1173}\u{11B6}",
-        nfkc: "\u{BBCF}",
-        nfkd: "\u{1106}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BBD0}",
-        nfc: "\u{BBD0}",
-        nfd: "\u{1106}\u{1173}\u{11B7}",
-        nfkc: "\u{BBD0}",
-        nfkd: "\u{1106}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BBD1}",
-        nfc: "\u{BBD1}",
-        nfd: "\u{1106}\u{1173}\u{11B8}",
-        nfkc: "\u{BBD1}",
-        nfkd: "\u{1106}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BBD2}",
-        nfc: "\u{BBD2}",
-        nfd: "\u{1106}\u{1173}\u{11B9}",
-        nfkc: "\u{BBD2}",
-        nfkd: "\u{1106}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BBD3}",
-        nfc: "\u{BBD3}",
-        nfd: "\u{1106}\u{1173}\u{11BA}",
-        nfkc: "\u{BBD3}",
-        nfkd: "\u{1106}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BBD4}",
-        nfc: "\u{BBD4}",
-        nfd: "\u{1106}\u{1173}\u{11BB}",
-        nfkc: "\u{BBD4}",
-        nfkd: "\u{1106}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BBD5}",
-        nfc: "\u{BBD5}",
-        nfd: "\u{1106}\u{1173}\u{11BC}",
-        nfkc: "\u{BBD5}",
-        nfkd: "\u{1106}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BBD6}",
-        nfc: "\u{BBD6}",
-        nfd: "\u{1106}\u{1173}\u{11BD}",
-        nfkc: "\u{BBD6}",
-        nfkd: "\u{1106}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BBD7}",
-        nfc: "\u{BBD7}",
-        nfd: "\u{1106}\u{1173}\u{11BE}",
-        nfkc: "\u{BBD7}",
-        nfkd: "\u{1106}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BBD8}",
-        nfc: "\u{BBD8}",
-        nfd: "\u{1106}\u{1173}\u{11BF}",
-        nfkc: "\u{BBD8}",
-        nfkd: "\u{1106}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BBD9}",
-        nfc: "\u{BBD9}",
-        nfd: "\u{1106}\u{1173}\u{11C0}",
-        nfkc: "\u{BBD9}",
-        nfkd: "\u{1106}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BBDA}",
-        nfc: "\u{BBDA}",
-        nfd: "\u{1106}\u{1173}\u{11C1}",
-        nfkc: "\u{BBDA}",
-        nfkd: "\u{1106}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BBDB}",
-        nfc: "\u{BBDB}",
-        nfd: "\u{1106}\u{1173}\u{11C2}",
-        nfkc: "\u{BBDB}",
-        nfkd: "\u{1106}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BBDC}",
-        nfc: "\u{BBDC}",
-        nfd: "\u{1106}\u{1174}",
-        nfkc: "\u{BBDC}",
-        nfkd: "\u{1106}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{BBDD}",
-        nfc: "\u{BBDD}",
-        nfd: "\u{1106}\u{1174}\u{11A8}",
-        nfkc: "\u{BBDD}",
-        nfkd: "\u{1106}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BBDE}",
-        nfc: "\u{BBDE}",
-        nfd: "\u{1106}\u{1174}\u{11A9}",
-        nfkc: "\u{BBDE}",
-        nfkd: "\u{1106}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BBDF}",
-        nfc: "\u{BBDF}",
-        nfd: "\u{1106}\u{1174}\u{11AA}",
-        nfkc: "\u{BBDF}",
-        nfkd: "\u{1106}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BBE0}",
-        nfc: "\u{BBE0}",
-        nfd: "\u{1106}\u{1174}\u{11AB}",
-        nfkc: "\u{BBE0}",
-        nfkd: "\u{1106}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BBE1}",
-        nfc: "\u{BBE1}",
-        nfd: "\u{1106}\u{1174}\u{11AC}",
-        nfkc: "\u{BBE1}",
-        nfkd: "\u{1106}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BBE2}",
-        nfc: "\u{BBE2}",
-        nfd: "\u{1106}\u{1174}\u{11AD}",
-        nfkc: "\u{BBE2}",
-        nfkd: "\u{1106}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BBE3}",
-        nfc: "\u{BBE3}",
-        nfd: "\u{1106}\u{1174}\u{11AE}",
-        nfkc: "\u{BBE3}",
-        nfkd: "\u{1106}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BBE4}",
-        nfc: "\u{BBE4}",
-        nfd: "\u{1106}\u{1174}\u{11AF}",
-        nfkc: "\u{BBE4}",
-        nfkd: "\u{1106}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BBE5}",
-        nfc: "\u{BBE5}",
-        nfd: "\u{1106}\u{1174}\u{11B0}",
-        nfkc: "\u{BBE5}",
-        nfkd: "\u{1106}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BBE6}",
-        nfc: "\u{BBE6}",
-        nfd: "\u{1106}\u{1174}\u{11B1}",
-        nfkc: "\u{BBE6}",
-        nfkd: "\u{1106}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BBE7}",
-        nfc: "\u{BBE7}",
-        nfd: "\u{1106}\u{1174}\u{11B2}",
-        nfkc: "\u{BBE7}",
-        nfkd: "\u{1106}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BBE8}",
-        nfc: "\u{BBE8}",
-        nfd: "\u{1106}\u{1174}\u{11B3}",
-        nfkc: "\u{BBE8}",
-        nfkd: "\u{1106}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BBE9}",
-        nfc: "\u{BBE9}",
-        nfd: "\u{1106}\u{1174}\u{11B4}",
-        nfkc: "\u{BBE9}",
-        nfkd: "\u{1106}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BBEA}",
-        nfc: "\u{BBEA}",
-        nfd: "\u{1106}\u{1174}\u{11B5}",
-        nfkc: "\u{BBEA}",
-        nfkd: "\u{1106}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BBEB}",
-        nfc: "\u{BBEB}",
-        nfd: "\u{1106}\u{1174}\u{11B6}",
-        nfkc: "\u{BBEB}",
-        nfkd: "\u{1106}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BBEC}",
-        nfc: "\u{BBEC}",
-        nfd: "\u{1106}\u{1174}\u{11B7}",
-        nfkc: "\u{BBEC}",
-        nfkd: "\u{1106}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BBED}",
-        nfc: "\u{BBED}",
-        nfd: "\u{1106}\u{1174}\u{11B8}",
-        nfkc: "\u{BBED}",
-        nfkd: "\u{1106}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BBEE}",
-        nfc: "\u{BBEE}",
-        nfd: "\u{1106}\u{1174}\u{11B9}",
-        nfkc: "\u{BBEE}",
-        nfkd: "\u{1106}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BBEF}",
-        nfc: "\u{BBEF}",
-        nfd: "\u{1106}\u{1174}\u{11BA}",
-        nfkc: "\u{BBEF}",
-        nfkd: "\u{1106}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BBF0}",
-        nfc: "\u{BBF0}",
-        nfd: "\u{1106}\u{1174}\u{11BB}",
-        nfkc: "\u{BBF0}",
-        nfkd: "\u{1106}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BBF1}",
-        nfc: "\u{BBF1}",
-        nfd: "\u{1106}\u{1174}\u{11BC}",
-        nfkc: "\u{BBF1}",
-        nfkd: "\u{1106}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BBF2}",
-        nfc: "\u{BBF2}",
-        nfd: "\u{1106}\u{1174}\u{11BD}",
-        nfkc: "\u{BBF2}",
-        nfkd: "\u{1106}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BBF3}",
-        nfc: "\u{BBF3}",
-        nfd: "\u{1106}\u{1174}\u{11BE}",
-        nfkc: "\u{BBF3}",
-        nfkd: "\u{1106}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BBF4}",
-        nfc: "\u{BBF4}",
-        nfd: "\u{1106}\u{1174}\u{11BF}",
-        nfkc: "\u{BBF4}",
-        nfkd: "\u{1106}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BBF5}",
-        nfc: "\u{BBF5}",
-        nfd: "\u{1106}\u{1174}\u{11C0}",
-        nfkc: "\u{BBF5}",
-        nfkd: "\u{1106}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BBF6}",
-        nfc: "\u{BBF6}",
-        nfd: "\u{1106}\u{1174}\u{11C1}",
-        nfkc: "\u{BBF6}",
-        nfkd: "\u{1106}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BBF7}",
-        nfc: "\u{BBF7}",
-        nfd: "\u{1106}\u{1174}\u{11C2}",
-        nfkc: "\u{BBF7}",
-        nfkd: "\u{1106}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BBF8}",
-        nfc: "\u{BBF8}",
-        nfd: "\u{1106}\u{1175}",
-        nfkc: "\u{BBF8}",
-        nfkd: "\u{1106}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{BBF9}",
-        nfc: "\u{BBF9}",
-        nfd: "\u{1106}\u{1175}\u{11A8}",
-        nfkc: "\u{BBF9}",
-        nfkd: "\u{1106}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BBFA}",
-        nfc: "\u{BBFA}",
-        nfd: "\u{1106}\u{1175}\u{11A9}",
-        nfkc: "\u{BBFA}",
-        nfkd: "\u{1106}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BBFB}",
-        nfc: "\u{BBFB}",
-        nfd: "\u{1106}\u{1175}\u{11AA}",
-        nfkc: "\u{BBFB}",
-        nfkd: "\u{1106}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BBFC}",
-        nfc: "\u{BBFC}",
-        nfd: "\u{1106}\u{1175}\u{11AB}",
-        nfkc: "\u{BBFC}",
-        nfkd: "\u{1106}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BBFD}",
-        nfc: "\u{BBFD}",
-        nfd: "\u{1106}\u{1175}\u{11AC}",
-        nfkc: "\u{BBFD}",
-        nfkd: "\u{1106}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BBFE}",
-        nfc: "\u{BBFE}",
-        nfd: "\u{1106}\u{1175}\u{11AD}",
-        nfkc: "\u{BBFE}",
-        nfkd: "\u{1106}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BBFF}",
-        nfc: "\u{BBFF}",
-        nfd: "\u{1106}\u{1175}\u{11AE}",
-        nfkc: "\u{BBFF}",
-        nfkd: "\u{1106}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC00}",
-        nfc: "\u{BC00}",
-        nfd: "\u{1106}\u{1175}\u{11AF}",
-        nfkc: "\u{BC00}",
-        nfkd: "\u{1106}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BC01}",
-        nfc: "\u{BC01}",
-        nfd: "\u{1106}\u{1175}\u{11B0}",
-        nfkc: "\u{BC01}",
-        nfkd: "\u{1106}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BC02}",
-        nfc: "\u{BC02}",
-        nfd: "\u{1106}\u{1175}\u{11B1}",
-        nfkc: "\u{BC02}",
-        nfkd: "\u{1106}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BC03}",
-        nfc: "\u{BC03}",
-        nfd: "\u{1106}\u{1175}\u{11B2}",
-        nfkc: "\u{BC03}",
-        nfkd: "\u{1106}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BC04}",
-        nfc: "\u{BC04}",
-        nfd: "\u{1106}\u{1175}\u{11B3}",
-        nfkc: "\u{BC04}",
-        nfkd: "\u{1106}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BC05}",
-        nfc: "\u{BC05}",
-        nfd: "\u{1106}\u{1175}\u{11B4}",
-        nfkc: "\u{BC05}",
-        nfkd: "\u{1106}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BC06}",
-        nfc: "\u{BC06}",
-        nfd: "\u{1106}\u{1175}\u{11B5}",
-        nfkc: "\u{BC06}",
-        nfkd: "\u{1106}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BC07}",
-        nfc: "\u{BC07}",
-        nfd: "\u{1106}\u{1175}\u{11B6}",
-        nfkc: "\u{BC07}",
-        nfkd: "\u{1106}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BC08}",
-        nfc: "\u{BC08}",
-        nfd: "\u{1106}\u{1175}\u{11B7}",
-        nfkc: "\u{BC08}",
-        nfkd: "\u{1106}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BC09}",
-        nfc: "\u{BC09}",
-        nfd: "\u{1106}\u{1175}\u{11B8}",
-        nfkc: "\u{BC09}",
-        nfkd: "\u{1106}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BC0A}",
-        nfc: "\u{BC0A}",
-        nfd: "\u{1106}\u{1175}\u{11B9}",
-        nfkc: "\u{BC0A}",
-        nfkd: "\u{1106}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BC0B}",
-        nfc: "\u{BC0B}",
-        nfd: "\u{1106}\u{1175}\u{11BA}",
-        nfkc: "\u{BC0B}",
-        nfkd: "\u{1106}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BC0C}",
-        nfc: "\u{BC0C}",
-        nfd: "\u{1106}\u{1175}\u{11BB}",
-        nfkc: "\u{BC0C}",
-        nfkd: "\u{1106}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BC0D}",
-        nfc: "\u{BC0D}",
-        nfd: "\u{1106}\u{1175}\u{11BC}",
-        nfkc: "\u{BC0D}",
-        nfkd: "\u{1106}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BC0E}",
-        nfc: "\u{BC0E}",
-        nfd: "\u{1106}\u{1175}\u{11BD}",
-        nfkc: "\u{BC0E}",
-        nfkd: "\u{1106}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BC0F}",
-        nfc: "\u{BC0F}",
-        nfd: "\u{1106}\u{1175}\u{11BE}",
-        nfkc: "\u{BC0F}",
-        nfkd: "\u{1106}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BC10}",
-        nfc: "\u{BC10}",
-        nfd: "\u{1106}\u{1175}\u{11BF}",
-        nfkc: "\u{BC10}",
-        nfkd: "\u{1106}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BC11}",
-        nfc: "\u{BC11}",
-        nfd: "\u{1106}\u{1175}\u{11C0}",
-        nfkc: "\u{BC11}",
-        nfkd: "\u{1106}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BC12}",
-        nfc: "\u{BC12}",
-        nfd: "\u{1106}\u{1175}\u{11C1}",
-        nfkc: "\u{BC12}",
-        nfkd: "\u{1106}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BC13}",
-        nfc: "\u{BC13}",
-        nfd: "\u{1106}\u{1175}\u{11C2}",
-        nfkc: "\u{BC13}",
-        nfkd: "\u{1106}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BC14}",
-        nfc: "\u{BC14}",
-        nfd: "\u{1107}\u{1161}",
-        nfkc: "\u{BC14}",
-        nfkd: "\u{1107}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{BC15}",
-        nfc: "\u{BC15}",
-        nfd: "\u{1107}\u{1161}\u{11A8}",
-        nfkc: "\u{BC15}",
-        nfkd: "\u{1107}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BC16}",
-        nfc: "\u{BC16}",
-        nfd: "\u{1107}\u{1161}\u{11A9}",
-        nfkc: "\u{BC16}",
-        nfkd: "\u{1107}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BC17}",
-        nfc: "\u{BC17}",
-        nfd: "\u{1107}\u{1161}\u{11AA}",
-        nfkc: "\u{BC17}",
-        nfkd: "\u{1107}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BC18}",
-        nfc: "\u{BC18}",
-        nfd: "\u{1107}\u{1161}\u{11AB}",
-        nfkc: "\u{BC18}",
-        nfkd: "\u{1107}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BC19}",
-        nfc: "\u{BC19}",
-        nfd: "\u{1107}\u{1161}\u{11AC}",
-        nfkc: "\u{BC19}",
-        nfkd: "\u{1107}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BC1A}",
-        nfc: "\u{BC1A}",
-        nfd: "\u{1107}\u{1161}\u{11AD}",
-        nfkc: "\u{BC1A}",
-        nfkd: "\u{1107}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BC1B}",
-        nfc: "\u{BC1B}",
-        nfd: "\u{1107}\u{1161}\u{11AE}",
-        nfkc: "\u{BC1B}",
-        nfkd: "\u{1107}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC1C}",
-        nfc: "\u{BC1C}",
-        nfd: "\u{1107}\u{1161}\u{11AF}",
-        nfkc: "\u{BC1C}",
-        nfkd: "\u{1107}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BC1D}",
-        nfc: "\u{BC1D}",
-        nfd: "\u{1107}\u{1161}\u{11B0}",
-        nfkc: "\u{BC1D}",
-        nfkd: "\u{1107}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BC1E}",
-        nfc: "\u{BC1E}",
-        nfd: "\u{1107}\u{1161}\u{11B1}",
-        nfkc: "\u{BC1E}",
-        nfkd: "\u{1107}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BC1F}",
-        nfc: "\u{BC1F}",
-        nfd: "\u{1107}\u{1161}\u{11B2}",
-        nfkc: "\u{BC1F}",
-        nfkd: "\u{1107}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BC20}",
-        nfc: "\u{BC20}",
-        nfd: "\u{1107}\u{1161}\u{11B3}",
-        nfkc: "\u{BC20}",
-        nfkd: "\u{1107}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BC21}",
-        nfc: "\u{BC21}",
-        nfd: "\u{1107}\u{1161}\u{11B4}",
-        nfkc: "\u{BC21}",
-        nfkd: "\u{1107}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BC22}",
-        nfc: "\u{BC22}",
-        nfd: "\u{1107}\u{1161}\u{11B5}",
-        nfkc: "\u{BC22}",
-        nfkd: "\u{1107}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BC23}",
-        nfc: "\u{BC23}",
-        nfd: "\u{1107}\u{1161}\u{11B6}",
-        nfkc: "\u{BC23}",
-        nfkd: "\u{1107}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BC24}",
-        nfc: "\u{BC24}",
-        nfd: "\u{1107}\u{1161}\u{11B7}",
-        nfkc: "\u{BC24}",
-        nfkd: "\u{1107}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BC25}",
-        nfc: "\u{BC25}",
-        nfd: "\u{1107}\u{1161}\u{11B8}",
-        nfkc: "\u{BC25}",
-        nfkd: "\u{1107}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BC26}",
-        nfc: "\u{BC26}",
-        nfd: "\u{1107}\u{1161}\u{11B9}",
-        nfkc: "\u{BC26}",
-        nfkd: "\u{1107}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BC27}",
-        nfc: "\u{BC27}",
-        nfd: "\u{1107}\u{1161}\u{11BA}",
-        nfkc: "\u{BC27}",
-        nfkd: "\u{1107}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BC28}",
-        nfc: "\u{BC28}",
-        nfd: "\u{1107}\u{1161}\u{11BB}",
-        nfkc: "\u{BC28}",
-        nfkd: "\u{1107}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BC29}",
-        nfc: "\u{BC29}",
-        nfd: "\u{1107}\u{1161}\u{11BC}",
-        nfkc: "\u{BC29}",
-        nfkd: "\u{1107}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BC2A}",
-        nfc: "\u{BC2A}",
-        nfd: "\u{1107}\u{1161}\u{11BD}",
-        nfkc: "\u{BC2A}",
-        nfkd: "\u{1107}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BC2B}",
-        nfc: "\u{BC2B}",
-        nfd: "\u{1107}\u{1161}\u{11BE}",
-        nfkc: "\u{BC2B}",
-        nfkd: "\u{1107}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BC2C}",
-        nfc: "\u{BC2C}",
-        nfd: "\u{1107}\u{1161}\u{11BF}",
-        nfkc: "\u{BC2C}",
-        nfkd: "\u{1107}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BC2D}",
-        nfc: "\u{BC2D}",
-        nfd: "\u{1107}\u{1161}\u{11C0}",
-        nfkc: "\u{BC2D}",
-        nfkd: "\u{1107}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BC2E}",
-        nfc: "\u{BC2E}",
-        nfd: "\u{1107}\u{1161}\u{11C1}",
-        nfkc: "\u{BC2E}",
-        nfkd: "\u{1107}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BC2F}",
-        nfc: "\u{BC2F}",
-        nfd: "\u{1107}\u{1161}\u{11C2}",
-        nfkc: "\u{BC2F}",
-        nfkd: "\u{1107}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BC30}",
-        nfc: "\u{BC30}",
-        nfd: "\u{1107}\u{1162}",
-        nfkc: "\u{BC30}",
-        nfkd: "\u{1107}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{BC31}",
-        nfc: "\u{BC31}",
-        nfd: "\u{1107}\u{1162}\u{11A8}",
-        nfkc: "\u{BC31}",
-        nfkd: "\u{1107}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BC32}",
-        nfc: "\u{BC32}",
-        nfd: "\u{1107}\u{1162}\u{11A9}",
-        nfkc: "\u{BC32}",
-        nfkd: "\u{1107}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BC33}",
-        nfc: "\u{BC33}",
-        nfd: "\u{1107}\u{1162}\u{11AA}",
-        nfkc: "\u{BC33}",
-        nfkd: "\u{1107}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BC34}",
-        nfc: "\u{BC34}",
-        nfd: "\u{1107}\u{1162}\u{11AB}",
-        nfkc: "\u{BC34}",
-        nfkd: "\u{1107}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BC35}",
-        nfc: "\u{BC35}",
-        nfd: "\u{1107}\u{1162}\u{11AC}",
-        nfkc: "\u{BC35}",
-        nfkd: "\u{1107}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BC36}",
-        nfc: "\u{BC36}",
-        nfd: "\u{1107}\u{1162}\u{11AD}",
-        nfkc: "\u{BC36}",
-        nfkd: "\u{1107}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BC37}",
-        nfc: "\u{BC37}",
-        nfd: "\u{1107}\u{1162}\u{11AE}",
-        nfkc: "\u{BC37}",
-        nfkd: "\u{1107}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC38}",
-        nfc: "\u{BC38}",
-        nfd: "\u{1107}\u{1162}\u{11AF}",
-        nfkc: "\u{BC38}",
-        nfkd: "\u{1107}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BC39}",
-        nfc: "\u{BC39}",
-        nfd: "\u{1107}\u{1162}\u{11B0}",
-        nfkc: "\u{BC39}",
-        nfkd: "\u{1107}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BC3A}",
-        nfc: "\u{BC3A}",
-        nfd: "\u{1107}\u{1162}\u{11B1}",
-        nfkc: "\u{BC3A}",
-        nfkd: "\u{1107}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BC3B}",
-        nfc: "\u{BC3B}",
-        nfd: "\u{1107}\u{1162}\u{11B2}",
-        nfkc: "\u{BC3B}",
-        nfkd: "\u{1107}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BC3C}",
-        nfc: "\u{BC3C}",
-        nfd: "\u{1107}\u{1162}\u{11B3}",
-        nfkc: "\u{BC3C}",
-        nfkd: "\u{1107}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BC3D}",
-        nfc: "\u{BC3D}",
-        nfd: "\u{1107}\u{1162}\u{11B4}",
-        nfkc: "\u{BC3D}",
-        nfkd: "\u{1107}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BC3E}",
-        nfc: "\u{BC3E}",
-        nfd: "\u{1107}\u{1162}\u{11B5}",
-        nfkc: "\u{BC3E}",
-        nfkd: "\u{1107}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BC3F}",
-        nfc: "\u{BC3F}",
-        nfd: "\u{1107}\u{1162}\u{11B6}",
-        nfkc: "\u{BC3F}",
-        nfkd: "\u{1107}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BC40}",
-        nfc: "\u{BC40}",
-        nfd: "\u{1107}\u{1162}\u{11B7}",
-        nfkc: "\u{BC40}",
-        nfkd: "\u{1107}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BC41}",
-        nfc: "\u{BC41}",
-        nfd: "\u{1107}\u{1162}\u{11B8}",
-        nfkc: "\u{BC41}",
-        nfkd: "\u{1107}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BC42}",
-        nfc: "\u{BC42}",
-        nfd: "\u{1107}\u{1162}\u{11B9}",
-        nfkc: "\u{BC42}",
-        nfkd: "\u{1107}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BC43}",
-        nfc: "\u{BC43}",
-        nfd: "\u{1107}\u{1162}\u{11BA}",
-        nfkc: "\u{BC43}",
-        nfkd: "\u{1107}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BC44}",
-        nfc: "\u{BC44}",
-        nfd: "\u{1107}\u{1162}\u{11BB}",
-        nfkc: "\u{BC44}",
-        nfkd: "\u{1107}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BC45}",
-        nfc: "\u{BC45}",
-        nfd: "\u{1107}\u{1162}\u{11BC}",
-        nfkc: "\u{BC45}",
-        nfkd: "\u{1107}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BC46}",
-        nfc: "\u{BC46}",
-        nfd: "\u{1107}\u{1162}\u{11BD}",
-        nfkc: "\u{BC46}",
-        nfkd: "\u{1107}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BC47}",
-        nfc: "\u{BC47}",
-        nfd: "\u{1107}\u{1162}\u{11BE}",
-        nfkc: "\u{BC47}",
-        nfkd: "\u{1107}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BC48}",
-        nfc: "\u{BC48}",
-        nfd: "\u{1107}\u{1162}\u{11BF}",
-        nfkc: "\u{BC48}",
-        nfkd: "\u{1107}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BC49}",
-        nfc: "\u{BC49}",
-        nfd: "\u{1107}\u{1162}\u{11C0}",
-        nfkc: "\u{BC49}",
-        nfkd: "\u{1107}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BC4A}",
-        nfc: "\u{BC4A}",
-        nfd: "\u{1107}\u{1162}\u{11C1}",
-        nfkc: "\u{BC4A}",
-        nfkd: "\u{1107}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BC4B}",
-        nfc: "\u{BC4B}",
-        nfd: "\u{1107}\u{1162}\u{11C2}",
-        nfkc: "\u{BC4B}",
-        nfkd: "\u{1107}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BC4C}",
-        nfc: "\u{BC4C}",
-        nfd: "\u{1107}\u{1163}",
-        nfkc: "\u{BC4C}",
-        nfkd: "\u{1107}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{BC4D}",
-        nfc: "\u{BC4D}",
-        nfd: "\u{1107}\u{1163}\u{11A8}",
-        nfkc: "\u{BC4D}",
-        nfkd: "\u{1107}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BC4E}",
-        nfc: "\u{BC4E}",
-        nfd: "\u{1107}\u{1163}\u{11A9}",
-        nfkc: "\u{BC4E}",
-        nfkd: "\u{1107}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BC4F}",
-        nfc: "\u{BC4F}",
-        nfd: "\u{1107}\u{1163}\u{11AA}",
-        nfkc: "\u{BC4F}",
-        nfkd: "\u{1107}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BC50}",
-        nfc: "\u{BC50}",
-        nfd: "\u{1107}\u{1163}\u{11AB}",
-        nfkc: "\u{BC50}",
-        nfkd: "\u{1107}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BC51}",
-        nfc: "\u{BC51}",
-        nfd: "\u{1107}\u{1163}\u{11AC}",
-        nfkc: "\u{BC51}",
-        nfkd: "\u{1107}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BC52}",
-        nfc: "\u{BC52}",
-        nfd: "\u{1107}\u{1163}\u{11AD}",
-        nfkc: "\u{BC52}",
-        nfkd: "\u{1107}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BC53}",
-        nfc: "\u{BC53}",
-        nfd: "\u{1107}\u{1163}\u{11AE}",
-        nfkc: "\u{BC53}",
-        nfkd: "\u{1107}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC54}",
-        nfc: "\u{BC54}",
-        nfd: "\u{1107}\u{1163}\u{11AF}",
-        nfkc: "\u{BC54}",
-        nfkd: "\u{1107}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BC55}",
-        nfc: "\u{BC55}",
-        nfd: "\u{1107}\u{1163}\u{11B0}",
-        nfkc: "\u{BC55}",
-        nfkd: "\u{1107}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BC56}",
-        nfc: "\u{BC56}",
-        nfd: "\u{1107}\u{1163}\u{11B1}",
-        nfkc: "\u{BC56}",
-        nfkd: "\u{1107}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BC57}",
-        nfc: "\u{BC57}",
-        nfd: "\u{1107}\u{1163}\u{11B2}",
-        nfkc: "\u{BC57}",
-        nfkd: "\u{1107}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BC58}",
-        nfc: "\u{BC58}",
-        nfd: "\u{1107}\u{1163}\u{11B3}",
-        nfkc: "\u{BC58}",
-        nfkd: "\u{1107}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BC59}",
-        nfc: "\u{BC59}",
-        nfd: "\u{1107}\u{1163}\u{11B4}",
-        nfkc: "\u{BC59}",
-        nfkd: "\u{1107}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BC5A}",
-        nfc: "\u{BC5A}",
-        nfd: "\u{1107}\u{1163}\u{11B5}",
-        nfkc: "\u{BC5A}",
-        nfkd: "\u{1107}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BC5B}",
-        nfc: "\u{BC5B}",
-        nfd: "\u{1107}\u{1163}\u{11B6}",
-        nfkc: "\u{BC5B}",
-        nfkd: "\u{1107}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BC5C}",
-        nfc: "\u{BC5C}",
-        nfd: "\u{1107}\u{1163}\u{11B7}",
-        nfkc: "\u{BC5C}",
-        nfkd: "\u{1107}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BC5D}",
-        nfc: "\u{BC5D}",
-        nfd: "\u{1107}\u{1163}\u{11B8}",
-        nfkc: "\u{BC5D}",
-        nfkd: "\u{1107}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BC5E}",
-        nfc: "\u{BC5E}",
-        nfd: "\u{1107}\u{1163}\u{11B9}",
-        nfkc: "\u{BC5E}",
-        nfkd: "\u{1107}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BC5F}",
-        nfc: "\u{BC5F}",
-        nfd: "\u{1107}\u{1163}\u{11BA}",
-        nfkc: "\u{BC5F}",
-        nfkd: "\u{1107}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BC60}",
-        nfc: "\u{BC60}",
-        nfd: "\u{1107}\u{1163}\u{11BB}",
-        nfkc: "\u{BC60}",
-        nfkd: "\u{1107}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BC61}",
-        nfc: "\u{BC61}",
-        nfd: "\u{1107}\u{1163}\u{11BC}",
-        nfkc: "\u{BC61}",
-        nfkd: "\u{1107}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BC62}",
-        nfc: "\u{BC62}",
-        nfd: "\u{1107}\u{1163}\u{11BD}",
-        nfkc: "\u{BC62}",
-        nfkd: "\u{1107}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BC63}",
-        nfc: "\u{BC63}",
-        nfd: "\u{1107}\u{1163}\u{11BE}",
-        nfkc: "\u{BC63}",
-        nfkd: "\u{1107}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BC64}",
-        nfc: "\u{BC64}",
-        nfd: "\u{1107}\u{1163}\u{11BF}",
-        nfkc: "\u{BC64}",
-        nfkd: "\u{1107}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BC65}",
-        nfc: "\u{BC65}",
-        nfd: "\u{1107}\u{1163}\u{11C0}",
-        nfkc: "\u{BC65}",
-        nfkd: "\u{1107}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BC66}",
-        nfc: "\u{BC66}",
-        nfd: "\u{1107}\u{1163}\u{11C1}",
-        nfkc: "\u{BC66}",
-        nfkd: "\u{1107}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BC67}",
-        nfc: "\u{BC67}",
-        nfd: "\u{1107}\u{1163}\u{11C2}",
-        nfkc: "\u{BC67}",
-        nfkd: "\u{1107}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BC68}",
-        nfc: "\u{BC68}",
-        nfd: "\u{1107}\u{1164}",
-        nfkc: "\u{BC68}",
-        nfkd: "\u{1107}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{BC69}",
-        nfc: "\u{BC69}",
-        nfd: "\u{1107}\u{1164}\u{11A8}",
-        nfkc: "\u{BC69}",
-        nfkd: "\u{1107}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BC6A}",
-        nfc: "\u{BC6A}",
-        nfd: "\u{1107}\u{1164}\u{11A9}",
-        nfkc: "\u{BC6A}",
-        nfkd: "\u{1107}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BC6B}",
-        nfc: "\u{BC6B}",
-        nfd: "\u{1107}\u{1164}\u{11AA}",
-        nfkc: "\u{BC6B}",
-        nfkd: "\u{1107}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BC6C}",
-        nfc: "\u{BC6C}",
-        nfd: "\u{1107}\u{1164}\u{11AB}",
-        nfkc: "\u{BC6C}",
-        nfkd: "\u{1107}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BC6D}",
-        nfc: "\u{BC6D}",
-        nfd: "\u{1107}\u{1164}\u{11AC}",
-        nfkc: "\u{BC6D}",
-        nfkd: "\u{1107}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BC6E}",
-        nfc: "\u{BC6E}",
-        nfd: "\u{1107}\u{1164}\u{11AD}",
-        nfkc: "\u{BC6E}",
-        nfkd: "\u{1107}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BC6F}",
-        nfc: "\u{BC6F}",
-        nfd: "\u{1107}\u{1164}\u{11AE}",
-        nfkc: "\u{BC6F}",
-        nfkd: "\u{1107}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC70}",
-        nfc: "\u{BC70}",
-        nfd: "\u{1107}\u{1164}\u{11AF}",
-        nfkc: "\u{BC70}",
-        nfkd: "\u{1107}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BC71}",
-        nfc: "\u{BC71}",
-        nfd: "\u{1107}\u{1164}\u{11B0}",
-        nfkc: "\u{BC71}",
-        nfkd: "\u{1107}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BC72}",
-        nfc: "\u{BC72}",
-        nfd: "\u{1107}\u{1164}\u{11B1}",
-        nfkc: "\u{BC72}",
-        nfkd: "\u{1107}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BC73}",
-        nfc: "\u{BC73}",
-        nfd: "\u{1107}\u{1164}\u{11B2}",
-        nfkc: "\u{BC73}",
-        nfkd: "\u{1107}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BC74}",
-        nfc: "\u{BC74}",
-        nfd: "\u{1107}\u{1164}\u{11B3}",
-        nfkc: "\u{BC74}",
-        nfkd: "\u{1107}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BC75}",
-        nfc: "\u{BC75}",
-        nfd: "\u{1107}\u{1164}\u{11B4}",
-        nfkc: "\u{BC75}",
-        nfkd: "\u{1107}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BC76}",
-        nfc: "\u{BC76}",
-        nfd: "\u{1107}\u{1164}\u{11B5}",
-        nfkc: "\u{BC76}",
-        nfkd: "\u{1107}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BC77}",
-        nfc: "\u{BC77}",
-        nfd: "\u{1107}\u{1164}\u{11B6}",
-        nfkc: "\u{BC77}",
-        nfkd: "\u{1107}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BC78}",
-        nfc: "\u{BC78}",
-        nfd: "\u{1107}\u{1164}\u{11B7}",
-        nfkc: "\u{BC78}",
-        nfkd: "\u{1107}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BC79}",
-        nfc: "\u{BC79}",
-        nfd: "\u{1107}\u{1164}\u{11B8}",
-        nfkc: "\u{BC79}",
-        nfkd: "\u{1107}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BC7A}",
-        nfc: "\u{BC7A}",
-        nfd: "\u{1107}\u{1164}\u{11B9}",
-        nfkc: "\u{BC7A}",
-        nfkd: "\u{1107}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BC7B}",
-        nfc: "\u{BC7B}",
-        nfd: "\u{1107}\u{1164}\u{11BA}",
-        nfkc: "\u{BC7B}",
-        nfkd: "\u{1107}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BC7C}",
-        nfc: "\u{BC7C}",
-        nfd: "\u{1107}\u{1164}\u{11BB}",
-        nfkc: "\u{BC7C}",
-        nfkd: "\u{1107}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BC7D}",
-        nfc: "\u{BC7D}",
-        nfd: "\u{1107}\u{1164}\u{11BC}",
-        nfkc: "\u{BC7D}",
-        nfkd: "\u{1107}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BC7E}",
-        nfc: "\u{BC7E}",
-        nfd: "\u{1107}\u{1164}\u{11BD}",
-        nfkc: "\u{BC7E}",
-        nfkd: "\u{1107}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BC7F}",
-        nfc: "\u{BC7F}",
-        nfd: "\u{1107}\u{1164}\u{11BE}",
-        nfkc: "\u{BC7F}",
-        nfkd: "\u{1107}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BC80}",
-        nfc: "\u{BC80}",
-        nfd: "\u{1107}\u{1164}\u{11BF}",
-        nfkc: "\u{BC80}",
-        nfkd: "\u{1107}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BC81}",
-        nfc: "\u{BC81}",
-        nfd: "\u{1107}\u{1164}\u{11C0}",
-        nfkc: "\u{BC81}",
-        nfkd: "\u{1107}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BC82}",
-        nfc: "\u{BC82}",
-        nfd: "\u{1107}\u{1164}\u{11C1}",
-        nfkc: "\u{BC82}",
-        nfkd: "\u{1107}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BC83}",
-        nfc: "\u{BC83}",
-        nfd: "\u{1107}\u{1164}\u{11C2}",
-        nfkc: "\u{BC83}",
-        nfkd: "\u{1107}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BC84}",
-        nfc: "\u{BC84}",
-        nfd: "\u{1107}\u{1165}",
-        nfkc: "\u{BC84}",
-        nfkd: "\u{1107}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{BC85}",
-        nfc: "\u{BC85}",
-        nfd: "\u{1107}\u{1165}\u{11A8}",
-        nfkc: "\u{BC85}",
-        nfkd: "\u{1107}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BC86}",
-        nfc: "\u{BC86}",
-        nfd: "\u{1107}\u{1165}\u{11A9}",
-        nfkc: "\u{BC86}",
-        nfkd: "\u{1107}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BC87}",
-        nfc: "\u{BC87}",
-        nfd: "\u{1107}\u{1165}\u{11AA}",
-        nfkc: "\u{BC87}",
-        nfkd: "\u{1107}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BC88}",
-        nfc: "\u{BC88}",
-        nfd: "\u{1107}\u{1165}\u{11AB}",
-        nfkc: "\u{BC88}",
-        nfkd: "\u{1107}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BC89}",
-        nfc: "\u{BC89}",
-        nfd: "\u{1107}\u{1165}\u{11AC}",
-        nfkc: "\u{BC89}",
-        nfkd: "\u{1107}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BC8A}",
-        nfc: "\u{BC8A}",
-        nfd: "\u{1107}\u{1165}\u{11AD}",
-        nfkc: "\u{BC8A}",
-        nfkd: "\u{1107}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BC8B}",
-        nfc: "\u{BC8B}",
-        nfd: "\u{1107}\u{1165}\u{11AE}",
-        nfkc: "\u{BC8B}",
-        nfkd: "\u{1107}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC8C}",
-        nfc: "\u{BC8C}",
-        nfd: "\u{1107}\u{1165}\u{11AF}",
-        nfkc: "\u{BC8C}",
-        nfkd: "\u{1107}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BC8D}",
-        nfc: "\u{BC8D}",
-        nfd: "\u{1107}\u{1165}\u{11B0}",
-        nfkc: "\u{BC8D}",
-        nfkd: "\u{1107}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BC8E}",
-        nfc: "\u{BC8E}",
-        nfd: "\u{1107}\u{1165}\u{11B1}",
-        nfkc: "\u{BC8E}",
-        nfkd: "\u{1107}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BC8F}",
-        nfc: "\u{BC8F}",
-        nfd: "\u{1107}\u{1165}\u{11B2}",
-        nfkc: "\u{BC8F}",
-        nfkd: "\u{1107}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BC90}",
-        nfc: "\u{BC90}",
-        nfd: "\u{1107}\u{1165}\u{11B3}",
-        nfkc: "\u{BC90}",
-        nfkd: "\u{1107}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BC91}",
-        nfc: "\u{BC91}",
-        nfd: "\u{1107}\u{1165}\u{11B4}",
-        nfkc: "\u{BC91}",
-        nfkd: "\u{1107}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BC92}",
-        nfc: "\u{BC92}",
-        nfd: "\u{1107}\u{1165}\u{11B5}",
-        nfkc: "\u{BC92}",
-        nfkd: "\u{1107}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BC93}",
-        nfc: "\u{BC93}",
-        nfd: "\u{1107}\u{1165}\u{11B6}",
-        nfkc: "\u{BC93}",
-        nfkd: "\u{1107}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BC94}",
-        nfc: "\u{BC94}",
-        nfd: "\u{1107}\u{1165}\u{11B7}",
-        nfkc: "\u{BC94}",
-        nfkd: "\u{1107}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BC95}",
-        nfc: "\u{BC95}",
-        nfd: "\u{1107}\u{1165}\u{11B8}",
-        nfkc: "\u{BC95}",
-        nfkd: "\u{1107}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BC96}",
-        nfc: "\u{BC96}",
-        nfd: "\u{1107}\u{1165}\u{11B9}",
-        nfkc: "\u{BC96}",
-        nfkd: "\u{1107}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BC97}",
-        nfc: "\u{BC97}",
-        nfd: "\u{1107}\u{1165}\u{11BA}",
-        nfkc: "\u{BC97}",
-        nfkd: "\u{1107}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BC98}",
-        nfc: "\u{BC98}",
-        nfd: "\u{1107}\u{1165}\u{11BB}",
-        nfkc: "\u{BC98}",
-        nfkd: "\u{1107}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BC99}",
-        nfc: "\u{BC99}",
-        nfd: "\u{1107}\u{1165}\u{11BC}",
-        nfkc: "\u{BC99}",
-        nfkd: "\u{1107}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BC9A}",
-        nfc: "\u{BC9A}",
-        nfd: "\u{1107}\u{1165}\u{11BD}",
-        nfkc: "\u{BC9A}",
-        nfkd: "\u{1107}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BC9B}",
-        nfc: "\u{BC9B}",
-        nfd: "\u{1107}\u{1165}\u{11BE}",
-        nfkc: "\u{BC9B}",
-        nfkd: "\u{1107}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BC9C}",
-        nfc: "\u{BC9C}",
-        nfd: "\u{1107}\u{1165}\u{11BF}",
-        nfkc: "\u{BC9C}",
-        nfkd: "\u{1107}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BC9D}",
-        nfc: "\u{BC9D}",
-        nfd: "\u{1107}\u{1165}\u{11C0}",
-        nfkc: "\u{BC9D}",
-        nfkd: "\u{1107}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BC9E}",
-        nfc: "\u{BC9E}",
-        nfd: "\u{1107}\u{1165}\u{11C1}",
-        nfkc: "\u{BC9E}",
-        nfkd: "\u{1107}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BC9F}",
-        nfc: "\u{BC9F}",
-        nfd: "\u{1107}\u{1165}\u{11C2}",
-        nfkc: "\u{BC9F}",
-        nfkd: "\u{1107}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BCA0}",
-        nfc: "\u{BCA0}",
-        nfd: "\u{1107}\u{1166}",
-        nfkc: "\u{BCA0}",
-        nfkd: "\u{1107}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{BCA1}",
-        nfc: "\u{BCA1}",
-        nfd: "\u{1107}\u{1166}\u{11A8}",
-        nfkc: "\u{BCA1}",
-        nfkd: "\u{1107}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BCA2}",
-        nfc: "\u{BCA2}",
-        nfd: "\u{1107}\u{1166}\u{11A9}",
-        nfkc: "\u{BCA2}",
-        nfkd: "\u{1107}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BCA3}",
-        nfc: "\u{BCA3}",
-        nfd: "\u{1107}\u{1166}\u{11AA}",
-        nfkc: "\u{BCA3}",
-        nfkd: "\u{1107}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BCA4}",
-        nfc: "\u{BCA4}",
-        nfd: "\u{1107}\u{1166}\u{11AB}",
-        nfkc: "\u{BCA4}",
-        nfkd: "\u{1107}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BCA5}",
-        nfc: "\u{BCA5}",
-        nfd: "\u{1107}\u{1166}\u{11AC}",
-        nfkc: "\u{BCA5}",
-        nfkd: "\u{1107}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BCA6}",
-        nfc: "\u{BCA6}",
-        nfd: "\u{1107}\u{1166}\u{11AD}",
-        nfkc: "\u{BCA6}",
-        nfkd: "\u{1107}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BCA7}",
-        nfc: "\u{BCA7}",
-        nfd: "\u{1107}\u{1166}\u{11AE}",
-        nfkc: "\u{BCA7}",
-        nfkd: "\u{1107}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BCA8}",
-        nfc: "\u{BCA8}",
-        nfd: "\u{1107}\u{1166}\u{11AF}",
-        nfkc: "\u{BCA8}",
-        nfkd: "\u{1107}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BCA9}",
-        nfc: "\u{BCA9}",
-        nfd: "\u{1107}\u{1166}\u{11B0}",
-        nfkc: "\u{BCA9}",
-        nfkd: "\u{1107}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BCAA}",
-        nfc: "\u{BCAA}",
-        nfd: "\u{1107}\u{1166}\u{11B1}",
-        nfkc: "\u{BCAA}",
-        nfkd: "\u{1107}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BCAB}",
-        nfc: "\u{BCAB}",
-        nfd: "\u{1107}\u{1166}\u{11B2}",
-        nfkc: "\u{BCAB}",
-        nfkd: "\u{1107}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BCAC}",
-        nfc: "\u{BCAC}",
-        nfd: "\u{1107}\u{1166}\u{11B3}",
-        nfkc: "\u{BCAC}",
-        nfkd: "\u{1107}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BCAD}",
-        nfc: "\u{BCAD}",
-        nfd: "\u{1107}\u{1166}\u{11B4}",
-        nfkc: "\u{BCAD}",
-        nfkd: "\u{1107}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BCAE}",
-        nfc: "\u{BCAE}",
-        nfd: "\u{1107}\u{1166}\u{11B5}",
-        nfkc: "\u{BCAE}",
-        nfkd: "\u{1107}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BCAF}",
-        nfc: "\u{BCAF}",
-        nfd: "\u{1107}\u{1166}\u{11B6}",
-        nfkc: "\u{BCAF}",
-        nfkd: "\u{1107}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BCB0}",
-        nfc: "\u{BCB0}",
-        nfd: "\u{1107}\u{1166}\u{11B7}",
-        nfkc: "\u{BCB0}",
-        nfkd: "\u{1107}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BCB1}",
-        nfc: "\u{BCB1}",
-        nfd: "\u{1107}\u{1166}\u{11B8}",
-        nfkc: "\u{BCB1}",
-        nfkd: "\u{1107}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BCB2}",
-        nfc: "\u{BCB2}",
-        nfd: "\u{1107}\u{1166}\u{11B9}",
-        nfkc: "\u{BCB2}",
-        nfkd: "\u{1107}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BCB3}",
-        nfc: "\u{BCB3}",
-        nfd: "\u{1107}\u{1166}\u{11BA}",
-        nfkc: "\u{BCB3}",
-        nfkd: "\u{1107}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BCB4}",
-        nfc: "\u{BCB4}",
-        nfd: "\u{1107}\u{1166}\u{11BB}",
-        nfkc: "\u{BCB4}",
-        nfkd: "\u{1107}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BCB5}",
-        nfc: "\u{BCB5}",
-        nfd: "\u{1107}\u{1166}\u{11BC}",
-        nfkc: "\u{BCB5}",
-        nfkd: "\u{1107}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BCB6}",
-        nfc: "\u{BCB6}",
-        nfd: "\u{1107}\u{1166}\u{11BD}",
-        nfkc: "\u{BCB6}",
-        nfkd: "\u{1107}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BCB7}",
-        nfc: "\u{BCB7}",
-        nfd: "\u{1107}\u{1166}\u{11BE}",
-        nfkc: "\u{BCB7}",
-        nfkd: "\u{1107}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BCB8}",
-        nfc: "\u{BCB8}",
-        nfd: "\u{1107}\u{1166}\u{11BF}",
-        nfkc: "\u{BCB8}",
-        nfkd: "\u{1107}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BCB9}",
-        nfc: "\u{BCB9}",
-        nfd: "\u{1107}\u{1166}\u{11C0}",
-        nfkc: "\u{BCB9}",
-        nfkd: "\u{1107}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BCBA}",
-        nfc: "\u{BCBA}",
-        nfd: "\u{1107}\u{1166}\u{11C1}",
-        nfkc: "\u{BCBA}",
-        nfkd: "\u{1107}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BCBB}",
-        nfc: "\u{BCBB}",
-        nfd: "\u{1107}\u{1166}\u{11C2}",
-        nfkc: "\u{BCBB}",
-        nfkd: "\u{1107}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BCBC}",
-        nfc: "\u{BCBC}",
-        nfd: "\u{1107}\u{1167}",
-        nfkc: "\u{BCBC}",
-        nfkd: "\u{1107}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{BCBD}",
-        nfc: "\u{BCBD}",
-        nfd: "\u{1107}\u{1167}\u{11A8}",
-        nfkc: "\u{BCBD}",
-        nfkd: "\u{1107}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BCBE}",
-        nfc: "\u{BCBE}",
-        nfd: "\u{1107}\u{1167}\u{11A9}",
-        nfkc: "\u{BCBE}",
-        nfkd: "\u{1107}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BCBF}",
-        nfc: "\u{BCBF}",
-        nfd: "\u{1107}\u{1167}\u{11AA}",
-        nfkc: "\u{BCBF}",
-        nfkd: "\u{1107}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BCC0}",
-        nfc: "\u{BCC0}",
-        nfd: "\u{1107}\u{1167}\u{11AB}",
-        nfkc: "\u{BCC0}",
-        nfkd: "\u{1107}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BCC1}",
-        nfc: "\u{BCC1}",
-        nfd: "\u{1107}\u{1167}\u{11AC}",
-        nfkc: "\u{BCC1}",
-        nfkd: "\u{1107}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BCC2}",
-        nfc: "\u{BCC2}",
-        nfd: "\u{1107}\u{1167}\u{11AD}",
-        nfkc: "\u{BCC2}",
-        nfkd: "\u{1107}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BCC3}",
-        nfc: "\u{BCC3}",
-        nfd: "\u{1107}\u{1167}\u{11AE}",
-        nfkc: "\u{BCC3}",
-        nfkd: "\u{1107}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BCC4}",
-        nfc: "\u{BCC4}",
-        nfd: "\u{1107}\u{1167}\u{11AF}",
-        nfkc: "\u{BCC4}",
-        nfkd: "\u{1107}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BCC5}",
-        nfc: "\u{BCC5}",
-        nfd: "\u{1107}\u{1167}\u{11B0}",
-        nfkc: "\u{BCC5}",
-        nfkd: "\u{1107}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BCC6}",
-        nfc: "\u{BCC6}",
-        nfd: "\u{1107}\u{1167}\u{11B1}",
-        nfkc: "\u{BCC6}",
-        nfkd: "\u{1107}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BCC7}",
-        nfc: "\u{BCC7}",
-        nfd: "\u{1107}\u{1167}\u{11B2}",
-        nfkc: "\u{BCC7}",
-        nfkd: "\u{1107}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BCC8}",
-        nfc: "\u{BCC8}",
-        nfd: "\u{1107}\u{1167}\u{11B3}",
-        nfkc: "\u{BCC8}",
-        nfkd: "\u{1107}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BCC9}",
-        nfc: "\u{BCC9}",
-        nfd: "\u{1107}\u{1167}\u{11B4}",
-        nfkc: "\u{BCC9}",
-        nfkd: "\u{1107}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BCCA}",
-        nfc: "\u{BCCA}",
-        nfd: "\u{1107}\u{1167}\u{11B5}",
-        nfkc: "\u{BCCA}",
-        nfkd: "\u{1107}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BCCB}",
-        nfc: "\u{BCCB}",
-        nfd: "\u{1107}\u{1167}\u{11B6}",
-        nfkc: "\u{BCCB}",
-        nfkd: "\u{1107}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BCCC}",
-        nfc: "\u{BCCC}",
-        nfd: "\u{1107}\u{1167}\u{11B7}",
-        nfkc: "\u{BCCC}",
-        nfkd: "\u{1107}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BCCD}",
-        nfc: "\u{BCCD}",
-        nfd: "\u{1107}\u{1167}\u{11B8}",
-        nfkc: "\u{BCCD}",
-        nfkd: "\u{1107}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BCCE}",
-        nfc: "\u{BCCE}",
-        nfd: "\u{1107}\u{1167}\u{11B9}",
-        nfkc: "\u{BCCE}",
-        nfkd: "\u{1107}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BCCF}",
-        nfc: "\u{BCCF}",
-        nfd: "\u{1107}\u{1167}\u{11BA}",
-        nfkc: "\u{BCCF}",
-        nfkd: "\u{1107}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BCD0}",
-        nfc: "\u{BCD0}",
-        nfd: "\u{1107}\u{1167}\u{11BB}",
-        nfkc: "\u{BCD0}",
-        nfkd: "\u{1107}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BCD1}",
-        nfc: "\u{BCD1}",
-        nfd: "\u{1107}\u{1167}\u{11BC}",
-        nfkc: "\u{BCD1}",
-        nfkd: "\u{1107}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BCD2}",
-        nfc: "\u{BCD2}",
-        nfd: "\u{1107}\u{1167}\u{11BD}",
-        nfkc: "\u{BCD2}",
-        nfkd: "\u{1107}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BCD3}",
-        nfc: "\u{BCD3}",
-        nfd: "\u{1107}\u{1167}\u{11BE}",
-        nfkc: "\u{BCD3}",
-        nfkd: "\u{1107}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BCD4}",
-        nfc: "\u{BCD4}",
-        nfd: "\u{1107}\u{1167}\u{11BF}",
-        nfkc: "\u{BCD4}",
-        nfkd: "\u{1107}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BCD5}",
-        nfc: "\u{BCD5}",
-        nfd: "\u{1107}\u{1167}\u{11C0}",
-        nfkc: "\u{BCD5}",
-        nfkd: "\u{1107}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BCD6}",
-        nfc: "\u{BCD6}",
-        nfd: "\u{1107}\u{1167}\u{11C1}",
-        nfkc: "\u{BCD6}",
-        nfkd: "\u{1107}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BCD7}",
-        nfc: "\u{BCD7}",
-        nfd: "\u{1107}\u{1167}\u{11C2}",
-        nfkc: "\u{BCD7}",
-        nfkd: "\u{1107}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BCD8}",
-        nfc: "\u{BCD8}",
-        nfd: "\u{1107}\u{1168}",
-        nfkc: "\u{BCD8}",
-        nfkd: "\u{1107}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{BCD9}",
-        nfc: "\u{BCD9}",
-        nfd: "\u{1107}\u{1168}\u{11A8}",
-        nfkc: "\u{BCD9}",
-        nfkd: "\u{1107}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BCDA}",
-        nfc: "\u{BCDA}",
-        nfd: "\u{1107}\u{1168}\u{11A9}",
-        nfkc: "\u{BCDA}",
-        nfkd: "\u{1107}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BCDB}",
-        nfc: "\u{BCDB}",
-        nfd: "\u{1107}\u{1168}\u{11AA}",
-        nfkc: "\u{BCDB}",
-        nfkd: "\u{1107}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BCDC}",
-        nfc: "\u{BCDC}",
-        nfd: "\u{1107}\u{1168}\u{11AB}",
-        nfkc: "\u{BCDC}",
-        nfkd: "\u{1107}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BCDD}",
-        nfc: "\u{BCDD}",
-        nfd: "\u{1107}\u{1168}\u{11AC}",
-        nfkc: "\u{BCDD}",
-        nfkd: "\u{1107}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BCDE}",
-        nfc: "\u{BCDE}",
-        nfd: "\u{1107}\u{1168}\u{11AD}",
-        nfkc: "\u{BCDE}",
-        nfkd: "\u{1107}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BCDF}",
-        nfc: "\u{BCDF}",
-        nfd: "\u{1107}\u{1168}\u{11AE}",
-        nfkc: "\u{BCDF}",
-        nfkd: "\u{1107}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BCE0}",
-        nfc: "\u{BCE0}",
-        nfd: "\u{1107}\u{1168}\u{11AF}",
-        nfkc: "\u{BCE0}",
-        nfkd: "\u{1107}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BCE1}",
-        nfc: "\u{BCE1}",
-        nfd: "\u{1107}\u{1168}\u{11B0}",
-        nfkc: "\u{BCE1}",
-        nfkd: "\u{1107}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BCE2}",
-        nfc: "\u{BCE2}",
-        nfd: "\u{1107}\u{1168}\u{11B1}",
-        nfkc: "\u{BCE2}",
-        nfkd: "\u{1107}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BCE3}",
-        nfc: "\u{BCE3}",
-        nfd: "\u{1107}\u{1168}\u{11B2}",
-        nfkc: "\u{BCE3}",
-        nfkd: "\u{1107}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BCE4}",
-        nfc: "\u{BCE4}",
-        nfd: "\u{1107}\u{1168}\u{11B3}",
-        nfkc: "\u{BCE4}",
-        nfkd: "\u{1107}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BCE5}",
-        nfc: "\u{BCE5}",
-        nfd: "\u{1107}\u{1168}\u{11B4}",
-        nfkc: "\u{BCE5}",
-        nfkd: "\u{1107}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BCE6}",
-        nfc: "\u{BCE6}",
-        nfd: "\u{1107}\u{1168}\u{11B5}",
-        nfkc: "\u{BCE6}",
-        nfkd: "\u{1107}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BCE7}",
-        nfc: "\u{BCE7}",
-        nfd: "\u{1107}\u{1168}\u{11B6}",
-        nfkc: "\u{BCE7}",
-        nfkd: "\u{1107}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BCE8}",
-        nfc: "\u{BCE8}",
-        nfd: "\u{1107}\u{1168}\u{11B7}",
-        nfkc: "\u{BCE8}",
-        nfkd: "\u{1107}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BCE9}",
-        nfc: "\u{BCE9}",
-        nfd: "\u{1107}\u{1168}\u{11B8}",
-        nfkc: "\u{BCE9}",
-        nfkd: "\u{1107}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BCEA}",
-        nfc: "\u{BCEA}",
-        nfd: "\u{1107}\u{1168}\u{11B9}",
-        nfkc: "\u{BCEA}",
-        nfkd: "\u{1107}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BCEB}",
-        nfc: "\u{BCEB}",
-        nfd: "\u{1107}\u{1168}\u{11BA}",
-        nfkc: "\u{BCEB}",
-        nfkd: "\u{1107}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BCEC}",
-        nfc: "\u{BCEC}",
-        nfd: "\u{1107}\u{1168}\u{11BB}",
-        nfkc: "\u{BCEC}",
-        nfkd: "\u{1107}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BCED}",
-        nfc: "\u{BCED}",
-        nfd: "\u{1107}\u{1168}\u{11BC}",
-        nfkc: "\u{BCED}",
-        nfkd: "\u{1107}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BCEE}",
-        nfc: "\u{BCEE}",
-        nfd: "\u{1107}\u{1168}\u{11BD}",
-        nfkc: "\u{BCEE}",
-        nfkd: "\u{1107}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BCEF}",
-        nfc: "\u{BCEF}",
-        nfd: "\u{1107}\u{1168}\u{11BE}",
-        nfkc: "\u{BCEF}",
-        nfkd: "\u{1107}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BCF0}",
-        nfc: "\u{BCF0}",
-        nfd: "\u{1107}\u{1168}\u{11BF}",
-        nfkc: "\u{BCF0}",
-        nfkd: "\u{1107}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BCF1}",
-        nfc: "\u{BCF1}",
-        nfd: "\u{1107}\u{1168}\u{11C0}",
-        nfkc: "\u{BCF1}",
-        nfkd: "\u{1107}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BCF2}",
-        nfc: "\u{BCF2}",
-        nfd: "\u{1107}\u{1168}\u{11C1}",
-        nfkc: "\u{BCF2}",
-        nfkd: "\u{1107}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BCF3}",
-        nfc: "\u{BCF3}",
-        nfd: "\u{1107}\u{1168}\u{11C2}",
-        nfkc: "\u{BCF3}",
-        nfkd: "\u{1107}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BCF4}",
-        nfc: "\u{BCF4}",
-        nfd: "\u{1107}\u{1169}",
-        nfkc: "\u{BCF4}",
-        nfkd: "\u{1107}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{BCF5}",
-        nfc: "\u{BCF5}",
-        nfd: "\u{1107}\u{1169}\u{11A8}",
-        nfkc: "\u{BCF5}",
-        nfkd: "\u{1107}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BCF6}",
-        nfc: "\u{BCF6}",
-        nfd: "\u{1107}\u{1169}\u{11A9}",
-        nfkc: "\u{BCF6}",
-        nfkd: "\u{1107}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BCF7}",
-        nfc: "\u{BCF7}",
-        nfd: "\u{1107}\u{1169}\u{11AA}",
-        nfkc: "\u{BCF7}",
-        nfkd: "\u{1107}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BCF8}",
-        nfc: "\u{BCF8}",
-        nfd: "\u{1107}\u{1169}\u{11AB}",
-        nfkc: "\u{BCF8}",
-        nfkd: "\u{1107}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BCF9}",
-        nfc: "\u{BCF9}",
-        nfd: "\u{1107}\u{1169}\u{11AC}",
-        nfkc: "\u{BCF9}",
-        nfkd: "\u{1107}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BCFA}",
-        nfc: "\u{BCFA}",
-        nfd: "\u{1107}\u{1169}\u{11AD}",
-        nfkc: "\u{BCFA}",
-        nfkd: "\u{1107}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BCFB}",
-        nfc: "\u{BCFB}",
-        nfd: "\u{1107}\u{1169}\u{11AE}",
-        nfkc: "\u{BCFB}",
-        nfkd: "\u{1107}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BCFC}",
-        nfc: "\u{BCFC}",
-        nfd: "\u{1107}\u{1169}\u{11AF}",
-        nfkc: "\u{BCFC}",
-        nfkd: "\u{1107}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BCFD}",
-        nfc: "\u{BCFD}",
-        nfd: "\u{1107}\u{1169}\u{11B0}",
-        nfkc: "\u{BCFD}",
-        nfkd: "\u{1107}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BCFE}",
-        nfc: "\u{BCFE}",
-        nfd: "\u{1107}\u{1169}\u{11B1}",
-        nfkc: "\u{BCFE}",
-        nfkd: "\u{1107}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BCFF}",
-        nfc: "\u{BCFF}",
-        nfd: "\u{1107}\u{1169}\u{11B2}",
-        nfkc: "\u{BCFF}",
-        nfkd: "\u{1107}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BD00}",
-        nfc: "\u{BD00}",
-        nfd: "\u{1107}\u{1169}\u{11B3}",
-        nfkc: "\u{BD00}",
-        nfkd: "\u{1107}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BD01}",
-        nfc: "\u{BD01}",
-        nfd: "\u{1107}\u{1169}\u{11B4}",
-        nfkc: "\u{BD01}",
-        nfkd: "\u{1107}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BD02}",
-        nfc: "\u{BD02}",
-        nfd: "\u{1107}\u{1169}\u{11B5}",
-        nfkc: "\u{BD02}",
-        nfkd: "\u{1107}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BD03}",
-        nfc: "\u{BD03}",
-        nfd: "\u{1107}\u{1169}\u{11B6}",
-        nfkc: "\u{BD03}",
-        nfkd: "\u{1107}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BD04}",
-        nfc: "\u{BD04}",
-        nfd: "\u{1107}\u{1169}\u{11B7}",
-        nfkc: "\u{BD04}",
-        nfkd: "\u{1107}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BD05}",
-        nfc: "\u{BD05}",
-        nfd: "\u{1107}\u{1169}\u{11B8}",
-        nfkc: "\u{BD05}",
-        nfkd: "\u{1107}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BD06}",
-        nfc: "\u{BD06}",
-        nfd: "\u{1107}\u{1169}\u{11B9}",
-        nfkc: "\u{BD06}",
-        nfkd: "\u{1107}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BD07}",
-        nfc: "\u{BD07}",
-        nfd: "\u{1107}\u{1169}\u{11BA}",
-        nfkc: "\u{BD07}",
-        nfkd: "\u{1107}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BD08}",
-        nfc: "\u{BD08}",
-        nfd: "\u{1107}\u{1169}\u{11BB}",
-        nfkc: "\u{BD08}",
-        nfkd: "\u{1107}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BD09}",
-        nfc: "\u{BD09}",
-        nfd: "\u{1107}\u{1169}\u{11BC}",
-        nfkc: "\u{BD09}",
-        nfkd: "\u{1107}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD0A}",
-        nfc: "\u{BD0A}",
-        nfd: "\u{1107}\u{1169}\u{11BD}",
-        nfkc: "\u{BD0A}",
-        nfkd: "\u{1107}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BD0B}",
-        nfc: "\u{BD0B}",
-        nfd: "\u{1107}\u{1169}\u{11BE}",
-        nfkc: "\u{BD0B}",
-        nfkd: "\u{1107}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BD0C}",
-        nfc: "\u{BD0C}",
-        nfd: "\u{1107}\u{1169}\u{11BF}",
-        nfkc: "\u{BD0C}",
-        nfkd: "\u{1107}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BD0D}",
-        nfc: "\u{BD0D}",
-        nfd: "\u{1107}\u{1169}\u{11C0}",
-        nfkc: "\u{BD0D}",
-        nfkd: "\u{1107}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BD0E}",
-        nfc: "\u{BD0E}",
-        nfd: "\u{1107}\u{1169}\u{11C1}",
-        nfkc: "\u{BD0E}",
-        nfkd: "\u{1107}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BD0F}",
-        nfc: "\u{BD0F}",
-        nfd: "\u{1107}\u{1169}\u{11C2}",
-        nfkc: "\u{BD0F}",
-        nfkd: "\u{1107}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BD10}",
-        nfc: "\u{BD10}",
-        nfd: "\u{1107}\u{116A}",
-        nfkc: "\u{BD10}",
-        nfkd: "\u{1107}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{BD11}",
-        nfc: "\u{BD11}",
-        nfd: "\u{1107}\u{116A}\u{11A8}",
-        nfkc: "\u{BD11}",
-        nfkd: "\u{1107}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BD12}",
-        nfc: "\u{BD12}",
-        nfd: "\u{1107}\u{116A}\u{11A9}",
-        nfkc: "\u{BD12}",
-        nfkd: "\u{1107}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BD13}",
-        nfc: "\u{BD13}",
-        nfd: "\u{1107}\u{116A}\u{11AA}",
-        nfkc: "\u{BD13}",
-        nfkd: "\u{1107}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BD14}",
-        nfc: "\u{BD14}",
-        nfd: "\u{1107}\u{116A}\u{11AB}",
-        nfkc: "\u{BD14}",
-        nfkd: "\u{1107}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BD15}",
-        nfc: "\u{BD15}",
-        nfd: "\u{1107}\u{116A}\u{11AC}",
-        nfkc: "\u{BD15}",
-        nfkd: "\u{1107}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BD16}",
-        nfc: "\u{BD16}",
-        nfd: "\u{1107}\u{116A}\u{11AD}",
-        nfkc: "\u{BD16}",
-        nfkd: "\u{1107}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BD17}",
-        nfc: "\u{BD17}",
-        nfd: "\u{1107}\u{116A}\u{11AE}",
-        nfkc: "\u{BD17}",
-        nfkd: "\u{1107}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BD18}",
-        nfc: "\u{BD18}",
-        nfd: "\u{1107}\u{116A}\u{11AF}",
-        nfkc: "\u{BD18}",
-        nfkd: "\u{1107}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BD19}",
-        nfc: "\u{BD19}",
-        nfd: "\u{1107}\u{116A}\u{11B0}",
-        nfkc: "\u{BD19}",
-        nfkd: "\u{1107}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BD1A}",
-        nfc: "\u{BD1A}",
-        nfd: "\u{1107}\u{116A}\u{11B1}",
-        nfkc: "\u{BD1A}",
-        nfkd: "\u{1107}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BD1B}",
-        nfc: "\u{BD1B}",
-        nfd: "\u{1107}\u{116A}\u{11B2}",
-        nfkc: "\u{BD1B}",
-        nfkd: "\u{1107}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BD1C}",
-        nfc: "\u{BD1C}",
-        nfd: "\u{1107}\u{116A}\u{11B3}",
-        nfkc: "\u{BD1C}",
-        nfkd: "\u{1107}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BD1D}",
-        nfc: "\u{BD1D}",
-        nfd: "\u{1107}\u{116A}\u{11B4}",
-        nfkc: "\u{BD1D}",
-        nfkd: "\u{1107}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BD1E}",
-        nfc: "\u{BD1E}",
-        nfd: "\u{1107}\u{116A}\u{11B5}",
-        nfkc: "\u{BD1E}",
-        nfkd: "\u{1107}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BD1F}",
-        nfc: "\u{BD1F}",
-        nfd: "\u{1107}\u{116A}\u{11B6}",
-        nfkc: "\u{BD1F}",
-        nfkd: "\u{1107}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BD20}",
-        nfc: "\u{BD20}",
-        nfd: "\u{1107}\u{116A}\u{11B7}",
-        nfkc: "\u{BD20}",
-        nfkd: "\u{1107}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BD21}",
-        nfc: "\u{BD21}",
-        nfd: "\u{1107}\u{116A}\u{11B8}",
-        nfkc: "\u{BD21}",
-        nfkd: "\u{1107}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BD22}",
-        nfc: "\u{BD22}",
-        nfd: "\u{1107}\u{116A}\u{11B9}",
-        nfkc: "\u{BD22}",
-        nfkd: "\u{1107}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BD23}",
-        nfc: "\u{BD23}",
-        nfd: "\u{1107}\u{116A}\u{11BA}",
-        nfkc: "\u{BD23}",
-        nfkd: "\u{1107}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BD24}",
-        nfc: "\u{BD24}",
-        nfd: "\u{1107}\u{116A}\u{11BB}",
-        nfkc: "\u{BD24}",
-        nfkd: "\u{1107}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BD25}",
-        nfc: "\u{BD25}",
-        nfd: "\u{1107}\u{116A}\u{11BC}",
-        nfkc: "\u{BD25}",
-        nfkd: "\u{1107}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD26}",
-        nfc: "\u{BD26}",
-        nfd: "\u{1107}\u{116A}\u{11BD}",
-        nfkc: "\u{BD26}",
-        nfkd: "\u{1107}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BD27}",
-        nfc: "\u{BD27}",
-        nfd: "\u{1107}\u{116A}\u{11BE}",
-        nfkc: "\u{BD27}",
-        nfkd: "\u{1107}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BD28}",
-        nfc: "\u{BD28}",
-        nfd: "\u{1107}\u{116A}\u{11BF}",
-        nfkc: "\u{BD28}",
-        nfkd: "\u{1107}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BD29}",
-        nfc: "\u{BD29}",
-        nfd: "\u{1107}\u{116A}\u{11C0}",
-        nfkc: "\u{BD29}",
-        nfkd: "\u{1107}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BD2A}",
-        nfc: "\u{BD2A}",
-        nfd: "\u{1107}\u{116A}\u{11C1}",
-        nfkc: "\u{BD2A}",
-        nfkd: "\u{1107}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BD2B}",
-        nfc: "\u{BD2B}",
-        nfd: "\u{1107}\u{116A}\u{11C2}",
-        nfkc: "\u{BD2B}",
-        nfkd: "\u{1107}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BD2C}",
-        nfc: "\u{BD2C}",
-        nfd: "\u{1107}\u{116B}",
-        nfkc: "\u{BD2C}",
-        nfkd: "\u{1107}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{BD2D}",
-        nfc: "\u{BD2D}",
-        nfd: "\u{1107}\u{116B}\u{11A8}",
-        nfkc: "\u{BD2D}",
-        nfkd: "\u{1107}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BD2E}",
-        nfc: "\u{BD2E}",
-        nfd: "\u{1107}\u{116B}\u{11A9}",
-        nfkc: "\u{BD2E}",
-        nfkd: "\u{1107}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BD2F}",
-        nfc: "\u{BD2F}",
-        nfd: "\u{1107}\u{116B}\u{11AA}",
-        nfkc: "\u{BD2F}",
-        nfkd: "\u{1107}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BD30}",
-        nfc: "\u{BD30}",
-        nfd: "\u{1107}\u{116B}\u{11AB}",
-        nfkc: "\u{BD30}",
-        nfkd: "\u{1107}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BD31}",
-        nfc: "\u{BD31}",
-        nfd: "\u{1107}\u{116B}\u{11AC}",
-        nfkc: "\u{BD31}",
-        nfkd: "\u{1107}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BD32}",
-        nfc: "\u{BD32}",
-        nfd: "\u{1107}\u{116B}\u{11AD}",
-        nfkc: "\u{BD32}",
-        nfkd: "\u{1107}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BD33}",
-        nfc: "\u{BD33}",
-        nfd: "\u{1107}\u{116B}\u{11AE}",
-        nfkc: "\u{BD33}",
-        nfkd: "\u{1107}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BD34}",
-        nfc: "\u{BD34}",
-        nfd: "\u{1107}\u{116B}\u{11AF}",
-        nfkc: "\u{BD34}",
-        nfkd: "\u{1107}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BD35}",
-        nfc: "\u{BD35}",
-        nfd: "\u{1107}\u{116B}\u{11B0}",
-        nfkc: "\u{BD35}",
-        nfkd: "\u{1107}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BD36}",
-        nfc: "\u{BD36}",
-        nfd: "\u{1107}\u{116B}\u{11B1}",
-        nfkc: "\u{BD36}",
-        nfkd: "\u{1107}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BD37}",
-        nfc: "\u{BD37}",
-        nfd: "\u{1107}\u{116B}\u{11B2}",
-        nfkc: "\u{BD37}",
-        nfkd: "\u{1107}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BD38}",
-        nfc: "\u{BD38}",
-        nfd: "\u{1107}\u{116B}\u{11B3}",
-        nfkc: "\u{BD38}",
-        nfkd: "\u{1107}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BD39}",
-        nfc: "\u{BD39}",
-        nfd: "\u{1107}\u{116B}\u{11B4}",
-        nfkc: "\u{BD39}",
-        nfkd: "\u{1107}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BD3A}",
-        nfc: "\u{BD3A}",
-        nfd: "\u{1107}\u{116B}\u{11B5}",
-        nfkc: "\u{BD3A}",
-        nfkd: "\u{1107}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BD3B}",
-        nfc: "\u{BD3B}",
-        nfd: "\u{1107}\u{116B}\u{11B6}",
-        nfkc: "\u{BD3B}",
-        nfkd: "\u{1107}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BD3C}",
-        nfc: "\u{BD3C}",
-        nfd: "\u{1107}\u{116B}\u{11B7}",
-        nfkc: "\u{BD3C}",
-        nfkd: "\u{1107}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BD3D}",
-        nfc: "\u{BD3D}",
-        nfd: "\u{1107}\u{116B}\u{11B8}",
-        nfkc: "\u{BD3D}",
-        nfkd: "\u{1107}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BD3E}",
-        nfc: "\u{BD3E}",
-        nfd: "\u{1107}\u{116B}\u{11B9}",
-        nfkc: "\u{BD3E}",
-        nfkd: "\u{1107}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BD3F}",
-        nfc: "\u{BD3F}",
-        nfd: "\u{1107}\u{116B}\u{11BA}",
-        nfkc: "\u{BD3F}",
-        nfkd: "\u{1107}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BD40}",
-        nfc: "\u{BD40}",
-        nfd: "\u{1107}\u{116B}\u{11BB}",
-        nfkc: "\u{BD40}",
-        nfkd: "\u{1107}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BD41}",
-        nfc: "\u{BD41}",
-        nfd: "\u{1107}\u{116B}\u{11BC}",
-        nfkc: "\u{BD41}",
-        nfkd: "\u{1107}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD42}",
-        nfc: "\u{BD42}",
-        nfd: "\u{1107}\u{116B}\u{11BD}",
-        nfkc: "\u{BD42}",
-        nfkd: "\u{1107}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BD43}",
-        nfc: "\u{BD43}",
-        nfd: "\u{1107}\u{116B}\u{11BE}",
-        nfkc: "\u{BD43}",
-        nfkd: "\u{1107}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BD44}",
-        nfc: "\u{BD44}",
-        nfd: "\u{1107}\u{116B}\u{11BF}",
-        nfkc: "\u{BD44}",
-        nfkd: "\u{1107}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BD45}",
-        nfc: "\u{BD45}",
-        nfd: "\u{1107}\u{116B}\u{11C0}",
-        nfkc: "\u{BD45}",
-        nfkd: "\u{1107}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BD46}",
-        nfc: "\u{BD46}",
-        nfd: "\u{1107}\u{116B}\u{11C1}",
-        nfkc: "\u{BD46}",
-        nfkd: "\u{1107}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BD47}",
-        nfc: "\u{BD47}",
-        nfd: "\u{1107}\u{116B}\u{11C2}",
-        nfkc: "\u{BD47}",
-        nfkd: "\u{1107}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BD48}",
-        nfc: "\u{BD48}",
-        nfd: "\u{1107}\u{116C}",
-        nfkc: "\u{BD48}",
-        nfkd: "\u{1107}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{BD49}",
-        nfc: "\u{BD49}",
-        nfd: "\u{1107}\u{116C}\u{11A8}",
-        nfkc: "\u{BD49}",
-        nfkd: "\u{1107}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BD4A}",
-        nfc: "\u{BD4A}",
-        nfd: "\u{1107}\u{116C}\u{11A9}",
-        nfkc: "\u{BD4A}",
-        nfkd: "\u{1107}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BD4B}",
-        nfc: "\u{BD4B}",
-        nfd: "\u{1107}\u{116C}\u{11AA}",
-        nfkc: "\u{BD4B}",
-        nfkd: "\u{1107}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BD4C}",
-        nfc: "\u{BD4C}",
-        nfd: "\u{1107}\u{116C}\u{11AB}",
-        nfkc: "\u{BD4C}",
-        nfkd: "\u{1107}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BD4D}",
-        nfc: "\u{BD4D}",
-        nfd: "\u{1107}\u{116C}\u{11AC}",
-        nfkc: "\u{BD4D}",
-        nfkd: "\u{1107}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BD4E}",
-        nfc: "\u{BD4E}",
-        nfd: "\u{1107}\u{116C}\u{11AD}",
-        nfkc: "\u{BD4E}",
-        nfkd: "\u{1107}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BD4F}",
-        nfc: "\u{BD4F}",
-        nfd: "\u{1107}\u{116C}\u{11AE}",
-        nfkc: "\u{BD4F}",
-        nfkd: "\u{1107}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BD50}",
-        nfc: "\u{BD50}",
-        nfd: "\u{1107}\u{116C}\u{11AF}",
-        nfkc: "\u{BD50}",
-        nfkd: "\u{1107}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BD51}",
-        nfc: "\u{BD51}",
-        nfd: "\u{1107}\u{116C}\u{11B0}",
-        nfkc: "\u{BD51}",
-        nfkd: "\u{1107}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BD52}",
-        nfc: "\u{BD52}",
-        nfd: "\u{1107}\u{116C}\u{11B1}",
-        nfkc: "\u{BD52}",
-        nfkd: "\u{1107}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BD53}",
-        nfc: "\u{BD53}",
-        nfd: "\u{1107}\u{116C}\u{11B2}",
-        nfkc: "\u{BD53}",
-        nfkd: "\u{1107}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BD54}",
-        nfc: "\u{BD54}",
-        nfd: "\u{1107}\u{116C}\u{11B3}",
-        nfkc: "\u{BD54}",
-        nfkd: "\u{1107}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BD55}",
-        nfc: "\u{BD55}",
-        nfd: "\u{1107}\u{116C}\u{11B4}",
-        nfkc: "\u{BD55}",
-        nfkd: "\u{1107}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BD56}",
-        nfc: "\u{BD56}",
-        nfd: "\u{1107}\u{116C}\u{11B5}",
-        nfkc: "\u{BD56}",
-        nfkd: "\u{1107}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BD57}",
-        nfc: "\u{BD57}",
-        nfd: "\u{1107}\u{116C}\u{11B6}",
-        nfkc: "\u{BD57}",
-        nfkd: "\u{1107}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BD58}",
-        nfc: "\u{BD58}",
-        nfd: "\u{1107}\u{116C}\u{11B7}",
-        nfkc: "\u{BD58}",
-        nfkd: "\u{1107}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BD59}",
-        nfc: "\u{BD59}",
-        nfd: "\u{1107}\u{116C}\u{11B8}",
-        nfkc: "\u{BD59}",
-        nfkd: "\u{1107}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BD5A}",
-        nfc: "\u{BD5A}",
-        nfd: "\u{1107}\u{116C}\u{11B9}",
-        nfkc: "\u{BD5A}",
-        nfkd: "\u{1107}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BD5B}",
-        nfc: "\u{BD5B}",
-        nfd: "\u{1107}\u{116C}\u{11BA}",
-        nfkc: "\u{BD5B}",
-        nfkd: "\u{1107}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BD5C}",
-        nfc: "\u{BD5C}",
-        nfd: "\u{1107}\u{116C}\u{11BB}",
-        nfkc: "\u{BD5C}",
-        nfkd: "\u{1107}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BD5D}",
-        nfc: "\u{BD5D}",
-        nfd: "\u{1107}\u{116C}\u{11BC}",
-        nfkc: "\u{BD5D}",
-        nfkd: "\u{1107}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD5E}",
-        nfc: "\u{BD5E}",
-        nfd: "\u{1107}\u{116C}\u{11BD}",
-        nfkc: "\u{BD5E}",
-        nfkd: "\u{1107}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BD5F}",
-        nfc: "\u{BD5F}",
-        nfd: "\u{1107}\u{116C}\u{11BE}",
-        nfkc: "\u{BD5F}",
-        nfkd: "\u{1107}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BD60}",
-        nfc: "\u{BD60}",
-        nfd: "\u{1107}\u{116C}\u{11BF}",
-        nfkc: "\u{BD60}",
-        nfkd: "\u{1107}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BD61}",
-        nfc: "\u{BD61}",
-        nfd: "\u{1107}\u{116C}\u{11C0}",
-        nfkc: "\u{BD61}",
-        nfkd: "\u{1107}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BD62}",
-        nfc: "\u{BD62}",
-        nfd: "\u{1107}\u{116C}\u{11C1}",
-        nfkc: "\u{BD62}",
-        nfkd: "\u{1107}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BD63}",
-        nfc: "\u{BD63}",
-        nfd: "\u{1107}\u{116C}\u{11C2}",
-        nfkc: "\u{BD63}",
-        nfkd: "\u{1107}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BD64}",
-        nfc: "\u{BD64}",
-        nfd: "\u{1107}\u{116D}",
-        nfkc: "\u{BD64}",
-        nfkd: "\u{1107}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{BD65}",
-        nfc: "\u{BD65}",
-        nfd: "\u{1107}\u{116D}\u{11A8}",
-        nfkc: "\u{BD65}",
-        nfkd: "\u{1107}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BD66}",
-        nfc: "\u{BD66}",
-        nfd: "\u{1107}\u{116D}\u{11A9}",
-        nfkc: "\u{BD66}",
-        nfkd: "\u{1107}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BD67}",
-        nfc: "\u{BD67}",
-        nfd: "\u{1107}\u{116D}\u{11AA}",
-        nfkc: "\u{BD67}",
-        nfkd: "\u{1107}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BD68}",
-        nfc: "\u{BD68}",
-        nfd: "\u{1107}\u{116D}\u{11AB}",
-        nfkc: "\u{BD68}",
-        nfkd: "\u{1107}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BD69}",
-        nfc: "\u{BD69}",
-        nfd: "\u{1107}\u{116D}\u{11AC}",
-        nfkc: "\u{BD69}",
-        nfkd: "\u{1107}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BD6A}",
-        nfc: "\u{BD6A}",
-        nfd: "\u{1107}\u{116D}\u{11AD}",
-        nfkc: "\u{BD6A}",
-        nfkd: "\u{1107}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BD6B}",
-        nfc: "\u{BD6B}",
-        nfd: "\u{1107}\u{116D}\u{11AE}",
-        nfkc: "\u{BD6B}",
-        nfkd: "\u{1107}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BD6C}",
-        nfc: "\u{BD6C}",
-        nfd: "\u{1107}\u{116D}\u{11AF}",
-        nfkc: "\u{BD6C}",
-        nfkd: "\u{1107}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BD6D}",
-        nfc: "\u{BD6D}",
-        nfd: "\u{1107}\u{116D}\u{11B0}",
-        nfkc: "\u{BD6D}",
-        nfkd: "\u{1107}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BD6E}",
-        nfc: "\u{BD6E}",
-        nfd: "\u{1107}\u{116D}\u{11B1}",
-        nfkc: "\u{BD6E}",
-        nfkd: "\u{1107}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BD6F}",
-        nfc: "\u{BD6F}",
-        nfd: "\u{1107}\u{116D}\u{11B2}",
-        nfkc: "\u{BD6F}",
-        nfkd: "\u{1107}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BD70}",
-        nfc: "\u{BD70}",
-        nfd: "\u{1107}\u{116D}\u{11B3}",
-        nfkc: "\u{BD70}",
-        nfkd: "\u{1107}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BD71}",
-        nfc: "\u{BD71}",
-        nfd: "\u{1107}\u{116D}\u{11B4}",
-        nfkc: "\u{BD71}",
-        nfkd: "\u{1107}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BD72}",
-        nfc: "\u{BD72}",
-        nfd: "\u{1107}\u{116D}\u{11B5}",
-        nfkc: "\u{BD72}",
-        nfkd: "\u{1107}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BD73}",
-        nfc: "\u{BD73}",
-        nfd: "\u{1107}\u{116D}\u{11B6}",
-        nfkc: "\u{BD73}",
-        nfkd: "\u{1107}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BD74}",
-        nfc: "\u{BD74}",
-        nfd: "\u{1107}\u{116D}\u{11B7}",
-        nfkc: "\u{BD74}",
-        nfkd: "\u{1107}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BD75}",
-        nfc: "\u{BD75}",
-        nfd: "\u{1107}\u{116D}\u{11B8}",
-        nfkc: "\u{BD75}",
-        nfkd: "\u{1107}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BD76}",
-        nfc: "\u{BD76}",
-        nfd: "\u{1107}\u{116D}\u{11B9}",
-        nfkc: "\u{BD76}",
-        nfkd: "\u{1107}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BD77}",
-        nfc: "\u{BD77}",
-        nfd: "\u{1107}\u{116D}\u{11BA}",
-        nfkc: "\u{BD77}",
-        nfkd: "\u{1107}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BD78}",
-        nfc: "\u{BD78}",
-        nfd: "\u{1107}\u{116D}\u{11BB}",
-        nfkc: "\u{BD78}",
-        nfkd: "\u{1107}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BD79}",
-        nfc: "\u{BD79}",
-        nfd: "\u{1107}\u{116D}\u{11BC}",
-        nfkc: "\u{BD79}",
-        nfkd: "\u{1107}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD7A}",
-        nfc: "\u{BD7A}",
-        nfd: "\u{1107}\u{116D}\u{11BD}",
-        nfkc: "\u{BD7A}",
-        nfkd: "\u{1107}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BD7B}",
-        nfc: "\u{BD7B}",
-        nfd: "\u{1107}\u{116D}\u{11BE}",
-        nfkc: "\u{BD7B}",
-        nfkd: "\u{1107}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BD7C}",
-        nfc: "\u{BD7C}",
-        nfd: "\u{1107}\u{116D}\u{11BF}",
-        nfkc: "\u{BD7C}",
-        nfkd: "\u{1107}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BD7D}",
-        nfc: "\u{BD7D}",
-        nfd: "\u{1107}\u{116D}\u{11C0}",
-        nfkc: "\u{BD7D}",
-        nfkd: "\u{1107}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BD7E}",
-        nfc: "\u{BD7E}",
-        nfd: "\u{1107}\u{116D}\u{11C1}",
-        nfkc: "\u{BD7E}",
-        nfkd: "\u{1107}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BD7F}",
-        nfc: "\u{BD7F}",
-        nfd: "\u{1107}\u{116D}\u{11C2}",
-        nfkc: "\u{BD7F}",
-        nfkd: "\u{1107}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BD80}",
-        nfc: "\u{BD80}",
-        nfd: "\u{1107}\u{116E}",
-        nfkc: "\u{BD80}",
-        nfkd: "\u{1107}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{BD81}",
-        nfc: "\u{BD81}",
-        nfd: "\u{1107}\u{116E}\u{11A8}",
-        nfkc: "\u{BD81}",
-        nfkd: "\u{1107}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BD82}",
-        nfc: "\u{BD82}",
-        nfd: "\u{1107}\u{116E}\u{11A9}",
-        nfkc: "\u{BD82}",
-        nfkd: "\u{1107}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BD83}",
-        nfc: "\u{BD83}",
-        nfd: "\u{1107}\u{116E}\u{11AA}",
-        nfkc: "\u{BD83}",
-        nfkd: "\u{1107}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BD84}",
-        nfc: "\u{BD84}",
-        nfd: "\u{1107}\u{116E}\u{11AB}",
-        nfkc: "\u{BD84}",
-        nfkd: "\u{1107}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BD85}",
-        nfc: "\u{BD85}",
-        nfd: "\u{1107}\u{116E}\u{11AC}",
-        nfkc: "\u{BD85}",
-        nfkd: "\u{1107}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BD86}",
-        nfc: "\u{BD86}",
-        nfd: "\u{1107}\u{116E}\u{11AD}",
-        nfkc: "\u{BD86}",
-        nfkd: "\u{1107}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BD87}",
-        nfc: "\u{BD87}",
-        nfd: "\u{1107}\u{116E}\u{11AE}",
-        nfkc: "\u{BD87}",
-        nfkd: "\u{1107}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BD88}",
-        nfc: "\u{BD88}",
-        nfd: "\u{1107}\u{116E}\u{11AF}",
-        nfkc: "\u{BD88}",
-        nfkd: "\u{1107}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BD89}",
-        nfc: "\u{BD89}",
-        nfd: "\u{1107}\u{116E}\u{11B0}",
-        nfkc: "\u{BD89}",
-        nfkd: "\u{1107}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BD8A}",
-        nfc: "\u{BD8A}",
-        nfd: "\u{1107}\u{116E}\u{11B1}",
-        nfkc: "\u{BD8A}",
-        nfkd: "\u{1107}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BD8B}",
-        nfc: "\u{BD8B}",
-        nfd: "\u{1107}\u{116E}\u{11B2}",
-        nfkc: "\u{BD8B}",
-        nfkd: "\u{1107}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BD8C}",
-        nfc: "\u{BD8C}",
-        nfd: "\u{1107}\u{116E}\u{11B3}",
-        nfkc: "\u{BD8C}",
-        nfkd: "\u{1107}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BD8D}",
-        nfc: "\u{BD8D}",
-        nfd: "\u{1107}\u{116E}\u{11B4}",
-        nfkc: "\u{BD8D}",
-        nfkd: "\u{1107}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BD8E}",
-        nfc: "\u{BD8E}",
-        nfd: "\u{1107}\u{116E}\u{11B5}",
-        nfkc: "\u{BD8E}",
-        nfkd: "\u{1107}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BD8F}",
-        nfc: "\u{BD8F}",
-        nfd: "\u{1107}\u{116E}\u{11B6}",
-        nfkc: "\u{BD8F}",
-        nfkd: "\u{1107}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BD90}",
-        nfc: "\u{BD90}",
-        nfd: "\u{1107}\u{116E}\u{11B7}",
-        nfkc: "\u{BD90}",
-        nfkd: "\u{1107}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BD91}",
-        nfc: "\u{BD91}",
-        nfd: "\u{1107}\u{116E}\u{11B8}",
-        nfkc: "\u{BD91}",
-        nfkd: "\u{1107}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BD92}",
-        nfc: "\u{BD92}",
-        nfd: "\u{1107}\u{116E}\u{11B9}",
-        nfkc: "\u{BD92}",
-        nfkd: "\u{1107}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BD93}",
-        nfc: "\u{BD93}",
-        nfd: "\u{1107}\u{116E}\u{11BA}",
-        nfkc: "\u{BD93}",
-        nfkd: "\u{1107}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BD94}",
-        nfc: "\u{BD94}",
-        nfd: "\u{1107}\u{116E}\u{11BB}",
-        nfkc: "\u{BD94}",
-        nfkd: "\u{1107}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BD95}",
-        nfc: "\u{BD95}",
-        nfd: "\u{1107}\u{116E}\u{11BC}",
-        nfkc: "\u{BD95}",
-        nfkd: "\u{1107}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD96}",
-        nfc: "\u{BD96}",
-        nfd: "\u{1107}\u{116E}\u{11BD}",
-        nfkc: "\u{BD96}",
-        nfkd: "\u{1107}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BD97}",
-        nfc: "\u{BD97}",
-        nfd: "\u{1107}\u{116E}\u{11BE}",
-        nfkc: "\u{BD97}",
-        nfkd: "\u{1107}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BD98}",
-        nfc: "\u{BD98}",
-        nfd: "\u{1107}\u{116E}\u{11BF}",
-        nfkc: "\u{BD98}",
-        nfkd: "\u{1107}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BD99}",
-        nfc: "\u{BD99}",
-        nfd: "\u{1107}\u{116E}\u{11C0}",
-        nfkc: "\u{BD99}",
-        nfkd: "\u{1107}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BD9A}",
-        nfc: "\u{BD9A}",
-        nfd: "\u{1107}\u{116E}\u{11C1}",
-        nfkc: "\u{BD9A}",
-        nfkd: "\u{1107}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BD9B}",
-        nfc: "\u{BD9B}",
-        nfd: "\u{1107}\u{116E}\u{11C2}",
-        nfkc: "\u{BD9B}",
-        nfkd: "\u{1107}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BD9C}",
-        nfc: "\u{BD9C}",
-        nfd: "\u{1107}\u{116F}",
-        nfkc: "\u{BD9C}",
-        nfkd: "\u{1107}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{BD9D}",
-        nfc: "\u{BD9D}",
-        nfd: "\u{1107}\u{116F}\u{11A8}",
-        nfkc: "\u{BD9D}",
-        nfkd: "\u{1107}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BD9E}",
-        nfc: "\u{BD9E}",
-        nfd: "\u{1107}\u{116F}\u{11A9}",
-        nfkc: "\u{BD9E}",
-        nfkd: "\u{1107}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BD9F}",
-        nfc: "\u{BD9F}",
-        nfd: "\u{1107}\u{116F}\u{11AA}",
-        nfkc: "\u{BD9F}",
-        nfkd: "\u{1107}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BDA0}",
-        nfc: "\u{BDA0}",
-        nfd: "\u{1107}\u{116F}\u{11AB}",
-        nfkc: "\u{BDA0}",
-        nfkd: "\u{1107}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BDA1}",
-        nfc: "\u{BDA1}",
-        nfd: "\u{1107}\u{116F}\u{11AC}",
-        nfkc: "\u{BDA1}",
-        nfkd: "\u{1107}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BDA2}",
-        nfc: "\u{BDA2}",
-        nfd: "\u{1107}\u{116F}\u{11AD}",
-        nfkc: "\u{BDA2}",
-        nfkd: "\u{1107}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BDA3}",
-        nfc: "\u{BDA3}",
-        nfd: "\u{1107}\u{116F}\u{11AE}",
-        nfkc: "\u{BDA3}",
-        nfkd: "\u{1107}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BDA4}",
-        nfc: "\u{BDA4}",
-        nfd: "\u{1107}\u{116F}\u{11AF}",
-        nfkc: "\u{BDA4}",
-        nfkd: "\u{1107}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BDA5}",
-        nfc: "\u{BDA5}",
-        nfd: "\u{1107}\u{116F}\u{11B0}",
-        nfkc: "\u{BDA5}",
-        nfkd: "\u{1107}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BDA6}",
-        nfc: "\u{BDA6}",
-        nfd: "\u{1107}\u{116F}\u{11B1}",
-        nfkc: "\u{BDA6}",
-        nfkd: "\u{1107}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BDA7}",
-        nfc: "\u{BDA7}",
-        nfd: "\u{1107}\u{116F}\u{11B2}",
-        nfkc: "\u{BDA7}",
-        nfkd: "\u{1107}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BDA8}",
-        nfc: "\u{BDA8}",
-        nfd: "\u{1107}\u{116F}\u{11B3}",
-        nfkc: "\u{BDA8}",
-        nfkd: "\u{1107}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BDA9}",
-        nfc: "\u{BDA9}",
-        nfd: "\u{1107}\u{116F}\u{11B4}",
-        nfkc: "\u{BDA9}",
-        nfkd: "\u{1107}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BDAA}",
-        nfc: "\u{BDAA}",
-        nfd: "\u{1107}\u{116F}\u{11B5}",
-        nfkc: "\u{BDAA}",
-        nfkd: "\u{1107}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BDAB}",
-        nfc: "\u{BDAB}",
-        nfd: "\u{1107}\u{116F}\u{11B6}",
-        nfkc: "\u{BDAB}",
-        nfkd: "\u{1107}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BDAC}",
-        nfc: "\u{BDAC}",
-        nfd: "\u{1107}\u{116F}\u{11B7}",
-        nfkc: "\u{BDAC}",
-        nfkd: "\u{1107}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BDAD}",
-        nfc: "\u{BDAD}",
-        nfd: "\u{1107}\u{116F}\u{11B8}",
-        nfkc: "\u{BDAD}",
-        nfkd: "\u{1107}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BDAE}",
-        nfc: "\u{BDAE}",
-        nfd: "\u{1107}\u{116F}\u{11B9}",
-        nfkc: "\u{BDAE}",
-        nfkd: "\u{1107}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BDAF}",
-        nfc: "\u{BDAF}",
-        nfd: "\u{1107}\u{116F}\u{11BA}",
-        nfkc: "\u{BDAF}",
-        nfkd: "\u{1107}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BDB0}",
-        nfc: "\u{BDB0}",
-        nfd: "\u{1107}\u{116F}\u{11BB}",
-        nfkc: "\u{BDB0}",
-        nfkd: "\u{1107}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BDB1}",
-        nfc: "\u{BDB1}",
-        nfd: "\u{1107}\u{116F}\u{11BC}",
-        nfkc: "\u{BDB1}",
-        nfkd: "\u{1107}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BDB2}",
-        nfc: "\u{BDB2}",
-        nfd: "\u{1107}\u{116F}\u{11BD}",
-        nfkc: "\u{BDB2}",
-        nfkd: "\u{1107}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BDB3}",
-        nfc: "\u{BDB3}",
-        nfd: "\u{1107}\u{116F}\u{11BE}",
-        nfkc: "\u{BDB3}",
-        nfkd: "\u{1107}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BDB4}",
-        nfc: "\u{BDB4}",
-        nfd: "\u{1107}\u{116F}\u{11BF}",
-        nfkc: "\u{BDB4}",
-        nfkd: "\u{1107}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BDB5}",
-        nfc: "\u{BDB5}",
-        nfd: "\u{1107}\u{116F}\u{11C0}",
-        nfkc: "\u{BDB5}",
-        nfkd: "\u{1107}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BDB6}",
-        nfc: "\u{BDB6}",
-        nfd: "\u{1107}\u{116F}\u{11C1}",
-        nfkc: "\u{BDB6}",
-        nfkd: "\u{1107}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BDB7}",
-        nfc: "\u{BDB7}",
-        nfd: "\u{1107}\u{116F}\u{11C2}",
-        nfkc: "\u{BDB7}",
-        nfkd: "\u{1107}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BDB8}",
-        nfc: "\u{BDB8}",
-        nfd: "\u{1107}\u{1170}",
-        nfkc: "\u{BDB8}",
-        nfkd: "\u{1107}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{BDB9}",
-        nfc: "\u{BDB9}",
-        nfd: "\u{1107}\u{1170}\u{11A8}",
-        nfkc: "\u{BDB9}",
-        nfkd: "\u{1107}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BDBA}",
-        nfc: "\u{BDBA}",
-        nfd: "\u{1107}\u{1170}\u{11A9}",
-        nfkc: "\u{BDBA}",
-        nfkd: "\u{1107}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BDBB}",
-        nfc: "\u{BDBB}",
-        nfd: "\u{1107}\u{1170}\u{11AA}",
-        nfkc: "\u{BDBB}",
-        nfkd: "\u{1107}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BDBC}",
-        nfc: "\u{BDBC}",
-        nfd: "\u{1107}\u{1170}\u{11AB}",
-        nfkc: "\u{BDBC}",
-        nfkd: "\u{1107}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BDBD}",
-        nfc: "\u{BDBD}",
-        nfd: "\u{1107}\u{1170}\u{11AC}",
-        nfkc: "\u{BDBD}",
-        nfkd: "\u{1107}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BDBE}",
-        nfc: "\u{BDBE}",
-        nfd: "\u{1107}\u{1170}\u{11AD}",
-        nfkc: "\u{BDBE}",
-        nfkd: "\u{1107}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BDBF}",
-        nfc: "\u{BDBF}",
-        nfd: "\u{1107}\u{1170}\u{11AE}",
-        nfkc: "\u{BDBF}",
-        nfkd: "\u{1107}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BDC0}",
-        nfc: "\u{BDC0}",
-        nfd: "\u{1107}\u{1170}\u{11AF}",
-        nfkc: "\u{BDC0}",
-        nfkd: "\u{1107}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BDC1}",
-        nfc: "\u{BDC1}",
-        nfd: "\u{1107}\u{1170}\u{11B0}",
-        nfkc: "\u{BDC1}",
-        nfkd: "\u{1107}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BDC2}",
-        nfc: "\u{BDC2}",
-        nfd: "\u{1107}\u{1170}\u{11B1}",
-        nfkc: "\u{BDC2}",
-        nfkd: "\u{1107}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BDC3}",
-        nfc: "\u{BDC3}",
-        nfd: "\u{1107}\u{1170}\u{11B2}",
-        nfkc: "\u{BDC3}",
-        nfkd: "\u{1107}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BDC4}",
-        nfc: "\u{BDC4}",
-        nfd: "\u{1107}\u{1170}\u{11B3}",
-        nfkc: "\u{BDC4}",
-        nfkd: "\u{1107}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BDC5}",
-        nfc: "\u{BDC5}",
-        nfd: "\u{1107}\u{1170}\u{11B4}",
-        nfkc: "\u{BDC5}",
-        nfkd: "\u{1107}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BDC6}",
-        nfc: "\u{BDC6}",
-        nfd: "\u{1107}\u{1170}\u{11B5}",
-        nfkc: "\u{BDC6}",
-        nfkd: "\u{1107}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BDC7}",
-        nfc: "\u{BDC7}",
-        nfd: "\u{1107}\u{1170}\u{11B6}",
-        nfkc: "\u{BDC7}",
-        nfkd: "\u{1107}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BDC8}",
-        nfc: "\u{BDC8}",
-        nfd: "\u{1107}\u{1170}\u{11B7}",
-        nfkc: "\u{BDC8}",
-        nfkd: "\u{1107}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BDC9}",
-        nfc: "\u{BDC9}",
-        nfd: "\u{1107}\u{1170}\u{11B8}",
-        nfkc: "\u{BDC9}",
-        nfkd: "\u{1107}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BDCA}",
-        nfc: "\u{BDCA}",
-        nfd: "\u{1107}\u{1170}\u{11B9}",
-        nfkc: "\u{BDCA}",
-        nfkd: "\u{1107}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BDCB}",
-        nfc: "\u{BDCB}",
-        nfd: "\u{1107}\u{1170}\u{11BA}",
-        nfkc: "\u{BDCB}",
-        nfkd: "\u{1107}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BDCC}",
-        nfc: "\u{BDCC}",
-        nfd: "\u{1107}\u{1170}\u{11BB}",
-        nfkc: "\u{BDCC}",
-        nfkd: "\u{1107}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BDCD}",
-        nfc: "\u{BDCD}",
-        nfd: "\u{1107}\u{1170}\u{11BC}",
-        nfkc: "\u{BDCD}",
-        nfkd: "\u{1107}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BDCE}",
-        nfc: "\u{BDCE}",
-        nfd: "\u{1107}\u{1170}\u{11BD}",
-        nfkc: "\u{BDCE}",
-        nfkd: "\u{1107}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BDCF}",
-        nfc: "\u{BDCF}",
-        nfd: "\u{1107}\u{1170}\u{11BE}",
-        nfkc: "\u{BDCF}",
-        nfkd: "\u{1107}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BDD0}",
-        nfc: "\u{BDD0}",
-        nfd: "\u{1107}\u{1170}\u{11BF}",
-        nfkc: "\u{BDD0}",
-        nfkd: "\u{1107}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BDD1}",
-        nfc: "\u{BDD1}",
-        nfd: "\u{1107}\u{1170}\u{11C0}",
-        nfkc: "\u{BDD1}",
-        nfkd: "\u{1107}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BDD2}",
-        nfc: "\u{BDD2}",
-        nfd: "\u{1107}\u{1170}\u{11C1}",
-        nfkc: "\u{BDD2}",
-        nfkd: "\u{1107}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BDD3}",
-        nfc: "\u{BDD3}",
-        nfd: "\u{1107}\u{1170}\u{11C2}",
-        nfkc: "\u{BDD3}",
-        nfkd: "\u{1107}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BDD4}",
-        nfc: "\u{BDD4}",
-        nfd: "\u{1107}\u{1171}",
-        nfkc: "\u{BDD4}",
-        nfkd: "\u{1107}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{BDD5}",
-        nfc: "\u{BDD5}",
-        nfd: "\u{1107}\u{1171}\u{11A8}",
-        nfkc: "\u{BDD5}",
-        nfkd: "\u{1107}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BDD6}",
-        nfc: "\u{BDD6}",
-        nfd: "\u{1107}\u{1171}\u{11A9}",
-        nfkc: "\u{BDD6}",
-        nfkd: "\u{1107}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BDD7}",
-        nfc: "\u{BDD7}",
-        nfd: "\u{1107}\u{1171}\u{11AA}",
-        nfkc: "\u{BDD7}",
-        nfkd: "\u{1107}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BDD8}",
-        nfc: "\u{BDD8}",
-        nfd: "\u{1107}\u{1171}\u{11AB}",
-        nfkc: "\u{BDD8}",
-        nfkd: "\u{1107}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BDD9}",
-        nfc: "\u{BDD9}",
-        nfd: "\u{1107}\u{1171}\u{11AC}",
-        nfkc: "\u{BDD9}",
-        nfkd: "\u{1107}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BDDA}",
-        nfc: "\u{BDDA}",
-        nfd: "\u{1107}\u{1171}\u{11AD}",
-        nfkc: "\u{BDDA}",
-        nfkd: "\u{1107}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BDDB}",
-        nfc: "\u{BDDB}",
-        nfd: "\u{1107}\u{1171}\u{11AE}",
-        nfkc: "\u{BDDB}",
-        nfkd: "\u{1107}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BDDC}",
-        nfc: "\u{BDDC}",
-        nfd: "\u{1107}\u{1171}\u{11AF}",
-        nfkc: "\u{BDDC}",
-        nfkd: "\u{1107}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BDDD}",
-        nfc: "\u{BDDD}",
-        nfd: "\u{1107}\u{1171}\u{11B0}",
-        nfkc: "\u{BDDD}",
-        nfkd: "\u{1107}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BDDE}",
-        nfc: "\u{BDDE}",
-        nfd: "\u{1107}\u{1171}\u{11B1}",
-        nfkc: "\u{BDDE}",
-        nfkd: "\u{1107}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BDDF}",
-        nfc: "\u{BDDF}",
-        nfd: "\u{1107}\u{1171}\u{11B2}",
-        nfkc: "\u{BDDF}",
-        nfkd: "\u{1107}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BDE0}",
-        nfc: "\u{BDE0}",
-        nfd: "\u{1107}\u{1171}\u{11B3}",
-        nfkc: "\u{BDE0}",
-        nfkd: "\u{1107}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BDE1}",
-        nfc: "\u{BDE1}",
-        nfd: "\u{1107}\u{1171}\u{11B4}",
-        nfkc: "\u{BDE1}",
-        nfkd: "\u{1107}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BDE2}",
-        nfc: "\u{BDE2}",
-        nfd: "\u{1107}\u{1171}\u{11B5}",
-        nfkc: "\u{BDE2}",
-        nfkd: "\u{1107}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BDE3}",
-        nfc: "\u{BDE3}",
-        nfd: "\u{1107}\u{1171}\u{11B6}",
-        nfkc: "\u{BDE3}",
-        nfkd: "\u{1107}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BDE4}",
-        nfc: "\u{BDE4}",
-        nfd: "\u{1107}\u{1171}\u{11B7}",
-        nfkc: "\u{BDE4}",
-        nfkd: "\u{1107}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BDE5}",
-        nfc: "\u{BDE5}",
-        nfd: "\u{1107}\u{1171}\u{11B8}",
-        nfkc: "\u{BDE5}",
-        nfkd: "\u{1107}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BDE6}",
-        nfc: "\u{BDE6}",
-        nfd: "\u{1107}\u{1171}\u{11B9}",
-        nfkc: "\u{BDE6}",
-        nfkd: "\u{1107}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BDE7}",
-        nfc: "\u{BDE7}",
-        nfd: "\u{1107}\u{1171}\u{11BA}",
-        nfkc: "\u{BDE7}",
-        nfkd: "\u{1107}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BDE8}",
-        nfc: "\u{BDE8}",
-        nfd: "\u{1107}\u{1171}\u{11BB}",
-        nfkc: "\u{BDE8}",
-        nfkd: "\u{1107}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BDE9}",
-        nfc: "\u{BDE9}",
-        nfd: "\u{1107}\u{1171}\u{11BC}",
-        nfkc: "\u{BDE9}",
-        nfkd: "\u{1107}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BDEA}",
-        nfc: "\u{BDEA}",
-        nfd: "\u{1107}\u{1171}\u{11BD}",
-        nfkc: "\u{BDEA}",
-        nfkd: "\u{1107}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BDEB}",
-        nfc: "\u{BDEB}",
-        nfd: "\u{1107}\u{1171}\u{11BE}",
-        nfkc: "\u{BDEB}",
-        nfkd: "\u{1107}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BDEC}",
-        nfc: "\u{BDEC}",
-        nfd: "\u{1107}\u{1171}\u{11BF}",
-        nfkc: "\u{BDEC}",
-        nfkd: "\u{1107}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BDED}",
-        nfc: "\u{BDED}",
-        nfd: "\u{1107}\u{1171}\u{11C0}",
-        nfkc: "\u{BDED}",
-        nfkd: "\u{1107}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BDEE}",
-        nfc: "\u{BDEE}",
-        nfd: "\u{1107}\u{1171}\u{11C1}",
-        nfkc: "\u{BDEE}",
-        nfkd: "\u{1107}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BDEF}",
-        nfc: "\u{BDEF}",
-        nfd: "\u{1107}\u{1171}\u{11C2}",
-        nfkc: "\u{BDEF}",
-        nfkd: "\u{1107}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BDF0}",
-        nfc: "\u{BDF0}",
-        nfd: "\u{1107}\u{1172}",
-        nfkc: "\u{BDF0}",
-        nfkd: "\u{1107}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{BDF1}",
-        nfc: "\u{BDF1}",
-        nfd: "\u{1107}\u{1172}\u{11A8}",
-        nfkc: "\u{BDF1}",
-        nfkd: "\u{1107}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BDF2}",
-        nfc: "\u{BDF2}",
-        nfd: "\u{1107}\u{1172}\u{11A9}",
-        nfkc: "\u{BDF2}",
-        nfkd: "\u{1107}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BDF3}",
-        nfc: "\u{BDF3}",
-        nfd: "\u{1107}\u{1172}\u{11AA}",
-        nfkc: "\u{BDF3}",
-        nfkd: "\u{1107}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BDF4}",
-        nfc: "\u{BDF4}",
-        nfd: "\u{1107}\u{1172}\u{11AB}",
-        nfkc: "\u{BDF4}",
-        nfkd: "\u{1107}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BDF5}",
-        nfc: "\u{BDF5}",
-        nfd: "\u{1107}\u{1172}\u{11AC}",
-        nfkc: "\u{BDF5}",
-        nfkd: "\u{1107}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BDF6}",
-        nfc: "\u{BDF6}",
-        nfd: "\u{1107}\u{1172}\u{11AD}",
-        nfkc: "\u{BDF6}",
-        nfkd: "\u{1107}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BDF7}",
-        nfc: "\u{BDF7}",
-        nfd: "\u{1107}\u{1172}\u{11AE}",
-        nfkc: "\u{BDF7}",
-        nfkd: "\u{1107}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BDF8}",
-        nfc: "\u{BDF8}",
-        nfd: "\u{1107}\u{1172}\u{11AF}",
-        nfkc: "\u{BDF8}",
-        nfkd: "\u{1107}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BDF9}",
-        nfc: "\u{BDF9}",
-        nfd: "\u{1107}\u{1172}\u{11B0}",
-        nfkc: "\u{BDF9}",
-        nfkd: "\u{1107}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BDFA}",
-        nfc: "\u{BDFA}",
-        nfd: "\u{1107}\u{1172}\u{11B1}",
-        nfkc: "\u{BDFA}",
-        nfkd: "\u{1107}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BDFB}",
-        nfc: "\u{BDFB}",
-        nfd: "\u{1107}\u{1172}\u{11B2}",
-        nfkc: "\u{BDFB}",
-        nfkd: "\u{1107}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BDFC}",
-        nfc: "\u{BDFC}",
-        nfd: "\u{1107}\u{1172}\u{11B3}",
-        nfkc: "\u{BDFC}",
-        nfkd: "\u{1107}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BDFD}",
-        nfc: "\u{BDFD}",
-        nfd: "\u{1107}\u{1172}\u{11B4}",
-        nfkc: "\u{BDFD}",
-        nfkd: "\u{1107}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BDFE}",
-        nfc: "\u{BDFE}",
-        nfd: "\u{1107}\u{1172}\u{11B5}",
-        nfkc: "\u{BDFE}",
-        nfkd: "\u{1107}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BDFF}",
-        nfc: "\u{BDFF}",
-        nfd: "\u{1107}\u{1172}\u{11B6}",
-        nfkc: "\u{BDFF}",
-        nfkd: "\u{1107}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BE00}",
-        nfc: "\u{BE00}",
-        nfd: "\u{1107}\u{1172}\u{11B7}",
-        nfkc: "\u{BE00}",
-        nfkd: "\u{1107}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BE01}",
-        nfc: "\u{BE01}",
-        nfd: "\u{1107}\u{1172}\u{11B8}",
-        nfkc: "\u{BE01}",
-        nfkd: "\u{1107}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BE02}",
-        nfc: "\u{BE02}",
-        nfd: "\u{1107}\u{1172}\u{11B9}",
-        nfkc: "\u{BE02}",
-        nfkd: "\u{1107}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BE03}",
-        nfc: "\u{BE03}",
-        nfd: "\u{1107}\u{1172}\u{11BA}",
-        nfkc: "\u{BE03}",
-        nfkd: "\u{1107}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BE04}",
-        nfc: "\u{BE04}",
-        nfd: "\u{1107}\u{1172}\u{11BB}",
-        nfkc: "\u{BE04}",
-        nfkd: "\u{1107}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BE05}",
-        nfc: "\u{BE05}",
-        nfd: "\u{1107}\u{1172}\u{11BC}",
-        nfkc: "\u{BE05}",
-        nfkd: "\u{1107}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BE06}",
-        nfc: "\u{BE06}",
-        nfd: "\u{1107}\u{1172}\u{11BD}",
-        nfkc: "\u{BE06}",
-        nfkd: "\u{1107}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BE07}",
-        nfc: "\u{BE07}",
-        nfd: "\u{1107}\u{1172}\u{11BE}",
-        nfkc: "\u{BE07}",
-        nfkd: "\u{1107}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BE08}",
-        nfc: "\u{BE08}",
-        nfd: "\u{1107}\u{1172}\u{11BF}",
-        nfkc: "\u{BE08}",
-        nfkd: "\u{1107}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BE09}",
-        nfc: "\u{BE09}",
-        nfd: "\u{1107}\u{1172}\u{11C0}",
-        nfkc: "\u{BE09}",
-        nfkd: "\u{1107}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BE0A}",
-        nfc: "\u{BE0A}",
-        nfd: "\u{1107}\u{1172}\u{11C1}",
-        nfkc: "\u{BE0A}",
-        nfkd: "\u{1107}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BE0B}",
-        nfc: "\u{BE0B}",
-        nfd: "\u{1107}\u{1172}\u{11C2}",
-        nfkc: "\u{BE0B}",
-        nfkd: "\u{1107}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BE0C}",
-        nfc: "\u{BE0C}",
-        nfd: "\u{1107}\u{1173}",
-        nfkc: "\u{BE0C}",
-        nfkd: "\u{1107}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{BE0D}",
-        nfc: "\u{BE0D}",
-        nfd: "\u{1107}\u{1173}\u{11A8}",
-        nfkc: "\u{BE0D}",
-        nfkd: "\u{1107}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BE0E}",
-        nfc: "\u{BE0E}",
-        nfd: "\u{1107}\u{1173}\u{11A9}",
-        nfkc: "\u{BE0E}",
-        nfkd: "\u{1107}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BE0F}",
-        nfc: "\u{BE0F}",
-        nfd: "\u{1107}\u{1173}\u{11AA}",
-        nfkc: "\u{BE0F}",
-        nfkd: "\u{1107}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BE10}",
-        nfc: "\u{BE10}",
-        nfd: "\u{1107}\u{1173}\u{11AB}",
-        nfkc: "\u{BE10}",
-        nfkd: "\u{1107}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BE11}",
-        nfc: "\u{BE11}",
-        nfd: "\u{1107}\u{1173}\u{11AC}",
-        nfkc: "\u{BE11}",
-        nfkd: "\u{1107}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BE12}",
-        nfc: "\u{BE12}",
-        nfd: "\u{1107}\u{1173}\u{11AD}",
-        nfkc: "\u{BE12}",
-        nfkd: "\u{1107}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BE13}",
-        nfc: "\u{BE13}",
-        nfd: "\u{1107}\u{1173}\u{11AE}",
-        nfkc: "\u{BE13}",
-        nfkd: "\u{1107}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BE14}",
-        nfc: "\u{BE14}",
-        nfd: "\u{1107}\u{1173}\u{11AF}",
-        nfkc: "\u{BE14}",
-        nfkd: "\u{1107}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BE15}",
-        nfc: "\u{BE15}",
-        nfd: "\u{1107}\u{1173}\u{11B0}",
-        nfkc: "\u{BE15}",
-        nfkd: "\u{1107}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BE16}",
-        nfc: "\u{BE16}",
-        nfd: "\u{1107}\u{1173}\u{11B1}",
-        nfkc: "\u{BE16}",
-        nfkd: "\u{1107}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BE17}",
-        nfc: "\u{BE17}",
-        nfd: "\u{1107}\u{1173}\u{11B2}",
-        nfkc: "\u{BE17}",
-        nfkd: "\u{1107}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BE18}",
-        nfc: "\u{BE18}",
-        nfd: "\u{1107}\u{1173}\u{11B3}",
-        nfkc: "\u{BE18}",
-        nfkd: "\u{1107}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BE19}",
-        nfc: "\u{BE19}",
-        nfd: "\u{1107}\u{1173}\u{11B4}",
-        nfkc: "\u{BE19}",
-        nfkd: "\u{1107}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BE1A}",
-        nfc: "\u{BE1A}",
-        nfd: "\u{1107}\u{1173}\u{11B5}",
-        nfkc: "\u{BE1A}",
-        nfkd: "\u{1107}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BE1B}",
-        nfc: "\u{BE1B}",
-        nfd: "\u{1107}\u{1173}\u{11B6}",
-        nfkc: "\u{BE1B}",
-        nfkd: "\u{1107}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BE1C}",
-        nfc: "\u{BE1C}",
-        nfd: "\u{1107}\u{1173}\u{11B7}",
-        nfkc: "\u{BE1C}",
-        nfkd: "\u{1107}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BE1D}",
-        nfc: "\u{BE1D}",
-        nfd: "\u{1107}\u{1173}\u{11B8}",
-        nfkc: "\u{BE1D}",
-        nfkd: "\u{1107}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BE1E}",
-        nfc: "\u{BE1E}",
-        nfd: "\u{1107}\u{1173}\u{11B9}",
-        nfkc: "\u{BE1E}",
-        nfkd: "\u{1107}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BE1F}",
-        nfc: "\u{BE1F}",
-        nfd: "\u{1107}\u{1173}\u{11BA}",
-        nfkc: "\u{BE1F}",
-        nfkd: "\u{1107}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BE20}",
-        nfc: "\u{BE20}",
-        nfd: "\u{1107}\u{1173}\u{11BB}",
-        nfkc: "\u{BE20}",
-        nfkd: "\u{1107}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BE21}",
-        nfc: "\u{BE21}",
-        nfd: "\u{1107}\u{1173}\u{11BC}",
-        nfkc: "\u{BE21}",
-        nfkd: "\u{1107}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BE22}",
-        nfc: "\u{BE22}",
-        nfd: "\u{1107}\u{1173}\u{11BD}",
-        nfkc: "\u{BE22}",
-        nfkd: "\u{1107}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BE23}",
-        nfc: "\u{BE23}",
-        nfd: "\u{1107}\u{1173}\u{11BE}",
-        nfkc: "\u{BE23}",
-        nfkd: "\u{1107}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BE24}",
-        nfc: "\u{BE24}",
-        nfd: "\u{1107}\u{1173}\u{11BF}",
-        nfkc: "\u{BE24}",
-        nfkd: "\u{1107}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BE25}",
-        nfc: "\u{BE25}",
-        nfd: "\u{1107}\u{1173}\u{11C0}",
-        nfkc: "\u{BE25}",
-        nfkd: "\u{1107}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BE26}",
-        nfc: "\u{BE26}",
-        nfd: "\u{1107}\u{1173}\u{11C1}",
-        nfkc: "\u{BE26}",
-        nfkd: "\u{1107}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BE27}",
-        nfc: "\u{BE27}",
-        nfd: "\u{1107}\u{1173}\u{11C2}",
-        nfkc: "\u{BE27}",
-        nfkd: "\u{1107}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BE28}",
-        nfc: "\u{BE28}",
-        nfd: "\u{1107}\u{1174}",
-        nfkc: "\u{BE28}",
-        nfkd: "\u{1107}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{BE29}",
-        nfc: "\u{BE29}",
-        nfd: "\u{1107}\u{1174}\u{11A8}",
-        nfkc: "\u{BE29}",
-        nfkd: "\u{1107}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BE2A}",
-        nfc: "\u{BE2A}",
-        nfd: "\u{1107}\u{1174}\u{11A9}",
-        nfkc: "\u{BE2A}",
-        nfkd: "\u{1107}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BE2B}",
-        nfc: "\u{BE2B}",
-        nfd: "\u{1107}\u{1174}\u{11AA}",
-        nfkc: "\u{BE2B}",
-        nfkd: "\u{1107}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BE2C}",
-        nfc: "\u{BE2C}",
-        nfd: "\u{1107}\u{1174}\u{11AB}",
-        nfkc: "\u{BE2C}",
-        nfkd: "\u{1107}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BE2D}",
-        nfc: "\u{BE2D}",
-        nfd: "\u{1107}\u{1174}\u{11AC}",
-        nfkc: "\u{BE2D}",
-        nfkd: "\u{1107}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BE2E}",
-        nfc: "\u{BE2E}",
-        nfd: "\u{1107}\u{1174}\u{11AD}",
-        nfkc: "\u{BE2E}",
-        nfkd: "\u{1107}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BE2F}",
-        nfc: "\u{BE2F}",
-        nfd: "\u{1107}\u{1174}\u{11AE}",
-        nfkc: "\u{BE2F}",
-        nfkd: "\u{1107}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BE30}",
-        nfc: "\u{BE30}",
-        nfd: "\u{1107}\u{1174}\u{11AF}",
-        nfkc: "\u{BE30}",
-        nfkd: "\u{1107}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BE31}",
-        nfc: "\u{BE31}",
-        nfd: "\u{1107}\u{1174}\u{11B0}",
-        nfkc: "\u{BE31}",
-        nfkd: "\u{1107}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BE32}",
-        nfc: "\u{BE32}",
-        nfd: "\u{1107}\u{1174}\u{11B1}",
-        nfkc: "\u{BE32}",
-        nfkd: "\u{1107}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BE33}",
-        nfc: "\u{BE33}",
-        nfd: "\u{1107}\u{1174}\u{11B2}",
-        nfkc: "\u{BE33}",
-        nfkd: "\u{1107}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BE34}",
-        nfc: "\u{BE34}",
-        nfd: "\u{1107}\u{1174}\u{11B3}",
-        nfkc: "\u{BE34}",
-        nfkd: "\u{1107}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BE35}",
-        nfc: "\u{BE35}",
-        nfd: "\u{1107}\u{1174}\u{11B4}",
-        nfkc: "\u{BE35}",
-        nfkd: "\u{1107}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BE36}",
-        nfc: "\u{BE36}",
-        nfd: "\u{1107}\u{1174}\u{11B5}",
-        nfkc: "\u{BE36}",
-        nfkd: "\u{1107}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BE37}",
-        nfc: "\u{BE37}",
-        nfd: "\u{1107}\u{1174}\u{11B6}",
-        nfkc: "\u{BE37}",
-        nfkd: "\u{1107}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BE38}",
-        nfc: "\u{BE38}",
-        nfd: "\u{1107}\u{1174}\u{11B7}",
-        nfkc: "\u{BE38}",
-        nfkd: "\u{1107}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BE39}",
-        nfc: "\u{BE39}",
-        nfd: "\u{1107}\u{1174}\u{11B8}",
-        nfkc: "\u{BE39}",
-        nfkd: "\u{1107}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BE3A}",
-        nfc: "\u{BE3A}",
-        nfd: "\u{1107}\u{1174}\u{11B9}",
-        nfkc: "\u{BE3A}",
-        nfkd: "\u{1107}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BE3B}",
-        nfc: "\u{BE3B}",
-        nfd: "\u{1107}\u{1174}\u{11BA}",
-        nfkc: "\u{BE3B}",
-        nfkd: "\u{1107}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BE3C}",
-        nfc: "\u{BE3C}",
-        nfd: "\u{1107}\u{1174}\u{11BB}",
-        nfkc: "\u{BE3C}",
-        nfkd: "\u{1107}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BE3D}",
-        nfc: "\u{BE3D}",
-        nfd: "\u{1107}\u{1174}\u{11BC}",
-        nfkc: "\u{BE3D}",
-        nfkd: "\u{1107}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BE3E}",
-        nfc: "\u{BE3E}",
-        nfd: "\u{1107}\u{1174}\u{11BD}",
-        nfkc: "\u{BE3E}",
-        nfkd: "\u{1107}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BE3F}",
-        nfc: "\u{BE3F}",
-        nfd: "\u{1107}\u{1174}\u{11BE}",
-        nfkc: "\u{BE3F}",
-        nfkd: "\u{1107}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BE40}",
-        nfc: "\u{BE40}",
-        nfd: "\u{1107}\u{1174}\u{11BF}",
-        nfkc: "\u{BE40}",
-        nfkd: "\u{1107}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BE41}",
-        nfc: "\u{BE41}",
-        nfd: "\u{1107}\u{1174}\u{11C0}",
-        nfkc: "\u{BE41}",
-        nfkd: "\u{1107}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BE42}",
-        nfc: "\u{BE42}",
-        nfd: "\u{1107}\u{1174}\u{11C1}",
-        nfkc: "\u{BE42}",
-        nfkd: "\u{1107}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BE43}",
-        nfc: "\u{BE43}",
-        nfd: "\u{1107}\u{1174}\u{11C2}",
-        nfkc: "\u{BE43}",
-        nfkd: "\u{1107}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BE44}",
-        nfc: "\u{BE44}",
-        nfd: "\u{1107}\u{1175}",
-        nfkc: "\u{BE44}",
-        nfkd: "\u{1107}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{BE45}",
-        nfc: "\u{BE45}",
-        nfd: "\u{1107}\u{1175}\u{11A8}",
-        nfkc: "\u{BE45}",
-        nfkd: "\u{1107}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BE46}",
-        nfc: "\u{BE46}",
-        nfd: "\u{1107}\u{1175}\u{11A9}",
-        nfkc: "\u{BE46}",
-        nfkd: "\u{1107}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BE47}",
-        nfc: "\u{BE47}",
-        nfd: "\u{1107}\u{1175}\u{11AA}",
-        nfkc: "\u{BE47}",
-        nfkd: "\u{1107}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BE48}",
-        nfc: "\u{BE48}",
-        nfd: "\u{1107}\u{1175}\u{11AB}",
-        nfkc: "\u{BE48}",
-        nfkd: "\u{1107}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BE49}",
-        nfc: "\u{BE49}",
-        nfd: "\u{1107}\u{1175}\u{11AC}",
-        nfkc: "\u{BE49}",
-        nfkd: "\u{1107}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BE4A}",
-        nfc: "\u{BE4A}",
-        nfd: "\u{1107}\u{1175}\u{11AD}",
-        nfkc: "\u{BE4A}",
-        nfkd: "\u{1107}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BE4B}",
-        nfc: "\u{BE4B}",
-        nfd: "\u{1107}\u{1175}\u{11AE}",
-        nfkc: "\u{BE4B}",
-        nfkd: "\u{1107}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BE4C}",
-        nfc: "\u{BE4C}",
-        nfd: "\u{1107}\u{1175}\u{11AF}",
-        nfkc: "\u{BE4C}",
-        nfkd: "\u{1107}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BE4D}",
-        nfc: "\u{BE4D}",
-        nfd: "\u{1107}\u{1175}\u{11B0}",
-        nfkc: "\u{BE4D}",
-        nfkd: "\u{1107}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BE4E}",
-        nfc: "\u{BE4E}",
-        nfd: "\u{1107}\u{1175}\u{11B1}",
-        nfkc: "\u{BE4E}",
-        nfkd: "\u{1107}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BE4F}",
-        nfc: "\u{BE4F}",
-        nfd: "\u{1107}\u{1175}\u{11B2}",
-        nfkc: "\u{BE4F}",
-        nfkd: "\u{1107}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BE50}",
-        nfc: "\u{BE50}",
-        nfd: "\u{1107}\u{1175}\u{11B3}",
-        nfkc: "\u{BE50}",
-        nfkd: "\u{1107}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BE51}",
-        nfc: "\u{BE51}",
-        nfd: "\u{1107}\u{1175}\u{11B4}",
-        nfkc: "\u{BE51}",
-        nfkd: "\u{1107}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BE52}",
-        nfc: "\u{BE52}",
-        nfd: "\u{1107}\u{1175}\u{11B5}",
-        nfkc: "\u{BE52}",
-        nfkd: "\u{1107}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BE53}",
-        nfc: "\u{BE53}",
-        nfd: "\u{1107}\u{1175}\u{11B6}",
-        nfkc: "\u{BE53}",
-        nfkd: "\u{1107}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BE54}",
-        nfc: "\u{BE54}",
-        nfd: "\u{1107}\u{1175}\u{11B7}",
-        nfkc: "\u{BE54}",
-        nfkd: "\u{1107}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BE55}",
-        nfc: "\u{BE55}",
-        nfd: "\u{1107}\u{1175}\u{11B8}",
-        nfkc: "\u{BE55}",
-        nfkd: "\u{1107}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BE56}",
-        nfc: "\u{BE56}",
-        nfd: "\u{1107}\u{1175}\u{11B9}",
-        nfkc: "\u{BE56}",
-        nfkd: "\u{1107}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BE57}",
-        nfc: "\u{BE57}",
-        nfd: "\u{1107}\u{1175}\u{11BA}",
-        nfkc: "\u{BE57}",
-        nfkd: "\u{1107}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BE58}",
-        nfc: "\u{BE58}",
-        nfd: "\u{1107}\u{1175}\u{11BB}",
-        nfkc: "\u{BE58}",
-        nfkd: "\u{1107}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BE59}",
-        nfc: "\u{BE59}",
-        nfd: "\u{1107}\u{1175}\u{11BC}",
-        nfkc: "\u{BE59}",
-        nfkd: "\u{1107}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BE5A}",
-        nfc: "\u{BE5A}",
-        nfd: "\u{1107}\u{1175}\u{11BD}",
-        nfkc: "\u{BE5A}",
-        nfkd: "\u{1107}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BE5B}",
-        nfc: "\u{BE5B}",
-        nfd: "\u{1107}\u{1175}\u{11BE}",
-        nfkc: "\u{BE5B}",
-        nfkd: "\u{1107}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BE5C}",
-        nfc: "\u{BE5C}",
-        nfd: "\u{1107}\u{1175}\u{11BF}",
-        nfkc: "\u{BE5C}",
-        nfkd: "\u{1107}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BE5D}",
-        nfc: "\u{BE5D}",
-        nfd: "\u{1107}\u{1175}\u{11C0}",
-        nfkc: "\u{BE5D}",
-        nfkd: "\u{1107}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BE5E}",
-        nfc: "\u{BE5E}",
-        nfd: "\u{1107}\u{1175}\u{11C1}",
-        nfkc: "\u{BE5E}",
-        nfkd: "\u{1107}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BE5F}",
-        nfc: "\u{BE5F}",
-        nfd: "\u{1107}\u{1175}\u{11C2}",
-        nfkc: "\u{BE5F}",
-        nfkd: "\u{1107}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BE60}",
-        nfc: "\u{BE60}",
-        nfd: "\u{1108}\u{1161}",
-        nfkc: "\u{BE60}",
-        nfkd: "\u{1108}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{BE61}",
-        nfc: "\u{BE61}",
-        nfd: "\u{1108}\u{1161}\u{11A8}",
-        nfkc: "\u{BE61}",
-        nfkd: "\u{1108}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BE62}",
-        nfc: "\u{BE62}",
-        nfd: "\u{1108}\u{1161}\u{11A9}",
-        nfkc: "\u{BE62}",
-        nfkd: "\u{1108}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BE63}",
-        nfc: "\u{BE63}",
-        nfd: "\u{1108}\u{1161}\u{11AA}",
-        nfkc: "\u{BE63}",
-        nfkd: "\u{1108}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BE64}",
-        nfc: "\u{BE64}",
-        nfd: "\u{1108}\u{1161}\u{11AB}",
-        nfkc: "\u{BE64}",
-        nfkd: "\u{1108}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BE65}",
-        nfc: "\u{BE65}",
-        nfd: "\u{1108}\u{1161}\u{11AC}",
-        nfkc: "\u{BE65}",
-        nfkd: "\u{1108}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BE66}",
-        nfc: "\u{BE66}",
-        nfd: "\u{1108}\u{1161}\u{11AD}",
-        nfkc: "\u{BE66}",
-        nfkd: "\u{1108}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BE67}",
-        nfc: "\u{BE67}",
-        nfd: "\u{1108}\u{1161}\u{11AE}",
-        nfkc: "\u{BE67}",
-        nfkd: "\u{1108}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BE68}",
-        nfc: "\u{BE68}",
-        nfd: "\u{1108}\u{1161}\u{11AF}",
-        nfkc: "\u{BE68}",
-        nfkd: "\u{1108}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BE69}",
-        nfc: "\u{BE69}",
-        nfd: "\u{1108}\u{1161}\u{11B0}",
-        nfkc: "\u{BE69}",
-        nfkd: "\u{1108}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BE6A}",
-        nfc: "\u{BE6A}",
-        nfd: "\u{1108}\u{1161}\u{11B1}",
-        nfkc: "\u{BE6A}",
-        nfkd: "\u{1108}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BE6B}",
-        nfc: "\u{BE6B}",
-        nfd: "\u{1108}\u{1161}\u{11B2}",
-        nfkc: "\u{BE6B}",
-        nfkd: "\u{1108}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BE6C}",
-        nfc: "\u{BE6C}",
-        nfd: "\u{1108}\u{1161}\u{11B3}",
-        nfkc: "\u{BE6C}",
-        nfkd: "\u{1108}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BE6D}",
-        nfc: "\u{BE6D}",
-        nfd: "\u{1108}\u{1161}\u{11B4}",
-        nfkc: "\u{BE6D}",
-        nfkd: "\u{1108}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BE6E}",
-        nfc: "\u{BE6E}",
-        nfd: "\u{1108}\u{1161}\u{11B5}",
-        nfkc: "\u{BE6E}",
-        nfkd: "\u{1108}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BE6F}",
-        nfc: "\u{BE6F}",
-        nfd: "\u{1108}\u{1161}\u{11B6}",
-        nfkc: "\u{BE6F}",
-        nfkd: "\u{1108}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BE70}",
-        nfc: "\u{BE70}",
-        nfd: "\u{1108}\u{1161}\u{11B7}",
-        nfkc: "\u{BE70}",
-        nfkd: "\u{1108}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BE71}",
-        nfc: "\u{BE71}",
-        nfd: "\u{1108}\u{1161}\u{11B8}",
-        nfkc: "\u{BE71}",
-        nfkd: "\u{1108}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BE72}",
-        nfc: "\u{BE72}",
-        nfd: "\u{1108}\u{1161}\u{11B9}",
-        nfkc: "\u{BE72}",
-        nfkd: "\u{1108}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BE73}",
-        nfc: "\u{BE73}",
-        nfd: "\u{1108}\u{1161}\u{11BA}",
-        nfkc: "\u{BE73}",
-        nfkd: "\u{1108}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BE74}",
-        nfc: "\u{BE74}",
-        nfd: "\u{1108}\u{1161}\u{11BB}",
-        nfkc: "\u{BE74}",
-        nfkd: "\u{1108}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BE75}",
-        nfc: "\u{BE75}",
-        nfd: "\u{1108}\u{1161}\u{11BC}",
-        nfkc: "\u{BE75}",
-        nfkd: "\u{1108}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BE76}",
-        nfc: "\u{BE76}",
-        nfd: "\u{1108}\u{1161}\u{11BD}",
-        nfkc: "\u{BE76}",
-        nfkd: "\u{1108}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BE77}",
-        nfc: "\u{BE77}",
-        nfd: "\u{1108}\u{1161}\u{11BE}",
-        nfkc: "\u{BE77}",
-        nfkd: "\u{1108}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BE78}",
-        nfc: "\u{BE78}",
-        nfd: "\u{1108}\u{1161}\u{11BF}",
-        nfkc: "\u{BE78}",
-        nfkd: "\u{1108}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BE79}",
-        nfc: "\u{BE79}",
-        nfd: "\u{1108}\u{1161}\u{11C0}",
-        nfkc: "\u{BE79}",
-        nfkd: "\u{1108}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BE7A}",
-        nfc: "\u{BE7A}",
-        nfd: "\u{1108}\u{1161}\u{11C1}",
-        nfkc: "\u{BE7A}",
-        nfkd: "\u{1108}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BE7B}",
-        nfc: "\u{BE7B}",
-        nfd: "\u{1108}\u{1161}\u{11C2}",
-        nfkc: "\u{BE7B}",
-        nfkd: "\u{1108}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BE7C}",
-        nfc: "\u{BE7C}",
-        nfd: "\u{1108}\u{1162}",
-        nfkc: "\u{BE7C}",
-        nfkd: "\u{1108}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{BE7D}",
-        nfc: "\u{BE7D}",
-        nfd: "\u{1108}\u{1162}\u{11A8}",
-        nfkc: "\u{BE7D}",
-        nfkd: "\u{1108}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BE7E}",
-        nfc: "\u{BE7E}",
-        nfd: "\u{1108}\u{1162}\u{11A9}",
-        nfkc: "\u{BE7E}",
-        nfkd: "\u{1108}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BE7F}",
-        nfc: "\u{BE7F}",
-        nfd: "\u{1108}\u{1162}\u{11AA}",
-        nfkc: "\u{BE7F}",
-        nfkd: "\u{1108}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BE80}",
-        nfc: "\u{BE80}",
-        nfd: "\u{1108}\u{1162}\u{11AB}",
-        nfkc: "\u{BE80}",
-        nfkd: "\u{1108}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BE81}",
-        nfc: "\u{BE81}",
-        nfd: "\u{1108}\u{1162}\u{11AC}",
-        nfkc: "\u{BE81}",
-        nfkd: "\u{1108}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BE82}",
-        nfc: "\u{BE82}",
-        nfd: "\u{1108}\u{1162}\u{11AD}",
-        nfkc: "\u{BE82}",
-        nfkd: "\u{1108}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BE83}",
-        nfc: "\u{BE83}",
-        nfd: "\u{1108}\u{1162}\u{11AE}",
-        nfkc: "\u{BE83}",
-        nfkd: "\u{1108}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BE84}",
-        nfc: "\u{BE84}",
-        nfd: "\u{1108}\u{1162}\u{11AF}",
-        nfkc: "\u{BE84}",
-        nfkd: "\u{1108}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BE85}",
-        nfc: "\u{BE85}",
-        nfd: "\u{1108}\u{1162}\u{11B0}",
-        nfkc: "\u{BE85}",
-        nfkd: "\u{1108}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BE86}",
-        nfc: "\u{BE86}",
-        nfd: "\u{1108}\u{1162}\u{11B1}",
-        nfkc: "\u{BE86}",
-        nfkd: "\u{1108}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BE87}",
-        nfc: "\u{BE87}",
-        nfd: "\u{1108}\u{1162}\u{11B2}",
-        nfkc: "\u{BE87}",
-        nfkd: "\u{1108}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BE88}",
-        nfc: "\u{BE88}",
-        nfd: "\u{1108}\u{1162}\u{11B3}",
-        nfkc: "\u{BE88}",
-        nfkd: "\u{1108}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BE89}",
-        nfc: "\u{BE89}",
-        nfd: "\u{1108}\u{1162}\u{11B4}",
-        nfkc: "\u{BE89}",
-        nfkd: "\u{1108}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BE8A}",
-        nfc: "\u{BE8A}",
-        nfd: "\u{1108}\u{1162}\u{11B5}",
-        nfkc: "\u{BE8A}",
-        nfkd: "\u{1108}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BE8B}",
-        nfc: "\u{BE8B}",
-        nfd: "\u{1108}\u{1162}\u{11B6}",
-        nfkc: "\u{BE8B}",
-        nfkd: "\u{1108}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BE8C}",
-        nfc: "\u{BE8C}",
-        nfd: "\u{1108}\u{1162}\u{11B7}",
-        nfkc: "\u{BE8C}",
-        nfkd: "\u{1108}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BE8D}",
-        nfc: "\u{BE8D}",
-        nfd: "\u{1108}\u{1162}\u{11B8}",
-        nfkc: "\u{BE8D}",
-        nfkd: "\u{1108}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BE8E}",
-        nfc: "\u{BE8E}",
-        nfd: "\u{1108}\u{1162}\u{11B9}",
-        nfkc: "\u{BE8E}",
-        nfkd: "\u{1108}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BE8F}",
-        nfc: "\u{BE8F}",
-        nfd: "\u{1108}\u{1162}\u{11BA}",
-        nfkc: "\u{BE8F}",
-        nfkd: "\u{1108}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BE90}",
-        nfc: "\u{BE90}",
-        nfd: "\u{1108}\u{1162}\u{11BB}",
-        nfkc: "\u{BE90}",
-        nfkd: "\u{1108}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BE91}",
-        nfc: "\u{BE91}",
-        nfd: "\u{1108}\u{1162}\u{11BC}",
-        nfkc: "\u{BE91}",
-        nfkd: "\u{1108}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BE92}",
-        nfc: "\u{BE92}",
-        nfd: "\u{1108}\u{1162}\u{11BD}",
-        nfkc: "\u{BE92}",
-        nfkd: "\u{1108}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BE93}",
-        nfc: "\u{BE93}",
-        nfd: "\u{1108}\u{1162}\u{11BE}",
-        nfkc: "\u{BE93}",
-        nfkd: "\u{1108}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BE94}",
-        nfc: "\u{BE94}",
-        nfd: "\u{1108}\u{1162}\u{11BF}",
-        nfkc: "\u{BE94}",
-        nfkd: "\u{1108}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BE95}",
-        nfc: "\u{BE95}",
-        nfd: "\u{1108}\u{1162}\u{11C0}",
-        nfkc: "\u{BE95}",
-        nfkd: "\u{1108}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BE96}",
-        nfc: "\u{BE96}",
-        nfd: "\u{1108}\u{1162}\u{11C1}",
-        nfkc: "\u{BE96}",
-        nfkd: "\u{1108}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BE97}",
-        nfc: "\u{BE97}",
-        nfd: "\u{1108}\u{1162}\u{11C2}",
-        nfkc: "\u{BE97}",
-        nfkd: "\u{1108}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BE98}",
-        nfc: "\u{BE98}",
-        nfd: "\u{1108}\u{1163}",
-        nfkc: "\u{BE98}",
-        nfkd: "\u{1108}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{BE99}",
-        nfc: "\u{BE99}",
-        nfd: "\u{1108}\u{1163}\u{11A8}",
-        nfkc: "\u{BE99}",
-        nfkd: "\u{1108}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BE9A}",
-        nfc: "\u{BE9A}",
-        nfd: "\u{1108}\u{1163}\u{11A9}",
-        nfkc: "\u{BE9A}",
-        nfkd: "\u{1108}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BE9B}",
-        nfc: "\u{BE9B}",
-        nfd: "\u{1108}\u{1163}\u{11AA}",
-        nfkc: "\u{BE9B}",
-        nfkd: "\u{1108}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BE9C}",
-        nfc: "\u{BE9C}",
-        nfd: "\u{1108}\u{1163}\u{11AB}",
-        nfkc: "\u{BE9C}",
-        nfkd: "\u{1108}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BE9D}",
-        nfc: "\u{BE9D}",
-        nfd: "\u{1108}\u{1163}\u{11AC}",
-        nfkc: "\u{BE9D}",
-        nfkd: "\u{1108}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BE9E}",
-        nfc: "\u{BE9E}",
-        nfd: "\u{1108}\u{1163}\u{11AD}",
-        nfkc: "\u{BE9E}",
-        nfkd: "\u{1108}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BE9F}",
-        nfc: "\u{BE9F}",
-        nfd: "\u{1108}\u{1163}\u{11AE}",
-        nfkc: "\u{BE9F}",
-        nfkd: "\u{1108}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BEA0}",
-        nfc: "\u{BEA0}",
-        nfd: "\u{1108}\u{1163}\u{11AF}",
-        nfkc: "\u{BEA0}",
-        nfkd: "\u{1108}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BEA1}",
-        nfc: "\u{BEA1}",
-        nfd: "\u{1108}\u{1163}\u{11B0}",
-        nfkc: "\u{BEA1}",
-        nfkd: "\u{1108}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BEA2}",
-        nfc: "\u{BEA2}",
-        nfd: "\u{1108}\u{1163}\u{11B1}",
-        nfkc: "\u{BEA2}",
-        nfkd: "\u{1108}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BEA3}",
-        nfc: "\u{BEA3}",
-        nfd: "\u{1108}\u{1163}\u{11B2}",
-        nfkc: "\u{BEA3}",
-        nfkd: "\u{1108}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BEA4}",
-        nfc: "\u{BEA4}",
-        nfd: "\u{1108}\u{1163}\u{11B3}",
-        nfkc: "\u{BEA4}",
-        nfkd: "\u{1108}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BEA5}",
-        nfc: "\u{BEA5}",
-        nfd: "\u{1108}\u{1163}\u{11B4}",
-        nfkc: "\u{BEA5}",
-        nfkd: "\u{1108}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BEA6}",
-        nfc: "\u{BEA6}",
-        nfd: "\u{1108}\u{1163}\u{11B5}",
-        nfkc: "\u{BEA6}",
-        nfkd: "\u{1108}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BEA7}",
-        nfc: "\u{BEA7}",
-        nfd: "\u{1108}\u{1163}\u{11B6}",
-        nfkc: "\u{BEA7}",
-        nfkd: "\u{1108}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BEA8}",
-        nfc: "\u{BEA8}",
-        nfd: "\u{1108}\u{1163}\u{11B7}",
-        nfkc: "\u{BEA8}",
-        nfkd: "\u{1108}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BEA9}",
-        nfc: "\u{BEA9}",
-        nfd: "\u{1108}\u{1163}\u{11B8}",
-        nfkc: "\u{BEA9}",
-        nfkd: "\u{1108}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BEAA}",
-        nfc: "\u{BEAA}",
-        nfd: "\u{1108}\u{1163}\u{11B9}",
-        nfkc: "\u{BEAA}",
-        nfkd: "\u{1108}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BEAB}",
-        nfc: "\u{BEAB}",
-        nfd: "\u{1108}\u{1163}\u{11BA}",
-        nfkc: "\u{BEAB}",
-        nfkd: "\u{1108}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BEAC}",
-        nfc: "\u{BEAC}",
-        nfd: "\u{1108}\u{1163}\u{11BB}",
-        nfkc: "\u{BEAC}",
-        nfkd: "\u{1108}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BEAD}",
-        nfc: "\u{BEAD}",
-        nfd: "\u{1108}\u{1163}\u{11BC}",
-        nfkc: "\u{BEAD}",
-        nfkd: "\u{1108}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BEAE}",
-        nfc: "\u{BEAE}",
-        nfd: "\u{1108}\u{1163}\u{11BD}",
-        nfkc: "\u{BEAE}",
-        nfkd: "\u{1108}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BEAF}",
-        nfc: "\u{BEAF}",
-        nfd: "\u{1108}\u{1163}\u{11BE}",
-        nfkc: "\u{BEAF}",
-        nfkd: "\u{1108}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BEB0}",
-        nfc: "\u{BEB0}",
-        nfd: "\u{1108}\u{1163}\u{11BF}",
-        nfkc: "\u{BEB0}",
-        nfkd: "\u{1108}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BEB1}",
-        nfc: "\u{BEB1}",
-        nfd: "\u{1108}\u{1163}\u{11C0}",
-        nfkc: "\u{BEB1}",
-        nfkd: "\u{1108}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BEB2}",
-        nfc: "\u{BEB2}",
-        nfd: "\u{1108}\u{1163}\u{11C1}",
-        nfkc: "\u{BEB2}",
-        nfkd: "\u{1108}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BEB3}",
-        nfc: "\u{BEB3}",
-        nfd: "\u{1108}\u{1163}\u{11C2}",
-        nfkc: "\u{BEB3}",
-        nfkd: "\u{1108}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BEB4}",
-        nfc: "\u{BEB4}",
-        nfd: "\u{1108}\u{1164}",
-        nfkc: "\u{BEB4}",
-        nfkd: "\u{1108}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{BEB5}",
-        nfc: "\u{BEB5}",
-        nfd: "\u{1108}\u{1164}\u{11A8}",
-        nfkc: "\u{BEB5}",
-        nfkd: "\u{1108}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BEB6}",
-        nfc: "\u{BEB6}",
-        nfd: "\u{1108}\u{1164}\u{11A9}",
-        nfkc: "\u{BEB6}",
-        nfkd: "\u{1108}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BEB7}",
-        nfc: "\u{BEB7}",
-        nfd: "\u{1108}\u{1164}\u{11AA}",
-        nfkc: "\u{BEB7}",
-        nfkd: "\u{1108}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BEB8}",
-        nfc: "\u{BEB8}",
-        nfd: "\u{1108}\u{1164}\u{11AB}",
-        nfkc: "\u{BEB8}",
-        nfkd: "\u{1108}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BEB9}",
-        nfc: "\u{BEB9}",
-        nfd: "\u{1108}\u{1164}\u{11AC}",
-        nfkc: "\u{BEB9}",
-        nfkd: "\u{1108}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BEBA}",
-        nfc: "\u{BEBA}",
-        nfd: "\u{1108}\u{1164}\u{11AD}",
-        nfkc: "\u{BEBA}",
-        nfkd: "\u{1108}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BEBB}",
-        nfc: "\u{BEBB}",
-        nfd: "\u{1108}\u{1164}\u{11AE}",
-        nfkc: "\u{BEBB}",
-        nfkd: "\u{1108}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BEBC}",
-        nfc: "\u{BEBC}",
-        nfd: "\u{1108}\u{1164}\u{11AF}",
-        nfkc: "\u{BEBC}",
-        nfkd: "\u{1108}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BEBD}",
-        nfc: "\u{BEBD}",
-        nfd: "\u{1108}\u{1164}\u{11B0}",
-        nfkc: "\u{BEBD}",
-        nfkd: "\u{1108}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BEBE}",
-        nfc: "\u{BEBE}",
-        nfd: "\u{1108}\u{1164}\u{11B1}",
-        nfkc: "\u{BEBE}",
-        nfkd: "\u{1108}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BEBF}",
-        nfc: "\u{BEBF}",
-        nfd: "\u{1108}\u{1164}\u{11B2}",
-        nfkc: "\u{BEBF}",
-        nfkd: "\u{1108}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BEC0}",
-        nfc: "\u{BEC0}",
-        nfd: "\u{1108}\u{1164}\u{11B3}",
-        nfkc: "\u{BEC0}",
-        nfkd: "\u{1108}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BEC1}",
-        nfc: "\u{BEC1}",
-        nfd: "\u{1108}\u{1164}\u{11B4}",
-        nfkc: "\u{BEC1}",
-        nfkd: "\u{1108}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BEC2}",
-        nfc: "\u{BEC2}",
-        nfd: "\u{1108}\u{1164}\u{11B5}",
-        nfkc: "\u{BEC2}",
-        nfkd: "\u{1108}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BEC3}",
-        nfc: "\u{BEC3}",
-        nfd: "\u{1108}\u{1164}\u{11B6}",
-        nfkc: "\u{BEC3}",
-        nfkd: "\u{1108}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BEC4}",
-        nfc: "\u{BEC4}",
-        nfd: "\u{1108}\u{1164}\u{11B7}",
-        nfkc: "\u{BEC4}",
-        nfkd: "\u{1108}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BEC5}",
-        nfc: "\u{BEC5}",
-        nfd: "\u{1108}\u{1164}\u{11B8}",
-        nfkc: "\u{BEC5}",
-        nfkd: "\u{1108}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BEC6}",
-        nfc: "\u{BEC6}",
-        nfd: "\u{1108}\u{1164}\u{11B9}",
-        nfkc: "\u{BEC6}",
-        nfkd: "\u{1108}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BEC7}",
-        nfc: "\u{BEC7}",
-        nfd: "\u{1108}\u{1164}\u{11BA}",
-        nfkc: "\u{BEC7}",
-        nfkd: "\u{1108}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BEC8}",
-        nfc: "\u{BEC8}",
-        nfd: "\u{1108}\u{1164}\u{11BB}",
-        nfkc: "\u{BEC8}",
-        nfkd: "\u{1108}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BEC9}",
-        nfc: "\u{BEC9}",
-        nfd: "\u{1108}\u{1164}\u{11BC}",
-        nfkc: "\u{BEC9}",
-        nfkd: "\u{1108}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BECA}",
-        nfc: "\u{BECA}",
-        nfd: "\u{1108}\u{1164}\u{11BD}",
-        nfkc: "\u{BECA}",
-        nfkd: "\u{1108}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BECB}",
-        nfc: "\u{BECB}",
-        nfd: "\u{1108}\u{1164}\u{11BE}",
-        nfkc: "\u{BECB}",
-        nfkd: "\u{1108}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BECC}",
-        nfc: "\u{BECC}",
-        nfd: "\u{1108}\u{1164}\u{11BF}",
-        nfkc: "\u{BECC}",
-        nfkd: "\u{1108}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BECD}",
-        nfc: "\u{BECD}",
-        nfd: "\u{1108}\u{1164}\u{11C0}",
-        nfkc: "\u{BECD}",
-        nfkd: "\u{1108}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BECE}",
-        nfc: "\u{BECE}",
-        nfd: "\u{1108}\u{1164}\u{11C1}",
-        nfkc: "\u{BECE}",
-        nfkd: "\u{1108}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BECF}",
-        nfc: "\u{BECF}",
-        nfd: "\u{1108}\u{1164}\u{11C2}",
-        nfkc: "\u{BECF}",
-        nfkd: "\u{1108}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BED0}",
-        nfc: "\u{BED0}",
-        nfd: "\u{1108}\u{1165}",
-        nfkc: "\u{BED0}",
-        nfkd: "\u{1108}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{BED1}",
-        nfc: "\u{BED1}",
-        nfd: "\u{1108}\u{1165}\u{11A8}",
-        nfkc: "\u{BED1}",
-        nfkd: "\u{1108}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BED2}",
-        nfc: "\u{BED2}",
-        nfd: "\u{1108}\u{1165}\u{11A9}",
-        nfkc: "\u{BED2}",
-        nfkd: "\u{1108}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BED3}",
-        nfc: "\u{BED3}",
-        nfd: "\u{1108}\u{1165}\u{11AA}",
-        nfkc: "\u{BED3}",
-        nfkd: "\u{1108}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BED4}",
-        nfc: "\u{BED4}",
-        nfd: "\u{1108}\u{1165}\u{11AB}",
-        nfkc: "\u{BED4}",
-        nfkd: "\u{1108}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BED5}",
-        nfc: "\u{BED5}",
-        nfd: "\u{1108}\u{1165}\u{11AC}",
-        nfkc: "\u{BED5}",
-        nfkd: "\u{1108}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BED6}",
-        nfc: "\u{BED6}",
-        nfd: "\u{1108}\u{1165}\u{11AD}",
-        nfkc: "\u{BED6}",
-        nfkd: "\u{1108}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BED7}",
-        nfc: "\u{BED7}",
-        nfd: "\u{1108}\u{1165}\u{11AE}",
-        nfkc: "\u{BED7}",
-        nfkd: "\u{1108}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BED8}",
-        nfc: "\u{BED8}",
-        nfd: "\u{1108}\u{1165}\u{11AF}",
-        nfkc: "\u{BED8}",
-        nfkd: "\u{1108}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BED9}",
-        nfc: "\u{BED9}",
-        nfd: "\u{1108}\u{1165}\u{11B0}",
-        nfkc: "\u{BED9}",
-        nfkd: "\u{1108}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BEDA}",
-        nfc: "\u{BEDA}",
-        nfd: "\u{1108}\u{1165}\u{11B1}",
-        nfkc: "\u{BEDA}",
-        nfkd: "\u{1108}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BEDB}",
-        nfc: "\u{BEDB}",
-        nfd: "\u{1108}\u{1165}\u{11B2}",
-        nfkc: "\u{BEDB}",
-        nfkd: "\u{1108}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BEDC}",
-        nfc: "\u{BEDC}",
-        nfd: "\u{1108}\u{1165}\u{11B3}",
-        nfkc: "\u{BEDC}",
-        nfkd: "\u{1108}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BEDD}",
-        nfc: "\u{BEDD}",
-        nfd: "\u{1108}\u{1165}\u{11B4}",
-        nfkc: "\u{BEDD}",
-        nfkd: "\u{1108}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BEDE}",
-        nfc: "\u{BEDE}",
-        nfd: "\u{1108}\u{1165}\u{11B5}",
-        nfkc: "\u{BEDE}",
-        nfkd: "\u{1108}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BEDF}",
-        nfc: "\u{BEDF}",
-        nfd: "\u{1108}\u{1165}\u{11B6}",
-        nfkc: "\u{BEDF}",
-        nfkd: "\u{1108}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BEE0}",
-        nfc: "\u{BEE0}",
-        nfd: "\u{1108}\u{1165}\u{11B7}",
-        nfkc: "\u{BEE0}",
-        nfkd: "\u{1108}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BEE1}",
-        nfc: "\u{BEE1}",
-        nfd: "\u{1108}\u{1165}\u{11B8}",
-        nfkc: "\u{BEE1}",
-        nfkd: "\u{1108}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BEE2}",
-        nfc: "\u{BEE2}",
-        nfd: "\u{1108}\u{1165}\u{11B9}",
-        nfkc: "\u{BEE2}",
-        nfkd: "\u{1108}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BEE3}",
-        nfc: "\u{BEE3}",
-        nfd: "\u{1108}\u{1165}\u{11BA}",
-        nfkc: "\u{BEE3}",
-        nfkd: "\u{1108}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BEE4}",
-        nfc: "\u{BEE4}",
-        nfd: "\u{1108}\u{1165}\u{11BB}",
-        nfkc: "\u{BEE4}",
-        nfkd: "\u{1108}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BEE5}",
-        nfc: "\u{BEE5}",
-        nfd: "\u{1108}\u{1165}\u{11BC}",
-        nfkc: "\u{BEE5}",
-        nfkd: "\u{1108}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BEE6}",
-        nfc: "\u{BEE6}",
-        nfd: "\u{1108}\u{1165}\u{11BD}",
-        nfkc: "\u{BEE6}",
-        nfkd: "\u{1108}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BEE7}",
-        nfc: "\u{BEE7}",
-        nfd: "\u{1108}\u{1165}\u{11BE}",
-        nfkc: "\u{BEE7}",
-        nfkd: "\u{1108}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BEE8}",
-        nfc: "\u{BEE8}",
-        nfd: "\u{1108}\u{1165}\u{11BF}",
-        nfkc: "\u{BEE8}",
-        nfkd: "\u{1108}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BEE9}",
-        nfc: "\u{BEE9}",
-        nfd: "\u{1108}\u{1165}\u{11C0}",
-        nfkc: "\u{BEE9}",
-        nfkd: "\u{1108}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BEEA}",
-        nfc: "\u{BEEA}",
-        nfd: "\u{1108}\u{1165}\u{11C1}",
-        nfkc: "\u{BEEA}",
-        nfkd: "\u{1108}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BEEB}",
-        nfc: "\u{BEEB}",
-        nfd: "\u{1108}\u{1165}\u{11C2}",
-        nfkc: "\u{BEEB}",
-        nfkd: "\u{1108}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BEEC}",
-        nfc: "\u{BEEC}",
-        nfd: "\u{1108}\u{1166}",
-        nfkc: "\u{BEEC}",
-        nfkd: "\u{1108}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{BEED}",
-        nfc: "\u{BEED}",
-        nfd: "\u{1108}\u{1166}\u{11A8}",
-        nfkc: "\u{BEED}",
-        nfkd: "\u{1108}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BEEE}",
-        nfc: "\u{BEEE}",
-        nfd: "\u{1108}\u{1166}\u{11A9}",
-        nfkc: "\u{BEEE}",
-        nfkd: "\u{1108}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BEEF}",
-        nfc: "\u{BEEF}",
-        nfd: "\u{1108}\u{1166}\u{11AA}",
-        nfkc: "\u{BEEF}",
-        nfkd: "\u{1108}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BEF0}",
-        nfc: "\u{BEF0}",
-        nfd: "\u{1108}\u{1166}\u{11AB}",
-        nfkc: "\u{BEF0}",
-        nfkd: "\u{1108}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BEF1}",
-        nfc: "\u{BEF1}",
-        nfd: "\u{1108}\u{1166}\u{11AC}",
-        nfkc: "\u{BEF1}",
-        nfkd: "\u{1108}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BEF2}",
-        nfc: "\u{BEF2}",
-        nfd: "\u{1108}\u{1166}\u{11AD}",
-        nfkc: "\u{BEF2}",
-        nfkd: "\u{1108}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BEF3}",
-        nfc: "\u{BEF3}",
-        nfd: "\u{1108}\u{1166}\u{11AE}",
-        nfkc: "\u{BEF3}",
-        nfkd: "\u{1108}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BEF4}",
-        nfc: "\u{BEF4}",
-        nfd: "\u{1108}\u{1166}\u{11AF}",
-        nfkc: "\u{BEF4}",
-        nfkd: "\u{1108}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BEF5}",
-        nfc: "\u{BEF5}",
-        nfd: "\u{1108}\u{1166}\u{11B0}",
-        nfkc: "\u{BEF5}",
-        nfkd: "\u{1108}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BEF6}",
-        nfc: "\u{BEF6}",
-        nfd: "\u{1108}\u{1166}\u{11B1}",
-        nfkc: "\u{BEF6}",
-        nfkd: "\u{1108}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BEF7}",
-        nfc: "\u{BEF7}",
-        nfd: "\u{1108}\u{1166}\u{11B2}",
-        nfkc: "\u{BEF7}",
-        nfkd: "\u{1108}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BEF8}",
-        nfc: "\u{BEF8}",
-        nfd: "\u{1108}\u{1166}\u{11B3}",
-        nfkc: "\u{BEF8}",
-        nfkd: "\u{1108}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BEF9}",
-        nfc: "\u{BEF9}",
-        nfd: "\u{1108}\u{1166}\u{11B4}",
-        nfkc: "\u{BEF9}",
-        nfkd: "\u{1108}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BEFA}",
-        nfc: "\u{BEFA}",
-        nfd: "\u{1108}\u{1166}\u{11B5}",
-        nfkc: "\u{BEFA}",
-        nfkd: "\u{1108}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BEFB}",
-        nfc: "\u{BEFB}",
-        nfd: "\u{1108}\u{1166}\u{11B6}",
-        nfkc: "\u{BEFB}",
-        nfkd: "\u{1108}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BEFC}",
-        nfc: "\u{BEFC}",
-        nfd: "\u{1108}\u{1166}\u{11B7}",
-        nfkc: "\u{BEFC}",
-        nfkd: "\u{1108}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BEFD}",
-        nfc: "\u{BEFD}",
-        nfd: "\u{1108}\u{1166}\u{11B8}",
-        nfkc: "\u{BEFD}",
-        nfkd: "\u{1108}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BEFE}",
-        nfc: "\u{BEFE}",
-        nfd: "\u{1108}\u{1166}\u{11B9}",
-        nfkc: "\u{BEFE}",
-        nfkd: "\u{1108}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BEFF}",
-        nfc: "\u{BEFF}",
-        nfd: "\u{1108}\u{1166}\u{11BA}",
-        nfkc: "\u{BEFF}",
-        nfkd: "\u{1108}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BF00}",
-        nfc: "\u{BF00}",
-        nfd: "\u{1108}\u{1166}\u{11BB}",
-        nfkc: "\u{BF00}",
-        nfkd: "\u{1108}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BF01}",
-        nfc: "\u{BF01}",
-        nfd: "\u{1108}\u{1166}\u{11BC}",
-        nfkc: "\u{BF01}",
-        nfkd: "\u{1108}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BF02}",
-        nfc: "\u{BF02}",
-        nfd: "\u{1108}\u{1166}\u{11BD}",
-        nfkc: "\u{BF02}",
-        nfkd: "\u{1108}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BF03}",
-        nfc: "\u{BF03}",
-        nfd: "\u{1108}\u{1166}\u{11BE}",
-        nfkc: "\u{BF03}",
-        nfkd: "\u{1108}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BF04}",
-        nfc: "\u{BF04}",
-        nfd: "\u{1108}\u{1166}\u{11BF}",
-        nfkc: "\u{BF04}",
-        nfkd: "\u{1108}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BF05}",
-        nfc: "\u{BF05}",
-        nfd: "\u{1108}\u{1166}\u{11C0}",
-        nfkc: "\u{BF05}",
-        nfkd: "\u{1108}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BF06}",
-        nfc: "\u{BF06}",
-        nfd: "\u{1108}\u{1166}\u{11C1}",
-        nfkc: "\u{BF06}",
-        nfkd: "\u{1108}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BF07}",
-        nfc: "\u{BF07}",
-        nfd: "\u{1108}\u{1166}\u{11C2}",
-        nfkc: "\u{BF07}",
-        nfkd: "\u{1108}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BF08}",
-        nfc: "\u{BF08}",
-        nfd: "\u{1108}\u{1167}",
-        nfkc: "\u{BF08}",
-        nfkd: "\u{1108}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{BF09}",
-        nfc: "\u{BF09}",
-        nfd: "\u{1108}\u{1167}\u{11A8}",
-        nfkc: "\u{BF09}",
-        nfkd: "\u{1108}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BF0A}",
-        nfc: "\u{BF0A}",
-        nfd: "\u{1108}\u{1167}\u{11A9}",
-        nfkc: "\u{BF0A}",
-        nfkd: "\u{1108}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BF0B}",
-        nfc: "\u{BF0B}",
-        nfd: "\u{1108}\u{1167}\u{11AA}",
-        nfkc: "\u{BF0B}",
-        nfkd: "\u{1108}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BF0C}",
-        nfc: "\u{BF0C}",
-        nfd: "\u{1108}\u{1167}\u{11AB}",
-        nfkc: "\u{BF0C}",
-        nfkd: "\u{1108}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BF0D}",
-        nfc: "\u{BF0D}",
-        nfd: "\u{1108}\u{1167}\u{11AC}",
-        nfkc: "\u{BF0D}",
-        nfkd: "\u{1108}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BF0E}",
-        nfc: "\u{BF0E}",
-        nfd: "\u{1108}\u{1167}\u{11AD}",
-        nfkc: "\u{BF0E}",
-        nfkd: "\u{1108}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BF0F}",
-        nfc: "\u{BF0F}",
-        nfd: "\u{1108}\u{1167}\u{11AE}",
-        nfkc: "\u{BF0F}",
-        nfkd: "\u{1108}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF10}",
-        nfc: "\u{BF10}",
-        nfd: "\u{1108}\u{1167}\u{11AF}",
-        nfkc: "\u{BF10}",
-        nfkd: "\u{1108}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BF11}",
-        nfc: "\u{BF11}",
-        nfd: "\u{1108}\u{1167}\u{11B0}",
-        nfkc: "\u{BF11}",
-        nfkd: "\u{1108}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BF12}",
-        nfc: "\u{BF12}",
-        nfd: "\u{1108}\u{1167}\u{11B1}",
-        nfkc: "\u{BF12}",
-        nfkd: "\u{1108}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BF13}",
-        nfc: "\u{BF13}",
-        nfd: "\u{1108}\u{1167}\u{11B2}",
-        nfkc: "\u{BF13}",
-        nfkd: "\u{1108}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BF14}",
-        nfc: "\u{BF14}",
-        nfd: "\u{1108}\u{1167}\u{11B3}",
-        nfkc: "\u{BF14}",
-        nfkd: "\u{1108}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BF15}",
-        nfc: "\u{BF15}",
-        nfd: "\u{1108}\u{1167}\u{11B4}",
-        nfkc: "\u{BF15}",
-        nfkd: "\u{1108}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BF16}",
-        nfc: "\u{BF16}",
-        nfd: "\u{1108}\u{1167}\u{11B5}",
-        nfkc: "\u{BF16}",
-        nfkd: "\u{1108}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BF17}",
-        nfc: "\u{BF17}",
-        nfd: "\u{1108}\u{1167}\u{11B6}",
-        nfkc: "\u{BF17}",
-        nfkd: "\u{1108}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BF18}",
-        nfc: "\u{BF18}",
-        nfd: "\u{1108}\u{1167}\u{11B7}",
-        nfkc: "\u{BF18}",
-        nfkd: "\u{1108}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BF19}",
-        nfc: "\u{BF19}",
-        nfd: "\u{1108}\u{1167}\u{11B8}",
-        nfkc: "\u{BF19}",
-        nfkd: "\u{1108}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BF1A}",
-        nfc: "\u{BF1A}",
-        nfd: "\u{1108}\u{1167}\u{11B9}",
-        nfkc: "\u{BF1A}",
-        nfkd: "\u{1108}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BF1B}",
-        nfc: "\u{BF1B}",
-        nfd: "\u{1108}\u{1167}\u{11BA}",
-        nfkc: "\u{BF1B}",
-        nfkd: "\u{1108}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BF1C}",
-        nfc: "\u{BF1C}",
-        nfd: "\u{1108}\u{1167}\u{11BB}",
-        nfkc: "\u{BF1C}",
-        nfkd: "\u{1108}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BF1D}",
-        nfc: "\u{BF1D}",
-        nfd: "\u{1108}\u{1167}\u{11BC}",
-        nfkc: "\u{BF1D}",
-        nfkd: "\u{1108}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BF1E}",
-        nfc: "\u{BF1E}",
-        nfd: "\u{1108}\u{1167}\u{11BD}",
-        nfkc: "\u{BF1E}",
-        nfkd: "\u{1108}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BF1F}",
-        nfc: "\u{BF1F}",
-        nfd: "\u{1108}\u{1167}\u{11BE}",
-        nfkc: "\u{BF1F}",
-        nfkd: "\u{1108}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BF20}",
-        nfc: "\u{BF20}",
-        nfd: "\u{1108}\u{1167}\u{11BF}",
-        nfkc: "\u{BF20}",
-        nfkd: "\u{1108}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BF21}",
-        nfc: "\u{BF21}",
-        nfd: "\u{1108}\u{1167}\u{11C0}",
-        nfkc: "\u{BF21}",
-        nfkd: "\u{1108}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BF22}",
-        nfc: "\u{BF22}",
-        nfd: "\u{1108}\u{1167}\u{11C1}",
-        nfkc: "\u{BF22}",
-        nfkd: "\u{1108}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BF23}",
-        nfc: "\u{BF23}",
-        nfd: "\u{1108}\u{1167}\u{11C2}",
-        nfkc: "\u{BF23}",
-        nfkd: "\u{1108}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BF24}",
-        nfc: "\u{BF24}",
-        nfd: "\u{1108}\u{1168}",
-        nfkc: "\u{BF24}",
-        nfkd: "\u{1108}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{BF25}",
-        nfc: "\u{BF25}",
-        nfd: "\u{1108}\u{1168}\u{11A8}",
-        nfkc: "\u{BF25}",
-        nfkd: "\u{1108}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BF26}",
-        nfc: "\u{BF26}",
-        nfd: "\u{1108}\u{1168}\u{11A9}",
-        nfkc: "\u{BF26}",
-        nfkd: "\u{1108}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BF27}",
-        nfc: "\u{BF27}",
-        nfd: "\u{1108}\u{1168}\u{11AA}",
-        nfkc: "\u{BF27}",
-        nfkd: "\u{1108}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BF28}",
-        nfc: "\u{BF28}",
-        nfd: "\u{1108}\u{1168}\u{11AB}",
-        nfkc: "\u{BF28}",
-        nfkd: "\u{1108}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BF29}",
-        nfc: "\u{BF29}",
-        nfd: "\u{1108}\u{1168}\u{11AC}",
-        nfkc: "\u{BF29}",
-        nfkd: "\u{1108}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BF2A}",
-        nfc: "\u{BF2A}",
-        nfd: "\u{1108}\u{1168}\u{11AD}",
-        nfkc: "\u{BF2A}",
-        nfkd: "\u{1108}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BF2B}",
-        nfc: "\u{BF2B}",
-        nfd: "\u{1108}\u{1168}\u{11AE}",
-        nfkc: "\u{BF2B}",
-        nfkd: "\u{1108}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF2C}",
-        nfc: "\u{BF2C}",
-        nfd: "\u{1108}\u{1168}\u{11AF}",
-        nfkc: "\u{BF2C}",
-        nfkd: "\u{1108}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BF2D}",
-        nfc: "\u{BF2D}",
-        nfd: "\u{1108}\u{1168}\u{11B0}",
-        nfkc: "\u{BF2D}",
-        nfkd: "\u{1108}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BF2E}",
-        nfc: "\u{BF2E}",
-        nfd: "\u{1108}\u{1168}\u{11B1}",
-        nfkc: "\u{BF2E}",
-        nfkd: "\u{1108}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BF2F}",
-        nfc: "\u{BF2F}",
-        nfd: "\u{1108}\u{1168}\u{11B2}",
-        nfkc: "\u{BF2F}",
-        nfkd: "\u{1108}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BF30}",
-        nfc: "\u{BF30}",
-        nfd: "\u{1108}\u{1168}\u{11B3}",
-        nfkc: "\u{BF30}",
-        nfkd: "\u{1108}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BF31}",
-        nfc: "\u{BF31}",
-        nfd: "\u{1108}\u{1168}\u{11B4}",
-        nfkc: "\u{BF31}",
-        nfkd: "\u{1108}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BF32}",
-        nfc: "\u{BF32}",
-        nfd: "\u{1108}\u{1168}\u{11B5}",
-        nfkc: "\u{BF32}",
-        nfkd: "\u{1108}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BF33}",
-        nfc: "\u{BF33}",
-        nfd: "\u{1108}\u{1168}\u{11B6}",
-        nfkc: "\u{BF33}",
-        nfkd: "\u{1108}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BF34}",
-        nfc: "\u{BF34}",
-        nfd: "\u{1108}\u{1168}\u{11B7}",
-        nfkc: "\u{BF34}",
-        nfkd: "\u{1108}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BF35}",
-        nfc: "\u{BF35}",
-        nfd: "\u{1108}\u{1168}\u{11B8}",
-        nfkc: "\u{BF35}",
-        nfkd: "\u{1108}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BF36}",
-        nfc: "\u{BF36}",
-        nfd: "\u{1108}\u{1168}\u{11B9}",
-        nfkc: "\u{BF36}",
-        nfkd: "\u{1108}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BF37}",
-        nfc: "\u{BF37}",
-        nfd: "\u{1108}\u{1168}\u{11BA}",
-        nfkc: "\u{BF37}",
-        nfkd: "\u{1108}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BF38}",
-        nfc: "\u{BF38}",
-        nfd: "\u{1108}\u{1168}\u{11BB}",
-        nfkc: "\u{BF38}",
-        nfkd: "\u{1108}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BF39}",
-        nfc: "\u{BF39}",
-        nfd: "\u{1108}\u{1168}\u{11BC}",
-        nfkc: "\u{BF39}",
-        nfkd: "\u{1108}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BF3A}",
-        nfc: "\u{BF3A}",
-        nfd: "\u{1108}\u{1168}\u{11BD}",
-        nfkc: "\u{BF3A}",
-        nfkd: "\u{1108}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BF3B}",
-        nfc: "\u{BF3B}",
-        nfd: "\u{1108}\u{1168}\u{11BE}",
-        nfkc: "\u{BF3B}",
-        nfkd: "\u{1108}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BF3C}",
-        nfc: "\u{BF3C}",
-        nfd: "\u{1108}\u{1168}\u{11BF}",
-        nfkc: "\u{BF3C}",
-        nfkd: "\u{1108}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BF3D}",
-        nfc: "\u{BF3D}",
-        nfd: "\u{1108}\u{1168}\u{11C0}",
-        nfkc: "\u{BF3D}",
-        nfkd: "\u{1108}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BF3E}",
-        nfc: "\u{BF3E}",
-        nfd: "\u{1108}\u{1168}\u{11C1}",
-        nfkc: "\u{BF3E}",
-        nfkd: "\u{1108}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BF3F}",
-        nfc: "\u{BF3F}",
-        nfd: "\u{1108}\u{1168}\u{11C2}",
-        nfkc: "\u{BF3F}",
-        nfkd: "\u{1108}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BF40}",
-        nfc: "\u{BF40}",
-        nfd: "\u{1108}\u{1169}",
-        nfkc: "\u{BF40}",
-        nfkd: "\u{1108}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{BF41}",
-        nfc: "\u{BF41}",
-        nfd: "\u{1108}\u{1169}\u{11A8}",
-        nfkc: "\u{BF41}",
-        nfkd: "\u{1108}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BF42}",
-        nfc: "\u{BF42}",
-        nfd: "\u{1108}\u{1169}\u{11A9}",
-        nfkc: "\u{BF42}",
-        nfkd: "\u{1108}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BF43}",
-        nfc: "\u{BF43}",
-        nfd: "\u{1108}\u{1169}\u{11AA}",
-        nfkc: "\u{BF43}",
-        nfkd: "\u{1108}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BF44}",
-        nfc: "\u{BF44}",
-        nfd: "\u{1108}\u{1169}\u{11AB}",
-        nfkc: "\u{BF44}",
-        nfkd: "\u{1108}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BF45}",
-        nfc: "\u{BF45}",
-        nfd: "\u{1108}\u{1169}\u{11AC}",
-        nfkc: "\u{BF45}",
-        nfkd: "\u{1108}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BF46}",
-        nfc: "\u{BF46}",
-        nfd: "\u{1108}\u{1169}\u{11AD}",
-        nfkc: "\u{BF46}",
-        nfkd: "\u{1108}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BF47}",
-        nfc: "\u{BF47}",
-        nfd: "\u{1108}\u{1169}\u{11AE}",
-        nfkc: "\u{BF47}",
-        nfkd: "\u{1108}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF48}",
-        nfc: "\u{BF48}",
-        nfd: "\u{1108}\u{1169}\u{11AF}",
-        nfkc: "\u{BF48}",
-        nfkd: "\u{1108}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BF49}",
-        nfc: "\u{BF49}",
-        nfd: "\u{1108}\u{1169}\u{11B0}",
-        nfkc: "\u{BF49}",
-        nfkd: "\u{1108}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BF4A}",
-        nfc: "\u{BF4A}",
-        nfd: "\u{1108}\u{1169}\u{11B1}",
-        nfkc: "\u{BF4A}",
-        nfkd: "\u{1108}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BF4B}",
-        nfc: "\u{BF4B}",
-        nfd: "\u{1108}\u{1169}\u{11B2}",
-        nfkc: "\u{BF4B}",
-        nfkd: "\u{1108}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BF4C}",
-        nfc: "\u{BF4C}",
-        nfd: "\u{1108}\u{1169}\u{11B3}",
-        nfkc: "\u{BF4C}",
-        nfkd: "\u{1108}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BF4D}",
-        nfc: "\u{BF4D}",
-        nfd: "\u{1108}\u{1169}\u{11B4}",
-        nfkc: "\u{BF4D}",
-        nfkd: "\u{1108}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BF4E}",
-        nfc: "\u{BF4E}",
-        nfd: "\u{1108}\u{1169}\u{11B5}",
-        nfkc: "\u{BF4E}",
-        nfkd: "\u{1108}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BF4F}",
-        nfc: "\u{BF4F}",
-        nfd: "\u{1108}\u{1169}\u{11B6}",
-        nfkc: "\u{BF4F}",
-        nfkd: "\u{1108}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BF50}",
-        nfc: "\u{BF50}",
-        nfd: "\u{1108}\u{1169}\u{11B7}",
-        nfkc: "\u{BF50}",
-        nfkd: "\u{1108}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BF51}",
-        nfc: "\u{BF51}",
-        nfd: "\u{1108}\u{1169}\u{11B8}",
-        nfkc: "\u{BF51}",
-        nfkd: "\u{1108}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BF52}",
-        nfc: "\u{BF52}",
-        nfd: "\u{1108}\u{1169}\u{11B9}",
-        nfkc: "\u{BF52}",
-        nfkd: "\u{1108}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BF53}",
-        nfc: "\u{BF53}",
-        nfd: "\u{1108}\u{1169}\u{11BA}",
-        nfkc: "\u{BF53}",
-        nfkd: "\u{1108}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BF54}",
-        nfc: "\u{BF54}",
-        nfd: "\u{1108}\u{1169}\u{11BB}",
-        nfkc: "\u{BF54}",
-        nfkd: "\u{1108}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BF55}",
-        nfc: "\u{BF55}",
-        nfd: "\u{1108}\u{1169}\u{11BC}",
-        nfkc: "\u{BF55}",
-        nfkd: "\u{1108}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BF56}",
-        nfc: "\u{BF56}",
-        nfd: "\u{1108}\u{1169}\u{11BD}",
-        nfkc: "\u{BF56}",
-        nfkd: "\u{1108}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BF57}",
-        nfc: "\u{BF57}",
-        nfd: "\u{1108}\u{1169}\u{11BE}",
-        nfkc: "\u{BF57}",
-        nfkd: "\u{1108}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BF58}",
-        nfc: "\u{BF58}",
-        nfd: "\u{1108}\u{1169}\u{11BF}",
-        nfkc: "\u{BF58}",
-        nfkd: "\u{1108}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BF59}",
-        nfc: "\u{BF59}",
-        nfd: "\u{1108}\u{1169}\u{11C0}",
-        nfkc: "\u{BF59}",
-        nfkd: "\u{1108}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BF5A}",
-        nfc: "\u{BF5A}",
-        nfd: "\u{1108}\u{1169}\u{11C1}",
-        nfkc: "\u{BF5A}",
-        nfkd: "\u{1108}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BF5B}",
-        nfc: "\u{BF5B}",
-        nfd: "\u{1108}\u{1169}\u{11C2}",
-        nfkc: "\u{BF5B}",
-        nfkd: "\u{1108}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BF5C}",
-        nfc: "\u{BF5C}",
-        nfd: "\u{1108}\u{116A}",
-        nfkc: "\u{BF5C}",
-        nfkd: "\u{1108}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{BF5D}",
-        nfc: "\u{BF5D}",
-        nfd: "\u{1108}\u{116A}\u{11A8}",
-        nfkc: "\u{BF5D}",
-        nfkd: "\u{1108}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BF5E}",
-        nfc: "\u{BF5E}",
-        nfd: "\u{1108}\u{116A}\u{11A9}",
-        nfkc: "\u{BF5E}",
-        nfkd: "\u{1108}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BF5F}",
-        nfc: "\u{BF5F}",
-        nfd: "\u{1108}\u{116A}\u{11AA}",
-        nfkc: "\u{BF5F}",
-        nfkd: "\u{1108}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BF60}",
-        nfc: "\u{BF60}",
-        nfd: "\u{1108}\u{116A}\u{11AB}",
-        nfkc: "\u{BF60}",
-        nfkd: "\u{1108}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BF61}",
-        nfc: "\u{BF61}",
-        nfd: "\u{1108}\u{116A}\u{11AC}",
-        nfkc: "\u{BF61}",
-        nfkd: "\u{1108}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BF62}",
-        nfc: "\u{BF62}",
-        nfd: "\u{1108}\u{116A}\u{11AD}",
-        nfkc: "\u{BF62}",
-        nfkd: "\u{1108}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BF63}",
-        nfc: "\u{BF63}",
-        nfd: "\u{1108}\u{116A}\u{11AE}",
-        nfkc: "\u{BF63}",
-        nfkd: "\u{1108}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF64}",
-        nfc: "\u{BF64}",
-        nfd: "\u{1108}\u{116A}\u{11AF}",
-        nfkc: "\u{BF64}",
-        nfkd: "\u{1108}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BF65}",
-        nfc: "\u{BF65}",
-        nfd: "\u{1108}\u{116A}\u{11B0}",
-        nfkc: "\u{BF65}",
-        nfkd: "\u{1108}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BF66}",
-        nfc: "\u{BF66}",
-        nfd: "\u{1108}\u{116A}\u{11B1}",
-        nfkc: "\u{BF66}",
-        nfkd: "\u{1108}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BF67}",
-        nfc: "\u{BF67}",
-        nfd: "\u{1108}\u{116A}\u{11B2}",
-        nfkc: "\u{BF67}",
-        nfkd: "\u{1108}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BF68}",
-        nfc: "\u{BF68}",
-        nfd: "\u{1108}\u{116A}\u{11B3}",
-        nfkc: "\u{BF68}",
-        nfkd: "\u{1108}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BF69}",
-        nfc: "\u{BF69}",
-        nfd: "\u{1108}\u{116A}\u{11B4}",
-        nfkc: "\u{BF69}",
-        nfkd: "\u{1108}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BF6A}",
-        nfc: "\u{BF6A}",
-        nfd: "\u{1108}\u{116A}\u{11B5}",
-        nfkc: "\u{BF6A}",
-        nfkd: "\u{1108}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BF6B}",
-        nfc: "\u{BF6B}",
-        nfd: "\u{1108}\u{116A}\u{11B6}",
-        nfkc: "\u{BF6B}",
-        nfkd: "\u{1108}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BF6C}",
-        nfc: "\u{BF6C}",
-        nfd: "\u{1108}\u{116A}\u{11B7}",
-        nfkc: "\u{BF6C}",
-        nfkd: "\u{1108}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BF6D}",
-        nfc: "\u{BF6D}",
-        nfd: "\u{1108}\u{116A}\u{11B8}",
-        nfkc: "\u{BF6D}",
-        nfkd: "\u{1108}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BF6E}",
-        nfc: "\u{BF6E}",
-        nfd: "\u{1108}\u{116A}\u{11B9}",
-        nfkc: "\u{BF6E}",
-        nfkd: "\u{1108}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BF6F}",
-        nfc: "\u{BF6F}",
-        nfd: "\u{1108}\u{116A}\u{11BA}",
-        nfkc: "\u{BF6F}",
-        nfkd: "\u{1108}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BF70}",
-        nfc: "\u{BF70}",
-        nfd: "\u{1108}\u{116A}\u{11BB}",
-        nfkc: "\u{BF70}",
-        nfkd: "\u{1108}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BF71}",
-        nfc: "\u{BF71}",
-        nfd: "\u{1108}\u{116A}\u{11BC}",
-        nfkc: "\u{BF71}",
-        nfkd: "\u{1108}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BF72}",
-        nfc: "\u{BF72}",
-        nfd: "\u{1108}\u{116A}\u{11BD}",
-        nfkc: "\u{BF72}",
-        nfkd: "\u{1108}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BF73}",
-        nfc: "\u{BF73}",
-        nfd: "\u{1108}\u{116A}\u{11BE}",
-        nfkc: "\u{BF73}",
-        nfkd: "\u{1108}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BF74}",
-        nfc: "\u{BF74}",
-        nfd: "\u{1108}\u{116A}\u{11BF}",
-        nfkc: "\u{BF74}",
-        nfkd: "\u{1108}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BF75}",
-        nfc: "\u{BF75}",
-        nfd: "\u{1108}\u{116A}\u{11C0}",
-        nfkc: "\u{BF75}",
-        nfkd: "\u{1108}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BF76}",
-        nfc: "\u{BF76}",
-        nfd: "\u{1108}\u{116A}\u{11C1}",
-        nfkc: "\u{BF76}",
-        nfkd: "\u{1108}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BF77}",
-        nfc: "\u{BF77}",
-        nfd: "\u{1108}\u{116A}\u{11C2}",
-        nfkc: "\u{BF77}",
-        nfkd: "\u{1108}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BF78}",
-        nfc: "\u{BF78}",
-        nfd: "\u{1108}\u{116B}",
-        nfkc: "\u{BF78}",
-        nfkd: "\u{1108}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{BF79}",
-        nfc: "\u{BF79}",
-        nfd: "\u{1108}\u{116B}\u{11A8}",
-        nfkc: "\u{BF79}",
-        nfkd: "\u{1108}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BF7A}",
-        nfc: "\u{BF7A}",
-        nfd: "\u{1108}\u{116B}\u{11A9}",
-        nfkc: "\u{BF7A}",
-        nfkd: "\u{1108}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BF7B}",
-        nfc: "\u{BF7B}",
-        nfd: "\u{1108}\u{116B}\u{11AA}",
-        nfkc: "\u{BF7B}",
-        nfkd: "\u{1108}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BF7C}",
-        nfc: "\u{BF7C}",
-        nfd: "\u{1108}\u{116B}\u{11AB}",
-        nfkc: "\u{BF7C}",
-        nfkd: "\u{1108}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BF7D}",
-        nfc: "\u{BF7D}",
-        nfd: "\u{1108}\u{116B}\u{11AC}",
-        nfkc: "\u{BF7D}",
-        nfkd: "\u{1108}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BF7E}",
-        nfc: "\u{BF7E}",
-        nfd: "\u{1108}\u{116B}\u{11AD}",
-        nfkc: "\u{BF7E}",
-        nfkd: "\u{1108}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BF7F}",
-        nfc: "\u{BF7F}",
-        nfd: "\u{1108}\u{116B}\u{11AE}",
-        nfkc: "\u{BF7F}",
-        nfkd: "\u{1108}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF80}",
-        nfc: "\u{BF80}",
-        nfd: "\u{1108}\u{116B}\u{11AF}",
-        nfkc: "\u{BF80}",
-        nfkd: "\u{1108}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BF81}",
-        nfc: "\u{BF81}",
-        nfd: "\u{1108}\u{116B}\u{11B0}",
-        nfkc: "\u{BF81}",
-        nfkd: "\u{1108}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BF82}",
-        nfc: "\u{BF82}",
-        nfd: "\u{1108}\u{116B}\u{11B1}",
-        nfkc: "\u{BF82}",
-        nfkd: "\u{1108}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BF83}",
-        nfc: "\u{BF83}",
-        nfd: "\u{1108}\u{116B}\u{11B2}",
-        nfkc: "\u{BF83}",
-        nfkd: "\u{1108}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BF84}",
-        nfc: "\u{BF84}",
-        nfd: "\u{1108}\u{116B}\u{11B3}",
-        nfkc: "\u{BF84}",
-        nfkd: "\u{1108}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BF85}",
-        nfc: "\u{BF85}",
-        nfd: "\u{1108}\u{116B}\u{11B4}",
-        nfkc: "\u{BF85}",
-        nfkd: "\u{1108}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BF86}",
-        nfc: "\u{BF86}",
-        nfd: "\u{1108}\u{116B}\u{11B5}",
-        nfkc: "\u{BF86}",
-        nfkd: "\u{1108}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BF87}",
-        nfc: "\u{BF87}",
-        nfd: "\u{1108}\u{116B}\u{11B6}",
-        nfkc: "\u{BF87}",
-        nfkd: "\u{1108}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BF88}",
-        nfc: "\u{BF88}",
-        nfd: "\u{1108}\u{116B}\u{11B7}",
-        nfkc: "\u{BF88}",
-        nfkd: "\u{1108}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BF89}",
-        nfc: "\u{BF89}",
-        nfd: "\u{1108}\u{116B}\u{11B8}",
-        nfkc: "\u{BF89}",
-        nfkd: "\u{1108}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BF8A}",
-        nfc: "\u{BF8A}",
-        nfd: "\u{1108}\u{116B}\u{11B9}",
-        nfkc: "\u{BF8A}",
-        nfkd: "\u{1108}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BF8B}",
-        nfc: "\u{BF8B}",
-        nfd: "\u{1108}\u{116B}\u{11BA}",
-        nfkc: "\u{BF8B}",
-        nfkd: "\u{1108}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BF8C}",
-        nfc: "\u{BF8C}",
-        nfd: "\u{1108}\u{116B}\u{11BB}",
-        nfkc: "\u{BF8C}",
-        nfkd: "\u{1108}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BF8D}",
-        nfc: "\u{BF8D}",
-        nfd: "\u{1108}\u{116B}\u{11BC}",
-        nfkc: "\u{BF8D}",
-        nfkd: "\u{1108}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BF8E}",
-        nfc: "\u{BF8E}",
-        nfd: "\u{1108}\u{116B}\u{11BD}",
-        nfkc: "\u{BF8E}",
-        nfkd: "\u{1108}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BF8F}",
-        nfc: "\u{BF8F}",
-        nfd: "\u{1108}\u{116B}\u{11BE}",
-        nfkc: "\u{BF8F}",
-        nfkd: "\u{1108}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BF90}",
-        nfc: "\u{BF90}",
-        nfd: "\u{1108}\u{116B}\u{11BF}",
-        nfkc: "\u{BF90}",
-        nfkd: "\u{1108}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BF91}",
-        nfc: "\u{BF91}",
-        nfd: "\u{1108}\u{116B}\u{11C0}",
-        nfkc: "\u{BF91}",
-        nfkd: "\u{1108}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BF92}",
-        nfc: "\u{BF92}",
-        nfd: "\u{1108}\u{116B}\u{11C1}",
-        nfkc: "\u{BF92}",
-        nfkd: "\u{1108}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BF93}",
-        nfc: "\u{BF93}",
-        nfd: "\u{1108}\u{116B}\u{11C2}",
-        nfkc: "\u{BF93}",
-        nfkd: "\u{1108}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BF94}",
-        nfc: "\u{BF94}",
-        nfd: "\u{1108}\u{116C}",
-        nfkc: "\u{BF94}",
-        nfkd: "\u{1108}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{BF95}",
-        nfc: "\u{BF95}",
-        nfd: "\u{1108}\u{116C}\u{11A8}",
-        nfkc: "\u{BF95}",
-        nfkd: "\u{1108}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BF96}",
-        nfc: "\u{BF96}",
-        nfd: "\u{1108}\u{116C}\u{11A9}",
-        nfkc: "\u{BF96}",
-        nfkd: "\u{1108}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BF97}",
-        nfc: "\u{BF97}",
-        nfd: "\u{1108}\u{116C}\u{11AA}",
-        nfkc: "\u{BF97}",
-        nfkd: "\u{1108}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BF98}",
-        nfc: "\u{BF98}",
-        nfd: "\u{1108}\u{116C}\u{11AB}",
-        nfkc: "\u{BF98}",
-        nfkd: "\u{1108}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BF99}",
-        nfc: "\u{BF99}",
-        nfd: "\u{1108}\u{116C}\u{11AC}",
-        nfkc: "\u{BF99}",
-        nfkd: "\u{1108}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BF9A}",
-        nfc: "\u{BF9A}",
-        nfd: "\u{1108}\u{116C}\u{11AD}",
-        nfkc: "\u{BF9A}",
-        nfkd: "\u{1108}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BF9B}",
-        nfc: "\u{BF9B}",
-        nfd: "\u{1108}\u{116C}\u{11AE}",
-        nfkc: "\u{BF9B}",
-        nfkd: "\u{1108}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF9C}",
-        nfc: "\u{BF9C}",
-        nfd: "\u{1108}\u{116C}\u{11AF}",
-        nfkc: "\u{BF9C}",
-        nfkd: "\u{1108}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BF9D}",
-        nfc: "\u{BF9D}",
-        nfd: "\u{1108}\u{116C}\u{11B0}",
-        nfkc: "\u{BF9D}",
-        nfkd: "\u{1108}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BF9E}",
-        nfc: "\u{BF9E}",
-        nfd: "\u{1108}\u{116C}\u{11B1}",
-        nfkc: "\u{BF9E}",
-        nfkd: "\u{1108}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BF9F}",
-        nfc: "\u{BF9F}",
-        nfd: "\u{1108}\u{116C}\u{11B2}",
-        nfkc: "\u{BF9F}",
-        nfkd: "\u{1108}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BFA0}",
-        nfc: "\u{BFA0}",
-        nfd: "\u{1108}\u{116C}\u{11B3}",
-        nfkc: "\u{BFA0}",
-        nfkd: "\u{1108}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BFA1}",
-        nfc: "\u{BFA1}",
-        nfd: "\u{1108}\u{116C}\u{11B4}",
-        nfkc: "\u{BFA1}",
-        nfkd: "\u{1108}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BFA2}",
-        nfc: "\u{BFA2}",
-        nfd: "\u{1108}\u{116C}\u{11B5}",
-        nfkc: "\u{BFA2}",
-        nfkd: "\u{1108}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BFA3}",
-        nfc: "\u{BFA3}",
-        nfd: "\u{1108}\u{116C}\u{11B6}",
-        nfkc: "\u{BFA3}",
-        nfkd: "\u{1108}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BFA4}",
-        nfc: "\u{BFA4}",
-        nfd: "\u{1108}\u{116C}\u{11B7}",
-        nfkc: "\u{BFA4}",
-        nfkd: "\u{1108}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BFA5}",
-        nfc: "\u{BFA5}",
-        nfd: "\u{1108}\u{116C}\u{11B8}",
-        nfkc: "\u{BFA5}",
-        nfkd: "\u{1108}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BFA6}",
-        nfc: "\u{BFA6}",
-        nfd: "\u{1108}\u{116C}\u{11B9}",
-        nfkc: "\u{BFA6}",
-        nfkd: "\u{1108}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BFA7}",
-        nfc: "\u{BFA7}",
-        nfd: "\u{1108}\u{116C}\u{11BA}",
-        nfkc: "\u{BFA7}",
-        nfkd: "\u{1108}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BFA8}",
-        nfc: "\u{BFA8}",
-        nfd: "\u{1108}\u{116C}\u{11BB}",
-        nfkc: "\u{BFA8}",
-        nfkd: "\u{1108}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BFA9}",
-        nfc: "\u{BFA9}",
-        nfd: "\u{1108}\u{116C}\u{11BC}",
-        nfkc: "\u{BFA9}",
-        nfkd: "\u{1108}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BFAA}",
-        nfc: "\u{BFAA}",
-        nfd: "\u{1108}\u{116C}\u{11BD}",
-        nfkc: "\u{BFAA}",
-        nfkd: "\u{1108}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BFAB}",
-        nfc: "\u{BFAB}",
-        nfd: "\u{1108}\u{116C}\u{11BE}",
-        nfkc: "\u{BFAB}",
-        nfkd: "\u{1108}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BFAC}",
-        nfc: "\u{BFAC}",
-        nfd: "\u{1108}\u{116C}\u{11BF}",
-        nfkc: "\u{BFAC}",
-        nfkd: "\u{1108}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BFAD}",
-        nfc: "\u{BFAD}",
-        nfd: "\u{1108}\u{116C}\u{11C0}",
-        nfkc: "\u{BFAD}",
-        nfkd: "\u{1108}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BFAE}",
-        nfc: "\u{BFAE}",
-        nfd: "\u{1108}\u{116C}\u{11C1}",
-        nfkc: "\u{BFAE}",
-        nfkd: "\u{1108}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BFAF}",
-        nfc: "\u{BFAF}",
-        nfd: "\u{1108}\u{116C}\u{11C2}",
-        nfkc: "\u{BFAF}",
-        nfkd: "\u{1108}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BFB0}",
-        nfc: "\u{BFB0}",
-        nfd: "\u{1108}\u{116D}",
-        nfkc: "\u{BFB0}",
-        nfkd: "\u{1108}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{BFB1}",
-        nfc: "\u{BFB1}",
-        nfd: "\u{1108}\u{116D}\u{11A8}",
-        nfkc: "\u{BFB1}",
-        nfkd: "\u{1108}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BFB2}",
-        nfc: "\u{BFB2}",
-        nfd: "\u{1108}\u{116D}\u{11A9}",
-        nfkc: "\u{BFB2}",
-        nfkd: "\u{1108}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BFB3}",
-        nfc: "\u{BFB3}",
-        nfd: "\u{1108}\u{116D}\u{11AA}",
-        nfkc: "\u{BFB3}",
-        nfkd: "\u{1108}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BFB4}",
-        nfc: "\u{BFB4}",
-        nfd: "\u{1108}\u{116D}\u{11AB}",
-        nfkc: "\u{BFB4}",
-        nfkd: "\u{1108}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BFB5}",
-        nfc: "\u{BFB5}",
-        nfd: "\u{1108}\u{116D}\u{11AC}",
-        nfkc: "\u{BFB5}",
-        nfkd: "\u{1108}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BFB6}",
-        nfc: "\u{BFB6}",
-        nfd: "\u{1108}\u{116D}\u{11AD}",
-        nfkc: "\u{BFB6}",
-        nfkd: "\u{1108}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BFB7}",
-        nfc: "\u{BFB7}",
-        nfd: "\u{1108}\u{116D}\u{11AE}",
-        nfkc: "\u{BFB7}",
-        nfkd: "\u{1108}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BFB8}",
-        nfc: "\u{BFB8}",
-        nfd: "\u{1108}\u{116D}\u{11AF}",
-        nfkc: "\u{BFB8}",
-        nfkd: "\u{1108}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BFB9}",
-        nfc: "\u{BFB9}",
-        nfd: "\u{1108}\u{116D}\u{11B0}",
-        nfkc: "\u{BFB9}",
-        nfkd: "\u{1108}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BFBA}",
-        nfc: "\u{BFBA}",
-        nfd: "\u{1108}\u{116D}\u{11B1}",
-        nfkc: "\u{BFBA}",
-        nfkd: "\u{1108}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BFBB}",
-        nfc: "\u{BFBB}",
-        nfd: "\u{1108}\u{116D}\u{11B2}",
-        nfkc: "\u{BFBB}",
-        nfkd: "\u{1108}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BFBC}",
-        nfc: "\u{BFBC}",
-        nfd: "\u{1108}\u{116D}\u{11B3}",
-        nfkc: "\u{BFBC}",
-        nfkd: "\u{1108}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BFBD}",
-        nfc: "\u{BFBD}",
-        nfd: "\u{1108}\u{116D}\u{11B4}",
-        nfkc: "\u{BFBD}",
-        nfkd: "\u{1108}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BFBE}",
-        nfc: "\u{BFBE}",
-        nfd: "\u{1108}\u{116D}\u{11B5}",
-        nfkc: "\u{BFBE}",
-        nfkd: "\u{1108}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BFBF}",
-        nfc: "\u{BFBF}",
-        nfd: "\u{1108}\u{116D}\u{11B6}",
-        nfkc: "\u{BFBF}",
-        nfkd: "\u{1108}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BFC0}",
-        nfc: "\u{BFC0}",
-        nfd: "\u{1108}\u{116D}\u{11B7}",
-        nfkc: "\u{BFC0}",
-        nfkd: "\u{1108}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BFC1}",
-        nfc: "\u{BFC1}",
-        nfd: "\u{1108}\u{116D}\u{11B8}",
-        nfkc: "\u{BFC1}",
-        nfkd: "\u{1108}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BFC2}",
-        nfc: "\u{BFC2}",
-        nfd: "\u{1108}\u{116D}\u{11B9}",
-        nfkc: "\u{BFC2}",
-        nfkd: "\u{1108}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BFC3}",
-        nfc: "\u{BFC3}",
-        nfd: "\u{1108}\u{116D}\u{11BA}",
-        nfkc: "\u{BFC3}",
-        nfkd: "\u{1108}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BFC4}",
-        nfc: "\u{BFC4}",
-        nfd: "\u{1108}\u{116D}\u{11BB}",
-        nfkc: "\u{BFC4}",
-        nfkd: "\u{1108}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BFC5}",
-        nfc: "\u{BFC5}",
-        nfd: "\u{1108}\u{116D}\u{11BC}",
-        nfkc: "\u{BFC5}",
-        nfkd: "\u{1108}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BFC6}",
-        nfc: "\u{BFC6}",
-        nfd: "\u{1108}\u{116D}\u{11BD}",
-        nfkc: "\u{BFC6}",
-        nfkd: "\u{1108}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BFC7}",
-        nfc: "\u{BFC7}",
-        nfd: "\u{1108}\u{116D}\u{11BE}",
-        nfkc: "\u{BFC7}",
-        nfkd: "\u{1108}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BFC8}",
-        nfc: "\u{BFC8}",
-        nfd: "\u{1108}\u{116D}\u{11BF}",
-        nfkc: "\u{BFC8}",
-        nfkd: "\u{1108}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BFC9}",
-        nfc: "\u{BFC9}",
-        nfd: "\u{1108}\u{116D}\u{11C0}",
-        nfkc: "\u{BFC9}",
-        nfkd: "\u{1108}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BFCA}",
-        nfc: "\u{BFCA}",
-        nfd: "\u{1108}\u{116D}\u{11C1}",
-        nfkc: "\u{BFCA}",
-        nfkd: "\u{1108}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BFCB}",
-        nfc: "\u{BFCB}",
-        nfd: "\u{1108}\u{116D}\u{11C2}",
-        nfkc: "\u{BFCB}",
-        nfkd: "\u{1108}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BFCC}",
-        nfc: "\u{BFCC}",
-        nfd: "\u{1108}\u{116E}",
-        nfkc: "\u{BFCC}",
-        nfkd: "\u{1108}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{BFCD}",
-        nfc: "\u{BFCD}",
-        nfd: "\u{1108}\u{116E}\u{11A8}",
-        nfkc: "\u{BFCD}",
-        nfkd: "\u{1108}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BFCE}",
-        nfc: "\u{BFCE}",
-        nfd: "\u{1108}\u{116E}\u{11A9}",
-        nfkc: "\u{BFCE}",
-        nfkd: "\u{1108}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BFCF}",
-        nfc: "\u{BFCF}",
-        nfd: "\u{1108}\u{116E}\u{11AA}",
-        nfkc: "\u{BFCF}",
-        nfkd: "\u{1108}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BFD0}",
-        nfc: "\u{BFD0}",
-        nfd: "\u{1108}\u{116E}\u{11AB}",
-        nfkc: "\u{BFD0}",
-        nfkd: "\u{1108}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BFD1}",
-        nfc: "\u{BFD1}",
-        nfd: "\u{1108}\u{116E}\u{11AC}",
-        nfkc: "\u{BFD1}",
-        nfkd: "\u{1108}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BFD2}",
-        nfc: "\u{BFD2}",
-        nfd: "\u{1108}\u{116E}\u{11AD}",
-        nfkc: "\u{BFD2}",
-        nfkd: "\u{1108}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BFD3}",
-        nfc: "\u{BFD3}",
-        nfd: "\u{1108}\u{116E}\u{11AE}",
-        nfkc: "\u{BFD3}",
-        nfkd: "\u{1108}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BFD4}",
-        nfc: "\u{BFD4}",
-        nfd: "\u{1108}\u{116E}\u{11AF}",
-        nfkc: "\u{BFD4}",
-        nfkd: "\u{1108}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BFD5}",
-        nfc: "\u{BFD5}",
-        nfd: "\u{1108}\u{116E}\u{11B0}",
-        nfkc: "\u{BFD5}",
-        nfkd: "\u{1108}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BFD6}",
-        nfc: "\u{BFD6}",
-        nfd: "\u{1108}\u{116E}\u{11B1}",
-        nfkc: "\u{BFD6}",
-        nfkd: "\u{1108}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BFD7}",
-        nfc: "\u{BFD7}",
-        nfd: "\u{1108}\u{116E}\u{11B2}",
-        nfkc: "\u{BFD7}",
-        nfkd: "\u{1108}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BFD8}",
-        nfc: "\u{BFD8}",
-        nfd: "\u{1108}\u{116E}\u{11B3}",
-        nfkc: "\u{BFD8}",
-        nfkd: "\u{1108}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BFD9}",
-        nfc: "\u{BFD9}",
-        nfd: "\u{1108}\u{116E}\u{11B4}",
-        nfkc: "\u{BFD9}",
-        nfkd: "\u{1108}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BFDA}",
-        nfc: "\u{BFDA}",
-        nfd: "\u{1108}\u{116E}\u{11B5}",
-        nfkc: "\u{BFDA}",
-        nfkd: "\u{1108}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BFDB}",
-        nfc: "\u{BFDB}",
-        nfd: "\u{1108}\u{116E}\u{11B6}",
-        nfkc: "\u{BFDB}",
-        nfkd: "\u{1108}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BFDC}",
-        nfc: "\u{BFDC}",
-        nfd: "\u{1108}\u{116E}\u{11B7}",
-        nfkc: "\u{BFDC}",
-        nfkd: "\u{1108}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BFDD}",
-        nfc: "\u{BFDD}",
-        nfd: "\u{1108}\u{116E}\u{11B8}",
-        nfkc: "\u{BFDD}",
-        nfkd: "\u{1108}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BFDE}",
-        nfc: "\u{BFDE}",
-        nfd: "\u{1108}\u{116E}\u{11B9}",
-        nfkc: "\u{BFDE}",
-        nfkd: "\u{1108}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BFDF}",
-        nfc: "\u{BFDF}",
-        nfd: "\u{1108}\u{116E}\u{11BA}",
-        nfkc: "\u{BFDF}",
-        nfkd: "\u{1108}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BFE0}",
-        nfc: "\u{BFE0}",
-        nfd: "\u{1108}\u{116E}\u{11BB}",
-        nfkc: "\u{BFE0}",
-        nfkd: "\u{1108}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BFE1}",
-        nfc: "\u{BFE1}",
-        nfd: "\u{1108}\u{116E}\u{11BC}",
-        nfkc: "\u{BFE1}",
-        nfkd: "\u{1108}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BFE2}",
-        nfc: "\u{BFE2}",
-        nfd: "\u{1108}\u{116E}\u{11BD}",
-        nfkc: "\u{BFE2}",
-        nfkd: "\u{1108}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BFE3}",
-        nfc: "\u{BFE3}",
-        nfd: "\u{1108}\u{116E}\u{11BE}",
-        nfkc: "\u{BFE3}",
-        nfkd: "\u{1108}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{BFE4}",
-        nfc: "\u{BFE4}",
-        nfd: "\u{1108}\u{116E}\u{11BF}",
-        nfkc: "\u{BFE4}",
-        nfkd: "\u{1108}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{BFE5}",
-        nfc: "\u{BFE5}",
-        nfd: "\u{1108}\u{116E}\u{11C0}",
-        nfkc: "\u{BFE5}",
-        nfkd: "\u{1108}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{BFE6}",
-        nfc: "\u{BFE6}",
-        nfd: "\u{1108}\u{116E}\u{11C1}",
-        nfkc: "\u{BFE6}",
-        nfkd: "\u{1108}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{BFE7}",
-        nfc: "\u{BFE7}",
-        nfd: "\u{1108}\u{116E}\u{11C2}",
-        nfkc: "\u{BFE7}",
-        nfkd: "\u{1108}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{BFE8}",
-        nfc: "\u{BFE8}",
-        nfd: "\u{1108}\u{116F}",
-        nfkc: "\u{BFE8}",
-        nfkd: "\u{1108}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{BFE9}",
-        nfc: "\u{BFE9}",
-        nfd: "\u{1108}\u{116F}\u{11A8}",
-        nfkc: "\u{BFE9}",
-        nfkd: "\u{1108}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{BFEA}",
-        nfc: "\u{BFEA}",
-        nfd: "\u{1108}\u{116F}\u{11A9}",
-        nfkc: "\u{BFEA}",
-        nfkd: "\u{1108}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{BFEB}",
-        nfc: "\u{BFEB}",
-        nfd: "\u{1108}\u{116F}\u{11AA}",
-        nfkc: "\u{BFEB}",
-        nfkd: "\u{1108}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{BFEC}",
-        nfc: "\u{BFEC}",
-        nfd: "\u{1108}\u{116F}\u{11AB}",
-        nfkc: "\u{BFEC}",
-        nfkd: "\u{1108}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{BFED}",
-        nfc: "\u{BFED}",
-        nfd: "\u{1108}\u{116F}\u{11AC}",
-        nfkc: "\u{BFED}",
-        nfkd: "\u{1108}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{BFEE}",
-        nfc: "\u{BFEE}",
-        nfd: "\u{1108}\u{116F}\u{11AD}",
-        nfkc: "\u{BFEE}",
-        nfkd: "\u{1108}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{BFEF}",
-        nfc: "\u{BFEF}",
-        nfd: "\u{1108}\u{116F}\u{11AE}",
-        nfkc: "\u{BFEF}",
-        nfkd: "\u{1108}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BFF0}",
-        nfc: "\u{BFF0}",
-        nfd: "\u{1108}\u{116F}\u{11AF}",
-        nfkc: "\u{BFF0}",
-        nfkd: "\u{1108}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{BFF1}",
-        nfc: "\u{BFF1}",
-        nfd: "\u{1108}\u{116F}\u{11B0}",
-        nfkc: "\u{BFF1}",
-        nfkd: "\u{1108}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{BFF2}",
-        nfc: "\u{BFF2}",
-        nfd: "\u{1108}\u{116F}\u{11B1}",
-        nfkc: "\u{BFF2}",
-        nfkd: "\u{1108}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{BFF3}",
-        nfc: "\u{BFF3}",
-        nfd: "\u{1108}\u{116F}\u{11B2}",
-        nfkc: "\u{BFF3}",
-        nfkd: "\u{1108}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{BFF4}",
-        nfc: "\u{BFF4}",
-        nfd: "\u{1108}\u{116F}\u{11B3}",
-        nfkc: "\u{BFF4}",
-        nfkd: "\u{1108}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{BFF5}",
-        nfc: "\u{BFF5}",
-        nfd: "\u{1108}\u{116F}\u{11B4}",
-        nfkc: "\u{BFF5}",
-        nfkd: "\u{1108}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{BFF6}",
-        nfc: "\u{BFF6}",
-        nfd: "\u{1108}\u{116F}\u{11B5}",
-        nfkc: "\u{BFF6}",
-        nfkd: "\u{1108}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BFF7}",
-        nfc: "\u{BFF7}",
-        nfd: "\u{1108}\u{116F}\u{11B6}",
-        nfkc: "\u{BFF7}",
-        nfkd: "\u{1108}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{BFF8}",
-        nfc: "\u{BFF8}",
-        nfd: "\u{1108}\u{116F}\u{11B7}",
-        nfkc: "\u{BFF8}",
-        nfkd: "\u{1108}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{BFF9}",
-        nfc: "\u{BFF9}",
-        nfd: "\u{1108}\u{116F}\u{11B8}",
-        nfkc: "\u{BFF9}",
-        nfkd: "\u{1108}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{BFFA}",
-        nfc: "\u{BFFA}",
-        nfd: "\u{1108}\u{116F}\u{11B9}",
-        nfkc: "\u{BFFA}",
-        nfkd: "\u{1108}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{BFFB}",
-        nfc: "\u{BFFB}",
-        nfd: "\u{1108}\u{116F}\u{11BA}",
-        nfkc: "\u{BFFB}",
-        nfkd: "\u{1108}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{BFFC}",
-        nfc: "\u{BFFC}",
-        nfd: "\u{1108}\u{116F}\u{11BB}",
-        nfkc: "\u{BFFC}",
-        nfkd: "\u{1108}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{BFFD}",
-        nfc: "\u{BFFD}",
-        nfd: "\u{1108}\u{116F}\u{11BC}",
-        nfkc: "\u{BFFD}",
-        nfkd: "\u{1108}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BFFE}",
-        nfc: "\u{BFFE}",
-        nfd: "\u{1108}\u{116F}\u{11BD}",
-        nfkc: "\u{BFFE}",
-        nfkd: "\u{1108}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{BFFF}",
-        nfc: "\u{BFFF}",
-        nfd: "\u{1108}\u{116F}\u{11BE}",
-        nfkc: "\u{BFFF}",
-        nfkd: "\u{1108}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C000}",
-        nfc: "\u{C000}",
-        nfd: "\u{1108}\u{116F}\u{11BF}",
-        nfkc: "\u{C000}",
-        nfkd: "\u{1108}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C001}",
-        nfc: "\u{C001}",
-        nfd: "\u{1108}\u{116F}\u{11C0}",
-        nfkc: "\u{C001}",
-        nfkd: "\u{1108}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C002}",
-        nfc: "\u{C002}",
-        nfd: "\u{1108}\u{116F}\u{11C1}",
-        nfkc: "\u{C002}",
-        nfkd: "\u{1108}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C003}",
-        nfc: "\u{C003}",
-        nfd: "\u{1108}\u{116F}\u{11C2}",
-        nfkc: "\u{C003}",
-        nfkd: "\u{1108}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C004}",
-        nfc: "\u{C004}",
-        nfd: "\u{1108}\u{1170}",
-        nfkc: "\u{C004}",
-        nfkd: "\u{1108}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{C005}",
-        nfc: "\u{C005}",
-        nfd: "\u{1108}\u{1170}\u{11A8}",
-        nfkc: "\u{C005}",
-        nfkd: "\u{1108}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C006}",
-        nfc: "\u{C006}",
-        nfd: "\u{1108}\u{1170}\u{11A9}",
-        nfkc: "\u{C006}",
-        nfkd: "\u{1108}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C007}",
-        nfc: "\u{C007}",
-        nfd: "\u{1108}\u{1170}\u{11AA}",
-        nfkc: "\u{C007}",
-        nfkd: "\u{1108}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C008}",
-        nfc: "\u{C008}",
-        nfd: "\u{1108}\u{1170}\u{11AB}",
-        nfkc: "\u{C008}",
-        nfkd: "\u{1108}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C009}",
-        nfc: "\u{C009}",
-        nfd: "\u{1108}\u{1170}\u{11AC}",
-        nfkc: "\u{C009}",
-        nfkd: "\u{1108}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C00A}",
-        nfc: "\u{C00A}",
-        nfd: "\u{1108}\u{1170}\u{11AD}",
-        nfkc: "\u{C00A}",
-        nfkd: "\u{1108}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C00B}",
-        nfc: "\u{C00B}",
-        nfd: "\u{1108}\u{1170}\u{11AE}",
-        nfkc: "\u{C00B}",
-        nfkd: "\u{1108}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C00C}",
-        nfc: "\u{C00C}",
-        nfd: "\u{1108}\u{1170}\u{11AF}",
-        nfkc: "\u{C00C}",
-        nfkd: "\u{1108}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C00D}",
-        nfc: "\u{C00D}",
-        nfd: "\u{1108}\u{1170}\u{11B0}",
-        nfkc: "\u{C00D}",
-        nfkd: "\u{1108}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C00E}",
-        nfc: "\u{C00E}",
-        nfd: "\u{1108}\u{1170}\u{11B1}",
-        nfkc: "\u{C00E}",
-        nfkd: "\u{1108}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C00F}",
-        nfc: "\u{C00F}",
-        nfd: "\u{1108}\u{1170}\u{11B2}",
-        nfkc: "\u{C00F}",
-        nfkd: "\u{1108}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C010}",
-        nfc: "\u{C010}",
-        nfd: "\u{1108}\u{1170}\u{11B3}",
-        nfkc: "\u{C010}",
-        nfkd: "\u{1108}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C011}",
-        nfc: "\u{C011}",
-        nfd: "\u{1108}\u{1170}\u{11B4}",
-        nfkc: "\u{C011}",
-        nfkd: "\u{1108}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C012}",
-        nfc: "\u{C012}",
-        nfd: "\u{1108}\u{1170}\u{11B5}",
-        nfkc: "\u{C012}",
-        nfkd: "\u{1108}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C013}",
-        nfc: "\u{C013}",
-        nfd: "\u{1108}\u{1170}\u{11B6}",
-        nfkc: "\u{C013}",
-        nfkd: "\u{1108}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C014}",
-        nfc: "\u{C014}",
-        nfd: "\u{1108}\u{1170}\u{11B7}",
-        nfkc: "\u{C014}",
-        nfkd: "\u{1108}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C015}",
-        nfc: "\u{C015}",
-        nfd: "\u{1108}\u{1170}\u{11B8}",
-        nfkc: "\u{C015}",
-        nfkd: "\u{1108}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C016}",
-        nfc: "\u{C016}",
-        nfd: "\u{1108}\u{1170}\u{11B9}",
-        nfkc: "\u{C016}",
-        nfkd: "\u{1108}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C017}",
-        nfc: "\u{C017}",
-        nfd: "\u{1108}\u{1170}\u{11BA}",
-        nfkc: "\u{C017}",
-        nfkd: "\u{1108}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C018}",
-        nfc: "\u{C018}",
-        nfd: "\u{1108}\u{1170}\u{11BB}",
-        nfkc: "\u{C018}",
-        nfkd: "\u{1108}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C019}",
-        nfc: "\u{C019}",
-        nfd: "\u{1108}\u{1170}\u{11BC}",
-        nfkc: "\u{C019}",
-        nfkd: "\u{1108}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C01A}",
-        nfc: "\u{C01A}",
-        nfd: "\u{1108}\u{1170}\u{11BD}",
-        nfkc: "\u{C01A}",
-        nfkd: "\u{1108}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C01B}",
-        nfc: "\u{C01B}",
-        nfd: "\u{1108}\u{1170}\u{11BE}",
-        nfkc: "\u{C01B}",
-        nfkd: "\u{1108}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C01C}",
-        nfc: "\u{C01C}",
-        nfd: "\u{1108}\u{1170}\u{11BF}",
-        nfkc: "\u{C01C}",
-        nfkd: "\u{1108}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C01D}",
-        nfc: "\u{C01D}",
-        nfd: "\u{1108}\u{1170}\u{11C0}",
-        nfkc: "\u{C01D}",
-        nfkd: "\u{1108}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C01E}",
-        nfc: "\u{C01E}",
-        nfd: "\u{1108}\u{1170}\u{11C1}",
-        nfkc: "\u{C01E}",
-        nfkd: "\u{1108}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C01F}",
-        nfc: "\u{C01F}",
-        nfd: "\u{1108}\u{1170}\u{11C2}",
-        nfkc: "\u{C01F}",
-        nfkd: "\u{1108}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C020}",
-        nfc: "\u{C020}",
-        nfd: "\u{1108}\u{1171}",
-        nfkc: "\u{C020}",
-        nfkd: "\u{1108}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{C021}",
-        nfc: "\u{C021}",
-        nfd: "\u{1108}\u{1171}\u{11A8}",
-        nfkc: "\u{C021}",
-        nfkd: "\u{1108}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C022}",
-        nfc: "\u{C022}",
-        nfd: "\u{1108}\u{1171}\u{11A9}",
-        nfkc: "\u{C022}",
-        nfkd: "\u{1108}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C023}",
-        nfc: "\u{C023}",
-        nfd: "\u{1108}\u{1171}\u{11AA}",
-        nfkc: "\u{C023}",
-        nfkd: "\u{1108}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C024}",
-        nfc: "\u{C024}",
-        nfd: "\u{1108}\u{1171}\u{11AB}",
-        nfkc: "\u{C024}",
-        nfkd: "\u{1108}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C025}",
-        nfc: "\u{C025}",
-        nfd: "\u{1108}\u{1171}\u{11AC}",
-        nfkc: "\u{C025}",
-        nfkd: "\u{1108}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C026}",
-        nfc: "\u{C026}",
-        nfd: "\u{1108}\u{1171}\u{11AD}",
-        nfkc: "\u{C026}",
-        nfkd: "\u{1108}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C027}",
-        nfc: "\u{C027}",
-        nfd: "\u{1108}\u{1171}\u{11AE}",
-        nfkc: "\u{C027}",
-        nfkd: "\u{1108}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C028}",
-        nfc: "\u{C028}",
-        nfd: "\u{1108}\u{1171}\u{11AF}",
-        nfkc: "\u{C028}",
-        nfkd: "\u{1108}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C029}",
-        nfc: "\u{C029}",
-        nfd: "\u{1108}\u{1171}\u{11B0}",
-        nfkc: "\u{C029}",
-        nfkd: "\u{1108}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C02A}",
-        nfc: "\u{C02A}",
-        nfd: "\u{1108}\u{1171}\u{11B1}",
-        nfkc: "\u{C02A}",
-        nfkd: "\u{1108}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C02B}",
-        nfc: "\u{C02B}",
-        nfd: "\u{1108}\u{1171}\u{11B2}",
-        nfkc: "\u{C02B}",
-        nfkd: "\u{1108}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C02C}",
-        nfc: "\u{C02C}",
-        nfd: "\u{1108}\u{1171}\u{11B3}",
-        nfkc: "\u{C02C}",
-        nfkd: "\u{1108}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C02D}",
-        nfc: "\u{C02D}",
-        nfd: "\u{1108}\u{1171}\u{11B4}",
-        nfkc: "\u{C02D}",
-        nfkd: "\u{1108}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C02E}",
-        nfc: "\u{C02E}",
-        nfd: "\u{1108}\u{1171}\u{11B5}",
-        nfkc: "\u{C02E}",
-        nfkd: "\u{1108}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C02F}",
-        nfc: "\u{C02F}",
-        nfd: "\u{1108}\u{1171}\u{11B6}",
-        nfkc: "\u{C02F}",
-        nfkd: "\u{1108}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C030}",
-        nfc: "\u{C030}",
-        nfd: "\u{1108}\u{1171}\u{11B7}",
-        nfkc: "\u{C030}",
-        nfkd: "\u{1108}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C031}",
-        nfc: "\u{C031}",
-        nfd: "\u{1108}\u{1171}\u{11B8}",
-        nfkc: "\u{C031}",
-        nfkd: "\u{1108}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C032}",
-        nfc: "\u{C032}",
-        nfd: "\u{1108}\u{1171}\u{11B9}",
-        nfkc: "\u{C032}",
-        nfkd: "\u{1108}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C033}",
-        nfc: "\u{C033}",
-        nfd: "\u{1108}\u{1171}\u{11BA}",
-        nfkc: "\u{C033}",
-        nfkd: "\u{1108}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C034}",
-        nfc: "\u{C034}",
-        nfd: "\u{1108}\u{1171}\u{11BB}",
-        nfkc: "\u{C034}",
-        nfkd: "\u{1108}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C035}",
-        nfc: "\u{C035}",
-        nfd: "\u{1108}\u{1171}\u{11BC}",
-        nfkc: "\u{C035}",
-        nfkd: "\u{1108}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C036}",
-        nfc: "\u{C036}",
-        nfd: "\u{1108}\u{1171}\u{11BD}",
-        nfkc: "\u{C036}",
-        nfkd: "\u{1108}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C037}",
-        nfc: "\u{C037}",
-        nfd: "\u{1108}\u{1171}\u{11BE}",
-        nfkc: "\u{C037}",
-        nfkd: "\u{1108}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C038}",
-        nfc: "\u{C038}",
-        nfd: "\u{1108}\u{1171}\u{11BF}",
-        nfkc: "\u{C038}",
-        nfkd: "\u{1108}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C039}",
-        nfc: "\u{C039}",
-        nfd: "\u{1108}\u{1171}\u{11C0}",
-        nfkc: "\u{C039}",
-        nfkd: "\u{1108}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C03A}",
-        nfc: "\u{C03A}",
-        nfd: "\u{1108}\u{1171}\u{11C1}",
-        nfkc: "\u{C03A}",
-        nfkd: "\u{1108}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C03B}",
-        nfc: "\u{C03B}",
-        nfd: "\u{1108}\u{1171}\u{11C2}",
-        nfkc: "\u{C03B}",
-        nfkd: "\u{1108}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C03C}",
-        nfc: "\u{C03C}",
-        nfd: "\u{1108}\u{1172}",
-        nfkc: "\u{C03C}",
-        nfkd: "\u{1108}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{C03D}",
-        nfc: "\u{C03D}",
-        nfd: "\u{1108}\u{1172}\u{11A8}",
-        nfkc: "\u{C03D}",
-        nfkd: "\u{1108}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C03E}",
-        nfc: "\u{C03E}",
-        nfd: "\u{1108}\u{1172}\u{11A9}",
-        nfkc: "\u{C03E}",
-        nfkd: "\u{1108}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C03F}",
-        nfc: "\u{C03F}",
-        nfd: "\u{1108}\u{1172}\u{11AA}",
-        nfkc: "\u{C03F}",
-        nfkd: "\u{1108}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C040}",
-        nfc: "\u{C040}",
-        nfd: "\u{1108}\u{1172}\u{11AB}",
-        nfkc: "\u{C040}",
-        nfkd: "\u{1108}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C041}",
-        nfc: "\u{C041}",
-        nfd: "\u{1108}\u{1172}\u{11AC}",
-        nfkc: "\u{C041}",
-        nfkd: "\u{1108}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C042}",
-        nfc: "\u{C042}",
-        nfd: "\u{1108}\u{1172}\u{11AD}",
-        nfkc: "\u{C042}",
-        nfkd: "\u{1108}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C043}",
-        nfc: "\u{C043}",
-        nfd: "\u{1108}\u{1172}\u{11AE}",
-        nfkc: "\u{C043}",
-        nfkd: "\u{1108}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C044}",
-        nfc: "\u{C044}",
-        nfd: "\u{1108}\u{1172}\u{11AF}",
-        nfkc: "\u{C044}",
-        nfkd: "\u{1108}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C045}",
-        nfc: "\u{C045}",
-        nfd: "\u{1108}\u{1172}\u{11B0}",
-        nfkc: "\u{C045}",
-        nfkd: "\u{1108}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C046}",
-        nfc: "\u{C046}",
-        nfd: "\u{1108}\u{1172}\u{11B1}",
-        nfkc: "\u{C046}",
-        nfkd: "\u{1108}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C047}",
-        nfc: "\u{C047}",
-        nfd: "\u{1108}\u{1172}\u{11B2}",
-        nfkc: "\u{C047}",
-        nfkd: "\u{1108}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C048}",
-        nfc: "\u{C048}",
-        nfd: "\u{1108}\u{1172}\u{11B3}",
-        nfkc: "\u{C048}",
-        nfkd: "\u{1108}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C049}",
-        nfc: "\u{C049}",
-        nfd: "\u{1108}\u{1172}\u{11B4}",
-        nfkc: "\u{C049}",
-        nfkd: "\u{1108}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C04A}",
-        nfc: "\u{C04A}",
-        nfd: "\u{1108}\u{1172}\u{11B5}",
-        nfkc: "\u{C04A}",
-        nfkd: "\u{1108}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C04B}",
-        nfc: "\u{C04B}",
-        nfd: "\u{1108}\u{1172}\u{11B6}",
-        nfkc: "\u{C04B}",
-        nfkd: "\u{1108}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C04C}",
-        nfc: "\u{C04C}",
-        nfd: "\u{1108}\u{1172}\u{11B7}",
-        nfkc: "\u{C04C}",
-        nfkd: "\u{1108}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C04D}",
-        nfc: "\u{C04D}",
-        nfd: "\u{1108}\u{1172}\u{11B8}",
-        nfkc: "\u{C04D}",
-        nfkd: "\u{1108}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C04E}",
-        nfc: "\u{C04E}",
-        nfd: "\u{1108}\u{1172}\u{11B9}",
-        nfkc: "\u{C04E}",
-        nfkd: "\u{1108}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C04F}",
-        nfc: "\u{C04F}",
-        nfd: "\u{1108}\u{1172}\u{11BA}",
-        nfkc: "\u{C04F}",
-        nfkd: "\u{1108}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C050}",
-        nfc: "\u{C050}",
-        nfd: "\u{1108}\u{1172}\u{11BB}",
-        nfkc: "\u{C050}",
-        nfkd: "\u{1108}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C051}",
-        nfc: "\u{C051}",
-        nfd: "\u{1108}\u{1172}\u{11BC}",
-        nfkc: "\u{C051}",
-        nfkd: "\u{1108}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C052}",
-        nfc: "\u{C052}",
-        nfd: "\u{1108}\u{1172}\u{11BD}",
-        nfkc: "\u{C052}",
-        nfkd: "\u{1108}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C053}",
-        nfc: "\u{C053}",
-        nfd: "\u{1108}\u{1172}\u{11BE}",
-        nfkc: "\u{C053}",
-        nfkd: "\u{1108}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C054}",
-        nfc: "\u{C054}",
-        nfd: "\u{1108}\u{1172}\u{11BF}",
-        nfkc: "\u{C054}",
-        nfkd: "\u{1108}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C055}",
-        nfc: "\u{C055}",
-        nfd: "\u{1108}\u{1172}\u{11C0}",
-        nfkc: "\u{C055}",
-        nfkd: "\u{1108}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C056}",
-        nfc: "\u{C056}",
-        nfd: "\u{1108}\u{1172}\u{11C1}",
-        nfkc: "\u{C056}",
-        nfkd: "\u{1108}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C057}",
-        nfc: "\u{C057}",
-        nfd: "\u{1108}\u{1172}\u{11C2}",
-        nfkc: "\u{C057}",
-        nfkd: "\u{1108}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C058}",
-        nfc: "\u{C058}",
-        nfd: "\u{1108}\u{1173}",
-        nfkc: "\u{C058}",
-        nfkd: "\u{1108}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{C059}",
-        nfc: "\u{C059}",
-        nfd: "\u{1108}\u{1173}\u{11A8}",
-        nfkc: "\u{C059}",
-        nfkd: "\u{1108}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C05A}",
-        nfc: "\u{C05A}",
-        nfd: "\u{1108}\u{1173}\u{11A9}",
-        nfkc: "\u{C05A}",
-        nfkd: "\u{1108}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C05B}",
-        nfc: "\u{C05B}",
-        nfd: "\u{1108}\u{1173}\u{11AA}",
-        nfkc: "\u{C05B}",
-        nfkd: "\u{1108}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C05C}",
-        nfc: "\u{C05C}",
-        nfd: "\u{1108}\u{1173}\u{11AB}",
-        nfkc: "\u{C05C}",
-        nfkd: "\u{1108}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C05D}",
-        nfc: "\u{C05D}",
-        nfd: "\u{1108}\u{1173}\u{11AC}",
-        nfkc: "\u{C05D}",
-        nfkd: "\u{1108}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C05E}",
-        nfc: "\u{C05E}",
-        nfd: "\u{1108}\u{1173}\u{11AD}",
-        nfkc: "\u{C05E}",
-        nfkd: "\u{1108}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C05F}",
-        nfc: "\u{C05F}",
-        nfd: "\u{1108}\u{1173}\u{11AE}",
-        nfkc: "\u{C05F}",
-        nfkd: "\u{1108}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C060}",
-        nfc: "\u{C060}",
-        nfd: "\u{1108}\u{1173}\u{11AF}",
-        nfkc: "\u{C060}",
-        nfkd: "\u{1108}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C061}",
-        nfc: "\u{C061}",
-        nfd: "\u{1108}\u{1173}\u{11B0}",
-        nfkc: "\u{C061}",
-        nfkd: "\u{1108}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C062}",
-        nfc: "\u{C062}",
-        nfd: "\u{1108}\u{1173}\u{11B1}",
-        nfkc: "\u{C062}",
-        nfkd: "\u{1108}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C063}",
-        nfc: "\u{C063}",
-        nfd: "\u{1108}\u{1173}\u{11B2}",
-        nfkc: "\u{C063}",
-        nfkd: "\u{1108}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C064}",
-        nfc: "\u{C064}",
-        nfd: "\u{1108}\u{1173}\u{11B3}",
-        nfkc: "\u{C064}",
-        nfkd: "\u{1108}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C065}",
-        nfc: "\u{C065}",
-        nfd: "\u{1108}\u{1173}\u{11B4}",
-        nfkc: "\u{C065}",
-        nfkd: "\u{1108}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C066}",
-        nfc: "\u{C066}",
-        nfd: "\u{1108}\u{1173}\u{11B5}",
-        nfkc: "\u{C066}",
-        nfkd: "\u{1108}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C067}",
-        nfc: "\u{C067}",
-        nfd: "\u{1108}\u{1173}\u{11B6}",
-        nfkc: "\u{C067}",
-        nfkd: "\u{1108}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C068}",
-        nfc: "\u{C068}",
-        nfd: "\u{1108}\u{1173}\u{11B7}",
-        nfkc: "\u{C068}",
-        nfkd: "\u{1108}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C069}",
-        nfc: "\u{C069}",
-        nfd: "\u{1108}\u{1173}\u{11B8}",
-        nfkc: "\u{C069}",
-        nfkd: "\u{1108}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C06A}",
-        nfc: "\u{C06A}",
-        nfd: "\u{1108}\u{1173}\u{11B9}",
-        nfkc: "\u{C06A}",
-        nfkd: "\u{1108}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C06B}",
-        nfc: "\u{C06B}",
-        nfd: "\u{1108}\u{1173}\u{11BA}",
-        nfkc: "\u{C06B}",
-        nfkd: "\u{1108}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C06C}",
-        nfc: "\u{C06C}",
-        nfd: "\u{1108}\u{1173}\u{11BB}",
-        nfkc: "\u{C06C}",
-        nfkd: "\u{1108}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C06D}",
-        nfc: "\u{C06D}",
-        nfd: "\u{1108}\u{1173}\u{11BC}",
-        nfkc: "\u{C06D}",
-        nfkd: "\u{1108}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C06E}",
-        nfc: "\u{C06E}",
-        nfd: "\u{1108}\u{1173}\u{11BD}",
-        nfkc: "\u{C06E}",
-        nfkd: "\u{1108}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C06F}",
-        nfc: "\u{C06F}",
-        nfd: "\u{1108}\u{1173}\u{11BE}",
-        nfkc: "\u{C06F}",
-        nfkd: "\u{1108}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C070}",
-        nfc: "\u{C070}",
-        nfd: "\u{1108}\u{1173}\u{11BF}",
-        nfkc: "\u{C070}",
-        nfkd: "\u{1108}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C071}",
-        nfc: "\u{C071}",
-        nfd: "\u{1108}\u{1173}\u{11C0}",
-        nfkc: "\u{C071}",
-        nfkd: "\u{1108}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C072}",
-        nfc: "\u{C072}",
-        nfd: "\u{1108}\u{1173}\u{11C1}",
-        nfkc: "\u{C072}",
-        nfkd: "\u{1108}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C073}",
-        nfc: "\u{C073}",
-        nfd: "\u{1108}\u{1173}\u{11C2}",
-        nfkc: "\u{C073}",
-        nfkd: "\u{1108}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C074}",
-        nfc: "\u{C074}",
-        nfd: "\u{1108}\u{1174}",
-        nfkc: "\u{C074}",
-        nfkd: "\u{1108}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{C075}",
-        nfc: "\u{C075}",
-        nfd: "\u{1108}\u{1174}\u{11A8}",
-        nfkc: "\u{C075}",
-        nfkd: "\u{1108}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C076}",
-        nfc: "\u{C076}",
-        nfd: "\u{1108}\u{1174}\u{11A9}",
-        nfkc: "\u{C076}",
-        nfkd: "\u{1108}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C077}",
-        nfc: "\u{C077}",
-        nfd: "\u{1108}\u{1174}\u{11AA}",
-        nfkc: "\u{C077}",
-        nfkd: "\u{1108}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C078}",
-        nfc: "\u{C078}",
-        nfd: "\u{1108}\u{1174}\u{11AB}",
-        nfkc: "\u{C078}",
-        nfkd: "\u{1108}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C079}",
-        nfc: "\u{C079}",
-        nfd: "\u{1108}\u{1174}\u{11AC}",
-        nfkc: "\u{C079}",
-        nfkd: "\u{1108}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C07A}",
-        nfc: "\u{C07A}",
-        nfd: "\u{1108}\u{1174}\u{11AD}",
-        nfkc: "\u{C07A}",
-        nfkd: "\u{1108}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C07B}",
-        nfc: "\u{C07B}",
-        nfd: "\u{1108}\u{1174}\u{11AE}",
-        nfkc: "\u{C07B}",
-        nfkd: "\u{1108}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C07C}",
-        nfc: "\u{C07C}",
-        nfd: "\u{1108}\u{1174}\u{11AF}",
-        nfkc: "\u{C07C}",
-        nfkd: "\u{1108}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C07D}",
-        nfc: "\u{C07D}",
-        nfd: "\u{1108}\u{1174}\u{11B0}",
-        nfkc: "\u{C07D}",
-        nfkd: "\u{1108}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C07E}",
-        nfc: "\u{C07E}",
-        nfd: "\u{1108}\u{1174}\u{11B1}",
-        nfkc: "\u{C07E}",
-        nfkd: "\u{1108}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C07F}",
-        nfc: "\u{C07F}",
-        nfd: "\u{1108}\u{1174}\u{11B2}",
-        nfkc: "\u{C07F}",
-        nfkd: "\u{1108}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C080}",
-        nfc: "\u{C080}",
-        nfd: "\u{1108}\u{1174}\u{11B3}",
-        nfkc: "\u{C080}",
-        nfkd: "\u{1108}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C081}",
-        nfc: "\u{C081}",
-        nfd: "\u{1108}\u{1174}\u{11B4}",
-        nfkc: "\u{C081}",
-        nfkd: "\u{1108}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C082}",
-        nfc: "\u{C082}",
-        nfd: "\u{1108}\u{1174}\u{11B5}",
-        nfkc: "\u{C082}",
-        nfkd: "\u{1108}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C083}",
-        nfc: "\u{C083}",
-        nfd: "\u{1108}\u{1174}\u{11B6}",
-        nfkc: "\u{C083}",
-        nfkd: "\u{1108}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C084}",
-        nfc: "\u{C084}",
-        nfd: "\u{1108}\u{1174}\u{11B7}",
-        nfkc: "\u{C084}",
-        nfkd: "\u{1108}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C085}",
-        nfc: "\u{C085}",
-        nfd: "\u{1108}\u{1174}\u{11B8}",
-        nfkc: "\u{C085}",
-        nfkd: "\u{1108}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C086}",
-        nfc: "\u{C086}",
-        nfd: "\u{1108}\u{1174}\u{11B9}",
-        nfkc: "\u{C086}",
-        nfkd: "\u{1108}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C087}",
-        nfc: "\u{C087}",
-        nfd: "\u{1108}\u{1174}\u{11BA}",
-        nfkc: "\u{C087}",
-        nfkd: "\u{1108}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C088}",
-        nfc: "\u{C088}",
-        nfd: "\u{1108}\u{1174}\u{11BB}",
-        nfkc: "\u{C088}",
-        nfkd: "\u{1108}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C089}",
-        nfc: "\u{C089}",
-        nfd: "\u{1108}\u{1174}\u{11BC}",
-        nfkc: "\u{C089}",
-        nfkd: "\u{1108}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C08A}",
-        nfc: "\u{C08A}",
-        nfd: "\u{1108}\u{1174}\u{11BD}",
-        nfkc: "\u{C08A}",
-        nfkd: "\u{1108}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C08B}",
-        nfc: "\u{C08B}",
-        nfd: "\u{1108}\u{1174}\u{11BE}",
-        nfkc: "\u{C08B}",
-        nfkd: "\u{1108}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C08C}",
-        nfc: "\u{C08C}",
-        nfd: "\u{1108}\u{1174}\u{11BF}",
-        nfkc: "\u{C08C}",
-        nfkd: "\u{1108}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C08D}",
-        nfc: "\u{C08D}",
-        nfd: "\u{1108}\u{1174}\u{11C0}",
-        nfkc: "\u{C08D}",
-        nfkd: "\u{1108}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C08E}",
-        nfc: "\u{C08E}",
-        nfd: "\u{1108}\u{1174}\u{11C1}",
-        nfkc: "\u{C08E}",
-        nfkd: "\u{1108}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C08F}",
-        nfc: "\u{C08F}",
-        nfd: "\u{1108}\u{1174}\u{11C2}",
-        nfkc: "\u{C08F}",
-        nfkd: "\u{1108}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C090}",
-        nfc: "\u{C090}",
-        nfd: "\u{1108}\u{1175}",
-        nfkc: "\u{C090}",
-        nfkd: "\u{1108}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{C091}",
-        nfc: "\u{C091}",
-        nfd: "\u{1108}\u{1175}\u{11A8}",
-        nfkc: "\u{C091}",
-        nfkd: "\u{1108}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C092}",
-        nfc: "\u{C092}",
-        nfd: "\u{1108}\u{1175}\u{11A9}",
-        nfkc: "\u{C092}",
-        nfkd: "\u{1108}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C093}",
-        nfc: "\u{C093}",
-        nfd: "\u{1108}\u{1175}\u{11AA}",
-        nfkc: "\u{C093}",
-        nfkd: "\u{1108}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C094}",
-        nfc: "\u{C094}",
-        nfd: "\u{1108}\u{1175}\u{11AB}",
-        nfkc: "\u{C094}",
-        nfkd: "\u{1108}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C095}",
-        nfc: "\u{C095}",
-        nfd: "\u{1108}\u{1175}\u{11AC}",
-        nfkc: "\u{C095}",
-        nfkd: "\u{1108}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C096}",
-        nfc: "\u{C096}",
-        nfd: "\u{1108}\u{1175}\u{11AD}",
-        nfkc: "\u{C096}",
-        nfkd: "\u{1108}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C097}",
-        nfc: "\u{C097}",
-        nfd: "\u{1108}\u{1175}\u{11AE}",
-        nfkc: "\u{C097}",
-        nfkd: "\u{1108}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C098}",
-        nfc: "\u{C098}",
-        nfd: "\u{1108}\u{1175}\u{11AF}",
-        nfkc: "\u{C098}",
-        nfkd: "\u{1108}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C099}",
-        nfc: "\u{C099}",
-        nfd: "\u{1108}\u{1175}\u{11B0}",
-        nfkc: "\u{C099}",
-        nfkd: "\u{1108}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C09A}",
-        nfc: "\u{C09A}",
-        nfd: "\u{1108}\u{1175}\u{11B1}",
-        nfkc: "\u{C09A}",
-        nfkd: "\u{1108}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C09B}",
-        nfc: "\u{C09B}",
-        nfd: "\u{1108}\u{1175}\u{11B2}",
-        nfkc: "\u{C09B}",
-        nfkd: "\u{1108}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C09C}",
-        nfc: "\u{C09C}",
-        nfd: "\u{1108}\u{1175}\u{11B3}",
-        nfkc: "\u{C09C}",
-        nfkd: "\u{1108}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C09D}",
-        nfc: "\u{C09D}",
-        nfd: "\u{1108}\u{1175}\u{11B4}",
-        nfkc: "\u{C09D}",
-        nfkd: "\u{1108}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C09E}",
-        nfc: "\u{C09E}",
-        nfd: "\u{1108}\u{1175}\u{11B5}",
-        nfkc: "\u{C09E}",
-        nfkd: "\u{1108}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C09F}",
-        nfc: "\u{C09F}",
-        nfd: "\u{1108}\u{1175}\u{11B6}",
-        nfkc: "\u{C09F}",
-        nfkd: "\u{1108}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C0A0}",
-        nfc: "\u{C0A0}",
-        nfd: "\u{1108}\u{1175}\u{11B7}",
-        nfkc: "\u{C0A0}",
-        nfkd: "\u{1108}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C0A1}",
-        nfc: "\u{C0A1}",
-        nfd: "\u{1108}\u{1175}\u{11B8}",
-        nfkc: "\u{C0A1}",
-        nfkd: "\u{1108}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C0A2}",
-        nfc: "\u{C0A2}",
-        nfd: "\u{1108}\u{1175}\u{11B9}",
-        nfkc: "\u{C0A2}",
-        nfkd: "\u{1108}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C0A3}",
-        nfc: "\u{C0A3}",
-        nfd: "\u{1108}\u{1175}\u{11BA}",
-        nfkc: "\u{C0A3}",
-        nfkd: "\u{1108}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C0A4}",
-        nfc: "\u{C0A4}",
-        nfd: "\u{1108}\u{1175}\u{11BB}",
-        nfkc: "\u{C0A4}",
-        nfkd: "\u{1108}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C0A5}",
-        nfc: "\u{C0A5}",
-        nfd: "\u{1108}\u{1175}\u{11BC}",
-        nfkc: "\u{C0A5}",
-        nfkd: "\u{1108}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C0A6}",
-        nfc: "\u{C0A6}",
-        nfd: "\u{1108}\u{1175}\u{11BD}",
-        nfkc: "\u{C0A6}",
-        nfkd: "\u{1108}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C0A7}",
-        nfc: "\u{C0A7}",
-        nfd: "\u{1108}\u{1175}\u{11BE}",
-        nfkc: "\u{C0A7}",
-        nfkd: "\u{1108}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C0A8}",
-        nfc: "\u{C0A8}",
-        nfd: "\u{1108}\u{1175}\u{11BF}",
-        nfkc: "\u{C0A8}",
-        nfkd: "\u{1108}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C0A9}",
-        nfc: "\u{C0A9}",
-        nfd: "\u{1108}\u{1175}\u{11C0}",
-        nfkc: "\u{C0A9}",
-        nfkd: "\u{1108}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C0AA}",
-        nfc: "\u{C0AA}",
-        nfd: "\u{1108}\u{1175}\u{11C1}",
-        nfkc: "\u{C0AA}",
-        nfkd: "\u{1108}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C0AB}",
-        nfc: "\u{C0AB}",
-        nfd: "\u{1108}\u{1175}\u{11C2}",
-        nfkc: "\u{C0AB}",
-        nfkd: "\u{1108}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C0AC}",
-        nfc: "\u{C0AC}",
-        nfd: "\u{1109}\u{1161}",
-        nfkc: "\u{C0AC}",
-        nfkd: "\u{1109}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{C0AD}",
-        nfc: "\u{C0AD}",
-        nfd: "\u{1109}\u{1161}\u{11A8}",
-        nfkc: "\u{C0AD}",
-        nfkd: "\u{1109}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C0AE}",
-        nfc: "\u{C0AE}",
-        nfd: "\u{1109}\u{1161}\u{11A9}",
-        nfkc: "\u{C0AE}",
-        nfkd: "\u{1109}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C0AF}",
-        nfc: "\u{C0AF}",
-        nfd: "\u{1109}\u{1161}\u{11AA}",
-        nfkc: "\u{C0AF}",
-        nfkd: "\u{1109}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C0B0}",
-        nfc: "\u{C0B0}",
-        nfd: "\u{1109}\u{1161}\u{11AB}",
-        nfkc: "\u{C0B0}",
-        nfkd: "\u{1109}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C0B1}",
-        nfc: "\u{C0B1}",
-        nfd: "\u{1109}\u{1161}\u{11AC}",
-        nfkc: "\u{C0B1}",
-        nfkd: "\u{1109}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C0B2}",
-        nfc: "\u{C0B2}",
-        nfd: "\u{1109}\u{1161}\u{11AD}",
-        nfkc: "\u{C0B2}",
-        nfkd: "\u{1109}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C0B3}",
-        nfc: "\u{C0B3}",
-        nfd: "\u{1109}\u{1161}\u{11AE}",
-        nfkc: "\u{C0B3}",
-        nfkd: "\u{1109}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C0B4}",
-        nfc: "\u{C0B4}",
-        nfd: "\u{1109}\u{1161}\u{11AF}",
-        nfkc: "\u{C0B4}",
-        nfkd: "\u{1109}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C0B5}",
-        nfc: "\u{C0B5}",
-        nfd: "\u{1109}\u{1161}\u{11B0}",
-        nfkc: "\u{C0B5}",
-        nfkd: "\u{1109}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C0B6}",
-        nfc: "\u{C0B6}",
-        nfd: "\u{1109}\u{1161}\u{11B1}",
-        nfkc: "\u{C0B6}",
-        nfkd: "\u{1109}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C0B7}",
-        nfc: "\u{C0B7}",
-        nfd: "\u{1109}\u{1161}\u{11B2}",
-        nfkc: "\u{C0B7}",
-        nfkd: "\u{1109}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C0B8}",
-        nfc: "\u{C0B8}",
-        nfd: "\u{1109}\u{1161}\u{11B3}",
-        nfkc: "\u{C0B8}",
-        nfkd: "\u{1109}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C0B9}",
-        nfc: "\u{C0B9}",
-        nfd: "\u{1109}\u{1161}\u{11B4}",
-        nfkc: "\u{C0B9}",
-        nfkd: "\u{1109}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C0BA}",
-        nfc: "\u{C0BA}",
-        nfd: "\u{1109}\u{1161}\u{11B5}",
-        nfkc: "\u{C0BA}",
-        nfkd: "\u{1109}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C0BB}",
-        nfc: "\u{C0BB}",
-        nfd: "\u{1109}\u{1161}\u{11B6}",
-        nfkc: "\u{C0BB}",
-        nfkd: "\u{1109}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C0BC}",
-        nfc: "\u{C0BC}",
-        nfd: "\u{1109}\u{1161}\u{11B7}",
-        nfkc: "\u{C0BC}",
-        nfkd: "\u{1109}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C0BD}",
-        nfc: "\u{C0BD}",
-        nfd: "\u{1109}\u{1161}\u{11B8}",
-        nfkc: "\u{C0BD}",
-        nfkd: "\u{1109}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C0BE}",
-        nfc: "\u{C0BE}",
-        nfd: "\u{1109}\u{1161}\u{11B9}",
-        nfkc: "\u{C0BE}",
-        nfkd: "\u{1109}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C0BF}",
-        nfc: "\u{C0BF}",
-        nfd: "\u{1109}\u{1161}\u{11BA}",
-        nfkc: "\u{C0BF}",
-        nfkd: "\u{1109}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C0C0}",
-        nfc: "\u{C0C0}",
-        nfd: "\u{1109}\u{1161}\u{11BB}",
-        nfkc: "\u{C0C0}",
-        nfkd: "\u{1109}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C0C1}",
-        nfc: "\u{C0C1}",
-        nfd: "\u{1109}\u{1161}\u{11BC}",
-        nfkc: "\u{C0C1}",
-        nfkd: "\u{1109}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C0C2}",
-        nfc: "\u{C0C2}",
-        nfd: "\u{1109}\u{1161}\u{11BD}",
-        nfkc: "\u{C0C2}",
-        nfkd: "\u{1109}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C0C3}",
-        nfc: "\u{C0C3}",
-        nfd: "\u{1109}\u{1161}\u{11BE}",
-        nfkc: "\u{C0C3}",
-        nfkd: "\u{1109}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C0C4}",
-        nfc: "\u{C0C4}",
-        nfd: "\u{1109}\u{1161}\u{11BF}",
-        nfkc: "\u{C0C4}",
-        nfkd: "\u{1109}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C0C5}",
-        nfc: "\u{C0C5}",
-        nfd: "\u{1109}\u{1161}\u{11C0}",
-        nfkc: "\u{C0C5}",
-        nfkd: "\u{1109}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C0C6}",
-        nfc: "\u{C0C6}",
-        nfd: "\u{1109}\u{1161}\u{11C1}",
-        nfkc: "\u{C0C6}",
-        nfkd: "\u{1109}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C0C7}",
-        nfc: "\u{C0C7}",
-        nfd: "\u{1109}\u{1161}\u{11C2}",
-        nfkc: "\u{C0C7}",
-        nfkd: "\u{1109}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C0C8}",
-        nfc: "\u{C0C8}",
-        nfd: "\u{1109}\u{1162}",
-        nfkc: "\u{C0C8}",
-        nfkd: "\u{1109}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{C0C9}",
-        nfc: "\u{C0C9}",
-        nfd: "\u{1109}\u{1162}\u{11A8}",
-        nfkc: "\u{C0C9}",
-        nfkd: "\u{1109}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C0CA}",
-        nfc: "\u{C0CA}",
-        nfd: "\u{1109}\u{1162}\u{11A9}",
-        nfkc: "\u{C0CA}",
-        nfkd: "\u{1109}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C0CB}",
-        nfc: "\u{C0CB}",
-        nfd: "\u{1109}\u{1162}\u{11AA}",
-        nfkc: "\u{C0CB}",
-        nfkd: "\u{1109}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C0CC}",
-        nfc: "\u{C0CC}",
-        nfd: "\u{1109}\u{1162}\u{11AB}",
-        nfkc: "\u{C0CC}",
-        nfkd: "\u{1109}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C0CD}",
-        nfc: "\u{C0CD}",
-        nfd: "\u{1109}\u{1162}\u{11AC}",
-        nfkc: "\u{C0CD}",
-        nfkd: "\u{1109}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C0CE}",
-        nfc: "\u{C0CE}",
-        nfd: "\u{1109}\u{1162}\u{11AD}",
-        nfkc: "\u{C0CE}",
-        nfkd: "\u{1109}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C0CF}",
-        nfc: "\u{C0CF}",
-        nfd: "\u{1109}\u{1162}\u{11AE}",
-        nfkc: "\u{C0CF}",
-        nfkd: "\u{1109}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C0D0}",
-        nfc: "\u{C0D0}",
-        nfd: "\u{1109}\u{1162}\u{11AF}",
-        nfkc: "\u{C0D0}",
-        nfkd: "\u{1109}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C0D1}",
-        nfc: "\u{C0D1}",
-        nfd: "\u{1109}\u{1162}\u{11B0}",
-        nfkc: "\u{C0D1}",
-        nfkd: "\u{1109}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C0D2}",
-        nfc: "\u{C0D2}",
-        nfd: "\u{1109}\u{1162}\u{11B1}",
-        nfkc: "\u{C0D2}",
-        nfkd: "\u{1109}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C0D3}",
-        nfc: "\u{C0D3}",
-        nfd: "\u{1109}\u{1162}\u{11B2}",
-        nfkc: "\u{C0D3}",
-        nfkd: "\u{1109}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C0D4}",
-        nfc: "\u{C0D4}",
-        nfd: "\u{1109}\u{1162}\u{11B3}",
-        nfkc: "\u{C0D4}",
-        nfkd: "\u{1109}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C0D5}",
-        nfc: "\u{C0D5}",
-        nfd: "\u{1109}\u{1162}\u{11B4}",
-        nfkc: "\u{C0D5}",
-        nfkd: "\u{1109}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C0D6}",
-        nfc: "\u{C0D6}",
-        nfd: "\u{1109}\u{1162}\u{11B5}",
-        nfkc: "\u{C0D6}",
-        nfkd: "\u{1109}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C0D7}",
-        nfc: "\u{C0D7}",
-        nfd: "\u{1109}\u{1162}\u{11B6}",
-        nfkc: "\u{C0D7}",
-        nfkd: "\u{1109}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C0D8}",
-        nfc: "\u{C0D8}",
-        nfd: "\u{1109}\u{1162}\u{11B7}",
-        nfkc: "\u{C0D8}",
-        nfkd: "\u{1109}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C0D9}",
-        nfc: "\u{C0D9}",
-        nfd: "\u{1109}\u{1162}\u{11B8}",
-        nfkc: "\u{C0D9}",
-        nfkd: "\u{1109}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C0DA}",
-        nfc: "\u{C0DA}",
-        nfd: "\u{1109}\u{1162}\u{11B9}",
-        nfkc: "\u{C0DA}",
-        nfkd: "\u{1109}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C0DB}",
-        nfc: "\u{C0DB}",
-        nfd: "\u{1109}\u{1162}\u{11BA}",
-        nfkc: "\u{C0DB}",
-        nfkd: "\u{1109}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C0DC}",
-        nfc: "\u{C0DC}",
-        nfd: "\u{1109}\u{1162}\u{11BB}",
-        nfkc: "\u{C0DC}",
-        nfkd: "\u{1109}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C0DD}",
-        nfc: "\u{C0DD}",
-        nfd: "\u{1109}\u{1162}\u{11BC}",
-        nfkc: "\u{C0DD}",
-        nfkd: "\u{1109}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C0DE}",
-        nfc: "\u{C0DE}",
-        nfd: "\u{1109}\u{1162}\u{11BD}",
-        nfkc: "\u{C0DE}",
-        nfkd: "\u{1109}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C0DF}",
-        nfc: "\u{C0DF}",
-        nfd: "\u{1109}\u{1162}\u{11BE}",
-        nfkc: "\u{C0DF}",
-        nfkd: "\u{1109}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C0E0}",
-        nfc: "\u{C0E0}",
-        nfd: "\u{1109}\u{1162}\u{11BF}",
-        nfkc: "\u{C0E0}",
-        nfkd: "\u{1109}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C0E1}",
-        nfc: "\u{C0E1}",
-        nfd: "\u{1109}\u{1162}\u{11C0}",
-        nfkc: "\u{C0E1}",
-        nfkd: "\u{1109}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C0E2}",
-        nfc: "\u{C0E2}",
-        nfd: "\u{1109}\u{1162}\u{11C1}",
-        nfkc: "\u{C0E2}",
-        nfkd: "\u{1109}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C0E3}",
-        nfc: "\u{C0E3}",
-        nfd: "\u{1109}\u{1162}\u{11C2}",
-        nfkc: "\u{C0E3}",
-        nfkd: "\u{1109}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C0E4}",
-        nfc: "\u{C0E4}",
-        nfd: "\u{1109}\u{1163}",
-        nfkc: "\u{C0E4}",
-        nfkd: "\u{1109}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{C0E5}",
-        nfc: "\u{C0E5}",
-        nfd: "\u{1109}\u{1163}\u{11A8}",
-        nfkc: "\u{C0E5}",
-        nfkd: "\u{1109}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C0E6}",
-        nfc: "\u{C0E6}",
-        nfd: "\u{1109}\u{1163}\u{11A9}",
-        nfkc: "\u{C0E6}",
-        nfkd: "\u{1109}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C0E7}",
-        nfc: "\u{C0E7}",
-        nfd: "\u{1109}\u{1163}\u{11AA}",
-        nfkc: "\u{C0E7}",
-        nfkd: "\u{1109}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C0E8}",
-        nfc: "\u{C0E8}",
-        nfd: "\u{1109}\u{1163}\u{11AB}",
-        nfkc: "\u{C0E8}",
-        nfkd: "\u{1109}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C0E9}",
-        nfc: "\u{C0E9}",
-        nfd: "\u{1109}\u{1163}\u{11AC}",
-        nfkc: "\u{C0E9}",
-        nfkd: "\u{1109}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C0EA}",
-        nfc: "\u{C0EA}",
-        nfd: "\u{1109}\u{1163}\u{11AD}",
-        nfkc: "\u{C0EA}",
-        nfkd: "\u{1109}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C0EB}",
-        nfc: "\u{C0EB}",
-        nfd: "\u{1109}\u{1163}\u{11AE}",
-        nfkc: "\u{C0EB}",
-        nfkd: "\u{1109}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C0EC}",
-        nfc: "\u{C0EC}",
-        nfd: "\u{1109}\u{1163}\u{11AF}",
-        nfkc: "\u{C0EC}",
-        nfkd: "\u{1109}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C0ED}",
-        nfc: "\u{C0ED}",
-        nfd: "\u{1109}\u{1163}\u{11B0}",
-        nfkc: "\u{C0ED}",
-        nfkd: "\u{1109}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C0EE}",
-        nfc: "\u{C0EE}",
-        nfd: "\u{1109}\u{1163}\u{11B1}",
-        nfkc: "\u{C0EE}",
-        nfkd: "\u{1109}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C0EF}",
-        nfc: "\u{C0EF}",
-        nfd: "\u{1109}\u{1163}\u{11B2}",
-        nfkc: "\u{C0EF}",
-        nfkd: "\u{1109}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C0F0}",
-        nfc: "\u{C0F0}",
-        nfd: "\u{1109}\u{1163}\u{11B3}",
-        nfkc: "\u{C0F0}",
-        nfkd: "\u{1109}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C0F1}",
-        nfc: "\u{C0F1}",
-        nfd: "\u{1109}\u{1163}\u{11B4}",
-        nfkc: "\u{C0F1}",
-        nfkd: "\u{1109}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C0F2}",
-        nfc: "\u{C0F2}",
-        nfd: "\u{1109}\u{1163}\u{11B5}",
-        nfkc: "\u{C0F2}",
-        nfkd: "\u{1109}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C0F3}",
-        nfc: "\u{C0F3}",
-        nfd: "\u{1109}\u{1163}\u{11B6}",
-        nfkc: "\u{C0F3}",
-        nfkd: "\u{1109}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C0F4}",
-        nfc: "\u{C0F4}",
-        nfd: "\u{1109}\u{1163}\u{11B7}",
-        nfkc: "\u{C0F4}",
-        nfkd: "\u{1109}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C0F5}",
-        nfc: "\u{C0F5}",
-        nfd: "\u{1109}\u{1163}\u{11B8}",
-        nfkc: "\u{C0F5}",
-        nfkd: "\u{1109}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C0F6}",
-        nfc: "\u{C0F6}",
-        nfd: "\u{1109}\u{1163}\u{11B9}",
-        nfkc: "\u{C0F6}",
-        nfkd: "\u{1109}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C0F7}",
-        nfc: "\u{C0F7}",
-        nfd: "\u{1109}\u{1163}\u{11BA}",
-        nfkc: "\u{C0F7}",
-        nfkd: "\u{1109}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C0F8}",
-        nfc: "\u{C0F8}",
-        nfd: "\u{1109}\u{1163}\u{11BB}",
-        nfkc: "\u{C0F8}",
-        nfkd: "\u{1109}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C0F9}",
-        nfc: "\u{C0F9}",
-        nfd: "\u{1109}\u{1163}\u{11BC}",
-        nfkc: "\u{C0F9}",
-        nfkd: "\u{1109}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C0FA}",
-        nfc: "\u{C0FA}",
-        nfd: "\u{1109}\u{1163}\u{11BD}",
-        nfkc: "\u{C0FA}",
-        nfkd: "\u{1109}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C0FB}",
-        nfc: "\u{C0FB}",
-        nfd: "\u{1109}\u{1163}\u{11BE}",
-        nfkc: "\u{C0FB}",
-        nfkd: "\u{1109}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C0FC}",
-        nfc: "\u{C0FC}",
-        nfd: "\u{1109}\u{1163}\u{11BF}",
-        nfkc: "\u{C0FC}",
-        nfkd: "\u{1109}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C0FD}",
-        nfc: "\u{C0FD}",
-        nfd: "\u{1109}\u{1163}\u{11C0}",
-        nfkc: "\u{C0FD}",
-        nfkd: "\u{1109}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C0FE}",
-        nfc: "\u{C0FE}",
-        nfd: "\u{1109}\u{1163}\u{11C1}",
-        nfkc: "\u{C0FE}",
-        nfkd: "\u{1109}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C0FF}",
-        nfc: "\u{C0FF}",
-        nfd: "\u{1109}\u{1163}\u{11C2}",
-        nfkc: "\u{C0FF}",
-        nfkd: "\u{1109}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C100}",
-        nfc: "\u{C100}",
-        nfd: "\u{1109}\u{1164}",
-        nfkc: "\u{C100}",
-        nfkd: "\u{1109}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{C101}",
-        nfc: "\u{C101}",
-        nfd: "\u{1109}\u{1164}\u{11A8}",
-        nfkc: "\u{C101}",
-        nfkd: "\u{1109}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C102}",
-        nfc: "\u{C102}",
-        nfd: "\u{1109}\u{1164}\u{11A9}",
-        nfkc: "\u{C102}",
-        nfkd: "\u{1109}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C103}",
-        nfc: "\u{C103}",
-        nfd: "\u{1109}\u{1164}\u{11AA}",
-        nfkc: "\u{C103}",
-        nfkd: "\u{1109}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C104}",
-        nfc: "\u{C104}",
-        nfd: "\u{1109}\u{1164}\u{11AB}",
-        nfkc: "\u{C104}",
-        nfkd: "\u{1109}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C105}",
-        nfc: "\u{C105}",
-        nfd: "\u{1109}\u{1164}\u{11AC}",
-        nfkc: "\u{C105}",
-        nfkd: "\u{1109}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C106}",
-        nfc: "\u{C106}",
-        nfd: "\u{1109}\u{1164}\u{11AD}",
-        nfkc: "\u{C106}",
-        nfkd: "\u{1109}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C107}",
-        nfc: "\u{C107}",
-        nfd: "\u{1109}\u{1164}\u{11AE}",
-        nfkc: "\u{C107}",
-        nfkd: "\u{1109}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C108}",
-        nfc: "\u{C108}",
-        nfd: "\u{1109}\u{1164}\u{11AF}",
-        nfkc: "\u{C108}",
-        nfkd: "\u{1109}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C109}",
-        nfc: "\u{C109}",
-        nfd: "\u{1109}\u{1164}\u{11B0}",
-        nfkc: "\u{C109}",
-        nfkd: "\u{1109}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C10A}",
-        nfc: "\u{C10A}",
-        nfd: "\u{1109}\u{1164}\u{11B1}",
-        nfkc: "\u{C10A}",
-        nfkd: "\u{1109}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C10B}",
-        nfc: "\u{C10B}",
-        nfd: "\u{1109}\u{1164}\u{11B2}",
-        nfkc: "\u{C10B}",
-        nfkd: "\u{1109}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C10C}",
-        nfc: "\u{C10C}",
-        nfd: "\u{1109}\u{1164}\u{11B3}",
-        nfkc: "\u{C10C}",
-        nfkd: "\u{1109}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C10D}",
-        nfc: "\u{C10D}",
-        nfd: "\u{1109}\u{1164}\u{11B4}",
-        nfkc: "\u{C10D}",
-        nfkd: "\u{1109}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C10E}",
-        nfc: "\u{C10E}",
-        nfd: "\u{1109}\u{1164}\u{11B5}",
-        nfkc: "\u{C10E}",
-        nfkd: "\u{1109}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C10F}",
-        nfc: "\u{C10F}",
-        nfd: "\u{1109}\u{1164}\u{11B6}",
-        nfkc: "\u{C10F}",
-        nfkd: "\u{1109}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C110}",
-        nfc: "\u{C110}",
-        nfd: "\u{1109}\u{1164}\u{11B7}",
-        nfkc: "\u{C110}",
-        nfkd: "\u{1109}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C111}",
-        nfc: "\u{C111}",
-        nfd: "\u{1109}\u{1164}\u{11B8}",
-        nfkc: "\u{C111}",
-        nfkd: "\u{1109}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C112}",
-        nfc: "\u{C112}",
-        nfd: "\u{1109}\u{1164}\u{11B9}",
-        nfkc: "\u{C112}",
-        nfkd: "\u{1109}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C113}",
-        nfc: "\u{C113}",
-        nfd: "\u{1109}\u{1164}\u{11BA}",
-        nfkc: "\u{C113}",
-        nfkd: "\u{1109}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C114}",
-        nfc: "\u{C114}",
-        nfd: "\u{1109}\u{1164}\u{11BB}",
-        nfkc: "\u{C114}",
-        nfkd: "\u{1109}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C115}",
-        nfc: "\u{C115}",
-        nfd: "\u{1109}\u{1164}\u{11BC}",
-        nfkc: "\u{C115}",
-        nfkd: "\u{1109}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C116}",
-        nfc: "\u{C116}",
-        nfd: "\u{1109}\u{1164}\u{11BD}",
-        nfkc: "\u{C116}",
-        nfkd: "\u{1109}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C117}",
-        nfc: "\u{C117}",
-        nfd: "\u{1109}\u{1164}\u{11BE}",
-        nfkc: "\u{C117}",
-        nfkd: "\u{1109}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C118}",
-        nfc: "\u{C118}",
-        nfd: "\u{1109}\u{1164}\u{11BF}",
-        nfkc: "\u{C118}",
-        nfkd: "\u{1109}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C119}",
-        nfc: "\u{C119}",
-        nfd: "\u{1109}\u{1164}\u{11C0}",
-        nfkc: "\u{C119}",
-        nfkd: "\u{1109}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C11A}",
-        nfc: "\u{C11A}",
-        nfd: "\u{1109}\u{1164}\u{11C1}",
-        nfkc: "\u{C11A}",
-        nfkd: "\u{1109}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C11B}",
-        nfc: "\u{C11B}",
-        nfd: "\u{1109}\u{1164}\u{11C2}",
-        nfkc: "\u{C11B}",
-        nfkd: "\u{1109}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C11C}",
-        nfc: "\u{C11C}",
-        nfd: "\u{1109}\u{1165}",
-        nfkc: "\u{C11C}",
-        nfkd: "\u{1109}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{C11D}",
-        nfc: "\u{C11D}",
-        nfd: "\u{1109}\u{1165}\u{11A8}",
-        nfkc: "\u{C11D}",
-        nfkd: "\u{1109}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C11E}",
-        nfc: "\u{C11E}",
-        nfd: "\u{1109}\u{1165}\u{11A9}",
-        nfkc: "\u{C11E}",
-        nfkd: "\u{1109}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C11F}",
-        nfc: "\u{C11F}",
-        nfd: "\u{1109}\u{1165}\u{11AA}",
-        nfkc: "\u{C11F}",
-        nfkd: "\u{1109}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C120}",
-        nfc: "\u{C120}",
-        nfd: "\u{1109}\u{1165}\u{11AB}",
-        nfkc: "\u{C120}",
-        nfkd: "\u{1109}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C121}",
-        nfc: "\u{C121}",
-        nfd: "\u{1109}\u{1165}\u{11AC}",
-        nfkc: "\u{C121}",
-        nfkd: "\u{1109}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C122}",
-        nfc: "\u{C122}",
-        nfd: "\u{1109}\u{1165}\u{11AD}",
-        nfkc: "\u{C122}",
-        nfkd: "\u{1109}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C123}",
-        nfc: "\u{C123}",
-        nfd: "\u{1109}\u{1165}\u{11AE}",
-        nfkc: "\u{C123}",
-        nfkd: "\u{1109}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C124}",
-        nfc: "\u{C124}",
-        nfd: "\u{1109}\u{1165}\u{11AF}",
-        nfkc: "\u{C124}",
-        nfkd: "\u{1109}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C125}",
-        nfc: "\u{C125}",
-        nfd: "\u{1109}\u{1165}\u{11B0}",
-        nfkc: "\u{C125}",
-        nfkd: "\u{1109}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C126}",
-        nfc: "\u{C126}",
-        nfd: "\u{1109}\u{1165}\u{11B1}",
-        nfkc: "\u{C126}",
-        nfkd: "\u{1109}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C127}",
-        nfc: "\u{C127}",
-        nfd: "\u{1109}\u{1165}\u{11B2}",
-        nfkc: "\u{C127}",
-        nfkd: "\u{1109}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C128}",
-        nfc: "\u{C128}",
-        nfd: "\u{1109}\u{1165}\u{11B3}",
-        nfkc: "\u{C128}",
-        nfkd: "\u{1109}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C129}",
-        nfc: "\u{C129}",
-        nfd: "\u{1109}\u{1165}\u{11B4}",
-        nfkc: "\u{C129}",
-        nfkd: "\u{1109}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C12A}",
-        nfc: "\u{C12A}",
-        nfd: "\u{1109}\u{1165}\u{11B5}",
-        nfkc: "\u{C12A}",
-        nfkd: "\u{1109}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C12B}",
-        nfc: "\u{C12B}",
-        nfd: "\u{1109}\u{1165}\u{11B6}",
-        nfkc: "\u{C12B}",
-        nfkd: "\u{1109}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C12C}",
-        nfc: "\u{C12C}",
-        nfd: "\u{1109}\u{1165}\u{11B7}",
-        nfkc: "\u{C12C}",
-        nfkd: "\u{1109}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C12D}",
-        nfc: "\u{C12D}",
-        nfd: "\u{1109}\u{1165}\u{11B8}",
-        nfkc: "\u{C12D}",
-        nfkd: "\u{1109}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C12E}",
-        nfc: "\u{C12E}",
-        nfd: "\u{1109}\u{1165}\u{11B9}",
-        nfkc: "\u{C12E}",
-        nfkd: "\u{1109}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C12F}",
-        nfc: "\u{C12F}",
-        nfd: "\u{1109}\u{1165}\u{11BA}",
-        nfkc: "\u{C12F}",
-        nfkd: "\u{1109}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C130}",
-        nfc: "\u{C130}",
-        nfd: "\u{1109}\u{1165}\u{11BB}",
-        nfkc: "\u{C130}",
-        nfkd: "\u{1109}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C131}",
-        nfc: "\u{C131}",
-        nfd: "\u{1109}\u{1165}\u{11BC}",
-        nfkc: "\u{C131}",
-        nfkd: "\u{1109}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C132}",
-        nfc: "\u{C132}",
-        nfd: "\u{1109}\u{1165}\u{11BD}",
-        nfkc: "\u{C132}",
-        nfkd: "\u{1109}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C133}",
-        nfc: "\u{C133}",
-        nfd: "\u{1109}\u{1165}\u{11BE}",
-        nfkc: "\u{C133}",
-        nfkd: "\u{1109}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C134}",
-        nfc: "\u{C134}",
-        nfd: "\u{1109}\u{1165}\u{11BF}",
-        nfkc: "\u{C134}",
-        nfkd: "\u{1109}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C135}",
-        nfc: "\u{C135}",
-        nfd: "\u{1109}\u{1165}\u{11C0}",
-        nfkc: "\u{C135}",
-        nfkd: "\u{1109}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C136}",
-        nfc: "\u{C136}",
-        nfd: "\u{1109}\u{1165}\u{11C1}",
-        nfkc: "\u{C136}",
-        nfkd: "\u{1109}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C137}",
-        nfc: "\u{C137}",
-        nfd: "\u{1109}\u{1165}\u{11C2}",
-        nfkc: "\u{C137}",
-        nfkd: "\u{1109}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C138}",
-        nfc: "\u{C138}",
-        nfd: "\u{1109}\u{1166}",
-        nfkc: "\u{C138}",
-        nfkd: "\u{1109}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{C139}",
-        nfc: "\u{C139}",
-        nfd: "\u{1109}\u{1166}\u{11A8}",
-        nfkc: "\u{C139}",
-        nfkd: "\u{1109}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C13A}",
-        nfc: "\u{C13A}",
-        nfd: "\u{1109}\u{1166}\u{11A9}",
-        nfkc: "\u{C13A}",
-        nfkd: "\u{1109}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C13B}",
-        nfc: "\u{C13B}",
-        nfd: "\u{1109}\u{1166}\u{11AA}",
-        nfkc: "\u{C13B}",
-        nfkd: "\u{1109}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C13C}",
-        nfc: "\u{C13C}",
-        nfd: "\u{1109}\u{1166}\u{11AB}",
-        nfkc: "\u{C13C}",
-        nfkd: "\u{1109}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C13D}",
-        nfc: "\u{C13D}",
-        nfd: "\u{1109}\u{1166}\u{11AC}",
-        nfkc: "\u{C13D}",
-        nfkd: "\u{1109}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C13E}",
-        nfc: "\u{C13E}",
-        nfd: "\u{1109}\u{1166}\u{11AD}",
-        nfkc: "\u{C13E}",
-        nfkd: "\u{1109}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C13F}",
-        nfc: "\u{C13F}",
-        nfd: "\u{1109}\u{1166}\u{11AE}",
-        nfkc: "\u{C13F}",
-        nfkd: "\u{1109}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C140}",
-        nfc: "\u{C140}",
-        nfd: "\u{1109}\u{1166}\u{11AF}",
-        nfkc: "\u{C140}",
-        nfkd: "\u{1109}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C141}",
-        nfc: "\u{C141}",
-        nfd: "\u{1109}\u{1166}\u{11B0}",
-        nfkc: "\u{C141}",
-        nfkd: "\u{1109}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C142}",
-        nfc: "\u{C142}",
-        nfd: "\u{1109}\u{1166}\u{11B1}",
-        nfkc: "\u{C142}",
-        nfkd: "\u{1109}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C143}",
-        nfc: "\u{C143}",
-        nfd: "\u{1109}\u{1166}\u{11B2}",
-        nfkc: "\u{C143}",
-        nfkd: "\u{1109}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C144}",
-        nfc: "\u{C144}",
-        nfd: "\u{1109}\u{1166}\u{11B3}",
-        nfkc: "\u{C144}",
-        nfkd: "\u{1109}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C145}",
-        nfc: "\u{C145}",
-        nfd: "\u{1109}\u{1166}\u{11B4}",
-        nfkc: "\u{C145}",
-        nfkd: "\u{1109}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C146}",
-        nfc: "\u{C146}",
-        nfd: "\u{1109}\u{1166}\u{11B5}",
-        nfkc: "\u{C146}",
-        nfkd: "\u{1109}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C147}",
-        nfc: "\u{C147}",
-        nfd: "\u{1109}\u{1166}\u{11B6}",
-        nfkc: "\u{C147}",
-        nfkd: "\u{1109}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C148}",
-        nfc: "\u{C148}",
-        nfd: "\u{1109}\u{1166}\u{11B7}",
-        nfkc: "\u{C148}",
-        nfkd: "\u{1109}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C149}",
-        nfc: "\u{C149}",
-        nfd: "\u{1109}\u{1166}\u{11B8}",
-        nfkc: "\u{C149}",
-        nfkd: "\u{1109}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C14A}",
-        nfc: "\u{C14A}",
-        nfd: "\u{1109}\u{1166}\u{11B9}",
-        nfkc: "\u{C14A}",
-        nfkd: "\u{1109}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C14B}",
-        nfc: "\u{C14B}",
-        nfd: "\u{1109}\u{1166}\u{11BA}",
-        nfkc: "\u{C14B}",
-        nfkd: "\u{1109}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C14C}",
-        nfc: "\u{C14C}",
-        nfd: "\u{1109}\u{1166}\u{11BB}",
-        nfkc: "\u{C14C}",
-        nfkd: "\u{1109}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C14D}",
-        nfc: "\u{C14D}",
-        nfd: "\u{1109}\u{1166}\u{11BC}",
-        nfkc: "\u{C14D}",
-        nfkd: "\u{1109}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C14E}",
-        nfc: "\u{C14E}",
-        nfd: "\u{1109}\u{1166}\u{11BD}",
-        nfkc: "\u{C14E}",
-        nfkd: "\u{1109}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C14F}",
-        nfc: "\u{C14F}",
-        nfd: "\u{1109}\u{1166}\u{11BE}",
-        nfkc: "\u{C14F}",
-        nfkd: "\u{1109}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C150}",
-        nfc: "\u{C150}",
-        nfd: "\u{1109}\u{1166}\u{11BF}",
-        nfkc: "\u{C150}",
-        nfkd: "\u{1109}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C151}",
-        nfc: "\u{C151}",
-        nfd: "\u{1109}\u{1166}\u{11C0}",
-        nfkc: "\u{C151}",
-        nfkd: "\u{1109}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C152}",
-        nfc: "\u{C152}",
-        nfd: "\u{1109}\u{1166}\u{11C1}",
-        nfkc: "\u{C152}",
-        nfkd: "\u{1109}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C153}",
-        nfc: "\u{C153}",
-        nfd: "\u{1109}\u{1166}\u{11C2}",
-        nfkc: "\u{C153}",
-        nfkd: "\u{1109}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C154}",
-        nfc: "\u{C154}",
-        nfd: "\u{1109}\u{1167}",
-        nfkc: "\u{C154}",
-        nfkd: "\u{1109}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{C155}",
-        nfc: "\u{C155}",
-        nfd: "\u{1109}\u{1167}\u{11A8}",
-        nfkc: "\u{C155}",
-        nfkd: "\u{1109}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C156}",
-        nfc: "\u{C156}",
-        nfd: "\u{1109}\u{1167}\u{11A9}",
-        nfkc: "\u{C156}",
-        nfkd: "\u{1109}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C157}",
-        nfc: "\u{C157}",
-        nfd: "\u{1109}\u{1167}\u{11AA}",
-        nfkc: "\u{C157}",
-        nfkd: "\u{1109}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C158}",
-        nfc: "\u{C158}",
-        nfd: "\u{1109}\u{1167}\u{11AB}",
-        nfkc: "\u{C158}",
-        nfkd: "\u{1109}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C159}",
-        nfc: "\u{C159}",
-        nfd: "\u{1109}\u{1167}\u{11AC}",
-        nfkc: "\u{C159}",
-        nfkd: "\u{1109}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C15A}",
-        nfc: "\u{C15A}",
-        nfd: "\u{1109}\u{1167}\u{11AD}",
-        nfkc: "\u{C15A}",
-        nfkd: "\u{1109}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C15B}",
-        nfc: "\u{C15B}",
-        nfd: "\u{1109}\u{1167}\u{11AE}",
-        nfkc: "\u{C15B}",
-        nfkd: "\u{1109}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C15C}",
-        nfc: "\u{C15C}",
-        nfd: "\u{1109}\u{1167}\u{11AF}",
-        nfkc: "\u{C15C}",
-        nfkd: "\u{1109}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C15D}",
-        nfc: "\u{C15D}",
-        nfd: "\u{1109}\u{1167}\u{11B0}",
-        nfkc: "\u{C15D}",
-        nfkd: "\u{1109}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C15E}",
-        nfc: "\u{C15E}",
-        nfd: "\u{1109}\u{1167}\u{11B1}",
-        nfkc: "\u{C15E}",
-        nfkd: "\u{1109}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C15F}",
-        nfc: "\u{C15F}",
-        nfd: "\u{1109}\u{1167}\u{11B2}",
-        nfkc: "\u{C15F}",
-        nfkd: "\u{1109}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C160}",
-        nfc: "\u{C160}",
-        nfd: "\u{1109}\u{1167}\u{11B3}",
-        nfkc: "\u{C160}",
-        nfkd: "\u{1109}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C161}",
-        nfc: "\u{C161}",
-        nfd: "\u{1109}\u{1167}\u{11B4}",
-        nfkc: "\u{C161}",
-        nfkd: "\u{1109}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C162}",
-        nfc: "\u{C162}",
-        nfd: "\u{1109}\u{1167}\u{11B5}",
-        nfkc: "\u{C162}",
-        nfkd: "\u{1109}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C163}",
-        nfc: "\u{C163}",
-        nfd: "\u{1109}\u{1167}\u{11B6}",
-        nfkc: "\u{C163}",
-        nfkd: "\u{1109}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C164}",
-        nfc: "\u{C164}",
-        nfd: "\u{1109}\u{1167}\u{11B7}",
-        nfkc: "\u{C164}",
-        nfkd: "\u{1109}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C165}",
-        nfc: "\u{C165}",
-        nfd: "\u{1109}\u{1167}\u{11B8}",
-        nfkc: "\u{C165}",
-        nfkd: "\u{1109}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C166}",
-        nfc: "\u{C166}",
-        nfd: "\u{1109}\u{1167}\u{11B9}",
-        nfkc: "\u{C166}",
-        nfkd: "\u{1109}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C167}",
-        nfc: "\u{C167}",
-        nfd: "\u{1109}\u{1167}\u{11BA}",
-        nfkc: "\u{C167}",
-        nfkd: "\u{1109}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C168}",
-        nfc: "\u{C168}",
-        nfd: "\u{1109}\u{1167}\u{11BB}",
-        nfkc: "\u{C168}",
-        nfkd: "\u{1109}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C169}",
-        nfc: "\u{C169}",
-        nfd: "\u{1109}\u{1167}\u{11BC}",
-        nfkc: "\u{C169}",
-        nfkd: "\u{1109}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C16A}",
-        nfc: "\u{C16A}",
-        nfd: "\u{1109}\u{1167}\u{11BD}",
-        nfkc: "\u{C16A}",
-        nfkd: "\u{1109}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C16B}",
-        nfc: "\u{C16B}",
-        nfd: "\u{1109}\u{1167}\u{11BE}",
-        nfkc: "\u{C16B}",
-        nfkd: "\u{1109}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C16C}",
-        nfc: "\u{C16C}",
-        nfd: "\u{1109}\u{1167}\u{11BF}",
-        nfkc: "\u{C16C}",
-        nfkd: "\u{1109}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C16D}",
-        nfc: "\u{C16D}",
-        nfd: "\u{1109}\u{1167}\u{11C0}",
-        nfkc: "\u{C16D}",
-        nfkd: "\u{1109}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C16E}",
-        nfc: "\u{C16E}",
-        nfd: "\u{1109}\u{1167}\u{11C1}",
-        nfkc: "\u{C16E}",
-        nfkd: "\u{1109}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C16F}",
-        nfc: "\u{C16F}",
-        nfd: "\u{1109}\u{1167}\u{11C2}",
-        nfkc: "\u{C16F}",
-        nfkd: "\u{1109}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C170}",
-        nfc: "\u{C170}",
-        nfd: "\u{1109}\u{1168}",
-        nfkc: "\u{C170}",
-        nfkd: "\u{1109}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{C171}",
-        nfc: "\u{C171}",
-        nfd: "\u{1109}\u{1168}\u{11A8}",
-        nfkc: "\u{C171}",
-        nfkd: "\u{1109}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C172}",
-        nfc: "\u{C172}",
-        nfd: "\u{1109}\u{1168}\u{11A9}",
-        nfkc: "\u{C172}",
-        nfkd: "\u{1109}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C173}",
-        nfc: "\u{C173}",
-        nfd: "\u{1109}\u{1168}\u{11AA}",
-        nfkc: "\u{C173}",
-        nfkd: "\u{1109}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C174}",
-        nfc: "\u{C174}",
-        nfd: "\u{1109}\u{1168}\u{11AB}",
-        nfkc: "\u{C174}",
-        nfkd: "\u{1109}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C175}",
-        nfc: "\u{C175}",
-        nfd: "\u{1109}\u{1168}\u{11AC}",
-        nfkc: "\u{C175}",
-        nfkd: "\u{1109}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C176}",
-        nfc: "\u{C176}",
-        nfd: "\u{1109}\u{1168}\u{11AD}",
-        nfkc: "\u{C176}",
-        nfkd: "\u{1109}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C177}",
-        nfc: "\u{C177}",
-        nfd: "\u{1109}\u{1168}\u{11AE}",
-        nfkc: "\u{C177}",
-        nfkd: "\u{1109}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C178}",
-        nfc: "\u{C178}",
-        nfd: "\u{1109}\u{1168}\u{11AF}",
-        nfkc: "\u{C178}",
-        nfkd: "\u{1109}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C179}",
-        nfc: "\u{C179}",
-        nfd: "\u{1109}\u{1168}\u{11B0}",
-        nfkc: "\u{C179}",
-        nfkd: "\u{1109}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C17A}",
-        nfc: "\u{C17A}",
-        nfd: "\u{1109}\u{1168}\u{11B1}",
-        nfkc: "\u{C17A}",
-        nfkd: "\u{1109}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C17B}",
-        nfc: "\u{C17B}",
-        nfd: "\u{1109}\u{1168}\u{11B2}",
-        nfkc: "\u{C17B}",
-        nfkd: "\u{1109}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C17C}",
-        nfc: "\u{C17C}",
-        nfd: "\u{1109}\u{1168}\u{11B3}",
-        nfkc: "\u{C17C}",
-        nfkd: "\u{1109}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C17D}",
-        nfc: "\u{C17D}",
-        nfd: "\u{1109}\u{1168}\u{11B4}",
-        nfkc: "\u{C17D}",
-        nfkd: "\u{1109}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C17E}",
-        nfc: "\u{C17E}",
-        nfd: "\u{1109}\u{1168}\u{11B5}",
-        nfkc: "\u{C17E}",
-        nfkd: "\u{1109}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C17F}",
-        nfc: "\u{C17F}",
-        nfd: "\u{1109}\u{1168}\u{11B6}",
-        nfkc: "\u{C17F}",
-        nfkd: "\u{1109}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C180}",
-        nfc: "\u{C180}",
-        nfd: "\u{1109}\u{1168}\u{11B7}",
-        nfkc: "\u{C180}",
-        nfkd: "\u{1109}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C181}",
-        nfc: "\u{C181}",
-        nfd: "\u{1109}\u{1168}\u{11B8}",
-        nfkc: "\u{C181}",
-        nfkd: "\u{1109}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C182}",
-        nfc: "\u{C182}",
-        nfd: "\u{1109}\u{1168}\u{11B9}",
-        nfkc: "\u{C182}",
-        nfkd: "\u{1109}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C183}",
-        nfc: "\u{C183}",
-        nfd: "\u{1109}\u{1168}\u{11BA}",
-        nfkc: "\u{C183}",
-        nfkd: "\u{1109}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C184}",
-        nfc: "\u{C184}",
-        nfd: "\u{1109}\u{1168}\u{11BB}",
-        nfkc: "\u{C184}",
-        nfkd: "\u{1109}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C185}",
-        nfc: "\u{C185}",
-        nfd: "\u{1109}\u{1168}\u{11BC}",
-        nfkc: "\u{C185}",
-        nfkd: "\u{1109}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C186}",
-        nfc: "\u{C186}",
-        nfd: "\u{1109}\u{1168}\u{11BD}",
-        nfkc: "\u{C186}",
-        nfkd: "\u{1109}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C187}",
-        nfc: "\u{C187}",
-        nfd: "\u{1109}\u{1168}\u{11BE}",
-        nfkc: "\u{C187}",
-        nfkd: "\u{1109}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C188}",
-        nfc: "\u{C188}",
-        nfd: "\u{1109}\u{1168}\u{11BF}",
-        nfkc: "\u{C188}",
-        nfkd: "\u{1109}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C189}",
-        nfc: "\u{C189}",
-        nfd: "\u{1109}\u{1168}\u{11C0}",
-        nfkc: "\u{C189}",
-        nfkd: "\u{1109}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C18A}",
-        nfc: "\u{C18A}",
-        nfd: "\u{1109}\u{1168}\u{11C1}",
-        nfkc: "\u{C18A}",
-        nfkd: "\u{1109}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C18B}",
-        nfc: "\u{C18B}",
-        nfd: "\u{1109}\u{1168}\u{11C2}",
-        nfkc: "\u{C18B}",
-        nfkd: "\u{1109}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C18C}",
-        nfc: "\u{C18C}",
-        nfd: "\u{1109}\u{1169}",
-        nfkc: "\u{C18C}",
-        nfkd: "\u{1109}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{C18D}",
-        nfc: "\u{C18D}",
-        nfd: "\u{1109}\u{1169}\u{11A8}",
-        nfkc: "\u{C18D}",
-        nfkd: "\u{1109}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C18E}",
-        nfc: "\u{C18E}",
-        nfd: "\u{1109}\u{1169}\u{11A9}",
-        nfkc: "\u{C18E}",
-        nfkd: "\u{1109}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C18F}",
-        nfc: "\u{C18F}",
-        nfd: "\u{1109}\u{1169}\u{11AA}",
-        nfkc: "\u{C18F}",
-        nfkd: "\u{1109}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C190}",
-        nfc: "\u{C190}",
-        nfd: "\u{1109}\u{1169}\u{11AB}",
-        nfkc: "\u{C190}",
-        nfkd: "\u{1109}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C191}",
-        nfc: "\u{C191}",
-        nfd: "\u{1109}\u{1169}\u{11AC}",
-        nfkc: "\u{C191}",
-        nfkd: "\u{1109}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C192}",
-        nfc: "\u{C192}",
-        nfd: "\u{1109}\u{1169}\u{11AD}",
-        nfkc: "\u{C192}",
-        nfkd: "\u{1109}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C193}",
-        nfc: "\u{C193}",
-        nfd: "\u{1109}\u{1169}\u{11AE}",
-        nfkc: "\u{C193}",
-        nfkd: "\u{1109}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C194}",
-        nfc: "\u{C194}",
-        nfd: "\u{1109}\u{1169}\u{11AF}",
-        nfkc: "\u{C194}",
-        nfkd: "\u{1109}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C195}",
-        nfc: "\u{C195}",
-        nfd: "\u{1109}\u{1169}\u{11B0}",
-        nfkc: "\u{C195}",
-        nfkd: "\u{1109}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C196}",
-        nfc: "\u{C196}",
-        nfd: "\u{1109}\u{1169}\u{11B1}",
-        nfkc: "\u{C196}",
-        nfkd: "\u{1109}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C197}",
-        nfc: "\u{C197}",
-        nfd: "\u{1109}\u{1169}\u{11B2}",
-        nfkc: "\u{C197}",
-        nfkd: "\u{1109}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C198}",
-        nfc: "\u{C198}",
-        nfd: "\u{1109}\u{1169}\u{11B3}",
-        nfkc: "\u{C198}",
-        nfkd: "\u{1109}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C199}",
-        nfc: "\u{C199}",
-        nfd: "\u{1109}\u{1169}\u{11B4}",
-        nfkc: "\u{C199}",
-        nfkd: "\u{1109}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C19A}",
-        nfc: "\u{C19A}",
-        nfd: "\u{1109}\u{1169}\u{11B5}",
-        nfkc: "\u{C19A}",
-        nfkd: "\u{1109}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C19B}",
-        nfc: "\u{C19B}",
-        nfd: "\u{1109}\u{1169}\u{11B6}",
-        nfkc: "\u{C19B}",
-        nfkd: "\u{1109}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C19C}",
-        nfc: "\u{C19C}",
-        nfd: "\u{1109}\u{1169}\u{11B7}",
-        nfkc: "\u{C19C}",
-        nfkd: "\u{1109}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C19D}",
-        nfc: "\u{C19D}",
-        nfd: "\u{1109}\u{1169}\u{11B8}",
-        nfkc: "\u{C19D}",
-        nfkd: "\u{1109}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C19E}",
-        nfc: "\u{C19E}",
-        nfd: "\u{1109}\u{1169}\u{11B9}",
-        nfkc: "\u{C19E}",
-        nfkd: "\u{1109}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C19F}",
-        nfc: "\u{C19F}",
-        nfd: "\u{1109}\u{1169}\u{11BA}",
-        nfkc: "\u{C19F}",
-        nfkd: "\u{1109}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C1A0}",
-        nfc: "\u{C1A0}",
-        nfd: "\u{1109}\u{1169}\u{11BB}",
-        nfkc: "\u{C1A0}",
-        nfkd: "\u{1109}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C1A1}",
-        nfc: "\u{C1A1}",
-        nfd: "\u{1109}\u{1169}\u{11BC}",
-        nfkc: "\u{C1A1}",
-        nfkd: "\u{1109}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C1A2}",
-        nfc: "\u{C1A2}",
-        nfd: "\u{1109}\u{1169}\u{11BD}",
-        nfkc: "\u{C1A2}",
-        nfkd: "\u{1109}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C1A3}",
-        nfc: "\u{C1A3}",
-        nfd: "\u{1109}\u{1169}\u{11BE}",
-        nfkc: "\u{C1A3}",
-        nfkd: "\u{1109}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C1A4}",
-        nfc: "\u{C1A4}",
-        nfd: "\u{1109}\u{1169}\u{11BF}",
-        nfkc: "\u{C1A4}",
-        nfkd: "\u{1109}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C1A5}",
-        nfc: "\u{C1A5}",
-        nfd: "\u{1109}\u{1169}\u{11C0}",
-        nfkc: "\u{C1A5}",
-        nfkd: "\u{1109}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C1A6}",
-        nfc: "\u{C1A6}",
-        nfd: "\u{1109}\u{1169}\u{11C1}",
-        nfkc: "\u{C1A6}",
-        nfkd: "\u{1109}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C1A7}",
-        nfc: "\u{C1A7}",
-        nfd: "\u{1109}\u{1169}\u{11C2}",
-        nfkc: "\u{C1A7}",
-        nfkd: "\u{1109}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C1A8}",
-        nfc: "\u{C1A8}",
-        nfd: "\u{1109}\u{116A}",
-        nfkc: "\u{C1A8}",
-        nfkd: "\u{1109}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{C1A9}",
-        nfc: "\u{C1A9}",
-        nfd: "\u{1109}\u{116A}\u{11A8}",
-        nfkc: "\u{C1A9}",
-        nfkd: "\u{1109}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C1AA}",
-        nfc: "\u{C1AA}",
-        nfd: "\u{1109}\u{116A}\u{11A9}",
-        nfkc: "\u{C1AA}",
-        nfkd: "\u{1109}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C1AB}",
-        nfc: "\u{C1AB}",
-        nfd: "\u{1109}\u{116A}\u{11AA}",
-        nfkc: "\u{C1AB}",
-        nfkd: "\u{1109}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C1AC}",
-        nfc: "\u{C1AC}",
-        nfd: "\u{1109}\u{116A}\u{11AB}",
-        nfkc: "\u{C1AC}",
-        nfkd: "\u{1109}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C1AD}",
-        nfc: "\u{C1AD}",
-        nfd: "\u{1109}\u{116A}\u{11AC}",
-        nfkc: "\u{C1AD}",
-        nfkd: "\u{1109}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C1AE}",
-        nfc: "\u{C1AE}",
-        nfd: "\u{1109}\u{116A}\u{11AD}",
-        nfkc: "\u{C1AE}",
-        nfkd: "\u{1109}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C1AF}",
-        nfc: "\u{C1AF}",
-        nfd: "\u{1109}\u{116A}\u{11AE}",
-        nfkc: "\u{C1AF}",
-        nfkd: "\u{1109}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C1B0}",
-        nfc: "\u{C1B0}",
-        nfd: "\u{1109}\u{116A}\u{11AF}",
-        nfkc: "\u{C1B0}",
-        nfkd: "\u{1109}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C1B1}",
-        nfc: "\u{C1B1}",
-        nfd: "\u{1109}\u{116A}\u{11B0}",
-        nfkc: "\u{C1B1}",
-        nfkd: "\u{1109}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C1B2}",
-        nfc: "\u{C1B2}",
-        nfd: "\u{1109}\u{116A}\u{11B1}",
-        nfkc: "\u{C1B2}",
-        nfkd: "\u{1109}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C1B3}",
-        nfc: "\u{C1B3}",
-        nfd: "\u{1109}\u{116A}\u{11B2}",
-        nfkc: "\u{C1B3}",
-        nfkd: "\u{1109}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C1B4}",
-        nfc: "\u{C1B4}",
-        nfd: "\u{1109}\u{116A}\u{11B3}",
-        nfkc: "\u{C1B4}",
-        nfkd: "\u{1109}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C1B5}",
-        nfc: "\u{C1B5}",
-        nfd: "\u{1109}\u{116A}\u{11B4}",
-        nfkc: "\u{C1B5}",
-        nfkd: "\u{1109}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C1B6}",
-        nfc: "\u{C1B6}",
-        nfd: "\u{1109}\u{116A}\u{11B5}",
-        nfkc: "\u{C1B6}",
-        nfkd: "\u{1109}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C1B7}",
-        nfc: "\u{C1B7}",
-        nfd: "\u{1109}\u{116A}\u{11B6}",
-        nfkc: "\u{C1B7}",
-        nfkd: "\u{1109}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C1B8}",
-        nfc: "\u{C1B8}",
-        nfd: "\u{1109}\u{116A}\u{11B7}",
-        nfkc: "\u{C1B8}",
-        nfkd: "\u{1109}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C1B9}",
-        nfc: "\u{C1B9}",
-        nfd: "\u{1109}\u{116A}\u{11B8}",
-        nfkc: "\u{C1B9}",
-        nfkd: "\u{1109}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C1BA}",
-        nfc: "\u{C1BA}",
-        nfd: "\u{1109}\u{116A}\u{11B9}",
-        nfkc: "\u{C1BA}",
-        nfkd: "\u{1109}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C1BB}",
-        nfc: "\u{C1BB}",
-        nfd: "\u{1109}\u{116A}\u{11BA}",
-        nfkc: "\u{C1BB}",
-        nfkd: "\u{1109}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C1BC}",
-        nfc: "\u{C1BC}",
-        nfd: "\u{1109}\u{116A}\u{11BB}",
-        nfkc: "\u{C1BC}",
-        nfkd: "\u{1109}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C1BD}",
-        nfc: "\u{C1BD}",
-        nfd: "\u{1109}\u{116A}\u{11BC}",
-        nfkc: "\u{C1BD}",
-        nfkd: "\u{1109}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C1BE}",
-        nfc: "\u{C1BE}",
-        nfd: "\u{1109}\u{116A}\u{11BD}",
-        nfkc: "\u{C1BE}",
-        nfkd: "\u{1109}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C1BF}",
-        nfc: "\u{C1BF}",
-        nfd: "\u{1109}\u{116A}\u{11BE}",
-        nfkc: "\u{C1BF}",
-        nfkd: "\u{1109}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C1C0}",
-        nfc: "\u{C1C0}",
-        nfd: "\u{1109}\u{116A}\u{11BF}",
-        nfkc: "\u{C1C0}",
-        nfkd: "\u{1109}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C1C1}",
-        nfc: "\u{C1C1}",
-        nfd: "\u{1109}\u{116A}\u{11C0}",
-        nfkc: "\u{C1C1}",
-        nfkd: "\u{1109}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C1C2}",
-        nfc: "\u{C1C2}",
-        nfd: "\u{1109}\u{116A}\u{11C1}",
-        nfkc: "\u{C1C2}",
-        nfkd: "\u{1109}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C1C3}",
-        nfc: "\u{C1C3}",
-        nfd: "\u{1109}\u{116A}\u{11C2}",
-        nfkc: "\u{C1C3}",
-        nfkd: "\u{1109}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C1C4}",
-        nfc: "\u{C1C4}",
-        nfd: "\u{1109}\u{116B}",
-        nfkc: "\u{C1C4}",
-        nfkd: "\u{1109}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{C1C5}",
-        nfc: "\u{C1C5}",
-        nfd: "\u{1109}\u{116B}\u{11A8}",
-        nfkc: "\u{C1C5}",
-        nfkd: "\u{1109}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C1C6}",
-        nfc: "\u{C1C6}",
-        nfd: "\u{1109}\u{116B}\u{11A9}",
-        nfkc: "\u{C1C6}",
-        nfkd: "\u{1109}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C1C7}",
-        nfc: "\u{C1C7}",
-        nfd: "\u{1109}\u{116B}\u{11AA}",
-        nfkc: "\u{C1C7}",
-        nfkd: "\u{1109}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C1C8}",
-        nfc: "\u{C1C8}",
-        nfd: "\u{1109}\u{116B}\u{11AB}",
-        nfkc: "\u{C1C8}",
-        nfkd: "\u{1109}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C1C9}",
-        nfc: "\u{C1C9}",
-        nfd: "\u{1109}\u{116B}\u{11AC}",
-        nfkc: "\u{C1C9}",
-        nfkd: "\u{1109}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C1CA}",
-        nfc: "\u{C1CA}",
-        nfd: "\u{1109}\u{116B}\u{11AD}",
-        nfkc: "\u{C1CA}",
-        nfkd: "\u{1109}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C1CB}",
-        nfc: "\u{C1CB}",
-        nfd: "\u{1109}\u{116B}\u{11AE}",
-        nfkc: "\u{C1CB}",
-        nfkd: "\u{1109}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C1CC}",
-        nfc: "\u{C1CC}",
-        nfd: "\u{1109}\u{116B}\u{11AF}",
-        nfkc: "\u{C1CC}",
-        nfkd: "\u{1109}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C1CD}",
-        nfc: "\u{C1CD}",
-        nfd: "\u{1109}\u{116B}\u{11B0}",
-        nfkc: "\u{C1CD}",
-        nfkd: "\u{1109}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C1CE}",
-        nfc: "\u{C1CE}",
-        nfd: "\u{1109}\u{116B}\u{11B1}",
-        nfkc: "\u{C1CE}",
-        nfkd: "\u{1109}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C1CF}",
-        nfc: "\u{C1CF}",
-        nfd: "\u{1109}\u{116B}\u{11B2}",
-        nfkc: "\u{C1CF}",
-        nfkd: "\u{1109}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C1D0}",
-        nfc: "\u{C1D0}",
-        nfd: "\u{1109}\u{116B}\u{11B3}",
-        nfkc: "\u{C1D0}",
-        nfkd: "\u{1109}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C1D1}",
-        nfc: "\u{C1D1}",
-        nfd: "\u{1109}\u{116B}\u{11B4}",
-        nfkc: "\u{C1D1}",
-        nfkd: "\u{1109}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C1D2}",
-        nfc: "\u{C1D2}",
-        nfd: "\u{1109}\u{116B}\u{11B5}",
-        nfkc: "\u{C1D2}",
-        nfkd: "\u{1109}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C1D3}",
-        nfc: "\u{C1D3}",
-        nfd: "\u{1109}\u{116B}\u{11B6}",
-        nfkc: "\u{C1D3}",
-        nfkd: "\u{1109}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C1D4}",
-        nfc: "\u{C1D4}",
-        nfd: "\u{1109}\u{116B}\u{11B7}",
-        nfkc: "\u{C1D4}",
-        nfkd: "\u{1109}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C1D5}",
-        nfc: "\u{C1D5}",
-        nfd: "\u{1109}\u{116B}\u{11B8}",
-        nfkc: "\u{C1D5}",
-        nfkd: "\u{1109}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C1D6}",
-        nfc: "\u{C1D6}",
-        nfd: "\u{1109}\u{116B}\u{11B9}",
-        nfkc: "\u{C1D6}",
-        nfkd: "\u{1109}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C1D7}",
-        nfc: "\u{C1D7}",
-        nfd: "\u{1109}\u{116B}\u{11BA}",
-        nfkc: "\u{C1D7}",
-        nfkd: "\u{1109}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C1D8}",
-        nfc: "\u{C1D8}",
-        nfd: "\u{1109}\u{116B}\u{11BB}",
-        nfkc: "\u{C1D8}",
-        nfkd: "\u{1109}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C1D9}",
-        nfc: "\u{C1D9}",
-        nfd: "\u{1109}\u{116B}\u{11BC}",
-        nfkc: "\u{C1D9}",
-        nfkd: "\u{1109}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C1DA}",
-        nfc: "\u{C1DA}",
-        nfd: "\u{1109}\u{116B}\u{11BD}",
-        nfkc: "\u{C1DA}",
-        nfkd: "\u{1109}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C1DB}",
-        nfc: "\u{C1DB}",
-        nfd: "\u{1109}\u{116B}\u{11BE}",
-        nfkc: "\u{C1DB}",
-        nfkd: "\u{1109}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C1DC}",
-        nfc: "\u{C1DC}",
-        nfd: "\u{1109}\u{116B}\u{11BF}",
-        nfkc: "\u{C1DC}",
-        nfkd: "\u{1109}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C1DD}",
-        nfc: "\u{C1DD}",
-        nfd: "\u{1109}\u{116B}\u{11C0}",
-        nfkc: "\u{C1DD}",
-        nfkd: "\u{1109}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C1DE}",
-        nfc: "\u{C1DE}",
-        nfd: "\u{1109}\u{116B}\u{11C1}",
-        nfkc: "\u{C1DE}",
-        nfkd: "\u{1109}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C1DF}",
-        nfc: "\u{C1DF}",
-        nfd: "\u{1109}\u{116B}\u{11C2}",
-        nfkc: "\u{C1DF}",
-        nfkd: "\u{1109}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C1E0}",
-        nfc: "\u{C1E0}",
-        nfd: "\u{1109}\u{116C}",
-        nfkc: "\u{C1E0}",
-        nfkd: "\u{1109}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{C1E1}",
-        nfc: "\u{C1E1}",
-        nfd: "\u{1109}\u{116C}\u{11A8}",
-        nfkc: "\u{C1E1}",
-        nfkd: "\u{1109}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C1E2}",
-        nfc: "\u{C1E2}",
-        nfd: "\u{1109}\u{116C}\u{11A9}",
-        nfkc: "\u{C1E2}",
-        nfkd: "\u{1109}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C1E3}",
-        nfc: "\u{C1E3}",
-        nfd: "\u{1109}\u{116C}\u{11AA}",
-        nfkc: "\u{C1E3}",
-        nfkd: "\u{1109}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C1E4}",
-        nfc: "\u{C1E4}",
-        nfd: "\u{1109}\u{116C}\u{11AB}",
-        nfkc: "\u{C1E4}",
-        nfkd: "\u{1109}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C1E5}",
-        nfc: "\u{C1E5}",
-        nfd: "\u{1109}\u{116C}\u{11AC}",
-        nfkc: "\u{C1E5}",
-        nfkd: "\u{1109}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C1E6}",
-        nfc: "\u{C1E6}",
-        nfd: "\u{1109}\u{116C}\u{11AD}",
-        nfkc: "\u{C1E6}",
-        nfkd: "\u{1109}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C1E7}",
-        nfc: "\u{C1E7}",
-        nfd: "\u{1109}\u{116C}\u{11AE}",
-        nfkc: "\u{C1E7}",
-        nfkd: "\u{1109}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C1E8}",
-        nfc: "\u{C1E8}",
-        nfd: "\u{1109}\u{116C}\u{11AF}",
-        nfkc: "\u{C1E8}",
-        nfkd: "\u{1109}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C1E9}",
-        nfc: "\u{C1E9}",
-        nfd: "\u{1109}\u{116C}\u{11B0}",
-        nfkc: "\u{C1E9}",
-        nfkd: "\u{1109}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C1EA}",
-        nfc: "\u{C1EA}",
-        nfd: "\u{1109}\u{116C}\u{11B1}",
-        nfkc: "\u{C1EA}",
-        nfkd: "\u{1109}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C1EB}",
-        nfc: "\u{C1EB}",
-        nfd: "\u{1109}\u{116C}\u{11B2}",
-        nfkc: "\u{C1EB}",
-        nfkd: "\u{1109}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C1EC}",
-        nfc: "\u{C1EC}",
-        nfd: "\u{1109}\u{116C}\u{11B3}",
-        nfkc: "\u{C1EC}",
-        nfkd: "\u{1109}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C1ED}",
-        nfc: "\u{C1ED}",
-        nfd: "\u{1109}\u{116C}\u{11B4}",
-        nfkc: "\u{C1ED}",
-        nfkd: "\u{1109}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C1EE}",
-        nfc: "\u{C1EE}",
-        nfd: "\u{1109}\u{116C}\u{11B5}",
-        nfkc: "\u{C1EE}",
-        nfkd: "\u{1109}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C1EF}",
-        nfc: "\u{C1EF}",
-        nfd: "\u{1109}\u{116C}\u{11B6}",
-        nfkc: "\u{C1EF}",
-        nfkd: "\u{1109}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C1F0}",
-        nfc: "\u{C1F0}",
-        nfd: "\u{1109}\u{116C}\u{11B7}",
-        nfkc: "\u{C1F0}",
-        nfkd: "\u{1109}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C1F1}",
-        nfc: "\u{C1F1}",
-        nfd: "\u{1109}\u{116C}\u{11B8}",
-        nfkc: "\u{C1F1}",
-        nfkd: "\u{1109}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C1F2}",
-        nfc: "\u{C1F2}",
-        nfd: "\u{1109}\u{116C}\u{11B9}",
-        nfkc: "\u{C1F2}",
-        nfkd: "\u{1109}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C1F3}",
-        nfc: "\u{C1F3}",
-        nfd: "\u{1109}\u{116C}\u{11BA}",
-        nfkc: "\u{C1F3}",
-        nfkd: "\u{1109}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C1F4}",
-        nfc: "\u{C1F4}",
-        nfd: "\u{1109}\u{116C}\u{11BB}",
-        nfkc: "\u{C1F4}",
-        nfkd: "\u{1109}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C1F5}",
-        nfc: "\u{C1F5}",
-        nfd: "\u{1109}\u{116C}\u{11BC}",
-        nfkc: "\u{C1F5}",
-        nfkd: "\u{1109}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C1F6}",
-        nfc: "\u{C1F6}",
-        nfd: "\u{1109}\u{116C}\u{11BD}",
-        nfkc: "\u{C1F6}",
-        nfkd: "\u{1109}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C1F7}",
-        nfc: "\u{C1F7}",
-        nfd: "\u{1109}\u{116C}\u{11BE}",
-        nfkc: "\u{C1F7}",
-        nfkd: "\u{1109}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C1F8}",
-        nfc: "\u{C1F8}",
-        nfd: "\u{1109}\u{116C}\u{11BF}",
-        nfkc: "\u{C1F8}",
-        nfkd: "\u{1109}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C1F9}",
-        nfc: "\u{C1F9}",
-        nfd: "\u{1109}\u{116C}\u{11C0}",
-        nfkc: "\u{C1F9}",
-        nfkd: "\u{1109}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C1FA}",
-        nfc: "\u{C1FA}",
-        nfd: "\u{1109}\u{116C}\u{11C1}",
-        nfkc: "\u{C1FA}",
-        nfkd: "\u{1109}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C1FB}",
-        nfc: "\u{C1FB}",
-        nfd: "\u{1109}\u{116C}\u{11C2}",
-        nfkc: "\u{C1FB}",
-        nfkd: "\u{1109}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C1FC}",
-        nfc: "\u{C1FC}",
-        nfd: "\u{1109}\u{116D}",
-        nfkc: "\u{C1FC}",
-        nfkd: "\u{1109}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{C1FD}",
-        nfc: "\u{C1FD}",
-        nfd: "\u{1109}\u{116D}\u{11A8}",
-        nfkc: "\u{C1FD}",
-        nfkd: "\u{1109}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C1FE}",
-        nfc: "\u{C1FE}",
-        nfd: "\u{1109}\u{116D}\u{11A9}",
-        nfkc: "\u{C1FE}",
-        nfkd: "\u{1109}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C1FF}",
-        nfc: "\u{C1FF}",
-        nfd: "\u{1109}\u{116D}\u{11AA}",
-        nfkc: "\u{C1FF}",
-        nfkd: "\u{1109}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C200}",
-        nfc: "\u{C200}",
-        nfd: "\u{1109}\u{116D}\u{11AB}",
-        nfkc: "\u{C200}",
-        nfkd: "\u{1109}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C201}",
-        nfc: "\u{C201}",
-        nfd: "\u{1109}\u{116D}\u{11AC}",
-        nfkc: "\u{C201}",
-        nfkd: "\u{1109}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C202}",
-        nfc: "\u{C202}",
-        nfd: "\u{1109}\u{116D}\u{11AD}",
-        nfkc: "\u{C202}",
-        nfkd: "\u{1109}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C203}",
-        nfc: "\u{C203}",
-        nfd: "\u{1109}\u{116D}\u{11AE}",
-        nfkc: "\u{C203}",
-        nfkd: "\u{1109}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C204}",
-        nfc: "\u{C204}",
-        nfd: "\u{1109}\u{116D}\u{11AF}",
-        nfkc: "\u{C204}",
-        nfkd: "\u{1109}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C205}",
-        nfc: "\u{C205}",
-        nfd: "\u{1109}\u{116D}\u{11B0}",
-        nfkc: "\u{C205}",
-        nfkd: "\u{1109}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C206}",
-        nfc: "\u{C206}",
-        nfd: "\u{1109}\u{116D}\u{11B1}",
-        nfkc: "\u{C206}",
-        nfkd: "\u{1109}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C207}",
-        nfc: "\u{C207}",
-        nfd: "\u{1109}\u{116D}\u{11B2}",
-        nfkc: "\u{C207}",
-        nfkd: "\u{1109}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C208}",
-        nfc: "\u{C208}",
-        nfd: "\u{1109}\u{116D}\u{11B3}",
-        nfkc: "\u{C208}",
-        nfkd: "\u{1109}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C209}",
-        nfc: "\u{C209}",
-        nfd: "\u{1109}\u{116D}\u{11B4}",
-        nfkc: "\u{C209}",
-        nfkd: "\u{1109}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C20A}",
-        nfc: "\u{C20A}",
-        nfd: "\u{1109}\u{116D}\u{11B5}",
-        nfkc: "\u{C20A}",
-        nfkd: "\u{1109}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C20B}",
-        nfc: "\u{C20B}",
-        nfd: "\u{1109}\u{116D}\u{11B6}",
-        nfkc: "\u{C20B}",
-        nfkd: "\u{1109}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C20C}",
-        nfc: "\u{C20C}",
-        nfd: "\u{1109}\u{116D}\u{11B7}",
-        nfkc: "\u{C20C}",
-        nfkd: "\u{1109}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C20D}",
-        nfc: "\u{C20D}",
-        nfd: "\u{1109}\u{116D}\u{11B8}",
-        nfkc: "\u{C20D}",
-        nfkd: "\u{1109}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C20E}",
-        nfc: "\u{C20E}",
-        nfd: "\u{1109}\u{116D}\u{11B9}",
-        nfkc: "\u{C20E}",
-        nfkd: "\u{1109}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C20F}",
-        nfc: "\u{C20F}",
-        nfd: "\u{1109}\u{116D}\u{11BA}",
-        nfkc: "\u{C20F}",
-        nfkd: "\u{1109}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C210}",
-        nfc: "\u{C210}",
-        nfd: "\u{1109}\u{116D}\u{11BB}",
-        nfkc: "\u{C210}",
-        nfkd: "\u{1109}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C211}",
-        nfc: "\u{C211}",
-        nfd: "\u{1109}\u{116D}\u{11BC}",
-        nfkc: "\u{C211}",
-        nfkd: "\u{1109}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C212}",
-        nfc: "\u{C212}",
-        nfd: "\u{1109}\u{116D}\u{11BD}",
-        nfkc: "\u{C212}",
-        nfkd: "\u{1109}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C213}",
-        nfc: "\u{C213}",
-        nfd: "\u{1109}\u{116D}\u{11BE}",
-        nfkc: "\u{C213}",
-        nfkd: "\u{1109}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C214}",
-        nfc: "\u{C214}",
-        nfd: "\u{1109}\u{116D}\u{11BF}",
-        nfkc: "\u{C214}",
-        nfkd: "\u{1109}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C215}",
-        nfc: "\u{C215}",
-        nfd: "\u{1109}\u{116D}\u{11C0}",
-        nfkc: "\u{C215}",
-        nfkd: "\u{1109}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C216}",
-        nfc: "\u{C216}",
-        nfd: "\u{1109}\u{116D}\u{11C1}",
-        nfkc: "\u{C216}",
-        nfkd: "\u{1109}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C217}",
-        nfc: "\u{C217}",
-        nfd: "\u{1109}\u{116D}\u{11C2}",
-        nfkc: "\u{C217}",
-        nfkd: "\u{1109}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C218}",
-        nfc: "\u{C218}",
-        nfd: "\u{1109}\u{116E}",
-        nfkc: "\u{C218}",
-        nfkd: "\u{1109}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{C219}",
-        nfc: "\u{C219}",
-        nfd: "\u{1109}\u{116E}\u{11A8}",
-        nfkc: "\u{C219}",
-        nfkd: "\u{1109}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C21A}",
-        nfc: "\u{C21A}",
-        nfd: "\u{1109}\u{116E}\u{11A9}",
-        nfkc: "\u{C21A}",
-        nfkd: "\u{1109}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C21B}",
-        nfc: "\u{C21B}",
-        nfd: "\u{1109}\u{116E}\u{11AA}",
-        nfkc: "\u{C21B}",
-        nfkd: "\u{1109}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C21C}",
-        nfc: "\u{C21C}",
-        nfd: "\u{1109}\u{116E}\u{11AB}",
-        nfkc: "\u{C21C}",
-        nfkd: "\u{1109}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C21D}",
-        nfc: "\u{C21D}",
-        nfd: "\u{1109}\u{116E}\u{11AC}",
-        nfkc: "\u{C21D}",
-        nfkd: "\u{1109}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C21E}",
-        nfc: "\u{C21E}",
-        nfd: "\u{1109}\u{116E}\u{11AD}",
-        nfkc: "\u{C21E}",
-        nfkd: "\u{1109}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C21F}",
-        nfc: "\u{C21F}",
-        nfd: "\u{1109}\u{116E}\u{11AE}",
-        nfkc: "\u{C21F}",
-        nfkd: "\u{1109}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C220}",
-        nfc: "\u{C220}",
-        nfd: "\u{1109}\u{116E}\u{11AF}",
-        nfkc: "\u{C220}",
-        nfkd: "\u{1109}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C221}",
-        nfc: "\u{C221}",
-        nfd: "\u{1109}\u{116E}\u{11B0}",
-        nfkc: "\u{C221}",
-        nfkd: "\u{1109}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C222}",
-        nfc: "\u{C222}",
-        nfd: "\u{1109}\u{116E}\u{11B1}",
-        nfkc: "\u{C222}",
-        nfkd: "\u{1109}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C223}",
-        nfc: "\u{C223}",
-        nfd: "\u{1109}\u{116E}\u{11B2}",
-        nfkc: "\u{C223}",
-        nfkd: "\u{1109}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C224}",
-        nfc: "\u{C224}",
-        nfd: "\u{1109}\u{116E}\u{11B3}",
-        nfkc: "\u{C224}",
-        nfkd: "\u{1109}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C225}",
-        nfc: "\u{C225}",
-        nfd: "\u{1109}\u{116E}\u{11B4}",
-        nfkc: "\u{C225}",
-        nfkd: "\u{1109}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C226}",
-        nfc: "\u{C226}",
-        nfd: "\u{1109}\u{116E}\u{11B5}",
-        nfkc: "\u{C226}",
-        nfkd: "\u{1109}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C227}",
-        nfc: "\u{C227}",
-        nfd: "\u{1109}\u{116E}\u{11B6}",
-        nfkc: "\u{C227}",
-        nfkd: "\u{1109}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C228}",
-        nfc: "\u{C228}",
-        nfd: "\u{1109}\u{116E}\u{11B7}",
-        nfkc: "\u{C228}",
-        nfkd: "\u{1109}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C229}",
-        nfc: "\u{C229}",
-        nfd: "\u{1109}\u{116E}\u{11B8}",
-        nfkc: "\u{C229}",
-        nfkd: "\u{1109}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C22A}",
-        nfc: "\u{C22A}",
-        nfd: "\u{1109}\u{116E}\u{11B9}",
-        nfkc: "\u{C22A}",
-        nfkd: "\u{1109}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C22B}",
-        nfc: "\u{C22B}",
-        nfd: "\u{1109}\u{116E}\u{11BA}",
-        nfkc: "\u{C22B}",
-        nfkd: "\u{1109}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C22C}",
-        nfc: "\u{C22C}",
-        nfd: "\u{1109}\u{116E}\u{11BB}",
-        nfkc: "\u{C22C}",
-        nfkd: "\u{1109}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C22D}",
-        nfc: "\u{C22D}",
-        nfd: "\u{1109}\u{116E}\u{11BC}",
-        nfkc: "\u{C22D}",
-        nfkd: "\u{1109}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C22E}",
-        nfc: "\u{C22E}",
-        nfd: "\u{1109}\u{116E}\u{11BD}",
-        nfkc: "\u{C22E}",
-        nfkd: "\u{1109}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C22F}",
-        nfc: "\u{C22F}",
-        nfd: "\u{1109}\u{116E}\u{11BE}",
-        nfkc: "\u{C22F}",
-        nfkd: "\u{1109}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C230}",
-        nfc: "\u{C230}",
-        nfd: "\u{1109}\u{116E}\u{11BF}",
-        nfkc: "\u{C230}",
-        nfkd: "\u{1109}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C231}",
-        nfc: "\u{C231}",
-        nfd: "\u{1109}\u{116E}\u{11C0}",
-        nfkc: "\u{C231}",
-        nfkd: "\u{1109}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C232}",
-        nfc: "\u{C232}",
-        nfd: "\u{1109}\u{116E}\u{11C1}",
-        nfkc: "\u{C232}",
-        nfkd: "\u{1109}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C233}",
-        nfc: "\u{C233}",
-        nfd: "\u{1109}\u{116E}\u{11C2}",
-        nfkc: "\u{C233}",
-        nfkd: "\u{1109}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C234}",
-        nfc: "\u{C234}",
-        nfd: "\u{1109}\u{116F}",
-        nfkc: "\u{C234}",
-        nfkd: "\u{1109}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{C235}",
-        nfc: "\u{C235}",
-        nfd: "\u{1109}\u{116F}\u{11A8}",
-        nfkc: "\u{C235}",
-        nfkd: "\u{1109}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C236}",
-        nfc: "\u{C236}",
-        nfd: "\u{1109}\u{116F}\u{11A9}",
-        nfkc: "\u{C236}",
-        nfkd: "\u{1109}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C237}",
-        nfc: "\u{C237}",
-        nfd: "\u{1109}\u{116F}\u{11AA}",
-        nfkc: "\u{C237}",
-        nfkd: "\u{1109}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C238}",
-        nfc: "\u{C238}",
-        nfd: "\u{1109}\u{116F}\u{11AB}",
-        nfkc: "\u{C238}",
-        nfkd: "\u{1109}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C239}",
-        nfc: "\u{C239}",
-        nfd: "\u{1109}\u{116F}\u{11AC}",
-        nfkc: "\u{C239}",
-        nfkd: "\u{1109}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C23A}",
-        nfc: "\u{C23A}",
-        nfd: "\u{1109}\u{116F}\u{11AD}",
-        nfkc: "\u{C23A}",
-        nfkd: "\u{1109}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C23B}",
-        nfc: "\u{C23B}",
-        nfd: "\u{1109}\u{116F}\u{11AE}",
-        nfkc: "\u{C23B}",
-        nfkd: "\u{1109}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C23C}",
-        nfc: "\u{C23C}",
-        nfd: "\u{1109}\u{116F}\u{11AF}",
-        nfkc: "\u{C23C}",
-        nfkd: "\u{1109}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C23D}",
-        nfc: "\u{C23D}",
-        nfd: "\u{1109}\u{116F}\u{11B0}",
-        nfkc: "\u{C23D}",
-        nfkd: "\u{1109}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C23E}",
-        nfc: "\u{C23E}",
-        nfd: "\u{1109}\u{116F}\u{11B1}",
-        nfkc: "\u{C23E}",
-        nfkd: "\u{1109}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C23F}",
-        nfc: "\u{C23F}",
-        nfd: "\u{1109}\u{116F}\u{11B2}",
-        nfkc: "\u{C23F}",
-        nfkd: "\u{1109}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C240}",
-        nfc: "\u{C240}",
-        nfd: "\u{1109}\u{116F}\u{11B3}",
-        nfkc: "\u{C240}",
-        nfkd: "\u{1109}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C241}",
-        nfc: "\u{C241}",
-        nfd: "\u{1109}\u{116F}\u{11B4}",
-        nfkc: "\u{C241}",
-        nfkd: "\u{1109}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C242}",
-        nfc: "\u{C242}",
-        nfd: "\u{1109}\u{116F}\u{11B5}",
-        nfkc: "\u{C242}",
-        nfkd: "\u{1109}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C243}",
-        nfc: "\u{C243}",
-        nfd: "\u{1109}\u{116F}\u{11B6}",
-        nfkc: "\u{C243}",
-        nfkd: "\u{1109}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C244}",
-        nfc: "\u{C244}",
-        nfd: "\u{1109}\u{116F}\u{11B7}",
-        nfkc: "\u{C244}",
-        nfkd: "\u{1109}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C245}",
-        nfc: "\u{C245}",
-        nfd: "\u{1109}\u{116F}\u{11B8}",
-        nfkc: "\u{C245}",
-        nfkd: "\u{1109}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C246}",
-        nfc: "\u{C246}",
-        nfd: "\u{1109}\u{116F}\u{11B9}",
-        nfkc: "\u{C246}",
-        nfkd: "\u{1109}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C247}",
-        nfc: "\u{C247}",
-        nfd: "\u{1109}\u{116F}\u{11BA}",
-        nfkc: "\u{C247}",
-        nfkd: "\u{1109}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C248}",
-        nfc: "\u{C248}",
-        nfd: "\u{1109}\u{116F}\u{11BB}",
-        nfkc: "\u{C248}",
-        nfkd: "\u{1109}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C249}",
-        nfc: "\u{C249}",
-        nfd: "\u{1109}\u{116F}\u{11BC}",
-        nfkc: "\u{C249}",
-        nfkd: "\u{1109}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C24A}",
-        nfc: "\u{C24A}",
-        nfd: "\u{1109}\u{116F}\u{11BD}",
-        nfkc: "\u{C24A}",
-        nfkd: "\u{1109}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C24B}",
-        nfc: "\u{C24B}",
-        nfd: "\u{1109}\u{116F}\u{11BE}",
-        nfkc: "\u{C24B}",
-        nfkd: "\u{1109}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C24C}",
-        nfc: "\u{C24C}",
-        nfd: "\u{1109}\u{116F}\u{11BF}",
-        nfkc: "\u{C24C}",
-        nfkd: "\u{1109}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C24D}",
-        nfc: "\u{C24D}",
-        nfd: "\u{1109}\u{116F}\u{11C0}",
-        nfkc: "\u{C24D}",
-        nfkd: "\u{1109}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C24E}",
-        nfc: "\u{C24E}",
-        nfd: "\u{1109}\u{116F}\u{11C1}",
-        nfkc: "\u{C24E}",
-        nfkd: "\u{1109}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C24F}",
-        nfc: "\u{C24F}",
-        nfd: "\u{1109}\u{116F}\u{11C2}",
-        nfkc: "\u{C24F}",
-        nfkd: "\u{1109}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C250}",
-        nfc: "\u{C250}",
-        nfd: "\u{1109}\u{1170}",
-        nfkc: "\u{C250}",
-        nfkd: "\u{1109}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{C251}",
-        nfc: "\u{C251}",
-        nfd: "\u{1109}\u{1170}\u{11A8}",
-        nfkc: "\u{C251}",
-        nfkd: "\u{1109}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C252}",
-        nfc: "\u{C252}",
-        nfd: "\u{1109}\u{1170}\u{11A9}",
-        nfkc: "\u{C252}",
-        nfkd: "\u{1109}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C253}",
-        nfc: "\u{C253}",
-        nfd: "\u{1109}\u{1170}\u{11AA}",
-        nfkc: "\u{C253}",
-        nfkd: "\u{1109}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C254}",
-        nfc: "\u{C254}",
-        nfd: "\u{1109}\u{1170}\u{11AB}",
-        nfkc: "\u{C254}",
-        nfkd: "\u{1109}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C255}",
-        nfc: "\u{C255}",
-        nfd: "\u{1109}\u{1170}\u{11AC}",
-        nfkc: "\u{C255}",
-        nfkd: "\u{1109}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C256}",
-        nfc: "\u{C256}",
-        nfd: "\u{1109}\u{1170}\u{11AD}",
-        nfkc: "\u{C256}",
-        nfkd: "\u{1109}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C257}",
-        nfc: "\u{C257}",
-        nfd: "\u{1109}\u{1170}\u{11AE}",
-        nfkc: "\u{C257}",
-        nfkd: "\u{1109}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C258}",
-        nfc: "\u{C258}",
-        nfd: "\u{1109}\u{1170}\u{11AF}",
-        nfkc: "\u{C258}",
-        nfkd: "\u{1109}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C259}",
-        nfc: "\u{C259}",
-        nfd: "\u{1109}\u{1170}\u{11B0}",
-        nfkc: "\u{C259}",
-        nfkd: "\u{1109}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C25A}",
-        nfc: "\u{C25A}",
-        nfd: "\u{1109}\u{1170}\u{11B1}",
-        nfkc: "\u{C25A}",
-        nfkd: "\u{1109}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C25B}",
-        nfc: "\u{C25B}",
-        nfd: "\u{1109}\u{1170}\u{11B2}",
-        nfkc: "\u{C25B}",
-        nfkd: "\u{1109}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C25C}",
-        nfc: "\u{C25C}",
-        nfd: "\u{1109}\u{1170}\u{11B3}",
-        nfkc: "\u{C25C}",
-        nfkd: "\u{1109}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C25D}",
-        nfc: "\u{C25D}",
-        nfd: "\u{1109}\u{1170}\u{11B4}",
-        nfkc: "\u{C25D}",
-        nfkd: "\u{1109}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C25E}",
-        nfc: "\u{C25E}",
-        nfd: "\u{1109}\u{1170}\u{11B5}",
-        nfkc: "\u{C25E}",
-        nfkd: "\u{1109}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C25F}",
-        nfc: "\u{C25F}",
-        nfd: "\u{1109}\u{1170}\u{11B6}",
-        nfkc: "\u{C25F}",
-        nfkd: "\u{1109}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C260}",
-        nfc: "\u{C260}",
-        nfd: "\u{1109}\u{1170}\u{11B7}",
-        nfkc: "\u{C260}",
-        nfkd: "\u{1109}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C261}",
-        nfc: "\u{C261}",
-        nfd: "\u{1109}\u{1170}\u{11B8}",
-        nfkc: "\u{C261}",
-        nfkd: "\u{1109}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C262}",
-        nfc: "\u{C262}",
-        nfd: "\u{1109}\u{1170}\u{11B9}",
-        nfkc: "\u{C262}",
-        nfkd: "\u{1109}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C263}",
-        nfc: "\u{C263}",
-        nfd: "\u{1109}\u{1170}\u{11BA}",
-        nfkc: "\u{C263}",
-        nfkd: "\u{1109}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C264}",
-        nfc: "\u{C264}",
-        nfd: "\u{1109}\u{1170}\u{11BB}",
-        nfkc: "\u{C264}",
-        nfkd: "\u{1109}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C265}",
-        nfc: "\u{C265}",
-        nfd: "\u{1109}\u{1170}\u{11BC}",
-        nfkc: "\u{C265}",
-        nfkd: "\u{1109}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C266}",
-        nfc: "\u{C266}",
-        nfd: "\u{1109}\u{1170}\u{11BD}",
-        nfkc: "\u{C266}",
-        nfkd: "\u{1109}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C267}",
-        nfc: "\u{C267}",
-        nfd: "\u{1109}\u{1170}\u{11BE}",
-        nfkc: "\u{C267}",
-        nfkd: "\u{1109}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C268}",
-        nfc: "\u{C268}",
-        nfd: "\u{1109}\u{1170}\u{11BF}",
-        nfkc: "\u{C268}",
-        nfkd: "\u{1109}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C269}",
-        nfc: "\u{C269}",
-        nfd: "\u{1109}\u{1170}\u{11C0}",
-        nfkc: "\u{C269}",
-        nfkd: "\u{1109}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C26A}",
-        nfc: "\u{C26A}",
-        nfd: "\u{1109}\u{1170}\u{11C1}",
-        nfkc: "\u{C26A}",
-        nfkd: "\u{1109}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C26B}",
-        nfc: "\u{C26B}",
-        nfd: "\u{1109}\u{1170}\u{11C2}",
-        nfkc: "\u{C26B}",
-        nfkd: "\u{1109}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C26C}",
-        nfc: "\u{C26C}",
-        nfd: "\u{1109}\u{1171}",
-        nfkc: "\u{C26C}",
-        nfkd: "\u{1109}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{C26D}",
-        nfc: "\u{C26D}",
-        nfd: "\u{1109}\u{1171}\u{11A8}",
-        nfkc: "\u{C26D}",
-        nfkd: "\u{1109}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C26E}",
-        nfc: "\u{C26E}",
-        nfd: "\u{1109}\u{1171}\u{11A9}",
-        nfkc: "\u{C26E}",
-        nfkd: "\u{1109}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C26F}",
-        nfc: "\u{C26F}",
-        nfd: "\u{1109}\u{1171}\u{11AA}",
-        nfkc: "\u{C26F}",
-        nfkd: "\u{1109}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C270}",
-        nfc: "\u{C270}",
-        nfd: "\u{1109}\u{1171}\u{11AB}",
-        nfkc: "\u{C270}",
-        nfkd: "\u{1109}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C271}",
-        nfc: "\u{C271}",
-        nfd: "\u{1109}\u{1171}\u{11AC}",
-        nfkc: "\u{C271}",
-        nfkd: "\u{1109}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C272}",
-        nfc: "\u{C272}",
-        nfd: "\u{1109}\u{1171}\u{11AD}",
-        nfkc: "\u{C272}",
-        nfkd: "\u{1109}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C273}",
-        nfc: "\u{C273}",
-        nfd: "\u{1109}\u{1171}\u{11AE}",
-        nfkc: "\u{C273}",
-        nfkd: "\u{1109}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C274}",
-        nfc: "\u{C274}",
-        nfd: "\u{1109}\u{1171}\u{11AF}",
-        nfkc: "\u{C274}",
-        nfkd: "\u{1109}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C275}",
-        nfc: "\u{C275}",
-        nfd: "\u{1109}\u{1171}\u{11B0}",
-        nfkc: "\u{C275}",
-        nfkd: "\u{1109}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C276}",
-        nfc: "\u{C276}",
-        nfd: "\u{1109}\u{1171}\u{11B1}",
-        nfkc: "\u{C276}",
-        nfkd: "\u{1109}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C277}",
-        nfc: "\u{C277}",
-        nfd: "\u{1109}\u{1171}\u{11B2}",
-        nfkc: "\u{C277}",
-        nfkd: "\u{1109}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C278}",
-        nfc: "\u{C278}",
-        nfd: "\u{1109}\u{1171}\u{11B3}",
-        nfkc: "\u{C278}",
-        nfkd: "\u{1109}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C279}",
-        nfc: "\u{C279}",
-        nfd: "\u{1109}\u{1171}\u{11B4}",
-        nfkc: "\u{C279}",
-        nfkd: "\u{1109}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C27A}",
-        nfc: "\u{C27A}",
-        nfd: "\u{1109}\u{1171}\u{11B5}",
-        nfkc: "\u{C27A}",
-        nfkd: "\u{1109}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C27B}",
-        nfc: "\u{C27B}",
-        nfd: "\u{1109}\u{1171}\u{11B6}",
-        nfkc: "\u{C27B}",
-        nfkd: "\u{1109}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C27C}",
-        nfc: "\u{C27C}",
-        nfd: "\u{1109}\u{1171}\u{11B7}",
-        nfkc: "\u{C27C}",
-        nfkd: "\u{1109}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C27D}",
-        nfc: "\u{C27D}",
-        nfd: "\u{1109}\u{1171}\u{11B8}",
-        nfkc: "\u{C27D}",
-        nfkd: "\u{1109}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C27E}",
-        nfc: "\u{C27E}",
-        nfd: "\u{1109}\u{1171}\u{11B9}",
-        nfkc: "\u{C27E}",
-        nfkd: "\u{1109}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C27F}",
-        nfc: "\u{C27F}",
-        nfd: "\u{1109}\u{1171}\u{11BA}",
-        nfkc: "\u{C27F}",
-        nfkd: "\u{1109}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C280}",
-        nfc: "\u{C280}",
-        nfd: "\u{1109}\u{1171}\u{11BB}",
-        nfkc: "\u{C280}",
-        nfkd: "\u{1109}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C281}",
-        nfc: "\u{C281}",
-        nfd: "\u{1109}\u{1171}\u{11BC}",
-        nfkc: "\u{C281}",
-        nfkd: "\u{1109}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C282}",
-        nfc: "\u{C282}",
-        nfd: "\u{1109}\u{1171}\u{11BD}",
-        nfkc: "\u{C282}",
-        nfkd: "\u{1109}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C283}",
-        nfc: "\u{C283}",
-        nfd: "\u{1109}\u{1171}\u{11BE}",
-        nfkc: "\u{C283}",
-        nfkd: "\u{1109}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C284}",
-        nfc: "\u{C284}",
-        nfd: "\u{1109}\u{1171}\u{11BF}",
-        nfkc: "\u{C284}",
-        nfkd: "\u{1109}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C285}",
-        nfc: "\u{C285}",
-        nfd: "\u{1109}\u{1171}\u{11C0}",
-        nfkc: "\u{C285}",
-        nfkd: "\u{1109}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C286}",
-        nfc: "\u{C286}",
-        nfd: "\u{1109}\u{1171}\u{11C1}",
-        nfkc: "\u{C286}",
-        nfkd: "\u{1109}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C287}",
-        nfc: "\u{C287}",
-        nfd: "\u{1109}\u{1171}\u{11C2}",
-        nfkc: "\u{C287}",
-        nfkd: "\u{1109}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C288}",
-        nfc: "\u{C288}",
-        nfd: "\u{1109}\u{1172}",
-        nfkc: "\u{C288}",
-        nfkd: "\u{1109}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{C289}",
-        nfc: "\u{C289}",
-        nfd: "\u{1109}\u{1172}\u{11A8}",
-        nfkc: "\u{C289}",
-        nfkd: "\u{1109}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C28A}",
-        nfc: "\u{C28A}",
-        nfd: "\u{1109}\u{1172}\u{11A9}",
-        nfkc: "\u{C28A}",
-        nfkd: "\u{1109}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C28B}",
-        nfc: "\u{C28B}",
-        nfd: "\u{1109}\u{1172}\u{11AA}",
-        nfkc: "\u{C28B}",
-        nfkd: "\u{1109}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C28C}",
-        nfc: "\u{C28C}",
-        nfd: "\u{1109}\u{1172}\u{11AB}",
-        nfkc: "\u{C28C}",
-        nfkd: "\u{1109}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C28D}",
-        nfc: "\u{C28D}",
-        nfd: "\u{1109}\u{1172}\u{11AC}",
-        nfkc: "\u{C28D}",
-        nfkd: "\u{1109}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C28E}",
-        nfc: "\u{C28E}",
-        nfd: "\u{1109}\u{1172}\u{11AD}",
-        nfkc: "\u{C28E}",
-        nfkd: "\u{1109}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C28F}",
-        nfc: "\u{C28F}",
-        nfd: "\u{1109}\u{1172}\u{11AE}",
-        nfkc: "\u{C28F}",
-        nfkd: "\u{1109}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C290}",
-        nfc: "\u{C290}",
-        nfd: "\u{1109}\u{1172}\u{11AF}",
-        nfkc: "\u{C290}",
-        nfkd: "\u{1109}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C291}",
-        nfc: "\u{C291}",
-        nfd: "\u{1109}\u{1172}\u{11B0}",
-        nfkc: "\u{C291}",
-        nfkd: "\u{1109}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C292}",
-        nfc: "\u{C292}",
-        nfd: "\u{1109}\u{1172}\u{11B1}",
-        nfkc: "\u{C292}",
-        nfkd: "\u{1109}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C293}",
-        nfc: "\u{C293}",
-        nfd: "\u{1109}\u{1172}\u{11B2}",
-        nfkc: "\u{C293}",
-        nfkd: "\u{1109}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C294}",
-        nfc: "\u{C294}",
-        nfd: "\u{1109}\u{1172}\u{11B3}",
-        nfkc: "\u{C294}",
-        nfkd: "\u{1109}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C295}",
-        nfc: "\u{C295}",
-        nfd: "\u{1109}\u{1172}\u{11B4}",
-        nfkc: "\u{C295}",
-        nfkd: "\u{1109}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C296}",
-        nfc: "\u{C296}",
-        nfd: "\u{1109}\u{1172}\u{11B5}",
-        nfkc: "\u{C296}",
-        nfkd: "\u{1109}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C297}",
-        nfc: "\u{C297}",
-        nfd: "\u{1109}\u{1172}\u{11B6}",
-        nfkc: "\u{C297}",
-        nfkd: "\u{1109}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C298}",
-        nfc: "\u{C298}",
-        nfd: "\u{1109}\u{1172}\u{11B7}",
-        nfkc: "\u{C298}",
-        nfkd: "\u{1109}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C299}",
-        nfc: "\u{C299}",
-        nfd: "\u{1109}\u{1172}\u{11B8}",
-        nfkc: "\u{C299}",
-        nfkd: "\u{1109}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C29A}",
-        nfc: "\u{C29A}",
-        nfd: "\u{1109}\u{1172}\u{11B9}",
-        nfkc: "\u{C29A}",
-        nfkd: "\u{1109}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C29B}",
-        nfc: "\u{C29B}",
-        nfd: "\u{1109}\u{1172}\u{11BA}",
-        nfkc: "\u{C29B}",
-        nfkd: "\u{1109}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C29C}",
-        nfc: "\u{C29C}",
-        nfd: "\u{1109}\u{1172}\u{11BB}",
-        nfkc: "\u{C29C}",
-        nfkd: "\u{1109}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C29D}",
-        nfc: "\u{C29D}",
-        nfd: "\u{1109}\u{1172}\u{11BC}",
-        nfkc: "\u{C29D}",
-        nfkd: "\u{1109}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C29E}",
-        nfc: "\u{C29E}",
-        nfd: "\u{1109}\u{1172}\u{11BD}",
-        nfkc: "\u{C29E}",
-        nfkd: "\u{1109}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C29F}",
-        nfc: "\u{C29F}",
-        nfd: "\u{1109}\u{1172}\u{11BE}",
-        nfkc: "\u{C29F}",
-        nfkd: "\u{1109}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C2A0}",
-        nfc: "\u{C2A0}",
-        nfd: "\u{1109}\u{1172}\u{11BF}",
-        nfkc: "\u{C2A0}",
-        nfkd: "\u{1109}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C2A1}",
-        nfc: "\u{C2A1}",
-        nfd: "\u{1109}\u{1172}\u{11C0}",
-        nfkc: "\u{C2A1}",
-        nfkd: "\u{1109}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C2A2}",
-        nfc: "\u{C2A2}",
-        nfd: "\u{1109}\u{1172}\u{11C1}",
-        nfkc: "\u{C2A2}",
-        nfkd: "\u{1109}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C2A3}",
-        nfc: "\u{C2A3}",
-        nfd: "\u{1109}\u{1172}\u{11C2}",
-        nfkc: "\u{C2A3}",
-        nfkd: "\u{1109}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C2A4}",
-        nfc: "\u{C2A4}",
-        nfd: "\u{1109}\u{1173}",
-        nfkc: "\u{C2A4}",
-        nfkd: "\u{1109}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{C2A5}",
-        nfc: "\u{C2A5}",
-        nfd: "\u{1109}\u{1173}\u{11A8}",
-        nfkc: "\u{C2A5}",
-        nfkd: "\u{1109}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C2A6}",
-        nfc: "\u{C2A6}",
-        nfd: "\u{1109}\u{1173}\u{11A9}",
-        nfkc: "\u{C2A6}",
-        nfkd: "\u{1109}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C2A7}",
-        nfc: "\u{C2A7}",
-        nfd: "\u{1109}\u{1173}\u{11AA}",
-        nfkc: "\u{C2A7}",
-        nfkd: "\u{1109}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C2A8}",
-        nfc: "\u{C2A8}",
-        nfd: "\u{1109}\u{1173}\u{11AB}",
-        nfkc: "\u{C2A8}",
-        nfkd: "\u{1109}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C2A9}",
-        nfc: "\u{C2A9}",
-        nfd: "\u{1109}\u{1173}\u{11AC}",
-        nfkc: "\u{C2A9}",
-        nfkd: "\u{1109}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C2AA}",
-        nfc: "\u{C2AA}",
-        nfd: "\u{1109}\u{1173}\u{11AD}",
-        nfkc: "\u{C2AA}",
-        nfkd: "\u{1109}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C2AB}",
-        nfc: "\u{C2AB}",
-        nfd: "\u{1109}\u{1173}\u{11AE}",
-        nfkc: "\u{C2AB}",
-        nfkd: "\u{1109}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C2AC}",
-        nfc: "\u{C2AC}",
-        nfd: "\u{1109}\u{1173}\u{11AF}",
-        nfkc: "\u{C2AC}",
-        nfkd: "\u{1109}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C2AD}",
-        nfc: "\u{C2AD}",
-        nfd: "\u{1109}\u{1173}\u{11B0}",
-        nfkc: "\u{C2AD}",
-        nfkd: "\u{1109}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C2AE}",
-        nfc: "\u{C2AE}",
-        nfd: "\u{1109}\u{1173}\u{11B1}",
-        nfkc: "\u{C2AE}",
-        nfkd: "\u{1109}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C2AF}",
-        nfc: "\u{C2AF}",
-        nfd: "\u{1109}\u{1173}\u{11B2}",
-        nfkc: "\u{C2AF}",
-        nfkd: "\u{1109}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C2B0}",
-        nfc: "\u{C2B0}",
-        nfd: "\u{1109}\u{1173}\u{11B3}",
-        nfkc: "\u{C2B0}",
-        nfkd: "\u{1109}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C2B1}",
-        nfc: "\u{C2B1}",
-        nfd: "\u{1109}\u{1173}\u{11B4}",
-        nfkc: "\u{C2B1}",
-        nfkd: "\u{1109}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C2B2}",
-        nfc: "\u{C2B2}",
-        nfd: "\u{1109}\u{1173}\u{11B5}",
-        nfkc: "\u{C2B2}",
-        nfkd: "\u{1109}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C2B3}",
-        nfc: "\u{C2B3}",
-        nfd: "\u{1109}\u{1173}\u{11B6}",
-        nfkc: "\u{C2B3}",
-        nfkd: "\u{1109}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C2B4}",
-        nfc: "\u{C2B4}",
-        nfd: "\u{1109}\u{1173}\u{11B7}",
-        nfkc: "\u{C2B4}",
-        nfkd: "\u{1109}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C2B5}",
-        nfc: "\u{C2B5}",
-        nfd: "\u{1109}\u{1173}\u{11B8}",
-        nfkc: "\u{C2B5}",
-        nfkd: "\u{1109}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C2B6}",
-        nfc: "\u{C2B6}",
-        nfd: "\u{1109}\u{1173}\u{11B9}",
-        nfkc: "\u{C2B6}",
-        nfkd: "\u{1109}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C2B7}",
-        nfc: "\u{C2B7}",
-        nfd: "\u{1109}\u{1173}\u{11BA}",
-        nfkc: "\u{C2B7}",
-        nfkd: "\u{1109}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C2B8}",
-        nfc: "\u{C2B8}",
-        nfd: "\u{1109}\u{1173}\u{11BB}",
-        nfkc: "\u{C2B8}",
-        nfkd: "\u{1109}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C2B9}",
-        nfc: "\u{C2B9}",
-        nfd: "\u{1109}\u{1173}\u{11BC}",
-        nfkc: "\u{C2B9}",
-        nfkd: "\u{1109}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C2BA}",
-        nfc: "\u{C2BA}",
-        nfd: "\u{1109}\u{1173}\u{11BD}",
-        nfkc: "\u{C2BA}",
-        nfkd: "\u{1109}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C2BB}",
-        nfc: "\u{C2BB}",
-        nfd: "\u{1109}\u{1173}\u{11BE}",
-        nfkc: "\u{C2BB}",
-        nfkd: "\u{1109}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C2BC}",
-        nfc: "\u{C2BC}",
-        nfd: "\u{1109}\u{1173}\u{11BF}",
-        nfkc: "\u{C2BC}",
-        nfkd: "\u{1109}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C2BD}",
-        nfc: "\u{C2BD}",
-        nfd: "\u{1109}\u{1173}\u{11C0}",
-        nfkc: "\u{C2BD}",
-        nfkd: "\u{1109}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C2BE}",
-        nfc: "\u{C2BE}",
-        nfd: "\u{1109}\u{1173}\u{11C1}",
-        nfkc: "\u{C2BE}",
-        nfkd: "\u{1109}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C2BF}",
-        nfc: "\u{C2BF}",
-        nfd: "\u{1109}\u{1173}\u{11C2}",
-        nfkc: "\u{C2BF}",
-        nfkd: "\u{1109}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C2C0}",
-        nfc: "\u{C2C0}",
-        nfd: "\u{1109}\u{1174}",
-        nfkc: "\u{C2C0}",
-        nfkd: "\u{1109}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{C2C1}",
-        nfc: "\u{C2C1}",
-        nfd: "\u{1109}\u{1174}\u{11A8}",
-        nfkc: "\u{C2C1}",
-        nfkd: "\u{1109}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C2C2}",
-        nfc: "\u{C2C2}",
-        nfd: "\u{1109}\u{1174}\u{11A9}",
-        nfkc: "\u{C2C2}",
-        nfkd: "\u{1109}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C2C3}",
-        nfc: "\u{C2C3}",
-        nfd: "\u{1109}\u{1174}\u{11AA}",
-        nfkc: "\u{C2C3}",
-        nfkd: "\u{1109}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C2C4}",
-        nfc: "\u{C2C4}",
-        nfd: "\u{1109}\u{1174}\u{11AB}",
-        nfkc: "\u{C2C4}",
-        nfkd: "\u{1109}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C2C5}",
-        nfc: "\u{C2C5}",
-        nfd: "\u{1109}\u{1174}\u{11AC}",
-        nfkc: "\u{C2C5}",
-        nfkd: "\u{1109}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C2C6}",
-        nfc: "\u{C2C6}",
-        nfd: "\u{1109}\u{1174}\u{11AD}",
-        nfkc: "\u{C2C6}",
-        nfkd: "\u{1109}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C2C7}",
-        nfc: "\u{C2C7}",
-        nfd: "\u{1109}\u{1174}\u{11AE}",
-        nfkc: "\u{C2C7}",
-        nfkd: "\u{1109}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C2C8}",
-        nfc: "\u{C2C8}",
-        nfd: "\u{1109}\u{1174}\u{11AF}",
-        nfkc: "\u{C2C8}",
-        nfkd: "\u{1109}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C2C9}",
-        nfc: "\u{C2C9}",
-        nfd: "\u{1109}\u{1174}\u{11B0}",
-        nfkc: "\u{C2C9}",
-        nfkd: "\u{1109}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C2CA}",
-        nfc: "\u{C2CA}",
-        nfd: "\u{1109}\u{1174}\u{11B1}",
-        nfkc: "\u{C2CA}",
-        nfkd: "\u{1109}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C2CB}",
-        nfc: "\u{C2CB}",
-        nfd: "\u{1109}\u{1174}\u{11B2}",
-        nfkc: "\u{C2CB}",
-        nfkd: "\u{1109}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C2CC}",
-        nfc: "\u{C2CC}",
-        nfd: "\u{1109}\u{1174}\u{11B3}",
-        nfkc: "\u{C2CC}",
-        nfkd: "\u{1109}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C2CD}",
-        nfc: "\u{C2CD}",
-        nfd: "\u{1109}\u{1174}\u{11B4}",
-        nfkc: "\u{C2CD}",
-        nfkd: "\u{1109}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C2CE}",
-        nfc: "\u{C2CE}",
-        nfd: "\u{1109}\u{1174}\u{11B5}",
-        nfkc: "\u{C2CE}",
-        nfkd: "\u{1109}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C2CF}",
-        nfc: "\u{C2CF}",
-        nfd: "\u{1109}\u{1174}\u{11B6}",
-        nfkc: "\u{C2CF}",
-        nfkd: "\u{1109}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C2D0}",
-        nfc: "\u{C2D0}",
-        nfd: "\u{1109}\u{1174}\u{11B7}",
-        nfkc: "\u{C2D0}",
-        nfkd: "\u{1109}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C2D1}",
-        nfc: "\u{C2D1}",
-        nfd: "\u{1109}\u{1174}\u{11B8}",
-        nfkc: "\u{C2D1}",
-        nfkd: "\u{1109}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C2D2}",
-        nfc: "\u{C2D2}",
-        nfd: "\u{1109}\u{1174}\u{11B9}",
-        nfkc: "\u{C2D2}",
-        nfkd: "\u{1109}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C2D3}",
-        nfc: "\u{C2D3}",
-        nfd: "\u{1109}\u{1174}\u{11BA}",
-        nfkc: "\u{C2D3}",
-        nfkd: "\u{1109}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C2D4}",
-        nfc: "\u{C2D4}",
-        nfd: "\u{1109}\u{1174}\u{11BB}",
-        nfkc: "\u{C2D4}",
-        nfkd: "\u{1109}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C2D5}",
-        nfc: "\u{C2D5}",
-        nfd: "\u{1109}\u{1174}\u{11BC}",
-        nfkc: "\u{C2D5}",
-        nfkd: "\u{1109}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C2D6}",
-        nfc: "\u{C2D6}",
-        nfd: "\u{1109}\u{1174}\u{11BD}",
-        nfkc: "\u{C2D6}",
-        nfkd: "\u{1109}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C2D7}",
-        nfc: "\u{C2D7}",
-        nfd: "\u{1109}\u{1174}\u{11BE}",
-        nfkc: "\u{C2D7}",
-        nfkd: "\u{1109}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C2D8}",
-        nfc: "\u{C2D8}",
-        nfd: "\u{1109}\u{1174}\u{11BF}",
-        nfkc: "\u{C2D8}",
-        nfkd: "\u{1109}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C2D9}",
-        nfc: "\u{C2D9}",
-        nfd: "\u{1109}\u{1174}\u{11C0}",
-        nfkc: "\u{C2D9}",
-        nfkd: "\u{1109}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C2DA}",
-        nfc: "\u{C2DA}",
-        nfd: "\u{1109}\u{1174}\u{11C1}",
-        nfkc: "\u{C2DA}",
-        nfkd: "\u{1109}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C2DB}",
-        nfc: "\u{C2DB}",
-        nfd: "\u{1109}\u{1174}\u{11C2}",
-        nfkc: "\u{C2DB}",
-        nfkd: "\u{1109}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C2DC}",
-        nfc: "\u{C2DC}",
-        nfd: "\u{1109}\u{1175}",
-        nfkc: "\u{C2DC}",
-        nfkd: "\u{1109}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{C2DD}",
-        nfc: "\u{C2DD}",
-        nfd: "\u{1109}\u{1175}\u{11A8}",
-        nfkc: "\u{C2DD}",
-        nfkd: "\u{1109}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C2DE}",
-        nfc: "\u{C2DE}",
-        nfd: "\u{1109}\u{1175}\u{11A9}",
-        nfkc: "\u{C2DE}",
-        nfkd: "\u{1109}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C2DF}",
-        nfc: "\u{C2DF}",
-        nfd: "\u{1109}\u{1175}\u{11AA}",
-        nfkc: "\u{C2DF}",
-        nfkd: "\u{1109}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C2E0}",
-        nfc: "\u{C2E0}",
-        nfd: "\u{1109}\u{1175}\u{11AB}",
-        nfkc: "\u{C2E0}",
-        nfkd: "\u{1109}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C2E1}",
-        nfc: "\u{C2E1}",
-        nfd: "\u{1109}\u{1175}\u{11AC}",
-        nfkc: "\u{C2E1}",
-        nfkd: "\u{1109}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C2E2}",
-        nfc: "\u{C2E2}",
-        nfd: "\u{1109}\u{1175}\u{11AD}",
-        nfkc: "\u{C2E2}",
-        nfkd: "\u{1109}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C2E3}",
-        nfc: "\u{C2E3}",
-        nfd: "\u{1109}\u{1175}\u{11AE}",
-        nfkc: "\u{C2E3}",
-        nfkd: "\u{1109}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C2E4}",
-        nfc: "\u{C2E4}",
-        nfd: "\u{1109}\u{1175}\u{11AF}",
-        nfkc: "\u{C2E4}",
-        nfkd: "\u{1109}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C2E5}",
-        nfc: "\u{C2E5}",
-        nfd: "\u{1109}\u{1175}\u{11B0}",
-        nfkc: "\u{C2E5}",
-        nfkd: "\u{1109}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C2E6}",
-        nfc: "\u{C2E6}",
-        nfd: "\u{1109}\u{1175}\u{11B1}",
-        nfkc: "\u{C2E6}",
-        nfkd: "\u{1109}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C2E7}",
-        nfc: "\u{C2E7}",
-        nfd: "\u{1109}\u{1175}\u{11B2}",
-        nfkc: "\u{C2E7}",
-        nfkd: "\u{1109}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C2E8}",
-        nfc: "\u{C2E8}",
-        nfd: "\u{1109}\u{1175}\u{11B3}",
-        nfkc: "\u{C2E8}",
-        nfkd: "\u{1109}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C2E9}",
-        nfc: "\u{C2E9}",
-        nfd: "\u{1109}\u{1175}\u{11B4}",
-        nfkc: "\u{C2E9}",
-        nfkd: "\u{1109}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C2EA}",
-        nfc: "\u{C2EA}",
-        nfd: "\u{1109}\u{1175}\u{11B5}",
-        nfkc: "\u{C2EA}",
-        nfkd: "\u{1109}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C2EB}",
-        nfc: "\u{C2EB}",
-        nfd: "\u{1109}\u{1175}\u{11B6}",
-        nfkc: "\u{C2EB}",
-        nfkd: "\u{1109}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C2EC}",
-        nfc: "\u{C2EC}",
-        nfd: "\u{1109}\u{1175}\u{11B7}",
-        nfkc: "\u{C2EC}",
-        nfkd: "\u{1109}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C2ED}",
-        nfc: "\u{C2ED}",
-        nfd: "\u{1109}\u{1175}\u{11B8}",
-        nfkc: "\u{C2ED}",
-        nfkd: "\u{1109}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C2EE}",
-        nfc: "\u{C2EE}",
-        nfd: "\u{1109}\u{1175}\u{11B9}",
-        nfkc: "\u{C2EE}",
-        nfkd: "\u{1109}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C2EF}",
-        nfc: "\u{C2EF}",
-        nfd: "\u{1109}\u{1175}\u{11BA}",
-        nfkc: "\u{C2EF}",
-        nfkd: "\u{1109}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C2F0}",
-        nfc: "\u{C2F0}",
-        nfd: "\u{1109}\u{1175}\u{11BB}",
-        nfkc: "\u{C2F0}",
-        nfkd: "\u{1109}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C2F1}",
-        nfc: "\u{C2F1}",
-        nfd: "\u{1109}\u{1175}\u{11BC}",
-        nfkc: "\u{C2F1}",
-        nfkd: "\u{1109}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C2F2}",
-        nfc: "\u{C2F2}",
-        nfd: "\u{1109}\u{1175}\u{11BD}",
-        nfkc: "\u{C2F2}",
-        nfkd: "\u{1109}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C2F3}",
-        nfc: "\u{C2F3}",
-        nfd: "\u{1109}\u{1175}\u{11BE}",
-        nfkc: "\u{C2F3}",
-        nfkd: "\u{1109}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C2F4}",
-        nfc: "\u{C2F4}",
-        nfd: "\u{1109}\u{1175}\u{11BF}",
-        nfkc: "\u{C2F4}",
-        nfkd: "\u{1109}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C2F5}",
-        nfc: "\u{C2F5}",
-        nfd: "\u{1109}\u{1175}\u{11C0}",
-        nfkc: "\u{C2F5}",
-        nfkd: "\u{1109}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C2F6}",
-        nfc: "\u{C2F6}",
-        nfd: "\u{1109}\u{1175}\u{11C1}",
-        nfkc: "\u{C2F6}",
-        nfkd: "\u{1109}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C2F7}",
-        nfc: "\u{C2F7}",
-        nfd: "\u{1109}\u{1175}\u{11C2}",
-        nfkc: "\u{C2F7}",
-        nfkd: "\u{1109}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C2F8}",
-        nfc: "\u{C2F8}",
-        nfd: "\u{110A}\u{1161}",
-        nfkc: "\u{C2F8}",
-        nfkd: "\u{110A}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{C2F9}",
-        nfc: "\u{C2F9}",
-        nfd: "\u{110A}\u{1161}\u{11A8}",
-        nfkc: "\u{C2F9}",
-        nfkd: "\u{110A}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C2FA}",
-        nfc: "\u{C2FA}",
-        nfd: "\u{110A}\u{1161}\u{11A9}",
-        nfkc: "\u{C2FA}",
-        nfkd: "\u{110A}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C2FB}",
-        nfc: "\u{C2FB}",
-        nfd: "\u{110A}\u{1161}\u{11AA}",
-        nfkc: "\u{C2FB}",
-        nfkd: "\u{110A}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C2FC}",
-        nfc: "\u{C2FC}",
-        nfd: "\u{110A}\u{1161}\u{11AB}",
-        nfkc: "\u{C2FC}",
-        nfkd: "\u{110A}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C2FD}",
-        nfc: "\u{C2FD}",
-        nfd: "\u{110A}\u{1161}\u{11AC}",
-        nfkc: "\u{C2FD}",
-        nfkd: "\u{110A}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C2FE}",
-        nfc: "\u{C2FE}",
-        nfd: "\u{110A}\u{1161}\u{11AD}",
-        nfkc: "\u{C2FE}",
-        nfkd: "\u{110A}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C2FF}",
-        nfc: "\u{C2FF}",
-        nfd: "\u{110A}\u{1161}\u{11AE}",
-        nfkc: "\u{C2FF}",
-        nfkd: "\u{110A}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C300}",
-        nfc: "\u{C300}",
-        nfd: "\u{110A}\u{1161}\u{11AF}",
-        nfkc: "\u{C300}",
-        nfkd: "\u{110A}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C301}",
-        nfc: "\u{C301}",
-        nfd: "\u{110A}\u{1161}\u{11B0}",
-        nfkc: "\u{C301}",
-        nfkd: "\u{110A}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C302}",
-        nfc: "\u{C302}",
-        nfd: "\u{110A}\u{1161}\u{11B1}",
-        nfkc: "\u{C302}",
-        nfkd: "\u{110A}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C303}",
-        nfc: "\u{C303}",
-        nfd: "\u{110A}\u{1161}\u{11B2}",
-        nfkc: "\u{C303}",
-        nfkd: "\u{110A}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C304}",
-        nfc: "\u{C304}",
-        nfd: "\u{110A}\u{1161}\u{11B3}",
-        nfkc: "\u{C304}",
-        nfkd: "\u{110A}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C305}",
-        nfc: "\u{C305}",
-        nfd: "\u{110A}\u{1161}\u{11B4}",
-        nfkc: "\u{C305}",
-        nfkd: "\u{110A}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C306}",
-        nfc: "\u{C306}",
-        nfd: "\u{110A}\u{1161}\u{11B5}",
-        nfkc: "\u{C306}",
-        nfkd: "\u{110A}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C307}",
-        nfc: "\u{C307}",
-        nfd: "\u{110A}\u{1161}\u{11B6}",
-        nfkc: "\u{C307}",
-        nfkd: "\u{110A}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C308}",
-        nfc: "\u{C308}",
-        nfd: "\u{110A}\u{1161}\u{11B7}",
-        nfkc: "\u{C308}",
-        nfkd: "\u{110A}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C309}",
-        nfc: "\u{C309}",
-        nfd: "\u{110A}\u{1161}\u{11B8}",
-        nfkc: "\u{C309}",
-        nfkd: "\u{110A}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C30A}",
-        nfc: "\u{C30A}",
-        nfd: "\u{110A}\u{1161}\u{11B9}",
-        nfkc: "\u{C30A}",
-        nfkd: "\u{110A}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C30B}",
-        nfc: "\u{C30B}",
-        nfd: "\u{110A}\u{1161}\u{11BA}",
-        nfkc: "\u{C30B}",
-        nfkd: "\u{110A}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C30C}",
-        nfc: "\u{C30C}",
-        nfd: "\u{110A}\u{1161}\u{11BB}",
-        nfkc: "\u{C30C}",
-        nfkd: "\u{110A}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C30D}",
-        nfc: "\u{C30D}",
-        nfd: "\u{110A}\u{1161}\u{11BC}",
-        nfkc: "\u{C30D}",
-        nfkd: "\u{110A}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C30E}",
-        nfc: "\u{C30E}",
-        nfd: "\u{110A}\u{1161}\u{11BD}",
-        nfkc: "\u{C30E}",
-        nfkd: "\u{110A}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C30F}",
-        nfc: "\u{C30F}",
-        nfd: "\u{110A}\u{1161}\u{11BE}",
-        nfkc: "\u{C30F}",
-        nfkd: "\u{110A}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C310}",
-        nfc: "\u{C310}",
-        nfd: "\u{110A}\u{1161}\u{11BF}",
-        nfkc: "\u{C310}",
-        nfkd: "\u{110A}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C311}",
-        nfc: "\u{C311}",
-        nfd: "\u{110A}\u{1161}\u{11C0}",
-        nfkc: "\u{C311}",
-        nfkd: "\u{110A}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C312}",
-        nfc: "\u{C312}",
-        nfd: "\u{110A}\u{1161}\u{11C1}",
-        nfkc: "\u{C312}",
-        nfkd: "\u{110A}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C313}",
-        nfc: "\u{C313}",
-        nfd: "\u{110A}\u{1161}\u{11C2}",
-        nfkc: "\u{C313}",
-        nfkd: "\u{110A}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C314}",
-        nfc: "\u{C314}",
-        nfd: "\u{110A}\u{1162}",
-        nfkc: "\u{C314}",
-        nfkd: "\u{110A}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{C315}",
-        nfc: "\u{C315}",
-        nfd: "\u{110A}\u{1162}\u{11A8}",
-        nfkc: "\u{C315}",
-        nfkd: "\u{110A}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C316}",
-        nfc: "\u{C316}",
-        nfd: "\u{110A}\u{1162}\u{11A9}",
-        nfkc: "\u{C316}",
-        nfkd: "\u{110A}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C317}",
-        nfc: "\u{C317}",
-        nfd: "\u{110A}\u{1162}\u{11AA}",
-        nfkc: "\u{C317}",
-        nfkd: "\u{110A}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C318}",
-        nfc: "\u{C318}",
-        nfd: "\u{110A}\u{1162}\u{11AB}",
-        nfkc: "\u{C318}",
-        nfkd: "\u{110A}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C319}",
-        nfc: "\u{C319}",
-        nfd: "\u{110A}\u{1162}\u{11AC}",
-        nfkc: "\u{C319}",
-        nfkd: "\u{110A}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C31A}",
-        nfc: "\u{C31A}",
-        nfd: "\u{110A}\u{1162}\u{11AD}",
-        nfkc: "\u{C31A}",
-        nfkd: "\u{110A}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C31B}",
-        nfc: "\u{C31B}",
-        nfd: "\u{110A}\u{1162}\u{11AE}",
-        nfkc: "\u{C31B}",
-        nfkd: "\u{110A}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C31C}",
-        nfc: "\u{C31C}",
-        nfd: "\u{110A}\u{1162}\u{11AF}",
-        nfkc: "\u{C31C}",
-        nfkd: "\u{110A}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C31D}",
-        nfc: "\u{C31D}",
-        nfd: "\u{110A}\u{1162}\u{11B0}",
-        nfkc: "\u{C31D}",
-        nfkd: "\u{110A}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C31E}",
-        nfc: "\u{C31E}",
-        nfd: "\u{110A}\u{1162}\u{11B1}",
-        nfkc: "\u{C31E}",
-        nfkd: "\u{110A}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C31F}",
-        nfc: "\u{C31F}",
-        nfd: "\u{110A}\u{1162}\u{11B2}",
-        nfkc: "\u{C31F}",
-        nfkd: "\u{110A}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C320}",
-        nfc: "\u{C320}",
-        nfd: "\u{110A}\u{1162}\u{11B3}",
-        nfkc: "\u{C320}",
-        nfkd: "\u{110A}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C321}",
-        nfc: "\u{C321}",
-        nfd: "\u{110A}\u{1162}\u{11B4}",
-        nfkc: "\u{C321}",
-        nfkd: "\u{110A}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C322}",
-        nfc: "\u{C322}",
-        nfd: "\u{110A}\u{1162}\u{11B5}",
-        nfkc: "\u{C322}",
-        nfkd: "\u{110A}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C323}",
-        nfc: "\u{C323}",
-        nfd: "\u{110A}\u{1162}\u{11B6}",
-        nfkc: "\u{C323}",
-        nfkd: "\u{110A}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C324}",
-        nfc: "\u{C324}",
-        nfd: "\u{110A}\u{1162}\u{11B7}",
-        nfkc: "\u{C324}",
-        nfkd: "\u{110A}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C325}",
-        nfc: "\u{C325}",
-        nfd: "\u{110A}\u{1162}\u{11B8}",
-        nfkc: "\u{C325}",
-        nfkd: "\u{110A}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C326}",
-        nfc: "\u{C326}",
-        nfd: "\u{110A}\u{1162}\u{11B9}",
-        nfkc: "\u{C326}",
-        nfkd: "\u{110A}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C327}",
-        nfc: "\u{C327}",
-        nfd: "\u{110A}\u{1162}\u{11BA}",
-        nfkc: "\u{C327}",
-        nfkd: "\u{110A}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C328}",
-        nfc: "\u{C328}",
-        nfd: "\u{110A}\u{1162}\u{11BB}",
-        nfkc: "\u{C328}",
-        nfkd: "\u{110A}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C329}",
-        nfc: "\u{C329}",
-        nfd: "\u{110A}\u{1162}\u{11BC}",
-        nfkc: "\u{C329}",
-        nfkd: "\u{110A}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C32A}",
-        nfc: "\u{C32A}",
-        nfd: "\u{110A}\u{1162}\u{11BD}",
-        nfkc: "\u{C32A}",
-        nfkd: "\u{110A}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C32B}",
-        nfc: "\u{C32B}",
-        nfd: "\u{110A}\u{1162}\u{11BE}",
-        nfkc: "\u{C32B}",
-        nfkd: "\u{110A}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C32C}",
-        nfc: "\u{C32C}",
-        nfd: "\u{110A}\u{1162}\u{11BF}",
-        nfkc: "\u{C32C}",
-        nfkd: "\u{110A}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C32D}",
-        nfc: "\u{C32D}",
-        nfd: "\u{110A}\u{1162}\u{11C0}",
-        nfkc: "\u{C32D}",
-        nfkd: "\u{110A}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C32E}",
-        nfc: "\u{C32E}",
-        nfd: "\u{110A}\u{1162}\u{11C1}",
-        nfkc: "\u{C32E}",
-        nfkd: "\u{110A}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C32F}",
-        nfc: "\u{C32F}",
-        nfd: "\u{110A}\u{1162}\u{11C2}",
-        nfkc: "\u{C32F}",
-        nfkd: "\u{110A}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C330}",
-        nfc: "\u{C330}",
-        nfd: "\u{110A}\u{1163}",
-        nfkc: "\u{C330}",
-        nfkd: "\u{110A}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{C331}",
-        nfc: "\u{C331}",
-        nfd: "\u{110A}\u{1163}\u{11A8}",
-        nfkc: "\u{C331}",
-        nfkd: "\u{110A}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C332}",
-        nfc: "\u{C332}",
-        nfd: "\u{110A}\u{1163}\u{11A9}",
-        nfkc: "\u{C332}",
-        nfkd: "\u{110A}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C333}",
-        nfc: "\u{C333}",
-        nfd: "\u{110A}\u{1163}\u{11AA}",
-        nfkc: "\u{C333}",
-        nfkd: "\u{110A}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C334}",
-        nfc: "\u{C334}",
-        nfd: "\u{110A}\u{1163}\u{11AB}",
-        nfkc: "\u{C334}",
-        nfkd: "\u{110A}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C335}",
-        nfc: "\u{C335}",
-        nfd: "\u{110A}\u{1163}\u{11AC}",
-        nfkc: "\u{C335}",
-        nfkd: "\u{110A}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C336}",
-        nfc: "\u{C336}",
-        nfd: "\u{110A}\u{1163}\u{11AD}",
-        nfkc: "\u{C336}",
-        nfkd: "\u{110A}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C337}",
-        nfc: "\u{C337}",
-        nfd: "\u{110A}\u{1163}\u{11AE}",
-        nfkc: "\u{C337}",
-        nfkd: "\u{110A}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C338}",
-        nfc: "\u{C338}",
-        nfd: "\u{110A}\u{1163}\u{11AF}",
-        nfkc: "\u{C338}",
-        nfkd: "\u{110A}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C339}",
-        nfc: "\u{C339}",
-        nfd: "\u{110A}\u{1163}\u{11B0}",
-        nfkc: "\u{C339}",
-        nfkd: "\u{110A}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C33A}",
-        nfc: "\u{C33A}",
-        nfd: "\u{110A}\u{1163}\u{11B1}",
-        nfkc: "\u{C33A}",
-        nfkd: "\u{110A}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C33B}",
-        nfc: "\u{C33B}",
-        nfd: "\u{110A}\u{1163}\u{11B2}",
-        nfkc: "\u{C33B}",
-        nfkd: "\u{110A}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C33C}",
-        nfc: "\u{C33C}",
-        nfd: "\u{110A}\u{1163}\u{11B3}",
-        nfkc: "\u{C33C}",
-        nfkd: "\u{110A}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C33D}",
-        nfc: "\u{C33D}",
-        nfd: "\u{110A}\u{1163}\u{11B4}",
-        nfkc: "\u{C33D}",
-        nfkd: "\u{110A}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C33E}",
-        nfc: "\u{C33E}",
-        nfd: "\u{110A}\u{1163}\u{11B5}",
-        nfkc: "\u{C33E}",
-        nfkd: "\u{110A}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C33F}",
-        nfc: "\u{C33F}",
-        nfd: "\u{110A}\u{1163}\u{11B6}",
-        nfkc: "\u{C33F}",
-        nfkd: "\u{110A}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C340}",
-        nfc: "\u{C340}",
-        nfd: "\u{110A}\u{1163}\u{11B7}",
-        nfkc: "\u{C340}",
-        nfkd: "\u{110A}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C341}",
-        nfc: "\u{C341}",
-        nfd: "\u{110A}\u{1163}\u{11B8}",
-        nfkc: "\u{C341}",
-        nfkd: "\u{110A}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C342}",
-        nfc: "\u{C342}",
-        nfd: "\u{110A}\u{1163}\u{11B9}",
-        nfkc: "\u{C342}",
-        nfkd: "\u{110A}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C343}",
-        nfc: "\u{C343}",
-        nfd: "\u{110A}\u{1163}\u{11BA}",
-        nfkc: "\u{C343}",
-        nfkd: "\u{110A}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C344}",
-        nfc: "\u{C344}",
-        nfd: "\u{110A}\u{1163}\u{11BB}",
-        nfkc: "\u{C344}",
-        nfkd: "\u{110A}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C345}",
-        nfc: "\u{C345}",
-        nfd: "\u{110A}\u{1163}\u{11BC}",
-        nfkc: "\u{C345}",
-        nfkd: "\u{110A}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C346}",
-        nfc: "\u{C346}",
-        nfd: "\u{110A}\u{1163}\u{11BD}",
-        nfkc: "\u{C346}",
-        nfkd: "\u{110A}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C347}",
-        nfc: "\u{C347}",
-        nfd: "\u{110A}\u{1163}\u{11BE}",
-        nfkc: "\u{C347}",
-        nfkd: "\u{110A}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C348}",
-        nfc: "\u{C348}",
-        nfd: "\u{110A}\u{1163}\u{11BF}",
-        nfkc: "\u{C348}",
-        nfkd: "\u{110A}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C349}",
-        nfc: "\u{C349}",
-        nfd: "\u{110A}\u{1163}\u{11C0}",
-        nfkc: "\u{C349}",
-        nfkd: "\u{110A}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C34A}",
-        nfc: "\u{C34A}",
-        nfd: "\u{110A}\u{1163}\u{11C1}",
-        nfkc: "\u{C34A}",
-        nfkd: "\u{110A}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C34B}",
-        nfc: "\u{C34B}",
-        nfd: "\u{110A}\u{1163}\u{11C2}",
-        nfkc: "\u{C34B}",
-        nfkd: "\u{110A}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C34C}",
-        nfc: "\u{C34C}",
-        nfd: "\u{110A}\u{1164}",
-        nfkc: "\u{C34C}",
-        nfkd: "\u{110A}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{C34D}",
-        nfc: "\u{C34D}",
-        nfd: "\u{110A}\u{1164}\u{11A8}",
-        nfkc: "\u{C34D}",
-        nfkd: "\u{110A}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C34E}",
-        nfc: "\u{C34E}",
-        nfd: "\u{110A}\u{1164}\u{11A9}",
-        nfkc: "\u{C34E}",
-        nfkd: "\u{110A}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C34F}",
-        nfc: "\u{C34F}",
-        nfd: "\u{110A}\u{1164}\u{11AA}",
-        nfkc: "\u{C34F}",
-        nfkd: "\u{110A}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C350}",
-        nfc: "\u{C350}",
-        nfd: "\u{110A}\u{1164}\u{11AB}",
-        nfkc: "\u{C350}",
-        nfkd: "\u{110A}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C351}",
-        nfc: "\u{C351}",
-        nfd: "\u{110A}\u{1164}\u{11AC}",
-        nfkc: "\u{C351}",
-        nfkd: "\u{110A}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C352}",
-        nfc: "\u{C352}",
-        nfd: "\u{110A}\u{1164}\u{11AD}",
-        nfkc: "\u{C352}",
-        nfkd: "\u{110A}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C353}",
-        nfc: "\u{C353}",
-        nfd: "\u{110A}\u{1164}\u{11AE}",
-        nfkc: "\u{C353}",
-        nfkd: "\u{110A}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C354}",
-        nfc: "\u{C354}",
-        nfd: "\u{110A}\u{1164}\u{11AF}",
-        nfkc: "\u{C354}",
-        nfkd: "\u{110A}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C355}",
-        nfc: "\u{C355}",
-        nfd: "\u{110A}\u{1164}\u{11B0}",
-        nfkc: "\u{C355}",
-        nfkd: "\u{110A}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C356}",
-        nfc: "\u{C356}",
-        nfd: "\u{110A}\u{1164}\u{11B1}",
-        nfkc: "\u{C356}",
-        nfkd: "\u{110A}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C357}",
-        nfc: "\u{C357}",
-        nfd: "\u{110A}\u{1164}\u{11B2}",
-        nfkc: "\u{C357}",
-        nfkd: "\u{110A}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C358}",
-        nfc: "\u{C358}",
-        nfd: "\u{110A}\u{1164}\u{11B3}",
-        nfkc: "\u{C358}",
-        nfkd: "\u{110A}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C359}",
-        nfc: "\u{C359}",
-        nfd: "\u{110A}\u{1164}\u{11B4}",
-        nfkc: "\u{C359}",
-        nfkd: "\u{110A}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C35A}",
-        nfc: "\u{C35A}",
-        nfd: "\u{110A}\u{1164}\u{11B5}",
-        nfkc: "\u{C35A}",
-        nfkd: "\u{110A}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C35B}",
-        nfc: "\u{C35B}",
-        nfd: "\u{110A}\u{1164}\u{11B6}",
-        nfkc: "\u{C35B}",
-        nfkd: "\u{110A}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C35C}",
-        nfc: "\u{C35C}",
-        nfd: "\u{110A}\u{1164}\u{11B7}",
-        nfkc: "\u{C35C}",
-        nfkd: "\u{110A}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C35D}",
-        nfc: "\u{C35D}",
-        nfd: "\u{110A}\u{1164}\u{11B8}",
-        nfkc: "\u{C35D}",
-        nfkd: "\u{110A}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C35E}",
-        nfc: "\u{C35E}",
-        nfd: "\u{110A}\u{1164}\u{11B9}",
-        nfkc: "\u{C35E}",
-        nfkd: "\u{110A}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C35F}",
-        nfc: "\u{C35F}",
-        nfd: "\u{110A}\u{1164}\u{11BA}",
-        nfkc: "\u{C35F}",
-        nfkd: "\u{110A}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C360}",
-        nfc: "\u{C360}",
-        nfd: "\u{110A}\u{1164}\u{11BB}",
-        nfkc: "\u{C360}",
-        nfkd: "\u{110A}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C361}",
-        nfc: "\u{C361}",
-        nfd: "\u{110A}\u{1164}\u{11BC}",
-        nfkc: "\u{C361}",
-        nfkd: "\u{110A}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C362}",
-        nfc: "\u{C362}",
-        nfd: "\u{110A}\u{1164}\u{11BD}",
-        nfkc: "\u{C362}",
-        nfkd: "\u{110A}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C363}",
-        nfc: "\u{C363}",
-        nfd: "\u{110A}\u{1164}\u{11BE}",
-        nfkc: "\u{C363}",
-        nfkd: "\u{110A}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C364}",
-        nfc: "\u{C364}",
-        nfd: "\u{110A}\u{1164}\u{11BF}",
-        nfkc: "\u{C364}",
-        nfkd: "\u{110A}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C365}",
-        nfc: "\u{C365}",
-        nfd: "\u{110A}\u{1164}\u{11C0}",
-        nfkc: "\u{C365}",
-        nfkd: "\u{110A}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C366}",
-        nfc: "\u{C366}",
-        nfd: "\u{110A}\u{1164}\u{11C1}",
-        nfkc: "\u{C366}",
-        nfkd: "\u{110A}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C367}",
-        nfc: "\u{C367}",
-        nfd: "\u{110A}\u{1164}\u{11C2}",
-        nfkc: "\u{C367}",
-        nfkd: "\u{110A}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C368}",
-        nfc: "\u{C368}",
-        nfd: "\u{110A}\u{1165}",
-        nfkc: "\u{C368}",
-        nfkd: "\u{110A}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{C369}",
-        nfc: "\u{C369}",
-        nfd: "\u{110A}\u{1165}\u{11A8}",
-        nfkc: "\u{C369}",
-        nfkd: "\u{110A}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C36A}",
-        nfc: "\u{C36A}",
-        nfd: "\u{110A}\u{1165}\u{11A9}",
-        nfkc: "\u{C36A}",
-        nfkd: "\u{110A}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C36B}",
-        nfc: "\u{C36B}",
-        nfd: "\u{110A}\u{1165}\u{11AA}",
-        nfkc: "\u{C36B}",
-        nfkd: "\u{110A}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C36C}",
-        nfc: "\u{C36C}",
-        nfd: "\u{110A}\u{1165}\u{11AB}",
-        nfkc: "\u{C36C}",
-        nfkd: "\u{110A}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C36D}",
-        nfc: "\u{C36D}",
-        nfd: "\u{110A}\u{1165}\u{11AC}",
-        nfkc: "\u{C36D}",
-        nfkd: "\u{110A}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C36E}",
-        nfc: "\u{C36E}",
-        nfd: "\u{110A}\u{1165}\u{11AD}",
-        nfkc: "\u{C36E}",
-        nfkd: "\u{110A}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C36F}",
-        nfc: "\u{C36F}",
-        nfd: "\u{110A}\u{1165}\u{11AE}",
-        nfkc: "\u{C36F}",
-        nfkd: "\u{110A}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C370}",
-        nfc: "\u{C370}",
-        nfd: "\u{110A}\u{1165}\u{11AF}",
-        nfkc: "\u{C370}",
-        nfkd: "\u{110A}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C371}",
-        nfc: "\u{C371}",
-        nfd: "\u{110A}\u{1165}\u{11B0}",
-        nfkc: "\u{C371}",
-        nfkd: "\u{110A}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C372}",
-        nfc: "\u{C372}",
-        nfd: "\u{110A}\u{1165}\u{11B1}",
-        nfkc: "\u{C372}",
-        nfkd: "\u{110A}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C373}",
-        nfc: "\u{C373}",
-        nfd: "\u{110A}\u{1165}\u{11B2}",
-        nfkc: "\u{C373}",
-        nfkd: "\u{110A}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C374}",
-        nfc: "\u{C374}",
-        nfd: "\u{110A}\u{1165}\u{11B3}",
-        nfkc: "\u{C374}",
-        nfkd: "\u{110A}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C375}",
-        nfc: "\u{C375}",
-        nfd: "\u{110A}\u{1165}\u{11B4}",
-        nfkc: "\u{C375}",
-        nfkd: "\u{110A}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C376}",
-        nfc: "\u{C376}",
-        nfd: "\u{110A}\u{1165}\u{11B5}",
-        nfkc: "\u{C376}",
-        nfkd: "\u{110A}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C377}",
-        nfc: "\u{C377}",
-        nfd: "\u{110A}\u{1165}\u{11B6}",
-        nfkc: "\u{C377}",
-        nfkd: "\u{110A}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C378}",
-        nfc: "\u{C378}",
-        nfd: "\u{110A}\u{1165}\u{11B7}",
-        nfkc: "\u{C378}",
-        nfkd: "\u{110A}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C379}",
-        nfc: "\u{C379}",
-        nfd: "\u{110A}\u{1165}\u{11B8}",
-        nfkc: "\u{C379}",
-        nfkd: "\u{110A}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C37A}",
-        nfc: "\u{C37A}",
-        nfd: "\u{110A}\u{1165}\u{11B9}",
-        nfkc: "\u{C37A}",
-        nfkd: "\u{110A}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C37B}",
-        nfc: "\u{C37B}",
-        nfd: "\u{110A}\u{1165}\u{11BA}",
-        nfkc: "\u{C37B}",
-        nfkd: "\u{110A}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C37C}",
-        nfc: "\u{C37C}",
-        nfd: "\u{110A}\u{1165}\u{11BB}",
-        nfkc: "\u{C37C}",
-        nfkd: "\u{110A}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C37D}",
-        nfc: "\u{C37D}",
-        nfd: "\u{110A}\u{1165}\u{11BC}",
-        nfkc: "\u{C37D}",
-        nfkd: "\u{110A}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C37E}",
-        nfc: "\u{C37E}",
-        nfd: "\u{110A}\u{1165}\u{11BD}",
-        nfkc: "\u{C37E}",
-        nfkd: "\u{110A}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C37F}",
-        nfc: "\u{C37F}",
-        nfd: "\u{110A}\u{1165}\u{11BE}",
-        nfkc: "\u{C37F}",
-        nfkd: "\u{110A}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C380}",
-        nfc: "\u{C380}",
-        nfd: "\u{110A}\u{1165}\u{11BF}",
-        nfkc: "\u{C380}",
-        nfkd: "\u{110A}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C381}",
-        nfc: "\u{C381}",
-        nfd: "\u{110A}\u{1165}\u{11C0}",
-        nfkc: "\u{C381}",
-        nfkd: "\u{110A}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C382}",
-        nfc: "\u{C382}",
-        nfd: "\u{110A}\u{1165}\u{11C1}",
-        nfkc: "\u{C382}",
-        nfkd: "\u{110A}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C383}",
-        nfc: "\u{C383}",
-        nfd: "\u{110A}\u{1165}\u{11C2}",
-        nfkc: "\u{C383}",
-        nfkd: "\u{110A}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C384}",
-        nfc: "\u{C384}",
-        nfd: "\u{110A}\u{1166}",
-        nfkc: "\u{C384}",
-        nfkd: "\u{110A}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{C385}",
-        nfc: "\u{C385}",
-        nfd: "\u{110A}\u{1166}\u{11A8}",
-        nfkc: "\u{C385}",
-        nfkd: "\u{110A}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C386}",
-        nfc: "\u{C386}",
-        nfd: "\u{110A}\u{1166}\u{11A9}",
-        nfkc: "\u{C386}",
-        nfkd: "\u{110A}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C387}",
-        nfc: "\u{C387}",
-        nfd: "\u{110A}\u{1166}\u{11AA}",
-        nfkc: "\u{C387}",
-        nfkd: "\u{110A}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C388}",
-        nfc: "\u{C388}",
-        nfd: "\u{110A}\u{1166}\u{11AB}",
-        nfkc: "\u{C388}",
-        nfkd: "\u{110A}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C389}",
-        nfc: "\u{C389}",
-        nfd: "\u{110A}\u{1166}\u{11AC}",
-        nfkc: "\u{C389}",
-        nfkd: "\u{110A}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C38A}",
-        nfc: "\u{C38A}",
-        nfd: "\u{110A}\u{1166}\u{11AD}",
-        nfkc: "\u{C38A}",
-        nfkd: "\u{110A}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C38B}",
-        nfc: "\u{C38B}",
-        nfd: "\u{110A}\u{1166}\u{11AE}",
-        nfkc: "\u{C38B}",
-        nfkd: "\u{110A}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C38C}",
-        nfc: "\u{C38C}",
-        nfd: "\u{110A}\u{1166}\u{11AF}",
-        nfkc: "\u{C38C}",
-        nfkd: "\u{110A}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C38D}",
-        nfc: "\u{C38D}",
-        nfd: "\u{110A}\u{1166}\u{11B0}",
-        nfkc: "\u{C38D}",
-        nfkd: "\u{110A}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C38E}",
-        nfc: "\u{C38E}",
-        nfd: "\u{110A}\u{1166}\u{11B1}",
-        nfkc: "\u{C38E}",
-        nfkd: "\u{110A}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C38F}",
-        nfc: "\u{C38F}",
-        nfd: "\u{110A}\u{1166}\u{11B2}",
-        nfkc: "\u{C38F}",
-        nfkd: "\u{110A}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C390}",
-        nfc: "\u{C390}",
-        nfd: "\u{110A}\u{1166}\u{11B3}",
-        nfkc: "\u{C390}",
-        nfkd: "\u{110A}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C391}",
-        nfc: "\u{C391}",
-        nfd: "\u{110A}\u{1166}\u{11B4}",
-        nfkc: "\u{C391}",
-        nfkd: "\u{110A}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C392}",
-        nfc: "\u{C392}",
-        nfd: "\u{110A}\u{1166}\u{11B5}",
-        nfkc: "\u{C392}",
-        nfkd: "\u{110A}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C393}",
-        nfc: "\u{C393}",
-        nfd: "\u{110A}\u{1166}\u{11B6}",
-        nfkc: "\u{C393}",
-        nfkd: "\u{110A}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C394}",
-        nfc: "\u{C394}",
-        nfd: "\u{110A}\u{1166}\u{11B7}",
-        nfkc: "\u{C394}",
-        nfkd: "\u{110A}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C395}",
-        nfc: "\u{C395}",
-        nfd: "\u{110A}\u{1166}\u{11B8}",
-        nfkc: "\u{C395}",
-        nfkd: "\u{110A}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C396}",
-        nfc: "\u{C396}",
-        nfd: "\u{110A}\u{1166}\u{11B9}",
-        nfkc: "\u{C396}",
-        nfkd: "\u{110A}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C397}",
-        nfc: "\u{C397}",
-        nfd: "\u{110A}\u{1166}\u{11BA}",
-        nfkc: "\u{C397}",
-        nfkd: "\u{110A}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C398}",
-        nfc: "\u{C398}",
-        nfd: "\u{110A}\u{1166}\u{11BB}",
-        nfkc: "\u{C398}",
-        nfkd: "\u{110A}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C399}",
-        nfc: "\u{C399}",
-        nfd: "\u{110A}\u{1166}\u{11BC}",
-        nfkc: "\u{C399}",
-        nfkd: "\u{110A}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C39A}",
-        nfc: "\u{C39A}",
-        nfd: "\u{110A}\u{1166}\u{11BD}",
-        nfkc: "\u{C39A}",
-        nfkd: "\u{110A}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C39B}",
-        nfc: "\u{C39B}",
-        nfd: "\u{110A}\u{1166}\u{11BE}",
-        nfkc: "\u{C39B}",
-        nfkd: "\u{110A}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C39C}",
-        nfc: "\u{C39C}",
-        nfd: "\u{110A}\u{1166}\u{11BF}",
-        nfkc: "\u{C39C}",
-        nfkd: "\u{110A}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C39D}",
-        nfc: "\u{C39D}",
-        nfd: "\u{110A}\u{1166}\u{11C0}",
-        nfkc: "\u{C39D}",
-        nfkd: "\u{110A}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C39E}",
-        nfc: "\u{C39E}",
-        nfd: "\u{110A}\u{1166}\u{11C1}",
-        nfkc: "\u{C39E}",
-        nfkd: "\u{110A}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C39F}",
-        nfc: "\u{C39F}",
-        nfd: "\u{110A}\u{1166}\u{11C2}",
-        nfkc: "\u{C39F}",
-        nfkd: "\u{110A}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C3A0}",
-        nfc: "\u{C3A0}",
-        nfd: "\u{110A}\u{1167}",
-        nfkc: "\u{C3A0}",
-        nfkd: "\u{110A}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{C3A1}",
-        nfc: "\u{C3A1}",
-        nfd: "\u{110A}\u{1167}\u{11A8}",
-        nfkc: "\u{C3A1}",
-        nfkd: "\u{110A}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C3A2}",
-        nfc: "\u{C3A2}",
-        nfd: "\u{110A}\u{1167}\u{11A9}",
-        nfkc: "\u{C3A2}",
-        nfkd: "\u{110A}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C3A3}",
-        nfc: "\u{C3A3}",
-        nfd: "\u{110A}\u{1167}\u{11AA}",
-        nfkc: "\u{C3A3}",
-        nfkd: "\u{110A}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C3A4}",
-        nfc: "\u{C3A4}",
-        nfd: "\u{110A}\u{1167}\u{11AB}",
-        nfkc: "\u{C3A4}",
-        nfkd: "\u{110A}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C3A5}",
-        nfc: "\u{C3A5}",
-        nfd: "\u{110A}\u{1167}\u{11AC}",
-        nfkc: "\u{C3A5}",
-        nfkd: "\u{110A}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C3A6}",
-        nfc: "\u{C3A6}",
-        nfd: "\u{110A}\u{1167}\u{11AD}",
-        nfkc: "\u{C3A6}",
-        nfkd: "\u{110A}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C3A7}",
-        nfc: "\u{C3A7}",
-        nfd: "\u{110A}\u{1167}\u{11AE}",
-        nfkc: "\u{C3A7}",
-        nfkd: "\u{110A}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C3A8}",
-        nfc: "\u{C3A8}",
-        nfd: "\u{110A}\u{1167}\u{11AF}",
-        nfkc: "\u{C3A8}",
-        nfkd: "\u{110A}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C3A9}",
-        nfc: "\u{C3A9}",
-        nfd: "\u{110A}\u{1167}\u{11B0}",
-        nfkc: "\u{C3A9}",
-        nfkd: "\u{110A}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C3AA}",
-        nfc: "\u{C3AA}",
-        nfd: "\u{110A}\u{1167}\u{11B1}",
-        nfkc: "\u{C3AA}",
-        nfkd: "\u{110A}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C3AB}",
-        nfc: "\u{C3AB}",
-        nfd: "\u{110A}\u{1167}\u{11B2}",
-        nfkc: "\u{C3AB}",
-        nfkd: "\u{110A}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C3AC}",
-        nfc: "\u{C3AC}",
-        nfd: "\u{110A}\u{1167}\u{11B3}",
-        nfkc: "\u{C3AC}",
-        nfkd: "\u{110A}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C3AD}",
-        nfc: "\u{C3AD}",
-        nfd: "\u{110A}\u{1167}\u{11B4}",
-        nfkc: "\u{C3AD}",
-        nfkd: "\u{110A}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C3AE}",
-        nfc: "\u{C3AE}",
-        nfd: "\u{110A}\u{1167}\u{11B5}",
-        nfkc: "\u{C3AE}",
-        nfkd: "\u{110A}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C3AF}",
-        nfc: "\u{C3AF}",
-        nfd: "\u{110A}\u{1167}\u{11B6}",
-        nfkc: "\u{C3AF}",
-        nfkd: "\u{110A}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C3B0}",
-        nfc: "\u{C3B0}",
-        nfd: "\u{110A}\u{1167}\u{11B7}",
-        nfkc: "\u{C3B0}",
-        nfkd: "\u{110A}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C3B1}",
-        nfc: "\u{C3B1}",
-        nfd: "\u{110A}\u{1167}\u{11B8}",
-        nfkc: "\u{C3B1}",
-        nfkd: "\u{110A}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C3B2}",
-        nfc: "\u{C3B2}",
-        nfd: "\u{110A}\u{1167}\u{11B9}",
-        nfkc: "\u{C3B2}",
-        nfkd: "\u{110A}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C3B3}",
-        nfc: "\u{C3B3}",
-        nfd: "\u{110A}\u{1167}\u{11BA}",
-        nfkc: "\u{C3B3}",
-        nfkd: "\u{110A}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C3B4}",
-        nfc: "\u{C3B4}",
-        nfd: "\u{110A}\u{1167}\u{11BB}",
-        nfkc: "\u{C3B4}",
-        nfkd: "\u{110A}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C3B5}",
-        nfc: "\u{C3B5}",
-        nfd: "\u{110A}\u{1167}\u{11BC}",
-        nfkc: "\u{C3B5}",
-        nfkd: "\u{110A}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C3B6}",
-        nfc: "\u{C3B6}",
-        nfd: "\u{110A}\u{1167}\u{11BD}",
-        nfkc: "\u{C3B6}",
-        nfkd: "\u{110A}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C3B7}",
-        nfc: "\u{C3B7}",
-        nfd: "\u{110A}\u{1167}\u{11BE}",
-        nfkc: "\u{C3B7}",
-        nfkd: "\u{110A}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C3B8}",
-        nfc: "\u{C3B8}",
-        nfd: "\u{110A}\u{1167}\u{11BF}",
-        nfkc: "\u{C3B8}",
-        nfkd: "\u{110A}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C3B9}",
-        nfc: "\u{C3B9}",
-        nfd: "\u{110A}\u{1167}\u{11C0}",
-        nfkc: "\u{C3B9}",
-        nfkd: "\u{110A}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C3BA}",
-        nfc: "\u{C3BA}",
-        nfd: "\u{110A}\u{1167}\u{11C1}",
-        nfkc: "\u{C3BA}",
-        nfkd: "\u{110A}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C3BB}",
-        nfc: "\u{C3BB}",
-        nfd: "\u{110A}\u{1167}\u{11C2}",
-        nfkc: "\u{C3BB}",
-        nfkd: "\u{110A}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C3BC}",
-        nfc: "\u{C3BC}",
-        nfd: "\u{110A}\u{1168}",
-        nfkc: "\u{C3BC}",
-        nfkd: "\u{110A}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{C3BD}",
-        nfc: "\u{C3BD}",
-        nfd: "\u{110A}\u{1168}\u{11A8}",
-        nfkc: "\u{C3BD}",
-        nfkd: "\u{110A}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C3BE}",
-        nfc: "\u{C3BE}",
-        nfd: "\u{110A}\u{1168}\u{11A9}",
-        nfkc: "\u{C3BE}",
-        nfkd: "\u{110A}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C3BF}",
-        nfc: "\u{C3BF}",
-        nfd: "\u{110A}\u{1168}\u{11AA}",
-        nfkc: "\u{C3BF}",
-        nfkd: "\u{110A}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C3C0}",
-        nfc: "\u{C3C0}",
-        nfd: "\u{110A}\u{1168}\u{11AB}",
-        nfkc: "\u{C3C0}",
-        nfkd: "\u{110A}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C3C1}",
-        nfc: "\u{C3C1}",
-        nfd: "\u{110A}\u{1168}\u{11AC}",
-        nfkc: "\u{C3C1}",
-        nfkd: "\u{110A}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C3C2}",
-        nfc: "\u{C3C2}",
-        nfd: "\u{110A}\u{1168}\u{11AD}",
-        nfkc: "\u{C3C2}",
-        nfkd: "\u{110A}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C3C3}",
-        nfc: "\u{C3C3}",
-        nfd: "\u{110A}\u{1168}\u{11AE}",
-        nfkc: "\u{C3C3}",
-        nfkd: "\u{110A}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C3C4}",
-        nfc: "\u{C3C4}",
-        nfd: "\u{110A}\u{1168}\u{11AF}",
-        nfkc: "\u{C3C4}",
-        nfkd: "\u{110A}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C3C5}",
-        nfc: "\u{C3C5}",
-        nfd: "\u{110A}\u{1168}\u{11B0}",
-        nfkc: "\u{C3C5}",
-        nfkd: "\u{110A}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C3C6}",
-        nfc: "\u{C3C6}",
-        nfd: "\u{110A}\u{1168}\u{11B1}",
-        nfkc: "\u{C3C6}",
-        nfkd: "\u{110A}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C3C7}",
-        nfc: "\u{C3C7}",
-        nfd: "\u{110A}\u{1168}\u{11B2}",
-        nfkc: "\u{C3C7}",
-        nfkd: "\u{110A}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C3C8}",
-        nfc: "\u{C3C8}",
-        nfd: "\u{110A}\u{1168}\u{11B3}",
-        nfkc: "\u{C3C8}",
-        nfkd: "\u{110A}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C3C9}",
-        nfc: "\u{C3C9}",
-        nfd: "\u{110A}\u{1168}\u{11B4}",
-        nfkc: "\u{C3C9}",
-        nfkd: "\u{110A}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C3CA}",
-        nfc: "\u{C3CA}",
-        nfd: "\u{110A}\u{1168}\u{11B5}",
-        nfkc: "\u{C3CA}",
-        nfkd: "\u{110A}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C3CB}",
-        nfc: "\u{C3CB}",
-        nfd: "\u{110A}\u{1168}\u{11B6}",
-        nfkc: "\u{C3CB}",
-        nfkd: "\u{110A}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C3CC}",
-        nfc: "\u{C3CC}",
-        nfd: "\u{110A}\u{1168}\u{11B7}",
-        nfkc: "\u{C3CC}",
-        nfkd: "\u{110A}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C3CD}",
-        nfc: "\u{C3CD}",
-        nfd: "\u{110A}\u{1168}\u{11B8}",
-        nfkc: "\u{C3CD}",
-        nfkd: "\u{110A}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C3CE}",
-        nfc: "\u{C3CE}",
-        nfd: "\u{110A}\u{1168}\u{11B9}",
-        nfkc: "\u{C3CE}",
-        nfkd: "\u{110A}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C3CF}",
-        nfc: "\u{C3CF}",
-        nfd: "\u{110A}\u{1168}\u{11BA}",
-        nfkc: "\u{C3CF}",
-        nfkd: "\u{110A}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C3D0}",
-        nfc: "\u{C3D0}",
-        nfd: "\u{110A}\u{1168}\u{11BB}",
-        nfkc: "\u{C3D0}",
-        nfkd: "\u{110A}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C3D1}",
-        nfc: "\u{C3D1}",
-        nfd: "\u{110A}\u{1168}\u{11BC}",
-        nfkc: "\u{C3D1}",
-        nfkd: "\u{110A}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C3D2}",
-        nfc: "\u{C3D2}",
-        nfd: "\u{110A}\u{1168}\u{11BD}",
-        nfkc: "\u{C3D2}",
-        nfkd: "\u{110A}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C3D3}",
-        nfc: "\u{C3D3}",
-        nfd: "\u{110A}\u{1168}\u{11BE}",
-        nfkc: "\u{C3D3}",
-        nfkd: "\u{110A}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C3D4}",
-        nfc: "\u{C3D4}",
-        nfd: "\u{110A}\u{1168}\u{11BF}",
-        nfkc: "\u{C3D4}",
-        nfkd: "\u{110A}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C3D5}",
-        nfc: "\u{C3D5}",
-        nfd: "\u{110A}\u{1168}\u{11C0}",
-        nfkc: "\u{C3D5}",
-        nfkd: "\u{110A}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C3D6}",
-        nfc: "\u{C3D6}",
-        nfd: "\u{110A}\u{1168}\u{11C1}",
-        nfkc: "\u{C3D6}",
-        nfkd: "\u{110A}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C3D7}",
-        nfc: "\u{C3D7}",
-        nfd: "\u{110A}\u{1168}\u{11C2}",
-        nfkc: "\u{C3D7}",
-        nfkd: "\u{110A}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C3D8}",
-        nfc: "\u{C3D8}",
-        nfd: "\u{110A}\u{1169}",
-        nfkc: "\u{C3D8}",
-        nfkd: "\u{110A}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{C3D9}",
-        nfc: "\u{C3D9}",
-        nfd: "\u{110A}\u{1169}\u{11A8}",
-        nfkc: "\u{C3D9}",
-        nfkd: "\u{110A}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C3DA}",
-        nfc: "\u{C3DA}",
-        nfd: "\u{110A}\u{1169}\u{11A9}",
-        nfkc: "\u{C3DA}",
-        nfkd: "\u{110A}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C3DB}",
-        nfc: "\u{C3DB}",
-        nfd: "\u{110A}\u{1169}\u{11AA}",
-        nfkc: "\u{C3DB}",
-        nfkd: "\u{110A}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C3DC}",
-        nfc: "\u{C3DC}",
-        nfd: "\u{110A}\u{1169}\u{11AB}",
-        nfkc: "\u{C3DC}",
-        nfkd: "\u{110A}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C3DD}",
-        nfc: "\u{C3DD}",
-        nfd: "\u{110A}\u{1169}\u{11AC}",
-        nfkc: "\u{C3DD}",
-        nfkd: "\u{110A}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C3DE}",
-        nfc: "\u{C3DE}",
-        nfd: "\u{110A}\u{1169}\u{11AD}",
-        nfkc: "\u{C3DE}",
-        nfkd: "\u{110A}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C3DF}",
-        nfc: "\u{C3DF}",
-        nfd: "\u{110A}\u{1169}\u{11AE}",
-        nfkc: "\u{C3DF}",
-        nfkd: "\u{110A}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C3E0}",
-        nfc: "\u{C3E0}",
-        nfd: "\u{110A}\u{1169}\u{11AF}",
-        nfkc: "\u{C3E0}",
-        nfkd: "\u{110A}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C3E1}",
-        nfc: "\u{C3E1}",
-        nfd: "\u{110A}\u{1169}\u{11B0}",
-        nfkc: "\u{C3E1}",
-        nfkd: "\u{110A}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C3E2}",
-        nfc: "\u{C3E2}",
-        nfd: "\u{110A}\u{1169}\u{11B1}",
-        nfkc: "\u{C3E2}",
-        nfkd: "\u{110A}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C3E3}",
-        nfc: "\u{C3E3}",
-        nfd: "\u{110A}\u{1169}\u{11B2}",
-        nfkc: "\u{C3E3}",
-        nfkd: "\u{110A}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C3E4}",
-        nfc: "\u{C3E4}",
-        nfd: "\u{110A}\u{1169}\u{11B3}",
-        nfkc: "\u{C3E4}",
-        nfkd: "\u{110A}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C3E5}",
-        nfc: "\u{C3E5}",
-        nfd: "\u{110A}\u{1169}\u{11B4}",
-        nfkc: "\u{C3E5}",
-        nfkd: "\u{110A}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C3E6}",
-        nfc: "\u{C3E6}",
-        nfd: "\u{110A}\u{1169}\u{11B5}",
-        nfkc: "\u{C3E6}",
-        nfkd: "\u{110A}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C3E7}",
-        nfc: "\u{C3E7}",
-        nfd: "\u{110A}\u{1169}\u{11B6}",
-        nfkc: "\u{C3E7}",
-        nfkd: "\u{110A}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C3E8}",
-        nfc: "\u{C3E8}",
-        nfd: "\u{110A}\u{1169}\u{11B7}",
-        nfkc: "\u{C3E8}",
-        nfkd: "\u{110A}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C3E9}",
-        nfc: "\u{C3E9}",
-        nfd: "\u{110A}\u{1169}\u{11B8}",
-        nfkc: "\u{C3E9}",
-        nfkd: "\u{110A}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C3EA}",
-        nfc: "\u{C3EA}",
-        nfd: "\u{110A}\u{1169}\u{11B9}",
-        nfkc: "\u{C3EA}",
-        nfkd: "\u{110A}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C3EB}",
-        nfc: "\u{C3EB}",
-        nfd: "\u{110A}\u{1169}\u{11BA}",
-        nfkc: "\u{C3EB}",
-        nfkd: "\u{110A}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C3EC}",
-        nfc: "\u{C3EC}",
-        nfd: "\u{110A}\u{1169}\u{11BB}",
-        nfkc: "\u{C3EC}",
-        nfkd: "\u{110A}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C3ED}",
-        nfc: "\u{C3ED}",
-        nfd: "\u{110A}\u{1169}\u{11BC}",
-        nfkc: "\u{C3ED}",
-        nfkd: "\u{110A}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C3EE}",
-        nfc: "\u{C3EE}",
-        nfd: "\u{110A}\u{1169}\u{11BD}",
-        nfkc: "\u{C3EE}",
-        nfkd: "\u{110A}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C3EF}",
-        nfc: "\u{C3EF}",
-        nfd: "\u{110A}\u{1169}\u{11BE}",
-        nfkc: "\u{C3EF}",
-        nfkd: "\u{110A}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C3F0}",
-        nfc: "\u{C3F0}",
-        nfd: "\u{110A}\u{1169}\u{11BF}",
-        nfkc: "\u{C3F0}",
-        nfkd: "\u{110A}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C3F1}",
-        nfc: "\u{C3F1}",
-        nfd: "\u{110A}\u{1169}\u{11C0}",
-        nfkc: "\u{C3F1}",
-        nfkd: "\u{110A}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C3F2}",
-        nfc: "\u{C3F2}",
-        nfd: "\u{110A}\u{1169}\u{11C1}",
-        nfkc: "\u{C3F2}",
-        nfkd: "\u{110A}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C3F3}",
-        nfc: "\u{C3F3}",
-        nfd: "\u{110A}\u{1169}\u{11C2}",
-        nfkc: "\u{C3F3}",
-        nfkd: "\u{110A}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C3F4}",
-        nfc: "\u{C3F4}",
-        nfd: "\u{110A}\u{116A}",
-        nfkc: "\u{C3F4}",
-        nfkd: "\u{110A}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{C3F5}",
-        nfc: "\u{C3F5}",
-        nfd: "\u{110A}\u{116A}\u{11A8}",
-        nfkc: "\u{C3F5}",
-        nfkd: "\u{110A}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C3F6}",
-        nfc: "\u{C3F6}",
-        nfd: "\u{110A}\u{116A}\u{11A9}",
-        nfkc: "\u{C3F6}",
-        nfkd: "\u{110A}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C3F7}",
-        nfc: "\u{C3F7}",
-        nfd: "\u{110A}\u{116A}\u{11AA}",
-        nfkc: "\u{C3F7}",
-        nfkd: "\u{110A}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C3F8}",
-        nfc: "\u{C3F8}",
-        nfd: "\u{110A}\u{116A}\u{11AB}",
-        nfkc: "\u{C3F8}",
-        nfkd: "\u{110A}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C3F9}",
-        nfc: "\u{C3F9}",
-        nfd: "\u{110A}\u{116A}\u{11AC}",
-        nfkc: "\u{C3F9}",
-        nfkd: "\u{110A}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C3FA}",
-        nfc: "\u{C3FA}",
-        nfd: "\u{110A}\u{116A}\u{11AD}",
-        nfkc: "\u{C3FA}",
-        nfkd: "\u{110A}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C3FB}",
-        nfc: "\u{C3FB}",
-        nfd: "\u{110A}\u{116A}\u{11AE}",
-        nfkc: "\u{C3FB}",
-        nfkd: "\u{110A}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C3FC}",
-        nfc: "\u{C3FC}",
-        nfd: "\u{110A}\u{116A}\u{11AF}",
-        nfkc: "\u{C3FC}",
-        nfkd: "\u{110A}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C3FD}",
-        nfc: "\u{C3FD}",
-        nfd: "\u{110A}\u{116A}\u{11B0}",
-        nfkc: "\u{C3FD}",
-        nfkd: "\u{110A}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C3FE}",
-        nfc: "\u{C3FE}",
-        nfd: "\u{110A}\u{116A}\u{11B1}",
-        nfkc: "\u{C3FE}",
-        nfkd: "\u{110A}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C3FF}",
-        nfc: "\u{C3FF}",
-        nfd: "\u{110A}\u{116A}\u{11B2}",
-        nfkc: "\u{C3FF}",
-        nfkd: "\u{110A}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C400}",
-        nfc: "\u{C400}",
-        nfd: "\u{110A}\u{116A}\u{11B3}",
-        nfkc: "\u{C400}",
-        nfkd: "\u{110A}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C401}",
-        nfc: "\u{C401}",
-        nfd: "\u{110A}\u{116A}\u{11B4}",
-        nfkc: "\u{C401}",
-        nfkd: "\u{110A}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C402}",
-        nfc: "\u{C402}",
-        nfd: "\u{110A}\u{116A}\u{11B5}",
-        nfkc: "\u{C402}",
-        nfkd: "\u{110A}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C403}",
-        nfc: "\u{C403}",
-        nfd: "\u{110A}\u{116A}\u{11B6}",
-        nfkc: "\u{C403}",
-        nfkd: "\u{110A}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C404}",
-        nfc: "\u{C404}",
-        nfd: "\u{110A}\u{116A}\u{11B7}",
-        nfkc: "\u{C404}",
-        nfkd: "\u{110A}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C405}",
-        nfc: "\u{C405}",
-        nfd: "\u{110A}\u{116A}\u{11B8}",
-        nfkc: "\u{C405}",
-        nfkd: "\u{110A}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C406}",
-        nfc: "\u{C406}",
-        nfd: "\u{110A}\u{116A}\u{11B9}",
-        nfkc: "\u{C406}",
-        nfkd: "\u{110A}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C407}",
-        nfc: "\u{C407}",
-        nfd: "\u{110A}\u{116A}\u{11BA}",
-        nfkc: "\u{C407}",
-        nfkd: "\u{110A}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C408}",
-        nfc: "\u{C408}",
-        nfd: "\u{110A}\u{116A}\u{11BB}",
-        nfkc: "\u{C408}",
-        nfkd: "\u{110A}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C409}",
-        nfc: "\u{C409}",
-        nfd: "\u{110A}\u{116A}\u{11BC}",
-        nfkc: "\u{C409}",
-        nfkd: "\u{110A}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C40A}",
-        nfc: "\u{C40A}",
-        nfd: "\u{110A}\u{116A}\u{11BD}",
-        nfkc: "\u{C40A}",
-        nfkd: "\u{110A}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C40B}",
-        nfc: "\u{C40B}",
-        nfd: "\u{110A}\u{116A}\u{11BE}",
-        nfkc: "\u{C40B}",
-        nfkd: "\u{110A}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C40C}",
-        nfc: "\u{C40C}",
-        nfd: "\u{110A}\u{116A}\u{11BF}",
-        nfkc: "\u{C40C}",
-        nfkd: "\u{110A}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C40D}",
-        nfc: "\u{C40D}",
-        nfd: "\u{110A}\u{116A}\u{11C0}",
-        nfkc: "\u{C40D}",
-        nfkd: "\u{110A}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C40E}",
-        nfc: "\u{C40E}",
-        nfd: "\u{110A}\u{116A}\u{11C1}",
-        nfkc: "\u{C40E}",
-        nfkd: "\u{110A}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C40F}",
-        nfc: "\u{C40F}",
-        nfd: "\u{110A}\u{116A}\u{11C2}",
-        nfkc: "\u{C40F}",
-        nfkd: "\u{110A}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C410}",
-        nfc: "\u{C410}",
-        nfd: "\u{110A}\u{116B}",
-        nfkc: "\u{C410}",
-        nfkd: "\u{110A}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{C411}",
-        nfc: "\u{C411}",
-        nfd: "\u{110A}\u{116B}\u{11A8}",
-        nfkc: "\u{C411}",
-        nfkd: "\u{110A}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C412}",
-        nfc: "\u{C412}",
-        nfd: "\u{110A}\u{116B}\u{11A9}",
-        nfkc: "\u{C412}",
-        nfkd: "\u{110A}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C413}",
-        nfc: "\u{C413}",
-        nfd: "\u{110A}\u{116B}\u{11AA}",
-        nfkc: "\u{C413}",
-        nfkd: "\u{110A}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C414}",
-        nfc: "\u{C414}",
-        nfd: "\u{110A}\u{116B}\u{11AB}",
-        nfkc: "\u{C414}",
-        nfkd: "\u{110A}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C415}",
-        nfc: "\u{C415}",
-        nfd: "\u{110A}\u{116B}\u{11AC}",
-        nfkc: "\u{C415}",
-        nfkd: "\u{110A}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C416}",
-        nfc: "\u{C416}",
-        nfd: "\u{110A}\u{116B}\u{11AD}",
-        nfkc: "\u{C416}",
-        nfkd: "\u{110A}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C417}",
-        nfc: "\u{C417}",
-        nfd: "\u{110A}\u{116B}\u{11AE}",
-        nfkc: "\u{C417}",
-        nfkd: "\u{110A}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C418}",
-        nfc: "\u{C418}",
-        nfd: "\u{110A}\u{116B}\u{11AF}",
-        nfkc: "\u{C418}",
-        nfkd: "\u{110A}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C419}",
-        nfc: "\u{C419}",
-        nfd: "\u{110A}\u{116B}\u{11B0}",
-        nfkc: "\u{C419}",
-        nfkd: "\u{110A}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C41A}",
-        nfc: "\u{C41A}",
-        nfd: "\u{110A}\u{116B}\u{11B1}",
-        nfkc: "\u{C41A}",
-        nfkd: "\u{110A}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C41B}",
-        nfc: "\u{C41B}",
-        nfd: "\u{110A}\u{116B}\u{11B2}",
-        nfkc: "\u{C41B}",
-        nfkd: "\u{110A}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C41C}",
-        nfc: "\u{C41C}",
-        nfd: "\u{110A}\u{116B}\u{11B3}",
-        nfkc: "\u{C41C}",
-        nfkd: "\u{110A}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C41D}",
-        nfc: "\u{C41D}",
-        nfd: "\u{110A}\u{116B}\u{11B4}",
-        nfkc: "\u{C41D}",
-        nfkd: "\u{110A}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C41E}",
-        nfc: "\u{C41E}",
-        nfd: "\u{110A}\u{116B}\u{11B5}",
-        nfkc: "\u{C41E}",
-        nfkd: "\u{110A}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C41F}",
-        nfc: "\u{C41F}",
-        nfd: "\u{110A}\u{116B}\u{11B6}",
-        nfkc: "\u{C41F}",
-        nfkd: "\u{110A}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C420}",
-        nfc: "\u{C420}",
-        nfd: "\u{110A}\u{116B}\u{11B7}",
-        nfkc: "\u{C420}",
-        nfkd: "\u{110A}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C421}",
-        nfc: "\u{C421}",
-        nfd: "\u{110A}\u{116B}\u{11B8}",
-        nfkc: "\u{C421}",
-        nfkd: "\u{110A}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C422}",
-        nfc: "\u{C422}",
-        nfd: "\u{110A}\u{116B}\u{11B9}",
-        nfkc: "\u{C422}",
-        nfkd: "\u{110A}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C423}",
-        nfc: "\u{C423}",
-        nfd: "\u{110A}\u{116B}\u{11BA}",
-        nfkc: "\u{C423}",
-        nfkd: "\u{110A}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C424}",
-        nfc: "\u{C424}",
-        nfd: "\u{110A}\u{116B}\u{11BB}",
-        nfkc: "\u{C424}",
-        nfkd: "\u{110A}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C425}",
-        nfc: "\u{C425}",
-        nfd: "\u{110A}\u{116B}\u{11BC}",
-        nfkc: "\u{C425}",
-        nfkd: "\u{110A}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C426}",
-        nfc: "\u{C426}",
-        nfd: "\u{110A}\u{116B}\u{11BD}",
-        nfkc: "\u{C426}",
-        nfkd: "\u{110A}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C427}",
-        nfc: "\u{C427}",
-        nfd: "\u{110A}\u{116B}\u{11BE}",
-        nfkc: "\u{C427}",
-        nfkd: "\u{110A}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C428}",
-        nfc: "\u{C428}",
-        nfd: "\u{110A}\u{116B}\u{11BF}",
-        nfkc: "\u{C428}",
-        nfkd: "\u{110A}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C429}",
-        nfc: "\u{C429}",
-        nfd: "\u{110A}\u{116B}\u{11C0}",
-        nfkc: "\u{C429}",
-        nfkd: "\u{110A}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C42A}",
-        nfc: "\u{C42A}",
-        nfd: "\u{110A}\u{116B}\u{11C1}",
-        nfkc: "\u{C42A}",
-        nfkd: "\u{110A}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C42B}",
-        nfc: "\u{C42B}",
-        nfd: "\u{110A}\u{116B}\u{11C2}",
-        nfkc: "\u{C42B}",
-        nfkd: "\u{110A}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C42C}",
-        nfc: "\u{C42C}",
-        nfd: "\u{110A}\u{116C}",
-        nfkc: "\u{C42C}",
-        nfkd: "\u{110A}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{C42D}",
-        nfc: "\u{C42D}",
-        nfd: "\u{110A}\u{116C}\u{11A8}",
-        nfkc: "\u{C42D}",
-        nfkd: "\u{110A}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C42E}",
-        nfc: "\u{C42E}",
-        nfd: "\u{110A}\u{116C}\u{11A9}",
-        nfkc: "\u{C42E}",
-        nfkd: "\u{110A}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C42F}",
-        nfc: "\u{C42F}",
-        nfd: "\u{110A}\u{116C}\u{11AA}",
-        nfkc: "\u{C42F}",
-        nfkd: "\u{110A}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C430}",
-        nfc: "\u{C430}",
-        nfd: "\u{110A}\u{116C}\u{11AB}",
-        nfkc: "\u{C430}",
-        nfkd: "\u{110A}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C431}",
-        nfc: "\u{C431}",
-        nfd: "\u{110A}\u{116C}\u{11AC}",
-        nfkc: "\u{C431}",
-        nfkd: "\u{110A}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C432}",
-        nfc: "\u{C432}",
-        nfd: "\u{110A}\u{116C}\u{11AD}",
-        nfkc: "\u{C432}",
-        nfkd: "\u{110A}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C433}",
-        nfc: "\u{C433}",
-        nfd: "\u{110A}\u{116C}\u{11AE}",
-        nfkc: "\u{C433}",
-        nfkd: "\u{110A}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C434}",
-        nfc: "\u{C434}",
-        nfd: "\u{110A}\u{116C}\u{11AF}",
-        nfkc: "\u{C434}",
-        nfkd: "\u{110A}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C435}",
-        nfc: "\u{C435}",
-        nfd: "\u{110A}\u{116C}\u{11B0}",
-        nfkc: "\u{C435}",
-        nfkd: "\u{110A}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C436}",
-        nfc: "\u{C436}",
-        nfd: "\u{110A}\u{116C}\u{11B1}",
-        nfkc: "\u{C436}",
-        nfkd: "\u{110A}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C437}",
-        nfc: "\u{C437}",
-        nfd: "\u{110A}\u{116C}\u{11B2}",
-        nfkc: "\u{C437}",
-        nfkd: "\u{110A}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C438}",
-        nfc: "\u{C438}",
-        nfd: "\u{110A}\u{116C}\u{11B3}",
-        nfkc: "\u{C438}",
-        nfkd: "\u{110A}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C439}",
-        nfc: "\u{C439}",
-        nfd: "\u{110A}\u{116C}\u{11B4}",
-        nfkc: "\u{C439}",
-        nfkd: "\u{110A}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C43A}",
-        nfc: "\u{C43A}",
-        nfd: "\u{110A}\u{116C}\u{11B5}",
-        nfkc: "\u{C43A}",
-        nfkd: "\u{110A}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C43B}",
-        nfc: "\u{C43B}",
-        nfd: "\u{110A}\u{116C}\u{11B6}",
-        nfkc: "\u{C43B}",
-        nfkd: "\u{110A}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C43C}",
-        nfc: "\u{C43C}",
-        nfd: "\u{110A}\u{116C}\u{11B7}",
-        nfkc: "\u{C43C}",
-        nfkd: "\u{110A}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C43D}",
-        nfc: "\u{C43D}",
-        nfd: "\u{110A}\u{116C}\u{11B8}",
-        nfkc: "\u{C43D}",
-        nfkd: "\u{110A}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C43E}",
-        nfc: "\u{C43E}",
-        nfd: "\u{110A}\u{116C}\u{11B9}",
-        nfkc: "\u{C43E}",
-        nfkd: "\u{110A}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C43F}",
-        nfc: "\u{C43F}",
-        nfd: "\u{110A}\u{116C}\u{11BA}",
-        nfkc: "\u{C43F}",
-        nfkd: "\u{110A}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C440}",
-        nfc: "\u{C440}",
-        nfd: "\u{110A}\u{116C}\u{11BB}",
-        nfkc: "\u{C440}",
-        nfkd: "\u{110A}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C441}",
-        nfc: "\u{C441}",
-        nfd: "\u{110A}\u{116C}\u{11BC}",
-        nfkc: "\u{C441}",
-        nfkd: "\u{110A}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C442}",
-        nfc: "\u{C442}",
-        nfd: "\u{110A}\u{116C}\u{11BD}",
-        nfkc: "\u{C442}",
-        nfkd: "\u{110A}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C443}",
-        nfc: "\u{C443}",
-        nfd: "\u{110A}\u{116C}\u{11BE}",
-        nfkc: "\u{C443}",
-        nfkd: "\u{110A}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C444}",
-        nfc: "\u{C444}",
-        nfd: "\u{110A}\u{116C}\u{11BF}",
-        nfkc: "\u{C444}",
-        nfkd: "\u{110A}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C445}",
-        nfc: "\u{C445}",
-        nfd: "\u{110A}\u{116C}\u{11C0}",
-        nfkc: "\u{C445}",
-        nfkd: "\u{110A}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C446}",
-        nfc: "\u{C446}",
-        nfd: "\u{110A}\u{116C}\u{11C1}",
-        nfkc: "\u{C446}",
-        nfkd: "\u{110A}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C447}",
-        nfc: "\u{C447}",
-        nfd: "\u{110A}\u{116C}\u{11C2}",
-        nfkc: "\u{C447}",
-        nfkd: "\u{110A}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C448}",
-        nfc: "\u{C448}",
-        nfd: "\u{110A}\u{116D}",
-        nfkc: "\u{C448}",
-        nfkd: "\u{110A}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{C449}",
-        nfc: "\u{C449}",
-        nfd: "\u{110A}\u{116D}\u{11A8}",
-        nfkc: "\u{C449}",
-        nfkd: "\u{110A}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C44A}",
-        nfc: "\u{C44A}",
-        nfd: "\u{110A}\u{116D}\u{11A9}",
-        nfkc: "\u{C44A}",
-        nfkd: "\u{110A}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C44B}",
-        nfc: "\u{C44B}",
-        nfd: "\u{110A}\u{116D}\u{11AA}",
-        nfkc: "\u{C44B}",
-        nfkd: "\u{110A}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C44C}",
-        nfc: "\u{C44C}",
-        nfd: "\u{110A}\u{116D}\u{11AB}",
-        nfkc: "\u{C44C}",
-        nfkd: "\u{110A}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C44D}",
-        nfc: "\u{C44D}",
-        nfd: "\u{110A}\u{116D}\u{11AC}",
-        nfkc: "\u{C44D}",
-        nfkd: "\u{110A}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C44E}",
-        nfc: "\u{C44E}",
-        nfd: "\u{110A}\u{116D}\u{11AD}",
-        nfkc: "\u{C44E}",
-        nfkd: "\u{110A}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C44F}",
-        nfc: "\u{C44F}",
-        nfd: "\u{110A}\u{116D}\u{11AE}",
-        nfkc: "\u{C44F}",
-        nfkd: "\u{110A}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C450}",
-        nfc: "\u{C450}",
-        nfd: "\u{110A}\u{116D}\u{11AF}",
-        nfkc: "\u{C450}",
-        nfkd: "\u{110A}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C451}",
-        nfc: "\u{C451}",
-        nfd: "\u{110A}\u{116D}\u{11B0}",
-        nfkc: "\u{C451}",
-        nfkd: "\u{110A}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C452}",
-        nfc: "\u{C452}",
-        nfd: "\u{110A}\u{116D}\u{11B1}",
-        nfkc: "\u{C452}",
-        nfkd: "\u{110A}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C453}",
-        nfc: "\u{C453}",
-        nfd: "\u{110A}\u{116D}\u{11B2}",
-        nfkc: "\u{C453}",
-        nfkd: "\u{110A}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C454}",
-        nfc: "\u{C454}",
-        nfd: "\u{110A}\u{116D}\u{11B3}",
-        nfkc: "\u{C454}",
-        nfkd: "\u{110A}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C455}",
-        nfc: "\u{C455}",
-        nfd: "\u{110A}\u{116D}\u{11B4}",
-        nfkc: "\u{C455}",
-        nfkd: "\u{110A}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C456}",
-        nfc: "\u{C456}",
-        nfd: "\u{110A}\u{116D}\u{11B5}",
-        nfkc: "\u{C456}",
-        nfkd: "\u{110A}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C457}",
-        nfc: "\u{C457}",
-        nfd: "\u{110A}\u{116D}\u{11B6}",
-        nfkc: "\u{C457}",
-        nfkd: "\u{110A}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C458}",
-        nfc: "\u{C458}",
-        nfd: "\u{110A}\u{116D}\u{11B7}",
-        nfkc: "\u{C458}",
-        nfkd: "\u{110A}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C459}",
-        nfc: "\u{C459}",
-        nfd: "\u{110A}\u{116D}\u{11B8}",
-        nfkc: "\u{C459}",
-        nfkd: "\u{110A}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C45A}",
-        nfc: "\u{C45A}",
-        nfd: "\u{110A}\u{116D}\u{11B9}",
-        nfkc: "\u{C45A}",
-        nfkd: "\u{110A}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C45B}",
-        nfc: "\u{C45B}",
-        nfd: "\u{110A}\u{116D}\u{11BA}",
-        nfkc: "\u{C45B}",
-        nfkd: "\u{110A}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C45C}",
-        nfc: "\u{C45C}",
-        nfd: "\u{110A}\u{116D}\u{11BB}",
-        nfkc: "\u{C45C}",
-        nfkd: "\u{110A}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C45D}",
-        nfc: "\u{C45D}",
-        nfd: "\u{110A}\u{116D}\u{11BC}",
-        nfkc: "\u{C45D}",
-        nfkd: "\u{110A}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C45E}",
-        nfc: "\u{C45E}",
-        nfd: "\u{110A}\u{116D}\u{11BD}",
-        nfkc: "\u{C45E}",
-        nfkd: "\u{110A}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C45F}",
-        nfc: "\u{C45F}",
-        nfd: "\u{110A}\u{116D}\u{11BE}",
-        nfkc: "\u{C45F}",
-        nfkd: "\u{110A}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C460}",
-        nfc: "\u{C460}",
-        nfd: "\u{110A}\u{116D}\u{11BF}",
-        nfkc: "\u{C460}",
-        nfkd: "\u{110A}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C461}",
-        nfc: "\u{C461}",
-        nfd: "\u{110A}\u{116D}\u{11C0}",
-        nfkc: "\u{C461}",
-        nfkd: "\u{110A}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C462}",
-        nfc: "\u{C462}",
-        nfd: "\u{110A}\u{116D}\u{11C1}",
-        nfkc: "\u{C462}",
-        nfkd: "\u{110A}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C463}",
-        nfc: "\u{C463}",
-        nfd: "\u{110A}\u{116D}\u{11C2}",
-        nfkc: "\u{C463}",
-        nfkd: "\u{110A}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C464}",
-        nfc: "\u{C464}",
-        nfd: "\u{110A}\u{116E}",
-        nfkc: "\u{C464}",
-        nfkd: "\u{110A}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{C465}",
-        nfc: "\u{C465}",
-        nfd: "\u{110A}\u{116E}\u{11A8}",
-        nfkc: "\u{C465}",
-        nfkd: "\u{110A}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C466}",
-        nfc: "\u{C466}",
-        nfd: "\u{110A}\u{116E}\u{11A9}",
-        nfkc: "\u{C466}",
-        nfkd: "\u{110A}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C467}",
-        nfc: "\u{C467}",
-        nfd: "\u{110A}\u{116E}\u{11AA}",
-        nfkc: "\u{C467}",
-        nfkd: "\u{110A}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C468}",
-        nfc: "\u{C468}",
-        nfd: "\u{110A}\u{116E}\u{11AB}",
-        nfkc: "\u{C468}",
-        nfkd: "\u{110A}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C469}",
-        nfc: "\u{C469}",
-        nfd: "\u{110A}\u{116E}\u{11AC}",
-        nfkc: "\u{C469}",
-        nfkd: "\u{110A}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C46A}",
-        nfc: "\u{C46A}",
-        nfd: "\u{110A}\u{116E}\u{11AD}",
-        nfkc: "\u{C46A}",
-        nfkd: "\u{110A}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C46B}",
-        nfc: "\u{C46B}",
-        nfd: "\u{110A}\u{116E}\u{11AE}",
-        nfkc: "\u{C46B}",
-        nfkd: "\u{110A}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C46C}",
-        nfc: "\u{C46C}",
-        nfd: "\u{110A}\u{116E}\u{11AF}",
-        nfkc: "\u{C46C}",
-        nfkd: "\u{110A}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C46D}",
-        nfc: "\u{C46D}",
-        nfd: "\u{110A}\u{116E}\u{11B0}",
-        nfkc: "\u{C46D}",
-        nfkd: "\u{110A}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C46E}",
-        nfc: "\u{C46E}",
-        nfd: "\u{110A}\u{116E}\u{11B1}",
-        nfkc: "\u{C46E}",
-        nfkd: "\u{110A}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C46F}",
-        nfc: "\u{C46F}",
-        nfd: "\u{110A}\u{116E}\u{11B2}",
-        nfkc: "\u{C46F}",
-        nfkd: "\u{110A}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C470}",
-        nfc: "\u{C470}",
-        nfd: "\u{110A}\u{116E}\u{11B3}",
-        nfkc: "\u{C470}",
-        nfkd: "\u{110A}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C471}",
-        nfc: "\u{C471}",
-        nfd: "\u{110A}\u{116E}\u{11B4}",
-        nfkc: "\u{C471}",
-        nfkd: "\u{110A}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C472}",
-        nfc: "\u{C472}",
-        nfd: "\u{110A}\u{116E}\u{11B5}",
-        nfkc: "\u{C472}",
-        nfkd: "\u{110A}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C473}",
-        nfc: "\u{C473}",
-        nfd: "\u{110A}\u{116E}\u{11B6}",
-        nfkc: "\u{C473}",
-        nfkd: "\u{110A}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C474}",
-        nfc: "\u{C474}",
-        nfd: "\u{110A}\u{116E}\u{11B7}",
-        nfkc: "\u{C474}",
-        nfkd: "\u{110A}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C475}",
-        nfc: "\u{C475}",
-        nfd: "\u{110A}\u{116E}\u{11B8}",
-        nfkc: "\u{C475}",
-        nfkd: "\u{110A}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C476}",
-        nfc: "\u{C476}",
-        nfd: "\u{110A}\u{116E}\u{11B9}",
-        nfkc: "\u{C476}",
-        nfkd: "\u{110A}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C477}",
-        nfc: "\u{C477}",
-        nfd: "\u{110A}\u{116E}\u{11BA}",
-        nfkc: "\u{C477}",
-        nfkd: "\u{110A}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C478}",
-        nfc: "\u{C478}",
-        nfd: "\u{110A}\u{116E}\u{11BB}",
-        nfkc: "\u{C478}",
-        nfkd: "\u{110A}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C479}",
-        nfc: "\u{C479}",
-        nfd: "\u{110A}\u{116E}\u{11BC}",
-        nfkc: "\u{C479}",
-        nfkd: "\u{110A}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C47A}",
-        nfc: "\u{C47A}",
-        nfd: "\u{110A}\u{116E}\u{11BD}",
-        nfkc: "\u{C47A}",
-        nfkd: "\u{110A}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C47B}",
-        nfc: "\u{C47B}",
-        nfd: "\u{110A}\u{116E}\u{11BE}",
-        nfkc: "\u{C47B}",
-        nfkd: "\u{110A}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C47C}",
-        nfc: "\u{C47C}",
-        nfd: "\u{110A}\u{116E}\u{11BF}",
-        nfkc: "\u{C47C}",
-        nfkd: "\u{110A}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C47D}",
-        nfc: "\u{C47D}",
-        nfd: "\u{110A}\u{116E}\u{11C0}",
-        nfkc: "\u{C47D}",
-        nfkd: "\u{110A}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C47E}",
-        nfc: "\u{C47E}",
-        nfd: "\u{110A}\u{116E}\u{11C1}",
-        nfkc: "\u{C47E}",
-        nfkd: "\u{110A}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C47F}",
-        nfc: "\u{C47F}",
-        nfd: "\u{110A}\u{116E}\u{11C2}",
-        nfkc: "\u{C47F}",
-        nfkd: "\u{110A}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C480}",
-        nfc: "\u{C480}",
-        nfd: "\u{110A}\u{116F}",
-        nfkc: "\u{C480}",
-        nfkd: "\u{110A}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{C481}",
-        nfc: "\u{C481}",
-        nfd: "\u{110A}\u{116F}\u{11A8}",
-        nfkc: "\u{C481}",
-        nfkd: "\u{110A}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C482}",
-        nfc: "\u{C482}",
-        nfd: "\u{110A}\u{116F}\u{11A9}",
-        nfkc: "\u{C482}",
-        nfkd: "\u{110A}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C483}",
-        nfc: "\u{C483}",
-        nfd: "\u{110A}\u{116F}\u{11AA}",
-        nfkc: "\u{C483}",
-        nfkd: "\u{110A}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C484}",
-        nfc: "\u{C484}",
-        nfd: "\u{110A}\u{116F}\u{11AB}",
-        nfkc: "\u{C484}",
-        nfkd: "\u{110A}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C485}",
-        nfc: "\u{C485}",
-        nfd: "\u{110A}\u{116F}\u{11AC}",
-        nfkc: "\u{C485}",
-        nfkd: "\u{110A}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C486}",
-        nfc: "\u{C486}",
-        nfd: "\u{110A}\u{116F}\u{11AD}",
-        nfkc: "\u{C486}",
-        nfkd: "\u{110A}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C487}",
-        nfc: "\u{C487}",
-        nfd: "\u{110A}\u{116F}\u{11AE}",
-        nfkc: "\u{C487}",
-        nfkd: "\u{110A}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C488}",
-        nfc: "\u{C488}",
-        nfd: "\u{110A}\u{116F}\u{11AF}",
-        nfkc: "\u{C488}",
-        nfkd: "\u{110A}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C489}",
-        nfc: "\u{C489}",
-        nfd: "\u{110A}\u{116F}\u{11B0}",
-        nfkc: "\u{C489}",
-        nfkd: "\u{110A}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C48A}",
-        nfc: "\u{C48A}",
-        nfd: "\u{110A}\u{116F}\u{11B1}",
-        nfkc: "\u{C48A}",
-        nfkd: "\u{110A}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C48B}",
-        nfc: "\u{C48B}",
-        nfd: "\u{110A}\u{116F}\u{11B2}",
-        nfkc: "\u{C48B}",
-        nfkd: "\u{110A}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C48C}",
-        nfc: "\u{C48C}",
-        nfd: "\u{110A}\u{116F}\u{11B3}",
-        nfkc: "\u{C48C}",
-        nfkd: "\u{110A}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C48D}",
-        nfc: "\u{C48D}",
-        nfd: "\u{110A}\u{116F}\u{11B4}",
-        nfkc: "\u{C48D}",
-        nfkd: "\u{110A}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C48E}",
-        nfc: "\u{C48E}",
-        nfd: "\u{110A}\u{116F}\u{11B5}",
-        nfkc: "\u{C48E}",
-        nfkd: "\u{110A}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C48F}",
-        nfc: "\u{C48F}",
-        nfd: "\u{110A}\u{116F}\u{11B6}",
-        nfkc: "\u{C48F}",
-        nfkd: "\u{110A}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C490}",
-        nfc: "\u{C490}",
-        nfd: "\u{110A}\u{116F}\u{11B7}",
-        nfkc: "\u{C490}",
-        nfkd: "\u{110A}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C491}",
-        nfc: "\u{C491}",
-        nfd: "\u{110A}\u{116F}\u{11B8}",
-        nfkc: "\u{C491}",
-        nfkd: "\u{110A}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C492}",
-        nfc: "\u{C492}",
-        nfd: "\u{110A}\u{116F}\u{11B9}",
-        nfkc: "\u{C492}",
-        nfkd: "\u{110A}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C493}",
-        nfc: "\u{C493}",
-        nfd: "\u{110A}\u{116F}\u{11BA}",
-        nfkc: "\u{C493}",
-        nfkd: "\u{110A}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C494}",
-        nfc: "\u{C494}",
-        nfd: "\u{110A}\u{116F}\u{11BB}",
-        nfkc: "\u{C494}",
-        nfkd: "\u{110A}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C495}",
-        nfc: "\u{C495}",
-        nfd: "\u{110A}\u{116F}\u{11BC}",
-        nfkc: "\u{C495}",
-        nfkd: "\u{110A}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C496}",
-        nfc: "\u{C496}",
-        nfd: "\u{110A}\u{116F}\u{11BD}",
-        nfkc: "\u{C496}",
-        nfkd: "\u{110A}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C497}",
-        nfc: "\u{C497}",
-        nfd: "\u{110A}\u{116F}\u{11BE}",
-        nfkc: "\u{C497}",
-        nfkd: "\u{110A}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C498}",
-        nfc: "\u{C498}",
-        nfd: "\u{110A}\u{116F}\u{11BF}",
-        nfkc: "\u{C498}",
-        nfkd: "\u{110A}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C499}",
-        nfc: "\u{C499}",
-        nfd: "\u{110A}\u{116F}\u{11C0}",
-        nfkc: "\u{C499}",
-        nfkd: "\u{110A}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C49A}",
-        nfc: "\u{C49A}",
-        nfd: "\u{110A}\u{116F}\u{11C1}",
-        nfkc: "\u{C49A}",
-        nfkd: "\u{110A}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C49B}",
-        nfc: "\u{C49B}",
-        nfd: "\u{110A}\u{116F}\u{11C2}",
-        nfkc: "\u{C49B}",
-        nfkd: "\u{110A}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C49C}",
-        nfc: "\u{C49C}",
-        nfd: "\u{110A}\u{1170}",
-        nfkc: "\u{C49C}",
-        nfkd: "\u{110A}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{C49D}",
-        nfc: "\u{C49D}",
-        nfd: "\u{110A}\u{1170}\u{11A8}",
-        nfkc: "\u{C49D}",
-        nfkd: "\u{110A}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C49E}",
-        nfc: "\u{C49E}",
-        nfd: "\u{110A}\u{1170}\u{11A9}",
-        nfkc: "\u{C49E}",
-        nfkd: "\u{110A}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C49F}",
-        nfc: "\u{C49F}",
-        nfd: "\u{110A}\u{1170}\u{11AA}",
-        nfkc: "\u{C49F}",
-        nfkd: "\u{110A}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C4A0}",
-        nfc: "\u{C4A0}",
-        nfd: "\u{110A}\u{1170}\u{11AB}",
-        nfkc: "\u{C4A0}",
-        nfkd: "\u{110A}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C4A1}",
-        nfc: "\u{C4A1}",
-        nfd: "\u{110A}\u{1170}\u{11AC}",
-        nfkc: "\u{C4A1}",
-        nfkd: "\u{110A}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C4A2}",
-        nfc: "\u{C4A2}",
-        nfd: "\u{110A}\u{1170}\u{11AD}",
-        nfkc: "\u{C4A2}",
-        nfkd: "\u{110A}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C4A3}",
-        nfc: "\u{C4A3}",
-        nfd: "\u{110A}\u{1170}\u{11AE}",
-        nfkc: "\u{C4A3}",
-        nfkd: "\u{110A}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C4A4}",
-        nfc: "\u{C4A4}",
-        nfd: "\u{110A}\u{1170}\u{11AF}",
-        nfkc: "\u{C4A4}",
-        nfkd: "\u{110A}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C4A5}",
-        nfc: "\u{C4A5}",
-        nfd: "\u{110A}\u{1170}\u{11B0}",
-        nfkc: "\u{C4A5}",
-        nfkd: "\u{110A}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C4A6}",
-        nfc: "\u{C4A6}",
-        nfd: "\u{110A}\u{1170}\u{11B1}",
-        nfkc: "\u{C4A6}",
-        nfkd: "\u{110A}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C4A7}",
-        nfc: "\u{C4A7}",
-        nfd: "\u{110A}\u{1170}\u{11B2}",
-        nfkc: "\u{C4A7}",
-        nfkd: "\u{110A}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C4A8}",
-        nfc: "\u{C4A8}",
-        nfd: "\u{110A}\u{1170}\u{11B3}",
-        nfkc: "\u{C4A8}",
-        nfkd: "\u{110A}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C4A9}",
-        nfc: "\u{C4A9}",
-        nfd: "\u{110A}\u{1170}\u{11B4}",
-        nfkc: "\u{C4A9}",
-        nfkd: "\u{110A}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C4AA}",
-        nfc: "\u{C4AA}",
-        nfd: "\u{110A}\u{1170}\u{11B5}",
-        nfkc: "\u{C4AA}",
-        nfkd: "\u{110A}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C4AB}",
-        nfc: "\u{C4AB}",
-        nfd: "\u{110A}\u{1170}\u{11B6}",
-        nfkc: "\u{C4AB}",
-        nfkd: "\u{110A}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C4AC}",
-        nfc: "\u{C4AC}",
-        nfd: "\u{110A}\u{1170}\u{11B7}",
-        nfkc: "\u{C4AC}",
-        nfkd: "\u{110A}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C4AD}",
-        nfc: "\u{C4AD}",
-        nfd: "\u{110A}\u{1170}\u{11B8}",
-        nfkc: "\u{C4AD}",
-        nfkd: "\u{110A}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C4AE}",
-        nfc: "\u{C4AE}",
-        nfd: "\u{110A}\u{1170}\u{11B9}",
-        nfkc: "\u{C4AE}",
-        nfkd: "\u{110A}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C4AF}",
-        nfc: "\u{C4AF}",
-        nfd: "\u{110A}\u{1170}\u{11BA}",
-        nfkc: "\u{C4AF}",
-        nfkd: "\u{110A}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C4B0}",
-        nfc: "\u{C4B0}",
-        nfd: "\u{110A}\u{1170}\u{11BB}",
-        nfkc: "\u{C4B0}",
-        nfkd: "\u{110A}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C4B1}",
-        nfc: "\u{C4B1}",
-        nfd: "\u{110A}\u{1170}\u{11BC}",
-        nfkc: "\u{C4B1}",
-        nfkd: "\u{110A}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C4B2}",
-        nfc: "\u{C4B2}",
-        nfd: "\u{110A}\u{1170}\u{11BD}",
-        nfkc: "\u{C4B2}",
-        nfkd: "\u{110A}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C4B3}",
-        nfc: "\u{C4B3}",
-        nfd: "\u{110A}\u{1170}\u{11BE}",
-        nfkc: "\u{C4B3}",
-        nfkd: "\u{110A}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C4B4}",
-        nfc: "\u{C4B4}",
-        nfd: "\u{110A}\u{1170}\u{11BF}",
-        nfkc: "\u{C4B4}",
-        nfkd: "\u{110A}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C4B5}",
-        nfc: "\u{C4B5}",
-        nfd: "\u{110A}\u{1170}\u{11C0}",
-        nfkc: "\u{C4B5}",
-        nfkd: "\u{110A}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C4B6}",
-        nfc: "\u{C4B6}",
-        nfd: "\u{110A}\u{1170}\u{11C1}",
-        nfkc: "\u{C4B6}",
-        nfkd: "\u{110A}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C4B7}",
-        nfc: "\u{C4B7}",
-        nfd: "\u{110A}\u{1170}\u{11C2}",
-        nfkc: "\u{C4B7}",
-        nfkd: "\u{110A}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C4B8}",
-        nfc: "\u{C4B8}",
-        nfd: "\u{110A}\u{1171}",
-        nfkc: "\u{C4B8}",
-        nfkd: "\u{110A}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{C4B9}",
-        nfc: "\u{C4B9}",
-        nfd: "\u{110A}\u{1171}\u{11A8}",
-        nfkc: "\u{C4B9}",
-        nfkd: "\u{110A}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C4BA}",
-        nfc: "\u{C4BA}",
-        nfd: "\u{110A}\u{1171}\u{11A9}",
-        nfkc: "\u{C4BA}",
-        nfkd: "\u{110A}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C4BB}",
-        nfc: "\u{C4BB}",
-        nfd: "\u{110A}\u{1171}\u{11AA}",
-        nfkc: "\u{C4BB}",
-        nfkd: "\u{110A}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C4BC}",
-        nfc: "\u{C4BC}",
-        nfd: "\u{110A}\u{1171}\u{11AB}",
-        nfkc: "\u{C4BC}",
-        nfkd: "\u{110A}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C4BD}",
-        nfc: "\u{C4BD}",
-        nfd: "\u{110A}\u{1171}\u{11AC}",
-        nfkc: "\u{C4BD}",
-        nfkd: "\u{110A}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C4BE}",
-        nfc: "\u{C4BE}",
-        nfd: "\u{110A}\u{1171}\u{11AD}",
-        nfkc: "\u{C4BE}",
-        nfkd: "\u{110A}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C4BF}",
-        nfc: "\u{C4BF}",
-        nfd: "\u{110A}\u{1171}\u{11AE}",
-        nfkc: "\u{C4BF}",
-        nfkd: "\u{110A}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C4C0}",
-        nfc: "\u{C4C0}",
-        nfd: "\u{110A}\u{1171}\u{11AF}",
-        nfkc: "\u{C4C0}",
-        nfkd: "\u{110A}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C4C1}",
-        nfc: "\u{C4C1}",
-        nfd: "\u{110A}\u{1171}\u{11B0}",
-        nfkc: "\u{C4C1}",
-        nfkd: "\u{110A}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C4C2}",
-        nfc: "\u{C4C2}",
-        nfd: "\u{110A}\u{1171}\u{11B1}",
-        nfkc: "\u{C4C2}",
-        nfkd: "\u{110A}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C4C3}",
-        nfc: "\u{C4C3}",
-        nfd: "\u{110A}\u{1171}\u{11B2}",
-        nfkc: "\u{C4C3}",
-        nfkd: "\u{110A}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C4C4}",
-        nfc: "\u{C4C4}",
-        nfd: "\u{110A}\u{1171}\u{11B3}",
-        nfkc: "\u{C4C4}",
-        nfkd: "\u{110A}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C4C5}",
-        nfc: "\u{C4C5}",
-        nfd: "\u{110A}\u{1171}\u{11B4}",
-        nfkc: "\u{C4C5}",
-        nfkd: "\u{110A}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C4C6}",
-        nfc: "\u{C4C6}",
-        nfd: "\u{110A}\u{1171}\u{11B5}",
-        nfkc: "\u{C4C6}",
-        nfkd: "\u{110A}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C4C7}",
-        nfc: "\u{C4C7}",
-        nfd: "\u{110A}\u{1171}\u{11B6}",
-        nfkc: "\u{C4C7}",
-        nfkd: "\u{110A}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C4C8}",
-        nfc: "\u{C4C8}",
-        nfd: "\u{110A}\u{1171}\u{11B7}",
-        nfkc: "\u{C4C8}",
-        nfkd: "\u{110A}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C4C9}",
-        nfc: "\u{C4C9}",
-        nfd: "\u{110A}\u{1171}\u{11B8}",
-        nfkc: "\u{C4C9}",
-        nfkd: "\u{110A}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C4CA}",
-        nfc: "\u{C4CA}",
-        nfd: "\u{110A}\u{1171}\u{11B9}",
-        nfkc: "\u{C4CA}",
-        nfkd: "\u{110A}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C4CB}",
-        nfc: "\u{C4CB}",
-        nfd: "\u{110A}\u{1171}\u{11BA}",
-        nfkc: "\u{C4CB}",
-        nfkd: "\u{110A}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C4CC}",
-        nfc: "\u{C4CC}",
-        nfd: "\u{110A}\u{1171}\u{11BB}",
-        nfkc: "\u{C4CC}",
-        nfkd: "\u{110A}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C4CD}",
-        nfc: "\u{C4CD}",
-        nfd: "\u{110A}\u{1171}\u{11BC}",
-        nfkc: "\u{C4CD}",
-        nfkd: "\u{110A}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C4CE}",
-        nfc: "\u{C4CE}",
-        nfd: "\u{110A}\u{1171}\u{11BD}",
-        nfkc: "\u{C4CE}",
-        nfkd: "\u{110A}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C4CF}",
-        nfc: "\u{C4CF}",
-        nfd: "\u{110A}\u{1171}\u{11BE}",
-        nfkc: "\u{C4CF}",
-        nfkd: "\u{110A}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C4D0}",
-        nfc: "\u{C4D0}",
-        nfd: "\u{110A}\u{1171}\u{11BF}",
-        nfkc: "\u{C4D0}",
-        nfkd: "\u{110A}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C4D1}",
-        nfc: "\u{C4D1}",
-        nfd: "\u{110A}\u{1171}\u{11C0}",
-        nfkc: "\u{C4D1}",
-        nfkd: "\u{110A}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C4D2}",
-        nfc: "\u{C4D2}",
-        nfd: "\u{110A}\u{1171}\u{11C1}",
-        nfkc: "\u{C4D2}",
-        nfkd: "\u{110A}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C4D3}",
-        nfc: "\u{C4D3}",
-        nfd: "\u{110A}\u{1171}\u{11C2}",
-        nfkc: "\u{C4D3}",
-        nfkd: "\u{110A}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C4D4}",
-        nfc: "\u{C4D4}",
-        nfd: "\u{110A}\u{1172}",
-        nfkc: "\u{C4D4}",
-        nfkd: "\u{110A}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{C4D5}",
-        nfc: "\u{C4D5}",
-        nfd: "\u{110A}\u{1172}\u{11A8}",
-        nfkc: "\u{C4D5}",
-        nfkd: "\u{110A}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C4D6}",
-        nfc: "\u{C4D6}",
-        nfd: "\u{110A}\u{1172}\u{11A9}",
-        nfkc: "\u{C4D6}",
-        nfkd: "\u{110A}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C4D7}",
-        nfc: "\u{C4D7}",
-        nfd: "\u{110A}\u{1172}\u{11AA}",
-        nfkc: "\u{C4D7}",
-        nfkd: "\u{110A}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C4D8}",
-        nfc: "\u{C4D8}",
-        nfd: "\u{110A}\u{1172}\u{11AB}",
-        nfkc: "\u{C4D8}",
-        nfkd: "\u{110A}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C4D9}",
-        nfc: "\u{C4D9}",
-        nfd: "\u{110A}\u{1172}\u{11AC}",
-        nfkc: "\u{C4D9}",
-        nfkd: "\u{110A}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C4DA}",
-        nfc: "\u{C4DA}",
-        nfd: "\u{110A}\u{1172}\u{11AD}",
-        nfkc: "\u{C4DA}",
-        nfkd: "\u{110A}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C4DB}",
-        nfc: "\u{C4DB}",
-        nfd: "\u{110A}\u{1172}\u{11AE}",
-        nfkc: "\u{C4DB}",
-        nfkd: "\u{110A}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C4DC}",
-        nfc: "\u{C4DC}",
-        nfd: "\u{110A}\u{1172}\u{11AF}",
-        nfkc: "\u{C4DC}",
-        nfkd: "\u{110A}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C4DD}",
-        nfc: "\u{C4DD}",
-        nfd: "\u{110A}\u{1172}\u{11B0}",
-        nfkc: "\u{C4DD}",
-        nfkd: "\u{110A}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C4DE}",
-        nfc: "\u{C4DE}",
-        nfd: "\u{110A}\u{1172}\u{11B1}",
-        nfkc: "\u{C4DE}",
-        nfkd: "\u{110A}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C4DF}",
-        nfc: "\u{C4DF}",
-        nfd: "\u{110A}\u{1172}\u{11B2}",
-        nfkc: "\u{C4DF}",
-        nfkd: "\u{110A}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C4E0}",
-        nfc: "\u{C4E0}",
-        nfd: "\u{110A}\u{1172}\u{11B3}",
-        nfkc: "\u{C4E0}",
-        nfkd: "\u{110A}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C4E1}",
-        nfc: "\u{C4E1}",
-        nfd: "\u{110A}\u{1172}\u{11B4}",
-        nfkc: "\u{C4E1}",
-        nfkd: "\u{110A}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C4E2}",
-        nfc: "\u{C4E2}",
-        nfd: "\u{110A}\u{1172}\u{11B5}",
-        nfkc: "\u{C4E2}",
-        nfkd: "\u{110A}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C4E3}",
-        nfc: "\u{C4E3}",
-        nfd: "\u{110A}\u{1172}\u{11B6}",
-        nfkc: "\u{C4E3}",
-        nfkd: "\u{110A}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C4E4}",
-        nfc: "\u{C4E4}",
-        nfd: "\u{110A}\u{1172}\u{11B7}",
-        nfkc: "\u{C4E4}",
-        nfkd: "\u{110A}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C4E5}",
-        nfc: "\u{C4E5}",
-        nfd: "\u{110A}\u{1172}\u{11B8}",
-        nfkc: "\u{C4E5}",
-        nfkd: "\u{110A}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C4E6}",
-        nfc: "\u{C4E6}",
-        nfd: "\u{110A}\u{1172}\u{11B9}",
-        nfkc: "\u{C4E6}",
-        nfkd: "\u{110A}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C4E7}",
-        nfc: "\u{C4E7}",
-        nfd: "\u{110A}\u{1172}\u{11BA}",
-        nfkc: "\u{C4E7}",
-        nfkd: "\u{110A}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C4E8}",
-        nfc: "\u{C4E8}",
-        nfd: "\u{110A}\u{1172}\u{11BB}",
-        nfkc: "\u{C4E8}",
-        nfkd: "\u{110A}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C4E9}",
-        nfc: "\u{C4E9}",
-        nfd: "\u{110A}\u{1172}\u{11BC}",
-        nfkc: "\u{C4E9}",
-        nfkd: "\u{110A}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C4EA}",
-        nfc: "\u{C4EA}",
-        nfd: "\u{110A}\u{1172}\u{11BD}",
-        nfkc: "\u{C4EA}",
-        nfkd: "\u{110A}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C4EB}",
-        nfc: "\u{C4EB}",
-        nfd: "\u{110A}\u{1172}\u{11BE}",
-        nfkc: "\u{C4EB}",
-        nfkd: "\u{110A}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C4EC}",
-        nfc: "\u{C4EC}",
-        nfd: "\u{110A}\u{1172}\u{11BF}",
-        nfkc: "\u{C4EC}",
-        nfkd: "\u{110A}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C4ED}",
-        nfc: "\u{C4ED}",
-        nfd: "\u{110A}\u{1172}\u{11C0}",
-        nfkc: "\u{C4ED}",
-        nfkd: "\u{110A}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C4EE}",
-        nfc: "\u{C4EE}",
-        nfd: "\u{110A}\u{1172}\u{11C1}",
-        nfkc: "\u{C4EE}",
-        nfkd: "\u{110A}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C4EF}",
-        nfc: "\u{C4EF}",
-        nfd: "\u{110A}\u{1172}\u{11C2}",
-        nfkc: "\u{C4EF}",
-        nfkd: "\u{110A}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C4F0}",
-        nfc: "\u{C4F0}",
-        nfd: "\u{110A}\u{1173}",
-        nfkc: "\u{C4F0}",
-        nfkd: "\u{110A}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{C4F1}",
-        nfc: "\u{C4F1}",
-        nfd: "\u{110A}\u{1173}\u{11A8}",
-        nfkc: "\u{C4F1}",
-        nfkd: "\u{110A}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C4F2}",
-        nfc: "\u{C4F2}",
-        nfd: "\u{110A}\u{1173}\u{11A9}",
-        nfkc: "\u{C4F2}",
-        nfkd: "\u{110A}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C4F3}",
-        nfc: "\u{C4F3}",
-        nfd: "\u{110A}\u{1173}\u{11AA}",
-        nfkc: "\u{C4F3}",
-        nfkd: "\u{110A}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C4F4}",
-        nfc: "\u{C4F4}",
-        nfd: "\u{110A}\u{1173}\u{11AB}",
-        nfkc: "\u{C4F4}",
-        nfkd: "\u{110A}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C4F5}",
-        nfc: "\u{C4F5}",
-        nfd: "\u{110A}\u{1173}\u{11AC}",
-        nfkc: "\u{C4F5}",
-        nfkd: "\u{110A}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C4F6}",
-        nfc: "\u{C4F6}",
-        nfd: "\u{110A}\u{1173}\u{11AD}",
-        nfkc: "\u{C4F6}",
-        nfkd: "\u{110A}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C4F7}",
-        nfc: "\u{C4F7}",
-        nfd: "\u{110A}\u{1173}\u{11AE}",
-        nfkc: "\u{C4F7}",
-        nfkd: "\u{110A}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C4F8}",
-        nfc: "\u{C4F8}",
-        nfd: "\u{110A}\u{1173}\u{11AF}",
-        nfkc: "\u{C4F8}",
-        nfkd: "\u{110A}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C4F9}",
-        nfc: "\u{C4F9}",
-        nfd: "\u{110A}\u{1173}\u{11B0}",
-        nfkc: "\u{C4F9}",
-        nfkd: "\u{110A}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C4FA}",
-        nfc: "\u{C4FA}",
-        nfd: "\u{110A}\u{1173}\u{11B1}",
-        nfkc: "\u{C4FA}",
-        nfkd: "\u{110A}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C4FB}",
-        nfc: "\u{C4FB}",
-        nfd: "\u{110A}\u{1173}\u{11B2}",
-        nfkc: "\u{C4FB}",
-        nfkd: "\u{110A}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C4FC}",
-        nfc: "\u{C4FC}",
-        nfd: "\u{110A}\u{1173}\u{11B3}",
-        nfkc: "\u{C4FC}",
-        nfkd: "\u{110A}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C4FD}",
-        nfc: "\u{C4FD}",
-        nfd: "\u{110A}\u{1173}\u{11B4}",
-        nfkc: "\u{C4FD}",
-        nfkd: "\u{110A}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C4FE}",
-        nfc: "\u{C4FE}",
-        nfd: "\u{110A}\u{1173}\u{11B5}",
-        nfkc: "\u{C4FE}",
-        nfkd: "\u{110A}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C4FF}",
-        nfc: "\u{C4FF}",
-        nfd: "\u{110A}\u{1173}\u{11B6}",
-        nfkc: "\u{C4FF}",
-        nfkd: "\u{110A}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C500}",
-        nfc: "\u{C500}",
-        nfd: "\u{110A}\u{1173}\u{11B7}",
-        nfkc: "\u{C500}",
-        nfkd: "\u{110A}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C501}",
-        nfc: "\u{C501}",
-        nfd: "\u{110A}\u{1173}\u{11B8}",
-        nfkc: "\u{C501}",
-        nfkd: "\u{110A}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C502}",
-        nfc: "\u{C502}",
-        nfd: "\u{110A}\u{1173}\u{11B9}",
-        nfkc: "\u{C502}",
-        nfkd: "\u{110A}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C503}",
-        nfc: "\u{C503}",
-        nfd: "\u{110A}\u{1173}\u{11BA}",
-        nfkc: "\u{C503}",
-        nfkd: "\u{110A}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C504}",
-        nfc: "\u{C504}",
-        nfd: "\u{110A}\u{1173}\u{11BB}",
-        nfkc: "\u{C504}",
-        nfkd: "\u{110A}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C505}",
-        nfc: "\u{C505}",
-        nfd: "\u{110A}\u{1173}\u{11BC}",
-        nfkc: "\u{C505}",
-        nfkd: "\u{110A}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C506}",
-        nfc: "\u{C506}",
-        nfd: "\u{110A}\u{1173}\u{11BD}",
-        nfkc: "\u{C506}",
-        nfkd: "\u{110A}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C507}",
-        nfc: "\u{C507}",
-        nfd: "\u{110A}\u{1173}\u{11BE}",
-        nfkc: "\u{C507}",
-        nfkd: "\u{110A}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C508}",
-        nfc: "\u{C508}",
-        nfd: "\u{110A}\u{1173}\u{11BF}",
-        nfkc: "\u{C508}",
-        nfkd: "\u{110A}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C509}",
-        nfc: "\u{C509}",
-        nfd: "\u{110A}\u{1173}\u{11C0}",
-        nfkc: "\u{C509}",
-        nfkd: "\u{110A}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C50A}",
-        nfc: "\u{C50A}",
-        nfd: "\u{110A}\u{1173}\u{11C1}",
-        nfkc: "\u{C50A}",
-        nfkd: "\u{110A}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C50B}",
-        nfc: "\u{C50B}",
-        nfd: "\u{110A}\u{1173}\u{11C2}",
-        nfkc: "\u{C50B}",
-        nfkd: "\u{110A}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C50C}",
-        nfc: "\u{C50C}",
-        nfd: "\u{110A}\u{1174}",
-        nfkc: "\u{C50C}",
-        nfkd: "\u{110A}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{C50D}",
-        nfc: "\u{C50D}",
-        nfd: "\u{110A}\u{1174}\u{11A8}",
-        nfkc: "\u{C50D}",
-        nfkd: "\u{110A}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C50E}",
-        nfc: "\u{C50E}",
-        nfd: "\u{110A}\u{1174}\u{11A9}",
-        nfkc: "\u{C50E}",
-        nfkd: "\u{110A}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C50F}",
-        nfc: "\u{C50F}",
-        nfd: "\u{110A}\u{1174}\u{11AA}",
-        nfkc: "\u{C50F}",
-        nfkd: "\u{110A}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C510}",
-        nfc: "\u{C510}",
-        nfd: "\u{110A}\u{1174}\u{11AB}",
-        nfkc: "\u{C510}",
-        nfkd: "\u{110A}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C511}",
-        nfc: "\u{C511}",
-        nfd: "\u{110A}\u{1174}\u{11AC}",
-        nfkc: "\u{C511}",
-        nfkd: "\u{110A}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C512}",
-        nfc: "\u{C512}",
-        nfd: "\u{110A}\u{1174}\u{11AD}",
-        nfkc: "\u{C512}",
-        nfkd: "\u{110A}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C513}",
-        nfc: "\u{C513}",
-        nfd: "\u{110A}\u{1174}\u{11AE}",
-        nfkc: "\u{C513}",
-        nfkd: "\u{110A}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C514}",
-        nfc: "\u{C514}",
-        nfd: "\u{110A}\u{1174}\u{11AF}",
-        nfkc: "\u{C514}",
-        nfkd: "\u{110A}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C515}",
-        nfc: "\u{C515}",
-        nfd: "\u{110A}\u{1174}\u{11B0}",
-        nfkc: "\u{C515}",
-        nfkd: "\u{110A}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C516}",
-        nfc: "\u{C516}",
-        nfd: "\u{110A}\u{1174}\u{11B1}",
-        nfkc: "\u{C516}",
-        nfkd: "\u{110A}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C517}",
-        nfc: "\u{C517}",
-        nfd: "\u{110A}\u{1174}\u{11B2}",
-        nfkc: "\u{C517}",
-        nfkd: "\u{110A}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C518}",
-        nfc: "\u{C518}",
-        nfd: "\u{110A}\u{1174}\u{11B3}",
-        nfkc: "\u{C518}",
-        nfkd: "\u{110A}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C519}",
-        nfc: "\u{C519}",
-        nfd: "\u{110A}\u{1174}\u{11B4}",
-        nfkc: "\u{C519}",
-        nfkd: "\u{110A}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C51A}",
-        nfc: "\u{C51A}",
-        nfd: "\u{110A}\u{1174}\u{11B5}",
-        nfkc: "\u{C51A}",
-        nfkd: "\u{110A}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C51B}",
-        nfc: "\u{C51B}",
-        nfd: "\u{110A}\u{1174}\u{11B6}",
-        nfkc: "\u{C51B}",
-        nfkd: "\u{110A}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C51C}",
-        nfc: "\u{C51C}",
-        nfd: "\u{110A}\u{1174}\u{11B7}",
-        nfkc: "\u{C51C}",
-        nfkd: "\u{110A}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C51D}",
-        nfc: "\u{C51D}",
-        nfd: "\u{110A}\u{1174}\u{11B8}",
-        nfkc: "\u{C51D}",
-        nfkd: "\u{110A}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C51E}",
-        nfc: "\u{C51E}",
-        nfd: "\u{110A}\u{1174}\u{11B9}",
-        nfkc: "\u{C51E}",
-        nfkd: "\u{110A}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C51F}",
-        nfc: "\u{C51F}",
-        nfd: "\u{110A}\u{1174}\u{11BA}",
-        nfkc: "\u{C51F}",
-        nfkd: "\u{110A}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C520}",
-        nfc: "\u{C520}",
-        nfd: "\u{110A}\u{1174}\u{11BB}",
-        nfkc: "\u{C520}",
-        nfkd: "\u{110A}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C521}",
-        nfc: "\u{C521}",
-        nfd: "\u{110A}\u{1174}\u{11BC}",
-        nfkc: "\u{C521}",
-        nfkd: "\u{110A}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C522}",
-        nfc: "\u{C522}",
-        nfd: "\u{110A}\u{1174}\u{11BD}",
-        nfkc: "\u{C522}",
-        nfkd: "\u{110A}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C523}",
-        nfc: "\u{C523}",
-        nfd: "\u{110A}\u{1174}\u{11BE}",
-        nfkc: "\u{C523}",
-        nfkd: "\u{110A}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C524}",
-        nfc: "\u{C524}",
-        nfd: "\u{110A}\u{1174}\u{11BF}",
-        nfkc: "\u{C524}",
-        nfkd: "\u{110A}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C525}",
-        nfc: "\u{C525}",
-        nfd: "\u{110A}\u{1174}\u{11C0}",
-        nfkc: "\u{C525}",
-        nfkd: "\u{110A}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C526}",
-        nfc: "\u{C526}",
-        nfd: "\u{110A}\u{1174}\u{11C1}",
-        nfkc: "\u{C526}",
-        nfkd: "\u{110A}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C527}",
-        nfc: "\u{C527}",
-        nfd: "\u{110A}\u{1174}\u{11C2}",
-        nfkc: "\u{C527}",
-        nfkd: "\u{110A}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C528}",
-        nfc: "\u{C528}",
-        nfd: "\u{110A}\u{1175}",
-        nfkc: "\u{C528}",
-        nfkd: "\u{110A}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{C529}",
-        nfc: "\u{C529}",
-        nfd: "\u{110A}\u{1175}\u{11A8}",
-        nfkc: "\u{C529}",
-        nfkd: "\u{110A}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C52A}",
-        nfc: "\u{C52A}",
-        nfd: "\u{110A}\u{1175}\u{11A9}",
-        nfkc: "\u{C52A}",
-        nfkd: "\u{110A}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C52B}",
-        nfc: "\u{C52B}",
-        nfd: "\u{110A}\u{1175}\u{11AA}",
-        nfkc: "\u{C52B}",
-        nfkd: "\u{110A}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C52C}",
-        nfc: "\u{C52C}",
-        nfd: "\u{110A}\u{1175}\u{11AB}",
-        nfkc: "\u{C52C}",
-        nfkd: "\u{110A}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C52D}",
-        nfc: "\u{C52D}",
-        nfd: "\u{110A}\u{1175}\u{11AC}",
-        nfkc: "\u{C52D}",
-        nfkd: "\u{110A}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C52E}",
-        nfc: "\u{C52E}",
-        nfd: "\u{110A}\u{1175}\u{11AD}",
-        nfkc: "\u{C52E}",
-        nfkd: "\u{110A}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C52F}",
-        nfc: "\u{C52F}",
-        nfd: "\u{110A}\u{1175}\u{11AE}",
-        nfkc: "\u{C52F}",
-        nfkd: "\u{110A}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C530}",
-        nfc: "\u{C530}",
-        nfd: "\u{110A}\u{1175}\u{11AF}",
-        nfkc: "\u{C530}",
-        nfkd: "\u{110A}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C531}",
-        nfc: "\u{C531}",
-        nfd: "\u{110A}\u{1175}\u{11B0}",
-        nfkc: "\u{C531}",
-        nfkd: "\u{110A}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C532}",
-        nfc: "\u{C532}",
-        nfd: "\u{110A}\u{1175}\u{11B1}",
-        nfkc: "\u{C532}",
-        nfkd: "\u{110A}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C533}",
-        nfc: "\u{C533}",
-        nfd: "\u{110A}\u{1175}\u{11B2}",
-        nfkc: "\u{C533}",
-        nfkd: "\u{110A}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C534}",
-        nfc: "\u{C534}",
-        nfd: "\u{110A}\u{1175}\u{11B3}",
-        nfkc: "\u{C534}",
-        nfkd: "\u{110A}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C535}",
-        nfc: "\u{C535}",
-        nfd: "\u{110A}\u{1175}\u{11B4}",
-        nfkc: "\u{C535}",
-        nfkd: "\u{110A}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C536}",
-        nfc: "\u{C536}",
-        nfd: "\u{110A}\u{1175}\u{11B5}",
-        nfkc: "\u{C536}",
-        nfkd: "\u{110A}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C537}",
-        nfc: "\u{C537}",
-        nfd: "\u{110A}\u{1175}\u{11B6}",
-        nfkc: "\u{C537}",
-        nfkd: "\u{110A}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C538}",
-        nfc: "\u{C538}",
-        nfd: "\u{110A}\u{1175}\u{11B7}",
-        nfkc: "\u{C538}",
-        nfkd: "\u{110A}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C539}",
-        nfc: "\u{C539}",
-        nfd: "\u{110A}\u{1175}\u{11B8}",
-        nfkc: "\u{C539}",
-        nfkd: "\u{110A}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C53A}",
-        nfc: "\u{C53A}",
-        nfd: "\u{110A}\u{1175}\u{11B9}",
-        nfkc: "\u{C53A}",
-        nfkd: "\u{110A}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C53B}",
-        nfc: "\u{C53B}",
-        nfd: "\u{110A}\u{1175}\u{11BA}",
-        nfkc: "\u{C53B}",
-        nfkd: "\u{110A}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C53C}",
-        nfc: "\u{C53C}",
-        nfd: "\u{110A}\u{1175}\u{11BB}",
-        nfkc: "\u{C53C}",
-        nfkd: "\u{110A}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C53D}",
-        nfc: "\u{C53D}",
-        nfd: "\u{110A}\u{1175}\u{11BC}",
-        nfkc: "\u{C53D}",
-        nfkd: "\u{110A}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C53E}",
-        nfc: "\u{C53E}",
-        nfd: "\u{110A}\u{1175}\u{11BD}",
-        nfkc: "\u{C53E}",
-        nfkd: "\u{110A}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C53F}",
-        nfc: "\u{C53F}",
-        nfd: "\u{110A}\u{1175}\u{11BE}",
-        nfkc: "\u{C53F}",
-        nfkd: "\u{110A}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C540}",
-        nfc: "\u{C540}",
-        nfd: "\u{110A}\u{1175}\u{11BF}",
-        nfkc: "\u{C540}",
-        nfkd: "\u{110A}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C541}",
-        nfc: "\u{C541}",
-        nfd: "\u{110A}\u{1175}\u{11C0}",
-        nfkc: "\u{C541}",
-        nfkd: "\u{110A}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C542}",
-        nfc: "\u{C542}",
-        nfd: "\u{110A}\u{1175}\u{11C1}",
-        nfkc: "\u{C542}",
-        nfkd: "\u{110A}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C543}",
-        nfc: "\u{C543}",
-        nfd: "\u{110A}\u{1175}\u{11C2}",
-        nfkc: "\u{C543}",
-        nfkd: "\u{110A}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C544}",
-        nfc: "\u{C544}",
-        nfd: "\u{110B}\u{1161}",
-        nfkc: "\u{C544}",
-        nfkd: "\u{110B}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{C545}",
-        nfc: "\u{C545}",
-        nfd: "\u{110B}\u{1161}\u{11A8}",
-        nfkc: "\u{C545}",
-        nfkd: "\u{110B}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C546}",
-        nfc: "\u{C546}",
-        nfd: "\u{110B}\u{1161}\u{11A9}",
-        nfkc: "\u{C546}",
-        nfkd: "\u{110B}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C547}",
-        nfc: "\u{C547}",
-        nfd: "\u{110B}\u{1161}\u{11AA}",
-        nfkc: "\u{C547}",
-        nfkd: "\u{110B}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C548}",
-        nfc: "\u{C548}",
-        nfd: "\u{110B}\u{1161}\u{11AB}",
-        nfkc: "\u{C548}",
-        nfkd: "\u{110B}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C549}",
-        nfc: "\u{C549}",
-        nfd: "\u{110B}\u{1161}\u{11AC}",
-        nfkc: "\u{C549}",
-        nfkd: "\u{110B}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C54A}",
-        nfc: "\u{C54A}",
-        nfd: "\u{110B}\u{1161}\u{11AD}",
-        nfkc: "\u{C54A}",
-        nfkd: "\u{110B}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C54B}",
-        nfc: "\u{C54B}",
-        nfd: "\u{110B}\u{1161}\u{11AE}",
-        nfkc: "\u{C54B}",
-        nfkd: "\u{110B}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C54C}",
-        nfc: "\u{C54C}",
-        nfd: "\u{110B}\u{1161}\u{11AF}",
-        nfkc: "\u{C54C}",
-        nfkd: "\u{110B}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C54D}",
-        nfc: "\u{C54D}",
-        nfd: "\u{110B}\u{1161}\u{11B0}",
-        nfkc: "\u{C54D}",
-        nfkd: "\u{110B}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C54E}",
-        nfc: "\u{C54E}",
-        nfd: "\u{110B}\u{1161}\u{11B1}",
-        nfkc: "\u{C54E}",
-        nfkd: "\u{110B}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C54F}",
-        nfc: "\u{C54F}",
-        nfd: "\u{110B}\u{1161}\u{11B2}",
-        nfkc: "\u{C54F}",
-        nfkd: "\u{110B}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C550}",
-        nfc: "\u{C550}",
-        nfd: "\u{110B}\u{1161}\u{11B3}",
-        nfkc: "\u{C550}",
-        nfkd: "\u{110B}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C551}",
-        nfc: "\u{C551}",
-        nfd: "\u{110B}\u{1161}\u{11B4}",
-        nfkc: "\u{C551}",
-        nfkd: "\u{110B}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C552}",
-        nfc: "\u{C552}",
-        nfd: "\u{110B}\u{1161}\u{11B5}",
-        nfkc: "\u{C552}",
-        nfkd: "\u{110B}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C553}",
-        nfc: "\u{C553}",
-        nfd: "\u{110B}\u{1161}\u{11B6}",
-        nfkc: "\u{C553}",
-        nfkd: "\u{110B}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C554}",
-        nfc: "\u{C554}",
-        nfd: "\u{110B}\u{1161}\u{11B7}",
-        nfkc: "\u{C554}",
-        nfkd: "\u{110B}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C555}",
-        nfc: "\u{C555}",
-        nfd: "\u{110B}\u{1161}\u{11B8}",
-        nfkc: "\u{C555}",
-        nfkd: "\u{110B}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C556}",
-        nfc: "\u{C556}",
-        nfd: "\u{110B}\u{1161}\u{11B9}",
-        nfkc: "\u{C556}",
-        nfkd: "\u{110B}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C557}",
-        nfc: "\u{C557}",
-        nfd: "\u{110B}\u{1161}\u{11BA}",
-        nfkc: "\u{C557}",
-        nfkd: "\u{110B}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C558}",
-        nfc: "\u{C558}",
-        nfd: "\u{110B}\u{1161}\u{11BB}",
-        nfkc: "\u{C558}",
-        nfkd: "\u{110B}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C559}",
-        nfc: "\u{C559}",
-        nfd: "\u{110B}\u{1161}\u{11BC}",
-        nfkc: "\u{C559}",
-        nfkd: "\u{110B}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C55A}",
-        nfc: "\u{C55A}",
-        nfd: "\u{110B}\u{1161}\u{11BD}",
-        nfkc: "\u{C55A}",
-        nfkd: "\u{110B}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C55B}",
-        nfc: "\u{C55B}",
-        nfd: "\u{110B}\u{1161}\u{11BE}",
-        nfkc: "\u{C55B}",
-        nfkd: "\u{110B}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C55C}",
-        nfc: "\u{C55C}",
-        nfd: "\u{110B}\u{1161}\u{11BF}",
-        nfkc: "\u{C55C}",
-        nfkd: "\u{110B}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C55D}",
-        nfc: "\u{C55D}",
-        nfd: "\u{110B}\u{1161}\u{11C0}",
-        nfkc: "\u{C55D}",
-        nfkd: "\u{110B}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C55E}",
-        nfc: "\u{C55E}",
-        nfd: "\u{110B}\u{1161}\u{11C1}",
-        nfkc: "\u{C55E}",
-        nfkd: "\u{110B}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C55F}",
-        nfc: "\u{C55F}",
-        nfd: "\u{110B}\u{1161}\u{11C2}",
-        nfkc: "\u{C55F}",
-        nfkd: "\u{110B}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C560}",
-        nfc: "\u{C560}",
-        nfd: "\u{110B}\u{1162}",
-        nfkc: "\u{C560}",
-        nfkd: "\u{110B}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{C561}",
-        nfc: "\u{C561}",
-        nfd: "\u{110B}\u{1162}\u{11A8}",
-        nfkc: "\u{C561}",
-        nfkd: "\u{110B}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C562}",
-        nfc: "\u{C562}",
-        nfd: "\u{110B}\u{1162}\u{11A9}",
-        nfkc: "\u{C562}",
-        nfkd: "\u{110B}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C563}",
-        nfc: "\u{C563}",
-        nfd: "\u{110B}\u{1162}\u{11AA}",
-        nfkc: "\u{C563}",
-        nfkd: "\u{110B}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C564}",
-        nfc: "\u{C564}",
-        nfd: "\u{110B}\u{1162}\u{11AB}",
-        nfkc: "\u{C564}",
-        nfkd: "\u{110B}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C565}",
-        nfc: "\u{C565}",
-        nfd: "\u{110B}\u{1162}\u{11AC}",
-        nfkc: "\u{C565}",
-        nfkd: "\u{110B}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C566}",
-        nfc: "\u{C566}",
-        nfd: "\u{110B}\u{1162}\u{11AD}",
-        nfkc: "\u{C566}",
-        nfkd: "\u{110B}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C567}",
-        nfc: "\u{C567}",
-        nfd: "\u{110B}\u{1162}\u{11AE}",
-        nfkc: "\u{C567}",
-        nfkd: "\u{110B}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C568}",
-        nfc: "\u{C568}",
-        nfd: "\u{110B}\u{1162}\u{11AF}",
-        nfkc: "\u{C568}",
-        nfkd: "\u{110B}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C569}",
-        nfc: "\u{C569}",
-        nfd: "\u{110B}\u{1162}\u{11B0}",
-        nfkc: "\u{C569}",
-        nfkd: "\u{110B}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C56A}",
-        nfc: "\u{C56A}",
-        nfd: "\u{110B}\u{1162}\u{11B1}",
-        nfkc: "\u{C56A}",
-        nfkd: "\u{110B}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C56B}",
-        nfc: "\u{C56B}",
-        nfd: "\u{110B}\u{1162}\u{11B2}",
-        nfkc: "\u{C56B}",
-        nfkd: "\u{110B}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C56C}",
-        nfc: "\u{C56C}",
-        nfd: "\u{110B}\u{1162}\u{11B3}",
-        nfkc: "\u{C56C}",
-        nfkd: "\u{110B}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C56D}",
-        nfc: "\u{C56D}",
-        nfd: "\u{110B}\u{1162}\u{11B4}",
-        nfkc: "\u{C56D}",
-        nfkd: "\u{110B}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C56E}",
-        nfc: "\u{C56E}",
-        nfd: "\u{110B}\u{1162}\u{11B5}",
-        nfkc: "\u{C56E}",
-        nfkd: "\u{110B}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C56F}",
-        nfc: "\u{C56F}",
-        nfd: "\u{110B}\u{1162}\u{11B6}",
-        nfkc: "\u{C56F}",
-        nfkd: "\u{110B}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C570}",
-        nfc: "\u{C570}",
-        nfd: "\u{110B}\u{1162}\u{11B7}",
-        nfkc: "\u{C570}",
-        nfkd: "\u{110B}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C571}",
-        nfc: "\u{C571}",
-        nfd: "\u{110B}\u{1162}\u{11B8}",
-        nfkc: "\u{C571}",
-        nfkd: "\u{110B}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C572}",
-        nfc: "\u{C572}",
-        nfd: "\u{110B}\u{1162}\u{11B9}",
-        nfkc: "\u{C572}",
-        nfkd: "\u{110B}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C573}",
-        nfc: "\u{C573}",
-        nfd: "\u{110B}\u{1162}\u{11BA}",
-        nfkc: "\u{C573}",
-        nfkd: "\u{110B}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C574}",
-        nfc: "\u{C574}",
-        nfd: "\u{110B}\u{1162}\u{11BB}",
-        nfkc: "\u{C574}",
-        nfkd: "\u{110B}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C575}",
-        nfc: "\u{C575}",
-        nfd: "\u{110B}\u{1162}\u{11BC}",
-        nfkc: "\u{C575}",
-        nfkd: "\u{110B}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C576}",
-        nfc: "\u{C576}",
-        nfd: "\u{110B}\u{1162}\u{11BD}",
-        nfkc: "\u{C576}",
-        nfkd: "\u{110B}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C577}",
-        nfc: "\u{C577}",
-        nfd: "\u{110B}\u{1162}\u{11BE}",
-        nfkc: "\u{C577}",
-        nfkd: "\u{110B}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C578}",
-        nfc: "\u{C578}",
-        nfd: "\u{110B}\u{1162}\u{11BF}",
-        nfkc: "\u{C578}",
-        nfkd: "\u{110B}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C579}",
-        nfc: "\u{C579}",
-        nfd: "\u{110B}\u{1162}\u{11C0}",
-        nfkc: "\u{C579}",
-        nfkd: "\u{110B}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C57A}",
-        nfc: "\u{C57A}",
-        nfd: "\u{110B}\u{1162}\u{11C1}",
-        nfkc: "\u{C57A}",
-        nfkd: "\u{110B}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C57B}",
-        nfc: "\u{C57B}",
-        nfd: "\u{110B}\u{1162}\u{11C2}",
-        nfkc: "\u{C57B}",
-        nfkd: "\u{110B}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C57C}",
-        nfc: "\u{C57C}",
-        nfd: "\u{110B}\u{1163}",
-        nfkc: "\u{C57C}",
-        nfkd: "\u{110B}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{C57D}",
-        nfc: "\u{C57D}",
-        nfd: "\u{110B}\u{1163}\u{11A8}",
-        nfkc: "\u{C57D}",
-        nfkd: "\u{110B}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C57E}",
-        nfc: "\u{C57E}",
-        nfd: "\u{110B}\u{1163}\u{11A9}",
-        nfkc: "\u{C57E}",
-        nfkd: "\u{110B}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C57F}",
-        nfc: "\u{C57F}",
-        nfd: "\u{110B}\u{1163}\u{11AA}",
-        nfkc: "\u{C57F}",
-        nfkd: "\u{110B}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C580}",
-        nfc: "\u{C580}",
-        nfd: "\u{110B}\u{1163}\u{11AB}",
-        nfkc: "\u{C580}",
-        nfkd: "\u{110B}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C581}",
-        nfc: "\u{C581}",
-        nfd: "\u{110B}\u{1163}\u{11AC}",
-        nfkc: "\u{C581}",
-        nfkd: "\u{110B}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C582}",
-        nfc: "\u{C582}",
-        nfd: "\u{110B}\u{1163}\u{11AD}",
-        nfkc: "\u{C582}",
-        nfkd: "\u{110B}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C583}",
-        nfc: "\u{C583}",
-        nfd: "\u{110B}\u{1163}\u{11AE}",
-        nfkc: "\u{C583}",
-        nfkd: "\u{110B}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C584}",
-        nfc: "\u{C584}",
-        nfd: "\u{110B}\u{1163}\u{11AF}",
-        nfkc: "\u{C584}",
-        nfkd: "\u{110B}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C585}",
-        nfc: "\u{C585}",
-        nfd: "\u{110B}\u{1163}\u{11B0}",
-        nfkc: "\u{C585}",
-        nfkd: "\u{110B}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C586}",
-        nfc: "\u{C586}",
-        nfd: "\u{110B}\u{1163}\u{11B1}",
-        nfkc: "\u{C586}",
-        nfkd: "\u{110B}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C587}",
-        nfc: "\u{C587}",
-        nfd: "\u{110B}\u{1163}\u{11B2}",
-        nfkc: "\u{C587}",
-        nfkd: "\u{110B}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C588}",
-        nfc: "\u{C588}",
-        nfd: "\u{110B}\u{1163}\u{11B3}",
-        nfkc: "\u{C588}",
-        nfkd: "\u{110B}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C589}",
-        nfc: "\u{C589}",
-        nfd: "\u{110B}\u{1163}\u{11B4}",
-        nfkc: "\u{C589}",
-        nfkd: "\u{110B}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C58A}",
-        nfc: "\u{C58A}",
-        nfd: "\u{110B}\u{1163}\u{11B5}",
-        nfkc: "\u{C58A}",
-        nfkd: "\u{110B}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C58B}",
-        nfc: "\u{C58B}",
-        nfd: "\u{110B}\u{1163}\u{11B6}",
-        nfkc: "\u{C58B}",
-        nfkd: "\u{110B}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C58C}",
-        nfc: "\u{C58C}",
-        nfd: "\u{110B}\u{1163}\u{11B7}",
-        nfkc: "\u{C58C}",
-        nfkd: "\u{110B}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C58D}",
-        nfc: "\u{C58D}",
-        nfd: "\u{110B}\u{1163}\u{11B8}",
-        nfkc: "\u{C58D}",
-        nfkd: "\u{110B}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C58E}",
-        nfc: "\u{C58E}",
-        nfd: "\u{110B}\u{1163}\u{11B9}",
-        nfkc: "\u{C58E}",
-        nfkd: "\u{110B}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C58F}",
-        nfc: "\u{C58F}",
-        nfd: "\u{110B}\u{1163}\u{11BA}",
-        nfkc: "\u{C58F}",
-        nfkd: "\u{110B}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C590}",
-        nfc: "\u{C590}",
-        nfd: "\u{110B}\u{1163}\u{11BB}",
-        nfkc: "\u{C590}",
-        nfkd: "\u{110B}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C591}",
-        nfc: "\u{C591}",
-        nfd: "\u{110B}\u{1163}\u{11BC}",
-        nfkc: "\u{C591}",
-        nfkd: "\u{110B}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C592}",
-        nfc: "\u{C592}",
-        nfd: "\u{110B}\u{1163}\u{11BD}",
-        nfkc: "\u{C592}",
-        nfkd: "\u{110B}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C593}",
-        nfc: "\u{C593}",
-        nfd: "\u{110B}\u{1163}\u{11BE}",
-        nfkc: "\u{C593}",
-        nfkd: "\u{110B}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C594}",
-        nfc: "\u{C594}",
-        nfd: "\u{110B}\u{1163}\u{11BF}",
-        nfkc: "\u{C594}",
-        nfkd: "\u{110B}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C595}",
-        nfc: "\u{C595}",
-        nfd: "\u{110B}\u{1163}\u{11C0}",
-        nfkc: "\u{C595}",
-        nfkd: "\u{110B}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C596}",
-        nfc: "\u{C596}",
-        nfd: "\u{110B}\u{1163}\u{11C1}",
-        nfkc: "\u{C596}",
-        nfkd: "\u{110B}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C597}",
-        nfc: "\u{C597}",
-        nfd: "\u{110B}\u{1163}\u{11C2}",
-        nfkc: "\u{C597}",
-        nfkd: "\u{110B}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C598}",
-        nfc: "\u{C598}",
-        nfd: "\u{110B}\u{1164}",
-        nfkc: "\u{C598}",
-        nfkd: "\u{110B}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{C599}",
-        nfc: "\u{C599}",
-        nfd: "\u{110B}\u{1164}\u{11A8}",
-        nfkc: "\u{C599}",
-        nfkd: "\u{110B}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C59A}",
-        nfc: "\u{C59A}",
-        nfd: "\u{110B}\u{1164}\u{11A9}",
-        nfkc: "\u{C59A}",
-        nfkd: "\u{110B}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C59B}",
-        nfc: "\u{C59B}",
-        nfd: "\u{110B}\u{1164}\u{11AA}",
-        nfkc: "\u{C59B}",
-        nfkd: "\u{110B}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C59C}",
-        nfc: "\u{C59C}",
-        nfd: "\u{110B}\u{1164}\u{11AB}",
-        nfkc: "\u{C59C}",
-        nfkd: "\u{110B}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C59D}",
-        nfc: "\u{C59D}",
-        nfd: "\u{110B}\u{1164}\u{11AC}",
-        nfkc: "\u{C59D}",
-        nfkd: "\u{110B}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C59E}",
-        nfc: "\u{C59E}",
-        nfd: "\u{110B}\u{1164}\u{11AD}",
-        nfkc: "\u{C59E}",
-        nfkd: "\u{110B}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C59F}",
-        nfc: "\u{C59F}",
-        nfd: "\u{110B}\u{1164}\u{11AE}",
-        nfkc: "\u{C59F}",
-        nfkd: "\u{110B}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C5A0}",
-        nfc: "\u{C5A0}",
-        nfd: "\u{110B}\u{1164}\u{11AF}",
-        nfkc: "\u{C5A0}",
-        nfkd: "\u{110B}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C5A1}",
-        nfc: "\u{C5A1}",
-        nfd: "\u{110B}\u{1164}\u{11B0}",
-        nfkc: "\u{C5A1}",
-        nfkd: "\u{110B}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C5A2}",
-        nfc: "\u{C5A2}",
-        nfd: "\u{110B}\u{1164}\u{11B1}",
-        nfkc: "\u{C5A2}",
-        nfkd: "\u{110B}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C5A3}",
-        nfc: "\u{C5A3}",
-        nfd: "\u{110B}\u{1164}\u{11B2}",
-        nfkc: "\u{C5A3}",
-        nfkd: "\u{110B}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C5A4}",
-        nfc: "\u{C5A4}",
-        nfd: "\u{110B}\u{1164}\u{11B3}",
-        nfkc: "\u{C5A4}",
-        nfkd: "\u{110B}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C5A5}",
-        nfc: "\u{C5A5}",
-        nfd: "\u{110B}\u{1164}\u{11B4}",
-        nfkc: "\u{C5A5}",
-        nfkd: "\u{110B}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C5A6}",
-        nfc: "\u{C5A6}",
-        nfd: "\u{110B}\u{1164}\u{11B5}",
-        nfkc: "\u{C5A6}",
-        nfkd: "\u{110B}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C5A7}",
-        nfc: "\u{C5A7}",
-        nfd: "\u{110B}\u{1164}\u{11B6}",
-        nfkc: "\u{C5A7}",
-        nfkd: "\u{110B}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C5A8}",
-        nfc: "\u{C5A8}",
-        nfd: "\u{110B}\u{1164}\u{11B7}",
-        nfkc: "\u{C5A8}",
-        nfkd: "\u{110B}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C5A9}",
-        nfc: "\u{C5A9}",
-        nfd: "\u{110B}\u{1164}\u{11B8}",
-        nfkc: "\u{C5A9}",
-        nfkd: "\u{110B}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C5AA}",
-        nfc: "\u{C5AA}",
-        nfd: "\u{110B}\u{1164}\u{11B9}",
-        nfkc: "\u{C5AA}",
-        nfkd: "\u{110B}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C5AB}",
-        nfc: "\u{C5AB}",
-        nfd: "\u{110B}\u{1164}\u{11BA}",
-        nfkc: "\u{C5AB}",
-        nfkd: "\u{110B}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C5AC}",
-        nfc: "\u{C5AC}",
-        nfd: "\u{110B}\u{1164}\u{11BB}",
-        nfkc: "\u{C5AC}",
-        nfkd: "\u{110B}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C5AD}",
-        nfc: "\u{C5AD}",
-        nfd: "\u{110B}\u{1164}\u{11BC}",
-        nfkc: "\u{C5AD}",
-        nfkd: "\u{110B}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C5AE}",
-        nfc: "\u{C5AE}",
-        nfd: "\u{110B}\u{1164}\u{11BD}",
-        nfkc: "\u{C5AE}",
-        nfkd: "\u{110B}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C5AF}",
-        nfc: "\u{C5AF}",
-        nfd: "\u{110B}\u{1164}\u{11BE}",
-        nfkc: "\u{C5AF}",
-        nfkd: "\u{110B}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C5B0}",
-        nfc: "\u{C5B0}",
-        nfd: "\u{110B}\u{1164}\u{11BF}",
-        nfkc: "\u{C5B0}",
-        nfkd: "\u{110B}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C5B1}",
-        nfc: "\u{C5B1}",
-        nfd: "\u{110B}\u{1164}\u{11C0}",
-        nfkc: "\u{C5B1}",
-        nfkd: "\u{110B}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C5B2}",
-        nfc: "\u{C5B2}",
-        nfd: "\u{110B}\u{1164}\u{11C1}",
-        nfkc: "\u{C5B2}",
-        nfkd: "\u{110B}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C5B3}",
-        nfc: "\u{C5B3}",
-        nfd: "\u{110B}\u{1164}\u{11C2}",
-        nfkc: "\u{C5B3}",
-        nfkd: "\u{110B}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C5B4}",
-        nfc: "\u{C5B4}",
-        nfd: "\u{110B}\u{1165}",
-        nfkc: "\u{C5B4}",
-        nfkd: "\u{110B}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{C5B5}",
-        nfc: "\u{C5B5}",
-        nfd: "\u{110B}\u{1165}\u{11A8}",
-        nfkc: "\u{C5B5}",
-        nfkd: "\u{110B}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C5B6}",
-        nfc: "\u{C5B6}",
-        nfd: "\u{110B}\u{1165}\u{11A9}",
-        nfkc: "\u{C5B6}",
-        nfkd: "\u{110B}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C5B7}",
-        nfc: "\u{C5B7}",
-        nfd: "\u{110B}\u{1165}\u{11AA}",
-        nfkc: "\u{C5B7}",
-        nfkd: "\u{110B}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C5B8}",
-        nfc: "\u{C5B8}",
-        nfd: "\u{110B}\u{1165}\u{11AB}",
-        nfkc: "\u{C5B8}",
-        nfkd: "\u{110B}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C5B9}",
-        nfc: "\u{C5B9}",
-        nfd: "\u{110B}\u{1165}\u{11AC}",
-        nfkc: "\u{C5B9}",
-        nfkd: "\u{110B}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C5BA}",
-        nfc: "\u{C5BA}",
-        nfd: "\u{110B}\u{1165}\u{11AD}",
-        nfkc: "\u{C5BA}",
-        nfkd: "\u{110B}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C5BB}",
-        nfc: "\u{C5BB}",
-        nfd: "\u{110B}\u{1165}\u{11AE}",
-        nfkc: "\u{C5BB}",
-        nfkd: "\u{110B}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C5BC}",
-        nfc: "\u{C5BC}",
-        nfd: "\u{110B}\u{1165}\u{11AF}",
-        nfkc: "\u{C5BC}",
-        nfkd: "\u{110B}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C5BD}",
-        nfc: "\u{C5BD}",
-        nfd: "\u{110B}\u{1165}\u{11B0}",
-        nfkc: "\u{C5BD}",
-        nfkd: "\u{110B}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C5BE}",
-        nfc: "\u{C5BE}",
-        nfd: "\u{110B}\u{1165}\u{11B1}",
-        nfkc: "\u{C5BE}",
-        nfkd: "\u{110B}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C5BF}",
-        nfc: "\u{C5BF}",
-        nfd: "\u{110B}\u{1165}\u{11B2}",
-        nfkc: "\u{C5BF}",
-        nfkd: "\u{110B}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C5C0}",
-        nfc: "\u{C5C0}",
-        nfd: "\u{110B}\u{1165}\u{11B3}",
-        nfkc: "\u{C5C0}",
-        nfkd: "\u{110B}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C5C1}",
-        nfc: "\u{C5C1}",
-        nfd: "\u{110B}\u{1165}\u{11B4}",
-        nfkc: "\u{C5C1}",
-        nfkd: "\u{110B}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C5C2}",
-        nfc: "\u{C5C2}",
-        nfd: "\u{110B}\u{1165}\u{11B5}",
-        nfkc: "\u{C5C2}",
-        nfkd: "\u{110B}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C5C3}",
-        nfc: "\u{C5C3}",
-        nfd: "\u{110B}\u{1165}\u{11B6}",
-        nfkc: "\u{C5C3}",
-        nfkd: "\u{110B}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C5C4}",
-        nfc: "\u{C5C4}",
-        nfd: "\u{110B}\u{1165}\u{11B7}",
-        nfkc: "\u{C5C4}",
-        nfkd: "\u{110B}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C5C5}",
-        nfc: "\u{C5C5}",
-        nfd: "\u{110B}\u{1165}\u{11B8}",
-        nfkc: "\u{C5C5}",
-        nfkd: "\u{110B}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C5C6}",
-        nfc: "\u{C5C6}",
-        nfd: "\u{110B}\u{1165}\u{11B9}",
-        nfkc: "\u{C5C6}",
-        nfkd: "\u{110B}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C5C7}",
-        nfc: "\u{C5C7}",
-        nfd: "\u{110B}\u{1165}\u{11BA}",
-        nfkc: "\u{C5C7}",
-        nfkd: "\u{110B}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C5C8}",
-        nfc: "\u{C5C8}",
-        nfd: "\u{110B}\u{1165}\u{11BB}",
-        nfkc: "\u{C5C8}",
-        nfkd: "\u{110B}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C5C9}",
-        nfc: "\u{C5C9}",
-        nfd: "\u{110B}\u{1165}\u{11BC}",
-        nfkc: "\u{C5C9}",
-        nfkd: "\u{110B}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C5CA}",
-        nfc: "\u{C5CA}",
-        nfd: "\u{110B}\u{1165}\u{11BD}",
-        nfkc: "\u{C5CA}",
-        nfkd: "\u{110B}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C5CB}",
-        nfc: "\u{C5CB}",
-        nfd: "\u{110B}\u{1165}\u{11BE}",
-        nfkc: "\u{C5CB}",
-        nfkd: "\u{110B}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C5CC}",
-        nfc: "\u{C5CC}",
-        nfd: "\u{110B}\u{1165}\u{11BF}",
-        nfkc: "\u{C5CC}",
-        nfkd: "\u{110B}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C5CD}",
-        nfc: "\u{C5CD}",
-        nfd: "\u{110B}\u{1165}\u{11C0}",
-        nfkc: "\u{C5CD}",
-        nfkd: "\u{110B}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C5CE}",
-        nfc: "\u{C5CE}",
-        nfd: "\u{110B}\u{1165}\u{11C1}",
-        nfkc: "\u{C5CE}",
-        nfkd: "\u{110B}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C5CF}",
-        nfc: "\u{C5CF}",
-        nfd: "\u{110B}\u{1165}\u{11C2}",
-        nfkc: "\u{C5CF}",
-        nfkd: "\u{110B}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C5D0}",
-        nfc: "\u{C5D0}",
-        nfd: "\u{110B}\u{1166}",
-        nfkc: "\u{C5D0}",
-        nfkd: "\u{110B}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{C5D1}",
-        nfc: "\u{C5D1}",
-        nfd: "\u{110B}\u{1166}\u{11A8}",
-        nfkc: "\u{C5D1}",
-        nfkd: "\u{110B}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C5D2}",
-        nfc: "\u{C5D2}",
-        nfd: "\u{110B}\u{1166}\u{11A9}",
-        nfkc: "\u{C5D2}",
-        nfkd: "\u{110B}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C5D3}",
-        nfc: "\u{C5D3}",
-        nfd: "\u{110B}\u{1166}\u{11AA}",
-        nfkc: "\u{C5D3}",
-        nfkd: "\u{110B}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C5D4}",
-        nfc: "\u{C5D4}",
-        nfd: "\u{110B}\u{1166}\u{11AB}",
-        nfkc: "\u{C5D4}",
-        nfkd: "\u{110B}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C5D5}",
-        nfc: "\u{C5D5}",
-        nfd: "\u{110B}\u{1166}\u{11AC}",
-        nfkc: "\u{C5D5}",
-        nfkd: "\u{110B}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C5D6}",
-        nfc: "\u{C5D6}",
-        nfd: "\u{110B}\u{1166}\u{11AD}",
-        nfkc: "\u{C5D6}",
-        nfkd: "\u{110B}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C5D7}",
-        nfc: "\u{C5D7}",
-        nfd: "\u{110B}\u{1166}\u{11AE}",
-        nfkc: "\u{C5D7}",
-        nfkd: "\u{110B}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C5D8}",
-        nfc: "\u{C5D8}",
-        nfd: "\u{110B}\u{1166}\u{11AF}",
-        nfkc: "\u{C5D8}",
-        nfkd: "\u{110B}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C5D9}",
-        nfc: "\u{C5D9}",
-        nfd: "\u{110B}\u{1166}\u{11B0}",
-        nfkc: "\u{C5D9}",
-        nfkd: "\u{110B}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C5DA}",
-        nfc: "\u{C5DA}",
-        nfd: "\u{110B}\u{1166}\u{11B1}",
-        nfkc: "\u{C5DA}",
-        nfkd: "\u{110B}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C5DB}",
-        nfc: "\u{C5DB}",
-        nfd: "\u{110B}\u{1166}\u{11B2}",
-        nfkc: "\u{C5DB}",
-        nfkd: "\u{110B}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C5DC}",
-        nfc: "\u{C5DC}",
-        nfd: "\u{110B}\u{1166}\u{11B3}",
-        nfkc: "\u{C5DC}",
-        nfkd: "\u{110B}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C5DD}",
-        nfc: "\u{C5DD}",
-        nfd: "\u{110B}\u{1166}\u{11B4}",
-        nfkc: "\u{C5DD}",
-        nfkd: "\u{110B}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C5DE}",
-        nfc: "\u{C5DE}",
-        nfd: "\u{110B}\u{1166}\u{11B5}",
-        nfkc: "\u{C5DE}",
-        nfkd: "\u{110B}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C5DF}",
-        nfc: "\u{C5DF}",
-        nfd: "\u{110B}\u{1166}\u{11B6}",
-        nfkc: "\u{C5DF}",
-        nfkd: "\u{110B}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C5E0}",
-        nfc: "\u{C5E0}",
-        nfd: "\u{110B}\u{1166}\u{11B7}",
-        nfkc: "\u{C5E0}",
-        nfkd: "\u{110B}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C5E1}",
-        nfc: "\u{C5E1}",
-        nfd: "\u{110B}\u{1166}\u{11B8}",
-        nfkc: "\u{C5E1}",
-        nfkd: "\u{110B}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C5E2}",
-        nfc: "\u{C5E2}",
-        nfd: "\u{110B}\u{1166}\u{11B9}",
-        nfkc: "\u{C5E2}",
-        nfkd: "\u{110B}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C5E3}",
-        nfc: "\u{C5E3}",
-        nfd: "\u{110B}\u{1166}\u{11BA}",
-        nfkc: "\u{C5E3}",
-        nfkd: "\u{110B}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C5E4}",
-        nfc: "\u{C5E4}",
-        nfd: "\u{110B}\u{1166}\u{11BB}",
-        nfkc: "\u{C5E4}",
-        nfkd: "\u{110B}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C5E5}",
-        nfc: "\u{C5E5}",
-        nfd: "\u{110B}\u{1166}\u{11BC}",
-        nfkc: "\u{C5E5}",
-        nfkd: "\u{110B}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C5E6}",
-        nfc: "\u{C5E6}",
-        nfd: "\u{110B}\u{1166}\u{11BD}",
-        nfkc: "\u{C5E6}",
-        nfkd: "\u{110B}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C5E7}",
-        nfc: "\u{C5E7}",
-        nfd: "\u{110B}\u{1166}\u{11BE}",
-        nfkc: "\u{C5E7}",
-        nfkd: "\u{110B}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C5E8}",
-        nfc: "\u{C5E8}",
-        nfd: "\u{110B}\u{1166}\u{11BF}",
-        nfkc: "\u{C5E8}",
-        nfkd: "\u{110B}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C5E9}",
-        nfc: "\u{C5E9}",
-        nfd: "\u{110B}\u{1166}\u{11C0}",
-        nfkc: "\u{C5E9}",
-        nfkd: "\u{110B}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C5EA}",
-        nfc: "\u{C5EA}",
-        nfd: "\u{110B}\u{1166}\u{11C1}",
-        nfkc: "\u{C5EA}",
-        nfkd: "\u{110B}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C5EB}",
-        nfc: "\u{C5EB}",
-        nfd: "\u{110B}\u{1166}\u{11C2}",
-        nfkc: "\u{C5EB}",
-        nfkd: "\u{110B}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C5EC}",
-        nfc: "\u{C5EC}",
-        nfd: "\u{110B}\u{1167}",
-        nfkc: "\u{C5EC}",
-        nfkd: "\u{110B}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{C5ED}",
-        nfc: "\u{C5ED}",
-        nfd: "\u{110B}\u{1167}\u{11A8}",
-        nfkc: "\u{C5ED}",
-        nfkd: "\u{110B}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C5EE}",
-        nfc: "\u{C5EE}",
-        nfd: "\u{110B}\u{1167}\u{11A9}",
-        nfkc: "\u{C5EE}",
-        nfkd: "\u{110B}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C5EF}",
-        nfc: "\u{C5EF}",
-        nfd: "\u{110B}\u{1167}\u{11AA}",
-        nfkc: "\u{C5EF}",
-        nfkd: "\u{110B}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C5F0}",
-        nfc: "\u{C5F0}",
-        nfd: "\u{110B}\u{1167}\u{11AB}",
-        nfkc: "\u{C5F0}",
-        nfkd: "\u{110B}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C5F1}",
-        nfc: "\u{C5F1}",
-        nfd: "\u{110B}\u{1167}\u{11AC}",
-        nfkc: "\u{C5F1}",
-        nfkd: "\u{110B}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C5F2}",
-        nfc: "\u{C5F2}",
-        nfd: "\u{110B}\u{1167}\u{11AD}",
-        nfkc: "\u{C5F2}",
-        nfkd: "\u{110B}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C5F3}",
-        nfc: "\u{C5F3}",
-        nfd: "\u{110B}\u{1167}\u{11AE}",
-        nfkc: "\u{C5F3}",
-        nfkd: "\u{110B}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C5F4}",
-        nfc: "\u{C5F4}",
-        nfd: "\u{110B}\u{1167}\u{11AF}",
-        nfkc: "\u{C5F4}",
-        nfkd: "\u{110B}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C5F5}",
-        nfc: "\u{C5F5}",
-        nfd: "\u{110B}\u{1167}\u{11B0}",
-        nfkc: "\u{C5F5}",
-        nfkd: "\u{110B}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C5F6}",
-        nfc: "\u{C5F6}",
-        nfd: "\u{110B}\u{1167}\u{11B1}",
-        nfkc: "\u{C5F6}",
-        nfkd: "\u{110B}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C5F7}",
-        nfc: "\u{C5F7}",
-        nfd: "\u{110B}\u{1167}\u{11B2}",
-        nfkc: "\u{C5F7}",
-        nfkd: "\u{110B}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C5F8}",
-        nfc: "\u{C5F8}",
-        nfd: "\u{110B}\u{1167}\u{11B3}",
-        nfkc: "\u{C5F8}",
-        nfkd: "\u{110B}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C5F9}",
-        nfc: "\u{C5F9}",
-        nfd: "\u{110B}\u{1167}\u{11B4}",
-        nfkc: "\u{C5F9}",
-        nfkd: "\u{110B}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C5FA}",
-        nfc: "\u{C5FA}",
-        nfd: "\u{110B}\u{1167}\u{11B5}",
-        nfkc: "\u{C5FA}",
-        nfkd: "\u{110B}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C5FB}",
-        nfc: "\u{C5FB}",
-        nfd: "\u{110B}\u{1167}\u{11B6}",
-        nfkc: "\u{C5FB}",
-        nfkd: "\u{110B}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C5FC}",
-        nfc: "\u{C5FC}",
-        nfd: "\u{110B}\u{1167}\u{11B7}",
-        nfkc: "\u{C5FC}",
-        nfkd: "\u{110B}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C5FD}",
-        nfc: "\u{C5FD}",
-        nfd: "\u{110B}\u{1167}\u{11B8}",
-        nfkc: "\u{C5FD}",
-        nfkd: "\u{110B}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C5FE}",
-        nfc: "\u{C5FE}",
-        nfd: "\u{110B}\u{1167}\u{11B9}",
-        nfkc: "\u{C5FE}",
-        nfkd: "\u{110B}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C5FF}",
-        nfc: "\u{C5FF}",
-        nfd: "\u{110B}\u{1167}\u{11BA}",
-        nfkc: "\u{C5FF}",
-        nfkd: "\u{110B}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C600}",
-        nfc: "\u{C600}",
-        nfd: "\u{110B}\u{1167}\u{11BB}",
-        nfkc: "\u{C600}",
-        nfkd: "\u{110B}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C601}",
-        nfc: "\u{C601}",
-        nfd: "\u{110B}\u{1167}\u{11BC}",
-        nfkc: "\u{C601}",
-        nfkd: "\u{110B}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C602}",
-        nfc: "\u{C602}",
-        nfd: "\u{110B}\u{1167}\u{11BD}",
-        nfkc: "\u{C602}",
-        nfkd: "\u{110B}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C603}",
-        nfc: "\u{C603}",
-        nfd: "\u{110B}\u{1167}\u{11BE}",
-        nfkc: "\u{C603}",
-        nfkd: "\u{110B}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C604}",
-        nfc: "\u{C604}",
-        nfd: "\u{110B}\u{1167}\u{11BF}",
-        nfkc: "\u{C604}",
-        nfkd: "\u{110B}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C605}",
-        nfc: "\u{C605}",
-        nfd: "\u{110B}\u{1167}\u{11C0}",
-        nfkc: "\u{C605}",
-        nfkd: "\u{110B}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C606}",
-        nfc: "\u{C606}",
-        nfd: "\u{110B}\u{1167}\u{11C1}",
-        nfkc: "\u{C606}",
-        nfkd: "\u{110B}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C607}",
-        nfc: "\u{C607}",
-        nfd: "\u{110B}\u{1167}\u{11C2}",
-        nfkc: "\u{C607}",
-        nfkd: "\u{110B}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C608}",
-        nfc: "\u{C608}",
-        nfd: "\u{110B}\u{1168}",
-        nfkc: "\u{C608}",
-        nfkd: "\u{110B}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{C609}",
-        nfc: "\u{C609}",
-        nfd: "\u{110B}\u{1168}\u{11A8}",
-        nfkc: "\u{C609}",
-        nfkd: "\u{110B}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C60A}",
-        nfc: "\u{C60A}",
-        nfd: "\u{110B}\u{1168}\u{11A9}",
-        nfkc: "\u{C60A}",
-        nfkd: "\u{110B}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C60B}",
-        nfc: "\u{C60B}",
-        nfd: "\u{110B}\u{1168}\u{11AA}",
-        nfkc: "\u{C60B}",
-        nfkd: "\u{110B}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C60C}",
-        nfc: "\u{C60C}",
-        nfd: "\u{110B}\u{1168}\u{11AB}",
-        nfkc: "\u{C60C}",
-        nfkd: "\u{110B}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C60D}",
-        nfc: "\u{C60D}",
-        nfd: "\u{110B}\u{1168}\u{11AC}",
-        nfkc: "\u{C60D}",
-        nfkd: "\u{110B}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C60E}",
-        nfc: "\u{C60E}",
-        nfd: "\u{110B}\u{1168}\u{11AD}",
-        nfkc: "\u{C60E}",
-        nfkd: "\u{110B}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C60F}",
-        nfc: "\u{C60F}",
-        nfd: "\u{110B}\u{1168}\u{11AE}",
-        nfkc: "\u{C60F}",
-        nfkd: "\u{110B}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C610}",
-        nfc: "\u{C610}",
-        nfd: "\u{110B}\u{1168}\u{11AF}",
-        nfkc: "\u{C610}",
-        nfkd: "\u{110B}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C611}",
-        nfc: "\u{C611}",
-        nfd: "\u{110B}\u{1168}\u{11B0}",
-        nfkc: "\u{C611}",
-        nfkd: "\u{110B}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C612}",
-        nfc: "\u{C612}",
-        nfd: "\u{110B}\u{1168}\u{11B1}",
-        nfkc: "\u{C612}",
-        nfkd: "\u{110B}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C613}",
-        nfc: "\u{C613}",
-        nfd: "\u{110B}\u{1168}\u{11B2}",
-        nfkc: "\u{C613}",
-        nfkd: "\u{110B}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C614}",
-        nfc: "\u{C614}",
-        nfd: "\u{110B}\u{1168}\u{11B3}",
-        nfkc: "\u{C614}",
-        nfkd: "\u{110B}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C615}",
-        nfc: "\u{C615}",
-        nfd: "\u{110B}\u{1168}\u{11B4}",
-        nfkc: "\u{C615}",
-        nfkd: "\u{110B}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C616}",
-        nfc: "\u{C616}",
-        nfd: "\u{110B}\u{1168}\u{11B5}",
-        nfkc: "\u{C616}",
-        nfkd: "\u{110B}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C617}",
-        nfc: "\u{C617}",
-        nfd: "\u{110B}\u{1168}\u{11B6}",
-        nfkc: "\u{C617}",
-        nfkd: "\u{110B}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C618}",
-        nfc: "\u{C618}",
-        nfd: "\u{110B}\u{1168}\u{11B7}",
-        nfkc: "\u{C618}",
-        nfkd: "\u{110B}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C619}",
-        nfc: "\u{C619}",
-        nfd: "\u{110B}\u{1168}\u{11B8}",
-        nfkc: "\u{C619}",
-        nfkd: "\u{110B}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C61A}",
-        nfc: "\u{C61A}",
-        nfd: "\u{110B}\u{1168}\u{11B9}",
-        nfkc: "\u{C61A}",
-        nfkd: "\u{110B}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C61B}",
-        nfc: "\u{C61B}",
-        nfd: "\u{110B}\u{1168}\u{11BA}",
-        nfkc: "\u{C61B}",
-        nfkd: "\u{110B}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C61C}",
-        nfc: "\u{C61C}",
-        nfd: "\u{110B}\u{1168}\u{11BB}",
-        nfkc: "\u{C61C}",
-        nfkd: "\u{110B}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C61D}",
-        nfc: "\u{C61D}",
-        nfd: "\u{110B}\u{1168}\u{11BC}",
-        nfkc: "\u{C61D}",
-        nfkd: "\u{110B}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C61E}",
-        nfc: "\u{C61E}",
-        nfd: "\u{110B}\u{1168}\u{11BD}",
-        nfkc: "\u{C61E}",
-        nfkd: "\u{110B}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C61F}",
-        nfc: "\u{C61F}",
-        nfd: "\u{110B}\u{1168}\u{11BE}",
-        nfkc: "\u{C61F}",
-        nfkd: "\u{110B}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C620}",
-        nfc: "\u{C620}",
-        nfd: "\u{110B}\u{1168}\u{11BF}",
-        nfkc: "\u{C620}",
-        nfkd: "\u{110B}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C621}",
-        nfc: "\u{C621}",
-        nfd: "\u{110B}\u{1168}\u{11C0}",
-        nfkc: "\u{C621}",
-        nfkd: "\u{110B}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C622}",
-        nfc: "\u{C622}",
-        nfd: "\u{110B}\u{1168}\u{11C1}",
-        nfkc: "\u{C622}",
-        nfkd: "\u{110B}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C623}",
-        nfc: "\u{C623}",
-        nfd: "\u{110B}\u{1168}\u{11C2}",
-        nfkc: "\u{C623}",
-        nfkd: "\u{110B}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C624}",
-        nfc: "\u{C624}",
-        nfd: "\u{110B}\u{1169}",
-        nfkc: "\u{C624}",
-        nfkd: "\u{110B}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{C625}",
-        nfc: "\u{C625}",
-        nfd: "\u{110B}\u{1169}\u{11A8}",
-        nfkc: "\u{C625}",
-        nfkd: "\u{110B}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C626}",
-        nfc: "\u{C626}",
-        nfd: "\u{110B}\u{1169}\u{11A9}",
-        nfkc: "\u{C626}",
-        nfkd: "\u{110B}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C627}",
-        nfc: "\u{C627}",
-        nfd: "\u{110B}\u{1169}\u{11AA}",
-        nfkc: "\u{C627}",
-        nfkd: "\u{110B}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C628}",
-        nfc: "\u{C628}",
-        nfd: "\u{110B}\u{1169}\u{11AB}",
-        nfkc: "\u{C628}",
-        nfkd: "\u{110B}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C629}",
-        nfc: "\u{C629}",
-        nfd: "\u{110B}\u{1169}\u{11AC}",
-        nfkc: "\u{C629}",
-        nfkd: "\u{110B}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C62A}",
-        nfc: "\u{C62A}",
-        nfd: "\u{110B}\u{1169}\u{11AD}",
-        nfkc: "\u{C62A}",
-        nfkd: "\u{110B}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C62B}",
-        nfc: "\u{C62B}",
-        nfd: "\u{110B}\u{1169}\u{11AE}",
-        nfkc: "\u{C62B}",
-        nfkd: "\u{110B}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C62C}",
-        nfc: "\u{C62C}",
-        nfd: "\u{110B}\u{1169}\u{11AF}",
-        nfkc: "\u{C62C}",
-        nfkd: "\u{110B}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C62D}",
-        nfc: "\u{C62D}",
-        nfd: "\u{110B}\u{1169}\u{11B0}",
-        nfkc: "\u{C62D}",
-        nfkd: "\u{110B}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C62E}",
-        nfc: "\u{C62E}",
-        nfd: "\u{110B}\u{1169}\u{11B1}",
-        nfkc: "\u{C62E}",
-        nfkd: "\u{110B}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C62F}",
-        nfc: "\u{C62F}",
-        nfd: "\u{110B}\u{1169}\u{11B2}",
-        nfkc: "\u{C62F}",
-        nfkd: "\u{110B}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C630}",
-        nfc: "\u{C630}",
-        nfd: "\u{110B}\u{1169}\u{11B3}",
-        nfkc: "\u{C630}",
-        nfkd: "\u{110B}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C631}",
-        nfc: "\u{C631}",
-        nfd: "\u{110B}\u{1169}\u{11B4}",
-        nfkc: "\u{C631}",
-        nfkd: "\u{110B}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C632}",
-        nfc: "\u{C632}",
-        nfd: "\u{110B}\u{1169}\u{11B5}",
-        nfkc: "\u{C632}",
-        nfkd: "\u{110B}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C633}",
-        nfc: "\u{C633}",
-        nfd: "\u{110B}\u{1169}\u{11B6}",
-        nfkc: "\u{C633}",
-        nfkd: "\u{110B}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C634}",
-        nfc: "\u{C634}",
-        nfd: "\u{110B}\u{1169}\u{11B7}",
-        nfkc: "\u{C634}",
-        nfkd: "\u{110B}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C635}",
-        nfc: "\u{C635}",
-        nfd: "\u{110B}\u{1169}\u{11B8}",
-        nfkc: "\u{C635}",
-        nfkd: "\u{110B}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C636}",
-        nfc: "\u{C636}",
-        nfd: "\u{110B}\u{1169}\u{11B9}",
-        nfkc: "\u{C636}",
-        nfkd: "\u{110B}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C637}",
-        nfc: "\u{C637}",
-        nfd: "\u{110B}\u{1169}\u{11BA}",
-        nfkc: "\u{C637}",
-        nfkd: "\u{110B}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C638}",
-        nfc: "\u{C638}",
-        nfd: "\u{110B}\u{1169}\u{11BB}",
-        nfkc: "\u{C638}",
-        nfkd: "\u{110B}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C639}",
-        nfc: "\u{C639}",
-        nfd: "\u{110B}\u{1169}\u{11BC}",
-        nfkc: "\u{C639}",
-        nfkd: "\u{110B}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C63A}",
-        nfc: "\u{C63A}",
-        nfd: "\u{110B}\u{1169}\u{11BD}",
-        nfkc: "\u{C63A}",
-        nfkd: "\u{110B}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C63B}",
-        nfc: "\u{C63B}",
-        nfd: "\u{110B}\u{1169}\u{11BE}",
-        nfkc: "\u{C63B}",
-        nfkd: "\u{110B}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C63C}",
-        nfc: "\u{C63C}",
-        nfd: "\u{110B}\u{1169}\u{11BF}",
-        nfkc: "\u{C63C}",
-        nfkd: "\u{110B}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C63D}",
-        nfc: "\u{C63D}",
-        nfd: "\u{110B}\u{1169}\u{11C0}",
-        nfkc: "\u{C63D}",
-        nfkd: "\u{110B}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C63E}",
-        nfc: "\u{C63E}",
-        nfd: "\u{110B}\u{1169}\u{11C1}",
-        nfkc: "\u{C63E}",
-        nfkd: "\u{110B}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C63F}",
-        nfc: "\u{C63F}",
-        nfd: "\u{110B}\u{1169}\u{11C2}",
-        nfkc: "\u{C63F}",
-        nfkd: "\u{110B}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C640}",
-        nfc: "\u{C640}",
-        nfd: "\u{110B}\u{116A}",
-        nfkc: "\u{C640}",
-        nfkd: "\u{110B}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{C641}",
-        nfc: "\u{C641}",
-        nfd: "\u{110B}\u{116A}\u{11A8}",
-        nfkc: "\u{C641}",
-        nfkd: "\u{110B}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C642}",
-        nfc: "\u{C642}",
-        nfd: "\u{110B}\u{116A}\u{11A9}",
-        nfkc: "\u{C642}",
-        nfkd: "\u{110B}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C643}",
-        nfc: "\u{C643}",
-        nfd: "\u{110B}\u{116A}\u{11AA}",
-        nfkc: "\u{C643}",
-        nfkd: "\u{110B}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C644}",
-        nfc: "\u{C644}",
-        nfd: "\u{110B}\u{116A}\u{11AB}",
-        nfkc: "\u{C644}",
-        nfkd: "\u{110B}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C645}",
-        nfc: "\u{C645}",
-        nfd: "\u{110B}\u{116A}\u{11AC}",
-        nfkc: "\u{C645}",
-        nfkd: "\u{110B}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C646}",
-        nfc: "\u{C646}",
-        nfd: "\u{110B}\u{116A}\u{11AD}",
-        nfkc: "\u{C646}",
-        nfkd: "\u{110B}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C647}",
-        nfc: "\u{C647}",
-        nfd: "\u{110B}\u{116A}\u{11AE}",
-        nfkc: "\u{C647}",
-        nfkd: "\u{110B}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C648}",
-        nfc: "\u{C648}",
-        nfd: "\u{110B}\u{116A}\u{11AF}",
-        nfkc: "\u{C648}",
-        nfkd: "\u{110B}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C649}",
-        nfc: "\u{C649}",
-        nfd: "\u{110B}\u{116A}\u{11B0}",
-        nfkc: "\u{C649}",
-        nfkd: "\u{110B}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C64A}",
-        nfc: "\u{C64A}",
-        nfd: "\u{110B}\u{116A}\u{11B1}",
-        nfkc: "\u{C64A}",
-        nfkd: "\u{110B}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C64B}",
-        nfc: "\u{C64B}",
-        nfd: "\u{110B}\u{116A}\u{11B2}",
-        nfkc: "\u{C64B}",
-        nfkd: "\u{110B}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C64C}",
-        nfc: "\u{C64C}",
-        nfd: "\u{110B}\u{116A}\u{11B3}",
-        nfkc: "\u{C64C}",
-        nfkd: "\u{110B}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C64D}",
-        nfc: "\u{C64D}",
-        nfd: "\u{110B}\u{116A}\u{11B4}",
-        nfkc: "\u{C64D}",
-        nfkd: "\u{110B}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C64E}",
-        nfc: "\u{C64E}",
-        nfd: "\u{110B}\u{116A}\u{11B5}",
-        nfkc: "\u{C64E}",
-        nfkd: "\u{110B}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C64F}",
-        nfc: "\u{C64F}",
-        nfd: "\u{110B}\u{116A}\u{11B6}",
-        nfkc: "\u{C64F}",
-        nfkd: "\u{110B}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C650}",
-        nfc: "\u{C650}",
-        nfd: "\u{110B}\u{116A}\u{11B7}",
-        nfkc: "\u{C650}",
-        nfkd: "\u{110B}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C651}",
-        nfc: "\u{C651}",
-        nfd: "\u{110B}\u{116A}\u{11B8}",
-        nfkc: "\u{C651}",
-        nfkd: "\u{110B}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C652}",
-        nfc: "\u{C652}",
-        nfd: "\u{110B}\u{116A}\u{11B9}",
-        nfkc: "\u{C652}",
-        nfkd: "\u{110B}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C653}",
-        nfc: "\u{C653}",
-        nfd: "\u{110B}\u{116A}\u{11BA}",
-        nfkc: "\u{C653}",
-        nfkd: "\u{110B}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C654}",
-        nfc: "\u{C654}",
-        nfd: "\u{110B}\u{116A}\u{11BB}",
-        nfkc: "\u{C654}",
-        nfkd: "\u{110B}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C655}",
-        nfc: "\u{C655}",
-        nfd: "\u{110B}\u{116A}\u{11BC}",
-        nfkc: "\u{C655}",
-        nfkd: "\u{110B}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C656}",
-        nfc: "\u{C656}",
-        nfd: "\u{110B}\u{116A}\u{11BD}",
-        nfkc: "\u{C656}",
-        nfkd: "\u{110B}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C657}",
-        nfc: "\u{C657}",
-        nfd: "\u{110B}\u{116A}\u{11BE}",
-        nfkc: "\u{C657}",
-        nfkd: "\u{110B}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C658}",
-        nfc: "\u{C658}",
-        nfd: "\u{110B}\u{116A}\u{11BF}",
-        nfkc: "\u{C658}",
-        nfkd: "\u{110B}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C659}",
-        nfc: "\u{C659}",
-        nfd: "\u{110B}\u{116A}\u{11C0}",
-        nfkc: "\u{C659}",
-        nfkd: "\u{110B}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C65A}",
-        nfc: "\u{C65A}",
-        nfd: "\u{110B}\u{116A}\u{11C1}",
-        nfkc: "\u{C65A}",
-        nfkd: "\u{110B}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C65B}",
-        nfc: "\u{C65B}",
-        nfd: "\u{110B}\u{116A}\u{11C2}",
-        nfkc: "\u{C65B}",
-        nfkd: "\u{110B}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C65C}",
-        nfc: "\u{C65C}",
-        nfd: "\u{110B}\u{116B}",
-        nfkc: "\u{C65C}",
-        nfkd: "\u{110B}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{C65D}",
-        nfc: "\u{C65D}",
-        nfd: "\u{110B}\u{116B}\u{11A8}",
-        nfkc: "\u{C65D}",
-        nfkd: "\u{110B}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C65E}",
-        nfc: "\u{C65E}",
-        nfd: "\u{110B}\u{116B}\u{11A9}",
-        nfkc: "\u{C65E}",
-        nfkd: "\u{110B}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C65F}",
-        nfc: "\u{C65F}",
-        nfd: "\u{110B}\u{116B}\u{11AA}",
-        nfkc: "\u{C65F}",
-        nfkd: "\u{110B}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C660}",
-        nfc: "\u{C660}",
-        nfd: "\u{110B}\u{116B}\u{11AB}",
-        nfkc: "\u{C660}",
-        nfkd: "\u{110B}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C661}",
-        nfc: "\u{C661}",
-        nfd: "\u{110B}\u{116B}\u{11AC}",
-        nfkc: "\u{C661}",
-        nfkd: "\u{110B}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C662}",
-        nfc: "\u{C662}",
-        nfd: "\u{110B}\u{116B}\u{11AD}",
-        nfkc: "\u{C662}",
-        nfkd: "\u{110B}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C663}",
-        nfc: "\u{C663}",
-        nfd: "\u{110B}\u{116B}\u{11AE}",
-        nfkc: "\u{C663}",
-        nfkd: "\u{110B}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C664}",
-        nfc: "\u{C664}",
-        nfd: "\u{110B}\u{116B}\u{11AF}",
-        nfkc: "\u{C664}",
-        nfkd: "\u{110B}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C665}",
-        nfc: "\u{C665}",
-        nfd: "\u{110B}\u{116B}\u{11B0}",
-        nfkc: "\u{C665}",
-        nfkd: "\u{110B}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C666}",
-        nfc: "\u{C666}",
-        nfd: "\u{110B}\u{116B}\u{11B1}",
-        nfkc: "\u{C666}",
-        nfkd: "\u{110B}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C667}",
-        nfc: "\u{C667}",
-        nfd: "\u{110B}\u{116B}\u{11B2}",
-        nfkc: "\u{C667}",
-        nfkd: "\u{110B}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C668}",
-        nfc: "\u{C668}",
-        nfd: "\u{110B}\u{116B}\u{11B3}",
-        nfkc: "\u{C668}",
-        nfkd: "\u{110B}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C669}",
-        nfc: "\u{C669}",
-        nfd: "\u{110B}\u{116B}\u{11B4}",
-        nfkc: "\u{C669}",
-        nfkd: "\u{110B}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C66A}",
-        nfc: "\u{C66A}",
-        nfd: "\u{110B}\u{116B}\u{11B5}",
-        nfkc: "\u{C66A}",
-        nfkd: "\u{110B}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C66B}",
-        nfc: "\u{C66B}",
-        nfd: "\u{110B}\u{116B}\u{11B6}",
-        nfkc: "\u{C66B}",
-        nfkd: "\u{110B}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C66C}",
-        nfc: "\u{C66C}",
-        nfd: "\u{110B}\u{116B}\u{11B7}",
-        nfkc: "\u{C66C}",
-        nfkd: "\u{110B}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C66D}",
-        nfc: "\u{C66D}",
-        nfd: "\u{110B}\u{116B}\u{11B8}",
-        nfkc: "\u{C66D}",
-        nfkd: "\u{110B}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C66E}",
-        nfc: "\u{C66E}",
-        nfd: "\u{110B}\u{116B}\u{11B9}",
-        nfkc: "\u{C66E}",
-        nfkd: "\u{110B}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C66F}",
-        nfc: "\u{C66F}",
-        nfd: "\u{110B}\u{116B}\u{11BA}",
-        nfkc: "\u{C66F}",
-        nfkd: "\u{110B}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C670}",
-        nfc: "\u{C670}",
-        nfd: "\u{110B}\u{116B}\u{11BB}",
-        nfkc: "\u{C670}",
-        nfkd: "\u{110B}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C671}",
-        nfc: "\u{C671}",
-        nfd: "\u{110B}\u{116B}\u{11BC}",
-        nfkc: "\u{C671}",
-        nfkd: "\u{110B}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C672}",
-        nfc: "\u{C672}",
-        nfd: "\u{110B}\u{116B}\u{11BD}",
-        nfkc: "\u{C672}",
-        nfkd: "\u{110B}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C673}",
-        nfc: "\u{C673}",
-        nfd: "\u{110B}\u{116B}\u{11BE}",
-        nfkc: "\u{C673}",
-        nfkd: "\u{110B}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C674}",
-        nfc: "\u{C674}",
-        nfd: "\u{110B}\u{116B}\u{11BF}",
-        nfkc: "\u{C674}",
-        nfkd: "\u{110B}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C675}",
-        nfc: "\u{C675}",
-        nfd: "\u{110B}\u{116B}\u{11C0}",
-        nfkc: "\u{C675}",
-        nfkd: "\u{110B}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C676}",
-        nfc: "\u{C676}",
-        nfd: "\u{110B}\u{116B}\u{11C1}",
-        nfkc: "\u{C676}",
-        nfkd: "\u{110B}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C677}",
-        nfc: "\u{C677}",
-        nfd: "\u{110B}\u{116B}\u{11C2}",
-        nfkc: "\u{C677}",
-        nfkd: "\u{110B}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C678}",
-        nfc: "\u{C678}",
-        nfd: "\u{110B}\u{116C}",
-        nfkc: "\u{C678}",
-        nfkd: "\u{110B}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{C679}",
-        nfc: "\u{C679}",
-        nfd: "\u{110B}\u{116C}\u{11A8}",
-        nfkc: "\u{C679}",
-        nfkd: "\u{110B}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C67A}",
-        nfc: "\u{C67A}",
-        nfd: "\u{110B}\u{116C}\u{11A9}",
-        nfkc: "\u{C67A}",
-        nfkd: "\u{110B}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C67B}",
-        nfc: "\u{C67B}",
-        nfd: "\u{110B}\u{116C}\u{11AA}",
-        nfkc: "\u{C67B}",
-        nfkd: "\u{110B}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C67C}",
-        nfc: "\u{C67C}",
-        nfd: "\u{110B}\u{116C}\u{11AB}",
-        nfkc: "\u{C67C}",
-        nfkd: "\u{110B}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C67D}",
-        nfc: "\u{C67D}",
-        nfd: "\u{110B}\u{116C}\u{11AC}",
-        nfkc: "\u{C67D}",
-        nfkd: "\u{110B}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C67E}",
-        nfc: "\u{C67E}",
-        nfd: "\u{110B}\u{116C}\u{11AD}",
-        nfkc: "\u{C67E}",
-        nfkd: "\u{110B}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C67F}",
-        nfc: "\u{C67F}",
-        nfd: "\u{110B}\u{116C}\u{11AE}",
-        nfkc: "\u{C67F}",
-        nfkd: "\u{110B}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C680}",
-        nfc: "\u{C680}",
-        nfd: "\u{110B}\u{116C}\u{11AF}",
-        nfkc: "\u{C680}",
-        nfkd: "\u{110B}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C681}",
-        nfc: "\u{C681}",
-        nfd: "\u{110B}\u{116C}\u{11B0}",
-        nfkc: "\u{C681}",
-        nfkd: "\u{110B}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C682}",
-        nfc: "\u{C682}",
-        nfd: "\u{110B}\u{116C}\u{11B1}",
-        nfkc: "\u{C682}",
-        nfkd: "\u{110B}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C683}",
-        nfc: "\u{C683}",
-        nfd: "\u{110B}\u{116C}\u{11B2}",
-        nfkc: "\u{C683}",
-        nfkd: "\u{110B}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C684}",
-        nfc: "\u{C684}",
-        nfd: "\u{110B}\u{116C}\u{11B3}",
-        nfkc: "\u{C684}",
-        nfkd: "\u{110B}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C685}",
-        nfc: "\u{C685}",
-        nfd: "\u{110B}\u{116C}\u{11B4}",
-        nfkc: "\u{C685}",
-        nfkd: "\u{110B}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C686}",
-        nfc: "\u{C686}",
-        nfd: "\u{110B}\u{116C}\u{11B5}",
-        nfkc: "\u{C686}",
-        nfkd: "\u{110B}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C687}",
-        nfc: "\u{C687}",
-        nfd: "\u{110B}\u{116C}\u{11B6}",
-        nfkc: "\u{C687}",
-        nfkd: "\u{110B}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C688}",
-        nfc: "\u{C688}",
-        nfd: "\u{110B}\u{116C}\u{11B7}",
-        nfkc: "\u{C688}",
-        nfkd: "\u{110B}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C689}",
-        nfc: "\u{C689}",
-        nfd: "\u{110B}\u{116C}\u{11B8}",
-        nfkc: "\u{C689}",
-        nfkd: "\u{110B}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C68A}",
-        nfc: "\u{C68A}",
-        nfd: "\u{110B}\u{116C}\u{11B9}",
-        nfkc: "\u{C68A}",
-        nfkd: "\u{110B}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C68B}",
-        nfc: "\u{C68B}",
-        nfd: "\u{110B}\u{116C}\u{11BA}",
-        nfkc: "\u{C68B}",
-        nfkd: "\u{110B}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C68C}",
-        nfc: "\u{C68C}",
-        nfd: "\u{110B}\u{116C}\u{11BB}",
-        nfkc: "\u{C68C}",
-        nfkd: "\u{110B}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C68D}",
-        nfc: "\u{C68D}",
-        nfd: "\u{110B}\u{116C}\u{11BC}",
-        nfkc: "\u{C68D}",
-        nfkd: "\u{110B}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C68E}",
-        nfc: "\u{C68E}",
-        nfd: "\u{110B}\u{116C}\u{11BD}",
-        nfkc: "\u{C68E}",
-        nfkd: "\u{110B}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C68F}",
-        nfc: "\u{C68F}",
-        nfd: "\u{110B}\u{116C}\u{11BE}",
-        nfkc: "\u{C68F}",
-        nfkd: "\u{110B}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C690}",
-        nfc: "\u{C690}",
-        nfd: "\u{110B}\u{116C}\u{11BF}",
-        nfkc: "\u{C690}",
-        nfkd: "\u{110B}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C691}",
-        nfc: "\u{C691}",
-        nfd: "\u{110B}\u{116C}\u{11C0}",
-        nfkc: "\u{C691}",
-        nfkd: "\u{110B}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C692}",
-        nfc: "\u{C692}",
-        nfd: "\u{110B}\u{116C}\u{11C1}",
-        nfkc: "\u{C692}",
-        nfkd: "\u{110B}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C693}",
-        nfc: "\u{C693}",
-        nfd: "\u{110B}\u{116C}\u{11C2}",
-        nfkc: "\u{C693}",
-        nfkd: "\u{110B}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C694}",
-        nfc: "\u{C694}",
-        nfd: "\u{110B}\u{116D}",
-        nfkc: "\u{C694}",
-        nfkd: "\u{110B}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{C695}",
-        nfc: "\u{C695}",
-        nfd: "\u{110B}\u{116D}\u{11A8}",
-        nfkc: "\u{C695}",
-        nfkd: "\u{110B}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C696}",
-        nfc: "\u{C696}",
-        nfd: "\u{110B}\u{116D}\u{11A9}",
-        nfkc: "\u{C696}",
-        nfkd: "\u{110B}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C697}",
-        nfc: "\u{C697}",
-        nfd: "\u{110B}\u{116D}\u{11AA}",
-        nfkc: "\u{C697}",
-        nfkd: "\u{110B}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C698}",
-        nfc: "\u{C698}",
-        nfd: "\u{110B}\u{116D}\u{11AB}",
-        nfkc: "\u{C698}",
-        nfkd: "\u{110B}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C699}",
-        nfc: "\u{C699}",
-        nfd: "\u{110B}\u{116D}\u{11AC}",
-        nfkc: "\u{C699}",
-        nfkd: "\u{110B}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C69A}",
-        nfc: "\u{C69A}",
-        nfd: "\u{110B}\u{116D}\u{11AD}",
-        nfkc: "\u{C69A}",
-        nfkd: "\u{110B}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C69B}",
-        nfc: "\u{C69B}",
-        nfd: "\u{110B}\u{116D}\u{11AE}",
-        nfkc: "\u{C69B}",
-        nfkd: "\u{110B}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C69C}",
-        nfc: "\u{C69C}",
-        nfd: "\u{110B}\u{116D}\u{11AF}",
-        nfkc: "\u{C69C}",
-        nfkd: "\u{110B}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C69D}",
-        nfc: "\u{C69D}",
-        nfd: "\u{110B}\u{116D}\u{11B0}",
-        nfkc: "\u{C69D}",
-        nfkd: "\u{110B}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C69E}",
-        nfc: "\u{C69E}",
-        nfd: "\u{110B}\u{116D}\u{11B1}",
-        nfkc: "\u{C69E}",
-        nfkd: "\u{110B}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C69F}",
-        nfc: "\u{C69F}",
-        nfd: "\u{110B}\u{116D}\u{11B2}",
-        nfkc: "\u{C69F}",
-        nfkd: "\u{110B}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C6A0}",
-        nfc: "\u{C6A0}",
-        nfd: "\u{110B}\u{116D}\u{11B3}",
-        nfkc: "\u{C6A0}",
-        nfkd: "\u{110B}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C6A1}",
-        nfc: "\u{C6A1}",
-        nfd: "\u{110B}\u{116D}\u{11B4}",
-        nfkc: "\u{C6A1}",
-        nfkd: "\u{110B}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C6A2}",
-        nfc: "\u{C6A2}",
-        nfd: "\u{110B}\u{116D}\u{11B5}",
-        nfkc: "\u{C6A2}",
-        nfkd: "\u{110B}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C6A3}",
-        nfc: "\u{C6A3}",
-        nfd: "\u{110B}\u{116D}\u{11B6}",
-        nfkc: "\u{C6A3}",
-        nfkd: "\u{110B}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C6A4}",
-        nfc: "\u{C6A4}",
-        nfd: "\u{110B}\u{116D}\u{11B7}",
-        nfkc: "\u{C6A4}",
-        nfkd: "\u{110B}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C6A5}",
-        nfc: "\u{C6A5}",
-        nfd: "\u{110B}\u{116D}\u{11B8}",
-        nfkc: "\u{C6A5}",
-        nfkd: "\u{110B}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C6A6}",
-        nfc: "\u{C6A6}",
-        nfd: "\u{110B}\u{116D}\u{11B9}",
-        nfkc: "\u{C6A6}",
-        nfkd: "\u{110B}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C6A7}",
-        nfc: "\u{C6A7}",
-        nfd: "\u{110B}\u{116D}\u{11BA}",
-        nfkc: "\u{C6A7}",
-        nfkd: "\u{110B}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C6A8}",
-        nfc: "\u{C6A8}",
-        nfd: "\u{110B}\u{116D}\u{11BB}",
-        nfkc: "\u{C6A8}",
-        nfkd: "\u{110B}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C6A9}",
-        nfc: "\u{C6A9}",
-        nfd: "\u{110B}\u{116D}\u{11BC}",
-        nfkc: "\u{C6A9}",
-        nfkd: "\u{110B}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C6AA}",
-        nfc: "\u{C6AA}",
-        nfd: "\u{110B}\u{116D}\u{11BD}",
-        nfkc: "\u{C6AA}",
-        nfkd: "\u{110B}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C6AB}",
-        nfc: "\u{C6AB}",
-        nfd: "\u{110B}\u{116D}\u{11BE}",
-        nfkc: "\u{C6AB}",
-        nfkd: "\u{110B}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C6AC}",
-        nfc: "\u{C6AC}",
-        nfd: "\u{110B}\u{116D}\u{11BF}",
-        nfkc: "\u{C6AC}",
-        nfkd: "\u{110B}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C6AD}",
-        nfc: "\u{C6AD}",
-        nfd: "\u{110B}\u{116D}\u{11C0}",
-        nfkc: "\u{C6AD}",
-        nfkd: "\u{110B}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C6AE}",
-        nfc: "\u{C6AE}",
-        nfd: "\u{110B}\u{116D}\u{11C1}",
-        nfkc: "\u{C6AE}",
-        nfkd: "\u{110B}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C6AF}",
-        nfc: "\u{C6AF}",
-        nfd: "\u{110B}\u{116D}\u{11C2}",
-        nfkc: "\u{C6AF}",
-        nfkd: "\u{110B}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C6B0}",
-        nfc: "\u{C6B0}",
-        nfd: "\u{110B}\u{116E}",
-        nfkc: "\u{C6B0}",
-        nfkd: "\u{110B}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{C6B1}",
-        nfc: "\u{C6B1}",
-        nfd: "\u{110B}\u{116E}\u{11A8}",
-        nfkc: "\u{C6B1}",
-        nfkd: "\u{110B}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C6B2}",
-        nfc: "\u{C6B2}",
-        nfd: "\u{110B}\u{116E}\u{11A9}",
-        nfkc: "\u{C6B2}",
-        nfkd: "\u{110B}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C6B3}",
-        nfc: "\u{C6B3}",
-        nfd: "\u{110B}\u{116E}\u{11AA}",
-        nfkc: "\u{C6B3}",
-        nfkd: "\u{110B}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C6B4}",
-        nfc: "\u{C6B4}",
-        nfd: "\u{110B}\u{116E}\u{11AB}",
-        nfkc: "\u{C6B4}",
-        nfkd: "\u{110B}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C6B5}",
-        nfc: "\u{C6B5}",
-        nfd: "\u{110B}\u{116E}\u{11AC}",
-        nfkc: "\u{C6B5}",
-        nfkd: "\u{110B}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C6B6}",
-        nfc: "\u{C6B6}",
-        nfd: "\u{110B}\u{116E}\u{11AD}",
-        nfkc: "\u{C6B6}",
-        nfkd: "\u{110B}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C6B7}",
-        nfc: "\u{C6B7}",
-        nfd: "\u{110B}\u{116E}\u{11AE}",
-        nfkc: "\u{C6B7}",
-        nfkd: "\u{110B}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C6B8}",
-        nfc: "\u{C6B8}",
-        nfd: "\u{110B}\u{116E}\u{11AF}",
-        nfkc: "\u{C6B8}",
-        nfkd: "\u{110B}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C6B9}",
-        nfc: "\u{C6B9}",
-        nfd: "\u{110B}\u{116E}\u{11B0}",
-        nfkc: "\u{C6B9}",
-        nfkd: "\u{110B}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C6BA}",
-        nfc: "\u{C6BA}",
-        nfd: "\u{110B}\u{116E}\u{11B1}",
-        nfkc: "\u{C6BA}",
-        nfkd: "\u{110B}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C6BB}",
-        nfc: "\u{C6BB}",
-        nfd: "\u{110B}\u{116E}\u{11B2}",
-        nfkc: "\u{C6BB}",
-        nfkd: "\u{110B}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C6BC}",
-        nfc: "\u{C6BC}",
-        nfd: "\u{110B}\u{116E}\u{11B3}",
-        nfkc: "\u{C6BC}",
-        nfkd: "\u{110B}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C6BD}",
-        nfc: "\u{C6BD}",
-        nfd: "\u{110B}\u{116E}\u{11B4}",
-        nfkc: "\u{C6BD}",
-        nfkd: "\u{110B}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C6BE}",
-        nfc: "\u{C6BE}",
-        nfd: "\u{110B}\u{116E}\u{11B5}",
-        nfkc: "\u{C6BE}",
-        nfkd: "\u{110B}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C6BF}",
-        nfc: "\u{C6BF}",
-        nfd: "\u{110B}\u{116E}\u{11B6}",
-        nfkc: "\u{C6BF}",
-        nfkd: "\u{110B}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C6C0}",
-        nfc: "\u{C6C0}",
-        nfd: "\u{110B}\u{116E}\u{11B7}",
-        nfkc: "\u{C6C0}",
-        nfkd: "\u{110B}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C6C1}",
-        nfc: "\u{C6C1}",
-        nfd: "\u{110B}\u{116E}\u{11B8}",
-        nfkc: "\u{C6C1}",
-        nfkd: "\u{110B}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C6C2}",
-        nfc: "\u{C6C2}",
-        nfd: "\u{110B}\u{116E}\u{11B9}",
-        nfkc: "\u{C6C2}",
-        nfkd: "\u{110B}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C6C3}",
-        nfc: "\u{C6C3}",
-        nfd: "\u{110B}\u{116E}\u{11BA}",
-        nfkc: "\u{C6C3}",
-        nfkd: "\u{110B}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C6C4}",
-        nfc: "\u{C6C4}",
-        nfd: "\u{110B}\u{116E}\u{11BB}",
-        nfkc: "\u{C6C4}",
-        nfkd: "\u{110B}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C6C5}",
-        nfc: "\u{C6C5}",
-        nfd: "\u{110B}\u{116E}\u{11BC}",
-        nfkc: "\u{C6C5}",
-        nfkd: "\u{110B}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C6C6}",
-        nfc: "\u{C6C6}",
-        nfd: "\u{110B}\u{116E}\u{11BD}",
-        nfkc: "\u{C6C6}",
-        nfkd: "\u{110B}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C6C7}",
-        nfc: "\u{C6C7}",
-        nfd: "\u{110B}\u{116E}\u{11BE}",
-        nfkc: "\u{C6C7}",
-        nfkd: "\u{110B}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C6C8}",
-        nfc: "\u{C6C8}",
-        nfd: "\u{110B}\u{116E}\u{11BF}",
-        nfkc: "\u{C6C8}",
-        nfkd: "\u{110B}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C6C9}",
-        nfc: "\u{C6C9}",
-        nfd: "\u{110B}\u{116E}\u{11C0}",
-        nfkc: "\u{C6C9}",
-        nfkd: "\u{110B}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C6CA}",
-        nfc: "\u{C6CA}",
-        nfd: "\u{110B}\u{116E}\u{11C1}",
-        nfkc: "\u{C6CA}",
-        nfkd: "\u{110B}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C6CB}",
-        nfc: "\u{C6CB}",
-        nfd: "\u{110B}\u{116E}\u{11C2}",
-        nfkc: "\u{C6CB}",
-        nfkd: "\u{110B}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C6CC}",
-        nfc: "\u{C6CC}",
-        nfd: "\u{110B}\u{116F}",
-        nfkc: "\u{C6CC}",
-        nfkd: "\u{110B}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{C6CD}",
-        nfc: "\u{C6CD}",
-        nfd: "\u{110B}\u{116F}\u{11A8}",
-        nfkc: "\u{C6CD}",
-        nfkd: "\u{110B}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C6CE}",
-        nfc: "\u{C6CE}",
-        nfd: "\u{110B}\u{116F}\u{11A9}",
-        nfkc: "\u{C6CE}",
-        nfkd: "\u{110B}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C6CF}",
-        nfc: "\u{C6CF}",
-        nfd: "\u{110B}\u{116F}\u{11AA}",
-        nfkc: "\u{C6CF}",
-        nfkd: "\u{110B}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C6D0}",
-        nfc: "\u{C6D0}",
-        nfd: "\u{110B}\u{116F}\u{11AB}",
-        nfkc: "\u{C6D0}",
-        nfkd: "\u{110B}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C6D1}",
-        nfc: "\u{C6D1}",
-        nfd: "\u{110B}\u{116F}\u{11AC}",
-        nfkc: "\u{C6D1}",
-        nfkd: "\u{110B}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C6D2}",
-        nfc: "\u{C6D2}",
-        nfd: "\u{110B}\u{116F}\u{11AD}",
-        nfkc: "\u{C6D2}",
-        nfkd: "\u{110B}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C6D3}",
-        nfc: "\u{C6D3}",
-        nfd: "\u{110B}\u{116F}\u{11AE}",
-        nfkc: "\u{C6D3}",
-        nfkd: "\u{110B}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C6D4}",
-        nfc: "\u{C6D4}",
-        nfd: "\u{110B}\u{116F}\u{11AF}",
-        nfkc: "\u{C6D4}",
-        nfkd: "\u{110B}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C6D5}",
-        nfc: "\u{C6D5}",
-        nfd: "\u{110B}\u{116F}\u{11B0}",
-        nfkc: "\u{C6D5}",
-        nfkd: "\u{110B}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C6D6}",
-        nfc: "\u{C6D6}",
-        nfd: "\u{110B}\u{116F}\u{11B1}",
-        nfkc: "\u{C6D6}",
-        nfkd: "\u{110B}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C6D7}",
-        nfc: "\u{C6D7}",
-        nfd: "\u{110B}\u{116F}\u{11B2}",
-        nfkc: "\u{C6D7}",
-        nfkd: "\u{110B}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C6D8}",
-        nfc: "\u{C6D8}",
-        nfd: "\u{110B}\u{116F}\u{11B3}",
-        nfkc: "\u{C6D8}",
-        nfkd: "\u{110B}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C6D9}",
-        nfc: "\u{C6D9}",
-        nfd: "\u{110B}\u{116F}\u{11B4}",
-        nfkc: "\u{C6D9}",
-        nfkd: "\u{110B}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C6DA}",
-        nfc: "\u{C6DA}",
-        nfd: "\u{110B}\u{116F}\u{11B5}",
-        nfkc: "\u{C6DA}",
-        nfkd: "\u{110B}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C6DB}",
-        nfc: "\u{C6DB}",
-        nfd: "\u{110B}\u{116F}\u{11B6}",
-        nfkc: "\u{C6DB}",
-        nfkd: "\u{110B}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C6DC}",
-        nfc: "\u{C6DC}",
-        nfd: "\u{110B}\u{116F}\u{11B7}",
-        nfkc: "\u{C6DC}",
-        nfkd: "\u{110B}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C6DD}",
-        nfc: "\u{C6DD}",
-        nfd: "\u{110B}\u{116F}\u{11B8}",
-        nfkc: "\u{C6DD}",
-        nfkd: "\u{110B}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C6DE}",
-        nfc: "\u{C6DE}",
-        nfd: "\u{110B}\u{116F}\u{11B9}",
-        nfkc: "\u{C6DE}",
-        nfkd: "\u{110B}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C6DF}",
-        nfc: "\u{C6DF}",
-        nfd: "\u{110B}\u{116F}\u{11BA}",
-        nfkc: "\u{C6DF}",
-        nfkd: "\u{110B}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C6E0}",
-        nfc: "\u{C6E0}",
-        nfd: "\u{110B}\u{116F}\u{11BB}",
-        nfkc: "\u{C6E0}",
-        nfkd: "\u{110B}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C6E1}",
-        nfc: "\u{C6E1}",
-        nfd: "\u{110B}\u{116F}\u{11BC}",
-        nfkc: "\u{C6E1}",
-        nfkd: "\u{110B}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C6E2}",
-        nfc: "\u{C6E2}",
-        nfd: "\u{110B}\u{116F}\u{11BD}",
-        nfkc: "\u{C6E2}",
-        nfkd: "\u{110B}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C6E3}",
-        nfc: "\u{C6E3}",
-        nfd: "\u{110B}\u{116F}\u{11BE}",
-        nfkc: "\u{C6E3}",
-        nfkd: "\u{110B}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C6E4}",
-        nfc: "\u{C6E4}",
-        nfd: "\u{110B}\u{116F}\u{11BF}",
-        nfkc: "\u{C6E4}",
-        nfkd: "\u{110B}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C6E5}",
-        nfc: "\u{C6E5}",
-        nfd: "\u{110B}\u{116F}\u{11C0}",
-        nfkc: "\u{C6E5}",
-        nfkd: "\u{110B}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C6E6}",
-        nfc: "\u{C6E6}",
-        nfd: "\u{110B}\u{116F}\u{11C1}",
-        nfkc: "\u{C6E6}",
-        nfkd: "\u{110B}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C6E7}",
-        nfc: "\u{C6E7}",
-        nfd: "\u{110B}\u{116F}\u{11C2}",
-        nfkc: "\u{C6E7}",
-        nfkd: "\u{110B}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C6E8}",
-        nfc: "\u{C6E8}",
-        nfd: "\u{110B}\u{1170}",
-        nfkc: "\u{C6E8}",
-        nfkd: "\u{110B}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{C6E9}",
-        nfc: "\u{C6E9}",
-        nfd: "\u{110B}\u{1170}\u{11A8}",
-        nfkc: "\u{C6E9}",
-        nfkd: "\u{110B}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C6EA}",
-        nfc: "\u{C6EA}",
-        nfd: "\u{110B}\u{1170}\u{11A9}",
-        nfkc: "\u{C6EA}",
-        nfkd: "\u{110B}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C6EB}",
-        nfc: "\u{C6EB}",
-        nfd: "\u{110B}\u{1170}\u{11AA}",
-        nfkc: "\u{C6EB}",
-        nfkd: "\u{110B}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C6EC}",
-        nfc: "\u{C6EC}",
-        nfd: "\u{110B}\u{1170}\u{11AB}",
-        nfkc: "\u{C6EC}",
-        nfkd: "\u{110B}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C6ED}",
-        nfc: "\u{C6ED}",
-        nfd: "\u{110B}\u{1170}\u{11AC}",
-        nfkc: "\u{C6ED}",
-        nfkd: "\u{110B}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C6EE}",
-        nfc: "\u{C6EE}",
-        nfd: "\u{110B}\u{1170}\u{11AD}",
-        nfkc: "\u{C6EE}",
-        nfkd: "\u{110B}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C6EF}",
-        nfc: "\u{C6EF}",
-        nfd: "\u{110B}\u{1170}\u{11AE}",
-        nfkc: "\u{C6EF}",
-        nfkd: "\u{110B}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C6F0}",
-        nfc: "\u{C6F0}",
-        nfd: "\u{110B}\u{1170}\u{11AF}",
-        nfkc: "\u{C6F0}",
-        nfkd: "\u{110B}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C6F1}",
-        nfc: "\u{C6F1}",
-        nfd: "\u{110B}\u{1170}\u{11B0}",
-        nfkc: "\u{C6F1}",
-        nfkd: "\u{110B}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C6F2}",
-        nfc: "\u{C6F2}",
-        nfd: "\u{110B}\u{1170}\u{11B1}",
-        nfkc: "\u{C6F2}",
-        nfkd: "\u{110B}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C6F3}",
-        nfc: "\u{C6F3}",
-        nfd: "\u{110B}\u{1170}\u{11B2}",
-        nfkc: "\u{C6F3}",
-        nfkd: "\u{110B}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C6F4}",
-        nfc: "\u{C6F4}",
-        nfd: "\u{110B}\u{1170}\u{11B3}",
-        nfkc: "\u{C6F4}",
-        nfkd: "\u{110B}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C6F5}",
-        nfc: "\u{C6F5}",
-        nfd: "\u{110B}\u{1170}\u{11B4}",
-        nfkc: "\u{C6F5}",
-        nfkd: "\u{110B}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C6F6}",
-        nfc: "\u{C6F6}",
-        nfd: "\u{110B}\u{1170}\u{11B5}",
-        nfkc: "\u{C6F6}",
-        nfkd: "\u{110B}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C6F7}",
-        nfc: "\u{C6F7}",
-        nfd: "\u{110B}\u{1170}\u{11B6}",
-        nfkc: "\u{C6F7}",
-        nfkd: "\u{110B}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C6F8}",
-        nfc: "\u{C6F8}",
-        nfd: "\u{110B}\u{1170}\u{11B7}",
-        nfkc: "\u{C6F8}",
-        nfkd: "\u{110B}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C6F9}",
-        nfc: "\u{C6F9}",
-        nfd: "\u{110B}\u{1170}\u{11B8}",
-        nfkc: "\u{C6F9}",
-        nfkd: "\u{110B}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C6FA}",
-        nfc: "\u{C6FA}",
-        nfd: "\u{110B}\u{1170}\u{11B9}",
-        nfkc: "\u{C6FA}",
-        nfkd: "\u{110B}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C6FB}",
-        nfc: "\u{C6FB}",
-        nfd: "\u{110B}\u{1170}\u{11BA}",
-        nfkc: "\u{C6FB}",
-        nfkd: "\u{110B}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C6FC}",
-        nfc: "\u{C6FC}",
-        nfd: "\u{110B}\u{1170}\u{11BB}",
-        nfkc: "\u{C6FC}",
-        nfkd: "\u{110B}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C6FD}",
-        nfc: "\u{C6FD}",
-        nfd: "\u{110B}\u{1170}\u{11BC}",
-        nfkc: "\u{C6FD}",
-        nfkd: "\u{110B}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C6FE}",
-        nfc: "\u{C6FE}",
-        nfd: "\u{110B}\u{1170}\u{11BD}",
-        nfkc: "\u{C6FE}",
-        nfkd: "\u{110B}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C6FF}",
-        nfc: "\u{C6FF}",
-        nfd: "\u{110B}\u{1170}\u{11BE}",
-        nfkc: "\u{C6FF}",
-        nfkd: "\u{110B}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C700}",
-        nfc: "\u{C700}",
-        nfd: "\u{110B}\u{1170}\u{11BF}",
-        nfkc: "\u{C700}",
-        nfkd: "\u{110B}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C701}",
-        nfc: "\u{C701}",
-        nfd: "\u{110B}\u{1170}\u{11C0}",
-        nfkc: "\u{C701}",
-        nfkd: "\u{110B}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C702}",
-        nfc: "\u{C702}",
-        nfd: "\u{110B}\u{1170}\u{11C1}",
-        nfkc: "\u{C702}",
-        nfkd: "\u{110B}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C703}",
-        nfc: "\u{C703}",
-        nfd: "\u{110B}\u{1170}\u{11C2}",
-        nfkc: "\u{C703}",
-        nfkd: "\u{110B}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C704}",
-        nfc: "\u{C704}",
-        nfd: "\u{110B}\u{1171}",
-        nfkc: "\u{C704}",
-        nfkd: "\u{110B}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{C705}",
-        nfc: "\u{C705}",
-        nfd: "\u{110B}\u{1171}\u{11A8}",
-        nfkc: "\u{C705}",
-        nfkd: "\u{110B}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C706}",
-        nfc: "\u{C706}",
-        nfd: "\u{110B}\u{1171}\u{11A9}",
-        nfkc: "\u{C706}",
-        nfkd: "\u{110B}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C707}",
-        nfc: "\u{C707}",
-        nfd: "\u{110B}\u{1171}\u{11AA}",
-        nfkc: "\u{C707}",
-        nfkd: "\u{110B}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C708}",
-        nfc: "\u{C708}",
-        nfd: "\u{110B}\u{1171}\u{11AB}",
-        nfkc: "\u{C708}",
-        nfkd: "\u{110B}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C709}",
-        nfc: "\u{C709}",
-        nfd: "\u{110B}\u{1171}\u{11AC}",
-        nfkc: "\u{C709}",
-        nfkd: "\u{110B}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C70A}",
-        nfc: "\u{C70A}",
-        nfd: "\u{110B}\u{1171}\u{11AD}",
-        nfkc: "\u{C70A}",
-        nfkd: "\u{110B}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C70B}",
-        nfc: "\u{C70B}",
-        nfd: "\u{110B}\u{1171}\u{11AE}",
-        nfkc: "\u{C70B}",
-        nfkd: "\u{110B}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C70C}",
-        nfc: "\u{C70C}",
-        nfd: "\u{110B}\u{1171}\u{11AF}",
-        nfkc: "\u{C70C}",
-        nfkd: "\u{110B}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C70D}",
-        nfc: "\u{C70D}",
-        nfd: "\u{110B}\u{1171}\u{11B0}",
-        nfkc: "\u{C70D}",
-        nfkd: "\u{110B}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C70E}",
-        nfc: "\u{C70E}",
-        nfd: "\u{110B}\u{1171}\u{11B1}",
-        nfkc: "\u{C70E}",
-        nfkd: "\u{110B}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C70F}",
-        nfc: "\u{C70F}",
-        nfd: "\u{110B}\u{1171}\u{11B2}",
-        nfkc: "\u{C70F}",
-        nfkd: "\u{110B}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C710}",
-        nfc: "\u{C710}",
-        nfd: "\u{110B}\u{1171}\u{11B3}",
-        nfkc: "\u{C710}",
-        nfkd: "\u{110B}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C711}",
-        nfc: "\u{C711}",
-        nfd: "\u{110B}\u{1171}\u{11B4}",
-        nfkc: "\u{C711}",
-        nfkd: "\u{110B}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C712}",
-        nfc: "\u{C712}",
-        nfd: "\u{110B}\u{1171}\u{11B5}",
-        nfkc: "\u{C712}",
-        nfkd: "\u{110B}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C713}",
-        nfc: "\u{C713}",
-        nfd: "\u{110B}\u{1171}\u{11B6}",
-        nfkc: "\u{C713}",
-        nfkd: "\u{110B}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C714}",
-        nfc: "\u{C714}",
-        nfd: "\u{110B}\u{1171}\u{11B7}",
-        nfkc: "\u{C714}",
-        nfkd: "\u{110B}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C715}",
-        nfc: "\u{C715}",
-        nfd: "\u{110B}\u{1171}\u{11B8}",
-        nfkc: "\u{C715}",
-        nfkd: "\u{110B}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C716}",
-        nfc: "\u{C716}",
-        nfd: "\u{110B}\u{1171}\u{11B9}",
-        nfkc: "\u{C716}",
-        nfkd: "\u{110B}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C717}",
-        nfc: "\u{C717}",
-        nfd: "\u{110B}\u{1171}\u{11BA}",
-        nfkc: "\u{C717}",
-        nfkd: "\u{110B}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C718}",
-        nfc: "\u{C718}",
-        nfd: "\u{110B}\u{1171}\u{11BB}",
-        nfkc: "\u{C718}",
-        nfkd: "\u{110B}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C719}",
-        nfc: "\u{C719}",
-        nfd: "\u{110B}\u{1171}\u{11BC}",
-        nfkc: "\u{C719}",
-        nfkd: "\u{110B}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C71A}",
-        nfc: "\u{C71A}",
-        nfd: "\u{110B}\u{1171}\u{11BD}",
-        nfkc: "\u{C71A}",
-        nfkd: "\u{110B}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C71B}",
-        nfc: "\u{C71B}",
-        nfd: "\u{110B}\u{1171}\u{11BE}",
-        nfkc: "\u{C71B}",
-        nfkd: "\u{110B}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C71C}",
-        nfc: "\u{C71C}",
-        nfd: "\u{110B}\u{1171}\u{11BF}",
-        nfkc: "\u{C71C}",
-        nfkd: "\u{110B}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C71D}",
-        nfc: "\u{C71D}",
-        nfd: "\u{110B}\u{1171}\u{11C0}",
-        nfkc: "\u{C71D}",
-        nfkd: "\u{110B}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C71E}",
-        nfc: "\u{C71E}",
-        nfd: "\u{110B}\u{1171}\u{11C1}",
-        nfkc: "\u{C71E}",
-        nfkd: "\u{110B}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C71F}",
-        nfc: "\u{C71F}",
-        nfd: "\u{110B}\u{1171}\u{11C2}",
-        nfkc: "\u{C71F}",
-        nfkd: "\u{110B}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C720}",
-        nfc: "\u{C720}",
-        nfd: "\u{110B}\u{1172}",
-        nfkc: "\u{C720}",
-        nfkd: "\u{110B}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{C721}",
-        nfc: "\u{C721}",
-        nfd: "\u{110B}\u{1172}\u{11A8}",
-        nfkc: "\u{C721}",
-        nfkd: "\u{110B}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C722}",
-        nfc: "\u{C722}",
-        nfd: "\u{110B}\u{1172}\u{11A9}",
-        nfkc: "\u{C722}",
-        nfkd: "\u{110B}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C723}",
-        nfc: "\u{C723}",
-        nfd: "\u{110B}\u{1172}\u{11AA}",
-        nfkc: "\u{C723}",
-        nfkd: "\u{110B}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C724}",
-        nfc: "\u{C724}",
-        nfd: "\u{110B}\u{1172}\u{11AB}",
-        nfkc: "\u{C724}",
-        nfkd: "\u{110B}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C725}",
-        nfc: "\u{C725}",
-        nfd: "\u{110B}\u{1172}\u{11AC}",
-        nfkc: "\u{C725}",
-        nfkd: "\u{110B}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C726}",
-        nfc: "\u{C726}",
-        nfd: "\u{110B}\u{1172}\u{11AD}",
-        nfkc: "\u{C726}",
-        nfkd: "\u{110B}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C727}",
-        nfc: "\u{C727}",
-        nfd: "\u{110B}\u{1172}\u{11AE}",
-        nfkc: "\u{C727}",
-        nfkd: "\u{110B}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C728}",
-        nfc: "\u{C728}",
-        nfd: "\u{110B}\u{1172}\u{11AF}",
-        nfkc: "\u{C728}",
-        nfkd: "\u{110B}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C729}",
-        nfc: "\u{C729}",
-        nfd: "\u{110B}\u{1172}\u{11B0}",
-        nfkc: "\u{C729}",
-        nfkd: "\u{110B}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C72A}",
-        nfc: "\u{C72A}",
-        nfd: "\u{110B}\u{1172}\u{11B1}",
-        nfkc: "\u{C72A}",
-        nfkd: "\u{110B}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C72B}",
-        nfc: "\u{C72B}",
-        nfd: "\u{110B}\u{1172}\u{11B2}",
-        nfkc: "\u{C72B}",
-        nfkd: "\u{110B}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C72C}",
-        nfc: "\u{C72C}",
-        nfd: "\u{110B}\u{1172}\u{11B3}",
-        nfkc: "\u{C72C}",
-        nfkd: "\u{110B}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C72D}",
-        nfc: "\u{C72D}",
-        nfd: "\u{110B}\u{1172}\u{11B4}",
-        nfkc: "\u{C72D}",
-        nfkd: "\u{110B}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C72E}",
-        nfc: "\u{C72E}",
-        nfd: "\u{110B}\u{1172}\u{11B5}",
-        nfkc: "\u{C72E}",
-        nfkd: "\u{110B}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C72F}",
-        nfc: "\u{C72F}",
-        nfd: "\u{110B}\u{1172}\u{11B6}",
-        nfkc: "\u{C72F}",
-        nfkd: "\u{110B}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C730}",
-        nfc: "\u{C730}",
-        nfd: "\u{110B}\u{1172}\u{11B7}",
-        nfkc: "\u{C730}",
-        nfkd: "\u{110B}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C731}",
-        nfc: "\u{C731}",
-        nfd: "\u{110B}\u{1172}\u{11B8}",
-        nfkc: "\u{C731}",
-        nfkd: "\u{110B}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C732}",
-        nfc: "\u{C732}",
-        nfd: "\u{110B}\u{1172}\u{11B9}",
-        nfkc: "\u{C732}",
-        nfkd: "\u{110B}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C733}",
-        nfc: "\u{C733}",
-        nfd: "\u{110B}\u{1172}\u{11BA}",
-        nfkc: "\u{C733}",
-        nfkd: "\u{110B}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C734}",
-        nfc: "\u{C734}",
-        nfd: "\u{110B}\u{1172}\u{11BB}",
-        nfkc: "\u{C734}",
-        nfkd: "\u{110B}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C735}",
-        nfc: "\u{C735}",
-        nfd: "\u{110B}\u{1172}\u{11BC}",
-        nfkc: "\u{C735}",
-        nfkd: "\u{110B}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C736}",
-        nfc: "\u{C736}",
-        nfd: "\u{110B}\u{1172}\u{11BD}",
-        nfkc: "\u{C736}",
-        nfkd: "\u{110B}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C737}",
-        nfc: "\u{C737}",
-        nfd: "\u{110B}\u{1172}\u{11BE}",
-        nfkc: "\u{C737}",
-        nfkd: "\u{110B}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C738}",
-        nfc: "\u{C738}",
-        nfd: "\u{110B}\u{1172}\u{11BF}",
-        nfkc: "\u{C738}",
-        nfkd: "\u{110B}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C739}",
-        nfc: "\u{C739}",
-        nfd: "\u{110B}\u{1172}\u{11C0}",
-        nfkc: "\u{C739}",
-        nfkd: "\u{110B}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C73A}",
-        nfc: "\u{C73A}",
-        nfd: "\u{110B}\u{1172}\u{11C1}",
-        nfkc: "\u{C73A}",
-        nfkd: "\u{110B}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C73B}",
-        nfc: "\u{C73B}",
-        nfd: "\u{110B}\u{1172}\u{11C2}",
-        nfkc: "\u{C73B}",
-        nfkd: "\u{110B}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C73C}",
-        nfc: "\u{C73C}",
-        nfd: "\u{110B}\u{1173}",
-        nfkc: "\u{C73C}",
-        nfkd: "\u{110B}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{C73D}",
-        nfc: "\u{C73D}",
-        nfd: "\u{110B}\u{1173}\u{11A8}",
-        nfkc: "\u{C73D}",
-        nfkd: "\u{110B}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C73E}",
-        nfc: "\u{C73E}",
-        nfd: "\u{110B}\u{1173}\u{11A9}",
-        nfkc: "\u{C73E}",
-        nfkd: "\u{110B}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C73F}",
-        nfc: "\u{C73F}",
-        nfd: "\u{110B}\u{1173}\u{11AA}",
-        nfkc: "\u{C73F}",
-        nfkd: "\u{110B}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C740}",
-        nfc: "\u{C740}",
-        nfd: "\u{110B}\u{1173}\u{11AB}",
-        nfkc: "\u{C740}",
-        nfkd: "\u{110B}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C741}",
-        nfc: "\u{C741}",
-        nfd: "\u{110B}\u{1173}\u{11AC}",
-        nfkc: "\u{C741}",
-        nfkd: "\u{110B}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C742}",
-        nfc: "\u{C742}",
-        nfd: "\u{110B}\u{1173}\u{11AD}",
-        nfkc: "\u{C742}",
-        nfkd: "\u{110B}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C743}",
-        nfc: "\u{C743}",
-        nfd: "\u{110B}\u{1173}\u{11AE}",
-        nfkc: "\u{C743}",
-        nfkd: "\u{110B}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C744}",
-        nfc: "\u{C744}",
-        nfd: "\u{110B}\u{1173}\u{11AF}",
-        nfkc: "\u{C744}",
-        nfkd: "\u{110B}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C745}",
-        nfc: "\u{C745}",
-        nfd: "\u{110B}\u{1173}\u{11B0}",
-        nfkc: "\u{C745}",
-        nfkd: "\u{110B}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C746}",
-        nfc: "\u{C746}",
-        nfd: "\u{110B}\u{1173}\u{11B1}",
-        nfkc: "\u{C746}",
-        nfkd: "\u{110B}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C747}",
-        nfc: "\u{C747}",
-        nfd: "\u{110B}\u{1173}\u{11B2}",
-        nfkc: "\u{C747}",
-        nfkd: "\u{110B}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C748}",
-        nfc: "\u{C748}",
-        nfd: "\u{110B}\u{1173}\u{11B3}",
-        nfkc: "\u{C748}",
-        nfkd: "\u{110B}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C749}",
-        nfc: "\u{C749}",
-        nfd: "\u{110B}\u{1173}\u{11B4}",
-        nfkc: "\u{C749}",
-        nfkd: "\u{110B}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C74A}",
-        nfc: "\u{C74A}",
-        nfd: "\u{110B}\u{1173}\u{11B5}",
-        nfkc: "\u{C74A}",
-        nfkd: "\u{110B}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C74B}",
-        nfc: "\u{C74B}",
-        nfd: "\u{110B}\u{1173}\u{11B6}",
-        nfkc: "\u{C74B}",
-        nfkd: "\u{110B}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C74C}",
-        nfc: "\u{C74C}",
-        nfd: "\u{110B}\u{1173}\u{11B7}",
-        nfkc: "\u{C74C}",
-        nfkd: "\u{110B}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C74D}",
-        nfc: "\u{C74D}",
-        nfd: "\u{110B}\u{1173}\u{11B8}",
-        nfkc: "\u{C74D}",
-        nfkd: "\u{110B}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C74E}",
-        nfc: "\u{C74E}",
-        nfd: "\u{110B}\u{1173}\u{11B9}",
-        nfkc: "\u{C74E}",
-        nfkd: "\u{110B}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C74F}",
-        nfc: "\u{C74F}",
-        nfd: "\u{110B}\u{1173}\u{11BA}",
-        nfkc: "\u{C74F}",
-        nfkd: "\u{110B}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C750}",
-        nfc: "\u{C750}",
-        nfd: "\u{110B}\u{1173}\u{11BB}",
-        nfkc: "\u{C750}",
-        nfkd: "\u{110B}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C751}",
-        nfc: "\u{C751}",
-        nfd: "\u{110B}\u{1173}\u{11BC}",
-        nfkc: "\u{C751}",
-        nfkd: "\u{110B}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C752}",
-        nfc: "\u{C752}",
-        nfd: "\u{110B}\u{1173}\u{11BD}",
-        nfkc: "\u{C752}",
-        nfkd: "\u{110B}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C753}",
-        nfc: "\u{C753}",
-        nfd: "\u{110B}\u{1173}\u{11BE}",
-        nfkc: "\u{C753}",
-        nfkd: "\u{110B}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C754}",
-        nfc: "\u{C754}",
-        nfd: "\u{110B}\u{1173}\u{11BF}",
-        nfkc: "\u{C754}",
-        nfkd: "\u{110B}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C755}",
-        nfc: "\u{C755}",
-        nfd: "\u{110B}\u{1173}\u{11C0}",
-        nfkc: "\u{C755}",
-        nfkd: "\u{110B}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C756}",
-        nfc: "\u{C756}",
-        nfd: "\u{110B}\u{1173}\u{11C1}",
-        nfkc: "\u{C756}",
-        nfkd: "\u{110B}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C757}",
-        nfc: "\u{C757}",
-        nfd: "\u{110B}\u{1173}\u{11C2}",
-        nfkc: "\u{C757}",
-        nfkd: "\u{110B}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C758}",
-        nfc: "\u{C758}",
-        nfd: "\u{110B}\u{1174}",
-        nfkc: "\u{C758}",
-        nfkd: "\u{110B}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{C759}",
-        nfc: "\u{C759}",
-        nfd: "\u{110B}\u{1174}\u{11A8}",
-        nfkc: "\u{C759}",
-        nfkd: "\u{110B}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C75A}",
-        nfc: "\u{C75A}",
-        nfd: "\u{110B}\u{1174}\u{11A9}",
-        nfkc: "\u{C75A}",
-        nfkd: "\u{110B}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C75B}",
-        nfc: "\u{C75B}",
-        nfd: "\u{110B}\u{1174}\u{11AA}",
-        nfkc: "\u{C75B}",
-        nfkd: "\u{110B}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C75C}",
-        nfc: "\u{C75C}",
-        nfd: "\u{110B}\u{1174}\u{11AB}",
-        nfkc: "\u{C75C}",
-        nfkd: "\u{110B}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C75D}",
-        nfc: "\u{C75D}",
-        nfd: "\u{110B}\u{1174}\u{11AC}",
-        nfkc: "\u{C75D}",
-        nfkd: "\u{110B}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C75E}",
-        nfc: "\u{C75E}",
-        nfd: "\u{110B}\u{1174}\u{11AD}",
-        nfkc: "\u{C75E}",
-        nfkd: "\u{110B}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C75F}",
-        nfc: "\u{C75F}",
-        nfd: "\u{110B}\u{1174}\u{11AE}",
-        nfkc: "\u{C75F}",
-        nfkd: "\u{110B}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C760}",
-        nfc: "\u{C760}",
-        nfd: "\u{110B}\u{1174}\u{11AF}",
-        nfkc: "\u{C760}",
-        nfkd: "\u{110B}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C761}",
-        nfc: "\u{C761}",
-        nfd: "\u{110B}\u{1174}\u{11B0}",
-        nfkc: "\u{C761}",
-        nfkd: "\u{110B}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C762}",
-        nfc: "\u{C762}",
-        nfd: "\u{110B}\u{1174}\u{11B1}",
-        nfkc: "\u{C762}",
-        nfkd: "\u{110B}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C763}",
-        nfc: "\u{C763}",
-        nfd: "\u{110B}\u{1174}\u{11B2}",
-        nfkc: "\u{C763}",
-        nfkd: "\u{110B}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C764}",
-        nfc: "\u{C764}",
-        nfd: "\u{110B}\u{1174}\u{11B3}",
-        nfkc: "\u{C764}",
-        nfkd: "\u{110B}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C765}",
-        nfc: "\u{C765}",
-        nfd: "\u{110B}\u{1174}\u{11B4}",
-        nfkc: "\u{C765}",
-        nfkd: "\u{110B}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C766}",
-        nfc: "\u{C766}",
-        nfd: "\u{110B}\u{1174}\u{11B5}",
-        nfkc: "\u{C766}",
-        nfkd: "\u{110B}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C767}",
-        nfc: "\u{C767}",
-        nfd: "\u{110B}\u{1174}\u{11B6}",
-        nfkc: "\u{C767}",
-        nfkd: "\u{110B}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C768}",
-        nfc: "\u{C768}",
-        nfd: "\u{110B}\u{1174}\u{11B7}",
-        nfkc: "\u{C768}",
-        nfkd: "\u{110B}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C769}",
-        nfc: "\u{C769}",
-        nfd: "\u{110B}\u{1174}\u{11B8}",
-        nfkc: "\u{C769}",
-        nfkd: "\u{110B}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C76A}",
-        nfc: "\u{C76A}",
-        nfd: "\u{110B}\u{1174}\u{11B9}",
-        nfkc: "\u{C76A}",
-        nfkd: "\u{110B}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C76B}",
-        nfc: "\u{C76B}",
-        nfd: "\u{110B}\u{1174}\u{11BA}",
-        nfkc: "\u{C76B}",
-        nfkd: "\u{110B}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C76C}",
-        nfc: "\u{C76C}",
-        nfd: "\u{110B}\u{1174}\u{11BB}",
-        nfkc: "\u{C76C}",
-        nfkd: "\u{110B}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C76D}",
-        nfc: "\u{C76D}",
-        nfd: "\u{110B}\u{1174}\u{11BC}",
-        nfkc: "\u{C76D}",
-        nfkd: "\u{110B}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C76E}",
-        nfc: "\u{C76E}",
-        nfd: "\u{110B}\u{1174}\u{11BD}",
-        nfkc: "\u{C76E}",
-        nfkd: "\u{110B}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C76F}",
-        nfc: "\u{C76F}",
-        nfd: "\u{110B}\u{1174}\u{11BE}",
-        nfkc: "\u{C76F}",
-        nfkd: "\u{110B}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C770}",
-        nfc: "\u{C770}",
-        nfd: "\u{110B}\u{1174}\u{11BF}",
-        nfkc: "\u{C770}",
-        nfkd: "\u{110B}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C771}",
-        nfc: "\u{C771}",
-        nfd: "\u{110B}\u{1174}\u{11C0}",
-        nfkc: "\u{C771}",
-        nfkd: "\u{110B}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C772}",
-        nfc: "\u{C772}",
-        nfd: "\u{110B}\u{1174}\u{11C1}",
-        nfkc: "\u{C772}",
-        nfkd: "\u{110B}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C773}",
-        nfc: "\u{C773}",
-        nfd: "\u{110B}\u{1174}\u{11C2}",
-        nfkc: "\u{C773}",
-        nfkd: "\u{110B}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C774}",
-        nfc: "\u{C774}",
-        nfd: "\u{110B}\u{1175}",
-        nfkc: "\u{C774}",
-        nfkd: "\u{110B}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{C775}",
-        nfc: "\u{C775}",
-        nfd: "\u{110B}\u{1175}\u{11A8}",
-        nfkc: "\u{C775}",
-        nfkd: "\u{110B}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C776}",
-        nfc: "\u{C776}",
-        nfd: "\u{110B}\u{1175}\u{11A9}",
-        nfkc: "\u{C776}",
-        nfkd: "\u{110B}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C777}",
-        nfc: "\u{C777}",
-        nfd: "\u{110B}\u{1175}\u{11AA}",
-        nfkc: "\u{C777}",
-        nfkd: "\u{110B}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C778}",
-        nfc: "\u{C778}",
-        nfd: "\u{110B}\u{1175}\u{11AB}",
-        nfkc: "\u{C778}",
-        nfkd: "\u{110B}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C779}",
-        nfc: "\u{C779}",
-        nfd: "\u{110B}\u{1175}\u{11AC}",
-        nfkc: "\u{C779}",
-        nfkd: "\u{110B}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C77A}",
-        nfc: "\u{C77A}",
-        nfd: "\u{110B}\u{1175}\u{11AD}",
-        nfkc: "\u{C77A}",
-        nfkd: "\u{110B}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C77B}",
-        nfc: "\u{C77B}",
-        nfd: "\u{110B}\u{1175}\u{11AE}",
-        nfkc: "\u{C77B}",
-        nfkd: "\u{110B}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C77C}",
-        nfc: "\u{C77C}",
-        nfd: "\u{110B}\u{1175}\u{11AF}",
-        nfkc: "\u{C77C}",
-        nfkd: "\u{110B}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C77D}",
-        nfc: "\u{C77D}",
-        nfd: "\u{110B}\u{1175}\u{11B0}",
-        nfkc: "\u{C77D}",
-        nfkd: "\u{110B}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C77E}",
-        nfc: "\u{C77E}",
-        nfd: "\u{110B}\u{1175}\u{11B1}",
-        nfkc: "\u{C77E}",
-        nfkd: "\u{110B}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C77F}",
-        nfc: "\u{C77F}",
-        nfd: "\u{110B}\u{1175}\u{11B2}",
-        nfkc: "\u{C77F}",
-        nfkd: "\u{110B}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C780}",
-        nfc: "\u{C780}",
-        nfd: "\u{110B}\u{1175}\u{11B3}",
-        nfkc: "\u{C780}",
-        nfkd: "\u{110B}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C781}",
-        nfc: "\u{C781}",
-        nfd: "\u{110B}\u{1175}\u{11B4}",
-        nfkc: "\u{C781}",
-        nfkd: "\u{110B}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C782}",
-        nfc: "\u{C782}",
-        nfd: "\u{110B}\u{1175}\u{11B5}",
-        nfkc: "\u{C782}",
-        nfkd: "\u{110B}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C783}",
-        nfc: "\u{C783}",
-        nfd: "\u{110B}\u{1175}\u{11B6}",
-        nfkc: "\u{C783}",
-        nfkd: "\u{110B}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C784}",
-        nfc: "\u{C784}",
-        nfd: "\u{110B}\u{1175}\u{11B7}",
-        nfkc: "\u{C784}",
-        nfkd: "\u{110B}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C785}",
-        nfc: "\u{C785}",
-        nfd: "\u{110B}\u{1175}\u{11B8}",
-        nfkc: "\u{C785}",
-        nfkd: "\u{110B}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C786}",
-        nfc: "\u{C786}",
-        nfd: "\u{110B}\u{1175}\u{11B9}",
-        nfkc: "\u{C786}",
-        nfkd: "\u{110B}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C787}",
-        nfc: "\u{C787}",
-        nfd: "\u{110B}\u{1175}\u{11BA}",
-        nfkc: "\u{C787}",
-        nfkd: "\u{110B}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C788}",
-        nfc: "\u{C788}",
-        nfd: "\u{110B}\u{1175}\u{11BB}",
-        nfkc: "\u{C788}",
-        nfkd: "\u{110B}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C789}",
-        nfc: "\u{C789}",
-        nfd: "\u{110B}\u{1175}\u{11BC}",
-        nfkc: "\u{C789}",
-        nfkd: "\u{110B}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C78A}",
-        nfc: "\u{C78A}",
-        nfd: "\u{110B}\u{1175}\u{11BD}",
-        nfkc: "\u{C78A}",
-        nfkd: "\u{110B}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C78B}",
-        nfc: "\u{C78B}",
-        nfd: "\u{110B}\u{1175}\u{11BE}",
-        nfkc: "\u{C78B}",
-        nfkd: "\u{110B}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C78C}",
-        nfc: "\u{C78C}",
-        nfd: "\u{110B}\u{1175}\u{11BF}",
-        nfkc: "\u{C78C}",
-        nfkd: "\u{110B}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C78D}",
-        nfc: "\u{C78D}",
-        nfd: "\u{110B}\u{1175}\u{11C0}",
-        nfkc: "\u{C78D}",
-        nfkd: "\u{110B}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C78E}",
-        nfc: "\u{C78E}",
-        nfd: "\u{110B}\u{1175}\u{11C1}",
-        nfkc: "\u{C78E}",
-        nfkd: "\u{110B}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C78F}",
-        nfc: "\u{C78F}",
-        nfd: "\u{110B}\u{1175}\u{11C2}",
-        nfkc: "\u{C78F}",
-        nfkd: "\u{110B}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C790}",
-        nfc: "\u{C790}",
-        nfd: "\u{110C}\u{1161}",
-        nfkc: "\u{C790}",
-        nfkd: "\u{110C}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{C791}",
-        nfc: "\u{C791}",
-        nfd: "\u{110C}\u{1161}\u{11A8}",
-        nfkc: "\u{C791}",
-        nfkd: "\u{110C}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C792}",
-        nfc: "\u{C792}",
-        nfd: "\u{110C}\u{1161}\u{11A9}",
-        nfkc: "\u{C792}",
-        nfkd: "\u{110C}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C793}",
-        nfc: "\u{C793}",
-        nfd: "\u{110C}\u{1161}\u{11AA}",
-        nfkc: "\u{C793}",
-        nfkd: "\u{110C}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C794}",
-        nfc: "\u{C794}",
-        nfd: "\u{110C}\u{1161}\u{11AB}",
-        nfkc: "\u{C794}",
-        nfkd: "\u{110C}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C795}",
-        nfc: "\u{C795}",
-        nfd: "\u{110C}\u{1161}\u{11AC}",
-        nfkc: "\u{C795}",
-        nfkd: "\u{110C}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C796}",
-        nfc: "\u{C796}",
-        nfd: "\u{110C}\u{1161}\u{11AD}",
-        nfkc: "\u{C796}",
-        nfkd: "\u{110C}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C797}",
-        nfc: "\u{C797}",
-        nfd: "\u{110C}\u{1161}\u{11AE}",
-        nfkc: "\u{C797}",
-        nfkd: "\u{110C}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C798}",
-        nfc: "\u{C798}",
-        nfd: "\u{110C}\u{1161}\u{11AF}",
-        nfkc: "\u{C798}",
-        nfkd: "\u{110C}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C799}",
-        nfc: "\u{C799}",
-        nfd: "\u{110C}\u{1161}\u{11B0}",
-        nfkc: "\u{C799}",
-        nfkd: "\u{110C}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C79A}",
-        nfc: "\u{C79A}",
-        nfd: "\u{110C}\u{1161}\u{11B1}",
-        nfkc: "\u{C79A}",
-        nfkd: "\u{110C}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C79B}",
-        nfc: "\u{C79B}",
-        nfd: "\u{110C}\u{1161}\u{11B2}",
-        nfkc: "\u{C79B}",
-        nfkd: "\u{110C}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C79C}",
-        nfc: "\u{C79C}",
-        nfd: "\u{110C}\u{1161}\u{11B3}",
-        nfkc: "\u{C79C}",
-        nfkd: "\u{110C}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C79D}",
-        nfc: "\u{C79D}",
-        nfd: "\u{110C}\u{1161}\u{11B4}",
-        nfkc: "\u{C79D}",
-        nfkd: "\u{110C}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C79E}",
-        nfc: "\u{C79E}",
-        nfd: "\u{110C}\u{1161}\u{11B5}",
-        nfkc: "\u{C79E}",
-        nfkd: "\u{110C}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C79F}",
-        nfc: "\u{C79F}",
-        nfd: "\u{110C}\u{1161}\u{11B6}",
-        nfkc: "\u{C79F}",
-        nfkd: "\u{110C}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C7A0}",
-        nfc: "\u{C7A0}",
-        nfd: "\u{110C}\u{1161}\u{11B7}",
-        nfkc: "\u{C7A0}",
-        nfkd: "\u{110C}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C7A1}",
-        nfc: "\u{C7A1}",
-        nfd: "\u{110C}\u{1161}\u{11B8}",
-        nfkc: "\u{C7A1}",
-        nfkd: "\u{110C}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C7A2}",
-        nfc: "\u{C7A2}",
-        nfd: "\u{110C}\u{1161}\u{11B9}",
-        nfkc: "\u{C7A2}",
-        nfkd: "\u{110C}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C7A3}",
-        nfc: "\u{C7A3}",
-        nfd: "\u{110C}\u{1161}\u{11BA}",
-        nfkc: "\u{C7A3}",
-        nfkd: "\u{110C}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C7A4}",
-        nfc: "\u{C7A4}",
-        nfd: "\u{110C}\u{1161}\u{11BB}",
-        nfkc: "\u{C7A4}",
-        nfkd: "\u{110C}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C7A5}",
-        nfc: "\u{C7A5}",
-        nfd: "\u{110C}\u{1161}\u{11BC}",
-        nfkc: "\u{C7A5}",
-        nfkd: "\u{110C}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C7A6}",
-        nfc: "\u{C7A6}",
-        nfd: "\u{110C}\u{1161}\u{11BD}",
-        nfkc: "\u{C7A6}",
-        nfkd: "\u{110C}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C7A7}",
-        nfc: "\u{C7A7}",
-        nfd: "\u{110C}\u{1161}\u{11BE}",
-        nfkc: "\u{C7A7}",
-        nfkd: "\u{110C}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C7A8}",
-        nfc: "\u{C7A8}",
-        nfd: "\u{110C}\u{1161}\u{11BF}",
-        nfkc: "\u{C7A8}",
-        nfkd: "\u{110C}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C7A9}",
-        nfc: "\u{C7A9}",
-        nfd: "\u{110C}\u{1161}\u{11C0}",
-        nfkc: "\u{C7A9}",
-        nfkd: "\u{110C}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C7AA}",
-        nfc: "\u{C7AA}",
-        nfd: "\u{110C}\u{1161}\u{11C1}",
-        nfkc: "\u{C7AA}",
-        nfkd: "\u{110C}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C7AB}",
-        nfc: "\u{C7AB}",
-        nfd: "\u{110C}\u{1161}\u{11C2}",
-        nfkc: "\u{C7AB}",
-        nfkd: "\u{110C}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C7AC}",
-        nfc: "\u{C7AC}",
-        nfd: "\u{110C}\u{1162}",
-        nfkc: "\u{C7AC}",
-        nfkd: "\u{110C}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{C7AD}",
-        nfc: "\u{C7AD}",
-        nfd: "\u{110C}\u{1162}\u{11A8}",
-        nfkc: "\u{C7AD}",
-        nfkd: "\u{110C}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C7AE}",
-        nfc: "\u{C7AE}",
-        nfd: "\u{110C}\u{1162}\u{11A9}",
-        nfkc: "\u{C7AE}",
-        nfkd: "\u{110C}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C7AF}",
-        nfc: "\u{C7AF}",
-        nfd: "\u{110C}\u{1162}\u{11AA}",
-        nfkc: "\u{C7AF}",
-        nfkd: "\u{110C}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C7B0}",
-        nfc: "\u{C7B0}",
-        nfd: "\u{110C}\u{1162}\u{11AB}",
-        nfkc: "\u{C7B0}",
-        nfkd: "\u{110C}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C7B1}",
-        nfc: "\u{C7B1}",
-        nfd: "\u{110C}\u{1162}\u{11AC}",
-        nfkc: "\u{C7B1}",
-        nfkd: "\u{110C}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C7B2}",
-        nfc: "\u{C7B2}",
-        nfd: "\u{110C}\u{1162}\u{11AD}",
-        nfkc: "\u{C7B2}",
-        nfkd: "\u{110C}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C7B3}",
-        nfc: "\u{C7B3}",
-        nfd: "\u{110C}\u{1162}\u{11AE}",
-        nfkc: "\u{C7B3}",
-        nfkd: "\u{110C}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C7B4}",
-        nfc: "\u{C7B4}",
-        nfd: "\u{110C}\u{1162}\u{11AF}",
-        nfkc: "\u{C7B4}",
-        nfkd: "\u{110C}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C7B5}",
-        nfc: "\u{C7B5}",
-        nfd: "\u{110C}\u{1162}\u{11B0}",
-        nfkc: "\u{C7B5}",
-        nfkd: "\u{110C}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C7B6}",
-        nfc: "\u{C7B6}",
-        nfd: "\u{110C}\u{1162}\u{11B1}",
-        nfkc: "\u{C7B6}",
-        nfkd: "\u{110C}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C7B7}",
-        nfc: "\u{C7B7}",
-        nfd: "\u{110C}\u{1162}\u{11B2}",
-        nfkc: "\u{C7B7}",
-        nfkd: "\u{110C}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C7B8}",
-        nfc: "\u{C7B8}",
-        nfd: "\u{110C}\u{1162}\u{11B3}",
-        nfkc: "\u{C7B8}",
-        nfkd: "\u{110C}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C7B9}",
-        nfc: "\u{C7B9}",
-        nfd: "\u{110C}\u{1162}\u{11B4}",
-        nfkc: "\u{C7B9}",
-        nfkd: "\u{110C}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C7BA}",
-        nfc: "\u{C7BA}",
-        nfd: "\u{110C}\u{1162}\u{11B5}",
-        nfkc: "\u{C7BA}",
-        nfkd: "\u{110C}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C7BB}",
-        nfc: "\u{C7BB}",
-        nfd: "\u{110C}\u{1162}\u{11B6}",
-        nfkc: "\u{C7BB}",
-        nfkd: "\u{110C}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C7BC}",
-        nfc: "\u{C7BC}",
-        nfd: "\u{110C}\u{1162}\u{11B7}",
-        nfkc: "\u{C7BC}",
-        nfkd: "\u{110C}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C7BD}",
-        nfc: "\u{C7BD}",
-        nfd: "\u{110C}\u{1162}\u{11B8}",
-        nfkc: "\u{C7BD}",
-        nfkd: "\u{110C}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C7BE}",
-        nfc: "\u{C7BE}",
-        nfd: "\u{110C}\u{1162}\u{11B9}",
-        nfkc: "\u{C7BE}",
-        nfkd: "\u{110C}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C7BF}",
-        nfc: "\u{C7BF}",
-        nfd: "\u{110C}\u{1162}\u{11BA}",
-        nfkc: "\u{C7BF}",
-        nfkd: "\u{110C}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C7C0}",
-        nfc: "\u{C7C0}",
-        nfd: "\u{110C}\u{1162}\u{11BB}",
-        nfkc: "\u{C7C0}",
-        nfkd: "\u{110C}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C7C1}",
-        nfc: "\u{C7C1}",
-        nfd: "\u{110C}\u{1162}\u{11BC}",
-        nfkc: "\u{C7C1}",
-        nfkd: "\u{110C}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C7C2}",
-        nfc: "\u{C7C2}",
-        nfd: "\u{110C}\u{1162}\u{11BD}",
-        nfkc: "\u{C7C2}",
-        nfkd: "\u{110C}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C7C3}",
-        nfc: "\u{C7C3}",
-        nfd: "\u{110C}\u{1162}\u{11BE}",
-        nfkc: "\u{C7C3}",
-        nfkd: "\u{110C}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C7C4}",
-        nfc: "\u{C7C4}",
-        nfd: "\u{110C}\u{1162}\u{11BF}",
-        nfkc: "\u{C7C4}",
-        nfkd: "\u{110C}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C7C5}",
-        nfc: "\u{C7C5}",
-        nfd: "\u{110C}\u{1162}\u{11C0}",
-        nfkc: "\u{C7C5}",
-        nfkd: "\u{110C}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C7C6}",
-        nfc: "\u{C7C6}",
-        nfd: "\u{110C}\u{1162}\u{11C1}",
-        nfkc: "\u{C7C6}",
-        nfkd: "\u{110C}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C7C7}",
-        nfc: "\u{C7C7}",
-        nfd: "\u{110C}\u{1162}\u{11C2}",
-        nfkc: "\u{C7C7}",
-        nfkd: "\u{110C}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C7C8}",
-        nfc: "\u{C7C8}",
-        nfd: "\u{110C}\u{1163}",
-        nfkc: "\u{C7C8}",
-        nfkd: "\u{110C}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{C7C9}",
-        nfc: "\u{C7C9}",
-        nfd: "\u{110C}\u{1163}\u{11A8}",
-        nfkc: "\u{C7C9}",
-        nfkd: "\u{110C}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C7CA}",
-        nfc: "\u{C7CA}",
-        nfd: "\u{110C}\u{1163}\u{11A9}",
-        nfkc: "\u{C7CA}",
-        nfkd: "\u{110C}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C7CB}",
-        nfc: "\u{C7CB}",
-        nfd: "\u{110C}\u{1163}\u{11AA}",
-        nfkc: "\u{C7CB}",
-        nfkd: "\u{110C}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C7CC}",
-        nfc: "\u{C7CC}",
-        nfd: "\u{110C}\u{1163}\u{11AB}",
-        nfkc: "\u{C7CC}",
-        nfkd: "\u{110C}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C7CD}",
-        nfc: "\u{C7CD}",
-        nfd: "\u{110C}\u{1163}\u{11AC}",
-        nfkc: "\u{C7CD}",
-        nfkd: "\u{110C}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C7CE}",
-        nfc: "\u{C7CE}",
-        nfd: "\u{110C}\u{1163}\u{11AD}",
-        nfkc: "\u{C7CE}",
-        nfkd: "\u{110C}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C7CF}",
-        nfc: "\u{C7CF}",
-        nfd: "\u{110C}\u{1163}\u{11AE}",
-        nfkc: "\u{C7CF}",
-        nfkd: "\u{110C}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C7D0}",
-        nfc: "\u{C7D0}",
-        nfd: "\u{110C}\u{1163}\u{11AF}",
-        nfkc: "\u{C7D0}",
-        nfkd: "\u{110C}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C7D1}",
-        nfc: "\u{C7D1}",
-        nfd: "\u{110C}\u{1163}\u{11B0}",
-        nfkc: "\u{C7D1}",
-        nfkd: "\u{110C}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C7D2}",
-        nfc: "\u{C7D2}",
-        nfd: "\u{110C}\u{1163}\u{11B1}",
-        nfkc: "\u{C7D2}",
-        nfkd: "\u{110C}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C7D3}",
-        nfc: "\u{C7D3}",
-        nfd: "\u{110C}\u{1163}\u{11B2}",
-        nfkc: "\u{C7D3}",
-        nfkd: "\u{110C}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C7D4}",
-        nfc: "\u{C7D4}",
-        nfd: "\u{110C}\u{1163}\u{11B3}",
-        nfkc: "\u{C7D4}",
-        nfkd: "\u{110C}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C7D5}",
-        nfc: "\u{C7D5}",
-        nfd: "\u{110C}\u{1163}\u{11B4}",
-        nfkc: "\u{C7D5}",
-        nfkd: "\u{110C}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C7D6}",
-        nfc: "\u{C7D6}",
-        nfd: "\u{110C}\u{1163}\u{11B5}",
-        nfkc: "\u{C7D6}",
-        nfkd: "\u{110C}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C7D7}",
-        nfc: "\u{C7D7}",
-        nfd: "\u{110C}\u{1163}\u{11B6}",
-        nfkc: "\u{C7D7}",
-        nfkd: "\u{110C}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C7D8}",
-        nfc: "\u{C7D8}",
-        nfd: "\u{110C}\u{1163}\u{11B7}",
-        nfkc: "\u{C7D8}",
-        nfkd: "\u{110C}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C7D9}",
-        nfc: "\u{C7D9}",
-        nfd: "\u{110C}\u{1163}\u{11B8}",
-        nfkc: "\u{C7D9}",
-        nfkd: "\u{110C}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C7DA}",
-        nfc: "\u{C7DA}",
-        nfd: "\u{110C}\u{1163}\u{11B9}",
-        nfkc: "\u{C7DA}",
-        nfkd: "\u{110C}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C7DB}",
-        nfc: "\u{C7DB}",
-        nfd: "\u{110C}\u{1163}\u{11BA}",
-        nfkc: "\u{C7DB}",
-        nfkd: "\u{110C}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C7DC}",
-        nfc: "\u{C7DC}",
-        nfd: "\u{110C}\u{1163}\u{11BB}",
-        nfkc: "\u{C7DC}",
-        nfkd: "\u{110C}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C7DD}",
-        nfc: "\u{C7DD}",
-        nfd: "\u{110C}\u{1163}\u{11BC}",
-        nfkc: "\u{C7DD}",
-        nfkd: "\u{110C}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C7DE}",
-        nfc: "\u{C7DE}",
-        nfd: "\u{110C}\u{1163}\u{11BD}",
-        nfkc: "\u{C7DE}",
-        nfkd: "\u{110C}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C7DF}",
-        nfc: "\u{C7DF}",
-        nfd: "\u{110C}\u{1163}\u{11BE}",
-        nfkc: "\u{C7DF}",
-        nfkd: "\u{110C}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C7E0}",
-        nfc: "\u{C7E0}",
-        nfd: "\u{110C}\u{1163}\u{11BF}",
-        nfkc: "\u{C7E0}",
-        nfkd: "\u{110C}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C7E1}",
-        nfc: "\u{C7E1}",
-        nfd: "\u{110C}\u{1163}\u{11C0}",
-        nfkc: "\u{C7E1}",
-        nfkd: "\u{110C}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C7E2}",
-        nfc: "\u{C7E2}",
-        nfd: "\u{110C}\u{1163}\u{11C1}",
-        nfkc: "\u{C7E2}",
-        nfkd: "\u{110C}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C7E3}",
-        nfc: "\u{C7E3}",
-        nfd: "\u{110C}\u{1163}\u{11C2}",
-        nfkc: "\u{C7E3}",
-        nfkd: "\u{110C}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C7E4}",
-        nfc: "\u{C7E4}",
-        nfd: "\u{110C}\u{1164}",
-        nfkc: "\u{C7E4}",
-        nfkd: "\u{110C}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{C7E5}",
-        nfc: "\u{C7E5}",
-        nfd: "\u{110C}\u{1164}\u{11A8}",
-        nfkc: "\u{C7E5}",
-        nfkd: "\u{110C}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C7E6}",
-        nfc: "\u{C7E6}",
-        nfd: "\u{110C}\u{1164}\u{11A9}",
-        nfkc: "\u{C7E6}",
-        nfkd: "\u{110C}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C7E7}",
-        nfc: "\u{C7E7}",
-        nfd: "\u{110C}\u{1164}\u{11AA}",
-        nfkc: "\u{C7E7}",
-        nfkd: "\u{110C}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C7E8}",
-        nfc: "\u{C7E8}",
-        nfd: "\u{110C}\u{1164}\u{11AB}",
-        nfkc: "\u{C7E8}",
-        nfkd: "\u{110C}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C7E9}",
-        nfc: "\u{C7E9}",
-        nfd: "\u{110C}\u{1164}\u{11AC}",
-        nfkc: "\u{C7E9}",
-        nfkd: "\u{110C}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C7EA}",
-        nfc: "\u{C7EA}",
-        nfd: "\u{110C}\u{1164}\u{11AD}",
-        nfkc: "\u{C7EA}",
-        nfkd: "\u{110C}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C7EB}",
-        nfc: "\u{C7EB}",
-        nfd: "\u{110C}\u{1164}\u{11AE}",
-        nfkc: "\u{C7EB}",
-        nfkd: "\u{110C}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C7EC}",
-        nfc: "\u{C7EC}",
-        nfd: "\u{110C}\u{1164}\u{11AF}",
-        nfkc: "\u{C7EC}",
-        nfkd: "\u{110C}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C7ED}",
-        nfc: "\u{C7ED}",
-        nfd: "\u{110C}\u{1164}\u{11B0}",
-        nfkc: "\u{C7ED}",
-        nfkd: "\u{110C}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C7EE}",
-        nfc: "\u{C7EE}",
-        nfd: "\u{110C}\u{1164}\u{11B1}",
-        nfkc: "\u{C7EE}",
-        nfkd: "\u{110C}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C7EF}",
-        nfc: "\u{C7EF}",
-        nfd: "\u{110C}\u{1164}\u{11B2}",
-        nfkc: "\u{C7EF}",
-        nfkd: "\u{110C}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C7F0}",
-        nfc: "\u{C7F0}",
-        nfd: "\u{110C}\u{1164}\u{11B3}",
-        nfkc: "\u{C7F0}",
-        nfkd: "\u{110C}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C7F1}",
-        nfc: "\u{C7F1}",
-        nfd: "\u{110C}\u{1164}\u{11B4}",
-        nfkc: "\u{C7F1}",
-        nfkd: "\u{110C}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C7F2}",
-        nfc: "\u{C7F2}",
-        nfd: "\u{110C}\u{1164}\u{11B5}",
-        nfkc: "\u{C7F2}",
-        nfkd: "\u{110C}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C7F3}",
-        nfc: "\u{C7F3}",
-        nfd: "\u{110C}\u{1164}\u{11B6}",
-        nfkc: "\u{C7F3}",
-        nfkd: "\u{110C}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C7F4}",
-        nfc: "\u{C7F4}",
-        nfd: "\u{110C}\u{1164}\u{11B7}",
-        nfkc: "\u{C7F4}",
-        nfkd: "\u{110C}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C7F5}",
-        nfc: "\u{C7F5}",
-        nfd: "\u{110C}\u{1164}\u{11B8}",
-        nfkc: "\u{C7F5}",
-        nfkd: "\u{110C}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C7F6}",
-        nfc: "\u{C7F6}",
-        nfd: "\u{110C}\u{1164}\u{11B9}",
-        nfkc: "\u{C7F6}",
-        nfkd: "\u{110C}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C7F7}",
-        nfc: "\u{C7F7}",
-        nfd: "\u{110C}\u{1164}\u{11BA}",
-        nfkc: "\u{C7F7}",
-        nfkd: "\u{110C}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C7F8}",
-        nfc: "\u{C7F8}",
-        nfd: "\u{110C}\u{1164}\u{11BB}",
-        nfkc: "\u{C7F8}",
-        nfkd: "\u{110C}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C7F9}",
-        nfc: "\u{C7F9}",
-        nfd: "\u{110C}\u{1164}\u{11BC}",
-        nfkc: "\u{C7F9}",
-        nfkd: "\u{110C}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C7FA}",
-        nfc: "\u{C7FA}",
-        nfd: "\u{110C}\u{1164}\u{11BD}",
-        nfkc: "\u{C7FA}",
-        nfkd: "\u{110C}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C7FB}",
-        nfc: "\u{C7FB}",
-        nfd: "\u{110C}\u{1164}\u{11BE}",
-        nfkc: "\u{C7FB}",
-        nfkd: "\u{110C}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C7FC}",
-        nfc: "\u{C7FC}",
-        nfd: "\u{110C}\u{1164}\u{11BF}",
-        nfkc: "\u{C7FC}",
-        nfkd: "\u{110C}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C7FD}",
-        nfc: "\u{C7FD}",
-        nfd: "\u{110C}\u{1164}\u{11C0}",
-        nfkc: "\u{C7FD}",
-        nfkd: "\u{110C}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C7FE}",
-        nfc: "\u{C7FE}",
-        nfd: "\u{110C}\u{1164}\u{11C1}",
-        nfkc: "\u{C7FE}",
-        nfkd: "\u{110C}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C7FF}",
-        nfc: "\u{C7FF}",
-        nfd: "\u{110C}\u{1164}\u{11C2}",
-        nfkc: "\u{C7FF}",
-        nfkd: "\u{110C}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C800}",
-        nfc: "\u{C800}",
-        nfd: "\u{110C}\u{1165}",
-        nfkc: "\u{C800}",
-        nfkd: "\u{110C}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{C801}",
-        nfc: "\u{C801}",
-        nfd: "\u{110C}\u{1165}\u{11A8}",
-        nfkc: "\u{C801}",
-        nfkd: "\u{110C}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C802}",
-        nfc: "\u{C802}",
-        nfd: "\u{110C}\u{1165}\u{11A9}",
-        nfkc: "\u{C802}",
-        nfkd: "\u{110C}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C803}",
-        nfc: "\u{C803}",
-        nfd: "\u{110C}\u{1165}\u{11AA}",
-        nfkc: "\u{C803}",
-        nfkd: "\u{110C}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C804}",
-        nfc: "\u{C804}",
-        nfd: "\u{110C}\u{1165}\u{11AB}",
-        nfkc: "\u{C804}",
-        nfkd: "\u{110C}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C805}",
-        nfc: "\u{C805}",
-        nfd: "\u{110C}\u{1165}\u{11AC}",
-        nfkc: "\u{C805}",
-        nfkd: "\u{110C}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C806}",
-        nfc: "\u{C806}",
-        nfd: "\u{110C}\u{1165}\u{11AD}",
-        nfkc: "\u{C806}",
-        nfkd: "\u{110C}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C807}",
-        nfc: "\u{C807}",
-        nfd: "\u{110C}\u{1165}\u{11AE}",
-        nfkc: "\u{C807}",
-        nfkd: "\u{110C}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C808}",
-        nfc: "\u{C808}",
-        nfd: "\u{110C}\u{1165}\u{11AF}",
-        nfkc: "\u{C808}",
-        nfkd: "\u{110C}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C809}",
-        nfc: "\u{C809}",
-        nfd: "\u{110C}\u{1165}\u{11B0}",
-        nfkc: "\u{C809}",
-        nfkd: "\u{110C}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C80A}",
-        nfc: "\u{C80A}",
-        nfd: "\u{110C}\u{1165}\u{11B1}",
-        nfkc: "\u{C80A}",
-        nfkd: "\u{110C}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C80B}",
-        nfc: "\u{C80B}",
-        nfd: "\u{110C}\u{1165}\u{11B2}",
-        nfkc: "\u{C80B}",
-        nfkd: "\u{110C}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C80C}",
-        nfc: "\u{C80C}",
-        nfd: "\u{110C}\u{1165}\u{11B3}",
-        nfkc: "\u{C80C}",
-        nfkd: "\u{110C}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C80D}",
-        nfc: "\u{C80D}",
-        nfd: "\u{110C}\u{1165}\u{11B4}",
-        nfkc: "\u{C80D}",
-        nfkd: "\u{110C}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C80E}",
-        nfc: "\u{C80E}",
-        nfd: "\u{110C}\u{1165}\u{11B5}",
-        nfkc: "\u{C80E}",
-        nfkd: "\u{110C}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C80F}",
-        nfc: "\u{C80F}",
-        nfd: "\u{110C}\u{1165}\u{11B6}",
-        nfkc: "\u{C80F}",
-        nfkd: "\u{110C}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C810}",
-        nfc: "\u{C810}",
-        nfd: "\u{110C}\u{1165}\u{11B7}",
-        nfkc: "\u{C810}",
-        nfkd: "\u{110C}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C811}",
-        nfc: "\u{C811}",
-        nfd: "\u{110C}\u{1165}\u{11B8}",
-        nfkc: "\u{C811}",
-        nfkd: "\u{110C}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C812}",
-        nfc: "\u{C812}",
-        nfd: "\u{110C}\u{1165}\u{11B9}",
-        nfkc: "\u{C812}",
-        nfkd: "\u{110C}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C813}",
-        nfc: "\u{C813}",
-        nfd: "\u{110C}\u{1165}\u{11BA}",
-        nfkc: "\u{C813}",
-        nfkd: "\u{110C}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C814}",
-        nfc: "\u{C814}",
-        nfd: "\u{110C}\u{1165}\u{11BB}",
-        nfkc: "\u{C814}",
-        nfkd: "\u{110C}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C815}",
-        nfc: "\u{C815}",
-        nfd: "\u{110C}\u{1165}\u{11BC}",
-        nfkc: "\u{C815}",
-        nfkd: "\u{110C}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C816}",
-        nfc: "\u{C816}",
-        nfd: "\u{110C}\u{1165}\u{11BD}",
-        nfkc: "\u{C816}",
-        nfkd: "\u{110C}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C817}",
-        nfc: "\u{C817}",
-        nfd: "\u{110C}\u{1165}\u{11BE}",
-        nfkc: "\u{C817}",
-        nfkd: "\u{110C}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C818}",
-        nfc: "\u{C818}",
-        nfd: "\u{110C}\u{1165}\u{11BF}",
-        nfkc: "\u{C818}",
-        nfkd: "\u{110C}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C819}",
-        nfc: "\u{C819}",
-        nfd: "\u{110C}\u{1165}\u{11C0}",
-        nfkc: "\u{C819}",
-        nfkd: "\u{110C}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C81A}",
-        nfc: "\u{C81A}",
-        nfd: "\u{110C}\u{1165}\u{11C1}",
-        nfkc: "\u{C81A}",
-        nfkd: "\u{110C}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C81B}",
-        nfc: "\u{C81B}",
-        nfd: "\u{110C}\u{1165}\u{11C2}",
-        nfkc: "\u{C81B}",
-        nfkd: "\u{110C}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C81C}",
-        nfc: "\u{C81C}",
-        nfd: "\u{110C}\u{1166}",
-        nfkc: "\u{C81C}",
-        nfkd: "\u{110C}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{C81D}",
-        nfc: "\u{C81D}",
-        nfd: "\u{110C}\u{1166}\u{11A8}",
-        nfkc: "\u{C81D}",
-        nfkd: "\u{110C}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C81E}",
-        nfc: "\u{C81E}",
-        nfd: "\u{110C}\u{1166}\u{11A9}",
-        nfkc: "\u{C81E}",
-        nfkd: "\u{110C}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C81F}",
-        nfc: "\u{C81F}",
-        nfd: "\u{110C}\u{1166}\u{11AA}",
-        nfkc: "\u{C81F}",
-        nfkd: "\u{110C}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C820}",
-        nfc: "\u{C820}",
-        nfd: "\u{110C}\u{1166}\u{11AB}",
-        nfkc: "\u{C820}",
-        nfkd: "\u{110C}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C821}",
-        nfc: "\u{C821}",
-        nfd: "\u{110C}\u{1166}\u{11AC}",
-        nfkc: "\u{C821}",
-        nfkd: "\u{110C}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C822}",
-        nfc: "\u{C822}",
-        nfd: "\u{110C}\u{1166}\u{11AD}",
-        nfkc: "\u{C822}",
-        nfkd: "\u{110C}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C823}",
-        nfc: "\u{C823}",
-        nfd: "\u{110C}\u{1166}\u{11AE}",
-        nfkc: "\u{C823}",
-        nfkd: "\u{110C}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C824}",
-        nfc: "\u{C824}",
-        nfd: "\u{110C}\u{1166}\u{11AF}",
-        nfkc: "\u{C824}",
-        nfkd: "\u{110C}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C825}",
-        nfc: "\u{C825}",
-        nfd: "\u{110C}\u{1166}\u{11B0}",
-        nfkc: "\u{C825}",
-        nfkd: "\u{110C}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C826}",
-        nfc: "\u{C826}",
-        nfd: "\u{110C}\u{1166}\u{11B1}",
-        nfkc: "\u{C826}",
-        nfkd: "\u{110C}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C827}",
-        nfc: "\u{C827}",
-        nfd: "\u{110C}\u{1166}\u{11B2}",
-        nfkc: "\u{C827}",
-        nfkd: "\u{110C}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C828}",
-        nfc: "\u{C828}",
-        nfd: "\u{110C}\u{1166}\u{11B3}",
-        nfkc: "\u{C828}",
-        nfkd: "\u{110C}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C829}",
-        nfc: "\u{C829}",
-        nfd: "\u{110C}\u{1166}\u{11B4}",
-        nfkc: "\u{C829}",
-        nfkd: "\u{110C}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C82A}",
-        nfc: "\u{C82A}",
-        nfd: "\u{110C}\u{1166}\u{11B5}",
-        nfkc: "\u{C82A}",
-        nfkd: "\u{110C}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C82B}",
-        nfc: "\u{C82B}",
-        nfd: "\u{110C}\u{1166}\u{11B6}",
-        nfkc: "\u{C82B}",
-        nfkd: "\u{110C}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C82C}",
-        nfc: "\u{C82C}",
-        nfd: "\u{110C}\u{1166}\u{11B7}",
-        nfkc: "\u{C82C}",
-        nfkd: "\u{110C}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C82D}",
-        nfc: "\u{C82D}",
-        nfd: "\u{110C}\u{1166}\u{11B8}",
-        nfkc: "\u{C82D}",
-        nfkd: "\u{110C}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C82E}",
-        nfc: "\u{C82E}",
-        nfd: "\u{110C}\u{1166}\u{11B9}",
-        nfkc: "\u{C82E}",
-        nfkd: "\u{110C}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C82F}",
-        nfc: "\u{C82F}",
-        nfd: "\u{110C}\u{1166}\u{11BA}",
-        nfkc: "\u{C82F}",
-        nfkd: "\u{110C}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C830}",
-        nfc: "\u{C830}",
-        nfd: "\u{110C}\u{1166}\u{11BB}",
-        nfkc: "\u{C830}",
-        nfkd: "\u{110C}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C831}",
-        nfc: "\u{C831}",
-        nfd: "\u{110C}\u{1166}\u{11BC}",
-        nfkc: "\u{C831}",
-        nfkd: "\u{110C}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C832}",
-        nfc: "\u{C832}",
-        nfd: "\u{110C}\u{1166}\u{11BD}",
-        nfkc: "\u{C832}",
-        nfkd: "\u{110C}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C833}",
-        nfc: "\u{C833}",
-        nfd: "\u{110C}\u{1166}\u{11BE}",
-        nfkc: "\u{C833}",
-        nfkd: "\u{110C}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C834}",
-        nfc: "\u{C834}",
-        nfd: "\u{110C}\u{1166}\u{11BF}",
-        nfkc: "\u{C834}",
-        nfkd: "\u{110C}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C835}",
-        nfc: "\u{C835}",
-        nfd: "\u{110C}\u{1166}\u{11C0}",
-        nfkc: "\u{C835}",
-        nfkd: "\u{110C}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C836}",
-        nfc: "\u{C836}",
-        nfd: "\u{110C}\u{1166}\u{11C1}",
-        nfkc: "\u{C836}",
-        nfkd: "\u{110C}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C837}",
-        nfc: "\u{C837}",
-        nfd: "\u{110C}\u{1166}\u{11C2}",
-        nfkc: "\u{C837}",
-        nfkd: "\u{110C}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C838}",
-        nfc: "\u{C838}",
-        nfd: "\u{110C}\u{1167}",
-        nfkc: "\u{C838}",
-        nfkd: "\u{110C}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{C839}",
-        nfc: "\u{C839}",
-        nfd: "\u{110C}\u{1167}\u{11A8}",
-        nfkc: "\u{C839}",
-        nfkd: "\u{110C}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C83A}",
-        nfc: "\u{C83A}",
-        nfd: "\u{110C}\u{1167}\u{11A9}",
-        nfkc: "\u{C83A}",
-        nfkd: "\u{110C}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C83B}",
-        nfc: "\u{C83B}",
-        nfd: "\u{110C}\u{1167}\u{11AA}",
-        nfkc: "\u{C83B}",
-        nfkd: "\u{110C}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C83C}",
-        nfc: "\u{C83C}",
-        nfd: "\u{110C}\u{1167}\u{11AB}",
-        nfkc: "\u{C83C}",
-        nfkd: "\u{110C}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C83D}",
-        nfc: "\u{C83D}",
-        nfd: "\u{110C}\u{1167}\u{11AC}",
-        nfkc: "\u{C83D}",
-        nfkd: "\u{110C}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C83E}",
-        nfc: "\u{C83E}",
-        nfd: "\u{110C}\u{1167}\u{11AD}",
-        nfkc: "\u{C83E}",
-        nfkd: "\u{110C}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C83F}",
-        nfc: "\u{C83F}",
-        nfd: "\u{110C}\u{1167}\u{11AE}",
-        nfkc: "\u{C83F}",
-        nfkd: "\u{110C}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C840}",
-        nfc: "\u{C840}",
-        nfd: "\u{110C}\u{1167}\u{11AF}",
-        nfkc: "\u{C840}",
-        nfkd: "\u{110C}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C841}",
-        nfc: "\u{C841}",
-        nfd: "\u{110C}\u{1167}\u{11B0}",
-        nfkc: "\u{C841}",
-        nfkd: "\u{110C}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C842}",
-        nfc: "\u{C842}",
-        nfd: "\u{110C}\u{1167}\u{11B1}",
-        nfkc: "\u{C842}",
-        nfkd: "\u{110C}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C843}",
-        nfc: "\u{C843}",
-        nfd: "\u{110C}\u{1167}\u{11B2}",
-        nfkc: "\u{C843}",
-        nfkd: "\u{110C}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C844}",
-        nfc: "\u{C844}",
-        nfd: "\u{110C}\u{1167}\u{11B3}",
-        nfkc: "\u{C844}",
-        nfkd: "\u{110C}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C845}",
-        nfc: "\u{C845}",
-        nfd: "\u{110C}\u{1167}\u{11B4}",
-        nfkc: "\u{C845}",
-        nfkd: "\u{110C}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C846}",
-        nfc: "\u{C846}",
-        nfd: "\u{110C}\u{1167}\u{11B5}",
-        nfkc: "\u{C846}",
-        nfkd: "\u{110C}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C847}",
-        nfc: "\u{C847}",
-        nfd: "\u{110C}\u{1167}\u{11B6}",
-        nfkc: "\u{C847}",
-        nfkd: "\u{110C}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C848}",
-        nfc: "\u{C848}",
-        nfd: "\u{110C}\u{1167}\u{11B7}",
-        nfkc: "\u{C848}",
-        nfkd: "\u{110C}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C849}",
-        nfc: "\u{C849}",
-        nfd: "\u{110C}\u{1167}\u{11B8}",
-        nfkc: "\u{C849}",
-        nfkd: "\u{110C}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C84A}",
-        nfc: "\u{C84A}",
-        nfd: "\u{110C}\u{1167}\u{11B9}",
-        nfkc: "\u{C84A}",
-        nfkd: "\u{110C}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C84B}",
-        nfc: "\u{C84B}",
-        nfd: "\u{110C}\u{1167}\u{11BA}",
-        nfkc: "\u{C84B}",
-        nfkd: "\u{110C}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C84C}",
-        nfc: "\u{C84C}",
-        nfd: "\u{110C}\u{1167}\u{11BB}",
-        nfkc: "\u{C84C}",
-        nfkd: "\u{110C}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C84D}",
-        nfc: "\u{C84D}",
-        nfd: "\u{110C}\u{1167}\u{11BC}",
-        nfkc: "\u{C84D}",
-        nfkd: "\u{110C}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C84E}",
-        nfc: "\u{C84E}",
-        nfd: "\u{110C}\u{1167}\u{11BD}",
-        nfkc: "\u{C84E}",
-        nfkd: "\u{110C}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C84F}",
-        nfc: "\u{C84F}",
-        nfd: "\u{110C}\u{1167}\u{11BE}",
-        nfkc: "\u{C84F}",
-        nfkd: "\u{110C}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C850}",
-        nfc: "\u{C850}",
-        nfd: "\u{110C}\u{1167}\u{11BF}",
-        nfkc: "\u{C850}",
-        nfkd: "\u{110C}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C851}",
-        nfc: "\u{C851}",
-        nfd: "\u{110C}\u{1167}\u{11C0}",
-        nfkc: "\u{C851}",
-        nfkd: "\u{110C}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C852}",
-        nfc: "\u{C852}",
-        nfd: "\u{110C}\u{1167}\u{11C1}",
-        nfkc: "\u{C852}",
-        nfkd: "\u{110C}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C853}",
-        nfc: "\u{C853}",
-        nfd: "\u{110C}\u{1167}\u{11C2}",
-        nfkc: "\u{C853}",
-        nfkd: "\u{110C}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C854}",
-        nfc: "\u{C854}",
-        nfd: "\u{110C}\u{1168}",
-        nfkc: "\u{C854}",
-        nfkd: "\u{110C}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{C855}",
-        nfc: "\u{C855}",
-        nfd: "\u{110C}\u{1168}\u{11A8}",
-        nfkc: "\u{C855}",
-        nfkd: "\u{110C}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C856}",
-        nfc: "\u{C856}",
-        nfd: "\u{110C}\u{1168}\u{11A9}",
-        nfkc: "\u{C856}",
-        nfkd: "\u{110C}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C857}",
-        nfc: "\u{C857}",
-        nfd: "\u{110C}\u{1168}\u{11AA}",
-        nfkc: "\u{C857}",
-        nfkd: "\u{110C}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C858}",
-        nfc: "\u{C858}",
-        nfd: "\u{110C}\u{1168}\u{11AB}",
-        nfkc: "\u{C858}",
-        nfkd: "\u{110C}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C859}",
-        nfc: "\u{C859}",
-        nfd: "\u{110C}\u{1168}\u{11AC}",
-        nfkc: "\u{C859}",
-        nfkd: "\u{110C}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C85A}",
-        nfc: "\u{C85A}",
-        nfd: "\u{110C}\u{1168}\u{11AD}",
-        nfkc: "\u{C85A}",
-        nfkd: "\u{110C}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C85B}",
-        nfc: "\u{C85B}",
-        nfd: "\u{110C}\u{1168}\u{11AE}",
-        nfkc: "\u{C85B}",
-        nfkd: "\u{110C}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C85C}",
-        nfc: "\u{C85C}",
-        nfd: "\u{110C}\u{1168}\u{11AF}",
-        nfkc: "\u{C85C}",
-        nfkd: "\u{110C}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C85D}",
-        nfc: "\u{C85D}",
-        nfd: "\u{110C}\u{1168}\u{11B0}",
-        nfkc: "\u{C85D}",
-        nfkd: "\u{110C}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C85E}",
-        nfc: "\u{C85E}",
-        nfd: "\u{110C}\u{1168}\u{11B1}",
-        nfkc: "\u{C85E}",
-        nfkd: "\u{110C}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C85F}",
-        nfc: "\u{C85F}",
-        nfd: "\u{110C}\u{1168}\u{11B2}",
-        nfkc: "\u{C85F}",
-        nfkd: "\u{110C}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C860}",
-        nfc: "\u{C860}",
-        nfd: "\u{110C}\u{1168}\u{11B3}",
-        nfkc: "\u{C860}",
-        nfkd: "\u{110C}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C861}",
-        nfc: "\u{C861}",
-        nfd: "\u{110C}\u{1168}\u{11B4}",
-        nfkc: "\u{C861}",
-        nfkd: "\u{110C}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C862}",
-        nfc: "\u{C862}",
-        nfd: "\u{110C}\u{1168}\u{11B5}",
-        nfkc: "\u{C862}",
-        nfkd: "\u{110C}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C863}",
-        nfc: "\u{C863}",
-        nfd: "\u{110C}\u{1168}\u{11B6}",
-        nfkc: "\u{C863}",
-        nfkd: "\u{110C}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C864}",
-        nfc: "\u{C864}",
-        nfd: "\u{110C}\u{1168}\u{11B7}",
-        nfkc: "\u{C864}",
-        nfkd: "\u{110C}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C865}",
-        nfc: "\u{C865}",
-        nfd: "\u{110C}\u{1168}\u{11B8}",
-        nfkc: "\u{C865}",
-        nfkd: "\u{110C}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C866}",
-        nfc: "\u{C866}",
-        nfd: "\u{110C}\u{1168}\u{11B9}",
-        nfkc: "\u{C866}",
-        nfkd: "\u{110C}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C867}",
-        nfc: "\u{C867}",
-        nfd: "\u{110C}\u{1168}\u{11BA}",
-        nfkc: "\u{C867}",
-        nfkd: "\u{110C}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C868}",
-        nfc: "\u{C868}",
-        nfd: "\u{110C}\u{1168}\u{11BB}",
-        nfkc: "\u{C868}",
-        nfkd: "\u{110C}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C869}",
-        nfc: "\u{C869}",
-        nfd: "\u{110C}\u{1168}\u{11BC}",
-        nfkc: "\u{C869}",
-        nfkd: "\u{110C}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C86A}",
-        nfc: "\u{C86A}",
-        nfd: "\u{110C}\u{1168}\u{11BD}",
-        nfkc: "\u{C86A}",
-        nfkd: "\u{110C}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C86B}",
-        nfc: "\u{C86B}",
-        nfd: "\u{110C}\u{1168}\u{11BE}",
-        nfkc: "\u{C86B}",
-        nfkd: "\u{110C}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C86C}",
-        nfc: "\u{C86C}",
-        nfd: "\u{110C}\u{1168}\u{11BF}",
-        nfkc: "\u{C86C}",
-        nfkd: "\u{110C}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C86D}",
-        nfc: "\u{C86D}",
-        nfd: "\u{110C}\u{1168}\u{11C0}",
-        nfkc: "\u{C86D}",
-        nfkd: "\u{110C}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C86E}",
-        nfc: "\u{C86E}",
-        nfd: "\u{110C}\u{1168}\u{11C1}",
-        nfkc: "\u{C86E}",
-        nfkd: "\u{110C}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C86F}",
-        nfc: "\u{C86F}",
-        nfd: "\u{110C}\u{1168}\u{11C2}",
-        nfkc: "\u{C86F}",
-        nfkd: "\u{110C}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C870}",
-        nfc: "\u{C870}",
-        nfd: "\u{110C}\u{1169}",
-        nfkc: "\u{C870}",
-        nfkd: "\u{110C}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{C871}",
-        nfc: "\u{C871}",
-        nfd: "\u{110C}\u{1169}\u{11A8}",
-        nfkc: "\u{C871}",
-        nfkd: "\u{110C}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C872}",
-        nfc: "\u{C872}",
-        nfd: "\u{110C}\u{1169}\u{11A9}",
-        nfkc: "\u{C872}",
-        nfkd: "\u{110C}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C873}",
-        nfc: "\u{C873}",
-        nfd: "\u{110C}\u{1169}\u{11AA}",
-        nfkc: "\u{C873}",
-        nfkd: "\u{110C}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C874}",
-        nfc: "\u{C874}",
-        nfd: "\u{110C}\u{1169}\u{11AB}",
-        nfkc: "\u{C874}",
-        nfkd: "\u{110C}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C875}",
-        nfc: "\u{C875}",
-        nfd: "\u{110C}\u{1169}\u{11AC}",
-        nfkc: "\u{C875}",
-        nfkd: "\u{110C}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C876}",
-        nfc: "\u{C876}",
-        nfd: "\u{110C}\u{1169}\u{11AD}",
-        nfkc: "\u{C876}",
-        nfkd: "\u{110C}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C877}",
-        nfc: "\u{C877}",
-        nfd: "\u{110C}\u{1169}\u{11AE}",
-        nfkc: "\u{C877}",
-        nfkd: "\u{110C}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C878}",
-        nfc: "\u{C878}",
-        nfd: "\u{110C}\u{1169}\u{11AF}",
-        nfkc: "\u{C878}",
-        nfkd: "\u{110C}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C879}",
-        nfc: "\u{C879}",
-        nfd: "\u{110C}\u{1169}\u{11B0}",
-        nfkc: "\u{C879}",
-        nfkd: "\u{110C}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C87A}",
-        nfc: "\u{C87A}",
-        nfd: "\u{110C}\u{1169}\u{11B1}",
-        nfkc: "\u{C87A}",
-        nfkd: "\u{110C}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C87B}",
-        nfc: "\u{C87B}",
-        nfd: "\u{110C}\u{1169}\u{11B2}",
-        nfkc: "\u{C87B}",
-        nfkd: "\u{110C}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C87C}",
-        nfc: "\u{C87C}",
-        nfd: "\u{110C}\u{1169}\u{11B3}",
-        nfkc: "\u{C87C}",
-        nfkd: "\u{110C}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C87D}",
-        nfc: "\u{C87D}",
-        nfd: "\u{110C}\u{1169}\u{11B4}",
-        nfkc: "\u{C87D}",
-        nfkd: "\u{110C}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C87E}",
-        nfc: "\u{C87E}",
-        nfd: "\u{110C}\u{1169}\u{11B5}",
-        nfkc: "\u{C87E}",
-        nfkd: "\u{110C}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C87F}",
-        nfc: "\u{C87F}",
-        nfd: "\u{110C}\u{1169}\u{11B6}",
-        nfkc: "\u{C87F}",
-        nfkd: "\u{110C}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C880}",
-        nfc: "\u{C880}",
-        nfd: "\u{110C}\u{1169}\u{11B7}",
-        nfkc: "\u{C880}",
-        nfkd: "\u{110C}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C881}",
-        nfc: "\u{C881}",
-        nfd: "\u{110C}\u{1169}\u{11B8}",
-        nfkc: "\u{C881}",
-        nfkd: "\u{110C}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C882}",
-        nfc: "\u{C882}",
-        nfd: "\u{110C}\u{1169}\u{11B9}",
-        nfkc: "\u{C882}",
-        nfkd: "\u{110C}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C883}",
-        nfc: "\u{C883}",
-        nfd: "\u{110C}\u{1169}\u{11BA}",
-        nfkc: "\u{C883}",
-        nfkd: "\u{110C}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C884}",
-        nfc: "\u{C884}",
-        nfd: "\u{110C}\u{1169}\u{11BB}",
-        nfkc: "\u{C884}",
-        nfkd: "\u{110C}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C885}",
-        nfc: "\u{C885}",
-        nfd: "\u{110C}\u{1169}\u{11BC}",
-        nfkc: "\u{C885}",
-        nfkd: "\u{110C}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C886}",
-        nfc: "\u{C886}",
-        nfd: "\u{110C}\u{1169}\u{11BD}",
-        nfkc: "\u{C886}",
-        nfkd: "\u{110C}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C887}",
-        nfc: "\u{C887}",
-        nfd: "\u{110C}\u{1169}\u{11BE}",
-        nfkc: "\u{C887}",
-        nfkd: "\u{110C}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C888}",
-        nfc: "\u{C888}",
-        nfd: "\u{110C}\u{1169}\u{11BF}",
-        nfkc: "\u{C888}",
-        nfkd: "\u{110C}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C889}",
-        nfc: "\u{C889}",
-        nfd: "\u{110C}\u{1169}\u{11C0}",
-        nfkc: "\u{C889}",
-        nfkd: "\u{110C}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C88A}",
-        nfc: "\u{C88A}",
-        nfd: "\u{110C}\u{1169}\u{11C1}",
-        nfkc: "\u{C88A}",
-        nfkd: "\u{110C}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C88B}",
-        nfc: "\u{C88B}",
-        nfd: "\u{110C}\u{1169}\u{11C2}",
-        nfkc: "\u{C88B}",
-        nfkd: "\u{110C}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C88C}",
-        nfc: "\u{C88C}",
-        nfd: "\u{110C}\u{116A}",
-        nfkc: "\u{C88C}",
-        nfkd: "\u{110C}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{C88D}",
-        nfc: "\u{C88D}",
-        nfd: "\u{110C}\u{116A}\u{11A8}",
-        nfkc: "\u{C88D}",
-        nfkd: "\u{110C}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C88E}",
-        nfc: "\u{C88E}",
-        nfd: "\u{110C}\u{116A}\u{11A9}",
-        nfkc: "\u{C88E}",
-        nfkd: "\u{110C}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C88F}",
-        nfc: "\u{C88F}",
-        nfd: "\u{110C}\u{116A}\u{11AA}",
-        nfkc: "\u{C88F}",
-        nfkd: "\u{110C}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C890}",
-        nfc: "\u{C890}",
-        nfd: "\u{110C}\u{116A}\u{11AB}",
-        nfkc: "\u{C890}",
-        nfkd: "\u{110C}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C891}",
-        nfc: "\u{C891}",
-        nfd: "\u{110C}\u{116A}\u{11AC}",
-        nfkc: "\u{C891}",
-        nfkd: "\u{110C}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C892}",
-        nfc: "\u{C892}",
-        nfd: "\u{110C}\u{116A}\u{11AD}",
-        nfkc: "\u{C892}",
-        nfkd: "\u{110C}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C893}",
-        nfc: "\u{C893}",
-        nfd: "\u{110C}\u{116A}\u{11AE}",
-        nfkc: "\u{C893}",
-        nfkd: "\u{110C}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C894}",
-        nfc: "\u{C894}",
-        nfd: "\u{110C}\u{116A}\u{11AF}",
-        nfkc: "\u{C894}",
-        nfkd: "\u{110C}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C895}",
-        nfc: "\u{C895}",
-        nfd: "\u{110C}\u{116A}\u{11B0}",
-        nfkc: "\u{C895}",
-        nfkd: "\u{110C}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C896}",
-        nfc: "\u{C896}",
-        nfd: "\u{110C}\u{116A}\u{11B1}",
-        nfkc: "\u{C896}",
-        nfkd: "\u{110C}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C897}",
-        nfc: "\u{C897}",
-        nfd: "\u{110C}\u{116A}\u{11B2}",
-        nfkc: "\u{C897}",
-        nfkd: "\u{110C}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C898}",
-        nfc: "\u{C898}",
-        nfd: "\u{110C}\u{116A}\u{11B3}",
-        nfkc: "\u{C898}",
-        nfkd: "\u{110C}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C899}",
-        nfc: "\u{C899}",
-        nfd: "\u{110C}\u{116A}\u{11B4}",
-        nfkc: "\u{C899}",
-        nfkd: "\u{110C}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C89A}",
-        nfc: "\u{C89A}",
-        nfd: "\u{110C}\u{116A}\u{11B5}",
-        nfkc: "\u{C89A}",
-        nfkd: "\u{110C}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C89B}",
-        nfc: "\u{C89B}",
-        nfd: "\u{110C}\u{116A}\u{11B6}",
-        nfkc: "\u{C89B}",
-        nfkd: "\u{110C}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C89C}",
-        nfc: "\u{C89C}",
-        nfd: "\u{110C}\u{116A}\u{11B7}",
-        nfkc: "\u{C89C}",
-        nfkd: "\u{110C}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C89D}",
-        nfc: "\u{C89D}",
-        nfd: "\u{110C}\u{116A}\u{11B8}",
-        nfkc: "\u{C89D}",
-        nfkd: "\u{110C}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C89E}",
-        nfc: "\u{C89E}",
-        nfd: "\u{110C}\u{116A}\u{11B9}",
-        nfkc: "\u{C89E}",
-        nfkd: "\u{110C}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C89F}",
-        nfc: "\u{C89F}",
-        nfd: "\u{110C}\u{116A}\u{11BA}",
-        nfkc: "\u{C89F}",
-        nfkd: "\u{110C}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C8A0}",
-        nfc: "\u{C8A0}",
-        nfd: "\u{110C}\u{116A}\u{11BB}",
-        nfkc: "\u{C8A0}",
-        nfkd: "\u{110C}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C8A1}",
-        nfc: "\u{C8A1}",
-        nfd: "\u{110C}\u{116A}\u{11BC}",
-        nfkc: "\u{C8A1}",
-        nfkd: "\u{110C}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C8A2}",
-        nfc: "\u{C8A2}",
-        nfd: "\u{110C}\u{116A}\u{11BD}",
-        nfkc: "\u{C8A2}",
-        nfkd: "\u{110C}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C8A3}",
-        nfc: "\u{C8A3}",
-        nfd: "\u{110C}\u{116A}\u{11BE}",
-        nfkc: "\u{C8A3}",
-        nfkd: "\u{110C}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C8A4}",
-        nfc: "\u{C8A4}",
-        nfd: "\u{110C}\u{116A}\u{11BF}",
-        nfkc: "\u{C8A4}",
-        nfkd: "\u{110C}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C8A5}",
-        nfc: "\u{C8A5}",
-        nfd: "\u{110C}\u{116A}\u{11C0}",
-        nfkc: "\u{C8A5}",
-        nfkd: "\u{110C}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C8A6}",
-        nfc: "\u{C8A6}",
-        nfd: "\u{110C}\u{116A}\u{11C1}",
-        nfkc: "\u{C8A6}",
-        nfkd: "\u{110C}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C8A7}",
-        nfc: "\u{C8A7}",
-        nfd: "\u{110C}\u{116A}\u{11C2}",
-        nfkc: "\u{C8A7}",
-        nfkd: "\u{110C}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C8A8}",
-        nfc: "\u{C8A8}",
-        nfd: "\u{110C}\u{116B}",
-        nfkc: "\u{C8A8}",
-        nfkd: "\u{110C}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{C8A9}",
-        nfc: "\u{C8A9}",
-        nfd: "\u{110C}\u{116B}\u{11A8}",
-        nfkc: "\u{C8A9}",
-        nfkd: "\u{110C}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C8AA}",
-        nfc: "\u{C8AA}",
-        nfd: "\u{110C}\u{116B}\u{11A9}",
-        nfkc: "\u{C8AA}",
-        nfkd: "\u{110C}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C8AB}",
-        nfc: "\u{C8AB}",
-        nfd: "\u{110C}\u{116B}\u{11AA}",
-        nfkc: "\u{C8AB}",
-        nfkd: "\u{110C}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C8AC}",
-        nfc: "\u{C8AC}",
-        nfd: "\u{110C}\u{116B}\u{11AB}",
-        nfkc: "\u{C8AC}",
-        nfkd: "\u{110C}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C8AD}",
-        nfc: "\u{C8AD}",
-        nfd: "\u{110C}\u{116B}\u{11AC}",
-        nfkc: "\u{C8AD}",
-        nfkd: "\u{110C}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C8AE}",
-        nfc: "\u{C8AE}",
-        nfd: "\u{110C}\u{116B}\u{11AD}",
-        nfkc: "\u{C8AE}",
-        nfkd: "\u{110C}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C8AF}",
-        nfc: "\u{C8AF}",
-        nfd: "\u{110C}\u{116B}\u{11AE}",
-        nfkc: "\u{C8AF}",
-        nfkd: "\u{110C}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C8B0}",
-        nfc: "\u{C8B0}",
-        nfd: "\u{110C}\u{116B}\u{11AF}",
-        nfkc: "\u{C8B0}",
-        nfkd: "\u{110C}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C8B1}",
-        nfc: "\u{C8B1}",
-        nfd: "\u{110C}\u{116B}\u{11B0}",
-        nfkc: "\u{C8B1}",
-        nfkd: "\u{110C}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C8B2}",
-        nfc: "\u{C8B2}",
-        nfd: "\u{110C}\u{116B}\u{11B1}",
-        nfkc: "\u{C8B2}",
-        nfkd: "\u{110C}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C8B3}",
-        nfc: "\u{C8B3}",
-        nfd: "\u{110C}\u{116B}\u{11B2}",
-        nfkc: "\u{C8B3}",
-        nfkd: "\u{110C}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C8B4}",
-        nfc: "\u{C8B4}",
-        nfd: "\u{110C}\u{116B}\u{11B3}",
-        nfkc: "\u{C8B4}",
-        nfkd: "\u{110C}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C8B5}",
-        nfc: "\u{C8B5}",
-        nfd: "\u{110C}\u{116B}\u{11B4}",
-        nfkc: "\u{C8B5}",
-        nfkd: "\u{110C}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C8B6}",
-        nfc: "\u{C8B6}",
-        nfd: "\u{110C}\u{116B}\u{11B5}",
-        nfkc: "\u{C8B6}",
-        nfkd: "\u{110C}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C8B7}",
-        nfc: "\u{C8B7}",
-        nfd: "\u{110C}\u{116B}\u{11B6}",
-        nfkc: "\u{C8B7}",
-        nfkd: "\u{110C}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C8B8}",
-        nfc: "\u{C8B8}",
-        nfd: "\u{110C}\u{116B}\u{11B7}",
-        nfkc: "\u{C8B8}",
-        nfkd: "\u{110C}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C8B9}",
-        nfc: "\u{C8B9}",
-        nfd: "\u{110C}\u{116B}\u{11B8}",
-        nfkc: "\u{C8B9}",
-        nfkd: "\u{110C}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C8BA}",
-        nfc: "\u{C8BA}",
-        nfd: "\u{110C}\u{116B}\u{11B9}",
-        nfkc: "\u{C8BA}",
-        nfkd: "\u{110C}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C8BB}",
-        nfc: "\u{C8BB}",
-        nfd: "\u{110C}\u{116B}\u{11BA}",
-        nfkc: "\u{C8BB}",
-        nfkd: "\u{110C}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C8BC}",
-        nfc: "\u{C8BC}",
-        nfd: "\u{110C}\u{116B}\u{11BB}",
-        nfkc: "\u{C8BC}",
-        nfkd: "\u{110C}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C8BD}",
-        nfc: "\u{C8BD}",
-        nfd: "\u{110C}\u{116B}\u{11BC}",
-        nfkc: "\u{C8BD}",
-        nfkd: "\u{110C}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C8BE}",
-        nfc: "\u{C8BE}",
-        nfd: "\u{110C}\u{116B}\u{11BD}",
-        nfkc: "\u{C8BE}",
-        nfkd: "\u{110C}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C8BF}",
-        nfc: "\u{C8BF}",
-        nfd: "\u{110C}\u{116B}\u{11BE}",
-        nfkc: "\u{C8BF}",
-        nfkd: "\u{110C}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C8C0}",
-        nfc: "\u{C8C0}",
-        nfd: "\u{110C}\u{116B}\u{11BF}",
-        nfkc: "\u{C8C0}",
-        nfkd: "\u{110C}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C8C1}",
-        nfc: "\u{C8C1}",
-        nfd: "\u{110C}\u{116B}\u{11C0}",
-        nfkc: "\u{C8C1}",
-        nfkd: "\u{110C}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C8C2}",
-        nfc: "\u{C8C2}",
-        nfd: "\u{110C}\u{116B}\u{11C1}",
-        nfkc: "\u{C8C2}",
-        nfkd: "\u{110C}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C8C3}",
-        nfc: "\u{C8C3}",
-        nfd: "\u{110C}\u{116B}\u{11C2}",
-        nfkc: "\u{C8C3}",
-        nfkd: "\u{110C}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C8C4}",
-        nfc: "\u{C8C4}",
-        nfd: "\u{110C}\u{116C}",
-        nfkc: "\u{C8C4}",
-        nfkd: "\u{110C}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{C8C5}",
-        nfc: "\u{C8C5}",
-        nfd: "\u{110C}\u{116C}\u{11A8}",
-        nfkc: "\u{C8C5}",
-        nfkd: "\u{110C}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C8C6}",
-        nfc: "\u{C8C6}",
-        nfd: "\u{110C}\u{116C}\u{11A9}",
-        nfkc: "\u{C8C6}",
-        nfkd: "\u{110C}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C8C7}",
-        nfc: "\u{C8C7}",
-        nfd: "\u{110C}\u{116C}\u{11AA}",
-        nfkc: "\u{C8C7}",
-        nfkd: "\u{110C}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C8C8}",
-        nfc: "\u{C8C8}",
-        nfd: "\u{110C}\u{116C}\u{11AB}",
-        nfkc: "\u{C8C8}",
-        nfkd: "\u{110C}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C8C9}",
-        nfc: "\u{C8C9}",
-        nfd: "\u{110C}\u{116C}\u{11AC}",
-        nfkc: "\u{C8C9}",
-        nfkd: "\u{110C}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C8CA}",
-        nfc: "\u{C8CA}",
-        nfd: "\u{110C}\u{116C}\u{11AD}",
-        nfkc: "\u{C8CA}",
-        nfkd: "\u{110C}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C8CB}",
-        nfc: "\u{C8CB}",
-        nfd: "\u{110C}\u{116C}\u{11AE}",
-        nfkc: "\u{C8CB}",
-        nfkd: "\u{110C}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C8CC}",
-        nfc: "\u{C8CC}",
-        nfd: "\u{110C}\u{116C}\u{11AF}",
-        nfkc: "\u{C8CC}",
-        nfkd: "\u{110C}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C8CD}",
-        nfc: "\u{C8CD}",
-        nfd: "\u{110C}\u{116C}\u{11B0}",
-        nfkc: "\u{C8CD}",
-        nfkd: "\u{110C}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C8CE}",
-        nfc: "\u{C8CE}",
-        nfd: "\u{110C}\u{116C}\u{11B1}",
-        nfkc: "\u{C8CE}",
-        nfkd: "\u{110C}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C8CF}",
-        nfc: "\u{C8CF}",
-        nfd: "\u{110C}\u{116C}\u{11B2}",
-        nfkc: "\u{C8CF}",
-        nfkd: "\u{110C}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C8D0}",
-        nfc: "\u{C8D0}",
-        nfd: "\u{110C}\u{116C}\u{11B3}",
-        nfkc: "\u{C8D0}",
-        nfkd: "\u{110C}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C8D1}",
-        nfc: "\u{C8D1}",
-        nfd: "\u{110C}\u{116C}\u{11B4}",
-        nfkc: "\u{C8D1}",
-        nfkd: "\u{110C}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C8D2}",
-        nfc: "\u{C8D2}",
-        nfd: "\u{110C}\u{116C}\u{11B5}",
-        nfkc: "\u{C8D2}",
-        nfkd: "\u{110C}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C8D3}",
-        nfc: "\u{C8D3}",
-        nfd: "\u{110C}\u{116C}\u{11B6}",
-        nfkc: "\u{C8D3}",
-        nfkd: "\u{110C}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C8D4}",
-        nfc: "\u{C8D4}",
-        nfd: "\u{110C}\u{116C}\u{11B7}",
-        nfkc: "\u{C8D4}",
-        nfkd: "\u{110C}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C8D5}",
-        nfc: "\u{C8D5}",
-        nfd: "\u{110C}\u{116C}\u{11B8}",
-        nfkc: "\u{C8D5}",
-        nfkd: "\u{110C}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C8D6}",
-        nfc: "\u{C8D6}",
-        nfd: "\u{110C}\u{116C}\u{11B9}",
-        nfkc: "\u{C8D6}",
-        nfkd: "\u{110C}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C8D7}",
-        nfc: "\u{C8D7}",
-        nfd: "\u{110C}\u{116C}\u{11BA}",
-        nfkc: "\u{C8D7}",
-        nfkd: "\u{110C}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C8D8}",
-        nfc: "\u{C8D8}",
-        nfd: "\u{110C}\u{116C}\u{11BB}",
-        nfkc: "\u{C8D8}",
-        nfkd: "\u{110C}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C8D9}",
-        nfc: "\u{C8D9}",
-        nfd: "\u{110C}\u{116C}\u{11BC}",
-        nfkc: "\u{C8D9}",
-        nfkd: "\u{110C}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C8DA}",
-        nfc: "\u{C8DA}",
-        nfd: "\u{110C}\u{116C}\u{11BD}",
-        nfkc: "\u{C8DA}",
-        nfkd: "\u{110C}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C8DB}",
-        nfc: "\u{C8DB}",
-        nfd: "\u{110C}\u{116C}\u{11BE}",
-        nfkc: "\u{C8DB}",
-        nfkd: "\u{110C}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C8DC}",
-        nfc: "\u{C8DC}",
-        nfd: "\u{110C}\u{116C}\u{11BF}",
-        nfkc: "\u{C8DC}",
-        nfkd: "\u{110C}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C8DD}",
-        nfc: "\u{C8DD}",
-        nfd: "\u{110C}\u{116C}\u{11C0}",
-        nfkc: "\u{C8DD}",
-        nfkd: "\u{110C}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C8DE}",
-        nfc: "\u{C8DE}",
-        nfd: "\u{110C}\u{116C}\u{11C1}",
-        nfkc: "\u{C8DE}",
-        nfkd: "\u{110C}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C8DF}",
-        nfc: "\u{C8DF}",
-        nfd: "\u{110C}\u{116C}\u{11C2}",
-        nfkc: "\u{C8DF}",
-        nfkd: "\u{110C}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C8E0}",
-        nfc: "\u{C8E0}",
-        nfd: "\u{110C}\u{116D}",
-        nfkc: "\u{C8E0}",
-        nfkd: "\u{110C}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{C8E1}",
-        nfc: "\u{C8E1}",
-        nfd: "\u{110C}\u{116D}\u{11A8}",
-        nfkc: "\u{C8E1}",
-        nfkd: "\u{110C}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C8E2}",
-        nfc: "\u{C8E2}",
-        nfd: "\u{110C}\u{116D}\u{11A9}",
-        nfkc: "\u{C8E2}",
-        nfkd: "\u{110C}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C8E3}",
-        nfc: "\u{C8E3}",
-        nfd: "\u{110C}\u{116D}\u{11AA}",
-        nfkc: "\u{C8E3}",
-        nfkd: "\u{110C}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C8E4}",
-        nfc: "\u{C8E4}",
-        nfd: "\u{110C}\u{116D}\u{11AB}",
-        nfkc: "\u{C8E4}",
-        nfkd: "\u{110C}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C8E5}",
-        nfc: "\u{C8E5}",
-        nfd: "\u{110C}\u{116D}\u{11AC}",
-        nfkc: "\u{C8E5}",
-        nfkd: "\u{110C}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C8E6}",
-        nfc: "\u{C8E6}",
-        nfd: "\u{110C}\u{116D}\u{11AD}",
-        nfkc: "\u{C8E6}",
-        nfkd: "\u{110C}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C8E7}",
-        nfc: "\u{C8E7}",
-        nfd: "\u{110C}\u{116D}\u{11AE}",
-        nfkc: "\u{C8E7}",
-        nfkd: "\u{110C}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C8E8}",
-        nfc: "\u{C8E8}",
-        nfd: "\u{110C}\u{116D}\u{11AF}",
-        nfkc: "\u{C8E8}",
-        nfkd: "\u{110C}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C8E9}",
-        nfc: "\u{C8E9}",
-        nfd: "\u{110C}\u{116D}\u{11B0}",
-        nfkc: "\u{C8E9}",
-        nfkd: "\u{110C}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C8EA}",
-        nfc: "\u{C8EA}",
-        nfd: "\u{110C}\u{116D}\u{11B1}",
-        nfkc: "\u{C8EA}",
-        nfkd: "\u{110C}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C8EB}",
-        nfc: "\u{C8EB}",
-        nfd: "\u{110C}\u{116D}\u{11B2}",
-        nfkc: "\u{C8EB}",
-        nfkd: "\u{110C}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C8EC}",
-        nfc: "\u{C8EC}",
-        nfd: "\u{110C}\u{116D}\u{11B3}",
-        nfkc: "\u{C8EC}",
-        nfkd: "\u{110C}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C8ED}",
-        nfc: "\u{C8ED}",
-        nfd: "\u{110C}\u{116D}\u{11B4}",
-        nfkc: "\u{C8ED}",
-        nfkd: "\u{110C}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C8EE}",
-        nfc: "\u{C8EE}",
-        nfd: "\u{110C}\u{116D}\u{11B5}",
-        nfkc: "\u{C8EE}",
-        nfkd: "\u{110C}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C8EF}",
-        nfc: "\u{C8EF}",
-        nfd: "\u{110C}\u{116D}\u{11B6}",
-        nfkc: "\u{C8EF}",
-        nfkd: "\u{110C}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C8F0}",
-        nfc: "\u{C8F0}",
-        nfd: "\u{110C}\u{116D}\u{11B7}",
-        nfkc: "\u{C8F0}",
-        nfkd: "\u{110C}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C8F1}",
-        nfc: "\u{C8F1}",
-        nfd: "\u{110C}\u{116D}\u{11B8}",
-        nfkc: "\u{C8F1}",
-        nfkd: "\u{110C}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C8F2}",
-        nfc: "\u{C8F2}",
-        nfd: "\u{110C}\u{116D}\u{11B9}",
-        nfkc: "\u{C8F2}",
-        nfkd: "\u{110C}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C8F3}",
-        nfc: "\u{C8F3}",
-        nfd: "\u{110C}\u{116D}\u{11BA}",
-        nfkc: "\u{C8F3}",
-        nfkd: "\u{110C}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C8F4}",
-        nfc: "\u{C8F4}",
-        nfd: "\u{110C}\u{116D}\u{11BB}",
-        nfkc: "\u{C8F4}",
-        nfkd: "\u{110C}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C8F5}",
-        nfc: "\u{C8F5}",
-        nfd: "\u{110C}\u{116D}\u{11BC}",
-        nfkc: "\u{C8F5}",
-        nfkd: "\u{110C}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C8F6}",
-        nfc: "\u{C8F6}",
-        nfd: "\u{110C}\u{116D}\u{11BD}",
-        nfkc: "\u{C8F6}",
-        nfkd: "\u{110C}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C8F7}",
-        nfc: "\u{C8F7}",
-        nfd: "\u{110C}\u{116D}\u{11BE}",
-        nfkc: "\u{C8F7}",
-        nfkd: "\u{110C}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C8F8}",
-        nfc: "\u{C8F8}",
-        nfd: "\u{110C}\u{116D}\u{11BF}",
-        nfkc: "\u{C8F8}",
-        nfkd: "\u{110C}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C8F9}",
-        nfc: "\u{C8F9}",
-        nfd: "\u{110C}\u{116D}\u{11C0}",
-        nfkc: "\u{C8F9}",
-        nfkd: "\u{110C}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C8FA}",
-        nfc: "\u{C8FA}",
-        nfd: "\u{110C}\u{116D}\u{11C1}",
-        nfkc: "\u{C8FA}",
-        nfkd: "\u{110C}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C8FB}",
-        nfc: "\u{C8FB}",
-        nfd: "\u{110C}\u{116D}\u{11C2}",
-        nfkc: "\u{C8FB}",
-        nfkd: "\u{110C}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C8FC}",
-        nfc: "\u{C8FC}",
-        nfd: "\u{110C}\u{116E}",
-        nfkc: "\u{C8FC}",
-        nfkd: "\u{110C}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{C8FD}",
-        nfc: "\u{C8FD}",
-        nfd: "\u{110C}\u{116E}\u{11A8}",
-        nfkc: "\u{C8FD}",
-        nfkd: "\u{110C}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C8FE}",
-        nfc: "\u{C8FE}",
-        nfd: "\u{110C}\u{116E}\u{11A9}",
-        nfkc: "\u{C8FE}",
-        nfkd: "\u{110C}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C8FF}",
-        nfc: "\u{C8FF}",
-        nfd: "\u{110C}\u{116E}\u{11AA}",
-        nfkc: "\u{C8FF}",
-        nfkd: "\u{110C}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C900}",
-        nfc: "\u{C900}",
-        nfd: "\u{110C}\u{116E}\u{11AB}",
-        nfkc: "\u{C900}",
-        nfkd: "\u{110C}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C901}",
-        nfc: "\u{C901}",
-        nfd: "\u{110C}\u{116E}\u{11AC}",
-        nfkc: "\u{C901}",
-        nfkd: "\u{110C}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C902}",
-        nfc: "\u{C902}",
-        nfd: "\u{110C}\u{116E}\u{11AD}",
-        nfkc: "\u{C902}",
-        nfkd: "\u{110C}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C903}",
-        nfc: "\u{C903}",
-        nfd: "\u{110C}\u{116E}\u{11AE}",
-        nfkc: "\u{C903}",
-        nfkd: "\u{110C}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C904}",
-        nfc: "\u{C904}",
-        nfd: "\u{110C}\u{116E}\u{11AF}",
-        nfkc: "\u{C904}",
-        nfkd: "\u{110C}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C905}",
-        nfc: "\u{C905}",
-        nfd: "\u{110C}\u{116E}\u{11B0}",
-        nfkc: "\u{C905}",
-        nfkd: "\u{110C}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C906}",
-        nfc: "\u{C906}",
-        nfd: "\u{110C}\u{116E}\u{11B1}",
-        nfkc: "\u{C906}",
-        nfkd: "\u{110C}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C907}",
-        nfc: "\u{C907}",
-        nfd: "\u{110C}\u{116E}\u{11B2}",
-        nfkc: "\u{C907}",
-        nfkd: "\u{110C}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C908}",
-        nfc: "\u{C908}",
-        nfd: "\u{110C}\u{116E}\u{11B3}",
-        nfkc: "\u{C908}",
-        nfkd: "\u{110C}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C909}",
-        nfc: "\u{C909}",
-        nfd: "\u{110C}\u{116E}\u{11B4}",
-        nfkc: "\u{C909}",
-        nfkd: "\u{110C}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C90A}",
-        nfc: "\u{C90A}",
-        nfd: "\u{110C}\u{116E}\u{11B5}",
-        nfkc: "\u{C90A}",
-        nfkd: "\u{110C}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C90B}",
-        nfc: "\u{C90B}",
-        nfd: "\u{110C}\u{116E}\u{11B6}",
-        nfkc: "\u{C90B}",
-        nfkd: "\u{110C}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C90C}",
-        nfc: "\u{C90C}",
-        nfd: "\u{110C}\u{116E}\u{11B7}",
-        nfkc: "\u{C90C}",
-        nfkd: "\u{110C}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C90D}",
-        nfc: "\u{C90D}",
-        nfd: "\u{110C}\u{116E}\u{11B8}",
-        nfkc: "\u{C90D}",
-        nfkd: "\u{110C}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C90E}",
-        nfc: "\u{C90E}",
-        nfd: "\u{110C}\u{116E}\u{11B9}",
-        nfkc: "\u{C90E}",
-        nfkd: "\u{110C}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C90F}",
-        nfc: "\u{C90F}",
-        nfd: "\u{110C}\u{116E}\u{11BA}",
-        nfkc: "\u{C90F}",
-        nfkd: "\u{110C}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C910}",
-        nfc: "\u{C910}",
-        nfd: "\u{110C}\u{116E}\u{11BB}",
-        nfkc: "\u{C910}",
-        nfkd: "\u{110C}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C911}",
-        nfc: "\u{C911}",
-        nfd: "\u{110C}\u{116E}\u{11BC}",
-        nfkc: "\u{C911}",
-        nfkd: "\u{110C}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C912}",
-        nfc: "\u{C912}",
-        nfd: "\u{110C}\u{116E}\u{11BD}",
-        nfkc: "\u{C912}",
-        nfkd: "\u{110C}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C913}",
-        nfc: "\u{C913}",
-        nfd: "\u{110C}\u{116E}\u{11BE}",
-        nfkc: "\u{C913}",
-        nfkd: "\u{110C}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C914}",
-        nfc: "\u{C914}",
-        nfd: "\u{110C}\u{116E}\u{11BF}",
-        nfkc: "\u{C914}",
-        nfkd: "\u{110C}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C915}",
-        nfc: "\u{C915}",
-        nfd: "\u{110C}\u{116E}\u{11C0}",
-        nfkc: "\u{C915}",
-        nfkd: "\u{110C}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C916}",
-        nfc: "\u{C916}",
-        nfd: "\u{110C}\u{116E}\u{11C1}",
-        nfkc: "\u{C916}",
-        nfkd: "\u{110C}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C917}",
-        nfc: "\u{C917}",
-        nfd: "\u{110C}\u{116E}\u{11C2}",
-        nfkc: "\u{C917}",
-        nfkd: "\u{110C}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C918}",
-        nfc: "\u{C918}",
-        nfd: "\u{110C}\u{116F}",
-        nfkc: "\u{C918}",
-        nfkd: "\u{110C}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{C919}",
-        nfc: "\u{C919}",
-        nfd: "\u{110C}\u{116F}\u{11A8}",
-        nfkc: "\u{C919}",
-        nfkd: "\u{110C}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C91A}",
-        nfc: "\u{C91A}",
-        nfd: "\u{110C}\u{116F}\u{11A9}",
-        nfkc: "\u{C91A}",
-        nfkd: "\u{110C}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C91B}",
-        nfc: "\u{C91B}",
-        nfd: "\u{110C}\u{116F}\u{11AA}",
-        nfkc: "\u{C91B}",
-        nfkd: "\u{110C}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C91C}",
-        nfc: "\u{C91C}",
-        nfd: "\u{110C}\u{116F}\u{11AB}",
-        nfkc: "\u{C91C}",
-        nfkd: "\u{110C}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C91D}",
-        nfc: "\u{C91D}",
-        nfd: "\u{110C}\u{116F}\u{11AC}",
-        nfkc: "\u{C91D}",
-        nfkd: "\u{110C}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C91E}",
-        nfc: "\u{C91E}",
-        nfd: "\u{110C}\u{116F}\u{11AD}",
-        nfkc: "\u{C91E}",
-        nfkd: "\u{110C}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C91F}",
-        nfc: "\u{C91F}",
-        nfd: "\u{110C}\u{116F}\u{11AE}",
-        nfkc: "\u{C91F}",
-        nfkd: "\u{110C}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C920}",
-        nfc: "\u{C920}",
-        nfd: "\u{110C}\u{116F}\u{11AF}",
-        nfkc: "\u{C920}",
-        nfkd: "\u{110C}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C921}",
-        nfc: "\u{C921}",
-        nfd: "\u{110C}\u{116F}\u{11B0}",
-        nfkc: "\u{C921}",
-        nfkd: "\u{110C}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C922}",
-        nfc: "\u{C922}",
-        nfd: "\u{110C}\u{116F}\u{11B1}",
-        nfkc: "\u{C922}",
-        nfkd: "\u{110C}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C923}",
-        nfc: "\u{C923}",
-        nfd: "\u{110C}\u{116F}\u{11B2}",
-        nfkc: "\u{C923}",
-        nfkd: "\u{110C}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C924}",
-        nfc: "\u{C924}",
-        nfd: "\u{110C}\u{116F}\u{11B3}",
-        nfkc: "\u{C924}",
-        nfkd: "\u{110C}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C925}",
-        nfc: "\u{C925}",
-        nfd: "\u{110C}\u{116F}\u{11B4}",
-        nfkc: "\u{C925}",
-        nfkd: "\u{110C}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C926}",
-        nfc: "\u{C926}",
-        nfd: "\u{110C}\u{116F}\u{11B5}",
-        nfkc: "\u{C926}",
-        nfkd: "\u{110C}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C927}",
-        nfc: "\u{C927}",
-        nfd: "\u{110C}\u{116F}\u{11B6}",
-        nfkc: "\u{C927}",
-        nfkd: "\u{110C}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C928}",
-        nfc: "\u{C928}",
-        nfd: "\u{110C}\u{116F}\u{11B7}",
-        nfkc: "\u{C928}",
-        nfkd: "\u{110C}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C929}",
-        nfc: "\u{C929}",
-        nfd: "\u{110C}\u{116F}\u{11B8}",
-        nfkc: "\u{C929}",
-        nfkd: "\u{110C}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C92A}",
-        nfc: "\u{C92A}",
-        nfd: "\u{110C}\u{116F}\u{11B9}",
-        nfkc: "\u{C92A}",
-        nfkd: "\u{110C}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C92B}",
-        nfc: "\u{C92B}",
-        nfd: "\u{110C}\u{116F}\u{11BA}",
-        nfkc: "\u{C92B}",
-        nfkd: "\u{110C}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C92C}",
-        nfc: "\u{C92C}",
-        nfd: "\u{110C}\u{116F}\u{11BB}",
-        nfkc: "\u{C92C}",
-        nfkd: "\u{110C}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C92D}",
-        nfc: "\u{C92D}",
-        nfd: "\u{110C}\u{116F}\u{11BC}",
-        nfkc: "\u{C92D}",
-        nfkd: "\u{110C}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C92E}",
-        nfc: "\u{C92E}",
-        nfd: "\u{110C}\u{116F}\u{11BD}",
-        nfkc: "\u{C92E}",
-        nfkd: "\u{110C}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C92F}",
-        nfc: "\u{C92F}",
-        nfd: "\u{110C}\u{116F}\u{11BE}",
-        nfkc: "\u{C92F}",
-        nfkd: "\u{110C}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C930}",
-        nfc: "\u{C930}",
-        nfd: "\u{110C}\u{116F}\u{11BF}",
-        nfkc: "\u{C930}",
-        nfkd: "\u{110C}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C931}",
-        nfc: "\u{C931}",
-        nfd: "\u{110C}\u{116F}\u{11C0}",
-        nfkc: "\u{C931}",
-        nfkd: "\u{110C}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C932}",
-        nfc: "\u{C932}",
-        nfd: "\u{110C}\u{116F}\u{11C1}",
-        nfkc: "\u{C932}",
-        nfkd: "\u{110C}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C933}",
-        nfc: "\u{C933}",
-        nfd: "\u{110C}\u{116F}\u{11C2}",
-        nfkc: "\u{C933}",
-        nfkd: "\u{110C}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C934}",
-        nfc: "\u{C934}",
-        nfd: "\u{110C}\u{1170}",
-        nfkc: "\u{C934}",
-        nfkd: "\u{110C}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{C935}",
-        nfc: "\u{C935}",
-        nfd: "\u{110C}\u{1170}\u{11A8}",
-        nfkc: "\u{C935}",
-        nfkd: "\u{110C}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C936}",
-        nfc: "\u{C936}",
-        nfd: "\u{110C}\u{1170}\u{11A9}",
-        nfkc: "\u{C936}",
-        nfkd: "\u{110C}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C937}",
-        nfc: "\u{C937}",
-        nfd: "\u{110C}\u{1170}\u{11AA}",
-        nfkc: "\u{C937}",
-        nfkd: "\u{110C}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C938}",
-        nfc: "\u{C938}",
-        nfd: "\u{110C}\u{1170}\u{11AB}",
-        nfkc: "\u{C938}",
-        nfkd: "\u{110C}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C939}",
-        nfc: "\u{C939}",
-        nfd: "\u{110C}\u{1170}\u{11AC}",
-        nfkc: "\u{C939}",
-        nfkd: "\u{110C}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C93A}",
-        nfc: "\u{C93A}",
-        nfd: "\u{110C}\u{1170}\u{11AD}",
-        nfkc: "\u{C93A}",
-        nfkd: "\u{110C}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C93B}",
-        nfc: "\u{C93B}",
-        nfd: "\u{110C}\u{1170}\u{11AE}",
-        nfkc: "\u{C93B}",
-        nfkd: "\u{110C}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C93C}",
-        nfc: "\u{C93C}",
-        nfd: "\u{110C}\u{1170}\u{11AF}",
-        nfkc: "\u{C93C}",
-        nfkd: "\u{110C}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C93D}",
-        nfc: "\u{C93D}",
-        nfd: "\u{110C}\u{1170}\u{11B0}",
-        nfkc: "\u{C93D}",
-        nfkd: "\u{110C}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C93E}",
-        nfc: "\u{C93E}",
-        nfd: "\u{110C}\u{1170}\u{11B1}",
-        nfkc: "\u{C93E}",
-        nfkd: "\u{110C}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C93F}",
-        nfc: "\u{C93F}",
-        nfd: "\u{110C}\u{1170}\u{11B2}",
-        nfkc: "\u{C93F}",
-        nfkd: "\u{110C}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C940}",
-        nfc: "\u{C940}",
-        nfd: "\u{110C}\u{1170}\u{11B3}",
-        nfkc: "\u{C940}",
-        nfkd: "\u{110C}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C941}",
-        nfc: "\u{C941}",
-        nfd: "\u{110C}\u{1170}\u{11B4}",
-        nfkc: "\u{C941}",
-        nfkd: "\u{110C}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C942}",
-        nfc: "\u{C942}",
-        nfd: "\u{110C}\u{1170}\u{11B5}",
-        nfkc: "\u{C942}",
-        nfkd: "\u{110C}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C943}",
-        nfc: "\u{C943}",
-        nfd: "\u{110C}\u{1170}\u{11B6}",
-        nfkc: "\u{C943}",
-        nfkd: "\u{110C}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C944}",
-        nfc: "\u{C944}",
-        nfd: "\u{110C}\u{1170}\u{11B7}",
-        nfkc: "\u{C944}",
-        nfkd: "\u{110C}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C945}",
-        nfc: "\u{C945}",
-        nfd: "\u{110C}\u{1170}\u{11B8}",
-        nfkc: "\u{C945}",
-        nfkd: "\u{110C}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C946}",
-        nfc: "\u{C946}",
-        nfd: "\u{110C}\u{1170}\u{11B9}",
-        nfkc: "\u{C946}",
-        nfkd: "\u{110C}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C947}",
-        nfc: "\u{C947}",
-        nfd: "\u{110C}\u{1170}\u{11BA}",
-        nfkc: "\u{C947}",
-        nfkd: "\u{110C}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C948}",
-        nfc: "\u{C948}",
-        nfd: "\u{110C}\u{1170}\u{11BB}",
-        nfkc: "\u{C948}",
-        nfkd: "\u{110C}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C949}",
-        nfc: "\u{C949}",
-        nfd: "\u{110C}\u{1170}\u{11BC}",
-        nfkc: "\u{C949}",
-        nfkd: "\u{110C}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C94A}",
-        nfc: "\u{C94A}",
-        nfd: "\u{110C}\u{1170}\u{11BD}",
-        nfkc: "\u{C94A}",
-        nfkd: "\u{110C}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C94B}",
-        nfc: "\u{C94B}",
-        nfd: "\u{110C}\u{1170}\u{11BE}",
-        nfkc: "\u{C94B}",
-        nfkd: "\u{110C}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C94C}",
-        nfc: "\u{C94C}",
-        nfd: "\u{110C}\u{1170}\u{11BF}",
-        nfkc: "\u{C94C}",
-        nfkd: "\u{110C}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C94D}",
-        nfc: "\u{C94D}",
-        nfd: "\u{110C}\u{1170}\u{11C0}",
-        nfkc: "\u{C94D}",
-        nfkd: "\u{110C}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C94E}",
-        nfc: "\u{C94E}",
-        nfd: "\u{110C}\u{1170}\u{11C1}",
-        nfkc: "\u{C94E}",
-        nfkd: "\u{110C}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C94F}",
-        nfc: "\u{C94F}",
-        nfd: "\u{110C}\u{1170}\u{11C2}",
-        nfkc: "\u{C94F}",
-        nfkd: "\u{110C}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C950}",
-        nfc: "\u{C950}",
-        nfd: "\u{110C}\u{1171}",
-        nfkc: "\u{C950}",
-        nfkd: "\u{110C}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{C951}",
-        nfc: "\u{C951}",
-        nfd: "\u{110C}\u{1171}\u{11A8}",
-        nfkc: "\u{C951}",
-        nfkd: "\u{110C}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C952}",
-        nfc: "\u{C952}",
-        nfd: "\u{110C}\u{1171}\u{11A9}",
-        nfkc: "\u{C952}",
-        nfkd: "\u{110C}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C953}",
-        nfc: "\u{C953}",
-        nfd: "\u{110C}\u{1171}\u{11AA}",
-        nfkc: "\u{C953}",
-        nfkd: "\u{110C}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C954}",
-        nfc: "\u{C954}",
-        nfd: "\u{110C}\u{1171}\u{11AB}",
-        nfkc: "\u{C954}",
-        nfkd: "\u{110C}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C955}",
-        nfc: "\u{C955}",
-        nfd: "\u{110C}\u{1171}\u{11AC}",
-        nfkc: "\u{C955}",
-        nfkd: "\u{110C}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C956}",
-        nfc: "\u{C956}",
-        nfd: "\u{110C}\u{1171}\u{11AD}",
-        nfkc: "\u{C956}",
-        nfkd: "\u{110C}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C957}",
-        nfc: "\u{C957}",
-        nfd: "\u{110C}\u{1171}\u{11AE}",
-        nfkc: "\u{C957}",
-        nfkd: "\u{110C}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C958}",
-        nfc: "\u{C958}",
-        nfd: "\u{110C}\u{1171}\u{11AF}",
-        nfkc: "\u{C958}",
-        nfkd: "\u{110C}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C959}",
-        nfc: "\u{C959}",
-        nfd: "\u{110C}\u{1171}\u{11B0}",
-        nfkc: "\u{C959}",
-        nfkd: "\u{110C}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C95A}",
-        nfc: "\u{C95A}",
-        nfd: "\u{110C}\u{1171}\u{11B1}",
-        nfkc: "\u{C95A}",
-        nfkd: "\u{110C}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C95B}",
-        nfc: "\u{C95B}",
-        nfd: "\u{110C}\u{1171}\u{11B2}",
-        nfkc: "\u{C95B}",
-        nfkd: "\u{110C}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C95C}",
-        nfc: "\u{C95C}",
-        nfd: "\u{110C}\u{1171}\u{11B3}",
-        nfkc: "\u{C95C}",
-        nfkd: "\u{110C}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C95D}",
-        nfc: "\u{C95D}",
-        nfd: "\u{110C}\u{1171}\u{11B4}",
-        nfkc: "\u{C95D}",
-        nfkd: "\u{110C}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C95E}",
-        nfc: "\u{C95E}",
-        nfd: "\u{110C}\u{1171}\u{11B5}",
-        nfkc: "\u{C95E}",
-        nfkd: "\u{110C}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C95F}",
-        nfc: "\u{C95F}",
-        nfd: "\u{110C}\u{1171}\u{11B6}",
-        nfkc: "\u{C95F}",
-        nfkd: "\u{110C}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C960}",
-        nfc: "\u{C960}",
-        nfd: "\u{110C}\u{1171}\u{11B7}",
-        nfkc: "\u{C960}",
-        nfkd: "\u{110C}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C961}",
-        nfc: "\u{C961}",
-        nfd: "\u{110C}\u{1171}\u{11B8}",
-        nfkc: "\u{C961}",
-        nfkd: "\u{110C}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C962}",
-        nfc: "\u{C962}",
-        nfd: "\u{110C}\u{1171}\u{11B9}",
-        nfkc: "\u{C962}",
-        nfkd: "\u{110C}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C963}",
-        nfc: "\u{C963}",
-        nfd: "\u{110C}\u{1171}\u{11BA}",
-        nfkc: "\u{C963}",
-        nfkd: "\u{110C}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C964}",
-        nfc: "\u{C964}",
-        nfd: "\u{110C}\u{1171}\u{11BB}",
-        nfkc: "\u{C964}",
-        nfkd: "\u{110C}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C965}",
-        nfc: "\u{C965}",
-        nfd: "\u{110C}\u{1171}\u{11BC}",
-        nfkc: "\u{C965}",
-        nfkd: "\u{110C}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C966}",
-        nfc: "\u{C966}",
-        nfd: "\u{110C}\u{1171}\u{11BD}",
-        nfkc: "\u{C966}",
-        nfkd: "\u{110C}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C967}",
-        nfc: "\u{C967}",
-        nfd: "\u{110C}\u{1171}\u{11BE}",
-        nfkc: "\u{C967}",
-        nfkd: "\u{110C}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C968}",
-        nfc: "\u{C968}",
-        nfd: "\u{110C}\u{1171}\u{11BF}",
-        nfkc: "\u{C968}",
-        nfkd: "\u{110C}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C969}",
-        nfc: "\u{C969}",
-        nfd: "\u{110C}\u{1171}\u{11C0}",
-        nfkc: "\u{C969}",
-        nfkd: "\u{110C}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C96A}",
-        nfc: "\u{C96A}",
-        nfd: "\u{110C}\u{1171}\u{11C1}",
-        nfkc: "\u{C96A}",
-        nfkd: "\u{110C}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C96B}",
-        nfc: "\u{C96B}",
-        nfd: "\u{110C}\u{1171}\u{11C2}",
-        nfkc: "\u{C96B}",
-        nfkd: "\u{110C}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C96C}",
-        nfc: "\u{C96C}",
-        nfd: "\u{110C}\u{1172}",
-        nfkc: "\u{C96C}",
-        nfkd: "\u{110C}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{C96D}",
-        nfc: "\u{C96D}",
-        nfd: "\u{110C}\u{1172}\u{11A8}",
-        nfkc: "\u{C96D}",
-        nfkd: "\u{110C}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C96E}",
-        nfc: "\u{C96E}",
-        nfd: "\u{110C}\u{1172}\u{11A9}",
-        nfkc: "\u{C96E}",
-        nfkd: "\u{110C}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C96F}",
-        nfc: "\u{C96F}",
-        nfd: "\u{110C}\u{1172}\u{11AA}",
-        nfkc: "\u{C96F}",
-        nfkd: "\u{110C}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C970}",
-        nfc: "\u{C970}",
-        nfd: "\u{110C}\u{1172}\u{11AB}",
-        nfkc: "\u{C970}",
-        nfkd: "\u{110C}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C971}",
-        nfc: "\u{C971}",
-        nfd: "\u{110C}\u{1172}\u{11AC}",
-        nfkc: "\u{C971}",
-        nfkd: "\u{110C}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C972}",
-        nfc: "\u{C972}",
-        nfd: "\u{110C}\u{1172}\u{11AD}",
-        nfkc: "\u{C972}",
-        nfkd: "\u{110C}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C973}",
-        nfc: "\u{C973}",
-        nfd: "\u{110C}\u{1172}\u{11AE}",
-        nfkc: "\u{C973}",
-        nfkd: "\u{110C}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C974}",
-        nfc: "\u{C974}",
-        nfd: "\u{110C}\u{1172}\u{11AF}",
-        nfkc: "\u{C974}",
-        nfkd: "\u{110C}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C975}",
-        nfc: "\u{C975}",
-        nfd: "\u{110C}\u{1172}\u{11B0}",
-        nfkc: "\u{C975}",
-        nfkd: "\u{110C}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C976}",
-        nfc: "\u{C976}",
-        nfd: "\u{110C}\u{1172}\u{11B1}",
-        nfkc: "\u{C976}",
-        nfkd: "\u{110C}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C977}",
-        nfc: "\u{C977}",
-        nfd: "\u{110C}\u{1172}\u{11B2}",
-        nfkc: "\u{C977}",
-        nfkd: "\u{110C}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C978}",
-        nfc: "\u{C978}",
-        nfd: "\u{110C}\u{1172}\u{11B3}",
-        nfkc: "\u{C978}",
-        nfkd: "\u{110C}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C979}",
-        nfc: "\u{C979}",
-        nfd: "\u{110C}\u{1172}\u{11B4}",
-        nfkc: "\u{C979}",
-        nfkd: "\u{110C}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C97A}",
-        nfc: "\u{C97A}",
-        nfd: "\u{110C}\u{1172}\u{11B5}",
-        nfkc: "\u{C97A}",
-        nfkd: "\u{110C}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C97B}",
-        nfc: "\u{C97B}",
-        nfd: "\u{110C}\u{1172}\u{11B6}",
-        nfkc: "\u{C97B}",
-        nfkd: "\u{110C}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C97C}",
-        nfc: "\u{C97C}",
-        nfd: "\u{110C}\u{1172}\u{11B7}",
-        nfkc: "\u{C97C}",
-        nfkd: "\u{110C}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C97D}",
-        nfc: "\u{C97D}",
-        nfd: "\u{110C}\u{1172}\u{11B8}",
-        nfkc: "\u{C97D}",
-        nfkd: "\u{110C}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C97E}",
-        nfc: "\u{C97E}",
-        nfd: "\u{110C}\u{1172}\u{11B9}",
-        nfkc: "\u{C97E}",
-        nfkd: "\u{110C}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C97F}",
-        nfc: "\u{C97F}",
-        nfd: "\u{110C}\u{1172}\u{11BA}",
-        nfkc: "\u{C97F}",
-        nfkd: "\u{110C}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C980}",
-        nfc: "\u{C980}",
-        nfd: "\u{110C}\u{1172}\u{11BB}",
-        nfkc: "\u{C980}",
-        nfkd: "\u{110C}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C981}",
-        nfc: "\u{C981}",
-        nfd: "\u{110C}\u{1172}\u{11BC}",
-        nfkc: "\u{C981}",
-        nfkd: "\u{110C}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C982}",
-        nfc: "\u{C982}",
-        nfd: "\u{110C}\u{1172}\u{11BD}",
-        nfkc: "\u{C982}",
-        nfkd: "\u{110C}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C983}",
-        nfc: "\u{C983}",
-        nfd: "\u{110C}\u{1172}\u{11BE}",
-        nfkc: "\u{C983}",
-        nfkd: "\u{110C}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C984}",
-        nfc: "\u{C984}",
-        nfd: "\u{110C}\u{1172}\u{11BF}",
-        nfkc: "\u{C984}",
-        nfkd: "\u{110C}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C985}",
-        nfc: "\u{C985}",
-        nfd: "\u{110C}\u{1172}\u{11C0}",
-        nfkc: "\u{C985}",
-        nfkd: "\u{110C}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C986}",
-        nfc: "\u{C986}",
-        nfd: "\u{110C}\u{1172}\u{11C1}",
-        nfkc: "\u{C986}",
-        nfkd: "\u{110C}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C987}",
-        nfc: "\u{C987}",
-        nfd: "\u{110C}\u{1172}\u{11C2}",
-        nfkc: "\u{C987}",
-        nfkd: "\u{110C}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C988}",
-        nfc: "\u{C988}",
-        nfd: "\u{110C}\u{1173}",
-        nfkc: "\u{C988}",
-        nfkd: "\u{110C}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{C989}",
-        nfc: "\u{C989}",
-        nfd: "\u{110C}\u{1173}\u{11A8}",
-        nfkc: "\u{C989}",
-        nfkd: "\u{110C}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C98A}",
-        nfc: "\u{C98A}",
-        nfd: "\u{110C}\u{1173}\u{11A9}",
-        nfkc: "\u{C98A}",
-        nfkd: "\u{110C}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C98B}",
-        nfc: "\u{C98B}",
-        nfd: "\u{110C}\u{1173}\u{11AA}",
-        nfkc: "\u{C98B}",
-        nfkd: "\u{110C}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C98C}",
-        nfc: "\u{C98C}",
-        nfd: "\u{110C}\u{1173}\u{11AB}",
-        nfkc: "\u{C98C}",
-        nfkd: "\u{110C}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C98D}",
-        nfc: "\u{C98D}",
-        nfd: "\u{110C}\u{1173}\u{11AC}",
-        nfkc: "\u{C98D}",
-        nfkd: "\u{110C}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C98E}",
-        nfc: "\u{C98E}",
-        nfd: "\u{110C}\u{1173}\u{11AD}",
-        nfkc: "\u{C98E}",
-        nfkd: "\u{110C}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C98F}",
-        nfc: "\u{C98F}",
-        nfd: "\u{110C}\u{1173}\u{11AE}",
-        nfkc: "\u{C98F}",
-        nfkd: "\u{110C}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C990}",
-        nfc: "\u{C990}",
-        nfd: "\u{110C}\u{1173}\u{11AF}",
-        nfkc: "\u{C990}",
-        nfkd: "\u{110C}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C991}",
-        nfc: "\u{C991}",
-        nfd: "\u{110C}\u{1173}\u{11B0}",
-        nfkc: "\u{C991}",
-        nfkd: "\u{110C}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C992}",
-        nfc: "\u{C992}",
-        nfd: "\u{110C}\u{1173}\u{11B1}",
-        nfkc: "\u{C992}",
-        nfkd: "\u{110C}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C993}",
-        nfc: "\u{C993}",
-        nfd: "\u{110C}\u{1173}\u{11B2}",
-        nfkc: "\u{C993}",
-        nfkd: "\u{110C}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C994}",
-        nfc: "\u{C994}",
-        nfd: "\u{110C}\u{1173}\u{11B3}",
-        nfkc: "\u{C994}",
-        nfkd: "\u{110C}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C995}",
-        nfc: "\u{C995}",
-        nfd: "\u{110C}\u{1173}\u{11B4}",
-        nfkc: "\u{C995}",
-        nfkd: "\u{110C}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C996}",
-        nfc: "\u{C996}",
-        nfd: "\u{110C}\u{1173}\u{11B5}",
-        nfkc: "\u{C996}",
-        nfkd: "\u{110C}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C997}",
-        nfc: "\u{C997}",
-        nfd: "\u{110C}\u{1173}\u{11B6}",
-        nfkc: "\u{C997}",
-        nfkd: "\u{110C}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C998}",
-        nfc: "\u{C998}",
-        nfd: "\u{110C}\u{1173}\u{11B7}",
-        nfkc: "\u{C998}",
-        nfkd: "\u{110C}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C999}",
-        nfc: "\u{C999}",
-        nfd: "\u{110C}\u{1173}\u{11B8}",
-        nfkc: "\u{C999}",
-        nfkd: "\u{110C}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C99A}",
-        nfc: "\u{C99A}",
-        nfd: "\u{110C}\u{1173}\u{11B9}",
-        nfkc: "\u{C99A}",
-        nfkd: "\u{110C}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C99B}",
-        nfc: "\u{C99B}",
-        nfd: "\u{110C}\u{1173}\u{11BA}",
-        nfkc: "\u{C99B}",
-        nfkd: "\u{110C}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C99C}",
-        nfc: "\u{C99C}",
-        nfd: "\u{110C}\u{1173}\u{11BB}",
-        nfkc: "\u{C99C}",
-        nfkd: "\u{110C}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C99D}",
-        nfc: "\u{C99D}",
-        nfd: "\u{110C}\u{1173}\u{11BC}",
-        nfkc: "\u{C99D}",
-        nfkd: "\u{110C}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C99E}",
-        nfc: "\u{C99E}",
-        nfd: "\u{110C}\u{1173}\u{11BD}",
-        nfkc: "\u{C99E}",
-        nfkd: "\u{110C}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C99F}",
-        nfc: "\u{C99F}",
-        nfd: "\u{110C}\u{1173}\u{11BE}",
-        nfkc: "\u{C99F}",
-        nfkd: "\u{110C}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C9A0}",
-        nfc: "\u{C9A0}",
-        nfd: "\u{110C}\u{1173}\u{11BF}",
-        nfkc: "\u{C9A0}",
-        nfkd: "\u{110C}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C9A1}",
-        nfc: "\u{C9A1}",
-        nfd: "\u{110C}\u{1173}\u{11C0}",
-        nfkc: "\u{C9A1}",
-        nfkd: "\u{110C}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C9A2}",
-        nfc: "\u{C9A2}",
-        nfd: "\u{110C}\u{1173}\u{11C1}",
-        nfkc: "\u{C9A2}",
-        nfkd: "\u{110C}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C9A3}",
-        nfc: "\u{C9A3}",
-        nfd: "\u{110C}\u{1173}\u{11C2}",
-        nfkc: "\u{C9A3}",
-        nfkd: "\u{110C}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C9A4}",
-        nfc: "\u{C9A4}",
-        nfd: "\u{110C}\u{1174}",
-        nfkc: "\u{C9A4}",
-        nfkd: "\u{110C}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{C9A5}",
-        nfc: "\u{C9A5}",
-        nfd: "\u{110C}\u{1174}\u{11A8}",
-        nfkc: "\u{C9A5}",
-        nfkd: "\u{110C}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C9A6}",
-        nfc: "\u{C9A6}",
-        nfd: "\u{110C}\u{1174}\u{11A9}",
-        nfkc: "\u{C9A6}",
-        nfkd: "\u{110C}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C9A7}",
-        nfc: "\u{C9A7}",
-        nfd: "\u{110C}\u{1174}\u{11AA}",
-        nfkc: "\u{C9A7}",
-        nfkd: "\u{110C}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C9A8}",
-        nfc: "\u{C9A8}",
-        nfd: "\u{110C}\u{1174}\u{11AB}",
-        nfkc: "\u{C9A8}",
-        nfkd: "\u{110C}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C9A9}",
-        nfc: "\u{C9A9}",
-        nfd: "\u{110C}\u{1174}\u{11AC}",
-        nfkc: "\u{C9A9}",
-        nfkd: "\u{110C}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C9AA}",
-        nfc: "\u{C9AA}",
-        nfd: "\u{110C}\u{1174}\u{11AD}",
-        nfkc: "\u{C9AA}",
-        nfkd: "\u{110C}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C9AB}",
-        nfc: "\u{C9AB}",
-        nfd: "\u{110C}\u{1174}\u{11AE}",
-        nfkc: "\u{C9AB}",
-        nfkd: "\u{110C}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C9AC}",
-        nfc: "\u{C9AC}",
-        nfd: "\u{110C}\u{1174}\u{11AF}",
-        nfkc: "\u{C9AC}",
-        nfkd: "\u{110C}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C9AD}",
-        nfc: "\u{C9AD}",
-        nfd: "\u{110C}\u{1174}\u{11B0}",
-        nfkc: "\u{C9AD}",
-        nfkd: "\u{110C}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C9AE}",
-        nfc: "\u{C9AE}",
-        nfd: "\u{110C}\u{1174}\u{11B1}",
-        nfkc: "\u{C9AE}",
-        nfkd: "\u{110C}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C9AF}",
-        nfc: "\u{C9AF}",
-        nfd: "\u{110C}\u{1174}\u{11B2}",
-        nfkc: "\u{C9AF}",
-        nfkd: "\u{110C}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C9B0}",
-        nfc: "\u{C9B0}",
-        nfd: "\u{110C}\u{1174}\u{11B3}",
-        nfkc: "\u{C9B0}",
-        nfkd: "\u{110C}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C9B1}",
-        nfc: "\u{C9B1}",
-        nfd: "\u{110C}\u{1174}\u{11B4}",
-        nfkc: "\u{C9B1}",
-        nfkd: "\u{110C}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C9B2}",
-        nfc: "\u{C9B2}",
-        nfd: "\u{110C}\u{1174}\u{11B5}",
-        nfkc: "\u{C9B2}",
-        nfkd: "\u{110C}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C9B3}",
-        nfc: "\u{C9B3}",
-        nfd: "\u{110C}\u{1174}\u{11B6}",
-        nfkc: "\u{C9B3}",
-        nfkd: "\u{110C}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C9B4}",
-        nfc: "\u{C9B4}",
-        nfd: "\u{110C}\u{1174}\u{11B7}",
-        nfkc: "\u{C9B4}",
-        nfkd: "\u{110C}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C9B5}",
-        nfc: "\u{C9B5}",
-        nfd: "\u{110C}\u{1174}\u{11B8}",
-        nfkc: "\u{C9B5}",
-        nfkd: "\u{110C}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C9B6}",
-        nfc: "\u{C9B6}",
-        nfd: "\u{110C}\u{1174}\u{11B9}",
-        nfkc: "\u{C9B6}",
-        nfkd: "\u{110C}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C9B7}",
-        nfc: "\u{C9B7}",
-        nfd: "\u{110C}\u{1174}\u{11BA}",
-        nfkc: "\u{C9B7}",
-        nfkd: "\u{110C}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C9B8}",
-        nfc: "\u{C9B8}",
-        nfd: "\u{110C}\u{1174}\u{11BB}",
-        nfkc: "\u{C9B8}",
-        nfkd: "\u{110C}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C9B9}",
-        nfc: "\u{C9B9}",
-        nfd: "\u{110C}\u{1174}\u{11BC}",
-        nfkc: "\u{C9B9}",
-        nfkd: "\u{110C}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C9BA}",
-        nfc: "\u{C9BA}",
-        nfd: "\u{110C}\u{1174}\u{11BD}",
-        nfkc: "\u{C9BA}",
-        nfkd: "\u{110C}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C9BB}",
-        nfc: "\u{C9BB}",
-        nfd: "\u{110C}\u{1174}\u{11BE}",
-        nfkc: "\u{C9BB}",
-        nfkd: "\u{110C}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C9BC}",
-        nfc: "\u{C9BC}",
-        nfd: "\u{110C}\u{1174}\u{11BF}",
-        nfkc: "\u{C9BC}",
-        nfkd: "\u{110C}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C9BD}",
-        nfc: "\u{C9BD}",
-        nfd: "\u{110C}\u{1174}\u{11C0}",
-        nfkc: "\u{C9BD}",
-        nfkd: "\u{110C}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C9BE}",
-        nfc: "\u{C9BE}",
-        nfd: "\u{110C}\u{1174}\u{11C1}",
-        nfkc: "\u{C9BE}",
-        nfkd: "\u{110C}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C9BF}",
-        nfc: "\u{C9BF}",
-        nfd: "\u{110C}\u{1174}\u{11C2}",
-        nfkc: "\u{C9BF}",
-        nfkd: "\u{110C}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C9C0}",
-        nfc: "\u{C9C0}",
-        nfd: "\u{110C}\u{1175}",
-        nfkc: "\u{C9C0}",
-        nfkd: "\u{110C}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{C9C1}",
-        nfc: "\u{C9C1}",
-        nfd: "\u{110C}\u{1175}\u{11A8}",
-        nfkc: "\u{C9C1}",
-        nfkd: "\u{110C}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C9C2}",
-        nfc: "\u{C9C2}",
-        nfd: "\u{110C}\u{1175}\u{11A9}",
-        nfkc: "\u{C9C2}",
-        nfkd: "\u{110C}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C9C3}",
-        nfc: "\u{C9C3}",
-        nfd: "\u{110C}\u{1175}\u{11AA}",
-        nfkc: "\u{C9C3}",
-        nfkd: "\u{110C}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C9C4}",
-        nfc: "\u{C9C4}",
-        nfd: "\u{110C}\u{1175}\u{11AB}",
-        nfkc: "\u{C9C4}",
-        nfkd: "\u{110C}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C9C5}",
-        nfc: "\u{C9C5}",
-        nfd: "\u{110C}\u{1175}\u{11AC}",
-        nfkc: "\u{C9C5}",
-        nfkd: "\u{110C}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C9C6}",
-        nfc: "\u{C9C6}",
-        nfd: "\u{110C}\u{1175}\u{11AD}",
-        nfkc: "\u{C9C6}",
-        nfkd: "\u{110C}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C9C7}",
-        nfc: "\u{C9C7}",
-        nfd: "\u{110C}\u{1175}\u{11AE}",
-        nfkc: "\u{C9C7}",
-        nfkd: "\u{110C}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C9C8}",
-        nfc: "\u{C9C8}",
-        nfd: "\u{110C}\u{1175}\u{11AF}",
-        nfkc: "\u{C9C8}",
-        nfkd: "\u{110C}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C9C9}",
-        nfc: "\u{C9C9}",
-        nfd: "\u{110C}\u{1175}\u{11B0}",
-        nfkc: "\u{C9C9}",
-        nfkd: "\u{110C}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C9CA}",
-        nfc: "\u{C9CA}",
-        nfd: "\u{110C}\u{1175}\u{11B1}",
-        nfkc: "\u{C9CA}",
-        nfkd: "\u{110C}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C9CB}",
-        nfc: "\u{C9CB}",
-        nfd: "\u{110C}\u{1175}\u{11B2}",
-        nfkc: "\u{C9CB}",
-        nfkd: "\u{110C}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C9CC}",
-        nfc: "\u{C9CC}",
-        nfd: "\u{110C}\u{1175}\u{11B3}",
-        nfkc: "\u{C9CC}",
-        nfkd: "\u{110C}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C9CD}",
-        nfc: "\u{C9CD}",
-        nfd: "\u{110C}\u{1175}\u{11B4}",
-        nfkc: "\u{C9CD}",
-        nfkd: "\u{110C}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C9CE}",
-        nfc: "\u{C9CE}",
-        nfd: "\u{110C}\u{1175}\u{11B5}",
-        nfkc: "\u{C9CE}",
-        nfkd: "\u{110C}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C9CF}",
-        nfc: "\u{C9CF}",
-        nfd: "\u{110C}\u{1175}\u{11B6}",
-        nfkc: "\u{C9CF}",
-        nfkd: "\u{110C}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C9D0}",
-        nfc: "\u{C9D0}",
-        nfd: "\u{110C}\u{1175}\u{11B7}",
-        nfkc: "\u{C9D0}",
-        nfkd: "\u{110C}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C9D1}",
-        nfc: "\u{C9D1}",
-        nfd: "\u{110C}\u{1175}\u{11B8}",
-        nfkc: "\u{C9D1}",
-        nfkd: "\u{110C}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C9D2}",
-        nfc: "\u{C9D2}",
-        nfd: "\u{110C}\u{1175}\u{11B9}",
-        nfkc: "\u{C9D2}",
-        nfkd: "\u{110C}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C9D3}",
-        nfc: "\u{C9D3}",
-        nfd: "\u{110C}\u{1175}\u{11BA}",
-        nfkc: "\u{C9D3}",
-        nfkd: "\u{110C}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C9D4}",
-        nfc: "\u{C9D4}",
-        nfd: "\u{110C}\u{1175}\u{11BB}",
-        nfkc: "\u{C9D4}",
-        nfkd: "\u{110C}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C9D5}",
-        nfc: "\u{C9D5}",
-        nfd: "\u{110C}\u{1175}\u{11BC}",
-        nfkc: "\u{C9D5}",
-        nfkd: "\u{110C}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C9D6}",
-        nfc: "\u{C9D6}",
-        nfd: "\u{110C}\u{1175}\u{11BD}",
-        nfkc: "\u{C9D6}",
-        nfkd: "\u{110C}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C9D7}",
-        nfc: "\u{C9D7}",
-        nfd: "\u{110C}\u{1175}\u{11BE}",
-        nfkc: "\u{C9D7}",
-        nfkd: "\u{110C}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C9D8}",
-        nfc: "\u{C9D8}",
-        nfd: "\u{110C}\u{1175}\u{11BF}",
-        nfkc: "\u{C9D8}",
-        nfkd: "\u{110C}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C9D9}",
-        nfc: "\u{C9D9}",
-        nfd: "\u{110C}\u{1175}\u{11C0}",
-        nfkc: "\u{C9D9}",
-        nfkd: "\u{110C}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C9DA}",
-        nfc: "\u{C9DA}",
-        nfd: "\u{110C}\u{1175}\u{11C1}",
-        nfkc: "\u{C9DA}",
-        nfkd: "\u{110C}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C9DB}",
-        nfc: "\u{C9DB}",
-        nfd: "\u{110C}\u{1175}\u{11C2}",
-        nfkc: "\u{C9DB}",
-        nfkd: "\u{110C}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C9DC}",
-        nfc: "\u{C9DC}",
-        nfd: "\u{110D}\u{1161}",
-        nfkc: "\u{C9DC}",
-        nfkd: "\u{110D}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{C9DD}",
-        nfc: "\u{C9DD}",
-        nfd: "\u{110D}\u{1161}\u{11A8}",
-        nfkc: "\u{C9DD}",
-        nfkd: "\u{110D}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C9DE}",
-        nfc: "\u{C9DE}",
-        nfd: "\u{110D}\u{1161}\u{11A9}",
-        nfkc: "\u{C9DE}",
-        nfkd: "\u{110D}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C9DF}",
-        nfc: "\u{C9DF}",
-        nfd: "\u{110D}\u{1161}\u{11AA}",
-        nfkc: "\u{C9DF}",
-        nfkd: "\u{110D}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C9E0}",
-        nfc: "\u{C9E0}",
-        nfd: "\u{110D}\u{1161}\u{11AB}",
-        nfkc: "\u{C9E0}",
-        nfkd: "\u{110D}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C9E1}",
-        nfc: "\u{C9E1}",
-        nfd: "\u{110D}\u{1161}\u{11AC}",
-        nfkc: "\u{C9E1}",
-        nfkd: "\u{110D}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C9E2}",
-        nfc: "\u{C9E2}",
-        nfd: "\u{110D}\u{1161}\u{11AD}",
-        nfkc: "\u{C9E2}",
-        nfkd: "\u{110D}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C9E3}",
-        nfc: "\u{C9E3}",
-        nfd: "\u{110D}\u{1161}\u{11AE}",
-        nfkc: "\u{C9E3}",
-        nfkd: "\u{110D}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C9E4}",
-        nfc: "\u{C9E4}",
-        nfd: "\u{110D}\u{1161}\u{11AF}",
-        nfkc: "\u{C9E4}",
-        nfkd: "\u{110D}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{C9E5}",
-        nfc: "\u{C9E5}",
-        nfd: "\u{110D}\u{1161}\u{11B0}",
-        nfkc: "\u{C9E5}",
-        nfkd: "\u{110D}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{C9E6}",
-        nfc: "\u{C9E6}",
-        nfd: "\u{110D}\u{1161}\u{11B1}",
-        nfkc: "\u{C9E6}",
-        nfkd: "\u{110D}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{C9E7}",
-        nfc: "\u{C9E7}",
-        nfd: "\u{110D}\u{1161}\u{11B2}",
-        nfkc: "\u{C9E7}",
-        nfkd: "\u{110D}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{C9E8}",
-        nfc: "\u{C9E8}",
-        nfd: "\u{110D}\u{1161}\u{11B3}",
-        nfkc: "\u{C9E8}",
-        nfkd: "\u{110D}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{C9E9}",
-        nfc: "\u{C9E9}",
-        nfd: "\u{110D}\u{1161}\u{11B4}",
-        nfkc: "\u{C9E9}",
-        nfkd: "\u{110D}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{C9EA}",
-        nfc: "\u{C9EA}",
-        nfd: "\u{110D}\u{1161}\u{11B5}",
-        nfkc: "\u{C9EA}",
-        nfkd: "\u{110D}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C9EB}",
-        nfc: "\u{C9EB}",
-        nfd: "\u{110D}\u{1161}\u{11B6}",
-        nfkc: "\u{C9EB}",
-        nfkd: "\u{110D}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{C9EC}",
-        nfc: "\u{C9EC}",
-        nfd: "\u{110D}\u{1161}\u{11B7}",
-        nfkc: "\u{C9EC}",
-        nfkd: "\u{110D}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{C9ED}",
-        nfc: "\u{C9ED}",
-        nfd: "\u{110D}\u{1161}\u{11B8}",
-        nfkc: "\u{C9ED}",
-        nfkd: "\u{110D}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{C9EE}",
-        nfc: "\u{C9EE}",
-        nfd: "\u{110D}\u{1161}\u{11B9}",
-        nfkc: "\u{C9EE}",
-        nfkd: "\u{110D}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{C9EF}",
-        nfc: "\u{C9EF}",
-        nfd: "\u{110D}\u{1161}\u{11BA}",
-        nfkc: "\u{C9EF}",
-        nfkd: "\u{110D}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{C9F0}",
-        nfc: "\u{C9F0}",
-        nfd: "\u{110D}\u{1161}\u{11BB}",
-        nfkc: "\u{C9F0}",
-        nfkd: "\u{110D}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{C9F1}",
-        nfc: "\u{C9F1}",
-        nfd: "\u{110D}\u{1161}\u{11BC}",
-        nfkc: "\u{C9F1}",
-        nfkd: "\u{110D}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C9F2}",
-        nfc: "\u{C9F2}",
-        nfd: "\u{110D}\u{1161}\u{11BD}",
-        nfkc: "\u{C9F2}",
-        nfkd: "\u{110D}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{C9F3}",
-        nfc: "\u{C9F3}",
-        nfd: "\u{110D}\u{1161}\u{11BE}",
-        nfkc: "\u{C9F3}",
-        nfkd: "\u{110D}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{C9F4}",
-        nfc: "\u{C9F4}",
-        nfd: "\u{110D}\u{1161}\u{11BF}",
-        nfkc: "\u{C9F4}",
-        nfkd: "\u{110D}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{C9F5}",
-        nfc: "\u{C9F5}",
-        nfd: "\u{110D}\u{1161}\u{11C0}",
-        nfkc: "\u{C9F5}",
-        nfkd: "\u{110D}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{C9F6}",
-        nfc: "\u{C9F6}",
-        nfd: "\u{110D}\u{1161}\u{11C1}",
-        nfkc: "\u{C9F6}",
-        nfkd: "\u{110D}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{C9F7}",
-        nfc: "\u{C9F7}",
-        nfd: "\u{110D}\u{1161}\u{11C2}",
-        nfkc: "\u{C9F7}",
-        nfkd: "\u{110D}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{C9F8}",
-        nfc: "\u{C9F8}",
-        nfd: "\u{110D}\u{1162}",
-        nfkc: "\u{C9F8}",
-        nfkd: "\u{110D}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{C9F9}",
-        nfc: "\u{C9F9}",
-        nfd: "\u{110D}\u{1162}\u{11A8}",
-        nfkc: "\u{C9F9}",
-        nfkd: "\u{110D}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{C9FA}",
-        nfc: "\u{C9FA}",
-        nfd: "\u{110D}\u{1162}\u{11A9}",
-        nfkc: "\u{C9FA}",
-        nfkd: "\u{110D}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{C9FB}",
-        nfc: "\u{C9FB}",
-        nfd: "\u{110D}\u{1162}\u{11AA}",
-        nfkc: "\u{C9FB}",
-        nfkd: "\u{110D}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{C9FC}",
-        nfc: "\u{C9FC}",
-        nfd: "\u{110D}\u{1162}\u{11AB}",
-        nfkc: "\u{C9FC}",
-        nfkd: "\u{110D}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{C9FD}",
-        nfc: "\u{C9FD}",
-        nfd: "\u{110D}\u{1162}\u{11AC}",
-        nfkc: "\u{C9FD}",
-        nfkd: "\u{110D}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{C9FE}",
-        nfc: "\u{C9FE}",
-        nfd: "\u{110D}\u{1162}\u{11AD}",
-        nfkc: "\u{C9FE}",
-        nfkd: "\u{110D}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{C9FF}",
-        nfc: "\u{C9FF}",
-        nfd: "\u{110D}\u{1162}\u{11AE}",
-        nfkc: "\u{C9FF}",
-        nfkd: "\u{110D}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA00}",
-        nfc: "\u{CA00}",
-        nfd: "\u{110D}\u{1162}\u{11AF}",
-        nfkc: "\u{CA00}",
-        nfkd: "\u{110D}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CA01}",
-        nfc: "\u{CA01}",
-        nfd: "\u{110D}\u{1162}\u{11B0}",
-        nfkc: "\u{CA01}",
-        nfkd: "\u{110D}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CA02}",
-        nfc: "\u{CA02}",
-        nfd: "\u{110D}\u{1162}\u{11B1}",
-        nfkc: "\u{CA02}",
-        nfkd: "\u{110D}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CA03}",
-        nfc: "\u{CA03}",
-        nfd: "\u{110D}\u{1162}\u{11B2}",
-        nfkc: "\u{CA03}",
-        nfkd: "\u{110D}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CA04}",
-        nfc: "\u{CA04}",
-        nfd: "\u{110D}\u{1162}\u{11B3}",
-        nfkc: "\u{CA04}",
-        nfkd: "\u{110D}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CA05}",
-        nfc: "\u{CA05}",
-        nfd: "\u{110D}\u{1162}\u{11B4}",
-        nfkc: "\u{CA05}",
-        nfkd: "\u{110D}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CA06}",
-        nfc: "\u{CA06}",
-        nfd: "\u{110D}\u{1162}\u{11B5}",
-        nfkc: "\u{CA06}",
-        nfkd: "\u{110D}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CA07}",
-        nfc: "\u{CA07}",
-        nfd: "\u{110D}\u{1162}\u{11B6}",
-        nfkc: "\u{CA07}",
-        nfkd: "\u{110D}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CA08}",
-        nfc: "\u{CA08}",
-        nfd: "\u{110D}\u{1162}\u{11B7}",
-        nfkc: "\u{CA08}",
-        nfkd: "\u{110D}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CA09}",
-        nfc: "\u{CA09}",
-        nfd: "\u{110D}\u{1162}\u{11B8}",
-        nfkc: "\u{CA09}",
-        nfkd: "\u{110D}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CA0A}",
-        nfc: "\u{CA0A}",
-        nfd: "\u{110D}\u{1162}\u{11B9}",
-        nfkc: "\u{CA0A}",
-        nfkd: "\u{110D}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CA0B}",
-        nfc: "\u{CA0B}",
-        nfd: "\u{110D}\u{1162}\u{11BA}",
-        nfkc: "\u{CA0B}",
-        nfkd: "\u{110D}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CA0C}",
-        nfc: "\u{CA0C}",
-        nfd: "\u{110D}\u{1162}\u{11BB}",
-        nfkc: "\u{CA0C}",
-        nfkd: "\u{110D}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CA0D}",
-        nfc: "\u{CA0D}",
-        nfd: "\u{110D}\u{1162}\u{11BC}",
-        nfkc: "\u{CA0D}",
-        nfkd: "\u{110D}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA0E}",
-        nfc: "\u{CA0E}",
-        nfd: "\u{110D}\u{1162}\u{11BD}",
-        nfkc: "\u{CA0E}",
-        nfkd: "\u{110D}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CA0F}",
-        nfc: "\u{CA0F}",
-        nfd: "\u{110D}\u{1162}\u{11BE}",
-        nfkc: "\u{CA0F}",
-        nfkd: "\u{110D}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CA10}",
-        nfc: "\u{CA10}",
-        nfd: "\u{110D}\u{1162}\u{11BF}",
-        nfkc: "\u{CA10}",
-        nfkd: "\u{110D}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CA11}",
-        nfc: "\u{CA11}",
-        nfd: "\u{110D}\u{1162}\u{11C0}",
-        nfkc: "\u{CA11}",
-        nfkd: "\u{110D}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CA12}",
-        nfc: "\u{CA12}",
-        nfd: "\u{110D}\u{1162}\u{11C1}",
-        nfkc: "\u{CA12}",
-        nfkd: "\u{110D}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CA13}",
-        nfc: "\u{CA13}",
-        nfd: "\u{110D}\u{1162}\u{11C2}",
-        nfkc: "\u{CA13}",
-        nfkd: "\u{110D}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CA14}",
-        nfc: "\u{CA14}",
-        nfd: "\u{110D}\u{1163}",
-        nfkc: "\u{CA14}",
-        nfkd: "\u{110D}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{CA15}",
-        nfc: "\u{CA15}",
-        nfd: "\u{110D}\u{1163}\u{11A8}",
-        nfkc: "\u{CA15}",
-        nfkd: "\u{110D}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CA16}",
-        nfc: "\u{CA16}",
-        nfd: "\u{110D}\u{1163}\u{11A9}",
-        nfkc: "\u{CA16}",
-        nfkd: "\u{110D}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CA17}",
-        nfc: "\u{CA17}",
-        nfd: "\u{110D}\u{1163}\u{11AA}",
-        nfkc: "\u{CA17}",
-        nfkd: "\u{110D}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CA18}",
-        nfc: "\u{CA18}",
-        nfd: "\u{110D}\u{1163}\u{11AB}",
-        nfkc: "\u{CA18}",
-        nfkd: "\u{110D}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CA19}",
-        nfc: "\u{CA19}",
-        nfd: "\u{110D}\u{1163}\u{11AC}",
-        nfkc: "\u{CA19}",
-        nfkd: "\u{110D}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CA1A}",
-        nfc: "\u{CA1A}",
-        nfd: "\u{110D}\u{1163}\u{11AD}",
-        nfkc: "\u{CA1A}",
-        nfkd: "\u{110D}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CA1B}",
-        nfc: "\u{CA1B}",
-        nfd: "\u{110D}\u{1163}\u{11AE}",
-        nfkc: "\u{CA1B}",
-        nfkd: "\u{110D}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA1C}",
-        nfc: "\u{CA1C}",
-        nfd: "\u{110D}\u{1163}\u{11AF}",
-        nfkc: "\u{CA1C}",
-        nfkd: "\u{110D}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CA1D}",
-        nfc: "\u{CA1D}",
-        nfd: "\u{110D}\u{1163}\u{11B0}",
-        nfkc: "\u{CA1D}",
-        nfkd: "\u{110D}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CA1E}",
-        nfc: "\u{CA1E}",
-        nfd: "\u{110D}\u{1163}\u{11B1}",
-        nfkc: "\u{CA1E}",
-        nfkd: "\u{110D}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CA1F}",
-        nfc: "\u{CA1F}",
-        nfd: "\u{110D}\u{1163}\u{11B2}",
-        nfkc: "\u{CA1F}",
-        nfkd: "\u{110D}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CA20}",
-        nfc: "\u{CA20}",
-        nfd: "\u{110D}\u{1163}\u{11B3}",
-        nfkc: "\u{CA20}",
-        nfkd: "\u{110D}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CA21}",
-        nfc: "\u{CA21}",
-        nfd: "\u{110D}\u{1163}\u{11B4}",
-        nfkc: "\u{CA21}",
-        nfkd: "\u{110D}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CA22}",
-        nfc: "\u{CA22}",
-        nfd: "\u{110D}\u{1163}\u{11B5}",
-        nfkc: "\u{CA22}",
-        nfkd: "\u{110D}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CA23}",
-        nfc: "\u{CA23}",
-        nfd: "\u{110D}\u{1163}\u{11B6}",
-        nfkc: "\u{CA23}",
-        nfkd: "\u{110D}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CA24}",
-        nfc: "\u{CA24}",
-        nfd: "\u{110D}\u{1163}\u{11B7}",
-        nfkc: "\u{CA24}",
-        nfkd: "\u{110D}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CA25}",
-        nfc: "\u{CA25}",
-        nfd: "\u{110D}\u{1163}\u{11B8}",
-        nfkc: "\u{CA25}",
-        nfkd: "\u{110D}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CA26}",
-        nfc: "\u{CA26}",
-        nfd: "\u{110D}\u{1163}\u{11B9}",
-        nfkc: "\u{CA26}",
-        nfkd: "\u{110D}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CA27}",
-        nfc: "\u{CA27}",
-        nfd: "\u{110D}\u{1163}\u{11BA}",
-        nfkc: "\u{CA27}",
-        nfkd: "\u{110D}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CA28}",
-        nfc: "\u{CA28}",
-        nfd: "\u{110D}\u{1163}\u{11BB}",
-        nfkc: "\u{CA28}",
-        nfkd: "\u{110D}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CA29}",
-        nfc: "\u{CA29}",
-        nfd: "\u{110D}\u{1163}\u{11BC}",
-        nfkc: "\u{CA29}",
-        nfkd: "\u{110D}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA2A}",
-        nfc: "\u{CA2A}",
-        nfd: "\u{110D}\u{1163}\u{11BD}",
-        nfkc: "\u{CA2A}",
-        nfkd: "\u{110D}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CA2B}",
-        nfc: "\u{CA2B}",
-        nfd: "\u{110D}\u{1163}\u{11BE}",
-        nfkc: "\u{CA2B}",
-        nfkd: "\u{110D}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CA2C}",
-        nfc: "\u{CA2C}",
-        nfd: "\u{110D}\u{1163}\u{11BF}",
-        nfkc: "\u{CA2C}",
-        nfkd: "\u{110D}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CA2D}",
-        nfc: "\u{CA2D}",
-        nfd: "\u{110D}\u{1163}\u{11C0}",
-        nfkc: "\u{CA2D}",
-        nfkd: "\u{110D}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CA2E}",
-        nfc: "\u{CA2E}",
-        nfd: "\u{110D}\u{1163}\u{11C1}",
-        nfkc: "\u{CA2E}",
-        nfkd: "\u{110D}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CA2F}",
-        nfc: "\u{CA2F}",
-        nfd: "\u{110D}\u{1163}\u{11C2}",
-        nfkc: "\u{CA2F}",
-        nfkd: "\u{110D}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CA30}",
-        nfc: "\u{CA30}",
-        nfd: "\u{110D}\u{1164}",
-        nfkc: "\u{CA30}",
-        nfkd: "\u{110D}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{CA31}",
-        nfc: "\u{CA31}",
-        nfd: "\u{110D}\u{1164}\u{11A8}",
-        nfkc: "\u{CA31}",
-        nfkd: "\u{110D}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CA32}",
-        nfc: "\u{CA32}",
-        nfd: "\u{110D}\u{1164}\u{11A9}",
-        nfkc: "\u{CA32}",
-        nfkd: "\u{110D}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CA33}",
-        nfc: "\u{CA33}",
-        nfd: "\u{110D}\u{1164}\u{11AA}",
-        nfkc: "\u{CA33}",
-        nfkd: "\u{110D}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CA34}",
-        nfc: "\u{CA34}",
-        nfd: "\u{110D}\u{1164}\u{11AB}",
-        nfkc: "\u{CA34}",
-        nfkd: "\u{110D}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CA35}",
-        nfc: "\u{CA35}",
-        nfd: "\u{110D}\u{1164}\u{11AC}",
-        nfkc: "\u{CA35}",
-        nfkd: "\u{110D}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CA36}",
-        nfc: "\u{CA36}",
-        nfd: "\u{110D}\u{1164}\u{11AD}",
-        nfkc: "\u{CA36}",
-        nfkd: "\u{110D}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CA37}",
-        nfc: "\u{CA37}",
-        nfd: "\u{110D}\u{1164}\u{11AE}",
-        nfkc: "\u{CA37}",
-        nfkd: "\u{110D}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA38}",
-        nfc: "\u{CA38}",
-        nfd: "\u{110D}\u{1164}\u{11AF}",
-        nfkc: "\u{CA38}",
-        nfkd: "\u{110D}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CA39}",
-        nfc: "\u{CA39}",
-        nfd: "\u{110D}\u{1164}\u{11B0}",
-        nfkc: "\u{CA39}",
-        nfkd: "\u{110D}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CA3A}",
-        nfc: "\u{CA3A}",
-        nfd: "\u{110D}\u{1164}\u{11B1}",
-        nfkc: "\u{CA3A}",
-        nfkd: "\u{110D}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CA3B}",
-        nfc: "\u{CA3B}",
-        nfd: "\u{110D}\u{1164}\u{11B2}",
-        nfkc: "\u{CA3B}",
-        nfkd: "\u{110D}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CA3C}",
-        nfc: "\u{CA3C}",
-        nfd: "\u{110D}\u{1164}\u{11B3}",
-        nfkc: "\u{CA3C}",
-        nfkd: "\u{110D}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CA3D}",
-        nfc: "\u{CA3D}",
-        nfd: "\u{110D}\u{1164}\u{11B4}",
-        nfkc: "\u{CA3D}",
-        nfkd: "\u{110D}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CA3E}",
-        nfc: "\u{CA3E}",
-        nfd: "\u{110D}\u{1164}\u{11B5}",
-        nfkc: "\u{CA3E}",
-        nfkd: "\u{110D}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CA3F}",
-        nfc: "\u{CA3F}",
-        nfd: "\u{110D}\u{1164}\u{11B6}",
-        nfkc: "\u{CA3F}",
-        nfkd: "\u{110D}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CA40}",
-        nfc: "\u{CA40}",
-        nfd: "\u{110D}\u{1164}\u{11B7}",
-        nfkc: "\u{CA40}",
-        nfkd: "\u{110D}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CA41}",
-        nfc: "\u{CA41}",
-        nfd: "\u{110D}\u{1164}\u{11B8}",
-        nfkc: "\u{CA41}",
-        nfkd: "\u{110D}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CA42}",
-        nfc: "\u{CA42}",
-        nfd: "\u{110D}\u{1164}\u{11B9}",
-        nfkc: "\u{CA42}",
-        nfkd: "\u{110D}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CA43}",
-        nfc: "\u{CA43}",
-        nfd: "\u{110D}\u{1164}\u{11BA}",
-        nfkc: "\u{CA43}",
-        nfkd: "\u{110D}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CA44}",
-        nfc: "\u{CA44}",
-        nfd: "\u{110D}\u{1164}\u{11BB}",
-        nfkc: "\u{CA44}",
-        nfkd: "\u{110D}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CA45}",
-        nfc: "\u{CA45}",
-        nfd: "\u{110D}\u{1164}\u{11BC}",
-        nfkc: "\u{CA45}",
-        nfkd: "\u{110D}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA46}",
-        nfc: "\u{CA46}",
-        nfd: "\u{110D}\u{1164}\u{11BD}",
-        nfkc: "\u{CA46}",
-        nfkd: "\u{110D}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CA47}",
-        nfc: "\u{CA47}",
-        nfd: "\u{110D}\u{1164}\u{11BE}",
-        nfkc: "\u{CA47}",
-        nfkd: "\u{110D}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CA48}",
-        nfc: "\u{CA48}",
-        nfd: "\u{110D}\u{1164}\u{11BF}",
-        nfkc: "\u{CA48}",
-        nfkd: "\u{110D}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CA49}",
-        nfc: "\u{CA49}",
-        nfd: "\u{110D}\u{1164}\u{11C0}",
-        nfkc: "\u{CA49}",
-        nfkd: "\u{110D}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CA4A}",
-        nfc: "\u{CA4A}",
-        nfd: "\u{110D}\u{1164}\u{11C1}",
-        nfkc: "\u{CA4A}",
-        nfkd: "\u{110D}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CA4B}",
-        nfc: "\u{CA4B}",
-        nfd: "\u{110D}\u{1164}\u{11C2}",
-        nfkc: "\u{CA4B}",
-        nfkd: "\u{110D}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CA4C}",
-        nfc: "\u{CA4C}",
-        nfd: "\u{110D}\u{1165}",
-        nfkc: "\u{CA4C}",
-        nfkd: "\u{110D}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{CA4D}",
-        nfc: "\u{CA4D}",
-        nfd: "\u{110D}\u{1165}\u{11A8}",
-        nfkc: "\u{CA4D}",
-        nfkd: "\u{110D}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CA4E}",
-        nfc: "\u{CA4E}",
-        nfd: "\u{110D}\u{1165}\u{11A9}",
-        nfkc: "\u{CA4E}",
-        nfkd: "\u{110D}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CA4F}",
-        nfc: "\u{CA4F}",
-        nfd: "\u{110D}\u{1165}\u{11AA}",
-        nfkc: "\u{CA4F}",
-        nfkd: "\u{110D}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CA50}",
-        nfc: "\u{CA50}",
-        nfd: "\u{110D}\u{1165}\u{11AB}",
-        nfkc: "\u{CA50}",
-        nfkd: "\u{110D}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CA51}",
-        nfc: "\u{CA51}",
-        nfd: "\u{110D}\u{1165}\u{11AC}",
-        nfkc: "\u{CA51}",
-        nfkd: "\u{110D}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CA52}",
-        nfc: "\u{CA52}",
-        nfd: "\u{110D}\u{1165}\u{11AD}",
-        nfkc: "\u{CA52}",
-        nfkd: "\u{110D}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CA53}",
-        nfc: "\u{CA53}",
-        nfd: "\u{110D}\u{1165}\u{11AE}",
-        nfkc: "\u{CA53}",
-        nfkd: "\u{110D}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA54}",
-        nfc: "\u{CA54}",
-        nfd: "\u{110D}\u{1165}\u{11AF}",
-        nfkc: "\u{CA54}",
-        nfkd: "\u{110D}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CA55}",
-        nfc: "\u{CA55}",
-        nfd: "\u{110D}\u{1165}\u{11B0}",
-        nfkc: "\u{CA55}",
-        nfkd: "\u{110D}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CA56}",
-        nfc: "\u{CA56}",
-        nfd: "\u{110D}\u{1165}\u{11B1}",
-        nfkc: "\u{CA56}",
-        nfkd: "\u{110D}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CA57}",
-        nfc: "\u{CA57}",
-        nfd: "\u{110D}\u{1165}\u{11B2}",
-        nfkc: "\u{CA57}",
-        nfkd: "\u{110D}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CA58}",
-        nfc: "\u{CA58}",
-        nfd: "\u{110D}\u{1165}\u{11B3}",
-        nfkc: "\u{CA58}",
-        nfkd: "\u{110D}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CA59}",
-        nfc: "\u{CA59}",
-        nfd: "\u{110D}\u{1165}\u{11B4}",
-        nfkc: "\u{CA59}",
-        nfkd: "\u{110D}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CA5A}",
-        nfc: "\u{CA5A}",
-        nfd: "\u{110D}\u{1165}\u{11B5}",
-        nfkc: "\u{CA5A}",
-        nfkd: "\u{110D}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CA5B}",
-        nfc: "\u{CA5B}",
-        nfd: "\u{110D}\u{1165}\u{11B6}",
-        nfkc: "\u{CA5B}",
-        nfkd: "\u{110D}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CA5C}",
-        nfc: "\u{CA5C}",
-        nfd: "\u{110D}\u{1165}\u{11B7}",
-        nfkc: "\u{CA5C}",
-        nfkd: "\u{110D}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CA5D}",
-        nfc: "\u{CA5D}",
-        nfd: "\u{110D}\u{1165}\u{11B8}",
-        nfkc: "\u{CA5D}",
-        nfkd: "\u{110D}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CA5E}",
-        nfc: "\u{CA5E}",
-        nfd: "\u{110D}\u{1165}\u{11B9}",
-        nfkc: "\u{CA5E}",
-        nfkd: "\u{110D}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CA5F}",
-        nfc: "\u{CA5F}",
-        nfd: "\u{110D}\u{1165}\u{11BA}",
-        nfkc: "\u{CA5F}",
-        nfkd: "\u{110D}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CA60}",
-        nfc: "\u{CA60}",
-        nfd: "\u{110D}\u{1165}\u{11BB}",
-        nfkc: "\u{CA60}",
-        nfkd: "\u{110D}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CA61}",
-        nfc: "\u{CA61}",
-        nfd: "\u{110D}\u{1165}\u{11BC}",
-        nfkc: "\u{CA61}",
-        nfkd: "\u{110D}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA62}",
-        nfc: "\u{CA62}",
-        nfd: "\u{110D}\u{1165}\u{11BD}",
-        nfkc: "\u{CA62}",
-        nfkd: "\u{110D}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CA63}",
-        nfc: "\u{CA63}",
-        nfd: "\u{110D}\u{1165}\u{11BE}",
-        nfkc: "\u{CA63}",
-        nfkd: "\u{110D}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CA64}",
-        nfc: "\u{CA64}",
-        nfd: "\u{110D}\u{1165}\u{11BF}",
-        nfkc: "\u{CA64}",
-        nfkd: "\u{110D}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CA65}",
-        nfc: "\u{CA65}",
-        nfd: "\u{110D}\u{1165}\u{11C0}",
-        nfkc: "\u{CA65}",
-        nfkd: "\u{110D}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CA66}",
-        nfc: "\u{CA66}",
-        nfd: "\u{110D}\u{1165}\u{11C1}",
-        nfkc: "\u{CA66}",
-        nfkd: "\u{110D}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CA67}",
-        nfc: "\u{CA67}",
-        nfd: "\u{110D}\u{1165}\u{11C2}",
-        nfkc: "\u{CA67}",
-        nfkd: "\u{110D}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CA68}",
-        nfc: "\u{CA68}",
-        nfd: "\u{110D}\u{1166}",
-        nfkc: "\u{CA68}",
-        nfkd: "\u{110D}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{CA69}",
-        nfc: "\u{CA69}",
-        nfd: "\u{110D}\u{1166}\u{11A8}",
-        nfkc: "\u{CA69}",
-        nfkd: "\u{110D}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CA6A}",
-        nfc: "\u{CA6A}",
-        nfd: "\u{110D}\u{1166}\u{11A9}",
-        nfkc: "\u{CA6A}",
-        nfkd: "\u{110D}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CA6B}",
-        nfc: "\u{CA6B}",
-        nfd: "\u{110D}\u{1166}\u{11AA}",
-        nfkc: "\u{CA6B}",
-        nfkd: "\u{110D}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CA6C}",
-        nfc: "\u{CA6C}",
-        nfd: "\u{110D}\u{1166}\u{11AB}",
-        nfkc: "\u{CA6C}",
-        nfkd: "\u{110D}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CA6D}",
-        nfc: "\u{CA6D}",
-        nfd: "\u{110D}\u{1166}\u{11AC}",
-        nfkc: "\u{CA6D}",
-        nfkd: "\u{110D}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CA6E}",
-        nfc: "\u{CA6E}",
-        nfd: "\u{110D}\u{1166}\u{11AD}",
-        nfkc: "\u{CA6E}",
-        nfkd: "\u{110D}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CA6F}",
-        nfc: "\u{CA6F}",
-        nfd: "\u{110D}\u{1166}\u{11AE}",
-        nfkc: "\u{CA6F}",
-        nfkd: "\u{110D}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA70}",
-        nfc: "\u{CA70}",
-        nfd: "\u{110D}\u{1166}\u{11AF}",
-        nfkc: "\u{CA70}",
-        nfkd: "\u{110D}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CA71}",
-        nfc: "\u{CA71}",
-        nfd: "\u{110D}\u{1166}\u{11B0}",
-        nfkc: "\u{CA71}",
-        nfkd: "\u{110D}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CA72}",
-        nfc: "\u{CA72}",
-        nfd: "\u{110D}\u{1166}\u{11B1}",
-        nfkc: "\u{CA72}",
-        nfkd: "\u{110D}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CA73}",
-        nfc: "\u{CA73}",
-        nfd: "\u{110D}\u{1166}\u{11B2}",
-        nfkc: "\u{CA73}",
-        nfkd: "\u{110D}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CA74}",
-        nfc: "\u{CA74}",
-        nfd: "\u{110D}\u{1166}\u{11B3}",
-        nfkc: "\u{CA74}",
-        nfkd: "\u{110D}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CA75}",
-        nfc: "\u{CA75}",
-        nfd: "\u{110D}\u{1166}\u{11B4}",
-        nfkc: "\u{CA75}",
-        nfkd: "\u{110D}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CA76}",
-        nfc: "\u{CA76}",
-        nfd: "\u{110D}\u{1166}\u{11B5}",
-        nfkc: "\u{CA76}",
-        nfkd: "\u{110D}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CA77}",
-        nfc: "\u{CA77}",
-        nfd: "\u{110D}\u{1166}\u{11B6}",
-        nfkc: "\u{CA77}",
-        nfkd: "\u{110D}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CA78}",
-        nfc: "\u{CA78}",
-        nfd: "\u{110D}\u{1166}\u{11B7}",
-        nfkc: "\u{CA78}",
-        nfkd: "\u{110D}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CA79}",
-        nfc: "\u{CA79}",
-        nfd: "\u{110D}\u{1166}\u{11B8}",
-        nfkc: "\u{CA79}",
-        nfkd: "\u{110D}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CA7A}",
-        nfc: "\u{CA7A}",
-        nfd: "\u{110D}\u{1166}\u{11B9}",
-        nfkc: "\u{CA7A}",
-        nfkd: "\u{110D}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CA7B}",
-        nfc: "\u{CA7B}",
-        nfd: "\u{110D}\u{1166}\u{11BA}",
-        nfkc: "\u{CA7B}",
-        nfkd: "\u{110D}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CA7C}",
-        nfc: "\u{CA7C}",
-        nfd: "\u{110D}\u{1166}\u{11BB}",
-        nfkc: "\u{CA7C}",
-        nfkd: "\u{110D}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CA7D}",
-        nfc: "\u{CA7D}",
-        nfd: "\u{110D}\u{1166}\u{11BC}",
-        nfkc: "\u{CA7D}",
-        nfkd: "\u{110D}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA7E}",
-        nfc: "\u{CA7E}",
-        nfd: "\u{110D}\u{1166}\u{11BD}",
-        nfkc: "\u{CA7E}",
-        nfkd: "\u{110D}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CA7F}",
-        nfc: "\u{CA7F}",
-        nfd: "\u{110D}\u{1166}\u{11BE}",
-        nfkc: "\u{CA7F}",
-        nfkd: "\u{110D}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CA80}",
-        nfc: "\u{CA80}",
-        nfd: "\u{110D}\u{1166}\u{11BF}",
-        nfkc: "\u{CA80}",
-        nfkd: "\u{110D}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CA81}",
-        nfc: "\u{CA81}",
-        nfd: "\u{110D}\u{1166}\u{11C0}",
-        nfkc: "\u{CA81}",
-        nfkd: "\u{110D}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CA82}",
-        nfc: "\u{CA82}",
-        nfd: "\u{110D}\u{1166}\u{11C1}",
-        nfkc: "\u{CA82}",
-        nfkd: "\u{110D}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CA83}",
-        nfc: "\u{CA83}",
-        nfd: "\u{110D}\u{1166}\u{11C2}",
-        nfkc: "\u{CA83}",
-        nfkd: "\u{110D}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CA84}",
-        nfc: "\u{CA84}",
-        nfd: "\u{110D}\u{1167}",
-        nfkc: "\u{CA84}",
-        nfkd: "\u{110D}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{CA85}",
-        nfc: "\u{CA85}",
-        nfd: "\u{110D}\u{1167}\u{11A8}",
-        nfkc: "\u{CA85}",
-        nfkd: "\u{110D}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CA86}",
-        nfc: "\u{CA86}",
-        nfd: "\u{110D}\u{1167}\u{11A9}",
-        nfkc: "\u{CA86}",
-        nfkd: "\u{110D}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CA87}",
-        nfc: "\u{CA87}",
-        nfd: "\u{110D}\u{1167}\u{11AA}",
-        nfkc: "\u{CA87}",
-        nfkd: "\u{110D}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CA88}",
-        nfc: "\u{CA88}",
-        nfd: "\u{110D}\u{1167}\u{11AB}",
-        nfkc: "\u{CA88}",
-        nfkd: "\u{110D}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CA89}",
-        nfc: "\u{CA89}",
-        nfd: "\u{110D}\u{1167}\u{11AC}",
-        nfkc: "\u{CA89}",
-        nfkd: "\u{110D}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CA8A}",
-        nfc: "\u{CA8A}",
-        nfd: "\u{110D}\u{1167}\u{11AD}",
-        nfkc: "\u{CA8A}",
-        nfkd: "\u{110D}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CA8B}",
-        nfc: "\u{CA8B}",
-        nfd: "\u{110D}\u{1167}\u{11AE}",
-        nfkc: "\u{CA8B}",
-        nfkd: "\u{110D}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA8C}",
-        nfc: "\u{CA8C}",
-        nfd: "\u{110D}\u{1167}\u{11AF}",
-        nfkc: "\u{CA8C}",
-        nfkd: "\u{110D}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CA8D}",
-        nfc: "\u{CA8D}",
-        nfd: "\u{110D}\u{1167}\u{11B0}",
-        nfkc: "\u{CA8D}",
-        nfkd: "\u{110D}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CA8E}",
-        nfc: "\u{CA8E}",
-        nfd: "\u{110D}\u{1167}\u{11B1}",
-        nfkc: "\u{CA8E}",
-        nfkd: "\u{110D}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CA8F}",
-        nfc: "\u{CA8F}",
-        nfd: "\u{110D}\u{1167}\u{11B2}",
-        nfkc: "\u{CA8F}",
-        nfkd: "\u{110D}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CA90}",
-        nfc: "\u{CA90}",
-        nfd: "\u{110D}\u{1167}\u{11B3}",
-        nfkc: "\u{CA90}",
-        nfkd: "\u{110D}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CA91}",
-        nfc: "\u{CA91}",
-        nfd: "\u{110D}\u{1167}\u{11B4}",
-        nfkc: "\u{CA91}",
-        nfkd: "\u{110D}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CA92}",
-        nfc: "\u{CA92}",
-        nfd: "\u{110D}\u{1167}\u{11B5}",
-        nfkc: "\u{CA92}",
-        nfkd: "\u{110D}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CA93}",
-        nfc: "\u{CA93}",
-        nfd: "\u{110D}\u{1167}\u{11B6}",
-        nfkc: "\u{CA93}",
-        nfkd: "\u{110D}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CA94}",
-        nfc: "\u{CA94}",
-        nfd: "\u{110D}\u{1167}\u{11B7}",
-        nfkc: "\u{CA94}",
-        nfkd: "\u{110D}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CA95}",
-        nfc: "\u{CA95}",
-        nfd: "\u{110D}\u{1167}\u{11B8}",
-        nfkc: "\u{CA95}",
-        nfkd: "\u{110D}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CA96}",
-        nfc: "\u{CA96}",
-        nfd: "\u{110D}\u{1167}\u{11B9}",
-        nfkc: "\u{CA96}",
-        nfkd: "\u{110D}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CA97}",
-        nfc: "\u{CA97}",
-        nfd: "\u{110D}\u{1167}\u{11BA}",
-        nfkc: "\u{CA97}",
-        nfkd: "\u{110D}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CA98}",
-        nfc: "\u{CA98}",
-        nfd: "\u{110D}\u{1167}\u{11BB}",
-        nfkc: "\u{CA98}",
-        nfkd: "\u{110D}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CA99}",
-        nfc: "\u{CA99}",
-        nfd: "\u{110D}\u{1167}\u{11BC}",
-        nfkc: "\u{CA99}",
-        nfkd: "\u{110D}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA9A}",
-        nfc: "\u{CA9A}",
-        nfd: "\u{110D}\u{1167}\u{11BD}",
-        nfkc: "\u{CA9A}",
-        nfkd: "\u{110D}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CA9B}",
-        nfc: "\u{CA9B}",
-        nfd: "\u{110D}\u{1167}\u{11BE}",
-        nfkc: "\u{CA9B}",
-        nfkd: "\u{110D}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CA9C}",
-        nfc: "\u{CA9C}",
-        nfd: "\u{110D}\u{1167}\u{11BF}",
-        nfkc: "\u{CA9C}",
-        nfkd: "\u{110D}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CA9D}",
-        nfc: "\u{CA9D}",
-        nfd: "\u{110D}\u{1167}\u{11C0}",
-        nfkc: "\u{CA9D}",
-        nfkd: "\u{110D}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CA9E}",
-        nfc: "\u{CA9E}",
-        nfd: "\u{110D}\u{1167}\u{11C1}",
-        nfkc: "\u{CA9E}",
-        nfkd: "\u{110D}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CA9F}",
-        nfc: "\u{CA9F}",
-        nfd: "\u{110D}\u{1167}\u{11C2}",
-        nfkc: "\u{CA9F}",
-        nfkd: "\u{110D}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CAA0}",
-        nfc: "\u{CAA0}",
-        nfd: "\u{110D}\u{1168}",
-        nfkc: "\u{CAA0}",
-        nfkd: "\u{110D}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{CAA1}",
-        nfc: "\u{CAA1}",
-        nfd: "\u{110D}\u{1168}\u{11A8}",
-        nfkc: "\u{CAA1}",
-        nfkd: "\u{110D}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CAA2}",
-        nfc: "\u{CAA2}",
-        nfd: "\u{110D}\u{1168}\u{11A9}",
-        nfkc: "\u{CAA2}",
-        nfkd: "\u{110D}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CAA3}",
-        nfc: "\u{CAA3}",
-        nfd: "\u{110D}\u{1168}\u{11AA}",
-        nfkc: "\u{CAA3}",
-        nfkd: "\u{110D}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CAA4}",
-        nfc: "\u{CAA4}",
-        nfd: "\u{110D}\u{1168}\u{11AB}",
-        nfkc: "\u{CAA4}",
-        nfkd: "\u{110D}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CAA5}",
-        nfc: "\u{CAA5}",
-        nfd: "\u{110D}\u{1168}\u{11AC}",
-        nfkc: "\u{CAA5}",
-        nfkd: "\u{110D}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CAA6}",
-        nfc: "\u{CAA6}",
-        nfd: "\u{110D}\u{1168}\u{11AD}",
-        nfkc: "\u{CAA6}",
-        nfkd: "\u{110D}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CAA7}",
-        nfc: "\u{CAA7}",
-        nfd: "\u{110D}\u{1168}\u{11AE}",
-        nfkc: "\u{CAA7}",
-        nfkd: "\u{110D}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CAA8}",
-        nfc: "\u{CAA8}",
-        nfd: "\u{110D}\u{1168}\u{11AF}",
-        nfkc: "\u{CAA8}",
-        nfkd: "\u{110D}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CAA9}",
-        nfc: "\u{CAA9}",
-        nfd: "\u{110D}\u{1168}\u{11B0}",
-        nfkc: "\u{CAA9}",
-        nfkd: "\u{110D}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CAAA}",
-        nfc: "\u{CAAA}",
-        nfd: "\u{110D}\u{1168}\u{11B1}",
-        nfkc: "\u{CAAA}",
-        nfkd: "\u{110D}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CAAB}",
-        nfc: "\u{CAAB}",
-        nfd: "\u{110D}\u{1168}\u{11B2}",
-        nfkc: "\u{CAAB}",
-        nfkd: "\u{110D}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CAAC}",
-        nfc: "\u{CAAC}",
-        nfd: "\u{110D}\u{1168}\u{11B3}",
-        nfkc: "\u{CAAC}",
-        nfkd: "\u{110D}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CAAD}",
-        nfc: "\u{CAAD}",
-        nfd: "\u{110D}\u{1168}\u{11B4}",
-        nfkc: "\u{CAAD}",
-        nfkd: "\u{110D}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CAAE}",
-        nfc: "\u{CAAE}",
-        nfd: "\u{110D}\u{1168}\u{11B5}",
-        nfkc: "\u{CAAE}",
-        nfkd: "\u{110D}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CAAF}",
-        nfc: "\u{CAAF}",
-        nfd: "\u{110D}\u{1168}\u{11B6}",
-        nfkc: "\u{CAAF}",
-        nfkd: "\u{110D}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CAB0}",
-        nfc: "\u{CAB0}",
-        nfd: "\u{110D}\u{1168}\u{11B7}",
-        nfkc: "\u{CAB0}",
-        nfkd: "\u{110D}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CAB1}",
-        nfc: "\u{CAB1}",
-        nfd: "\u{110D}\u{1168}\u{11B8}",
-        nfkc: "\u{CAB1}",
-        nfkd: "\u{110D}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CAB2}",
-        nfc: "\u{CAB2}",
-        nfd: "\u{110D}\u{1168}\u{11B9}",
-        nfkc: "\u{CAB2}",
-        nfkd: "\u{110D}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CAB3}",
-        nfc: "\u{CAB3}",
-        nfd: "\u{110D}\u{1168}\u{11BA}",
-        nfkc: "\u{CAB3}",
-        nfkd: "\u{110D}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CAB4}",
-        nfc: "\u{CAB4}",
-        nfd: "\u{110D}\u{1168}\u{11BB}",
-        nfkc: "\u{CAB4}",
-        nfkd: "\u{110D}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CAB5}",
-        nfc: "\u{CAB5}",
-        nfd: "\u{110D}\u{1168}\u{11BC}",
-        nfkc: "\u{CAB5}",
-        nfkd: "\u{110D}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CAB6}",
-        nfc: "\u{CAB6}",
-        nfd: "\u{110D}\u{1168}\u{11BD}",
-        nfkc: "\u{CAB6}",
-        nfkd: "\u{110D}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CAB7}",
-        nfc: "\u{CAB7}",
-        nfd: "\u{110D}\u{1168}\u{11BE}",
-        nfkc: "\u{CAB7}",
-        nfkd: "\u{110D}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CAB8}",
-        nfc: "\u{CAB8}",
-        nfd: "\u{110D}\u{1168}\u{11BF}",
-        nfkc: "\u{CAB8}",
-        nfkd: "\u{110D}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CAB9}",
-        nfc: "\u{CAB9}",
-        nfd: "\u{110D}\u{1168}\u{11C0}",
-        nfkc: "\u{CAB9}",
-        nfkd: "\u{110D}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CABA}",
-        nfc: "\u{CABA}",
-        nfd: "\u{110D}\u{1168}\u{11C1}",
-        nfkc: "\u{CABA}",
-        nfkd: "\u{110D}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CABB}",
-        nfc: "\u{CABB}",
-        nfd: "\u{110D}\u{1168}\u{11C2}",
-        nfkc: "\u{CABB}",
-        nfkd: "\u{110D}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CABC}",
-        nfc: "\u{CABC}",
-        nfd: "\u{110D}\u{1169}",
-        nfkc: "\u{CABC}",
-        nfkd: "\u{110D}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{CABD}",
-        nfc: "\u{CABD}",
-        nfd: "\u{110D}\u{1169}\u{11A8}",
-        nfkc: "\u{CABD}",
-        nfkd: "\u{110D}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CABE}",
-        nfc: "\u{CABE}",
-        nfd: "\u{110D}\u{1169}\u{11A9}",
-        nfkc: "\u{CABE}",
-        nfkd: "\u{110D}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CABF}",
-        nfc: "\u{CABF}",
-        nfd: "\u{110D}\u{1169}\u{11AA}",
-        nfkc: "\u{CABF}",
-        nfkd: "\u{110D}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CAC0}",
-        nfc: "\u{CAC0}",
-        nfd: "\u{110D}\u{1169}\u{11AB}",
-        nfkc: "\u{CAC0}",
-        nfkd: "\u{110D}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CAC1}",
-        nfc: "\u{CAC1}",
-        nfd: "\u{110D}\u{1169}\u{11AC}",
-        nfkc: "\u{CAC1}",
-        nfkd: "\u{110D}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CAC2}",
-        nfc: "\u{CAC2}",
-        nfd: "\u{110D}\u{1169}\u{11AD}",
-        nfkc: "\u{CAC2}",
-        nfkd: "\u{110D}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CAC3}",
-        nfc: "\u{CAC3}",
-        nfd: "\u{110D}\u{1169}\u{11AE}",
-        nfkc: "\u{CAC3}",
-        nfkd: "\u{110D}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CAC4}",
-        nfc: "\u{CAC4}",
-        nfd: "\u{110D}\u{1169}\u{11AF}",
-        nfkc: "\u{CAC4}",
-        nfkd: "\u{110D}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CAC5}",
-        nfc: "\u{CAC5}",
-        nfd: "\u{110D}\u{1169}\u{11B0}",
-        nfkc: "\u{CAC5}",
-        nfkd: "\u{110D}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CAC6}",
-        nfc: "\u{CAC6}",
-        nfd: "\u{110D}\u{1169}\u{11B1}",
-        nfkc: "\u{CAC6}",
-        nfkd: "\u{110D}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CAC7}",
-        nfc: "\u{CAC7}",
-        nfd: "\u{110D}\u{1169}\u{11B2}",
-        nfkc: "\u{CAC7}",
-        nfkd: "\u{110D}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CAC8}",
-        nfc: "\u{CAC8}",
-        nfd: "\u{110D}\u{1169}\u{11B3}",
-        nfkc: "\u{CAC8}",
-        nfkd: "\u{110D}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CAC9}",
-        nfc: "\u{CAC9}",
-        nfd: "\u{110D}\u{1169}\u{11B4}",
-        nfkc: "\u{CAC9}",
-        nfkd: "\u{110D}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CACA}",
-        nfc: "\u{CACA}",
-        nfd: "\u{110D}\u{1169}\u{11B5}",
-        nfkc: "\u{CACA}",
-        nfkd: "\u{110D}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CACB}",
-        nfc: "\u{CACB}",
-        nfd: "\u{110D}\u{1169}\u{11B6}",
-        nfkc: "\u{CACB}",
-        nfkd: "\u{110D}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CACC}",
-        nfc: "\u{CACC}",
-        nfd: "\u{110D}\u{1169}\u{11B7}",
-        nfkc: "\u{CACC}",
-        nfkd: "\u{110D}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CACD}",
-        nfc: "\u{CACD}",
-        nfd: "\u{110D}\u{1169}\u{11B8}",
-        nfkc: "\u{CACD}",
-        nfkd: "\u{110D}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CACE}",
-        nfc: "\u{CACE}",
-        nfd: "\u{110D}\u{1169}\u{11B9}",
-        nfkc: "\u{CACE}",
-        nfkd: "\u{110D}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CACF}",
-        nfc: "\u{CACF}",
-        nfd: "\u{110D}\u{1169}\u{11BA}",
-        nfkc: "\u{CACF}",
-        nfkd: "\u{110D}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CAD0}",
-        nfc: "\u{CAD0}",
-        nfd: "\u{110D}\u{1169}\u{11BB}",
-        nfkc: "\u{CAD0}",
-        nfkd: "\u{110D}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CAD1}",
-        nfc: "\u{CAD1}",
-        nfd: "\u{110D}\u{1169}\u{11BC}",
-        nfkc: "\u{CAD1}",
-        nfkd: "\u{110D}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CAD2}",
-        nfc: "\u{CAD2}",
-        nfd: "\u{110D}\u{1169}\u{11BD}",
-        nfkc: "\u{CAD2}",
-        nfkd: "\u{110D}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CAD3}",
-        nfc: "\u{CAD3}",
-        nfd: "\u{110D}\u{1169}\u{11BE}",
-        nfkc: "\u{CAD3}",
-        nfkd: "\u{110D}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CAD4}",
-        nfc: "\u{CAD4}",
-        nfd: "\u{110D}\u{1169}\u{11BF}",
-        nfkc: "\u{CAD4}",
-        nfkd: "\u{110D}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CAD5}",
-        nfc: "\u{CAD5}",
-        nfd: "\u{110D}\u{1169}\u{11C0}",
-        nfkc: "\u{CAD5}",
-        nfkd: "\u{110D}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CAD6}",
-        nfc: "\u{CAD6}",
-        nfd: "\u{110D}\u{1169}\u{11C1}",
-        nfkc: "\u{CAD6}",
-        nfkd: "\u{110D}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CAD7}",
-        nfc: "\u{CAD7}",
-        nfd: "\u{110D}\u{1169}\u{11C2}",
-        nfkc: "\u{CAD7}",
-        nfkd: "\u{110D}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CAD8}",
-        nfc: "\u{CAD8}",
-        nfd: "\u{110D}\u{116A}",
-        nfkc: "\u{CAD8}",
-        nfkd: "\u{110D}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{CAD9}",
-        nfc: "\u{CAD9}",
-        nfd: "\u{110D}\u{116A}\u{11A8}",
-        nfkc: "\u{CAD9}",
-        nfkd: "\u{110D}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CADA}",
-        nfc: "\u{CADA}",
-        nfd: "\u{110D}\u{116A}\u{11A9}",
-        nfkc: "\u{CADA}",
-        nfkd: "\u{110D}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CADB}",
-        nfc: "\u{CADB}",
-        nfd: "\u{110D}\u{116A}\u{11AA}",
-        nfkc: "\u{CADB}",
-        nfkd: "\u{110D}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CADC}",
-        nfc: "\u{CADC}",
-        nfd: "\u{110D}\u{116A}\u{11AB}",
-        nfkc: "\u{CADC}",
-        nfkd: "\u{110D}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CADD}",
-        nfc: "\u{CADD}",
-        nfd: "\u{110D}\u{116A}\u{11AC}",
-        nfkc: "\u{CADD}",
-        nfkd: "\u{110D}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CADE}",
-        nfc: "\u{CADE}",
-        nfd: "\u{110D}\u{116A}\u{11AD}",
-        nfkc: "\u{CADE}",
-        nfkd: "\u{110D}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CADF}",
-        nfc: "\u{CADF}",
-        nfd: "\u{110D}\u{116A}\u{11AE}",
-        nfkc: "\u{CADF}",
-        nfkd: "\u{110D}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CAE0}",
-        nfc: "\u{CAE0}",
-        nfd: "\u{110D}\u{116A}\u{11AF}",
-        nfkc: "\u{CAE0}",
-        nfkd: "\u{110D}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CAE1}",
-        nfc: "\u{CAE1}",
-        nfd: "\u{110D}\u{116A}\u{11B0}",
-        nfkc: "\u{CAE1}",
-        nfkd: "\u{110D}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CAE2}",
-        nfc: "\u{CAE2}",
-        nfd: "\u{110D}\u{116A}\u{11B1}",
-        nfkc: "\u{CAE2}",
-        nfkd: "\u{110D}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CAE3}",
-        nfc: "\u{CAE3}",
-        nfd: "\u{110D}\u{116A}\u{11B2}",
-        nfkc: "\u{CAE3}",
-        nfkd: "\u{110D}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CAE4}",
-        nfc: "\u{CAE4}",
-        nfd: "\u{110D}\u{116A}\u{11B3}",
-        nfkc: "\u{CAE4}",
-        nfkd: "\u{110D}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CAE5}",
-        nfc: "\u{CAE5}",
-        nfd: "\u{110D}\u{116A}\u{11B4}",
-        nfkc: "\u{CAE5}",
-        nfkd: "\u{110D}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CAE6}",
-        nfc: "\u{CAE6}",
-        nfd: "\u{110D}\u{116A}\u{11B5}",
-        nfkc: "\u{CAE6}",
-        nfkd: "\u{110D}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CAE7}",
-        nfc: "\u{CAE7}",
-        nfd: "\u{110D}\u{116A}\u{11B6}",
-        nfkc: "\u{CAE7}",
-        nfkd: "\u{110D}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CAE8}",
-        nfc: "\u{CAE8}",
-        nfd: "\u{110D}\u{116A}\u{11B7}",
-        nfkc: "\u{CAE8}",
-        nfkd: "\u{110D}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CAE9}",
-        nfc: "\u{CAE9}",
-        nfd: "\u{110D}\u{116A}\u{11B8}",
-        nfkc: "\u{CAE9}",
-        nfkd: "\u{110D}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CAEA}",
-        nfc: "\u{CAEA}",
-        nfd: "\u{110D}\u{116A}\u{11B9}",
-        nfkc: "\u{CAEA}",
-        nfkd: "\u{110D}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CAEB}",
-        nfc: "\u{CAEB}",
-        nfd: "\u{110D}\u{116A}\u{11BA}",
-        nfkc: "\u{CAEB}",
-        nfkd: "\u{110D}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CAEC}",
-        nfc: "\u{CAEC}",
-        nfd: "\u{110D}\u{116A}\u{11BB}",
-        nfkc: "\u{CAEC}",
-        nfkd: "\u{110D}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CAED}",
-        nfc: "\u{CAED}",
-        nfd: "\u{110D}\u{116A}\u{11BC}",
-        nfkc: "\u{CAED}",
-        nfkd: "\u{110D}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CAEE}",
-        nfc: "\u{CAEE}",
-        nfd: "\u{110D}\u{116A}\u{11BD}",
-        nfkc: "\u{CAEE}",
-        nfkd: "\u{110D}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CAEF}",
-        nfc: "\u{CAEF}",
-        nfd: "\u{110D}\u{116A}\u{11BE}",
-        nfkc: "\u{CAEF}",
-        nfkd: "\u{110D}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CAF0}",
-        nfc: "\u{CAF0}",
-        nfd: "\u{110D}\u{116A}\u{11BF}",
-        nfkc: "\u{CAF0}",
-        nfkd: "\u{110D}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CAF1}",
-        nfc: "\u{CAF1}",
-        nfd: "\u{110D}\u{116A}\u{11C0}",
-        nfkc: "\u{CAF1}",
-        nfkd: "\u{110D}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CAF2}",
-        nfc: "\u{CAF2}",
-        nfd: "\u{110D}\u{116A}\u{11C1}",
-        nfkc: "\u{CAF2}",
-        nfkd: "\u{110D}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CAF3}",
-        nfc: "\u{CAF3}",
-        nfd: "\u{110D}\u{116A}\u{11C2}",
-        nfkc: "\u{CAF3}",
-        nfkd: "\u{110D}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CAF4}",
-        nfc: "\u{CAF4}",
-        nfd: "\u{110D}\u{116B}",
-        nfkc: "\u{CAF4}",
-        nfkd: "\u{110D}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{CAF5}",
-        nfc: "\u{CAF5}",
-        nfd: "\u{110D}\u{116B}\u{11A8}",
-        nfkc: "\u{CAF5}",
-        nfkd: "\u{110D}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CAF6}",
-        nfc: "\u{CAF6}",
-        nfd: "\u{110D}\u{116B}\u{11A9}",
-        nfkc: "\u{CAF6}",
-        nfkd: "\u{110D}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CAF7}",
-        nfc: "\u{CAF7}",
-        nfd: "\u{110D}\u{116B}\u{11AA}",
-        nfkc: "\u{CAF7}",
-        nfkd: "\u{110D}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CAF8}",
-        nfc: "\u{CAF8}",
-        nfd: "\u{110D}\u{116B}\u{11AB}",
-        nfkc: "\u{CAF8}",
-        nfkd: "\u{110D}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CAF9}",
-        nfc: "\u{CAF9}",
-        nfd: "\u{110D}\u{116B}\u{11AC}",
-        nfkc: "\u{CAF9}",
-        nfkd: "\u{110D}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CAFA}",
-        nfc: "\u{CAFA}",
-        nfd: "\u{110D}\u{116B}\u{11AD}",
-        nfkc: "\u{CAFA}",
-        nfkd: "\u{110D}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CAFB}",
-        nfc: "\u{CAFB}",
-        nfd: "\u{110D}\u{116B}\u{11AE}",
-        nfkc: "\u{CAFB}",
-        nfkd: "\u{110D}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CAFC}",
-        nfc: "\u{CAFC}",
-        nfd: "\u{110D}\u{116B}\u{11AF}",
-        nfkc: "\u{CAFC}",
-        nfkd: "\u{110D}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CAFD}",
-        nfc: "\u{CAFD}",
-        nfd: "\u{110D}\u{116B}\u{11B0}",
-        nfkc: "\u{CAFD}",
-        nfkd: "\u{110D}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CAFE}",
-        nfc: "\u{CAFE}",
-        nfd: "\u{110D}\u{116B}\u{11B1}",
-        nfkc: "\u{CAFE}",
-        nfkd: "\u{110D}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CAFF}",
-        nfc: "\u{CAFF}",
-        nfd: "\u{110D}\u{116B}\u{11B2}",
-        nfkc: "\u{CAFF}",
-        nfkd: "\u{110D}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CB00}",
-        nfc: "\u{CB00}",
-        nfd: "\u{110D}\u{116B}\u{11B3}",
-        nfkc: "\u{CB00}",
-        nfkd: "\u{110D}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CB01}",
-        nfc: "\u{CB01}",
-        nfd: "\u{110D}\u{116B}\u{11B4}",
-        nfkc: "\u{CB01}",
-        nfkd: "\u{110D}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CB02}",
-        nfc: "\u{CB02}",
-        nfd: "\u{110D}\u{116B}\u{11B5}",
-        nfkc: "\u{CB02}",
-        nfkd: "\u{110D}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CB03}",
-        nfc: "\u{CB03}",
-        nfd: "\u{110D}\u{116B}\u{11B6}",
-        nfkc: "\u{CB03}",
-        nfkd: "\u{110D}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CB04}",
-        nfc: "\u{CB04}",
-        nfd: "\u{110D}\u{116B}\u{11B7}",
-        nfkc: "\u{CB04}",
-        nfkd: "\u{110D}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CB05}",
-        nfc: "\u{CB05}",
-        nfd: "\u{110D}\u{116B}\u{11B8}",
-        nfkc: "\u{CB05}",
-        nfkd: "\u{110D}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CB06}",
-        nfc: "\u{CB06}",
-        nfd: "\u{110D}\u{116B}\u{11B9}",
-        nfkc: "\u{CB06}",
-        nfkd: "\u{110D}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CB07}",
-        nfc: "\u{CB07}",
-        nfd: "\u{110D}\u{116B}\u{11BA}",
-        nfkc: "\u{CB07}",
-        nfkd: "\u{110D}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CB08}",
-        nfc: "\u{CB08}",
-        nfd: "\u{110D}\u{116B}\u{11BB}",
-        nfkc: "\u{CB08}",
-        nfkd: "\u{110D}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CB09}",
-        nfc: "\u{CB09}",
-        nfd: "\u{110D}\u{116B}\u{11BC}",
-        nfkc: "\u{CB09}",
-        nfkd: "\u{110D}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB0A}",
-        nfc: "\u{CB0A}",
-        nfd: "\u{110D}\u{116B}\u{11BD}",
-        nfkc: "\u{CB0A}",
-        nfkd: "\u{110D}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CB0B}",
-        nfc: "\u{CB0B}",
-        nfd: "\u{110D}\u{116B}\u{11BE}",
-        nfkc: "\u{CB0B}",
-        nfkd: "\u{110D}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CB0C}",
-        nfc: "\u{CB0C}",
-        nfd: "\u{110D}\u{116B}\u{11BF}",
-        nfkc: "\u{CB0C}",
-        nfkd: "\u{110D}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CB0D}",
-        nfc: "\u{CB0D}",
-        nfd: "\u{110D}\u{116B}\u{11C0}",
-        nfkc: "\u{CB0D}",
-        nfkd: "\u{110D}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CB0E}",
-        nfc: "\u{CB0E}",
-        nfd: "\u{110D}\u{116B}\u{11C1}",
-        nfkc: "\u{CB0E}",
-        nfkd: "\u{110D}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CB0F}",
-        nfc: "\u{CB0F}",
-        nfd: "\u{110D}\u{116B}\u{11C2}",
-        nfkc: "\u{CB0F}",
-        nfkd: "\u{110D}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CB10}",
-        nfc: "\u{CB10}",
-        nfd: "\u{110D}\u{116C}",
-        nfkc: "\u{CB10}",
-        nfkd: "\u{110D}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{CB11}",
-        nfc: "\u{CB11}",
-        nfd: "\u{110D}\u{116C}\u{11A8}",
-        nfkc: "\u{CB11}",
-        nfkd: "\u{110D}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CB12}",
-        nfc: "\u{CB12}",
-        nfd: "\u{110D}\u{116C}\u{11A9}",
-        nfkc: "\u{CB12}",
-        nfkd: "\u{110D}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CB13}",
-        nfc: "\u{CB13}",
-        nfd: "\u{110D}\u{116C}\u{11AA}",
-        nfkc: "\u{CB13}",
-        nfkd: "\u{110D}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CB14}",
-        nfc: "\u{CB14}",
-        nfd: "\u{110D}\u{116C}\u{11AB}",
-        nfkc: "\u{CB14}",
-        nfkd: "\u{110D}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CB15}",
-        nfc: "\u{CB15}",
-        nfd: "\u{110D}\u{116C}\u{11AC}",
-        nfkc: "\u{CB15}",
-        nfkd: "\u{110D}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CB16}",
-        nfc: "\u{CB16}",
-        nfd: "\u{110D}\u{116C}\u{11AD}",
-        nfkc: "\u{CB16}",
-        nfkd: "\u{110D}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CB17}",
-        nfc: "\u{CB17}",
-        nfd: "\u{110D}\u{116C}\u{11AE}",
-        nfkc: "\u{CB17}",
-        nfkd: "\u{110D}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CB18}",
-        nfc: "\u{CB18}",
-        nfd: "\u{110D}\u{116C}\u{11AF}",
-        nfkc: "\u{CB18}",
-        nfkd: "\u{110D}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CB19}",
-        nfc: "\u{CB19}",
-        nfd: "\u{110D}\u{116C}\u{11B0}",
-        nfkc: "\u{CB19}",
-        nfkd: "\u{110D}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CB1A}",
-        nfc: "\u{CB1A}",
-        nfd: "\u{110D}\u{116C}\u{11B1}",
-        nfkc: "\u{CB1A}",
-        nfkd: "\u{110D}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CB1B}",
-        nfc: "\u{CB1B}",
-        nfd: "\u{110D}\u{116C}\u{11B2}",
-        nfkc: "\u{CB1B}",
-        nfkd: "\u{110D}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CB1C}",
-        nfc: "\u{CB1C}",
-        nfd: "\u{110D}\u{116C}\u{11B3}",
-        nfkc: "\u{CB1C}",
-        nfkd: "\u{110D}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CB1D}",
-        nfc: "\u{CB1D}",
-        nfd: "\u{110D}\u{116C}\u{11B4}",
-        nfkc: "\u{CB1D}",
-        nfkd: "\u{110D}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CB1E}",
-        nfc: "\u{CB1E}",
-        nfd: "\u{110D}\u{116C}\u{11B5}",
-        nfkc: "\u{CB1E}",
-        nfkd: "\u{110D}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CB1F}",
-        nfc: "\u{CB1F}",
-        nfd: "\u{110D}\u{116C}\u{11B6}",
-        nfkc: "\u{CB1F}",
-        nfkd: "\u{110D}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CB20}",
-        nfc: "\u{CB20}",
-        nfd: "\u{110D}\u{116C}\u{11B7}",
-        nfkc: "\u{CB20}",
-        nfkd: "\u{110D}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CB21}",
-        nfc: "\u{CB21}",
-        nfd: "\u{110D}\u{116C}\u{11B8}",
-        nfkc: "\u{CB21}",
-        nfkd: "\u{110D}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CB22}",
-        nfc: "\u{CB22}",
-        nfd: "\u{110D}\u{116C}\u{11B9}",
-        nfkc: "\u{CB22}",
-        nfkd: "\u{110D}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CB23}",
-        nfc: "\u{CB23}",
-        nfd: "\u{110D}\u{116C}\u{11BA}",
-        nfkc: "\u{CB23}",
-        nfkd: "\u{110D}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CB24}",
-        nfc: "\u{CB24}",
-        nfd: "\u{110D}\u{116C}\u{11BB}",
-        nfkc: "\u{CB24}",
-        nfkd: "\u{110D}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CB25}",
-        nfc: "\u{CB25}",
-        nfd: "\u{110D}\u{116C}\u{11BC}",
-        nfkc: "\u{CB25}",
-        nfkd: "\u{110D}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB26}",
-        nfc: "\u{CB26}",
-        nfd: "\u{110D}\u{116C}\u{11BD}",
-        nfkc: "\u{CB26}",
-        nfkd: "\u{110D}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CB27}",
-        nfc: "\u{CB27}",
-        nfd: "\u{110D}\u{116C}\u{11BE}",
-        nfkc: "\u{CB27}",
-        nfkd: "\u{110D}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CB28}",
-        nfc: "\u{CB28}",
-        nfd: "\u{110D}\u{116C}\u{11BF}",
-        nfkc: "\u{CB28}",
-        nfkd: "\u{110D}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CB29}",
-        nfc: "\u{CB29}",
-        nfd: "\u{110D}\u{116C}\u{11C0}",
-        nfkc: "\u{CB29}",
-        nfkd: "\u{110D}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CB2A}",
-        nfc: "\u{CB2A}",
-        nfd: "\u{110D}\u{116C}\u{11C1}",
-        nfkc: "\u{CB2A}",
-        nfkd: "\u{110D}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CB2B}",
-        nfc: "\u{CB2B}",
-        nfd: "\u{110D}\u{116C}\u{11C2}",
-        nfkc: "\u{CB2B}",
-        nfkd: "\u{110D}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CB2C}",
-        nfc: "\u{CB2C}",
-        nfd: "\u{110D}\u{116D}",
-        nfkc: "\u{CB2C}",
-        nfkd: "\u{110D}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{CB2D}",
-        nfc: "\u{CB2D}",
-        nfd: "\u{110D}\u{116D}\u{11A8}",
-        nfkc: "\u{CB2D}",
-        nfkd: "\u{110D}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CB2E}",
-        nfc: "\u{CB2E}",
-        nfd: "\u{110D}\u{116D}\u{11A9}",
-        nfkc: "\u{CB2E}",
-        nfkd: "\u{110D}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CB2F}",
-        nfc: "\u{CB2F}",
-        nfd: "\u{110D}\u{116D}\u{11AA}",
-        nfkc: "\u{CB2F}",
-        nfkd: "\u{110D}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CB30}",
-        nfc: "\u{CB30}",
-        nfd: "\u{110D}\u{116D}\u{11AB}",
-        nfkc: "\u{CB30}",
-        nfkd: "\u{110D}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CB31}",
-        nfc: "\u{CB31}",
-        nfd: "\u{110D}\u{116D}\u{11AC}",
-        nfkc: "\u{CB31}",
-        nfkd: "\u{110D}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CB32}",
-        nfc: "\u{CB32}",
-        nfd: "\u{110D}\u{116D}\u{11AD}",
-        nfkc: "\u{CB32}",
-        nfkd: "\u{110D}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CB33}",
-        nfc: "\u{CB33}",
-        nfd: "\u{110D}\u{116D}\u{11AE}",
-        nfkc: "\u{CB33}",
-        nfkd: "\u{110D}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CB34}",
-        nfc: "\u{CB34}",
-        nfd: "\u{110D}\u{116D}\u{11AF}",
-        nfkc: "\u{CB34}",
-        nfkd: "\u{110D}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CB35}",
-        nfc: "\u{CB35}",
-        nfd: "\u{110D}\u{116D}\u{11B0}",
-        nfkc: "\u{CB35}",
-        nfkd: "\u{110D}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CB36}",
-        nfc: "\u{CB36}",
-        nfd: "\u{110D}\u{116D}\u{11B1}",
-        nfkc: "\u{CB36}",
-        nfkd: "\u{110D}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CB37}",
-        nfc: "\u{CB37}",
-        nfd: "\u{110D}\u{116D}\u{11B2}",
-        nfkc: "\u{CB37}",
-        nfkd: "\u{110D}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CB38}",
-        nfc: "\u{CB38}",
-        nfd: "\u{110D}\u{116D}\u{11B3}",
-        nfkc: "\u{CB38}",
-        nfkd: "\u{110D}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CB39}",
-        nfc: "\u{CB39}",
-        nfd: "\u{110D}\u{116D}\u{11B4}",
-        nfkc: "\u{CB39}",
-        nfkd: "\u{110D}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CB3A}",
-        nfc: "\u{CB3A}",
-        nfd: "\u{110D}\u{116D}\u{11B5}",
-        nfkc: "\u{CB3A}",
-        nfkd: "\u{110D}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CB3B}",
-        nfc: "\u{CB3B}",
-        nfd: "\u{110D}\u{116D}\u{11B6}",
-        nfkc: "\u{CB3B}",
-        nfkd: "\u{110D}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CB3C}",
-        nfc: "\u{CB3C}",
-        nfd: "\u{110D}\u{116D}\u{11B7}",
-        nfkc: "\u{CB3C}",
-        nfkd: "\u{110D}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CB3D}",
-        nfc: "\u{CB3D}",
-        nfd: "\u{110D}\u{116D}\u{11B8}",
-        nfkc: "\u{CB3D}",
-        nfkd: "\u{110D}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CB3E}",
-        nfc: "\u{CB3E}",
-        nfd: "\u{110D}\u{116D}\u{11B9}",
-        nfkc: "\u{CB3E}",
-        nfkd: "\u{110D}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CB3F}",
-        nfc: "\u{CB3F}",
-        nfd: "\u{110D}\u{116D}\u{11BA}",
-        nfkc: "\u{CB3F}",
-        nfkd: "\u{110D}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CB40}",
-        nfc: "\u{CB40}",
-        nfd: "\u{110D}\u{116D}\u{11BB}",
-        nfkc: "\u{CB40}",
-        nfkd: "\u{110D}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CB41}",
-        nfc: "\u{CB41}",
-        nfd: "\u{110D}\u{116D}\u{11BC}",
-        nfkc: "\u{CB41}",
-        nfkd: "\u{110D}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB42}",
-        nfc: "\u{CB42}",
-        nfd: "\u{110D}\u{116D}\u{11BD}",
-        nfkc: "\u{CB42}",
-        nfkd: "\u{110D}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CB43}",
-        nfc: "\u{CB43}",
-        nfd: "\u{110D}\u{116D}\u{11BE}",
-        nfkc: "\u{CB43}",
-        nfkd: "\u{110D}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CB44}",
-        nfc: "\u{CB44}",
-        nfd: "\u{110D}\u{116D}\u{11BF}",
-        nfkc: "\u{CB44}",
-        nfkd: "\u{110D}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CB45}",
-        nfc: "\u{CB45}",
-        nfd: "\u{110D}\u{116D}\u{11C0}",
-        nfkc: "\u{CB45}",
-        nfkd: "\u{110D}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CB46}",
-        nfc: "\u{CB46}",
-        nfd: "\u{110D}\u{116D}\u{11C1}",
-        nfkc: "\u{CB46}",
-        nfkd: "\u{110D}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CB47}",
-        nfc: "\u{CB47}",
-        nfd: "\u{110D}\u{116D}\u{11C2}",
-        nfkc: "\u{CB47}",
-        nfkd: "\u{110D}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CB48}",
-        nfc: "\u{CB48}",
-        nfd: "\u{110D}\u{116E}",
-        nfkc: "\u{CB48}",
-        nfkd: "\u{110D}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{CB49}",
-        nfc: "\u{CB49}",
-        nfd: "\u{110D}\u{116E}\u{11A8}",
-        nfkc: "\u{CB49}",
-        nfkd: "\u{110D}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CB4A}",
-        nfc: "\u{CB4A}",
-        nfd: "\u{110D}\u{116E}\u{11A9}",
-        nfkc: "\u{CB4A}",
-        nfkd: "\u{110D}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CB4B}",
-        nfc: "\u{CB4B}",
-        nfd: "\u{110D}\u{116E}\u{11AA}",
-        nfkc: "\u{CB4B}",
-        nfkd: "\u{110D}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CB4C}",
-        nfc: "\u{CB4C}",
-        nfd: "\u{110D}\u{116E}\u{11AB}",
-        nfkc: "\u{CB4C}",
-        nfkd: "\u{110D}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CB4D}",
-        nfc: "\u{CB4D}",
-        nfd: "\u{110D}\u{116E}\u{11AC}",
-        nfkc: "\u{CB4D}",
-        nfkd: "\u{110D}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CB4E}",
-        nfc: "\u{CB4E}",
-        nfd: "\u{110D}\u{116E}\u{11AD}",
-        nfkc: "\u{CB4E}",
-        nfkd: "\u{110D}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CB4F}",
-        nfc: "\u{CB4F}",
-        nfd: "\u{110D}\u{116E}\u{11AE}",
-        nfkc: "\u{CB4F}",
-        nfkd: "\u{110D}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CB50}",
-        nfc: "\u{CB50}",
-        nfd: "\u{110D}\u{116E}\u{11AF}",
-        nfkc: "\u{CB50}",
-        nfkd: "\u{110D}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CB51}",
-        nfc: "\u{CB51}",
-        nfd: "\u{110D}\u{116E}\u{11B0}",
-        nfkc: "\u{CB51}",
-        nfkd: "\u{110D}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CB52}",
-        nfc: "\u{CB52}",
-        nfd: "\u{110D}\u{116E}\u{11B1}",
-        nfkc: "\u{CB52}",
-        nfkd: "\u{110D}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CB53}",
-        nfc: "\u{CB53}",
-        nfd: "\u{110D}\u{116E}\u{11B2}",
-        nfkc: "\u{CB53}",
-        nfkd: "\u{110D}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CB54}",
-        nfc: "\u{CB54}",
-        nfd: "\u{110D}\u{116E}\u{11B3}",
-        nfkc: "\u{CB54}",
-        nfkd: "\u{110D}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CB55}",
-        nfc: "\u{CB55}",
-        nfd: "\u{110D}\u{116E}\u{11B4}",
-        nfkc: "\u{CB55}",
-        nfkd: "\u{110D}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CB56}",
-        nfc: "\u{CB56}",
-        nfd: "\u{110D}\u{116E}\u{11B5}",
-        nfkc: "\u{CB56}",
-        nfkd: "\u{110D}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CB57}",
-        nfc: "\u{CB57}",
-        nfd: "\u{110D}\u{116E}\u{11B6}",
-        nfkc: "\u{CB57}",
-        nfkd: "\u{110D}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CB58}",
-        nfc: "\u{CB58}",
-        nfd: "\u{110D}\u{116E}\u{11B7}",
-        nfkc: "\u{CB58}",
-        nfkd: "\u{110D}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CB59}",
-        nfc: "\u{CB59}",
-        nfd: "\u{110D}\u{116E}\u{11B8}",
-        nfkc: "\u{CB59}",
-        nfkd: "\u{110D}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CB5A}",
-        nfc: "\u{CB5A}",
-        nfd: "\u{110D}\u{116E}\u{11B9}",
-        nfkc: "\u{CB5A}",
-        nfkd: "\u{110D}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CB5B}",
-        nfc: "\u{CB5B}",
-        nfd: "\u{110D}\u{116E}\u{11BA}",
-        nfkc: "\u{CB5B}",
-        nfkd: "\u{110D}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CB5C}",
-        nfc: "\u{CB5C}",
-        nfd: "\u{110D}\u{116E}\u{11BB}",
-        nfkc: "\u{CB5C}",
-        nfkd: "\u{110D}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CB5D}",
-        nfc: "\u{CB5D}",
-        nfd: "\u{110D}\u{116E}\u{11BC}",
-        nfkc: "\u{CB5D}",
-        nfkd: "\u{110D}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB5E}",
-        nfc: "\u{CB5E}",
-        nfd: "\u{110D}\u{116E}\u{11BD}",
-        nfkc: "\u{CB5E}",
-        nfkd: "\u{110D}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CB5F}",
-        nfc: "\u{CB5F}",
-        nfd: "\u{110D}\u{116E}\u{11BE}",
-        nfkc: "\u{CB5F}",
-        nfkd: "\u{110D}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CB60}",
-        nfc: "\u{CB60}",
-        nfd: "\u{110D}\u{116E}\u{11BF}",
-        nfkc: "\u{CB60}",
-        nfkd: "\u{110D}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CB61}",
-        nfc: "\u{CB61}",
-        nfd: "\u{110D}\u{116E}\u{11C0}",
-        nfkc: "\u{CB61}",
-        nfkd: "\u{110D}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CB62}",
-        nfc: "\u{CB62}",
-        nfd: "\u{110D}\u{116E}\u{11C1}",
-        nfkc: "\u{CB62}",
-        nfkd: "\u{110D}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CB63}",
-        nfc: "\u{CB63}",
-        nfd: "\u{110D}\u{116E}\u{11C2}",
-        nfkc: "\u{CB63}",
-        nfkd: "\u{110D}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CB64}",
-        nfc: "\u{CB64}",
-        nfd: "\u{110D}\u{116F}",
-        nfkc: "\u{CB64}",
-        nfkd: "\u{110D}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{CB65}",
-        nfc: "\u{CB65}",
-        nfd: "\u{110D}\u{116F}\u{11A8}",
-        nfkc: "\u{CB65}",
-        nfkd: "\u{110D}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CB66}",
-        nfc: "\u{CB66}",
-        nfd: "\u{110D}\u{116F}\u{11A9}",
-        nfkc: "\u{CB66}",
-        nfkd: "\u{110D}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CB67}",
-        nfc: "\u{CB67}",
-        nfd: "\u{110D}\u{116F}\u{11AA}",
-        nfkc: "\u{CB67}",
-        nfkd: "\u{110D}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CB68}",
-        nfc: "\u{CB68}",
-        nfd: "\u{110D}\u{116F}\u{11AB}",
-        nfkc: "\u{CB68}",
-        nfkd: "\u{110D}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CB69}",
-        nfc: "\u{CB69}",
-        nfd: "\u{110D}\u{116F}\u{11AC}",
-        nfkc: "\u{CB69}",
-        nfkd: "\u{110D}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CB6A}",
-        nfc: "\u{CB6A}",
-        nfd: "\u{110D}\u{116F}\u{11AD}",
-        nfkc: "\u{CB6A}",
-        nfkd: "\u{110D}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CB6B}",
-        nfc: "\u{CB6B}",
-        nfd: "\u{110D}\u{116F}\u{11AE}",
-        nfkc: "\u{CB6B}",
-        nfkd: "\u{110D}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CB6C}",
-        nfc: "\u{CB6C}",
-        nfd: "\u{110D}\u{116F}\u{11AF}",
-        nfkc: "\u{CB6C}",
-        nfkd: "\u{110D}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CB6D}",
-        nfc: "\u{CB6D}",
-        nfd: "\u{110D}\u{116F}\u{11B0}",
-        nfkc: "\u{CB6D}",
-        nfkd: "\u{110D}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CB6E}",
-        nfc: "\u{CB6E}",
-        nfd: "\u{110D}\u{116F}\u{11B1}",
-        nfkc: "\u{CB6E}",
-        nfkd: "\u{110D}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CB6F}",
-        nfc: "\u{CB6F}",
-        nfd: "\u{110D}\u{116F}\u{11B2}",
-        nfkc: "\u{CB6F}",
-        nfkd: "\u{110D}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CB70}",
-        nfc: "\u{CB70}",
-        nfd: "\u{110D}\u{116F}\u{11B3}",
-        nfkc: "\u{CB70}",
-        nfkd: "\u{110D}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CB71}",
-        nfc: "\u{CB71}",
-        nfd: "\u{110D}\u{116F}\u{11B4}",
-        nfkc: "\u{CB71}",
-        nfkd: "\u{110D}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CB72}",
-        nfc: "\u{CB72}",
-        nfd: "\u{110D}\u{116F}\u{11B5}",
-        nfkc: "\u{CB72}",
-        nfkd: "\u{110D}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CB73}",
-        nfc: "\u{CB73}",
-        nfd: "\u{110D}\u{116F}\u{11B6}",
-        nfkc: "\u{CB73}",
-        nfkd: "\u{110D}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CB74}",
-        nfc: "\u{CB74}",
-        nfd: "\u{110D}\u{116F}\u{11B7}",
-        nfkc: "\u{CB74}",
-        nfkd: "\u{110D}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CB75}",
-        nfc: "\u{CB75}",
-        nfd: "\u{110D}\u{116F}\u{11B8}",
-        nfkc: "\u{CB75}",
-        nfkd: "\u{110D}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CB76}",
-        nfc: "\u{CB76}",
-        nfd: "\u{110D}\u{116F}\u{11B9}",
-        nfkc: "\u{CB76}",
-        nfkd: "\u{110D}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CB77}",
-        nfc: "\u{CB77}",
-        nfd: "\u{110D}\u{116F}\u{11BA}",
-        nfkc: "\u{CB77}",
-        nfkd: "\u{110D}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CB78}",
-        nfc: "\u{CB78}",
-        nfd: "\u{110D}\u{116F}\u{11BB}",
-        nfkc: "\u{CB78}",
-        nfkd: "\u{110D}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CB79}",
-        nfc: "\u{CB79}",
-        nfd: "\u{110D}\u{116F}\u{11BC}",
-        nfkc: "\u{CB79}",
-        nfkd: "\u{110D}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB7A}",
-        nfc: "\u{CB7A}",
-        nfd: "\u{110D}\u{116F}\u{11BD}",
-        nfkc: "\u{CB7A}",
-        nfkd: "\u{110D}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CB7B}",
-        nfc: "\u{CB7B}",
-        nfd: "\u{110D}\u{116F}\u{11BE}",
-        nfkc: "\u{CB7B}",
-        nfkd: "\u{110D}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CB7C}",
-        nfc: "\u{CB7C}",
-        nfd: "\u{110D}\u{116F}\u{11BF}",
-        nfkc: "\u{CB7C}",
-        nfkd: "\u{110D}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CB7D}",
-        nfc: "\u{CB7D}",
-        nfd: "\u{110D}\u{116F}\u{11C0}",
-        nfkc: "\u{CB7D}",
-        nfkd: "\u{110D}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CB7E}",
-        nfc: "\u{CB7E}",
-        nfd: "\u{110D}\u{116F}\u{11C1}",
-        nfkc: "\u{CB7E}",
-        nfkd: "\u{110D}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CB7F}",
-        nfc: "\u{CB7F}",
-        nfd: "\u{110D}\u{116F}\u{11C2}",
-        nfkc: "\u{CB7F}",
-        nfkd: "\u{110D}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CB80}",
-        nfc: "\u{CB80}",
-        nfd: "\u{110D}\u{1170}",
-        nfkc: "\u{CB80}",
-        nfkd: "\u{110D}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{CB81}",
-        nfc: "\u{CB81}",
-        nfd: "\u{110D}\u{1170}\u{11A8}",
-        nfkc: "\u{CB81}",
-        nfkd: "\u{110D}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CB82}",
-        nfc: "\u{CB82}",
-        nfd: "\u{110D}\u{1170}\u{11A9}",
-        nfkc: "\u{CB82}",
-        nfkd: "\u{110D}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CB83}",
-        nfc: "\u{CB83}",
-        nfd: "\u{110D}\u{1170}\u{11AA}",
-        nfkc: "\u{CB83}",
-        nfkd: "\u{110D}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CB84}",
-        nfc: "\u{CB84}",
-        nfd: "\u{110D}\u{1170}\u{11AB}",
-        nfkc: "\u{CB84}",
-        nfkd: "\u{110D}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CB85}",
-        nfc: "\u{CB85}",
-        nfd: "\u{110D}\u{1170}\u{11AC}",
-        nfkc: "\u{CB85}",
-        nfkd: "\u{110D}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CB86}",
-        nfc: "\u{CB86}",
-        nfd: "\u{110D}\u{1170}\u{11AD}",
-        nfkc: "\u{CB86}",
-        nfkd: "\u{110D}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CB87}",
-        nfc: "\u{CB87}",
-        nfd: "\u{110D}\u{1170}\u{11AE}",
-        nfkc: "\u{CB87}",
-        nfkd: "\u{110D}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CB88}",
-        nfc: "\u{CB88}",
-        nfd: "\u{110D}\u{1170}\u{11AF}",
-        nfkc: "\u{CB88}",
-        nfkd: "\u{110D}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CB89}",
-        nfc: "\u{CB89}",
-        nfd: "\u{110D}\u{1170}\u{11B0}",
-        nfkc: "\u{CB89}",
-        nfkd: "\u{110D}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CB8A}",
-        nfc: "\u{CB8A}",
-        nfd: "\u{110D}\u{1170}\u{11B1}",
-        nfkc: "\u{CB8A}",
-        nfkd: "\u{110D}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CB8B}",
-        nfc: "\u{CB8B}",
-        nfd: "\u{110D}\u{1170}\u{11B2}",
-        nfkc: "\u{CB8B}",
-        nfkd: "\u{110D}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CB8C}",
-        nfc: "\u{CB8C}",
-        nfd: "\u{110D}\u{1170}\u{11B3}",
-        nfkc: "\u{CB8C}",
-        nfkd: "\u{110D}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CB8D}",
-        nfc: "\u{CB8D}",
-        nfd: "\u{110D}\u{1170}\u{11B4}",
-        nfkc: "\u{CB8D}",
-        nfkd: "\u{110D}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CB8E}",
-        nfc: "\u{CB8E}",
-        nfd: "\u{110D}\u{1170}\u{11B5}",
-        nfkc: "\u{CB8E}",
-        nfkd: "\u{110D}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CB8F}",
-        nfc: "\u{CB8F}",
-        nfd: "\u{110D}\u{1170}\u{11B6}",
-        nfkc: "\u{CB8F}",
-        nfkd: "\u{110D}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CB90}",
-        nfc: "\u{CB90}",
-        nfd: "\u{110D}\u{1170}\u{11B7}",
-        nfkc: "\u{CB90}",
-        nfkd: "\u{110D}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CB91}",
-        nfc: "\u{CB91}",
-        nfd: "\u{110D}\u{1170}\u{11B8}",
-        nfkc: "\u{CB91}",
-        nfkd: "\u{110D}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CB92}",
-        nfc: "\u{CB92}",
-        nfd: "\u{110D}\u{1170}\u{11B9}",
-        nfkc: "\u{CB92}",
-        nfkd: "\u{110D}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CB93}",
-        nfc: "\u{CB93}",
-        nfd: "\u{110D}\u{1170}\u{11BA}",
-        nfkc: "\u{CB93}",
-        nfkd: "\u{110D}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CB94}",
-        nfc: "\u{CB94}",
-        nfd: "\u{110D}\u{1170}\u{11BB}",
-        nfkc: "\u{CB94}",
-        nfkd: "\u{110D}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CB95}",
-        nfc: "\u{CB95}",
-        nfd: "\u{110D}\u{1170}\u{11BC}",
-        nfkc: "\u{CB95}",
-        nfkd: "\u{110D}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB96}",
-        nfc: "\u{CB96}",
-        nfd: "\u{110D}\u{1170}\u{11BD}",
-        nfkc: "\u{CB96}",
-        nfkd: "\u{110D}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CB97}",
-        nfc: "\u{CB97}",
-        nfd: "\u{110D}\u{1170}\u{11BE}",
-        nfkc: "\u{CB97}",
-        nfkd: "\u{110D}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CB98}",
-        nfc: "\u{CB98}",
-        nfd: "\u{110D}\u{1170}\u{11BF}",
-        nfkc: "\u{CB98}",
-        nfkd: "\u{110D}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CB99}",
-        nfc: "\u{CB99}",
-        nfd: "\u{110D}\u{1170}\u{11C0}",
-        nfkc: "\u{CB99}",
-        nfkd: "\u{110D}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CB9A}",
-        nfc: "\u{CB9A}",
-        nfd: "\u{110D}\u{1170}\u{11C1}",
-        nfkc: "\u{CB9A}",
-        nfkd: "\u{110D}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CB9B}",
-        nfc: "\u{CB9B}",
-        nfd: "\u{110D}\u{1170}\u{11C2}",
-        nfkc: "\u{CB9B}",
-        nfkd: "\u{110D}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CB9C}",
-        nfc: "\u{CB9C}",
-        nfd: "\u{110D}\u{1171}",
-        nfkc: "\u{CB9C}",
-        nfkd: "\u{110D}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{CB9D}",
-        nfc: "\u{CB9D}",
-        nfd: "\u{110D}\u{1171}\u{11A8}",
-        nfkc: "\u{CB9D}",
-        nfkd: "\u{110D}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CB9E}",
-        nfc: "\u{CB9E}",
-        nfd: "\u{110D}\u{1171}\u{11A9}",
-        nfkc: "\u{CB9E}",
-        nfkd: "\u{110D}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CB9F}",
-        nfc: "\u{CB9F}",
-        nfd: "\u{110D}\u{1171}\u{11AA}",
-        nfkc: "\u{CB9F}",
-        nfkd: "\u{110D}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CBA0}",
-        nfc: "\u{CBA0}",
-        nfd: "\u{110D}\u{1171}\u{11AB}",
-        nfkc: "\u{CBA0}",
-        nfkd: "\u{110D}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CBA1}",
-        nfc: "\u{CBA1}",
-        nfd: "\u{110D}\u{1171}\u{11AC}",
-        nfkc: "\u{CBA1}",
-        nfkd: "\u{110D}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CBA2}",
-        nfc: "\u{CBA2}",
-        nfd: "\u{110D}\u{1171}\u{11AD}",
-        nfkc: "\u{CBA2}",
-        nfkd: "\u{110D}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CBA3}",
-        nfc: "\u{CBA3}",
-        nfd: "\u{110D}\u{1171}\u{11AE}",
-        nfkc: "\u{CBA3}",
-        nfkd: "\u{110D}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CBA4}",
-        nfc: "\u{CBA4}",
-        nfd: "\u{110D}\u{1171}\u{11AF}",
-        nfkc: "\u{CBA4}",
-        nfkd: "\u{110D}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CBA5}",
-        nfc: "\u{CBA5}",
-        nfd: "\u{110D}\u{1171}\u{11B0}",
-        nfkc: "\u{CBA5}",
-        nfkd: "\u{110D}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CBA6}",
-        nfc: "\u{CBA6}",
-        nfd: "\u{110D}\u{1171}\u{11B1}",
-        nfkc: "\u{CBA6}",
-        nfkd: "\u{110D}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CBA7}",
-        nfc: "\u{CBA7}",
-        nfd: "\u{110D}\u{1171}\u{11B2}",
-        nfkc: "\u{CBA7}",
-        nfkd: "\u{110D}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CBA8}",
-        nfc: "\u{CBA8}",
-        nfd: "\u{110D}\u{1171}\u{11B3}",
-        nfkc: "\u{CBA8}",
-        nfkd: "\u{110D}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CBA9}",
-        nfc: "\u{CBA9}",
-        nfd: "\u{110D}\u{1171}\u{11B4}",
-        nfkc: "\u{CBA9}",
-        nfkd: "\u{110D}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CBAA}",
-        nfc: "\u{CBAA}",
-        nfd: "\u{110D}\u{1171}\u{11B5}",
-        nfkc: "\u{CBAA}",
-        nfkd: "\u{110D}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CBAB}",
-        nfc: "\u{CBAB}",
-        nfd: "\u{110D}\u{1171}\u{11B6}",
-        nfkc: "\u{CBAB}",
-        nfkd: "\u{110D}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CBAC}",
-        nfc: "\u{CBAC}",
-        nfd: "\u{110D}\u{1171}\u{11B7}",
-        nfkc: "\u{CBAC}",
-        nfkd: "\u{110D}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CBAD}",
-        nfc: "\u{CBAD}",
-        nfd: "\u{110D}\u{1171}\u{11B8}",
-        nfkc: "\u{CBAD}",
-        nfkd: "\u{110D}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CBAE}",
-        nfc: "\u{CBAE}",
-        nfd: "\u{110D}\u{1171}\u{11B9}",
-        nfkc: "\u{CBAE}",
-        nfkd: "\u{110D}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CBAF}",
-        nfc: "\u{CBAF}",
-        nfd: "\u{110D}\u{1171}\u{11BA}",
-        nfkc: "\u{CBAF}",
-        nfkd: "\u{110D}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CBB0}",
-        nfc: "\u{CBB0}",
-        nfd: "\u{110D}\u{1171}\u{11BB}",
-        nfkc: "\u{CBB0}",
-        nfkd: "\u{110D}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CBB1}",
-        nfc: "\u{CBB1}",
-        nfd: "\u{110D}\u{1171}\u{11BC}",
-        nfkc: "\u{CBB1}",
-        nfkd: "\u{110D}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CBB2}",
-        nfc: "\u{CBB2}",
-        nfd: "\u{110D}\u{1171}\u{11BD}",
-        nfkc: "\u{CBB2}",
-        nfkd: "\u{110D}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CBB3}",
-        nfc: "\u{CBB3}",
-        nfd: "\u{110D}\u{1171}\u{11BE}",
-        nfkc: "\u{CBB3}",
-        nfkd: "\u{110D}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CBB4}",
-        nfc: "\u{CBB4}",
-        nfd: "\u{110D}\u{1171}\u{11BF}",
-        nfkc: "\u{CBB4}",
-        nfkd: "\u{110D}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CBB5}",
-        nfc: "\u{CBB5}",
-        nfd: "\u{110D}\u{1171}\u{11C0}",
-        nfkc: "\u{CBB5}",
-        nfkd: "\u{110D}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CBB6}",
-        nfc: "\u{CBB6}",
-        nfd: "\u{110D}\u{1171}\u{11C1}",
-        nfkc: "\u{CBB6}",
-        nfkd: "\u{110D}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CBB7}",
-        nfc: "\u{CBB7}",
-        nfd: "\u{110D}\u{1171}\u{11C2}",
-        nfkc: "\u{CBB7}",
-        nfkd: "\u{110D}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CBB8}",
-        nfc: "\u{CBB8}",
-        nfd: "\u{110D}\u{1172}",
-        nfkc: "\u{CBB8}",
-        nfkd: "\u{110D}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{CBB9}",
-        nfc: "\u{CBB9}",
-        nfd: "\u{110D}\u{1172}\u{11A8}",
-        nfkc: "\u{CBB9}",
-        nfkd: "\u{110D}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CBBA}",
-        nfc: "\u{CBBA}",
-        nfd: "\u{110D}\u{1172}\u{11A9}",
-        nfkc: "\u{CBBA}",
-        nfkd: "\u{110D}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CBBB}",
-        nfc: "\u{CBBB}",
-        nfd: "\u{110D}\u{1172}\u{11AA}",
-        nfkc: "\u{CBBB}",
-        nfkd: "\u{110D}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CBBC}",
-        nfc: "\u{CBBC}",
-        nfd: "\u{110D}\u{1172}\u{11AB}",
-        nfkc: "\u{CBBC}",
-        nfkd: "\u{110D}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CBBD}",
-        nfc: "\u{CBBD}",
-        nfd: "\u{110D}\u{1172}\u{11AC}",
-        nfkc: "\u{CBBD}",
-        nfkd: "\u{110D}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CBBE}",
-        nfc: "\u{CBBE}",
-        nfd: "\u{110D}\u{1172}\u{11AD}",
-        nfkc: "\u{CBBE}",
-        nfkd: "\u{110D}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CBBF}",
-        nfc: "\u{CBBF}",
-        nfd: "\u{110D}\u{1172}\u{11AE}",
-        nfkc: "\u{CBBF}",
-        nfkd: "\u{110D}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CBC0}",
-        nfc: "\u{CBC0}",
-        nfd: "\u{110D}\u{1172}\u{11AF}",
-        nfkc: "\u{CBC0}",
-        nfkd: "\u{110D}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CBC1}",
-        nfc: "\u{CBC1}",
-        nfd: "\u{110D}\u{1172}\u{11B0}",
-        nfkc: "\u{CBC1}",
-        nfkd: "\u{110D}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CBC2}",
-        nfc: "\u{CBC2}",
-        nfd: "\u{110D}\u{1172}\u{11B1}",
-        nfkc: "\u{CBC2}",
-        nfkd: "\u{110D}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CBC3}",
-        nfc: "\u{CBC3}",
-        nfd: "\u{110D}\u{1172}\u{11B2}",
-        nfkc: "\u{CBC3}",
-        nfkd: "\u{110D}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CBC4}",
-        nfc: "\u{CBC4}",
-        nfd: "\u{110D}\u{1172}\u{11B3}",
-        nfkc: "\u{CBC4}",
-        nfkd: "\u{110D}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CBC5}",
-        nfc: "\u{CBC5}",
-        nfd: "\u{110D}\u{1172}\u{11B4}",
-        nfkc: "\u{CBC5}",
-        nfkd: "\u{110D}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CBC6}",
-        nfc: "\u{CBC6}",
-        nfd: "\u{110D}\u{1172}\u{11B5}",
-        nfkc: "\u{CBC6}",
-        nfkd: "\u{110D}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CBC7}",
-        nfc: "\u{CBC7}",
-        nfd: "\u{110D}\u{1172}\u{11B6}",
-        nfkc: "\u{CBC7}",
-        nfkd: "\u{110D}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CBC8}",
-        nfc: "\u{CBC8}",
-        nfd: "\u{110D}\u{1172}\u{11B7}",
-        nfkc: "\u{CBC8}",
-        nfkd: "\u{110D}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CBC9}",
-        nfc: "\u{CBC9}",
-        nfd: "\u{110D}\u{1172}\u{11B8}",
-        nfkc: "\u{CBC9}",
-        nfkd: "\u{110D}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CBCA}",
-        nfc: "\u{CBCA}",
-        nfd: "\u{110D}\u{1172}\u{11B9}",
-        nfkc: "\u{CBCA}",
-        nfkd: "\u{110D}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CBCB}",
-        nfc: "\u{CBCB}",
-        nfd: "\u{110D}\u{1172}\u{11BA}",
-        nfkc: "\u{CBCB}",
-        nfkd: "\u{110D}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CBCC}",
-        nfc: "\u{CBCC}",
-        nfd: "\u{110D}\u{1172}\u{11BB}",
-        nfkc: "\u{CBCC}",
-        nfkd: "\u{110D}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CBCD}",
-        nfc: "\u{CBCD}",
-        nfd: "\u{110D}\u{1172}\u{11BC}",
-        nfkc: "\u{CBCD}",
-        nfkd: "\u{110D}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CBCE}",
-        nfc: "\u{CBCE}",
-        nfd: "\u{110D}\u{1172}\u{11BD}",
-        nfkc: "\u{CBCE}",
-        nfkd: "\u{110D}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CBCF}",
-        nfc: "\u{CBCF}",
-        nfd: "\u{110D}\u{1172}\u{11BE}",
-        nfkc: "\u{CBCF}",
-        nfkd: "\u{110D}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CBD0}",
-        nfc: "\u{CBD0}",
-        nfd: "\u{110D}\u{1172}\u{11BF}",
-        nfkc: "\u{CBD0}",
-        nfkd: "\u{110D}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CBD1}",
-        nfc: "\u{CBD1}",
-        nfd: "\u{110D}\u{1172}\u{11C0}",
-        nfkc: "\u{CBD1}",
-        nfkd: "\u{110D}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CBD2}",
-        nfc: "\u{CBD2}",
-        nfd: "\u{110D}\u{1172}\u{11C1}",
-        nfkc: "\u{CBD2}",
-        nfkd: "\u{110D}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CBD3}",
-        nfc: "\u{CBD3}",
-        nfd: "\u{110D}\u{1172}\u{11C2}",
-        nfkc: "\u{CBD3}",
-        nfkd: "\u{110D}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CBD4}",
-        nfc: "\u{CBD4}",
-        nfd: "\u{110D}\u{1173}",
-        nfkc: "\u{CBD4}",
-        nfkd: "\u{110D}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{CBD5}",
-        nfc: "\u{CBD5}",
-        nfd: "\u{110D}\u{1173}\u{11A8}",
-        nfkc: "\u{CBD5}",
-        nfkd: "\u{110D}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CBD6}",
-        nfc: "\u{CBD6}",
-        nfd: "\u{110D}\u{1173}\u{11A9}",
-        nfkc: "\u{CBD6}",
-        nfkd: "\u{110D}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CBD7}",
-        nfc: "\u{CBD7}",
-        nfd: "\u{110D}\u{1173}\u{11AA}",
-        nfkc: "\u{CBD7}",
-        nfkd: "\u{110D}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CBD8}",
-        nfc: "\u{CBD8}",
-        nfd: "\u{110D}\u{1173}\u{11AB}",
-        nfkc: "\u{CBD8}",
-        nfkd: "\u{110D}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CBD9}",
-        nfc: "\u{CBD9}",
-        nfd: "\u{110D}\u{1173}\u{11AC}",
-        nfkc: "\u{CBD9}",
-        nfkd: "\u{110D}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CBDA}",
-        nfc: "\u{CBDA}",
-        nfd: "\u{110D}\u{1173}\u{11AD}",
-        nfkc: "\u{CBDA}",
-        nfkd: "\u{110D}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CBDB}",
-        nfc: "\u{CBDB}",
-        nfd: "\u{110D}\u{1173}\u{11AE}",
-        nfkc: "\u{CBDB}",
-        nfkd: "\u{110D}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CBDC}",
-        nfc: "\u{CBDC}",
-        nfd: "\u{110D}\u{1173}\u{11AF}",
-        nfkc: "\u{CBDC}",
-        nfkd: "\u{110D}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CBDD}",
-        nfc: "\u{CBDD}",
-        nfd: "\u{110D}\u{1173}\u{11B0}",
-        nfkc: "\u{CBDD}",
-        nfkd: "\u{110D}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CBDE}",
-        nfc: "\u{CBDE}",
-        nfd: "\u{110D}\u{1173}\u{11B1}",
-        nfkc: "\u{CBDE}",
-        nfkd: "\u{110D}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CBDF}",
-        nfc: "\u{CBDF}",
-        nfd: "\u{110D}\u{1173}\u{11B2}",
-        nfkc: "\u{CBDF}",
-        nfkd: "\u{110D}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CBE0}",
-        nfc: "\u{CBE0}",
-        nfd: "\u{110D}\u{1173}\u{11B3}",
-        nfkc: "\u{CBE0}",
-        nfkd: "\u{110D}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CBE1}",
-        nfc: "\u{CBE1}",
-        nfd: "\u{110D}\u{1173}\u{11B4}",
-        nfkc: "\u{CBE1}",
-        nfkd: "\u{110D}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CBE2}",
-        nfc: "\u{CBE2}",
-        nfd: "\u{110D}\u{1173}\u{11B5}",
-        nfkc: "\u{CBE2}",
-        nfkd: "\u{110D}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CBE3}",
-        nfc: "\u{CBE3}",
-        nfd: "\u{110D}\u{1173}\u{11B6}",
-        nfkc: "\u{CBE3}",
-        nfkd: "\u{110D}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CBE4}",
-        nfc: "\u{CBE4}",
-        nfd: "\u{110D}\u{1173}\u{11B7}",
-        nfkc: "\u{CBE4}",
-        nfkd: "\u{110D}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CBE5}",
-        nfc: "\u{CBE5}",
-        nfd: "\u{110D}\u{1173}\u{11B8}",
-        nfkc: "\u{CBE5}",
-        nfkd: "\u{110D}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CBE6}",
-        nfc: "\u{CBE6}",
-        nfd: "\u{110D}\u{1173}\u{11B9}",
-        nfkc: "\u{CBE6}",
-        nfkd: "\u{110D}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CBE7}",
-        nfc: "\u{CBE7}",
-        nfd: "\u{110D}\u{1173}\u{11BA}",
-        nfkc: "\u{CBE7}",
-        nfkd: "\u{110D}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CBE8}",
-        nfc: "\u{CBE8}",
-        nfd: "\u{110D}\u{1173}\u{11BB}",
-        nfkc: "\u{CBE8}",
-        nfkd: "\u{110D}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CBE9}",
-        nfc: "\u{CBE9}",
-        nfd: "\u{110D}\u{1173}\u{11BC}",
-        nfkc: "\u{CBE9}",
-        nfkd: "\u{110D}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CBEA}",
-        nfc: "\u{CBEA}",
-        nfd: "\u{110D}\u{1173}\u{11BD}",
-        nfkc: "\u{CBEA}",
-        nfkd: "\u{110D}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CBEB}",
-        nfc: "\u{CBEB}",
-        nfd: "\u{110D}\u{1173}\u{11BE}",
-        nfkc: "\u{CBEB}",
-        nfkd: "\u{110D}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CBEC}",
-        nfc: "\u{CBEC}",
-        nfd: "\u{110D}\u{1173}\u{11BF}",
-        nfkc: "\u{CBEC}",
-        nfkd: "\u{110D}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CBED}",
-        nfc: "\u{CBED}",
-        nfd: "\u{110D}\u{1173}\u{11C0}",
-        nfkc: "\u{CBED}",
-        nfkd: "\u{110D}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CBEE}",
-        nfc: "\u{CBEE}",
-        nfd: "\u{110D}\u{1173}\u{11C1}",
-        nfkc: "\u{CBEE}",
-        nfkd: "\u{110D}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CBEF}",
-        nfc: "\u{CBEF}",
-        nfd: "\u{110D}\u{1173}\u{11C2}",
-        nfkc: "\u{CBEF}",
-        nfkd: "\u{110D}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CBF0}",
-        nfc: "\u{CBF0}",
-        nfd: "\u{110D}\u{1174}",
-        nfkc: "\u{CBF0}",
-        nfkd: "\u{110D}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{CBF1}",
-        nfc: "\u{CBF1}",
-        nfd: "\u{110D}\u{1174}\u{11A8}",
-        nfkc: "\u{CBF1}",
-        nfkd: "\u{110D}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CBF2}",
-        nfc: "\u{CBF2}",
-        nfd: "\u{110D}\u{1174}\u{11A9}",
-        nfkc: "\u{CBF2}",
-        nfkd: "\u{110D}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CBF3}",
-        nfc: "\u{CBF3}",
-        nfd: "\u{110D}\u{1174}\u{11AA}",
-        nfkc: "\u{CBF3}",
-        nfkd: "\u{110D}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CBF4}",
-        nfc: "\u{CBF4}",
-        nfd: "\u{110D}\u{1174}\u{11AB}",
-        nfkc: "\u{CBF4}",
-        nfkd: "\u{110D}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CBF5}",
-        nfc: "\u{CBF5}",
-        nfd: "\u{110D}\u{1174}\u{11AC}",
-        nfkc: "\u{CBF5}",
-        nfkd: "\u{110D}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CBF6}",
-        nfc: "\u{CBF6}",
-        nfd: "\u{110D}\u{1174}\u{11AD}",
-        nfkc: "\u{CBF6}",
-        nfkd: "\u{110D}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CBF7}",
-        nfc: "\u{CBF7}",
-        nfd: "\u{110D}\u{1174}\u{11AE}",
-        nfkc: "\u{CBF7}",
-        nfkd: "\u{110D}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CBF8}",
-        nfc: "\u{CBF8}",
-        nfd: "\u{110D}\u{1174}\u{11AF}",
-        nfkc: "\u{CBF8}",
-        nfkd: "\u{110D}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CBF9}",
-        nfc: "\u{CBF9}",
-        nfd: "\u{110D}\u{1174}\u{11B0}",
-        nfkc: "\u{CBF9}",
-        nfkd: "\u{110D}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CBFA}",
-        nfc: "\u{CBFA}",
-        nfd: "\u{110D}\u{1174}\u{11B1}",
-        nfkc: "\u{CBFA}",
-        nfkd: "\u{110D}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CBFB}",
-        nfc: "\u{CBFB}",
-        nfd: "\u{110D}\u{1174}\u{11B2}",
-        nfkc: "\u{CBFB}",
-        nfkd: "\u{110D}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CBFC}",
-        nfc: "\u{CBFC}",
-        nfd: "\u{110D}\u{1174}\u{11B3}",
-        nfkc: "\u{CBFC}",
-        nfkd: "\u{110D}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CBFD}",
-        nfc: "\u{CBFD}",
-        nfd: "\u{110D}\u{1174}\u{11B4}",
-        nfkc: "\u{CBFD}",
-        nfkd: "\u{110D}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CBFE}",
-        nfc: "\u{CBFE}",
-        nfd: "\u{110D}\u{1174}\u{11B5}",
-        nfkc: "\u{CBFE}",
-        nfkd: "\u{110D}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CBFF}",
-        nfc: "\u{CBFF}",
-        nfd: "\u{110D}\u{1174}\u{11B6}",
-        nfkc: "\u{CBFF}",
-        nfkd: "\u{110D}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CC00}",
-        nfc: "\u{CC00}",
-        nfd: "\u{110D}\u{1174}\u{11B7}",
-        nfkc: "\u{CC00}",
-        nfkd: "\u{110D}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CC01}",
-        nfc: "\u{CC01}",
-        nfd: "\u{110D}\u{1174}\u{11B8}",
-        nfkc: "\u{CC01}",
-        nfkd: "\u{110D}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CC02}",
-        nfc: "\u{CC02}",
-        nfd: "\u{110D}\u{1174}\u{11B9}",
-        nfkc: "\u{CC02}",
-        nfkd: "\u{110D}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CC03}",
-        nfc: "\u{CC03}",
-        nfd: "\u{110D}\u{1174}\u{11BA}",
-        nfkc: "\u{CC03}",
-        nfkd: "\u{110D}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CC04}",
-        nfc: "\u{CC04}",
-        nfd: "\u{110D}\u{1174}\u{11BB}",
-        nfkc: "\u{CC04}",
-        nfkd: "\u{110D}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CC05}",
-        nfc: "\u{CC05}",
-        nfd: "\u{110D}\u{1174}\u{11BC}",
-        nfkc: "\u{CC05}",
-        nfkd: "\u{110D}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CC06}",
-        nfc: "\u{CC06}",
-        nfd: "\u{110D}\u{1174}\u{11BD}",
-        nfkc: "\u{CC06}",
-        nfkd: "\u{110D}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CC07}",
-        nfc: "\u{CC07}",
-        nfd: "\u{110D}\u{1174}\u{11BE}",
-        nfkc: "\u{CC07}",
-        nfkd: "\u{110D}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CC08}",
-        nfc: "\u{CC08}",
-        nfd: "\u{110D}\u{1174}\u{11BF}",
-        nfkc: "\u{CC08}",
-        nfkd: "\u{110D}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CC09}",
-        nfc: "\u{CC09}",
-        nfd: "\u{110D}\u{1174}\u{11C0}",
-        nfkc: "\u{CC09}",
-        nfkd: "\u{110D}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CC0A}",
-        nfc: "\u{CC0A}",
-        nfd: "\u{110D}\u{1174}\u{11C1}",
-        nfkc: "\u{CC0A}",
-        nfkd: "\u{110D}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CC0B}",
-        nfc: "\u{CC0B}",
-        nfd: "\u{110D}\u{1174}\u{11C2}",
-        nfkc: "\u{CC0B}",
-        nfkd: "\u{110D}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CC0C}",
-        nfc: "\u{CC0C}",
-        nfd: "\u{110D}\u{1175}",
-        nfkc: "\u{CC0C}",
-        nfkd: "\u{110D}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{CC0D}",
-        nfc: "\u{CC0D}",
-        nfd: "\u{110D}\u{1175}\u{11A8}",
-        nfkc: "\u{CC0D}",
-        nfkd: "\u{110D}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CC0E}",
-        nfc: "\u{CC0E}",
-        nfd: "\u{110D}\u{1175}\u{11A9}",
-        nfkc: "\u{CC0E}",
-        nfkd: "\u{110D}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CC0F}",
-        nfc: "\u{CC0F}",
-        nfd: "\u{110D}\u{1175}\u{11AA}",
-        nfkc: "\u{CC0F}",
-        nfkd: "\u{110D}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CC10}",
-        nfc: "\u{CC10}",
-        nfd: "\u{110D}\u{1175}\u{11AB}",
-        nfkc: "\u{CC10}",
-        nfkd: "\u{110D}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CC11}",
-        nfc: "\u{CC11}",
-        nfd: "\u{110D}\u{1175}\u{11AC}",
-        nfkc: "\u{CC11}",
-        nfkd: "\u{110D}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CC12}",
-        nfc: "\u{CC12}",
-        nfd: "\u{110D}\u{1175}\u{11AD}",
-        nfkc: "\u{CC12}",
-        nfkd: "\u{110D}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CC13}",
-        nfc: "\u{CC13}",
-        nfd: "\u{110D}\u{1175}\u{11AE}",
-        nfkc: "\u{CC13}",
-        nfkd: "\u{110D}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CC14}",
-        nfc: "\u{CC14}",
-        nfd: "\u{110D}\u{1175}\u{11AF}",
-        nfkc: "\u{CC14}",
-        nfkd: "\u{110D}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CC15}",
-        nfc: "\u{CC15}",
-        nfd: "\u{110D}\u{1175}\u{11B0}",
-        nfkc: "\u{CC15}",
-        nfkd: "\u{110D}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CC16}",
-        nfc: "\u{CC16}",
-        nfd: "\u{110D}\u{1175}\u{11B1}",
-        nfkc: "\u{CC16}",
-        nfkd: "\u{110D}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CC17}",
-        nfc: "\u{CC17}",
-        nfd: "\u{110D}\u{1175}\u{11B2}",
-        nfkc: "\u{CC17}",
-        nfkd: "\u{110D}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CC18}",
-        nfc: "\u{CC18}",
-        nfd: "\u{110D}\u{1175}\u{11B3}",
-        nfkc: "\u{CC18}",
-        nfkd: "\u{110D}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CC19}",
-        nfc: "\u{CC19}",
-        nfd: "\u{110D}\u{1175}\u{11B4}",
-        nfkc: "\u{CC19}",
-        nfkd: "\u{110D}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CC1A}",
-        nfc: "\u{CC1A}",
-        nfd: "\u{110D}\u{1175}\u{11B5}",
-        nfkc: "\u{CC1A}",
-        nfkd: "\u{110D}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CC1B}",
-        nfc: "\u{CC1B}",
-        nfd: "\u{110D}\u{1175}\u{11B6}",
-        nfkc: "\u{CC1B}",
-        nfkd: "\u{110D}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CC1C}",
-        nfc: "\u{CC1C}",
-        nfd: "\u{110D}\u{1175}\u{11B7}",
-        nfkc: "\u{CC1C}",
-        nfkd: "\u{110D}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CC1D}",
-        nfc: "\u{CC1D}",
-        nfd: "\u{110D}\u{1175}\u{11B8}",
-        nfkc: "\u{CC1D}",
-        nfkd: "\u{110D}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CC1E}",
-        nfc: "\u{CC1E}",
-        nfd: "\u{110D}\u{1175}\u{11B9}",
-        nfkc: "\u{CC1E}",
-        nfkd: "\u{110D}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CC1F}",
-        nfc: "\u{CC1F}",
-        nfd: "\u{110D}\u{1175}\u{11BA}",
-        nfkc: "\u{CC1F}",
-        nfkd: "\u{110D}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CC20}",
-        nfc: "\u{CC20}",
-        nfd: "\u{110D}\u{1175}\u{11BB}",
-        nfkc: "\u{CC20}",
-        nfkd: "\u{110D}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CC21}",
-        nfc: "\u{CC21}",
-        nfd: "\u{110D}\u{1175}\u{11BC}",
-        nfkc: "\u{CC21}",
-        nfkd: "\u{110D}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CC22}",
-        nfc: "\u{CC22}",
-        nfd: "\u{110D}\u{1175}\u{11BD}",
-        nfkc: "\u{CC22}",
-        nfkd: "\u{110D}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CC23}",
-        nfc: "\u{CC23}",
-        nfd: "\u{110D}\u{1175}\u{11BE}",
-        nfkc: "\u{CC23}",
-        nfkd: "\u{110D}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CC24}",
-        nfc: "\u{CC24}",
-        nfd: "\u{110D}\u{1175}\u{11BF}",
-        nfkc: "\u{CC24}",
-        nfkd: "\u{110D}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CC25}",
-        nfc: "\u{CC25}",
-        nfd: "\u{110D}\u{1175}\u{11C0}",
-        nfkc: "\u{CC25}",
-        nfkd: "\u{110D}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CC26}",
-        nfc: "\u{CC26}",
-        nfd: "\u{110D}\u{1175}\u{11C1}",
-        nfkc: "\u{CC26}",
-        nfkd: "\u{110D}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CC27}",
-        nfc: "\u{CC27}",
-        nfd: "\u{110D}\u{1175}\u{11C2}",
-        nfkc: "\u{CC27}",
-        nfkd: "\u{110D}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CC28}",
-        nfc: "\u{CC28}",
-        nfd: "\u{110E}\u{1161}",
-        nfkc: "\u{CC28}",
-        nfkd: "\u{110E}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{CC29}",
-        nfc: "\u{CC29}",
-        nfd: "\u{110E}\u{1161}\u{11A8}",
-        nfkc: "\u{CC29}",
-        nfkd: "\u{110E}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CC2A}",
-        nfc: "\u{CC2A}",
-        nfd: "\u{110E}\u{1161}\u{11A9}",
-        nfkc: "\u{CC2A}",
-        nfkd: "\u{110E}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CC2B}",
-        nfc: "\u{CC2B}",
-        nfd: "\u{110E}\u{1161}\u{11AA}",
-        nfkc: "\u{CC2B}",
-        nfkd: "\u{110E}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CC2C}",
-        nfc: "\u{CC2C}",
-        nfd: "\u{110E}\u{1161}\u{11AB}",
-        nfkc: "\u{CC2C}",
-        nfkd: "\u{110E}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CC2D}",
-        nfc: "\u{CC2D}",
-        nfd: "\u{110E}\u{1161}\u{11AC}",
-        nfkc: "\u{CC2D}",
-        nfkd: "\u{110E}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CC2E}",
-        nfc: "\u{CC2E}",
-        nfd: "\u{110E}\u{1161}\u{11AD}",
-        nfkc: "\u{CC2E}",
-        nfkd: "\u{110E}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CC2F}",
-        nfc: "\u{CC2F}",
-        nfd: "\u{110E}\u{1161}\u{11AE}",
-        nfkc: "\u{CC2F}",
-        nfkd: "\u{110E}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CC30}",
-        nfc: "\u{CC30}",
-        nfd: "\u{110E}\u{1161}\u{11AF}",
-        nfkc: "\u{CC30}",
-        nfkd: "\u{110E}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CC31}",
-        nfc: "\u{CC31}",
-        nfd: "\u{110E}\u{1161}\u{11B0}",
-        nfkc: "\u{CC31}",
-        nfkd: "\u{110E}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CC32}",
-        nfc: "\u{CC32}",
-        nfd: "\u{110E}\u{1161}\u{11B1}",
-        nfkc: "\u{CC32}",
-        nfkd: "\u{110E}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CC33}",
-        nfc: "\u{CC33}",
-        nfd: "\u{110E}\u{1161}\u{11B2}",
-        nfkc: "\u{CC33}",
-        nfkd: "\u{110E}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CC34}",
-        nfc: "\u{CC34}",
-        nfd: "\u{110E}\u{1161}\u{11B3}",
-        nfkc: "\u{CC34}",
-        nfkd: "\u{110E}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CC35}",
-        nfc: "\u{CC35}",
-        nfd: "\u{110E}\u{1161}\u{11B4}",
-        nfkc: "\u{CC35}",
-        nfkd: "\u{110E}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CC36}",
-        nfc: "\u{CC36}",
-        nfd: "\u{110E}\u{1161}\u{11B5}",
-        nfkc: "\u{CC36}",
-        nfkd: "\u{110E}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CC37}",
-        nfc: "\u{CC37}",
-        nfd: "\u{110E}\u{1161}\u{11B6}",
-        nfkc: "\u{CC37}",
-        nfkd: "\u{110E}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CC38}",
-        nfc: "\u{CC38}",
-        nfd: "\u{110E}\u{1161}\u{11B7}",
-        nfkc: "\u{CC38}",
-        nfkd: "\u{110E}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CC39}",
-        nfc: "\u{CC39}",
-        nfd: "\u{110E}\u{1161}\u{11B8}",
-        nfkc: "\u{CC39}",
-        nfkd: "\u{110E}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CC3A}",
-        nfc: "\u{CC3A}",
-        nfd: "\u{110E}\u{1161}\u{11B9}",
-        nfkc: "\u{CC3A}",
-        nfkd: "\u{110E}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CC3B}",
-        nfc: "\u{CC3B}",
-        nfd: "\u{110E}\u{1161}\u{11BA}",
-        nfkc: "\u{CC3B}",
-        nfkd: "\u{110E}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CC3C}",
-        nfc: "\u{CC3C}",
-        nfd: "\u{110E}\u{1161}\u{11BB}",
-        nfkc: "\u{CC3C}",
-        nfkd: "\u{110E}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CC3D}",
-        nfc: "\u{CC3D}",
-        nfd: "\u{110E}\u{1161}\u{11BC}",
-        nfkc: "\u{CC3D}",
-        nfkd: "\u{110E}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CC3E}",
-        nfc: "\u{CC3E}",
-        nfd: "\u{110E}\u{1161}\u{11BD}",
-        nfkc: "\u{CC3E}",
-        nfkd: "\u{110E}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CC3F}",
-        nfc: "\u{CC3F}",
-        nfd: "\u{110E}\u{1161}\u{11BE}",
-        nfkc: "\u{CC3F}",
-        nfkd: "\u{110E}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CC40}",
-        nfc: "\u{CC40}",
-        nfd: "\u{110E}\u{1161}\u{11BF}",
-        nfkc: "\u{CC40}",
-        nfkd: "\u{110E}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CC41}",
-        nfc: "\u{CC41}",
-        nfd: "\u{110E}\u{1161}\u{11C0}",
-        nfkc: "\u{CC41}",
-        nfkd: "\u{110E}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CC42}",
-        nfc: "\u{CC42}",
-        nfd: "\u{110E}\u{1161}\u{11C1}",
-        nfkc: "\u{CC42}",
-        nfkd: "\u{110E}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CC43}",
-        nfc: "\u{CC43}",
-        nfd: "\u{110E}\u{1161}\u{11C2}",
-        nfkc: "\u{CC43}",
-        nfkd: "\u{110E}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CC44}",
-        nfc: "\u{CC44}",
-        nfd: "\u{110E}\u{1162}",
-        nfkc: "\u{CC44}",
-        nfkd: "\u{110E}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{CC45}",
-        nfc: "\u{CC45}",
-        nfd: "\u{110E}\u{1162}\u{11A8}",
-        nfkc: "\u{CC45}",
-        nfkd: "\u{110E}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CC46}",
-        nfc: "\u{CC46}",
-        nfd: "\u{110E}\u{1162}\u{11A9}",
-        nfkc: "\u{CC46}",
-        nfkd: "\u{110E}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CC47}",
-        nfc: "\u{CC47}",
-        nfd: "\u{110E}\u{1162}\u{11AA}",
-        nfkc: "\u{CC47}",
-        nfkd: "\u{110E}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CC48}",
-        nfc: "\u{CC48}",
-        nfd: "\u{110E}\u{1162}\u{11AB}",
-        nfkc: "\u{CC48}",
-        nfkd: "\u{110E}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CC49}",
-        nfc: "\u{CC49}",
-        nfd: "\u{110E}\u{1162}\u{11AC}",
-        nfkc: "\u{CC49}",
-        nfkd: "\u{110E}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CC4A}",
-        nfc: "\u{CC4A}",
-        nfd: "\u{110E}\u{1162}\u{11AD}",
-        nfkc: "\u{CC4A}",
-        nfkd: "\u{110E}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CC4B}",
-        nfc: "\u{CC4B}",
-        nfd: "\u{110E}\u{1162}\u{11AE}",
-        nfkc: "\u{CC4B}",
-        nfkd: "\u{110E}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CC4C}",
-        nfc: "\u{CC4C}",
-        nfd: "\u{110E}\u{1162}\u{11AF}",
-        nfkc: "\u{CC4C}",
-        nfkd: "\u{110E}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CC4D}",
-        nfc: "\u{CC4D}",
-        nfd: "\u{110E}\u{1162}\u{11B0}",
-        nfkc: "\u{CC4D}",
-        nfkd: "\u{110E}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CC4E}",
-        nfc: "\u{CC4E}",
-        nfd: "\u{110E}\u{1162}\u{11B1}",
-        nfkc: "\u{CC4E}",
-        nfkd: "\u{110E}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CC4F}",
-        nfc: "\u{CC4F}",
-        nfd: "\u{110E}\u{1162}\u{11B2}",
-        nfkc: "\u{CC4F}",
-        nfkd: "\u{110E}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CC50}",
-        nfc: "\u{CC50}",
-        nfd: "\u{110E}\u{1162}\u{11B3}",
-        nfkc: "\u{CC50}",
-        nfkd: "\u{110E}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CC51}",
-        nfc: "\u{CC51}",
-        nfd: "\u{110E}\u{1162}\u{11B4}",
-        nfkc: "\u{CC51}",
-        nfkd: "\u{110E}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CC52}",
-        nfc: "\u{CC52}",
-        nfd: "\u{110E}\u{1162}\u{11B5}",
-        nfkc: "\u{CC52}",
-        nfkd: "\u{110E}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CC53}",
-        nfc: "\u{CC53}",
-        nfd: "\u{110E}\u{1162}\u{11B6}",
-        nfkc: "\u{CC53}",
-        nfkd: "\u{110E}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CC54}",
-        nfc: "\u{CC54}",
-        nfd: "\u{110E}\u{1162}\u{11B7}",
-        nfkc: "\u{CC54}",
-        nfkd: "\u{110E}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CC55}",
-        nfc: "\u{CC55}",
-        nfd: "\u{110E}\u{1162}\u{11B8}",
-        nfkc: "\u{CC55}",
-        nfkd: "\u{110E}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CC56}",
-        nfc: "\u{CC56}",
-        nfd: "\u{110E}\u{1162}\u{11B9}",
-        nfkc: "\u{CC56}",
-        nfkd: "\u{110E}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CC57}",
-        nfc: "\u{CC57}",
-        nfd: "\u{110E}\u{1162}\u{11BA}",
-        nfkc: "\u{CC57}",
-        nfkd: "\u{110E}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CC58}",
-        nfc: "\u{CC58}",
-        nfd: "\u{110E}\u{1162}\u{11BB}",
-        nfkc: "\u{CC58}",
-        nfkd: "\u{110E}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CC59}",
-        nfc: "\u{CC59}",
-        nfd: "\u{110E}\u{1162}\u{11BC}",
-        nfkc: "\u{CC59}",
-        nfkd: "\u{110E}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CC5A}",
-        nfc: "\u{CC5A}",
-        nfd: "\u{110E}\u{1162}\u{11BD}",
-        nfkc: "\u{CC5A}",
-        nfkd: "\u{110E}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CC5B}",
-        nfc: "\u{CC5B}",
-        nfd: "\u{110E}\u{1162}\u{11BE}",
-        nfkc: "\u{CC5B}",
-        nfkd: "\u{110E}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CC5C}",
-        nfc: "\u{CC5C}",
-        nfd: "\u{110E}\u{1162}\u{11BF}",
-        nfkc: "\u{CC5C}",
-        nfkd: "\u{110E}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CC5D}",
-        nfc: "\u{CC5D}",
-        nfd: "\u{110E}\u{1162}\u{11C0}",
-        nfkc: "\u{CC5D}",
-        nfkd: "\u{110E}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CC5E}",
-        nfc: "\u{CC5E}",
-        nfd: "\u{110E}\u{1162}\u{11C1}",
-        nfkc: "\u{CC5E}",
-        nfkd: "\u{110E}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CC5F}",
-        nfc: "\u{CC5F}",
-        nfd: "\u{110E}\u{1162}\u{11C2}",
-        nfkc: "\u{CC5F}",
-        nfkd: "\u{110E}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CC60}",
-        nfc: "\u{CC60}",
-        nfd: "\u{110E}\u{1163}",
-        nfkc: "\u{CC60}",
-        nfkd: "\u{110E}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{CC61}",
-        nfc: "\u{CC61}",
-        nfd: "\u{110E}\u{1163}\u{11A8}",
-        nfkc: "\u{CC61}",
-        nfkd: "\u{110E}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CC62}",
-        nfc: "\u{CC62}",
-        nfd: "\u{110E}\u{1163}\u{11A9}",
-        nfkc: "\u{CC62}",
-        nfkd: "\u{110E}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CC63}",
-        nfc: "\u{CC63}",
-        nfd: "\u{110E}\u{1163}\u{11AA}",
-        nfkc: "\u{CC63}",
-        nfkd: "\u{110E}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CC64}",
-        nfc: "\u{CC64}",
-        nfd: "\u{110E}\u{1163}\u{11AB}",
-        nfkc: "\u{CC64}",
-        nfkd: "\u{110E}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CC65}",
-        nfc: "\u{CC65}",
-        nfd: "\u{110E}\u{1163}\u{11AC}",
-        nfkc: "\u{CC65}",
-        nfkd: "\u{110E}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CC66}",
-        nfc: "\u{CC66}",
-        nfd: "\u{110E}\u{1163}\u{11AD}",
-        nfkc: "\u{CC66}",
-        nfkd: "\u{110E}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CC67}",
-        nfc: "\u{CC67}",
-        nfd: "\u{110E}\u{1163}\u{11AE}",
-        nfkc: "\u{CC67}",
-        nfkd: "\u{110E}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CC68}",
-        nfc: "\u{CC68}",
-        nfd: "\u{110E}\u{1163}\u{11AF}",
-        nfkc: "\u{CC68}",
-        nfkd: "\u{110E}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CC69}",
-        nfc: "\u{CC69}",
-        nfd: "\u{110E}\u{1163}\u{11B0}",
-        nfkc: "\u{CC69}",
-        nfkd: "\u{110E}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CC6A}",
-        nfc: "\u{CC6A}",
-        nfd: "\u{110E}\u{1163}\u{11B1}",
-        nfkc: "\u{CC6A}",
-        nfkd: "\u{110E}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CC6B}",
-        nfc: "\u{CC6B}",
-        nfd: "\u{110E}\u{1163}\u{11B2}",
-        nfkc: "\u{CC6B}",
-        nfkd: "\u{110E}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CC6C}",
-        nfc: "\u{CC6C}",
-        nfd: "\u{110E}\u{1163}\u{11B3}",
-        nfkc: "\u{CC6C}",
-        nfkd: "\u{110E}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CC6D}",
-        nfc: "\u{CC6D}",
-        nfd: "\u{110E}\u{1163}\u{11B4}",
-        nfkc: "\u{CC6D}",
-        nfkd: "\u{110E}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CC6E}",
-        nfc: "\u{CC6E}",
-        nfd: "\u{110E}\u{1163}\u{11B5}",
-        nfkc: "\u{CC6E}",
-        nfkd: "\u{110E}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CC6F}",
-        nfc: "\u{CC6F}",
-        nfd: "\u{110E}\u{1163}\u{11B6}",
-        nfkc: "\u{CC6F}",
-        nfkd: "\u{110E}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CC70}",
-        nfc: "\u{CC70}",
-        nfd: "\u{110E}\u{1163}\u{11B7}",
-        nfkc: "\u{CC70}",
-        nfkd: "\u{110E}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CC71}",
-        nfc: "\u{CC71}",
-        nfd: "\u{110E}\u{1163}\u{11B8}",
-        nfkc: "\u{CC71}",
-        nfkd: "\u{110E}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CC72}",
-        nfc: "\u{CC72}",
-        nfd: "\u{110E}\u{1163}\u{11B9}",
-        nfkc: "\u{CC72}",
-        nfkd: "\u{110E}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CC73}",
-        nfc: "\u{CC73}",
-        nfd: "\u{110E}\u{1163}\u{11BA}",
-        nfkc: "\u{CC73}",
-        nfkd: "\u{110E}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CC74}",
-        nfc: "\u{CC74}",
-        nfd: "\u{110E}\u{1163}\u{11BB}",
-        nfkc: "\u{CC74}",
-        nfkd: "\u{110E}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CC75}",
-        nfc: "\u{CC75}",
-        nfd: "\u{110E}\u{1163}\u{11BC}",
-        nfkc: "\u{CC75}",
-        nfkd: "\u{110E}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CC76}",
-        nfc: "\u{CC76}",
-        nfd: "\u{110E}\u{1163}\u{11BD}",
-        nfkc: "\u{CC76}",
-        nfkd: "\u{110E}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CC77}",
-        nfc: "\u{CC77}",
-        nfd: "\u{110E}\u{1163}\u{11BE}",
-        nfkc: "\u{CC77}",
-        nfkd: "\u{110E}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CC78}",
-        nfc: "\u{CC78}",
-        nfd: "\u{110E}\u{1163}\u{11BF}",
-        nfkc: "\u{CC78}",
-        nfkd: "\u{110E}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CC79}",
-        nfc: "\u{CC79}",
-        nfd: "\u{110E}\u{1163}\u{11C0}",
-        nfkc: "\u{CC79}",
-        nfkd: "\u{110E}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CC7A}",
-        nfc: "\u{CC7A}",
-        nfd: "\u{110E}\u{1163}\u{11C1}",
-        nfkc: "\u{CC7A}",
-        nfkd: "\u{110E}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CC7B}",
-        nfc: "\u{CC7B}",
-        nfd: "\u{110E}\u{1163}\u{11C2}",
-        nfkc: "\u{CC7B}",
-        nfkd: "\u{110E}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CC7C}",
-        nfc: "\u{CC7C}",
-        nfd: "\u{110E}\u{1164}",
-        nfkc: "\u{CC7C}",
-        nfkd: "\u{110E}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{CC7D}",
-        nfc: "\u{CC7D}",
-        nfd: "\u{110E}\u{1164}\u{11A8}",
-        nfkc: "\u{CC7D}",
-        nfkd: "\u{110E}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CC7E}",
-        nfc: "\u{CC7E}",
-        nfd: "\u{110E}\u{1164}\u{11A9}",
-        nfkc: "\u{CC7E}",
-        nfkd: "\u{110E}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CC7F}",
-        nfc: "\u{CC7F}",
-        nfd: "\u{110E}\u{1164}\u{11AA}",
-        nfkc: "\u{CC7F}",
-        nfkd: "\u{110E}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CC80}",
-        nfc: "\u{CC80}",
-        nfd: "\u{110E}\u{1164}\u{11AB}",
-        nfkc: "\u{CC80}",
-        nfkd: "\u{110E}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CC81}",
-        nfc: "\u{CC81}",
-        nfd: "\u{110E}\u{1164}\u{11AC}",
-        nfkc: "\u{CC81}",
-        nfkd: "\u{110E}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CC82}",
-        nfc: "\u{CC82}",
-        nfd: "\u{110E}\u{1164}\u{11AD}",
-        nfkc: "\u{CC82}",
-        nfkd: "\u{110E}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CC83}",
-        nfc: "\u{CC83}",
-        nfd: "\u{110E}\u{1164}\u{11AE}",
-        nfkc: "\u{CC83}",
-        nfkd: "\u{110E}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CC84}",
-        nfc: "\u{CC84}",
-        nfd: "\u{110E}\u{1164}\u{11AF}",
-        nfkc: "\u{CC84}",
-        nfkd: "\u{110E}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CC85}",
-        nfc: "\u{CC85}",
-        nfd: "\u{110E}\u{1164}\u{11B0}",
-        nfkc: "\u{CC85}",
-        nfkd: "\u{110E}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CC86}",
-        nfc: "\u{CC86}",
-        nfd: "\u{110E}\u{1164}\u{11B1}",
-        nfkc: "\u{CC86}",
-        nfkd: "\u{110E}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CC87}",
-        nfc: "\u{CC87}",
-        nfd: "\u{110E}\u{1164}\u{11B2}",
-        nfkc: "\u{CC87}",
-        nfkd: "\u{110E}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CC88}",
-        nfc: "\u{CC88}",
-        nfd: "\u{110E}\u{1164}\u{11B3}",
-        nfkc: "\u{CC88}",
-        nfkd: "\u{110E}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CC89}",
-        nfc: "\u{CC89}",
-        nfd: "\u{110E}\u{1164}\u{11B4}",
-        nfkc: "\u{CC89}",
-        nfkd: "\u{110E}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CC8A}",
-        nfc: "\u{CC8A}",
-        nfd: "\u{110E}\u{1164}\u{11B5}",
-        nfkc: "\u{CC8A}",
-        nfkd: "\u{110E}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CC8B}",
-        nfc: "\u{CC8B}",
-        nfd: "\u{110E}\u{1164}\u{11B6}",
-        nfkc: "\u{CC8B}",
-        nfkd: "\u{110E}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CC8C}",
-        nfc: "\u{CC8C}",
-        nfd: "\u{110E}\u{1164}\u{11B7}",
-        nfkc: "\u{CC8C}",
-        nfkd: "\u{110E}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CC8D}",
-        nfc: "\u{CC8D}",
-        nfd: "\u{110E}\u{1164}\u{11B8}",
-        nfkc: "\u{CC8D}",
-        nfkd: "\u{110E}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CC8E}",
-        nfc: "\u{CC8E}",
-        nfd: "\u{110E}\u{1164}\u{11B9}",
-        nfkc: "\u{CC8E}",
-        nfkd: "\u{110E}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CC8F}",
-        nfc: "\u{CC8F}",
-        nfd: "\u{110E}\u{1164}\u{11BA}",
-        nfkc: "\u{CC8F}",
-        nfkd: "\u{110E}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CC90}",
-        nfc: "\u{CC90}",
-        nfd: "\u{110E}\u{1164}\u{11BB}",
-        nfkc: "\u{CC90}",
-        nfkd: "\u{110E}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CC91}",
-        nfc: "\u{CC91}",
-        nfd: "\u{110E}\u{1164}\u{11BC}",
-        nfkc: "\u{CC91}",
-        nfkd: "\u{110E}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CC92}",
-        nfc: "\u{CC92}",
-        nfd: "\u{110E}\u{1164}\u{11BD}",
-        nfkc: "\u{CC92}",
-        nfkd: "\u{110E}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CC93}",
-        nfc: "\u{CC93}",
-        nfd: "\u{110E}\u{1164}\u{11BE}",
-        nfkc: "\u{CC93}",
-        nfkd: "\u{110E}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CC94}",
-        nfc: "\u{CC94}",
-        nfd: "\u{110E}\u{1164}\u{11BF}",
-        nfkc: "\u{CC94}",
-        nfkd: "\u{110E}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CC95}",
-        nfc: "\u{CC95}",
-        nfd: "\u{110E}\u{1164}\u{11C0}",
-        nfkc: "\u{CC95}",
-        nfkd: "\u{110E}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CC96}",
-        nfc: "\u{CC96}",
-        nfd: "\u{110E}\u{1164}\u{11C1}",
-        nfkc: "\u{CC96}",
-        nfkd: "\u{110E}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CC97}",
-        nfc: "\u{CC97}",
-        nfd: "\u{110E}\u{1164}\u{11C2}",
-        nfkc: "\u{CC97}",
-        nfkd: "\u{110E}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CC98}",
-        nfc: "\u{CC98}",
-        nfd: "\u{110E}\u{1165}",
-        nfkc: "\u{CC98}",
-        nfkd: "\u{110E}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{CC99}",
-        nfc: "\u{CC99}",
-        nfd: "\u{110E}\u{1165}\u{11A8}",
-        nfkc: "\u{CC99}",
-        nfkd: "\u{110E}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CC9A}",
-        nfc: "\u{CC9A}",
-        nfd: "\u{110E}\u{1165}\u{11A9}",
-        nfkc: "\u{CC9A}",
-        nfkd: "\u{110E}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CC9B}",
-        nfc: "\u{CC9B}",
-        nfd: "\u{110E}\u{1165}\u{11AA}",
-        nfkc: "\u{CC9B}",
-        nfkd: "\u{110E}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CC9C}",
-        nfc: "\u{CC9C}",
-        nfd: "\u{110E}\u{1165}\u{11AB}",
-        nfkc: "\u{CC9C}",
-        nfkd: "\u{110E}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CC9D}",
-        nfc: "\u{CC9D}",
-        nfd: "\u{110E}\u{1165}\u{11AC}",
-        nfkc: "\u{CC9D}",
-        nfkd: "\u{110E}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CC9E}",
-        nfc: "\u{CC9E}",
-        nfd: "\u{110E}\u{1165}\u{11AD}",
-        nfkc: "\u{CC9E}",
-        nfkd: "\u{110E}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CC9F}",
-        nfc: "\u{CC9F}",
-        nfd: "\u{110E}\u{1165}\u{11AE}",
-        nfkc: "\u{CC9F}",
-        nfkd: "\u{110E}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CCA0}",
-        nfc: "\u{CCA0}",
-        nfd: "\u{110E}\u{1165}\u{11AF}",
-        nfkc: "\u{CCA0}",
-        nfkd: "\u{110E}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CCA1}",
-        nfc: "\u{CCA1}",
-        nfd: "\u{110E}\u{1165}\u{11B0}",
-        nfkc: "\u{CCA1}",
-        nfkd: "\u{110E}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CCA2}",
-        nfc: "\u{CCA2}",
-        nfd: "\u{110E}\u{1165}\u{11B1}",
-        nfkc: "\u{CCA2}",
-        nfkd: "\u{110E}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CCA3}",
-        nfc: "\u{CCA3}",
-        nfd: "\u{110E}\u{1165}\u{11B2}",
-        nfkc: "\u{CCA3}",
-        nfkd: "\u{110E}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CCA4}",
-        nfc: "\u{CCA4}",
-        nfd: "\u{110E}\u{1165}\u{11B3}",
-        nfkc: "\u{CCA4}",
-        nfkd: "\u{110E}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CCA5}",
-        nfc: "\u{CCA5}",
-        nfd: "\u{110E}\u{1165}\u{11B4}",
-        nfkc: "\u{CCA5}",
-        nfkd: "\u{110E}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CCA6}",
-        nfc: "\u{CCA6}",
-        nfd: "\u{110E}\u{1165}\u{11B5}",
-        nfkc: "\u{CCA6}",
-        nfkd: "\u{110E}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CCA7}",
-        nfc: "\u{CCA7}",
-        nfd: "\u{110E}\u{1165}\u{11B6}",
-        nfkc: "\u{CCA7}",
-        nfkd: "\u{110E}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CCA8}",
-        nfc: "\u{CCA8}",
-        nfd: "\u{110E}\u{1165}\u{11B7}",
-        nfkc: "\u{CCA8}",
-        nfkd: "\u{110E}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CCA9}",
-        nfc: "\u{CCA9}",
-        nfd: "\u{110E}\u{1165}\u{11B8}",
-        nfkc: "\u{CCA9}",
-        nfkd: "\u{110E}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CCAA}",
-        nfc: "\u{CCAA}",
-        nfd: "\u{110E}\u{1165}\u{11B9}",
-        nfkc: "\u{CCAA}",
-        nfkd: "\u{110E}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CCAB}",
-        nfc: "\u{CCAB}",
-        nfd: "\u{110E}\u{1165}\u{11BA}",
-        nfkc: "\u{CCAB}",
-        nfkd: "\u{110E}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CCAC}",
-        nfc: "\u{CCAC}",
-        nfd: "\u{110E}\u{1165}\u{11BB}",
-        nfkc: "\u{CCAC}",
-        nfkd: "\u{110E}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CCAD}",
-        nfc: "\u{CCAD}",
-        nfd: "\u{110E}\u{1165}\u{11BC}",
-        nfkc: "\u{CCAD}",
-        nfkd: "\u{110E}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CCAE}",
-        nfc: "\u{CCAE}",
-        nfd: "\u{110E}\u{1165}\u{11BD}",
-        nfkc: "\u{CCAE}",
-        nfkd: "\u{110E}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CCAF}",
-        nfc: "\u{CCAF}",
-        nfd: "\u{110E}\u{1165}\u{11BE}",
-        nfkc: "\u{CCAF}",
-        nfkd: "\u{110E}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CCB0}",
-        nfc: "\u{CCB0}",
-        nfd: "\u{110E}\u{1165}\u{11BF}",
-        nfkc: "\u{CCB0}",
-        nfkd: "\u{110E}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CCB1}",
-        nfc: "\u{CCB1}",
-        nfd: "\u{110E}\u{1165}\u{11C0}",
-        nfkc: "\u{CCB1}",
-        nfkd: "\u{110E}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CCB2}",
-        nfc: "\u{CCB2}",
-        nfd: "\u{110E}\u{1165}\u{11C1}",
-        nfkc: "\u{CCB2}",
-        nfkd: "\u{110E}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CCB3}",
-        nfc: "\u{CCB3}",
-        nfd: "\u{110E}\u{1165}\u{11C2}",
-        nfkc: "\u{CCB3}",
-        nfkd: "\u{110E}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CCB4}",
-        nfc: "\u{CCB4}",
-        nfd: "\u{110E}\u{1166}",
-        nfkc: "\u{CCB4}",
-        nfkd: "\u{110E}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{CCB5}",
-        nfc: "\u{CCB5}",
-        nfd: "\u{110E}\u{1166}\u{11A8}",
-        nfkc: "\u{CCB5}",
-        nfkd: "\u{110E}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CCB6}",
-        nfc: "\u{CCB6}",
-        nfd: "\u{110E}\u{1166}\u{11A9}",
-        nfkc: "\u{CCB6}",
-        nfkd: "\u{110E}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CCB7}",
-        nfc: "\u{CCB7}",
-        nfd: "\u{110E}\u{1166}\u{11AA}",
-        nfkc: "\u{CCB7}",
-        nfkd: "\u{110E}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CCB8}",
-        nfc: "\u{CCB8}",
-        nfd: "\u{110E}\u{1166}\u{11AB}",
-        nfkc: "\u{CCB8}",
-        nfkd: "\u{110E}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CCB9}",
-        nfc: "\u{CCB9}",
-        nfd: "\u{110E}\u{1166}\u{11AC}",
-        nfkc: "\u{CCB9}",
-        nfkd: "\u{110E}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CCBA}",
-        nfc: "\u{CCBA}",
-        nfd: "\u{110E}\u{1166}\u{11AD}",
-        nfkc: "\u{CCBA}",
-        nfkd: "\u{110E}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CCBB}",
-        nfc: "\u{CCBB}",
-        nfd: "\u{110E}\u{1166}\u{11AE}",
-        nfkc: "\u{CCBB}",
-        nfkd: "\u{110E}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CCBC}",
-        nfc: "\u{CCBC}",
-        nfd: "\u{110E}\u{1166}\u{11AF}",
-        nfkc: "\u{CCBC}",
-        nfkd: "\u{110E}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CCBD}",
-        nfc: "\u{CCBD}",
-        nfd: "\u{110E}\u{1166}\u{11B0}",
-        nfkc: "\u{CCBD}",
-        nfkd: "\u{110E}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CCBE}",
-        nfc: "\u{CCBE}",
-        nfd: "\u{110E}\u{1166}\u{11B1}",
-        nfkc: "\u{CCBE}",
-        nfkd: "\u{110E}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CCBF}",
-        nfc: "\u{CCBF}",
-        nfd: "\u{110E}\u{1166}\u{11B2}",
-        nfkc: "\u{CCBF}",
-        nfkd: "\u{110E}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CCC0}",
-        nfc: "\u{CCC0}",
-        nfd: "\u{110E}\u{1166}\u{11B3}",
-        nfkc: "\u{CCC0}",
-        nfkd: "\u{110E}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CCC1}",
-        nfc: "\u{CCC1}",
-        nfd: "\u{110E}\u{1166}\u{11B4}",
-        nfkc: "\u{CCC1}",
-        nfkd: "\u{110E}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CCC2}",
-        nfc: "\u{CCC2}",
-        nfd: "\u{110E}\u{1166}\u{11B5}",
-        nfkc: "\u{CCC2}",
-        nfkd: "\u{110E}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CCC3}",
-        nfc: "\u{CCC3}",
-        nfd: "\u{110E}\u{1166}\u{11B6}",
-        nfkc: "\u{CCC3}",
-        nfkd: "\u{110E}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CCC4}",
-        nfc: "\u{CCC4}",
-        nfd: "\u{110E}\u{1166}\u{11B7}",
-        nfkc: "\u{CCC4}",
-        nfkd: "\u{110E}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CCC5}",
-        nfc: "\u{CCC5}",
-        nfd: "\u{110E}\u{1166}\u{11B8}",
-        nfkc: "\u{CCC5}",
-        nfkd: "\u{110E}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CCC6}",
-        nfc: "\u{CCC6}",
-        nfd: "\u{110E}\u{1166}\u{11B9}",
-        nfkc: "\u{CCC6}",
-        nfkd: "\u{110E}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CCC7}",
-        nfc: "\u{CCC7}",
-        nfd: "\u{110E}\u{1166}\u{11BA}",
-        nfkc: "\u{CCC7}",
-        nfkd: "\u{110E}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CCC8}",
-        nfc: "\u{CCC8}",
-        nfd: "\u{110E}\u{1166}\u{11BB}",
-        nfkc: "\u{CCC8}",
-        nfkd: "\u{110E}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CCC9}",
-        nfc: "\u{CCC9}",
-        nfd: "\u{110E}\u{1166}\u{11BC}",
-        nfkc: "\u{CCC9}",
-        nfkd: "\u{110E}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CCCA}",
-        nfc: "\u{CCCA}",
-        nfd: "\u{110E}\u{1166}\u{11BD}",
-        nfkc: "\u{CCCA}",
-        nfkd: "\u{110E}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CCCB}",
-        nfc: "\u{CCCB}",
-        nfd: "\u{110E}\u{1166}\u{11BE}",
-        nfkc: "\u{CCCB}",
-        nfkd: "\u{110E}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CCCC}",
-        nfc: "\u{CCCC}",
-        nfd: "\u{110E}\u{1166}\u{11BF}",
-        nfkc: "\u{CCCC}",
-        nfkd: "\u{110E}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CCCD}",
-        nfc: "\u{CCCD}",
-        nfd: "\u{110E}\u{1166}\u{11C0}",
-        nfkc: "\u{CCCD}",
-        nfkd: "\u{110E}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CCCE}",
-        nfc: "\u{CCCE}",
-        nfd: "\u{110E}\u{1166}\u{11C1}",
-        nfkc: "\u{CCCE}",
-        nfkd: "\u{110E}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CCCF}",
-        nfc: "\u{CCCF}",
-        nfd: "\u{110E}\u{1166}\u{11C2}",
-        nfkc: "\u{CCCF}",
-        nfkd: "\u{110E}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CCD0}",
-        nfc: "\u{CCD0}",
-        nfd: "\u{110E}\u{1167}",
-        nfkc: "\u{CCD0}",
-        nfkd: "\u{110E}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{CCD1}",
-        nfc: "\u{CCD1}",
-        nfd: "\u{110E}\u{1167}\u{11A8}",
-        nfkc: "\u{CCD1}",
-        nfkd: "\u{110E}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CCD2}",
-        nfc: "\u{CCD2}",
-        nfd: "\u{110E}\u{1167}\u{11A9}",
-        nfkc: "\u{CCD2}",
-        nfkd: "\u{110E}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CCD3}",
-        nfc: "\u{CCD3}",
-        nfd: "\u{110E}\u{1167}\u{11AA}",
-        nfkc: "\u{CCD3}",
-        nfkd: "\u{110E}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CCD4}",
-        nfc: "\u{CCD4}",
-        nfd: "\u{110E}\u{1167}\u{11AB}",
-        nfkc: "\u{CCD4}",
-        nfkd: "\u{110E}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CCD5}",
-        nfc: "\u{CCD5}",
-        nfd: "\u{110E}\u{1167}\u{11AC}",
-        nfkc: "\u{CCD5}",
-        nfkd: "\u{110E}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CCD6}",
-        nfc: "\u{CCD6}",
-        nfd: "\u{110E}\u{1167}\u{11AD}",
-        nfkc: "\u{CCD6}",
-        nfkd: "\u{110E}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CCD7}",
-        nfc: "\u{CCD7}",
-        nfd: "\u{110E}\u{1167}\u{11AE}",
-        nfkc: "\u{CCD7}",
-        nfkd: "\u{110E}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CCD8}",
-        nfc: "\u{CCD8}",
-        nfd: "\u{110E}\u{1167}\u{11AF}",
-        nfkc: "\u{CCD8}",
-        nfkd: "\u{110E}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CCD9}",
-        nfc: "\u{CCD9}",
-        nfd: "\u{110E}\u{1167}\u{11B0}",
-        nfkc: "\u{CCD9}",
-        nfkd: "\u{110E}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CCDA}",
-        nfc: "\u{CCDA}",
-        nfd: "\u{110E}\u{1167}\u{11B1}",
-        nfkc: "\u{CCDA}",
-        nfkd: "\u{110E}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CCDB}",
-        nfc: "\u{CCDB}",
-        nfd: "\u{110E}\u{1167}\u{11B2}",
-        nfkc: "\u{CCDB}",
-        nfkd: "\u{110E}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CCDC}",
-        nfc: "\u{CCDC}",
-        nfd: "\u{110E}\u{1167}\u{11B3}",
-        nfkc: "\u{CCDC}",
-        nfkd: "\u{110E}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CCDD}",
-        nfc: "\u{CCDD}",
-        nfd: "\u{110E}\u{1167}\u{11B4}",
-        nfkc: "\u{CCDD}",
-        nfkd: "\u{110E}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CCDE}",
-        nfc: "\u{CCDE}",
-        nfd: "\u{110E}\u{1167}\u{11B5}",
-        nfkc: "\u{CCDE}",
-        nfkd: "\u{110E}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CCDF}",
-        nfc: "\u{CCDF}",
-        nfd: "\u{110E}\u{1167}\u{11B6}",
-        nfkc: "\u{CCDF}",
-        nfkd: "\u{110E}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CCE0}",
-        nfc: "\u{CCE0}",
-        nfd: "\u{110E}\u{1167}\u{11B7}",
-        nfkc: "\u{CCE0}",
-        nfkd: "\u{110E}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CCE1}",
-        nfc: "\u{CCE1}",
-        nfd: "\u{110E}\u{1167}\u{11B8}",
-        nfkc: "\u{CCE1}",
-        nfkd: "\u{110E}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CCE2}",
-        nfc: "\u{CCE2}",
-        nfd: "\u{110E}\u{1167}\u{11B9}",
-        nfkc: "\u{CCE2}",
-        nfkd: "\u{110E}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CCE3}",
-        nfc: "\u{CCE3}",
-        nfd: "\u{110E}\u{1167}\u{11BA}",
-        nfkc: "\u{CCE3}",
-        nfkd: "\u{110E}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CCE4}",
-        nfc: "\u{CCE4}",
-        nfd: "\u{110E}\u{1167}\u{11BB}",
-        nfkc: "\u{CCE4}",
-        nfkd: "\u{110E}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CCE5}",
-        nfc: "\u{CCE5}",
-        nfd: "\u{110E}\u{1167}\u{11BC}",
-        nfkc: "\u{CCE5}",
-        nfkd: "\u{110E}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CCE6}",
-        nfc: "\u{CCE6}",
-        nfd: "\u{110E}\u{1167}\u{11BD}",
-        nfkc: "\u{CCE6}",
-        nfkd: "\u{110E}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CCE7}",
-        nfc: "\u{CCE7}",
-        nfd: "\u{110E}\u{1167}\u{11BE}",
-        nfkc: "\u{CCE7}",
-        nfkd: "\u{110E}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CCE8}",
-        nfc: "\u{CCE8}",
-        nfd: "\u{110E}\u{1167}\u{11BF}",
-        nfkc: "\u{CCE8}",
-        nfkd: "\u{110E}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CCE9}",
-        nfc: "\u{CCE9}",
-        nfd: "\u{110E}\u{1167}\u{11C0}",
-        nfkc: "\u{CCE9}",
-        nfkd: "\u{110E}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CCEA}",
-        nfc: "\u{CCEA}",
-        nfd: "\u{110E}\u{1167}\u{11C1}",
-        nfkc: "\u{CCEA}",
-        nfkd: "\u{110E}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CCEB}",
-        nfc: "\u{CCEB}",
-        nfd: "\u{110E}\u{1167}\u{11C2}",
-        nfkc: "\u{CCEB}",
-        nfkd: "\u{110E}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CCEC}",
-        nfc: "\u{CCEC}",
-        nfd: "\u{110E}\u{1168}",
-        nfkc: "\u{CCEC}",
-        nfkd: "\u{110E}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{CCED}",
-        nfc: "\u{CCED}",
-        nfd: "\u{110E}\u{1168}\u{11A8}",
-        nfkc: "\u{CCED}",
-        nfkd: "\u{110E}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CCEE}",
-        nfc: "\u{CCEE}",
-        nfd: "\u{110E}\u{1168}\u{11A9}",
-        nfkc: "\u{CCEE}",
-        nfkd: "\u{110E}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CCEF}",
-        nfc: "\u{CCEF}",
-        nfd: "\u{110E}\u{1168}\u{11AA}",
-        nfkc: "\u{CCEF}",
-        nfkd: "\u{110E}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CCF0}",
-        nfc: "\u{CCF0}",
-        nfd: "\u{110E}\u{1168}\u{11AB}",
-        nfkc: "\u{CCF0}",
-        nfkd: "\u{110E}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CCF1}",
-        nfc: "\u{CCF1}",
-        nfd: "\u{110E}\u{1168}\u{11AC}",
-        nfkc: "\u{CCF1}",
-        nfkd: "\u{110E}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CCF2}",
-        nfc: "\u{CCF2}",
-        nfd: "\u{110E}\u{1168}\u{11AD}",
-        nfkc: "\u{CCF2}",
-        nfkd: "\u{110E}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CCF3}",
-        nfc: "\u{CCF3}",
-        nfd: "\u{110E}\u{1168}\u{11AE}",
-        nfkc: "\u{CCF3}",
-        nfkd: "\u{110E}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CCF4}",
-        nfc: "\u{CCF4}",
-        nfd: "\u{110E}\u{1168}\u{11AF}",
-        nfkc: "\u{CCF4}",
-        nfkd: "\u{110E}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CCF5}",
-        nfc: "\u{CCF5}",
-        nfd: "\u{110E}\u{1168}\u{11B0}",
-        nfkc: "\u{CCF5}",
-        nfkd: "\u{110E}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CCF6}",
-        nfc: "\u{CCF6}",
-        nfd: "\u{110E}\u{1168}\u{11B1}",
-        nfkc: "\u{CCF6}",
-        nfkd: "\u{110E}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CCF7}",
-        nfc: "\u{CCF7}",
-        nfd: "\u{110E}\u{1168}\u{11B2}",
-        nfkc: "\u{CCF7}",
-        nfkd: "\u{110E}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CCF8}",
-        nfc: "\u{CCF8}",
-        nfd: "\u{110E}\u{1168}\u{11B3}",
-        nfkc: "\u{CCF8}",
-        nfkd: "\u{110E}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CCF9}",
-        nfc: "\u{CCF9}",
-        nfd: "\u{110E}\u{1168}\u{11B4}",
-        nfkc: "\u{CCF9}",
-        nfkd: "\u{110E}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CCFA}",
-        nfc: "\u{CCFA}",
-        nfd: "\u{110E}\u{1168}\u{11B5}",
-        nfkc: "\u{CCFA}",
-        nfkd: "\u{110E}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CCFB}",
-        nfc: "\u{CCFB}",
-        nfd: "\u{110E}\u{1168}\u{11B6}",
-        nfkc: "\u{CCFB}",
-        nfkd: "\u{110E}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CCFC}",
-        nfc: "\u{CCFC}",
-        nfd: "\u{110E}\u{1168}\u{11B7}",
-        nfkc: "\u{CCFC}",
-        nfkd: "\u{110E}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CCFD}",
-        nfc: "\u{CCFD}",
-        nfd: "\u{110E}\u{1168}\u{11B8}",
-        nfkc: "\u{CCFD}",
-        nfkd: "\u{110E}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CCFE}",
-        nfc: "\u{CCFE}",
-        nfd: "\u{110E}\u{1168}\u{11B9}",
-        nfkc: "\u{CCFE}",
-        nfkd: "\u{110E}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CCFF}",
-        nfc: "\u{CCFF}",
-        nfd: "\u{110E}\u{1168}\u{11BA}",
-        nfkc: "\u{CCFF}",
-        nfkd: "\u{110E}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CD00}",
-        nfc: "\u{CD00}",
-        nfd: "\u{110E}\u{1168}\u{11BB}",
-        nfkc: "\u{CD00}",
-        nfkd: "\u{110E}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CD01}",
-        nfc: "\u{CD01}",
-        nfd: "\u{110E}\u{1168}\u{11BC}",
-        nfkc: "\u{CD01}",
-        nfkd: "\u{110E}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD02}",
-        nfc: "\u{CD02}",
-        nfd: "\u{110E}\u{1168}\u{11BD}",
-        nfkc: "\u{CD02}",
-        nfkd: "\u{110E}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CD03}",
-        nfc: "\u{CD03}",
-        nfd: "\u{110E}\u{1168}\u{11BE}",
-        nfkc: "\u{CD03}",
-        nfkd: "\u{110E}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CD04}",
-        nfc: "\u{CD04}",
-        nfd: "\u{110E}\u{1168}\u{11BF}",
-        nfkc: "\u{CD04}",
-        nfkd: "\u{110E}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CD05}",
-        nfc: "\u{CD05}",
-        nfd: "\u{110E}\u{1168}\u{11C0}",
-        nfkc: "\u{CD05}",
-        nfkd: "\u{110E}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CD06}",
-        nfc: "\u{CD06}",
-        nfd: "\u{110E}\u{1168}\u{11C1}",
-        nfkc: "\u{CD06}",
-        nfkd: "\u{110E}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CD07}",
-        nfc: "\u{CD07}",
-        nfd: "\u{110E}\u{1168}\u{11C2}",
-        nfkc: "\u{CD07}",
-        nfkd: "\u{110E}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CD08}",
-        nfc: "\u{CD08}",
-        nfd: "\u{110E}\u{1169}",
-        nfkc: "\u{CD08}",
-        nfkd: "\u{110E}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{CD09}",
-        nfc: "\u{CD09}",
-        nfd: "\u{110E}\u{1169}\u{11A8}",
-        nfkc: "\u{CD09}",
-        nfkd: "\u{110E}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CD0A}",
-        nfc: "\u{CD0A}",
-        nfd: "\u{110E}\u{1169}\u{11A9}",
-        nfkc: "\u{CD0A}",
-        nfkd: "\u{110E}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CD0B}",
-        nfc: "\u{CD0B}",
-        nfd: "\u{110E}\u{1169}\u{11AA}",
-        nfkc: "\u{CD0B}",
-        nfkd: "\u{110E}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CD0C}",
-        nfc: "\u{CD0C}",
-        nfd: "\u{110E}\u{1169}\u{11AB}",
-        nfkc: "\u{CD0C}",
-        nfkd: "\u{110E}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CD0D}",
-        nfc: "\u{CD0D}",
-        nfd: "\u{110E}\u{1169}\u{11AC}",
-        nfkc: "\u{CD0D}",
-        nfkd: "\u{110E}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CD0E}",
-        nfc: "\u{CD0E}",
-        nfd: "\u{110E}\u{1169}\u{11AD}",
-        nfkc: "\u{CD0E}",
-        nfkd: "\u{110E}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CD0F}",
-        nfc: "\u{CD0F}",
-        nfd: "\u{110E}\u{1169}\u{11AE}",
-        nfkc: "\u{CD0F}",
-        nfkd: "\u{110E}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD10}",
-        nfc: "\u{CD10}",
-        nfd: "\u{110E}\u{1169}\u{11AF}",
-        nfkc: "\u{CD10}",
-        nfkd: "\u{110E}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CD11}",
-        nfc: "\u{CD11}",
-        nfd: "\u{110E}\u{1169}\u{11B0}",
-        nfkc: "\u{CD11}",
-        nfkd: "\u{110E}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CD12}",
-        nfc: "\u{CD12}",
-        nfd: "\u{110E}\u{1169}\u{11B1}",
-        nfkc: "\u{CD12}",
-        nfkd: "\u{110E}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CD13}",
-        nfc: "\u{CD13}",
-        nfd: "\u{110E}\u{1169}\u{11B2}",
-        nfkc: "\u{CD13}",
-        nfkd: "\u{110E}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CD14}",
-        nfc: "\u{CD14}",
-        nfd: "\u{110E}\u{1169}\u{11B3}",
-        nfkc: "\u{CD14}",
-        nfkd: "\u{110E}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CD15}",
-        nfc: "\u{CD15}",
-        nfd: "\u{110E}\u{1169}\u{11B4}",
-        nfkc: "\u{CD15}",
-        nfkd: "\u{110E}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CD16}",
-        nfc: "\u{CD16}",
-        nfd: "\u{110E}\u{1169}\u{11B5}",
-        nfkc: "\u{CD16}",
-        nfkd: "\u{110E}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CD17}",
-        nfc: "\u{CD17}",
-        nfd: "\u{110E}\u{1169}\u{11B6}",
-        nfkc: "\u{CD17}",
-        nfkd: "\u{110E}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CD18}",
-        nfc: "\u{CD18}",
-        nfd: "\u{110E}\u{1169}\u{11B7}",
-        nfkc: "\u{CD18}",
-        nfkd: "\u{110E}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CD19}",
-        nfc: "\u{CD19}",
-        nfd: "\u{110E}\u{1169}\u{11B8}",
-        nfkc: "\u{CD19}",
-        nfkd: "\u{110E}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CD1A}",
-        nfc: "\u{CD1A}",
-        nfd: "\u{110E}\u{1169}\u{11B9}",
-        nfkc: "\u{CD1A}",
-        nfkd: "\u{110E}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CD1B}",
-        nfc: "\u{CD1B}",
-        nfd: "\u{110E}\u{1169}\u{11BA}",
-        nfkc: "\u{CD1B}",
-        nfkd: "\u{110E}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CD1C}",
-        nfc: "\u{CD1C}",
-        nfd: "\u{110E}\u{1169}\u{11BB}",
-        nfkc: "\u{CD1C}",
-        nfkd: "\u{110E}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CD1D}",
-        nfc: "\u{CD1D}",
-        nfd: "\u{110E}\u{1169}\u{11BC}",
-        nfkc: "\u{CD1D}",
-        nfkd: "\u{110E}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD1E}",
-        nfc: "\u{CD1E}",
-        nfd: "\u{110E}\u{1169}\u{11BD}",
-        nfkc: "\u{CD1E}",
-        nfkd: "\u{110E}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CD1F}",
-        nfc: "\u{CD1F}",
-        nfd: "\u{110E}\u{1169}\u{11BE}",
-        nfkc: "\u{CD1F}",
-        nfkd: "\u{110E}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CD20}",
-        nfc: "\u{CD20}",
-        nfd: "\u{110E}\u{1169}\u{11BF}",
-        nfkc: "\u{CD20}",
-        nfkd: "\u{110E}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CD21}",
-        nfc: "\u{CD21}",
-        nfd: "\u{110E}\u{1169}\u{11C0}",
-        nfkc: "\u{CD21}",
-        nfkd: "\u{110E}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CD22}",
-        nfc: "\u{CD22}",
-        nfd: "\u{110E}\u{1169}\u{11C1}",
-        nfkc: "\u{CD22}",
-        nfkd: "\u{110E}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CD23}",
-        nfc: "\u{CD23}",
-        nfd: "\u{110E}\u{1169}\u{11C2}",
-        nfkc: "\u{CD23}",
-        nfkd: "\u{110E}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CD24}",
-        nfc: "\u{CD24}",
-        nfd: "\u{110E}\u{116A}",
-        nfkc: "\u{CD24}",
-        nfkd: "\u{110E}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{CD25}",
-        nfc: "\u{CD25}",
-        nfd: "\u{110E}\u{116A}\u{11A8}",
-        nfkc: "\u{CD25}",
-        nfkd: "\u{110E}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CD26}",
-        nfc: "\u{CD26}",
-        nfd: "\u{110E}\u{116A}\u{11A9}",
-        nfkc: "\u{CD26}",
-        nfkd: "\u{110E}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CD27}",
-        nfc: "\u{CD27}",
-        nfd: "\u{110E}\u{116A}\u{11AA}",
-        nfkc: "\u{CD27}",
-        nfkd: "\u{110E}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CD28}",
-        nfc: "\u{CD28}",
-        nfd: "\u{110E}\u{116A}\u{11AB}",
-        nfkc: "\u{CD28}",
-        nfkd: "\u{110E}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CD29}",
-        nfc: "\u{CD29}",
-        nfd: "\u{110E}\u{116A}\u{11AC}",
-        nfkc: "\u{CD29}",
-        nfkd: "\u{110E}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CD2A}",
-        nfc: "\u{CD2A}",
-        nfd: "\u{110E}\u{116A}\u{11AD}",
-        nfkc: "\u{CD2A}",
-        nfkd: "\u{110E}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CD2B}",
-        nfc: "\u{CD2B}",
-        nfd: "\u{110E}\u{116A}\u{11AE}",
-        nfkc: "\u{CD2B}",
-        nfkd: "\u{110E}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD2C}",
-        nfc: "\u{CD2C}",
-        nfd: "\u{110E}\u{116A}\u{11AF}",
-        nfkc: "\u{CD2C}",
-        nfkd: "\u{110E}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CD2D}",
-        nfc: "\u{CD2D}",
-        nfd: "\u{110E}\u{116A}\u{11B0}",
-        nfkc: "\u{CD2D}",
-        nfkd: "\u{110E}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CD2E}",
-        nfc: "\u{CD2E}",
-        nfd: "\u{110E}\u{116A}\u{11B1}",
-        nfkc: "\u{CD2E}",
-        nfkd: "\u{110E}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CD2F}",
-        nfc: "\u{CD2F}",
-        nfd: "\u{110E}\u{116A}\u{11B2}",
-        nfkc: "\u{CD2F}",
-        nfkd: "\u{110E}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CD30}",
-        nfc: "\u{CD30}",
-        nfd: "\u{110E}\u{116A}\u{11B3}",
-        nfkc: "\u{CD30}",
-        nfkd: "\u{110E}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CD31}",
-        nfc: "\u{CD31}",
-        nfd: "\u{110E}\u{116A}\u{11B4}",
-        nfkc: "\u{CD31}",
-        nfkd: "\u{110E}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CD32}",
-        nfc: "\u{CD32}",
-        nfd: "\u{110E}\u{116A}\u{11B5}",
-        nfkc: "\u{CD32}",
-        nfkd: "\u{110E}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CD33}",
-        nfc: "\u{CD33}",
-        nfd: "\u{110E}\u{116A}\u{11B6}",
-        nfkc: "\u{CD33}",
-        nfkd: "\u{110E}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CD34}",
-        nfc: "\u{CD34}",
-        nfd: "\u{110E}\u{116A}\u{11B7}",
-        nfkc: "\u{CD34}",
-        nfkd: "\u{110E}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CD35}",
-        nfc: "\u{CD35}",
-        nfd: "\u{110E}\u{116A}\u{11B8}",
-        nfkc: "\u{CD35}",
-        nfkd: "\u{110E}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CD36}",
-        nfc: "\u{CD36}",
-        nfd: "\u{110E}\u{116A}\u{11B9}",
-        nfkc: "\u{CD36}",
-        nfkd: "\u{110E}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CD37}",
-        nfc: "\u{CD37}",
-        nfd: "\u{110E}\u{116A}\u{11BA}",
-        nfkc: "\u{CD37}",
-        nfkd: "\u{110E}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CD38}",
-        nfc: "\u{CD38}",
-        nfd: "\u{110E}\u{116A}\u{11BB}",
-        nfkc: "\u{CD38}",
-        nfkd: "\u{110E}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CD39}",
-        nfc: "\u{CD39}",
-        nfd: "\u{110E}\u{116A}\u{11BC}",
-        nfkc: "\u{CD39}",
-        nfkd: "\u{110E}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD3A}",
-        nfc: "\u{CD3A}",
-        nfd: "\u{110E}\u{116A}\u{11BD}",
-        nfkc: "\u{CD3A}",
-        nfkd: "\u{110E}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CD3B}",
-        nfc: "\u{CD3B}",
-        nfd: "\u{110E}\u{116A}\u{11BE}",
-        nfkc: "\u{CD3B}",
-        nfkd: "\u{110E}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CD3C}",
-        nfc: "\u{CD3C}",
-        nfd: "\u{110E}\u{116A}\u{11BF}",
-        nfkc: "\u{CD3C}",
-        nfkd: "\u{110E}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CD3D}",
-        nfc: "\u{CD3D}",
-        nfd: "\u{110E}\u{116A}\u{11C0}",
-        nfkc: "\u{CD3D}",
-        nfkd: "\u{110E}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CD3E}",
-        nfc: "\u{CD3E}",
-        nfd: "\u{110E}\u{116A}\u{11C1}",
-        nfkc: "\u{CD3E}",
-        nfkd: "\u{110E}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CD3F}",
-        nfc: "\u{CD3F}",
-        nfd: "\u{110E}\u{116A}\u{11C2}",
-        nfkc: "\u{CD3F}",
-        nfkd: "\u{110E}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CD40}",
-        nfc: "\u{CD40}",
-        nfd: "\u{110E}\u{116B}",
-        nfkc: "\u{CD40}",
-        nfkd: "\u{110E}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{CD41}",
-        nfc: "\u{CD41}",
-        nfd: "\u{110E}\u{116B}\u{11A8}",
-        nfkc: "\u{CD41}",
-        nfkd: "\u{110E}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CD42}",
-        nfc: "\u{CD42}",
-        nfd: "\u{110E}\u{116B}\u{11A9}",
-        nfkc: "\u{CD42}",
-        nfkd: "\u{110E}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CD43}",
-        nfc: "\u{CD43}",
-        nfd: "\u{110E}\u{116B}\u{11AA}",
-        nfkc: "\u{CD43}",
-        nfkd: "\u{110E}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CD44}",
-        nfc: "\u{CD44}",
-        nfd: "\u{110E}\u{116B}\u{11AB}",
-        nfkc: "\u{CD44}",
-        nfkd: "\u{110E}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CD45}",
-        nfc: "\u{CD45}",
-        nfd: "\u{110E}\u{116B}\u{11AC}",
-        nfkc: "\u{CD45}",
-        nfkd: "\u{110E}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CD46}",
-        nfc: "\u{CD46}",
-        nfd: "\u{110E}\u{116B}\u{11AD}",
-        nfkc: "\u{CD46}",
-        nfkd: "\u{110E}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CD47}",
-        nfc: "\u{CD47}",
-        nfd: "\u{110E}\u{116B}\u{11AE}",
-        nfkc: "\u{CD47}",
-        nfkd: "\u{110E}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD48}",
-        nfc: "\u{CD48}",
-        nfd: "\u{110E}\u{116B}\u{11AF}",
-        nfkc: "\u{CD48}",
-        nfkd: "\u{110E}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CD49}",
-        nfc: "\u{CD49}",
-        nfd: "\u{110E}\u{116B}\u{11B0}",
-        nfkc: "\u{CD49}",
-        nfkd: "\u{110E}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CD4A}",
-        nfc: "\u{CD4A}",
-        nfd: "\u{110E}\u{116B}\u{11B1}",
-        nfkc: "\u{CD4A}",
-        nfkd: "\u{110E}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CD4B}",
-        nfc: "\u{CD4B}",
-        nfd: "\u{110E}\u{116B}\u{11B2}",
-        nfkc: "\u{CD4B}",
-        nfkd: "\u{110E}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CD4C}",
-        nfc: "\u{CD4C}",
-        nfd: "\u{110E}\u{116B}\u{11B3}",
-        nfkc: "\u{CD4C}",
-        nfkd: "\u{110E}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CD4D}",
-        nfc: "\u{CD4D}",
-        nfd: "\u{110E}\u{116B}\u{11B4}",
-        nfkc: "\u{CD4D}",
-        nfkd: "\u{110E}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CD4E}",
-        nfc: "\u{CD4E}",
-        nfd: "\u{110E}\u{116B}\u{11B5}",
-        nfkc: "\u{CD4E}",
-        nfkd: "\u{110E}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CD4F}",
-        nfc: "\u{CD4F}",
-        nfd: "\u{110E}\u{116B}\u{11B6}",
-        nfkc: "\u{CD4F}",
-        nfkd: "\u{110E}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CD50}",
-        nfc: "\u{CD50}",
-        nfd: "\u{110E}\u{116B}\u{11B7}",
-        nfkc: "\u{CD50}",
-        nfkd: "\u{110E}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CD51}",
-        nfc: "\u{CD51}",
-        nfd: "\u{110E}\u{116B}\u{11B8}",
-        nfkc: "\u{CD51}",
-        nfkd: "\u{110E}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CD52}",
-        nfc: "\u{CD52}",
-        nfd: "\u{110E}\u{116B}\u{11B9}",
-        nfkc: "\u{CD52}",
-        nfkd: "\u{110E}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CD53}",
-        nfc: "\u{CD53}",
-        nfd: "\u{110E}\u{116B}\u{11BA}",
-        nfkc: "\u{CD53}",
-        nfkd: "\u{110E}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CD54}",
-        nfc: "\u{CD54}",
-        nfd: "\u{110E}\u{116B}\u{11BB}",
-        nfkc: "\u{CD54}",
-        nfkd: "\u{110E}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CD55}",
-        nfc: "\u{CD55}",
-        nfd: "\u{110E}\u{116B}\u{11BC}",
-        nfkc: "\u{CD55}",
-        nfkd: "\u{110E}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD56}",
-        nfc: "\u{CD56}",
-        nfd: "\u{110E}\u{116B}\u{11BD}",
-        nfkc: "\u{CD56}",
-        nfkd: "\u{110E}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CD57}",
-        nfc: "\u{CD57}",
-        nfd: "\u{110E}\u{116B}\u{11BE}",
-        nfkc: "\u{CD57}",
-        nfkd: "\u{110E}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CD58}",
-        nfc: "\u{CD58}",
-        nfd: "\u{110E}\u{116B}\u{11BF}",
-        nfkc: "\u{CD58}",
-        nfkd: "\u{110E}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CD59}",
-        nfc: "\u{CD59}",
-        nfd: "\u{110E}\u{116B}\u{11C0}",
-        nfkc: "\u{CD59}",
-        nfkd: "\u{110E}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CD5A}",
-        nfc: "\u{CD5A}",
-        nfd: "\u{110E}\u{116B}\u{11C1}",
-        nfkc: "\u{CD5A}",
-        nfkd: "\u{110E}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CD5B}",
-        nfc: "\u{CD5B}",
-        nfd: "\u{110E}\u{116B}\u{11C2}",
-        nfkc: "\u{CD5B}",
-        nfkd: "\u{110E}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CD5C}",
-        nfc: "\u{CD5C}",
-        nfd: "\u{110E}\u{116C}",
-        nfkc: "\u{CD5C}",
-        nfkd: "\u{110E}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{CD5D}",
-        nfc: "\u{CD5D}",
-        nfd: "\u{110E}\u{116C}\u{11A8}",
-        nfkc: "\u{CD5D}",
-        nfkd: "\u{110E}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CD5E}",
-        nfc: "\u{CD5E}",
-        nfd: "\u{110E}\u{116C}\u{11A9}",
-        nfkc: "\u{CD5E}",
-        nfkd: "\u{110E}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CD5F}",
-        nfc: "\u{CD5F}",
-        nfd: "\u{110E}\u{116C}\u{11AA}",
-        nfkc: "\u{CD5F}",
-        nfkd: "\u{110E}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CD60}",
-        nfc: "\u{CD60}",
-        nfd: "\u{110E}\u{116C}\u{11AB}",
-        nfkc: "\u{CD60}",
-        nfkd: "\u{110E}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CD61}",
-        nfc: "\u{CD61}",
-        nfd: "\u{110E}\u{116C}\u{11AC}",
-        nfkc: "\u{CD61}",
-        nfkd: "\u{110E}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CD62}",
-        nfc: "\u{CD62}",
-        nfd: "\u{110E}\u{116C}\u{11AD}",
-        nfkc: "\u{CD62}",
-        nfkd: "\u{110E}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CD63}",
-        nfc: "\u{CD63}",
-        nfd: "\u{110E}\u{116C}\u{11AE}",
-        nfkc: "\u{CD63}",
-        nfkd: "\u{110E}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD64}",
-        nfc: "\u{CD64}",
-        nfd: "\u{110E}\u{116C}\u{11AF}",
-        nfkc: "\u{CD64}",
-        nfkd: "\u{110E}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CD65}",
-        nfc: "\u{CD65}",
-        nfd: "\u{110E}\u{116C}\u{11B0}",
-        nfkc: "\u{CD65}",
-        nfkd: "\u{110E}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CD66}",
-        nfc: "\u{CD66}",
-        nfd: "\u{110E}\u{116C}\u{11B1}",
-        nfkc: "\u{CD66}",
-        nfkd: "\u{110E}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CD67}",
-        nfc: "\u{CD67}",
-        nfd: "\u{110E}\u{116C}\u{11B2}",
-        nfkc: "\u{CD67}",
-        nfkd: "\u{110E}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CD68}",
-        nfc: "\u{CD68}",
-        nfd: "\u{110E}\u{116C}\u{11B3}",
-        nfkc: "\u{CD68}",
-        nfkd: "\u{110E}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CD69}",
-        nfc: "\u{CD69}",
-        nfd: "\u{110E}\u{116C}\u{11B4}",
-        nfkc: "\u{CD69}",
-        nfkd: "\u{110E}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CD6A}",
-        nfc: "\u{CD6A}",
-        nfd: "\u{110E}\u{116C}\u{11B5}",
-        nfkc: "\u{CD6A}",
-        nfkd: "\u{110E}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CD6B}",
-        nfc: "\u{CD6B}",
-        nfd: "\u{110E}\u{116C}\u{11B6}",
-        nfkc: "\u{CD6B}",
-        nfkd: "\u{110E}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CD6C}",
-        nfc: "\u{CD6C}",
-        nfd: "\u{110E}\u{116C}\u{11B7}",
-        nfkc: "\u{CD6C}",
-        nfkd: "\u{110E}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CD6D}",
-        nfc: "\u{CD6D}",
-        nfd: "\u{110E}\u{116C}\u{11B8}",
-        nfkc: "\u{CD6D}",
-        nfkd: "\u{110E}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CD6E}",
-        nfc: "\u{CD6E}",
-        nfd: "\u{110E}\u{116C}\u{11B9}",
-        nfkc: "\u{CD6E}",
-        nfkd: "\u{110E}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CD6F}",
-        nfc: "\u{CD6F}",
-        nfd: "\u{110E}\u{116C}\u{11BA}",
-        nfkc: "\u{CD6F}",
-        nfkd: "\u{110E}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CD70}",
-        nfc: "\u{CD70}",
-        nfd: "\u{110E}\u{116C}\u{11BB}",
-        nfkc: "\u{CD70}",
-        nfkd: "\u{110E}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CD71}",
-        nfc: "\u{CD71}",
-        nfd: "\u{110E}\u{116C}\u{11BC}",
-        nfkc: "\u{CD71}",
-        nfkd: "\u{110E}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD72}",
-        nfc: "\u{CD72}",
-        nfd: "\u{110E}\u{116C}\u{11BD}",
-        nfkc: "\u{CD72}",
-        nfkd: "\u{110E}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CD73}",
-        nfc: "\u{CD73}",
-        nfd: "\u{110E}\u{116C}\u{11BE}",
-        nfkc: "\u{CD73}",
-        nfkd: "\u{110E}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CD74}",
-        nfc: "\u{CD74}",
-        nfd: "\u{110E}\u{116C}\u{11BF}",
-        nfkc: "\u{CD74}",
-        nfkd: "\u{110E}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CD75}",
-        nfc: "\u{CD75}",
-        nfd: "\u{110E}\u{116C}\u{11C0}",
-        nfkc: "\u{CD75}",
-        nfkd: "\u{110E}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CD76}",
-        nfc: "\u{CD76}",
-        nfd: "\u{110E}\u{116C}\u{11C1}",
-        nfkc: "\u{CD76}",
-        nfkd: "\u{110E}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CD77}",
-        nfc: "\u{CD77}",
-        nfd: "\u{110E}\u{116C}\u{11C2}",
-        nfkc: "\u{CD77}",
-        nfkd: "\u{110E}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CD78}",
-        nfc: "\u{CD78}",
-        nfd: "\u{110E}\u{116D}",
-        nfkc: "\u{CD78}",
-        nfkd: "\u{110E}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{CD79}",
-        nfc: "\u{CD79}",
-        nfd: "\u{110E}\u{116D}\u{11A8}",
-        nfkc: "\u{CD79}",
-        nfkd: "\u{110E}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CD7A}",
-        nfc: "\u{CD7A}",
-        nfd: "\u{110E}\u{116D}\u{11A9}",
-        nfkc: "\u{CD7A}",
-        nfkd: "\u{110E}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CD7B}",
-        nfc: "\u{CD7B}",
-        nfd: "\u{110E}\u{116D}\u{11AA}",
-        nfkc: "\u{CD7B}",
-        nfkd: "\u{110E}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CD7C}",
-        nfc: "\u{CD7C}",
-        nfd: "\u{110E}\u{116D}\u{11AB}",
-        nfkc: "\u{CD7C}",
-        nfkd: "\u{110E}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CD7D}",
-        nfc: "\u{CD7D}",
-        nfd: "\u{110E}\u{116D}\u{11AC}",
-        nfkc: "\u{CD7D}",
-        nfkd: "\u{110E}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CD7E}",
-        nfc: "\u{CD7E}",
-        nfd: "\u{110E}\u{116D}\u{11AD}",
-        nfkc: "\u{CD7E}",
-        nfkd: "\u{110E}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CD7F}",
-        nfc: "\u{CD7F}",
-        nfd: "\u{110E}\u{116D}\u{11AE}",
-        nfkc: "\u{CD7F}",
-        nfkd: "\u{110E}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD80}",
-        nfc: "\u{CD80}",
-        nfd: "\u{110E}\u{116D}\u{11AF}",
-        nfkc: "\u{CD80}",
-        nfkd: "\u{110E}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CD81}",
-        nfc: "\u{CD81}",
-        nfd: "\u{110E}\u{116D}\u{11B0}",
-        nfkc: "\u{CD81}",
-        nfkd: "\u{110E}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CD82}",
-        nfc: "\u{CD82}",
-        nfd: "\u{110E}\u{116D}\u{11B1}",
-        nfkc: "\u{CD82}",
-        nfkd: "\u{110E}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CD83}",
-        nfc: "\u{CD83}",
-        nfd: "\u{110E}\u{116D}\u{11B2}",
-        nfkc: "\u{CD83}",
-        nfkd: "\u{110E}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CD84}",
-        nfc: "\u{CD84}",
-        nfd: "\u{110E}\u{116D}\u{11B3}",
-        nfkc: "\u{CD84}",
-        nfkd: "\u{110E}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CD85}",
-        nfc: "\u{CD85}",
-        nfd: "\u{110E}\u{116D}\u{11B4}",
-        nfkc: "\u{CD85}",
-        nfkd: "\u{110E}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CD86}",
-        nfc: "\u{CD86}",
-        nfd: "\u{110E}\u{116D}\u{11B5}",
-        nfkc: "\u{CD86}",
-        nfkd: "\u{110E}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CD87}",
-        nfc: "\u{CD87}",
-        nfd: "\u{110E}\u{116D}\u{11B6}",
-        nfkc: "\u{CD87}",
-        nfkd: "\u{110E}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CD88}",
-        nfc: "\u{CD88}",
-        nfd: "\u{110E}\u{116D}\u{11B7}",
-        nfkc: "\u{CD88}",
-        nfkd: "\u{110E}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CD89}",
-        nfc: "\u{CD89}",
-        nfd: "\u{110E}\u{116D}\u{11B8}",
-        nfkc: "\u{CD89}",
-        nfkd: "\u{110E}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CD8A}",
-        nfc: "\u{CD8A}",
-        nfd: "\u{110E}\u{116D}\u{11B9}",
-        nfkc: "\u{CD8A}",
-        nfkd: "\u{110E}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CD8B}",
-        nfc: "\u{CD8B}",
-        nfd: "\u{110E}\u{116D}\u{11BA}",
-        nfkc: "\u{CD8B}",
-        nfkd: "\u{110E}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CD8C}",
-        nfc: "\u{CD8C}",
-        nfd: "\u{110E}\u{116D}\u{11BB}",
-        nfkc: "\u{CD8C}",
-        nfkd: "\u{110E}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CD8D}",
-        nfc: "\u{CD8D}",
-        nfd: "\u{110E}\u{116D}\u{11BC}",
-        nfkc: "\u{CD8D}",
-        nfkd: "\u{110E}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD8E}",
-        nfc: "\u{CD8E}",
-        nfd: "\u{110E}\u{116D}\u{11BD}",
-        nfkc: "\u{CD8E}",
-        nfkd: "\u{110E}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CD8F}",
-        nfc: "\u{CD8F}",
-        nfd: "\u{110E}\u{116D}\u{11BE}",
-        nfkc: "\u{CD8F}",
-        nfkd: "\u{110E}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CD90}",
-        nfc: "\u{CD90}",
-        nfd: "\u{110E}\u{116D}\u{11BF}",
-        nfkc: "\u{CD90}",
-        nfkd: "\u{110E}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CD91}",
-        nfc: "\u{CD91}",
-        nfd: "\u{110E}\u{116D}\u{11C0}",
-        nfkc: "\u{CD91}",
-        nfkd: "\u{110E}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CD92}",
-        nfc: "\u{CD92}",
-        nfd: "\u{110E}\u{116D}\u{11C1}",
-        nfkc: "\u{CD92}",
-        nfkd: "\u{110E}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CD93}",
-        nfc: "\u{CD93}",
-        nfd: "\u{110E}\u{116D}\u{11C2}",
-        nfkc: "\u{CD93}",
-        nfkd: "\u{110E}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CD94}",
-        nfc: "\u{CD94}",
-        nfd: "\u{110E}\u{116E}",
-        nfkc: "\u{CD94}",
-        nfkd: "\u{110E}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{CD95}",
-        nfc: "\u{CD95}",
-        nfd: "\u{110E}\u{116E}\u{11A8}",
-        nfkc: "\u{CD95}",
-        nfkd: "\u{110E}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CD96}",
-        nfc: "\u{CD96}",
-        nfd: "\u{110E}\u{116E}\u{11A9}",
-        nfkc: "\u{CD96}",
-        nfkd: "\u{110E}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CD97}",
-        nfc: "\u{CD97}",
-        nfd: "\u{110E}\u{116E}\u{11AA}",
-        nfkc: "\u{CD97}",
-        nfkd: "\u{110E}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CD98}",
-        nfc: "\u{CD98}",
-        nfd: "\u{110E}\u{116E}\u{11AB}",
-        nfkc: "\u{CD98}",
-        nfkd: "\u{110E}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CD99}",
-        nfc: "\u{CD99}",
-        nfd: "\u{110E}\u{116E}\u{11AC}",
-        nfkc: "\u{CD99}",
-        nfkd: "\u{110E}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CD9A}",
-        nfc: "\u{CD9A}",
-        nfd: "\u{110E}\u{116E}\u{11AD}",
-        nfkc: "\u{CD9A}",
-        nfkd: "\u{110E}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CD9B}",
-        nfc: "\u{CD9B}",
-        nfd: "\u{110E}\u{116E}\u{11AE}",
-        nfkc: "\u{CD9B}",
-        nfkd: "\u{110E}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD9C}",
-        nfc: "\u{CD9C}",
-        nfd: "\u{110E}\u{116E}\u{11AF}",
-        nfkc: "\u{CD9C}",
-        nfkd: "\u{110E}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CD9D}",
-        nfc: "\u{CD9D}",
-        nfd: "\u{110E}\u{116E}\u{11B0}",
-        nfkc: "\u{CD9D}",
-        nfkd: "\u{110E}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CD9E}",
-        nfc: "\u{CD9E}",
-        nfd: "\u{110E}\u{116E}\u{11B1}",
-        nfkc: "\u{CD9E}",
-        nfkd: "\u{110E}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CD9F}",
-        nfc: "\u{CD9F}",
-        nfd: "\u{110E}\u{116E}\u{11B2}",
-        nfkc: "\u{CD9F}",
-        nfkd: "\u{110E}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CDA0}",
-        nfc: "\u{CDA0}",
-        nfd: "\u{110E}\u{116E}\u{11B3}",
-        nfkc: "\u{CDA0}",
-        nfkd: "\u{110E}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CDA1}",
-        nfc: "\u{CDA1}",
-        nfd: "\u{110E}\u{116E}\u{11B4}",
-        nfkc: "\u{CDA1}",
-        nfkd: "\u{110E}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CDA2}",
-        nfc: "\u{CDA2}",
-        nfd: "\u{110E}\u{116E}\u{11B5}",
-        nfkc: "\u{CDA2}",
-        nfkd: "\u{110E}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CDA3}",
-        nfc: "\u{CDA3}",
-        nfd: "\u{110E}\u{116E}\u{11B6}",
-        nfkc: "\u{CDA3}",
-        nfkd: "\u{110E}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CDA4}",
-        nfc: "\u{CDA4}",
-        nfd: "\u{110E}\u{116E}\u{11B7}",
-        nfkc: "\u{CDA4}",
-        nfkd: "\u{110E}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CDA5}",
-        nfc: "\u{CDA5}",
-        nfd: "\u{110E}\u{116E}\u{11B8}",
-        nfkc: "\u{CDA5}",
-        nfkd: "\u{110E}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CDA6}",
-        nfc: "\u{CDA6}",
-        nfd: "\u{110E}\u{116E}\u{11B9}",
-        nfkc: "\u{CDA6}",
-        nfkd: "\u{110E}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CDA7}",
-        nfc: "\u{CDA7}",
-        nfd: "\u{110E}\u{116E}\u{11BA}",
-        nfkc: "\u{CDA7}",
-        nfkd: "\u{110E}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CDA8}",
-        nfc: "\u{CDA8}",
-        nfd: "\u{110E}\u{116E}\u{11BB}",
-        nfkc: "\u{CDA8}",
-        nfkd: "\u{110E}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CDA9}",
-        nfc: "\u{CDA9}",
-        nfd: "\u{110E}\u{116E}\u{11BC}",
-        nfkc: "\u{CDA9}",
-        nfkd: "\u{110E}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CDAA}",
-        nfc: "\u{CDAA}",
-        nfd: "\u{110E}\u{116E}\u{11BD}",
-        nfkc: "\u{CDAA}",
-        nfkd: "\u{110E}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CDAB}",
-        nfc: "\u{CDAB}",
-        nfd: "\u{110E}\u{116E}\u{11BE}",
-        nfkc: "\u{CDAB}",
-        nfkd: "\u{110E}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CDAC}",
-        nfc: "\u{CDAC}",
-        nfd: "\u{110E}\u{116E}\u{11BF}",
-        nfkc: "\u{CDAC}",
-        nfkd: "\u{110E}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CDAD}",
-        nfc: "\u{CDAD}",
-        nfd: "\u{110E}\u{116E}\u{11C0}",
-        nfkc: "\u{CDAD}",
-        nfkd: "\u{110E}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CDAE}",
-        nfc: "\u{CDAE}",
-        nfd: "\u{110E}\u{116E}\u{11C1}",
-        nfkc: "\u{CDAE}",
-        nfkd: "\u{110E}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CDAF}",
-        nfc: "\u{CDAF}",
-        nfd: "\u{110E}\u{116E}\u{11C2}",
-        nfkc: "\u{CDAF}",
-        nfkd: "\u{110E}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CDB0}",
-        nfc: "\u{CDB0}",
-        nfd: "\u{110E}\u{116F}",
-        nfkc: "\u{CDB0}",
-        nfkd: "\u{110E}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{CDB1}",
-        nfc: "\u{CDB1}",
-        nfd: "\u{110E}\u{116F}\u{11A8}",
-        nfkc: "\u{CDB1}",
-        nfkd: "\u{110E}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CDB2}",
-        nfc: "\u{CDB2}",
-        nfd: "\u{110E}\u{116F}\u{11A9}",
-        nfkc: "\u{CDB2}",
-        nfkd: "\u{110E}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CDB3}",
-        nfc: "\u{CDB3}",
-        nfd: "\u{110E}\u{116F}\u{11AA}",
-        nfkc: "\u{CDB3}",
-        nfkd: "\u{110E}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CDB4}",
-        nfc: "\u{CDB4}",
-        nfd: "\u{110E}\u{116F}\u{11AB}",
-        nfkc: "\u{CDB4}",
-        nfkd: "\u{110E}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CDB5}",
-        nfc: "\u{CDB5}",
-        nfd: "\u{110E}\u{116F}\u{11AC}",
-        nfkc: "\u{CDB5}",
-        nfkd: "\u{110E}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CDB6}",
-        nfc: "\u{CDB6}",
-        nfd: "\u{110E}\u{116F}\u{11AD}",
-        nfkc: "\u{CDB6}",
-        nfkd: "\u{110E}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CDB7}",
-        nfc: "\u{CDB7}",
-        nfd: "\u{110E}\u{116F}\u{11AE}",
-        nfkc: "\u{CDB7}",
-        nfkd: "\u{110E}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CDB8}",
-        nfc: "\u{CDB8}",
-        nfd: "\u{110E}\u{116F}\u{11AF}",
-        nfkc: "\u{CDB8}",
-        nfkd: "\u{110E}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CDB9}",
-        nfc: "\u{CDB9}",
-        nfd: "\u{110E}\u{116F}\u{11B0}",
-        nfkc: "\u{CDB9}",
-        nfkd: "\u{110E}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CDBA}",
-        nfc: "\u{CDBA}",
-        nfd: "\u{110E}\u{116F}\u{11B1}",
-        nfkc: "\u{CDBA}",
-        nfkd: "\u{110E}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CDBB}",
-        nfc: "\u{CDBB}",
-        nfd: "\u{110E}\u{116F}\u{11B2}",
-        nfkc: "\u{CDBB}",
-        nfkd: "\u{110E}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CDBC}",
-        nfc: "\u{CDBC}",
-        nfd: "\u{110E}\u{116F}\u{11B3}",
-        nfkc: "\u{CDBC}",
-        nfkd: "\u{110E}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CDBD}",
-        nfc: "\u{CDBD}",
-        nfd: "\u{110E}\u{116F}\u{11B4}",
-        nfkc: "\u{CDBD}",
-        nfkd: "\u{110E}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CDBE}",
-        nfc: "\u{CDBE}",
-        nfd: "\u{110E}\u{116F}\u{11B5}",
-        nfkc: "\u{CDBE}",
-        nfkd: "\u{110E}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CDBF}",
-        nfc: "\u{CDBF}",
-        nfd: "\u{110E}\u{116F}\u{11B6}",
-        nfkc: "\u{CDBF}",
-        nfkd: "\u{110E}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CDC0}",
-        nfc: "\u{CDC0}",
-        nfd: "\u{110E}\u{116F}\u{11B7}",
-        nfkc: "\u{CDC0}",
-        nfkd: "\u{110E}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CDC1}",
-        nfc: "\u{CDC1}",
-        nfd: "\u{110E}\u{116F}\u{11B8}",
-        nfkc: "\u{CDC1}",
-        nfkd: "\u{110E}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CDC2}",
-        nfc: "\u{CDC2}",
-        nfd: "\u{110E}\u{116F}\u{11B9}",
-        nfkc: "\u{CDC2}",
-        nfkd: "\u{110E}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CDC3}",
-        nfc: "\u{CDC3}",
-        nfd: "\u{110E}\u{116F}\u{11BA}",
-        nfkc: "\u{CDC3}",
-        nfkd: "\u{110E}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CDC4}",
-        nfc: "\u{CDC4}",
-        nfd: "\u{110E}\u{116F}\u{11BB}",
-        nfkc: "\u{CDC4}",
-        nfkd: "\u{110E}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CDC5}",
-        nfc: "\u{CDC5}",
-        nfd: "\u{110E}\u{116F}\u{11BC}",
-        nfkc: "\u{CDC5}",
-        nfkd: "\u{110E}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CDC6}",
-        nfc: "\u{CDC6}",
-        nfd: "\u{110E}\u{116F}\u{11BD}",
-        nfkc: "\u{CDC6}",
-        nfkd: "\u{110E}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CDC7}",
-        nfc: "\u{CDC7}",
-        nfd: "\u{110E}\u{116F}\u{11BE}",
-        nfkc: "\u{CDC7}",
-        nfkd: "\u{110E}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CDC8}",
-        nfc: "\u{CDC8}",
-        nfd: "\u{110E}\u{116F}\u{11BF}",
-        nfkc: "\u{CDC8}",
-        nfkd: "\u{110E}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CDC9}",
-        nfc: "\u{CDC9}",
-        nfd: "\u{110E}\u{116F}\u{11C0}",
-        nfkc: "\u{CDC9}",
-        nfkd: "\u{110E}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CDCA}",
-        nfc: "\u{CDCA}",
-        nfd: "\u{110E}\u{116F}\u{11C1}",
-        nfkc: "\u{CDCA}",
-        nfkd: "\u{110E}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CDCB}",
-        nfc: "\u{CDCB}",
-        nfd: "\u{110E}\u{116F}\u{11C2}",
-        nfkc: "\u{CDCB}",
-        nfkd: "\u{110E}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CDCC}",
-        nfc: "\u{CDCC}",
-        nfd: "\u{110E}\u{1170}",
-        nfkc: "\u{CDCC}",
-        nfkd: "\u{110E}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{CDCD}",
-        nfc: "\u{CDCD}",
-        nfd: "\u{110E}\u{1170}\u{11A8}",
-        nfkc: "\u{CDCD}",
-        nfkd: "\u{110E}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CDCE}",
-        nfc: "\u{CDCE}",
-        nfd: "\u{110E}\u{1170}\u{11A9}",
-        nfkc: "\u{CDCE}",
-        nfkd: "\u{110E}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CDCF}",
-        nfc: "\u{CDCF}",
-        nfd: "\u{110E}\u{1170}\u{11AA}",
-        nfkc: "\u{CDCF}",
-        nfkd: "\u{110E}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CDD0}",
-        nfc: "\u{CDD0}",
-        nfd: "\u{110E}\u{1170}\u{11AB}",
-        nfkc: "\u{CDD0}",
-        nfkd: "\u{110E}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CDD1}",
-        nfc: "\u{CDD1}",
-        nfd: "\u{110E}\u{1170}\u{11AC}",
-        nfkc: "\u{CDD1}",
-        nfkd: "\u{110E}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CDD2}",
-        nfc: "\u{CDD2}",
-        nfd: "\u{110E}\u{1170}\u{11AD}",
-        nfkc: "\u{CDD2}",
-        nfkd: "\u{110E}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CDD3}",
-        nfc: "\u{CDD3}",
-        nfd: "\u{110E}\u{1170}\u{11AE}",
-        nfkc: "\u{CDD3}",
-        nfkd: "\u{110E}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CDD4}",
-        nfc: "\u{CDD4}",
-        nfd: "\u{110E}\u{1170}\u{11AF}",
-        nfkc: "\u{CDD4}",
-        nfkd: "\u{110E}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CDD5}",
-        nfc: "\u{CDD5}",
-        nfd: "\u{110E}\u{1170}\u{11B0}",
-        nfkc: "\u{CDD5}",
-        nfkd: "\u{110E}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CDD6}",
-        nfc: "\u{CDD6}",
-        nfd: "\u{110E}\u{1170}\u{11B1}",
-        nfkc: "\u{CDD6}",
-        nfkd: "\u{110E}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CDD7}",
-        nfc: "\u{CDD7}",
-        nfd: "\u{110E}\u{1170}\u{11B2}",
-        nfkc: "\u{CDD7}",
-        nfkd: "\u{110E}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CDD8}",
-        nfc: "\u{CDD8}",
-        nfd: "\u{110E}\u{1170}\u{11B3}",
-        nfkc: "\u{CDD8}",
-        nfkd: "\u{110E}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CDD9}",
-        nfc: "\u{CDD9}",
-        nfd: "\u{110E}\u{1170}\u{11B4}",
-        nfkc: "\u{CDD9}",
-        nfkd: "\u{110E}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CDDA}",
-        nfc: "\u{CDDA}",
-        nfd: "\u{110E}\u{1170}\u{11B5}",
-        nfkc: "\u{CDDA}",
-        nfkd: "\u{110E}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CDDB}",
-        nfc: "\u{CDDB}",
-        nfd: "\u{110E}\u{1170}\u{11B6}",
-        nfkc: "\u{CDDB}",
-        nfkd: "\u{110E}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CDDC}",
-        nfc: "\u{CDDC}",
-        nfd: "\u{110E}\u{1170}\u{11B7}",
-        nfkc: "\u{CDDC}",
-        nfkd: "\u{110E}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CDDD}",
-        nfc: "\u{CDDD}",
-        nfd: "\u{110E}\u{1170}\u{11B8}",
-        nfkc: "\u{CDDD}",
-        nfkd: "\u{110E}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CDDE}",
-        nfc: "\u{CDDE}",
-        nfd: "\u{110E}\u{1170}\u{11B9}",
-        nfkc: "\u{CDDE}",
-        nfkd: "\u{110E}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CDDF}",
-        nfc: "\u{CDDF}",
-        nfd: "\u{110E}\u{1170}\u{11BA}",
-        nfkc: "\u{CDDF}",
-        nfkd: "\u{110E}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CDE0}",
-        nfc: "\u{CDE0}",
-        nfd: "\u{110E}\u{1170}\u{11BB}",
-        nfkc: "\u{CDE0}",
-        nfkd: "\u{110E}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CDE1}",
-        nfc: "\u{CDE1}",
-        nfd: "\u{110E}\u{1170}\u{11BC}",
-        nfkc: "\u{CDE1}",
-        nfkd: "\u{110E}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CDE2}",
-        nfc: "\u{CDE2}",
-        nfd: "\u{110E}\u{1170}\u{11BD}",
-        nfkc: "\u{CDE2}",
-        nfkd: "\u{110E}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CDE3}",
-        nfc: "\u{CDE3}",
-        nfd: "\u{110E}\u{1170}\u{11BE}",
-        nfkc: "\u{CDE3}",
-        nfkd: "\u{110E}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CDE4}",
-        nfc: "\u{CDE4}",
-        nfd: "\u{110E}\u{1170}\u{11BF}",
-        nfkc: "\u{CDE4}",
-        nfkd: "\u{110E}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CDE5}",
-        nfc: "\u{CDE5}",
-        nfd: "\u{110E}\u{1170}\u{11C0}",
-        nfkc: "\u{CDE5}",
-        nfkd: "\u{110E}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CDE6}",
-        nfc: "\u{CDE6}",
-        nfd: "\u{110E}\u{1170}\u{11C1}",
-        nfkc: "\u{CDE6}",
-        nfkd: "\u{110E}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CDE7}",
-        nfc: "\u{CDE7}",
-        nfd: "\u{110E}\u{1170}\u{11C2}",
-        nfkc: "\u{CDE7}",
-        nfkd: "\u{110E}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CDE8}",
-        nfc: "\u{CDE8}",
-        nfd: "\u{110E}\u{1171}",
-        nfkc: "\u{CDE8}",
-        nfkd: "\u{110E}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{CDE9}",
-        nfc: "\u{CDE9}",
-        nfd: "\u{110E}\u{1171}\u{11A8}",
-        nfkc: "\u{CDE9}",
-        nfkd: "\u{110E}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CDEA}",
-        nfc: "\u{CDEA}",
-        nfd: "\u{110E}\u{1171}\u{11A9}",
-        nfkc: "\u{CDEA}",
-        nfkd: "\u{110E}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CDEB}",
-        nfc: "\u{CDEB}",
-        nfd: "\u{110E}\u{1171}\u{11AA}",
-        nfkc: "\u{CDEB}",
-        nfkd: "\u{110E}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CDEC}",
-        nfc: "\u{CDEC}",
-        nfd: "\u{110E}\u{1171}\u{11AB}",
-        nfkc: "\u{CDEC}",
-        nfkd: "\u{110E}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CDED}",
-        nfc: "\u{CDED}",
-        nfd: "\u{110E}\u{1171}\u{11AC}",
-        nfkc: "\u{CDED}",
-        nfkd: "\u{110E}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CDEE}",
-        nfc: "\u{CDEE}",
-        nfd: "\u{110E}\u{1171}\u{11AD}",
-        nfkc: "\u{CDEE}",
-        nfkd: "\u{110E}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CDEF}",
-        nfc: "\u{CDEF}",
-        nfd: "\u{110E}\u{1171}\u{11AE}",
-        nfkc: "\u{CDEF}",
-        nfkd: "\u{110E}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CDF0}",
-        nfc: "\u{CDF0}",
-        nfd: "\u{110E}\u{1171}\u{11AF}",
-        nfkc: "\u{CDF0}",
-        nfkd: "\u{110E}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CDF1}",
-        nfc: "\u{CDF1}",
-        nfd: "\u{110E}\u{1171}\u{11B0}",
-        nfkc: "\u{CDF1}",
-        nfkd: "\u{110E}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CDF2}",
-        nfc: "\u{CDF2}",
-        nfd: "\u{110E}\u{1171}\u{11B1}",
-        nfkc: "\u{CDF2}",
-        nfkd: "\u{110E}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CDF3}",
-        nfc: "\u{CDF3}",
-        nfd: "\u{110E}\u{1171}\u{11B2}",
-        nfkc: "\u{CDF3}",
-        nfkd: "\u{110E}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CDF4}",
-        nfc: "\u{CDF4}",
-        nfd: "\u{110E}\u{1171}\u{11B3}",
-        nfkc: "\u{CDF4}",
-        nfkd: "\u{110E}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CDF5}",
-        nfc: "\u{CDF5}",
-        nfd: "\u{110E}\u{1171}\u{11B4}",
-        nfkc: "\u{CDF5}",
-        nfkd: "\u{110E}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CDF6}",
-        nfc: "\u{CDF6}",
-        nfd: "\u{110E}\u{1171}\u{11B5}",
-        nfkc: "\u{CDF6}",
-        nfkd: "\u{110E}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CDF7}",
-        nfc: "\u{CDF7}",
-        nfd: "\u{110E}\u{1171}\u{11B6}",
-        nfkc: "\u{CDF7}",
-        nfkd: "\u{110E}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CDF8}",
-        nfc: "\u{CDF8}",
-        nfd: "\u{110E}\u{1171}\u{11B7}",
-        nfkc: "\u{CDF8}",
-        nfkd: "\u{110E}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CDF9}",
-        nfc: "\u{CDF9}",
-        nfd: "\u{110E}\u{1171}\u{11B8}",
-        nfkc: "\u{CDF9}",
-        nfkd: "\u{110E}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CDFA}",
-        nfc: "\u{CDFA}",
-        nfd: "\u{110E}\u{1171}\u{11B9}",
-        nfkc: "\u{CDFA}",
-        nfkd: "\u{110E}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CDFB}",
-        nfc: "\u{CDFB}",
-        nfd: "\u{110E}\u{1171}\u{11BA}",
-        nfkc: "\u{CDFB}",
-        nfkd: "\u{110E}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CDFC}",
-        nfc: "\u{CDFC}",
-        nfd: "\u{110E}\u{1171}\u{11BB}",
-        nfkc: "\u{CDFC}",
-        nfkd: "\u{110E}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CDFD}",
-        nfc: "\u{CDFD}",
-        nfd: "\u{110E}\u{1171}\u{11BC}",
-        nfkc: "\u{CDFD}",
-        nfkd: "\u{110E}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CDFE}",
-        nfc: "\u{CDFE}",
-        nfd: "\u{110E}\u{1171}\u{11BD}",
-        nfkc: "\u{CDFE}",
-        nfkd: "\u{110E}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CDFF}",
-        nfc: "\u{CDFF}",
-        nfd: "\u{110E}\u{1171}\u{11BE}",
-        nfkc: "\u{CDFF}",
-        nfkd: "\u{110E}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CE00}",
-        nfc: "\u{CE00}",
-        nfd: "\u{110E}\u{1171}\u{11BF}",
-        nfkc: "\u{CE00}",
-        nfkd: "\u{110E}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CE01}",
-        nfc: "\u{CE01}",
-        nfd: "\u{110E}\u{1171}\u{11C0}",
-        nfkc: "\u{CE01}",
-        nfkd: "\u{110E}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CE02}",
-        nfc: "\u{CE02}",
-        nfd: "\u{110E}\u{1171}\u{11C1}",
-        nfkc: "\u{CE02}",
-        nfkd: "\u{110E}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CE03}",
-        nfc: "\u{CE03}",
-        nfd: "\u{110E}\u{1171}\u{11C2}",
-        nfkc: "\u{CE03}",
-        nfkd: "\u{110E}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CE04}",
-        nfc: "\u{CE04}",
-        nfd: "\u{110E}\u{1172}",
-        nfkc: "\u{CE04}",
-        nfkd: "\u{110E}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{CE05}",
-        nfc: "\u{CE05}",
-        nfd: "\u{110E}\u{1172}\u{11A8}",
-        nfkc: "\u{CE05}",
-        nfkd: "\u{110E}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CE06}",
-        nfc: "\u{CE06}",
-        nfd: "\u{110E}\u{1172}\u{11A9}",
-        nfkc: "\u{CE06}",
-        nfkd: "\u{110E}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CE07}",
-        nfc: "\u{CE07}",
-        nfd: "\u{110E}\u{1172}\u{11AA}",
-        nfkc: "\u{CE07}",
-        nfkd: "\u{110E}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CE08}",
-        nfc: "\u{CE08}",
-        nfd: "\u{110E}\u{1172}\u{11AB}",
-        nfkc: "\u{CE08}",
-        nfkd: "\u{110E}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CE09}",
-        nfc: "\u{CE09}",
-        nfd: "\u{110E}\u{1172}\u{11AC}",
-        nfkc: "\u{CE09}",
-        nfkd: "\u{110E}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CE0A}",
-        nfc: "\u{CE0A}",
-        nfd: "\u{110E}\u{1172}\u{11AD}",
-        nfkc: "\u{CE0A}",
-        nfkd: "\u{110E}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CE0B}",
-        nfc: "\u{CE0B}",
-        nfd: "\u{110E}\u{1172}\u{11AE}",
-        nfkc: "\u{CE0B}",
-        nfkd: "\u{110E}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CE0C}",
-        nfc: "\u{CE0C}",
-        nfd: "\u{110E}\u{1172}\u{11AF}",
-        nfkc: "\u{CE0C}",
-        nfkd: "\u{110E}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CE0D}",
-        nfc: "\u{CE0D}",
-        nfd: "\u{110E}\u{1172}\u{11B0}",
-        nfkc: "\u{CE0D}",
-        nfkd: "\u{110E}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CE0E}",
-        nfc: "\u{CE0E}",
-        nfd: "\u{110E}\u{1172}\u{11B1}",
-        nfkc: "\u{CE0E}",
-        nfkd: "\u{110E}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CE0F}",
-        nfc: "\u{CE0F}",
-        nfd: "\u{110E}\u{1172}\u{11B2}",
-        nfkc: "\u{CE0F}",
-        nfkd: "\u{110E}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CE10}",
-        nfc: "\u{CE10}",
-        nfd: "\u{110E}\u{1172}\u{11B3}",
-        nfkc: "\u{CE10}",
-        nfkd: "\u{110E}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CE11}",
-        nfc: "\u{CE11}",
-        nfd: "\u{110E}\u{1172}\u{11B4}",
-        nfkc: "\u{CE11}",
-        nfkd: "\u{110E}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CE12}",
-        nfc: "\u{CE12}",
-        nfd: "\u{110E}\u{1172}\u{11B5}",
-        nfkc: "\u{CE12}",
-        nfkd: "\u{110E}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CE13}",
-        nfc: "\u{CE13}",
-        nfd: "\u{110E}\u{1172}\u{11B6}",
-        nfkc: "\u{CE13}",
-        nfkd: "\u{110E}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CE14}",
-        nfc: "\u{CE14}",
-        nfd: "\u{110E}\u{1172}\u{11B7}",
-        nfkc: "\u{CE14}",
-        nfkd: "\u{110E}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CE15}",
-        nfc: "\u{CE15}",
-        nfd: "\u{110E}\u{1172}\u{11B8}",
-        nfkc: "\u{CE15}",
-        nfkd: "\u{110E}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CE16}",
-        nfc: "\u{CE16}",
-        nfd: "\u{110E}\u{1172}\u{11B9}",
-        nfkc: "\u{CE16}",
-        nfkd: "\u{110E}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CE17}",
-        nfc: "\u{CE17}",
-        nfd: "\u{110E}\u{1172}\u{11BA}",
-        nfkc: "\u{CE17}",
-        nfkd: "\u{110E}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CE18}",
-        nfc: "\u{CE18}",
-        nfd: "\u{110E}\u{1172}\u{11BB}",
-        nfkc: "\u{CE18}",
-        nfkd: "\u{110E}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CE19}",
-        nfc: "\u{CE19}",
-        nfd: "\u{110E}\u{1172}\u{11BC}",
-        nfkc: "\u{CE19}",
-        nfkd: "\u{110E}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CE1A}",
-        nfc: "\u{CE1A}",
-        nfd: "\u{110E}\u{1172}\u{11BD}",
-        nfkc: "\u{CE1A}",
-        nfkd: "\u{110E}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CE1B}",
-        nfc: "\u{CE1B}",
-        nfd: "\u{110E}\u{1172}\u{11BE}",
-        nfkc: "\u{CE1B}",
-        nfkd: "\u{110E}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CE1C}",
-        nfc: "\u{CE1C}",
-        nfd: "\u{110E}\u{1172}\u{11BF}",
-        nfkc: "\u{CE1C}",
-        nfkd: "\u{110E}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CE1D}",
-        nfc: "\u{CE1D}",
-        nfd: "\u{110E}\u{1172}\u{11C0}",
-        nfkc: "\u{CE1D}",
-        nfkd: "\u{110E}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CE1E}",
-        nfc: "\u{CE1E}",
-        nfd: "\u{110E}\u{1172}\u{11C1}",
-        nfkc: "\u{CE1E}",
-        nfkd: "\u{110E}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CE1F}",
-        nfc: "\u{CE1F}",
-        nfd: "\u{110E}\u{1172}\u{11C2}",
-        nfkc: "\u{CE1F}",
-        nfkd: "\u{110E}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CE20}",
-        nfc: "\u{CE20}",
-        nfd: "\u{110E}\u{1173}",
-        nfkc: "\u{CE20}",
-        nfkd: "\u{110E}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{CE21}",
-        nfc: "\u{CE21}",
-        nfd: "\u{110E}\u{1173}\u{11A8}",
-        nfkc: "\u{CE21}",
-        nfkd: "\u{110E}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CE22}",
-        nfc: "\u{CE22}",
-        nfd: "\u{110E}\u{1173}\u{11A9}",
-        nfkc: "\u{CE22}",
-        nfkd: "\u{110E}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CE23}",
-        nfc: "\u{CE23}",
-        nfd: "\u{110E}\u{1173}\u{11AA}",
-        nfkc: "\u{CE23}",
-        nfkd: "\u{110E}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CE24}",
-        nfc: "\u{CE24}",
-        nfd: "\u{110E}\u{1173}\u{11AB}",
-        nfkc: "\u{CE24}",
-        nfkd: "\u{110E}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CE25}",
-        nfc: "\u{CE25}",
-        nfd: "\u{110E}\u{1173}\u{11AC}",
-        nfkc: "\u{CE25}",
-        nfkd: "\u{110E}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CE26}",
-        nfc: "\u{CE26}",
-        nfd: "\u{110E}\u{1173}\u{11AD}",
-        nfkc: "\u{CE26}",
-        nfkd: "\u{110E}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CE27}",
-        nfc: "\u{CE27}",
-        nfd: "\u{110E}\u{1173}\u{11AE}",
-        nfkc: "\u{CE27}",
-        nfkd: "\u{110E}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CE28}",
-        nfc: "\u{CE28}",
-        nfd: "\u{110E}\u{1173}\u{11AF}",
-        nfkc: "\u{CE28}",
-        nfkd: "\u{110E}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CE29}",
-        nfc: "\u{CE29}",
-        nfd: "\u{110E}\u{1173}\u{11B0}",
-        nfkc: "\u{CE29}",
-        nfkd: "\u{110E}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CE2A}",
-        nfc: "\u{CE2A}",
-        nfd: "\u{110E}\u{1173}\u{11B1}",
-        nfkc: "\u{CE2A}",
-        nfkd: "\u{110E}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CE2B}",
-        nfc: "\u{CE2B}",
-        nfd: "\u{110E}\u{1173}\u{11B2}",
-        nfkc: "\u{CE2B}",
-        nfkd: "\u{110E}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CE2C}",
-        nfc: "\u{CE2C}",
-        nfd: "\u{110E}\u{1173}\u{11B3}",
-        nfkc: "\u{CE2C}",
-        nfkd: "\u{110E}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CE2D}",
-        nfc: "\u{CE2D}",
-        nfd: "\u{110E}\u{1173}\u{11B4}",
-        nfkc: "\u{CE2D}",
-        nfkd: "\u{110E}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CE2E}",
-        nfc: "\u{CE2E}",
-        nfd: "\u{110E}\u{1173}\u{11B5}",
-        nfkc: "\u{CE2E}",
-        nfkd: "\u{110E}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CE2F}",
-        nfc: "\u{CE2F}",
-        nfd: "\u{110E}\u{1173}\u{11B6}",
-        nfkc: "\u{CE2F}",
-        nfkd: "\u{110E}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CE30}",
-        nfc: "\u{CE30}",
-        nfd: "\u{110E}\u{1173}\u{11B7}",
-        nfkc: "\u{CE30}",
-        nfkd: "\u{110E}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CE31}",
-        nfc: "\u{CE31}",
-        nfd: "\u{110E}\u{1173}\u{11B8}",
-        nfkc: "\u{CE31}",
-        nfkd: "\u{110E}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CE32}",
-        nfc: "\u{CE32}",
-        nfd: "\u{110E}\u{1173}\u{11B9}",
-        nfkc: "\u{CE32}",
-        nfkd: "\u{110E}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CE33}",
-        nfc: "\u{CE33}",
-        nfd: "\u{110E}\u{1173}\u{11BA}",
-        nfkc: "\u{CE33}",
-        nfkd: "\u{110E}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CE34}",
-        nfc: "\u{CE34}",
-        nfd: "\u{110E}\u{1173}\u{11BB}",
-        nfkc: "\u{CE34}",
-        nfkd: "\u{110E}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CE35}",
-        nfc: "\u{CE35}",
-        nfd: "\u{110E}\u{1173}\u{11BC}",
-        nfkc: "\u{CE35}",
-        nfkd: "\u{110E}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CE36}",
-        nfc: "\u{CE36}",
-        nfd: "\u{110E}\u{1173}\u{11BD}",
-        nfkc: "\u{CE36}",
-        nfkd: "\u{110E}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CE37}",
-        nfc: "\u{CE37}",
-        nfd: "\u{110E}\u{1173}\u{11BE}",
-        nfkc: "\u{CE37}",
-        nfkd: "\u{110E}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CE38}",
-        nfc: "\u{CE38}",
-        nfd: "\u{110E}\u{1173}\u{11BF}",
-        nfkc: "\u{CE38}",
-        nfkd: "\u{110E}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CE39}",
-        nfc: "\u{CE39}",
-        nfd: "\u{110E}\u{1173}\u{11C0}",
-        nfkc: "\u{CE39}",
-        nfkd: "\u{110E}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CE3A}",
-        nfc: "\u{CE3A}",
-        nfd: "\u{110E}\u{1173}\u{11C1}",
-        nfkc: "\u{CE3A}",
-        nfkd: "\u{110E}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CE3B}",
-        nfc: "\u{CE3B}",
-        nfd: "\u{110E}\u{1173}\u{11C2}",
-        nfkc: "\u{CE3B}",
-        nfkd: "\u{110E}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CE3C}",
-        nfc: "\u{CE3C}",
-        nfd: "\u{110E}\u{1174}",
-        nfkc: "\u{CE3C}",
-        nfkd: "\u{110E}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{CE3D}",
-        nfc: "\u{CE3D}",
-        nfd: "\u{110E}\u{1174}\u{11A8}",
-        nfkc: "\u{CE3D}",
-        nfkd: "\u{110E}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CE3E}",
-        nfc: "\u{CE3E}",
-        nfd: "\u{110E}\u{1174}\u{11A9}",
-        nfkc: "\u{CE3E}",
-        nfkd: "\u{110E}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CE3F}",
-        nfc: "\u{CE3F}",
-        nfd: "\u{110E}\u{1174}\u{11AA}",
-        nfkc: "\u{CE3F}",
-        nfkd: "\u{110E}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CE40}",
-        nfc: "\u{CE40}",
-        nfd: "\u{110E}\u{1174}\u{11AB}",
-        nfkc: "\u{CE40}",
-        nfkd: "\u{110E}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CE41}",
-        nfc: "\u{CE41}",
-        nfd: "\u{110E}\u{1174}\u{11AC}",
-        nfkc: "\u{CE41}",
-        nfkd: "\u{110E}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CE42}",
-        nfc: "\u{CE42}",
-        nfd: "\u{110E}\u{1174}\u{11AD}",
-        nfkc: "\u{CE42}",
-        nfkd: "\u{110E}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CE43}",
-        nfc: "\u{CE43}",
-        nfd: "\u{110E}\u{1174}\u{11AE}",
-        nfkc: "\u{CE43}",
-        nfkd: "\u{110E}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CE44}",
-        nfc: "\u{CE44}",
-        nfd: "\u{110E}\u{1174}\u{11AF}",
-        nfkc: "\u{CE44}",
-        nfkd: "\u{110E}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CE45}",
-        nfc: "\u{CE45}",
-        nfd: "\u{110E}\u{1174}\u{11B0}",
-        nfkc: "\u{CE45}",
-        nfkd: "\u{110E}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CE46}",
-        nfc: "\u{CE46}",
-        nfd: "\u{110E}\u{1174}\u{11B1}",
-        nfkc: "\u{CE46}",
-        nfkd: "\u{110E}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CE47}",
-        nfc: "\u{CE47}",
-        nfd: "\u{110E}\u{1174}\u{11B2}",
-        nfkc: "\u{CE47}",
-        nfkd: "\u{110E}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CE48}",
-        nfc: "\u{CE48}",
-        nfd: "\u{110E}\u{1174}\u{11B3}",
-        nfkc: "\u{CE48}",
-        nfkd: "\u{110E}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CE49}",
-        nfc: "\u{CE49}",
-        nfd: "\u{110E}\u{1174}\u{11B4}",
-        nfkc: "\u{CE49}",
-        nfkd: "\u{110E}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CE4A}",
-        nfc: "\u{CE4A}",
-        nfd: "\u{110E}\u{1174}\u{11B5}",
-        nfkc: "\u{CE4A}",
-        nfkd: "\u{110E}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CE4B}",
-        nfc: "\u{CE4B}",
-        nfd: "\u{110E}\u{1174}\u{11B6}",
-        nfkc: "\u{CE4B}",
-        nfkd: "\u{110E}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CE4C}",
-        nfc: "\u{CE4C}",
-        nfd: "\u{110E}\u{1174}\u{11B7}",
-        nfkc: "\u{CE4C}",
-        nfkd: "\u{110E}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CE4D}",
-        nfc: "\u{CE4D}",
-        nfd: "\u{110E}\u{1174}\u{11B8}",
-        nfkc: "\u{CE4D}",
-        nfkd: "\u{110E}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CE4E}",
-        nfc: "\u{CE4E}",
-        nfd: "\u{110E}\u{1174}\u{11B9}",
-        nfkc: "\u{CE4E}",
-        nfkd: "\u{110E}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CE4F}",
-        nfc: "\u{CE4F}",
-        nfd: "\u{110E}\u{1174}\u{11BA}",
-        nfkc: "\u{CE4F}",
-        nfkd: "\u{110E}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CE50}",
-        nfc: "\u{CE50}",
-        nfd: "\u{110E}\u{1174}\u{11BB}",
-        nfkc: "\u{CE50}",
-        nfkd: "\u{110E}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CE51}",
-        nfc: "\u{CE51}",
-        nfd: "\u{110E}\u{1174}\u{11BC}",
-        nfkc: "\u{CE51}",
-        nfkd: "\u{110E}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CE52}",
-        nfc: "\u{CE52}",
-        nfd: "\u{110E}\u{1174}\u{11BD}",
-        nfkc: "\u{CE52}",
-        nfkd: "\u{110E}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CE53}",
-        nfc: "\u{CE53}",
-        nfd: "\u{110E}\u{1174}\u{11BE}",
-        nfkc: "\u{CE53}",
-        nfkd: "\u{110E}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CE54}",
-        nfc: "\u{CE54}",
-        nfd: "\u{110E}\u{1174}\u{11BF}",
-        nfkc: "\u{CE54}",
-        nfkd: "\u{110E}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CE55}",
-        nfc: "\u{CE55}",
-        nfd: "\u{110E}\u{1174}\u{11C0}",
-        nfkc: "\u{CE55}",
-        nfkd: "\u{110E}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CE56}",
-        nfc: "\u{CE56}",
-        nfd: "\u{110E}\u{1174}\u{11C1}",
-        nfkc: "\u{CE56}",
-        nfkd: "\u{110E}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CE57}",
-        nfc: "\u{CE57}",
-        nfd: "\u{110E}\u{1174}\u{11C2}",
-        nfkc: "\u{CE57}",
-        nfkd: "\u{110E}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CE58}",
-        nfc: "\u{CE58}",
-        nfd: "\u{110E}\u{1175}",
-        nfkc: "\u{CE58}",
-        nfkd: "\u{110E}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{CE59}",
-        nfc: "\u{CE59}",
-        nfd: "\u{110E}\u{1175}\u{11A8}",
-        nfkc: "\u{CE59}",
-        nfkd: "\u{110E}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CE5A}",
-        nfc: "\u{CE5A}",
-        nfd: "\u{110E}\u{1175}\u{11A9}",
-        nfkc: "\u{CE5A}",
-        nfkd: "\u{110E}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CE5B}",
-        nfc: "\u{CE5B}",
-        nfd: "\u{110E}\u{1175}\u{11AA}",
-        nfkc: "\u{CE5B}",
-        nfkd: "\u{110E}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CE5C}",
-        nfc: "\u{CE5C}",
-        nfd: "\u{110E}\u{1175}\u{11AB}",
-        nfkc: "\u{CE5C}",
-        nfkd: "\u{110E}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CE5D}",
-        nfc: "\u{CE5D}",
-        nfd: "\u{110E}\u{1175}\u{11AC}",
-        nfkc: "\u{CE5D}",
-        nfkd: "\u{110E}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CE5E}",
-        nfc: "\u{CE5E}",
-        nfd: "\u{110E}\u{1175}\u{11AD}",
-        nfkc: "\u{CE5E}",
-        nfkd: "\u{110E}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CE5F}",
-        nfc: "\u{CE5F}",
-        nfd: "\u{110E}\u{1175}\u{11AE}",
-        nfkc: "\u{CE5F}",
-        nfkd: "\u{110E}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CE60}",
-        nfc: "\u{CE60}",
-        nfd: "\u{110E}\u{1175}\u{11AF}",
-        nfkc: "\u{CE60}",
-        nfkd: "\u{110E}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CE61}",
-        nfc: "\u{CE61}",
-        nfd: "\u{110E}\u{1175}\u{11B0}",
-        nfkc: "\u{CE61}",
-        nfkd: "\u{110E}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CE62}",
-        nfc: "\u{CE62}",
-        nfd: "\u{110E}\u{1175}\u{11B1}",
-        nfkc: "\u{CE62}",
-        nfkd: "\u{110E}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CE63}",
-        nfc: "\u{CE63}",
-        nfd: "\u{110E}\u{1175}\u{11B2}",
-        nfkc: "\u{CE63}",
-        nfkd: "\u{110E}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CE64}",
-        nfc: "\u{CE64}",
-        nfd: "\u{110E}\u{1175}\u{11B3}",
-        nfkc: "\u{CE64}",
-        nfkd: "\u{110E}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CE65}",
-        nfc: "\u{CE65}",
-        nfd: "\u{110E}\u{1175}\u{11B4}",
-        nfkc: "\u{CE65}",
-        nfkd: "\u{110E}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CE66}",
-        nfc: "\u{CE66}",
-        nfd: "\u{110E}\u{1175}\u{11B5}",
-        nfkc: "\u{CE66}",
-        nfkd: "\u{110E}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CE67}",
-        nfc: "\u{CE67}",
-        nfd: "\u{110E}\u{1175}\u{11B6}",
-        nfkc: "\u{CE67}",
-        nfkd: "\u{110E}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CE68}",
-        nfc: "\u{CE68}",
-        nfd: "\u{110E}\u{1175}\u{11B7}",
-        nfkc: "\u{CE68}",
-        nfkd: "\u{110E}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CE69}",
-        nfc: "\u{CE69}",
-        nfd: "\u{110E}\u{1175}\u{11B8}",
-        nfkc: "\u{CE69}",
-        nfkd: "\u{110E}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CE6A}",
-        nfc: "\u{CE6A}",
-        nfd: "\u{110E}\u{1175}\u{11B9}",
-        nfkc: "\u{CE6A}",
-        nfkd: "\u{110E}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CE6B}",
-        nfc: "\u{CE6B}",
-        nfd: "\u{110E}\u{1175}\u{11BA}",
-        nfkc: "\u{CE6B}",
-        nfkd: "\u{110E}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CE6C}",
-        nfc: "\u{CE6C}",
-        nfd: "\u{110E}\u{1175}\u{11BB}",
-        nfkc: "\u{CE6C}",
-        nfkd: "\u{110E}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CE6D}",
-        nfc: "\u{CE6D}",
-        nfd: "\u{110E}\u{1175}\u{11BC}",
-        nfkc: "\u{CE6D}",
-        nfkd: "\u{110E}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CE6E}",
-        nfc: "\u{CE6E}",
-        nfd: "\u{110E}\u{1175}\u{11BD}",
-        nfkc: "\u{CE6E}",
-        nfkd: "\u{110E}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CE6F}",
-        nfc: "\u{CE6F}",
-        nfd: "\u{110E}\u{1175}\u{11BE}",
-        nfkc: "\u{CE6F}",
-        nfkd: "\u{110E}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CE70}",
-        nfc: "\u{CE70}",
-        nfd: "\u{110E}\u{1175}\u{11BF}",
-        nfkc: "\u{CE70}",
-        nfkd: "\u{110E}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CE71}",
-        nfc: "\u{CE71}",
-        nfd: "\u{110E}\u{1175}\u{11C0}",
-        nfkc: "\u{CE71}",
-        nfkd: "\u{110E}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CE72}",
-        nfc: "\u{CE72}",
-        nfd: "\u{110E}\u{1175}\u{11C1}",
-        nfkc: "\u{CE72}",
-        nfkd: "\u{110E}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CE73}",
-        nfc: "\u{CE73}",
-        nfd: "\u{110E}\u{1175}\u{11C2}",
-        nfkc: "\u{CE73}",
-        nfkd: "\u{110E}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CE74}",
-        nfc: "\u{CE74}",
-        nfd: "\u{110F}\u{1161}",
-        nfkc: "\u{CE74}",
-        nfkd: "\u{110F}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{CE75}",
-        nfc: "\u{CE75}",
-        nfd: "\u{110F}\u{1161}\u{11A8}",
-        nfkc: "\u{CE75}",
-        nfkd: "\u{110F}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CE76}",
-        nfc: "\u{CE76}",
-        nfd: "\u{110F}\u{1161}\u{11A9}",
-        nfkc: "\u{CE76}",
-        nfkd: "\u{110F}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CE77}",
-        nfc: "\u{CE77}",
-        nfd: "\u{110F}\u{1161}\u{11AA}",
-        nfkc: "\u{CE77}",
-        nfkd: "\u{110F}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CE78}",
-        nfc: "\u{CE78}",
-        nfd: "\u{110F}\u{1161}\u{11AB}",
-        nfkc: "\u{CE78}",
-        nfkd: "\u{110F}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CE79}",
-        nfc: "\u{CE79}",
-        nfd: "\u{110F}\u{1161}\u{11AC}",
-        nfkc: "\u{CE79}",
-        nfkd: "\u{110F}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CE7A}",
-        nfc: "\u{CE7A}",
-        nfd: "\u{110F}\u{1161}\u{11AD}",
-        nfkc: "\u{CE7A}",
-        nfkd: "\u{110F}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CE7B}",
-        nfc: "\u{CE7B}",
-        nfd: "\u{110F}\u{1161}\u{11AE}",
-        nfkc: "\u{CE7B}",
-        nfkd: "\u{110F}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CE7C}",
-        nfc: "\u{CE7C}",
-        nfd: "\u{110F}\u{1161}\u{11AF}",
-        nfkc: "\u{CE7C}",
-        nfkd: "\u{110F}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CE7D}",
-        nfc: "\u{CE7D}",
-        nfd: "\u{110F}\u{1161}\u{11B0}",
-        nfkc: "\u{CE7D}",
-        nfkd: "\u{110F}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CE7E}",
-        nfc: "\u{CE7E}",
-        nfd: "\u{110F}\u{1161}\u{11B1}",
-        nfkc: "\u{CE7E}",
-        nfkd: "\u{110F}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CE7F}",
-        nfc: "\u{CE7F}",
-        nfd: "\u{110F}\u{1161}\u{11B2}",
-        nfkc: "\u{CE7F}",
-        nfkd: "\u{110F}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CE80}",
-        nfc: "\u{CE80}",
-        nfd: "\u{110F}\u{1161}\u{11B3}",
-        nfkc: "\u{CE80}",
-        nfkd: "\u{110F}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CE81}",
-        nfc: "\u{CE81}",
-        nfd: "\u{110F}\u{1161}\u{11B4}",
-        nfkc: "\u{CE81}",
-        nfkd: "\u{110F}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CE82}",
-        nfc: "\u{CE82}",
-        nfd: "\u{110F}\u{1161}\u{11B5}",
-        nfkc: "\u{CE82}",
-        nfkd: "\u{110F}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CE83}",
-        nfc: "\u{CE83}",
-        nfd: "\u{110F}\u{1161}\u{11B6}",
-        nfkc: "\u{CE83}",
-        nfkd: "\u{110F}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CE84}",
-        nfc: "\u{CE84}",
-        nfd: "\u{110F}\u{1161}\u{11B7}",
-        nfkc: "\u{CE84}",
-        nfkd: "\u{110F}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CE85}",
-        nfc: "\u{CE85}",
-        nfd: "\u{110F}\u{1161}\u{11B8}",
-        nfkc: "\u{CE85}",
-        nfkd: "\u{110F}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CE86}",
-        nfc: "\u{CE86}",
-        nfd: "\u{110F}\u{1161}\u{11B9}",
-        nfkc: "\u{CE86}",
-        nfkd: "\u{110F}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CE87}",
-        nfc: "\u{CE87}",
-        nfd: "\u{110F}\u{1161}\u{11BA}",
-        nfkc: "\u{CE87}",
-        nfkd: "\u{110F}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CE88}",
-        nfc: "\u{CE88}",
-        nfd: "\u{110F}\u{1161}\u{11BB}",
-        nfkc: "\u{CE88}",
-        nfkd: "\u{110F}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CE89}",
-        nfc: "\u{CE89}",
-        nfd: "\u{110F}\u{1161}\u{11BC}",
-        nfkc: "\u{CE89}",
-        nfkd: "\u{110F}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CE8A}",
-        nfc: "\u{CE8A}",
-        nfd: "\u{110F}\u{1161}\u{11BD}",
-        nfkc: "\u{CE8A}",
-        nfkd: "\u{110F}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CE8B}",
-        nfc: "\u{CE8B}",
-        nfd: "\u{110F}\u{1161}\u{11BE}",
-        nfkc: "\u{CE8B}",
-        nfkd: "\u{110F}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CE8C}",
-        nfc: "\u{CE8C}",
-        nfd: "\u{110F}\u{1161}\u{11BF}",
-        nfkc: "\u{CE8C}",
-        nfkd: "\u{110F}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CE8D}",
-        nfc: "\u{CE8D}",
-        nfd: "\u{110F}\u{1161}\u{11C0}",
-        nfkc: "\u{CE8D}",
-        nfkd: "\u{110F}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CE8E}",
-        nfc: "\u{CE8E}",
-        nfd: "\u{110F}\u{1161}\u{11C1}",
-        nfkc: "\u{CE8E}",
-        nfkd: "\u{110F}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CE8F}",
-        nfc: "\u{CE8F}",
-        nfd: "\u{110F}\u{1161}\u{11C2}",
-        nfkc: "\u{CE8F}",
-        nfkd: "\u{110F}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CE90}",
-        nfc: "\u{CE90}",
-        nfd: "\u{110F}\u{1162}",
-        nfkc: "\u{CE90}",
-        nfkd: "\u{110F}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{CE91}",
-        nfc: "\u{CE91}",
-        nfd: "\u{110F}\u{1162}\u{11A8}",
-        nfkc: "\u{CE91}",
-        nfkd: "\u{110F}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CE92}",
-        nfc: "\u{CE92}",
-        nfd: "\u{110F}\u{1162}\u{11A9}",
-        nfkc: "\u{CE92}",
-        nfkd: "\u{110F}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CE93}",
-        nfc: "\u{CE93}",
-        nfd: "\u{110F}\u{1162}\u{11AA}",
-        nfkc: "\u{CE93}",
-        nfkd: "\u{110F}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CE94}",
-        nfc: "\u{CE94}",
-        nfd: "\u{110F}\u{1162}\u{11AB}",
-        nfkc: "\u{CE94}",
-        nfkd: "\u{110F}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CE95}",
-        nfc: "\u{CE95}",
-        nfd: "\u{110F}\u{1162}\u{11AC}",
-        nfkc: "\u{CE95}",
-        nfkd: "\u{110F}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CE96}",
-        nfc: "\u{CE96}",
-        nfd: "\u{110F}\u{1162}\u{11AD}",
-        nfkc: "\u{CE96}",
-        nfkd: "\u{110F}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CE97}",
-        nfc: "\u{CE97}",
-        nfd: "\u{110F}\u{1162}\u{11AE}",
-        nfkc: "\u{CE97}",
-        nfkd: "\u{110F}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CE98}",
-        nfc: "\u{CE98}",
-        nfd: "\u{110F}\u{1162}\u{11AF}",
-        nfkc: "\u{CE98}",
-        nfkd: "\u{110F}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CE99}",
-        nfc: "\u{CE99}",
-        nfd: "\u{110F}\u{1162}\u{11B0}",
-        nfkc: "\u{CE99}",
-        nfkd: "\u{110F}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CE9A}",
-        nfc: "\u{CE9A}",
-        nfd: "\u{110F}\u{1162}\u{11B1}",
-        nfkc: "\u{CE9A}",
-        nfkd: "\u{110F}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CE9B}",
-        nfc: "\u{CE9B}",
-        nfd: "\u{110F}\u{1162}\u{11B2}",
-        nfkc: "\u{CE9B}",
-        nfkd: "\u{110F}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CE9C}",
-        nfc: "\u{CE9C}",
-        nfd: "\u{110F}\u{1162}\u{11B3}",
-        nfkc: "\u{CE9C}",
-        nfkd: "\u{110F}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CE9D}",
-        nfc: "\u{CE9D}",
-        nfd: "\u{110F}\u{1162}\u{11B4}",
-        nfkc: "\u{CE9D}",
-        nfkd: "\u{110F}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CE9E}",
-        nfc: "\u{CE9E}",
-        nfd: "\u{110F}\u{1162}\u{11B5}",
-        nfkc: "\u{CE9E}",
-        nfkd: "\u{110F}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CE9F}",
-        nfc: "\u{CE9F}",
-        nfd: "\u{110F}\u{1162}\u{11B6}",
-        nfkc: "\u{CE9F}",
-        nfkd: "\u{110F}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CEA0}",
-        nfc: "\u{CEA0}",
-        nfd: "\u{110F}\u{1162}\u{11B7}",
-        nfkc: "\u{CEA0}",
-        nfkd: "\u{110F}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CEA1}",
-        nfc: "\u{CEA1}",
-        nfd: "\u{110F}\u{1162}\u{11B8}",
-        nfkc: "\u{CEA1}",
-        nfkd: "\u{110F}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CEA2}",
-        nfc: "\u{CEA2}",
-        nfd: "\u{110F}\u{1162}\u{11B9}",
-        nfkc: "\u{CEA2}",
-        nfkd: "\u{110F}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CEA3}",
-        nfc: "\u{CEA3}",
-        nfd: "\u{110F}\u{1162}\u{11BA}",
-        nfkc: "\u{CEA3}",
-        nfkd: "\u{110F}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CEA4}",
-        nfc: "\u{CEA4}",
-        nfd: "\u{110F}\u{1162}\u{11BB}",
-        nfkc: "\u{CEA4}",
-        nfkd: "\u{110F}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CEA5}",
-        nfc: "\u{CEA5}",
-        nfd: "\u{110F}\u{1162}\u{11BC}",
-        nfkc: "\u{CEA5}",
-        nfkd: "\u{110F}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CEA6}",
-        nfc: "\u{CEA6}",
-        nfd: "\u{110F}\u{1162}\u{11BD}",
-        nfkc: "\u{CEA6}",
-        nfkd: "\u{110F}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CEA7}",
-        nfc: "\u{CEA7}",
-        nfd: "\u{110F}\u{1162}\u{11BE}",
-        nfkc: "\u{CEA7}",
-        nfkd: "\u{110F}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CEA8}",
-        nfc: "\u{CEA8}",
-        nfd: "\u{110F}\u{1162}\u{11BF}",
-        nfkc: "\u{CEA8}",
-        nfkd: "\u{110F}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CEA9}",
-        nfc: "\u{CEA9}",
-        nfd: "\u{110F}\u{1162}\u{11C0}",
-        nfkc: "\u{CEA9}",
-        nfkd: "\u{110F}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CEAA}",
-        nfc: "\u{CEAA}",
-        nfd: "\u{110F}\u{1162}\u{11C1}",
-        nfkc: "\u{CEAA}",
-        nfkd: "\u{110F}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CEAB}",
-        nfc: "\u{CEAB}",
-        nfd: "\u{110F}\u{1162}\u{11C2}",
-        nfkc: "\u{CEAB}",
-        nfkd: "\u{110F}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CEAC}",
-        nfc: "\u{CEAC}",
-        nfd: "\u{110F}\u{1163}",
-        nfkc: "\u{CEAC}",
-        nfkd: "\u{110F}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{CEAD}",
-        nfc: "\u{CEAD}",
-        nfd: "\u{110F}\u{1163}\u{11A8}",
-        nfkc: "\u{CEAD}",
-        nfkd: "\u{110F}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CEAE}",
-        nfc: "\u{CEAE}",
-        nfd: "\u{110F}\u{1163}\u{11A9}",
-        nfkc: "\u{CEAE}",
-        nfkd: "\u{110F}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CEAF}",
-        nfc: "\u{CEAF}",
-        nfd: "\u{110F}\u{1163}\u{11AA}",
-        nfkc: "\u{CEAF}",
-        nfkd: "\u{110F}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CEB0}",
-        nfc: "\u{CEB0}",
-        nfd: "\u{110F}\u{1163}\u{11AB}",
-        nfkc: "\u{CEB0}",
-        nfkd: "\u{110F}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CEB1}",
-        nfc: "\u{CEB1}",
-        nfd: "\u{110F}\u{1163}\u{11AC}",
-        nfkc: "\u{CEB1}",
-        nfkd: "\u{110F}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CEB2}",
-        nfc: "\u{CEB2}",
-        nfd: "\u{110F}\u{1163}\u{11AD}",
-        nfkc: "\u{CEB2}",
-        nfkd: "\u{110F}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CEB3}",
-        nfc: "\u{CEB3}",
-        nfd: "\u{110F}\u{1163}\u{11AE}",
-        nfkc: "\u{CEB3}",
-        nfkd: "\u{110F}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CEB4}",
-        nfc: "\u{CEB4}",
-        nfd: "\u{110F}\u{1163}\u{11AF}",
-        nfkc: "\u{CEB4}",
-        nfkd: "\u{110F}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CEB5}",
-        nfc: "\u{CEB5}",
-        nfd: "\u{110F}\u{1163}\u{11B0}",
-        nfkc: "\u{CEB5}",
-        nfkd: "\u{110F}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CEB6}",
-        nfc: "\u{CEB6}",
-        nfd: "\u{110F}\u{1163}\u{11B1}",
-        nfkc: "\u{CEB6}",
-        nfkd: "\u{110F}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CEB7}",
-        nfc: "\u{CEB7}",
-        nfd: "\u{110F}\u{1163}\u{11B2}",
-        nfkc: "\u{CEB7}",
-        nfkd: "\u{110F}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CEB8}",
-        nfc: "\u{CEB8}",
-        nfd: "\u{110F}\u{1163}\u{11B3}",
-        nfkc: "\u{CEB8}",
-        nfkd: "\u{110F}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CEB9}",
-        nfc: "\u{CEB9}",
-        nfd: "\u{110F}\u{1163}\u{11B4}",
-        nfkc: "\u{CEB9}",
-        nfkd: "\u{110F}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CEBA}",
-        nfc: "\u{CEBA}",
-        nfd: "\u{110F}\u{1163}\u{11B5}",
-        nfkc: "\u{CEBA}",
-        nfkd: "\u{110F}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CEBB}",
-        nfc: "\u{CEBB}",
-        nfd: "\u{110F}\u{1163}\u{11B6}",
-        nfkc: "\u{CEBB}",
-        nfkd: "\u{110F}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CEBC}",
-        nfc: "\u{CEBC}",
-        nfd: "\u{110F}\u{1163}\u{11B7}",
-        nfkc: "\u{CEBC}",
-        nfkd: "\u{110F}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CEBD}",
-        nfc: "\u{CEBD}",
-        nfd: "\u{110F}\u{1163}\u{11B8}",
-        nfkc: "\u{CEBD}",
-        nfkd: "\u{110F}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CEBE}",
-        nfc: "\u{CEBE}",
-        nfd: "\u{110F}\u{1163}\u{11B9}",
-        nfkc: "\u{CEBE}",
-        nfkd: "\u{110F}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CEBF}",
-        nfc: "\u{CEBF}",
-        nfd: "\u{110F}\u{1163}\u{11BA}",
-        nfkc: "\u{CEBF}",
-        nfkd: "\u{110F}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CEC0}",
-        nfc: "\u{CEC0}",
-        nfd: "\u{110F}\u{1163}\u{11BB}",
-        nfkc: "\u{CEC0}",
-        nfkd: "\u{110F}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CEC1}",
-        nfc: "\u{CEC1}",
-        nfd: "\u{110F}\u{1163}\u{11BC}",
-        nfkc: "\u{CEC1}",
-        nfkd: "\u{110F}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CEC2}",
-        nfc: "\u{CEC2}",
-        nfd: "\u{110F}\u{1163}\u{11BD}",
-        nfkc: "\u{CEC2}",
-        nfkd: "\u{110F}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CEC3}",
-        nfc: "\u{CEC3}",
-        nfd: "\u{110F}\u{1163}\u{11BE}",
-        nfkc: "\u{CEC3}",
-        nfkd: "\u{110F}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CEC4}",
-        nfc: "\u{CEC4}",
-        nfd: "\u{110F}\u{1163}\u{11BF}",
-        nfkc: "\u{CEC4}",
-        nfkd: "\u{110F}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CEC5}",
-        nfc: "\u{CEC5}",
-        nfd: "\u{110F}\u{1163}\u{11C0}",
-        nfkc: "\u{CEC5}",
-        nfkd: "\u{110F}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CEC6}",
-        nfc: "\u{CEC6}",
-        nfd: "\u{110F}\u{1163}\u{11C1}",
-        nfkc: "\u{CEC6}",
-        nfkd: "\u{110F}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CEC7}",
-        nfc: "\u{CEC7}",
-        nfd: "\u{110F}\u{1163}\u{11C2}",
-        nfkc: "\u{CEC7}",
-        nfkd: "\u{110F}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CEC8}",
-        nfc: "\u{CEC8}",
-        nfd: "\u{110F}\u{1164}",
-        nfkc: "\u{CEC8}",
-        nfkd: "\u{110F}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{CEC9}",
-        nfc: "\u{CEC9}",
-        nfd: "\u{110F}\u{1164}\u{11A8}",
-        nfkc: "\u{CEC9}",
-        nfkd: "\u{110F}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CECA}",
-        nfc: "\u{CECA}",
-        nfd: "\u{110F}\u{1164}\u{11A9}",
-        nfkc: "\u{CECA}",
-        nfkd: "\u{110F}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CECB}",
-        nfc: "\u{CECB}",
-        nfd: "\u{110F}\u{1164}\u{11AA}",
-        nfkc: "\u{CECB}",
-        nfkd: "\u{110F}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CECC}",
-        nfc: "\u{CECC}",
-        nfd: "\u{110F}\u{1164}\u{11AB}",
-        nfkc: "\u{CECC}",
-        nfkd: "\u{110F}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CECD}",
-        nfc: "\u{CECD}",
-        nfd: "\u{110F}\u{1164}\u{11AC}",
-        nfkc: "\u{CECD}",
-        nfkd: "\u{110F}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CECE}",
-        nfc: "\u{CECE}",
-        nfd: "\u{110F}\u{1164}\u{11AD}",
-        nfkc: "\u{CECE}",
-        nfkd: "\u{110F}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CECF}",
-        nfc: "\u{CECF}",
-        nfd: "\u{110F}\u{1164}\u{11AE}",
-        nfkc: "\u{CECF}",
-        nfkd: "\u{110F}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CED0}",
-        nfc: "\u{CED0}",
-        nfd: "\u{110F}\u{1164}\u{11AF}",
-        nfkc: "\u{CED0}",
-        nfkd: "\u{110F}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CED1}",
-        nfc: "\u{CED1}",
-        nfd: "\u{110F}\u{1164}\u{11B0}",
-        nfkc: "\u{CED1}",
-        nfkd: "\u{110F}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CED2}",
-        nfc: "\u{CED2}",
-        nfd: "\u{110F}\u{1164}\u{11B1}",
-        nfkc: "\u{CED2}",
-        nfkd: "\u{110F}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CED3}",
-        nfc: "\u{CED3}",
-        nfd: "\u{110F}\u{1164}\u{11B2}",
-        nfkc: "\u{CED3}",
-        nfkd: "\u{110F}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CED4}",
-        nfc: "\u{CED4}",
-        nfd: "\u{110F}\u{1164}\u{11B3}",
-        nfkc: "\u{CED4}",
-        nfkd: "\u{110F}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CED5}",
-        nfc: "\u{CED5}",
-        nfd: "\u{110F}\u{1164}\u{11B4}",
-        nfkc: "\u{CED5}",
-        nfkd: "\u{110F}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CED6}",
-        nfc: "\u{CED6}",
-        nfd: "\u{110F}\u{1164}\u{11B5}",
-        nfkc: "\u{CED6}",
-        nfkd: "\u{110F}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CED7}",
-        nfc: "\u{CED7}",
-        nfd: "\u{110F}\u{1164}\u{11B6}",
-        nfkc: "\u{CED7}",
-        nfkd: "\u{110F}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CED8}",
-        nfc: "\u{CED8}",
-        nfd: "\u{110F}\u{1164}\u{11B7}",
-        nfkc: "\u{CED8}",
-        nfkd: "\u{110F}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CED9}",
-        nfc: "\u{CED9}",
-        nfd: "\u{110F}\u{1164}\u{11B8}",
-        nfkc: "\u{CED9}",
-        nfkd: "\u{110F}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CEDA}",
-        nfc: "\u{CEDA}",
-        nfd: "\u{110F}\u{1164}\u{11B9}",
-        nfkc: "\u{CEDA}",
-        nfkd: "\u{110F}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CEDB}",
-        nfc: "\u{CEDB}",
-        nfd: "\u{110F}\u{1164}\u{11BA}",
-        nfkc: "\u{CEDB}",
-        nfkd: "\u{110F}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CEDC}",
-        nfc: "\u{CEDC}",
-        nfd: "\u{110F}\u{1164}\u{11BB}",
-        nfkc: "\u{CEDC}",
-        nfkd: "\u{110F}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CEDD}",
-        nfc: "\u{CEDD}",
-        nfd: "\u{110F}\u{1164}\u{11BC}",
-        nfkc: "\u{CEDD}",
-        nfkd: "\u{110F}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CEDE}",
-        nfc: "\u{CEDE}",
-        nfd: "\u{110F}\u{1164}\u{11BD}",
-        nfkc: "\u{CEDE}",
-        nfkd: "\u{110F}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CEDF}",
-        nfc: "\u{CEDF}",
-        nfd: "\u{110F}\u{1164}\u{11BE}",
-        nfkc: "\u{CEDF}",
-        nfkd: "\u{110F}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CEE0}",
-        nfc: "\u{CEE0}",
-        nfd: "\u{110F}\u{1164}\u{11BF}",
-        nfkc: "\u{CEE0}",
-        nfkd: "\u{110F}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CEE1}",
-        nfc: "\u{CEE1}",
-        nfd: "\u{110F}\u{1164}\u{11C0}",
-        nfkc: "\u{CEE1}",
-        nfkd: "\u{110F}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CEE2}",
-        nfc: "\u{CEE2}",
-        nfd: "\u{110F}\u{1164}\u{11C1}",
-        nfkc: "\u{CEE2}",
-        nfkd: "\u{110F}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CEE3}",
-        nfc: "\u{CEE3}",
-        nfd: "\u{110F}\u{1164}\u{11C2}",
-        nfkc: "\u{CEE3}",
-        nfkd: "\u{110F}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CEE4}",
-        nfc: "\u{CEE4}",
-        nfd: "\u{110F}\u{1165}",
-        nfkc: "\u{CEE4}",
-        nfkd: "\u{110F}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{CEE5}",
-        nfc: "\u{CEE5}",
-        nfd: "\u{110F}\u{1165}\u{11A8}",
-        nfkc: "\u{CEE5}",
-        nfkd: "\u{110F}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CEE6}",
-        nfc: "\u{CEE6}",
-        nfd: "\u{110F}\u{1165}\u{11A9}",
-        nfkc: "\u{CEE6}",
-        nfkd: "\u{110F}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CEE7}",
-        nfc: "\u{CEE7}",
-        nfd: "\u{110F}\u{1165}\u{11AA}",
-        nfkc: "\u{CEE7}",
-        nfkd: "\u{110F}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CEE8}",
-        nfc: "\u{CEE8}",
-        nfd: "\u{110F}\u{1165}\u{11AB}",
-        nfkc: "\u{CEE8}",
-        nfkd: "\u{110F}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CEE9}",
-        nfc: "\u{CEE9}",
-        nfd: "\u{110F}\u{1165}\u{11AC}",
-        nfkc: "\u{CEE9}",
-        nfkd: "\u{110F}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CEEA}",
-        nfc: "\u{CEEA}",
-        nfd: "\u{110F}\u{1165}\u{11AD}",
-        nfkc: "\u{CEEA}",
-        nfkd: "\u{110F}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CEEB}",
-        nfc: "\u{CEEB}",
-        nfd: "\u{110F}\u{1165}\u{11AE}",
-        nfkc: "\u{CEEB}",
-        nfkd: "\u{110F}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CEEC}",
-        nfc: "\u{CEEC}",
-        nfd: "\u{110F}\u{1165}\u{11AF}",
-        nfkc: "\u{CEEC}",
-        nfkd: "\u{110F}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CEED}",
-        nfc: "\u{CEED}",
-        nfd: "\u{110F}\u{1165}\u{11B0}",
-        nfkc: "\u{CEED}",
-        nfkd: "\u{110F}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CEEE}",
-        nfc: "\u{CEEE}",
-        nfd: "\u{110F}\u{1165}\u{11B1}",
-        nfkc: "\u{CEEE}",
-        nfkd: "\u{110F}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CEEF}",
-        nfc: "\u{CEEF}",
-        nfd: "\u{110F}\u{1165}\u{11B2}",
-        nfkc: "\u{CEEF}",
-        nfkd: "\u{110F}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CEF0}",
-        nfc: "\u{CEF0}",
-        nfd: "\u{110F}\u{1165}\u{11B3}",
-        nfkc: "\u{CEF0}",
-        nfkd: "\u{110F}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CEF1}",
-        nfc: "\u{CEF1}",
-        nfd: "\u{110F}\u{1165}\u{11B4}",
-        nfkc: "\u{CEF1}",
-        nfkd: "\u{110F}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CEF2}",
-        nfc: "\u{CEF2}",
-        nfd: "\u{110F}\u{1165}\u{11B5}",
-        nfkc: "\u{CEF2}",
-        nfkd: "\u{110F}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CEF3}",
-        nfc: "\u{CEF3}",
-        nfd: "\u{110F}\u{1165}\u{11B6}",
-        nfkc: "\u{CEF3}",
-        nfkd: "\u{110F}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CEF4}",
-        nfc: "\u{CEF4}",
-        nfd: "\u{110F}\u{1165}\u{11B7}",
-        nfkc: "\u{CEF4}",
-        nfkd: "\u{110F}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CEF5}",
-        nfc: "\u{CEF5}",
-        nfd: "\u{110F}\u{1165}\u{11B8}",
-        nfkc: "\u{CEF5}",
-        nfkd: "\u{110F}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CEF6}",
-        nfc: "\u{CEF6}",
-        nfd: "\u{110F}\u{1165}\u{11B9}",
-        nfkc: "\u{CEF6}",
-        nfkd: "\u{110F}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CEF7}",
-        nfc: "\u{CEF7}",
-        nfd: "\u{110F}\u{1165}\u{11BA}",
-        nfkc: "\u{CEF7}",
-        nfkd: "\u{110F}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CEF8}",
-        nfc: "\u{CEF8}",
-        nfd: "\u{110F}\u{1165}\u{11BB}",
-        nfkc: "\u{CEF8}",
-        nfkd: "\u{110F}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CEF9}",
-        nfc: "\u{CEF9}",
-        nfd: "\u{110F}\u{1165}\u{11BC}",
-        nfkc: "\u{CEF9}",
-        nfkd: "\u{110F}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CEFA}",
-        nfc: "\u{CEFA}",
-        nfd: "\u{110F}\u{1165}\u{11BD}",
-        nfkc: "\u{CEFA}",
-        nfkd: "\u{110F}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CEFB}",
-        nfc: "\u{CEFB}",
-        nfd: "\u{110F}\u{1165}\u{11BE}",
-        nfkc: "\u{CEFB}",
-        nfkd: "\u{110F}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CEFC}",
-        nfc: "\u{CEFC}",
-        nfd: "\u{110F}\u{1165}\u{11BF}",
-        nfkc: "\u{CEFC}",
-        nfkd: "\u{110F}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CEFD}",
-        nfc: "\u{CEFD}",
-        nfd: "\u{110F}\u{1165}\u{11C0}",
-        nfkc: "\u{CEFD}",
-        nfkd: "\u{110F}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CEFE}",
-        nfc: "\u{CEFE}",
-        nfd: "\u{110F}\u{1165}\u{11C1}",
-        nfkc: "\u{CEFE}",
-        nfkd: "\u{110F}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CEFF}",
-        nfc: "\u{CEFF}",
-        nfd: "\u{110F}\u{1165}\u{11C2}",
-        nfkc: "\u{CEFF}",
-        nfkd: "\u{110F}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CF00}",
-        nfc: "\u{CF00}",
-        nfd: "\u{110F}\u{1166}",
-        nfkc: "\u{CF00}",
-        nfkd: "\u{110F}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{CF01}",
-        nfc: "\u{CF01}",
-        nfd: "\u{110F}\u{1166}\u{11A8}",
-        nfkc: "\u{CF01}",
-        nfkd: "\u{110F}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CF02}",
-        nfc: "\u{CF02}",
-        nfd: "\u{110F}\u{1166}\u{11A9}",
-        nfkc: "\u{CF02}",
-        nfkd: "\u{110F}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CF03}",
-        nfc: "\u{CF03}",
-        nfd: "\u{110F}\u{1166}\u{11AA}",
-        nfkc: "\u{CF03}",
-        nfkd: "\u{110F}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CF04}",
-        nfc: "\u{CF04}",
-        nfd: "\u{110F}\u{1166}\u{11AB}",
-        nfkc: "\u{CF04}",
-        nfkd: "\u{110F}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CF05}",
-        nfc: "\u{CF05}",
-        nfd: "\u{110F}\u{1166}\u{11AC}",
-        nfkc: "\u{CF05}",
-        nfkd: "\u{110F}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CF06}",
-        nfc: "\u{CF06}",
-        nfd: "\u{110F}\u{1166}\u{11AD}",
-        nfkc: "\u{CF06}",
-        nfkd: "\u{110F}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CF07}",
-        nfc: "\u{CF07}",
-        nfd: "\u{110F}\u{1166}\u{11AE}",
-        nfkc: "\u{CF07}",
-        nfkd: "\u{110F}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CF08}",
-        nfc: "\u{CF08}",
-        nfd: "\u{110F}\u{1166}\u{11AF}",
-        nfkc: "\u{CF08}",
-        nfkd: "\u{110F}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CF09}",
-        nfc: "\u{CF09}",
-        nfd: "\u{110F}\u{1166}\u{11B0}",
-        nfkc: "\u{CF09}",
-        nfkd: "\u{110F}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CF0A}",
-        nfc: "\u{CF0A}",
-        nfd: "\u{110F}\u{1166}\u{11B1}",
-        nfkc: "\u{CF0A}",
-        nfkd: "\u{110F}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CF0B}",
-        nfc: "\u{CF0B}",
-        nfd: "\u{110F}\u{1166}\u{11B2}",
-        nfkc: "\u{CF0B}",
-        nfkd: "\u{110F}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CF0C}",
-        nfc: "\u{CF0C}",
-        nfd: "\u{110F}\u{1166}\u{11B3}",
-        nfkc: "\u{CF0C}",
-        nfkd: "\u{110F}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CF0D}",
-        nfc: "\u{CF0D}",
-        nfd: "\u{110F}\u{1166}\u{11B4}",
-        nfkc: "\u{CF0D}",
-        nfkd: "\u{110F}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CF0E}",
-        nfc: "\u{CF0E}",
-        nfd: "\u{110F}\u{1166}\u{11B5}",
-        nfkc: "\u{CF0E}",
-        nfkd: "\u{110F}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF0F}",
-        nfc: "\u{CF0F}",
-        nfd: "\u{110F}\u{1166}\u{11B6}",
-        nfkc: "\u{CF0F}",
-        nfkd: "\u{110F}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CF10}",
-        nfc: "\u{CF10}",
-        nfd: "\u{110F}\u{1166}\u{11B7}",
-        nfkc: "\u{CF10}",
-        nfkd: "\u{110F}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CF11}",
-        nfc: "\u{CF11}",
-        nfd: "\u{110F}\u{1166}\u{11B8}",
-        nfkc: "\u{CF11}",
-        nfkd: "\u{110F}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CF12}",
-        nfc: "\u{CF12}",
-        nfd: "\u{110F}\u{1166}\u{11B9}",
-        nfkc: "\u{CF12}",
-        nfkd: "\u{110F}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CF13}",
-        nfc: "\u{CF13}",
-        nfd: "\u{110F}\u{1166}\u{11BA}",
-        nfkc: "\u{CF13}",
-        nfkd: "\u{110F}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CF14}",
-        nfc: "\u{CF14}",
-        nfd: "\u{110F}\u{1166}\u{11BB}",
-        nfkc: "\u{CF14}",
-        nfkd: "\u{110F}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CF15}",
-        nfc: "\u{CF15}",
-        nfd: "\u{110F}\u{1166}\u{11BC}",
-        nfkc: "\u{CF15}",
-        nfkd: "\u{110F}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CF16}",
-        nfc: "\u{CF16}",
-        nfd: "\u{110F}\u{1166}\u{11BD}",
-        nfkc: "\u{CF16}",
-        nfkd: "\u{110F}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CF17}",
-        nfc: "\u{CF17}",
-        nfd: "\u{110F}\u{1166}\u{11BE}",
-        nfkc: "\u{CF17}",
-        nfkd: "\u{110F}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CF18}",
-        nfc: "\u{CF18}",
-        nfd: "\u{110F}\u{1166}\u{11BF}",
-        nfkc: "\u{CF18}",
-        nfkd: "\u{110F}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CF19}",
-        nfc: "\u{CF19}",
-        nfd: "\u{110F}\u{1166}\u{11C0}",
-        nfkc: "\u{CF19}",
-        nfkd: "\u{110F}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CF1A}",
-        nfc: "\u{CF1A}",
-        nfd: "\u{110F}\u{1166}\u{11C1}",
-        nfkc: "\u{CF1A}",
-        nfkd: "\u{110F}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CF1B}",
-        nfc: "\u{CF1B}",
-        nfd: "\u{110F}\u{1166}\u{11C2}",
-        nfkc: "\u{CF1B}",
-        nfkd: "\u{110F}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CF1C}",
-        nfc: "\u{CF1C}",
-        nfd: "\u{110F}\u{1167}",
-        nfkc: "\u{CF1C}",
-        nfkd: "\u{110F}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{CF1D}",
-        nfc: "\u{CF1D}",
-        nfd: "\u{110F}\u{1167}\u{11A8}",
-        nfkc: "\u{CF1D}",
-        nfkd: "\u{110F}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CF1E}",
-        nfc: "\u{CF1E}",
-        nfd: "\u{110F}\u{1167}\u{11A9}",
-        nfkc: "\u{CF1E}",
-        nfkd: "\u{110F}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CF1F}",
-        nfc: "\u{CF1F}",
-        nfd: "\u{110F}\u{1167}\u{11AA}",
-        nfkc: "\u{CF1F}",
-        nfkd: "\u{110F}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CF20}",
-        nfc: "\u{CF20}",
-        nfd: "\u{110F}\u{1167}\u{11AB}",
-        nfkc: "\u{CF20}",
-        nfkd: "\u{110F}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CF21}",
-        nfc: "\u{CF21}",
-        nfd: "\u{110F}\u{1167}\u{11AC}",
-        nfkc: "\u{CF21}",
-        nfkd: "\u{110F}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CF22}",
-        nfc: "\u{CF22}",
-        nfd: "\u{110F}\u{1167}\u{11AD}",
-        nfkc: "\u{CF22}",
-        nfkd: "\u{110F}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CF23}",
-        nfc: "\u{CF23}",
-        nfd: "\u{110F}\u{1167}\u{11AE}",
-        nfkc: "\u{CF23}",
-        nfkd: "\u{110F}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CF24}",
-        nfc: "\u{CF24}",
-        nfd: "\u{110F}\u{1167}\u{11AF}",
-        nfkc: "\u{CF24}",
-        nfkd: "\u{110F}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CF25}",
-        nfc: "\u{CF25}",
-        nfd: "\u{110F}\u{1167}\u{11B0}",
-        nfkc: "\u{CF25}",
-        nfkd: "\u{110F}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CF26}",
-        nfc: "\u{CF26}",
-        nfd: "\u{110F}\u{1167}\u{11B1}",
-        nfkc: "\u{CF26}",
-        nfkd: "\u{110F}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CF27}",
-        nfc: "\u{CF27}",
-        nfd: "\u{110F}\u{1167}\u{11B2}",
-        nfkc: "\u{CF27}",
-        nfkd: "\u{110F}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CF28}",
-        nfc: "\u{CF28}",
-        nfd: "\u{110F}\u{1167}\u{11B3}",
-        nfkc: "\u{CF28}",
-        nfkd: "\u{110F}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CF29}",
-        nfc: "\u{CF29}",
-        nfd: "\u{110F}\u{1167}\u{11B4}",
-        nfkc: "\u{CF29}",
-        nfkd: "\u{110F}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CF2A}",
-        nfc: "\u{CF2A}",
-        nfd: "\u{110F}\u{1167}\u{11B5}",
-        nfkc: "\u{CF2A}",
-        nfkd: "\u{110F}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF2B}",
-        nfc: "\u{CF2B}",
-        nfd: "\u{110F}\u{1167}\u{11B6}",
-        nfkc: "\u{CF2B}",
-        nfkd: "\u{110F}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CF2C}",
-        nfc: "\u{CF2C}",
-        nfd: "\u{110F}\u{1167}\u{11B7}",
-        nfkc: "\u{CF2C}",
-        nfkd: "\u{110F}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CF2D}",
-        nfc: "\u{CF2D}",
-        nfd: "\u{110F}\u{1167}\u{11B8}",
-        nfkc: "\u{CF2D}",
-        nfkd: "\u{110F}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CF2E}",
-        nfc: "\u{CF2E}",
-        nfd: "\u{110F}\u{1167}\u{11B9}",
-        nfkc: "\u{CF2E}",
-        nfkd: "\u{110F}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CF2F}",
-        nfc: "\u{CF2F}",
-        nfd: "\u{110F}\u{1167}\u{11BA}",
-        nfkc: "\u{CF2F}",
-        nfkd: "\u{110F}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CF30}",
-        nfc: "\u{CF30}",
-        nfd: "\u{110F}\u{1167}\u{11BB}",
-        nfkc: "\u{CF30}",
-        nfkd: "\u{110F}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CF31}",
-        nfc: "\u{CF31}",
-        nfd: "\u{110F}\u{1167}\u{11BC}",
-        nfkc: "\u{CF31}",
-        nfkd: "\u{110F}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CF32}",
-        nfc: "\u{CF32}",
-        nfd: "\u{110F}\u{1167}\u{11BD}",
-        nfkc: "\u{CF32}",
-        nfkd: "\u{110F}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CF33}",
-        nfc: "\u{CF33}",
-        nfd: "\u{110F}\u{1167}\u{11BE}",
-        nfkc: "\u{CF33}",
-        nfkd: "\u{110F}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CF34}",
-        nfc: "\u{CF34}",
-        nfd: "\u{110F}\u{1167}\u{11BF}",
-        nfkc: "\u{CF34}",
-        nfkd: "\u{110F}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CF35}",
-        nfc: "\u{CF35}",
-        nfd: "\u{110F}\u{1167}\u{11C0}",
-        nfkc: "\u{CF35}",
-        nfkd: "\u{110F}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CF36}",
-        nfc: "\u{CF36}",
-        nfd: "\u{110F}\u{1167}\u{11C1}",
-        nfkc: "\u{CF36}",
-        nfkd: "\u{110F}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CF37}",
-        nfc: "\u{CF37}",
-        nfd: "\u{110F}\u{1167}\u{11C2}",
-        nfkc: "\u{CF37}",
-        nfkd: "\u{110F}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CF38}",
-        nfc: "\u{CF38}",
-        nfd: "\u{110F}\u{1168}",
-        nfkc: "\u{CF38}",
-        nfkd: "\u{110F}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{CF39}",
-        nfc: "\u{CF39}",
-        nfd: "\u{110F}\u{1168}\u{11A8}",
-        nfkc: "\u{CF39}",
-        nfkd: "\u{110F}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CF3A}",
-        nfc: "\u{CF3A}",
-        nfd: "\u{110F}\u{1168}\u{11A9}",
-        nfkc: "\u{CF3A}",
-        nfkd: "\u{110F}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CF3B}",
-        nfc: "\u{CF3B}",
-        nfd: "\u{110F}\u{1168}\u{11AA}",
-        nfkc: "\u{CF3B}",
-        nfkd: "\u{110F}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CF3C}",
-        nfc: "\u{CF3C}",
-        nfd: "\u{110F}\u{1168}\u{11AB}",
-        nfkc: "\u{CF3C}",
-        nfkd: "\u{110F}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CF3D}",
-        nfc: "\u{CF3D}",
-        nfd: "\u{110F}\u{1168}\u{11AC}",
-        nfkc: "\u{CF3D}",
-        nfkd: "\u{110F}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CF3E}",
-        nfc: "\u{CF3E}",
-        nfd: "\u{110F}\u{1168}\u{11AD}",
-        nfkc: "\u{CF3E}",
-        nfkd: "\u{110F}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CF3F}",
-        nfc: "\u{CF3F}",
-        nfd: "\u{110F}\u{1168}\u{11AE}",
-        nfkc: "\u{CF3F}",
-        nfkd: "\u{110F}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CF40}",
-        nfc: "\u{CF40}",
-        nfd: "\u{110F}\u{1168}\u{11AF}",
-        nfkc: "\u{CF40}",
-        nfkd: "\u{110F}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CF41}",
-        nfc: "\u{CF41}",
-        nfd: "\u{110F}\u{1168}\u{11B0}",
-        nfkc: "\u{CF41}",
-        nfkd: "\u{110F}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CF42}",
-        nfc: "\u{CF42}",
-        nfd: "\u{110F}\u{1168}\u{11B1}",
-        nfkc: "\u{CF42}",
-        nfkd: "\u{110F}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CF43}",
-        nfc: "\u{CF43}",
-        nfd: "\u{110F}\u{1168}\u{11B2}",
-        nfkc: "\u{CF43}",
-        nfkd: "\u{110F}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CF44}",
-        nfc: "\u{CF44}",
-        nfd: "\u{110F}\u{1168}\u{11B3}",
-        nfkc: "\u{CF44}",
-        nfkd: "\u{110F}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CF45}",
-        nfc: "\u{CF45}",
-        nfd: "\u{110F}\u{1168}\u{11B4}",
-        nfkc: "\u{CF45}",
-        nfkd: "\u{110F}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CF46}",
-        nfc: "\u{CF46}",
-        nfd: "\u{110F}\u{1168}\u{11B5}",
-        nfkc: "\u{CF46}",
-        nfkd: "\u{110F}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF47}",
-        nfc: "\u{CF47}",
-        nfd: "\u{110F}\u{1168}\u{11B6}",
-        nfkc: "\u{CF47}",
-        nfkd: "\u{110F}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CF48}",
-        nfc: "\u{CF48}",
-        nfd: "\u{110F}\u{1168}\u{11B7}",
-        nfkc: "\u{CF48}",
-        nfkd: "\u{110F}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CF49}",
-        nfc: "\u{CF49}",
-        nfd: "\u{110F}\u{1168}\u{11B8}",
-        nfkc: "\u{CF49}",
-        nfkd: "\u{110F}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CF4A}",
-        nfc: "\u{CF4A}",
-        nfd: "\u{110F}\u{1168}\u{11B9}",
-        nfkc: "\u{CF4A}",
-        nfkd: "\u{110F}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CF4B}",
-        nfc: "\u{CF4B}",
-        nfd: "\u{110F}\u{1168}\u{11BA}",
-        nfkc: "\u{CF4B}",
-        nfkd: "\u{110F}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CF4C}",
-        nfc: "\u{CF4C}",
-        nfd: "\u{110F}\u{1168}\u{11BB}",
-        nfkc: "\u{CF4C}",
-        nfkd: "\u{110F}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CF4D}",
-        nfc: "\u{CF4D}",
-        nfd: "\u{110F}\u{1168}\u{11BC}",
-        nfkc: "\u{CF4D}",
-        nfkd: "\u{110F}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CF4E}",
-        nfc: "\u{CF4E}",
-        nfd: "\u{110F}\u{1168}\u{11BD}",
-        nfkc: "\u{CF4E}",
-        nfkd: "\u{110F}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CF4F}",
-        nfc: "\u{CF4F}",
-        nfd: "\u{110F}\u{1168}\u{11BE}",
-        nfkc: "\u{CF4F}",
-        nfkd: "\u{110F}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CF50}",
-        nfc: "\u{CF50}",
-        nfd: "\u{110F}\u{1168}\u{11BF}",
-        nfkc: "\u{CF50}",
-        nfkd: "\u{110F}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CF51}",
-        nfc: "\u{CF51}",
-        nfd: "\u{110F}\u{1168}\u{11C0}",
-        nfkc: "\u{CF51}",
-        nfkd: "\u{110F}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CF52}",
-        nfc: "\u{CF52}",
-        nfd: "\u{110F}\u{1168}\u{11C1}",
-        nfkc: "\u{CF52}",
-        nfkd: "\u{110F}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CF53}",
-        nfc: "\u{CF53}",
-        nfd: "\u{110F}\u{1168}\u{11C2}",
-        nfkc: "\u{CF53}",
-        nfkd: "\u{110F}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CF54}",
-        nfc: "\u{CF54}",
-        nfd: "\u{110F}\u{1169}",
-        nfkc: "\u{CF54}",
-        nfkd: "\u{110F}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{CF55}",
-        nfc: "\u{CF55}",
-        nfd: "\u{110F}\u{1169}\u{11A8}",
-        nfkc: "\u{CF55}",
-        nfkd: "\u{110F}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CF56}",
-        nfc: "\u{CF56}",
-        nfd: "\u{110F}\u{1169}\u{11A9}",
-        nfkc: "\u{CF56}",
-        nfkd: "\u{110F}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CF57}",
-        nfc: "\u{CF57}",
-        nfd: "\u{110F}\u{1169}\u{11AA}",
-        nfkc: "\u{CF57}",
-        nfkd: "\u{110F}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CF58}",
-        nfc: "\u{CF58}",
-        nfd: "\u{110F}\u{1169}\u{11AB}",
-        nfkc: "\u{CF58}",
-        nfkd: "\u{110F}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CF59}",
-        nfc: "\u{CF59}",
-        nfd: "\u{110F}\u{1169}\u{11AC}",
-        nfkc: "\u{CF59}",
-        nfkd: "\u{110F}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CF5A}",
-        nfc: "\u{CF5A}",
-        nfd: "\u{110F}\u{1169}\u{11AD}",
-        nfkc: "\u{CF5A}",
-        nfkd: "\u{110F}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CF5B}",
-        nfc: "\u{CF5B}",
-        nfd: "\u{110F}\u{1169}\u{11AE}",
-        nfkc: "\u{CF5B}",
-        nfkd: "\u{110F}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CF5C}",
-        nfc: "\u{CF5C}",
-        nfd: "\u{110F}\u{1169}\u{11AF}",
-        nfkc: "\u{CF5C}",
-        nfkd: "\u{110F}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CF5D}",
-        nfc: "\u{CF5D}",
-        nfd: "\u{110F}\u{1169}\u{11B0}",
-        nfkc: "\u{CF5D}",
-        nfkd: "\u{110F}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CF5E}",
-        nfc: "\u{CF5E}",
-        nfd: "\u{110F}\u{1169}\u{11B1}",
-        nfkc: "\u{CF5E}",
-        nfkd: "\u{110F}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CF5F}",
-        nfc: "\u{CF5F}",
-        nfd: "\u{110F}\u{1169}\u{11B2}",
-        nfkc: "\u{CF5F}",
-        nfkd: "\u{110F}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CF60}",
-        nfc: "\u{CF60}",
-        nfd: "\u{110F}\u{1169}\u{11B3}",
-        nfkc: "\u{CF60}",
-        nfkd: "\u{110F}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CF61}",
-        nfc: "\u{CF61}",
-        nfd: "\u{110F}\u{1169}\u{11B4}",
-        nfkc: "\u{CF61}",
-        nfkd: "\u{110F}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CF62}",
-        nfc: "\u{CF62}",
-        nfd: "\u{110F}\u{1169}\u{11B5}",
-        nfkc: "\u{CF62}",
-        nfkd: "\u{110F}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF63}",
-        nfc: "\u{CF63}",
-        nfd: "\u{110F}\u{1169}\u{11B6}",
-        nfkc: "\u{CF63}",
-        nfkd: "\u{110F}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CF64}",
-        nfc: "\u{CF64}",
-        nfd: "\u{110F}\u{1169}\u{11B7}",
-        nfkc: "\u{CF64}",
-        nfkd: "\u{110F}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CF65}",
-        nfc: "\u{CF65}",
-        nfd: "\u{110F}\u{1169}\u{11B8}",
-        nfkc: "\u{CF65}",
-        nfkd: "\u{110F}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CF66}",
-        nfc: "\u{CF66}",
-        nfd: "\u{110F}\u{1169}\u{11B9}",
-        nfkc: "\u{CF66}",
-        nfkd: "\u{110F}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CF67}",
-        nfc: "\u{CF67}",
-        nfd: "\u{110F}\u{1169}\u{11BA}",
-        nfkc: "\u{CF67}",
-        nfkd: "\u{110F}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CF68}",
-        nfc: "\u{CF68}",
-        nfd: "\u{110F}\u{1169}\u{11BB}",
-        nfkc: "\u{CF68}",
-        nfkd: "\u{110F}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CF69}",
-        nfc: "\u{CF69}",
-        nfd: "\u{110F}\u{1169}\u{11BC}",
-        nfkc: "\u{CF69}",
-        nfkd: "\u{110F}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CF6A}",
-        nfc: "\u{CF6A}",
-        nfd: "\u{110F}\u{1169}\u{11BD}",
-        nfkc: "\u{CF6A}",
-        nfkd: "\u{110F}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CF6B}",
-        nfc: "\u{CF6B}",
-        nfd: "\u{110F}\u{1169}\u{11BE}",
-        nfkc: "\u{CF6B}",
-        nfkd: "\u{110F}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CF6C}",
-        nfc: "\u{CF6C}",
-        nfd: "\u{110F}\u{1169}\u{11BF}",
-        nfkc: "\u{CF6C}",
-        nfkd: "\u{110F}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CF6D}",
-        nfc: "\u{CF6D}",
-        nfd: "\u{110F}\u{1169}\u{11C0}",
-        nfkc: "\u{CF6D}",
-        nfkd: "\u{110F}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CF6E}",
-        nfc: "\u{CF6E}",
-        nfd: "\u{110F}\u{1169}\u{11C1}",
-        nfkc: "\u{CF6E}",
-        nfkd: "\u{110F}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CF6F}",
-        nfc: "\u{CF6F}",
-        nfd: "\u{110F}\u{1169}\u{11C2}",
-        nfkc: "\u{CF6F}",
-        nfkd: "\u{110F}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CF70}",
-        nfc: "\u{CF70}",
-        nfd: "\u{110F}\u{116A}",
-        nfkc: "\u{CF70}",
-        nfkd: "\u{110F}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{CF71}",
-        nfc: "\u{CF71}",
-        nfd: "\u{110F}\u{116A}\u{11A8}",
-        nfkc: "\u{CF71}",
-        nfkd: "\u{110F}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CF72}",
-        nfc: "\u{CF72}",
-        nfd: "\u{110F}\u{116A}\u{11A9}",
-        nfkc: "\u{CF72}",
-        nfkd: "\u{110F}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CF73}",
-        nfc: "\u{CF73}",
-        nfd: "\u{110F}\u{116A}\u{11AA}",
-        nfkc: "\u{CF73}",
-        nfkd: "\u{110F}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CF74}",
-        nfc: "\u{CF74}",
-        nfd: "\u{110F}\u{116A}\u{11AB}",
-        nfkc: "\u{CF74}",
-        nfkd: "\u{110F}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CF75}",
-        nfc: "\u{CF75}",
-        nfd: "\u{110F}\u{116A}\u{11AC}",
-        nfkc: "\u{CF75}",
-        nfkd: "\u{110F}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CF76}",
-        nfc: "\u{CF76}",
-        nfd: "\u{110F}\u{116A}\u{11AD}",
-        nfkc: "\u{CF76}",
-        nfkd: "\u{110F}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CF77}",
-        nfc: "\u{CF77}",
-        nfd: "\u{110F}\u{116A}\u{11AE}",
-        nfkc: "\u{CF77}",
-        nfkd: "\u{110F}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CF78}",
-        nfc: "\u{CF78}",
-        nfd: "\u{110F}\u{116A}\u{11AF}",
-        nfkc: "\u{CF78}",
-        nfkd: "\u{110F}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CF79}",
-        nfc: "\u{CF79}",
-        nfd: "\u{110F}\u{116A}\u{11B0}",
-        nfkc: "\u{CF79}",
-        nfkd: "\u{110F}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CF7A}",
-        nfc: "\u{CF7A}",
-        nfd: "\u{110F}\u{116A}\u{11B1}",
-        nfkc: "\u{CF7A}",
-        nfkd: "\u{110F}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CF7B}",
-        nfc: "\u{CF7B}",
-        nfd: "\u{110F}\u{116A}\u{11B2}",
-        nfkc: "\u{CF7B}",
-        nfkd: "\u{110F}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CF7C}",
-        nfc: "\u{CF7C}",
-        nfd: "\u{110F}\u{116A}\u{11B3}",
-        nfkc: "\u{CF7C}",
-        nfkd: "\u{110F}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CF7D}",
-        nfc: "\u{CF7D}",
-        nfd: "\u{110F}\u{116A}\u{11B4}",
-        nfkc: "\u{CF7D}",
-        nfkd: "\u{110F}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CF7E}",
-        nfc: "\u{CF7E}",
-        nfd: "\u{110F}\u{116A}\u{11B5}",
-        nfkc: "\u{CF7E}",
-        nfkd: "\u{110F}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF7F}",
-        nfc: "\u{CF7F}",
-        nfd: "\u{110F}\u{116A}\u{11B6}",
-        nfkc: "\u{CF7F}",
-        nfkd: "\u{110F}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CF80}",
-        nfc: "\u{CF80}",
-        nfd: "\u{110F}\u{116A}\u{11B7}",
-        nfkc: "\u{CF80}",
-        nfkd: "\u{110F}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CF81}",
-        nfc: "\u{CF81}",
-        nfd: "\u{110F}\u{116A}\u{11B8}",
-        nfkc: "\u{CF81}",
-        nfkd: "\u{110F}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CF82}",
-        nfc: "\u{CF82}",
-        nfd: "\u{110F}\u{116A}\u{11B9}",
-        nfkc: "\u{CF82}",
-        nfkd: "\u{110F}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CF83}",
-        nfc: "\u{CF83}",
-        nfd: "\u{110F}\u{116A}\u{11BA}",
-        nfkc: "\u{CF83}",
-        nfkd: "\u{110F}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CF84}",
-        nfc: "\u{CF84}",
-        nfd: "\u{110F}\u{116A}\u{11BB}",
-        nfkc: "\u{CF84}",
-        nfkd: "\u{110F}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CF85}",
-        nfc: "\u{CF85}",
-        nfd: "\u{110F}\u{116A}\u{11BC}",
-        nfkc: "\u{CF85}",
-        nfkd: "\u{110F}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CF86}",
-        nfc: "\u{CF86}",
-        nfd: "\u{110F}\u{116A}\u{11BD}",
-        nfkc: "\u{CF86}",
-        nfkd: "\u{110F}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CF87}",
-        nfc: "\u{CF87}",
-        nfd: "\u{110F}\u{116A}\u{11BE}",
-        nfkc: "\u{CF87}",
-        nfkd: "\u{110F}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CF88}",
-        nfc: "\u{CF88}",
-        nfd: "\u{110F}\u{116A}\u{11BF}",
-        nfkc: "\u{CF88}",
-        nfkd: "\u{110F}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CF89}",
-        nfc: "\u{CF89}",
-        nfd: "\u{110F}\u{116A}\u{11C0}",
-        nfkc: "\u{CF89}",
-        nfkd: "\u{110F}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CF8A}",
-        nfc: "\u{CF8A}",
-        nfd: "\u{110F}\u{116A}\u{11C1}",
-        nfkc: "\u{CF8A}",
-        nfkd: "\u{110F}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CF8B}",
-        nfc: "\u{CF8B}",
-        nfd: "\u{110F}\u{116A}\u{11C2}",
-        nfkc: "\u{CF8B}",
-        nfkd: "\u{110F}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CF8C}",
-        nfc: "\u{CF8C}",
-        nfd: "\u{110F}\u{116B}",
-        nfkc: "\u{CF8C}",
-        nfkd: "\u{110F}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{CF8D}",
-        nfc: "\u{CF8D}",
-        nfd: "\u{110F}\u{116B}\u{11A8}",
-        nfkc: "\u{CF8D}",
-        nfkd: "\u{110F}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CF8E}",
-        nfc: "\u{CF8E}",
-        nfd: "\u{110F}\u{116B}\u{11A9}",
-        nfkc: "\u{CF8E}",
-        nfkd: "\u{110F}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CF8F}",
-        nfc: "\u{CF8F}",
-        nfd: "\u{110F}\u{116B}\u{11AA}",
-        nfkc: "\u{CF8F}",
-        nfkd: "\u{110F}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CF90}",
-        nfc: "\u{CF90}",
-        nfd: "\u{110F}\u{116B}\u{11AB}",
-        nfkc: "\u{CF90}",
-        nfkd: "\u{110F}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CF91}",
-        nfc: "\u{CF91}",
-        nfd: "\u{110F}\u{116B}\u{11AC}",
-        nfkc: "\u{CF91}",
-        nfkd: "\u{110F}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CF92}",
-        nfc: "\u{CF92}",
-        nfd: "\u{110F}\u{116B}\u{11AD}",
-        nfkc: "\u{CF92}",
-        nfkd: "\u{110F}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CF93}",
-        nfc: "\u{CF93}",
-        nfd: "\u{110F}\u{116B}\u{11AE}",
-        nfkc: "\u{CF93}",
-        nfkd: "\u{110F}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CF94}",
-        nfc: "\u{CF94}",
-        nfd: "\u{110F}\u{116B}\u{11AF}",
-        nfkc: "\u{CF94}",
-        nfkd: "\u{110F}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CF95}",
-        nfc: "\u{CF95}",
-        nfd: "\u{110F}\u{116B}\u{11B0}",
-        nfkc: "\u{CF95}",
-        nfkd: "\u{110F}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CF96}",
-        nfc: "\u{CF96}",
-        nfd: "\u{110F}\u{116B}\u{11B1}",
-        nfkc: "\u{CF96}",
-        nfkd: "\u{110F}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CF97}",
-        nfc: "\u{CF97}",
-        nfd: "\u{110F}\u{116B}\u{11B2}",
-        nfkc: "\u{CF97}",
-        nfkd: "\u{110F}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CF98}",
-        nfc: "\u{CF98}",
-        nfd: "\u{110F}\u{116B}\u{11B3}",
-        nfkc: "\u{CF98}",
-        nfkd: "\u{110F}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CF99}",
-        nfc: "\u{CF99}",
-        nfd: "\u{110F}\u{116B}\u{11B4}",
-        nfkc: "\u{CF99}",
-        nfkd: "\u{110F}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CF9A}",
-        nfc: "\u{CF9A}",
-        nfd: "\u{110F}\u{116B}\u{11B5}",
-        nfkc: "\u{CF9A}",
-        nfkd: "\u{110F}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF9B}",
-        nfc: "\u{CF9B}",
-        nfd: "\u{110F}\u{116B}\u{11B6}",
-        nfkc: "\u{CF9B}",
-        nfkd: "\u{110F}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CF9C}",
-        nfc: "\u{CF9C}",
-        nfd: "\u{110F}\u{116B}\u{11B7}",
-        nfkc: "\u{CF9C}",
-        nfkd: "\u{110F}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CF9D}",
-        nfc: "\u{CF9D}",
-        nfd: "\u{110F}\u{116B}\u{11B8}",
-        nfkc: "\u{CF9D}",
-        nfkd: "\u{110F}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CF9E}",
-        nfc: "\u{CF9E}",
-        nfd: "\u{110F}\u{116B}\u{11B9}",
-        nfkc: "\u{CF9E}",
-        nfkd: "\u{110F}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CF9F}",
-        nfc: "\u{CF9F}",
-        nfd: "\u{110F}\u{116B}\u{11BA}",
-        nfkc: "\u{CF9F}",
-        nfkd: "\u{110F}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CFA0}",
-        nfc: "\u{CFA0}",
-        nfd: "\u{110F}\u{116B}\u{11BB}",
-        nfkc: "\u{CFA0}",
-        nfkd: "\u{110F}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CFA1}",
-        nfc: "\u{CFA1}",
-        nfd: "\u{110F}\u{116B}\u{11BC}",
-        nfkc: "\u{CFA1}",
-        nfkd: "\u{110F}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CFA2}",
-        nfc: "\u{CFA2}",
-        nfd: "\u{110F}\u{116B}\u{11BD}",
-        nfkc: "\u{CFA2}",
-        nfkd: "\u{110F}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CFA3}",
-        nfc: "\u{CFA3}",
-        nfd: "\u{110F}\u{116B}\u{11BE}",
-        nfkc: "\u{CFA3}",
-        nfkd: "\u{110F}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CFA4}",
-        nfc: "\u{CFA4}",
-        nfd: "\u{110F}\u{116B}\u{11BF}",
-        nfkc: "\u{CFA4}",
-        nfkd: "\u{110F}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CFA5}",
-        nfc: "\u{CFA5}",
-        nfd: "\u{110F}\u{116B}\u{11C0}",
-        nfkc: "\u{CFA5}",
-        nfkd: "\u{110F}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CFA6}",
-        nfc: "\u{CFA6}",
-        nfd: "\u{110F}\u{116B}\u{11C1}",
-        nfkc: "\u{CFA6}",
-        nfkd: "\u{110F}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CFA7}",
-        nfc: "\u{CFA7}",
-        nfd: "\u{110F}\u{116B}\u{11C2}",
-        nfkc: "\u{CFA7}",
-        nfkd: "\u{110F}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CFA8}",
-        nfc: "\u{CFA8}",
-        nfd: "\u{110F}\u{116C}",
-        nfkc: "\u{CFA8}",
-        nfkd: "\u{110F}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{CFA9}",
-        nfc: "\u{CFA9}",
-        nfd: "\u{110F}\u{116C}\u{11A8}",
-        nfkc: "\u{CFA9}",
-        nfkd: "\u{110F}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CFAA}",
-        nfc: "\u{CFAA}",
-        nfd: "\u{110F}\u{116C}\u{11A9}",
-        nfkc: "\u{CFAA}",
-        nfkd: "\u{110F}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CFAB}",
-        nfc: "\u{CFAB}",
-        nfd: "\u{110F}\u{116C}\u{11AA}",
-        nfkc: "\u{CFAB}",
-        nfkd: "\u{110F}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CFAC}",
-        nfc: "\u{CFAC}",
-        nfd: "\u{110F}\u{116C}\u{11AB}",
-        nfkc: "\u{CFAC}",
-        nfkd: "\u{110F}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CFAD}",
-        nfc: "\u{CFAD}",
-        nfd: "\u{110F}\u{116C}\u{11AC}",
-        nfkc: "\u{CFAD}",
-        nfkd: "\u{110F}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CFAE}",
-        nfc: "\u{CFAE}",
-        nfd: "\u{110F}\u{116C}\u{11AD}",
-        nfkc: "\u{CFAE}",
-        nfkd: "\u{110F}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CFAF}",
-        nfc: "\u{CFAF}",
-        nfd: "\u{110F}\u{116C}\u{11AE}",
-        nfkc: "\u{CFAF}",
-        nfkd: "\u{110F}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CFB0}",
-        nfc: "\u{CFB0}",
-        nfd: "\u{110F}\u{116C}\u{11AF}",
-        nfkc: "\u{CFB0}",
-        nfkd: "\u{110F}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CFB1}",
-        nfc: "\u{CFB1}",
-        nfd: "\u{110F}\u{116C}\u{11B0}",
-        nfkc: "\u{CFB1}",
-        nfkd: "\u{110F}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CFB2}",
-        nfc: "\u{CFB2}",
-        nfd: "\u{110F}\u{116C}\u{11B1}",
-        nfkc: "\u{CFB2}",
-        nfkd: "\u{110F}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CFB3}",
-        nfc: "\u{CFB3}",
-        nfd: "\u{110F}\u{116C}\u{11B2}",
-        nfkc: "\u{CFB3}",
-        nfkd: "\u{110F}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CFB4}",
-        nfc: "\u{CFB4}",
-        nfd: "\u{110F}\u{116C}\u{11B3}",
-        nfkc: "\u{CFB4}",
-        nfkd: "\u{110F}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CFB5}",
-        nfc: "\u{CFB5}",
-        nfd: "\u{110F}\u{116C}\u{11B4}",
-        nfkc: "\u{CFB5}",
-        nfkd: "\u{110F}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CFB6}",
-        nfc: "\u{CFB6}",
-        nfd: "\u{110F}\u{116C}\u{11B5}",
-        nfkc: "\u{CFB6}",
-        nfkd: "\u{110F}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CFB7}",
-        nfc: "\u{CFB7}",
-        nfd: "\u{110F}\u{116C}\u{11B6}",
-        nfkc: "\u{CFB7}",
-        nfkd: "\u{110F}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CFB8}",
-        nfc: "\u{CFB8}",
-        nfd: "\u{110F}\u{116C}\u{11B7}",
-        nfkc: "\u{CFB8}",
-        nfkd: "\u{110F}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CFB9}",
-        nfc: "\u{CFB9}",
-        nfd: "\u{110F}\u{116C}\u{11B8}",
-        nfkc: "\u{CFB9}",
-        nfkd: "\u{110F}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CFBA}",
-        nfc: "\u{CFBA}",
-        nfd: "\u{110F}\u{116C}\u{11B9}",
-        nfkc: "\u{CFBA}",
-        nfkd: "\u{110F}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CFBB}",
-        nfc: "\u{CFBB}",
-        nfd: "\u{110F}\u{116C}\u{11BA}",
-        nfkc: "\u{CFBB}",
-        nfkd: "\u{110F}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CFBC}",
-        nfc: "\u{CFBC}",
-        nfd: "\u{110F}\u{116C}\u{11BB}",
-        nfkc: "\u{CFBC}",
-        nfkd: "\u{110F}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CFBD}",
-        nfc: "\u{CFBD}",
-        nfd: "\u{110F}\u{116C}\u{11BC}",
-        nfkc: "\u{CFBD}",
-        nfkd: "\u{110F}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CFBE}",
-        nfc: "\u{CFBE}",
-        nfd: "\u{110F}\u{116C}\u{11BD}",
-        nfkc: "\u{CFBE}",
-        nfkd: "\u{110F}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CFBF}",
-        nfc: "\u{CFBF}",
-        nfd: "\u{110F}\u{116C}\u{11BE}",
-        nfkc: "\u{CFBF}",
-        nfkd: "\u{110F}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CFC0}",
-        nfc: "\u{CFC0}",
-        nfd: "\u{110F}\u{116C}\u{11BF}",
-        nfkc: "\u{CFC0}",
-        nfkd: "\u{110F}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CFC1}",
-        nfc: "\u{CFC1}",
-        nfd: "\u{110F}\u{116C}\u{11C0}",
-        nfkc: "\u{CFC1}",
-        nfkd: "\u{110F}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CFC2}",
-        nfc: "\u{CFC2}",
-        nfd: "\u{110F}\u{116C}\u{11C1}",
-        nfkc: "\u{CFC2}",
-        nfkd: "\u{110F}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CFC3}",
-        nfc: "\u{CFC3}",
-        nfd: "\u{110F}\u{116C}\u{11C2}",
-        nfkc: "\u{CFC3}",
-        nfkd: "\u{110F}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CFC4}",
-        nfc: "\u{CFC4}",
-        nfd: "\u{110F}\u{116D}",
-        nfkc: "\u{CFC4}",
-        nfkd: "\u{110F}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{CFC5}",
-        nfc: "\u{CFC5}",
-        nfd: "\u{110F}\u{116D}\u{11A8}",
-        nfkc: "\u{CFC5}",
-        nfkd: "\u{110F}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CFC6}",
-        nfc: "\u{CFC6}",
-        nfd: "\u{110F}\u{116D}\u{11A9}",
-        nfkc: "\u{CFC6}",
-        nfkd: "\u{110F}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CFC7}",
-        nfc: "\u{CFC7}",
-        nfd: "\u{110F}\u{116D}\u{11AA}",
-        nfkc: "\u{CFC7}",
-        nfkd: "\u{110F}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CFC8}",
-        nfc: "\u{CFC8}",
-        nfd: "\u{110F}\u{116D}\u{11AB}",
-        nfkc: "\u{CFC8}",
-        nfkd: "\u{110F}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CFC9}",
-        nfc: "\u{CFC9}",
-        nfd: "\u{110F}\u{116D}\u{11AC}",
-        nfkc: "\u{CFC9}",
-        nfkd: "\u{110F}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CFCA}",
-        nfc: "\u{CFCA}",
-        nfd: "\u{110F}\u{116D}\u{11AD}",
-        nfkc: "\u{CFCA}",
-        nfkd: "\u{110F}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CFCB}",
-        nfc: "\u{CFCB}",
-        nfd: "\u{110F}\u{116D}\u{11AE}",
-        nfkc: "\u{CFCB}",
-        nfkd: "\u{110F}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CFCC}",
-        nfc: "\u{CFCC}",
-        nfd: "\u{110F}\u{116D}\u{11AF}",
-        nfkc: "\u{CFCC}",
-        nfkd: "\u{110F}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CFCD}",
-        nfc: "\u{CFCD}",
-        nfd: "\u{110F}\u{116D}\u{11B0}",
-        nfkc: "\u{CFCD}",
-        nfkd: "\u{110F}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CFCE}",
-        nfc: "\u{CFCE}",
-        nfd: "\u{110F}\u{116D}\u{11B1}",
-        nfkc: "\u{CFCE}",
-        nfkd: "\u{110F}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CFCF}",
-        nfc: "\u{CFCF}",
-        nfd: "\u{110F}\u{116D}\u{11B2}",
-        nfkc: "\u{CFCF}",
-        nfkd: "\u{110F}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CFD0}",
-        nfc: "\u{CFD0}",
-        nfd: "\u{110F}\u{116D}\u{11B3}",
-        nfkc: "\u{CFD0}",
-        nfkd: "\u{110F}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CFD1}",
-        nfc: "\u{CFD1}",
-        nfd: "\u{110F}\u{116D}\u{11B4}",
-        nfkc: "\u{CFD1}",
-        nfkd: "\u{110F}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CFD2}",
-        nfc: "\u{CFD2}",
-        nfd: "\u{110F}\u{116D}\u{11B5}",
-        nfkc: "\u{CFD2}",
-        nfkd: "\u{110F}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CFD3}",
-        nfc: "\u{CFD3}",
-        nfd: "\u{110F}\u{116D}\u{11B6}",
-        nfkc: "\u{CFD3}",
-        nfkd: "\u{110F}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CFD4}",
-        nfc: "\u{CFD4}",
-        nfd: "\u{110F}\u{116D}\u{11B7}",
-        nfkc: "\u{CFD4}",
-        nfkd: "\u{110F}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CFD5}",
-        nfc: "\u{CFD5}",
-        nfd: "\u{110F}\u{116D}\u{11B8}",
-        nfkc: "\u{CFD5}",
-        nfkd: "\u{110F}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CFD6}",
-        nfc: "\u{CFD6}",
-        nfd: "\u{110F}\u{116D}\u{11B9}",
-        nfkc: "\u{CFD6}",
-        nfkd: "\u{110F}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CFD7}",
-        nfc: "\u{CFD7}",
-        nfd: "\u{110F}\u{116D}\u{11BA}",
-        nfkc: "\u{CFD7}",
-        nfkd: "\u{110F}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CFD8}",
-        nfc: "\u{CFD8}",
-        nfd: "\u{110F}\u{116D}\u{11BB}",
-        nfkc: "\u{CFD8}",
-        nfkd: "\u{110F}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CFD9}",
-        nfc: "\u{CFD9}",
-        nfd: "\u{110F}\u{116D}\u{11BC}",
-        nfkc: "\u{CFD9}",
-        nfkd: "\u{110F}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CFDA}",
-        nfc: "\u{CFDA}",
-        nfd: "\u{110F}\u{116D}\u{11BD}",
-        nfkc: "\u{CFDA}",
-        nfkd: "\u{110F}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CFDB}",
-        nfc: "\u{CFDB}",
-        nfd: "\u{110F}\u{116D}\u{11BE}",
-        nfkc: "\u{CFDB}",
-        nfkd: "\u{110F}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CFDC}",
-        nfc: "\u{CFDC}",
-        nfd: "\u{110F}\u{116D}\u{11BF}",
-        nfkc: "\u{CFDC}",
-        nfkd: "\u{110F}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CFDD}",
-        nfc: "\u{CFDD}",
-        nfd: "\u{110F}\u{116D}\u{11C0}",
-        nfkc: "\u{CFDD}",
-        nfkd: "\u{110F}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CFDE}",
-        nfc: "\u{CFDE}",
-        nfd: "\u{110F}\u{116D}\u{11C1}",
-        nfkc: "\u{CFDE}",
-        nfkd: "\u{110F}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CFDF}",
-        nfc: "\u{CFDF}",
-        nfd: "\u{110F}\u{116D}\u{11C2}",
-        nfkc: "\u{CFDF}",
-        nfkd: "\u{110F}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CFE0}",
-        nfc: "\u{CFE0}",
-        nfd: "\u{110F}\u{116E}",
-        nfkc: "\u{CFE0}",
-        nfkd: "\u{110F}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{CFE1}",
-        nfc: "\u{CFE1}",
-        nfd: "\u{110F}\u{116E}\u{11A8}",
-        nfkc: "\u{CFE1}",
-        nfkd: "\u{110F}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CFE2}",
-        nfc: "\u{CFE2}",
-        nfd: "\u{110F}\u{116E}\u{11A9}",
-        nfkc: "\u{CFE2}",
-        nfkd: "\u{110F}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CFE3}",
-        nfc: "\u{CFE3}",
-        nfd: "\u{110F}\u{116E}\u{11AA}",
-        nfkc: "\u{CFE3}",
-        nfkd: "\u{110F}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{CFE4}",
-        nfc: "\u{CFE4}",
-        nfd: "\u{110F}\u{116E}\u{11AB}",
-        nfkc: "\u{CFE4}",
-        nfkd: "\u{110F}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{CFE5}",
-        nfc: "\u{CFE5}",
-        nfd: "\u{110F}\u{116E}\u{11AC}",
-        nfkc: "\u{CFE5}",
-        nfkd: "\u{110F}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{CFE6}",
-        nfc: "\u{CFE6}",
-        nfd: "\u{110F}\u{116E}\u{11AD}",
-        nfkc: "\u{CFE6}",
-        nfkd: "\u{110F}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{CFE7}",
-        nfc: "\u{CFE7}",
-        nfd: "\u{110F}\u{116E}\u{11AE}",
-        nfkc: "\u{CFE7}",
-        nfkd: "\u{110F}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CFE8}",
-        nfc: "\u{CFE8}",
-        nfd: "\u{110F}\u{116E}\u{11AF}",
-        nfkc: "\u{CFE8}",
-        nfkd: "\u{110F}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{CFE9}",
-        nfc: "\u{CFE9}",
-        nfd: "\u{110F}\u{116E}\u{11B0}",
-        nfkc: "\u{CFE9}",
-        nfkd: "\u{110F}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{CFEA}",
-        nfc: "\u{CFEA}",
-        nfd: "\u{110F}\u{116E}\u{11B1}",
-        nfkc: "\u{CFEA}",
-        nfkd: "\u{110F}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{CFEB}",
-        nfc: "\u{CFEB}",
-        nfd: "\u{110F}\u{116E}\u{11B2}",
-        nfkc: "\u{CFEB}",
-        nfkd: "\u{110F}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{CFEC}",
-        nfc: "\u{CFEC}",
-        nfd: "\u{110F}\u{116E}\u{11B3}",
-        nfkc: "\u{CFEC}",
-        nfkd: "\u{110F}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{CFED}",
-        nfc: "\u{CFED}",
-        nfd: "\u{110F}\u{116E}\u{11B4}",
-        nfkc: "\u{CFED}",
-        nfkd: "\u{110F}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{CFEE}",
-        nfc: "\u{CFEE}",
-        nfd: "\u{110F}\u{116E}\u{11B5}",
-        nfkc: "\u{CFEE}",
-        nfkd: "\u{110F}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CFEF}",
-        nfc: "\u{CFEF}",
-        nfd: "\u{110F}\u{116E}\u{11B6}",
-        nfkc: "\u{CFEF}",
-        nfkd: "\u{110F}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{CFF0}",
-        nfc: "\u{CFF0}",
-        nfd: "\u{110F}\u{116E}\u{11B7}",
-        nfkc: "\u{CFF0}",
-        nfkd: "\u{110F}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{CFF1}",
-        nfc: "\u{CFF1}",
-        nfd: "\u{110F}\u{116E}\u{11B8}",
-        nfkc: "\u{CFF1}",
-        nfkd: "\u{110F}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{CFF2}",
-        nfc: "\u{CFF2}",
-        nfd: "\u{110F}\u{116E}\u{11B9}",
-        nfkc: "\u{CFF2}",
-        nfkd: "\u{110F}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{CFF3}",
-        nfc: "\u{CFF3}",
-        nfd: "\u{110F}\u{116E}\u{11BA}",
-        nfkc: "\u{CFF3}",
-        nfkd: "\u{110F}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{CFF4}",
-        nfc: "\u{CFF4}",
-        nfd: "\u{110F}\u{116E}\u{11BB}",
-        nfkc: "\u{CFF4}",
-        nfkd: "\u{110F}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{CFF5}",
-        nfc: "\u{CFF5}",
-        nfd: "\u{110F}\u{116E}\u{11BC}",
-        nfkc: "\u{CFF5}",
-        nfkd: "\u{110F}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CFF6}",
-        nfc: "\u{CFF6}",
-        nfd: "\u{110F}\u{116E}\u{11BD}",
-        nfkc: "\u{CFF6}",
-        nfkd: "\u{110F}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{CFF7}",
-        nfc: "\u{CFF7}",
-        nfd: "\u{110F}\u{116E}\u{11BE}",
-        nfkc: "\u{CFF7}",
-        nfkd: "\u{110F}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{CFF8}",
-        nfc: "\u{CFF8}",
-        nfd: "\u{110F}\u{116E}\u{11BF}",
-        nfkc: "\u{CFF8}",
-        nfkd: "\u{110F}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{CFF9}",
-        nfc: "\u{CFF9}",
-        nfd: "\u{110F}\u{116E}\u{11C0}",
-        nfkc: "\u{CFF9}",
-        nfkd: "\u{110F}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{CFFA}",
-        nfc: "\u{CFFA}",
-        nfd: "\u{110F}\u{116E}\u{11C1}",
-        nfkc: "\u{CFFA}",
-        nfkd: "\u{110F}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{CFFB}",
-        nfc: "\u{CFFB}",
-        nfd: "\u{110F}\u{116E}\u{11C2}",
-        nfkc: "\u{CFFB}",
-        nfkd: "\u{110F}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{CFFC}",
-        nfc: "\u{CFFC}",
-        nfd: "\u{110F}\u{116F}",
-        nfkc: "\u{CFFC}",
-        nfkd: "\u{110F}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{CFFD}",
-        nfc: "\u{CFFD}",
-        nfd: "\u{110F}\u{116F}\u{11A8}",
-        nfkc: "\u{CFFD}",
-        nfkd: "\u{110F}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{CFFE}",
-        nfc: "\u{CFFE}",
-        nfd: "\u{110F}\u{116F}\u{11A9}",
-        nfkc: "\u{CFFE}",
-        nfkd: "\u{110F}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{CFFF}",
-        nfc: "\u{CFFF}",
-        nfd: "\u{110F}\u{116F}\u{11AA}",
-        nfkc: "\u{CFFF}",
-        nfkd: "\u{110F}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D000}",
-        nfc: "\u{D000}",
-        nfd: "\u{110F}\u{116F}\u{11AB}",
-        nfkc: "\u{D000}",
-        nfkd: "\u{110F}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D001}",
-        nfc: "\u{D001}",
-        nfd: "\u{110F}\u{116F}\u{11AC}",
-        nfkc: "\u{D001}",
-        nfkd: "\u{110F}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D002}",
-        nfc: "\u{D002}",
-        nfd: "\u{110F}\u{116F}\u{11AD}",
-        nfkc: "\u{D002}",
-        nfkd: "\u{110F}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D003}",
-        nfc: "\u{D003}",
-        nfd: "\u{110F}\u{116F}\u{11AE}",
-        nfkc: "\u{D003}",
-        nfkd: "\u{110F}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D004}",
-        nfc: "\u{D004}",
-        nfd: "\u{110F}\u{116F}\u{11AF}",
-        nfkc: "\u{D004}",
-        nfkd: "\u{110F}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D005}",
-        nfc: "\u{D005}",
-        nfd: "\u{110F}\u{116F}\u{11B0}",
-        nfkc: "\u{D005}",
-        nfkd: "\u{110F}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D006}",
-        nfc: "\u{D006}",
-        nfd: "\u{110F}\u{116F}\u{11B1}",
-        nfkc: "\u{D006}",
-        nfkd: "\u{110F}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D007}",
-        nfc: "\u{D007}",
-        nfd: "\u{110F}\u{116F}\u{11B2}",
-        nfkc: "\u{D007}",
-        nfkd: "\u{110F}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D008}",
-        nfc: "\u{D008}",
-        nfd: "\u{110F}\u{116F}\u{11B3}",
-        nfkc: "\u{D008}",
-        nfkd: "\u{110F}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D009}",
-        nfc: "\u{D009}",
-        nfd: "\u{110F}\u{116F}\u{11B4}",
-        nfkc: "\u{D009}",
-        nfkd: "\u{110F}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D00A}",
-        nfc: "\u{D00A}",
-        nfd: "\u{110F}\u{116F}\u{11B5}",
-        nfkc: "\u{D00A}",
-        nfkd: "\u{110F}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D00B}",
-        nfc: "\u{D00B}",
-        nfd: "\u{110F}\u{116F}\u{11B6}",
-        nfkc: "\u{D00B}",
-        nfkd: "\u{110F}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D00C}",
-        nfc: "\u{D00C}",
-        nfd: "\u{110F}\u{116F}\u{11B7}",
-        nfkc: "\u{D00C}",
-        nfkd: "\u{110F}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D00D}",
-        nfc: "\u{D00D}",
-        nfd: "\u{110F}\u{116F}\u{11B8}",
-        nfkc: "\u{D00D}",
-        nfkd: "\u{110F}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D00E}",
-        nfc: "\u{D00E}",
-        nfd: "\u{110F}\u{116F}\u{11B9}",
-        nfkc: "\u{D00E}",
-        nfkd: "\u{110F}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D00F}",
-        nfc: "\u{D00F}",
-        nfd: "\u{110F}\u{116F}\u{11BA}",
-        nfkc: "\u{D00F}",
-        nfkd: "\u{110F}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D010}",
-        nfc: "\u{D010}",
-        nfd: "\u{110F}\u{116F}\u{11BB}",
-        nfkc: "\u{D010}",
-        nfkd: "\u{110F}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D011}",
-        nfc: "\u{D011}",
-        nfd: "\u{110F}\u{116F}\u{11BC}",
-        nfkc: "\u{D011}",
-        nfkd: "\u{110F}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D012}",
-        nfc: "\u{D012}",
-        nfd: "\u{110F}\u{116F}\u{11BD}",
-        nfkc: "\u{D012}",
-        nfkd: "\u{110F}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D013}",
-        nfc: "\u{D013}",
-        nfd: "\u{110F}\u{116F}\u{11BE}",
-        nfkc: "\u{D013}",
-        nfkd: "\u{110F}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D014}",
-        nfc: "\u{D014}",
-        nfd: "\u{110F}\u{116F}\u{11BF}",
-        nfkc: "\u{D014}",
-        nfkd: "\u{110F}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D015}",
-        nfc: "\u{D015}",
-        nfd: "\u{110F}\u{116F}\u{11C0}",
-        nfkc: "\u{D015}",
-        nfkd: "\u{110F}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D016}",
-        nfc: "\u{D016}",
-        nfd: "\u{110F}\u{116F}\u{11C1}",
-        nfkc: "\u{D016}",
-        nfkd: "\u{110F}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D017}",
-        nfc: "\u{D017}",
-        nfd: "\u{110F}\u{116F}\u{11C2}",
-        nfkc: "\u{D017}",
-        nfkd: "\u{110F}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D018}",
-        nfc: "\u{D018}",
-        nfd: "\u{110F}\u{1170}",
-        nfkc: "\u{D018}",
-        nfkd: "\u{110F}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{D019}",
-        nfc: "\u{D019}",
-        nfd: "\u{110F}\u{1170}\u{11A8}",
-        nfkc: "\u{D019}",
-        nfkd: "\u{110F}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D01A}",
-        nfc: "\u{D01A}",
-        nfd: "\u{110F}\u{1170}\u{11A9}",
-        nfkc: "\u{D01A}",
-        nfkd: "\u{110F}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D01B}",
-        nfc: "\u{D01B}",
-        nfd: "\u{110F}\u{1170}\u{11AA}",
-        nfkc: "\u{D01B}",
-        nfkd: "\u{110F}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D01C}",
-        nfc: "\u{D01C}",
-        nfd: "\u{110F}\u{1170}\u{11AB}",
-        nfkc: "\u{D01C}",
-        nfkd: "\u{110F}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D01D}",
-        nfc: "\u{D01D}",
-        nfd: "\u{110F}\u{1170}\u{11AC}",
-        nfkc: "\u{D01D}",
-        nfkd: "\u{110F}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D01E}",
-        nfc: "\u{D01E}",
-        nfd: "\u{110F}\u{1170}\u{11AD}",
-        nfkc: "\u{D01E}",
-        nfkd: "\u{110F}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D01F}",
-        nfc: "\u{D01F}",
-        nfd: "\u{110F}\u{1170}\u{11AE}",
-        nfkc: "\u{D01F}",
-        nfkd: "\u{110F}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D020}",
-        nfc: "\u{D020}",
-        nfd: "\u{110F}\u{1170}\u{11AF}",
-        nfkc: "\u{D020}",
-        nfkd: "\u{110F}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D021}",
-        nfc: "\u{D021}",
-        nfd: "\u{110F}\u{1170}\u{11B0}",
-        nfkc: "\u{D021}",
-        nfkd: "\u{110F}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D022}",
-        nfc: "\u{D022}",
-        nfd: "\u{110F}\u{1170}\u{11B1}",
-        nfkc: "\u{D022}",
-        nfkd: "\u{110F}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D023}",
-        nfc: "\u{D023}",
-        nfd: "\u{110F}\u{1170}\u{11B2}",
-        nfkc: "\u{D023}",
-        nfkd: "\u{110F}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D024}",
-        nfc: "\u{D024}",
-        nfd: "\u{110F}\u{1170}\u{11B3}",
-        nfkc: "\u{D024}",
-        nfkd: "\u{110F}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D025}",
-        nfc: "\u{D025}",
-        nfd: "\u{110F}\u{1170}\u{11B4}",
-        nfkc: "\u{D025}",
-        nfkd: "\u{110F}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D026}",
-        nfc: "\u{D026}",
-        nfd: "\u{110F}\u{1170}\u{11B5}",
-        nfkc: "\u{D026}",
-        nfkd: "\u{110F}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D027}",
-        nfc: "\u{D027}",
-        nfd: "\u{110F}\u{1170}\u{11B6}",
-        nfkc: "\u{D027}",
-        nfkd: "\u{110F}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D028}",
-        nfc: "\u{D028}",
-        nfd: "\u{110F}\u{1170}\u{11B7}",
-        nfkc: "\u{D028}",
-        nfkd: "\u{110F}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D029}",
-        nfc: "\u{D029}",
-        nfd: "\u{110F}\u{1170}\u{11B8}",
-        nfkc: "\u{D029}",
-        nfkd: "\u{110F}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D02A}",
-        nfc: "\u{D02A}",
-        nfd: "\u{110F}\u{1170}\u{11B9}",
-        nfkc: "\u{D02A}",
-        nfkd: "\u{110F}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D02B}",
-        nfc: "\u{D02B}",
-        nfd: "\u{110F}\u{1170}\u{11BA}",
-        nfkc: "\u{D02B}",
-        nfkd: "\u{110F}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D02C}",
-        nfc: "\u{D02C}",
-        nfd: "\u{110F}\u{1170}\u{11BB}",
-        nfkc: "\u{D02C}",
-        nfkd: "\u{110F}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D02D}",
-        nfc: "\u{D02D}",
-        nfd: "\u{110F}\u{1170}\u{11BC}",
-        nfkc: "\u{D02D}",
-        nfkd: "\u{110F}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D02E}",
-        nfc: "\u{D02E}",
-        nfd: "\u{110F}\u{1170}\u{11BD}",
-        nfkc: "\u{D02E}",
-        nfkd: "\u{110F}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D02F}",
-        nfc: "\u{D02F}",
-        nfd: "\u{110F}\u{1170}\u{11BE}",
-        nfkc: "\u{D02F}",
-        nfkd: "\u{110F}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D030}",
-        nfc: "\u{D030}",
-        nfd: "\u{110F}\u{1170}\u{11BF}",
-        nfkc: "\u{D030}",
-        nfkd: "\u{110F}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D031}",
-        nfc: "\u{D031}",
-        nfd: "\u{110F}\u{1170}\u{11C0}",
-        nfkc: "\u{D031}",
-        nfkd: "\u{110F}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D032}",
-        nfc: "\u{D032}",
-        nfd: "\u{110F}\u{1170}\u{11C1}",
-        nfkc: "\u{D032}",
-        nfkd: "\u{110F}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D033}",
-        nfc: "\u{D033}",
-        nfd: "\u{110F}\u{1170}\u{11C2}",
-        nfkc: "\u{D033}",
-        nfkd: "\u{110F}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D034}",
-        nfc: "\u{D034}",
-        nfd: "\u{110F}\u{1171}",
-        nfkc: "\u{D034}",
-        nfkd: "\u{110F}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{D035}",
-        nfc: "\u{D035}",
-        nfd: "\u{110F}\u{1171}\u{11A8}",
-        nfkc: "\u{D035}",
-        nfkd: "\u{110F}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D036}",
-        nfc: "\u{D036}",
-        nfd: "\u{110F}\u{1171}\u{11A9}",
-        nfkc: "\u{D036}",
-        nfkd: "\u{110F}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D037}",
-        nfc: "\u{D037}",
-        nfd: "\u{110F}\u{1171}\u{11AA}",
-        nfkc: "\u{D037}",
-        nfkd: "\u{110F}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D038}",
-        nfc: "\u{D038}",
-        nfd: "\u{110F}\u{1171}\u{11AB}",
-        nfkc: "\u{D038}",
-        nfkd: "\u{110F}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D039}",
-        nfc: "\u{D039}",
-        nfd: "\u{110F}\u{1171}\u{11AC}",
-        nfkc: "\u{D039}",
-        nfkd: "\u{110F}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D03A}",
-        nfc: "\u{D03A}",
-        nfd: "\u{110F}\u{1171}\u{11AD}",
-        nfkc: "\u{D03A}",
-        nfkd: "\u{110F}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D03B}",
-        nfc: "\u{D03B}",
-        nfd: "\u{110F}\u{1171}\u{11AE}",
-        nfkc: "\u{D03B}",
-        nfkd: "\u{110F}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D03C}",
-        nfc: "\u{D03C}",
-        nfd: "\u{110F}\u{1171}\u{11AF}",
-        nfkc: "\u{D03C}",
-        nfkd: "\u{110F}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D03D}",
-        nfc: "\u{D03D}",
-        nfd: "\u{110F}\u{1171}\u{11B0}",
-        nfkc: "\u{D03D}",
-        nfkd: "\u{110F}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D03E}",
-        nfc: "\u{D03E}",
-        nfd: "\u{110F}\u{1171}\u{11B1}",
-        nfkc: "\u{D03E}",
-        nfkd: "\u{110F}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D03F}",
-        nfc: "\u{D03F}",
-        nfd: "\u{110F}\u{1171}\u{11B2}",
-        nfkc: "\u{D03F}",
-        nfkd: "\u{110F}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D040}",
-        nfc: "\u{D040}",
-        nfd: "\u{110F}\u{1171}\u{11B3}",
-        nfkc: "\u{D040}",
-        nfkd: "\u{110F}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D041}",
-        nfc: "\u{D041}",
-        nfd: "\u{110F}\u{1171}\u{11B4}",
-        nfkc: "\u{D041}",
-        nfkd: "\u{110F}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D042}",
-        nfc: "\u{D042}",
-        nfd: "\u{110F}\u{1171}\u{11B5}",
-        nfkc: "\u{D042}",
-        nfkd: "\u{110F}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D043}",
-        nfc: "\u{D043}",
-        nfd: "\u{110F}\u{1171}\u{11B6}",
-        nfkc: "\u{D043}",
-        nfkd: "\u{110F}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D044}",
-        nfc: "\u{D044}",
-        nfd: "\u{110F}\u{1171}\u{11B7}",
-        nfkc: "\u{D044}",
-        nfkd: "\u{110F}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D045}",
-        nfc: "\u{D045}",
-        nfd: "\u{110F}\u{1171}\u{11B8}",
-        nfkc: "\u{D045}",
-        nfkd: "\u{110F}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D046}",
-        nfc: "\u{D046}",
-        nfd: "\u{110F}\u{1171}\u{11B9}",
-        nfkc: "\u{D046}",
-        nfkd: "\u{110F}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D047}",
-        nfc: "\u{D047}",
-        nfd: "\u{110F}\u{1171}\u{11BA}",
-        nfkc: "\u{D047}",
-        nfkd: "\u{110F}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D048}",
-        nfc: "\u{D048}",
-        nfd: "\u{110F}\u{1171}\u{11BB}",
-        nfkc: "\u{D048}",
-        nfkd: "\u{110F}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D049}",
-        nfc: "\u{D049}",
-        nfd: "\u{110F}\u{1171}\u{11BC}",
-        nfkc: "\u{D049}",
-        nfkd: "\u{110F}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D04A}",
-        nfc: "\u{D04A}",
-        nfd: "\u{110F}\u{1171}\u{11BD}",
-        nfkc: "\u{D04A}",
-        nfkd: "\u{110F}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D04B}",
-        nfc: "\u{D04B}",
-        nfd: "\u{110F}\u{1171}\u{11BE}",
-        nfkc: "\u{D04B}",
-        nfkd: "\u{110F}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D04C}",
-        nfc: "\u{D04C}",
-        nfd: "\u{110F}\u{1171}\u{11BF}",
-        nfkc: "\u{D04C}",
-        nfkd: "\u{110F}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D04D}",
-        nfc: "\u{D04D}",
-        nfd: "\u{110F}\u{1171}\u{11C0}",
-        nfkc: "\u{D04D}",
-        nfkd: "\u{110F}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D04E}",
-        nfc: "\u{D04E}",
-        nfd: "\u{110F}\u{1171}\u{11C1}",
-        nfkc: "\u{D04E}",
-        nfkd: "\u{110F}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D04F}",
-        nfc: "\u{D04F}",
-        nfd: "\u{110F}\u{1171}\u{11C2}",
-        nfkc: "\u{D04F}",
-        nfkd: "\u{110F}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D050}",
-        nfc: "\u{D050}",
-        nfd: "\u{110F}\u{1172}",
-        nfkc: "\u{D050}",
-        nfkd: "\u{110F}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{D051}",
-        nfc: "\u{D051}",
-        nfd: "\u{110F}\u{1172}\u{11A8}",
-        nfkc: "\u{D051}",
-        nfkd: "\u{110F}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D052}",
-        nfc: "\u{D052}",
-        nfd: "\u{110F}\u{1172}\u{11A9}",
-        nfkc: "\u{D052}",
-        nfkd: "\u{110F}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D053}",
-        nfc: "\u{D053}",
-        nfd: "\u{110F}\u{1172}\u{11AA}",
-        nfkc: "\u{D053}",
-        nfkd: "\u{110F}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D054}",
-        nfc: "\u{D054}",
-        nfd: "\u{110F}\u{1172}\u{11AB}",
-        nfkc: "\u{D054}",
-        nfkd: "\u{110F}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D055}",
-        nfc: "\u{D055}",
-        nfd: "\u{110F}\u{1172}\u{11AC}",
-        nfkc: "\u{D055}",
-        nfkd: "\u{110F}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D056}",
-        nfc: "\u{D056}",
-        nfd: "\u{110F}\u{1172}\u{11AD}",
-        nfkc: "\u{D056}",
-        nfkd: "\u{110F}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D057}",
-        nfc: "\u{D057}",
-        nfd: "\u{110F}\u{1172}\u{11AE}",
-        nfkc: "\u{D057}",
-        nfkd: "\u{110F}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D058}",
-        nfc: "\u{D058}",
-        nfd: "\u{110F}\u{1172}\u{11AF}",
-        nfkc: "\u{D058}",
-        nfkd: "\u{110F}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D059}",
-        nfc: "\u{D059}",
-        nfd: "\u{110F}\u{1172}\u{11B0}",
-        nfkc: "\u{D059}",
-        nfkd: "\u{110F}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D05A}",
-        nfc: "\u{D05A}",
-        nfd: "\u{110F}\u{1172}\u{11B1}",
-        nfkc: "\u{D05A}",
-        nfkd: "\u{110F}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D05B}",
-        nfc: "\u{D05B}",
-        nfd: "\u{110F}\u{1172}\u{11B2}",
-        nfkc: "\u{D05B}",
-        nfkd: "\u{110F}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D05C}",
-        nfc: "\u{D05C}",
-        nfd: "\u{110F}\u{1172}\u{11B3}",
-        nfkc: "\u{D05C}",
-        nfkd: "\u{110F}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D05D}",
-        nfc: "\u{D05D}",
-        nfd: "\u{110F}\u{1172}\u{11B4}",
-        nfkc: "\u{D05D}",
-        nfkd: "\u{110F}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D05E}",
-        nfc: "\u{D05E}",
-        nfd: "\u{110F}\u{1172}\u{11B5}",
-        nfkc: "\u{D05E}",
-        nfkd: "\u{110F}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D05F}",
-        nfc: "\u{D05F}",
-        nfd: "\u{110F}\u{1172}\u{11B6}",
-        nfkc: "\u{D05F}",
-        nfkd: "\u{110F}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D060}",
-        nfc: "\u{D060}",
-        nfd: "\u{110F}\u{1172}\u{11B7}",
-        nfkc: "\u{D060}",
-        nfkd: "\u{110F}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D061}",
-        nfc: "\u{D061}",
-        nfd: "\u{110F}\u{1172}\u{11B8}",
-        nfkc: "\u{D061}",
-        nfkd: "\u{110F}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D062}",
-        nfc: "\u{D062}",
-        nfd: "\u{110F}\u{1172}\u{11B9}",
-        nfkc: "\u{D062}",
-        nfkd: "\u{110F}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D063}",
-        nfc: "\u{D063}",
-        nfd: "\u{110F}\u{1172}\u{11BA}",
-        nfkc: "\u{D063}",
-        nfkd: "\u{110F}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D064}",
-        nfc: "\u{D064}",
-        nfd: "\u{110F}\u{1172}\u{11BB}",
-        nfkc: "\u{D064}",
-        nfkd: "\u{110F}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D065}",
-        nfc: "\u{D065}",
-        nfd: "\u{110F}\u{1172}\u{11BC}",
-        nfkc: "\u{D065}",
-        nfkd: "\u{110F}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D066}",
-        nfc: "\u{D066}",
-        nfd: "\u{110F}\u{1172}\u{11BD}",
-        nfkc: "\u{D066}",
-        nfkd: "\u{110F}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D067}",
-        nfc: "\u{D067}",
-        nfd: "\u{110F}\u{1172}\u{11BE}",
-        nfkc: "\u{D067}",
-        nfkd: "\u{110F}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D068}",
-        nfc: "\u{D068}",
-        nfd: "\u{110F}\u{1172}\u{11BF}",
-        nfkc: "\u{D068}",
-        nfkd: "\u{110F}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D069}",
-        nfc: "\u{D069}",
-        nfd: "\u{110F}\u{1172}\u{11C0}",
-        nfkc: "\u{D069}",
-        nfkd: "\u{110F}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D06A}",
-        nfc: "\u{D06A}",
-        nfd: "\u{110F}\u{1172}\u{11C1}",
-        nfkc: "\u{D06A}",
-        nfkd: "\u{110F}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D06B}",
-        nfc: "\u{D06B}",
-        nfd: "\u{110F}\u{1172}\u{11C2}",
-        nfkc: "\u{D06B}",
-        nfkd: "\u{110F}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D06C}",
-        nfc: "\u{D06C}",
-        nfd: "\u{110F}\u{1173}",
-        nfkc: "\u{D06C}",
-        nfkd: "\u{110F}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{D06D}",
-        nfc: "\u{D06D}",
-        nfd: "\u{110F}\u{1173}\u{11A8}",
-        nfkc: "\u{D06D}",
-        nfkd: "\u{110F}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D06E}",
-        nfc: "\u{D06E}",
-        nfd: "\u{110F}\u{1173}\u{11A9}",
-        nfkc: "\u{D06E}",
-        nfkd: "\u{110F}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D06F}",
-        nfc: "\u{D06F}",
-        nfd: "\u{110F}\u{1173}\u{11AA}",
-        nfkc: "\u{D06F}",
-        nfkd: "\u{110F}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D070}",
-        nfc: "\u{D070}",
-        nfd: "\u{110F}\u{1173}\u{11AB}",
-        nfkc: "\u{D070}",
-        nfkd: "\u{110F}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D071}",
-        nfc: "\u{D071}",
-        nfd: "\u{110F}\u{1173}\u{11AC}",
-        nfkc: "\u{D071}",
-        nfkd: "\u{110F}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D072}",
-        nfc: "\u{D072}",
-        nfd: "\u{110F}\u{1173}\u{11AD}",
-        nfkc: "\u{D072}",
-        nfkd: "\u{110F}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D073}",
-        nfc: "\u{D073}",
-        nfd: "\u{110F}\u{1173}\u{11AE}",
-        nfkc: "\u{D073}",
-        nfkd: "\u{110F}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D074}",
-        nfc: "\u{D074}",
-        nfd: "\u{110F}\u{1173}\u{11AF}",
-        nfkc: "\u{D074}",
-        nfkd: "\u{110F}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D075}",
-        nfc: "\u{D075}",
-        nfd: "\u{110F}\u{1173}\u{11B0}",
-        nfkc: "\u{D075}",
-        nfkd: "\u{110F}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D076}",
-        nfc: "\u{D076}",
-        nfd: "\u{110F}\u{1173}\u{11B1}",
-        nfkc: "\u{D076}",
-        nfkd: "\u{110F}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D077}",
-        nfc: "\u{D077}",
-        nfd: "\u{110F}\u{1173}\u{11B2}",
-        nfkc: "\u{D077}",
-        nfkd: "\u{110F}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D078}",
-        nfc: "\u{D078}",
-        nfd: "\u{110F}\u{1173}\u{11B3}",
-        nfkc: "\u{D078}",
-        nfkd: "\u{110F}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D079}",
-        nfc: "\u{D079}",
-        nfd: "\u{110F}\u{1173}\u{11B4}",
-        nfkc: "\u{D079}",
-        nfkd: "\u{110F}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D07A}",
-        nfc: "\u{D07A}",
-        nfd: "\u{110F}\u{1173}\u{11B5}",
-        nfkc: "\u{D07A}",
-        nfkd: "\u{110F}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D07B}",
-        nfc: "\u{D07B}",
-        nfd: "\u{110F}\u{1173}\u{11B6}",
-        nfkc: "\u{D07B}",
-        nfkd: "\u{110F}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D07C}",
-        nfc: "\u{D07C}",
-        nfd: "\u{110F}\u{1173}\u{11B7}",
-        nfkc: "\u{D07C}",
-        nfkd: "\u{110F}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D07D}",
-        nfc: "\u{D07D}",
-        nfd: "\u{110F}\u{1173}\u{11B8}",
-        nfkc: "\u{D07D}",
-        nfkd: "\u{110F}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D07E}",
-        nfc: "\u{D07E}",
-        nfd: "\u{110F}\u{1173}\u{11B9}",
-        nfkc: "\u{D07E}",
-        nfkd: "\u{110F}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D07F}",
-        nfc: "\u{D07F}",
-        nfd: "\u{110F}\u{1173}\u{11BA}",
-        nfkc: "\u{D07F}",
-        nfkd: "\u{110F}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D080}",
-        nfc: "\u{D080}",
-        nfd: "\u{110F}\u{1173}\u{11BB}",
-        nfkc: "\u{D080}",
-        nfkd: "\u{110F}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D081}",
-        nfc: "\u{D081}",
-        nfd: "\u{110F}\u{1173}\u{11BC}",
-        nfkc: "\u{D081}",
-        nfkd: "\u{110F}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D082}",
-        nfc: "\u{D082}",
-        nfd: "\u{110F}\u{1173}\u{11BD}",
-        nfkc: "\u{D082}",
-        nfkd: "\u{110F}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D083}",
-        nfc: "\u{D083}",
-        nfd: "\u{110F}\u{1173}\u{11BE}",
-        nfkc: "\u{D083}",
-        nfkd: "\u{110F}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D084}",
-        nfc: "\u{D084}",
-        nfd: "\u{110F}\u{1173}\u{11BF}",
-        nfkc: "\u{D084}",
-        nfkd: "\u{110F}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D085}",
-        nfc: "\u{D085}",
-        nfd: "\u{110F}\u{1173}\u{11C0}",
-        nfkc: "\u{D085}",
-        nfkd: "\u{110F}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D086}",
-        nfc: "\u{D086}",
-        nfd: "\u{110F}\u{1173}\u{11C1}",
-        nfkc: "\u{D086}",
-        nfkd: "\u{110F}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D087}",
-        nfc: "\u{D087}",
-        nfd: "\u{110F}\u{1173}\u{11C2}",
-        nfkc: "\u{D087}",
-        nfkd: "\u{110F}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D088}",
-        nfc: "\u{D088}",
-        nfd: "\u{110F}\u{1174}",
-        nfkc: "\u{D088}",
-        nfkd: "\u{110F}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{D089}",
-        nfc: "\u{D089}",
-        nfd: "\u{110F}\u{1174}\u{11A8}",
-        nfkc: "\u{D089}",
-        nfkd: "\u{110F}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D08A}",
-        nfc: "\u{D08A}",
-        nfd: "\u{110F}\u{1174}\u{11A9}",
-        nfkc: "\u{D08A}",
-        nfkd: "\u{110F}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D08B}",
-        nfc: "\u{D08B}",
-        nfd: "\u{110F}\u{1174}\u{11AA}",
-        nfkc: "\u{D08B}",
-        nfkd: "\u{110F}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D08C}",
-        nfc: "\u{D08C}",
-        nfd: "\u{110F}\u{1174}\u{11AB}",
-        nfkc: "\u{D08C}",
-        nfkd: "\u{110F}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D08D}",
-        nfc: "\u{D08D}",
-        nfd: "\u{110F}\u{1174}\u{11AC}",
-        nfkc: "\u{D08D}",
-        nfkd: "\u{110F}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D08E}",
-        nfc: "\u{D08E}",
-        nfd: "\u{110F}\u{1174}\u{11AD}",
-        nfkc: "\u{D08E}",
-        nfkd: "\u{110F}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D08F}",
-        nfc: "\u{D08F}",
-        nfd: "\u{110F}\u{1174}\u{11AE}",
-        nfkc: "\u{D08F}",
-        nfkd: "\u{110F}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D090}",
-        nfc: "\u{D090}",
-        nfd: "\u{110F}\u{1174}\u{11AF}",
-        nfkc: "\u{D090}",
-        nfkd: "\u{110F}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D091}",
-        nfc: "\u{D091}",
-        nfd: "\u{110F}\u{1174}\u{11B0}",
-        nfkc: "\u{D091}",
-        nfkd: "\u{110F}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D092}",
-        nfc: "\u{D092}",
-        nfd: "\u{110F}\u{1174}\u{11B1}",
-        nfkc: "\u{D092}",
-        nfkd: "\u{110F}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D093}",
-        nfc: "\u{D093}",
-        nfd: "\u{110F}\u{1174}\u{11B2}",
-        nfkc: "\u{D093}",
-        nfkd: "\u{110F}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D094}",
-        nfc: "\u{D094}",
-        nfd: "\u{110F}\u{1174}\u{11B3}",
-        nfkc: "\u{D094}",
-        nfkd: "\u{110F}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D095}",
-        nfc: "\u{D095}",
-        nfd: "\u{110F}\u{1174}\u{11B4}",
-        nfkc: "\u{D095}",
-        nfkd: "\u{110F}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D096}",
-        nfc: "\u{D096}",
-        nfd: "\u{110F}\u{1174}\u{11B5}",
-        nfkc: "\u{D096}",
-        nfkd: "\u{110F}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D097}",
-        nfc: "\u{D097}",
-        nfd: "\u{110F}\u{1174}\u{11B6}",
-        nfkc: "\u{D097}",
-        nfkd: "\u{110F}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D098}",
-        nfc: "\u{D098}",
-        nfd: "\u{110F}\u{1174}\u{11B7}",
-        nfkc: "\u{D098}",
-        nfkd: "\u{110F}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D099}",
-        nfc: "\u{D099}",
-        nfd: "\u{110F}\u{1174}\u{11B8}",
-        nfkc: "\u{D099}",
-        nfkd: "\u{110F}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D09A}",
-        nfc: "\u{D09A}",
-        nfd: "\u{110F}\u{1174}\u{11B9}",
-        nfkc: "\u{D09A}",
-        nfkd: "\u{110F}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D09B}",
-        nfc: "\u{D09B}",
-        nfd: "\u{110F}\u{1174}\u{11BA}",
-        nfkc: "\u{D09B}",
-        nfkd: "\u{110F}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D09C}",
-        nfc: "\u{D09C}",
-        nfd: "\u{110F}\u{1174}\u{11BB}",
-        nfkc: "\u{D09C}",
-        nfkd: "\u{110F}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D09D}",
-        nfc: "\u{D09D}",
-        nfd: "\u{110F}\u{1174}\u{11BC}",
-        nfkc: "\u{D09D}",
-        nfkd: "\u{110F}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D09E}",
-        nfc: "\u{D09E}",
-        nfd: "\u{110F}\u{1174}\u{11BD}",
-        nfkc: "\u{D09E}",
-        nfkd: "\u{110F}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D09F}",
-        nfc: "\u{D09F}",
-        nfd: "\u{110F}\u{1174}\u{11BE}",
-        nfkc: "\u{D09F}",
-        nfkd: "\u{110F}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D0A0}",
-        nfc: "\u{D0A0}",
-        nfd: "\u{110F}\u{1174}\u{11BF}",
-        nfkc: "\u{D0A0}",
-        nfkd: "\u{110F}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D0A1}",
-        nfc: "\u{D0A1}",
-        nfd: "\u{110F}\u{1174}\u{11C0}",
-        nfkc: "\u{D0A1}",
-        nfkd: "\u{110F}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D0A2}",
-        nfc: "\u{D0A2}",
-        nfd: "\u{110F}\u{1174}\u{11C1}",
-        nfkc: "\u{D0A2}",
-        nfkd: "\u{110F}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D0A3}",
-        nfc: "\u{D0A3}",
-        nfd: "\u{110F}\u{1174}\u{11C2}",
-        nfkc: "\u{D0A3}",
-        nfkd: "\u{110F}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D0A4}",
-        nfc: "\u{D0A4}",
-        nfd: "\u{110F}\u{1175}",
-        nfkc: "\u{D0A4}",
-        nfkd: "\u{110F}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{D0A5}",
-        nfc: "\u{D0A5}",
-        nfd: "\u{110F}\u{1175}\u{11A8}",
-        nfkc: "\u{D0A5}",
-        nfkd: "\u{110F}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D0A6}",
-        nfc: "\u{D0A6}",
-        nfd: "\u{110F}\u{1175}\u{11A9}",
-        nfkc: "\u{D0A6}",
-        nfkd: "\u{110F}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D0A7}",
-        nfc: "\u{D0A7}",
-        nfd: "\u{110F}\u{1175}\u{11AA}",
-        nfkc: "\u{D0A7}",
-        nfkd: "\u{110F}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D0A8}",
-        nfc: "\u{D0A8}",
-        nfd: "\u{110F}\u{1175}\u{11AB}",
-        nfkc: "\u{D0A8}",
-        nfkd: "\u{110F}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D0A9}",
-        nfc: "\u{D0A9}",
-        nfd: "\u{110F}\u{1175}\u{11AC}",
-        nfkc: "\u{D0A9}",
-        nfkd: "\u{110F}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D0AA}",
-        nfc: "\u{D0AA}",
-        nfd: "\u{110F}\u{1175}\u{11AD}",
-        nfkc: "\u{D0AA}",
-        nfkd: "\u{110F}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D0AB}",
-        nfc: "\u{D0AB}",
-        nfd: "\u{110F}\u{1175}\u{11AE}",
-        nfkc: "\u{D0AB}",
-        nfkd: "\u{110F}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D0AC}",
-        nfc: "\u{D0AC}",
-        nfd: "\u{110F}\u{1175}\u{11AF}",
-        nfkc: "\u{D0AC}",
-        nfkd: "\u{110F}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D0AD}",
-        nfc: "\u{D0AD}",
-        nfd: "\u{110F}\u{1175}\u{11B0}",
-        nfkc: "\u{D0AD}",
-        nfkd: "\u{110F}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D0AE}",
-        nfc: "\u{D0AE}",
-        nfd: "\u{110F}\u{1175}\u{11B1}",
-        nfkc: "\u{D0AE}",
-        nfkd: "\u{110F}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D0AF}",
-        nfc: "\u{D0AF}",
-        nfd: "\u{110F}\u{1175}\u{11B2}",
-        nfkc: "\u{D0AF}",
-        nfkd: "\u{110F}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D0B0}",
-        nfc: "\u{D0B0}",
-        nfd: "\u{110F}\u{1175}\u{11B3}",
-        nfkc: "\u{D0B0}",
-        nfkd: "\u{110F}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D0B1}",
-        nfc: "\u{D0B1}",
-        nfd: "\u{110F}\u{1175}\u{11B4}",
-        nfkc: "\u{D0B1}",
-        nfkd: "\u{110F}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D0B2}",
-        nfc: "\u{D0B2}",
-        nfd: "\u{110F}\u{1175}\u{11B5}",
-        nfkc: "\u{D0B2}",
-        nfkd: "\u{110F}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D0B3}",
-        nfc: "\u{D0B3}",
-        nfd: "\u{110F}\u{1175}\u{11B6}",
-        nfkc: "\u{D0B3}",
-        nfkd: "\u{110F}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D0B4}",
-        nfc: "\u{D0B4}",
-        nfd: "\u{110F}\u{1175}\u{11B7}",
-        nfkc: "\u{D0B4}",
-        nfkd: "\u{110F}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D0B5}",
-        nfc: "\u{D0B5}",
-        nfd: "\u{110F}\u{1175}\u{11B8}",
-        nfkc: "\u{D0B5}",
-        nfkd: "\u{110F}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D0B6}",
-        nfc: "\u{D0B6}",
-        nfd: "\u{110F}\u{1175}\u{11B9}",
-        nfkc: "\u{D0B6}",
-        nfkd: "\u{110F}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D0B7}",
-        nfc: "\u{D0B7}",
-        nfd: "\u{110F}\u{1175}\u{11BA}",
-        nfkc: "\u{D0B7}",
-        nfkd: "\u{110F}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D0B8}",
-        nfc: "\u{D0B8}",
-        nfd: "\u{110F}\u{1175}\u{11BB}",
-        nfkc: "\u{D0B8}",
-        nfkd: "\u{110F}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D0B9}",
-        nfc: "\u{D0B9}",
-        nfd: "\u{110F}\u{1175}\u{11BC}",
-        nfkc: "\u{D0B9}",
-        nfkd: "\u{110F}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D0BA}",
-        nfc: "\u{D0BA}",
-        nfd: "\u{110F}\u{1175}\u{11BD}",
-        nfkc: "\u{D0BA}",
-        nfkd: "\u{110F}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D0BB}",
-        nfc: "\u{D0BB}",
-        nfd: "\u{110F}\u{1175}\u{11BE}",
-        nfkc: "\u{D0BB}",
-        nfkd: "\u{110F}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D0BC}",
-        nfc: "\u{D0BC}",
-        nfd: "\u{110F}\u{1175}\u{11BF}",
-        nfkc: "\u{D0BC}",
-        nfkd: "\u{110F}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D0BD}",
-        nfc: "\u{D0BD}",
-        nfd: "\u{110F}\u{1175}\u{11C0}",
-        nfkc: "\u{D0BD}",
-        nfkd: "\u{110F}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D0BE}",
-        nfc: "\u{D0BE}",
-        nfd: "\u{110F}\u{1175}\u{11C1}",
-        nfkc: "\u{D0BE}",
-        nfkd: "\u{110F}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D0BF}",
-        nfc: "\u{D0BF}",
-        nfd: "\u{110F}\u{1175}\u{11C2}",
-        nfkc: "\u{D0BF}",
-        nfkd: "\u{110F}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D0C0}",
-        nfc: "\u{D0C0}",
-        nfd: "\u{1110}\u{1161}",
-        nfkc: "\u{D0C0}",
-        nfkd: "\u{1110}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{D0C1}",
-        nfc: "\u{D0C1}",
-        nfd: "\u{1110}\u{1161}\u{11A8}",
-        nfkc: "\u{D0C1}",
-        nfkd: "\u{1110}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D0C2}",
-        nfc: "\u{D0C2}",
-        nfd: "\u{1110}\u{1161}\u{11A9}",
-        nfkc: "\u{D0C2}",
-        nfkd: "\u{1110}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D0C3}",
-        nfc: "\u{D0C3}",
-        nfd: "\u{1110}\u{1161}\u{11AA}",
-        nfkc: "\u{D0C3}",
-        nfkd: "\u{1110}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D0C4}",
-        nfc: "\u{D0C4}",
-        nfd: "\u{1110}\u{1161}\u{11AB}",
-        nfkc: "\u{D0C4}",
-        nfkd: "\u{1110}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D0C5}",
-        nfc: "\u{D0C5}",
-        nfd: "\u{1110}\u{1161}\u{11AC}",
-        nfkc: "\u{D0C5}",
-        nfkd: "\u{1110}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D0C6}",
-        nfc: "\u{D0C6}",
-        nfd: "\u{1110}\u{1161}\u{11AD}",
-        nfkc: "\u{D0C6}",
-        nfkd: "\u{1110}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D0C7}",
-        nfc: "\u{D0C7}",
-        nfd: "\u{1110}\u{1161}\u{11AE}",
-        nfkc: "\u{D0C7}",
-        nfkd: "\u{1110}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D0C8}",
-        nfc: "\u{D0C8}",
-        nfd: "\u{1110}\u{1161}\u{11AF}",
-        nfkc: "\u{D0C8}",
-        nfkd: "\u{1110}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D0C9}",
-        nfc: "\u{D0C9}",
-        nfd: "\u{1110}\u{1161}\u{11B0}",
-        nfkc: "\u{D0C9}",
-        nfkd: "\u{1110}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D0CA}",
-        nfc: "\u{D0CA}",
-        nfd: "\u{1110}\u{1161}\u{11B1}",
-        nfkc: "\u{D0CA}",
-        nfkd: "\u{1110}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D0CB}",
-        nfc: "\u{D0CB}",
-        nfd: "\u{1110}\u{1161}\u{11B2}",
-        nfkc: "\u{D0CB}",
-        nfkd: "\u{1110}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D0CC}",
-        nfc: "\u{D0CC}",
-        nfd: "\u{1110}\u{1161}\u{11B3}",
-        nfkc: "\u{D0CC}",
-        nfkd: "\u{1110}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D0CD}",
-        nfc: "\u{D0CD}",
-        nfd: "\u{1110}\u{1161}\u{11B4}",
-        nfkc: "\u{D0CD}",
-        nfkd: "\u{1110}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D0CE}",
-        nfc: "\u{D0CE}",
-        nfd: "\u{1110}\u{1161}\u{11B5}",
-        nfkc: "\u{D0CE}",
-        nfkd: "\u{1110}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D0CF}",
-        nfc: "\u{D0CF}",
-        nfd: "\u{1110}\u{1161}\u{11B6}",
-        nfkc: "\u{D0CF}",
-        nfkd: "\u{1110}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D0D0}",
-        nfc: "\u{D0D0}",
-        nfd: "\u{1110}\u{1161}\u{11B7}",
-        nfkc: "\u{D0D0}",
-        nfkd: "\u{1110}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D0D1}",
-        nfc: "\u{D0D1}",
-        nfd: "\u{1110}\u{1161}\u{11B8}",
-        nfkc: "\u{D0D1}",
-        nfkd: "\u{1110}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D0D2}",
-        nfc: "\u{D0D2}",
-        nfd: "\u{1110}\u{1161}\u{11B9}",
-        nfkc: "\u{D0D2}",
-        nfkd: "\u{1110}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D0D3}",
-        nfc: "\u{D0D3}",
-        nfd: "\u{1110}\u{1161}\u{11BA}",
-        nfkc: "\u{D0D3}",
-        nfkd: "\u{1110}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D0D4}",
-        nfc: "\u{D0D4}",
-        nfd: "\u{1110}\u{1161}\u{11BB}",
-        nfkc: "\u{D0D4}",
-        nfkd: "\u{1110}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D0D5}",
-        nfc: "\u{D0D5}",
-        nfd: "\u{1110}\u{1161}\u{11BC}",
-        nfkc: "\u{D0D5}",
-        nfkd: "\u{1110}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D0D6}",
-        nfc: "\u{D0D6}",
-        nfd: "\u{1110}\u{1161}\u{11BD}",
-        nfkc: "\u{D0D6}",
-        nfkd: "\u{1110}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D0D7}",
-        nfc: "\u{D0D7}",
-        nfd: "\u{1110}\u{1161}\u{11BE}",
-        nfkc: "\u{D0D7}",
-        nfkd: "\u{1110}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D0D8}",
-        nfc: "\u{D0D8}",
-        nfd: "\u{1110}\u{1161}\u{11BF}",
-        nfkc: "\u{D0D8}",
-        nfkd: "\u{1110}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D0D9}",
-        nfc: "\u{D0D9}",
-        nfd: "\u{1110}\u{1161}\u{11C0}",
-        nfkc: "\u{D0D9}",
-        nfkd: "\u{1110}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D0DA}",
-        nfc: "\u{D0DA}",
-        nfd: "\u{1110}\u{1161}\u{11C1}",
-        nfkc: "\u{D0DA}",
-        nfkd: "\u{1110}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D0DB}",
-        nfc: "\u{D0DB}",
-        nfd: "\u{1110}\u{1161}\u{11C2}",
-        nfkc: "\u{D0DB}",
-        nfkd: "\u{1110}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D0DC}",
-        nfc: "\u{D0DC}",
-        nfd: "\u{1110}\u{1162}",
-        nfkc: "\u{D0DC}",
-        nfkd: "\u{1110}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{D0DD}",
-        nfc: "\u{D0DD}",
-        nfd: "\u{1110}\u{1162}\u{11A8}",
-        nfkc: "\u{D0DD}",
-        nfkd: "\u{1110}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D0DE}",
-        nfc: "\u{D0DE}",
-        nfd: "\u{1110}\u{1162}\u{11A9}",
-        nfkc: "\u{D0DE}",
-        nfkd: "\u{1110}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D0DF}",
-        nfc: "\u{D0DF}",
-        nfd: "\u{1110}\u{1162}\u{11AA}",
-        nfkc: "\u{D0DF}",
-        nfkd: "\u{1110}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D0E0}",
-        nfc: "\u{D0E0}",
-        nfd: "\u{1110}\u{1162}\u{11AB}",
-        nfkc: "\u{D0E0}",
-        nfkd: "\u{1110}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D0E1}",
-        nfc: "\u{D0E1}",
-        nfd: "\u{1110}\u{1162}\u{11AC}",
-        nfkc: "\u{D0E1}",
-        nfkd: "\u{1110}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D0E2}",
-        nfc: "\u{D0E2}",
-        nfd: "\u{1110}\u{1162}\u{11AD}",
-        nfkc: "\u{D0E2}",
-        nfkd: "\u{1110}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D0E3}",
-        nfc: "\u{D0E3}",
-        nfd: "\u{1110}\u{1162}\u{11AE}",
-        nfkc: "\u{D0E3}",
-        nfkd: "\u{1110}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D0E4}",
-        nfc: "\u{D0E4}",
-        nfd: "\u{1110}\u{1162}\u{11AF}",
-        nfkc: "\u{D0E4}",
-        nfkd: "\u{1110}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D0E5}",
-        nfc: "\u{D0E5}",
-        nfd: "\u{1110}\u{1162}\u{11B0}",
-        nfkc: "\u{D0E5}",
-        nfkd: "\u{1110}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D0E6}",
-        nfc: "\u{D0E6}",
-        nfd: "\u{1110}\u{1162}\u{11B1}",
-        nfkc: "\u{D0E6}",
-        nfkd: "\u{1110}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D0E7}",
-        nfc: "\u{D0E7}",
-        nfd: "\u{1110}\u{1162}\u{11B2}",
-        nfkc: "\u{D0E7}",
-        nfkd: "\u{1110}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D0E8}",
-        nfc: "\u{D0E8}",
-        nfd: "\u{1110}\u{1162}\u{11B3}",
-        nfkc: "\u{D0E8}",
-        nfkd: "\u{1110}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D0E9}",
-        nfc: "\u{D0E9}",
-        nfd: "\u{1110}\u{1162}\u{11B4}",
-        nfkc: "\u{D0E9}",
-        nfkd: "\u{1110}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D0EA}",
-        nfc: "\u{D0EA}",
-        nfd: "\u{1110}\u{1162}\u{11B5}",
-        nfkc: "\u{D0EA}",
-        nfkd: "\u{1110}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D0EB}",
-        nfc: "\u{D0EB}",
-        nfd: "\u{1110}\u{1162}\u{11B6}",
-        nfkc: "\u{D0EB}",
-        nfkd: "\u{1110}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D0EC}",
-        nfc: "\u{D0EC}",
-        nfd: "\u{1110}\u{1162}\u{11B7}",
-        nfkc: "\u{D0EC}",
-        nfkd: "\u{1110}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D0ED}",
-        nfc: "\u{D0ED}",
-        nfd: "\u{1110}\u{1162}\u{11B8}",
-        nfkc: "\u{D0ED}",
-        nfkd: "\u{1110}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D0EE}",
-        nfc: "\u{D0EE}",
-        nfd: "\u{1110}\u{1162}\u{11B9}",
-        nfkc: "\u{D0EE}",
-        nfkd: "\u{1110}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D0EF}",
-        nfc: "\u{D0EF}",
-        nfd: "\u{1110}\u{1162}\u{11BA}",
-        nfkc: "\u{D0EF}",
-        nfkd: "\u{1110}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D0F0}",
-        nfc: "\u{D0F0}",
-        nfd: "\u{1110}\u{1162}\u{11BB}",
-        nfkc: "\u{D0F0}",
-        nfkd: "\u{1110}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D0F1}",
-        nfc: "\u{D0F1}",
-        nfd: "\u{1110}\u{1162}\u{11BC}",
-        nfkc: "\u{D0F1}",
-        nfkd: "\u{1110}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D0F2}",
-        nfc: "\u{D0F2}",
-        nfd: "\u{1110}\u{1162}\u{11BD}",
-        nfkc: "\u{D0F2}",
-        nfkd: "\u{1110}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D0F3}",
-        nfc: "\u{D0F3}",
-        nfd: "\u{1110}\u{1162}\u{11BE}",
-        nfkc: "\u{D0F3}",
-        nfkd: "\u{1110}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D0F4}",
-        nfc: "\u{D0F4}",
-        nfd: "\u{1110}\u{1162}\u{11BF}",
-        nfkc: "\u{D0F4}",
-        nfkd: "\u{1110}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D0F5}",
-        nfc: "\u{D0F5}",
-        nfd: "\u{1110}\u{1162}\u{11C0}",
-        nfkc: "\u{D0F5}",
-        nfkd: "\u{1110}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D0F6}",
-        nfc: "\u{D0F6}",
-        nfd: "\u{1110}\u{1162}\u{11C1}",
-        nfkc: "\u{D0F6}",
-        nfkd: "\u{1110}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D0F7}",
-        nfc: "\u{D0F7}",
-        nfd: "\u{1110}\u{1162}\u{11C2}",
-        nfkc: "\u{D0F7}",
-        nfkd: "\u{1110}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D0F8}",
-        nfc: "\u{D0F8}",
-        nfd: "\u{1110}\u{1163}",
-        nfkc: "\u{D0F8}",
-        nfkd: "\u{1110}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{D0F9}",
-        nfc: "\u{D0F9}",
-        nfd: "\u{1110}\u{1163}\u{11A8}",
-        nfkc: "\u{D0F9}",
-        nfkd: "\u{1110}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D0FA}",
-        nfc: "\u{D0FA}",
-        nfd: "\u{1110}\u{1163}\u{11A9}",
-        nfkc: "\u{D0FA}",
-        nfkd: "\u{1110}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D0FB}",
-        nfc: "\u{D0FB}",
-        nfd: "\u{1110}\u{1163}\u{11AA}",
-        nfkc: "\u{D0FB}",
-        nfkd: "\u{1110}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D0FC}",
-        nfc: "\u{D0FC}",
-        nfd: "\u{1110}\u{1163}\u{11AB}",
-        nfkc: "\u{D0FC}",
-        nfkd: "\u{1110}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D0FD}",
-        nfc: "\u{D0FD}",
-        nfd: "\u{1110}\u{1163}\u{11AC}",
-        nfkc: "\u{D0FD}",
-        nfkd: "\u{1110}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D0FE}",
-        nfc: "\u{D0FE}",
-        nfd: "\u{1110}\u{1163}\u{11AD}",
-        nfkc: "\u{D0FE}",
-        nfkd: "\u{1110}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D0FF}",
-        nfc: "\u{D0FF}",
-        nfd: "\u{1110}\u{1163}\u{11AE}",
-        nfkc: "\u{D0FF}",
-        nfkd: "\u{1110}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D100}",
-        nfc: "\u{D100}",
-        nfd: "\u{1110}\u{1163}\u{11AF}",
-        nfkc: "\u{D100}",
-        nfkd: "\u{1110}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D101}",
-        nfc: "\u{D101}",
-        nfd: "\u{1110}\u{1163}\u{11B0}",
-        nfkc: "\u{D101}",
-        nfkd: "\u{1110}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D102}",
-        nfc: "\u{D102}",
-        nfd: "\u{1110}\u{1163}\u{11B1}",
-        nfkc: "\u{D102}",
-        nfkd: "\u{1110}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D103}",
-        nfc: "\u{D103}",
-        nfd: "\u{1110}\u{1163}\u{11B2}",
-        nfkc: "\u{D103}",
-        nfkd: "\u{1110}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D104}",
-        nfc: "\u{D104}",
-        nfd: "\u{1110}\u{1163}\u{11B3}",
-        nfkc: "\u{D104}",
-        nfkd: "\u{1110}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D105}",
-        nfc: "\u{D105}",
-        nfd: "\u{1110}\u{1163}\u{11B4}",
-        nfkc: "\u{D105}",
-        nfkd: "\u{1110}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D106}",
-        nfc: "\u{D106}",
-        nfd: "\u{1110}\u{1163}\u{11B5}",
-        nfkc: "\u{D106}",
-        nfkd: "\u{1110}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D107}",
-        nfc: "\u{D107}",
-        nfd: "\u{1110}\u{1163}\u{11B6}",
-        nfkc: "\u{D107}",
-        nfkd: "\u{1110}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D108}",
-        nfc: "\u{D108}",
-        nfd: "\u{1110}\u{1163}\u{11B7}",
-        nfkc: "\u{D108}",
-        nfkd: "\u{1110}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D109}",
-        nfc: "\u{D109}",
-        nfd: "\u{1110}\u{1163}\u{11B8}",
-        nfkc: "\u{D109}",
-        nfkd: "\u{1110}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D10A}",
-        nfc: "\u{D10A}",
-        nfd: "\u{1110}\u{1163}\u{11B9}",
-        nfkc: "\u{D10A}",
-        nfkd: "\u{1110}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D10B}",
-        nfc: "\u{D10B}",
-        nfd: "\u{1110}\u{1163}\u{11BA}",
-        nfkc: "\u{D10B}",
-        nfkd: "\u{1110}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D10C}",
-        nfc: "\u{D10C}",
-        nfd: "\u{1110}\u{1163}\u{11BB}",
-        nfkc: "\u{D10C}",
-        nfkd: "\u{1110}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D10D}",
-        nfc: "\u{D10D}",
-        nfd: "\u{1110}\u{1163}\u{11BC}",
-        nfkc: "\u{D10D}",
-        nfkd: "\u{1110}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D10E}",
-        nfc: "\u{D10E}",
-        nfd: "\u{1110}\u{1163}\u{11BD}",
-        nfkc: "\u{D10E}",
-        nfkd: "\u{1110}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D10F}",
-        nfc: "\u{D10F}",
-        nfd: "\u{1110}\u{1163}\u{11BE}",
-        nfkc: "\u{D10F}",
-        nfkd: "\u{1110}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D110}",
-        nfc: "\u{D110}",
-        nfd: "\u{1110}\u{1163}\u{11BF}",
-        nfkc: "\u{D110}",
-        nfkd: "\u{1110}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D111}",
-        nfc: "\u{D111}",
-        nfd: "\u{1110}\u{1163}\u{11C0}",
-        nfkc: "\u{D111}",
-        nfkd: "\u{1110}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D112}",
-        nfc: "\u{D112}",
-        nfd: "\u{1110}\u{1163}\u{11C1}",
-        nfkc: "\u{D112}",
-        nfkd: "\u{1110}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D113}",
-        nfc: "\u{D113}",
-        nfd: "\u{1110}\u{1163}\u{11C2}",
-        nfkc: "\u{D113}",
-        nfkd: "\u{1110}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D114}",
-        nfc: "\u{D114}",
-        nfd: "\u{1110}\u{1164}",
-        nfkc: "\u{D114}",
-        nfkd: "\u{1110}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{D115}",
-        nfc: "\u{D115}",
-        nfd: "\u{1110}\u{1164}\u{11A8}",
-        nfkc: "\u{D115}",
-        nfkd: "\u{1110}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D116}",
-        nfc: "\u{D116}",
-        nfd: "\u{1110}\u{1164}\u{11A9}",
-        nfkc: "\u{D116}",
-        nfkd: "\u{1110}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D117}",
-        nfc: "\u{D117}",
-        nfd: "\u{1110}\u{1164}\u{11AA}",
-        nfkc: "\u{D117}",
-        nfkd: "\u{1110}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D118}",
-        nfc: "\u{D118}",
-        nfd: "\u{1110}\u{1164}\u{11AB}",
-        nfkc: "\u{D118}",
-        nfkd: "\u{1110}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D119}",
-        nfc: "\u{D119}",
-        nfd: "\u{1110}\u{1164}\u{11AC}",
-        nfkc: "\u{D119}",
-        nfkd: "\u{1110}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D11A}",
-        nfc: "\u{D11A}",
-        nfd: "\u{1110}\u{1164}\u{11AD}",
-        nfkc: "\u{D11A}",
-        nfkd: "\u{1110}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D11B}",
-        nfc: "\u{D11B}",
-        nfd: "\u{1110}\u{1164}\u{11AE}",
-        nfkc: "\u{D11B}",
-        nfkd: "\u{1110}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D11C}",
-        nfc: "\u{D11C}",
-        nfd: "\u{1110}\u{1164}\u{11AF}",
-        nfkc: "\u{D11C}",
-        nfkd: "\u{1110}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D11D}",
-        nfc: "\u{D11D}",
-        nfd: "\u{1110}\u{1164}\u{11B0}",
-        nfkc: "\u{D11D}",
-        nfkd: "\u{1110}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D11E}",
-        nfc: "\u{D11E}",
-        nfd: "\u{1110}\u{1164}\u{11B1}",
-        nfkc: "\u{D11E}",
-        nfkd: "\u{1110}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D11F}",
-        nfc: "\u{D11F}",
-        nfd: "\u{1110}\u{1164}\u{11B2}",
-        nfkc: "\u{D11F}",
-        nfkd: "\u{1110}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D120}",
-        nfc: "\u{D120}",
-        nfd: "\u{1110}\u{1164}\u{11B3}",
-        nfkc: "\u{D120}",
-        nfkd: "\u{1110}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D121}",
-        nfc: "\u{D121}",
-        nfd: "\u{1110}\u{1164}\u{11B4}",
-        nfkc: "\u{D121}",
-        nfkd: "\u{1110}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D122}",
-        nfc: "\u{D122}",
-        nfd: "\u{1110}\u{1164}\u{11B5}",
-        nfkc: "\u{D122}",
-        nfkd: "\u{1110}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D123}",
-        nfc: "\u{D123}",
-        nfd: "\u{1110}\u{1164}\u{11B6}",
-        nfkc: "\u{D123}",
-        nfkd: "\u{1110}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D124}",
-        nfc: "\u{D124}",
-        nfd: "\u{1110}\u{1164}\u{11B7}",
-        nfkc: "\u{D124}",
-        nfkd: "\u{1110}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D125}",
-        nfc: "\u{D125}",
-        nfd: "\u{1110}\u{1164}\u{11B8}",
-        nfkc: "\u{D125}",
-        nfkd: "\u{1110}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D126}",
-        nfc: "\u{D126}",
-        nfd: "\u{1110}\u{1164}\u{11B9}",
-        nfkc: "\u{D126}",
-        nfkd: "\u{1110}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D127}",
-        nfc: "\u{D127}",
-        nfd: "\u{1110}\u{1164}\u{11BA}",
-        nfkc: "\u{D127}",
-        nfkd: "\u{1110}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D128}",
-        nfc: "\u{D128}",
-        nfd: "\u{1110}\u{1164}\u{11BB}",
-        nfkc: "\u{D128}",
-        nfkd: "\u{1110}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D129}",
-        nfc: "\u{D129}",
-        nfd: "\u{1110}\u{1164}\u{11BC}",
-        nfkc: "\u{D129}",
-        nfkd: "\u{1110}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D12A}",
-        nfc: "\u{D12A}",
-        nfd: "\u{1110}\u{1164}\u{11BD}",
-        nfkc: "\u{D12A}",
-        nfkd: "\u{1110}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D12B}",
-        nfc: "\u{D12B}",
-        nfd: "\u{1110}\u{1164}\u{11BE}",
-        nfkc: "\u{D12B}",
-        nfkd: "\u{1110}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D12C}",
-        nfc: "\u{D12C}",
-        nfd: "\u{1110}\u{1164}\u{11BF}",
-        nfkc: "\u{D12C}",
-        nfkd: "\u{1110}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D12D}",
-        nfc: "\u{D12D}",
-        nfd: "\u{1110}\u{1164}\u{11C0}",
-        nfkc: "\u{D12D}",
-        nfkd: "\u{1110}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D12E}",
-        nfc: "\u{D12E}",
-        nfd: "\u{1110}\u{1164}\u{11C1}",
-        nfkc: "\u{D12E}",
-        nfkd: "\u{1110}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D12F}",
-        nfc: "\u{D12F}",
-        nfd: "\u{1110}\u{1164}\u{11C2}",
-        nfkc: "\u{D12F}",
-        nfkd: "\u{1110}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D130}",
-        nfc: "\u{D130}",
-        nfd: "\u{1110}\u{1165}",
-        nfkc: "\u{D130}",
-        nfkd: "\u{1110}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{D131}",
-        nfc: "\u{D131}",
-        nfd: "\u{1110}\u{1165}\u{11A8}",
-        nfkc: "\u{D131}",
-        nfkd: "\u{1110}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D132}",
-        nfc: "\u{D132}",
-        nfd: "\u{1110}\u{1165}\u{11A9}",
-        nfkc: "\u{D132}",
-        nfkd: "\u{1110}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D133}",
-        nfc: "\u{D133}",
-        nfd: "\u{1110}\u{1165}\u{11AA}",
-        nfkc: "\u{D133}",
-        nfkd: "\u{1110}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D134}",
-        nfc: "\u{D134}",
-        nfd: "\u{1110}\u{1165}\u{11AB}",
-        nfkc: "\u{D134}",
-        nfkd: "\u{1110}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D135}",
-        nfc: "\u{D135}",
-        nfd: "\u{1110}\u{1165}\u{11AC}",
-        nfkc: "\u{D135}",
-        nfkd: "\u{1110}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D136}",
-        nfc: "\u{D136}",
-        nfd: "\u{1110}\u{1165}\u{11AD}",
-        nfkc: "\u{D136}",
-        nfkd: "\u{1110}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D137}",
-        nfc: "\u{D137}",
-        nfd: "\u{1110}\u{1165}\u{11AE}",
-        nfkc: "\u{D137}",
-        nfkd: "\u{1110}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D138}",
-        nfc: "\u{D138}",
-        nfd: "\u{1110}\u{1165}\u{11AF}",
-        nfkc: "\u{D138}",
-        nfkd: "\u{1110}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D139}",
-        nfc: "\u{D139}",
-        nfd: "\u{1110}\u{1165}\u{11B0}",
-        nfkc: "\u{D139}",
-        nfkd: "\u{1110}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D13A}",
-        nfc: "\u{D13A}",
-        nfd: "\u{1110}\u{1165}\u{11B1}",
-        nfkc: "\u{D13A}",
-        nfkd: "\u{1110}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D13B}",
-        nfc: "\u{D13B}",
-        nfd: "\u{1110}\u{1165}\u{11B2}",
-        nfkc: "\u{D13B}",
-        nfkd: "\u{1110}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D13C}",
-        nfc: "\u{D13C}",
-        nfd: "\u{1110}\u{1165}\u{11B3}",
-        nfkc: "\u{D13C}",
-        nfkd: "\u{1110}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D13D}",
-        nfc: "\u{D13D}",
-        nfd: "\u{1110}\u{1165}\u{11B4}",
-        nfkc: "\u{D13D}",
-        nfkd: "\u{1110}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D13E}",
-        nfc: "\u{D13E}",
-        nfd: "\u{1110}\u{1165}\u{11B5}",
-        nfkc: "\u{D13E}",
-        nfkd: "\u{1110}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D13F}",
-        nfc: "\u{D13F}",
-        nfd: "\u{1110}\u{1165}\u{11B6}",
-        nfkc: "\u{D13F}",
-        nfkd: "\u{1110}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D140}",
-        nfc: "\u{D140}",
-        nfd: "\u{1110}\u{1165}\u{11B7}",
-        nfkc: "\u{D140}",
-        nfkd: "\u{1110}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D141}",
-        nfc: "\u{D141}",
-        nfd: "\u{1110}\u{1165}\u{11B8}",
-        nfkc: "\u{D141}",
-        nfkd: "\u{1110}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D142}",
-        nfc: "\u{D142}",
-        nfd: "\u{1110}\u{1165}\u{11B9}",
-        nfkc: "\u{D142}",
-        nfkd: "\u{1110}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D143}",
-        nfc: "\u{D143}",
-        nfd: "\u{1110}\u{1165}\u{11BA}",
-        nfkc: "\u{D143}",
-        nfkd: "\u{1110}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D144}",
-        nfc: "\u{D144}",
-        nfd: "\u{1110}\u{1165}\u{11BB}",
-        nfkc: "\u{D144}",
-        nfkd: "\u{1110}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D145}",
-        nfc: "\u{D145}",
-        nfd: "\u{1110}\u{1165}\u{11BC}",
-        nfkc: "\u{D145}",
-        nfkd: "\u{1110}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D146}",
-        nfc: "\u{D146}",
-        nfd: "\u{1110}\u{1165}\u{11BD}",
-        nfkc: "\u{D146}",
-        nfkd: "\u{1110}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D147}",
-        nfc: "\u{D147}",
-        nfd: "\u{1110}\u{1165}\u{11BE}",
-        nfkc: "\u{D147}",
-        nfkd: "\u{1110}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D148}",
-        nfc: "\u{D148}",
-        nfd: "\u{1110}\u{1165}\u{11BF}",
-        nfkc: "\u{D148}",
-        nfkd: "\u{1110}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D149}",
-        nfc: "\u{D149}",
-        nfd: "\u{1110}\u{1165}\u{11C0}",
-        nfkc: "\u{D149}",
-        nfkd: "\u{1110}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D14A}",
-        nfc: "\u{D14A}",
-        nfd: "\u{1110}\u{1165}\u{11C1}",
-        nfkc: "\u{D14A}",
-        nfkd: "\u{1110}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D14B}",
-        nfc: "\u{D14B}",
-        nfd: "\u{1110}\u{1165}\u{11C2}",
-        nfkc: "\u{D14B}",
-        nfkd: "\u{1110}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D14C}",
-        nfc: "\u{D14C}",
-        nfd: "\u{1110}\u{1166}",
-        nfkc: "\u{D14C}",
-        nfkd: "\u{1110}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{D14D}",
-        nfc: "\u{D14D}",
-        nfd: "\u{1110}\u{1166}\u{11A8}",
-        nfkc: "\u{D14D}",
-        nfkd: "\u{1110}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D14E}",
-        nfc: "\u{D14E}",
-        nfd: "\u{1110}\u{1166}\u{11A9}",
-        nfkc: "\u{D14E}",
-        nfkd: "\u{1110}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D14F}",
-        nfc: "\u{D14F}",
-        nfd: "\u{1110}\u{1166}\u{11AA}",
-        nfkc: "\u{D14F}",
-        nfkd: "\u{1110}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D150}",
-        nfc: "\u{D150}",
-        nfd: "\u{1110}\u{1166}\u{11AB}",
-        nfkc: "\u{D150}",
-        nfkd: "\u{1110}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D151}",
-        nfc: "\u{D151}",
-        nfd: "\u{1110}\u{1166}\u{11AC}",
-        nfkc: "\u{D151}",
-        nfkd: "\u{1110}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D152}",
-        nfc: "\u{D152}",
-        nfd: "\u{1110}\u{1166}\u{11AD}",
-        nfkc: "\u{D152}",
-        nfkd: "\u{1110}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D153}",
-        nfc: "\u{D153}",
-        nfd: "\u{1110}\u{1166}\u{11AE}",
-        nfkc: "\u{D153}",
-        nfkd: "\u{1110}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D154}",
-        nfc: "\u{D154}",
-        nfd: "\u{1110}\u{1166}\u{11AF}",
-        nfkc: "\u{D154}",
-        nfkd: "\u{1110}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D155}",
-        nfc: "\u{D155}",
-        nfd: "\u{1110}\u{1166}\u{11B0}",
-        nfkc: "\u{D155}",
-        nfkd: "\u{1110}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D156}",
-        nfc: "\u{D156}",
-        nfd: "\u{1110}\u{1166}\u{11B1}",
-        nfkc: "\u{D156}",
-        nfkd: "\u{1110}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D157}",
-        nfc: "\u{D157}",
-        nfd: "\u{1110}\u{1166}\u{11B2}",
-        nfkc: "\u{D157}",
-        nfkd: "\u{1110}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D158}",
-        nfc: "\u{D158}",
-        nfd: "\u{1110}\u{1166}\u{11B3}",
-        nfkc: "\u{D158}",
-        nfkd: "\u{1110}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D159}",
-        nfc: "\u{D159}",
-        nfd: "\u{1110}\u{1166}\u{11B4}",
-        nfkc: "\u{D159}",
-        nfkd: "\u{1110}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D15A}",
-        nfc: "\u{D15A}",
-        nfd: "\u{1110}\u{1166}\u{11B5}",
-        nfkc: "\u{D15A}",
-        nfkd: "\u{1110}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D15B}",
-        nfc: "\u{D15B}",
-        nfd: "\u{1110}\u{1166}\u{11B6}",
-        nfkc: "\u{D15B}",
-        nfkd: "\u{1110}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D15C}",
-        nfc: "\u{D15C}",
-        nfd: "\u{1110}\u{1166}\u{11B7}",
-        nfkc: "\u{D15C}",
-        nfkd: "\u{1110}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D15D}",
-        nfc: "\u{D15D}",
-        nfd: "\u{1110}\u{1166}\u{11B8}",
-        nfkc: "\u{D15D}",
-        nfkd: "\u{1110}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D15E}",
-        nfc: "\u{D15E}",
-        nfd: "\u{1110}\u{1166}\u{11B9}",
-        nfkc: "\u{D15E}",
-        nfkd: "\u{1110}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D15F}",
-        nfc: "\u{D15F}",
-        nfd: "\u{1110}\u{1166}\u{11BA}",
-        nfkc: "\u{D15F}",
-        nfkd: "\u{1110}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D160}",
-        nfc: "\u{D160}",
-        nfd: "\u{1110}\u{1166}\u{11BB}",
-        nfkc: "\u{D160}",
-        nfkd: "\u{1110}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D161}",
-        nfc: "\u{D161}",
-        nfd: "\u{1110}\u{1166}\u{11BC}",
-        nfkc: "\u{D161}",
-        nfkd: "\u{1110}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D162}",
-        nfc: "\u{D162}",
-        nfd: "\u{1110}\u{1166}\u{11BD}",
-        nfkc: "\u{D162}",
-        nfkd: "\u{1110}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D163}",
-        nfc: "\u{D163}",
-        nfd: "\u{1110}\u{1166}\u{11BE}",
-        nfkc: "\u{D163}",
-        nfkd: "\u{1110}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D164}",
-        nfc: "\u{D164}",
-        nfd: "\u{1110}\u{1166}\u{11BF}",
-        nfkc: "\u{D164}",
-        nfkd: "\u{1110}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D165}",
-        nfc: "\u{D165}",
-        nfd: "\u{1110}\u{1166}\u{11C0}",
-        nfkc: "\u{D165}",
-        nfkd: "\u{1110}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D166}",
-        nfc: "\u{D166}",
-        nfd: "\u{1110}\u{1166}\u{11C1}",
-        nfkc: "\u{D166}",
-        nfkd: "\u{1110}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D167}",
-        nfc: "\u{D167}",
-        nfd: "\u{1110}\u{1166}\u{11C2}",
-        nfkc: "\u{D167}",
-        nfkd: "\u{1110}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D168}",
-        nfc: "\u{D168}",
-        nfd: "\u{1110}\u{1167}",
-        nfkc: "\u{D168}",
-        nfkd: "\u{1110}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{D169}",
-        nfc: "\u{D169}",
-        nfd: "\u{1110}\u{1167}\u{11A8}",
-        nfkc: "\u{D169}",
-        nfkd: "\u{1110}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D16A}",
-        nfc: "\u{D16A}",
-        nfd: "\u{1110}\u{1167}\u{11A9}",
-        nfkc: "\u{D16A}",
-        nfkd: "\u{1110}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D16B}",
-        nfc: "\u{D16B}",
-        nfd: "\u{1110}\u{1167}\u{11AA}",
-        nfkc: "\u{D16B}",
-        nfkd: "\u{1110}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D16C}",
-        nfc: "\u{D16C}",
-        nfd: "\u{1110}\u{1167}\u{11AB}",
-        nfkc: "\u{D16C}",
-        nfkd: "\u{1110}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D16D}",
-        nfc: "\u{D16D}",
-        nfd: "\u{1110}\u{1167}\u{11AC}",
-        nfkc: "\u{D16D}",
-        nfkd: "\u{1110}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D16E}",
-        nfc: "\u{D16E}",
-        nfd: "\u{1110}\u{1167}\u{11AD}",
-        nfkc: "\u{D16E}",
-        nfkd: "\u{1110}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D16F}",
-        nfc: "\u{D16F}",
-        nfd: "\u{1110}\u{1167}\u{11AE}",
-        nfkc: "\u{D16F}",
-        nfkd: "\u{1110}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D170}",
-        nfc: "\u{D170}",
-        nfd: "\u{1110}\u{1167}\u{11AF}",
-        nfkc: "\u{D170}",
-        nfkd: "\u{1110}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D171}",
-        nfc: "\u{D171}",
-        nfd: "\u{1110}\u{1167}\u{11B0}",
-        nfkc: "\u{D171}",
-        nfkd: "\u{1110}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D172}",
-        nfc: "\u{D172}",
-        nfd: "\u{1110}\u{1167}\u{11B1}",
-        nfkc: "\u{D172}",
-        nfkd: "\u{1110}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D173}",
-        nfc: "\u{D173}",
-        nfd: "\u{1110}\u{1167}\u{11B2}",
-        nfkc: "\u{D173}",
-        nfkd: "\u{1110}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D174}",
-        nfc: "\u{D174}",
-        nfd: "\u{1110}\u{1167}\u{11B3}",
-        nfkc: "\u{D174}",
-        nfkd: "\u{1110}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D175}",
-        nfc: "\u{D175}",
-        nfd: "\u{1110}\u{1167}\u{11B4}",
-        nfkc: "\u{D175}",
-        nfkd: "\u{1110}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D176}",
-        nfc: "\u{D176}",
-        nfd: "\u{1110}\u{1167}\u{11B5}",
-        nfkc: "\u{D176}",
-        nfkd: "\u{1110}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D177}",
-        nfc: "\u{D177}",
-        nfd: "\u{1110}\u{1167}\u{11B6}",
-        nfkc: "\u{D177}",
-        nfkd: "\u{1110}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D178}",
-        nfc: "\u{D178}",
-        nfd: "\u{1110}\u{1167}\u{11B7}",
-        nfkc: "\u{D178}",
-        nfkd: "\u{1110}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D179}",
-        nfc: "\u{D179}",
-        nfd: "\u{1110}\u{1167}\u{11B8}",
-        nfkc: "\u{D179}",
-        nfkd: "\u{1110}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D17A}",
-        nfc: "\u{D17A}",
-        nfd: "\u{1110}\u{1167}\u{11B9}",
-        nfkc: "\u{D17A}",
-        nfkd: "\u{1110}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D17B}",
-        nfc: "\u{D17B}",
-        nfd: "\u{1110}\u{1167}\u{11BA}",
-        nfkc: "\u{D17B}",
-        nfkd: "\u{1110}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D17C}",
-        nfc: "\u{D17C}",
-        nfd: "\u{1110}\u{1167}\u{11BB}",
-        nfkc: "\u{D17C}",
-        nfkd: "\u{1110}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D17D}",
-        nfc: "\u{D17D}",
-        nfd: "\u{1110}\u{1167}\u{11BC}",
-        nfkc: "\u{D17D}",
-        nfkd: "\u{1110}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D17E}",
-        nfc: "\u{D17E}",
-        nfd: "\u{1110}\u{1167}\u{11BD}",
-        nfkc: "\u{D17E}",
-        nfkd: "\u{1110}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D17F}",
-        nfc: "\u{D17F}",
-        nfd: "\u{1110}\u{1167}\u{11BE}",
-        nfkc: "\u{D17F}",
-        nfkd: "\u{1110}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D180}",
-        nfc: "\u{D180}",
-        nfd: "\u{1110}\u{1167}\u{11BF}",
-        nfkc: "\u{D180}",
-        nfkd: "\u{1110}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D181}",
-        nfc: "\u{D181}",
-        nfd: "\u{1110}\u{1167}\u{11C0}",
-        nfkc: "\u{D181}",
-        nfkd: "\u{1110}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D182}",
-        nfc: "\u{D182}",
-        nfd: "\u{1110}\u{1167}\u{11C1}",
-        nfkc: "\u{D182}",
-        nfkd: "\u{1110}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D183}",
-        nfc: "\u{D183}",
-        nfd: "\u{1110}\u{1167}\u{11C2}",
-        nfkc: "\u{D183}",
-        nfkd: "\u{1110}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D184}",
-        nfc: "\u{D184}",
-        nfd: "\u{1110}\u{1168}",
-        nfkc: "\u{D184}",
-        nfkd: "\u{1110}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{D185}",
-        nfc: "\u{D185}",
-        nfd: "\u{1110}\u{1168}\u{11A8}",
-        nfkc: "\u{D185}",
-        nfkd: "\u{1110}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D186}",
-        nfc: "\u{D186}",
-        nfd: "\u{1110}\u{1168}\u{11A9}",
-        nfkc: "\u{D186}",
-        nfkd: "\u{1110}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D187}",
-        nfc: "\u{D187}",
-        nfd: "\u{1110}\u{1168}\u{11AA}",
-        nfkc: "\u{D187}",
-        nfkd: "\u{1110}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D188}",
-        nfc: "\u{D188}",
-        nfd: "\u{1110}\u{1168}\u{11AB}",
-        nfkc: "\u{D188}",
-        nfkd: "\u{1110}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D189}",
-        nfc: "\u{D189}",
-        nfd: "\u{1110}\u{1168}\u{11AC}",
-        nfkc: "\u{D189}",
-        nfkd: "\u{1110}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D18A}",
-        nfc: "\u{D18A}",
-        nfd: "\u{1110}\u{1168}\u{11AD}",
-        nfkc: "\u{D18A}",
-        nfkd: "\u{1110}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D18B}",
-        nfc: "\u{D18B}",
-        nfd: "\u{1110}\u{1168}\u{11AE}",
-        nfkc: "\u{D18B}",
-        nfkd: "\u{1110}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D18C}",
-        nfc: "\u{D18C}",
-        nfd: "\u{1110}\u{1168}\u{11AF}",
-        nfkc: "\u{D18C}",
-        nfkd: "\u{1110}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D18D}",
-        nfc: "\u{D18D}",
-        nfd: "\u{1110}\u{1168}\u{11B0}",
-        nfkc: "\u{D18D}",
-        nfkd: "\u{1110}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D18E}",
-        nfc: "\u{D18E}",
-        nfd: "\u{1110}\u{1168}\u{11B1}",
-        nfkc: "\u{D18E}",
-        nfkd: "\u{1110}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D18F}",
-        nfc: "\u{D18F}",
-        nfd: "\u{1110}\u{1168}\u{11B2}",
-        nfkc: "\u{D18F}",
-        nfkd: "\u{1110}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D190}",
-        nfc: "\u{D190}",
-        nfd: "\u{1110}\u{1168}\u{11B3}",
-        nfkc: "\u{D190}",
-        nfkd: "\u{1110}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D191}",
-        nfc: "\u{D191}",
-        nfd: "\u{1110}\u{1168}\u{11B4}",
-        nfkc: "\u{D191}",
-        nfkd: "\u{1110}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D192}",
-        nfc: "\u{D192}",
-        nfd: "\u{1110}\u{1168}\u{11B5}",
-        nfkc: "\u{D192}",
-        nfkd: "\u{1110}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D193}",
-        nfc: "\u{D193}",
-        nfd: "\u{1110}\u{1168}\u{11B6}",
-        nfkc: "\u{D193}",
-        nfkd: "\u{1110}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D194}",
-        nfc: "\u{D194}",
-        nfd: "\u{1110}\u{1168}\u{11B7}",
-        nfkc: "\u{D194}",
-        nfkd: "\u{1110}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D195}",
-        nfc: "\u{D195}",
-        nfd: "\u{1110}\u{1168}\u{11B8}",
-        nfkc: "\u{D195}",
-        nfkd: "\u{1110}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D196}",
-        nfc: "\u{D196}",
-        nfd: "\u{1110}\u{1168}\u{11B9}",
-        nfkc: "\u{D196}",
-        nfkd: "\u{1110}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D197}",
-        nfc: "\u{D197}",
-        nfd: "\u{1110}\u{1168}\u{11BA}",
-        nfkc: "\u{D197}",
-        nfkd: "\u{1110}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D198}",
-        nfc: "\u{D198}",
-        nfd: "\u{1110}\u{1168}\u{11BB}",
-        nfkc: "\u{D198}",
-        nfkd: "\u{1110}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D199}",
-        nfc: "\u{D199}",
-        nfd: "\u{1110}\u{1168}\u{11BC}",
-        nfkc: "\u{D199}",
-        nfkd: "\u{1110}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D19A}",
-        nfc: "\u{D19A}",
-        nfd: "\u{1110}\u{1168}\u{11BD}",
-        nfkc: "\u{D19A}",
-        nfkd: "\u{1110}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D19B}",
-        nfc: "\u{D19B}",
-        nfd: "\u{1110}\u{1168}\u{11BE}",
-        nfkc: "\u{D19B}",
-        nfkd: "\u{1110}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D19C}",
-        nfc: "\u{D19C}",
-        nfd: "\u{1110}\u{1168}\u{11BF}",
-        nfkc: "\u{D19C}",
-        nfkd: "\u{1110}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D19D}",
-        nfc: "\u{D19D}",
-        nfd: "\u{1110}\u{1168}\u{11C0}",
-        nfkc: "\u{D19D}",
-        nfkd: "\u{1110}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D19E}",
-        nfc: "\u{D19E}",
-        nfd: "\u{1110}\u{1168}\u{11C1}",
-        nfkc: "\u{D19E}",
-        nfkd: "\u{1110}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D19F}",
-        nfc: "\u{D19F}",
-        nfd: "\u{1110}\u{1168}\u{11C2}",
-        nfkc: "\u{D19F}",
-        nfkd: "\u{1110}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D1A0}",
-        nfc: "\u{D1A0}",
-        nfd: "\u{1110}\u{1169}",
-        nfkc: "\u{D1A0}",
-        nfkd: "\u{1110}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{D1A1}",
-        nfc: "\u{D1A1}",
-        nfd: "\u{1110}\u{1169}\u{11A8}",
-        nfkc: "\u{D1A1}",
-        nfkd: "\u{1110}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D1A2}",
-        nfc: "\u{D1A2}",
-        nfd: "\u{1110}\u{1169}\u{11A9}",
-        nfkc: "\u{D1A2}",
-        nfkd: "\u{1110}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D1A3}",
-        nfc: "\u{D1A3}",
-        nfd: "\u{1110}\u{1169}\u{11AA}",
-        nfkc: "\u{D1A3}",
-        nfkd: "\u{1110}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D1A4}",
-        nfc: "\u{D1A4}",
-        nfd: "\u{1110}\u{1169}\u{11AB}",
-        nfkc: "\u{D1A4}",
-        nfkd: "\u{1110}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D1A5}",
-        nfc: "\u{D1A5}",
-        nfd: "\u{1110}\u{1169}\u{11AC}",
-        nfkc: "\u{D1A5}",
-        nfkd: "\u{1110}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D1A6}",
-        nfc: "\u{D1A6}",
-        nfd: "\u{1110}\u{1169}\u{11AD}",
-        nfkc: "\u{D1A6}",
-        nfkd: "\u{1110}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D1A7}",
-        nfc: "\u{D1A7}",
-        nfd: "\u{1110}\u{1169}\u{11AE}",
-        nfkc: "\u{D1A7}",
-        nfkd: "\u{1110}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D1A8}",
-        nfc: "\u{D1A8}",
-        nfd: "\u{1110}\u{1169}\u{11AF}",
-        nfkc: "\u{D1A8}",
-        nfkd: "\u{1110}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D1A9}",
-        nfc: "\u{D1A9}",
-        nfd: "\u{1110}\u{1169}\u{11B0}",
-        nfkc: "\u{D1A9}",
-        nfkd: "\u{1110}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D1AA}",
-        nfc: "\u{D1AA}",
-        nfd: "\u{1110}\u{1169}\u{11B1}",
-        nfkc: "\u{D1AA}",
-        nfkd: "\u{1110}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D1AB}",
-        nfc: "\u{D1AB}",
-        nfd: "\u{1110}\u{1169}\u{11B2}",
-        nfkc: "\u{D1AB}",
-        nfkd: "\u{1110}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D1AC}",
-        nfc: "\u{D1AC}",
-        nfd: "\u{1110}\u{1169}\u{11B3}",
-        nfkc: "\u{D1AC}",
-        nfkd: "\u{1110}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D1AD}",
-        nfc: "\u{D1AD}",
-        nfd: "\u{1110}\u{1169}\u{11B4}",
-        nfkc: "\u{D1AD}",
-        nfkd: "\u{1110}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D1AE}",
-        nfc: "\u{D1AE}",
-        nfd: "\u{1110}\u{1169}\u{11B5}",
-        nfkc: "\u{D1AE}",
-        nfkd: "\u{1110}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D1AF}",
-        nfc: "\u{D1AF}",
-        nfd: "\u{1110}\u{1169}\u{11B6}",
-        nfkc: "\u{D1AF}",
-        nfkd: "\u{1110}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D1B0}",
-        nfc: "\u{D1B0}",
-        nfd: "\u{1110}\u{1169}\u{11B7}",
-        nfkc: "\u{D1B0}",
-        nfkd: "\u{1110}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D1B1}",
-        nfc: "\u{D1B1}",
-        nfd: "\u{1110}\u{1169}\u{11B8}",
-        nfkc: "\u{D1B1}",
-        nfkd: "\u{1110}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D1B2}",
-        nfc: "\u{D1B2}",
-        nfd: "\u{1110}\u{1169}\u{11B9}",
-        nfkc: "\u{D1B2}",
-        nfkd: "\u{1110}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D1B3}",
-        nfc: "\u{D1B3}",
-        nfd: "\u{1110}\u{1169}\u{11BA}",
-        nfkc: "\u{D1B3}",
-        nfkd: "\u{1110}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D1B4}",
-        nfc: "\u{D1B4}",
-        nfd: "\u{1110}\u{1169}\u{11BB}",
-        nfkc: "\u{D1B4}",
-        nfkd: "\u{1110}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D1B5}",
-        nfc: "\u{D1B5}",
-        nfd: "\u{1110}\u{1169}\u{11BC}",
-        nfkc: "\u{D1B5}",
-        nfkd: "\u{1110}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D1B6}",
-        nfc: "\u{D1B6}",
-        nfd: "\u{1110}\u{1169}\u{11BD}",
-        nfkc: "\u{D1B6}",
-        nfkd: "\u{1110}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D1B7}",
-        nfc: "\u{D1B7}",
-        nfd: "\u{1110}\u{1169}\u{11BE}",
-        nfkc: "\u{D1B7}",
-        nfkd: "\u{1110}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D1B8}",
-        nfc: "\u{D1B8}",
-        nfd: "\u{1110}\u{1169}\u{11BF}",
-        nfkc: "\u{D1B8}",
-        nfkd: "\u{1110}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D1B9}",
-        nfc: "\u{D1B9}",
-        nfd: "\u{1110}\u{1169}\u{11C0}",
-        nfkc: "\u{D1B9}",
-        nfkd: "\u{1110}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D1BA}",
-        nfc: "\u{D1BA}",
-        nfd: "\u{1110}\u{1169}\u{11C1}",
-        nfkc: "\u{D1BA}",
-        nfkd: "\u{1110}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D1BB}",
-        nfc: "\u{D1BB}",
-        nfd: "\u{1110}\u{1169}\u{11C2}",
-        nfkc: "\u{D1BB}",
-        nfkd: "\u{1110}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D1BC}",
-        nfc: "\u{D1BC}",
-        nfd: "\u{1110}\u{116A}",
-        nfkc: "\u{D1BC}",
-        nfkd: "\u{1110}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{D1BD}",
-        nfc: "\u{D1BD}",
-        nfd: "\u{1110}\u{116A}\u{11A8}",
-        nfkc: "\u{D1BD}",
-        nfkd: "\u{1110}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D1BE}",
-        nfc: "\u{D1BE}",
-        nfd: "\u{1110}\u{116A}\u{11A9}",
-        nfkc: "\u{D1BE}",
-        nfkd: "\u{1110}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D1BF}",
-        nfc: "\u{D1BF}",
-        nfd: "\u{1110}\u{116A}\u{11AA}",
-        nfkc: "\u{D1BF}",
-        nfkd: "\u{1110}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D1C0}",
-        nfc: "\u{D1C0}",
-        nfd: "\u{1110}\u{116A}\u{11AB}",
-        nfkc: "\u{D1C0}",
-        nfkd: "\u{1110}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D1C1}",
-        nfc: "\u{D1C1}",
-        nfd: "\u{1110}\u{116A}\u{11AC}",
-        nfkc: "\u{D1C1}",
-        nfkd: "\u{1110}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D1C2}",
-        nfc: "\u{D1C2}",
-        nfd: "\u{1110}\u{116A}\u{11AD}",
-        nfkc: "\u{D1C2}",
-        nfkd: "\u{1110}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D1C3}",
-        nfc: "\u{D1C3}",
-        nfd: "\u{1110}\u{116A}\u{11AE}",
-        nfkc: "\u{D1C3}",
-        nfkd: "\u{1110}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D1C4}",
-        nfc: "\u{D1C4}",
-        nfd: "\u{1110}\u{116A}\u{11AF}",
-        nfkc: "\u{D1C4}",
-        nfkd: "\u{1110}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D1C5}",
-        nfc: "\u{D1C5}",
-        nfd: "\u{1110}\u{116A}\u{11B0}",
-        nfkc: "\u{D1C5}",
-        nfkd: "\u{1110}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D1C6}",
-        nfc: "\u{D1C6}",
-        nfd: "\u{1110}\u{116A}\u{11B1}",
-        nfkc: "\u{D1C6}",
-        nfkd: "\u{1110}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D1C7}",
-        nfc: "\u{D1C7}",
-        nfd: "\u{1110}\u{116A}\u{11B2}",
-        nfkc: "\u{D1C7}",
-        nfkd: "\u{1110}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D1C8}",
-        nfc: "\u{D1C8}",
-        nfd: "\u{1110}\u{116A}\u{11B3}",
-        nfkc: "\u{D1C8}",
-        nfkd: "\u{1110}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D1C9}",
-        nfc: "\u{D1C9}",
-        nfd: "\u{1110}\u{116A}\u{11B4}",
-        nfkc: "\u{D1C9}",
-        nfkd: "\u{1110}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D1CA}",
-        nfc: "\u{D1CA}",
-        nfd: "\u{1110}\u{116A}\u{11B5}",
-        nfkc: "\u{D1CA}",
-        nfkd: "\u{1110}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D1CB}",
-        nfc: "\u{D1CB}",
-        nfd: "\u{1110}\u{116A}\u{11B6}",
-        nfkc: "\u{D1CB}",
-        nfkd: "\u{1110}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D1CC}",
-        nfc: "\u{D1CC}",
-        nfd: "\u{1110}\u{116A}\u{11B7}",
-        nfkc: "\u{D1CC}",
-        nfkd: "\u{1110}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D1CD}",
-        nfc: "\u{D1CD}",
-        nfd: "\u{1110}\u{116A}\u{11B8}",
-        nfkc: "\u{D1CD}",
-        nfkd: "\u{1110}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D1CE}",
-        nfc: "\u{D1CE}",
-        nfd: "\u{1110}\u{116A}\u{11B9}",
-        nfkc: "\u{D1CE}",
-        nfkd: "\u{1110}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D1CF}",
-        nfc: "\u{D1CF}",
-        nfd: "\u{1110}\u{116A}\u{11BA}",
-        nfkc: "\u{D1CF}",
-        nfkd: "\u{1110}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D1D0}",
-        nfc: "\u{D1D0}",
-        nfd: "\u{1110}\u{116A}\u{11BB}",
-        nfkc: "\u{D1D0}",
-        nfkd: "\u{1110}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D1D1}",
-        nfc: "\u{D1D1}",
-        nfd: "\u{1110}\u{116A}\u{11BC}",
-        nfkc: "\u{D1D1}",
-        nfkd: "\u{1110}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D1D2}",
-        nfc: "\u{D1D2}",
-        nfd: "\u{1110}\u{116A}\u{11BD}",
-        nfkc: "\u{D1D2}",
-        nfkd: "\u{1110}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D1D3}",
-        nfc: "\u{D1D3}",
-        nfd: "\u{1110}\u{116A}\u{11BE}",
-        nfkc: "\u{D1D3}",
-        nfkd: "\u{1110}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D1D4}",
-        nfc: "\u{D1D4}",
-        nfd: "\u{1110}\u{116A}\u{11BF}",
-        nfkc: "\u{D1D4}",
-        nfkd: "\u{1110}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D1D5}",
-        nfc: "\u{D1D5}",
-        nfd: "\u{1110}\u{116A}\u{11C0}",
-        nfkc: "\u{D1D5}",
-        nfkd: "\u{1110}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D1D6}",
-        nfc: "\u{D1D6}",
-        nfd: "\u{1110}\u{116A}\u{11C1}",
-        nfkc: "\u{D1D6}",
-        nfkd: "\u{1110}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D1D7}",
-        nfc: "\u{D1D7}",
-        nfd: "\u{1110}\u{116A}\u{11C2}",
-        nfkc: "\u{D1D7}",
-        nfkd: "\u{1110}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D1D8}",
-        nfc: "\u{D1D8}",
-        nfd: "\u{1110}\u{116B}",
-        nfkc: "\u{D1D8}",
-        nfkd: "\u{1110}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{D1D9}",
-        nfc: "\u{D1D9}",
-        nfd: "\u{1110}\u{116B}\u{11A8}",
-        nfkc: "\u{D1D9}",
-        nfkd: "\u{1110}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D1DA}",
-        nfc: "\u{D1DA}",
-        nfd: "\u{1110}\u{116B}\u{11A9}",
-        nfkc: "\u{D1DA}",
-        nfkd: "\u{1110}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D1DB}",
-        nfc: "\u{D1DB}",
-        nfd: "\u{1110}\u{116B}\u{11AA}",
-        nfkc: "\u{D1DB}",
-        nfkd: "\u{1110}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D1DC}",
-        nfc: "\u{D1DC}",
-        nfd: "\u{1110}\u{116B}\u{11AB}",
-        nfkc: "\u{D1DC}",
-        nfkd: "\u{1110}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D1DD}",
-        nfc: "\u{D1DD}",
-        nfd: "\u{1110}\u{116B}\u{11AC}",
-        nfkc: "\u{D1DD}",
-        nfkd: "\u{1110}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D1DE}",
-        nfc: "\u{D1DE}",
-        nfd: "\u{1110}\u{116B}\u{11AD}",
-        nfkc: "\u{D1DE}",
-        nfkd: "\u{1110}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D1DF}",
-        nfc: "\u{D1DF}",
-        nfd: "\u{1110}\u{116B}\u{11AE}",
-        nfkc: "\u{D1DF}",
-        nfkd: "\u{1110}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D1E0}",
-        nfc: "\u{D1E0}",
-        nfd: "\u{1110}\u{116B}\u{11AF}",
-        nfkc: "\u{D1E0}",
-        nfkd: "\u{1110}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D1E1}",
-        nfc: "\u{D1E1}",
-        nfd: "\u{1110}\u{116B}\u{11B0}",
-        nfkc: "\u{D1E1}",
-        nfkd: "\u{1110}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D1E2}",
-        nfc: "\u{D1E2}",
-        nfd: "\u{1110}\u{116B}\u{11B1}",
-        nfkc: "\u{D1E2}",
-        nfkd: "\u{1110}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D1E3}",
-        nfc: "\u{D1E3}",
-        nfd: "\u{1110}\u{116B}\u{11B2}",
-        nfkc: "\u{D1E3}",
-        nfkd: "\u{1110}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D1E4}",
-        nfc: "\u{D1E4}",
-        nfd: "\u{1110}\u{116B}\u{11B3}",
-        nfkc: "\u{D1E4}",
-        nfkd: "\u{1110}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D1E5}",
-        nfc: "\u{D1E5}",
-        nfd: "\u{1110}\u{116B}\u{11B4}",
-        nfkc: "\u{D1E5}",
-        nfkd: "\u{1110}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D1E6}",
-        nfc: "\u{D1E6}",
-        nfd: "\u{1110}\u{116B}\u{11B5}",
-        nfkc: "\u{D1E6}",
-        nfkd: "\u{1110}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D1E7}",
-        nfc: "\u{D1E7}",
-        nfd: "\u{1110}\u{116B}\u{11B6}",
-        nfkc: "\u{D1E7}",
-        nfkd: "\u{1110}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D1E8}",
-        nfc: "\u{D1E8}",
-        nfd: "\u{1110}\u{116B}\u{11B7}",
-        nfkc: "\u{D1E8}",
-        nfkd: "\u{1110}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D1E9}",
-        nfc: "\u{D1E9}",
-        nfd: "\u{1110}\u{116B}\u{11B8}",
-        nfkc: "\u{D1E9}",
-        nfkd: "\u{1110}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D1EA}",
-        nfc: "\u{D1EA}",
-        nfd: "\u{1110}\u{116B}\u{11B9}",
-        nfkc: "\u{D1EA}",
-        nfkd: "\u{1110}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D1EB}",
-        nfc: "\u{D1EB}",
-        nfd: "\u{1110}\u{116B}\u{11BA}",
-        nfkc: "\u{D1EB}",
-        nfkd: "\u{1110}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D1EC}",
-        nfc: "\u{D1EC}",
-        nfd: "\u{1110}\u{116B}\u{11BB}",
-        nfkc: "\u{D1EC}",
-        nfkd: "\u{1110}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D1ED}",
-        nfc: "\u{D1ED}",
-        nfd: "\u{1110}\u{116B}\u{11BC}",
-        nfkc: "\u{D1ED}",
-        nfkd: "\u{1110}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D1EE}",
-        nfc: "\u{D1EE}",
-        nfd: "\u{1110}\u{116B}\u{11BD}",
-        nfkc: "\u{D1EE}",
-        nfkd: "\u{1110}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D1EF}",
-        nfc: "\u{D1EF}",
-        nfd: "\u{1110}\u{116B}\u{11BE}",
-        nfkc: "\u{D1EF}",
-        nfkd: "\u{1110}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D1F0}",
-        nfc: "\u{D1F0}",
-        nfd: "\u{1110}\u{116B}\u{11BF}",
-        nfkc: "\u{D1F0}",
-        nfkd: "\u{1110}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D1F1}",
-        nfc: "\u{D1F1}",
-        nfd: "\u{1110}\u{116B}\u{11C0}",
-        nfkc: "\u{D1F1}",
-        nfkd: "\u{1110}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D1F2}",
-        nfc: "\u{D1F2}",
-        nfd: "\u{1110}\u{116B}\u{11C1}",
-        nfkc: "\u{D1F2}",
-        nfkd: "\u{1110}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D1F3}",
-        nfc: "\u{D1F3}",
-        nfd: "\u{1110}\u{116B}\u{11C2}",
-        nfkc: "\u{D1F3}",
-        nfkd: "\u{1110}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D1F4}",
-        nfc: "\u{D1F4}",
-        nfd: "\u{1110}\u{116C}",
-        nfkc: "\u{D1F4}",
-        nfkd: "\u{1110}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{D1F5}",
-        nfc: "\u{D1F5}",
-        nfd: "\u{1110}\u{116C}\u{11A8}",
-        nfkc: "\u{D1F5}",
-        nfkd: "\u{1110}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D1F6}",
-        nfc: "\u{D1F6}",
-        nfd: "\u{1110}\u{116C}\u{11A9}",
-        nfkc: "\u{D1F6}",
-        nfkd: "\u{1110}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D1F7}",
-        nfc: "\u{D1F7}",
-        nfd: "\u{1110}\u{116C}\u{11AA}",
-        nfkc: "\u{D1F7}",
-        nfkd: "\u{1110}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D1F8}",
-        nfc: "\u{D1F8}",
-        nfd: "\u{1110}\u{116C}\u{11AB}",
-        nfkc: "\u{D1F8}",
-        nfkd: "\u{1110}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D1F9}",
-        nfc: "\u{D1F9}",
-        nfd: "\u{1110}\u{116C}\u{11AC}",
-        nfkc: "\u{D1F9}",
-        nfkd: "\u{1110}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D1FA}",
-        nfc: "\u{D1FA}",
-        nfd: "\u{1110}\u{116C}\u{11AD}",
-        nfkc: "\u{D1FA}",
-        nfkd: "\u{1110}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D1FB}",
-        nfc: "\u{D1FB}",
-        nfd: "\u{1110}\u{116C}\u{11AE}",
-        nfkc: "\u{D1FB}",
-        nfkd: "\u{1110}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D1FC}",
-        nfc: "\u{D1FC}",
-        nfd: "\u{1110}\u{116C}\u{11AF}",
-        nfkc: "\u{D1FC}",
-        nfkd: "\u{1110}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D1FD}",
-        nfc: "\u{D1FD}",
-        nfd: "\u{1110}\u{116C}\u{11B0}",
-        nfkc: "\u{D1FD}",
-        nfkd: "\u{1110}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D1FE}",
-        nfc: "\u{D1FE}",
-        nfd: "\u{1110}\u{116C}\u{11B1}",
-        nfkc: "\u{D1FE}",
-        nfkd: "\u{1110}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D1FF}",
-        nfc: "\u{D1FF}",
-        nfd: "\u{1110}\u{116C}\u{11B2}",
-        nfkc: "\u{D1FF}",
-        nfkd: "\u{1110}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D200}",
-        nfc: "\u{D200}",
-        nfd: "\u{1110}\u{116C}\u{11B3}",
-        nfkc: "\u{D200}",
-        nfkd: "\u{1110}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D201}",
-        nfc: "\u{D201}",
-        nfd: "\u{1110}\u{116C}\u{11B4}",
-        nfkc: "\u{D201}",
-        nfkd: "\u{1110}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D202}",
-        nfc: "\u{D202}",
-        nfd: "\u{1110}\u{116C}\u{11B5}",
-        nfkc: "\u{D202}",
-        nfkd: "\u{1110}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D203}",
-        nfc: "\u{D203}",
-        nfd: "\u{1110}\u{116C}\u{11B6}",
-        nfkc: "\u{D203}",
-        nfkd: "\u{1110}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D204}",
-        nfc: "\u{D204}",
-        nfd: "\u{1110}\u{116C}\u{11B7}",
-        nfkc: "\u{D204}",
-        nfkd: "\u{1110}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D205}",
-        nfc: "\u{D205}",
-        nfd: "\u{1110}\u{116C}\u{11B8}",
-        nfkc: "\u{D205}",
-        nfkd: "\u{1110}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D206}",
-        nfc: "\u{D206}",
-        nfd: "\u{1110}\u{116C}\u{11B9}",
-        nfkc: "\u{D206}",
-        nfkd: "\u{1110}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D207}",
-        nfc: "\u{D207}",
-        nfd: "\u{1110}\u{116C}\u{11BA}",
-        nfkc: "\u{D207}",
-        nfkd: "\u{1110}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D208}",
-        nfc: "\u{D208}",
-        nfd: "\u{1110}\u{116C}\u{11BB}",
-        nfkc: "\u{D208}",
-        nfkd: "\u{1110}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D209}",
-        nfc: "\u{D209}",
-        nfd: "\u{1110}\u{116C}\u{11BC}",
-        nfkc: "\u{D209}",
-        nfkd: "\u{1110}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D20A}",
-        nfc: "\u{D20A}",
-        nfd: "\u{1110}\u{116C}\u{11BD}",
-        nfkc: "\u{D20A}",
-        nfkd: "\u{1110}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D20B}",
-        nfc: "\u{D20B}",
-        nfd: "\u{1110}\u{116C}\u{11BE}",
-        nfkc: "\u{D20B}",
-        nfkd: "\u{1110}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D20C}",
-        nfc: "\u{D20C}",
-        nfd: "\u{1110}\u{116C}\u{11BF}",
-        nfkc: "\u{D20C}",
-        nfkd: "\u{1110}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D20D}",
-        nfc: "\u{D20D}",
-        nfd: "\u{1110}\u{116C}\u{11C0}",
-        nfkc: "\u{D20D}",
-        nfkd: "\u{1110}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D20E}",
-        nfc: "\u{D20E}",
-        nfd: "\u{1110}\u{116C}\u{11C1}",
-        nfkc: "\u{D20E}",
-        nfkd: "\u{1110}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D20F}",
-        nfc: "\u{D20F}",
-        nfd: "\u{1110}\u{116C}\u{11C2}",
-        nfkc: "\u{D20F}",
-        nfkd: "\u{1110}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D210}",
-        nfc: "\u{D210}",
-        nfd: "\u{1110}\u{116D}",
-        nfkc: "\u{D210}",
-        nfkd: "\u{1110}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{D211}",
-        nfc: "\u{D211}",
-        nfd: "\u{1110}\u{116D}\u{11A8}",
-        nfkc: "\u{D211}",
-        nfkd: "\u{1110}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D212}",
-        nfc: "\u{D212}",
-        nfd: "\u{1110}\u{116D}\u{11A9}",
-        nfkc: "\u{D212}",
-        nfkd: "\u{1110}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D213}",
-        nfc: "\u{D213}",
-        nfd: "\u{1110}\u{116D}\u{11AA}",
-        nfkc: "\u{D213}",
-        nfkd: "\u{1110}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D214}",
-        nfc: "\u{D214}",
-        nfd: "\u{1110}\u{116D}\u{11AB}",
-        nfkc: "\u{D214}",
-        nfkd: "\u{1110}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D215}",
-        nfc: "\u{D215}",
-        nfd: "\u{1110}\u{116D}\u{11AC}",
-        nfkc: "\u{D215}",
-        nfkd: "\u{1110}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D216}",
-        nfc: "\u{D216}",
-        nfd: "\u{1110}\u{116D}\u{11AD}",
-        nfkc: "\u{D216}",
-        nfkd: "\u{1110}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D217}",
-        nfc: "\u{D217}",
-        nfd: "\u{1110}\u{116D}\u{11AE}",
-        nfkc: "\u{D217}",
-        nfkd: "\u{1110}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D218}",
-        nfc: "\u{D218}",
-        nfd: "\u{1110}\u{116D}\u{11AF}",
-        nfkc: "\u{D218}",
-        nfkd: "\u{1110}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D219}",
-        nfc: "\u{D219}",
-        nfd: "\u{1110}\u{116D}\u{11B0}",
-        nfkc: "\u{D219}",
-        nfkd: "\u{1110}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D21A}",
-        nfc: "\u{D21A}",
-        nfd: "\u{1110}\u{116D}\u{11B1}",
-        nfkc: "\u{D21A}",
-        nfkd: "\u{1110}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D21B}",
-        nfc: "\u{D21B}",
-        nfd: "\u{1110}\u{116D}\u{11B2}",
-        nfkc: "\u{D21B}",
-        nfkd: "\u{1110}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D21C}",
-        nfc: "\u{D21C}",
-        nfd: "\u{1110}\u{116D}\u{11B3}",
-        nfkc: "\u{D21C}",
-        nfkd: "\u{1110}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D21D}",
-        nfc: "\u{D21D}",
-        nfd: "\u{1110}\u{116D}\u{11B4}",
-        nfkc: "\u{D21D}",
-        nfkd: "\u{1110}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D21E}",
-        nfc: "\u{D21E}",
-        nfd: "\u{1110}\u{116D}\u{11B5}",
-        nfkc: "\u{D21E}",
-        nfkd: "\u{1110}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D21F}",
-        nfc: "\u{D21F}",
-        nfd: "\u{1110}\u{116D}\u{11B6}",
-        nfkc: "\u{D21F}",
-        nfkd: "\u{1110}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D220}",
-        nfc: "\u{D220}",
-        nfd: "\u{1110}\u{116D}\u{11B7}",
-        nfkc: "\u{D220}",
-        nfkd: "\u{1110}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D221}",
-        nfc: "\u{D221}",
-        nfd: "\u{1110}\u{116D}\u{11B8}",
-        nfkc: "\u{D221}",
-        nfkd: "\u{1110}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D222}",
-        nfc: "\u{D222}",
-        nfd: "\u{1110}\u{116D}\u{11B9}",
-        nfkc: "\u{D222}",
-        nfkd: "\u{1110}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D223}",
-        nfc: "\u{D223}",
-        nfd: "\u{1110}\u{116D}\u{11BA}",
-        nfkc: "\u{D223}",
-        nfkd: "\u{1110}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D224}",
-        nfc: "\u{D224}",
-        nfd: "\u{1110}\u{116D}\u{11BB}",
-        nfkc: "\u{D224}",
-        nfkd: "\u{1110}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D225}",
-        nfc: "\u{D225}",
-        nfd: "\u{1110}\u{116D}\u{11BC}",
-        nfkc: "\u{D225}",
-        nfkd: "\u{1110}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D226}",
-        nfc: "\u{D226}",
-        nfd: "\u{1110}\u{116D}\u{11BD}",
-        nfkc: "\u{D226}",
-        nfkd: "\u{1110}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D227}",
-        nfc: "\u{D227}",
-        nfd: "\u{1110}\u{116D}\u{11BE}",
-        nfkc: "\u{D227}",
-        nfkd: "\u{1110}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D228}",
-        nfc: "\u{D228}",
-        nfd: "\u{1110}\u{116D}\u{11BF}",
-        nfkc: "\u{D228}",
-        nfkd: "\u{1110}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D229}",
-        nfc: "\u{D229}",
-        nfd: "\u{1110}\u{116D}\u{11C0}",
-        nfkc: "\u{D229}",
-        nfkd: "\u{1110}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D22A}",
-        nfc: "\u{D22A}",
-        nfd: "\u{1110}\u{116D}\u{11C1}",
-        nfkc: "\u{D22A}",
-        nfkd: "\u{1110}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D22B}",
-        nfc: "\u{D22B}",
-        nfd: "\u{1110}\u{116D}\u{11C2}",
-        nfkc: "\u{D22B}",
-        nfkd: "\u{1110}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D22C}",
-        nfc: "\u{D22C}",
-        nfd: "\u{1110}\u{116E}",
-        nfkc: "\u{D22C}",
-        nfkd: "\u{1110}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{D22D}",
-        nfc: "\u{D22D}",
-        nfd: "\u{1110}\u{116E}\u{11A8}",
-        nfkc: "\u{D22D}",
-        nfkd: "\u{1110}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D22E}",
-        nfc: "\u{D22E}",
-        nfd: "\u{1110}\u{116E}\u{11A9}",
-        nfkc: "\u{D22E}",
-        nfkd: "\u{1110}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D22F}",
-        nfc: "\u{D22F}",
-        nfd: "\u{1110}\u{116E}\u{11AA}",
-        nfkc: "\u{D22F}",
-        nfkd: "\u{1110}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D230}",
-        nfc: "\u{D230}",
-        nfd: "\u{1110}\u{116E}\u{11AB}",
-        nfkc: "\u{D230}",
-        nfkd: "\u{1110}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D231}",
-        nfc: "\u{D231}",
-        nfd: "\u{1110}\u{116E}\u{11AC}",
-        nfkc: "\u{D231}",
-        nfkd: "\u{1110}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D232}",
-        nfc: "\u{D232}",
-        nfd: "\u{1110}\u{116E}\u{11AD}",
-        nfkc: "\u{D232}",
-        nfkd: "\u{1110}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D233}",
-        nfc: "\u{D233}",
-        nfd: "\u{1110}\u{116E}\u{11AE}",
-        nfkc: "\u{D233}",
-        nfkd: "\u{1110}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D234}",
-        nfc: "\u{D234}",
-        nfd: "\u{1110}\u{116E}\u{11AF}",
-        nfkc: "\u{D234}",
-        nfkd: "\u{1110}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D235}",
-        nfc: "\u{D235}",
-        nfd: "\u{1110}\u{116E}\u{11B0}",
-        nfkc: "\u{D235}",
-        nfkd: "\u{1110}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D236}",
-        nfc: "\u{D236}",
-        nfd: "\u{1110}\u{116E}\u{11B1}",
-        nfkc: "\u{D236}",
-        nfkd: "\u{1110}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D237}",
-        nfc: "\u{D237}",
-        nfd: "\u{1110}\u{116E}\u{11B2}",
-        nfkc: "\u{D237}",
-        nfkd: "\u{1110}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D238}",
-        nfc: "\u{D238}",
-        nfd: "\u{1110}\u{116E}\u{11B3}",
-        nfkc: "\u{D238}",
-        nfkd: "\u{1110}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D239}",
-        nfc: "\u{D239}",
-        nfd: "\u{1110}\u{116E}\u{11B4}",
-        nfkc: "\u{D239}",
-        nfkd: "\u{1110}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D23A}",
-        nfc: "\u{D23A}",
-        nfd: "\u{1110}\u{116E}\u{11B5}",
-        nfkc: "\u{D23A}",
-        nfkd: "\u{1110}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D23B}",
-        nfc: "\u{D23B}",
-        nfd: "\u{1110}\u{116E}\u{11B6}",
-        nfkc: "\u{D23B}",
-        nfkd: "\u{1110}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D23C}",
-        nfc: "\u{D23C}",
-        nfd: "\u{1110}\u{116E}\u{11B7}",
-        nfkc: "\u{D23C}",
-        nfkd: "\u{1110}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D23D}",
-        nfc: "\u{D23D}",
-        nfd: "\u{1110}\u{116E}\u{11B8}",
-        nfkc: "\u{D23D}",
-        nfkd: "\u{1110}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D23E}",
-        nfc: "\u{D23E}",
-        nfd: "\u{1110}\u{116E}\u{11B9}",
-        nfkc: "\u{D23E}",
-        nfkd: "\u{1110}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D23F}",
-        nfc: "\u{D23F}",
-        nfd: "\u{1110}\u{116E}\u{11BA}",
-        nfkc: "\u{D23F}",
-        nfkd: "\u{1110}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D240}",
-        nfc: "\u{D240}",
-        nfd: "\u{1110}\u{116E}\u{11BB}",
-        nfkc: "\u{D240}",
-        nfkd: "\u{1110}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D241}",
-        nfc: "\u{D241}",
-        nfd: "\u{1110}\u{116E}\u{11BC}",
-        nfkc: "\u{D241}",
-        nfkd: "\u{1110}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D242}",
-        nfc: "\u{D242}",
-        nfd: "\u{1110}\u{116E}\u{11BD}",
-        nfkc: "\u{D242}",
-        nfkd: "\u{1110}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D243}",
-        nfc: "\u{D243}",
-        nfd: "\u{1110}\u{116E}\u{11BE}",
-        nfkc: "\u{D243}",
-        nfkd: "\u{1110}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D244}",
-        nfc: "\u{D244}",
-        nfd: "\u{1110}\u{116E}\u{11BF}",
-        nfkc: "\u{D244}",
-        nfkd: "\u{1110}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D245}",
-        nfc: "\u{D245}",
-        nfd: "\u{1110}\u{116E}\u{11C0}",
-        nfkc: "\u{D245}",
-        nfkd: "\u{1110}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D246}",
-        nfc: "\u{D246}",
-        nfd: "\u{1110}\u{116E}\u{11C1}",
-        nfkc: "\u{D246}",
-        nfkd: "\u{1110}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D247}",
-        nfc: "\u{D247}",
-        nfd: "\u{1110}\u{116E}\u{11C2}",
-        nfkc: "\u{D247}",
-        nfkd: "\u{1110}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D248}",
-        nfc: "\u{D248}",
-        nfd: "\u{1110}\u{116F}",
-        nfkc: "\u{D248}",
-        nfkd: "\u{1110}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{D249}",
-        nfc: "\u{D249}",
-        nfd: "\u{1110}\u{116F}\u{11A8}",
-        nfkc: "\u{D249}",
-        nfkd: "\u{1110}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D24A}",
-        nfc: "\u{D24A}",
-        nfd: "\u{1110}\u{116F}\u{11A9}",
-        nfkc: "\u{D24A}",
-        nfkd: "\u{1110}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D24B}",
-        nfc: "\u{D24B}",
-        nfd: "\u{1110}\u{116F}\u{11AA}",
-        nfkc: "\u{D24B}",
-        nfkd: "\u{1110}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D24C}",
-        nfc: "\u{D24C}",
-        nfd: "\u{1110}\u{116F}\u{11AB}",
-        nfkc: "\u{D24C}",
-        nfkd: "\u{1110}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D24D}",
-        nfc: "\u{D24D}",
-        nfd: "\u{1110}\u{116F}\u{11AC}",
-        nfkc: "\u{D24D}",
-        nfkd: "\u{1110}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D24E}",
-        nfc: "\u{D24E}",
-        nfd: "\u{1110}\u{116F}\u{11AD}",
-        nfkc: "\u{D24E}",
-        nfkd: "\u{1110}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D24F}",
-        nfc: "\u{D24F}",
-        nfd: "\u{1110}\u{116F}\u{11AE}",
-        nfkc: "\u{D24F}",
-        nfkd: "\u{1110}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D250}",
-        nfc: "\u{D250}",
-        nfd: "\u{1110}\u{116F}\u{11AF}",
-        nfkc: "\u{D250}",
-        nfkd: "\u{1110}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D251}",
-        nfc: "\u{D251}",
-        nfd: "\u{1110}\u{116F}\u{11B0}",
-        nfkc: "\u{D251}",
-        nfkd: "\u{1110}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D252}",
-        nfc: "\u{D252}",
-        nfd: "\u{1110}\u{116F}\u{11B1}",
-        nfkc: "\u{D252}",
-        nfkd: "\u{1110}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D253}",
-        nfc: "\u{D253}",
-        nfd: "\u{1110}\u{116F}\u{11B2}",
-        nfkc: "\u{D253}",
-        nfkd: "\u{1110}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D254}",
-        nfc: "\u{D254}",
-        nfd: "\u{1110}\u{116F}\u{11B3}",
-        nfkc: "\u{D254}",
-        nfkd: "\u{1110}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D255}",
-        nfc: "\u{D255}",
-        nfd: "\u{1110}\u{116F}\u{11B4}",
-        nfkc: "\u{D255}",
-        nfkd: "\u{1110}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D256}",
-        nfc: "\u{D256}",
-        nfd: "\u{1110}\u{116F}\u{11B5}",
-        nfkc: "\u{D256}",
-        nfkd: "\u{1110}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D257}",
-        nfc: "\u{D257}",
-        nfd: "\u{1110}\u{116F}\u{11B6}",
-        nfkc: "\u{D257}",
-        nfkd: "\u{1110}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D258}",
-        nfc: "\u{D258}",
-        nfd: "\u{1110}\u{116F}\u{11B7}",
-        nfkc: "\u{D258}",
-        nfkd: "\u{1110}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D259}",
-        nfc: "\u{D259}",
-        nfd: "\u{1110}\u{116F}\u{11B8}",
-        nfkc: "\u{D259}",
-        nfkd: "\u{1110}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D25A}",
-        nfc: "\u{D25A}",
-        nfd: "\u{1110}\u{116F}\u{11B9}",
-        nfkc: "\u{D25A}",
-        nfkd: "\u{1110}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D25B}",
-        nfc: "\u{D25B}",
-        nfd: "\u{1110}\u{116F}\u{11BA}",
-        nfkc: "\u{D25B}",
-        nfkd: "\u{1110}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D25C}",
-        nfc: "\u{D25C}",
-        nfd: "\u{1110}\u{116F}\u{11BB}",
-        nfkc: "\u{D25C}",
-        nfkd: "\u{1110}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D25D}",
-        nfc: "\u{D25D}",
-        nfd: "\u{1110}\u{116F}\u{11BC}",
-        nfkc: "\u{D25D}",
-        nfkd: "\u{1110}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D25E}",
-        nfc: "\u{D25E}",
-        nfd: "\u{1110}\u{116F}\u{11BD}",
-        nfkc: "\u{D25E}",
-        nfkd: "\u{1110}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D25F}",
-        nfc: "\u{D25F}",
-        nfd: "\u{1110}\u{116F}\u{11BE}",
-        nfkc: "\u{D25F}",
-        nfkd: "\u{1110}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D260}",
-        nfc: "\u{D260}",
-        nfd: "\u{1110}\u{116F}\u{11BF}",
-        nfkc: "\u{D260}",
-        nfkd: "\u{1110}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D261}",
-        nfc: "\u{D261}",
-        nfd: "\u{1110}\u{116F}\u{11C0}",
-        nfkc: "\u{D261}",
-        nfkd: "\u{1110}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D262}",
-        nfc: "\u{D262}",
-        nfd: "\u{1110}\u{116F}\u{11C1}",
-        nfkc: "\u{D262}",
-        nfkd: "\u{1110}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D263}",
-        nfc: "\u{D263}",
-        nfd: "\u{1110}\u{116F}\u{11C2}",
-        nfkc: "\u{D263}",
-        nfkd: "\u{1110}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D264}",
-        nfc: "\u{D264}",
-        nfd: "\u{1110}\u{1170}",
-        nfkc: "\u{D264}",
-        nfkd: "\u{1110}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{D265}",
-        nfc: "\u{D265}",
-        nfd: "\u{1110}\u{1170}\u{11A8}",
-        nfkc: "\u{D265}",
-        nfkd: "\u{1110}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D266}",
-        nfc: "\u{D266}",
-        nfd: "\u{1110}\u{1170}\u{11A9}",
-        nfkc: "\u{D266}",
-        nfkd: "\u{1110}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D267}",
-        nfc: "\u{D267}",
-        nfd: "\u{1110}\u{1170}\u{11AA}",
-        nfkc: "\u{D267}",
-        nfkd: "\u{1110}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D268}",
-        nfc: "\u{D268}",
-        nfd: "\u{1110}\u{1170}\u{11AB}",
-        nfkc: "\u{D268}",
-        nfkd: "\u{1110}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D269}",
-        nfc: "\u{D269}",
-        nfd: "\u{1110}\u{1170}\u{11AC}",
-        nfkc: "\u{D269}",
-        nfkd: "\u{1110}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D26A}",
-        nfc: "\u{D26A}",
-        nfd: "\u{1110}\u{1170}\u{11AD}",
-        nfkc: "\u{D26A}",
-        nfkd: "\u{1110}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D26B}",
-        nfc: "\u{D26B}",
-        nfd: "\u{1110}\u{1170}\u{11AE}",
-        nfkc: "\u{D26B}",
-        nfkd: "\u{1110}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D26C}",
-        nfc: "\u{D26C}",
-        nfd: "\u{1110}\u{1170}\u{11AF}",
-        nfkc: "\u{D26C}",
-        nfkd: "\u{1110}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D26D}",
-        nfc: "\u{D26D}",
-        nfd: "\u{1110}\u{1170}\u{11B0}",
-        nfkc: "\u{D26D}",
-        nfkd: "\u{1110}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D26E}",
-        nfc: "\u{D26E}",
-        nfd: "\u{1110}\u{1170}\u{11B1}",
-        nfkc: "\u{D26E}",
-        nfkd: "\u{1110}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D26F}",
-        nfc: "\u{D26F}",
-        nfd: "\u{1110}\u{1170}\u{11B2}",
-        nfkc: "\u{D26F}",
-        nfkd: "\u{1110}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D270}",
-        nfc: "\u{D270}",
-        nfd: "\u{1110}\u{1170}\u{11B3}",
-        nfkc: "\u{D270}",
-        nfkd: "\u{1110}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D271}",
-        nfc: "\u{D271}",
-        nfd: "\u{1110}\u{1170}\u{11B4}",
-        nfkc: "\u{D271}",
-        nfkd: "\u{1110}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D272}",
-        nfc: "\u{D272}",
-        nfd: "\u{1110}\u{1170}\u{11B5}",
-        nfkc: "\u{D272}",
-        nfkd: "\u{1110}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D273}",
-        nfc: "\u{D273}",
-        nfd: "\u{1110}\u{1170}\u{11B6}",
-        nfkc: "\u{D273}",
-        nfkd: "\u{1110}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D274}",
-        nfc: "\u{D274}",
-        nfd: "\u{1110}\u{1170}\u{11B7}",
-        nfkc: "\u{D274}",
-        nfkd: "\u{1110}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D275}",
-        nfc: "\u{D275}",
-        nfd: "\u{1110}\u{1170}\u{11B8}",
-        nfkc: "\u{D275}",
-        nfkd: "\u{1110}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D276}",
-        nfc: "\u{D276}",
-        nfd: "\u{1110}\u{1170}\u{11B9}",
-        nfkc: "\u{D276}",
-        nfkd: "\u{1110}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D277}",
-        nfc: "\u{D277}",
-        nfd: "\u{1110}\u{1170}\u{11BA}",
-        nfkc: "\u{D277}",
-        nfkd: "\u{1110}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D278}",
-        nfc: "\u{D278}",
-        nfd: "\u{1110}\u{1170}\u{11BB}",
-        nfkc: "\u{D278}",
-        nfkd: "\u{1110}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D279}",
-        nfc: "\u{D279}",
-        nfd: "\u{1110}\u{1170}\u{11BC}",
-        nfkc: "\u{D279}",
-        nfkd: "\u{1110}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D27A}",
-        nfc: "\u{D27A}",
-        nfd: "\u{1110}\u{1170}\u{11BD}",
-        nfkc: "\u{D27A}",
-        nfkd: "\u{1110}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D27B}",
-        nfc: "\u{D27B}",
-        nfd: "\u{1110}\u{1170}\u{11BE}",
-        nfkc: "\u{D27B}",
-        nfkd: "\u{1110}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D27C}",
-        nfc: "\u{D27C}",
-        nfd: "\u{1110}\u{1170}\u{11BF}",
-        nfkc: "\u{D27C}",
-        nfkd: "\u{1110}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D27D}",
-        nfc: "\u{D27D}",
-        nfd: "\u{1110}\u{1170}\u{11C0}",
-        nfkc: "\u{D27D}",
-        nfkd: "\u{1110}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D27E}",
-        nfc: "\u{D27E}",
-        nfd: "\u{1110}\u{1170}\u{11C1}",
-        nfkc: "\u{D27E}",
-        nfkd: "\u{1110}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D27F}",
-        nfc: "\u{D27F}",
-        nfd: "\u{1110}\u{1170}\u{11C2}",
-        nfkc: "\u{D27F}",
-        nfkd: "\u{1110}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D280}",
-        nfc: "\u{D280}",
-        nfd: "\u{1110}\u{1171}",
-        nfkc: "\u{D280}",
-        nfkd: "\u{1110}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{D281}",
-        nfc: "\u{D281}",
-        nfd: "\u{1110}\u{1171}\u{11A8}",
-        nfkc: "\u{D281}",
-        nfkd: "\u{1110}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D282}",
-        nfc: "\u{D282}",
-        nfd: "\u{1110}\u{1171}\u{11A9}",
-        nfkc: "\u{D282}",
-        nfkd: "\u{1110}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D283}",
-        nfc: "\u{D283}",
-        nfd: "\u{1110}\u{1171}\u{11AA}",
-        nfkc: "\u{D283}",
-        nfkd: "\u{1110}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D284}",
-        nfc: "\u{D284}",
-        nfd: "\u{1110}\u{1171}\u{11AB}",
-        nfkc: "\u{D284}",
-        nfkd: "\u{1110}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D285}",
-        nfc: "\u{D285}",
-        nfd: "\u{1110}\u{1171}\u{11AC}",
-        nfkc: "\u{D285}",
-        nfkd: "\u{1110}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D286}",
-        nfc: "\u{D286}",
-        nfd: "\u{1110}\u{1171}\u{11AD}",
-        nfkc: "\u{D286}",
-        nfkd: "\u{1110}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D287}",
-        nfc: "\u{D287}",
-        nfd: "\u{1110}\u{1171}\u{11AE}",
-        nfkc: "\u{D287}",
-        nfkd: "\u{1110}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D288}",
-        nfc: "\u{D288}",
-        nfd: "\u{1110}\u{1171}\u{11AF}",
-        nfkc: "\u{D288}",
-        nfkd: "\u{1110}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D289}",
-        nfc: "\u{D289}",
-        nfd: "\u{1110}\u{1171}\u{11B0}",
-        nfkc: "\u{D289}",
-        nfkd: "\u{1110}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D28A}",
-        nfc: "\u{D28A}",
-        nfd: "\u{1110}\u{1171}\u{11B1}",
-        nfkc: "\u{D28A}",
-        nfkd: "\u{1110}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D28B}",
-        nfc: "\u{D28B}",
-        nfd: "\u{1110}\u{1171}\u{11B2}",
-        nfkc: "\u{D28B}",
-        nfkd: "\u{1110}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D28C}",
-        nfc: "\u{D28C}",
-        nfd: "\u{1110}\u{1171}\u{11B3}",
-        nfkc: "\u{D28C}",
-        nfkd: "\u{1110}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D28D}",
-        nfc: "\u{D28D}",
-        nfd: "\u{1110}\u{1171}\u{11B4}",
-        nfkc: "\u{D28D}",
-        nfkd: "\u{1110}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D28E}",
-        nfc: "\u{D28E}",
-        nfd: "\u{1110}\u{1171}\u{11B5}",
-        nfkc: "\u{D28E}",
-        nfkd: "\u{1110}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D28F}",
-        nfc: "\u{D28F}",
-        nfd: "\u{1110}\u{1171}\u{11B6}",
-        nfkc: "\u{D28F}",
-        nfkd: "\u{1110}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D290}",
-        nfc: "\u{D290}",
-        nfd: "\u{1110}\u{1171}\u{11B7}",
-        nfkc: "\u{D290}",
-        nfkd: "\u{1110}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D291}",
-        nfc: "\u{D291}",
-        nfd: "\u{1110}\u{1171}\u{11B8}",
-        nfkc: "\u{D291}",
-        nfkd: "\u{1110}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D292}",
-        nfc: "\u{D292}",
-        nfd: "\u{1110}\u{1171}\u{11B9}",
-        nfkc: "\u{D292}",
-        nfkd: "\u{1110}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D293}",
-        nfc: "\u{D293}",
-        nfd: "\u{1110}\u{1171}\u{11BA}",
-        nfkc: "\u{D293}",
-        nfkd: "\u{1110}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D294}",
-        nfc: "\u{D294}",
-        nfd: "\u{1110}\u{1171}\u{11BB}",
-        nfkc: "\u{D294}",
-        nfkd: "\u{1110}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D295}",
-        nfc: "\u{D295}",
-        nfd: "\u{1110}\u{1171}\u{11BC}",
-        nfkc: "\u{D295}",
-        nfkd: "\u{1110}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D296}",
-        nfc: "\u{D296}",
-        nfd: "\u{1110}\u{1171}\u{11BD}",
-        nfkc: "\u{D296}",
-        nfkd: "\u{1110}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D297}",
-        nfc: "\u{D297}",
-        nfd: "\u{1110}\u{1171}\u{11BE}",
-        nfkc: "\u{D297}",
-        nfkd: "\u{1110}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D298}",
-        nfc: "\u{D298}",
-        nfd: "\u{1110}\u{1171}\u{11BF}",
-        nfkc: "\u{D298}",
-        nfkd: "\u{1110}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D299}",
-        nfc: "\u{D299}",
-        nfd: "\u{1110}\u{1171}\u{11C0}",
-        nfkc: "\u{D299}",
-        nfkd: "\u{1110}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D29A}",
-        nfc: "\u{D29A}",
-        nfd: "\u{1110}\u{1171}\u{11C1}",
-        nfkc: "\u{D29A}",
-        nfkd: "\u{1110}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D29B}",
-        nfc: "\u{D29B}",
-        nfd: "\u{1110}\u{1171}\u{11C2}",
-        nfkc: "\u{D29B}",
-        nfkd: "\u{1110}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D29C}",
-        nfc: "\u{D29C}",
-        nfd: "\u{1110}\u{1172}",
-        nfkc: "\u{D29C}",
-        nfkd: "\u{1110}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{D29D}",
-        nfc: "\u{D29D}",
-        nfd: "\u{1110}\u{1172}\u{11A8}",
-        nfkc: "\u{D29D}",
-        nfkd: "\u{1110}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D29E}",
-        nfc: "\u{D29E}",
-        nfd: "\u{1110}\u{1172}\u{11A9}",
-        nfkc: "\u{D29E}",
-        nfkd: "\u{1110}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D29F}",
-        nfc: "\u{D29F}",
-        nfd: "\u{1110}\u{1172}\u{11AA}",
-        nfkc: "\u{D29F}",
-        nfkd: "\u{1110}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D2A0}",
-        nfc: "\u{D2A0}",
-        nfd: "\u{1110}\u{1172}\u{11AB}",
-        nfkc: "\u{D2A0}",
-        nfkd: "\u{1110}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D2A1}",
-        nfc: "\u{D2A1}",
-        nfd: "\u{1110}\u{1172}\u{11AC}",
-        nfkc: "\u{D2A1}",
-        nfkd: "\u{1110}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D2A2}",
-        nfc: "\u{D2A2}",
-        nfd: "\u{1110}\u{1172}\u{11AD}",
-        nfkc: "\u{D2A2}",
-        nfkd: "\u{1110}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D2A3}",
-        nfc: "\u{D2A3}",
-        nfd: "\u{1110}\u{1172}\u{11AE}",
-        nfkc: "\u{D2A3}",
-        nfkd: "\u{1110}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D2A4}",
-        nfc: "\u{D2A4}",
-        nfd: "\u{1110}\u{1172}\u{11AF}",
-        nfkc: "\u{D2A4}",
-        nfkd: "\u{1110}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D2A5}",
-        nfc: "\u{D2A5}",
-        nfd: "\u{1110}\u{1172}\u{11B0}",
-        nfkc: "\u{D2A5}",
-        nfkd: "\u{1110}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D2A6}",
-        nfc: "\u{D2A6}",
-        nfd: "\u{1110}\u{1172}\u{11B1}",
-        nfkc: "\u{D2A6}",
-        nfkd: "\u{1110}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D2A7}",
-        nfc: "\u{D2A7}",
-        nfd: "\u{1110}\u{1172}\u{11B2}",
-        nfkc: "\u{D2A7}",
-        nfkd: "\u{1110}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D2A8}",
-        nfc: "\u{D2A8}",
-        nfd: "\u{1110}\u{1172}\u{11B3}",
-        nfkc: "\u{D2A8}",
-        nfkd: "\u{1110}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D2A9}",
-        nfc: "\u{D2A9}",
-        nfd: "\u{1110}\u{1172}\u{11B4}",
-        nfkc: "\u{D2A9}",
-        nfkd: "\u{1110}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D2AA}",
-        nfc: "\u{D2AA}",
-        nfd: "\u{1110}\u{1172}\u{11B5}",
-        nfkc: "\u{D2AA}",
-        nfkd: "\u{1110}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D2AB}",
-        nfc: "\u{D2AB}",
-        nfd: "\u{1110}\u{1172}\u{11B6}",
-        nfkc: "\u{D2AB}",
-        nfkd: "\u{1110}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D2AC}",
-        nfc: "\u{D2AC}",
-        nfd: "\u{1110}\u{1172}\u{11B7}",
-        nfkc: "\u{D2AC}",
-        nfkd: "\u{1110}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D2AD}",
-        nfc: "\u{D2AD}",
-        nfd: "\u{1110}\u{1172}\u{11B8}",
-        nfkc: "\u{D2AD}",
-        nfkd: "\u{1110}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D2AE}",
-        nfc: "\u{D2AE}",
-        nfd: "\u{1110}\u{1172}\u{11B9}",
-        nfkc: "\u{D2AE}",
-        nfkd: "\u{1110}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D2AF}",
-        nfc: "\u{D2AF}",
-        nfd: "\u{1110}\u{1172}\u{11BA}",
-        nfkc: "\u{D2AF}",
-        nfkd: "\u{1110}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D2B0}",
-        nfc: "\u{D2B0}",
-        nfd: "\u{1110}\u{1172}\u{11BB}",
-        nfkc: "\u{D2B0}",
-        nfkd: "\u{1110}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D2B1}",
-        nfc: "\u{D2B1}",
-        nfd: "\u{1110}\u{1172}\u{11BC}",
-        nfkc: "\u{D2B1}",
-        nfkd: "\u{1110}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D2B2}",
-        nfc: "\u{D2B2}",
-        nfd: "\u{1110}\u{1172}\u{11BD}",
-        nfkc: "\u{D2B2}",
-        nfkd: "\u{1110}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D2B3}",
-        nfc: "\u{D2B3}",
-        nfd: "\u{1110}\u{1172}\u{11BE}",
-        nfkc: "\u{D2B3}",
-        nfkd: "\u{1110}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D2B4}",
-        nfc: "\u{D2B4}",
-        nfd: "\u{1110}\u{1172}\u{11BF}",
-        nfkc: "\u{D2B4}",
-        nfkd: "\u{1110}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D2B5}",
-        nfc: "\u{D2B5}",
-        nfd: "\u{1110}\u{1172}\u{11C0}",
-        nfkc: "\u{D2B5}",
-        nfkd: "\u{1110}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D2B6}",
-        nfc: "\u{D2B6}",
-        nfd: "\u{1110}\u{1172}\u{11C1}",
-        nfkc: "\u{D2B6}",
-        nfkd: "\u{1110}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D2B7}",
-        nfc: "\u{D2B7}",
-        nfd: "\u{1110}\u{1172}\u{11C2}",
-        nfkc: "\u{D2B7}",
-        nfkd: "\u{1110}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D2B8}",
-        nfc: "\u{D2B8}",
-        nfd: "\u{1110}\u{1173}",
-        nfkc: "\u{D2B8}",
-        nfkd: "\u{1110}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{D2B9}",
-        nfc: "\u{D2B9}",
-        nfd: "\u{1110}\u{1173}\u{11A8}",
-        nfkc: "\u{D2B9}",
-        nfkd: "\u{1110}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D2BA}",
-        nfc: "\u{D2BA}",
-        nfd: "\u{1110}\u{1173}\u{11A9}",
-        nfkc: "\u{D2BA}",
-        nfkd: "\u{1110}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D2BB}",
-        nfc: "\u{D2BB}",
-        nfd: "\u{1110}\u{1173}\u{11AA}",
-        nfkc: "\u{D2BB}",
-        nfkd: "\u{1110}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D2BC}",
-        nfc: "\u{D2BC}",
-        nfd: "\u{1110}\u{1173}\u{11AB}",
-        nfkc: "\u{D2BC}",
-        nfkd: "\u{1110}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D2BD}",
-        nfc: "\u{D2BD}",
-        nfd: "\u{1110}\u{1173}\u{11AC}",
-        nfkc: "\u{D2BD}",
-        nfkd: "\u{1110}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D2BE}",
-        nfc: "\u{D2BE}",
-        nfd: "\u{1110}\u{1173}\u{11AD}",
-        nfkc: "\u{D2BE}",
-        nfkd: "\u{1110}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D2BF}",
-        nfc: "\u{D2BF}",
-        nfd: "\u{1110}\u{1173}\u{11AE}",
-        nfkc: "\u{D2BF}",
-        nfkd: "\u{1110}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D2C0}",
-        nfc: "\u{D2C0}",
-        nfd: "\u{1110}\u{1173}\u{11AF}",
-        nfkc: "\u{D2C0}",
-        nfkd: "\u{1110}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D2C1}",
-        nfc: "\u{D2C1}",
-        nfd: "\u{1110}\u{1173}\u{11B0}",
-        nfkc: "\u{D2C1}",
-        nfkd: "\u{1110}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D2C2}",
-        nfc: "\u{D2C2}",
-        nfd: "\u{1110}\u{1173}\u{11B1}",
-        nfkc: "\u{D2C2}",
-        nfkd: "\u{1110}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D2C3}",
-        nfc: "\u{D2C3}",
-        nfd: "\u{1110}\u{1173}\u{11B2}",
-        nfkc: "\u{D2C3}",
-        nfkd: "\u{1110}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D2C4}",
-        nfc: "\u{D2C4}",
-        nfd: "\u{1110}\u{1173}\u{11B3}",
-        nfkc: "\u{D2C4}",
-        nfkd: "\u{1110}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D2C5}",
-        nfc: "\u{D2C5}",
-        nfd: "\u{1110}\u{1173}\u{11B4}",
-        nfkc: "\u{D2C5}",
-        nfkd: "\u{1110}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D2C6}",
-        nfc: "\u{D2C6}",
-        nfd: "\u{1110}\u{1173}\u{11B5}",
-        nfkc: "\u{D2C6}",
-        nfkd: "\u{1110}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D2C7}",
-        nfc: "\u{D2C7}",
-        nfd: "\u{1110}\u{1173}\u{11B6}",
-        nfkc: "\u{D2C7}",
-        nfkd: "\u{1110}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D2C8}",
-        nfc: "\u{D2C8}",
-        nfd: "\u{1110}\u{1173}\u{11B7}",
-        nfkc: "\u{D2C8}",
-        nfkd: "\u{1110}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D2C9}",
-        nfc: "\u{D2C9}",
-        nfd: "\u{1110}\u{1173}\u{11B8}",
-        nfkc: "\u{D2C9}",
-        nfkd: "\u{1110}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D2CA}",
-        nfc: "\u{D2CA}",
-        nfd: "\u{1110}\u{1173}\u{11B9}",
-        nfkc: "\u{D2CA}",
-        nfkd: "\u{1110}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D2CB}",
-        nfc: "\u{D2CB}",
-        nfd: "\u{1110}\u{1173}\u{11BA}",
-        nfkc: "\u{D2CB}",
-        nfkd: "\u{1110}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D2CC}",
-        nfc: "\u{D2CC}",
-        nfd: "\u{1110}\u{1173}\u{11BB}",
-        nfkc: "\u{D2CC}",
-        nfkd: "\u{1110}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D2CD}",
-        nfc: "\u{D2CD}",
-        nfd: "\u{1110}\u{1173}\u{11BC}",
-        nfkc: "\u{D2CD}",
-        nfkd: "\u{1110}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D2CE}",
-        nfc: "\u{D2CE}",
-        nfd: "\u{1110}\u{1173}\u{11BD}",
-        nfkc: "\u{D2CE}",
-        nfkd: "\u{1110}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D2CF}",
-        nfc: "\u{D2CF}",
-        nfd: "\u{1110}\u{1173}\u{11BE}",
-        nfkc: "\u{D2CF}",
-        nfkd: "\u{1110}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D2D0}",
-        nfc: "\u{D2D0}",
-        nfd: "\u{1110}\u{1173}\u{11BF}",
-        nfkc: "\u{D2D0}",
-        nfkd: "\u{1110}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D2D1}",
-        nfc: "\u{D2D1}",
-        nfd: "\u{1110}\u{1173}\u{11C0}",
-        nfkc: "\u{D2D1}",
-        nfkd: "\u{1110}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D2D2}",
-        nfc: "\u{D2D2}",
-        nfd: "\u{1110}\u{1173}\u{11C1}",
-        nfkc: "\u{D2D2}",
-        nfkd: "\u{1110}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D2D3}",
-        nfc: "\u{D2D3}",
-        nfd: "\u{1110}\u{1173}\u{11C2}",
-        nfkc: "\u{D2D3}",
-        nfkd: "\u{1110}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D2D4}",
-        nfc: "\u{D2D4}",
-        nfd: "\u{1110}\u{1174}",
-        nfkc: "\u{D2D4}",
-        nfkd: "\u{1110}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{D2D5}",
-        nfc: "\u{D2D5}",
-        nfd: "\u{1110}\u{1174}\u{11A8}",
-        nfkc: "\u{D2D5}",
-        nfkd: "\u{1110}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D2D6}",
-        nfc: "\u{D2D6}",
-        nfd: "\u{1110}\u{1174}\u{11A9}",
-        nfkc: "\u{D2D6}",
-        nfkd: "\u{1110}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D2D7}",
-        nfc: "\u{D2D7}",
-        nfd: "\u{1110}\u{1174}\u{11AA}",
-        nfkc: "\u{D2D7}",
-        nfkd: "\u{1110}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D2D8}",
-        nfc: "\u{D2D8}",
-        nfd: "\u{1110}\u{1174}\u{11AB}",
-        nfkc: "\u{D2D8}",
-        nfkd: "\u{1110}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D2D9}",
-        nfc: "\u{D2D9}",
-        nfd: "\u{1110}\u{1174}\u{11AC}",
-        nfkc: "\u{D2D9}",
-        nfkd: "\u{1110}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D2DA}",
-        nfc: "\u{D2DA}",
-        nfd: "\u{1110}\u{1174}\u{11AD}",
-        nfkc: "\u{D2DA}",
-        nfkd: "\u{1110}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D2DB}",
-        nfc: "\u{D2DB}",
-        nfd: "\u{1110}\u{1174}\u{11AE}",
-        nfkc: "\u{D2DB}",
-        nfkd: "\u{1110}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D2DC}",
-        nfc: "\u{D2DC}",
-        nfd: "\u{1110}\u{1174}\u{11AF}",
-        nfkc: "\u{D2DC}",
-        nfkd: "\u{1110}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D2DD}",
-        nfc: "\u{D2DD}",
-        nfd: "\u{1110}\u{1174}\u{11B0}",
-        nfkc: "\u{D2DD}",
-        nfkd: "\u{1110}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D2DE}",
-        nfc: "\u{D2DE}",
-        nfd: "\u{1110}\u{1174}\u{11B1}",
-        nfkc: "\u{D2DE}",
-        nfkd: "\u{1110}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D2DF}",
-        nfc: "\u{D2DF}",
-        nfd: "\u{1110}\u{1174}\u{11B2}",
-        nfkc: "\u{D2DF}",
-        nfkd: "\u{1110}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D2E0}",
-        nfc: "\u{D2E0}",
-        nfd: "\u{1110}\u{1174}\u{11B3}",
-        nfkc: "\u{D2E0}",
-        nfkd: "\u{1110}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D2E1}",
-        nfc: "\u{D2E1}",
-        nfd: "\u{1110}\u{1174}\u{11B4}",
-        nfkc: "\u{D2E1}",
-        nfkd: "\u{1110}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D2E2}",
-        nfc: "\u{D2E2}",
-        nfd: "\u{1110}\u{1174}\u{11B5}",
-        nfkc: "\u{D2E2}",
-        nfkd: "\u{1110}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D2E3}",
-        nfc: "\u{D2E3}",
-        nfd: "\u{1110}\u{1174}\u{11B6}",
-        nfkc: "\u{D2E3}",
-        nfkd: "\u{1110}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D2E4}",
-        nfc: "\u{D2E4}",
-        nfd: "\u{1110}\u{1174}\u{11B7}",
-        nfkc: "\u{D2E4}",
-        nfkd: "\u{1110}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D2E5}",
-        nfc: "\u{D2E5}",
-        nfd: "\u{1110}\u{1174}\u{11B8}",
-        nfkc: "\u{D2E5}",
-        nfkd: "\u{1110}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D2E6}",
-        nfc: "\u{D2E6}",
-        nfd: "\u{1110}\u{1174}\u{11B9}",
-        nfkc: "\u{D2E6}",
-        nfkd: "\u{1110}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D2E7}",
-        nfc: "\u{D2E7}",
-        nfd: "\u{1110}\u{1174}\u{11BA}",
-        nfkc: "\u{D2E7}",
-        nfkd: "\u{1110}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D2E8}",
-        nfc: "\u{D2E8}",
-        nfd: "\u{1110}\u{1174}\u{11BB}",
-        nfkc: "\u{D2E8}",
-        nfkd: "\u{1110}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D2E9}",
-        nfc: "\u{D2E9}",
-        nfd: "\u{1110}\u{1174}\u{11BC}",
-        nfkc: "\u{D2E9}",
-        nfkd: "\u{1110}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D2EA}",
-        nfc: "\u{D2EA}",
-        nfd: "\u{1110}\u{1174}\u{11BD}",
-        nfkc: "\u{D2EA}",
-        nfkd: "\u{1110}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D2EB}",
-        nfc: "\u{D2EB}",
-        nfd: "\u{1110}\u{1174}\u{11BE}",
-        nfkc: "\u{D2EB}",
-        nfkd: "\u{1110}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D2EC}",
-        nfc: "\u{D2EC}",
-        nfd: "\u{1110}\u{1174}\u{11BF}",
-        nfkc: "\u{D2EC}",
-        nfkd: "\u{1110}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D2ED}",
-        nfc: "\u{D2ED}",
-        nfd: "\u{1110}\u{1174}\u{11C0}",
-        nfkc: "\u{D2ED}",
-        nfkd: "\u{1110}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D2EE}",
-        nfc: "\u{D2EE}",
-        nfd: "\u{1110}\u{1174}\u{11C1}",
-        nfkc: "\u{D2EE}",
-        nfkd: "\u{1110}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D2EF}",
-        nfc: "\u{D2EF}",
-        nfd: "\u{1110}\u{1174}\u{11C2}",
-        nfkc: "\u{D2EF}",
-        nfkd: "\u{1110}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D2F0}",
-        nfc: "\u{D2F0}",
-        nfd: "\u{1110}\u{1175}",
-        nfkc: "\u{D2F0}",
-        nfkd: "\u{1110}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{D2F1}",
-        nfc: "\u{D2F1}",
-        nfd: "\u{1110}\u{1175}\u{11A8}",
-        nfkc: "\u{D2F1}",
-        nfkd: "\u{1110}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D2F2}",
-        nfc: "\u{D2F2}",
-        nfd: "\u{1110}\u{1175}\u{11A9}",
-        nfkc: "\u{D2F2}",
-        nfkd: "\u{1110}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D2F3}",
-        nfc: "\u{D2F3}",
-        nfd: "\u{1110}\u{1175}\u{11AA}",
-        nfkc: "\u{D2F3}",
-        nfkd: "\u{1110}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D2F4}",
-        nfc: "\u{D2F4}",
-        nfd: "\u{1110}\u{1175}\u{11AB}",
-        nfkc: "\u{D2F4}",
-        nfkd: "\u{1110}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D2F5}",
-        nfc: "\u{D2F5}",
-        nfd: "\u{1110}\u{1175}\u{11AC}",
-        nfkc: "\u{D2F5}",
-        nfkd: "\u{1110}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D2F6}",
-        nfc: "\u{D2F6}",
-        nfd: "\u{1110}\u{1175}\u{11AD}",
-        nfkc: "\u{D2F6}",
-        nfkd: "\u{1110}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D2F7}",
-        nfc: "\u{D2F7}",
-        nfd: "\u{1110}\u{1175}\u{11AE}",
-        nfkc: "\u{D2F7}",
-        nfkd: "\u{1110}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D2F8}",
-        nfc: "\u{D2F8}",
-        nfd: "\u{1110}\u{1175}\u{11AF}",
-        nfkc: "\u{D2F8}",
-        nfkd: "\u{1110}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D2F9}",
-        nfc: "\u{D2F9}",
-        nfd: "\u{1110}\u{1175}\u{11B0}",
-        nfkc: "\u{D2F9}",
-        nfkd: "\u{1110}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D2FA}",
-        nfc: "\u{D2FA}",
-        nfd: "\u{1110}\u{1175}\u{11B1}",
-        nfkc: "\u{D2FA}",
-        nfkd: "\u{1110}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D2FB}",
-        nfc: "\u{D2FB}",
-        nfd: "\u{1110}\u{1175}\u{11B2}",
-        nfkc: "\u{D2FB}",
-        nfkd: "\u{1110}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D2FC}",
-        nfc: "\u{D2FC}",
-        nfd: "\u{1110}\u{1175}\u{11B3}",
-        nfkc: "\u{D2FC}",
-        nfkd: "\u{1110}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D2FD}",
-        nfc: "\u{D2FD}",
-        nfd: "\u{1110}\u{1175}\u{11B4}",
-        nfkc: "\u{D2FD}",
-        nfkd: "\u{1110}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D2FE}",
-        nfc: "\u{D2FE}",
-        nfd: "\u{1110}\u{1175}\u{11B5}",
-        nfkc: "\u{D2FE}",
-        nfkd: "\u{1110}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D2FF}",
-        nfc: "\u{D2FF}",
-        nfd: "\u{1110}\u{1175}\u{11B6}",
-        nfkc: "\u{D2FF}",
-        nfkd: "\u{1110}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D300}",
-        nfc: "\u{D300}",
-        nfd: "\u{1110}\u{1175}\u{11B7}",
-        nfkc: "\u{D300}",
-        nfkd: "\u{1110}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D301}",
-        nfc: "\u{D301}",
-        nfd: "\u{1110}\u{1175}\u{11B8}",
-        nfkc: "\u{D301}",
-        nfkd: "\u{1110}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D302}",
-        nfc: "\u{D302}",
-        nfd: "\u{1110}\u{1175}\u{11B9}",
-        nfkc: "\u{D302}",
-        nfkd: "\u{1110}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D303}",
-        nfc: "\u{D303}",
-        nfd: "\u{1110}\u{1175}\u{11BA}",
-        nfkc: "\u{D303}",
-        nfkd: "\u{1110}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D304}",
-        nfc: "\u{D304}",
-        nfd: "\u{1110}\u{1175}\u{11BB}",
-        nfkc: "\u{D304}",
-        nfkd: "\u{1110}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D305}",
-        nfc: "\u{D305}",
-        nfd: "\u{1110}\u{1175}\u{11BC}",
-        nfkc: "\u{D305}",
-        nfkd: "\u{1110}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D306}",
-        nfc: "\u{D306}",
-        nfd: "\u{1110}\u{1175}\u{11BD}",
-        nfkc: "\u{D306}",
-        nfkd: "\u{1110}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D307}",
-        nfc: "\u{D307}",
-        nfd: "\u{1110}\u{1175}\u{11BE}",
-        nfkc: "\u{D307}",
-        nfkd: "\u{1110}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D308}",
-        nfc: "\u{D308}",
-        nfd: "\u{1110}\u{1175}\u{11BF}",
-        nfkc: "\u{D308}",
-        nfkd: "\u{1110}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D309}",
-        nfc: "\u{D309}",
-        nfd: "\u{1110}\u{1175}\u{11C0}",
-        nfkc: "\u{D309}",
-        nfkd: "\u{1110}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D30A}",
-        nfc: "\u{D30A}",
-        nfd: "\u{1110}\u{1175}\u{11C1}",
-        nfkc: "\u{D30A}",
-        nfkd: "\u{1110}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D30B}",
-        nfc: "\u{D30B}",
-        nfd: "\u{1110}\u{1175}\u{11C2}",
-        nfkc: "\u{D30B}",
-        nfkd: "\u{1110}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D30C}",
-        nfc: "\u{D30C}",
-        nfd: "\u{1111}\u{1161}",
-        nfkc: "\u{D30C}",
-        nfkd: "\u{1111}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{D30D}",
-        nfc: "\u{D30D}",
-        nfd: "\u{1111}\u{1161}\u{11A8}",
-        nfkc: "\u{D30D}",
-        nfkd: "\u{1111}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D30E}",
-        nfc: "\u{D30E}",
-        nfd: "\u{1111}\u{1161}\u{11A9}",
-        nfkc: "\u{D30E}",
-        nfkd: "\u{1111}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D30F}",
-        nfc: "\u{D30F}",
-        nfd: "\u{1111}\u{1161}\u{11AA}",
-        nfkc: "\u{D30F}",
-        nfkd: "\u{1111}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D310}",
-        nfc: "\u{D310}",
-        nfd: "\u{1111}\u{1161}\u{11AB}",
-        nfkc: "\u{D310}",
-        nfkd: "\u{1111}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D311}",
-        nfc: "\u{D311}",
-        nfd: "\u{1111}\u{1161}\u{11AC}",
-        nfkc: "\u{D311}",
-        nfkd: "\u{1111}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D312}",
-        nfc: "\u{D312}",
-        nfd: "\u{1111}\u{1161}\u{11AD}",
-        nfkc: "\u{D312}",
-        nfkd: "\u{1111}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D313}",
-        nfc: "\u{D313}",
-        nfd: "\u{1111}\u{1161}\u{11AE}",
-        nfkc: "\u{D313}",
-        nfkd: "\u{1111}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D314}",
-        nfc: "\u{D314}",
-        nfd: "\u{1111}\u{1161}\u{11AF}",
-        nfkc: "\u{D314}",
-        nfkd: "\u{1111}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D315}",
-        nfc: "\u{D315}",
-        nfd: "\u{1111}\u{1161}\u{11B0}",
-        nfkc: "\u{D315}",
-        nfkd: "\u{1111}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D316}",
-        nfc: "\u{D316}",
-        nfd: "\u{1111}\u{1161}\u{11B1}",
-        nfkc: "\u{D316}",
-        nfkd: "\u{1111}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D317}",
-        nfc: "\u{D317}",
-        nfd: "\u{1111}\u{1161}\u{11B2}",
-        nfkc: "\u{D317}",
-        nfkd: "\u{1111}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D318}",
-        nfc: "\u{D318}",
-        nfd: "\u{1111}\u{1161}\u{11B3}",
-        nfkc: "\u{D318}",
-        nfkd: "\u{1111}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D319}",
-        nfc: "\u{D319}",
-        nfd: "\u{1111}\u{1161}\u{11B4}",
-        nfkc: "\u{D319}",
-        nfkd: "\u{1111}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D31A}",
-        nfc: "\u{D31A}",
-        nfd: "\u{1111}\u{1161}\u{11B5}",
-        nfkc: "\u{D31A}",
-        nfkd: "\u{1111}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D31B}",
-        nfc: "\u{D31B}",
-        nfd: "\u{1111}\u{1161}\u{11B6}",
-        nfkc: "\u{D31B}",
-        nfkd: "\u{1111}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D31C}",
-        nfc: "\u{D31C}",
-        nfd: "\u{1111}\u{1161}\u{11B7}",
-        nfkc: "\u{D31C}",
-        nfkd: "\u{1111}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D31D}",
-        nfc: "\u{D31D}",
-        nfd: "\u{1111}\u{1161}\u{11B8}",
-        nfkc: "\u{D31D}",
-        nfkd: "\u{1111}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D31E}",
-        nfc: "\u{D31E}",
-        nfd: "\u{1111}\u{1161}\u{11B9}",
-        nfkc: "\u{D31E}",
-        nfkd: "\u{1111}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D31F}",
-        nfc: "\u{D31F}",
-        nfd: "\u{1111}\u{1161}\u{11BA}",
-        nfkc: "\u{D31F}",
-        nfkd: "\u{1111}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D320}",
-        nfc: "\u{D320}",
-        nfd: "\u{1111}\u{1161}\u{11BB}",
-        nfkc: "\u{D320}",
-        nfkd: "\u{1111}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D321}",
-        nfc: "\u{D321}",
-        nfd: "\u{1111}\u{1161}\u{11BC}",
-        nfkc: "\u{D321}",
-        nfkd: "\u{1111}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D322}",
-        nfc: "\u{D322}",
-        nfd: "\u{1111}\u{1161}\u{11BD}",
-        nfkc: "\u{D322}",
-        nfkd: "\u{1111}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D323}",
-        nfc: "\u{D323}",
-        nfd: "\u{1111}\u{1161}\u{11BE}",
-        nfkc: "\u{D323}",
-        nfkd: "\u{1111}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D324}",
-        nfc: "\u{D324}",
-        nfd: "\u{1111}\u{1161}\u{11BF}",
-        nfkc: "\u{D324}",
-        nfkd: "\u{1111}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D325}",
-        nfc: "\u{D325}",
-        nfd: "\u{1111}\u{1161}\u{11C0}",
-        nfkc: "\u{D325}",
-        nfkd: "\u{1111}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D326}",
-        nfc: "\u{D326}",
-        nfd: "\u{1111}\u{1161}\u{11C1}",
-        nfkc: "\u{D326}",
-        nfkd: "\u{1111}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D327}",
-        nfc: "\u{D327}",
-        nfd: "\u{1111}\u{1161}\u{11C2}",
-        nfkc: "\u{D327}",
-        nfkd: "\u{1111}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D328}",
-        nfc: "\u{D328}",
-        nfd: "\u{1111}\u{1162}",
-        nfkc: "\u{D328}",
-        nfkd: "\u{1111}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{D329}",
-        nfc: "\u{D329}",
-        nfd: "\u{1111}\u{1162}\u{11A8}",
-        nfkc: "\u{D329}",
-        nfkd: "\u{1111}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D32A}",
-        nfc: "\u{D32A}",
-        nfd: "\u{1111}\u{1162}\u{11A9}",
-        nfkc: "\u{D32A}",
-        nfkd: "\u{1111}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D32B}",
-        nfc: "\u{D32B}",
-        nfd: "\u{1111}\u{1162}\u{11AA}",
-        nfkc: "\u{D32B}",
-        nfkd: "\u{1111}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D32C}",
-        nfc: "\u{D32C}",
-        nfd: "\u{1111}\u{1162}\u{11AB}",
-        nfkc: "\u{D32C}",
-        nfkd: "\u{1111}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D32D}",
-        nfc: "\u{D32D}",
-        nfd: "\u{1111}\u{1162}\u{11AC}",
-        nfkc: "\u{D32D}",
-        nfkd: "\u{1111}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D32E}",
-        nfc: "\u{D32E}",
-        nfd: "\u{1111}\u{1162}\u{11AD}",
-        nfkc: "\u{D32E}",
-        nfkd: "\u{1111}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D32F}",
-        nfc: "\u{D32F}",
-        nfd: "\u{1111}\u{1162}\u{11AE}",
-        nfkc: "\u{D32F}",
-        nfkd: "\u{1111}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D330}",
-        nfc: "\u{D330}",
-        nfd: "\u{1111}\u{1162}\u{11AF}",
-        nfkc: "\u{D330}",
-        nfkd: "\u{1111}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D331}",
-        nfc: "\u{D331}",
-        nfd: "\u{1111}\u{1162}\u{11B0}",
-        nfkc: "\u{D331}",
-        nfkd: "\u{1111}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D332}",
-        nfc: "\u{D332}",
-        nfd: "\u{1111}\u{1162}\u{11B1}",
-        nfkc: "\u{D332}",
-        nfkd: "\u{1111}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D333}",
-        nfc: "\u{D333}",
-        nfd: "\u{1111}\u{1162}\u{11B2}",
-        nfkc: "\u{D333}",
-        nfkd: "\u{1111}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D334}",
-        nfc: "\u{D334}",
-        nfd: "\u{1111}\u{1162}\u{11B3}",
-        nfkc: "\u{D334}",
-        nfkd: "\u{1111}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D335}",
-        nfc: "\u{D335}",
-        nfd: "\u{1111}\u{1162}\u{11B4}",
-        nfkc: "\u{D335}",
-        nfkd: "\u{1111}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D336}",
-        nfc: "\u{D336}",
-        nfd: "\u{1111}\u{1162}\u{11B5}",
-        nfkc: "\u{D336}",
-        nfkd: "\u{1111}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D337}",
-        nfc: "\u{D337}",
-        nfd: "\u{1111}\u{1162}\u{11B6}",
-        nfkc: "\u{D337}",
-        nfkd: "\u{1111}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D338}",
-        nfc: "\u{D338}",
-        nfd: "\u{1111}\u{1162}\u{11B7}",
-        nfkc: "\u{D338}",
-        nfkd: "\u{1111}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D339}",
-        nfc: "\u{D339}",
-        nfd: "\u{1111}\u{1162}\u{11B8}",
-        nfkc: "\u{D339}",
-        nfkd: "\u{1111}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D33A}",
-        nfc: "\u{D33A}",
-        nfd: "\u{1111}\u{1162}\u{11B9}",
-        nfkc: "\u{D33A}",
-        nfkd: "\u{1111}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D33B}",
-        nfc: "\u{D33B}",
-        nfd: "\u{1111}\u{1162}\u{11BA}",
-        nfkc: "\u{D33B}",
-        nfkd: "\u{1111}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D33C}",
-        nfc: "\u{D33C}",
-        nfd: "\u{1111}\u{1162}\u{11BB}",
-        nfkc: "\u{D33C}",
-        nfkd: "\u{1111}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D33D}",
-        nfc: "\u{D33D}",
-        nfd: "\u{1111}\u{1162}\u{11BC}",
-        nfkc: "\u{D33D}",
-        nfkd: "\u{1111}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D33E}",
-        nfc: "\u{D33E}",
-        nfd: "\u{1111}\u{1162}\u{11BD}",
-        nfkc: "\u{D33E}",
-        nfkd: "\u{1111}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D33F}",
-        nfc: "\u{D33F}",
-        nfd: "\u{1111}\u{1162}\u{11BE}",
-        nfkc: "\u{D33F}",
-        nfkd: "\u{1111}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D340}",
-        nfc: "\u{D340}",
-        nfd: "\u{1111}\u{1162}\u{11BF}",
-        nfkc: "\u{D340}",
-        nfkd: "\u{1111}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D341}",
-        nfc: "\u{D341}",
-        nfd: "\u{1111}\u{1162}\u{11C0}",
-        nfkc: "\u{D341}",
-        nfkd: "\u{1111}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D342}",
-        nfc: "\u{D342}",
-        nfd: "\u{1111}\u{1162}\u{11C1}",
-        nfkc: "\u{D342}",
-        nfkd: "\u{1111}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D343}",
-        nfc: "\u{D343}",
-        nfd: "\u{1111}\u{1162}\u{11C2}",
-        nfkc: "\u{D343}",
-        nfkd: "\u{1111}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D344}",
-        nfc: "\u{D344}",
-        nfd: "\u{1111}\u{1163}",
-        nfkc: "\u{D344}",
-        nfkd: "\u{1111}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{D345}",
-        nfc: "\u{D345}",
-        nfd: "\u{1111}\u{1163}\u{11A8}",
-        nfkc: "\u{D345}",
-        nfkd: "\u{1111}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D346}",
-        nfc: "\u{D346}",
-        nfd: "\u{1111}\u{1163}\u{11A9}",
-        nfkc: "\u{D346}",
-        nfkd: "\u{1111}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D347}",
-        nfc: "\u{D347}",
-        nfd: "\u{1111}\u{1163}\u{11AA}",
-        nfkc: "\u{D347}",
-        nfkd: "\u{1111}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D348}",
-        nfc: "\u{D348}",
-        nfd: "\u{1111}\u{1163}\u{11AB}",
-        nfkc: "\u{D348}",
-        nfkd: "\u{1111}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D349}",
-        nfc: "\u{D349}",
-        nfd: "\u{1111}\u{1163}\u{11AC}",
-        nfkc: "\u{D349}",
-        nfkd: "\u{1111}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D34A}",
-        nfc: "\u{D34A}",
-        nfd: "\u{1111}\u{1163}\u{11AD}",
-        nfkc: "\u{D34A}",
-        nfkd: "\u{1111}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D34B}",
-        nfc: "\u{D34B}",
-        nfd: "\u{1111}\u{1163}\u{11AE}",
-        nfkc: "\u{D34B}",
-        nfkd: "\u{1111}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D34C}",
-        nfc: "\u{D34C}",
-        nfd: "\u{1111}\u{1163}\u{11AF}",
-        nfkc: "\u{D34C}",
-        nfkd: "\u{1111}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D34D}",
-        nfc: "\u{D34D}",
-        nfd: "\u{1111}\u{1163}\u{11B0}",
-        nfkc: "\u{D34D}",
-        nfkd: "\u{1111}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D34E}",
-        nfc: "\u{D34E}",
-        nfd: "\u{1111}\u{1163}\u{11B1}",
-        nfkc: "\u{D34E}",
-        nfkd: "\u{1111}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D34F}",
-        nfc: "\u{D34F}",
-        nfd: "\u{1111}\u{1163}\u{11B2}",
-        nfkc: "\u{D34F}",
-        nfkd: "\u{1111}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D350}",
-        nfc: "\u{D350}",
-        nfd: "\u{1111}\u{1163}\u{11B3}",
-        nfkc: "\u{D350}",
-        nfkd: "\u{1111}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D351}",
-        nfc: "\u{D351}",
-        nfd: "\u{1111}\u{1163}\u{11B4}",
-        nfkc: "\u{D351}",
-        nfkd: "\u{1111}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D352}",
-        nfc: "\u{D352}",
-        nfd: "\u{1111}\u{1163}\u{11B5}",
-        nfkc: "\u{D352}",
-        nfkd: "\u{1111}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D353}",
-        nfc: "\u{D353}",
-        nfd: "\u{1111}\u{1163}\u{11B6}",
-        nfkc: "\u{D353}",
-        nfkd: "\u{1111}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D354}",
-        nfc: "\u{D354}",
-        nfd: "\u{1111}\u{1163}\u{11B7}",
-        nfkc: "\u{D354}",
-        nfkd: "\u{1111}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D355}",
-        nfc: "\u{D355}",
-        nfd: "\u{1111}\u{1163}\u{11B8}",
-        nfkc: "\u{D355}",
-        nfkd: "\u{1111}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D356}",
-        nfc: "\u{D356}",
-        nfd: "\u{1111}\u{1163}\u{11B9}",
-        nfkc: "\u{D356}",
-        nfkd: "\u{1111}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D357}",
-        nfc: "\u{D357}",
-        nfd: "\u{1111}\u{1163}\u{11BA}",
-        nfkc: "\u{D357}",
-        nfkd: "\u{1111}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D358}",
-        nfc: "\u{D358}",
-        nfd: "\u{1111}\u{1163}\u{11BB}",
-        nfkc: "\u{D358}",
-        nfkd: "\u{1111}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D359}",
-        nfc: "\u{D359}",
-        nfd: "\u{1111}\u{1163}\u{11BC}",
-        nfkc: "\u{D359}",
-        nfkd: "\u{1111}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D35A}",
-        nfc: "\u{D35A}",
-        nfd: "\u{1111}\u{1163}\u{11BD}",
-        nfkc: "\u{D35A}",
-        nfkd: "\u{1111}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D35B}",
-        nfc: "\u{D35B}",
-        nfd: "\u{1111}\u{1163}\u{11BE}",
-        nfkc: "\u{D35B}",
-        nfkd: "\u{1111}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D35C}",
-        nfc: "\u{D35C}",
-        nfd: "\u{1111}\u{1163}\u{11BF}",
-        nfkc: "\u{D35C}",
-        nfkd: "\u{1111}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D35D}",
-        nfc: "\u{D35D}",
-        nfd: "\u{1111}\u{1163}\u{11C0}",
-        nfkc: "\u{D35D}",
-        nfkd: "\u{1111}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D35E}",
-        nfc: "\u{D35E}",
-        nfd: "\u{1111}\u{1163}\u{11C1}",
-        nfkc: "\u{D35E}",
-        nfkd: "\u{1111}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D35F}",
-        nfc: "\u{D35F}",
-        nfd: "\u{1111}\u{1163}\u{11C2}",
-        nfkc: "\u{D35F}",
-        nfkd: "\u{1111}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D360}",
-        nfc: "\u{D360}",
-        nfd: "\u{1111}\u{1164}",
-        nfkc: "\u{D360}",
-        nfkd: "\u{1111}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{D361}",
-        nfc: "\u{D361}",
-        nfd: "\u{1111}\u{1164}\u{11A8}",
-        nfkc: "\u{D361}",
-        nfkd: "\u{1111}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D362}",
-        nfc: "\u{D362}",
-        nfd: "\u{1111}\u{1164}\u{11A9}",
-        nfkc: "\u{D362}",
-        nfkd: "\u{1111}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D363}",
-        nfc: "\u{D363}",
-        nfd: "\u{1111}\u{1164}\u{11AA}",
-        nfkc: "\u{D363}",
-        nfkd: "\u{1111}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D364}",
-        nfc: "\u{D364}",
-        nfd: "\u{1111}\u{1164}\u{11AB}",
-        nfkc: "\u{D364}",
-        nfkd: "\u{1111}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D365}",
-        nfc: "\u{D365}",
-        nfd: "\u{1111}\u{1164}\u{11AC}",
-        nfkc: "\u{D365}",
-        nfkd: "\u{1111}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D366}",
-        nfc: "\u{D366}",
-        nfd: "\u{1111}\u{1164}\u{11AD}",
-        nfkc: "\u{D366}",
-        nfkd: "\u{1111}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D367}",
-        nfc: "\u{D367}",
-        nfd: "\u{1111}\u{1164}\u{11AE}",
-        nfkc: "\u{D367}",
-        nfkd: "\u{1111}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D368}",
-        nfc: "\u{D368}",
-        nfd: "\u{1111}\u{1164}\u{11AF}",
-        nfkc: "\u{D368}",
-        nfkd: "\u{1111}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D369}",
-        nfc: "\u{D369}",
-        nfd: "\u{1111}\u{1164}\u{11B0}",
-        nfkc: "\u{D369}",
-        nfkd: "\u{1111}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D36A}",
-        nfc: "\u{D36A}",
-        nfd: "\u{1111}\u{1164}\u{11B1}",
-        nfkc: "\u{D36A}",
-        nfkd: "\u{1111}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D36B}",
-        nfc: "\u{D36B}",
-        nfd: "\u{1111}\u{1164}\u{11B2}",
-        nfkc: "\u{D36B}",
-        nfkd: "\u{1111}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D36C}",
-        nfc: "\u{D36C}",
-        nfd: "\u{1111}\u{1164}\u{11B3}",
-        nfkc: "\u{D36C}",
-        nfkd: "\u{1111}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D36D}",
-        nfc: "\u{D36D}",
-        nfd: "\u{1111}\u{1164}\u{11B4}",
-        nfkc: "\u{D36D}",
-        nfkd: "\u{1111}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D36E}",
-        nfc: "\u{D36E}",
-        nfd: "\u{1111}\u{1164}\u{11B5}",
-        nfkc: "\u{D36E}",
-        nfkd: "\u{1111}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D36F}",
-        nfc: "\u{D36F}",
-        nfd: "\u{1111}\u{1164}\u{11B6}",
-        nfkc: "\u{D36F}",
-        nfkd: "\u{1111}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D370}",
-        nfc: "\u{D370}",
-        nfd: "\u{1111}\u{1164}\u{11B7}",
-        nfkc: "\u{D370}",
-        nfkd: "\u{1111}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D371}",
-        nfc: "\u{D371}",
-        nfd: "\u{1111}\u{1164}\u{11B8}",
-        nfkc: "\u{D371}",
-        nfkd: "\u{1111}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D372}",
-        nfc: "\u{D372}",
-        nfd: "\u{1111}\u{1164}\u{11B9}",
-        nfkc: "\u{D372}",
-        nfkd: "\u{1111}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D373}",
-        nfc: "\u{D373}",
-        nfd: "\u{1111}\u{1164}\u{11BA}",
-        nfkc: "\u{D373}",
-        nfkd: "\u{1111}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D374}",
-        nfc: "\u{D374}",
-        nfd: "\u{1111}\u{1164}\u{11BB}",
-        nfkc: "\u{D374}",
-        nfkd: "\u{1111}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D375}",
-        nfc: "\u{D375}",
-        nfd: "\u{1111}\u{1164}\u{11BC}",
-        nfkc: "\u{D375}",
-        nfkd: "\u{1111}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D376}",
-        nfc: "\u{D376}",
-        nfd: "\u{1111}\u{1164}\u{11BD}",
-        nfkc: "\u{D376}",
-        nfkd: "\u{1111}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D377}",
-        nfc: "\u{D377}",
-        nfd: "\u{1111}\u{1164}\u{11BE}",
-        nfkc: "\u{D377}",
-        nfkd: "\u{1111}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D378}",
-        nfc: "\u{D378}",
-        nfd: "\u{1111}\u{1164}\u{11BF}",
-        nfkc: "\u{D378}",
-        nfkd: "\u{1111}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D379}",
-        nfc: "\u{D379}",
-        nfd: "\u{1111}\u{1164}\u{11C0}",
-        nfkc: "\u{D379}",
-        nfkd: "\u{1111}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D37A}",
-        nfc: "\u{D37A}",
-        nfd: "\u{1111}\u{1164}\u{11C1}",
-        nfkc: "\u{D37A}",
-        nfkd: "\u{1111}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D37B}",
-        nfc: "\u{D37B}",
-        nfd: "\u{1111}\u{1164}\u{11C2}",
-        nfkc: "\u{D37B}",
-        nfkd: "\u{1111}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D37C}",
-        nfc: "\u{D37C}",
-        nfd: "\u{1111}\u{1165}",
-        nfkc: "\u{D37C}",
-        nfkd: "\u{1111}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{D37D}",
-        nfc: "\u{D37D}",
-        nfd: "\u{1111}\u{1165}\u{11A8}",
-        nfkc: "\u{D37D}",
-        nfkd: "\u{1111}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D37E}",
-        nfc: "\u{D37E}",
-        nfd: "\u{1111}\u{1165}\u{11A9}",
-        nfkc: "\u{D37E}",
-        nfkd: "\u{1111}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D37F}",
-        nfc: "\u{D37F}",
-        nfd: "\u{1111}\u{1165}\u{11AA}",
-        nfkc: "\u{D37F}",
-        nfkd: "\u{1111}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D380}",
-        nfc: "\u{D380}",
-        nfd: "\u{1111}\u{1165}\u{11AB}",
-        nfkc: "\u{D380}",
-        nfkd: "\u{1111}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D381}",
-        nfc: "\u{D381}",
-        nfd: "\u{1111}\u{1165}\u{11AC}",
-        nfkc: "\u{D381}",
-        nfkd: "\u{1111}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D382}",
-        nfc: "\u{D382}",
-        nfd: "\u{1111}\u{1165}\u{11AD}",
-        nfkc: "\u{D382}",
-        nfkd: "\u{1111}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D383}",
-        nfc: "\u{D383}",
-        nfd: "\u{1111}\u{1165}\u{11AE}",
-        nfkc: "\u{D383}",
-        nfkd: "\u{1111}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D384}",
-        nfc: "\u{D384}",
-        nfd: "\u{1111}\u{1165}\u{11AF}",
-        nfkc: "\u{D384}",
-        nfkd: "\u{1111}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D385}",
-        nfc: "\u{D385}",
-        nfd: "\u{1111}\u{1165}\u{11B0}",
-        nfkc: "\u{D385}",
-        nfkd: "\u{1111}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D386}",
-        nfc: "\u{D386}",
-        nfd: "\u{1111}\u{1165}\u{11B1}",
-        nfkc: "\u{D386}",
-        nfkd: "\u{1111}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D387}",
-        nfc: "\u{D387}",
-        nfd: "\u{1111}\u{1165}\u{11B2}",
-        nfkc: "\u{D387}",
-        nfkd: "\u{1111}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D388}",
-        nfc: "\u{D388}",
-        nfd: "\u{1111}\u{1165}\u{11B3}",
-        nfkc: "\u{D388}",
-        nfkd: "\u{1111}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D389}",
-        nfc: "\u{D389}",
-        nfd: "\u{1111}\u{1165}\u{11B4}",
-        nfkc: "\u{D389}",
-        nfkd: "\u{1111}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D38A}",
-        nfc: "\u{D38A}",
-        nfd: "\u{1111}\u{1165}\u{11B5}",
-        nfkc: "\u{D38A}",
-        nfkd: "\u{1111}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D38B}",
-        nfc: "\u{D38B}",
-        nfd: "\u{1111}\u{1165}\u{11B6}",
-        nfkc: "\u{D38B}",
-        nfkd: "\u{1111}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D38C}",
-        nfc: "\u{D38C}",
-        nfd: "\u{1111}\u{1165}\u{11B7}",
-        nfkc: "\u{D38C}",
-        nfkd: "\u{1111}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D38D}",
-        nfc: "\u{D38D}",
-        nfd: "\u{1111}\u{1165}\u{11B8}",
-        nfkc: "\u{D38D}",
-        nfkd: "\u{1111}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D38E}",
-        nfc: "\u{D38E}",
-        nfd: "\u{1111}\u{1165}\u{11B9}",
-        nfkc: "\u{D38E}",
-        nfkd: "\u{1111}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D38F}",
-        nfc: "\u{D38F}",
-        nfd: "\u{1111}\u{1165}\u{11BA}",
-        nfkc: "\u{D38F}",
-        nfkd: "\u{1111}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D390}",
-        nfc: "\u{D390}",
-        nfd: "\u{1111}\u{1165}\u{11BB}",
-        nfkc: "\u{D390}",
-        nfkd: "\u{1111}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D391}",
-        nfc: "\u{D391}",
-        nfd: "\u{1111}\u{1165}\u{11BC}",
-        nfkc: "\u{D391}",
-        nfkd: "\u{1111}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D392}",
-        nfc: "\u{D392}",
-        nfd: "\u{1111}\u{1165}\u{11BD}",
-        nfkc: "\u{D392}",
-        nfkd: "\u{1111}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D393}",
-        nfc: "\u{D393}",
-        nfd: "\u{1111}\u{1165}\u{11BE}",
-        nfkc: "\u{D393}",
-        nfkd: "\u{1111}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D394}",
-        nfc: "\u{D394}",
-        nfd: "\u{1111}\u{1165}\u{11BF}",
-        nfkc: "\u{D394}",
-        nfkd: "\u{1111}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D395}",
-        nfc: "\u{D395}",
-        nfd: "\u{1111}\u{1165}\u{11C0}",
-        nfkc: "\u{D395}",
-        nfkd: "\u{1111}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D396}",
-        nfc: "\u{D396}",
-        nfd: "\u{1111}\u{1165}\u{11C1}",
-        nfkc: "\u{D396}",
-        nfkd: "\u{1111}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D397}",
-        nfc: "\u{D397}",
-        nfd: "\u{1111}\u{1165}\u{11C2}",
-        nfkc: "\u{D397}",
-        nfkd: "\u{1111}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D398}",
-        nfc: "\u{D398}",
-        nfd: "\u{1111}\u{1166}",
-        nfkc: "\u{D398}",
-        nfkd: "\u{1111}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{D399}",
-        nfc: "\u{D399}",
-        nfd: "\u{1111}\u{1166}\u{11A8}",
-        nfkc: "\u{D399}",
-        nfkd: "\u{1111}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D39A}",
-        nfc: "\u{D39A}",
-        nfd: "\u{1111}\u{1166}\u{11A9}",
-        nfkc: "\u{D39A}",
-        nfkd: "\u{1111}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D39B}",
-        nfc: "\u{D39B}",
-        nfd: "\u{1111}\u{1166}\u{11AA}",
-        nfkc: "\u{D39B}",
-        nfkd: "\u{1111}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D39C}",
-        nfc: "\u{D39C}",
-        nfd: "\u{1111}\u{1166}\u{11AB}",
-        nfkc: "\u{D39C}",
-        nfkd: "\u{1111}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D39D}",
-        nfc: "\u{D39D}",
-        nfd: "\u{1111}\u{1166}\u{11AC}",
-        nfkc: "\u{D39D}",
-        nfkd: "\u{1111}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D39E}",
-        nfc: "\u{D39E}",
-        nfd: "\u{1111}\u{1166}\u{11AD}",
-        nfkc: "\u{D39E}",
-        nfkd: "\u{1111}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D39F}",
-        nfc: "\u{D39F}",
-        nfd: "\u{1111}\u{1166}\u{11AE}",
-        nfkc: "\u{D39F}",
-        nfkd: "\u{1111}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D3A0}",
-        nfc: "\u{D3A0}",
-        nfd: "\u{1111}\u{1166}\u{11AF}",
-        nfkc: "\u{D3A0}",
-        nfkd: "\u{1111}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D3A1}",
-        nfc: "\u{D3A1}",
-        nfd: "\u{1111}\u{1166}\u{11B0}",
-        nfkc: "\u{D3A1}",
-        nfkd: "\u{1111}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D3A2}",
-        nfc: "\u{D3A2}",
-        nfd: "\u{1111}\u{1166}\u{11B1}",
-        nfkc: "\u{D3A2}",
-        nfkd: "\u{1111}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D3A3}",
-        nfc: "\u{D3A3}",
-        nfd: "\u{1111}\u{1166}\u{11B2}",
-        nfkc: "\u{D3A3}",
-        nfkd: "\u{1111}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D3A4}",
-        nfc: "\u{D3A4}",
-        nfd: "\u{1111}\u{1166}\u{11B3}",
-        nfkc: "\u{D3A4}",
-        nfkd: "\u{1111}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D3A5}",
-        nfc: "\u{D3A5}",
-        nfd: "\u{1111}\u{1166}\u{11B4}",
-        nfkc: "\u{D3A5}",
-        nfkd: "\u{1111}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D3A6}",
-        nfc: "\u{D3A6}",
-        nfd: "\u{1111}\u{1166}\u{11B5}",
-        nfkc: "\u{D3A6}",
-        nfkd: "\u{1111}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D3A7}",
-        nfc: "\u{D3A7}",
-        nfd: "\u{1111}\u{1166}\u{11B6}",
-        nfkc: "\u{D3A7}",
-        nfkd: "\u{1111}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D3A8}",
-        nfc: "\u{D3A8}",
-        nfd: "\u{1111}\u{1166}\u{11B7}",
-        nfkc: "\u{D3A8}",
-        nfkd: "\u{1111}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D3A9}",
-        nfc: "\u{D3A9}",
-        nfd: "\u{1111}\u{1166}\u{11B8}",
-        nfkc: "\u{D3A9}",
-        nfkd: "\u{1111}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D3AA}",
-        nfc: "\u{D3AA}",
-        nfd: "\u{1111}\u{1166}\u{11B9}",
-        nfkc: "\u{D3AA}",
-        nfkd: "\u{1111}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D3AB}",
-        nfc: "\u{D3AB}",
-        nfd: "\u{1111}\u{1166}\u{11BA}",
-        nfkc: "\u{D3AB}",
-        nfkd: "\u{1111}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D3AC}",
-        nfc: "\u{D3AC}",
-        nfd: "\u{1111}\u{1166}\u{11BB}",
-        nfkc: "\u{D3AC}",
-        nfkd: "\u{1111}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D3AD}",
-        nfc: "\u{D3AD}",
-        nfd: "\u{1111}\u{1166}\u{11BC}",
-        nfkc: "\u{D3AD}",
-        nfkd: "\u{1111}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D3AE}",
-        nfc: "\u{D3AE}",
-        nfd: "\u{1111}\u{1166}\u{11BD}",
-        nfkc: "\u{D3AE}",
-        nfkd: "\u{1111}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D3AF}",
-        nfc: "\u{D3AF}",
-        nfd: "\u{1111}\u{1166}\u{11BE}",
-        nfkc: "\u{D3AF}",
-        nfkd: "\u{1111}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D3B0}",
-        nfc: "\u{D3B0}",
-        nfd: "\u{1111}\u{1166}\u{11BF}",
-        nfkc: "\u{D3B0}",
-        nfkd: "\u{1111}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D3B1}",
-        nfc: "\u{D3B1}",
-        nfd: "\u{1111}\u{1166}\u{11C0}",
-        nfkc: "\u{D3B1}",
-        nfkd: "\u{1111}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D3B2}",
-        nfc: "\u{D3B2}",
-        nfd: "\u{1111}\u{1166}\u{11C1}",
-        nfkc: "\u{D3B2}",
-        nfkd: "\u{1111}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D3B3}",
-        nfc: "\u{D3B3}",
-        nfd: "\u{1111}\u{1166}\u{11C2}",
-        nfkc: "\u{D3B3}",
-        nfkd: "\u{1111}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D3B4}",
-        nfc: "\u{D3B4}",
-        nfd: "\u{1111}\u{1167}",
-        nfkc: "\u{D3B4}",
-        nfkd: "\u{1111}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{D3B5}",
-        nfc: "\u{D3B5}",
-        nfd: "\u{1111}\u{1167}\u{11A8}",
-        nfkc: "\u{D3B5}",
-        nfkd: "\u{1111}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D3B6}",
-        nfc: "\u{D3B6}",
-        nfd: "\u{1111}\u{1167}\u{11A9}",
-        nfkc: "\u{D3B6}",
-        nfkd: "\u{1111}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D3B7}",
-        nfc: "\u{D3B7}",
-        nfd: "\u{1111}\u{1167}\u{11AA}",
-        nfkc: "\u{D3B7}",
-        nfkd: "\u{1111}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D3B8}",
-        nfc: "\u{D3B8}",
-        nfd: "\u{1111}\u{1167}\u{11AB}",
-        nfkc: "\u{D3B8}",
-        nfkd: "\u{1111}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D3B9}",
-        nfc: "\u{D3B9}",
-        nfd: "\u{1111}\u{1167}\u{11AC}",
-        nfkc: "\u{D3B9}",
-        nfkd: "\u{1111}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D3BA}",
-        nfc: "\u{D3BA}",
-        nfd: "\u{1111}\u{1167}\u{11AD}",
-        nfkc: "\u{D3BA}",
-        nfkd: "\u{1111}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D3BB}",
-        nfc: "\u{D3BB}",
-        nfd: "\u{1111}\u{1167}\u{11AE}",
-        nfkc: "\u{D3BB}",
-        nfkd: "\u{1111}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D3BC}",
-        nfc: "\u{D3BC}",
-        nfd: "\u{1111}\u{1167}\u{11AF}",
-        nfkc: "\u{D3BC}",
-        nfkd: "\u{1111}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D3BD}",
-        nfc: "\u{D3BD}",
-        nfd: "\u{1111}\u{1167}\u{11B0}",
-        nfkc: "\u{D3BD}",
-        nfkd: "\u{1111}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D3BE}",
-        nfc: "\u{D3BE}",
-        nfd: "\u{1111}\u{1167}\u{11B1}",
-        nfkc: "\u{D3BE}",
-        nfkd: "\u{1111}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D3BF}",
-        nfc: "\u{D3BF}",
-        nfd: "\u{1111}\u{1167}\u{11B2}",
-        nfkc: "\u{D3BF}",
-        nfkd: "\u{1111}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D3C0}",
-        nfc: "\u{D3C0}",
-        nfd: "\u{1111}\u{1167}\u{11B3}",
-        nfkc: "\u{D3C0}",
-        nfkd: "\u{1111}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D3C1}",
-        nfc: "\u{D3C1}",
-        nfd: "\u{1111}\u{1167}\u{11B4}",
-        nfkc: "\u{D3C1}",
-        nfkd: "\u{1111}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D3C2}",
-        nfc: "\u{D3C2}",
-        nfd: "\u{1111}\u{1167}\u{11B5}",
-        nfkc: "\u{D3C2}",
-        nfkd: "\u{1111}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D3C3}",
-        nfc: "\u{D3C3}",
-        nfd: "\u{1111}\u{1167}\u{11B6}",
-        nfkc: "\u{D3C3}",
-        nfkd: "\u{1111}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D3C4}",
-        nfc: "\u{D3C4}",
-        nfd: "\u{1111}\u{1167}\u{11B7}",
-        nfkc: "\u{D3C4}",
-        nfkd: "\u{1111}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D3C5}",
-        nfc: "\u{D3C5}",
-        nfd: "\u{1111}\u{1167}\u{11B8}",
-        nfkc: "\u{D3C5}",
-        nfkd: "\u{1111}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D3C6}",
-        nfc: "\u{D3C6}",
-        nfd: "\u{1111}\u{1167}\u{11B9}",
-        nfkc: "\u{D3C6}",
-        nfkd: "\u{1111}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D3C7}",
-        nfc: "\u{D3C7}",
-        nfd: "\u{1111}\u{1167}\u{11BA}",
-        nfkc: "\u{D3C7}",
-        nfkd: "\u{1111}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D3C8}",
-        nfc: "\u{D3C8}",
-        nfd: "\u{1111}\u{1167}\u{11BB}",
-        nfkc: "\u{D3C8}",
-        nfkd: "\u{1111}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D3C9}",
-        nfc: "\u{D3C9}",
-        nfd: "\u{1111}\u{1167}\u{11BC}",
-        nfkc: "\u{D3C9}",
-        nfkd: "\u{1111}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D3CA}",
-        nfc: "\u{D3CA}",
-        nfd: "\u{1111}\u{1167}\u{11BD}",
-        nfkc: "\u{D3CA}",
-        nfkd: "\u{1111}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D3CB}",
-        nfc: "\u{D3CB}",
-        nfd: "\u{1111}\u{1167}\u{11BE}",
-        nfkc: "\u{D3CB}",
-        nfkd: "\u{1111}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D3CC}",
-        nfc: "\u{D3CC}",
-        nfd: "\u{1111}\u{1167}\u{11BF}",
-        nfkc: "\u{D3CC}",
-        nfkd: "\u{1111}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D3CD}",
-        nfc: "\u{D3CD}",
-        nfd: "\u{1111}\u{1167}\u{11C0}",
-        nfkc: "\u{D3CD}",
-        nfkd: "\u{1111}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D3CE}",
-        nfc: "\u{D3CE}",
-        nfd: "\u{1111}\u{1167}\u{11C1}",
-        nfkc: "\u{D3CE}",
-        nfkd: "\u{1111}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D3CF}",
-        nfc: "\u{D3CF}",
-        nfd: "\u{1111}\u{1167}\u{11C2}",
-        nfkc: "\u{D3CF}",
-        nfkd: "\u{1111}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D3D0}",
-        nfc: "\u{D3D0}",
-        nfd: "\u{1111}\u{1168}",
-        nfkc: "\u{D3D0}",
-        nfkd: "\u{1111}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{D3D1}",
-        nfc: "\u{D3D1}",
-        nfd: "\u{1111}\u{1168}\u{11A8}",
-        nfkc: "\u{D3D1}",
-        nfkd: "\u{1111}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D3D2}",
-        nfc: "\u{D3D2}",
-        nfd: "\u{1111}\u{1168}\u{11A9}",
-        nfkc: "\u{D3D2}",
-        nfkd: "\u{1111}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D3D3}",
-        nfc: "\u{D3D3}",
-        nfd: "\u{1111}\u{1168}\u{11AA}",
-        nfkc: "\u{D3D3}",
-        nfkd: "\u{1111}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D3D4}",
-        nfc: "\u{D3D4}",
-        nfd: "\u{1111}\u{1168}\u{11AB}",
-        nfkc: "\u{D3D4}",
-        nfkd: "\u{1111}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D3D5}",
-        nfc: "\u{D3D5}",
-        nfd: "\u{1111}\u{1168}\u{11AC}",
-        nfkc: "\u{D3D5}",
-        nfkd: "\u{1111}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D3D6}",
-        nfc: "\u{D3D6}",
-        nfd: "\u{1111}\u{1168}\u{11AD}",
-        nfkc: "\u{D3D6}",
-        nfkd: "\u{1111}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D3D7}",
-        nfc: "\u{D3D7}",
-        nfd: "\u{1111}\u{1168}\u{11AE}",
-        nfkc: "\u{D3D7}",
-        nfkd: "\u{1111}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D3D8}",
-        nfc: "\u{D3D8}",
-        nfd: "\u{1111}\u{1168}\u{11AF}",
-        nfkc: "\u{D3D8}",
-        nfkd: "\u{1111}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D3D9}",
-        nfc: "\u{D3D9}",
-        nfd: "\u{1111}\u{1168}\u{11B0}",
-        nfkc: "\u{D3D9}",
-        nfkd: "\u{1111}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D3DA}",
-        nfc: "\u{D3DA}",
-        nfd: "\u{1111}\u{1168}\u{11B1}",
-        nfkc: "\u{D3DA}",
-        nfkd: "\u{1111}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D3DB}",
-        nfc: "\u{D3DB}",
-        nfd: "\u{1111}\u{1168}\u{11B2}",
-        nfkc: "\u{D3DB}",
-        nfkd: "\u{1111}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D3DC}",
-        nfc: "\u{D3DC}",
-        nfd: "\u{1111}\u{1168}\u{11B3}",
-        nfkc: "\u{D3DC}",
-        nfkd: "\u{1111}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D3DD}",
-        nfc: "\u{D3DD}",
-        nfd: "\u{1111}\u{1168}\u{11B4}",
-        nfkc: "\u{D3DD}",
-        nfkd: "\u{1111}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D3DE}",
-        nfc: "\u{D3DE}",
-        nfd: "\u{1111}\u{1168}\u{11B5}",
-        nfkc: "\u{D3DE}",
-        nfkd: "\u{1111}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D3DF}",
-        nfc: "\u{D3DF}",
-        nfd: "\u{1111}\u{1168}\u{11B6}",
-        nfkc: "\u{D3DF}",
-        nfkd: "\u{1111}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D3E0}",
-        nfc: "\u{D3E0}",
-        nfd: "\u{1111}\u{1168}\u{11B7}",
-        nfkc: "\u{D3E0}",
-        nfkd: "\u{1111}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D3E1}",
-        nfc: "\u{D3E1}",
-        nfd: "\u{1111}\u{1168}\u{11B8}",
-        nfkc: "\u{D3E1}",
-        nfkd: "\u{1111}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D3E2}",
-        nfc: "\u{D3E2}",
-        nfd: "\u{1111}\u{1168}\u{11B9}",
-        nfkc: "\u{D3E2}",
-        nfkd: "\u{1111}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D3E3}",
-        nfc: "\u{D3E3}",
-        nfd: "\u{1111}\u{1168}\u{11BA}",
-        nfkc: "\u{D3E3}",
-        nfkd: "\u{1111}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D3E4}",
-        nfc: "\u{D3E4}",
-        nfd: "\u{1111}\u{1168}\u{11BB}",
-        nfkc: "\u{D3E4}",
-        nfkd: "\u{1111}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D3E5}",
-        nfc: "\u{D3E5}",
-        nfd: "\u{1111}\u{1168}\u{11BC}",
-        nfkc: "\u{D3E5}",
-        nfkd: "\u{1111}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D3E6}",
-        nfc: "\u{D3E6}",
-        nfd: "\u{1111}\u{1168}\u{11BD}",
-        nfkc: "\u{D3E6}",
-        nfkd: "\u{1111}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D3E7}",
-        nfc: "\u{D3E7}",
-        nfd: "\u{1111}\u{1168}\u{11BE}",
-        nfkc: "\u{D3E7}",
-        nfkd: "\u{1111}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D3E8}",
-        nfc: "\u{D3E8}",
-        nfd: "\u{1111}\u{1168}\u{11BF}",
-        nfkc: "\u{D3E8}",
-        nfkd: "\u{1111}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D3E9}",
-        nfc: "\u{D3E9}",
-        nfd: "\u{1111}\u{1168}\u{11C0}",
-        nfkc: "\u{D3E9}",
-        nfkd: "\u{1111}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D3EA}",
-        nfc: "\u{D3EA}",
-        nfd: "\u{1111}\u{1168}\u{11C1}",
-        nfkc: "\u{D3EA}",
-        nfkd: "\u{1111}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D3EB}",
-        nfc: "\u{D3EB}",
-        nfd: "\u{1111}\u{1168}\u{11C2}",
-        nfkc: "\u{D3EB}",
-        nfkd: "\u{1111}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D3EC}",
-        nfc: "\u{D3EC}",
-        nfd: "\u{1111}\u{1169}",
-        nfkc: "\u{D3EC}",
-        nfkd: "\u{1111}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{D3ED}",
-        nfc: "\u{D3ED}",
-        nfd: "\u{1111}\u{1169}\u{11A8}",
-        nfkc: "\u{D3ED}",
-        nfkd: "\u{1111}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D3EE}",
-        nfc: "\u{D3EE}",
-        nfd: "\u{1111}\u{1169}\u{11A9}",
-        nfkc: "\u{D3EE}",
-        nfkd: "\u{1111}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D3EF}",
-        nfc: "\u{D3EF}",
-        nfd: "\u{1111}\u{1169}\u{11AA}",
-        nfkc: "\u{D3EF}",
-        nfkd: "\u{1111}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D3F0}",
-        nfc: "\u{D3F0}",
-        nfd: "\u{1111}\u{1169}\u{11AB}",
-        nfkc: "\u{D3F0}",
-        nfkd: "\u{1111}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D3F1}",
-        nfc: "\u{D3F1}",
-        nfd: "\u{1111}\u{1169}\u{11AC}",
-        nfkc: "\u{D3F1}",
-        nfkd: "\u{1111}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D3F2}",
-        nfc: "\u{D3F2}",
-        nfd: "\u{1111}\u{1169}\u{11AD}",
-        nfkc: "\u{D3F2}",
-        nfkd: "\u{1111}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D3F3}",
-        nfc: "\u{D3F3}",
-        nfd: "\u{1111}\u{1169}\u{11AE}",
-        nfkc: "\u{D3F3}",
-        nfkd: "\u{1111}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D3F4}",
-        nfc: "\u{D3F4}",
-        nfd: "\u{1111}\u{1169}\u{11AF}",
-        nfkc: "\u{D3F4}",
-        nfkd: "\u{1111}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D3F5}",
-        nfc: "\u{D3F5}",
-        nfd: "\u{1111}\u{1169}\u{11B0}",
-        nfkc: "\u{D3F5}",
-        nfkd: "\u{1111}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D3F6}",
-        nfc: "\u{D3F6}",
-        nfd: "\u{1111}\u{1169}\u{11B1}",
-        nfkc: "\u{D3F6}",
-        nfkd: "\u{1111}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D3F7}",
-        nfc: "\u{D3F7}",
-        nfd: "\u{1111}\u{1169}\u{11B2}",
-        nfkc: "\u{D3F7}",
-        nfkd: "\u{1111}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D3F8}",
-        nfc: "\u{D3F8}",
-        nfd: "\u{1111}\u{1169}\u{11B3}",
-        nfkc: "\u{D3F8}",
-        nfkd: "\u{1111}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D3F9}",
-        nfc: "\u{D3F9}",
-        nfd: "\u{1111}\u{1169}\u{11B4}",
-        nfkc: "\u{D3F9}",
-        nfkd: "\u{1111}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D3FA}",
-        nfc: "\u{D3FA}",
-        nfd: "\u{1111}\u{1169}\u{11B5}",
-        nfkc: "\u{D3FA}",
-        nfkd: "\u{1111}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D3FB}",
-        nfc: "\u{D3FB}",
-        nfd: "\u{1111}\u{1169}\u{11B6}",
-        nfkc: "\u{D3FB}",
-        nfkd: "\u{1111}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D3FC}",
-        nfc: "\u{D3FC}",
-        nfd: "\u{1111}\u{1169}\u{11B7}",
-        nfkc: "\u{D3FC}",
-        nfkd: "\u{1111}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D3FD}",
-        nfc: "\u{D3FD}",
-        nfd: "\u{1111}\u{1169}\u{11B8}",
-        nfkc: "\u{D3FD}",
-        nfkd: "\u{1111}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D3FE}",
-        nfc: "\u{D3FE}",
-        nfd: "\u{1111}\u{1169}\u{11B9}",
-        nfkc: "\u{D3FE}",
-        nfkd: "\u{1111}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D3FF}",
-        nfc: "\u{D3FF}",
-        nfd: "\u{1111}\u{1169}\u{11BA}",
-        nfkc: "\u{D3FF}",
-        nfkd: "\u{1111}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D400}",
-        nfc: "\u{D400}",
-        nfd: "\u{1111}\u{1169}\u{11BB}",
-        nfkc: "\u{D400}",
-        nfkd: "\u{1111}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D401}",
-        nfc: "\u{D401}",
-        nfd: "\u{1111}\u{1169}\u{11BC}",
-        nfkc: "\u{D401}",
-        nfkd: "\u{1111}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D402}",
-        nfc: "\u{D402}",
-        nfd: "\u{1111}\u{1169}\u{11BD}",
-        nfkc: "\u{D402}",
-        nfkd: "\u{1111}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D403}",
-        nfc: "\u{D403}",
-        nfd: "\u{1111}\u{1169}\u{11BE}",
-        nfkc: "\u{D403}",
-        nfkd: "\u{1111}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D404}",
-        nfc: "\u{D404}",
-        nfd: "\u{1111}\u{1169}\u{11BF}",
-        nfkc: "\u{D404}",
-        nfkd: "\u{1111}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D405}",
-        nfc: "\u{D405}",
-        nfd: "\u{1111}\u{1169}\u{11C0}",
-        nfkc: "\u{D405}",
-        nfkd: "\u{1111}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D406}",
-        nfc: "\u{D406}",
-        nfd: "\u{1111}\u{1169}\u{11C1}",
-        nfkc: "\u{D406}",
-        nfkd: "\u{1111}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D407}",
-        nfc: "\u{D407}",
-        nfd: "\u{1111}\u{1169}\u{11C2}",
-        nfkc: "\u{D407}",
-        nfkd: "\u{1111}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D408}",
-        nfc: "\u{D408}",
-        nfd: "\u{1111}\u{116A}",
-        nfkc: "\u{D408}",
-        nfkd: "\u{1111}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{D409}",
-        nfc: "\u{D409}",
-        nfd: "\u{1111}\u{116A}\u{11A8}",
-        nfkc: "\u{D409}",
-        nfkd: "\u{1111}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D40A}",
-        nfc: "\u{D40A}",
-        nfd: "\u{1111}\u{116A}\u{11A9}",
-        nfkc: "\u{D40A}",
-        nfkd: "\u{1111}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D40B}",
-        nfc: "\u{D40B}",
-        nfd: "\u{1111}\u{116A}\u{11AA}",
-        nfkc: "\u{D40B}",
-        nfkd: "\u{1111}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D40C}",
-        nfc: "\u{D40C}",
-        nfd: "\u{1111}\u{116A}\u{11AB}",
-        nfkc: "\u{D40C}",
-        nfkd: "\u{1111}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D40D}",
-        nfc: "\u{D40D}",
-        nfd: "\u{1111}\u{116A}\u{11AC}",
-        nfkc: "\u{D40D}",
-        nfkd: "\u{1111}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D40E}",
-        nfc: "\u{D40E}",
-        nfd: "\u{1111}\u{116A}\u{11AD}",
-        nfkc: "\u{D40E}",
-        nfkd: "\u{1111}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D40F}",
-        nfc: "\u{D40F}",
-        nfd: "\u{1111}\u{116A}\u{11AE}",
-        nfkc: "\u{D40F}",
-        nfkd: "\u{1111}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D410}",
-        nfc: "\u{D410}",
-        nfd: "\u{1111}\u{116A}\u{11AF}",
-        nfkc: "\u{D410}",
-        nfkd: "\u{1111}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D411}",
-        nfc: "\u{D411}",
-        nfd: "\u{1111}\u{116A}\u{11B0}",
-        nfkc: "\u{D411}",
-        nfkd: "\u{1111}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D412}",
-        nfc: "\u{D412}",
-        nfd: "\u{1111}\u{116A}\u{11B1}",
-        nfkc: "\u{D412}",
-        nfkd: "\u{1111}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D413}",
-        nfc: "\u{D413}",
-        nfd: "\u{1111}\u{116A}\u{11B2}",
-        nfkc: "\u{D413}",
-        nfkd: "\u{1111}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D414}",
-        nfc: "\u{D414}",
-        nfd: "\u{1111}\u{116A}\u{11B3}",
-        nfkc: "\u{D414}",
-        nfkd: "\u{1111}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D415}",
-        nfc: "\u{D415}",
-        nfd: "\u{1111}\u{116A}\u{11B4}",
-        nfkc: "\u{D415}",
-        nfkd: "\u{1111}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D416}",
-        nfc: "\u{D416}",
-        nfd: "\u{1111}\u{116A}\u{11B5}",
-        nfkc: "\u{D416}",
-        nfkd: "\u{1111}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D417}",
-        nfc: "\u{D417}",
-        nfd: "\u{1111}\u{116A}\u{11B6}",
-        nfkc: "\u{D417}",
-        nfkd: "\u{1111}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D418}",
-        nfc: "\u{D418}",
-        nfd: "\u{1111}\u{116A}\u{11B7}",
-        nfkc: "\u{D418}",
-        nfkd: "\u{1111}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D419}",
-        nfc: "\u{D419}",
-        nfd: "\u{1111}\u{116A}\u{11B8}",
-        nfkc: "\u{D419}",
-        nfkd: "\u{1111}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D41A}",
-        nfc: "\u{D41A}",
-        nfd: "\u{1111}\u{116A}\u{11B9}",
-        nfkc: "\u{D41A}",
-        nfkd: "\u{1111}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D41B}",
-        nfc: "\u{D41B}",
-        nfd: "\u{1111}\u{116A}\u{11BA}",
-        nfkc: "\u{D41B}",
-        nfkd: "\u{1111}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D41C}",
-        nfc: "\u{D41C}",
-        nfd: "\u{1111}\u{116A}\u{11BB}",
-        nfkc: "\u{D41C}",
-        nfkd: "\u{1111}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D41D}",
-        nfc: "\u{D41D}",
-        nfd: "\u{1111}\u{116A}\u{11BC}",
-        nfkc: "\u{D41D}",
-        nfkd: "\u{1111}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D41E}",
-        nfc: "\u{D41E}",
-        nfd: "\u{1111}\u{116A}\u{11BD}",
-        nfkc: "\u{D41E}",
-        nfkd: "\u{1111}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D41F}",
-        nfc: "\u{D41F}",
-        nfd: "\u{1111}\u{116A}\u{11BE}",
-        nfkc: "\u{D41F}",
-        nfkd: "\u{1111}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D420}",
-        nfc: "\u{D420}",
-        nfd: "\u{1111}\u{116A}\u{11BF}",
-        nfkc: "\u{D420}",
-        nfkd: "\u{1111}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D421}",
-        nfc: "\u{D421}",
-        nfd: "\u{1111}\u{116A}\u{11C0}",
-        nfkc: "\u{D421}",
-        nfkd: "\u{1111}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D422}",
-        nfc: "\u{D422}",
-        nfd: "\u{1111}\u{116A}\u{11C1}",
-        nfkc: "\u{D422}",
-        nfkd: "\u{1111}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D423}",
-        nfc: "\u{D423}",
-        nfd: "\u{1111}\u{116A}\u{11C2}",
-        nfkc: "\u{D423}",
-        nfkd: "\u{1111}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D424}",
-        nfc: "\u{D424}",
-        nfd: "\u{1111}\u{116B}",
-        nfkc: "\u{D424}",
-        nfkd: "\u{1111}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{D425}",
-        nfc: "\u{D425}",
-        nfd: "\u{1111}\u{116B}\u{11A8}",
-        nfkc: "\u{D425}",
-        nfkd: "\u{1111}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D426}",
-        nfc: "\u{D426}",
-        nfd: "\u{1111}\u{116B}\u{11A9}",
-        nfkc: "\u{D426}",
-        nfkd: "\u{1111}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D427}",
-        nfc: "\u{D427}",
-        nfd: "\u{1111}\u{116B}\u{11AA}",
-        nfkc: "\u{D427}",
-        nfkd: "\u{1111}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D428}",
-        nfc: "\u{D428}",
-        nfd: "\u{1111}\u{116B}\u{11AB}",
-        nfkc: "\u{D428}",
-        nfkd: "\u{1111}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D429}",
-        nfc: "\u{D429}",
-        nfd: "\u{1111}\u{116B}\u{11AC}",
-        nfkc: "\u{D429}",
-        nfkd: "\u{1111}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D42A}",
-        nfc: "\u{D42A}",
-        nfd: "\u{1111}\u{116B}\u{11AD}",
-        nfkc: "\u{D42A}",
-        nfkd: "\u{1111}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D42B}",
-        nfc: "\u{D42B}",
-        nfd: "\u{1111}\u{116B}\u{11AE}",
-        nfkc: "\u{D42B}",
-        nfkd: "\u{1111}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D42C}",
-        nfc: "\u{D42C}",
-        nfd: "\u{1111}\u{116B}\u{11AF}",
-        nfkc: "\u{D42C}",
-        nfkd: "\u{1111}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D42D}",
-        nfc: "\u{D42D}",
-        nfd: "\u{1111}\u{116B}\u{11B0}",
-        nfkc: "\u{D42D}",
-        nfkd: "\u{1111}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D42E}",
-        nfc: "\u{D42E}",
-        nfd: "\u{1111}\u{116B}\u{11B1}",
-        nfkc: "\u{D42E}",
-        nfkd: "\u{1111}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D42F}",
-        nfc: "\u{D42F}",
-        nfd: "\u{1111}\u{116B}\u{11B2}",
-        nfkc: "\u{D42F}",
-        nfkd: "\u{1111}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D430}",
-        nfc: "\u{D430}",
-        nfd: "\u{1111}\u{116B}\u{11B3}",
-        nfkc: "\u{D430}",
-        nfkd: "\u{1111}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D431}",
-        nfc: "\u{D431}",
-        nfd: "\u{1111}\u{116B}\u{11B4}",
-        nfkc: "\u{D431}",
-        nfkd: "\u{1111}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D432}",
-        nfc: "\u{D432}",
-        nfd: "\u{1111}\u{116B}\u{11B5}",
-        nfkc: "\u{D432}",
-        nfkd: "\u{1111}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D433}",
-        nfc: "\u{D433}",
-        nfd: "\u{1111}\u{116B}\u{11B6}",
-        nfkc: "\u{D433}",
-        nfkd: "\u{1111}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D434}",
-        nfc: "\u{D434}",
-        nfd: "\u{1111}\u{116B}\u{11B7}",
-        nfkc: "\u{D434}",
-        nfkd: "\u{1111}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D435}",
-        nfc: "\u{D435}",
-        nfd: "\u{1111}\u{116B}\u{11B8}",
-        nfkc: "\u{D435}",
-        nfkd: "\u{1111}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D436}",
-        nfc: "\u{D436}",
-        nfd: "\u{1111}\u{116B}\u{11B9}",
-        nfkc: "\u{D436}",
-        nfkd: "\u{1111}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D437}",
-        nfc: "\u{D437}",
-        nfd: "\u{1111}\u{116B}\u{11BA}",
-        nfkc: "\u{D437}",
-        nfkd: "\u{1111}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D438}",
-        nfc: "\u{D438}",
-        nfd: "\u{1111}\u{116B}\u{11BB}",
-        nfkc: "\u{D438}",
-        nfkd: "\u{1111}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D439}",
-        nfc: "\u{D439}",
-        nfd: "\u{1111}\u{116B}\u{11BC}",
-        nfkc: "\u{D439}",
-        nfkd: "\u{1111}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D43A}",
-        nfc: "\u{D43A}",
-        nfd: "\u{1111}\u{116B}\u{11BD}",
-        nfkc: "\u{D43A}",
-        nfkd: "\u{1111}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D43B}",
-        nfc: "\u{D43B}",
-        nfd: "\u{1111}\u{116B}\u{11BE}",
-        nfkc: "\u{D43B}",
-        nfkd: "\u{1111}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D43C}",
-        nfc: "\u{D43C}",
-        nfd: "\u{1111}\u{116B}\u{11BF}",
-        nfkc: "\u{D43C}",
-        nfkd: "\u{1111}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D43D}",
-        nfc: "\u{D43D}",
-        nfd: "\u{1111}\u{116B}\u{11C0}",
-        nfkc: "\u{D43D}",
-        nfkd: "\u{1111}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D43E}",
-        nfc: "\u{D43E}",
-        nfd: "\u{1111}\u{116B}\u{11C1}",
-        nfkc: "\u{D43E}",
-        nfkd: "\u{1111}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D43F}",
-        nfc: "\u{D43F}",
-        nfd: "\u{1111}\u{116B}\u{11C2}",
-        nfkc: "\u{D43F}",
-        nfkd: "\u{1111}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D440}",
-        nfc: "\u{D440}",
-        nfd: "\u{1111}\u{116C}",
-        nfkc: "\u{D440}",
-        nfkd: "\u{1111}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{D441}",
-        nfc: "\u{D441}",
-        nfd: "\u{1111}\u{116C}\u{11A8}",
-        nfkc: "\u{D441}",
-        nfkd: "\u{1111}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D442}",
-        nfc: "\u{D442}",
-        nfd: "\u{1111}\u{116C}\u{11A9}",
-        nfkc: "\u{D442}",
-        nfkd: "\u{1111}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D443}",
-        nfc: "\u{D443}",
-        nfd: "\u{1111}\u{116C}\u{11AA}",
-        nfkc: "\u{D443}",
-        nfkd: "\u{1111}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D444}",
-        nfc: "\u{D444}",
-        nfd: "\u{1111}\u{116C}\u{11AB}",
-        nfkc: "\u{D444}",
-        nfkd: "\u{1111}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D445}",
-        nfc: "\u{D445}",
-        nfd: "\u{1111}\u{116C}\u{11AC}",
-        nfkc: "\u{D445}",
-        nfkd: "\u{1111}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D446}",
-        nfc: "\u{D446}",
-        nfd: "\u{1111}\u{116C}\u{11AD}",
-        nfkc: "\u{D446}",
-        nfkd: "\u{1111}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D447}",
-        nfc: "\u{D447}",
-        nfd: "\u{1111}\u{116C}\u{11AE}",
-        nfkc: "\u{D447}",
-        nfkd: "\u{1111}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D448}",
-        nfc: "\u{D448}",
-        nfd: "\u{1111}\u{116C}\u{11AF}",
-        nfkc: "\u{D448}",
-        nfkd: "\u{1111}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D449}",
-        nfc: "\u{D449}",
-        nfd: "\u{1111}\u{116C}\u{11B0}",
-        nfkc: "\u{D449}",
-        nfkd: "\u{1111}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D44A}",
-        nfc: "\u{D44A}",
-        nfd: "\u{1111}\u{116C}\u{11B1}",
-        nfkc: "\u{D44A}",
-        nfkd: "\u{1111}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D44B}",
-        nfc: "\u{D44B}",
-        nfd: "\u{1111}\u{116C}\u{11B2}",
-        nfkc: "\u{D44B}",
-        nfkd: "\u{1111}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D44C}",
-        nfc: "\u{D44C}",
-        nfd: "\u{1111}\u{116C}\u{11B3}",
-        nfkc: "\u{D44C}",
-        nfkd: "\u{1111}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D44D}",
-        nfc: "\u{D44D}",
-        nfd: "\u{1111}\u{116C}\u{11B4}",
-        nfkc: "\u{D44D}",
-        nfkd: "\u{1111}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D44E}",
-        nfc: "\u{D44E}",
-        nfd: "\u{1111}\u{116C}\u{11B5}",
-        nfkc: "\u{D44E}",
-        nfkd: "\u{1111}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D44F}",
-        nfc: "\u{D44F}",
-        nfd: "\u{1111}\u{116C}\u{11B6}",
-        nfkc: "\u{D44F}",
-        nfkd: "\u{1111}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D450}",
-        nfc: "\u{D450}",
-        nfd: "\u{1111}\u{116C}\u{11B7}",
-        nfkc: "\u{D450}",
-        nfkd: "\u{1111}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D451}",
-        nfc: "\u{D451}",
-        nfd: "\u{1111}\u{116C}\u{11B8}",
-        nfkc: "\u{D451}",
-        nfkd: "\u{1111}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D452}",
-        nfc: "\u{D452}",
-        nfd: "\u{1111}\u{116C}\u{11B9}",
-        nfkc: "\u{D452}",
-        nfkd: "\u{1111}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D453}",
-        nfc: "\u{D453}",
-        nfd: "\u{1111}\u{116C}\u{11BA}",
-        nfkc: "\u{D453}",
-        nfkd: "\u{1111}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D454}",
-        nfc: "\u{D454}",
-        nfd: "\u{1111}\u{116C}\u{11BB}",
-        nfkc: "\u{D454}",
-        nfkd: "\u{1111}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D455}",
-        nfc: "\u{D455}",
-        nfd: "\u{1111}\u{116C}\u{11BC}",
-        nfkc: "\u{D455}",
-        nfkd: "\u{1111}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D456}",
-        nfc: "\u{D456}",
-        nfd: "\u{1111}\u{116C}\u{11BD}",
-        nfkc: "\u{D456}",
-        nfkd: "\u{1111}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D457}",
-        nfc: "\u{D457}",
-        nfd: "\u{1111}\u{116C}\u{11BE}",
-        nfkc: "\u{D457}",
-        nfkd: "\u{1111}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D458}",
-        nfc: "\u{D458}",
-        nfd: "\u{1111}\u{116C}\u{11BF}",
-        nfkc: "\u{D458}",
-        nfkd: "\u{1111}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D459}",
-        nfc: "\u{D459}",
-        nfd: "\u{1111}\u{116C}\u{11C0}",
-        nfkc: "\u{D459}",
-        nfkd: "\u{1111}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D45A}",
-        nfc: "\u{D45A}",
-        nfd: "\u{1111}\u{116C}\u{11C1}",
-        nfkc: "\u{D45A}",
-        nfkd: "\u{1111}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D45B}",
-        nfc: "\u{D45B}",
-        nfd: "\u{1111}\u{116C}\u{11C2}",
-        nfkc: "\u{D45B}",
-        nfkd: "\u{1111}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D45C}",
-        nfc: "\u{D45C}",
-        nfd: "\u{1111}\u{116D}",
-        nfkc: "\u{D45C}",
-        nfkd: "\u{1111}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{D45D}",
-        nfc: "\u{D45D}",
-        nfd: "\u{1111}\u{116D}\u{11A8}",
-        nfkc: "\u{D45D}",
-        nfkd: "\u{1111}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D45E}",
-        nfc: "\u{D45E}",
-        nfd: "\u{1111}\u{116D}\u{11A9}",
-        nfkc: "\u{D45E}",
-        nfkd: "\u{1111}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D45F}",
-        nfc: "\u{D45F}",
-        nfd: "\u{1111}\u{116D}\u{11AA}",
-        nfkc: "\u{D45F}",
-        nfkd: "\u{1111}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D460}",
-        nfc: "\u{D460}",
-        nfd: "\u{1111}\u{116D}\u{11AB}",
-        nfkc: "\u{D460}",
-        nfkd: "\u{1111}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D461}",
-        nfc: "\u{D461}",
-        nfd: "\u{1111}\u{116D}\u{11AC}",
-        nfkc: "\u{D461}",
-        nfkd: "\u{1111}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D462}",
-        nfc: "\u{D462}",
-        nfd: "\u{1111}\u{116D}\u{11AD}",
-        nfkc: "\u{D462}",
-        nfkd: "\u{1111}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D463}",
-        nfc: "\u{D463}",
-        nfd: "\u{1111}\u{116D}\u{11AE}",
-        nfkc: "\u{D463}",
-        nfkd: "\u{1111}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D464}",
-        nfc: "\u{D464}",
-        nfd: "\u{1111}\u{116D}\u{11AF}",
-        nfkc: "\u{D464}",
-        nfkd: "\u{1111}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D465}",
-        nfc: "\u{D465}",
-        nfd: "\u{1111}\u{116D}\u{11B0}",
-        nfkc: "\u{D465}",
-        nfkd: "\u{1111}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D466}",
-        nfc: "\u{D466}",
-        nfd: "\u{1111}\u{116D}\u{11B1}",
-        nfkc: "\u{D466}",
-        nfkd: "\u{1111}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D467}",
-        nfc: "\u{D467}",
-        nfd: "\u{1111}\u{116D}\u{11B2}",
-        nfkc: "\u{D467}",
-        nfkd: "\u{1111}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D468}",
-        nfc: "\u{D468}",
-        nfd: "\u{1111}\u{116D}\u{11B3}",
-        nfkc: "\u{D468}",
-        nfkd: "\u{1111}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D469}",
-        nfc: "\u{D469}",
-        nfd: "\u{1111}\u{116D}\u{11B4}",
-        nfkc: "\u{D469}",
-        nfkd: "\u{1111}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D46A}",
-        nfc: "\u{D46A}",
-        nfd: "\u{1111}\u{116D}\u{11B5}",
-        nfkc: "\u{D46A}",
-        nfkd: "\u{1111}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D46B}",
-        nfc: "\u{D46B}",
-        nfd: "\u{1111}\u{116D}\u{11B6}",
-        nfkc: "\u{D46B}",
-        nfkd: "\u{1111}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D46C}",
-        nfc: "\u{D46C}",
-        nfd: "\u{1111}\u{116D}\u{11B7}",
-        nfkc: "\u{D46C}",
-        nfkd: "\u{1111}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D46D}",
-        nfc: "\u{D46D}",
-        nfd: "\u{1111}\u{116D}\u{11B8}",
-        nfkc: "\u{D46D}",
-        nfkd: "\u{1111}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D46E}",
-        nfc: "\u{D46E}",
-        nfd: "\u{1111}\u{116D}\u{11B9}",
-        nfkc: "\u{D46E}",
-        nfkd: "\u{1111}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D46F}",
-        nfc: "\u{D46F}",
-        nfd: "\u{1111}\u{116D}\u{11BA}",
-        nfkc: "\u{D46F}",
-        nfkd: "\u{1111}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D470}",
-        nfc: "\u{D470}",
-        nfd: "\u{1111}\u{116D}\u{11BB}",
-        nfkc: "\u{D470}",
-        nfkd: "\u{1111}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D471}",
-        nfc: "\u{D471}",
-        nfd: "\u{1111}\u{116D}\u{11BC}",
-        nfkc: "\u{D471}",
-        nfkd: "\u{1111}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D472}",
-        nfc: "\u{D472}",
-        nfd: "\u{1111}\u{116D}\u{11BD}",
-        nfkc: "\u{D472}",
-        nfkd: "\u{1111}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D473}",
-        nfc: "\u{D473}",
-        nfd: "\u{1111}\u{116D}\u{11BE}",
-        nfkc: "\u{D473}",
-        nfkd: "\u{1111}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D474}",
-        nfc: "\u{D474}",
-        nfd: "\u{1111}\u{116D}\u{11BF}",
-        nfkc: "\u{D474}",
-        nfkd: "\u{1111}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D475}",
-        nfc: "\u{D475}",
-        nfd: "\u{1111}\u{116D}\u{11C0}",
-        nfkc: "\u{D475}",
-        nfkd: "\u{1111}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D476}",
-        nfc: "\u{D476}",
-        nfd: "\u{1111}\u{116D}\u{11C1}",
-        nfkc: "\u{D476}",
-        nfkd: "\u{1111}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D477}",
-        nfc: "\u{D477}",
-        nfd: "\u{1111}\u{116D}\u{11C2}",
-        nfkc: "\u{D477}",
-        nfkd: "\u{1111}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D478}",
-        nfc: "\u{D478}",
-        nfd: "\u{1111}\u{116E}",
-        nfkc: "\u{D478}",
-        nfkd: "\u{1111}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{D479}",
-        nfc: "\u{D479}",
-        nfd: "\u{1111}\u{116E}\u{11A8}",
-        nfkc: "\u{D479}",
-        nfkd: "\u{1111}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D47A}",
-        nfc: "\u{D47A}",
-        nfd: "\u{1111}\u{116E}\u{11A9}",
-        nfkc: "\u{D47A}",
-        nfkd: "\u{1111}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D47B}",
-        nfc: "\u{D47B}",
-        nfd: "\u{1111}\u{116E}\u{11AA}",
-        nfkc: "\u{D47B}",
-        nfkd: "\u{1111}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D47C}",
-        nfc: "\u{D47C}",
-        nfd: "\u{1111}\u{116E}\u{11AB}",
-        nfkc: "\u{D47C}",
-        nfkd: "\u{1111}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D47D}",
-        nfc: "\u{D47D}",
-        nfd: "\u{1111}\u{116E}\u{11AC}",
-        nfkc: "\u{D47D}",
-        nfkd: "\u{1111}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D47E}",
-        nfc: "\u{D47E}",
-        nfd: "\u{1111}\u{116E}\u{11AD}",
-        nfkc: "\u{D47E}",
-        nfkd: "\u{1111}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D47F}",
-        nfc: "\u{D47F}",
-        nfd: "\u{1111}\u{116E}\u{11AE}",
-        nfkc: "\u{D47F}",
-        nfkd: "\u{1111}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D480}",
-        nfc: "\u{D480}",
-        nfd: "\u{1111}\u{116E}\u{11AF}",
-        nfkc: "\u{D480}",
-        nfkd: "\u{1111}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D481}",
-        nfc: "\u{D481}",
-        nfd: "\u{1111}\u{116E}\u{11B0}",
-        nfkc: "\u{D481}",
-        nfkd: "\u{1111}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D482}",
-        nfc: "\u{D482}",
-        nfd: "\u{1111}\u{116E}\u{11B1}",
-        nfkc: "\u{D482}",
-        nfkd: "\u{1111}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D483}",
-        nfc: "\u{D483}",
-        nfd: "\u{1111}\u{116E}\u{11B2}",
-        nfkc: "\u{D483}",
-        nfkd: "\u{1111}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D484}",
-        nfc: "\u{D484}",
-        nfd: "\u{1111}\u{116E}\u{11B3}",
-        nfkc: "\u{D484}",
-        nfkd: "\u{1111}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D485}",
-        nfc: "\u{D485}",
-        nfd: "\u{1111}\u{116E}\u{11B4}",
-        nfkc: "\u{D485}",
-        nfkd: "\u{1111}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D486}",
-        nfc: "\u{D486}",
-        nfd: "\u{1111}\u{116E}\u{11B5}",
-        nfkc: "\u{D486}",
-        nfkd: "\u{1111}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D487}",
-        nfc: "\u{D487}",
-        nfd: "\u{1111}\u{116E}\u{11B6}",
-        nfkc: "\u{D487}",
-        nfkd: "\u{1111}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D488}",
-        nfc: "\u{D488}",
-        nfd: "\u{1111}\u{116E}\u{11B7}",
-        nfkc: "\u{D488}",
-        nfkd: "\u{1111}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D489}",
-        nfc: "\u{D489}",
-        nfd: "\u{1111}\u{116E}\u{11B8}",
-        nfkc: "\u{D489}",
-        nfkd: "\u{1111}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D48A}",
-        nfc: "\u{D48A}",
-        nfd: "\u{1111}\u{116E}\u{11B9}",
-        nfkc: "\u{D48A}",
-        nfkd: "\u{1111}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D48B}",
-        nfc: "\u{D48B}",
-        nfd: "\u{1111}\u{116E}\u{11BA}",
-        nfkc: "\u{D48B}",
-        nfkd: "\u{1111}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D48C}",
-        nfc: "\u{D48C}",
-        nfd: "\u{1111}\u{116E}\u{11BB}",
-        nfkc: "\u{D48C}",
-        nfkd: "\u{1111}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D48D}",
-        nfc: "\u{D48D}",
-        nfd: "\u{1111}\u{116E}\u{11BC}",
-        nfkc: "\u{D48D}",
-        nfkd: "\u{1111}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D48E}",
-        nfc: "\u{D48E}",
-        nfd: "\u{1111}\u{116E}\u{11BD}",
-        nfkc: "\u{D48E}",
-        nfkd: "\u{1111}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D48F}",
-        nfc: "\u{D48F}",
-        nfd: "\u{1111}\u{116E}\u{11BE}",
-        nfkc: "\u{D48F}",
-        nfkd: "\u{1111}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D490}",
-        nfc: "\u{D490}",
-        nfd: "\u{1111}\u{116E}\u{11BF}",
-        nfkc: "\u{D490}",
-        nfkd: "\u{1111}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D491}",
-        nfc: "\u{D491}",
-        nfd: "\u{1111}\u{116E}\u{11C0}",
-        nfkc: "\u{D491}",
-        nfkd: "\u{1111}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D492}",
-        nfc: "\u{D492}",
-        nfd: "\u{1111}\u{116E}\u{11C1}",
-        nfkc: "\u{D492}",
-        nfkd: "\u{1111}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D493}",
-        nfc: "\u{D493}",
-        nfd: "\u{1111}\u{116E}\u{11C2}",
-        nfkc: "\u{D493}",
-        nfkd: "\u{1111}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D494}",
-        nfc: "\u{D494}",
-        nfd: "\u{1111}\u{116F}",
-        nfkc: "\u{D494}",
-        nfkd: "\u{1111}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{D495}",
-        nfc: "\u{D495}",
-        nfd: "\u{1111}\u{116F}\u{11A8}",
-        nfkc: "\u{D495}",
-        nfkd: "\u{1111}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D496}",
-        nfc: "\u{D496}",
-        nfd: "\u{1111}\u{116F}\u{11A9}",
-        nfkc: "\u{D496}",
-        nfkd: "\u{1111}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D497}",
-        nfc: "\u{D497}",
-        nfd: "\u{1111}\u{116F}\u{11AA}",
-        nfkc: "\u{D497}",
-        nfkd: "\u{1111}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D498}",
-        nfc: "\u{D498}",
-        nfd: "\u{1111}\u{116F}\u{11AB}",
-        nfkc: "\u{D498}",
-        nfkd: "\u{1111}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D499}",
-        nfc: "\u{D499}",
-        nfd: "\u{1111}\u{116F}\u{11AC}",
-        nfkc: "\u{D499}",
-        nfkd: "\u{1111}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D49A}",
-        nfc: "\u{D49A}",
-        nfd: "\u{1111}\u{116F}\u{11AD}",
-        nfkc: "\u{D49A}",
-        nfkd: "\u{1111}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D49B}",
-        nfc: "\u{D49B}",
-        nfd: "\u{1111}\u{116F}\u{11AE}",
-        nfkc: "\u{D49B}",
-        nfkd: "\u{1111}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D49C}",
-        nfc: "\u{D49C}",
-        nfd: "\u{1111}\u{116F}\u{11AF}",
-        nfkc: "\u{D49C}",
-        nfkd: "\u{1111}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D49D}",
-        nfc: "\u{D49D}",
-        nfd: "\u{1111}\u{116F}\u{11B0}",
-        nfkc: "\u{D49D}",
-        nfkd: "\u{1111}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D49E}",
-        nfc: "\u{D49E}",
-        nfd: "\u{1111}\u{116F}\u{11B1}",
-        nfkc: "\u{D49E}",
-        nfkd: "\u{1111}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D49F}",
-        nfc: "\u{D49F}",
-        nfd: "\u{1111}\u{116F}\u{11B2}",
-        nfkc: "\u{D49F}",
-        nfkd: "\u{1111}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D4A0}",
-        nfc: "\u{D4A0}",
-        nfd: "\u{1111}\u{116F}\u{11B3}",
-        nfkc: "\u{D4A0}",
-        nfkd: "\u{1111}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D4A1}",
-        nfc: "\u{D4A1}",
-        nfd: "\u{1111}\u{116F}\u{11B4}",
-        nfkc: "\u{D4A1}",
-        nfkd: "\u{1111}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D4A2}",
-        nfc: "\u{D4A2}",
-        nfd: "\u{1111}\u{116F}\u{11B5}",
-        nfkc: "\u{D4A2}",
-        nfkd: "\u{1111}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D4A3}",
-        nfc: "\u{D4A3}",
-        nfd: "\u{1111}\u{116F}\u{11B6}",
-        nfkc: "\u{D4A3}",
-        nfkd: "\u{1111}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D4A4}",
-        nfc: "\u{D4A4}",
-        nfd: "\u{1111}\u{116F}\u{11B7}",
-        nfkc: "\u{D4A4}",
-        nfkd: "\u{1111}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D4A5}",
-        nfc: "\u{D4A5}",
-        nfd: "\u{1111}\u{116F}\u{11B8}",
-        nfkc: "\u{D4A5}",
-        nfkd: "\u{1111}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D4A6}",
-        nfc: "\u{D4A6}",
-        nfd: "\u{1111}\u{116F}\u{11B9}",
-        nfkc: "\u{D4A6}",
-        nfkd: "\u{1111}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D4A7}",
-        nfc: "\u{D4A7}",
-        nfd: "\u{1111}\u{116F}\u{11BA}",
-        nfkc: "\u{D4A7}",
-        nfkd: "\u{1111}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D4A8}",
-        nfc: "\u{D4A8}",
-        nfd: "\u{1111}\u{116F}\u{11BB}",
-        nfkc: "\u{D4A8}",
-        nfkd: "\u{1111}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D4A9}",
-        nfc: "\u{D4A9}",
-        nfd: "\u{1111}\u{116F}\u{11BC}",
-        nfkc: "\u{D4A9}",
-        nfkd: "\u{1111}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D4AA}",
-        nfc: "\u{D4AA}",
-        nfd: "\u{1111}\u{116F}\u{11BD}",
-        nfkc: "\u{D4AA}",
-        nfkd: "\u{1111}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D4AB}",
-        nfc: "\u{D4AB}",
-        nfd: "\u{1111}\u{116F}\u{11BE}",
-        nfkc: "\u{D4AB}",
-        nfkd: "\u{1111}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D4AC}",
-        nfc: "\u{D4AC}",
-        nfd: "\u{1111}\u{116F}\u{11BF}",
-        nfkc: "\u{D4AC}",
-        nfkd: "\u{1111}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D4AD}",
-        nfc: "\u{D4AD}",
-        nfd: "\u{1111}\u{116F}\u{11C0}",
-        nfkc: "\u{D4AD}",
-        nfkd: "\u{1111}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D4AE}",
-        nfc: "\u{D4AE}",
-        nfd: "\u{1111}\u{116F}\u{11C1}",
-        nfkc: "\u{D4AE}",
-        nfkd: "\u{1111}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D4AF}",
-        nfc: "\u{D4AF}",
-        nfd: "\u{1111}\u{116F}\u{11C2}",
-        nfkc: "\u{D4AF}",
-        nfkd: "\u{1111}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D4B0}",
-        nfc: "\u{D4B0}",
-        nfd: "\u{1111}\u{1170}",
-        nfkc: "\u{D4B0}",
-        nfkd: "\u{1111}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{D4B1}",
-        nfc: "\u{D4B1}",
-        nfd: "\u{1111}\u{1170}\u{11A8}",
-        nfkc: "\u{D4B1}",
-        nfkd: "\u{1111}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D4B2}",
-        nfc: "\u{D4B2}",
-        nfd: "\u{1111}\u{1170}\u{11A9}",
-        nfkc: "\u{D4B2}",
-        nfkd: "\u{1111}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D4B3}",
-        nfc: "\u{D4B3}",
-        nfd: "\u{1111}\u{1170}\u{11AA}",
-        nfkc: "\u{D4B3}",
-        nfkd: "\u{1111}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D4B4}",
-        nfc: "\u{D4B4}",
-        nfd: "\u{1111}\u{1170}\u{11AB}",
-        nfkc: "\u{D4B4}",
-        nfkd: "\u{1111}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D4B5}",
-        nfc: "\u{D4B5}",
-        nfd: "\u{1111}\u{1170}\u{11AC}",
-        nfkc: "\u{D4B5}",
-        nfkd: "\u{1111}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D4B6}",
-        nfc: "\u{D4B6}",
-        nfd: "\u{1111}\u{1170}\u{11AD}",
-        nfkc: "\u{D4B6}",
-        nfkd: "\u{1111}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D4B7}",
-        nfc: "\u{D4B7}",
-        nfd: "\u{1111}\u{1170}\u{11AE}",
-        nfkc: "\u{D4B7}",
-        nfkd: "\u{1111}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D4B8}",
-        nfc: "\u{D4B8}",
-        nfd: "\u{1111}\u{1170}\u{11AF}",
-        nfkc: "\u{D4B8}",
-        nfkd: "\u{1111}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D4B9}",
-        nfc: "\u{D4B9}",
-        nfd: "\u{1111}\u{1170}\u{11B0}",
-        nfkc: "\u{D4B9}",
-        nfkd: "\u{1111}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D4BA}",
-        nfc: "\u{D4BA}",
-        nfd: "\u{1111}\u{1170}\u{11B1}",
-        nfkc: "\u{D4BA}",
-        nfkd: "\u{1111}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D4BB}",
-        nfc: "\u{D4BB}",
-        nfd: "\u{1111}\u{1170}\u{11B2}",
-        nfkc: "\u{D4BB}",
-        nfkd: "\u{1111}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D4BC}",
-        nfc: "\u{D4BC}",
-        nfd: "\u{1111}\u{1170}\u{11B3}",
-        nfkc: "\u{D4BC}",
-        nfkd: "\u{1111}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D4BD}",
-        nfc: "\u{D4BD}",
-        nfd: "\u{1111}\u{1170}\u{11B4}",
-        nfkc: "\u{D4BD}",
-        nfkd: "\u{1111}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D4BE}",
-        nfc: "\u{D4BE}",
-        nfd: "\u{1111}\u{1170}\u{11B5}",
-        nfkc: "\u{D4BE}",
-        nfkd: "\u{1111}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D4BF}",
-        nfc: "\u{D4BF}",
-        nfd: "\u{1111}\u{1170}\u{11B6}",
-        nfkc: "\u{D4BF}",
-        nfkd: "\u{1111}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D4C0}",
-        nfc: "\u{D4C0}",
-        nfd: "\u{1111}\u{1170}\u{11B7}",
-        nfkc: "\u{D4C0}",
-        nfkd: "\u{1111}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D4C1}",
-        nfc: "\u{D4C1}",
-        nfd: "\u{1111}\u{1170}\u{11B8}",
-        nfkc: "\u{D4C1}",
-        nfkd: "\u{1111}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D4C2}",
-        nfc: "\u{D4C2}",
-        nfd: "\u{1111}\u{1170}\u{11B9}",
-        nfkc: "\u{D4C2}",
-        nfkd: "\u{1111}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D4C3}",
-        nfc: "\u{D4C3}",
-        nfd: "\u{1111}\u{1170}\u{11BA}",
-        nfkc: "\u{D4C3}",
-        nfkd: "\u{1111}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D4C4}",
-        nfc: "\u{D4C4}",
-        nfd: "\u{1111}\u{1170}\u{11BB}",
-        nfkc: "\u{D4C4}",
-        nfkd: "\u{1111}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D4C5}",
-        nfc: "\u{D4C5}",
-        nfd: "\u{1111}\u{1170}\u{11BC}",
-        nfkc: "\u{D4C5}",
-        nfkd: "\u{1111}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D4C6}",
-        nfc: "\u{D4C6}",
-        nfd: "\u{1111}\u{1170}\u{11BD}",
-        nfkc: "\u{D4C6}",
-        nfkd: "\u{1111}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D4C7}",
-        nfc: "\u{D4C7}",
-        nfd: "\u{1111}\u{1170}\u{11BE}",
-        nfkc: "\u{D4C7}",
-        nfkd: "\u{1111}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D4C8}",
-        nfc: "\u{D4C8}",
-        nfd: "\u{1111}\u{1170}\u{11BF}",
-        nfkc: "\u{D4C8}",
-        nfkd: "\u{1111}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D4C9}",
-        nfc: "\u{D4C9}",
-        nfd: "\u{1111}\u{1170}\u{11C0}",
-        nfkc: "\u{D4C9}",
-        nfkd: "\u{1111}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D4CA}",
-        nfc: "\u{D4CA}",
-        nfd: "\u{1111}\u{1170}\u{11C1}",
-        nfkc: "\u{D4CA}",
-        nfkd: "\u{1111}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D4CB}",
-        nfc: "\u{D4CB}",
-        nfd: "\u{1111}\u{1170}\u{11C2}",
-        nfkc: "\u{D4CB}",
-        nfkd: "\u{1111}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D4CC}",
-        nfc: "\u{D4CC}",
-        nfd: "\u{1111}\u{1171}",
-        nfkc: "\u{D4CC}",
-        nfkd: "\u{1111}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{D4CD}",
-        nfc: "\u{D4CD}",
-        nfd: "\u{1111}\u{1171}\u{11A8}",
-        nfkc: "\u{D4CD}",
-        nfkd: "\u{1111}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D4CE}",
-        nfc: "\u{D4CE}",
-        nfd: "\u{1111}\u{1171}\u{11A9}",
-        nfkc: "\u{D4CE}",
-        nfkd: "\u{1111}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D4CF}",
-        nfc: "\u{D4CF}",
-        nfd: "\u{1111}\u{1171}\u{11AA}",
-        nfkc: "\u{D4CF}",
-        nfkd: "\u{1111}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D4D0}",
-        nfc: "\u{D4D0}",
-        nfd: "\u{1111}\u{1171}\u{11AB}",
-        nfkc: "\u{D4D0}",
-        nfkd: "\u{1111}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D4D1}",
-        nfc: "\u{D4D1}",
-        nfd: "\u{1111}\u{1171}\u{11AC}",
-        nfkc: "\u{D4D1}",
-        nfkd: "\u{1111}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D4D2}",
-        nfc: "\u{D4D2}",
-        nfd: "\u{1111}\u{1171}\u{11AD}",
-        nfkc: "\u{D4D2}",
-        nfkd: "\u{1111}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D4D3}",
-        nfc: "\u{D4D3}",
-        nfd: "\u{1111}\u{1171}\u{11AE}",
-        nfkc: "\u{D4D3}",
-        nfkd: "\u{1111}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D4D4}",
-        nfc: "\u{D4D4}",
-        nfd: "\u{1111}\u{1171}\u{11AF}",
-        nfkc: "\u{D4D4}",
-        nfkd: "\u{1111}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D4D5}",
-        nfc: "\u{D4D5}",
-        nfd: "\u{1111}\u{1171}\u{11B0}",
-        nfkc: "\u{D4D5}",
-        nfkd: "\u{1111}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D4D6}",
-        nfc: "\u{D4D6}",
-        nfd: "\u{1111}\u{1171}\u{11B1}",
-        nfkc: "\u{D4D6}",
-        nfkd: "\u{1111}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D4D7}",
-        nfc: "\u{D4D7}",
-        nfd: "\u{1111}\u{1171}\u{11B2}",
-        nfkc: "\u{D4D7}",
-        nfkd: "\u{1111}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D4D8}",
-        nfc: "\u{D4D8}",
-        nfd: "\u{1111}\u{1171}\u{11B3}",
-        nfkc: "\u{D4D8}",
-        nfkd: "\u{1111}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D4D9}",
-        nfc: "\u{D4D9}",
-        nfd: "\u{1111}\u{1171}\u{11B4}",
-        nfkc: "\u{D4D9}",
-        nfkd: "\u{1111}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D4DA}",
-        nfc: "\u{D4DA}",
-        nfd: "\u{1111}\u{1171}\u{11B5}",
-        nfkc: "\u{D4DA}",
-        nfkd: "\u{1111}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D4DB}",
-        nfc: "\u{D4DB}",
-        nfd: "\u{1111}\u{1171}\u{11B6}",
-        nfkc: "\u{D4DB}",
-        nfkd: "\u{1111}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D4DC}",
-        nfc: "\u{D4DC}",
-        nfd: "\u{1111}\u{1171}\u{11B7}",
-        nfkc: "\u{D4DC}",
-        nfkd: "\u{1111}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D4DD}",
-        nfc: "\u{D4DD}",
-        nfd: "\u{1111}\u{1171}\u{11B8}",
-        nfkc: "\u{D4DD}",
-        nfkd: "\u{1111}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D4DE}",
-        nfc: "\u{D4DE}",
-        nfd: "\u{1111}\u{1171}\u{11B9}",
-        nfkc: "\u{D4DE}",
-        nfkd: "\u{1111}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D4DF}",
-        nfc: "\u{D4DF}",
-        nfd: "\u{1111}\u{1171}\u{11BA}",
-        nfkc: "\u{D4DF}",
-        nfkd: "\u{1111}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D4E0}",
-        nfc: "\u{D4E0}",
-        nfd: "\u{1111}\u{1171}\u{11BB}",
-        nfkc: "\u{D4E0}",
-        nfkd: "\u{1111}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D4E1}",
-        nfc: "\u{D4E1}",
-        nfd: "\u{1111}\u{1171}\u{11BC}",
-        nfkc: "\u{D4E1}",
-        nfkd: "\u{1111}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D4E2}",
-        nfc: "\u{D4E2}",
-        nfd: "\u{1111}\u{1171}\u{11BD}",
-        nfkc: "\u{D4E2}",
-        nfkd: "\u{1111}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D4E3}",
-        nfc: "\u{D4E3}",
-        nfd: "\u{1111}\u{1171}\u{11BE}",
-        nfkc: "\u{D4E3}",
-        nfkd: "\u{1111}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D4E4}",
-        nfc: "\u{D4E4}",
-        nfd: "\u{1111}\u{1171}\u{11BF}",
-        nfkc: "\u{D4E4}",
-        nfkd: "\u{1111}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D4E5}",
-        nfc: "\u{D4E5}",
-        nfd: "\u{1111}\u{1171}\u{11C0}",
-        nfkc: "\u{D4E5}",
-        nfkd: "\u{1111}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D4E6}",
-        nfc: "\u{D4E6}",
-        nfd: "\u{1111}\u{1171}\u{11C1}",
-        nfkc: "\u{D4E6}",
-        nfkd: "\u{1111}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D4E7}",
-        nfc: "\u{D4E7}",
-        nfd: "\u{1111}\u{1171}\u{11C2}",
-        nfkc: "\u{D4E7}",
-        nfkd: "\u{1111}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D4E8}",
-        nfc: "\u{D4E8}",
-        nfd: "\u{1111}\u{1172}",
-        nfkc: "\u{D4E8}",
-        nfkd: "\u{1111}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{D4E9}",
-        nfc: "\u{D4E9}",
-        nfd: "\u{1111}\u{1172}\u{11A8}",
-        nfkc: "\u{D4E9}",
-        nfkd: "\u{1111}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D4EA}",
-        nfc: "\u{D4EA}",
-        nfd: "\u{1111}\u{1172}\u{11A9}",
-        nfkc: "\u{D4EA}",
-        nfkd: "\u{1111}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D4EB}",
-        nfc: "\u{D4EB}",
-        nfd: "\u{1111}\u{1172}\u{11AA}",
-        nfkc: "\u{D4EB}",
-        nfkd: "\u{1111}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D4EC}",
-        nfc: "\u{D4EC}",
-        nfd: "\u{1111}\u{1172}\u{11AB}",
-        nfkc: "\u{D4EC}",
-        nfkd: "\u{1111}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D4ED}",
-        nfc: "\u{D4ED}",
-        nfd: "\u{1111}\u{1172}\u{11AC}",
-        nfkc: "\u{D4ED}",
-        nfkd: "\u{1111}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D4EE}",
-        nfc: "\u{D4EE}",
-        nfd: "\u{1111}\u{1172}\u{11AD}",
-        nfkc: "\u{D4EE}",
-        nfkd: "\u{1111}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D4EF}",
-        nfc: "\u{D4EF}",
-        nfd: "\u{1111}\u{1172}\u{11AE}",
-        nfkc: "\u{D4EF}",
-        nfkd: "\u{1111}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D4F0}",
-        nfc: "\u{D4F0}",
-        nfd: "\u{1111}\u{1172}\u{11AF}",
-        nfkc: "\u{D4F0}",
-        nfkd: "\u{1111}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D4F1}",
-        nfc: "\u{D4F1}",
-        nfd: "\u{1111}\u{1172}\u{11B0}",
-        nfkc: "\u{D4F1}",
-        nfkd: "\u{1111}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D4F2}",
-        nfc: "\u{D4F2}",
-        nfd: "\u{1111}\u{1172}\u{11B1}",
-        nfkc: "\u{D4F2}",
-        nfkd: "\u{1111}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D4F3}",
-        nfc: "\u{D4F3}",
-        nfd: "\u{1111}\u{1172}\u{11B2}",
-        nfkc: "\u{D4F3}",
-        nfkd: "\u{1111}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D4F4}",
-        nfc: "\u{D4F4}",
-        nfd: "\u{1111}\u{1172}\u{11B3}",
-        nfkc: "\u{D4F4}",
-        nfkd: "\u{1111}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D4F5}",
-        nfc: "\u{D4F5}",
-        nfd: "\u{1111}\u{1172}\u{11B4}",
-        nfkc: "\u{D4F5}",
-        nfkd: "\u{1111}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D4F6}",
-        nfc: "\u{D4F6}",
-        nfd: "\u{1111}\u{1172}\u{11B5}",
-        nfkc: "\u{D4F6}",
-        nfkd: "\u{1111}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D4F7}",
-        nfc: "\u{D4F7}",
-        nfd: "\u{1111}\u{1172}\u{11B6}",
-        nfkc: "\u{D4F7}",
-        nfkd: "\u{1111}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D4F8}",
-        nfc: "\u{D4F8}",
-        nfd: "\u{1111}\u{1172}\u{11B7}",
-        nfkc: "\u{D4F8}",
-        nfkd: "\u{1111}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D4F9}",
-        nfc: "\u{D4F9}",
-        nfd: "\u{1111}\u{1172}\u{11B8}",
-        nfkc: "\u{D4F9}",
-        nfkd: "\u{1111}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D4FA}",
-        nfc: "\u{D4FA}",
-        nfd: "\u{1111}\u{1172}\u{11B9}",
-        nfkc: "\u{D4FA}",
-        nfkd: "\u{1111}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D4FB}",
-        nfc: "\u{D4FB}",
-        nfd: "\u{1111}\u{1172}\u{11BA}",
-        nfkc: "\u{D4FB}",
-        nfkd: "\u{1111}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D4FC}",
-        nfc: "\u{D4FC}",
-        nfd: "\u{1111}\u{1172}\u{11BB}",
-        nfkc: "\u{D4FC}",
-        nfkd: "\u{1111}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D4FD}",
-        nfc: "\u{D4FD}",
-        nfd: "\u{1111}\u{1172}\u{11BC}",
-        nfkc: "\u{D4FD}",
-        nfkd: "\u{1111}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D4FE}",
-        nfc: "\u{D4FE}",
-        nfd: "\u{1111}\u{1172}\u{11BD}",
-        nfkc: "\u{D4FE}",
-        nfkd: "\u{1111}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D4FF}",
-        nfc: "\u{D4FF}",
-        nfd: "\u{1111}\u{1172}\u{11BE}",
-        nfkc: "\u{D4FF}",
-        nfkd: "\u{1111}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D500}",
-        nfc: "\u{D500}",
-        nfd: "\u{1111}\u{1172}\u{11BF}",
-        nfkc: "\u{D500}",
-        nfkd: "\u{1111}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D501}",
-        nfc: "\u{D501}",
-        nfd: "\u{1111}\u{1172}\u{11C0}",
-        nfkc: "\u{D501}",
-        nfkd: "\u{1111}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D502}",
-        nfc: "\u{D502}",
-        nfd: "\u{1111}\u{1172}\u{11C1}",
-        nfkc: "\u{D502}",
-        nfkd: "\u{1111}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D503}",
-        nfc: "\u{D503}",
-        nfd: "\u{1111}\u{1172}\u{11C2}",
-        nfkc: "\u{D503}",
-        nfkd: "\u{1111}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D504}",
-        nfc: "\u{D504}",
-        nfd: "\u{1111}\u{1173}",
-        nfkc: "\u{D504}",
-        nfkd: "\u{1111}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{D505}",
-        nfc: "\u{D505}",
-        nfd: "\u{1111}\u{1173}\u{11A8}",
-        nfkc: "\u{D505}",
-        nfkd: "\u{1111}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D506}",
-        nfc: "\u{D506}",
-        nfd: "\u{1111}\u{1173}\u{11A9}",
-        nfkc: "\u{D506}",
-        nfkd: "\u{1111}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D507}",
-        nfc: "\u{D507}",
-        nfd: "\u{1111}\u{1173}\u{11AA}",
-        nfkc: "\u{D507}",
-        nfkd: "\u{1111}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D508}",
-        nfc: "\u{D508}",
-        nfd: "\u{1111}\u{1173}\u{11AB}",
-        nfkc: "\u{D508}",
-        nfkd: "\u{1111}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D509}",
-        nfc: "\u{D509}",
-        nfd: "\u{1111}\u{1173}\u{11AC}",
-        nfkc: "\u{D509}",
-        nfkd: "\u{1111}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D50A}",
-        nfc: "\u{D50A}",
-        nfd: "\u{1111}\u{1173}\u{11AD}",
-        nfkc: "\u{D50A}",
-        nfkd: "\u{1111}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D50B}",
-        nfc: "\u{D50B}",
-        nfd: "\u{1111}\u{1173}\u{11AE}",
-        nfkc: "\u{D50B}",
-        nfkd: "\u{1111}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D50C}",
-        nfc: "\u{D50C}",
-        nfd: "\u{1111}\u{1173}\u{11AF}",
-        nfkc: "\u{D50C}",
-        nfkd: "\u{1111}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D50D}",
-        nfc: "\u{D50D}",
-        nfd: "\u{1111}\u{1173}\u{11B0}",
-        nfkc: "\u{D50D}",
-        nfkd: "\u{1111}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D50E}",
-        nfc: "\u{D50E}",
-        nfd: "\u{1111}\u{1173}\u{11B1}",
-        nfkc: "\u{D50E}",
-        nfkd: "\u{1111}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D50F}",
-        nfc: "\u{D50F}",
-        nfd: "\u{1111}\u{1173}\u{11B2}",
-        nfkc: "\u{D50F}",
-        nfkd: "\u{1111}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D510}",
-        nfc: "\u{D510}",
-        nfd: "\u{1111}\u{1173}\u{11B3}",
-        nfkc: "\u{D510}",
-        nfkd: "\u{1111}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D511}",
-        nfc: "\u{D511}",
-        nfd: "\u{1111}\u{1173}\u{11B4}",
-        nfkc: "\u{D511}",
-        nfkd: "\u{1111}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D512}",
-        nfc: "\u{D512}",
-        nfd: "\u{1111}\u{1173}\u{11B5}",
-        nfkc: "\u{D512}",
-        nfkd: "\u{1111}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D513}",
-        nfc: "\u{D513}",
-        nfd: "\u{1111}\u{1173}\u{11B6}",
-        nfkc: "\u{D513}",
-        nfkd: "\u{1111}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D514}",
-        nfc: "\u{D514}",
-        nfd: "\u{1111}\u{1173}\u{11B7}",
-        nfkc: "\u{D514}",
-        nfkd: "\u{1111}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D515}",
-        nfc: "\u{D515}",
-        nfd: "\u{1111}\u{1173}\u{11B8}",
-        nfkc: "\u{D515}",
-        nfkd: "\u{1111}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D516}",
-        nfc: "\u{D516}",
-        nfd: "\u{1111}\u{1173}\u{11B9}",
-        nfkc: "\u{D516}",
-        nfkd: "\u{1111}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D517}",
-        nfc: "\u{D517}",
-        nfd: "\u{1111}\u{1173}\u{11BA}",
-        nfkc: "\u{D517}",
-        nfkd: "\u{1111}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D518}",
-        nfc: "\u{D518}",
-        nfd: "\u{1111}\u{1173}\u{11BB}",
-        nfkc: "\u{D518}",
-        nfkd: "\u{1111}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D519}",
-        nfc: "\u{D519}",
-        nfd: "\u{1111}\u{1173}\u{11BC}",
-        nfkc: "\u{D519}",
-        nfkd: "\u{1111}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D51A}",
-        nfc: "\u{D51A}",
-        nfd: "\u{1111}\u{1173}\u{11BD}",
-        nfkc: "\u{D51A}",
-        nfkd: "\u{1111}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D51B}",
-        nfc: "\u{D51B}",
-        nfd: "\u{1111}\u{1173}\u{11BE}",
-        nfkc: "\u{D51B}",
-        nfkd: "\u{1111}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D51C}",
-        nfc: "\u{D51C}",
-        nfd: "\u{1111}\u{1173}\u{11BF}",
-        nfkc: "\u{D51C}",
-        nfkd: "\u{1111}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D51D}",
-        nfc: "\u{D51D}",
-        nfd: "\u{1111}\u{1173}\u{11C0}",
-        nfkc: "\u{D51D}",
-        nfkd: "\u{1111}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D51E}",
-        nfc: "\u{D51E}",
-        nfd: "\u{1111}\u{1173}\u{11C1}",
-        nfkc: "\u{D51E}",
-        nfkd: "\u{1111}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D51F}",
-        nfc: "\u{D51F}",
-        nfd: "\u{1111}\u{1173}\u{11C2}",
-        nfkc: "\u{D51F}",
-        nfkd: "\u{1111}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D520}",
-        nfc: "\u{D520}",
-        nfd: "\u{1111}\u{1174}",
-        nfkc: "\u{D520}",
-        nfkd: "\u{1111}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{D521}",
-        nfc: "\u{D521}",
-        nfd: "\u{1111}\u{1174}\u{11A8}",
-        nfkc: "\u{D521}",
-        nfkd: "\u{1111}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D522}",
-        nfc: "\u{D522}",
-        nfd: "\u{1111}\u{1174}\u{11A9}",
-        nfkc: "\u{D522}",
-        nfkd: "\u{1111}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D523}",
-        nfc: "\u{D523}",
-        nfd: "\u{1111}\u{1174}\u{11AA}",
-        nfkc: "\u{D523}",
-        nfkd: "\u{1111}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D524}",
-        nfc: "\u{D524}",
-        nfd: "\u{1111}\u{1174}\u{11AB}",
-        nfkc: "\u{D524}",
-        nfkd: "\u{1111}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D525}",
-        nfc: "\u{D525}",
-        nfd: "\u{1111}\u{1174}\u{11AC}",
-        nfkc: "\u{D525}",
-        nfkd: "\u{1111}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D526}",
-        nfc: "\u{D526}",
-        nfd: "\u{1111}\u{1174}\u{11AD}",
-        nfkc: "\u{D526}",
-        nfkd: "\u{1111}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D527}",
-        nfc: "\u{D527}",
-        nfd: "\u{1111}\u{1174}\u{11AE}",
-        nfkc: "\u{D527}",
-        nfkd: "\u{1111}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D528}",
-        nfc: "\u{D528}",
-        nfd: "\u{1111}\u{1174}\u{11AF}",
-        nfkc: "\u{D528}",
-        nfkd: "\u{1111}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D529}",
-        nfc: "\u{D529}",
-        nfd: "\u{1111}\u{1174}\u{11B0}",
-        nfkc: "\u{D529}",
-        nfkd: "\u{1111}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D52A}",
-        nfc: "\u{D52A}",
-        nfd: "\u{1111}\u{1174}\u{11B1}",
-        nfkc: "\u{D52A}",
-        nfkd: "\u{1111}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D52B}",
-        nfc: "\u{D52B}",
-        nfd: "\u{1111}\u{1174}\u{11B2}",
-        nfkc: "\u{D52B}",
-        nfkd: "\u{1111}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D52C}",
-        nfc: "\u{D52C}",
-        nfd: "\u{1111}\u{1174}\u{11B3}",
-        nfkc: "\u{D52C}",
-        nfkd: "\u{1111}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D52D}",
-        nfc: "\u{D52D}",
-        nfd: "\u{1111}\u{1174}\u{11B4}",
-        nfkc: "\u{D52D}",
-        nfkd: "\u{1111}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D52E}",
-        nfc: "\u{D52E}",
-        nfd: "\u{1111}\u{1174}\u{11B5}",
-        nfkc: "\u{D52E}",
-        nfkd: "\u{1111}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D52F}",
-        nfc: "\u{D52F}",
-        nfd: "\u{1111}\u{1174}\u{11B6}",
-        nfkc: "\u{D52F}",
-        nfkd: "\u{1111}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D530}",
-        nfc: "\u{D530}",
-        nfd: "\u{1111}\u{1174}\u{11B7}",
-        nfkc: "\u{D530}",
-        nfkd: "\u{1111}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D531}",
-        nfc: "\u{D531}",
-        nfd: "\u{1111}\u{1174}\u{11B8}",
-        nfkc: "\u{D531}",
-        nfkd: "\u{1111}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D532}",
-        nfc: "\u{D532}",
-        nfd: "\u{1111}\u{1174}\u{11B9}",
-        nfkc: "\u{D532}",
-        nfkd: "\u{1111}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D533}",
-        nfc: "\u{D533}",
-        nfd: "\u{1111}\u{1174}\u{11BA}",
-        nfkc: "\u{D533}",
-        nfkd: "\u{1111}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D534}",
-        nfc: "\u{D534}",
-        nfd: "\u{1111}\u{1174}\u{11BB}",
-        nfkc: "\u{D534}",
-        nfkd: "\u{1111}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D535}",
-        nfc: "\u{D535}",
-        nfd: "\u{1111}\u{1174}\u{11BC}",
-        nfkc: "\u{D535}",
-        nfkd: "\u{1111}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D536}",
-        nfc: "\u{D536}",
-        nfd: "\u{1111}\u{1174}\u{11BD}",
-        nfkc: "\u{D536}",
-        nfkd: "\u{1111}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D537}",
-        nfc: "\u{D537}",
-        nfd: "\u{1111}\u{1174}\u{11BE}",
-        nfkc: "\u{D537}",
-        nfkd: "\u{1111}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D538}",
-        nfc: "\u{D538}",
-        nfd: "\u{1111}\u{1174}\u{11BF}",
-        nfkc: "\u{D538}",
-        nfkd: "\u{1111}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D539}",
-        nfc: "\u{D539}",
-        nfd: "\u{1111}\u{1174}\u{11C0}",
-        nfkc: "\u{D539}",
-        nfkd: "\u{1111}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D53A}",
-        nfc: "\u{D53A}",
-        nfd: "\u{1111}\u{1174}\u{11C1}",
-        nfkc: "\u{D53A}",
-        nfkd: "\u{1111}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D53B}",
-        nfc: "\u{D53B}",
-        nfd: "\u{1111}\u{1174}\u{11C2}",
-        nfkc: "\u{D53B}",
-        nfkd: "\u{1111}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D53C}",
-        nfc: "\u{D53C}",
-        nfd: "\u{1111}\u{1175}",
-        nfkc: "\u{D53C}",
-        nfkd: "\u{1111}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{D53D}",
-        nfc: "\u{D53D}",
-        nfd: "\u{1111}\u{1175}\u{11A8}",
-        nfkc: "\u{D53D}",
-        nfkd: "\u{1111}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D53E}",
-        nfc: "\u{D53E}",
-        nfd: "\u{1111}\u{1175}\u{11A9}",
-        nfkc: "\u{D53E}",
-        nfkd: "\u{1111}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D53F}",
-        nfc: "\u{D53F}",
-        nfd: "\u{1111}\u{1175}\u{11AA}",
-        nfkc: "\u{D53F}",
-        nfkd: "\u{1111}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D540}",
-        nfc: "\u{D540}",
-        nfd: "\u{1111}\u{1175}\u{11AB}",
-        nfkc: "\u{D540}",
-        nfkd: "\u{1111}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D541}",
-        nfc: "\u{D541}",
-        nfd: "\u{1111}\u{1175}\u{11AC}",
-        nfkc: "\u{D541}",
-        nfkd: "\u{1111}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D542}",
-        nfc: "\u{D542}",
-        nfd: "\u{1111}\u{1175}\u{11AD}",
-        nfkc: "\u{D542}",
-        nfkd: "\u{1111}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D543}",
-        nfc: "\u{D543}",
-        nfd: "\u{1111}\u{1175}\u{11AE}",
-        nfkc: "\u{D543}",
-        nfkd: "\u{1111}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D544}",
-        nfc: "\u{D544}",
-        nfd: "\u{1111}\u{1175}\u{11AF}",
-        nfkc: "\u{D544}",
-        nfkd: "\u{1111}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D545}",
-        nfc: "\u{D545}",
-        nfd: "\u{1111}\u{1175}\u{11B0}",
-        nfkc: "\u{D545}",
-        nfkd: "\u{1111}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D546}",
-        nfc: "\u{D546}",
-        nfd: "\u{1111}\u{1175}\u{11B1}",
-        nfkc: "\u{D546}",
-        nfkd: "\u{1111}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D547}",
-        nfc: "\u{D547}",
-        nfd: "\u{1111}\u{1175}\u{11B2}",
-        nfkc: "\u{D547}",
-        nfkd: "\u{1111}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D548}",
-        nfc: "\u{D548}",
-        nfd: "\u{1111}\u{1175}\u{11B3}",
-        nfkc: "\u{D548}",
-        nfkd: "\u{1111}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D549}",
-        nfc: "\u{D549}",
-        nfd: "\u{1111}\u{1175}\u{11B4}",
-        nfkc: "\u{D549}",
-        nfkd: "\u{1111}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D54A}",
-        nfc: "\u{D54A}",
-        nfd: "\u{1111}\u{1175}\u{11B5}",
-        nfkc: "\u{D54A}",
-        nfkd: "\u{1111}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D54B}",
-        nfc: "\u{D54B}",
-        nfd: "\u{1111}\u{1175}\u{11B6}",
-        nfkc: "\u{D54B}",
-        nfkd: "\u{1111}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D54C}",
-        nfc: "\u{D54C}",
-        nfd: "\u{1111}\u{1175}\u{11B7}",
-        nfkc: "\u{D54C}",
-        nfkd: "\u{1111}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D54D}",
-        nfc: "\u{D54D}",
-        nfd: "\u{1111}\u{1175}\u{11B8}",
-        nfkc: "\u{D54D}",
-        nfkd: "\u{1111}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D54E}",
-        nfc: "\u{D54E}",
-        nfd: "\u{1111}\u{1175}\u{11B9}",
-        nfkc: "\u{D54E}",
-        nfkd: "\u{1111}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D54F}",
-        nfc: "\u{D54F}",
-        nfd: "\u{1111}\u{1175}\u{11BA}",
-        nfkc: "\u{D54F}",
-        nfkd: "\u{1111}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D550}",
-        nfc: "\u{D550}",
-        nfd: "\u{1111}\u{1175}\u{11BB}",
-        nfkc: "\u{D550}",
-        nfkd: "\u{1111}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D551}",
-        nfc: "\u{D551}",
-        nfd: "\u{1111}\u{1175}\u{11BC}",
-        nfkc: "\u{D551}",
-        nfkd: "\u{1111}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D552}",
-        nfc: "\u{D552}",
-        nfd: "\u{1111}\u{1175}\u{11BD}",
-        nfkc: "\u{D552}",
-        nfkd: "\u{1111}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D553}",
-        nfc: "\u{D553}",
-        nfd: "\u{1111}\u{1175}\u{11BE}",
-        nfkc: "\u{D553}",
-        nfkd: "\u{1111}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D554}",
-        nfc: "\u{D554}",
-        nfd: "\u{1111}\u{1175}\u{11BF}",
-        nfkc: "\u{D554}",
-        nfkd: "\u{1111}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D555}",
-        nfc: "\u{D555}",
-        nfd: "\u{1111}\u{1175}\u{11C0}",
-        nfkc: "\u{D555}",
-        nfkd: "\u{1111}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D556}",
-        nfc: "\u{D556}",
-        nfd: "\u{1111}\u{1175}\u{11C1}",
-        nfkc: "\u{D556}",
-        nfkd: "\u{1111}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D557}",
-        nfc: "\u{D557}",
-        nfd: "\u{1111}\u{1175}\u{11C2}",
-        nfkc: "\u{D557}",
-        nfkd: "\u{1111}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D558}",
-        nfc: "\u{D558}",
-        nfd: "\u{1112}\u{1161}",
-        nfkc: "\u{D558}",
-        nfkd: "\u{1112}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{D559}",
-        nfc: "\u{D559}",
-        nfd: "\u{1112}\u{1161}\u{11A8}",
-        nfkc: "\u{D559}",
-        nfkd: "\u{1112}\u{1161}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D55A}",
-        nfc: "\u{D55A}",
-        nfd: "\u{1112}\u{1161}\u{11A9}",
-        nfkc: "\u{D55A}",
-        nfkd: "\u{1112}\u{1161}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D55B}",
-        nfc: "\u{D55B}",
-        nfd: "\u{1112}\u{1161}\u{11AA}",
-        nfkc: "\u{D55B}",
-        nfkd: "\u{1112}\u{1161}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D55C}",
-        nfc: "\u{D55C}",
-        nfd: "\u{1112}\u{1161}\u{11AB}",
-        nfkc: "\u{D55C}",
-        nfkd: "\u{1112}\u{1161}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D55D}",
-        nfc: "\u{D55D}",
-        nfd: "\u{1112}\u{1161}\u{11AC}",
-        nfkc: "\u{D55D}",
-        nfkd: "\u{1112}\u{1161}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D55E}",
-        nfc: "\u{D55E}",
-        nfd: "\u{1112}\u{1161}\u{11AD}",
-        nfkc: "\u{D55E}",
-        nfkd: "\u{1112}\u{1161}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D55F}",
-        nfc: "\u{D55F}",
-        nfd: "\u{1112}\u{1161}\u{11AE}",
-        nfkc: "\u{D55F}",
-        nfkd: "\u{1112}\u{1161}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D560}",
-        nfc: "\u{D560}",
-        nfd: "\u{1112}\u{1161}\u{11AF}",
-        nfkc: "\u{D560}",
-        nfkd: "\u{1112}\u{1161}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D561}",
-        nfc: "\u{D561}",
-        nfd: "\u{1112}\u{1161}\u{11B0}",
-        nfkc: "\u{D561}",
-        nfkd: "\u{1112}\u{1161}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D562}",
-        nfc: "\u{D562}",
-        nfd: "\u{1112}\u{1161}\u{11B1}",
-        nfkc: "\u{D562}",
-        nfkd: "\u{1112}\u{1161}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D563}",
-        nfc: "\u{D563}",
-        nfd: "\u{1112}\u{1161}\u{11B2}",
-        nfkc: "\u{D563}",
-        nfkd: "\u{1112}\u{1161}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D564}",
-        nfc: "\u{D564}",
-        nfd: "\u{1112}\u{1161}\u{11B3}",
-        nfkc: "\u{D564}",
-        nfkd: "\u{1112}\u{1161}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D565}",
-        nfc: "\u{D565}",
-        nfd: "\u{1112}\u{1161}\u{11B4}",
-        nfkc: "\u{D565}",
-        nfkd: "\u{1112}\u{1161}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D566}",
-        nfc: "\u{D566}",
-        nfd: "\u{1112}\u{1161}\u{11B5}",
-        nfkc: "\u{D566}",
-        nfkd: "\u{1112}\u{1161}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D567}",
-        nfc: "\u{D567}",
-        nfd: "\u{1112}\u{1161}\u{11B6}",
-        nfkc: "\u{D567}",
-        nfkd: "\u{1112}\u{1161}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D568}",
-        nfc: "\u{D568}",
-        nfd: "\u{1112}\u{1161}\u{11B7}",
-        nfkc: "\u{D568}",
-        nfkd: "\u{1112}\u{1161}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D569}",
-        nfc: "\u{D569}",
-        nfd: "\u{1112}\u{1161}\u{11B8}",
-        nfkc: "\u{D569}",
-        nfkd: "\u{1112}\u{1161}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D56A}",
-        nfc: "\u{D56A}",
-        nfd: "\u{1112}\u{1161}\u{11B9}",
-        nfkc: "\u{D56A}",
-        nfkd: "\u{1112}\u{1161}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D56B}",
-        nfc: "\u{D56B}",
-        nfd: "\u{1112}\u{1161}\u{11BA}",
-        nfkc: "\u{D56B}",
-        nfkd: "\u{1112}\u{1161}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D56C}",
-        nfc: "\u{D56C}",
-        nfd: "\u{1112}\u{1161}\u{11BB}",
-        nfkc: "\u{D56C}",
-        nfkd: "\u{1112}\u{1161}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D56D}",
-        nfc: "\u{D56D}",
-        nfd: "\u{1112}\u{1161}\u{11BC}",
-        nfkc: "\u{D56D}",
-        nfkd: "\u{1112}\u{1161}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D56E}",
-        nfc: "\u{D56E}",
-        nfd: "\u{1112}\u{1161}\u{11BD}",
-        nfkc: "\u{D56E}",
-        nfkd: "\u{1112}\u{1161}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D56F}",
-        nfc: "\u{D56F}",
-        nfd: "\u{1112}\u{1161}\u{11BE}",
-        nfkc: "\u{D56F}",
-        nfkd: "\u{1112}\u{1161}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D570}",
-        nfc: "\u{D570}",
-        nfd: "\u{1112}\u{1161}\u{11BF}",
-        nfkc: "\u{D570}",
-        nfkd: "\u{1112}\u{1161}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D571}",
-        nfc: "\u{D571}",
-        nfd: "\u{1112}\u{1161}\u{11C0}",
-        nfkc: "\u{D571}",
-        nfkd: "\u{1112}\u{1161}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D572}",
-        nfc: "\u{D572}",
-        nfd: "\u{1112}\u{1161}\u{11C1}",
-        nfkc: "\u{D572}",
-        nfkd: "\u{1112}\u{1161}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D573}",
-        nfc: "\u{D573}",
-        nfd: "\u{1112}\u{1161}\u{11C2}",
-        nfkc: "\u{D573}",
-        nfkd: "\u{1112}\u{1161}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D574}",
-        nfc: "\u{D574}",
-        nfd: "\u{1112}\u{1162}",
-        nfkc: "\u{D574}",
-        nfkd: "\u{1112}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{D575}",
-        nfc: "\u{D575}",
-        nfd: "\u{1112}\u{1162}\u{11A8}",
-        nfkc: "\u{D575}",
-        nfkd: "\u{1112}\u{1162}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D576}",
-        nfc: "\u{D576}",
-        nfd: "\u{1112}\u{1162}\u{11A9}",
-        nfkc: "\u{D576}",
-        nfkd: "\u{1112}\u{1162}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D577}",
-        nfc: "\u{D577}",
-        nfd: "\u{1112}\u{1162}\u{11AA}",
-        nfkc: "\u{D577}",
-        nfkd: "\u{1112}\u{1162}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D578}",
-        nfc: "\u{D578}",
-        nfd: "\u{1112}\u{1162}\u{11AB}",
-        nfkc: "\u{D578}",
-        nfkd: "\u{1112}\u{1162}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D579}",
-        nfc: "\u{D579}",
-        nfd: "\u{1112}\u{1162}\u{11AC}",
-        nfkc: "\u{D579}",
-        nfkd: "\u{1112}\u{1162}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D57A}",
-        nfc: "\u{D57A}",
-        nfd: "\u{1112}\u{1162}\u{11AD}",
-        nfkc: "\u{D57A}",
-        nfkd: "\u{1112}\u{1162}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D57B}",
-        nfc: "\u{D57B}",
-        nfd: "\u{1112}\u{1162}\u{11AE}",
-        nfkc: "\u{D57B}",
-        nfkd: "\u{1112}\u{1162}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D57C}",
-        nfc: "\u{D57C}",
-        nfd: "\u{1112}\u{1162}\u{11AF}",
-        nfkc: "\u{D57C}",
-        nfkd: "\u{1112}\u{1162}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D57D}",
-        nfc: "\u{D57D}",
-        nfd: "\u{1112}\u{1162}\u{11B0}",
-        nfkc: "\u{D57D}",
-        nfkd: "\u{1112}\u{1162}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D57E}",
-        nfc: "\u{D57E}",
-        nfd: "\u{1112}\u{1162}\u{11B1}",
-        nfkc: "\u{D57E}",
-        nfkd: "\u{1112}\u{1162}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D57F}",
-        nfc: "\u{D57F}",
-        nfd: "\u{1112}\u{1162}\u{11B2}",
-        nfkc: "\u{D57F}",
-        nfkd: "\u{1112}\u{1162}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D580}",
-        nfc: "\u{D580}",
-        nfd: "\u{1112}\u{1162}\u{11B3}",
-        nfkc: "\u{D580}",
-        nfkd: "\u{1112}\u{1162}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D581}",
-        nfc: "\u{D581}",
-        nfd: "\u{1112}\u{1162}\u{11B4}",
-        nfkc: "\u{D581}",
-        nfkd: "\u{1112}\u{1162}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D582}",
-        nfc: "\u{D582}",
-        nfd: "\u{1112}\u{1162}\u{11B5}",
-        nfkc: "\u{D582}",
-        nfkd: "\u{1112}\u{1162}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D583}",
-        nfc: "\u{D583}",
-        nfd: "\u{1112}\u{1162}\u{11B6}",
-        nfkc: "\u{D583}",
-        nfkd: "\u{1112}\u{1162}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D584}",
-        nfc: "\u{D584}",
-        nfd: "\u{1112}\u{1162}\u{11B7}",
-        nfkc: "\u{D584}",
-        nfkd: "\u{1112}\u{1162}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D585}",
-        nfc: "\u{D585}",
-        nfd: "\u{1112}\u{1162}\u{11B8}",
-        nfkc: "\u{D585}",
-        nfkd: "\u{1112}\u{1162}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D586}",
-        nfc: "\u{D586}",
-        nfd: "\u{1112}\u{1162}\u{11B9}",
-        nfkc: "\u{D586}",
-        nfkd: "\u{1112}\u{1162}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D587}",
-        nfc: "\u{D587}",
-        nfd: "\u{1112}\u{1162}\u{11BA}",
-        nfkc: "\u{D587}",
-        nfkd: "\u{1112}\u{1162}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D588}",
-        nfc: "\u{D588}",
-        nfd: "\u{1112}\u{1162}\u{11BB}",
-        nfkc: "\u{D588}",
-        nfkd: "\u{1112}\u{1162}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D589}",
-        nfc: "\u{D589}",
-        nfd: "\u{1112}\u{1162}\u{11BC}",
-        nfkc: "\u{D589}",
-        nfkd: "\u{1112}\u{1162}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D58A}",
-        nfc: "\u{D58A}",
-        nfd: "\u{1112}\u{1162}\u{11BD}",
-        nfkc: "\u{D58A}",
-        nfkd: "\u{1112}\u{1162}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D58B}",
-        nfc: "\u{D58B}",
-        nfd: "\u{1112}\u{1162}\u{11BE}",
-        nfkc: "\u{D58B}",
-        nfkd: "\u{1112}\u{1162}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D58C}",
-        nfc: "\u{D58C}",
-        nfd: "\u{1112}\u{1162}\u{11BF}",
-        nfkc: "\u{D58C}",
-        nfkd: "\u{1112}\u{1162}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D58D}",
-        nfc: "\u{D58D}",
-        nfd: "\u{1112}\u{1162}\u{11C0}",
-        nfkc: "\u{D58D}",
-        nfkd: "\u{1112}\u{1162}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D58E}",
-        nfc: "\u{D58E}",
-        nfd: "\u{1112}\u{1162}\u{11C1}",
-        nfkc: "\u{D58E}",
-        nfkd: "\u{1112}\u{1162}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D58F}",
-        nfc: "\u{D58F}",
-        nfd: "\u{1112}\u{1162}\u{11C2}",
-        nfkc: "\u{D58F}",
-        nfkd: "\u{1112}\u{1162}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D590}",
-        nfc: "\u{D590}",
-        nfd: "\u{1112}\u{1163}",
-        nfkc: "\u{D590}",
-        nfkd: "\u{1112}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{D591}",
-        nfc: "\u{D591}",
-        nfd: "\u{1112}\u{1163}\u{11A8}",
-        nfkc: "\u{D591}",
-        nfkd: "\u{1112}\u{1163}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D592}",
-        nfc: "\u{D592}",
-        nfd: "\u{1112}\u{1163}\u{11A9}",
-        nfkc: "\u{D592}",
-        nfkd: "\u{1112}\u{1163}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D593}",
-        nfc: "\u{D593}",
-        nfd: "\u{1112}\u{1163}\u{11AA}",
-        nfkc: "\u{D593}",
-        nfkd: "\u{1112}\u{1163}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D594}",
-        nfc: "\u{D594}",
-        nfd: "\u{1112}\u{1163}\u{11AB}",
-        nfkc: "\u{D594}",
-        nfkd: "\u{1112}\u{1163}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D595}",
-        nfc: "\u{D595}",
-        nfd: "\u{1112}\u{1163}\u{11AC}",
-        nfkc: "\u{D595}",
-        nfkd: "\u{1112}\u{1163}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D596}",
-        nfc: "\u{D596}",
-        nfd: "\u{1112}\u{1163}\u{11AD}",
-        nfkc: "\u{D596}",
-        nfkd: "\u{1112}\u{1163}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D597}",
-        nfc: "\u{D597}",
-        nfd: "\u{1112}\u{1163}\u{11AE}",
-        nfkc: "\u{D597}",
-        nfkd: "\u{1112}\u{1163}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D598}",
-        nfc: "\u{D598}",
-        nfd: "\u{1112}\u{1163}\u{11AF}",
-        nfkc: "\u{D598}",
-        nfkd: "\u{1112}\u{1163}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D599}",
-        nfc: "\u{D599}",
-        nfd: "\u{1112}\u{1163}\u{11B0}",
-        nfkc: "\u{D599}",
-        nfkd: "\u{1112}\u{1163}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D59A}",
-        nfc: "\u{D59A}",
-        nfd: "\u{1112}\u{1163}\u{11B1}",
-        nfkc: "\u{D59A}",
-        nfkd: "\u{1112}\u{1163}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D59B}",
-        nfc: "\u{D59B}",
-        nfd: "\u{1112}\u{1163}\u{11B2}",
-        nfkc: "\u{D59B}",
-        nfkd: "\u{1112}\u{1163}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D59C}",
-        nfc: "\u{D59C}",
-        nfd: "\u{1112}\u{1163}\u{11B3}",
-        nfkc: "\u{D59C}",
-        nfkd: "\u{1112}\u{1163}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D59D}",
-        nfc: "\u{D59D}",
-        nfd: "\u{1112}\u{1163}\u{11B4}",
-        nfkc: "\u{D59D}",
-        nfkd: "\u{1112}\u{1163}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D59E}",
-        nfc: "\u{D59E}",
-        nfd: "\u{1112}\u{1163}\u{11B5}",
-        nfkc: "\u{D59E}",
-        nfkd: "\u{1112}\u{1163}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D59F}",
-        nfc: "\u{D59F}",
-        nfd: "\u{1112}\u{1163}\u{11B6}",
-        nfkc: "\u{D59F}",
-        nfkd: "\u{1112}\u{1163}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D5A0}",
-        nfc: "\u{D5A0}",
-        nfd: "\u{1112}\u{1163}\u{11B7}",
-        nfkc: "\u{D5A0}",
-        nfkd: "\u{1112}\u{1163}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D5A1}",
-        nfc: "\u{D5A1}",
-        nfd: "\u{1112}\u{1163}\u{11B8}",
-        nfkc: "\u{D5A1}",
-        nfkd: "\u{1112}\u{1163}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D5A2}",
-        nfc: "\u{D5A2}",
-        nfd: "\u{1112}\u{1163}\u{11B9}",
-        nfkc: "\u{D5A2}",
-        nfkd: "\u{1112}\u{1163}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D5A3}",
-        nfc: "\u{D5A3}",
-        nfd: "\u{1112}\u{1163}\u{11BA}",
-        nfkc: "\u{D5A3}",
-        nfkd: "\u{1112}\u{1163}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D5A4}",
-        nfc: "\u{D5A4}",
-        nfd: "\u{1112}\u{1163}\u{11BB}",
-        nfkc: "\u{D5A4}",
-        nfkd: "\u{1112}\u{1163}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D5A5}",
-        nfc: "\u{D5A5}",
-        nfd: "\u{1112}\u{1163}\u{11BC}",
-        nfkc: "\u{D5A5}",
-        nfkd: "\u{1112}\u{1163}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D5A6}",
-        nfc: "\u{D5A6}",
-        nfd: "\u{1112}\u{1163}\u{11BD}",
-        nfkc: "\u{D5A6}",
-        nfkd: "\u{1112}\u{1163}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D5A7}",
-        nfc: "\u{D5A7}",
-        nfd: "\u{1112}\u{1163}\u{11BE}",
-        nfkc: "\u{D5A7}",
-        nfkd: "\u{1112}\u{1163}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D5A8}",
-        nfc: "\u{D5A8}",
-        nfd: "\u{1112}\u{1163}\u{11BF}",
-        nfkc: "\u{D5A8}",
-        nfkd: "\u{1112}\u{1163}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D5A9}",
-        nfc: "\u{D5A9}",
-        nfd: "\u{1112}\u{1163}\u{11C0}",
-        nfkc: "\u{D5A9}",
-        nfkd: "\u{1112}\u{1163}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D5AA}",
-        nfc: "\u{D5AA}",
-        nfd: "\u{1112}\u{1163}\u{11C1}",
-        nfkc: "\u{D5AA}",
-        nfkd: "\u{1112}\u{1163}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D5AB}",
-        nfc: "\u{D5AB}",
-        nfd: "\u{1112}\u{1163}\u{11C2}",
-        nfkc: "\u{D5AB}",
-        nfkd: "\u{1112}\u{1163}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D5AC}",
-        nfc: "\u{D5AC}",
-        nfd: "\u{1112}\u{1164}",
-        nfkc: "\u{D5AC}",
-        nfkd: "\u{1112}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{D5AD}",
-        nfc: "\u{D5AD}",
-        nfd: "\u{1112}\u{1164}\u{11A8}",
-        nfkc: "\u{D5AD}",
-        nfkd: "\u{1112}\u{1164}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D5AE}",
-        nfc: "\u{D5AE}",
-        nfd: "\u{1112}\u{1164}\u{11A9}",
-        nfkc: "\u{D5AE}",
-        nfkd: "\u{1112}\u{1164}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D5AF}",
-        nfc: "\u{D5AF}",
-        nfd: "\u{1112}\u{1164}\u{11AA}",
-        nfkc: "\u{D5AF}",
-        nfkd: "\u{1112}\u{1164}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D5B0}",
-        nfc: "\u{D5B0}",
-        nfd: "\u{1112}\u{1164}\u{11AB}",
-        nfkc: "\u{D5B0}",
-        nfkd: "\u{1112}\u{1164}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D5B1}",
-        nfc: "\u{D5B1}",
-        nfd: "\u{1112}\u{1164}\u{11AC}",
-        nfkc: "\u{D5B1}",
-        nfkd: "\u{1112}\u{1164}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D5B2}",
-        nfc: "\u{D5B2}",
-        nfd: "\u{1112}\u{1164}\u{11AD}",
-        nfkc: "\u{D5B2}",
-        nfkd: "\u{1112}\u{1164}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D5B3}",
-        nfc: "\u{D5B3}",
-        nfd: "\u{1112}\u{1164}\u{11AE}",
-        nfkc: "\u{D5B3}",
-        nfkd: "\u{1112}\u{1164}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D5B4}",
-        nfc: "\u{D5B4}",
-        nfd: "\u{1112}\u{1164}\u{11AF}",
-        nfkc: "\u{D5B4}",
-        nfkd: "\u{1112}\u{1164}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D5B5}",
-        nfc: "\u{D5B5}",
-        nfd: "\u{1112}\u{1164}\u{11B0}",
-        nfkc: "\u{D5B5}",
-        nfkd: "\u{1112}\u{1164}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D5B6}",
-        nfc: "\u{D5B6}",
-        nfd: "\u{1112}\u{1164}\u{11B1}",
-        nfkc: "\u{D5B6}",
-        nfkd: "\u{1112}\u{1164}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D5B7}",
-        nfc: "\u{D5B7}",
-        nfd: "\u{1112}\u{1164}\u{11B2}",
-        nfkc: "\u{D5B7}",
-        nfkd: "\u{1112}\u{1164}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D5B8}",
-        nfc: "\u{D5B8}",
-        nfd: "\u{1112}\u{1164}\u{11B3}",
-        nfkc: "\u{D5B8}",
-        nfkd: "\u{1112}\u{1164}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D5B9}",
-        nfc: "\u{D5B9}",
-        nfd: "\u{1112}\u{1164}\u{11B4}",
-        nfkc: "\u{D5B9}",
-        nfkd: "\u{1112}\u{1164}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D5BA}",
-        nfc: "\u{D5BA}",
-        nfd: "\u{1112}\u{1164}\u{11B5}",
-        nfkc: "\u{D5BA}",
-        nfkd: "\u{1112}\u{1164}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D5BB}",
-        nfc: "\u{D5BB}",
-        nfd: "\u{1112}\u{1164}\u{11B6}",
-        nfkc: "\u{D5BB}",
-        nfkd: "\u{1112}\u{1164}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D5BC}",
-        nfc: "\u{D5BC}",
-        nfd: "\u{1112}\u{1164}\u{11B7}",
-        nfkc: "\u{D5BC}",
-        nfkd: "\u{1112}\u{1164}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D5BD}",
-        nfc: "\u{D5BD}",
-        nfd: "\u{1112}\u{1164}\u{11B8}",
-        nfkc: "\u{D5BD}",
-        nfkd: "\u{1112}\u{1164}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D5BE}",
-        nfc: "\u{D5BE}",
-        nfd: "\u{1112}\u{1164}\u{11B9}",
-        nfkc: "\u{D5BE}",
-        nfkd: "\u{1112}\u{1164}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D5BF}",
-        nfc: "\u{D5BF}",
-        nfd: "\u{1112}\u{1164}\u{11BA}",
-        nfkc: "\u{D5BF}",
-        nfkd: "\u{1112}\u{1164}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D5C0}",
-        nfc: "\u{D5C0}",
-        nfd: "\u{1112}\u{1164}\u{11BB}",
-        nfkc: "\u{D5C0}",
-        nfkd: "\u{1112}\u{1164}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D5C1}",
-        nfc: "\u{D5C1}",
-        nfd: "\u{1112}\u{1164}\u{11BC}",
-        nfkc: "\u{D5C1}",
-        nfkd: "\u{1112}\u{1164}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D5C2}",
-        nfc: "\u{D5C2}",
-        nfd: "\u{1112}\u{1164}\u{11BD}",
-        nfkc: "\u{D5C2}",
-        nfkd: "\u{1112}\u{1164}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D5C3}",
-        nfc: "\u{D5C3}",
-        nfd: "\u{1112}\u{1164}\u{11BE}",
-        nfkc: "\u{D5C3}",
-        nfkd: "\u{1112}\u{1164}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D5C4}",
-        nfc: "\u{D5C4}",
-        nfd: "\u{1112}\u{1164}\u{11BF}",
-        nfkc: "\u{D5C4}",
-        nfkd: "\u{1112}\u{1164}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D5C5}",
-        nfc: "\u{D5C5}",
-        nfd: "\u{1112}\u{1164}\u{11C0}",
-        nfkc: "\u{D5C5}",
-        nfkd: "\u{1112}\u{1164}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D5C6}",
-        nfc: "\u{D5C6}",
-        nfd: "\u{1112}\u{1164}\u{11C1}",
-        nfkc: "\u{D5C6}",
-        nfkd: "\u{1112}\u{1164}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D5C7}",
-        nfc: "\u{D5C7}",
-        nfd: "\u{1112}\u{1164}\u{11C2}",
-        nfkc: "\u{D5C7}",
-        nfkd: "\u{1112}\u{1164}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D5C8}",
-        nfc: "\u{D5C8}",
-        nfd: "\u{1112}\u{1165}",
-        nfkc: "\u{D5C8}",
-        nfkd: "\u{1112}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{D5C9}",
-        nfc: "\u{D5C9}",
-        nfd: "\u{1112}\u{1165}\u{11A8}",
-        nfkc: "\u{D5C9}",
-        nfkd: "\u{1112}\u{1165}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D5CA}",
-        nfc: "\u{D5CA}",
-        nfd: "\u{1112}\u{1165}\u{11A9}",
-        nfkc: "\u{D5CA}",
-        nfkd: "\u{1112}\u{1165}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D5CB}",
-        nfc: "\u{D5CB}",
-        nfd: "\u{1112}\u{1165}\u{11AA}",
-        nfkc: "\u{D5CB}",
-        nfkd: "\u{1112}\u{1165}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D5CC}",
-        nfc: "\u{D5CC}",
-        nfd: "\u{1112}\u{1165}\u{11AB}",
-        nfkc: "\u{D5CC}",
-        nfkd: "\u{1112}\u{1165}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D5CD}",
-        nfc: "\u{D5CD}",
-        nfd: "\u{1112}\u{1165}\u{11AC}",
-        nfkc: "\u{D5CD}",
-        nfkd: "\u{1112}\u{1165}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D5CE}",
-        nfc: "\u{D5CE}",
-        nfd: "\u{1112}\u{1165}\u{11AD}",
-        nfkc: "\u{D5CE}",
-        nfkd: "\u{1112}\u{1165}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D5CF}",
-        nfc: "\u{D5CF}",
-        nfd: "\u{1112}\u{1165}\u{11AE}",
-        nfkc: "\u{D5CF}",
-        nfkd: "\u{1112}\u{1165}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D5D0}",
-        nfc: "\u{D5D0}",
-        nfd: "\u{1112}\u{1165}\u{11AF}",
-        nfkc: "\u{D5D0}",
-        nfkd: "\u{1112}\u{1165}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D5D1}",
-        nfc: "\u{D5D1}",
-        nfd: "\u{1112}\u{1165}\u{11B0}",
-        nfkc: "\u{D5D1}",
-        nfkd: "\u{1112}\u{1165}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D5D2}",
-        nfc: "\u{D5D2}",
-        nfd: "\u{1112}\u{1165}\u{11B1}",
-        nfkc: "\u{D5D2}",
-        nfkd: "\u{1112}\u{1165}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D5D3}",
-        nfc: "\u{D5D3}",
-        nfd: "\u{1112}\u{1165}\u{11B2}",
-        nfkc: "\u{D5D3}",
-        nfkd: "\u{1112}\u{1165}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D5D4}",
-        nfc: "\u{D5D4}",
-        nfd: "\u{1112}\u{1165}\u{11B3}",
-        nfkc: "\u{D5D4}",
-        nfkd: "\u{1112}\u{1165}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D5D5}",
-        nfc: "\u{D5D5}",
-        nfd: "\u{1112}\u{1165}\u{11B4}",
-        nfkc: "\u{D5D5}",
-        nfkd: "\u{1112}\u{1165}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D5D6}",
-        nfc: "\u{D5D6}",
-        nfd: "\u{1112}\u{1165}\u{11B5}",
-        nfkc: "\u{D5D6}",
-        nfkd: "\u{1112}\u{1165}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D5D7}",
-        nfc: "\u{D5D7}",
-        nfd: "\u{1112}\u{1165}\u{11B6}",
-        nfkc: "\u{D5D7}",
-        nfkd: "\u{1112}\u{1165}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D5D8}",
-        nfc: "\u{D5D8}",
-        nfd: "\u{1112}\u{1165}\u{11B7}",
-        nfkc: "\u{D5D8}",
-        nfkd: "\u{1112}\u{1165}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D5D9}",
-        nfc: "\u{D5D9}",
-        nfd: "\u{1112}\u{1165}\u{11B8}",
-        nfkc: "\u{D5D9}",
-        nfkd: "\u{1112}\u{1165}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D5DA}",
-        nfc: "\u{D5DA}",
-        nfd: "\u{1112}\u{1165}\u{11B9}",
-        nfkc: "\u{D5DA}",
-        nfkd: "\u{1112}\u{1165}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D5DB}",
-        nfc: "\u{D5DB}",
-        nfd: "\u{1112}\u{1165}\u{11BA}",
-        nfkc: "\u{D5DB}",
-        nfkd: "\u{1112}\u{1165}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D5DC}",
-        nfc: "\u{D5DC}",
-        nfd: "\u{1112}\u{1165}\u{11BB}",
-        nfkc: "\u{D5DC}",
-        nfkd: "\u{1112}\u{1165}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D5DD}",
-        nfc: "\u{D5DD}",
-        nfd: "\u{1112}\u{1165}\u{11BC}",
-        nfkc: "\u{D5DD}",
-        nfkd: "\u{1112}\u{1165}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D5DE}",
-        nfc: "\u{D5DE}",
-        nfd: "\u{1112}\u{1165}\u{11BD}",
-        nfkc: "\u{D5DE}",
-        nfkd: "\u{1112}\u{1165}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D5DF}",
-        nfc: "\u{D5DF}",
-        nfd: "\u{1112}\u{1165}\u{11BE}",
-        nfkc: "\u{D5DF}",
-        nfkd: "\u{1112}\u{1165}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D5E0}",
-        nfc: "\u{D5E0}",
-        nfd: "\u{1112}\u{1165}\u{11BF}",
-        nfkc: "\u{D5E0}",
-        nfkd: "\u{1112}\u{1165}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D5E1}",
-        nfc: "\u{D5E1}",
-        nfd: "\u{1112}\u{1165}\u{11C0}",
-        nfkc: "\u{D5E1}",
-        nfkd: "\u{1112}\u{1165}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D5E2}",
-        nfc: "\u{D5E2}",
-        nfd: "\u{1112}\u{1165}\u{11C1}",
-        nfkc: "\u{D5E2}",
-        nfkd: "\u{1112}\u{1165}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D5E3}",
-        nfc: "\u{D5E3}",
-        nfd: "\u{1112}\u{1165}\u{11C2}",
-        nfkc: "\u{D5E3}",
-        nfkd: "\u{1112}\u{1165}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D5E4}",
-        nfc: "\u{D5E4}",
-        nfd: "\u{1112}\u{1166}",
-        nfkc: "\u{D5E4}",
-        nfkd: "\u{1112}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{D5E5}",
-        nfc: "\u{D5E5}",
-        nfd: "\u{1112}\u{1166}\u{11A8}",
-        nfkc: "\u{D5E5}",
-        nfkd: "\u{1112}\u{1166}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D5E6}",
-        nfc: "\u{D5E6}",
-        nfd: "\u{1112}\u{1166}\u{11A9}",
-        nfkc: "\u{D5E6}",
-        nfkd: "\u{1112}\u{1166}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D5E7}",
-        nfc: "\u{D5E7}",
-        nfd: "\u{1112}\u{1166}\u{11AA}",
-        nfkc: "\u{D5E7}",
-        nfkd: "\u{1112}\u{1166}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D5E8}",
-        nfc: "\u{D5E8}",
-        nfd: "\u{1112}\u{1166}\u{11AB}",
-        nfkc: "\u{D5E8}",
-        nfkd: "\u{1112}\u{1166}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D5E9}",
-        nfc: "\u{D5E9}",
-        nfd: "\u{1112}\u{1166}\u{11AC}",
-        nfkc: "\u{D5E9}",
-        nfkd: "\u{1112}\u{1166}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D5EA}",
-        nfc: "\u{D5EA}",
-        nfd: "\u{1112}\u{1166}\u{11AD}",
-        nfkc: "\u{D5EA}",
-        nfkd: "\u{1112}\u{1166}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D5EB}",
-        nfc: "\u{D5EB}",
-        nfd: "\u{1112}\u{1166}\u{11AE}",
-        nfkc: "\u{D5EB}",
-        nfkd: "\u{1112}\u{1166}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D5EC}",
-        nfc: "\u{D5EC}",
-        nfd: "\u{1112}\u{1166}\u{11AF}",
-        nfkc: "\u{D5EC}",
-        nfkd: "\u{1112}\u{1166}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D5ED}",
-        nfc: "\u{D5ED}",
-        nfd: "\u{1112}\u{1166}\u{11B0}",
-        nfkc: "\u{D5ED}",
-        nfkd: "\u{1112}\u{1166}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D5EE}",
-        nfc: "\u{D5EE}",
-        nfd: "\u{1112}\u{1166}\u{11B1}",
-        nfkc: "\u{D5EE}",
-        nfkd: "\u{1112}\u{1166}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D5EF}",
-        nfc: "\u{D5EF}",
-        nfd: "\u{1112}\u{1166}\u{11B2}",
-        nfkc: "\u{D5EF}",
-        nfkd: "\u{1112}\u{1166}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D5F0}",
-        nfc: "\u{D5F0}",
-        nfd: "\u{1112}\u{1166}\u{11B3}",
-        nfkc: "\u{D5F0}",
-        nfkd: "\u{1112}\u{1166}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D5F1}",
-        nfc: "\u{D5F1}",
-        nfd: "\u{1112}\u{1166}\u{11B4}",
-        nfkc: "\u{D5F1}",
-        nfkd: "\u{1112}\u{1166}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D5F2}",
-        nfc: "\u{D5F2}",
-        nfd: "\u{1112}\u{1166}\u{11B5}",
-        nfkc: "\u{D5F2}",
-        nfkd: "\u{1112}\u{1166}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D5F3}",
-        nfc: "\u{D5F3}",
-        nfd: "\u{1112}\u{1166}\u{11B6}",
-        nfkc: "\u{D5F3}",
-        nfkd: "\u{1112}\u{1166}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D5F4}",
-        nfc: "\u{D5F4}",
-        nfd: "\u{1112}\u{1166}\u{11B7}",
-        nfkc: "\u{D5F4}",
-        nfkd: "\u{1112}\u{1166}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D5F5}",
-        nfc: "\u{D5F5}",
-        nfd: "\u{1112}\u{1166}\u{11B8}",
-        nfkc: "\u{D5F5}",
-        nfkd: "\u{1112}\u{1166}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D5F6}",
-        nfc: "\u{D5F6}",
-        nfd: "\u{1112}\u{1166}\u{11B9}",
-        nfkc: "\u{D5F6}",
-        nfkd: "\u{1112}\u{1166}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D5F7}",
-        nfc: "\u{D5F7}",
-        nfd: "\u{1112}\u{1166}\u{11BA}",
-        nfkc: "\u{D5F7}",
-        nfkd: "\u{1112}\u{1166}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D5F8}",
-        nfc: "\u{D5F8}",
-        nfd: "\u{1112}\u{1166}\u{11BB}",
-        nfkc: "\u{D5F8}",
-        nfkd: "\u{1112}\u{1166}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D5F9}",
-        nfc: "\u{D5F9}",
-        nfd: "\u{1112}\u{1166}\u{11BC}",
-        nfkc: "\u{D5F9}",
-        nfkd: "\u{1112}\u{1166}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D5FA}",
-        nfc: "\u{D5FA}",
-        nfd: "\u{1112}\u{1166}\u{11BD}",
-        nfkc: "\u{D5FA}",
-        nfkd: "\u{1112}\u{1166}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D5FB}",
-        nfc: "\u{D5FB}",
-        nfd: "\u{1112}\u{1166}\u{11BE}",
-        nfkc: "\u{D5FB}",
-        nfkd: "\u{1112}\u{1166}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D5FC}",
-        nfc: "\u{D5FC}",
-        nfd: "\u{1112}\u{1166}\u{11BF}",
-        nfkc: "\u{D5FC}",
-        nfkd: "\u{1112}\u{1166}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D5FD}",
-        nfc: "\u{D5FD}",
-        nfd: "\u{1112}\u{1166}\u{11C0}",
-        nfkc: "\u{D5FD}",
-        nfkd: "\u{1112}\u{1166}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D5FE}",
-        nfc: "\u{D5FE}",
-        nfd: "\u{1112}\u{1166}\u{11C1}",
-        nfkc: "\u{D5FE}",
-        nfkd: "\u{1112}\u{1166}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D5FF}",
-        nfc: "\u{D5FF}",
-        nfd: "\u{1112}\u{1166}\u{11C2}",
-        nfkc: "\u{D5FF}",
-        nfkd: "\u{1112}\u{1166}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D600}",
-        nfc: "\u{D600}",
-        nfd: "\u{1112}\u{1167}",
-        nfkc: "\u{D600}",
-        nfkd: "\u{1112}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{D601}",
-        nfc: "\u{D601}",
-        nfd: "\u{1112}\u{1167}\u{11A8}",
-        nfkc: "\u{D601}",
-        nfkd: "\u{1112}\u{1167}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D602}",
-        nfc: "\u{D602}",
-        nfd: "\u{1112}\u{1167}\u{11A9}",
-        nfkc: "\u{D602}",
-        nfkd: "\u{1112}\u{1167}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D603}",
-        nfc: "\u{D603}",
-        nfd: "\u{1112}\u{1167}\u{11AA}",
-        nfkc: "\u{D603}",
-        nfkd: "\u{1112}\u{1167}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D604}",
-        nfc: "\u{D604}",
-        nfd: "\u{1112}\u{1167}\u{11AB}",
-        nfkc: "\u{D604}",
-        nfkd: "\u{1112}\u{1167}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D605}",
-        nfc: "\u{D605}",
-        nfd: "\u{1112}\u{1167}\u{11AC}",
-        nfkc: "\u{D605}",
-        nfkd: "\u{1112}\u{1167}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D606}",
-        nfc: "\u{D606}",
-        nfd: "\u{1112}\u{1167}\u{11AD}",
-        nfkc: "\u{D606}",
-        nfkd: "\u{1112}\u{1167}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D607}",
-        nfc: "\u{D607}",
-        nfd: "\u{1112}\u{1167}\u{11AE}",
-        nfkc: "\u{D607}",
-        nfkd: "\u{1112}\u{1167}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D608}",
-        nfc: "\u{D608}",
-        nfd: "\u{1112}\u{1167}\u{11AF}",
-        nfkc: "\u{D608}",
-        nfkd: "\u{1112}\u{1167}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D609}",
-        nfc: "\u{D609}",
-        nfd: "\u{1112}\u{1167}\u{11B0}",
-        nfkc: "\u{D609}",
-        nfkd: "\u{1112}\u{1167}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D60A}",
-        nfc: "\u{D60A}",
-        nfd: "\u{1112}\u{1167}\u{11B1}",
-        nfkc: "\u{D60A}",
-        nfkd: "\u{1112}\u{1167}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D60B}",
-        nfc: "\u{D60B}",
-        nfd: "\u{1112}\u{1167}\u{11B2}",
-        nfkc: "\u{D60B}",
-        nfkd: "\u{1112}\u{1167}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D60C}",
-        nfc: "\u{D60C}",
-        nfd: "\u{1112}\u{1167}\u{11B3}",
-        nfkc: "\u{D60C}",
-        nfkd: "\u{1112}\u{1167}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D60D}",
-        nfc: "\u{D60D}",
-        nfd: "\u{1112}\u{1167}\u{11B4}",
-        nfkc: "\u{D60D}",
-        nfkd: "\u{1112}\u{1167}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D60E}",
-        nfc: "\u{D60E}",
-        nfd: "\u{1112}\u{1167}\u{11B5}",
-        nfkc: "\u{D60E}",
-        nfkd: "\u{1112}\u{1167}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D60F}",
-        nfc: "\u{D60F}",
-        nfd: "\u{1112}\u{1167}\u{11B6}",
-        nfkc: "\u{D60F}",
-        nfkd: "\u{1112}\u{1167}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D610}",
-        nfc: "\u{D610}",
-        nfd: "\u{1112}\u{1167}\u{11B7}",
-        nfkc: "\u{D610}",
-        nfkd: "\u{1112}\u{1167}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D611}",
-        nfc: "\u{D611}",
-        nfd: "\u{1112}\u{1167}\u{11B8}",
-        nfkc: "\u{D611}",
-        nfkd: "\u{1112}\u{1167}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D612}",
-        nfc: "\u{D612}",
-        nfd: "\u{1112}\u{1167}\u{11B9}",
-        nfkc: "\u{D612}",
-        nfkd: "\u{1112}\u{1167}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D613}",
-        nfc: "\u{D613}",
-        nfd: "\u{1112}\u{1167}\u{11BA}",
-        nfkc: "\u{D613}",
-        nfkd: "\u{1112}\u{1167}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D614}",
-        nfc: "\u{D614}",
-        nfd: "\u{1112}\u{1167}\u{11BB}",
-        nfkc: "\u{D614}",
-        nfkd: "\u{1112}\u{1167}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D615}",
-        nfc: "\u{D615}",
-        nfd: "\u{1112}\u{1167}\u{11BC}",
-        nfkc: "\u{D615}",
-        nfkd: "\u{1112}\u{1167}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D616}",
-        nfc: "\u{D616}",
-        nfd: "\u{1112}\u{1167}\u{11BD}",
-        nfkc: "\u{D616}",
-        nfkd: "\u{1112}\u{1167}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D617}",
-        nfc: "\u{D617}",
-        nfd: "\u{1112}\u{1167}\u{11BE}",
-        nfkc: "\u{D617}",
-        nfkd: "\u{1112}\u{1167}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D618}",
-        nfc: "\u{D618}",
-        nfd: "\u{1112}\u{1167}\u{11BF}",
-        nfkc: "\u{D618}",
-        nfkd: "\u{1112}\u{1167}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D619}",
-        nfc: "\u{D619}",
-        nfd: "\u{1112}\u{1167}\u{11C0}",
-        nfkc: "\u{D619}",
-        nfkd: "\u{1112}\u{1167}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D61A}",
-        nfc: "\u{D61A}",
-        nfd: "\u{1112}\u{1167}\u{11C1}",
-        nfkc: "\u{D61A}",
-        nfkd: "\u{1112}\u{1167}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D61B}",
-        nfc: "\u{D61B}",
-        nfd: "\u{1112}\u{1167}\u{11C2}",
-        nfkc: "\u{D61B}",
-        nfkd: "\u{1112}\u{1167}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D61C}",
-        nfc: "\u{D61C}",
-        nfd: "\u{1112}\u{1168}",
-        nfkc: "\u{D61C}",
-        nfkd: "\u{1112}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{D61D}",
-        nfc: "\u{D61D}",
-        nfd: "\u{1112}\u{1168}\u{11A8}",
-        nfkc: "\u{D61D}",
-        nfkd: "\u{1112}\u{1168}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D61E}",
-        nfc: "\u{D61E}",
-        nfd: "\u{1112}\u{1168}\u{11A9}",
-        nfkc: "\u{D61E}",
-        nfkd: "\u{1112}\u{1168}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D61F}",
-        nfc: "\u{D61F}",
-        nfd: "\u{1112}\u{1168}\u{11AA}",
-        nfkc: "\u{D61F}",
-        nfkd: "\u{1112}\u{1168}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D620}",
-        nfc: "\u{D620}",
-        nfd: "\u{1112}\u{1168}\u{11AB}",
-        nfkc: "\u{D620}",
-        nfkd: "\u{1112}\u{1168}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D621}",
-        nfc: "\u{D621}",
-        nfd: "\u{1112}\u{1168}\u{11AC}",
-        nfkc: "\u{D621}",
-        nfkd: "\u{1112}\u{1168}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D622}",
-        nfc: "\u{D622}",
-        nfd: "\u{1112}\u{1168}\u{11AD}",
-        nfkc: "\u{D622}",
-        nfkd: "\u{1112}\u{1168}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D623}",
-        nfc: "\u{D623}",
-        nfd: "\u{1112}\u{1168}\u{11AE}",
-        nfkc: "\u{D623}",
-        nfkd: "\u{1112}\u{1168}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D624}",
-        nfc: "\u{D624}",
-        nfd: "\u{1112}\u{1168}\u{11AF}",
-        nfkc: "\u{D624}",
-        nfkd: "\u{1112}\u{1168}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D625}",
-        nfc: "\u{D625}",
-        nfd: "\u{1112}\u{1168}\u{11B0}",
-        nfkc: "\u{D625}",
-        nfkd: "\u{1112}\u{1168}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D626}",
-        nfc: "\u{D626}",
-        nfd: "\u{1112}\u{1168}\u{11B1}",
-        nfkc: "\u{D626}",
-        nfkd: "\u{1112}\u{1168}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D627}",
-        nfc: "\u{D627}",
-        nfd: "\u{1112}\u{1168}\u{11B2}",
-        nfkc: "\u{D627}",
-        nfkd: "\u{1112}\u{1168}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D628}",
-        nfc: "\u{D628}",
-        nfd: "\u{1112}\u{1168}\u{11B3}",
-        nfkc: "\u{D628}",
-        nfkd: "\u{1112}\u{1168}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D629}",
-        nfc: "\u{D629}",
-        nfd: "\u{1112}\u{1168}\u{11B4}",
-        nfkc: "\u{D629}",
-        nfkd: "\u{1112}\u{1168}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D62A}",
-        nfc: "\u{D62A}",
-        nfd: "\u{1112}\u{1168}\u{11B5}",
-        nfkc: "\u{D62A}",
-        nfkd: "\u{1112}\u{1168}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D62B}",
-        nfc: "\u{D62B}",
-        nfd: "\u{1112}\u{1168}\u{11B6}",
-        nfkc: "\u{D62B}",
-        nfkd: "\u{1112}\u{1168}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D62C}",
-        nfc: "\u{D62C}",
-        nfd: "\u{1112}\u{1168}\u{11B7}",
-        nfkc: "\u{D62C}",
-        nfkd: "\u{1112}\u{1168}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D62D}",
-        nfc: "\u{D62D}",
-        nfd: "\u{1112}\u{1168}\u{11B8}",
-        nfkc: "\u{D62D}",
-        nfkd: "\u{1112}\u{1168}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D62E}",
-        nfc: "\u{D62E}",
-        nfd: "\u{1112}\u{1168}\u{11B9}",
-        nfkc: "\u{D62E}",
-        nfkd: "\u{1112}\u{1168}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D62F}",
-        nfc: "\u{D62F}",
-        nfd: "\u{1112}\u{1168}\u{11BA}",
-        nfkc: "\u{D62F}",
-        nfkd: "\u{1112}\u{1168}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D630}",
-        nfc: "\u{D630}",
-        nfd: "\u{1112}\u{1168}\u{11BB}",
-        nfkc: "\u{D630}",
-        nfkd: "\u{1112}\u{1168}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D631}",
-        nfc: "\u{D631}",
-        nfd: "\u{1112}\u{1168}\u{11BC}",
-        nfkc: "\u{D631}",
-        nfkd: "\u{1112}\u{1168}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D632}",
-        nfc: "\u{D632}",
-        nfd: "\u{1112}\u{1168}\u{11BD}",
-        nfkc: "\u{D632}",
-        nfkd: "\u{1112}\u{1168}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D633}",
-        nfc: "\u{D633}",
-        nfd: "\u{1112}\u{1168}\u{11BE}",
-        nfkc: "\u{D633}",
-        nfkd: "\u{1112}\u{1168}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D634}",
-        nfc: "\u{D634}",
-        nfd: "\u{1112}\u{1168}\u{11BF}",
-        nfkc: "\u{D634}",
-        nfkd: "\u{1112}\u{1168}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D635}",
-        nfc: "\u{D635}",
-        nfd: "\u{1112}\u{1168}\u{11C0}",
-        nfkc: "\u{D635}",
-        nfkd: "\u{1112}\u{1168}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D636}",
-        nfc: "\u{D636}",
-        nfd: "\u{1112}\u{1168}\u{11C1}",
-        nfkc: "\u{D636}",
-        nfkd: "\u{1112}\u{1168}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D637}",
-        nfc: "\u{D637}",
-        nfd: "\u{1112}\u{1168}\u{11C2}",
-        nfkc: "\u{D637}",
-        nfkd: "\u{1112}\u{1168}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D638}",
-        nfc: "\u{D638}",
-        nfd: "\u{1112}\u{1169}",
-        nfkc: "\u{D638}",
-        nfkd: "\u{1112}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{D639}",
-        nfc: "\u{D639}",
-        nfd: "\u{1112}\u{1169}\u{11A8}",
-        nfkc: "\u{D639}",
-        nfkd: "\u{1112}\u{1169}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D63A}",
-        nfc: "\u{D63A}",
-        nfd: "\u{1112}\u{1169}\u{11A9}",
-        nfkc: "\u{D63A}",
-        nfkd: "\u{1112}\u{1169}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D63B}",
-        nfc: "\u{D63B}",
-        nfd: "\u{1112}\u{1169}\u{11AA}",
-        nfkc: "\u{D63B}",
-        nfkd: "\u{1112}\u{1169}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D63C}",
-        nfc: "\u{D63C}",
-        nfd: "\u{1112}\u{1169}\u{11AB}",
-        nfkc: "\u{D63C}",
-        nfkd: "\u{1112}\u{1169}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D63D}",
-        nfc: "\u{D63D}",
-        nfd: "\u{1112}\u{1169}\u{11AC}",
-        nfkc: "\u{D63D}",
-        nfkd: "\u{1112}\u{1169}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D63E}",
-        nfc: "\u{D63E}",
-        nfd: "\u{1112}\u{1169}\u{11AD}",
-        nfkc: "\u{D63E}",
-        nfkd: "\u{1112}\u{1169}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D63F}",
-        nfc: "\u{D63F}",
-        nfd: "\u{1112}\u{1169}\u{11AE}",
-        nfkc: "\u{D63F}",
-        nfkd: "\u{1112}\u{1169}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D640}",
-        nfc: "\u{D640}",
-        nfd: "\u{1112}\u{1169}\u{11AF}",
-        nfkc: "\u{D640}",
-        nfkd: "\u{1112}\u{1169}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D641}",
-        nfc: "\u{D641}",
-        nfd: "\u{1112}\u{1169}\u{11B0}",
-        nfkc: "\u{D641}",
-        nfkd: "\u{1112}\u{1169}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D642}",
-        nfc: "\u{D642}",
-        nfd: "\u{1112}\u{1169}\u{11B1}",
-        nfkc: "\u{D642}",
-        nfkd: "\u{1112}\u{1169}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D643}",
-        nfc: "\u{D643}",
-        nfd: "\u{1112}\u{1169}\u{11B2}",
-        nfkc: "\u{D643}",
-        nfkd: "\u{1112}\u{1169}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D644}",
-        nfc: "\u{D644}",
-        nfd: "\u{1112}\u{1169}\u{11B3}",
-        nfkc: "\u{D644}",
-        nfkd: "\u{1112}\u{1169}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D645}",
-        nfc: "\u{D645}",
-        nfd: "\u{1112}\u{1169}\u{11B4}",
-        nfkc: "\u{D645}",
-        nfkd: "\u{1112}\u{1169}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D646}",
-        nfc: "\u{D646}",
-        nfd: "\u{1112}\u{1169}\u{11B5}",
-        nfkc: "\u{D646}",
-        nfkd: "\u{1112}\u{1169}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D647}",
-        nfc: "\u{D647}",
-        nfd: "\u{1112}\u{1169}\u{11B6}",
-        nfkc: "\u{D647}",
-        nfkd: "\u{1112}\u{1169}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D648}",
-        nfc: "\u{D648}",
-        nfd: "\u{1112}\u{1169}\u{11B7}",
-        nfkc: "\u{D648}",
-        nfkd: "\u{1112}\u{1169}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D649}",
-        nfc: "\u{D649}",
-        nfd: "\u{1112}\u{1169}\u{11B8}",
-        nfkc: "\u{D649}",
-        nfkd: "\u{1112}\u{1169}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D64A}",
-        nfc: "\u{D64A}",
-        nfd: "\u{1112}\u{1169}\u{11B9}",
-        nfkc: "\u{D64A}",
-        nfkd: "\u{1112}\u{1169}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D64B}",
-        nfc: "\u{D64B}",
-        nfd: "\u{1112}\u{1169}\u{11BA}",
-        nfkc: "\u{D64B}",
-        nfkd: "\u{1112}\u{1169}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D64C}",
-        nfc: "\u{D64C}",
-        nfd: "\u{1112}\u{1169}\u{11BB}",
-        nfkc: "\u{D64C}",
-        nfkd: "\u{1112}\u{1169}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D64D}",
-        nfc: "\u{D64D}",
-        nfd: "\u{1112}\u{1169}\u{11BC}",
-        nfkc: "\u{D64D}",
-        nfkd: "\u{1112}\u{1169}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D64E}",
-        nfc: "\u{D64E}",
-        nfd: "\u{1112}\u{1169}\u{11BD}",
-        nfkc: "\u{D64E}",
-        nfkd: "\u{1112}\u{1169}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D64F}",
-        nfc: "\u{D64F}",
-        nfd: "\u{1112}\u{1169}\u{11BE}",
-        nfkc: "\u{D64F}",
-        nfkd: "\u{1112}\u{1169}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D650}",
-        nfc: "\u{D650}",
-        nfd: "\u{1112}\u{1169}\u{11BF}",
-        nfkc: "\u{D650}",
-        nfkd: "\u{1112}\u{1169}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D651}",
-        nfc: "\u{D651}",
-        nfd: "\u{1112}\u{1169}\u{11C0}",
-        nfkc: "\u{D651}",
-        nfkd: "\u{1112}\u{1169}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D652}",
-        nfc: "\u{D652}",
-        nfd: "\u{1112}\u{1169}\u{11C1}",
-        nfkc: "\u{D652}",
-        nfkd: "\u{1112}\u{1169}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D653}",
-        nfc: "\u{D653}",
-        nfd: "\u{1112}\u{1169}\u{11C2}",
-        nfkc: "\u{D653}",
-        nfkd: "\u{1112}\u{1169}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D654}",
-        nfc: "\u{D654}",
-        nfd: "\u{1112}\u{116A}",
-        nfkc: "\u{D654}",
-        nfkd: "\u{1112}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{D655}",
-        nfc: "\u{D655}",
-        nfd: "\u{1112}\u{116A}\u{11A8}",
-        nfkc: "\u{D655}",
-        nfkd: "\u{1112}\u{116A}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D656}",
-        nfc: "\u{D656}",
-        nfd: "\u{1112}\u{116A}\u{11A9}",
-        nfkc: "\u{D656}",
-        nfkd: "\u{1112}\u{116A}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D657}",
-        nfc: "\u{D657}",
-        nfd: "\u{1112}\u{116A}\u{11AA}",
-        nfkc: "\u{D657}",
-        nfkd: "\u{1112}\u{116A}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D658}",
-        nfc: "\u{D658}",
-        nfd: "\u{1112}\u{116A}\u{11AB}",
-        nfkc: "\u{D658}",
-        nfkd: "\u{1112}\u{116A}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D659}",
-        nfc: "\u{D659}",
-        nfd: "\u{1112}\u{116A}\u{11AC}",
-        nfkc: "\u{D659}",
-        nfkd: "\u{1112}\u{116A}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D65A}",
-        nfc: "\u{D65A}",
-        nfd: "\u{1112}\u{116A}\u{11AD}",
-        nfkc: "\u{D65A}",
-        nfkd: "\u{1112}\u{116A}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D65B}",
-        nfc: "\u{D65B}",
-        nfd: "\u{1112}\u{116A}\u{11AE}",
-        nfkc: "\u{D65B}",
-        nfkd: "\u{1112}\u{116A}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D65C}",
-        nfc: "\u{D65C}",
-        nfd: "\u{1112}\u{116A}\u{11AF}",
-        nfkc: "\u{D65C}",
-        nfkd: "\u{1112}\u{116A}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D65D}",
-        nfc: "\u{D65D}",
-        nfd: "\u{1112}\u{116A}\u{11B0}",
-        nfkc: "\u{D65D}",
-        nfkd: "\u{1112}\u{116A}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D65E}",
-        nfc: "\u{D65E}",
-        nfd: "\u{1112}\u{116A}\u{11B1}",
-        nfkc: "\u{D65E}",
-        nfkd: "\u{1112}\u{116A}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D65F}",
-        nfc: "\u{D65F}",
-        nfd: "\u{1112}\u{116A}\u{11B2}",
-        nfkc: "\u{D65F}",
-        nfkd: "\u{1112}\u{116A}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D660}",
-        nfc: "\u{D660}",
-        nfd: "\u{1112}\u{116A}\u{11B3}",
-        nfkc: "\u{D660}",
-        nfkd: "\u{1112}\u{116A}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D661}",
-        nfc: "\u{D661}",
-        nfd: "\u{1112}\u{116A}\u{11B4}",
-        nfkc: "\u{D661}",
-        nfkd: "\u{1112}\u{116A}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D662}",
-        nfc: "\u{D662}",
-        nfd: "\u{1112}\u{116A}\u{11B5}",
-        nfkc: "\u{D662}",
-        nfkd: "\u{1112}\u{116A}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D663}",
-        nfc: "\u{D663}",
-        nfd: "\u{1112}\u{116A}\u{11B6}",
-        nfkc: "\u{D663}",
-        nfkd: "\u{1112}\u{116A}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D664}",
-        nfc: "\u{D664}",
-        nfd: "\u{1112}\u{116A}\u{11B7}",
-        nfkc: "\u{D664}",
-        nfkd: "\u{1112}\u{116A}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D665}",
-        nfc: "\u{D665}",
-        nfd: "\u{1112}\u{116A}\u{11B8}",
-        nfkc: "\u{D665}",
-        nfkd: "\u{1112}\u{116A}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D666}",
-        nfc: "\u{D666}",
-        nfd: "\u{1112}\u{116A}\u{11B9}",
-        nfkc: "\u{D666}",
-        nfkd: "\u{1112}\u{116A}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D667}",
-        nfc: "\u{D667}",
-        nfd: "\u{1112}\u{116A}\u{11BA}",
-        nfkc: "\u{D667}",
-        nfkd: "\u{1112}\u{116A}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D668}",
-        nfc: "\u{D668}",
-        nfd: "\u{1112}\u{116A}\u{11BB}",
-        nfkc: "\u{D668}",
-        nfkd: "\u{1112}\u{116A}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D669}",
-        nfc: "\u{D669}",
-        nfd: "\u{1112}\u{116A}\u{11BC}",
-        nfkc: "\u{D669}",
-        nfkd: "\u{1112}\u{116A}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D66A}",
-        nfc: "\u{D66A}",
-        nfd: "\u{1112}\u{116A}\u{11BD}",
-        nfkc: "\u{D66A}",
-        nfkd: "\u{1112}\u{116A}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D66B}",
-        nfc: "\u{D66B}",
-        nfd: "\u{1112}\u{116A}\u{11BE}",
-        nfkc: "\u{D66B}",
-        nfkd: "\u{1112}\u{116A}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D66C}",
-        nfc: "\u{D66C}",
-        nfd: "\u{1112}\u{116A}\u{11BF}",
-        nfkc: "\u{D66C}",
-        nfkd: "\u{1112}\u{116A}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D66D}",
-        nfc: "\u{D66D}",
-        nfd: "\u{1112}\u{116A}\u{11C0}",
-        nfkc: "\u{D66D}",
-        nfkd: "\u{1112}\u{116A}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D66E}",
-        nfc: "\u{D66E}",
-        nfd: "\u{1112}\u{116A}\u{11C1}",
-        nfkc: "\u{D66E}",
-        nfkd: "\u{1112}\u{116A}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D66F}",
-        nfc: "\u{D66F}",
-        nfd: "\u{1112}\u{116A}\u{11C2}",
-        nfkc: "\u{D66F}",
-        nfkd: "\u{1112}\u{116A}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D670}",
-        nfc: "\u{D670}",
-        nfd: "\u{1112}\u{116B}",
-        nfkc: "\u{D670}",
-        nfkd: "\u{1112}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{D671}",
-        nfc: "\u{D671}",
-        nfd: "\u{1112}\u{116B}\u{11A8}",
-        nfkc: "\u{D671}",
-        nfkd: "\u{1112}\u{116B}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D672}",
-        nfc: "\u{D672}",
-        nfd: "\u{1112}\u{116B}\u{11A9}",
-        nfkc: "\u{D672}",
-        nfkd: "\u{1112}\u{116B}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D673}",
-        nfc: "\u{D673}",
-        nfd: "\u{1112}\u{116B}\u{11AA}",
-        nfkc: "\u{D673}",
-        nfkd: "\u{1112}\u{116B}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D674}",
-        nfc: "\u{D674}",
-        nfd: "\u{1112}\u{116B}\u{11AB}",
-        nfkc: "\u{D674}",
-        nfkd: "\u{1112}\u{116B}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D675}",
-        nfc: "\u{D675}",
-        nfd: "\u{1112}\u{116B}\u{11AC}",
-        nfkc: "\u{D675}",
-        nfkd: "\u{1112}\u{116B}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D676}",
-        nfc: "\u{D676}",
-        nfd: "\u{1112}\u{116B}\u{11AD}",
-        nfkc: "\u{D676}",
-        nfkd: "\u{1112}\u{116B}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D677}",
-        nfc: "\u{D677}",
-        nfd: "\u{1112}\u{116B}\u{11AE}",
-        nfkc: "\u{D677}",
-        nfkd: "\u{1112}\u{116B}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D678}",
-        nfc: "\u{D678}",
-        nfd: "\u{1112}\u{116B}\u{11AF}",
-        nfkc: "\u{D678}",
-        nfkd: "\u{1112}\u{116B}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D679}",
-        nfc: "\u{D679}",
-        nfd: "\u{1112}\u{116B}\u{11B0}",
-        nfkc: "\u{D679}",
-        nfkd: "\u{1112}\u{116B}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D67A}",
-        nfc: "\u{D67A}",
-        nfd: "\u{1112}\u{116B}\u{11B1}",
-        nfkc: "\u{D67A}",
-        nfkd: "\u{1112}\u{116B}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D67B}",
-        nfc: "\u{D67B}",
-        nfd: "\u{1112}\u{116B}\u{11B2}",
-        nfkc: "\u{D67B}",
-        nfkd: "\u{1112}\u{116B}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D67C}",
-        nfc: "\u{D67C}",
-        nfd: "\u{1112}\u{116B}\u{11B3}",
-        nfkc: "\u{D67C}",
-        nfkd: "\u{1112}\u{116B}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D67D}",
-        nfc: "\u{D67D}",
-        nfd: "\u{1112}\u{116B}\u{11B4}",
-        nfkc: "\u{D67D}",
-        nfkd: "\u{1112}\u{116B}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D67E}",
-        nfc: "\u{D67E}",
-        nfd: "\u{1112}\u{116B}\u{11B5}",
-        nfkc: "\u{D67E}",
-        nfkd: "\u{1112}\u{116B}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D67F}",
-        nfc: "\u{D67F}",
-        nfd: "\u{1112}\u{116B}\u{11B6}",
-        nfkc: "\u{D67F}",
-        nfkd: "\u{1112}\u{116B}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D680}",
-        nfc: "\u{D680}",
-        nfd: "\u{1112}\u{116B}\u{11B7}",
-        nfkc: "\u{D680}",
-        nfkd: "\u{1112}\u{116B}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D681}",
-        nfc: "\u{D681}",
-        nfd: "\u{1112}\u{116B}\u{11B8}",
-        nfkc: "\u{D681}",
-        nfkd: "\u{1112}\u{116B}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D682}",
-        nfc: "\u{D682}",
-        nfd: "\u{1112}\u{116B}\u{11B9}",
-        nfkc: "\u{D682}",
-        nfkd: "\u{1112}\u{116B}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D683}",
-        nfc: "\u{D683}",
-        nfd: "\u{1112}\u{116B}\u{11BA}",
-        nfkc: "\u{D683}",
-        nfkd: "\u{1112}\u{116B}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D684}",
-        nfc: "\u{D684}",
-        nfd: "\u{1112}\u{116B}\u{11BB}",
-        nfkc: "\u{D684}",
-        nfkd: "\u{1112}\u{116B}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D685}",
-        nfc: "\u{D685}",
-        nfd: "\u{1112}\u{116B}\u{11BC}",
-        nfkc: "\u{D685}",
-        nfkd: "\u{1112}\u{116B}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D686}",
-        nfc: "\u{D686}",
-        nfd: "\u{1112}\u{116B}\u{11BD}",
-        nfkc: "\u{D686}",
-        nfkd: "\u{1112}\u{116B}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D687}",
-        nfc: "\u{D687}",
-        nfd: "\u{1112}\u{116B}\u{11BE}",
-        nfkc: "\u{D687}",
-        nfkd: "\u{1112}\u{116B}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D688}",
-        nfc: "\u{D688}",
-        nfd: "\u{1112}\u{116B}\u{11BF}",
-        nfkc: "\u{D688}",
-        nfkd: "\u{1112}\u{116B}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D689}",
-        nfc: "\u{D689}",
-        nfd: "\u{1112}\u{116B}\u{11C0}",
-        nfkc: "\u{D689}",
-        nfkd: "\u{1112}\u{116B}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D68A}",
-        nfc: "\u{D68A}",
-        nfd: "\u{1112}\u{116B}\u{11C1}",
-        nfkc: "\u{D68A}",
-        nfkd: "\u{1112}\u{116B}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D68B}",
-        nfc: "\u{D68B}",
-        nfd: "\u{1112}\u{116B}\u{11C2}",
-        nfkc: "\u{D68B}",
-        nfkd: "\u{1112}\u{116B}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D68C}",
-        nfc: "\u{D68C}",
-        nfd: "\u{1112}\u{116C}",
-        nfkc: "\u{D68C}",
-        nfkd: "\u{1112}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{D68D}",
-        nfc: "\u{D68D}",
-        nfd: "\u{1112}\u{116C}\u{11A8}",
-        nfkc: "\u{D68D}",
-        nfkd: "\u{1112}\u{116C}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D68E}",
-        nfc: "\u{D68E}",
-        nfd: "\u{1112}\u{116C}\u{11A9}",
-        nfkc: "\u{D68E}",
-        nfkd: "\u{1112}\u{116C}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D68F}",
-        nfc: "\u{D68F}",
-        nfd: "\u{1112}\u{116C}\u{11AA}",
-        nfkc: "\u{D68F}",
-        nfkd: "\u{1112}\u{116C}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D690}",
-        nfc: "\u{D690}",
-        nfd: "\u{1112}\u{116C}\u{11AB}",
-        nfkc: "\u{D690}",
-        nfkd: "\u{1112}\u{116C}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D691}",
-        nfc: "\u{D691}",
-        nfd: "\u{1112}\u{116C}\u{11AC}",
-        nfkc: "\u{D691}",
-        nfkd: "\u{1112}\u{116C}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D692}",
-        nfc: "\u{D692}",
-        nfd: "\u{1112}\u{116C}\u{11AD}",
-        nfkc: "\u{D692}",
-        nfkd: "\u{1112}\u{116C}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D693}",
-        nfc: "\u{D693}",
-        nfd: "\u{1112}\u{116C}\u{11AE}",
-        nfkc: "\u{D693}",
-        nfkd: "\u{1112}\u{116C}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D694}",
-        nfc: "\u{D694}",
-        nfd: "\u{1112}\u{116C}\u{11AF}",
-        nfkc: "\u{D694}",
-        nfkd: "\u{1112}\u{116C}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D695}",
-        nfc: "\u{D695}",
-        nfd: "\u{1112}\u{116C}\u{11B0}",
-        nfkc: "\u{D695}",
-        nfkd: "\u{1112}\u{116C}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D696}",
-        nfc: "\u{D696}",
-        nfd: "\u{1112}\u{116C}\u{11B1}",
-        nfkc: "\u{D696}",
-        nfkd: "\u{1112}\u{116C}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D697}",
-        nfc: "\u{D697}",
-        nfd: "\u{1112}\u{116C}\u{11B2}",
-        nfkc: "\u{D697}",
-        nfkd: "\u{1112}\u{116C}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D698}",
-        nfc: "\u{D698}",
-        nfd: "\u{1112}\u{116C}\u{11B3}",
-        nfkc: "\u{D698}",
-        nfkd: "\u{1112}\u{116C}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D699}",
-        nfc: "\u{D699}",
-        nfd: "\u{1112}\u{116C}\u{11B4}",
-        nfkc: "\u{D699}",
-        nfkd: "\u{1112}\u{116C}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D69A}",
-        nfc: "\u{D69A}",
-        nfd: "\u{1112}\u{116C}\u{11B5}",
-        nfkc: "\u{D69A}",
-        nfkd: "\u{1112}\u{116C}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D69B}",
-        nfc: "\u{D69B}",
-        nfd: "\u{1112}\u{116C}\u{11B6}",
-        nfkc: "\u{D69B}",
-        nfkd: "\u{1112}\u{116C}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D69C}",
-        nfc: "\u{D69C}",
-        nfd: "\u{1112}\u{116C}\u{11B7}",
-        nfkc: "\u{D69C}",
-        nfkd: "\u{1112}\u{116C}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D69D}",
-        nfc: "\u{D69D}",
-        nfd: "\u{1112}\u{116C}\u{11B8}",
-        nfkc: "\u{D69D}",
-        nfkd: "\u{1112}\u{116C}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D69E}",
-        nfc: "\u{D69E}",
-        nfd: "\u{1112}\u{116C}\u{11B9}",
-        nfkc: "\u{D69E}",
-        nfkd: "\u{1112}\u{116C}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D69F}",
-        nfc: "\u{D69F}",
-        nfd: "\u{1112}\u{116C}\u{11BA}",
-        nfkc: "\u{D69F}",
-        nfkd: "\u{1112}\u{116C}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D6A0}",
-        nfc: "\u{D6A0}",
-        nfd: "\u{1112}\u{116C}\u{11BB}",
-        nfkc: "\u{D6A0}",
-        nfkd: "\u{1112}\u{116C}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D6A1}",
-        nfc: "\u{D6A1}",
-        nfd: "\u{1112}\u{116C}\u{11BC}",
-        nfkc: "\u{D6A1}",
-        nfkd: "\u{1112}\u{116C}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D6A2}",
-        nfc: "\u{D6A2}",
-        nfd: "\u{1112}\u{116C}\u{11BD}",
-        nfkc: "\u{D6A2}",
-        nfkd: "\u{1112}\u{116C}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D6A3}",
-        nfc: "\u{D6A3}",
-        nfd: "\u{1112}\u{116C}\u{11BE}",
-        nfkc: "\u{D6A3}",
-        nfkd: "\u{1112}\u{116C}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D6A4}",
-        nfc: "\u{D6A4}",
-        nfd: "\u{1112}\u{116C}\u{11BF}",
-        nfkc: "\u{D6A4}",
-        nfkd: "\u{1112}\u{116C}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D6A5}",
-        nfc: "\u{D6A5}",
-        nfd: "\u{1112}\u{116C}\u{11C0}",
-        nfkc: "\u{D6A5}",
-        nfkd: "\u{1112}\u{116C}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D6A6}",
-        nfc: "\u{D6A6}",
-        nfd: "\u{1112}\u{116C}\u{11C1}",
-        nfkc: "\u{D6A6}",
-        nfkd: "\u{1112}\u{116C}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D6A7}",
-        nfc: "\u{D6A7}",
-        nfd: "\u{1112}\u{116C}\u{11C2}",
-        nfkc: "\u{D6A7}",
-        nfkd: "\u{1112}\u{116C}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D6A8}",
-        nfc: "\u{D6A8}",
-        nfd: "\u{1112}\u{116D}",
-        nfkc: "\u{D6A8}",
-        nfkd: "\u{1112}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{D6A9}",
-        nfc: "\u{D6A9}",
-        nfd: "\u{1112}\u{116D}\u{11A8}",
-        nfkc: "\u{D6A9}",
-        nfkd: "\u{1112}\u{116D}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D6AA}",
-        nfc: "\u{D6AA}",
-        nfd: "\u{1112}\u{116D}\u{11A9}",
-        nfkc: "\u{D6AA}",
-        nfkd: "\u{1112}\u{116D}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D6AB}",
-        nfc: "\u{D6AB}",
-        nfd: "\u{1112}\u{116D}\u{11AA}",
-        nfkc: "\u{D6AB}",
-        nfkd: "\u{1112}\u{116D}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D6AC}",
-        nfc: "\u{D6AC}",
-        nfd: "\u{1112}\u{116D}\u{11AB}",
-        nfkc: "\u{D6AC}",
-        nfkd: "\u{1112}\u{116D}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D6AD}",
-        nfc: "\u{D6AD}",
-        nfd: "\u{1112}\u{116D}\u{11AC}",
-        nfkc: "\u{D6AD}",
-        nfkd: "\u{1112}\u{116D}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D6AE}",
-        nfc: "\u{D6AE}",
-        nfd: "\u{1112}\u{116D}\u{11AD}",
-        nfkc: "\u{D6AE}",
-        nfkd: "\u{1112}\u{116D}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D6AF}",
-        nfc: "\u{D6AF}",
-        nfd: "\u{1112}\u{116D}\u{11AE}",
-        nfkc: "\u{D6AF}",
-        nfkd: "\u{1112}\u{116D}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D6B0}",
-        nfc: "\u{D6B0}",
-        nfd: "\u{1112}\u{116D}\u{11AF}",
-        nfkc: "\u{D6B0}",
-        nfkd: "\u{1112}\u{116D}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D6B1}",
-        nfc: "\u{D6B1}",
-        nfd: "\u{1112}\u{116D}\u{11B0}",
-        nfkc: "\u{D6B1}",
-        nfkd: "\u{1112}\u{116D}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D6B2}",
-        nfc: "\u{D6B2}",
-        nfd: "\u{1112}\u{116D}\u{11B1}",
-        nfkc: "\u{D6B2}",
-        nfkd: "\u{1112}\u{116D}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D6B3}",
-        nfc: "\u{D6B3}",
-        nfd: "\u{1112}\u{116D}\u{11B2}",
-        nfkc: "\u{D6B3}",
-        nfkd: "\u{1112}\u{116D}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D6B4}",
-        nfc: "\u{D6B4}",
-        nfd: "\u{1112}\u{116D}\u{11B3}",
-        nfkc: "\u{D6B4}",
-        nfkd: "\u{1112}\u{116D}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D6B5}",
-        nfc: "\u{D6B5}",
-        nfd: "\u{1112}\u{116D}\u{11B4}",
-        nfkc: "\u{D6B5}",
-        nfkd: "\u{1112}\u{116D}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D6B6}",
-        nfc: "\u{D6B6}",
-        nfd: "\u{1112}\u{116D}\u{11B5}",
-        nfkc: "\u{D6B6}",
-        nfkd: "\u{1112}\u{116D}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D6B7}",
-        nfc: "\u{D6B7}",
-        nfd: "\u{1112}\u{116D}\u{11B6}",
-        nfkc: "\u{D6B7}",
-        nfkd: "\u{1112}\u{116D}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D6B8}",
-        nfc: "\u{D6B8}",
-        nfd: "\u{1112}\u{116D}\u{11B7}",
-        nfkc: "\u{D6B8}",
-        nfkd: "\u{1112}\u{116D}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D6B9}",
-        nfc: "\u{D6B9}",
-        nfd: "\u{1112}\u{116D}\u{11B8}",
-        nfkc: "\u{D6B9}",
-        nfkd: "\u{1112}\u{116D}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D6BA}",
-        nfc: "\u{D6BA}",
-        nfd: "\u{1112}\u{116D}\u{11B9}",
-        nfkc: "\u{D6BA}",
-        nfkd: "\u{1112}\u{116D}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D6BB}",
-        nfc: "\u{D6BB}",
-        nfd: "\u{1112}\u{116D}\u{11BA}",
-        nfkc: "\u{D6BB}",
-        nfkd: "\u{1112}\u{116D}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D6BC}",
-        nfc: "\u{D6BC}",
-        nfd: "\u{1112}\u{116D}\u{11BB}",
-        nfkc: "\u{D6BC}",
-        nfkd: "\u{1112}\u{116D}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D6BD}",
-        nfc: "\u{D6BD}",
-        nfd: "\u{1112}\u{116D}\u{11BC}",
-        nfkc: "\u{D6BD}",
-        nfkd: "\u{1112}\u{116D}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D6BE}",
-        nfc: "\u{D6BE}",
-        nfd: "\u{1112}\u{116D}\u{11BD}",
-        nfkc: "\u{D6BE}",
-        nfkd: "\u{1112}\u{116D}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D6BF}",
-        nfc: "\u{D6BF}",
-        nfd: "\u{1112}\u{116D}\u{11BE}",
-        nfkc: "\u{D6BF}",
-        nfkd: "\u{1112}\u{116D}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D6C0}",
-        nfc: "\u{D6C0}",
-        nfd: "\u{1112}\u{116D}\u{11BF}",
-        nfkc: "\u{D6C0}",
-        nfkd: "\u{1112}\u{116D}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D6C1}",
-        nfc: "\u{D6C1}",
-        nfd: "\u{1112}\u{116D}\u{11C0}",
-        nfkc: "\u{D6C1}",
-        nfkd: "\u{1112}\u{116D}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D6C2}",
-        nfc: "\u{D6C2}",
-        nfd: "\u{1112}\u{116D}\u{11C1}",
-        nfkc: "\u{D6C2}",
-        nfkd: "\u{1112}\u{116D}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D6C3}",
-        nfc: "\u{D6C3}",
-        nfd: "\u{1112}\u{116D}\u{11C2}",
-        nfkc: "\u{D6C3}",
-        nfkd: "\u{1112}\u{116D}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D6C4}",
-        nfc: "\u{D6C4}",
-        nfd: "\u{1112}\u{116E}",
-        nfkc: "\u{D6C4}",
-        nfkd: "\u{1112}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{D6C5}",
-        nfc: "\u{D6C5}",
-        nfd: "\u{1112}\u{116E}\u{11A8}",
-        nfkc: "\u{D6C5}",
-        nfkd: "\u{1112}\u{116E}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D6C6}",
-        nfc: "\u{D6C6}",
-        nfd: "\u{1112}\u{116E}\u{11A9}",
-        nfkc: "\u{D6C6}",
-        nfkd: "\u{1112}\u{116E}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D6C7}",
-        nfc: "\u{D6C7}",
-        nfd: "\u{1112}\u{116E}\u{11AA}",
-        nfkc: "\u{D6C7}",
-        nfkd: "\u{1112}\u{116E}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D6C8}",
-        nfc: "\u{D6C8}",
-        nfd: "\u{1112}\u{116E}\u{11AB}",
-        nfkc: "\u{D6C8}",
-        nfkd: "\u{1112}\u{116E}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D6C9}",
-        nfc: "\u{D6C9}",
-        nfd: "\u{1112}\u{116E}\u{11AC}",
-        nfkc: "\u{D6C9}",
-        nfkd: "\u{1112}\u{116E}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D6CA}",
-        nfc: "\u{D6CA}",
-        nfd: "\u{1112}\u{116E}\u{11AD}",
-        nfkc: "\u{D6CA}",
-        nfkd: "\u{1112}\u{116E}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D6CB}",
-        nfc: "\u{D6CB}",
-        nfd: "\u{1112}\u{116E}\u{11AE}",
-        nfkc: "\u{D6CB}",
-        nfkd: "\u{1112}\u{116E}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D6CC}",
-        nfc: "\u{D6CC}",
-        nfd: "\u{1112}\u{116E}\u{11AF}",
-        nfkc: "\u{D6CC}",
-        nfkd: "\u{1112}\u{116E}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D6CD}",
-        nfc: "\u{D6CD}",
-        nfd: "\u{1112}\u{116E}\u{11B0}",
-        nfkc: "\u{D6CD}",
-        nfkd: "\u{1112}\u{116E}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D6CE}",
-        nfc: "\u{D6CE}",
-        nfd: "\u{1112}\u{116E}\u{11B1}",
-        nfkc: "\u{D6CE}",
-        nfkd: "\u{1112}\u{116E}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D6CF}",
-        nfc: "\u{D6CF}",
-        nfd: "\u{1112}\u{116E}\u{11B2}",
-        nfkc: "\u{D6CF}",
-        nfkd: "\u{1112}\u{116E}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D6D0}",
-        nfc: "\u{D6D0}",
-        nfd: "\u{1112}\u{116E}\u{11B3}",
-        nfkc: "\u{D6D0}",
-        nfkd: "\u{1112}\u{116E}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D6D1}",
-        nfc: "\u{D6D1}",
-        nfd: "\u{1112}\u{116E}\u{11B4}",
-        nfkc: "\u{D6D1}",
-        nfkd: "\u{1112}\u{116E}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D6D2}",
-        nfc: "\u{D6D2}",
-        nfd: "\u{1112}\u{116E}\u{11B5}",
-        nfkc: "\u{D6D2}",
-        nfkd: "\u{1112}\u{116E}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D6D3}",
-        nfc: "\u{D6D3}",
-        nfd: "\u{1112}\u{116E}\u{11B6}",
-        nfkc: "\u{D6D3}",
-        nfkd: "\u{1112}\u{116E}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D6D4}",
-        nfc: "\u{D6D4}",
-        nfd: "\u{1112}\u{116E}\u{11B7}",
-        nfkc: "\u{D6D4}",
-        nfkd: "\u{1112}\u{116E}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D6D5}",
-        nfc: "\u{D6D5}",
-        nfd: "\u{1112}\u{116E}\u{11B8}",
-        nfkc: "\u{D6D5}",
-        nfkd: "\u{1112}\u{116E}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D6D6}",
-        nfc: "\u{D6D6}",
-        nfd: "\u{1112}\u{116E}\u{11B9}",
-        nfkc: "\u{D6D6}",
-        nfkd: "\u{1112}\u{116E}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D6D7}",
-        nfc: "\u{D6D7}",
-        nfd: "\u{1112}\u{116E}\u{11BA}",
-        nfkc: "\u{D6D7}",
-        nfkd: "\u{1112}\u{116E}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D6D8}",
-        nfc: "\u{D6D8}",
-        nfd: "\u{1112}\u{116E}\u{11BB}",
-        nfkc: "\u{D6D8}",
-        nfkd: "\u{1112}\u{116E}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D6D9}",
-        nfc: "\u{D6D9}",
-        nfd: "\u{1112}\u{116E}\u{11BC}",
-        nfkc: "\u{D6D9}",
-        nfkd: "\u{1112}\u{116E}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D6DA}",
-        nfc: "\u{D6DA}",
-        nfd: "\u{1112}\u{116E}\u{11BD}",
-        nfkc: "\u{D6DA}",
-        nfkd: "\u{1112}\u{116E}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D6DB}",
-        nfc: "\u{D6DB}",
-        nfd: "\u{1112}\u{116E}\u{11BE}",
-        nfkc: "\u{D6DB}",
-        nfkd: "\u{1112}\u{116E}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D6DC}",
-        nfc: "\u{D6DC}",
-        nfd: "\u{1112}\u{116E}\u{11BF}",
-        nfkc: "\u{D6DC}",
-        nfkd: "\u{1112}\u{116E}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D6DD}",
-        nfc: "\u{D6DD}",
-        nfd: "\u{1112}\u{116E}\u{11C0}",
-        nfkc: "\u{D6DD}",
-        nfkd: "\u{1112}\u{116E}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D6DE}",
-        nfc: "\u{D6DE}",
-        nfd: "\u{1112}\u{116E}\u{11C1}",
-        nfkc: "\u{D6DE}",
-        nfkd: "\u{1112}\u{116E}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D6DF}",
-        nfc: "\u{D6DF}",
-        nfd: "\u{1112}\u{116E}\u{11C2}",
-        nfkc: "\u{D6DF}",
-        nfkd: "\u{1112}\u{116E}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D6E0}",
-        nfc: "\u{D6E0}",
-        nfd: "\u{1112}\u{116F}",
-        nfkc: "\u{D6E0}",
-        nfkd: "\u{1112}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{D6E1}",
-        nfc: "\u{D6E1}",
-        nfd: "\u{1112}\u{116F}\u{11A8}",
-        nfkc: "\u{D6E1}",
-        nfkd: "\u{1112}\u{116F}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D6E2}",
-        nfc: "\u{D6E2}",
-        nfd: "\u{1112}\u{116F}\u{11A9}",
-        nfkc: "\u{D6E2}",
-        nfkd: "\u{1112}\u{116F}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D6E3}",
-        nfc: "\u{D6E3}",
-        nfd: "\u{1112}\u{116F}\u{11AA}",
-        nfkc: "\u{D6E3}",
-        nfkd: "\u{1112}\u{116F}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D6E4}",
-        nfc: "\u{D6E4}",
-        nfd: "\u{1112}\u{116F}\u{11AB}",
-        nfkc: "\u{D6E4}",
-        nfkd: "\u{1112}\u{116F}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D6E5}",
-        nfc: "\u{D6E5}",
-        nfd: "\u{1112}\u{116F}\u{11AC}",
-        nfkc: "\u{D6E5}",
-        nfkd: "\u{1112}\u{116F}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D6E6}",
-        nfc: "\u{D6E6}",
-        nfd: "\u{1112}\u{116F}\u{11AD}",
-        nfkc: "\u{D6E6}",
-        nfkd: "\u{1112}\u{116F}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D6E7}",
-        nfc: "\u{D6E7}",
-        nfd: "\u{1112}\u{116F}\u{11AE}",
-        nfkc: "\u{D6E7}",
-        nfkd: "\u{1112}\u{116F}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D6E8}",
-        nfc: "\u{D6E8}",
-        nfd: "\u{1112}\u{116F}\u{11AF}",
-        nfkc: "\u{D6E8}",
-        nfkd: "\u{1112}\u{116F}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D6E9}",
-        nfc: "\u{D6E9}",
-        nfd: "\u{1112}\u{116F}\u{11B0}",
-        nfkc: "\u{D6E9}",
-        nfkd: "\u{1112}\u{116F}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D6EA}",
-        nfc: "\u{D6EA}",
-        nfd: "\u{1112}\u{116F}\u{11B1}",
-        nfkc: "\u{D6EA}",
-        nfkd: "\u{1112}\u{116F}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D6EB}",
-        nfc: "\u{D6EB}",
-        nfd: "\u{1112}\u{116F}\u{11B2}",
-        nfkc: "\u{D6EB}",
-        nfkd: "\u{1112}\u{116F}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D6EC}",
-        nfc: "\u{D6EC}",
-        nfd: "\u{1112}\u{116F}\u{11B3}",
-        nfkc: "\u{D6EC}",
-        nfkd: "\u{1112}\u{116F}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D6ED}",
-        nfc: "\u{D6ED}",
-        nfd: "\u{1112}\u{116F}\u{11B4}",
-        nfkc: "\u{D6ED}",
-        nfkd: "\u{1112}\u{116F}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D6EE}",
-        nfc: "\u{D6EE}",
-        nfd: "\u{1112}\u{116F}\u{11B5}",
-        nfkc: "\u{D6EE}",
-        nfkd: "\u{1112}\u{116F}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D6EF}",
-        nfc: "\u{D6EF}",
-        nfd: "\u{1112}\u{116F}\u{11B6}",
-        nfkc: "\u{D6EF}",
-        nfkd: "\u{1112}\u{116F}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D6F0}",
-        nfc: "\u{D6F0}",
-        nfd: "\u{1112}\u{116F}\u{11B7}",
-        nfkc: "\u{D6F0}",
-        nfkd: "\u{1112}\u{116F}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D6F1}",
-        nfc: "\u{D6F1}",
-        nfd: "\u{1112}\u{116F}\u{11B8}",
-        nfkc: "\u{D6F1}",
-        nfkd: "\u{1112}\u{116F}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D6F2}",
-        nfc: "\u{D6F2}",
-        nfd: "\u{1112}\u{116F}\u{11B9}",
-        nfkc: "\u{D6F2}",
-        nfkd: "\u{1112}\u{116F}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D6F3}",
-        nfc: "\u{D6F3}",
-        nfd: "\u{1112}\u{116F}\u{11BA}",
-        nfkc: "\u{D6F3}",
-        nfkd: "\u{1112}\u{116F}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D6F4}",
-        nfc: "\u{D6F4}",
-        nfd: "\u{1112}\u{116F}\u{11BB}",
-        nfkc: "\u{D6F4}",
-        nfkd: "\u{1112}\u{116F}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D6F5}",
-        nfc: "\u{D6F5}",
-        nfd: "\u{1112}\u{116F}\u{11BC}",
-        nfkc: "\u{D6F5}",
-        nfkd: "\u{1112}\u{116F}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D6F6}",
-        nfc: "\u{D6F6}",
-        nfd: "\u{1112}\u{116F}\u{11BD}",
-        nfkc: "\u{D6F6}",
-        nfkd: "\u{1112}\u{116F}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D6F7}",
-        nfc: "\u{D6F7}",
-        nfd: "\u{1112}\u{116F}\u{11BE}",
-        nfkc: "\u{D6F7}",
-        nfkd: "\u{1112}\u{116F}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D6F8}",
-        nfc: "\u{D6F8}",
-        nfd: "\u{1112}\u{116F}\u{11BF}",
-        nfkc: "\u{D6F8}",
-        nfkd: "\u{1112}\u{116F}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D6F9}",
-        nfc: "\u{D6F9}",
-        nfd: "\u{1112}\u{116F}\u{11C0}",
-        nfkc: "\u{D6F9}",
-        nfkd: "\u{1112}\u{116F}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D6FA}",
-        nfc: "\u{D6FA}",
-        nfd: "\u{1112}\u{116F}\u{11C1}",
-        nfkc: "\u{D6FA}",
-        nfkd: "\u{1112}\u{116F}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D6FB}",
-        nfc: "\u{D6FB}",
-        nfd: "\u{1112}\u{116F}\u{11C2}",
-        nfkc: "\u{D6FB}",
-        nfkd: "\u{1112}\u{116F}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D6FC}",
-        nfc: "\u{D6FC}",
-        nfd: "\u{1112}\u{1170}",
-        nfkc: "\u{D6FC}",
-        nfkd: "\u{1112}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{D6FD}",
-        nfc: "\u{D6FD}",
-        nfd: "\u{1112}\u{1170}\u{11A8}",
-        nfkc: "\u{D6FD}",
-        nfkd: "\u{1112}\u{1170}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D6FE}",
-        nfc: "\u{D6FE}",
-        nfd: "\u{1112}\u{1170}\u{11A9}",
-        nfkc: "\u{D6FE}",
-        nfkd: "\u{1112}\u{1170}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D6FF}",
-        nfc: "\u{D6FF}",
-        nfd: "\u{1112}\u{1170}\u{11AA}",
-        nfkc: "\u{D6FF}",
-        nfkd: "\u{1112}\u{1170}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D700}",
-        nfc: "\u{D700}",
-        nfd: "\u{1112}\u{1170}\u{11AB}",
-        nfkc: "\u{D700}",
-        nfkd: "\u{1112}\u{1170}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D701}",
-        nfc: "\u{D701}",
-        nfd: "\u{1112}\u{1170}\u{11AC}",
-        nfkc: "\u{D701}",
-        nfkd: "\u{1112}\u{1170}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D702}",
-        nfc: "\u{D702}",
-        nfd: "\u{1112}\u{1170}\u{11AD}",
-        nfkc: "\u{D702}",
-        nfkd: "\u{1112}\u{1170}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D703}",
-        nfc: "\u{D703}",
-        nfd: "\u{1112}\u{1170}\u{11AE}",
-        nfkc: "\u{D703}",
-        nfkd: "\u{1112}\u{1170}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D704}",
-        nfc: "\u{D704}",
-        nfd: "\u{1112}\u{1170}\u{11AF}",
-        nfkc: "\u{D704}",
-        nfkd: "\u{1112}\u{1170}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D705}",
-        nfc: "\u{D705}",
-        nfd: "\u{1112}\u{1170}\u{11B0}",
-        nfkc: "\u{D705}",
-        nfkd: "\u{1112}\u{1170}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D706}",
-        nfc: "\u{D706}",
-        nfd: "\u{1112}\u{1170}\u{11B1}",
-        nfkc: "\u{D706}",
-        nfkd: "\u{1112}\u{1170}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D707}",
-        nfc: "\u{D707}",
-        nfd: "\u{1112}\u{1170}\u{11B2}",
-        nfkc: "\u{D707}",
-        nfkd: "\u{1112}\u{1170}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D708}",
-        nfc: "\u{D708}",
-        nfd: "\u{1112}\u{1170}\u{11B3}",
-        nfkc: "\u{D708}",
-        nfkd: "\u{1112}\u{1170}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D709}",
-        nfc: "\u{D709}",
-        nfd: "\u{1112}\u{1170}\u{11B4}",
-        nfkc: "\u{D709}",
-        nfkd: "\u{1112}\u{1170}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D70A}",
-        nfc: "\u{D70A}",
-        nfd: "\u{1112}\u{1170}\u{11B5}",
-        nfkc: "\u{D70A}",
-        nfkd: "\u{1112}\u{1170}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D70B}",
-        nfc: "\u{D70B}",
-        nfd: "\u{1112}\u{1170}\u{11B6}",
-        nfkc: "\u{D70B}",
-        nfkd: "\u{1112}\u{1170}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D70C}",
-        nfc: "\u{D70C}",
-        nfd: "\u{1112}\u{1170}\u{11B7}",
-        nfkc: "\u{D70C}",
-        nfkd: "\u{1112}\u{1170}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D70D}",
-        nfc: "\u{D70D}",
-        nfd: "\u{1112}\u{1170}\u{11B8}",
-        nfkc: "\u{D70D}",
-        nfkd: "\u{1112}\u{1170}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D70E}",
-        nfc: "\u{D70E}",
-        nfd: "\u{1112}\u{1170}\u{11B9}",
-        nfkc: "\u{D70E}",
-        nfkd: "\u{1112}\u{1170}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D70F}",
-        nfc: "\u{D70F}",
-        nfd: "\u{1112}\u{1170}\u{11BA}",
-        nfkc: "\u{D70F}",
-        nfkd: "\u{1112}\u{1170}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D710}",
-        nfc: "\u{D710}",
-        nfd: "\u{1112}\u{1170}\u{11BB}",
-        nfkc: "\u{D710}",
-        nfkd: "\u{1112}\u{1170}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D711}",
-        nfc: "\u{D711}",
-        nfd: "\u{1112}\u{1170}\u{11BC}",
-        nfkc: "\u{D711}",
-        nfkd: "\u{1112}\u{1170}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D712}",
-        nfc: "\u{D712}",
-        nfd: "\u{1112}\u{1170}\u{11BD}",
-        nfkc: "\u{D712}",
-        nfkd: "\u{1112}\u{1170}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D713}",
-        nfc: "\u{D713}",
-        nfd: "\u{1112}\u{1170}\u{11BE}",
-        nfkc: "\u{D713}",
-        nfkd: "\u{1112}\u{1170}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D714}",
-        nfc: "\u{D714}",
-        nfd: "\u{1112}\u{1170}\u{11BF}",
-        nfkc: "\u{D714}",
-        nfkd: "\u{1112}\u{1170}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D715}",
-        nfc: "\u{D715}",
-        nfd: "\u{1112}\u{1170}\u{11C0}",
-        nfkc: "\u{D715}",
-        nfkd: "\u{1112}\u{1170}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D716}",
-        nfc: "\u{D716}",
-        nfd: "\u{1112}\u{1170}\u{11C1}",
-        nfkc: "\u{D716}",
-        nfkd: "\u{1112}\u{1170}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D717}",
-        nfc: "\u{D717}",
-        nfd: "\u{1112}\u{1170}\u{11C2}",
-        nfkc: "\u{D717}",
-        nfkd: "\u{1112}\u{1170}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D718}",
-        nfc: "\u{D718}",
-        nfd: "\u{1112}\u{1171}",
-        nfkc: "\u{D718}",
-        nfkd: "\u{1112}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{D719}",
-        nfc: "\u{D719}",
-        nfd: "\u{1112}\u{1171}\u{11A8}",
-        nfkc: "\u{D719}",
-        nfkd: "\u{1112}\u{1171}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D71A}",
-        nfc: "\u{D71A}",
-        nfd: "\u{1112}\u{1171}\u{11A9}",
-        nfkc: "\u{D71A}",
-        nfkd: "\u{1112}\u{1171}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D71B}",
-        nfc: "\u{D71B}",
-        nfd: "\u{1112}\u{1171}\u{11AA}",
-        nfkc: "\u{D71B}",
-        nfkd: "\u{1112}\u{1171}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D71C}",
-        nfc: "\u{D71C}",
-        nfd: "\u{1112}\u{1171}\u{11AB}",
-        nfkc: "\u{D71C}",
-        nfkd: "\u{1112}\u{1171}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D71D}",
-        nfc: "\u{D71D}",
-        nfd: "\u{1112}\u{1171}\u{11AC}",
-        nfkc: "\u{D71D}",
-        nfkd: "\u{1112}\u{1171}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D71E}",
-        nfc: "\u{D71E}",
-        nfd: "\u{1112}\u{1171}\u{11AD}",
-        nfkc: "\u{D71E}",
-        nfkd: "\u{1112}\u{1171}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D71F}",
-        nfc: "\u{D71F}",
-        nfd: "\u{1112}\u{1171}\u{11AE}",
-        nfkc: "\u{D71F}",
-        nfkd: "\u{1112}\u{1171}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D720}",
-        nfc: "\u{D720}",
-        nfd: "\u{1112}\u{1171}\u{11AF}",
-        nfkc: "\u{D720}",
-        nfkd: "\u{1112}\u{1171}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D721}",
-        nfc: "\u{D721}",
-        nfd: "\u{1112}\u{1171}\u{11B0}",
-        nfkc: "\u{D721}",
-        nfkd: "\u{1112}\u{1171}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D722}",
-        nfc: "\u{D722}",
-        nfd: "\u{1112}\u{1171}\u{11B1}",
-        nfkc: "\u{D722}",
-        nfkd: "\u{1112}\u{1171}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D723}",
-        nfc: "\u{D723}",
-        nfd: "\u{1112}\u{1171}\u{11B2}",
-        nfkc: "\u{D723}",
-        nfkd: "\u{1112}\u{1171}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D724}",
-        nfc: "\u{D724}",
-        nfd: "\u{1112}\u{1171}\u{11B3}",
-        nfkc: "\u{D724}",
-        nfkd: "\u{1112}\u{1171}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D725}",
-        nfc: "\u{D725}",
-        nfd: "\u{1112}\u{1171}\u{11B4}",
-        nfkc: "\u{D725}",
-        nfkd: "\u{1112}\u{1171}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D726}",
-        nfc: "\u{D726}",
-        nfd: "\u{1112}\u{1171}\u{11B5}",
-        nfkc: "\u{D726}",
-        nfkd: "\u{1112}\u{1171}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D727}",
-        nfc: "\u{D727}",
-        nfd: "\u{1112}\u{1171}\u{11B6}",
-        nfkc: "\u{D727}",
-        nfkd: "\u{1112}\u{1171}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D728}",
-        nfc: "\u{D728}",
-        nfd: "\u{1112}\u{1171}\u{11B7}",
-        nfkc: "\u{D728}",
-        nfkd: "\u{1112}\u{1171}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D729}",
-        nfc: "\u{D729}",
-        nfd: "\u{1112}\u{1171}\u{11B8}",
-        nfkc: "\u{D729}",
-        nfkd: "\u{1112}\u{1171}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D72A}",
-        nfc: "\u{D72A}",
-        nfd: "\u{1112}\u{1171}\u{11B9}",
-        nfkc: "\u{D72A}",
-        nfkd: "\u{1112}\u{1171}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D72B}",
-        nfc: "\u{D72B}",
-        nfd: "\u{1112}\u{1171}\u{11BA}",
-        nfkc: "\u{D72B}",
-        nfkd: "\u{1112}\u{1171}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D72C}",
-        nfc: "\u{D72C}",
-        nfd: "\u{1112}\u{1171}\u{11BB}",
-        nfkc: "\u{D72C}",
-        nfkd: "\u{1112}\u{1171}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D72D}",
-        nfc: "\u{D72D}",
-        nfd: "\u{1112}\u{1171}\u{11BC}",
-        nfkc: "\u{D72D}",
-        nfkd: "\u{1112}\u{1171}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D72E}",
-        nfc: "\u{D72E}",
-        nfd: "\u{1112}\u{1171}\u{11BD}",
-        nfkc: "\u{D72E}",
-        nfkd: "\u{1112}\u{1171}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D72F}",
-        nfc: "\u{D72F}",
-        nfd: "\u{1112}\u{1171}\u{11BE}",
-        nfkc: "\u{D72F}",
-        nfkd: "\u{1112}\u{1171}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D730}",
-        nfc: "\u{D730}",
-        nfd: "\u{1112}\u{1171}\u{11BF}",
-        nfkc: "\u{D730}",
-        nfkd: "\u{1112}\u{1171}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D731}",
-        nfc: "\u{D731}",
-        nfd: "\u{1112}\u{1171}\u{11C0}",
-        nfkc: "\u{D731}",
-        nfkd: "\u{1112}\u{1171}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D732}",
-        nfc: "\u{D732}",
-        nfd: "\u{1112}\u{1171}\u{11C1}",
-        nfkc: "\u{D732}",
-        nfkd: "\u{1112}\u{1171}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D733}",
-        nfc: "\u{D733}",
-        nfd: "\u{1112}\u{1171}\u{11C2}",
-        nfkc: "\u{D733}",
-        nfkd: "\u{1112}\u{1171}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D734}",
-        nfc: "\u{D734}",
-        nfd: "\u{1112}\u{1172}",
-        nfkc: "\u{D734}",
-        nfkd: "\u{1112}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{D735}",
-        nfc: "\u{D735}",
-        nfd: "\u{1112}\u{1172}\u{11A8}",
-        nfkc: "\u{D735}",
-        nfkd: "\u{1112}\u{1172}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D736}",
-        nfc: "\u{D736}",
-        nfd: "\u{1112}\u{1172}\u{11A9}",
-        nfkc: "\u{D736}",
-        nfkd: "\u{1112}\u{1172}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D737}",
-        nfc: "\u{D737}",
-        nfd: "\u{1112}\u{1172}\u{11AA}",
-        nfkc: "\u{D737}",
-        nfkd: "\u{1112}\u{1172}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D738}",
-        nfc: "\u{D738}",
-        nfd: "\u{1112}\u{1172}\u{11AB}",
-        nfkc: "\u{D738}",
-        nfkd: "\u{1112}\u{1172}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D739}",
-        nfc: "\u{D739}",
-        nfd: "\u{1112}\u{1172}\u{11AC}",
-        nfkc: "\u{D739}",
-        nfkd: "\u{1112}\u{1172}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D73A}",
-        nfc: "\u{D73A}",
-        nfd: "\u{1112}\u{1172}\u{11AD}",
-        nfkc: "\u{D73A}",
-        nfkd: "\u{1112}\u{1172}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D73B}",
-        nfc: "\u{D73B}",
-        nfd: "\u{1112}\u{1172}\u{11AE}",
-        nfkc: "\u{D73B}",
-        nfkd: "\u{1112}\u{1172}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D73C}",
-        nfc: "\u{D73C}",
-        nfd: "\u{1112}\u{1172}\u{11AF}",
-        nfkc: "\u{D73C}",
-        nfkd: "\u{1112}\u{1172}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D73D}",
-        nfc: "\u{D73D}",
-        nfd: "\u{1112}\u{1172}\u{11B0}",
-        nfkc: "\u{D73D}",
-        nfkd: "\u{1112}\u{1172}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D73E}",
-        nfc: "\u{D73E}",
-        nfd: "\u{1112}\u{1172}\u{11B1}",
-        nfkc: "\u{D73E}",
-        nfkd: "\u{1112}\u{1172}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D73F}",
-        nfc: "\u{D73F}",
-        nfd: "\u{1112}\u{1172}\u{11B2}",
-        nfkc: "\u{D73F}",
-        nfkd: "\u{1112}\u{1172}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D740}",
-        nfc: "\u{D740}",
-        nfd: "\u{1112}\u{1172}\u{11B3}",
-        nfkc: "\u{D740}",
-        nfkd: "\u{1112}\u{1172}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D741}",
-        nfc: "\u{D741}",
-        nfd: "\u{1112}\u{1172}\u{11B4}",
-        nfkc: "\u{D741}",
-        nfkd: "\u{1112}\u{1172}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D742}",
-        nfc: "\u{D742}",
-        nfd: "\u{1112}\u{1172}\u{11B5}",
-        nfkc: "\u{D742}",
-        nfkd: "\u{1112}\u{1172}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D743}",
-        nfc: "\u{D743}",
-        nfd: "\u{1112}\u{1172}\u{11B6}",
-        nfkc: "\u{D743}",
-        nfkd: "\u{1112}\u{1172}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D744}",
-        nfc: "\u{D744}",
-        nfd: "\u{1112}\u{1172}\u{11B7}",
-        nfkc: "\u{D744}",
-        nfkd: "\u{1112}\u{1172}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D745}",
-        nfc: "\u{D745}",
-        nfd: "\u{1112}\u{1172}\u{11B8}",
-        nfkc: "\u{D745}",
-        nfkd: "\u{1112}\u{1172}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D746}",
-        nfc: "\u{D746}",
-        nfd: "\u{1112}\u{1172}\u{11B9}",
-        nfkc: "\u{D746}",
-        nfkd: "\u{1112}\u{1172}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D747}",
-        nfc: "\u{D747}",
-        nfd: "\u{1112}\u{1172}\u{11BA}",
-        nfkc: "\u{D747}",
-        nfkd: "\u{1112}\u{1172}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D748}",
-        nfc: "\u{D748}",
-        nfd: "\u{1112}\u{1172}\u{11BB}",
-        nfkc: "\u{D748}",
-        nfkd: "\u{1112}\u{1172}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D749}",
-        nfc: "\u{D749}",
-        nfd: "\u{1112}\u{1172}\u{11BC}",
-        nfkc: "\u{D749}",
-        nfkd: "\u{1112}\u{1172}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D74A}",
-        nfc: "\u{D74A}",
-        nfd: "\u{1112}\u{1172}\u{11BD}",
-        nfkc: "\u{D74A}",
-        nfkd: "\u{1112}\u{1172}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D74B}",
-        nfc: "\u{D74B}",
-        nfd: "\u{1112}\u{1172}\u{11BE}",
-        nfkc: "\u{D74B}",
-        nfkd: "\u{1112}\u{1172}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D74C}",
-        nfc: "\u{D74C}",
-        nfd: "\u{1112}\u{1172}\u{11BF}",
-        nfkc: "\u{D74C}",
-        nfkd: "\u{1112}\u{1172}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D74D}",
-        nfc: "\u{D74D}",
-        nfd: "\u{1112}\u{1172}\u{11C0}",
-        nfkc: "\u{D74D}",
-        nfkd: "\u{1112}\u{1172}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D74E}",
-        nfc: "\u{D74E}",
-        nfd: "\u{1112}\u{1172}\u{11C1}",
-        nfkc: "\u{D74E}",
-        nfkd: "\u{1112}\u{1172}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D74F}",
-        nfc: "\u{D74F}",
-        nfd: "\u{1112}\u{1172}\u{11C2}",
-        nfkc: "\u{D74F}",
-        nfkd: "\u{1112}\u{1172}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D750}",
-        nfc: "\u{D750}",
-        nfd: "\u{1112}\u{1173}",
-        nfkc: "\u{D750}",
-        nfkd: "\u{1112}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{D751}",
-        nfc: "\u{D751}",
-        nfd: "\u{1112}\u{1173}\u{11A8}",
-        nfkc: "\u{D751}",
-        nfkd: "\u{1112}\u{1173}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D752}",
-        nfc: "\u{D752}",
-        nfd: "\u{1112}\u{1173}\u{11A9}",
-        nfkc: "\u{D752}",
-        nfkd: "\u{1112}\u{1173}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D753}",
-        nfc: "\u{D753}",
-        nfd: "\u{1112}\u{1173}\u{11AA}",
-        nfkc: "\u{D753}",
-        nfkd: "\u{1112}\u{1173}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D754}",
-        nfc: "\u{D754}",
-        nfd: "\u{1112}\u{1173}\u{11AB}",
-        nfkc: "\u{D754}",
-        nfkd: "\u{1112}\u{1173}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D755}",
-        nfc: "\u{D755}",
-        nfd: "\u{1112}\u{1173}\u{11AC}",
-        nfkc: "\u{D755}",
-        nfkd: "\u{1112}\u{1173}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D756}",
-        nfc: "\u{D756}",
-        nfd: "\u{1112}\u{1173}\u{11AD}",
-        nfkc: "\u{D756}",
-        nfkd: "\u{1112}\u{1173}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D757}",
-        nfc: "\u{D757}",
-        nfd: "\u{1112}\u{1173}\u{11AE}",
-        nfkc: "\u{D757}",
-        nfkd: "\u{1112}\u{1173}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D758}",
-        nfc: "\u{D758}",
-        nfd: "\u{1112}\u{1173}\u{11AF}",
-        nfkc: "\u{D758}",
-        nfkd: "\u{1112}\u{1173}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D759}",
-        nfc: "\u{D759}",
-        nfd: "\u{1112}\u{1173}\u{11B0}",
-        nfkc: "\u{D759}",
-        nfkd: "\u{1112}\u{1173}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D75A}",
-        nfc: "\u{D75A}",
-        nfd: "\u{1112}\u{1173}\u{11B1}",
-        nfkc: "\u{D75A}",
-        nfkd: "\u{1112}\u{1173}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D75B}",
-        nfc: "\u{D75B}",
-        nfd: "\u{1112}\u{1173}\u{11B2}",
-        nfkc: "\u{D75B}",
-        nfkd: "\u{1112}\u{1173}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D75C}",
-        nfc: "\u{D75C}",
-        nfd: "\u{1112}\u{1173}\u{11B3}",
-        nfkc: "\u{D75C}",
-        nfkd: "\u{1112}\u{1173}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D75D}",
-        nfc: "\u{D75D}",
-        nfd: "\u{1112}\u{1173}\u{11B4}",
-        nfkc: "\u{D75D}",
-        nfkd: "\u{1112}\u{1173}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D75E}",
-        nfc: "\u{D75E}",
-        nfd: "\u{1112}\u{1173}\u{11B5}",
-        nfkc: "\u{D75E}",
-        nfkd: "\u{1112}\u{1173}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D75F}",
-        nfc: "\u{D75F}",
-        nfd: "\u{1112}\u{1173}\u{11B6}",
-        nfkc: "\u{D75F}",
-        nfkd: "\u{1112}\u{1173}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D760}",
-        nfc: "\u{D760}",
-        nfd: "\u{1112}\u{1173}\u{11B7}",
-        nfkc: "\u{D760}",
-        nfkd: "\u{1112}\u{1173}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D761}",
-        nfc: "\u{D761}",
-        nfd: "\u{1112}\u{1173}\u{11B8}",
-        nfkc: "\u{D761}",
-        nfkd: "\u{1112}\u{1173}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D762}",
-        nfc: "\u{D762}",
-        nfd: "\u{1112}\u{1173}\u{11B9}",
-        nfkc: "\u{D762}",
-        nfkd: "\u{1112}\u{1173}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D763}",
-        nfc: "\u{D763}",
-        nfd: "\u{1112}\u{1173}\u{11BA}",
-        nfkc: "\u{D763}",
-        nfkd: "\u{1112}\u{1173}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D764}",
-        nfc: "\u{D764}",
-        nfd: "\u{1112}\u{1173}\u{11BB}",
-        nfkc: "\u{D764}",
-        nfkd: "\u{1112}\u{1173}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D765}",
-        nfc: "\u{D765}",
-        nfd: "\u{1112}\u{1173}\u{11BC}",
-        nfkc: "\u{D765}",
-        nfkd: "\u{1112}\u{1173}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D766}",
-        nfc: "\u{D766}",
-        nfd: "\u{1112}\u{1173}\u{11BD}",
-        nfkc: "\u{D766}",
-        nfkd: "\u{1112}\u{1173}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D767}",
-        nfc: "\u{D767}",
-        nfd: "\u{1112}\u{1173}\u{11BE}",
-        nfkc: "\u{D767}",
-        nfkd: "\u{1112}\u{1173}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D768}",
-        nfc: "\u{D768}",
-        nfd: "\u{1112}\u{1173}\u{11BF}",
-        nfkc: "\u{D768}",
-        nfkd: "\u{1112}\u{1173}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D769}",
-        nfc: "\u{D769}",
-        nfd: "\u{1112}\u{1173}\u{11C0}",
-        nfkc: "\u{D769}",
-        nfkd: "\u{1112}\u{1173}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D76A}",
-        nfc: "\u{D76A}",
-        nfd: "\u{1112}\u{1173}\u{11C1}",
-        nfkc: "\u{D76A}",
-        nfkd: "\u{1112}\u{1173}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D76B}",
-        nfc: "\u{D76B}",
-        nfd: "\u{1112}\u{1173}\u{11C2}",
-        nfkc: "\u{D76B}",
-        nfkd: "\u{1112}\u{1173}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D76C}",
-        nfc: "\u{D76C}",
-        nfd: "\u{1112}\u{1174}",
-        nfkc: "\u{D76C}",
-        nfkd: "\u{1112}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{D76D}",
-        nfc: "\u{D76D}",
-        nfd: "\u{1112}\u{1174}\u{11A8}",
-        nfkc: "\u{D76D}",
-        nfkd: "\u{1112}\u{1174}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D76E}",
-        nfc: "\u{D76E}",
-        nfd: "\u{1112}\u{1174}\u{11A9}",
-        nfkc: "\u{D76E}",
-        nfkd: "\u{1112}\u{1174}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D76F}",
-        nfc: "\u{D76F}",
-        nfd: "\u{1112}\u{1174}\u{11AA}",
-        nfkc: "\u{D76F}",
-        nfkd: "\u{1112}\u{1174}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D770}",
-        nfc: "\u{D770}",
-        nfd: "\u{1112}\u{1174}\u{11AB}",
-        nfkc: "\u{D770}",
-        nfkd: "\u{1112}\u{1174}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D771}",
-        nfc: "\u{D771}",
-        nfd: "\u{1112}\u{1174}\u{11AC}",
-        nfkc: "\u{D771}",
-        nfkd: "\u{1112}\u{1174}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D772}",
-        nfc: "\u{D772}",
-        nfd: "\u{1112}\u{1174}\u{11AD}",
-        nfkc: "\u{D772}",
-        nfkd: "\u{1112}\u{1174}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D773}",
-        nfc: "\u{D773}",
-        nfd: "\u{1112}\u{1174}\u{11AE}",
-        nfkc: "\u{D773}",
-        nfkd: "\u{1112}\u{1174}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D774}",
-        nfc: "\u{D774}",
-        nfd: "\u{1112}\u{1174}\u{11AF}",
-        nfkc: "\u{D774}",
-        nfkd: "\u{1112}\u{1174}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D775}",
-        nfc: "\u{D775}",
-        nfd: "\u{1112}\u{1174}\u{11B0}",
-        nfkc: "\u{D775}",
-        nfkd: "\u{1112}\u{1174}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D776}",
-        nfc: "\u{D776}",
-        nfd: "\u{1112}\u{1174}\u{11B1}",
-        nfkc: "\u{D776}",
-        nfkd: "\u{1112}\u{1174}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D777}",
-        nfc: "\u{D777}",
-        nfd: "\u{1112}\u{1174}\u{11B2}",
-        nfkc: "\u{D777}",
-        nfkd: "\u{1112}\u{1174}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D778}",
-        nfc: "\u{D778}",
-        nfd: "\u{1112}\u{1174}\u{11B3}",
-        nfkc: "\u{D778}",
-        nfkd: "\u{1112}\u{1174}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D779}",
-        nfc: "\u{D779}",
-        nfd: "\u{1112}\u{1174}\u{11B4}",
-        nfkc: "\u{D779}",
-        nfkd: "\u{1112}\u{1174}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D77A}",
-        nfc: "\u{D77A}",
-        nfd: "\u{1112}\u{1174}\u{11B5}",
-        nfkc: "\u{D77A}",
-        nfkd: "\u{1112}\u{1174}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D77B}",
-        nfc: "\u{D77B}",
-        nfd: "\u{1112}\u{1174}\u{11B6}",
-        nfkc: "\u{D77B}",
-        nfkd: "\u{1112}\u{1174}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D77C}",
-        nfc: "\u{D77C}",
-        nfd: "\u{1112}\u{1174}\u{11B7}",
-        nfkc: "\u{D77C}",
-        nfkd: "\u{1112}\u{1174}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D77D}",
-        nfc: "\u{D77D}",
-        nfd: "\u{1112}\u{1174}\u{11B8}",
-        nfkc: "\u{D77D}",
-        nfkd: "\u{1112}\u{1174}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D77E}",
-        nfc: "\u{D77E}",
-        nfd: "\u{1112}\u{1174}\u{11B9}",
-        nfkc: "\u{D77E}",
-        nfkd: "\u{1112}\u{1174}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D77F}",
-        nfc: "\u{D77F}",
-        nfd: "\u{1112}\u{1174}\u{11BA}",
-        nfkc: "\u{D77F}",
-        nfkd: "\u{1112}\u{1174}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D780}",
-        nfc: "\u{D780}",
-        nfd: "\u{1112}\u{1174}\u{11BB}",
-        nfkc: "\u{D780}",
-        nfkd: "\u{1112}\u{1174}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D781}",
-        nfc: "\u{D781}",
-        nfd: "\u{1112}\u{1174}\u{11BC}",
-        nfkc: "\u{D781}",
-        nfkd: "\u{1112}\u{1174}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D782}",
-        nfc: "\u{D782}",
-        nfd: "\u{1112}\u{1174}\u{11BD}",
-        nfkc: "\u{D782}",
-        nfkd: "\u{1112}\u{1174}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D783}",
-        nfc: "\u{D783}",
-        nfd: "\u{1112}\u{1174}\u{11BE}",
-        nfkc: "\u{D783}",
-        nfkd: "\u{1112}\u{1174}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D784}",
-        nfc: "\u{D784}",
-        nfd: "\u{1112}\u{1174}\u{11BF}",
-        nfkc: "\u{D784}",
-        nfkd: "\u{1112}\u{1174}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D785}",
-        nfc: "\u{D785}",
-        nfd: "\u{1112}\u{1174}\u{11C0}",
-        nfkc: "\u{D785}",
-        nfkd: "\u{1112}\u{1174}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D786}",
-        nfc: "\u{D786}",
-        nfd: "\u{1112}\u{1174}\u{11C1}",
-        nfkc: "\u{D786}",
-        nfkd: "\u{1112}\u{1174}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D787}",
-        nfc: "\u{D787}",
-        nfd: "\u{1112}\u{1174}\u{11C2}",
-        nfkc: "\u{D787}",
-        nfkd: "\u{1112}\u{1174}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{D788}",
-        nfc: "\u{D788}",
-        nfd: "\u{1112}\u{1175}",
-        nfkc: "\u{D788}",
-        nfkd: "\u{1112}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{D789}",
-        nfc: "\u{D789}",
-        nfd: "\u{1112}\u{1175}\u{11A8}",
-        nfkc: "\u{D789}",
-        nfkd: "\u{1112}\u{1175}\u{11A8}",
-    },
-    NormalizationTest {
-        source: "\u{D78A}",
-        nfc: "\u{D78A}",
-        nfd: "\u{1112}\u{1175}\u{11A9}",
-        nfkc: "\u{D78A}",
-        nfkd: "\u{1112}\u{1175}\u{11A9}",
-    },
-    NormalizationTest {
-        source: "\u{D78B}",
-        nfc: "\u{D78B}",
-        nfd: "\u{1112}\u{1175}\u{11AA}",
-        nfkc: "\u{D78B}",
-        nfkd: "\u{1112}\u{1175}\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{D78C}",
-        nfc: "\u{D78C}",
-        nfd: "\u{1112}\u{1175}\u{11AB}",
-        nfkc: "\u{D78C}",
-        nfkd: "\u{1112}\u{1175}\u{11AB}",
-    },
-    NormalizationTest {
-        source: "\u{D78D}",
-        nfc: "\u{D78D}",
-        nfd: "\u{1112}\u{1175}\u{11AC}",
-        nfkc: "\u{D78D}",
-        nfkd: "\u{1112}\u{1175}\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{D78E}",
-        nfc: "\u{D78E}",
-        nfd: "\u{1112}\u{1175}\u{11AD}",
-        nfkc: "\u{D78E}",
-        nfkd: "\u{1112}\u{1175}\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{D78F}",
-        nfc: "\u{D78F}",
-        nfd: "\u{1112}\u{1175}\u{11AE}",
-        nfkc: "\u{D78F}",
-        nfkd: "\u{1112}\u{1175}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D790}",
-        nfc: "\u{D790}",
-        nfd: "\u{1112}\u{1175}\u{11AF}",
-        nfkc: "\u{D790}",
-        nfkd: "\u{1112}\u{1175}\u{11AF}",
-    },
-    NormalizationTest {
-        source: "\u{D791}",
-        nfc: "\u{D791}",
-        nfd: "\u{1112}\u{1175}\u{11B0}",
-        nfkc: "\u{D791}",
-        nfkd: "\u{1112}\u{1175}\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{D792}",
-        nfc: "\u{D792}",
-        nfd: "\u{1112}\u{1175}\u{11B1}",
-        nfkc: "\u{D792}",
-        nfkd: "\u{1112}\u{1175}\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{D793}",
-        nfc: "\u{D793}",
-        nfd: "\u{1112}\u{1175}\u{11B2}",
-        nfkc: "\u{D793}",
-        nfkd: "\u{1112}\u{1175}\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{D794}",
-        nfc: "\u{D794}",
-        nfd: "\u{1112}\u{1175}\u{11B3}",
-        nfkc: "\u{D794}",
-        nfkd: "\u{1112}\u{1175}\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{D795}",
-        nfc: "\u{D795}",
-        nfd: "\u{1112}\u{1175}\u{11B4}",
-        nfkc: "\u{D795}",
-        nfkd: "\u{1112}\u{1175}\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{D796}",
-        nfc: "\u{D796}",
-        nfd: "\u{1112}\u{1175}\u{11B5}",
-        nfkc: "\u{D796}",
-        nfkd: "\u{1112}\u{1175}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D797}",
-        nfc: "\u{D797}",
-        nfd: "\u{1112}\u{1175}\u{11B6}",
-        nfkc: "\u{D797}",
-        nfkd: "\u{1112}\u{1175}\u{11B6}",
-    },
-    NormalizationTest {
-        source: "\u{D798}",
-        nfc: "\u{D798}",
-        nfd: "\u{1112}\u{1175}\u{11B7}",
-        nfkc: "\u{D798}",
-        nfkd: "\u{1112}\u{1175}\u{11B7}",
-    },
-    NormalizationTest {
-        source: "\u{D799}",
-        nfc: "\u{D799}",
-        nfd: "\u{1112}\u{1175}\u{11B8}",
-        nfkc: "\u{D799}",
-        nfkd: "\u{1112}\u{1175}\u{11B8}",
-    },
-    NormalizationTest {
-        source: "\u{D79A}",
-        nfc: "\u{D79A}",
-        nfd: "\u{1112}\u{1175}\u{11B9}",
-        nfkc: "\u{D79A}",
-        nfkd: "\u{1112}\u{1175}\u{11B9}",
-    },
-    NormalizationTest {
-        source: "\u{D79B}",
-        nfc: "\u{D79B}",
-        nfd: "\u{1112}\u{1175}\u{11BA}",
-        nfkc: "\u{D79B}",
-        nfkd: "\u{1112}\u{1175}\u{11BA}",
-    },
-    NormalizationTest {
-        source: "\u{D79C}",
-        nfc: "\u{D79C}",
-        nfd: "\u{1112}\u{1175}\u{11BB}",
-        nfkc: "\u{D79C}",
-        nfkd: "\u{1112}\u{1175}\u{11BB}",
-    },
-    NormalizationTest {
-        source: "\u{D79D}",
-        nfc: "\u{D79D}",
-        nfd: "\u{1112}\u{1175}\u{11BC}",
-        nfkc: "\u{D79D}",
-        nfkd: "\u{1112}\u{1175}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D79E}",
-        nfc: "\u{D79E}",
-        nfd: "\u{1112}\u{1175}\u{11BD}",
-        nfkc: "\u{D79E}",
-        nfkd: "\u{1112}\u{1175}\u{11BD}",
-    },
-    NormalizationTest {
-        source: "\u{D79F}",
-        nfc: "\u{D79F}",
-        nfd: "\u{1112}\u{1175}\u{11BE}",
-        nfkc: "\u{D79F}",
-        nfkd: "\u{1112}\u{1175}\u{11BE}",
-    },
-    NormalizationTest {
-        source: "\u{D7A0}",
-        nfc: "\u{D7A0}",
-        nfd: "\u{1112}\u{1175}\u{11BF}",
-        nfkc: "\u{D7A0}",
-        nfkd: "\u{1112}\u{1175}\u{11BF}",
-    },
-    NormalizationTest {
-        source: "\u{D7A1}",
-        nfc: "\u{D7A1}",
-        nfd: "\u{1112}\u{1175}\u{11C0}",
-        nfkc: "\u{D7A1}",
-        nfkd: "\u{1112}\u{1175}\u{11C0}",
-    },
-    NormalizationTest {
-        source: "\u{D7A2}",
-        nfc: "\u{D7A2}",
-        nfd: "\u{1112}\u{1175}\u{11C1}",
-        nfkc: "\u{D7A2}",
-        nfkd: "\u{1112}\u{1175}\u{11C1}",
-    },
-    NormalizationTest {
-        source: "\u{D7A3}",
-        nfc: "\u{D7A3}",
-        nfd: "\u{1112}\u{1175}\u{11C2}",
-        nfkc: "\u{D7A3}",
-        nfkd: "\u{1112}\u{1175}\u{11C2}",
-    },
-    NormalizationTest {
-        source: "\u{F900}",
-        nfc: "\u{8C48}",
-        nfd: "\u{8C48}",
-        nfkc: "\u{8C48}",
-        nfkd: "\u{8C48}",
-    },
-    NormalizationTest {
-        source: "\u{F901}",
-        nfc: "\u{66F4}",
-        nfd: "\u{66F4}",
-        nfkc: "\u{66F4}",
-        nfkd: "\u{66F4}",
-    },
-    NormalizationTest {
-        source: "\u{F902}",
-        nfc: "\u{8ECA}",
-        nfd: "\u{8ECA}",
-        nfkc: "\u{8ECA}",
-        nfkd: "\u{8ECA}",
-    },
-    NormalizationTest {
-        source: "\u{F903}",
-        nfc: "\u{8CC8}",
-        nfd: "\u{8CC8}",
-        nfkc: "\u{8CC8}",
-        nfkd: "\u{8CC8}",
-    },
-    NormalizationTest {
-        source: "\u{F904}",
-        nfc: "\u{6ED1}",
-        nfd: "\u{6ED1}",
-        nfkc: "\u{6ED1}",
-        nfkd: "\u{6ED1}",
-    },
-    NormalizationTest {
-        source: "\u{F905}",
-        nfc: "\u{4E32}",
-        nfd: "\u{4E32}",
-        nfkc: "\u{4E32}",
-        nfkd: "\u{4E32}",
-    },
-    NormalizationTest {
-        source: "\u{F906}",
-        nfc: "\u{53E5}",
-        nfd: "\u{53E5}",
-        nfkc: "\u{53E5}",
-        nfkd: "\u{53E5}",
-    },
-    NormalizationTest {
-        source: "\u{F907}",
-        nfc: "\u{9F9C}",
-        nfd: "\u{9F9C}",
-        nfkc: "\u{9F9C}",
-        nfkd: "\u{9F9C}",
-    },
-    NormalizationTest {
-        source: "\u{F908}",
-        nfc: "\u{9F9C}",
-        nfd: "\u{9F9C}",
-        nfkc: "\u{9F9C}",
-        nfkd: "\u{9F9C}",
-    },
-    NormalizationTest {
-        source: "\u{F909}",
-        nfc: "\u{5951}",
-        nfd: "\u{5951}",
-        nfkc: "\u{5951}",
-        nfkd: "\u{5951}",
-    },
-    NormalizationTest {
-        source: "\u{F90A}",
-        nfc: "\u{91D1}",
-        nfd: "\u{91D1}",
-        nfkc: "\u{91D1}",
-        nfkd: "\u{91D1}",
-    },
-    NormalizationTest {
-        source: "\u{F90B}",
-        nfc: "\u{5587}",
-        nfd: "\u{5587}",
-        nfkc: "\u{5587}",
-        nfkd: "\u{5587}",
-    },
-    NormalizationTest {
-        source: "\u{F90C}",
-        nfc: "\u{5948}",
-        nfd: "\u{5948}",
-        nfkc: "\u{5948}",
-        nfkd: "\u{5948}",
-    },
-    NormalizationTest {
-        source: "\u{F90D}",
-        nfc: "\u{61F6}",
-        nfd: "\u{61F6}",
-        nfkc: "\u{61F6}",
-        nfkd: "\u{61F6}",
-    },
-    NormalizationTest {
-        source: "\u{F90E}",
-        nfc: "\u{7669}",
-        nfd: "\u{7669}",
-        nfkc: "\u{7669}",
-        nfkd: "\u{7669}",
-    },
-    NormalizationTest {
-        source: "\u{F90F}",
-        nfc: "\u{7F85}",
-        nfd: "\u{7F85}",
-        nfkc: "\u{7F85}",
-        nfkd: "\u{7F85}",
-    },
-    NormalizationTest {
-        source: "\u{F910}",
-        nfc: "\u{863F}",
-        nfd: "\u{863F}",
-        nfkc: "\u{863F}",
-        nfkd: "\u{863F}",
-    },
-    NormalizationTest {
-        source: "\u{F911}",
-        nfc: "\u{87BA}",
-        nfd: "\u{87BA}",
-        nfkc: "\u{87BA}",
-        nfkd: "\u{87BA}",
-    },
-    NormalizationTest {
-        source: "\u{F912}",
-        nfc: "\u{88F8}",
-        nfd: "\u{88F8}",
-        nfkc: "\u{88F8}",
-        nfkd: "\u{88F8}",
-    },
-    NormalizationTest {
-        source: "\u{F913}",
-        nfc: "\u{908F}",
-        nfd: "\u{908F}",
-        nfkc: "\u{908F}",
-        nfkd: "\u{908F}",
-    },
-    NormalizationTest {
-        source: "\u{F914}",
-        nfc: "\u{6A02}",
-        nfd: "\u{6A02}",
-        nfkc: "\u{6A02}",
-        nfkd: "\u{6A02}",
-    },
-    NormalizationTest {
-        source: "\u{F915}",
-        nfc: "\u{6D1B}",
-        nfd: "\u{6D1B}",
-        nfkc: "\u{6D1B}",
-        nfkd: "\u{6D1B}",
-    },
-    NormalizationTest {
-        source: "\u{F916}",
-        nfc: "\u{70D9}",
-        nfd: "\u{70D9}",
-        nfkc: "\u{70D9}",
-        nfkd: "\u{70D9}",
-    },
-    NormalizationTest {
-        source: "\u{F917}",
-        nfc: "\u{73DE}",
-        nfd: "\u{73DE}",
-        nfkc: "\u{73DE}",
-        nfkd: "\u{73DE}",
-    },
-    NormalizationTest {
-        source: "\u{F918}",
-        nfc: "\u{843D}",
-        nfd: "\u{843D}",
-        nfkc: "\u{843D}",
-        nfkd: "\u{843D}",
-    },
-    NormalizationTest {
-        source: "\u{F919}",
-        nfc: "\u{916A}",
-        nfd: "\u{916A}",
-        nfkc: "\u{916A}",
-        nfkd: "\u{916A}",
-    },
-    NormalizationTest {
-        source: "\u{F91A}",
-        nfc: "\u{99F1}",
-        nfd: "\u{99F1}",
-        nfkc: "\u{99F1}",
-        nfkd: "\u{99F1}",
-    },
-    NormalizationTest {
-        source: "\u{F91B}",
-        nfc: "\u{4E82}",
-        nfd: "\u{4E82}",
-        nfkc: "\u{4E82}",
-        nfkd: "\u{4E82}",
-    },
-    NormalizationTest {
-        source: "\u{F91C}",
-        nfc: "\u{5375}",
-        nfd: "\u{5375}",
-        nfkc: "\u{5375}",
-        nfkd: "\u{5375}",
-    },
-    NormalizationTest {
-        source: "\u{F91D}",
-        nfc: "\u{6B04}",
-        nfd: "\u{6B04}",
-        nfkc: "\u{6B04}",
-        nfkd: "\u{6B04}",
-    },
-    NormalizationTest {
-        source: "\u{F91E}",
-        nfc: "\u{721B}",
-        nfd: "\u{721B}",
-        nfkc: "\u{721B}",
-        nfkd: "\u{721B}",
-    },
-    NormalizationTest {
-        source: "\u{F91F}",
-        nfc: "\u{862D}",
-        nfd: "\u{862D}",
-        nfkc: "\u{862D}",
-        nfkd: "\u{862D}",
-    },
-    NormalizationTest {
-        source: "\u{F920}",
-        nfc: "\u{9E1E}",
-        nfd: "\u{9E1E}",
-        nfkc: "\u{9E1E}",
-        nfkd: "\u{9E1E}",
-    },
-    NormalizationTest {
-        source: "\u{F921}",
-        nfc: "\u{5D50}",
-        nfd: "\u{5D50}",
-        nfkc: "\u{5D50}",
-        nfkd: "\u{5D50}",
-    },
-    NormalizationTest {
-        source: "\u{F922}",
-        nfc: "\u{6FEB}",
-        nfd: "\u{6FEB}",
-        nfkc: "\u{6FEB}",
-        nfkd: "\u{6FEB}",
-    },
-    NormalizationTest {
-        source: "\u{F923}",
-        nfc: "\u{85CD}",
-        nfd: "\u{85CD}",
-        nfkc: "\u{85CD}",
-        nfkd: "\u{85CD}",
-    },
-    NormalizationTest {
-        source: "\u{F924}",
-        nfc: "\u{8964}",
-        nfd: "\u{8964}",
-        nfkc: "\u{8964}",
-        nfkd: "\u{8964}",
-    },
-    NormalizationTest {
-        source: "\u{F925}",
-        nfc: "\u{62C9}",
-        nfd: "\u{62C9}",
-        nfkc: "\u{62C9}",
-        nfkd: "\u{62C9}",
-    },
-    NormalizationTest {
-        source: "\u{F926}",
-        nfc: "\u{81D8}",
-        nfd: "\u{81D8}",
-        nfkc: "\u{81D8}",
-        nfkd: "\u{81D8}",
-    },
-    NormalizationTest {
-        source: "\u{F927}",
-        nfc: "\u{881F}",
-        nfd: "\u{881F}",
-        nfkc: "\u{881F}",
-        nfkd: "\u{881F}",
-    },
-    NormalizationTest {
-        source: "\u{F928}",
-        nfc: "\u{5ECA}",
-        nfd: "\u{5ECA}",
-        nfkc: "\u{5ECA}",
-        nfkd: "\u{5ECA}",
-    },
-    NormalizationTest {
-        source: "\u{F929}",
-        nfc: "\u{6717}",
-        nfd: "\u{6717}",
-        nfkc: "\u{6717}",
-        nfkd: "\u{6717}",
-    },
-    NormalizationTest {
-        source: "\u{F92A}",
-        nfc: "\u{6D6A}",
-        nfd: "\u{6D6A}",
-        nfkc: "\u{6D6A}",
-        nfkd: "\u{6D6A}",
-    },
-    NormalizationTest {
-        source: "\u{F92B}",
-        nfc: "\u{72FC}",
-        nfd: "\u{72FC}",
-        nfkc: "\u{72FC}",
-        nfkd: "\u{72FC}",
-    },
-    NormalizationTest {
-        source: "\u{F92C}",
-        nfc: "\u{90CE}",
-        nfd: "\u{90CE}",
-        nfkc: "\u{90CE}",
-        nfkd: "\u{90CE}",
-    },
-    NormalizationTest {
-        source: "\u{F92D}",
-        nfc: "\u{4F86}",
-        nfd: "\u{4F86}",
-        nfkc: "\u{4F86}",
-        nfkd: "\u{4F86}",
-    },
-    NormalizationTest {
-        source: "\u{F92E}",
-        nfc: "\u{51B7}",
-        nfd: "\u{51B7}",
-        nfkc: "\u{51B7}",
-        nfkd: "\u{51B7}",
-    },
-    NormalizationTest {
-        source: "\u{F92F}",
-        nfc: "\u{52DE}",
-        nfd: "\u{52DE}",
-        nfkc: "\u{52DE}",
-        nfkd: "\u{52DE}",
-    },
-    NormalizationTest {
-        source: "\u{F930}",
-        nfc: "\u{64C4}",
-        nfd: "\u{64C4}",
-        nfkc: "\u{64C4}",
-        nfkd: "\u{64C4}",
-    },
-    NormalizationTest {
-        source: "\u{F931}",
-        nfc: "\u{6AD3}",
-        nfd: "\u{6AD3}",
-        nfkc: "\u{6AD3}",
-        nfkd: "\u{6AD3}",
-    },
-    NormalizationTest {
-        source: "\u{F932}",
-        nfc: "\u{7210}",
-        nfd: "\u{7210}",
-        nfkc: "\u{7210}",
-        nfkd: "\u{7210}",
-    },
-    NormalizationTest {
-        source: "\u{F933}",
-        nfc: "\u{76E7}",
-        nfd: "\u{76E7}",
-        nfkc: "\u{76E7}",
-        nfkd: "\u{76E7}",
-    },
-    NormalizationTest {
-        source: "\u{F934}",
-        nfc: "\u{8001}",
-        nfd: "\u{8001}",
-        nfkc: "\u{8001}",
-        nfkd: "\u{8001}",
-    },
-    NormalizationTest {
-        source: "\u{F935}",
-        nfc: "\u{8606}",
-        nfd: "\u{8606}",
-        nfkc: "\u{8606}",
-        nfkd: "\u{8606}",
-    },
-    NormalizationTest {
-        source: "\u{F936}",
-        nfc: "\u{865C}",
-        nfd: "\u{865C}",
-        nfkc: "\u{865C}",
-        nfkd: "\u{865C}",
-    },
-    NormalizationTest {
-        source: "\u{F937}",
-        nfc: "\u{8DEF}",
-        nfd: "\u{8DEF}",
-        nfkc: "\u{8DEF}",
-        nfkd: "\u{8DEF}",
-    },
-    NormalizationTest {
-        source: "\u{F938}",
-        nfc: "\u{9732}",
-        nfd: "\u{9732}",
-        nfkc: "\u{9732}",
-        nfkd: "\u{9732}",
-    },
-    NormalizationTest {
-        source: "\u{F939}",
-        nfc: "\u{9B6F}",
-        nfd: "\u{9B6F}",
-        nfkc: "\u{9B6F}",
-        nfkd: "\u{9B6F}",
-    },
-    NormalizationTest {
-        source: "\u{F93A}",
-        nfc: "\u{9DFA}",
-        nfd: "\u{9DFA}",
-        nfkc: "\u{9DFA}",
-        nfkd: "\u{9DFA}",
-    },
-    NormalizationTest {
-        source: "\u{F93B}",
-        nfc: "\u{788C}",
-        nfd: "\u{788C}",
-        nfkc: "\u{788C}",
-        nfkd: "\u{788C}",
-    },
-    NormalizationTest {
-        source: "\u{F93C}",
-        nfc: "\u{797F}",
-        nfd: "\u{797F}",
-        nfkc: "\u{797F}",
-        nfkd: "\u{797F}",
-    },
-    NormalizationTest {
-        source: "\u{F93D}",
-        nfc: "\u{7DA0}",
-        nfd: "\u{7DA0}",
-        nfkc: "\u{7DA0}",
-        nfkd: "\u{7DA0}",
-    },
-    NormalizationTest {
-        source: "\u{F93E}",
-        nfc: "\u{83C9}",
-        nfd: "\u{83C9}",
-        nfkc: "\u{83C9}",
-        nfkd: "\u{83C9}",
-    },
-    NormalizationTest {
-        source: "\u{F93F}",
-        nfc: "\u{9304}",
-        nfd: "\u{9304}",
-        nfkc: "\u{9304}",
-        nfkd: "\u{9304}",
-    },
-    NormalizationTest {
-        source: "\u{F940}",
-        nfc: "\u{9E7F}",
-        nfd: "\u{9E7F}",
-        nfkc: "\u{9E7F}",
-        nfkd: "\u{9E7F}",
-    },
-    NormalizationTest {
-        source: "\u{F941}",
-        nfc: "\u{8AD6}",
-        nfd: "\u{8AD6}",
-        nfkc: "\u{8AD6}",
-        nfkd: "\u{8AD6}",
-    },
-    NormalizationTest {
-        source: "\u{F942}",
-        nfc: "\u{58DF}",
-        nfd: "\u{58DF}",
-        nfkc: "\u{58DF}",
-        nfkd: "\u{58DF}",
-    },
-    NormalizationTest {
-        source: "\u{F943}",
-        nfc: "\u{5F04}",
-        nfd: "\u{5F04}",
-        nfkc: "\u{5F04}",
-        nfkd: "\u{5F04}",
-    },
-    NormalizationTest {
-        source: "\u{F944}",
-        nfc: "\u{7C60}",
-        nfd: "\u{7C60}",
-        nfkc: "\u{7C60}",
-        nfkd: "\u{7C60}",
-    },
-    NormalizationTest {
-        source: "\u{F945}",
-        nfc: "\u{807E}",
-        nfd: "\u{807E}",
-        nfkc: "\u{807E}",
-        nfkd: "\u{807E}",
-    },
-    NormalizationTest {
-        source: "\u{F946}",
-        nfc: "\u{7262}",
-        nfd: "\u{7262}",
-        nfkc: "\u{7262}",
-        nfkd: "\u{7262}",
-    },
-    NormalizationTest {
-        source: "\u{F947}",
-        nfc: "\u{78CA}",
-        nfd: "\u{78CA}",
-        nfkc: "\u{78CA}",
-        nfkd: "\u{78CA}",
-    },
-    NormalizationTest {
-        source: "\u{F948}",
-        nfc: "\u{8CC2}",
-        nfd: "\u{8CC2}",
-        nfkc: "\u{8CC2}",
-        nfkd: "\u{8CC2}",
-    },
-    NormalizationTest {
-        source: "\u{F949}",
-        nfc: "\u{96F7}",
-        nfd: "\u{96F7}",
-        nfkc: "\u{96F7}",
-        nfkd: "\u{96F7}",
-    },
-    NormalizationTest {
-        source: "\u{F94A}",
-        nfc: "\u{58D8}",
-        nfd: "\u{58D8}",
-        nfkc: "\u{58D8}",
-        nfkd: "\u{58D8}",
-    },
-    NormalizationTest {
-        source: "\u{F94B}",
-        nfc: "\u{5C62}",
-        nfd: "\u{5C62}",
-        nfkc: "\u{5C62}",
-        nfkd: "\u{5C62}",
-    },
-    NormalizationTest {
-        source: "\u{F94C}",
-        nfc: "\u{6A13}",
-        nfd: "\u{6A13}",
-        nfkc: "\u{6A13}",
-        nfkd: "\u{6A13}",
-    },
-    NormalizationTest {
-        source: "\u{F94D}",
-        nfc: "\u{6DDA}",
-        nfd: "\u{6DDA}",
-        nfkc: "\u{6DDA}",
-        nfkd: "\u{6DDA}",
-    },
-    NormalizationTest {
-        source: "\u{F94E}",
-        nfc: "\u{6F0F}",
-        nfd: "\u{6F0F}",
-        nfkc: "\u{6F0F}",
-        nfkd: "\u{6F0F}",
-    },
-    NormalizationTest {
-        source: "\u{F94F}",
-        nfc: "\u{7D2F}",
-        nfd: "\u{7D2F}",
-        nfkc: "\u{7D2F}",
-        nfkd: "\u{7D2F}",
-    },
-    NormalizationTest {
-        source: "\u{F950}",
-        nfc: "\u{7E37}",
-        nfd: "\u{7E37}",
-        nfkc: "\u{7E37}",
-        nfkd: "\u{7E37}",
-    },
-    NormalizationTest {
-        source: "\u{F951}",
-        nfc: "\u{964B}",
-        nfd: "\u{964B}",
-        nfkc: "\u{964B}",
-        nfkd: "\u{964B}",
-    },
-    NormalizationTest {
-        source: "\u{F952}",
-        nfc: "\u{52D2}",
-        nfd: "\u{52D2}",
-        nfkc: "\u{52D2}",
-        nfkd: "\u{52D2}",
-    },
-    NormalizationTest {
-        source: "\u{F953}",
-        nfc: "\u{808B}",
-        nfd: "\u{808B}",
-        nfkc: "\u{808B}",
-        nfkd: "\u{808B}",
-    },
-    NormalizationTest {
-        source: "\u{F954}",
-        nfc: "\u{51DC}",
-        nfd: "\u{51DC}",
-        nfkc: "\u{51DC}",
-        nfkd: "\u{51DC}",
-    },
-    NormalizationTest {
-        source: "\u{F955}",
-        nfc: "\u{51CC}",
-        nfd: "\u{51CC}",
-        nfkc: "\u{51CC}",
-        nfkd: "\u{51CC}",
-    },
-    NormalizationTest {
-        source: "\u{F956}",
-        nfc: "\u{7A1C}",
-        nfd: "\u{7A1C}",
-        nfkc: "\u{7A1C}",
-        nfkd: "\u{7A1C}",
-    },
-    NormalizationTest {
-        source: "\u{F957}",
-        nfc: "\u{7DBE}",
-        nfd: "\u{7DBE}",
-        nfkc: "\u{7DBE}",
-        nfkd: "\u{7DBE}",
-    },
-    NormalizationTest {
-        source: "\u{F958}",
-        nfc: "\u{83F1}",
-        nfd: "\u{83F1}",
-        nfkc: "\u{83F1}",
-        nfkd: "\u{83F1}",
-    },
-    NormalizationTest {
-        source: "\u{F959}",
-        nfc: "\u{9675}",
-        nfd: "\u{9675}",
-        nfkc: "\u{9675}",
-        nfkd: "\u{9675}",
-    },
-    NormalizationTest {
-        source: "\u{F95A}",
-        nfc: "\u{8B80}",
-        nfd: "\u{8B80}",
-        nfkc: "\u{8B80}",
-        nfkd: "\u{8B80}",
-    },
-    NormalizationTest {
-        source: "\u{F95B}",
-        nfc: "\u{62CF}",
-        nfd: "\u{62CF}",
-        nfkc: "\u{62CF}",
-        nfkd: "\u{62CF}",
-    },
-    NormalizationTest {
-        source: "\u{F95C}",
-        nfc: "\u{6A02}",
-        nfd: "\u{6A02}",
-        nfkc: "\u{6A02}",
-        nfkd: "\u{6A02}",
-    },
-    NormalizationTest {
-        source: "\u{F95D}",
-        nfc: "\u{8AFE}",
-        nfd: "\u{8AFE}",
-        nfkc: "\u{8AFE}",
-        nfkd: "\u{8AFE}",
-    },
-    NormalizationTest {
-        source: "\u{F95E}",
-        nfc: "\u{4E39}",
-        nfd: "\u{4E39}",
-        nfkc: "\u{4E39}",
-        nfkd: "\u{4E39}",
-    },
-    NormalizationTest {
-        source: "\u{F95F}",
-        nfc: "\u{5BE7}",
-        nfd: "\u{5BE7}",
-        nfkc: "\u{5BE7}",
-        nfkd: "\u{5BE7}",
-    },
-    NormalizationTest {
-        source: "\u{F960}",
-        nfc: "\u{6012}",
-        nfd: "\u{6012}",
-        nfkc: "\u{6012}",
-        nfkd: "\u{6012}",
-    },
-    NormalizationTest {
-        source: "\u{F961}",
-        nfc: "\u{7387}",
-        nfd: "\u{7387}",
-        nfkc: "\u{7387}",
-        nfkd: "\u{7387}",
-    },
-    NormalizationTest {
-        source: "\u{F962}",
-        nfc: "\u{7570}",
-        nfd: "\u{7570}",
-        nfkc: "\u{7570}",
-        nfkd: "\u{7570}",
-    },
-    NormalizationTest {
-        source: "\u{F963}",
-        nfc: "\u{5317}",
-        nfd: "\u{5317}",
-        nfkc: "\u{5317}",
-        nfkd: "\u{5317}",
-    },
-    NormalizationTest {
-        source: "\u{F964}",
-        nfc: "\u{78FB}",
-        nfd: "\u{78FB}",
-        nfkc: "\u{78FB}",
-        nfkd: "\u{78FB}",
-    },
-    NormalizationTest {
-        source: "\u{F965}",
-        nfc: "\u{4FBF}",
-        nfd: "\u{4FBF}",
-        nfkc: "\u{4FBF}",
-        nfkd: "\u{4FBF}",
-    },
-    NormalizationTest {
-        source: "\u{F966}",
-        nfc: "\u{5FA9}",
-        nfd: "\u{5FA9}",
-        nfkc: "\u{5FA9}",
-        nfkd: "\u{5FA9}",
-    },
-    NormalizationTest {
-        source: "\u{F967}",
-        nfc: "\u{4E0D}",
-        nfd: "\u{4E0D}",
-        nfkc: "\u{4E0D}",
-        nfkd: "\u{4E0D}",
-    },
-    NormalizationTest {
-        source: "\u{F968}",
-        nfc: "\u{6CCC}",
-        nfd: "\u{6CCC}",
-        nfkc: "\u{6CCC}",
-        nfkd: "\u{6CCC}",
-    },
-    NormalizationTest {
-        source: "\u{F969}",
-        nfc: "\u{6578}",
-        nfd: "\u{6578}",
-        nfkc: "\u{6578}",
-        nfkd: "\u{6578}",
-    },
-    NormalizationTest {
-        source: "\u{F96A}",
-        nfc: "\u{7D22}",
-        nfd: "\u{7D22}",
-        nfkc: "\u{7D22}",
-        nfkd: "\u{7D22}",
-    },
-    NormalizationTest {
-        source: "\u{F96B}",
-        nfc: "\u{53C3}",
-        nfd: "\u{53C3}",
-        nfkc: "\u{53C3}",
-        nfkd: "\u{53C3}",
-    },
-    NormalizationTest {
-        source: "\u{F96C}",
-        nfc: "\u{585E}",
-        nfd: "\u{585E}",
-        nfkc: "\u{585E}",
-        nfkd: "\u{585E}",
-    },
-    NormalizationTest {
-        source: "\u{F96D}",
-        nfc: "\u{7701}",
-        nfd: "\u{7701}",
-        nfkc: "\u{7701}",
-        nfkd: "\u{7701}",
-    },
-    NormalizationTest {
-        source: "\u{F96E}",
-        nfc: "\u{8449}",
-        nfd: "\u{8449}",
-        nfkc: "\u{8449}",
-        nfkd: "\u{8449}",
-    },
-    NormalizationTest {
-        source: "\u{F96F}",
-        nfc: "\u{8AAA}",
-        nfd: "\u{8AAA}",
-        nfkc: "\u{8AAA}",
-        nfkd: "\u{8AAA}",
-    },
-    NormalizationTest {
-        source: "\u{F970}",
-        nfc: "\u{6BBA}",
-        nfd: "\u{6BBA}",
-        nfkc: "\u{6BBA}",
-        nfkd: "\u{6BBA}",
-    },
-    NormalizationTest {
-        source: "\u{F971}",
-        nfc: "\u{8FB0}",
-        nfd: "\u{8FB0}",
-        nfkc: "\u{8FB0}",
-        nfkd: "\u{8FB0}",
-    },
-    NormalizationTest {
-        source: "\u{F972}",
-        nfc: "\u{6C88}",
-        nfd: "\u{6C88}",
-        nfkc: "\u{6C88}",
-        nfkd: "\u{6C88}",
-    },
-    NormalizationTest {
-        source: "\u{F973}",
-        nfc: "\u{62FE}",
-        nfd: "\u{62FE}",
-        nfkc: "\u{62FE}",
-        nfkd: "\u{62FE}",
-    },
-    NormalizationTest {
-        source: "\u{F974}",
-        nfc: "\u{82E5}",
-        nfd: "\u{82E5}",
-        nfkc: "\u{82E5}",
-        nfkd: "\u{82E5}",
-    },
-    NormalizationTest {
-        source: "\u{F975}",
-        nfc: "\u{63A0}",
-        nfd: "\u{63A0}",
-        nfkc: "\u{63A0}",
-        nfkd: "\u{63A0}",
-    },
-    NormalizationTest {
-        source: "\u{F976}",
-        nfc: "\u{7565}",
-        nfd: "\u{7565}",
-        nfkc: "\u{7565}",
-        nfkd: "\u{7565}",
-    },
-    NormalizationTest {
-        source: "\u{F977}",
-        nfc: "\u{4EAE}",
-        nfd: "\u{4EAE}",
-        nfkc: "\u{4EAE}",
-        nfkd: "\u{4EAE}",
-    },
-    NormalizationTest {
-        source: "\u{F978}",
-        nfc: "\u{5169}",
-        nfd: "\u{5169}",
-        nfkc: "\u{5169}",
-        nfkd: "\u{5169}",
-    },
-    NormalizationTest {
-        source: "\u{F979}",
-        nfc: "\u{51C9}",
-        nfd: "\u{51C9}",
-        nfkc: "\u{51C9}",
-        nfkd: "\u{51C9}",
-    },
-    NormalizationTest {
-        source: "\u{F97A}",
-        nfc: "\u{6881}",
-        nfd: "\u{6881}",
-        nfkc: "\u{6881}",
-        nfkd: "\u{6881}",
-    },
-    NormalizationTest {
-        source: "\u{F97B}",
-        nfc: "\u{7CE7}",
-        nfd: "\u{7CE7}",
-        nfkc: "\u{7CE7}",
-        nfkd: "\u{7CE7}",
-    },
-    NormalizationTest {
-        source: "\u{F97C}",
-        nfc: "\u{826F}",
-        nfd: "\u{826F}",
-        nfkc: "\u{826F}",
-        nfkd: "\u{826F}",
-    },
-    NormalizationTest {
-        source: "\u{F97D}",
-        nfc: "\u{8AD2}",
-        nfd: "\u{8AD2}",
-        nfkc: "\u{8AD2}",
-        nfkd: "\u{8AD2}",
-    },
-    NormalizationTest {
-        source: "\u{F97E}",
-        nfc: "\u{91CF}",
-        nfd: "\u{91CF}",
-        nfkc: "\u{91CF}",
-        nfkd: "\u{91CF}",
-    },
-    NormalizationTest {
-        source: "\u{F97F}",
-        nfc: "\u{52F5}",
-        nfd: "\u{52F5}",
-        nfkc: "\u{52F5}",
-        nfkd: "\u{52F5}",
-    },
-    NormalizationTest {
-        source: "\u{F980}",
-        nfc: "\u{5442}",
-        nfd: "\u{5442}",
-        nfkc: "\u{5442}",
-        nfkd: "\u{5442}",
-    },
-    NormalizationTest {
-        source: "\u{F981}",
-        nfc: "\u{5973}",
-        nfd: "\u{5973}",
-        nfkc: "\u{5973}",
-        nfkd: "\u{5973}",
-    },
-    NormalizationTest {
-        source: "\u{F982}",
-        nfc: "\u{5EEC}",
-        nfd: "\u{5EEC}",
-        nfkc: "\u{5EEC}",
-        nfkd: "\u{5EEC}",
-    },
-    NormalizationTest {
-        source: "\u{F983}",
-        nfc: "\u{65C5}",
-        nfd: "\u{65C5}",
-        nfkc: "\u{65C5}",
-        nfkd: "\u{65C5}",
-    },
-    NormalizationTest {
-        source: "\u{F984}",
-        nfc: "\u{6FFE}",
-        nfd: "\u{6FFE}",
-        nfkc: "\u{6FFE}",
-        nfkd: "\u{6FFE}",
-    },
-    NormalizationTest {
-        source: "\u{F985}",
-        nfc: "\u{792A}",
-        nfd: "\u{792A}",
-        nfkc: "\u{792A}",
-        nfkd: "\u{792A}",
-    },
-    NormalizationTest {
-        source: "\u{F986}",
-        nfc: "\u{95AD}",
-        nfd: "\u{95AD}",
-        nfkc: "\u{95AD}",
-        nfkd: "\u{95AD}",
-    },
-    NormalizationTest {
-        source: "\u{F987}",
-        nfc: "\u{9A6A}",
-        nfd: "\u{9A6A}",
-        nfkc: "\u{9A6A}",
-        nfkd: "\u{9A6A}",
-    },
-    NormalizationTest {
-        source: "\u{F988}",
-        nfc: "\u{9E97}",
-        nfd: "\u{9E97}",
-        nfkc: "\u{9E97}",
-        nfkd: "\u{9E97}",
-    },
-    NormalizationTest {
-        source: "\u{F989}",
-        nfc: "\u{9ECE}",
-        nfd: "\u{9ECE}",
-        nfkc: "\u{9ECE}",
-        nfkd: "\u{9ECE}",
-    },
-    NormalizationTest {
-        source: "\u{F98A}",
-        nfc: "\u{529B}",
-        nfd: "\u{529B}",
-        nfkc: "\u{529B}",
-        nfkd: "\u{529B}",
-    },
-    NormalizationTest {
-        source: "\u{F98B}",
-        nfc: "\u{66C6}",
-        nfd: "\u{66C6}",
-        nfkc: "\u{66C6}",
-        nfkd: "\u{66C6}",
-    },
-    NormalizationTest {
-        source: "\u{F98C}",
-        nfc: "\u{6B77}",
-        nfd: "\u{6B77}",
-        nfkc: "\u{6B77}",
-        nfkd: "\u{6B77}",
-    },
-    NormalizationTest {
-        source: "\u{F98D}",
-        nfc: "\u{8F62}",
-        nfd: "\u{8F62}",
-        nfkc: "\u{8F62}",
-        nfkd: "\u{8F62}",
-    },
-    NormalizationTest {
-        source: "\u{F98E}",
-        nfc: "\u{5E74}",
-        nfd: "\u{5E74}",
-        nfkc: "\u{5E74}",
-        nfkd: "\u{5E74}",
-    },
-    NormalizationTest {
-        source: "\u{F98F}",
-        nfc: "\u{6190}",
-        nfd: "\u{6190}",
-        nfkc: "\u{6190}",
-        nfkd: "\u{6190}",
-    },
-    NormalizationTest {
-        source: "\u{F990}",
-        nfc: "\u{6200}",
-        nfd: "\u{6200}",
-        nfkc: "\u{6200}",
-        nfkd: "\u{6200}",
-    },
-    NormalizationTest {
-        source: "\u{F991}",
-        nfc: "\u{649A}",
-        nfd: "\u{649A}",
-        nfkc: "\u{649A}",
-        nfkd: "\u{649A}",
-    },
-    NormalizationTest {
-        source: "\u{F992}",
-        nfc: "\u{6F23}",
-        nfd: "\u{6F23}",
-        nfkc: "\u{6F23}",
-        nfkd: "\u{6F23}",
-    },
-    NormalizationTest {
-        source: "\u{F993}",
-        nfc: "\u{7149}",
-        nfd: "\u{7149}",
-        nfkc: "\u{7149}",
-        nfkd: "\u{7149}",
-    },
-    NormalizationTest {
-        source: "\u{F994}",
-        nfc: "\u{7489}",
-        nfd: "\u{7489}",
-        nfkc: "\u{7489}",
-        nfkd: "\u{7489}",
-    },
-    NormalizationTest {
-        source: "\u{F995}",
-        nfc: "\u{79CA}",
-        nfd: "\u{79CA}",
-        nfkc: "\u{79CA}",
-        nfkd: "\u{79CA}",
-    },
-    NormalizationTest {
-        source: "\u{F996}",
-        nfc: "\u{7DF4}",
-        nfd: "\u{7DF4}",
-        nfkc: "\u{7DF4}",
-        nfkd: "\u{7DF4}",
-    },
-    NormalizationTest {
-        source: "\u{F997}",
-        nfc: "\u{806F}",
-        nfd: "\u{806F}",
-        nfkc: "\u{806F}",
-        nfkd: "\u{806F}",
-    },
-    NormalizationTest {
-        source: "\u{F998}",
-        nfc: "\u{8F26}",
-        nfd: "\u{8F26}",
-        nfkc: "\u{8F26}",
-        nfkd: "\u{8F26}",
-    },
-    NormalizationTest {
-        source: "\u{F999}",
-        nfc: "\u{84EE}",
-        nfd: "\u{84EE}",
-        nfkc: "\u{84EE}",
-        nfkd: "\u{84EE}",
-    },
-    NormalizationTest {
-        source: "\u{F99A}",
-        nfc: "\u{9023}",
-        nfd: "\u{9023}",
-        nfkc: "\u{9023}",
-        nfkd: "\u{9023}",
-    },
-    NormalizationTest {
-        source: "\u{F99B}",
-        nfc: "\u{934A}",
-        nfd: "\u{934A}",
-        nfkc: "\u{934A}",
-        nfkd: "\u{934A}",
-    },
-    NormalizationTest {
-        source: "\u{F99C}",
-        nfc: "\u{5217}",
-        nfd: "\u{5217}",
-        nfkc: "\u{5217}",
-        nfkd: "\u{5217}",
-    },
-    NormalizationTest {
-        source: "\u{F99D}",
-        nfc: "\u{52A3}",
-        nfd: "\u{52A3}",
-        nfkc: "\u{52A3}",
-        nfkd: "\u{52A3}",
-    },
-    NormalizationTest {
-        source: "\u{F99E}",
-        nfc: "\u{54BD}",
-        nfd: "\u{54BD}",
-        nfkc: "\u{54BD}",
-        nfkd: "\u{54BD}",
-    },
-    NormalizationTest {
-        source: "\u{F99F}",
-        nfc: "\u{70C8}",
-        nfd: "\u{70C8}",
-        nfkc: "\u{70C8}",
-        nfkd: "\u{70C8}",
-    },
-    NormalizationTest {
-        source: "\u{F9A0}",
-        nfc: "\u{88C2}",
-        nfd: "\u{88C2}",
-        nfkc: "\u{88C2}",
-        nfkd: "\u{88C2}",
-    },
-    NormalizationTest {
-        source: "\u{F9A1}",
-        nfc: "\u{8AAA}",
-        nfd: "\u{8AAA}",
-        nfkc: "\u{8AAA}",
-        nfkd: "\u{8AAA}",
-    },
-    NormalizationTest {
-        source: "\u{F9A2}",
-        nfc: "\u{5EC9}",
-        nfd: "\u{5EC9}",
-        nfkc: "\u{5EC9}",
-        nfkd: "\u{5EC9}",
-    },
-    NormalizationTest {
-        source: "\u{F9A3}",
-        nfc: "\u{5FF5}",
-        nfd: "\u{5FF5}",
-        nfkc: "\u{5FF5}",
-        nfkd: "\u{5FF5}",
-    },
-    NormalizationTest {
-        source: "\u{F9A4}",
-        nfc: "\u{637B}",
-        nfd: "\u{637B}",
-        nfkc: "\u{637B}",
-        nfkd: "\u{637B}",
-    },
-    NormalizationTest {
-        source: "\u{F9A5}",
-        nfc: "\u{6BAE}",
-        nfd: "\u{6BAE}",
-        nfkc: "\u{6BAE}",
-        nfkd: "\u{6BAE}",
-    },
-    NormalizationTest {
-        source: "\u{F9A6}",
-        nfc: "\u{7C3E}",
-        nfd: "\u{7C3E}",
-        nfkc: "\u{7C3E}",
-        nfkd: "\u{7C3E}",
-    },
-    NormalizationTest {
-        source: "\u{F9A7}",
-        nfc: "\u{7375}",
-        nfd: "\u{7375}",
-        nfkc: "\u{7375}",
-        nfkd: "\u{7375}",
-    },
-    NormalizationTest {
-        source: "\u{F9A8}",
-        nfc: "\u{4EE4}",
-        nfd: "\u{4EE4}",
-        nfkc: "\u{4EE4}",
-        nfkd: "\u{4EE4}",
-    },
-    NormalizationTest {
-        source: "\u{F9A9}",
-        nfc: "\u{56F9}",
-        nfd: "\u{56F9}",
-        nfkc: "\u{56F9}",
-        nfkd: "\u{56F9}",
-    },
-    NormalizationTest {
-        source: "\u{F9AA}",
-        nfc: "\u{5BE7}",
-        nfd: "\u{5BE7}",
-        nfkc: "\u{5BE7}",
-        nfkd: "\u{5BE7}",
-    },
-    NormalizationTest {
-        source: "\u{F9AB}",
-        nfc: "\u{5DBA}",
-        nfd: "\u{5DBA}",
-        nfkc: "\u{5DBA}",
-        nfkd: "\u{5DBA}",
-    },
-    NormalizationTest {
-        source: "\u{F9AC}",
-        nfc: "\u{601C}",
-        nfd: "\u{601C}",
-        nfkc: "\u{601C}",
-        nfkd: "\u{601C}",
-    },
-    NormalizationTest {
-        source: "\u{F9AD}",
-        nfc: "\u{73B2}",
-        nfd: "\u{73B2}",
-        nfkc: "\u{73B2}",
-        nfkd: "\u{73B2}",
-    },
-    NormalizationTest {
-        source: "\u{F9AE}",
-        nfc: "\u{7469}",
-        nfd: "\u{7469}",
-        nfkc: "\u{7469}",
-        nfkd: "\u{7469}",
-    },
-    NormalizationTest {
-        source: "\u{F9AF}",
-        nfc: "\u{7F9A}",
-        nfd: "\u{7F9A}",
-        nfkc: "\u{7F9A}",
-        nfkd: "\u{7F9A}",
-    },
-    NormalizationTest {
-        source: "\u{F9B0}",
-        nfc: "\u{8046}",
-        nfd: "\u{8046}",
-        nfkc: "\u{8046}",
-        nfkd: "\u{8046}",
-    },
-    NormalizationTest {
-        source: "\u{F9B1}",
-        nfc: "\u{9234}",
-        nfd: "\u{9234}",
-        nfkc: "\u{9234}",
-        nfkd: "\u{9234}",
-    },
-    NormalizationTest {
-        source: "\u{F9B2}",
-        nfc: "\u{96F6}",
-        nfd: "\u{96F6}",
-        nfkc: "\u{96F6}",
-        nfkd: "\u{96F6}",
-    },
-    NormalizationTest {
-        source: "\u{F9B3}",
-        nfc: "\u{9748}",
-        nfd: "\u{9748}",
-        nfkc: "\u{9748}",
-        nfkd: "\u{9748}",
-    },
-    NormalizationTest {
-        source: "\u{F9B4}",
-        nfc: "\u{9818}",
-        nfd: "\u{9818}",
-        nfkc: "\u{9818}",
-        nfkd: "\u{9818}",
-    },
-    NormalizationTest {
-        source: "\u{F9B5}",
-        nfc: "\u{4F8B}",
-        nfd: "\u{4F8B}",
-        nfkc: "\u{4F8B}",
-        nfkd: "\u{4F8B}",
-    },
-    NormalizationTest {
-        source: "\u{F9B6}",
-        nfc: "\u{79AE}",
-        nfd: "\u{79AE}",
-        nfkc: "\u{79AE}",
-        nfkd: "\u{79AE}",
-    },
-    NormalizationTest {
-        source: "\u{F9B7}",
-        nfc: "\u{91B4}",
-        nfd: "\u{91B4}",
-        nfkc: "\u{91B4}",
-        nfkd: "\u{91B4}",
-    },
-    NormalizationTest {
-        source: "\u{F9B8}",
-        nfc: "\u{96B8}",
-        nfd: "\u{96B8}",
-        nfkc: "\u{96B8}",
-        nfkd: "\u{96B8}",
-    },
-    NormalizationTest {
-        source: "\u{F9B9}",
-        nfc: "\u{60E1}",
-        nfd: "\u{60E1}",
-        nfkc: "\u{60E1}",
-        nfkd: "\u{60E1}",
-    },
-    NormalizationTest {
-        source: "\u{F9BA}",
-        nfc: "\u{4E86}",
-        nfd: "\u{4E86}",
-        nfkc: "\u{4E86}",
-        nfkd: "\u{4E86}",
-    },
-    NormalizationTest {
-        source: "\u{F9BB}",
-        nfc: "\u{50DA}",
-        nfd: "\u{50DA}",
-        nfkc: "\u{50DA}",
-        nfkd: "\u{50DA}",
-    },
-    NormalizationTest {
-        source: "\u{F9BC}",
-        nfc: "\u{5BEE}",
-        nfd: "\u{5BEE}",
-        nfkc: "\u{5BEE}",
-        nfkd: "\u{5BEE}",
-    },
-    NormalizationTest {
-        source: "\u{F9BD}",
-        nfc: "\u{5C3F}",
-        nfd: "\u{5C3F}",
-        nfkc: "\u{5C3F}",
-        nfkd: "\u{5C3F}",
-    },
-    NormalizationTest {
-        source: "\u{F9BE}",
-        nfc: "\u{6599}",
-        nfd: "\u{6599}",
-        nfkc: "\u{6599}",
-        nfkd: "\u{6599}",
-    },
-    NormalizationTest {
-        source: "\u{F9BF}",
-        nfc: "\u{6A02}",
-        nfd: "\u{6A02}",
-        nfkc: "\u{6A02}",
-        nfkd: "\u{6A02}",
-    },
-    NormalizationTest {
-        source: "\u{F9C0}",
-        nfc: "\u{71CE}",
-        nfd: "\u{71CE}",
-        nfkc: "\u{71CE}",
-        nfkd: "\u{71CE}",
-    },
-    NormalizationTest {
-        source: "\u{F9C1}",
-        nfc: "\u{7642}",
-        nfd: "\u{7642}",
-        nfkc: "\u{7642}",
-        nfkd: "\u{7642}",
-    },
-    NormalizationTest {
-        source: "\u{F9C2}",
-        nfc: "\u{84FC}",
-        nfd: "\u{84FC}",
-        nfkc: "\u{84FC}",
-        nfkd: "\u{84FC}",
-    },
-    NormalizationTest {
-        source: "\u{F9C3}",
-        nfc: "\u{907C}",
-        nfd: "\u{907C}",
-        nfkc: "\u{907C}",
-        nfkd: "\u{907C}",
-    },
-    NormalizationTest {
-        source: "\u{F9C4}",
-        nfc: "\u{9F8D}",
-        nfd: "\u{9F8D}",
-        nfkc: "\u{9F8D}",
-        nfkd: "\u{9F8D}",
-    },
-    NormalizationTest {
-        source: "\u{F9C5}",
-        nfc: "\u{6688}",
-        nfd: "\u{6688}",
-        nfkc: "\u{6688}",
-        nfkd: "\u{6688}",
-    },
-    NormalizationTest {
-        source: "\u{F9C6}",
-        nfc: "\u{962E}",
-        nfd: "\u{962E}",
-        nfkc: "\u{962E}",
-        nfkd: "\u{962E}",
-    },
-    NormalizationTest {
-        source: "\u{F9C7}",
-        nfc: "\u{5289}",
-        nfd: "\u{5289}",
-        nfkc: "\u{5289}",
-        nfkd: "\u{5289}",
-    },
-    NormalizationTest {
-        source: "\u{F9C8}",
-        nfc: "\u{677B}",
-        nfd: "\u{677B}",
-        nfkc: "\u{677B}",
-        nfkd: "\u{677B}",
-    },
-    NormalizationTest {
-        source: "\u{F9C9}",
-        nfc: "\u{67F3}",
-        nfd: "\u{67F3}",
-        nfkc: "\u{67F3}",
-        nfkd: "\u{67F3}",
-    },
-    NormalizationTest {
-        source: "\u{F9CA}",
-        nfc: "\u{6D41}",
-        nfd: "\u{6D41}",
-        nfkc: "\u{6D41}",
-        nfkd: "\u{6D41}",
-    },
-    NormalizationTest {
-        source: "\u{F9CB}",
-        nfc: "\u{6E9C}",
-        nfd: "\u{6E9C}",
-        nfkc: "\u{6E9C}",
-        nfkd: "\u{6E9C}",
-    },
-    NormalizationTest {
-        source: "\u{F9CC}",
-        nfc: "\u{7409}",
-        nfd: "\u{7409}",
-        nfkc: "\u{7409}",
-        nfkd: "\u{7409}",
-    },
-    NormalizationTest {
-        source: "\u{F9CD}",
-        nfc: "\u{7559}",
-        nfd: "\u{7559}",
-        nfkc: "\u{7559}",
-        nfkd: "\u{7559}",
-    },
-    NormalizationTest {
-        source: "\u{F9CE}",
-        nfc: "\u{786B}",
-        nfd: "\u{786B}",
-        nfkc: "\u{786B}",
-        nfkd: "\u{786B}",
-    },
-    NormalizationTest {
-        source: "\u{F9CF}",
-        nfc: "\u{7D10}",
-        nfd: "\u{7D10}",
-        nfkc: "\u{7D10}",
-        nfkd: "\u{7D10}",
-    },
-    NormalizationTest {
-        source: "\u{F9D0}",
-        nfc: "\u{985E}",
-        nfd: "\u{985E}",
-        nfkc: "\u{985E}",
-        nfkd: "\u{985E}",
-    },
-    NormalizationTest {
-        source: "\u{F9D1}",
-        nfc: "\u{516D}",
-        nfd: "\u{516D}",
-        nfkc: "\u{516D}",
-        nfkd: "\u{516D}",
-    },
-    NormalizationTest {
-        source: "\u{F9D2}",
-        nfc: "\u{622E}",
-        nfd: "\u{622E}",
-        nfkc: "\u{622E}",
-        nfkd: "\u{622E}",
-    },
-    NormalizationTest {
-        source: "\u{F9D3}",
-        nfc: "\u{9678}",
-        nfd: "\u{9678}",
-        nfkc: "\u{9678}",
-        nfkd: "\u{9678}",
-    },
-    NormalizationTest {
-        source: "\u{F9D4}",
-        nfc: "\u{502B}",
-        nfd: "\u{502B}",
-        nfkc: "\u{502B}",
-        nfkd: "\u{502B}",
-    },
-    NormalizationTest {
-        source: "\u{F9D5}",
-        nfc: "\u{5D19}",
-        nfd: "\u{5D19}",
-        nfkc: "\u{5D19}",
-        nfkd: "\u{5D19}",
-    },
-    NormalizationTest {
-        source: "\u{F9D6}",
-        nfc: "\u{6DEA}",
-        nfd: "\u{6DEA}",
-        nfkc: "\u{6DEA}",
-        nfkd: "\u{6DEA}",
-    },
-    NormalizationTest {
-        source: "\u{F9D7}",
-        nfc: "\u{8F2A}",
-        nfd: "\u{8F2A}",
-        nfkc: "\u{8F2A}",
-        nfkd: "\u{8F2A}",
-    },
-    NormalizationTest {
-        source: "\u{F9D8}",
-        nfc: "\u{5F8B}",
-        nfd: "\u{5F8B}",
-        nfkc: "\u{5F8B}",
-        nfkd: "\u{5F8B}",
-    },
-    NormalizationTest {
-        source: "\u{F9D9}",
-        nfc: "\u{6144}",
-        nfd: "\u{6144}",
-        nfkc: "\u{6144}",
-        nfkd: "\u{6144}",
-    },
-    NormalizationTest {
-        source: "\u{F9DA}",
-        nfc: "\u{6817}",
-        nfd: "\u{6817}",
-        nfkc: "\u{6817}",
-        nfkd: "\u{6817}",
-    },
-    NormalizationTest {
-        source: "\u{F9DB}",
-        nfc: "\u{7387}",
-        nfd: "\u{7387}",
-        nfkc: "\u{7387}",
-        nfkd: "\u{7387}",
-    },
-    NormalizationTest {
-        source: "\u{F9DC}",
-        nfc: "\u{9686}",
-        nfd: "\u{9686}",
-        nfkc: "\u{9686}",
-        nfkd: "\u{9686}",
-    },
-    NormalizationTest {
-        source: "\u{F9DD}",
-        nfc: "\u{5229}",
-        nfd: "\u{5229}",
-        nfkc: "\u{5229}",
-        nfkd: "\u{5229}",
-    },
-    NormalizationTest {
-        source: "\u{F9DE}",
-        nfc: "\u{540F}",
-        nfd: "\u{540F}",
-        nfkc: "\u{540F}",
-        nfkd: "\u{540F}",
-    },
-    NormalizationTest {
-        source: "\u{F9DF}",
-        nfc: "\u{5C65}",
-        nfd: "\u{5C65}",
-        nfkc: "\u{5C65}",
-        nfkd: "\u{5C65}",
-    },
-    NormalizationTest {
-        source: "\u{F9E0}",
-        nfc: "\u{6613}",
-        nfd: "\u{6613}",
-        nfkc: "\u{6613}",
-        nfkd: "\u{6613}",
-    },
-    NormalizationTest {
-        source: "\u{F9E1}",
-        nfc: "\u{674E}",
-        nfd: "\u{674E}",
-        nfkc: "\u{674E}",
-        nfkd: "\u{674E}",
-    },
-    NormalizationTest {
-        source: "\u{F9E2}",
-        nfc: "\u{68A8}",
-        nfd: "\u{68A8}",
-        nfkc: "\u{68A8}",
-        nfkd: "\u{68A8}",
-    },
-    NormalizationTest {
-        source: "\u{F9E3}",
-        nfc: "\u{6CE5}",
-        nfd: "\u{6CE5}",
-        nfkc: "\u{6CE5}",
-        nfkd: "\u{6CE5}",
-    },
-    NormalizationTest {
-        source: "\u{F9E4}",
-        nfc: "\u{7406}",
-        nfd: "\u{7406}",
-        nfkc: "\u{7406}",
-        nfkd: "\u{7406}",
-    },
-    NormalizationTest {
-        source: "\u{F9E5}",
-        nfc: "\u{75E2}",
-        nfd: "\u{75E2}",
-        nfkc: "\u{75E2}",
-        nfkd: "\u{75E2}",
-    },
-    NormalizationTest {
-        source: "\u{F9E6}",
-        nfc: "\u{7F79}",
-        nfd: "\u{7F79}",
-        nfkc: "\u{7F79}",
-        nfkd: "\u{7F79}",
-    },
-    NormalizationTest {
-        source: "\u{F9E7}",
-        nfc: "\u{88CF}",
-        nfd: "\u{88CF}",
-        nfkc: "\u{88CF}",
-        nfkd: "\u{88CF}",
-    },
-    NormalizationTest {
-        source: "\u{F9E8}",
-        nfc: "\u{88E1}",
-        nfd: "\u{88E1}",
-        nfkc: "\u{88E1}",
-        nfkd: "\u{88E1}",
-    },
-    NormalizationTest {
-        source: "\u{F9E9}",
-        nfc: "\u{91CC}",
-        nfd: "\u{91CC}",
-        nfkc: "\u{91CC}",
-        nfkd: "\u{91CC}",
-    },
-    NormalizationTest {
-        source: "\u{F9EA}",
-        nfc: "\u{96E2}",
-        nfd: "\u{96E2}",
-        nfkc: "\u{96E2}",
-        nfkd: "\u{96E2}",
-    },
-    NormalizationTest {
-        source: "\u{F9EB}",
-        nfc: "\u{533F}",
-        nfd: "\u{533F}",
-        nfkc: "\u{533F}",
-        nfkd: "\u{533F}",
-    },
-    NormalizationTest {
-        source: "\u{F9EC}",
-        nfc: "\u{6EBA}",
-        nfd: "\u{6EBA}",
-        nfkc: "\u{6EBA}",
-        nfkd: "\u{6EBA}",
-    },
-    NormalizationTest {
-        source: "\u{F9ED}",
-        nfc: "\u{541D}",
-        nfd: "\u{541D}",
-        nfkc: "\u{541D}",
-        nfkd: "\u{541D}",
-    },
-    NormalizationTest {
-        source: "\u{F9EE}",
-        nfc: "\u{71D0}",
-        nfd: "\u{71D0}",
-        nfkc: "\u{71D0}",
-        nfkd: "\u{71D0}",
-    },
-    NormalizationTest {
-        source: "\u{F9EF}",
-        nfc: "\u{7498}",
-        nfd: "\u{7498}",
-        nfkc: "\u{7498}",
-        nfkd: "\u{7498}",
-    },
-    NormalizationTest {
-        source: "\u{F9F0}",
-        nfc: "\u{85FA}",
-        nfd: "\u{85FA}",
-        nfkc: "\u{85FA}",
-        nfkd: "\u{85FA}",
-    },
-    NormalizationTest {
-        source: "\u{F9F1}",
-        nfc: "\u{96A3}",
-        nfd: "\u{96A3}",
-        nfkc: "\u{96A3}",
-        nfkd: "\u{96A3}",
-    },
-    NormalizationTest {
-        source: "\u{F9F2}",
-        nfc: "\u{9C57}",
-        nfd: "\u{9C57}",
-        nfkc: "\u{9C57}",
-        nfkd: "\u{9C57}",
-    },
-    NormalizationTest {
-        source: "\u{F9F3}",
-        nfc: "\u{9E9F}",
-        nfd: "\u{9E9F}",
-        nfkc: "\u{9E9F}",
-        nfkd: "\u{9E9F}",
-    },
-    NormalizationTest {
-        source: "\u{F9F4}",
-        nfc: "\u{6797}",
-        nfd: "\u{6797}",
-        nfkc: "\u{6797}",
-        nfkd: "\u{6797}",
-    },
-    NormalizationTest {
-        source: "\u{F9F5}",
-        nfc: "\u{6DCB}",
-        nfd: "\u{6DCB}",
-        nfkc: "\u{6DCB}",
-        nfkd: "\u{6DCB}",
-    },
-    NormalizationTest {
-        source: "\u{F9F6}",
-        nfc: "\u{81E8}",
-        nfd: "\u{81E8}",
-        nfkc: "\u{81E8}",
-        nfkd: "\u{81E8}",
-    },
-    NormalizationTest {
-        source: "\u{F9F7}",
-        nfc: "\u{7ACB}",
-        nfd: "\u{7ACB}",
-        nfkc: "\u{7ACB}",
-        nfkd: "\u{7ACB}",
-    },
-    NormalizationTest {
-        source: "\u{F9F8}",
-        nfc: "\u{7B20}",
-        nfd: "\u{7B20}",
-        nfkc: "\u{7B20}",
-        nfkd: "\u{7B20}",
-    },
-    NormalizationTest {
-        source: "\u{F9F9}",
-        nfc: "\u{7C92}",
-        nfd: "\u{7C92}",
-        nfkc: "\u{7C92}",
-        nfkd: "\u{7C92}",
-    },
-    NormalizationTest {
-        source: "\u{F9FA}",
-        nfc: "\u{72C0}",
-        nfd: "\u{72C0}",
-        nfkc: "\u{72C0}",
-        nfkd: "\u{72C0}",
-    },
-    NormalizationTest {
-        source: "\u{F9FB}",
-        nfc: "\u{7099}",
-        nfd: "\u{7099}",
-        nfkc: "\u{7099}",
-        nfkd: "\u{7099}",
-    },
-    NormalizationTest {
-        source: "\u{F9FC}",
-        nfc: "\u{8B58}",
-        nfd: "\u{8B58}",
-        nfkc: "\u{8B58}",
-        nfkd: "\u{8B58}",
-    },
-    NormalizationTest {
-        source: "\u{F9FD}",
-        nfc: "\u{4EC0}",
-        nfd: "\u{4EC0}",
-        nfkc: "\u{4EC0}",
-        nfkd: "\u{4EC0}",
-    },
-    NormalizationTest {
-        source: "\u{F9FE}",
-        nfc: "\u{8336}",
-        nfd: "\u{8336}",
-        nfkc: "\u{8336}",
-        nfkd: "\u{8336}",
-    },
-    NormalizationTest {
-        source: "\u{F9FF}",
-        nfc: "\u{523A}",
-        nfd: "\u{523A}",
-        nfkc: "\u{523A}",
-        nfkd: "\u{523A}",
-    },
-    NormalizationTest {
-        source: "\u{FA00}",
-        nfc: "\u{5207}",
-        nfd: "\u{5207}",
-        nfkc: "\u{5207}",
-        nfkd: "\u{5207}",
-    },
-    NormalizationTest {
-        source: "\u{FA01}",
-        nfc: "\u{5EA6}",
-        nfd: "\u{5EA6}",
-        nfkc: "\u{5EA6}",
-        nfkd: "\u{5EA6}",
-    },
-    NormalizationTest {
-        source: "\u{FA02}",
-        nfc: "\u{62D3}",
-        nfd: "\u{62D3}",
-        nfkc: "\u{62D3}",
-        nfkd: "\u{62D3}",
-    },
-    NormalizationTest {
-        source: "\u{FA03}",
-        nfc: "\u{7CD6}",
-        nfd: "\u{7CD6}",
-        nfkc: "\u{7CD6}",
-        nfkd: "\u{7CD6}",
-    },
-    NormalizationTest {
-        source: "\u{FA04}",
-        nfc: "\u{5B85}",
-        nfd: "\u{5B85}",
-        nfkc: "\u{5B85}",
-        nfkd: "\u{5B85}",
-    },
-    NormalizationTest {
-        source: "\u{FA05}",
-        nfc: "\u{6D1E}",
-        nfd: "\u{6D1E}",
-        nfkc: "\u{6D1E}",
-        nfkd: "\u{6D1E}",
-    },
-    NormalizationTest {
-        source: "\u{FA06}",
-        nfc: "\u{66B4}",
-        nfd: "\u{66B4}",
-        nfkc: "\u{66B4}",
-        nfkd: "\u{66B4}",
-    },
-    NormalizationTest {
-        source: "\u{FA07}",
-        nfc: "\u{8F3B}",
-        nfd: "\u{8F3B}",
-        nfkc: "\u{8F3B}",
-        nfkd: "\u{8F3B}",
-    },
-    NormalizationTest {
-        source: "\u{FA08}",
-        nfc: "\u{884C}",
-        nfd: "\u{884C}",
-        nfkc: "\u{884C}",
-        nfkd: "\u{884C}",
-    },
-    NormalizationTest {
-        source: "\u{FA09}",
-        nfc: "\u{964D}",
-        nfd: "\u{964D}",
-        nfkc: "\u{964D}",
-        nfkd: "\u{964D}",
-    },
-    NormalizationTest {
-        source: "\u{FA0A}",
-        nfc: "\u{898B}",
-        nfd: "\u{898B}",
-        nfkc: "\u{898B}",
-        nfkd: "\u{898B}",
-    },
-    NormalizationTest {
-        source: "\u{FA0B}",
-        nfc: "\u{5ED3}",
-        nfd: "\u{5ED3}",
-        nfkc: "\u{5ED3}",
-        nfkd: "\u{5ED3}",
-    },
-    NormalizationTest {
-        source: "\u{FA0C}",
-        nfc: "\u{5140}",
-        nfd: "\u{5140}",
-        nfkc: "\u{5140}",
-        nfkd: "\u{5140}",
-    },
-    NormalizationTest {
-        source: "\u{FA0D}",
-        nfc: "\u{55C0}",
-        nfd: "\u{55C0}",
-        nfkc: "\u{55C0}",
-        nfkd: "\u{55C0}",
-    },
-    NormalizationTest {
-        source: "\u{FA10}",
-        nfc: "\u{585A}",
-        nfd: "\u{585A}",
-        nfkc: "\u{585A}",
-        nfkd: "\u{585A}",
-    },
-    NormalizationTest {
-        source: "\u{FA12}",
-        nfc: "\u{6674}",
-        nfd: "\u{6674}",
-        nfkc: "\u{6674}",
-        nfkd: "\u{6674}",
-    },
-    NormalizationTest {
-        source: "\u{FA15}",
-        nfc: "\u{51DE}",
-        nfd: "\u{51DE}",
-        nfkc: "\u{51DE}",
-        nfkd: "\u{51DE}",
-    },
-    NormalizationTest {
-        source: "\u{FA16}",
-        nfc: "\u{732A}",
-        nfd: "\u{732A}",
-        nfkc: "\u{732A}",
-        nfkd: "\u{732A}",
-    },
-    NormalizationTest {
-        source: "\u{FA17}",
-        nfc: "\u{76CA}",
-        nfd: "\u{76CA}",
-        nfkc: "\u{76CA}",
-        nfkd: "\u{76CA}",
-    },
-    NormalizationTest {
-        source: "\u{FA18}",
-        nfc: "\u{793C}",
-        nfd: "\u{793C}",
-        nfkc: "\u{793C}",
-        nfkd: "\u{793C}",
-    },
-    NormalizationTest {
-        source: "\u{FA19}",
-        nfc: "\u{795E}",
-        nfd: "\u{795E}",
-        nfkc: "\u{795E}",
-        nfkd: "\u{795E}",
-    },
-    NormalizationTest {
-        source: "\u{FA1A}",
-        nfc: "\u{7965}",
-        nfd: "\u{7965}",
-        nfkc: "\u{7965}",
-        nfkd: "\u{7965}",
-    },
-    NormalizationTest {
-        source: "\u{FA1B}",
-        nfc: "\u{798F}",
-        nfd: "\u{798F}",
-        nfkc: "\u{798F}",
-        nfkd: "\u{798F}",
-    },
-    NormalizationTest {
-        source: "\u{FA1C}",
-        nfc: "\u{9756}",
-        nfd: "\u{9756}",
-        nfkc: "\u{9756}",
-        nfkd: "\u{9756}",
-    },
-    NormalizationTest {
-        source: "\u{FA1D}",
-        nfc: "\u{7CBE}",
-        nfd: "\u{7CBE}",
-        nfkc: "\u{7CBE}",
-        nfkd: "\u{7CBE}",
-    },
-    NormalizationTest {
-        source: "\u{FA1E}",
-        nfc: "\u{7FBD}",
-        nfd: "\u{7FBD}",
-        nfkc: "\u{7FBD}",
-        nfkd: "\u{7FBD}",
-    },
-    NormalizationTest {
-        source: "\u{FA20}",
-        nfc: "\u{8612}",
-        nfd: "\u{8612}",
-        nfkc: "\u{8612}",
-        nfkd: "\u{8612}",
-    },
-    NormalizationTest {
-        source: "\u{FA22}",
-        nfc: "\u{8AF8}",
-        nfd: "\u{8AF8}",
-        nfkc: "\u{8AF8}",
-        nfkd: "\u{8AF8}",
-    },
-    NormalizationTest {
-        source: "\u{FA25}",
-        nfc: "\u{9038}",
-        nfd: "\u{9038}",
-        nfkc: "\u{9038}",
-        nfkd: "\u{9038}",
-    },
-    NormalizationTest {
-        source: "\u{FA26}",
-        nfc: "\u{90FD}",
-        nfd: "\u{90FD}",
-        nfkc: "\u{90FD}",
-        nfkd: "\u{90FD}",
-    },
-    NormalizationTest {
-        source: "\u{FA2A}",
-        nfc: "\u{98EF}",
-        nfd: "\u{98EF}",
-        nfkc: "\u{98EF}",
-        nfkd: "\u{98EF}",
-    },
-    NormalizationTest {
-        source: "\u{FA2B}",
-        nfc: "\u{98FC}",
-        nfd: "\u{98FC}",
-        nfkc: "\u{98FC}",
-        nfkd: "\u{98FC}",
-    },
-    NormalizationTest {
-        source: "\u{FA2C}",
-        nfc: "\u{9928}",
-        nfd: "\u{9928}",
-        nfkc: "\u{9928}",
-        nfkd: "\u{9928}",
-    },
-    NormalizationTest {
-        source: "\u{FA2D}",
-        nfc: "\u{9DB4}",
-        nfd: "\u{9DB4}",
-        nfkc: "\u{9DB4}",
-        nfkd: "\u{9DB4}",
-    },
-    NormalizationTest {
-        source: "\u{FA2E}",
-        nfc: "\u{90DE}",
-        nfd: "\u{90DE}",
-        nfkc: "\u{90DE}",
-        nfkd: "\u{90DE}",
-    },
-    NormalizationTest {
-        source: "\u{FA2F}",
-        nfc: "\u{96B7}",
-        nfd: "\u{96B7}",
-        nfkc: "\u{96B7}",
-        nfkd: "\u{96B7}",
-    },
-    NormalizationTest {
-        source: "\u{FA30}",
-        nfc: "\u{4FAE}",
-        nfd: "\u{4FAE}",
-        nfkc: "\u{4FAE}",
-        nfkd: "\u{4FAE}",
-    },
-    NormalizationTest {
-        source: "\u{FA31}",
-        nfc: "\u{50E7}",
-        nfd: "\u{50E7}",
-        nfkc: "\u{50E7}",
-        nfkd: "\u{50E7}",
-    },
-    NormalizationTest {
-        source: "\u{FA32}",
-        nfc: "\u{514D}",
-        nfd: "\u{514D}",
-        nfkc: "\u{514D}",
-        nfkd: "\u{514D}",
-    },
-    NormalizationTest {
-        source: "\u{FA33}",
-        nfc: "\u{52C9}",
-        nfd: "\u{52C9}",
-        nfkc: "\u{52C9}",
-        nfkd: "\u{52C9}",
-    },
-    NormalizationTest {
-        source: "\u{FA34}",
-        nfc: "\u{52E4}",
-        nfd: "\u{52E4}",
-        nfkc: "\u{52E4}",
-        nfkd: "\u{52E4}",
-    },
-    NormalizationTest {
-        source: "\u{FA35}",
-        nfc: "\u{5351}",
-        nfd: "\u{5351}",
-        nfkc: "\u{5351}",
-        nfkd: "\u{5351}",
-    },
-    NormalizationTest {
-        source: "\u{FA36}",
-        nfc: "\u{559D}",
-        nfd: "\u{559D}",
-        nfkc: "\u{559D}",
-        nfkd: "\u{559D}",
-    },
-    NormalizationTest {
-        source: "\u{FA37}",
-        nfc: "\u{5606}",
-        nfd: "\u{5606}",
-        nfkc: "\u{5606}",
-        nfkd: "\u{5606}",
-    },
-    NormalizationTest {
-        source: "\u{FA38}",
-        nfc: "\u{5668}",
-        nfd: "\u{5668}",
-        nfkc: "\u{5668}",
-        nfkd: "\u{5668}",
-    },
-    NormalizationTest {
-        source: "\u{FA39}",
-        nfc: "\u{5840}",
-        nfd: "\u{5840}",
-        nfkc: "\u{5840}",
-        nfkd: "\u{5840}",
-    },
-    NormalizationTest {
-        source: "\u{FA3A}",
-        nfc: "\u{58A8}",
-        nfd: "\u{58A8}",
-        nfkc: "\u{58A8}",
-        nfkd: "\u{58A8}",
-    },
-    NormalizationTest {
-        source: "\u{FA3B}",
-        nfc: "\u{5C64}",
-        nfd: "\u{5C64}",
-        nfkc: "\u{5C64}",
-        nfkd: "\u{5C64}",
-    },
-    NormalizationTest {
-        source: "\u{FA3C}",
-        nfc: "\u{5C6E}",
-        nfd: "\u{5C6E}",
-        nfkc: "\u{5C6E}",
-        nfkd: "\u{5C6E}",
-    },
-    NormalizationTest {
-        source: "\u{FA3D}",
-        nfc: "\u{6094}",
-        nfd: "\u{6094}",
-        nfkc: "\u{6094}",
-        nfkd: "\u{6094}",
-    },
-    NormalizationTest {
-        source: "\u{FA3E}",
-        nfc: "\u{6168}",
-        nfd: "\u{6168}",
-        nfkc: "\u{6168}",
-        nfkd: "\u{6168}",
-    },
-    NormalizationTest {
-        source: "\u{FA3F}",
-        nfc: "\u{618E}",
-        nfd: "\u{618E}",
-        nfkc: "\u{618E}",
-        nfkd: "\u{618E}",
-    },
-    NormalizationTest {
-        source: "\u{FA40}",
-        nfc: "\u{61F2}",
-        nfd: "\u{61F2}",
-        nfkc: "\u{61F2}",
-        nfkd: "\u{61F2}",
-    },
-    NormalizationTest {
-        source: "\u{FA41}",
-        nfc: "\u{654F}",
-        nfd: "\u{654F}",
-        nfkc: "\u{654F}",
-        nfkd: "\u{654F}",
-    },
-    NormalizationTest {
-        source: "\u{FA42}",
-        nfc: "\u{65E2}",
-        nfd: "\u{65E2}",
-        nfkc: "\u{65E2}",
-        nfkd: "\u{65E2}",
-    },
-    NormalizationTest {
-        source: "\u{FA43}",
-        nfc: "\u{6691}",
-        nfd: "\u{6691}",
-        nfkc: "\u{6691}",
-        nfkd: "\u{6691}",
-    },
-    NormalizationTest {
-        source: "\u{FA44}",
-        nfc: "\u{6885}",
-        nfd: "\u{6885}",
-        nfkc: "\u{6885}",
-        nfkd: "\u{6885}",
-    },
-    NormalizationTest {
-        source: "\u{FA45}",
-        nfc: "\u{6D77}",
-        nfd: "\u{6D77}",
-        nfkc: "\u{6D77}",
-        nfkd: "\u{6D77}",
-    },
-    NormalizationTest {
-        source: "\u{FA46}",
-        nfc: "\u{6E1A}",
-        nfd: "\u{6E1A}",
-        nfkc: "\u{6E1A}",
-        nfkd: "\u{6E1A}",
-    },
-    NormalizationTest {
-        source: "\u{FA47}",
-        nfc: "\u{6F22}",
-        nfd: "\u{6F22}",
-        nfkc: "\u{6F22}",
-        nfkd: "\u{6F22}",
-    },
-    NormalizationTest {
-        source: "\u{FA48}",
-        nfc: "\u{716E}",
-        nfd: "\u{716E}",
-        nfkc: "\u{716E}",
-        nfkd: "\u{716E}",
-    },
-    NormalizationTest {
-        source: "\u{FA49}",
-        nfc: "\u{722B}",
-        nfd: "\u{722B}",
-        nfkc: "\u{722B}",
-        nfkd: "\u{722B}",
-    },
-    NormalizationTest {
-        source: "\u{FA4A}",
-        nfc: "\u{7422}",
-        nfd: "\u{7422}",
-        nfkc: "\u{7422}",
-        nfkd: "\u{7422}",
-    },
-    NormalizationTest {
-        source: "\u{FA4B}",
-        nfc: "\u{7891}",
-        nfd: "\u{7891}",
-        nfkc: "\u{7891}",
-        nfkd: "\u{7891}",
-    },
-    NormalizationTest {
-        source: "\u{FA4C}",
-        nfc: "\u{793E}",
-        nfd: "\u{793E}",
-        nfkc: "\u{793E}",
-        nfkd: "\u{793E}",
-    },
-    NormalizationTest {
-        source: "\u{FA4D}",
-        nfc: "\u{7949}",
-        nfd: "\u{7949}",
-        nfkc: "\u{7949}",
-        nfkd: "\u{7949}",
-    },
-    NormalizationTest {
-        source: "\u{FA4E}",
-        nfc: "\u{7948}",
-        nfd: "\u{7948}",
-        nfkc: "\u{7948}",
-        nfkd: "\u{7948}",
-    },
-    NormalizationTest {
-        source: "\u{FA4F}",
-        nfc: "\u{7950}",
-        nfd: "\u{7950}",
-        nfkc: "\u{7950}",
-        nfkd: "\u{7950}",
-    },
-    NormalizationTest {
-        source: "\u{FA50}",
-        nfc: "\u{7956}",
-        nfd: "\u{7956}",
-        nfkc: "\u{7956}",
-        nfkd: "\u{7956}",
-    },
-    NormalizationTest {
-        source: "\u{FA51}",
-        nfc: "\u{795D}",
-        nfd: "\u{795D}",
-        nfkc: "\u{795D}",
-        nfkd: "\u{795D}",
-    },
-    NormalizationTest {
-        source: "\u{FA52}",
-        nfc: "\u{798D}",
-        nfd: "\u{798D}",
-        nfkc: "\u{798D}",
-        nfkd: "\u{798D}",
-    },
-    NormalizationTest {
-        source: "\u{FA53}",
-        nfc: "\u{798E}",
-        nfd: "\u{798E}",
-        nfkc: "\u{798E}",
-        nfkd: "\u{798E}",
-    },
-    NormalizationTest {
-        source: "\u{FA54}",
-        nfc: "\u{7A40}",
-        nfd: "\u{7A40}",
-        nfkc: "\u{7A40}",
-        nfkd: "\u{7A40}",
-    },
-    NormalizationTest {
-        source: "\u{FA55}",
-        nfc: "\u{7A81}",
-        nfd: "\u{7A81}",
-        nfkc: "\u{7A81}",
-        nfkd: "\u{7A81}",
-    },
-    NormalizationTest {
-        source: "\u{FA56}",
-        nfc: "\u{7BC0}",
-        nfd: "\u{7BC0}",
-        nfkc: "\u{7BC0}",
-        nfkd: "\u{7BC0}",
-    },
-    NormalizationTest {
-        source: "\u{FA57}",
-        nfc: "\u{7DF4}",
-        nfd: "\u{7DF4}",
-        nfkc: "\u{7DF4}",
-        nfkd: "\u{7DF4}",
-    },
-    NormalizationTest {
-        source: "\u{FA58}",
-        nfc: "\u{7E09}",
-        nfd: "\u{7E09}",
-        nfkc: "\u{7E09}",
-        nfkd: "\u{7E09}",
-    },
-    NormalizationTest {
-        source: "\u{FA59}",
-        nfc: "\u{7E41}",
-        nfd: "\u{7E41}",
-        nfkc: "\u{7E41}",
-        nfkd: "\u{7E41}",
-    },
-    NormalizationTest {
-        source: "\u{FA5A}",
-        nfc: "\u{7F72}",
-        nfd: "\u{7F72}",
-        nfkc: "\u{7F72}",
-        nfkd: "\u{7F72}",
-    },
-    NormalizationTest {
-        source: "\u{FA5B}",
-        nfc: "\u{8005}",
-        nfd: "\u{8005}",
-        nfkc: "\u{8005}",
-        nfkd: "\u{8005}",
-    },
-    NormalizationTest {
-        source: "\u{FA5C}",
-        nfc: "\u{81ED}",
-        nfd: "\u{81ED}",
-        nfkc: "\u{81ED}",
-        nfkd: "\u{81ED}",
-    },
-    NormalizationTest {
-        source: "\u{FA5D}",
-        nfc: "\u{8279}",
-        nfd: "\u{8279}",
-        nfkc: "\u{8279}",
-        nfkd: "\u{8279}",
-    },
-    NormalizationTest {
-        source: "\u{FA5E}",
-        nfc: "\u{8279}",
-        nfd: "\u{8279}",
-        nfkc: "\u{8279}",
-        nfkd: "\u{8279}",
-    },
-    NormalizationTest {
-        source: "\u{FA5F}",
-        nfc: "\u{8457}",
-        nfd: "\u{8457}",
-        nfkc: "\u{8457}",
-        nfkd: "\u{8457}",
-    },
-    NormalizationTest {
-        source: "\u{FA60}",
-        nfc: "\u{8910}",
-        nfd: "\u{8910}",
-        nfkc: "\u{8910}",
-        nfkd: "\u{8910}",
-    },
-    NormalizationTest {
-        source: "\u{FA61}",
-        nfc: "\u{8996}",
-        nfd: "\u{8996}",
-        nfkc: "\u{8996}",
-        nfkd: "\u{8996}",
-    },
-    NormalizationTest {
-        source: "\u{FA62}",
-        nfc: "\u{8B01}",
-        nfd: "\u{8B01}",
-        nfkc: "\u{8B01}",
-        nfkd: "\u{8B01}",
-    },
-    NormalizationTest {
-        source: "\u{FA63}",
-        nfc: "\u{8B39}",
-        nfd: "\u{8B39}",
-        nfkc: "\u{8B39}",
-        nfkd: "\u{8B39}",
-    },
-    NormalizationTest {
-        source: "\u{FA64}",
-        nfc: "\u{8CD3}",
-        nfd: "\u{8CD3}",
-        nfkc: "\u{8CD3}",
-        nfkd: "\u{8CD3}",
-    },
-    NormalizationTest {
-        source: "\u{FA65}",
-        nfc: "\u{8D08}",
-        nfd: "\u{8D08}",
-        nfkc: "\u{8D08}",
-        nfkd: "\u{8D08}",
-    },
-    NormalizationTest {
-        source: "\u{FA66}",
-        nfc: "\u{8FB6}",
-        nfd: "\u{8FB6}",
-        nfkc: "\u{8FB6}",
-        nfkd: "\u{8FB6}",
-    },
-    NormalizationTest {
-        source: "\u{FA67}",
-        nfc: "\u{9038}",
-        nfd: "\u{9038}",
-        nfkc: "\u{9038}",
-        nfkd: "\u{9038}",
-    },
-    NormalizationTest {
-        source: "\u{FA68}",
-        nfc: "\u{96E3}",
-        nfd: "\u{96E3}",
-        nfkc: "\u{96E3}",
-        nfkd: "\u{96E3}",
-    },
-    NormalizationTest {
-        source: "\u{FA69}",
-        nfc: "\u{97FF}",
-        nfd: "\u{97FF}",
-        nfkc: "\u{97FF}",
-        nfkd: "\u{97FF}",
-    },
-    NormalizationTest {
-        source: "\u{FA6A}",
-        nfc: "\u{983B}",
-        nfd: "\u{983B}",
-        nfkc: "\u{983B}",
-        nfkd: "\u{983B}",
-    },
-    NormalizationTest {
-        source: "\u{FA6B}",
-        nfc: "\u{6075}",
-        nfd: "\u{6075}",
-        nfkc: "\u{6075}",
-        nfkd: "\u{6075}",
-    },
-    NormalizationTest {
-        source: "\u{FA6C}",
-        nfc: "\u{242EE}",
-        nfd: "\u{242EE}",
-        nfkc: "\u{242EE}",
-        nfkd: "\u{242EE}",
-    },
-    NormalizationTest {
-        source: "\u{FA6D}",
-        nfc: "\u{8218}",
-        nfd: "\u{8218}",
-        nfkc: "\u{8218}",
-        nfkd: "\u{8218}",
-    },
-    NormalizationTest {
-        source: "\u{FA70}",
-        nfc: "\u{4E26}",
-        nfd: "\u{4E26}",
-        nfkc: "\u{4E26}",
-        nfkd: "\u{4E26}",
-    },
-    NormalizationTest {
-        source: "\u{FA71}",
-        nfc: "\u{51B5}",
-        nfd: "\u{51B5}",
-        nfkc: "\u{51B5}",
-        nfkd: "\u{51B5}",
-    },
-    NormalizationTest {
-        source: "\u{FA72}",
-        nfc: "\u{5168}",
-        nfd: "\u{5168}",
-        nfkc: "\u{5168}",
-        nfkd: "\u{5168}",
-    },
-    NormalizationTest {
-        source: "\u{FA73}",
-        nfc: "\u{4F80}",
-        nfd: "\u{4F80}",
-        nfkc: "\u{4F80}",
-        nfkd: "\u{4F80}",
-    },
-    NormalizationTest {
-        source: "\u{FA74}",
-        nfc: "\u{5145}",
-        nfd: "\u{5145}",
-        nfkc: "\u{5145}",
-        nfkd: "\u{5145}",
-    },
-    NormalizationTest {
-        source: "\u{FA75}",
-        nfc: "\u{5180}",
-        nfd: "\u{5180}",
-        nfkc: "\u{5180}",
-        nfkd: "\u{5180}",
-    },
-    NormalizationTest {
-        source: "\u{FA76}",
-        nfc: "\u{52C7}",
-        nfd: "\u{52C7}",
-        nfkc: "\u{52C7}",
-        nfkd: "\u{52C7}",
-    },
-    NormalizationTest {
-        source: "\u{FA77}",
-        nfc: "\u{52FA}",
-        nfd: "\u{52FA}",
-        nfkc: "\u{52FA}",
-        nfkd: "\u{52FA}",
-    },
-    NormalizationTest {
-        source: "\u{FA78}",
-        nfc: "\u{559D}",
-        nfd: "\u{559D}",
-        nfkc: "\u{559D}",
-        nfkd: "\u{559D}",
-    },
-    NormalizationTest {
-        source: "\u{FA79}",
-        nfc: "\u{5555}",
-        nfd: "\u{5555}",
-        nfkc: "\u{5555}",
-        nfkd: "\u{5555}",
-    },
-    NormalizationTest {
-        source: "\u{FA7A}",
-        nfc: "\u{5599}",
-        nfd: "\u{5599}",
-        nfkc: "\u{5599}",
-        nfkd: "\u{5599}",
-    },
-    NormalizationTest {
-        source: "\u{FA7B}",
-        nfc: "\u{55E2}",
-        nfd: "\u{55E2}",
-        nfkc: "\u{55E2}",
-        nfkd: "\u{55E2}",
-    },
-    NormalizationTest {
-        source: "\u{FA7C}",
-        nfc: "\u{585A}",
-        nfd: "\u{585A}",
-        nfkc: "\u{585A}",
-        nfkd: "\u{585A}",
-    },
-    NormalizationTest {
-        source: "\u{FA7D}",
-        nfc: "\u{58B3}",
-        nfd: "\u{58B3}",
-        nfkc: "\u{58B3}",
-        nfkd: "\u{58B3}",
-    },
-    NormalizationTest {
-        source: "\u{FA7E}",
-        nfc: "\u{5944}",
-        nfd: "\u{5944}",
-        nfkc: "\u{5944}",
-        nfkd: "\u{5944}",
-    },
-    NormalizationTest {
-        source: "\u{FA7F}",
-        nfc: "\u{5954}",
-        nfd: "\u{5954}",
-        nfkc: "\u{5954}",
-        nfkd: "\u{5954}",
-    },
-    NormalizationTest {
-        source: "\u{FA80}",
-        nfc: "\u{5A62}",
-        nfd: "\u{5A62}",
-        nfkc: "\u{5A62}",
-        nfkd: "\u{5A62}",
-    },
-    NormalizationTest {
-        source: "\u{FA81}",
-        nfc: "\u{5B28}",
-        nfd: "\u{5B28}",
-        nfkc: "\u{5B28}",
-        nfkd: "\u{5B28}",
-    },
-    NormalizationTest {
-        source: "\u{FA82}",
-        nfc: "\u{5ED2}",
-        nfd: "\u{5ED2}",
-        nfkc: "\u{5ED2}",
-        nfkd: "\u{5ED2}",
-    },
-    NormalizationTest {
-        source: "\u{FA83}",
-        nfc: "\u{5ED9}",
-        nfd: "\u{5ED9}",
-        nfkc: "\u{5ED9}",
-        nfkd: "\u{5ED9}",
-    },
-    NormalizationTest {
-        source: "\u{FA84}",
-        nfc: "\u{5F69}",
-        nfd: "\u{5F69}",
-        nfkc: "\u{5F69}",
-        nfkd: "\u{5F69}",
-    },
-    NormalizationTest {
-        source: "\u{FA85}",
-        nfc: "\u{5FAD}",
-        nfd: "\u{5FAD}",
-        nfkc: "\u{5FAD}",
-        nfkd: "\u{5FAD}",
-    },
-    NormalizationTest {
-        source: "\u{FA86}",
-        nfc: "\u{60D8}",
-        nfd: "\u{60D8}",
-        nfkc: "\u{60D8}",
-        nfkd: "\u{60D8}",
-    },
-    NormalizationTest {
-        source: "\u{FA87}",
-        nfc: "\u{614E}",
-        nfd: "\u{614E}",
-        nfkc: "\u{614E}",
-        nfkd: "\u{614E}",
-    },
-    NormalizationTest {
-        source: "\u{FA88}",
-        nfc: "\u{6108}",
-        nfd: "\u{6108}",
-        nfkc: "\u{6108}",
-        nfkd: "\u{6108}",
-    },
-    NormalizationTest {
-        source: "\u{FA89}",
-        nfc: "\u{618E}",
-        nfd: "\u{618E}",
-        nfkc: "\u{618E}",
-        nfkd: "\u{618E}",
-    },
-    NormalizationTest {
-        source: "\u{FA8A}",
-        nfc: "\u{6160}",
-        nfd: "\u{6160}",
-        nfkc: "\u{6160}",
-        nfkd: "\u{6160}",
-    },
-    NormalizationTest {
-        source: "\u{FA8B}",
-        nfc: "\u{61F2}",
-        nfd: "\u{61F2}",
-        nfkc: "\u{61F2}",
-        nfkd: "\u{61F2}",
-    },
-    NormalizationTest {
-        source: "\u{FA8C}",
-        nfc: "\u{6234}",
-        nfd: "\u{6234}",
-        nfkc: "\u{6234}",
-        nfkd: "\u{6234}",
-    },
-    NormalizationTest {
-        source: "\u{FA8D}",
-        nfc: "\u{63C4}",
-        nfd: "\u{63C4}",
-        nfkc: "\u{63C4}",
-        nfkd: "\u{63C4}",
-    },
-    NormalizationTest {
-        source: "\u{FA8E}",
-        nfc: "\u{641C}",
-        nfd: "\u{641C}",
-        nfkc: "\u{641C}",
-        nfkd: "\u{641C}",
-    },
-    NormalizationTest {
-        source: "\u{FA8F}",
-        nfc: "\u{6452}",
-        nfd: "\u{6452}",
-        nfkc: "\u{6452}",
-        nfkd: "\u{6452}",
-    },
-    NormalizationTest {
-        source: "\u{FA90}",
-        nfc: "\u{6556}",
-        nfd: "\u{6556}",
-        nfkc: "\u{6556}",
-        nfkd: "\u{6556}",
-    },
-    NormalizationTest {
-        source: "\u{FA91}",
-        nfc: "\u{6674}",
-        nfd: "\u{6674}",
-        nfkc: "\u{6674}",
-        nfkd: "\u{6674}",
-    },
-    NormalizationTest {
-        source: "\u{FA92}",
-        nfc: "\u{6717}",
-        nfd: "\u{6717}",
-        nfkc: "\u{6717}",
-        nfkd: "\u{6717}",
-    },
-    NormalizationTest {
-        source: "\u{FA93}",
-        nfc: "\u{671B}",
-        nfd: "\u{671B}",
-        nfkc: "\u{671B}",
-        nfkd: "\u{671B}",
-    },
-    NormalizationTest {
-        source: "\u{FA94}",
-        nfc: "\u{6756}",
-        nfd: "\u{6756}",
-        nfkc: "\u{6756}",
-        nfkd: "\u{6756}",
-    },
-    NormalizationTest {
-        source: "\u{FA95}",
-        nfc: "\u{6B79}",
-        nfd: "\u{6B79}",
-        nfkc: "\u{6B79}",
-        nfkd: "\u{6B79}",
-    },
-    NormalizationTest {
-        source: "\u{FA96}",
-        nfc: "\u{6BBA}",
-        nfd: "\u{6BBA}",
-        nfkc: "\u{6BBA}",
-        nfkd: "\u{6BBA}",
-    },
-    NormalizationTest {
-        source: "\u{FA97}",
-        nfc: "\u{6D41}",
-        nfd: "\u{6D41}",
-        nfkc: "\u{6D41}",
-        nfkd: "\u{6D41}",
-    },
-    NormalizationTest {
-        source: "\u{FA98}",
-        nfc: "\u{6EDB}",
-        nfd: "\u{6EDB}",
-        nfkc: "\u{6EDB}",
-        nfkd: "\u{6EDB}",
-    },
-    NormalizationTest {
-        source: "\u{FA99}",
-        nfc: "\u{6ECB}",
-        nfd: "\u{6ECB}",
-        nfkc: "\u{6ECB}",
-        nfkd: "\u{6ECB}",
-    },
-    NormalizationTest {
-        source: "\u{FA9A}",
-        nfc: "\u{6F22}",
-        nfd: "\u{6F22}",
-        nfkc: "\u{6F22}",
-        nfkd: "\u{6F22}",
-    },
-    NormalizationTest {
-        source: "\u{FA9B}",
-        nfc: "\u{701E}",
-        nfd: "\u{701E}",
-        nfkc: "\u{701E}",
-        nfkd: "\u{701E}",
-    },
-    NormalizationTest {
-        source: "\u{FA9C}",
-        nfc: "\u{716E}",
-        nfd: "\u{716E}",
-        nfkc: "\u{716E}",
-        nfkd: "\u{716E}",
-    },
-    NormalizationTest {
-        source: "\u{FA9D}",
-        nfc: "\u{77A7}",
-        nfd: "\u{77A7}",
-        nfkc: "\u{77A7}",
-        nfkd: "\u{77A7}",
-    },
-    NormalizationTest {
-        source: "\u{FA9E}",
-        nfc: "\u{7235}",
-        nfd: "\u{7235}",
-        nfkc: "\u{7235}",
-        nfkd: "\u{7235}",
-    },
-    NormalizationTest {
-        source: "\u{FA9F}",
-        nfc: "\u{72AF}",
-        nfd: "\u{72AF}",
-        nfkc: "\u{72AF}",
-        nfkd: "\u{72AF}",
-    },
-    NormalizationTest {
-        source: "\u{FAA0}",
-        nfc: "\u{732A}",
-        nfd: "\u{732A}",
-        nfkc: "\u{732A}",
-        nfkd: "\u{732A}",
-    },
-    NormalizationTest {
-        source: "\u{FAA1}",
-        nfc: "\u{7471}",
-        nfd: "\u{7471}",
-        nfkc: "\u{7471}",
-        nfkd: "\u{7471}",
-    },
-    NormalizationTest {
-        source: "\u{FAA2}",
-        nfc: "\u{7506}",
-        nfd: "\u{7506}",
-        nfkc: "\u{7506}",
-        nfkd: "\u{7506}",
-    },
-    NormalizationTest {
-        source: "\u{FAA3}",
-        nfc: "\u{753B}",
-        nfd: "\u{753B}",
-        nfkc: "\u{753B}",
-        nfkd: "\u{753B}",
-    },
-    NormalizationTest {
-        source: "\u{FAA4}",
-        nfc: "\u{761D}",
-        nfd: "\u{761D}",
-        nfkc: "\u{761D}",
-        nfkd: "\u{761D}",
-    },
-    NormalizationTest {
-        source: "\u{FAA5}",
-        nfc: "\u{761F}",
-        nfd: "\u{761F}",
-        nfkc: "\u{761F}",
-        nfkd: "\u{761F}",
-    },
-    NormalizationTest {
-        source: "\u{FAA6}",
-        nfc: "\u{76CA}",
-        nfd: "\u{76CA}",
-        nfkc: "\u{76CA}",
-        nfkd: "\u{76CA}",
-    },
-    NormalizationTest {
-        source: "\u{FAA7}",
-        nfc: "\u{76DB}",
-        nfd: "\u{76DB}",
-        nfkc: "\u{76DB}",
-        nfkd: "\u{76DB}",
-    },
-    NormalizationTest {
-        source: "\u{FAA8}",
-        nfc: "\u{76F4}",
-        nfd: "\u{76F4}",
-        nfkc: "\u{76F4}",
-        nfkd: "\u{76F4}",
-    },
-    NormalizationTest {
-        source: "\u{FAA9}",
-        nfc: "\u{774A}",
-        nfd: "\u{774A}",
-        nfkc: "\u{774A}",
-        nfkd: "\u{774A}",
-    },
-    NormalizationTest {
-        source: "\u{FAAA}",
-        nfc: "\u{7740}",
-        nfd: "\u{7740}",
-        nfkc: "\u{7740}",
-        nfkd: "\u{7740}",
-    },
-    NormalizationTest {
-        source: "\u{FAAB}",
-        nfc: "\u{78CC}",
-        nfd: "\u{78CC}",
-        nfkc: "\u{78CC}",
-        nfkd: "\u{78CC}",
-    },
-    NormalizationTest {
-        source: "\u{FAAC}",
-        nfc: "\u{7AB1}",
-        nfd: "\u{7AB1}",
-        nfkc: "\u{7AB1}",
-        nfkd: "\u{7AB1}",
-    },
-    NormalizationTest {
-        source: "\u{FAAD}",
-        nfc: "\u{7BC0}",
-        nfd: "\u{7BC0}",
-        nfkc: "\u{7BC0}",
-        nfkd: "\u{7BC0}",
-    },
-    NormalizationTest {
-        source: "\u{FAAE}",
-        nfc: "\u{7C7B}",
-        nfd: "\u{7C7B}",
-        nfkc: "\u{7C7B}",
-        nfkd: "\u{7C7B}",
-    },
-    NormalizationTest {
-        source: "\u{FAAF}",
-        nfc: "\u{7D5B}",
-        nfd: "\u{7D5B}",
-        nfkc: "\u{7D5B}",
-        nfkd: "\u{7D5B}",
-    },
-    NormalizationTest {
-        source: "\u{FAB0}",
-        nfc: "\u{7DF4}",
-        nfd: "\u{7DF4}",
-        nfkc: "\u{7DF4}",
-        nfkd: "\u{7DF4}",
-    },
-    NormalizationTest {
-        source: "\u{FAB1}",
-        nfc: "\u{7F3E}",
-        nfd: "\u{7F3E}",
-        nfkc: "\u{7F3E}",
-        nfkd: "\u{7F3E}",
-    },
-    NormalizationTest {
-        source: "\u{FAB2}",
-        nfc: "\u{8005}",
-        nfd: "\u{8005}",
-        nfkc: "\u{8005}",
-        nfkd: "\u{8005}",
-    },
-    NormalizationTest {
-        source: "\u{FAB3}",
-        nfc: "\u{8352}",
-        nfd: "\u{8352}",
-        nfkc: "\u{8352}",
-        nfkd: "\u{8352}",
-    },
-    NormalizationTest {
-        source: "\u{FAB4}",
-        nfc: "\u{83EF}",
-        nfd: "\u{83EF}",
-        nfkc: "\u{83EF}",
-        nfkd: "\u{83EF}",
-    },
-    NormalizationTest {
-        source: "\u{FAB5}",
-        nfc: "\u{8779}",
-        nfd: "\u{8779}",
-        nfkc: "\u{8779}",
-        nfkd: "\u{8779}",
-    },
-    NormalizationTest {
-        source: "\u{FAB6}",
-        nfc: "\u{8941}",
-        nfd: "\u{8941}",
-        nfkc: "\u{8941}",
-        nfkd: "\u{8941}",
-    },
-    NormalizationTest {
-        source: "\u{FAB7}",
-        nfc: "\u{8986}",
-        nfd: "\u{8986}",
-        nfkc: "\u{8986}",
-        nfkd: "\u{8986}",
-    },
-    NormalizationTest {
-        source: "\u{FAB8}",
-        nfc: "\u{8996}",
-        nfd: "\u{8996}",
-        nfkc: "\u{8996}",
-        nfkd: "\u{8996}",
-    },
-    NormalizationTest {
-        source: "\u{FAB9}",
-        nfc: "\u{8ABF}",
-        nfd: "\u{8ABF}",
-        nfkc: "\u{8ABF}",
-        nfkd: "\u{8ABF}",
-    },
-    NormalizationTest {
-        source: "\u{FABA}",
-        nfc: "\u{8AF8}",
-        nfd: "\u{8AF8}",
-        nfkc: "\u{8AF8}",
-        nfkd: "\u{8AF8}",
-    },
-    NormalizationTest {
-        source: "\u{FABB}",
-        nfc: "\u{8ACB}",
-        nfd: "\u{8ACB}",
-        nfkc: "\u{8ACB}",
-        nfkd: "\u{8ACB}",
-    },
-    NormalizationTest {
-        source: "\u{FABC}",
-        nfc: "\u{8B01}",
-        nfd: "\u{8B01}",
-        nfkc: "\u{8B01}",
-        nfkd: "\u{8B01}",
-    },
-    NormalizationTest {
-        source: "\u{FABD}",
-        nfc: "\u{8AFE}",
-        nfd: "\u{8AFE}",
-        nfkc: "\u{8AFE}",
-        nfkd: "\u{8AFE}",
-    },
-    NormalizationTest {
-        source: "\u{FABE}",
-        nfc: "\u{8AED}",
-        nfd: "\u{8AED}",
-        nfkc: "\u{8AED}",
-        nfkd: "\u{8AED}",
-    },
-    NormalizationTest {
-        source: "\u{FABF}",
-        nfc: "\u{8B39}",
-        nfd: "\u{8B39}",
-        nfkc: "\u{8B39}",
-        nfkd: "\u{8B39}",
-    },
-    NormalizationTest {
-        source: "\u{FAC0}",
-        nfc: "\u{8B8A}",
-        nfd: "\u{8B8A}",
-        nfkc: "\u{8B8A}",
-        nfkd: "\u{8B8A}",
-    },
-    NormalizationTest {
-        source: "\u{FAC1}",
-        nfc: "\u{8D08}",
-        nfd: "\u{8D08}",
-        nfkc: "\u{8D08}",
-        nfkd: "\u{8D08}",
-    },
-    NormalizationTest {
-        source: "\u{FAC2}",
-        nfc: "\u{8F38}",
-        nfd: "\u{8F38}",
-        nfkc: "\u{8F38}",
-        nfkd: "\u{8F38}",
-    },
-    NormalizationTest {
-        source: "\u{FAC3}",
-        nfc: "\u{9072}",
-        nfd: "\u{9072}",
-        nfkc: "\u{9072}",
-        nfkd: "\u{9072}",
-    },
-    NormalizationTest {
-        source: "\u{FAC4}",
-        nfc: "\u{9199}",
-        nfd: "\u{9199}",
-        nfkc: "\u{9199}",
-        nfkd: "\u{9199}",
-    },
-    NormalizationTest {
-        source: "\u{FAC5}",
-        nfc: "\u{9276}",
-        nfd: "\u{9276}",
-        nfkc: "\u{9276}",
-        nfkd: "\u{9276}",
-    },
-    NormalizationTest {
-        source: "\u{FAC6}",
-        nfc: "\u{967C}",
-        nfd: "\u{967C}",
-        nfkc: "\u{967C}",
-        nfkd: "\u{967C}",
-    },
-    NormalizationTest {
-        source: "\u{FAC7}",
-        nfc: "\u{96E3}",
-        nfd: "\u{96E3}",
-        nfkc: "\u{96E3}",
-        nfkd: "\u{96E3}",
-    },
-    NormalizationTest {
-        source: "\u{FAC8}",
-        nfc: "\u{9756}",
-        nfd: "\u{9756}",
-        nfkc: "\u{9756}",
-        nfkd: "\u{9756}",
-    },
-    NormalizationTest {
-        source: "\u{FAC9}",
-        nfc: "\u{97DB}",
-        nfd: "\u{97DB}",
-        nfkc: "\u{97DB}",
-        nfkd: "\u{97DB}",
-    },
-    NormalizationTest {
-        source: "\u{FACA}",
-        nfc: "\u{97FF}",
-        nfd: "\u{97FF}",
-        nfkc: "\u{97FF}",
-        nfkd: "\u{97FF}",
-    },
-    NormalizationTest {
-        source: "\u{FACB}",
-        nfc: "\u{980B}",
-        nfd: "\u{980B}",
-        nfkc: "\u{980B}",
-        nfkd: "\u{980B}",
-    },
-    NormalizationTest {
-        source: "\u{FACC}",
-        nfc: "\u{983B}",
-        nfd: "\u{983B}",
-        nfkc: "\u{983B}",
-        nfkd: "\u{983B}",
-    },
-    NormalizationTest {
-        source: "\u{FACD}",
-        nfc: "\u{9B12}",
-        nfd: "\u{9B12}",
-        nfkc: "\u{9B12}",
-        nfkd: "\u{9B12}",
-    },
-    NormalizationTest {
-        source: "\u{FACE}",
-        nfc: "\u{9F9C}",
-        nfd: "\u{9F9C}",
-        nfkc: "\u{9F9C}",
-        nfkd: "\u{9F9C}",
-    },
-    NormalizationTest {
-        source: "\u{FACF}",
-        nfc: "\u{2284A}",
-        nfd: "\u{2284A}",
-        nfkc: "\u{2284A}",
-        nfkd: "\u{2284A}",
-    },
-    NormalizationTest {
-        source: "\u{FAD0}",
-        nfc: "\u{22844}",
-        nfd: "\u{22844}",
-        nfkc: "\u{22844}",
-        nfkd: "\u{22844}",
-    },
-    NormalizationTest {
-        source: "\u{FAD1}",
-        nfc: "\u{233D5}",
-        nfd: "\u{233D5}",
-        nfkc: "\u{233D5}",
-        nfkd: "\u{233D5}",
-    },
-    NormalizationTest {
-        source: "\u{FAD2}",
-        nfc: "\u{3B9D}",
-        nfd: "\u{3B9D}",
-        nfkc: "\u{3B9D}",
-        nfkd: "\u{3B9D}",
-    },
-    NormalizationTest {
-        source: "\u{FAD3}",
-        nfc: "\u{4018}",
-        nfd: "\u{4018}",
-        nfkc: "\u{4018}",
-        nfkd: "\u{4018}",
-    },
-    NormalizationTest {
-        source: "\u{FAD4}",
-        nfc: "\u{4039}",
-        nfd: "\u{4039}",
-        nfkc: "\u{4039}",
-        nfkd: "\u{4039}",
-    },
-    NormalizationTest {
-        source: "\u{FAD5}",
-        nfc: "\u{25249}",
-        nfd: "\u{25249}",
-        nfkc: "\u{25249}",
-        nfkd: "\u{25249}",
-    },
-    NormalizationTest {
-        source: "\u{FAD6}",
-        nfc: "\u{25CD0}",
-        nfd: "\u{25CD0}",
-        nfkc: "\u{25CD0}",
-        nfkd: "\u{25CD0}",
-    },
-    NormalizationTest {
-        source: "\u{FAD7}",
-        nfc: "\u{27ED3}",
-        nfd: "\u{27ED3}",
-        nfkc: "\u{27ED3}",
-        nfkd: "\u{27ED3}",
-    },
-    NormalizationTest {
-        source: "\u{FAD8}",
-        nfc: "\u{9F43}",
-        nfd: "\u{9F43}",
-        nfkc: "\u{9F43}",
-        nfkd: "\u{9F43}",
-    },
-    NormalizationTest {
-        source: "\u{FAD9}",
-        nfc: "\u{9F8E}",
-        nfd: "\u{9F8E}",
-        nfkc: "\u{9F8E}",
-        nfkd: "\u{9F8E}",
-    },
-    NormalizationTest {
-        source: "\u{FB00}",
-        nfc: "\u{FB00}",
-        nfd: "\u{FB00}",
-        nfkc: "\u{0066}\u{0066}",
-        nfkd: "\u{0066}\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{FB01}",
-        nfc: "\u{FB01}",
-        nfd: "\u{FB01}",
-        nfkc: "\u{0066}\u{0069}",
-        nfkd: "\u{0066}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{FB02}",
-        nfc: "\u{FB02}",
-        nfd: "\u{FB02}",
-        nfkc: "\u{0066}\u{006C}",
-        nfkd: "\u{0066}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{FB03}",
-        nfc: "\u{FB03}",
-        nfd: "\u{FB03}",
-        nfkc: "\u{0066}\u{0066}\u{0069}",
-        nfkd: "\u{0066}\u{0066}\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{FB04}",
-        nfc: "\u{FB04}",
-        nfd: "\u{FB04}",
-        nfkc: "\u{0066}\u{0066}\u{006C}",
-        nfkd: "\u{0066}\u{0066}\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{FB05}",
-        nfc: "\u{FB05}",
-        nfd: "\u{FB05}",
-        nfkc: "\u{0073}\u{0074}",
-        nfkd: "\u{0073}\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{FB06}",
-        nfc: "\u{FB06}",
-        nfd: "\u{FB06}",
-        nfkc: "\u{0073}\u{0074}",
-        nfkd: "\u{0073}\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{FB13}",
-        nfc: "\u{FB13}",
-        nfd: "\u{FB13}",
-        nfkc: "\u{0574}\u{0576}",
-        nfkd: "\u{0574}\u{0576}",
-    },
-    NormalizationTest {
-        source: "\u{FB14}",
-        nfc: "\u{FB14}",
-        nfd: "\u{FB14}",
-        nfkc: "\u{0574}\u{0565}",
-        nfkd: "\u{0574}\u{0565}",
-    },
-    NormalizationTest {
-        source: "\u{FB15}",
-        nfc: "\u{FB15}",
-        nfd: "\u{FB15}",
-        nfkc: "\u{0574}\u{056B}",
-        nfkd: "\u{0574}\u{056B}",
-    },
-    NormalizationTest {
-        source: "\u{FB16}",
-        nfc: "\u{FB16}",
-        nfd: "\u{FB16}",
-        nfkc: "\u{057E}\u{0576}",
-        nfkd: "\u{057E}\u{0576}",
-    },
-    NormalizationTest {
-        source: "\u{FB17}",
-        nfc: "\u{FB17}",
-        nfd: "\u{FB17}",
-        nfkc: "\u{0574}\u{056D}",
-        nfkd: "\u{0574}\u{056D}",
-    },
-    NormalizationTest {
-        source: "\u{FB1D}",
-        nfc: "\u{05D9}\u{05B4}",
-        nfd: "\u{05D9}\u{05B4}",
-        nfkc: "\u{05D9}\u{05B4}",
-        nfkd: "\u{05D9}\u{05B4}",
-    },
-    NormalizationTest {
-        source: "\u{FB1F}",
-        nfc: "\u{05F2}\u{05B7}",
-        nfd: "\u{05F2}\u{05B7}",
-        nfkc: "\u{05F2}\u{05B7}",
-        nfkd: "\u{05F2}\u{05B7}",
-    },
-    NormalizationTest {
-        source: "\u{FB20}",
-        nfc: "\u{FB20}",
-        nfd: "\u{FB20}",
-        nfkc: "\u{05E2}",
-        nfkd: "\u{05E2}",
-    },
-    NormalizationTest {
-        source: "\u{FB21}",
-        nfc: "\u{FB21}",
-        nfd: "\u{FB21}",
-        nfkc: "\u{05D0}",
-        nfkd: "\u{05D0}",
-    },
-    NormalizationTest {
-        source: "\u{FB22}",
-        nfc: "\u{FB22}",
-        nfd: "\u{FB22}",
-        nfkc: "\u{05D3}",
-        nfkd: "\u{05D3}",
-    },
-    NormalizationTest {
-        source: "\u{FB23}",
-        nfc: "\u{FB23}",
-        nfd: "\u{FB23}",
-        nfkc: "\u{05D4}",
-        nfkd: "\u{05D4}",
-    },
-    NormalizationTest {
-        source: "\u{FB24}",
-        nfc: "\u{FB24}",
-        nfd: "\u{FB24}",
-        nfkc: "\u{05DB}",
-        nfkd: "\u{05DB}",
-    },
-    NormalizationTest {
-        source: "\u{FB25}",
-        nfc: "\u{FB25}",
-        nfd: "\u{FB25}",
-        nfkc: "\u{05DC}",
-        nfkd: "\u{05DC}",
-    },
-    NormalizationTest {
-        source: "\u{FB26}",
-        nfc: "\u{FB26}",
-        nfd: "\u{FB26}",
-        nfkc: "\u{05DD}",
-        nfkd: "\u{05DD}",
-    },
-    NormalizationTest {
-        source: "\u{FB27}",
-        nfc: "\u{FB27}",
-        nfd: "\u{FB27}",
-        nfkc: "\u{05E8}",
-        nfkd: "\u{05E8}",
-    },
-    NormalizationTest {
-        source: "\u{FB28}",
-        nfc: "\u{FB28}",
-        nfd: "\u{FB28}",
-        nfkc: "\u{05EA}",
-        nfkd: "\u{05EA}",
-    },
-    NormalizationTest {
-        source: "\u{FB29}",
-        nfc: "\u{FB29}",
-        nfd: "\u{FB29}",
-        nfkc: "\u{002B}",
-        nfkd: "\u{002B}",
-    },
-    NormalizationTest {
-        source: "\u{FB2A}",
-        nfc: "\u{05E9}\u{05C1}",
-        nfd: "\u{05E9}\u{05C1}",
-        nfkc: "\u{05E9}\u{05C1}",
-        nfkd: "\u{05E9}\u{05C1}",
-    },
-    NormalizationTest {
-        source: "\u{FB2B}",
-        nfc: "\u{05E9}\u{05C2}",
-        nfd: "\u{05E9}\u{05C2}",
-        nfkc: "\u{05E9}\u{05C2}",
-        nfkd: "\u{05E9}\u{05C2}",
-    },
-    NormalizationTest {
-        source: "\u{FB2C}",
-        nfc: "\u{05E9}\u{05BC}\u{05C1}",
-        nfd: "\u{05E9}\u{05BC}\u{05C1}",
-        nfkc: "\u{05E9}\u{05BC}\u{05C1}",
-        nfkd: "\u{05E9}\u{05BC}\u{05C1}",
-    },
-    NormalizationTest {
-        source: "\u{FB2D}",
-        nfc: "\u{05E9}\u{05BC}\u{05C2}",
-        nfd: "\u{05E9}\u{05BC}\u{05C2}",
-        nfkc: "\u{05E9}\u{05BC}\u{05C2}",
-        nfkd: "\u{05E9}\u{05BC}\u{05C2}",
-    },
-    NormalizationTest {
-        source: "\u{FB2E}",
-        nfc: "\u{05D0}\u{05B7}",
-        nfd: "\u{05D0}\u{05B7}",
-        nfkc: "\u{05D0}\u{05B7}",
-        nfkd: "\u{05D0}\u{05B7}",
-    },
-    NormalizationTest {
-        source: "\u{FB2F}",
-        nfc: "\u{05D0}\u{05B8}",
-        nfd: "\u{05D0}\u{05B8}",
-        nfkc: "\u{05D0}\u{05B8}",
-        nfkd: "\u{05D0}\u{05B8}",
-    },
-    NormalizationTest {
-        source: "\u{FB30}",
-        nfc: "\u{05D0}\u{05BC}",
-        nfd: "\u{05D0}\u{05BC}",
-        nfkc: "\u{05D0}\u{05BC}",
-        nfkd: "\u{05D0}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB31}",
-        nfc: "\u{05D1}\u{05BC}",
-        nfd: "\u{05D1}\u{05BC}",
-        nfkc: "\u{05D1}\u{05BC}",
-        nfkd: "\u{05D1}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB32}",
-        nfc: "\u{05D2}\u{05BC}",
-        nfd: "\u{05D2}\u{05BC}",
-        nfkc: "\u{05D2}\u{05BC}",
-        nfkd: "\u{05D2}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB33}",
-        nfc: "\u{05D3}\u{05BC}",
-        nfd: "\u{05D3}\u{05BC}",
-        nfkc: "\u{05D3}\u{05BC}",
-        nfkd: "\u{05D3}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB34}",
-        nfc: "\u{05D4}\u{05BC}",
-        nfd: "\u{05D4}\u{05BC}",
-        nfkc: "\u{05D4}\u{05BC}",
-        nfkd: "\u{05D4}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB35}",
-        nfc: "\u{05D5}\u{05BC}",
-        nfd: "\u{05D5}\u{05BC}",
-        nfkc: "\u{05D5}\u{05BC}",
-        nfkd: "\u{05D5}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB36}",
-        nfc: "\u{05D6}\u{05BC}",
-        nfd: "\u{05D6}\u{05BC}",
-        nfkc: "\u{05D6}\u{05BC}",
-        nfkd: "\u{05D6}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB38}",
-        nfc: "\u{05D8}\u{05BC}",
-        nfd: "\u{05D8}\u{05BC}",
-        nfkc: "\u{05D8}\u{05BC}",
-        nfkd: "\u{05D8}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB39}",
-        nfc: "\u{05D9}\u{05BC}",
-        nfd: "\u{05D9}\u{05BC}",
-        nfkc: "\u{05D9}\u{05BC}",
-        nfkd: "\u{05D9}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB3A}",
-        nfc: "\u{05DA}\u{05BC}",
-        nfd: "\u{05DA}\u{05BC}",
-        nfkc: "\u{05DA}\u{05BC}",
-        nfkd: "\u{05DA}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB3B}",
-        nfc: "\u{05DB}\u{05BC}",
-        nfd: "\u{05DB}\u{05BC}",
-        nfkc: "\u{05DB}\u{05BC}",
-        nfkd: "\u{05DB}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB3C}",
-        nfc: "\u{05DC}\u{05BC}",
-        nfd: "\u{05DC}\u{05BC}",
-        nfkc: "\u{05DC}\u{05BC}",
-        nfkd: "\u{05DC}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB3E}",
-        nfc: "\u{05DE}\u{05BC}",
-        nfd: "\u{05DE}\u{05BC}",
-        nfkc: "\u{05DE}\u{05BC}",
-        nfkd: "\u{05DE}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB40}",
-        nfc: "\u{05E0}\u{05BC}",
-        nfd: "\u{05E0}\u{05BC}",
-        nfkc: "\u{05E0}\u{05BC}",
-        nfkd: "\u{05E0}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB41}",
-        nfc: "\u{05E1}\u{05BC}",
-        nfd: "\u{05E1}\u{05BC}",
-        nfkc: "\u{05E1}\u{05BC}",
-        nfkd: "\u{05E1}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB43}",
-        nfc: "\u{05E3}\u{05BC}",
-        nfd: "\u{05E3}\u{05BC}",
-        nfkc: "\u{05E3}\u{05BC}",
-        nfkd: "\u{05E3}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB44}",
-        nfc: "\u{05E4}\u{05BC}",
-        nfd: "\u{05E4}\u{05BC}",
-        nfkc: "\u{05E4}\u{05BC}",
-        nfkd: "\u{05E4}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB46}",
-        nfc: "\u{05E6}\u{05BC}",
-        nfd: "\u{05E6}\u{05BC}",
-        nfkc: "\u{05E6}\u{05BC}",
-        nfkd: "\u{05E6}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB47}",
-        nfc: "\u{05E7}\u{05BC}",
-        nfd: "\u{05E7}\u{05BC}",
-        nfkc: "\u{05E7}\u{05BC}",
-        nfkd: "\u{05E7}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB48}",
-        nfc: "\u{05E8}\u{05BC}",
-        nfd: "\u{05E8}\u{05BC}",
-        nfkc: "\u{05E8}\u{05BC}",
-        nfkd: "\u{05E8}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB49}",
-        nfc: "\u{05E9}\u{05BC}",
-        nfd: "\u{05E9}\u{05BC}",
-        nfkc: "\u{05E9}\u{05BC}",
-        nfkd: "\u{05E9}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB4A}",
-        nfc: "\u{05EA}\u{05BC}",
-        nfd: "\u{05EA}\u{05BC}",
-        nfkc: "\u{05EA}\u{05BC}",
-        nfkd: "\u{05EA}\u{05BC}",
-    },
-    NormalizationTest {
-        source: "\u{FB4B}",
-        nfc: "\u{05D5}\u{05B9}",
-        nfd: "\u{05D5}\u{05B9}",
-        nfkc: "\u{05D5}\u{05B9}",
-        nfkd: "\u{05D5}\u{05B9}",
-    },
-    NormalizationTest {
-        source: "\u{FB4C}",
-        nfc: "\u{05D1}\u{05BF}",
-        nfd: "\u{05D1}\u{05BF}",
-        nfkc: "\u{05D1}\u{05BF}",
-        nfkd: "\u{05D1}\u{05BF}",
-    },
-    NormalizationTest {
-        source: "\u{FB4D}",
-        nfc: "\u{05DB}\u{05BF}",
-        nfd: "\u{05DB}\u{05BF}",
-        nfkc: "\u{05DB}\u{05BF}",
-        nfkd: "\u{05DB}\u{05BF}",
-    },
-    NormalizationTest {
-        source: "\u{FB4E}",
-        nfc: "\u{05E4}\u{05BF}",
-        nfd: "\u{05E4}\u{05BF}",
-        nfkc: "\u{05E4}\u{05BF}",
-        nfkd: "\u{05E4}\u{05BF}",
-    },
-    NormalizationTest {
-        source: "\u{FB4F}",
-        nfc: "\u{FB4F}",
-        nfd: "\u{FB4F}",
-        nfkc: "\u{05D0}\u{05DC}",
-        nfkd: "\u{05D0}\u{05DC}",
-    },
-    NormalizationTest {
-        source: "\u{FB50}",
-        nfc: "\u{FB50}",
-        nfd: "\u{FB50}",
-        nfkc: "\u{0671}",
-        nfkd: "\u{0671}",
-    },
-    NormalizationTest {
-        source: "\u{FB51}",
-        nfc: "\u{FB51}",
-        nfd: "\u{FB51}",
-        nfkc: "\u{0671}",
-        nfkd: "\u{0671}",
-    },
-    NormalizationTest {
-        source: "\u{FB52}",
-        nfc: "\u{FB52}",
-        nfd: "\u{FB52}",
-        nfkc: "\u{067B}",
-        nfkd: "\u{067B}",
-    },
-    NormalizationTest {
-        source: "\u{FB53}",
-        nfc: "\u{FB53}",
-        nfd: "\u{FB53}",
-        nfkc: "\u{067B}",
-        nfkd: "\u{067B}",
-    },
-    NormalizationTest {
-        source: "\u{FB54}",
-        nfc: "\u{FB54}",
-        nfd: "\u{FB54}",
-        nfkc: "\u{067B}",
-        nfkd: "\u{067B}",
-    },
-    NormalizationTest {
-        source: "\u{FB55}",
-        nfc: "\u{FB55}",
-        nfd: "\u{FB55}",
-        nfkc: "\u{067B}",
-        nfkd: "\u{067B}",
-    },
-    NormalizationTest {
-        source: "\u{FB56}",
-        nfc: "\u{FB56}",
-        nfd: "\u{FB56}",
-        nfkc: "\u{067E}",
-        nfkd: "\u{067E}",
-    },
-    NormalizationTest {
-        source: "\u{FB57}",
-        nfc: "\u{FB57}",
-        nfd: "\u{FB57}",
-        nfkc: "\u{067E}",
-        nfkd: "\u{067E}",
-    },
-    NormalizationTest {
-        source: "\u{FB58}",
-        nfc: "\u{FB58}",
-        nfd: "\u{FB58}",
-        nfkc: "\u{067E}",
-        nfkd: "\u{067E}",
-    },
-    NormalizationTest {
-        source: "\u{FB59}",
-        nfc: "\u{FB59}",
-        nfd: "\u{FB59}",
-        nfkc: "\u{067E}",
-        nfkd: "\u{067E}",
-    },
-    NormalizationTest {
-        source: "\u{FB5A}",
-        nfc: "\u{FB5A}",
-        nfd: "\u{FB5A}",
-        nfkc: "\u{0680}",
-        nfkd: "\u{0680}",
-    },
-    NormalizationTest {
-        source: "\u{FB5B}",
-        nfc: "\u{FB5B}",
-        nfd: "\u{FB5B}",
-        nfkc: "\u{0680}",
-        nfkd: "\u{0680}",
-    },
-    NormalizationTest {
-        source: "\u{FB5C}",
-        nfc: "\u{FB5C}",
-        nfd: "\u{FB5C}",
-        nfkc: "\u{0680}",
-        nfkd: "\u{0680}",
-    },
-    NormalizationTest {
-        source: "\u{FB5D}",
-        nfc: "\u{FB5D}",
-        nfd: "\u{FB5D}",
-        nfkc: "\u{0680}",
-        nfkd: "\u{0680}",
-    },
-    NormalizationTest {
-        source: "\u{FB5E}",
-        nfc: "\u{FB5E}",
-        nfd: "\u{FB5E}",
-        nfkc: "\u{067A}",
-        nfkd: "\u{067A}",
-    },
-    NormalizationTest {
-        source: "\u{FB5F}",
-        nfc: "\u{FB5F}",
-        nfd: "\u{FB5F}",
-        nfkc: "\u{067A}",
-        nfkd: "\u{067A}",
-    },
-    NormalizationTest {
-        source: "\u{FB60}",
-        nfc: "\u{FB60}",
-        nfd: "\u{FB60}",
-        nfkc: "\u{067A}",
-        nfkd: "\u{067A}",
-    },
-    NormalizationTest {
-        source: "\u{FB61}",
-        nfc: "\u{FB61}",
-        nfd: "\u{FB61}",
-        nfkc: "\u{067A}",
-        nfkd: "\u{067A}",
-    },
-    NormalizationTest {
-        source: "\u{FB62}",
-        nfc: "\u{FB62}",
-        nfd: "\u{FB62}",
-        nfkc: "\u{067F}",
-        nfkd: "\u{067F}",
-    },
-    NormalizationTest {
-        source: "\u{FB63}",
-        nfc: "\u{FB63}",
-        nfd: "\u{FB63}",
-        nfkc: "\u{067F}",
-        nfkd: "\u{067F}",
-    },
-    NormalizationTest {
-        source: "\u{FB64}",
-        nfc: "\u{FB64}",
-        nfd: "\u{FB64}",
-        nfkc: "\u{067F}",
-        nfkd: "\u{067F}",
-    },
-    NormalizationTest {
-        source: "\u{FB65}",
-        nfc: "\u{FB65}",
-        nfd: "\u{FB65}",
-        nfkc: "\u{067F}",
-        nfkd: "\u{067F}",
-    },
-    NormalizationTest {
-        source: "\u{FB66}",
-        nfc: "\u{FB66}",
-        nfd: "\u{FB66}",
-        nfkc: "\u{0679}",
-        nfkd: "\u{0679}",
-    },
-    NormalizationTest {
-        source: "\u{FB67}",
-        nfc: "\u{FB67}",
-        nfd: "\u{FB67}",
-        nfkc: "\u{0679}",
-        nfkd: "\u{0679}",
-    },
-    NormalizationTest {
-        source: "\u{FB68}",
-        nfc: "\u{FB68}",
-        nfd: "\u{FB68}",
-        nfkc: "\u{0679}",
-        nfkd: "\u{0679}",
-    },
-    NormalizationTest {
-        source: "\u{FB69}",
-        nfc: "\u{FB69}",
-        nfd: "\u{FB69}",
-        nfkc: "\u{0679}",
-        nfkd: "\u{0679}",
-    },
-    NormalizationTest {
-        source: "\u{FB6A}",
-        nfc: "\u{FB6A}",
-        nfd: "\u{FB6A}",
-        nfkc: "\u{06A4}",
-        nfkd: "\u{06A4}",
-    },
-    NormalizationTest {
-        source: "\u{FB6B}",
-        nfc: "\u{FB6B}",
-        nfd: "\u{FB6B}",
-        nfkc: "\u{06A4}",
-        nfkd: "\u{06A4}",
-    },
-    NormalizationTest {
-        source: "\u{FB6C}",
-        nfc: "\u{FB6C}",
-        nfd: "\u{FB6C}",
-        nfkc: "\u{06A4}",
-        nfkd: "\u{06A4}",
-    },
-    NormalizationTest {
-        source: "\u{FB6D}",
-        nfc: "\u{FB6D}",
-        nfd: "\u{FB6D}",
-        nfkc: "\u{06A4}",
-        nfkd: "\u{06A4}",
-    },
-    NormalizationTest {
-        source: "\u{FB6E}",
-        nfc: "\u{FB6E}",
-        nfd: "\u{FB6E}",
-        nfkc: "\u{06A6}",
-        nfkd: "\u{06A6}",
-    },
-    NormalizationTest {
-        source: "\u{FB6F}",
-        nfc: "\u{FB6F}",
-        nfd: "\u{FB6F}",
-        nfkc: "\u{06A6}",
-        nfkd: "\u{06A6}",
-    },
-    NormalizationTest {
-        source: "\u{FB70}",
-        nfc: "\u{FB70}",
-        nfd: "\u{FB70}",
-        nfkc: "\u{06A6}",
-        nfkd: "\u{06A6}",
-    },
-    NormalizationTest {
-        source: "\u{FB71}",
-        nfc: "\u{FB71}",
-        nfd: "\u{FB71}",
-        nfkc: "\u{06A6}",
-        nfkd: "\u{06A6}",
-    },
-    NormalizationTest {
-        source: "\u{FB72}",
-        nfc: "\u{FB72}",
-        nfd: "\u{FB72}",
-        nfkc: "\u{0684}",
-        nfkd: "\u{0684}",
-    },
-    NormalizationTest {
-        source: "\u{FB73}",
-        nfc: "\u{FB73}",
-        nfd: "\u{FB73}",
-        nfkc: "\u{0684}",
-        nfkd: "\u{0684}",
-    },
-    NormalizationTest {
-        source: "\u{FB74}",
-        nfc: "\u{FB74}",
-        nfd: "\u{FB74}",
-        nfkc: "\u{0684}",
-        nfkd: "\u{0684}",
-    },
-    NormalizationTest {
-        source: "\u{FB75}",
-        nfc: "\u{FB75}",
-        nfd: "\u{FB75}",
-        nfkc: "\u{0684}",
-        nfkd: "\u{0684}",
-    },
-    NormalizationTest {
-        source: "\u{FB76}",
-        nfc: "\u{FB76}",
-        nfd: "\u{FB76}",
-        nfkc: "\u{0683}",
-        nfkd: "\u{0683}",
-    },
-    NormalizationTest {
-        source: "\u{FB77}",
-        nfc: "\u{FB77}",
-        nfd: "\u{FB77}",
-        nfkc: "\u{0683}",
-        nfkd: "\u{0683}",
-    },
-    NormalizationTest {
-        source: "\u{FB78}",
-        nfc: "\u{FB78}",
-        nfd: "\u{FB78}",
-        nfkc: "\u{0683}",
-        nfkd: "\u{0683}",
-    },
-    NormalizationTest {
-        source: "\u{FB79}",
-        nfc: "\u{FB79}",
-        nfd: "\u{FB79}",
-        nfkc: "\u{0683}",
-        nfkd: "\u{0683}",
-    },
-    NormalizationTest {
-        source: "\u{FB7A}",
-        nfc: "\u{FB7A}",
-        nfd: "\u{FB7A}",
-        nfkc: "\u{0686}",
-        nfkd: "\u{0686}",
-    },
-    NormalizationTest {
-        source: "\u{FB7B}",
-        nfc: "\u{FB7B}",
-        nfd: "\u{FB7B}",
-        nfkc: "\u{0686}",
-        nfkd: "\u{0686}",
-    },
-    NormalizationTest {
-        source: "\u{FB7C}",
-        nfc: "\u{FB7C}",
-        nfd: "\u{FB7C}",
-        nfkc: "\u{0686}",
-        nfkd: "\u{0686}",
-    },
-    NormalizationTest {
-        source: "\u{FB7D}",
-        nfc: "\u{FB7D}",
-        nfd: "\u{FB7D}",
-        nfkc: "\u{0686}",
-        nfkd: "\u{0686}",
-    },
-    NormalizationTest {
-        source: "\u{FB7E}",
-        nfc: "\u{FB7E}",
-        nfd: "\u{FB7E}",
-        nfkc: "\u{0687}",
-        nfkd: "\u{0687}",
-    },
-    NormalizationTest {
-        source: "\u{FB7F}",
-        nfc: "\u{FB7F}",
-        nfd: "\u{FB7F}",
-        nfkc: "\u{0687}",
-        nfkd: "\u{0687}",
-    },
-    NormalizationTest {
-        source: "\u{FB80}",
-        nfc: "\u{FB80}",
-        nfd: "\u{FB80}",
-        nfkc: "\u{0687}",
-        nfkd: "\u{0687}",
-    },
-    NormalizationTest {
-        source: "\u{FB81}",
-        nfc: "\u{FB81}",
-        nfd: "\u{FB81}",
-        nfkc: "\u{0687}",
-        nfkd: "\u{0687}",
-    },
-    NormalizationTest {
-        source: "\u{FB82}",
-        nfc: "\u{FB82}",
-        nfd: "\u{FB82}",
-        nfkc: "\u{068D}",
-        nfkd: "\u{068D}",
-    },
-    NormalizationTest {
-        source: "\u{FB83}",
-        nfc: "\u{FB83}",
-        nfd: "\u{FB83}",
-        nfkc: "\u{068D}",
-        nfkd: "\u{068D}",
-    },
-    NormalizationTest {
-        source: "\u{FB84}",
-        nfc: "\u{FB84}",
-        nfd: "\u{FB84}",
-        nfkc: "\u{068C}",
-        nfkd: "\u{068C}",
-    },
-    NormalizationTest {
-        source: "\u{FB85}",
-        nfc: "\u{FB85}",
-        nfd: "\u{FB85}",
-        nfkc: "\u{068C}",
-        nfkd: "\u{068C}",
-    },
-    NormalizationTest {
-        source: "\u{FB86}",
-        nfc: "\u{FB86}",
-        nfd: "\u{FB86}",
-        nfkc: "\u{068E}",
-        nfkd: "\u{068E}",
-    },
-    NormalizationTest {
-        source: "\u{FB87}",
-        nfc: "\u{FB87}",
-        nfd: "\u{FB87}",
-        nfkc: "\u{068E}",
-        nfkd: "\u{068E}",
-    },
-    NormalizationTest {
-        source: "\u{FB88}",
-        nfc: "\u{FB88}",
-        nfd: "\u{FB88}",
-        nfkc: "\u{0688}",
-        nfkd: "\u{0688}",
-    },
-    NormalizationTest {
-        source: "\u{FB89}",
-        nfc: "\u{FB89}",
-        nfd: "\u{FB89}",
-        nfkc: "\u{0688}",
-        nfkd: "\u{0688}",
-    },
-    NormalizationTest {
-        source: "\u{FB8A}",
-        nfc: "\u{FB8A}",
-        nfd: "\u{FB8A}",
-        nfkc: "\u{0698}",
-        nfkd: "\u{0698}",
-    },
-    NormalizationTest {
-        source: "\u{FB8B}",
-        nfc: "\u{FB8B}",
-        nfd: "\u{FB8B}",
-        nfkc: "\u{0698}",
-        nfkd: "\u{0698}",
-    },
-    NormalizationTest {
-        source: "\u{FB8C}",
-        nfc: "\u{FB8C}",
-        nfd: "\u{FB8C}",
-        nfkc: "\u{0691}",
-        nfkd: "\u{0691}",
-    },
-    NormalizationTest {
-        source: "\u{FB8D}",
-        nfc: "\u{FB8D}",
-        nfd: "\u{FB8D}",
-        nfkc: "\u{0691}",
-        nfkd: "\u{0691}",
-    },
-    NormalizationTest {
-        source: "\u{FB8E}",
-        nfc: "\u{FB8E}",
-        nfd: "\u{FB8E}",
-        nfkc: "\u{06A9}",
-        nfkd: "\u{06A9}",
-    },
-    NormalizationTest {
-        source: "\u{FB8F}",
-        nfc: "\u{FB8F}",
-        nfd: "\u{FB8F}",
-        nfkc: "\u{06A9}",
-        nfkd: "\u{06A9}",
-    },
-    NormalizationTest {
-        source: "\u{FB90}",
-        nfc: "\u{FB90}",
-        nfd: "\u{FB90}",
-        nfkc: "\u{06A9}",
-        nfkd: "\u{06A9}",
-    },
-    NormalizationTest {
-        source: "\u{FB91}",
-        nfc: "\u{FB91}",
-        nfd: "\u{FB91}",
-        nfkc: "\u{06A9}",
-        nfkd: "\u{06A9}",
-    },
-    NormalizationTest {
-        source: "\u{FB92}",
-        nfc: "\u{FB92}",
-        nfd: "\u{FB92}",
-        nfkc: "\u{06AF}",
-        nfkd: "\u{06AF}",
-    },
-    NormalizationTest {
-        source: "\u{FB93}",
-        nfc: "\u{FB93}",
-        nfd: "\u{FB93}",
-        nfkc: "\u{06AF}",
-        nfkd: "\u{06AF}",
-    },
-    NormalizationTest {
-        source: "\u{FB94}",
-        nfc: "\u{FB94}",
-        nfd: "\u{FB94}",
-        nfkc: "\u{06AF}",
-        nfkd: "\u{06AF}",
-    },
-    NormalizationTest {
-        source: "\u{FB95}",
-        nfc: "\u{FB95}",
-        nfd: "\u{FB95}",
-        nfkc: "\u{06AF}",
-        nfkd: "\u{06AF}",
-    },
-    NormalizationTest {
-        source: "\u{FB96}",
-        nfc: "\u{FB96}",
-        nfd: "\u{FB96}",
-        nfkc: "\u{06B3}",
-        nfkd: "\u{06B3}",
-    },
-    NormalizationTest {
-        source: "\u{FB97}",
-        nfc: "\u{FB97}",
-        nfd: "\u{FB97}",
-        nfkc: "\u{06B3}",
-        nfkd: "\u{06B3}",
-    },
-    NormalizationTest {
-        source: "\u{FB98}",
-        nfc: "\u{FB98}",
-        nfd: "\u{FB98}",
-        nfkc: "\u{06B3}",
-        nfkd: "\u{06B3}",
-    },
-    NormalizationTest {
-        source: "\u{FB99}",
-        nfc: "\u{FB99}",
-        nfd: "\u{FB99}",
-        nfkc: "\u{06B3}",
-        nfkd: "\u{06B3}",
-    },
-    NormalizationTest {
-        source: "\u{FB9A}",
-        nfc: "\u{FB9A}",
-        nfd: "\u{FB9A}",
-        nfkc: "\u{06B1}",
-        nfkd: "\u{06B1}",
-    },
-    NormalizationTest {
-        source: "\u{FB9B}",
-        nfc: "\u{FB9B}",
-        nfd: "\u{FB9B}",
-        nfkc: "\u{06B1}",
-        nfkd: "\u{06B1}",
-    },
-    NormalizationTest {
-        source: "\u{FB9C}",
-        nfc: "\u{FB9C}",
-        nfd: "\u{FB9C}",
-        nfkc: "\u{06B1}",
-        nfkd: "\u{06B1}",
-    },
-    NormalizationTest {
-        source: "\u{FB9D}",
-        nfc: "\u{FB9D}",
-        nfd: "\u{FB9D}",
-        nfkc: "\u{06B1}",
-        nfkd: "\u{06B1}",
-    },
-    NormalizationTest {
-        source: "\u{FB9E}",
-        nfc: "\u{FB9E}",
-        nfd: "\u{FB9E}",
-        nfkc: "\u{06BA}",
-        nfkd: "\u{06BA}",
-    },
-    NormalizationTest {
-        source: "\u{FB9F}",
-        nfc: "\u{FB9F}",
-        nfd: "\u{FB9F}",
-        nfkc: "\u{06BA}",
-        nfkd: "\u{06BA}",
-    },
-    NormalizationTest {
-        source: "\u{FBA0}",
-        nfc: "\u{FBA0}",
-        nfd: "\u{FBA0}",
-        nfkc: "\u{06BB}",
-        nfkd: "\u{06BB}",
-    },
-    NormalizationTest {
-        source: "\u{FBA1}",
-        nfc: "\u{FBA1}",
-        nfd: "\u{FBA1}",
-        nfkc: "\u{06BB}",
-        nfkd: "\u{06BB}",
-    },
-    NormalizationTest {
-        source: "\u{FBA2}",
-        nfc: "\u{FBA2}",
-        nfd: "\u{FBA2}",
-        nfkc: "\u{06BB}",
-        nfkd: "\u{06BB}",
-    },
-    NormalizationTest {
-        source: "\u{FBA3}",
-        nfc: "\u{FBA3}",
-        nfd: "\u{FBA3}",
-        nfkc: "\u{06BB}",
-        nfkd: "\u{06BB}",
-    },
-    NormalizationTest {
-        source: "\u{FBA4}",
-        nfc: "\u{FBA4}",
-        nfd: "\u{FBA4}",
-        nfkc: "\u{06C0}",
-        nfkd: "\u{06D5}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FBA5}",
-        nfc: "\u{FBA5}",
-        nfd: "\u{FBA5}",
-        nfkc: "\u{06C0}",
-        nfkd: "\u{06D5}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FBA6}",
-        nfc: "\u{FBA6}",
-        nfd: "\u{FBA6}",
-        nfkc: "\u{06C1}",
-        nfkd: "\u{06C1}",
-    },
-    NormalizationTest {
-        source: "\u{FBA7}",
-        nfc: "\u{FBA7}",
-        nfd: "\u{FBA7}",
-        nfkc: "\u{06C1}",
-        nfkd: "\u{06C1}",
-    },
-    NormalizationTest {
-        source: "\u{FBA8}",
-        nfc: "\u{FBA8}",
-        nfd: "\u{FBA8}",
-        nfkc: "\u{06C1}",
-        nfkd: "\u{06C1}",
-    },
-    NormalizationTest {
-        source: "\u{FBA9}",
-        nfc: "\u{FBA9}",
-        nfd: "\u{FBA9}",
-        nfkc: "\u{06C1}",
-        nfkd: "\u{06C1}",
-    },
-    NormalizationTest {
-        source: "\u{FBAA}",
-        nfc: "\u{FBAA}",
-        nfd: "\u{FBAA}",
-        nfkc: "\u{06BE}",
-        nfkd: "\u{06BE}",
-    },
-    NormalizationTest {
-        source: "\u{FBAB}",
-        nfc: "\u{FBAB}",
-        nfd: "\u{FBAB}",
-        nfkc: "\u{06BE}",
-        nfkd: "\u{06BE}",
-    },
-    NormalizationTest {
-        source: "\u{FBAC}",
-        nfc: "\u{FBAC}",
-        nfd: "\u{FBAC}",
-        nfkc: "\u{06BE}",
-        nfkd: "\u{06BE}",
-    },
-    NormalizationTest {
-        source: "\u{FBAD}",
-        nfc: "\u{FBAD}",
-        nfd: "\u{FBAD}",
-        nfkc: "\u{06BE}",
-        nfkd: "\u{06BE}",
-    },
-    NormalizationTest {
-        source: "\u{FBAE}",
-        nfc: "\u{FBAE}",
-        nfd: "\u{FBAE}",
-        nfkc: "\u{06D2}",
-        nfkd: "\u{06D2}",
-    },
-    NormalizationTest {
-        source: "\u{FBAF}",
-        nfc: "\u{FBAF}",
-        nfd: "\u{FBAF}",
-        nfkc: "\u{06D2}",
-        nfkd: "\u{06D2}",
-    },
-    NormalizationTest {
-        source: "\u{FBB0}",
-        nfc: "\u{FBB0}",
-        nfd: "\u{FBB0}",
-        nfkc: "\u{06D3}",
-        nfkd: "\u{06D2}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FBB1}",
-        nfc: "\u{FBB1}",
-        nfd: "\u{FBB1}",
-        nfkc: "\u{06D3}",
-        nfkd: "\u{06D2}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FBD3}",
-        nfc: "\u{FBD3}",
-        nfd: "\u{FBD3}",
-        nfkc: "\u{06AD}",
-        nfkd: "\u{06AD}",
-    },
-    NormalizationTest {
-        source: "\u{FBD4}",
-        nfc: "\u{FBD4}",
-        nfd: "\u{FBD4}",
-        nfkc: "\u{06AD}",
-        nfkd: "\u{06AD}",
-    },
-    NormalizationTest {
-        source: "\u{FBD5}",
-        nfc: "\u{FBD5}",
-        nfd: "\u{FBD5}",
-        nfkc: "\u{06AD}",
-        nfkd: "\u{06AD}",
-    },
-    NormalizationTest {
-        source: "\u{FBD6}",
-        nfc: "\u{FBD6}",
-        nfd: "\u{FBD6}",
-        nfkc: "\u{06AD}",
-        nfkd: "\u{06AD}",
-    },
-    NormalizationTest {
-        source: "\u{FBD7}",
-        nfc: "\u{FBD7}",
-        nfd: "\u{FBD7}",
-        nfkc: "\u{06C7}",
-        nfkd: "\u{06C7}",
-    },
-    NormalizationTest {
-        source: "\u{FBD8}",
-        nfc: "\u{FBD8}",
-        nfd: "\u{FBD8}",
-        nfkc: "\u{06C7}",
-        nfkd: "\u{06C7}",
-    },
-    NormalizationTest {
-        source: "\u{FBD9}",
-        nfc: "\u{FBD9}",
-        nfd: "\u{FBD9}",
-        nfkc: "\u{06C6}",
-        nfkd: "\u{06C6}",
-    },
-    NormalizationTest {
-        source: "\u{FBDA}",
-        nfc: "\u{FBDA}",
-        nfd: "\u{FBDA}",
-        nfkc: "\u{06C6}",
-        nfkd: "\u{06C6}",
-    },
-    NormalizationTest {
-        source: "\u{FBDB}",
-        nfc: "\u{FBDB}",
-        nfd: "\u{FBDB}",
-        nfkc: "\u{06C8}",
-        nfkd: "\u{06C8}",
-    },
-    NormalizationTest {
-        source: "\u{FBDC}",
-        nfc: "\u{FBDC}",
-        nfd: "\u{FBDC}",
-        nfkc: "\u{06C8}",
-        nfkd: "\u{06C8}",
-    },
-    NormalizationTest {
-        source: "\u{FBDD}",
-        nfc: "\u{FBDD}",
-        nfd: "\u{FBDD}",
-        nfkc: "\u{06C7}\u{0674}",
-        nfkd: "\u{06C7}\u{0674}",
-    },
-    NormalizationTest {
-        source: "\u{FBDE}",
-        nfc: "\u{FBDE}",
-        nfd: "\u{FBDE}",
-        nfkc: "\u{06CB}",
-        nfkd: "\u{06CB}",
-    },
-    NormalizationTest {
-        source: "\u{FBDF}",
-        nfc: "\u{FBDF}",
-        nfd: "\u{FBDF}",
-        nfkc: "\u{06CB}",
-        nfkd: "\u{06CB}",
-    },
-    NormalizationTest {
-        source: "\u{FBE0}",
-        nfc: "\u{FBE0}",
-        nfd: "\u{FBE0}",
-        nfkc: "\u{06C5}",
-        nfkd: "\u{06C5}",
-    },
-    NormalizationTest {
-        source: "\u{FBE1}",
-        nfc: "\u{FBE1}",
-        nfd: "\u{FBE1}",
-        nfkc: "\u{06C5}",
-        nfkd: "\u{06C5}",
-    },
-    NormalizationTest {
-        source: "\u{FBE2}",
-        nfc: "\u{FBE2}",
-        nfd: "\u{FBE2}",
-        nfkc: "\u{06C9}",
-        nfkd: "\u{06C9}",
-    },
-    NormalizationTest {
-        source: "\u{FBE3}",
-        nfc: "\u{FBE3}",
-        nfd: "\u{FBE3}",
-        nfkc: "\u{06C9}",
-        nfkd: "\u{06C9}",
-    },
-    NormalizationTest {
-        source: "\u{FBE4}",
-        nfc: "\u{FBE4}",
-        nfd: "\u{FBE4}",
-        nfkc: "\u{06D0}",
-        nfkd: "\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBE5}",
-        nfc: "\u{FBE5}",
-        nfd: "\u{FBE5}",
-        nfkc: "\u{06D0}",
-        nfkd: "\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBE6}",
-        nfc: "\u{FBE6}",
-        nfd: "\u{FBE6}",
-        nfkc: "\u{06D0}",
-        nfkd: "\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBE7}",
-        nfc: "\u{FBE7}",
-        nfd: "\u{FBE7}",
-        nfkc: "\u{06D0}",
-        nfkd: "\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBE8}",
-        nfc: "\u{FBE8}",
-        nfd: "\u{FBE8}",
-        nfkc: "\u{0649}",
-        nfkd: "\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FBE9}",
-        nfc: "\u{FBE9}",
-        nfd: "\u{FBE9}",
-        nfkc: "\u{0649}",
-        nfkd: "\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FBEA}",
-        nfc: "\u{FBEA}",
-        nfd: "\u{FBEA}",
-        nfkc: "\u{0626}\u{0627}",
-        nfkd: "\u{064A}\u{0654}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FBEB}",
-        nfc: "\u{FBEB}",
-        nfd: "\u{FBEB}",
-        nfkc: "\u{0626}\u{0627}",
-        nfkd: "\u{064A}\u{0654}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FBEC}",
-        nfc: "\u{FBEC}",
-        nfd: "\u{FBEC}",
-        nfkc: "\u{0626}\u{06D5}",
-        nfkd: "\u{064A}\u{0654}\u{06D5}",
-    },
-    NormalizationTest {
-        source: "\u{FBED}",
-        nfc: "\u{FBED}",
-        nfd: "\u{FBED}",
-        nfkc: "\u{0626}\u{06D5}",
-        nfkd: "\u{064A}\u{0654}\u{06D5}",
-    },
-    NormalizationTest {
-        source: "\u{FBEE}",
-        nfc: "\u{FBEE}",
-        nfd: "\u{FBEE}",
-        nfkc: "\u{0626}\u{0648}",
-        nfkd: "\u{064A}\u{0654}\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{FBEF}",
-        nfc: "\u{FBEF}",
-        nfd: "\u{FBEF}",
-        nfkc: "\u{0626}\u{0648}",
-        nfkd: "\u{064A}\u{0654}\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{FBF0}",
-        nfc: "\u{FBF0}",
-        nfd: "\u{FBF0}",
-        nfkc: "\u{0626}\u{06C7}",
-        nfkd: "\u{064A}\u{0654}\u{06C7}",
-    },
-    NormalizationTest {
-        source: "\u{FBF1}",
-        nfc: "\u{FBF1}",
-        nfd: "\u{FBF1}",
-        nfkc: "\u{0626}\u{06C7}",
-        nfkd: "\u{064A}\u{0654}\u{06C7}",
-    },
-    NormalizationTest {
-        source: "\u{FBF2}",
-        nfc: "\u{FBF2}",
-        nfd: "\u{FBF2}",
-        nfkc: "\u{0626}\u{06C6}",
-        nfkd: "\u{064A}\u{0654}\u{06C6}",
-    },
-    NormalizationTest {
-        source: "\u{FBF3}",
-        nfc: "\u{FBF3}",
-        nfd: "\u{FBF3}",
-        nfkc: "\u{0626}\u{06C6}",
-        nfkd: "\u{064A}\u{0654}\u{06C6}",
-    },
-    NormalizationTest {
-        source: "\u{FBF4}",
-        nfc: "\u{FBF4}",
-        nfd: "\u{FBF4}",
-        nfkc: "\u{0626}\u{06C8}",
-        nfkd: "\u{064A}\u{0654}\u{06C8}",
-    },
-    NormalizationTest {
-        source: "\u{FBF5}",
-        nfc: "\u{FBF5}",
-        nfd: "\u{FBF5}",
-        nfkc: "\u{0626}\u{06C8}",
-        nfkd: "\u{064A}\u{0654}\u{06C8}",
-    },
-    NormalizationTest {
-        source: "\u{FBF6}",
-        nfc: "\u{FBF6}",
-        nfd: "\u{FBF6}",
-        nfkc: "\u{0626}\u{06D0}",
-        nfkd: "\u{064A}\u{0654}\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBF7}",
-        nfc: "\u{FBF7}",
-        nfd: "\u{FBF7}",
-        nfkc: "\u{0626}\u{06D0}",
-        nfkd: "\u{064A}\u{0654}\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBF8}",
-        nfc: "\u{FBF8}",
-        nfd: "\u{FBF8}",
-        nfkc: "\u{0626}\u{06D0}",
-        nfkd: "\u{064A}\u{0654}\u{06D0}",
-    },
-    NormalizationTest {
-        source: "\u{FBF9}",
-        nfc: "\u{FBF9}",
-        nfd: "\u{FBF9}",
-        nfkc: "\u{0626}\u{0649}",
-        nfkd: "\u{064A}\u{0654}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FBFA}",
-        nfc: "\u{FBFA}",
-        nfd: "\u{FBFA}",
-        nfkc: "\u{0626}\u{0649}",
-        nfkd: "\u{064A}\u{0654}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FBFB}",
-        nfc: "\u{FBFB}",
-        nfd: "\u{FBFB}",
-        nfkc: "\u{0626}\u{0649}",
-        nfkd: "\u{064A}\u{0654}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FBFC}",
-        nfc: "\u{FBFC}",
-        nfd: "\u{FBFC}",
-        nfkc: "\u{06CC}",
-        nfkd: "\u{06CC}",
-    },
-    NormalizationTest {
-        source: "\u{FBFD}",
-        nfc: "\u{FBFD}",
-        nfd: "\u{FBFD}",
-        nfkc: "\u{06CC}",
-        nfkd: "\u{06CC}",
-    },
-    NormalizationTest {
-        source: "\u{FBFE}",
-        nfc: "\u{FBFE}",
-        nfd: "\u{FBFE}",
-        nfkc: "\u{06CC}",
-        nfkd: "\u{06CC}",
-    },
-    NormalizationTest {
-        source: "\u{FBFF}",
-        nfc: "\u{FBFF}",
-        nfd: "\u{FBFF}",
-        nfkc: "\u{06CC}",
-        nfkd: "\u{06CC}",
-    },
-    NormalizationTest {
-        source: "\u{FC00}",
-        nfc: "\u{FC00}",
-        nfd: "\u{FC00}",
-        nfkc: "\u{0626}\u{062C}",
-        nfkd: "\u{064A}\u{0654}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC01}",
-        nfc: "\u{FC01}",
-        nfd: "\u{FC01}",
-        nfkc: "\u{0626}\u{062D}",
-        nfkd: "\u{064A}\u{0654}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC02}",
-        nfc: "\u{FC02}",
-        nfd: "\u{FC02}",
-        nfkc: "\u{0626}\u{0645}",
-        nfkd: "\u{064A}\u{0654}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC03}",
-        nfc: "\u{FC03}",
-        nfd: "\u{FC03}",
-        nfkc: "\u{0626}\u{0649}",
-        nfkd: "\u{064A}\u{0654}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC04}",
-        nfc: "\u{FC04}",
-        nfd: "\u{FC04}",
-        nfkc: "\u{0626}\u{064A}",
-        nfkd: "\u{064A}\u{0654}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC05}",
-        nfc: "\u{FC05}",
-        nfd: "\u{FC05}",
-        nfkc: "\u{0628}\u{062C}",
-        nfkd: "\u{0628}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC06}",
-        nfc: "\u{FC06}",
-        nfd: "\u{FC06}",
-        nfkc: "\u{0628}\u{062D}",
-        nfkd: "\u{0628}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC07}",
-        nfc: "\u{FC07}",
-        nfd: "\u{FC07}",
-        nfkc: "\u{0628}\u{062E}",
-        nfkd: "\u{0628}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC08}",
-        nfc: "\u{FC08}",
-        nfd: "\u{FC08}",
-        nfkc: "\u{0628}\u{0645}",
-        nfkd: "\u{0628}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC09}",
-        nfc: "\u{FC09}",
-        nfd: "\u{FC09}",
-        nfkc: "\u{0628}\u{0649}",
-        nfkd: "\u{0628}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC0A}",
-        nfc: "\u{FC0A}",
-        nfd: "\u{FC0A}",
-        nfkc: "\u{0628}\u{064A}",
-        nfkd: "\u{0628}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC0B}",
-        nfc: "\u{FC0B}",
-        nfd: "\u{FC0B}",
-        nfkc: "\u{062A}\u{062C}",
-        nfkd: "\u{062A}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC0C}",
-        nfc: "\u{FC0C}",
-        nfd: "\u{FC0C}",
-        nfkc: "\u{062A}\u{062D}",
-        nfkd: "\u{062A}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC0D}",
-        nfc: "\u{FC0D}",
-        nfd: "\u{FC0D}",
-        nfkc: "\u{062A}\u{062E}",
-        nfkd: "\u{062A}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC0E}",
-        nfc: "\u{FC0E}",
-        nfd: "\u{FC0E}",
-        nfkc: "\u{062A}\u{0645}",
-        nfkd: "\u{062A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC0F}",
-        nfc: "\u{FC0F}",
-        nfd: "\u{FC0F}",
-        nfkc: "\u{062A}\u{0649}",
-        nfkd: "\u{062A}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC10}",
-        nfc: "\u{FC10}",
-        nfd: "\u{FC10}",
-        nfkc: "\u{062A}\u{064A}",
-        nfkd: "\u{062A}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC11}",
-        nfc: "\u{FC11}",
-        nfd: "\u{FC11}",
-        nfkc: "\u{062B}\u{062C}",
-        nfkd: "\u{062B}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC12}",
-        nfc: "\u{FC12}",
-        nfd: "\u{FC12}",
-        nfkc: "\u{062B}\u{0645}",
-        nfkd: "\u{062B}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC13}",
-        nfc: "\u{FC13}",
-        nfd: "\u{FC13}",
-        nfkc: "\u{062B}\u{0649}",
-        nfkd: "\u{062B}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC14}",
-        nfc: "\u{FC14}",
-        nfd: "\u{FC14}",
-        nfkc: "\u{062B}\u{064A}",
-        nfkd: "\u{062B}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC15}",
-        nfc: "\u{FC15}",
-        nfd: "\u{FC15}",
-        nfkc: "\u{062C}\u{062D}",
-        nfkd: "\u{062C}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC16}",
-        nfc: "\u{FC16}",
-        nfd: "\u{FC16}",
-        nfkc: "\u{062C}\u{0645}",
-        nfkd: "\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC17}",
-        nfc: "\u{FC17}",
-        nfd: "\u{FC17}",
-        nfkc: "\u{062D}\u{062C}",
-        nfkd: "\u{062D}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC18}",
-        nfc: "\u{FC18}",
-        nfd: "\u{FC18}",
-        nfkc: "\u{062D}\u{0645}",
-        nfkd: "\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC19}",
-        nfc: "\u{FC19}",
-        nfd: "\u{FC19}",
-        nfkc: "\u{062E}\u{062C}",
-        nfkd: "\u{062E}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC1A}",
-        nfc: "\u{FC1A}",
-        nfd: "\u{FC1A}",
-        nfkc: "\u{062E}\u{062D}",
-        nfkd: "\u{062E}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC1B}",
-        nfc: "\u{FC1B}",
-        nfd: "\u{FC1B}",
-        nfkc: "\u{062E}\u{0645}",
-        nfkd: "\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC1C}",
-        nfc: "\u{FC1C}",
-        nfd: "\u{FC1C}",
-        nfkc: "\u{0633}\u{062C}",
-        nfkd: "\u{0633}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC1D}",
-        nfc: "\u{FC1D}",
-        nfd: "\u{FC1D}",
-        nfkc: "\u{0633}\u{062D}",
-        nfkd: "\u{0633}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC1E}",
-        nfc: "\u{FC1E}",
-        nfd: "\u{FC1E}",
-        nfkc: "\u{0633}\u{062E}",
-        nfkd: "\u{0633}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC1F}",
-        nfc: "\u{FC1F}",
-        nfd: "\u{FC1F}",
-        nfkc: "\u{0633}\u{0645}",
-        nfkd: "\u{0633}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC20}",
-        nfc: "\u{FC20}",
-        nfd: "\u{FC20}",
-        nfkc: "\u{0635}\u{062D}",
-        nfkd: "\u{0635}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC21}",
-        nfc: "\u{FC21}",
-        nfd: "\u{FC21}",
-        nfkc: "\u{0635}\u{0645}",
-        nfkd: "\u{0635}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC22}",
-        nfc: "\u{FC22}",
-        nfd: "\u{FC22}",
-        nfkc: "\u{0636}\u{062C}",
-        nfkd: "\u{0636}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC23}",
-        nfc: "\u{FC23}",
-        nfd: "\u{FC23}",
-        nfkc: "\u{0636}\u{062D}",
-        nfkd: "\u{0636}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC24}",
-        nfc: "\u{FC24}",
-        nfd: "\u{FC24}",
-        nfkc: "\u{0636}\u{062E}",
-        nfkd: "\u{0636}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC25}",
-        nfc: "\u{FC25}",
-        nfd: "\u{FC25}",
-        nfkc: "\u{0636}\u{0645}",
-        nfkd: "\u{0636}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC26}",
-        nfc: "\u{FC26}",
-        nfd: "\u{FC26}",
-        nfkc: "\u{0637}\u{062D}",
-        nfkd: "\u{0637}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC27}",
-        nfc: "\u{FC27}",
-        nfd: "\u{FC27}",
-        nfkc: "\u{0637}\u{0645}",
-        nfkd: "\u{0637}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC28}",
-        nfc: "\u{FC28}",
-        nfd: "\u{FC28}",
-        nfkc: "\u{0638}\u{0645}",
-        nfkd: "\u{0638}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC29}",
-        nfc: "\u{FC29}",
-        nfd: "\u{FC29}",
-        nfkc: "\u{0639}\u{062C}",
-        nfkd: "\u{0639}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC2A}",
-        nfc: "\u{FC2A}",
-        nfd: "\u{FC2A}",
-        nfkc: "\u{0639}\u{0645}",
-        nfkd: "\u{0639}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC2B}",
-        nfc: "\u{FC2B}",
-        nfd: "\u{FC2B}",
-        nfkc: "\u{063A}\u{062C}",
-        nfkd: "\u{063A}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC2C}",
-        nfc: "\u{FC2C}",
-        nfd: "\u{FC2C}",
-        nfkc: "\u{063A}\u{0645}",
-        nfkd: "\u{063A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC2D}",
-        nfc: "\u{FC2D}",
-        nfd: "\u{FC2D}",
-        nfkc: "\u{0641}\u{062C}",
-        nfkd: "\u{0641}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC2E}",
-        nfc: "\u{FC2E}",
-        nfd: "\u{FC2E}",
-        nfkc: "\u{0641}\u{062D}",
-        nfkd: "\u{0641}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC2F}",
-        nfc: "\u{FC2F}",
-        nfd: "\u{FC2F}",
-        nfkc: "\u{0641}\u{062E}",
-        nfkd: "\u{0641}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC30}",
-        nfc: "\u{FC30}",
-        nfd: "\u{FC30}",
-        nfkc: "\u{0641}\u{0645}",
-        nfkd: "\u{0641}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC31}",
-        nfc: "\u{FC31}",
-        nfd: "\u{FC31}",
-        nfkc: "\u{0641}\u{0649}",
-        nfkd: "\u{0641}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC32}",
-        nfc: "\u{FC32}",
-        nfd: "\u{FC32}",
-        nfkc: "\u{0641}\u{064A}",
-        nfkd: "\u{0641}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC33}",
-        nfc: "\u{FC33}",
-        nfd: "\u{FC33}",
-        nfkc: "\u{0642}\u{062D}",
-        nfkd: "\u{0642}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC34}",
-        nfc: "\u{FC34}",
-        nfd: "\u{FC34}",
-        nfkc: "\u{0642}\u{0645}",
-        nfkd: "\u{0642}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC35}",
-        nfc: "\u{FC35}",
-        nfd: "\u{FC35}",
-        nfkc: "\u{0642}\u{0649}",
-        nfkd: "\u{0642}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC36}",
-        nfc: "\u{FC36}",
-        nfd: "\u{FC36}",
-        nfkc: "\u{0642}\u{064A}",
-        nfkd: "\u{0642}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC37}",
-        nfc: "\u{FC37}",
-        nfd: "\u{FC37}",
-        nfkc: "\u{0643}\u{0627}",
-        nfkd: "\u{0643}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FC38}",
-        nfc: "\u{FC38}",
-        nfd: "\u{FC38}",
-        nfkc: "\u{0643}\u{062C}",
-        nfkd: "\u{0643}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC39}",
-        nfc: "\u{FC39}",
-        nfd: "\u{FC39}",
-        nfkc: "\u{0643}\u{062D}",
-        nfkd: "\u{0643}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC3A}",
-        nfc: "\u{FC3A}",
-        nfd: "\u{FC3A}",
-        nfkc: "\u{0643}\u{062E}",
-        nfkd: "\u{0643}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC3B}",
-        nfc: "\u{FC3B}",
-        nfd: "\u{FC3B}",
-        nfkc: "\u{0643}\u{0644}",
-        nfkd: "\u{0643}\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FC3C}",
-        nfc: "\u{FC3C}",
-        nfd: "\u{FC3C}",
-        nfkc: "\u{0643}\u{0645}",
-        nfkd: "\u{0643}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC3D}",
-        nfc: "\u{FC3D}",
-        nfd: "\u{FC3D}",
-        nfkc: "\u{0643}\u{0649}",
-        nfkd: "\u{0643}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC3E}",
-        nfc: "\u{FC3E}",
-        nfd: "\u{FC3E}",
-        nfkc: "\u{0643}\u{064A}",
-        nfkd: "\u{0643}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC3F}",
-        nfc: "\u{FC3F}",
-        nfd: "\u{FC3F}",
-        nfkc: "\u{0644}\u{062C}",
-        nfkd: "\u{0644}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC40}",
-        nfc: "\u{FC40}",
-        nfd: "\u{FC40}",
-        nfkc: "\u{0644}\u{062D}",
-        nfkd: "\u{0644}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC41}",
-        nfc: "\u{FC41}",
-        nfd: "\u{FC41}",
-        nfkc: "\u{0644}\u{062E}",
-        nfkd: "\u{0644}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC42}",
-        nfc: "\u{FC42}",
-        nfd: "\u{FC42}",
-        nfkc: "\u{0644}\u{0645}",
-        nfkd: "\u{0644}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC43}",
-        nfc: "\u{FC43}",
-        nfd: "\u{FC43}",
-        nfkc: "\u{0644}\u{0649}",
-        nfkd: "\u{0644}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC44}",
-        nfc: "\u{FC44}",
-        nfd: "\u{FC44}",
-        nfkc: "\u{0644}\u{064A}",
-        nfkd: "\u{0644}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC45}",
-        nfc: "\u{FC45}",
-        nfd: "\u{FC45}",
-        nfkc: "\u{0645}\u{062C}",
-        nfkd: "\u{0645}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC46}",
-        nfc: "\u{FC46}",
-        nfd: "\u{FC46}",
-        nfkc: "\u{0645}\u{062D}",
-        nfkd: "\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC47}",
-        nfc: "\u{FC47}",
-        nfd: "\u{FC47}",
-        nfkc: "\u{0645}\u{062E}",
-        nfkd: "\u{0645}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC48}",
-        nfc: "\u{FC48}",
-        nfd: "\u{FC48}",
-        nfkc: "\u{0645}\u{0645}",
-        nfkd: "\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC49}",
-        nfc: "\u{FC49}",
-        nfd: "\u{FC49}",
-        nfkc: "\u{0645}\u{0649}",
-        nfkd: "\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC4A}",
-        nfc: "\u{FC4A}",
-        nfd: "\u{FC4A}",
-        nfkc: "\u{0645}\u{064A}",
-        nfkd: "\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC4B}",
-        nfc: "\u{FC4B}",
-        nfd: "\u{FC4B}",
-        nfkc: "\u{0646}\u{062C}",
-        nfkd: "\u{0646}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC4C}",
-        nfc: "\u{FC4C}",
-        nfd: "\u{FC4C}",
-        nfkc: "\u{0646}\u{062D}",
-        nfkd: "\u{0646}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC4D}",
-        nfc: "\u{FC4D}",
-        nfd: "\u{FC4D}",
-        nfkc: "\u{0646}\u{062E}",
-        nfkd: "\u{0646}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC4E}",
-        nfc: "\u{FC4E}",
-        nfd: "\u{FC4E}",
-        nfkc: "\u{0646}\u{0645}",
-        nfkd: "\u{0646}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC4F}",
-        nfc: "\u{FC4F}",
-        nfd: "\u{FC4F}",
-        nfkc: "\u{0646}\u{0649}",
-        nfkd: "\u{0646}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC50}",
-        nfc: "\u{FC50}",
-        nfd: "\u{FC50}",
-        nfkc: "\u{0646}\u{064A}",
-        nfkd: "\u{0646}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC51}",
-        nfc: "\u{FC51}",
-        nfd: "\u{FC51}",
-        nfkc: "\u{0647}\u{062C}",
-        nfkd: "\u{0647}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC52}",
-        nfc: "\u{FC52}",
-        nfd: "\u{FC52}",
-        nfkc: "\u{0647}\u{0645}",
-        nfkd: "\u{0647}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC53}",
-        nfc: "\u{FC53}",
-        nfd: "\u{FC53}",
-        nfkc: "\u{0647}\u{0649}",
-        nfkd: "\u{0647}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC54}",
-        nfc: "\u{FC54}",
-        nfd: "\u{FC54}",
-        nfkc: "\u{0647}\u{064A}",
-        nfkd: "\u{0647}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC55}",
-        nfc: "\u{FC55}",
-        nfd: "\u{FC55}",
-        nfkc: "\u{064A}\u{062C}",
-        nfkd: "\u{064A}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC56}",
-        nfc: "\u{FC56}",
-        nfd: "\u{FC56}",
-        nfkc: "\u{064A}\u{062D}",
-        nfkd: "\u{064A}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC57}",
-        nfc: "\u{FC57}",
-        nfd: "\u{FC57}",
-        nfkc: "\u{064A}\u{062E}",
-        nfkd: "\u{064A}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC58}",
-        nfc: "\u{FC58}",
-        nfd: "\u{FC58}",
-        nfkc: "\u{064A}\u{0645}",
-        nfkd: "\u{064A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC59}",
-        nfc: "\u{FC59}",
-        nfd: "\u{FC59}",
-        nfkc: "\u{064A}\u{0649}",
-        nfkd: "\u{064A}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC5A}",
-        nfc: "\u{FC5A}",
-        nfd: "\u{FC5A}",
-        nfkc: "\u{064A}\u{064A}",
-        nfkd: "\u{064A}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC5B}",
-        nfc: "\u{FC5B}",
-        nfd: "\u{FC5B}",
-        nfkc: "\u{0630}\u{0670}",
-        nfkd: "\u{0630}\u{0670}",
-    },
-    NormalizationTest {
-        source: "\u{FC5C}",
-        nfc: "\u{FC5C}",
-        nfd: "\u{FC5C}",
-        nfkc: "\u{0631}\u{0670}",
-        nfkd: "\u{0631}\u{0670}",
-    },
-    NormalizationTest {
-        source: "\u{FC5D}",
-        nfc: "\u{FC5D}",
-        nfd: "\u{FC5D}",
-        nfkc: "\u{0649}\u{0670}",
-        nfkd: "\u{0649}\u{0670}",
-    },
-    NormalizationTest {
-        source: "\u{FC5E}",
-        nfc: "\u{FC5E}",
-        nfd: "\u{FC5E}",
-        nfkc: "\u{0020}\u{064C}\u{0651}",
-        nfkd: "\u{0020}\u{064C}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FC5F}",
-        nfc: "\u{FC5F}",
-        nfd: "\u{FC5F}",
-        nfkc: "\u{0020}\u{064D}\u{0651}",
-        nfkd: "\u{0020}\u{064D}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FC60}",
-        nfc: "\u{FC60}",
-        nfd: "\u{FC60}",
-        nfkc: "\u{0020}\u{064E}\u{0651}",
-        nfkd: "\u{0020}\u{064E}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FC61}",
-        nfc: "\u{FC61}",
-        nfd: "\u{FC61}",
-        nfkc: "\u{0020}\u{064F}\u{0651}",
-        nfkd: "\u{0020}\u{064F}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FC62}",
-        nfc: "\u{FC62}",
-        nfd: "\u{FC62}",
-        nfkc: "\u{0020}\u{0650}\u{0651}",
-        nfkd: "\u{0020}\u{0650}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FC63}",
-        nfc: "\u{FC63}",
-        nfd: "\u{FC63}",
-        nfkc: "\u{0020}\u{0651}\u{0670}",
-        nfkd: "\u{0020}\u{0651}\u{0670}",
-    },
-    NormalizationTest {
-        source: "\u{FC64}",
-        nfc: "\u{FC64}",
-        nfd: "\u{FC64}",
-        nfkc: "\u{0626}\u{0631}",
-        nfkd: "\u{064A}\u{0654}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FC65}",
-        nfc: "\u{FC65}",
-        nfd: "\u{FC65}",
-        nfkc: "\u{0626}\u{0632}",
-        nfkd: "\u{064A}\u{0654}\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FC66}",
-        nfc: "\u{FC66}",
-        nfd: "\u{FC66}",
-        nfkc: "\u{0626}\u{0645}",
-        nfkd: "\u{064A}\u{0654}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC67}",
-        nfc: "\u{FC67}",
-        nfd: "\u{FC67}",
-        nfkc: "\u{0626}\u{0646}",
-        nfkd: "\u{064A}\u{0654}\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FC68}",
-        nfc: "\u{FC68}",
-        nfd: "\u{FC68}",
-        nfkc: "\u{0626}\u{0649}",
-        nfkd: "\u{064A}\u{0654}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC69}",
-        nfc: "\u{FC69}",
-        nfd: "\u{FC69}",
-        nfkc: "\u{0626}\u{064A}",
-        nfkd: "\u{064A}\u{0654}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC6A}",
-        nfc: "\u{FC6A}",
-        nfd: "\u{FC6A}",
-        nfkc: "\u{0628}\u{0631}",
-        nfkd: "\u{0628}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FC6B}",
-        nfc: "\u{FC6B}",
-        nfd: "\u{FC6B}",
-        nfkc: "\u{0628}\u{0632}",
-        nfkd: "\u{0628}\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FC6C}",
-        nfc: "\u{FC6C}",
-        nfd: "\u{FC6C}",
-        nfkc: "\u{0628}\u{0645}",
-        nfkd: "\u{0628}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC6D}",
-        nfc: "\u{FC6D}",
-        nfd: "\u{FC6D}",
-        nfkc: "\u{0628}\u{0646}",
-        nfkd: "\u{0628}\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FC6E}",
-        nfc: "\u{FC6E}",
-        nfd: "\u{FC6E}",
-        nfkc: "\u{0628}\u{0649}",
-        nfkd: "\u{0628}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC6F}",
-        nfc: "\u{FC6F}",
-        nfd: "\u{FC6F}",
-        nfkc: "\u{0628}\u{064A}",
-        nfkd: "\u{0628}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC70}",
-        nfc: "\u{FC70}",
-        nfd: "\u{FC70}",
-        nfkc: "\u{062A}\u{0631}",
-        nfkd: "\u{062A}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FC71}",
-        nfc: "\u{FC71}",
-        nfd: "\u{FC71}",
-        nfkc: "\u{062A}\u{0632}",
-        nfkd: "\u{062A}\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FC72}",
-        nfc: "\u{FC72}",
-        nfd: "\u{FC72}",
-        nfkc: "\u{062A}\u{0645}",
-        nfkd: "\u{062A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC73}",
-        nfc: "\u{FC73}",
-        nfd: "\u{FC73}",
-        nfkc: "\u{062A}\u{0646}",
-        nfkd: "\u{062A}\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FC74}",
-        nfc: "\u{FC74}",
-        nfd: "\u{FC74}",
-        nfkc: "\u{062A}\u{0649}",
-        nfkd: "\u{062A}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC75}",
-        nfc: "\u{FC75}",
-        nfd: "\u{FC75}",
-        nfkc: "\u{062A}\u{064A}",
-        nfkd: "\u{062A}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC76}",
-        nfc: "\u{FC76}",
-        nfd: "\u{FC76}",
-        nfkc: "\u{062B}\u{0631}",
-        nfkd: "\u{062B}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FC77}",
-        nfc: "\u{FC77}",
-        nfd: "\u{FC77}",
-        nfkc: "\u{062B}\u{0632}",
-        nfkd: "\u{062B}\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FC78}",
-        nfc: "\u{FC78}",
-        nfd: "\u{FC78}",
-        nfkc: "\u{062B}\u{0645}",
-        nfkd: "\u{062B}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC79}",
-        nfc: "\u{FC79}",
-        nfd: "\u{FC79}",
-        nfkc: "\u{062B}\u{0646}",
-        nfkd: "\u{062B}\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FC7A}",
-        nfc: "\u{FC7A}",
-        nfd: "\u{FC7A}",
-        nfkc: "\u{062B}\u{0649}",
-        nfkd: "\u{062B}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC7B}",
-        nfc: "\u{FC7B}",
-        nfd: "\u{FC7B}",
-        nfkc: "\u{062B}\u{064A}",
-        nfkd: "\u{062B}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC7C}",
-        nfc: "\u{FC7C}",
-        nfd: "\u{FC7C}",
-        nfkc: "\u{0641}\u{0649}",
-        nfkd: "\u{0641}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC7D}",
-        nfc: "\u{FC7D}",
-        nfd: "\u{FC7D}",
-        nfkc: "\u{0641}\u{064A}",
-        nfkd: "\u{0641}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC7E}",
-        nfc: "\u{FC7E}",
-        nfd: "\u{FC7E}",
-        nfkc: "\u{0642}\u{0649}",
-        nfkd: "\u{0642}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC7F}",
-        nfc: "\u{FC7F}",
-        nfd: "\u{FC7F}",
-        nfkc: "\u{0642}\u{064A}",
-        nfkd: "\u{0642}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC80}",
-        nfc: "\u{FC80}",
-        nfd: "\u{FC80}",
-        nfkc: "\u{0643}\u{0627}",
-        nfkd: "\u{0643}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FC81}",
-        nfc: "\u{FC81}",
-        nfd: "\u{FC81}",
-        nfkc: "\u{0643}\u{0644}",
-        nfkd: "\u{0643}\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FC82}",
-        nfc: "\u{FC82}",
-        nfd: "\u{FC82}",
-        nfkc: "\u{0643}\u{0645}",
-        nfkd: "\u{0643}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC83}",
-        nfc: "\u{FC83}",
-        nfd: "\u{FC83}",
-        nfkc: "\u{0643}\u{0649}",
-        nfkd: "\u{0643}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC84}",
-        nfc: "\u{FC84}",
-        nfd: "\u{FC84}",
-        nfkc: "\u{0643}\u{064A}",
-        nfkd: "\u{0643}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC85}",
-        nfc: "\u{FC85}",
-        nfd: "\u{FC85}",
-        nfkc: "\u{0644}\u{0645}",
-        nfkd: "\u{0644}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC86}",
-        nfc: "\u{FC86}",
-        nfd: "\u{FC86}",
-        nfkc: "\u{0644}\u{0649}",
-        nfkd: "\u{0644}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC87}",
-        nfc: "\u{FC87}",
-        nfd: "\u{FC87}",
-        nfkc: "\u{0644}\u{064A}",
-        nfkd: "\u{0644}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC88}",
-        nfc: "\u{FC88}",
-        nfd: "\u{FC88}",
-        nfkc: "\u{0645}\u{0627}",
-        nfkd: "\u{0645}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FC89}",
-        nfc: "\u{FC89}",
-        nfd: "\u{FC89}",
-        nfkc: "\u{0645}\u{0645}",
-        nfkd: "\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC8A}",
-        nfc: "\u{FC8A}",
-        nfd: "\u{FC8A}",
-        nfkc: "\u{0646}\u{0631}",
-        nfkd: "\u{0646}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FC8B}",
-        nfc: "\u{FC8B}",
-        nfd: "\u{FC8B}",
-        nfkc: "\u{0646}\u{0632}",
-        nfkd: "\u{0646}\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FC8C}",
-        nfc: "\u{FC8C}",
-        nfd: "\u{FC8C}",
-        nfkc: "\u{0646}\u{0645}",
-        nfkd: "\u{0646}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC8D}",
-        nfc: "\u{FC8D}",
-        nfd: "\u{FC8D}",
-        nfkc: "\u{0646}\u{0646}",
-        nfkd: "\u{0646}\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FC8E}",
-        nfc: "\u{FC8E}",
-        nfd: "\u{FC8E}",
-        nfkc: "\u{0646}\u{0649}",
-        nfkd: "\u{0646}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC8F}",
-        nfc: "\u{FC8F}",
-        nfd: "\u{FC8F}",
-        nfkc: "\u{0646}\u{064A}",
-        nfkd: "\u{0646}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC90}",
-        nfc: "\u{FC90}",
-        nfd: "\u{FC90}",
-        nfkc: "\u{0649}\u{0670}",
-        nfkd: "\u{0649}\u{0670}",
-    },
-    NormalizationTest {
-        source: "\u{FC91}",
-        nfc: "\u{FC91}",
-        nfd: "\u{FC91}",
-        nfkc: "\u{064A}\u{0631}",
-        nfkd: "\u{064A}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FC92}",
-        nfc: "\u{FC92}",
-        nfd: "\u{FC92}",
-        nfkc: "\u{064A}\u{0632}",
-        nfkd: "\u{064A}\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FC93}",
-        nfc: "\u{FC93}",
-        nfd: "\u{FC93}",
-        nfkc: "\u{064A}\u{0645}",
-        nfkd: "\u{064A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC94}",
-        nfc: "\u{FC94}",
-        nfd: "\u{FC94}",
-        nfkc: "\u{064A}\u{0646}",
-        nfkd: "\u{064A}\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FC95}",
-        nfc: "\u{FC95}",
-        nfd: "\u{FC95}",
-        nfkc: "\u{064A}\u{0649}",
-        nfkd: "\u{064A}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FC96}",
-        nfc: "\u{FC96}",
-        nfd: "\u{FC96}",
-        nfkc: "\u{064A}\u{064A}",
-        nfkd: "\u{064A}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FC97}",
-        nfc: "\u{FC97}",
-        nfd: "\u{FC97}",
-        nfkc: "\u{0626}\u{062C}",
-        nfkd: "\u{064A}\u{0654}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC98}",
-        nfc: "\u{FC98}",
-        nfd: "\u{FC98}",
-        nfkc: "\u{0626}\u{062D}",
-        nfkd: "\u{064A}\u{0654}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC99}",
-        nfc: "\u{FC99}",
-        nfd: "\u{FC99}",
-        nfkc: "\u{0626}\u{062E}",
-        nfkd: "\u{064A}\u{0654}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC9A}",
-        nfc: "\u{FC9A}",
-        nfd: "\u{FC9A}",
-        nfkc: "\u{0626}\u{0645}",
-        nfkd: "\u{064A}\u{0654}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FC9B}",
-        nfc: "\u{FC9B}",
-        nfd: "\u{FC9B}",
-        nfkc: "\u{0626}\u{0647}",
-        nfkd: "\u{064A}\u{0654}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FC9C}",
-        nfc: "\u{FC9C}",
-        nfd: "\u{FC9C}",
-        nfkc: "\u{0628}\u{062C}",
-        nfkd: "\u{0628}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FC9D}",
-        nfc: "\u{FC9D}",
-        nfd: "\u{FC9D}",
-        nfkc: "\u{0628}\u{062D}",
-        nfkd: "\u{0628}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FC9E}",
-        nfc: "\u{FC9E}",
-        nfd: "\u{FC9E}",
-        nfkc: "\u{0628}\u{062E}",
-        nfkd: "\u{0628}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FC9F}",
-        nfc: "\u{FC9F}",
-        nfd: "\u{FC9F}",
-        nfkc: "\u{0628}\u{0645}",
-        nfkd: "\u{0628}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCA0}",
-        nfc: "\u{FCA0}",
-        nfd: "\u{FCA0}",
-        nfkc: "\u{0628}\u{0647}",
-        nfkd: "\u{0628}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCA1}",
-        nfc: "\u{FCA1}",
-        nfd: "\u{FCA1}",
-        nfkc: "\u{062A}\u{062C}",
-        nfkd: "\u{062A}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCA2}",
-        nfc: "\u{FCA2}",
-        nfd: "\u{FCA2}",
-        nfkc: "\u{062A}\u{062D}",
-        nfkd: "\u{062A}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCA3}",
-        nfc: "\u{FCA3}",
-        nfd: "\u{FCA3}",
-        nfkc: "\u{062A}\u{062E}",
-        nfkd: "\u{062A}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCA4}",
-        nfc: "\u{FCA4}",
-        nfd: "\u{FCA4}",
-        nfkc: "\u{062A}\u{0645}",
-        nfkd: "\u{062A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCA5}",
-        nfc: "\u{FCA5}",
-        nfd: "\u{FCA5}",
-        nfkc: "\u{062A}\u{0647}",
-        nfkd: "\u{062A}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCA6}",
-        nfc: "\u{FCA6}",
-        nfd: "\u{FCA6}",
-        nfkc: "\u{062B}\u{0645}",
-        nfkd: "\u{062B}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCA7}",
-        nfc: "\u{FCA7}",
-        nfd: "\u{FCA7}",
-        nfkc: "\u{062C}\u{062D}",
-        nfkd: "\u{062C}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCA8}",
-        nfc: "\u{FCA8}",
-        nfd: "\u{FCA8}",
-        nfkc: "\u{062C}\u{0645}",
-        nfkd: "\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCA9}",
-        nfc: "\u{FCA9}",
-        nfd: "\u{FCA9}",
-        nfkc: "\u{062D}\u{062C}",
-        nfkd: "\u{062D}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCAA}",
-        nfc: "\u{FCAA}",
-        nfd: "\u{FCAA}",
-        nfkc: "\u{062D}\u{0645}",
-        nfkd: "\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCAB}",
-        nfc: "\u{FCAB}",
-        nfd: "\u{FCAB}",
-        nfkc: "\u{062E}\u{062C}",
-        nfkd: "\u{062E}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCAC}",
-        nfc: "\u{FCAC}",
-        nfd: "\u{FCAC}",
-        nfkc: "\u{062E}\u{0645}",
-        nfkd: "\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCAD}",
-        nfc: "\u{FCAD}",
-        nfd: "\u{FCAD}",
-        nfkc: "\u{0633}\u{062C}",
-        nfkd: "\u{0633}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCAE}",
-        nfc: "\u{FCAE}",
-        nfd: "\u{FCAE}",
-        nfkc: "\u{0633}\u{062D}",
-        nfkd: "\u{0633}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCAF}",
-        nfc: "\u{FCAF}",
-        nfd: "\u{FCAF}",
-        nfkc: "\u{0633}\u{062E}",
-        nfkd: "\u{0633}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCB0}",
-        nfc: "\u{FCB0}",
-        nfd: "\u{FCB0}",
-        nfkc: "\u{0633}\u{0645}",
-        nfkd: "\u{0633}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCB1}",
-        nfc: "\u{FCB1}",
-        nfd: "\u{FCB1}",
-        nfkc: "\u{0635}\u{062D}",
-        nfkd: "\u{0635}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCB2}",
-        nfc: "\u{FCB2}",
-        nfd: "\u{FCB2}",
-        nfkc: "\u{0635}\u{062E}",
-        nfkd: "\u{0635}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCB3}",
-        nfc: "\u{FCB3}",
-        nfd: "\u{FCB3}",
-        nfkc: "\u{0635}\u{0645}",
-        nfkd: "\u{0635}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCB4}",
-        nfc: "\u{FCB4}",
-        nfd: "\u{FCB4}",
-        nfkc: "\u{0636}\u{062C}",
-        nfkd: "\u{0636}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCB5}",
-        nfc: "\u{FCB5}",
-        nfd: "\u{FCB5}",
-        nfkc: "\u{0636}\u{062D}",
-        nfkd: "\u{0636}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCB6}",
-        nfc: "\u{FCB6}",
-        nfd: "\u{FCB6}",
-        nfkc: "\u{0636}\u{062E}",
-        nfkd: "\u{0636}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCB7}",
-        nfc: "\u{FCB7}",
-        nfd: "\u{FCB7}",
-        nfkc: "\u{0636}\u{0645}",
-        nfkd: "\u{0636}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCB8}",
-        nfc: "\u{FCB8}",
-        nfd: "\u{FCB8}",
-        nfkc: "\u{0637}\u{062D}",
-        nfkd: "\u{0637}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCB9}",
-        nfc: "\u{FCB9}",
-        nfd: "\u{FCB9}",
-        nfkc: "\u{0638}\u{0645}",
-        nfkd: "\u{0638}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCBA}",
-        nfc: "\u{FCBA}",
-        nfd: "\u{FCBA}",
-        nfkc: "\u{0639}\u{062C}",
-        nfkd: "\u{0639}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCBB}",
-        nfc: "\u{FCBB}",
-        nfd: "\u{FCBB}",
-        nfkc: "\u{0639}\u{0645}",
-        nfkd: "\u{0639}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCBC}",
-        nfc: "\u{FCBC}",
-        nfd: "\u{FCBC}",
-        nfkc: "\u{063A}\u{062C}",
-        nfkd: "\u{063A}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCBD}",
-        nfc: "\u{FCBD}",
-        nfd: "\u{FCBD}",
-        nfkc: "\u{063A}\u{0645}",
-        nfkd: "\u{063A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCBE}",
-        nfc: "\u{FCBE}",
-        nfd: "\u{FCBE}",
-        nfkc: "\u{0641}\u{062C}",
-        nfkd: "\u{0641}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCBF}",
-        nfc: "\u{FCBF}",
-        nfd: "\u{FCBF}",
-        nfkc: "\u{0641}\u{062D}",
-        nfkd: "\u{0641}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCC0}",
-        nfc: "\u{FCC0}",
-        nfd: "\u{FCC0}",
-        nfkc: "\u{0641}\u{062E}",
-        nfkd: "\u{0641}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCC1}",
-        nfc: "\u{FCC1}",
-        nfd: "\u{FCC1}",
-        nfkc: "\u{0641}\u{0645}",
-        nfkd: "\u{0641}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCC2}",
-        nfc: "\u{FCC2}",
-        nfd: "\u{FCC2}",
-        nfkc: "\u{0642}\u{062D}",
-        nfkd: "\u{0642}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCC3}",
-        nfc: "\u{FCC3}",
-        nfd: "\u{FCC3}",
-        nfkc: "\u{0642}\u{0645}",
-        nfkd: "\u{0642}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCC4}",
-        nfc: "\u{FCC4}",
-        nfd: "\u{FCC4}",
-        nfkc: "\u{0643}\u{062C}",
-        nfkd: "\u{0643}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCC5}",
-        nfc: "\u{FCC5}",
-        nfd: "\u{FCC5}",
-        nfkc: "\u{0643}\u{062D}",
-        nfkd: "\u{0643}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCC6}",
-        nfc: "\u{FCC6}",
-        nfd: "\u{FCC6}",
-        nfkc: "\u{0643}\u{062E}",
-        nfkd: "\u{0643}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCC7}",
-        nfc: "\u{FCC7}",
-        nfd: "\u{FCC7}",
-        nfkc: "\u{0643}\u{0644}",
-        nfkd: "\u{0643}\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FCC8}",
-        nfc: "\u{FCC8}",
-        nfd: "\u{FCC8}",
-        nfkc: "\u{0643}\u{0645}",
-        nfkd: "\u{0643}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCC9}",
-        nfc: "\u{FCC9}",
-        nfd: "\u{FCC9}",
-        nfkc: "\u{0644}\u{062C}",
-        nfkd: "\u{0644}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCCA}",
-        nfc: "\u{FCCA}",
-        nfd: "\u{FCCA}",
-        nfkc: "\u{0644}\u{062D}",
-        nfkd: "\u{0644}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCCB}",
-        nfc: "\u{FCCB}",
-        nfd: "\u{FCCB}",
-        nfkc: "\u{0644}\u{062E}",
-        nfkd: "\u{0644}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCCC}",
-        nfc: "\u{FCCC}",
-        nfd: "\u{FCCC}",
-        nfkc: "\u{0644}\u{0645}",
-        nfkd: "\u{0644}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCCD}",
-        nfc: "\u{FCCD}",
-        nfd: "\u{FCCD}",
-        nfkc: "\u{0644}\u{0647}",
-        nfkd: "\u{0644}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCCE}",
-        nfc: "\u{FCCE}",
-        nfd: "\u{FCCE}",
-        nfkc: "\u{0645}\u{062C}",
-        nfkd: "\u{0645}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCCF}",
-        nfc: "\u{FCCF}",
-        nfd: "\u{FCCF}",
-        nfkc: "\u{0645}\u{062D}",
-        nfkd: "\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCD0}",
-        nfc: "\u{FCD0}",
-        nfd: "\u{FCD0}",
-        nfkc: "\u{0645}\u{062E}",
-        nfkd: "\u{0645}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCD1}",
-        nfc: "\u{FCD1}",
-        nfd: "\u{FCD1}",
-        nfkc: "\u{0645}\u{0645}",
-        nfkd: "\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCD2}",
-        nfc: "\u{FCD2}",
-        nfd: "\u{FCD2}",
-        nfkc: "\u{0646}\u{062C}",
-        nfkd: "\u{0646}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCD3}",
-        nfc: "\u{FCD3}",
-        nfd: "\u{FCD3}",
-        nfkc: "\u{0646}\u{062D}",
-        nfkd: "\u{0646}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCD4}",
-        nfc: "\u{FCD4}",
-        nfd: "\u{FCD4}",
-        nfkc: "\u{0646}\u{062E}",
-        nfkd: "\u{0646}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCD5}",
-        nfc: "\u{FCD5}",
-        nfd: "\u{FCD5}",
-        nfkc: "\u{0646}\u{0645}",
-        nfkd: "\u{0646}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCD6}",
-        nfc: "\u{FCD6}",
-        nfd: "\u{FCD6}",
-        nfkc: "\u{0646}\u{0647}",
-        nfkd: "\u{0646}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCD7}",
-        nfc: "\u{FCD7}",
-        nfd: "\u{FCD7}",
-        nfkc: "\u{0647}\u{062C}",
-        nfkd: "\u{0647}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCD8}",
-        nfc: "\u{FCD8}",
-        nfd: "\u{FCD8}",
-        nfkc: "\u{0647}\u{0645}",
-        nfkd: "\u{0647}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCD9}",
-        nfc: "\u{FCD9}",
-        nfd: "\u{FCD9}",
-        nfkc: "\u{0647}\u{0670}",
-        nfkd: "\u{0647}\u{0670}",
-    },
-    NormalizationTest {
-        source: "\u{FCDA}",
-        nfc: "\u{FCDA}",
-        nfd: "\u{FCDA}",
-        nfkc: "\u{064A}\u{062C}",
-        nfkd: "\u{064A}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FCDB}",
-        nfc: "\u{FCDB}",
-        nfd: "\u{FCDB}",
-        nfkc: "\u{064A}\u{062D}",
-        nfkd: "\u{064A}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FCDC}",
-        nfc: "\u{FCDC}",
-        nfd: "\u{FCDC}",
-        nfkc: "\u{064A}\u{062E}",
-        nfkd: "\u{064A}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FCDD}",
-        nfc: "\u{FCDD}",
-        nfd: "\u{FCDD}",
-        nfkc: "\u{064A}\u{0645}",
-        nfkd: "\u{064A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCDE}",
-        nfc: "\u{FCDE}",
-        nfd: "\u{FCDE}",
-        nfkc: "\u{064A}\u{0647}",
-        nfkd: "\u{064A}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCDF}",
-        nfc: "\u{FCDF}",
-        nfd: "\u{FCDF}",
-        nfkc: "\u{0626}\u{0645}",
-        nfkd: "\u{064A}\u{0654}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCE0}",
-        nfc: "\u{FCE0}",
-        nfd: "\u{FCE0}",
-        nfkc: "\u{0626}\u{0647}",
-        nfkd: "\u{064A}\u{0654}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCE1}",
-        nfc: "\u{FCE1}",
-        nfd: "\u{FCE1}",
-        nfkc: "\u{0628}\u{0645}",
-        nfkd: "\u{0628}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCE2}",
-        nfc: "\u{FCE2}",
-        nfd: "\u{FCE2}",
-        nfkc: "\u{0628}\u{0647}",
-        nfkd: "\u{0628}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCE3}",
-        nfc: "\u{FCE3}",
-        nfd: "\u{FCE3}",
-        nfkc: "\u{062A}\u{0645}",
-        nfkd: "\u{062A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCE4}",
-        nfc: "\u{FCE4}",
-        nfd: "\u{FCE4}",
-        nfkc: "\u{062A}\u{0647}",
-        nfkd: "\u{062A}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCE5}",
-        nfc: "\u{FCE5}",
-        nfd: "\u{FCE5}",
-        nfkc: "\u{062B}\u{0645}",
-        nfkd: "\u{062B}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCE6}",
-        nfc: "\u{FCE6}",
-        nfd: "\u{FCE6}",
-        nfkc: "\u{062B}\u{0647}",
-        nfkd: "\u{062B}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCE7}",
-        nfc: "\u{FCE7}",
-        nfd: "\u{FCE7}",
-        nfkc: "\u{0633}\u{0645}",
-        nfkd: "\u{0633}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCE8}",
-        nfc: "\u{FCE8}",
-        nfd: "\u{FCE8}",
-        nfkc: "\u{0633}\u{0647}",
-        nfkd: "\u{0633}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCE9}",
-        nfc: "\u{FCE9}",
-        nfd: "\u{FCE9}",
-        nfkc: "\u{0634}\u{0645}",
-        nfkd: "\u{0634}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCEA}",
-        nfc: "\u{FCEA}",
-        nfd: "\u{FCEA}",
-        nfkc: "\u{0634}\u{0647}",
-        nfkd: "\u{0634}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCEB}",
-        nfc: "\u{FCEB}",
-        nfd: "\u{FCEB}",
-        nfkc: "\u{0643}\u{0644}",
-        nfkd: "\u{0643}\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FCEC}",
-        nfc: "\u{FCEC}",
-        nfd: "\u{FCEC}",
-        nfkc: "\u{0643}\u{0645}",
-        nfkd: "\u{0643}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCED}",
-        nfc: "\u{FCED}",
-        nfd: "\u{FCED}",
-        nfkc: "\u{0644}\u{0645}",
-        nfkd: "\u{0644}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCEE}",
-        nfc: "\u{FCEE}",
-        nfd: "\u{FCEE}",
-        nfkc: "\u{0646}\u{0645}",
-        nfkd: "\u{0646}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCEF}",
-        nfc: "\u{FCEF}",
-        nfd: "\u{FCEF}",
-        nfkc: "\u{0646}\u{0647}",
-        nfkd: "\u{0646}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCF0}",
-        nfc: "\u{FCF0}",
-        nfd: "\u{FCF0}",
-        nfkc: "\u{064A}\u{0645}",
-        nfkd: "\u{064A}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FCF1}",
-        nfc: "\u{FCF1}",
-        nfd: "\u{FCF1}",
-        nfkc: "\u{064A}\u{0647}",
-        nfkd: "\u{064A}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FCF2}",
-        nfc: "\u{FCF2}",
-        nfd: "\u{FCF2}",
-        nfkc: "\u{0640}\u{064E}\u{0651}",
-        nfkd: "\u{0640}\u{064E}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FCF3}",
-        nfc: "\u{FCF3}",
-        nfd: "\u{FCF3}",
-        nfkc: "\u{0640}\u{064F}\u{0651}",
-        nfkd: "\u{0640}\u{064F}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FCF4}",
-        nfc: "\u{FCF4}",
-        nfd: "\u{FCF4}",
-        nfkc: "\u{0640}\u{0650}\u{0651}",
-        nfkd: "\u{0640}\u{0650}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FCF5}",
-        nfc: "\u{FCF5}",
-        nfd: "\u{FCF5}",
-        nfkc: "\u{0637}\u{0649}",
-        nfkd: "\u{0637}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FCF6}",
-        nfc: "\u{FCF6}",
-        nfd: "\u{FCF6}",
-        nfkc: "\u{0637}\u{064A}",
-        nfkd: "\u{0637}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FCF7}",
-        nfc: "\u{FCF7}",
-        nfd: "\u{FCF7}",
-        nfkc: "\u{0639}\u{0649}",
-        nfkd: "\u{0639}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FCF8}",
-        nfc: "\u{FCF8}",
-        nfd: "\u{FCF8}",
-        nfkc: "\u{0639}\u{064A}",
-        nfkd: "\u{0639}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FCF9}",
-        nfc: "\u{FCF9}",
-        nfd: "\u{FCF9}",
-        nfkc: "\u{063A}\u{0649}",
-        nfkd: "\u{063A}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FCFA}",
-        nfc: "\u{FCFA}",
-        nfd: "\u{FCFA}",
-        nfkc: "\u{063A}\u{064A}",
-        nfkd: "\u{063A}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FCFB}",
-        nfc: "\u{FCFB}",
-        nfd: "\u{FCFB}",
-        nfkc: "\u{0633}\u{0649}",
-        nfkd: "\u{0633}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FCFC}",
-        nfc: "\u{FCFC}",
-        nfd: "\u{FCFC}",
-        nfkc: "\u{0633}\u{064A}",
-        nfkd: "\u{0633}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FCFD}",
-        nfc: "\u{FCFD}",
-        nfd: "\u{FCFD}",
-        nfkc: "\u{0634}\u{0649}",
-        nfkd: "\u{0634}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FCFE}",
-        nfc: "\u{FCFE}",
-        nfd: "\u{FCFE}",
-        nfkc: "\u{0634}\u{064A}",
-        nfkd: "\u{0634}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FCFF}",
-        nfc: "\u{FCFF}",
-        nfd: "\u{FCFF}",
-        nfkc: "\u{062D}\u{0649}",
-        nfkd: "\u{062D}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD00}",
-        nfc: "\u{FD00}",
-        nfd: "\u{FD00}",
-        nfkc: "\u{062D}\u{064A}",
-        nfkd: "\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD01}",
-        nfc: "\u{FD01}",
-        nfd: "\u{FD01}",
-        nfkc: "\u{062C}\u{0649}",
-        nfkd: "\u{062C}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD02}",
-        nfc: "\u{FD02}",
-        nfd: "\u{FD02}",
-        nfkc: "\u{062C}\u{064A}",
-        nfkd: "\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD03}",
-        nfc: "\u{FD03}",
-        nfd: "\u{FD03}",
-        nfkc: "\u{062E}\u{0649}",
-        nfkd: "\u{062E}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD04}",
-        nfc: "\u{FD04}",
-        nfd: "\u{FD04}",
-        nfkc: "\u{062E}\u{064A}",
-        nfkd: "\u{062E}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD05}",
-        nfc: "\u{FD05}",
-        nfd: "\u{FD05}",
-        nfkc: "\u{0635}\u{0649}",
-        nfkd: "\u{0635}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD06}",
-        nfc: "\u{FD06}",
-        nfd: "\u{FD06}",
-        nfkc: "\u{0635}\u{064A}",
-        nfkd: "\u{0635}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD07}",
-        nfc: "\u{FD07}",
-        nfd: "\u{FD07}",
-        nfkc: "\u{0636}\u{0649}",
-        nfkd: "\u{0636}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD08}",
-        nfc: "\u{FD08}",
-        nfd: "\u{FD08}",
-        nfkc: "\u{0636}\u{064A}",
-        nfkd: "\u{0636}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD09}",
-        nfc: "\u{FD09}",
-        nfd: "\u{FD09}",
-        nfkc: "\u{0634}\u{062C}",
-        nfkd: "\u{0634}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD0A}",
-        nfc: "\u{FD0A}",
-        nfd: "\u{FD0A}",
-        nfkc: "\u{0634}\u{062D}",
-        nfkd: "\u{0634}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD0B}",
-        nfc: "\u{FD0B}",
-        nfd: "\u{FD0B}",
-        nfkc: "\u{0634}\u{062E}",
-        nfkd: "\u{0634}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD0C}",
-        nfc: "\u{FD0C}",
-        nfd: "\u{FD0C}",
-        nfkc: "\u{0634}\u{0645}",
-        nfkd: "\u{0634}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD0D}",
-        nfc: "\u{FD0D}",
-        nfd: "\u{FD0D}",
-        nfkc: "\u{0634}\u{0631}",
-        nfkd: "\u{0634}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD0E}",
-        nfc: "\u{FD0E}",
-        nfd: "\u{FD0E}",
-        nfkc: "\u{0633}\u{0631}",
-        nfkd: "\u{0633}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD0F}",
-        nfc: "\u{FD0F}",
-        nfd: "\u{FD0F}",
-        nfkc: "\u{0635}\u{0631}",
-        nfkd: "\u{0635}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD10}",
-        nfc: "\u{FD10}",
-        nfd: "\u{FD10}",
-        nfkc: "\u{0636}\u{0631}",
-        nfkd: "\u{0636}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD11}",
-        nfc: "\u{FD11}",
-        nfd: "\u{FD11}",
-        nfkc: "\u{0637}\u{0649}",
-        nfkd: "\u{0637}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD12}",
-        nfc: "\u{FD12}",
-        nfd: "\u{FD12}",
-        nfkc: "\u{0637}\u{064A}",
-        nfkd: "\u{0637}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD13}",
-        nfc: "\u{FD13}",
-        nfd: "\u{FD13}",
-        nfkc: "\u{0639}\u{0649}",
-        nfkd: "\u{0639}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD14}",
-        nfc: "\u{FD14}",
-        nfd: "\u{FD14}",
-        nfkc: "\u{0639}\u{064A}",
-        nfkd: "\u{0639}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD15}",
-        nfc: "\u{FD15}",
-        nfd: "\u{FD15}",
-        nfkc: "\u{063A}\u{0649}",
-        nfkd: "\u{063A}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD16}",
-        nfc: "\u{FD16}",
-        nfd: "\u{FD16}",
-        nfkc: "\u{063A}\u{064A}",
-        nfkd: "\u{063A}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD17}",
-        nfc: "\u{FD17}",
-        nfd: "\u{FD17}",
-        nfkc: "\u{0633}\u{0649}",
-        nfkd: "\u{0633}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD18}",
-        nfc: "\u{FD18}",
-        nfd: "\u{FD18}",
-        nfkc: "\u{0633}\u{064A}",
-        nfkd: "\u{0633}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD19}",
-        nfc: "\u{FD19}",
-        nfd: "\u{FD19}",
-        nfkc: "\u{0634}\u{0649}",
-        nfkd: "\u{0634}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD1A}",
-        nfc: "\u{FD1A}",
-        nfd: "\u{FD1A}",
-        nfkc: "\u{0634}\u{064A}",
-        nfkd: "\u{0634}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD1B}",
-        nfc: "\u{FD1B}",
-        nfd: "\u{FD1B}",
-        nfkc: "\u{062D}\u{0649}",
-        nfkd: "\u{062D}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD1C}",
-        nfc: "\u{FD1C}",
-        nfd: "\u{FD1C}",
-        nfkc: "\u{062D}\u{064A}",
-        nfkd: "\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD1D}",
-        nfc: "\u{FD1D}",
-        nfd: "\u{FD1D}",
-        nfkc: "\u{062C}\u{0649}",
-        nfkd: "\u{062C}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD1E}",
-        nfc: "\u{FD1E}",
-        nfd: "\u{FD1E}",
-        nfkc: "\u{062C}\u{064A}",
-        nfkd: "\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD1F}",
-        nfc: "\u{FD1F}",
-        nfd: "\u{FD1F}",
-        nfkc: "\u{062E}\u{0649}",
-        nfkd: "\u{062E}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD20}",
-        nfc: "\u{FD20}",
-        nfd: "\u{FD20}",
-        nfkc: "\u{062E}\u{064A}",
-        nfkd: "\u{062E}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD21}",
-        nfc: "\u{FD21}",
-        nfd: "\u{FD21}",
-        nfkc: "\u{0635}\u{0649}",
-        nfkd: "\u{0635}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD22}",
-        nfc: "\u{FD22}",
-        nfd: "\u{FD22}",
-        nfkc: "\u{0635}\u{064A}",
-        nfkd: "\u{0635}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD23}",
-        nfc: "\u{FD23}",
-        nfd: "\u{FD23}",
-        nfkc: "\u{0636}\u{0649}",
-        nfkd: "\u{0636}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD24}",
-        nfc: "\u{FD24}",
-        nfd: "\u{FD24}",
-        nfkc: "\u{0636}\u{064A}",
-        nfkd: "\u{0636}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD25}",
-        nfc: "\u{FD25}",
-        nfd: "\u{FD25}",
-        nfkc: "\u{0634}\u{062C}",
-        nfkd: "\u{0634}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD26}",
-        nfc: "\u{FD26}",
-        nfd: "\u{FD26}",
-        nfkc: "\u{0634}\u{062D}",
-        nfkd: "\u{0634}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD27}",
-        nfc: "\u{FD27}",
-        nfd: "\u{FD27}",
-        nfkc: "\u{0634}\u{062E}",
-        nfkd: "\u{0634}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD28}",
-        nfc: "\u{FD28}",
-        nfd: "\u{FD28}",
-        nfkc: "\u{0634}\u{0645}",
-        nfkd: "\u{0634}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD29}",
-        nfc: "\u{FD29}",
-        nfd: "\u{FD29}",
-        nfkc: "\u{0634}\u{0631}",
-        nfkd: "\u{0634}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD2A}",
-        nfc: "\u{FD2A}",
-        nfd: "\u{FD2A}",
-        nfkc: "\u{0633}\u{0631}",
-        nfkd: "\u{0633}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD2B}",
-        nfc: "\u{FD2B}",
-        nfd: "\u{FD2B}",
-        nfkc: "\u{0635}\u{0631}",
-        nfkd: "\u{0635}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD2C}",
-        nfc: "\u{FD2C}",
-        nfd: "\u{FD2C}",
-        nfkc: "\u{0636}\u{0631}",
-        nfkd: "\u{0636}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FD2D}",
-        nfc: "\u{FD2D}",
-        nfd: "\u{FD2D}",
-        nfkc: "\u{0634}\u{062C}",
-        nfkd: "\u{0634}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD2E}",
-        nfc: "\u{FD2E}",
-        nfd: "\u{FD2E}",
-        nfkc: "\u{0634}\u{062D}",
-        nfkd: "\u{0634}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD2F}",
-        nfc: "\u{FD2F}",
-        nfd: "\u{FD2F}",
-        nfkc: "\u{0634}\u{062E}",
-        nfkd: "\u{0634}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD30}",
-        nfc: "\u{FD30}",
-        nfd: "\u{FD30}",
-        nfkc: "\u{0634}\u{0645}",
-        nfkd: "\u{0634}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD31}",
-        nfc: "\u{FD31}",
-        nfd: "\u{FD31}",
-        nfkc: "\u{0633}\u{0647}",
-        nfkd: "\u{0633}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FD32}",
-        nfc: "\u{FD32}",
-        nfd: "\u{FD32}",
-        nfkc: "\u{0634}\u{0647}",
-        nfkd: "\u{0634}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FD33}",
-        nfc: "\u{FD33}",
-        nfd: "\u{FD33}",
-        nfkc: "\u{0637}\u{0645}",
-        nfkd: "\u{0637}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD34}",
-        nfc: "\u{FD34}",
-        nfd: "\u{FD34}",
-        nfkc: "\u{0633}\u{062C}",
-        nfkd: "\u{0633}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD35}",
-        nfc: "\u{FD35}",
-        nfd: "\u{FD35}",
-        nfkc: "\u{0633}\u{062D}",
-        nfkd: "\u{0633}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD36}",
-        nfc: "\u{FD36}",
-        nfd: "\u{FD36}",
-        nfkc: "\u{0633}\u{062E}",
-        nfkd: "\u{0633}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD37}",
-        nfc: "\u{FD37}",
-        nfd: "\u{FD37}",
-        nfkc: "\u{0634}\u{062C}",
-        nfkd: "\u{0634}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD38}",
-        nfc: "\u{FD38}",
-        nfd: "\u{FD38}",
-        nfkc: "\u{0634}\u{062D}",
-        nfkd: "\u{0634}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD39}",
-        nfc: "\u{FD39}",
-        nfd: "\u{FD39}",
-        nfkc: "\u{0634}\u{062E}",
-        nfkd: "\u{0634}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD3A}",
-        nfc: "\u{FD3A}",
-        nfd: "\u{FD3A}",
-        nfkc: "\u{0637}\u{0645}",
-        nfkd: "\u{0637}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD3B}",
-        nfc: "\u{FD3B}",
-        nfd: "\u{FD3B}",
-        nfkc: "\u{0638}\u{0645}",
-        nfkd: "\u{0638}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD3C}",
-        nfc: "\u{FD3C}",
-        nfd: "\u{FD3C}",
-        nfkc: "\u{0627}\u{064B}",
-        nfkd: "\u{0627}\u{064B}",
-    },
-    NormalizationTest {
-        source: "\u{FD3D}",
-        nfc: "\u{FD3D}",
-        nfd: "\u{FD3D}",
-        nfkc: "\u{0627}\u{064B}",
-        nfkd: "\u{0627}\u{064B}",
-    },
-    NormalizationTest {
-        source: "\u{FD50}",
-        nfc: "\u{FD50}",
-        nfd: "\u{FD50}",
-        nfkc: "\u{062A}\u{062C}\u{0645}",
-        nfkd: "\u{062A}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD51}",
-        nfc: "\u{FD51}",
-        nfd: "\u{FD51}",
-        nfkc: "\u{062A}\u{062D}\u{062C}",
-        nfkd: "\u{062A}\u{062D}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD52}",
-        nfc: "\u{FD52}",
-        nfd: "\u{FD52}",
-        nfkc: "\u{062A}\u{062D}\u{062C}",
-        nfkd: "\u{062A}\u{062D}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD53}",
-        nfc: "\u{FD53}",
-        nfd: "\u{FD53}",
-        nfkc: "\u{062A}\u{062D}\u{0645}",
-        nfkd: "\u{062A}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD54}",
-        nfc: "\u{FD54}",
-        nfd: "\u{FD54}",
-        nfkc: "\u{062A}\u{062E}\u{0645}",
-        nfkd: "\u{062A}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD55}",
-        nfc: "\u{FD55}",
-        nfd: "\u{FD55}",
-        nfkc: "\u{062A}\u{0645}\u{062C}",
-        nfkd: "\u{062A}\u{0645}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD56}",
-        nfc: "\u{FD56}",
-        nfd: "\u{FD56}",
-        nfkc: "\u{062A}\u{0645}\u{062D}",
-        nfkd: "\u{062A}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD57}",
-        nfc: "\u{FD57}",
-        nfd: "\u{FD57}",
-        nfkc: "\u{062A}\u{0645}\u{062E}",
-        nfkd: "\u{062A}\u{0645}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD58}",
-        nfc: "\u{FD58}",
-        nfd: "\u{FD58}",
-        nfkc: "\u{062C}\u{0645}\u{062D}",
-        nfkd: "\u{062C}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD59}",
-        nfc: "\u{FD59}",
-        nfd: "\u{FD59}",
-        nfkc: "\u{062C}\u{0645}\u{062D}",
-        nfkd: "\u{062C}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD5A}",
-        nfc: "\u{FD5A}",
-        nfd: "\u{FD5A}",
-        nfkc: "\u{062D}\u{0645}\u{064A}",
-        nfkd: "\u{062D}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD5B}",
-        nfc: "\u{FD5B}",
-        nfd: "\u{FD5B}",
-        nfkc: "\u{062D}\u{0645}\u{0649}",
-        nfkd: "\u{062D}\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD5C}",
-        nfc: "\u{FD5C}",
-        nfd: "\u{FD5C}",
-        nfkc: "\u{0633}\u{062D}\u{062C}",
-        nfkd: "\u{0633}\u{062D}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD5D}",
-        nfc: "\u{FD5D}",
-        nfd: "\u{FD5D}",
-        nfkc: "\u{0633}\u{062C}\u{062D}",
-        nfkd: "\u{0633}\u{062C}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD5E}",
-        nfc: "\u{FD5E}",
-        nfd: "\u{FD5E}",
-        nfkc: "\u{0633}\u{062C}\u{0649}",
-        nfkd: "\u{0633}\u{062C}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD5F}",
-        nfc: "\u{FD5F}",
-        nfd: "\u{FD5F}",
-        nfkc: "\u{0633}\u{0645}\u{062D}",
-        nfkd: "\u{0633}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD60}",
-        nfc: "\u{FD60}",
-        nfd: "\u{FD60}",
-        nfkc: "\u{0633}\u{0645}\u{062D}",
-        nfkd: "\u{0633}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD61}",
-        nfc: "\u{FD61}",
-        nfd: "\u{FD61}",
-        nfkc: "\u{0633}\u{0645}\u{062C}",
-        nfkd: "\u{0633}\u{0645}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD62}",
-        nfc: "\u{FD62}",
-        nfd: "\u{FD62}",
-        nfkc: "\u{0633}\u{0645}\u{0645}",
-        nfkd: "\u{0633}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD63}",
-        nfc: "\u{FD63}",
-        nfd: "\u{FD63}",
-        nfkc: "\u{0633}\u{0645}\u{0645}",
-        nfkd: "\u{0633}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD64}",
-        nfc: "\u{FD64}",
-        nfd: "\u{FD64}",
-        nfkc: "\u{0635}\u{062D}\u{062D}",
-        nfkd: "\u{0635}\u{062D}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD65}",
-        nfc: "\u{FD65}",
-        nfd: "\u{FD65}",
-        nfkc: "\u{0635}\u{062D}\u{062D}",
-        nfkd: "\u{0635}\u{062D}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD66}",
-        nfc: "\u{FD66}",
-        nfd: "\u{FD66}",
-        nfkc: "\u{0635}\u{0645}\u{0645}",
-        nfkd: "\u{0635}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD67}",
-        nfc: "\u{FD67}",
-        nfd: "\u{FD67}",
-        nfkc: "\u{0634}\u{062D}\u{0645}",
-        nfkd: "\u{0634}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD68}",
-        nfc: "\u{FD68}",
-        nfd: "\u{FD68}",
-        nfkc: "\u{0634}\u{062D}\u{0645}",
-        nfkd: "\u{0634}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD69}",
-        nfc: "\u{FD69}",
-        nfd: "\u{FD69}",
-        nfkc: "\u{0634}\u{062C}\u{064A}",
-        nfkd: "\u{0634}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD6A}",
-        nfc: "\u{FD6A}",
-        nfd: "\u{FD6A}",
-        nfkc: "\u{0634}\u{0645}\u{062E}",
-        nfkd: "\u{0634}\u{0645}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD6B}",
-        nfc: "\u{FD6B}",
-        nfd: "\u{FD6B}",
-        nfkc: "\u{0634}\u{0645}\u{062E}",
-        nfkd: "\u{0634}\u{0645}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD6C}",
-        nfc: "\u{FD6C}",
-        nfd: "\u{FD6C}",
-        nfkc: "\u{0634}\u{0645}\u{0645}",
-        nfkd: "\u{0634}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD6D}",
-        nfc: "\u{FD6D}",
-        nfd: "\u{FD6D}",
-        nfkc: "\u{0634}\u{0645}\u{0645}",
-        nfkd: "\u{0634}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD6E}",
-        nfc: "\u{FD6E}",
-        nfd: "\u{FD6E}",
-        nfkc: "\u{0636}\u{062D}\u{0649}",
-        nfkd: "\u{0636}\u{062D}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD6F}",
-        nfc: "\u{FD6F}",
-        nfd: "\u{FD6F}",
-        nfkc: "\u{0636}\u{062E}\u{0645}",
-        nfkd: "\u{0636}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD70}",
-        nfc: "\u{FD70}",
-        nfd: "\u{FD70}",
-        nfkc: "\u{0636}\u{062E}\u{0645}",
-        nfkd: "\u{0636}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD71}",
-        nfc: "\u{FD71}",
-        nfd: "\u{FD71}",
-        nfkc: "\u{0637}\u{0645}\u{062D}",
-        nfkd: "\u{0637}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD72}",
-        nfc: "\u{FD72}",
-        nfd: "\u{FD72}",
-        nfkc: "\u{0637}\u{0645}\u{062D}",
-        nfkd: "\u{0637}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD73}",
-        nfc: "\u{FD73}",
-        nfd: "\u{FD73}",
-        nfkc: "\u{0637}\u{0645}\u{0645}",
-        nfkd: "\u{0637}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD74}",
-        nfc: "\u{FD74}",
-        nfd: "\u{FD74}",
-        nfkc: "\u{0637}\u{0645}\u{064A}",
-        nfkd: "\u{0637}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD75}",
-        nfc: "\u{FD75}",
-        nfd: "\u{FD75}",
-        nfkc: "\u{0639}\u{062C}\u{0645}",
-        nfkd: "\u{0639}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD76}",
-        nfc: "\u{FD76}",
-        nfd: "\u{FD76}",
-        nfkc: "\u{0639}\u{0645}\u{0645}",
-        nfkd: "\u{0639}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD77}",
-        nfc: "\u{FD77}",
-        nfd: "\u{FD77}",
-        nfkc: "\u{0639}\u{0645}\u{0645}",
-        nfkd: "\u{0639}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD78}",
-        nfc: "\u{FD78}",
-        nfd: "\u{FD78}",
-        nfkc: "\u{0639}\u{0645}\u{0649}",
-        nfkd: "\u{0639}\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD79}",
-        nfc: "\u{FD79}",
-        nfd: "\u{FD79}",
-        nfkc: "\u{063A}\u{0645}\u{0645}",
-        nfkd: "\u{063A}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD7A}",
-        nfc: "\u{FD7A}",
-        nfd: "\u{FD7A}",
-        nfkc: "\u{063A}\u{0645}\u{064A}",
-        nfkd: "\u{063A}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD7B}",
-        nfc: "\u{FD7B}",
-        nfd: "\u{FD7B}",
-        nfkc: "\u{063A}\u{0645}\u{0649}",
-        nfkd: "\u{063A}\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD7C}",
-        nfc: "\u{FD7C}",
-        nfd: "\u{FD7C}",
-        nfkc: "\u{0641}\u{062E}\u{0645}",
-        nfkd: "\u{0641}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD7D}",
-        nfc: "\u{FD7D}",
-        nfd: "\u{FD7D}",
-        nfkc: "\u{0641}\u{062E}\u{0645}",
-        nfkd: "\u{0641}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD7E}",
-        nfc: "\u{FD7E}",
-        nfd: "\u{FD7E}",
-        nfkc: "\u{0642}\u{0645}\u{062D}",
-        nfkd: "\u{0642}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD7F}",
-        nfc: "\u{FD7F}",
-        nfd: "\u{FD7F}",
-        nfkc: "\u{0642}\u{0645}\u{0645}",
-        nfkd: "\u{0642}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD80}",
-        nfc: "\u{FD80}",
-        nfd: "\u{FD80}",
-        nfkc: "\u{0644}\u{062D}\u{0645}",
-        nfkd: "\u{0644}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD81}",
-        nfc: "\u{FD81}",
-        nfd: "\u{FD81}",
-        nfkc: "\u{0644}\u{062D}\u{064A}",
-        nfkd: "\u{0644}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD82}",
-        nfc: "\u{FD82}",
-        nfd: "\u{FD82}",
-        nfkc: "\u{0644}\u{062D}\u{0649}",
-        nfkd: "\u{0644}\u{062D}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD83}",
-        nfc: "\u{FD83}",
-        nfd: "\u{FD83}",
-        nfkc: "\u{0644}\u{062C}\u{062C}",
-        nfkd: "\u{0644}\u{062C}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD84}",
-        nfc: "\u{FD84}",
-        nfd: "\u{FD84}",
-        nfkc: "\u{0644}\u{062C}\u{062C}",
-        nfkd: "\u{0644}\u{062C}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD85}",
-        nfc: "\u{FD85}",
-        nfd: "\u{FD85}",
-        nfkc: "\u{0644}\u{062E}\u{0645}",
-        nfkd: "\u{0644}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD86}",
-        nfc: "\u{FD86}",
-        nfd: "\u{FD86}",
-        nfkc: "\u{0644}\u{062E}\u{0645}",
-        nfkd: "\u{0644}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD87}",
-        nfc: "\u{FD87}",
-        nfd: "\u{FD87}",
-        nfkc: "\u{0644}\u{0645}\u{062D}",
-        nfkd: "\u{0644}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD88}",
-        nfc: "\u{FD88}",
-        nfd: "\u{FD88}",
-        nfkc: "\u{0644}\u{0645}\u{062D}",
-        nfkd: "\u{0644}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD89}",
-        nfc: "\u{FD89}",
-        nfd: "\u{FD89}",
-        nfkc: "\u{0645}\u{062D}\u{062C}",
-        nfkd: "\u{0645}\u{062D}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD8A}",
-        nfc: "\u{FD8A}",
-        nfd: "\u{FD8A}",
-        nfkc: "\u{0645}\u{062D}\u{0645}",
-        nfkd: "\u{0645}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD8B}",
-        nfc: "\u{FD8B}",
-        nfd: "\u{FD8B}",
-        nfkc: "\u{0645}\u{062D}\u{064A}",
-        nfkd: "\u{0645}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD8C}",
-        nfc: "\u{FD8C}",
-        nfd: "\u{FD8C}",
-        nfkc: "\u{0645}\u{062C}\u{062D}",
-        nfkd: "\u{0645}\u{062C}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FD8D}",
-        nfc: "\u{FD8D}",
-        nfd: "\u{FD8D}",
-        nfkc: "\u{0645}\u{062C}\u{0645}",
-        nfkd: "\u{0645}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD8E}",
-        nfc: "\u{FD8E}",
-        nfd: "\u{FD8E}",
-        nfkc: "\u{0645}\u{062E}\u{062C}",
-        nfkd: "\u{0645}\u{062E}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD8F}",
-        nfc: "\u{FD8F}",
-        nfd: "\u{FD8F}",
-        nfkc: "\u{0645}\u{062E}\u{0645}",
-        nfkd: "\u{0645}\u{062E}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD92}",
-        nfc: "\u{FD92}",
-        nfd: "\u{FD92}",
-        nfkc: "\u{0645}\u{062C}\u{062E}",
-        nfkd: "\u{0645}\u{062C}\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FD93}",
-        nfc: "\u{FD93}",
-        nfd: "\u{FD93}",
-        nfkc: "\u{0647}\u{0645}\u{062C}",
-        nfkd: "\u{0647}\u{0645}\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FD94}",
-        nfc: "\u{FD94}",
-        nfd: "\u{FD94}",
-        nfkc: "\u{0647}\u{0645}\u{0645}",
-        nfkd: "\u{0647}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD95}",
-        nfc: "\u{FD95}",
-        nfd: "\u{FD95}",
-        nfkc: "\u{0646}\u{062D}\u{0645}",
-        nfkd: "\u{0646}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD96}",
-        nfc: "\u{FD96}",
-        nfd: "\u{FD96}",
-        nfkc: "\u{0646}\u{062D}\u{0649}",
-        nfkd: "\u{0646}\u{062D}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD97}",
-        nfc: "\u{FD97}",
-        nfd: "\u{FD97}",
-        nfkc: "\u{0646}\u{062C}\u{0645}",
-        nfkd: "\u{0646}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD98}",
-        nfc: "\u{FD98}",
-        nfd: "\u{FD98}",
-        nfkc: "\u{0646}\u{062C}\u{0645}",
-        nfkd: "\u{0646}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD99}",
-        nfc: "\u{FD99}",
-        nfd: "\u{FD99}",
-        nfkc: "\u{0646}\u{062C}\u{0649}",
-        nfkd: "\u{0646}\u{062C}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD9A}",
-        nfc: "\u{FD9A}",
-        nfd: "\u{FD9A}",
-        nfkc: "\u{0646}\u{0645}\u{064A}",
-        nfkd: "\u{0646}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD9B}",
-        nfc: "\u{FD9B}",
-        nfd: "\u{FD9B}",
-        nfkc: "\u{0646}\u{0645}\u{0649}",
-        nfkd: "\u{0646}\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FD9C}",
-        nfc: "\u{FD9C}",
-        nfd: "\u{FD9C}",
-        nfkc: "\u{064A}\u{0645}\u{0645}",
-        nfkd: "\u{064A}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD9D}",
-        nfc: "\u{FD9D}",
-        nfd: "\u{FD9D}",
-        nfkc: "\u{064A}\u{0645}\u{0645}",
-        nfkd: "\u{064A}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FD9E}",
-        nfc: "\u{FD9E}",
-        nfd: "\u{FD9E}",
-        nfkc: "\u{0628}\u{062E}\u{064A}",
-        nfkd: "\u{0628}\u{062E}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FD9F}",
-        nfc: "\u{FD9F}",
-        nfd: "\u{FD9F}",
-        nfkc: "\u{062A}\u{062C}\u{064A}",
-        nfkd: "\u{062A}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDA0}",
-        nfc: "\u{FDA0}",
-        nfd: "\u{FDA0}",
-        nfkc: "\u{062A}\u{062C}\u{0649}",
-        nfkd: "\u{062A}\u{062C}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDA1}",
-        nfc: "\u{FDA1}",
-        nfd: "\u{FDA1}",
-        nfkc: "\u{062A}\u{062E}\u{064A}",
-        nfkd: "\u{062A}\u{062E}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDA2}",
-        nfc: "\u{FDA2}",
-        nfd: "\u{FDA2}",
-        nfkc: "\u{062A}\u{062E}\u{0649}",
-        nfkd: "\u{062A}\u{062E}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDA3}",
-        nfc: "\u{FDA3}",
-        nfd: "\u{FDA3}",
-        nfkc: "\u{062A}\u{0645}\u{064A}",
-        nfkd: "\u{062A}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDA4}",
-        nfc: "\u{FDA4}",
-        nfd: "\u{FDA4}",
-        nfkc: "\u{062A}\u{0645}\u{0649}",
-        nfkd: "\u{062A}\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDA5}",
-        nfc: "\u{FDA5}",
-        nfd: "\u{FDA5}",
-        nfkc: "\u{062C}\u{0645}\u{064A}",
-        nfkd: "\u{062C}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDA6}",
-        nfc: "\u{FDA6}",
-        nfd: "\u{FDA6}",
-        nfkc: "\u{062C}\u{062D}\u{0649}",
-        nfkd: "\u{062C}\u{062D}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDA7}",
-        nfc: "\u{FDA7}",
-        nfd: "\u{FDA7}",
-        nfkc: "\u{062C}\u{0645}\u{0649}",
-        nfkd: "\u{062C}\u{0645}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDA8}",
-        nfc: "\u{FDA8}",
-        nfd: "\u{FDA8}",
-        nfkc: "\u{0633}\u{062E}\u{0649}",
-        nfkd: "\u{0633}\u{062E}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDA9}",
-        nfc: "\u{FDA9}",
-        nfd: "\u{FDA9}",
-        nfkc: "\u{0635}\u{062D}\u{064A}",
-        nfkd: "\u{0635}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDAA}",
-        nfc: "\u{FDAA}",
-        nfd: "\u{FDAA}",
-        nfkc: "\u{0634}\u{062D}\u{064A}",
-        nfkd: "\u{0634}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDAB}",
-        nfc: "\u{FDAB}",
-        nfd: "\u{FDAB}",
-        nfkc: "\u{0636}\u{062D}\u{064A}",
-        nfkd: "\u{0636}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDAC}",
-        nfc: "\u{FDAC}",
-        nfd: "\u{FDAC}",
-        nfkc: "\u{0644}\u{062C}\u{064A}",
-        nfkd: "\u{0644}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDAD}",
-        nfc: "\u{FDAD}",
-        nfd: "\u{FDAD}",
-        nfkc: "\u{0644}\u{0645}\u{064A}",
-        nfkd: "\u{0644}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDAE}",
-        nfc: "\u{FDAE}",
-        nfd: "\u{FDAE}",
-        nfkc: "\u{064A}\u{062D}\u{064A}",
-        nfkd: "\u{064A}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDAF}",
-        nfc: "\u{FDAF}",
-        nfd: "\u{FDAF}",
-        nfkc: "\u{064A}\u{062C}\u{064A}",
-        nfkd: "\u{064A}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB0}",
-        nfc: "\u{FDB0}",
-        nfd: "\u{FDB0}",
-        nfkc: "\u{064A}\u{0645}\u{064A}",
-        nfkd: "\u{064A}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB1}",
-        nfc: "\u{FDB1}",
-        nfd: "\u{FDB1}",
-        nfkc: "\u{0645}\u{0645}\u{064A}",
-        nfkd: "\u{0645}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB2}",
-        nfc: "\u{FDB2}",
-        nfd: "\u{FDB2}",
-        nfkc: "\u{0642}\u{0645}\u{064A}",
-        nfkd: "\u{0642}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB3}",
-        nfc: "\u{FDB3}",
-        nfd: "\u{FDB3}",
-        nfkc: "\u{0646}\u{062D}\u{064A}",
-        nfkd: "\u{0646}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB4}",
-        nfc: "\u{FDB4}",
-        nfd: "\u{FDB4}",
-        nfkc: "\u{0642}\u{0645}\u{062D}",
-        nfkd: "\u{0642}\u{0645}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FDB5}",
-        nfc: "\u{FDB5}",
-        nfd: "\u{FDB5}",
-        nfkc: "\u{0644}\u{062D}\u{0645}",
-        nfkd: "\u{0644}\u{062D}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDB6}",
-        nfc: "\u{FDB6}",
-        nfd: "\u{FDB6}",
-        nfkc: "\u{0639}\u{0645}\u{064A}",
-        nfkd: "\u{0639}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB7}",
-        nfc: "\u{FDB7}",
-        nfd: "\u{FDB7}",
-        nfkc: "\u{0643}\u{0645}\u{064A}",
-        nfkd: "\u{0643}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDB8}",
-        nfc: "\u{FDB8}",
-        nfd: "\u{FDB8}",
-        nfkc: "\u{0646}\u{062C}\u{062D}",
-        nfkd: "\u{0646}\u{062C}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FDB9}",
-        nfc: "\u{FDB9}",
-        nfd: "\u{FDB9}",
-        nfkc: "\u{0645}\u{062E}\u{064A}",
-        nfkd: "\u{0645}\u{062E}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDBA}",
-        nfc: "\u{FDBA}",
-        nfd: "\u{FDBA}",
-        nfkc: "\u{0644}\u{062C}\u{0645}",
-        nfkd: "\u{0644}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDBB}",
-        nfc: "\u{FDBB}",
-        nfd: "\u{FDBB}",
-        nfkc: "\u{0643}\u{0645}\u{0645}",
-        nfkd: "\u{0643}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDBC}",
-        nfc: "\u{FDBC}",
-        nfd: "\u{FDBC}",
-        nfkc: "\u{0644}\u{062C}\u{0645}",
-        nfkd: "\u{0644}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDBD}",
-        nfc: "\u{FDBD}",
-        nfd: "\u{FDBD}",
-        nfkc: "\u{0646}\u{062C}\u{062D}",
-        nfkd: "\u{0646}\u{062C}\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FDBE}",
-        nfc: "\u{FDBE}",
-        nfd: "\u{FDBE}",
-        nfkc: "\u{062C}\u{062D}\u{064A}",
-        nfkd: "\u{062C}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDBF}",
-        nfc: "\u{FDBF}",
-        nfd: "\u{FDBF}",
-        nfkc: "\u{062D}\u{062C}\u{064A}",
-        nfkd: "\u{062D}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDC0}",
-        nfc: "\u{FDC0}",
-        nfd: "\u{FDC0}",
-        nfkc: "\u{0645}\u{062C}\u{064A}",
-        nfkd: "\u{0645}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDC1}",
-        nfc: "\u{FDC1}",
-        nfd: "\u{FDC1}",
-        nfkc: "\u{0641}\u{0645}\u{064A}",
-        nfkd: "\u{0641}\u{0645}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDC2}",
-        nfc: "\u{FDC2}",
-        nfd: "\u{FDC2}",
-        nfkc: "\u{0628}\u{062D}\u{064A}",
-        nfkd: "\u{0628}\u{062D}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDC3}",
-        nfc: "\u{FDC3}",
-        nfd: "\u{FDC3}",
-        nfkc: "\u{0643}\u{0645}\u{0645}",
-        nfkd: "\u{0643}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDC4}",
-        nfc: "\u{FDC4}",
-        nfd: "\u{FDC4}",
-        nfkc: "\u{0639}\u{062C}\u{0645}",
-        nfkd: "\u{0639}\u{062C}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDC5}",
-        nfc: "\u{FDC5}",
-        nfd: "\u{FDC5}",
-        nfkc: "\u{0635}\u{0645}\u{0645}",
-        nfkd: "\u{0635}\u{0645}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDC6}",
-        nfc: "\u{FDC6}",
-        nfd: "\u{FDC6}",
-        nfkc: "\u{0633}\u{062E}\u{064A}",
-        nfkd: "\u{0633}\u{062E}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDC7}",
-        nfc: "\u{FDC7}",
-        nfd: "\u{FDC7}",
-        nfkc: "\u{0646}\u{062C}\u{064A}",
-        nfkd: "\u{0646}\u{062C}\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FDF0}",
-        nfc: "\u{FDF0}",
-        nfd: "\u{FDF0}",
-        nfkc: "\u{0635}\u{0644}\u{06D2}",
-        nfkd: "\u{0635}\u{0644}\u{06D2}",
-    },
-    NormalizationTest {
-        source: "\u{FDF1}",
-        nfc: "\u{FDF1}",
-        nfd: "\u{FDF1}",
-        nfkc: "\u{0642}\u{0644}\u{06D2}",
-        nfkd: "\u{0642}\u{0644}\u{06D2}",
-    },
-    NormalizationTest {
-        source: "\u{FDF2}",
-        nfc: "\u{FDF2}",
-        nfd: "\u{FDF2}",
-        nfkc: "\u{0627}\u{0644}\u{0644}\u{0647}",
-        nfkd: "\u{0627}\u{0644}\u{0644}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FDF3}",
-        nfc: "\u{FDF3}",
-        nfd: "\u{FDF3}",
-        nfkc: "\u{0627}\u{0643}\u{0628}\u{0631}",
-        nfkd: "\u{0627}\u{0643}\u{0628}\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FDF4}",
-        nfc: "\u{FDF4}",
-        nfd: "\u{FDF4}",
-        nfkc: "\u{0645}\u{062D}\u{0645}\u{062F}",
-        nfkd: "\u{0645}\u{062D}\u{0645}\u{062F}",
-    },
-    NormalizationTest {
-        source: "\u{FDF5}",
-        nfc: "\u{FDF5}",
-        nfd: "\u{FDF5}",
-        nfkc: "\u{0635}\u{0644}\u{0639}\u{0645}",
-        nfkd: "\u{0635}\u{0644}\u{0639}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDF6}",
-        nfc: "\u{FDF6}",
-        nfd: "\u{FDF6}",
-        nfkc: "\u{0631}\u{0633}\u{0648}\u{0644}",
-        nfkd: "\u{0631}\u{0633}\u{0648}\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FDF7}",
-        nfc: "\u{FDF7}",
-        nfd: "\u{FDF7}",
-        nfkc: "\u{0639}\u{0644}\u{064A}\u{0647}",
-        nfkd: "\u{0639}\u{0644}\u{064A}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FDF8}",
-        nfc: "\u{FDF8}",
-        nfd: "\u{FDF8}",
-        nfkc: "\u{0648}\u{0633}\u{0644}\u{0645}",
-        nfkd: "\u{0648}\u{0633}\u{0644}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDF9}",
-        nfc: "\u{FDF9}",
-        nfd: "\u{FDF9}",
-        nfkc: "\u{0635}\u{0644}\u{0649}",
-        nfkd: "\u{0635}\u{0644}\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FDFA}",
-        nfc: "\u{FDFA}",
-        nfd: "\u{FDFA}",
-        nfkc: "\u{0635}\u{0644}\u{0649}\u{0020}\u{0627}\u{0644}\u{0644}\u{0647}\u{0020}\u{0639}\u{0644}\u{064A}\u{0647}\u{0020}\u{0648}\u{0633}\u{0644}\u{0645}",
-        nfkd: "\u{0635}\u{0644}\u{0649}\u{0020}\u{0627}\u{0644}\u{0644}\u{0647}\u{0020}\u{0639}\u{0644}\u{064A}\u{0647}\u{0020}\u{0648}\u{0633}\u{0644}\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FDFB}",
-        nfc: "\u{FDFB}",
-        nfd: "\u{FDFB}",
-        nfkc: "\u{062C}\u{0644}\u{0020}\u{062C}\u{0644}\u{0627}\u{0644}\u{0647}",
-        nfkd: "\u{062C}\u{0644}\u{0020}\u{062C}\u{0644}\u{0627}\u{0644}\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FDFC}",
-        nfc: "\u{FDFC}",
-        nfd: "\u{FDFC}",
-        nfkc: "\u{0631}\u{06CC}\u{0627}\u{0644}",
-        nfkd: "\u{0631}\u{06CC}\u{0627}\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FE10}",
-        nfc: "\u{FE10}",
-        nfd: "\u{FE10}",
-        nfkc: "\u{002C}",
-        nfkd: "\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{FE11}",
-        nfc: "\u{FE11}",
-        nfd: "\u{FE11}",
-        nfkc: "\u{3001}",
-        nfkd: "\u{3001}",
-    },
-    NormalizationTest {
-        source: "\u{FE12}",
-        nfc: "\u{FE12}",
-        nfd: "\u{FE12}",
-        nfkc: "\u{3002}",
-        nfkd: "\u{3002}",
-    },
-    NormalizationTest {
-        source: "\u{FE13}",
-        nfc: "\u{FE13}",
-        nfd: "\u{FE13}",
-        nfkc: "\u{003A}",
-        nfkd: "\u{003A}",
-    },
-    NormalizationTest {
-        source: "\u{FE14}",
-        nfc: "\u{FE14}",
-        nfd: "\u{FE14}",
-        nfkc: "\u{003B}",
-        nfkd: "\u{003B}",
-    },
-    NormalizationTest {
-        source: "\u{FE15}",
-        nfc: "\u{FE15}",
-        nfd: "\u{FE15}",
-        nfkc: "\u{0021}",
-        nfkd: "\u{0021}",
-    },
-    NormalizationTest {
-        source: "\u{FE16}",
-        nfc: "\u{FE16}",
-        nfd: "\u{FE16}",
-        nfkc: "\u{003F}",
-        nfkd: "\u{003F}",
-    },
-    NormalizationTest {
-        source: "\u{FE17}",
-        nfc: "\u{FE17}",
-        nfd: "\u{FE17}",
-        nfkc: "\u{3016}",
-        nfkd: "\u{3016}",
-    },
-    NormalizationTest {
-        source: "\u{FE18}",
-        nfc: "\u{FE18}",
-        nfd: "\u{FE18}",
-        nfkc: "\u{3017}",
-        nfkd: "\u{3017}",
-    },
-    NormalizationTest {
-        source: "\u{FE19}",
-        nfc: "\u{FE19}",
-        nfd: "\u{FE19}",
-        nfkc: "\u{002E}\u{002E}\u{002E}",
-        nfkd: "\u{002E}\u{002E}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{FE30}",
-        nfc: "\u{FE30}",
-        nfd: "\u{FE30}",
-        nfkc: "\u{002E}\u{002E}",
-        nfkd: "\u{002E}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{FE31}",
-        nfc: "\u{FE31}",
-        nfd: "\u{FE31}",
-        nfkc: "\u{2014}",
-        nfkd: "\u{2014}",
-    },
-    NormalizationTest {
-        source: "\u{FE32}",
-        nfc: "\u{FE32}",
-        nfd: "\u{FE32}",
-        nfkc: "\u{2013}",
-        nfkd: "\u{2013}",
-    },
-    NormalizationTest {
-        source: "\u{FE33}",
-        nfc: "\u{FE33}",
-        nfd: "\u{FE33}",
-        nfkc: "\u{005F}",
-        nfkd: "\u{005F}",
-    },
-    NormalizationTest {
-        source: "\u{FE34}",
-        nfc: "\u{FE34}",
-        nfd: "\u{FE34}",
-        nfkc: "\u{005F}",
-        nfkd: "\u{005F}",
-    },
-    NormalizationTest {
-        source: "\u{FE35}",
-        nfc: "\u{FE35}",
-        nfd: "\u{FE35}",
-        nfkc: "\u{0028}",
-        nfkd: "\u{0028}",
-    },
-    NormalizationTest {
-        source: "\u{FE36}",
-        nfc: "\u{FE36}",
-        nfd: "\u{FE36}",
-        nfkc: "\u{0029}",
-        nfkd: "\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{FE37}",
-        nfc: "\u{FE37}",
-        nfd: "\u{FE37}",
-        nfkc: "\u{007B}",
-        nfkd: "\u{007B}",
-    },
-    NormalizationTest {
-        source: "\u{FE38}",
-        nfc: "\u{FE38}",
-        nfd: "\u{FE38}",
-        nfkc: "\u{007D}",
-        nfkd: "\u{007D}",
-    },
-    NormalizationTest {
-        source: "\u{FE39}",
-        nfc: "\u{FE39}",
-        nfd: "\u{FE39}",
-        nfkc: "\u{3014}",
-        nfkd: "\u{3014}",
-    },
-    NormalizationTest {
-        source: "\u{FE3A}",
-        nfc: "\u{FE3A}",
-        nfd: "\u{FE3A}",
-        nfkc: "\u{3015}",
-        nfkd: "\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{FE3B}",
-        nfc: "\u{FE3B}",
-        nfd: "\u{FE3B}",
-        nfkc: "\u{3010}",
-        nfkd: "\u{3010}",
-    },
-    NormalizationTest {
-        source: "\u{FE3C}",
-        nfc: "\u{FE3C}",
-        nfd: "\u{FE3C}",
-        nfkc: "\u{3011}",
-        nfkd: "\u{3011}",
-    },
-    NormalizationTest {
-        source: "\u{FE3D}",
-        nfc: "\u{FE3D}",
-        nfd: "\u{FE3D}",
-        nfkc: "\u{300A}",
-        nfkd: "\u{300A}",
-    },
-    NormalizationTest {
-        source: "\u{FE3E}",
-        nfc: "\u{FE3E}",
-        nfd: "\u{FE3E}",
-        nfkc: "\u{300B}",
-        nfkd: "\u{300B}",
-    },
-    NormalizationTest {
-        source: "\u{FE3F}",
-        nfc: "\u{FE3F}",
-        nfd: "\u{FE3F}",
-        nfkc: "\u{3008}",
-        nfkd: "\u{3008}",
-    },
-    NormalizationTest {
-        source: "\u{FE40}",
-        nfc: "\u{FE40}",
-        nfd: "\u{FE40}",
-        nfkc: "\u{3009}",
-        nfkd: "\u{3009}",
-    },
-    NormalizationTest {
-        source: "\u{FE41}",
-        nfc: "\u{FE41}",
-        nfd: "\u{FE41}",
-        nfkc: "\u{300C}",
-        nfkd: "\u{300C}",
-    },
-    NormalizationTest {
-        source: "\u{FE42}",
-        nfc: "\u{FE42}",
-        nfd: "\u{FE42}",
-        nfkc: "\u{300D}",
-        nfkd: "\u{300D}",
-    },
-    NormalizationTest {
-        source: "\u{FE43}",
-        nfc: "\u{FE43}",
-        nfd: "\u{FE43}",
-        nfkc: "\u{300E}",
-        nfkd: "\u{300E}",
-    },
-    NormalizationTest {
-        source: "\u{FE44}",
-        nfc: "\u{FE44}",
-        nfd: "\u{FE44}",
-        nfkc: "\u{300F}",
-        nfkd: "\u{300F}",
-    },
-    NormalizationTest {
-        source: "\u{FE47}",
-        nfc: "\u{FE47}",
-        nfd: "\u{FE47}",
-        nfkc: "\u{005B}",
-        nfkd: "\u{005B}",
-    },
-    NormalizationTest {
-        source: "\u{FE48}",
-        nfc: "\u{FE48}",
-        nfd: "\u{FE48}",
-        nfkc: "\u{005D}",
-        nfkd: "\u{005D}",
-    },
-    NormalizationTest {
-        source: "\u{FE49}",
-        nfc: "\u{FE49}",
-        nfd: "\u{FE49}",
-        nfkc: "\u{0020}\u{0305}",
-        nfkd: "\u{0020}\u{0305}",
-    },
-    NormalizationTest {
-        source: "\u{FE4A}",
-        nfc: "\u{FE4A}",
-        nfd: "\u{FE4A}",
-        nfkc: "\u{0020}\u{0305}",
-        nfkd: "\u{0020}\u{0305}",
-    },
-    NormalizationTest {
-        source: "\u{FE4B}",
-        nfc: "\u{FE4B}",
-        nfd: "\u{FE4B}",
-        nfkc: "\u{0020}\u{0305}",
-        nfkd: "\u{0020}\u{0305}",
-    },
-    NormalizationTest {
-        source: "\u{FE4C}",
-        nfc: "\u{FE4C}",
-        nfd: "\u{FE4C}",
-        nfkc: "\u{0020}\u{0305}",
-        nfkd: "\u{0020}\u{0305}",
-    },
-    NormalizationTest {
-        source: "\u{FE4D}",
-        nfc: "\u{FE4D}",
-        nfd: "\u{FE4D}",
-        nfkc: "\u{005F}",
-        nfkd: "\u{005F}",
-    },
-    NormalizationTest {
-        source: "\u{FE4E}",
-        nfc: "\u{FE4E}",
-        nfd: "\u{FE4E}",
-        nfkc: "\u{005F}",
-        nfkd: "\u{005F}",
-    },
-    NormalizationTest {
-        source: "\u{FE4F}",
-        nfc: "\u{FE4F}",
-        nfd: "\u{FE4F}",
-        nfkc: "\u{005F}",
-        nfkd: "\u{005F}",
-    },
-    NormalizationTest {
-        source: "\u{FE50}",
-        nfc: "\u{FE50}",
-        nfd: "\u{FE50}",
-        nfkc: "\u{002C}",
-        nfkd: "\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{FE51}",
-        nfc: "\u{FE51}",
-        nfd: "\u{FE51}",
-        nfkc: "\u{3001}",
-        nfkd: "\u{3001}",
-    },
-    NormalizationTest {
-        source: "\u{FE52}",
-        nfc: "\u{FE52}",
-        nfd: "\u{FE52}",
-        nfkc: "\u{002E}",
-        nfkd: "\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{FE54}",
-        nfc: "\u{FE54}",
-        nfd: "\u{FE54}",
-        nfkc: "\u{003B}",
-        nfkd: "\u{003B}",
-    },
-    NormalizationTest {
-        source: "\u{FE55}",
-        nfc: "\u{FE55}",
-        nfd: "\u{FE55}",
-        nfkc: "\u{003A}",
-        nfkd: "\u{003A}",
-    },
-    NormalizationTest {
-        source: "\u{FE56}",
-        nfc: "\u{FE56}",
-        nfd: "\u{FE56}",
-        nfkc: "\u{003F}",
-        nfkd: "\u{003F}",
-    },
-    NormalizationTest {
-        source: "\u{FE57}",
-        nfc: "\u{FE57}",
-        nfd: "\u{FE57}",
-        nfkc: "\u{0021}",
-        nfkd: "\u{0021}",
-    },
-    NormalizationTest {
-        source: "\u{FE58}",
-        nfc: "\u{FE58}",
-        nfd: "\u{FE58}",
-        nfkc: "\u{2014}",
-        nfkd: "\u{2014}",
-    },
-    NormalizationTest {
-        source: "\u{FE59}",
-        nfc: "\u{FE59}",
-        nfd: "\u{FE59}",
-        nfkc: "\u{0028}",
-        nfkd: "\u{0028}",
-    },
-    NormalizationTest {
-        source: "\u{FE5A}",
-        nfc: "\u{FE5A}",
-        nfd: "\u{FE5A}",
-        nfkc: "\u{0029}",
-        nfkd: "\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{FE5B}",
-        nfc: "\u{FE5B}",
-        nfd: "\u{FE5B}",
-        nfkc: "\u{007B}",
-        nfkd: "\u{007B}",
-    },
-    NormalizationTest {
-        source: "\u{FE5C}",
-        nfc: "\u{FE5C}",
-        nfd: "\u{FE5C}",
-        nfkc: "\u{007D}",
-        nfkd: "\u{007D}",
-    },
-    NormalizationTest {
-        source: "\u{FE5D}",
-        nfc: "\u{FE5D}",
-        nfd: "\u{FE5D}",
-        nfkc: "\u{3014}",
-        nfkd: "\u{3014}",
-    },
-    NormalizationTest {
-        source: "\u{FE5E}",
-        nfc: "\u{FE5E}",
-        nfd: "\u{FE5E}",
-        nfkc: "\u{3015}",
-        nfkd: "\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{FE5F}",
-        nfc: "\u{FE5F}",
-        nfd: "\u{FE5F}",
-        nfkc: "\u{0023}",
-        nfkd: "\u{0023}",
-    },
-    NormalizationTest {
-        source: "\u{FE60}",
-        nfc: "\u{FE60}",
-        nfd: "\u{FE60}",
-        nfkc: "\u{0026}",
-        nfkd: "\u{0026}",
-    },
-    NormalizationTest {
-        source: "\u{FE61}",
-        nfc: "\u{FE61}",
-        nfd: "\u{FE61}",
-        nfkc: "\u{002A}",
-        nfkd: "\u{002A}",
-    },
-    NormalizationTest {
-        source: "\u{FE62}",
-        nfc: "\u{FE62}",
-        nfd: "\u{FE62}",
-        nfkc: "\u{002B}",
-        nfkd: "\u{002B}",
-    },
-    NormalizationTest {
-        source: "\u{FE63}",
-        nfc: "\u{FE63}",
-        nfd: "\u{FE63}",
-        nfkc: "\u{002D}",
-        nfkd: "\u{002D}",
-    },
-    NormalizationTest {
-        source: "\u{FE64}",
-        nfc: "\u{FE64}",
-        nfd: "\u{FE64}",
-        nfkc: "\u{003C}",
-        nfkd: "\u{003C}",
-    },
-    NormalizationTest {
-        source: "\u{FE65}",
-        nfc: "\u{FE65}",
-        nfd: "\u{FE65}",
-        nfkc: "\u{003E}",
-        nfkd: "\u{003E}",
-    },
-    NormalizationTest {
-        source: "\u{FE66}",
-        nfc: "\u{FE66}",
-        nfd: "\u{FE66}",
-        nfkc: "\u{003D}",
-        nfkd: "\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{FE68}",
-        nfc: "\u{FE68}",
-        nfd: "\u{FE68}",
-        nfkc: "\u{005C}",
-        nfkd: "\u{005C}",
-    },
-    NormalizationTest {
-        source: "\u{FE69}",
-        nfc: "\u{FE69}",
-        nfd: "\u{FE69}",
-        nfkc: "\u{0024}",
-        nfkd: "\u{0024}",
-    },
-    NormalizationTest {
-        source: "\u{FE6A}",
-        nfc: "\u{FE6A}",
-        nfd: "\u{FE6A}",
-        nfkc: "\u{0025}",
-        nfkd: "\u{0025}",
-    },
-    NormalizationTest {
-        source: "\u{FE6B}",
-        nfc: "\u{FE6B}",
-        nfd: "\u{FE6B}",
-        nfkc: "\u{0040}",
-        nfkd: "\u{0040}",
-    },
-    NormalizationTest {
-        source: "\u{FE70}",
-        nfc: "\u{FE70}",
-        nfd: "\u{FE70}",
-        nfkc: "\u{0020}\u{064B}",
-        nfkd: "\u{0020}\u{064B}",
-    },
-    NormalizationTest {
-        source: "\u{FE71}",
-        nfc: "\u{FE71}",
-        nfd: "\u{FE71}",
-        nfkc: "\u{0640}\u{064B}",
-        nfkd: "\u{0640}\u{064B}",
-    },
-    NormalizationTest {
-        source: "\u{FE72}",
-        nfc: "\u{FE72}",
-        nfd: "\u{FE72}",
-        nfkc: "\u{0020}\u{064C}",
-        nfkd: "\u{0020}\u{064C}",
-    },
-    NormalizationTest {
-        source: "\u{FE74}",
-        nfc: "\u{FE74}",
-        nfd: "\u{FE74}",
-        nfkc: "\u{0020}\u{064D}",
-        nfkd: "\u{0020}\u{064D}",
-    },
-    NormalizationTest {
-        source: "\u{FE76}",
-        nfc: "\u{FE76}",
-        nfd: "\u{FE76}",
-        nfkc: "\u{0020}\u{064E}",
-        nfkd: "\u{0020}\u{064E}",
-    },
-    NormalizationTest {
-        source: "\u{FE77}",
-        nfc: "\u{FE77}",
-        nfd: "\u{FE77}",
-        nfkc: "\u{0640}\u{064E}",
-        nfkd: "\u{0640}\u{064E}",
-    },
-    NormalizationTest {
-        source: "\u{FE78}",
-        nfc: "\u{FE78}",
-        nfd: "\u{FE78}",
-        nfkc: "\u{0020}\u{064F}",
-        nfkd: "\u{0020}\u{064F}",
-    },
-    NormalizationTest {
-        source: "\u{FE79}",
-        nfc: "\u{FE79}",
-        nfd: "\u{FE79}",
-        nfkc: "\u{0640}\u{064F}",
-        nfkd: "\u{0640}\u{064F}",
-    },
-    NormalizationTest {
-        source: "\u{FE7A}",
-        nfc: "\u{FE7A}",
-        nfd: "\u{FE7A}",
-        nfkc: "\u{0020}\u{0650}",
-        nfkd: "\u{0020}\u{0650}",
-    },
-    NormalizationTest {
-        source: "\u{FE7B}",
-        nfc: "\u{FE7B}",
-        nfd: "\u{FE7B}",
-        nfkc: "\u{0640}\u{0650}",
-        nfkd: "\u{0640}\u{0650}",
-    },
-    NormalizationTest {
-        source: "\u{FE7C}",
-        nfc: "\u{FE7C}",
-        nfd: "\u{FE7C}",
-        nfkc: "\u{0020}\u{0651}",
-        nfkd: "\u{0020}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FE7D}",
-        nfc: "\u{FE7D}",
-        nfd: "\u{FE7D}",
-        nfkc: "\u{0640}\u{0651}",
-        nfkd: "\u{0640}\u{0651}",
-    },
-    NormalizationTest {
-        source: "\u{FE7E}",
-        nfc: "\u{FE7E}",
-        nfd: "\u{FE7E}",
-        nfkc: "\u{0020}\u{0652}",
-        nfkd: "\u{0020}\u{0652}",
-    },
-    NormalizationTest {
-        source: "\u{FE7F}",
-        nfc: "\u{FE7F}",
-        nfd: "\u{FE7F}",
-        nfkc: "\u{0640}\u{0652}",
-        nfkd: "\u{0640}\u{0652}",
-    },
-    NormalizationTest {
-        source: "\u{FE80}",
-        nfc: "\u{FE80}",
-        nfd: "\u{FE80}",
-        nfkc: "\u{0621}",
-        nfkd: "\u{0621}",
-    },
-    NormalizationTest {
-        source: "\u{FE81}",
-        nfc: "\u{FE81}",
-        nfd: "\u{FE81}",
-        nfkc: "\u{0622}",
-        nfkd: "\u{0627}\u{0653}",
-    },
-    NormalizationTest {
-        source: "\u{FE82}",
-        nfc: "\u{FE82}",
-        nfd: "\u{FE82}",
-        nfkc: "\u{0622}",
-        nfkd: "\u{0627}\u{0653}",
-    },
-    NormalizationTest {
-        source: "\u{FE83}",
-        nfc: "\u{FE83}",
-        nfd: "\u{FE83}",
-        nfkc: "\u{0623}",
-        nfkd: "\u{0627}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE84}",
-        nfc: "\u{FE84}",
-        nfd: "\u{FE84}",
-        nfkc: "\u{0623}",
-        nfkd: "\u{0627}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE85}",
-        nfc: "\u{FE85}",
-        nfd: "\u{FE85}",
-        nfkc: "\u{0624}",
-        nfkd: "\u{0648}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE86}",
-        nfc: "\u{FE86}",
-        nfd: "\u{FE86}",
-        nfkc: "\u{0624}",
-        nfkd: "\u{0648}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE87}",
-        nfc: "\u{FE87}",
-        nfd: "\u{FE87}",
-        nfkc: "\u{0625}",
-        nfkd: "\u{0627}\u{0655}",
-    },
-    NormalizationTest {
-        source: "\u{FE88}",
-        nfc: "\u{FE88}",
-        nfd: "\u{FE88}",
-        nfkc: "\u{0625}",
-        nfkd: "\u{0627}\u{0655}",
-    },
-    NormalizationTest {
-        source: "\u{FE89}",
-        nfc: "\u{FE89}",
-        nfd: "\u{FE89}",
-        nfkc: "\u{0626}",
-        nfkd: "\u{064A}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE8A}",
-        nfc: "\u{FE8A}",
-        nfd: "\u{FE8A}",
-        nfkc: "\u{0626}",
-        nfkd: "\u{064A}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE8B}",
-        nfc: "\u{FE8B}",
-        nfd: "\u{FE8B}",
-        nfkc: "\u{0626}",
-        nfkd: "\u{064A}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE8C}",
-        nfc: "\u{FE8C}",
-        nfd: "\u{FE8C}",
-        nfkc: "\u{0626}",
-        nfkd: "\u{064A}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FE8D}",
-        nfc: "\u{FE8D}",
-        nfd: "\u{FE8D}",
-        nfkc: "\u{0627}",
-        nfkd: "\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FE8E}",
-        nfc: "\u{FE8E}",
-        nfd: "\u{FE8E}",
-        nfkc: "\u{0627}",
-        nfkd: "\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FE8F}",
-        nfc: "\u{FE8F}",
-        nfd: "\u{FE8F}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{FE90}",
-        nfc: "\u{FE90}",
-        nfd: "\u{FE90}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{FE91}",
-        nfc: "\u{FE91}",
-        nfd: "\u{FE91}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{FE92}",
-        nfc: "\u{FE92}",
-        nfd: "\u{FE92}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{FE93}",
-        nfc: "\u{FE93}",
-        nfd: "\u{FE93}",
-        nfkc: "\u{0629}",
-        nfkd: "\u{0629}",
-    },
-    NormalizationTest {
-        source: "\u{FE94}",
-        nfc: "\u{FE94}",
-        nfd: "\u{FE94}",
-        nfkc: "\u{0629}",
-        nfkd: "\u{0629}",
-    },
-    NormalizationTest {
-        source: "\u{FE95}",
-        nfc: "\u{FE95}",
-        nfd: "\u{FE95}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{FE96}",
-        nfc: "\u{FE96}",
-        nfd: "\u{FE96}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{FE97}",
-        nfc: "\u{FE97}",
-        nfd: "\u{FE97}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{FE98}",
-        nfc: "\u{FE98}",
-        nfd: "\u{FE98}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{FE99}",
-        nfc: "\u{FE99}",
-        nfd: "\u{FE99}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{FE9A}",
-        nfc: "\u{FE9A}",
-        nfd: "\u{FE9A}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{FE9B}",
-        nfc: "\u{FE9B}",
-        nfd: "\u{FE9B}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{FE9C}",
-        nfc: "\u{FE9C}",
-        nfd: "\u{FE9C}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{FE9D}",
-        nfc: "\u{FE9D}",
-        nfd: "\u{FE9D}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FE9E}",
-        nfc: "\u{FE9E}",
-        nfd: "\u{FE9E}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FE9F}",
-        nfc: "\u{FE9F}",
-        nfd: "\u{FE9F}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FEA0}",
-        nfc: "\u{FEA0}",
-        nfd: "\u{FEA0}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{FEA1}",
-        nfc: "\u{FEA1}",
-        nfd: "\u{FEA1}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FEA2}",
-        nfc: "\u{FEA2}",
-        nfd: "\u{FEA2}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FEA3}",
-        nfc: "\u{FEA3}",
-        nfd: "\u{FEA3}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FEA4}",
-        nfc: "\u{FEA4}",
-        nfd: "\u{FEA4}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{FEA5}",
-        nfc: "\u{FEA5}",
-        nfd: "\u{FEA5}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FEA6}",
-        nfc: "\u{FEA6}",
-        nfd: "\u{FEA6}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FEA7}",
-        nfc: "\u{FEA7}",
-        nfd: "\u{FEA7}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FEA8}",
-        nfc: "\u{FEA8}",
-        nfd: "\u{FEA8}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{FEA9}",
-        nfc: "\u{FEA9}",
-        nfd: "\u{FEA9}",
-        nfkc: "\u{062F}",
-        nfkd: "\u{062F}",
-    },
-    NormalizationTest {
-        source: "\u{FEAA}",
-        nfc: "\u{FEAA}",
-        nfd: "\u{FEAA}",
-        nfkc: "\u{062F}",
-        nfkd: "\u{062F}",
-    },
-    NormalizationTest {
-        source: "\u{FEAB}",
-        nfc: "\u{FEAB}",
-        nfd: "\u{FEAB}",
-        nfkc: "\u{0630}",
-        nfkd: "\u{0630}",
-    },
-    NormalizationTest {
-        source: "\u{FEAC}",
-        nfc: "\u{FEAC}",
-        nfd: "\u{FEAC}",
-        nfkc: "\u{0630}",
-        nfkd: "\u{0630}",
-    },
-    NormalizationTest {
-        source: "\u{FEAD}",
-        nfc: "\u{FEAD}",
-        nfd: "\u{FEAD}",
-        nfkc: "\u{0631}",
-        nfkd: "\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FEAE}",
-        nfc: "\u{FEAE}",
-        nfd: "\u{FEAE}",
-        nfkc: "\u{0631}",
-        nfkd: "\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{FEAF}",
-        nfc: "\u{FEAF}",
-        nfd: "\u{FEAF}",
-        nfkc: "\u{0632}",
-        nfkd: "\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FEB0}",
-        nfc: "\u{FEB0}",
-        nfd: "\u{FEB0}",
-        nfkc: "\u{0632}",
-        nfkd: "\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{FEB1}",
-        nfc: "\u{FEB1}",
-        nfd: "\u{FEB1}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{FEB2}",
-        nfc: "\u{FEB2}",
-        nfd: "\u{FEB2}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{FEB3}",
-        nfc: "\u{FEB3}",
-        nfd: "\u{FEB3}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{FEB4}",
-        nfc: "\u{FEB4}",
-        nfd: "\u{FEB4}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{FEB5}",
-        nfc: "\u{FEB5}",
-        nfd: "\u{FEB5}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{FEB6}",
-        nfc: "\u{FEB6}",
-        nfd: "\u{FEB6}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{FEB7}",
-        nfc: "\u{FEB7}",
-        nfd: "\u{FEB7}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{FEB8}",
-        nfc: "\u{FEB8}",
-        nfd: "\u{FEB8}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{FEB9}",
-        nfc: "\u{FEB9}",
-        nfd: "\u{FEB9}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{FEBA}",
-        nfc: "\u{FEBA}",
-        nfd: "\u{FEBA}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{FEBB}",
-        nfc: "\u{FEBB}",
-        nfd: "\u{FEBB}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{FEBC}",
-        nfc: "\u{FEBC}",
-        nfd: "\u{FEBC}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{FEBD}",
-        nfc: "\u{FEBD}",
-        nfd: "\u{FEBD}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{FEBE}",
-        nfc: "\u{FEBE}",
-        nfd: "\u{FEBE}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{FEBF}",
-        nfc: "\u{FEBF}",
-        nfd: "\u{FEBF}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{FEC0}",
-        nfc: "\u{FEC0}",
-        nfd: "\u{FEC0}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{FEC1}",
-        nfc: "\u{FEC1}",
-        nfd: "\u{FEC1}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{FEC2}",
-        nfc: "\u{FEC2}",
-        nfd: "\u{FEC2}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{FEC3}",
-        nfc: "\u{FEC3}",
-        nfd: "\u{FEC3}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{FEC4}",
-        nfc: "\u{FEC4}",
-        nfd: "\u{FEC4}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{FEC5}",
-        nfc: "\u{FEC5}",
-        nfd: "\u{FEC5}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{FEC6}",
-        nfc: "\u{FEC6}",
-        nfd: "\u{FEC6}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{FEC7}",
-        nfc: "\u{FEC7}",
-        nfd: "\u{FEC7}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{FEC8}",
-        nfc: "\u{FEC8}",
-        nfd: "\u{FEC8}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{FEC9}",
-        nfc: "\u{FEC9}",
-        nfd: "\u{FEC9}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{FECA}",
-        nfc: "\u{FECA}",
-        nfd: "\u{FECA}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{FECB}",
-        nfc: "\u{FECB}",
-        nfd: "\u{FECB}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{FECC}",
-        nfc: "\u{FECC}",
-        nfd: "\u{FECC}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{FECD}",
-        nfc: "\u{FECD}",
-        nfd: "\u{FECD}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{FECE}",
-        nfc: "\u{FECE}",
-        nfd: "\u{FECE}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{FECF}",
-        nfc: "\u{FECF}",
-        nfd: "\u{FECF}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{FED0}",
-        nfc: "\u{FED0}",
-        nfd: "\u{FED0}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{FED1}",
-        nfc: "\u{FED1}",
-        nfd: "\u{FED1}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{FED2}",
-        nfc: "\u{FED2}",
-        nfd: "\u{FED2}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{FED3}",
-        nfc: "\u{FED3}",
-        nfd: "\u{FED3}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{FED4}",
-        nfc: "\u{FED4}",
-        nfd: "\u{FED4}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{FED5}",
-        nfc: "\u{FED5}",
-        nfd: "\u{FED5}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{FED6}",
-        nfc: "\u{FED6}",
-        nfd: "\u{FED6}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{FED7}",
-        nfc: "\u{FED7}",
-        nfd: "\u{FED7}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{FED8}",
-        nfc: "\u{FED8}",
-        nfd: "\u{FED8}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{FED9}",
-        nfc: "\u{FED9}",
-        nfd: "\u{FED9}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{FEDA}",
-        nfc: "\u{FEDA}",
-        nfd: "\u{FEDA}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{FEDB}",
-        nfc: "\u{FEDB}",
-        nfd: "\u{FEDB}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{FEDC}",
-        nfc: "\u{FEDC}",
-        nfd: "\u{FEDC}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{FEDD}",
-        nfc: "\u{FEDD}",
-        nfd: "\u{FEDD}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FEDE}",
-        nfc: "\u{FEDE}",
-        nfd: "\u{FEDE}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FEDF}",
-        nfc: "\u{FEDF}",
-        nfd: "\u{FEDF}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FEE0}",
-        nfc: "\u{FEE0}",
-        nfd: "\u{FEE0}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{FEE1}",
-        nfc: "\u{FEE1}",
-        nfd: "\u{FEE1}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FEE2}",
-        nfc: "\u{FEE2}",
-        nfd: "\u{FEE2}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FEE3}",
-        nfc: "\u{FEE3}",
-        nfd: "\u{FEE3}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FEE4}",
-        nfc: "\u{FEE4}",
-        nfd: "\u{FEE4}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{FEE5}",
-        nfc: "\u{FEE5}",
-        nfd: "\u{FEE5}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FEE6}",
-        nfc: "\u{FEE6}",
-        nfd: "\u{FEE6}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FEE7}",
-        nfc: "\u{FEE7}",
-        nfd: "\u{FEE7}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FEE8}",
-        nfc: "\u{FEE8}",
-        nfd: "\u{FEE8}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{FEE9}",
-        nfc: "\u{FEE9}",
-        nfd: "\u{FEE9}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FEEA}",
-        nfc: "\u{FEEA}",
-        nfd: "\u{FEEA}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FEEB}",
-        nfc: "\u{FEEB}",
-        nfd: "\u{FEEB}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FEEC}",
-        nfc: "\u{FEEC}",
-        nfd: "\u{FEEC}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{FEED}",
-        nfc: "\u{FEED}",
-        nfd: "\u{FEED}",
-        nfkc: "\u{0648}",
-        nfkd: "\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{FEEE}",
-        nfc: "\u{FEEE}",
-        nfd: "\u{FEEE}",
-        nfkc: "\u{0648}",
-        nfkd: "\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{FEEF}",
-        nfc: "\u{FEEF}",
-        nfd: "\u{FEEF}",
-        nfkc: "\u{0649}",
-        nfkd: "\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FEF0}",
-        nfc: "\u{FEF0}",
-        nfd: "\u{FEF0}",
-        nfkc: "\u{0649}",
-        nfkd: "\u{0649}",
-    },
-    NormalizationTest {
-        source: "\u{FEF1}",
-        nfc: "\u{FEF1}",
-        nfd: "\u{FEF1}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FEF2}",
-        nfc: "\u{FEF2}",
-        nfd: "\u{FEF2}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FEF3}",
-        nfc: "\u{FEF3}",
-        nfd: "\u{FEF3}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FEF4}",
-        nfc: "\u{FEF4}",
-        nfd: "\u{FEF4}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{FEF5}",
-        nfc: "\u{FEF5}",
-        nfd: "\u{FEF5}",
-        nfkc: "\u{0644}\u{0622}",
-        nfkd: "\u{0644}\u{0627}\u{0653}",
-    },
-    NormalizationTest {
-        source: "\u{FEF6}",
-        nfc: "\u{FEF6}",
-        nfd: "\u{FEF6}",
-        nfkc: "\u{0644}\u{0622}",
-        nfkd: "\u{0644}\u{0627}\u{0653}",
-    },
-    NormalizationTest {
-        source: "\u{FEF7}",
-        nfc: "\u{FEF7}",
-        nfd: "\u{FEF7}",
-        nfkc: "\u{0644}\u{0623}",
-        nfkd: "\u{0644}\u{0627}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FEF8}",
-        nfc: "\u{FEF8}",
-        nfd: "\u{FEF8}",
-        nfkc: "\u{0644}\u{0623}",
-        nfkd: "\u{0644}\u{0627}\u{0654}",
-    },
-    NormalizationTest {
-        source: "\u{FEF9}",
-        nfc: "\u{FEF9}",
-        nfd: "\u{FEF9}",
-        nfkc: "\u{0644}\u{0625}",
-        nfkd: "\u{0644}\u{0627}\u{0655}",
-    },
-    NormalizationTest {
-        source: "\u{FEFA}",
-        nfc: "\u{FEFA}",
-        nfd: "\u{FEFA}",
-        nfkc: "\u{0644}\u{0625}",
-        nfkd: "\u{0644}\u{0627}\u{0655}",
-    },
-    NormalizationTest {
-        source: "\u{FEFB}",
-        nfc: "\u{FEFB}",
-        nfd: "\u{FEFB}",
-        nfkc: "\u{0644}\u{0627}",
-        nfkd: "\u{0644}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FEFC}",
-        nfc: "\u{FEFC}",
-        nfd: "\u{FEFC}",
-        nfkc: "\u{0644}\u{0627}",
-        nfkd: "\u{0644}\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{FF01}",
-        nfc: "\u{FF01}",
-        nfd: "\u{FF01}",
-        nfkc: "\u{0021}",
-        nfkd: "\u{0021}",
-    },
-    NormalizationTest {
-        source: "\u{FF02}",
-        nfc: "\u{FF02}",
-        nfd: "\u{FF02}",
-        nfkc: "\u{0022}",
-        nfkd: "\u{0022}",
-    },
-    NormalizationTest {
-        source: "\u{FF03}",
-        nfc: "\u{FF03}",
-        nfd: "\u{FF03}",
-        nfkc: "\u{0023}",
-        nfkd: "\u{0023}",
-    },
-    NormalizationTest {
-        source: "\u{FF04}",
-        nfc: "\u{FF04}",
-        nfd: "\u{FF04}",
-        nfkc: "\u{0024}",
-        nfkd: "\u{0024}",
-    },
-    NormalizationTest {
-        source: "\u{FF05}",
-        nfc: "\u{FF05}",
-        nfd: "\u{FF05}",
-        nfkc: "\u{0025}",
-        nfkd: "\u{0025}",
-    },
-    NormalizationTest {
-        source: "\u{FF06}",
-        nfc: "\u{FF06}",
-        nfd: "\u{FF06}",
-        nfkc: "\u{0026}",
-        nfkd: "\u{0026}",
-    },
-    NormalizationTest {
-        source: "\u{FF07}",
-        nfc: "\u{FF07}",
-        nfd: "\u{FF07}",
-        nfkc: "\u{0027}",
-        nfkd: "\u{0027}",
-    },
-    NormalizationTest {
-        source: "\u{FF08}",
-        nfc: "\u{FF08}",
-        nfd: "\u{FF08}",
-        nfkc: "\u{0028}",
-        nfkd: "\u{0028}",
-    },
-    NormalizationTest {
-        source: "\u{FF09}",
-        nfc: "\u{FF09}",
-        nfd: "\u{FF09}",
-        nfkc: "\u{0029}",
-        nfkd: "\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{FF0A}",
-        nfc: "\u{FF0A}",
-        nfd: "\u{FF0A}",
-        nfkc: "\u{002A}",
-        nfkd: "\u{002A}",
-    },
-    NormalizationTest {
-        source: "\u{FF0B}",
-        nfc: "\u{FF0B}",
-        nfd: "\u{FF0B}",
-        nfkc: "\u{002B}",
-        nfkd: "\u{002B}",
-    },
-    NormalizationTest {
-        source: "\u{FF0C}",
-        nfc: "\u{FF0C}",
-        nfd: "\u{FF0C}",
-        nfkc: "\u{002C}",
-        nfkd: "\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{FF0D}",
-        nfc: "\u{FF0D}",
-        nfd: "\u{FF0D}",
-        nfkc: "\u{002D}",
-        nfkd: "\u{002D}",
-    },
-    NormalizationTest {
-        source: "\u{FF0E}",
-        nfc: "\u{FF0E}",
-        nfd: "\u{FF0E}",
-        nfkc: "\u{002E}",
-        nfkd: "\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{FF0F}",
-        nfc: "\u{FF0F}",
-        nfd: "\u{FF0F}",
-        nfkc: "\u{002F}",
-        nfkd: "\u{002F}",
-    },
-    NormalizationTest {
-        source: "\u{FF10}",
-        nfc: "\u{FF10}",
-        nfd: "\u{FF10}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{FF11}",
-        nfc: "\u{FF11}",
-        nfd: "\u{FF11}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{FF12}",
-        nfc: "\u{FF12}",
-        nfd: "\u{FF12}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{FF13}",
-        nfc: "\u{FF13}",
-        nfd: "\u{FF13}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{FF14}",
-        nfc: "\u{FF14}",
-        nfd: "\u{FF14}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{FF15}",
-        nfc: "\u{FF15}",
-        nfd: "\u{FF15}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{FF16}",
-        nfc: "\u{FF16}",
-        nfd: "\u{FF16}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{FF17}",
-        nfc: "\u{FF17}",
-        nfd: "\u{FF17}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{FF18}",
-        nfc: "\u{FF18}",
-        nfd: "\u{FF18}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{FF19}",
-        nfc: "\u{FF19}",
-        nfd: "\u{FF19}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{FF1A}",
-        nfc: "\u{FF1A}",
-        nfd: "\u{FF1A}",
-        nfkc: "\u{003A}",
-        nfkd: "\u{003A}",
-    },
-    NormalizationTest {
-        source: "\u{FF1B}",
-        nfc: "\u{FF1B}",
-        nfd: "\u{FF1B}",
-        nfkc: "\u{003B}",
-        nfkd: "\u{003B}",
-    },
-    NormalizationTest {
-        source: "\u{FF1C}",
-        nfc: "\u{FF1C}",
-        nfd: "\u{FF1C}",
-        nfkc: "\u{003C}",
-        nfkd: "\u{003C}",
-    },
-    NormalizationTest {
-        source: "\u{FF1D}",
-        nfc: "\u{FF1D}",
-        nfd: "\u{FF1D}",
-        nfkc: "\u{003D}",
-        nfkd: "\u{003D}",
-    },
-    NormalizationTest {
-        source: "\u{FF1E}",
-        nfc: "\u{FF1E}",
-        nfd: "\u{FF1E}",
-        nfkc: "\u{003E}",
-        nfkd: "\u{003E}",
-    },
-    NormalizationTest {
-        source: "\u{FF1F}",
-        nfc: "\u{FF1F}",
-        nfd: "\u{FF1F}",
-        nfkc: "\u{003F}",
-        nfkd: "\u{003F}",
-    },
-    NormalizationTest {
-        source: "\u{FF20}",
-        nfc: "\u{FF20}",
-        nfd: "\u{FF20}",
-        nfkc: "\u{0040}",
-        nfkd: "\u{0040}",
-    },
-    NormalizationTest {
-        source: "\u{FF21}",
-        nfc: "\u{FF21}",
-        nfd: "\u{FF21}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{FF22}",
-        nfc: "\u{FF22}",
-        nfd: "\u{FF22}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{FF23}",
-        nfc: "\u{FF23}",
-        nfd: "\u{FF23}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{FF24}",
-        nfc: "\u{FF24}",
-        nfd: "\u{FF24}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{FF25}",
-        nfc: "\u{FF25}",
-        nfd: "\u{FF25}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{FF26}",
-        nfc: "\u{FF26}",
-        nfd: "\u{FF26}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{FF27}",
-        nfc: "\u{FF27}",
-        nfd: "\u{FF27}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{FF28}",
-        nfc: "\u{FF28}",
-        nfd: "\u{FF28}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{FF29}",
-        nfc: "\u{FF29}",
-        nfd: "\u{FF29}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{FF2A}",
-        nfc: "\u{FF2A}",
-        nfd: "\u{FF2A}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{FF2B}",
-        nfc: "\u{FF2B}",
-        nfd: "\u{FF2B}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{FF2C}",
-        nfc: "\u{FF2C}",
-        nfd: "\u{FF2C}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{FF2D}",
-        nfc: "\u{FF2D}",
-        nfd: "\u{FF2D}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{FF2E}",
-        nfc: "\u{FF2E}",
-        nfd: "\u{FF2E}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{FF2F}",
-        nfc: "\u{FF2F}",
-        nfd: "\u{FF2F}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{FF30}",
-        nfc: "\u{FF30}",
-        nfd: "\u{FF30}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{FF31}",
-        nfc: "\u{FF31}",
-        nfd: "\u{FF31}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{FF32}",
-        nfc: "\u{FF32}",
-        nfd: "\u{FF32}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{FF33}",
-        nfc: "\u{FF33}",
-        nfd: "\u{FF33}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{FF34}",
-        nfc: "\u{FF34}",
-        nfd: "\u{FF34}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{FF35}",
-        nfc: "\u{FF35}",
-        nfd: "\u{FF35}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{FF36}",
-        nfc: "\u{FF36}",
-        nfd: "\u{FF36}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{FF37}",
-        nfc: "\u{FF37}",
-        nfd: "\u{FF37}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{FF38}",
-        nfc: "\u{FF38}",
-        nfd: "\u{FF38}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{FF39}",
-        nfc: "\u{FF39}",
-        nfd: "\u{FF39}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{FF3A}",
-        nfc: "\u{FF3A}",
-        nfd: "\u{FF3A}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{FF3B}",
-        nfc: "\u{FF3B}",
-        nfd: "\u{FF3B}",
-        nfkc: "\u{005B}",
-        nfkd: "\u{005B}",
-    },
-    NormalizationTest {
-        source: "\u{FF3C}",
-        nfc: "\u{FF3C}",
-        nfd: "\u{FF3C}",
-        nfkc: "\u{005C}",
-        nfkd: "\u{005C}",
-    },
-    NormalizationTest {
-        source: "\u{FF3D}",
-        nfc: "\u{FF3D}",
-        nfd: "\u{FF3D}",
-        nfkc: "\u{005D}",
-        nfkd: "\u{005D}",
-    },
-    NormalizationTest {
-        source: "\u{FF3E}",
-        nfc: "\u{FF3E}",
-        nfd: "\u{FF3E}",
-        nfkc: "\u{005E}",
-        nfkd: "\u{005E}",
-    },
-    NormalizationTest {
-        source: "\u{FF3F}",
-        nfc: "\u{FF3F}",
-        nfd: "\u{FF3F}",
-        nfkc: "\u{005F}",
-        nfkd: "\u{005F}",
-    },
-    NormalizationTest {
-        source: "\u{FF40}",
-        nfc: "\u{FF40}",
-        nfd: "\u{FF40}",
-        nfkc: "\u{0060}",
-        nfkd: "\u{0060}",
-    },
-    NormalizationTest {
-        source: "\u{FF41}",
-        nfc: "\u{FF41}",
-        nfd: "\u{FF41}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{FF42}",
-        nfc: "\u{FF42}",
-        nfd: "\u{FF42}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{FF43}",
-        nfc: "\u{FF43}",
-        nfd: "\u{FF43}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{FF44}",
-        nfc: "\u{FF44}",
-        nfd: "\u{FF44}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{FF45}",
-        nfc: "\u{FF45}",
-        nfd: "\u{FF45}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{FF46}",
-        nfc: "\u{FF46}",
-        nfd: "\u{FF46}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{FF47}",
-        nfc: "\u{FF47}",
-        nfd: "\u{FF47}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{FF48}",
-        nfc: "\u{FF48}",
-        nfd: "\u{FF48}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{FF49}",
-        nfc: "\u{FF49}",
-        nfd: "\u{FF49}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{FF4A}",
-        nfc: "\u{FF4A}",
-        nfd: "\u{FF4A}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{FF4B}",
-        nfc: "\u{FF4B}",
-        nfd: "\u{FF4B}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{FF4C}",
-        nfc: "\u{FF4C}",
-        nfd: "\u{FF4C}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{FF4D}",
-        nfc: "\u{FF4D}",
-        nfd: "\u{FF4D}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{FF4E}",
-        nfc: "\u{FF4E}",
-        nfd: "\u{FF4E}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{FF4F}",
-        nfc: "\u{FF4F}",
-        nfd: "\u{FF4F}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{FF50}",
-        nfc: "\u{FF50}",
-        nfd: "\u{FF50}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{FF51}",
-        nfc: "\u{FF51}",
-        nfd: "\u{FF51}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{FF52}",
-        nfc: "\u{FF52}",
-        nfd: "\u{FF52}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{FF53}",
-        nfc: "\u{FF53}",
-        nfd: "\u{FF53}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{FF54}",
-        nfc: "\u{FF54}",
-        nfd: "\u{FF54}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{FF55}",
-        nfc: "\u{FF55}",
-        nfd: "\u{FF55}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{FF56}",
-        nfc: "\u{FF56}",
-        nfd: "\u{FF56}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{FF57}",
-        nfc: "\u{FF57}",
-        nfd: "\u{FF57}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{FF58}",
-        nfc: "\u{FF58}",
-        nfd: "\u{FF58}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{FF59}",
-        nfc: "\u{FF59}",
-        nfd: "\u{FF59}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{FF5A}",
-        nfc: "\u{FF5A}",
-        nfd: "\u{FF5A}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{FF5B}",
-        nfc: "\u{FF5B}",
-        nfd: "\u{FF5B}",
-        nfkc: "\u{007B}",
-        nfkd: "\u{007B}",
-    },
-    NormalizationTest {
-        source: "\u{FF5C}",
-        nfc: "\u{FF5C}",
-        nfd: "\u{FF5C}",
-        nfkc: "\u{007C}",
-        nfkd: "\u{007C}",
-    },
-    NormalizationTest {
-        source: "\u{FF5D}",
-        nfc: "\u{FF5D}",
-        nfd: "\u{FF5D}",
-        nfkc: "\u{007D}",
-        nfkd: "\u{007D}",
-    },
-    NormalizationTest {
-        source: "\u{FF5E}",
-        nfc: "\u{FF5E}",
-        nfd: "\u{FF5E}",
-        nfkc: "\u{007E}",
-        nfkd: "\u{007E}",
-    },
-    NormalizationTest {
-        source: "\u{FF5F}",
-        nfc: "\u{FF5F}",
-        nfd: "\u{FF5F}",
-        nfkc: "\u{2985}",
-        nfkd: "\u{2985}",
-    },
-    NormalizationTest {
-        source: "\u{FF60}",
-        nfc: "\u{FF60}",
-        nfd: "\u{FF60}",
-        nfkc: "\u{2986}",
-        nfkd: "\u{2986}",
-    },
-    NormalizationTest {
-        source: "\u{FF61}",
-        nfc: "\u{FF61}",
-        nfd: "\u{FF61}",
-        nfkc: "\u{3002}",
-        nfkd: "\u{3002}",
-    },
-    NormalizationTest {
-        source: "\u{FF62}",
-        nfc: "\u{FF62}",
-        nfd: "\u{FF62}",
-        nfkc: "\u{300C}",
-        nfkd: "\u{300C}",
-    },
-    NormalizationTest {
-        source: "\u{FF63}",
-        nfc: "\u{FF63}",
-        nfd: "\u{FF63}",
-        nfkc: "\u{300D}",
-        nfkd: "\u{300D}",
-    },
-    NormalizationTest {
-        source: "\u{FF64}",
-        nfc: "\u{FF64}",
-        nfd: "\u{FF64}",
-        nfkc: "\u{3001}",
-        nfkd: "\u{3001}",
-    },
-    NormalizationTest {
-        source: "\u{FF65}",
-        nfc: "\u{FF65}",
-        nfd: "\u{FF65}",
-        nfkc: "\u{30FB}",
-        nfkd: "\u{30FB}",
-    },
-    NormalizationTest {
-        source: "\u{FF66}",
-        nfc: "\u{FF66}",
-        nfd: "\u{FF66}",
-        nfkc: "\u{30F2}",
-        nfkd: "\u{30F2}",
-    },
-    NormalizationTest {
-        source: "\u{FF67}",
-        nfc: "\u{FF67}",
-        nfd: "\u{FF67}",
-        nfkc: "\u{30A1}",
-        nfkd: "\u{30A1}",
-    },
-    NormalizationTest {
-        source: "\u{FF68}",
-        nfc: "\u{FF68}",
-        nfd: "\u{FF68}",
-        nfkc: "\u{30A3}",
-        nfkd: "\u{30A3}",
-    },
-    NormalizationTest {
-        source: "\u{FF69}",
-        nfc: "\u{FF69}",
-        nfd: "\u{FF69}",
-        nfkc: "\u{30A5}",
-        nfkd: "\u{30A5}",
-    },
-    NormalizationTest {
-        source: "\u{FF6A}",
-        nfc: "\u{FF6A}",
-        nfd: "\u{FF6A}",
-        nfkc: "\u{30A7}",
-        nfkd: "\u{30A7}",
-    },
-    NormalizationTest {
-        source: "\u{FF6B}",
-        nfc: "\u{FF6B}",
-        nfd: "\u{FF6B}",
-        nfkc: "\u{30A9}",
-        nfkd: "\u{30A9}",
-    },
-    NormalizationTest {
-        source: "\u{FF6C}",
-        nfc: "\u{FF6C}",
-        nfd: "\u{FF6C}",
-        nfkc: "\u{30E3}",
-        nfkd: "\u{30E3}",
-    },
-    NormalizationTest {
-        source: "\u{FF6D}",
-        nfc: "\u{FF6D}",
-        nfd: "\u{FF6D}",
-        nfkc: "\u{30E5}",
-        nfkd: "\u{30E5}",
-    },
-    NormalizationTest {
-        source: "\u{FF6E}",
-        nfc: "\u{FF6E}",
-        nfd: "\u{FF6E}",
-        nfkc: "\u{30E7}",
-        nfkd: "\u{30E7}",
-    },
-    NormalizationTest {
-        source: "\u{FF6F}",
-        nfc: "\u{FF6F}",
-        nfd: "\u{FF6F}",
-        nfkc: "\u{30C3}",
-        nfkd: "\u{30C3}",
-    },
-    NormalizationTest {
-        source: "\u{FF70}",
-        nfc: "\u{FF70}",
-        nfd: "\u{FF70}",
-        nfkc: "\u{30FC}",
-        nfkd: "\u{30FC}",
-    },
-    NormalizationTest {
-        source: "\u{FF71}",
-        nfc: "\u{FF71}",
-        nfd: "\u{FF71}",
-        nfkc: "\u{30A2}",
-        nfkd: "\u{30A2}",
-    },
-    NormalizationTest {
-        source: "\u{FF72}",
-        nfc: "\u{FF72}",
-        nfd: "\u{FF72}",
-        nfkc: "\u{30A4}",
-        nfkd: "\u{30A4}",
-    },
-    NormalizationTest {
-        source: "\u{FF73}",
-        nfc: "\u{FF73}",
-        nfd: "\u{FF73}",
-        nfkc: "\u{30A6}",
-        nfkd: "\u{30A6}",
-    },
-    NormalizationTest {
-        source: "\u{FF74}",
-        nfc: "\u{FF74}",
-        nfd: "\u{FF74}",
-        nfkc: "\u{30A8}",
-        nfkd: "\u{30A8}",
-    },
-    NormalizationTest {
-        source: "\u{FF75}",
-        nfc: "\u{FF75}",
-        nfd: "\u{FF75}",
-        nfkc: "\u{30AA}",
-        nfkd: "\u{30AA}",
-    },
-    NormalizationTest {
-        source: "\u{FF76}",
-        nfc: "\u{FF76}",
-        nfd: "\u{FF76}",
-        nfkc: "\u{30AB}",
-        nfkd: "\u{30AB}",
-    },
-    NormalizationTest {
-        source: "\u{FF77}",
-        nfc: "\u{FF77}",
-        nfd: "\u{FF77}",
-        nfkc: "\u{30AD}",
-        nfkd: "\u{30AD}",
-    },
-    NormalizationTest {
-        source: "\u{FF78}",
-        nfc: "\u{FF78}",
-        nfd: "\u{FF78}",
-        nfkc: "\u{30AF}",
-        nfkd: "\u{30AF}",
-    },
-    NormalizationTest {
-        source: "\u{FF79}",
-        nfc: "\u{FF79}",
-        nfd: "\u{FF79}",
-        nfkc: "\u{30B1}",
-        nfkd: "\u{30B1}",
-    },
-    NormalizationTest {
-        source: "\u{FF7A}",
-        nfc: "\u{FF7A}",
-        nfd: "\u{FF7A}",
-        nfkc: "\u{30B3}",
-        nfkd: "\u{30B3}",
-    },
-    NormalizationTest {
-        source: "\u{FF7B}",
-        nfc: "\u{FF7B}",
-        nfd: "\u{FF7B}",
-        nfkc: "\u{30B5}",
-        nfkd: "\u{30B5}",
-    },
-    NormalizationTest {
-        source: "\u{FF7C}",
-        nfc: "\u{FF7C}",
-        nfd: "\u{FF7C}",
-        nfkc: "\u{30B7}",
-        nfkd: "\u{30B7}",
-    },
-    NormalizationTest {
-        source: "\u{FF7D}",
-        nfc: "\u{FF7D}",
-        nfd: "\u{FF7D}",
-        nfkc: "\u{30B9}",
-        nfkd: "\u{30B9}",
-    },
-    NormalizationTest {
-        source: "\u{FF7E}",
-        nfc: "\u{FF7E}",
-        nfd: "\u{FF7E}",
-        nfkc: "\u{30BB}",
-        nfkd: "\u{30BB}",
-    },
-    NormalizationTest {
-        source: "\u{FF7F}",
-        nfc: "\u{FF7F}",
-        nfd: "\u{FF7F}",
-        nfkc: "\u{30BD}",
-        nfkd: "\u{30BD}",
-    },
-    NormalizationTest {
-        source: "\u{FF80}",
-        nfc: "\u{FF80}",
-        nfd: "\u{FF80}",
-        nfkc: "\u{30BF}",
-        nfkd: "\u{30BF}",
-    },
-    NormalizationTest {
-        source: "\u{FF81}",
-        nfc: "\u{FF81}",
-        nfd: "\u{FF81}",
-        nfkc: "\u{30C1}",
-        nfkd: "\u{30C1}",
-    },
-    NormalizationTest {
-        source: "\u{FF82}",
-        nfc: "\u{FF82}",
-        nfd: "\u{FF82}",
-        nfkc: "\u{30C4}",
-        nfkd: "\u{30C4}",
-    },
-    NormalizationTest {
-        source: "\u{FF83}",
-        nfc: "\u{FF83}",
-        nfd: "\u{FF83}",
-        nfkc: "\u{30C6}",
-        nfkd: "\u{30C6}",
-    },
-    NormalizationTest {
-        source: "\u{FF84}",
-        nfc: "\u{FF84}",
-        nfd: "\u{FF84}",
-        nfkc: "\u{30C8}",
-        nfkd: "\u{30C8}",
-    },
-    NormalizationTest {
-        source: "\u{FF85}",
-        nfc: "\u{FF85}",
-        nfd: "\u{FF85}",
-        nfkc: "\u{30CA}",
-        nfkd: "\u{30CA}",
-    },
-    NormalizationTest {
-        source: "\u{FF86}",
-        nfc: "\u{FF86}",
-        nfd: "\u{FF86}",
-        nfkc: "\u{30CB}",
-        nfkd: "\u{30CB}",
-    },
-    NormalizationTest {
-        source: "\u{FF87}",
-        nfc: "\u{FF87}",
-        nfd: "\u{FF87}",
-        nfkc: "\u{30CC}",
-        nfkd: "\u{30CC}",
-    },
-    NormalizationTest {
-        source: "\u{FF88}",
-        nfc: "\u{FF88}",
-        nfd: "\u{FF88}",
-        nfkc: "\u{30CD}",
-        nfkd: "\u{30CD}",
-    },
-    NormalizationTest {
-        source: "\u{FF89}",
-        nfc: "\u{FF89}",
-        nfd: "\u{FF89}",
-        nfkc: "\u{30CE}",
-        nfkd: "\u{30CE}",
-    },
-    NormalizationTest {
-        source: "\u{FF8A}",
-        nfc: "\u{FF8A}",
-        nfd: "\u{FF8A}",
-        nfkc: "\u{30CF}",
-        nfkd: "\u{30CF}",
-    },
-    NormalizationTest {
-        source: "\u{FF8B}",
-        nfc: "\u{FF8B}",
-        nfd: "\u{FF8B}",
-        nfkc: "\u{30D2}",
-        nfkd: "\u{30D2}",
-    },
-    NormalizationTest {
-        source: "\u{FF8C}",
-        nfc: "\u{FF8C}",
-        nfd: "\u{FF8C}",
-        nfkc: "\u{30D5}",
-        nfkd: "\u{30D5}",
-    },
-    NormalizationTest {
-        source: "\u{FF8D}",
-        nfc: "\u{FF8D}",
-        nfd: "\u{FF8D}",
-        nfkc: "\u{30D8}",
-        nfkd: "\u{30D8}",
-    },
-    NormalizationTest {
-        source: "\u{FF8E}",
-        nfc: "\u{FF8E}",
-        nfd: "\u{FF8E}",
-        nfkc: "\u{30DB}",
-        nfkd: "\u{30DB}",
-    },
-    NormalizationTest {
-        source: "\u{FF8F}",
-        nfc: "\u{FF8F}",
-        nfd: "\u{FF8F}",
-        nfkc: "\u{30DE}",
-        nfkd: "\u{30DE}",
-    },
-    NormalizationTest {
-        source: "\u{FF90}",
-        nfc: "\u{FF90}",
-        nfd: "\u{FF90}",
-        nfkc: "\u{30DF}",
-        nfkd: "\u{30DF}",
-    },
-    NormalizationTest {
-        source: "\u{FF91}",
-        nfc: "\u{FF91}",
-        nfd: "\u{FF91}",
-        nfkc: "\u{30E0}",
-        nfkd: "\u{30E0}",
-    },
-    NormalizationTest {
-        source: "\u{FF92}",
-        nfc: "\u{FF92}",
-        nfd: "\u{FF92}",
-        nfkc: "\u{30E1}",
-        nfkd: "\u{30E1}",
-    },
-    NormalizationTest {
-        source: "\u{FF93}",
-        nfc: "\u{FF93}",
-        nfd: "\u{FF93}",
-        nfkc: "\u{30E2}",
-        nfkd: "\u{30E2}",
-    },
-    NormalizationTest {
-        source: "\u{FF94}",
-        nfc: "\u{FF94}",
-        nfd: "\u{FF94}",
-        nfkc: "\u{30E4}",
-        nfkd: "\u{30E4}",
-    },
-    NormalizationTest {
-        source: "\u{FF95}",
-        nfc: "\u{FF95}",
-        nfd: "\u{FF95}",
-        nfkc: "\u{30E6}",
-        nfkd: "\u{30E6}",
-    },
-    NormalizationTest {
-        source: "\u{FF96}",
-        nfc: "\u{FF96}",
-        nfd: "\u{FF96}",
-        nfkc: "\u{30E8}",
-        nfkd: "\u{30E8}",
-    },
-    NormalizationTest {
-        source: "\u{FF97}",
-        nfc: "\u{FF97}",
-        nfd: "\u{FF97}",
-        nfkc: "\u{30E9}",
-        nfkd: "\u{30E9}",
-    },
-    NormalizationTest {
-        source: "\u{FF98}",
-        nfc: "\u{FF98}",
-        nfd: "\u{FF98}",
-        nfkc: "\u{30EA}",
-        nfkd: "\u{30EA}",
-    },
-    NormalizationTest {
-        source: "\u{FF99}",
-        nfc: "\u{FF99}",
-        nfd: "\u{FF99}",
-        nfkc: "\u{30EB}",
-        nfkd: "\u{30EB}",
-    },
-    NormalizationTest {
-        source: "\u{FF9A}",
-        nfc: "\u{FF9A}",
-        nfd: "\u{FF9A}",
-        nfkc: "\u{30EC}",
-        nfkd: "\u{30EC}",
-    },
-    NormalizationTest {
-        source: "\u{FF9B}",
-        nfc: "\u{FF9B}",
-        nfd: "\u{FF9B}",
-        nfkc: "\u{30ED}",
-        nfkd: "\u{30ED}",
-    },
-    NormalizationTest {
-        source: "\u{FF9C}",
-        nfc: "\u{FF9C}",
-        nfd: "\u{FF9C}",
-        nfkc: "\u{30EF}",
-        nfkd: "\u{30EF}",
-    },
-    NormalizationTest {
-        source: "\u{FF9D}",
-        nfc: "\u{FF9D}",
-        nfd: "\u{FF9D}",
-        nfkc: "\u{30F3}",
-        nfkd: "\u{30F3}",
-    },
-    NormalizationTest {
-        source: "\u{FF9E}",
-        nfc: "\u{FF9E}",
-        nfd: "\u{FF9E}",
-        nfkc: "\u{3099}",
-        nfkd: "\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{FF9F}",
-        nfc: "\u{FF9F}",
-        nfd: "\u{FF9F}",
-        nfkc: "\u{309A}",
-        nfkd: "\u{309A}",
-    },
-    NormalizationTest {
-        source: "\u{FFA0}",
-        nfc: "\u{FFA0}",
-        nfd: "\u{FFA0}",
-        nfkc: "\u{1160}",
-        nfkd: "\u{1160}",
-    },
-    NormalizationTest {
-        source: "\u{FFA1}",
-        nfc: "\u{FFA1}",
-        nfd: "\u{FFA1}",
-        nfkc: "\u{1100}",
-        nfkd: "\u{1100}",
-    },
-    NormalizationTest {
-        source: "\u{FFA2}",
-        nfc: "\u{FFA2}",
-        nfd: "\u{FFA2}",
-        nfkc: "\u{1101}",
-        nfkd: "\u{1101}",
-    },
-    NormalizationTest {
-        source: "\u{FFA3}",
-        nfc: "\u{FFA3}",
-        nfd: "\u{FFA3}",
-        nfkc: "\u{11AA}",
-        nfkd: "\u{11AA}",
-    },
-    NormalizationTest {
-        source: "\u{FFA4}",
-        nfc: "\u{FFA4}",
-        nfd: "\u{FFA4}",
-        nfkc: "\u{1102}",
-        nfkd: "\u{1102}",
-    },
-    NormalizationTest {
-        source: "\u{FFA5}",
-        nfc: "\u{FFA5}",
-        nfd: "\u{FFA5}",
-        nfkc: "\u{11AC}",
-        nfkd: "\u{11AC}",
-    },
-    NormalizationTest {
-        source: "\u{FFA6}",
-        nfc: "\u{FFA6}",
-        nfd: "\u{FFA6}",
-        nfkc: "\u{11AD}",
-        nfkd: "\u{11AD}",
-    },
-    NormalizationTest {
-        source: "\u{FFA7}",
-        nfc: "\u{FFA7}",
-        nfd: "\u{FFA7}",
-        nfkc: "\u{1103}",
-        nfkd: "\u{1103}",
-    },
-    NormalizationTest {
-        source: "\u{FFA8}",
-        nfc: "\u{FFA8}",
-        nfd: "\u{FFA8}",
-        nfkc: "\u{1104}",
-        nfkd: "\u{1104}",
-    },
-    NormalizationTest {
-        source: "\u{FFA9}",
-        nfc: "\u{FFA9}",
-        nfd: "\u{FFA9}",
-        nfkc: "\u{1105}",
-        nfkd: "\u{1105}",
-    },
-    NormalizationTest {
-        source: "\u{FFAA}",
-        nfc: "\u{FFAA}",
-        nfd: "\u{FFAA}",
-        nfkc: "\u{11B0}",
-        nfkd: "\u{11B0}",
-    },
-    NormalizationTest {
-        source: "\u{FFAB}",
-        nfc: "\u{FFAB}",
-        nfd: "\u{FFAB}",
-        nfkc: "\u{11B1}",
-        nfkd: "\u{11B1}",
-    },
-    NormalizationTest {
-        source: "\u{FFAC}",
-        nfc: "\u{FFAC}",
-        nfd: "\u{FFAC}",
-        nfkc: "\u{11B2}",
-        nfkd: "\u{11B2}",
-    },
-    NormalizationTest {
-        source: "\u{FFAD}",
-        nfc: "\u{FFAD}",
-        nfd: "\u{FFAD}",
-        nfkc: "\u{11B3}",
-        nfkd: "\u{11B3}",
-    },
-    NormalizationTest {
-        source: "\u{FFAE}",
-        nfc: "\u{FFAE}",
-        nfd: "\u{FFAE}",
-        nfkc: "\u{11B4}",
-        nfkd: "\u{11B4}",
-    },
-    NormalizationTest {
-        source: "\u{FFAF}",
-        nfc: "\u{FFAF}",
-        nfd: "\u{FFAF}",
-        nfkc: "\u{11B5}",
-        nfkd: "\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{FFB0}",
-        nfc: "\u{FFB0}",
-        nfd: "\u{FFB0}",
-        nfkc: "\u{111A}",
-        nfkd: "\u{111A}",
-    },
-    NormalizationTest {
-        source: "\u{FFB1}",
-        nfc: "\u{FFB1}",
-        nfd: "\u{FFB1}",
-        nfkc: "\u{1106}",
-        nfkd: "\u{1106}",
-    },
-    NormalizationTest {
-        source: "\u{FFB2}",
-        nfc: "\u{FFB2}",
-        nfd: "\u{FFB2}",
-        nfkc: "\u{1107}",
-        nfkd: "\u{1107}",
-    },
-    NormalizationTest {
-        source: "\u{FFB3}",
-        nfc: "\u{FFB3}",
-        nfd: "\u{FFB3}",
-        nfkc: "\u{1108}",
-        nfkd: "\u{1108}",
-    },
-    NormalizationTest {
-        source: "\u{FFB4}",
-        nfc: "\u{FFB4}",
-        nfd: "\u{FFB4}",
-        nfkc: "\u{1121}",
-        nfkd: "\u{1121}",
-    },
-    NormalizationTest {
-        source: "\u{FFB5}",
-        nfc: "\u{FFB5}",
-        nfd: "\u{FFB5}",
-        nfkc: "\u{1109}",
-        nfkd: "\u{1109}",
-    },
-    NormalizationTest {
-        source: "\u{FFB6}",
-        nfc: "\u{FFB6}",
-        nfd: "\u{FFB6}",
-        nfkc: "\u{110A}",
-        nfkd: "\u{110A}",
-    },
-    NormalizationTest {
-        source: "\u{FFB7}",
-        nfc: "\u{FFB7}",
-        nfd: "\u{FFB7}",
-        nfkc: "\u{110B}",
-        nfkd: "\u{110B}",
-    },
-    NormalizationTest {
-        source: "\u{FFB8}",
-        nfc: "\u{FFB8}",
-        nfd: "\u{FFB8}",
-        nfkc: "\u{110C}",
-        nfkd: "\u{110C}",
-    },
-    NormalizationTest {
-        source: "\u{FFB9}",
-        nfc: "\u{FFB9}",
-        nfd: "\u{FFB9}",
-        nfkc: "\u{110D}",
-        nfkd: "\u{110D}",
-    },
-    NormalizationTest {
-        source: "\u{FFBA}",
-        nfc: "\u{FFBA}",
-        nfd: "\u{FFBA}",
-        nfkc: "\u{110E}",
-        nfkd: "\u{110E}",
-    },
-    NormalizationTest {
-        source: "\u{FFBB}",
-        nfc: "\u{FFBB}",
-        nfd: "\u{FFBB}",
-        nfkc: "\u{110F}",
-        nfkd: "\u{110F}",
-    },
-    NormalizationTest {
-        source: "\u{FFBC}",
-        nfc: "\u{FFBC}",
-        nfd: "\u{FFBC}",
-        nfkc: "\u{1110}",
-        nfkd: "\u{1110}",
-    },
-    NormalizationTest {
-        source: "\u{FFBD}",
-        nfc: "\u{FFBD}",
-        nfd: "\u{FFBD}",
-        nfkc: "\u{1111}",
-        nfkd: "\u{1111}",
-    },
-    NormalizationTest {
-        source: "\u{FFBE}",
-        nfc: "\u{FFBE}",
-        nfd: "\u{FFBE}",
-        nfkc: "\u{1112}",
-        nfkd: "\u{1112}",
-    },
-    NormalizationTest {
-        source: "\u{FFC2}",
-        nfc: "\u{FFC2}",
-        nfd: "\u{FFC2}",
-        nfkc: "\u{1161}",
-        nfkd: "\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{FFC3}",
-        nfc: "\u{FFC3}",
-        nfd: "\u{FFC3}",
-        nfkc: "\u{1162}",
-        nfkd: "\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{FFC4}",
-        nfc: "\u{FFC4}",
-        nfd: "\u{FFC4}",
-        nfkc: "\u{1163}",
-        nfkd: "\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{FFC5}",
-        nfc: "\u{FFC5}",
-        nfd: "\u{FFC5}",
-        nfkc: "\u{1164}",
-        nfkd: "\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{FFC6}",
-        nfc: "\u{FFC6}",
-        nfd: "\u{FFC6}",
-        nfkc: "\u{1165}",
-        nfkd: "\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{FFC7}",
-        nfc: "\u{FFC7}",
-        nfd: "\u{FFC7}",
-        nfkc: "\u{1166}",
-        nfkd: "\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{FFCA}",
-        nfc: "\u{FFCA}",
-        nfd: "\u{FFCA}",
-        nfkc: "\u{1167}",
-        nfkd: "\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{FFCB}",
-        nfc: "\u{FFCB}",
-        nfd: "\u{FFCB}",
-        nfkc: "\u{1168}",
-        nfkd: "\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{FFCC}",
-        nfc: "\u{FFCC}",
-        nfd: "\u{FFCC}",
-        nfkc: "\u{1169}",
-        nfkd: "\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{FFCD}",
-        nfc: "\u{FFCD}",
-        nfd: "\u{FFCD}",
-        nfkc: "\u{116A}",
-        nfkd: "\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{FFCE}",
-        nfc: "\u{FFCE}",
-        nfd: "\u{FFCE}",
-        nfkc: "\u{116B}",
-        nfkd: "\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{FFCF}",
-        nfc: "\u{FFCF}",
-        nfd: "\u{FFCF}",
-        nfkc: "\u{116C}",
-        nfkd: "\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{FFD2}",
-        nfc: "\u{FFD2}",
-        nfd: "\u{FFD2}",
-        nfkc: "\u{116D}",
-        nfkd: "\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{FFD3}",
-        nfc: "\u{FFD3}",
-        nfd: "\u{FFD3}",
-        nfkc: "\u{116E}",
-        nfkd: "\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{FFD4}",
-        nfc: "\u{FFD4}",
-        nfd: "\u{FFD4}",
-        nfkc: "\u{116F}",
-        nfkd: "\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{FFD5}",
-        nfc: "\u{FFD5}",
-        nfd: "\u{FFD5}",
-        nfkc: "\u{1170}",
-        nfkd: "\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{FFD6}",
-        nfc: "\u{FFD6}",
-        nfd: "\u{FFD6}",
-        nfkc: "\u{1171}",
-        nfkd: "\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{FFD7}",
-        nfc: "\u{FFD7}",
-        nfd: "\u{FFD7}",
-        nfkc: "\u{1172}",
-        nfkd: "\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{FFDA}",
-        nfc: "\u{FFDA}",
-        nfd: "\u{FFDA}",
-        nfkc: "\u{1173}",
-        nfkd: "\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{FFDB}",
-        nfc: "\u{FFDB}",
-        nfd: "\u{FFDB}",
-        nfkc: "\u{1174}",
-        nfkd: "\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{FFDC}",
-        nfc: "\u{FFDC}",
-        nfd: "\u{FFDC}",
-        nfkc: "\u{1175}",
-        nfkd: "\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{FFE0}",
-        nfc: "\u{FFE0}",
-        nfd: "\u{FFE0}",
-        nfkc: "\u{00A2}",
-        nfkd: "\u{00A2}",
-    },
-    NormalizationTest {
-        source: "\u{FFE1}",
-        nfc: "\u{FFE1}",
-        nfd: "\u{FFE1}",
-        nfkc: "\u{00A3}",
-        nfkd: "\u{00A3}",
-    },
-    NormalizationTest {
-        source: "\u{FFE2}",
-        nfc: "\u{FFE2}",
-        nfd: "\u{FFE2}",
-        nfkc: "\u{00AC}",
-        nfkd: "\u{00AC}",
-    },
-    NormalizationTest {
-        source: "\u{FFE3}",
-        nfc: "\u{FFE3}",
-        nfd: "\u{FFE3}",
-        nfkc: "\u{0020}\u{0304}",
-        nfkd: "\u{0020}\u{0304}",
-    },
-    NormalizationTest {
-        source: "\u{FFE4}",
-        nfc: "\u{FFE4}",
-        nfd: "\u{FFE4}",
-        nfkc: "\u{00A6}",
-        nfkd: "\u{00A6}",
-    },
-    NormalizationTest {
-        source: "\u{FFE5}",
-        nfc: "\u{FFE5}",
-        nfd: "\u{FFE5}",
-        nfkc: "\u{00A5}",
-        nfkd: "\u{00A5}",
-    },
-    NormalizationTest {
-        source: "\u{FFE6}",
-        nfc: "\u{FFE6}",
-        nfd: "\u{FFE6}",
-        nfkc: "\u{20A9}",
-        nfkd: "\u{20A9}",
-    },
-    NormalizationTest {
-        source: "\u{FFE8}",
-        nfc: "\u{FFE8}",
-        nfd: "\u{FFE8}",
-        nfkc: "\u{2502}",
-        nfkd: "\u{2502}",
-    },
-    NormalizationTest {
-        source: "\u{FFE9}",
-        nfc: "\u{FFE9}",
-        nfd: "\u{FFE9}",
-        nfkc: "\u{2190}",
-        nfkd: "\u{2190}",
-    },
-    NormalizationTest {
-        source: "\u{FFEA}",
-        nfc: "\u{FFEA}",
-        nfd: "\u{FFEA}",
-        nfkc: "\u{2191}",
-        nfkd: "\u{2191}",
-    },
-    NormalizationTest {
-        source: "\u{FFEB}",
-        nfc: "\u{FFEB}",
-        nfd: "\u{FFEB}",
-        nfkc: "\u{2192}",
-        nfkd: "\u{2192}",
-    },
-    NormalizationTest {
-        source: "\u{FFEC}",
-        nfc: "\u{FFEC}",
-        nfd: "\u{FFEC}",
-        nfkc: "\u{2193}",
-        nfkd: "\u{2193}",
-    },
-    NormalizationTest {
-        source: "\u{FFED}",
-        nfc: "\u{FFED}",
-        nfd: "\u{FFED}",
-        nfkc: "\u{25A0}",
-        nfkd: "\u{25A0}",
-    },
-    NormalizationTest {
-        source: "\u{FFEE}",
-        nfc: "\u{FFEE}",
-        nfd: "\u{FFEE}",
-        nfkc: "\u{25CB}",
-        nfkd: "\u{25CB}",
-    },
-    NormalizationTest {
-        source: "\u{1109A}",
-        nfc: "\u{1109A}",
-        nfd: "\u{11099}\u{110BA}",
-        nfkc: "\u{1109A}",
-        nfkd: "\u{11099}\u{110BA}",
-    },
-    NormalizationTest {
-        source: "\u{1109C}",
-        nfc: "\u{1109C}",
-        nfd: "\u{1109B}\u{110BA}",
-        nfkc: "\u{1109C}",
-        nfkd: "\u{1109B}\u{110BA}",
-    },
-    NormalizationTest {
-        source: "\u{110AB}",
-        nfc: "\u{110AB}",
-        nfd: "\u{110A5}\u{110BA}",
-        nfkc: "\u{110AB}",
-        nfkd: "\u{110A5}\u{110BA}",
-    },
-    NormalizationTest {
-        source: "\u{1112E}",
-        nfc: "\u{1112E}",
-        nfd: "\u{11131}\u{11127}",
-        nfkc: "\u{1112E}",
-        nfkd: "\u{11131}\u{11127}",
-    },
-    NormalizationTest {
-        source: "\u{1112F}",
-        nfc: "\u{1112F}",
-        nfd: "\u{11132}\u{11127}",
-        nfkc: "\u{1112F}",
-        nfkd: "\u{11132}\u{11127}",
-    },
-    NormalizationTest {
-        source: "\u{1134B}",
-        nfc: "\u{1134B}",
-        nfd: "\u{11347}\u{1133E}",
-        nfkc: "\u{1134B}",
-        nfkd: "\u{11347}\u{1133E}",
-    },
-    NormalizationTest {
-        source: "\u{1134C}",
-        nfc: "\u{1134C}",
-        nfd: "\u{11347}\u{11357}",
-        nfkc: "\u{1134C}",
-        nfkd: "\u{11347}\u{11357}",
-    },
-    NormalizationTest {
-        source: "\u{114BB}",
-        nfc: "\u{114BB}",
-        nfd: "\u{114B9}\u{114BA}",
-        nfkc: "\u{114BB}",
-        nfkd: "\u{114B9}\u{114BA}",
-    },
-    NormalizationTest {
-        source: "\u{114BC}",
-        nfc: "\u{114BC}",
-        nfd: "\u{114B9}\u{114B0}",
-        nfkc: "\u{114BC}",
-        nfkd: "\u{114B9}\u{114B0}",
-    },
-    NormalizationTest {
-        source: "\u{114BE}",
-        nfc: "\u{114BE}",
-        nfd: "\u{114B9}\u{114BD}",
-        nfkc: "\u{114BE}",
-        nfkd: "\u{114B9}\u{114BD}",
-    },
-    NormalizationTest {
-        source: "\u{115BA}",
-        nfc: "\u{115BA}",
-        nfd: "\u{115B8}\u{115AF}",
-        nfkc: "\u{115BA}",
-        nfkd: "\u{115B8}\u{115AF}",
-    },
-    NormalizationTest {
-        source: "\u{115BB}",
-        nfc: "\u{115BB}",
-        nfd: "\u{115B9}\u{115AF}",
-        nfkc: "\u{115BB}",
-        nfkd: "\u{115B9}\u{115AF}",
-    },
-    NormalizationTest {
-        source: "\u{1D15E}",
-        nfc: "\u{1D157}\u{1D165}",
-        nfd: "\u{1D157}\u{1D165}",
-        nfkc: "\u{1D157}\u{1D165}",
-        nfkd: "\u{1D157}\u{1D165}",
-    },
-    NormalizationTest {
-        source: "\u{1D15F}",
-        nfc: "\u{1D158}\u{1D165}",
-        nfd: "\u{1D158}\u{1D165}",
-        nfkc: "\u{1D158}\u{1D165}",
-        nfkd: "\u{1D158}\u{1D165}",
-    },
-    NormalizationTest {
-        source: "\u{1D160}",
-        nfc: "\u{1D158}\u{1D165}\u{1D16E}",
-        nfd: "\u{1D158}\u{1D165}\u{1D16E}",
-        nfkc: "\u{1D158}\u{1D165}\u{1D16E}",
-        nfkd: "\u{1D158}\u{1D165}\u{1D16E}",
-    },
-    NormalizationTest {
-        source: "\u{1D161}",
-        nfc: "\u{1D158}\u{1D165}\u{1D16F}",
-        nfd: "\u{1D158}\u{1D165}\u{1D16F}",
-        nfkc: "\u{1D158}\u{1D165}\u{1D16F}",
-        nfkd: "\u{1D158}\u{1D165}\u{1D16F}",
-    },
-    NormalizationTest {
-        source: "\u{1D162}",
-        nfc: "\u{1D158}\u{1D165}\u{1D170}",
-        nfd: "\u{1D158}\u{1D165}\u{1D170}",
-        nfkc: "\u{1D158}\u{1D165}\u{1D170}",
-        nfkd: "\u{1D158}\u{1D165}\u{1D170}",
-    },
-    NormalizationTest {
-        source: "\u{1D163}",
-        nfc: "\u{1D158}\u{1D165}\u{1D171}",
-        nfd: "\u{1D158}\u{1D165}\u{1D171}",
-        nfkc: "\u{1D158}\u{1D165}\u{1D171}",
-        nfkd: "\u{1D158}\u{1D165}\u{1D171}",
-    },
-    NormalizationTest {
-        source: "\u{1D164}",
-        nfc: "\u{1D158}\u{1D165}\u{1D172}",
-        nfd: "\u{1D158}\u{1D165}\u{1D172}",
-        nfkc: "\u{1D158}\u{1D165}\u{1D172}",
-        nfkd: "\u{1D158}\u{1D165}\u{1D172}",
-    },
-    NormalizationTest {
-        source: "\u{1D1BB}",
-        nfc: "\u{1D1B9}\u{1D165}",
-        nfd: "\u{1D1B9}\u{1D165}",
-        nfkc: "\u{1D1B9}\u{1D165}",
-        nfkd: "\u{1D1B9}\u{1D165}",
-    },
-    NormalizationTest {
-        source: "\u{1D1BC}",
-        nfc: "\u{1D1BA}\u{1D165}",
-        nfd: "\u{1D1BA}\u{1D165}",
-        nfkc: "\u{1D1BA}\u{1D165}",
-        nfkd: "\u{1D1BA}\u{1D165}",
-    },
-    NormalizationTest {
-        source: "\u{1D1BD}",
-        nfc: "\u{1D1B9}\u{1D165}\u{1D16E}",
-        nfd: "\u{1D1B9}\u{1D165}\u{1D16E}",
-        nfkc: "\u{1D1B9}\u{1D165}\u{1D16E}",
-        nfkd: "\u{1D1B9}\u{1D165}\u{1D16E}",
-    },
-    NormalizationTest {
-        source: "\u{1D1BE}",
-        nfc: "\u{1D1BA}\u{1D165}\u{1D16E}",
-        nfd: "\u{1D1BA}\u{1D165}\u{1D16E}",
-        nfkc: "\u{1D1BA}\u{1D165}\u{1D16E}",
-        nfkd: "\u{1D1BA}\u{1D165}\u{1D16E}",
-    },
-    NormalizationTest {
-        source: "\u{1D1BF}",
-        nfc: "\u{1D1B9}\u{1D165}\u{1D16F}",
-        nfd: "\u{1D1B9}\u{1D165}\u{1D16F}",
-        nfkc: "\u{1D1B9}\u{1D165}\u{1D16F}",
-        nfkd: "\u{1D1B9}\u{1D165}\u{1D16F}",
-    },
-    NormalizationTest {
-        source: "\u{1D1C0}",
-        nfc: "\u{1D1BA}\u{1D165}\u{1D16F}",
-        nfd: "\u{1D1BA}\u{1D165}\u{1D16F}",
-        nfkc: "\u{1D1BA}\u{1D165}\u{1D16F}",
-        nfkd: "\u{1D1BA}\u{1D165}\u{1D16F}",
-    },
-    NormalizationTest {
-        source: "\u{1D400}",
-        nfc: "\u{1D400}",
-        nfd: "\u{1D400}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D401}",
-        nfc: "\u{1D401}",
-        nfd: "\u{1D401}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D402}",
-        nfc: "\u{1D402}",
-        nfd: "\u{1D402}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D403}",
-        nfc: "\u{1D403}",
-        nfd: "\u{1D403}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D404}",
-        nfc: "\u{1D404}",
-        nfd: "\u{1D404}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D405}",
-        nfc: "\u{1D405}",
-        nfd: "\u{1D405}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D406}",
-        nfc: "\u{1D406}",
-        nfd: "\u{1D406}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D407}",
-        nfc: "\u{1D407}",
-        nfd: "\u{1D407}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D408}",
-        nfc: "\u{1D408}",
-        nfd: "\u{1D408}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D409}",
-        nfc: "\u{1D409}",
-        nfd: "\u{1D409}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D40A}",
-        nfc: "\u{1D40A}",
-        nfd: "\u{1D40A}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D40B}",
-        nfc: "\u{1D40B}",
-        nfd: "\u{1D40B}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D40C}",
-        nfc: "\u{1D40C}",
-        nfd: "\u{1D40C}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D40D}",
-        nfc: "\u{1D40D}",
-        nfd: "\u{1D40D}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D40E}",
-        nfc: "\u{1D40E}",
-        nfd: "\u{1D40E}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D40F}",
-        nfc: "\u{1D40F}",
-        nfd: "\u{1D40F}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D410}",
-        nfc: "\u{1D410}",
-        nfd: "\u{1D410}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D411}",
-        nfc: "\u{1D411}",
-        nfd: "\u{1D411}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D412}",
-        nfc: "\u{1D412}",
-        nfd: "\u{1D412}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D413}",
-        nfc: "\u{1D413}",
-        nfd: "\u{1D413}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D414}",
-        nfc: "\u{1D414}",
-        nfd: "\u{1D414}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D415}",
-        nfc: "\u{1D415}",
-        nfd: "\u{1D415}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D416}",
-        nfc: "\u{1D416}",
-        nfd: "\u{1D416}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D417}",
-        nfc: "\u{1D417}",
-        nfd: "\u{1D417}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D418}",
-        nfc: "\u{1D418}",
-        nfd: "\u{1D418}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D419}",
-        nfc: "\u{1D419}",
-        nfd: "\u{1D419}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D41A}",
-        nfc: "\u{1D41A}",
-        nfd: "\u{1D41A}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D41B}",
-        nfc: "\u{1D41B}",
-        nfd: "\u{1D41B}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D41C}",
-        nfc: "\u{1D41C}",
-        nfd: "\u{1D41C}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D41D}",
-        nfc: "\u{1D41D}",
-        nfd: "\u{1D41D}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D41E}",
-        nfc: "\u{1D41E}",
-        nfd: "\u{1D41E}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D41F}",
-        nfc: "\u{1D41F}",
-        nfd: "\u{1D41F}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D420}",
-        nfc: "\u{1D420}",
-        nfd: "\u{1D420}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D421}",
-        nfc: "\u{1D421}",
-        nfd: "\u{1D421}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D422}",
-        nfc: "\u{1D422}",
-        nfd: "\u{1D422}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D423}",
-        nfc: "\u{1D423}",
-        nfd: "\u{1D423}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D424}",
-        nfc: "\u{1D424}",
-        nfd: "\u{1D424}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D425}",
-        nfc: "\u{1D425}",
-        nfd: "\u{1D425}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D426}",
-        nfc: "\u{1D426}",
-        nfd: "\u{1D426}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D427}",
-        nfc: "\u{1D427}",
-        nfd: "\u{1D427}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D428}",
-        nfc: "\u{1D428}",
-        nfd: "\u{1D428}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D429}",
-        nfc: "\u{1D429}",
-        nfd: "\u{1D429}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D42A}",
-        nfc: "\u{1D42A}",
-        nfd: "\u{1D42A}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D42B}",
-        nfc: "\u{1D42B}",
-        nfd: "\u{1D42B}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D42C}",
-        nfc: "\u{1D42C}",
-        nfd: "\u{1D42C}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D42D}",
-        nfc: "\u{1D42D}",
-        nfd: "\u{1D42D}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D42E}",
-        nfc: "\u{1D42E}",
-        nfd: "\u{1D42E}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D42F}",
-        nfc: "\u{1D42F}",
-        nfd: "\u{1D42F}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D430}",
-        nfc: "\u{1D430}",
-        nfd: "\u{1D430}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D431}",
-        nfc: "\u{1D431}",
-        nfd: "\u{1D431}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D432}",
-        nfc: "\u{1D432}",
-        nfd: "\u{1D432}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D433}",
-        nfc: "\u{1D433}",
-        nfd: "\u{1D433}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D434}",
-        nfc: "\u{1D434}",
-        nfd: "\u{1D434}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D435}",
-        nfc: "\u{1D435}",
-        nfd: "\u{1D435}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D436}",
-        nfc: "\u{1D436}",
-        nfd: "\u{1D436}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D437}",
-        nfc: "\u{1D437}",
-        nfd: "\u{1D437}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D438}",
-        nfc: "\u{1D438}",
-        nfd: "\u{1D438}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D439}",
-        nfc: "\u{1D439}",
-        nfd: "\u{1D439}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D43A}",
-        nfc: "\u{1D43A}",
-        nfd: "\u{1D43A}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D43B}",
-        nfc: "\u{1D43B}",
-        nfd: "\u{1D43B}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D43C}",
-        nfc: "\u{1D43C}",
-        nfd: "\u{1D43C}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D43D}",
-        nfc: "\u{1D43D}",
-        nfd: "\u{1D43D}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D43E}",
-        nfc: "\u{1D43E}",
-        nfd: "\u{1D43E}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D43F}",
-        nfc: "\u{1D43F}",
-        nfd: "\u{1D43F}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D440}",
-        nfc: "\u{1D440}",
-        nfd: "\u{1D440}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D441}",
-        nfc: "\u{1D441}",
-        nfd: "\u{1D441}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D442}",
-        nfc: "\u{1D442}",
-        nfd: "\u{1D442}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D443}",
-        nfc: "\u{1D443}",
-        nfd: "\u{1D443}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D444}",
-        nfc: "\u{1D444}",
-        nfd: "\u{1D444}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D445}",
-        nfc: "\u{1D445}",
-        nfd: "\u{1D445}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D446}",
-        nfc: "\u{1D446}",
-        nfd: "\u{1D446}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D447}",
-        nfc: "\u{1D447}",
-        nfd: "\u{1D447}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D448}",
-        nfc: "\u{1D448}",
-        nfd: "\u{1D448}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D449}",
-        nfc: "\u{1D449}",
-        nfd: "\u{1D449}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D44A}",
-        nfc: "\u{1D44A}",
-        nfd: "\u{1D44A}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D44B}",
-        nfc: "\u{1D44B}",
-        nfd: "\u{1D44B}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D44C}",
-        nfc: "\u{1D44C}",
-        nfd: "\u{1D44C}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D44D}",
-        nfc: "\u{1D44D}",
-        nfd: "\u{1D44D}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D44E}",
-        nfc: "\u{1D44E}",
-        nfd: "\u{1D44E}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D44F}",
-        nfc: "\u{1D44F}",
-        nfd: "\u{1D44F}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D450}",
-        nfc: "\u{1D450}",
-        nfd: "\u{1D450}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D451}",
-        nfc: "\u{1D451}",
-        nfd: "\u{1D451}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D452}",
-        nfc: "\u{1D452}",
-        nfd: "\u{1D452}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D453}",
-        nfc: "\u{1D453}",
-        nfd: "\u{1D453}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D454}",
-        nfc: "\u{1D454}",
-        nfd: "\u{1D454}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D456}",
-        nfc: "\u{1D456}",
-        nfd: "\u{1D456}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D457}",
-        nfc: "\u{1D457}",
-        nfd: "\u{1D457}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D458}",
-        nfc: "\u{1D458}",
-        nfd: "\u{1D458}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D459}",
-        nfc: "\u{1D459}",
-        nfd: "\u{1D459}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D45A}",
-        nfc: "\u{1D45A}",
-        nfd: "\u{1D45A}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D45B}",
-        nfc: "\u{1D45B}",
-        nfd: "\u{1D45B}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D45C}",
-        nfc: "\u{1D45C}",
-        nfd: "\u{1D45C}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D45D}",
-        nfc: "\u{1D45D}",
-        nfd: "\u{1D45D}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D45E}",
-        nfc: "\u{1D45E}",
-        nfd: "\u{1D45E}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D45F}",
-        nfc: "\u{1D45F}",
-        nfd: "\u{1D45F}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D460}",
-        nfc: "\u{1D460}",
-        nfd: "\u{1D460}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D461}",
-        nfc: "\u{1D461}",
-        nfd: "\u{1D461}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D462}",
-        nfc: "\u{1D462}",
-        nfd: "\u{1D462}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D463}",
-        nfc: "\u{1D463}",
-        nfd: "\u{1D463}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D464}",
-        nfc: "\u{1D464}",
-        nfd: "\u{1D464}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D465}",
-        nfc: "\u{1D465}",
-        nfd: "\u{1D465}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D466}",
-        nfc: "\u{1D466}",
-        nfd: "\u{1D466}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D467}",
-        nfc: "\u{1D467}",
-        nfd: "\u{1D467}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D468}",
-        nfc: "\u{1D468}",
-        nfd: "\u{1D468}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D469}",
-        nfc: "\u{1D469}",
-        nfd: "\u{1D469}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D46A}",
-        nfc: "\u{1D46A}",
-        nfd: "\u{1D46A}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D46B}",
-        nfc: "\u{1D46B}",
-        nfd: "\u{1D46B}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D46C}",
-        nfc: "\u{1D46C}",
-        nfd: "\u{1D46C}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D46D}",
-        nfc: "\u{1D46D}",
-        nfd: "\u{1D46D}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D46E}",
-        nfc: "\u{1D46E}",
-        nfd: "\u{1D46E}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D46F}",
-        nfc: "\u{1D46F}",
-        nfd: "\u{1D46F}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D470}",
-        nfc: "\u{1D470}",
-        nfd: "\u{1D470}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D471}",
-        nfc: "\u{1D471}",
-        nfd: "\u{1D471}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D472}",
-        nfc: "\u{1D472}",
-        nfd: "\u{1D472}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D473}",
-        nfc: "\u{1D473}",
-        nfd: "\u{1D473}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D474}",
-        nfc: "\u{1D474}",
-        nfd: "\u{1D474}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D475}",
-        nfc: "\u{1D475}",
-        nfd: "\u{1D475}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D476}",
-        nfc: "\u{1D476}",
-        nfd: "\u{1D476}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D477}",
-        nfc: "\u{1D477}",
-        nfd: "\u{1D477}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D478}",
-        nfc: "\u{1D478}",
-        nfd: "\u{1D478}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D479}",
-        nfc: "\u{1D479}",
-        nfd: "\u{1D479}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D47A}",
-        nfc: "\u{1D47A}",
-        nfd: "\u{1D47A}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D47B}",
-        nfc: "\u{1D47B}",
-        nfd: "\u{1D47B}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D47C}",
-        nfc: "\u{1D47C}",
-        nfd: "\u{1D47C}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D47D}",
-        nfc: "\u{1D47D}",
-        nfd: "\u{1D47D}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D47E}",
-        nfc: "\u{1D47E}",
-        nfd: "\u{1D47E}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D47F}",
-        nfc: "\u{1D47F}",
-        nfd: "\u{1D47F}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D480}",
-        nfc: "\u{1D480}",
-        nfd: "\u{1D480}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D481}",
-        nfc: "\u{1D481}",
-        nfd: "\u{1D481}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D482}",
-        nfc: "\u{1D482}",
-        nfd: "\u{1D482}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D483}",
-        nfc: "\u{1D483}",
-        nfd: "\u{1D483}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D484}",
-        nfc: "\u{1D484}",
-        nfd: "\u{1D484}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D485}",
-        nfc: "\u{1D485}",
-        nfd: "\u{1D485}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D486}",
-        nfc: "\u{1D486}",
-        nfd: "\u{1D486}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D487}",
-        nfc: "\u{1D487}",
-        nfd: "\u{1D487}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D488}",
-        nfc: "\u{1D488}",
-        nfd: "\u{1D488}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D489}",
-        nfc: "\u{1D489}",
-        nfd: "\u{1D489}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D48A}",
-        nfc: "\u{1D48A}",
-        nfd: "\u{1D48A}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D48B}",
-        nfc: "\u{1D48B}",
-        nfd: "\u{1D48B}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D48C}",
-        nfc: "\u{1D48C}",
-        nfd: "\u{1D48C}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D48D}",
-        nfc: "\u{1D48D}",
-        nfd: "\u{1D48D}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D48E}",
-        nfc: "\u{1D48E}",
-        nfd: "\u{1D48E}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D48F}",
-        nfc: "\u{1D48F}",
-        nfd: "\u{1D48F}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D490}",
-        nfc: "\u{1D490}",
-        nfd: "\u{1D490}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D491}",
-        nfc: "\u{1D491}",
-        nfd: "\u{1D491}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D492}",
-        nfc: "\u{1D492}",
-        nfd: "\u{1D492}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D493}",
-        nfc: "\u{1D493}",
-        nfd: "\u{1D493}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D494}",
-        nfc: "\u{1D494}",
-        nfd: "\u{1D494}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D495}",
-        nfc: "\u{1D495}",
-        nfd: "\u{1D495}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D496}",
-        nfc: "\u{1D496}",
-        nfd: "\u{1D496}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D497}",
-        nfc: "\u{1D497}",
-        nfd: "\u{1D497}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D498}",
-        nfc: "\u{1D498}",
-        nfd: "\u{1D498}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D499}",
-        nfc: "\u{1D499}",
-        nfd: "\u{1D499}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D49A}",
-        nfc: "\u{1D49A}",
-        nfd: "\u{1D49A}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D49B}",
-        nfc: "\u{1D49B}",
-        nfd: "\u{1D49B}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D49C}",
-        nfc: "\u{1D49C}",
-        nfd: "\u{1D49C}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D49E}",
-        nfc: "\u{1D49E}",
-        nfd: "\u{1D49E}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D49F}",
-        nfc: "\u{1D49F}",
-        nfd: "\u{1D49F}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D4A2}",
-        nfc: "\u{1D4A2}",
-        nfd: "\u{1D4A2}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D4A5}",
-        nfc: "\u{1D4A5}",
-        nfd: "\u{1D4A5}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4A6}",
-        nfc: "\u{1D4A6}",
-        nfd: "\u{1D4A6}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D4A9}",
-        nfc: "\u{1D4A9}",
-        nfd: "\u{1D4A9}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D4AA}",
-        nfc: "\u{1D4AA}",
-        nfd: "\u{1D4AA}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D4AB}",
-        nfc: "\u{1D4AB}",
-        nfd: "\u{1D4AB}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D4AC}",
-        nfc: "\u{1D4AC}",
-        nfd: "\u{1D4AC}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D4AE}",
-        nfc: "\u{1D4AE}",
-        nfd: "\u{1D4AE}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D4AF}",
-        nfc: "\u{1D4AF}",
-        nfd: "\u{1D4AF}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B0}",
-        nfc: "\u{1D4B0}",
-        nfd: "\u{1D4B0}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B1}",
-        nfc: "\u{1D4B1}",
-        nfd: "\u{1D4B1}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B2}",
-        nfc: "\u{1D4B2}",
-        nfd: "\u{1D4B2}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B3}",
-        nfc: "\u{1D4B3}",
-        nfd: "\u{1D4B3}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B4}",
-        nfc: "\u{1D4B4}",
-        nfd: "\u{1D4B4}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B5}",
-        nfc: "\u{1D4B5}",
-        nfd: "\u{1D4B5}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B6}",
-        nfc: "\u{1D4B6}",
-        nfd: "\u{1D4B6}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B7}",
-        nfc: "\u{1D4B7}",
-        nfd: "\u{1D4B7}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B8}",
-        nfc: "\u{1D4B8}",
-        nfd: "\u{1D4B8}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D4B9}",
-        nfc: "\u{1D4B9}",
-        nfd: "\u{1D4B9}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D4BB}",
-        nfc: "\u{1D4BB}",
-        nfd: "\u{1D4BB}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D4BD}",
-        nfc: "\u{1D4BD}",
-        nfd: "\u{1D4BD}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D4BE}",
-        nfc: "\u{1D4BE}",
-        nfd: "\u{1D4BE}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D4BF}",
-        nfc: "\u{1D4BF}",
-        nfd: "\u{1D4BF}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C0}",
-        nfc: "\u{1D4C0}",
-        nfd: "\u{1D4C0}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C1}",
-        nfc: "\u{1D4C1}",
-        nfd: "\u{1D4C1}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C2}",
-        nfc: "\u{1D4C2}",
-        nfd: "\u{1D4C2}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C3}",
-        nfc: "\u{1D4C3}",
-        nfd: "\u{1D4C3}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C5}",
-        nfc: "\u{1D4C5}",
-        nfd: "\u{1D4C5}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C6}",
-        nfc: "\u{1D4C6}",
-        nfd: "\u{1D4C6}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C7}",
-        nfc: "\u{1D4C7}",
-        nfd: "\u{1D4C7}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C8}",
-        nfc: "\u{1D4C8}",
-        nfd: "\u{1D4C8}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D4C9}",
-        nfc: "\u{1D4C9}",
-        nfd: "\u{1D4C9}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D4CA}",
-        nfc: "\u{1D4CA}",
-        nfd: "\u{1D4CA}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D4CB}",
-        nfc: "\u{1D4CB}",
-        nfd: "\u{1D4CB}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D4CC}",
-        nfc: "\u{1D4CC}",
-        nfd: "\u{1D4CC}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D4CD}",
-        nfc: "\u{1D4CD}",
-        nfd: "\u{1D4CD}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D4CE}",
-        nfc: "\u{1D4CE}",
-        nfd: "\u{1D4CE}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D4CF}",
-        nfc: "\u{1D4CF}",
-        nfd: "\u{1D4CF}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D0}",
-        nfc: "\u{1D4D0}",
-        nfd: "\u{1D4D0}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D1}",
-        nfc: "\u{1D4D1}",
-        nfd: "\u{1D4D1}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D2}",
-        nfc: "\u{1D4D2}",
-        nfd: "\u{1D4D2}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D3}",
-        nfc: "\u{1D4D3}",
-        nfd: "\u{1D4D3}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D4}",
-        nfc: "\u{1D4D4}",
-        nfd: "\u{1D4D4}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D5}",
-        nfc: "\u{1D4D5}",
-        nfd: "\u{1D4D5}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D6}",
-        nfc: "\u{1D4D6}",
-        nfd: "\u{1D4D6}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D7}",
-        nfc: "\u{1D4D7}",
-        nfd: "\u{1D4D7}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D8}",
-        nfc: "\u{1D4D8}",
-        nfd: "\u{1D4D8}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D4D9}",
-        nfc: "\u{1D4D9}",
-        nfd: "\u{1D4D9}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4DA}",
-        nfc: "\u{1D4DA}",
-        nfd: "\u{1D4DA}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D4DB}",
-        nfc: "\u{1D4DB}",
-        nfd: "\u{1D4DB}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D4DC}",
-        nfc: "\u{1D4DC}",
-        nfd: "\u{1D4DC}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D4DD}",
-        nfc: "\u{1D4DD}",
-        nfd: "\u{1D4DD}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D4DE}",
-        nfc: "\u{1D4DE}",
-        nfd: "\u{1D4DE}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D4DF}",
-        nfc: "\u{1D4DF}",
-        nfd: "\u{1D4DF}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E0}",
-        nfc: "\u{1D4E0}",
-        nfd: "\u{1D4E0}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E1}",
-        nfc: "\u{1D4E1}",
-        nfd: "\u{1D4E1}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E2}",
-        nfc: "\u{1D4E2}",
-        nfd: "\u{1D4E2}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E3}",
-        nfc: "\u{1D4E3}",
-        nfd: "\u{1D4E3}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E4}",
-        nfc: "\u{1D4E4}",
-        nfd: "\u{1D4E4}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E5}",
-        nfc: "\u{1D4E5}",
-        nfd: "\u{1D4E5}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E6}",
-        nfc: "\u{1D4E6}",
-        nfd: "\u{1D4E6}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E7}",
-        nfc: "\u{1D4E7}",
-        nfd: "\u{1D4E7}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E8}",
-        nfc: "\u{1D4E8}",
-        nfd: "\u{1D4E8}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D4E9}",
-        nfc: "\u{1D4E9}",
-        nfd: "\u{1D4E9}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4EA}",
-        nfc: "\u{1D4EA}",
-        nfd: "\u{1D4EA}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D4EB}",
-        nfc: "\u{1D4EB}",
-        nfd: "\u{1D4EB}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D4EC}",
-        nfc: "\u{1D4EC}",
-        nfd: "\u{1D4EC}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D4ED}",
-        nfc: "\u{1D4ED}",
-        nfd: "\u{1D4ED}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D4EE}",
-        nfc: "\u{1D4EE}",
-        nfd: "\u{1D4EE}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D4EF}",
-        nfc: "\u{1D4EF}",
-        nfd: "\u{1D4EF}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F0}",
-        nfc: "\u{1D4F0}",
-        nfd: "\u{1D4F0}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F1}",
-        nfc: "\u{1D4F1}",
-        nfd: "\u{1D4F1}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F2}",
-        nfc: "\u{1D4F2}",
-        nfd: "\u{1D4F2}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F3}",
-        nfc: "\u{1D4F3}",
-        nfd: "\u{1D4F3}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F4}",
-        nfc: "\u{1D4F4}",
-        nfd: "\u{1D4F4}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F5}",
-        nfc: "\u{1D4F5}",
-        nfd: "\u{1D4F5}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F6}",
-        nfc: "\u{1D4F6}",
-        nfd: "\u{1D4F6}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F7}",
-        nfc: "\u{1D4F7}",
-        nfd: "\u{1D4F7}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F8}",
-        nfc: "\u{1D4F8}",
-        nfd: "\u{1D4F8}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D4F9}",
-        nfc: "\u{1D4F9}",
-        nfd: "\u{1D4F9}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D4FA}",
-        nfc: "\u{1D4FA}",
-        nfd: "\u{1D4FA}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D4FB}",
-        nfc: "\u{1D4FB}",
-        nfd: "\u{1D4FB}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D4FC}",
-        nfc: "\u{1D4FC}",
-        nfd: "\u{1D4FC}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D4FD}",
-        nfc: "\u{1D4FD}",
-        nfd: "\u{1D4FD}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D4FE}",
-        nfc: "\u{1D4FE}",
-        nfd: "\u{1D4FE}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D4FF}",
-        nfc: "\u{1D4FF}",
-        nfd: "\u{1D4FF}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D500}",
-        nfc: "\u{1D500}",
-        nfd: "\u{1D500}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D501}",
-        nfc: "\u{1D501}",
-        nfd: "\u{1D501}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D502}",
-        nfc: "\u{1D502}",
-        nfd: "\u{1D502}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D503}",
-        nfc: "\u{1D503}",
-        nfd: "\u{1D503}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D504}",
-        nfc: "\u{1D504}",
-        nfd: "\u{1D504}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D505}",
-        nfc: "\u{1D505}",
-        nfd: "\u{1D505}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D507}",
-        nfc: "\u{1D507}",
-        nfd: "\u{1D507}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D508}",
-        nfc: "\u{1D508}",
-        nfd: "\u{1D508}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D509}",
-        nfc: "\u{1D509}",
-        nfd: "\u{1D509}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D50A}",
-        nfc: "\u{1D50A}",
-        nfd: "\u{1D50A}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D50D}",
-        nfc: "\u{1D50D}",
-        nfd: "\u{1D50D}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D50E}",
-        nfc: "\u{1D50E}",
-        nfd: "\u{1D50E}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D50F}",
-        nfc: "\u{1D50F}",
-        nfd: "\u{1D50F}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D510}",
-        nfc: "\u{1D510}",
-        nfd: "\u{1D510}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D511}",
-        nfc: "\u{1D511}",
-        nfd: "\u{1D511}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D512}",
-        nfc: "\u{1D512}",
-        nfd: "\u{1D512}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D513}",
-        nfc: "\u{1D513}",
-        nfd: "\u{1D513}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D514}",
-        nfc: "\u{1D514}",
-        nfd: "\u{1D514}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D516}",
-        nfc: "\u{1D516}",
-        nfd: "\u{1D516}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D517}",
-        nfc: "\u{1D517}",
-        nfd: "\u{1D517}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D518}",
-        nfc: "\u{1D518}",
-        nfd: "\u{1D518}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D519}",
-        nfc: "\u{1D519}",
-        nfd: "\u{1D519}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D51A}",
-        nfc: "\u{1D51A}",
-        nfd: "\u{1D51A}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D51B}",
-        nfc: "\u{1D51B}",
-        nfd: "\u{1D51B}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D51C}",
-        nfc: "\u{1D51C}",
-        nfd: "\u{1D51C}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D51E}",
-        nfc: "\u{1D51E}",
-        nfd: "\u{1D51E}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D51F}",
-        nfc: "\u{1D51F}",
-        nfd: "\u{1D51F}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D520}",
-        nfc: "\u{1D520}",
-        nfd: "\u{1D520}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D521}",
-        nfc: "\u{1D521}",
-        nfd: "\u{1D521}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D522}",
-        nfc: "\u{1D522}",
-        nfd: "\u{1D522}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D523}",
-        nfc: "\u{1D523}",
-        nfd: "\u{1D523}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D524}",
-        nfc: "\u{1D524}",
-        nfd: "\u{1D524}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D525}",
-        nfc: "\u{1D525}",
-        nfd: "\u{1D525}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D526}",
-        nfc: "\u{1D526}",
-        nfd: "\u{1D526}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D527}",
-        nfc: "\u{1D527}",
-        nfd: "\u{1D527}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D528}",
-        nfc: "\u{1D528}",
-        nfd: "\u{1D528}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D529}",
-        nfc: "\u{1D529}",
-        nfd: "\u{1D529}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D52A}",
-        nfc: "\u{1D52A}",
-        nfd: "\u{1D52A}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D52B}",
-        nfc: "\u{1D52B}",
-        nfd: "\u{1D52B}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D52C}",
-        nfc: "\u{1D52C}",
-        nfd: "\u{1D52C}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D52D}",
-        nfc: "\u{1D52D}",
-        nfd: "\u{1D52D}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D52E}",
-        nfc: "\u{1D52E}",
-        nfd: "\u{1D52E}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D52F}",
-        nfc: "\u{1D52F}",
-        nfd: "\u{1D52F}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D530}",
-        nfc: "\u{1D530}",
-        nfd: "\u{1D530}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D531}",
-        nfc: "\u{1D531}",
-        nfd: "\u{1D531}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D532}",
-        nfc: "\u{1D532}",
-        nfd: "\u{1D532}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D533}",
-        nfc: "\u{1D533}",
-        nfd: "\u{1D533}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D534}",
-        nfc: "\u{1D534}",
-        nfd: "\u{1D534}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D535}",
-        nfc: "\u{1D535}",
-        nfd: "\u{1D535}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D536}",
-        nfc: "\u{1D536}",
-        nfd: "\u{1D536}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D537}",
-        nfc: "\u{1D537}",
-        nfd: "\u{1D537}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D538}",
-        nfc: "\u{1D538}",
-        nfd: "\u{1D538}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D539}",
-        nfc: "\u{1D539}",
-        nfd: "\u{1D539}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D53B}",
-        nfc: "\u{1D53B}",
-        nfd: "\u{1D53B}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D53C}",
-        nfc: "\u{1D53C}",
-        nfd: "\u{1D53C}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D53D}",
-        nfc: "\u{1D53D}",
-        nfd: "\u{1D53D}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D53E}",
-        nfc: "\u{1D53E}",
-        nfd: "\u{1D53E}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D540}",
-        nfc: "\u{1D540}",
-        nfd: "\u{1D540}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D541}",
-        nfc: "\u{1D541}",
-        nfd: "\u{1D541}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D542}",
-        nfc: "\u{1D542}",
-        nfd: "\u{1D542}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D543}",
-        nfc: "\u{1D543}",
-        nfd: "\u{1D543}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D544}",
-        nfc: "\u{1D544}",
-        nfd: "\u{1D544}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D546}",
-        nfc: "\u{1D546}",
-        nfd: "\u{1D546}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D54A}",
-        nfc: "\u{1D54A}",
-        nfd: "\u{1D54A}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D54B}",
-        nfc: "\u{1D54B}",
-        nfd: "\u{1D54B}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D54C}",
-        nfc: "\u{1D54C}",
-        nfd: "\u{1D54C}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D54D}",
-        nfc: "\u{1D54D}",
-        nfd: "\u{1D54D}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D54E}",
-        nfc: "\u{1D54E}",
-        nfd: "\u{1D54E}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D54F}",
-        nfc: "\u{1D54F}",
-        nfd: "\u{1D54F}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D550}",
-        nfc: "\u{1D550}",
-        nfd: "\u{1D550}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D552}",
-        nfc: "\u{1D552}",
-        nfd: "\u{1D552}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D553}",
-        nfc: "\u{1D553}",
-        nfd: "\u{1D553}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D554}",
-        nfc: "\u{1D554}",
-        nfd: "\u{1D554}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D555}",
-        nfc: "\u{1D555}",
-        nfd: "\u{1D555}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D556}",
-        nfc: "\u{1D556}",
-        nfd: "\u{1D556}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D557}",
-        nfc: "\u{1D557}",
-        nfd: "\u{1D557}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D558}",
-        nfc: "\u{1D558}",
-        nfd: "\u{1D558}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D559}",
-        nfc: "\u{1D559}",
-        nfd: "\u{1D559}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D55A}",
-        nfc: "\u{1D55A}",
-        nfd: "\u{1D55A}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D55B}",
-        nfc: "\u{1D55B}",
-        nfd: "\u{1D55B}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D55C}",
-        nfc: "\u{1D55C}",
-        nfd: "\u{1D55C}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D55D}",
-        nfc: "\u{1D55D}",
-        nfd: "\u{1D55D}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D55E}",
-        nfc: "\u{1D55E}",
-        nfd: "\u{1D55E}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D55F}",
-        nfc: "\u{1D55F}",
-        nfd: "\u{1D55F}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D560}",
-        nfc: "\u{1D560}",
-        nfd: "\u{1D560}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D561}",
-        nfc: "\u{1D561}",
-        nfd: "\u{1D561}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D562}",
-        nfc: "\u{1D562}",
-        nfd: "\u{1D562}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D563}",
-        nfc: "\u{1D563}",
-        nfd: "\u{1D563}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D564}",
-        nfc: "\u{1D564}",
-        nfd: "\u{1D564}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D565}",
-        nfc: "\u{1D565}",
-        nfd: "\u{1D565}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D566}",
-        nfc: "\u{1D566}",
-        nfd: "\u{1D566}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D567}",
-        nfc: "\u{1D567}",
-        nfd: "\u{1D567}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D568}",
-        nfc: "\u{1D568}",
-        nfd: "\u{1D568}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D569}",
-        nfc: "\u{1D569}",
-        nfd: "\u{1D569}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D56A}",
-        nfc: "\u{1D56A}",
-        nfd: "\u{1D56A}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D56B}",
-        nfc: "\u{1D56B}",
-        nfd: "\u{1D56B}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D56C}",
-        nfc: "\u{1D56C}",
-        nfd: "\u{1D56C}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D56D}",
-        nfc: "\u{1D56D}",
-        nfd: "\u{1D56D}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D56E}",
-        nfc: "\u{1D56E}",
-        nfd: "\u{1D56E}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D56F}",
-        nfc: "\u{1D56F}",
-        nfd: "\u{1D56F}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D570}",
-        nfc: "\u{1D570}",
-        nfd: "\u{1D570}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D571}",
-        nfc: "\u{1D571}",
-        nfd: "\u{1D571}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D572}",
-        nfc: "\u{1D572}",
-        nfd: "\u{1D572}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D573}",
-        nfc: "\u{1D573}",
-        nfd: "\u{1D573}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D574}",
-        nfc: "\u{1D574}",
-        nfd: "\u{1D574}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D575}",
-        nfc: "\u{1D575}",
-        nfd: "\u{1D575}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D576}",
-        nfc: "\u{1D576}",
-        nfd: "\u{1D576}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D577}",
-        nfc: "\u{1D577}",
-        nfd: "\u{1D577}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D578}",
-        nfc: "\u{1D578}",
-        nfd: "\u{1D578}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D579}",
-        nfc: "\u{1D579}",
-        nfd: "\u{1D579}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D57A}",
-        nfc: "\u{1D57A}",
-        nfd: "\u{1D57A}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D57B}",
-        nfc: "\u{1D57B}",
-        nfd: "\u{1D57B}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D57C}",
-        nfc: "\u{1D57C}",
-        nfd: "\u{1D57C}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D57D}",
-        nfc: "\u{1D57D}",
-        nfd: "\u{1D57D}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D57E}",
-        nfc: "\u{1D57E}",
-        nfd: "\u{1D57E}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D57F}",
-        nfc: "\u{1D57F}",
-        nfd: "\u{1D57F}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D580}",
-        nfc: "\u{1D580}",
-        nfd: "\u{1D580}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D581}",
-        nfc: "\u{1D581}",
-        nfd: "\u{1D581}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D582}",
-        nfc: "\u{1D582}",
-        nfd: "\u{1D582}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D583}",
-        nfc: "\u{1D583}",
-        nfd: "\u{1D583}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D584}",
-        nfc: "\u{1D584}",
-        nfd: "\u{1D584}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D585}",
-        nfc: "\u{1D585}",
-        nfd: "\u{1D585}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D586}",
-        nfc: "\u{1D586}",
-        nfd: "\u{1D586}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D587}",
-        nfc: "\u{1D587}",
-        nfd: "\u{1D587}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D588}",
-        nfc: "\u{1D588}",
-        nfd: "\u{1D588}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D589}",
-        nfc: "\u{1D589}",
-        nfd: "\u{1D589}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D58A}",
-        nfc: "\u{1D58A}",
-        nfd: "\u{1D58A}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D58B}",
-        nfc: "\u{1D58B}",
-        nfd: "\u{1D58B}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D58C}",
-        nfc: "\u{1D58C}",
-        nfd: "\u{1D58C}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D58D}",
-        nfc: "\u{1D58D}",
-        nfd: "\u{1D58D}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D58E}",
-        nfc: "\u{1D58E}",
-        nfd: "\u{1D58E}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D58F}",
-        nfc: "\u{1D58F}",
-        nfd: "\u{1D58F}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D590}",
-        nfc: "\u{1D590}",
-        nfd: "\u{1D590}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D591}",
-        nfc: "\u{1D591}",
-        nfd: "\u{1D591}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D592}",
-        nfc: "\u{1D592}",
-        nfd: "\u{1D592}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D593}",
-        nfc: "\u{1D593}",
-        nfd: "\u{1D593}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D594}",
-        nfc: "\u{1D594}",
-        nfd: "\u{1D594}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D595}",
-        nfc: "\u{1D595}",
-        nfd: "\u{1D595}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D596}",
-        nfc: "\u{1D596}",
-        nfd: "\u{1D596}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D597}",
-        nfc: "\u{1D597}",
-        nfd: "\u{1D597}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D598}",
-        nfc: "\u{1D598}",
-        nfd: "\u{1D598}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D599}",
-        nfc: "\u{1D599}",
-        nfd: "\u{1D599}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D59A}",
-        nfc: "\u{1D59A}",
-        nfd: "\u{1D59A}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D59B}",
-        nfc: "\u{1D59B}",
-        nfd: "\u{1D59B}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D59C}",
-        nfc: "\u{1D59C}",
-        nfd: "\u{1D59C}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D59D}",
-        nfc: "\u{1D59D}",
-        nfd: "\u{1D59D}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D59E}",
-        nfc: "\u{1D59E}",
-        nfd: "\u{1D59E}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D59F}",
-        nfc: "\u{1D59F}",
-        nfd: "\u{1D59F}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A0}",
-        nfc: "\u{1D5A0}",
-        nfd: "\u{1D5A0}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A1}",
-        nfc: "\u{1D5A1}",
-        nfd: "\u{1D5A1}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A2}",
-        nfc: "\u{1D5A2}",
-        nfd: "\u{1D5A2}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A3}",
-        nfc: "\u{1D5A3}",
-        nfd: "\u{1D5A3}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A4}",
-        nfc: "\u{1D5A4}",
-        nfd: "\u{1D5A4}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A5}",
-        nfc: "\u{1D5A5}",
-        nfd: "\u{1D5A5}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A6}",
-        nfc: "\u{1D5A6}",
-        nfd: "\u{1D5A6}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A7}",
-        nfc: "\u{1D5A7}",
-        nfd: "\u{1D5A7}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A8}",
-        nfc: "\u{1D5A8}",
-        nfd: "\u{1D5A8}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D5A9}",
-        nfc: "\u{1D5A9}",
-        nfd: "\u{1D5A9}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5AA}",
-        nfc: "\u{1D5AA}",
-        nfd: "\u{1D5AA}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D5AB}",
-        nfc: "\u{1D5AB}",
-        nfd: "\u{1D5AB}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D5AC}",
-        nfc: "\u{1D5AC}",
-        nfd: "\u{1D5AC}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D5AD}",
-        nfc: "\u{1D5AD}",
-        nfd: "\u{1D5AD}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D5AE}",
-        nfc: "\u{1D5AE}",
-        nfd: "\u{1D5AE}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D5AF}",
-        nfc: "\u{1D5AF}",
-        nfd: "\u{1D5AF}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B0}",
-        nfc: "\u{1D5B0}",
-        nfd: "\u{1D5B0}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B1}",
-        nfc: "\u{1D5B1}",
-        nfd: "\u{1D5B1}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B2}",
-        nfc: "\u{1D5B2}",
-        nfd: "\u{1D5B2}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B3}",
-        nfc: "\u{1D5B3}",
-        nfd: "\u{1D5B3}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B4}",
-        nfc: "\u{1D5B4}",
-        nfd: "\u{1D5B4}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B5}",
-        nfc: "\u{1D5B5}",
-        nfd: "\u{1D5B5}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B6}",
-        nfc: "\u{1D5B6}",
-        nfd: "\u{1D5B6}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B7}",
-        nfc: "\u{1D5B7}",
-        nfd: "\u{1D5B7}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B8}",
-        nfc: "\u{1D5B8}",
-        nfd: "\u{1D5B8}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D5B9}",
-        nfc: "\u{1D5B9}",
-        nfd: "\u{1D5B9}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5BA}",
-        nfc: "\u{1D5BA}",
-        nfd: "\u{1D5BA}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D5BB}",
-        nfc: "\u{1D5BB}",
-        nfd: "\u{1D5BB}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D5BC}",
-        nfc: "\u{1D5BC}",
-        nfd: "\u{1D5BC}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D5BD}",
-        nfc: "\u{1D5BD}",
-        nfd: "\u{1D5BD}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D5BE}",
-        nfc: "\u{1D5BE}",
-        nfd: "\u{1D5BE}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D5BF}",
-        nfc: "\u{1D5BF}",
-        nfd: "\u{1D5BF}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C0}",
-        nfc: "\u{1D5C0}",
-        nfd: "\u{1D5C0}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C1}",
-        nfc: "\u{1D5C1}",
-        nfd: "\u{1D5C1}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C2}",
-        nfc: "\u{1D5C2}",
-        nfd: "\u{1D5C2}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C3}",
-        nfc: "\u{1D5C3}",
-        nfd: "\u{1D5C3}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C4}",
-        nfc: "\u{1D5C4}",
-        nfd: "\u{1D5C4}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C5}",
-        nfc: "\u{1D5C5}",
-        nfd: "\u{1D5C5}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C6}",
-        nfc: "\u{1D5C6}",
-        nfd: "\u{1D5C6}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C7}",
-        nfc: "\u{1D5C7}",
-        nfd: "\u{1D5C7}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C8}",
-        nfc: "\u{1D5C8}",
-        nfd: "\u{1D5C8}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D5C9}",
-        nfc: "\u{1D5C9}",
-        nfd: "\u{1D5C9}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D5CA}",
-        nfc: "\u{1D5CA}",
-        nfd: "\u{1D5CA}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D5CB}",
-        nfc: "\u{1D5CB}",
-        nfd: "\u{1D5CB}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D5CC}",
-        nfc: "\u{1D5CC}",
-        nfd: "\u{1D5CC}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D5CD}",
-        nfc: "\u{1D5CD}",
-        nfd: "\u{1D5CD}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D5CE}",
-        nfc: "\u{1D5CE}",
-        nfd: "\u{1D5CE}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D5CF}",
-        nfc: "\u{1D5CF}",
-        nfd: "\u{1D5CF}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D0}",
-        nfc: "\u{1D5D0}",
-        nfd: "\u{1D5D0}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D1}",
-        nfc: "\u{1D5D1}",
-        nfd: "\u{1D5D1}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D2}",
-        nfc: "\u{1D5D2}",
-        nfd: "\u{1D5D2}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D3}",
-        nfc: "\u{1D5D3}",
-        nfd: "\u{1D5D3}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D4}",
-        nfc: "\u{1D5D4}",
-        nfd: "\u{1D5D4}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D5}",
-        nfc: "\u{1D5D5}",
-        nfd: "\u{1D5D5}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D6}",
-        nfc: "\u{1D5D6}",
-        nfd: "\u{1D5D6}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D7}",
-        nfc: "\u{1D5D7}",
-        nfd: "\u{1D5D7}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D8}",
-        nfc: "\u{1D5D8}",
-        nfd: "\u{1D5D8}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D5D9}",
-        nfc: "\u{1D5D9}",
-        nfd: "\u{1D5D9}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D5DA}",
-        nfc: "\u{1D5DA}",
-        nfd: "\u{1D5DA}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D5DB}",
-        nfc: "\u{1D5DB}",
-        nfd: "\u{1D5DB}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D5DC}",
-        nfc: "\u{1D5DC}",
-        nfd: "\u{1D5DC}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D5DD}",
-        nfc: "\u{1D5DD}",
-        nfd: "\u{1D5DD}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5DE}",
-        nfc: "\u{1D5DE}",
-        nfd: "\u{1D5DE}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D5DF}",
-        nfc: "\u{1D5DF}",
-        nfd: "\u{1D5DF}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E0}",
-        nfc: "\u{1D5E0}",
-        nfd: "\u{1D5E0}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E1}",
-        nfc: "\u{1D5E1}",
-        nfd: "\u{1D5E1}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E2}",
-        nfc: "\u{1D5E2}",
-        nfd: "\u{1D5E2}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E3}",
-        nfc: "\u{1D5E3}",
-        nfd: "\u{1D5E3}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E4}",
-        nfc: "\u{1D5E4}",
-        nfd: "\u{1D5E4}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E5}",
-        nfc: "\u{1D5E5}",
-        nfd: "\u{1D5E5}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E6}",
-        nfc: "\u{1D5E6}",
-        nfd: "\u{1D5E6}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E7}",
-        nfc: "\u{1D5E7}",
-        nfd: "\u{1D5E7}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E8}",
-        nfc: "\u{1D5E8}",
-        nfd: "\u{1D5E8}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D5E9}",
-        nfc: "\u{1D5E9}",
-        nfd: "\u{1D5E9}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D5EA}",
-        nfc: "\u{1D5EA}",
-        nfd: "\u{1D5EA}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D5EB}",
-        nfc: "\u{1D5EB}",
-        nfd: "\u{1D5EB}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D5EC}",
-        nfc: "\u{1D5EC}",
-        nfd: "\u{1D5EC}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D5ED}",
-        nfc: "\u{1D5ED}",
-        nfd: "\u{1D5ED}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5EE}",
-        nfc: "\u{1D5EE}",
-        nfd: "\u{1D5EE}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D5EF}",
-        nfc: "\u{1D5EF}",
-        nfd: "\u{1D5EF}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F0}",
-        nfc: "\u{1D5F0}",
-        nfd: "\u{1D5F0}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F1}",
-        nfc: "\u{1D5F1}",
-        nfd: "\u{1D5F1}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F2}",
-        nfc: "\u{1D5F2}",
-        nfd: "\u{1D5F2}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F3}",
-        nfc: "\u{1D5F3}",
-        nfd: "\u{1D5F3}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F4}",
-        nfc: "\u{1D5F4}",
-        nfd: "\u{1D5F4}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F5}",
-        nfc: "\u{1D5F5}",
-        nfd: "\u{1D5F5}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F6}",
-        nfc: "\u{1D5F6}",
-        nfd: "\u{1D5F6}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F7}",
-        nfc: "\u{1D5F7}",
-        nfd: "\u{1D5F7}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F8}",
-        nfc: "\u{1D5F8}",
-        nfd: "\u{1D5F8}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D5F9}",
-        nfc: "\u{1D5F9}",
-        nfd: "\u{1D5F9}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D5FA}",
-        nfc: "\u{1D5FA}",
-        nfd: "\u{1D5FA}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D5FB}",
-        nfc: "\u{1D5FB}",
-        nfd: "\u{1D5FB}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D5FC}",
-        nfc: "\u{1D5FC}",
-        nfd: "\u{1D5FC}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D5FD}",
-        nfc: "\u{1D5FD}",
-        nfd: "\u{1D5FD}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D5FE}",
-        nfc: "\u{1D5FE}",
-        nfd: "\u{1D5FE}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D5FF}",
-        nfc: "\u{1D5FF}",
-        nfd: "\u{1D5FF}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D600}",
-        nfc: "\u{1D600}",
-        nfd: "\u{1D600}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D601}",
-        nfc: "\u{1D601}",
-        nfd: "\u{1D601}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D602}",
-        nfc: "\u{1D602}",
-        nfd: "\u{1D602}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D603}",
-        nfc: "\u{1D603}",
-        nfd: "\u{1D603}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D604}",
-        nfc: "\u{1D604}",
-        nfd: "\u{1D604}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D605}",
-        nfc: "\u{1D605}",
-        nfd: "\u{1D605}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D606}",
-        nfc: "\u{1D606}",
-        nfd: "\u{1D606}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D607}",
-        nfc: "\u{1D607}",
-        nfd: "\u{1D607}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D608}",
-        nfc: "\u{1D608}",
-        nfd: "\u{1D608}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D609}",
-        nfc: "\u{1D609}",
-        nfd: "\u{1D609}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D60A}",
-        nfc: "\u{1D60A}",
-        nfd: "\u{1D60A}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D60B}",
-        nfc: "\u{1D60B}",
-        nfd: "\u{1D60B}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D60C}",
-        nfc: "\u{1D60C}",
-        nfd: "\u{1D60C}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D60D}",
-        nfc: "\u{1D60D}",
-        nfd: "\u{1D60D}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D60E}",
-        nfc: "\u{1D60E}",
-        nfd: "\u{1D60E}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D60F}",
-        nfc: "\u{1D60F}",
-        nfd: "\u{1D60F}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D610}",
-        nfc: "\u{1D610}",
-        nfd: "\u{1D610}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D611}",
-        nfc: "\u{1D611}",
-        nfd: "\u{1D611}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D612}",
-        nfc: "\u{1D612}",
-        nfd: "\u{1D612}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D613}",
-        nfc: "\u{1D613}",
-        nfd: "\u{1D613}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D614}",
-        nfc: "\u{1D614}",
-        nfd: "\u{1D614}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D615}",
-        nfc: "\u{1D615}",
-        nfd: "\u{1D615}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D616}",
-        nfc: "\u{1D616}",
-        nfd: "\u{1D616}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D617}",
-        nfc: "\u{1D617}",
-        nfd: "\u{1D617}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D618}",
-        nfc: "\u{1D618}",
-        nfd: "\u{1D618}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D619}",
-        nfc: "\u{1D619}",
-        nfd: "\u{1D619}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D61A}",
-        nfc: "\u{1D61A}",
-        nfd: "\u{1D61A}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D61B}",
-        nfc: "\u{1D61B}",
-        nfd: "\u{1D61B}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D61C}",
-        nfc: "\u{1D61C}",
-        nfd: "\u{1D61C}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D61D}",
-        nfc: "\u{1D61D}",
-        nfd: "\u{1D61D}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D61E}",
-        nfc: "\u{1D61E}",
-        nfd: "\u{1D61E}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D61F}",
-        nfc: "\u{1D61F}",
-        nfd: "\u{1D61F}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D620}",
-        nfc: "\u{1D620}",
-        nfd: "\u{1D620}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D621}",
-        nfc: "\u{1D621}",
-        nfd: "\u{1D621}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D622}",
-        nfc: "\u{1D622}",
-        nfd: "\u{1D622}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D623}",
-        nfc: "\u{1D623}",
-        nfd: "\u{1D623}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D624}",
-        nfc: "\u{1D624}",
-        nfd: "\u{1D624}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D625}",
-        nfc: "\u{1D625}",
-        nfd: "\u{1D625}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D626}",
-        nfc: "\u{1D626}",
-        nfd: "\u{1D626}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D627}",
-        nfc: "\u{1D627}",
-        nfd: "\u{1D627}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D628}",
-        nfc: "\u{1D628}",
-        nfd: "\u{1D628}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D629}",
-        nfc: "\u{1D629}",
-        nfd: "\u{1D629}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D62A}",
-        nfc: "\u{1D62A}",
-        nfd: "\u{1D62A}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D62B}",
-        nfc: "\u{1D62B}",
-        nfd: "\u{1D62B}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D62C}",
-        nfc: "\u{1D62C}",
-        nfd: "\u{1D62C}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D62D}",
-        nfc: "\u{1D62D}",
-        nfd: "\u{1D62D}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D62E}",
-        nfc: "\u{1D62E}",
-        nfd: "\u{1D62E}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D62F}",
-        nfc: "\u{1D62F}",
-        nfd: "\u{1D62F}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D630}",
-        nfc: "\u{1D630}",
-        nfd: "\u{1D630}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D631}",
-        nfc: "\u{1D631}",
-        nfd: "\u{1D631}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D632}",
-        nfc: "\u{1D632}",
-        nfd: "\u{1D632}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D633}",
-        nfc: "\u{1D633}",
-        nfd: "\u{1D633}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D634}",
-        nfc: "\u{1D634}",
-        nfd: "\u{1D634}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D635}",
-        nfc: "\u{1D635}",
-        nfd: "\u{1D635}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D636}",
-        nfc: "\u{1D636}",
-        nfd: "\u{1D636}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D637}",
-        nfc: "\u{1D637}",
-        nfd: "\u{1D637}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D638}",
-        nfc: "\u{1D638}",
-        nfd: "\u{1D638}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D639}",
-        nfc: "\u{1D639}",
-        nfd: "\u{1D639}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D63A}",
-        nfc: "\u{1D63A}",
-        nfd: "\u{1D63A}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D63B}",
-        nfc: "\u{1D63B}",
-        nfd: "\u{1D63B}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D63C}",
-        nfc: "\u{1D63C}",
-        nfd: "\u{1D63C}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D63D}",
-        nfc: "\u{1D63D}",
-        nfd: "\u{1D63D}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D63E}",
-        nfc: "\u{1D63E}",
-        nfd: "\u{1D63E}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D63F}",
-        nfc: "\u{1D63F}",
-        nfd: "\u{1D63F}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D640}",
-        nfc: "\u{1D640}",
-        nfd: "\u{1D640}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D641}",
-        nfc: "\u{1D641}",
-        nfd: "\u{1D641}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D642}",
-        nfc: "\u{1D642}",
-        nfd: "\u{1D642}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D643}",
-        nfc: "\u{1D643}",
-        nfd: "\u{1D643}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D644}",
-        nfc: "\u{1D644}",
-        nfd: "\u{1D644}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D645}",
-        nfc: "\u{1D645}",
-        nfd: "\u{1D645}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D646}",
-        nfc: "\u{1D646}",
-        nfd: "\u{1D646}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D647}",
-        nfc: "\u{1D647}",
-        nfd: "\u{1D647}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D648}",
-        nfc: "\u{1D648}",
-        nfd: "\u{1D648}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D649}",
-        nfc: "\u{1D649}",
-        nfd: "\u{1D649}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D64A}",
-        nfc: "\u{1D64A}",
-        nfd: "\u{1D64A}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D64B}",
-        nfc: "\u{1D64B}",
-        nfd: "\u{1D64B}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D64C}",
-        nfc: "\u{1D64C}",
-        nfd: "\u{1D64C}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D64D}",
-        nfc: "\u{1D64D}",
-        nfd: "\u{1D64D}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D64E}",
-        nfc: "\u{1D64E}",
-        nfd: "\u{1D64E}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D64F}",
-        nfc: "\u{1D64F}",
-        nfd: "\u{1D64F}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D650}",
-        nfc: "\u{1D650}",
-        nfd: "\u{1D650}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D651}",
-        nfc: "\u{1D651}",
-        nfd: "\u{1D651}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D652}",
-        nfc: "\u{1D652}",
-        nfd: "\u{1D652}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D653}",
-        nfc: "\u{1D653}",
-        nfd: "\u{1D653}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D654}",
-        nfc: "\u{1D654}",
-        nfd: "\u{1D654}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D655}",
-        nfc: "\u{1D655}",
-        nfd: "\u{1D655}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D656}",
-        nfc: "\u{1D656}",
-        nfd: "\u{1D656}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D657}",
-        nfc: "\u{1D657}",
-        nfd: "\u{1D657}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D658}",
-        nfc: "\u{1D658}",
-        nfd: "\u{1D658}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D659}",
-        nfc: "\u{1D659}",
-        nfd: "\u{1D659}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D65A}",
-        nfc: "\u{1D65A}",
-        nfd: "\u{1D65A}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D65B}",
-        nfc: "\u{1D65B}",
-        nfd: "\u{1D65B}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D65C}",
-        nfc: "\u{1D65C}",
-        nfd: "\u{1D65C}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D65D}",
-        nfc: "\u{1D65D}",
-        nfd: "\u{1D65D}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D65E}",
-        nfc: "\u{1D65E}",
-        nfd: "\u{1D65E}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D65F}",
-        nfc: "\u{1D65F}",
-        nfd: "\u{1D65F}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D660}",
-        nfc: "\u{1D660}",
-        nfd: "\u{1D660}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D661}",
-        nfc: "\u{1D661}",
-        nfd: "\u{1D661}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D662}",
-        nfc: "\u{1D662}",
-        nfd: "\u{1D662}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D663}",
-        nfc: "\u{1D663}",
-        nfd: "\u{1D663}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D664}",
-        nfc: "\u{1D664}",
-        nfd: "\u{1D664}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D665}",
-        nfc: "\u{1D665}",
-        nfd: "\u{1D665}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D666}",
-        nfc: "\u{1D666}",
-        nfd: "\u{1D666}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D667}",
-        nfc: "\u{1D667}",
-        nfd: "\u{1D667}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D668}",
-        nfc: "\u{1D668}",
-        nfd: "\u{1D668}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D669}",
-        nfc: "\u{1D669}",
-        nfd: "\u{1D669}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D66A}",
-        nfc: "\u{1D66A}",
-        nfd: "\u{1D66A}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D66B}",
-        nfc: "\u{1D66B}",
-        nfd: "\u{1D66B}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D66C}",
-        nfc: "\u{1D66C}",
-        nfd: "\u{1D66C}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D66D}",
-        nfc: "\u{1D66D}",
-        nfd: "\u{1D66D}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D66E}",
-        nfc: "\u{1D66E}",
-        nfd: "\u{1D66E}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D66F}",
-        nfc: "\u{1D66F}",
-        nfd: "\u{1D66F}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D670}",
-        nfc: "\u{1D670}",
-        nfd: "\u{1D670}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1D671}",
-        nfc: "\u{1D671}",
-        nfd: "\u{1D671}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1D672}",
-        nfc: "\u{1D672}",
-        nfd: "\u{1D672}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1D673}",
-        nfc: "\u{1D673}",
-        nfd: "\u{1D673}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1D674}",
-        nfc: "\u{1D674}",
-        nfd: "\u{1D674}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1D675}",
-        nfc: "\u{1D675}",
-        nfd: "\u{1D675}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1D676}",
-        nfc: "\u{1D676}",
-        nfd: "\u{1D676}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1D677}",
-        nfc: "\u{1D677}",
-        nfd: "\u{1D677}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1D678}",
-        nfc: "\u{1D678}",
-        nfd: "\u{1D678}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1D679}",
-        nfc: "\u{1D679}",
-        nfd: "\u{1D679}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1D67A}",
-        nfc: "\u{1D67A}",
-        nfd: "\u{1D67A}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1D67B}",
-        nfc: "\u{1D67B}",
-        nfd: "\u{1D67B}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1D67C}",
-        nfc: "\u{1D67C}",
-        nfd: "\u{1D67C}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1D67D}",
-        nfc: "\u{1D67D}",
-        nfd: "\u{1D67D}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1D67E}",
-        nfc: "\u{1D67E}",
-        nfd: "\u{1D67E}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1D67F}",
-        nfc: "\u{1D67F}",
-        nfd: "\u{1D67F}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1D680}",
-        nfc: "\u{1D680}",
-        nfd: "\u{1D680}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1D681}",
-        nfc: "\u{1D681}",
-        nfd: "\u{1D681}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1D682}",
-        nfc: "\u{1D682}",
-        nfd: "\u{1D682}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1D683}",
-        nfc: "\u{1D683}",
-        nfd: "\u{1D683}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1D684}",
-        nfc: "\u{1D684}",
-        nfd: "\u{1D684}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1D685}",
-        nfc: "\u{1D685}",
-        nfd: "\u{1D685}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1D686}",
-        nfc: "\u{1D686}",
-        nfd: "\u{1D686}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1D687}",
-        nfc: "\u{1D687}",
-        nfd: "\u{1D687}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1D688}",
-        nfc: "\u{1D688}",
-        nfd: "\u{1D688}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1D689}",
-        nfc: "\u{1D689}",
-        nfd: "\u{1D689}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1D68A}",
-        nfc: "\u{1D68A}",
-        nfd: "\u{1D68A}",
-        nfkc: "\u{0061}",
-        nfkd: "\u{0061}",
-    },
-    NormalizationTest {
-        source: "\u{1D68B}",
-        nfc: "\u{1D68B}",
-        nfd: "\u{1D68B}",
-        nfkc: "\u{0062}",
-        nfkd: "\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{1D68C}",
-        nfc: "\u{1D68C}",
-        nfd: "\u{1D68C}",
-        nfkc: "\u{0063}",
-        nfkd: "\u{0063}",
-    },
-    NormalizationTest {
-        source: "\u{1D68D}",
-        nfc: "\u{1D68D}",
-        nfd: "\u{1D68D}",
-        nfkc: "\u{0064}",
-        nfkd: "\u{0064}",
-    },
-    NormalizationTest {
-        source: "\u{1D68E}",
-        nfc: "\u{1D68E}",
-        nfd: "\u{1D68E}",
-        nfkc: "\u{0065}",
-        nfkd: "\u{0065}",
-    },
-    NormalizationTest {
-        source: "\u{1D68F}",
-        nfc: "\u{1D68F}",
-        nfd: "\u{1D68F}",
-        nfkc: "\u{0066}",
-        nfkd: "\u{0066}",
-    },
-    NormalizationTest {
-        source: "\u{1D690}",
-        nfc: "\u{1D690}",
-        nfd: "\u{1D690}",
-        nfkc: "\u{0067}",
-        nfkd: "\u{0067}",
-    },
-    NormalizationTest {
-        source: "\u{1D691}",
-        nfc: "\u{1D691}",
-        nfd: "\u{1D691}",
-        nfkc: "\u{0068}",
-        nfkd: "\u{0068}",
-    },
-    NormalizationTest {
-        source: "\u{1D692}",
-        nfc: "\u{1D692}",
-        nfd: "\u{1D692}",
-        nfkc: "\u{0069}",
-        nfkd: "\u{0069}",
-    },
-    NormalizationTest {
-        source: "\u{1D693}",
-        nfc: "\u{1D693}",
-        nfd: "\u{1D693}",
-        nfkc: "\u{006A}",
-        nfkd: "\u{006A}",
-    },
-    NormalizationTest {
-        source: "\u{1D694}",
-        nfc: "\u{1D694}",
-        nfd: "\u{1D694}",
-        nfkc: "\u{006B}",
-        nfkd: "\u{006B}",
-    },
-    NormalizationTest {
-        source: "\u{1D695}",
-        nfc: "\u{1D695}",
-        nfd: "\u{1D695}",
-        nfkc: "\u{006C}",
-        nfkd: "\u{006C}",
-    },
-    NormalizationTest {
-        source: "\u{1D696}",
-        nfc: "\u{1D696}",
-        nfd: "\u{1D696}",
-        nfkc: "\u{006D}",
-        nfkd: "\u{006D}",
-    },
-    NormalizationTest {
-        source: "\u{1D697}",
-        nfc: "\u{1D697}",
-        nfd: "\u{1D697}",
-        nfkc: "\u{006E}",
-        nfkd: "\u{006E}",
-    },
-    NormalizationTest {
-        source: "\u{1D698}",
-        nfc: "\u{1D698}",
-        nfd: "\u{1D698}",
-        nfkc: "\u{006F}",
-        nfkd: "\u{006F}",
-    },
-    NormalizationTest {
-        source: "\u{1D699}",
-        nfc: "\u{1D699}",
-        nfd: "\u{1D699}",
-        nfkc: "\u{0070}",
-        nfkd: "\u{0070}",
-    },
-    NormalizationTest {
-        source: "\u{1D69A}",
-        nfc: "\u{1D69A}",
-        nfd: "\u{1D69A}",
-        nfkc: "\u{0071}",
-        nfkd: "\u{0071}",
-    },
-    NormalizationTest {
-        source: "\u{1D69B}",
-        nfc: "\u{1D69B}",
-        nfd: "\u{1D69B}",
-        nfkc: "\u{0072}",
-        nfkd: "\u{0072}",
-    },
-    NormalizationTest {
-        source: "\u{1D69C}",
-        nfc: "\u{1D69C}",
-        nfd: "\u{1D69C}",
-        nfkc: "\u{0073}",
-        nfkd: "\u{0073}",
-    },
-    NormalizationTest {
-        source: "\u{1D69D}",
-        nfc: "\u{1D69D}",
-        nfd: "\u{1D69D}",
-        nfkc: "\u{0074}",
-        nfkd: "\u{0074}",
-    },
-    NormalizationTest {
-        source: "\u{1D69E}",
-        nfc: "\u{1D69E}",
-        nfd: "\u{1D69E}",
-        nfkc: "\u{0075}",
-        nfkd: "\u{0075}",
-    },
-    NormalizationTest {
-        source: "\u{1D69F}",
-        nfc: "\u{1D69F}",
-        nfd: "\u{1D69F}",
-        nfkc: "\u{0076}",
-        nfkd: "\u{0076}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A0}",
-        nfc: "\u{1D6A0}",
-        nfd: "\u{1D6A0}",
-        nfkc: "\u{0077}",
-        nfkd: "\u{0077}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A1}",
-        nfc: "\u{1D6A1}",
-        nfd: "\u{1D6A1}",
-        nfkc: "\u{0078}",
-        nfkd: "\u{0078}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A2}",
-        nfc: "\u{1D6A2}",
-        nfd: "\u{1D6A2}",
-        nfkc: "\u{0079}",
-        nfkd: "\u{0079}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A3}",
-        nfc: "\u{1D6A3}",
-        nfd: "\u{1D6A3}",
-        nfkc: "\u{007A}",
-        nfkd: "\u{007A}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A4}",
-        nfc: "\u{1D6A4}",
-        nfd: "\u{1D6A4}",
-        nfkc: "\u{0131}",
-        nfkd: "\u{0131}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A5}",
-        nfc: "\u{1D6A5}",
-        nfd: "\u{1D6A5}",
-        nfkc: "\u{0237}",
-        nfkd: "\u{0237}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A8}",
-        nfc: "\u{1D6A8}",
-        nfd: "\u{1D6A8}",
-        nfkc: "\u{0391}",
-        nfkd: "\u{0391}",
-    },
-    NormalizationTest {
-        source: "\u{1D6A9}",
-        nfc: "\u{1D6A9}",
-        nfd: "\u{1D6A9}",
-        nfkc: "\u{0392}",
-        nfkd: "\u{0392}",
-    },
-    NormalizationTest {
-        source: "\u{1D6AA}",
-        nfc: "\u{1D6AA}",
-        nfd: "\u{1D6AA}",
-        nfkc: "\u{0393}",
-        nfkd: "\u{0393}",
-    },
-    NormalizationTest {
-        source: "\u{1D6AB}",
-        nfc: "\u{1D6AB}",
-        nfd: "\u{1D6AB}",
-        nfkc: "\u{0394}",
-        nfkd: "\u{0394}",
-    },
-    NormalizationTest {
-        source: "\u{1D6AC}",
-        nfc: "\u{1D6AC}",
-        nfd: "\u{1D6AC}",
-        nfkc: "\u{0395}",
-        nfkd: "\u{0395}",
-    },
-    NormalizationTest {
-        source: "\u{1D6AD}",
-        nfc: "\u{1D6AD}",
-        nfd: "\u{1D6AD}",
-        nfkc: "\u{0396}",
-        nfkd: "\u{0396}",
-    },
-    NormalizationTest {
-        source: "\u{1D6AE}",
-        nfc: "\u{1D6AE}",
-        nfd: "\u{1D6AE}",
-        nfkc: "\u{0397}",
-        nfkd: "\u{0397}",
-    },
-    NormalizationTest {
-        source: "\u{1D6AF}",
-        nfc: "\u{1D6AF}",
-        nfd: "\u{1D6AF}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B0}",
-        nfc: "\u{1D6B0}",
-        nfd: "\u{1D6B0}",
-        nfkc: "\u{0399}",
-        nfkd: "\u{0399}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B1}",
-        nfc: "\u{1D6B1}",
-        nfd: "\u{1D6B1}",
-        nfkc: "\u{039A}",
-        nfkd: "\u{039A}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B2}",
-        nfc: "\u{1D6B2}",
-        nfd: "\u{1D6B2}",
-        nfkc: "\u{039B}",
-        nfkd: "\u{039B}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B3}",
-        nfc: "\u{1D6B3}",
-        nfd: "\u{1D6B3}",
-        nfkc: "\u{039C}",
-        nfkd: "\u{039C}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B4}",
-        nfc: "\u{1D6B4}",
-        nfd: "\u{1D6B4}",
-        nfkc: "\u{039D}",
-        nfkd: "\u{039D}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B5}",
-        nfc: "\u{1D6B5}",
-        nfd: "\u{1D6B5}",
-        nfkc: "\u{039E}",
-        nfkd: "\u{039E}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B6}",
-        nfc: "\u{1D6B6}",
-        nfd: "\u{1D6B6}",
-        nfkc: "\u{039F}",
-        nfkd: "\u{039F}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B7}",
-        nfc: "\u{1D6B7}",
-        nfd: "\u{1D6B7}",
-        nfkc: "\u{03A0}",
-        nfkd: "\u{03A0}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B8}",
-        nfc: "\u{1D6B8}",
-        nfd: "\u{1D6B8}",
-        nfkc: "\u{03A1}",
-        nfkd: "\u{03A1}",
-    },
-    NormalizationTest {
-        source: "\u{1D6B9}",
-        nfc: "\u{1D6B9}",
-        nfd: "\u{1D6B9}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D6BA}",
-        nfc: "\u{1D6BA}",
-        nfd: "\u{1D6BA}",
-        nfkc: "\u{03A3}",
-        nfkd: "\u{03A3}",
-    },
-    NormalizationTest {
-        source: "\u{1D6BB}",
-        nfc: "\u{1D6BB}",
-        nfd: "\u{1D6BB}",
-        nfkc: "\u{03A4}",
-        nfkd: "\u{03A4}",
-    },
-    NormalizationTest {
-        source: "\u{1D6BC}",
-        nfc: "\u{1D6BC}",
-        nfd: "\u{1D6BC}",
-        nfkc: "\u{03A5}",
-        nfkd: "\u{03A5}",
-    },
-    NormalizationTest {
-        source: "\u{1D6BD}",
-        nfc: "\u{1D6BD}",
-        nfd: "\u{1D6BD}",
-        nfkc: "\u{03A6}",
-        nfkd: "\u{03A6}",
-    },
-    NormalizationTest {
-        source: "\u{1D6BE}",
-        nfc: "\u{1D6BE}",
-        nfd: "\u{1D6BE}",
-        nfkc: "\u{03A7}",
-        nfkd: "\u{03A7}",
-    },
-    NormalizationTest {
-        source: "\u{1D6BF}",
-        nfc: "\u{1D6BF}",
-        nfd: "\u{1D6BF}",
-        nfkc: "\u{03A8}",
-        nfkd: "\u{03A8}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C0}",
-        nfc: "\u{1D6C0}",
-        nfd: "\u{1D6C0}",
-        nfkc: "\u{03A9}",
-        nfkd: "\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C1}",
-        nfc: "\u{1D6C1}",
-        nfd: "\u{1D6C1}",
-        nfkc: "\u{2207}",
-        nfkd: "\u{2207}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C2}",
-        nfc: "\u{1D6C2}",
-        nfd: "\u{1D6C2}",
-        nfkc: "\u{03B1}",
-        nfkd: "\u{03B1}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C3}",
-        nfc: "\u{1D6C3}",
-        nfd: "\u{1D6C3}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C4}",
-        nfc: "\u{1D6C4}",
-        nfd: "\u{1D6C4}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C5}",
-        nfc: "\u{1D6C5}",
-        nfd: "\u{1D6C5}",
-        nfkc: "\u{03B4}",
-        nfkd: "\u{03B4}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C6}",
-        nfc: "\u{1D6C6}",
-        nfd: "\u{1D6C6}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C7}",
-        nfc: "\u{1D6C7}",
-        nfd: "\u{1D6C7}",
-        nfkc: "\u{03B6}",
-        nfkd: "\u{03B6}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C8}",
-        nfc: "\u{1D6C8}",
-        nfd: "\u{1D6C8}",
-        nfkc: "\u{03B7}",
-        nfkd: "\u{03B7}",
-    },
-    NormalizationTest {
-        source: "\u{1D6C9}",
-        nfc: "\u{1D6C9}",
-        nfd: "\u{1D6C9}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D6CA}",
-        nfc: "\u{1D6CA}",
-        nfd: "\u{1D6CA}",
-        nfkc: "\u{03B9}",
-        nfkd: "\u{03B9}",
-    },
-    NormalizationTest {
-        source: "\u{1D6CB}",
-        nfc: "\u{1D6CB}",
-        nfd: "\u{1D6CB}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D6CC}",
-        nfc: "\u{1D6CC}",
-        nfd: "\u{1D6CC}",
-        nfkc: "\u{03BB}",
-        nfkd: "\u{03BB}",
-    },
-    NormalizationTest {
-        source: "\u{1D6CD}",
-        nfc: "\u{1D6CD}",
-        nfd: "\u{1D6CD}",
-        nfkc: "\u{03BC}",
-        nfkd: "\u{03BC}",
-    },
-    NormalizationTest {
-        source: "\u{1D6CE}",
-        nfc: "\u{1D6CE}",
-        nfd: "\u{1D6CE}",
-        nfkc: "\u{03BD}",
-        nfkd: "\u{03BD}",
-    },
-    NormalizationTest {
-        source: "\u{1D6CF}",
-        nfc: "\u{1D6CF}",
-        nfd: "\u{1D6CF}",
-        nfkc: "\u{03BE}",
-        nfkd: "\u{03BE}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D0}",
-        nfc: "\u{1D6D0}",
-        nfd: "\u{1D6D0}",
-        nfkc: "\u{03BF}",
-        nfkd: "\u{03BF}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D1}",
-        nfc: "\u{1D6D1}",
-        nfd: "\u{1D6D1}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D2}",
-        nfc: "\u{1D6D2}",
-        nfd: "\u{1D6D2}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D3}",
-        nfc: "\u{1D6D3}",
-        nfd: "\u{1D6D3}",
-        nfkc: "\u{03C2}",
-        nfkd: "\u{03C2}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D4}",
-        nfc: "\u{1D6D4}",
-        nfd: "\u{1D6D4}",
-        nfkc: "\u{03C3}",
-        nfkd: "\u{03C3}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D5}",
-        nfc: "\u{1D6D5}",
-        nfd: "\u{1D6D5}",
-        nfkc: "\u{03C4}",
-        nfkd: "\u{03C4}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D6}",
-        nfc: "\u{1D6D6}",
-        nfd: "\u{1D6D6}",
-        nfkc: "\u{03C5}",
-        nfkd: "\u{03C5}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D7}",
-        nfc: "\u{1D6D7}",
-        nfd: "\u{1D6D7}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D8}",
-        nfc: "\u{1D6D8}",
-        nfd: "\u{1D6D8}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D6D9}",
-        nfc: "\u{1D6D9}",
-        nfd: "\u{1D6D9}",
-        nfkc: "\u{03C8}",
-        nfkd: "\u{03C8}",
-    },
-    NormalizationTest {
-        source: "\u{1D6DA}",
-        nfc: "\u{1D6DA}",
-        nfd: "\u{1D6DA}",
-        nfkc: "\u{03C9}",
-        nfkd: "\u{03C9}",
-    },
-    NormalizationTest {
-        source: "\u{1D6DB}",
-        nfc: "\u{1D6DB}",
-        nfd: "\u{1D6DB}",
-        nfkc: "\u{2202}",
-        nfkd: "\u{2202}",
-    },
-    NormalizationTest {
-        source: "\u{1D6DC}",
-        nfc: "\u{1D6DC}",
-        nfd: "\u{1D6DC}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D6DD}",
-        nfc: "\u{1D6DD}",
-        nfd: "\u{1D6DD}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D6DE}",
-        nfc: "\u{1D6DE}",
-        nfd: "\u{1D6DE}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D6DF}",
-        nfc: "\u{1D6DF}",
-        nfd: "\u{1D6DF}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E0}",
-        nfc: "\u{1D6E0}",
-        nfd: "\u{1D6E0}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E1}",
-        nfc: "\u{1D6E1}",
-        nfd: "\u{1D6E1}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E2}",
-        nfc: "\u{1D6E2}",
-        nfd: "\u{1D6E2}",
-        nfkc: "\u{0391}",
-        nfkd: "\u{0391}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E3}",
-        nfc: "\u{1D6E3}",
-        nfd: "\u{1D6E3}",
-        nfkc: "\u{0392}",
-        nfkd: "\u{0392}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E4}",
-        nfc: "\u{1D6E4}",
-        nfd: "\u{1D6E4}",
-        nfkc: "\u{0393}",
-        nfkd: "\u{0393}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E5}",
-        nfc: "\u{1D6E5}",
-        nfd: "\u{1D6E5}",
-        nfkc: "\u{0394}",
-        nfkd: "\u{0394}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E6}",
-        nfc: "\u{1D6E6}",
-        nfd: "\u{1D6E6}",
-        nfkc: "\u{0395}",
-        nfkd: "\u{0395}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E7}",
-        nfc: "\u{1D6E7}",
-        nfd: "\u{1D6E7}",
-        nfkc: "\u{0396}",
-        nfkd: "\u{0396}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E8}",
-        nfc: "\u{1D6E8}",
-        nfd: "\u{1D6E8}",
-        nfkc: "\u{0397}",
-        nfkd: "\u{0397}",
-    },
-    NormalizationTest {
-        source: "\u{1D6E9}",
-        nfc: "\u{1D6E9}",
-        nfd: "\u{1D6E9}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D6EA}",
-        nfc: "\u{1D6EA}",
-        nfd: "\u{1D6EA}",
-        nfkc: "\u{0399}",
-        nfkd: "\u{0399}",
-    },
-    NormalizationTest {
-        source: "\u{1D6EB}",
-        nfc: "\u{1D6EB}",
-        nfd: "\u{1D6EB}",
-        nfkc: "\u{039A}",
-        nfkd: "\u{039A}",
-    },
-    NormalizationTest {
-        source: "\u{1D6EC}",
-        nfc: "\u{1D6EC}",
-        nfd: "\u{1D6EC}",
-        nfkc: "\u{039B}",
-        nfkd: "\u{039B}",
-    },
-    NormalizationTest {
-        source: "\u{1D6ED}",
-        nfc: "\u{1D6ED}",
-        nfd: "\u{1D6ED}",
-        nfkc: "\u{039C}",
-        nfkd: "\u{039C}",
-    },
-    NormalizationTest {
-        source: "\u{1D6EE}",
-        nfc: "\u{1D6EE}",
-        nfd: "\u{1D6EE}",
-        nfkc: "\u{039D}",
-        nfkd: "\u{039D}",
-    },
-    NormalizationTest {
-        source: "\u{1D6EF}",
-        nfc: "\u{1D6EF}",
-        nfd: "\u{1D6EF}",
-        nfkc: "\u{039E}",
-        nfkd: "\u{039E}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F0}",
-        nfc: "\u{1D6F0}",
-        nfd: "\u{1D6F0}",
-        nfkc: "\u{039F}",
-        nfkd: "\u{039F}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F1}",
-        nfc: "\u{1D6F1}",
-        nfd: "\u{1D6F1}",
-        nfkc: "\u{03A0}",
-        nfkd: "\u{03A0}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F2}",
-        nfc: "\u{1D6F2}",
-        nfd: "\u{1D6F2}",
-        nfkc: "\u{03A1}",
-        nfkd: "\u{03A1}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F3}",
-        nfc: "\u{1D6F3}",
-        nfd: "\u{1D6F3}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F4}",
-        nfc: "\u{1D6F4}",
-        nfd: "\u{1D6F4}",
-        nfkc: "\u{03A3}",
-        nfkd: "\u{03A3}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F5}",
-        nfc: "\u{1D6F5}",
-        nfd: "\u{1D6F5}",
-        nfkc: "\u{03A4}",
-        nfkd: "\u{03A4}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F6}",
-        nfc: "\u{1D6F6}",
-        nfd: "\u{1D6F6}",
-        nfkc: "\u{03A5}",
-        nfkd: "\u{03A5}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F7}",
-        nfc: "\u{1D6F7}",
-        nfd: "\u{1D6F7}",
-        nfkc: "\u{03A6}",
-        nfkd: "\u{03A6}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F8}",
-        nfc: "\u{1D6F8}",
-        nfd: "\u{1D6F8}",
-        nfkc: "\u{03A7}",
-        nfkd: "\u{03A7}",
-    },
-    NormalizationTest {
-        source: "\u{1D6F9}",
-        nfc: "\u{1D6F9}",
-        nfd: "\u{1D6F9}",
-        nfkc: "\u{03A8}",
-        nfkd: "\u{03A8}",
-    },
-    NormalizationTest {
-        source: "\u{1D6FA}",
-        nfc: "\u{1D6FA}",
-        nfd: "\u{1D6FA}",
-        nfkc: "\u{03A9}",
-        nfkd: "\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{1D6FB}",
-        nfc: "\u{1D6FB}",
-        nfd: "\u{1D6FB}",
-        nfkc: "\u{2207}",
-        nfkd: "\u{2207}",
-    },
-    NormalizationTest {
-        source: "\u{1D6FC}",
-        nfc: "\u{1D6FC}",
-        nfd: "\u{1D6FC}",
-        nfkc: "\u{03B1}",
-        nfkd: "\u{03B1}",
-    },
-    NormalizationTest {
-        source: "\u{1D6FD}",
-        nfc: "\u{1D6FD}",
-        nfd: "\u{1D6FD}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D6FE}",
-        nfc: "\u{1D6FE}",
-        nfd: "\u{1D6FE}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D6FF}",
-        nfc: "\u{1D6FF}",
-        nfd: "\u{1D6FF}",
-        nfkc: "\u{03B4}",
-        nfkd: "\u{03B4}",
-    },
-    NormalizationTest {
-        source: "\u{1D700}",
-        nfc: "\u{1D700}",
-        nfd: "\u{1D700}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D701}",
-        nfc: "\u{1D701}",
-        nfd: "\u{1D701}",
-        nfkc: "\u{03B6}",
-        nfkd: "\u{03B6}",
-    },
-    NormalizationTest {
-        source: "\u{1D702}",
-        nfc: "\u{1D702}",
-        nfd: "\u{1D702}",
-        nfkc: "\u{03B7}",
-        nfkd: "\u{03B7}",
-    },
-    NormalizationTest {
-        source: "\u{1D703}",
-        nfc: "\u{1D703}",
-        nfd: "\u{1D703}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D704}",
-        nfc: "\u{1D704}",
-        nfd: "\u{1D704}",
-        nfkc: "\u{03B9}",
-        nfkd: "\u{03B9}",
-    },
-    NormalizationTest {
-        source: "\u{1D705}",
-        nfc: "\u{1D705}",
-        nfd: "\u{1D705}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D706}",
-        nfc: "\u{1D706}",
-        nfd: "\u{1D706}",
-        nfkc: "\u{03BB}",
-        nfkd: "\u{03BB}",
-    },
-    NormalizationTest {
-        source: "\u{1D707}",
-        nfc: "\u{1D707}",
-        nfd: "\u{1D707}",
-        nfkc: "\u{03BC}",
-        nfkd: "\u{03BC}",
-    },
-    NormalizationTest {
-        source: "\u{1D708}",
-        nfc: "\u{1D708}",
-        nfd: "\u{1D708}",
-        nfkc: "\u{03BD}",
-        nfkd: "\u{03BD}",
-    },
-    NormalizationTest {
-        source: "\u{1D709}",
-        nfc: "\u{1D709}",
-        nfd: "\u{1D709}",
-        nfkc: "\u{03BE}",
-        nfkd: "\u{03BE}",
-    },
-    NormalizationTest {
-        source: "\u{1D70A}",
-        nfc: "\u{1D70A}",
-        nfd: "\u{1D70A}",
-        nfkc: "\u{03BF}",
-        nfkd: "\u{03BF}",
-    },
-    NormalizationTest {
-        source: "\u{1D70B}",
-        nfc: "\u{1D70B}",
-        nfd: "\u{1D70B}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D70C}",
-        nfc: "\u{1D70C}",
-        nfd: "\u{1D70C}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D70D}",
-        nfc: "\u{1D70D}",
-        nfd: "\u{1D70D}",
-        nfkc: "\u{03C2}",
-        nfkd: "\u{03C2}",
-    },
-    NormalizationTest {
-        source: "\u{1D70E}",
-        nfc: "\u{1D70E}",
-        nfd: "\u{1D70E}",
-        nfkc: "\u{03C3}",
-        nfkd: "\u{03C3}",
-    },
-    NormalizationTest {
-        source: "\u{1D70F}",
-        nfc: "\u{1D70F}",
-        nfd: "\u{1D70F}",
-        nfkc: "\u{03C4}",
-        nfkd: "\u{03C4}",
-    },
-    NormalizationTest {
-        source: "\u{1D710}",
-        nfc: "\u{1D710}",
-        nfd: "\u{1D710}",
-        nfkc: "\u{03C5}",
-        nfkd: "\u{03C5}",
-    },
-    NormalizationTest {
-        source: "\u{1D711}",
-        nfc: "\u{1D711}",
-        nfd: "\u{1D711}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D712}",
-        nfc: "\u{1D712}",
-        nfd: "\u{1D712}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D713}",
-        nfc: "\u{1D713}",
-        nfd: "\u{1D713}",
-        nfkc: "\u{03C8}",
-        nfkd: "\u{03C8}",
-    },
-    NormalizationTest {
-        source: "\u{1D714}",
-        nfc: "\u{1D714}",
-        nfd: "\u{1D714}",
-        nfkc: "\u{03C9}",
-        nfkd: "\u{03C9}",
-    },
-    NormalizationTest {
-        source: "\u{1D715}",
-        nfc: "\u{1D715}",
-        nfd: "\u{1D715}",
-        nfkc: "\u{2202}",
-        nfkd: "\u{2202}",
-    },
-    NormalizationTest {
-        source: "\u{1D716}",
-        nfc: "\u{1D716}",
-        nfd: "\u{1D716}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D717}",
-        nfc: "\u{1D717}",
-        nfd: "\u{1D717}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D718}",
-        nfc: "\u{1D718}",
-        nfd: "\u{1D718}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D719}",
-        nfc: "\u{1D719}",
-        nfd: "\u{1D719}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D71A}",
-        nfc: "\u{1D71A}",
-        nfd: "\u{1D71A}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D71B}",
-        nfc: "\u{1D71B}",
-        nfd: "\u{1D71B}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D71C}",
-        nfc: "\u{1D71C}",
-        nfd: "\u{1D71C}",
-        nfkc: "\u{0391}",
-        nfkd: "\u{0391}",
-    },
-    NormalizationTest {
-        source: "\u{1D71D}",
-        nfc: "\u{1D71D}",
-        nfd: "\u{1D71D}",
-        nfkc: "\u{0392}",
-        nfkd: "\u{0392}",
-    },
-    NormalizationTest {
-        source: "\u{1D71E}",
-        nfc: "\u{1D71E}",
-        nfd: "\u{1D71E}",
-        nfkc: "\u{0393}",
-        nfkd: "\u{0393}",
-    },
-    NormalizationTest {
-        source: "\u{1D71F}",
-        nfc: "\u{1D71F}",
-        nfd: "\u{1D71F}",
-        nfkc: "\u{0394}",
-        nfkd: "\u{0394}",
-    },
-    NormalizationTest {
-        source: "\u{1D720}",
-        nfc: "\u{1D720}",
-        nfd: "\u{1D720}",
-        nfkc: "\u{0395}",
-        nfkd: "\u{0395}",
-    },
-    NormalizationTest {
-        source: "\u{1D721}",
-        nfc: "\u{1D721}",
-        nfd: "\u{1D721}",
-        nfkc: "\u{0396}",
-        nfkd: "\u{0396}",
-    },
-    NormalizationTest {
-        source: "\u{1D722}",
-        nfc: "\u{1D722}",
-        nfd: "\u{1D722}",
-        nfkc: "\u{0397}",
-        nfkd: "\u{0397}",
-    },
-    NormalizationTest {
-        source: "\u{1D723}",
-        nfc: "\u{1D723}",
-        nfd: "\u{1D723}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D724}",
-        nfc: "\u{1D724}",
-        nfd: "\u{1D724}",
-        nfkc: "\u{0399}",
-        nfkd: "\u{0399}",
-    },
-    NormalizationTest {
-        source: "\u{1D725}",
-        nfc: "\u{1D725}",
-        nfd: "\u{1D725}",
-        nfkc: "\u{039A}",
-        nfkd: "\u{039A}",
-    },
-    NormalizationTest {
-        source: "\u{1D726}",
-        nfc: "\u{1D726}",
-        nfd: "\u{1D726}",
-        nfkc: "\u{039B}",
-        nfkd: "\u{039B}",
-    },
-    NormalizationTest {
-        source: "\u{1D727}",
-        nfc: "\u{1D727}",
-        nfd: "\u{1D727}",
-        nfkc: "\u{039C}",
-        nfkd: "\u{039C}",
-    },
-    NormalizationTest {
-        source: "\u{1D728}",
-        nfc: "\u{1D728}",
-        nfd: "\u{1D728}",
-        nfkc: "\u{039D}",
-        nfkd: "\u{039D}",
-    },
-    NormalizationTest {
-        source: "\u{1D729}",
-        nfc: "\u{1D729}",
-        nfd: "\u{1D729}",
-        nfkc: "\u{039E}",
-        nfkd: "\u{039E}",
-    },
-    NormalizationTest {
-        source: "\u{1D72A}",
-        nfc: "\u{1D72A}",
-        nfd: "\u{1D72A}",
-        nfkc: "\u{039F}",
-        nfkd: "\u{039F}",
-    },
-    NormalizationTest {
-        source: "\u{1D72B}",
-        nfc: "\u{1D72B}",
-        nfd: "\u{1D72B}",
-        nfkc: "\u{03A0}",
-        nfkd: "\u{03A0}",
-    },
-    NormalizationTest {
-        source: "\u{1D72C}",
-        nfc: "\u{1D72C}",
-        nfd: "\u{1D72C}",
-        nfkc: "\u{03A1}",
-        nfkd: "\u{03A1}",
-    },
-    NormalizationTest {
-        source: "\u{1D72D}",
-        nfc: "\u{1D72D}",
-        nfd: "\u{1D72D}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D72E}",
-        nfc: "\u{1D72E}",
-        nfd: "\u{1D72E}",
-        nfkc: "\u{03A3}",
-        nfkd: "\u{03A3}",
-    },
-    NormalizationTest {
-        source: "\u{1D72F}",
-        nfc: "\u{1D72F}",
-        nfd: "\u{1D72F}",
-        nfkc: "\u{03A4}",
-        nfkd: "\u{03A4}",
-    },
-    NormalizationTest {
-        source: "\u{1D730}",
-        nfc: "\u{1D730}",
-        nfd: "\u{1D730}",
-        nfkc: "\u{03A5}",
-        nfkd: "\u{03A5}",
-    },
-    NormalizationTest {
-        source: "\u{1D731}",
-        nfc: "\u{1D731}",
-        nfd: "\u{1D731}",
-        nfkc: "\u{03A6}",
-        nfkd: "\u{03A6}",
-    },
-    NormalizationTest {
-        source: "\u{1D732}",
-        nfc: "\u{1D732}",
-        nfd: "\u{1D732}",
-        nfkc: "\u{03A7}",
-        nfkd: "\u{03A7}",
-    },
-    NormalizationTest {
-        source: "\u{1D733}",
-        nfc: "\u{1D733}",
-        nfd: "\u{1D733}",
-        nfkc: "\u{03A8}",
-        nfkd: "\u{03A8}",
-    },
-    NormalizationTest {
-        source: "\u{1D734}",
-        nfc: "\u{1D734}",
-        nfd: "\u{1D734}",
-        nfkc: "\u{03A9}",
-        nfkd: "\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{1D735}",
-        nfc: "\u{1D735}",
-        nfd: "\u{1D735}",
-        nfkc: "\u{2207}",
-        nfkd: "\u{2207}",
-    },
-    NormalizationTest {
-        source: "\u{1D736}",
-        nfc: "\u{1D736}",
-        nfd: "\u{1D736}",
-        nfkc: "\u{03B1}",
-        nfkd: "\u{03B1}",
-    },
-    NormalizationTest {
-        source: "\u{1D737}",
-        nfc: "\u{1D737}",
-        nfd: "\u{1D737}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D738}",
-        nfc: "\u{1D738}",
-        nfd: "\u{1D738}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D739}",
-        nfc: "\u{1D739}",
-        nfd: "\u{1D739}",
-        nfkc: "\u{03B4}",
-        nfkd: "\u{03B4}",
-    },
-    NormalizationTest {
-        source: "\u{1D73A}",
-        nfc: "\u{1D73A}",
-        nfd: "\u{1D73A}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D73B}",
-        nfc: "\u{1D73B}",
-        nfd: "\u{1D73B}",
-        nfkc: "\u{03B6}",
-        nfkd: "\u{03B6}",
-    },
-    NormalizationTest {
-        source: "\u{1D73C}",
-        nfc: "\u{1D73C}",
-        nfd: "\u{1D73C}",
-        nfkc: "\u{03B7}",
-        nfkd: "\u{03B7}",
-    },
-    NormalizationTest {
-        source: "\u{1D73D}",
-        nfc: "\u{1D73D}",
-        nfd: "\u{1D73D}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D73E}",
-        nfc: "\u{1D73E}",
-        nfd: "\u{1D73E}",
-        nfkc: "\u{03B9}",
-        nfkd: "\u{03B9}",
-    },
-    NormalizationTest {
-        source: "\u{1D73F}",
-        nfc: "\u{1D73F}",
-        nfd: "\u{1D73F}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D740}",
-        nfc: "\u{1D740}",
-        nfd: "\u{1D740}",
-        nfkc: "\u{03BB}",
-        nfkd: "\u{03BB}",
-    },
-    NormalizationTest {
-        source: "\u{1D741}",
-        nfc: "\u{1D741}",
-        nfd: "\u{1D741}",
-        nfkc: "\u{03BC}",
-        nfkd: "\u{03BC}",
-    },
-    NormalizationTest {
-        source: "\u{1D742}",
-        nfc: "\u{1D742}",
-        nfd: "\u{1D742}",
-        nfkc: "\u{03BD}",
-        nfkd: "\u{03BD}",
-    },
-    NormalizationTest {
-        source: "\u{1D743}",
-        nfc: "\u{1D743}",
-        nfd: "\u{1D743}",
-        nfkc: "\u{03BE}",
-        nfkd: "\u{03BE}",
-    },
-    NormalizationTest {
-        source: "\u{1D744}",
-        nfc: "\u{1D744}",
-        nfd: "\u{1D744}",
-        nfkc: "\u{03BF}",
-        nfkd: "\u{03BF}",
-    },
-    NormalizationTest {
-        source: "\u{1D745}",
-        nfc: "\u{1D745}",
-        nfd: "\u{1D745}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D746}",
-        nfc: "\u{1D746}",
-        nfd: "\u{1D746}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D747}",
-        nfc: "\u{1D747}",
-        nfd: "\u{1D747}",
-        nfkc: "\u{03C2}",
-        nfkd: "\u{03C2}",
-    },
-    NormalizationTest {
-        source: "\u{1D748}",
-        nfc: "\u{1D748}",
-        nfd: "\u{1D748}",
-        nfkc: "\u{03C3}",
-        nfkd: "\u{03C3}",
-    },
-    NormalizationTest {
-        source: "\u{1D749}",
-        nfc: "\u{1D749}",
-        nfd: "\u{1D749}",
-        nfkc: "\u{03C4}",
-        nfkd: "\u{03C4}",
-    },
-    NormalizationTest {
-        source: "\u{1D74A}",
-        nfc: "\u{1D74A}",
-        nfd: "\u{1D74A}",
-        nfkc: "\u{03C5}",
-        nfkd: "\u{03C5}",
-    },
-    NormalizationTest {
-        source: "\u{1D74B}",
-        nfc: "\u{1D74B}",
-        nfd: "\u{1D74B}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D74C}",
-        nfc: "\u{1D74C}",
-        nfd: "\u{1D74C}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D74D}",
-        nfc: "\u{1D74D}",
-        nfd: "\u{1D74D}",
-        nfkc: "\u{03C8}",
-        nfkd: "\u{03C8}",
-    },
-    NormalizationTest {
-        source: "\u{1D74E}",
-        nfc: "\u{1D74E}",
-        nfd: "\u{1D74E}",
-        nfkc: "\u{03C9}",
-        nfkd: "\u{03C9}",
-    },
-    NormalizationTest {
-        source: "\u{1D74F}",
-        nfc: "\u{1D74F}",
-        nfd: "\u{1D74F}",
-        nfkc: "\u{2202}",
-        nfkd: "\u{2202}",
-    },
-    NormalizationTest {
-        source: "\u{1D750}",
-        nfc: "\u{1D750}",
-        nfd: "\u{1D750}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D751}",
-        nfc: "\u{1D751}",
-        nfd: "\u{1D751}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D752}",
-        nfc: "\u{1D752}",
-        nfd: "\u{1D752}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D753}",
-        nfc: "\u{1D753}",
-        nfd: "\u{1D753}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D754}",
-        nfc: "\u{1D754}",
-        nfd: "\u{1D754}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D755}",
-        nfc: "\u{1D755}",
-        nfd: "\u{1D755}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D756}",
-        nfc: "\u{1D756}",
-        nfd: "\u{1D756}",
-        nfkc: "\u{0391}",
-        nfkd: "\u{0391}",
-    },
-    NormalizationTest {
-        source: "\u{1D757}",
-        nfc: "\u{1D757}",
-        nfd: "\u{1D757}",
-        nfkc: "\u{0392}",
-        nfkd: "\u{0392}",
-    },
-    NormalizationTest {
-        source: "\u{1D758}",
-        nfc: "\u{1D758}",
-        nfd: "\u{1D758}",
-        nfkc: "\u{0393}",
-        nfkd: "\u{0393}",
-    },
-    NormalizationTest {
-        source: "\u{1D759}",
-        nfc: "\u{1D759}",
-        nfd: "\u{1D759}",
-        nfkc: "\u{0394}",
-        nfkd: "\u{0394}",
-    },
-    NormalizationTest {
-        source: "\u{1D75A}",
-        nfc: "\u{1D75A}",
-        nfd: "\u{1D75A}",
-        nfkc: "\u{0395}",
-        nfkd: "\u{0395}",
-    },
-    NormalizationTest {
-        source: "\u{1D75B}",
-        nfc: "\u{1D75B}",
-        nfd: "\u{1D75B}",
-        nfkc: "\u{0396}",
-        nfkd: "\u{0396}",
-    },
-    NormalizationTest {
-        source: "\u{1D75C}",
-        nfc: "\u{1D75C}",
-        nfd: "\u{1D75C}",
-        nfkc: "\u{0397}",
-        nfkd: "\u{0397}",
-    },
-    NormalizationTest {
-        source: "\u{1D75D}",
-        nfc: "\u{1D75D}",
-        nfd: "\u{1D75D}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D75E}",
-        nfc: "\u{1D75E}",
-        nfd: "\u{1D75E}",
-        nfkc: "\u{0399}",
-        nfkd: "\u{0399}",
-    },
-    NormalizationTest {
-        source: "\u{1D75F}",
-        nfc: "\u{1D75F}",
-        nfd: "\u{1D75F}",
-        nfkc: "\u{039A}",
-        nfkd: "\u{039A}",
-    },
-    NormalizationTest {
-        source: "\u{1D760}",
-        nfc: "\u{1D760}",
-        nfd: "\u{1D760}",
-        nfkc: "\u{039B}",
-        nfkd: "\u{039B}",
-    },
-    NormalizationTest {
-        source: "\u{1D761}",
-        nfc: "\u{1D761}",
-        nfd: "\u{1D761}",
-        nfkc: "\u{039C}",
-        nfkd: "\u{039C}",
-    },
-    NormalizationTest {
-        source: "\u{1D762}",
-        nfc: "\u{1D762}",
-        nfd: "\u{1D762}",
-        nfkc: "\u{039D}",
-        nfkd: "\u{039D}",
-    },
-    NormalizationTest {
-        source: "\u{1D763}",
-        nfc: "\u{1D763}",
-        nfd: "\u{1D763}",
-        nfkc: "\u{039E}",
-        nfkd: "\u{039E}",
-    },
-    NormalizationTest {
-        source: "\u{1D764}",
-        nfc: "\u{1D764}",
-        nfd: "\u{1D764}",
-        nfkc: "\u{039F}",
-        nfkd: "\u{039F}",
-    },
-    NormalizationTest {
-        source: "\u{1D765}",
-        nfc: "\u{1D765}",
-        nfd: "\u{1D765}",
-        nfkc: "\u{03A0}",
-        nfkd: "\u{03A0}",
-    },
-    NormalizationTest {
-        source: "\u{1D766}",
-        nfc: "\u{1D766}",
-        nfd: "\u{1D766}",
-        nfkc: "\u{03A1}",
-        nfkd: "\u{03A1}",
-    },
-    NormalizationTest {
-        source: "\u{1D767}",
-        nfc: "\u{1D767}",
-        nfd: "\u{1D767}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D768}",
-        nfc: "\u{1D768}",
-        nfd: "\u{1D768}",
-        nfkc: "\u{03A3}",
-        nfkd: "\u{03A3}",
-    },
-    NormalizationTest {
-        source: "\u{1D769}",
-        nfc: "\u{1D769}",
-        nfd: "\u{1D769}",
-        nfkc: "\u{03A4}",
-        nfkd: "\u{03A4}",
-    },
-    NormalizationTest {
-        source: "\u{1D76A}",
-        nfc: "\u{1D76A}",
-        nfd: "\u{1D76A}",
-        nfkc: "\u{03A5}",
-        nfkd: "\u{03A5}",
-    },
-    NormalizationTest {
-        source: "\u{1D76B}",
-        nfc: "\u{1D76B}",
-        nfd: "\u{1D76B}",
-        nfkc: "\u{03A6}",
-        nfkd: "\u{03A6}",
-    },
-    NormalizationTest {
-        source: "\u{1D76C}",
-        nfc: "\u{1D76C}",
-        nfd: "\u{1D76C}",
-        nfkc: "\u{03A7}",
-        nfkd: "\u{03A7}",
-    },
-    NormalizationTest {
-        source: "\u{1D76D}",
-        nfc: "\u{1D76D}",
-        nfd: "\u{1D76D}",
-        nfkc: "\u{03A8}",
-        nfkd: "\u{03A8}",
-    },
-    NormalizationTest {
-        source: "\u{1D76E}",
-        nfc: "\u{1D76E}",
-        nfd: "\u{1D76E}",
-        nfkc: "\u{03A9}",
-        nfkd: "\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{1D76F}",
-        nfc: "\u{1D76F}",
-        nfd: "\u{1D76F}",
-        nfkc: "\u{2207}",
-        nfkd: "\u{2207}",
-    },
-    NormalizationTest {
-        source: "\u{1D770}",
-        nfc: "\u{1D770}",
-        nfd: "\u{1D770}",
-        nfkc: "\u{03B1}",
-        nfkd: "\u{03B1}",
-    },
-    NormalizationTest {
-        source: "\u{1D771}",
-        nfc: "\u{1D771}",
-        nfd: "\u{1D771}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D772}",
-        nfc: "\u{1D772}",
-        nfd: "\u{1D772}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D773}",
-        nfc: "\u{1D773}",
-        nfd: "\u{1D773}",
-        nfkc: "\u{03B4}",
-        nfkd: "\u{03B4}",
-    },
-    NormalizationTest {
-        source: "\u{1D774}",
-        nfc: "\u{1D774}",
-        nfd: "\u{1D774}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D775}",
-        nfc: "\u{1D775}",
-        nfd: "\u{1D775}",
-        nfkc: "\u{03B6}",
-        nfkd: "\u{03B6}",
-    },
-    NormalizationTest {
-        source: "\u{1D776}",
-        nfc: "\u{1D776}",
-        nfd: "\u{1D776}",
-        nfkc: "\u{03B7}",
-        nfkd: "\u{03B7}",
-    },
-    NormalizationTest {
-        source: "\u{1D777}",
-        nfc: "\u{1D777}",
-        nfd: "\u{1D777}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D778}",
-        nfc: "\u{1D778}",
-        nfd: "\u{1D778}",
-        nfkc: "\u{03B9}",
-        nfkd: "\u{03B9}",
-    },
-    NormalizationTest {
-        source: "\u{1D779}",
-        nfc: "\u{1D779}",
-        nfd: "\u{1D779}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D77A}",
-        nfc: "\u{1D77A}",
-        nfd: "\u{1D77A}",
-        nfkc: "\u{03BB}",
-        nfkd: "\u{03BB}",
-    },
-    NormalizationTest {
-        source: "\u{1D77B}",
-        nfc: "\u{1D77B}",
-        nfd: "\u{1D77B}",
-        nfkc: "\u{03BC}",
-        nfkd: "\u{03BC}",
-    },
-    NormalizationTest {
-        source: "\u{1D77C}",
-        nfc: "\u{1D77C}",
-        nfd: "\u{1D77C}",
-        nfkc: "\u{03BD}",
-        nfkd: "\u{03BD}",
-    },
-    NormalizationTest {
-        source: "\u{1D77D}",
-        nfc: "\u{1D77D}",
-        nfd: "\u{1D77D}",
-        nfkc: "\u{03BE}",
-        nfkd: "\u{03BE}",
-    },
-    NormalizationTest {
-        source: "\u{1D77E}",
-        nfc: "\u{1D77E}",
-        nfd: "\u{1D77E}",
-        nfkc: "\u{03BF}",
-        nfkd: "\u{03BF}",
-    },
-    NormalizationTest {
-        source: "\u{1D77F}",
-        nfc: "\u{1D77F}",
-        nfd: "\u{1D77F}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D780}",
-        nfc: "\u{1D780}",
-        nfd: "\u{1D780}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D781}",
-        nfc: "\u{1D781}",
-        nfd: "\u{1D781}",
-        nfkc: "\u{03C2}",
-        nfkd: "\u{03C2}",
-    },
-    NormalizationTest {
-        source: "\u{1D782}",
-        nfc: "\u{1D782}",
-        nfd: "\u{1D782}",
-        nfkc: "\u{03C3}",
-        nfkd: "\u{03C3}",
-    },
-    NormalizationTest {
-        source: "\u{1D783}",
-        nfc: "\u{1D783}",
-        nfd: "\u{1D783}",
-        nfkc: "\u{03C4}",
-        nfkd: "\u{03C4}",
-    },
-    NormalizationTest {
-        source: "\u{1D784}",
-        nfc: "\u{1D784}",
-        nfd: "\u{1D784}",
-        nfkc: "\u{03C5}",
-        nfkd: "\u{03C5}",
-    },
-    NormalizationTest {
-        source: "\u{1D785}",
-        nfc: "\u{1D785}",
-        nfd: "\u{1D785}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D786}",
-        nfc: "\u{1D786}",
-        nfd: "\u{1D786}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D787}",
-        nfc: "\u{1D787}",
-        nfd: "\u{1D787}",
-        nfkc: "\u{03C8}",
-        nfkd: "\u{03C8}",
-    },
-    NormalizationTest {
-        source: "\u{1D788}",
-        nfc: "\u{1D788}",
-        nfd: "\u{1D788}",
-        nfkc: "\u{03C9}",
-        nfkd: "\u{03C9}",
-    },
-    NormalizationTest {
-        source: "\u{1D789}",
-        nfc: "\u{1D789}",
-        nfd: "\u{1D789}",
-        nfkc: "\u{2202}",
-        nfkd: "\u{2202}",
-    },
-    NormalizationTest {
-        source: "\u{1D78A}",
-        nfc: "\u{1D78A}",
-        nfd: "\u{1D78A}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D78B}",
-        nfc: "\u{1D78B}",
-        nfd: "\u{1D78B}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D78C}",
-        nfc: "\u{1D78C}",
-        nfd: "\u{1D78C}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D78D}",
-        nfc: "\u{1D78D}",
-        nfd: "\u{1D78D}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D78E}",
-        nfc: "\u{1D78E}",
-        nfd: "\u{1D78E}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D78F}",
-        nfc: "\u{1D78F}",
-        nfd: "\u{1D78F}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D790}",
-        nfc: "\u{1D790}",
-        nfd: "\u{1D790}",
-        nfkc: "\u{0391}",
-        nfkd: "\u{0391}",
-    },
-    NormalizationTest {
-        source: "\u{1D791}",
-        nfc: "\u{1D791}",
-        nfd: "\u{1D791}",
-        nfkc: "\u{0392}",
-        nfkd: "\u{0392}",
-    },
-    NormalizationTest {
-        source: "\u{1D792}",
-        nfc: "\u{1D792}",
-        nfd: "\u{1D792}",
-        nfkc: "\u{0393}",
-        nfkd: "\u{0393}",
-    },
-    NormalizationTest {
-        source: "\u{1D793}",
-        nfc: "\u{1D793}",
-        nfd: "\u{1D793}",
-        nfkc: "\u{0394}",
-        nfkd: "\u{0394}",
-    },
-    NormalizationTest {
-        source: "\u{1D794}",
-        nfc: "\u{1D794}",
-        nfd: "\u{1D794}",
-        nfkc: "\u{0395}",
-        nfkd: "\u{0395}",
-    },
-    NormalizationTest {
-        source: "\u{1D795}",
-        nfc: "\u{1D795}",
-        nfd: "\u{1D795}",
-        nfkc: "\u{0396}",
-        nfkd: "\u{0396}",
-    },
-    NormalizationTest {
-        source: "\u{1D796}",
-        nfc: "\u{1D796}",
-        nfd: "\u{1D796}",
-        nfkc: "\u{0397}",
-        nfkd: "\u{0397}",
-    },
-    NormalizationTest {
-        source: "\u{1D797}",
-        nfc: "\u{1D797}",
-        nfd: "\u{1D797}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D798}",
-        nfc: "\u{1D798}",
-        nfd: "\u{1D798}",
-        nfkc: "\u{0399}",
-        nfkd: "\u{0399}",
-    },
-    NormalizationTest {
-        source: "\u{1D799}",
-        nfc: "\u{1D799}",
-        nfd: "\u{1D799}",
-        nfkc: "\u{039A}",
-        nfkd: "\u{039A}",
-    },
-    NormalizationTest {
-        source: "\u{1D79A}",
-        nfc: "\u{1D79A}",
-        nfd: "\u{1D79A}",
-        nfkc: "\u{039B}",
-        nfkd: "\u{039B}",
-    },
-    NormalizationTest {
-        source: "\u{1D79B}",
-        nfc: "\u{1D79B}",
-        nfd: "\u{1D79B}",
-        nfkc: "\u{039C}",
-        nfkd: "\u{039C}",
-    },
-    NormalizationTest {
-        source: "\u{1D79C}",
-        nfc: "\u{1D79C}",
-        nfd: "\u{1D79C}",
-        nfkc: "\u{039D}",
-        nfkd: "\u{039D}",
-    },
-    NormalizationTest {
-        source: "\u{1D79D}",
-        nfc: "\u{1D79D}",
-        nfd: "\u{1D79D}",
-        nfkc: "\u{039E}",
-        nfkd: "\u{039E}",
-    },
-    NormalizationTest {
-        source: "\u{1D79E}",
-        nfc: "\u{1D79E}",
-        nfd: "\u{1D79E}",
-        nfkc: "\u{039F}",
-        nfkd: "\u{039F}",
-    },
-    NormalizationTest {
-        source: "\u{1D79F}",
-        nfc: "\u{1D79F}",
-        nfd: "\u{1D79F}",
-        nfkc: "\u{03A0}",
-        nfkd: "\u{03A0}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A0}",
-        nfc: "\u{1D7A0}",
-        nfd: "\u{1D7A0}",
-        nfkc: "\u{03A1}",
-        nfkd: "\u{03A1}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A1}",
-        nfc: "\u{1D7A1}",
-        nfd: "\u{1D7A1}",
-        nfkc: "\u{0398}",
-        nfkd: "\u{0398}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A2}",
-        nfc: "\u{1D7A2}",
-        nfd: "\u{1D7A2}",
-        nfkc: "\u{03A3}",
-        nfkd: "\u{03A3}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A3}",
-        nfc: "\u{1D7A3}",
-        nfd: "\u{1D7A3}",
-        nfkc: "\u{03A4}",
-        nfkd: "\u{03A4}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A4}",
-        nfc: "\u{1D7A4}",
-        nfd: "\u{1D7A4}",
-        nfkc: "\u{03A5}",
-        nfkd: "\u{03A5}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A5}",
-        nfc: "\u{1D7A5}",
-        nfd: "\u{1D7A5}",
-        nfkc: "\u{03A6}",
-        nfkd: "\u{03A6}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A6}",
-        nfc: "\u{1D7A6}",
-        nfd: "\u{1D7A6}",
-        nfkc: "\u{03A7}",
-        nfkd: "\u{03A7}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A7}",
-        nfc: "\u{1D7A7}",
-        nfd: "\u{1D7A7}",
-        nfkc: "\u{03A8}",
-        nfkd: "\u{03A8}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A8}",
-        nfc: "\u{1D7A8}",
-        nfd: "\u{1D7A8}",
-        nfkc: "\u{03A9}",
-        nfkd: "\u{03A9}",
-    },
-    NormalizationTest {
-        source: "\u{1D7A9}",
-        nfc: "\u{1D7A9}",
-        nfd: "\u{1D7A9}",
-        nfkc: "\u{2207}",
-        nfkd: "\u{2207}",
-    },
-    NormalizationTest {
-        source: "\u{1D7AA}",
-        nfc: "\u{1D7AA}",
-        nfd: "\u{1D7AA}",
-        nfkc: "\u{03B1}",
-        nfkd: "\u{03B1}",
-    },
-    NormalizationTest {
-        source: "\u{1D7AB}",
-        nfc: "\u{1D7AB}",
-        nfd: "\u{1D7AB}",
-        nfkc: "\u{03B2}",
-        nfkd: "\u{03B2}",
-    },
-    NormalizationTest {
-        source: "\u{1D7AC}",
-        nfc: "\u{1D7AC}",
-        nfd: "\u{1D7AC}",
-        nfkc: "\u{03B3}",
-        nfkd: "\u{03B3}",
-    },
-    NormalizationTest {
-        source: "\u{1D7AD}",
-        nfc: "\u{1D7AD}",
-        nfd: "\u{1D7AD}",
-        nfkc: "\u{03B4}",
-        nfkd: "\u{03B4}",
-    },
-    NormalizationTest {
-        source: "\u{1D7AE}",
-        nfc: "\u{1D7AE}",
-        nfd: "\u{1D7AE}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D7AF}",
-        nfc: "\u{1D7AF}",
-        nfd: "\u{1D7AF}",
-        nfkc: "\u{03B6}",
-        nfkd: "\u{03B6}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B0}",
-        nfc: "\u{1D7B0}",
-        nfd: "\u{1D7B0}",
-        nfkc: "\u{03B7}",
-        nfkd: "\u{03B7}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B1}",
-        nfc: "\u{1D7B1}",
-        nfd: "\u{1D7B1}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B2}",
-        nfc: "\u{1D7B2}",
-        nfd: "\u{1D7B2}",
-        nfkc: "\u{03B9}",
-        nfkd: "\u{03B9}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B3}",
-        nfc: "\u{1D7B3}",
-        nfd: "\u{1D7B3}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B4}",
-        nfc: "\u{1D7B4}",
-        nfd: "\u{1D7B4}",
-        nfkc: "\u{03BB}",
-        nfkd: "\u{03BB}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B5}",
-        nfc: "\u{1D7B5}",
-        nfd: "\u{1D7B5}",
-        nfkc: "\u{03BC}",
-        nfkd: "\u{03BC}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B6}",
-        nfc: "\u{1D7B6}",
-        nfd: "\u{1D7B6}",
-        nfkc: "\u{03BD}",
-        nfkd: "\u{03BD}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B7}",
-        nfc: "\u{1D7B7}",
-        nfd: "\u{1D7B7}",
-        nfkc: "\u{03BE}",
-        nfkd: "\u{03BE}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B8}",
-        nfc: "\u{1D7B8}",
-        nfd: "\u{1D7B8}",
-        nfkc: "\u{03BF}",
-        nfkd: "\u{03BF}",
-    },
-    NormalizationTest {
-        source: "\u{1D7B9}",
-        nfc: "\u{1D7B9}",
-        nfd: "\u{1D7B9}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D7BA}",
-        nfc: "\u{1D7BA}",
-        nfd: "\u{1D7BA}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D7BB}",
-        nfc: "\u{1D7BB}",
-        nfd: "\u{1D7BB}",
-        nfkc: "\u{03C2}",
-        nfkd: "\u{03C2}",
-    },
-    NormalizationTest {
-        source: "\u{1D7BC}",
-        nfc: "\u{1D7BC}",
-        nfd: "\u{1D7BC}",
-        nfkc: "\u{03C3}",
-        nfkd: "\u{03C3}",
-    },
-    NormalizationTest {
-        source: "\u{1D7BD}",
-        nfc: "\u{1D7BD}",
-        nfd: "\u{1D7BD}",
-        nfkc: "\u{03C4}",
-        nfkd: "\u{03C4}",
-    },
-    NormalizationTest {
-        source: "\u{1D7BE}",
-        nfc: "\u{1D7BE}",
-        nfd: "\u{1D7BE}",
-        nfkc: "\u{03C5}",
-        nfkd: "\u{03C5}",
-    },
-    NormalizationTest {
-        source: "\u{1D7BF}",
-        nfc: "\u{1D7BF}",
-        nfd: "\u{1D7BF}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C0}",
-        nfc: "\u{1D7C0}",
-        nfd: "\u{1D7C0}",
-        nfkc: "\u{03C7}",
-        nfkd: "\u{03C7}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C1}",
-        nfc: "\u{1D7C1}",
-        nfd: "\u{1D7C1}",
-        nfkc: "\u{03C8}",
-        nfkd: "\u{03C8}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C2}",
-        nfc: "\u{1D7C2}",
-        nfd: "\u{1D7C2}",
-        nfkc: "\u{03C9}",
-        nfkd: "\u{03C9}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C3}",
-        nfc: "\u{1D7C3}",
-        nfd: "\u{1D7C3}",
-        nfkc: "\u{2202}",
-        nfkd: "\u{2202}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C4}",
-        nfc: "\u{1D7C4}",
-        nfd: "\u{1D7C4}",
-        nfkc: "\u{03B5}",
-        nfkd: "\u{03B5}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C5}",
-        nfc: "\u{1D7C5}",
-        nfd: "\u{1D7C5}",
-        nfkc: "\u{03B8}",
-        nfkd: "\u{03B8}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C6}",
-        nfc: "\u{1D7C6}",
-        nfd: "\u{1D7C6}",
-        nfkc: "\u{03BA}",
-        nfkd: "\u{03BA}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C7}",
-        nfc: "\u{1D7C7}",
-        nfd: "\u{1D7C7}",
-        nfkc: "\u{03C6}",
-        nfkd: "\u{03C6}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C8}",
-        nfc: "\u{1D7C8}",
-        nfd: "\u{1D7C8}",
-        nfkc: "\u{03C1}",
-        nfkd: "\u{03C1}",
-    },
-    NormalizationTest {
-        source: "\u{1D7C9}",
-        nfc: "\u{1D7C9}",
-        nfd: "\u{1D7C9}",
-        nfkc: "\u{03C0}",
-        nfkd: "\u{03C0}",
-    },
-    NormalizationTest {
-        source: "\u{1D7CA}",
-        nfc: "\u{1D7CA}",
-        nfd: "\u{1D7CA}",
-        nfkc: "\u{03DC}",
-        nfkd: "\u{03DC}",
-    },
-    NormalizationTest {
-        source: "\u{1D7CB}",
-        nfc: "\u{1D7CB}",
-        nfd: "\u{1D7CB}",
-        nfkc: "\u{03DD}",
-        nfkd: "\u{03DD}",
-    },
-    NormalizationTest {
-        source: "\u{1D7CE}",
-        nfc: "\u{1D7CE}",
-        nfd: "\u{1D7CE}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{1D7CF}",
-        nfc: "\u{1D7CF}",
-        nfd: "\u{1D7CF}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D0}",
-        nfc: "\u{1D7D0}",
-        nfd: "\u{1D7D0}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D1}",
-        nfc: "\u{1D7D1}",
-        nfd: "\u{1D7D1}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D2}",
-        nfc: "\u{1D7D2}",
-        nfd: "\u{1D7D2}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D3}",
-        nfc: "\u{1D7D3}",
-        nfd: "\u{1D7D3}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D4}",
-        nfc: "\u{1D7D4}",
-        nfd: "\u{1D7D4}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D5}",
-        nfc: "\u{1D7D5}",
-        nfd: "\u{1D7D5}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D6}",
-        nfc: "\u{1D7D6}",
-        nfd: "\u{1D7D6}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D7}",
-        nfc: "\u{1D7D7}",
-        nfd: "\u{1D7D7}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D8}",
-        nfc: "\u{1D7D8}",
-        nfd: "\u{1D7D8}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{1D7D9}",
-        nfc: "\u{1D7D9}",
-        nfd: "\u{1D7D9}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{1D7DA}",
-        nfc: "\u{1D7DA}",
-        nfd: "\u{1D7DA}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{1D7DB}",
-        nfc: "\u{1D7DB}",
-        nfd: "\u{1D7DB}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{1D7DC}",
-        nfc: "\u{1D7DC}",
-        nfd: "\u{1D7DC}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{1D7DD}",
-        nfc: "\u{1D7DD}",
-        nfd: "\u{1D7DD}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{1D7DE}",
-        nfc: "\u{1D7DE}",
-        nfd: "\u{1D7DE}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{1D7DF}",
-        nfc: "\u{1D7DF}",
-        nfd: "\u{1D7DF}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E0}",
-        nfc: "\u{1D7E0}",
-        nfd: "\u{1D7E0}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E1}",
-        nfc: "\u{1D7E1}",
-        nfd: "\u{1D7E1}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E2}",
-        nfc: "\u{1D7E2}",
-        nfd: "\u{1D7E2}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E3}",
-        nfc: "\u{1D7E3}",
-        nfd: "\u{1D7E3}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E4}",
-        nfc: "\u{1D7E4}",
-        nfd: "\u{1D7E4}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E5}",
-        nfc: "\u{1D7E5}",
-        nfd: "\u{1D7E5}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E6}",
-        nfc: "\u{1D7E6}",
-        nfd: "\u{1D7E6}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E7}",
-        nfc: "\u{1D7E7}",
-        nfd: "\u{1D7E7}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E8}",
-        nfc: "\u{1D7E8}",
-        nfd: "\u{1D7E8}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{1D7E9}",
-        nfc: "\u{1D7E9}",
-        nfd: "\u{1D7E9}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{1D7EA}",
-        nfc: "\u{1D7EA}",
-        nfd: "\u{1D7EA}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{1D7EB}",
-        nfc: "\u{1D7EB}",
-        nfd: "\u{1D7EB}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{1D7EC}",
-        nfc: "\u{1D7EC}",
-        nfd: "\u{1D7EC}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{1D7ED}",
-        nfc: "\u{1D7ED}",
-        nfd: "\u{1D7ED}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{1D7EE}",
-        nfc: "\u{1D7EE}",
-        nfd: "\u{1D7EE}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{1D7EF}",
-        nfc: "\u{1D7EF}",
-        nfd: "\u{1D7EF}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F0}",
-        nfc: "\u{1D7F0}",
-        nfd: "\u{1D7F0}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F1}",
-        nfc: "\u{1D7F1}",
-        nfd: "\u{1D7F1}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F2}",
-        nfc: "\u{1D7F2}",
-        nfd: "\u{1D7F2}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F3}",
-        nfc: "\u{1D7F3}",
-        nfd: "\u{1D7F3}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F4}",
-        nfc: "\u{1D7F4}",
-        nfd: "\u{1D7F4}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F5}",
-        nfc: "\u{1D7F5}",
-        nfd: "\u{1D7F5}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F6}",
-        nfc: "\u{1D7F6}",
-        nfd: "\u{1D7F6}",
-        nfkc: "\u{0030}",
-        nfkd: "\u{0030}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F7}",
-        nfc: "\u{1D7F7}",
-        nfd: "\u{1D7F7}",
-        nfkc: "\u{0031}",
-        nfkd: "\u{0031}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F8}",
-        nfc: "\u{1D7F8}",
-        nfd: "\u{1D7F8}",
-        nfkc: "\u{0032}",
-        nfkd: "\u{0032}",
-    },
-    NormalizationTest {
-        source: "\u{1D7F9}",
-        nfc: "\u{1D7F9}",
-        nfd: "\u{1D7F9}",
-        nfkc: "\u{0033}",
-        nfkd: "\u{0033}",
-    },
-    NormalizationTest {
-        source: "\u{1D7FA}",
-        nfc: "\u{1D7FA}",
-        nfd: "\u{1D7FA}",
-        nfkc: "\u{0034}",
-        nfkd: "\u{0034}",
-    },
-    NormalizationTest {
-        source: "\u{1D7FB}",
-        nfc: "\u{1D7FB}",
-        nfd: "\u{1D7FB}",
-        nfkc: "\u{0035}",
-        nfkd: "\u{0035}",
-    },
-    NormalizationTest {
-        source: "\u{1D7FC}",
-        nfc: "\u{1D7FC}",
-        nfd: "\u{1D7FC}",
-        nfkc: "\u{0036}",
-        nfkd: "\u{0036}",
-    },
-    NormalizationTest {
-        source: "\u{1D7FD}",
-        nfc: "\u{1D7FD}",
-        nfd: "\u{1D7FD}",
-        nfkc: "\u{0037}",
-        nfkd: "\u{0037}",
-    },
-    NormalizationTest {
-        source: "\u{1D7FE}",
-        nfc: "\u{1D7FE}",
-        nfd: "\u{1D7FE}",
-        nfkc: "\u{0038}",
-        nfkd: "\u{0038}",
-    },
-    NormalizationTest {
-        source: "\u{1D7FF}",
-        nfc: "\u{1D7FF}",
-        nfd: "\u{1D7FF}",
-        nfkc: "\u{0039}",
-        nfkd: "\u{0039}",
-    },
-    NormalizationTest {
-        source: "\u{1EE00}",
-        nfc: "\u{1EE00}",
-        nfd: "\u{1EE00}",
-        nfkc: "\u{0627}",
-        nfkd: "\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{1EE01}",
-        nfc: "\u{1EE01}",
-        nfd: "\u{1EE01}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{1EE02}",
-        nfc: "\u{1EE02}",
-        nfd: "\u{1EE02}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{1EE03}",
-        nfc: "\u{1EE03}",
-        nfd: "\u{1EE03}",
-        nfkc: "\u{062F}",
-        nfkd: "\u{062F}",
-    },
-    NormalizationTest {
-        source: "\u{1EE05}",
-        nfc: "\u{1EE05}",
-        nfd: "\u{1EE05}",
-        nfkc: "\u{0648}",
-        nfkd: "\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{1EE06}",
-        nfc: "\u{1EE06}",
-        nfd: "\u{1EE06}",
-        nfkc: "\u{0632}",
-        nfkd: "\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{1EE07}",
-        nfc: "\u{1EE07}",
-        nfd: "\u{1EE07}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{1EE08}",
-        nfc: "\u{1EE08}",
-        nfd: "\u{1EE08}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{1EE09}",
-        nfc: "\u{1EE09}",
-        nfd: "\u{1EE09}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0A}",
-        nfc: "\u{1EE0A}",
-        nfd: "\u{1EE0A}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0B}",
-        nfc: "\u{1EE0B}",
-        nfd: "\u{1EE0B}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0C}",
-        nfc: "\u{1EE0C}",
-        nfd: "\u{1EE0C}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0D}",
-        nfc: "\u{1EE0D}",
-        nfd: "\u{1EE0D}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0E}",
-        nfc: "\u{1EE0E}",
-        nfd: "\u{1EE0E}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{1EE0F}",
-        nfc: "\u{1EE0F}",
-        nfd: "\u{1EE0F}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{1EE10}",
-        nfc: "\u{1EE10}",
-        nfd: "\u{1EE10}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{1EE11}",
-        nfc: "\u{1EE11}",
-        nfd: "\u{1EE11}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{1EE12}",
-        nfc: "\u{1EE12}",
-        nfd: "\u{1EE12}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{1EE13}",
-        nfc: "\u{1EE13}",
-        nfd: "\u{1EE13}",
-        nfkc: "\u{0631}",
-        nfkd: "\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{1EE14}",
-        nfc: "\u{1EE14}",
-        nfd: "\u{1EE14}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{1EE15}",
-        nfc: "\u{1EE15}",
-        nfd: "\u{1EE15}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE16}",
-        nfc: "\u{1EE16}",
-        nfd: "\u{1EE16}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{1EE17}",
-        nfc: "\u{1EE17}",
-        nfd: "\u{1EE17}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE18}",
-        nfc: "\u{1EE18}",
-        nfd: "\u{1EE18}",
-        nfkc: "\u{0630}",
-        nfkd: "\u{0630}",
-    },
-    NormalizationTest {
-        source: "\u{1EE19}",
-        nfc: "\u{1EE19}",
-        nfd: "\u{1EE19}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1A}",
-        nfc: "\u{1EE1A}",
-        nfd: "\u{1EE1A}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1B}",
-        nfc: "\u{1EE1B}",
-        nfd: "\u{1EE1B}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1C}",
-        nfc: "\u{1EE1C}",
-        nfd: "\u{1EE1C}",
-        nfkc: "\u{066E}",
-        nfkd: "\u{066E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1D}",
-        nfc: "\u{1EE1D}",
-        nfd: "\u{1EE1D}",
-        nfkc: "\u{06BA}",
-        nfkd: "\u{06BA}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1E}",
-        nfc: "\u{1EE1E}",
-        nfd: "\u{1EE1E}",
-        nfkc: "\u{06A1}",
-        nfkd: "\u{06A1}",
-    },
-    NormalizationTest {
-        source: "\u{1EE1F}",
-        nfc: "\u{1EE1F}",
-        nfd: "\u{1EE1F}",
-        nfkc: "\u{066F}",
-        nfkd: "\u{066F}",
-    },
-    NormalizationTest {
-        source: "\u{1EE21}",
-        nfc: "\u{1EE21}",
-        nfd: "\u{1EE21}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{1EE22}",
-        nfc: "\u{1EE22}",
-        nfd: "\u{1EE22}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{1EE24}",
-        nfc: "\u{1EE24}",
-        nfd: "\u{1EE24}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{1EE27}",
-        nfc: "\u{1EE27}",
-        nfd: "\u{1EE27}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{1EE29}",
-        nfc: "\u{1EE29}",
-        nfd: "\u{1EE29}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2A}",
-        nfc: "\u{1EE2A}",
-        nfd: "\u{1EE2A}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2B}",
-        nfc: "\u{1EE2B}",
-        nfd: "\u{1EE2B}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2C}",
-        nfc: "\u{1EE2C}",
-        nfd: "\u{1EE2C}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2D}",
-        nfc: "\u{1EE2D}",
-        nfd: "\u{1EE2D}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2E}",
-        nfc: "\u{1EE2E}",
-        nfd: "\u{1EE2E}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{1EE2F}",
-        nfc: "\u{1EE2F}",
-        nfd: "\u{1EE2F}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{1EE30}",
-        nfc: "\u{1EE30}",
-        nfd: "\u{1EE30}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{1EE31}",
-        nfc: "\u{1EE31}",
-        nfd: "\u{1EE31}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{1EE32}",
-        nfc: "\u{1EE32}",
-        nfd: "\u{1EE32}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{1EE34}",
-        nfc: "\u{1EE34}",
-        nfd: "\u{1EE34}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{1EE35}",
-        nfc: "\u{1EE35}",
-        nfd: "\u{1EE35}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE36}",
-        nfc: "\u{1EE36}",
-        nfd: "\u{1EE36}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{1EE37}",
-        nfc: "\u{1EE37}",
-        nfd: "\u{1EE37}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE39}",
-        nfc: "\u{1EE39}",
-        nfd: "\u{1EE39}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{1EE3B}",
-        nfc: "\u{1EE3B}",
-        nfd: "\u{1EE3B}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE42}",
-        nfc: "\u{1EE42}",
-        nfd: "\u{1EE42}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{1EE47}",
-        nfc: "\u{1EE47}",
-        nfd: "\u{1EE47}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{1EE49}",
-        nfc: "\u{1EE49}",
-        nfd: "\u{1EE49}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE4B}",
-        nfc: "\u{1EE4B}",
-        nfd: "\u{1EE4B}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{1EE4D}",
-        nfc: "\u{1EE4D}",
-        nfd: "\u{1EE4D}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{1EE4E}",
-        nfc: "\u{1EE4E}",
-        nfd: "\u{1EE4E}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{1EE4F}",
-        nfc: "\u{1EE4F}",
-        nfd: "\u{1EE4F}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{1EE51}",
-        nfc: "\u{1EE51}",
-        nfd: "\u{1EE51}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{1EE52}",
-        nfc: "\u{1EE52}",
-        nfd: "\u{1EE52}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{1EE54}",
-        nfc: "\u{1EE54}",
-        nfd: "\u{1EE54}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{1EE57}",
-        nfc: "\u{1EE57}",
-        nfd: "\u{1EE57}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE59}",
-        nfc: "\u{1EE59}",
-        nfd: "\u{1EE59}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{1EE5B}",
-        nfc: "\u{1EE5B}",
-        nfd: "\u{1EE5B}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE5D}",
-        nfc: "\u{1EE5D}",
-        nfd: "\u{1EE5D}",
-        nfkc: "\u{06BA}",
-        nfkd: "\u{06BA}",
-    },
-    NormalizationTest {
-        source: "\u{1EE5F}",
-        nfc: "\u{1EE5F}",
-        nfd: "\u{1EE5F}",
-        nfkc: "\u{066F}",
-        nfkd: "\u{066F}",
-    },
-    NormalizationTest {
-        source: "\u{1EE61}",
-        nfc: "\u{1EE61}",
-        nfd: "\u{1EE61}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{1EE62}",
-        nfc: "\u{1EE62}",
-        nfd: "\u{1EE62}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{1EE64}",
-        nfc: "\u{1EE64}",
-        nfd: "\u{1EE64}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{1EE67}",
-        nfc: "\u{1EE67}",
-        nfd: "\u{1EE67}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{1EE68}",
-        nfc: "\u{1EE68}",
-        nfd: "\u{1EE68}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{1EE69}",
-        nfc: "\u{1EE69}",
-        nfd: "\u{1EE69}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE6A}",
-        nfc: "\u{1EE6A}",
-        nfd: "\u{1EE6A}",
-        nfkc: "\u{0643}",
-        nfkd: "\u{0643}",
-    },
-    NormalizationTest {
-        source: "\u{1EE6C}",
-        nfc: "\u{1EE6C}",
-        nfd: "\u{1EE6C}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{1EE6D}",
-        nfc: "\u{1EE6D}",
-        nfd: "\u{1EE6D}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{1EE6E}",
-        nfc: "\u{1EE6E}",
-        nfd: "\u{1EE6E}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{1EE6F}",
-        nfc: "\u{1EE6F}",
-        nfd: "\u{1EE6F}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{1EE70}",
-        nfc: "\u{1EE70}",
-        nfd: "\u{1EE70}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{1EE71}",
-        nfc: "\u{1EE71}",
-        nfd: "\u{1EE71}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{1EE72}",
-        nfc: "\u{1EE72}",
-        nfd: "\u{1EE72}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{1EE74}",
-        nfc: "\u{1EE74}",
-        nfd: "\u{1EE74}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{1EE75}",
-        nfc: "\u{1EE75}",
-        nfd: "\u{1EE75}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE76}",
-        nfc: "\u{1EE76}",
-        nfd: "\u{1EE76}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{1EE77}",
-        nfc: "\u{1EE77}",
-        nfd: "\u{1EE77}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE79}",
-        nfc: "\u{1EE79}",
-        nfd: "\u{1EE79}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{1EE7A}",
-        nfc: "\u{1EE7A}",
-        nfd: "\u{1EE7A}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{1EE7B}",
-        nfc: "\u{1EE7B}",
-        nfd: "\u{1EE7B}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE7C}",
-        nfc: "\u{1EE7C}",
-        nfd: "\u{1EE7C}",
-        nfkc: "\u{066E}",
-        nfkd: "\u{066E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE7E}",
-        nfc: "\u{1EE7E}",
-        nfd: "\u{1EE7E}",
-        nfkc: "\u{06A1}",
-        nfkd: "\u{06A1}",
-    },
-    NormalizationTest {
-        source: "\u{1EE80}",
-        nfc: "\u{1EE80}",
-        nfd: "\u{1EE80}",
-        nfkc: "\u{0627}",
-        nfkd: "\u{0627}",
-    },
-    NormalizationTest {
-        source: "\u{1EE81}",
-        nfc: "\u{1EE81}",
-        nfd: "\u{1EE81}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{1EE82}",
-        nfc: "\u{1EE82}",
-        nfd: "\u{1EE82}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{1EE83}",
-        nfc: "\u{1EE83}",
-        nfd: "\u{1EE83}",
-        nfkc: "\u{062F}",
-        nfkd: "\u{062F}",
-    },
-    NormalizationTest {
-        source: "\u{1EE84}",
-        nfc: "\u{1EE84}",
-        nfd: "\u{1EE84}",
-        nfkc: "\u{0647}",
-        nfkd: "\u{0647}",
-    },
-    NormalizationTest {
-        source: "\u{1EE85}",
-        nfc: "\u{1EE85}",
-        nfd: "\u{1EE85}",
-        nfkc: "\u{0648}",
-        nfkd: "\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{1EE86}",
-        nfc: "\u{1EE86}",
-        nfd: "\u{1EE86}",
-        nfkc: "\u{0632}",
-        nfkd: "\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{1EE87}",
-        nfc: "\u{1EE87}",
-        nfd: "\u{1EE87}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{1EE88}",
-        nfc: "\u{1EE88}",
-        nfd: "\u{1EE88}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{1EE89}",
-        nfc: "\u{1EE89}",
-        nfd: "\u{1EE89}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE8B}",
-        nfc: "\u{1EE8B}",
-        nfd: "\u{1EE8B}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{1EE8C}",
-        nfc: "\u{1EE8C}",
-        nfd: "\u{1EE8C}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{1EE8D}",
-        nfc: "\u{1EE8D}",
-        nfd: "\u{1EE8D}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{1EE8E}",
-        nfc: "\u{1EE8E}",
-        nfd: "\u{1EE8E}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{1EE8F}",
-        nfc: "\u{1EE8F}",
-        nfd: "\u{1EE8F}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{1EE90}",
-        nfc: "\u{1EE90}",
-        nfd: "\u{1EE90}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{1EE91}",
-        nfc: "\u{1EE91}",
-        nfd: "\u{1EE91}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{1EE92}",
-        nfc: "\u{1EE92}",
-        nfd: "\u{1EE92}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{1EE93}",
-        nfc: "\u{1EE93}",
-        nfd: "\u{1EE93}",
-        nfkc: "\u{0631}",
-        nfkd: "\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{1EE94}",
-        nfc: "\u{1EE94}",
-        nfd: "\u{1EE94}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{1EE95}",
-        nfc: "\u{1EE95}",
-        nfd: "\u{1EE95}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{1EE96}",
-        nfc: "\u{1EE96}",
-        nfd: "\u{1EE96}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{1EE97}",
-        nfc: "\u{1EE97}",
-        nfd: "\u{1EE97}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{1EE98}",
-        nfc: "\u{1EE98}",
-        nfd: "\u{1EE98}",
-        nfkc: "\u{0630}",
-        nfkd: "\u{0630}",
-    },
-    NormalizationTest {
-        source: "\u{1EE99}",
-        nfc: "\u{1EE99}",
-        nfd: "\u{1EE99}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{1EE9A}",
-        nfc: "\u{1EE9A}",
-        nfd: "\u{1EE9A}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{1EE9B}",
-        nfc: "\u{1EE9B}",
-        nfd: "\u{1EE9B}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA1}",
-        nfc: "\u{1EEA1}",
-        nfd: "\u{1EEA1}",
-        nfkc: "\u{0628}",
-        nfkd: "\u{0628}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA2}",
-        nfc: "\u{1EEA2}",
-        nfd: "\u{1EEA2}",
-        nfkc: "\u{062C}",
-        nfkd: "\u{062C}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA3}",
-        nfc: "\u{1EEA3}",
-        nfd: "\u{1EEA3}",
-        nfkc: "\u{062F}",
-        nfkd: "\u{062F}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA5}",
-        nfc: "\u{1EEA5}",
-        nfd: "\u{1EEA5}",
-        nfkc: "\u{0648}",
-        nfkd: "\u{0648}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA6}",
-        nfc: "\u{1EEA6}",
-        nfd: "\u{1EEA6}",
-        nfkc: "\u{0632}",
-        nfkd: "\u{0632}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA7}",
-        nfc: "\u{1EEA7}",
-        nfd: "\u{1EEA7}",
-        nfkc: "\u{062D}",
-        nfkd: "\u{062D}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA8}",
-        nfc: "\u{1EEA8}",
-        nfd: "\u{1EEA8}",
-        nfkc: "\u{0637}",
-        nfkd: "\u{0637}",
-    },
-    NormalizationTest {
-        source: "\u{1EEA9}",
-        nfc: "\u{1EEA9}",
-        nfd: "\u{1EEA9}",
-        nfkc: "\u{064A}",
-        nfkd: "\u{064A}",
-    },
-    NormalizationTest {
-        source: "\u{1EEAB}",
-        nfc: "\u{1EEAB}",
-        nfd: "\u{1EEAB}",
-        nfkc: "\u{0644}",
-        nfkd: "\u{0644}",
-    },
-    NormalizationTest {
-        source: "\u{1EEAC}",
-        nfc: "\u{1EEAC}",
-        nfd: "\u{1EEAC}",
-        nfkc: "\u{0645}",
-        nfkd: "\u{0645}",
-    },
-    NormalizationTest {
-        source: "\u{1EEAD}",
-        nfc: "\u{1EEAD}",
-        nfd: "\u{1EEAD}",
-        nfkc: "\u{0646}",
-        nfkd: "\u{0646}",
-    },
-    NormalizationTest {
-        source: "\u{1EEAE}",
-        nfc: "\u{1EEAE}",
-        nfd: "\u{1EEAE}",
-        nfkc: "\u{0633}",
-        nfkd: "\u{0633}",
-    },
-    NormalizationTest {
-        source: "\u{1EEAF}",
-        nfc: "\u{1EEAF}",
-        nfd: "\u{1EEAF}",
-        nfkc: "\u{0639}",
-        nfkd: "\u{0639}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB0}",
-        nfc: "\u{1EEB0}",
-        nfd: "\u{1EEB0}",
-        nfkc: "\u{0641}",
-        nfkd: "\u{0641}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB1}",
-        nfc: "\u{1EEB1}",
-        nfd: "\u{1EEB1}",
-        nfkc: "\u{0635}",
-        nfkd: "\u{0635}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB2}",
-        nfc: "\u{1EEB2}",
-        nfd: "\u{1EEB2}",
-        nfkc: "\u{0642}",
-        nfkd: "\u{0642}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB3}",
-        nfc: "\u{1EEB3}",
-        nfd: "\u{1EEB3}",
-        nfkc: "\u{0631}",
-        nfkd: "\u{0631}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB4}",
-        nfc: "\u{1EEB4}",
-        nfd: "\u{1EEB4}",
-        nfkc: "\u{0634}",
-        nfkd: "\u{0634}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB5}",
-        nfc: "\u{1EEB5}",
-        nfd: "\u{1EEB5}",
-        nfkc: "\u{062A}",
-        nfkd: "\u{062A}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB6}",
-        nfc: "\u{1EEB6}",
-        nfd: "\u{1EEB6}",
-        nfkc: "\u{062B}",
-        nfkd: "\u{062B}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB7}",
-        nfc: "\u{1EEB7}",
-        nfd: "\u{1EEB7}",
-        nfkc: "\u{062E}",
-        nfkd: "\u{062E}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB8}",
-        nfc: "\u{1EEB8}",
-        nfd: "\u{1EEB8}",
-        nfkc: "\u{0630}",
-        nfkd: "\u{0630}",
-    },
-    NormalizationTest {
-        source: "\u{1EEB9}",
-        nfc: "\u{1EEB9}",
-        nfd: "\u{1EEB9}",
-        nfkc: "\u{0636}",
-        nfkd: "\u{0636}",
-    },
-    NormalizationTest {
-        source: "\u{1EEBA}",
-        nfc: "\u{1EEBA}",
-        nfd: "\u{1EEBA}",
-        nfkc: "\u{0638}",
-        nfkd: "\u{0638}",
-    },
-    NormalizationTest {
-        source: "\u{1EEBB}",
-        nfc: "\u{1EEBB}",
-        nfd: "\u{1EEBB}",
-        nfkc: "\u{063A}",
-        nfkd: "\u{063A}",
-    },
-    NormalizationTest {
-        source: "\u{1F100}",
-        nfc: "\u{1F100}",
-        nfd: "\u{1F100}",
-        nfkc: "\u{0030}\u{002E}",
-        nfkd: "\u{0030}\u{002E}",
-    },
-    NormalizationTest {
-        source: "\u{1F101}",
-        nfc: "\u{1F101}",
-        nfd: "\u{1F101}",
-        nfkc: "\u{0030}\u{002C}",
-        nfkd: "\u{0030}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F102}",
-        nfc: "\u{1F102}",
-        nfd: "\u{1F102}",
-        nfkc: "\u{0031}\u{002C}",
-        nfkd: "\u{0031}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F103}",
-        nfc: "\u{1F103}",
-        nfd: "\u{1F103}",
-        nfkc: "\u{0032}\u{002C}",
-        nfkd: "\u{0032}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F104}",
-        nfc: "\u{1F104}",
-        nfd: "\u{1F104}",
-        nfkc: "\u{0033}\u{002C}",
-        nfkd: "\u{0033}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F105}",
-        nfc: "\u{1F105}",
-        nfd: "\u{1F105}",
-        nfkc: "\u{0034}\u{002C}",
-        nfkd: "\u{0034}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F106}",
-        nfc: "\u{1F106}",
-        nfd: "\u{1F106}",
-        nfkc: "\u{0035}\u{002C}",
-        nfkd: "\u{0035}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F107}",
-        nfc: "\u{1F107}",
-        nfd: "\u{1F107}",
-        nfkc: "\u{0036}\u{002C}",
-        nfkd: "\u{0036}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F108}",
-        nfc: "\u{1F108}",
-        nfd: "\u{1F108}",
-        nfkc: "\u{0037}\u{002C}",
-        nfkd: "\u{0037}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F109}",
-        nfc: "\u{1F109}",
-        nfd: "\u{1F109}",
-        nfkc: "\u{0038}\u{002C}",
-        nfkd: "\u{0038}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F10A}",
-        nfc: "\u{1F10A}",
-        nfd: "\u{1F10A}",
-        nfkc: "\u{0039}\u{002C}",
-        nfkd: "\u{0039}\u{002C}",
-    },
-    NormalizationTest {
-        source: "\u{1F110}",
-        nfc: "\u{1F110}",
-        nfd: "\u{1F110}",
-        nfkc: "\u{0028}\u{0041}\u{0029}",
-        nfkd: "\u{0028}\u{0041}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F111}",
-        nfc: "\u{1F111}",
-        nfd: "\u{1F111}",
-        nfkc: "\u{0028}\u{0042}\u{0029}",
-        nfkd: "\u{0028}\u{0042}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F112}",
-        nfc: "\u{1F112}",
-        nfd: "\u{1F112}",
-        nfkc: "\u{0028}\u{0043}\u{0029}",
-        nfkd: "\u{0028}\u{0043}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F113}",
-        nfc: "\u{1F113}",
-        nfd: "\u{1F113}",
-        nfkc: "\u{0028}\u{0044}\u{0029}",
-        nfkd: "\u{0028}\u{0044}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F114}",
-        nfc: "\u{1F114}",
-        nfd: "\u{1F114}",
-        nfkc: "\u{0028}\u{0045}\u{0029}",
-        nfkd: "\u{0028}\u{0045}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F115}",
-        nfc: "\u{1F115}",
-        nfd: "\u{1F115}",
-        nfkc: "\u{0028}\u{0046}\u{0029}",
-        nfkd: "\u{0028}\u{0046}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F116}",
-        nfc: "\u{1F116}",
-        nfd: "\u{1F116}",
-        nfkc: "\u{0028}\u{0047}\u{0029}",
-        nfkd: "\u{0028}\u{0047}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F117}",
-        nfc: "\u{1F117}",
-        nfd: "\u{1F117}",
-        nfkc: "\u{0028}\u{0048}\u{0029}",
-        nfkd: "\u{0028}\u{0048}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F118}",
-        nfc: "\u{1F118}",
-        nfd: "\u{1F118}",
-        nfkc: "\u{0028}\u{0049}\u{0029}",
-        nfkd: "\u{0028}\u{0049}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F119}",
-        nfc: "\u{1F119}",
-        nfd: "\u{1F119}",
-        nfkc: "\u{0028}\u{004A}\u{0029}",
-        nfkd: "\u{0028}\u{004A}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F11A}",
-        nfc: "\u{1F11A}",
-        nfd: "\u{1F11A}",
-        nfkc: "\u{0028}\u{004B}\u{0029}",
-        nfkd: "\u{0028}\u{004B}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F11B}",
-        nfc: "\u{1F11B}",
-        nfd: "\u{1F11B}",
-        nfkc: "\u{0028}\u{004C}\u{0029}",
-        nfkd: "\u{0028}\u{004C}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F11C}",
-        nfc: "\u{1F11C}",
-        nfd: "\u{1F11C}",
-        nfkc: "\u{0028}\u{004D}\u{0029}",
-        nfkd: "\u{0028}\u{004D}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F11D}",
-        nfc: "\u{1F11D}",
-        nfd: "\u{1F11D}",
-        nfkc: "\u{0028}\u{004E}\u{0029}",
-        nfkd: "\u{0028}\u{004E}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F11E}",
-        nfc: "\u{1F11E}",
-        nfd: "\u{1F11E}",
-        nfkc: "\u{0028}\u{004F}\u{0029}",
-        nfkd: "\u{0028}\u{004F}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F11F}",
-        nfc: "\u{1F11F}",
-        nfd: "\u{1F11F}",
-        nfkc: "\u{0028}\u{0050}\u{0029}",
-        nfkd: "\u{0028}\u{0050}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F120}",
-        nfc: "\u{1F120}",
-        nfd: "\u{1F120}",
-        nfkc: "\u{0028}\u{0051}\u{0029}",
-        nfkd: "\u{0028}\u{0051}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F121}",
-        nfc: "\u{1F121}",
-        nfd: "\u{1F121}",
-        nfkc: "\u{0028}\u{0052}\u{0029}",
-        nfkd: "\u{0028}\u{0052}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F122}",
-        nfc: "\u{1F122}",
-        nfd: "\u{1F122}",
-        nfkc: "\u{0028}\u{0053}\u{0029}",
-        nfkd: "\u{0028}\u{0053}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F123}",
-        nfc: "\u{1F123}",
-        nfd: "\u{1F123}",
-        nfkc: "\u{0028}\u{0054}\u{0029}",
-        nfkd: "\u{0028}\u{0054}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F124}",
-        nfc: "\u{1F124}",
-        nfd: "\u{1F124}",
-        nfkc: "\u{0028}\u{0055}\u{0029}",
-        nfkd: "\u{0028}\u{0055}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F125}",
-        nfc: "\u{1F125}",
-        nfd: "\u{1F125}",
-        nfkc: "\u{0028}\u{0056}\u{0029}",
-        nfkd: "\u{0028}\u{0056}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F126}",
-        nfc: "\u{1F126}",
-        nfd: "\u{1F126}",
-        nfkc: "\u{0028}\u{0057}\u{0029}",
-        nfkd: "\u{0028}\u{0057}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F127}",
-        nfc: "\u{1F127}",
-        nfd: "\u{1F127}",
-        nfkc: "\u{0028}\u{0058}\u{0029}",
-        nfkd: "\u{0028}\u{0058}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F128}",
-        nfc: "\u{1F128}",
-        nfd: "\u{1F128}",
-        nfkc: "\u{0028}\u{0059}\u{0029}",
-        nfkd: "\u{0028}\u{0059}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F129}",
-        nfc: "\u{1F129}",
-        nfd: "\u{1F129}",
-        nfkc: "\u{0028}\u{005A}\u{0029}",
-        nfkd: "\u{0028}\u{005A}\u{0029}",
-    },
-    NormalizationTest {
-        source: "\u{1F12A}",
-        nfc: "\u{1F12A}",
-        nfd: "\u{1F12A}",
-        nfkc: "\u{3014}\u{0053}\u{3015}",
-        nfkd: "\u{3014}\u{0053}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F12B}",
-        nfc: "\u{1F12B}",
-        nfd: "\u{1F12B}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1F12C}",
-        nfc: "\u{1F12C}",
-        nfd: "\u{1F12C}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1F12D}",
-        nfc: "\u{1F12D}",
-        nfd: "\u{1F12D}",
-        nfkc: "\u{0043}\u{0044}",
-        nfkd: "\u{0043}\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1F12E}",
-        nfc: "\u{1F12E}",
-        nfd: "\u{1F12E}",
-        nfkc: "\u{0057}\u{005A}",
-        nfkd: "\u{0057}\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1F130}",
-        nfc: "\u{1F130}",
-        nfd: "\u{1F130}",
-        nfkc: "\u{0041}",
-        nfkd: "\u{0041}",
-    },
-    NormalizationTest {
-        source: "\u{1F131}",
-        nfc: "\u{1F131}",
-        nfd: "\u{1F131}",
-        nfkc: "\u{0042}",
-        nfkd: "\u{0042}",
-    },
-    NormalizationTest {
-        source: "\u{1F132}",
-        nfc: "\u{1F132}",
-        nfd: "\u{1F132}",
-        nfkc: "\u{0043}",
-        nfkd: "\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1F133}",
-        nfc: "\u{1F133}",
-        nfd: "\u{1F133}",
-        nfkc: "\u{0044}",
-        nfkd: "\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1F134}",
-        nfc: "\u{1F134}",
-        nfd: "\u{1F134}",
-        nfkc: "\u{0045}",
-        nfkd: "\u{0045}",
-    },
-    NormalizationTest {
-        source: "\u{1F135}",
-        nfc: "\u{1F135}",
-        nfd: "\u{1F135}",
-        nfkc: "\u{0046}",
-        nfkd: "\u{0046}",
-    },
-    NormalizationTest {
-        source: "\u{1F136}",
-        nfc: "\u{1F136}",
-        nfd: "\u{1F136}",
-        nfkc: "\u{0047}",
-        nfkd: "\u{0047}",
-    },
-    NormalizationTest {
-        source: "\u{1F137}",
-        nfc: "\u{1F137}",
-        nfd: "\u{1F137}",
-        nfkc: "\u{0048}",
-        nfkd: "\u{0048}",
-    },
-    NormalizationTest {
-        source: "\u{1F138}",
-        nfc: "\u{1F138}",
-        nfd: "\u{1F138}",
-        nfkc: "\u{0049}",
-        nfkd: "\u{0049}",
-    },
-    NormalizationTest {
-        source: "\u{1F139}",
-        nfc: "\u{1F139}",
-        nfd: "\u{1F139}",
-        nfkc: "\u{004A}",
-        nfkd: "\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1F13A}",
-        nfc: "\u{1F13A}",
-        nfd: "\u{1F13A}",
-        nfkc: "\u{004B}",
-        nfkd: "\u{004B}",
-    },
-    NormalizationTest {
-        source: "\u{1F13B}",
-        nfc: "\u{1F13B}",
-        nfd: "\u{1F13B}",
-        nfkc: "\u{004C}",
-        nfkd: "\u{004C}",
-    },
-    NormalizationTest {
-        source: "\u{1F13C}",
-        nfc: "\u{1F13C}",
-        nfd: "\u{1F13C}",
-        nfkc: "\u{004D}",
-        nfkd: "\u{004D}",
-    },
-    NormalizationTest {
-        source: "\u{1F13D}",
-        nfc: "\u{1F13D}",
-        nfd: "\u{1F13D}",
-        nfkc: "\u{004E}",
-        nfkd: "\u{004E}",
-    },
-    NormalizationTest {
-        source: "\u{1F13E}",
-        nfc: "\u{1F13E}",
-        nfd: "\u{1F13E}",
-        nfkc: "\u{004F}",
-        nfkd: "\u{004F}",
-    },
-    NormalizationTest {
-        source: "\u{1F13F}",
-        nfc: "\u{1F13F}",
-        nfd: "\u{1F13F}",
-        nfkc: "\u{0050}",
-        nfkd: "\u{0050}",
-    },
-    NormalizationTest {
-        source: "\u{1F140}",
-        nfc: "\u{1F140}",
-        nfd: "\u{1F140}",
-        nfkc: "\u{0051}",
-        nfkd: "\u{0051}",
-    },
-    NormalizationTest {
-        source: "\u{1F141}",
-        nfc: "\u{1F141}",
-        nfd: "\u{1F141}",
-        nfkc: "\u{0052}",
-        nfkd: "\u{0052}",
-    },
-    NormalizationTest {
-        source: "\u{1F142}",
-        nfc: "\u{1F142}",
-        nfd: "\u{1F142}",
-        nfkc: "\u{0053}",
-        nfkd: "\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1F143}",
-        nfc: "\u{1F143}",
-        nfd: "\u{1F143}",
-        nfkc: "\u{0054}",
-        nfkd: "\u{0054}",
-    },
-    NormalizationTest {
-        source: "\u{1F144}",
-        nfc: "\u{1F144}",
-        nfd: "\u{1F144}",
-        nfkc: "\u{0055}",
-        nfkd: "\u{0055}",
-    },
-    NormalizationTest {
-        source: "\u{1F145}",
-        nfc: "\u{1F145}",
-        nfd: "\u{1F145}",
-        nfkc: "\u{0056}",
-        nfkd: "\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1F146}",
-        nfc: "\u{1F146}",
-        nfd: "\u{1F146}",
-        nfkc: "\u{0057}",
-        nfkd: "\u{0057}",
-    },
-    NormalizationTest {
-        source: "\u{1F147}",
-        nfc: "\u{1F147}",
-        nfd: "\u{1F147}",
-        nfkc: "\u{0058}",
-        nfkd: "\u{0058}",
-    },
-    NormalizationTest {
-        source: "\u{1F148}",
-        nfc: "\u{1F148}",
-        nfd: "\u{1F148}",
-        nfkc: "\u{0059}",
-        nfkd: "\u{0059}",
-    },
-    NormalizationTest {
-        source: "\u{1F149}",
-        nfc: "\u{1F149}",
-        nfd: "\u{1F149}",
-        nfkc: "\u{005A}",
-        nfkd: "\u{005A}",
-    },
-    NormalizationTest {
-        source: "\u{1F14A}",
-        nfc: "\u{1F14A}",
-        nfd: "\u{1F14A}",
-        nfkc: "\u{0048}\u{0056}",
-        nfkd: "\u{0048}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1F14B}",
-        nfc: "\u{1F14B}",
-        nfd: "\u{1F14B}",
-        nfkc: "\u{004D}\u{0056}",
-        nfkd: "\u{004D}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1F14C}",
-        nfc: "\u{1F14C}",
-        nfd: "\u{1F14C}",
-        nfkc: "\u{0053}\u{0044}",
-        nfkd: "\u{0053}\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1F14D}",
-        nfc: "\u{1F14D}",
-        nfd: "\u{1F14D}",
-        nfkc: "\u{0053}\u{0053}",
-        nfkd: "\u{0053}\u{0053}",
-    },
-    NormalizationTest {
-        source: "\u{1F14E}",
-        nfc: "\u{1F14E}",
-        nfd: "\u{1F14E}",
-        nfkc: "\u{0050}\u{0050}\u{0056}",
-        nfkd: "\u{0050}\u{0050}\u{0056}",
-    },
-    NormalizationTest {
-        source: "\u{1F14F}",
-        nfc: "\u{1F14F}",
-        nfd: "\u{1F14F}",
-        nfkc: "\u{0057}\u{0043}",
-        nfkd: "\u{0057}\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1F16A}",
-        nfc: "\u{1F16A}",
-        nfd: "\u{1F16A}",
-        nfkc: "\u{004D}\u{0043}",
-        nfkd: "\u{004D}\u{0043}",
-    },
-    NormalizationTest {
-        source: "\u{1F16B}",
-        nfc: "\u{1F16B}",
-        nfd: "\u{1F16B}",
-        nfkc: "\u{004D}\u{0044}",
-        nfkd: "\u{004D}\u{0044}",
-    },
-    NormalizationTest {
-        source: "\u{1F190}",
-        nfc: "\u{1F190}",
-        nfd: "\u{1F190}",
-        nfkc: "\u{0044}\u{004A}",
-        nfkd: "\u{0044}\u{004A}",
-    },
-    NormalizationTest {
-        source: "\u{1F200}",
-        nfc: "\u{1F200}",
-        nfd: "\u{1F200}",
-        nfkc: "\u{307B}\u{304B}",
-        nfkd: "\u{307B}\u{304B}",
-    },
-    NormalizationTest {
-        source: "\u{1F201}",
-        nfc: "\u{1F201}",
-        nfd: "\u{1F201}",
-        nfkc: "\u{30B3}\u{30B3}",
-        nfkd: "\u{30B3}\u{30B3}",
-    },
-    NormalizationTest {
-        source: "\u{1F202}",
-        nfc: "\u{1F202}",
-        nfd: "\u{1F202}",
-        nfkc: "\u{30B5}",
-        nfkd: "\u{30B5}",
-    },
-    NormalizationTest {
-        source: "\u{1F210}",
-        nfc: "\u{1F210}",
-        nfd: "\u{1F210}",
-        nfkc: "\u{624B}",
-        nfkd: "\u{624B}",
-    },
-    NormalizationTest {
-        source: "\u{1F211}",
-        nfc: "\u{1F211}",
-        nfd: "\u{1F211}",
-        nfkc: "\u{5B57}",
-        nfkd: "\u{5B57}",
-    },
-    NormalizationTest {
-        source: "\u{1F212}",
-        nfc: "\u{1F212}",
-        nfd: "\u{1F212}",
-        nfkc: "\u{53CC}",
-        nfkd: "\u{53CC}",
-    },
-    NormalizationTest {
-        source: "\u{1F213}",
-        nfc: "\u{1F213}",
-        nfd: "\u{1F213}",
-        nfkc: "\u{30C7}",
-        nfkd: "\u{30C6}\u{3099}",
-    },
-    NormalizationTest {
-        source: "\u{1F214}",
-        nfc: "\u{1F214}",
-        nfd: "\u{1F214}",
-        nfkc: "\u{4E8C}",
-        nfkd: "\u{4E8C}",
-    },
-    NormalizationTest {
-        source: "\u{1F215}",
-        nfc: "\u{1F215}",
-        nfd: "\u{1F215}",
-        nfkc: "\u{591A}",
-        nfkd: "\u{591A}",
-    },
-    NormalizationTest {
-        source: "\u{1F216}",
-        nfc: "\u{1F216}",
-        nfd: "\u{1F216}",
-        nfkc: "\u{89E3}",
-        nfkd: "\u{89E3}",
-    },
-    NormalizationTest {
-        source: "\u{1F217}",
-        nfc: "\u{1F217}",
-        nfd: "\u{1F217}",
-        nfkc: "\u{5929}",
-        nfkd: "\u{5929}",
-    },
-    NormalizationTest {
-        source: "\u{1F218}",
-        nfc: "\u{1F218}",
-        nfd: "\u{1F218}",
-        nfkc: "\u{4EA4}",
-        nfkd: "\u{4EA4}",
-    },
-    NormalizationTest {
-        source: "\u{1F219}",
-        nfc: "\u{1F219}",
-        nfd: "\u{1F219}",
-        nfkc: "\u{6620}",
-        nfkd: "\u{6620}",
-    },
-    NormalizationTest {
-        source: "\u{1F21A}",
-        nfc: "\u{1F21A}",
-        nfd: "\u{1F21A}",
-        nfkc: "\u{7121}",
-        nfkd: "\u{7121}",
-    },
-    NormalizationTest {
-        source: "\u{1F21B}",
-        nfc: "\u{1F21B}",
-        nfd: "\u{1F21B}",
-        nfkc: "\u{6599}",
-        nfkd: "\u{6599}",
-    },
-    NormalizationTest {
-        source: "\u{1F21C}",
-        nfc: "\u{1F21C}",
-        nfd: "\u{1F21C}",
-        nfkc: "\u{524D}",
-        nfkd: "\u{524D}",
-    },
-    NormalizationTest {
-        source: "\u{1F21D}",
-        nfc: "\u{1F21D}",
-        nfd: "\u{1F21D}",
-        nfkc: "\u{5F8C}",
-        nfkd: "\u{5F8C}",
-    },
-    NormalizationTest {
-        source: "\u{1F21E}",
-        nfc: "\u{1F21E}",
-        nfd: "\u{1F21E}",
-        nfkc: "\u{518D}",
-        nfkd: "\u{518D}",
-    },
-    NormalizationTest {
-        source: "\u{1F21F}",
-        nfc: "\u{1F21F}",
-        nfd: "\u{1F21F}",
-        nfkc: "\u{65B0}",
-        nfkd: "\u{65B0}",
-    },
-    NormalizationTest {
-        source: "\u{1F220}",
-        nfc: "\u{1F220}",
-        nfd: "\u{1F220}",
-        nfkc: "\u{521D}",
-        nfkd: "\u{521D}",
-    },
-    NormalizationTest {
-        source: "\u{1F221}",
-        nfc: "\u{1F221}",
-        nfd: "\u{1F221}",
-        nfkc: "\u{7D42}",
-        nfkd: "\u{7D42}",
-    },
-    NormalizationTest {
-        source: "\u{1F222}",
-        nfc: "\u{1F222}",
-        nfd: "\u{1F222}",
-        nfkc: "\u{751F}",
-        nfkd: "\u{751F}",
-    },
-    NormalizationTest {
-        source: "\u{1F223}",
-        nfc: "\u{1F223}",
-        nfd: "\u{1F223}",
-        nfkc: "\u{8CA9}",
-        nfkd: "\u{8CA9}",
-    },
-    NormalizationTest {
-        source: "\u{1F224}",
-        nfc: "\u{1F224}",
-        nfd: "\u{1F224}",
-        nfkc: "\u{58F0}",
-        nfkd: "\u{58F0}",
-    },
-    NormalizationTest {
-        source: "\u{1F225}",
-        nfc: "\u{1F225}",
-        nfd: "\u{1F225}",
-        nfkc: "\u{5439}",
-        nfkd: "\u{5439}",
-    },
-    NormalizationTest {
-        source: "\u{1F226}",
-        nfc: "\u{1F226}",
-        nfd: "\u{1F226}",
-        nfkc: "\u{6F14}",
-        nfkd: "\u{6F14}",
-    },
-    NormalizationTest {
-        source: "\u{1F227}",
-        nfc: "\u{1F227}",
-        nfd: "\u{1F227}",
-        nfkc: "\u{6295}",
-        nfkd: "\u{6295}",
-    },
-    NormalizationTest {
-        source: "\u{1F228}",
-        nfc: "\u{1F228}",
-        nfd: "\u{1F228}",
-        nfkc: "\u{6355}",
-        nfkd: "\u{6355}",
-    },
-    NormalizationTest {
-        source: "\u{1F229}",
-        nfc: "\u{1F229}",
-        nfd: "\u{1F229}",
-        nfkc: "\u{4E00}",
-        nfkd: "\u{4E00}",
-    },
-    NormalizationTest {
-        source: "\u{1F22A}",
-        nfc: "\u{1F22A}",
-        nfd: "\u{1F22A}",
-        nfkc: "\u{4E09}",
-        nfkd: "\u{4E09}",
-    },
-    NormalizationTest {
-        source: "\u{1F22B}",
-        nfc: "\u{1F22B}",
-        nfd: "\u{1F22B}",
-        nfkc: "\u{904A}",
-        nfkd: "\u{904A}",
-    },
-    NormalizationTest {
-        source: "\u{1F22C}",
-        nfc: "\u{1F22C}",
-        nfd: "\u{1F22C}",
-        nfkc: "\u{5DE6}",
-        nfkd: "\u{5DE6}",
-    },
-    NormalizationTest {
-        source: "\u{1F22D}",
-        nfc: "\u{1F22D}",
-        nfd: "\u{1F22D}",
-        nfkc: "\u{4E2D}",
-        nfkd: "\u{4E2D}",
-    },
-    NormalizationTest {
-        source: "\u{1F22E}",
-        nfc: "\u{1F22E}",
-        nfd: "\u{1F22E}",
-        nfkc: "\u{53F3}",
-        nfkd: "\u{53F3}",
-    },
-    NormalizationTest {
-        source: "\u{1F22F}",
-        nfc: "\u{1F22F}",
-        nfd: "\u{1F22F}",
-        nfkc: "\u{6307}",
-        nfkd: "\u{6307}",
-    },
-    NormalizationTest {
-        source: "\u{1F230}",
-        nfc: "\u{1F230}",
-        nfd: "\u{1F230}",
-        nfkc: "\u{8D70}",
-        nfkd: "\u{8D70}",
-    },
-    NormalizationTest {
-        source: "\u{1F231}",
-        nfc: "\u{1F231}",
-        nfd: "\u{1F231}",
-        nfkc: "\u{6253}",
-        nfkd: "\u{6253}",
-    },
-    NormalizationTest {
-        source: "\u{1F232}",
-        nfc: "\u{1F232}",
-        nfd: "\u{1F232}",
-        nfkc: "\u{7981}",
-        nfkd: "\u{7981}",
-    },
-    NormalizationTest {
-        source: "\u{1F233}",
-        nfc: "\u{1F233}",
-        nfd: "\u{1F233}",
-        nfkc: "\u{7A7A}",
-        nfkd: "\u{7A7A}",
-    },
-    NormalizationTest {
-        source: "\u{1F234}",
-        nfc: "\u{1F234}",
-        nfd: "\u{1F234}",
-        nfkc: "\u{5408}",
-        nfkd: "\u{5408}",
-    },
-    NormalizationTest {
-        source: "\u{1F235}",
-        nfc: "\u{1F235}",
-        nfd: "\u{1F235}",
-        nfkc: "\u{6E80}",
-        nfkd: "\u{6E80}",
-    },
-    NormalizationTest {
-        source: "\u{1F236}",
-        nfc: "\u{1F236}",
-        nfd: "\u{1F236}",
-        nfkc: "\u{6709}",
-        nfkd: "\u{6709}",
-    },
-    NormalizationTest {
-        source: "\u{1F237}",
-        nfc: "\u{1F237}",
-        nfd: "\u{1F237}",
-        nfkc: "\u{6708}",
-        nfkd: "\u{6708}",
-    },
-    NormalizationTest {
-        source: "\u{1F238}",
-        nfc: "\u{1F238}",
-        nfd: "\u{1F238}",
-        nfkc: "\u{7533}",
-        nfkd: "\u{7533}",
-    },
-    NormalizationTest {
-        source: "\u{1F239}",
-        nfc: "\u{1F239}",
-        nfd: "\u{1F239}",
-        nfkc: "\u{5272}",
-        nfkd: "\u{5272}",
-    },
-    NormalizationTest {
-        source: "\u{1F23A}",
-        nfc: "\u{1F23A}",
-        nfd: "\u{1F23A}",
-        nfkc: "\u{55B6}",
-        nfkd: "\u{55B6}",
-    },
-    NormalizationTest {
-        source: "\u{1F23B}",
-        nfc: "\u{1F23B}",
-        nfd: "\u{1F23B}",
-        nfkc: "\u{914D}",
-        nfkd: "\u{914D}",
-    },
-    NormalizationTest {
-        source: "\u{1F240}",
-        nfc: "\u{1F240}",
-        nfd: "\u{1F240}",
-        nfkc: "\u{3014}\u{672C}\u{3015}",
-        nfkd: "\u{3014}\u{672C}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F241}",
-        nfc: "\u{1F241}",
-        nfd: "\u{1F241}",
-        nfkc: "\u{3014}\u{4E09}\u{3015}",
-        nfkd: "\u{3014}\u{4E09}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F242}",
-        nfc: "\u{1F242}",
-        nfd: "\u{1F242}",
-        nfkc: "\u{3014}\u{4E8C}\u{3015}",
-        nfkd: "\u{3014}\u{4E8C}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F243}",
-        nfc: "\u{1F243}",
-        nfd: "\u{1F243}",
-        nfkc: "\u{3014}\u{5B89}\u{3015}",
-        nfkd: "\u{3014}\u{5B89}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F244}",
-        nfc: "\u{1F244}",
-        nfd: "\u{1F244}",
-        nfkc: "\u{3014}\u{70B9}\u{3015}",
-        nfkd: "\u{3014}\u{70B9}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F245}",
-        nfc: "\u{1F245}",
-        nfd: "\u{1F245}",
-        nfkc: "\u{3014}\u{6253}\u{3015}",
-        nfkd: "\u{3014}\u{6253}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F246}",
-        nfc: "\u{1F246}",
-        nfd: "\u{1F246}",
-        nfkc: "\u{3014}\u{76D7}\u{3015}",
-        nfkd: "\u{3014}\u{76D7}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F247}",
-        nfc: "\u{1F247}",
-        nfd: "\u{1F247}",
-        nfkc: "\u{3014}\u{52DD}\u{3015}",
-        nfkd: "\u{3014}\u{52DD}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F248}",
-        nfc: "\u{1F248}",
-        nfd: "\u{1F248}",
-        nfkc: "\u{3014}\u{6557}\u{3015}",
-        nfkd: "\u{3014}\u{6557}\u{3015}",
-    },
-    NormalizationTest {
-        source: "\u{1F250}",
-        nfc: "\u{1F250}",
-        nfd: "\u{1F250}",
-        nfkc: "\u{5F97}",
-        nfkd: "\u{5F97}",
-    },
-    NormalizationTest {
-        source: "\u{1F251}",
-        nfc: "\u{1F251}",
-        nfd: "\u{1F251}",
-        nfkc: "\u{53EF}",
-        nfkd: "\u{53EF}",
-    },
-    NormalizationTest {
-        source: "\u{2F800}",
-        nfc: "\u{4E3D}",
-        nfd: "\u{4E3D}",
-        nfkc: "\u{4E3D}",
-        nfkd: "\u{4E3D}",
-    },
-    NormalizationTest {
-        source: "\u{2F801}",
-        nfc: "\u{4E38}",
-        nfd: "\u{4E38}",
-        nfkc: "\u{4E38}",
-        nfkd: "\u{4E38}",
-    },
-    NormalizationTest {
-        source: "\u{2F802}",
-        nfc: "\u{4E41}",
-        nfd: "\u{4E41}",
-        nfkc: "\u{4E41}",
-        nfkd: "\u{4E41}",
-    },
-    NormalizationTest {
-        source: "\u{2F803}",
-        nfc: "\u{20122}",
-        nfd: "\u{20122}",
-        nfkc: "\u{20122}",
-        nfkd: "\u{20122}",
-    },
-    NormalizationTest {
-        source: "\u{2F804}",
-        nfc: "\u{4F60}",
-        nfd: "\u{4F60}",
-        nfkc: "\u{4F60}",
-        nfkd: "\u{4F60}",
-    },
-    NormalizationTest {
-        source: "\u{2F805}",
-        nfc: "\u{4FAE}",
-        nfd: "\u{4FAE}",
-        nfkc: "\u{4FAE}",
-        nfkd: "\u{4FAE}",
-    },
-    NormalizationTest {
-        source: "\u{2F806}",
-        nfc: "\u{4FBB}",
-        nfd: "\u{4FBB}",
-        nfkc: "\u{4FBB}",
-        nfkd: "\u{4FBB}",
-    },
-    NormalizationTest {
-        source: "\u{2F807}",
-        nfc: "\u{5002}",
-        nfd: "\u{5002}",
-        nfkc: "\u{5002}",
-        nfkd: "\u{5002}",
-    },
-    NormalizationTest {
-        source: "\u{2F808}",
-        nfc: "\u{507A}",
-        nfd: "\u{507A}",
-        nfkc: "\u{507A}",
-        nfkd: "\u{507A}",
-    },
-    NormalizationTest {
-        source: "\u{2F809}",
-        nfc: "\u{5099}",
-        nfd: "\u{5099}",
-        nfkc: "\u{5099}",
-        nfkd: "\u{5099}",
-    },
-    NormalizationTest {
-        source: "\u{2F80A}",
-        nfc: "\u{50E7}",
-        nfd: "\u{50E7}",
-        nfkc: "\u{50E7}",
-        nfkd: "\u{50E7}",
-    },
-    NormalizationTest {
-        source: "\u{2F80B}",
-        nfc: "\u{50CF}",
-        nfd: "\u{50CF}",
-        nfkc: "\u{50CF}",
-        nfkd: "\u{50CF}",
-    },
-    NormalizationTest {
-        source: "\u{2F80C}",
-        nfc: "\u{349E}",
-        nfd: "\u{349E}",
-        nfkc: "\u{349E}",
-        nfkd: "\u{349E}",
-    },
-    NormalizationTest {
-        source: "\u{2F80D}",
-        nfc: "\u{2063A}",
-        nfd: "\u{2063A}",
-        nfkc: "\u{2063A}",
-        nfkd: "\u{2063A}",
-    },
-    NormalizationTest {
-        source: "\u{2F80E}",
-        nfc: "\u{514D}",
-        nfd: "\u{514D}",
-        nfkc: "\u{514D}",
-        nfkd: "\u{514D}",
-    },
-    NormalizationTest {
-        source: "\u{2F80F}",
-        nfc: "\u{5154}",
-        nfd: "\u{5154}",
-        nfkc: "\u{5154}",
-        nfkd: "\u{5154}",
-    },
-    NormalizationTest {
-        source: "\u{2F810}",
-        nfc: "\u{5164}",
-        nfd: "\u{5164}",
-        nfkc: "\u{5164}",
-        nfkd: "\u{5164}",
-    },
-    NormalizationTest {
-        source: "\u{2F811}",
-        nfc: "\u{5177}",
-        nfd: "\u{5177}",
-        nfkc: "\u{5177}",
-        nfkd: "\u{5177}",
-    },
-    NormalizationTest {
-        source: "\u{2F812}",
-        nfc: "\u{2051C}",
-        nfd: "\u{2051C}",
-        nfkc: "\u{2051C}",
-        nfkd: "\u{2051C}",
-    },
-    NormalizationTest {
-        source: "\u{2F813}",
-        nfc: "\u{34B9}",
-        nfd: "\u{34B9}",
-        nfkc: "\u{34B9}",
-        nfkd: "\u{34B9}",
-    },
-    NormalizationTest {
-        source: "\u{2F814}",
-        nfc: "\u{5167}",
-        nfd: "\u{5167}",
-        nfkc: "\u{5167}",
-        nfkd: "\u{5167}",
-    },
-    NormalizationTest {
-        source: "\u{2F815}",
-        nfc: "\u{518D}",
-        nfd: "\u{518D}",
-        nfkc: "\u{518D}",
-        nfkd: "\u{518D}",
-    },
-    NormalizationTest {
-        source: "\u{2F816}",
-        nfc: "\u{2054B}",
-        nfd: "\u{2054B}",
-        nfkc: "\u{2054B}",
-        nfkd: "\u{2054B}",
-    },
-    NormalizationTest {
-        source: "\u{2F817}",
-        nfc: "\u{5197}",
-        nfd: "\u{5197}",
-        nfkc: "\u{5197}",
-        nfkd: "\u{5197}",
-    },
-    NormalizationTest {
-        source: "\u{2F818}",
-        nfc: "\u{51A4}",
-        nfd: "\u{51A4}",
-        nfkc: "\u{51A4}",
-        nfkd: "\u{51A4}",
-    },
-    NormalizationTest {
-        source: "\u{2F819}",
-        nfc: "\u{4ECC}",
-        nfd: "\u{4ECC}",
-        nfkc: "\u{4ECC}",
-        nfkd: "\u{4ECC}",
-    },
-    NormalizationTest {
-        source: "\u{2F81A}",
-        nfc: "\u{51AC}",
-        nfd: "\u{51AC}",
-        nfkc: "\u{51AC}",
-        nfkd: "\u{51AC}",
-    },
-    NormalizationTest {
-        source: "\u{2F81B}",
-        nfc: "\u{51B5}",
-        nfd: "\u{51B5}",
-        nfkc: "\u{51B5}",
-        nfkd: "\u{51B5}",
-    },
-    NormalizationTest {
-        source: "\u{2F81C}",
-        nfc: "\u{291DF}",
-        nfd: "\u{291DF}",
-        nfkc: "\u{291DF}",
-        nfkd: "\u{291DF}",
-    },
-    NormalizationTest {
-        source: "\u{2F81D}",
-        nfc: "\u{51F5}",
-        nfd: "\u{51F5}",
-        nfkc: "\u{51F5}",
-        nfkd: "\u{51F5}",
-    },
-    NormalizationTest {
-        source: "\u{2F81E}",
-        nfc: "\u{5203}",
-        nfd: "\u{5203}",
-        nfkc: "\u{5203}",
-        nfkd: "\u{5203}",
-    },
-    NormalizationTest {
-        source: "\u{2F81F}",
-        nfc: "\u{34DF}",
-        nfd: "\u{34DF}",
-        nfkc: "\u{34DF}",
-        nfkd: "\u{34DF}",
-    },
-    NormalizationTest {
-        source: "\u{2F820}",
-        nfc: "\u{523B}",
-        nfd: "\u{523B}",
-        nfkc: "\u{523B}",
-        nfkd: "\u{523B}",
-    },
-    NormalizationTest {
-        source: "\u{2F821}",
-        nfc: "\u{5246}",
-        nfd: "\u{5246}",
-        nfkc: "\u{5246}",
-        nfkd: "\u{5246}",
-    },
-    NormalizationTest {
-        source: "\u{2F822}",
-        nfc: "\u{5272}",
-        nfd: "\u{5272}",
-        nfkc: "\u{5272}",
-        nfkd: "\u{5272}",
-    },
-    NormalizationTest {
-        source: "\u{2F823}",
-        nfc: "\u{5277}",
-        nfd: "\u{5277}",
-        nfkc: "\u{5277}",
-        nfkd: "\u{5277}",
-    },
-    NormalizationTest {
-        source: "\u{2F824}",
-        nfc: "\u{3515}",
-        nfd: "\u{3515}",
-        nfkc: "\u{3515}",
-        nfkd: "\u{3515}",
-    },
-    NormalizationTest {
-        source: "\u{2F825}",
-        nfc: "\u{52C7}",
-        nfd: "\u{52C7}",
-        nfkc: "\u{52C7}",
-        nfkd: "\u{52C7}",
-    },
-    NormalizationTest {
-        source: "\u{2F826}",
-        nfc: "\u{52C9}",
-        nfd: "\u{52C9}",
-        nfkc: "\u{52C9}",
-        nfkd: "\u{52C9}",
-    },
-    NormalizationTest {
-        source: "\u{2F827}",
-        nfc: "\u{52E4}",
-        nfd: "\u{52E4}",
-        nfkc: "\u{52E4}",
-        nfkd: "\u{52E4}",
-    },
-    NormalizationTest {
-        source: "\u{2F828}",
-        nfc: "\u{52FA}",
-        nfd: "\u{52FA}",
-        nfkc: "\u{52FA}",
-        nfkd: "\u{52FA}",
-    },
-    NormalizationTest {
-        source: "\u{2F829}",
-        nfc: "\u{5305}",
-        nfd: "\u{5305}",
-        nfkc: "\u{5305}",
-        nfkd: "\u{5305}",
-    },
-    NormalizationTest {
-        source: "\u{2F82A}",
-        nfc: "\u{5306}",
-        nfd: "\u{5306}",
-        nfkc: "\u{5306}",
-        nfkd: "\u{5306}",
-    },
-    NormalizationTest {
-        source: "\u{2F82B}",
-        nfc: "\u{5317}",
-        nfd: "\u{5317}",
-        nfkc: "\u{5317}",
-        nfkd: "\u{5317}",
-    },
-    NormalizationTest {
-        source: "\u{2F82C}",
-        nfc: "\u{5349}",
-        nfd: "\u{5349}",
-        nfkc: "\u{5349}",
-        nfkd: "\u{5349}",
-    },
-    NormalizationTest {
-        source: "\u{2F82D}",
-        nfc: "\u{5351}",
-        nfd: "\u{5351}",
-        nfkc: "\u{5351}",
-        nfkd: "\u{5351}",
-    },
-    NormalizationTest {
-        source: "\u{2F82E}",
-        nfc: "\u{535A}",
-        nfd: "\u{535A}",
-        nfkc: "\u{535A}",
-        nfkd: "\u{535A}",
-    },
-    NormalizationTest {
-        source: "\u{2F82F}",
-        nfc: "\u{5373}",
-        nfd: "\u{5373}",
-        nfkc: "\u{5373}",
-        nfkd: "\u{5373}",
-    },
-    NormalizationTest {
-        source: "\u{2F830}",
-        nfc: "\u{537D}",
-        nfd: "\u{537D}",
-        nfkc: "\u{537D}",
-        nfkd: "\u{537D}",
-    },
-    NormalizationTest {
-        source: "\u{2F831}",
-        nfc: "\u{537F}",
-        nfd: "\u{537F}",
-        nfkc: "\u{537F}",
-        nfkd: "\u{537F}",
-    },
-    NormalizationTest {
-        source: "\u{2F832}",
-        nfc: "\u{537F}",
-        nfd: "\u{537F}",
-        nfkc: "\u{537F}",
-        nfkd: "\u{537F}",
-    },
-    NormalizationTest {
-        source: "\u{2F833}",
-        nfc: "\u{537F}",
-        nfd: "\u{537F}",
-        nfkc: "\u{537F}",
-        nfkd: "\u{537F}",
-    },
-    NormalizationTest {
-        source: "\u{2F834}",
-        nfc: "\u{20A2C}",
-        nfd: "\u{20A2C}",
-        nfkc: "\u{20A2C}",
-        nfkd: "\u{20A2C}",
-    },
-    NormalizationTest {
-        source: "\u{2F835}",
-        nfc: "\u{7070}",
-        nfd: "\u{7070}",
-        nfkc: "\u{7070}",
-        nfkd: "\u{7070}",
-    },
-    NormalizationTest {
-        source: "\u{2F836}",
-        nfc: "\u{53CA}",
-        nfd: "\u{53CA}",
-        nfkc: "\u{53CA}",
-        nfkd: "\u{53CA}",
-    },
-    NormalizationTest {
-        source: "\u{2F837}",
-        nfc: "\u{53DF}",
-        nfd: "\u{53DF}",
-        nfkc: "\u{53DF}",
-        nfkd: "\u{53DF}",
-    },
-    NormalizationTest {
-        source: "\u{2F838}",
-        nfc: "\u{20B63}",
-        nfd: "\u{20B63}",
-        nfkc: "\u{20B63}",
-        nfkd: "\u{20B63}",
-    },
-    NormalizationTest {
-        source: "\u{2F839}",
-        nfc: "\u{53EB}",
-        nfd: "\u{53EB}",
-        nfkc: "\u{53EB}",
-        nfkd: "\u{53EB}",
-    },
-    NormalizationTest {
-        source: "\u{2F83A}",
-        nfc: "\u{53F1}",
-        nfd: "\u{53F1}",
-        nfkc: "\u{53F1}",
-        nfkd: "\u{53F1}",
-    },
-    NormalizationTest {
-        source: "\u{2F83B}",
-        nfc: "\u{5406}",
-        nfd: "\u{5406}",
-        nfkc: "\u{5406}",
-        nfkd: "\u{5406}",
-    },
-    NormalizationTest {
-        source: "\u{2F83C}",
-        nfc: "\u{549E}",
-        nfd: "\u{549E}",
-        nfkc: "\u{549E}",
-        nfkd: "\u{549E}",
-    },
-    NormalizationTest {
-        source: "\u{2F83D}",
-        nfc: "\u{5438}",
-        nfd: "\u{5438}",
-        nfkc: "\u{5438}",
-        nfkd: "\u{5438}",
-    },
-    NormalizationTest {
-        source: "\u{2F83E}",
-        nfc: "\u{5448}",
-        nfd: "\u{5448}",
-        nfkc: "\u{5448}",
-        nfkd: "\u{5448}",
-    },
-    NormalizationTest {
-        source: "\u{2F83F}",
-        nfc: "\u{5468}",
-        nfd: "\u{5468}",
-        nfkc: "\u{5468}",
-        nfkd: "\u{5468}",
-    },
-    NormalizationTest {
-        source: "\u{2F840}",
-        nfc: "\u{54A2}",
-        nfd: "\u{54A2}",
-        nfkc: "\u{54A2}",
-        nfkd: "\u{54A2}",
-    },
-    NormalizationTest {
-        source: "\u{2F841}",
-        nfc: "\u{54F6}",
-        nfd: "\u{54F6}",
-        nfkc: "\u{54F6}",
-        nfkd: "\u{54F6}",
-    },
-    NormalizationTest {
-        source: "\u{2F842}",
-        nfc: "\u{5510}",
-        nfd: "\u{5510}",
-        nfkc: "\u{5510}",
-        nfkd: "\u{5510}",
-    },
-    NormalizationTest {
-        source: "\u{2F843}",
-        nfc: "\u{5553}",
-        nfd: "\u{5553}",
-        nfkc: "\u{5553}",
-        nfkd: "\u{5553}",
-    },
-    NormalizationTest {
-        source: "\u{2F844}",
-        nfc: "\u{5563}",
-        nfd: "\u{5563}",
-        nfkc: "\u{5563}",
-        nfkd: "\u{5563}",
-    },
-    NormalizationTest {
-        source: "\u{2F845}",
-        nfc: "\u{5584}",
-        nfd: "\u{5584}",
-        nfkc: "\u{5584}",
-        nfkd: "\u{5584}",
-    },
-    NormalizationTest {
-        source: "\u{2F846}",
-        nfc: "\u{5584}",
-        nfd: "\u{5584}",
-        nfkc: "\u{5584}",
-        nfkd: "\u{5584}",
-    },
-    NormalizationTest {
-        source: "\u{2F847}",
-        nfc: "\u{5599}",
-        nfd: "\u{5599}",
-        nfkc: "\u{5599}",
-        nfkd: "\u{5599}",
-    },
-    NormalizationTest {
-        source: "\u{2F848}",
-        nfc: "\u{55AB}",
-        nfd: "\u{55AB}",
-        nfkc: "\u{55AB}",
-        nfkd: "\u{55AB}",
-    },
-    NormalizationTest {
-        source: "\u{2F849}",
-        nfc: "\u{55B3}",
-        nfd: "\u{55B3}",
-        nfkc: "\u{55B3}",
-        nfkd: "\u{55B3}",
-    },
-    NormalizationTest {
-        source: "\u{2F84A}",
-        nfc: "\u{55C2}",
-        nfd: "\u{55C2}",
-        nfkc: "\u{55C2}",
-        nfkd: "\u{55C2}",
-    },
-    NormalizationTest {
-        source: "\u{2F84B}",
-        nfc: "\u{5716}",
-        nfd: "\u{5716}",
-        nfkc: "\u{5716}",
-        nfkd: "\u{5716}",
-    },
-    NormalizationTest {
-        source: "\u{2F84C}",
-        nfc: "\u{5606}",
-        nfd: "\u{5606}",
-        nfkc: "\u{5606}",
-        nfkd: "\u{5606}",
-    },
-    NormalizationTest {
-        source: "\u{2F84D}",
-        nfc: "\u{5717}",
-        nfd: "\u{5717}",
-        nfkc: "\u{5717}",
-        nfkd: "\u{5717}",
-    },
-    NormalizationTest {
-        source: "\u{2F84E}",
-        nfc: "\u{5651}",
-        nfd: "\u{5651}",
-        nfkc: "\u{5651}",
-        nfkd: "\u{5651}",
-    },
-    NormalizationTest {
-        source: "\u{2F84F}",
-        nfc: "\u{5674}",
-        nfd: "\u{5674}",
-        nfkc: "\u{5674}",
-        nfkd: "\u{5674}",
-    },
-    NormalizationTest {
-        source: "\u{2F850}",
-        nfc: "\u{5207}",
-        nfd: "\u{5207}",
-        nfkc: "\u{5207}",
-        nfkd: "\u{5207}",
-    },
-    NormalizationTest {
-        source: "\u{2F851}",
-        nfc: "\u{58EE}",
-        nfd: "\u{58EE}",
-        nfkc: "\u{58EE}",
-        nfkd: "\u{58EE}",
-    },
-    NormalizationTest {
-        source: "\u{2F852}",
-        nfc: "\u{57CE}",
-        nfd: "\u{57CE}",
-        nfkc: "\u{57CE}",
-        nfkd: "\u{57CE}",
-    },
-    NormalizationTest {
-        source: "\u{2F853}",
-        nfc: "\u{57F4}",
-        nfd: "\u{57F4}",
-        nfkc: "\u{57F4}",
-        nfkd: "\u{57F4}",
-    },
-    NormalizationTest {
-        source: "\u{2F854}",
-        nfc: "\u{580D}",
-        nfd: "\u{580D}",
-        nfkc: "\u{580D}",
-        nfkd: "\u{580D}",
-    },
-    NormalizationTest {
-        source: "\u{2F855}",
-        nfc: "\u{578B}",
-        nfd: "\u{578B}",
-        nfkc: "\u{578B}",
-        nfkd: "\u{578B}",
-    },
-    NormalizationTest {
-        source: "\u{2F856}",
-        nfc: "\u{5832}",
-        nfd: "\u{5832}",
-        nfkc: "\u{5832}",
-        nfkd: "\u{5832}",
-    },
-    NormalizationTest {
-        source: "\u{2F857}",
-        nfc: "\u{5831}",
-        nfd: "\u{5831}",
-        nfkc: "\u{5831}",
-        nfkd: "\u{5831}",
-    },
-    NormalizationTest {
-        source: "\u{2F858}",
-        nfc: "\u{58AC}",
-        nfd: "\u{58AC}",
-        nfkc: "\u{58AC}",
-        nfkd: "\u{58AC}",
-    },
-    NormalizationTest {
-        source: "\u{2F859}",
-        nfc: "\u{214E4}",
-        nfd: "\u{214E4}",
-        nfkc: "\u{214E4}",
-        nfkd: "\u{214E4}",
-    },
-    NormalizationTest {
-        source: "\u{2F85A}",
-        nfc: "\u{58F2}",
-        nfd: "\u{58F2}",
-        nfkc: "\u{58F2}",
-        nfkd: "\u{58F2}",
-    },
-    NormalizationTest {
-        source: "\u{2F85B}",
-        nfc: "\u{58F7}",
-        nfd: "\u{58F7}",
-        nfkc: "\u{58F7}",
-        nfkd: "\u{58F7}",
-    },
-    NormalizationTest {
-        source: "\u{2F85C}",
-        nfc: "\u{5906}",
-        nfd: "\u{5906}",
-        nfkc: "\u{5906}",
-        nfkd: "\u{5906}",
-    },
-    NormalizationTest {
-        source: "\u{2F85D}",
-        nfc: "\u{591A}",
-        nfd: "\u{591A}",
-        nfkc: "\u{591A}",
-        nfkd: "\u{591A}",
-    },
-    NormalizationTest {
-        source: "\u{2F85E}",
-        nfc: "\u{5922}",
-        nfd: "\u{5922}",
-        nfkc: "\u{5922}",
-        nfkd: "\u{5922}",
-    },
-    NormalizationTest {
-        source: "\u{2F85F}",
-        nfc: "\u{5962}",
-        nfd: "\u{5962}",
-        nfkc: "\u{5962}",
-        nfkd: "\u{5962}",
-    },
-    NormalizationTest {
-        source: "\u{2F860}",
-        nfc: "\u{216A8}",
-        nfd: "\u{216A8}",
-        nfkc: "\u{216A8}",
-        nfkd: "\u{216A8}",
-    },
-    NormalizationTest {
-        source: "\u{2F861}",
-        nfc: "\u{216EA}",
-        nfd: "\u{216EA}",
-        nfkc: "\u{216EA}",
-        nfkd: "\u{216EA}",
-    },
-    NormalizationTest {
-        source: "\u{2F862}",
-        nfc: "\u{59EC}",
-        nfd: "\u{59EC}",
-        nfkc: "\u{59EC}",
-        nfkd: "\u{59EC}",
-    },
-    NormalizationTest {
-        source: "\u{2F863}",
-        nfc: "\u{5A1B}",
-        nfd: "\u{5A1B}",
-        nfkc: "\u{5A1B}",
-        nfkd: "\u{5A1B}",
-    },
-    NormalizationTest {
-        source: "\u{2F864}",
-        nfc: "\u{5A27}",
-        nfd: "\u{5A27}",
-        nfkc: "\u{5A27}",
-        nfkd: "\u{5A27}",
-    },
-    NormalizationTest {
-        source: "\u{2F865}",
-        nfc: "\u{59D8}",
-        nfd: "\u{59D8}",
-        nfkc: "\u{59D8}",
-        nfkd: "\u{59D8}",
-    },
-    NormalizationTest {
-        source: "\u{2F866}",
-        nfc: "\u{5A66}",
-        nfd: "\u{5A66}",
-        nfkc: "\u{5A66}",
-        nfkd: "\u{5A66}",
-    },
-    NormalizationTest {
-        source: "\u{2F867}",
-        nfc: "\u{36EE}",
-        nfd: "\u{36EE}",
-        nfkc: "\u{36EE}",
-        nfkd: "\u{36EE}",
-    },
-    NormalizationTest {
-        source: "\u{2F868}",
-        nfc: "\u{36FC}",
-        nfd: "\u{36FC}",
-        nfkc: "\u{36FC}",
-        nfkd: "\u{36FC}",
-    },
-    NormalizationTest {
-        source: "\u{2F869}",
-        nfc: "\u{5B08}",
-        nfd: "\u{5B08}",
-        nfkc: "\u{5B08}",
-        nfkd: "\u{5B08}",
-    },
-    NormalizationTest {
-        source: "\u{2F86A}",
-        nfc: "\u{5B3E}",
-        nfd: "\u{5B3E}",
-        nfkc: "\u{5B3E}",
-        nfkd: "\u{5B3E}",
-    },
-    NormalizationTest {
-        source: "\u{2F86B}",
-        nfc: "\u{5B3E}",
-        nfd: "\u{5B3E}",
-        nfkc: "\u{5B3E}",
-        nfkd: "\u{5B3E}",
-    },
-    NormalizationTest {
-        source: "\u{2F86C}",
-        nfc: "\u{219C8}",
-        nfd: "\u{219C8}",
-        nfkc: "\u{219C8}",
-        nfkd: "\u{219C8}",
-    },
-    NormalizationTest {
-        source: "\u{2F86D}",
-        nfc: "\u{5BC3}",
-        nfd: "\u{5BC3}",
-        nfkc: "\u{5BC3}",
-        nfkd: "\u{5BC3}",
-    },
-    NormalizationTest {
-        source: "\u{2F86E}",
-        nfc: "\u{5BD8}",
-        nfd: "\u{5BD8}",
-        nfkc: "\u{5BD8}",
-        nfkd: "\u{5BD8}",
-    },
-    NormalizationTest {
-        source: "\u{2F86F}",
-        nfc: "\u{5BE7}",
-        nfd: "\u{5BE7}",
-        nfkc: "\u{5BE7}",
-        nfkd: "\u{5BE7}",
-    },
-    NormalizationTest {
-        source: "\u{2F870}",
-        nfc: "\u{5BF3}",
-        nfd: "\u{5BF3}",
-        nfkc: "\u{5BF3}",
-        nfkd: "\u{5BF3}",
-    },
-    NormalizationTest {
-        source: "\u{2F871}",
-        nfc: "\u{21B18}",
-        nfd: "\u{21B18}",
-        nfkc: "\u{21B18}",
-        nfkd: "\u{21B18}",
-    },
-    NormalizationTest {
-        source: "\u{2F872}",
-        nfc: "\u{5BFF}",
-        nfd: "\u{5BFF}",
-        nfkc: "\u{5BFF}",
-        nfkd: "\u{5BFF}",
-    },
-    NormalizationTest {
-        source: "\u{2F873}",
-        nfc: "\u{5C06}",
-        nfd: "\u{5C06}",
-        nfkc: "\u{5C06}",
-        nfkd: "\u{5C06}",
-    },
-    NormalizationTest {
-        source: "\u{2F874}",
-        nfc: "\u{5F53}",
-        nfd: "\u{5F53}",
-        nfkc: "\u{5F53}",
-        nfkd: "\u{5F53}",
-    },
-    NormalizationTest {
-        source: "\u{2F875}",
-        nfc: "\u{5C22}",
-        nfd: "\u{5C22}",
-        nfkc: "\u{5C22}",
-        nfkd: "\u{5C22}",
-    },
-    NormalizationTest {
-        source: "\u{2F876}",
-        nfc: "\u{3781}",
-        nfd: "\u{3781}",
-        nfkc: "\u{3781}",
-        nfkd: "\u{3781}",
-    },
-    NormalizationTest {
-        source: "\u{2F877}",
-        nfc: "\u{5C60}",
-        nfd: "\u{5C60}",
-        nfkc: "\u{5C60}",
-        nfkd: "\u{5C60}",
-    },
-    NormalizationTest {
-        source: "\u{2F878}",
-        nfc: "\u{5C6E}",
-        nfd: "\u{5C6E}",
-        nfkc: "\u{5C6E}",
-        nfkd: "\u{5C6E}",
-    },
-    NormalizationTest {
-        source: "\u{2F879}",
-        nfc: "\u{5CC0}",
-        nfd: "\u{5CC0}",
-        nfkc: "\u{5CC0}",
-        nfkd: "\u{5CC0}",
-    },
-    NormalizationTest {
-        source: "\u{2F87A}",
-        nfc: "\u{5C8D}",
-        nfd: "\u{5C8D}",
-        nfkc: "\u{5C8D}",
-        nfkd: "\u{5C8D}",
-    },
-    NormalizationTest {
-        source: "\u{2F87B}",
-        nfc: "\u{21DE4}",
-        nfd: "\u{21DE4}",
-        nfkc: "\u{21DE4}",
-        nfkd: "\u{21DE4}",
-    },
-    NormalizationTest {
-        source: "\u{2F87C}",
-        nfc: "\u{5D43}",
-        nfd: "\u{5D43}",
-        nfkc: "\u{5D43}",
-        nfkd: "\u{5D43}",
-    },
-    NormalizationTest {
-        source: "\u{2F87D}",
-        nfc: "\u{21DE6}",
-        nfd: "\u{21DE6}",
-        nfkc: "\u{21DE6}",
-        nfkd: "\u{21DE6}",
-    },
-    NormalizationTest {
-        source: "\u{2F87E}",
-        nfc: "\u{5D6E}",
-        nfd: "\u{5D6E}",
-        nfkc: "\u{5D6E}",
-        nfkd: "\u{5D6E}",
-    },
-    NormalizationTest {
-        source: "\u{2F87F}",
-        nfc: "\u{5D6B}",
-        nfd: "\u{5D6B}",
-        nfkc: "\u{5D6B}",
-        nfkd: "\u{5D6B}",
-    },
-    NormalizationTest {
-        source: "\u{2F880}",
-        nfc: "\u{5D7C}",
-        nfd: "\u{5D7C}",
-        nfkc: "\u{5D7C}",
-        nfkd: "\u{5D7C}",
-    },
-    NormalizationTest {
-        source: "\u{2F881}",
-        nfc: "\u{5DE1}",
-        nfd: "\u{5DE1}",
-        nfkc: "\u{5DE1}",
-        nfkd: "\u{5DE1}",
-    },
-    NormalizationTest {
-        source: "\u{2F882}",
-        nfc: "\u{5DE2}",
-        nfd: "\u{5DE2}",
-        nfkc: "\u{5DE2}",
-        nfkd: "\u{5DE2}",
-    },
-    NormalizationTest {
-        source: "\u{2F883}",
-        nfc: "\u{382F}",
-        nfd: "\u{382F}",
-        nfkc: "\u{382F}",
-        nfkd: "\u{382F}",
-    },
-    NormalizationTest {
-        source: "\u{2F884}",
-        nfc: "\u{5DFD}",
-        nfd: "\u{5DFD}",
-        nfkc: "\u{5DFD}",
-        nfkd: "\u{5DFD}",
-    },
-    NormalizationTest {
-        source: "\u{2F885}",
-        nfc: "\u{5E28}",
-        nfd: "\u{5E28}",
-        nfkc: "\u{5E28}",
-        nfkd: "\u{5E28}",
-    },
-    NormalizationTest {
-        source: "\u{2F886}",
-        nfc: "\u{5E3D}",
-        nfd: "\u{5E3D}",
-        nfkc: "\u{5E3D}",
-        nfkd: "\u{5E3D}",
-    },
-    NormalizationTest {
-        source: "\u{2F887}",
-        nfc: "\u{5E69}",
-        nfd: "\u{5E69}",
-        nfkc: "\u{5E69}",
-        nfkd: "\u{5E69}",
-    },
-    NormalizationTest {
-        source: "\u{2F888}",
-        nfc: "\u{3862}",
-        nfd: "\u{3862}",
-        nfkc: "\u{3862}",
-        nfkd: "\u{3862}",
-    },
-    NormalizationTest {
-        source: "\u{2F889}",
-        nfc: "\u{22183}",
-        nfd: "\u{22183}",
-        nfkc: "\u{22183}",
-        nfkd: "\u{22183}",
-    },
-    NormalizationTest {
-        source: "\u{2F88A}",
-        nfc: "\u{387C}",
-        nfd: "\u{387C}",
-        nfkc: "\u{387C}",
-        nfkd: "\u{387C}",
-    },
-    NormalizationTest {
-        source: "\u{2F88B}",
-        nfc: "\u{5EB0}",
-        nfd: "\u{5EB0}",
-        nfkc: "\u{5EB0}",
-        nfkd: "\u{5EB0}",
-    },
-    NormalizationTest {
-        source: "\u{2F88C}",
-        nfc: "\u{5EB3}",
-        nfd: "\u{5EB3}",
-        nfkc: "\u{5EB3}",
-        nfkd: "\u{5EB3}",
-    },
-    NormalizationTest {
-        source: "\u{2F88D}",
-        nfc: "\u{5EB6}",
-        nfd: "\u{5EB6}",
-        nfkc: "\u{5EB6}",
-        nfkd: "\u{5EB6}",
-    },
-    NormalizationTest {
-        source: "\u{2F88E}",
-        nfc: "\u{5ECA}",
-        nfd: "\u{5ECA}",
-        nfkc: "\u{5ECA}",
-        nfkd: "\u{5ECA}",
-    },
-    NormalizationTest {
-        source: "\u{2F88F}",
-        nfc: "\u{2A392}",
-        nfd: "\u{2A392}",
-        nfkc: "\u{2A392}",
-        nfkd: "\u{2A392}",
-    },
-    NormalizationTest {
-        source: "\u{2F890}",
-        nfc: "\u{5EFE}",
-        nfd: "\u{5EFE}",
-        nfkc: "\u{5EFE}",
-        nfkd: "\u{5EFE}",
-    },
-    NormalizationTest {
-        source: "\u{2F891}",
-        nfc: "\u{22331}",
-        nfd: "\u{22331}",
-        nfkc: "\u{22331}",
-        nfkd: "\u{22331}",
-    },
-    NormalizationTest {
-        source: "\u{2F892}",
-        nfc: "\u{22331}",
-        nfd: "\u{22331}",
-        nfkc: "\u{22331}",
-        nfkd: "\u{22331}",
-    },
-    NormalizationTest {
-        source: "\u{2F893}",
-        nfc: "\u{8201}",
-        nfd: "\u{8201}",
-        nfkc: "\u{8201}",
-        nfkd: "\u{8201}",
-    },
-    NormalizationTest {
-        source: "\u{2F894}",
-        nfc: "\u{5F22}",
-        nfd: "\u{5F22}",
-        nfkc: "\u{5F22}",
-        nfkd: "\u{5F22}",
-    },
-    NormalizationTest {
-        source: "\u{2F895}",
-        nfc: "\u{5F22}",
-        nfd: "\u{5F22}",
-        nfkc: "\u{5F22}",
-        nfkd: "\u{5F22}",
-    },
-    NormalizationTest {
-        source: "\u{2F896}",
-        nfc: "\u{38C7}",
-        nfd: "\u{38C7}",
-        nfkc: "\u{38C7}",
-        nfkd: "\u{38C7}",
-    },
-    NormalizationTest {
-        source: "\u{2F897}",
-        nfc: "\u{232B8}",
-        nfd: "\u{232B8}",
-        nfkc: "\u{232B8}",
-        nfkd: "\u{232B8}",
-    },
-    NormalizationTest {
-        source: "\u{2F898}",
-        nfc: "\u{261DA}",
-        nfd: "\u{261DA}",
-        nfkc: "\u{261DA}",
-        nfkd: "\u{261DA}",
-    },
-    NormalizationTest {
-        source: "\u{2F899}",
-        nfc: "\u{5F62}",
-        nfd: "\u{5F62}",
-        nfkc: "\u{5F62}",
-        nfkd: "\u{5F62}",
-    },
-    NormalizationTest {
-        source: "\u{2F89A}",
-        nfc: "\u{5F6B}",
-        nfd: "\u{5F6B}",
-        nfkc: "\u{5F6B}",
-        nfkd: "\u{5F6B}",
-    },
-    NormalizationTest {
-        source: "\u{2F89B}",
-        nfc: "\u{38E3}",
-        nfd: "\u{38E3}",
-        nfkc: "\u{38E3}",
-        nfkd: "\u{38E3}",
-    },
-    NormalizationTest {
-        source: "\u{2F89C}",
-        nfc: "\u{5F9A}",
-        nfd: "\u{5F9A}",
-        nfkc: "\u{5F9A}",
-        nfkd: "\u{5F9A}",
-    },
-    NormalizationTest {
-        source: "\u{2F89D}",
-        nfc: "\u{5FCD}",
-        nfd: "\u{5FCD}",
-        nfkc: "\u{5FCD}",
-        nfkd: "\u{5FCD}",
-    },
-    NormalizationTest {
-        source: "\u{2F89E}",
-        nfc: "\u{5FD7}",
-        nfd: "\u{5FD7}",
-        nfkc: "\u{5FD7}",
-        nfkd: "\u{5FD7}",
-    },
-    NormalizationTest {
-        source: "\u{2F89F}",
-        nfc: "\u{5FF9}",
-        nfd: "\u{5FF9}",
-        nfkc: "\u{5FF9}",
-        nfkd: "\u{5FF9}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A0}",
-        nfc: "\u{6081}",
-        nfd: "\u{6081}",
-        nfkc: "\u{6081}",
-        nfkd: "\u{6081}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A1}",
-        nfc: "\u{393A}",
-        nfd: "\u{393A}",
-        nfkc: "\u{393A}",
-        nfkd: "\u{393A}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A2}",
-        nfc: "\u{391C}",
-        nfd: "\u{391C}",
-        nfkc: "\u{391C}",
-        nfkd: "\u{391C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A3}",
-        nfc: "\u{6094}",
-        nfd: "\u{6094}",
-        nfkc: "\u{6094}",
-        nfkd: "\u{6094}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A4}",
-        nfc: "\u{226D4}",
-        nfd: "\u{226D4}",
-        nfkc: "\u{226D4}",
-        nfkd: "\u{226D4}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A5}",
-        nfc: "\u{60C7}",
-        nfd: "\u{60C7}",
-        nfkc: "\u{60C7}",
-        nfkd: "\u{60C7}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A6}",
-        nfc: "\u{6148}",
-        nfd: "\u{6148}",
-        nfkc: "\u{6148}",
-        nfkd: "\u{6148}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A7}",
-        nfc: "\u{614C}",
-        nfd: "\u{614C}",
-        nfkc: "\u{614C}",
-        nfkd: "\u{614C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A8}",
-        nfc: "\u{614E}",
-        nfd: "\u{614E}",
-        nfkc: "\u{614E}",
-        nfkd: "\u{614E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8A9}",
-        nfc: "\u{614C}",
-        nfd: "\u{614C}",
-        nfkc: "\u{614C}",
-        nfkd: "\u{614C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8AA}",
-        nfc: "\u{617A}",
-        nfd: "\u{617A}",
-        nfkc: "\u{617A}",
-        nfkd: "\u{617A}",
-    },
-    NormalizationTest {
-        source: "\u{2F8AB}",
-        nfc: "\u{618E}",
-        nfd: "\u{618E}",
-        nfkc: "\u{618E}",
-        nfkd: "\u{618E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8AC}",
-        nfc: "\u{61B2}",
-        nfd: "\u{61B2}",
-        nfkc: "\u{61B2}",
-        nfkd: "\u{61B2}",
-    },
-    NormalizationTest {
-        source: "\u{2F8AD}",
-        nfc: "\u{61A4}",
-        nfd: "\u{61A4}",
-        nfkc: "\u{61A4}",
-        nfkd: "\u{61A4}",
-    },
-    NormalizationTest {
-        source: "\u{2F8AE}",
-        nfc: "\u{61AF}",
-        nfd: "\u{61AF}",
-        nfkc: "\u{61AF}",
-        nfkd: "\u{61AF}",
-    },
-    NormalizationTest {
-        source: "\u{2F8AF}",
-        nfc: "\u{61DE}",
-        nfd: "\u{61DE}",
-        nfkc: "\u{61DE}",
-        nfkd: "\u{61DE}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B0}",
-        nfc: "\u{61F2}",
-        nfd: "\u{61F2}",
-        nfkc: "\u{61F2}",
-        nfkd: "\u{61F2}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B1}",
-        nfc: "\u{61F6}",
-        nfd: "\u{61F6}",
-        nfkc: "\u{61F6}",
-        nfkd: "\u{61F6}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B2}",
-        nfc: "\u{6210}",
-        nfd: "\u{6210}",
-        nfkc: "\u{6210}",
-        nfkd: "\u{6210}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B3}",
-        nfc: "\u{621B}",
-        nfd: "\u{621B}",
-        nfkc: "\u{621B}",
-        nfkd: "\u{621B}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B4}",
-        nfc: "\u{625D}",
-        nfd: "\u{625D}",
-        nfkc: "\u{625D}",
-        nfkd: "\u{625D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B5}",
-        nfc: "\u{62B1}",
-        nfd: "\u{62B1}",
-        nfkc: "\u{62B1}",
-        nfkd: "\u{62B1}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B6}",
-        nfc: "\u{62D4}",
-        nfd: "\u{62D4}",
-        nfkc: "\u{62D4}",
-        nfkd: "\u{62D4}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B7}",
-        nfc: "\u{6350}",
-        nfd: "\u{6350}",
-        nfkc: "\u{6350}",
-        nfkd: "\u{6350}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B8}",
-        nfc: "\u{22B0C}",
-        nfd: "\u{22B0C}",
-        nfkc: "\u{22B0C}",
-        nfkd: "\u{22B0C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8B9}",
-        nfc: "\u{633D}",
-        nfd: "\u{633D}",
-        nfkc: "\u{633D}",
-        nfkd: "\u{633D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8BA}",
-        nfc: "\u{62FC}",
-        nfd: "\u{62FC}",
-        nfkc: "\u{62FC}",
-        nfkd: "\u{62FC}",
-    },
-    NormalizationTest {
-        source: "\u{2F8BB}",
-        nfc: "\u{6368}",
-        nfd: "\u{6368}",
-        nfkc: "\u{6368}",
-        nfkd: "\u{6368}",
-    },
-    NormalizationTest {
-        source: "\u{2F8BC}",
-        nfc: "\u{6383}",
-        nfd: "\u{6383}",
-        nfkc: "\u{6383}",
-        nfkd: "\u{6383}",
-    },
-    NormalizationTest {
-        source: "\u{2F8BD}",
-        nfc: "\u{63E4}",
-        nfd: "\u{63E4}",
-        nfkc: "\u{63E4}",
-        nfkd: "\u{63E4}",
-    },
-    NormalizationTest {
-        source: "\u{2F8BE}",
-        nfc: "\u{22BF1}",
-        nfd: "\u{22BF1}",
-        nfkc: "\u{22BF1}",
-        nfkd: "\u{22BF1}",
-    },
-    NormalizationTest {
-        source: "\u{2F8BF}",
-        nfc: "\u{6422}",
-        nfd: "\u{6422}",
-        nfkc: "\u{6422}",
-        nfkd: "\u{6422}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C0}",
-        nfc: "\u{63C5}",
-        nfd: "\u{63C5}",
-        nfkc: "\u{63C5}",
-        nfkd: "\u{63C5}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C1}",
-        nfc: "\u{63A9}",
-        nfd: "\u{63A9}",
-        nfkc: "\u{63A9}",
-        nfkd: "\u{63A9}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C2}",
-        nfc: "\u{3A2E}",
-        nfd: "\u{3A2E}",
-        nfkc: "\u{3A2E}",
-        nfkd: "\u{3A2E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C3}",
-        nfc: "\u{6469}",
-        nfd: "\u{6469}",
-        nfkc: "\u{6469}",
-        nfkd: "\u{6469}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C4}",
-        nfc: "\u{647E}",
-        nfd: "\u{647E}",
-        nfkc: "\u{647E}",
-        nfkd: "\u{647E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C5}",
-        nfc: "\u{649D}",
-        nfd: "\u{649D}",
-        nfkc: "\u{649D}",
-        nfkd: "\u{649D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C6}",
-        nfc: "\u{6477}",
-        nfd: "\u{6477}",
-        nfkc: "\u{6477}",
-        nfkd: "\u{6477}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C7}",
-        nfc: "\u{3A6C}",
-        nfd: "\u{3A6C}",
-        nfkc: "\u{3A6C}",
-        nfkd: "\u{3A6C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C8}",
-        nfc: "\u{654F}",
-        nfd: "\u{654F}",
-        nfkc: "\u{654F}",
-        nfkd: "\u{654F}",
-    },
-    NormalizationTest {
-        source: "\u{2F8C9}",
-        nfc: "\u{656C}",
-        nfd: "\u{656C}",
-        nfkc: "\u{656C}",
-        nfkd: "\u{656C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8CA}",
-        nfc: "\u{2300A}",
-        nfd: "\u{2300A}",
-        nfkc: "\u{2300A}",
-        nfkd: "\u{2300A}",
-    },
-    NormalizationTest {
-        source: "\u{2F8CB}",
-        nfc: "\u{65E3}",
-        nfd: "\u{65E3}",
-        nfkc: "\u{65E3}",
-        nfkd: "\u{65E3}",
-    },
-    NormalizationTest {
-        source: "\u{2F8CC}",
-        nfc: "\u{66F8}",
-        nfd: "\u{66F8}",
-        nfkc: "\u{66F8}",
-        nfkd: "\u{66F8}",
-    },
-    NormalizationTest {
-        source: "\u{2F8CD}",
-        nfc: "\u{6649}",
-        nfd: "\u{6649}",
-        nfkc: "\u{6649}",
-        nfkd: "\u{6649}",
-    },
-    NormalizationTest {
-        source: "\u{2F8CE}",
-        nfc: "\u{3B19}",
-        nfd: "\u{3B19}",
-        nfkc: "\u{3B19}",
-        nfkd: "\u{3B19}",
-    },
-    NormalizationTest {
-        source: "\u{2F8CF}",
-        nfc: "\u{6691}",
-        nfd: "\u{6691}",
-        nfkc: "\u{6691}",
-        nfkd: "\u{6691}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D0}",
-        nfc: "\u{3B08}",
-        nfd: "\u{3B08}",
-        nfkc: "\u{3B08}",
-        nfkd: "\u{3B08}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D1}",
-        nfc: "\u{3AE4}",
-        nfd: "\u{3AE4}",
-        nfkc: "\u{3AE4}",
-        nfkd: "\u{3AE4}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D2}",
-        nfc: "\u{5192}",
-        nfd: "\u{5192}",
-        nfkc: "\u{5192}",
-        nfkd: "\u{5192}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D3}",
-        nfc: "\u{5195}",
-        nfd: "\u{5195}",
-        nfkc: "\u{5195}",
-        nfkd: "\u{5195}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D4}",
-        nfc: "\u{6700}",
-        nfd: "\u{6700}",
-        nfkc: "\u{6700}",
-        nfkd: "\u{6700}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D5}",
-        nfc: "\u{669C}",
-        nfd: "\u{669C}",
-        nfkc: "\u{669C}",
-        nfkd: "\u{669C}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D6}",
-        nfc: "\u{80AD}",
-        nfd: "\u{80AD}",
-        nfkc: "\u{80AD}",
-        nfkd: "\u{80AD}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D7}",
-        nfc: "\u{43D9}",
-        nfd: "\u{43D9}",
-        nfkc: "\u{43D9}",
-        nfkd: "\u{43D9}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D8}",
-        nfc: "\u{6717}",
-        nfd: "\u{6717}",
-        nfkc: "\u{6717}",
-        nfkd: "\u{6717}",
-    },
-    NormalizationTest {
-        source: "\u{2F8D9}",
-        nfc: "\u{671B}",
-        nfd: "\u{671B}",
-        nfkc: "\u{671B}",
-        nfkd: "\u{671B}",
-    },
-    NormalizationTest {
-        source: "\u{2F8DA}",
-        nfc: "\u{6721}",
-        nfd: "\u{6721}",
-        nfkc: "\u{6721}",
-        nfkd: "\u{6721}",
-    },
-    NormalizationTest {
-        source: "\u{2F8DB}",
-        nfc: "\u{675E}",
-        nfd: "\u{675E}",
-        nfkc: "\u{675E}",
-        nfkd: "\u{675E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8DC}",
-        nfc: "\u{6753}",
-        nfd: "\u{6753}",
-        nfkc: "\u{6753}",
-        nfkd: "\u{6753}",
-    },
-    NormalizationTest {
-        source: "\u{2F8DD}",
-        nfc: "\u{233C3}",
-        nfd: "\u{233C3}",
-        nfkc: "\u{233C3}",
-        nfkd: "\u{233C3}",
-    },
-    NormalizationTest {
-        source: "\u{2F8DE}",
-        nfc: "\u{3B49}",
-        nfd: "\u{3B49}",
-        nfkc: "\u{3B49}",
-        nfkd: "\u{3B49}",
-    },
-    NormalizationTest {
-        source: "\u{2F8DF}",
-        nfc: "\u{67FA}",
-        nfd: "\u{67FA}",
-        nfkc: "\u{67FA}",
-        nfkd: "\u{67FA}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E0}",
-        nfc: "\u{6785}",
-        nfd: "\u{6785}",
-        nfkc: "\u{6785}",
-        nfkd: "\u{6785}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E1}",
-        nfc: "\u{6852}",
-        nfd: "\u{6852}",
-        nfkc: "\u{6852}",
-        nfkd: "\u{6852}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E2}",
-        nfc: "\u{6885}",
-        nfd: "\u{6885}",
-        nfkc: "\u{6885}",
-        nfkd: "\u{6885}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E3}",
-        nfc: "\u{2346D}",
-        nfd: "\u{2346D}",
-        nfkc: "\u{2346D}",
-        nfkd: "\u{2346D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E4}",
-        nfc: "\u{688E}",
-        nfd: "\u{688E}",
-        nfkc: "\u{688E}",
-        nfkd: "\u{688E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E5}",
-        nfc: "\u{681F}",
-        nfd: "\u{681F}",
-        nfkc: "\u{681F}",
-        nfkd: "\u{681F}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E6}",
-        nfc: "\u{6914}",
-        nfd: "\u{6914}",
-        nfkc: "\u{6914}",
-        nfkd: "\u{6914}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E7}",
-        nfc: "\u{3B9D}",
-        nfd: "\u{3B9D}",
-        nfkc: "\u{3B9D}",
-        nfkd: "\u{3B9D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E8}",
-        nfc: "\u{6942}",
-        nfd: "\u{6942}",
-        nfkc: "\u{6942}",
-        nfkd: "\u{6942}",
-    },
-    NormalizationTest {
-        source: "\u{2F8E9}",
-        nfc: "\u{69A3}",
-        nfd: "\u{69A3}",
-        nfkc: "\u{69A3}",
-        nfkd: "\u{69A3}",
-    },
-    NormalizationTest {
-        source: "\u{2F8EA}",
-        nfc: "\u{69EA}",
-        nfd: "\u{69EA}",
-        nfkc: "\u{69EA}",
-        nfkd: "\u{69EA}",
-    },
-    NormalizationTest {
-        source: "\u{2F8EB}",
-        nfc: "\u{6AA8}",
-        nfd: "\u{6AA8}",
-        nfkc: "\u{6AA8}",
-        nfkd: "\u{6AA8}",
-    },
-    NormalizationTest {
-        source: "\u{2F8EC}",
-        nfc: "\u{236A3}",
-        nfd: "\u{236A3}",
-        nfkc: "\u{236A3}",
-        nfkd: "\u{236A3}",
-    },
-    NormalizationTest {
-        source: "\u{2F8ED}",
-        nfc: "\u{6ADB}",
-        nfd: "\u{6ADB}",
-        nfkc: "\u{6ADB}",
-        nfkd: "\u{6ADB}",
-    },
-    NormalizationTest {
-        source: "\u{2F8EE}",
-        nfc: "\u{3C18}",
-        nfd: "\u{3C18}",
-        nfkc: "\u{3C18}",
-        nfkd: "\u{3C18}",
-    },
-    NormalizationTest {
-        source: "\u{2F8EF}",
-        nfc: "\u{6B21}",
-        nfd: "\u{6B21}",
-        nfkc: "\u{6B21}",
-        nfkd: "\u{6B21}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F0}",
-        nfc: "\u{238A7}",
-        nfd: "\u{238A7}",
-        nfkc: "\u{238A7}",
-        nfkd: "\u{238A7}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F1}",
-        nfc: "\u{6B54}",
-        nfd: "\u{6B54}",
-        nfkc: "\u{6B54}",
-        nfkd: "\u{6B54}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F2}",
-        nfc: "\u{3C4E}",
-        nfd: "\u{3C4E}",
-        nfkc: "\u{3C4E}",
-        nfkd: "\u{3C4E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F3}",
-        nfc: "\u{6B72}",
-        nfd: "\u{6B72}",
-        nfkc: "\u{6B72}",
-        nfkd: "\u{6B72}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F4}",
-        nfc: "\u{6B9F}",
-        nfd: "\u{6B9F}",
-        nfkc: "\u{6B9F}",
-        nfkd: "\u{6B9F}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F5}",
-        nfc: "\u{6BBA}",
-        nfd: "\u{6BBA}",
-        nfkc: "\u{6BBA}",
-        nfkd: "\u{6BBA}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F6}",
-        nfc: "\u{6BBB}",
-        nfd: "\u{6BBB}",
-        nfkc: "\u{6BBB}",
-        nfkd: "\u{6BBB}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F7}",
-        nfc: "\u{23A8D}",
-        nfd: "\u{23A8D}",
-        nfkc: "\u{23A8D}",
-        nfkd: "\u{23A8D}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F8}",
-        nfc: "\u{21D0B}",
-        nfd: "\u{21D0B}",
-        nfkc: "\u{21D0B}",
-        nfkd: "\u{21D0B}",
-    },
-    NormalizationTest {
-        source: "\u{2F8F9}",
-        nfc: "\u{23AFA}",
-        nfd: "\u{23AFA}",
-        nfkc: "\u{23AFA}",
-        nfkd: "\u{23AFA}",
-    },
-    NormalizationTest {
-        source: "\u{2F8FA}",
-        nfc: "\u{6C4E}",
-        nfd: "\u{6C4E}",
-        nfkc: "\u{6C4E}",
-        nfkd: "\u{6C4E}",
-    },
-    NormalizationTest {
-        source: "\u{2F8FB}",
-        nfc: "\u{23CBC}",
-        nfd: "\u{23CBC}",
-        nfkc: "\u{23CBC}",
-        nfkd: "\u{23CBC}",
-    },
-    NormalizationTest {
-        source: "\u{2F8FC}",
-        nfc: "\u{6CBF}",
-        nfd: "\u{6CBF}",
-        nfkc: "\u{6CBF}",
-        nfkd: "\u{6CBF}",
-    },
-    NormalizationTest {
-        source: "\u{2F8FD}",
-        nfc: "\u{6CCD}",
-        nfd: "\u{6CCD}",
-        nfkc: "\u{6CCD}",
-        nfkd: "\u{6CCD}",
-    },
-    NormalizationTest {
-        source: "\u{2F8FE}",
-        nfc: "\u{6C67}",
-        nfd: "\u{6C67}",
-        nfkc: "\u{6C67}",
-        nfkd: "\u{6C67}",
-    },
-    NormalizationTest {
-        source: "\u{2F8FF}",
-        nfc: "\u{6D16}",
-        nfd: "\u{6D16}",
-        nfkc: "\u{6D16}",
-        nfkd: "\u{6D16}",
-    },
-    NormalizationTest {
-        source: "\u{2F900}",
-        nfc: "\u{6D3E}",
-        nfd: "\u{6D3E}",
-        nfkc: "\u{6D3E}",
-        nfkd: "\u{6D3E}",
-    },
-    NormalizationTest {
-        source: "\u{2F901}",
-        nfc: "\u{6D77}",
-        nfd: "\u{6D77}",
-        nfkc: "\u{6D77}",
-        nfkd: "\u{6D77}",
-    },
-    NormalizationTest {
-        source: "\u{2F902}",
-        nfc: "\u{6D41}",
-        nfd: "\u{6D41}",
-        nfkc: "\u{6D41}",
-        nfkd: "\u{6D41}",
-    },
-    NormalizationTest {
-        source: "\u{2F903}",
-        nfc: "\u{6D69}",
-        nfd: "\u{6D69}",
-        nfkc: "\u{6D69}",
-        nfkd: "\u{6D69}",
-    },
-    NormalizationTest {
-        source: "\u{2F904}",
-        nfc: "\u{6D78}",
-        nfd: "\u{6D78}",
-        nfkc: "\u{6D78}",
-        nfkd: "\u{6D78}",
-    },
-    NormalizationTest {
-        source: "\u{2F905}",
-        nfc: "\u{6D85}",
-        nfd: "\u{6D85}",
-        nfkc: "\u{6D85}",
-        nfkd: "\u{6D85}",
-    },
-    NormalizationTest {
-        source: "\u{2F906}",
-        nfc: "\u{23D1E}",
-        nfd: "\u{23D1E}",
-        nfkc: "\u{23D1E}",
-        nfkd: "\u{23D1E}",
-    },
-    NormalizationTest {
-        source: "\u{2F907}",
-        nfc: "\u{6D34}",
-        nfd: "\u{6D34}",
-        nfkc: "\u{6D34}",
-        nfkd: "\u{6D34}",
-    },
-    NormalizationTest {
-        source: "\u{2F908}",
-        nfc: "\u{6E2F}",
-        nfd: "\u{6E2F}",
-        nfkc: "\u{6E2F}",
-        nfkd: "\u{6E2F}",
-    },
-    NormalizationTest {
-        source: "\u{2F909}",
-        nfc: "\u{6E6E}",
-        nfd: "\u{6E6E}",
-        nfkc: "\u{6E6E}",
-        nfkd: "\u{6E6E}",
-    },
-    NormalizationTest {
-        source: "\u{2F90A}",
-        nfc: "\u{3D33}",
-        nfd: "\u{3D33}",
-        nfkc: "\u{3D33}",
-        nfkd: "\u{3D33}",
-    },
-    NormalizationTest {
-        source: "\u{2F90B}",
-        nfc: "\u{6ECB}",
-        nfd: "\u{6ECB}",
-        nfkc: "\u{6ECB}",
-        nfkd: "\u{6ECB}",
-    },
-    NormalizationTest {
-        source: "\u{2F90C}",
-        nfc: "\u{6EC7}",
-        nfd: "\u{6EC7}",
-        nfkc: "\u{6EC7}",
-        nfkd: "\u{6EC7}",
-    },
-    NormalizationTest {
-        source: "\u{2F90D}",
-        nfc: "\u{23ED1}",
-        nfd: "\u{23ED1}",
-        nfkc: "\u{23ED1}",
-        nfkd: "\u{23ED1}",
-    },
-    NormalizationTest {
-        source: "\u{2F90E}",
-        nfc: "\u{6DF9}",
-        nfd: "\u{6DF9}",
-        nfkc: "\u{6DF9}",
-        nfkd: "\u{6DF9}",
-    },
-    NormalizationTest {
-        source: "\u{2F90F}",
-        nfc: "\u{6F6E}",
-        nfd: "\u{6F6E}",
-        nfkc: "\u{6F6E}",
-        nfkd: "\u{6F6E}",
-    },
-    NormalizationTest {
-        source: "\u{2F910}",
-        nfc: "\u{23F5E}",
-        nfd: "\u{23F5E}",
-        nfkc: "\u{23F5E}",
-        nfkd: "\u{23F5E}",
-    },
-    NormalizationTest {
-        source: "\u{2F911}",
-        nfc: "\u{23F8E}",
-        nfd: "\u{23F8E}",
-        nfkc: "\u{23F8E}",
-        nfkd: "\u{23F8E}",
-    },
-    NormalizationTest {
-        source: "\u{2F912}",
-        nfc: "\u{6FC6}",
-        nfd: "\u{6FC6}",
-        nfkc: "\u{6FC6}",
-        nfkd: "\u{6FC6}",
-    },
-    NormalizationTest {
-        source: "\u{2F913}",
-        nfc: "\u{7039}",
-        nfd: "\u{7039}",
-        nfkc: "\u{7039}",
-        nfkd: "\u{7039}",
-    },
-    NormalizationTest {
-        source: "\u{2F914}",
-        nfc: "\u{701E}",
-        nfd: "\u{701E}",
-        nfkc: "\u{701E}",
-        nfkd: "\u{701E}",
-    },
-    NormalizationTest {
-        source: "\u{2F915}",
-        nfc: "\u{701B}",
-        nfd: "\u{701B}",
-        nfkc: "\u{701B}",
-        nfkd: "\u{701B}",
-    },
-    NormalizationTest {
-        source: "\u{2F916}",
-        nfc: "\u{3D96}",
-        nfd: "\u{3D96}",
-        nfkc: "\u{3D96}",
-        nfkd: "\u{3D96}",
-    },
-    NormalizationTest {
-        source: "\u{2F917}",
-        nfc: "\u{704A}",
-        nfd: "\u{704A}",
-        nfkc: "\u{704A}",
-        nfkd: "\u{704A}",
-    },
-    NormalizationTest {
-        source: "\u{2F918}",
-        nfc: "\u{707D}",
-        nfd: "\u{707D}",
-        nfkc: "\u{707D}",
-        nfkd: "\u{707D}",
-    },
-    NormalizationTest {
-        source: "\u{2F919}",
-        nfc: "\u{7077}",
-        nfd: "\u{7077}",
-        nfkc: "\u{7077}",
-        nfkd: "\u{7077}",
-    },
-    NormalizationTest {
-        source: "\u{2F91A}",
-        nfc: "\u{70AD}",
-        nfd: "\u{70AD}",
-        nfkc: "\u{70AD}",
-        nfkd: "\u{70AD}",
-    },
-    NormalizationTest {
-        source: "\u{2F91B}",
-        nfc: "\u{20525}",
-        nfd: "\u{20525}",
-        nfkc: "\u{20525}",
-        nfkd: "\u{20525}",
-    },
-    NormalizationTest {
-        source: "\u{2F91C}",
-        nfc: "\u{7145}",
-        nfd: "\u{7145}",
-        nfkc: "\u{7145}",
-        nfkd: "\u{7145}",
-    },
-    NormalizationTest {
-        source: "\u{2F91D}",
-        nfc: "\u{24263}",
-        nfd: "\u{24263}",
-        nfkc: "\u{24263}",
-        nfkd: "\u{24263}",
-    },
-    NormalizationTest {
-        source: "\u{2F91E}",
-        nfc: "\u{719C}",
-        nfd: "\u{719C}",
-        nfkc: "\u{719C}",
-        nfkd: "\u{719C}",
-    },
-    NormalizationTest {
-        source: "\u{2F91F}",
-        nfc: "\u{243AB}",
-        nfd: "\u{243AB}",
-        nfkc: "\u{243AB}",
-        nfkd: "\u{243AB}",
-    },
-    NormalizationTest {
-        source: "\u{2F920}",
-        nfc: "\u{7228}",
-        nfd: "\u{7228}",
-        nfkc: "\u{7228}",
-        nfkd: "\u{7228}",
-    },
-    NormalizationTest {
-        source: "\u{2F921}",
-        nfc: "\u{7235}",
-        nfd: "\u{7235}",
-        nfkc: "\u{7235}",
-        nfkd: "\u{7235}",
-    },
-    NormalizationTest {
-        source: "\u{2F922}",
-        nfc: "\u{7250}",
-        nfd: "\u{7250}",
-        nfkc: "\u{7250}",
-        nfkd: "\u{7250}",
-    },
-    NormalizationTest {
-        source: "\u{2F923}",
-        nfc: "\u{24608}",
-        nfd: "\u{24608}",
-        nfkc: "\u{24608}",
-        nfkd: "\u{24608}",
-    },
-    NormalizationTest {
-        source: "\u{2F924}",
-        nfc: "\u{7280}",
-        nfd: "\u{7280}",
-        nfkc: "\u{7280}",
-        nfkd: "\u{7280}",
-    },
-    NormalizationTest {
-        source: "\u{2F925}",
-        nfc: "\u{7295}",
-        nfd: "\u{7295}",
-        nfkc: "\u{7295}",
-        nfkd: "\u{7295}",
-    },
-    NormalizationTest {
-        source: "\u{2F926}",
-        nfc: "\u{24735}",
-        nfd: "\u{24735}",
-        nfkc: "\u{24735}",
-        nfkd: "\u{24735}",
-    },
-    NormalizationTest {
-        source: "\u{2F927}",
-        nfc: "\u{24814}",
-        nfd: "\u{24814}",
-        nfkc: "\u{24814}",
-        nfkd: "\u{24814}",
-    },
-    NormalizationTest {
-        source: "\u{2F928}",
-        nfc: "\u{737A}",
-        nfd: "\u{737A}",
-        nfkc: "\u{737A}",
-        nfkd: "\u{737A}",
-    },
-    NormalizationTest {
-        source: "\u{2F929}",
-        nfc: "\u{738B}",
-        nfd: "\u{738B}",
-        nfkc: "\u{738B}",
-        nfkd: "\u{738B}",
-    },
-    NormalizationTest {
-        source: "\u{2F92A}",
-        nfc: "\u{3EAC}",
-        nfd: "\u{3EAC}",
-        nfkc: "\u{3EAC}",
-        nfkd: "\u{3EAC}",
-    },
-    NormalizationTest {
-        source: "\u{2F92B}",
-        nfc: "\u{73A5}",
-        nfd: "\u{73A5}",
-        nfkc: "\u{73A5}",
-        nfkd: "\u{73A5}",
-    },
-    NormalizationTest {
-        source: "\u{2F92C}",
-        nfc: "\u{3EB8}",
-        nfd: "\u{3EB8}",
-        nfkc: "\u{3EB8}",
-        nfkd: "\u{3EB8}",
-    },
-    NormalizationTest {
-        source: "\u{2F92D}",
-        nfc: "\u{3EB8}",
-        nfd: "\u{3EB8}",
-        nfkc: "\u{3EB8}",
-        nfkd: "\u{3EB8}",
-    },
-    NormalizationTest {
-        source: "\u{2F92E}",
-        nfc: "\u{7447}",
-        nfd: "\u{7447}",
-        nfkc: "\u{7447}",
-        nfkd: "\u{7447}",
-    },
-    NormalizationTest {
-        source: "\u{2F92F}",
-        nfc: "\u{745C}",
-        nfd: "\u{745C}",
-        nfkc: "\u{745C}",
-        nfkd: "\u{745C}",
-    },
-    NormalizationTest {
-        source: "\u{2F930}",
-        nfc: "\u{7471}",
-        nfd: "\u{7471}",
-        nfkc: "\u{7471}",
-        nfkd: "\u{7471}",
-    },
-    NormalizationTest {
-        source: "\u{2F931}",
-        nfc: "\u{7485}",
-        nfd: "\u{7485}",
-        nfkc: "\u{7485}",
-        nfkd: "\u{7485}",
-    },
-    NormalizationTest {
-        source: "\u{2F932}",
-        nfc: "\u{74CA}",
-        nfd: "\u{74CA}",
-        nfkc: "\u{74CA}",
-        nfkd: "\u{74CA}",
-    },
-    NormalizationTest {
-        source: "\u{2F933}",
-        nfc: "\u{3F1B}",
-        nfd: "\u{3F1B}",
-        nfkc: "\u{3F1B}",
-        nfkd: "\u{3F1B}",
-    },
-    NormalizationTest {
-        source: "\u{2F934}",
-        nfc: "\u{7524}",
-        nfd: "\u{7524}",
-        nfkc: "\u{7524}",
-        nfkd: "\u{7524}",
-    },
-    NormalizationTest {
-        source: "\u{2F935}",
-        nfc: "\u{24C36}",
-        nfd: "\u{24C36}",
-        nfkc: "\u{24C36}",
-        nfkd: "\u{24C36}",
-    },
-    NormalizationTest {
-        source: "\u{2F936}",
-        nfc: "\u{753E}",
-        nfd: "\u{753E}",
-        nfkc: "\u{753E}",
-        nfkd: "\u{753E}",
-    },
-    NormalizationTest {
-        source: "\u{2F937}",
-        nfc: "\u{24C92}",
-        nfd: "\u{24C92}",
-        nfkc: "\u{24C92}",
-        nfkd: "\u{24C92}",
-    },
-    NormalizationTest {
-        source: "\u{2F938}",
-        nfc: "\u{7570}",
-        nfd: "\u{7570}",
-        nfkc: "\u{7570}",
-        nfkd: "\u{7570}",
-    },
-    NormalizationTest {
-        source: "\u{2F939}",
-        nfc: "\u{2219F}",
-        nfd: "\u{2219F}",
-        nfkc: "\u{2219F}",
-        nfkd: "\u{2219F}",
-    },
-    NormalizationTest {
-        source: "\u{2F93A}",
-        nfc: "\u{7610}",
-        nfd: "\u{7610}",
-        nfkc: "\u{7610}",
-        nfkd: "\u{7610}",
-    },
-    NormalizationTest {
-        source: "\u{2F93B}",
-        nfc: "\u{24FA1}",
-        nfd: "\u{24FA1}",
-        nfkc: "\u{24FA1}",
-        nfkd: "\u{24FA1}",
-    },
-    NormalizationTest {
-        source: "\u{2F93C}",
-        nfc: "\u{24FB8}",
-        nfd: "\u{24FB8}",
-        nfkc: "\u{24FB8}",
-        nfkd: "\u{24FB8}",
-    },
-    NormalizationTest {
-        source: "\u{2F93D}",
-        nfc: "\u{25044}",
-        nfd: "\u{25044}",
-        nfkc: "\u{25044}",
-        nfkd: "\u{25044}",
-    },
-    NormalizationTest {
-        source: "\u{2F93E}",
-        nfc: "\u{3FFC}",
-        nfd: "\u{3FFC}",
-        nfkc: "\u{3FFC}",
-        nfkd: "\u{3FFC}",
-    },
-    NormalizationTest {
-        source: "\u{2F93F}",
-        nfc: "\u{4008}",
-        nfd: "\u{4008}",
-        nfkc: "\u{4008}",
-        nfkd: "\u{4008}",
-    },
-    NormalizationTest {
-        source: "\u{2F940}",
-        nfc: "\u{76F4}",
-        nfd: "\u{76F4}",
-        nfkc: "\u{76F4}",
-        nfkd: "\u{76F4}",
-    },
-    NormalizationTest {
-        source: "\u{2F941}",
-        nfc: "\u{250F3}",
-        nfd: "\u{250F3}",
-        nfkc: "\u{250F3}",
-        nfkd: "\u{250F3}",
-    },
-    NormalizationTest {
-        source: "\u{2F942}",
-        nfc: "\u{250F2}",
-        nfd: "\u{250F2}",
-        nfkc: "\u{250F2}",
-        nfkd: "\u{250F2}",
-    },
-    NormalizationTest {
-        source: "\u{2F943}",
-        nfc: "\u{25119}",
-        nfd: "\u{25119}",
-        nfkc: "\u{25119}",
-        nfkd: "\u{25119}",
-    },
-    NormalizationTest {
-        source: "\u{2F944}",
-        nfc: "\u{25133}",
-        nfd: "\u{25133}",
-        nfkc: "\u{25133}",
-        nfkd: "\u{25133}",
-    },
-    NormalizationTest {
-        source: "\u{2F945}",
-        nfc: "\u{771E}",
-        nfd: "\u{771E}",
-        nfkc: "\u{771E}",
-        nfkd: "\u{771E}",
-    },
-    NormalizationTest {
-        source: "\u{2F946}",
-        nfc: "\u{771F}",
-        nfd: "\u{771F}",
-        nfkc: "\u{771F}",
-        nfkd: "\u{771F}",
-    },
-    NormalizationTest {
-        source: "\u{2F947}",
-        nfc: "\u{771F}",
-        nfd: "\u{771F}",
-        nfkc: "\u{771F}",
-        nfkd: "\u{771F}",
-    },
-    NormalizationTest {
-        source: "\u{2F948}",
-        nfc: "\u{774A}",
-        nfd: "\u{774A}",
-        nfkc: "\u{774A}",
-        nfkd: "\u{774A}",
-    },
-    NormalizationTest {
-        source: "\u{2F949}",
-        nfc: "\u{4039}",
-        nfd: "\u{4039}",
-        nfkc: "\u{4039}",
-        nfkd: "\u{4039}",
-    },
-    NormalizationTest {
-        source: "\u{2F94A}",
-        nfc: "\u{778B}",
-        nfd: "\u{778B}",
-        nfkc: "\u{778B}",
-        nfkd: "\u{778B}",
-    },
-    NormalizationTest {
-        source: "\u{2F94B}",
-        nfc: "\u{4046}",
-        nfd: "\u{4046}",
-        nfkc: "\u{4046}",
-        nfkd: "\u{4046}",
-    },
-    NormalizationTest {
-        source: "\u{2F94C}",
-        nfc: "\u{4096}",
-        nfd: "\u{4096}",
-        nfkc: "\u{4096}",
-        nfkd: "\u{4096}",
-    },
-    NormalizationTest {
-        source: "\u{2F94D}",
-        nfc: "\u{2541D}",
-        nfd: "\u{2541D}",
-        nfkc: "\u{2541D}",
-        nfkd: "\u{2541D}",
-    },
-    NormalizationTest {
-        source: "\u{2F94E}",
-        nfc: "\u{784E}",
-        nfd: "\u{784E}",
-        nfkc: "\u{784E}",
-        nfkd: "\u{784E}",
-    },
-    NormalizationTest {
-        source: "\u{2F94F}",
-        nfc: "\u{788C}",
-        nfd: "\u{788C}",
-        nfkc: "\u{788C}",
-        nfkd: "\u{788C}",
-    },
-    NormalizationTest {
-        source: "\u{2F950}",
-        nfc: "\u{78CC}",
-        nfd: "\u{78CC}",
-        nfkc: "\u{78CC}",
-        nfkd: "\u{78CC}",
-    },
-    NormalizationTest {
-        source: "\u{2F951}",
-        nfc: "\u{40E3}",
-        nfd: "\u{40E3}",
-        nfkc: "\u{40E3}",
-        nfkd: "\u{40E3}",
-    },
-    NormalizationTest {
-        source: "\u{2F952}",
-        nfc: "\u{25626}",
-        nfd: "\u{25626}",
-        nfkc: "\u{25626}",
-        nfkd: "\u{25626}",
-    },
-    NormalizationTest {
-        source: "\u{2F953}",
-        nfc: "\u{7956}",
-        nfd: "\u{7956}",
-        nfkc: "\u{7956}",
-        nfkd: "\u{7956}",
-    },
-    NormalizationTest {
-        source: "\u{2F954}",
-        nfc: "\u{2569A}",
-        nfd: "\u{2569A}",
-        nfkc: "\u{2569A}",
-        nfkd: "\u{2569A}",
-    },
-    NormalizationTest {
-        source: "\u{2F955}",
-        nfc: "\u{256C5}",
-        nfd: "\u{256C5}",
-        nfkc: "\u{256C5}",
-        nfkd: "\u{256C5}",
-    },
-    NormalizationTest {
-        source: "\u{2F956}",
-        nfc: "\u{798F}",
-        nfd: "\u{798F}",
-        nfkc: "\u{798F}",
-        nfkd: "\u{798F}",
-    },
-    NormalizationTest {
-        source: "\u{2F957}",
-        nfc: "\u{79EB}",
-        nfd: "\u{79EB}",
-        nfkc: "\u{79EB}",
-        nfkd: "\u{79EB}",
-    },
-    NormalizationTest {
-        source: "\u{2F958}",
-        nfc: "\u{412F}",
-        nfd: "\u{412F}",
-        nfkc: "\u{412F}",
-        nfkd: "\u{412F}",
-    },
-    NormalizationTest {
-        source: "\u{2F959}",
-        nfc: "\u{7A40}",
-        nfd: "\u{7A40}",
-        nfkc: "\u{7A40}",
-        nfkd: "\u{7A40}",
-    },
-    NormalizationTest {
-        source: "\u{2F95A}",
-        nfc: "\u{7A4A}",
-        nfd: "\u{7A4A}",
-        nfkc: "\u{7A4A}",
-        nfkd: "\u{7A4A}",
-    },
-    NormalizationTest {
-        source: "\u{2F95B}",
-        nfc: "\u{7A4F}",
-        nfd: "\u{7A4F}",
-        nfkc: "\u{7A4F}",
-        nfkd: "\u{7A4F}",
-    },
-    NormalizationTest {
-        source: "\u{2F95C}",
-        nfc: "\u{2597C}",
-        nfd: "\u{2597C}",
-        nfkc: "\u{2597C}",
-        nfkd: "\u{2597C}",
-    },
-    NormalizationTest {
-        source: "\u{2F95D}",
-        nfc: "\u{25AA7}",
-        nfd: "\u{25AA7}",
-        nfkc: "\u{25AA7}",
-        nfkd: "\u{25AA7}",
-    },
-    NormalizationTest {
-        source: "\u{2F95E}",
-        nfc: "\u{25AA7}",
-        nfd: "\u{25AA7}",
-        nfkc: "\u{25AA7}",
-        nfkd: "\u{25AA7}",
-    },
-    NormalizationTest {
-        source: "\u{2F95F}",
-        nfc: "\u{7AEE}",
-        nfd: "\u{7AEE}",
-        nfkc: "\u{7AEE}",
-        nfkd: "\u{7AEE}",
-    },
-    NormalizationTest {
-        source: "\u{2F960}",
-        nfc: "\u{4202}",
-        nfd: "\u{4202}",
-        nfkc: "\u{4202}",
-        nfkd: "\u{4202}",
-    },
-    NormalizationTest {
-        source: "\u{2F961}",
-        nfc: "\u{25BAB}",
-        nfd: "\u{25BAB}",
-        nfkc: "\u{25BAB}",
-        nfkd: "\u{25BAB}",
-    },
-    NormalizationTest {
-        source: "\u{2F962}",
-        nfc: "\u{7BC6}",
-        nfd: "\u{7BC6}",
-        nfkc: "\u{7BC6}",
-        nfkd: "\u{7BC6}",
-    },
-    NormalizationTest {
-        source: "\u{2F963}",
-        nfc: "\u{7BC9}",
-        nfd: "\u{7BC9}",
-        nfkc: "\u{7BC9}",
-        nfkd: "\u{7BC9}",
-    },
-    NormalizationTest {
-        source: "\u{2F964}",
-        nfc: "\u{4227}",
-        nfd: "\u{4227}",
-        nfkc: "\u{4227}",
-        nfkd: "\u{4227}",
-    },
-    NormalizationTest {
-        source: "\u{2F965}",
-        nfc: "\u{25C80}",
-        nfd: "\u{25C80}",
-        nfkc: "\u{25C80}",
-        nfkd: "\u{25C80}",
-    },
-    NormalizationTest {
-        source: "\u{2F966}",
-        nfc: "\u{7CD2}",
-        nfd: "\u{7CD2}",
-        nfkc: "\u{7CD2}",
-        nfkd: "\u{7CD2}",
-    },
-    NormalizationTest {
-        source: "\u{2F967}",
-        nfc: "\u{42A0}",
-        nfd: "\u{42A0}",
-        nfkc: "\u{42A0}",
-        nfkd: "\u{42A0}",
-    },
-    NormalizationTest {
-        source: "\u{2F968}",
-        nfc: "\u{7CE8}",
-        nfd: "\u{7CE8}",
-        nfkc: "\u{7CE8}",
-        nfkd: "\u{7CE8}",
-    },
-    NormalizationTest {
-        source: "\u{2F969}",
-        nfc: "\u{7CE3}",
-        nfd: "\u{7CE3}",
-        nfkc: "\u{7CE3}",
-        nfkd: "\u{7CE3}",
-    },
-    NormalizationTest {
-        source: "\u{2F96A}",
-        nfc: "\u{7D00}",
-        nfd: "\u{7D00}",
-        nfkc: "\u{7D00}",
-        nfkd: "\u{7D00}",
-    },
-    NormalizationTest {
-        source: "\u{2F96B}",
-        nfc: "\u{25F86}",
-        nfd: "\u{25F86}",
-        nfkc: "\u{25F86}",
-        nfkd: "\u{25F86}",
-    },
-    NormalizationTest {
-        source: "\u{2F96C}",
-        nfc: "\u{7D63}",
-        nfd: "\u{7D63}",
-        nfkc: "\u{7D63}",
-        nfkd: "\u{7D63}",
-    },
-    NormalizationTest {
-        source: "\u{2F96D}",
-        nfc: "\u{4301}",
-        nfd: "\u{4301}",
-        nfkc: "\u{4301}",
-        nfkd: "\u{4301}",
-    },
-    NormalizationTest {
-        source: "\u{2F96E}",
-        nfc: "\u{7DC7}",
-        nfd: "\u{7DC7}",
-        nfkc: "\u{7DC7}",
-        nfkd: "\u{7DC7}",
-    },
-    NormalizationTest {
-        source: "\u{2F96F}",
-        nfc: "\u{7E02}",
-        nfd: "\u{7E02}",
-        nfkc: "\u{7E02}",
-        nfkd: "\u{7E02}",
-    },
-    NormalizationTest {
-        source: "\u{2F970}",
-        nfc: "\u{7E45}",
-        nfd: "\u{7E45}",
-        nfkc: "\u{7E45}",
-        nfkd: "\u{7E45}",
-    },
-    NormalizationTest {
-        source: "\u{2F971}",
-        nfc: "\u{4334}",
-        nfd: "\u{4334}",
-        nfkc: "\u{4334}",
-        nfkd: "\u{4334}",
-    },
-    NormalizationTest {
-        source: "\u{2F972}",
-        nfc: "\u{26228}",
-        nfd: "\u{26228}",
-        nfkc: "\u{26228}",
-        nfkd: "\u{26228}",
-    },
-    NormalizationTest {
-        source: "\u{2F973}",
-        nfc: "\u{26247}",
-        nfd: "\u{26247}",
-        nfkc: "\u{26247}",
-        nfkd: "\u{26247}",
-    },
-    NormalizationTest {
-        source: "\u{2F974}",
-        nfc: "\u{4359}",
-        nfd: "\u{4359}",
-        nfkc: "\u{4359}",
-        nfkd: "\u{4359}",
-    },
-    NormalizationTest {
-        source: "\u{2F975}",
-        nfc: "\u{262D9}",
-        nfd: "\u{262D9}",
-        nfkc: "\u{262D9}",
-        nfkd: "\u{262D9}",
-    },
-    NormalizationTest {
-        source: "\u{2F976}",
-        nfc: "\u{7F7A}",
-        nfd: "\u{7F7A}",
-        nfkc: "\u{7F7A}",
-        nfkd: "\u{7F7A}",
-    },
-    NormalizationTest {
-        source: "\u{2F977}",
-        nfc: "\u{2633E}",
-        nfd: "\u{2633E}",
-        nfkc: "\u{2633E}",
-        nfkd: "\u{2633E}",
-    },
-    NormalizationTest {
-        source: "\u{2F978}",
-        nfc: "\u{7F95}",
-        nfd: "\u{7F95}",
-        nfkc: "\u{7F95}",
-        nfkd: "\u{7F95}",
-    },
-    NormalizationTest {
-        source: "\u{2F979}",
-        nfc: "\u{7FFA}",
-        nfd: "\u{7FFA}",
-        nfkc: "\u{7FFA}",
-        nfkd: "\u{7FFA}",
-    },
-    NormalizationTest {
-        source: "\u{2F97A}",
-        nfc: "\u{8005}",
-        nfd: "\u{8005}",
-        nfkc: "\u{8005}",
-        nfkd: "\u{8005}",
-    },
-    NormalizationTest {
-        source: "\u{2F97B}",
-        nfc: "\u{264DA}",
-        nfd: "\u{264DA}",
-        nfkc: "\u{264DA}",
-        nfkd: "\u{264DA}",
-    },
-    NormalizationTest {
-        source: "\u{2F97C}",
-        nfc: "\u{26523}",
-        nfd: "\u{26523}",
-        nfkc: "\u{26523}",
-        nfkd: "\u{26523}",
-    },
-    NormalizationTest {
-        source: "\u{2F97D}",
-        nfc: "\u{8060}",
-        nfd: "\u{8060}",
-        nfkc: "\u{8060}",
-        nfkd: "\u{8060}",
-    },
-    NormalizationTest {
-        source: "\u{2F97E}",
-        nfc: "\u{265A8}",
-        nfd: "\u{265A8}",
-        nfkc: "\u{265A8}",
-        nfkd: "\u{265A8}",
-    },
-    NormalizationTest {
-        source: "\u{2F97F}",
-        nfc: "\u{8070}",
-        nfd: "\u{8070}",
-        nfkc: "\u{8070}",
-        nfkd: "\u{8070}",
-    },
-    NormalizationTest {
-        source: "\u{2F980}",
-        nfc: "\u{2335F}",
-        nfd: "\u{2335F}",
-        nfkc: "\u{2335F}",
-        nfkd: "\u{2335F}",
-    },
-    NormalizationTest {
-        source: "\u{2F981}",
-        nfc: "\u{43D5}",
-        nfd: "\u{43D5}",
-        nfkc: "\u{43D5}",
-        nfkd: "\u{43D5}",
-    },
-    NormalizationTest {
-        source: "\u{2F982}",
-        nfc: "\u{80B2}",
-        nfd: "\u{80B2}",
-        nfkc: "\u{80B2}",
-        nfkd: "\u{80B2}",
-    },
-    NormalizationTest {
-        source: "\u{2F983}",
-        nfc: "\u{8103}",
-        nfd: "\u{8103}",
-        nfkc: "\u{8103}",
-        nfkd: "\u{8103}",
-    },
-    NormalizationTest {
-        source: "\u{2F984}",
-        nfc: "\u{440B}",
-        nfd: "\u{440B}",
-        nfkc: "\u{440B}",
-        nfkd: "\u{440B}",
-    },
-    NormalizationTest {
-        source: "\u{2F985}",
-        nfc: "\u{813E}",
-        nfd: "\u{813E}",
-        nfkc: "\u{813E}",
-        nfkd: "\u{813E}",
-    },
-    NormalizationTest {
-        source: "\u{2F986}",
-        nfc: "\u{5AB5}",
-        nfd: "\u{5AB5}",
-        nfkc: "\u{5AB5}",
-        nfkd: "\u{5AB5}",
-    },
-    NormalizationTest {
-        source: "\u{2F987}",
-        nfc: "\u{267A7}",
-        nfd: "\u{267A7}",
-        nfkc: "\u{267A7}",
-        nfkd: "\u{267A7}",
-    },
-    NormalizationTest {
-        source: "\u{2F988}",
-        nfc: "\u{267B5}",
-        nfd: "\u{267B5}",
-        nfkc: "\u{267B5}",
-        nfkd: "\u{267B5}",
-    },
-    NormalizationTest {
-        source: "\u{2F989}",
-        nfc: "\u{23393}",
-        nfd: "\u{23393}",
-        nfkc: "\u{23393}",
-        nfkd: "\u{23393}",
-    },
-    NormalizationTest {
-        source: "\u{2F98A}",
-        nfc: "\u{2339C}",
-        nfd: "\u{2339C}",
-        nfkc: "\u{2339C}",
-        nfkd: "\u{2339C}",
-    },
-    NormalizationTest {
-        source: "\u{2F98B}",
-        nfc: "\u{8201}",
-        nfd: "\u{8201}",
-        nfkc: "\u{8201}",
-        nfkd: "\u{8201}",
-    },
-    NormalizationTest {
-        source: "\u{2F98C}",
-        nfc: "\u{8204}",
-        nfd: "\u{8204}",
-        nfkc: "\u{8204}",
-        nfkd: "\u{8204}",
-    },
-    NormalizationTest {
-        source: "\u{2F98D}",
-        nfc: "\u{8F9E}",
-        nfd: "\u{8F9E}",
-        nfkc: "\u{8F9E}",
-        nfkd: "\u{8F9E}",
-    },
-    NormalizationTest {
-        source: "\u{2F98E}",
-        nfc: "\u{446B}",
-        nfd: "\u{446B}",
-        nfkc: "\u{446B}",
-        nfkd: "\u{446B}",
-    },
-    NormalizationTest {
-        source: "\u{2F98F}",
-        nfc: "\u{8291}",
-        nfd: "\u{8291}",
-        nfkc: "\u{8291}",
-        nfkd: "\u{8291}",
-    },
-    NormalizationTest {
-        source: "\u{2F990}",
-        nfc: "\u{828B}",
-        nfd: "\u{828B}",
-        nfkc: "\u{828B}",
-        nfkd: "\u{828B}",
-    },
-    NormalizationTest {
-        source: "\u{2F991}",
-        nfc: "\u{829D}",
-        nfd: "\u{829D}",
-        nfkc: "\u{829D}",
-        nfkd: "\u{829D}",
-    },
-    NormalizationTest {
-        source: "\u{2F992}",
-        nfc: "\u{52B3}",
-        nfd: "\u{52B3}",
-        nfkc: "\u{52B3}",
-        nfkd: "\u{52B3}",
-    },
-    NormalizationTest {
-        source: "\u{2F993}",
-        nfc: "\u{82B1}",
-        nfd: "\u{82B1}",
-        nfkc: "\u{82B1}",
-        nfkd: "\u{82B1}",
-    },
-    NormalizationTest {
-        source: "\u{2F994}",
-        nfc: "\u{82B3}",
-        nfd: "\u{82B3}",
-        nfkc: "\u{82B3}",
-        nfkd: "\u{82B3}",
-    },
-    NormalizationTest {
-        source: "\u{2F995}",
-        nfc: "\u{82BD}",
-        nfd: "\u{82BD}",
-        nfkc: "\u{82BD}",
-        nfkd: "\u{82BD}",
-    },
-    NormalizationTest {
-        source: "\u{2F996}",
-        nfc: "\u{82E6}",
-        nfd: "\u{82E6}",
-        nfkc: "\u{82E6}",
-        nfkd: "\u{82E6}",
-    },
-    NormalizationTest {
-        source: "\u{2F997}",
-        nfc: "\u{26B3C}",
-        nfd: "\u{26B3C}",
-        nfkc: "\u{26B3C}",
-        nfkd: "\u{26B3C}",
-    },
-    NormalizationTest {
-        source: "\u{2F998}",
-        nfc: "\u{82E5}",
-        nfd: "\u{82E5}",
-        nfkc: "\u{82E5}",
-        nfkd: "\u{82E5}",
-    },
-    NormalizationTest {
-        source: "\u{2F999}",
-        nfc: "\u{831D}",
-        nfd: "\u{831D}",
-        nfkc: "\u{831D}",
-        nfkd: "\u{831D}",
-    },
-    NormalizationTest {
-        source: "\u{2F99A}",
-        nfc: "\u{8363}",
-        nfd: "\u{8363}",
-        nfkc: "\u{8363}",
-        nfkd: "\u{8363}",
-    },
-    NormalizationTest {
-        source: "\u{2F99B}",
-        nfc: "\u{83AD}",
-        nfd: "\u{83AD}",
-        nfkc: "\u{83AD}",
-        nfkd: "\u{83AD}",
-    },
-    NormalizationTest {
-        source: "\u{2F99C}",
-        nfc: "\u{8323}",
-        nfd: "\u{8323}",
-        nfkc: "\u{8323}",
-        nfkd: "\u{8323}",
-    },
-    NormalizationTest {
-        source: "\u{2F99D}",
-        nfc: "\u{83BD}",
-        nfd: "\u{83BD}",
-        nfkc: "\u{83BD}",
-        nfkd: "\u{83BD}",
-    },
-    NormalizationTest {
-        source: "\u{2F99E}",
-        nfc: "\u{83E7}",
-        nfd: "\u{83E7}",
-        nfkc: "\u{83E7}",
-        nfkd: "\u{83E7}",
-    },
-    NormalizationTest {
-        source: "\u{2F99F}",
-        nfc: "\u{8457}",
-        nfd: "\u{8457}",
-        nfkc: "\u{8457}",
-        nfkd: "\u{8457}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A0}",
-        nfc: "\u{8353}",
-        nfd: "\u{8353}",
-        nfkc: "\u{8353}",
-        nfkd: "\u{8353}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A1}",
-        nfc: "\u{83CA}",
-        nfd: "\u{83CA}",
-        nfkc: "\u{83CA}",
-        nfkd: "\u{83CA}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A2}",
-        nfc: "\u{83CC}",
-        nfd: "\u{83CC}",
-        nfkc: "\u{83CC}",
-        nfkd: "\u{83CC}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A3}",
-        nfc: "\u{83DC}",
-        nfd: "\u{83DC}",
-        nfkc: "\u{83DC}",
-        nfkd: "\u{83DC}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A4}",
-        nfc: "\u{26C36}",
-        nfd: "\u{26C36}",
-        nfkc: "\u{26C36}",
-        nfkd: "\u{26C36}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A5}",
-        nfc: "\u{26D6B}",
-        nfd: "\u{26D6B}",
-        nfkc: "\u{26D6B}",
-        nfkd: "\u{26D6B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A6}",
-        nfc: "\u{26CD5}",
-        nfd: "\u{26CD5}",
-        nfkc: "\u{26CD5}",
-        nfkd: "\u{26CD5}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A7}",
-        nfc: "\u{452B}",
-        nfd: "\u{452B}",
-        nfkc: "\u{452B}",
-        nfkd: "\u{452B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A8}",
-        nfc: "\u{84F1}",
-        nfd: "\u{84F1}",
-        nfkc: "\u{84F1}",
-        nfkd: "\u{84F1}",
-    },
-    NormalizationTest {
-        source: "\u{2F9A9}",
-        nfc: "\u{84F3}",
-        nfd: "\u{84F3}",
-        nfkc: "\u{84F3}",
-        nfkd: "\u{84F3}",
-    },
-    NormalizationTest {
-        source: "\u{2F9AA}",
-        nfc: "\u{8516}",
-        nfd: "\u{8516}",
-        nfkc: "\u{8516}",
-        nfkd: "\u{8516}",
-    },
-    NormalizationTest {
-        source: "\u{2F9AB}",
-        nfc: "\u{273CA}",
-        nfd: "\u{273CA}",
-        nfkc: "\u{273CA}",
-        nfkd: "\u{273CA}",
-    },
-    NormalizationTest {
-        source: "\u{2F9AC}",
-        nfc: "\u{8564}",
-        nfd: "\u{8564}",
-        nfkc: "\u{8564}",
-        nfkd: "\u{8564}",
-    },
-    NormalizationTest {
-        source: "\u{2F9AD}",
-        nfc: "\u{26F2C}",
-        nfd: "\u{26F2C}",
-        nfkc: "\u{26F2C}",
-        nfkd: "\u{26F2C}",
-    },
-    NormalizationTest {
-        source: "\u{2F9AE}",
-        nfc: "\u{455D}",
-        nfd: "\u{455D}",
-        nfkc: "\u{455D}",
-        nfkd: "\u{455D}",
-    },
-    NormalizationTest {
-        source: "\u{2F9AF}",
-        nfc: "\u{4561}",
-        nfd: "\u{4561}",
-        nfkc: "\u{4561}",
-        nfkd: "\u{4561}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B0}",
-        nfc: "\u{26FB1}",
-        nfd: "\u{26FB1}",
-        nfkc: "\u{26FB1}",
-        nfkd: "\u{26FB1}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B1}",
-        nfc: "\u{270D2}",
-        nfd: "\u{270D2}",
-        nfkc: "\u{270D2}",
-        nfkd: "\u{270D2}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B2}",
-        nfc: "\u{456B}",
-        nfd: "\u{456B}",
-        nfkc: "\u{456B}",
-        nfkd: "\u{456B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B3}",
-        nfc: "\u{8650}",
-        nfd: "\u{8650}",
-        nfkc: "\u{8650}",
-        nfkd: "\u{8650}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B4}",
-        nfc: "\u{865C}",
-        nfd: "\u{865C}",
-        nfkc: "\u{865C}",
-        nfkd: "\u{865C}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B5}",
-        nfc: "\u{8667}",
-        nfd: "\u{8667}",
-        nfkc: "\u{8667}",
-        nfkd: "\u{8667}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B6}",
-        nfc: "\u{8669}",
-        nfd: "\u{8669}",
-        nfkc: "\u{8669}",
-        nfkd: "\u{8669}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B7}",
-        nfc: "\u{86A9}",
-        nfd: "\u{86A9}",
-        nfkc: "\u{86A9}",
-        nfkd: "\u{86A9}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B8}",
-        nfc: "\u{8688}",
-        nfd: "\u{8688}",
-        nfkc: "\u{8688}",
-        nfkd: "\u{8688}",
-    },
-    NormalizationTest {
-        source: "\u{2F9B9}",
-        nfc: "\u{870E}",
-        nfd: "\u{870E}",
-        nfkc: "\u{870E}",
-        nfkd: "\u{870E}",
-    },
-    NormalizationTest {
-        source: "\u{2F9BA}",
-        nfc: "\u{86E2}",
-        nfd: "\u{86E2}",
-        nfkc: "\u{86E2}",
-        nfkd: "\u{86E2}",
-    },
-    NormalizationTest {
-        source: "\u{2F9BB}",
-        nfc: "\u{8779}",
-        nfd: "\u{8779}",
-        nfkc: "\u{8779}",
-        nfkd: "\u{8779}",
-    },
-    NormalizationTest {
-        source: "\u{2F9BC}",
-        nfc: "\u{8728}",
-        nfd: "\u{8728}",
-        nfkc: "\u{8728}",
-        nfkd: "\u{8728}",
-    },
-    NormalizationTest {
-        source: "\u{2F9BD}",
-        nfc: "\u{876B}",
-        nfd: "\u{876B}",
-        nfkc: "\u{876B}",
-        nfkd: "\u{876B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9BE}",
-        nfc: "\u{8786}",
-        nfd: "\u{8786}",
-        nfkc: "\u{8786}",
-        nfkd: "\u{8786}",
-    },
-    NormalizationTest {
-        source: "\u{2F9BF}",
-        nfc: "\u{45D7}",
-        nfd: "\u{45D7}",
-        nfkc: "\u{45D7}",
-        nfkd: "\u{45D7}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C0}",
-        nfc: "\u{87E1}",
-        nfd: "\u{87E1}",
-        nfkc: "\u{87E1}",
-        nfkd: "\u{87E1}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C1}",
-        nfc: "\u{8801}",
-        nfd: "\u{8801}",
-        nfkc: "\u{8801}",
-        nfkd: "\u{8801}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C2}",
-        nfc: "\u{45F9}",
-        nfd: "\u{45F9}",
-        nfkc: "\u{45F9}",
-        nfkd: "\u{45F9}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C3}",
-        nfc: "\u{8860}",
-        nfd: "\u{8860}",
-        nfkc: "\u{8860}",
-        nfkd: "\u{8860}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C4}",
-        nfc: "\u{8863}",
-        nfd: "\u{8863}",
-        nfkc: "\u{8863}",
-        nfkd: "\u{8863}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C5}",
-        nfc: "\u{27667}",
-        nfd: "\u{27667}",
-        nfkc: "\u{27667}",
-        nfkd: "\u{27667}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C6}",
-        nfc: "\u{88D7}",
-        nfd: "\u{88D7}",
-        nfkc: "\u{88D7}",
-        nfkd: "\u{88D7}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C7}",
-        nfc: "\u{88DE}",
-        nfd: "\u{88DE}",
-        nfkc: "\u{88DE}",
-        nfkd: "\u{88DE}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C8}",
-        nfc: "\u{4635}",
-        nfd: "\u{4635}",
-        nfkc: "\u{4635}",
-        nfkd: "\u{4635}",
-    },
-    NormalizationTest {
-        source: "\u{2F9C9}",
-        nfc: "\u{88FA}",
-        nfd: "\u{88FA}",
-        nfkc: "\u{88FA}",
-        nfkd: "\u{88FA}",
-    },
-    NormalizationTest {
-        source: "\u{2F9CA}",
-        nfc: "\u{34BB}",
-        nfd: "\u{34BB}",
-        nfkc: "\u{34BB}",
-        nfkd: "\u{34BB}",
-    },
-    NormalizationTest {
-        source: "\u{2F9CB}",
-        nfc: "\u{278AE}",
-        nfd: "\u{278AE}",
-        nfkc: "\u{278AE}",
-        nfkd: "\u{278AE}",
-    },
-    NormalizationTest {
-        source: "\u{2F9CC}",
-        nfc: "\u{27966}",
-        nfd: "\u{27966}",
-        nfkc: "\u{27966}",
-        nfkd: "\u{27966}",
-    },
-    NormalizationTest {
-        source: "\u{2F9CD}",
-        nfc: "\u{46BE}",
-        nfd: "\u{46BE}",
-        nfkc: "\u{46BE}",
-        nfkd: "\u{46BE}",
-    },
-    NormalizationTest {
-        source: "\u{2F9CE}",
-        nfc: "\u{46C7}",
-        nfd: "\u{46C7}",
-        nfkc: "\u{46C7}",
-        nfkd: "\u{46C7}",
-    },
-    NormalizationTest {
-        source: "\u{2F9CF}",
-        nfc: "\u{8AA0}",
-        nfd: "\u{8AA0}",
-        nfkc: "\u{8AA0}",
-        nfkd: "\u{8AA0}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D0}",
-        nfc: "\u{8AED}",
-        nfd: "\u{8AED}",
-        nfkc: "\u{8AED}",
-        nfkd: "\u{8AED}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D1}",
-        nfc: "\u{8B8A}",
-        nfd: "\u{8B8A}",
-        nfkc: "\u{8B8A}",
-        nfkd: "\u{8B8A}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D2}",
-        nfc: "\u{8C55}",
-        nfd: "\u{8C55}",
-        nfkc: "\u{8C55}",
-        nfkd: "\u{8C55}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D3}",
-        nfc: "\u{27CA8}",
-        nfd: "\u{27CA8}",
-        nfkc: "\u{27CA8}",
-        nfkd: "\u{27CA8}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D4}",
-        nfc: "\u{8CAB}",
-        nfd: "\u{8CAB}",
-        nfkc: "\u{8CAB}",
-        nfkd: "\u{8CAB}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D5}",
-        nfc: "\u{8CC1}",
-        nfd: "\u{8CC1}",
-        nfkc: "\u{8CC1}",
-        nfkd: "\u{8CC1}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D6}",
-        nfc: "\u{8D1B}",
-        nfd: "\u{8D1B}",
-        nfkc: "\u{8D1B}",
-        nfkd: "\u{8D1B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D7}",
-        nfc: "\u{8D77}",
-        nfd: "\u{8D77}",
-        nfkc: "\u{8D77}",
-        nfkd: "\u{8D77}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D8}",
-        nfc: "\u{27F2F}",
-        nfd: "\u{27F2F}",
-        nfkc: "\u{27F2F}",
-        nfkd: "\u{27F2F}",
-    },
-    NormalizationTest {
-        source: "\u{2F9D9}",
-        nfc: "\u{20804}",
-        nfd: "\u{20804}",
-        nfkc: "\u{20804}",
-        nfkd: "\u{20804}",
-    },
-    NormalizationTest {
-        source: "\u{2F9DA}",
-        nfc: "\u{8DCB}",
-        nfd: "\u{8DCB}",
-        nfkc: "\u{8DCB}",
-        nfkd: "\u{8DCB}",
-    },
-    NormalizationTest {
-        source: "\u{2F9DB}",
-        nfc: "\u{8DBC}",
-        nfd: "\u{8DBC}",
-        nfkc: "\u{8DBC}",
-        nfkd: "\u{8DBC}",
-    },
-    NormalizationTest {
-        source: "\u{2F9DC}",
-        nfc: "\u{8DF0}",
-        nfd: "\u{8DF0}",
-        nfkc: "\u{8DF0}",
-        nfkd: "\u{8DF0}",
-    },
-    NormalizationTest {
-        source: "\u{2F9DD}",
-        nfc: "\u{208DE}",
-        nfd: "\u{208DE}",
-        nfkc: "\u{208DE}",
-        nfkd: "\u{208DE}",
-    },
-    NormalizationTest {
-        source: "\u{2F9DE}",
-        nfc: "\u{8ED4}",
-        nfd: "\u{8ED4}",
-        nfkc: "\u{8ED4}",
-        nfkd: "\u{8ED4}",
-    },
-    NormalizationTest {
-        source: "\u{2F9DF}",
-        nfc: "\u{8F38}",
-        nfd: "\u{8F38}",
-        nfkc: "\u{8F38}",
-        nfkd: "\u{8F38}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E0}",
-        nfc: "\u{285D2}",
-        nfd: "\u{285D2}",
-        nfkc: "\u{285D2}",
-        nfkd: "\u{285D2}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E1}",
-        nfc: "\u{285ED}",
-        nfd: "\u{285ED}",
-        nfkc: "\u{285ED}",
-        nfkd: "\u{285ED}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E2}",
-        nfc: "\u{9094}",
-        nfd: "\u{9094}",
-        nfkc: "\u{9094}",
-        nfkd: "\u{9094}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E3}",
-        nfc: "\u{90F1}",
-        nfd: "\u{90F1}",
-        nfkc: "\u{90F1}",
-        nfkd: "\u{90F1}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E4}",
-        nfc: "\u{9111}",
-        nfd: "\u{9111}",
-        nfkc: "\u{9111}",
-        nfkd: "\u{9111}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E5}",
-        nfc: "\u{2872E}",
-        nfd: "\u{2872E}",
-        nfkc: "\u{2872E}",
-        nfkd: "\u{2872E}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E6}",
-        nfc: "\u{911B}",
-        nfd: "\u{911B}",
-        nfkc: "\u{911B}",
-        nfkd: "\u{911B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E7}",
-        nfc: "\u{9238}",
-        nfd: "\u{9238}",
-        nfkc: "\u{9238}",
-        nfkd: "\u{9238}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E8}",
-        nfc: "\u{92D7}",
-        nfd: "\u{92D7}",
-        nfkc: "\u{92D7}",
-        nfkd: "\u{92D7}",
-    },
-    NormalizationTest {
-        source: "\u{2F9E9}",
-        nfc: "\u{92D8}",
-        nfd: "\u{92D8}",
-        nfkc: "\u{92D8}",
-        nfkd: "\u{92D8}",
-    },
-    NormalizationTest {
-        source: "\u{2F9EA}",
-        nfc: "\u{927C}",
-        nfd: "\u{927C}",
-        nfkc: "\u{927C}",
-        nfkd: "\u{927C}",
-    },
-    NormalizationTest {
-        source: "\u{2F9EB}",
-        nfc: "\u{93F9}",
-        nfd: "\u{93F9}",
-        nfkc: "\u{93F9}",
-        nfkd: "\u{93F9}",
-    },
-    NormalizationTest {
-        source: "\u{2F9EC}",
-        nfc: "\u{9415}",
-        nfd: "\u{9415}",
-        nfkc: "\u{9415}",
-        nfkd: "\u{9415}",
-    },
-    NormalizationTest {
-        source: "\u{2F9ED}",
-        nfc: "\u{28BFA}",
-        nfd: "\u{28BFA}",
-        nfkc: "\u{28BFA}",
-        nfkd: "\u{28BFA}",
-    },
-    NormalizationTest {
-        source: "\u{2F9EE}",
-        nfc: "\u{958B}",
-        nfd: "\u{958B}",
-        nfkc: "\u{958B}",
-        nfkd: "\u{958B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9EF}",
-        nfc: "\u{4995}",
-        nfd: "\u{4995}",
-        nfkc: "\u{4995}",
-        nfkd: "\u{4995}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F0}",
-        nfc: "\u{95B7}",
-        nfd: "\u{95B7}",
-        nfkc: "\u{95B7}",
-        nfkd: "\u{95B7}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F1}",
-        nfc: "\u{28D77}",
-        nfd: "\u{28D77}",
-        nfkc: "\u{28D77}",
-        nfkd: "\u{28D77}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F2}",
-        nfc: "\u{49E6}",
-        nfd: "\u{49E6}",
-        nfkc: "\u{49E6}",
-        nfkd: "\u{49E6}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F3}",
-        nfc: "\u{96C3}",
-        nfd: "\u{96C3}",
-        nfkc: "\u{96C3}",
-        nfkd: "\u{96C3}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F4}",
-        nfc: "\u{5DB2}",
-        nfd: "\u{5DB2}",
-        nfkc: "\u{5DB2}",
-        nfkd: "\u{5DB2}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F5}",
-        nfc: "\u{9723}",
-        nfd: "\u{9723}",
-        nfkc: "\u{9723}",
-        nfkd: "\u{9723}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F6}",
-        nfc: "\u{29145}",
-        nfd: "\u{29145}",
-        nfkc: "\u{29145}",
-        nfkd: "\u{29145}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F7}",
-        nfc: "\u{2921A}",
-        nfd: "\u{2921A}",
-        nfkc: "\u{2921A}",
-        nfkd: "\u{2921A}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F8}",
-        nfc: "\u{4A6E}",
-        nfd: "\u{4A6E}",
-        nfkc: "\u{4A6E}",
-        nfkd: "\u{4A6E}",
-    },
-    NormalizationTest {
-        source: "\u{2F9F9}",
-        nfc: "\u{4A76}",
-        nfd: "\u{4A76}",
-        nfkc: "\u{4A76}",
-        nfkd: "\u{4A76}",
-    },
-    NormalizationTest {
-        source: "\u{2F9FA}",
-        nfc: "\u{97E0}",
-        nfd: "\u{97E0}",
-        nfkc: "\u{97E0}",
-        nfkd: "\u{97E0}",
-    },
-    NormalizationTest {
-        source: "\u{2F9FB}",
-        nfc: "\u{2940A}",
-        nfd: "\u{2940A}",
-        nfkc: "\u{2940A}",
-        nfkd: "\u{2940A}",
-    },
-    NormalizationTest {
-        source: "\u{2F9FC}",
-        nfc: "\u{4AB2}",
-        nfd: "\u{4AB2}",
-        nfkc: "\u{4AB2}",
-        nfkd: "\u{4AB2}",
-    },
-    NormalizationTest {
-        source: "\u{2F9FD}",
-        nfc: "\u{29496}",
-        nfd: "\u{29496}",
-        nfkc: "\u{29496}",
-        nfkd: "\u{29496}",
-    },
-    NormalizationTest {
-        source: "\u{2F9FE}",
-        nfc: "\u{980B}",
-        nfd: "\u{980B}",
-        nfkc: "\u{980B}",
-        nfkd: "\u{980B}",
-    },
-    NormalizationTest {
-        source: "\u{2F9FF}",
-        nfc: "\u{980B}",
-        nfd: "\u{980B}",
-        nfkc: "\u{980B}",
-        nfkd: "\u{980B}",
-    },
-    NormalizationTest {
-        source: "\u{2FA00}",
-        nfc: "\u{9829}",
-        nfd: "\u{9829}",
-        nfkc: "\u{9829}",
-        nfkd: "\u{9829}",
-    },
-    NormalizationTest {
-        source: "\u{2FA01}",
-        nfc: "\u{295B6}",
-        nfd: "\u{295B6}",
-        nfkc: "\u{295B6}",
-        nfkd: "\u{295B6}",
-    },
-    NormalizationTest {
-        source: "\u{2FA02}",
-        nfc: "\u{98E2}",
-        nfd: "\u{98E2}",
-        nfkc: "\u{98E2}",
-        nfkd: "\u{98E2}",
-    },
-    NormalizationTest {
-        source: "\u{2FA03}",
-        nfc: "\u{4B33}",
-        nfd: "\u{4B33}",
-        nfkc: "\u{4B33}",
-        nfkd: "\u{4B33}",
-    },
-    NormalizationTest {
-        source: "\u{2FA04}",
-        nfc: "\u{9929}",
-        nfd: "\u{9929}",
-        nfkc: "\u{9929}",
-        nfkd: "\u{9929}",
-    },
-    NormalizationTest {
-        source: "\u{2FA05}",
-        nfc: "\u{99A7}",
-        nfd: "\u{99A7}",
-        nfkc: "\u{99A7}",
-        nfkd: "\u{99A7}",
-    },
-    NormalizationTest {
-        source: "\u{2FA06}",
-        nfc: "\u{99C2}",
-        nfd: "\u{99C2}",
-        nfkc: "\u{99C2}",
-        nfkd: "\u{99C2}",
-    },
-    NormalizationTest {
-        source: "\u{2FA07}",
-        nfc: "\u{99FE}",
-        nfd: "\u{99FE}",
-        nfkc: "\u{99FE}",
-        nfkd: "\u{99FE}",
-    },
-    NormalizationTest {
-        source: "\u{2FA08}",
-        nfc: "\u{4BCE}",
-        nfd: "\u{4BCE}",
-        nfkc: "\u{4BCE}",
-        nfkd: "\u{4BCE}",
-    },
-    NormalizationTest {
-        source: "\u{2FA09}",
-        nfc: "\u{29B30}",
-        nfd: "\u{29B30}",
-        nfkc: "\u{29B30}",
-        nfkd: "\u{29B30}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0A}",
-        nfc: "\u{9B12}",
-        nfd: "\u{9B12}",
-        nfkc: "\u{9B12}",
-        nfkd: "\u{9B12}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0B}",
-        nfc: "\u{9C40}",
-        nfd: "\u{9C40}",
-        nfkc: "\u{9C40}",
-        nfkd: "\u{9C40}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0C}",
-        nfc: "\u{9CFD}",
-        nfd: "\u{9CFD}",
-        nfkc: "\u{9CFD}",
-        nfkd: "\u{9CFD}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0D}",
-        nfc: "\u{4CCE}",
-        nfd: "\u{4CCE}",
-        nfkc: "\u{4CCE}",
-        nfkd: "\u{4CCE}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0E}",
-        nfc: "\u{4CED}",
-        nfd: "\u{4CED}",
-        nfkc: "\u{4CED}",
-        nfkd: "\u{4CED}",
-    },
-    NormalizationTest {
-        source: "\u{2FA0F}",
-        nfc: "\u{9D67}",
-        nfd: "\u{9D67}",
-        nfkc: "\u{9D67}",
-        nfkd: "\u{9D67}",
-    },
-    NormalizationTest {
-        source: "\u{2FA10}",
-        nfc: "\u{2A0CE}",
-        nfd: "\u{2A0CE}",
-        nfkc: "\u{2A0CE}",
-        nfkd: "\u{2A0CE}",
-    },
-    NormalizationTest {
-        source: "\u{2FA11}",
-        nfc: "\u{4CF8}",
-        nfd: "\u{4CF8}",
-        nfkc: "\u{4CF8}",
-        nfkd: "\u{4CF8}",
-    },
-    NormalizationTest {
-        source: "\u{2FA12}",
-        nfc: "\u{2A105}",
-        nfd: "\u{2A105}",
-        nfkc: "\u{2A105}",
-        nfkd: "\u{2A105}",
-    },
-    NormalizationTest {
-        source: "\u{2FA13}",
-        nfc: "\u{2A20E}",
-        nfd: "\u{2A20E}",
-        nfkc: "\u{2A20E}",
-        nfkd: "\u{2A20E}",
-    },
-    NormalizationTest {
-        source: "\u{2FA14}",
-        nfc: "\u{2A291}",
-        nfd: "\u{2A291}",
-        nfkc: "\u{2A291}",
-        nfkd: "\u{2A291}",
-    },
-    NormalizationTest {
-        source: "\u{2FA15}",
-        nfc: "\u{9EBB}",
-        nfd: "\u{9EBB}",
-        nfkc: "\u{9EBB}",
-        nfkd: "\u{9EBB}",
-    },
-    NormalizationTest {
-        source: "\u{2FA16}",
-        nfc: "\u{4D56}",
-        nfd: "\u{4D56}",
-        nfkc: "\u{4D56}",
-        nfkd: "\u{4D56}",
-    },
-    NormalizationTest {
-        source: "\u{2FA17}",
-        nfc: "\u{9EF9}",
-        nfd: "\u{9EF9}",
-        nfkc: "\u{9EF9}",
-        nfkd: "\u{9EF9}",
-    },
-    NormalizationTest {
-        source: "\u{2FA18}",
-        nfc: "\u{9EFE}",
-        nfd: "\u{9EFE}",
-        nfkc: "\u{9EFE}",
-        nfkd: "\u{9EFE}",
-    },
-    NormalizationTest {
-        source: "\u{2FA19}",
-        nfc: "\u{9F05}",
-        nfd: "\u{9F05}",
-        nfkc: "\u{9F05}",
-        nfkd: "\u{9F05}",
-    },
-    NormalizationTest {
-        source: "\u{2FA1A}",
-        nfc: "\u{9F0F}",
-        nfd: "\u{9F0F}",
-        nfkc: "\u{9F0F}",
-        nfkd: "\u{9F0F}",
-    },
-    NormalizationTest {
-        source: "\u{2FA1B}",
-        nfc: "\u{9F16}",
-        nfd: "\u{9F16}",
-        nfkc: "\u{9F16}",
-        nfkd: "\u{9F16}",
-    },
-    NormalizationTest {
-        source: "\u{2FA1C}",
-        nfc: "\u{9F3B}",
-        nfd: "\u{9F3B}",
-        nfkc: "\u{9F3B}",
-        nfkd: "\u{9F3B}",
-    },
-    NormalizationTest {
-        source: "\u{2FA1D}",
-        nfc: "\u{2A600}",
-        nfd: "\u{2A600}",
-        nfkc: "\u{2A600}",
-        nfkd: "\u{2A600}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0300}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0300}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0301}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0301}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0301}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0301}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0301}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0301}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E1}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0301}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E1}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0301}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0302}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0302}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0302}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0302}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0302}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0302}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{1EA7}\u{05AE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0302}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{1EA7}\u{05AE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0302}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0303}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0303}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0303}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0303}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0303}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0303}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E3}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0303}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E3}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0303}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0304}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0304}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0304}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0304}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0304}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0304}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0101}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0304}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0101}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0304}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0305}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0305}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0305}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0305}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0305}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0305}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0305}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0305}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0305}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0305}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0306}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0306}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0306}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0306}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0306}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0306}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{1EB1}\u{05AE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0306}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{1EB1}\u{05AE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0306}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0307}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0307}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0307}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0307}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0307}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0307}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0227}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0307}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0227}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0307}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0308}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0308}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0308}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0308}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0308}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0308}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E4}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0308}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E4}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0308}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0309}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0309}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0309}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0309}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0309}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0309}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{1EA3}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0309}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{1EA3}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0309}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{030A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{030A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{030A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{030A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{030A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{030A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E5}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{030A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E5}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{030A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{030B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{030B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{030B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{030B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{030B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{030B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{030B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{030B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{030B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{030B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{030C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{030C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{030C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{030C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{030C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{030C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{01CE}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{030C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{01CE}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{030C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{030D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{030D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{030D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{030D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{030D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{030D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{030D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{030D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{030D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{030D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{030E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{030E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{030E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{030E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{030E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{030E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{030E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{030E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{030E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{030E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{030F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{030F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{030F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{030F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{030F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{030F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0201}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{030F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0201}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{030F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0310}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0310}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0310}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0310}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0310}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0310}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0310}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0310}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0310}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0310}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0311}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0311}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0311}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0311}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0311}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0311}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0203}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0311}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0203}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0311}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0312}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0312}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0312}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0312}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0312}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0312}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0312}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0312}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0312}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0312}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0313}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0313}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0313}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0313}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0313}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0313}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0314}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0314}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0314}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0314}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0314}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0314}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0314}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0314}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0314}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0314}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035C}\u{0315}\u{0300}\u{0315}\u{0062}",
-        nfc: "\u{00E0}\u{0315}\u{0315}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{0315}\u{0315}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{0315}\u{0315}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{0315}\u{0315}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{035C}\u{0315}\u{0300}\u{0062}",
-        nfc: "\u{00E0}\u{0315}\u{0315}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{0315}\u{0315}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{0315}\u{0315}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{0315}\u{0315}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0316}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0316}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0317}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0317}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0317}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0317}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0317}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0317}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0317}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0317}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0317}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0317}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0318}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0318}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0318}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0318}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0318}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0318}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0318}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0318}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0318}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0318}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0319}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0319}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0319}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0319}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0319}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0319}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0319}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0319}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0319}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0319}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035C}\u{0315}\u{0300}\u{031A}\u{0062}",
-        nfc: "\u{00E0}\u{0315}\u{031A}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{0315}\u{031A}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{0315}\u{031A}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{0315}\u{031A}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031A}\u{035C}\u{0315}\u{0300}\u{0062}",
-        nfc: "\u{00E0}\u{031A}\u{0315}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{031A}\u{0315}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{031A}\u{0315}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{031A}\u{0315}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{031B}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031B}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{031C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{031C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{031C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{031C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{031C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{031C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{031C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{031C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{031C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{031D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{031D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{031D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{031D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{031D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{031D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{031D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{031D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{031D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{031E}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{031E}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{031E}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{031E}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{031E}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031E}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{031E}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{031E}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{031E}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{031E}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{031F}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{031F}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{031F}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{031F}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{031F}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031F}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{031F}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{031F}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{031F}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{031F}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0320}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0320}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0320}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0320}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0320}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0320}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0320}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0320}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0320}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0320}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCE}\u{0321}\u{0F74}\u{0321}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0321}\u{1DCE}\u{0321}\u{0F74}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0321}\u{0321}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCE}\u{0321}\u{0F74}\u{0322}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0321}\u{0322}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0321}\u{0322}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0321}\u{0322}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0321}\u{0322}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0322}\u{1DCE}\u{0321}\u{0F74}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0322}\u{0321}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0322}\u{0321}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0322}\u{0321}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0322}\u{0321}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0323}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0323}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0323}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0323}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0323}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0323}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{1EA1}\u{302A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0323}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{1EA1}\u{302A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0323}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0324}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0324}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0324}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0324}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0324}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0324}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0324}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0324}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0324}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0324}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0325}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0325}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0325}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0325}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0325}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0325}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{1E01}\u{302A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0325}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{1E01}\u{302A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0325}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0326}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0326}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0326}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0326}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0326}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0326}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0326}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0326}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0326}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0326}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCE}\u{0321}\u{0F74}\u{0327}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0321}\u{0327}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0321}\u{0327}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0321}\u{0327}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0321}\u{0327}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0327}\u{1DCE}\u{0321}\u{0F74}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0327}\u{0321}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0327}\u{0321}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0327}\u{0321}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0327}\u{0321}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCE}\u{0321}\u{0F74}\u{0328}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0321}\u{0328}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0321}\u{0328}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0321}\u{0328}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0321}\u{0328}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0328}\u{1DCE}\u{0321}\u{0F74}\u{0062}",
-        nfc: "\u{0105}\u{0F74}\u{0321}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0328}\u{0321}\u{1DCE}\u{0062}",
-        nfkc: "\u{0105}\u{0F74}\u{0321}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0328}\u{0321}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0329}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0329}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0329}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0329}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0329}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0329}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0329}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0329}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0329}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0329}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{032A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{032A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{032A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{032A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{032A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{032A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{032A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{032A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{032A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{032A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{032B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{032B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{032B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{032B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{032B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{032B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{032B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{032B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{032B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{032B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{032C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{032C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{032C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{032C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{032C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{032C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{032C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{032C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{032C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{032C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{032D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{032D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{032D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{032D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{032D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{032D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{032D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{032D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{032D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{032D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{032E}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{032E}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{032E}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{032E}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{032E}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{032E}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{032E}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{032E}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{032E}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{032E}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{032F}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{032F}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{032F}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{032F}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{032F}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{032F}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{032F}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{032F}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{032F}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{032F}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0330}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0330}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0330}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0330}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0330}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0330}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0330}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0330}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0330}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0330}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0331}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0331}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0331}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0331}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0331}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0331}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0331}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0331}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0331}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0331}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0332}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0332}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0332}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0332}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0332}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0332}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0332}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0332}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0332}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0332}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0333}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0333}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0333}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0333}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0333}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0333}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0333}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0333}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0333}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0333}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0334}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{0335}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0335}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0335}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0335}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0335}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0335}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0335}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0335}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0335}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0335}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{0336}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0336}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0336}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0336}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0336}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0336}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0336}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0336}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0336}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0336}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{0337}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0337}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0337}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0337}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0337}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0337}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0337}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0337}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0337}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0337}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{0338}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0338}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0338}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0338}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0338}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0338}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0338}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0338}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0338}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0338}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0339}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0339}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0339}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0339}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0339}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0339}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0339}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0339}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0339}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0339}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{033A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{033A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{033A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{033A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{033A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{033A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{033A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{033A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{033A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{033A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{033B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{033B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{033B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{033B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{033B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{033B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{033B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{033B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{033B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{033B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{033C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{033C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{033C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{033C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{033C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{033C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{033C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{033C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{033C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{033C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{033D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{033D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{033D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{033D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{033D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{033D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{033D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{033D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{033D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{033D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{033E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{033E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{033E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{033E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{033E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{033E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{033E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{033E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{033E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{033E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{033F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{033F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{033F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{033F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{033F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{033F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{033F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{033F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{033F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{033F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0340}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0340}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0341}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0301}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0301}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0301}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0301}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0341}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E1}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0301}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E1}\u{05AE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0301}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0342}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0342}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0342}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0342}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0342}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0342}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0342}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0342}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0342}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0342}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0343}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0313}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0313}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0313}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0313}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0343}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0313}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0344}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0308}\u{0301}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0308}\u{0301}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0308}\u{0301}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0308}\u{0301}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0344}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{00E4}\u{05AE}\u{0301}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0308}\u{0301}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{00E4}\u{05AE}\u{0301}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0308}\u{0301}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{035D}\u{0345}\u{0062}",
-        nfc: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{0345}\u{035D}\u{0062}",
-        nfc: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035D}\u{0345}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0346}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0346}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0346}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0346}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0346}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0346}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0346}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0346}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0346}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0346}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0347}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0347}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0347}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0347}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0347}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0347}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0347}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0347}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0347}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0347}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0348}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0348}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0348}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0348}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0348}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0348}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0348}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0348}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0348}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0348}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0349}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0349}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0349}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0349}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0349}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0349}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0349}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0349}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0349}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0349}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{034A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{034A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{034A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{034A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{034A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{034A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{034A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{034A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{034A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{034A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{034B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{034B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{034B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{034B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{034B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{034B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{034B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{034B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{034B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{034B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{034C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{034C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{034C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{034C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{034C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{034C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{034C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{034C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{034C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{034C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{034D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{034D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{034D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{034D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{034D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{034D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{034D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{034D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{034D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{034D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{034E}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{034E}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{034E}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{034E}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{034E}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{034E}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{034E}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{034E}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{034E}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{034E}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0350}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0350}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0350}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0350}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0350}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0350}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0350}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0350}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0350}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0350}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0351}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0351}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0351}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0351}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0351}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0351}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0351}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0351}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0351}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0351}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0352}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0352}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0352}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0352}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0352}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0352}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0352}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0352}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0352}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0352}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0353}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0353}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0353}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0353}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0353}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0353}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0353}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0353}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0353}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0353}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0354}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0354}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0354}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0354}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0354}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0354}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0354}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0354}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0354}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0354}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0355}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0355}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0355}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0355}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0355}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0355}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0355}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0355}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0355}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0355}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0356}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0356}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0356}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0356}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0356}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0356}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0356}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0356}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0356}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0356}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0357}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0357}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0357}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0357}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0357}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0357}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0357}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0357}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0357}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0357}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035C}\u{0315}\u{0300}\u{0358}\u{0062}",
-        nfc: "\u{00E0}\u{0315}\u{0358}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{0315}\u{0358}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{0315}\u{0358}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{0315}\u{0358}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0358}\u{035C}\u{0315}\u{0300}\u{0062}",
-        nfc: "\u{00E0}\u{0358}\u{0315}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{0358}\u{0315}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{0358}\u{0315}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{0358}\u{0315}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0359}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0359}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0359}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0359}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0359}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0359}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0359}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0359}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0359}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0359}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{035A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{035A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{035A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{035A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{035A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{035A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{035A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{035A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{035A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{035B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{035B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{035B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{035B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{035B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{035B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{035B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{035B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{035B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035D}\u{035C}\u{0315}\u{035C}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035C}\u{035D}\u{035C}\u{0315}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{035C}\u{035C}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{035D}\u{035C}\u{035D}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035D}\u{0345}\u{035D}\u{035C}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035D}\u{035D}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{035D}\u{035C}\u{035E}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035D}\u{035E}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035D}\u{035E}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035D}\u{035E}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035D}\u{035E}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035E}\u{0345}\u{035D}\u{035C}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035E}\u{035D}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035E}\u{035D}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035E}\u{035D}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035E}\u{035D}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035D}\u{035C}\u{0315}\u{035F}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{035C}\u{035F}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{035C}\u{035F}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{035C}\u{035F}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{035C}\u{035F}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035F}\u{035D}\u{035C}\u{0315}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{035F}\u{035C}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{035F}\u{035C}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{035F}\u{035C}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{035F}\u{035C}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{035D}\u{035C}\u{0360}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035D}\u{0360}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035D}\u{0360}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035D}\u{0360}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035D}\u{0360}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0360}\u{0345}\u{035D}\u{035C}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{0360}\u{035D}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{0360}\u{035D}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{0360}\u{035D}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{0360}\u{035D}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{035D}\u{035C}\u{0361}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035D}\u{0361}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035D}\u{0361}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035D}\u{0361}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035D}\u{0361}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0361}\u{0345}\u{035D}\u{035C}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{0361}\u{035D}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{0361}\u{035D}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{0361}\u{035D}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{0361}\u{035D}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035D}\u{035C}\u{0315}\u{0362}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{035C}\u{0362}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{035C}\u{0362}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{035C}\u{0362}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{035C}\u{0362}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0362}\u{035D}\u{035C}\u{0315}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{0362}\u{035C}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{0362}\u{035C}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{0362}\u{035C}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{0362}\u{035C}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0363}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0363}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0363}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0363}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0363}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0363}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0363}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0363}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0363}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0363}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0364}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0364}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0364}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0364}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0364}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0364}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0364}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0364}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0364}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0364}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0365}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0365}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0365}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0365}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0365}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0365}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0365}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0365}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0365}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0365}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0366}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0366}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0366}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0366}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0366}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0366}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0366}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0366}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0366}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0366}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0367}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0367}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0367}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0367}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0367}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0367}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0367}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0367}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0367}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0367}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0368}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0368}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0368}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0368}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0368}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0368}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0368}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0368}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0368}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0368}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0369}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0369}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0369}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0369}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0369}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0369}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0369}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0369}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0369}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0369}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{036A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{036A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{036A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{036A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{036A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{036A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{036A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{036A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{036A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{036A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{036B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{036B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{036B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{036B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{036B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{036B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{036B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{036B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{036B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{036B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{036C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{036C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{036C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{036C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{036C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{036C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{036C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{036C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{036C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{036C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{036D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{036D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{036D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{036D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{036D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{036D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{036D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{036D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{036D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{036D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{036E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{036E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{036E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{036E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{036E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{036E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{036E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{036E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{036E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{036E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{036F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{036F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{036F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{036F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{036F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{036F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{036F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{036F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{036F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{036F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0483}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0483}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0483}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0483}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0483}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0483}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0483}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0483}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0483}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0483}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0484}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0484}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0484}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0484}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0484}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0484}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0484}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0484}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0484}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0484}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0485}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0485}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0485}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0485}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0485}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0485}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0485}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0485}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0485}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0485}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0486}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0486}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0486}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0486}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0486}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0486}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0486}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0486}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0486}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0486}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0487}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0487}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0487}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0487}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0487}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0487}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0487}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0487}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0487}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0487}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0591}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0591}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0591}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0591}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0591}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0591}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0591}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0591}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0591}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0591}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0592}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0592}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0592}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0592}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0592}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0592}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0592}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0592}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0592}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0592}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0593}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0593}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0593}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0593}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0593}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0593}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0593}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0593}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0593}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0593}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0594}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0594}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0594}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0594}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0594}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0594}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0594}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0594}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0594}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0594}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0595}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0595}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0595}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0595}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0595}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0595}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0595}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0595}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0595}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0595}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0596}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0596}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0596}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0596}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0596}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0596}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0596}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0596}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0596}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0596}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0597}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0597}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0597}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0597}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0597}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0597}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0597}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0597}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0597}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0597}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0598}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0598}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0598}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0598}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0598}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0598}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0598}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0598}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0598}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0598}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0599}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0599}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0599}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0599}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0599}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0599}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0599}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0599}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0599}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0599}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302E}\u{059A}\u{0316}\u{059A}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{302E}\u{059A}\u{0316}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{059A}\u{059A}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{059B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{059B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{059B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{059B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{059B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{059B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{059B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{059B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{059B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{059C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{059C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{059C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{059C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{059C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{059C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{059C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{059C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{059C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{059D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{059D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{059D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{059D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{059D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{059D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{059D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{059D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{059D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{059E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{059E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{059E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{059E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{059E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{059E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{059E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{059E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{059E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{059F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{059F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{059F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{059F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{059F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{059F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{059F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{059F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{059F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05A0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05A0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05A0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05A0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05A0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05A0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05A0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05A0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05A0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05A1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05A1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05A1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05A1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05A1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05A1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05A1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05A1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05A1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05A2}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05A2}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05A2}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05A2}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05A2}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A2}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05A2}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05A2}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05A2}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05A2}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05A3}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05A3}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05A3}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05A3}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05A3}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A3}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05A3}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05A3}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05A3}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05A3}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05A4}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05A4}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05A4}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05A4}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05A4}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A4}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05A4}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05A4}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05A4}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05A4}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05A5}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05A5}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05A5}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05A5}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05A5}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A5}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05A5}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05A5}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05A5}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05A5}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05A6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05A6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05A6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05A6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05A6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05A6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05A6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05A6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05A6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05A7}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05A7}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05A7}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05A7}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05A7}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A7}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05A7}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05A7}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05A7}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05A7}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05A8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05A8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05A8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05A8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05A8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05A8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05A8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05A8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05A8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05A9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05A9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05A9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05A9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05A9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05A9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05A9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05A9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05A9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05A9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05AA}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05AA}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05AA}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05AA}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05AA}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AA}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05AA}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05AA}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05AA}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05AA}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05AB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05AB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05AB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05AB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05AB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05AB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05AB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05AB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05AB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05AC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05AC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05AC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05AC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05AC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05AC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05AC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05AC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05AC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302E}\u{059A}\u{0316}\u{05AD}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{059A}\u{05AD}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{059A}\u{05AD}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{059A}\u{05AD}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{059A}\u{05AD}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AD}\u{302E}\u{059A}\u{0316}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{05AD}\u{059A}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{05AD}\u{059A}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{05AD}\u{059A}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{05AD}\u{059A}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0300}\u{05AE}\u{1D16D}\u{05AE}\u{0062}",
-        nfc: "\u{00E0}\u{1D16D}\u{05AE}\u{05AE}\u{0062}",
-        nfd: "\u{0061}\u{1D16D}\u{05AE}\u{05AE}\u{0300}\u{0062}",
-        nfkc: "\u{00E0}\u{1D16D}\u{05AE}\u{05AE}\u{0062}",
-        nfkd: "\u{0061}\u{1D16D}\u{05AE}\u{05AE}\u{0300}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AE}\u{0300}\u{05AE}\u{1D16D}\u{0062}",
-        nfc: "\u{00E0}\u{1D16D}\u{05AE}\u{05AE}\u{0062}",
-        nfd: "\u{0061}\u{1D16D}\u{05AE}\u{05AE}\u{0300}\u{0062}",
-        nfkc: "\u{00E0}\u{1D16D}\u{05AE}\u{05AE}\u{0062}",
-        nfkd: "\u{0061}\u{1D16D}\u{05AE}\u{05AE}\u{0300}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05AF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05AF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05AF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05AF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05AF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05AF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05AF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05AF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05AF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B1}\u{05B0}\u{094D}\u{05B0}\u{0062}",
-        nfc: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-        nfd: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-        nfkc: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-        nfkd: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{05B1}\u{05B0}\u{094D}\u{0062}",
-        nfc: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-        nfd: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-        nfkc: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-        nfkd: "\u{0061}\u{094D}\u{05B0}\u{05B0}\u{05B1}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B2}\u{05B1}\u{05B0}\u{05B1}\u{0062}",
-        nfc: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-        nfd: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-        nfkc: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-        nfkd: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B1}\u{05B2}\u{05B1}\u{05B0}\u{0062}",
-        nfc: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-        nfd: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-        nfkc: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-        nfkd: "\u{0061}\u{05B0}\u{05B1}\u{05B1}\u{05B2}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B3}\u{05B2}\u{05B1}\u{05B2}\u{0062}",
-        nfc: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-        nfd: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-        nfkc: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-        nfkd: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B2}\u{05B3}\u{05B2}\u{05B1}\u{0062}",
-        nfc: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-        nfd: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-        nfkc: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-        nfkd: "\u{0061}\u{05B1}\u{05B2}\u{05B2}\u{05B3}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B4}\u{05B3}\u{05B2}\u{05B3}\u{0062}",
-        nfc: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-        nfd: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-        nfkc: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-        nfkd: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B3}\u{05B4}\u{05B3}\u{05B2}\u{0062}",
-        nfc: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-        nfd: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-        nfkc: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-        nfkd: "\u{0061}\u{05B2}\u{05B3}\u{05B3}\u{05B4}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B5}\u{05B4}\u{05B3}\u{05B4}\u{0062}",
-        nfc: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-        nfd: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-        nfkc: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-        nfkd: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B4}\u{05B5}\u{05B4}\u{05B3}\u{0062}",
-        nfc: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-        nfd: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-        nfkc: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-        nfkd: "\u{0061}\u{05B3}\u{05B4}\u{05B4}\u{05B5}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B6}\u{05B5}\u{05B4}\u{05B5}\u{0062}",
-        nfc: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-        nfd: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-        nfkc: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-        nfkd: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B5}\u{05B6}\u{05B5}\u{05B4}\u{0062}",
-        nfc: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-        nfd: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-        nfkc: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-        nfkd: "\u{0061}\u{05B4}\u{05B5}\u{05B5}\u{05B6}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B7}\u{05B6}\u{05B5}\u{05B6}\u{0062}",
-        nfc: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-        nfd: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-        nfkc: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-        nfkd: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B6}\u{05B7}\u{05B6}\u{05B5}\u{0062}",
-        nfc: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-        nfd: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-        nfkc: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-        nfkd: "\u{0061}\u{05B5}\u{05B6}\u{05B6}\u{05B7}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B8}\u{05B7}\u{05B6}\u{05B7}\u{0062}",
-        nfc: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-        nfd: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-        nfkc: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-        nfkd: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B7}\u{05B8}\u{05B7}\u{05B6}\u{0062}",
-        nfc: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-        nfd: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-        nfkc: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-        nfkd: "\u{0061}\u{05B6}\u{05B7}\u{05B7}\u{05B8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B9}\u{05B8}\u{05B7}\u{05B8}\u{0062}",
-        nfc: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-        nfd: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-        nfkc: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-        nfkd: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B8}\u{05B9}\u{05B8}\u{05B7}\u{0062}",
-        nfc: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-        nfd: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-        nfkc: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-        nfkd: "\u{0061}\u{05B7}\u{05B8}\u{05B8}\u{05B9}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BB}\u{05B9}\u{05B8}\u{05B9}\u{0062}",
-        nfc: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-        nfd: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-        nfkc: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-        nfkd: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B9}\u{05BB}\u{05B9}\u{05B8}\u{0062}",
-        nfc: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-        nfd: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-        nfkc: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-        nfkd: "\u{0061}\u{05B8}\u{05B9}\u{05B9}\u{05BB}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BB}\u{05B9}\u{05B8}\u{05BA}\u{0062}",
-        nfc: "\u{0061}\u{05B8}\u{05B9}\u{05BA}\u{05BB}\u{0062}",
-        nfd: "\u{0061}\u{05B8}\u{05B9}\u{05BA}\u{05BB}\u{0062}",
-        nfkc: "\u{0061}\u{05B8}\u{05B9}\u{05BA}\u{05BB}\u{0062}",
-        nfkd: "\u{0061}\u{05B8}\u{05B9}\u{05BA}\u{05BB}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BA}\u{05BB}\u{05B9}\u{05B8}\u{0062}",
-        nfc: "\u{0061}\u{05B8}\u{05BA}\u{05B9}\u{05BB}\u{0062}",
-        nfd: "\u{0061}\u{05B8}\u{05BA}\u{05B9}\u{05BB}\u{0062}",
-        nfkc: "\u{0061}\u{05B8}\u{05BA}\u{05B9}\u{05BB}\u{0062}",
-        nfkd: "\u{0061}\u{05B8}\u{05BA}\u{05B9}\u{05BB}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BC}\u{05BB}\u{05B9}\u{05BB}\u{0062}",
-        nfc: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-        nfd: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-        nfkc: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-        nfkd: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BB}\u{05BC}\u{05BB}\u{05B9}\u{0062}",
-        nfc: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-        nfd: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-        nfkc: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-        nfkd: "\u{0061}\u{05B9}\u{05BB}\u{05BB}\u{05BC}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BD}\u{05BC}\u{05BB}\u{05BC}\u{0062}",
-        nfc: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-        nfd: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-        nfkc: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-        nfkd: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BC}\u{05BD}\u{05BC}\u{05BB}\u{0062}",
-        nfc: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-        nfd: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-        nfkc: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-        nfkd: "\u{0061}\u{05BB}\u{05BC}\u{05BC}\u{05BD}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BF}\u{05BD}\u{05BC}\u{05BD}\u{0062}",
-        nfc: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-        nfd: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-        nfkc: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-        nfkd: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BD}\u{05BF}\u{05BD}\u{05BC}\u{0062}",
-        nfc: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-        nfd: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-        nfkc: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-        nfkd: "\u{0061}\u{05BC}\u{05BD}\u{05BD}\u{05BF}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C1}\u{05BF}\u{05BD}\u{05BF}\u{0062}",
-        nfc: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-        nfd: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-        nfkc: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-        nfkd: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05BF}\u{05C1}\u{05BF}\u{05BD}\u{0062}",
-        nfc: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-        nfd: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-        nfkc: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-        nfkd: "\u{0061}\u{05BD}\u{05BF}\u{05BF}\u{05C1}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C2}\u{05C1}\u{05BF}\u{05C1}\u{0062}",
-        nfc: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-        nfd: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-        nfkc: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-        nfkd: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C1}\u{05C2}\u{05C1}\u{05BF}\u{0062}",
-        nfc: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-        nfd: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-        nfkc: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-        nfkd: "\u{0061}\u{05BF}\u{05C1}\u{05C1}\u{05C2}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FB1E}\u{05C2}\u{05C1}\u{05C2}\u{0062}",
-        nfc: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-        nfd: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-        nfkc: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-        nfkd: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C2}\u{FB1E}\u{05C2}\u{05C1}\u{0062}",
-        nfc: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-        nfd: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-        nfkc: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-        nfkd: "\u{0061}\u{05C1}\u{05C2}\u{05C2}\u{FB1E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{05C4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{05C4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{05C4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{05C4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{05C4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{05C4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{05C4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{05C4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{05C4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{05C5}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{05C5}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{05C5}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{05C5}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{05C5}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C5}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{05C5}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{05C5}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{05C5}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{05C5}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B9}\u{05B8}\u{05B7}\u{05C7}\u{0062}",
-        nfc: "\u{0061}\u{05B7}\u{05B8}\u{05C7}\u{05B9}\u{0062}",
-        nfd: "\u{0061}\u{05B7}\u{05B8}\u{05C7}\u{05B9}\u{0062}",
-        nfkc: "\u{0061}\u{05B7}\u{05B8}\u{05C7}\u{05B9}\u{0062}",
-        nfkd: "\u{0061}\u{05B7}\u{05B8}\u{05C7}\u{05B9}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05C7}\u{05B9}\u{05B8}\u{05B7}\u{0062}",
-        nfc: "\u{0061}\u{05B7}\u{05C7}\u{05B8}\u{05B9}\u{0062}",
-        nfd: "\u{0061}\u{05B7}\u{05C7}\u{05B8}\u{05B9}\u{0062}",
-        nfkc: "\u{0061}\u{05B7}\u{05C7}\u{05B8}\u{05B9}\u{0062}",
-        nfkd: "\u{0061}\u{05B7}\u{05C7}\u{05B8}\u{05B9}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0610}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0610}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0610}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0610}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0610}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0610}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0610}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0610}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0610}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0610}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0611}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0611}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0611}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0611}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0611}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0611}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0611}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0611}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0611}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0611}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0612}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0612}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0612}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0612}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0612}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0612}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0612}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0612}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0612}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0612}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0613}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0613}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0613}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0613}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0613}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0613}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0613}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0613}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0613}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0613}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0614}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0614}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0614}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0614}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0614}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0614}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0614}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0614}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0614}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0614}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0615}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0615}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0615}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0615}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0615}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0615}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0615}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0615}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0615}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0615}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0616}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0616}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0616}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0616}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0616}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0616}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0616}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0616}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0616}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0616}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0617}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0617}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0617}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0617}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0617}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0617}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0617}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0617}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0617}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0617}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0619}\u{0618}\u{064D}\u{0618}\u{0062}",
-        nfc: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-        nfd: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-        nfkc: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-        nfkd: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0618}\u{0619}\u{0618}\u{064D}\u{0062}",
-        nfc: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-        nfd: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-        nfkc: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-        nfkd: "\u{0061}\u{064D}\u{0618}\u{0618}\u{0619}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{061A}\u{0619}\u{0618}\u{0619}\u{0062}",
-        nfc: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-        nfd: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-        nfkc: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-        nfkd: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0619}\u{061A}\u{0619}\u{0618}\u{0062}",
-        nfc: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-        nfd: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-        nfkc: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-        nfkd: "\u{0061}\u{0618}\u{0619}\u{0619}\u{061A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0651}\u{061A}\u{0619}\u{061A}\u{0062}",
-        nfc: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-        nfd: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-        nfkc: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-        nfkd: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{061A}\u{0651}\u{061A}\u{0619}\u{0062}",
-        nfc: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-        nfd: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-        nfkc: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-        nfkd: "\u{0061}\u{0619}\u{061A}\u{061A}\u{0651}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064C}\u{064B}\u{FB1E}\u{064B}\u{0062}",
-        nfc: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-        nfd: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-        nfkc: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-        nfkd: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064B}\u{064C}\u{064B}\u{FB1E}\u{0062}",
-        nfc: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-        nfd: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-        nfkc: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-        nfkd: "\u{0061}\u{FB1E}\u{064B}\u{064B}\u{064C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064D}\u{064C}\u{064B}\u{064C}\u{0062}",
-        nfc: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-        nfd: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-        nfkc: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-        nfkd: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064C}\u{064D}\u{064C}\u{064B}\u{0062}",
-        nfc: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-        nfd: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-        nfkc: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-        nfkd: "\u{0061}\u{064B}\u{064C}\u{064C}\u{064D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0618}\u{064D}\u{064C}\u{064D}\u{0062}",
-        nfc: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-        nfd: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-        nfkc: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-        nfkd: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064D}\u{0618}\u{064D}\u{064C}\u{0062}",
-        nfc: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-        nfd: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-        nfkc: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-        nfkd: "\u{0061}\u{064C}\u{064D}\u{064D}\u{0618}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0619}\u{0618}\u{064D}\u{064E}\u{0062}",
-        nfc: "\u{0061}\u{064D}\u{0618}\u{064E}\u{0619}\u{0062}",
-        nfd: "\u{0061}\u{064D}\u{0618}\u{064E}\u{0619}\u{0062}",
-        nfkc: "\u{0061}\u{064D}\u{0618}\u{064E}\u{0619}\u{0062}",
-        nfkd: "\u{0061}\u{064D}\u{0618}\u{064E}\u{0619}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064E}\u{0619}\u{0618}\u{064D}\u{0062}",
-        nfc: "\u{0061}\u{064D}\u{064E}\u{0618}\u{0619}\u{0062}",
-        nfd: "\u{0061}\u{064D}\u{064E}\u{0618}\u{0619}\u{0062}",
-        nfkc: "\u{0061}\u{064D}\u{064E}\u{0618}\u{0619}\u{0062}",
-        nfkd: "\u{0061}\u{064D}\u{064E}\u{0618}\u{0619}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{061A}\u{0619}\u{0618}\u{064F}\u{0062}",
-        nfc: "\u{0061}\u{0618}\u{0619}\u{064F}\u{061A}\u{0062}",
-        nfd: "\u{0061}\u{0618}\u{0619}\u{064F}\u{061A}\u{0062}",
-        nfkc: "\u{0061}\u{0618}\u{0619}\u{064F}\u{061A}\u{0062}",
-        nfkd: "\u{0061}\u{0618}\u{0619}\u{064F}\u{061A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064F}\u{061A}\u{0619}\u{0618}\u{0062}",
-        nfc: "\u{0061}\u{0618}\u{064F}\u{0619}\u{061A}\u{0062}",
-        nfd: "\u{0061}\u{0618}\u{064F}\u{0619}\u{061A}\u{0062}",
-        nfkc: "\u{0061}\u{0618}\u{064F}\u{0619}\u{061A}\u{0062}",
-        nfkd: "\u{0061}\u{0618}\u{064F}\u{0619}\u{061A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0651}\u{061A}\u{0619}\u{0650}\u{0062}",
-        nfc: "\u{0061}\u{0619}\u{061A}\u{0650}\u{0651}\u{0062}",
-        nfd: "\u{0061}\u{0619}\u{061A}\u{0650}\u{0651}\u{0062}",
-        nfkc: "\u{0061}\u{0619}\u{061A}\u{0650}\u{0651}\u{0062}",
-        nfkd: "\u{0061}\u{0619}\u{061A}\u{0650}\u{0651}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0650}\u{0651}\u{061A}\u{0619}\u{0062}",
-        nfc: "\u{0061}\u{0619}\u{0650}\u{061A}\u{0651}\u{0062}",
-        nfd: "\u{0061}\u{0619}\u{0650}\u{061A}\u{0651}\u{0062}",
-        nfkc: "\u{0061}\u{0619}\u{0650}\u{061A}\u{0651}\u{0062}",
-        nfkd: "\u{0061}\u{0619}\u{0650}\u{061A}\u{0651}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0652}\u{0651}\u{061A}\u{0651}\u{0062}",
-        nfc: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-        nfd: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-        nfkc: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-        nfkd: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0651}\u{0652}\u{0651}\u{061A}\u{0062}",
-        nfc: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-        nfd: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-        nfkc: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-        nfkd: "\u{0061}\u{061A}\u{0651}\u{0651}\u{0652}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0670}\u{0652}\u{0651}\u{0652}\u{0062}",
-        nfc: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-        nfd: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-        nfkc: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-        nfkd: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0652}\u{0670}\u{0652}\u{0651}\u{0062}",
-        nfc: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-        nfd: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-        nfkc: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-        nfkd: "\u{0061}\u{0651}\u{0652}\u{0652}\u{0670}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0653}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0653}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0653}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0653}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0653}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0653}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0653}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0653}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0653}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0653}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0654}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0654}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0654}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0654}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0654}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0654}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0654}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0654}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0654}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0654}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0655}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0655}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0655}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0655}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0655}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0655}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0655}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0655}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0655}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0655}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0656}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0656}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0656}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0656}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0656}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0656}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0656}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0656}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0656}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0656}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0657}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0657}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0657}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0657}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0657}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0657}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0657}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0657}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0657}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0657}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0658}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0658}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0658}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0658}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0658}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0658}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0658}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0658}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0658}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0658}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0659}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0659}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0659}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0659}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0659}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0659}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0659}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0659}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0659}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0659}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{065A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{065A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{065A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{065A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{065A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{065A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{065A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{065A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{065A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{065A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{065B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{065B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{065B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{065B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{065B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{065B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{065B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{065B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{065B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{065B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{065C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{065C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{065C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{065C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{065C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{065C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{065C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{065C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{065C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{065C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{065D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{065D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{065D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{065D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{065D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{065D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{065D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{065D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{065D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{065D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{065E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{065E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{065E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{065E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{065E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{065E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{065E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{065E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{065E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{065E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{065F}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{065F}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{065F}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{065F}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{065F}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{065F}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{065F}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{065F}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{065F}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{065F}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0711}\u{0670}\u{0652}\u{0670}\u{0062}",
-        nfc: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-        nfd: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-        nfkc: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-        nfkd: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0670}\u{0711}\u{0670}\u{0652}\u{0062}",
-        nfc: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-        nfd: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-        nfkc: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-        nfkd: "\u{0061}\u{0652}\u{0670}\u{0670}\u{0711}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06D6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06D6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06D6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06D6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06D6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06D6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06D6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06D6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06D6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06D6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06D7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06D7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06D7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06D7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06D7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06D7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06D7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06D7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06D7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06D7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06D8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06D8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06D8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06D8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06D8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06D8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06D8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06D8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06D8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06D8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06D9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06D9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06D9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06D9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06D9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06D9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06D9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06D9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06D9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06D9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06DA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06DA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06DA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06DA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06DA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06DA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06DA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06DA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06DA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06DA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06DB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06DB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06DB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06DB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06DB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06DB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06DB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06DB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06DB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06DB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06DC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06DC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06DC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06DC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06DC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06DC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06DC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06DC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06DC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06DC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06DF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06DF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06DF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06DF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06DF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06DF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06DF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06DF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06DF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06DF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06E0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06E0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06E0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06E0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06E0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06E0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06E0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06E0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06E0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06E1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06E1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06E1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06E1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06E1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06E1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06E1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06E1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06E1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06E2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06E2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06E2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06E2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06E2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06E2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06E2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06E2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06E2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{06E3}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{06E3}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{06E3}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{06E3}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{06E3}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E3}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{06E3}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{06E3}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{06E3}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{06E3}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06E4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06E4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06E4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06E4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06E4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06E4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06E4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06E4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06E4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06E7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06E7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06E7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06E7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06E7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06E7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06E7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06E7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06E7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06E8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06E8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06E8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06E8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06E8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06E8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06E8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06E8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06E8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06E8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{06EA}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{06EA}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{06EA}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{06EA}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{06EA}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06EA}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{06EA}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{06EA}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{06EA}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{06EA}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06EB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06EB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06EB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06EB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06EB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06EB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06EB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06EB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06EB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06EB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{06EC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{06EC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{06EC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{06EC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{06EC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06EC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{06EC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{06EC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{06EC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{06EC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{06ED}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{06ED}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{06ED}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{06ED}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{06ED}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{06ED}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{06ED}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{06ED}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{06ED}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{06ED}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0C55}\u{0711}\u{0670}\u{0711}\u{0062}",
-        nfc: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-        nfd: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-        nfkc: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-        nfkd: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0711}\u{0C55}\u{0711}\u{0670}\u{0062}",
-        nfc: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-        nfd: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-        nfkc: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-        nfkd: "\u{0061}\u{0670}\u{0711}\u{0711}\u{0C55}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0730}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0730}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0730}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0730}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0730}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0730}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0730}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0730}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0730}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0730}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0731}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0731}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0731}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0731}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0731}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0731}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0731}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0731}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0731}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0731}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0732}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0732}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0732}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0732}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0732}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0732}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0732}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0732}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0732}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0732}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0733}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0733}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0733}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0733}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0733}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0733}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0733}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0733}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0733}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0733}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0734}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0734}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0734}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0734}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0734}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0734}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0734}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0734}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0734}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0734}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0735}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0735}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0735}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0735}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0735}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0735}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0735}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0735}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0735}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0735}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0736}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0736}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0736}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0736}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0736}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0736}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0736}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0736}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0736}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0736}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0737}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0737}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0737}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0737}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0737}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0737}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0737}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0737}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0737}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0737}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0738}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0738}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0738}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0738}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0738}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0738}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0738}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0738}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0738}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0738}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0739}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0739}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0739}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0739}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0739}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0739}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0739}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0739}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0739}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0739}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{073A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{073A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{073A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{073A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{073A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{073A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{073A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{073A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{073A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{073A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{073B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{073B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{073B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{073B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{073B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{073B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{073B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{073B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{073B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{073B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{073C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{073C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{073C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{073C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{073C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{073C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{073C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{073C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{073C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{073C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{073D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{073D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{073D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{073D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{073D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{073D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{073D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{073D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{073D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{073D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{073E}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{073E}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{073E}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{073E}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{073E}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{073E}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{073E}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{073E}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{073E}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{073E}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{073F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{073F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{073F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{073F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{073F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{073F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{073F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{073F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{073F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{073F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0740}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0740}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0740}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0740}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0740}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0740}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0740}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0740}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0740}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0740}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0741}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0741}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0741}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0741}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0741}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0741}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0741}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0741}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0741}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0741}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0742}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0742}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0742}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0742}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0742}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0742}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0742}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0742}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0742}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0742}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0743}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0743}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0743}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0743}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0743}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0743}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0743}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0743}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0743}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0743}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0744}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0744}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0744}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0744}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0744}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0744}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0744}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0744}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0744}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0744}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0745}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0745}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0745}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0745}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0745}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0745}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0745}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0745}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0745}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0745}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0746}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0746}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0746}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0746}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0746}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0746}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0746}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0746}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0746}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0746}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0747}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0747}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0747}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0747}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0747}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0747}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0747}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0747}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0747}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0747}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0748}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0748}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0748}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0748}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0748}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0748}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0748}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0748}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0748}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0748}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0749}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0749}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0749}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0749}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0749}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0749}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0749}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0749}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0749}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0749}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{074A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{074A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{074A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{074A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{074A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{074A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{074A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{074A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{074A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{074A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07EB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07EB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07EB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07EB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07EB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07EB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07EB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07EB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07EB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07EB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07EC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07EC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07EC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07EC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07EC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07EC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07EC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07EC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07EC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07EC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07ED}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07ED}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07ED}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07ED}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07ED}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07ED}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07ED}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07ED}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07ED}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07ED}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07EE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07EE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07EE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07EE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07EE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07EE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07EE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07EE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07EE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07EE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07EF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07EF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07EF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07EF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07EF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07EF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07EF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07EF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07EF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07EF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07F0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07F0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07F0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07F0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07F0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07F0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07F0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07F0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07F0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07F0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07F1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07F1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07F1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07F1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07F1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07F1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07F1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07F1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07F1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07F1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{07F2}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{07F2}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{07F2}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{07F2}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{07F2}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07F2}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{07F2}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{07F2}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{07F2}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{07F2}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{07F3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{07F3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{07F3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{07F3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{07F3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{07F3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{07F3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{07F3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{07F3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{07F3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0816}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0816}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0816}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0816}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0816}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0816}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0816}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0816}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0816}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0816}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0817}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0817}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0817}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0817}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0817}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0817}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0817}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0817}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0817}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0817}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0818}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0818}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0818}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0818}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0818}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0818}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0818}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0818}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0818}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0818}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0819}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0819}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0819}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0819}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0819}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0819}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0819}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0819}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0819}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0819}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{081B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{081B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{081B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{081B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{081B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{081B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{081B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{081B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{081B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{081B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{081C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{081C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{081C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{081C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{081C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{081C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{081C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{081C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{081C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{081C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{081D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{081D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{081D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{081D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{081D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{081D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{081D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{081D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{081D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{081D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{081E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{081E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{081E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{081E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{081E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{081E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{081E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{081E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{081E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{081E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{081F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{081F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{081F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{081F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{081F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{081F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{081F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{081F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{081F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{081F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0820}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0820}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0820}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0820}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0820}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0820}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0820}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0820}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0820}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0820}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0821}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0821}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0821}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0821}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0821}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0821}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0821}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0821}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0821}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0821}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0822}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0822}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0822}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0822}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0822}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0822}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0822}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0822}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0822}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0822}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0823}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0823}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0823}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0823}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0823}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0823}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0823}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0823}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0823}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0823}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0825}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0825}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0825}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0825}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0825}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0825}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0825}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0825}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0825}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0825}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0826}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0826}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0826}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0826}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0826}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0826}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0826}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0826}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0826}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0826}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0827}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0827}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0827}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0827}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0827}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0827}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0827}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0827}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0827}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0827}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0829}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0829}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0829}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0829}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0829}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0829}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0829}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0829}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0829}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0829}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{082A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{082A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{082A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{082A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{082A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{082A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{082A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{082A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{082A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{082A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{082B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{082B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{082B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{082B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{082B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{082B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{082B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{082B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{082B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{082B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{082C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{082C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{082C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{082C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{082C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{082C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{082C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{082C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{082C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{082C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{082D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{082D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{082D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{082D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{082D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{082D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{082D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{082D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{082D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{082D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0859}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0859}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0859}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0859}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0859}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0859}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0859}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0859}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0859}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0859}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{085A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{085A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{085A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{085A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{085A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{085A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{085A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{085A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{085A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{085A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{085B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{085B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{085B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{085B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{085B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{085B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{085B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{085B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{085B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{085B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08D4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08D4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08D4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08D4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08D4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08D4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08D4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08D4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08D4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08D4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08D5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08D5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08D5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08D5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08D5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08D5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08D5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08D5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08D5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08D5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08D6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08D6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08D6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08D6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08D6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08D6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08D6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08D6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08D6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08D6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08D7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08D7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08D7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08D7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08D7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08D7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08D7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08D7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08D7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08D7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08D8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08D8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08D8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08D8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08D8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08D8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08D8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08D8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08D8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08D8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08D9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08D9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08D9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08D9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08D9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08D9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08D9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08D9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08D9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08D9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08DA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08DA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08DA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08DA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08DA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08DA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08DA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08DA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08DA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08DA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08DB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08DB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08DB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08DB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08DB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08DB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08DB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08DB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08DB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08DB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08DC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08DC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08DC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08DC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08DC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08DC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08DC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08DC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08DC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08DC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08DD}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08DD}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08DD}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08DD}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08DD}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08DD}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08DD}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08DD}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08DD}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08DD}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08DE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08DE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08DE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08DE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08DE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08DE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08DE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08DE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08DE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08DE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08DF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08DF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08DF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08DF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08DF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08DF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08DF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08DF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08DF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08DF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08E0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08E0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08E0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08E0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08E0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08E0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08E0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08E0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08E0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08E1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08E1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08E1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08E1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08E1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08E1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08E1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08E1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08E1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08E3}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08E3}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08E3}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08E3}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08E3}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E3}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08E3}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08E3}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08E3}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08E3}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08E4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08E4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08E4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08E4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08E4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08E4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08E4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08E4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08E4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08E5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08E5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08E5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08E5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08E5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08E5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08E5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08E5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08E5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08E6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08E6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08E6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08E6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08E6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08E6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08E6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08E6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08E6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08E7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08E7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08E7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08E7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08E7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08E7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08E7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08E7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08E7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08E8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08E8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08E8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08E8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08E8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08E8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08E8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08E8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08E8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08E9}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08E9}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08E9}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08E9}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08E9}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08E9}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08E9}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08E9}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08E9}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08E9}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08EA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08EA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08EA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08EA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08EA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08EA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08EA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08EA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08EA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08EA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08EB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08EB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08EB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08EB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08EB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08EB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08EB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08EB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08EB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08EB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08EC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08EC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08EC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08EC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08EC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08EC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08EC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08EC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08EC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08EC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08ED}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08ED}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08ED}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08ED}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08ED}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08ED}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08ED}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08ED}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08ED}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08ED}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08EE}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08EE}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08EE}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08EE}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08EE}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08EE}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08EE}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08EE}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08EE}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08EE}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08EF}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08EF}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08EF}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08EF}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08EF}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08EF}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08EF}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08EF}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08EF}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08EF}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064C}\u{064B}\u{FB1E}\u{08F0}\u{0062}",
-        nfc: "\u{0061}\u{FB1E}\u{064B}\u{08F0}\u{064C}\u{0062}",
-        nfd: "\u{0061}\u{FB1E}\u{064B}\u{08F0}\u{064C}\u{0062}",
-        nfkc: "\u{0061}\u{FB1E}\u{064B}\u{08F0}\u{064C}\u{0062}",
-        nfkd: "\u{0061}\u{FB1E}\u{064B}\u{08F0}\u{064C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F0}\u{064C}\u{064B}\u{FB1E}\u{0062}",
-        nfc: "\u{0061}\u{FB1E}\u{08F0}\u{064B}\u{064C}\u{0062}",
-        nfd: "\u{0061}\u{FB1E}\u{08F0}\u{064B}\u{064C}\u{0062}",
-        nfkc: "\u{0061}\u{FB1E}\u{08F0}\u{064B}\u{064C}\u{0062}",
-        nfkd: "\u{0061}\u{FB1E}\u{08F0}\u{064B}\u{064C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064D}\u{064C}\u{064B}\u{08F1}\u{0062}",
-        nfc: "\u{0061}\u{064B}\u{064C}\u{08F1}\u{064D}\u{0062}",
-        nfd: "\u{0061}\u{064B}\u{064C}\u{08F1}\u{064D}\u{0062}",
-        nfkc: "\u{0061}\u{064B}\u{064C}\u{08F1}\u{064D}\u{0062}",
-        nfkd: "\u{0061}\u{064B}\u{064C}\u{08F1}\u{064D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F1}\u{064D}\u{064C}\u{064B}\u{0062}",
-        nfc: "\u{0061}\u{064B}\u{08F1}\u{064C}\u{064D}\u{0062}",
-        nfd: "\u{0061}\u{064B}\u{08F1}\u{064C}\u{064D}\u{0062}",
-        nfkc: "\u{0061}\u{064B}\u{08F1}\u{064C}\u{064D}\u{0062}",
-        nfkd: "\u{0061}\u{064B}\u{08F1}\u{064C}\u{064D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0618}\u{064D}\u{064C}\u{08F2}\u{0062}",
-        nfc: "\u{0061}\u{064C}\u{064D}\u{08F2}\u{0618}\u{0062}",
-        nfd: "\u{0061}\u{064C}\u{064D}\u{08F2}\u{0618}\u{0062}",
-        nfkc: "\u{0061}\u{064C}\u{064D}\u{08F2}\u{0618}\u{0062}",
-        nfkd: "\u{0061}\u{064C}\u{064D}\u{08F2}\u{0618}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F2}\u{0618}\u{064D}\u{064C}\u{0062}",
-        nfc: "\u{0061}\u{064C}\u{08F2}\u{064D}\u{0618}\u{0062}",
-        nfd: "\u{0061}\u{064C}\u{08F2}\u{064D}\u{0618}\u{0062}",
-        nfkc: "\u{0061}\u{064C}\u{08F2}\u{064D}\u{0618}\u{0062}",
-        nfkd: "\u{0061}\u{064C}\u{08F2}\u{064D}\u{0618}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08F3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08F3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08F3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08F3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08F3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08F3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08F3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08F3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08F3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08F4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08F4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08F4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08F4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08F4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08F4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08F4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08F4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08F4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08F5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08F5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08F5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08F5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08F5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08F5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08F5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08F5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08F5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08F6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08F6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08F6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08F6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08F6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08F6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08F6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08F6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08F6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08F7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08F7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08F7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08F7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08F7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08F7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08F7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08F7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08F7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08F8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08F8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08F8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08F8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08F8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08F8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08F8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08F8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08F8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08F9}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08F9}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08F9}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08F9}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08F9}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08F9}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08F9}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08F9}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08F9}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08F9}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{08FA}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{08FA}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{08FA}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{08FA}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{08FA}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08FA}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{08FA}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{08FA}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{08FA}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{08FA}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08FB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08FB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08FB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08FB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08FB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08FB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08FB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08FB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08FB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08FB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08FC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08FC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08FC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08FC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08FC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08FC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08FC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08FC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08FC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08FC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08FD}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08FD}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08FD}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08FD}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08FD}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08FD}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08FD}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08FD}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08FD}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08FD}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08FE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08FE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08FE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08FE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08FE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08FE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08FE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08FE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08FE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08FE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{08FF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{08FF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{08FF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{08FF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{08FF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{08FF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{08FF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{08FF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{08FF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{08FF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{093C}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{094D}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{094D}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0951}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0951}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0951}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0951}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0951}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0951}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0951}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0951}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0951}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0951}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0952}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0952}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0952}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0952}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0952}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0952}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0952}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0952}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0952}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0952}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0953}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0953}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0953}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0953}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0953}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0953}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0953}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0953}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0953}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0953}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0954}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0954}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0954}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0954}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0954}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0954}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0954}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0954}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0954}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0954}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{09BC}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{09BC}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{09BC}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{09BC}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{09BC}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{09BC}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{09BC}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{09BC}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{09BC}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{09BC}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{09CD}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{09CD}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{09CD}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{09CD}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{09CD}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{09CD}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{09CD}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{09CD}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{09CD}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{09CD}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{0A3C}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{0A3C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{0A3C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{0A3C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{0A3C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0A3C}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0A3C}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0A3C}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0A3C}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0A3C}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0A4D}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0A4D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0A4D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0A4D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0A4D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0A4D}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0A4D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0A4D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0A4D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0A4D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{0ABC}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{0ABC}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{0ABC}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{0ABC}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{0ABC}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0ABC}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0ABC}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0ABC}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0ABC}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0ABC}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0ACD}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0ACD}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0ACD}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0ACD}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0ACD}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0ACD}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0ACD}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0ACD}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0ACD}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0ACD}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{0B3C}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{0B3C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{0B3C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{0B3C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{0B3C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0B3C}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0B3C}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0B3C}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0B3C}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0B3C}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0B4D}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0B4D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0B4D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0B4D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0B4D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0B4D}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0B4D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0B4D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0B4D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0B4D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0BCD}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0BCD}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0BCD}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0BCD}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0BCD}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0BCD}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0BCD}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0BCD}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0BCD}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0BCD}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0C4D}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0C4D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0C4D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0C4D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0C4D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0C4D}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0C4D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0C4D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0C4D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0C4D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0C56}\u{0C55}\u{0711}\u{0C55}\u{0062}",
-        nfc: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-        nfd: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-        nfkc: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-        nfkd: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0C55}\u{0C56}\u{0C55}\u{0711}\u{0062}",
-        nfc: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-        nfd: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-        nfkc: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-        nfkd: "\u{0061}\u{0711}\u{0C55}\u{0C55}\u{0C56}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E38}\u{0C56}\u{0C55}\u{0C56}\u{0062}",
-        nfc: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-        nfd: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-        nfkc: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-        nfkd: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0C56}\u{0E38}\u{0C56}\u{0C55}\u{0062}",
-        nfc: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-        nfd: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-        nfkc: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-        nfkd: "\u{0061}\u{0C55}\u{0C56}\u{0C56}\u{0E38}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{0CBC}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{0CBC}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{0CBC}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{0CBC}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{0CBC}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0CBC}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{0CBC}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{0CBC}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{0CBC}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{0CBC}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0CCD}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0CCD}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0CCD}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0CCD}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0CCD}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0CCD}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0CCD}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0CCD}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0CCD}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0CCD}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0D4D}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0D4D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0D4D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0D4D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0D4D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0D4D}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0D4D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0D4D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0D4D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0D4D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0DCA}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0DCA}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0DCA}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0DCA}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0DCA}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0DCA}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0DCA}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0DCA}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0DCA}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0DCA}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E48}\u{0E38}\u{0C56}\u{0E38}\u{0062}",
-        nfc: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-        nfd: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-        nfkc: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-        nfkd: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E38}\u{0E48}\u{0E38}\u{0C56}\u{0062}",
-        nfc: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-        nfd: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-        nfkc: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-        nfkd: "\u{0061}\u{0C56}\u{0E38}\u{0E38}\u{0E48}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E48}\u{0E38}\u{0C56}\u{0E39}\u{0062}",
-        nfc: "\u{0061}\u{0C56}\u{0E38}\u{0E39}\u{0E48}\u{0062}",
-        nfd: "\u{0061}\u{0C56}\u{0E38}\u{0E39}\u{0E48}\u{0062}",
-        nfkc: "\u{0061}\u{0C56}\u{0E38}\u{0E39}\u{0E48}\u{0062}",
-        nfkd: "\u{0061}\u{0C56}\u{0E38}\u{0E39}\u{0E48}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E39}\u{0E48}\u{0E38}\u{0C56}\u{0062}",
-        nfc: "\u{0061}\u{0C56}\u{0E39}\u{0E38}\u{0E48}\u{0062}",
-        nfd: "\u{0061}\u{0C56}\u{0E39}\u{0E38}\u{0E48}\u{0062}",
-        nfkc: "\u{0061}\u{0C56}\u{0E39}\u{0E38}\u{0E48}\u{0062}",
-        nfkd: "\u{0061}\u{0C56}\u{0E39}\u{0E38}\u{0E48}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0E3A}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0E3A}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0E3A}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0E3A}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0E3A}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E3A}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0E3A}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0E3A}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0E3A}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0E3A}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EB8}\u{0E48}\u{0E38}\u{0E48}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E48}\u{0EB8}\u{0E48}\u{0E38}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E48}\u{0E48}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EB8}\u{0E48}\u{0E38}\u{0E49}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E48}\u{0E49}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E48}\u{0E49}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E48}\u{0E49}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E48}\u{0E49}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E49}\u{0EB8}\u{0E48}\u{0E38}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E49}\u{0E48}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E49}\u{0E48}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E49}\u{0E48}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E49}\u{0E48}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EB8}\u{0E48}\u{0E38}\u{0E4A}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E48}\u{0E4A}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E48}\u{0E4A}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E48}\u{0E4A}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E48}\u{0E4A}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E4A}\u{0EB8}\u{0E48}\u{0E38}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E4A}\u{0E48}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E4A}\u{0E48}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E4A}\u{0E48}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E4A}\u{0E48}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EB8}\u{0E48}\u{0E38}\u{0E4B}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E48}\u{0E4B}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E48}\u{0E4B}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E48}\u{0E4B}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E48}\u{0E4B}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0E4B}\u{0EB8}\u{0E48}\u{0E38}\u{0062}",
-        nfc: "\u{0061}\u{0E38}\u{0E4B}\u{0E48}\u{0EB8}\u{0062}",
-        nfd: "\u{0061}\u{0E38}\u{0E4B}\u{0E48}\u{0EB8}\u{0062}",
-        nfkc: "\u{0061}\u{0E38}\u{0E4B}\u{0E48}\u{0EB8}\u{0062}",
-        nfkd: "\u{0061}\u{0E38}\u{0E4B}\u{0E48}\u{0EB8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EC8}\u{0EB8}\u{0E48}\u{0EB8}\u{0062}",
-        nfc: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfd: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfkc: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfkd: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EB8}\u{0EC8}\u{0EB8}\u{0E48}\u{0062}",
-        nfc: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfd: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfkc: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfkd: "\u{0061}\u{0E48}\u{0EB8}\u{0EB8}\u{0EC8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EC8}\u{0EB8}\u{0E48}\u{0EB9}\u{0062}",
-        nfc: "\u{0061}\u{0E48}\u{0EB8}\u{0EB9}\u{0EC8}\u{0062}",
-        nfd: "\u{0061}\u{0E48}\u{0EB8}\u{0EB9}\u{0EC8}\u{0062}",
-        nfkc: "\u{0061}\u{0E48}\u{0EB8}\u{0EB9}\u{0EC8}\u{0062}",
-        nfkd: "\u{0061}\u{0E48}\u{0EB8}\u{0EB9}\u{0EC8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EB9}\u{0EC8}\u{0EB8}\u{0E48}\u{0062}",
-        nfc: "\u{0061}\u{0E48}\u{0EB9}\u{0EB8}\u{0EC8}\u{0062}",
-        nfd: "\u{0061}\u{0E48}\u{0EB9}\u{0EB8}\u{0EC8}\u{0062}",
-        nfkc: "\u{0061}\u{0E48}\u{0EB9}\u{0EB8}\u{0EC8}\u{0062}",
-        nfkd: "\u{0061}\u{0E48}\u{0EB9}\u{0EB8}\u{0EC8}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F71}\u{0EC8}\u{0EB8}\u{0EC8}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EC8}\u{0F71}\u{0EC8}\u{0EB8}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC8}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F71}\u{0EC8}\u{0EB8}\u{0EC9}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC9}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC9}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC9}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0EC8}\u{0EC9}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0EC9}\u{0F71}\u{0EC8}\u{0EB8}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0EC9}\u{0EC8}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0EC9}\u{0EC8}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0EC9}\u{0EC8}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0EC9}\u{0EC8}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F71}\u{0EC8}\u{0EB8}\u{0ECA}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECA}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECA}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECA}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECA}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0ECA}\u{0F71}\u{0EC8}\u{0EB8}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0ECA}\u{0EC8}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0ECA}\u{0EC8}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0ECA}\u{0EC8}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0ECA}\u{0EC8}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F71}\u{0EC8}\u{0EB8}\u{0ECB}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECB}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECB}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECB}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0EC8}\u{0ECB}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0ECB}\u{0F71}\u{0EC8}\u{0EB8}\u{0062}",
-        nfc: "\u{0061}\u{0EB8}\u{0ECB}\u{0EC8}\u{0F71}\u{0062}",
-        nfd: "\u{0061}\u{0EB8}\u{0ECB}\u{0EC8}\u{0F71}\u{0062}",
-        nfkc: "\u{0061}\u{0EB8}\u{0ECB}\u{0EC8}\u{0F71}\u{0062}",
-        nfkd: "\u{0061}\u{0EB8}\u{0ECB}\u{0EC8}\u{0F71}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0F18}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0F18}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0F18}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0F18}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0F18}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F18}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0F18}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0F18}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0F18}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0F18}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0F19}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0F19}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0F19}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0F19}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0F19}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F19}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0F19}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0F19}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0F19}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0F19}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0F35}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0F35}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0F35}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0F35}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0F35}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F35}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0F35}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0F35}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0F35}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0F35}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0F37}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0F37}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0F37}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0F37}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0F37}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F37}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0F37}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0F37}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0F37}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0F37}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{0F39}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{0F39}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{0F39}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{0F39}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{0F39}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F39}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{0F39}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{0F39}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{0F39}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{0F39}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F72}\u{0F71}\u{0EC8}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-        nfd: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-        nfkc: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-        nfkd: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F71}\u{0F72}\u{0F71}\u{0EC8}\u{0062}",
-        nfc: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-        nfd: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-        nfkc: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-        nfkd: "\u{0061}\u{0EC8}\u{0F71}\u{0F71}\u{0F72}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0F72}\u{0F71}\u{0F72}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F72}\u{0F74}\u{0F72}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0321}\u{0F74}\u{0F72}\u{0F74}\u{0062}",
-        nfc: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-        nfd: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-        nfkc: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-        nfkd: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0321}\u{0F74}\u{0F72}\u{0062}",
-        nfc: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-        nfd: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-        nfkc: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-        nfkd: "\u{0061}\u{0F72}\u{0F74}\u{0F74}\u{0321}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0F72}\u{0F71}\u{0F7A}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F7A}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F7A}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F7A}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F7A}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F7A}\u{0F74}\u{0F72}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F7A}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F7A}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F7A}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F7A}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0F72}\u{0F71}\u{0F7B}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F7B}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F7B}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F7B}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F7B}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F7B}\u{0F74}\u{0F72}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F7B}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F7B}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F7B}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F7B}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0F72}\u{0F71}\u{0F7C}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F7C}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F7C}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F7C}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F7C}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F7C}\u{0F74}\u{0F72}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F7C}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F7C}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F7C}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F7C}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0F72}\u{0F71}\u{0F7D}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F7D}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F7D}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F7D}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F7D}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F7D}\u{0F74}\u{0F72}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F7D}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F7D}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F7D}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F7D}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F74}\u{0F72}\u{0F71}\u{0F80}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F72}\u{0F80}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F72}\u{0F80}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F72}\u{0F80}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F72}\u{0F80}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F80}\u{0F74}\u{0F72}\u{0F71}\u{0062}",
-        nfc: "\u{0061}\u{0F71}\u{0F80}\u{0F72}\u{0F74}\u{0062}",
-        nfd: "\u{0061}\u{0F71}\u{0F80}\u{0F72}\u{0F74}\u{0062}",
-        nfkc: "\u{0061}\u{0F71}\u{0F80}\u{0F72}\u{0F74}\u{0062}",
-        nfkd: "\u{0061}\u{0F71}\u{0F80}\u{0F72}\u{0F74}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0F82}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0F82}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0F82}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0F82}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0F82}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F82}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0F82}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0F82}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0F82}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0F82}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0F83}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0F83}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0F83}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0F83}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0F83}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F83}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0F83}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0F83}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0F83}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0F83}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{0F84}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{0F84}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{0F84}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{0F84}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{0F84}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F84}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{0F84}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{0F84}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{0F84}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{0F84}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0F86}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0F86}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0F86}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0F86}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0F86}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F86}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0F86}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0F86}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0F86}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0F86}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{0F87}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{0F87}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{0F87}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{0F87}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{0F87}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0F87}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{0F87}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0F87}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{0F87}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0F87}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{0FC6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{0FC6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{0FC6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{0FC6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{0FC6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0FC6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0FC6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0FC6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0FC6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0FC6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{1037}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{1037}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{1037}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{1037}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{1037}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1037}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1037}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1037}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1037}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1037}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1039}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1039}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1039}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1039}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1039}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1039}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1039}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1039}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1039}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1039}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{103A}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{103A}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{103A}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{103A}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{103A}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{103A}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{103A}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{103A}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{103A}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{103A}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{108D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{108D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{108D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{108D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{108D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{108D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{108D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{108D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{108D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{108D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{135D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{135D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{135D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{135D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{135D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{135D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{135D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{135D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{135D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{135D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{135E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{135E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{135E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{135E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{135E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{135E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{135E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{135E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{135E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{135E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{135F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{135F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{135F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{135F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{135F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{135F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{135F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{135F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{135F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{135F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1714}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1714}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1714}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1714}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1714}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1714}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1714}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1714}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1714}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1714}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1734}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1734}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1734}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1734}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1734}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1734}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1734}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1734}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1734}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1734}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{17D2}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{17D2}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{17D2}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{17D2}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{17D2}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{17D2}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{17D2}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{17D2}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{17D2}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{17D2}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{17DD}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{17DD}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{17DD}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{17DD}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{17DD}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{17DD}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{17DD}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{17DD}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{17DD}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{17DD}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0300}\u{05AE}\u{1D16D}\u{18A9}\u{0062}",
-        nfc: "\u{00E0}\u{1D16D}\u{05AE}\u{18A9}\u{0062}",
-        nfd: "\u{0061}\u{1D16D}\u{05AE}\u{18A9}\u{0300}\u{0062}",
-        nfkc: "\u{00E0}\u{1D16D}\u{05AE}\u{18A9}\u{0062}",
-        nfkd: "\u{0061}\u{1D16D}\u{05AE}\u{18A9}\u{0300}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{18A9}\u{0300}\u{05AE}\u{1D16D}\u{0062}",
-        nfc: "\u{00E0}\u{1D16D}\u{18A9}\u{05AE}\u{0062}",
-        nfd: "\u{0061}\u{1D16D}\u{18A9}\u{05AE}\u{0300}\u{0062}",
-        nfkc: "\u{00E0}\u{1D16D}\u{18A9}\u{05AE}\u{0062}",
-        nfkd: "\u{0061}\u{1D16D}\u{18A9}\u{05AE}\u{0300}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302E}\u{059A}\u{0316}\u{1939}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{059A}\u{1939}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{059A}\u{1939}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{059A}\u{1939}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{059A}\u{1939}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1939}\u{302E}\u{059A}\u{0316}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{1939}\u{059A}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{1939}\u{059A}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{1939}\u{059A}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{1939}\u{059A}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{193A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{193A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{193A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{193A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{193A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{193A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{193A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{193A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{193A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{193A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{193B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{193B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{193B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{193B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{193B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{193B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{193B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{193B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{193B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{193B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A17}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A17}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A17}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A17}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A17}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A17}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A17}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A17}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A17}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A17}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1A18}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1A18}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1A18}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1A18}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1A18}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A18}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1A18}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1A18}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1A18}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1A18}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1A60}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1A60}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1A60}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1A60}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1A60}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A60}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1A60}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1A60}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1A60}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1A60}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A75}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A75}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A75}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A75}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A75}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A75}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A75}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A75}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A75}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A75}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A76}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A76}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A76}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A76}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A76}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A76}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A76}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A76}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A76}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A76}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A77}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A77}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A77}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A77}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A77}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A77}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A77}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A77}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A77}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A77}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A78}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A78}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A78}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A78}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A78}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A78}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A78}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A78}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A78}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A78}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A79}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A79}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A79}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A79}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A79}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A79}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A79}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A79}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A79}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A79}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A7A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A7A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A7A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A7A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A7A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A7A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A7A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A7A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A7A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A7A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A7B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A7B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A7B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A7B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A7B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A7B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A7B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A7B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A7B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A7B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1A7C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1A7C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1A7C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1A7C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1A7C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A7C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1A7C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1A7C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1A7C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1A7C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1A7F}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1A7F}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1A7F}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1A7F}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1A7F}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1A7F}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1A7F}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1A7F}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1A7F}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1A7F}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1AB0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1AB0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1AB0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1AB0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1AB0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1AB0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1AB0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1AB0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1AB0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1AB1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1AB1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1AB1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1AB1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1AB1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1AB1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1AB1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1AB1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1AB1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1AB2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1AB2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1AB2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1AB2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1AB2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1AB2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1AB2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1AB2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1AB2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1AB3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1AB3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1AB3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1AB3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1AB3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1AB3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1AB3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1AB3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1AB3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1AB4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1AB4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1AB4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1AB4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1AB4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1AB4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1AB4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1AB4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1AB4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1AB5}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1AB5}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1AB5}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1AB5}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1AB5}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB5}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1AB5}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1AB5}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1AB5}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1AB5}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1AB6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1AB6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1AB6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1AB6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1AB6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1AB6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1AB6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1AB6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1AB6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1AB7}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1AB7}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1AB7}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1AB7}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1AB7}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB7}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1AB7}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1AB7}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1AB7}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1AB7}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1AB8}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1AB8}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1AB8}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1AB8}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1AB8}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB8}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1AB8}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1AB8}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1AB8}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1AB8}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1AB9}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1AB9}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1AB9}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1AB9}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1AB9}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1AB9}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1AB9}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1AB9}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1AB9}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1AB9}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1ABA}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1ABA}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1ABA}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1ABA}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1ABA}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1ABA}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1ABA}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1ABA}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1ABA}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1ABA}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1ABB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1ABB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1ABB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1ABB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1ABB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1ABB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1ABB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1ABB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1ABB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1ABB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1ABC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1ABC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1ABC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1ABC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1ABC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1ABC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1ABC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1ABC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1ABC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1ABC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1ABD}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1ABD}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1ABD}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1ABD}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1ABD}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1ABD}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1ABD}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1ABD}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1ABD}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1ABD}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{1B34}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{1B34}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{1B34}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{1B34}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{1B34}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B34}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1B34}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1B34}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1B34}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1B34}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1B44}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1B44}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1B44}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1B44}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1B44}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B44}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1B44}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1B44}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1B44}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1B44}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B6B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B6B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B6B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B6B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B6B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B6B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B6B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B6B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B6B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B6B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1B6C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1B6C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1B6C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1B6C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1B6C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B6C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1B6C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1B6C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1B6C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1B6C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B6D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B6D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B6D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B6D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B6D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B6D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B6D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B6D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B6D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B6D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B6E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B6E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B6E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B6E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B6E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B6E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B6E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B6E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B6E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B6E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B6F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B6F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B6F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B6F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B6F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B6F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B6F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B6F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B6F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B6F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B70}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B70}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B70}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B70}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B70}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B70}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B70}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B70}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B70}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B70}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B71}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B71}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B71}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B71}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B71}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B71}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B71}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B71}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B71}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B71}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B72}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B72}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B72}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B72}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B72}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B72}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B72}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B72}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B72}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B72}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1B73}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1B73}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1B73}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1B73}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1B73}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1B73}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1B73}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1B73}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1B73}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1B73}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1BAA}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1BAA}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1BAA}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1BAA}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1BAA}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1BAA}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1BAA}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1BAA}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1BAA}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1BAA}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1BAB}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1BAB}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1BAB}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1BAB}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1BAB}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1BAB}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1BAB}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1BAB}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1BAB}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1BAB}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{1BE6}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{1BE6}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{1BE6}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{1BE6}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{1BE6}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1BE6}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1BE6}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1BE6}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1BE6}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1BE6}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1BF2}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1BF2}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1BF2}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1BF2}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1BF2}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1BF2}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1BF2}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1BF2}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1BF2}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1BF2}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1BF3}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1BF3}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1BF3}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1BF3}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1BF3}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1BF3}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1BF3}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1BF3}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1BF3}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1BF3}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{1C37}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{1C37}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{1C37}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{1C37}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{1C37}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1C37}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1C37}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1C37}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1C37}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1C37}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CD0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CD0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CD0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CD0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CD0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CD0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CD0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CD0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CD0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CD1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CD1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CD1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CD1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CD1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CD1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CD1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CD1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CD1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CD2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CD2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CD2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CD2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CD2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CD2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CD2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CD2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CD2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CD4}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CD4}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CD4}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CD4}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CD4}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD4}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CD4}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CD4}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CD4}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CD4}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CD5}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CD5}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CD5}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CD5}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CD5}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD5}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CD5}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CD5}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CD5}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CD5}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CD6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CD6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CD6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CD6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CD6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CD6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CD6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CD6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CD6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CD7}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CD7}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CD7}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CD7}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CD7}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD7}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CD7}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CD7}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CD7}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CD7}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CD8}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CD8}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CD8}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CD8}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CD8}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD8}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CD8}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CD8}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CD8}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CD8}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CD9}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CD9}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CD9}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CD9}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CD9}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CD9}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CD9}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CD9}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CD9}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CD9}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CDA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CDA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CDA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CDA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CDA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CDA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CDA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CDA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CDA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CDA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CDB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CDB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CDB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CDB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CDB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CDB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CDB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CDB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CDB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CDB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CDC}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CDC}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CDC}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CDC}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CDC}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CDC}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CDC}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CDC}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CDC}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CDC}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CDD}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CDD}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CDD}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CDD}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CDD}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CDD}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CDD}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CDD}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CDD}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CDD}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CDE}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CDE}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CDE}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CDE}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CDE}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CDE}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CDE}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CDE}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CDE}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CDE}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CDF}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CDF}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CDF}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CDF}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CDF}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CDF}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CDF}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CDF}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CDF}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CDF}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CE0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CE0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CE0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CE0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CE0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CE0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CE0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CE0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CE0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE2}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE2}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE2}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE2}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE2}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE2}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE2}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE2}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE2}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE2}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE3}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE3}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE3}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE3}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE3}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE3}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE3}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE3}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE3}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE3}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE4}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE4}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE4}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE4}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE4}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE4}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE4}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE4}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE4}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE4}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE5}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE5}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE5}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE5}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE5}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE5}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE5}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE5}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE5}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE5}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE6}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE6}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE6}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE6}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE6}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE6}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE6}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE6}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE6}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE6}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE7}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE7}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE7}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE7}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE7}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE7}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE7}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE7}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE7}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE7}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1CE8}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1CE8}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1CE8}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1CE8}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1CE8}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CE8}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1CE8}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1CE8}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1CE8}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1CE8}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1CED}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1CED}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1CED}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1CED}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1CED}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CED}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1CED}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1CED}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1CED}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1CED}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CF4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CF4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CF4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CF4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CF4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CF4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CF4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CF4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CF4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CF4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CF8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CF8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CF8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CF8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CF8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CF8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CF8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CF8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CF8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CF8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1CF9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1CF9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1CF9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1CF9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1CF9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1CF9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1CF9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1CF9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1CF9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1CF9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1DC2}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1DC2}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1DC2}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1DC2}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1DC2}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC2}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1DC2}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1DC2}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1DC2}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1DC2}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DC9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DC9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DC9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DC9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DC9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DC9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DC9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DC9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DC9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DC9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1DCA}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1DCA}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1DCA}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1DCA}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1DCA}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCA}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1DCA}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1DCA}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1DCA}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1DCA}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DCB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DCB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DCB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DCB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DCB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DCB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DCB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DCB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DCB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DCC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DCC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DCC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DCC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DCC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DCC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DCC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DCC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DCC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0345}\u{035D}\u{035C}\u{1DCD}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{035D}\u{1DCD}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{035D}\u{1DCD}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{035D}\u{1DCD}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{035D}\u{1DCD}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCD}\u{0345}\u{035D}\u{035C}\u{0062}",
-        nfc: "\u{0061}\u{035C}\u{1DCD}\u{035D}\u{0345}\u{0062}",
-        nfd: "\u{0061}\u{035C}\u{1DCD}\u{035D}\u{0345}\u{0062}",
-        nfkc: "\u{0061}\u{035C}\u{1DCD}\u{035D}\u{0345}\u{0062}",
-        nfkd: "\u{0061}\u{035C}\u{1DCD}\u{035D}\u{0345}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{031B}\u{1DCE}\u{0321}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-        nfd: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-        nfkc: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-        nfkd: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCE}\u{031B}\u{1DCE}\u{0321}\u{0062}",
-        nfc: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-        nfd: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-        nfkc: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-        nfkd: "\u{0061}\u{0321}\u{1DCE}\u{1DCE}\u{031B}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1DCF}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1DCF}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1DCF}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1DCF}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1DCF}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCF}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1DCF}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1DCF}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1DCF}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1DCF}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DCE}\u{0321}\u{0F74}\u{1DD0}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{0321}\u{1DD0}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{0321}\u{1DD0}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{0321}\u{1DD0}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{0321}\u{1DD0}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD0}\u{1DCE}\u{0321}\u{0F74}\u{0062}",
-        nfc: "\u{0061}\u{0F74}\u{1DD0}\u{0321}\u{1DCE}\u{0062}",
-        nfd: "\u{0061}\u{0F74}\u{1DD0}\u{0321}\u{1DCE}\u{0062}",
-        nfkc: "\u{0061}\u{0F74}\u{1DD0}\u{0321}\u{1DCE}\u{0062}",
-        nfkd: "\u{0061}\u{0F74}\u{1DD0}\u{0321}\u{1DCE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DD9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DD9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DD9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DD9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DD9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DD9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DD9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DD9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DD9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DD9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DDA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DDA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DDA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DDA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DDA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DDA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DDA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DDA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DDA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DDA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DDB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DDB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DDB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DDB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DDB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DDB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DDB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DDB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DDB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DDB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DDC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DDC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DDC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DDC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DDC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DDC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DDC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DDC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DDC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DDC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DDD}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DDD}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DDD}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DDD}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DDD}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DDD}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DDD}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DDD}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DDD}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DDD}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DDE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DDE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DDE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DDE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DDE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DDE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DDE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DDE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DDE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DDE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DDF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DDF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DDF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DDF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DDF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DDF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DDF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DDF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DDF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DDF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DE9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DE9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DE9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DE9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DE9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DE9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DE9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DE9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DE9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DE9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DEA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DEA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DEA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DEA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DEA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DEA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DEA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DEA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DEA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DEA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DEB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DEB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DEB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DEB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DEB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DEB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DEB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DEB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DEB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DEB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DEC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DEC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DEC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DEC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DEC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DEC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DEC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DEC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DEC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DEC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DED}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DED}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DED}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DED}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DED}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DED}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DED}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DED}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DED}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DED}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DEE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DEE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DEE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DEE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DEE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DEE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DEE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DEE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DEE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DEE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DEF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DEF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DEF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DEF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DEF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DEF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DEF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DEF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DEF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DEF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DF0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DF0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DF0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DF0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DF0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DF0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DF0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DF0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DF0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DF0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DF1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DF1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DF1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DF1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DF1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DF1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DF1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DF1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DF1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DF1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DF2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DF2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DF2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DF2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DF2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DF2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DF2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DF2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DF2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DF2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DF3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DF3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DF3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DF3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DF3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DF3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DF3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DF3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DF3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DF3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DF4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DF4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DF4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DF4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DF4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DF4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DF4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DF4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DF4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DF4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DF5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DF5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DF5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DF5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DF5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DF5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DF5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DF5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DF5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DF5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DFB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DFB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DFB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DFB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DFB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DFB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DFB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DFB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DFB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DFB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035D}\u{035C}\u{0315}\u{1DFC}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{035C}\u{1DFC}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{035C}\u{1DFC}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{035C}\u{1DFC}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{035C}\u{1DFC}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DFC}\u{035D}\u{035C}\u{0315}\u{0062}",
-        nfc: "\u{0061}\u{0315}\u{1DFC}\u{035C}\u{035D}\u{0062}",
-        nfd: "\u{0061}\u{0315}\u{1DFC}\u{035C}\u{035D}\u{0062}",
-        nfkc: "\u{0061}\u{0315}\u{1DFC}\u{035C}\u{035D}\u{0062}",
-        nfkd: "\u{0061}\u{0315}\u{1DFC}\u{035C}\u{035D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1DFD}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1DFD}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1DFD}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1DFD}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1DFD}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DFD}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1DFD}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1DFD}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1DFD}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1DFD}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1DFE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1DFE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1DFE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1DFE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1DFE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DFE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1DFE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1DFE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1DFE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1DFE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1DFF}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1DFF}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1DFF}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1DFF}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1DFF}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1DFF}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1DFF}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1DFF}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1DFF}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1DFF}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20D0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20D0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20D0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20D0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20D0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20D0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20D0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20D0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20D0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20D1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20D1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20D1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20D1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20D1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20D1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20D1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20D1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20D1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20D2}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20D2}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20D2}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20D2}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20D2}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D2}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20D2}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20D2}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20D2}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20D2}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20D3}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20D3}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20D3}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20D3}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20D3}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D3}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20D3}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20D3}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20D3}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20D3}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20D4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20D4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20D4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20D4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20D4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20D4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20D4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20D4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20D4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20D5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20D5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20D5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20D5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20D5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20D5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20D5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20D5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20D5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20D6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20D6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20D6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20D6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20D6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20D6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20D6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20D6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20D6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20D7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20D7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20D7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20D7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20D7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20D7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20D7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20D7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20D7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20D8}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20D8}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20D8}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20D8}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20D8}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D8}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20D8}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20D8}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20D8}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20D8}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20D9}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20D9}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20D9}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20D9}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20D9}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20D9}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20D9}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20D9}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20D9}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20D9}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20DA}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20DA}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20DA}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20DA}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20DA}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20DA}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20DA}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20DA}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20DA}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20DA}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20DB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20DB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20DB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20DB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20DB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20DB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20DB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20DB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20DB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20DB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20DC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20DC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20DC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20DC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20DC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20DC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20DC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20DC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20DC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20DC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20E1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20E1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20E1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20E1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20E1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20E1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20E1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20E1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20E1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20E1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20E5}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20E5}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20E5}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20E5}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20E5}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20E5}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20E5}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20E5}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20E5}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20E5}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20E6}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20E6}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20E6}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20E6}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20E6}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20E6}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20E6}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20E6}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20E6}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20E6}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20E7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20E7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20E7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20E7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20E7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20E7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20E7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20E7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20E7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20E7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{20E8}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{20E8}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{20E8}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{20E8}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{20E8}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20E8}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{20E8}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{20E8}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{20E8}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{20E8}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20E9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20E9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20E9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20E9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20E9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20E9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20E9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20E9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20E9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20E9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20EA}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20EA}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20EA}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20EA}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20EA}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20EA}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20EA}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20EA}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20EA}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20EA}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{20EB}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{20EB}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{20EB}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{20EB}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{20EB}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20EB}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{20EB}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{20EB}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{20EB}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{20EB}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{20EC}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{20EC}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{20EC}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{20EC}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{20EC}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20EC}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{20EC}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{20EC}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{20EC}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{20EC}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{20ED}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{20ED}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{20ED}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{20ED}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{20ED}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20ED}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{20ED}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{20ED}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{20ED}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{20ED}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{20EE}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{20EE}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{20EE}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{20EE}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{20EE}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20EE}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{20EE}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{20EE}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{20EE}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{20EE}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{20EF}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{20EF}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{20EF}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{20EF}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{20EF}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20EF}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{20EF}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{20EF}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{20EF}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{20EF}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{20F0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{20F0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{20F0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{20F0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{20F0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{20F0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{20F0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{20F0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{20F0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{20F0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2CEF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2CEF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2CEF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2CEF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2CEF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2CEF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2CEF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2CEF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2CEF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2CEF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2CF0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2CF0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2CF0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2CF0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2CF0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2CF0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2CF0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2CF0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2CF0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2CF0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2CF1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2CF1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2CF1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2CF1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2CF1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2CF1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2CF1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2CF1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2CF1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2CF1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{2D7F}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{2D7F}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{2D7F}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{2D7F}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{2D7F}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2D7F}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{2D7F}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{2D7F}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{2D7F}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{2D7F}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DE9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DE9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DE9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DE9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DE9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DE9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DE9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DE9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DE9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DE9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DEA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DEA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DEA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DEA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DEA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DEA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DEA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DEA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DEA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DEA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DEB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DEB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DEB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DEB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DEB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DEB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DEB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DEB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DEB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DEB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DEC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DEC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DEC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DEC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DEC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DEC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DEC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DEC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DEC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DEC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DED}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DED}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DED}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DED}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DED}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DED}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DED}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DED}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DED}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DED}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DEE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DEE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DEE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DEE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DEE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DEE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DEE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DEE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DEE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DEE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DEF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DEF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DEF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DEF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DEF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DEF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DEF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DEF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DEF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DEF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DF9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DF9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DF9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DF9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DF9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DF9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DF9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DF9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DF9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DF9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DFA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DFA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DFA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DFA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DFA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DFA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DFA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DFA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DFA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DFA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DFB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DFB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DFB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DFB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DFB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DFB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DFB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DFB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DFB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DFB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DFC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DFC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DFC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DFC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DFC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DFC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DFC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DFC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DFC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DFC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DFD}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DFD}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DFD}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DFD}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DFD}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DFD}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DFD}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DFD}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DFD}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DFD}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DFE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DFE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DFE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DFE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DFE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DFE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DFE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DFE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DFE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DFE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{2DFF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{2DFF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{2DFF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{2DFF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{2DFF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{2DFF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{2DFF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{2DFF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{2DFF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{2DFF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0316}\u{302A}\u{031B}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-        nfd: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-        nfkc: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-        nfkd: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{0316}\u{302A}\u{031B}\u{0062}",
-        nfc: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-        nfd: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-        nfkc: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-        nfkd: "\u{0061}\u{031B}\u{302A}\u{302A}\u{0316}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0300}\u{05AE}\u{1D16D}\u{302B}\u{0062}",
-        nfc: "\u{00E0}\u{1D16D}\u{05AE}\u{302B}\u{0062}",
-        nfd: "\u{0061}\u{1D16D}\u{05AE}\u{302B}\u{0300}\u{0062}",
-        nfkc: "\u{00E0}\u{1D16D}\u{05AE}\u{302B}\u{0062}",
-        nfkd: "\u{0061}\u{1D16D}\u{05AE}\u{302B}\u{0300}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302B}\u{0300}\u{05AE}\u{1D16D}\u{0062}",
-        nfc: "\u{00E0}\u{1D16D}\u{302B}\u{05AE}\u{0062}",
-        nfd: "\u{0061}\u{1D16D}\u{302B}\u{05AE}\u{0300}\u{0062}",
-        nfkc: "\u{00E0}\u{1D16D}\u{302B}\u{05AE}\u{0062}",
-        nfkd: "\u{0061}\u{1D16D}\u{302B}\u{05AE}\u{0300}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{035C}\u{0315}\u{0300}\u{302C}\u{0062}",
-        nfc: "\u{00E0}\u{0315}\u{302C}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{0315}\u{302C}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{0315}\u{302C}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{0315}\u{302C}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302C}\u{035C}\u{0315}\u{0300}\u{0062}",
-        nfc: "\u{00E0}\u{302C}\u{0315}\u{035C}\u{0062}",
-        nfd: "\u{0061}\u{0300}\u{302C}\u{0315}\u{035C}\u{0062}",
-        nfkc: "\u{00E0}\u{302C}\u{0315}\u{035C}\u{0062}",
-        nfkd: "\u{0061}\u{0300}\u{302C}\u{0315}\u{035C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302E}\u{059A}\u{0316}\u{302D}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{059A}\u{302D}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{059A}\u{302D}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{059A}\u{302D}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{059A}\u{302D}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302D}\u{302E}\u{059A}\u{0316}\u{0062}",
-        nfc: "\u{0061}\u{0316}\u{302D}\u{059A}\u{302E}\u{0062}",
-        nfd: "\u{0061}\u{0316}\u{302D}\u{059A}\u{302E}\u{0062}",
-        nfkc: "\u{0061}\u{0316}\u{302D}\u{059A}\u{302E}\u{0062}",
-        nfkd: "\u{0061}\u{0316}\u{302D}\u{059A}\u{302E}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D16D}\u{302E}\u{059A}\u{302E}\u{0062}",
-        nfc: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-        nfd: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-        nfkc: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-        nfkd: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302E}\u{1D16D}\u{302E}\u{059A}\u{0062}",
-        nfc: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-        nfd: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-        nfkc: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-        nfkd: "\u{0061}\u{059A}\u{302E}\u{302E}\u{1D16D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D16D}\u{302E}\u{059A}\u{302F}\u{0062}",
-        nfc: "\u{0061}\u{059A}\u{302E}\u{302F}\u{1D16D}\u{0062}",
-        nfd: "\u{0061}\u{059A}\u{302E}\u{302F}\u{1D16D}\u{0062}",
-        nfkc: "\u{0061}\u{059A}\u{302E}\u{302F}\u{1D16D}\u{0062}",
-        nfkd: "\u{0061}\u{059A}\u{302E}\u{302F}\u{1D16D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302F}\u{1D16D}\u{302E}\u{059A}\u{0062}",
-        nfc: "\u{0061}\u{059A}\u{302F}\u{302E}\u{1D16D}\u{0062}",
-        nfd: "\u{0061}\u{059A}\u{302F}\u{302E}\u{1D16D}\u{0062}",
-        nfkc: "\u{0061}\u{059A}\u{302F}\u{302E}\u{1D16D}\u{0062}",
-        nfkd: "\u{0061}\u{059A}\u{302F}\u{302E}\u{1D16D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{094D}\u{3099}\u{093C}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-        nfd: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-        nfkc: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-        nfkd: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{094D}\u{3099}\u{093C}\u{0062}",
-        nfc: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-        nfd: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-        nfkc: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-        nfkd: "\u{0061}\u{093C}\u{3099}\u{3099}\u{094D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{094D}\u{3099}\u{093C}\u{309A}\u{0062}",
-        nfc: "\u{0061}\u{093C}\u{3099}\u{309A}\u{094D}\u{0062}",
-        nfd: "\u{0061}\u{093C}\u{3099}\u{309A}\u{094D}\u{0062}",
-        nfkc: "\u{0061}\u{093C}\u{3099}\u{309A}\u{094D}\u{0062}",
-        nfkd: "\u{0061}\u{093C}\u{3099}\u{309A}\u{094D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{309A}\u{094D}\u{3099}\u{093C}\u{0062}",
-        nfc: "\u{0061}\u{093C}\u{309A}\u{3099}\u{094D}\u{0062}",
-        nfd: "\u{0061}\u{093C}\u{309A}\u{3099}\u{094D}\u{0062}",
-        nfkc: "\u{0061}\u{093C}\u{309A}\u{3099}\u{094D}\u{0062}",
-        nfkd: "\u{0061}\u{093C}\u{309A}\u{3099}\u{094D}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A66F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A66F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A66F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A66F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A66F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A66F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A66F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A66F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A66F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A66F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A674}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A674}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A674}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A674}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A674}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A674}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A674}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A674}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A674}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A674}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A675}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A675}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A675}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A675}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A675}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A675}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A675}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A675}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A675}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A675}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A676}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A676}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A676}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A676}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A676}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A676}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A676}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A676}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A676}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A676}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A677}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A677}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A677}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A677}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A677}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A677}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A677}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A677}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A677}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A677}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A678}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A678}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A678}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A678}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A678}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A678}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A678}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A678}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A678}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A678}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A679}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A679}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A679}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A679}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A679}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A679}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A679}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A679}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A679}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A679}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A67A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A67A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A67A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A67A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A67A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A67A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A67A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A67A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A67A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A67A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A67B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A67B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A67B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A67B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A67B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A67B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A67B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A67B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A67B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A67B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A67C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A67C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A67C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A67C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A67C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A67C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A67C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A67C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A67C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A67C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A67D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A67D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A67D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A67D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A67D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A67D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A67D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A67D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A67D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A67D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A69E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A69E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A69E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A69E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A69E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A69E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A69E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A69E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A69E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A69E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A69F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A69F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A69F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A69F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A69F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A69F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A69F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A69F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A69F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A69F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A6F0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A6F0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A6F0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A6F0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A6F0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A6F0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A6F0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A6F0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A6F0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A6F0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A6F1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A6F1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A6F1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A6F1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A6F1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A6F1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A6F1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A6F1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A6F1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A6F1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{A806}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{A806}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{A806}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{A806}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{A806}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A806}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{A806}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{A806}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{A806}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{A806}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{A8C4}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{A8C4}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{A8C4}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{A8C4}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{A8C4}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8C4}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{A8C4}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{A8C4}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{A8C4}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{A8C4}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E4}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E4}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E4}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E4}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E4}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E4}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E4}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E4}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E4}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E4}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E6}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E6}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E6}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E6}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E6}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E6}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E6}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E6}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E6}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E6}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8E9}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8E9}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8E9}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8E9}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8E9}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8E9}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8E9}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8E9}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8E9}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8E9}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8EA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8EA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8EA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8EA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8EA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8EA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8EA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8EA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8EA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8EA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8EB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8EB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8EB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8EB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8EB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8EB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8EB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8EB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8EB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8EB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8EC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8EC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8EC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8EC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8EC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8EC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8EC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8EC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8EC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8EC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8ED}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8ED}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8ED}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8ED}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8ED}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8ED}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8ED}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8ED}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8ED}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8ED}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8EE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8EE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8EE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8EE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8EE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8EE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8EE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8EE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8EE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8EE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8EF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8EF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8EF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8EF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8EF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8EF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8EF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8EF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8EF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8EF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8F0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8F0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8F0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8F0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8F0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8F0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8F0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8F0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8F0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8F0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{A8F1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{A8F1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{A8F1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{A8F1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{A8F1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A8F1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{A8F1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{A8F1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{A8F1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{A8F1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{A92B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{A92B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{A92B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{A92B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{A92B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A92B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{A92B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{A92B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{A92B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{A92B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{A92C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{A92C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{A92C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{A92C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{A92C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A92C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{A92C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{A92C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{A92C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{A92C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{A92D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{A92D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{A92D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{A92D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{A92D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A92D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{A92D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{A92D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{A92D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{A92D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{A953}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{A953}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{A953}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{A953}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{A953}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A953}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{A953}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{A953}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{A953}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{A953}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{A9B3}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{A9B3}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{A9B3}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{A9B3}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{A9B3}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A9B3}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{A9B3}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{A9B3}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{A9B3}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{A9B3}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{A9C0}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{A9C0}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{A9C0}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{A9C0}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{A9C0}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{A9C0}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{A9C0}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{A9C0}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{A9C0}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{A9C0}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AAB0}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AAB0}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AAB0}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AAB0}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AAB0}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAB0}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AAB0}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AAB0}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AAB0}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AAB0}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AAB2}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AAB2}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AAB2}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AAB2}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AAB2}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAB2}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AAB2}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AAB2}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AAB2}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AAB2}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AAB3}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AAB3}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AAB3}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AAB3}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AAB3}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAB3}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AAB3}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AAB3}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AAB3}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AAB3}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{AAB4}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{AAB4}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{AAB4}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{AAB4}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{AAB4}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAB4}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{AAB4}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{AAB4}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{AAB4}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{AAB4}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AAB7}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AAB7}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AAB7}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AAB7}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AAB7}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAB7}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AAB7}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AAB7}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AAB7}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AAB7}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AAB8}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AAB8}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AAB8}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AAB8}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AAB8}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAB8}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AAB8}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AAB8}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AAB8}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AAB8}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AABE}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AABE}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AABE}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AABE}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AABE}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AABE}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AABE}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AABE}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AABE}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AABE}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AABF}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AABF}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AABF}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AABF}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AABF}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AABF}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AABF}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AABF}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AABF}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AABF}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{AAC1}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{AAC1}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{AAC1}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{AAC1}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{AAC1}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAC1}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{AAC1}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{AAC1}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{AAC1}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{AAC1}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{AAF6}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{AAF6}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{AAF6}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{AAF6}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{AAF6}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{AAF6}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{AAF6}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{AAF6}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{AAF6}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{AAF6}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{ABED}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{ABED}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{ABED}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{ABED}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{ABED}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{ABED}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{ABED}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{ABED}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{ABED}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{ABED}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{064B}\u{FB1E}\u{05C2}\u{FB1E}\u{0062}",
-        nfc: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-        nfd: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-        nfkc: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-        nfkd: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FB1E}\u{064B}\u{FB1E}\u{05C2}\u{0062}",
-        nfc: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-        nfd: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-        nfkc: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-        nfkd: "\u{0061}\u{05C2}\u{FB1E}\u{FB1E}\u{064B}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE20}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE20}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE20}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE20}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE20}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE20}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE20}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE20}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE20}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE20}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE21}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE21}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE21}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE21}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE21}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE21}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE21}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE21}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE21}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE21}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE22}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE22}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE22}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE22}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE22}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE22}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE22}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE22}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE22}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE22}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE23}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE23}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE23}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE23}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE23}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE23}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE23}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE23}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE23}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE23}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE24}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE24}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE24}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE24}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE24}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE24}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE24}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE24}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE24}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE24}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE25}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE25}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE25}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE25}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE25}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE25}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE25}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE25}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE25}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE25}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE26}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE26}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE26}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE26}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE26}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE26}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE26}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE26}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE26}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE26}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE27}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE27}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE27}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE27}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE27}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE27}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE27}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE27}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE27}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE27}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE28}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE28}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE28}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE28}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE28}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE28}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE28}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE28}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE28}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE28}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE29}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE29}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE29}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE29}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE29}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE29}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE29}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE29}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE29}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE29}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE2A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE2A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE2A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE2A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE2A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE2A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE2A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE2A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE2A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE2A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE2B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE2B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE2B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE2B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE2B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE2B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE2B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE2B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE2B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE2B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE2C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE2C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE2C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE2C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE2C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE2C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE2C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE2C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE2C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE2C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{FE2D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{FE2D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{FE2D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{FE2D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{FE2D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE2D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{FE2D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{FE2D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{FE2D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{FE2D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE2E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE2E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE2E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE2E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE2E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE2E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE2E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE2E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE2E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE2E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{FE2F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{FE2F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{FE2F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{FE2F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{FE2F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{FE2F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{FE2F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{FE2F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{FE2F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{FE2F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{101FD}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{101FD}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{101FD}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{101FD}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{101FD}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{101FD}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{101FD}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{101FD}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{101FD}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{101FD}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{102E0}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{102E0}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{102E0}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{102E0}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{102E0}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{102E0}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{102E0}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{102E0}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{102E0}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{102E0}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10376}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10376}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10376}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10376}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10376}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10376}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10376}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10376}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10376}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10376}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10377}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10377}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10377}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10377}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10377}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10377}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10377}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10377}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10377}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10377}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10378}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10378}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10378}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10378}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10378}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10378}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10378}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10378}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10378}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10378}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10379}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10379}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10379}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10379}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10379}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10379}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10379}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10379}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10379}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10379}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1037A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1037A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1037A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1037A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1037A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1037A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1037A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1037A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1037A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1037A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{10A0D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{10A0D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{10A0D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{10A0D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{10A0D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10A0D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{10A0D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{10A0D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{10A0D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{10A0D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10A0F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10A0F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10A0F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10A0F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10A0F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10A0F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10A0F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10A0F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10A0F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10A0F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10A38}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10A38}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10A38}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10A38}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10A38}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10A38}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10A38}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10A38}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10A38}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10A38}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{10A39}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{10A39}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{10A39}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{10A39}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{10A39}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10A39}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{10A39}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{10A39}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{10A39}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{10A39}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{10A3A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{10A3A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{10A3A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{10A3A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{10A3A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10A3A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{10A3A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{10A3A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{10A3A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{10A3A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{10A3F}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{10A3F}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{10A3F}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{10A3F}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{10A3F}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10A3F}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{10A3F}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{10A3F}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{10A3F}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{10A3F}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{10AE5}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{10AE5}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{10AE5}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{10AE5}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{10AE5}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10AE5}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{10AE5}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{10AE5}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{10AE5}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{10AE5}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{10AE6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{10AE6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{10AE6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{10AE6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{10AE6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{10AE6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{10AE6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{10AE6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{10AE6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{10AE6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{11046}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{11046}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{11046}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{11046}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{11046}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11046}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{11046}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{11046}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{11046}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{11046}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1107F}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1107F}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1107F}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1107F}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1107F}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1107F}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1107F}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1107F}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1107F}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1107F}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{110B9}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{110B9}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{110B9}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{110B9}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{110B9}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{110B9}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{110B9}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{110B9}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{110B9}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{110B9}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{110BA}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{110BA}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{110BA}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{110BA}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{110BA}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{110BA}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{110BA}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{110BA}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{110BA}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{110BA}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11100}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11100}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11100}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11100}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11100}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11100}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11100}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11100}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11100}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11100}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11101}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11101}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11101}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11101}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11101}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11101}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11101}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11101}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11101}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11101}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11102}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11102}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11102}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11102}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11102}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11102}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11102}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11102}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11102}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11102}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{11133}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{11133}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{11133}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{11133}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{11133}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11133}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{11133}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{11133}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{11133}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{11133}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{11134}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{11134}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{11134}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{11134}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{11134}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11134}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{11134}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{11134}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{11134}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{11134}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{11173}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{11173}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{11173}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{11173}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{11173}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11173}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{11173}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{11173}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{11173}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{11173}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{111C0}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{111C0}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{111C0}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{111C0}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{111C0}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{111C0}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{111C0}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{111C0}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{111C0}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{111C0}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{111CA}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{111CA}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{111CA}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{111CA}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{111CA}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{111CA}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{111CA}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{111CA}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{111CA}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{111CA}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{11235}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{11235}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{11235}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{11235}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{11235}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11235}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{11235}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{11235}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{11235}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{11235}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{11236}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{11236}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{11236}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{11236}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{11236}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11236}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{11236}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{11236}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{11236}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{11236}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{112E9}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{112E9}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{112E9}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{112E9}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{112E9}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{112E9}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{112E9}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{112E9}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{112E9}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{112E9}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{112EA}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{112EA}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{112EA}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{112EA}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{112EA}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{112EA}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{112EA}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{112EA}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{112EA}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{112EA}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{1133C}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{1133C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{1133C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{1133C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{1133C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1133C}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1133C}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1133C}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1133C}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1133C}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1134D}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1134D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1134D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1134D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1134D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1134D}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1134D}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1134D}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1134D}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1134D}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11366}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11366}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11366}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11366}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11366}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11366}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11366}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11366}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11366}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11366}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11367}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11367}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11367}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11367}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11367}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11367}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11367}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11367}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11367}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11367}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11368}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11368}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11368}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11368}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11368}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11368}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11368}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11368}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11368}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11368}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11369}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11369}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11369}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11369}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11369}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11369}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11369}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11369}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11369}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11369}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1136A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1136A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1136A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1136A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1136A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1136A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1136A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1136A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1136A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1136A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1136B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1136B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1136B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1136B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1136B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1136B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1136B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1136B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1136B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1136B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1136C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1136C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1136C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1136C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1136C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1136C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1136C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1136C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1136C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1136C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11370}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11370}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11370}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11370}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11370}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11370}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11370}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11370}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11370}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11370}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11371}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11371}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11371}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11371}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11371}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11371}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11371}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11371}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11371}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11371}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11372}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11372}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11372}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11372}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11372}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11372}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11372}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11372}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11372}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11372}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11373}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11373}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11373}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11373}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11373}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11373}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11373}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11373}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11373}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11373}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{11374}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{11374}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{11374}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{11374}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{11374}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11374}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{11374}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{11374}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{11374}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{11374}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{11442}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{11442}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{11442}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{11442}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{11442}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11442}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{11442}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{11442}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{11442}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{11442}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{11446}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{11446}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{11446}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{11446}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{11446}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11446}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{11446}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{11446}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{11446}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{11446}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{114C2}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{114C2}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{114C2}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{114C2}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{114C2}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{114C2}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{114C2}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{114C2}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{114C2}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{114C2}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{114C3}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{114C3}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{114C3}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{114C3}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{114C3}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{114C3}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{114C3}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{114C3}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{114C3}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{114C3}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{115BF}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{115BF}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{115BF}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{115BF}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{115BF}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{115BF}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{115BF}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{115BF}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{115BF}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{115BF}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{115C0}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{115C0}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{115C0}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{115C0}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{115C0}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{115C0}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{115C0}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{115C0}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{115C0}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{115C0}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1163F}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1163F}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1163F}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1163F}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1163F}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1163F}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1163F}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1163F}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1163F}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1163F}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{116B6}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{116B6}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{116B6}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{116B6}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{116B6}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{116B6}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{116B6}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{116B6}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{116B6}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{116B6}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{116B7}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{116B7}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{116B7}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{116B7}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{116B7}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{116B7}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{116B7}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{116B7}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{116B7}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{116B7}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{1172B}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{1172B}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{1172B}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{1172B}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{1172B}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1172B}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{1172B}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{1172B}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{1172B}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{1172B}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05B0}\u{094D}\u{3099}\u{11C3F}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{094D}\u{11C3F}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{094D}\u{11C3F}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{094D}\u{11C3F}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{094D}\u{11C3F}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{11C3F}\u{05B0}\u{094D}\u{3099}\u{0062}",
-        nfc: "\u{0061}\u{3099}\u{11C3F}\u{094D}\u{05B0}\u{0062}",
-        nfd: "\u{0061}\u{3099}\u{11C3F}\u{094D}\u{05B0}\u{0062}",
-        nfkc: "\u{0061}\u{3099}\u{11C3F}\u{094D}\u{05B0}\u{0062}",
-        nfkd: "\u{0061}\u{3099}\u{11C3F}\u{094D}\u{05B0}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{16AF0}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{16AF0}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{16AF0}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{16AF0}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{16AF0}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16AF0}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{16AF0}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{16AF0}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{16AF0}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{16AF0}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{16AF1}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{16AF1}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{16AF1}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{16AF1}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{16AF1}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16AF1}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{16AF1}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{16AF1}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{16AF1}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{16AF1}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{16AF2}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{16AF2}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{16AF2}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{16AF2}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{16AF2}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16AF2}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{16AF2}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{16AF2}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{16AF2}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{16AF2}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{16AF3}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{16AF3}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{16AF3}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{16AF3}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{16AF3}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16AF3}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{16AF3}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{16AF3}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{16AF3}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{16AF3}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{16AF4}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{16AF4}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{16AF4}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{16AF4}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{16AF4}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16AF4}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{16AF4}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{16AF4}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{16AF4}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{16AF4}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B30}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B30}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B30}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B30}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B30}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B30}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B30}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B30}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B30}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B30}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B31}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B31}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B31}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B31}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B31}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B31}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B31}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B31}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B31}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B31}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B32}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B32}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B32}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B32}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B32}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B32}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B32}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B32}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B32}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B32}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B33}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B33}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B33}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B33}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B33}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B33}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B33}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B33}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B33}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B33}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B34}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B34}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B34}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B34}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B34}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B34}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B34}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B34}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B34}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B34}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B35}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B35}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B35}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B35}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B35}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B35}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B35}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B35}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B35}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B35}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{16B36}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{16B36}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{16B36}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{16B36}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{16B36}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{16B36}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{16B36}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{16B36}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{16B36}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{16B36}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1BC9E}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1BC9E}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1BC9E}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1BC9E}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1BC9E}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1BC9E}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1BC9E}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1BC9E}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1BC9E}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1BC9E}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D165}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D165}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D165}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D165}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D165}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D165}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D165}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D165}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D165}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D165}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D166}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D166}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D166}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D166}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D166}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D166}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D166}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D166}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D166}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D166}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1D167}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1D167}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1D167}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1D167}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1D167}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D167}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1D167}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1D167}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1D167}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1D167}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1D168}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1D168}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1D168}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1D168}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1D168}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D168}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1D168}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1D168}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1D168}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1D168}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{093C}\u{0334}\u{1D169}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1D169}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1D169}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1D169}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1D169}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D169}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{1D169}\u{0334}\u{093C}\u{0062}",
-        nfd: "\u{0061}\u{1D169}\u{0334}\u{093C}\u{0062}",
-        nfkc: "\u{0061}\u{1D169}\u{0334}\u{093C}\u{0062}",
-        nfkd: "\u{0061}\u{1D169}\u{0334}\u{093C}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{05AE}\u{1D16D}\u{302E}\u{1D16D}\u{0062}",
-        nfc: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-        nfd: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-        nfkc: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-        nfkd: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D16D}\u{05AE}\u{1D16D}\u{302E}\u{0062}",
-        nfc: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-        nfd: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-        nfkc: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-        nfkd: "\u{0061}\u{302E}\u{1D16D}\u{1D16D}\u{05AE}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D16E}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D16E}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D16E}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D16E}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D16E}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D16E}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D16E}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D16E}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D16E}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D16E}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D16F}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D16F}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D16F}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D16F}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D16F}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D16F}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D16F}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D16F}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D16F}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D16F}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D170}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D170}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D170}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D170}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D170}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D170}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D170}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D170}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D170}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D170}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D171}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D171}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D171}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D171}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D171}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D171}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D171}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D171}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D171}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D171}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{302A}\u{031B}\u{1DCE}\u{1D172}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{031B}\u{1D172}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{031B}\u{1D172}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{031B}\u{1D172}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{031B}\u{1D172}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D172}\u{302A}\u{031B}\u{1DCE}\u{0062}",
-        nfc: "\u{0061}\u{1DCE}\u{1D172}\u{031B}\u{302A}\u{0062}",
-        nfd: "\u{0061}\u{1DCE}\u{1D172}\u{031B}\u{302A}\u{0062}",
-        nfkc: "\u{0061}\u{1DCE}\u{1D172}\u{031B}\u{302A}\u{0062}",
-        nfkd: "\u{0061}\u{1DCE}\u{1D172}\u{031B}\u{302A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D17B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D17B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D17B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D17B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D17B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D17B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D17B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D17B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D17B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D17B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D17C}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D17C}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D17C}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D17C}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D17C}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D17C}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D17C}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D17C}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D17C}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D17C}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D17D}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D17D}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D17D}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D17D}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D17D}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D17D}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D17D}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D17D}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D17D}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D17D}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D17E}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D17E}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D17E}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D17E}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D17E}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D17E}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D17E}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D17E}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D17E}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D17E}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D17F}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D17F}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D17F}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D17F}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D17F}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D17F}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D17F}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D17F}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D17F}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D17F}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D180}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D180}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D180}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D180}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D180}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D180}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D180}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D180}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D180}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D180}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D181}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D181}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D181}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D181}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D181}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D181}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D181}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D181}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D181}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D181}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D182}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D182}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D182}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D182}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D182}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D182}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D182}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D182}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D182}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D182}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D185}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D185}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D185}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D185}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D185}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D185}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D185}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D185}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D185}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D185}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D186}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D186}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D186}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D186}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D186}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D186}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D186}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D186}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D186}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D186}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D187}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D187}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D187}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D187}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D187}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D187}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D187}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D187}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D187}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D187}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D188}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D188}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D188}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D188}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D188}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D188}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D188}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D188}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D188}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D188}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D189}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D189}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D189}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D189}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D189}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D189}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D189}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D189}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D189}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D189}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D18A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D18A}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D18A}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D18A}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D18A}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D18A}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D18A}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D18A}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D18A}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D18A}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1D18B}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1D18B}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1D18B}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1D18B}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1D18B}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D18B}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1D18B}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1D18B}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1D18B}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1D18B}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D1AA}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D1AA}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D1AA}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D1AA}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D1AA}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D1AA}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D1AA}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D1AA}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D1AA}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D1AA}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D1AB}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D1AB}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D1AB}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D1AB}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D1AB}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D1AB}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D1AB}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D1AB}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D1AB}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D1AB}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D1AC}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D1AC}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D1AC}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D1AC}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D1AC}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D1AC}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D1AC}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D1AC}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D1AC}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D1AC}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D1AD}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D1AD}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D1AD}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D1AD}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D1AD}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D1AD}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D1AD}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D1AD}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D1AD}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D1AD}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D242}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D242}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D242}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D242}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D242}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D242}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D242}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D242}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D242}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D242}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D243}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D243}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D243}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D243}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D243}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D243}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D243}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D243}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D243}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D243}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1D244}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1D244}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1D244}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1D244}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1D244}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1D244}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1D244}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1D244}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1D244}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1D244}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E000}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E000}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E000}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E000}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E000}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E000}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E000}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E000}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E000}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E000}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E001}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E001}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E001}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E001}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E001}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E001}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E001}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E001}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E001}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E001}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E002}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E002}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E002}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E002}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E002}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E002}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E002}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E002}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E002}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E002}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E003}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E003}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E003}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E003}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E003}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E003}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E003}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E003}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E003}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E003}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E004}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E004}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E004}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E004}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E004}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E004}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E004}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E004}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E004}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E004}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E005}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E005}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E005}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E005}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E005}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E005}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E005}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E005}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E005}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E005}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E006}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E006}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E006}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E006}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E006}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E006}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E006}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E006}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E006}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E006}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E008}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E008}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E008}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E008}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E008}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E008}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E008}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E008}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E008}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E008}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E009}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E009}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E009}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E009}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E009}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E009}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E009}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E009}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E009}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E009}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E00A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E00A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E00A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E00A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E00A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E00A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E00A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E00A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E00A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E00A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E00B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E00B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E00B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E00B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E00B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E00B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E00B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E00B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E00B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E00B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E00C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E00C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E00C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E00C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E00C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E00C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E00C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E00C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E00C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E00C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E00D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E00D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E00D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E00D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E00D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E00D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E00D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E00D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E00D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E00D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E00E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E00E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E00E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E00E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E00E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E00E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E00E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E00E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E00E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E00E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E00F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E00F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E00F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E00F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E00F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E00F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E00F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E00F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E00F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E00F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E010}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E010}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E010}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E010}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E010}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E010}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E010}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E010}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E010}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E010}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E011}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E011}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E011}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E011}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E011}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E011}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E011}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E011}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E011}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E011}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E012}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E012}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E012}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E012}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E012}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E012}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E012}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E012}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E012}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E012}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E013}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E013}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E013}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E013}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E013}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E013}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E013}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E013}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E013}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E013}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E014}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E014}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E014}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E014}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E014}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E014}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E014}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E014}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E014}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E014}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E015}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E015}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E015}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E015}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E015}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E015}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E015}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E015}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E015}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E015}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E016}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E016}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E016}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E016}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E016}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E016}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E016}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E016}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E016}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E016}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E017}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E017}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E017}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E017}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E017}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E017}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E017}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E017}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E017}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E017}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E018}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E018}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E018}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E018}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E018}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E018}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E018}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E018}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E018}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E018}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E01B}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E01B}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E01B}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E01B}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E01B}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E01B}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E01B}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E01B}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E01B}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E01B}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E01C}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E01C}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E01C}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E01C}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E01C}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E01C}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E01C}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E01C}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E01C}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E01C}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E01D}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E01D}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E01D}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E01D}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E01D}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E01D}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E01D}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E01D}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E01D}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E01D}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E01E}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E01E}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E01E}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E01E}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E01E}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E01E}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E01E}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E01E}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E01E}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E01E}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E01F}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E01F}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E01F}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E01F}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E01F}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E01F}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E01F}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E01F}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E01F}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E01F}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E020}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E020}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E020}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E020}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E020}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E020}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E020}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E020}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E020}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E020}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E021}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E021}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E021}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E021}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E021}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E021}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E021}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E021}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E021}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E021}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E023}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E023}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E023}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E023}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E023}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E023}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E023}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E023}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E023}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E023}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E024}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E024}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E024}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E024}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E024}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E024}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E024}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E024}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E024}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E024}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E026}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E026}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E026}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E026}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E026}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E026}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E026}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E026}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E026}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E026}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E027}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E027}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E027}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E027}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E027}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E027}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E027}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E027}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E027}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E027}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E028}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E028}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E028}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E028}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E028}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E028}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E028}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E028}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E028}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E028}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E029}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E029}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E029}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E029}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E029}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E029}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E029}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E029}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E029}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E029}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E02A}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E02A}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E02A}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E02A}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E02A}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E02A}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E02A}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E02A}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E02A}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E02A}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D0}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D0}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D0}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D0}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D0}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D0}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D0}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D0}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D0}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D0}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D1}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D1}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D1}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D1}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D1}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D1}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D1}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D1}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D1}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D1}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D2}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D2}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D2}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D2}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D2}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D2}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D2}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D2}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D2}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D2}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D3}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D3}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D3}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D3}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D3}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D3}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D3}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D3}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D3}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D3}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D4}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D4}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D4}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D4}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D4}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D4}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D4}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D4}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D4}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D4}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D5}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D5}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D5}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D5}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D5}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D5}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D5}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D5}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D5}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D5}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{059A}\u{0316}\u{302A}\u{1E8D6}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{0316}\u{1E8D6}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{0316}\u{1E8D6}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{0316}\u{1E8D6}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{0316}\u{1E8D6}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E8D6}\u{059A}\u{0316}\u{302A}\u{0062}",
-        nfc: "\u{0061}\u{302A}\u{1E8D6}\u{0316}\u{059A}\u{0062}",
-        nfd: "\u{0061}\u{302A}\u{1E8D6}\u{0316}\u{059A}\u{0062}",
-        nfkc: "\u{0061}\u{302A}\u{1E8D6}\u{0316}\u{059A}\u{0062}",
-        nfkd: "\u{0061}\u{302A}\u{1E8D6}\u{0316}\u{059A}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E944}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E944}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E944}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E944}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E944}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E944}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E944}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E944}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E944}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E944}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E945}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E945}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E945}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E945}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E945}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E945}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E945}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E945}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E945}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E945}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E946}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E946}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E946}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E946}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E946}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E946}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E946}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E946}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E946}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E946}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E947}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E947}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E947}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E947}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E947}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E947}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E947}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E947}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E947}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E947}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E948}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E948}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E948}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E948}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E948}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E948}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E948}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E948}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E948}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E948}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{0315}\u{0300}\u{05AE}\u{1E949}\u{0062}",
-        nfc: "\u{00E0}\u{05AE}\u{1E949}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{0300}\u{1E949}\u{0315}\u{0062}",
-        nfkc: "\u{00E0}\u{05AE}\u{1E949}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{0300}\u{1E949}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E949}\u{0315}\u{0300}\u{05AE}\u{0062}",
-        nfc: "\u{0061}\u{05AE}\u{1E949}\u{0300}\u{0315}\u{0062}",
-        nfd: "\u{0061}\u{05AE}\u{1E949}\u{0300}\u{0315}\u{0062}",
-        nfkc: "\u{0061}\u{05AE}\u{1E949}\u{0300}\u{0315}\u{0062}",
-        nfkd: "\u{0061}\u{05AE}\u{1E949}\u{0300}\u{0315}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{3099}\u{093C}\u{0334}\u{1E94A}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{093C}\u{1E94A}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{093C}\u{1E94A}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{093C}\u{1E94A}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{093C}\u{1E94A}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{0061}\u{1E94A}\u{3099}\u{093C}\u{0334}\u{0062}",
-        nfc: "\u{0061}\u{0334}\u{1E94A}\u{093C}\u{3099}\u{0062}",
-        nfd: "\u{0061}\u{0334}\u{1E94A}\u{093C}\u{3099}\u{0062}",
-        nfkc: "\u{0061}\u{0334}\u{1E94A}\u{093C}\u{3099}\u{0062}",
-        nfkd: "\u{0061}\u{0334}\u{1E94A}\u{093C}\u{3099}\u{0062}",
-    },
-    NormalizationTest {
-        source: "\u{09C7}\u{0334}\u{09BE}",
-        nfc: "\u{09C7}\u{0334}\u{09BE}",
-        nfd: "\u{09C7}\u{0334}\u{09BE}",
-        nfkc: "\u{09C7}\u{0334}\u{09BE}",
-        nfkd: "\u{09C7}\u{0334}\u{09BE}",
-    },
-    NormalizationTest {
-        source: "\u{09C7}\u{0334}\u{09D7}",
-        nfc: "\u{09C7}\u{0334}\u{09D7}",
-        nfd: "\u{09C7}\u{0334}\u{09D7}",
-        nfkc: "\u{09C7}\u{0334}\u{09D7}",
-        nfkd: "\u{09C7}\u{0334}\u{09D7}",
-    },
-    NormalizationTest {
-        source: "\u{0B47}\u{0334}\u{0B3E}",
-        nfc: "\u{0B47}\u{0334}\u{0B3E}",
-        nfd: "\u{0B47}\u{0334}\u{0B3E}",
-        nfkc: "\u{0B47}\u{0334}\u{0B3E}",
-        nfkd: "\u{0B47}\u{0334}\u{0B3E}",
-    },
-    NormalizationTest {
-        source: "\u{0B47}\u{0334}\u{0B56}",
-        nfc: "\u{0B47}\u{0334}\u{0B56}",
-        nfd: "\u{0B47}\u{0334}\u{0B56}",
-        nfkc: "\u{0B47}\u{0334}\u{0B56}",
-        nfkd: "\u{0B47}\u{0334}\u{0B56}",
-    },
-    NormalizationTest {
-        source: "\u{0B47}\u{0334}\u{0B57}",
-        nfc: "\u{0B47}\u{0334}\u{0B57}",
-        nfd: "\u{0B47}\u{0334}\u{0B57}",
-        nfkc: "\u{0B47}\u{0334}\u{0B57}",
-        nfkd: "\u{0B47}\u{0334}\u{0B57}",
-    },
-    NormalizationTest {
-        source: "\u{0B92}\u{0334}\u{0BD7}",
-        nfc: "\u{0B92}\u{0334}\u{0BD7}",
-        nfd: "\u{0B92}\u{0334}\u{0BD7}",
-        nfkc: "\u{0B92}\u{0334}\u{0BD7}",
-        nfkd: "\u{0B92}\u{0334}\u{0BD7}",
-    },
-    NormalizationTest {
-        source: "\u{0BC6}\u{0334}\u{0BBE}",
-        nfc: "\u{0BC6}\u{0334}\u{0BBE}",
-        nfd: "\u{0BC6}\u{0334}\u{0BBE}",
-        nfkc: "\u{0BC6}\u{0334}\u{0BBE}",
-        nfkd: "\u{0BC6}\u{0334}\u{0BBE}",
-    },
-    NormalizationTest {
-        source: "\u{0BC6}\u{0334}\u{0BD7}",
-        nfc: "\u{0BC6}\u{0334}\u{0BD7}",
-        nfd: "\u{0BC6}\u{0334}\u{0BD7}",
-        nfkc: "\u{0BC6}\u{0334}\u{0BD7}",
-        nfkd: "\u{0BC6}\u{0334}\u{0BD7}",
-    },
-    NormalizationTest {
-        source: "\u{0BC7}\u{0334}\u{0BBE}",
-        nfc: "\u{0BC7}\u{0334}\u{0BBE}",
-        nfd: "\u{0BC7}\u{0334}\u{0BBE}",
-        nfkc: "\u{0BC7}\u{0334}\u{0BBE}",
-        nfkd: "\u{0BC7}\u{0334}\u{0BBE}",
-    },
-    NormalizationTest {
-        source: "\u{0CBF}\u{0334}\u{0CD5}",
-        nfc: "\u{0CBF}\u{0334}\u{0CD5}",
-        nfd: "\u{0CBF}\u{0334}\u{0CD5}",
-        nfkc: "\u{0CBF}\u{0334}\u{0CD5}",
-        nfkd: "\u{0CBF}\u{0334}\u{0CD5}",
-    },
-    NormalizationTest {
-        source: "\u{0CC6}\u{0334}\u{0CC2}",
-        nfc: "\u{0CC6}\u{0334}\u{0CC2}",
-        nfd: "\u{0CC6}\u{0334}\u{0CC2}",
-        nfkc: "\u{0CC6}\u{0334}\u{0CC2}",
-        nfkd: "\u{0CC6}\u{0334}\u{0CC2}",
-    },
-    NormalizationTest {
-        source: "\u{0CC6}\u{0334}\u{0CD5}",
-        nfc: "\u{0CC6}\u{0334}\u{0CD5}",
-        nfd: "\u{0CC6}\u{0334}\u{0CD5}",
-        nfkc: "\u{0CC6}\u{0334}\u{0CD5}",
-        nfkd: "\u{0CC6}\u{0334}\u{0CD5}",
-    },
-    NormalizationTest {
-        source: "\u{0CC6}\u{0334}\u{0CD6}",
-        nfc: "\u{0CC6}\u{0334}\u{0CD6}",
-        nfd: "\u{0CC6}\u{0334}\u{0CD6}",
-        nfkc: "\u{0CC6}\u{0334}\u{0CD6}",
-        nfkd: "\u{0CC6}\u{0334}\u{0CD6}",
-    },
-    NormalizationTest {
-        source: "\u{0CCA}\u{0334}\u{0CD5}",
-        nfc: "\u{0CCA}\u{0334}\u{0CD5}",
-        nfd: "\u{0CC6}\u{0CC2}\u{0334}\u{0CD5}",
-        nfkc: "\u{0CCA}\u{0334}\u{0CD5}",
-        nfkd: "\u{0CC6}\u{0CC2}\u{0334}\u{0CD5}",
-    },
-    NormalizationTest {
-        source: "\u{0D46}\u{0334}\u{0D3E}",
-        nfc: "\u{0D46}\u{0334}\u{0D3E}",
-        nfd: "\u{0D46}\u{0334}\u{0D3E}",
-        nfkc: "\u{0D46}\u{0334}\u{0D3E}",
-        nfkd: "\u{0D46}\u{0334}\u{0D3E}",
-    },
-    NormalizationTest {
-        source: "\u{0D46}\u{0334}\u{0D57}",
-        nfc: "\u{0D46}\u{0334}\u{0D57}",
-        nfd: "\u{0D46}\u{0334}\u{0D57}",
-        nfkc: "\u{0D46}\u{0334}\u{0D57}",
-        nfkd: "\u{0D46}\u{0334}\u{0D57}",
-    },
-    NormalizationTest {
-        source: "\u{0D47}\u{0334}\u{0D3E}",
-        nfc: "\u{0D47}\u{0334}\u{0D3E}",
-        nfd: "\u{0D47}\u{0334}\u{0D3E}",
-        nfkc: "\u{0D47}\u{0334}\u{0D3E}",
-        nfkd: "\u{0D47}\u{0334}\u{0D3E}",
-    },
-    NormalizationTest {
-        source: "\u{0DD9}\u{0334}\u{0DCF}",
-        nfc: "\u{0DD9}\u{0334}\u{0DCF}",
-        nfd: "\u{0DD9}\u{0334}\u{0DCF}",
-        nfkc: "\u{0DD9}\u{0334}\u{0DCF}",
-        nfkd: "\u{0DD9}\u{0334}\u{0DCF}",
-    },
-    NormalizationTest {
-        source: "\u{0DD9}\u{0334}\u{0DDF}",
-        nfc: "\u{0DD9}\u{0334}\u{0DDF}",
-        nfd: "\u{0DD9}\u{0334}\u{0DDF}",
-        nfkc: "\u{0DD9}\u{0334}\u{0DDF}",
-        nfkd: "\u{0DD9}\u{0334}\u{0DDF}",
-    },
-    NormalizationTest {
-        source: "\u{0F40}\u{0334}\u{0FB5}",
-        nfc: "\u{0F40}\u{0334}\u{0FB5}",
-        nfd: "\u{0F40}\u{0334}\u{0FB5}",
-        nfkc: "\u{0F40}\u{0334}\u{0FB5}",
-        nfkd: "\u{0F40}\u{0334}\u{0FB5}",
-    },
-    NormalizationTest {
-        source: "\u{0F42}\u{0334}\u{0FB7}",
-        nfc: "\u{0F42}\u{0334}\u{0FB7}",
-        nfd: "\u{0F42}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F42}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F42}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F4C}\u{0334}\u{0FB7}",
-        nfc: "\u{0F4C}\u{0334}\u{0FB7}",
-        nfd: "\u{0F4C}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F4C}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F4C}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F51}\u{0334}\u{0FB7}",
-        nfc: "\u{0F51}\u{0334}\u{0FB7}",
-        nfd: "\u{0F51}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F51}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F51}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F56}\u{0334}\u{0FB7}",
-        nfc: "\u{0F56}\u{0334}\u{0FB7}",
-        nfd: "\u{0F56}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F56}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F56}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F5B}\u{0334}\u{0FB7}",
-        nfc: "\u{0F5B}\u{0334}\u{0FB7}",
-        nfd: "\u{0F5B}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F5B}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F5B}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F90}\u{0334}\u{0FB5}",
-        nfc: "\u{0F90}\u{0334}\u{0FB5}",
-        nfd: "\u{0F90}\u{0334}\u{0FB5}",
-        nfkc: "\u{0F90}\u{0334}\u{0FB5}",
-        nfkd: "\u{0F90}\u{0334}\u{0FB5}",
-    },
-    NormalizationTest {
-        source: "\u{0F92}\u{0334}\u{0FB7}",
-        nfc: "\u{0F92}\u{0334}\u{0FB7}",
-        nfd: "\u{0F92}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F92}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F92}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0F9C}\u{0334}\u{0FB7}",
-        nfc: "\u{0F9C}\u{0334}\u{0FB7}",
-        nfd: "\u{0F9C}\u{0334}\u{0FB7}",
-        nfkc: "\u{0F9C}\u{0334}\u{0FB7}",
-        nfkd: "\u{0F9C}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FA1}\u{0334}\u{0FB7}",
-        nfc: "\u{0FA1}\u{0334}\u{0FB7}",
-        nfd: "\u{0FA1}\u{0334}\u{0FB7}",
-        nfkc: "\u{0FA1}\u{0334}\u{0FB7}",
-        nfkd: "\u{0FA1}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FA6}\u{0334}\u{0FB7}",
-        nfc: "\u{0FA6}\u{0334}\u{0FB7}",
-        nfd: "\u{0FA6}\u{0334}\u{0FB7}",
-        nfkc: "\u{0FA6}\u{0334}\u{0FB7}",
-        nfkd: "\u{0FA6}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{0FAB}\u{0334}\u{0FB7}",
-        nfc: "\u{0FAB}\u{0334}\u{0FB7}",
-        nfd: "\u{0FAB}\u{0334}\u{0FB7}",
-        nfkc: "\u{0FAB}\u{0334}\u{0FB7}",
-        nfkd: "\u{0FAB}\u{0334}\u{0FB7}",
-    },
-    NormalizationTest {
-        source: "\u{1025}\u{0334}\u{102E}",
-        nfc: "\u{1025}\u{0334}\u{102E}",
-        nfd: "\u{1025}\u{0334}\u{102E}",
-        nfkc: "\u{1025}\u{0334}\u{102E}",
-        nfkd: "\u{1025}\u{0334}\u{102E}",
-    },
-    NormalizationTest {
-        source: "\u{1100}\u{0334}\u{1161}",
-        nfc: "\u{1100}\u{0334}\u{1161}",
-        nfd: "\u{1100}\u{0334}\u{1161}",
-        nfkc: "\u{1100}\u{0334}\u{1161}",
-        nfkd: "\u{1100}\u{0334}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{1100}\u{0334}\u{116E}",
-        nfc: "\u{1100}\u{0334}\u{116E}",
-        nfd: "\u{1100}\u{0334}\u{116E}",
-        nfkc: "\u{1100}\u{0334}\u{116E}",
-        nfkd: "\u{1100}\u{0334}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{1101}\u{0334}\u{1166}",
-        nfc: "\u{1101}\u{0334}\u{1166}",
-        nfd: "\u{1101}\u{0334}\u{1166}",
-        nfkc: "\u{1101}\u{0334}\u{1166}",
-        nfkd: "\u{1101}\u{0334}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{1101}\u{0334}\u{1173}",
-        nfc: "\u{1101}\u{0334}\u{1173}",
-        nfd: "\u{1101}\u{0334}\u{1173}",
-        nfkc: "\u{1101}\u{0334}\u{1173}",
-        nfkd: "\u{1101}\u{0334}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{1102}\u{0334}\u{116B}",
-        nfc: "\u{1102}\u{0334}\u{116B}",
-        nfd: "\u{1102}\u{0334}\u{116B}",
-        nfkc: "\u{1102}\u{0334}\u{116B}",
-        nfkd: "\u{1102}\u{0334}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{1103}\u{0334}\u{1163}",
-        nfc: "\u{1103}\u{0334}\u{1163}",
-        nfd: "\u{1103}\u{0334}\u{1163}",
-        nfkc: "\u{1103}\u{0334}\u{1163}",
-        nfkd: "\u{1103}\u{0334}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{1103}\u{0334}\u{1170}",
-        nfc: "\u{1103}\u{0334}\u{1170}",
-        nfd: "\u{1103}\u{0334}\u{1170}",
-        nfkc: "\u{1103}\u{0334}\u{1170}",
-        nfkd: "\u{1103}\u{0334}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{1104}\u{0334}\u{1168}",
-        nfc: "\u{1104}\u{0334}\u{1168}",
-        nfd: "\u{1104}\u{0334}\u{1168}",
-        nfkc: "\u{1104}\u{0334}\u{1168}",
-        nfkd: "\u{1104}\u{0334}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{1104}\u{0334}\u{1175}",
-        nfc: "\u{1104}\u{0334}\u{1175}",
-        nfd: "\u{1104}\u{0334}\u{1175}",
-        nfkc: "\u{1104}\u{0334}\u{1175}",
-        nfkd: "\u{1104}\u{0334}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{1105}\u{0334}\u{116D}",
-        nfc: "\u{1105}\u{0334}\u{116D}",
-        nfd: "\u{1105}\u{0334}\u{116D}",
-        nfkc: "\u{1105}\u{0334}\u{116D}",
-        nfkd: "\u{1105}\u{0334}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{1106}\u{0334}\u{1165}",
-        nfc: "\u{1106}\u{0334}\u{1165}",
-        nfd: "\u{1106}\u{0334}\u{1165}",
-        nfkc: "\u{1106}\u{0334}\u{1165}",
-        nfkd: "\u{1106}\u{0334}\u{1165}",
-    },
-    NormalizationTest {
-        source: "\u{1106}\u{0334}\u{1172}",
-        nfc: "\u{1106}\u{0334}\u{1172}",
-        nfd: "\u{1106}\u{0334}\u{1172}",
-        nfkc: "\u{1106}\u{0334}\u{1172}",
-        nfkd: "\u{1106}\u{0334}\u{1172}",
-    },
-    NormalizationTest {
-        source: "\u{1107}\u{0334}\u{116A}",
-        nfc: "\u{1107}\u{0334}\u{116A}",
-        nfd: "\u{1107}\u{0334}\u{116A}",
-        nfkc: "\u{1107}\u{0334}\u{116A}",
-        nfkd: "\u{1107}\u{0334}\u{116A}",
-    },
-    NormalizationTest {
-        source: "\u{1108}\u{0334}\u{1162}",
-        nfc: "\u{1108}\u{0334}\u{1162}",
-        nfd: "\u{1108}\u{0334}\u{1162}",
-        nfkc: "\u{1108}\u{0334}\u{1162}",
-        nfkd: "\u{1108}\u{0334}\u{1162}",
-    },
-    NormalizationTest {
-        source: "\u{1108}\u{0334}\u{116F}",
-        nfc: "\u{1108}\u{0334}\u{116F}",
-        nfd: "\u{1108}\u{0334}\u{116F}",
-        nfkc: "\u{1108}\u{0334}\u{116F}",
-        nfkd: "\u{1108}\u{0334}\u{116F}",
-    },
-    NormalizationTest {
-        source: "\u{1109}\u{0334}\u{1167}",
-        nfc: "\u{1109}\u{0334}\u{1167}",
-        nfd: "\u{1109}\u{0334}\u{1167}",
-        nfkc: "\u{1109}\u{0334}\u{1167}",
-        nfkd: "\u{1109}\u{0334}\u{1167}",
-    },
-    NormalizationTest {
-        source: "\u{1109}\u{0334}\u{1174}",
-        nfc: "\u{1109}\u{0334}\u{1174}",
-        nfd: "\u{1109}\u{0334}\u{1174}",
-        nfkc: "\u{1109}\u{0334}\u{1174}",
-        nfkd: "\u{1109}\u{0334}\u{1174}",
-    },
-    NormalizationTest {
-        source: "\u{110A}\u{0334}\u{116C}",
-        nfc: "\u{110A}\u{0334}\u{116C}",
-        nfd: "\u{110A}\u{0334}\u{116C}",
-        nfkc: "\u{110A}\u{0334}\u{116C}",
-        nfkd: "\u{110A}\u{0334}\u{116C}",
-    },
-    NormalizationTest {
-        source: "\u{110B}\u{0334}\u{1164}",
-        nfc: "\u{110B}\u{0334}\u{1164}",
-        nfd: "\u{110B}\u{0334}\u{1164}",
-        nfkc: "\u{110B}\u{0334}\u{1164}",
-        nfkd: "\u{110B}\u{0334}\u{1164}",
-    },
-    NormalizationTest {
-        source: "\u{110B}\u{0334}\u{1171}",
-        nfc: "\u{110B}\u{0334}\u{1171}",
-        nfd: "\u{110B}\u{0334}\u{1171}",
-        nfkc: "\u{110B}\u{0334}\u{1171}",
-        nfkd: "\u{110B}\u{0334}\u{1171}",
-    },
-    NormalizationTest {
-        source: "\u{110C}\u{0334}\u{1169}",
-        nfc: "\u{110C}\u{0334}\u{1169}",
-        nfd: "\u{110C}\u{0334}\u{1169}",
-        nfkc: "\u{110C}\u{0334}\u{1169}",
-        nfkd: "\u{110C}\u{0334}\u{1169}",
-    },
-    NormalizationTest {
-        source: "\u{110D}\u{0334}\u{1161}",
-        nfc: "\u{110D}\u{0334}\u{1161}",
-        nfd: "\u{110D}\u{0334}\u{1161}",
-        nfkc: "\u{110D}\u{0334}\u{1161}",
-        nfkd: "\u{110D}\u{0334}\u{1161}",
-    },
-    NormalizationTest {
-        source: "\u{110D}\u{0334}\u{116E}",
-        nfc: "\u{110D}\u{0334}\u{116E}",
-        nfd: "\u{110D}\u{0334}\u{116E}",
-        nfkc: "\u{110D}\u{0334}\u{116E}",
-        nfkd: "\u{110D}\u{0334}\u{116E}",
-    },
-    NormalizationTest {
-        source: "\u{110E}\u{0334}\u{1166}",
-        nfc: "\u{110E}\u{0334}\u{1166}",
-        nfd: "\u{110E}\u{0334}\u{1166}",
-        nfkc: "\u{110E}\u{0334}\u{1166}",
-        nfkd: "\u{110E}\u{0334}\u{1166}",
-    },
-    NormalizationTest {
-        source: "\u{110E}\u{0334}\u{1173}",
-        nfc: "\u{110E}\u{0334}\u{1173}",
-        nfd: "\u{110E}\u{0334}\u{1173}",
-        nfkc: "\u{110E}\u{0334}\u{1173}",
-        nfkd: "\u{110E}\u{0334}\u{1173}",
-    },
-    NormalizationTest {
-        source: "\u{110F}\u{0334}\u{116B}",
-        nfc: "\u{110F}\u{0334}\u{116B}",
-        nfd: "\u{110F}\u{0334}\u{116B}",
-        nfkc: "\u{110F}\u{0334}\u{116B}",
-        nfkd: "\u{110F}\u{0334}\u{116B}",
-    },
-    NormalizationTest {
-        source: "\u{1110}\u{0334}\u{1163}",
-        nfc: "\u{1110}\u{0334}\u{1163}",
-        nfd: "\u{1110}\u{0334}\u{1163}",
-        nfkc: "\u{1110}\u{0334}\u{1163}",
-        nfkd: "\u{1110}\u{0334}\u{1163}",
-    },
-    NormalizationTest {
-        source: "\u{1110}\u{0334}\u{1170}",
-        nfc: "\u{1110}\u{0334}\u{1170}",
-        nfd: "\u{1110}\u{0334}\u{1170}",
-        nfkc: "\u{1110}\u{0334}\u{1170}",
-        nfkd: "\u{1110}\u{0334}\u{1170}",
-    },
-    NormalizationTest {
-        source: "\u{1111}\u{0334}\u{1168}",
-        nfc: "\u{1111}\u{0334}\u{1168}",
-        nfd: "\u{1111}\u{0334}\u{1168}",
-        nfkc: "\u{1111}\u{0334}\u{1168}",
-        nfkd: "\u{1111}\u{0334}\u{1168}",
-    },
-    NormalizationTest {
-        source: "\u{1111}\u{0334}\u{1175}",
-        nfc: "\u{1111}\u{0334}\u{1175}",
-        nfd: "\u{1111}\u{0334}\u{1175}",
-        nfkc: "\u{1111}\u{0334}\u{1175}",
-        nfkd: "\u{1111}\u{0334}\u{1175}",
-    },
-    NormalizationTest {
-        source: "\u{1112}\u{0334}\u{116D}",
-        nfc: "\u{1112}\u{0334}\u{116D}",
-        nfd: "\u{1112}\u{0334}\u{116D}",
-        nfkc: "\u{1112}\u{0334}\u{116D}",
-        nfkd: "\u{1112}\u{0334}\u{116D}",
-    },
-    NormalizationTest {
-        source: "\u{1B05}\u{0334}\u{1B35}",
-        nfc: "\u{1B05}\u{0334}\u{1B35}",
-        nfd: "\u{1B05}\u{0334}\u{1B35}",
-        nfkc: "\u{1B05}\u{0334}\u{1B35}",
-        nfkd: "\u{1B05}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B07}\u{0334}\u{1B35}",
-        nfc: "\u{1B07}\u{0334}\u{1B35}",
-        nfd: "\u{1B07}\u{0334}\u{1B35}",
-        nfkc: "\u{1B07}\u{0334}\u{1B35}",
-        nfkd: "\u{1B07}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B09}\u{0334}\u{1B35}",
-        nfc: "\u{1B09}\u{0334}\u{1B35}",
-        nfd: "\u{1B09}\u{0334}\u{1B35}",
-        nfkc: "\u{1B09}\u{0334}\u{1B35}",
-        nfkd: "\u{1B09}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B0B}\u{0334}\u{1B35}",
-        nfc: "\u{1B0B}\u{0334}\u{1B35}",
-        nfd: "\u{1B0B}\u{0334}\u{1B35}",
-        nfkc: "\u{1B0B}\u{0334}\u{1B35}",
-        nfkd: "\u{1B0B}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B0D}\u{0334}\u{1B35}",
-        nfc: "\u{1B0D}\u{0334}\u{1B35}",
-        nfd: "\u{1B0D}\u{0334}\u{1B35}",
-        nfkc: "\u{1B0D}\u{0334}\u{1B35}",
-        nfkd: "\u{1B0D}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B11}\u{0334}\u{1B35}",
-        nfc: "\u{1B11}\u{0334}\u{1B35}",
-        nfd: "\u{1B11}\u{0334}\u{1B35}",
-        nfkc: "\u{1B11}\u{0334}\u{1B35}",
-        nfkd: "\u{1B11}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B3A}\u{0334}\u{1B35}",
-        nfc: "\u{1B3A}\u{0334}\u{1B35}",
-        nfd: "\u{1B3A}\u{0334}\u{1B35}",
-        nfkc: "\u{1B3A}\u{0334}\u{1B35}",
-        nfkd: "\u{1B3A}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B3C}\u{0334}\u{1B35}",
-        nfc: "\u{1B3C}\u{0334}\u{1B35}",
-        nfd: "\u{1B3C}\u{0334}\u{1B35}",
-        nfkc: "\u{1B3C}\u{0334}\u{1B35}",
-        nfkd: "\u{1B3C}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B3E}\u{0334}\u{1B35}",
-        nfc: "\u{1B3E}\u{0334}\u{1B35}",
-        nfd: "\u{1B3E}\u{0334}\u{1B35}",
-        nfkc: "\u{1B3E}\u{0334}\u{1B35}",
-        nfkd: "\u{1B3E}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B3F}\u{0334}\u{1B35}",
-        nfc: "\u{1B3F}\u{0334}\u{1B35}",
-        nfd: "\u{1B3F}\u{0334}\u{1B35}",
-        nfkc: "\u{1B3F}\u{0334}\u{1B35}",
-        nfkd: "\u{1B3F}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{1B42}\u{0334}\u{1B35}",
-        nfc: "\u{1B42}\u{0334}\u{1B35}",
-        nfd: "\u{1B42}\u{0334}\u{1B35}",
-        nfkc: "\u{1B42}\u{0334}\u{1B35}",
-        nfkd: "\u{1B42}\u{0334}\u{1B35}",
-    },
-    NormalizationTest {
-        source: "\u{AC54}\u{0334}\u{11AE}",
-        nfc: "\u{AC54}\u{0334}\u{11AE}",
-        nfd: "\u{1100}\u{1164}\u{0334}\u{11AE}",
-        nfkc: "\u{AC54}\u{0334}\u{11AE}",
-        nfkd: "\u{1100}\u{1164}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{ACA8}\u{0334}\u{11B5}",
-        nfc: "\u{ACA8}\u{0334}\u{11B5}",
-        nfd: "\u{1100}\u{1167}\u{0334}\u{11B5}",
-        nfkc: "\u{ACA8}\u{0334}\u{11B5}",
-        nfkd: "\u{1100}\u{1167}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{ACFC}\u{0334}\u{11BC}",
-        nfc: "\u{ACFC}\u{0334}\u{11BC}",
-        nfd: "\u{1100}\u{116A}\u{0334}\u{11BC}",
-        nfkc: "\u{ACFC}\u{0334}\u{11BC}",
-        nfkd: "\u{1100}\u{116A}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{ADC0}\u{0334}\u{11AE}",
-        nfc: "\u{ADC0}\u{0334}\u{11AE}",
-        nfd: "\u{1100}\u{1171}\u{0334}\u{11AE}",
-        nfkc: "\u{ADC0}\u{0334}\u{11AE}",
-        nfkd: "\u{1100}\u{1171}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AE14}\u{0334}\u{11B5}",
-        nfc: "\u{AE14}\u{0334}\u{11B5}",
-        nfd: "\u{1100}\u{1174}\u{0334}\u{11B5}",
-        nfkc: "\u{AE14}\u{0334}\u{11B5}",
-        nfkd: "\u{1100}\u{1174}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AE68}\u{0334}\u{11BC}",
-        nfc: "\u{AE68}\u{0334}\u{11BC}",
-        nfd: "\u{1101}\u{1162}\u{0334}\u{11BC}",
-        nfkc: "\u{AE68}\u{0334}\u{11BC}",
-        nfkd: "\u{1101}\u{1162}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{AF2C}\u{0334}\u{11AE}",
-        nfc: "\u{AF2C}\u{0334}\u{11AE}",
-        nfd: "\u{1101}\u{1169}\u{0334}\u{11AE}",
-        nfkc: "\u{AF2C}\u{0334}\u{11AE}",
-        nfkd: "\u{1101}\u{1169}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{AF80}\u{0334}\u{11B5}",
-        nfc: "\u{AF80}\u{0334}\u{11B5}",
-        nfd: "\u{1101}\u{116C}\u{0334}\u{11B5}",
-        nfkc: "\u{AF80}\u{0334}\u{11B5}",
-        nfkd: "\u{1101}\u{116C}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{AFD4}\u{0334}\u{11BC}",
-        nfc: "\u{AFD4}\u{0334}\u{11BC}",
-        nfd: "\u{1101}\u{116F}\u{0334}\u{11BC}",
-        nfkc: "\u{AFD4}\u{0334}\u{11BC}",
-        nfkd: "\u{1101}\u{116F}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B098}\u{0334}\u{11AE}",
-        nfc: "\u{B098}\u{0334}\u{11AE}",
-        nfd: "\u{1102}\u{1161}\u{0334}\u{11AE}",
-        nfkc: "\u{B098}\u{0334}\u{11AE}",
-        nfkd: "\u{1102}\u{1161}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B0EC}\u{0334}\u{11B5}",
-        nfc: "\u{B0EC}\u{0334}\u{11B5}",
-        nfd: "\u{1102}\u{1164}\u{0334}\u{11B5}",
-        nfkc: "\u{B0EC}\u{0334}\u{11B5}",
-        nfkd: "\u{1102}\u{1164}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B140}\u{0334}\u{11BC}",
-        nfc: "\u{B140}\u{0334}\u{11BC}",
-        nfd: "\u{1102}\u{1167}\u{0334}\u{11BC}",
-        nfkc: "\u{B140}\u{0334}\u{11BC}",
-        nfkd: "\u{1102}\u{1167}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B204}\u{0334}\u{11AE}",
-        nfc: "\u{B204}\u{0334}\u{11AE}",
-        nfd: "\u{1102}\u{116E}\u{0334}\u{11AE}",
-        nfkc: "\u{B204}\u{0334}\u{11AE}",
-        nfkd: "\u{1102}\u{116E}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B258}\u{0334}\u{11B5}",
-        nfc: "\u{B258}\u{0334}\u{11B5}",
-        nfd: "\u{1102}\u{1171}\u{0334}\u{11B5}",
-        nfkc: "\u{B258}\u{0334}\u{11B5}",
-        nfkd: "\u{1102}\u{1171}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B2AC}\u{0334}\u{11BC}",
-        nfc: "\u{B2AC}\u{0334}\u{11BC}",
-        nfd: "\u{1102}\u{1174}\u{0334}\u{11BC}",
-        nfkc: "\u{B2AC}\u{0334}\u{11BC}",
-        nfkd: "\u{1102}\u{1174}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B370}\u{0334}\u{11AE}",
-        nfc: "\u{B370}\u{0334}\u{11AE}",
-        nfd: "\u{1103}\u{1166}\u{0334}\u{11AE}",
-        nfkc: "\u{B370}\u{0334}\u{11AE}",
-        nfkd: "\u{1103}\u{1166}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B3C4}\u{0334}\u{11B5}",
-        nfc: "\u{B3C4}\u{0334}\u{11B5}",
-        nfd: "\u{1103}\u{1169}\u{0334}\u{11B5}",
-        nfkc: "\u{B3C4}\u{0334}\u{11B5}",
-        nfkd: "\u{1103}\u{1169}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B418}\u{0334}\u{11BC}",
-        nfc: "\u{B418}\u{0334}\u{11BC}",
-        nfd: "\u{1103}\u{116C}\u{0334}\u{11BC}",
-        nfkc: "\u{B418}\u{0334}\u{11BC}",
-        nfkd: "\u{1103}\u{116C}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B4DC}\u{0334}\u{11AE}",
-        nfc: "\u{B4DC}\u{0334}\u{11AE}",
-        nfd: "\u{1103}\u{1173}\u{0334}\u{11AE}",
-        nfkc: "\u{B4DC}\u{0334}\u{11AE}",
-        nfkd: "\u{1103}\u{1173}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B530}\u{0334}\u{11B5}",
-        nfc: "\u{B530}\u{0334}\u{11B5}",
-        nfd: "\u{1104}\u{1161}\u{0334}\u{11B5}",
-        nfkc: "\u{B530}\u{0334}\u{11B5}",
-        nfkd: "\u{1104}\u{1161}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B584}\u{0334}\u{11BC}",
-        nfc: "\u{B584}\u{0334}\u{11BC}",
-        nfd: "\u{1104}\u{1164}\u{0334}\u{11BC}",
-        nfkc: "\u{B584}\u{0334}\u{11BC}",
-        nfkd: "\u{1104}\u{1164}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B648}\u{0334}\u{11AE}",
-        nfc: "\u{B648}\u{0334}\u{11AE}",
-        nfd: "\u{1104}\u{116B}\u{0334}\u{11AE}",
-        nfkc: "\u{B648}\u{0334}\u{11AE}",
-        nfkd: "\u{1104}\u{116B}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B69C}\u{0334}\u{11B5}",
-        nfc: "\u{B69C}\u{0334}\u{11B5}",
-        nfd: "\u{1104}\u{116E}\u{0334}\u{11B5}",
-        nfkc: "\u{B69C}\u{0334}\u{11B5}",
-        nfkd: "\u{1104}\u{116E}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B6F0}\u{0334}\u{11BC}",
-        nfc: "\u{B6F0}\u{0334}\u{11BC}",
-        nfd: "\u{1104}\u{1171}\u{0334}\u{11BC}",
-        nfkc: "\u{B6F0}\u{0334}\u{11BC}",
-        nfkd: "\u{1104}\u{1171}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B7B4}\u{0334}\u{11AE}",
-        nfc: "\u{B7B4}\u{0334}\u{11AE}",
-        nfd: "\u{1105}\u{1163}\u{0334}\u{11AE}",
-        nfkc: "\u{B7B4}\u{0334}\u{11AE}",
-        nfkd: "\u{1105}\u{1163}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B808}\u{0334}\u{11B5}",
-        nfc: "\u{B808}\u{0334}\u{11B5}",
-        nfd: "\u{1105}\u{1166}\u{0334}\u{11B5}",
-        nfkc: "\u{B808}\u{0334}\u{11B5}",
-        nfkd: "\u{1105}\u{1166}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B85C}\u{0334}\u{11BC}",
-        nfc: "\u{B85C}\u{0334}\u{11BC}",
-        nfd: "\u{1105}\u{1169}\u{0334}\u{11BC}",
-        nfkc: "\u{B85C}\u{0334}\u{11BC}",
-        nfkd: "\u{1105}\u{1169}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{B920}\u{0334}\u{11AE}",
-        nfc: "\u{B920}\u{0334}\u{11AE}",
-        nfd: "\u{1105}\u{1170}\u{0334}\u{11AE}",
-        nfkc: "\u{B920}\u{0334}\u{11AE}",
-        nfkd: "\u{1105}\u{1170}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{B974}\u{0334}\u{11B5}",
-        nfc: "\u{B974}\u{0334}\u{11B5}",
-        nfd: "\u{1105}\u{1173}\u{0334}\u{11B5}",
-        nfkc: "\u{B974}\u{0334}\u{11B5}",
-        nfkd: "\u{1105}\u{1173}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{B9C8}\u{0334}\u{11BC}",
-        nfc: "\u{B9C8}\u{0334}\u{11BC}",
-        nfd: "\u{1106}\u{1161}\u{0334}\u{11BC}",
-        nfkc: "\u{B9C8}\u{0334}\u{11BC}",
-        nfkd: "\u{1106}\u{1161}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BA8C}\u{0334}\u{11AE}",
-        nfc: "\u{BA8C}\u{0334}\u{11AE}",
-        nfd: "\u{1106}\u{1168}\u{0334}\u{11AE}",
-        nfkc: "\u{BA8C}\u{0334}\u{11AE}",
-        nfkd: "\u{1106}\u{1168}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BAE0}\u{0334}\u{11B5}",
-        nfc: "\u{BAE0}\u{0334}\u{11B5}",
-        nfd: "\u{1106}\u{116B}\u{0334}\u{11B5}",
-        nfkc: "\u{BAE0}\u{0334}\u{11B5}",
-        nfkd: "\u{1106}\u{116B}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BB34}\u{0334}\u{11BC}",
-        nfc: "\u{BB34}\u{0334}\u{11BC}",
-        nfd: "\u{1106}\u{116E}\u{0334}\u{11BC}",
-        nfkc: "\u{BB34}\u{0334}\u{11BC}",
-        nfkd: "\u{1106}\u{116E}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BBF8}\u{0334}\u{11AE}",
-        nfc: "\u{BBF8}\u{0334}\u{11AE}",
-        nfd: "\u{1106}\u{1175}\u{0334}\u{11AE}",
-        nfkc: "\u{BBF8}\u{0334}\u{11AE}",
-        nfkd: "\u{1106}\u{1175}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BC4C}\u{0334}\u{11B5}",
-        nfc: "\u{BC4C}\u{0334}\u{11B5}",
-        nfd: "\u{1107}\u{1163}\u{0334}\u{11B5}",
-        nfkc: "\u{BC4C}\u{0334}\u{11B5}",
-        nfkd: "\u{1107}\u{1163}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BCA0}\u{0334}\u{11BC}",
-        nfc: "\u{BCA0}\u{0334}\u{11BC}",
-        nfd: "\u{1107}\u{1166}\u{0334}\u{11BC}",
-        nfkc: "\u{BCA0}\u{0334}\u{11BC}",
-        nfkd: "\u{1107}\u{1166}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BD64}\u{0334}\u{11AE}",
-        nfc: "\u{BD64}\u{0334}\u{11AE}",
-        nfd: "\u{1107}\u{116D}\u{0334}\u{11AE}",
-        nfkc: "\u{BD64}\u{0334}\u{11AE}",
-        nfkd: "\u{1107}\u{116D}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BDB8}\u{0334}\u{11B5}",
-        nfc: "\u{BDB8}\u{0334}\u{11B5}",
-        nfd: "\u{1107}\u{1170}\u{0334}\u{11B5}",
-        nfkc: "\u{BDB8}\u{0334}\u{11B5}",
-        nfkd: "\u{1107}\u{1170}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BE0C}\u{0334}\u{11BC}",
-        nfc: "\u{BE0C}\u{0334}\u{11BC}",
-        nfd: "\u{1107}\u{1173}\u{0334}\u{11BC}",
-        nfkc: "\u{BE0C}\u{0334}\u{11BC}",
-        nfkd: "\u{1107}\u{1173}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{BED0}\u{0334}\u{11AE}",
-        nfc: "\u{BED0}\u{0334}\u{11AE}",
-        nfd: "\u{1108}\u{1165}\u{0334}\u{11AE}",
-        nfkc: "\u{BED0}\u{0334}\u{11AE}",
-        nfkd: "\u{1108}\u{1165}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{BF24}\u{0334}\u{11B5}",
-        nfc: "\u{BF24}\u{0334}\u{11B5}",
-        nfd: "\u{1108}\u{1168}\u{0334}\u{11B5}",
-        nfkc: "\u{BF24}\u{0334}\u{11B5}",
-        nfkd: "\u{1108}\u{1168}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{BF78}\u{0334}\u{11BC}",
-        nfc: "\u{BF78}\u{0334}\u{11BC}",
-        nfd: "\u{1108}\u{116B}\u{0334}\u{11BC}",
-        nfkc: "\u{BF78}\u{0334}\u{11BC}",
-        nfkd: "\u{1108}\u{116B}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C03C}\u{0334}\u{11AE}",
-        nfc: "\u{C03C}\u{0334}\u{11AE}",
-        nfd: "\u{1108}\u{1172}\u{0334}\u{11AE}",
-        nfkc: "\u{C03C}\u{0334}\u{11AE}",
-        nfkd: "\u{1108}\u{1172}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C090}\u{0334}\u{11B5}",
-        nfc: "\u{C090}\u{0334}\u{11B5}",
-        nfd: "\u{1108}\u{1175}\u{0334}\u{11B5}",
-        nfkc: "\u{C090}\u{0334}\u{11B5}",
-        nfkd: "\u{1108}\u{1175}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C0E4}\u{0334}\u{11BC}",
-        nfc: "\u{C0E4}\u{0334}\u{11BC}",
-        nfd: "\u{1109}\u{1163}\u{0334}\u{11BC}",
-        nfkc: "\u{C0E4}\u{0334}\u{11BC}",
-        nfkd: "\u{1109}\u{1163}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C1A8}\u{0334}\u{11AE}",
-        nfc: "\u{C1A8}\u{0334}\u{11AE}",
-        nfd: "\u{1109}\u{116A}\u{0334}\u{11AE}",
-        nfkc: "\u{C1A8}\u{0334}\u{11AE}",
-        nfkd: "\u{1109}\u{116A}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C1FC}\u{0334}\u{11B5}",
-        nfc: "\u{C1FC}\u{0334}\u{11B5}",
-        nfd: "\u{1109}\u{116D}\u{0334}\u{11B5}",
-        nfkc: "\u{C1FC}\u{0334}\u{11B5}",
-        nfkd: "\u{1109}\u{116D}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C250}\u{0334}\u{11BC}",
-        nfc: "\u{C250}\u{0334}\u{11BC}",
-        nfd: "\u{1109}\u{1170}\u{0334}\u{11BC}",
-        nfkc: "\u{C250}\u{0334}\u{11BC}",
-        nfkd: "\u{1109}\u{1170}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C314}\u{0334}\u{11AE}",
-        nfc: "\u{C314}\u{0334}\u{11AE}",
-        nfd: "\u{110A}\u{1162}\u{0334}\u{11AE}",
-        nfkc: "\u{C314}\u{0334}\u{11AE}",
-        nfkd: "\u{110A}\u{1162}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C368}\u{0334}\u{11B5}",
-        nfc: "\u{C368}\u{0334}\u{11B5}",
-        nfd: "\u{110A}\u{1165}\u{0334}\u{11B5}",
-        nfkc: "\u{C368}\u{0334}\u{11B5}",
-        nfkd: "\u{110A}\u{1165}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C3BC}\u{0334}\u{11BC}",
-        nfc: "\u{C3BC}\u{0334}\u{11BC}",
-        nfd: "\u{110A}\u{1168}\u{0334}\u{11BC}",
-        nfkc: "\u{C3BC}\u{0334}\u{11BC}",
-        nfkd: "\u{110A}\u{1168}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C480}\u{0334}\u{11AE}",
-        nfc: "\u{C480}\u{0334}\u{11AE}",
-        nfd: "\u{110A}\u{116F}\u{0334}\u{11AE}",
-        nfkc: "\u{C480}\u{0334}\u{11AE}",
-        nfkd: "\u{110A}\u{116F}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C4D4}\u{0334}\u{11B5}",
-        nfc: "\u{C4D4}\u{0334}\u{11B5}",
-        nfd: "\u{110A}\u{1172}\u{0334}\u{11B5}",
-        nfkc: "\u{C4D4}\u{0334}\u{11B5}",
-        nfkd: "\u{110A}\u{1172}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C528}\u{0334}\u{11BC}",
-        nfc: "\u{C528}\u{0334}\u{11BC}",
-        nfd: "\u{110A}\u{1175}\u{0334}\u{11BC}",
-        nfkc: "\u{C528}\u{0334}\u{11BC}",
-        nfkd: "\u{110A}\u{1175}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C5EC}\u{0334}\u{11AE}",
-        nfc: "\u{C5EC}\u{0334}\u{11AE}",
-        nfd: "\u{110B}\u{1167}\u{0334}\u{11AE}",
-        nfkc: "\u{C5EC}\u{0334}\u{11AE}",
-        nfkd: "\u{110B}\u{1167}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C640}\u{0334}\u{11B5}",
-        nfc: "\u{C640}\u{0334}\u{11B5}",
-        nfd: "\u{110B}\u{116A}\u{0334}\u{11B5}",
-        nfkc: "\u{C640}\u{0334}\u{11B5}",
-        nfkd: "\u{110B}\u{116A}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C694}\u{0334}\u{11BC}",
-        nfc: "\u{C694}\u{0334}\u{11BC}",
-        nfd: "\u{110B}\u{116D}\u{0334}\u{11BC}",
-        nfkc: "\u{C694}\u{0334}\u{11BC}",
-        nfkd: "\u{110B}\u{116D}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C758}\u{0334}\u{11AE}",
-        nfc: "\u{C758}\u{0334}\u{11AE}",
-        nfd: "\u{110B}\u{1174}\u{0334}\u{11AE}",
-        nfkc: "\u{C758}\u{0334}\u{11AE}",
-        nfkd: "\u{110B}\u{1174}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C7AC}\u{0334}\u{11B5}",
-        nfc: "\u{C7AC}\u{0334}\u{11B5}",
-        nfd: "\u{110C}\u{1162}\u{0334}\u{11B5}",
-        nfkc: "\u{C7AC}\u{0334}\u{11B5}",
-        nfkd: "\u{110C}\u{1162}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C800}\u{0334}\u{11BC}",
-        nfc: "\u{C800}\u{0334}\u{11BC}",
-        nfd: "\u{110C}\u{1165}\u{0334}\u{11BC}",
-        nfkc: "\u{C800}\u{0334}\u{11BC}",
-        nfkd: "\u{110C}\u{1165}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{C8C4}\u{0334}\u{11AE}",
-        nfc: "\u{C8C4}\u{0334}\u{11AE}",
-        nfd: "\u{110C}\u{116C}\u{0334}\u{11AE}",
-        nfkc: "\u{C8C4}\u{0334}\u{11AE}",
-        nfkd: "\u{110C}\u{116C}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{C918}\u{0334}\u{11B5}",
-        nfc: "\u{C918}\u{0334}\u{11B5}",
-        nfd: "\u{110C}\u{116F}\u{0334}\u{11B5}",
-        nfkc: "\u{C918}\u{0334}\u{11B5}",
-        nfkd: "\u{110C}\u{116F}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{C96C}\u{0334}\u{11BC}",
-        nfc: "\u{C96C}\u{0334}\u{11BC}",
-        nfd: "\u{110C}\u{1172}\u{0334}\u{11BC}",
-        nfkc: "\u{C96C}\u{0334}\u{11BC}",
-        nfkd: "\u{110C}\u{1172}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CA30}\u{0334}\u{11AE}",
-        nfc: "\u{CA30}\u{0334}\u{11AE}",
-        nfd: "\u{110D}\u{1164}\u{0334}\u{11AE}",
-        nfkc: "\u{CA30}\u{0334}\u{11AE}",
-        nfkd: "\u{110D}\u{1164}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CA84}\u{0334}\u{11B5}",
-        nfc: "\u{CA84}\u{0334}\u{11B5}",
-        nfd: "\u{110D}\u{1167}\u{0334}\u{11B5}",
-        nfkc: "\u{CA84}\u{0334}\u{11B5}",
-        nfkd: "\u{110D}\u{1167}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CAD8}\u{0334}\u{11BC}",
-        nfc: "\u{CAD8}\u{0334}\u{11BC}",
-        nfd: "\u{110D}\u{116A}\u{0334}\u{11BC}",
-        nfkc: "\u{CAD8}\u{0334}\u{11BC}",
-        nfkd: "\u{110D}\u{116A}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CB9C}\u{0334}\u{11AE}",
-        nfc: "\u{CB9C}\u{0334}\u{11AE}",
-        nfd: "\u{110D}\u{1171}\u{0334}\u{11AE}",
-        nfkc: "\u{CB9C}\u{0334}\u{11AE}",
-        nfkd: "\u{110D}\u{1171}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CBF0}\u{0334}\u{11B5}",
-        nfc: "\u{CBF0}\u{0334}\u{11B5}",
-        nfd: "\u{110D}\u{1174}\u{0334}\u{11B5}",
-        nfkc: "\u{CBF0}\u{0334}\u{11B5}",
-        nfkd: "\u{110D}\u{1174}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CC44}\u{0334}\u{11BC}",
-        nfc: "\u{CC44}\u{0334}\u{11BC}",
-        nfd: "\u{110E}\u{1162}\u{0334}\u{11BC}",
-        nfkc: "\u{CC44}\u{0334}\u{11BC}",
-        nfkd: "\u{110E}\u{1162}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CD08}\u{0334}\u{11AE}",
-        nfc: "\u{CD08}\u{0334}\u{11AE}",
-        nfd: "\u{110E}\u{1169}\u{0334}\u{11AE}",
-        nfkc: "\u{CD08}\u{0334}\u{11AE}",
-        nfkd: "\u{110E}\u{1169}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CD5C}\u{0334}\u{11B5}",
-        nfc: "\u{CD5C}\u{0334}\u{11B5}",
-        nfd: "\u{110E}\u{116C}\u{0334}\u{11B5}",
-        nfkc: "\u{CD5C}\u{0334}\u{11B5}",
-        nfkd: "\u{110E}\u{116C}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CDB0}\u{0334}\u{11BC}",
-        nfc: "\u{CDB0}\u{0334}\u{11BC}",
-        nfd: "\u{110E}\u{116F}\u{0334}\u{11BC}",
-        nfkc: "\u{CDB0}\u{0334}\u{11BC}",
-        nfkd: "\u{110E}\u{116F}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CE74}\u{0334}\u{11AE}",
-        nfc: "\u{CE74}\u{0334}\u{11AE}",
-        nfd: "\u{110F}\u{1161}\u{0334}\u{11AE}",
-        nfkc: "\u{CE74}\u{0334}\u{11AE}",
-        nfkd: "\u{110F}\u{1161}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{CEC8}\u{0334}\u{11B5}",
-        nfc: "\u{CEC8}\u{0334}\u{11B5}",
-        nfd: "\u{110F}\u{1164}\u{0334}\u{11B5}",
-        nfkc: "\u{CEC8}\u{0334}\u{11B5}",
-        nfkd: "\u{110F}\u{1164}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{CF1C}\u{0334}\u{11BC}",
-        nfc: "\u{CF1C}\u{0334}\u{11BC}",
-        nfd: "\u{110F}\u{1167}\u{0334}\u{11BC}",
-        nfkc: "\u{CF1C}\u{0334}\u{11BC}",
-        nfkd: "\u{110F}\u{1167}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{CFE0}\u{0334}\u{11AE}",
-        nfc: "\u{CFE0}\u{0334}\u{11AE}",
-        nfd: "\u{110F}\u{116E}\u{0334}\u{11AE}",
-        nfkc: "\u{CFE0}\u{0334}\u{11AE}",
-        nfkd: "\u{110F}\u{116E}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D034}\u{0334}\u{11B5}",
-        nfc: "\u{D034}\u{0334}\u{11B5}",
-        nfd: "\u{110F}\u{1171}\u{0334}\u{11B5}",
-        nfkc: "\u{D034}\u{0334}\u{11B5}",
-        nfkd: "\u{110F}\u{1171}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D088}\u{0334}\u{11BC}",
-        nfc: "\u{D088}\u{0334}\u{11BC}",
-        nfd: "\u{110F}\u{1174}\u{0334}\u{11BC}",
-        nfkc: "\u{D088}\u{0334}\u{11BC}",
-        nfkd: "\u{110F}\u{1174}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D14C}\u{0334}\u{11AE}",
-        nfc: "\u{D14C}\u{0334}\u{11AE}",
-        nfd: "\u{1110}\u{1166}\u{0334}\u{11AE}",
-        nfkc: "\u{D14C}\u{0334}\u{11AE}",
-        nfkd: "\u{1110}\u{1166}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D1A0}\u{0334}\u{11B5}",
-        nfc: "\u{D1A0}\u{0334}\u{11B5}",
-        nfd: "\u{1110}\u{1169}\u{0334}\u{11B5}",
-        nfkc: "\u{D1A0}\u{0334}\u{11B5}",
-        nfkd: "\u{1110}\u{1169}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D1F4}\u{0334}\u{11BC}",
-        nfc: "\u{D1F4}\u{0334}\u{11BC}",
-        nfd: "\u{1110}\u{116C}\u{0334}\u{11BC}",
-        nfkc: "\u{D1F4}\u{0334}\u{11BC}",
-        nfkd: "\u{1110}\u{116C}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D2B8}\u{0334}\u{11AE}",
-        nfc: "\u{D2B8}\u{0334}\u{11AE}",
-        nfd: "\u{1110}\u{1173}\u{0334}\u{11AE}",
-        nfkc: "\u{D2B8}\u{0334}\u{11AE}",
-        nfkd: "\u{1110}\u{1173}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D30C}\u{0334}\u{11B5}",
-        nfc: "\u{D30C}\u{0334}\u{11B5}",
-        nfd: "\u{1111}\u{1161}\u{0334}\u{11B5}",
-        nfkc: "\u{D30C}\u{0334}\u{11B5}",
-        nfkd: "\u{1111}\u{1161}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D360}\u{0334}\u{11BC}",
-        nfc: "\u{D360}\u{0334}\u{11BC}",
-        nfd: "\u{1111}\u{1164}\u{0334}\u{11BC}",
-        nfkc: "\u{D360}\u{0334}\u{11BC}",
-        nfkd: "\u{1111}\u{1164}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D424}\u{0334}\u{11AE}",
-        nfc: "\u{D424}\u{0334}\u{11AE}",
-        nfd: "\u{1111}\u{116B}\u{0334}\u{11AE}",
-        nfkc: "\u{D424}\u{0334}\u{11AE}",
-        nfkd: "\u{1111}\u{116B}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D478}\u{0334}\u{11B5}",
-        nfc: "\u{D478}\u{0334}\u{11B5}",
-        nfd: "\u{1111}\u{116E}\u{0334}\u{11B5}",
-        nfkc: "\u{D478}\u{0334}\u{11B5}",
-        nfkd: "\u{1111}\u{116E}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D4CC}\u{0334}\u{11BC}",
-        nfc: "\u{D4CC}\u{0334}\u{11BC}",
-        nfd: "\u{1111}\u{1171}\u{0334}\u{11BC}",
-        nfkc: "\u{D4CC}\u{0334}\u{11BC}",
-        nfkd: "\u{1111}\u{1171}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D590}\u{0334}\u{11AE}",
-        nfc: "\u{D590}\u{0334}\u{11AE}",
-        nfd: "\u{1112}\u{1163}\u{0334}\u{11AE}",
-        nfkc: "\u{D590}\u{0334}\u{11AE}",
-        nfkd: "\u{1112}\u{1163}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D5E4}\u{0334}\u{11B5}",
-        nfc: "\u{D5E4}\u{0334}\u{11B5}",
-        nfd: "\u{1112}\u{1166}\u{0334}\u{11B5}",
-        nfkc: "\u{D5E4}\u{0334}\u{11B5}",
-        nfkd: "\u{1112}\u{1166}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{D638}\u{0334}\u{11BC}",
-        nfc: "\u{D638}\u{0334}\u{11BC}",
-        nfd: "\u{1112}\u{1169}\u{0334}\u{11BC}",
-        nfkc: "\u{D638}\u{0334}\u{11BC}",
-        nfkd: "\u{1112}\u{1169}\u{0334}\u{11BC}",
-    },
-    NormalizationTest {
-        source: "\u{D6FC}\u{0334}\u{11AE}",
-        nfc: "\u{D6FC}\u{0334}\u{11AE}",
-        nfd: "\u{1112}\u{1170}\u{0334}\u{11AE}",
-        nfkc: "\u{D6FC}\u{0334}\u{11AE}",
-        nfkd: "\u{1112}\u{1170}\u{0334}\u{11AE}",
-    },
-    NormalizationTest {
-        source: "\u{D750}\u{0334}\u{11B5}",
-        nfc: "\u{D750}\u{0334}\u{11B5}",
-        nfd: "\u{1112}\u{1173}\u{0334}\u{11B5}",
-        nfkc: "\u{D750}\u{0334}\u{11B5}",
-        nfkd: "\u{1112}\u{1173}\u{0334}\u{11B5}",
-    },
-    NormalizationTest {
-        source: "\u{11131}\u{0334}\u{11127}",
-        nfc: "\u{11131}\u{0334}\u{11127}",
-        nfd: "\u{11131}\u{0334}\u{11127}",
-        nfkc: "\u{11131}\u{0334}\u{11127}",
-        nfkd: "\u{11131}\u{0334}\u{11127}",
-    },
-    NormalizationTest {
-        source: "\u{11132}\u{0334}\u{11127}",
-        nfc: "\u{11132}\u{0334}\u{11127}",
-        nfd: "\u{11132}\u{0334}\u{11127}",
-        nfkc: "\u{11132}\u{0334}\u{11127}",
-        nfkd: "\u{11132}\u{0334}\u{11127}",
-    },
-    NormalizationTest {
-        source: "\u{11347}\u{0334}\u{1133E}",
-        nfc: "\u{11347}\u{0334}\u{1133E}",
-        nfd: "\u{11347}\u{0334}\u{1133E}",
-        nfkc: "\u{11347}\u{0334}\u{1133E}",
-        nfkd: "\u{11347}\u{0334}\u{1133E}",
-    },
-    NormalizationTest {
-        source: "\u{11347}\u{0334}\u{11357}",
-        nfc: "\u{11347}\u{0334}\u{11357}",
-        nfd: "\u{11347}\u{0334}\u{11357}",
-        nfkc: "\u{11347}\u{0334}\u{11357}",
-        nfkd: "\u{11347}\u{0334}\u{11357}",
-    },
-    NormalizationTest {
-        source: "\u{114B9}\u{0334}\u{114B0}",
-        nfc: "\u{114B9}\u{0334}\u{114B0}",
-        nfd: "\u{114B9}\u{0334}\u{114B0}",
-        nfkc: "\u{114B9}\u{0334}\u{114B0}",
-        nfkd: "\u{114B9}\u{0334}\u{114B0}",
-    },
-    NormalizationTest {
-        source: "\u{114B9}\u{0334}\u{114BA}",
-        nfc: "\u{114B9}\u{0334}\u{114BA}",
-        nfd: "\u{114B9}\u{0334}\u{114BA}",
-        nfkc: "\u{114B9}\u{0334}\u{114BA}",
-        nfkd: "\u{114B9}\u{0334}\u{114BA}",
-    },
-    NormalizationTest {
-        source: "\u{114B9}\u{0334}\u{114BD}",
-        nfc: "\u{114B9}\u{0334}\u{114BD}",
-        nfd: "\u{114B9}\u{0334}\u{114BD}",
-        nfkc: "\u{114B9}\u{0334}\u{114BD}",
-        nfkd: "\u{114B9}\u{0334}\u{114BD}",
-    },
-    NormalizationTest {
-        source: "\u{115B8}\u{0334}\u{115AF}",
-        nfc: "\u{115B8}\u{0334}\u{115AF}",
-        nfd: "\u{115B8}\u{0334}\u{115AF}",
-        nfkc: "\u{115B8}\u{0334}\u{115AF}",
-        nfkd: "\u{115B8}\u{0334}\u{115AF}",
-    },
-    NormalizationTest {
-        source: "\u{115B9}\u{0334}\u{115AF}",
-        nfc: "\u{115B9}\u{0334}\u{115AF}",
-        nfd: "\u{115B9}\u{0334}\u{115AF}",
-        nfkc: "\u{115B9}\u{0334}\u{115AF}",
-        nfkd: "\u{115B9}\u{0334}\u{115AF}",
-    },
-];
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/quick_check.rs cargo-0.33.0/vendor/unicode-normalization/src/quick_check.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/quick_check.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/quick_check.rs	2019-02-06 04:11:58.000000000 +0000
@@ -70,12 +70,25 @@
     quick_check(s, tables::qc_nfc, false)
 }
 
+
+/// Quickly check if a string is in NFKC.
+#[inline]
+pub fn is_nfkc_quick<I: Iterator<Item=char>>(s: I) -> IsNormalized {
+    quick_check(s, tables::qc_nfkc, false)
+}
+
 /// Quickly check if a string is in NFD.
 #[inline]
 pub fn is_nfd_quick<I: Iterator<Item=char>>(s: I) -> IsNormalized {
     quick_check(s, tables::qc_nfd, false)
 }
 
+/// Quickly check if a string is in NFKD.
+#[inline]
+pub fn is_nfkd_quick<I: Iterator<Item=char>>(s: I) -> IsNormalized {
+    quick_check(s, tables::qc_nfkd, false)
+}
+
 /// Quickly check if a string is Stream-Safe NFC.
 #[inline]
 pub fn is_nfc_stream_safe_quick<I: Iterator<Item=char>>(s: I) -> IsNormalized {
@@ -98,6 +111,16 @@
     }
 }
 
+/// Authoritatively check if a string is in NFKC.
+#[inline]
+pub fn is_nfkc(s: &str) -> bool {
+    match is_nfkc_quick(s.chars()) {
+        IsNormalized::Yes => true,
+        IsNormalized::No => false,
+        IsNormalized::Maybe => s.chars().eq(s.chars().nfkc()),
+    }
+}
+
 /// Authoritatively check if a string is in NFD.
 #[inline]
 pub fn is_nfd(s: &str) -> bool {
@@ -108,6 +131,16 @@
     }
 }
 
+/// Authoritatively check if a string is in NFKD.
+#[inline]
+pub fn is_nfkd(s: &str) -> bool {
+    match is_nfkd_quick(s.chars()) {
+        IsNormalized::Yes => true,
+        IsNormalized::No => false,
+        IsNormalized::Maybe => s.chars().eq(s.chars().nfkd()),
+    }
+}
+
 /// Authoritatively check if a string is Stream-Safe NFC.
 #[inline]
 pub fn is_nfc_stream_safe(s: &str) -> bool {
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/recompose.rs cargo-0.33.0/vendor/unicode-normalization/src/recompose.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/recompose.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/recompose.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,15 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::collections::VecDeque;
-use std::fmt::{self, Write};
 use decompose::Decompositions;
+use smallvec::SmallVec;
+use std::fmt::{self, Write};
 
 #[derive(Clone)]
 enum RecompositionState {
     Composing,
-    Purging,
-    Finished
+    Purging(usize),
+    Finished(usize),
 }
 
 /// External iterator for a string recomposition's characters.
@@ -24,9 +24,9 @@
 pub struct Recompositions<I> {
     iter: Decompositions<I>,
     state: RecompositionState,
-    buffer: VecDeque<char>,
+    buffer: SmallVec<[char; 4]>,
     composee: Option<char>,
-    last_ccc: Option<u8>
+    last_ccc: Option<u8>,
 }
 
 #[inline]
@@ -34,7 +34,7 @@
     Recompositions {
         iter: super::decompose::new_canonical(iter),
         state: self::RecompositionState::Composing,
-        buffer: VecDeque::new(),
+        buffer: SmallVec::new(),
         composee: None,
         last_ccc: None,
     }
@@ -45,7 +45,7 @@
     Recompositions {
         iter: super::decompose::new_compatible(iter),
         state: self::RecompositionState::Composing,
-        buffer: VecDeque::new(),
+        buffer: SmallVec::new(),
         composee: None,
         last_ccc: None,
     }
@@ -85,7 +85,7 @@
                                             self.composee = Some(ch);
                                             return Some(k);
                                         }
-                                        self.buffer.push_back(ch);
+                                        self.buffer.push(ch);
                                         self.last_ccc = Some(ch_class);
                                     }
                                 }
@@ -96,10 +96,10 @@
                                     if ch_class == 0 {
                                         self.composee = Some(ch);
                                         self.last_ccc = None;
-                                        self.state = Purging;
+                                        self.state = Purging(0);
                                         return Some(k);
                                     }
-                                    self.buffer.push_back(ch);
+                                    self.buffer.push(ch);
                                     self.last_ccc = Some(ch_class);
                                     continue;
                                 }
@@ -109,28 +109,40 @@
                                         continue;
                                     }
                                     None => {
-                                        self.buffer.push_back(ch);
+                                        self.buffer.push(ch);
                                         self.last_ccc = Some(ch_class);
                                     }
                                 }
                             }
                         }
                     }
-                    self.state = Finished;
+                    self.state = Finished(0);
                     if self.composee.is_some() {
                         return self.composee.take();
                     }
                 }
-                Purging => {
-                    match self.buffer.pop_front() {
-                        None => self.state = Composing,
-                        s => return s
+                Purging(next) => {
+                    match self.buffer.get(next).cloned() {
+                        None => {
+                            self.buffer.clear();
+                            self.state = Composing;
+                        }
+                        s => {
+                            self.state = Purging(next + 1);
+                            return s
+                        }
                     }
                 }
-                Finished => {
-                    match self.buffer.pop_front() {
-                        None => return self.composee.take(),
-                        s => return s
+                Finished(next) => {
+                    match self.buffer.get(next).cloned() {
+                        None => {
+                            self.buffer.clear();
+                            return self.composee.take()
+                        }
+                        s => {
+                            self.state = Finished(next + 1);
+                            return s
+                        }
                     }
                 }
             }
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/tables.rs cargo-0.33.0/vendor/unicode-normalization/src/tables.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/tables.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/tables.rs	2019-02-06 04:11:58.000000000 +0000
@@ -1787,5754 +1787,5754 @@
 
 #[inline]
 pub fn canonical_fully_decomposed(c: char) -> Option<&'static [char]> {
-    match c {
-        '\u{00C0}' => Some(&['\u{0041}', '\u{0300}']),
-        '\u{00C1}' => Some(&['\u{0041}', '\u{0301}']),
-        '\u{00C2}' => Some(&['\u{0041}', '\u{0302}']),
-        '\u{00C3}' => Some(&['\u{0041}', '\u{0303}']),
-        '\u{00C4}' => Some(&['\u{0041}', '\u{0308}']),
-        '\u{00C5}' => Some(&['\u{0041}', '\u{030A}']),
-        '\u{00C7}' => Some(&['\u{0043}', '\u{0327}']),
-        '\u{00C8}' => Some(&['\u{0045}', '\u{0300}']),
-        '\u{00C9}' => Some(&['\u{0045}', '\u{0301}']),
-        '\u{00CA}' => Some(&['\u{0045}', '\u{0302}']),
-        '\u{00CB}' => Some(&['\u{0045}', '\u{0308}']),
-        '\u{00CC}' => Some(&['\u{0049}', '\u{0300}']),
-        '\u{00CD}' => Some(&['\u{0049}', '\u{0301}']),
-        '\u{00CE}' => Some(&['\u{0049}', '\u{0302}']),
-        '\u{00CF}' => Some(&['\u{0049}', '\u{0308}']),
-        '\u{00D1}' => Some(&['\u{004E}', '\u{0303}']),
-        '\u{00D2}' => Some(&['\u{004F}', '\u{0300}']),
-        '\u{00D3}' => Some(&['\u{004F}', '\u{0301}']),
-        '\u{00D4}' => Some(&['\u{004F}', '\u{0302}']),
-        '\u{00D5}' => Some(&['\u{004F}', '\u{0303}']),
-        '\u{00D6}' => Some(&['\u{004F}', '\u{0308}']),
-        '\u{00D9}' => Some(&['\u{0055}', '\u{0300}']),
-        '\u{00DA}' => Some(&['\u{0055}', '\u{0301}']),
-        '\u{00DB}' => Some(&['\u{0055}', '\u{0302}']),
-        '\u{00DC}' => Some(&['\u{0055}', '\u{0308}']),
-        '\u{00DD}' => Some(&['\u{0059}', '\u{0301}']),
-        '\u{00E0}' => Some(&['\u{0061}', '\u{0300}']),
-        '\u{00E1}' => Some(&['\u{0061}', '\u{0301}']),
-        '\u{00E2}' => Some(&['\u{0061}', '\u{0302}']),
-        '\u{00E3}' => Some(&['\u{0061}', '\u{0303}']),
-        '\u{00E4}' => Some(&['\u{0061}', '\u{0308}']),
-        '\u{00E5}' => Some(&['\u{0061}', '\u{030A}']),
-        '\u{00E7}' => Some(&['\u{0063}', '\u{0327}']),
-        '\u{00E8}' => Some(&['\u{0065}', '\u{0300}']),
-        '\u{00E9}' => Some(&['\u{0065}', '\u{0301}']),
-        '\u{00EA}' => Some(&['\u{0065}', '\u{0302}']),
-        '\u{00EB}' => Some(&['\u{0065}', '\u{0308}']),
-        '\u{00EC}' => Some(&['\u{0069}', '\u{0300}']),
-        '\u{00ED}' => Some(&['\u{0069}', '\u{0301}']),
-        '\u{00EE}' => Some(&['\u{0069}', '\u{0302}']),
-        '\u{00EF}' => Some(&['\u{0069}', '\u{0308}']),
-        '\u{00F1}' => Some(&['\u{006E}', '\u{0303}']),
-        '\u{00F2}' => Some(&['\u{006F}', '\u{0300}']),
-        '\u{00F3}' => Some(&['\u{006F}', '\u{0301}']),
-        '\u{00F4}' => Some(&['\u{006F}', '\u{0302}']),
-        '\u{00F5}' => Some(&['\u{006F}', '\u{0303}']),
-        '\u{00F6}' => Some(&['\u{006F}', '\u{0308}']),
-        '\u{00F9}' => Some(&['\u{0075}', '\u{0300}']),
-        '\u{00FA}' => Some(&['\u{0075}', '\u{0301}']),
-        '\u{00FB}' => Some(&['\u{0075}', '\u{0302}']),
-        '\u{00FC}' => Some(&['\u{0075}', '\u{0308}']),
-        '\u{00FD}' => Some(&['\u{0079}', '\u{0301}']),
-        '\u{00FF}' => Some(&['\u{0079}', '\u{0308}']),
-        '\u{0100}' => Some(&['\u{0041}', '\u{0304}']),
-        '\u{0101}' => Some(&['\u{0061}', '\u{0304}']),
-        '\u{0102}' => Some(&['\u{0041}', '\u{0306}']),
-        '\u{0103}' => Some(&['\u{0061}', '\u{0306}']),
-        '\u{0104}' => Some(&['\u{0041}', '\u{0328}']),
-        '\u{0105}' => Some(&['\u{0061}', '\u{0328}']),
-        '\u{0106}' => Some(&['\u{0043}', '\u{0301}']),
-        '\u{0107}' => Some(&['\u{0063}', '\u{0301}']),
-        '\u{0108}' => Some(&['\u{0043}', '\u{0302}']),
-        '\u{0109}' => Some(&['\u{0063}', '\u{0302}']),
-        '\u{010A}' => Some(&['\u{0043}', '\u{0307}']),
-        '\u{010B}' => Some(&['\u{0063}', '\u{0307}']),
-        '\u{010C}' => Some(&['\u{0043}', '\u{030C}']),
-        '\u{010D}' => Some(&['\u{0063}', '\u{030C}']),
-        '\u{010E}' => Some(&['\u{0044}', '\u{030C}']),
-        '\u{010F}' => Some(&['\u{0064}', '\u{030C}']),
-        '\u{0112}' => Some(&['\u{0045}', '\u{0304}']),
-        '\u{0113}' => Some(&['\u{0065}', '\u{0304}']),
-        '\u{0114}' => Some(&['\u{0045}', '\u{0306}']),
-        '\u{0115}' => Some(&['\u{0065}', '\u{0306}']),
-        '\u{0116}' => Some(&['\u{0045}', '\u{0307}']),
-        '\u{0117}' => Some(&['\u{0065}', '\u{0307}']),
-        '\u{0118}' => Some(&['\u{0045}', '\u{0328}']),
-        '\u{0119}' => Some(&['\u{0065}', '\u{0328}']),
-        '\u{011A}' => Some(&['\u{0045}', '\u{030C}']),
-        '\u{011B}' => Some(&['\u{0065}', '\u{030C}']),
-        '\u{011C}' => Some(&['\u{0047}', '\u{0302}']),
-        '\u{011D}' => Some(&['\u{0067}', '\u{0302}']),
-        '\u{011E}' => Some(&['\u{0047}', '\u{0306}']),
-        '\u{011F}' => Some(&['\u{0067}', '\u{0306}']),
-        '\u{0120}' => Some(&['\u{0047}', '\u{0307}']),
-        '\u{0121}' => Some(&['\u{0067}', '\u{0307}']),
-        '\u{0122}' => Some(&['\u{0047}', '\u{0327}']),
-        '\u{0123}' => Some(&['\u{0067}', '\u{0327}']),
-        '\u{0124}' => Some(&['\u{0048}', '\u{0302}']),
-        '\u{0125}' => Some(&['\u{0068}', '\u{0302}']),
-        '\u{0128}' => Some(&['\u{0049}', '\u{0303}']),
-        '\u{0129}' => Some(&['\u{0069}', '\u{0303}']),
-        '\u{012A}' => Some(&['\u{0049}', '\u{0304}']),
-        '\u{012B}' => Some(&['\u{0069}', '\u{0304}']),
-        '\u{012C}' => Some(&['\u{0049}', '\u{0306}']),
-        '\u{012D}' => Some(&['\u{0069}', '\u{0306}']),
-        '\u{012E}' => Some(&['\u{0049}', '\u{0328}']),
-        '\u{012F}' => Some(&['\u{0069}', '\u{0328}']),
-        '\u{0130}' => Some(&['\u{0049}', '\u{0307}']),
-        '\u{0134}' => Some(&['\u{004A}', '\u{0302}']),
-        '\u{0135}' => Some(&['\u{006A}', '\u{0302}']),
-        '\u{0136}' => Some(&['\u{004B}', '\u{0327}']),
-        '\u{0137}' => Some(&['\u{006B}', '\u{0327}']),
-        '\u{0139}' => Some(&['\u{004C}', '\u{0301}']),
-        '\u{013A}' => Some(&['\u{006C}', '\u{0301}']),
-        '\u{013B}' => Some(&['\u{004C}', '\u{0327}']),
-        '\u{013C}' => Some(&['\u{006C}', '\u{0327}']),
-        '\u{013D}' => Some(&['\u{004C}', '\u{030C}']),
-        '\u{013E}' => Some(&['\u{006C}', '\u{030C}']),
-        '\u{0143}' => Some(&['\u{004E}', '\u{0301}']),
-        '\u{0144}' => Some(&['\u{006E}', '\u{0301}']),
-        '\u{0145}' => Some(&['\u{004E}', '\u{0327}']),
-        '\u{0146}' => Some(&['\u{006E}', '\u{0327}']),
-        '\u{0147}' => Some(&['\u{004E}', '\u{030C}']),
-        '\u{0148}' => Some(&['\u{006E}', '\u{030C}']),
-        '\u{014C}' => Some(&['\u{004F}', '\u{0304}']),
-        '\u{014D}' => Some(&['\u{006F}', '\u{0304}']),
-        '\u{014E}' => Some(&['\u{004F}', '\u{0306}']),
-        '\u{014F}' => Some(&['\u{006F}', '\u{0306}']),
-        '\u{0150}' => Some(&['\u{004F}', '\u{030B}']),
-        '\u{0151}' => Some(&['\u{006F}', '\u{030B}']),
-        '\u{0154}' => Some(&['\u{0052}', '\u{0301}']),
-        '\u{0155}' => Some(&['\u{0072}', '\u{0301}']),
-        '\u{0156}' => Some(&['\u{0052}', '\u{0327}']),
-        '\u{0157}' => Some(&['\u{0072}', '\u{0327}']),
-        '\u{0158}' => Some(&['\u{0052}', '\u{030C}']),
-        '\u{0159}' => Some(&['\u{0072}', '\u{030C}']),
-        '\u{015A}' => Some(&['\u{0053}', '\u{0301}']),
-        '\u{015B}' => Some(&['\u{0073}', '\u{0301}']),
-        '\u{015C}' => Some(&['\u{0053}', '\u{0302}']),
-        '\u{015D}' => Some(&['\u{0073}', '\u{0302}']),
-        '\u{015E}' => Some(&['\u{0053}', '\u{0327}']),
-        '\u{015F}' => Some(&['\u{0073}', '\u{0327}']),
-        '\u{0160}' => Some(&['\u{0053}', '\u{030C}']),
-        '\u{0161}' => Some(&['\u{0073}', '\u{030C}']),
-        '\u{0162}' => Some(&['\u{0054}', '\u{0327}']),
-        '\u{0163}' => Some(&['\u{0074}', '\u{0327}']),
-        '\u{0164}' => Some(&['\u{0054}', '\u{030C}']),
-        '\u{0165}' => Some(&['\u{0074}', '\u{030C}']),
-        '\u{0168}' => Some(&['\u{0055}', '\u{0303}']),
-        '\u{0169}' => Some(&['\u{0075}', '\u{0303}']),
-        '\u{016A}' => Some(&['\u{0055}', '\u{0304}']),
-        '\u{016B}' => Some(&['\u{0075}', '\u{0304}']),
-        '\u{016C}' => Some(&['\u{0055}', '\u{0306}']),
-        '\u{016D}' => Some(&['\u{0075}', '\u{0306}']),
-        '\u{016E}' => Some(&['\u{0055}', '\u{030A}']),
-        '\u{016F}' => Some(&['\u{0075}', '\u{030A}']),
-        '\u{0170}' => Some(&['\u{0055}', '\u{030B}']),
-        '\u{0171}' => Some(&['\u{0075}', '\u{030B}']),
-        '\u{0172}' => Some(&['\u{0055}', '\u{0328}']),
-        '\u{0173}' => Some(&['\u{0075}', '\u{0328}']),
-        '\u{0174}' => Some(&['\u{0057}', '\u{0302}']),
-        '\u{0175}' => Some(&['\u{0077}', '\u{0302}']),
-        '\u{0176}' => Some(&['\u{0059}', '\u{0302}']),
-        '\u{0177}' => Some(&['\u{0079}', '\u{0302}']),
-        '\u{0178}' => Some(&['\u{0059}', '\u{0308}']),
-        '\u{0179}' => Some(&['\u{005A}', '\u{0301}']),
-        '\u{017A}' => Some(&['\u{007A}', '\u{0301}']),
-        '\u{017B}' => Some(&['\u{005A}', '\u{0307}']),
-        '\u{017C}' => Some(&['\u{007A}', '\u{0307}']),
-        '\u{017D}' => Some(&['\u{005A}', '\u{030C}']),
-        '\u{017E}' => Some(&['\u{007A}', '\u{030C}']),
-        '\u{01A0}' => Some(&['\u{004F}', '\u{031B}']),
-        '\u{01A1}' => Some(&['\u{006F}', '\u{031B}']),
-        '\u{01AF}' => Some(&['\u{0055}', '\u{031B}']),
-        '\u{01B0}' => Some(&['\u{0075}', '\u{031B}']),
-        '\u{01CD}' => Some(&['\u{0041}', '\u{030C}']),
-        '\u{01CE}' => Some(&['\u{0061}', '\u{030C}']),
-        '\u{01CF}' => Some(&['\u{0049}', '\u{030C}']),
-        '\u{01D0}' => Some(&['\u{0069}', '\u{030C}']),
-        '\u{01D1}' => Some(&['\u{004F}', '\u{030C}']),
-        '\u{01D2}' => Some(&['\u{006F}', '\u{030C}']),
-        '\u{01D3}' => Some(&['\u{0055}', '\u{030C}']),
-        '\u{01D4}' => Some(&['\u{0075}', '\u{030C}']),
-        '\u{01D5}' => Some(&['\u{0055}', '\u{0308}', '\u{0304}']),
-        '\u{01D6}' => Some(&['\u{0075}', '\u{0308}', '\u{0304}']),
-        '\u{01D7}' => Some(&['\u{0055}', '\u{0308}', '\u{0301}']),
-        '\u{01D8}' => Some(&['\u{0075}', '\u{0308}', '\u{0301}']),
-        '\u{01D9}' => Some(&['\u{0055}', '\u{0308}', '\u{030C}']),
-        '\u{01DA}' => Some(&['\u{0075}', '\u{0308}', '\u{030C}']),
-        '\u{01DB}' => Some(&['\u{0055}', '\u{0308}', '\u{0300}']),
-        '\u{01DC}' => Some(&['\u{0075}', '\u{0308}', '\u{0300}']),
-        '\u{01DE}' => Some(&['\u{0041}', '\u{0308}', '\u{0304}']),
-        '\u{01DF}' => Some(&['\u{0061}', '\u{0308}', '\u{0304}']),
-        '\u{01E0}' => Some(&['\u{0041}', '\u{0307}', '\u{0304}']),
-        '\u{01E1}' => Some(&['\u{0061}', '\u{0307}', '\u{0304}']),
-        '\u{01E2}' => Some(&['\u{00C6}', '\u{0304}']),
-        '\u{01E3}' => Some(&['\u{00E6}', '\u{0304}']),
-        '\u{01E6}' => Some(&['\u{0047}', '\u{030C}']),
-        '\u{01E7}' => Some(&['\u{0067}', '\u{030C}']),
-        '\u{01E8}' => Some(&['\u{004B}', '\u{030C}']),
-        '\u{01E9}' => Some(&['\u{006B}', '\u{030C}']),
-        '\u{01EA}' => Some(&['\u{004F}', '\u{0328}']),
-        '\u{01EB}' => Some(&['\u{006F}', '\u{0328}']),
-        '\u{01EC}' => Some(&['\u{004F}', '\u{0328}', '\u{0304}']),
-        '\u{01ED}' => Some(&['\u{006F}', '\u{0328}', '\u{0304}']),
-        '\u{01EE}' => Some(&['\u{01B7}', '\u{030C}']),
-        '\u{01EF}' => Some(&['\u{0292}', '\u{030C}']),
-        '\u{01F0}' => Some(&['\u{006A}', '\u{030C}']),
-        '\u{01F4}' => Some(&['\u{0047}', '\u{0301}']),
-        '\u{01F5}' => Some(&['\u{0067}', '\u{0301}']),
-        '\u{01F8}' => Some(&['\u{004E}', '\u{0300}']),
-        '\u{01F9}' => Some(&['\u{006E}', '\u{0300}']),
-        '\u{01FA}' => Some(&['\u{0041}', '\u{030A}', '\u{0301}']),
-        '\u{01FB}' => Some(&['\u{0061}', '\u{030A}', '\u{0301}']),
-        '\u{01FC}' => Some(&['\u{00C6}', '\u{0301}']),
-        '\u{01FD}' => Some(&['\u{00E6}', '\u{0301}']),
-        '\u{01FE}' => Some(&['\u{00D8}', '\u{0301}']),
-        '\u{01FF}' => Some(&['\u{00F8}', '\u{0301}']),
-        '\u{0200}' => Some(&['\u{0041}', '\u{030F}']),
-        '\u{0201}' => Some(&['\u{0061}', '\u{030F}']),
-        '\u{0202}' => Some(&['\u{0041}', '\u{0311}']),
-        '\u{0203}' => Some(&['\u{0061}', '\u{0311}']),
-        '\u{0204}' => Some(&['\u{0045}', '\u{030F}']),
-        '\u{0205}' => Some(&['\u{0065}', '\u{030F}']),
-        '\u{0206}' => Some(&['\u{0045}', '\u{0311}']),
-        '\u{0207}' => Some(&['\u{0065}', '\u{0311}']),
-        '\u{0208}' => Some(&['\u{0049}', '\u{030F}']),
-        '\u{0209}' => Some(&['\u{0069}', '\u{030F}']),
-        '\u{020A}' => Some(&['\u{0049}', '\u{0311}']),
-        '\u{020B}' => Some(&['\u{0069}', '\u{0311}']),
-        '\u{020C}' => Some(&['\u{004F}', '\u{030F}']),
-        '\u{020D}' => Some(&['\u{006F}', '\u{030F}']),
-        '\u{020E}' => Some(&['\u{004F}', '\u{0311}']),
-        '\u{020F}' => Some(&['\u{006F}', '\u{0311}']),
-        '\u{0210}' => Some(&['\u{0052}', '\u{030F}']),
-        '\u{0211}' => Some(&['\u{0072}', '\u{030F}']),
-        '\u{0212}' => Some(&['\u{0052}', '\u{0311}']),
-        '\u{0213}' => Some(&['\u{0072}', '\u{0311}']),
-        '\u{0214}' => Some(&['\u{0055}', '\u{030F}']),
-        '\u{0215}' => Some(&['\u{0075}', '\u{030F}']),
-        '\u{0216}' => Some(&['\u{0055}', '\u{0311}']),
-        '\u{0217}' => Some(&['\u{0075}', '\u{0311}']),
-        '\u{0218}' => Some(&['\u{0053}', '\u{0326}']),
-        '\u{0219}' => Some(&['\u{0073}', '\u{0326}']),
-        '\u{021A}' => Some(&['\u{0054}', '\u{0326}']),
-        '\u{021B}' => Some(&['\u{0074}', '\u{0326}']),
-        '\u{021E}' => Some(&['\u{0048}', '\u{030C}']),
-        '\u{021F}' => Some(&['\u{0068}', '\u{030C}']),
-        '\u{0226}' => Some(&['\u{0041}', '\u{0307}']),
-        '\u{0227}' => Some(&['\u{0061}', '\u{0307}']),
-        '\u{0228}' => Some(&['\u{0045}', '\u{0327}']),
-        '\u{0229}' => Some(&['\u{0065}', '\u{0327}']),
-        '\u{022A}' => Some(&['\u{004F}', '\u{0308}', '\u{0304}']),
-        '\u{022B}' => Some(&['\u{006F}', '\u{0308}', '\u{0304}']),
-        '\u{022C}' => Some(&['\u{004F}', '\u{0303}', '\u{0304}']),
-        '\u{022D}' => Some(&['\u{006F}', '\u{0303}', '\u{0304}']),
-        '\u{022E}' => Some(&['\u{004F}', '\u{0307}']),
-        '\u{022F}' => Some(&['\u{006F}', '\u{0307}']),
-        '\u{0230}' => Some(&['\u{004F}', '\u{0307}', '\u{0304}']),
-        '\u{0231}' => Some(&['\u{006F}', '\u{0307}', '\u{0304}']),
-        '\u{0232}' => Some(&['\u{0059}', '\u{0304}']),
-        '\u{0233}' => Some(&['\u{0079}', '\u{0304}']),
-        '\u{0340}' => Some(&['\u{0300}']),
-        '\u{0341}' => Some(&['\u{0301}']),
-        '\u{0343}' => Some(&['\u{0313}']),
-        '\u{0344}' => Some(&['\u{0308}', '\u{0301}']),
-        '\u{0374}' => Some(&['\u{02B9}']),
-        '\u{037E}' => Some(&['\u{003B}']),
-        '\u{0385}' => Some(&['\u{00A8}', '\u{0301}']),
-        '\u{0386}' => Some(&['\u{0391}', '\u{0301}']),
-        '\u{0387}' => Some(&['\u{00B7}']),
-        '\u{0388}' => Some(&['\u{0395}', '\u{0301}']),
-        '\u{0389}' => Some(&['\u{0397}', '\u{0301}']),
-        '\u{038A}' => Some(&['\u{0399}', '\u{0301}']),
-        '\u{038C}' => Some(&['\u{039F}', '\u{0301}']),
-        '\u{038E}' => Some(&['\u{03A5}', '\u{0301}']),
-        '\u{038F}' => Some(&['\u{03A9}', '\u{0301}']),
-        '\u{0390}' => Some(&['\u{03B9}', '\u{0308}', '\u{0301}']),
-        '\u{03AA}' => Some(&['\u{0399}', '\u{0308}']),
-        '\u{03AB}' => Some(&['\u{03A5}', '\u{0308}']),
-        '\u{03AC}' => Some(&['\u{03B1}', '\u{0301}']),
-        '\u{03AD}' => Some(&['\u{03B5}', '\u{0301}']),
-        '\u{03AE}' => Some(&['\u{03B7}', '\u{0301}']),
-        '\u{03AF}' => Some(&['\u{03B9}', '\u{0301}']),
-        '\u{03B0}' => Some(&['\u{03C5}', '\u{0308}', '\u{0301}']),
-        '\u{03CA}' => Some(&['\u{03B9}', '\u{0308}']),
-        '\u{03CB}' => Some(&['\u{03C5}', '\u{0308}']),
-        '\u{03CC}' => Some(&['\u{03BF}', '\u{0301}']),
-        '\u{03CD}' => Some(&['\u{03C5}', '\u{0301}']),
-        '\u{03CE}' => Some(&['\u{03C9}', '\u{0301}']),
-        '\u{03D3}' => Some(&['\u{03D2}', '\u{0301}']),
-        '\u{03D4}' => Some(&['\u{03D2}', '\u{0308}']),
-        '\u{0400}' => Some(&['\u{0415}', '\u{0300}']),
-        '\u{0401}' => Some(&['\u{0415}', '\u{0308}']),
-        '\u{0403}' => Some(&['\u{0413}', '\u{0301}']),
-        '\u{0407}' => Some(&['\u{0406}', '\u{0308}']),
-        '\u{040C}' => Some(&['\u{041A}', '\u{0301}']),
-        '\u{040D}' => Some(&['\u{0418}', '\u{0300}']),
-        '\u{040E}' => Some(&['\u{0423}', '\u{0306}']),
-        '\u{0419}' => Some(&['\u{0418}', '\u{0306}']),
-        '\u{0439}' => Some(&['\u{0438}', '\u{0306}']),
-        '\u{0450}' => Some(&['\u{0435}', '\u{0300}']),
-        '\u{0451}' => Some(&['\u{0435}', '\u{0308}']),
-        '\u{0453}' => Some(&['\u{0433}', '\u{0301}']),
-        '\u{0457}' => Some(&['\u{0456}', '\u{0308}']),
-        '\u{045C}' => Some(&['\u{043A}', '\u{0301}']),
-        '\u{045D}' => Some(&['\u{0438}', '\u{0300}']),
-        '\u{045E}' => Some(&['\u{0443}', '\u{0306}']),
-        '\u{0476}' => Some(&['\u{0474}', '\u{030F}']),
-        '\u{0477}' => Some(&['\u{0475}', '\u{030F}']),
-        '\u{04C1}' => Some(&['\u{0416}', '\u{0306}']),
-        '\u{04C2}' => Some(&['\u{0436}', '\u{0306}']),
-        '\u{04D0}' => Some(&['\u{0410}', '\u{0306}']),
-        '\u{04D1}' => Some(&['\u{0430}', '\u{0306}']),
-        '\u{04D2}' => Some(&['\u{0410}', '\u{0308}']),
-        '\u{04D3}' => Some(&['\u{0430}', '\u{0308}']),
-        '\u{04D6}' => Some(&['\u{0415}', '\u{0306}']),
-        '\u{04D7}' => Some(&['\u{0435}', '\u{0306}']),
-        '\u{04DA}' => Some(&['\u{04D8}', '\u{0308}']),
-        '\u{04DB}' => Some(&['\u{04D9}', '\u{0308}']),
-        '\u{04DC}' => Some(&['\u{0416}', '\u{0308}']),
-        '\u{04DD}' => Some(&['\u{0436}', '\u{0308}']),
-        '\u{04DE}' => Some(&['\u{0417}', '\u{0308}']),
-        '\u{04DF}' => Some(&['\u{0437}', '\u{0308}']),
-        '\u{04E2}' => Some(&['\u{0418}', '\u{0304}']),
-        '\u{04E3}' => Some(&['\u{0438}', '\u{0304}']),
-        '\u{04E4}' => Some(&['\u{0418}', '\u{0308}']),
-        '\u{04E5}' => Some(&['\u{0438}', '\u{0308}']),
-        '\u{04E6}' => Some(&['\u{041E}', '\u{0308}']),
-        '\u{04E7}' => Some(&['\u{043E}', '\u{0308}']),
-        '\u{04EA}' => Some(&['\u{04E8}', '\u{0308}']),
-        '\u{04EB}' => Some(&['\u{04E9}', '\u{0308}']),
-        '\u{04EC}' => Some(&['\u{042D}', '\u{0308}']),
-        '\u{04ED}' => Some(&['\u{044D}', '\u{0308}']),
-        '\u{04EE}' => Some(&['\u{0423}', '\u{0304}']),
-        '\u{04EF}' => Some(&['\u{0443}', '\u{0304}']),
-        '\u{04F0}' => Some(&['\u{0423}', '\u{0308}']),
-        '\u{04F1}' => Some(&['\u{0443}', '\u{0308}']),
-        '\u{04F2}' => Some(&['\u{0423}', '\u{030B}']),
-        '\u{04F3}' => Some(&['\u{0443}', '\u{030B}']),
-        '\u{04F4}' => Some(&['\u{0427}', '\u{0308}']),
-        '\u{04F5}' => Some(&['\u{0447}', '\u{0308}']),
-        '\u{04F8}' => Some(&['\u{042B}', '\u{0308}']),
-        '\u{04F9}' => Some(&['\u{044B}', '\u{0308}']),
-        '\u{0622}' => Some(&['\u{0627}', '\u{0653}']),
-        '\u{0623}' => Some(&['\u{0627}', '\u{0654}']),
-        '\u{0624}' => Some(&['\u{0648}', '\u{0654}']),
-        '\u{0625}' => Some(&['\u{0627}', '\u{0655}']),
-        '\u{0626}' => Some(&['\u{064A}', '\u{0654}']),
-        '\u{06C0}' => Some(&['\u{06D5}', '\u{0654}']),
-        '\u{06C2}' => Some(&['\u{06C1}', '\u{0654}']),
-        '\u{06D3}' => Some(&['\u{06D2}', '\u{0654}']),
-        '\u{0929}' => Some(&['\u{0928}', '\u{093C}']),
-        '\u{0931}' => Some(&['\u{0930}', '\u{093C}']),
-        '\u{0934}' => Some(&['\u{0933}', '\u{093C}']),
-        '\u{0958}' => Some(&['\u{0915}', '\u{093C}']),
-        '\u{0959}' => Some(&['\u{0916}', '\u{093C}']),
-        '\u{095A}' => Some(&['\u{0917}', '\u{093C}']),
-        '\u{095B}' => Some(&['\u{091C}', '\u{093C}']),
-        '\u{095C}' => Some(&['\u{0921}', '\u{093C}']),
-        '\u{095D}' => Some(&['\u{0922}', '\u{093C}']),
-        '\u{095E}' => Some(&['\u{092B}', '\u{093C}']),
-        '\u{095F}' => Some(&['\u{092F}', '\u{093C}']),
-        '\u{09CB}' => Some(&['\u{09C7}', '\u{09BE}']),
-        '\u{09CC}' => Some(&['\u{09C7}', '\u{09D7}']),
-        '\u{09DC}' => Some(&['\u{09A1}', '\u{09BC}']),
-        '\u{09DD}' => Some(&['\u{09A2}', '\u{09BC}']),
-        '\u{09DF}' => Some(&['\u{09AF}', '\u{09BC}']),
-        '\u{0A33}' => Some(&['\u{0A32}', '\u{0A3C}']),
-        '\u{0A36}' => Some(&['\u{0A38}', '\u{0A3C}']),
-        '\u{0A59}' => Some(&['\u{0A16}', '\u{0A3C}']),
-        '\u{0A5A}' => Some(&['\u{0A17}', '\u{0A3C}']),
-        '\u{0A5B}' => Some(&['\u{0A1C}', '\u{0A3C}']),
-        '\u{0A5E}' => Some(&['\u{0A2B}', '\u{0A3C}']),
-        '\u{0B48}' => Some(&['\u{0B47}', '\u{0B56}']),
-        '\u{0B4B}' => Some(&['\u{0B47}', '\u{0B3E}']),
-        '\u{0B4C}' => Some(&['\u{0B47}', '\u{0B57}']),
-        '\u{0B5C}' => Some(&['\u{0B21}', '\u{0B3C}']),
-        '\u{0B5D}' => Some(&['\u{0B22}', '\u{0B3C}']),
-        '\u{0B94}' => Some(&['\u{0B92}', '\u{0BD7}']),
-        '\u{0BCA}' => Some(&['\u{0BC6}', '\u{0BBE}']),
-        '\u{0BCB}' => Some(&['\u{0BC7}', '\u{0BBE}']),
-        '\u{0BCC}' => Some(&['\u{0BC6}', '\u{0BD7}']),
-        '\u{0C48}' => Some(&['\u{0C46}', '\u{0C56}']),
-        '\u{0CC0}' => Some(&['\u{0CBF}', '\u{0CD5}']),
-        '\u{0CC7}' => Some(&['\u{0CC6}', '\u{0CD5}']),
-        '\u{0CC8}' => Some(&['\u{0CC6}', '\u{0CD6}']),
-        '\u{0CCA}' => Some(&['\u{0CC6}', '\u{0CC2}']),
-        '\u{0CCB}' => Some(&['\u{0CC6}', '\u{0CC2}', '\u{0CD5}']),
-        '\u{0D4A}' => Some(&['\u{0D46}', '\u{0D3E}']),
-        '\u{0D4B}' => Some(&['\u{0D47}', '\u{0D3E}']),
-        '\u{0D4C}' => Some(&['\u{0D46}', '\u{0D57}']),
-        '\u{0DDA}' => Some(&['\u{0DD9}', '\u{0DCA}']),
-        '\u{0DDC}' => Some(&['\u{0DD9}', '\u{0DCF}']),
-        '\u{0DDD}' => Some(&['\u{0DD9}', '\u{0DCF}', '\u{0DCA}']),
-        '\u{0DDE}' => Some(&['\u{0DD9}', '\u{0DDF}']),
-        '\u{0F43}' => Some(&['\u{0F42}', '\u{0FB7}']),
-        '\u{0F4D}' => Some(&['\u{0F4C}', '\u{0FB7}']),
-        '\u{0F52}' => Some(&['\u{0F51}', '\u{0FB7}']),
-        '\u{0F57}' => Some(&['\u{0F56}', '\u{0FB7}']),
-        '\u{0F5C}' => Some(&['\u{0F5B}', '\u{0FB7}']),
-        '\u{0F69}' => Some(&['\u{0F40}', '\u{0FB5}']),
-        '\u{0F73}' => Some(&['\u{0F71}', '\u{0F72}']),
-        '\u{0F75}' => Some(&['\u{0F71}', '\u{0F74}']),
-        '\u{0F76}' => Some(&['\u{0FB2}', '\u{0F80}']),
-        '\u{0F78}' => Some(&['\u{0FB3}', '\u{0F80}']),
-        '\u{0F81}' => Some(&['\u{0F71}', '\u{0F80}']),
-        '\u{0F93}' => Some(&['\u{0F92}', '\u{0FB7}']),
-        '\u{0F9D}' => Some(&['\u{0F9C}', '\u{0FB7}']),
-        '\u{0FA2}' => Some(&['\u{0FA1}', '\u{0FB7}']),
-        '\u{0FA7}' => Some(&['\u{0FA6}', '\u{0FB7}']),
-        '\u{0FAC}' => Some(&['\u{0FAB}', '\u{0FB7}']),
-        '\u{0FB9}' => Some(&['\u{0F90}', '\u{0FB5}']),
-        '\u{1026}' => Some(&['\u{1025}', '\u{102E}']),
-        '\u{1B06}' => Some(&['\u{1B05}', '\u{1B35}']),
-        '\u{1B08}' => Some(&['\u{1B07}', '\u{1B35}']),
-        '\u{1B0A}' => Some(&['\u{1B09}', '\u{1B35}']),
-        '\u{1B0C}' => Some(&['\u{1B0B}', '\u{1B35}']),
-        '\u{1B0E}' => Some(&['\u{1B0D}', '\u{1B35}']),
-        '\u{1B12}' => Some(&['\u{1B11}', '\u{1B35}']),
-        '\u{1B3B}' => Some(&['\u{1B3A}', '\u{1B35}']),
-        '\u{1B3D}' => Some(&['\u{1B3C}', '\u{1B35}']),
-        '\u{1B40}' => Some(&['\u{1B3E}', '\u{1B35}']),
-        '\u{1B41}' => Some(&['\u{1B3F}', '\u{1B35}']),
-        '\u{1B43}' => Some(&['\u{1B42}', '\u{1B35}']),
-        '\u{1E00}' => Some(&['\u{0041}', '\u{0325}']),
-        '\u{1E01}' => Some(&['\u{0061}', '\u{0325}']),
-        '\u{1E02}' => Some(&['\u{0042}', '\u{0307}']),
-        '\u{1E03}' => Some(&['\u{0062}', '\u{0307}']),
-        '\u{1E04}' => Some(&['\u{0042}', '\u{0323}']),
-        '\u{1E05}' => Some(&['\u{0062}', '\u{0323}']),
-        '\u{1E06}' => Some(&['\u{0042}', '\u{0331}']),
-        '\u{1E07}' => Some(&['\u{0062}', '\u{0331}']),
-        '\u{1E08}' => Some(&['\u{0043}', '\u{0327}', '\u{0301}']),
-        '\u{1E09}' => Some(&['\u{0063}', '\u{0327}', '\u{0301}']),
-        '\u{1E0A}' => Some(&['\u{0044}', '\u{0307}']),
-        '\u{1E0B}' => Some(&['\u{0064}', '\u{0307}']),
-        '\u{1E0C}' => Some(&['\u{0044}', '\u{0323}']),
-        '\u{1E0D}' => Some(&['\u{0064}', '\u{0323}']),
-        '\u{1E0E}' => Some(&['\u{0044}', '\u{0331}']),
-        '\u{1E0F}' => Some(&['\u{0064}', '\u{0331}']),
-        '\u{1E10}' => Some(&['\u{0044}', '\u{0327}']),
-        '\u{1E11}' => Some(&['\u{0064}', '\u{0327}']),
-        '\u{1E12}' => Some(&['\u{0044}', '\u{032D}']),
-        '\u{1E13}' => Some(&['\u{0064}', '\u{032D}']),
-        '\u{1E14}' => Some(&['\u{0045}', '\u{0304}', '\u{0300}']),
-        '\u{1E15}' => Some(&['\u{0065}', '\u{0304}', '\u{0300}']),
-        '\u{1E16}' => Some(&['\u{0045}', '\u{0304}', '\u{0301}']),
-        '\u{1E17}' => Some(&['\u{0065}', '\u{0304}', '\u{0301}']),
-        '\u{1E18}' => Some(&['\u{0045}', '\u{032D}']),
-        '\u{1E19}' => Some(&['\u{0065}', '\u{032D}']),
-        '\u{1E1A}' => Some(&['\u{0045}', '\u{0330}']),
-        '\u{1E1B}' => Some(&['\u{0065}', '\u{0330}']),
-        '\u{1E1C}' => Some(&['\u{0045}', '\u{0327}', '\u{0306}']),
-        '\u{1E1D}' => Some(&['\u{0065}', '\u{0327}', '\u{0306}']),
-        '\u{1E1E}' => Some(&['\u{0046}', '\u{0307}']),
-        '\u{1E1F}' => Some(&['\u{0066}', '\u{0307}']),
-        '\u{1E20}' => Some(&['\u{0047}', '\u{0304}']),
-        '\u{1E21}' => Some(&['\u{0067}', '\u{0304}']),
-        '\u{1E22}' => Some(&['\u{0048}', '\u{0307}']),
-        '\u{1E23}' => Some(&['\u{0068}', '\u{0307}']),
-        '\u{1E24}' => Some(&['\u{0048}', '\u{0323}']),
-        '\u{1E25}' => Some(&['\u{0068}', '\u{0323}']),
-        '\u{1E26}' => Some(&['\u{0048}', '\u{0308}']),
-        '\u{1E27}' => Some(&['\u{0068}', '\u{0308}']),
-        '\u{1E28}' => Some(&['\u{0048}', '\u{0327}']),
-        '\u{1E29}' => Some(&['\u{0068}', '\u{0327}']),
-        '\u{1E2A}' => Some(&['\u{0048}', '\u{032E}']),
-        '\u{1E2B}' => Some(&['\u{0068}', '\u{032E}']),
-        '\u{1E2C}' => Some(&['\u{0049}', '\u{0330}']),
-        '\u{1E2D}' => Some(&['\u{0069}', '\u{0330}']),
-        '\u{1E2E}' => Some(&['\u{0049}', '\u{0308}', '\u{0301}']),
-        '\u{1E2F}' => Some(&['\u{0069}', '\u{0308}', '\u{0301}']),
-        '\u{1E30}' => Some(&['\u{004B}', '\u{0301}']),
-        '\u{1E31}' => Some(&['\u{006B}', '\u{0301}']),
-        '\u{1E32}' => Some(&['\u{004B}', '\u{0323}']),
-        '\u{1E33}' => Some(&['\u{006B}', '\u{0323}']),
-        '\u{1E34}' => Some(&['\u{004B}', '\u{0331}']),
-        '\u{1E35}' => Some(&['\u{006B}', '\u{0331}']),
-        '\u{1E36}' => Some(&['\u{004C}', '\u{0323}']),
-        '\u{1E37}' => Some(&['\u{006C}', '\u{0323}']),
-        '\u{1E38}' => Some(&['\u{004C}', '\u{0323}', '\u{0304}']),
-        '\u{1E39}' => Some(&['\u{006C}', '\u{0323}', '\u{0304}']),
-        '\u{1E3A}' => Some(&['\u{004C}', '\u{0331}']),
-        '\u{1E3B}' => Some(&['\u{006C}', '\u{0331}']),
-        '\u{1E3C}' => Some(&['\u{004C}', '\u{032D}']),
-        '\u{1E3D}' => Some(&['\u{006C}', '\u{032D}']),
-        '\u{1E3E}' => Some(&['\u{004D}', '\u{0301}']),
-        '\u{1E3F}' => Some(&['\u{006D}', '\u{0301}']),
-        '\u{1E40}' => Some(&['\u{004D}', '\u{0307}']),
-        '\u{1E41}' => Some(&['\u{006D}', '\u{0307}']),
-        '\u{1E42}' => Some(&['\u{004D}', '\u{0323}']),
-        '\u{1E43}' => Some(&['\u{006D}', '\u{0323}']),
-        '\u{1E44}' => Some(&['\u{004E}', '\u{0307}']),
-        '\u{1E45}' => Some(&['\u{006E}', '\u{0307}']),
-        '\u{1E46}' => Some(&['\u{004E}', '\u{0323}']),
-        '\u{1E47}' => Some(&['\u{006E}', '\u{0323}']),
-        '\u{1E48}' => Some(&['\u{004E}', '\u{0331}']),
-        '\u{1E49}' => Some(&['\u{006E}', '\u{0331}']),
-        '\u{1E4A}' => Some(&['\u{004E}', '\u{032D}']),
-        '\u{1E4B}' => Some(&['\u{006E}', '\u{032D}']),
-        '\u{1E4C}' => Some(&['\u{004F}', '\u{0303}', '\u{0301}']),
-        '\u{1E4D}' => Some(&['\u{006F}', '\u{0303}', '\u{0301}']),
-        '\u{1E4E}' => Some(&['\u{004F}', '\u{0303}', '\u{0308}']),
-        '\u{1E4F}' => Some(&['\u{006F}', '\u{0303}', '\u{0308}']),
-        '\u{1E50}' => Some(&['\u{004F}', '\u{0304}', '\u{0300}']),
-        '\u{1E51}' => Some(&['\u{006F}', '\u{0304}', '\u{0300}']),
-        '\u{1E52}' => Some(&['\u{004F}', '\u{0304}', '\u{0301}']),
-        '\u{1E53}' => Some(&['\u{006F}', '\u{0304}', '\u{0301}']),
-        '\u{1E54}' => Some(&['\u{0050}', '\u{0301}']),
-        '\u{1E55}' => Some(&['\u{0070}', '\u{0301}']),
-        '\u{1E56}' => Some(&['\u{0050}', '\u{0307}']),
-        '\u{1E57}' => Some(&['\u{0070}', '\u{0307}']),
-        '\u{1E58}' => Some(&['\u{0052}', '\u{0307}']),
-        '\u{1E59}' => Some(&['\u{0072}', '\u{0307}']),
-        '\u{1E5A}' => Some(&['\u{0052}', '\u{0323}']),
-        '\u{1E5B}' => Some(&['\u{0072}', '\u{0323}']),
-        '\u{1E5C}' => Some(&['\u{0052}', '\u{0323}', '\u{0304}']),
-        '\u{1E5D}' => Some(&['\u{0072}', '\u{0323}', '\u{0304}']),
-        '\u{1E5E}' => Some(&['\u{0052}', '\u{0331}']),
-        '\u{1E5F}' => Some(&['\u{0072}', '\u{0331}']),
-        '\u{1E60}' => Some(&['\u{0053}', '\u{0307}']),
-        '\u{1E61}' => Some(&['\u{0073}', '\u{0307}']),
-        '\u{1E62}' => Some(&['\u{0053}', '\u{0323}']),
-        '\u{1E63}' => Some(&['\u{0073}', '\u{0323}']),
-        '\u{1E64}' => Some(&['\u{0053}', '\u{0301}', '\u{0307}']),
-        '\u{1E65}' => Some(&['\u{0073}', '\u{0301}', '\u{0307}']),
-        '\u{1E66}' => Some(&['\u{0053}', '\u{030C}', '\u{0307}']),
-        '\u{1E67}' => Some(&['\u{0073}', '\u{030C}', '\u{0307}']),
-        '\u{1E68}' => Some(&['\u{0053}', '\u{0323}', '\u{0307}']),
-        '\u{1E69}' => Some(&['\u{0073}', '\u{0323}', '\u{0307}']),
-        '\u{1E6A}' => Some(&['\u{0054}', '\u{0307}']),
-        '\u{1E6B}' => Some(&['\u{0074}', '\u{0307}']),
-        '\u{1E6C}' => Some(&['\u{0054}', '\u{0323}']),
-        '\u{1E6D}' => Some(&['\u{0074}', '\u{0323}']),
-        '\u{1E6E}' => Some(&['\u{0054}', '\u{0331}']),
-        '\u{1E6F}' => Some(&['\u{0074}', '\u{0331}']),
-        '\u{1E70}' => Some(&['\u{0054}', '\u{032D}']),
-        '\u{1E71}' => Some(&['\u{0074}', '\u{032D}']),
-        '\u{1E72}' => Some(&['\u{0055}', '\u{0324}']),
-        '\u{1E73}' => Some(&['\u{0075}', '\u{0324}']),
-        '\u{1E74}' => Some(&['\u{0055}', '\u{0330}']),
-        '\u{1E75}' => Some(&['\u{0075}', '\u{0330}']),
-        '\u{1E76}' => Some(&['\u{0055}', '\u{032D}']),
-        '\u{1E77}' => Some(&['\u{0075}', '\u{032D}']),
-        '\u{1E78}' => Some(&['\u{0055}', '\u{0303}', '\u{0301}']),
-        '\u{1E79}' => Some(&['\u{0075}', '\u{0303}', '\u{0301}']),
-        '\u{1E7A}' => Some(&['\u{0055}', '\u{0304}', '\u{0308}']),
-        '\u{1E7B}' => Some(&['\u{0075}', '\u{0304}', '\u{0308}']),
-        '\u{1E7C}' => Some(&['\u{0056}', '\u{0303}']),
-        '\u{1E7D}' => Some(&['\u{0076}', '\u{0303}']),
-        '\u{1E7E}' => Some(&['\u{0056}', '\u{0323}']),
-        '\u{1E7F}' => Some(&['\u{0076}', '\u{0323}']),
-        '\u{1E80}' => Some(&['\u{0057}', '\u{0300}']),
-        '\u{1E81}' => Some(&['\u{0077}', '\u{0300}']),
-        '\u{1E82}' => Some(&['\u{0057}', '\u{0301}']),
-        '\u{1E83}' => Some(&['\u{0077}', '\u{0301}']),
-        '\u{1E84}' => Some(&['\u{0057}', '\u{0308}']),
-        '\u{1E85}' => Some(&['\u{0077}', '\u{0308}']),
-        '\u{1E86}' => Some(&['\u{0057}', '\u{0307}']),
-        '\u{1E87}' => Some(&['\u{0077}', '\u{0307}']),
-        '\u{1E88}' => Some(&['\u{0057}', '\u{0323}']),
-        '\u{1E89}' => Some(&['\u{0077}', '\u{0323}']),
-        '\u{1E8A}' => Some(&['\u{0058}', '\u{0307}']),
-        '\u{1E8B}' => Some(&['\u{0078}', '\u{0307}']),
-        '\u{1E8C}' => Some(&['\u{0058}', '\u{0308}']),
-        '\u{1E8D}' => Some(&['\u{0078}', '\u{0308}']),
-        '\u{1E8E}' => Some(&['\u{0059}', '\u{0307}']),
-        '\u{1E8F}' => Some(&['\u{0079}', '\u{0307}']),
-        '\u{1E90}' => Some(&['\u{005A}', '\u{0302}']),
-        '\u{1E91}' => Some(&['\u{007A}', '\u{0302}']),
-        '\u{1E92}' => Some(&['\u{005A}', '\u{0323}']),
-        '\u{1E93}' => Some(&['\u{007A}', '\u{0323}']),
-        '\u{1E94}' => Some(&['\u{005A}', '\u{0331}']),
-        '\u{1E95}' => Some(&['\u{007A}', '\u{0331}']),
-        '\u{1E96}' => Some(&['\u{0068}', '\u{0331}']),
-        '\u{1E97}' => Some(&['\u{0074}', '\u{0308}']),
-        '\u{1E98}' => Some(&['\u{0077}', '\u{030A}']),
-        '\u{1E99}' => Some(&['\u{0079}', '\u{030A}']),
-        '\u{1E9B}' => Some(&['\u{017F}', '\u{0307}']),
-        '\u{1EA0}' => Some(&['\u{0041}', '\u{0323}']),
-        '\u{1EA1}' => Some(&['\u{0061}', '\u{0323}']),
-        '\u{1EA2}' => Some(&['\u{0041}', '\u{0309}']),
-        '\u{1EA3}' => Some(&['\u{0061}', '\u{0309}']),
-        '\u{1EA4}' => Some(&['\u{0041}', '\u{0302}', '\u{0301}']),
-        '\u{1EA5}' => Some(&['\u{0061}', '\u{0302}', '\u{0301}']),
-        '\u{1EA6}' => Some(&['\u{0041}', '\u{0302}', '\u{0300}']),
-        '\u{1EA7}' => Some(&['\u{0061}', '\u{0302}', '\u{0300}']),
-        '\u{1EA8}' => Some(&['\u{0041}', '\u{0302}', '\u{0309}']),
-        '\u{1EA9}' => Some(&['\u{0061}', '\u{0302}', '\u{0309}']),
-        '\u{1EAA}' => Some(&['\u{0041}', '\u{0302}', '\u{0303}']),
-        '\u{1EAB}' => Some(&['\u{0061}', '\u{0302}', '\u{0303}']),
-        '\u{1EAC}' => Some(&['\u{0041}', '\u{0323}', '\u{0302}']),
-        '\u{1EAD}' => Some(&['\u{0061}', '\u{0323}', '\u{0302}']),
-        '\u{1EAE}' => Some(&['\u{0041}', '\u{0306}', '\u{0301}']),
-        '\u{1EAF}' => Some(&['\u{0061}', '\u{0306}', '\u{0301}']),
-        '\u{1EB0}' => Some(&['\u{0041}', '\u{0306}', '\u{0300}']),
-        '\u{1EB1}' => Some(&['\u{0061}', '\u{0306}', '\u{0300}']),
-        '\u{1EB2}' => Some(&['\u{0041}', '\u{0306}', '\u{0309}']),
-        '\u{1EB3}' => Some(&['\u{0061}', '\u{0306}', '\u{0309}']),
-        '\u{1EB4}' => Some(&['\u{0041}', '\u{0306}', '\u{0303}']),
-        '\u{1EB5}' => Some(&['\u{0061}', '\u{0306}', '\u{0303}']),
-        '\u{1EB6}' => Some(&['\u{0041}', '\u{0323}', '\u{0306}']),
-        '\u{1EB7}' => Some(&['\u{0061}', '\u{0323}', '\u{0306}']),
-        '\u{1EB8}' => Some(&['\u{0045}', '\u{0323}']),
-        '\u{1EB9}' => Some(&['\u{0065}', '\u{0323}']),
-        '\u{1EBA}' => Some(&['\u{0045}', '\u{0309}']),
-        '\u{1EBB}' => Some(&['\u{0065}', '\u{0309}']),
-        '\u{1EBC}' => Some(&['\u{0045}', '\u{0303}']),
-        '\u{1EBD}' => Some(&['\u{0065}', '\u{0303}']),
-        '\u{1EBE}' => Some(&['\u{0045}', '\u{0302}', '\u{0301}']),
-        '\u{1EBF}' => Some(&['\u{0065}', '\u{0302}', '\u{0301}']),
-        '\u{1EC0}' => Some(&['\u{0045}', '\u{0302}', '\u{0300}']),
-        '\u{1EC1}' => Some(&['\u{0065}', '\u{0302}', '\u{0300}']),
-        '\u{1EC2}' => Some(&['\u{0045}', '\u{0302}', '\u{0309}']),
-        '\u{1EC3}' => Some(&['\u{0065}', '\u{0302}', '\u{0309}']),
-        '\u{1EC4}' => Some(&['\u{0045}', '\u{0302}', '\u{0303}']),
-        '\u{1EC5}' => Some(&['\u{0065}', '\u{0302}', '\u{0303}']),
-        '\u{1EC6}' => Some(&['\u{0045}', '\u{0323}', '\u{0302}']),
-        '\u{1EC7}' => Some(&['\u{0065}', '\u{0323}', '\u{0302}']),
-        '\u{1EC8}' => Some(&['\u{0049}', '\u{0309}']),
-        '\u{1EC9}' => Some(&['\u{0069}', '\u{0309}']),
-        '\u{1ECA}' => Some(&['\u{0049}', '\u{0323}']),
-        '\u{1ECB}' => Some(&['\u{0069}', '\u{0323}']),
-        '\u{1ECC}' => Some(&['\u{004F}', '\u{0323}']),
-        '\u{1ECD}' => Some(&['\u{006F}', '\u{0323}']),
-        '\u{1ECE}' => Some(&['\u{004F}', '\u{0309}']),
-        '\u{1ECF}' => Some(&['\u{006F}', '\u{0309}']),
-        '\u{1ED0}' => Some(&['\u{004F}', '\u{0302}', '\u{0301}']),
-        '\u{1ED1}' => Some(&['\u{006F}', '\u{0302}', '\u{0301}']),
-        '\u{1ED2}' => Some(&['\u{004F}', '\u{0302}', '\u{0300}']),
-        '\u{1ED3}' => Some(&['\u{006F}', '\u{0302}', '\u{0300}']),
-        '\u{1ED4}' => Some(&['\u{004F}', '\u{0302}', '\u{0309}']),
-        '\u{1ED5}' => Some(&['\u{006F}', '\u{0302}', '\u{0309}']),
-        '\u{1ED6}' => Some(&['\u{004F}', '\u{0302}', '\u{0303}']),
-        '\u{1ED7}' => Some(&['\u{006F}', '\u{0302}', '\u{0303}']),
-        '\u{1ED8}' => Some(&['\u{004F}', '\u{0323}', '\u{0302}']),
-        '\u{1ED9}' => Some(&['\u{006F}', '\u{0323}', '\u{0302}']),
-        '\u{1EDA}' => Some(&['\u{004F}', '\u{031B}', '\u{0301}']),
-        '\u{1EDB}' => Some(&['\u{006F}', '\u{031B}', '\u{0301}']),
-        '\u{1EDC}' => Some(&['\u{004F}', '\u{031B}', '\u{0300}']),
-        '\u{1EDD}' => Some(&['\u{006F}', '\u{031B}', '\u{0300}']),
-        '\u{1EDE}' => Some(&['\u{004F}', '\u{031B}', '\u{0309}']),
-        '\u{1EDF}' => Some(&['\u{006F}', '\u{031B}', '\u{0309}']),
-        '\u{1EE0}' => Some(&['\u{004F}', '\u{031B}', '\u{0303}']),
-        '\u{1EE1}' => Some(&['\u{006F}', '\u{031B}', '\u{0303}']),
-        '\u{1EE2}' => Some(&['\u{004F}', '\u{031B}', '\u{0323}']),
-        '\u{1EE3}' => Some(&['\u{006F}', '\u{031B}', '\u{0323}']),
-        '\u{1EE4}' => Some(&['\u{0055}', '\u{0323}']),
-        '\u{1EE5}' => Some(&['\u{0075}', '\u{0323}']),
-        '\u{1EE6}' => Some(&['\u{0055}', '\u{0309}']),
-        '\u{1EE7}' => Some(&['\u{0075}', '\u{0309}']),
-        '\u{1EE8}' => Some(&['\u{0055}', '\u{031B}', '\u{0301}']),
-        '\u{1EE9}' => Some(&['\u{0075}', '\u{031B}', '\u{0301}']),
-        '\u{1EEA}' => Some(&['\u{0055}', '\u{031B}', '\u{0300}']),
-        '\u{1EEB}' => Some(&['\u{0075}', '\u{031B}', '\u{0300}']),
-        '\u{1EEC}' => Some(&['\u{0055}', '\u{031B}', '\u{0309}']),
-        '\u{1EED}' => Some(&['\u{0075}', '\u{031B}', '\u{0309}']),
-        '\u{1EEE}' => Some(&['\u{0055}', '\u{031B}', '\u{0303}']),
-        '\u{1EEF}' => Some(&['\u{0075}', '\u{031B}', '\u{0303}']),
-        '\u{1EF0}' => Some(&['\u{0055}', '\u{031B}', '\u{0323}']),
-        '\u{1EF1}' => Some(&['\u{0075}', '\u{031B}', '\u{0323}']),
-        '\u{1EF2}' => Some(&['\u{0059}', '\u{0300}']),
-        '\u{1EF3}' => Some(&['\u{0079}', '\u{0300}']),
-        '\u{1EF4}' => Some(&['\u{0059}', '\u{0323}']),
-        '\u{1EF5}' => Some(&['\u{0079}', '\u{0323}']),
-        '\u{1EF6}' => Some(&['\u{0059}', '\u{0309}']),
-        '\u{1EF7}' => Some(&['\u{0079}', '\u{0309}']),
-        '\u{1EF8}' => Some(&['\u{0059}', '\u{0303}']),
-        '\u{1EF9}' => Some(&['\u{0079}', '\u{0303}']),
-        '\u{1F00}' => Some(&['\u{03B1}', '\u{0313}']),
-        '\u{1F01}' => Some(&['\u{03B1}', '\u{0314}']),
-        '\u{1F02}' => Some(&['\u{03B1}', '\u{0313}', '\u{0300}']),
-        '\u{1F03}' => Some(&['\u{03B1}', '\u{0314}', '\u{0300}']),
-        '\u{1F04}' => Some(&['\u{03B1}', '\u{0313}', '\u{0301}']),
-        '\u{1F05}' => Some(&['\u{03B1}', '\u{0314}', '\u{0301}']),
-        '\u{1F06}' => Some(&['\u{03B1}', '\u{0313}', '\u{0342}']),
-        '\u{1F07}' => Some(&['\u{03B1}', '\u{0314}', '\u{0342}']),
-        '\u{1F08}' => Some(&['\u{0391}', '\u{0313}']),
-        '\u{1F09}' => Some(&['\u{0391}', '\u{0314}']),
-        '\u{1F0A}' => Some(&['\u{0391}', '\u{0313}', '\u{0300}']),
-        '\u{1F0B}' => Some(&['\u{0391}', '\u{0314}', '\u{0300}']),
-        '\u{1F0C}' => Some(&['\u{0391}', '\u{0313}', '\u{0301}']),
-        '\u{1F0D}' => Some(&['\u{0391}', '\u{0314}', '\u{0301}']),
-        '\u{1F0E}' => Some(&['\u{0391}', '\u{0313}', '\u{0342}']),
-        '\u{1F0F}' => Some(&['\u{0391}', '\u{0314}', '\u{0342}']),
-        '\u{1F10}' => Some(&['\u{03B5}', '\u{0313}']),
-        '\u{1F11}' => Some(&['\u{03B5}', '\u{0314}']),
-        '\u{1F12}' => Some(&['\u{03B5}', '\u{0313}', '\u{0300}']),
-        '\u{1F13}' => Some(&['\u{03B5}', '\u{0314}', '\u{0300}']),
-        '\u{1F14}' => Some(&['\u{03B5}', '\u{0313}', '\u{0301}']),
-        '\u{1F15}' => Some(&['\u{03B5}', '\u{0314}', '\u{0301}']),
-        '\u{1F18}' => Some(&['\u{0395}', '\u{0313}']),
-        '\u{1F19}' => Some(&['\u{0395}', '\u{0314}']),
-        '\u{1F1A}' => Some(&['\u{0395}', '\u{0313}', '\u{0300}']),
-        '\u{1F1B}' => Some(&['\u{0395}', '\u{0314}', '\u{0300}']),
-        '\u{1F1C}' => Some(&['\u{0395}', '\u{0313}', '\u{0301}']),
-        '\u{1F1D}' => Some(&['\u{0395}', '\u{0314}', '\u{0301}']),
-        '\u{1F20}' => Some(&['\u{03B7}', '\u{0313}']),
-        '\u{1F21}' => Some(&['\u{03B7}', '\u{0314}']),
-        '\u{1F22}' => Some(&['\u{03B7}', '\u{0313}', '\u{0300}']),
-        '\u{1F23}' => Some(&['\u{03B7}', '\u{0314}', '\u{0300}']),
-        '\u{1F24}' => Some(&['\u{03B7}', '\u{0313}', '\u{0301}']),
-        '\u{1F25}' => Some(&['\u{03B7}', '\u{0314}', '\u{0301}']),
-        '\u{1F26}' => Some(&['\u{03B7}', '\u{0313}', '\u{0342}']),
-        '\u{1F27}' => Some(&['\u{03B7}', '\u{0314}', '\u{0342}']),
-        '\u{1F28}' => Some(&['\u{0397}', '\u{0313}']),
-        '\u{1F29}' => Some(&['\u{0397}', '\u{0314}']),
-        '\u{1F2A}' => Some(&['\u{0397}', '\u{0313}', '\u{0300}']),
-        '\u{1F2B}' => Some(&['\u{0397}', '\u{0314}', '\u{0300}']),
-        '\u{1F2C}' => Some(&['\u{0397}', '\u{0313}', '\u{0301}']),
-        '\u{1F2D}' => Some(&['\u{0397}', '\u{0314}', '\u{0301}']),
-        '\u{1F2E}' => Some(&['\u{0397}', '\u{0313}', '\u{0342}']),
-        '\u{1F2F}' => Some(&['\u{0397}', '\u{0314}', '\u{0342}']),
-        '\u{1F30}' => Some(&['\u{03B9}', '\u{0313}']),
-        '\u{1F31}' => Some(&['\u{03B9}', '\u{0314}']),
-        '\u{1F32}' => Some(&['\u{03B9}', '\u{0313}', '\u{0300}']),
-        '\u{1F33}' => Some(&['\u{03B9}', '\u{0314}', '\u{0300}']),
-        '\u{1F34}' => Some(&['\u{03B9}', '\u{0313}', '\u{0301}']),
-        '\u{1F35}' => Some(&['\u{03B9}', '\u{0314}', '\u{0301}']),
-        '\u{1F36}' => Some(&['\u{03B9}', '\u{0313}', '\u{0342}']),
-        '\u{1F37}' => Some(&['\u{03B9}', '\u{0314}', '\u{0342}']),
-        '\u{1F38}' => Some(&['\u{0399}', '\u{0313}']),
-        '\u{1F39}' => Some(&['\u{0399}', '\u{0314}']),
-        '\u{1F3A}' => Some(&['\u{0399}', '\u{0313}', '\u{0300}']),
-        '\u{1F3B}' => Some(&['\u{0399}', '\u{0314}', '\u{0300}']),
-        '\u{1F3C}' => Some(&['\u{0399}', '\u{0313}', '\u{0301}']),
-        '\u{1F3D}' => Some(&['\u{0399}', '\u{0314}', '\u{0301}']),
-        '\u{1F3E}' => Some(&['\u{0399}', '\u{0313}', '\u{0342}']),
-        '\u{1F3F}' => Some(&['\u{0399}', '\u{0314}', '\u{0342}']),
-        '\u{1F40}' => Some(&['\u{03BF}', '\u{0313}']),
-        '\u{1F41}' => Some(&['\u{03BF}', '\u{0314}']),
-        '\u{1F42}' => Some(&['\u{03BF}', '\u{0313}', '\u{0300}']),
-        '\u{1F43}' => Some(&['\u{03BF}', '\u{0314}', '\u{0300}']),
-        '\u{1F44}' => Some(&['\u{03BF}', '\u{0313}', '\u{0301}']),
-        '\u{1F45}' => Some(&['\u{03BF}', '\u{0314}', '\u{0301}']),
-        '\u{1F48}' => Some(&['\u{039F}', '\u{0313}']),
-        '\u{1F49}' => Some(&['\u{039F}', '\u{0314}']),
-        '\u{1F4A}' => Some(&['\u{039F}', '\u{0313}', '\u{0300}']),
-        '\u{1F4B}' => Some(&['\u{039F}', '\u{0314}', '\u{0300}']),
-        '\u{1F4C}' => Some(&['\u{039F}', '\u{0313}', '\u{0301}']),
-        '\u{1F4D}' => Some(&['\u{039F}', '\u{0314}', '\u{0301}']),
-        '\u{1F50}' => Some(&['\u{03C5}', '\u{0313}']),
-        '\u{1F51}' => Some(&['\u{03C5}', '\u{0314}']),
-        '\u{1F52}' => Some(&['\u{03C5}', '\u{0313}', '\u{0300}']),
-        '\u{1F53}' => Some(&['\u{03C5}', '\u{0314}', '\u{0300}']),
-        '\u{1F54}' => Some(&['\u{03C5}', '\u{0313}', '\u{0301}']),
-        '\u{1F55}' => Some(&['\u{03C5}', '\u{0314}', '\u{0301}']),
-        '\u{1F56}' => Some(&['\u{03C5}', '\u{0313}', '\u{0342}']),
-        '\u{1F57}' => Some(&['\u{03C5}', '\u{0314}', '\u{0342}']),
-        '\u{1F59}' => Some(&['\u{03A5}', '\u{0314}']),
-        '\u{1F5B}' => Some(&['\u{03A5}', '\u{0314}', '\u{0300}']),
-        '\u{1F5D}' => Some(&['\u{03A5}', '\u{0314}', '\u{0301}']),
-        '\u{1F5F}' => Some(&['\u{03A5}', '\u{0314}', '\u{0342}']),
-        '\u{1F60}' => Some(&['\u{03C9}', '\u{0313}']),
-        '\u{1F61}' => Some(&['\u{03C9}', '\u{0314}']),
-        '\u{1F62}' => Some(&['\u{03C9}', '\u{0313}', '\u{0300}']),
-        '\u{1F63}' => Some(&['\u{03C9}', '\u{0314}', '\u{0300}']),
-        '\u{1F64}' => Some(&['\u{03C9}', '\u{0313}', '\u{0301}']),
-        '\u{1F65}' => Some(&['\u{03C9}', '\u{0314}', '\u{0301}']),
-        '\u{1F66}' => Some(&['\u{03C9}', '\u{0313}', '\u{0342}']),
-        '\u{1F67}' => Some(&['\u{03C9}', '\u{0314}', '\u{0342}']),
-        '\u{1F68}' => Some(&['\u{03A9}', '\u{0313}']),
-        '\u{1F69}' => Some(&['\u{03A9}', '\u{0314}']),
-        '\u{1F6A}' => Some(&['\u{03A9}', '\u{0313}', '\u{0300}']),
-        '\u{1F6B}' => Some(&['\u{03A9}', '\u{0314}', '\u{0300}']),
-        '\u{1F6C}' => Some(&['\u{03A9}', '\u{0313}', '\u{0301}']),
-        '\u{1F6D}' => Some(&['\u{03A9}', '\u{0314}', '\u{0301}']),
-        '\u{1F6E}' => Some(&['\u{03A9}', '\u{0313}', '\u{0342}']),
-        '\u{1F6F}' => Some(&['\u{03A9}', '\u{0314}', '\u{0342}']),
-        '\u{1F70}' => Some(&['\u{03B1}', '\u{0300}']),
-        '\u{1F71}' => Some(&['\u{03B1}', '\u{0301}']),
-        '\u{1F72}' => Some(&['\u{03B5}', '\u{0300}']),
-        '\u{1F73}' => Some(&['\u{03B5}', '\u{0301}']),
-        '\u{1F74}' => Some(&['\u{03B7}', '\u{0300}']),
-        '\u{1F75}' => Some(&['\u{03B7}', '\u{0301}']),
-        '\u{1F76}' => Some(&['\u{03B9}', '\u{0300}']),
-        '\u{1F77}' => Some(&['\u{03B9}', '\u{0301}']),
-        '\u{1F78}' => Some(&['\u{03BF}', '\u{0300}']),
-        '\u{1F79}' => Some(&['\u{03BF}', '\u{0301}']),
-        '\u{1F7A}' => Some(&['\u{03C5}', '\u{0300}']),
-        '\u{1F7B}' => Some(&['\u{03C5}', '\u{0301}']),
-        '\u{1F7C}' => Some(&['\u{03C9}', '\u{0300}']),
-        '\u{1F7D}' => Some(&['\u{03C9}', '\u{0301}']),
-        '\u{1F80}' => Some(&['\u{03B1}', '\u{0313}', '\u{0345}']),
-        '\u{1F81}' => Some(&['\u{03B1}', '\u{0314}', '\u{0345}']),
-        '\u{1F82}' => Some(&['\u{03B1}', '\u{0313}', '\u{0300}', '\u{0345}']),
-        '\u{1F83}' => Some(&['\u{03B1}', '\u{0314}', '\u{0300}', '\u{0345}']),
-        '\u{1F84}' => Some(&['\u{03B1}', '\u{0313}', '\u{0301}', '\u{0345}']),
-        '\u{1F85}' => Some(&['\u{03B1}', '\u{0314}', '\u{0301}', '\u{0345}']),
-        '\u{1F86}' => Some(&['\u{03B1}', '\u{0313}', '\u{0342}', '\u{0345}']),
-        '\u{1F87}' => Some(&['\u{03B1}', '\u{0314}', '\u{0342}', '\u{0345}']),
-        '\u{1F88}' => Some(&['\u{0391}', '\u{0313}', '\u{0345}']),
-        '\u{1F89}' => Some(&['\u{0391}', '\u{0314}', '\u{0345}']),
-        '\u{1F8A}' => Some(&['\u{0391}', '\u{0313}', '\u{0300}', '\u{0345}']),
-        '\u{1F8B}' => Some(&['\u{0391}', '\u{0314}', '\u{0300}', '\u{0345}']),
-        '\u{1F8C}' => Some(&['\u{0391}', '\u{0313}', '\u{0301}', '\u{0345}']),
-        '\u{1F8D}' => Some(&['\u{0391}', '\u{0314}', '\u{0301}', '\u{0345}']),
-        '\u{1F8E}' => Some(&['\u{0391}', '\u{0313}', '\u{0342}', '\u{0345}']),
-        '\u{1F8F}' => Some(&['\u{0391}', '\u{0314}', '\u{0342}', '\u{0345}']),
-        '\u{1F90}' => Some(&['\u{03B7}', '\u{0313}', '\u{0345}']),
-        '\u{1F91}' => Some(&['\u{03B7}', '\u{0314}', '\u{0345}']),
-        '\u{1F92}' => Some(&['\u{03B7}', '\u{0313}', '\u{0300}', '\u{0345}']),
-        '\u{1F93}' => Some(&['\u{03B7}', '\u{0314}', '\u{0300}', '\u{0345}']),
-        '\u{1F94}' => Some(&['\u{03B7}', '\u{0313}', '\u{0301}', '\u{0345}']),
-        '\u{1F95}' => Some(&['\u{03B7}', '\u{0314}', '\u{0301}', '\u{0345}']),
-        '\u{1F96}' => Some(&['\u{03B7}', '\u{0313}', '\u{0342}', '\u{0345}']),
-        '\u{1F97}' => Some(&['\u{03B7}', '\u{0314}', '\u{0342}', '\u{0345}']),
-        '\u{1F98}' => Some(&['\u{0397}', '\u{0313}', '\u{0345}']),
-        '\u{1F99}' => Some(&['\u{0397}', '\u{0314}', '\u{0345}']),
-        '\u{1F9A}' => Some(&['\u{0397}', '\u{0313}', '\u{0300}', '\u{0345}']),
-        '\u{1F9B}' => Some(&['\u{0397}', '\u{0314}', '\u{0300}', '\u{0345}']),
-        '\u{1F9C}' => Some(&['\u{0397}', '\u{0313}', '\u{0301}', '\u{0345}']),
-        '\u{1F9D}' => Some(&['\u{0397}', '\u{0314}', '\u{0301}', '\u{0345}']),
-        '\u{1F9E}' => Some(&['\u{0397}', '\u{0313}', '\u{0342}', '\u{0345}']),
-        '\u{1F9F}' => Some(&['\u{0397}', '\u{0314}', '\u{0342}', '\u{0345}']),
-        '\u{1FA0}' => Some(&['\u{03C9}', '\u{0313}', '\u{0345}']),
-        '\u{1FA1}' => Some(&['\u{03C9}', '\u{0314}', '\u{0345}']),
-        '\u{1FA2}' => Some(&['\u{03C9}', '\u{0313}', '\u{0300}', '\u{0345}']),
-        '\u{1FA3}' => Some(&['\u{03C9}', '\u{0314}', '\u{0300}', '\u{0345}']),
-        '\u{1FA4}' => Some(&['\u{03C9}', '\u{0313}', '\u{0301}', '\u{0345}']),
-        '\u{1FA5}' => Some(&['\u{03C9}', '\u{0314}', '\u{0301}', '\u{0345}']),
-        '\u{1FA6}' => Some(&['\u{03C9}', '\u{0313}', '\u{0342}', '\u{0345}']),
-        '\u{1FA7}' => Some(&['\u{03C9}', '\u{0314}', '\u{0342}', '\u{0345}']),
-        '\u{1FA8}' => Some(&['\u{03A9}', '\u{0313}', '\u{0345}']),
-        '\u{1FA9}' => Some(&['\u{03A9}', '\u{0314}', '\u{0345}']),
-        '\u{1FAA}' => Some(&['\u{03A9}', '\u{0313}', '\u{0300}', '\u{0345}']),
-        '\u{1FAB}' => Some(&['\u{03A9}', '\u{0314}', '\u{0300}', '\u{0345}']),
-        '\u{1FAC}' => Some(&['\u{03A9}', '\u{0313}', '\u{0301}', '\u{0345}']),
-        '\u{1FAD}' => Some(&['\u{03A9}', '\u{0314}', '\u{0301}', '\u{0345}']),
-        '\u{1FAE}' => Some(&['\u{03A9}', '\u{0313}', '\u{0342}', '\u{0345}']),
-        '\u{1FAF}' => Some(&['\u{03A9}', '\u{0314}', '\u{0342}', '\u{0345}']),
-        '\u{1FB0}' => Some(&['\u{03B1}', '\u{0306}']),
-        '\u{1FB1}' => Some(&['\u{03B1}', '\u{0304}']),
-        '\u{1FB2}' => Some(&['\u{03B1}', '\u{0300}', '\u{0345}']),
-        '\u{1FB3}' => Some(&['\u{03B1}', '\u{0345}']),
-        '\u{1FB4}' => Some(&['\u{03B1}', '\u{0301}', '\u{0345}']),
-        '\u{1FB6}' => Some(&['\u{03B1}', '\u{0342}']),
-        '\u{1FB7}' => Some(&['\u{03B1}', '\u{0342}', '\u{0345}']),
-        '\u{1FB8}' => Some(&['\u{0391}', '\u{0306}']),
-        '\u{1FB9}' => Some(&['\u{0391}', '\u{0304}']),
-        '\u{1FBA}' => Some(&['\u{0391}', '\u{0300}']),
-        '\u{1FBB}' => Some(&['\u{0391}', '\u{0301}']),
-        '\u{1FBC}' => Some(&['\u{0391}', '\u{0345}']),
-        '\u{1FBE}' => Some(&['\u{03B9}']),
-        '\u{1FC1}' => Some(&['\u{00A8}', '\u{0342}']),
-        '\u{1FC2}' => Some(&['\u{03B7}', '\u{0300}', '\u{0345}']),
-        '\u{1FC3}' => Some(&['\u{03B7}', '\u{0345}']),
-        '\u{1FC4}' => Some(&['\u{03B7}', '\u{0301}', '\u{0345}']),
-        '\u{1FC6}' => Some(&['\u{03B7}', '\u{0342}']),
-        '\u{1FC7}' => Some(&['\u{03B7}', '\u{0342}', '\u{0345}']),
-        '\u{1FC8}' => Some(&['\u{0395}', '\u{0300}']),
-        '\u{1FC9}' => Some(&['\u{0395}', '\u{0301}']),
-        '\u{1FCA}' => Some(&['\u{0397}', '\u{0300}']),
-        '\u{1FCB}' => Some(&['\u{0397}', '\u{0301}']),
-        '\u{1FCC}' => Some(&['\u{0397}', '\u{0345}']),
-        '\u{1FCD}' => Some(&['\u{1FBF}', '\u{0300}']),
-        '\u{1FCE}' => Some(&['\u{1FBF}', '\u{0301}']),
-        '\u{1FCF}' => Some(&['\u{1FBF}', '\u{0342}']),
-        '\u{1FD0}' => Some(&['\u{03B9}', '\u{0306}']),
-        '\u{1FD1}' => Some(&['\u{03B9}', '\u{0304}']),
-        '\u{1FD2}' => Some(&['\u{03B9}', '\u{0308}', '\u{0300}']),
-        '\u{1FD3}' => Some(&['\u{03B9}', '\u{0308}', '\u{0301}']),
-        '\u{1FD6}' => Some(&['\u{03B9}', '\u{0342}']),
-        '\u{1FD7}' => Some(&['\u{03B9}', '\u{0308}', '\u{0342}']),
-        '\u{1FD8}' => Some(&['\u{0399}', '\u{0306}']),
-        '\u{1FD9}' => Some(&['\u{0399}', '\u{0304}']),
-        '\u{1FDA}' => Some(&['\u{0399}', '\u{0300}']),
-        '\u{1FDB}' => Some(&['\u{0399}', '\u{0301}']),
-        '\u{1FDD}' => Some(&['\u{1FFE}', '\u{0300}']),
-        '\u{1FDE}' => Some(&['\u{1FFE}', '\u{0301}']),
-        '\u{1FDF}' => Some(&['\u{1FFE}', '\u{0342}']),
-        '\u{1FE0}' => Some(&['\u{03C5}', '\u{0306}']),
-        '\u{1FE1}' => Some(&['\u{03C5}', '\u{0304}']),
-        '\u{1FE2}' => Some(&['\u{03C5}', '\u{0308}', '\u{0300}']),
-        '\u{1FE3}' => Some(&['\u{03C5}', '\u{0308}', '\u{0301}']),
-        '\u{1FE4}' => Some(&['\u{03C1}', '\u{0313}']),
-        '\u{1FE5}' => Some(&['\u{03C1}', '\u{0314}']),
-        '\u{1FE6}' => Some(&['\u{03C5}', '\u{0342}']),
-        '\u{1FE7}' => Some(&['\u{03C5}', '\u{0308}', '\u{0342}']),
-        '\u{1FE8}' => Some(&['\u{03A5}', '\u{0306}']),
-        '\u{1FE9}' => Some(&['\u{03A5}', '\u{0304}']),
-        '\u{1FEA}' => Some(&['\u{03A5}', '\u{0300}']),
-        '\u{1FEB}' => Some(&['\u{03A5}', '\u{0301}']),
-        '\u{1FEC}' => Some(&['\u{03A1}', '\u{0314}']),
-        '\u{1FED}' => Some(&['\u{00A8}', '\u{0300}']),
-        '\u{1FEE}' => Some(&['\u{00A8}', '\u{0301}']),
-        '\u{1FEF}' => Some(&['\u{0060}']),
-        '\u{1FF2}' => Some(&['\u{03C9}', '\u{0300}', '\u{0345}']),
-        '\u{1FF3}' => Some(&['\u{03C9}', '\u{0345}']),
-        '\u{1FF4}' => Some(&['\u{03C9}', '\u{0301}', '\u{0345}']),
-        '\u{1FF6}' => Some(&['\u{03C9}', '\u{0342}']),
-        '\u{1FF7}' => Some(&['\u{03C9}', '\u{0342}', '\u{0345}']),
-        '\u{1FF8}' => Some(&['\u{039F}', '\u{0300}']),
-        '\u{1FF9}' => Some(&['\u{039F}', '\u{0301}']),
-        '\u{1FFA}' => Some(&['\u{03A9}', '\u{0300}']),
-        '\u{1FFB}' => Some(&['\u{03A9}', '\u{0301}']),
-        '\u{1FFC}' => Some(&['\u{03A9}', '\u{0345}']),
-        '\u{1FFD}' => Some(&['\u{00B4}']),
-        '\u{2000}' => Some(&['\u{2002}']),
-        '\u{2001}' => Some(&['\u{2003}']),
-        '\u{2126}' => Some(&['\u{03A9}']),
-        '\u{212A}' => Some(&['\u{004B}']),
-        '\u{212B}' => Some(&['\u{0041}', '\u{030A}']),
-        '\u{219A}' => Some(&['\u{2190}', '\u{0338}']),
-        '\u{219B}' => Some(&['\u{2192}', '\u{0338}']),
-        '\u{21AE}' => Some(&['\u{2194}', '\u{0338}']),
-        '\u{21CD}' => Some(&['\u{21D0}', '\u{0338}']),
-        '\u{21CE}' => Some(&['\u{21D4}', '\u{0338}']),
-        '\u{21CF}' => Some(&['\u{21D2}', '\u{0338}']),
-        '\u{2204}' => Some(&['\u{2203}', '\u{0338}']),
-        '\u{2209}' => Some(&['\u{2208}', '\u{0338}']),
-        '\u{220C}' => Some(&['\u{220B}', '\u{0338}']),
-        '\u{2224}' => Some(&['\u{2223}', '\u{0338}']),
-        '\u{2226}' => Some(&['\u{2225}', '\u{0338}']),
-        '\u{2241}' => Some(&['\u{223C}', '\u{0338}']),
-        '\u{2244}' => Some(&['\u{2243}', '\u{0338}']),
-        '\u{2247}' => Some(&['\u{2245}', '\u{0338}']),
-        '\u{2249}' => Some(&['\u{2248}', '\u{0338}']),
-        '\u{2260}' => Some(&['\u{003D}', '\u{0338}']),
-        '\u{2262}' => Some(&['\u{2261}', '\u{0338}']),
-        '\u{226D}' => Some(&['\u{224D}', '\u{0338}']),
-        '\u{226E}' => Some(&['\u{003C}', '\u{0338}']),
-        '\u{226F}' => Some(&['\u{003E}', '\u{0338}']),
-        '\u{2270}' => Some(&['\u{2264}', '\u{0338}']),
-        '\u{2271}' => Some(&['\u{2265}', '\u{0338}']),
-        '\u{2274}' => Some(&['\u{2272}', '\u{0338}']),
-        '\u{2275}' => Some(&['\u{2273}', '\u{0338}']),
-        '\u{2278}' => Some(&['\u{2276}', '\u{0338}']),
-        '\u{2279}' => Some(&['\u{2277}', '\u{0338}']),
-        '\u{2280}' => Some(&['\u{227A}', '\u{0338}']),
-        '\u{2281}' => Some(&['\u{227B}', '\u{0338}']),
-        '\u{2284}' => Some(&['\u{2282}', '\u{0338}']),
-        '\u{2285}' => Some(&['\u{2283}', '\u{0338}']),
-        '\u{2288}' => Some(&['\u{2286}', '\u{0338}']),
-        '\u{2289}' => Some(&['\u{2287}', '\u{0338}']),
-        '\u{22AC}' => Some(&['\u{22A2}', '\u{0338}']),
-        '\u{22AD}' => Some(&['\u{22A8}', '\u{0338}']),
-        '\u{22AE}' => Some(&['\u{22A9}', '\u{0338}']),
-        '\u{22AF}' => Some(&['\u{22AB}', '\u{0338}']),
-        '\u{22E0}' => Some(&['\u{227C}', '\u{0338}']),
-        '\u{22E1}' => Some(&['\u{227D}', '\u{0338}']),
-        '\u{22E2}' => Some(&['\u{2291}', '\u{0338}']),
-        '\u{22E3}' => Some(&['\u{2292}', '\u{0338}']),
-        '\u{22EA}' => Some(&['\u{22B2}', '\u{0338}']),
-        '\u{22EB}' => Some(&['\u{22B3}', '\u{0338}']),
-        '\u{22EC}' => Some(&['\u{22B4}', '\u{0338}']),
-        '\u{22ED}' => Some(&['\u{22B5}', '\u{0338}']),
-        '\u{2329}' => Some(&['\u{3008}']),
-        '\u{232A}' => Some(&['\u{3009}']),
-        '\u{2ADC}' => Some(&['\u{2ADD}', '\u{0338}']),
-        '\u{304C}' => Some(&['\u{304B}', '\u{3099}']),
-        '\u{304E}' => Some(&['\u{304D}', '\u{3099}']),
-        '\u{3050}' => Some(&['\u{304F}', '\u{3099}']),
-        '\u{3052}' => Some(&['\u{3051}', '\u{3099}']),
-        '\u{3054}' => Some(&['\u{3053}', '\u{3099}']),
-        '\u{3056}' => Some(&['\u{3055}', '\u{3099}']),
-        '\u{3058}' => Some(&['\u{3057}', '\u{3099}']),
-        '\u{305A}' => Some(&['\u{3059}', '\u{3099}']),
-        '\u{305C}' => Some(&['\u{305B}', '\u{3099}']),
-        '\u{305E}' => Some(&['\u{305D}', '\u{3099}']),
-        '\u{3060}' => Some(&['\u{305F}', '\u{3099}']),
-        '\u{3062}' => Some(&['\u{3061}', '\u{3099}']),
-        '\u{3065}' => Some(&['\u{3064}', '\u{3099}']),
-        '\u{3067}' => Some(&['\u{3066}', '\u{3099}']),
-        '\u{3069}' => Some(&['\u{3068}', '\u{3099}']),
-        '\u{3070}' => Some(&['\u{306F}', '\u{3099}']),
-        '\u{3071}' => Some(&['\u{306F}', '\u{309A}']),
-        '\u{3073}' => Some(&['\u{3072}', '\u{3099}']),
-        '\u{3074}' => Some(&['\u{3072}', '\u{309A}']),
-        '\u{3076}' => Some(&['\u{3075}', '\u{3099}']),
-        '\u{3077}' => Some(&['\u{3075}', '\u{309A}']),
-        '\u{3079}' => Some(&['\u{3078}', '\u{3099}']),
-        '\u{307A}' => Some(&['\u{3078}', '\u{309A}']),
-        '\u{307C}' => Some(&['\u{307B}', '\u{3099}']),
-        '\u{307D}' => Some(&['\u{307B}', '\u{309A}']),
-        '\u{3094}' => Some(&['\u{3046}', '\u{3099}']),
-        '\u{309E}' => Some(&['\u{309D}', '\u{3099}']),
-        '\u{30AC}' => Some(&['\u{30AB}', '\u{3099}']),
-        '\u{30AE}' => Some(&['\u{30AD}', '\u{3099}']),
-        '\u{30B0}' => Some(&['\u{30AF}', '\u{3099}']),
-        '\u{30B2}' => Some(&['\u{30B1}', '\u{3099}']),
-        '\u{30B4}' => Some(&['\u{30B3}', '\u{3099}']),
-        '\u{30B6}' => Some(&['\u{30B5}', '\u{3099}']),
-        '\u{30B8}' => Some(&['\u{30B7}', '\u{3099}']),
-        '\u{30BA}' => Some(&['\u{30B9}', '\u{3099}']),
-        '\u{30BC}' => Some(&['\u{30BB}', '\u{3099}']),
-        '\u{30BE}' => Some(&['\u{30BD}', '\u{3099}']),
-        '\u{30C0}' => Some(&['\u{30BF}', '\u{3099}']),
-        '\u{30C2}' => Some(&['\u{30C1}', '\u{3099}']),
-        '\u{30C5}' => Some(&['\u{30C4}', '\u{3099}']),
-        '\u{30C7}' => Some(&['\u{30C6}', '\u{3099}']),
-        '\u{30C9}' => Some(&['\u{30C8}', '\u{3099}']),
-        '\u{30D0}' => Some(&['\u{30CF}', '\u{3099}']),
-        '\u{30D1}' => Some(&['\u{30CF}', '\u{309A}']),
-        '\u{30D3}' => Some(&['\u{30D2}', '\u{3099}']),
-        '\u{30D4}' => Some(&['\u{30D2}', '\u{309A}']),
-        '\u{30D6}' => Some(&['\u{30D5}', '\u{3099}']),
-        '\u{30D7}' => Some(&['\u{30D5}', '\u{309A}']),
-        '\u{30D9}' => Some(&['\u{30D8}', '\u{3099}']),
-        '\u{30DA}' => Some(&['\u{30D8}', '\u{309A}']),
-        '\u{30DC}' => Some(&['\u{30DB}', '\u{3099}']),
-        '\u{30DD}' => Some(&['\u{30DB}', '\u{309A}']),
-        '\u{30F4}' => Some(&['\u{30A6}', '\u{3099}']),
-        '\u{30F7}' => Some(&['\u{30EF}', '\u{3099}']),
-        '\u{30F8}' => Some(&['\u{30F0}', '\u{3099}']),
-        '\u{30F9}' => Some(&['\u{30F1}', '\u{3099}']),
-        '\u{30FA}' => Some(&['\u{30F2}', '\u{3099}']),
-        '\u{30FE}' => Some(&['\u{30FD}', '\u{3099}']),
-        '\u{F900}' => Some(&['\u{8C48}']),
-        '\u{F901}' => Some(&['\u{66F4}']),
-        '\u{F902}' => Some(&['\u{8ECA}']),
-        '\u{F903}' => Some(&['\u{8CC8}']),
-        '\u{F904}' => Some(&['\u{6ED1}']),
-        '\u{F905}' => Some(&['\u{4E32}']),
-        '\u{F906}' => Some(&['\u{53E5}']),
-        '\u{F907}' => Some(&['\u{9F9C}']),
-        '\u{F908}' => Some(&['\u{9F9C}']),
-        '\u{F909}' => Some(&['\u{5951}']),
-        '\u{F90A}' => Some(&['\u{91D1}']),
-        '\u{F90B}' => Some(&['\u{5587}']),
-        '\u{F90C}' => Some(&['\u{5948}']),
-        '\u{F90D}' => Some(&['\u{61F6}']),
-        '\u{F90E}' => Some(&['\u{7669}']),
-        '\u{F90F}' => Some(&['\u{7F85}']),
-        '\u{F910}' => Some(&['\u{863F}']),
-        '\u{F911}' => Some(&['\u{87BA}']),
-        '\u{F912}' => Some(&['\u{88F8}']),
-        '\u{F913}' => Some(&['\u{908F}']),
-        '\u{F914}' => Some(&['\u{6A02}']),
-        '\u{F915}' => Some(&['\u{6D1B}']),
-        '\u{F916}' => Some(&['\u{70D9}']),
-        '\u{F917}' => Some(&['\u{73DE}']),
-        '\u{F918}' => Some(&['\u{843D}']),
-        '\u{F919}' => Some(&['\u{916A}']),
-        '\u{F91A}' => Some(&['\u{99F1}']),
-        '\u{F91B}' => Some(&['\u{4E82}']),
-        '\u{F91C}' => Some(&['\u{5375}']),
-        '\u{F91D}' => Some(&['\u{6B04}']),
-        '\u{F91E}' => Some(&['\u{721B}']),
-        '\u{F91F}' => Some(&['\u{862D}']),
-        '\u{F920}' => Some(&['\u{9E1E}']),
-        '\u{F921}' => Some(&['\u{5D50}']),
-        '\u{F922}' => Some(&['\u{6FEB}']),
-        '\u{F923}' => Some(&['\u{85CD}']),
-        '\u{F924}' => Some(&['\u{8964}']),
-        '\u{F925}' => Some(&['\u{62C9}']),
-        '\u{F926}' => Some(&['\u{81D8}']),
-        '\u{F927}' => Some(&['\u{881F}']),
-        '\u{F928}' => Some(&['\u{5ECA}']),
-        '\u{F929}' => Some(&['\u{6717}']),
-        '\u{F92A}' => Some(&['\u{6D6A}']),
-        '\u{F92B}' => Some(&['\u{72FC}']),
-        '\u{F92C}' => Some(&['\u{90CE}']),
-        '\u{F92D}' => Some(&['\u{4F86}']),
-        '\u{F92E}' => Some(&['\u{51B7}']),
-        '\u{F92F}' => Some(&['\u{52DE}']),
-        '\u{F930}' => Some(&['\u{64C4}']),
-        '\u{F931}' => Some(&['\u{6AD3}']),
-        '\u{F932}' => Some(&['\u{7210}']),
-        '\u{F933}' => Some(&['\u{76E7}']),
-        '\u{F934}' => Some(&['\u{8001}']),
-        '\u{F935}' => Some(&['\u{8606}']),
-        '\u{F936}' => Some(&['\u{865C}']),
-        '\u{F937}' => Some(&['\u{8DEF}']),
-        '\u{F938}' => Some(&['\u{9732}']),
-        '\u{F939}' => Some(&['\u{9B6F}']),
-        '\u{F93A}' => Some(&['\u{9DFA}']),
-        '\u{F93B}' => Some(&['\u{788C}']),
-        '\u{F93C}' => Some(&['\u{797F}']),
-        '\u{F93D}' => Some(&['\u{7DA0}']),
-        '\u{F93E}' => Some(&['\u{83C9}']),
-        '\u{F93F}' => Some(&['\u{9304}']),
-        '\u{F940}' => Some(&['\u{9E7F}']),
-        '\u{F941}' => Some(&['\u{8AD6}']),
-        '\u{F942}' => Some(&['\u{58DF}']),
-        '\u{F943}' => Some(&['\u{5F04}']),
-        '\u{F944}' => Some(&['\u{7C60}']),
-        '\u{F945}' => Some(&['\u{807E}']),
-        '\u{F946}' => Some(&['\u{7262}']),
-        '\u{F947}' => Some(&['\u{78CA}']),
-        '\u{F948}' => Some(&['\u{8CC2}']),
-        '\u{F949}' => Some(&['\u{96F7}']),
-        '\u{F94A}' => Some(&['\u{58D8}']),
-        '\u{F94B}' => Some(&['\u{5C62}']),
-        '\u{F94C}' => Some(&['\u{6A13}']),
-        '\u{F94D}' => Some(&['\u{6DDA}']),
-        '\u{F94E}' => Some(&['\u{6F0F}']),
-        '\u{F94F}' => Some(&['\u{7D2F}']),
-        '\u{F950}' => Some(&['\u{7E37}']),
-        '\u{F951}' => Some(&['\u{964B}']),
-        '\u{F952}' => Some(&['\u{52D2}']),
-        '\u{F953}' => Some(&['\u{808B}']),
-        '\u{F954}' => Some(&['\u{51DC}']),
-        '\u{F955}' => Some(&['\u{51CC}']),
-        '\u{F956}' => Some(&['\u{7A1C}']),
-        '\u{F957}' => Some(&['\u{7DBE}']),
-        '\u{F958}' => Some(&['\u{83F1}']),
-        '\u{F959}' => Some(&['\u{9675}']),
-        '\u{F95A}' => Some(&['\u{8B80}']),
-        '\u{F95B}' => Some(&['\u{62CF}']),
-        '\u{F95C}' => Some(&['\u{6A02}']),
-        '\u{F95D}' => Some(&['\u{8AFE}']),
-        '\u{F95E}' => Some(&['\u{4E39}']),
-        '\u{F95F}' => Some(&['\u{5BE7}']),
-        '\u{F960}' => Some(&['\u{6012}']),
-        '\u{F961}' => Some(&['\u{7387}']),
-        '\u{F962}' => Some(&['\u{7570}']),
-        '\u{F963}' => Some(&['\u{5317}']),
-        '\u{F964}' => Some(&['\u{78FB}']),
-        '\u{F965}' => Some(&['\u{4FBF}']),
-        '\u{F966}' => Some(&['\u{5FA9}']),
-        '\u{F967}' => Some(&['\u{4E0D}']),
-        '\u{F968}' => Some(&['\u{6CCC}']),
-        '\u{F969}' => Some(&['\u{6578}']),
-        '\u{F96A}' => Some(&['\u{7D22}']),
-        '\u{F96B}' => Some(&['\u{53C3}']),
-        '\u{F96C}' => Some(&['\u{585E}']),
-        '\u{F96D}' => Some(&['\u{7701}']),
-        '\u{F96E}' => Some(&['\u{8449}']),
-        '\u{F96F}' => Some(&['\u{8AAA}']),
-        '\u{F970}' => Some(&['\u{6BBA}']),
-        '\u{F971}' => Some(&['\u{8FB0}']),
-        '\u{F972}' => Some(&['\u{6C88}']),
-        '\u{F973}' => Some(&['\u{62FE}']),
-        '\u{F974}' => Some(&['\u{82E5}']),
-        '\u{F975}' => Some(&['\u{63A0}']),
-        '\u{F976}' => Some(&['\u{7565}']),
-        '\u{F977}' => Some(&['\u{4EAE}']),
-        '\u{F978}' => Some(&['\u{5169}']),
-        '\u{F979}' => Some(&['\u{51C9}']),
-        '\u{F97A}' => Some(&['\u{6881}']),
-        '\u{F97B}' => Some(&['\u{7CE7}']),
-        '\u{F97C}' => Some(&['\u{826F}']),
-        '\u{F97D}' => Some(&['\u{8AD2}']),
-        '\u{F97E}' => Some(&['\u{91CF}']),
-        '\u{F97F}' => Some(&['\u{52F5}']),
-        '\u{F980}' => Some(&['\u{5442}']),
-        '\u{F981}' => Some(&['\u{5973}']),
-        '\u{F982}' => Some(&['\u{5EEC}']),
-        '\u{F983}' => Some(&['\u{65C5}']),
-        '\u{F984}' => Some(&['\u{6FFE}']),
-        '\u{F985}' => Some(&['\u{792A}']),
-        '\u{F986}' => Some(&['\u{95AD}']),
-        '\u{F987}' => Some(&['\u{9A6A}']),
-        '\u{F988}' => Some(&['\u{9E97}']),
-        '\u{F989}' => Some(&['\u{9ECE}']),
-        '\u{F98A}' => Some(&['\u{529B}']),
-        '\u{F98B}' => Some(&['\u{66C6}']),
-        '\u{F98C}' => Some(&['\u{6B77}']),
-        '\u{F98D}' => Some(&['\u{8F62}']),
-        '\u{F98E}' => Some(&['\u{5E74}']),
-        '\u{F98F}' => Some(&['\u{6190}']),
-        '\u{F990}' => Some(&['\u{6200}']),
-        '\u{F991}' => Some(&['\u{649A}']),
-        '\u{F992}' => Some(&['\u{6F23}']),
-        '\u{F993}' => Some(&['\u{7149}']),
-        '\u{F994}' => Some(&['\u{7489}']),
-        '\u{F995}' => Some(&['\u{79CA}']),
-        '\u{F996}' => Some(&['\u{7DF4}']),
-        '\u{F997}' => Some(&['\u{806F}']),
-        '\u{F998}' => Some(&['\u{8F26}']),
-        '\u{F999}' => Some(&['\u{84EE}']),
-        '\u{F99A}' => Some(&['\u{9023}']),
-        '\u{F99B}' => Some(&['\u{934A}']),
-        '\u{F99C}' => Some(&['\u{5217}']),
-        '\u{F99D}' => Some(&['\u{52A3}']),
-        '\u{F99E}' => Some(&['\u{54BD}']),
-        '\u{F99F}' => Some(&['\u{70C8}']),
-        '\u{F9A0}' => Some(&['\u{88C2}']),
-        '\u{F9A1}' => Some(&['\u{8AAA}']),
-        '\u{F9A2}' => Some(&['\u{5EC9}']),
-        '\u{F9A3}' => Some(&['\u{5FF5}']),
-        '\u{F9A4}' => Some(&['\u{637B}']),
-        '\u{F9A5}' => Some(&['\u{6BAE}']),
-        '\u{F9A6}' => Some(&['\u{7C3E}']),
-        '\u{F9A7}' => Some(&['\u{7375}']),
-        '\u{F9A8}' => Some(&['\u{4EE4}']),
-        '\u{F9A9}' => Some(&['\u{56F9}']),
-        '\u{F9AA}' => Some(&['\u{5BE7}']),
-        '\u{F9AB}' => Some(&['\u{5DBA}']),
-        '\u{F9AC}' => Some(&['\u{601C}']),
-        '\u{F9AD}' => Some(&['\u{73B2}']),
-        '\u{F9AE}' => Some(&['\u{7469}']),
-        '\u{F9AF}' => Some(&['\u{7F9A}']),
-        '\u{F9B0}' => Some(&['\u{8046}']),
-        '\u{F9B1}' => Some(&['\u{9234}']),
-        '\u{F9B2}' => Some(&['\u{96F6}']),
-        '\u{F9B3}' => Some(&['\u{9748}']),
-        '\u{F9B4}' => Some(&['\u{9818}']),
-        '\u{F9B5}' => Some(&['\u{4F8B}']),
-        '\u{F9B6}' => Some(&['\u{79AE}']),
-        '\u{F9B7}' => Some(&['\u{91B4}']),
-        '\u{F9B8}' => Some(&['\u{96B8}']),
-        '\u{F9B9}' => Some(&['\u{60E1}']),
-        '\u{F9BA}' => Some(&['\u{4E86}']),
-        '\u{F9BB}' => Some(&['\u{50DA}']),
-        '\u{F9BC}' => Some(&['\u{5BEE}']),
-        '\u{F9BD}' => Some(&['\u{5C3F}']),
-        '\u{F9BE}' => Some(&['\u{6599}']),
-        '\u{F9BF}' => Some(&['\u{6A02}']),
-        '\u{F9C0}' => Some(&['\u{71CE}']),
-        '\u{F9C1}' => Some(&['\u{7642}']),
-        '\u{F9C2}' => Some(&['\u{84FC}']),
-        '\u{F9C3}' => Some(&['\u{907C}']),
-        '\u{F9C4}' => Some(&['\u{9F8D}']),
-        '\u{F9C5}' => Some(&['\u{6688}']),
-        '\u{F9C6}' => Some(&['\u{962E}']),
-        '\u{F9C7}' => Some(&['\u{5289}']),
-        '\u{F9C8}' => Some(&['\u{677B}']),
-        '\u{F9C9}' => Some(&['\u{67F3}']),
-        '\u{F9CA}' => Some(&['\u{6D41}']),
-        '\u{F9CB}' => Some(&['\u{6E9C}']),
-        '\u{F9CC}' => Some(&['\u{7409}']),
-        '\u{F9CD}' => Some(&['\u{7559}']),
-        '\u{F9CE}' => Some(&['\u{786B}']),
-        '\u{F9CF}' => Some(&['\u{7D10}']),
-        '\u{F9D0}' => Some(&['\u{985E}']),
-        '\u{F9D1}' => Some(&['\u{516D}']),
-        '\u{F9D2}' => Some(&['\u{622E}']),
-        '\u{F9D3}' => Some(&['\u{9678}']),
-        '\u{F9D4}' => Some(&['\u{502B}']),
-        '\u{F9D5}' => Some(&['\u{5D19}']),
-        '\u{F9D6}' => Some(&['\u{6DEA}']),
-        '\u{F9D7}' => Some(&['\u{8F2A}']),
-        '\u{F9D8}' => Some(&['\u{5F8B}']),
-        '\u{F9D9}' => Some(&['\u{6144}']),
-        '\u{F9DA}' => Some(&['\u{6817}']),
-        '\u{F9DB}' => Some(&['\u{7387}']),
-        '\u{F9DC}' => Some(&['\u{9686}']),
-        '\u{F9DD}' => Some(&['\u{5229}']),
-        '\u{F9DE}' => Some(&['\u{540F}']),
-        '\u{F9DF}' => Some(&['\u{5C65}']),
-        '\u{F9E0}' => Some(&['\u{6613}']),
-        '\u{F9E1}' => Some(&['\u{674E}']),
-        '\u{F9E2}' => Some(&['\u{68A8}']),
-        '\u{F9E3}' => Some(&['\u{6CE5}']),
-        '\u{F9E4}' => Some(&['\u{7406}']),
-        '\u{F9E5}' => Some(&['\u{75E2}']),
-        '\u{F9E6}' => Some(&['\u{7F79}']),
-        '\u{F9E7}' => Some(&['\u{88CF}']),
-        '\u{F9E8}' => Some(&['\u{88E1}']),
-        '\u{F9E9}' => Some(&['\u{91CC}']),
-        '\u{F9EA}' => Some(&['\u{96E2}']),
-        '\u{F9EB}' => Some(&['\u{533F}']),
-        '\u{F9EC}' => Some(&['\u{6EBA}']),
-        '\u{F9ED}' => Some(&['\u{541D}']),
-        '\u{F9EE}' => Some(&['\u{71D0}']),
-        '\u{F9EF}' => Some(&['\u{7498}']),
-        '\u{F9F0}' => Some(&['\u{85FA}']),
-        '\u{F9F1}' => Some(&['\u{96A3}']),
-        '\u{F9F2}' => Some(&['\u{9C57}']),
-        '\u{F9F3}' => Some(&['\u{9E9F}']),
-        '\u{F9F4}' => Some(&['\u{6797}']),
-        '\u{F9F5}' => Some(&['\u{6DCB}']),
-        '\u{F9F6}' => Some(&['\u{81E8}']),
-        '\u{F9F7}' => Some(&['\u{7ACB}']),
-        '\u{F9F8}' => Some(&['\u{7B20}']),
-        '\u{F9F9}' => Some(&['\u{7C92}']),
-        '\u{F9FA}' => Some(&['\u{72C0}']),
-        '\u{F9FB}' => Some(&['\u{7099}']),
-        '\u{F9FC}' => Some(&['\u{8B58}']),
-        '\u{F9FD}' => Some(&['\u{4EC0}']),
-        '\u{F9FE}' => Some(&['\u{8336}']),
-        '\u{F9FF}' => Some(&['\u{523A}']),
-        '\u{FA00}' => Some(&['\u{5207}']),
-        '\u{FA01}' => Some(&['\u{5EA6}']),
-        '\u{FA02}' => Some(&['\u{62D3}']),
-        '\u{FA03}' => Some(&['\u{7CD6}']),
-        '\u{FA04}' => Some(&['\u{5B85}']),
-        '\u{FA05}' => Some(&['\u{6D1E}']),
-        '\u{FA06}' => Some(&['\u{66B4}']),
-        '\u{FA07}' => Some(&['\u{8F3B}']),
-        '\u{FA08}' => Some(&['\u{884C}']),
-        '\u{FA09}' => Some(&['\u{964D}']),
-        '\u{FA0A}' => Some(&['\u{898B}']),
-        '\u{FA0B}' => Some(&['\u{5ED3}']),
-        '\u{FA0C}' => Some(&['\u{5140}']),
-        '\u{FA0D}' => Some(&['\u{55C0}']),
-        '\u{FA10}' => Some(&['\u{585A}']),
-        '\u{FA12}' => Some(&['\u{6674}']),
-        '\u{FA15}' => Some(&['\u{51DE}']),
-        '\u{FA16}' => Some(&['\u{732A}']),
-        '\u{FA17}' => Some(&['\u{76CA}']),
-        '\u{FA18}' => Some(&['\u{793C}']),
-        '\u{FA19}' => Some(&['\u{795E}']),
-        '\u{FA1A}' => Some(&['\u{7965}']),
-        '\u{FA1B}' => Some(&['\u{798F}']),
-        '\u{FA1C}' => Some(&['\u{9756}']),
-        '\u{FA1D}' => Some(&['\u{7CBE}']),
-        '\u{FA1E}' => Some(&['\u{7FBD}']),
-        '\u{FA20}' => Some(&['\u{8612}']),
-        '\u{FA22}' => Some(&['\u{8AF8}']),
-        '\u{FA25}' => Some(&['\u{9038}']),
-        '\u{FA26}' => Some(&['\u{90FD}']),
-        '\u{FA2A}' => Some(&['\u{98EF}']),
-        '\u{FA2B}' => Some(&['\u{98FC}']),
-        '\u{FA2C}' => Some(&['\u{9928}']),
-        '\u{FA2D}' => Some(&['\u{9DB4}']),
-        '\u{FA2E}' => Some(&['\u{90DE}']),
-        '\u{FA2F}' => Some(&['\u{96B7}']),
-        '\u{FA30}' => Some(&['\u{4FAE}']),
-        '\u{FA31}' => Some(&['\u{50E7}']),
-        '\u{FA32}' => Some(&['\u{514D}']),
-        '\u{FA33}' => Some(&['\u{52C9}']),
-        '\u{FA34}' => Some(&['\u{52E4}']),
-        '\u{FA35}' => Some(&['\u{5351}']),
-        '\u{FA36}' => Some(&['\u{559D}']),
-        '\u{FA37}' => Some(&['\u{5606}']),
-        '\u{FA38}' => Some(&['\u{5668}']),
-        '\u{FA39}' => Some(&['\u{5840}']),
-        '\u{FA3A}' => Some(&['\u{58A8}']),
-        '\u{FA3B}' => Some(&['\u{5C64}']),
-        '\u{FA3C}' => Some(&['\u{5C6E}']),
-        '\u{FA3D}' => Some(&['\u{6094}']),
-        '\u{FA3E}' => Some(&['\u{6168}']),
-        '\u{FA3F}' => Some(&['\u{618E}']),
-        '\u{FA40}' => Some(&['\u{61F2}']),
-        '\u{FA41}' => Some(&['\u{654F}']),
-        '\u{FA42}' => Some(&['\u{65E2}']),
-        '\u{FA43}' => Some(&['\u{6691}']),
-        '\u{FA44}' => Some(&['\u{6885}']),
-        '\u{FA45}' => Some(&['\u{6D77}']),
-        '\u{FA46}' => Some(&['\u{6E1A}']),
-        '\u{FA47}' => Some(&['\u{6F22}']),
-        '\u{FA48}' => Some(&['\u{716E}']),
-        '\u{FA49}' => Some(&['\u{722B}']),
-        '\u{FA4A}' => Some(&['\u{7422}']),
-        '\u{FA4B}' => Some(&['\u{7891}']),
-        '\u{FA4C}' => Some(&['\u{793E}']),
-        '\u{FA4D}' => Some(&['\u{7949}']),
-        '\u{FA4E}' => Some(&['\u{7948}']),
-        '\u{FA4F}' => Some(&['\u{7950}']),
-        '\u{FA50}' => Some(&['\u{7956}']),
-        '\u{FA51}' => Some(&['\u{795D}']),
-        '\u{FA52}' => Some(&['\u{798D}']),
-        '\u{FA53}' => Some(&['\u{798E}']),
-        '\u{FA54}' => Some(&['\u{7A40}']),
-        '\u{FA55}' => Some(&['\u{7A81}']),
-        '\u{FA56}' => Some(&['\u{7BC0}']),
-        '\u{FA57}' => Some(&['\u{7DF4}']),
-        '\u{FA58}' => Some(&['\u{7E09}']),
-        '\u{FA59}' => Some(&['\u{7E41}']),
-        '\u{FA5A}' => Some(&['\u{7F72}']),
-        '\u{FA5B}' => Some(&['\u{8005}']),
-        '\u{FA5C}' => Some(&['\u{81ED}']),
-        '\u{FA5D}' => Some(&['\u{8279}']),
-        '\u{FA5E}' => Some(&['\u{8279}']),
-        '\u{FA5F}' => Some(&['\u{8457}']),
-        '\u{FA60}' => Some(&['\u{8910}']),
-        '\u{FA61}' => Some(&['\u{8996}']),
-        '\u{FA62}' => Some(&['\u{8B01}']),
-        '\u{FA63}' => Some(&['\u{8B39}']),
-        '\u{FA64}' => Some(&['\u{8CD3}']),
-        '\u{FA65}' => Some(&['\u{8D08}']),
-        '\u{FA66}' => Some(&['\u{8FB6}']),
-        '\u{FA67}' => Some(&['\u{9038}']),
-        '\u{FA68}' => Some(&['\u{96E3}']),
-        '\u{FA69}' => Some(&['\u{97FF}']),
-        '\u{FA6A}' => Some(&['\u{983B}']),
-        '\u{FA6B}' => Some(&['\u{6075}']),
-        '\u{FA6C}' => Some(&['\u{242EE}']),
-        '\u{FA6D}' => Some(&['\u{8218}']),
-        '\u{FA70}' => Some(&['\u{4E26}']),
-        '\u{FA71}' => Some(&['\u{51B5}']),
-        '\u{FA72}' => Some(&['\u{5168}']),
-        '\u{FA73}' => Some(&['\u{4F80}']),
-        '\u{FA74}' => Some(&['\u{5145}']),
-        '\u{FA75}' => Some(&['\u{5180}']),
-        '\u{FA76}' => Some(&['\u{52C7}']),
-        '\u{FA77}' => Some(&['\u{52FA}']),
-        '\u{FA78}' => Some(&['\u{559D}']),
-        '\u{FA79}' => Some(&['\u{5555}']),
-        '\u{FA7A}' => Some(&['\u{5599}']),
-        '\u{FA7B}' => Some(&['\u{55E2}']),
-        '\u{FA7C}' => Some(&['\u{585A}']),
-        '\u{FA7D}' => Some(&['\u{58B3}']),
-        '\u{FA7E}' => Some(&['\u{5944}']),
-        '\u{FA7F}' => Some(&['\u{5954}']),
-        '\u{FA80}' => Some(&['\u{5A62}']),
-        '\u{FA81}' => Some(&['\u{5B28}']),
-        '\u{FA82}' => Some(&['\u{5ED2}']),
-        '\u{FA83}' => Some(&['\u{5ED9}']),
-        '\u{FA84}' => Some(&['\u{5F69}']),
-        '\u{FA85}' => Some(&['\u{5FAD}']),
-        '\u{FA86}' => Some(&['\u{60D8}']),
-        '\u{FA87}' => Some(&['\u{614E}']),
-        '\u{FA88}' => Some(&['\u{6108}']),
-        '\u{FA89}' => Some(&['\u{618E}']),
-        '\u{FA8A}' => Some(&['\u{6160}']),
-        '\u{FA8B}' => Some(&['\u{61F2}']),
-        '\u{FA8C}' => Some(&['\u{6234}']),
-        '\u{FA8D}' => Some(&['\u{63C4}']),
-        '\u{FA8E}' => Some(&['\u{641C}']),
-        '\u{FA8F}' => Some(&['\u{6452}']),
-        '\u{FA90}' => Some(&['\u{6556}']),
-        '\u{FA91}' => Some(&['\u{6674}']),
-        '\u{FA92}' => Some(&['\u{6717}']),
-        '\u{FA93}' => Some(&['\u{671B}']),
-        '\u{FA94}' => Some(&['\u{6756}']),
-        '\u{FA95}' => Some(&['\u{6B79}']),
-        '\u{FA96}' => Some(&['\u{6BBA}']),
-        '\u{FA97}' => Some(&['\u{6D41}']),
-        '\u{FA98}' => Some(&['\u{6EDB}']),
-        '\u{FA99}' => Some(&['\u{6ECB}']),
-        '\u{FA9A}' => Some(&['\u{6F22}']),
-        '\u{FA9B}' => Some(&['\u{701E}']),
-        '\u{FA9C}' => Some(&['\u{716E}']),
-        '\u{FA9D}' => Some(&['\u{77A7}']),
-        '\u{FA9E}' => Some(&['\u{7235}']),
-        '\u{FA9F}' => Some(&['\u{72AF}']),
-        '\u{FAA0}' => Some(&['\u{732A}']),
-        '\u{FAA1}' => Some(&['\u{7471}']),
-        '\u{FAA2}' => Some(&['\u{7506}']),
-        '\u{FAA3}' => Some(&['\u{753B}']),
-        '\u{FAA4}' => Some(&['\u{761D}']),
-        '\u{FAA5}' => Some(&['\u{761F}']),
-        '\u{FAA6}' => Some(&['\u{76CA}']),
-        '\u{FAA7}' => Some(&['\u{76DB}']),
-        '\u{FAA8}' => Some(&['\u{76F4}']),
-        '\u{FAA9}' => Some(&['\u{774A}']),
-        '\u{FAAA}' => Some(&['\u{7740}']),
-        '\u{FAAB}' => Some(&['\u{78CC}']),
-        '\u{FAAC}' => Some(&['\u{7AB1}']),
-        '\u{FAAD}' => Some(&['\u{7BC0}']),
-        '\u{FAAE}' => Some(&['\u{7C7B}']),
-        '\u{FAAF}' => Some(&['\u{7D5B}']),
-        '\u{FAB0}' => Some(&['\u{7DF4}']),
-        '\u{FAB1}' => Some(&['\u{7F3E}']),
-        '\u{FAB2}' => Some(&['\u{8005}']),
-        '\u{FAB3}' => Some(&['\u{8352}']),
-        '\u{FAB4}' => Some(&['\u{83EF}']),
-        '\u{FAB5}' => Some(&['\u{8779}']),
-        '\u{FAB6}' => Some(&['\u{8941}']),
-        '\u{FAB7}' => Some(&['\u{8986}']),
-        '\u{FAB8}' => Some(&['\u{8996}']),
-        '\u{FAB9}' => Some(&['\u{8ABF}']),
-        '\u{FABA}' => Some(&['\u{8AF8}']),
-        '\u{FABB}' => Some(&['\u{8ACB}']),
-        '\u{FABC}' => Some(&['\u{8B01}']),
-        '\u{FABD}' => Some(&['\u{8AFE}']),
-        '\u{FABE}' => Some(&['\u{8AED}']),
-        '\u{FABF}' => Some(&['\u{8B39}']),
-        '\u{FAC0}' => Some(&['\u{8B8A}']),
-        '\u{FAC1}' => Some(&['\u{8D08}']),
-        '\u{FAC2}' => Some(&['\u{8F38}']),
-        '\u{FAC3}' => Some(&['\u{9072}']),
-        '\u{FAC4}' => Some(&['\u{9199}']),
-        '\u{FAC5}' => Some(&['\u{9276}']),
-        '\u{FAC6}' => Some(&['\u{967C}']),
-        '\u{FAC7}' => Some(&['\u{96E3}']),
-        '\u{FAC8}' => Some(&['\u{9756}']),
-        '\u{FAC9}' => Some(&['\u{97DB}']),
-        '\u{FACA}' => Some(&['\u{97FF}']),
-        '\u{FACB}' => Some(&['\u{980B}']),
-        '\u{FACC}' => Some(&['\u{983B}']),
-        '\u{FACD}' => Some(&['\u{9B12}']),
-        '\u{FACE}' => Some(&['\u{9F9C}']),
-        '\u{FACF}' => Some(&['\u{2284A}']),
-        '\u{FAD0}' => Some(&['\u{22844}']),
-        '\u{FAD1}' => Some(&['\u{233D5}']),
-        '\u{FAD2}' => Some(&['\u{3B9D}']),
-        '\u{FAD3}' => Some(&['\u{4018}']),
-        '\u{FAD4}' => Some(&['\u{4039}']),
-        '\u{FAD5}' => Some(&['\u{25249}']),
-        '\u{FAD6}' => Some(&['\u{25CD0}']),
-        '\u{FAD7}' => Some(&['\u{27ED3}']),
-        '\u{FAD8}' => Some(&['\u{9F43}']),
-        '\u{FAD9}' => Some(&['\u{9F8E}']),
-        '\u{FB1D}' => Some(&['\u{05D9}', '\u{05B4}']),
-        '\u{FB1F}' => Some(&['\u{05F2}', '\u{05B7}']),
-        '\u{FB2A}' => Some(&['\u{05E9}', '\u{05C1}']),
-        '\u{FB2B}' => Some(&['\u{05E9}', '\u{05C2}']),
-        '\u{FB2C}' => Some(&['\u{05E9}', '\u{05BC}', '\u{05C1}']),
-        '\u{FB2D}' => Some(&['\u{05E9}', '\u{05BC}', '\u{05C2}']),
-        '\u{FB2E}' => Some(&['\u{05D0}', '\u{05B7}']),
-        '\u{FB2F}' => Some(&['\u{05D0}', '\u{05B8}']),
-        '\u{FB30}' => Some(&['\u{05D0}', '\u{05BC}']),
-        '\u{FB31}' => Some(&['\u{05D1}', '\u{05BC}']),
-        '\u{FB32}' => Some(&['\u{05D2}', '\u{05BC}']),
-        '\u{FB33}' => Some(&['\u{05D3}', '\u{05BC}']),
-        '\u{FB34}' => Some(&['\u{05D4}', '\u{05BC}']),
-        '\u{FB35}' => Some(&['\u{05D5}', '\u{05BC}']),
-        '\u{FB36}' => Some(&['\u{05D6}', '\u{05BC}']),
-        '\u{FB38}' => Some(&['\u{05D8}', '\u{05BC}']),
-        '\u{FB39}' => Some(&['\u{05D9}', '\u{05BC}']),
-        '\u{FB3A}' => Some(&['\u{05DA}', '\u{05BC}']),
-        '\u{FB3B}' => Some(&['\u{05DB}', '\u{05BC}']),
-        '\u{FB3C}' => Some(&['\u{05DC}', '\u{05BC}']),
-        '\u{FB3E}' => Some(&['\u{05DE}', '\u{05BC}']),
-        '\u{FB40}' => Some(&['\u{05E0}', '\u{05BC}']),
-        '\u{FB41}' => Some(&['\u{05E1}', '\u{05BC}']),
-        '\u{FB43}' => Some(&['\u{05E3}', '\u{05BC}']),
-        '\u{FB44}' => Some(&['\u{05E4}', '\u{05BC}']),
-        '\u{FB46}' => Some(&['\u{05E6}', '\u{05BC}']),
-        '\u{FB47}' => Some(&['\u{05E7}', '\u{05BC}']),
-        '\u{FB48}' => Some(&['\u{05E8}', '\u{05BC}']),
-        '\u{FB49}' => Some(&['\u{05E9}', '\u{05BC}']),
-        '\u{FB4A}' => Some(&['\u{05EA}', '\u{05BC}']),
-        '\u{FB4B}' => Some(&['\u{05D5}', '\u{05B9}']),
-        '\u{FB4C}' => Some(&['\u{05D1}', '\u{05BF}']),
-        '\u{FB4D}' => Some(&['\u{05DB}', '\u{05BF}']),
-        '\u{FB4E}' => Some(&['\u{05E4}', '\u{05BF}']),
-        '\u{1109A}' => Some(&['\u{11099}', '\u{110BA}']),
-        '\u{1109C}' => Some(&['\u{1109B}', '\u{110BA}']),
-        '\u{110AB}' => Some(&['\u{110A5}', '\u{110BA}']),
-        '\u{1112E}' => Some(&['\u{11131}', '\u{11127}']),
-        '\u{1112F}' => Some(&['\u{11132}', '\u{11127}']),
-        '\u{1134B}' => Some(&['\u{11347}', '\u{1133E}']),
-        '\u{1134C}' => Some(&['\u{11347}', '\u{11357}']),
-        '\u{114BB}' => Some(&['\u{114B9}', '\u{114BA}']),
-        '\u{114BC}' => Some(&['\u{114B9}', '\u{114B0}']),
-        '\u{114BE}' => Some(&['\u{114B9}', '\u{114BD}']),
-        '\u{115BA}' => Some(&['\u{115B8}', '\u{115AF}']),
-        '\u{115BB}' => Some(&['\u{115B9}', '\u{115AF}']),
-        '\u{1D15E}' => Some(&['\u{1D157}', '\u{1D165}']),
-        '\u{1D15F}' => Some(&['\u{1D158}', '\u{1D165}']),
-        '\u{1D160}' => Some(&['\u{1D158}', '\u{1D165}', '\u{1D16E}']),
-        '\u{1D161}' => Some(&['\u{1D158}', '\u{1D165}', '\u{1D16F}']),
-        '\u{1D162}' => Some(&['\u{1D158}', '\u{1D165}', '\u{1D170}']),
-        '\u{1D163}' => Some(&['\u{1D158}', '\u{1D165}', '\u{1D171}']),
-        '\u{1D164}' => Some(&['\u{1D158}', '\u{1D165}', '\u{1D172}']),
-        '\u{1D1BB}' => Some(&['\u{1D1B9}', '\u{1D165}']),
-        '\u{1D1BC}' => Some(&['\u{1D1BA}', '\u{1D165}']),
-        '\u{1D1BD}' => Some(&['\u{1D1B9}', '\u{1D165}', '\u{1D16E}']),
-        '\u{1D1BE}' => Some(&['\u{1D1BA}', '\u{1D165}', '\u{1D16E}']),
-        '\u{1D1BF}' => Some(&['\u{1D1B9}', '\u{1D165}', '\u{1D16F}']),
-        '\u{1D1C0}' => Some(&['\u{1D1BA}', '\u{1D165}', '\u{1D16F}']),
-        '\u{2F800}' => Some(&['\u{4E3D}']),
-        '\u{2F801}' => Some(&['\u{4E38}']),
-        '\u{2F802}' => Some(&['\u{4E41}']),
-        '\u{2F803}' => Some(&['\u{20122}']),
-        '\u{2F804}' => Some(&['\u{4F60}']),
-        '\u{2F805}' => Some(&['\u{4FAE}']),
-        '\u{2F806}' => Some(&['\u{4FBB}']),
-        '\u{2F807}' => Some(&['\u{5002}']),
-        '\u{2F808}' => Some(&['\u{507A}']),
-        '\u{2F809}' => Some(&['\u{5099}']),
-        '\u{2F80A}' => Some(&['\u{50E7}']),
-        '\u{2F80B}' => Some(&['\u{50CF}']),
-        '\u{2F80C}' => Some(&['\u{349E}']),
-        '\u{2F80D}' => Some(&['\u{2063A}']),
-        '\u{2F80E}' => Some(&['\u{514D}']),
-        '\u{2F80F}' => Some(&['\u{5154}']),
-        '\u{2F810}' => Some(&['\u{5164}']),
-        '\u{2F811}' => Some(&['\u{5177}']),
-        '\u{2F812}' => Some(&['\u{2051C}']),
-        '\u{2F813}' => Some(&['\u{34B9}']),
-        '\u{2F814}' => Some(&['\u{5167}']),
-        '\u{2F815}' => Some(&['\u{518D}']),
-        '\u{2F816}' => Some(&['\u{2054B}']),
-        '\u{2F817}' => Some(&['\u{5197}']),
-        '\u{2F818}' => Some(&['\u{51A4}']),
-        '\u{2F819}' => Some(&['\u{4ECC}']),
-        '\u{2F81A}' => Some(&['\u{51AC}']),
-        '\u{2F81B}' => Some(&['\u{51B5}']),
-        '\u{2F81C}' => Some(&['\u{291DF}']),
-        '\u{2F81D}' => Some(&['\u{51F5}']),
-        '\u{2F81E}' => Some(&['\u{5203}']),
-        '\u{2F81F}' => Some(&['\u{34DF}']),
-        '\u{2F820}' => Some(&['\u{523B}']),
-        '\u{2F821}' => Some(&['\u{5246}']),
-        '\u{2F822}' => Some(&['\u{5272}']),
-        '\u{2F823}' => Some(&['\u{5277}']),
-        '\u{2F824}' => Some(&['\u{3515}']),
-        '\u{2F825}' => Some(&['\u{52C7}']),
-        '\u{2F826}' => Some(&['\u{52C9}']),
-        '\u{2F827}' => Some(&['\u{52E4}']),
-        '\u{2F828}' => Some(&['\u{52FA}']),
-        '\u{2F829}' => Some(&['\u{5305}']),
-        '\u{2F82A}' => Some(&['\u{5306}']),
-        '\u{2F82B}' => Some(&['\u{5317}']),
-        '\u{2F82C}' => Some(&['\u{5349}']),
-        '\u{2F82D}' => Some(&['\u{5351}']),
-        '\u{2F82E}' => Some(&['\u{535A}']),
-        '\u{2F82F}' => Some(&['\u{5373}']),
-        '\u{2F830}' => Some(&['\u{537D}']),
-        '\u{2F831}' => Some(&['\u{537F}']),
-        '\u{2F832}' => Some(&['\u{537F}']),
-        '\u{2F833}' => Some(&['\u{537F}']),
-        '\u{2F834}' => Some(&['\u{20A2C}']),
-        '\u{2F835}' => Some(&['\u{7070}']),
-        '\u{2F836}' => Some(&['\u{53CA}']),
-        '\u{2F837}' => Some(&['\u{53DF}']),
-        '\u{2F838}' => Some(&['\u{20B63}']),
-        '\u{2F839}' => Some(&['\u{53EB}']),
-        '\u{2F83A}' => Some(&['\u{53F1}']),
-        '\u{2F83B}' => Some(&['\u{5406}']),
-        '\u{2F83C}' => Some(&['\u{549E}']),
-        '\u{2F83D}' => Some(&['\u{5438}']),
-        '\u{2F83E}' => Some(&['\u{5448}']),
-        '\u{2F83F}' => Some(&['\u{5468}']),
-        '\u{2F840}' => Some(&['\u{54A2}']),
-        '\u{2F841}' => Some(&['\u{54F6}']),
-        '\u{2F842}' => Some(&['\u{5510}']),
-        '\u{2F843}' => Some(&['\u{5553}']),
-        '\u{2F844}' => Some(&['\u{5563}']),
-        '\u{2F845}' => Some(&['\u{5584}']),
-        '\u{2F846}' => Some(&['\u{5584}']),
-        '\u{2F847}' => Some(&['\u{5599}']),
-        '\u{2F848}' => Some(&['\u{55AB}']),
-        '\u{2F849}' => Some(&['\u{55B3}']),
-        '\u{2F84A}' => Some(&['\u{55C2}']),
-        '\u{2F84B}' => Some(&['\u{5716}']),
-        '\u{2F84C}' => Some(&['\u{5606}']),
-        '\u{2F84D}' => Some(&['\u{5717}']),
-        '\u{2F84E}' => Some(&['\u{5651}']),
-        '\u{2F84F}' => Some(&['\u{5674}']),
-        '\u{2F850}' => Some(&['\u{5207}']),
-        '\u{2F851}' => Some(&['\u{58EE}']),
-        '\u{2F852}' => Some(&['\u{57CE}']),
-        '\u{2F853}' => Some(&['\u{57F4}']),
-        '\u{2F854}' => Some(&['\u{580D}']),
-        '\u{2F855}' => Some(&['\u{578B}']),
-        '\u{2F856}' => Some(&['\u{5832}']),
-        '\u{2F857}' => Some(&['\u{5831}']),
-        '\u{2F858}' => Some(&['\u{58AC}']),
-        '\u{2F859}' => Some(&['\u{214E4}']),
-        '\u{2F85A}' => Some(&['\u{58F2}']),
-        '\u{2F85B}' => Some(&['\u{58F7}']),
-        '\u{2F85C}' => Some(&['\u{5906}']),
-        '\u{2F85D}' => Some(&['\u{591A}']),
-        '\u{2F85E}' => Some(&['\u{5922}']),
-        '\u{2F85F}' => Some(&['\u{5962}']),
-        '\u{2F860}' => Some(&['\u{216A8}']),
-        '\u{2F861}' => Some(&['\u{216EA}']),
-        '\u{2F862}' => Some(&['\u{59EC}']),
-        '\u{2F863}' => Some(&['\u{5A1B}']),
-        '\u{2F864}' => Some(&['\u{5A27}']),
-        '\u{2F865}' => Some(&['\u{59D8}']),
-        '\u{2F866}' => Some(&['\u{5A66}']),
-        '\u{2F867}' => Some(&['\u{36EE}']),
-        '\u{2F868}' => Some(&['\u{36FC}']),
-        '\u{2F869}' => Some(&['\u{5B08}']),
-        '\u{2F86A}' => Some(&['\u{5B3E}']),
-        '\u{2F86B}' => Some(&['\u{5B3E}']),
-        '\u{2F86C}' => Some(&['\u{219C8}']),
-        '\u{2F86D}' => Some(&['\u{5BC3}']),
-        '\u{2F86E}' => Some(&['\u{5BD8}']),
-        '\u{2F86F}' => Some(&['\u{5BE7}']),
-        '\u{2F870}' => Some(&['\u{5BF3}']),
-        '\u{2F871}' => Some(&['\u{21B18}']),
-        '\u{2F872}' => Some(&['\u{5BFF}']),
-        '\u{2F873}' => Some(&['\u{5C06}']),
-        '\u{2F874}' => Some(&['\u{5F53}']),
-        '\u{2F875}' => Some(&['\u{5C22}']),
-        '\u{2F876}' => Some(&['\u{3781}']),
-        '\u{2F877}' => Some(&['\u{5C60}']),
-        '\u{2F878}' => Some(&['\u{5C6E}']),
-        '\u{2F879}' => Some(&['\u{5CC0}']),
-        '\u{2F87A}' => Some(&['\u{5C8D}']),
-        '\u{2F87B}' => Some(&['\u{21DE4}']),
-        '\u{2F87C}' => Some(&['\u{5D43}']),
-        '\u{2F87D}' => Some(&['\u{21DE6}']),
-        '\u{2F87E}' => Some(&['\u{5D6E}']),
-        '\u{2F87F}' => Some(&['\u{5D6B}']),
-        '\u{2F880}' => Some(&['\u{5D7C}']),
-        '\u{2F881}' => Some(&['\u{5DE1}']),
-        '\u{2F882}' => Some(&['\u{5DE2}']),
-        '\u{2F883}' => Some(&['\u{382F}']),
-        '\u{2F884}' => Some(&['\u{5DFD}']),
-        '\u{2F885}' => Some(&['\u{5E28}']),
-        '\u{2F886}' => Some(&['\u{5E3D}']),
-        '\u{2F887}' => Some(&['\u{5E69}']),
-        '\u{2F888}' => Some(&['\u{3862}']),
-        '\u{2F889}' => Some(&['\u{22183}']),
-        '\u{2F88A}' => Some(&['\u{387C}']),
-        '\u{2F88B}' => Some(&['\u{5EB0}']),
-        '\u{2F88C}' => Some(&['\u{5EB3}']),
-        '\u{2F88D}' => Some(&['\u{5EB6}']),
-        '\u{2F88E}' => Some(&['\u{5ECA}']),
-        '\u{2F88F}' => Some(&['\u{2A392}']),
-        '\u{2F890}' => Some(&['\u{5EFE}']),
-        '\u{2F891}' => Some(&['\u{22331}']),
-        '\u{2F892}' => Some(&['\u{22331}']),
-        '\u{2F893}' => Some(&['\u{8201}']),
-        '\u{2F894}' => Some(&['\u{5F22}']),
-        '\u{2F895}' => Some(&['\u{5F22}']),
-        '\u{2F896}' => Some(&['\u{38C7}']),
-        '\u{2F897}' => Some(&['\u{232B8}']),
-        '\u{2F898}' => Some(&['\u{261DA}']),
-        '\u{2F899}' => Some(&['\u{5F62}']),
-        '\u{2F89A}' => Some(&['\u{5F6B}']),
-        '\u{2F89B}' => Some(&['\u{38E3}']),
-        '\u{2F89C}' => Some(&['\u{5F9A}']),
-        '\u{2F89D}' => Some(&['\u{5FCD}']),
-        '\u{2F89E}' => Some(&['\u{5FD7}']),
-        '\u{2F89F}' => Some(&['\u{5FF9}']),
-        '\u{2F8A0}' => Some(&['\u{6081}']),
-        '\u{2F8A1}' => Some(&['\u{393A}']),
-        '\u{2F8A2}' => Some(&['\u{391C}']),
-        '\u{2F8A3}' => Some(&['\u{6094}']),
-        '\u{2F8A4}' => Some(&['\u{226D4}']),
-        '\u{2F8A5}' => Some(&['\u{60C7}']),
-        '\u{2F8A6}' => Some(&['\u{6148}']),
-        '\u{2F8A7}' => Some(&['\u{614C}']),
-        '\u{2F8A8}' => Some(&['\u{614E}']),
-        '\u{2F8A9}' => Some(&['\u{614C}']),
-        '\u{2F8AA}' => Some(&['\u{617A}']),
-        '\u{2F8AB}' => Some(&['\u{618E}']),
-        '\u{2F8AC}' => Some(&['\u{61B2}']),
-        '\u{2F8AD}' => Some(&['\u{61A4}']),
-        '\u{2F8AE}' => Some(&['\u{61AF}']),
-        '\u{2F8AF}' => Some(&['\u{61DE}']),
-        '\u{2F8B0}' => Some(&['\u{61F2}']),
-        '\u{2F8B1}' => Some(&['\u{61F6}']),
-        '\u{2F8B2}' => Some(&['\u{6210}']),
-        '\u{2F8B3}' => Some(&['\u{621B}']),
-        '\u{2F8B4}' => Some(&['\u{625D}']),
-        '\u{2F8B5}' => Some(&['\u{62B1}']),
-        '\u{2F8B6}' => Some(&['\u{62D4}']),
-        '\u{2F8B7}' => Some(&['\u{6350}']),
-        '\u{2F8B8}' => Some(&['\u{22B0C}']),
-        '\u{2F8B9}' => Some(&['\u{633D}']),
-        '\u{2F8BA}' => Some(&['\u{62FC}']),
-        '\u{2F8BB}' => Some(&['\u{6368}']),
-        '\u{2F8BC}' => Some(&['\u{6383}']),
-        '\u{2F8BD}' => Some(&['\u{63E4}']),
-        '\u{2F8BE}' => Some(&['\u{22BF1}']),
-        '\u{2F8BF}' => Some(&['\u{6422}']),
-        '\u{2F8C0}' => Some(&['\u{63C5}']),
-        '\u{2F8C1}' => Some(&['\u{63A9}']),
-        '\u{2F8C2}' => Some(&['\u{3A2E}']),
-        '\u{2F8C3}' => Some(&['\u{6469}']),
-        '\u{2F8C4}' => Some(&['\u{647E}']),
-        '\u{2F8C5}' => Some(&['\u{649D}']),
-        '\u{2F8C6}' => Some(&['\u{6477}']),
-        '\u{2F8C7}' => Some(&['\u{3A6C}']),
-        '\u{2F8C8}' => Some(&['\u{654F}']),
-        '\u{2F8C9}' => Some(&['\u{656C}']),
-        '\u{2F8CA}' => Some(&['\u{2300A}']),
-        '\u{2F8CB}' => Some(&['\u{65E3}']),
-        '\u{2F8CC}' => Some(&['\u{66F8}']),
-        '\u{2F8CD}' => Some(&['\u{6649}']),
-        '\u{2F8CE}' => Some(&['\u{3B19}']),
-        '\u{2F8CF}' => Some(&['\u{6691}']),
-        '\u{2F8D0}' => Some(&['\u{3B08}']),
-        '\u{2F8D1}' => Some(&['\u{3AE4}']),
-        '\u{2F8D2}' => Some(&['\u{5192}']),
-        '\u{2F8D3}' => Some(&['\u{5195}']),
-        '\u{2F8D4}' => Some(&['\u{6700}']),
-        '\u{2F8D5}' => Some(&['\u{669C}']),
-        '\u{2F8D6}' => Some(&['\u{80AD}']),
-        '\u{2F8D7}' => Some(&['\u{43D9}']),
-        '\u{2F8D8}' => Some(&['\u{6717}']),
-        '\u{2F8D9}' => Some(&['\u{671B}']),
-        '\u{2F8DA}' => Some(&['\u{6721}']),
-        '\u{2F8DB}' => Some(&['\u{675E}']),
-        '\u{2F8DC}' => Some(&['\u{6753}']),
-        '\u{2F8DD}' => Some(&['\u{233C3}']),
-        '\u{2F8DE}' => Some(&['\u{3B49}']),
-        '\u{2F8DF}' => Some(&['\u{67FA}']),
-        '\u{2F8E0}' => Some(&['\u{6785}']),
-        '\u{2F8E1}' => Some(&['\u{6852}']),
-        '\u{2F8E2}' => Some(&['\u{6885}']),
-        '\u{2F8E3}' => Some(&['\u{2346D}']),
-        '\u{2F8E4}' => Some(&['\u{688E}']),
-        '\u{2F8E5}' => Some(&['\u{681F}']),
-        '\u{2F8E6}' => Some(&['\u{6914}']),
-        '\u{2F8E7}' => Some(&['\u{3B9D}']),
-        '\u{2F8E8}' => Some(&['\u{6942}']),
-        '\u{2F8E9}' => Some(&['\u{69A3}']),
-        '\u{2F8EA}' => Some(&['\u{69EA}']),
-        '\u{2F8EB}' => Some(&['\u{6AA8}']),
-        '\u{2F8EC}' => Some(&['\u{236A3}']),
-        '\u{2F8ED}' => Some(&['\u{6ADB}']),
-        '\u{2F8EE}' => Some(&['\u{3C18}']),
-        '\u{2F8EF}' => Some(&['\u{6B21}']),
-        '\u{2F8F0}' => Some(&['\u{238A7}']),
-        '\u{2F8F1}' => Some(&['\u{6B54}']),
-        '\u{2F8F2}' => Some(&['\u{3C4E}']),
-        '\u{2F8F3}' => Some(&['\u{6B72}']),
-        '\u{2F8F4}' => Some(&['\u{6B9F}']),
-        '\u{2F8F5}' => Some(&['\u{6BBA}']),
-        '\u{2F8F6}' => Some(&['\u{6BBB}']),
-        '\u{2F8F7}' => Some(&['\u{23A8D}']),
-        '\u{2F8F8}' => Some(&['\u{21D0B}']),
-        '\u{2F8F9}' => Some(&['\u{23AFA}']),
-        '\u{2F8FA}' => Some(&['\u{6C4E}']),
-        '\u{2F8FB}' => Some(&['\u{23CBC}']),
-        '\u{2F8FC}' => Some(&['\u{6CBF}']),
-        '\u{2F8FD}' => Some(&['\u{6CCD}']),
-        '\u{2F8FE}' => Some(&['\u{6C67}']),
-        '\u{2F8FF}' => Some(&['\u{6D16}']),
-        '\u{2F900}' => Some(&['\u{6D3E}']),
-        '\u{2F901}' => Some(&['\u{6D77}']),
-        '\u{2F902}' => Some(&['\u{6D41}']),
-        '\u{2F903}' => Some(&['\u{6D69}']),
-        '\u{2F904}' => Some(&['\u{6D78}']),
-        '\u{2F905}' => Some(&['\u{6D85}']),
-        '\u{2F906}' => Some(&['\u{23D1E}']),
-        '\u{2F907}' => Some(&['\u{6D34}']),
-        '\u{2F908}' => Some(&['\u{6E2F}']),
-        '\u{2F909}' => Some(&['\u{6E6E}']),
-        '\u{2F90A}' => Some(&['\u{3D33}']),
-        '\u{2F90B}' => Some(&['\u{6ECB}']),
-        '\u{2F90C}' => Some(&['\u{6EC7}']),
-        '\u{2F90D}' => Some(&['\u{23ED1}']),
-        '\u{2F90E}' => Some(&['\u{6DF9}']),
-        '\u{2F90F}' => Some(&['\u{6F6E}']),
-        '\u{2F910}' => Some(&['\u{23F5E}']),
-        '\u{2F911}' => Some(&['\u{23F8E}']),
-        '\u{2F912}' => Some(&['\u{6FC6}']),
-        '\u{2F913}' => Some(&['\u{7039}']),
-        '\u{2F914}' => Some(&['\u{701E}']),
-        '\u{2F915}' => Some(&['\u{701B}']),
-        '\u{2F916}' => Some(&['\u{3D96}']),
-        '\u{2F917}' => Some(&['\u{704A}']),
-        '\u{2F918}' => Some(&['\u{707D}']),
-        '\u{2F919}' => Some(&['\u{7077}']),
-        '\u{2F91A}' => Some(&['\u{70AD}']),
-        '\u{2F91B}' => Some(&['\u{20525}']),
-        '\u{2F91C}' => Some(&['\u{7145}']),
-        '\u{2F91D}' => Some(&['\u{24263}']),
-        '\u{2F91E}' => Some(&['\u{719C}']),
-        '\u{2F91F}' => Some(&['\u{243AB}']),
-        '\u{2F920}' => Some(&['\u{7228}']),
-        '\u{2F921}' => Some(&['\u{7235}']),
-        '\u{2F922}' => Some(&['\u{7250}']),
-        '\u{2F923}' => Some(&['\u{24608}']),
-        '\u{2F924}' => Some(&['\u{7280}']),
-        '\u{2F925}' => Some(&['\u{7295}']),
-        '\u{2F926}' => Some(&['\u{24735}']),
-        '\u{2F927}' => Some(&['\u{24814}']),
-        '\u{2F928}' => Some(&['\u{737A}']),
-        '\u{2F929}' => Some(&['\u{738B}']),
-        '\u{2F92A}' => Some(&['\u{3EAC}']),
-        '\u{2F92B}' => Some(&['\u{73A5}']),
-        '\u{2F92C}' => Some(&['\u{3EB8}']),
-        '\u{2F92D}' => Some(&['\u{3EB8}']),
-        '\u{2F92E}' => Some(&['\u{7447}']),
-        '\u{2F92F}' => Some(&['\u{745C}']),
-        '\u{2F930}' => Some(&['\u{7471}']),
-        '\u{2F931}' => Some(&['\u{7485}']),
-        '\u{2F932}' => Some(&['\u{74CA}']),
-        '\u{2F933}' => Some(&['\u{3F1B}']),
-        '\u{2F934}' => Some(&['\u{7524}']),
-        '\u{2F935}' => Some(&['\u{24C36}']),
-        '\u{2F936}' => Some(&['\u{753E}']),
-        '\u{2F937}' => Some(&['\u{24C92}']),
-        '\u{2F938}' => Some(&['\u{7570}']),
-        '\u{2F939}' => Some(&['\u{2219F}']),
-        '\u{2F93A}' => Some(&['\u{7610}']),
-        '\u{2F93B}' => Some(&['\u{24FA1}']),
-        '\u{2F93C}' => Some(&['\u{24FB8}']),
-        '\u{2F93D}' => Some(&['\u{25044}']),
-        '\u{2F93E}' => Some(&['\u{3FFC}']),
-        '\u{2F93F}' => Some(&['\u{4008}']),
-        '\u{2F940}' => Some(&['\u{76F4}']),
-        '\u{2F941}' => Some(&['\u{250F3}']),
-        '\u{2F942}' => Some(&['\u{250F2}']),
-        '\u{2F943}' => Some(&['\u{25119}']),
-        '\u{2F944}' => Some(&['\u{25133}']),
-        '\u{2F945}' => Some(&['\u{771E}']),
-        '\u{2F946}' => Some(&['\u{771F}']),
-        '\u{2F947}' => Some(&['\u{771F}']),
-        '\u{2F948}' => Some(&['\u{774A}']),
-        '\u{2F949}' => Some(&['\u{4039}']),
-        '\u{2F94A}' => Some(&['\u{778B}']),
-        '\u{2F94B}' => Some(&['\u{4046}']),
-        '\u{2F94C}' => Some(&['\u{4096}']),
-        '\u{2F94D}' => Some(&['\u{2541D}']),
-        '\u{2F94E}' => Some(&['\u{784E}']),
-        '\u{2F94F}' => Some(&['\u{788C}']),
-        '\u{2F950}' => Some(&['\u{78CC}']),
-        '\u{2F951}' => Some(&['\u{40E3}']),
-        '\u{2F952}' => Some(&['\u{25626}']),
-        '\u{2F953}' => Some(&['\u{7956}']),
-        '\u{2F954}' => Some(&['\u{2569A}']),
-        '\u{2F955}' => Some(&['\u{256C5}']),
-        '\u{2F956}' => Some(&['\u{798F}']),
-        '\u{2F957}' => Some(&['\u{79EB}']),
-        '\u{2F958}' => Some(&['\u{412F}']),
-        '\u{2F959}' => Some(&['\u{7A40}']),
-        '\u{2F95A}' => Some(&['\u{7A4A}']),
-        '\u{2F95B}' => Some(&['\u{7A4F}']),
-        '\u{2F95C}' => Some(&['\u{2597C}']),
-        '\u{2F95D}' => Some(&['\u{25AA7}']),
-        '\u{2F95E}' => Some(&['\u{25AA7}']),
-        '\u{2F95F}' => Some(&['\u{7AEE}']),
-        '\u{2F960}' => Some(&['\u{4202}']),
-        '\u{2F961}' => Some(&['\u{25BAB}']),
-        '\u{2F962}' => Some(&['\u{7BC6}']),
-        '\u{2F963}' => Some(&['\u{7BC9}']),
-        '\u{2F964}' => Some(&['\u{4227}']),
-        '\u{2F965}' => Some(&['\u{25C80}']),
-        '\u{2F966}' => Some(&['\u{7CD2}']),
-        '\u{2F967}' => Some(&['\u{42A0}']),
-        '\u{2F968}' => Some(&['\u{7CE8}']),
-        '\u{2F969}' => Some(&['\u{7CE3}']),
-        '\u{2F96A}' => Some(&['\u{7D00}']),
-        '\u{2F96B}' => Some(&['\u{25F86}']),
-        '\u{2F96C}' => Some(&['\u{7D63}']),
-        '\u{2F96D}' => Some(&['\u{4301}']),
-        '\u{2F96E}' => Some(&['\u{7DC7}']),
-        '\u{2F96F}' => Some(&['\u{7E02}']),
-        '\u{2F970}' => Some(&['\u{7E45}']),
-        '\u{2F971}' => Some(&['\u{4334}']),
-        '\u{2F972}' => Some(&['\u{26228}']),
-        '\u{2F973}' => Some(&['\u{26247}']),
-        '\u{2F974}' => Some(&['\u{4359}']),
-        '\u{2F975}' => Some(&['\u{262D9}']),
-        '\u{2F976}' => Some(&['\u{7F7A}']),
-        '\u{2F977}' => Some(&['\u{2633E}']),
-        '\u{2F978}' => Some(&['\u{7F95}']),
-        '\u{2F979}' => Some(&['\u{7FFA}']),
-        '\u{2F97A}' => Some(&['\u{8005}']),
-        '\u{2F97B}' => Some(&['\u{264DA}']),
-        '\u{2F97C}' => Some(&['\u{26523}']),
-        '\u{2F97D}' => Some(&['\u{8060}']),
-        '\u{2F97E}' => Some(&['\u{265A8}']),
-        '\u{2F97F}' => Some(&['\u{8070}']),
-        '\u{2F980}' => Some(&['\u{2335F}']),
-        '\u{2F981}' => Some(&['\u{43D5}']),
-        '\u{2F982}' => Some(&['\u{80B2}']),
-        '\u{2F983}' => Some(&['\u{8103}']),
-        '\u{2F984}' => Some(&['\u{440B}']),
-        '\u{2F985}' => Some(&['\u{813E}']),
-        '\u{2F986}' => Some(&['\u{5AB5}']),
-        '\u{2F987}' => Some(&['\u{267A7}']),
-        '\u{2F988}' => Some(&['\u{267B5}']),
-        '\u{2F989}' => Some(&['\u{23393}']),
-        '\u{2F98A}' => Some(&['\u{2339C}']),
-        '\u{2F98B}' => Some(&['\u{8201}']),
-        '\u{2F98C}' => Some(&['\u{8204}']),
-        '\u{2F98D}' => Some(&['\u{8F9E}']),
-        '\u{2F98E}' => Some(&['\u{446B}']),
-        '\u{2F98F}' => Some(&['\u{8291}']),
-        '\u{2F990}' => Some(&['\u{828B}']),
-        '\u{2F991}' => Some(&['\u{829D}']),
-        '\u{2F992}' => Some(&['\u{52B3}']),
-        '\u{2F993}' => Some(&['\u{82B1}']),
-        '\u{2F994}' => Some(&['\u{82B3}']),
-        '\u{2F995}' => Some(&['\u{82BD}']),
-        '\u{2F996}' => Some(&['\u{82E6}']),
-        '\u{2F997}' => Some(&['\u{26B3C}']),
-        '\u{2F998}' => Some(&['\u{82E5}']),
-        '\u{2F999}' => Some(&['\u{831D}']),
-        '\u{2F99A}' => Some(&['\u{8363}']),
-        '\u{2F99B}' => Some(&['\u{83AD}']),
-        '\u{2F99C}' => Some(&['\u{8323}']),
-        '\u{2F99D}' => Some(&['\u{83BD}']),
-        '\u{2F99E}' => Some(&['\u{83E7}']),
-        '\u{2F99F}' => Some(&['\u{8457}']),
-        '\u{2F9A0}' => Some(&['\u{8353}']),
-        '\u{2F9A1}' => Some(&['\u{83CA}']),
-        '\u{2F9A2}' => Some(&['\u{83CC}']),
-        '\u{2F9A3}' => Some(&['\u{83DC}']),
-        '\u{2F9A4}' => Some(&['\u{26C36}']),
-        '\u{2F9A5}' => Some(&['\u{26D6B}']),
-        '\u{2F9A6}' => Some(&['\u{26CD5}']),
-        '\u{2F9A7}' => Some(&['\u{452B}']),
-        '\u{2F9A8}' => Some(&['\u{84F1}']),
-        '\u{2F9A9}' => Some(&['\u{84F3}']),
-        '\u{2F9AA}' => Some(&['\u{8516}']),
-        '\u{2F9AB}' => Some(&['\u{273CA}']),
-        '\u{2F9AC}' => Some(&['\u{8564}']),
-        '\u{2F9AD}' => Some(&['\u{26F2C}']),
-        '\u{2F9AE}' => Some(&['\u{455D}']),
-        '\u{2F9AF}' => Some(&['\u{4561}']),
-        '\u{2F9B0}' => Some(&['\u{26FB1}']),
-        '\u{2F9B1}' => Some(&['\u{270D2}']),
-        '\u{2F9B2}' => Some(&['\u{456B}']),
-        '\u{2F9B3}' => Some(&['\u{8650}']),
-        '\u{2F9B4}' => Some(&['\u{865C}']),
-        '\u{2F9B5}' => Some(&['\u{8667}']),
-        '\u{2F9B6}' => Some(&['\u{8669}']),
-        '\u{2F9B7}' => Some(&['\u{86A9}']),
-        '\u{2F9B8}' => Some(&['\u{8688}']),
-        '\u{2F9B9}' => Some(&['\u{870E}']),
-        '\u{2F9BA}' => Some(&['\u{86E2}']),
-        '\u{2F9BB}' => Some(&['\u{8779}']),
-        '\u{2F9BC}' => Some(&['\u{8728}']),
-        '\u{2F9BD}' => Some(&['\u{876B}']),
-        '\u{2F9BE}' => Some(&['\u{8786}']),
-        '\u{2F9BF}' => Some(&['\u{45D7}']),
-        '\u{2F9C0}' => Some(&['\u{87E1}']),
-        '\u{2F9C1}' => Some(&['\u{8801}']),
-        '\u{2F9C2}' => Some(&['\u{45F9}']),
-        '\u{2F9C3}' => Some(&['\u{8860}']),
-        '\u{2F9C4}' => Some(&['\u{8863}']),
-        '\u{2F9C5}' => Some(&['\u{27667}']),
-        '\u{2F9C6}' => Some(&['\u{88D7}']),
-        '\u{2F9C7}' => Some(&['\u{88DE}']),
-        '\u{2F9C8}' => Some(&['\u{4635}']),
-        '\u{2F9C9}' => Some(&['\u{88FA}']),
-        '\u{2F9CA}' => Some(&['\u{34BB}']),
-        '\u{2F9CB}' => Some(&['\u{278AE}']),
-        '\u{2F9CC}' => Some(&['\u{27966}']),
-        '\u{2F9CD}' => Some(&['\u{46BE}']),
-        '\u{2F9CE}' => Some(&['\u{46C7}']),
-        '\u{2F9CF}' => Some(&['\u{8AA0}']),
-        '\u{2F9D0}' => Some(&['\u{8AED}']),
-        '\u{2F9D1}' => Some(&['\u{8B8A}']),
-        '\u{2F9D2}' => Some(&['\u{8C55}']),
-        '\u{2F9D3}' => Some(&['\u{27CA8}']),
-        '\u{2F9D4}' => Some(&['\u{8CAB}']),
-        '\u{2F9D5}' => Some(&['\u{8CC1}']),
-        '\u{2F9D6}' => Some(&['\u{8D1B}']),
-        '\u{2F9D7}' => Some(&['\u{8D77}']),
-        '\u{2F9D8}' => Some(&['\u{27F2F}']),
-        '\u{2F9D9}' => Some(&['\u{20804}']),
-        '\u{2F9DA}' => Some(&['\u{8DCB}']),
-        '\u{2F9DB}' => Some(&['\u{8DBC}']),
-        '\u{2F9DC}' => Some(&['\u{8DF0}']),
-        '\u{2F9DD}' => Some(&['\u{208DE}']),
-        '\u{2F9DE}' => Some(&['\u{8ED4}']),
-        '\u{2F9DF}' => Some(&['\u{8F38}']),
-        '\u{2F9E0}' => Some(&['\u{285D2}']),
-        '\u{2F9E1}' => Some(&['\u{285ED}']),
-        '\u{2F9E2}' => Some(&['\u{9094}']),
-        '\u{2F9E3}' => Some(&['\u{90F1}']),
-        '\u{2F9E4}' => Some(&['\u{9111}']),
-        '\u{2F9E5}' => Some(&['\u{2872E}']),
-        '\u{2F9E6}' => Some(&['\u{911B}']),
-        '\u{2F9E7}' => Some(&['\u{9238}']),
-        '\u{2F9E8}' => Some(&['\u{92D7}']),
-        '\u{2F9E9}' => Some(&['\u{92D8}']),
-        '\u{2F9EA}' => Some(&['\u{927C}']),
-        '\u{2F9EB}' => Some(&['\u{93F9}']),
-        '\u{2F9EC}' => Some(&['\u{9415}']),
-        '\u{2F9ED}' => Some(&['\u{28BFA}']),
-        '\u{2F9EE}' => Some(&['\u{958B}']),
-        '\u{2F9EF}' => Some(&['\u{4995}']),
-        '\u{2F9F0}' => Some(&['\u{95B7}']),
-        '\u{2F9F1}' => Some(&['\u{28D77}']),
-        '\u{2F9F2}' => Some(&['\u{49E6}']),
-        '\u{2F9F3}' => Some(&['\u{96C3}']),
-        '\u{2F9F4}' => Some(&['\u{5DB2}']),
-        '\u{2F9F5}' => Some(&['\u{9723}']),
-        '\u{2F9F6}' => Some(&['\u{29145}']),
-        '\u{2F9F7}' => Some(&['\u{2921A}']),
-        '\u{2F9F8}' => Some(&['\u{4A6E}']),
-        '\u{2F9F9}' => Some(&['\u{4A76}']),
-        '\u{2F9FA}' => Some(&['\u{97E0}']),
-        '\u{2F9FB}' => Some(&['\u{2940A}']),
-        '\u{2F9FC}' => Some(&['\u{4AB2}']),
-        '\u{2F9FD}' => Some(&['\u{29496}']),
-        '\u{2F9FE}' => Some(&['\u{980B}']),
-        '\u{2F9FF}' => Some(&['\u{980B}']),
-        '\u{2FA00}' => Some(&['\u{9829}']),
-        '\u{2FA01}' => Some(&['\u{295B6}']),
-        '\u{2FA02}' => Some(&['\u{98E2}']),
-        '\u{2FA03}' => Some(&['\u{4B33}']),
-        '\u{2FA04}' => Some(&['\u{9929}']),
-        '\u{2FA05}' => Some(&['\u{99A7}']),
-        '\u{2FA06}' => Some(&['\u{99C2}']),
-        '\u{2FA07}' => Some(&['\u{99FE}']),
-        '\u{2FA08}' => Some(&['\u{4BCE}']),
-        '\u{2FA09}' => Some(&['\u{29B30}']),
-        '\u{2FA0A}' => Some(&['\u{9B12}']),
-        '\u{2FA0B}' => Some(&['\u{9C40}']),
-        '\u{2FA0C}' => Some(&['\u{9CFD}']),
-        '\u{2FA0D}' => Some(&['\u{4CCE}']),
-        '\u{2FA0E}' => Some(&['\u{4CED}']),
-        '\u{2FA0F}' => Some(&['\u{9D67}']),
-        '\u{2FA10}' => Some(&['\u{2A0CE}']),
-        '\u{2FA11}' => Some(&['\u{4CF8}']),
-        '\u{2FA12}' => Some(&['\u{2A105}']),
-        '\u{2FA13}' => Some(&['\u{2A20E}']),
-        '\u{2FA14}' => Some(&['\u{2A291}']),
-        '\u{2FA15}' => Some(&['\u{9EBB}']),
-        '\u{2FA16}' => Some(&['\u{4D56}']),
-        '\u{2FA17}' => Some(&['\u{9EF9}']),
-        '\u{2FA18}' => Some(&['\u{9EFE}']),
-        '\u{2FA19}' => Some(&['\u{9F05}']),
-        '\u{2FA1A}' => Some(&['\u{9F0F}']),
-        '\u{2FA1B}' => Some(&['\u{9F16}']),
-        '\u{2FA1C}' => Some(&['\u{9F3B}']),
-        '\u{2FA1D}' => Some(&['\u{2A600}']),
-        _ => None,
-    }
+    Some(match c {
+        '\u{00C0}' => &['\u{0041}', '\u{0300}'],
+        '\u{00C1}' => &['\u{0041}', '\u{0301}'],
+        '\u{00C2}' => &['\u{0041}', '\u{0302}'],
+        '\u{00C3}' => &['\u{0041}', '\u{0303}'],
+        '\u{00C4}' => &['\u{0041}', '\u{0308}'],
+        '\u{00C5}' => &['\u{0041}', '\u{030A}'],
+        '\u{00C7}' => &['\u{0043}', '\u{0327}'],
+        '\u{00C8}' => &['\u{0045}', '\u{0300}'],
+        '\u{00C9}' => &['\u{0045}', '\u{0301}'],
+        '\u{00CA}' => &['\u{0045}', '\u{0302}'],
+        '\u{00CB}' => &['\u{0045}', '\u{0308}'],
+        '\u{00CC}' => &['\u{0049}', '\u{0300}'],
+        '\u{00CD}' => &['\u{0049}', '\u{0301}'],
+        '\u{00CE}' => &['\u{0049}', '\u{0302}'],
+        '\u{00CF}' => &['\u{0049}', '\u{0308}'],
+        '\u{00D1}' => &['\u{004E}', '\u{0303}'],
+        '\u{00D2}' => &['\u{004F}', '\u{0300}'],
+        '\u{00D3}' => &['\u{004F}', '\u{0301}'],
+        '\u{00D4}' => &['\u{004F}', '\u{0302}'],
+        '\u{00D5}' => &['\u{004F}', '\u{0303}'],
+        '\u{00D6}' => &['\u{004F}', '\u{0308}'],
+        '\u{00D9}' => &['\u{0055}', '\u{0300}'],
+        '\u{00DA}' => &['\u{0055}', '\u{0301}'],
+        '\u{00DB}' => &['\u{0055}', '\u{0302}'],
+        '\u{00DC}' => &['\u{0055}', '\u{0308}'],
+        '\u{00DD}' => &['\u{0059}', '\u{0301}'],
+        '\u{00E0}' => &['\u{0061}', '\u{0300}'],
+        '\u{00E1}' => &['\u{0061}', '\u{0301}'],
+        '\u{00E2}' => &['\u{0061}', '\u{0302}'],
+        '\u{00E3}' => &['\u{0061}', '\u{0303}'],
+        '\u{00E4}' => &['\u{0061}', '\u{0308}'],
+        '\u{00E5}' => &['\u{0061}', '\u{030A}'],
+        '\u{00E7}' => &['\u{0063}', '\u{0327}'],
+        '\u{00E8}' => &['\u{0065}', '\u{0300}'],
+        '\u{00E9}' => &['\u{0065}', '\u{0301}'],
+        '\u{00EA}' => &['\u{0065}', '\u{0302}'],
+        '\u{00EB}' => &['\u{0065}', '\u{0308}'],
+        '\u{00EC}' => &['\u{0069}', '\u{0300}'],
+        '\u{00ED}' => &['\u{0069}', '\u{0301}'],
+        '\u{00EE}' => &['\u{0069}', '\u{0302}'],
+        '\u{00EF}' => &['\u{0069}', '\u{0308}'],
+        '\u{00F1}' => &['\u{006E}', '\u{0303}'],
+        '\u{00F2}' => &['\u{006F}', '\u{0300}'],
+        '\u{00F3}' => &['\u{006F}', '\u{0301}'],
+        '\u{00F4}' => &['\u{006F}', '\u{0302}'],
+        '\u{00F5}' => &['\u{006F}', '\u{0303}'],
+        '\u{00F6}' => &['\u{006F}', '\u{0308}'],
+        '\u{00F9}' => &['\u{0075}', '\u{0300}'],
+        '\u{00FA}' => &['\u{0075}', '\u{0301}'],
+        '\u{00FB}' => &['\u{0075}', '\u{0302}'],
+        '\u{00FC}' => &['\u{0075}', '\u{0308}'],
+        '\u{00FD}' => &['\u{0079}', '\u{0301}'],
+        '\u{00FF}' => &['\u{0079}', '\u{0308}'],
+        '\u{0100}' => &['\u{0041}', '\u{0304}'],
+        '\u{0101}' => &['\u{0061}', '\u{0304}'],
+        '\u{0102}' => &['\u{0041}', '\u{0306}'],
+        '\u{0103}' => &['\u{0061}', '\u{0306}'],
+        '\u{0104}' => &['\u{0041}', '\u{0328}'],
+        '\u{0105}' => &['\u{0061}', '\u{0328}'],
+        '\u{0106}' => &['\u{0043}', '\u{0301}'],
+        '\u{0107}' => &['\u{0063}', '\u{0301}'],
+        '\u{0108}' => &['\u{0043}', '\u{0302}'],
+        '\u{0109}' => &['\u{0063}', '\u{0302}'],
+        '\u{010A}' => &['\u{0043}', '\u{0307}'],
+        '\u{010B}' => &['\u{0063}', '\u{0307}'],
+        '\u{010C}' => &['\u{0043}', '\u{030C}'],
+        '\u{010D}' => &['\u{0063}', '\u{030C}'],
+        '\u{010E}' => &['\u{0044}', '\u{030C}'],
+        '\u{010F}' => &['\u{0064}', '\u{030C}'],
+        '\u{0112}' => &['\u{0045}', '\u{0304}'],
+        '\u{0113}' => &['\u{0065}', '\u{0304}'],
+        '\u{0114}' => &['\u{0045}', '\u{0306}'],
+        '\u{0115}' => &['\u{0065}', '\u{0306}'],
+        '\u{0116}' => &['\u{0045}', '\u{0307}'],
+        '\u{0117}' => &['\u{0065}', '\u{0307}'],
+        '\u{0118}' => &['\u{0045}', '\u{0328}'],
+        '\u{0119}' => &['\u{0065}', '\u{0328}'],
+        '\u{011A}' => &['\u{0045}', '\u{030C}'],
+        '\u{011B}' => &['\u{0065}', '\u{030C}'],
+        '\u{011C}' => &['\u{0047}', '\u{0302}'],
+        '\u{011D}' => &['\u{0067}', '\u{0302}'],
+        '\u{011E}' => &['\u{0047}', '\u{0306}'],
+        '\u{011F}' => &['\u{0067}', '\u{0306}'],
+        '\u{0120}' => &['\u{0047}', '\u{0307}'],
+        '\u{0121}' => &['\u{0067}', '\u{0307}'],
+        '\u{0122}' => &['\u{0047}', '\u{0327}'],
+        '\u{0123}' => &['\u{0067}', '\u{0327}'],
+        '\u{0124}' => &['\u{0048}', '\u{0302}'],
+        '\u{0125}' => &['\u{0068}', '\u{0302}'],
+        '\u{0128}' => &['\u{0049}', '\u{0303}'],
+        '\u{0129}' => &['\u{0069}', '\u{0303}'],
+        '\u{012A}' => &['\u{0049}', '\u{0304}'],
+        '\u{012B}' => &['\u{0069}', '\u{0304}'],
+        '\u{012C}' => &['\u{0049}', '\u{0306}'],
+        '\u{012D}' => &['\u{0069}', '\u{0306}'],
+        '\u{012E}' => &['\u{0049}', '\u{0328}'],
+        '\u{012F}' => &['\u{0069}', '\u{0328}'],
+        '\u{0130}' => &['\u{0049}', '\u{0307}'],
+        '\u{0134}' => &['\u{004A}', '\u{0302}'],
+        '\u{0135}' => &['\u{006A}', '\u{0302}'],
+        '\u{0136}' => &['\u{004B}', '\u{0327}'],
+        '\u{0137}' => &['\u{006B}', '\u{0327}'],
+        '\u{0139}' => &['\u{004C}', '\u{0301}'],
+        '\u{013A}' => &['\u{006C}', '\u{0301}'],
+        '\u{013B}' => &['\u{004C}', '\u{0327}'],
+        '\u{013C}' => &['\u{006C}', '\u{0327}'],
+        '\u{013D}' => &['\u{004C}', '\u{030C}'],
+        '\u{013E}' => &['\u{006C}', '\u{030C}'],
+        '\u{0143}' => &['\u{004E}', '\u{0301}'],
+        '\u{0144}' => &['\u{006E}', '\u{0301}'],
+        '\u{0145}' => &['\u{004E}', '\u{0327}'],
+        '\u{0146}' => &['\u{006E}', '\u{0327}'],
+        '\u{0147}' => &['\u{004E}', '\u{030C}'],
+        '\u{0148}' => &['\u{006E}', '\u{030C}'],
+        '\u{014C}' => &['\u{004F}', '\u{0304}'],
+        '\u{014D}' => &['\u{006F}', '\u{0304}'],
+        '\u{014E}' => &['\u{004F}', '\u{0306}'],
+        '\u{014F}' => &['\u{006F}', '\u{0306}'],
+        '\u{0150}' => &['\u{004F}', '\u{030B}'],
+        '\u{0151}' => &['\u{006F}', '\u{030B}'],
+        '\u{0154}' => &['\u{0052}', '\u{0301}'],
+        '\u{0155}' => &['\u{0072}', '\u{0301}'],
+        '\u{0156}' => &['\u{0052}', '\u{0327}'],
+        '\u{0157}' => &['\u{0072}', '\u{0327}'],
+        '\u{0158}' => &['\u{0052}', '\u{030C}'],
+        '\u{0159}' => &['\u{0072}', '\u{030C}'],
+        '\u{015A}' => &['\u{0053}', '\u{0301}'],
+        '\u{015B}' => &['\u{0073}', '\u{0301}'],
+        '\u{015C}' => &['\u{0053}', '\u{0302}'],
+        '\u{015D}' => &['\u{0073}', '\u{0302}'],
+        '\u{015E}' => &['\u{0053}', '\u{0327}'],
+        '\u{015F}' => &['\u{0073}', '\u{0327}'],
+        '\u{0160}' => &['\u{0053}', '\u{030C}'],
+        '\u{0161}' => &['\u{0073}', '\u{030C}'],
+        '\u{0162}' => &['\u{0054}', '\u{0327}'],
+        '\u{0163}' => &['\u{0074}', '\u{0327}'],
+        '\u{0164}' => &['\u{0054}', '\u{030C}'],
+        '\u{0165}' => &['\u{0074}', '\u{030C}'],
+        '\u{0168}' => &['\u{0055}', '\u{0303}'],
+        '\u{0169}' => &['\u{0075}', '\u{0303}'],
+        '\u{016A}' => &['\u{0055}', '\u{0304}'],
+        '\u{016B}' => &['\u{0075}', '\u{0304}'],
+        '\u{016C}' => &['\u{0055}', '\u{0306}'],
+        '\u{016D}' => &['\u{0075}', '\u{0306}'],
+        '\u{016E}' => &['\u{0055}', '\u{030A}'],
+        '\u{016F}' => &['\u{0075}', '\u{030A}'],
+        '\u{0170}' => &['\u{0055}', '\u{030B}'],
+        '\u{0171}' => &['\u{0075}', '\u{030B}'],
+        '\u{0172}' => &['\u{0055}', '\u{0328}'],
+        '\u{0173}' => &['\u{0075}', '\u{0328}'],
+        '\u{0174}' => &['\u{0057}', '\u{0302}'],
+        '\u{0175}' => &['\u{0077}', '\u{0302}'],
+        '\u{0176}' => &['\u{0059}', '\u{0302}'],
+        '\u{0177}' => &['\u{0079}', '\u{0302}'],
+        '\u{0178}' => &['\u{0059}', '\u{0308}'],
+        '\u{0179}' => &['\u{005A}', '\u{0301}'],
+        '\u{017A}' => &['\u{007A}', '\u{0301}'],
+        '\u{017B}' => &['\u{005A}', '\u{0307}'],
+        '\u{017C}' => &['\u{007A}', '\u{0307}'],
+        '\u{017D}' => &['\u{005A}', '\u{030C}'],
+        '\u{017E}' => &['\u{007A}', '\u{030C}'],
+        '\u{01A0}' => &['\u{004F}', '\u{031B}'],
+        '\u{01A1}' => &['\u{006F}', '\u{031B}'],
+        '\u{01AF}' => &['\u{0055}', '\u{031B}'],
+        '\u{01B0}' => &['\u{0075}', '\u{031B}'],
+        '\u{01CD}' => &['\u{0041}', '\u{030C}'],
+        '\u{01CE}' => &['\u{0061}', '\u{030C}'],
+        '\u{01CF}' => &['\u{0049}', '\u{030C}'],
+        '\u{01D0}' => &['\u{0069}', '\u{030C}'],
+        '\u{01D1}' => &['\u{004F}', '\u{030C}'],
+        '\u{01D2}' => &['\u{006F}', '\u{030C}'],
+        '\u{01D3}' => &['\u{0055}', '\u{030C}'],
+        '\u{01D4}' => &['\u{0075}', '\u{030C}'],
+        '\u{01D5}' => &['\u{0055}', '\u{0308}', '\u{0304}'],
+        '\u{01D6}' => &['\u{0075}', '\u{0308}', '\u{0304}'],
+        '\u{01D7}' => &['\u{0055}', '\u{0308}', '\u{0301}'],
+        '\u{01D8}' => &['\u{0075}', '\u{0308}', '\u{0301}'],
+        '\u{01D9}' => &['\u{0055}', '\u{0308}', '\u{030C}'],
+        '\u{01DA}' => &['\u{0075}', '\u{0308}', '\u{030C}'],
+        '\u{01DB}' => &['\u{0055}', '\u{0308}', '\u{0300}'],
+        '\u{01DC}' => &['\u{0075}', '\u{0308}', '\u{0300}'],
+        '\u{01DE}' => &['\u{0041}', '\u{0308}', '\u{0304}'],
+        '\u{01DF}' => &['\u{0061}', '\u{0308}', '\u{0304}'],
+        '\u{01E0}' => &['\u{0041}', '\u{0307}', '\u{0304}'],
+        '\u{01E1}' => &['\u{0061}', '\u{0307}', '\u{0304}'],
+        '\u{01E2}' => &['\u{00C6}', '\u{0304}'],
+        '\u{01E3}' => &['\u{00E6}', '\u{0304}'],
+        '\u{01E6}' => &['\u{0047}', '\u{030C}'],
+        '\u{01E7}' => &['\u{0067}', '\u{030C}'],
+        '\u{01E8}' => &['\u{004B}', '\u{030C}'],
+        '\u{01E9}' => &['\u{006B}', '\u{030C}'],
+        '\u{01EA}' => &['\u{004F}', '\u{0328}'],
+        '\u{01EB}' => &['\u{006F}', '\u{0328}'],
+        '\u{01EC}' => &['\u{004F}', '\u{0328}', '\u{0304}'],
+        '\u{01ED}' => &['\u{006F}', '\u{0328}', '\u{0304}'],
+        '\u{01EE}' => &['\u{01B7}', '\u{030C}'],
+        '\u{01EF}' => &['\u{0292}', '\u{030C}'],
+        '\u{01F0}' => &['\u{006A}', '\u{030C}'],
+        '\u{01F4}' => &['\u{0047}', '\u{0301}'],
+        '\u{01F5}' => &['\u{0067}', '\u{0301}'],
+        '\u{01F8}' => &['\u{004E}', '\u{0300}'],
+        '\u{01F9}' => &['\u{006E}', '\u{0300}'],
+        '\u{01FA}' => &['\u{0041}', '\u{030A}', '\u{0301}'],
+        '\u{01FB}' => &['\u{0061}', '\u{030A}', '\u{0301}'],
+        '\u{01FC}' => &['\u{00C6}', '\u{0301}'],
+        '\u{01FD}' => &['\u{00E6}', '\u{0301}'],
+        '\u{01FE}' => &['\u{00D8}', '\u{0301}'],
+        '\u{01FF}' => &['\u{00F8}', '\u{0301}'],
+        '\u{0200}' => &['\u{0041}', '\u{030F}'],
+        '\u{0201}' => &['\u{0061}', '\u{030F}'],
+        '\u{0202}' => &['\u{0041}', '\u{0311}'],
+        '\u{0203}' => &['\u{0061}', '\u{0311}'],
+        '\u{0204}' => &['\u{0045}', '\u{030F}'],
+        '\u{0205}' => &['\u{0065}', '\u{030F}'],
+        '\u{0206}' => &['\u{0045}', '\u{0311}'],
+        '\u{0207}' => &['\u{0065}', '\u{0311}'],
+        '\u{0208}' => &['\u{0049}', '\u{030F}'],
+        '\u{0209}' => &['\u{0069}', '\u{030F}'],
+        '\u{020A}' => &['\u{0049}', '\u{0311}'],
+        '\u{020B}' => &['\u{0069}', '\u{0311}'],
+        '\u{020C}' => &['\u{004F}', '\u{030F}'],
+        '\u{020D}' => &['\u{006F}', '\u{030F}'],
+        '\u{020E}' => &['\u{004F}', '\u{0311}'],
+        '\u{020F}' => &['\u{006F}', '\u{0311}'],
+        '\u{0210}' => &['\u{0052}', '\u{030F}'],
+        '\u{0211}' => &['\u{0072}', '\u{030F}'],
+        '\u{0212}' => &['\u{0052}', '\u{0311}'],
+        '\u{0213}' => &['\u{0072}', '\u{0311}'],
+        '\u{0214}' => &['\u{0055}', '\u{030F}'],
+        '\u{0215}' => &['\u{0075}', '\u{030F}'],
+        '\u{0216}' => &['\u{0055}', '\u{0311}'],
+        '\u{0217}' => &['\u{0075}', '\u{0311}'],
+        '\u{0218}' => &['\u{0053}', '\u{0326}'],
+        '\u{0219}' => &['\u{0073}', '\u{0326}'],
+        '\u{021A}' => &['\u{0054}', '\u{0326}'],
+        '\u{021B}' => &['\u{0074}', '\u{0326}'],
+        '\u{021E}' => &['\u{0048}', '\u{030C}'],
+        '\u{021F}' => &['\u{0068}', '\u{030C}'],
+        '\u{0226}' => &['\u{0041}', '\u{0307}'],
+        '\u{0227}' => &['\u{0061}', '\u{0307}'],
+        '\u{0228}' => &['\u{0045}', '\u{0327}'],
+        '\u{0229}' => &['\u{0065}', '\u{0327}'],
+        '\u{022A}' => &['\u{004F}', '\u{0308}', '\u{0304}'],
+        '\u{022B}' => &['\u{006F}', '\u{0308}', '\u{0304}'],
+        '\u{022C}' => &['\u{004F}', '\u{0303}', '\u{0304}'],
+        '\u{022D}' => &['\u{006F}', '\u{0303}', '\u{0304}'],
+        '\u{022E}' => &['\u{004F}', '\u{0307}'],
+        '\u{022F}' => &['\u{006F}', '\u{0307}'],
+        '\u{0230}' => &['\u{004F}', '\u{0307}', '\u{0304}'],
+        '\u{0231}' => &['\u{006F}', '\u{0307}', '\u{0304}'],
+        '\u{0232}' => &['\u{0059}', '\u{0304}'],
+        '\u{0233}' => &['\u{0079}', '\u{0304}'],
+        '\u{0340}' => &['\u{0300}'],
+        '\u{0341}' => &['\u{0301}'],
+        '\u{0343}' => &['\u{0313}'],
+        '\u{0344}' => &['\u{0308}', '\u{0301}'],
+        '\u{0374}' => &['\u{02B9}'],
+        '\u{037E}' => &['\u{003B}'],
+        '\u{0385}' => &['\u{00A8}', '\u{0301}'],
+        '\u{0386}' => &['\u{0391}', '\u{0301}'],
+        '\u{0387}' => &['\u{00B7}'],
+        '\u{0388}' => &['\u{0395}', '\u{0301}'],
+        '\u{0389}' => &['\u{0397}', '\u{0301}'],
+        '\u{038A}' => &['\u{0399}', '\u{0301}'],
+        '\u{038C}' => &['\u{039F}', '\u{0301}'],
+        '\u{038E}' => &['\u{03A5}', '\u{0301}'],
+        '\u{038F}' => &['\u{03A9}', '\u{0301}'],
+        '\u{0390}' => &['\u{03B9}', '\u{0308}', '\u{0301}'],
+        '\u{03AA}' => &['\u{0399}', '\u{0308}'],
+        '\u{03AB}' => &['\u{03A5}', '\u{0308}'],
+        '\u{03AC}' => &['\u{03B1}', '\u{0301}'],
+        '\u{03AD}' => &['\u{03B5}', '\u{0301}'],
+        '\u{03AE}' => &['\u{03B7}', '\u{0301}'],
+        '\u{03AF}' => &['\u{03B9}', '\u{0301}'],
+        '\u{03B0}' => &['\u{03C5}', '\u{0308}', '\u{0301}'],
+        '\u{03CA}' => &['\u{03B9}', '\u{0308}'],
+        '\u{03CB}' => &['\u{03C5}', '\u{0308}'],
+        '\u{03CC}' => &['\u{03BF}', '\u{0301}'],
+        '\u{03CD}' => &['\u{03C5}', '\u{0301}'],
+        '\u{03CE}' => &['\u{03C9}', '\u{0301}'],
+        '\u{03D3}' => &['\u{03D2}', '\u{0301}'],
+        '\u{03D4}' => &['\u{03D2}', '\u{0308}'],
+        '\u{0400}' => &['\u{0415}', '\u{0300}'],
+        '\u{0401}' => &['\u{0415}', '\u{0308}'],
+        '\u{0403}' => &['\u{0413}', '\u{0301}'],
+        '\u{0407}' => &['\u{0406}', '\u{0308}'],
+        '\u{040C}' => &['\u{041A}', '\u{0301}'],
+        '\u{040D}' => &['\u{0418}', '\u{0300}'],
+        '\u{040E}' => &['\u{0423}', '\u{0306}'],
+        '\u{0419}' => &['\u{0418}', '\u{0306}'],
+        '\u{0439}' => &['\u{0438}', '\u{0306}'],
+        '\u{0450}' => &['\u{0435}', '\u{0300}'],
+        '\u{0451}' => &['\u{0435}', '\u{0308}'],
+        '\u{0453}' => &['\u{0433}', '\u{0301}'],
+        '\u{0457}' => &['\u{0456}', '\u{0308}'],
+        '\u{045C}' => &['\u{043A}', '\u{0301}'],
+        '\u{045D}' => &['\u{0438}', '\u{0300}'],
+        '\u{045E}' => &['\u{0443}', '\u{0306}'],
+        '\u{0476}' => &['\u{0474}', '\u{030F}'],
+        '\u{0477}' => &['\u{0475}', '\u{030F}'],
+        '\u{04C1}' => &['\u{0416}', '\u{0306}'],
+        '\u{04C2}' => &['\u{0436}', '\u{0306}'],
+        '\u{04D0}' => &['\u{0410}', '\u{0306}'],
+        '\u{04D1}' => &['\u{0430}', '\u{0306}'],
+        '\u{04D2}' => &['\u{0410}', '\u{0308}'],
+        '\u{04D3}' => &['\u{0430}', '\u{0308}'],
+        '\u{04D6}' => &['\u{0415}', '\u{0306}'],
+        '\u{04D7}' => &['\u{0435}', '\u{0306}'],
+        '\u{04DA}' => &['\u{04D8}', '\u{0308}'],
+        '\u{04DB}' => &['\u{04D9}', '\u{0308}'],
+        '\u{04DC}' => &['\u{0416}', '\u{0308}'],
+        '\u{04DD}' => &['\u{0436}', '\u{0308}'],
+        '\u{04DE}' => &['\u{0417}', '\u{0308}'],
+        '\u{04DF}' => &['\u{0437}', '\u{0308}'],
+        '\u{04E2}' => &['\u{0418}', '\u{0304}'],
+        '\u{04E3}' => &['\u{0438}', '\u{0304}'],
+        '\u{04E4}' => &['\u{0418}', '\u{0308}'],
+        '\u{04E5}' => &['\u{0438}', '\u{0308}'],
+        '\u{04E6}' => &['\u{041E}', '\u{0308}'],
+        '\u{04E7}' => &['\u{043E}', '\u{0308}'],
+        '\u{04EA}' => &['\u{04E8}', '\u{0308}'],
+        '\u{04EB}' => &['\u{04E9}', '\u{0308}'],
+        '\u{04EC}' => &['\u{042D}', '\u{0308}'],
+        '\u{04ED}' => &['\u{044D}', '\u{0308}'],
+        '\u{04EE}' => &['\u{0423}', '\u{0304}'],
+        '\u{04EF}' => &['\u{0443}', '\u{0304}'],
+        '\u{04F0}' => &['\u{0423}', '\u{0308}'],
+        '\u{04F1}' => &['\u{0443}', '\u{0308}'],
+        '\u{04F2}' => &['\u{0423}', '\u{030B}'],
+        '\u{04F3}' => &['\u{0443}', '\u{030B}'],
+        '\u{04F4}' => &['\u{0427}', '\u{0308}'],
+        '\u{04F5}' => &['\u{0447}', '\u{0308}'],
+        '\u{04F8}' => &['\u{042B}', '\u{0308}'],
+        '\u{04F9}' => &['\u{044B}', '\u{0308}'],
+        '\u{0622}' => &['\u{0627}', '\u{0653}'],
+        '\u{0623}' => &['\u{0627}', '\u{0654}'],
+        '\u{0624}' => &['\u{0648}', '\u{0654}'],
+        '\u{0625}' => &['\u{0627}', '\u{0655}'],
+        '\u{0626}' => &['\u{064A}', '\u{0654}'],
+        '\u{06C0}' => &['\u{06D5}', '\u{0654}'],
+        '\u{06C2}' => &['\u{06C1}', '\u{0654}'],
+        '\u{06D3}' => &['\u{06D2}', '\u{0654}'],
+        '\u{0929}' => &['\u{0928}', '\u{093C}'],
+        '\u{0931}' => &['\u{0930}', '\u{093C}'],
+        '\u{0934}' => &['\u{0933}', '\u{093C}'],
+        '\u{0958}' => &['\u{0915}', '\u{093C}'],
+        '\u{0959}' => &['\u{0916}', '\u{093C}'],
+        '\u{095A}' => &['\u{0917}', '\u{093C}'],
+        '\u{095B}' => &['\u{091C}', '\u{093C}'],
+        '\u{095C}' => &['\u{0921}', '\u{093C}'],
+        '\u{095D}' => &['\u{0922}', '\u{093C}'],
+        '\u{095E}' => &['\u{092B}', '\u{093C}'],
+        '\u{095F}' => &['\u{092F}', '\u{093C}'],
+        '\u{09CB}' => &['\u{09C7}', '\u{09BE}'],
+        '\u{09CC}' => &['\u{09C7}', '\u{09D7}'],
+        '\u{09DC}' => &['\u{09A1}', '\u{09BC}'],
+        '\u{09DD}' => &['\u{09A2}', '\u{09BC}'],
+        '\u{09DF}' => &['\u{09AF}', '\u{09BC}'],
+        '\u{0A33}' => &['\u{0A32}', '\u{0A3C}'],
+        '\u{0A36}' => &['\u{0A38}', '\u{0A3C}'],
+        '\u{0A59}' => &['\u{0A16}', '\u{0A3C}'],
+        '\u{0A5A}' => &['\u{0A17}', '\u{0A3C}'],
+        '\u{0A5B}' => &['\u{0A1C}', '\u{0A3C}'],
+        '\u{0A5E}' => &['\u{0A2B}', '\u{0A3C}'],
+        '\u{0B48}' => &['\u{0B47}', '\u{0B56}'],
+        '\u{0B4B}' => &['\u{0B47}', '\u{0B3E}'],
+        '\u{0B4C}' => &['\u{0B47}', '\u{0B57}'],
+        '\u{0B5C}' => &['\u{0B21}', '\u{0B3C}'],
+        '\u{0B5D}' => &['\u{0B22}', '\u{0B3C}'],
+        '\u{0B94}' => &['\u{0B92}', '\u{0BD7}'],
+        '\u{0BCA}' => &['\u{0BC6}', '\u{0BBE}'],
+        '\u{0BCB}' => &['\u{0BC7}', '\u{0BBE}'],
+        '\u{0BCC}' => &['\u{0BC6}', '\u{0BD7}'],
+        '\u{0C48}' => &['\u{0C46}', '\u{0C56}'],
+        '\u{0CC0}' => &['\u{0CBF}', '\u{0CD5}'],
+        '\u{0CC7}' => &['\u{0CC6}', '\u{0CD5}'],
+        '\u{0CC8}' => &['\u{0CC6}', '\u{0CD6}'],
+        '\u{0CCA}' => &['\u{0CC6}', '\u{0CC2}'],
+        '\u{0CCB}' => &['\u{0CC6}', '\u{0CC2}', '\u{0CD5}'],
+        '\u{0D4A}' => &['\u{0D46}', '\u{0D3E}'],
+        '\u{0D4B}' => &['\u{0D47}', '\u{0D3E}'],
+        '\u{0D4C}' => &['\u{0D46}', '\u{0D57}'],
+        '\u{0DDA}' => &['\u{0DD9}', '\u{0DCA}'],
+        '\u{0DDC}' => &['\u{0DD9}', '\u{0DCF}'],
+        '\u{0DDD}' => &['\u{0DD9}', '\u{0DCF}', '\u{0DCA}'],
+        '\u{0DDE}' => &['\u{0DD9}', '\u{0DDF}'],
+        '\u{0F43}' => &['\u{0F42}', '\u{0FB7}'],
+        '\u{0F4D}' => &['\u{0F4C}', '\u{0FB7}'],
+        '\u{0F52}' => &['\u{0F51}', '\u{0FB7}'],
+        '\u{0F57}' => &['\u{0F56}', '\u{0FB7}'],
+        '\u{0F5C}' => &['\u{0F5B}', '\u{0FB7}'],
+        '\u{0F69}' => &['\u{0F40}', '\u{0FB5}'],
+        '\u{0F73}' => &['\u{0F71}', '\u{0F72}'],
+        '\u{0F75}' => &['\u{0F71}', '\u{0F74}'],
+        '\u{0F76}' => &['\u{0FB2}', '\u{0F80}'],
+        '\u{0F78}' => &['\u{0FB3}', '\u{0F80}'],
+        '\u{0F81}' => &['\u{0F71}', '\u{0F80}'],
+        '\u{0F93}' => &['\u{0F92}', '\u{0FB7}'],
+        '\u{0F9D}' => &['\u{0F9C}', '\u{0FB7}'],
+        '\u{0FA2}' => &['\u{0FA1}', '\u{0FB7}'],
+        '\u{0FA7}' => &['\u{0FA6}', '\u{0FB7}'],
+        '\u{0FAC}' => &['\u{0FAB}', '\u{0FB7}'],
+        '\u{0FB9}' => &['\u{0F90}', '\u{0FB5}'],
+        '\u{1026}' => &['\u{1025}', '\u{102E}'],
+        '\u{1B06}' => &['\u{1B05}', '\u{1B35}'],
+        '\u{1B08}' => &['\u{1B07}', '\u{1B35}'],
+        '\u{1B0A}' => &['\u{1B09}', '\u{1B35}'],
+        '\u{1B0C}' => &['\u{1B0B}', '\u{1B35}'],
+        '\u{1B0E}' => &['\u{1B0D}', '\u{1B35}'],
+        '\u{1B12}' => &['\u{1B11}', '\u{1B35}'],
+        '\u{1B3B}' => &['\u{1B3A}', '\u{1B35}'],
+        '\u{1B3D}' => &['\u{1B3C}', '\u{1B35}'],
+        '\u{1B40}' => &['\u{1B3E}', '\u{1B35}'],
+        '\u{1B41}' => &['\u{1B3F}', '\u{1B35}'],
+        '\u{1B43}' => &['\u{1B42}', '\u{1B35}'],
+        '\u{1E00}' => &['\u{0041}', '\u{0325}'],
+        '\u{1E01}' => &['\u{0061}', '\u{0325}'],
+        '\u{1E02}' => &['\u{0042}', '\u{0307}'],
+        '\u{1E03}' => &['\u{0062}', '\u{0307}'],
+        '\u{1E04}' => &['\u{0042}', '\u{0323}'],
+        '\u{1E05}' => &['\u{0062}', '\u{0323}'],
+        '\u{1E06}' => &['\u{0042}', '\u{0331}'],
+        '\u{1E07}' => &['\u{0062}', '\u{0331}'],
+        '\u{1E08}' => &['\u{0043}', '\u{0327}', '\u{0301}'],
+        '\u{1E09}' => &['\u{0063}', '\u{0327}', '\u{0301}'],
+        '\u{1E0A}' => &['\u{0044}', '\u{0307}'],
+        '\u{1E0B}' => &['\u{0064}', '\u{0307}'],
+        '\u{1E0C}' => &['\u{0044}', '\u{0323}'],
+        '\u{1E0D}' => &['\u{0064}', '\u{0323}'],
+        '\u{1E0E}' => &['\u{0044}', '\u{0331}'],
+        '\u{1E0F}' => &['\u{0064}', '\u{0331}'],
+        '\u{1E10}' => &['\u{0044}', '\u{0327}'],
+        '\u{1E11}' => &['\u{0064}', '\u{0327}'],
+        '\u{1E12}' => &['\u{0044}', '\u{032D}'],
+        '\u{1E13}' => &['\u{0064}', '\u{032D}'],
+        '\u{1E14}' => &['\u{0045}', '\u{0304}', '\u{0300}'],
+        '\u{1E15}' => &['\u{0065}', '\u{0304}', '\u{0300}'],
+        '\u{1E16}' => &['\u{0045}', '\u{0304}', '\u{0301}'],
+        '\u{1E17}' => &['\u{0065}', '\u{0304}', '\u{0301}'],
+        '\u{1E18}' => &['\u{0045}', '\u{032D}'],
+        '\u{1E19}' => &['\u{0065}', '\u{032D}'],
+        '\u{1E1A}' => &['\u{0045}', '\u{0330}'],
+        '\u{1E1B}' => &['\u{0065}', '\u{0330}'],
+        '\u{1E1C}' => &['\u{0045}', '\u{0327}', '\u{0306}'],
+        '\u{1E1D}' => &['\u{0065}', '\u{0327}', '\u{0306}'],
+        '\u{1E1E}' => &['\u{0046}', '\u{0307}'],
+        '\u{1E1F}' => &['\u{0066}', '\u{0307}'],
+        '\u{1E20}' => &['\u{0047}', '\u{0304}'],
+        '\u{1E21}' => &['\u{0067}', '\u{0304}'],
+        '\u{1E22}' => &['\u{0048}', '\u{0307}'],
+        '\u{1E23}' => &['\u{0068}', '\u{0307}'],
+        '\u{1E24}' => &['\u{0048}', '\u{0323}'],
+        '\u{1E25}' => &['\u{0068}', '\u{0323}'],
+        '\u{1E26}' => &['\u{0048}', '\u{0308}'],
+        '\u{1E27}' => &['\u{0068}', '\u{0308}'],
+        '\u{1E28}' => &['\u{0048}', '\u{0327}'],
+        '\u{1E29}' => &['\u{0068}', '\u{0327}'],
+        '\u{1E2A}' => &['\u{0048}', '\u{032E}'],
+        '\u{1E2B}' => &['\u{0068}', '\u{032E}'],
+        '\u{1E2C}' => &['\u{0049}', '\u{0330}'],
+        '\u{1E2D}' => &['\u{0069}', '\u{0330}'],
+        '\u{1E2E}' => &['\u{0049}', '\u{0308}', '\u{0301}'],
+        '\u{1E2F}' => &['\u{0069}', '\u{0308}', '\u{0301}'],
+        '\u{1E30}' => &['\u{004B}', '\u{0301}'],
+        '\u{1E31}' => &['\u{006B}', '\u{0301}'],
+        '\u{1E32}' => &['\u{004B}', '\u{0323}'],
+        '\u{1E33}' => &['\u{006B}', '\u{0323}'],
+        '\u{1E34}' => &['\u{004B}', '\u{0331}'],
+        '\u{1E35}' => &['\u{006B}', '\u{0331}'],
+        '\u{1E36}' => &['\u{004C}', '\u{0323}'],
+        '\u{1E37}' => &['\u{006C}', '\u{0323}'],
+        '\u{1E38}' => &['\u{004C}', '\u{0323}', '\u{0304}'],
+        '\u{1E39}' => &['\u{006C}', '\u{0323}', '\u{0304}'],
+        '\u{1E3A}' => &['\u{004C}', '\u{0331}'],
+        '\u{1E3B}' => &['\u{006C}', '\u{0331}'],
+        '\u{1E3C}' => &['\u{004C}', '\u{032D}'],
+        '\u{1E3D}' => &['\u{006C}', '\u{032D}'],
+        '\u{1E3E}' => &['\u{004D}', '\u{0301}'],
+        '\u{1E3F}' => &['\u{006D}', '\u{0301}'],
+        '\u{1E40}' => &['\u{004D}', '\u{0307}'],
+        '\u{1E41}' => &['\u{006D}', '\u{0307}'],
+        '\u{1E42}' => &['\u{004D}', '\u{0323}'],
+        '\u{1E43}' => &['\u{006D}', '\u{0323}'],
+        '\u{1E44}' => &['\u{004E}', '\u{0307}'],
+        '\u{1E45}' => &['\u{006E}', '\u{0307}'],
+        '\u{1E46}' => &['\u{004E}', '\u{0323}'],
+        '\u{1E47}' => &['\u{006E}', '\u{0323}'],
+        '\u{1E48}' => &['\u{004E}', '\u{0331}'],
+        '\u{1E49}' => &['\u{006E}', '\u{0331}'],
+        '\u{1E4A}' => &['\u{004E}', '\u{032D}'],
+        '\u{1E4B}' => &['\u{006E}', '\u{032D}'],
+        '\u{1E4C}' => &['\u{004F}', '\u{0303}', '\u{0301}'],
+        '\u{1E4D}' => &['\u{006F}', '\u{0303}', '\u{0301}'],
+        '\u{1E4E}' => &['\u{004F}', '\u{0303}', '\u{0308}'],
+        '\u{1E4F}' => &['\u{006F}', '\u{0303}', '\u{0308}'],
+        '\u{1E50}' => &['\u{004F}', '\u{0304}', '\u{0300}'],
+        '\u{1E51}' => &['\u{006F}', '\u{0304}', '\u{0300}'],
+        '\u{1E52}' => &['\u{004F}', '\u{0304}', '\u{0301}'],
+        '\u{1E53}' => &['\u{006F}', '\u{0304}', '\u{0301}'],
+        '\u{1E54}' => &['\u{0050}', '\u{0301}'],
+        '\u{1E55}' => &['\u{0070}', '\u{0301}'],
+        '\u{1E56}' => &['\u{0050}', '\u{0307}'],
+        '\u{1E57}' => &['\u{0070}', '\u{0307}'],
+        '\u{1E58}' => &['\u{0052}', '\u{0307}'],
+        '\u{1E59}' => &['\u{0072}', '\u{0307}'],
+        '\u{1E5A}' => &['\u{0052}', '\u{0323}'],
+        '\u{1E5B}' => &['\u{0072}', '\u{0323}'],
+        '\u{1E5C}' => &['\u{0052}', '\u{0323}', '\u{0304}'],
+        '\u{1E5D}' => &['\u{0072}', '\u{0323}', '\u{0304}'],
+        '\u{1E5E}' => &['\u{0052}', '\u{0331}'],
+        '\u{1E5F}' => &['\u{0072}', '\u{0331}'],
+        '\u{1E60}' => &['\u{0053}', '\u{0307}'],
+        '\u{1E61}' => &['\u{0073}', '\u{0307}'],
+        '\u{1E62}' => &['\u{0053}', '\u{0323}'],
+        '\u{1E63}' => &['\u{0073}', '\u{0323}'],
+        '\u{1E64}' => &['\u{0053}', '\u{0301}', '\u{0307}'],
+        '\u{1E65}' => &['\u{0073}', '\u{0301}', '\u{0307}'],
+        '\u{1E66}' => &['\u{0053}', '\u{030C}', '\u{0307}'],
+        '\u{1E67}' => &['\u{0073}', '\u{030C}', '\u{0307}'],
+        '\u{1E68}' => &['\u{0053}', '\u{0323}', '\u{0307}'],
+        '\u{1E69}' => &['\u{0073}', '\u{0323}', '\u{0307}'],
+        '\u{1E6A}' => &['\u{0054}', '\u{0307}'],
+        '\u{1E6B}' => &['\u{0074}', '\u{0307}'],
+        '\u{1E6C}' => &['\u{0054}', '\u{0323}'],
+        '\u{1E6D}' => &['\u{0074}', '\u{0323}'],
+        '\u{1E6E}' => &['\u{0054}', '\u{0331}'],
+        '\u{1E6F}' => &['\u{0074}', '\u{0331}'],
+        '\u{1E70}' => &['\u{0054}', '\u{032D}'],
+        '\u{1E71}' => &['\u{0074}', '\u{032D}'],
+        '\u{1E72}' => &['\u{0055}', '\u{0324}'],
+        '\u{1E73}' => &['\u{0075}', '\u{0324}'],
+        '\u{1E74}' => &['\u{0055}', '\u{0330}'],
+        '\u{1E75}' => &['\u{0075}', '\u{0330}'],
+        '\u{1E76}' => &['\u{0055}', '\u{032D}'],
+        '\u{1E77}' => &['\u{0075}', '\u{032D}'],
+        '\u{1E78}' => &['\u{0055}', '\u{0303}', '\u{0301}'],
+        '\u{1E79}' => &['\u{0075}', '\u{0303}', '\u{0301}'],
+        '\u{1E7A}' => &['\u{0055}', '\u{0304}', '\u{0308}'],
+        '\u{1E7B}' => &['\u{0075}', '\u{0304}', '\u{0308}'],
+        '\u{1E7C}' => &['\u{0056}', '\u{0303}'],
+        '\u{1E7D}' => &['\u{0076}', '\u{0303}'],
+        '\u{1E7E}' => &['\u{0056}', '\u{0323}'],
+        '\u{1E7F}' => &['\u{0076}', '\u{0323}'],
+        '\u{1E80}' => &['\u{0057}', '\u{0300}'],
+        '\u{1E81}' => &['\u{0077}', '\u{0300}'],
+        '\u{1E82}' => &['\u{0057}', '\u{0301}'],
+        '\u{1E83}' => &['\u{0077}', '\u{0301}'],
+        '\u{1E84}' => &['\u{0057}', '\u{0308}'],
+        '\u{1E85}' => &['\u{0077}', '\u{0308}'],
+        '\u{1E86}' => &['\u{0057}', '\u{0307}'],
+        '\u{1E87}' => &['\u{0077}', '\u{0307}'],
+        '\u{1E88}' => &['\u{0057}', '\u{0323}'],
+        '\u{1E89}' => &['\u{0077}', '\u{0323}'],
+        '\u{1E8A}' => &['\u{0058}', '\u{0307}'],
+        '\u{1E8B}' => &['\u{0078}', '\u{0307}'],
+        '\u{1E8C}' => &['\u{0058}', '\u{0308}'],
+        '\u{1E8D}' => &['\u{0078}', '\u{0308}'],
+        '\u{1E8E}' => &['\u{0059}', '\u{0307}'],
+        '\u{1E8F}' => &['\u{0079}', '\u{0307}'],
+        '\u{1E90}' => &['\u{005A}', '\u{0302}'],
+        '\u{1E91}' => &['\u{007A}', '\u{0302}'],
+        '\u{1E92}' => &['\u{005A}', '\u{0323}'],
+        '\u{1E93}' => &['\u{007A}', '\u{0323}'],
+        '\u{1E94}' => &['\u{005A}', '\u{0331}'],
+        '\u{1E95}' => &['\u{007A}', '\u{0331}'],
+        '\u{1E96}' => &['\u{0068}', '\u{0331}'],
+        '\u{1E97}' => &['\u{0074}', '\u{0308}'],
+        '\u{1E98}' => &['\u{0077}', '\u{030A}'],
+        '\u{1E99}' => &['\u{0079}', '\u{030A}'],
+        '\u{1E9B}' => &['\u{017F}', '\u{0307}'],
+        '\u{1EA0}' => &['\u{0041}', '\u{0323}'],
+        '\u{1EA1}' => &['\u{0061}', '\u{0323}'],
+        '\u{1EA2}' => &['\u{0041}', '\u{0309}'],
+        '\u{1EA3}' => &['\u{0061}', '\u{0309}'],
+        '\u{1EA4}' => &['\u{0041}', '\u{0302}', '\u{0301}'],
+        '\u{1EA5}' => &['\u{0061}', '\u{0302}', '\u{0301}'],
+        '\u{1EA6}' => &['\u{0041}', '\u{0302}', '\u{0300}'],
+        '\u{1EA7}' => &['\u{0061}', '\u{0302}', '\u{0300}'],
+        '\u{1EA8}' => &['\u{0041}', '\u{0302}', '\u{0309}'],
+        '\u{1EA9}' => &['\u{0061}', '\u{0302}', '\u{0309}'],
+        '\u{1EAA}' => &['\u{0041}', '\u{0302}', '\u{0303}'],
+        '\u{1EAB}' => &['\u{0061}', '\u{0302}', '\u{0303}'],
+        '\u{1EAC}' => &['\u{0041}', '\u{0323}', '\u{0302}'],
+        '\u{1EAD}' => &['\u{0061}', '\u{0323}', '\u{0302}'],
+        '\u{1EAE}' => &['\u{0041}', '\u{0306}', '\u{0301}'],
+        '\u{1EAF}' => &['\u{0061}', '\u{0306}', '\u{0301}'],
+        '\u{1EB0}' => &['\u{0041}', '\u{0306}', '\u{0300}'],
+        '\u{1EB1}' => &['\u{0061}', '\u{0306}', '\u{0300}'],
+        '\u{1EB2}' => &['\u{0041}', '\u{0306}', '\u{0309}'],
+        '\u{1EB3}' => &['\u{0061}', '\u{0306}', '\u{0309}'],
+        '\u{1EB4}' => &['\u{0041}', '\u{0306}', '\u{0303}'],
+        '\u{1EB5}' => &['\u{0061}', '\u{0306}', '\u{0303}'],
+        '\u{1EB6}' => &['\u{0041}', '\u{0323}', '\u{0306}'],
+        '\u{1EB7}' => &['\u{0061}', '\u{0323}', '\u{0306}'],
+        '\u{1EB8}' => &['\u{0045}', '\u{0323}'],
+        '\u{1EB9}' => &['\u{0065}', '\u{0323}'],
+        '\u{1EBA}' => &['\u{0045}', '\u{0309}'],
+        '\u{1EBB}' => &['\u{0065}', '\u{0309}'],
+        '\u{1EBC}' => &['\u{0045}', '\u{0303}'],
+        '\u{1EBD}' => &['\u{0065}', '\u{0303}'],
+        '\u{1EBE}' => &['\u{0045}', '\u{0302}', '\u{0301}'],
+        '\u{1EBF}' => &['\u{0065}', '\u{0302}', '\u{0301}'],
+        '\u{1EC0}' => &['\u{0045}', '\u{0302}', '\u{0300}'],
+        '\u{1EC1}' => &['\u{0065}', '\u{0302}', '\u{0300}'],
+        '\u{1EC2}' => &['\u{0045}', '\u{0302}', '\u{0309}'],
+        '\u{1EC3}' => &['\u{0065}', '\u{0302}', '\u{0309}'],
+        '\u{1EC4}' => &['\u{0045}', '\u{0302}', '\u{0303}'],
+        '\u{1EC5}' => &['\u{0065}', '\u{0302}', '\u{0303}'],
+        '\u{1EC6}' => &['\u{0045}', '\u{0323}', '\u{0302}'],
+        '\u{1EC7}' => &['\u{0065}', '\u{0323}', '\u{0302}'],
+        '\u{1EC8}' => &['\u{0049}', '\u{0309}'],
+        '\u{1EC9}' => &['\u{0069}', '\u{0309}'],
+        '\u{1ECA}' => &['\u{0049}', '\u{0323}'],
+        '\u{1ECB}' => &['\u{0069}', '\u{0323}'],
+        '\u{1ECC}' => &['\u{004F}', '\u{0323}'],
+        '\u{1ECD}' => &['\u{006F}', '\u{0323}'],
+        '\u{1ECE}' => &['\u{004F}', '\u{0309}'],
+        '\u{1ECF}' => &['\u{006F}', '\u{0309}'],
+        '\u{1ED0}' => &['\u{004F}', '\u{0302}', '\u{0301}'],
+        '\u{1ED1}' => &['\u{006F}', '\u{0302}', '\u{0301}'],
+        '\u{1ED2}' => &['\u{004F}', '\u{0302}', '\u{0300}'],
+        '\u{1ED3}' => &['\u{006F}', '\u{0302}', '\u{0300}'],
+        '\u{1ED4}' => &['\u{004F}', '\u{0302}', '\u{0309}'],
+        '\u{1ED5}' => &['\u{006F}', '\u{0302}', '\u{0309}'],
+        '\u{1ED6}' => &['\u{004F}', '\u{0302}', '\u{0303}'],
+        '\u{1ED7}' => &['\u{006F}', '\u{0302}', '\u{0303}'],
+        '\u{1ED8}' => &['\u{004F}', '\u{0323}', '\u{0302}'],
+        '\u{1ED9}' => &['\u{006F}', '\u{0323}', '\u{0302}'],
+        '\u{1EDA}' => &['\u{004F}', '\u{031B}', '\u{0301}'],
+        '\u{1EDB}' => &['\u{006F}', '\u{031B}', '\u{0301}'],
+        '\u{1EDC}' => &['\u{004F}', '\u{031B}', '\u{0300}'],
+        '\u{1EDD}' => &['\u{006F}', '\u{031B}', '\u{0300}'],
+        '\u{1EDE}' => &['\u{004F}', '\u{031B}', '\u{0309}'],
+        '\u{1EDF}' => &['\u{006F}', '\u{031B}', '\u{0309}'],
+        '\u{1EE0}' => &['\u{004F}', '\u{031B}', '\u{0303}'],
+        '\u{1EE1}' => &['\u{006F}', '\u{031B}', '\u{0303}'],
+        '\u{1EE2}' => &['\u{004F}', '\u{031B}', '\u{0323}'],
+        '\u{1EE3}' => &['\u{006F}', '\u{031B}', '\u{0323}'],
+        '\u{1EE4}' => &['\u{0055}', '\u{0323}'],
+        '\u{1EE5}' => &['\u{0075}', '\u{0323}'],
+        '\u{1EE6}' => &['\u{0055}', '\u{0309}'],
+        '\u{1EE7}' => &['\u{0075}', '\u{0309}'],
+        '\u{1EE8}' => &['\u{0055}', '\u{031B}', '\u{0301}'],
+        '\u{1EE9}' => &['\u{0075}', '\u{031B}', '\u{0301}'],
+        '\u{1EEA}' => &['\u{0055}', '\u{031B}', '\u{0300}'],
+        '\u{1EEB}' => &['\u{0075}', '\u{031B}', '\u{0300}'],
+        '\u{1EEC}' => &['\u{0055}', '\u{031B}', '\u{0309}'],
+        '\u{1EED}' => &['\u{0075}', '\u{031B}', '\u{0309}'],
+        '\u{1EEE}' => &['\u{0055}', '\u{031B}', '\u{0303}'],
+        '\u{1EEF}' => &['\u{0075}', '\u{031B}', '\u{0303}'],
+        '\u{1EF0}' => &['\u{0055}', '\u{031B}', '\u{0323}'],
+        '\u{1EF1}' => &['\u{0075}', '\u{031B}', '\u{0323}'],
+        '\u{1EF2}' => &['\u{0059}', '\u{0300}'],
+        '\u{1EF3}' => &['\u{0079}', '\u{0300}'],
+        '\u{1EF4}' => &['\u{0059}', '\u{0323}'],
+        '\u{1EF5}' => &['\u{0079}', '\u{0323}'],
+        '\u{1EF6}' => &['\u{0059}', '\u{0309}'],
+        '\u{1EF7}' => &['\u{0079}', '\u{0309}'],
+        '\u{1EF8}' => &['\u{0059}', '\u{0303}'],
+        '\u{1EF9}' => &['\u{0079}', '\u{0303}'],
+        '\u{1F00}' => &['\u{03B1}', '\u{0313}'],
+        '\u{1F01}' => &['\u{03B1}', '\u{0314}'],
+        '\u{1F02}' => &['\u{03B1}', '\u{0313}', '\u{0300}'],
+        '\u{1F03}' => &['\u{03B1}', '\u{0314}', '\u{0300}'],
+        '\u{1F04}' => &['\u{03B1}', '\u{0313}', '\u{0301}'],
+        '\u{1F05}' => &['\u{03B1}', '\u{0314}', '\u{0301}'],
+        '\u{1F06}' => &['\u{03B1}', '\u{0313}', '\u{0342}'],
+        '\u{1F07}' => &['\u{03B1}', '\u{0314}', '\u{0342}'],
+        '\u{1F08}' => &['\u{0391}', '\u{0313}'],
+        '\u{1F09}' => &['\u{0391}', '\u{0314}'],
+        '\u{1F0A}' => &['\u{0391}', '\u{0313}', '\u{0300}'],
+        '\u{1F0B}' => &['\u{0391}', '\u{0314}', '\u{0300}'],
+        '\u{1F0C}' => &['\u{0391}', '\u{0313}', '\u{0301}'],
+        '\u{1F0D}' => &['\u{0391}', '\u{0314}', '\u{0301}'],
+        '\u{1F0E}' => &['\u{0391}', '\u{0313}', '\u{0342}'],
+        '\u{1F0F}' => &['\u{0391}', '\u{0314}', '\u{0342}'],
+        '\u{1F10}' => &['\u{03B5}', '\u{0313}'],
+        '\u{1F11}' => &['\u{03B5}', '\u{0314}'],
+        '\u{1F12}' => &['\u{03B5}', '\u{0313}', '\u{0300}'],
+        '\u{1F13}' => &['\u{03B5}', '\u{0314}', '\u{0300}'],
+        '\u{1F14}' => &['\u{03B5}', '\u{0313}', '\u{0301}'],
+        '\u{1F15}' => &['\u{03B5}', '\u{0314}', '\u{0301}'],
+        '\u{1F18}' => &['\u{0395}', '\u{0313}'],
+        '\u{1F19}' => &['\u{0395}', '\u{0314}'],
+        '\u{1F1A}' => &['\u{0395}', '\u{0313}', '\u{0300}'],
+        '\u{1F1B}' => &['\u{0395}', '\u{0314}', '\u{0300}'],
+        '\u{1F1C}' => &['\u{0395}', '\u{0313}', '\u{0301}'],
+        '\u{1F1D}' => &['\u{0395}', '\u{0314}', '\u{0301}'],
+        '\u{1F20}' => &['\u{03B7}', '\u{0313}'],
+        '\u{1F21}' => &['\u{03B7}', '\u{0314}'],
+        '\u{1F22}' => &['\u{03B7}', '\u{0313}', '\u{0300}'],
+        '\u{1F23}' => &['\u{03B7}', '\u{0314}', '\u{0300}'],
+        '\u{1F24}' => &['\u{03B7}', '\u{0313}', '\u{0301}'],
+        '\u{1F25}' => &['\u{03B7}', '\u{0314}', '\u{0301}'],
+        '\u{1F26}' => &['\u{03B7}', '\u{0313}', '\u{0342}'],
+        '\u{1F27}' => &['\u{03B7}', '\u{0314}', '\u{0342}'],
+        '\u{1F28}' => &['\u{0397}', '\u{0313}'],
+        '\u{1F29}' => &['\u{0397}', '\u{0314}'],
+        '\u{1F2A}' => &['\u{0397}', '\u{0313}', '\u{0300}'],
+        '\u{1F2B}' => &['\u{0397}', '\u{0314}', '\u{0300}'],
+        '\u{1F2C}' => &['\u{0397}', '\u{0313}', '\u{0301}'],
+        '\u{1F2D}' => &['\u{0397}', '\u{0314}', '\u{0301}'],
+        '\u{1F2E}' => &['\u{0397}', '\u{0313}', '\u{0342}'],
+        '\u{1F2F}' => &['\u{0397}', '\u{0314}', '\u{0342}'],
+        '\u{1F30}' => &['\u{03B9}', '\u{0313}'],
+        '\u{1F31}' => &['\u{03B9}', '\u{0314}'],
+        '\u{1F32}' => &['\u{03B9}', '\u{0313}', '\u{0300}'],
+        '\u{1F33}' => &['\u{03B9}', '\u{0314}', '\u{0300}'],
+        '\u{1F34}' => &['\u{03B9}', '\u{0313}', '\u{0301}'],
+        '\u{1F35}' => &['\u{03B9}', '\u{0314}', '\u{0301}'],
+        '\u{1F36}' => &['\u{03B9}', '\u{0313}', '\u{0342}'],
+        '\u{1F37}' => &['\u{03B9}', '\u{0314}', '\u{0342}'],
+        '\u{1F38}' => &['\u{0399}', '\u{0313}'],
+        '\u{1F39}' => &['\u{0399}', '\u{0314}'],
+        '\u{1F3A}' => &['\u{0399}', '\u{0313}', '\u{0300}'],
+        '\u{1F3B}' => &['\u{0399}', '\u{0314}', '\u{0300}'],
+        '\u{1F3C}' => &['\u{0399}', '\u{0313}', '\u{0301}'],
+        '\u{1F3D}' => &['\u{0399}', '\u{0314}', '\u{0301}'],
+        '\u{1F3E}' => &['\u{0399}', '\u{0313}', '\u{0342}'],
+        '\u{1F3F}' => &['\u{0399}', '\u{0314}', '\u{0342}'],
+        '\u{1F40}' => &['\u{03BF}', '\u{0313}'],
+        '\u{1F41}' => &['\u{03BF}', '\u{0314}'],
+        '\u{1F42}' => &['\u{03BF}', '\u{0313}', '\u{0300}'],
+        '\u{1F43}' => &['\u{03BF}', '\u{0314}', '\u{0300}'],
+        '\u{1F44}' => &['\u{03BF}', '\u{0313}', '\u{0301}'],
+        '\u{1F45}' => &['\u{03BF}', '\u{0314}', '\u{0301}'],
+        '\u{1F48}' => &['\u{039F}', '\u{0313}'],
+        '\u{1F49}' => &['\u{039F}', '\u{0314}'],
+        '\u{1F4A}' => &['\u{039F}', '\u{0313}', '\u{0300}'],
+        '\u{1F4B}' => &['\u{039F}', '\u{0314}', '\u{0300}'],
+        '\u{1F4C}' => &['\u{039F}', '\u{0313}', '\u{0301}'],
+        '\u{1F4D}' => &['\u{039F}', '\u{0314}', '\u{0301}'],
+        '\u{1F50}' => &['\u{03C5}', '\u{0313}'],
+        '\u{1F51}' => &['\u{03C5}', '\u{0314}'],
+        '\u{1F52}' => &['\u{03C5}', '\u{0313}', '\u{0300}'],
+        '\u{1F53}' => &['\u{03C5}', '\u{0314}', '\u{0300}'],
+        '\u{1F54}' => &['\u{03C5}', '\u{0313}', '\u{0301}'],
+        '\u{1F55}' => &['\u{03C5}', '\u{0314}', '\u{0301}'],
+        '\u{1F56}' => &['\u{03C5}', '\u{0313}', '\u{0342}'],
+        '\u{1F57}' => &['\u{03C5}', '\u{0314}', '\u{0342}'],
+        '\u{1F59}' => &['\u{03A5}', '\u{0314}'],
+        '\u{1F5B}' => &['\u{03A5}', '\u{0314}', '\u{0300}'],
+        '\u{1F5D}' => &['\u{03A5}', '\u{0314}', '\u{0301}'],
+        '\u{1F5F}' => &['\u{03A5}', '\u{0314}', '\u{0342}'],
+        '\u{1F60}' => &['\u{03C9}', '\u{0313}'],
+        '\u{1F61}' => &['\u{03C9}', '\u{0314}'],
+        '\u{1F62}' => &['\u{03C9}', '\u{0313}', '\u{0300}'],
+        '\u{1F63}' => &['\u{03C9}', '\u{0314}', '\u{0300}'],
+        '\u{1F64}' => &['\u{03C9}', '\u{0313}', '\u{0301}'],
+        '\u{1F65}' => &['\u{03C9}', '\u{0314}', '\u{0301}'],
+        '\u{1F66}' => &['\u{03C9}', '\u{0313}', '\u{0342}'],
+        '\u{1F67}' => &['\u{03C9}', '\u{0314}', '\u{0342}'],
+        '\u{1F68}' => &['\u{03A9}', '\u{0313}'],
+        '\u{1F69}' => &['\u{03A9}', '\u{0314}'],
+        '\u{1F6A}' => &['\u{03A9}', '\u{0313}', '\u{0300}'],
+        '\u{1F6B}' => &['\u{03A9}', '\u{0314}', '\u{0300}'],
+        '\u{1F6C}' => &['\u{03A9}', '\u{0313}', '\u{0301}'],
+        '\u{1F6D}' => &['\u{03A9}', '\u{0314}', '\u{0301}'],
+        '\u{1F6E}' => &['\u{03A9}', '\u{0313}', '\u{0342}'],
+        '\u{1F6F}' => &['\u{03A9}', '\u{0314}', '\u{0342}'],
+        '\u{1F70}' => &['\u{03B1}', '\u{0300}'],
+        '\u{1F71}' => &['\u{03B1}', '\u{0301}'],
+        '\u{1F72}' => &['\u{03B5}', '\u{0300}'],
+        '\u{1F73}' => &['\u{03B5}', '\u{0301}'],
+        '\u{1F74}' => &['\u{03B7}', '\u{0300}'],
+        '\u{1F75}' => &['\u{03B7}', '\u{0301}'],
+        '\u{1F76}' => &['\u{03B9}', '\u{0300}'],
+        '\u{1F77}' => &['\u{03B9}', '\u{0301}'],
+        '\u{1F78}' => &['\u{03BF}', '\u{0300}'],
+        '\u{1F79}' => &['\u{03BF}', '\u{0301}'],
+        '\u{1F7A}' => &['\u{03C5}', '\u{0300}'],
+        '\u{1F7B}' => &['\u{03C5}', '\u{0301}'],
+        '\u{1F7C}' => &['\u{03C9}', '\u{0300}'],
+        '\u{1F7D}' => &['\u{03C9}', '\u{0301}'],
+        '\u{1F80}' => &['\u{03B1}', '\u{0313}', '\u{0345}'],
+        '\u{1F81}' => &['\u{03B1}', '\u{0314}', '\u{0345}'],
+        '\u{1F82}' => &['\u{03B1}', '\u{0313}', '\u{0300}', '\u{0345}'],
+        '\u{1F83}' => &['\u{03B1}', '\u{0314}', '\u{0300}', '\u{0345}'],
+        '\u{1F84}' => &['\u{03B1}', '\u{0313}', '\u{0301}', '\u{0345}'],
+        '\u{1F85}' => &['\u{03B1}', '\u{0314}', '\u{0301}', '\u{0345}'],
+        '\u{1F86}' => &['\u{03B1}', '\u{0313}', '\u{0342}', '\u{0345}'],
+        '\u{1F87}' => &['\u{03B1}', '\u{0314}', '\u{0342}', '\u{0345}'],
+        '\u{1F88}' => &['\u{0391}', '\u{0313}', '\u{0345}'],
+        '\u{1F89}' => &['\u{0391}', '\u{0314}', '\u{0345}'],
+        '\u{1F8A}' => &['\u{0391}', '\u{0313}', '\u{0300}', '\u{0345}'],
+        '\u{1F8B}' => &['\u{0391}', '\u{0314}', '\u{0300}', '\u{0345}'],
+        '\u{1F8C}' => &['\u{0391}', '\u{0313}', '\u{0301}', '\u{0345}'],
+        '\u{1F8D}' => &['\u{0391}', '\u{0314}', '\u{0301}', '\u{0345}'],
+        '\u{1F8E}' => &['\u{0391}', '\u{0313}', '\u{0342}', '\u{0345}'],
+        '\u{1F8F}' => &['\u{0391}', '\u{0314}', '\u{0342}', '\u{0345}'],
+        '\u{1F90}' => &['\u{03B7}', '\u{0313}', '\u{0345}'],
+        '\u{1F91}' => &['\u{03B7}', '\u{0314}', '\u{0345}'],
+        '\u{1F92}' => &['\u{03B7}', '\u{0313}', '\u{0300}', '\u{0345}'],
+        '\u{1F93}' => &['\u{03B7}', '\u{0314}', '\u{0300}', '\u{0345}'],
+        '\u{1F94}' => &['\u{03B7}', '\u{0313}', '\u{0301}', '\u{0345}'],
+        '\u{1F95}' => &['\u{03B7}', '\u{0314}', '\u{0301}', '\u{0345}'],
+        '\u{1F96}' => &['\u{03B7}', '\u{0313}', '\u{0342}', '\u{0345}'],
+        '\u{1F97}' => &['\u{03B7}', '\u{0314}', '\u{0342}', '\u{0345}'],
+        '\u{1F98}' => &['\u{0397}', '\u{0313}', '\u{0345}'],
+        '\u{1F99}' => &['\u{0397}', '\u{0314}', '\u{0345}'],
+        '\u{1F9A}' => &['\u{0397}', '\u{0313}', '\u{0300}', '\u{0345}'],
+        '\u{1F9B}' => &['\u{0397}', '\u{0314}', '\u{0300}', '\u{0345}'],
+        '\u{1F9C}' => &['\u{0397}', '\u{0313}', '\u{0301}', '\u{0345}'],
+        '\u{1F9D}' => &['\u{0397}', '\u{0314}', '\u{0301}', '\u{0345}'],
+        '\u{1F9E}' => &['\u{0397}', '\u{0313}', '\u{0342}', '\u{0345}'],
+        '\u{1F9F}' => &['\u{0397}', '\u{0314}', '\u{0342}', '\u{0345}'],
+        '\u{1FA0}' => &['\u{03C9}', '\u{0313}', '\u{0345}'],
+        '\u{1FA1}' => &['\u{03C9}', '\u{0314}', '\u{0345}'],
+        '\u{1FA2}' => &['\u{03C9}', '\u{0313}', '\u{0300}', '\u{0345}'],
+        '\u{1FA3}' => &['\u{03C9}', '\u{0314}', '\u{0300}', '\u{0345}'],
+        '\u{1FA4}' => &['\u{03C9}', '\u{0313}', '\u{0301}', '\u{0345}'],
+        '\u{1FA5}' => &['\u{03C9}', '\u{0314}', '\u{0301}', '\u{0345}'],
+        '\u{1FA6}' => &['\u{03C9}', '\u{0313}', '\u{0342}', '\u{0345}'],
+        '\u{1FA7}' => &['\u{03C9}', '\u{0314}', '\u{0342}', '\u{0345}'],
+        '\u{1FA8}' => &['\u{03A9}', '\u{0313}', '\u{0345}'],
+        '\u{1FA9}' => &['\u{03A9}', '\u{0314}', '\u{0345}'],
+        '\u{1FAA}' => &['\u{03A9}', '\u{0313}', '\u{0300}', '\u{0345}'],
+        '\u{1FAB}' => &['\u{03A9}', '\u{0314}', '\u{0300}', '\u{0345}'],
+        '\u{1FAC}' => &['\u{03A9}', '\u{0313}', '\u{0301}', '\u{0345}'],
+        '\u{1FAD}' => &['\u{03A9}', '\u{0314}', '\u{0301}', '\u{0345}'],
+        '\u{1FAE}' => &['\u{03A9}', '\u{0313}', '\u{0342}', '\u{0345}'],
+        '\u{1FAF}' => &['\u{03A9}', '\u{0314}', '\u{0342}', '\u{0345}'],
+        '\u{1FB0}' => &['\u{03B1}', '\u{0306}'],
+        '\u{1FB1}' => &['\u{03B1}', '\u{0304}'],
+        '\u{1FB2}' => &['\u{03B1}', '\u{0300}', '\u{0345}'],
+        '\u{1FB3}' => &['\u{03B1}', '\u{0345}'],
+        '\u{1FB4}' => &['\u{03B1}', '\u{0301}', '\u{0345}'],
+        '\u{1FB6}' => &['\u{03B1}', '\u{0342}'],
+        '\u{1FB7}' => &['\u{03B1}', '\u{0342}', '\u{0345}'],
+        '\u{1FB8}' => &['\u{0391}', '\u{0306}'],
+        '\u{1FB9}' => &['\u{0391}', '\u{0304}'],
+        '\u{1FBA}' => &['\u{0391}', '\u{0300}'],
+        '\u{1FBB}' => &['\u{0391}', '\u{0301}'],
+        '\u{1FBC}' => &['\u{0391}', '\u{0345}'],
+        '\u{1FBE}' => &['\u{03B9}'],
+        '\u{1FC1}' => &['\u{00A8}', '\u{0342}'],
+        '\u{1FC2}' => &['\u{03B7}', '\u{0300}', '\u{0345}'],
+        '\u{1FC3}' => &['\u{03B7}', '\u{0345}'],
+        '\u{1FC4}' => &['\u{03B7}', '\u{0301}', '\u{0345}'],
+        '\u{1FC6}' => &['\u{03B7}', '\u{0342}'],
+        '\u{1FC7}' => &['\u{03B7}', '\u{0342}', '\u{0345}'],
+        '\u{1FC8}' => &['\u{0395}', '\u{0300}'],
+        '\u{1FC9}' => &['\u{0395}', '\u{0301}'],
+        '\u{1FCA}' => &['\u{0397}', '\u{0300}'],
+        '\u{1FCB}' => &['\u{0397}', '\u{0301}'],
+        '\u{1FCC}' => &['\u{0397}', '\u{0345}'],
+        '\u{1FCD}' => &['\u{1FBF}', '\u{0300}'],
+        '\u{1FCE}' => &['\u{1FBF}', '\u{0301}'],
+        '\u{1FCF}' => &['\u{1FBF}', '\u{0342}'],
+        '\u{1FD0}' => &['\u{03B9}', '\u{0306}'],
+        '\u{1FD1}' => &['\u{03B9}', '\u{0304}'],
+        '\u{1FD2}' => &['\u{03B9}', '\u{0308}', '\u{0300}'],
+        '\u{1FD3}' => &['\u{03B9}', '\u{0308}', '\u{0301}'],
+        '\u{1FD6}' => &['\u{03B9}', '\u{0342}'],
+        '\u{1FD7}' => &['\u{03B9}', '\u{0308}', '\u{0342}'],
+        '\u{1FD8}' => &['\u{0399}', '\u{0306}'],
+        '\u{1FD9}' => &['\u{0399}', '\u{0304}'],
+        '\u{1FDA}' => &['\u{0399}', '\u{0300}'],
+        '\u{1FDB}' => &['\u{0399}', '\u{0301}'],
+        '\u{1FDD}' => &['\u{1FFE}', '\u{0300}'],
+        '\u{1FDE}' => &['\u{1FFE}', '\u{0301}'],
+        '\u{1FDF}' => &['\u{1FFE}', '\u{0342}'],
+        '\u{1FE0}' => &['\u{03C5}', '\u{0306}'],
+        '\u{1FE1}' => &['\u{03C5}', '\u{0304}'],
+        '\u{1FE2}' => &['\u{03C5}', '\u{0308}', '\u{0300}'],
+        '\u{1FE3}' => &['\u{03C5}', '\u{0308}', '\u{0301}'],
+        '\u{1FE4}' => &['\u{03C1}', '\u{0313}'],
+        '\u{1FE5}' => &['\u{03C1}', '\u{0314}'],
+        '\u{1FE6}' => &['\u{03C5}', '\u{0342}'],
+        '\u{1FE7}' => &['\u{03C5}', '\u{0308}', '\u{0342}'],
+        '\u{1FE8}' => &['\u{03A5}', '\u{0306}'],
+        '\u{1FE9}' => &['\u{03A5}', '\u{0304}'],
+        '\u{1FEA}' => &['\u{03A5}', '\u{0300}'],
+        '\u{1FEB}' => &['\u{03A5}', '\u{0301}'],
+        '\u{1FEC}' => &['\u{03A1}', '\u{0314}'],
+        '\u{1FED}' => &['\u{00A8}', '\u{0300}'],
+        '\u{1FEE}' => &['\u{00A8}', '\u{0301}'],
+        '\u{1FEF}' => &['\u{0060}'],
+        '\u{1FF2}' => &['\u{03C9}', '\u{0300}', '\u{0345}'],
+        '\u{1FF3}' => &['\u{03C9}', '\u{0345}'],
+        '\u{1FF4}' => &['\u{03C9}', '\u{0301}', '\u{0345}'],
+        '\u{1FF6}' => &['\u{03C9}', '\u{0342}'],
+        '\u{1FF7}' => &['\u{03C9}', '\u{0342}', '\u{0345}'],
+        '\u{1FF8}' => &['\u{039F}', '\u{0300}'],
+        '\u{1FF9}' => &['\u{039F}', '\u{0301}'],
+        '\u{1FFA}' => &['\u{03A9}', '\u{0300}'],
+        '\u{1FFB}' => &['\u{03A9}', '\u{0301}'],
+        '\u{1FFC}' => &['\u{03A9}', '\u{0345}'],
+        '\u{1FFD}' => &['\u{00B4}'],
+        '\u{2000}' => &['\u{2002}'],
+        '\u{2001}' => &['\u{2003}'],
+        '\u{2126}' => &['\u{03A9}'],
+        '\u{212A}' => &['\u{004B}'],
+        '\u{212B}' => &['\u{0041}', '\u{030A}'],
+        '\u{219A}' => &['\u{2190}', '\u{0338}'],
+        '\u{219B}' => &['\u{2192}', '\u{0338}'],
+        '\u{21AE}' => &['\u{2194}', '\u{0338}'],
+        '\u{21CD}' => &['\u{21D0}', '\u{0338}'],
+        '\u{21CE}' => &['\u{21D4}', '\u{0338}'],
+        '\u{21CF}' => &['\u{21D2}', '\u{0338}'],
+        '\u{2204}' => &['\u{2203}', '\u{0338}'],
+        '\u{2209}' => &['\u{2208}', '\u{0338}'],
+        '\u{220C}' => &['\u{220B}', '\u{0338}'],
+        '\u{2224}' => &['\u{2223}', '\u{0338}'],
+        '\u{2226}' => &['\u{2225}', '\u{0338}'],
+        '\u{2241}' => &['\u{223C}', '\u{0338}'],
+        '\u{2244}' => &['\u{2243}', '\u{0338}'],
+        '\u{2247}' => &['\u{2245}', '\u{0338}'],
+        '\u{2249}' => &['\u{2248}', '\u{0338}'],
+        '\u{2260}' => &['\u{003D}', '\u{0338}'],
+        '\u{2262}' => &['\u{2261}', '\u{0338}'],
+        '\u{226D}' => &['\u{224D}', '\u{0338}'],
+        '\u{226E}' => &['\u{003C}', '\u{0338}'],
+        '\u{226F}' => &['\u{003E}', '\u{0338}'],
+        '\u{2270}' => &['\u{2264}', '\u{0338}'],
+        '\u{2271}' => &['\u{2265}', '\u{0338}'],
+        '\u{2274}' => &['\u{2272}', '\u{0338}'],
+        '\u{2275}' => &['\u{2273}', '\u{0338}'],
+        '\u{2278}' => &['\u{2276}', '\u{0338}'],
+        '\u{2279}' => &['\u{2277}', '\u{0338}'],
+        '\u{2280}' => &['\u{227A}', '\u{0338}'],
+        '\u{2281}' => &['\u{227B}', '\u{0338}'],
+        '\u{2284}' => &['\u{2282}', '\u{0338}'],
+        '\u{2285}' => &['\u{2283}', '\u{0338}'],
+        '\u{2288}' => &['\u{2286}', '\u{0338}'],
+        '\u{2289}' => &['\u{2287}', '\u{0338}'],
+        '\u{22AC}' => &['\u{22A2}', '\u{0338}'],
+        '\u{22AD}' => &['\u{22A8}', '\u{0338}'],
+        '\u{22AE}' => &['\u{22A9}', '\u{0338}'],
+        '\u{22AF}' => &['\u{22AB}', '\u{0338}'],
+        '\u{22E0}' => &['\u{227C}', '\u{0338}'],
+        '\u{22E1}' => &['\u{227D}', '\u{0338}'],
+        '\u{22E2}' => &['\u{2291}', '\u{0338}'],
+        '\u{22E3}' => &['\u{2292}', '\u{0338}'],
+        '\u{22EA}' => &['\u{22B2}', '\u{0338}'],
+        '\u{22EB}' => &['\u{22B3}', '\u{0338}'],
+        '\u{22EC}' => &['\u{22B4}', '\u{0338}'],
+        '\u{22ED}' => &['\u{22B5}', '\u{0338}'],
+        '\u{2329}' => &['\u{3008}'],
+        '\u{232A}' => &['\u{3009}'],
+        '\u{2ADC}' => &['\u{2ADD}', '\u{0338}'],
+        '\u{304C}' => &['\u{304B}', '\u{3099}'],
+        '\u{304E}' => &['\u{304D}', '\u{3099}'],
+        '\u{3050}' => &['\u{304F}', '\u{3099}'],
+        '\u{3052}' => &['\u{3051}', '\u{3099}'],
+        '\u{3054}' => &['\u{3053}', '\u{3099}'],
+        '\u{3056}' => &['\u{3055}', '\u{3099}'],
+        '\u{3058}' => &['\u{3057}', '\u{3099}'],
+        '\u{305A}' => &['\u{3059}', '\u{3099}'],
+        '\u{305C}' => &['\u{305B}', '\u{3099}'],
+        '\u{305E}' => &['\u{305D}', '\u{3099}'],
+        '\u{3060}' => &['\u{305F}', '\u{3099}'],
+        '\u{3062}' => &['\u{3061}', '\u{3099}'],
+        '\u{3065}' => &['\u{3064}', '\u{3099}'],
+        '\u{3067}' => &['\u{3066}', '\u{3099}'],
+        '\u{3069}' => &['\u{3068}', '\u{3099}'],
+        '\u{3070}' => &['\u{306F}', '\u{3099}'],
+        '\u{3071}' => &['\u{306F}', '\u{309A}'],
+        '\u{3073}' => &['\u{3072}', '\u{3099}'],
+        '\u{3074}' => &['\u{3072}', '\u{309A}'],
+        '\u{3076}' => &['\u{3075}', '\u{3099}'],
+        '\u{3077}' => &['\u{3075}', '\u{309A}'],
+        '\u{3079}' => &['\u{3078}', '\u{3099}'],
+        '\u{307A}' => &['\u{3078}', '\u{309A}'],
+        '\u{307C}' => &['\u{307B}', '\u{3099}'],
+        '\u{307D}' => &['\u{307B}', '\u{309A}'],
+        '\u{3094}' => &['\u{3046}', '\u{3099}'],
+        '\u{309E}' => &['\u{309D}', '\u{3099}'],
+        '\u{30AC}' => &['\u{30AB}', '\u{3099}'],
+        '\u{30AE}' => &['\u{30AD}', '\u{3099}'],
+        '\u{30B0}' => &['\u{30AF}', '\u{3099}'],
+        '\u{30B2}' => &['\u{30B1}', '\u{3099}'],
+        '\u{30B4}' => &['\u{30B3}', '\u{3099}'],
+        '\u{30B6}' => &['\u{30B5}', '\u{3099}'],
+        '\u{30B8}' => &['\u{30B7}', '\u{3099}'],
+        '\u{30BA}' => &['\u{30B9}', '\u{3099}'],
+        '\u{30BC}' => &['\u{30BB}', '\u{3099}'],
+        '\u{30BE}' => &['\u{30BD}', '\u{3099}'],
+        '\u{30C0}' => &['\u{30BF}', '\u{3099}'],
+        '\u{30C2}' => &['\u{30C1}', '\u{3099}'],
+        '\u{30C5}' => &['\u{30C4}', '\u{3099}'],
+        '\u{30C7}' => &['\u{30C6}', '\u{3099}'],
+        '\u{30C9}' => &['\u{30C8}', '\u{3099}'],
+        '\u{30D0}' => &['\u{30CF}', '\u{3099}'],
+        '\u{30D1}' => &['\u{30CF}', '\u{309A}'],
+        '\u{30D3}' => &['\u{30D2}', '\u{3099}'],
+        '\u{30D4}' => &['\u{30D2}', '\u{309A}'],
+        '\u{30D6}' => &['\u{30D5}', '\u{3099}'],
+        '\u{30D7}' => &['\u{30D5}', '\u{309A}'],
+        '\u{30D9}' => &['\u{30D8}', '\u{3099}'],
+        '\u{30DA}' => &['\u{30D8}', '\u{309A}'],
+        '\u{30DC}' => &['\u{30DB}', '\u{3099}'],
+        '\u{30DD}' => &['\u{30DB}', '\u{309A}'],
+        '\u{30F4}' => &['\u{30A6}', '\u{3099}'],
+        '\u{30F7}' => &['\u{30EF}', '\u{3099}'],
+        '\u{30F8}' => &['\u{30F0}', '\u{3099}'],
+        '\u{30F9}' => &['\u{30F1}', '\u{3099}'],
+        '\u{30FA}' => &['\u{30F2}', '\u{3099}'],
+        '\u{30FE}' => &['\u{30FD}', '\u{3099}'],
+        '\u{F900}' => &['\u{8C48}'],
+        '\u{F901}' => &['\u{66F4}'],
+        '\u{F902}' => &['\u{8ECA}'],
+        '\u{F903}' => &['\u{8CC8}'],
+        '\u{F904}' => &['\u{6ED1}'],
+        '\u{F905}' => &['\u{4E32}'],
+        '\u{F906}' => &['\u{53E5}'],
+        '\u{F907}' => &['\u{9F9C}'],
+        '\u{F908}' => &['\u{9F9C}'],
+        '\u{F909}' => &['\u{5951}'],
+        '\u{F90A}' => &['\u{91D1}'],
+        '\u{F90B}' => &['\u{5587}'],
+        '\u{F90C}' => &['\u{5948}'],
+        '\u{F90D}' => &['\u{61F6}'],
+        '\u{F90E}' => &['\u{7669}'],
+        '\u{F90F}' => &['\u{7F85}'],
+        '\u{F910}' => &['\u{863F}'],
+        '\u{F911}' => &['\u{87BA}'],
+        '\u{F912}' => &['\u{88F8}'],
+        '\u{F913}' => &['\u{908F}'],
+        '\u{F914}' => &['\u{6A02}'],
+        '\u{F915}' => &['\u{6D1B}'],
+        '\u{F916}' => &['\u{70D9}'],
+        '\u{F917}' => &['\u{73DE}'],
+        '\u{F918}' => &['\u{843D}'],
+        '\u{F919}' => &['\u{916A}'],
+        '\u{F91A}' => &['\u{99F1}'],
+        '\u{F91B}' => &['\u{4E82}'],
+        '\u{F91C}' => &['\u{5375}'],
+        '\u{F91D}' => &['\u{6B04}'],
+        '\u{F91E}' => &['\u{721B}'],
+        '\u{F91F}' => &['\u{862D}'],
+        '\u{F920}' => &['\u{9E1E}'],
+        '\u{F921}' => &['\u{5D50}'],
+        '\u{F922}' => &['\u{6FEB}'],
+        '\u{F923}' => &['\u{85CD}'],
+        '\u{F924}' => &['\u{8964}'],
+        '\u{F925}' => &['\u{62C9}'],
+        '\u{F926}' => &['\u{81D8}'],
+        '\u{F927}' => &['\u{881F}'],
+        '\u{F928}' => &['\u{5ECA}'],
+        '\u{F929}' => &['\u{6717}'],
+        '\u{F92A}' => &['\u{6D6A}'],
+        '\u{F92B}' => &['\u{72FC}'],
+        '\u{F92C}' => &['\u{90CE}'],
+        '\u{F92D}' => &['\u{4F86}'],
+        '\u{F92E}' => &['\u{51B7}'],
+        '\u{F92F}' => &['\u{52DE}'],
+        '\u{F930}' => &['\u{64C4}'],
+        '\u{F931}' => &['\u{6AD3}'],
+        '\u{F932}' => &['\u{7210}'],
+        '\u{F933}' => &['\u{76E7}'],
+        '\u{F934}' => &['\u{8001}'],
+        '\u{F935}' => &['\u{8606}'],
+        '\u{F936}' => &['\u{865C}'],
+        '\u{F937}' => &['\u{8DEF}'],
+        '\u{F938}' => &['\u{9732}'],
+        '\u{F939}' => &['\u{9B6F}'],
+        '\u{F93A}' => &['\u{9DFA}'],
+        '\u{F93B}' => &['\u{788C}'],
+        '\u{F93C}' => &['\u{797F}'],
+        '\u{F93D}' => &['\u{7DA0}'],
+        '\u{F93E}' => &['\u{83C9}'],
+        '\u{F93F}' => &['\u{9304}'],
+        '\u{F940}' => &['\u{9E7F}'],
+        '\u{F941}' => &['\u{8AD6}'],
+        '\u{F942}' => &['\u{58DF}'],
+        '\u{F943}' => &['\u{5F04}'],
+        '\u{F944}' => &['\u{7C60}'],
+        '\u{F945}' => &['\u{807E}'],
+        '\u{F946}' => &['\u{7262}'],
+        '\u{F947}' => &['\u{78CA}'],
+        '\u{F948}' => &['\u{8CC2}'],
+        '\u{F949}' => &['\u{96F7}'],
+        '\u{F94A}' => &['\u{58D8}'],
+        '\u{F94B}' => &['\u{5C62}'],
+        '\u{F94C}' => &['\u{6A13}'],
+        '\u{F94D}' => &['\u{6DDA}'],
+        '\u{F94E}' => &['\u{6F0F}'],
+        '\u{F94F}' => &['\u{7D2F}'],
+        '\u{F950}' => &['\u{7E37}'],
+        '\u{F951}' => &['\u{964B}'],
+        '\u{F952}' => &['\u{52D2}'],
+        '\u{F953}' => &['\u{808B}'],
+        '\u{F954}' => &['\u{51DC}'],
+        '\u{F955}' => &['\u{51CC}'],
+        '\u{F956}' => &['\u{7A1C}'],
+        '\u{F957}' => &['\u{7DBE}'],
+        '\u{F958}' => &['\u{83F1}'],
+        '\u{F959}' => &['\u{9675}'],
+        '\u{F95A}' => &['\u{8B80}'],
+        '\u{F95B}' => &['\u{62CF}'],
+        '\u{F95C}' => &['\u{6A02}'],
+        '\u{F95D}' => &['\u{8AFE}'],
+        '\u{F95E}' => &['\u{4E39}'],
+        '\u{F95F}' => &['\u{5BE7}'],
+        '\u{F960}' => &['\u{6012}'],
+        '\u{F961}' => &['\u{7387}'],
+        '\u{F962}' => &['\u{7570}'],
+        '\u{F963}' => &['\u{5317}'],
+        '\u{F964}' => &['\u{78FB}'],
+        '\u{F965}' => &['\u{4FBF}'],
+        '\u{F966}' => &['\u{5FA9}'],
+        '\u{F967}' => &['\u{4E0D}'],
+        '\u{F968}' => &['\u{6CCC}'],
+        '\u{F969}' => &['\u{6578}'],
+        '\u{F96A}' => &['\u{7D22}'],
+        '\u{F96B}' => &['\u{53C3}'],
+        '\u{F96C}' => &['\u{585E}'],
+        '\u{F96D}' => &['\u{7701}'],
+        '\u{F96E}' => &['\u{8449}'],
+        '\u{F96F}' => &['\u{8AAA}'],
+        '\u{F970}' => &['\u{6BBA}'],
+        '\u{F971}' => &['\u{8FB0}'],
+        '\u{F972}' => &['\u{6C88}'],
+        '\u{F973}' => &['\u{62FE}'],
+        '\u{F974}' => &['\u{82E5}'],
+        '\u{F975}' => &['\u{63A0}'],
+        '\u{F976}' => &['\u{7565}'],
+        '\u{F977}' => &['\u{4EAE}'],
+        '\u{F978}' => &['\u{5169}'],
+        '\u{F979}' => &['\u{51C9}'],
+        '\u{F97A}' => &['\u{6881}'],
+        '\u{F97B}' => &['\u{7CE7}'],
+        '\u{F97C}' => &['\u{826F}'],
+        '\u{F97D}' => &['\u{8AD2}'],
+        '\u{F97E}' => &['\u{91CF}'],
+        '\u{F97F}' => &['\u{52F5}'],
+        '\u{F980}' => &['\u{5442}'],
+        '\u{F981}' => &['\u{5973}'],
+        '\u{F982}' => &['\u{5EEC}'],
+        '\u{F983}' => &['\u{65C5}'],
+        '\u{F984}' => &['\u{6FFE}'],
+        '\u{F985}' => &['\u{792A}'],
+        '\u{F986}' => &['\u{95AD}'],
+        '\u{F987}' => &['\u{9A6A}'],
+        '\u{F988}' => &['\u{9E97}'],
+        '\u{F989}' => &['\u{9ECE}'],
+        '\u{F98A}' => &['\u{529B}'],
+        '\u{F98B}' => &['\u{66C6}'],
+        '\u{F98C}' => &['\u{6B77}'],
+        '\u{F98D}' => &['\u{8F62}'],
+        '\u{F98E}' => &['\u{5E74}'],
+        '\u{F98F}' => &['\u{6190}'],
+        '\u{F990}' => &['\u{6200}'],
+        '\u{F991}' => &['\u{649A}'],
+        '\u{F992}' => &['\u{6F23}'],
+        '\u{F993}' => &['\u{7149}'],
+        '\u{F994}' => &['\u{7489}'],
+        '\u{F995}' => &['\u{79CA}'],
+        '\u{F996}' => &['\u{7DF4}'],
+        '\u{F997}' => &['\u{806F}'],
+        '\u{F998}' => &['\u{8F26}'],
+        '\u{F999}' => &['\u{84EE}'],
+        '\u{F99A}' => &['\u{9023}'],
+        '\u{F99B}' => &['\u{934A}'],
+        '\u{F99C}' => &['\u{5217}'],
+        '\u{F99D}' => &['\u{52A3}'],
+        '\u{F99E}' => &['\u{54BD}'],
+        '\u{F99F}' => &['\u{70C8}'],
+        '\u{F9A0}' => &['\u{88C2}'],
+        '\u{F9A1}' => &['\u{8AAA}'],
+        '\u{F9A2}' => &['\u{5EC9}'],
+        '\u{F9A3}' => &['\u{5FF5}'],
+        '\u{F9A4}' => &['\u{637B}'],
+        '\u{F9A5}' => &['\u{6BAE}'],
+        '\u{F9A6}' => &['\u{7C3E}'],
+        '\u{F9A7}' => &['\u{7375}'],
+        '\u{F9A8}' => &['\u{4EE4}'],
+        '\u{F9A9}' => &['\u{56F9}'],
+        '\u{F9AA}' => &['\u{5BE7}'],
+        '\u{F9AB}' => &['\u{5DBA}'],
+        '\u{F9AC}' => &['\u{601C}'],
+        '\u{F9AD}' => &['\u{73B2}'],
+        '\u{F9AE}' => &['\u{7469}'],
+        '\u{F9AF}' => &['\u{7F9A}'],
+        '\u{F9B0}' => &['\u{8046}'],
+        '\u{F9B1}' => &['\u{9234}'],
+        '\u{F9B2}' => &['\u{96F6}'],
+        '\u{F9B3}' => &['\u{9748}'],
+        '\u{F9B4}' => &['\u{9818}'],
+        '\u{F9B5}' => &['\u{4F8B}'],
+        '\u{F9B6}' => &['\u{79AE}'],
+        '\u{F9B7}' => &['\u{91B4}'],
+        '\u{F9B8}' => &['\u{96B8}'],
+        '\u{F9B9}' => &['\u{60E1}'],
+        '\u{F9BA}' => &['\u{4E86}'],
+        '\u{F9BB}' => &['\u{50DA}'],
+        '\u{F9BC}' => &['\u{5BEE}'],
+        '\u{F9BD}' => &['\u{5C3F}'],
+        '\u{F9BE}' => &['\u{6599}'],
+        '\u{F9BF}' => &['\u{6A02}'],
+        '\u{F9C0}' => &['\u{71CE}'],
+        '\u{F9C1}' => &['\u{7642}'],
+        '\u{F9C2}' => &['\u{84FC}'],
+        '\u{F9C3}' => &['\u{907C}'],
+        '\u{F9C4}' => &['\u{9F8D}'],
+        '\u{F9C5}' => &['\u{6688}'],
+        '\u{F9C6}' => &['\u{962E}'],
+        '\u{F9C7}' => &['\u{5289}'],
+        '\u{F9C8}' => &['\u{677B}'],
+        '\u{F9C9}' => &['\u{67F3}'],
+        '\u{F9CA}' => &['\u{6D41}'],
+        '\u{F9CB}' => &['\u{6E9C}'],
+        '\u{F9CC}' => &['\u{7409}'],
+        '\u{F9CD}' => &['\u{7559}'],
+        '\u{F9CE}' => &['\u{786B}'],
+        '\u{F9CF}' => &['\u{7D10}'],
+        '\u{F9D0}' => &['\u{985E}'],
+        '\u{F9D1}' => &['\u{516D}'],
+        '\u{F9D2}' => &['\u{622E}'],
+        '\u{F9D3}' => &['\u{9678}'],
+        '\u{F9D4}' => &['\u{502B}'],
+        '\u{F9D5}' => &['\u{5D19}'],
+        '\u{F9D6}' => &['\u{6DEA}'],
+        '\u{F9D7}' => &['\u{8F2A}'],
+        '\u{F9D8}' => &['\u{5F8B}'],
+        '\u{F9D9}' => &['\u{6144}'],
+        '\u{F9DA}' => &['\u{6817}'],
+        '\u{F9DB}' => &['\u{7387}'],
+        '\u{F9DC}' => &['\u{9686}'],
+        '\u{F9DD}' => &['\u{5229}'],
+        '\u{F9DE}' => &['\u{540F}'],
+        '\u{F9DF}' => &['\u{5C65}'],
+        '\u{F9E0}' => &['\u{6613}'],
+        '\u{F9E1}' => &['\u{674E}'],
+        '\u{F9E2}' => &['\u{68A8}'],
+        '\u{F9E3}' => &['\u{6CE5}'],
+        '\u{F9E4}' => &['\u{7406}'],
+        '\u{F9E5}' => &['\u{75E2}'],
+        '\u{F9E6}' => &['\u{7F79}'],
+        '\u{F9E7}' => &['\u{88CF}'],
+        '\u{F9E8}' => &['\u{88E1}'],
+        '\u{F9E9}' => &['\u{91CC}'],
+        '\u{F9EA}' => &['\u{96E2}'],
+        '\u{F9EB}' => &['\u{533F}'],
+        '\u{F9EC}' => &['\u{6EBA}'],
+        '\u{F9ED}' => &['\u{541D}'],
+        '\u{F9EE}' => &['\u{71D0}'],
+        '\u{F9EF}' => &['\u{7498}'],
+        '\u{F9F0}' => &['\u{85FA}'],
+        '\u{F9F1}' => &['\u{96A3}'],
+        '\u{F9F2}' => &['\u{9C57}'],
+        '\u{F9F3}' => &['\u{9E9F}'],
+        '\u{F9F4}' => &['\u{6797}'],
+        '\u{F9F5}' => &['\u{6DCB}'],
+        '\u{F9F6}' => &['\u{81E8}'],
+        '\u{F9F7}' => &['\u{7ACB}'],
+        '\u{F9F8}' => &['\u{7B20}'],
+        '\u{F9F9}' => &['\u{7C92}'],
+        '\u{F9FA}' => &['\u{72C0}'],
+        '\u{F9FB}' => &['\u{7099}'],
+        '\u{F9FC}' => &['\u{8B58}'],
+        '\u{F9FD}' => &['\u{4EC0}'],
+        '\u{F9FE}' => &['\u{8336}'],
+        '\u{F9FF}' => &['\u{523A}'],
+        '\u{FA00}' => &['\u{5207}'],
+        '\u{FA01}' => &['\u{5EA6}'],
+        '\u{FA02}' => &['\u{62D3}'],
+        '\u{FA03}' => &['\u{7CD6}'],
+        '\u{FA04}' => &['\u{5B85}'],
+        '\u{FA05}' => &['\u{6D1E}'],
+        '\u{FA06}' => &['\u{66B4}'],
+        '\u{FA07}' => &['\u{8F3B}'],
+        '\u{FA08}' => &['\u{884C}'],
+        '\u{FA09}' => &['\u{964D}'],
+        '\u{FA0A}' => &['\u{898B}'],
+        '\u{FA0B}' => &['\u{5ED3}'],
+        '\u{FA0C}' => &['\u{5140}'],
+        '\u{FA0D}' => &['\u{55C0}'],
+        '\u{FA10}' => &['\u{585A}'],
+        '\u{FA12}' => &['\u{6674}'],
+        '\u{FA15}' => &['\u{51DE}'],
+        '\u{FA16}' => &['\u{732A}'],
+        '\u{FA17}' => &['\u{76CA}'],
+        '\u{FA18}' => &['\u{793C}'],
+        '\u{FA19}' => &['\u{795E}'],
+        '\u{FA1A}' => &['\u{7965}'],
+        '\u{FA1B}' => &['\u{798F}'],
+        '\u{FA1C}' => &['\u{9756}'],
+        '\u{FA1D}' => &['\u{7CBE}'],
+        '\u{FA1E}' => &['\u{7FBD}'],
+        '\u{FA20}' => &['\u{8612}'],
+        '\u{FA22}' => &['\u{8AF8}'],
+        '\u{FA25}' => &['\u{9038}'],
+        '\u{FA26}' => &['\u{90FD}'],
+        '\u{FA2A}' => &['\u{98EF}'],
+        '\u{FA2B}' => &['\u{98FC}'],
+        '\u{FA2C}' => &['\u{9928}'],
+        '\u{FA2D}' => &['\u{9DB4}'],
+        '\u{FA2E}' => &['\u{90DE}'],
+        '\u{FA2F}' => &['\u{96B7}'],
+        '\u{FA30}' => &['\u{4FAE}'],
+        '\u{FA31}' => &['\u{50E7}'],
+        '\u{FA32}' => &['\u{514D}'],
+        '\u{FA33}' => &['\u{52C9}'],
+        '\u{FA34}' => &['\u{52E4}'],
+        '\u{FA35}' => &['\u{5351}'],
+        '\u{FA36}' => &['\u{559D}'],
+        '\u{FA37}' => &['\u{5606}'],
+        '\u{FA38}' => &['\u{5668}'],
+        '\u{FA39}' => &['\u{5840}'],
+        '\u{FA3A}' => &['\u{58A8}'],
+        '\u{FA3B}' => &['\u{5C64}'],
+        '\u{FA3C}' => &['\u{5C6E}'],
+        '\u{FA3D}' => &['\u{6094}'],
+        '\u{FA3E}' => &['\u{6168}'],
+        '\u{FA3F}' => &['\u{618E}'],
+        '\u{FA40}' => &['\u{61F2}'],
+        '\u{FA41}' => &['\u{654F}'],
+        '\u{FA42}' => &['\u{65E2}'],
+        '\u{FA43}' => &['\u{6691}'],
+        '\u{FA44}' => &['\u{6885}'],
+        '\u{FA45}' => &['\u{6D77}'],
+        '\u{FA46}' => &['\u{6E1A}'],
+        '\u{FA47}' => &['\u{6F22}'],
+        '\u{FA48}' => &['\u{716E}'],
+        '\u{FA49}' => &['\u{722B}'],
+        '\u{FA4A}' => &['\u{7422}'],
+        '\u{FA4B}' => &['\u{7891}'],
+        '\u{FA4C}' => &['\u{793E}'],
+        '\u{FA4D}' => &['\u{7949}'],
+        '\u{FA4E}' => &['\u{7948}'],
+        '\u{FA4F}' => &['\u{7950}'],
+        '\u{FA50}' => &['\u{7956}'],
+        '\u{FA51}' => &['\u{795D}'],
+        '\u{FA52}' => &['\u{798D}'],
+        '\u{FA53}' => &['\u{798E}'],
+        '\u{FA54}' => &['\u{7A40}'],
+        '\u{FA55}' => &['\u{7A81}'],
+        '\u{FA56}' => &['\u{7BC0}'],
+        '\u{FA57}' => &['\u{7DF4}'],
+        '\u{FA58}' => &['\u{7E09}'],
+        '\u{FA59}' => &['\u{7E41}'],
+        '\u{FA5A}' => &['\u{7F72}'],
+        '\u{FA5B}' => &['\u{8005}'],
+        '\u{FA5C}' => &['\u{81ED}'],
+        '\u{FA5D}' => &['\u{8279}'],
+        '\u{FA5E}' => &['\u{8279}'],
+        '\u{FA5F}' => &['\u{8457}'],
+        '\u{FA60}' => &['\u{8910}'],
+        '\u{FA61}' => &['\u{8996}'],
+        '\u{FA62}' => &['\u{8B01}'],
+        '\u{FA63}' => &['\u{8B39}'],
+        '\u{FA64}' => &['\u{8CD3}'],
+        '\u{FA65}' => &['\u{8D08}'],
+        '\u{FA66}' => &['\u{8FB6}'],
+        '\u{FA67}' => &['\u{9038}'],
+        '\u{FA68}' => &['\u{96E3}'],
+        '\u{FA69}' => &['\u{97FF}'],
+        '\u{FA6A}' => &['\u{983B}'],
+        '\u{FA6B}' => &['\u{6075}'],
+        '\u{FA6C}' => &['\u{242EE}'],
+        '\u{FA6D}' => &['\u{8218}'],
+        '\u{FA70}' => &['\u{4E26}'],
+        '\u{FA71}' => &['\u{51B5}'],
+        '\u{FA72}' => &['\u{5168}'],
+        '\u{FA73}' => &['\u{4F80}'],
+        '\u{FA74}' => &['\u{5145}'],
+        '\u{FA75}' => &['\u{5180}'],
+        '\u{FA76}' => &['\u{52C7}'],
+        '\u{FA77}' => &['\u{52FA}'],
+        '\u{FA78}' => &['\u{559D}'],
+        '\u{FA79}' => &['\u{5555}'],
+        '\u{FA7A}' => &['\u{5599}'],
+        '\u{FA7B}' => &['\u{55E2}'],
+        '\u{FA7C}' => &['\u{585A}'],
+        '\u{FA7D}' => &['\u{58B3}'],
+        '\u{FA7E}' => &['\u{5944}'],
+        '\u{FA7F}' => &['\u{5954}'],
+        '\u{FA80}' => &['\u{5A62}'],
+        '\u{FA81}' => &['\u{5B28}'],
+        '\u{FA82}' => &['\u{5ED2}'],
+        '\u{FA83}' => &['\u{5ED9}'],
+        '\u{FA84}' => &['\u{5F69}'],
+        '\u{FA85}' => &['\u{5FAD}'],
+        '\u{FA86}' => &['\u{60D8}'],
+        '\u{FA87}' => &['\u{614E}'],
+        '\u{FA88}' => &['\u{6108}'],
+        '\u{FA89}' => &['\u{618E}'],
+        '\u{FA8A}' => &['\u{6160}'],
+        '\u{FA8B}' => &['\u{61F2}'],
+        '\u{FA8C}' => &['\u{6234}'],
+        '\u{FA8D}' => &['\u{63C4}'],
+        '\u{FA8E}' => &['\u{641C}'],
+        '\u{FA8F}' => &['\u{6452}'],
+        '\u{FA90}' => &['\u{6556}'],
+        '\u{FA91}' => &['\u{6674}'],
+        '\u{FA92}' => &['\u{6717}'],
+        '\u{FA93}' => &['\u{671B}'],
+        '\u{FA94}' => &['\u{6756}'],
+        '\u{FA95}' => &['\u{6B79}'],
+        '\u{FA96}' => &['\u{6BBA}'],
+        '\u{FA97}' => &['\u{6D41}'],
+        '\u{FA98}' => &['\u{6EDB}'],
+        '\u{FA99}' => &['\u{6ECB}'],
+        '\u{FA9A}' => &['\u{6F22}'],
+        '\u{FA9B}' => &['\u{701E}'],
+        '\u{FA9C}' => &['\u{716E}'],
+        '\u{FA9D}' => &['\u{77A7}'],
+        '\u{FA9E}' => &['\u{7235}'],
+        '\u{FA9F}' => &['\u{72AF}'],
+        '\u{FAA0}' => &['\u{732A}'],
+        '\u{FAA1}' => &['\u{7471}'],
+        '\u{FAA2}' => &['\u{7506}'],
+        '\u{FAA3}' => &['\u{753B}'],
+        '\u{FAA4}' => &['\u{761D}'],
+        '\u{FAA5}' => &['\u{761F}'],
+        '\u{FAA6}' => &['\u{76CA}'],
+        '\u{FAA7}' => &['\u{76DB}'],
+        '\u{FAA8}' => &['\u{76F4}'],
+        '\u{FAA9}' => &['\u{774A}'],
+        '\u{FAAA}' => &['\u{7740}'],
+        '\u{FAAB}' => &['\u{78CC}'],
+        '\u{FAAC}' => &['\u{7AB1}'],
+        '\u{FAAD}' => &['\u{7BC0}'],
+        '\u{FAAE}' => &['\u{7C7B}'],
+        '\u{FAAF}' => &['\u{7D5B}'],
+        '\u{FAB0}' => &['\u{7DF4}'],
+        '\u{FAB1}' => &['\u{7F3E}'],
+        '\u{FAB2}' => &['\u{8005}'],
+        '\u{FAB3}' => &['\u{8352}'],
+        '\u{FAB4}' => &['\u{83EF}'],
+        '\u{FAB5}' => &['\u{8779}'],
+        '\u{FAB6}' => &['\u{8941}'],
+        '\u{FAB7}' => &['\u{8986}'],
+        '\u{FAB8}' => &['\u{8996}'],
+        '\u{FAB9}' => &['\u{8ABF}'],
+        '\u{FABA}' => &['\u{8AF8}'],
+        '\u{FABB}' => &['\u{8ACB}'],
+        '\u{FABC}' => &['\u{8B01}'],
+        '\u{FABD}' => &['\u{8AFE}'],
+        '\u{FABE}' => &['\u{8AED}'],
+        '\u{FABF}' => &['\u{8B39}'],
+        '\u{FAC0}' => &['\u{8B8A}'],
+        '\u{FAC1}' => &['\u{8D08}'],
+        '\u{FAC2}' => &['\u{8F38}'],
+        '\u{FAC3}' => &['\u{9072}'],
+        '\u{FAC4}' => &['\u{9199}'],
+        '\u{FAC5}' => &['\u{9276}'],
+        '\u{FAC6}' => &['\u{967C}'],
+        '\u{FAC7}' => &['\u{96E3}'],
+        '\u{FAC8}' => &['\u{9756}'],
+        '\u{FAC9}' => &['\u{97DB}'],
+        '\u{FACA}' => &['\u{97FF}'],
+        '\u{FACB}' => &['\u{980B}'],
+        '\u{FACC}' => &['\u{983B}'],
+        '\u{FACD}' => &['\u{9B12}'],
+        '\u{FACE}' => &['\u{9F9C}'],
+        '\u{FACF}' => &['\u{2284A}'],
+        '\u{FAD0}' => &['\u{22844}'],
+        '\u{FAD1}' => &['\u{233D5}'],
+        '\u{FAD2}' => &['\u{3B9D}'],
+        '\u{FAD3}' => &['\u{4018}'],
+        '\u{FAD4}' => &['\u{4039}'],
+        '\u{FAD5}' => &['\u{25249}'],
+        '\u{FAD6}' => &['\u{25CD0}'],
+        '\u{FAD7}' => &['\u{27ED3}'],
+        '\u{FAD8}' => &['\u{9F43}'],
+        '\u{FAD9}' => &['\u{9F8E}'],
+        '\u{FB1D}' => &['\u{05D9}', '\u{05B4}'],
+        '\u{FB1F}' => &['\u{05F2}', '\u{05B7}'],
+        '\u{FB2A}' => &['\u{05E9}', '\u{05C1}'],
+        '\u{FB2B}' => &['\u{05E9}', '\u{05C2}'],
+        '\u{FB2C}' => &['\u{05E9}', '\u{05BC}', '\u{05C1}'],
+        '\u{FB2D}' => &['\u{05E9}', '\u{05BC}', '\u{05C2}'],
+        '\u{FB2E}' => &['\u{05D0}', '\u{05B7}'],
+        '\u{FB2F}' => &['\u{05D0}', '\u{05B8}'],
+        '\u{FB30}' => &['\u{05D0}', '\u{05BC}'],
+        '\u{FB31}' => &['\u{05D1}', '\u{05BC}'],
+        '\u{FB32}' => &['\u{05D2}', '\u{05BC}'],
+        '\u{FB33}' => &['\u{05D3}', '\u{05BC}'],
+        '\u{FB34}' => &['\u{05D4}', '\u{05BC}'],
+        '\u{FB35}' => &['\u{05D5}', '\u{05BC}'],
+        '\u{FB36}' => &['\u{05D6}', '\u{05BC}'],
+        '\u{FB38}' => &['\u{05D8}', '\u{05BC}'],
+        '\u{FB39}' => &['\u{05D9}', '\u{05BC}'],
+        '\u{FB3A}' => &['\u{05DA}', '\u{05BC}'],
+        '\u{FB3B}' => &['\u{05DB}', '\u{05BC}'],
+        '\u{FB3C}' => &['\u{05DC}', '\u{05BC}'],
+        '\u{FB3E}' => &['\u{05DE}', '\u{05BC}'],
+        '\u{FB40}' => &['\u{05E0}', '\u{05BC}'],
+        '\u{FB41}' => &['\u{05E1}', '\u{05BC}'],
+        '\u{FB43}' => &['\u{05E3}', '\u{05BC}'],
+        '\u{FB44}' => &['\u{05E4}', '\u{05BC}'],
+        '\u{FB46}' => &['\u{05E6}', '\u{05BC}'],
+        '\u{FB47}' => &['\u{05E7}', '\u{05BC}'],
+        '\u{FB48}' => &['\u{05E8}', '\u{05BC}'],
+        '\u{FB49}' => &['\u{05E9}', '\u{05BC}'],
+        '\u{FB4A}' => &['\u{05EA}', '\u{05BC}'],
+        '\u{FB4B}' => &['\u{05D5}', '\u{05B9}'],
+        '\u{FB4C}' => &['\u{05D1}', '\u{05BF}'],
+        '\u{FB4D}' => &['\u{05DB}', '\u{05BF}'],
+        '\u{FB4E}' => &['\u{05E4}', '\u{05BF}'],
+        '\u{1109A}' => &['\u{11099}', '\u{110BA}'],
+        '\u{1109C}' => &['\u{1109B}', '\u{110BA}'],
+        '\u{110AB}' => &['\u{110A5}', '\u{110BA}'],
+        '\u{1112E}' => &['\u{11131}', '\u{11127}'],
+        '\u{1112F}' => &['\u{11132}', '\u{11127}'],
+        '\u{1134B}' => &['\u{11347}', '\u{1133E}'],
+        '\u{1134C}' => &['\u{11347}', '\u{11357}'],
+        '\u{114BB}' => &['\u{114B9}', '\u{114BA}'],
+        '\u{114BC}' => &['\u{114B9}', '\u{114B0}'],
+        '\u{114BE}' => &['\u{114B9}', '\u{114BD}'],
+        '\u{115BA}' => &['\u{115B8}', '\u{115AF}'],
+        '\u{115BB}' => &['\u{115B9}', '\u{115AF}'],
+        '\u{1D15E}' => &['\u{1D157}', '\u{1D165}'],
+        '\u{1D15F}' => &['\u{1D158}', '\u{1D165}'],
+        '\u{1D160}' => &['\u{1D158}', '\u{1D165}', '\u{1D16E}'],
+        '\u{1D161}' => &['\u{1D158}', '\u{1D165}', '\u{1D16F}'],
+        '\u{1D162}' => &['\u{1D158}', '\u{1D165}', '\u{1D170}'],
+        '\u{1D163}' => &['\u{1D158}', '\u{1D165}', '\u{1D171}'],
+        '\u{1D164}' => &['\u{1D158}', '\u{1D165}', '\u{1D172}'],
+        '\u{1D1BB}' => &['\u{1D1B9}', '\u{1D165}'],
+        '\u{1D1BC}' => &['\u{1D1BA}', '\u{1D165}'],
+        '\u{1D1BD}' => &['\u{1D1B9}', '\u{1D165}', '\u{1D16E}'],
+        '\u{1D1BE}' => &['\u{1D1BA}', '\u{1D165}', '\u{1D16E}'],
+        '\u{1D1BF}' => &['\u{1D1B9}', '\u{1D165}', '\u{1D16F}'],
+        '\u{1D1C0}' => &['\u{1D1BA}', '\u{1D165}', '\u{1D16F}'],
+        '\u{2F800}' => &['\u{4E3D}'],
+        '\u{2F801}' => &['\u{4E38}'],
+        '\u{2F802}' => &['\u{4E41}'],
+        '\u{2F803}' => &['\u{20122}'],
+        '\u{2F804}' => &['\u{4F60}'],
+        '\u{2F805}' => &['\u{4FAE}'],
+        '\u{2F806}' => &['\u{4FBB}'],
+        '\u{2F807}' => &['\u{5002}'],
+        '\u{2F808}' => &['\u{507A}'],
+        '\u{2F809}' => &['\u{5099}'],
+        '\u{2F80A}' => &['\u{50E7}'],
+        '\u{2F80B}' => &['\u{50CF}'],
+        '\u{2F80C}' => &['\u{349E}'],
+        '\u{2F80D}' => &['\u{2063A}'],
+        '\u{2F80E}' => &['\u{514D}'],
+        '\u{2F80F}' => &['\u{5154}'],
+        '\u{2F810}' => &['\u{5164}'],
+        '\u{2F811}' => &['\u{5177}'],
+        '\u{2F812}' => &['\u{2051C}'],
+        '\u{2F813}' => &['\u{34B9}'],
+        '\u{2F814}' => &['\u{5167}'],
+        '\u{2F815}' => &['\u{518D}'],
+        '\u{2F816}' => &['\u{2054B}'],
+        '\u{2F817}' => &['\u{5197}'],
+        '\u{2F818}' => &['\u{51A4}'],
+        '\u{2F819}' => &['\u{4ECC}'],
+        '\u{2F81A}' => &['\u{51AC}'],
+        '\u{2F81B}' => &['\u{51B5}'],
+        '\u{2F81C}' => &['\u{291DF}'],
+        '\u{2F81D}' => &['\u{51F5}'],
+        '\u{2F81E}' => &['\u{5203}'],
+        '\u{2F81F}' => &['\u{34DF}'],
+        '\u{2F820}' => &['\u{523B}'],
+        '\u{2F821}' => &['\u{5246}'],
+        '\u{2F822}' => &['\u{5272}'],
+        '\u{2F823}' => &['\u{5277}'],
+        '\u{2F824}' => &['\u{3515}'],
+        '\u{2F825}' => &['\u{52C7}'],
+        '\u{2F826}' => &['\u{52C9}'],
+        '\u{2F827}' => &['\u{52E4}'],
+        '\u{2F828}' => &['\u{52FA}'],
+        '\u{2F829}' => &['\u{5305}'],
+        '\u{2F82A}' => &['\u{5306}'],
+        '\u{2F82B}' => &['\u{5317}'],
+        '\u{2F82C}' => &['\u{5349}'],
+        '\u{2F82D}' => &['\u{5351}'],
+        '\u{2F82E}' => &['\u{535A}'],
+        '\u{2F82F}' => &['\u{5373}'],
+        '\u{2F830}' => &['\u{537D}'],
+        '\u{2F831}' => &['\u{537F}'],
+        '\u{2F832}' => &['\u{537F}'],
+        '\u{2F833}' => &['\u{537F}'],
+        '\u{2F834}' => &['\u{20A2C}'],
+        '\u{2F835}' => &['\u{7070}'],
+        '\u{2F836}' => &['\u{53CA}'],
+        '\u{2F837}' => &['\u{53DF}'],
+        '\u{2F838}' => &['\u{20B63}'],
+        '\u{2F839}' => &['\u{53EB}'],
+        '\u{2F83A}' => &['\u{53F1}'],
+        '\u{2F83B}' => &['\u{5406}'],
+        '\u{2F83C}' => &['\u{549E}'],
+        '\u{2F83D}' => &['\u{5438}'],
+        '\u{2F83E}' => &['\u{5448}'],
+        '\u{2F83F}' => &['\u{5468}'],
+        '\u{2F840}' => &['\u{54A2}'],
+        '\u{2F841}' => &['\u{54F6}'],
+        '\u{2F842}' => &['\u{5510}'],
+        '\u{2F843}' => &['\u{5553}'],
+        '\u{2F844}' => &['\u{5563}'],
+        '\u{2F845}' => &['\u{5584}'],
+        '\u{2F846}' => &['\u{5584}'],
+        '\u{2F847}' => &['\u{5599}'],
+        '\u{2F848}' => &['\u{55AB}'],
+        '\u{2F849}' => &['\u{55B3}'],
+        '\u{2F84A}' => &['\u{55C2}'],
+        '\u{2F84B}' => &['\u{5716}'],
+        '\u{2F84C}' => &['\u{5606}'],
+        '\u{2F84D}' => &['\u{5717}'],
+        '\u{2F84E}' => &['\u{5651}'],
+        '\u{2F84F}' => &['\u{5674}'],
+        '\u{2F850}' => &['\u{5207}'],
+        '\u{2F851}' => &['\u{58EE}'],
+        '\u{2F852}' => &['\u{57CE}'],
+        '\u{2F853}' => &['\u{57F4}'],
+        '\u{2F854}' => &['\u{580D}'],
+        '\u{2F855}' => &['\u{578B}'],
+        '\u{2F856}' => &['\u{5832}'],
+        '\u{2F857}' => &['\u{5831}'],
+        '\u{2F858}' => &['\u{58AC}'],
+        '\u{2F859}' => &['\u{214E4}'],
+        '\u{2F85A}' => &['\u{58F2}'],
+        '\u{2F85B}' => &['\u{58F7}'],
+        '\u{2F85C}' => &['\u{5906}'],
+        '\u{2F85D}' => &['\u{591A}'],
+        '\u{2F85E}' => &['\u{5922}'],
+        '\u{2F85F}' => &['\u{5962}'],
+        '\u{2F860}' => &['\u{216A8}'],
+        '\u{2F861}' => &['\u{216EA}'],
+        '\u{2F862}' => &['\u{59EC}'],
+        '\u{2F863}' => &['\u{5A1B}'],
+        '\u{2F864}' => &['\u{5A27}'],
+        '\u{2F865}' => &['\u{59D8}'],
+        '\u{2F866}' => &['\u{5A66}'],
+        '\u{2F867}' => &['\u{36EE}'],
+        '\u{2F868}' => &['\u{36FC}'],
+        '\u{2F869}' => &['\u{5B08}'],
+        '\u{2F86A}' => &['\u{5B3E}'],
+        '\u{2F86B}' => &['\u{5B3E}'],
+        '\u{2F86C}' => &['\u{219C8}'],
+        '\u{2F86D}' => &['\u{5BC3}'],
+        '\u{2F86E}' => &['\u{5BD8}'],
+        '\u{2F86F}' => &['\u{5BE7}'],
+        '\u{2F870}' => &['\u{5BF3}'],
+        '\u{2F871}' => &['\u{21B18}'],
+        '\u{2F872}' => &['\u{5BFF}'],
+        '\u{2F873}' => &['\u{5C06}'],
+        '\u{2F874}' => &['\u{5F53}'],
+        '\u{2F875}' => &['\u{5C22}'],
+        '\u{2F876}' => &['\u{3781}'],
+        '\u{2F877}' => &['\u{5C60}'],
+        '\u{2F878}' => &['\u{5C6E}'],
+        '\u{2F879}' => &['\u{5CC0}'],
+        '\u{2F87A}' => &['\u{5C8D}'],
+        '\u{2F87B}' => &['\u{21DE4}'],
+        '\u{2F87C}' => &['\u{5D43}'],
+        '\u{2F87D}' => &['\u{21DE6}'],
+        '\u{2F87E}' => &['\u{5D6E}'],
+        '\u{2F87F}' => &['\u{5D6B}'],
+        '\u{2F880}' => &['\u{5D7C}'],
+        '\u{2F881}' => &['\u{5DE1}'],
+        '\u{2F882}' => &['\u{5DE2}'],
+        '\u{2F883}' => &['\u{382F}'],
+        '\u{2F884}' => &['\u{5DFD}'],
+        '\u{2F885}' => &['\u{5E28}'],
+        '\u{2F886}' => &['\u{5E3D}'],
+        '\u{2F887}' => &['\u{5E69}'],
+        '\u{2F888}' => &['\u{3862}'],
+        '\u{2F889}' => &['\u{22183}'],
+        '\u{2F88A}' => &['\u{387C}'],
+        '\u{2F88B}' => &['\u{5EB0}'],
+        '\u{2F88C}' => &['\u{5EB3}'],
+        '\u{2F88D}' => &['\u{5EB6}'],
+        '\u{2F88E}' => &['\u{5ECA}'],
+        '\u{2F88F}' => &['\u{2A392}'],
+        '\u{2F890}' => &['\u{5EFE}'],
+        '\u{2F891}' => &['\u{22331}'],
+        '\u{2F892}' => &['\u{22331}'],
+        '\u{2F893}' => &['\u{8201}'],
+        '\u{2F894}' => &['\u{5F22}'],
+        '\u{2F895}' => &['\u{5F22}'],
+        '\u{2F896}' => &['\u{38C7}'],
+        '\u{2F897}' => &['\u{232B8}'],
+        '\u{2F898}' => &['\u{261DA}'],
+        '\u{2F899}' => &['\u{5F62}'],
+        '\u{2F89A}' => &['\u{5F6B}'],
+        '\u{2F89B}' => &['\u{38E3}'],
+        '\u{2F89C}' => &['\u{5F9A}'],
+        '\u{2F89D}' => &['\u{5FCD}'],
+        '\u{2F89E}' => &['\u{5FD7}'],
+        '\u{2F89F}' => &['\u{5FF9}'],
+        '\u{2F8A0}' => &['\u{6081}'],
+        '\u{2F8A1}' => &['\u{393A}'],
+        '\u{2F8A2}' => &['\u{391C}'],
+        '\u{2F8A3}' => &['\u{6094}'],
+        '\u{2F8A4}' => &['\u{226D4}'],
+        '\u{2F8A5}' => &['\u{60C7}'],
+        '\u{2F8A6}' => &['\u{6148}'],
+        '\u{2F8A7}' => &['\u{614C}'],
+        '\u{2F8A8}' => &['\u{614E}'],
+        '\u{2F8A9}' => &['\u{614C}'],
+        '\u{2F8AA}' => &['\u{617A}'],
+        '\u{2F8AB}' => &['\u{618E}'],
+        '\u{2F8AC}' => &['\u{61B2}'],
+        '\u{2F8AD}' => &['\u{61A4}'],
+        '\u{2F8AE}' => &['\u{61AF}'],
+        '\u{2F8AF}' => &['\u{61DE}'],
+        '\u{2F8B0}' => &['\u{61F2}'],
+        '\u{2F8B1}' => &['\u{61F6}'],
+        '\u{2F8B2}' => &['\u{6210}'],
+        '\u{2F8B3}' => &['\u{621B}'],
+        '\u{2F8B4}' => &['\u{625D}'],
+        '\u{2F8B5}' => &['\u{62B1}'],
+        '\u{2F8B6}' => &['\u{62D4}'],
+        '\u{2F8B7}' => &['\u{6350}'],
+        '\u{2F8B8}' => &['\u{22B0C}'],
+        '\u{2F8B9}' => &['\u{633D}'],
+        '\u{2F8BA}' => &['\u{62FC}'],
+        '\u{2F8BB}' => &['\u{6368}'],
+        '\u{2F8BC}' => &['\u{6383}'],
+        '\u{2F8BD}' => &['\u{63E4}'],
+        '\u{2F8BE}' => &['\u{22BF1}'],
+        '\u{2F8BF}' => &['\u{6422}'],
+        '\u{2F8C0}' => &['\u{63C5}'],
+        '\u{2F8C1}' => &['\u{63A9}'],
+        '\u{2F8C2}' => &['\u{3A2E}'],
+        '\u{2F8C3}' => &['\u{6469}'],
+        '\u{2F8C4}' => &['\u{647E}'],
+        '\u{2F8C5}' => &['\u{649D}'],
+        '\u{2F8C6}' => &['\u{6477}'],
+        '\u{2F8C7}' => &['\u{3A6C}'],
+        '\u{2F8C8}' => &['\u{654F}'],
+        '\u{2F8C9}' => &['\u{656C}'],
+        '\u{2F8CA}' => &['\u{2300A}'],
+        '\u{2F8CB}' => &['\u{65E3}'],
+        '\u{2F8CC}' => &['\u{66F8}'],
+        '\u{2F8CD}' => &['\u{6649}'],
+        '\u{2F8CE}' => &['\u{3B19}'],
+        '\u{2F8CF}' => &['\u{6691}'],
+        '\u{2F8D0}' => &['\u{3B08}'],
+        '\u{2F8D1}' => &['\u{3AE4}'],
+        '\u{2F8D2}' => &['\u{5192}'],
+        '\u{2F8D3}' => &['\u{5195}'],
+        '\u{2F8D4}' => &['\u{6700}'],
+        '\u{2F8D5}' => &['\u{669C}'],
+        '\u{2F8D6}' => &['\u{80AD}'],
+        '\u{2F8D7}' => &['\u{43D9}'],
+        '\u{2F8D8}' => &['\u{6717}'],
+        '\u{2F8D9}' => &['\u{671B}'],
+        '\u{2F8DA}' => &['\u{6721}'],
+        '\u{2F8DB}' => &['\u{675E}'],
+        '\u{2F8DC}' => &['\u{6753}'],
+        '\u{2F8DD}' => &['\u{233C3}'],
+        '\u{2F8DE}' => &['\u{3B49}'],
+        '\u{2F8DF}' => &['\u{67FA}'],
+        '\u{2F8E0}' => &['\u{6785}'],
+        '\u{2F8E1}' => &['\u{6852}'],
+        '\u{2F8E2}' => &['\u{6885}'],
+        '\u{2F8E3}' => &['\u{2346D}'],
+        '\u{2F8E4}' => &['\u{688E}'],
+        '\u{2F8E5}' => &['\u{681F}'],
+        '\u{2F8E6}' => &['\u{6914}'],
+        '\u{2F8E7}' => &['\u{3B9D}'],
+        '\u{2F8E8}' => &['\u{6942}'],
+        '\u{2F8E9}' => &['\u{69A3}'],
+        '\u{2F8EA}' => &['\u{69EA}'],
+        '\u{2F8EB}' => &['\u{6AA8}'],
+        '\u{2F8EC}' => &['\u{236A3}'],
+        '\u{2F8ED}' => &['\u{6ADB}'],
+        '\u{2F8EE}' => &['\u{3C18}'],
+        '\u{2F8EF}' => &['\u{6B21}'],
+        '\u{2F8F0}' => &['\u{238A7}'],
+        '\u{2F8F1}' => &['\u{6B54}'],
+        '\u{2F8F2}' => &['\u{3C4E}'],
+        '\u{2F8F3}' => &['\u{6B72}'],
+        '\u{2F8F4}' => &['\u{6B9F}'],
+        '\u{2F8F5}' => &['\u{6BBA}'],
+        '\u{2F8F6}' => &['\u{6BBB}'],
+        '\u{2F8F7}' => &['\u{23A8D}'],
+        '\u{2F8F8}' => &['\u{21D0B}'],
+        '\u{2F8F9}' => &['\u{23AFA}'],
+        '\u{2F8FA}' => &['\u{6C4E}'],
+        '\u{2F8FB}' => &['\u{23CBC}'],
+        '\u{2F8FC}' => &['\u{6CBF}'],
+        '\u{2F8FD}' => &['\u{6CCD}'],
+        '\u{2F8FE}' => &['\u{6C67}'],
+        '\u{2F8FF}' => &['\u{6D16}'],
+        '\u{2F900}' => &['\u{6D3E}'],
+        '\u{2F901}' => &['\u{6D77}'],
+        '\u{2F902}' => &['\u{6D41}'],
+        '\u{2F903}' => &['\u{6D69}'],
+        '\u{2F904}' => &['\u{6D78}'],
+        '\u{2F905}' => &['\u{6D85}'],
+        '\u{2F906}' => &['\u{23D1E}'],
+        '\u{2F907}' => &['\u{6D34}'],
+        '\u{2F908}' => &['\u{6E2F}'],
+        '\u{2F909}' => &['\u{6E6E}'],
+        '\u{2F90A}' => &['\u{3D33}'],
+        '\u{2F90B}' => &['\u{6ECB}'],
+        '\u{2F90C}' => &['\u{6EC7}'],
+        '\u{2F90D}' => &['\u{23ED1}'],
+        '\u{2F90E}' => &['\u{6DF9}'],
+        '\u{2F90F}' => &['\u{6F6E}'],
+        '\u{2F910}' => &['\u{23F5E}'],
+        '\u{2F911}' => &['\u{23F8E}'],
+        '\u{2F912}' => &['\u{6FC6}'],
+        '\u{2F913}' => &['\u{7039}'],
+        '\u{2F914}' => &['\u{701E}'],
+        '\u{2F915}' => &['\u{701B}'],
+        '\u{2F916}' => &['\u{3D96}'],
+        '\u{2F917}' => &['\u{704A}'],
+        '\u{2F918}' => &['\u{707D}'],
+        '\u{2F919}' => &['\u{7077}'],
+        '\u{2F91A}' => &['\u{70AD}'],
+        '\u{2F91B}' => &['\u{20525}'],
+        '\u{2F91C}' => &['\u{7145}'],
+        '\u{2F91D}' => &['\u{24263}'],
+        '\u{2F91E}' => &['\u{719C}'],
+        '\u{2F91F}' => &['\u{243AB}'],
+        '\u{2F920}' => &['\u{7228}'],
+        '\u{2F921}' => &['\u{7235}'],
+        '\u{2F922}' => &['\u{7250}'],
+        '\u{2F923}' => &['\u{24608}'],
+        '\u{2F924}' => &['\u{7280}'],
+        '\u{2F925}' => &['\u{7295}'],
+        '\u{2F926}' => &['\u{24735}'],
+        '\u{2F927}' => &['\u{24814}'],
+        '\u{2F928}' => &['\u{737A}'],
+        '\u{2F929}' => &['\u{738B}'],
+        '\u{2F92A}' => &['\u{3EAC}'],
+        '\u{2F92B}' => &['\u{73A5}'],
+        '\u{2F92C}' => &['\u{3EB8}'],
+        '\u{2F92D}' => &['\u{3EB8}'],
+        '\u{2F92E}' => &['\u{7447}'],
+        '\u{2F92F}' => &['\u{745C}'],
+        '\u{2F930}' => &['\u{7471}'],
+        '\u{2F931}' => &['\u{7485}'],
+        '\u{2F932}' => &['\u{74CA}'],
+        '\u{2F933}' => &['\u{3F1B}'],
+        '\u{2F934}' => &['\u{7524}'],
+        '\u{2F935}' => &['\u{24C36}'],
+        '\u{2F936}' => &['\u{753E}'],
+        '\u{2F937}' => &['\u{24C92}'],
+        '\u{2F938}' => &['\u{7570}'],
+        '\u{2F939}' => &['\u{2219F}'],
+        '\u{2F93A}' => &['\u{7610}'],
+        '\u{2F93B}' => &['\u{24FA1}'],
+        '\u{2F93C}' => &['\u{24FB8}'],
+        '\u{2F93D}' => &['\u{25044}'],
+        '\u{2F93E}' => &['\u{3FFC}'],
+        '\u{2F93F}' => &['\u{4008}'],
+        '\u{2F940}' => &['\u{76F4}'],
+        '\u{2F941}' => &['\u{250F3}'],
+        '\u{2F942}' => &['\u{250F2}'],
+        '\u{2F943}' => &['\u{25119}'],
+        '\u{2F944}' => &['\u{25133}'],
+        '\u{2F945}' => &['\u{771E}'],
+        '\u{2F946}' => &['\u{771F}'],
+        '\u{2F947}' => &['\u{771F}'],
+        '\u{2F948}' => &['\u{774A}'],
+        '\u{2F949}' => &['\u{4039}'],
+        '\u{2F94A}' => &['\u{778B}'],
+        '\u{2F94B}' => &['\u{4046}'],
+        '\u{2F94C}' => &['\u{4096}'],
+        '\u{2F94D}' => &['\u{2541D}'],
+        '\u{2F94E}' => &['\u{784E}'],
+        '\u{2F94F}' => &['\u{788C}'],
+        '\u{2F950}' => &['\u{78CC}'],
+        '\u{2F951}' => &['\u{40E3}'],
+        '\u{2F952}' => &['\u{25626}'],
+        '\u{2F953}' => &['\u{7956}'],
+        '\u{2F954}' => &['\u{2569A}'],
+        '\u{2F955}' => &['\u{256C5}'],
+        '\u{2F956}' => &['\u{798F}'],
+        '\u{2F957}' => &['\u{79EB}'],
+        '\u{2F958}' => &['\u{412F}'],
+        '\u{2F959}' => &['\u{7A40}'],
+        '\u{2F95A}' => &['\u{7A4A}'],
+        '\u{2F95B}' => &['\u{7A4F}'],
+        '\u{2F95C}' => &['\u{2597C}'],
+        '\u{2F95D}' => &['\u{25AA7}'],
+        '\u{2F95E}' => &['\u{25AA7}'],
+        '\u{2F95F}' => &['\u{7AEE}'],
+        '\u{2F960}' => &['\u{4202}'],
+        '\u{2F961}' => &['\u{25BAB}'],
+        '\u{2F962}' => &['\u{7BC6}'],
+        '\u{2F963}' => &['\u{7BC9}'],
+        '\u{2F964}' => &['\u{4227}'],
+        '\u{2F965}' => &['\u{25C80}'],
+        '\u{2F966}' => &['\u{7CD2}'],
+        '\u{2F967}' => &['\u{42A0}'],
+        '\u{2F968}' => &['\u{7CE8}'],
+        '\u{2F969}' => &['\u{7CE3}'],
+        '\u{2F96A}' => &['\u{7D00}'],
+        '\u{2F96B}' => &['\u{25F86}'],
+        '\u{2F96C}' => &['\u{7D63}'],
+        '\u{2F96D}' => &['\u{4301}'],
+        '\u{2F96E}' => &['\u{7DC7}'],
+        '\u{2F96F}' => &['\u{7E02}'],
+        '\u{2F970}' => &['\u{7E45}'],
+        '\u{2F971}' => &['\u{4334}'],
+        '\u{2F972}' => &['\u{26228}'],
+        '\u{2F973}' => &['\u{26247}'],
+        '\u{2F974}' => &['\u{4359}'],
+        '\u{2F975}' => &['\u{262D9}'],
+        '\u{2F976}' => &['\u{7F7A}'],
+        '\u{2F977}' => &['\u{2633E}'],
+        '\u{2F978}' => &['\u{7F95}'],
+        '\u{2F979}' => &['\u{7FFA}'],
+        '\u{2F97A}' => &['\u{8005}'],
+        '\u{2F97B}' => &['\u{264DA}'],
+        '\u{2F97C}' => &['\u{26523}'],
+        '\u{2F97D}' => &['\u{8060}'],
+        '\u{2F97E}' => &['\u{265A8}'],
+        '\u{2F97F}' => &['\u{8070}'],
+        '\u{2F980}' => &['\u{2335F}'],
+        '\u{2F981}' => &['\u{43D5}'],
+        '\u{2F982}' => &['\u{80B2}'],
+        '\u{2F983}' => &['\u{8103}'],
+        '\u{2F984}' => &['\u{440B}'],
+        '\u{2F985}' => &['\u{813E}'],
+        '\u{2F986}' => &['\u{5AB5}'],
+        '\u{2F987}' => &['\u{267A7}'],
+        '\u{2F988}' => &['\u{267B5}'],
+        '\u{2F989}' => &['\u{23393}'],
+        '\u{2F98A}' => &['\u{2339C}'],
+        '\u{2F98B}' => &['\u{8201}'],
+        '\u{2F98C}' => &['\u{8204}'],
+        '\u{2F98D}' => &['\u{8F9E}'],
+        '\u{2F98E}' => &['\u{446B}'],
+        '\u{2F98F}' => &['\u{8291}'],
+        '\u{2F990}' => &['\u{828B}'],
+        '\u{2F991}' => &['\u{829D}'],
+        '\u{2F992}' => &['\u{52B3}'],
+        '\u{2F993}' => &['\u{82B1}'],
+        '\u{2F994}' => &['\u{82B3}'],
+        '\u{2F995}' => &['\u{82BD}'],
+        '\u{2F996}' => &['\u{82E6}'],
+        '\u{2F997}' => &['\u{26B3C}'],
+        '\u{2F998}' => &['\u{82E5}'],
+        '\u{2F999}' => &['\u{831D}'],
+        '\u{2F99A}' => &['\u{8363}'],
+        '\u{2F99B}' => &['\u{83AD}'],
+        '\u{2F99C}' => &['\u{8323}'],
+        '\u{2F99D}' => &['\u{83BD}'],
+        '\u{2F99E}' => &['\u{83E7}'],
+        '\u{2F99F}' => &['\u{8457}'],
+        '\u{2F9A0}' => &['\u{8353}'],
+        '\u{2F9A1}' => &['\u{83CA}'],
+        '\u{2F9A2}' => &['\u{83CC}'],
+        '\u{2F9A3}' => &['\u{83DC}'],
+        '\u{2F9A4}' => &['\u{26C36}'],
+        '\u{2F9A5}' => &['\u{26D6B}'],
+        '\u{2F9A6}' => &['\u{26CD5}'],
+        '\u{2F9A7}' => &['\u{452B}'],
+        '\u{2F9A8}' => &['\u{84F1}'],
+        '\u{2F9A9}' => &['\u{84F3}'],
+        '\u{2F9AA}' => &['\u{8516}'],
+        '\u{2F9AB}' => &['\u{273CA}'],
+        '\u{2F9AC}' => &['\u{8564}'],
+        '\u{2F9AD}' => &['\u{26F2C}'],
+        '\u{2F9AE}' => &['\u{455D}'],
+        '\u{2F9AF}' => &['\u{4561}'],
+        '\u{2F9B0}' => &['\u{26FB1}'],
+        '\u{2F9B1}' => &['\u{270D2}'],
+        '\u{2F9B2}' => &['\u{456B}'],
+        '\u{2F9B3}' => &['\u{8650}'],
+        '\u{2F9B4}' => &['\u{865C}'],
+        '\u{2F9B5}' => &['\u{8667}'],
+        '\u{2F9B6}' => &['\u{8669}'],
+        '\u{2F9B7}' => &['\u{86A9}'],
+        '\u{2F9B8}' => &['\u{8688}'],
+        '\u{2F9B9}' => &['\u{870E}'],
+        '\u{2F9BA}' => &['\u{86E2}'],
+        '\u{2F9BB}' => &['\u{8779}'],
+        '\u{2F9BC}' => &['\u{8728}'],
+        '\u{2F9BD}' => &['\u{876B}'],
+        '\u{2F9BE}' => &['\u{8786}'],
+        '\u{2F9BF}' => &['\u{45D7}'],
+        '\u{2F9C0}' => &['\u{87E1}'],
+        '\u{2F9C1}' => &['\u{8801}'],
+        '\u{2F9C2}' => &['\u{45F9}'],
+        '\u{2F9C3}' => &['\u{8860}'],
+        '\u{2F9C4}' => &['\u{8863}'],
+        '\u{2F9C5}' => &['\u{27667}'],
+        '\u{2F9C6}' => &['\u{88D7}'],
+        '\u{2F9C7}' => &['\u{88DE}'],
+        '\u{2F9C8}' => &['\u{4635}'],
+        '\u{2F9C9}' => &['\u{88FA}'],
+        '\u{2F9CA}' => &['\u{34BB}'],
+        '\u{2F9CB}' => &['\u{278AE}'],
+        '\u{2F9CC}' => &['\u{27966}'],
+        '\u{2F9CD}' => &['\u{46BE}'],
+        '\u{2F9CE}' => &['\u{46C7}'],
+        '\u{2F9CF}' => &['\u{8AA0}'],
+        '\u{2F9D0}' => &['\u{8AED}'],
+        '\u{2F9D1}' => &['\u{8B8A}'],
+        '\u{2F9D2}' => &['\u{8C55}'],
+        '\u{2F9D3}' => &['\u{27CA8}'],
+        '\u{2F9D4}' => &['\u{8CAB}'],
+        '\u{2F9D5}' => &['\u{8CC1}'],
+        '\u{2F9D6}' => &['\u{8D1B}'],
+        '\u{2F9D7}' => &['\u{8D77}'],
+        '\u{2F9D8}' => &['\u{27F2F}'],
+        '\u{2F9D9}' => &['\u{20804}'],
+        '\u{2F9DA}' => &['\u{8DCB}'],
+        '\u{2F9DB}' => &['\u{8DBC}'],
+        '\u{2F9DC}' => &['\u{8DF0}'],
+        '\u{2F9DD}' => &['\u{208DE}'],
+        '\u{2F9DE}' => &['\u{8ED4}'],
+        '\u{2F9DF}' => &['\u{8F38}'],
+        '\u{2F9E0}' => &['\u{285D2}'],
+        '\u{2F9E1}' => &['\u{285ED}'],
+        '\u{2F9E2}' => &['\u{9094}'],
+        '\u{2F9E3}' => &['\u{90F1}'],
+        '\u{2F9E4}' => &['\u{9111}'],
+        '\u{2F9E5}' => &['\u{2872E}'],
+        '\u{2F9E6}' => &['\u{911B}'],
+        '\u{2F9E7}' => &['\u{9238}'],
+        '\u{2F9E8}' => &['\u{92D7}'],
+        '\u{2F9E9}' => &['\u{92D8}'],
+        '\u{2F9EA}' => &['\u{927C}'],
+        '\u{2F9EB}' => &['\u{93F9}'],
+        '\u{2F9EC}' => &['\u{9415}'],
+        '\u{2F9ED}' => &['\u{28BFA}'],
+        '\u{2F9EE}' => &['\u{958B}'],
+        '\u{2F9EF}' => &['\u{4995}'],
+        '\u{2F9F0}' => &['\u{95B7}'],
+        '\u{2F9F1}' => &['\u{28D77}'],
+        '\u{2F9F2}' => &['\u{49E6}'],
+        '\u{2F9F3}' => &['\u{96C3}'],
+        '\u{2F9F4}' => &['\u{5DB2}'],
+        '\u{2F9F5}' => &['\u{9723}'],
+        '\u{2F9F6}' => &['\u{29145}'],
+        '\u{2F9F7}' => &['\u{2921A}'],
+        '\u{2F9F8}' => &['\u{4A6E}'],
+        '\u{2F9F9}' => &['\u{4A76}'],
+        '\u{2F9FA}' => &['\u{97E0}'],
+        '\u{2F9FB}' => &['\u{2940A}'],
+        '\u{2F9FC}' => &['\u{4AB2}'],
+        '\u{2F9FD}' => &['\u{29496}'],
+        '\u{2F9FE}' => &['\u{980B}'],
+        '\u{2F9FF}' => &['\u{980B}'],
+        '\u{2FA00}' => &['\u{9829}'],
+        '\u{2FA01}' => &['\u{295B6}'],
+        '\u{2FA02}' => &['\u{98E2}'],
+        '\u{2FA03}' => &['\u{4B33}'],
+        '\u{2FA04}' => &['\u{9929}'],
+        '\u{2FA05}' => &['\u{99A7}'],
+        '\u{2FA06}' => &['\u{99C2}'],
+        '\u{2FA07}' => &['\u{99FE}'],
+        '\u{2FA08}' => &['\u{4BCE}'],
+        '\u{2FA09}' => &['\u{29B30}'],
+        '\u{2FA0A}' => &['\u{9B12}'],
+        '\u{2FA0B}' => &['\u{9C40}'],
+        '\u{2FA0C}' => &['\u{9CFD}'],
+        '\u{2FA0D}' => &['\u{4CCE}'],
+        '\u{2FA0E}' => &['\u{4CED}'],
+        '\u{2FA0F}' => &['\u{9D67}'],
+        '\u{2FA10}' => &['\u{2A0CE}'],
+        '\u{2FA11}' => &['\u{4CF8}'],
+        '\u{2FA12}' => &['\u{2A105}'],
+        '\u{2FA13}' => &['\u{2A20E}'],
+        '\u{2FA14}' => &['\u{2A291}'],
+        '\u{2FA15}' => &['\u{9EBB}'],
+        '\u{2FA16}' => &['\u{4D56}'],
+        '\u{2FA17}' => &['\u{9EF9}'],
+        '\u{2FA18}' => &['\u{9EFE}'],
+        '\u{2FA19}' => &['\u{9F05}'],
+        '\u{2FA1A}' => &['\u{9F0F}'],
+        '\u{2FA1B}' => &['\u{9F16}'],
+        '\u{2FA1C}' => &['\u{9F3B}'],
+        '\u{2FA1D}' => &['\u{2A600}'],
+        _ => return None,
+    })
 }
 
 #[inline]
 pub fn compatibility_fully_decomposed(c: char) -> Option<&'static [char]> {
-    match c {
-        '\u{00A0}' => Some(&['\u{0020}']),
-        '\u{00A8}' => Some(&['\u{0020}', '\u{0308}']),
-        '\u{00AA}' => Some(&['\u{0061}']),
-        '\u{00AF}' => Some(&['\u{0020}', '\u{0304}']),
-        '\u{00B2}' => Some(&['\u{0032}']),
-        '\u{00B3}' => Some(&['\u{0033}']),
-        '\u{00B4}' => Some(&['\u{0020}', '\u{0301}']),
-        '\u{00B5}' => Some(&['\u{03BC}']),
-        '\u{00B8}' => Some(&['\u{0020}', '\u{0327}']),
-        '\u{00B9}' => Some(&['\u{0031}']),
-        '\u{00BA}' => Some(&['\u{006F}']),
-        '\u{00BC}' => Some(&['\u{0031}', '\u{2044}', '\u{0034}']),
-        '\u{00BD}' => Some(&['\u{0031}', '\u{2044}', '\u{0032}']),
-        '\u{00BE}' => Some(&['\u{0033}', '\u{2044}', '\u{0034}']),
-        '\u{0132}' => Some(&['\u{0049}', '\u{004A}']),
-        '\u{0133}' => Some(&['\u{0069}', '\u{006A}']),
-        '\u{013F}' => Some(&['\u{004C}', '\u{00B7}']),
-        '\u{0140}' => Some(&['\u{006C}', '\u{00B7}']),
-        '\u{0149}' => Some(&['\u{02BC}', '\u{006E}']),
-        '\u{017F}' => Some(&['\u{0073}']),
-        '\u{01C4}' => Some(&['\u{0044}', '\u{005A}', '\u{030C}']),
-        '\u{01C5}' => Some(&['\u{0044}', '\u{007A}', '\u{030C}']),
-        '\u{01C6}' => Some(&['\u{0064}', '\u{007A}', '\u{030C}']),
-        '\u{01C7}' => Some(&['\u{004C}', '\u{004A}']),
-        '\u{01C8}' => Some(&['\u{004C}', '\u{006A}']),
-        '\u{01C9}' => Some(&['\u{006C}', '\u{006A}']),
-        '\u{01CA}' => Some(&['\u{004E}', '\u{004A}']),
-        '\u{01CB}' => Some(&['\u{004E}', '\u{006A}']),
-        '\u{01CC}' => Some(&['\u{006E}', '\u{006A}']),
-        '\u{01F1}' => Some(&['\u{0044}', '\u{005A}']),
-        '\u{01F2}' => Some(&['\u{0044}', '\u{007A}']),
-        '\u{01F3}' => Some(&['\u{0064}', '\u{007A}']),
-        '\u{02B0}' => Some(&['\u{0068}']),
-        '\u{02B1}' => Some(&['\u{0266}']),
-        '\u{02B2}' => Some(&['\u{006A}']),
-        '\u{02B3}' => Some(&['\u{0072}']),
-        '\u{02B4}' => Some(&['\u{0279}']),
-        '\u{02B5}' => Some(&['\u{027B}']),
-        '\u{02B6}' => Some(&['\u{0281}']),
-        '\u{02B7}' => Some(&['\u{0077}']),
-        '\u{02B8}' => Some(&['\u{0079}']),
-        '\u{02D8}' => Some(&['\u{0020}', '\u{0306}']),
-        '\u{02D9}' => Some(&['\u{0020}', '\u{0307}']),
-        '\u{02DA}' => Some(&['\u{0020}', '\u{030A}']),
-        '\u{02DB}' => Some(&['\u{0020}', '\u{0328}']),
-        '\u{02DC}' => Some(&['\u{0020}', '\u{0303}']),
-        '\u{02DD}' => Some(&['\u{0020}', '\u{030B}']),
-        '\u{02E0}' => Some(&['\u{0263}']),
-        '\u{02E1}' => Some(&['\u{006C}']),
-        '\u{02E2}' => Some(&['\u{0073}']),
-        '\u{02E3}' => Some(&['\u{0078}']),
-        '\u{02E4}' => Some(&['\u{0295}']),
-        '\u{037A}' => Some(&['\u{0020}', '\u{0345}']),
-        '\u{0384}' => Some(&['\u{0020}', '\u{0301}']),
-        '\u{0385}' => Some(&['\u{0020}', '\u{0308}', '\u{0301}']),
-        '\u{03D0}' => Some(&['\u{03B2}']),
-        '\u{03D1}' => Some(&['\u{03B8}']),
-        '\u{03D2}' => Some(&['\u{03A5}']),
-        '\u{03D3}' => Some(&['\u{03A5}', '\u{0301}']),
-        '\u{03D4}' => Some(&['\u{03A5}', '\u{0308}']),
-        '\u{03D5}' => Some(&['\u{03C6}']),
-        '\u{03D6}' => Some(&['\u{03C0}']),
-        '\u{03F0}' => Some(&['\u{03BA}']),
-        '\u{03F1}' => Some(&['\u{03C1}']),
-        '\u{03F2}' => Some(&['\u{03C2}']),
-        '\u{03F4}' => Some(&['\u{0398}']),
-        '\u{03F5}' => Some(&['\u{03B5}']),
-        '\u{03F9}' => Some(&['\u{03A3}']),
-        '\u{0587}' => Some(&['\u{0565}', '\u{0582}']),
-        '\u{0675}' => Some(&['\u{0627}', '\u{0674}']),
-        '\u{0676}' => Some(&['\u{0648}', '\u{0674}']),
-        '\u{0677}' => Some(&['\u{06C7}', '\u{0674}']),
-        '\u{0678}' => Some(&['\u{064A}', '\u{0674}']),
-        '\u{0E33}' => Some(&['\u{0E4D}', '\u{0E32}']),
-        '\u{0EB3}' => Some(&['\u{0ECD}', '\u{0EB2}']),
-        '\u{0EDC}' => Some(&['\u{0EAB}', '\u{0E99}']),
-        '\u{0EDD}' => Some(&['\u{0EAB}', '\u{0EA1}']),
-        '\u{0F0C}' => Some(&['\u{0F0B}']),
-        '\u{0F77}' => Some(&['\u{0FB2}', '\u{0F71}', '\u{0F80}']),
-        '\u{0F79}' => Some(&['\u{0FB3}', '\u{0F71}', '\u{0F80}']),
-        '\u{10FC}' => Some(&['\u{10DC}']),
-        '\u{1D2C}' => Some(&['\u{0041}']),
-        '\u{1D2D}' => Some(&['\u{00C6}']),
-        '\u{1D2E}' => Some(&['\u{0042}']),
-        '\u{1D30}' => Some(&['\u{0044}']),
-        '\u{1D31}' => Some(&['\u{0045}']),
-        '\u{1D32}' => Some(&['\u{018E}']),
-        '\u{1D33}' => Some(&['\u{0047}']),
-        '\u{1D34}' => Some(&['\u{0048}']),
-        '\u{1D35}' => Some(&['\u{0049}']),
-        '\u{1D36}' => Some(&['\u{004A}']),
-        '\u{1D37}' => Some(&['\u{004B}']),
-        '\u{1D38}' => Some(&['\u{004C}']),
-        '\u{1D39}' => Some(&['\u{004D}']),
-        '\u{1D3A}' => Some(&['\u{004E}']),
-        '\u{1D3C}' => Some(&['\u{004F}']),
-        '\u{1D3D}' => Some(&['\u{0222}']),
-        '\u{1D3E}' => Some(&['\u{0050}']),
-        '\u{1D3F}' => Some(&['\u{0052}']),
-        '\u{1D40}' => Some(&['\u{0054}']),
-        '\u{1D41}' => Some(&['\u{0055}']),
-        '\u{1D42}' => Some(&['\u{0057}']),
-        '\u{1D43}' => Some(&['\u{0061}']),
-        '\u{1D44}' => Some(&['\u{0250}']),
-        '\u{1D45}' => Some(&['\u{0251}']),
-        '\u{1D46}' => Some(&['\u{1D02}']),
-        '\u{1D47}' => Some(&['\u{0062}']),
-        '\u{1D48}' => Some(&['\u{0064}']),
-        '\u{1D49}' => Some(&['\u{0065}']),
-        '\u{1D4A}' => Some(&['\u{0259}']),
-        '\u{1D4B}' => Some(&['\u{025B}']),
-        '\u{1D4C}' => Some(&['\u{025C}']),
-        '\u{1D4D}' => Some(&['\u{0067}']),
-        '\u{1D4F}' => Some(&['\u{006B}']),
-        '\u{1D50}' => Some(&['\u{006D}']),
-        '\u{1D51}' => Some(&['\u{014B}']),
-        '\u{1D52}' => Some(&['\u{006F}']),
-        '\u{1D53}' => Some(&['\u{0254}']),
-        '\u{1D54}' => Some(&['\u{1D16}']),
-        '\u{1D55}' => Some(&['\u{1D17}']),
-        '\u{1D56}' => Some(&['\u{0070}']),
-        '\u{1D57}' => Some(&['\u{0074}']),
-        '\u{1D58}' => Some(&['\u{0075}']),
-        '\u{1D59}' => Some(&['\u{1D1D}']),
-        '\u{1D5A}' => Some(&['\u{026F}']),
-        '\u{1D5B}' => Some(&['\u{0076}']),
-        '\u{1D5C}' => Some(&['\u{1D25}']),
-        '\u{1D5D}' => Some(&['\u{03B2}']),
-        '\u{1D5E}' => Some(&['\u{03B3}']),
-        '\u{1D5F}' => Some(&['\u{03B4}']),
-        '\u{1D60}' => Some(&['\u{03C6}']),
-        '\u{1D61}' => Some(&['\u{03C7}']),
-        '\u{1D62}' => Some(&['\u{0069}']),
-        '\u{1D63}' => Some(&['\u{0072}']),
-        '\u{1D64}' => Some(&['\u{0075}']),
-        '\u{1D65}' => Some(&['\u{0076}']),
-        '\u{1D66}' => Some(&['\u{03B2}']),
-        '\u{1D67}' => Some(&['\u{03B3}']),
-        '\u{1D68}' => Some(&['\u{03C1}']),
-        '\u{1D69}' => Some(&['\u{03C6}']),
-        '\u{1D6A}' => Some(&['\u{03C7}']),
-        '\u{1D78}' => Some(&['\u{043D}']),
-        '\u{1D9B}' => Some(&['\u{0252}']),
-        '\u{1D9C}' => Some(&['\u{0063}']),
-        '\u{1D9D}' => Some(&['\u{0255}']),
-        '\u{1D9E}' => Some(&['\u{00F0}']),
-        '\u{1D9F}' => Some(&['\u{025C}']),
-        '\u{1DA0}' => Some(&['\u{0066}']),
-        '\u{1DA1}' => Some(&['\u{025F}']),
-        '\u{1DA2}' => Some(&['\u{0261}']),
-        '\u{1DA3}' => Some(&['\u{0265}']),
-        '\u{1DA4}' => Some(&['\u{0268}']),
-        '\u{1DA5}' => Some(&['\u{0269}']),
-        '\u{1DA6}' => Some(&['\u{026A}']),
-        '\u{1DA7}' => Some(&['\u{1D7B}']),
-        '\u{1DA8}' => Some(&['\u{029D}']),
-        '\u{1DA9}' => Some(&['\u{026D}']),
-        '\u{1DAA}' => Some(&['\u{1D85}']),
-        '\u{1DAB}' => Some(&['\u{029F}']),
-        '\u{1DAC}' => Some(&['\u{0271}']),
-        '\u{1DAD}' => Some(&['\u{0270}']),
-        '\u{1DAE}' => Some(&['\u{0272}']),
-        '\u{1DAF}' => Some(&['\u{0273}']),
-        '\u{1DB0}' => Some(&['\u{0274}']),
-        '\u{1DB1}' => Some(&['\u{0275}']),
-        '\u{1DB2}' => Some(&['\u{0278}']),
-        '\u{1DB3}' => Some(&['\u{0282}']),
-        '\u{1DB4}' => Some(&['\u{0283}']),
-        '\u{1DB5}' => Some(&['\u{01AB}']),
-        '\u{1DB6}' => Some(&['\u{0289}']),
-        '\u{1DB7}' => Some(&['\u{028A}']),
-        '\u{1DB8}' => Some(&['\u{1D1C}']),
-        '\u{1DB9}' => Some(&['\u{028B}']),
-        '\u{1DBA}' => Some(&['\u{028C}']),
-        '\u{1DBB}' => Some(&['\u{007A}']),
-        '\u{1DBC}' => Some(&['\u{0290}']),
-        '\u{1DBD}' => Some(&['\u{0291}']),
-        '\u{1DBE}' => Some(&['\u{0292}']),
-        '\u{1DBF}' => Some(&['\u{03B8}']),
-        '\u{1E9A}' => Some(&['\u{0061}', '\u{02BE}']),
-        '\u{1E9B}' => Some(&['\u{0073}', '\u{0307}']),
-        '\u{1FBD}' => Some(&['\u{0020}', '\u{0313}']),
-        '\u{1FBF}' => Some(&['\u{0020}', '\u{0313}']),
-        '\u{1FC0}' => Some(&['\u{0020}', '\u{0342}']),
-        '\u{1FC1}' => Some(&['\u{0020}', '\u{0308}', '\u{0342}']),
-        '\u{1FCD}' => Some(&['\u{0020}', '\u{0313}', '\u{0300}']),
-        '\u{1FCE}' => Some(&['\u{0020}', '\u{0313}', '\u{0301}']),
-        '\u{1FCF}' => Some(&['\u{0020}', '\u{0313}', '\u{0342}']),
-        '\u{1FDD}' => Some(&['\u{0020}', '\u{0314}', '\u{0300}']),
-        '\u{1FDE}' => Some(&['\u{0020}', '\u{0314}', '\u{0301}']),
-        '\u{1FDF}' => Some(&['\u{0020}', '\u{0314}', '\u{0342}']),
-        '\u{1FED}' => Some(&['\u{0020}', '\u{0308}', '\u{0300}']),
-        '\u{1FEE}' => Some(&['\u{0020}', '\u{0308}', '\u{0301}']),
-        '\u{1FFD}' => Some(&['\u{0020}', '\u{0301}']),
-        '\u{1FFE}' => Some(&['\u{0020}', '\u{0314}']),
-        '\u{2000}' => Some(&['\u{0020}']),
-        '\u{2001}' => Some(&['\u{0020}']),
-        '\u{2002}' => Some(&['\u{0020}']),
-        '\u{2003}' => Some(&['\u{0020}']),
-        '\u{2004}' => Some(&['\u{0020}']),
-        '\u{2005}' => Some(&['\u{0020}']),
-        '\u{2006}' => Some(&['\u{0020}']),
-        '\u{2007}' => Some(&['\u{0020}']),
-        '\u{2008}' => Some(&['\u{0020}']),
-        '\u{2009}' => Some(&['\u{0020}']),
-        '\u{200A}' => Some(&['\u{0020}']),
-        '\u{2011}' => Some(&['\u{2010}']),
-        '\u{2017}' => Some(&['\u{0020}', '\u{0333}']),
-        '\u{2024}' => Some(&['\u{002E}']),
-        '\u{2025}' => Some(&['\u{002E}', '\u{002E}']),
-        '\u{2026}' => Some(&['\u{002E}', '\u{002E}', '\u{002E}']),
-        '\u{202F}' => Some(&['\u{0020}']),
-        '\u{2033}' => Some(&['\u{2032}', '\u{2032}']),
-        '\u{2034}' => Some(&['\u{2032}', '\u{2032}', '\u{2032}']),
-        '\u{2036}' => Some(&['\u{2035}', '\u{2035}']),
-        '\u{2037}' => Some(&['\u{2035}', '\u{2035}', '\u{2035}']),
-        '\u{203C}' => Some(&['\u{0021}', '\u{0021}']),
-        '\u{203E}' => Some(&['\u{0020}', '\u{0305}']),
-        '\u{2047}' => Some(&['\u{003F}', '\u{003F}']),
-        '\u{2048}' => Some(&['\u{003F}', '\u{0021}']),
-        '\u{2049}' => Some(&['\u{0021}', '\u{003F}']),
-        '\u{2057}' => Some(&['\u{2032}', '\u{2032}', '\u{2032}', '\u{2032}']),
-        '\u{205F}' => Some(&['\u{0020}']),
-        '\u{2070}' => Some(&['\u{0030}']),
-        '\u{2071}' => Some(&['\u{0069}']),
-        '\u{2074}' => Some(&['\u{0034}']),
-        '\u{2075}' => Some(&['\u{0035}']),
-        '\u{2076}' => Some(&['\u{0036}']),
-        '\u{2077}' => Some(&['\u{0037}']),
-        '\u{2078}' => Some(&['\u{0038}']),
-        '\u{2079}' => Some(&['\u{0039}']),
-        '\u{207A}' => Some(&['\u{002B}']),
-        '\u{207B}' => Some(&['\u{2212}']),
-        '\u{207C}' => Some(&['\u{003D}']),
-        '\u{207D}' => Some(&['\u{0028}']),
-        '\u{207E}' => Some(&['\u{0029}']),
-        '\u{207F}' => Some(&['\u{006E}']),
-        '\u{2080}' => Some(&['\u{0030}']),
-        '\u{2081}' => Some(&['\u{0031}']),
-        '\u{2082}' => Some(&['\u{0032}']),
-        '\u{2083}' => Some(&['\u{0033}']),
-        '\u{2084}' => Some(&['\u{0034}']),
-        '\u{2085}' => Some(&['\u{0035}']),
-        '\u{2086}' => Some(&['\u{0036}']),
-        '\u{2087}' => Some(&['\u{0037}']),
-        '\u{2088}' => Some(&['\u{0038}']),
-        '\u{2089}' => Some(&['\u{0039}']),
-        '\u{208A}' => Some(&['\u{002B}']),
-        '\u{208B}' => Some(&['\u{2212}']),
-        '\u{208C}' => Some(&['\u{003D}']),
-        '\u{208D}' => Some(&['\u{0028}']),
-        '\u{208E}' => Some(&['\u{0029}']),
-        '\u{2090}' => Some(&['\u{0061}']),
-        '\u{2091}' => Some(&['\u{0065}']),
-        '\u{2092}' => Some(&['\u{006F}']),
-        '\u{2093}' => Some(&['\u{0078}']),
-        '\u{2094}' => Some(&['\u{0259}']),
-        '\u{2095}' => Some(&['\u{0068}']),
-        '\u{2096}' => Some(&['\u{006B}']),
-        '\u{2097}' => Some(&['\u{006C}']),
-        '\u{2098}' => Some(&['\u{006D}']),
-        '\u{2099}' => Some(&['\u{006E}']),
-        '\u{209A}' => Some(&['\u{0070}']),
-        '\u{209B}' => Some(&['\u{0073}']),
-        '\u{209C}' => Some(&['\u{0074}']),
-        '\u{20A8}' => Some(&['\u{0052}', '\u{0073}']),
-        '\u{2100}' => Some(&['\u{0061}', '\u{002F}', '\u{0063}']),
-        '\u{2101}' => Some(&['\u{0061}', '\u{002F}', '\u{0073}']),
-        '\u{2102}' => Some(&['\u{0043}']),
-        '\u{2103}' => Some(&['\u{00B0}', '\u{0043}']),
-        '\u{2105}' => Some(&['\u{0063}', '\u{002F}', '\u{006F}']),
-        '\u{2106}' => Some(&['\u{0063}', '\u{002F}', '\u{0075}']),
-        '\u{2107}' => Some(&['\u{0190}']),
-        '\u{2109}' => Some(&['\u{00B0}', '\u{0046}']),
-        '\u{210A}' => Some(&['\u{0067}']),
-        '\u{210B}' => Some(&['\u{0048}']),
-        '\u{210C}' => Some(&['\u{0048}']),
-        '\u{210D}' => Some(&['\u{0048}']),
-        '\u{210E}' => Some(&['\u{0068}']),
-        '\u{210F}' => Some(&['\u{0127}']),
-        '\u{2110}' => Some(&['\u{0049}']),
-        '\u{2111}' => Some(&['\u{0049}']),
-        '\u{2112}' => Some(&['\u{004C}']),
-        '\u{2113}' => Some(&['\u{006C}']),
-        '\u{2115}' => Some(&['\u{004E}']),
-        '\u{2116}' => Some(&['\u{004E}', '\u{006F}']),
-        '\u{2119}' => Some(&['\u{0050}']),
-        '\u{211A}' => Some(&['\u{0051}']),
-        '\u{211B}' => Some(&['\u{0052}']),
-        '\u{211C}' => Some(&['\u{0052}']),
-        '\u{211D}' => Some(&['\u{0052}']),
-        '\u{2120}' => Some(&['\u{0053}', '\u{004D}']),
-        '\u{2121}' => Some(&['\u{0054}', '\u{0045}', '\u{004C}']),
-        '\u{2122}' => Some(&['\u{0054}', '\u{004D}']),
-        '\u{2124}' => Some(&['\u{005A}']),
-        '\u{2128}' => Some(&['\u{005A}']),
-        '\u{212C}' => Some(&['\u{0042}']),
-        '\u{212D}' => Some(&['\u{0043}']),
-        '\u{212F}' => Some(&['\u{0065}']),
-        '\u{2130}' => Some(&['\u{0045}']),
-        '\u{2131}' => Some(&['\u{0046}']),
-        '\u{2133}' => Some(&['\u{004D}']),
-        '\u{2134}' => Some(&['\u{006F}']),
-        '\u{2135}' => Some(&['\u{05D0}']),
-        '\u{2136}' => Some(&['\u{05D1}']),
-        '\u{2137}' => Some(&['\u{05D2}']),
-        '\u{2138}' => Some(&['\u{05D3}']),
-        '\u{2139}' => Some(&['\u{0069}']),
-        '\u{213B}' => Some(&['\u{0046}', '\u{0041}', '\u{0058}']),
-        '\u{213C}' => Some(&['\u{03C0}']),
-        '\u{213D}' => Some(&['\u{03B3}']),
-        '\u{213E}' => Some(&['\u{0393}']),
-        '\u{213F}' => Some(&['\u{03A0}']),
-        '\u{2140}' => Some(&['\u{2211}']),
-        '\u{2145}' => Some(&['\u{0044}']),
-        '\u{2146}' => Some(&['\u{0064}']),
-        '\u{2147}' => Some(&['\u{0065}']),
-        '\u{2148}' => Some(&['\u{0069}']),
-        '\u{2149}' => Some(&['\u{006A}']),
-        '\u{2150}' => Some(&['\u{0031}', '\u{2044}', '\u{0037}']),
-        '\u{2151}' => Some(&['\u{0031}', '\u{2044}', '\u{0039}']),
-        '\u{2152}' => Some(&['\u{0031}', '\u{2044}', '\u{0031}', '\u{0030}']),
-        '\u{2153}' => Some(&['\u{0031}', '\u{2044}', '\u{0033}']),
-        '\u{2154}' => Some(&['\u{0032}', '\u{2044}', '\u{0033}']),
-        '\u{2155}' => Some(&['\u{0031}', '\u{2044}', '\u{0035}']),
-        '\u{2156}' => Some(&['\u{0032}', '\u{2044}', '\u{0035}']),
-        '\u{2157}' => Some(&['\u{0033}', '\u{2044}', '\u{0035}']),
-        '\u{2158}' => Some(&['\u{0034}', '\u{2044}', '\u{0035}']),
-        '\u{2159}' => Some(&['\u{0031}', '\u{2044}', '\u{0036}']),
-        '\u{215A}' => Some(&['\u{0035}', '\u{2044}', '\u{0036}']),
-        '\u{215B}' => Some(&['\u{0031}', '\u{2044}', '\u{0038}']),
-        '\u{215C}' => Some(&['\u{0033}', '\u{2044}', '\u{0038}']),
-        '\u{215D}' => Some(&['\u{0035}', '\u{2044}', '\u{0038}']),
-        '\u{215E}' => Some(&['\u{0037}', '\u{2044}', '\u{0038}']),
-        '\u{215F}' => Some(&['\u{0031}', '\u{2044}']),
-        '\u{2160}' => Some(&['\u{0049}']),
-        '\u{2161}' => Some(&['\u{0049}', '\u{0049}']),
-        '\u{2162}' => Some(&['\u{0049}', '\u{0049}', '\u{0049}']),
-        '\u{2163}' => Some(&['\u{0049}', '\u{0056}']),
-        '\u{2164}' => Some(&['\u{0056}']),
-        '\u{2165}' => Some(&['\u{0056}', '\u{0049}']),
-        '\u{2166}' => Some(&['\u{0056}', '\u{0049}', '\u{0049}']),
-        '\u{2167}' => Some(&['\u{0056}', '\u{0049}', '\u{0049}', '\u{0049}']),
-        '\u{2168}' => Some(&['\u{0049}', '\u{0058}']),
-        '\u{2169}' => Some(&['\u{0058}']),
-        '\u{216A}' => Some(&['\u{0058}', '\u{0049}']),
-        '\u{216B}' => Some(&['\u{0058}', '\u{0049}', '\u{0049}']),
-        '\u{216C}' => Some(&['\u{004C}']),
-        '\u{216D}' => Some(&['\u{0043}']),
-        '\u{216E}' => Some(&['\u{0044}']),
-        '\u{216F}' => Some(&['\u{004D}']),
-        '\u{2170}' => Some(&['\u{0069}']),
-        '\u{2171}' => Some(&['\u{0069}', '\u{0069}']),
-        '\u{2172}' => Some(&['\u{0069}', '\u{0069}', '\u{0069}']),
-        '\u{2173}' => Some(&['\u{0069}', '\u{0076}']),
-        '\u{2174}' => Some(&['\u{0076}']),
-        '\u{2175}' => Some(&['\u{0076}', '\u{0069}']),
-        '\u{2176}' => Some(&['\u{0076}', '\u{0069}', '\u{0069}']),
-        '\u{2177}' => Some(&['\u{0076}', '\u{0069}', '\u{0069}', '\u{0069}']),
-        '\u{2178}' => Some(&['\u{0069}', '\u{0078}']),
-        '\u{2179}' => Some(&['\u{0078}']),
-        '\u{217A}' => Some(&['\u{0078}', '\u{0069}']),
-        '\u{217B}' => Some(&['\u{0078}', '\u{0069}', '\u{0069}']),
-        '\u{217C}' => Some(&['\u{006C}']),
-        '\u{217D}' => Some(&['\u{0063}']),
-        '\u{217E}' => Some(&['\u{0064}']),
-        '\u{217F}' => Some(&['\u{006D}']),
-        '\u{2189}' => Some(&['\u{0030}', '\u{2044}', '\u{0033}']),
-        '\u{222C}' => Some(&['\u{222B}', '\u{222B}']),
-        '\u{222D}' => Some(&['\u{222B}', '\u{222B}', '\u{222B}']),
-        '\u{222F}' => Some(&['\u{222E}', '\u{222E}']),
-        '\u{2230}' => Some(&['\u{222E}', '\u{222E}', '\u{222E}']),
-        '\u{2460}' => Some(&['\u{0031}']),
-        '\u{2461}' => Some(&['\u{0032}']),
-        '\u{2462}' => Some(&['\u{0033}']),
-        '\u{2463}' => Some(&['\u{0034}']),
-        '\u{2464}' => Some(&['\u{0035}']),
-        '\u{2465}' => Some(&['\u{0036}']),
-        '\u{2466}' => Some(&['\u{0037}']),
-        '\u{2467}' => Some(&['\u{0038}']),
-        '\u{2468}' => Some(&['\u{0039}']),
-        '\u{2469}' => Some(&['\u{0031}', '\u{0030}']),
-        '\u{246A}' => Some(&['\u{0031}', '\u{0031}']),
-        '\u{246B}' => Some(&['\u{0031}', '\u{0032}']),
-        '\u{246C}' => Some(&['\u{0031}', '\u{0033}']),
-        '\u{246D}' => Some(&['\u{0031}', '\u{0034}']),
-        '\u{246E}' => Some(&['\u{0031}', '\u{0035}']),
-        '\u{246F}' => Some(&['\u{0031}', '\u{0036}']),
-        '\u{2470}' => Some(&['\u{0031}', '\u{0037}']),
-        '\u{2471}' => Some(&['\u{0031}', '\u{0038}']),
-        '\u{2472}' => Some(&['\u{0031}', '\u{0039}']),
-        '\u{2473}' => Some(&['\u{0032}', '\u{0030}']),
-        '\u{2474}' => Some(&['\u{0028}', '\u{0031}', '\u{0029}']),
-        '\u{2475}' => Some(&['\u{0028}', '\u{0032}', '\u{0029}']),
-        '\u{2476}' => Some(&['\u{0028}', '\u{0033}', '\u{0029}']),
-        '\u{2477}' => Some(&['\u{0028}', '\u{0034}', '\u{0029}']),
-        '\u{2478}' => Some(&['\u{0028}', '\u{0035}', '\u{0029}']),
-        '\u{2479}' => Some(&['\u{0028}', '\u{0036}', '\u{0029}']),
-        '\u{247A}' => Some(&['\u{0028}', '\u{0037}', '\u{0029}']),
-        '\u{247B}' => Some(&['\u{0028}', '\u{0038}', '\u{0029}']),
-        '\u{247C}' => Some(&['\u{0028}', '\u{0039}', '\u{0029}']),
-        '\u{247D}' => Some(&['\u{0028}', '\u{0031}', '\u{0030}', '\u{0029}']),
-        '\u{247E}' => Some(&['\u{0028}', '\u{0031}', '\u{0031}', '\u{0029}']),
-        '\u{247F}' => Some(&['\u{0028}', '\u{0031}', '\u{0032}', '\u{0029}']),
-        '\u{2480}' => Some(&['\u{0028}', '\u{0031}', '\u{0033}', '\u{0029}']),
-        '\u{2481}' => Some(&['\u{0028}', '\u{0031}', '\u{0034}', '\u{0029}']),
-        '\u{2482}' => Some(&['\u{0028}', '\u{0031}', '\u{0035}', '\u{0029}']),
-        '\u{2483}' => Some(&['\u{0028}', '\u{0031}', '\u{0036}', '\u{0029}']),
-        '\u{2484}' => Some(&['\u{0028}', '\u{0031}', '\u{0037}', '\u{0029}']),
-        '\u{2485}' => Some(&['\u{0028}', '\u{0031}', '\u{0038}', '\u{0029}']),
-        '\u{2486}' => Some(&['\u{0028}', '\u{0031}', '\u{0039}', '\u{0029}']),
-        '\u{2487}' => Some(&['\u{0028}', '\u{0032}', '\u{0030}', '\u{0029}']),
-        '\u{2488}' => Some(&['\u{0031}', '\u{002E}']),
-        '\u{2489}' => Some(&['\u{0032}', '\u{002E}']),
-        '\u{248A}' => Some(&['\u{0033}', '\u{002E}']),
-        '\u{248B}' => Some(&['\u{0034}', '\u{002E}']),
-        '\u{248C}' => Some(&['\u{0035}', '\u{002E}']),
-        '\u{248D}' => Some(&['\u{0036}', '\u{002E}']),
-        '\u{248E}' => Some(&['\u{0037}', '\u{002E}']),
-        '\u{248F}' => Some(&['\u{0038}', '\u{002E}']),
-        '\u{2490}' => Some(&['\u{0039}', '\u{002E}']),
-        '\u{2491}' => Some(&['\u{0031}', '\u{0030}', '\u{002E}']),
-        '\u{2492}' => Some(&['\u{0031}', '\u{0031}', '\u{002E}']),
-        '\u{2493}' => Some(&['\u{0031}', '\u{0032}', '\u{002E}']),
-        '\u{2494}' => Some(&['\u{0031}', '\u{0033}', '\u{002E}']),
-        '\u{2495}' => Some(&['\u{0031}', '\u{0034}', '\u{002E}']),
-        '\u{2496}' => Some(&['\u{0031}', '\u{0035}', '\u{002E}']),
-        '\u{2497}' => Some(&['\u{0031}', '\u{0036}', '\u{002E}']),
-        '\u{2498}' => Some(&['\u{0031}', '\u{0037}', '\u{002E}']),
-        '\u{2499}' => Some(&['\u{0031}', '\u{0038}', '\u{002E}']),
-        '\u{249A}' => Some(&['\u{0031}', '\u{0039}', '\u{002E}']),
-        '\u{249B}' => Some(&['\u{0032}', '\u{0030}', '\u{002E}']),
-        '\u{249C}' => Some(&['\u{0028}', '\u{0061}', '\u{0029}']),
-        '\u{249D}' => Some(&['\u{0028}', '\u{0062}', '\u{0029}']),
-        '\u{249E}' => Some(&['\u{0028}', '\u{0063}', '\u{0029}']),
-        '\u{249F}' => Some(&['\u{0028}', '\u{0064}', '\u{0029}']),
-        '\u{24A0}' => Some(&['\u{0028}', '\u{0065}', '\u{0029}']),
-        '\u{24A1}' => Some(&['\u{0028}', '\u{0066}', '\u{0029}']),
-        '\u{24A2}' => Some(&['\u{0028}', '\u{0067}', '\u{0029}']),
-        '\u{24A3}' => Some(&['\u{0028}', '\u{0068}', '\u{0029}']),
-        '\u{24A4}' => Some(&['\u{0028}', '\u{0069}', '\u{0029}']),
-        '\u{24A5}' => Some(&['\u{0028}', '\u{006A}', '\u{0029}']),
-        '\u{24A6}' => Some(&['\u{0028}', '\u{006B}', '\u{0029}']),
-        '\u{24A7}' => Some(&['\u{0028}', '\u{006C}', '\u{0029}']),
-        '\u{24A8}' => Some(&['\u{0028}', '\u{006D}', '\u{0029}']),
-        '\u{24A9}' => Some(&['\u{0028}', '\u{006E}', '\u{0029}']),
-        '\u{24AA}' => Some(&['\u{0028}', '\u{006F}', '\u{0029}']),
-        '\u{24AB}' => Some(&['\u{0028}', '\u{0070}', '\u{0029}']),
-        '\u{24AC}' => Some(&['\u{0028}', '\u{0071}', '\u{0029}']),
-        '\u{24AD}' => Some(&['\u{0028}', '\u{0072}', '\u{0029}']),
-        '\u{24AE}' => Some(&['\u{0028}', '\u{0073}', '\u{0029}']),
-        '\u{24AF}' => Some(&['\u{0028}', '\u{0074}', '\u{0029}']),
-        '\u{24B0}' => Some(&['\u{0028}', '\u{0075}', '\u{0029}']),
-        '\u{24B1}' => Some(&['\u{0028}', '\u{0076}', '\u{0029}']),
-        '\u{24B2}' => Some(&['\u{0028}', '\u{0077}', '\u{0029}']),
-        '\u{24B3}' => Some(&['\u{0028}', '\u{0078}', '\u{0029}']),
-        '\u{24B4}' => Some(&['\u{0028}', '\u{0079}', '\u{0029}']),
-        '\u{24B5}' => Some(&['\u{0028}', '\u{007A}', '\u{0029}']),
-        '\u{24B6}' => Some(&['\u{0041}']),
-        '\u{24B7}' => Some(&['\u{0042}']),
-        '\u{24B8}' => Some(&['\u{0043}']),
-        '\u{24B9}' => Some(&['\u{0044}']),
-        '\u{24BA}' => Some(&['\u{0045}']),
-        '\u{24BB}' => Some(&['\u{0046}']),
-        '\u{24BC}' => Some(&['\u{0047}']),
-        '\u{24BD}' => Some(&['\u{0048}']),
-        '\u{24BE}' => Some(&['\u{0049}']),
-        '\u{24BF}' => Some(&['\u{004A}']),
-        '\u{24C0}' => Some(&['\u{004B}']),
-        '\u{24C1}' => Some(&['\u{004C}']),
-        '\u{24C2}' => Some(&['\u{004D}']),
-        '\u{24C3}' => Some(&['\u{004E}']),
-        '\u{24C4}' => Some(&['\u{004F}']),
-        '\u{24C5}' => Some(&['\u{0050}']),
-        '\u{24C6}' => Some(&['\u{0051}']),
-        '\u{24C7}' => Some(&['\u{0052}']),
-        '\u{24C8}' => Some(&['\u{0053}']),
-        '\u{24C9}' => Some(&['\u{0054}']),
-        '\u{24CA}' => Some(&['\u{0055}']),
-        '\u{24CB}' => Some(&['\u{0056}']),
-        '\u{24CC}' => Some(&['\u{0057}']),
-        '\u{24CD}' => Some(&['\u{0058}']),
-        '\u{24CE}' => Some(&['\u{0059}']),
-        '\u{24CF}' => Some(&['\u{005A}']),
-        '\u{24D0}' => Some(&['\u{0061}']),
-        '\u{24D1}' => Some(&['\u{0062}']),
-        '\u{24D2}' => Some(&['\u{0063}']),
-        '\u{24D3}' => Some(&['\u{0064}']),
-        '\u{24D4}' => Some(&['\u{0065}']),
-        '\u{24D5}' => Some(&['\u{0066}']),
-        '\u{24D6}' => Some(&['\u{0067}']),
-        '\u{24D7}' => Some(&['\u{0068}']),
-        '\u{24D8}' => Some(&['\u{0069}']),
-        '\u{24D9}' => Some(&['\u{006A}']),
-        '\u{24DA}' => Some(&['\u{006B}']),
-        '\u{24DB}' => Some(&['\u{006C}']),
-        '\u{24DC}' => Some(&['\u{006D}']),
-        '\u{24DD}' => Some(&['\u{006E}']),
-        '\u{24DE}' => Some(&['\u{006F}']),
-        '\u{24DF}' => Some(&['\u{0070}']),
-        '\u{24E0}' => Some(&['\u{0071}']),
-        '\u{24E1}' => Some(&['\u{0072}']),
-        '\u{24E2}' => Some(&['\u{0073}']),
-        '\u{24E3}' => Some(&['\u{0074}']),
-        '\u{24E4}' => Some(&['\u{0075}']),
-        '\u{24E5}' => Some(&['\u{0076}']),
-        '\u{24E6}' => Some(&['\u{0077}']),
-        '\u{24E7}' => Some(&['\u{0078}']),
-        '\u{24E8}' => Some(&['\u{0079}']),
-        '\u{24E9}' => Some(&['\u{007A}']),
-        '\u{24EA}' => Some(&['\u{0030}']),
-        '\u{2A0C}' => Some(&['\u{222B}', '\u{222B}', '\u{222B}', '\u{222B}']),
-        '\u{2A74}' => Some(&['\u{003A}', '\u{003A}', '\u{003D}']),
-        '\u{2A75}' => Some(&['\u{003D}', '\u{003D}']),
-        '\u{2A76}' => Some(&['\u{003D}', '\u{003D}', '\u{003D}']),
-        '\u{2C7C}' => Some(&['\u{006A}']),
-        '\u{2C7D}' => Some(&['\u{0056}']),
-        '\u{2D6F}' => Some(&['\u{2D61}']),
-        '\u{2E9F}' => Some(&['\u{6BCD}']),
-        '\u{2EF3}' => Some(&['\u{9F9F}']),
-        '\u{2F00}' => Some(&['\u{4E00}']),
-        '\u{2F01}' => Some(&['\u{4E28}']),
-        '\u{2F02}' => Some(&['\u{4E36}']),
-        '\u{2F03}' => Some(&['\u{4E3F}']),
-        '\u{2F04}' => Some(&['\u{4E59}']),
-        '\u{2F05}' => Some(&['\u{4E85}']),
-        '\u{2F06}' => Some(&['\u{4E8C}']),
-        '\u{2F07}' => Some(&['\u{4EA0}']),
-        '\u{2F08}' => Some(&['\u{4EBA}']),
-        '\u{2F09}' => Some(&['\u{513F}']),
-        '\u{2F0A}' => Some(&['\u{5165}']),
-        '\u{2F0B}' => Some(&['\u{516B}']),
-        '\u{2F0C}' => Some(&['\u{5182}']),
-        '\u{2F0D}' => Some(&['\u{5196}']),
-        '\u{2F0E}' => Some(&['\u{51AB}']),
-        '\u{2F0F}' => Some(&['\u{51E0}']),
-        '\u{2F10}' => Some(&['\u{51F5}']),
-        '\u{2F11}' => Some(&['\u{5200}']),
-        '\u{2F12}' => Some(&['\u{529B}']),
-        '\u{2F13}' => Some(&['\u{52F9}']),
-        '\u{2F14}' => Some(&['\u{5315}']),
-        '\u{2F15}' => Some(&['\u{531A}']),
-        '\u{2F16}' => Some(&['\u{5338}']),
-        '\u{2F17}' => Some(&['\u{5341}']),
-        '\u{2F18}' => Some(&['\u{535C}']),
-        '\u{2F19}' => Some(&['\u{5369}']),
-        '\u{2F1A}' => Some(&['\u{5382}']),
-        '\u{2F1B}' => Some(&['\u{53B6}']),
-        '\u{2F1C}' => Some(&['\u{53C8}']),
-        '\u{2F1D}' => Some(&['\u{53E3}']),
-        '\u{2F1E}' => Some(&['\u{56D7}']),
-        '\u{2F1F}' => Some(&['\u{571F}']),
-        '\u{2F20}' => Some(&['\u{58EB}']),
-        '\u{2F21}' => Some(&['\u{5902}']),
-        '\u{2F22}' => Some(&['\u{590A}']),
-        '\u{2F23}' => Some(&['\u{5915}']),
-        '\u{2F24}' => Some(&['\u{5927}']),
-        '\u{2F25}' => Some(&['\u{5973}']),
-        '\u{2F26}' => Some(&['\u{5B50}']),
-        '\u{2F27}' => Some(&['\u{5B80}']),
-        '\u{2F28}' => Some(&['\u{5BF8}']),
-        '\u{2F29}' => Some(&['\u{5C0F}']),
-        '\u{2F2A}' => Some(&['\u{5C22}']),
-        '\u{2F2B}' => Some(&['\u{5C38}']),
-        '\u{2F2C}' => Some(&['\u{5C6E}']),
-        '\u{2F2D}' => Some(&['\u{5C71}']),
-        '\u{2F2E}' => Some(&['\u{5DDB}']),
-        '\u{2F2F}' => Some(&['\u{5DE5}']),
-        '\u{2F30}' => Some(&['\u{5DF1}']),
-        '\u{2F31}' => Some(&['\u{5DFE}']),
-        '\u{2F32}' => Some(&['\u{5E72}']),
-        '\u{2F33}' => Some(&['\u{5E7A}']),
-        '\u{2F34}' => Some(&['\u{5E7F}']),
-        '\u{2F35}' => Some(&['\u{5EF4}']),
-        '\u{2F36}' => Some(&['\u{5EFE}']),
-        '\u{2F37}' => Some(&['\u{5F0B}']),
-        '\u{2F38}' => Some(&['\u{5F13}']),
-        '\u{2F39}' => Some(&['\u{5F50}']),
-        '\u{2F3A}' => Some(&['\u{5F61}']),
-        '\u{2F3B}' => Some(&['\u{5F73}']),
-        '\u{2F3C}' => Some(&['\u{5FC3}']),
-        '\u{2F3D}' => Some(&['\u{6208}']),
-        '\u{2F3E}' => Some(&['\u{6236}']),
-        '\u{2F3F}' => Some(&['\u{624B}']),
-        '\u{2F40}' => Some(&['\u{652F}']),
-        '\u{2F41}' => Some(&['\u{6534}']),
-        '\u{2F42}' => Some(&['\u{6587}']),
-        '\u{2F43}' => Some(&['\u{6597}']),
-        '\u{2F44}' => Some(&['\u{65A4}']),
-        '\u{2F45}' => Some(&['\u{65B9}']),
-        '\u{2F46}' => Some(&['\u{65E0}']),
-        '\u{2F47}' => Some(&['\u{65E5}']),
-        '\u{2F48}' => Some(&['\u{66F0}']),
-        '\u{2F49}' => Some(&['\u{6708}']),
-        '\u{2F4A}' => Some(&['\u{6728}']),
-        '\u{2F4B}' => Some(&['\u{6B20}']),
-        '\u{2F4C}' => Some(&['\u{6B62}']),
-        '\u{2F4D}' => Some(&['\u{6B79}']),
-        '\u{2F4E}' => Some(&['\u{6BB3}']),
-        '\u{2F4F}' => Some(&['\u{6BCB}']),
-        '\u{2F50}' => Some(&['\u{6BD4}']),
-        '\u{2F51}' => Some(&['\u{6BDB}']),
-        '\u{2F52}' => Some(&['\u{6C0F}']),
-        '\u{2F53}' => Some(&['\u{6C14}']),
-        '\u{2F54}' => Some(&['\u{6C34}']),
-        '\u{2F55}' => Some(&['\u{706B}']),
-        '\u{2F56}' => Some(&['\u{722A}']),
-        '\u{2F57}' => Some(&['\u{7236}']),
-        '\u{2F58}' => Some(&['\u{723B}']),
-        '\u{2F59}' => Some(&['\u{723F}']),
-        '\u{2F5A}' => Some(&['\u{7247}']),
-        '\u{2F5B}' => Some(&['\u{7259}']),
-        '\u{2F5C}' => Some(&['\u{725B}']),
-        '\u{2F5D}' => Some(&['\u{72AC}']),
-        '\u{2F5E}' => Some(&['\u{7384}']),
-        '\u{2F5F}' => Some(&['\u{7389}']),
-        '\u{2F60}' => Some(&['\u{74DC}']),
-        '\u{2F61}' => Some(&['\u{74E6}']),
-        '\u{2F62}' => Some(&['\u{7518}']),
-        '\u{2F63}' => Some(&['\u{751F}']),
-        '\u{2F64}' => Some(&['\u{7528}']),
-        '\u{2F65}' => Some(&['\u{7530}']),
-        '\u{2F66}' => Some(&['\u{758B}']),
-        '\u{2F67}' => Some(&['\u{7592}']),
-        '\u{2F68}' => Some(&['\u{7676}']),
-        '\u{2F69}' => Some(&['\u{767D}']),
-        '\u{2F6A}' => Some(&['\u{76AE}']),
-        '\u{2F6B}' => Some(&['\u{76BF}']),
-        '\u{2F6C}' => Some(&['\u{76EE}']),
-        '\u{2F6D}' => Some(&['\u{77DB}']),
-        '\u{2F6E}' => Some(&['\u{77E2}']),
-        '\u{2F6F}' => Some(&['\u{77F3}']),
-        '\u{2F70}' => Some(&['\u{793A}']),
-        '\u{2F71}' => Some(&['\u{79B8}']),
-        '\u{2F72}' => Some(&['\u{79BE}']),
-        '\u{2F73}' => Some(&['\u{7A74}']),
-        '\u{2F74}' => Some(&['\u{7ACB}']),
-        '\u{2F75}' => Some(&['\u{7AF9}']),
-        '\u{2F76}' => Some(&['\u{7C73}']),
-        '\u{2F77}' => Some(&['\u{7CF8}']),
-        '\u{2F78}' => Some(&['\u{7F36}']),
-        '\u{2F79}' => Some(&['\u{7F51}']),
-        '\u{2F7A}' => Some(&['\u{7F8A}']),
-        '\u{2F7B}' => Some(&['\u{7FBD}']),
-        '\u{2F7C}' => Some(&['\u{8001}']),
-        '\u{2F7D}' => Some(&['\u{800C}']),
-        '\u{2F7E}' => Some(&['\u{8012}']),
-        '\u{2F7F}' => Some(&['\u{8033}']),
-        '\u{2F80}' => Some(&['\u{807F}']),
-        '\u{2F81}' => Some(&['\u{8089}']),
-        '\u{2F82}' => Some(&['\u{81E3}']),
-        '\u{2F83}' => Some(&['\u{81EA}']),
-        '\u{2F84}' => Some(&['\u{81F3}']),
-        '\u{2F85}' => Some(&['\u{81FC}']),
-        '\u{2F86}' => Some(&['\u{820C}']),
-        '\u{2F87}' => Some(&['\u{821B}']),
-        '\u{2F88}' => Some(&['\u{821F}']),
-        '\u{2F89}' => Some(&['\u{826E}']),
-        '\u{2F8A}' => Some(&['\u{8272}']),
-        '\u{2F8B}' => Some(&['\u{8278}']),
-        '\u{2F8C}' => Some(&['\u{864D}']),
-        '\u{2F8D}' => Some(&['\u{866B}']),
-        '\u{2F8E}' => Some(&['\u{8840}']),
-        '\u{2F8F}' => Some(&['\u{884C}']),
-        '\u{2F90}' => Some(&['\u{8863}']),
-        '\u{2F91}' => Some(&['\u{897E}']),
-        '\u{2F92}' => Some(&['\u{898B}']),
-        '\u{2F93}' => Some(&['\u{89D2}']),
-        '\u{2F94}' => Some(&['\u{8A00}']),
-        '\u{2F95}' => Some(&['\u{8C37}']),
-        '\u{2F96}' => Some(&['\u{8C46}']),
-        '\u{2F97}' => Some(&['\u{8C55}']),
-        '\u{2F98}' => Some(&['\u{8C78}']),
-        '\u{2F99}' => Some(&['\u{8C9D}']),
-        '\u{2F9A}' => Some(&['\u{8D64}']),
-        '\u{2F9B}' => Some(&['\u{8D70}']),
-        '\u{2F9C}' => Some(&['\u{8DB3}']),
-        '\u{2F9D}' => Some(&['\u{8EAB}']),
-        '\u{2F9E}' => Some(&['\u{8ECA}']),
-        '\u{2F9F}' => Some(&['\u{8F9B}']),
-        '\u{2FA0}' => Some(&['\u{8FB0}']),
-        '\u{2FA1}' => Some(&['\u{8FB5}']),
-        '\u{2FA2}' => Some(&['\u{9091}']),
-        '\u{2FA3}' => Some(&['\u{9149}']),
-        '\u{2FA4}' => Some(&['\u{91C6}']),
-        '\u{2FA5}' => Some(&['\u{91CC}']),
-        '\u{2FA6}' => Some(&['\u{91D1}']),
-        '\u{2FA7}' => Some(&['\u{9577}']),
-        '\u{2FA8}' => Some(&['\u{9580}']),
-        '\u{2FA9}' => Some(&['\u{961C}']),
-        '\u{2FAA}' => Some(&['\u{96B6}']),
-        '\u{2FAB}' => Some(&['\u{96B9}']),
-        '\u{2FAC}' => Some(&['\u{96E8}']),
-        '\u{2FAD}' => Some(&['\u{9751}']),
-        '\u{2FAE}' => Some(&['\u{975E}']),
-        '\u{2FAF}' => Some(&['\u{9762}']),
-        '\u{2FB0}' => Some(&['\u{9769}']),
-        '\u{2FB1}' => Some(&['\u{97CB}']),
-        '\u{2FB2}' => Some(&['\u{97ED}']),
-        '\u{2FB3}' => Some(&['\u{97F3}']),
-        '\u{2FB4}' => Some(&['\u{9801}']),
-        '\u{2FB5}' => Some(&['\u{98A8}']),
-        '\u{2FB6}' => Some(&['\u{98DB}']),
-        '\u{2FB7}' => Some(&['\u{98DF}']),
-        '\u{2FB8}' => Some(&['\u{9996}']),
-        '\u{2FB9}' => Some(&['\u{9999}']),
-        '\u{2FBA}' => Some(&['\u{99AC}']),
-        '\u{2FBB}' => Some(&['\u{9AA8}']),
-        '\u{2FBC}' => Some(&['\u{9AD8}']),
-        '\u{2FBD}' => Some(&['\u{9ADF}']),
-        '\u{2FBE}' => Some(&['\u{9B25}']),
-        '\u{2FBF}' => Some(&['\u{9B2F}']),
-        '\u{2FC0}' => Some(&['\u{9B32}']),
-        '\u{2FC1}' => Some(&['\u{9B3C}']),
-        '\u{2FC2}' => Some(&['\u{9B5A}']),
-        '\u{2FC3}' => Some(&['\u{9CE5}']),
-        '\u{2FC4}' => Some(&['\u{9E75}']),
-        '\u{2FC5}' => Some(&['\u{9E7F}']),
-        '\u{2FC6}' => Some(&['\u{9EA5}']),
-        '\u{2FC7}' => Some(&['\u{9EBB}']),
-        '\u{2FC8}' => Some(&['\u{9EC3}']),
-        '\u{2FC9}' => Some(&['\u{9ECD}']),
-        '\u{2FCA}' => Some(&['\u{9ED1}']),
-        '\u{2FCB}' => Some(&['\u{9EF9}']),
-        '\u{2FCC}' => Some(&['\u{9EFD}']),
-        '\u{2FCD}' => Some(&['\u{9F0E}']),
-        '\u{2FCE}' => Some(&['\u{9F13}']),
-        '\u{2FCF}' => Some(&['\u{9F20}']),
-        '\u{2FD0}' => Some(&['\u{9F3B}']),
-        '\u{2FD1}' => Some(&['\u{9F4A}']),
-        '\u{2FD2}' => Some(&['\u{9F52}']),
-        '\u{2FD3}' => Some(&['\u{9F8D}']),
-        '\u{2FD4}' => Some(&['\u{9F9C}']),
-        '\u{2FD5}' => Some(&['\u{9FA0}']),
-        '\u{3000}' => Some(&['\u{0020}']),
-        '\u{3036}' => Some(&['\u{3012}']),
-        '\u{3038}' => Some(&['\u{5341}']),
-        '\u{3039}' => Some(&['\u{5344}']),
-        '\u{303A}' => Some(&['\u{5345}']),
-        '\u{309B}' => Some(&['\u{0020}', '\u{3099}']),
-        '\u{309C}' => Some(&['\u{0020}', '\u{309A}']),
-        '\u{309F}' => Some(&['\u{3088}', '\u{308A}']),
-        '\u{30FF}' => Some(&['\u{30B3}', '\u{30C8}']),
-        '\u{3131}' => Some(&['\u{1100}']),
-        '\u{3132}' => Some(&['\u{1101}']),
-        '\u{3133}' => Some(&['\u{11AA}']),
-        '\u{3134}' => Some(&['\u{1102}']),
-        '\u{3135}' => Some(&['\u{11AC}']),
-        '\u{3136}' => Some(&['\u{11AD}']),
-        '\u{3137}' => Some(&['\u{1103}']),
-        '\u{3138}' => Some(&['\u{1104}']),
-        '\u{3139}' => Some(&['\u{1105}']),
-        '\u{313A}' => Some(&['\u{11B0}']),
-        '\u{313B}' => Some(&['\u{11B1}']),
-        '\u{313C}' => Some(&['\u{11B2}']),
-        '\u{313D}' => Some(&['\u{11B3}']),
-        '\u{313E}' => Some(&['\u{11B4}']),
-        '\u{313F}' => Some(&['\u{11B5}']),
-        '\u{3140}' => Some(&['\u{111A}']),
-        '\u{3141}' => Some(&['\u{1106}']),
-        '\u{3142}' => Some(&['\u{1107}']),
-        '\u{3143}' => Some(&['\u{1108}']),
-        '\u{3144}' => Some(&['\u{1121}']),
-        '\u{3145}' => Some(&['\u{1109}']),
-        '\u{3146}' => Some(&['\u{110A}']),
-        '\u{3147}' => Some(&['\u{110B}']),
-        '\u{3148}' => Some(&['\u{110C}']),
-        '\u{3149}' => Some(&['\u{110D}']),
-        '\u{314A}' => Some(&['\u{110E}']),
-        '\u{314B}' => Some(&['\u{110F}']),
-        '\u{314C}' => Some(&['\u{1110}']),
-        '\u{314D}' => Some(&['\u{1111}']),
-        '\u{314E}' => Some(&['\u{1112}']),
-        '\u{314F}' => Some(&['\u{1161}']),
-        '\u{3150}' => Some(&['\u{1162}']),
-        '\u{3151}' => Some(&['\u{1163}']),
-        '\u{3152}' => Some(&['\u{1164}']),
-        '\u{3153}' => Some(&['\u{1165}']),
-        '\u{3154}' => Some(&['\u{1166}']),
-        '\u{3155}' => Some(&['\u{1167}']),
-        '\u{3156}' => Some(&['\u{1168}']),
-        '\u{3157}' => Some(&['\u{1169}']),
-        '\u{3158}' => Some(&['\u{116A}']),
-        '\u{3159}' => Some(&['\u{116B}']),
-        '\u{315A}' => Some(&['\u{116C}']),
-        '\u{315B}' => Some(&['\u{116D}']),
-        '\u{315C}' => Some(&['\u{116E}']),
-        '\u{315D}' => Some(&['\u{116F}']),
-        '\u{315E}' => Some(&['\u{1170}']),
-        '\u{315F}' => Some(&['\u{1171}']),
-        '\u{3160}' => Some(&['\u{1172}']),
-        '\u{3161}' => Some(&['\u{1173}']),
-        '\u{3162}' => Some(&['\u{1174}']),
-        '\u{3163}' => Some(&['\u{1175}']),
-        '\u{3164}' => Some(&['\u{1160}']),
-        '\u{3165}' => Some(&['\u{1114}']),
-        '\u{3166}' => Some(&['\u{1115}']),
-        '\u{3167}' => Some(&['\u{11C7}']),
-        '\u{3168}' => Some(&['\u{11C8}']),
-        '\u{3169}' => Some(&['\u{11CC}']),
-        '\u{316A}' => Some(&['\u{11CE}']),
-        '\u{316B}' => Some(&['\u{11D3}']),
-        '\u{316C}' => Some(&['\u{11D7}']),
-        '\u{316D}' => Some(&['\u{11D9}']),
-        '\u{316E}' => Some(&['\u{111C}']),
-        '\u{316F}' => Some(&['\u{11DD}']),
-        '\u{3170}' => Some(&['\u{11DF}']),
-        '\u{3171}' => Some(&['\u{111D}']),
-        '\u{3172}' => Some(&['\u{111E}']),
-        '\u{3173}' => Some(&['\u{1120}']),
-        '\u{3174}' => Some(&['\u{1122}']),
-        '\u{3175}' => Some(&['\u{1123}']),
-        '\u{3176}' => Some(&['\u{1127}']),
-        '\u{3177}' => Some(&['\u{1129}']),
-        '\u{3178}' => Some(&['\u{112B}']),
-        '\u{3179}' => Some(&['\u{112C}']),
-        '\u{317A}' => Some(&['\u{112D}']),
-        '\u{317B}' => Some(&['\u{112E}']),
-        '\u{317C}' => Some(&['\u{112F}']),
-        '\u{317D}' => Some(&['\u{1132}']),
-        '\u{317E}' => Some(&['\u{1136}']),
-        '\u{317F}' => Some(&['\u{1140}']),
-        '\u{3180}' => Some(&['\u{1147}']),
-        '\u{3181}' => Some(&['\u{114C}']),
-        '\u{3182}' => Some(&['\u{11F1}']),
-        '\u{3183}' => Some(&['\u{11F2}']),
-        '\u{3184}' => Some(&['\u{1157}']),
-        '\u{3185}' => Some(&['\u{1158}']),
-        '\u{3186}' => Some(&['\u{1159}']),
-        '\u{3187}' => Some(&['\u{1184}']),
-        '\u{3188}' => Some(&['\u{1185}']),
-        '\u{3189}' => Some(&['\u{1188}']),
-        '\u{318A}' => Some(&['\u{1191}']),
-        '\u{318B}' => Some(&['\u{1192}']),
-        '\u{318C}' => Some(&['\u{1194}']),
-        '\u{318D}' => Some(&['\u{119E}']),
-        '\u{318E}' => Some(&['\u{11A1}']),
-        '\u{3192}' => Some(&['\u{4E00}']),
-        '\u{3193}' => Some(&['\u{4E8C}']),
-        '\u{3194}' => Some(&['\u{4E09}']),
-        '\u{3195}' => Some(&['\u{56DB}']),
-        '\u{3196}' => Some(&['\u{4E0A}']),
-        '\u{3197}' => Some(&['\u{4E2D}']),
-        '\u{3198}' => Some(&['\u{4E0B}']),
-        '\u{3199}' => Some(&['\u{7532}']),
-        '\u{319A}' => Some(&['\u{4E59}']),
-        '\u{319B}' => Some(&['\u{4E19}']),
-        '\u{319C}' => Some(&['\u{4E01}']),
-        '\u{319D}' => Some(&['\u{5929}']),
-        '\u{319E}' => Some(&['\u{5730}']),
-        '\u{319F}' => Some(&['\u{4EBA}']),
-        '\u{3200}' => Some(&['\u{0028}', '\u{1100}', '\u{0029}']),
-        '\u{3201}' => Some(&['\u{0028}', '\u{1102}', '\u{0029}']),
-        '\u{3202}' => Some(&['\u{0028}', '\u{1103}', '\u{0029}']),
-        '\u{3203}' => Some(&['\u{0028}', '\u{1105}', '\u{0029}']),
-        '\u{3204}' => Some(&['\u{0028}', '\u{1106}', '\u{0029}']),
-        '\u{3205}' => Some(&['\u{0028}', '\u{1107}', '\u{0029}']),
-        '\u{3206}' => Some(&['\u{0028}', '\u{1109}', '\u{0029}']),
-        '\u{3207}' => Some(&['\u{0028}', '\u{110B}', '\u{0029}']),
-        '\u{3208}' => Some(&['\u{0028}', '\u{110C}', '\u{0029}']),
-        '\u{3209}' => Some(&['\u{0028}', '\u{110E}', '\u{0029}']),
-        '\u{320A}' => Some(&['\u{0028}', '\u{110F}', '\u{0029}']),
-        '\u{320B}' => Some(&['\u{0028}', '\u{1110}', '\u{0029}']),
-        '\u{320C}' => Some(&['\u{0028}', '\u{1111}', '\u{0029}']),
-        '\u{320D}' => Some(&['\u{0028}', '\u{1112}', '\u{0029}']),
-        '\u{320E}' => Some(&['\u{0028}', '\u{1100}', '\u{1161}', '\u{0029}']),
-        '\u{320F}' => Some(&['\u{0028}', '\u{1102}', '\u{1161}', '\u{0029}']),
-        '\u{3210}' => Some(&['\u{0028}', '\u{1103}', '\u{1161}', '\u{0029}']),
-        '\u{3211}' => Some(&['\u{0028}', '\u{1105}', '\u{1161}', '\u{0029}']),
-        '\u{3212}' => Some(&['\u{0028}', '\u{1106}', '\u{1161}', '\u{0029}']),
-        '\u{3213}' => Some(&['\u{0028}', '\u{1107}', '\u{1161}', '\u{0029}']),
-        '\u{3214}' => Some(&['\u{0028}', '\u{1109}', '\u{1161}', '\u{0029}']),
-        '\u{3215}' => Some(&['\u{0028}', '\u{110B}', '\u{1161}', '\u{0029}']),
-        '\u{3216}' => Some(&['\u{0028}', '\u{110C}', '\u{1161}', '\u{0029}']),
-        '\u{3217}' => Some(&['\u{0028}', '\u{110E}', '\u{1161}', '\u{0029}']),
-        '\u{3218}' => Some(&['\u{0028}', '\u{110F}', '\u{1161}', '\u{0029}']),
-        '\u{3219}' => Some(&['\u{0028}', '\u{1110}', '\u{1161}', '\u{0029}']),
-        '\u{321A}' => Some(&['\u{0028}', '\u{1111}', '\u{1161}', '\u{0029}']),
-        '\u{321B}' => Some(&['\u{0028}', '\u{1112}', '\u{1161}', '\u{0029}']),
-        '\u{321C}' => Some(&['\u{0028}', '\u{110C}', '\u{116E}', '\u{0029}']),
-        '\u{321D}' => Some(&['\u{0028}', '\u{110B}', '\u{1169}', '\u{110C}', '\u{1165}', '\u{11AB}', '\u{0029}']),
-        '\u{321E}' => Some(&['\u{0028}', '\u{110B}', '\u{1169}', '\u{1112}', '\u{116E}', '\u{0029}']),
-        '\u{3220}' => Some(&['\u{0028}', '\u{4E00}', '\u{0029}']),
-        '\u{3221}' => Some(&['\u{0028}', '\u{4E8C}', '\u{0029}']),
-        '\u{3222}' => Some(&['\u{0028}', '\u{4E09}', '\u{0029}']),
-        '\u{3223}' => Some(&['\u{0028}', '\u{56DB}', '\u{0029}']),
-        '\u{3224}' => Some(&['\u{0028}', '\u{4E94}', '\u{0029}']),
-        '\u{3225}' => Some(&['\u{0028}', '\u{516D}', '\u{0029}']),
-        '\u{3226}' => Some(&['\u{0028}', '\u{4E03}', '\u{0029}']),
-        '\u{3227}' => Some(&['\u{0028}', '\u{516B}', '\u{0029}']),
-        '\u{3228}' => Some(&['\u{0028}', '\u{4E5D}', '\u{0029}']),
-        '\u{3229}' => Some(&['\u{0028}', '\u{5341}', '\u{0029}']),
-        '\u{322A}' => Some(&['\u{0028}', '\u{6708}', '\u{0029}']),
-        '\u{322B}' => Some(&['\u{0028}', '\u{706B}', '\u{0029}']),
-        '\u{322C}' => Some(&['\u{0028}', '\u{6C34}', '\u{0029}']),
-        '\u{322D}' => Some(&['\u{0028}', '\u{6728}', '\u{0029}']),
-        '\u{322E}' => Some(&['\u{0028}', '\u{91D1}', '\u{0029}']),
-        '\u{322F}' => Some(&['\u{0028}', '\u{571F}', '\u{0029}']),
-        '\u{3230}' => Some(&['\u{0028}', '\u{65E5}', '\u{0029}']),
-        '\u{3231}' => Some(&['\u{0028}', '\u{682A}', '\u{0029}']),
-        '\u{3232}' => Some(&['\u{0028}', '\u{6709}', '\u{0029}']),
-        '\u{3233}' => Some(&['\u{0028}', '\u{793E}', '\u{0029}']),
-        '\u{3234}' => Some(&['\u{0028}', '\u{540D}', '\u{0029}']),
-        '\u{3235}' => Some(&['\u{0028}', '\u{7279}', '\u{0029}']),
-        '\u{3236}' => Some(&['\u{0028}', '\u{8CA1}', '\u{0029}']),
-        '\u{3237}' => Some(&['\u{0028}', '\u{795D}', '\u{0029}']),
-        '\u{3238}' => Some(&['\u{0028}', '\u{52B4}', '\u{0029}']),
-        '\u{3239}' => Some(&['\u{0028}', '\u{4EE3}', '\u{0029}']),
-        '\u{323A}' => Some(&['\u{0028}', '\u{547C}', '\u{0029}']),
-        '\u{323B}' => Some(&['\u{0028}', '\u{5B66}', '\u{0029}']),
-        '\u{323C}' => Some(&['\u{0028}', '\u{76E3}', '\u{0029}']),
-        '\u{323D}' => Some(&['\u{0028}', '\u{4F01}', '\u{0029}']),
-        '\u{323E}' => Some(&['\u{0028}', '\u{8CC7}', '\u{0029}']),
-        '\u{323F}' => Some(&['\u{0028}', '\u{5354}', '\u{0029}']),
-        '\u{3240}' => Some(&['\u{0028}', '\u{796D}', '\u{0029}']),
-        '\u{3241}' => Some(&['\u{0028}', '\u{4F11}', '\u{0029}']),
-        '\u{3242}' => Some(&['\u{0028}', '\u{81EA}', '\u{0029}']),
-        '\u{3243}' => Some(&['\u{0028}', '\u{81F3}', '\u{0029}']),
-        '\u{3244}' => Some(&['\u{554F}']),
-        '\u{3245}' => Some(&['\u{5E7C}']),
-        '\u{3246}' => Some(&['\u{6587}']),
-        '\u{3247}' => Some(&['\u{7B8F}']),
-        '\u{3250}' => Some(&['\u{0050}', '\u{0054}', '\u{0045}']),
-        '\u{3251}' => Some(&['\u{0032}', '\u{0031}']),
-        '\u{3252}' => Some(&['\u{0032}', '\u{0032}']),
-        '\u{3253}' => Some(&['\u{0032}', '\u{0033}']),
-        '\u{3254}' => Some(&['\u{0032}', '\u{0034}']),
-        '\u{3255}' => Some(&['\u{0032}', '\u{0035}']),
-        '\u{3256}' => Some(&['\u{0032}', '\u{0036}']),
-        '\u{3257}' => Some(&['\u{0032}', '\u{0037}']),
-        '\u{3258}' => Some(&['\u{0032}', '\u{0038}']),
-        '\u{3259}' => Some(&['\u{0032}', '\u{0039}']),
-        '\u{325A}' => Some(&['\u{0033}', '\u{0030}']),
-        '\u{325B}' => Some(&['\u{0033}', '\u{0031}']),
-        '\u{325C}' => Some(&['\u{0033}', '\u{0032}']),
-        '\u{325D}' => Some(&['\u{0033}', '\u{0033}']),
-        '\u{325E}' => Some(&['\u{0033}', '\u{0034}']),
-        '\u{325F}' => Some(&['\u{0033}', '\u{0035}']),
-        '\u{3260}' => Some(&['\u{1100}']),
-        '\u{3261}' => Some(&['\u{1102}']),
-        '\u{3262}' => Some(&['\u{1103}']),
-        '\u{3263}' => Some(&['\u{1105}']),
-        '\u{3264}' => Some(&['\u{1106}']),
-        '\u{3265}' => Some(&['\u{1107}']),
-        '\u{3266}' => Some(&['\u{1109}']),
-        '\u{3267}' => Some(&['\u{110B}']),
-        '\u{3268}' => Some(&['\u{110C}']),
-        '\u{3269}' => Some(&['\u{110E}']),
-        '\u{326A}' => Some(&['\u{110F}']),
-        '\u{326B}' => Some(&['\u{1110}']),
-        '\u{326C}' => Some(&['\u{1111}']),
-        '\u{326D}' => Some(&['\u{1112}']),
-        '\u{326E}' => Some(&['\u{1100}', '\u{1161}']),
-        '\u{326F}' => Some(&['\u{1102}', '\u{1161}']),
-        '\u{3270}' => Some(&['\u{1103}', '\u{1161}']),
-        '\u{3271}' => Some(&['\u{1105}', '\u{1161}']),
-        '\u{3272}' => Some(&['\u{1106}', '\u{1161}']),
-        '\u{3273}' => Some(&['\u{1107}', '\u{1161}']),
-        '\u{3274}' => Some(&['\u{1109}', '\u{1161}']),
-        '\u{3275}' => Some(&['\u{110B}', '\u{1161}']),
-        '\u{3276}' => Some(&['\u{110C}', '\u{1161}']),
-        '\u{3277}' => Some(&['\u{110E}', '\u{1161}']),
-        '\u{3278}' => Some(&['\u{110F}', '\u{1161}']),
-        '\u{3279}' => Some(&['\u{1110}', '\u{1161}']),
-        '\u{327A}' => Some(&['\u{1111}', '\u{1161}']),
-        '\u{327B}' => Some(&['\u{1112}', '\u{1161}']),
-        '\u{327C}' => Some(&['\u{110E}', '\u{1161}', '\u{11B7}', '\u{1100}', '\u{1169}']),
-        '\u{327D}' => Some(&['\u{110C}', '\u{116E}', '\u{110B}', '\u{1174}']),
-        '\u{327E}' => Some(&['\u{110B}', '\u{116E}']),
-        '\u{3280}' => Some(&['\u{4E00}']),
-        '\u{3281}' => Some(&['\u{4E8C}']),
-        '\u{3282}' => Some(&['\u{4E09}']),
-        '\u{3283}' => Some(&['\u{56DB}']),
-        '\u{3284}' => Some(&['\u{4E94}']),
-        '\u{3285}' => Some(&['\u{516D}']),
-        '\u{3286}' => Some(&['\u{4E03}']),
-        '\u{3287}' => Some(&['\u{516B}']),
-        '\u{3288}' => Some(&['\u{4E5D}']),
-        '\u{3289}' => Some(&['\u{5341}']),
-        '\u{328A}' => Some(&['\u{6708}']),
-        '\u{328B}' => Some(&['\u{706B}']),
-        '\u{328C}' => Some(&['\u{6C34}']),
-        '\u{328D}' => Some(&['\u{6728}']),
-        '\u{328E}' => Some(&['\u{91D1}']),
-        '\u{328F}' => Some(&['\u{571F}']),
-        '\u{3290}' => Some(&['\u{65E5}']),
-        '\u{3291}' => Some(&['\u{682A}']),
-        '\u{3292}' => Some(&['\u{6709}']),
-        '\u{3293}' => Some(&['\u{793E}']),
-        '\u{3294}' => Some(&['\u{540D}']),
-        '\u{3295}' => Some(&['\u{7279}']),
-        '\u{3296}' => Some(&['\u{8CA1}']),
-        '\u{3297}' => Some(&['\u{795D}']),
-        '\u{3298}' => Some(&['\u{52B4}']),
-        '\u{3299}' => Some(&['\u{79D8}']),
-        '\u{329A}' => Some(&['\u{7537}']),
-        '\u{329B}' => Some(&['\u{5973}']),
-        '\u{329C}' => Some(&['\u{9069}']),
-        '\u{329D}' => Some(&['\u{512A}']),
-        '\u{329E}' => Some(&['\u{5370}']),
-        '\u{329F}' => Some(&['\u{6CE8}']),
-        '\u{32A0}' => Some(&['\u{9805}']),
-        '\u{32A1}' => Some(&['\u{4F11}']),
-        '\u{32A2}' => Some(&['\u{5199}']),
-        '\u{32A3}' => Some(&['\u{6B63}']),
-        '\u{32A4}' => Some(&['\u{4E0A}']),
-        '\u{32A5}' => Some(&['\u{4E2D}']),
-        '\u{32A6}' => Some(&['\u{4E0B}']),
-        '\u{32A7}' => Some(&['\u{5DE6}']),
-        '\u{32A8}' => Some(&['\u{53F3}']),
-        '\u{32A9}' => Some(&['\u{533B}']),
-        '\u{32AA}' => Some(&['\u{5B97}']),
-        '\u{32AB}' => Some(&['\u{5B66}']),
-        '\u{32AC}' => Some(&['\u{76E3}']),
-        '\u{32AD}' => Some(&['\u{4F01}']),
-        '\u{32AE}' => Some(&['\u{8CC7}']),
-        '\u{32AF}' => Some(&['\u{5354}']),
-        '\u{32B0}' => Some(&['\u{591C}']),
-        '\u{32B1}' => Some(&['\u{0033}', '\u{0036}']),
-        '\u{32B2}' => Some(&['\u{0033}', '\u{0037}']),
-        '\u{32B3}' => Some(&['\u{0033}', '\u{0038}']),
-        '\u{32B4}' => Some(&['\u{0033}', '\u{0039}']),
-        '\u{32B5}' => Some(&['\u{0034}', '\u{0030}']),
-        '\u{32B6}' => Some(&['\u{0034}', '\u{0031}']),
-        '\u{32B7}' => Some(&['\u{0034}', '\u{0032}']),
-        '\u{32B8}' => Some(&['\u{0034}', '\u{0033}']),
-        '\u{32B9}' => Some(&['\u{0034}', '\u{0034}']),
-        '\u{32BA}' => Some(&['\u{0034}', '\u{0035}']),
-        '\u{32BB}' => Some(&['\u{0034}', '\u{0036}']),
-        '\u{32BC}' => Some(&['\u{0034}', '\u{0037}']),
-        '\u{32BD}' => Some(&['\u{0034}', '\u{0038}']),
-        '\u{32BE}' => Some(&['\u{0034}', '\u{0039}']),
-        '\u{32BF}' => Some(&['\u{0035}', '\u{0030}']),
-        '\u{32C0}' => Some(&['\u{0031}', '\u{6708}']),
-        '\u{32C1}' => Some(&['\u{0032}', '\u{6708}']),
-        '\u{32C2}' => Some(&['\u{0033}', '\u{6708}']),
-        '\u{32C3}' => Some(&['\u{0034}', '\u{6708}']),
-        '\u{32C4}' => Some(&['\u{0035}', '\u{6708}']),
-        '\u{32C5}' => Some(&['\u{0036}', '\u{6708}']),
-        '\u{32C6}' => Some(&['\u{0037}', '\u{6708}']),
-        '\u{32C7}' => Some(&['\u{0038}', '\u{6708}']),
-        '\u{32C8}' => Some(&['\u{0039}', '\u{6708}']),
-        '\u{32C9}' => Some(&['\u{0031}', '\u{0030}', '\u{6708}']),
-        '\u{32CA}' => Some(&['\u{0031}', '\u{0031}', '\u{6708}']),
-        '\u{32CB}' => Some(&['\u{0031}', '\u{0032}', '\u{6708}']),
-        '\u{32CC}' => Some(&['\u{0048}', '\u{0067}']),
-        '\u{32CD}' => Some(&['\u{0065}', '\u{0072}', '\u{0067}']),
-        '\u{32CE}' => Some(&['\u{0065}', '\u{0056}']),
-        '\u{32CF}' => Some(&['\u{004C}', '\u{0054}', '\u{0044}']),
-        '\u{32D0}' => Some(&['\u{30A2}']),
-        '\u{32D1}' => Some(&['\u{30A4}']),
-        '\u{32D2}' => Some(&['\u{30A6}']),
-        '\u{32D3}' => Some(&['\u{30A8}']),
-        '\u{32D4}' => Some(&['\u{30AA}']),
-        '\u{32D5}' => Some(&['\u{30AB}']),
-        '\u{32D6}' => Some(&['\u{30AD}']),
-        '\u{32D7}' => Some(&['\u{30AF}']),
-        '\u{32D8}' => Some(&['\u{30B1}']),
-        '\u{32D9}' => Some(&['\u{30B3}']),
-        '\u{32DA}' => Some(&['\u{30B5}']),
-        '\u{32DB}' => Some(&['\u{30B7}']),
-        '\u{32DC}' => Some(&['\u{30B9}']),
-        '\u{32DD}' => Some(&['\u{30BB}']),
-        '\u{32DE}' => Some(&['\u{30BD}']),
-        '\u{32DF}' => Some(&['\u{30BF}']),
-        '\u{32E0}' => Some(&['\u{30C1}']),
-        '\u{32E1}' => Some(&['\u{30C4}']),
-        '\u{32E2}' => Some(&['\u{30C6}']),
-        '\u{32E3}' => Some(&['\u{30C8}']),
-        '\u{32E4}' => Some(&['\u{30CA}']),
-        '\u{32E5}' => Some(&['\u{30CB}']),
-        '\u{32E6}' => Some(&['\u{30CC}']),
-        '\u{32E7}' => Some(&['\u{30CD}']),
-        '\u{32E8}' => Some(&['\u{30CE}']),
-        '\u{32E9}' => Some(&['\u{30CF}']),
-        '\u{32EA}' => Some(&['\u{30D2}']),
-        '\u{32EB}' => Some(&['\u{30D5}']),
-        '\u{32EC}' => Some(&['\u{30D8}']),
-        '\u{32ED}' => Some(&['\u{30DB}']),
-        '\u{32EE}' => Some(&['\u{30DE}']),
-        '\u{32EF}' => Some(&['\u{30DF}']),
-        '\u{32F0}' => Some(&['\u{30E0}']),
-        '\u{32F1}' => Some(&['\u{30E1}']),
-        '\u{32F2}' => Some(&['\u{30E2}']),
-        '\u{32F3}' => Some(&['\u{30E4}']),
-        '\u{32F4}' => Some(&['\u{30E6}']),
-        '\u{32F5}' => Some(&['\u{30E8}']),
-        '\u{32F6}' => Some(&['\u{30E9}']),
-        '\u{32F7}' => Some(&['\u{30EA}']),
-        '\u{32F8}' => Some(&['\u{30EB}']),
-        '\u{32F9}' => Some(&['\u{30EC}']),
-        '\u{32FA}' => Some(&['\u{30ED}']),
-        '\u{32FB}' => Some(&['\u{30EF}']),
-        '\u{32FC}' => Some(&['\u{30F0}']),
-        '\u{32FD}' => Some(&['\u{30F1}']),
-        '\u{32FE}' => Some(&['\u{30F2}']),
-        '\u{3300}' => Some(&['\u{30A2}', '\u{30CF}', '\u{309A}', '\u{30FC}', '\u{30C8}']),
-        '\u{3301}' => Some(&['\u{30A2}', '\u{30EB}', '\u{30D5}', '\u{30A1}']),
-        '\u{3302}' => Some(&['\u{30A2}', '\u{30F3}', '\u{30D8}', '\u{309A}', '\u{30A2}']),
-        '\u{3303}' => Some(&['\u{30A2}', '\u{30FC}', '\u{30EB}']),
-        '\u{3304}' => Some(&['\u{30A4}', '\u{30CB}', '\u{30F3}', '\u{30AF}', '\u{3099}']),
-        '\u{3305}' => Some(&['\u{30A4}', '\u{30F3}', '\u{30C1}']),
-        '\u{3306}' => Some(&['\u{30A6}', '\u{30A9}', '\u{30F3}']),
-        '\u{3307}' => Some(&['\u{30A8}', '\u{30B9}', '\u{30AF}', '\u{30FC}', '\u{30C8}', '\u{3099}']),
-        '\u{3308}' => Some(&['\u{30A8}', '\u{30FC}', '\u{30AB}', '\u{30FC}']),
-        '\u{3309}' => Some(&['\u{30AA}', '\u{30F3}', '\u{30B9}']),
-        '\u{330A}' => Some(&['\u{30AA}', '\u{30FC}', '\u{30E0}']),
-        '\u{330B}' => Some(&['\u{30AB}', '\u{30A4}', '\u{30EA}']),
-        '\u{330C}' => Some(&['\u{30AB}', '\u{30E9}', '\u{30C3}', '\u{30C8}']),
-        '\u{330D}' => Some(&['\u{30AB}', '\u{30ED}', '\u{30EA}', '\u{30FC}']),
-        '\u{330E}' => Some(&['\u{30AB}', '\u{3099}', '\u{30ED}', '\u{30F3}']),
-        '\u{330F}' => Some(&['\u{30AB}', '\u{3099}', '\u{30F3}', '\u{30DE}']),
-        '\u{3310}' => Some(&['\u{30AD}', '\u{3099}', '\u{30AB}', '\u{3099}']),
-        '\u{3311}' => Some(&['\u{30AD}', '\u{3099}', '\u{30CB}', '\u{30FC}']),
-        '\u{3312}' => Some(&['\u{30AD}', '\u{30E5}', '\u{30EA}', '\u{30FC}']),
-        '\u{3313}' => Some(&['\u{30AD}', '\u{3099}', '\u{30EB}', '\u{30BF}', '\u{3099}', '\u{30FC}']),
-        '\u{3314}' => Some(&['\u{30AD}', '\u{30ED}']),
-        '\u{3315}' => Some(&['\u{30AD}', '\u{30ED}', '\u{30AF}', '\u{3099}', '\u{30E9}', '\u{30E0}']),
-        '\u{3316}' => Some(&['\u{30AD}', '\u{30ED}', '\u{30E1}', '\u{30FC}', '\u{30C8}', '\u{30EB}']),
-        '\u{3317}' => Some(&['\u{30AD}', '\u{30ED}', '\u{30EF}', '\u{30C3}', '\u{30C8}']),
-        '\u{3318}' => Some(&['\u{30AF}', '\u{3099}', '\u{30E9}', '\u{30E0}']),
-        '\u{3319}' => Some(&['\u{30AF}', '\u{3099}', '\u{30E9}', '\u{30E0}', '\u{30C8}', '\u{30F3}']),
-        '\u{331A}' => Some(&['\u{30AF}', '\u{30EB}', '\u{30BB}', '\u{3099}', '\u{30A4}', '\u{30ED}']),
-        '\u{331B}' => Some(&['\u{30AF}', '\u{30ED}', '\u{30FC}', '\u{30CD}']),
-        '\u{331C}' => Some(&['\u{30B1}', '\u{30FC}', '\u{30B9}']),
-        '\u{331D}' => Some(&['\u{30B3}', '\u{30EB}', '\u{30CA}']),
-        '\u{331E}' => Some(&['\u{30B3}', '\u{30FC}', '\u{30DB}', '\u{309A}']),
-        '\u{331F}' => Some(&['\u{30B5}', '\u{30A4}', '\u{30AF}', '\u{30EB}']),
-        '\u{3320}' => Some(&['\u{30B5}', '\u{30F3}', '\u{30C1}', '\u{30FC}', '\u{30E0}']),
-        '\u{3321}' => Some(&['\u{30B7}', '\u{30EA}', '\u{30F3}', '\u{30AF}', '\u{3099}']),
-        '\u{3322}' => Some(&['\u{30BB}', '\u{30F3}', '\u{30C1}']),
-        '\u{3323}' => Some(&['\u{30BB}', '\u{30F3}', '\u{30C8}']),
-        '\u{3324}' => Some(&['\u{30BF}', '\u{3099}', '\u{30FC}', '\u{30B9}']),
-        '\u{3325}' => Some(&['\u{30C6}', '\u{3099}', '\u{30B7}']),
-        '\u{3326}' => Some(&['\u{30C8}', '\u{3099}', '\u{30EB}']),
-        '\u{3327}' => Some(&['\u{30C8}', '\u{30F3}']),
-        '\u{3328}' => Some(&['\u{30CA}', '\u{30CE}']),
-        '\u{3329}' => Some(&['\u{30CE}', '\u{30C3}', '\u{30C8}']),
-        '\u{332A}' => Some(&['\u{30CF}', '\u{30A4}', '\u{30C4}']),
-        '\u{332B}' => Some(&['\u{30CF}', '\u{309A}', '\u{30FC}', '\u{30BB}', '\u{30F3}', '\u{30C8}']),
-        '\u{332C}' => Some(&['\u{30CF}', '\u{309A}', '\u{30FC}', '\u{30C4}']),
-        '\u{332D}' => Some(&['\u{30CF}', '\u{3099}', '\u{30FC}', '\u{30EC}', '\u{30EB}']),
-        '\u{332E}' => Some(&['\u{30D2}', '\u{309A}', '\u{30A2}', '\u{30B9}', '\u{30C8}', '\u{30EB}']),
-        '\u{332F}' => Some(&['\u{30D2}', '\u{309A}', '\u{30AF}', '\u{30EB}']),
-        '\u{3330}' => Some(&['\u{30D2}', '\u{309A}', '\u{30B3}']),
-        '\u{3331}' => Some(&['\u{30D2}', '\u{3099}', '\u{30EB}']),
-        '\u{3332}' => Some(&['\u{30D5}', '\u{30A1}', '\u{30E9}', '\u{30C3}', '\u{30C8}', '\u{3099}']),
-        '\u{3333}' => Some(&['\u{30D5}', '\u{30A3}', '\u{30FC}', '\u{30C8}']),
-        '\u{3334}' => Some(&['\u{30D5}', '\u{3099}', '\u{30C3}', '\u{30B7}', '\u{30A7}', '\u{30EB}']),
-        '\u{3335}' => Some(&['\u{30D5}', '\u{30E9}', '\u{30F3}']),
-        '\u{3336}' => Some(&['\u{30D8}', '\u{30AF}', '\u{30BF}', '\u{30FC}', '\u{30EB}']),
-        '\u{3337}' => Some(&['\u{30D8}', '\u{309A}', '\u{30BD}']),
-        '\u{3338}' => Some(&['\u{30D8}', '\u{309A}', '\u{30CB}', '\u{30D2}']),
-        '\u{3339}' => Some(&['\u{30D8}', '\u{30EB}', '\u{30C4}']),
-        '\u{333A}' => Some(&['\u{30D8}', '\u{309A}', '\u{30F3}', '\u{30B9}']),
-        '\u{333B}' => Some(&['\u{30D8}', '\u{309A}', '\u{30FC}', '\u{30B7}', '\u{3099}']),
-        '\u{333C}' => Some(&['\u{30D8}', '\u{3099}', '\u{30FC}', '\u{30BF}']),
-        '\u{333D}' => Some(&['\u{30DB}', '\u{309A}', '\u{30A4}', '\u{30F3}', '\u{30C8}']),
-        '\u{333E}' => Some(&['\u{30DB}', '\u{3099}', '\u{30EB}', '\u{30C8}']),
-        '\u{333F}' => Some(&['\u{30DB}', '\u{30F3}']),
-        '\u{3340}' => Some(&['\u{30DB}', '\u{309A}', '\u{30F3}', '\u{30C8}', '\u{3099}']),
-        '\u{3341}' => Some(&['\u{30DB}', '\u{30FC}', '\u{30EB}']),
-        '\u{3342}' => Some(&['\u{30DB}', '\u{30FC}', '\u{30F3}']),
-        '\u{3343}' => Some(&['\u{30DE}', '\u{30A4}', '\u{30AF}', '\u{30ED}']),
-        '\u{3344}' => Some(&['\u{30DE}', '\u{30A4}', '\u{30EB}']),
-        '\u{3345}' => Some(&['\u{30DE}', '\u{30C3}', '\u{30CF}']),
-        '\u{3346}' => Some(&['\u{30DE}', '\u{30EB}', '\u{30AF}']),
-        '\u{3347}' => Some(&['\u{30DE}', '\u{30F3}', '\u{30B7}', '\u{30E7}', '\u{30F3}']),
-        '\u{3348}' => Some(&['\u{30DF}', '\u{30AF}', '\u{30ED}', '\u{30F3}']),
-        '\u{3349}' => Some(&['\u{30DF}', '\u{30EA}']),
-        '\u{334A}' => Some(&['\u{30DF}', '\u{30EA}', '\u{30CF}', '\u{3099}', '\u{30FC}', '\u{30EB}']),
-        '\u{334B}' => Some(&['\u{30E1}', '\u{30AB}', '\u{3099}']),
-        '\u{334C}' => Some(&['\u{30E1}', '\u{30AB}', '\u{3099}', '\u{30C8}', '\u{30F3}']),
-        '\u{334D}' => Some(&['\u{30E1}', '\u{30FC}', '\u{30C8}', '\u{30EB}']),
-        '\u{334E}' => Some(&['\u{30E4}', '\u{30FC}', '\u{30C8}', '\u{3099}']),
-        '\u{334F}' => Some(&['\u{30E4}', '\u{30FC}', '\u{30EB}']),
-        '\u{3350}' => Some(&['\u{30E6}', '\u{30A2}', '\u{30F3}']),
-        '\u{3351}' => Some(&['\u{30EA}', '\u{30C3}', '\u{30C8}', '\u{30EB}']),
-        '\u{3352}' => Some(&['\u{30EA}', '\u{30E9}']),
-        '\u{3353}' => Some(&['\u{30EB}', '\u{30D2}', '\u{309A}', '\u{30FC}']),
-        '\u{3354}' => Some(&['\u{30EB}', '\u{30FC}', '\u{30D5}', '\u{3099}', '\u{30EB}']),
-        '\u{3355}' => Some(&['\u{30EC}', '\u{30E0}']),
-        '\u{3356}' => Some(&['\u{30EC}', '\u{30F3}', '\u{30C8}', '\u{30B1}', '\u{3099}', '\u{30F3}']),
-        '\u{3357}' => Some(&['\u{30EF}', '\u{30C3}', '\u{30C8}']),
-        '\u{3358}' => Some(&['\u{0030}', '\u{70B9}']),
-        '\u{3359}' => Some(&['\u{0031}', '\u{70B9}']),
-        '\u{335A}' => Some(&['\u{0032}', '\u{70B9}']),
-        '\u{335B}' => Some(&['\u{0033}', '\u{70B9}']),
-        '\u{335C}' => Some(&['\u{0034}', '\u{70B9}']),
-        '\u{335D}' => Some(&['\u{0035}', '\u{70B9}']),
-        '\u{335E}' => Some(&['\u{0036}', '\u{70B9}']),
-        '\u{335F}' => Some(&['\u{0037}', '\u{70B9}']),
-        '\u{3360}' => Some(&['\u{0038}', '\u{70B9}']),
-        '\u{3361}' => Some(&['\u{0039}', '\u{70B9}']),
-        '\u{3362}' => Some(&['\u{0031}', '\u{0030}', '\u{70B9}']),
-        '\u{3363}' => Some(&['\u{0031}', '\u{0031}', '\u{70B9}']),
-        '\u{3364}' => Some(&['\u{0031}', '\u{0032}', '\u{70B9}']),
-        '\u{3365}' => Some(&['\u{0031}', '\u{0033}', '\u{70B9}']),
-        '\u{3366}' => Some(&['\u{0031}', '\u{0034}', '\u{70B9}']),
-        '\u{3367}' => Some(&['\u{0031}', '\u{0035}', '\u{70B9}']),
-        '\u{3368}' => Some(&['\u{0031}', '\u{0036}', '\u{70B9}']),
-        '\u{3369}' => Some(&['\u{0031}', '\u{0037}', '\u{70B9}']),
-        '\u{336A}' => Some(&['\u{0031}', '\u{0038}', '\u{70B9}']),
-        '\u{336B}' => Some(&['\u{0031}', '\u{0039}', '\u{70B9}']),
-        '\u{336C}' => Some(&['\u{0032}', '\u{0030}', '\u{70B9}']),
-        '\u{336D}' => Some(&['\u{0032}', '\u{0031}', '\u{70B9}']),
-        '\u{336E}' => Some(&['\u{0032}', '\u{0032}', '\u{70B9}']),
-        '\u{336F}' => Some(&['\u{0032}', '\u{0033}', '\u{70B9}']),
-        '\u{3370}' => Some(&['\u{0032}', '\u{0034}', '\u{70B9}']),
-        '\u{3371}' => Some(&['\u{0068}', '\u{0050}', '\u{0061}']),
-        '\u{3372}' => Some(&['\u{0064}', '\u{0061}']),
-        '\u{3373}' => Some(&['\u{0041}', '\u{0055}']),
-        '\u{3374}' => Some(&['\u{0062}', '\u{0061}', '\u{0072}']),
-        '\u{3375}' => Some(&['\u{006F}', '\u{0056}']),
-        '\u{3376}' => Some(&['\u{0070}', '\u{0063}']),
-        '\u{3377}' => Some(&['\u{0064}', '\u{006D}']),
-        '\u{3378}' => Some(&['\u{0064}', '\u{006D}', '\u{0032}']),
-        '\u{3379}' => Some(&['\u{0064}', '\u{006D}', '\u{0033}']),
-        '\u{337A}' => Some(&['\u{0049}', '\u{0055}']),
-        '\u{337B}' => Some(&['\u{5E73}', '\u{6210}']),
-        '\u{337C}' => Some(&['\u{662D}', '\u{548C}']),
-        '\u{337D}' => Some(&['\u{5927}', '\u{6B63}']),
-        '\u{337E}' => Some(&['\u{660E}', '\u{6CBB}']),
-        '\u{337F}' => Some(&['\u{682A}', '\u{5F0F}', '\u{4F1A}', '\u{793E}']),
-        '\u{3380}' => Some(&['\u{0070}', '\u{0041}']),
-        '\u{3381}' => Some(&['\u{006E}', '\u{0041}']),
-        '\u{3382}' => Some(&['\u{03BC}', '\u{0041}']),
-        '\u{3383}' => Some(&['\u{006D}', '\u{0041}']),
-        '\u{3384}' => Some(&['\u{006B}', '\u{0041}']),
-        '\u{3385}' => Some(&['\u{004B}', '\u{0042}']),
-        '\u{3386}' => Some(&['\u{004D}', '\u{0042}']),
-        '\u{3387}' => Some(&['\u{0047}', '\u{0042}']),
-        '\u{3388}' => Some(&['\u{0063}', '\u{0061}', '\u{006C}']),
-        '\u{3389}' => Some(&['\u{006B}', '\u{0063}', '\u{0061}', '\u{006C}']),
-        '\u{338A}' => Some(&['\u{0070}', '\u{0046}']),
-        '\u{338B}' => Some(&['\u{006E}', '\u{0046}']),
-        '\u{338C}' => Some(&['\u{03BC}', '\u{0046}']),
-        '\u{338D}' => Some(&['\u{03BC}', '\u{0067}']),
-        '\u{338E}' => Some(&['\u{006D}', '\u{0067}']),
-        '\u{338F}' => Some(&['\u{006B}', '\u{0067}']),
-        '\u{3390}' => Some(&['\u{0048}', '\u{007A}']),
-        '\u{3391}' => Some(&['\u{006B}', '\u{0048}', '\u{007A}']),
-        '\u{3392}' => Some(&['\u{004D}', '\u{0048}', '\u{007A}']),
-        '\u{3393}' => Some(&['\u{0047}', '\u{0048}', '\u{007A}']),
-        '\u{3394}' => Some(&['\u{0054}', '\u{0048}', '\u{007A}']),
-        '\u{3395}' => Some(&['\u{03BC}', '\u{006C}']),
-        '\u{3396}' => Some(&['\u{006D}', '\u{006C}']),
-        '\u{3397}' => Some(&['\u{0064}', '\u{006C}']),
-        '\u{3398}' => Some(&['\u{006B}', '\u{006C}']),
-        '\u{3399}' => Some(&['\u{0066}', '\u{006D}']),
-        '\u{339A}' => Some(&['\u{006E}', '\u{006D}']),
-        '\u{339B}' => Some(&['\u{03BC}', '\u{006D}']),
-        '\u{339C}' => Some(&['\u{006D}', '\u{006D}']),
-        '\u{339D}' => Some(&['\u{0063}', '\u{006D}']),
-        '\u{339E}' => Some(&['\u{006B}', '\u{006D}']),
-        '\u{339F}' => Some(&['\u{006D}', '\u{006D}', '\u{0032}']),
-        '\u{33A0}' => Some(&['\u{0063}', '\u{006D}', '\u{0032}']),
-        '\u{33A1}' => Some(&['\u{006D}', '\u{0032}']),
-        '\u{33A2}' => Some(&['\u{006B}', '\u{006D}', '\u{0032}']),
-        '\u{33A3}' => Some(&['\u{006D}', '\u{006D}', '\u{0033}']),
-        '\u{33A4}' => Some(&['\u{0063}', '\u{006D}', '\u{0033}']),
-        '\u{33A5}' => Some(&['\u{006D}', '\u{0033}']),
-        '\u{33A6}' => Some(&['\u{006B}', '\u{006D}', '\u{0033}']),
-        '\u{33A7}' => Some(&['\u{006D}', '\u{2215}', '\u{0073}']),
-        '\u{33A8}' => Some(&['\u{006D}', '\u{2215}', '\u{0073}', '\u{0032}']),
-        '\u{33A9}' => Some(&['\u{0050}', '\u{0061}']),
-        '\u{33AA}' => Some(&['\u{006B}', '\u{0050}', '\u{0061}']),
-        '\u{33AB}' => Some(&['\u{004D}', '\u{0050}', '\u{0061}']),
-        '\u{33AC}' => Some(&['\u{0047}', '\u{0050}', '\u{0061}']),
-        '\u{33AD}' => Some(&['\u{0072}', '\u{0061}', '\u{0064}']),
-        '\u{33AE}' => Some(&['\u{0072}', '\u{0061}', '\u{0064}', '\u{2215}', '\u{0073}']),
-        '\u{33AF}' => Some(&['\u{0072}', '\u{0061}', '\u{0064}', '\u{2215}', '\u{0073}', '\u{0032}']),
-        '\u{33B0}' => Some(&['\u{0070}', '\u{0073}']),
-        '\u{33B1}' => Some(&['\u{006E}', '\u{0073}']),
-        '\u{33B2}' => Some(&['\u{03BC}', '\u{0073}']),
-        '\u{33B3}' => Some(&['\u{006D}', '\u{0073}']),
-        '\u{33B4}' => Some(&['\u{0070}', '\u{0056}']),
-        '\u{33B5}' => Some(&['\u{006E}', '\u{0056}']),
-        '\u{33B6}' => Some(&['\u{03BC}', '\u{0056}']),
-        '\u{33B7}' => Some(&['\u{006D}', '\u{0056}']),
-        '\u{33B8}' => Some(&['\u{006B}', '\u{0056}']),
-        '\u{33B9}' => Some(&['\u{004D}', '\u{0056}']),
-        '\u{33BA}' => Some(&['\u{0070}', '\u{0057}']),
-        '\u{33BB}' => Some(&['\u{006E}', '\u{0057}']),
-        '\u{33BC}' => Some(&['\u{03BC}', '\u{0057}']),
-        '\u{33BD}' => Some(&['\u{006D}', '\u{0057}']),
-        '\u{33BE}' => Some(&['\u{006B}', '\u{0057}']),
-        '\u{33BF}' => Some(&['\u{004D}', '\u{0057}']),
-        '\u{33C0}' => Some(&['\u{006B}', '\u{03A9}']),
-        '\u{33C1}' => Some(&['\u{004D}', '\u{03A9}']),
-        '\u{33C2}' => Some(&['\u{0061}', '\u{002E}', '\u{006D}', '\u{002E}']),
-        '\u{33C3}' => Some(&['\u{0042}', '\u{0071}']),
-        '\u{33C4}' => Some(&['\u{0063}', '\u{0063}']),
-        '\u{33C5}' => Some(&['\u{0063}', '\u{0064}']),
-        '\u{33C6}' => Some(&['\u{0043}', '\u{2215}', '\u{006B}', '\u{0067}']),
-        '\u{33C7}' => Some(&['\u{0043}', '\u{006F}', '\u{002E}']),
-        '\u{33C8}' => Some(&['\u{0064}', '\u{0042}']),
-        '\u{33C9}' => Some(&['\u{0047}', '\u{0079}']),
-        '\u{33CA}' => Some(&['\u{0068}', '\u{0061}']),
-        '\u{33CB}' => Some(&['\u{0048}', '\u{0050}']),
-        '\u{33CC}' => Some(&['\u{0069}', '\u{006E}']),
-        '\u{33CD}' => Some(&['\u{004B}', '\u{004B}']),
-        '\u{33CE}' => Some(&['\u{004B}', '\u{004D}']),
-        '\u{33CF}' => Some(&['\u{006B}', '\u{0074}']),
-        '\u{33D0}' => Some(&['\u{006C}', '\u{006D}']),
-        '\u{33D1}' => Some(&['\u{006C}', '\u{006E}']),
-        '\u{33D2}' => Some(&['\u{006C}', '\u{006F}', '\u{0067}']),
-        '\u{33D3}' => Some(&['\u{006C}', '\u{0078}']),
-        '\u{33D4}' => Some(&['\u{006D}', '\u{0062}']),
-        '\u{33D5}' => Some(&['\u{006D}', '\u{0069}', '\u{006C}']),
-        '\u{33D6}' => Some(&['\u{006D}', '\u{006F}', '\u{006C}']),
-        '\u{33D7}' => Some(&['\u{0050}', '\u{0048}']),
-        '\u{33D8}' => Some(&['\u{0070}', '\u{002E}', '\u{006D}', '\u{002E}']),
-        '\u{33D9}' => Some(&['\u{0050}', '\u{0050}', '\u{004D}']),
-        '\u{33DA}' => Some(&['\u{0050}', '\u{0052}']),
-        '\u{33DB}' => Some(&['\u{0073}', '\u{0072}']),
-        '\u{33DC}' => Some(&['\u{0053}', '\u{0076}']),
-        '\u{33DD}' => Some(&['\u{0057}', '\u{0062}']),
-        '\u{33DE}' => Some(&['\u{0056}', '\u{2215}', '\u{006D}']),
-        '\u{33DF}' => Some(&['\u{0041}', '\u{2215}', '\u{006D}']),
-        '\u{33E0}' => Some(&['\u{0031}', '\u{65E5}']),
-        '\u{33E1}' => Some(&['\u{0032}', '\u{65E5}']),
-        '\u{33E2}' => Some(&['\u{0033}', '\u{65E5}']),
-        '\u{33E3}' => Some(&['\u{0034}', '\u{65E5}']),
-        '\u{33E4}' => Some(&['\u{0035}', '\u{65E5}']),
-        '\u{33E5}' => Some(&['\u{0036}', '\u{65E5}']),
-        '\u{33E6}' => Some(&['\u{0037}', '\u{65E5}']),
-        '\u{33E7}' => Some(&['\u{0038}', '\u{65E5}']),
-        '\u{33E8}' => Some(&['\u{0039}', '\u{65E5}']),
-        '\u{33E9}' => Some(&['\u{0031}', '\u{0030}', '\u{65E5}']),
-        '\u{33EA}' => Some(&['\u{0031}', '\u{0031}', '\u{65E5}']),
-        '\u{33EB}' => Some(&['\u{0031}', '\u{0032}', '\u{65E5}']),
-        '\u{33EC}' => Some(&['\u{0031}', '\u{0033}', '\u{65E5}']),
-        '\u{33ED}' => Some(&['\u{0031}', '\u{0034}', '\u{65E5}']),
-        '\u{33EE}' => Some(&['\u{0031}', '\u{0035}', '\u{65E5}']),
-        '\u{33EF}' => Some(&['\u{0031}', '\u{0036}', '\u{65E5}']),
-        '\u{33F0}' => Some(&['\u{0031}', '\u{0037}', '\u{65E5}']),
-        '\u{33F1}' => Some(&['\u{0031}', '\u{0038}', '\u{65E5}']),
-        '\u{33F2}' => Some(&['\u{0031}', '\u{0039}', '\u{65E5}']),
-        '\u{33F3}' => Some(&['\u{0032}', '\u{0030}', '\u{65E5}']),
-        '\u{33F4}' => Some(&['\u{0032}', '\u{0031}', '\u{65E5}']),
-        '\u{33F5}' => Some(&['\u{0032}', '\u{0032}', '\u{65E5}']),
-        '\u{33F6}' => Some(&['\u{0032}', '\u{0033}', '\u{65E5}']),
-        '\u{33F7}' => Some(&['\u{0032}', '\u{0034}', '\u{65E5}']),
-        '\u{33F8}' => Some(&['\u{0032}', '\u{0035}', '\u{65E5}']),
-        '\u{33F9}' => Some(&['\u{0032}', '\u{0036}', '\u{65E5}']),
-        '\u{33FA}' => Some(&['\u{0032}', '\u{0037}', '\u{65E5}']),
-        '\u{33FB}' => Some(&['\u{0032}', '\u{0038}', '\u{65E5}']),
-        '\u{33FC}' => Some(&['\u{0032}', '\u{0039}', '\u{65E5}']),
-        '\u{33FD}' => Some(&['\u{0033}', '\u{0030}', '\u{65E5}']),
-        '\u{33FE}' => Some(&['\u{0033}', '\u{0031}', '\u{65E5}']),
-        '\u{33FF}' => Some(&['\u{0067}', '\u{0061}', '\u{006C}']),
-        '\u{A69C}' => Some(&['\u{044A}']),
-        '\u{A69D}' => Some(&['\u{044C}']),
-        '\u{A770}' => Some(&['\u{A76F}']),
-        '\u{A7F8}' => Some(&['\u{0126}']),
-        '\u{A7F9}' => Some(&['\u{0153}']),
-        '\u{AB5C}' => Some(&['\u{A727}']),
-        '\u{AB5D}' => Some(&['\u{AB37}']),
-        '\u{AB5E}' => Some(&['\u{026B}']),
-        '\u{AB5F}' => Some(&['\u{AB52}']),
-        '\u{FB00}' => Some(&['\u{0066}', '\u{0066}']),
-        '\u{FB01}' => Some(&['\u{0066}', '\u{0069}']),
-        '\u{FB02}' => Some(&['\u{0066}', '\u{006C}']),
-        '\u{FB03}' => Some(&['\u{0066}', '\u{0066}', '\u{0069}']),
-        '\u{FB04}' => Some(&['\u{0066}', '\u{0066}', '\u{006C}']),
-        '\u{FB05}' => Some(&['\u{0073}', '\u{0074}']),
-        '\u{FB06}' => Some(&['\u{0073}', '\u{0074}']),
-        '\u{FB13}' => Some(&['\u{0574}', '\u{0576}']),
-        '\u{FB14}' => Some(&['\u{0574}', '\u{0565}']),
-        '\u{FB15}' => Some(&['\u{0574}', '\u{056B}']),
-        '\u{FB16}' => Some(&['\u{057E}', '\u{0576}']),
-        '\u{FB17}' => Some(&['\u{0574}', '\u{056D}']),
-        '\u{FB20}' => Some(&['\u{05E2}']),
-        '\u{FB21}' => Some(&['\u{05D0}']),
-        '\u{FB22}' => Some(&['\u{05D3}']),
-        '\u{FB23}' => Some(&['\u{05D4}']),
-        '\u{FB24}' => Some(&['\u{05DB}']),
-        '\u{FB25}' => Some(&['\u{05DC}']),
-        '\u{FB26}' => Some(&['\u{05DD}']),
-        '\u{FB27}' => Some(&['\u{05E8}']),
-        '\u{FB28}' => Some(&['\u{05EA}']),
-        '\u{FB29}' => Some(&['\u{002B}']),
-        '\u{FB4F}' => Some(&['\u{05D0}', '\u{05DC}']),
-        '\u{FB50}' => Some(&['\u{0671}']),
-        '\u{FB51}' => Some(&['\u{0671}']),
-        '\u{FB52}' => Some(&['\u{067B}']),
-        '\u{FB53}' => Some(&['\u{067B}']),
-        '\u{FB54}' => Some(&['\u{067B}']),
-        '\u{FB55}' => Some(&['\u{067B}']),
-        '\u{FB56}' => Some(&['\u{067E}']),
-        '\u{FB57}' => Some(&['\u{067E}']),
-        '\u{FB58}' => Some(&['\u{067E}']),
-        '\u{FB59}' => Some(&['\u{067E}']),
-        '\u{FB5A}' => Some(&['\u{0680}']),
-        '\u{FB5B}' => Some(&['\u{0680}']),
-        '\u{FB5C}' => Some(&['\u{0680}']),
-        '\u{FB5D}' => Some(&['\u{0680}']),
-        '\u{FB5E}' => Some(&['\u{067A}']),
-        '\u{FB5F}' => Some(&['\u{067A}']),
-        '\u{FB60}' => Some(&['\u{067A}']),
-        '\u{FB61}' => Some(&['\u{067A}']),
-        '\u{FB62}' => Some(&['\u{067F}']),
-        '\u{FB63}' => Some(&['\u{067F}']),
-        '\u{FB64}' => Some(&['\u{067F}']),
-        '\u{FB65}' => Some(&['\u{067F}']),
-        '\u{FB66}' => Some(&['\u{0679}']),
-        '\u{FB67}' => Some(&['\u{0679}']),
-        '\u{FB68}' => Some(&['\u{0679}']),
-        '\u{FB69}' => Some(&['\u{0679}']),
-        '\u{FB6A}' => Some(&['\u{06A4}']),
-        '\u{FB6B}' => Some(&['\u{06A4}']),
-        '\u{FB6C}' => Some(&['\u{06A4}']),
-        '\u{FB6D}' => Some(&['\u{06A4}']),
-        '\u{FB6E}' => Some(&['\u{06A6}']),
-        '\u{FB6F}' => Some(&['\u{06A6}']),
-        '\u{FB70}' => Some(&['\u{06A6}']),
-        '\u{FB71}' => Some(&['\u{06A6}']),
-        '\u{FB72}' => Some(&['\u{0684}']),
-        '\u{FB73}' => Some(&['\u{0684}']),
-        '\u{FB74}' => Some(&['\u{0684}']),
-        '\u{FB75}' => Some(&['\u{0684}']),
-        '\u{FB76}' => Some(&['\u{0683}']),
-        '\u{FB77}' => Some(&['\u{0683}']),
-        '\u{FB78}' => Some(&['\u{0683}']),
-        '\u{FB79}' => Some(&['\u{0683}']),
-        '\u{FB7A}' => Some(&['\u{0686}']),
-        '\u{FB7B}' => Some(&['\u{0686}']),
-        '\u{FB7C}' => Some(&['\u{0686}']),
-        '\u{FB7D}' => Some(&['\u{0686}']),
-        '\u{FB7E}' => Some(&['\u{0687}']),
-        '\u{FB7F}' => Some(&['\u{0687}']),
-        '\u{FB80}' => Some(&['\u{0687}']),
-        '\u{FB81}' => Some(&['\u{0687}']),
-        '\u{FB82}' => Some(&['\u{068D}']),
-        '\u{FB83}' => Some(&['\u{068D}']),
-        '\u{FB84}' => Some(&['\u{068C}']),
-        '\u{FB85}' => Some(&['\u{068C}']),
-        '\u{FB86}' => Some(&['\u{068E}']),
-        '\u{FB87}' => Some(&['\u{068E}']),
-        '\u{FB88}' => Some(&['\u{0688}']),
-        '\u{FB89}' => Some(&['\u{0688}']),
-        '\u{FB8A}' => Some(&['\u{0698}']),
-        '\u{FB8B}' => Some(&['\u{0698}']),
-        '\u{FB8C}' => Some(&['\u{0691}']),
-        '\u{FB8D}' => Some(&['\u{0691}']),
-        '\u{FB8E}' => Some(&['\u{06A9}']),
-        '\u{FB8F}' => Some(&['\u{06A9}']),
-        '\u{FB90}' => Some(&['\u{06A9}']),
-        '\u{FB91}' => Some(&['\u{06A9}']),
-        '\u{FB92}' => Some(&['\u{06AF}']),
-        '\u{FB93}' => Some(&['\u{06AF}']),
-        '\u{FB94}' => Some(&['\u{06AF}']),
-        '\u{FB95}' => Some(&['\u{06AF}']),
-        '\u{FB96}' => Some(&['\u{06B3}']),
-        '\u{FB97}' => Some(&['\u{06B3}']),
-        '\u{FB98}' => Some(&['\u{06B3}']),
-        '\u{FB99}' => Some(&['\u{06B3}']),
-        '\u{FB9A}' => Some(&['\u{06B1}']),
-        '\u{FB9B}' => Some(&['\u{06B1}']),
-        '\u{FB9C}' => Some(&['\u{06B1}']),
-        '\u{FB9D}' => Some(&['\u{06B1}']),
-        '\u{FB9E}' => Some(&['\u{06BA}']),
-        '\u{FB9F}' => Some(&['\u{06BA}']),
-        '\u{FBA0}' => Some(&['\u{06BB}']),
-        '\u{FBA1}' => Some(&['\u{06BB}']),
-        '\u{FBA2}' => Some(&['\u{06BB}']),
-        '\u{FBA3}' => Some(&['\u{06BB}']),
-        '\u{FBA4}' => Some(&['\u{06D5}', '\u{0654}']),
-        '\u{FBA5}' => Some(&['\u{06D5}', '\u{0654}']),
-        '\u{FBA6}' => Some(&['\u{06C1}']),
-        '\u{FBA7}' => Some(&['\u{06C1}']),
-        '\u{FBA8}' => Some(&['\u{06C1}']),
-        '\u{FBA9}' => Some(&['\u{06C1}']),
-        '\u{FBAA}' => Some(&['\u{06BE}']),
-        '\u{FBAB}' => Some(&['\u{06BE}']),
-        '\u{FBAC}' => Some(&['\u{06BE}']),
-        '\u{FBAD}' => Some(&['\u{06BE}']),
-        '\u{FBAE}' => Some(&['\u{06D2}']),
-        '\u{FBAF}' => Some(&['\u{06D2}']),
-        '\u{FBB0}' => Some(&['\u{06D2}', '\u{0654}']),
-        '\u{FBB1}' => Some(&['\u{06D2}', '\u{0654}']),
-        '\u{FBD3}' => Some(&['\u{06AD}']),
-        '\u{FBD4}' => Some(&['\u{06AD}']),
-        '\u{FBD5}' => Some(&['\u{06AD}']),
-        '\u{FBD6}' => Some(&['\u{06AD}']),
-        '\u{FBD7}' => Some(&['\u{06C7}']),
-        '\u{FBD8}' => Some(&['\u{06C7}']),
-        '\u{FBD9}' => Some(&['\u{06C6}']),
-        '\u{FBDA}' => Some(&['\u{06C6}']),
-        '\u{FBDB}' => Some(&['\u{06C8}']),
-        '\u{FBDC}' => Some(&['\u{06C8}']),
-        '\u{FBDD}' => Some(&['\u{06C7}', '\u{0674}']),
-        '\u{FBDE}' => Some(&['\u{06CB}']),
-        '\u{FBDF}' => Some(&['\u{06CB}']),
-        '\u{FBE0}' => Some(&['\u{06C5}']),
-        '\u{FBE1}' => Some(&['\u{06C5}']),
-        '\u{FBE2}' => Some(&['\u{06C9}']),
-        '\u{FBE3}' => Some(&['\u{06C9}']),
-        '\u{FBE4}' => Some(&['\u{06D0}']),
-        '\u{FBE5}' => Some(&['\u{06D0}']),
-        '\u{FBE6}' => Some(&['\u{06D0}']),
-        '\u{FBE7}' => Some(&['\u{06D0}']),
-        '\u{FBE8}' => Some(&['\u{0649}']),
-        '\u{FBE9}' => Some(&['\u{0649}']),
-        '\u{FBEA}' => Some(&['\u{064A}', '\u{0654}', '\u{0627}']),
-        '\u{FBEB}' => Some(&['\u{064A}', '\u{0654}', '\u{0627}']),
-        '\u{FBEC}' => Some(&['\u{064A}', '\u{0654}', '\u{06D5}']),
-        '\u{FBED}' => Some(&['\u{064A}', '\u{0654}', '\u{06D5}']),
-        '\u{FBEE}' => Some(&['\u{064A}', '\u{0654}', '\u{0648}']),
-        '\u{FBEF}' => Some(&['\u{064A}', '\u{0654}', '\u{0648}']),
-        '\u{FBF0}' => Some(&['\u{064A}', '\u{0654}', '\u{06C7}']),
-        '\u{FBF1}' => Some(&['\u{064A}', '\u{0654}', '\u{06C7}']),
-        '\u{FBF2}' => Some(&['\u{064A}', '\u{0654}', '\u{06C6}']),
-        '\u{FBF3}' => Some(&['\u{064A}', '\u{0654}', '\u{06C6}']),
-        '\u{FBF4}' => Some(&['\u{064A}', '\u{0654}', '\u{06C8}']),
-        '\u{FBF5}' => Some(&['\u{064A}', '\u{0654}', '\u{06C8}']),
-        '\u{FBF6}' => Some(&['\u{064A}', '\u{0654}', '\u{06D0}']),
-        '\u{FBF7}' => Some(&['\u{064A}', '\u{0654}', '\u{06D0}']),
-        '\u{FBF8}' => Some(&['\u{064A}', '\u{0654}', '\u{06D0}']),
-        '\u{FBF9}' => Some(&['\u{064A}', '\u{0654}', '\u{0649}']),
-        '\u{FBFA}' => Some(&['\u{064A}', '\u{0654}', '\u{0649}']),
-        '\u{FBFB}' => Some(&['\u{064A}', '\u{0654}', '\u{0649}']),
-        '\u{FBFC}' => Some(&['\u{06CC}']),
-        '\u{FBFD}' => Some(&['\u{06CC}']),
-        '\u{FBFE}' => Some(&['\u{06CC}']),
-        '\u{FBFF}' => Some(&['\u{06CC}']),
-        '\u{FC00}' => Some(&['\u{064A}', '\u{0654}', '\u{062C}']),
-        '\u{FC01}' => Some(&['\u{064A}', '\u{0654}', '\u{062D}']),
-        '\u{FC02}' => Some(&['\u{064A}', '\u{0654}', '\u{0645}']),
-        '\u{FC03}' => Some(&['\u{064A}', '\u{0654}', '\u{0649}']),
-        '\u{FC04}' => Some(&['\u{064A}', '\u{0654}', '\u{064A}']),
-        '\u{FC05}' => Some(&['\u{0628}', '\u{062C}']),
-        '\u{FC06}' => Some(&['\u{0628}', '\u{062D}']),
-        '\u{FC07}' => Some(&['\u{0628}', '\u{062E}']),
-        '\u{FC08}' => Some(&['\u{0628}', '\u{0645}']),
-        '\u{FC09}' => Some(&['\u{0628}', '\u{0649}']),
-        '\u{FC0A}' => Some(&['\u{0628}', '\u{064A}']),
-        '\u{FC0B}' => Some(&['\u{062A}', '\u{062C}']),
-        '\u{FC0C}' => Some(&['\u{062A}', '\u{062D}']),
-        '\u{FC0D}' => Some(&['\u{062A}', '\u{062E}']),
-        '\u{FC0E}' => Some(&['\u{062A}', '\u{0645}']),
-        '\u{FC0F}' => Some(&['\u{062A}', '\u{0649}']),
-        '\u{FC10}' => Some(&['\u{062A}', '\u{064A}']),
-        '\u{FC11}' => Some(&['\u{062B}', '\u{062C}']),
-        '\u{FC12}' => Some(&['\u{062B}', '\u{0645}']),
-        '\u{FC13}' => Some(&['\u{062B}', '\u{0649}']),
-        '\u{FC14}' => Some(&['\u{062B}', '\u{064A}']),
-        '\u{FC15}' => Some(&['\u{062C}', '\u{062D}']),
-        '\u{FC16}' => Some(&['\u{062C}', '\u{0645}']),
-        '\u{FC17}' => Some(&['\u{062D}', '\u{062C}']),
-        '\u{FC18}' => Some(&['\u{062D}', '\u{0645}']),
-        '\u{FC19}' => Some(&['\u{062E}', '\u{062C}']),
-        '\u{FC1A}' => Some(&['\u{062E}', '\u{062D}']),
-        '\u{FC1B}' => Some(&['\u{062E}', '\u{0645}']),
-        '\u{FC1C}' => Some(&['\u{0633}', '\u{062C}']),
-        '\u{FC1D}' => Some(&['\u{0633}', '\u{062D}']),
-        '\u{FC1E}' => Some(&['\u{0633}', '\u{062E}']),
-        '\u{FC1F}' => Some(&['\u{0633}', '\u{0645}']),
-        '\u{FC20}' => Some(&['\u{0635}', '\u{062D}']),
-        '\u{FC21}' => Some(&['\u{0635}', '\u{0645}']),
-        '\u{FC22}' => Some(&['\u{0636}', '\u{062C}']),
-        '\u{FC23}' => Some(&['\u{0636}', '\u{062D}']),
-        '\u{FC24}' => Some(&['\u{0636}', '\u{062E}']),
-        '\u{FC25}' => Some(&['\u{0636}', '\u{0645}']),
-        '\u{FC26}' => Some(&['\u{0637}', '\u{062D}']),
-        '\u{FC27}' => Some(&['\u{0637}', '\u{0645}']),
-        '\u{FC28}' => Some(&['\u{0638}', '\u{0645}']),
-        '\u{FC29}' => Some(&['\u{0639}', '\u{062C}']),
-        '\u{FC2A}' => Some(&['\u{0639}', '\u{0645}']),
-        '\u{FC2B}' => Some(&['\u{063A}', '\u{062C}']),
-        '\u{FC2C}' => Some(&['\u{063A}', '\u{0645}']),
-        '\u{FC2D}' => Some(&['\u{0641}', '\u{062C}']),
-        '\u{FC2E}' => Some(&['\u{0641}', '\u{062D}']),
-        '\u{FC2F}' => Some(&['\u{0641}', '\u{062E}']),
-        '\u{FC30}' => Some(&['\u{0641}', '\u{0645}']),
-        '\u{FC31}' => Some(&['\u{0641}', '\u{0649}']),
-        '\u{FC32}' => Some(&['\u{0641}', '\u{064A}']),
-        '\u{FC33}' => Some(&['\u{0642}', '\u{062D}']),
-        '\u{FC34}' => Some(&['\u{0642}', '\u{0645}']),
-        '\u{FC35}' => Some(&['\u{0642}', '\u{0649}']),
-        '\u{FC36}' => Some(&['\u{0642}', '\u{064A}']),
-        '\u{FC37}' => Some(&['\u{0643}', '\u{0627}']),
-        '\u{FC38}' => Some(&['\u{0643}', '\u{062C}']),
-        '\u{FC39}' => Some(&['\u{0643}', '\u{062D}']),
-        '\u{FC3A}' => Some(&['\u{0643}', '\u{062E}']),
-        '\u{FC3B}' => Some(&['\u{0643}', '\u{0644}']),
-        '\u{FC3C}' => Some(&['\u{0643}', '\u{0645}']),
-        '\u{FC3D}' => Some(&['\u{0643}', '\u{0649}']),
-        '\u{FC3E}' => Some(&['\u{0643}', '\u{064A}']),
-        '\u{FC3F}' => Some(&['\u{0644}', '\u{062C}']),
-        '\u{FC40}' => Some(&['\u{0644}', '\u{062D}']),
-        '\u{FC41}' => Some(&['\u{0644}', '\u{062E}']),
-        '\u{FC42}' => Some(&['\u{0644}', '\u{0645}']),
-        '\u{FC43}' => Some(&['\u{0644}', '\u{0649}']),
-        '\u{FC44}' => Some(&['\u{0644}', '\u{064A}']),
-        '\u{FC45}' => Some(&['\u{0645}', '\u{062C}']),
-        '\u{FC46}' => Some(&['\u{0645}', '\u{062D}']),
-        '\u{FC47}' => Some(&['\u{0645}', '\u{062E}']),
-        '\u{FC48}' => Some(&['\u{0645}', '\u{0645}']),
-        '\u{FC49}' => Some(&['\u{0645}', '\u{0649}']),
-        '\u{FC4A}' => Some(&['\u{0645}', '\u{064A}']),
-        '\u{FC4B}' => Some(&['\u{0646}', '\u{062C}']),
-        '\u{FC4C}' => Some(&['\u{0646}', '\u{062D}']),
-        '\u{FC4D}' => Some(&['\u{0646}', '\u{062E}']),
-        '\u{FC4E}' => Some(&['\u{0646}', '\u{0645}']),
-        '\u{FC4F}' => Some(&['\u{0646}', '\u{0649}']),
-        '\u{FC50}' => Some(&['\u{0646}', '\u{064A}']),
-        '\u{FC51}' => Some(&['\u{0647}', '\u{062C}']),
-        '\u{FC52}' => Some(&['\u{0647}', '\u{0645}']),
-        '\u{FC53}' => Some(&['\u{0647}', '\u{0649}']),
-        '\u{FC54}' => Some(&['\u{0647}', '\u{064A}']),
-        '\u{FC55}' => Some(&['\u{064A}', '\u{062C}']),
-        '\u{FC56}' => Some(&['\u{064A}', '\u{062D}']),
-        '\u{FC57}' => Some(&['\u{064A}', '\u{062E}']),
-        '\u{FC58}' => Some(&['\u{064A}', '\u{0645}']),
-        '\u{FC59}' => Some(&['\u{064A}', '\u{0649}']),
-        '\u{FC5A}' => Some(&['\u{064A}', '\u{064A}']),
-        '\u{FC5B}' => Some(&['\u{0630}', '\u{0670}']),
-        '\u{FC5C}' => Some(&['\u{0631}', '\u{0670}']),
-        '\u{FC5D}' => Some(&['\u{0649}', '\u{0670}']),
-        '\u{FC5E}' => Some(&['\u{0020}', '\u{064C}', '\u{0651}']),
-        '\u{FC5F}' => Some(&['\u{0020}', '\u{064D}', '\u{0651}']),
-        '\u{FC60}' => Some(&['\u{0020}', '\u{064E}', '\u{0651}']),
-        '\u{FC61}' => Some(&['\u{0020}', '\u{064F}', '\u{0651}']),
-        '\u{FC62}' => Some(&['\u{0020}', '\u{0650}', '\u{0651}']),
-        '\u{FC63}' => Some(&['\u{0020}', '\u{0651}', '\u{0670}']),
-        '\u{FC64}' => Some(&['\u{064A}', '\u{0654}', '\u{0631}']),
-        '\u{FC65}' => Some(&['\u{064A}', '\u{0654}', '\u{0632}']),
-        '\u{FC66}' => Some(&['\u{064A}', '\u{0654}', '\u{0645}']),
-        '\u{FC67}' => Some(&['\u{064A}', '\u{0654}', '\u{0646}']),
-        '\u{FC68}' => Some(&['\u{064A}', '\u{0654}', '\u{0649}']),
-        '\u{FC69}' => Some(&['\u{064A}', '\u{0654}', '\u{064A}']),
-        '\u{FC6A}' => Some(&['\u{0628}', '\u{0631}']),
-        '\u{FC6B}' => Some(&['\u{0628}', '\u{0632}']),
-        '\u{FC6C}' => Some(&['\u{0628}', '\u{0645}']),
-        '\u{FC6D}' => Some(&['\u{0628}', '\u{0646}']),
-        '\u{FC6E}' => Some(&['\u{0628}', '\u{0649}']),
-        '\u{FC6F}' => Some(&['\u{0628}', '\u{064A}']),
-        '\u{FC70}' => Some(&['\u{062A}', '\u{0631}']),
-        '\u{FC71}' => Some(&['\u{062A}', '\u{0632}']),
-        '\u{FC72}' => Some(&['\u{062A}', '\u{0645}']),
-        '\u{FC73}' => Some(&['\u{062A}', '\u{0646}']),
-        '\u{FC74}' => Some(&['\u{062A}', '\u{0649}']),
-        '\u{FC75}' => Some(&['\u{062A}', '\u{064A}']),
-        '\u{FC76}' => Some(&['\u{062B}', '\u{0631}']),
-        '\u{FC77}' => Some(&['\u{062B}', '\u{0632}']),
-        '\u{FC78}' => Some(&['\u{062B}', '\u{0645}']),
-        '\u{FC79}' => Some(&['\u{062B}', '\u{0646}']),
-        '\u{FC7A}' => Some(&['\u{062B}', '\u{0649}']),
-        '\u{FC7B}' => Some(&['\u{062B}', '\u{064A}']),
-        '\u{FC7C}' => Some(&['\u{0641}', '\u{0649}']),
-        '\u{FC7D}' => Some(&['\u{0641}', '\u{064A}']),
-        '\u{FC7E}' => Some(&['\u{0642}', '\u{0649}']),
-        '\u{FC7F}' => Some(&['\u{0642}', '\u{064A}']),
-        '\u{FC80}' => Some(&['\u{0643}', '\u{0627}']),
-        '\u{FC81}' => Some(&['\u{0643}', '\u{0644}']),
-        '\u{FC82}' => Some(&['\u{0643}', '\u{0645}']),
-        '\u{FC83}' => Some(&['\u{0643}', '\u{0649}']),
-        '\u{FC84}' => Some(&['\u{0643}', '\u{064A}']),
-        '\u{FC85}' => Some(&['\u{0644}', '\u{0645}']),
-        '\u{FC86}' => Some(&['\u{0644}', '\u{0649}']),
-        '\u{FC87}' => Some(&['\u{0644}', '\u{064A}']),
-        '\u{FC88}' => Some(&['\u{0645}', '\u{0627}']),
-        '\u{FC89}' => Some(&['\u{0645}', '\u{0645}']),
-        '\u{FC8A}' => Some(&['\u{0646}', '\u{0631}']),
-        '\u{FC8B}' => Some(&['\u{0646}', '\u{0632}']),
-        '\u{FC8C}' => Some(&['\u{0646}', '\u{0645}']),
-        '\u{FC8D}' => Some(&['\u{0646}', '\u{0646}']),
-        '\u{FC8E}' => Some(&['\u{0646}', '\u{0649}']),
-        '\u{FC8F}' => Some(&['\u{0646}', '\u{064A}']),
-        '\u{FC90}' => Some(&['\u{0649}', '\u{0670}']),
-        '\u{FC91}' => Some(&['\u{064A}', '\u{0631}']),
-        '\u{FC92}' => Some(&['\u{064A}', '\u{0632}']),
-        '\u{FC93}' => Some(&['\u{064A}', '\u{0645}']),
-        '\u{FC94}' => Some(&['\u{064A}', '\u{0646}']),
-        '\u{FC95}' => Some(&['\u{064A}', '\u{0649}']),
-        '\u{FC96}' => Some(&['\u{064A}', '\u{064A}']),
-        '\u{FC97}' => Some(&['\u{064A}', '\u{0654}', '\u{062C}']),
-        '\u{FC98}' => Some(&['\u{064A}', '\u{0654}', '\u{062D}']),
-        '\u{FC99}' => Some(&['\u{064A}', '\u{0654}', '\u{062E}']),
-        '\u{FC9A}' => Some(&['\u{064A}', '\u{0654}', '\u{0645}']),
-        '\u{FC9B}' => Some(&['\u{064A}', '\u{0654}', '\u{0647}']),
-        '\u{FC9C}' => Some(&['\u{0628}', '\u{062C}']),
-        '\u{FC9D}' => Some(&['\u{0628}', '\u{062D}']),
-        '\u{FC9E}' => Some(&['\u{0628}', '\u{062E}']),
-        '\u{FC9F}' => Some(&['\u{0628}', '\u{0645}']),
-        '\u{FCA0}' => Some(&['\u{0628}', '\u{0647}']),
-        '\u{FCA1}' => Some(&['\u{062A}', '\u{062C}']),
-        '\u{FCA2}' => Some(&['\u{062A}', '\u{062D}']),
-        '\u{FCA3}' => Some(&['\u{062A}', '\u{062E}']),
-        '\u{FCA4}' => Some(&['\u{062A}', '\u{0645}']),
-        '\u{FCA5}' => Some(&['\u{062A}', '\u{0647}']),
-        '\u{FCA6}' => Some(&['\u{062B}', '\u{0645}']),
-        '\u{FCA7}' => Some(&['\u{062C}', '\u{062D}']),
-        '\u{FCA8}' => Some(&['\u{062C}', '\u{0645}']),
-        '\u{FCA9}' => Some(&['\u{062D}', '\u{062C}']),
-        '\u{FCAA}' => Some(&['\u{062D}', '\u{0645}']),
-        '\u{FCAB}' => Some(&['\u{062E}', '\u{062C}']),
-        '\u{FCAC}' => Some(&['\u{062E}', '\u{0645}']),
-        '\u{FCAD}' => Some(&['\u{0633}', '\u{062C}']),
-        '\u{FCAE}' => Some(&['\u{0633}', '\u{062D}']),
-        '\u{FCAF}' => Some(&['\u{0633}', '\u{062E}']),
-        '\u{FCB0}' => Some(&['\u{0633}', '\u{0645}']),
-        '\u{FCB1}' => Some(&['\u{0635}', '\u{062D}']),
-        '\u{FCB2}' => Some(&['\u{0635}', '\u{062E}']),
-        '\u{FCB3}' => Some(&['\u{0635}', '\u{0645}']),
-        '\u{FCB4}' => Some(&['\u{0636}', '\u{062C}']),
-        '\u{FCB5}' => Some(&['\u{0636}', '\u{062D}']),
-        '\u{FCB6}' => Some(&['\u{0636}', '\u{062E}']),
-        '\u{FCB7}' => Some(&['\u{0636}', '\u{0645}']),
-        '\u{FCB8}' => Some(&['\u{0637}', '\u{062D}']),
-        '\u{FCB9}' => Some(&['\u{0638}', '\u{0645}']),
-        '\u{FCBA}' => Some(&['\u{0639}', '\u{062C}']),
-        '\u{FCBB}' => Some(&['\u{0639}', '\u{0645}']),
-        '\u{FCBC}' => Some(&['\u{063A}', '\u{062C}']),
-        '\u{FCBD}' => Some(&['\u{063A}', '\u{0645}']),
-        '\u{FCBE}' => Some(&['\u{0641}', '\u{062C}']),
-        '\u{FCBF}' => Some(&['\u{0641}', '\u{062D}']),
-        '\u{FCC0}' => Some(&['\u{0641}', '\u{062E}']),
-        '\u{FCC1}' => Some(&['\u{0641}', '\u{0645}']),
-        '\u{FCC2}' => Some(&['\u{0642}', '\u{062D}']),
-        '\u{FCC3}' => Some(&['\u{0642}', '\u{0645}']),
-        '\u{FCC4}' => Some(&['\u{0643}', '\u{062C}']),
-        '\u{FCC5}' => Some(&['\u{0643}', '\u{062D}']),
-        '\u{FCC6}' => Some(&['\u{0643}', '\u{062E}']),
-        '\u{FCC7}' => Some(&['\u{0643}', '\u{0644}']),
-        '\u{FCC8}' => Some(&['\u{0643}', '\u{0645}']),
-        '\u{FCC9}' => Some(&['\u{0644}', '\u{062C}']),
-        '\u{FCCA}' => Some(&['\u{0644}', '\u{062D}']),
-        '\u{FCCB}' => Some(&['\u{0644}', '\u{062E}']),
-        '\u{FCCC}' => Some(&['\u{0644}', '\u{0645}']),
-        '\u{FCCD}' => Some(&['\u{0644}', '\u{0647}']),
-        '\u{FCCE}' => Some(&['\u{0645}', '\u{062C}']),
-        '\u{FCCF}' => Some(&['\u{0645}', '\u{062D}']),
-        '\u{FCD0}' => Some(&['\u{0645}', '\u{062E}']),
-        '\u{FCD1}' => Some(&['\u{0645}', '\u{0645}']),
-        '\u{FCD2}' => Some(&['\u{0646}', '\u{062C}']),
-        '\u{FCD3}' => Some(&['\u{0646}', '\u{062D}']),
-        '\u{FCD4}' => Some(&['\u{0646}', '\u{062E}']),
-        '\u{FCD5}' => Some(&['\u{0646}', '\u{0645}']),
-        '\u{FCD6}' => Some(&['\u{0646}', '\u{0647}']),
-        '\u{FCD7}' => Some(&['\u{0647}', '\u{062C}']),
-        '\u{FCD8}' => Some(&['\u{0647}', '\u{0645}']),
-        '\u{FCD9}' => Some(&['\u{0647}', '\u{0670}']),
-        '\u{FCDA}' => Some(&['\u{064A}', '\u{062C}']),
-        '\u{FCDB}' => Some(&['\u{064A}', '\u{062D}']),
-        '\u{FCDC}' => Some(&['\u{064A}', '\u{062E}']),
-        '\u{FCDD}' => Some(&['\u{064A}', '\u{0645}']),
-        '\u{FCDE}' => Some(&['\u{064A}', '\u{0647}']),
-        '\u{FCDF}' => Some(&['\u{064A}', '\u{0654}', '\u{0645}']),
-        '\u{FCE0}' => Some(&['\u{064A}', '\u{0654}', '\u{0647}']),
-        '\u{FCE1}' => Some(&['\u{0628}', '\u{0645}']),
-        '\u{FCE2}' => Some(&['\u{0628}', '\u{0647}']),
-        '\u{FCE3}' => Some(&['\u{062A}', '\u{0645}']),
-        '\u{FCE4}' => Some(&['\u{062A}', '\u{0647}']),
-        '\u{FCE5}' => Some(&['\u{062B}', '\u{0645}']),
-        '\u{FCE6}' => Some(&['\u{062B}', '\u{0647}']),
-        '\u{FCE7}' => Some(&['\u{0633}', '\u{0645}']),
-        '\u{FCE8}' => Some(&['\u{0633}', '\u{0647}']),
-        '\u{FCE9}' => Some(&['\u{0634}', '\u{0645}']),
-        '\u{FCEA}' => Some(&['\u{0634}', '\u{0647}']),
-        '\u{FCEB}' => Some(&['\u{0643}', '\u{0644}']),
-        '\u{FCEC}' => Some(&['\u{0643}', '\u{0645}']),
-        '\u{FCED}' => Some(&['\u{0644}', '\u{0645}']),
-        '\u{FCEE}' => Some(&['\u{0646}', '\u{0645}']),
-        '\u{FCEF}' => Some(&['\u{0646}', '\u{0647}']),
-        '\u{FCF0}' => Some(&['\u{064A}', '\u{0645}']),
-        '\u{FCF1}' => Some(&['\u{064A}', '\u{0647}']),
-        '\u{FCF2}' => Some(&['\u{0640}', '\u{064E}', '\u{0651}']),
-        '\u{FCF3}' => Some(&['\u{0640}', '\u{064F}', '\u{0651}']),
-        '\u{FCF4}' => Some(&['\u{0640}', '\u{0650}', '\u{0651}']),
-        '\u{FCF5}' => Some(&['\u{0637}', '\u{0649}']),
-        '\u{FCF6}' => Some(&['\u{0637}', '\u{064A}']),
-        '\u{FCF7}' => Some(&['\u{0639}', '\u{0649}']),
-        '\u{FCF8}' => Some(&['\u{0639}', '\u{064A}']),
-        '\u{FCF9}' => Some(&['\u{063A}', '\u{0649}']),
-        '\u{FCFA}' => Some(&['\u{063A}', '\u{064A}']),
-        '\u{FCFB}' => Some(&['\u{0633}', '\u{0649}']),
-        '\u{FCFC}' => Some(&['\u{0633}', '\u{064A}']),
-        '\u{FCFD}' => Some(&['\u{0634}', '\u{0649}']),
-        '\u{FCFE}' => Some(&['\u{0634}', '\u{064A}']),
-        '\u{FCFF}' => Some(&['\u{062D}', '\u{0649}']),
-        '\u{FD00}' => Some(&['\u{062D}', '\u{064A}']),
-        '\u{FD01}' => Some(&['\u{062C}', '\u{0649}']),
-        '\u{FD02}' => Some(&['\u{062C}', '\u{064A}']),
-        '\u{FD03}' => Some(&['\u{062E}', '\u{0649}']),
-        '\u{FD04}' => Some(&['\u{062E}', '\u{064A}']),
-        '\u{FD05}' => Some(&['\u{0635}', '\u{0649}']),
-        '\u{FD06}' => Some(&['\u{0635}', '\u{064A}']),
-        '\u{FD07}' => Some(&['\u{0636}', '\u{0649}']),
-        '\u{FD08}' => Some(&['\u{0636}', '\u{064A}']),
-        '\u{FD09}' => Some(&['\u{0634}', '\u{062C}']),
-        '\u{FD0A}' => Some(&['\u{0634}', '\u{062D}']),
-        '\u{FD0B}' => Some(&['\u{0634}', '\u{062E}']),
-        '\u{FD0C}' => Some(&['\u{0634}', '\u{0645}']),
-        '\u{FD0D}' => Some(&['\u{0634}', '\u{0631}']),
-        '\u{FD0E}' => Some(&['\u{0633}', '\u{0631}']),
-        '\u{FD0F}' => Some(&['\u{0635}', '\u{0631}']),
-        '\u{FD10}' => Some(&['\u{0636}', '\u{0631}']),
-        '\u{FD11}' => Some(&['\u{0637}', '\u{0649}']),
-        '\u{FD12}' => Some(&['\u{0637}', '\u{064A}']),
-        '\u{FD13}' => Some(&['\u{0639}', '\u{0649}']),
-        '\u{FD14}' => Some(&['\u{0639}', '\u{064A}']),
-        '\u{FD15}' => Some(&['\u{063A}', '\u{0649}']),
-        '\u{FD16}' => Some(&['\u{063A}', '\u{064A}']),
-        '\u{FD17}' => Some(&['\u{0633}', '\u{0649}']),
-        '\u{FD18}' => Some(&['\u{0633}', '\u{064A}']),
-        '\u{FD19}' => Some(&['\u{0634}', '\u{0649}']),
-        '\u{FD1A}' => Some(&['\u{0634}', '\u{064A}']),
-        '\u{FD1B}' => Some(&['\u{062D}', '\u{0649}']),
-        '\u{FD1C}' => Some(&['\u{062D}', '\u{064A}']),
-        '\u{FD1D}' => Some(&['\u{062C}', '\u{0649}']),
-        '\u{FD1E}' => Some(&['\u{062C}', '\u{064A}']),
-        '\u{FD1F}' => Some(&['\u{062E}', '\u{0649}']),
-        '\u{FD20}' => Some(&['\u{062E}', '\u{064A}']),
-        '\u{FD21}' => Some(&['\u{0635}', '\u{0649}']),
-        '\u{FD22}' => Some(&['\u{0635}', '\u{064A}']),
-        '\u{FD23}' => Some(&['\u{0636}', '\u{0649}']),
-        '\u{FD24}' => Some(&['\u{0636}', '\u{064A}']),
-        '\u{FD25}' => Some(&['\u{0634}', '\u{062C}']),
-        '\u{FD26}' => Some(&['\u{0634}', '\u{062D}']),
-        '\u{FD27}' => Some(&['\u{0634}', '\u{062E}']),
-        '\u{FD28}' => Some(&['\u{0634}', '\u{0645}']),
-        '\u{FD29}' => Some(&['\u{0634}', '\u{0631}']),
-        '\u{FD2A}' => Some(&['\u{0633}', '\u{0631}']),
-        '\u{FD2B}' => Some(&['\u{0635}', '\u{0631}']),
-        '\u{FD2C}' => Some(&['\u{0636}', '\u{0631}']),
-        '\u{FD2D}' => Some(&['\u{0634}', '\u{062C}']),
-        '\u{FD2E}' => Some(&['\u{0634}', '\u{062D}']),
-        '\u{FD2F}' => Some(&['\u{0634}', '\u{062E}']),
-        '\u{FD30}' => Some(&['\u{0634}', '\u{0645}']),
-        '\u{FD31}' => Some(&['\u{0633}', '\u{0647}']),
-        '\u{FD32}' => Some(&['\u{0634}', '\u{0647}']),
-        '\u{FD33}' => Some(&['\u{0637}', '\u{0645}']),
-        '\u{FD34}' => Some(&['\u{0633}', '\u{062C}']),
-        '\u{FD35}' => Some(&['\u{0633}', '\u{062D}']),
-        '\u{FD36}' => Some(&['\u{0633}', '\u{062E}']),
-        '\u{FD37}' => Some(&['\u{0634}', '\u{062C}']),
-        '\u{FD38}' => Some(&['\u{0634}', '\u{062D}']),
-        '\u{FD39}' => Some(&['\u{0634}', '\u{062E}']),
-        '\u{FD3A}' => Some(&['\u{0637}', '\u{0645}']),
-        '\u{FD3B}' => Some(&['\u{0638}', '\u{0645}']),
-        '\u{FD3C}' => Some(&['\u{0627}', '\u{064B}']),
-        '\u{FD3D}' => Some(&['\u{0627}', '\u{064B}']),
-        '\u{FD50}' => Some(&['\u{062A}', '\u{062C}', '\u{0645}']),
-        '\u{FD51}' => Some(&['\u{062A}', '\u{062D}', '\u{062C}']),
-        '\u{FD52}' => Some(&['\u{062A}', '\u{062D}', '\u{062C}']),
-        '\u{FD53}' => Some(&['\u{062A}', '\u{062D}', '\u{0645}']),
-        '\u{FD54}' => Some(&['\u{062A}', '\u{062E}', '\u{0645}']),
-        '\u{FD55}' => Some(&['\u{062A}', '\u{0645}', '\u{062C}']),
-        '\u{FD56}' => Some(&['\u{062A}', '\u{0645}', '\u{062D}']),
-        '\u{FD57}' => Some(&['\u{062A}', '\u{0645}', '\u{062E}']),
-        '\u{FD58}' => Some(&['\u{062C}', '\u{0645}', '\u{062D}']),
-        '\u{FD59}' => Some(&['\u{062C}', '\u{0645}', '\u{062D}']),
-        '\u{FD5A}' => Some(&['\u{062D}', '\u{0645}', '\u{064A}']),
-        '\u{FD5B}' => Some(&['\u{062D}', '\u{0645}', '\u{0649}']),
-        '\u{FD5C}' => Some(&['\u{0633}', '\u{062D}', '\u{062C}']),
-        '\u{FD5D}' => Some(&['\u{0633}', '\u{062C}', '\u{062D}']),
-        '\u{FD5E}' => Some(&['\u{0633}', '\u{062C}', '\u{0649}']),
-        '\u{FD5F}' => Some(&['\u{0633}', '\u{0645}', '\u{062D}']),
-        '\u{FD60}' => Some(&['\u{0633}', '\u{0645}', '\u{062D}']),
-        '\u{FD61}' => Some(&['\u{0633}', '\u{0645}', '\u{062C}']),
-        '\u{FD62}' => Some(&['\u{0633}', '\u{0645}', '\u{0645}']),
-        '\u{FD63}' => Some(&['\u{0633}', '\u{0645}', '\u{0645}']),
-        '\u{FD64}' => Some(&['\u{0635}', '\u{062D}', '\u{062D}']),
-        '\u{FD65}' => Some(&['\u{0635}', '\u{062D}', '\u{062D}']),
-        '\u{FD66}' => Some(&['\u{0635}', '\u{0645}', '\u{0645}']),
-        '\u{FD67}' => Some(&['\u{0634}', '\u{062D}', '\u{0645}']),
-        '\u{FD68}' => Some(&['\u{0634}', '\u{062D}', '\u{0645}']),
-        '\u{FD69}' => Some(&['\u{0634}', '\u{062C}', '\u{064A}']),
-        '\u{FD6A}' => Some(&['\u{0634}', '\u{0645}', '\u{062E}']),
-        '\u{FD6B}' => Some(&['\u{0634}', '\u{0645}', '\u{062E}']),
-        '\u{FD6C}' => Some(&['\u{0634}', '\u{0645}', '\u{0645}']),
-        '\u{FD6D}' => Some(&['\u{0634}', '\u{0645}', '\u{0645}']),
-        '\u{FD6E}' => Some(&['\u{0636}', '\u{062D}', '\u{0649}']),
-        '\u{FD6F}' => Some(&['\u{0636}', '\u{062E}', '\u{0645}']),
-        '\u{FD70}' => Some(&['\u{0636}', '\u{062E}', '\u{0645}']),
-        '\u{FD71}' => Some(&['\u{0637}', '\u{0645}', '\u{062D}']),
-        '\u{FD72}' => Some(&['\u{0637}', '\u{0645}', '\u{062D}']),
-        '\u{FD73}' => Some(&['\u{0637}', '\u{0645}', '\u{0645}']),
-        '\u{FD74}' => Some(&['\u{0637}', '\u{0645}', '\u{064A}']),
-        '\u{FD75}' => Some(&['\u{0639}', '\u{062C}', '\u{0645}']),
-        '\u{FD76}' => Some(&['\u{0639}', '\u{0645}', '\u{0645}']),
-        '\u{FD77}' => Some(&['\u{0639}', '\u{0645}', '\u{0645}']),
-        '\u{FD78}' => Some(&['\u{0639}', '\u{0645}', '\u{0649}']),
-        '\u{FD79}' => Some(&['\u{063A}', '\u{0645}', '\u{0645}']),
-        '\u{FD7A}' => Some(&['\u{063A}', '\u{0645}', '\u{064A}']),
-        '\u{FD7B}' => Some(&['\u{063A}', '\u{0645}', '\u{0649}']),
-        '\u{FD7C}' => Some(&['\u{0641}', '\u{062E}', '\u{0645}']),
-        '\u{FD7D}' => Some(&['\u{0641}', '\u{062E}', '\u{0645}']),
-        '\u{FD7E}' => Some(&['\u{0642}', '\u{0645}', '\u{062D}']),
-        '\u{FD7F}' => Some(&['\u{0642}', '\u{0645}', '\u{0645}']),
-        '\u{FD80}' => Some(&['\u{0644}', '\u{062D}', '\u{0645}']),
-        '\u{FD81}' => Some(&['\u{0644}', '\u{062D}', '\u{064A}']),
-        '\u{FD82}' => Some(&['\u{0644}', '\u{062D}', '\u{0649}']),
-        '\u{FD83}' => Some(&['\u{0644}', '\u{062C}', '\u{062C}']),
-        '\u{FD84}' => Some(&['\u{0644}', '\u{062C}', '\u{062C}']),
-        '\u{FD85}' => Some(&['\u{0644}', '\u{062E}', '\u{0645}']),
-        '\u{FD86}' => Some(&['\u{0644}', '\u{062E}', '\u{0645}']),
-        '\u{FD87}' => Some(&['\u{0644}', '\u{0645}', '\u{062D}']),
-        '\u{FD88}' => Some(&['\u{0644}', '\u{0645}', '\u{062D}']),
-        '\u{FD89}' => Some(&['\u{0645}', '\u{062D}', '\u{062C}']),
-        '\u{FD8A}' => Some(&['\u{0645}', '\u{062D}', '\u{0645}']),
-        '\u{FD8B}' => Some(&['\u{0645}', '\u{062D}', '\u{064A}']),
-        '\u{FD8C}' => Some(&['\u{0645}', '\u{062C}', '\u{062D}']),
-        '\u{FD8D}' => Some(&['\u{0645}', '\u{062C}', '\u{0645}']),
-        '\u{FD8E}' => Some(&['\u{0645}', '\u{062E}', '\u{062C}']),
-        '\u{FD8F}' => Some(&['\u{0645}', '\u{062E}', '\u{0645}']),
-        '\u{FD92}' => Some(&['\u{0645}', '\u{062C}', '\u{062E}']),
-        '\u{FD93}' => Some(&['\u{0647}', '\u{0645}', '\u{062C}']),
-        '\u{FD94}' => Some(&['\u{0647}', '\u{0645}', '\u{0645}']),
-        '\u{FD95}' => Some(&['\u{0646}', '\u{062D}', '\u{0645}']),
-        '\u{FD96}' => Some(&['\u{0646}', '\u{062D}', '\u{0649}']),
-        '\u{FD97}' => Some(&['\u{0646}', '\u{062C}', '\u{0645}']),
-        '\u{FD98}' => Some(&['\u{0646}', '\u{062C}', '\u{0645}']),
-        '\u{FD99}' => Some(&['\u{0646}', '\u{062C}', '\u{0649}']),
-        '\u{FD9A}' => Some(&['\u{0646}', '\u{0645}', '\u{064A}']),
-        '\u{FD9B}' => Some(&['\u{0646}', '\u{0645}', '\u{0649}']),
-        '\u{FD9C}' => Some(&['\u{064A}', '\u{0645}', '\u{0645}']),
-        '\u{FD9D}' => Some(&['\u{064A}', '\u{0645}', '\u{0645}']),
-        '\u{FD9E}' => Some(&['\u{0628}', '\u{062E}', '\u{064A}']),
-        '\u{FD9F}' => Some(&['\u{062A}', '\u{062C}', '\u{064A}']),
-        '\u{FDA0}' => Some(&['\u{062A}', '\u{062C}', '\u{0649}']),
-        '\u{FDA1}' => Some(&['\u{062A}', '\u{062E}', '\u{064A}']),
-        '\u{FDA2}' => Some(&['\u{062A}', '\u{062E}', '\u{0649}']),
-        '\u{FDA3}' => Some(&['\u{062A}', '\u{0645}', '\u{064A}']),
-        '\u{FDA4}' => Some(&['\u{062A}', '\u{0645}', '\u{0649}']),
-        '\u{FDA5}' => Some(&['\u{062C}', '\u{0645}', '\u{064A}']),
-        '\u{FDA6}' => Some(&['\u{062C}', '\u{062D}', '\u{0649}']),
-        '\u{FDA7}' => Some(&['\u{062C}', '\u{0645}', '\u{0649}']),
-        '\u{FDA8}' => Some(&['\u{0633}', '\u{062E}', '\u{0649}']),
-        '\u{FDA9}' => Some(&['\u{0635}', '\u{062D}', '\u{064A}']),
-        '\u{FDAA}' => Some(&['\u{0634}', '\u{062D}', '\u{064A}']),
-        '\u{FDAB}' => Some(&['\u{0636}', '\u{062D}', '\u{064A}']),
-        '\u{FDAC}' => Some(&['\u{0644}', '\u{062C}', '\u{064A}']),
-        '\u{FDAD}' => Some(&['\u{0644}', '\u{0645}', '\u{064A}']),
-        '\u{FDAE}' => Some(&['\u{064A}', '\u{062D}', '\u{064A}']),
-        '\u{FDAF}' => Some(&['\u{064A}', '\u{062C}', '\u{064A}']),
-        '\u{FDB0}' => Some(&['\u{064A}', '\u{0645}', '\u{064A}']),
-        '\u{FDB1}' => Some(&['\u{0645}', '\u{0645}', '\u{064A}']),
-        '\u{FDB2}' => Some(&['\u{0642}', '\u{0645}', '\u{064A}']),
-        '\u{FDB3}' => Some(&['\u{0646}', '\u{062D}', '\u{064A}']),
-        '\u{FDB4}' => Some(&['\u{0642}', '\u{0645}', '\u{062D}']),
-        '\u{FDB5}' => Some(&['\u{0644}', '\u{062D}', '\u{0645}']),
-        '\u{FDB6}' => Some(&['\u{0639}', '\u{0645}', '\u{064A}']),
-        '\u{FDB7}' => Some(&['\u{0643}', '\u{0645}', '\u{064A}']),
-        '\u{FDB8}' => Some(&['\u{0646}', '\u{062C}', '\u{062D}']),
-        '\u{FDB9}' => Some(&['\u{0645}', '\u{062E}', '\u{064A}']),
-        '\u{FDBA}' => Some(&['\u{0644}', '\u{062C}', '\u{0645}']),
-        '\u{FDBB}' => Some(&['\u{0643}', '\u{0645}', '\u{0645}']),
-        '\u{FDBC}' => Some(&['\u{0644}', '\u{062C}', '\u{0645}']),
-        '\u{FDBD}' => Some(&['\u{0646}', '\u{062C}', '\u{062D}']),
-        '\u{FDBE}' => Some(&['\u{062C}', '\u{062D}', '\u{064A}']),
-        '\u{FDBF}' => Some(&['\u{062D}', '\u{062C}', '\u{064A}']),
-        '\u{FDC0}' => Some(&['\u{0645}', '\u{062C}', '\u{064A}']),
-        '\u{FDC1}' => Some(&['\u{0641}', '\u{0645}', '\u{064A}']),
-        '\u{FDC2}' => Some(&['\u{0628}', '\u{062D}', '\u{064A}']),
-        '\u{FDC3}' => Some(&['\u{0643}', '\u{0645}', '\u{0645}']),
-        '\u{FDC4}' => Some(&['\u{0639}', '\u{062C}', '\u{0645}']),
-        '\u{FDC5}' => Some(&['\u{0635}', '\u{0645}', '\u{0645}']),
-        '\u{FDC6}' => Some(&['\u{0633}', '\u{062E}', '\u{064A}']),
-        '\u{FDC7}' => Some(&['\u{0646}', '\u{062C}', '\u{064A}']),
-        '\u{FDF0}' => Some(&['\u{0635}', '\u{0644}', '\u{06D2}']),
-        '\u{FDF1}' => Some(&['\u{0642}', '\u{0644}', '\u{06D2}']),
-        '\u{FDF2}' => Some(&['\u{0627}', '\u{0644}', '\u{0644}', '\u{0647}']),
-        '\u{FDF3}' => Some(&['\u{0627}', '\u{0643}', '\u{0628}', '\u{0631}']),
-        '\u{FDF4}' => Some(&['\u{0645}', '\u{062D}', '\u{0645}', '\u{062F}']),
-        '\u{FDF5}' => Some(&['\u{0635}', '\u{0644}', '\u{0639}', '\u{0645}']),
-        '\u{FDF6}' => Some(&['\u{0631}', '\u{0633}', '\u{0648}', '\u{0644}']),
-        '\u{FDF7}' => Some(&['\u{0639}', '\u{0644}', '\u{064A}', '\u{0647}']),
-        '\u{FDF8}' => Some(&['\u{0648}', '\u{0633}', '\u{0644}', '\u{0645}']),
-        '\u{FDF9}' => Some(&['\u{0635}', '\u{0644}', '\u{0649}']),
-        '\u{FDFA}' => Some(&['\u{0635}', '\u{0644}', '\u{0649}', '\u{0020}', '\u{0627}', '\u{0644}', '\u{0644}', '\u{0647}', '\u{0020}', '\u{0639}', '\u{0644}', '\u{064A}', '\u{0647}', '\u{0020}', '\u{0648}', '\u{0633}', '\u{0644}', '\u{0645}']),
-        '\u{FDFB}' => Some(&['\u{062C}', '\u{0644}', '\u{0020}', '\u{062C}', '\u{0644}', '\u{0627}', '\u{0644}', '\u{0647}']),
-        '\u{FDFC}' => Some(&['\u{0631}', '\u{06CC}', '\u{0627}', '\u{0644}']),
-        '\u{FE10}' => Some(&['\u{002C}']),
-        '\u{FE11}' => Some(&['\u{3001}']),
-        '\u{FE12}' => Some(&['\u{3002}']),
-        '\u{FE13}' => Some(&['\u{003A}']),
-        '\u{FE14}' => Some(&['\u{003B}']),
-        '\u{FE15}' => Some(&['\u{0021}']),
-        '\u{FE16}' => Some(&['\u{003F}']),
-        '\u{FE17}' => Some(&['\u{3016}']),
-        '\u{FE18}' => Some(&['\u{3017}']),
-        '\u{FE19}' => Some(&['\u{002E}', '\u{002E}', '\u{002E}']),
-        '\u{FE30}' => Some(&['\u{002E}', '\u{002E}']),
-        '\u{FE31}' => Some(&['\u{2014}']),
-        '\u{FE32}' => Some(&['\u{2013}']),
-        '\u{FE33}' => Some(&['\u{005F}']),
-        '\u{FE34}' => Some(&['\u{005F}']),
-        '\u{FE35}' => Some(&['\u{0028}']),
-        '\u{FE36}' => Some(&['\u{0029}']),
-        '\u{FE37}' => Some(&['\u{007B}']),
-        '\u{FE38}' => Some(&['\u{007D}']),
-        '\u{FE39}' => Some(&['\u{3014}']),
-        '\u{FE3A}' => Some(&['\u{3015}']),
-        '\u{FE3B}' => Some(&['\u{3010}']),
-        '\u{FE3C}' => Some(&['\u{3011}']),
-        '\u{FE3D}' => Some(&['\u{300A}']),
-        '\u{FE3E}' => Some(&['\u{300B}']),
-        '\u{FE3F}' => Some(&['\u{3008}']),
-        '\u{FE40}' => Some(&['\u{3009}']),
-        '\u{FE41}' => Some(&['\u{300C}']),
-        '\u{FE42}' => Some(&['\u{300D}']),
-        '\u{FE43}' => Some(&['\u{300E}']),
-        '\u{FE44}' => Some(&['\u{300F}']),
-        '\u{FE47}' => Some(&['\u{005B}']),
-        '\u{FE48}' => Some(&['\u{005D}']),
-        '\u{FE49}' => Some(&['\u{0020}', '\u{0305}']),
-        '\u{FE4A}' => Some(&['\u{0020}', '\u{0305}']),
-        '\u{FE4B}' => Some(&['\u{0020}', '\u{0305}']),
-        '\u{FE4C}' => Some(&['\u{0020}', '\u{0305}']),
-        '\u{FE4D}' => Some(&['\u{005F}']),
-        '\u{FE4E}' => Some(&['\u{005F}']),
-        '\u{FE4F}' => Some(&['\u{005F}']),
-        '\u{FE50}' => Some(&['\u{002C}']),
-        '\u{FE51}' => Some(&['\u{3001}']),
-        '\u{FE52}' => Some(&['\u{002E}']),
-        '\u{FE54}' => Some(&['\u{003B}']),
-        '\u{FE55}' => Some(&['\u{003A}']),
-        '\u{FE56}' => Some(&['\u{003F}']),
-        '\u{FE57}' => Some(&['\u{0021}']),
-        '\u{FE58}' => Some(&['\u{2014}']),
-        '\u{FE59}' => Some(&['\u{0028}']),
-        '\u{FE5A}' => Some(&['\u{0029}']),
-        '\u{FE5B}' => Some(&['\u{007B}']),
-        '\u{FE5C}' => Some(&['\u{007D}']),
-        '\u{FE5D}' => Some(&['\u{3014}']),
-        '\u{FE5E}' => Some(&['\u{3015}']),
-        '\u{FE5F}' => Some(&['\u{0023}']),
-        '\u{FE60}' => Some(&['\u{0026}']),
-        '\u{FE61}' => Some(&['\u{002A}']),
-        '\u{FE62}' => Some(&['\u{002B}']),
-        '\u{FE63}' => Some(&['\u{002D}']),
-        '\u{FE64}' => Some(&['\u{003C}']),
-        '\u{FE65}' => Some(&['\u{003E}']),
-        '\u{FE66}' => Some(&['\u{003D}']),
-        '\u{FE68}' => Some(&['\u{005C}']),
-        '\u{FE69}' => Some(&['\u{0024}']),
-        '\u{FE6A}' => Some(&['\u{0025}']),
-        '\u{FE6B}' => Some(&['\u{0040}']),
-        '\u{FE70}' => Some(&['\u{0020}', '\u{064B}']),
-        '\u{FE71}' => Some(&['\u{0640}', '\u{064B}']),
-        '\u{FE72}' => Some(&['\u{0020}', '\u{064C}']),
-        '\u{FE74}' => Some(&['\u{0020}', '\u{064D}']),
-        '\u{FE76}' => Some(&['\u{0020}', '\u{064E}']),
-        '\u{FE77}' => Some(&['\u{0640}', '\u{064E}']),
-        '\u{FE78}' => Some(&['\u{0020}', '\u{064F}']),
-        '\u{FE79}' => Some(&['\u{0640}', '\u{064F}']),
-        '\u{FE7A}' => Some(&['\u{0020}', '\u{0650}']),
-        '\u{FE7B}' => Some(&['\u{0640}', '\u{0650}']),
-        '\u{FE7C}' => Some(&['\u{0020}', '\u{0651}']),
-        '\u{FE7D}' => Some(&['\u{0640}', '\u{0651}']),
-        '\u{FE7E}' => Some(&['\u{0020}', '\u{0652}']),
-        '\u{FE7F}' => Some(&['\u{0640}', '\u{0652}']),
-        '\u{FE80}' => Some(&['\u{0621}']),
-        '\u{FE81}' => Some(&['\u{0627}', '\u{0653}']),
-        '\u{FE82}' => Some(&['\u{0627}', '\u{0653}']),
-        '\u{FE83}' => Some(&['\u{0627}', '\u{0654}']),
-        '\u{FE84}' => Some(&['\u{0627}', '\u{0654}']),
-        '\u{FE85}' => Some(&['\u{0648}', '\u{0654}']),
-        '\u{FE86}' => Some(&['\u{0648}', '\u{0654}']),
-        '\u{FE87}' => Some(&['\u{0627}', '\u{0655}']),
-        '\u{FE88}' => Some(&['\u{0627}', '\u{0655}']),
-        '\u{FE89}' => Some(&['\u{064A}', '\u{0654}']),
-        '\u{FE8A}' => Some(&['\u{064A}', '\u{0654}']),
-        '\u{FE8B}' => Some(&['\u{064A}', '\u{0654}']),
-        '\u{FE8C}' => Some(&['\u{064A}', '\u{0654}']),
-        '\u{FE8D}' => Some(&['\u{0627}']),
-        '\u{FE8E}' => Some(&['\u{0627}']),
-        '\u{FE8F}' => Some(&['\u{0628}']),
-        '\u{FE90}' => Some(&['\u{0628}']),
-        '\u{FE91}' => Some(&['\u{0628}']),
-        '\u{FE92}' => Some(&['\u{0628}']),
-        '\u{FE93}' => Some(&['\u{0629}']),
-        '\u{FE94}' => Some(&['\u{0629}']),
-        '\u{FE95}' => Some(&['\u{062A}']),
-        '\u{FE96}' => Some(&['\u{062A}']),
-        '\u{FE97}' => Some(&['\u{062A}']),
-        '\u{FE98}' => Some(&['\u{062A}']),
-        '\u{FE99}' => Some(&['\u{062B}']),
-        '\u{FE9A}' => Some(&['\u{062B}']),
-        '\u{FE9B}' => Some(&['\u{062B}']),
-        '\u{FE9C}' => Some(&['\u{062B}']),
-        '\u{FE9D}' => Some(&['\u{062C}']),
-        '\u{FE9E}' => Some(&['\u{062C}']),
-        '\u{FE9F}' => Some(&['\u{062C}']),
-        '\u{FEA0}' => Some(&['\u{062C}']),
-        '\u{FEA1}' => Some(&['\u{062D}']),
-        '\u{FEA2}' => Some(&['\u{062D}']),
-        '\u{FEA3}' => Some(&['\u{062D}']),
-        '\u{FEA4}' => Some(&['\u{062D}']),
-        '\u{FEA5}' => Some(&['\u{062E}']),
-        '\u{FEA6}' => Some(&['\u{062E}']),
-        '\u{FEA7}' => Some(&['\u{062E}']),
-        '\u{FEA8}' => Some(&['\u{062E}']),
-        '\u{FEA9}' => Some(&['\u{062F}']),
-        '\u{FEAA}' => Some(&['\u{062F}']),
-        '\u{FEAB}' => Some(&['\u{0630}']),
-        '\u{FEAC}' => Some(&['\u{0630}']),
-        '\u{FEAD}' => Some(&['\u{0631}']),
-        '\u{FEAE}' => Some(&['\u{0631}']),
-        '\u{FEAF}' => Some(&['\u{0632}']),
-        '\u{FEB0}' => Some(&['\u{0632}']),
-        '\u{FEB1}' => Some(&['\u{0633}']),
-        '\u{FEB2}' => Some(&['\u{0633}']),
-        '\u{FEB3}' => Some(&['\u{0633}']),
-        '\u{FEB4}' => Some(&['\u{0633}']),
-        '\u{FEB5}' => Some(&['\u{0634}']),
-        '\u{FEB6}' => Some(&['\u{0634}']),
-        '\u{FEB7}' => Some(&['\u{0634}']),
-        '\u{FEB8}' => Some(&['\u{0634}']),
-        '\u{FEB9}' => Some(&['\u{0635}']),
-        '\u{FEBA}' => Some(&['\u{0635}']),
-        '\u{FEBB}' => Some(&['\u{0635}']),
-        '\u{FEBC}' => Some(&['\u{0635}']),
-        '\u{FEBD}' => Some(&['\u{0636}']),
-        '\u{FEBE}' => Some(&['\u{0636}']),
-        '\u{FEBF}' => Some(&['\u{0636}']),
-        '\u{FEC0}' => Some(&['\u{0636}']),
-        '\u{FEC1}' => Some(&['\u{0637}']),
-        '\u{FEC2}' => Some(&['\u{0637}']),
-        '\u{FEC3}' => Some(&['\u{0637}']),
-        '\u{FEC4}' => Some(&['\u{0637}']),
-        '\u{FEC5}' => Some(&['\u{0638}']),
-        '\u{FEC6}' => Some(&['\u{0638}']),
-        '\u{FEC7}' => Some(&['\u{0638}']),
-        '\u{FEC8}' => Some(&['\u{0638}']),
-        '\u{FEC9}' => Some(&['\u{0639}']),
-        '\u{FECA}' => Some(&['\u{0639}']),
-        '\u{FECB}' => Some(&['\u{0639}']),
-        '\u{FECC}' => Some(&['\u{0639}']),
-        '\u{FECD}' => Some(&['\u{063A}']),
-        '\u{FECE}' => Some(&['\u{063A}']),
-        '\u{FECF}' => Some(&['\u{063A}']),
-        '\u{FED0}' => Some(&['\u{063A}']),
-        '\u{FED1}' => Some(&['\u{0641}']),
-        '\u{FED2}' => Some(&['\u{0641}']),
-        '\u{FED3}' => Some(&['\u{0641}']),
-        '\u{FED4}' => Some(&['\u{0641}']),
-        '\u{FED5}' => Some(&['\u{0642}']),
-        '\u{FED6}' => Some(&['\u{0642}']),
-        '\u{FED7}' => Some(&['\u{0642}']),
-        '\u{FED8}' => Some(&['\u{0642}']),
-        '\u{FED9}' => Some(&['\u{0643}']),
-        '\u{FEDA}' => Some(&['\u{0643}']),
-        '\u{FEDB}' => Some(&['\u{0643}']),
-        '\u{FEDC}' => Some(&['\u{0643}']),
-        '\u{FEDD}' => Some(&['\u{0644}']),
-        '\u{FEDE}' => Some(&['\u{0644}']),
-        '\u{FEDF}' => Some(&['\u{0644}']),
-        '\u{FEE0}' => Some(&['\u{0644}']),
-        '\u{FEE1}' => Some(&['\u{0645}']),
-        '\u{FEE2}' => Some(&['\u{0645}']),
-        '\u{FEE3}' => Some(&['\u{0645}']),
-        '\u{FEE4}' => Some(&['\u{0645}']),
-        '\u{FEE5}' => Some(&['\u{0646}']),
-        '\u{FEE6}' => Some(&['\u{0646}']),
-        '\u{FEE7}' => Some(&['\u{0646}']),
-        '\u{FEE8}' => Some(&['\u{0646}']),
-        '\u{FEE9}' => Some(&['\u{0647}']),
-        '\u{FEEA}' => Some(&['\u{0647}']),
-        '\u{FEEB}' => Some(&['\u{0647}']),
-        '\u{FEEC}' => Some(&['\u{0647}']),
-        '\u{FEED}' => Some(&['\u{0648}']),
-        '\u{FEEE}' => Some(&['\u{0648}']),
-        '\u{FEEF}' => Some(&['\u{0649}']),
-        '\u{FEF0}' => Some(&['\u{0649}']),
-        '\u{FEF1}' => Some(&['\u{064A}']),
-        '\u{FEF2}' => Some(&['\u{064A}']),
-        '\u{FEF3}' => Some(&['\u{064A}']),
-        '\u{FEF4}' => Some(&['\u{064A}']),
-        '\u{FEF5}' => Some(&['\u{0644}', '\u{0627}', '\u{0653}']),
-        '\u{FEF6}' => Some(&['\u{0644}', '\u{0627}', '\u{0653}']),
-        '\u{FEF7}' => Some(&['\u{0644}', '\u{0627}', '\u{0654}']),
-        '\u{FEF8}' => Some(&['\u{0644}', '\u{0627}', '\u{0654}']),
-        '\u{FEF9}' => Some(&['\u{0644}', '\u{0627}', '\u{0655}']),
-        '\u{FEFA}' => Some(&['\u{0644}', '\u{0627}', '\u{0655}']),
-        '\u{FEFB}' => Some(&['\u{0644}', '\u{0627}']),
-        '\u{FEFC}' => Some(&['\u{0644}', '\u{0627}']),
-        '\u{FF01}' => Some(&['\u{0021}']),
-        '\u{FF02}' => Some(&['\u{0022}']),
-        '\u{FF03}' => Some(&['\u{0023}']),
-        '\u{FF04}' => Some(&['\u{0024}']),
-        '\u{FF05}' => Some(&['\u{0025}']),
-        '\u{FF06}' => Some(&['\u{0026}']),
-        '\u{FF07}' => Some(&['\u{0027}']),
-        '\u{FF08}' => Some(&['\u{0028}']),
-        '\u{FF09}' => Some(&['\u{0029}']),
-        '\u{FF0A}' => Some(&['\u{002A}']),
-        '\u{FF0B}' => Some(&['\u{002B}']),
-        '\u{FF0C}' => Some(&['\u{002C}']),
-        '\u{FF0D}' => Some(&['\u{002D}']),
-        '\u{FF0E}' => Some(&['\u{002E}']),
-        '\u{FF0F}' => Some(&['\u{002F}']),
-        '\u{FF10}' => Some(&['\u{0030}']),
-        '\u{FF11}' => Some(&['\u{0031}']),
-        '\u{FF12}' => Some(&['\u{0032}']),
-        '\u{FF13}' => Some(&['\u{0033}']),
-        '\u{FF14}' => Some(&['\u{0034}']),
-        '\u{FF15}' => Some(&['\u{0035}']),
-        '\u{FF16}' => Some(&['\u{0036}']),
-        '\u{FF17}' => Some(&['\u{0037}']),
-        '\u{FF18}' => Some(&['\u{0038}']),
-        '\u{FF19}' => Some(&['\u{0039}']),
-        '\u{FF1A}' => Some(&['\u{003A}']),
-        '\u{FF1B}' => Some(&['\u{003B}']),
-        '\u{FF1C}' => Some(&['\u{003C}']),
-        '\u{FF1D}' => Some(&['\u{003D}']),
-        '\u{FF1E}' => Some(&['\u{003E}']),
-        '\u{FF1F}' => Some(&['\u{003F}']),
-        '\u{FF20}' => Some(&['\u{0040}']),
-        '\u{FF21}' => Some(&['\u{0041}']),
-        '\u{FF22}' => Some(&['\u{0042}']),
-        '\u{FF23}' => Some(&['\u{0043}']),
-        '\u{FF24}' => Some(&['\u{0044}']),
-        '\u{FF25}' => Some(&['\u{0045}']),
-        '\u{FF26}' => Some(&['\u{0046}']),
-        '\u{FF27}' => Some(&['\u{0047}']),
-        '\u{FF28}' => Some(&['\u{0048}']),
-        '\u{FF29}' => Some(&['\u{0049}']),
-        '\u{FF2A}' => Some(&['\u{004A}']),
-        '\u{FF2B}' => Some(&['\u{004B}']),
-        '\u{FF2C}' => Some(&['\u{004C}']),
-        '\u{FF2D}' => Some(&['\u{004D}']),
-        '\u{FF2E}' => Some(&['\u{004E}']),
-        '\u{FF2F}' => Some(&['\u{004F}']),
-        '\u{FF30}' => Some(&['\u{0050}']),
-        '\u{FF31}' => Some(&['\u{0051}']),
-        '\u{FF32}' => Some(&['\u{0052}']),
-        '\u{FF33}' => Some(&['\u{0053}']),
-        '\u{FF34}' => Some(&['\u{0054}']),
-        '\u{FF35}' => Some(&['\u{0055}']),
-        '\u{FF36}' => Some(&['\u{0056}']),
-        '\u{FF37}' => Some(&['\u{0057}']),
-        '\u{FF38}' => Some(&['\u{0058}']),
-        '\u{FF39}' => Some(&['\u{0059}']),
-        '\u{FF3A}' => Some(&['\u{005A}']),
-        '\u{FF3B}' => Some(&['\u{005B}']),
-        '\u{FF3C}' => Some(&['\u{005C}']),
-        '\u{FF3D}' => Some(&['\u{005D}']),
-        '\u{FF3E}' => Some(&['\u{005E}']),
-        '\u{FF3F}' => Some(&['\u{005F}']),
-        '\u{FF40}' => Some(&['\u{0060}']),
-        '\u{FF41}' => Some(&['\u{0061}']),
-        '\u{FF42}' => Some(&['\u{0062}']),
-        '\u{FF43}' => Some(&['\u{0063}']),
-        '\u{FF44}' => Some(&['\u{0064}']),
-        '\u{FF45}' => Some(&['\u{0065}']),
-        '\u{FF46}' => Some(&['\u{0066}']),
-        '\u{FF47}' => Some(&['\u{0067}']),
-        '\u{FF48}' => Some(&['\u{0068}']),
-        '\u{FF49}' => Some(&['\u{0069}']),
-        '\u{FF4A}' => Some(&['\u{006A}']),
-        '\u{FF4B}' => Some(&['\u{006B}']),
-        '\u{FF4C}' => Some(&['\u{006C}']),
-        '\u{FF4D}' => Some(&['\u{006D}']),
-        '\u{FF4E}' => Some(&['\u{006E}']),
-        '\u{FF4F}' => Some(&['\u{006F}']),
-        '\u{FF50}' => Some(&['\u{0070}']),
-        '\u{FF51}' => Some(&['\u{0071}']),
-        '\u{FF52}' => Some(&['\u{0072}']),
-        '\u{FF53}' => Some(&['\u{0073}']),
-        '\u{FF54}' => Some(&['\u{0074}']),
-        '\u{FF55}' => Some(&['\u{0075}']),
-        '\u{FF56}' => Some(&['\u{0076}']),
-        '\u{FF57}' => Some(&['\u{0077}']),
-        '\u{FF58}' => Some(&['\u{0078}']),
-        '\u{FF59}' => Some(&['\u{0079}']),
-        '\u{FF5A}' => Some(&['\u{007A}']),
-        '\u{FF5B}' => Some(&['\u{007B}']),
-        '\u{FF5C}' => Some(&['\u{007C}']),
-        '\u{FF5D}' => Some(&['\u{007D}']),
-        '\u{FF5E}' => Some(&['\u{007E}']),
-        '\u{FF5F}' => Some(&['\u{2985}']),
-        '\u{FF60}' => Some(&['\u{2986}']),
-        '\u{FF61}' => Some(&['\u{3002}']),
-        '\u{FF62}' => Some(&['\u{300C}']),
-        '\u{FF63}' => Some(&['\u{300D}']),
-        '\u{FF64}' => Some(&['\u{3001}']),
-        '\u{FF65}' => Some(&['\u{30FB}']),
-        '\u{FF66}' => Some(&['\u{30F2}']),
-        '\u{FF67}' => Some(&['\u{30A1}']),
-        '\u{FF68}' => Some(&['\u{30A3}']),
-        '\u{FF69}' => Some(&['\u{30A5}']),
-        '\u{FF6A}' => Some(&['\u{30A7}']),
-        '\u{FF6B}' => Some(&['\u{30A9}']),
-        '\u{FF6C}' => Some(&['\u{30E3}']),
-        '\u{FF6D}' => Some(&['\u{30E5}']),
-        '\u{FF6E}' => Some(&['\u{30E7}']),
-        '\u{FF6F}' => Some(&['\u{30C3}']),
-        '\u{FF70}' => Some(&['\u{30FC}']),
-        '\u{FF71}' => Some(&['\u{30A2}']),
-        '\u{FF72}' => Some(&['\u{30A4}']),
-        '\u{FF73}' => Some(&['\u{30A6}']),
-        '\u{FF74}' => Some(&['\u{30A8}']),
-        '\u{FF75}' => Some(&['\u{30AA}']),
-        '\u{FF76}' => Some(&['\u{30AB}']),
-        '\u{FF77}' => Some(&['\u{30AD}']),
-        '\u{FF78}' => Some(&['\u{30AF}']),
-        '\u{FF79}' => Some(&['\u{30B1}']),
-        '\u{FF7A}' => Some(&['\u{30B3}']),
-        '\u{FF7B}' => Some(&['\u{30B5}']),
-        '\u{FF7C}' => Some(&['\u{30B7}']),
-        '\u{FF7D}' => Some(&['\u{30B9}']),
-        '\u{FF7E}' => Some(&['\u{30BB}']),
-        '\u{FF7F}' => Some(&['\u{30BD}']),
-        '\u{FF80}' => Some(&['\u{30BF}']),
-        '\u{FF81}' => Some(&['\u{30C1}']),
-        '\u{FF82}' => Some(&['\u{30C4}']),
-        '\u{FF83}' => Some(&['\u{30C6}']),
-        '\u{FF84}' => Some(&['\u{30C8}']),
-        '\u{FF85}' => Some(&['\u{30CA}']),
-        '\u{FF86}' => Some(&['\u{30CB}']),
-        '\u{FF87}' => Some(&['\u{30CC}']),
-        '\u{FF88}' => Some(&['\u{30CD}']),
-        '\u{FF89}' => Some(&['\u{30CE}']),
-        '\u{FF8A}' => Some(&['\u{30CF}']),
-        '\u{FF8B}' => Some(&['\u{30D2}']),
-        '\u{FF8C}' => Some(&['\u{30D5}']),
-        '\u{FF8D}' => Some(&['\u{30D8}']),
-        '\u{FF8E}' => Some(&['\u{30DB}']),
-        '\u{FF8F}' => Some(&['\u{30DE}']),
-        '\u{FF90}' => Some(&['\u{30DF}']),
-        '\u{FF91}' => Some(&['\u{30E0}']),
-        '\u{FF92}' => Some(&['\u{30E1}']),
-        '\u{FF93}' => Some(&['\u{30E2}']),
-        '\u{FF94}' => Some(&['\u{30E4}']),
-        '\u{FF95}' => Some(&['\u{30E6}']),
-        '\u{FF96}' => Some(&['\u{30E8}']),
-        '\u{FF97}' => Some(&['\u{30E9}']),
-        '\u{FF98}' => Some(&['\u{30EA}']),
-        '\u{FF99}' => Some(&['\u{30EB}']),
-        '\u{FF9A}' => Some(&['\u{30EC}']),
-        '\u{FF9B}' => Some(&['\u{30ED}']),
-        '\u{FF9C}' => Some(&['\u{30EF}']),
-        '\u{FF9D}' => Some(&['\u{30F3}']),
-        '\u{FF9E}' => Some(&['\u{3099}']),
-        '\u{FF9F}' => Some(&['\u{309A}']),
-        '\u{FFA0}' => Some(&['\u{1160}']),
-        '\u{FFA1}' => Some(&['\u{1100}']),
-        '\u{FFA2}' => Some(&['\u{1101}']),
-        '\u{FFA3}' => Some(&['\u{11AA}']),
-        '\u{FFA4}' => Some(&['\u{1102}']),
-        '\u{FFA5}' => Some(&['\u{11AC}']),
-        '\u{FFA6}' => Some(&['\u{11AD}']),
-        '\u{FFA7}' => Some(&['\u{1103}']),
-        '\u{FFA8}' => Some(&['\u{1104}']),
-        '\u{FFA9}' => Some(&['\u{1105}']),
-        '\u{FFAA}' => Some(&['\u{11B0}']),
-        '\u{FFAB}' => Some(&['\u{11B1}']),
-        '\u{FFAC}' => Some(&['\u{11B2}']),
-        '\u{FFAD}' => Some(&['\u{11B3}']),
-        '\u{FFAE}' => Some(&['\u{11B4}']),
-        '\u{FFAF}' => Some(&['\u{11B5}']),
-        '\u{FFB0}' => Some(&['\u{111A}']),
-        '\u{FFB1}' => Some(&['\u{1106}']),
-        '\u{FFB2}' => Some(&['\u{1107}']),
-        '\u{FFB3}' => Some(&['\u{1108}']),
-        '\u{FFB4}' => Some(&['\u{1121}']),
-        '\u{FFB5}' => Some(&['\u{1109}']),
-        '\u{FFB6}' => Some(&['\u{110A}']),
-        '\u{FFB7}' => Some(&['\u{110B}']),
-        '\u{FFB8}' => Some(&['\u{110C}']),
-        '\u{FFB9}' => Some(&['\u{110D}']),
-        '\u{FFBA}' => Some(&['\u{110E}']),
-        '\u{FFBB}' => Some(&['\u{110F}']),
-        '\u{FFBC}' => Some(&['\u{1110}']),
-        '\u{FFBD}' => Some(&['\u{1111}']),
-        '\u{FFBE}' => Some(&['\u{1112}']),
-        '\u{FFC2}' => Some(&['\u{1161}']),
-        '\u{FFC3}' => Some(&['\u{1162}']),
-        '\u{FFC4}' => Some(&['\u{1163}']),
-        '\u{FFC5}' => Some(&['\u{1164}']),
-        '\u{FFC6}' => Some(&['\u{1165}']),
-        '\u{FFC7}' => Some(&['\u{1166}']),
-        '\u{FFCA}' => Some(&['\u{1167}']),
-        '\u{FFCB}' => Some(&['\u{1168}']),
-        '\u{FFCC}' => Some(&['\u{1169}']),
-        '\u{FFCD}' => Some(&['\u{116A}']),
-        '\u{FFCE}' => Some(&['\u{116B}']),
-        '\u{FFCF}' => Some(&['\u{116C}']),
-        '\u{FFD2}' => Some(&['\u{116D}']),
-        '\u{FFD3}' => Some(&['\u{116E}']),
-        '\u{FFD4}' => Some(&['\u{116F}']),
-        '\u{FFD5}' => Some(&['\u{1170}']),
-        '\u{FFD6}' => Some(&['\u{1171}']),
-        '\u{FFD7}' => Some(&['\u{1172}']),
-        '\u{FFDA}' => Some(&['\u{1173}']),
-        '\u{FFDB}' => Some(&['\u{1174}']),
-        '\u{FFDC}' => Some(&['\u{1175}']),
-        '\u{FFE0}' => Some(&['\u{00A2}']),
-        '\u{FFE1}' => Some(&['\u{00A3}']),
-        '\u{FFE2}' => Some(&['\u{00AC}']),
-        '\u{FFE3}' => Some(&['\u{0020}', '\u{0304}']),
-        '\u{FFE4}' => Some(&['\u{00A6}']),
-        '\u{FFE5}' => Some(&['\u{00A5}']),
-        '\u{FFE6}' => Some(&['\u{20A9}']),
-        '\u{FFE8}' => Some(&['\u{2502}']),
-        '\u{FFE9}' => Some(&['\u{2190}']),
-        '\u{FFEA}' => Some(&['\u{2191}']),
-        '\u{FFEB}' => Some(&['\u{2192}']),
-        '\u{FFEC}' => Some(&['\u{2193}']),
-        '\u{FFED}' => Some(&['\u{25A0}']),
-        '\u{FFEE}' => Some(&['\u{25CB}']),
-        '\u{1D400}' => Some(&['\u{0041}']),
-        '\u{1D401}' => Some(&['\u{0042}']),
-        '\u{1D402}' => Some(&['\u{0043}']),
-        '\u{1D403}' => Some(&['\u{0044}']),
-        '\u{1D404}' => Some(&['\u{0045}']),
-        '\u{1D405}' => Some(&['\u{0046}']),
-        '\u{1D406}' => Some(&['\u{0047}']),
-        '\u{1D407}' => Some(&['\u{0048}']),
-        '\u{1D408}' => Some(&['\u{0049}']),
-        '\u{1D409}' => Some(&['\u{004A}']),
-        '\u{1D40A}' => Some(&['\u{004B}']),
-        '\u{1D40B}' => Some(&['\u{004C}']),
-        '\u{1D40C}' => Some(&['\u{004D}']),
-        '\u{1D40D}' => Some(&['\u{004E}']),
-        '\u{1D40E}' => Some(&['\u{004F}']),
-        '\u{1D40F}' => Some(&['\u{0050}']),
-        '\u{1D410}' => Some(&['\u{0051}']),
-        '\u{1D411}' => Some(&['\u{0052}']),
-        '\u{1D412}' => Some(&['\u{0053}']),
-        '\u{1D413}' => Some(&['\u{0054}']),
-        '\u{1D414}' => Some(&['\u{0055}']),
-        '\u{1D415}' => Some(&['\u{0056}']),
-        '\u{1D416}' => Some(&['\u{0057}']),
-        '\u{1D417}' => Some(&['\u{0058}']),
-        '\u{1D418}' => Some(&['\u{0059}']),
-        '\u{1D419}' => Some(&['\u{005A}']),
-        '\u{1D41A}' => Some(&['\u{0061}']),
-        '\u{1D41B}' => Some(&['\u{0062}']),
-        '\u{1D41C}' => Some(&['\u{0063}']),
-        '\u{1D41D}' => Some(&['\u{0064}']),
-        '\u{1D41E}' => Some(&['\u{0065}']),
-        '\u{1D41F}' => Some(&['\u{0066}']),
-        '\u{1D420}' => Some(&['\u{0067}']),
-        '\u{1D421}' => Some(&['\u{0068}']),
-        '\u{1D422}' => Some(&['\u{0069}']),
-        '\u{1D423}' => Some(&['\u{006A}']),
-        '\u{1D424}' => Some(&['\u{006B}']),
-        '\u{1D425}' => Some(&['\u{006C}']),
-        '\u{1D426}' => Some(&['\u{006D}']),
-        '\u{1D427}' => Some(&['\u{006E}']),
-        '\u{1D428}' => Some(&['\u{006F}']),
-        '\u{1D429}' => Some(&['\u{0070}']),
-        '\u{1D42A}' => Some(&['\u{0071}']),
-        '\u{1D42B}' => Some(&['\u{0072}']),
-        '\u{1D42C}' => Some(&['\u{0073}']),
-        '\u{1D42D}' => Some(&['\u{0074}']),
-        '\u{1D42E}' => Some(&['\u{0075}']),
-        '\u{1D42F}' => Some(&['\u{0076}']),
-        '\u{1D430}' => Some(&['\u{0077}']),
-        '\u{1D431}' => Some(&['\u{0078}']),
-        '\u{1D432}' => Some(&['\u{0079}']),
-        '\u{1D433}' => Some(&['\u{007A}']),
-        '\u{1D434}' => Some(&['\u{0041}']),
-        '\u{1D435}' => Some(&['\u{0042}']),
-        '\u{1D436}' => Some(&['\u{0043}']),
-        '\u{1D437}' => Some(&['\u{0044}']),
-        '\u{1D438}' => Some(&['\u{0045}']),
-        '\u{1D439}' => Some(&['\u{0046}']),
-        '\u{1D43A}' => Some(&['\u{0047}']),
-        '\u{1D43B}' => Some(&['\u{0048}']),
-        '\u{1D43C}' => Some(&['\u{0049}']),
-        '\u{1D43D}' => Some(&['\u{004A}']),
-        '\u{1D43E}' => Some(&['\u{004B}']),
-        '\u{1D43F}' => Some(&['\u{004C}']),
-        '\u{1D440}' => Some(&['\u{004D}']),
-        '\u{1D441}' => Some(&['\u{004E}']),
-        '\u{1D442}' => Some(&['\u{004F}']),
-        '\u{1D443}' => Some(&['\u{0050}']),
-        '\u{1D444}' => Some(&['\u{0051}']),
-        '\u{1D445}' => Some(&['\u{0052}']),
-        '\u{1D446}' => Some(&['\u{0053}']),
-        '\u{1D447}' => Some(&['\u{0054}']),
-        '\u{1D448}' => Some(&['\u{0055}']),
-        '\u{1D449}' => Some(&['\u{0056}']),
-        '\u{1D44A}' => Some(&['\u{0057}']),
-        '\u{1D44B}' => Some(&['\u{0058}']),
-        '\u{1D44C}' => Some(&['\u{0059}']),
-        '\u{1D44D}' => Some(&['\u{005A}']),
-        '\u{1D44E}' => Some(&['\u{0061}']),
-        '\u{1D44F}' => Some(&['\u{0062}']),
-        '\u{1D450}' => Some(&['\u{0063}']),
-        '\u{1D451}' => Some(&['\u{0064}']),
-        '\u{1D452}' => Some(&['\u{0065}']),
-        '\u{1D453}' => Some(&['\u{0066}']),
-        '\u{1D454}' => Some(&['\u{0067}']),
-        '\u{1D456}' => Some(&['\u{0069}']),
-        '\u{1D457}' => Some(&['\u{006A}']),
-        '\u{1D458}' => Some(&['\u{006B}']),
-        '\u{1D459}' => Some(&['\u{006C}']),
-        '\u{1D45A}' => Some(&['\u{006D}']),
-        '\u{1D45B}' => Some(&['\u{006E}']),
-        '\u{1D45C}' => Some(&['\u{006F}']),
-        '\u{1D45D}' => Some(&['\u{0070}']),
-        '\u{1D45E}' => Some(&['\u{0071}']),
-        '\u{1D45F}' => Some(&['\u{0072}']),
-        '\u{1D460}' => Some(&['\u{0073}']),
-        '\u{1D461}' => Some(&['\u{0074}']),
-        '\u{1D462}' => Some(&['\u{0075}']),
-        '\u{1D463}' => Some(&['\u{0076}']),
-        '\u{1D464}' => Some(&['\u{0077}']),
-        '\u{1D465}' => Some(&['\u{0078}']),
-        '\u{1D466}' => Some(&['\u{0079}']),
-        '\u{1D467}' => Some(&['\u{007A}']),
-        '\u{1D468}' => Some(&['\u{0041}']),
-        '\u{1D469}' => Some(&['\u{0042}']),
-        '\u{1D46A}' => Some(&['\u{0043}']),
-        '\u{1D46B}' => Some(&['\u{0044}']),
-        '\u{1D46C}' => Some(&['\u{0045}']),
-        '\u{1D46D}' => Some(&['\u{0046}']),
-        '\u{1D46E}' => Some(&['\u{0047}']),
-        '\u{1D46F}' => Some(&['\u{0048}']),
-        '\u{1D470}' => Some(&['\u{0049}']),
-        '\u{1D471}' => Some(&['\u{004A}']),
-        '\u{1D472}' => Some(&['\u{004B}']),
-        '\u{1D473}' => Some(&['\u{004C}']),
-        '\u{1D474}' => Some(&['\u{004D}']),
-        '\u{1D475}' => Some(&['\u{004E}']),
-        '\u{1D476}' => Some(&['\u{004F}']),
-        '\u{1D477}' => Some(&['\u{0050}']),
-        '\u{1D478}' => Some(&['\u{0051}']),
-        '\u{1D479}' => Some(&['\u{0052}']),
-        '\u{1D47A}' => Some(&['\u{0053}']),
-        '\u{1D47B}' => Some(&['\u{0054}']),
-        '\u{1D47C}' => Some(&['\u{0055}']),
-        '\u{1D47D}' => Some(&['\u{0056}']),
-        '\u{1D47E}' => Some(&['\u{0057}']),
-        '\u{1D47F}' => Some(&['\u{0058}']),
-        '\u{1D480}' => Some(&['\u{0059}']),
-        '\u{1D481}' => Some(&['\u{005A}']),
-        '\u{1D482}' => Some(&['\u{0061}']),
-        '\u{1D483}' => Some(&['\u{0062}']),
-        '\u{1D484}' => Some(&['\u{0063}']),
-        '\u{1D485}' => Some(&['\u{0064}']),
-        '\u{1D486}' => Some(&['\u{0065}']),
-        '\u{1D487}' => Some(&['\u{0066}']),
-        '\u{1D488}' => Some(&['\u{0067}']),
-        '\u{1D489}' => Some(&['\u{0068}']),
-        '\u{1D48A}' => Some(&['\u{0069}']),
-        '\u{1D48B}' => Some(&['\u{006A}']),
-        '\u{1D48C}' => Some(&['\u{006B}']),
-        '\u{1D48D}' => Some(&['\u{006C}']),
-        '\u{1D48E}' => Some(&['\u{006D}']),
-        '\u{1D48F}' => Some(&['\u{006E}']),
-        '\u{1D490}' => Some(&['\u{006F}']),
-        '\u{1D491}' => Some(&['\u{0070}']),
-        '\u{1D492}' => Some(&['\u{0071}']),
-        '\u{1D493}' => Some(&['\u{0072}']),
-        '\u{1D494}' => Some(&['\u{0073}']),
-        '\u{1D495}' => Some(&['\u{0074}']),
-        '\u{1D496}' => Some(&['\u{0075}']),
-        '\u{1D497}' => Some(&['\u{0076}']),
-        '\u{1D498}' => Some(&['\u{0077}']),
-        '\u{1D499}' => Some(&['\u{0078}']),
-        '\u{1D49A}' => Some(&['\u{0079}']),
-        '\u{1D49B}' => Some(&['\u{007A}']),
-        '\u{1D49C}' => Some(&['\u{0041}']),
-        '\u{1D49E}' => Some(&['\u{0043}']),
-        '\u{1D49F}' => Some(&['\u{0044}']),
-        '\u{1D4A2}' => Some(&['\u{0047}']),
-        '\u{1D4A5}' => Some(&['\u{004A}']),
-        '\u{1D4A6}' => Some(&['\u{004B}']),
-        '\u{1D4A9}' => Some(&['\u{004E}']),
-        '\u{1D4AA}' => Some(&['\u{004F}']),
-        '\u{1D4AB}' => Some(&['\u{0050}']),
-        '\u{1D4AC}' => Some(&['\u{0051}']),
-        '\u{1D4AE}' => Some(&['\u{0053}']),
-        '\u{1D4AF}' => Some(&['\u{0054}']),
-        '\u{1D4B0}' => Some(&['\u{0055}']),
-        '\u{1D4B1}' => Some(&['\u{0056}']),
-        '\u{1D4B2}' => Some(&['\u{0057}']),
-        '\u{1D4B3}' => Some(&['\u{0058}']),
-        '\u{1D4B4}' => Some(&['\u{0059}']),
-        '\u{1D4B5}' => Some(&['\u{005A}']),
-        '\u{1D4B6}' => Some(&['\u{0061}']),
-        '\u{1D4B7}' => Some(&['\u{0062}']),
-        '\u{1D4B8}' => Some(&['\u{0063}']),
-        '\u{1D4B9}' => Some(&['\u{0064}']),
-        '\u{1D4BB}' => Some(&['\u{0066}']),
-        '\u{1D4BD}' => Some(&['\u{0068}']),
-        '\u{1D4BE}' => Some(&['\u{0069}']),
-        '\u{1D4BF}' => Some(&['\u{006A}']),
-        '\u{1D4C0}' => Some(&['\u{006B}']),
-        '\u{1D4C1}' => Some(&['\u{006C}']),
-        '\u{1D4C2}' => Some(&['\u{006D}']),
-        '\u{1D4C3}' => Some(&['\u{006E}']),
-        '\u{1D4C5}' => Some(&['\u{0070}']),
-        '\u{1D4C6}' => Some(&['\u{0071}']),
-        '\u{1D4C7}' => Some(&['\u{0072}']),
-        '\u{1D4C8}' => Some(&['\u{0073}']),
-        '\u{1D4C9}' => Some(&['\u{0074}']),
-        '\u{1D4CA}' => Some(&['\u{0075}']),
-        '\u{1D4CB}' => Some(&['\u{0076}']),
-        '\u{1D4CC}' => Some(&['\u{0077}']),
-        '\u{1D4CD}' => Some(&['\u{0078}']),
-        '\u{1D4CE}' => Some(&['\u{0079}']),
-        '\u{1D4CF}' => Some(&['\u{007A}']),
-        '\u{1D4D0}' => Some(&['\u{0041}']),
-        '\u{1D4D1}' => Some(&['\u{0042}']),
-        '\u{1D4D2}' => Some(&['\u{0043}']),
-        '\u{1D4D3}' => Some(&['\u{0044}']),
-        '\u{1D4D4}' => Some(&['\u{0045}']),
-        '\u{1D4D5}' => Some(&['\u{0046}']),
-        '\u{1D4D6}' => Some(&['\u{0047}']),
-        '\u{1D4D7}' => Some(&['\u{0048}']),
-        '\u{1D4D8}' => Some(&['\u{0049}']),
-        '\u{1D4D9}' => Some(&['\u{004A}']),
-        '\u{1D4DA}' => Some(&['\u{004B}']),
-        '\u{1D4DB}' => Some(&['\u{004C}']),
-        '\u{1D4DC}' => Some(&['\u{004D}']),
-        '\u{1D4DD}' => Some(&['\u{004E}']),
-        '\u{1D4DE}' => Some(&['\u{004F}']),
-        '\u{1D4DF}' => Some(&['\u{0050}']),
-        '\u{1D4E0}' => Some(&['\u{0051}']),
-        '\u{1D4E1}' => Some(&['\u{0052}']),
-        '\u{1D4E2}' => Some(&['\u{0053}']),
-        '\u{1D4E3}' => Some(&['\u{0054}']),
-        '\u{1D4E4}' => Some(&['\u{0055}']),
-        '\u{1D4E5}' => Some(&['\u{0056}']),
-        '\u{1D4E6}' => Some(&['\u{0057}']),
-        '\u{1D4E7}' => Some(&['\u{0058}']),
-        '\u{1D4E8}' => Some(&['\u{0059}']),
-        '\u{1D4E9}' => Some(&['\u{005A}']),
-        '\u{1D4EA}' => Some(&['\u{0061}']),
-        '\u{1D4EB}' => Some(&['\u{0062}']),
-        '\u{1D4EC}' => Some(&['\u{0063}']),
-        '\u{1D4ED}' => Some(&['\u{0064}']),
-        '\u{1D4EE}' => Some(&['\u{0065}']),
-        '\u{1D4EF}' => Some(&['\u{0066}']),
-        '\u{1D4F0}' => Some(&['\u{0067}']),
-        '\u{1D4F1}' => Some(&['\u{0068}']),
-        '\u{1D4F2}' => Some(&['\u{0069}']),
-        '\u{1D4F3}' => Some(&['\u{006A}']),
-        '\u{1D4F4}' => Some(&['\u{006B}']),
-        '\u{1D4F5}' => Some(&['\u{006C}']),
-        '\u{1D4F6}' => Some(&['\u{006D}']),
-        '\u{1D4F7}' => Some(&['\u{006E}']),
-        '\u{1D4F8}' => Some(&['\u{006F}']),
-        '\u{1D4F9}' => Some(&['\u{0070}']),
-        '\u{1D4FA}' => Some(&['\u{0071}']),
-        '\u{1D4FB}' => Some(&['\u{0072}']),
-        '\u{1D4FC}' => Some(&['\u{0073}']),
-        '\u{1D4FD}' => Some(&['\u{0074}']),
-        '\u{1D4FE}' => Some(&['\u{0075}']),
-        '\u{1D4FF}' => Some(&['\u{0076}']),
-        '\u{1D500}' => Some(&['\u{0077}']),
-        '\u{1D501}' => Some(&['\u{0078}']),
-        '\u{1D502}' => Some(&['\u{0079}']),
-        '\u{1D503}' => Some(&['\u{007A}']),
-        '\u{1D504}' => Some(&['\u{0041}']),
-        '\u{1D505}' => Some(&['\u{0042}']),
-        '\u{1D507}' => Some(&['\u{0044}']),
-        '\u{1D508}' => Some(&['\u{0045}']),
-        '\u{1D509}' => Some(&['\u{0046}']),
-        '\u{1D50A}' => Some(&['\u{0047}']),
-        '\u{1D50D}' => Some(&['\u{004A}']),
-        '\u{1D50E}' => Some(&['\u{004B}']),
-        '\u{1D50F}' => Some(&['\u{004C}']),
-        '\u{1D510}' => Some(&['\u{004D}']),
-        '\u{1D511}' => Some(&['\u{004E}']),
-        '\u{1D512}' => Some(&['\u{004F}']),
-        '\u{1D513}' => Some(&['\u{0050}']),
-        '\u{1D514}' => Some(&['\u{0051}']),
-        '\u{1D516}' => Some(&['\u{0053}']),
-        '\u{1D517}' => Some(&['\u{0054}']),
-        '\u{1D518}' => Some(&['\u{0055}']),
-        '\u{1D519}' => Some(&['\u{0056}']),
-        '\u{1D51A}' => Some(&['\u{0057}']),
-        '\u{1D51B}' => Some(&['\u{0058}']),
-        '\u{1D51C}' => Some(&['\u{0059}']),
-        '\u{1D51E}' => Some(&['\u{0061}']),
-        '\u{1D51F}' => Some(&['\u{0062}']),
-        '\u{1D520}' => Some(&['\u{0063}']),
-        '\u{1D521}' => Some(&['\u{0064}']),
-        '\u{1D522}' => Some(&['\u{0065}']),
-        '\u{1D523}' => Some(&['\u{0066}']),
-        '\u{1D524}' => Some(&['\u{0067}']),
-        '\u{1D525}' => Some(&['\u{0068}']),
-        '\u{1D526}' => Some(&['\u{0069}']),
-        '\u{1D527}' => Some(&['\u{006A}']),
-        '\u{1D528}' => Some(&['\u{006B}']),
-        '\u{1D529}' => Some(&['\u{006C}']),
-        '\u{1D52A}' => Some(&['\u{006D}']),
-        '\u{1D52B}' => Some(&['\u{006E}']),
-        '\u{1D52C}' => Some(&['\u{006F}']),
-        '\u{1D52D}' => Some(&['\u{0070}']),
-        '\u{1D52E}' => Some(&['\u{0071}']),
-        '\u{1D52F}' => Some(&['\u{0072}']),
-        '\u{1D530}' => Some(&['\u{0073}']),
-        '\u{1D531}' => Some(&['\u{0074}']),
-        '\u{1D532}' => Some(&['\u{0075}']),
-        '\u{1D533}' => Some(&['\u{0076}']),
-        '\u{1D534}' => Some(&['\u{0077}']),
-        '\u{1D535}' => Some(&['\u{0078}']),
-        '\u{1D536}' => Some(&['\u{0079}']),
-        '\u{1D537}' => Some(&['\u{007A}']),
-        '\u{1D538}' => Some(&['\u{0041}']),
-        '\u{1D539}' => Some(&['\u{0042}']),
-        '\u{1D53B}' => Some(&['\u{0044}']),
-        '\u{1D53C}' => Some(&['\u{0045}']),
-        '\u{1D53D}' => Some(&['\u{0046}']),
-        '\u{1D53E}' => Some(&['\u{0047}']),
-        '\u{1D540}' => Some(&['\u{0049}']),
-        '\u{1D541}' => Some(&['\u{004A}']),
-        '\u{1D542}' => Some(&['\u{004B}']),
-        '\u{1D543}' => Some(&['\u{004C}']),
-        '\u{1D544}' => Some(&['\u{004D}']),
-        '\u{1D546}' => Some(&['\u{004F}']),
-        '\u{1D54A}' => Some(&['\u{0053}']),
-        '\u{1D54B}' => Some(&['\u{0054}']),
-        '\u{1D54C}' => Some(&['\u{0055}']),
-        '\u{1D54D}' => Some(&['\u{0056}']),
-        '\u{1D54E}' => Some(&['\u{0057}']),
-        '\u{1D54F}' => Some(&['\u{0058}']),
-        '\u{1D550}' => Some(&['\u{0059}']),
-        '\u{1D552}' => Some(&['\u{0061}']),
-        '\u{1D553}' => Some(&['\u{0062}']),
-        '\u{1D554}' => Some(&['\u{0063}']),
-        '\u{1D555}' => Some(&['\u{0064}']),
-        '\u{1D556}' => Some(&['\u{0065}']),
-        '\u{1D557}' => Some(&['\u{0066}']),
-        '\u{1D558}' => Some(&['\u{0067}']),
-        '\u{1D559}' => Some(&['\u{0068}']),
-        '\u{1D55A}' => Some(&['\u{0069}']),
-        '\u{1D55B}' => Some(&['\u{006A}']),
-        '\u{1D55C}' => Some(&['\u{006B}']),
-        '\u{1D55D}' => Some(&['\u{006C}']),
-        '\u{1D55E}' => Some(&['\u{006D}']),
-        '\u{1D55F}' => Some(&['\u{006E}']),
-        '\u{1D560}' => Some(&['\u{006F}']),
-        '\u{1D561}' => Some(&['\u{0070}']),
-        '\u{1D562}' => Some(&['\u{0071}']),
-        '\u{1D563}' => Some(&['\u{0072}']),
-        '\u{1D564}' => Some(&['\u{0073}']),
-        '\u{1D565}' => Some(&['\u{0074}']),
-        '\u{1D566}' => Some(&['\u{0075}']),
-        '\u{1D567}' => Some(&['\u{0076}']),
-        '\u{1D568}' => Some(&['\u{0077}']),
-        '\u{1D569}' => Some(&['\u{0078}']),
-        '\u{1D56A}' => Some(&['\u{0079}']),
-        '\u{1D56B}' => Some(&['\u{007A}']),
-        '\u{1D56C}' => Some(&['\u{0041}']),
-        '\u{1D56D}' => Some(&['\u{0042}']),
-        '\u{1D56E}' => Some(&['\u{0043}']),
-        '\u{1D56F}' => Some(&['\u{0044}']),
-        '\u{1D570}' => Some(&['\u{0045}']),
-        '\u{1D571}' => Some(&['\u{0046}']),
-        '\u{1D572}' => Some(&['\u{0047}']),
-        '\u{1D573}' => Some(&['\u{0048}']),
-        '\u{1D574}' => Some(&['\u{0049}']),
-        '\u{1D575}' => Some(&['\u{004A}']),
-        '\u{1D576}' => Some(&['\u{004B}']),
-        '\u{1D577}' => Some(&['\u{004C}']),
-        '\u{1D578}' => Some(&['\u{004D}']),
-        '\u{1D579}' => Some(&['\u{004E}']),
-        '\u{1D57A}' => Some(&['\u{004F}']),
-        '\u{1D57B}' => Some(&['\u{0050}']),
-        '\u{1D57C}' => Some(&['\u{0051}']),
-        '\u{1D57D}' => Some(&['\u{0052}']),
-        '\u{1D57E}' => Some(&['\u{0053}']),
-        '\u{1D57F}' => Some(&['\u{0054}']),
-        '\u{1D580}' => Some(&['\u{0055}']),
-        '\u{1D581}' => Some(&['\u{0056}']),
-        '\u{1D582}' => Some(&['\u{0057}']),
-        '\u{1D583}' => Some(&['\u{0058}']),
-        '\u{1D584}' => Some(&['\u{0059}']),
-        '\u{1D585}' => Some(&['\u{005A}']),
-        '\u{1D586}' => Some(&['\u{0061}']),
-        '\u{1D587}' => Some(&['\u{0062}']),
-        '\u{1D588}' => Some(&['\u{0063}']),
-        '\u{1D589}' => Some(&['\u{0064}']),
-        '\u{1D58A}' => Some(&['\u{0065}']),
-        '\u{1D58B}' => Some(&['\u{0066}']),
-        '\u{1D58C}' => Some(&['\u{0067}']),
-        '\u{1D58D}' => Some(&['\u{0068}']),
-        '\u{1D58E}' => Some(&['\u{0069}']),
-        '\u{1D58F}' => Some(&['\u{006A}']),
-        '\u{1D590}' => Some(&['\u{006B}']),
-        '\u{1D591}' => Some(&['\u{006C}']),
-        '\u{1D592}' => Some(&['\u{006D}']),
-        '\u{1D593}' => Some(&['\u{006E}']),
-        '\u{1D594}' => Some(&['\u{006F}']),
-        '\u{1D595}' => Some(&['\u{0070}']),
-        '\u{1D596}' => Some(&['\u{0071}']),
-        '\u{1D597}' => Some(&['\u{0072}']),
-        '\u{1D598}' => Some(&['\u{0073}']),
-        '\u{1D599}' => Some(&['\u{0074}']),
-        '\u{1D59A}' => Some(&['\u{0075}']),
-        '\u{1D59B}' => Some(&['\u{0076}']),
-        '\u{1D59C}' => Some(&['\u{0077}']),
-        '\u{1D59D}' => Some(&['\u{0078}']),
-        '\u{1D59E}' => Some(&['\u{0079}']),
-        '\u{1D59F}' => Some(&['\u{007A}']),
-        '\u{1D5A0}' => Some(&['\u{0041}']),
-        '\u{1D5A1}' => Some(&['\u{0042}']),
-        '\u{1D5A2}' => Some(&['\u{0043}']),
-        '\u{1D5A3}' => Some(&['\u{0044}']),
-        '\u{1D5A4}' => Some(&['\u{0045}']),
-        '\u{1D5A5}' => Some(&['\u{0046}']),
-        '\u{1D5A6}' => Some(&['\u{0047}']),
-        '\u{1D5A7}' => Some(&['\u{0048}']),
-        '\u{1D5A8}' => Some(&['\u{0049}']),
-        '\u{1D5A9}' => Some(&['\u{004A}']),
-        '\u{1D5AA}' => Some(&['\u{004B}']),
-        '\u{1D5AB}' => Some(&['\u{004C}']),
-        '\u{1D5AC}' => Some(&['\u{004D}']),
-        '\u{1D5AD}' => Some(&['\u{004E}']),
-        '\u{1D5AE}' => Some(&['\u{004F}']),
-        '\u{1D5AF}' => Some(&['\u{0050}']),
-        '\u{1D5B0}' => Some(&['\u{0051}']),
-        '\u{1D5B1}' => Some(&['\u{0052}']),
-        '\u{1D5B2}' => Some(&['\u{0053}']),
-        '\u{1D5B3}' => Some(&['\u{0054}']),
-        '\u{1D5B4}' => Some(&['\u{0055}']),
-        '\u{1D5B5}' => Some(&['\u{0056}']),
-        '\u{1D5B6}' => Some(&['\u{0057}']),
-        '\u{1D5B7}' => Some(&['\u{0058}']),
-        '\u{1D5B8}' => Some(&['\u{0059}']),
-        '\u{1D5B9}' => Some(&['\u{005A}']),
-        '\u{1D5BA}' => Some(&['\u{0061}']),
-        '\u{1D5BB}' => Some(&['\u{0062}']),
-        '\u{1D5BC}' => Some(&['\u{0063}']),
-        '\u{1D5BD}' => Some(&['\u{0064}']),
-        '\u{1D5BE}' => Some(&['\u{0065}']),
-        '\u{1D5BF}' => Some(&['\u{0066}']),
-        '\u{1D5C0}' => Some(&['\u{0067}']),
-        '\u{1D5C1}' => Some(&['\u{0068}']),
-        '\u{1D5C2}' => Some(&['\u{0069}']),
-        '\u{1D5C3}' => Some(&['\u{006A}']),
-        '\u{1D5C4}' => Some(&['\u{006B}']),
-        '\u{1D5C5}' => Some(&['\u{006C}']),
-        '\u{1D5C6}' => Some(&['\u{006D}']),
-        '\u{1D5C7}' => Some(&['\u{006E}']),
-        '\u{1D5C8}' => Some(&['\u{006F}']),
-        '\u{1D5C9}' => Some(&['\u{0070}']),
-        '\u{1D5CA}' => Some(&['\u{0071}']),
-        '\u{1D5CB}' => Some(&['\u{0072}']),
-        '\u{1D5CC}' => Some(&['\u{0073}']),
-        '\u{1D5CD}' => Some(&['\u{0074}']),
-        '\u{1D5CE}' => Some(&['\u{0075}']),
-        '\u{1D5CF}' => Some(&['\u{0076}']),
-        '\u{1D5D0}' => Some(&['\u{0077}']),
-        '\u{1D5D1}' => Some(&['\u{0078}']),
-        '\u{1D5D2}' => Some(&['\u{0079}']),
-        '\u{1D5D3}' => Some(&['\u{007A}']),
-        '\u{1D5D4}' => Some(&['\u{0041}']),
-        '\u{1D5D5}' => Some(&['\u{0042}']),
-        '\u{1D5D6}' => Some(&['\u{0043}']),
-        '\u{1D5D7}' => Some(&['\u{0044}']),
-        '\u{1D5D8}' => Some(&['\u{0045}']),
-        '\u{1D5D9}' => Some(&['\u{0046}']),
-        '\u{1D5DA}' => Some(&['\u{0047}']),
-        '\u{1D5DB}' => Some(&['\u{0048}']),
-        '\u{1D5DC}' => Some(&['\u{0049}']),
-        '\u{1D5DD}' => Some(&['\u{004A}']),
-        '\u{1D5DE}' => Some(&['\u{004B}']),
-        '\u{1D5DF}' => Some(&['\u{004C}']),
-        '\u{1D5E0}' => Some(&['\u{004D}']),
-        '\u{1D5E1}' => Some(&['\u{004E}']),
-        '\u{1D5E2}' => Some(&['\u{004F}']),
-        '\u{1D5E3}' => Some(&['\u{0050}']),
-        '\u{1D5E4}' => Some(&['\u{0051}']),
-        '\u{1D5E5}' => Some(&['\u{0052}']),
-        '\u{1D5E6}' => Some(&['\u{0053}']),
-        '\u{1D5E7}' => Some(&['\u{0054}']),
-        '\u{1D5E8}' => Some(&['\u{0055}']),
-        '\u{1D5E9}' => Some(&['\u{0056}']),
-        '\u{1D5EA}' => Some(&['\u{0057}']),
-        '\u{1D5EB}' => Some(&['\u{0058}']),
-        '\u{1D5EC}' => Some(&['\u{0059}']),
-        '\u{1D5ED}' => Some(&['\u{005A}']),
-        '\u{1D5EE}' => Some(&['\u{0061}']),
-        '\u{1D5EF}' => Some(&['\u{0062}']),
-        '\u{1D5F0}' => Some(&['\u{0063}']),
-        '\u{1D5F1}' => Some(&['\u{0064}']),
-        '\u{1D5F2}' => Some(&['\u{0065}']),
-        '\u{1D5F3}' => Some(&['\u{0066}']),
-        '\u{1D5F4}' => Some(&['\u{0067}']),
-        '\u{1D5F5}' => Some(&['\u{0068}']),
-        '\u{1D5F6}' => Some(&['\u{0069}']),
-        '\u{1D5F7}' => Some(&['\u{006A}']),
-        '\u{1D5F8}' => Some(&['\u{006B}']),
-        '\u{1D5F9}' => Some(&['\u{006C}']),
-        '\u{1D5FA}' => Some(&['\u{006D}']),
-        '\u{1D5FB}' => Some(&['\u{006E}']),
-        '\u{1D5FC}' => Some(&['\u{006F}']),
-        '\u{1D5FD}' => Some(&['\u{0070}']),
-        '\u{1D5FE}' => Some(&['\u{0071}']),
-        '\u{1D5FF}' => Some(&['\u{0072}']),
-        '\u{1D600}' => Some(&['\u{0073}']),
-        '\u{1D601}' => Some(&['\u{0074}']),
-        '\u{1D602}' => Some(&['\u{0075}']),
-        '\u{1D603}' => Some(&['\u{0076}']),
-        '\u{1D604}' => Some(&['\u{0077}']),
-        '\u{1D605}' => Some(&['\u{0078}']),
-        '\u{1D606}' => Some(&['\u{0079}']),
-        '\u{1D607}' => Some(&['\u{007A}']),
-        '\u{1D608}' => Some(&['\u{0041}']),
-        '\u{1D609}' => Some(&['\u{0042}']),
-        '\u{1D60A}' => Some(&['\u{0043}']),
-        '\u{1D60B}' => Some(&['\u{0044}']),
-        '\u{1D60C}' => Some(&['\u{0045}']),
-        '\u{1D60D}' => Some(&['\u{0046}']),
-        '\u{1D60E}' => Some(&['\u{0047}']),
-        '\u{1D60F}' => Some(&['\u{0048}']),
-        '\u{1D610}' => Some(&['\u{0049}']),
-        '\u{1D611}' => Some(&['\u{004A}']),
-        '\u{1D612}' => Some(&['\u{004B}']),
-        '\u{1D613}' => Some(&['\u{004C}']),
-        '\u{1D614}' => Some(&['\u{004D}']),
-        '\u{1D615}' => Some(&['\u{004E}']),
-        '\u{1D616}' => Some(&['\u{004F}']),
-        '\u{1D617}' => Some(&['\u{0050}']),
-        '\u{1D618}' => Some(&['\u{0051}']),
-        '\u{1D619}' => Some(&['\u{0052}']),
-        '\u{1D61A}' => Some(&['\u{0053}']),
-        '\u{1D61B}' => Some(&['\u{0054}']),
-        '\u{1D61C}' => Some(&['\u{0055}']),
-        '\u{1D61D}' => Some(&['\u{0056}']),
-        '\u{1D61E}' => Some(&['\u{0057}']),
-        '\u{1D61F}' => Some(&['\u{0058}']),
-        '\u{1D620}' => Some(&['\u{0059}']),
-        '\u{1D621}' => Some(&['\u{005A}']),
-        '\u{1D622}' => Some(&['\u{0061}']),
-        '\u{1D623}' => Some(&['\u{0062}']),
-        '\u{1D624}' => Some(&['\u{0063}']),
-        '\u{1D625}' => Some(&['\u{0064}']),
-        '\u{1D626}' => Some(&['\u{0065}']),
-        '\u{1D627}' => Some(&['\u{0066}']),
-        '\u{1D628}' => Some(&['\u{0067}']),
-        '\u{1D629}' => Some(&['\u{0068}']),
-        '\u{1D62A}' => Some(&['\u{0069}']),
-        '\u{1D62B}' => Some(&['\u{006A}']),
-        '\u{1D62C}' => Some(&['\u{006B}']),
-        '\u{1D62D}' => Some(&['\u{006C}']),
-        '\u{1D62E}' => Some(&['\u{006D}']),
-        '\u{1D62F}' => Some(&['\u{006E}']),
-        '\u{1D630}' => Some(&['\u{006F}']),
-        '\u{1D631}' => Some(&['\u{0070}']),
-        '\u{1D632}' => Some(&['\u{0071}']),
-        '\u{1D633}' => Some(&['\u{0072}']),
-        '\u{1D634}' => Some(&['\u{0073}']),
-        '\u{1D635}' => Some(&['\u{0074}']),
-        '\u{1D636}' => Some(&['\u{0075}']),
-        '\u{1D637}' => Some(&['\u{0076}']),
-        '\u{1D638}' => Some(&['\u{0077}']),
-        '\u{1D639}' => Some(&['\u{0078}']),
-        '\u{1D63A}' => Some(&['\u{0079}']),
-        '\u{1D63B}' => Some(&['\u{007A}']),
-        '\u{1D63C}' => Some(&['\u{0041}']),
-        '\u{1D63D}' => Some(&['\u{0042}']),
-        '\u{1D63E}' => Some(&['\u{0043}']),
-        '\u{1D63F}' => Some(&['\u{0044}']),
-        '\u{1D640}' => Some(&['\u{0045}']),
-        '\u{1D641}' => Some(&['\u{0046}']),
-        '\u{1D642}' => Some(&['\u{0047}']),
-        '\u{1D643}' => Some(&['\u{0048}']),
-        '\u{1D644}' => Some(&['\u{0049}']),
-        '\u{1D645}' => Some(&['\u{004A}']),
-        '\u{1D646}' => Some(&['\u{004B}']),
-        '\u{1D647}' => Some(&['\u{004C}']),
-        '\u{1D648}' => Some(&['\u{004D}']),
-        '\u{1D649}' => Some(&['\u{004E}']),
-        '\u{1D64A}' => Some(&['\u{004F}']),
-        '\u{1D64B}' => Some(&['\u{0050}']),
-        '\u{1D64C}' => Some(&['\u{0051}']),
-        '\u{1D64D}' => Some(&['\u{0052}']),
-        '\u{1D64E}' => Some(&['\u{0053}']),
-        '\u{1D64F}' => Some(&['\u{0054}']),
-        '\u{1D650}' => Some(&['\u{0055}']),
-        '\u{1D651}' => Some(&['\u{0056}']),
-        '\u{1D652}' => Some(&['\u{0057}']),
-        '\u{1D653}' => Some(&['\u{0058}']),
-        '\u{1D654}' => Some(&['\u{0059}']),
-        '\u{1D655}' => Some(&['\u{005A}']),
-        '\u{1D656}' => Some(&['\u{0061}']),
-        '\u{1D657}' => Some(&['\u{0062}']),
-        '\u{1D658}' => Some(&['\u{0063}']),
-        '\u{1D659}' => Some(&['\u{0064}']),
-        '\u{1D65A}' => Some(&['\u{0065}']),
-        '\u{1D65B}' => Some(&['\u{0066}']),
-        '\u{1D65C}' => Some(&['\u{0067}']),
-        '\u{1D65D}' => Some(&['\u{0068}']),
-        '\u{1D65E}' => Some(&['\u{0069}']),
-        '\u{1D65F}' => Some(&['\u{006A}']),
-        '\u{1D660}' => Some(&['\u{006B}']),
-        '\u{1D661}' => Some(&['\u{006C}']),
-        '\u{1D662}' => Some(&['\u{006D}']),
-        '\u{1D663}' => Some(&['\u{006E}']),
-        '\u{1D664}' => Some(&['\u{006F}']),
-        '\u{1D665}' => Some(&['\u{0070}']),
-        '\u{1D666}' => Some(&['\u{0071}']),
-        '\u{1D667}' => Some(&['\u{0072}']),
-        '\u{1D668}' => Some(&['\u{0073}']),
-        '\u{1D669}' => Some(&['\u{0074}']),
-        '\u{1D66A}' => Some(&['\u{0075}']),
-        '\u{1D66B}' => Some(&['\u{0076}']),
-        '\u{1D66C}' => Some(&['\u{0077}']),
-        '\u{1D66D}' => Some(&['\u{0078}']),
-        '\u{1D66E}' => Some(&['\u{0079}']),
-        '\u{1D66F}' => Some(&['\u{007A}']),
-        '\u{1D670}' => Some(&['\u{0041}']),
-        '\u{1D671}' => Some(&['\u{0042}']),
-        '\u{1D672}' => Some(&['\u{0043}']),
-        '\u{1D673}' => Some(&['\u{0044}']),
-        '\u{1D674}' => Some(&['\u{0045}']),
-        '\u{1D675}' => Some(&['\u{0046}']),
-        '\u{1D676}' => Some(&['\u{0047}']),
-        '\u{1D677}' => Some(&['\u{0048}']),
-        '\u{1D678}' => Some(&['\u{0049}']),
-        '\u{1D679}' => Some(&['\u{004A}']),
-        '\u{1D67A}' => Some(&['\u{004B}']),
-        '\u{1D67B}' => Some(&['\u{004C}']),
-        '\u{1D67C}' => Some(&['\u{004D}']),
-        '\u{1D67D}' => Some(&['\u{004E}']),
-        '\u{1D67E}' => Some(&['\u{004F}']),
-        '\u{1D67F}' => Some(&['\u{0050}']),
-        '\u{1D680}' => Some(&['\u{0051}']),
-        '\u{1D681}' => Some(&['\u{0052}']),
-        '\u{1D682}' => Some(&['\u{0053}']),
-        '\u{1D683}' => Some(&['\u{0054}']),
-        '\u{1D684}' => Some(&['\u{0055}']),
-        '\u{1D685}' => Some(&['\u{0056}']),
-        '\u{1D686}' => Some(&['\u{0057}']),
-        '\u{1D687}' => Some(&['\u{0058}']),
-        '\u{1D688}' => Some(&['\u{0059}']),
-        '\u{1D689}' => Some(&['\u{005A}']),
-        '\u{1D68A}' => Some(&['\u{0061}']),
-        '\u{1D68B}' => Some(&['\u{0062}']),
-        '\u{1D68C}' => Some(&['\u{0063}']),
-        '\u{1D68D}' => Some(&['\u{0064}']),
-        '\u{1D68E}' => Some(&['\u{0065}']),
-        '\u{1D68F}' => Some(&['\u{0066}']),
-        '\u{1D690}' => Some(&['\u{0067}']),
-        '\u{1D691}' => Some(&['\u{0068}']),
-        '\u{1D692}' => Some(&['\u{0069}']),
-        '\u{1D693}' => Some(&['\u{006A}']),
-        '\u{1D694}' => Some(&['\u{006B}']),
-        '\u{1D695}' => Some(&['\u{006C}']),
-        '\u{1D696}' => Some(&['\u{006D}']),
-        '\u{1D697}' => Some(&['\u{006E}']),
-        '\u{1D698}' => Some(&['\u{006F}']),
-        '\u{1D699}' => Some(&['\u{0070}']),
-        '\u{1D69A}' => Some(&['\u{0071}']),
-        '\u{1D69B}' => Some(&['\u{0072}']),
-        '\u{1D69C}' => Some(&['\u{0073}']),
-        '\u{1D69D}' => Some(&['\u{0074}']),
-        '\u{1D69E}' => Some(&['\u{0075}']),
-        '\u{1D69F}' => Some(&['\u{0076}']),
-        '\u{1D6A0}' => Some(&['\u{0077}']),
-        '\u{1D6A1}' => Some(&['\u{0078}']),
-        '\u{1D6A2}' => Some(&['\u{0079}']),
-        '\u{1D6A3}' => Some(&['\u{007A}']),
-        '\u{1D6A4}' => Some(&['\u{0131}']),
-        '\u{1D6A5}' => Some(&['\u{0237}']),
-        '\u{1D6A8}' => Some(&['\u{0391}']),
-        '\u{1D6A9}' => Some(&['\u{0392}']),
-        '\u{1D6AA}' => Some(&['\u{0393}']),
-        '\u{1D6AB}' => Some(&['\u{0394}']),
-        '\u{1D6AC}' => Some(&['\u{0395}']),
-        '\u{1D6AD}' => Some(&['\u{0396}']),
-        '\u{1D6AE}' => Some(&['\u{0397}']),
-        '\u{1D6AF}' => Some(&['\u{0398}']),
-        '\u{1D6B0}' => Some(&['\u{0399}']),
-        '\u{1D6B1}' => Some(&['\u{039A}']),
-        '\u{1D6B2}' => Some(&['\u{039B}']),
-        '\u{1D6B3}' => Some(&['\u{039C}']),
-        '\u{1D6B4}' => Some(&['\u{039D}']),
-        '\u{1D6B5}' => Some(&['\u{039E}']),
-        '\u{1D6B6}' => Some(&['\u{039F}']),
-        '\u{1D6B7}' => Some(&['\u{03A0}']),
-        '\u{1D6B8}' => Some(&['\u{03A1}']),
-        '\u{1D6B9}' => Some(&['\u{0398}']),
-        '\u{1D6BA}' => Some(&['\u{03A3}']),
-        '\u{1D6BB}' => Some(&['\u{03A4}']),
-        '\u{1D6BC}' => Some(&['\u{03A5}']),
-        '\u{1D6BD}' => Some(&['\u{03A6}']),
-        '\u{1D6BE}' => Some(&['\u{03A7}']),
-        '\u{1D6BF}' => Some(&['\u{03A8}']),
-        '\u{1D6C0}' => Some(&['\u{03A9}']),
-        '\u{1D6C1}' => Some(&['\u{2207}']),
-        '\u{1D6C2}' => Some(&['\u{03B1}']),
-        '\u{1D6C3}' => Some(&['\u{03B2}']),
-        '\u{1D6C4}' => Some(&['\u{03B3}']),
-        '\u{1D6C5}' => Some(&['\u{03B4}']),
-        '\u{1D6C6}' => Some(&['\u{03B5}']),
-        '\u{1D6C7}' => Some(&['\u{03B6}']),
-        '\u{1D6C8}' => Some(&['\u{03B7}']),
-        '\u{1D6C9}' => Some(&['\u{03B8}']),
-        '\u{1D6CA}' => Some(&['\u{03B9}']),
-        '\u{1D6CB}' => Some(&['\u{03BA}']),
-        '\u{1D6CC}' => Some(&['\u{03BB}']),
-        '\u{1D6CD}' => Some(&['\u{03BC}']),
-        '\u{1D6CE}' => Some(&['\u{03BD}']),
-        '\u{1D6CF}' => Some(&['\u{03BE}']),
-        '\u{1D6D0}' => Some(&['\u{03BF}']),
-        '\u{1D6D1}' => Some(&['\u{03C0}']),
-        '\u{1D6D2}' => Some(&['\u{03C1}']),
-        '\u{1D6D3}' => Some(&['\u{03C2}']),
-        '\u{1D6D4}' => Some(&['\u{03C3}']),
-        '\u{1D6D5}' => Some(&['\u{03C4}']),
-        '\u{1D6D6}' => Some(&['\u{03C5}']),
-        '\u{1D6D7}' => Some(&['\u{03C6}']),
-        '\u{1D6D8}' => Some(&['\u{03C7}']),
-        '\u{1D6D9}' => Some(&['\u{03C8}']),
-        '\u{1D6DA}' => Some(&['\u{03C9}']),
-        '\u{1D6DB}' => Some(&['\u{2202}']),
-        '\u{1D6DC}' => Some(&['\u{03B5}']),
-        '\u{1D6DD}' => Some(&['\u{03B8}']),
-        '\u{1D6DE}' => Some(&['\u{03BA}']),
-        '\u{1D6DF}' => Some(&['\u{03C6}']),
-        '\u{1D6E0}' => Some(&['\u{03C1}']),
-        '\u{1D6E1}' => Some(&['\u{03C0}']),
-        '\u{1D6E2}' => Some(&['\u{0391}']),
-        '\u{1D6E3}' => Some(&['\u{0392}']),
-        '\u{1D6E4}' => Some(&['\u{0393}']),
-        '\u{1D6E5}' => Some(&['\u{0394}']),
-        '\u{1D6E6}' => Some(&['\u{0395}']),
-        '\u{1D6E7}' => Some(&['\u{0396}']),
-        '\u{1D6E8}' => Some(&['\u{0397}']),
-        '\u{1D6E9}' => Some(&['\u{0398}']),
-        '\u{1D6EA}' => Some(&['\u{0399}']),
-        '\u{1D6EB}' => Some(&['\u{039A}']),
-        '\u{1D6EC}' => Some(&['\u{039B}']),
-        '\u{1D6ED}' => Some(&['\u{039C}']),
-        '\u{1D6EE}' => Some(&['\u{039D}']),
-        '\u{1D6EF}' => Some(&['\u{039E}']),
-        '\u{1D6F0}' => Some(&['\u{039F}']),
-        '\u{1D6F1}' => Some(&['\u{03A0}']),
-        '\u{1D6F2}' => Some(&['\u{03A1}']),
-        '\u{1D6F3}' => Some(&['\u{0398}']),
-        '\u{1D6F4}' => Some(&['\u{03A3}']),
-        '\u{1D6F5}' => Some(&['\u{03A4}']),
-        '\u{1D6F6}' => Some(&['\u{03A5}']),
-        '\u{1D6F7}' => Some(&['\u{03A6}']),
-        '\u{1D6F8}' => Some(&['\u{03A7}']),
-        '\u{1D6F9}' => Some(&['\u{03A8}']),
-        '\u{1D6FA}' => Some(&['\u{03A9}']),
-        '\u{1D6FB}' => Some(&['\u{2207}']),
-        '\u{1D6FC}' => Some(&['\u{03B1}']),
-        '\u{1D6FD}' => Some(&['\u{03B2}']),
-        '\u{1D6FE}' => Some(&['\u{03B3}']),
-        '\u{1D6FF}' => Some(&['\u{03B4}']),
-        '\u{1D700}' => Some(&['\u{03B5}']),
-        '\u{1D701}' => Some(&['\u{03B6}']),
-        '\u{1D702}' => Some(&['\u{03B7}']),
-        '\u{1D703}' => Some(&['\u{03B8}']),
-        '\u{1D704}' => Some(&['\u{03B9}']),
-        '\u{1D705}' => Some(&['\u{03BA}']),
-        '\u{1D706}' => Some(&['\u{03BB}']),
-        '\u{1D707}' => Some(&['\u{03BC}']),
-        '\u{1D708}' => Some(&['\u{03BD}']),
-        '\u{1D709}' => Some(&['\u{03BE}']),
-        '\u{1D70A}' => Some(&['\u{03BF}']),
-        '\u{1D70B}' => Some(&['\u{03C0}']),
-        '\u{1D70C}' => Some(&['\u{03C1}']),
-        '\u{1D70D}' => Some(&['\u{03C2}']),
-        '\u{1D70E}' => Some(&['\u{03C3}']),
-        '\u{1D70F}' => Some(&['\u{03C4}']),
-        '\u{1D710}' => Some(&['\u{03C5}']),
-        '\u{1D711}' => Some(&['\u{03C6}']),
-        '\u{1D712}' => Some(&['\u{03C7}']),
-        '\u{1D713}' => Some(&['\u{03C8}']),
-        '\u{1D714}' => Some(&['\u{03C9}']),
-        '\u{1D715}' => Some(&['\u{2202}']),
-        '\u{1D716}' => Some(&['\u{03B5}']),
-        '\u{1D717}' => Some(&['\u{03B8}']),
-        '\u{1D718}' => Some(&['\u{03BA}']),
-        '\u{1D719}' => Some(&['\u{03C6}']),
-        '\u{1D71A}' => Some(&['\u{03C1}']),
-        '\u{1D71B}' => Some(&['\u{03C0}']),
-        '\u{1D71C}' => Some(&['\u{0391}']),
-        '\u{1D71D}' => Some(&['\u{0392}']),
-        '\u{1D71E}' => Some(&['\u{0393}']),
-        '\u{1D71F}' => Some(&['\u{0394}']),
-        '\u{1D720}' => Some(&['\u{0395}']),
-        '\u{1D721}' => Some(&['\u{0396}']),
-        '\u{1D722}' => Some(&['\u{0397}']),
-        '\u{1D723}' => Some(&['\u{0398}']),
-        '\u{1D724}' => Some(&['\u{0399}']),
-        '\u{1D725}' => Some(&['\u{039A}']),
-        '\u{1D726}' => Some(&['\u{039B}']),
-        '\u{1D727}' => Some(&['\u{039C}']),
-        '\u{1D728}' => Some(&['\u{039D}']),
-        '\u{1D729}' => Some(&['\u{039E}']),
-        '\u{1D72A}' => Some(&['\u{039F}']),
-        '\u{1D72B}' => Some(&['\u{03A0}']),
-        '\u{1D72C}' => Some(&['\u{03A1}']),
-        '\u{1D72D}' => Some(&['\u{0398}']),
-        '\u{1D72E}' => Some(&['\u{03A3}']),
-        '\u{1D72F}' => Some(&['\u{03A4}']),
-        '\u{1D730}' => Some(&['\u{03A5}']),
-        '\u{1D731}' => Some(&['\u{03A6}']),
-        '\u{1D732}' => Some(&['\u{03A7}']),
-        '\u{1D733}' => Some(&['\u{03A8}']),
-        '\u{1D734}' => Some(&['\u{03A9}']),
-        '\u{1D735}' => Some(&['\u{2207}']),
-        '\u{1D736}' => Some(&['\u{03B1}']),
-        '\u{1D737}' => Some(&['\u{03B2}']),
-        '\u{1D738}' => Some(&['\u{03B3}']),
-        '\u{1D739}' => Some(&['\u{03B4}']),
-        '\u{1D73A}' => Some(&['\u{03B5}']),
-        '\u{1D73B}' => Some(&['\u{03B6}']),
-        '\u{1D73C}' => Some(&['\u{03B7}']),
-        '\u{1D73D}' => Some(&['\u{03B8}']),
-        '\u{1D73E}' => Some(&['\u{03B9}']),
-        '\u{1D73F}' => Some(&['\u{03BA}']),
-        '\u{1D740}' => Some(&['\u{03BB}']),
-        '\u{1D741}' => Some(&['\u{03BC}']),
-        '\u{1D742}' => Some(&['\u{03BD}']),
-        '\u{1D743}' => Some(&['\u{03BE}']),
-        '\u{1D744}' => Some(&['\u{03BF}']),
-        '\u{1D745}' => Some(&['\u{03C0}']),
-        '\u{1D746}' => Some(&['\u{03C1}']),
-        '\u{1D747}' => Some(&['\u{03C2}']),
-        '\u{1D748}' => Some(&['\u{03C3}']),
-        '\u{1D749}' => Some(&['\u{03C4}']),
-        '\u{1D74A}' => Some(&['\u{03C5}']),
-        '\u{1D74B}' => Some(&['\u{03C6}']),
-        '\u{1D74C}' => Some(&['\u{03C7}']),
-        '\u{1D74D}' => Some(&['\u{03C8}']),
-        '\u{1D74E}' => Some(&['\u{03C9}']),
-        '\u{1D74F}' => Some(&['\u{2202}']),
-        '\u{1D750}' => Some(&['\u{03B5}']),
-        '\u{1D751}' => Some(&['\u{03B8}']),
-        '\u{1D752}' => Some(&['\u{03BA}']),
-        '\u{1D753}' => Some(&['\u{03C6}']),
-        '\u{1D754}' => Some(&['\u{03C1}']),
-        '\u{1D755}' => Some(&['\u{03C0}']),
-        '\u{1D756}' => Some(&['\u{0391}']),
-        '\u{1D757}' => Some(&['\u{0392}']),
-        '\u{1D758}' => Some(&['\u{0393}']),
-        '\u{1D759}' => Some(&['\u{0394}']),
-        '\u{1D75A}' => Some(&['\u{0395}']),
-        '\u{1D75B}' => Some(&['\u{0396}']),
-        '\u{1D75C}' => Some(&['\u{0397}']),
-        '\u{1D75D}' => Some(&['\u{0398}']),
-        '\u{1D75E}' => Some(&['\u{0399}']),
-        '\u{1D75F}' => Some(&['\u{039A}']),
-        '\u{1D760}' => Some(&['\u{039B}']),
-        '\u{1D761}' => Some(&['\u{039C}']),
-        '\u{1D762}' => Some(&['\u{039D}']),
-        '\u{1D763}' => Some(&['\u{039E}']),
-        '\u{1D764}' => Some(&['\u{039F}']),
-        '\u{1D765}' => Some(&['\u{03A0}']),
-        '\u{1D766}' => Some(&['\u{03A1}']),
-        '\u{1D767}' => Some(&['\u{0398}']),
-        '\u{1D768}' => Some(&['\u{03A3}']),
-        '\u{1D769}' => Some(&['\u{03A4}']),
-        '\u{1D76A}' => Some(&['\u{03A5}']),
-        '\u{1D76B}' => Some(&['\u{03A6}']),
-        '\u{1D76C}' => Some(&['\u{03A7}']),
-        '\u{1D76D}' => Some(&['\u{03A8}']),
-        '\u{1D76E}' => Some(&['\u{03A9}']),
-        '\u{1D76F}' => Some(&['\u{2207}']),
-        '\u{1D770}' => Some(&['\u{03B1}']),
-        '\u{1D771}' => Some(&['\u{03B2}']),
-        '\u{1D772}' => Some(&['\u{03B3}']),
-        '\u{1D773}' => Some(&['\u{03B4}']),
-        '\u{1D774}' => Some(&['\u{03B5}']),
-        '\u{1D775}' => Some(&['\u{03B6}']),
-        '\u{1D776}' => Some(&['\u{03B7}']),
-        '\u{1D777}' => Some(&['\u{03B8}']),
-        '\u{1D778}' => Some(&['\u{03B9}']),
-        '\u{1D779}' => Some(&['\u{03BA}']),
-        '\u{1D77A}' => Some(&['\u{03BB}']),
-        '\u{1D77B}' => Some(&['\u{03BC}']),
-        '\u{1D77C}' => Some(&['\u{03BD}']),
-        '\u{1D77D}' => Some(&['\u{03BE}']),
-        '\u{1D77E}' => Some(&['\u{03BF}']),
-        '\u{1D77F}' => Some(&['\u{03C0}']),
-        '\u{1D780}' => Some(&['\u{03C1}']),
-        '\u{1D781}' => Some(&['\u{03C2}']),
-        '\u{1D782}' => Some(&['\u{03C3}']),
-        '\u{1D783}' => Some(&['\u{03C4}']),
-        '\u{1D784}' => Some(&['\u{03C5}']),
-        '\u{1D785}' => Some(&['\u{03C6}']),
-        '\u{1D786}' => Some(&['\u{03C7}']),
-        '\u{1D787}' => Some(&['\u{03C8}']),
-        '\u{1D788}' => Some(&['\u{03C9}']),
-        '\u{1D789}' => Some(&['\u{2202}']),
-        '\u{1D78A}' => Some(&['\u{03B5}']),
-        '\u{1D78B}' => Some(&['\u{03B8}']),
-        '\u{1D78C}' => Some(&['\u{03BA}']),
-        '\u{1D78D}' => Some(&['\u{03C6}']),
-        '\u{1D78E}' => Some(&['\u{03C1}']),
-        '\u{1D78F}' => Some(&['\u{03C0}']),
-        '\u{1D790}' => Some(&['\u{0391}']),
-        '\u{1D791}' => Some(&['\u{0392}']),
-        '\u{1D792}' => Some(&['\u{0393}']),
-        '\u{1D793}' => Some(&['\u{0394}']),
-        '\u{1D794}' => Some(&['\u{0395}']),
-        '\u{1D795}' => Some(&['\u{0396}']),
-        '\u{1D796}' => Some(&['\u{0397}']),
-        '\u{1D797}' => Some(&['\u{0398}']),
-        '\u{1D798}' => Some(&['\u{0399}']),
-        '\u{1D799}' => Some(&['\u{039A}']),
-        '\u{1D79A}' => Some(&['\u{039B}']),
-        '\u{1D79B}' => Some(&['\u{039C}']),
-        '\u{1D79C}' => Some(&['\u{039D}']),
-        '\u{1D79D}' => Some(&['\u{039E}']),
-        '\u{1D79E}' => Some(&['\u{039F}']),
-        '\u{1D79F}' => Some(&['\u{03A0}']),
-        '\u{1D7A0}' => Some(&['\u{03A1}']),
-        '\u{1D7A1}' => Some(&['\u{0398}']),
-        '\u{1D7A2}' => Some(&['\u{03A3}']),
-        '\u{1D7A3}' => Some(&['\u{03A4}']),
-        '\u{1D7A4}' => Some(&['\u{03A5}']),
-        '\u{1D7A5}' => Some(&['\u{03A6}']),
-        '\u{1D7A6}' => Some(&['\u{03A7}']),
-        '\u{1D7A7}' => Some(&['\u{03A8}']),
-        '\u{1D7A8}' => Some(&['\u{03A9}']),
-        '\u{1D7A9}' => Some(&['\u{2207}']),
-        '\u{1D7AA}' => Some(&['\u{03B1}']),
-        '\u{1D7AB}' => Some(&['\u{03B2}']),
-        '\u{1D7AC}' => Some(&['\u{03B3}']),
-        '\u{1D7AD}' => Some(&['\u{03B4}']),
-        '\u{1D7AE}' => Some(&['\u{03B5}']),
-        '\u{1D7AF}' => Some(&['\u{03B6}']),
-        '\u{1D7B0}' => Some(&['\u{03B7}']),
-        '\u{1D7B1}' => Some(&['\u{03B8}']),
-        '\u{1D7B2}' => Some(&['\u{03B9}']),
-        '\u{1D7B3}' => Some(&['\u{03BA}']),
-        '\u{1D7B4}' => Some(&['\u{03BB}']),
-        '\u{1D7B5}' => Some(&['\u{03BC}']),
-        '\u{1D7B6}' => Some(&['\u{03BD}']),
-        '\u{1D7B7}' => Some(&['\u{03BE}']),
-        '\u{1D7B8}' => Some(&['\u{03BF}']),
-        '\u{1D7B9}' => Some(&['\u{03C0}']),
-        '\u{1D7BA}' => Some(&['\u{03C1}']),
-        '\u{1D7BB}' => Some(&['\u{03C2}']),
-        '\u{1D7BC}' => Some(&['\u{03C3}']),
-        '\u{1D7BD}' => Some(&['\u{03C4}']),
-        '\u{1D7BE}' => Some(&['\u{03C5}']),
-        '\u{1D7BF}' => Some(&['\u{03C6}']),
-        '\u{1D7C0}' => Some(&['\u{03C7}']),
-        '\u{1D7C1}' => Some(&['\u{03C8}']),
-        '\u{1D7C2}' => Some(&['\u{03C9}']),
-        '\u{1D7C3}' => Some(&['\u{2202}']),
-        '\u{1D7C4}' => Some(&['\u{03B5}']),
-        '\u{1D7C5}' => Some(&['\u{03B8}']),
-        '\u{1D7C6}' => Some(&['\u{03BA}']),
-        '\u{1D7C7}' => Some(&['\u{03C6}']),
-        '\u{1D7C8}' => Some(&['\u{03C1}']),
-        '\u{1D7C9}' => Some(&['\u{03C0}']),
-        '\u{1D7CA}' => Some(&['\u{03DC}']),
-        '\u{1D7CB}' => Some(&['\u{03DD}']),
-        '\u{1D7CE}' => Some(&['\u{0030}']),
-        '\u{1D7CF}' => Some(&['\u{0031}']),
-        '\u{1D7D0}' => Some(&['\u{0032}']),
-        '\u{1D7D1}' => Some(&['\u{0033}']),
-        '\u{1D7D2}' => Some(&['\u{0034}']),
-        '\u{1D7D3}' => Some(&['\u{0035}']),
-        '\u{1D7D4}' => Some(&['\u{0036}']),
-        '\u{1D7D5}' => Some(&['\u{0037}']),
-        '\u{1D7D6}' => Some(&['\u{0038}']),
-        '\u{1D7D7}' => Some(&['\u{0039}']),
-        '\u{1D7D8}' => Some(&['\u{0030}']),
-        '\u{1D7D9}' => Some(&['\u{0031}']),
-        '\u{1D7DA}' => Some(&['\u{0032}']),
-        '\u{1D7DB}' => Some(&['\u{0033}']),
-        '\u{1D7DC}' => Some(&['\u{0034}']),
-        '\u{1D7DD}' => Some(&['\u{0035}']),
-        '\u{1D7DE}' => Some(&['\u{0036}']),
-        '\u{1D7DF}' => Some(&['\u{0037}']),
-        '\u{1D7E0}' => Some(&['\u{0038}']),
-        '\u{1D7E1}' => Some(&['\u{0039}']),
-        '\u{1D7E2}' => Some(&['\u{0030}']),
-        '\u{1D7E3}' => Some(&['\u{0031}']),
-        '\u{1D7E4}' => Some(&['\u{0032}']),
-        '\u{1D7E5}' => Some(&['\u{0033}']),
-        '\u{1D7E6}' => Some(&['\u{0034}']),
-        '\u{1D7E7}' => Some(&['\u{0035}']),
-        '\u{1D7E8}' => Some(&['\u{0036}']),
-        '\u{1D7E9}' => Some(&['\u{0037}']),
-        '\u{1D7EA}' => Some(&['\u{0038}']),
-        '\u{1D7EB}' => Some(&['\u{0039}']),
-        '\u{1D7EC}' => Some(&['\u{0030}']),
-        '\u{1D7ED}' => Some(&['\u{0031}']),
-        '\u{1D7EE}' => Some(&['\u{0032}']),
-        '\u{1D7EF}' => Some(&['\u{0033}']),
-        '\u{1D7F0}' => Some(&['\u{0034}']),
-        '\u{1D7F1}' => Some(&['\u{0035}']),
-        '\u{1D7F2}' => Some(&['\u{0036}']),
-        '\u{1D7F3}' => Some(&['\u{0037}']),
-        '\u{1D7F4}' => Some(&['\u{0038}']),
-        '\u{1D7F5}' => Some(&['\u{0039}']),
-        '\u{1D7F6}' => Some(&['\u{0030}']),
-        '\u{1D7F7}' => Some(&['\u{0031}']),
-        '\u{1D7F8}' => Some(&['\u{0032}']),
-        '\u{1D7F9}' => Some(&['\u{0033}']),
-        '\u{1D7FA}' => Some(&['\u{0034}']),
-        '\u{1D7FB}' => Some(&['\u{0035}']),
-        '\u{1D7FC}' => Some(&['\u{0036}']),
-        '\u{1D7FD}' => Some(&['\u{0037}']),
-        '\u{1D7FE}' => Some(&['\u{0038}']),
-        '\u{1D7FF}' => Some(&['\u{0039}']),
-        '\u{1EE00}' => Some(&['\u{0627}']),
-        '\u{1EE01}' => Some(&['\u{0628}']),
-        '\u{1EE02}' => Some(&['\u{062C}']),
-        '\u{1EE03}' => Some(&['\u{062F}']),
-        '\u{1EE05}' => Some(&['\u{0648}']),
-        '\u{1EE06}' => Some(&['\u{0632}']),
-        '\u{1EE07}' => Some(&['\u{062D}']),
-        '\u{1EE08}' => Some(&['\u{0637}']),
-        '\u{1EE09}' => Some(&['\u{064A}']),
-        '\u{1EE0A}' => Some(&['\u{0643}']),
-        '\u{1EE0B}' => Some(&['\u{0644}']),
-        '\u{1EE0C}' => Some(&['\u{0645}']),
-        '\u{1EE0D}' => Some(&['\u{0646}']),
-        '\u{1EE0E}' => Some(&['\u{0633}']),
-        '\u{1EE0F}' => Some(&['\u{0639}']),
-        '\u{1EE10}' => Some(&['\u{0641}']),
-        '\u{1EE11}' => Some(&['\u{0635}']),
-        '\u{1EE12}' => Some(&['\u{0642}']),
-        '\u{1EE13}' => Some(&['\u{0631}']),
-        '\u{1EE14}' => Some(&['\u{0634}']),
-        '\u{1EE15}' => Some(&['\u{062A}']),
-        '\u{1EE16}' => Some(&['\u{062B}']),
-        '\u{1EE17}' => Some(&['\u{062E}']),
-        '\u{1EE18}' => Some(&['\u{0630}']),
-        '\u{1EE19}' => Some(&['\u{0636}']),
-        '\u{1EE1A}' => Some(&['\u{0638}']),
-        '\u{1EE1B}' => Some(&['\u{063A}']),
-        '\u{1EE1C}' => Some(&['\u{066E}']),
-        '\u{1EE1D}' => Some(&['\u{06BA}']),
-        '\u{1EE1E}' => Some(&['\u{06A1}']),
-        '\u{1EE1F}' => Some(&['\u{066F}']),
-        '\u{1EE21}' => Some(&['\u{0628}']),
-        '\u{1EE22}' => Some(&['\u{062C}']),
-        '\u{1EE24}' => Some(&['\u{0647}']),
-        '\u{1EE27}' => Some(&['\u{062D}']),
-        '\u{1EE29}' => Some(&['\u{064A}']),
-        '\u{1EE2A}' => Some(&['\u{0643}']),
-        '\u{1EE2B}' => Some(&['\u{0644}']),
-        '\u{1EE2C}' => Some(&['\u{0645}']),
-        '\u{1EE2D}' => Some(&['\u{0646}']),
-        '\u{1EE2E}' => Some(&['\u{0633}']),
-        '\u{1EE2F}' => Some(&['\u{0639}']),
-        '\u{1EE30}' => Some(&['\u{0641}']),
-        '\u{1EE31}' => Some(&['\u{0635}']),
-        '\u{1EE32}' => Some(&['\u{0642}']),
-        '\u{1EE34}' => Some(&['\u{0634}']),
-        '\u{1EE35}' => Some(&['\u{062A}']),
-        '\u{1EE36}' => Some(&['\u{062B}']),
-        '\u{1EE37}' => Some(&['\u{062E}']),
-        '\u{1EE39}' => Some(&['\u{0636}']),
-        '\u{1EE3B}' => Some(&['\u{063A}']),
-        '\u{1EE42}' => Some(&['\u{062C}']),
-        '\u{1EE47}' => Some(&['\u{062D}']),
-        '\u{1EE49}' => Some(&['\u{064A}']),
-        '\u{1EE4B}' => Some(&['\u{0644}']),
-        '\u{1EE4D}' => Some(&['\u{0646}']),
-        '\u{1EE4E}' => Some(&['\u{0633}']),
-        '\u{1EE4F}' => Some(&['\u{0639}']),
-        '\u{1EE51}' => Some(&['\u{0635}']),
-        '\u{1EE52}' => Some(&['\u{0642}']),
-        '\u{1EE54}' => Some(&['\u{0634}']),
-        '\u{1EE57}' => Some(&['\u{062E}']),
-        '\u{1EE59}' => Some(&['\u{0636}']),
-        '\u{1EE5B}' => Some(&['\u{063A}']),
-        '\u{1EE5D}' => Some(&['\u{06BA}']),
-        '\u{1EE5F}' => Some(&['\u{066F}']),
-        '\u{1EE61}' => Some(&['\u{0628}']),
-        '\u{1EE62}' => Some(&['\u{062C}']),
-        '\u{1EE64}' => Some(&['\u{0647}']),
-        '\u{1EE67}' => Some(&['\u{062D}']),
-        '\u{1EE68}' => Some(&['\u{0637}']),
-        '\u{1EE69}' => Some(&['\u{064A}']),
-        '\u{1EE6A}' => Some(&['\u{0643}']),
-        '\u{1EE6C}' => Some(&['\u{0645}']),
-        '\u{1EE6D}' => Some(&['\u{0646}']),
-        '\u{1EE6E}' => Some(&['\u{0633}']),
-        '\u{1EE6F}' => Some(&['\u{0639}']),
-        '\u{1EE70}' => Some(&['\u{0641}']),
-        '\u{1EE71}' => Some(&['\u{0635}']),
-        '\u{1EE72}' => Some(&['\u{0642}']),
-        '\u{1EE74}' => Some(&['\u{0634}']),
-        '\u{1EE75}' => Some(&['\u{062A}']),
-        '\u{1EE76}' => Some(&['\u{062B}']),
-        '\u{1EE77}' => Some(&['\u{062E}']),
-        '\u{1EE79}' => Some(&['\u{0636}']),
-        '\u{1EE7A}' => Some(&['\u{0638}']),
-        '\u{1EE7B}' => Some(&['\u{063A}']),
-        '\u{1EE7C}' => Some(&['\u{066E}']),
-        '\u{1EE7E}' => Some(&['\u{06A1}']),
-        '\u{1EE80}' => Some(&['\u{0627}']),
-        '\u{1EE81}' => Some(&['\u{0628}']),
-        '\u{1EE82}' => Some(&['\u{062C}']),
-        '\u{1EE83}' => Some(&['\u{062F}']),
-        '\u{1EE84}' => Some(&['\u{0647}']),
-        '\u{1EE85}' => Some(&['\u{0648}']),
-        '\u{1EE86}' => Some(&['\u{0632}']),
-        '\u{1EE87}' => Some(&['\u{062D}']),
-        '\u{1EE88}' => Some(&['\u{0637}']),
-        '\u{1EE89}' => Some(&['\u{064A}']),
-        '\u{1EE8B}' => Some(&['\u{0644}']),
-        '\u{1EE8C}' => Some(&['\u{0645}']),
-        '\u{1EE8D}' => Some(&['\u{0646}']),
-        '\u{1EE8E}' => Some(&['\u{0633}']),
-        '\u{1EE8F}' => Some(&['\u{0639}']),
-        '\u{1EE90}' => Some(&['\u{0641}']),
-        '\u{1EE91}' => Some(&['\u{0635}']),
-        '\u{1EE92}' => Some(&['\u{0642}']),
-        '\u{1EE93}' => Some(&['\u{0631}']),
-        '\u{1EE94}' => Some(&['\u{0634}']),
-        '\u{1EE95}' => Some(&['\u{062A}']),
-        '\u{1EE96}' => Some(&['\u{062B}']),
-        '\u{1EE97}' => Some(&['\u{062E}']),
-        '\u{1EE98}' => Some(&['\u{0630}']),
-        '\u{1EE99}' => Some(&['\u{0636}']),
-        '\u{1EE9A}' => Some(&['\u{0638}']),
-        '\u{1EE9B}' => Some(&['\u{063A}']),
-        '\u{1EEA1}' => Some(&['\u{0628}']),
-        '\u{1EEA2}' => Some(&['\u{062C}']),
-        '\u{1EEA3}' => Some(&['\u{062F}']),
-        '\u{1EEA5}' => Some(&['\u{0648}']),
-        '\u{1EEA6}' => Some(&['\u{0632}']),
-        '\u{1EEA7}' => Some(&['\u{062D}']),
-        '\u{1EEA8}' => Some(&['\u{0637}']),
-        '\u{1EEA9}' => Some(&['\u{064A}']),
-        '\u{1EEAB}' => Some(&['\u{0644}']),
-        '\u{1EEAC}' => Some(&['\u{0645}']),
-        '\u{1EEAD}' => Some(&['\u{0646}']),
-        '\u{1EEAE}' => Some(&['\u{0633}']),
-        '\u{1EEAF}' => Some(&['\u{0639}']),
-        '\u{1EEB0}' => Some(&['\u{0641}']),
-        '\u{1EEB1}' => Some(&['\u{0635}']),
-        '\u{1EEB2}' => Some(&['\u{0642}']),
-        '\u{1EEB3}' => Some(&['\u{0631}']),
-        '\u{1EEB4}' => Some(&['\u{0634}']),
-        '\u{1EEB5}' => Some(&['\u{062A}']),
-        '\u{1EEB6}' => Some(&['\u{062B}']),
-        '\u{1EEB7}' => Some(&['\u{062E}']),
-        '\u{1EEB8}' => Some(&['\u{0630}']),
-        '\u{1EEB9}' => Some(&['\u{0636}']),
-        '\u{1EEBA}' => Some(&['\u{0638}']),
-        '\u{1EEBB}' => Some(&['\u{063A}']),
-        '\u{1F100}' => Some(&['\u{0030}', '\u{002E}']),
-        '\u{1F101}' => Some(&['\u{0030}', '\u{002C}']),
-        '\u{1F102}' => Some(&['\u{0031}', '\u{002C}']),
-        '\u{1F103}' => Some(&['\u{0032}', '\u{002C}']),
-        '\u{1F104}' => Some(&['\u{0033}', '\u{002C}']),
-        '\u{1F105}' => Some(&['\u{0034}', '\u{002C}']),
-        '\u{1F106}' => Some(&['\u{0035}', '\u{002C}']),
-        '\u{1F107}' => Some(&['\u{0036}', '\u{002C}']),
-        '\u{1F108}' => Some(&['\u{0037}', '\u{002C}']),
-        '\u{1F109}' => Some(&['\u{0038}', '\u{002C}']),
-        '\u{1F10A}' => Some(&['\u{0039}', '\u{002C}']),
-        '\u{1F110}' => Some(&['\u{0028}', '\u{0041}', '\u{0029}']),
-        '\u{1F111}' => Some(&['\u{0028}', '\u{0042}', '\u{0029}']),
-        '\u{1F112}' => Some(&['\u{0028}', '\u{0043}', '\u{0029}']),
-        '\u{1F113}' => Some(&['\u{0028}', '\u{0044}', '\u{0029}']),
-        '\u{1F114}' => Some(&['\u{0028}', '\u{0045}', '\u{0029}']),
-        '\u{1F115}' => Some(&['\u{0028}', '\u{0046}', '\u{0029}']),
-        '\u{1F116}' => Some(&['\u{0028}', '\u{0047}', '\u{0029}']),
-        '\u{1F117}' => Some(&['\u{0028}', '\u{0048}', '\u{0029}']),
-        '\u{1F118}' => Some(&['\u{0028}', '\u{0049}', '\u{0029}']),
-        '\u{1F119}' => Some(&['\u{0028}', '\u{004A}', '\u{0029}']),
-        '\u{1F11A}' => Some(&['\u{0028}', '\u{004B}', '\u{0029}']),
-        '\u{1F11B}' => Some(&['\u{0028}', '\u{004C}', '\u{0029}']),
-        '\u{1F11C}' => Some(&['\u{0028}', '\u{004D}', '\u{0029}']),
-        '\u{1F11D}' => Some(&['\u{0028}', '\u{004E}', '\u{0029}']),
-        '\u{1F11E}' => Some(&['\u{0028}', '\u{004F}', '\u{0029}']),
-        '\u{1F11F}' => Some(&['\u{0028}', '\u{0050}', '\u{0029}']),
-        '\u{1F120}' => Some(&['\u{0028}', '\u{0051}', '\u{0029}']),
-        '\u{1F121}' => Some(&['\u{0028}', '\u{0052}', '\u{0029}']),
-        '\u{1F122}' => Some(&['\u{0028}', '\u{0053}', '\u{0029}']),
-        '\u{1F123}' => Some(&['\u{0028}', '\u{0054}', '\u{0029}']),
-        '\u{1F124}' => Some(&['\u{0028}', '\u{0055}', '\u{0029}']),
-        '\u{1F125}' => Some(&['\u{0028}', '\u{0056}', '\u{0029}']),
-        '\u{1F126}' => Some(&['\u{0028}', '\u{0057}', '\u{0029}']),
-        '\u{1F127}' => Some(&['\u{0028}', '\u{0058}', '\u{0029}']),
-        '\u{1F128}' => Some(&['\u{0028}', '\u{0059}', '\u{0029}']),
-        '\u{1F129}' => Some(&['\u{0028}', '\u{005A}', '\u{0029}']),
-        '\u{1F12A}' => Some(&['\u{3014}', '\u{0053}', '\u{3015}']),
-        '\u{1F12B}' => Some(&['\u{0043}']),
-        '\u{1F12C}' => Some(&['\u{0052}']),
-        '\u{1F12D}' => Some(&['\u{0043}', '\u{0044}']),
-        '\u{1F12E}' => Some(&['\u{0057}', '\u{005A}']),
-        '\u{1F130}' => Some(&['\u{0041}']),
-        '\u{1F131}' => Some(&['\u{0042}']),
-        '\u{1F132}' => Some(&['\u{0043}']),
-        '\u{1F133}' => Some(&['\u{0044}']),
-        '\u{1F134}' => Some(&['\u{0045}']),
-        '\u{1F135}' => Some(&['\u{0046}']),
-        '\u{1F136}' => Some(&['\u{0047}']),
-        '\u{1F137}' => Some(&['\u{0048}']),
-        '\u{1F138}' => Some(&['\u{0049}']),
-        '\u{1F139}' => Some(&['\u{004A}']),
-        '\u{1F13A}' => Some(&['\u{004B}']),
-        '\u{1F13B}' => Some(&['\u{004C}']),
-        '\u{1F13C}' => Some(&['\u{004D}']),
-        '\u{1F13D}' => Some(&['\u{004E}']),
-        '\u{1F13E}' => Some(&['\u{004F}']),
-        '\u{1F13F}' => Some(&['\u{0050}']),
-        '\u{1F140}' => Some(&['\u{0051}']),
-        '\u{1F141}' => Some(&['\u{0052}']),
-        '\u{1F142}' => Some(&['\u{0053}']),
-        '\u{1F143}' => Some(&['\u{0054}']),
-        '\u{1F144}' => Some(&['\u{0055}']),
-        '\u{1F145}' => Some(&['\u{0056}']),
-        '\u{1F146}' => Some(&['\u{0057}']),
-        '\u{1F147}' => Some(&['\u{0058}']),
-        '\u{1F148}' => Some(&['\u{0059}']),
-        '\u{1F149}' => Some(&['\u{005A}']),
-        '\u{1F14A}' => Some(&['\u{0048}', '\u{0056}']),
-        '\u{1F14B}' => Some(&['\u{004D}', '\u{0056}']),
-        '\u{1F14C}' => Some(&['\u{0053}', '\u{0044}']),
-        '\u{1F14D}' => Some(&['\u{0053}', '\u{0053}']),
-        '\u{1F14E}' => Some(&['\u{0050}', '\u{0050}', '\u{0056}']),
-        '\u{1F14F}' => Some(&['\u{0057}', '\u{0043}']),
-        '\u{1F16A}' => Some(&['\u{004D}', '\u{0043}']),
-        '\u{1F16B}' => Some(&['\u{004D}', '\u{0044}']),
-        '\u{1F190}' => Some(&['\u{0044}', '\u{004A}']),
-        '\u{1F200}' => Some(&['\u{307B}', '\u{304B}']),
-        '\u{1F201}' => Some(&['\u{30B3}', '\u{30B3}']),
-        '\u{1F202}' => Some(&['\u{30B5}']),
-        '\u{1F210}' => Some(&['\u{624B}']),
-        '\u{1F211}' => Some(&['\u{5B57}']),
-        '\u{1F212}' => Some(&['\u{53CC}']),
-        '\u{1F213}' => Some(&['\u{30C6}', '\u{3099}']),
-        '\u{1F214}' => Some(&['\u{4E8C}']),
-        '\u{1F215}' => Some(&['\u{591A}']),
-        '\u{1F216}' => Some(&['\u{89E3}']),
-        '\u{1F217}' => Some(&['\u{5929}']),
-        '\u{1F218}' => Some(&['\u{4EA4}']),
-        '\u{1F219}' => Some(&['\u{6620}']),
-        '\u{1F21A}' => Some(&['\u{7121}']),
-        '\u{1F21B}' => Some(&['\u{6599}']),
-        '\u{1F21C}' => Some(&['\u{524D}']),
-        '\u{1F21D}' => Some(&['\u{5F8C}']),
-        '\u{1F21E}' => Some(&['\u{518D}']),
-        '\u{1F21F}' => Some(&['\u{65B0}']),
-        '\u{1F220}' => Some(&['\u{521D}']),
-        '\u{1F221}' => Some(&['\u{7D42}']),
-        '\u{1F222}' => Some(&['\u{751F}']),
-        '\u{1F223}' => Some(&['\u{8CA9}']),
-        '\u{1F224}' => Some(&['\u{58F0}']),
-        '\u{1F225}' => Some(&['\u{5439}']),
-        '\u{1F226}' => Some(&['\u{6F14}']),
-        '\u{1F227}' => Some(&['\u{6295}']),
-        '\u{1F228}' => Some(&['\u{6355}']),
-        '\u{1F229}' => Some(&['\u{4E00}']),
-        '\u{1F22A}' => Some(&['\u{4E09}']),
-        '\u{1F22B}' => Some(&['\u{904A}']),
-        '\u{1F22C}' => Some(&['\u{5DE6}']),
-        '\u{1F22D}' => Some(&['\u{4E2D}']),
-        '\u{1F22E}' => Some(&['\u{53F3}']),
-        '\u{1F22F}' => Some(&['\u{6307}']),
-        '\u{1F230}' => Some(&['\u{8D70}']),
-        '\u{1F231}' => Some(&['\u{6253}']),
-        '\u{1F232}' => Some(&['\u{7981}']),
-        '\u{1F233}' => Some(&['\u{7A7A}']),
-        '\u{1F234}' => Some(&['\u{5408}']),
-        '\u{1F235}' => Some(&['\u{6E80}']),
-        '\u{1F236}' => Some(&['\u{6709}']),
-        '\u{1F237}' => Some(&['\u{6708}']),
-        '\u{1F238}' => Some(&['\u{7533}']),
-        '\u{1F239}' => Some(&['\u{5272}']),
-        '\u{1F23A}' => Some(&['\u{55B6}']),
-        '\u{1F23B}' => Some(&['\u{914D}']),
-        '\u{1F240}' => Some(&['\u{3014}', '\u{672C}', '\u{3015}']),
-        '\u{1F241}' => Some(&['\u{3014}', '\u{4E09}', '\u{3015}']),
-        '\u{1F242}' => Some(&['\u{3014}', '\u{4E8C}', '\u{3015}']),
-        '\u{1F243}' => Some(&['\u{3014}', '\u{5B89}', '\u{3015}']),
-        '\u{1F244}' => Some(&['\u{3014}', '\u{70B9}', '\u{3015}']),
-        '\u{1F245}' => Some(&['\u{3014}', '\u{6253}', '\u{3015}']),
-        '\u{1F246}' => Some(&['\u{3014}', '\u{76D7}', '\u{3015}']),
-        '\u{1F247}' => Some(&['\u{3014}', '\u{52DD}', '\u{3015}']),
-        '\u{1F248}' => Some(&['\u{3014}', '\u{6557}', '\u{3015}']),
-        '\u{1F250}' => Some(&['\u{5F97}']),
-        '\u{1F251}' => Some(&['\u{53EF}']),
-        _ => None,
-    }
+    Some(match c {
+        '\u{00A0}' => &['\u{0020}'],
+        '\u{00A8}' => &['\u{0020}', '\u{0308}'],
+        '\u{00AA}' => &['\u{0061}'],
+        '\u{00AF}' => &['\u{0020}', '\u{0304}'],
+        '\u{00B2}' => &['\u{0032}'],
+        '\u{00B3}' => &['\u{0033}'],
+        '\u{00B4}' => &['\u{0020}', '\u{0301}'],
+        '\u{00B5}' => &['\u{03BC}'],
+        '\u{00B8}' => &['\u{0020}', '\u{0327}'],
+        '\u{00B9}' => &['\u{0031}'],
+        '\u{00BA}' => &['\u{006F}'],
+        '\u{00BC}' => &['\u{0031}', '\u{2044}', '\u{0034}'],
+        '\u{00BD}' => &['\u{0031}', '\u{2044}', '\u{0032}'],
+        '\u{00BE}' => &['\u{0033}', '\u{2044}', '\u{0034}'],
+        '\u{0132}' => &['\u{0049}', '\u{004A}'],
+        '\u{0133}' => &['\u{0069}', '\u{006A}'],
+        '\u{013F}' => &['\u{004C}', '\u{00B7}'],
+        '\u{0140}' => &['\u{006C}', '\u{00B7}'],
+        '\u{0149}' => &['\u{02BC}', '\u{006E}'],
+        '\u{017F}' => &['\u{0073}'],
+        '\u{01C4}' => &['\u{0044}', '\u{005A}', '\u{030C}'],
+        '\u{01C5}' => &['\u{0044}', '\u{007A}', '\u{030C}'],
+        '\u{01C6}' => &['\u{0064}', '\u{007A}', '\u{030C}'],
+        '\u{01C7}' => &['\u{004C}', '\u{004A}'],
+        '\u{01C8}' => &['\u{004C}', '\u{006A}'],
+        '\u{01C9}' => &['\u{006C}', '\u{006A}'],
+        '\u{01CA}' => &['\u{004E}', '\u{004A}'],
+        '\u{01CB}' => &['\u{004E}', '\u{006A}'],
+        '\u{01CC}' => &['\u{006E}', '\u{006A}'],
+        '\u{01F1}' => &['\u{0044}', '\u{005A}'],
+        '\u{01F2}' => &['\u{0044}', '\u{007A}'],
+        '\u{01F3}' => &['\u{0064}', '\u{007A}'],
+        '\u{02B0}' => &['\u{0068}'],
+        '\u{02B1}' => &['\u{0266}'],
+        '\u{02B2}' => &['\u{006A}'],
+        '\u{02B3}' => &['\u{0072}'],
+        '\u{02B4}' => &['\u{0279}'],
+        '\u{02B5}' => &['\u{027B}'],
+        '\u{02B6}' => &['\u{0281}'],
+        '\u{02B7}' => &['\u{0077}'],
+        '\u{02B8}' => &['\u{0079}'],
+        '\u{02D8}' => &['\u{0020}', '\u{0306}'],
+        '\u{02D9}' => &['\u{0020}', '\u{0307}'],
+        '\u{02DA}' => &['\u{0020}', '\u{030A}'],
+        '\u{02DB}' => &['\u{0020}', '\u{0328}'],
+        '\u{02DC}' => &['\u{0020}', '\u{0303}'],
+        '\u{02DD}' => &['\u{0020}', '\u{030B}'],
+        '\u{02E0}' => &['\u{0263}'],
+        '\u{02E1}' => &['\u{006C}'],
+        '\u{02E2}' => &['\u{0073}'],
+        '\u{02E3}' => &['\u{0078}'],
+        '\u{02E4}' => &['\u{0295}'],
+        '\u{037A}' => &['\u{0020}', '\u{0345}'],
+        '\u{0384}' => &['\u{0020}', '\u{0301}'],
+        '\u{0385}' => &['\u{0020}', '\u{0308}', '\u{0301}'],
+        '\u{03D0}' => &['\u{03B2}'],
+        '\u{03D1}' => &['\u{03B8}'],
+        '\u{03D2}' => &['\u{03A5}'],
+        '\u{03D3}' => &['\u{03A5}', '\u{0301}'],
+        '\u{03D4}' => &['\u{03A5}', '\u{0308}'],
+        '\u{03D5}' => &['\u{03C6}'],
+        '\u{03D6}' => &['\u{03C0}'],
+        '\u{03F0}' => &['\u{03BA}'],
+        '\u{03F1}' => &['\u{03C1}'],
+        '\u{03F2}' => &['\u{03C2}'],
+        '\u{03F4}' => &['\u{0398}'],
+        '\u{03F5}' => &['\u{03B5}'],
+        '\u{03F9}' => &['\u{03A3}'],
+        '\u{0587}' => &['\u{0565}', '\u{0582}'],
+        '\u{0675}' => &['\u{0627}', '\u{0674}'],
+        '\u{0676}' => &['\u{0648}', '\u{0674}'],
+        '\u{0677}' => &['\u{06C7}', '\u{0674}'],
+        '\u{0678}' => &['\u{064A}', '\u{0674}'],
+        '\u{0E33}' => &['\u{0E4D}', '\u{0E32}'],
+        '\u{0EB3}' => &['\u{0ECD}', '\u{0EB2}'],
+        '\u{0EDC}' => &['\u{0EAB}', '\u{0E99}'],
+        '\u{0EDD}' => &['\u{0EAB}', '\u{0EA1}'],
+        '\u{0F0C}' => &['\u{0F0B}'],
+        '\u{0F77}' => &['\u{0FB2}', '\u{0F71}', '\u{0F80}'],
+        '\u{0F79}' => &['\u{0FB3}', '\u{0F71}', '\u{0F80}'],
+        '\u{10FC}' => &['\u{10DC}'],
+        '\u{1D2C}' => &['\u{0041}'],
+        '\u{1D2D}' => &['\u{00C6}'],
+        '\u{1D2E}' => &['\u{0042}'],
+        '\u{1D30}' => &['\u{0044}'],
+        '\u{1D31}' => &['\u{0045}'],
+        '\u{1D32}' => &['\u{018E}'],
+        '\u{1D33}' => &['\u{0047}'],
+        '\u{1D34}' => &['\u{0048}'],
+        '\u{1D35}' => &['\u{0049}'],
+        '\u{1D36}' => &['\u{004A}'],
+        '\u{1D37}' => &['\u{004B}'],
+        '\u{1D38}' => &['\u{004C}'],
+        '\u{1D39}' => &['\u{004D}'],
+        '\u{1D3A}' => &['\u{004E}'],
+        '\u{1D3C}' => &['\u{004F}'],
+        '\u{1D3D}' => &['\u{0222}'],
+        '\u{1D3E}' => &['\u{0050}'],
+        '\u{1D3F}' => &['\u{0052}'],
+        '\u{1D40}' => &['\u{0054}'],
+        '\u{1D41}' => &['\u{0055}'],
+        '\u{1D42}' => &['\u{0057}'],
+        '\u{1D43}' => &['\u{0061}'],
+        '\u{1D44}' => &['\u{0250}'],
+        '\u{1D45}' => &['\u{0251}'],
+        '\u{1D46}' => &['\u{1D02}'],
+        '\u{1D47}' => &['\u{0062}'],
+        '\u{1D48}' => &['\u{0064}'],
+        '\u{1D49}' => &['\u{0065}'],
+        '\u{1D4A}' => &['\u{0259}'],
+        '\u{1D4B}' => &['\u{025B}'],
+        '\u{1D4C}' => &['\u{025C}'],
+        '\u{1D4D}' => &['\u{0067}'],
+        '\u{1D4F}' => &['\u{006B}'],
+        '\u{1D50}' => &['\u{006D}'],
+        '\u{1D51}' => &['\u{014B}'],
+        '\u{1D52}' => &['\u{006F}'],
+        '\u{1D53}' => &['\u{0254}'],
+        '\u{1D54}' => &['\u{1D16}'],
+        '\u{1D55}' => &['\u{1D17}'],
+        '\u{1D56}' => &['\u{0070}'],
+        '\u{1D57}' => &['\u{0074}'],
+        '\u{1D58}' => &['\u{0075}'],
+        '\u{1D59}' => &['\u{1D1D}'],
+        '\u{1D5A}' => &['\u{026F}'],
+        '\u{1D5B}' => &['\u{0076}'],
+        '\u{1D5C}' => &['\u{1D25}'],
+        '\u{1D5D}' => &['\u{03B2}'],
+        '\u{1D5E}' => &['\u{03B3}'],
+        '\u{1D5F}' => &['\u{03B4}'],
+        '\u{1D60}' => &['\u{03C6}'],
+        '\u{1D61}' => &['\u{03C7}'],
+        '\u{1D62}' => &['\u{0069}'],
+        '\u{1D63}' => &['\u{0072}'],
+        '\u{1D64}' => &['\u{0075}'],
+        '\u{1D65}' => &['\u{0076}'],
+        '\u{1D66}' => &['\u{03B2}'],
+        '\u{1D67}' => &['\u{03B3}'],
+        '\u{1D68}' => &['\u{03C1}'],
+        '\u{1D69}' => &['\u{03C6}'],
+        '\u{1D6A}' => &['\u{03C7}'],
+        '\u{1D78}' => &['\u{043D}'],
+        '\u{1D9B}' => &['\u{0252}'],
+        '\u{1D9C}' => &['\u{0063}'],
+        '\u{1D9D}' => &['\u{0255}'],
+        '\u{1D9E}' => &['\u{00F0}'],
+        '\u{1D9F}' => &['\u{025C}'],
+        '\u{1DA0}' => &['\u{0066}'],
+        '\u{1DA1}' => &['\u{025F}'],
+        '\u{1DA2}' => &['\u{0261}'],
+        '\u{1DA3}' => &['\u{0265}'],
+        '\u{1DA4}' => &['\u{0268}'],
+        '\u{1DA5}' => &['\u{0269}'],
+        '\u{1DA6}' => &['\u{026A}'],
+        '\u{1DA7}' => &['\u{1D7B}'],
+        '\u{1DA8}' => &['\u{029D}'],
+        '\u{1DA9}' => &['\u{026D}'],
+        '\u{1DAA}' => &['\u{1D85}'],
+        '\u{1DAB}' => &['\u{029F}'],
+        '\u{1DAC}' => &['\u{0271}'],
+        '\u{1DAD}' => &['\u{0270}'],
+        '\u{1DAE}' => &['\u{0272}'],
+        '\u{1DAF}' => &['\u{0273}'],
+        '\u{1DB0}' => &['\u{0274}'],
+        '\u{1DB1}' => &['\u{0275}'],
+        '\u{1DB2}' => &['\u{0278}'],
+        '\u{1DB3}' => &['\u{0282}'],
+        '\u{1DB4}' => &['\u{0283}'],
+        '\u{1DB5}' => &['\u{01AB}'],
+        '\u{1DB6}' => &['\u{0289}'],
+        '\u{1DB7}' => &['\u{028A}'],
+        '\u{1DB8}' => &['\u{1D1C}'],
+        '\u{1DB9}' => &['\u{028B}'],
+        '\u{1DBA}' => &['\u{028C}'],
+        '\u{1DBB}' => &['\u{007A}'],
+        '\u{1DBC}' => &['\u{0290}'],
+        '\u{1DBD}' => &['\u{0291}'],
+        '\u{1DBE}' => &['\u{0292}'],
+        '\u{1DBF}' => &['\u{03B8}'],
+        '\u{1E9A}' => &['\u{0061}', '\u{02BE}'],
+        '\u{1E9B}' => &['\u{0073}', '\u{0307}'],
+        '\u{1FBD}' => &['\u{0020}', '\u{0313}'],
+        '\u{1FBF}' => &['\u{0020}', '\u{0313}'],
+        '\u{1FC0}' => &['\u{0020}', '\u{0342}'],
+        '\u{1FC1}' => &['\u{0020}', '\u{0308}', '\u{0342}'],
+        '\u{1FCD}' => &['\u{0020}', '\u{0313}', '\u{0300}'],
+        '\u{1FCE}' => &['\u{0020}', '\u{0313}', '\u{0301}'],
+        '\u{1FCF}' => &['\u{0020}', '\u{0313}', '\u{0342}'],
+        '\u{1FDD}' => &['\u{0020}', '\u{0314}', '\u{0300}'],
+        '\u{1FDE}' => &['\u{0020}', '\u{0314}', '\u{0301}'],
+        '\u{1FDF}' => &['\u{0020}', '\u{0314}', '\u{0342}'],
+        '\u{1FED}' => &['\u{0020}', '\u{0308}', '\u{0300}'],
+        '\u{1FEE}' => &['\u{0020}', '\u{0308}', '\u{0301}'],
+        '\u{1FFD}' => &['\u{0020}', '\u{0301}'],
+        '\u{1FFE}' => &['\u{0020}', '\u{0314}'],
+        '\u{2000}' => &['\u{0020}'],
+        '\u{2001}' => &['\u{0020}'],
+        '\u{2002}' => &['\u{0020}'],
+        '\u{2003}' => &['\u{0020}'],
+        '\u{2004}' => &['\u{0020}'],
+        '\u{2005}' => &['\u{0020}'],
+        '\u{2006}' => &['\u{0020}'],
+        '\u{2007}' => &['\u{0020}'],
+        '\u{2008}' => &['\u{0020}'],
+        '\u{2009}' => &['\u{0020}'],
+        '\u{200A}' => &['\u{0020}'],
+        '\u{2011}' => &['\u{2010}'],
+        '\u{2017}' => &['\u{0020}', '\u{0333}'],
+        '\u{2024}' => &['\u{002E}'],
+        '\u{2025}' => &['\u{002E}', '\u{002E}'],
+        '\u{2026}' => &['\u{002E}', '\u{002E}', '\u{002E}'],
+        '\u{202F}' => &['\u{0020}'],
+        '\u{2033}' => &['\u{2032}', '\u{2032}'],
+        '\u{2034}' => &['\u{2032}', '\u{2032}', '\u{2032}'],
+        '\u{2036}' => &['\u{2035}', '\u{2035}'],
+        '\u{2037}' => &['\u{2035}', '\u{2035}', '\u{2035}'],
+        '\u{203C}' => &['\u{0021}', '\u{0021}'],
+        '\u{203E}' => &['\u{0020}', '\u{0305}'],
+        '\u{2047}' => &['\u{003F}', '\u{003F}'],
+        '\u{2048}' => &['\u{003F}', '\u{0021}'],
+        '\u{2049}' => &['\u{0021}', '\u{003F}'],
+        '\u{2057}' => &['\u{2032}', '\u{2032}', '\u{2032}', '\u{2032}'],
+        '\u{205F}' => &['\u{0020}'],
+        '\u{2070}' => &['\u{0030}'],
+        '\u{2071}' => &['\u{0069}'],
+        '\u{2074}' => &['\u{0034}'],
+        '\u{2075}' => &['\u{0035}'],
+        '\u{2076}' => &['\u{0036}'],
+        '\u{2077}' => &['\u{0037}'],
+        '\u{2078}' => &['\u{0038}'],
+        '\u{2079}' => &['\u{0039}'],
+        '\u{207A}' => &['\u{002B}'],
+        '\u{207B}' => &['\u{2212}'],
+        '\u{207C}' => &['\u{003D}'],
+        '\u{207D}' => &['\u{0028}'],
+        '\u{207E}' => &['\u{0029}'],
+        '\u{207F}' => &['\u{006E}'],
+        '\u{2080}' => &['\u{0030}'],
+        '\u{2081}' => &['\u{0031}'],
+        '\u{2082}' => &['\u{0032}'],
+        '\u{2083}' => &['\u{0033}'],
+        '\u{2084}' => &['\u{0034}'],
+        '\u{2085}' => &['\u{0035}'],
+        '\u{2086}' => &['\u{0036}'],
+        '\u{2087}' => &['\u{0037}'],
+        '\u{2088}' => &['\u{0038}'],
+        '\u{2089}' => &['\u{0039}'],
+        '\u{208A}' => &['\u{002B}'],
+        '\u{208B}' => &['\u{2212}'],
+        '\u{208C}' => &['\u{003D}'],
+        '\u{208D}' => &['\u{0028}'],
+        '\u{208E}' => &['\u{0029}'],
+        '\u{2090}' => &['\u{0061}'],
+        '\u{2091}' => &['\u{0065}'],
+        '\u{2092}' => &['\u{006F}'],
+        '\u{2093}' => &['\u{0078}'],
+        '\u{2094}' => &['\u{0259}'],
+        '\u{2095}' => &['\u{0068}'],
+        '\u{2096}' => &['\u{006B}'],
+        '\u{2097}' => &['\u{006C}'],
+        '\u{2098}' => &['\u{006D}'],
+        '\u{2099}' => &['\u{006E}'],
+        '\u{209A}' => &['\u{0070}'],
+        '\u{209B}' => &['\u{0073}'],
+        '\u{209C}' => &['\u{0074}'],
+        '\u{20A8}' => &['\u{0052}', '\u{0073}'],
+        '\u{2100}' => &['\u{0061}', '\u{002F}', '\u{0063}'],
+        '\u{2101}' => &['\u{0061}', '\u{002F}', '\u{0073}'],
+        '\u{2102}' => &['\u{0043}'],
+        '\u{2103}' => &['\u{00B0}', '\u{0043}'],
+        '\u{2105}' => &['\u{0063}', '\u{002F}', '\u{006F}'],
+        '\u{2106}' => &['\u{0063}', '\u{002F}', '\u{0075}'],
+        '\u{2107}' => &['\u{0190}'],
+        '\u{2109}' => &['\u{00B0}', '\u{0046}'],
+        '\u{210A}' => &['\u{0067}'],
+        '\u{210B}' => &['\u{0048}'],
+        '\u{210C}' => &['\u{0048}'],
+        '\u{210D}' => &['\u{0048}'],
+        '\u{210E}' => &['\u{0068}'],
+        '\u{210F}' => &['\u{0127}'],
+        '\u{2110}' => &['\u{0049}'],
+        '\u{2111}' => &['\u{0049}'],
+        '\u{2112}' => &['\u{004C}'],
+        '\u{2113}' => &['\u{006C}'],
+        '\u{2115}' => &['\u{004E}'],
+        '\u{2116}' => &['\u{004E}', '\u{006F}'],
+        '\u{2119}' => &['\u{0050}'],
+        '\u{211A}' => &['\u{0051}'],
+        '\u{211B}' => &['\u{0052}'],
+        '\u{211C}' => &['\u{0052}'],
+        '\u{211D}' => &['\u{0052}'],
+        '\u{2120}' => &['\u{0053}', '\u{004D}'],
+        '\u{2121}' => &['\u{0054}', '\u{0045}', '\u{004C}'],
+        '\u{2122}' => &['\u{0054}', '\u{004D}'],
+        '\u{2124}' => &['\u{005A}'],
+        '\u{2128}' => &['\u{005A}'],
+        '\u{212C}' => &['\u{0042}'],
+        '\u{212D}' => &['\u{0043}'],
+        '\u{212F}' => &['\u{0065}'],
+        '\u{2130}' => &['\u{0045}'],
+        '\u{2131}' => &['\u{0046}'],
+        '\u{2133}' => &['\u{004D}'],
+        '\u{2134}' => &['\u{006F}'],
+        '\u{2135}' => &['\u{05D0}'],
+        '\u{2136}' => &['\u{05D1}'],
+        '\u{2137}' => &['\u{05D2}'],
+        '\u{2138}' => &['\u{05D3}'],
+        '\u{2139}' => &['\u{0069}'],
+        '\u{213B}' => &['\u{0046}', '\u{0041}', '\u{0058}'],
+        '\u{213C}' => &['\u{03C0}'],
+        '\u{213D}' => &['\u{03B3}'],
+        '\u{213E}' => &['\u{0393}'],
+        '\u{213F}' => &['\u{03A0}'],
+        '\u{2140}' => &['\u{2211}'],
+        '\u{2145}' => &['\u{0044}'],
+        '\u{2146}' => &['\u{0064}'],
+        '\u{2147}' => &['\u{0065}'],
+        '\u{2148}' => &['\u{0069}'],
+        '\u{2149}' => &['\u{006A}'],
+        '\u{2150}' => &['\u{0031}', '\u{2044}', '\u{0037}'],
+        '\u{2151}' => &['\u{0031}', '\u{2044}', '\u{0039}'],
+        '\u{2152}' => &['\u{0031}', '\u{2044}', '\u{0031}', '\u{0030}'],
+        '\u{2153}' => &['\u{0031}', '\u{2044}', '\u{0033}'],
+        '\u{2154}' => &['\u{0032}', '\u{2044}', '\u{0033}'],
+        '\u{2155}' => &['\u{0031}', '\u{2044}', '\u{0035}'],
+        '\u{2156}' => &['\u{0032}', '\u{2044}', '\u{0035}'],
+        '\u{2157}' => &['\u{0033}', '\u{2044}', '\u{0035}'],
+        '\u{2158}' => &['\u{0034}', '\u{2044}', '\u{0035}'],
+        '\u{2159}' => &['\u{0031}', '\u{2044}', '\u{0036}'],
+        '\u{215A}' => &['\u{0035}', '\u{2044}', '\u{0036}'],
+        '\u{215B}' => &['\u{0031}', '\u{2044}', '\u{0038}'],
+        '\u{215C}' => &['\u{0033}', '\u{2044}', '\u{0038}'],
+        '\u{215D}' => &['\u{0035}', '\u{2044}', '\u{0038}'],
+        '\u{215E}' => &['\u{0037}', '\u{2044}', '\u{0038}'],
+        '\u{215F}' => &['\u{0031}', '\u{2044}'],
+        '\u{2160}' => &['\u{0049}'],
+        '\u{2161}' => &['\u{0049}', '\u{0049}'],
+        '\u{2162}' => &['\u{0049}', '\u{0049}', '\u{0049}'],
+        '\u{2163}' => &['\u{0049}', '\u{0056}'],
+        '\u{2164}' => &['\u{0056}'],
+        '\u{2165}' => &['\u{0056}', '\u{0049}'],
+        '\u{2166}' => &['\u{0056}', '\u{0049}', '\u{0049}'],
+        '\u{2167}' => &['\u{0056}', '\u{0049}', '\u{0049}', '\u{0049}'],
+        '\u{2168}' => &['\u{0049}', '\u{0058}'],
+        '\u{2169}' => &['\u{0058}'],
+        '\u{216A}' => &['\u{0058}', '\u{0049}'],
+        '\u{216B}' => &['\u{0058}', '\u{0049}', '\u{0049}'],
+        '\u{216C}' => &['\u{004C}'],
+        '\u{216D}' => &['\u{0043}'],
+        '\u{216E}' => &['\u{0044}'],
+        '\u{216F}' => &['\u{004D}'],
+        '\u{2170}' => &['\u{0069}'],
+        '\u{2171}' => &['\u{0069}', '\u{0069}'],
+        '\u{2172}' => &['\u{0069}', '\u{0069}', '\u{0069}'],
+        '\u{2173}' => &['\u{0069}', '\u{0076}'],
+        '\u{2174}' => &['\u{0076}'],
+        '\u{2175}' => &['\u{0076}', '\u{0069}'],
+        '\u{2176}' => &['\u{0076}', '\u{0069}', '\u{0069}'],
+        '\u{2177}' => &['\u{0076}', '\u{0069}', '\u{0069}', '\u{0069}'],
+        '\u{2178}' => &['\u{0069}', '\u{0078}'],
+        '\u{2179}' => &['\u{0078}'],
+        '\u{217A}' => &['\u{0078}', '\u{0069}'],
+        '\u{217B}' => &['\u{0078}', '\u{0069}', '\u{0069}'],
+        '\u{217C}' => &['\u{006C}'],
+        '\u{217D}' => &['\u{0063}'],
+        '\u{217E}' => &['\u{0064}'],
+        '\u{217F}' => &['\u{006D}'],
+        '\u{2189}' => &['\u{0030}', '\u{2044}', '\u{0033}'],
+        '\u{222C}' => &['\u{222B}', '\u{222B}'],
+        '\u{222D}' => &['\u{222B}', '\u{222B}', '\u{222B}'],
+        '\u{222F}' => &['\u{222E}', '\u{222E}'],
+        '\u{2230}' => &['\u{222E}', '\u{222E}', '\u{222E}'],
+        '\u{2460}' => &['\u{0031}'],
+        '\u{2461}' => &['\u{0032}'],
+        '\u{2462}' => &['\u{0033}'],
+        '\u{2463}' => &['\u{0034}'],
+        '\u{2464}' => &['\u{0035}'],
+        '\u{2465}' => &['\u{0036}'],
+        '\u{2466}' => &['\u{0037}'],
+        '\u{2467}' => &['\u{0038}'],
+        '\u{2468}' => &['\u{0039}'],
+        '\u{2469}' => &['\u{0031}', '\u{0030}'],
+        '\u{246A}' => &['\u{0031}', '\u{0031}'],
+        '\u{246B}' => &['\u{0031}', '\u{0032}'],
+        '\u{246C}' => &['\u{0031}', '\u{0033}'],
+        '\u{246D}' => &['\u{0031}', '\u{0034}'],
+        '\u{246E}' => &['\u{0031}', '\u{0035}'],
+        '\u{246F}' => &['\u{0031}', '\u{0036}'],
+        '\u{2470}' => &['\u{0031}', '\u{0037}'],
+        '\u{2471}' => &['\u{0031}', '\u{0038}'],
+        '\u{2472}' => &['\u{0031}', '\u{0039}'],
+        '\u{2473}' => &['\u{0032}', '\u{0030}'],
+        '\u{2474}' => &['\u{0028}', '\u{0031}', '\u{0029}'],
+        '\u{2475}' => &['\u{0028}', '\u{0032}', '\u{0029}'],
+        '\u{2476}' => &['\u{0028}', '\u{0033}', '\u{0029}'],
+        '\u{2477}' => &['\u{0028}', '\u{0034}', '\u{0029}'],
+        '\u{2478}' => &['\u{0028}', '\u{0035}', '\u{0029}'],
+        '\u{2479}' => &['\u{0028}', '\u{0036}', '\u{0029}'],
+        '\u{247A}' => &['\u{0028}', '\u{0037}', '\u{0029}'],
+        '\u{247B}' => &['\u{0028}', '\u{0038}', '\u{0029}'],
+        '\u{247C}' => &['\u{0028}', '\u{0039}', '\u{0029}'],
+        '\u{247D}' => &['\u{0028}', '\u{0031}', '\u{0030}', '\u{0029}'],
+        '\u{247E}' => &['\u{0028}', '\u{0031}', '\u{0031}', '\u{0029}'],
+        '\u{247F}' => &['\u{0028}', '\u{0031}', '\u{0032}', '\u{0029}'],
+        '\u{2480}' => &['\u{0028}', '\u{0031}', '\u{0033}', '\u{0029}'],
+        '\u{2481}' => &['\u{0028}', '\u{0031}', '\u{0034}', '\u{0029}'],
+        '\u{2482}' => &['\u{0028}', '\u{0031}', '\u{0035}', '\u{0029}'],
+        '\u{2483}' => &['\u{0028}', '\u{0031}', '\u{0036}', '\u{0029}'],
+        '\u{2484}' => &['\u{0028}', '\u{0031}', '\u{0037}', '\u{0029}'],
+        '\u{2485}' => &['\u{0028}', '\u{0031}', '\u{0038}', '\u{0029}'],
+        '\u{2486}' => &['\u{0028}', '\u{0031}', '\u{0039}', '\u{0029}'],
+        '\u{2487}' => &['\u{0028}', '\u{0032}', '\u{0030}', '\u{0029}'],
+        '\u{2488}' => &['\u{0031}', '\u{002E}'],
+        '\u{2489}' => &['\u{0032}', '\u{002E}'],
+        '\u{248A}' => &['\u{0033}', '\u{002E}'],
+        '\u{248B}' => &['\u{0034}', '\u{002E}'],
+        '\u{248C}' => &['\u{0035}', '\u{002E}'],
+        '\u{248D}' => &['\u{0036}', '\u{002E}'],
+        '\u{248E}' => &['\u{0037}', '\u{002E}'],
+        '\u{248F}' => &['\u{0038}', '\u{002E}'],
+        '\u{2490}' => &['\u{0039}', '\u{002E}'],
+        '\u{2491}' => &['\u{0031}', '\u{0030}', '\u{002E}'],
+        '\u{2492}' => &['\u{0031}', '\u{0031}', '\u{002E}'],
+        '\u{2493}' => &['\u{0031}', '\u{0032}', '\u{002E}'],
+        '\u{2494}' => &['\u{0031}', '\u{0033}', '\u{002E}'],
+        '\u{2495}' => &['\u{0031}', '\u{0034}', '\u{002E}'],
+        '\u{2496}' => &['\u{0031}', '\u{0035}', '\u{002E}'],
+        '\u{2497}' => &['\u{0031}', '\u{0036}', '\u{002E}'],
+        '\u{2498}' => &['\u{0031}', '\u{0037}', '\u{002E}'],
+        '\u{2499}' => &['\u{0031}', '\u{0038}', '\u{002E}'],
+        '\u{249A}' => &['\u{0031}', '\u{0039}', '\u{002E}'],
+        '\u{249B}' => &['\u{0032}', '\u{0030}', '\u{002E}'],
+        '\u{249C}' => &['\u{0028}', '\u{0061}', '\u{0029}'],
+        '\u{249D}' => &['\u{0028}', '\u{0062}', '\u{0029}'],
+        '\u{249E}' => &['\u{0028}', '\u{0063}', '\u{0029}'],
+        '\u{249F}' => &['\u{0028}', '\u{0064}', '\u{0029}'],
+        '\u{24A0}' => &['\u{0028}', '\u{0065}', '\u{0029}'],
+        '\u{24A1}' => &['\u{0028}', '\u{0066}', '\u{0029}'],
+        '\u{24A2}' => &['\u{0028}', '\u{0067}', '\u{0029}'],
+        '\u{24A3}' => &['\u{0028}', '\u{0068}', '\u{0029}'],
+        '\u{24A4}' => &['\u{0028}', '\u{0069}', '\u{0029}'],
+        '\u{24A5}' => &['\u{0028}', '\u{006A}', '\u{0029}'],
+        '\u{24A6}' => &['\u{0028}', '\u{006B}', '\u{0029}'],
+        '\u{24A7}' => &['\u{0028}', '\u{006C}', '\u{0029}'],
+        '\u{24A8}' => &['\u{0028}', '\u{006D}', '\u{0029}'],
+        '\u{24A9}' => &['\u{0028}', '\u{006E}', '\u{0029}'],
+        '\u{24AA}' => &['\u{0028}', '\u{006F}', '\u{0029}'],
+        '\u{24AB}' => &['\u{0028}', '\u{0070}', '\u{0029}'],
+        '\u{24AC}' => &['\u{0028}', '\u{0071}', '\u{0029}'],
+        '\u{24AD}' => &['\u{0028}', '\u{0072}', '\u{0029}'],
+        '\u{24AE}' => &['\u{0028}', '\u{0073}', '\u{0029}'],
+        '\u{24AF}' => &['\u{0028}', '\u{0074}', '\u{0029}'],
+        '\u{24B0}' => &['\u{0028}', '\u{0075}', '\u{0029}'],
+        '\u{24B1}' => &['\u{0028}', '\u{0076}', '\u{0029}'],
+        '\u{24B2}' => &['\u{0028}', '\u{0077}', '\u{0029}'],
+        '\u{24B3}' => &['\u{0028}', '\u{0078}', '\u{0029}'],
+        '\u{24B4}' => &['\u{0028}', '\u{0079}', '\u{0029}'],
+        '\u{24B5}' => &['\u{0028}', '\u{007A}', '\u{0029}'],
+        '\u{24B6}' => &['\u{0041}'],
+        '\u{24B7}' => &['\u{0042}'],
+        '\u{24B8}' => &['\u{0043}'],
+        '\u{24B9}' => &['\u{0044}'],
+        '\u{24BA}' => &['\u{0045}'],
+        '\u{24BB}' => &['\u{0046}'],
+        '\u{24BC}' => &['\u{0047}'],
+        '\u{24BD}' => &['\u{0048}'],
+        '\u{24BE}' => &['\u{0049}'],
+        '\u{24BF}' => &['\u{004A}'],
+        '\u{24C0}' => &['\u{004B}'],
+        '\u{24C1}' => &['\u{004C}'],
+        '\u{24C2}' => &['\u{004D}'],
+        '\u{24C3}' => &['\u{004E}'],
+        '\u{24C4}' => &['\u{004F}'],
+        '\u{24C5}' => &['\u{0050}'],
+        '\u{24C6}' => &['\u{0051}'],
+        '\u{24C7}' => &['\u{0052}'],
+        '\u{24C8}' => &['\u{0053}'],
+        '\u{24C9}' => &['\u{0054}'],
+        '\u{24CA}' => &['\u{0055}'],
+        '\u{24CB}' => &['\u{0056}'],
+        '\u{24CC}' => &['\u{0057}'],
+        '\u{24CD}' => &['\u{0058}'],
+        '\u{24CE}' => &['\u{0059}'],
+        '\u{24CF}' => &['\u{005A}'],
+        '\u{24D0}' => &['\u{0061}'],
+        '\u{24D1}' => &['\u{0062}'],
+        '\u{24D2}' => &['\u{0063}'],
+        '\u{24D3}' => &['\u{0064}'],
+        '\u{24D4}' => &['\u{0065}'],
+        '\u{24D5}' => &['\u{0066}'],
+        '\u{24D6}' => &['\u{0067}'],
+        '\u{24D7}' => &['\u{0068}'],
+        '\u{24D8}' => &['\u{0069}'],
+        '\u{24D9}' => &['\u{006A}'],
+        '\u{24DA}' => &['\u{006B}'],
+        '\u{24DB}' => &['\u{006C}'],
+        '\u{24DC}' => &['\u{006D}'],
+        '\u{24DD}' => &['\u{006E}'],
+        '\u{24DE}' => &['\u{006F}'],
+        '\u{24DF}' => &['\u{0070}'],
+        '\u{24E0}' => &['\u{0071}'],
+        '\u{24E1}' => &['\u{0072}'],
+        '\u{24E2}' => &['\u{0073}'],
+        '\u{24E3}' => &['\u{0074}'],
+        '\u{24E4}' => &['\u{0075}'],
+        '\u{24E5}' => &['\u{0076}'],
+        '\u{24E6}' => &['\u{0077}'],
+        '\u{24E7}' => &['\u{0078}'],
+        '\u{24E8}' => &['\u{0079}'],
+        '\u{24E9}' => &['\u{007A}'],
+        '\u{24EA}' => &['\u{0030}'],
+        '\u{2A0C}' => &['\u{222B}', '\u{222B}', '\u{222B}', '\u{222B}'],
+        '\u{2A74}' => &['\u{003A}', '\u{003A}', '\u{003D}'],
+        '\u{2A75}' => &['\u{003D}', '\u{003D}'],
+        '\u{2A76}' => &['\u{003D}', '\u{003D}', '\u{003D}'],
+        '\u{2C7C}' => &['\u{006A}'],
+        '\u{2C7D}' => &['\u{0056}'],
+        '\u{2D6F}' => &['\u{2D61}'],
+        '\u{2E9F}' => &['\u{6BCD}'],
+        '\u{2EF3}' => &['\u{9F9F}'],
+        '\u{2F00}' => &['\u{4E00}'],
+        '\u{2F01}' => &['\u{4E28}'],
+        '\u{2F02}' => &['\u{4E36}'],
+        '\u{2F03}' => &['\u{4E3F}'],
+        '\u{2F04}' => &['\u{4E59}'],
+        '\u{2F05}' => &['\u{4E85}'],
+        '\u{2F06}' => &['\u{4E8C}'],
+        '\u{2F07}' => &['\u{4EA0}'],
+        '\u{2F08}' => &['\u{4EBA}'],
+        '\u{2F09}' => &['\u{513F}'],
+        '\u{2F0A}' => &['\u{5165}'],
+        '\u{2F0B}' => &['\u{516B}'],
+        '\u{2F0C}' => &['\u{5182}'],
+        '\u{2F0D}' => &['\u{5196}'],
+        '\u{2F0E}' => &['\u{51AB}'],
+        '\u{2F0F}' => &['\u{51E0}'],
+        '\u{2F10}' => &['\u{51F5}'],
+        '\u{2F11}' => &['\u{5200}'],
+        '\u{2F12}' => &['\u{529B}'],
+        '\u{2F13}' => &['\u{52F9}'],
+        '\u{2F14}' => &['\u{5315}'],
+        '\u{2F15}' => &['\u{531A}'],
+        '\u{2F16}' => &['\u{5338}'],
+        '\u{2F17}' => &['\u{5341}'],
+        '\u{2F18}' => &['\u{535C}'],
+        '\u{2F19}' => &['\u{5369}'],
+        '\u{2F1A}' => &['\u{5382}'],
+        '\u{2F1B}' => &['\u{53B6}'],
+        '\u{2F1C}' => &['\u{53C8}'],
+        '\u{2F1D}' => &['\u{53E3}'],
+        '\u{2F1E}' => &['\u{56D7}'],
+        '\u{2F1F}' => &['\u{571F}'],
+        '\u{2F20}' => &['\u{58EB}'],
+        '\u{2F21}' => &['\u{5902}'],
+        '\u{2F22}' => &['\u{590A}'],
+        '\u{2F23}' => &['\u{5915}'],
+        '\u{2F24}' => &['\u{5927}'],
+        '\u{2F25}' => &['\u{5973}'],
+        '\u{2F26}' => &['\u{5B50}'],
+        '\u{2F27}' => &['\u{5B80}'],
+        '\u{2F28}' => &['\u{5BF8}'],
+        '\u{2F29}' => &['\u{5C0F}'],
+        '\u{2F2A}' => &['\u{5C22}'],
+        '\u{2F2B}' => &['\u{5C38}'],
+        '\u{2F2C}' => &['\u{5C6E}'],
+        '\u{2F2D}' => &['\u{5C71}'],
+        '\u{2F2E}' => &['\u{5DDB}'],
+        '\u{2F2F}' => &['\u{5DE5}'],
+        '\u{2F30}' => &['\u{5DF1}'],
+        '\u{2F31}' => &['\u{5DFE}'],
+        '\u{2F32}' => &['\u{5E72}'],
+        '\u{2F33}' => &['\u{5E7A}'],
+        '\u{2F34}' => &['\u{5E7F}'],
+        '\u{2F35}' => &['\u{5EF4}'],
+        '\u{2F36}' => &['\u{5EFE}'],
+        '\u{2F37}' => &['\u{5F0B}'],
+        '\u{2F38}' => &['\u{5F13}'],
+        '\u{2F39}' => &['\u{5F50}'],
+        '\u{2F3A}' => &['\u{5F61}'],
+        '\u{2F3B}' => &['\u{5F73}'],
+        '\u{2F3C}' => &['\u{5FC3}'],
+        '\u{2F3D}' => &['\u{6208}'],
+        '\u{2F3E}' => &['\u{6236}'],
+        '\u{2F3F}' => &['\u{624B}'],
+        '\u{2F40}' => &['\u{652F}'],
+        '\u{2F41}' => &['\u{6534}'],
+        '\u{2F42}' => &['\u{6587}'],
+        '\u{2F43}' => &['\u{6597}'],
+        '\u{2F44}' => &['\u{65A4}'],
+        '\u{2F45}' => &['\u{65B9}'],
+        '\u{2F46}' => &['\u{65E0}'],
+        '\u{2F47}' => &['\u{65E5}'],
+        '\u{2F48}' => &['\u{66F0}'],
+        '\u{2F49}' => &['\u{6708}'],
+        '\u{2F4A}' => &['\u{6728}'],
+        '\u{2F4B}' => &['\u{6B20}'],
+        '\u{2F4C}' => &['\u{6B62}'],
+        '\u{2F4D}' => &['\u{6B79}'],
+        '\u{2F4E}' => &['\u{6BB3}'],
+        '\u{2F4F}' => &['\u{6BCB}'],
+        '\u{2F50}' => &['\u{6BD4}'],
+        '\u{2F51}' => &['\u{6BDB}'],
+        '\u{2F52}' => &['\u{6C0F}'],
+        '\u{2F53}' => &['\u{6C14}'],
+        '\u{2F54}' => &['\u{6C34}'],
+        '\u{2F55}' => &['\u{706B}'],
+        '\u{2F56}' => &['\u{722A}'],
+        '\u{2F57}' => &['\u{7236}'],
+        '\u{2F58}' => &['\u{723B}'],
+        '\u{2F59}' => &['\u{723F}'],
+        '\u{2F5A}' => &['\u{7247}'],
+        '\u{2F5B}' => &['\u{7259}'],
+        '\u{2F5C}' => &['\u{725B}'],
+        '\u{2F5D}' => &['\u{72AC}'],
+        '\u{2F5E}' => &['\u{7384}'],
+        '\u{2F5F}' => &['\u{7389}'],
+        '\u{2F60}' => &['\u{74DC}'],
+        '\u{2F61}' => &['\u{74E6}'],
+        '\u{2F62}' => &['\u{7518}'],
+        '\u{2F63}' => &['\u{751F}'],
+        '\u{2F64}' => &['\u{7528}'],
+        '\u{2F65}' => &['\u{7530}'],
+        '\u{2F66}' => &['\u{758B}'],
+        '\u{2F67}' => &['\u{7592}'],
+        '\u{2F68}' => &['\u{7676}'],
+        '\u{2F69}' => &['\u{767D}'],
+        '\u{2F6A}' => &['\u{76AE}'],
+        '\u{2F6B}' => &['\u{76BF}'],
+        '\u{2F6C}' => &['\u{76EE}'],
+        '\u{2F6D}' => &['\u{77DB}'],
+        '\u{2F6E}' => &['\u{77E2}'],
+        '\u{2F6F}' => &['\u{77F3}'],
+        '\u{2F70}' => &['\u{793A}'],
+        '\u{2F71}' => &['\u{79B8}'],
+        '\u{2F72}' => &['\u{79BE}'],
+        '\u{2F73}' => &['\u{7A74}'],
+        '\u{2F74}' => &['\u{7ACB}'],
+        '\u{2F75}' => &['\u{7AF9}'],
+        '\u{2F76}' => &['\u{7C73}'],
+        '\u{2F77}' => &['\u{7CF8}'],
+        '\u{2F78}' => &['\u{7F36}'],
+        '\u{2F79}' => &['\u{7F51}'],
+        '\u{2F7A}' => &['\u{7F8A}'],
+        '\u{2F7B}' => &['\u{7FBD}'],
+        '\u{2F7C}' => &['\u{8001}'],
+        '\u{2F7D}' => &['\u{800C}'],
+        '\u{2F7E}' => &['\u{8012}'],
+        '\u{2F7F}' => &['\u{8033}'],
+        '\u{2F80}' => &['\u{807F}'],
+        '\u{2F81}' => &['\u{8089}'],
+        '\u{2F82}' => &['\u{81E3}'],
+        '\u{2F83}' => &['\u{81EA}'],
+        '\u{2F84}' => &['\u{81F3}'],
+        '\u{2F85}' => &['\u{81FC}'],
+        '\u{2F86}' => &['\u{820C}'],
+        '\u{2F87}' => &['\u{821B}'],
+        '\u{2F88}' => &['\u{821F}'],
+        '\u{2F89}' => &['\u{826E}'],
+        '\u{2F8A}' => &['\u{8272}'],
+        '\u{2F8B}' => &['\u{8278}'],
+        '\u{2F8C}' => &['\u{864D}'],
+        '\u{2F8D}' => &['\u{866B}'],
+        '\u{2F8E}' => &['\u{8840}'],
+        '\u{2F8F}' => &['\u{884C}'],
+        '\u{2F90}' => &['\u{8863}'],
+        '\u{2F91}' => &['\u{897E}'],
+        '\u{2F92}' => &['\u{898B}'],
+        '\u{2F93}' => &['\u{89D2}'],
+        '\u{2F94}' => &['\u{8A00}'],
+        '\u{2F95}' => &['\u{8C37}'],
+        '\u{2F96}' => &['\u{8C46}'],
+        '\u{2F97}' => &['\u{8C55}'],
+        '\u{2F98}' => &['\u{8C78}'],
+        '\u{2F99}' => &['\u{8C9D}'],
+        '\u{2F9A}' => &['\u{8D64}'],
+        '\u{2F9B}' => &['\u{8D70}'],
+        '\u{2F9C}' => &['\u{8DB3}'],
+        '\u{2F9D}' => &['\u{8EAB}'],
+        '\u{2F9E}' => &['\u{8ECA}'],
+        '\u{2F9F}' => &['\u{8F9B}'],
+        '\u{2FA0}' => &['\u{8FB0}'],
+        '\u{2FA1}' => &['\u{8FB5}'],
+        '\u{2FA2}' => &['\u{9091}'],
+        '\u{2FA3}' => &['\u{9149}'],
+        '\u{2FA4}' => &['\u{91C6}'],
+        '\u{2FA5}' => &['\u{91CC}'],
+        '\u{2FA6}' => &['\u{91D1}'],
+        '\u{2FA7}' => &['\u{9577}'],
+        '\u{2FA8}' => &['\u{9580}'],
+        '\u{2FA9}' => &['\u{961C}'],
+        '\u{2FAA}' => &['\u{96B6}'],
+        '\u{2FAB}' => &['\u{96B9}'],
+        '\u{2FAC}' => &['\u{96E8}'],
+        '\u{2FAD}' => &['\u{9751}'],
+        '\u{2FAE}' => &['\u{975E}'],
+        '\u{2FAF}' => &['\u{9762}'],
+        '\u{2FB0}' => &['\u{9769}'],
+        '\u{2FB1}' => &['\u{97CB}'],
+        '\u{2FB2}' => &['\u{97ED}'],
+        '\u{2FB3}' => &['\u{97F3}'],
+        '\u{2FB4}' => &['\u{9801}'],
+        '\u{2FB5}' => &['\u{98A8}'],
+        '\u{2FB6}' => &['\u{98DB}'],
+        '\u{2FB7}' => &['\u{98DF}'],
+        '\u{2FB8}' => &['\u{9996}'],
+        '\u{2FB9}' => &['\u{9999}'],
+        '\u{2FBA}' => &['\u{99AC}'],
+        '\u{2FBB}' => &['\u{9AA8}'],
+        '\u{2FBC}' => &['\u{9AD8}'],
+        '\u{2FBD}' => &['\u{9ADF}'],
+        '\u{2FBE}' => &['\u{9B25}'],
+        '\u{2FBF}' => &['\u{9B2F}'],
+        '\u{2FC0}' => &['\u{9B32}'],
+        '\u{2FC1}' => &['\u{9B3C}'],
+        '\u{2FC2}' => &['\u{9B5A}'],
+        '\u{2FC3}' => &['\u{9CE5}'],
+        '\u{2FC4}' => &['\u{9E75}'],
+        '\u{2FC5}' => &['\u{9E7F}'],
+        '\u{2FC6}' => &['\u{9EA5}'],
+        '\u{2FC7}' => &['\u{9EBB}'],
+        '\u{2FC8}' => &['\u{9EC3}'],
+        '\u{2FC9}' => &['\u{9ECD}'],
+        '\u{2FCA}' => &['\u{9ED1}'],
+        '\u{2FCB}' => &['\u{9EF9}'],
+        '\u{2FCC}' => &['\u{9EFD}'],
+        '\u{2FCD}' => &['\u{9F0E}'],
+        '\u{2FCE}' => &['\u{9F13}'],
+        '\u{2FCF}' => &['\u{9F20}'],
+        '\u{2FD0}' => &['\u{9F3B}'],
+        '\u{2FD1}' => &['\u{9F4A}'],
+        '\u{2FD2}' => &['\u{9F52}'],
+        '\u{2FD3}' => &['\u{9F8D}'],
+        '\u{2FD4}' => &['\u{9F9C}'],
+        '\u{2FD5}' => &['\u{9FA0}'],
+        '\u{3000}' => &['\u{0020}'],
+        '\u{3036}' => &['\u{3012}'],
+        '\u{3038}' => &['\u{5341}'],
+        '\u{3039}' => &['\u{5344}'],
+        '\u{303A}' => &['\u{5345}'],
+        '\u{309B}' => &['\u{0020}', '\u{3099}'],
+        '\u{309C}' => &['\u{0020}', '\u{309A}'],
+        '\u{309F}' => &['\u{3088}', '\u{308A}'],
+        '\u{30FF}' => &['\u{30B3}', '\u{30C8}'],
+        '\u{3131}' => &['\u{1100}'],
+        '\u{3132}' => &['\u{1101}'],
+        '\u{3133}' => &['\u{11AA}'],
+        '\u{3134}' => &['\u{1102}'],
+        '\u{3135}' => &['\u{11AC}'],
+        '\u{3136}' => &['\u{11AD}'],
+        '\u{3137}' => &['\u{1103}'],
+        '\u{3138}' => &['\u{1104}'],
+        '\u{3139}' => &['\u{1105}'],
+        '\u{313A}' => &['\u{11B0}'],
+        '\u{313B}' => &['\u{11B1}'],
+        '\u{313C}' => &['\u{11B2}'],
+        '\u{313D}' => &['\u{11B3}'],
+        '\u{313E}' => &['\u{11B4}'],
+        '\u{313F}' => &['\u{11B5}'],
+        '\u{3140}' => &['\u{111A}'],
+        '\u{3141}' => &['\u{1106}'],
+        '\u{3142}' => &['\u{1107}'],
+        '\u{3143}' => &['\u{1108}'],
+        '\u{3144}' => &['\u{1121}'],
+        '\u{3145}' => &['\u{1109}'],
+        '\u{3146}' => &['\u{110A}'],
+        '\u{3147}' => &['\u{110B}'],
+        '\u{3148}' => &['\u{110C}'],
+        '\u{3149}' => &['\u{110D}'],
+        '\u{314A}' => &['\u{110E}'],
+        '\u{314B}' => &['\u{110F}'],
+        '\u{314C}' => &['\u{1110}'],
+        '\u{314D}' => &['\u{1111}'],
+        '\u{314E}' => &['\u{1112}'],
+        '\u{314F}' => &['\u{1161}'],
+        '\u{3150}' => &['\u{1162}'],
+        '\u{3151}' => &['\u{1163}'],
+        '\u{3152}' => &['\u{1164}'],
+        '\u{3153}' => &['\u{1165}'],
+        '\u{3154}' => &['\u{1166}'],
+        '\u{3155}' => &['\u{1167}'],
+        '\u{3156}' => &['\u{1168}'],
+        '\u{3157}' => &['\u{1169}'],
+        '\u{3158}' => &['\u{116A}'],
+        '\u{3159}' => &['\u{116B}'],
+        '\u{315A}' => &['\u{116C}'],
+        '\u{315B}' => &['\u{116D}'],
+        '\u{315C}' => &['\u{116E}'],
+        '\u{315D}' => &['\u{116F}'],
+        '\u{315E}' => &['\u{1170}'],
+        '\u{315F}' => &['\u{1171}'],
+        '\u{3160}' => &['\u{1172}'],
+        '\u{3161}' => &['\u{1173}'],
+        '\u{3162}' => &['\u{1174}'],
+        '\u{3163}' => &['\u{1175}'],
+        '\u{3164}' => &['\u{1160}'],
+        '\u{3165}' => &['\u{1114}'],
+        '\u{3166}' => &['\u{1115}'],
+        '\u{3167}' => &['\u{11C7}'],
+        '\u{3168}' => &['\u{11C8}'],
+        '\u{3169}' => &['\u{11CC}'],
+        '\u{316A}' => &['\u{11CE}'],
+        '\u{316B}' => &['\u{11D3}'],
+        '\u{316C}' => &['\u{11D7}'],
+        '\u{316D}' => &['\u{11D9}'],
+        '\u{316E}' => &['\u{111C}'],
+        '\u{316F}' => &['\u{11DD}'],
+        '\u{3170}' => &['\u{11DF}'],
+        '\u{3171}' => &['\u{111D}'],
+        '\u{3172}' => &['\u{111E}'],
+        '\u{3173}' => &['\u{1120}'],
+        '\u{3174}' => &['\u{1122}'],
+        '\u{3175}' => &['\u{1123}'],
+        '\u{3176}' => &['\u{1127}'],
+        '\u{3177}' => &['\u{1129}'],
+        '\u{3178}' => &['\u{112B}'],
+        '\u{3179}' => &['\u{112C}'],
+        '\u{317A}' => &['\u{112D}'],
+        '\u{317B}' => &['\u{112E}'],
+        '\u{317C}' => &['\u{112F}'],
+        '\u{317D}' => &['\u{1132}'],
+        '\u{317E}' => &['\u{1136}'],
+        '\u{317F}' => &['\u{1140}'],
+        '\u{3180}' => &['\u{1147}'],
+        '\u{3181}' => &['\u{114C}'],
+        '\u{3182}' => &['\u{11F1}'],
+        '\u{3183}' => &['\u{11F2}'],
+        '\u{3184}' => &['\u{1157}'],
+        '\u{3185}' => &['\u{1158}'],
+        '\u{3186}' => &['\u{1159}'],
+        '\u{3187}' => &['\u{1184}'],
+        '\u{3188}' => &['\u{1185}'],
+        '\u{3189}' => &['\u{1188}'],
+        '\u{318A}' => &['\u{1191}'],
+        '\u{318B}' => &['\u{1192}'],
+        '\u{318C}' => &['\u{1194}'],
+        '\u{318D}' => &['\u{119E}'],
+        '\u{318E}' => &['\u{11A1}'],
+        '\u{3192}' => &['\u{4E00}'],
+        '\u{3193}' => &['\u{4E8C}'],
+        '\u{3194}' => &['\u{4E09}'],
+        '\u{3195}' => &['\u{56DB}'],
+        '\u{3196}' => &['\u{4E0A}'],
+        '\u{3197}' => &['\u{4E2D}'],
+        '\u{3198}' => &['\u{4E0B}'],
+        '\u{3199}' => &['\u{7532}'],
+        '\u{319A}' => &['\u{4E59}'],
+        '\u{319B}' => &['\u{4E19}'],
+        '\u{319C}' => &['\u{4E01}'],
+        '\u{319D}' => &['\u{5929}'],
+        '\u{319E}' => &['\u{5730}'],
+        '\u{319F}' => &['\u{4EBA}'],
+        '\u{3200}' => &['\u{0028}', '\u{1100}', '\u{0029}'],
+        '\u{3201}' => &['\u{0028}', '\u{1102}', '\u{0029}'],
+        '\u{3202}' => &['\u{0028}', '\u{1103}', '\u{0029}'],
+        '\u{3203}' => &['\u{0028}', '\u{1105}', '\u{0029}'],
+        '\u{3204}' => &['\u{0028}', '\u{1106}', '\u{0029}'],
+        '\u{3205}' => &['\u{0028}', '\u{1107}', '\u{0029}'],
+        '\u{3206}' => &['\u{0028}', '\u{1109}', '\u{0029}'],
+        '\u{3207}' => &['\u{0028}', '\u{110B}', '\u{0029}'],
+        '\u{3208}' => &['\u{0028}', '\u{110C}', '\u{0029}'],
+        '\u{3209}' => &['\u{0028}', '\u{110E}', '\u{0029}'],
+        '\u{320A}' => &['\u{0028}', '\u{110F}', '\u{0029}'],
+        '\u{320B}' => &['\u{0028}', '\u{1110}', '\u{0029}'],
+        '\u{320C}' => &['\u{0028}', '\u{1111}', '\u{0029}'],
+        '\u{320D}' => &['\u{0028}', '\u{1112}', '\u{0029}'],
+        '\u{320E}' => &['\u{0028}', '\u{1100}', '\u{1161}', '\u{0029}'],
+        '\u{320F}' => &['\u{0028}', '\u{1102}', '\u{1161}', '\u{0029}'],
+        '\u{3210}' => &['\u{0028}', '\u{1103}', '\u{1161}', '\u{0029}'],
+        '\u{3211}' => &['\u{0028}', '\u{1105}', '\u{1161}', '\u{0029}'],
+        '\u{3212}' => &['\u{0028}', '\u{1106}', '\u{1161}', '\u{0029}'],
+        '\u{3213}' => &['\u{0028}', '\u{1107}', '\u{1161}', '\u{0029}'],
+        '\u{3214}' => &['\u{0028}', '\u{1109}', '\u{1161}', '\u{0029}'],
+        '\u{3215}' => &['\u{0028}', '\u{110B}', '\u{1161}', '\u{0029}'],
+        '\u{3216}' => &['\u{0028}', '\u{110C}', '\u{1161}', '\u{0029}'],
+        '\u{3217}' => &['\u{0028}', '\u{110E}', '\u{1161}', '\u{0029}'],
+        '\u{3218}' => &['\u{0028}', '\u{110F}', '\u{1161}', '\u{0029}'],
+        '\u{3219}' => &['\u{0028}', '\u{1110}', '\u{1161}', '\u{0029}'],
+        '\u{321A}' => &['\u{0028}', '\u{1111}', '\u{1161}', '\u{0029}'],
+        '\u{321B}' => &['\u{0028}', '\u{1112}', '\u{1161}', '\u{0029}'],
+        '\u{321C}' => &['\u{0028}', '\u{110C}', '\u{116E}', '\u{0029}'],
+        '\u{321D}' => &['\u{0028}', '\u{110B}', '\u{1169}', '\u{110C}', '\u{1165}', '\u{11AB}', '\u{0029}'],
+        '\u{321E}' => &['\u{0028}', '\u{110B}', '\u{1169}', '\u{1112}', '\u{116E}', '\u{0029}'],
+        '\u{3220}' => &['\u{0028}', '\u{4E00}', '\u{0029}'],
+        '\u{3221}' => &['\u{0028}', '\u{4E8C}', '\u{0029}'],
+        '\u{3222}' => &['\u{0028}', '\u{4E09}', '\u{0029}'],
+        '\u{3223}' => &['\u{0028}', '\u{56DB}', '\u{0029}'],
+        '\u{3224}' => &['\u{0028}', '\u{4E94}', '\u{0029}'],
+        '\u{3225}' => &['\u{0028}', '\u{516D}', '\u{0029}'],
+        '\u{3226}' => &['\u{0028}', '\u{4E03}', '\u{0029}'],
+        '\u{3227}' => &['\u{0028}', '\u{516B}', '\u{0029}'],
+        '\u{3228}' => &['\u{0028}', '\u{4E5D}', '\u{0029}'],
+        '\u{3229}' => &['\u{0028}', '\u{5341}', '\u{0029}'],
+        '\u{322A}' => &['\u{0028}', '\u{6708}', '\u{0029}'],
+        '\u{322B}' => &['\u{0028}', '\u{706B}', '\u{0029}'],
+        '\u{322C}' => &['\u{0028}', '\u{6C34}', '\u{0029}'],
+        '\u{322D}' => &['\u{0028}', '\u{6728}', '\u{0029}'],
+        '\u{322E}' => &['\u{0028}', '\u{91D1}', '\u{0029}'],
+        '\u{322F}' => &['\u{0028}', '\u{571F}', '\u{0029}'],
+        '\u{3230}' => &['\u{0028}', '\u{65E5}', '\u{0029}'],
+        '\u{3231}' => &['\u{0028}', '\u{682A}', '\u{0029}'],
+        '\u{3232}' => &['\u{0028}', '\u{6709}', '\u{0029}'],
+        '\u{3233}' => &['\u{0028}', '\u{793E}', '\u{0029}'],
+        '\u{3234}' => &['\u{0028}', '\u{540D}', '\u{0029}'],
+        '\u{3235}' => &['\u{0028}', '\u{7279}', '\u{0029}'],
+        '\u{3236}' => &['\u{0028}', '\u{8CA1}', '\u{0029}'],
+        '\u{3237}' => &['\u{0028}', '\u{795D}', '\u{0029}'],
+        '\u{3238}' => &['\u{0028}', '\u{52B4}', '\u{0029}'],
+        '\u{3239}' => &['\u{0028}', '\u{4EE3}', '\u{0029}'],
+        '\u{323A}' => &['\u{0028}', '\u{547C}', '\u{0029}'],
+        '\u{323B}' => &['\u{0028}', '\u{5B66}', '\u{0029}'],
+        '\u{323C}' => &['\u{0028}', '\u{76E3}', '\u{0029}'],
+        '\u{323D}' => &['\u{0028}', '\u{4F01}', '\u{0029}'],
+        '\u{323E}' => &['\u{0028}', '\u{8CC7}', '\u{0029}'],
+        '\u{323F}' => &['\u{0028}', '\u{5354}', '\u{0029}'],
+        '\u{3240}' => &['\u{0028}', '\u{796D}', '\u{0029}'],
+        '\u{3241}' => &['\u{0028}', '\u{4F11}', '\u{0029}'],
+        '\u{3242}' => &['\u{0028}', '\u{81EA}', '\u{0029}'],
+        '\u{3243}' => &['\u{0028}', '\u{81F3}', '\u{0029}'],
+        '\u{3244}' => &['\u{554F}'],
+        '\u{3245}' => &['\u{5E7C}'],
+        '\u{3246}' => &['\u{6587}'],
+        '\u{3247}' => &['\u{7B8F}'],
+        '\u{3250}' => &['\u{0050}', '\u{0054}', '\u{0045}'],
+        '\u{3251}' => &['\u{0032}', '\u{0031}'],
+        '\u{3252}' => &['\u{0032}', '\u{0032}'],
+        '\u{3253}' => &['\u{0032}', '\u{0033}'],
+        '\u{3254}' => &['\u{0032}', '\u{0034}'],
+        '\u{3255}' => &['\u{0032}', '\u{0035}'],
+        '\u{3256}' => &['\u{0032}', '\u{0036}'],
+        '\u{3257}' => &['\u{0032}', '\u{0037}'],
+        '\u{3258}' => &['\u{0032}', '\u{0038}'],
+        '\u{3259}' => &['\u{0032}', '\u{0039}'],
+        '\u{325A}' => &['\u{0033}', '\u{0030}'],
+        '\u{325B}' => &['\u{0033}', '\u{0031}'],
+        '\u{325C}' => &['\u{0033}', '\u{0032}'],
+        '\u{325D}' => &['\u{0033}', '\u{0033}'],
+        '\u{325E}' => &['\u{0033}', '\u{0034}'],
+        '\u{325F}' => &['\u{0033}', '\u{0035}'],
+        '\u{3260}' => &['\u{1100}'],
+        '\u{3261}' => &['\u{1102}'],
+        '\u{3262}' => &['\u{1103}'],
+        '\u{3263}' => &['\u{1105}'],
+        '\u{3264}' => &['\u{1106}'],
+        '\u{3265}' => &['\u{1107}'],
+        '\u{3266}' => &['\u{1109}'],
+        '\u{3267}' => &['\u{110B}'],
+        '\u{3268}' => &['\u{110C}'],
+        '\u{3269}' => &['\u{110E}'],
+        '\u{326A}' => &['\u{110F}'],
+        '\u{326B}' => &['\u{1110}'],
+        '\u{326C}' => &['\u{1111}'],
+        '\u{326D}' => &['\u{1112}'],
+        '\u{326E}' => &['\u{1100}', '\u{1161}'],
+        '\u{326F}' => &['\u{1102}', '\u{1161}'],
+        '\u{3270}' => &['\u{1103}', '\u{1161}'],
+        '\u{3271}' => &['\u{1105}', '\u{1161}'],
+        '\u{3272}' => &['\u{1106}', '\u{1161}'],
+        '\u{3273}' => &['\u{1107}', '\u{1161}'],
+        '\u{3274}' => &['\u{1109}', '\u{1161}'],
+        '\u{3275}' => &['\u{110B}', '\u{1161}'],
+        '\u{3276}' => &['\u{110C}', '\u{1161}'],
+        '\u{3277}' => &['\u{110E}', '\u{1161}'],
+        '\u{3278}' => &['\u{110F}', '\u{1161}'],
+        '\u{3279}' => &['\u{1110}', '\u{1161}'],
+        '\u{327A}' => &['\u{1111}', '\u{1161}'],
+        '\u{327B}' => &['\u{1112}', '\u{1161}'],
+        '\u{327C}' => &['\u{110E}', '\u{1161}', '\u{11B7}', '\u{1100}', '\u{1169}'],
+        '\u{327D}' => &['\u{110C}', '\u{116E}', '\u{110B}', '\u{1174}'],
+        '\u{327E}' => &['\u{110B}', '\u{116E}'],
+        '\u{3280}' => &['\u{4E00}'],
+        '\u{3281}' => &['\u{4E8C}'],
+        '\u{3282}' => &['\u{4E09}'],
+        '\u{3283}' => &['\u{56DB}'],
+        '\u{3284}' => &['\u{4E94}'],
+        '\u{3285}' => &['\u{516D}'],
+        '\u{3286}' => &['\u{4E03}'],
+        '\u{3287}' => &['\u{516B}'],
+        '\u{3288}' => &['\u{4E5D}'],
+        '\u{3289}' => &['\u{5341}'],
+        '\u{328A}' => &['\u{6708}'],
+        '\u{328B}' => &['\u{706B}'],
+        '\u{328C}' => &['\u{6C34}'],
+        '\u{328D}' => &['\u{6728}'],
+        '\u{328E}' => &['\u{91D1}'],
+        '\u{328F}' => &['\u{571F}'],
+        '\u{3290}' => &['\u{65E5}'],
+        '\u{3291}' => &['\u{682A}'],
+        '\u{3292}' => &['\u{6709}'],
+        '\u{3293}' => &['\u{793E}'],
+        '\u{3294}' => &['\u{540D}'],
+        '\u{3295}' => &['\u{7279}'],
+        '\u{3296}' => &['\u{8CA1}'],
+        '\u{3297}' => &['\u{795D}'],
+        '\u{3298}' => &['\u{52B4}'],
+        '\u{3299}' => &['\u{79D8}'],
+        '\u{329A}' => &['\u{7537}'],
+        '\u{329B}' => &['\u{5973}'],
+        '\u{329C}' => &['\u{9069}'],
+        '\u{329D}' => &['\u{512A}'],
+        '\u{329E}' => &['\u{5370}'],
+        '\u{329F}' => &['\u{6CE8}'],
+        '\u{32A0}' => &['\u{9805}'],
+        '\u{32A1}' => &['\u{4F11}'],
+        '\u{32A2}' => &['\u{5199}'],
+        '\u{32A3}' => &['\u{6B63}'],
+        '\u{32A4}' => &['\u{4E0A}'],
+        '\u{32A5}' => &['\u{4E2D}'],
+        '\u{32A6}' => &['\u{4E0B}'],
+        '\u{32A7}' => &['\u{5DE6}'],
+        '\u{32A8}' => &['\u{53F3}'],
+        '\u{32A9}' => &['\u{533B}'],
+        '\u{32AA}' => &['\u{5B97}'],
+        '\u{32AB}' => &['\u{5B66}'],
+        '\u{32AC}' => &['\u{76E3}'],
+        '\u{32AD}' => &['\u{4F01}'],
+        '\u{32AE}' => &['\u{8CC7}'],
+        '\u{32AF}' => &['\u{5354}'],
+        '\u{32B0}' => &['\u{591C}'],
+        '\u{32B1}' => &['\u{0033}', '\u{0036}'],
+        '\u{32B2}' => &['\u{0033}', '\u{0037}'],
+        '\u{32B3}' => &['\u{0033}', '\u{0038}'],
+        '\u{32B4}' => &['\u{0033}', '\u{0039}'],
+        '\u{32B5}' => &['\u{0034}', '\u{0030}'],
+        '\u{32B6}' => &['\u{0034}', '\u{0031}'],
+        '\u{32B7}' => &['\u{0034}', '\u{0032}'],
+        '\u{32B8}' => &['\u{0034}', '\u{0033}'],
+        '\u{32B9}' => &['\u{0034}', '\u{0034}'],
+        '\u{32BA}' => &['\u{0034}', '\u{0035}'],
+        '\u{32BB}' => &['\u{0034}', '\u{0036}'],
+        '\u{32BC}' => &['\u{0034}', '\u{0037}'],
+        '\u{32BD}' => &['\u{0034}', '\u{0038}'],
+        '\u{32BE}' => &['\u{0034}', '\u{0039}'],
+        '\u{32BF}' => &['\u{0035}', '\u{0030}'],
+        '\u{32C0}' => &['\u{0031}', '\u{6708}'],
+        '\u{32C1}' => &['\u{0032}', '\u{6708}'],
+        '\u{32C2}' => &['\u{0033}', '\u{6708}'],
+        '\u{32C3}' => &['\u{0034}', '\u{6708}'],
+        '\u{32C4}' => &['\u{0035}', '\u{6708}'],
+        '\u{32C5}' => &['\u{0036}', '\u{6708}'],
+        '\u{32C6}' => &['\u{0037}', '\u{6708}'],
+        '\u{32C7}' => &['\u{0038}', '\u{6708}'],
+        '\u{32C8}' => &['\u{0039}', '\u{6708}'],
+        '\u{32C9}' => &['\u{0031}', '\u{0030}', '\u{6708}'],
+        '\u{32CA}' => &['\u{0031}', '\u{0031}', '\u{6708}'],
+        '\u{32CB}' => &['\u{0031}', '\u{0032}', '\u{6708}'],
+        '\u{32CC}' => &['\u{0048}', '\u{0067}'],
+        '\u{32CD}' => &['\u{0065}', '\u{0072}', '\u{0067}'],
+        '\u{32CE}' => &['\u{0065}', '\u{0056}'],
+        '\u{32CF}' => &['\u{004C}', '\u{0054}', '\u{0044}'],
+        '\u{32D0}' => &['\u{30A2}'],
+        '\u{32D1}' => &['\u{30A4}'],
+        '\u{32D2}' => &['\u{30A6}'],
+        '\u{32D3}' => &['\u{30A8}'],
+        '\u{32D4}' => &['\u{30AA}'],
+        '\u{32D5}' => &['\u{30AB}'],
+        '\u{32D6}' => &['\u{30AD}'],
+        '\u{32D7}' => &['\u{30AF}'],
+        '\u{32D8}' => &['\u{30B1}'],
+        '\u{32D9}' => &['\u{30B3}'],
+        '\u{32DA}' => &['\u{30B5}'],
+        '\u{32DB}' => &['\u{30B7}'],
+        '\u{32DC}' => &['\u{30B9}'],
+        '\u{32DD}' => &['\u{30BB}'],
+        '\u{32DE}' => &['\u{30BD}'],
+        '\u{32DF}' => &['\u{30BF}'],
+        '\u{32E0}' => &['\u{30C1}'],
+        '\u{32E1}' => &['\u{30C4}'],
+        '\u{32E2}' => &['\u{30C6}'],
+        '\u{32E3}' => &['\u{30C8}'],
+        '\u{32E4}' => &['\u{30CA}'],
+        '\u{32E5}' => &['\u{30CB}'],
+        '\u{32E6}' => &['\u{30CC}'],
+        '\u{32E7}' => &['\u{30CD}'],
+        '\u{32E8}' => &['\u{30CE}'],
+        '\u{32E9}' => &['\u{30CF}'],
+        '\u{32EA}' => &['\u{30D2}'],
+        '\u{32EB}' => &['\u{30D5}'],
+        '\u{32EC}' => &['\u{30D8}'],
+        '\u{32ED}' => &['\u{30DB}'],
+        '\u{32EE}' => &['\u{30DE}'],
+        '\u{32EF}' => &['\u{30DF}'],
+        '\u{32F0}' => &['\u{30E0}'],
+        '\u{32F1}' => &['\u{30E1}'],
+        '\u{32F2}' => &['\u{30E2}'],
+        '\u{32F3}' => &['\u{30E4}'],
+        '\u{32F4}' => &['\u{30E6}'],
+        '\u{32F5}' => &['\u{30E8}'],
+        '\u{32F6}' => &['\u{30E9}'],
+        '\u{32F7}' => &['\u{30EA}'],
+        '\u{32F8}' => &['\u{30EB}'],
+        '\u{32F9}' => &['\u{30EC}'],
+        '\u{32FA}' => &['\u{30ED}'],
+        '\u{32FB}' => &['\u{30EF}'],
+        '\u{32FC}' => &['\u{30F0}'],
+        '\u{32FD}' => &['\u{30F1}'],
+        '\u{32FE}' => &['\u{30F2}'],
+        '\u{3300}' => &['\u{30A2}', '\u{30CF}', '\u{309A}', '\u{30FC}', '\u{30C8}'],
+        '\u{3301}' => &['\u{30A2}', '\u{30EB}', '\u{30D5}', '\u{30A1}'],
+        '\u{3302}' => &['\u{30A2}', '\u{30F3}', '\u{30D8}', '\u{309A}', '\u{30A2}'],
+        '\u{3303}' => &['\u{30A2}', '\u{30FC}', '\u{30EB}'],
+        '\u{3304}' => &['\u{30A4}', '\u{30CB}', '\u{30F3}', '\u{30AF}', '\u{3099}'],
+        '\u{3305}' => &['\u{30A4}', '\u{30F3}', '\u{30C1}'],
+        '\u{3306}' => &['\u{30A6}', '\u{30A9}', '\u{30F3}'],
+        '\u{3307}' => &['\u{30A8}', '\u{30B9}', '\u{30AF}', '\u{30FC}', '\u{30C8}', '\u{3099}'],
+        '\u{3308}' => &['\u{30A8}', '\u{30FC}', '\u{30AB}', '\u{30FC}'],
+        '\u{3309}' => &['\u{30AA}', '\u{30F3}', '\u{30B9}'],
+        '\u{330A}' => &['\u{30AA}', '\u{30FC}', '\u{30E0}'],
+        '\u{330B}' => &['\u{30AB}', '\u{30A4}', '\u{30EA}'],
+        '\u{330C}' => &['\u{30AB}', '\u{30E9}', '\u{30C3}', '\u{30C8}'],
+        '\u{330D}' => &['\u{30AB}', '\u{30ED}', '\u{30EA}', '\u{30FC}'],
+        '\u{330E}' => &['\u{30AB}', '\u{3099}', '\u{30ED}', '\u{30F3}'],
+        '\u{330F}' => &['\u{30AB}', '\u{3099}', '\u{30F3}', '\u{30DE}'],
+        '\u{3310}' => &['\u{30AD}', '\u{3099}', '\u{30AB}', '\u{3099}'],
+        '\u{3311}' => &['\u{30AD}', '\u{3099}', '\u{30CB}', '\u{30FC}'],
+        '\u{3312}' => &['\u{30AD}', '\u{30E5}', '\u{30EA}', '\u{30FC}'],
+        '\u{3313}' => &['\u{30AD}', '\u{3099}', '\u{30EB}', '\u{30BF}', '\u{3099}', '\u{30FC}'],
+        '\u{3314}' => &['\u{30AD}', '\u{30ED}'],
+        '\u{3315}' => &['\u{30AD}', '\u{30ED}', '\u{30AF}', '\u{3099}', '\u{30E9}', '\u{30E0}'],
+        '\u{3316}' => &['\u{30AD}', '\u{30ED}', '\u{30E1}', '\u{30FC}', '\u{30C8}', '\u{30EB}'],
+        '\u{3317}' => &['\u{30AD}', '\u{30ED}', '\u{30EF}', '\u{30C3}', '\u{30C8}'],
+        '\u{3318}' => &['\u{30AF}', '\u{3099}', '\u{30E9}', '\u{30E0}'],
+        '\u{3319}' => &['\u{30AF}', '\u{3099}', '\u{30E9}', '\u{30E0}', '\u{30C8}', '\u{30F3}'],
+        '\u{331A}' => &['\u{30AF}', '\u{30EB}', '\u{30BB}', '\u{3099}', '\u{30A4}', '\u{30ED}'],
+        '\u{331B}' => &['\u{30AF}', '\u{30ED}', '\u{30FC}', '\u{30CD}'],
+        '\u{331C}' => &['\u{30B1}', '\u{30FC}', '\u{30B9}'],
+        '\u{331D}' => &['\u{30B3}', '\u{30EB}', '\u{30CA}'],
+        '\u{331E}' => &['\u{30B3}', '\u{30FC}', '\u{30DB}', '\u{309A}'],
+        '\u{331F}' => &['\u{30B5}', '\u{30A4}', '\u{30AF}', '\u{30EB}'],
+        '\u{3320}' => &['\u{30B5}', '\u{30F3}', '\u{30C1}', '\u{30FC}', '\u{30E0}'],
+        '\u{3321}' => &['\u{30B7}', '\u{30EA}', '\u{30F3}', '\u{30AF}', '\u{3099}'],
+        '\u{3322}' => &['\u{30BB}', '\u{30F3}', '\u{30C1}'],
+        '\u{3323}' => &['\u{30BB}', '\u{30F3}', '\u{30C8}'],
+        '\u{3324}' => &['\u{30BF}', '\u{3099}', '\u{30FC}', '\u{30B9}'],
+        '\u{3325}' => &['\u{30C6}', '\u{3099}', '\u{30B7}'],
+        '\u{3326}' => &['\u{30C8}', '\u{3099}', '\u{30EB}'],
+        '\u{3327}' => &['\u{30C8}', '\u{30F3}'],
+        '\u{3328}' => &['\u{30CA}', '\u{30CE}'],
+        '\u{3329}' => &['\u{30CE}', '\u{30C3}', '\u{30C8}'],
+        '\u{332A}' => &['\u{30CF}', '\u{30A4}', '\u{30C4}'],
+        '\u{332B}' => &['\u{30CF}', '\u{309A}', '\u{30FC}', '\u{30BB}', '\u{30F3}', '\u{30C8}'],
+        '\u{332C}' => &['\u{30CF}', '\u{309A}', '\u{30FC}', '\u{30C4}'],
+        '\u{332D}' => &['\u{30CF}', '\u{3099}', '\u{30FC}', '\u{30EC}', '\u{30EB}'],
+        '\u{332E}' => &['\u{30D2}', '\u{309A}', '\u{30A2}', '\u{30B9}', '\u{30C8}', '\u{30EB}'],
+        '\u{332F}' => &['\u{30D2}', '\u{309A}', '\u{30AF}', '\u{30EB}'],
+        '\u{3330}' => &['\u{30D2}', '\u{309A}', '\u{30B3}'],
+        '\u{3331}' => &['\u{30D2}', '\u{3099}', '\u{30EB}'],
+        '\u{3332}' => &['\u{30D5}', '\u{30A1}', '\u{30E9}', '\u{30C3}', '\u{30C8}', '\u{3099}'],
+        '\u{3333}' => &['\u{30D5}', '\u{30A3}', '\u{30FC}', '\u{30C8}'],
+        '\u{3334}' => &['\u{30D5}', '\u{3099}', '\u{30C3}', '\u{30B7}', '\u{30A7}', '\u{30EB}'],
+        '\u{3335}' => &['\u{30D5}', '\u{30E9}', '\u{30F3}'],
+        '\u{3336}' => &['\u{30D8}', '\u{30AF}', '\u{30BF}', '\u{30FC}', '\u{30EB}'],
+        '\u{3337}' => &['\u{30D8}', '\u{309A}', '\u{30BD}'],
+        '\u{3338}' => &['\u{30D8}', '\u{309A}', '\u{30CB}', '\u{30D2}'],
+        '\u{3339}' => &['\u{30D8}', '\u{30EB}', '\u{30C4}'],
+        '\u{333A}' => &['\u{30D8}', '\u{309A}', '\u{30F3}', '\u{30B9}'],
+        '\u{333B}' => &['\u{30D8}', '\u{309A}', '\u{30FC}', '\u{30B7}', '\u{3099}'],
+        '\u{333C}' => &['\u{30D8}', '\u{3099}', '\u{30FC}', '\u{30BF}'],
+        '\u{333D}' => &['\u{30DB}', '\u{309A}', '\u{30A4}', '\u{30F3}', '\u{30C8}'],
+        '\u{333E}' => &['\u{30DB}', '\u{3099}', '\u{30EB}', '\u{30C8}'],
+        '\u{333F}' => &['\u{30DB}', '\u{30F3}'],
+        '\u{3340}' => &['\u{30DB}', '\u{309A}', '\u{30F3}', '\u{30C8}', '\u{3099}'],
+        '\u{3341}' => &['\u{30DB}', '\u{30FC}', '\u{30EB}'],
+        '\u{3342}' => &['\u{30DB}', '\u{30FC}', '\u{30F3}'],
+        '\u{3343}' => &['\u{30DE}', '\u{30A4}', '\u{30AF}', '\u{30ED}'],
+        '\u{3344}' => &['\u{30DE}', '\u{30A4}', '\u{30EB}'],
+        '\u{3345}' => &['\u{30DE}', '\u{30C3}', '\u{30CF}'],
+        '\u{3346}' => &['\u{30DE}', '\u{30EB}', '\u{30AF}'],
+        '\u{3347}' => &['\u{30DE}', '\u{30F3}', '\u{30B7}', '\u{30E7}', '\u{30F3}'],
+        '\u{3348}' => &['\u{30DF}', '\u{30AF}', '\u{30ED}', '\u{30F3}'],
+        '\u{3349}' => &['\u{30DF}', '\u{30EA}'],
+        '\u{334A}' => &['\u{30DF}', '\u{30EA}', '\u{30CF}', '\u{3099}', '\u{30FC}', '\u{30EB}'],
+        '\u{334B}' => &['\u{30E1}', '\u{30AB}', '\u{3099}'],
+        '\u{334C}' => &['\u{30E1}', '\u{30AB}', '\u{3099}', '\u{30C8}', '\u{30F3}'],
+        '\u{334D}' => &['\u{30E1}', '\u{30FC}', '\u{30C8}', '\u{30EB}'],
+        '\u{334E}' => &['\u{30E4}', '\u{30FC}', '\u{30C8}', '\u{3099}'],
+        '\u{334F}' => &['\u{30E4}', '\u{30FC}', '\u{30EB}'],
+        '\u{3350}' => &['\u{30E6}', '\u{30A2}', '\u{30F3}'],
+        '\u{3351}' => &['\u{30EA}', '\u{30C3}', '\u{30C8}', '\u{30EB}'],
+        '\u{3352}' => &['\u{30EA}', '\u{30E9}'],
+        '\u{3353}' => &['\u{30EB}', '\u{30D2}', '\u{309A}', '\u{30FC}'],
+        '\u{3354}' => &['\u{30EB}', '\u{30FC}', '\u{30D5}', '\u{3099}', '\u{30EB}'],
+        '\u{3355}' => &['\u{30EC}', '\u{30E0}'],
+        '\u{3356}' => &['\u{30EC}', '\u{30F3}', '\u{30C8}', '\u{30B1}', '\u{3099}', '\u{30F3}'],
+        '\u{3357}' => &['\u{30EF}', '\u{30C3}', '\u{30C8}'],
+        '\u{3358}' => &['\u{0030}', '\u{70B9}'],
+        '\u{3359}' => &['\u{0031}', '\u{70B9}'],
+        '\u{335A}' => &['\u{0032}', '\u{70B9}'],
+        '\u{335B}' => &['\u{0033}', '\u{70B9}'],
+        '\u{335C}' => &['\u{0034}', '\u{70B9}'],
+        '\u{335D}' => &['\u{0035}', '\u{70B9}'],
+        '\u{335E}' => &['\u{0036}', '\u{70B9}'],
+        '\u{335F}' => &['\u{0037}', '\u{70B9}'],
+        '\u{3360}' => &['\u{0038}', '\u{70B9}'],
+        '\u{3361}' => &['\u{0039}', '\u{70B9}'],
+        '\u{3362}' => &['\u{0031}', '\u{0030}', '\u{70B9}'],
+        '\u{3363}' => &['\u{0031}', '\u{0031}', '\u{70B9}'],
+        '\u{3364}' => &['\u{0031}', '\u{0032}', '\u{70B9}'],
+        '\u{3365}' => &['\u{0031}', '\u{0033}', '\u{70B9}'],
+        '\u{3366}' => &['\u{0031}', '\u{0034}', '\u{70B9}'],
+        '\u{3367}' => &['\u{0031}', '\u{0035}', '\u{70B9}'],
+        '\u{3368}' => &['\u{0031}', '\u{0036}', '\u{70B9}'],
+        '\u{3369}' => &['\u{0031}', '\u{0037}', '\u{70B9}'],
+        '\u{336A}' => &['\u{0031}', '\u{0038}', '\u{70B9}'],
+        '\u{336B}' => &['\u{0031}', '\u{0039}', '\u{70B9}'],
+        '\u{336C}' => &['\u{0032}', '\u{0030}', '\u{70B9}'],
+        '\u{336D}' => &['\u{0032}', '\u{0031}', '\u{70B9}'],
+        '\u{336E}' => &['\u{0032}', '\u{0032}', '\u{70B9}'],
+        '\u{336F}' => &['\u{0032}', '\u{0033}', '\u{70B9}'],
+        '\u{3370}' => &['\u{0032}', '\u{0034}', '\u{70B9}'],
+        '\u{3371}' => &['\u{0068}', '\u{0050}', '\u{0061}'],
+        '\u{3372}' => &['\u{0064}', '\u{0061}'],
+        '\u{3373}' => &['\u{0041}', '\u{0055}'],
+        '\u{3374}' => &['\u{0062}', '\u{0061}', '\u{0072}'],
+        '\u{3375}' => &['\u{006F}', '\u{0056}'],
+        '\u{3376}' => &['\u{0070}', '\u{0063}'],
+        '\u{3377}' => &['\u{0064}', '\u{006D}'],
+        '\u{3378}' => &['\u{0064}', '\u{006D}', '\u{0032}'],
+        '\u{3379}' => &['\u{0064}', '\u{006D}', '\u{0033}'],
+        '\u{337A}' => &['\u{0049}', '\u{0055}'],
+        '\u{337B}' => &['\u{5E73}', '\u{6210}'],
+        '\u{337C}' => &['\u{662D}', '\u{548C}'],
+        '\u{337D}' => &['\u{5927}', '\u{6B63}'],
+        '\u{337E}' => &['\u{660E}', '\u{6CBB}'],
+        '\u{337F}' => &['\u{682A}', '\u{5F0F}', '\u{4F1A}', '\u{793E}'],
+        '\u{3380}' => &['\u{0070}', '\u{0041}'],
+        '\u{3381}' => &['\u{006E}', '\u{0041}'],
+        '\u{3382}' => &['\u{03BC}', '\u{0041}'],
+        '\u{3383}' => &['\u{006D}', '\u{0041}'],
+        '\u{3384}' => &['\u{006B}', '\u{0041}'],
+        '\u{3385}' => &['\u{004B}', '\u{0042}'],
+        '\u{3386}' => &['\u{004D}', '\u{0042}'],
+        '\u{3387}' => &['\u{0047}', '\u{0042}'],
+        '\u{3388}' => &['\u{0063}', '\u{0061}', '\u{006C}'],
+        '\u{3389}' => &['\u{006B}', '\u{0063}', '\u{0061}', '\u{006C}'],
+        '\u{338A}' => &['\u{0070}', '\u{0046}'],
+        '\u{338B}' => &['\u{006E}', '\u{0046}'],
+        '\u{338C}' => &['\u{03BC}', '\u{0046}'],
+        '\u{338D}' => &['\u{03BC}', '\u{0067}'],
+        '\u{338E}' => &['\u{006D}', '\u{0067}'],
+        '\u{338F}' => &['\u{006B}', '\u{0067}'],
+        '\u{3390}' => &['\u{0048}', '\u{007A}'],
+        '\u{3391}' => &['\u{006B}', '\u{0048}', '\u{007A}'],
+        '\u{3392}' => &['\u{004D}', '\u{0048}', '\u{007A}'],
+        '\u{3393}' => &['\u{0047}', '\u{0048}', '\u{007A}'],
+        '\u{3394}' => &['\u{0054}', '\u{0048}', '\u{007A}'],
+        '\u{3395}' => &['\u{03BC}', '\u{006C}'],
+        '\u{3396}' => &['\u{006D}', '\u{006C}'],
+        '\u{3397}' => &['\u{0064}', '\u{006C}'],
+        '\u{3398}' => &['\u{006B}', '\u{006C}'],
+        '\u{3399}' => &['\u{0066}', '\u{006D}'],
+        '\u{339A}' => &['\u{006E}', '\u{006D}'],
+        '\u{339B}' => &['\u{03BC}', '\u{006D}'],
+        '\u{339C}' => &['\u{006D}', '\u{006D}'],
+        '\u{339D}' => &['\u{0063}', '\u{006D}'],
+        '\u{339E}' => &['\u{006B}', '\u{006D}'],
+        '\u{339F}' => &['\u{006D}', '\u{006D}', '\u{0032}'],
+        '\u{33A0}' => &['\u{0063}', '\u{006D}', '\u{0032}'],
+        '\u{33A1}' => &['\u{006D}', '\u{0032}'],
+        '\u{33A2}' => &['\u{006B}', '\u{006D}', '\u{0032}'],
+        '\u{33A3}' => &['\u{006D}', '\u{006D}', '\u{0033}'],
+        '\u{33A4}' => &['\u{0063}', '\u{006D}', '\u{0033}'],
+        '\u{33A5}' => &['\u{006D}', '\u{0033}'],
+        '\u{33A6}' => &['\u{006B}', '\u{006D}', '\u{0033}'],
+        '\u{33A7}' => &['\u{006D}', '\u{2215}', '\u{0073}'],
+        '\u{33A8}' => &['\u{006D}', '\u{2215}', '\u{0073}', '\u{0032}'],
+        '\u{33A9}' => &['\u{0050}', '\u{0061}'],
+        '\u{33AA}' => &['\u{006B}', '\u{0050}', '\u{0061}'],
+        '\u{33AB}' => &['\u{004D}', '\u{0050}', '\u{0061}'],
+        '\u{33AC}' => &['\u{0047}', '\u{0050}', '\u{0061}'],
+        '\u{33AD}' => &['\u{0072}', '\u{0061}', '\u{0064}'],
+        '\u{33AE}' => &['\u{0072}', '\u{0061}', '\u{0064}', '\u{2215}', '\u{0073}'],
+        '\u{33AF}' => &['\u{0072}', '\u{0061}', '\u{0064}', '\u{2215}', '\u{0073}', '\u{0032}'],
+        '\u{33B0}' => &['\u{0070}', '\u{0073}'],
+        '\u{33B1}' => &['\u{006E}', '\u{0073}'],
+        '\u{33B2}' => &['\u{03BC}', '\u{0073}'],
+        '\u{33B3}' => &['\u{006D}', '\u{0073}'],
+        '\u{33B4}' => &['\u{0070}', '\u{0056}'],
+        '\u{33B5}' => &['\u{006E}', '\u{0056}'],
+        '\u{33B6}' => &['\u{03BC}', '\u{0056}'],
+        '\u{33B7}' => &['\u{006D}', '\u{0056}'],
+        '\u{33B8}' => &['\u{006B}', '\u{0056}'],
+        '\u{33B9}' => &['\u{004D}', '\u{0056}'],
+        '\u{33BA}' => &['\u{0070}', '\u{0057}'],
+        '\u{33BB}' => &['\u{006E}', '\u{0057}'],
+        '\u{33BC}' => &['\u{03BC}', '\u{0057}'],
+        '\u{33BD}' => &['\u{006D}', '\u{0057}'],
+        '\u{33BE}' => &['\u{006B}', '\u{0057}'],
+        '\u{33BF}' => &['\u{004D}', '\u{0057}'],
+        '\u{33C0}' => &['\u{006B}', '\u{03A9}'],
+        '\u{33C1}' => &['\u{004D}', '\u{03A9}'],
+        '\u{33C2}' => &['\u{0061}', '\u{002E}', '\u{006D}', '\u{002E}'],
+        '\u{33C3}' => &['\u{0042}', '\u{0071}'],
+        '\u{33C4}' => &['\u{0063}', '\u{0063}'],
+        '\u{33C5}' => &['\u{0063}', '\u{0064}'],
+        '\u{33C6}' => &['\u{0043}', '\u{2215}', '\u{006B}', '\u{0067}'],
+        '\u{33C7}' => &['\u{0043}', '\u{006F}', '\u{002E}'],
+        '\u{33C8}' => &['\u{0064}', '\u{0042}'],
+        '\u{33C9}' => &['\u{0047}', '\u{0079}'],
+        '\u{33CA}' => &['\u{0068}', '\u{0061}'],
+        '\u{33CB}' => &['\u{0048}', '\u{0050}'],
+        '\u{33CC}' => &['\u{0069}', '\u{006E}'],
+        '\u{33CD}' => &['\u{004B}', '\u{004B}'],
+        '\u{33CE}' => &['\u{004B}', '\u{004D}'],
+        '\u{33CF}' => &['\u{006B}', '\u{0074}'],
+        '\u{33D0}' => &['\u{006C}', '\u{006D}'],
+        '\u{33D1}' => &['\u{006C}', '\u{006E}'],
+        '\u{33D2}' => &['\u{006C}', '\u{006F}', '\u{0067}'],
+        '\u{33D3}' => &['\u{006C}', '\u{0078}'],
+        '\u{33D4}' => &['\u{006D}', '\u{0062}'],
+        '\u{33D5}' => &['\u{006D}', '\u{0069}', '\u{006C}'],
+        '\u{33D6}' => &['\u{006D}', '\u{006F}', '\u{006C}'],
+        '\u{33D7}' => &['\u{0050}', '\u{0048}'],
+        '\u{33D8}' => &['\u{0070}', '\u{002E}', '\u{006D}', '\u{002E}'],
+        '\u{33D9}' => &['\u{0050}', '\u{0050}', '\u{004D}'],
+        '\u{33DA}' => &['\u{0050}', '\u{0052}'],
+        '\u{33DB}' => &['\u{0073}', '\u{0072}'],
+        '\u{33DC}' => &['\u{0053}', '\u{0076}'],
+        '\u{33DD}' => &['\u{0057}', '\u{0062}'],
+        '\u{33DE}' => &['\u{0056}', '\u{2215}', '\u{006D}'],
+        '\u{33DF}' => &['\u{0041}', '\u{2215}', '\u{006D}'],
+        '\u{33E0}' => &['\u{0031}', '\u{65E5}'],
+        '\u{33E1}' => &['\u{0032}', '\u{65E5}'],
+        '\u{33E2}' => &['\u{0033}', '\u{65E5}'],
+        '\u{33E3}' => &['\u{0034}', '\u{65E5}'],
+        '\u{33E4}' => &['\u{0035}', '\u{65E5}'],
+        '\u{33E5}' => &['\u{0036}', '\u{65E5}'],
+        '\u{33E6}' => &['\u{0037}', '\u{65E5}'],
+        '\u{33E7}' => &['\u{0038}', '\u{65E5}'],
+        '\u{33E8}' => &['\u{0039}', '\u{65E5}'],
+        '\u{33E9}' => &['\u{0031}', '\u{0030}', '\u{65E5}'],
+        '\u{33EA}' => &['\u{0031}', '\u{0031}', '\u{65E5}'],
+        '\u{33EB}' => &['\u{0031}', '\u{0032}', '\u{65E5}'],
+        '\u{33EC}' => &['\u{0031}', '\u{0033}', '\u{65E5}'],
+        '\u{33ED}' => &['\u{0031}', '\u{0034}', '\u{65E5}'],
+        '\u{33EE}' => &['\u{0031}', '\u{0035}', '\u{65E5}'],
+        '\u{33EF}' => &['\u{0031}', '\u{0036}', '\u{65E5}'],
+        '\u{33F0}' => &['\u{0031}', '\u{0037}', '\u{65E5}'],
+        '\u{33F1}' => &['\u{0031}', '\u{0038}', '\u{65E5}'],
+        '\u{33F2}' => &['\u{0031}', '\u{0039}', '\u{65E5}'],
+        '\u{33F3}' => &['\u{0032}', '\u{0030}', '\u{65E5}'],
+        '\u{33F4}' => &['\u{0032}', '\u{0031}', '\u{65E5}'],
+        '\u{33F5}' => &['\u{0032}', '\u{0032}', '\u{65E5}'],
+        '\u{33F6}' => &['\u{0032}', '\u{0033}', '\u{65E5}'],
+        '\u{33F7}' => &['\u{0032}', '\u{0034}', '\u{65E5}'],
+        '\u{33F8}' => &['\u{0032}', '\u{0035}', '\u{65E5}'],
+        '\u{33F9}' => &['\u{0032}', '\u{0036}', '\u{65E5}'],
+        '\u{33FA}' => &['\u{0032}', '\u{0037}', '\u{65E5}'],
+        '\u{33FB}' => &['\u{0032}', '\u{0038}', '\u{65E5}'],
+        '\u{33FC}' => &['\u{0032}', '\u{0039}', '\u{65E5}'],
+        '\u{33FD}' => &['\u{0033}', '\u{0030}', '\u{65E5}'],
+        '\u{33FE}' => &['\u{0033}', '\u{0031}', '\u{65E5}'],
+        '\u{33FF}' => &['\u{0067}', '\u{0061}', '\u{006C}'],
+        '\u{A69C}' => &['\u{044A}'],
+        '\u{A69D}' => &['\u{044C}'],
+        '\u{A770}' => &['\u{A76F}'],
+        '\u{A7F8}' => &['\u{0126}'],
+        '\u{A7F9}' => &['\u{0153}'],
+        '\u{AB5C}' => &['\u{A727}'],
+        '\u{AB5D}' => &['\u{AB37}'],
+        '\u{AB5E}' => &['\u{026B}'],
+        '\u{AB5F}' => &['\u{AB52}'],
+        '\u{FB00}' => &['\u{0066}', '\u{0066}'],
+        '\u{FB01}' => &['\u{0066}', '\u{0069}'],
+        '\u{FB02}' => &['\u{0066}', '\u{006C}'],
+        '\u{FB03}' => &['\u{0066}', '\u{0066}', '\u{0069}'],
+        '\u{FB04}' => &['\u{0066}', '\u{0066}', '\u{006C}'],
+        '\u{FB05}' => &['\u{0073}', '\u{0074}'],
+        '\u{FB06}' => &['\u{0073}', '\u{0074}'],
+        '\u{FB13}' => &['\u{0574}', '\u{0576}'],
+        '\u{FB14}' => &['\u{0574}', '\u{0565}'],
+        '\u{FB15}' => &['\u{0574}', '\u{056B}'],
+        '\u{FB16}' => &['\u{057E}', '\u{0576}'],
+        '\u{FB17}' => &['\u{0574}', '\u{056D}'],
+        '\u{FB20}' => &['\u{05E2}'],
+        '\u{FB21}' => &['\u{05D0}'],
+        '\u{FB22}' => &['\u{05D3}'],
+        '\u{FB23}' => &['\u{05D4}'],
+        '\u{FB24}' => &['\u{05DB}'],
+        '\u{FB25}' => &['\u{05DC}'],
+        '\u{FB26}' => &['\u{05DD}'],
+        '\u{FB27}' => &['\u{05E8}'],
+        '\u{FB28}' => &['\u{05EA}'],
+        '\u{FB29}' => &['\u{002B}'],
+        '\u{FB4F}' => &['\u{05D0}', '\u{05DC}'],
+        '\u{FB50}' => &['\u{0671}'],
+        '\u{FB51}' => &['\u{0671}'],
+        '\u{FB52}' => &['\u{067B}'],
+        '\u{FB53}' => &['\u{067B}'],
+        '\u{FB54}' => &['\u{067B}'],
+        '\u{FB55}' => &['\u{067B}'],
+        '\u{FB56}' => &['\u{067E}'],
+        '\u{FB57}' => &['\u{067E}'],
+        '\u{FB58}' => &['\u{067E}'],
+        '\u{FB59}' => &['\u{067E}'],
+        '\u{FB5A}' => &['\u{0680}'],
+        '\u{FB5B}' => &['\u{0680}'],
+        '\u{FB5C}' => &['\u{0680}'],
+        '\u{FB5D}' => &['\u{0680}'],
+        '\u{FB5E}' => &['\u{067A}'],
+        '\u{FB5F}' => &['\u{067A}'],
+        '\u{FB60}' => &['\u{067A}'],
+        '\u{FB61}' => &['\u{067A}'],
+        '\u{FB62}' => &['\u{067F}'],
+        '\u{FB63}' => &['\u{067F}'],
+        '\u{FB64}' => &['\u{067F}'],
+        '\u{FB65}' => &['\u{067F}'],
+        '\u{FB66}' => &['\u{0679}'],
+        '\u{FB67}' => &['\u{0679}'],
+        '\u{FB68}' => &['\u{0679}'],
+        '\u{FB69}' => &['\u{0679}'],
+        '\u{FB6A}' => &['\u{06A4}'],
+        '\u{FB6B}' => &['\u{06A4}'],
+        '\u{FB6C}' => &['\u{06A4}'],
+        '\u{FB6D}' => &['\u{06A4}'],
+        '\u{FB6E}' => &['\u{06A6}'],
+        '\u{FB6F}' => &['\u{06A6}'],
+        '\u{FB70}' => &['\u{06A6}'],
+        '\u{FB71}' => &['\u{06A6}'],
+        '\u{FB72}' => &['\u{0684}'],
+        '\u{FB73}' => &['\u{0684}'],
+        '\u{FB74}' => &['\u{0684}'],
+        '\u{FB75}' => &['\u{0684}'],
+        '\u{FB76}' => &['\u{0683}'],
+        '\u{FB77}' => &['\u{0683}'],
+        '\u{FB78}' => &['\u{0683}'],
+        '\u{FB79}' => &['\u{0683}'],
+        '\u{FB7A}' => &['\u{0686}'],
+        '\u{FB7B}' => &['\u{0686}'],
+        '\u{FB7C}' => &['\u{0686}'],
+        '\u{FB7D}' => &['\u{0686}'],
+        '\u{FB7E}' => &['\u{0687}'],
+        '\u{FB7F}' => &['\u{0687}'],
+        '\u{FB80}' => &['\u{0687}'],
+        '\u{FB81}' => &['\u{0687}'],
+        '\u{FB82}' => &['\u{068D}'],
+        '\u{FB83}' => &['\u{068D}'],
+        '\u{FB84}' => &['\u{068C}'],
+        '\u{FB85}' => &['\u{068C}'],
+        '\u{FB86}' => &['\u{068E}'],
+        '\u{FB87}' => &['\u{068E}'],
+        '\u{FB88}' => &['\u{0688}'],
+        '\u{FB89}' => &['\u{0688}'],
+        '\u{FB8A}' => &['\u{0698}'],
+        '\u{FB8B}' => &['\u{0698}'],
+        '\u{FB8C}' => &['\u{0691}'],
+        '\u{FB8D}' => &['\u{0691}'],
+        '\u{FB8E}' => &['\u{06A9}'],
+        '\u{FB8F}' => &['\u{06A9}'],
+        '\u{FB90}' => &['\u{06A9}'],
+        '\u{FB91}' => &['\u{06A9}'],
+        '\u{FB92}' => &['\u{06AF}'],
+        '\u{FB93}' => &['\u{06AF}'],
+        '\u{FB94}' => &['\u{06AF}'],
+        '\u{FB95}' => &['\u{06AF}'],
+        '\u{FB96}' => &['\u{06B3}'],
+        '\u{FB97}' => &['\u{06B3}'],
+        '\u{FB98}' => &['\u{06B3}'],
+        '\u{FB99}' => &['\u{06B3}'],
+        '\u{FB9A}' => &['\u{06B1}'],
+        '\u{FB9B}' => &['\u{06B1}'],
+        '\u{FB9C}' => &['\u{06B1}'],
+        '\u{FB9D}' => &['\u{06B1}'],
+        '\u{FB9E}' => &['\u{06BA}'],
+        '\u{FB9F}' => &['\u{06BA}'],
+        '\u{FBA0}' => &['\u{06BB}'],
+        '\u{FBA1}' => &['\u{06BB}'],
+        '\u{FBA2}' => &['\u{06BB}'],
+        '\u{FBA3}' => &['\u{06BB}'],
+        '\u{FBA4}' => &['\u{06D5}', '\u{0654}'],
+        '\u{FBA5}' => &['\u{06D5}', '\u{0654}'],
+        '\u{FBA6}' => &['\u{06C1}'],
+        '\u{FBA7}' => &['\u{06C1}'],
+        '\u{FBA8}' => &['\u{06C1}'],
+        '\u{FBA9}' => &['\u{06C1}'],
+        '\u{FBAA}' => &['\u{06BE}'],
+        '\u{FBAB}' => &['\u{06BE}'],
+        '\u{FBAC}' => &['\u{06BE}'],
+        '\u{FBAD}' => &['\u{06BE}'],
+        '\u{FBAE}' => &['\u{06D2}'],
+        '\u{FBAF}' => &['\u{06D2}'],
+        '\u{FBB0}' => &['\u{06D2}', '\u{0654}'],
+        '\u{FBB1}' => &['\u{06D2}', '\u{0654}'],
+        '\u{FBD3}' => &['\u{06AD}'],
+        '\u{FBD4}' => &['\u{06AD}'],
+        '\u{FBD5}' => &['\u{06AD}'],
+        '\u{FBD6}' => &['\u{06AD}'],
+        '\u{FBD7}' => &['\u{06C7}'],
+        '\u{FBD8}' => &['\u{06C7}'],
+        '\u{FBD9}' => &['\u{06C6}'],
+        '\u{FBDA}' => &['\u{06C6}'],
+        '\u{FBDB}' => &['\u{06C8}'],
+        '\u{FBDC}' => &['\u{06C8}'],
+        '\u{FBDD}' => &['\u{06C7}', '\u{0674}'],
+        '\u{FBDE}' => &['\u{06CB}'],
+        '\u{FBDF}' => &['\u{06CB}'],
+        '\u{FBE0}' => &['\u{06C5}'],
+        '\u{FBE1}' => &['\u{06C5}'],
+        '\u{FBE2}' => &['\u{06C9}'],
+        '\u{FBE3}' => &['\u{06C9}'],
+        '\u{FBE4}' => &['\u{06D0}'],
+        '\u{FBE5}' => &['\u{06D0}'],
+        '\u{FBE6}' => &['\u{06D0}'],
+        '\u{FBE7}' => &['\u{06D0}'],
+        '\u{FBE8}' => &['\u{0649}'],
+        '\u{FBE9}' => &['\u{0649}'],
+        '\u{FBEA}' => &['\u{064A}', '\u{0654}', '\u{0627}'],
+        '\u{FBEB}' => &['\u{064A}', '\u{0654}', '\u{0627}'],
+        '\u{FBEC}' => &['\u{064A}', '\u{0654}', '\u{06D5}'],
+        '\u{FBED}' => &['\u{064A}', '\u{0654}', '\u{06D5}'],
+        '\u{FBEE}' => &['\u{064A}', '\u{0654}', '\u{0648}'],
+        '\u{FBEF}' => &['\u{064A}', '\u{0654}', '\u{0648}'],
+        '\u{FBF0}' => &['\u{064A}', '\u{0654}', '\u{06C7}'],
+        '\u{FBF1}' => &['\u{064A}', '\u{0654}', '\u{06C7}'],
+        '\u{FBF2}' => &['\u{064A}', '\u{0654}', '\u{06C6}'],
+        '\u{FBF3}' => &['\u{064A}', '\u{0654}', '\u{06C6}'],
+        '\u{FBF4}' => &['\u{064A}', '\u{0654}', '\u{06C8}'],
+        '\u{FBF5}' => &['\u{064A}', '\u{0654}', '\u{06C8}'],
+        '\u{FBF6}' => &['\u{064A}', '\u{0654}', '\u{06D0}'],
+        '\u{FBF7}' => &['\u{064A}', '\u{0654}', '\u{06D0}'],
+        '\u{FBF8}' => &['\u{064A}', '\u{0654}', '\u{06D0}'],
+        '\u{FBF9}' => &['\u{064A}', '\u{0654}', '\u{0649}'],
+        '\u{FBFA}' => &['\u{064A}', '\u{0654}', '\u{0649}'],
+        '\u{FBFB}' => &['\u{064A}', '\u{0654}', '\u{0649}'],
+        '\u{FBFC}' => &['\u{06CC}'],
+        '\u{FBFD}' => &['\u{06CC}'],
+        '\u{FBFE}' => &['\u{06CC}'],
+        '\u{FBFF}' => &['\u{06CC}'],
+        '\u{FC00}' => &['\u{064A}', '\u{0654}', '\u{062C}'],
+        '\u{FC01}' => &['\u{064A}', '\u{0654}', '\u{062D}'],
+        '\u{FC02}' => &['\u{064A}', '\u{0654}', '\u{0645}'],
+        '\u{FC03}' => &['\u{064A}', '\u{0654}', '\u{0649}'],
+        '\u{FC04}' => &['\u{064A}', '\u{0654}', '\u{064A}'],
+        '\u{FC05}' => &['\u{0628}', '\u{062C}'],
+        '\u{FC06}' => &['\u{0628}', '\u{062D}'],
+        '\u{FC07}' => &['\u{0628}', '\u{062E}'],
+        '\u{FC08}' => &['\u{0628}', '\u{0645}'],
+        '\u{FC09}' => &['\u{0628}', '\u{0649}'],
+        '\u{FC0A}' => &['\u{0628}', '\u{064A}'],
+        '\u{FC0B}' => &['\u{062A}', '\u{062C}'],
+        '\u{FC0C}' => &['\u{062A}', '\u{062D}'],
+        '\u{FC0D}' => &['\u{062A}', '\u{062E}'],
+        '\u{FC0E}' => &['\u{062A}', '\u{0645}'],
+        '\u{FC0F}' => &['\u{062A}', '\u{0649}'],
+        '\u{FC10}' => &['\u{062A}', '\u{064A}'],
+        '\u{FC11}' => &['\u{062B}', '\u{062C}'],
+        '\u{FC12}' => &['\u{062B}', '\u{0645}'],
+        '\u{FC13}' => &['\u{062B}', '\u{0649}'],
+        '\u{FC14}' => &['\u{062B}', '\u{064A}'],
+        '\u{FC15}' => &['\u{062C}', '\u{062D}'],
+        '\u{FC16}' => &['\u{062C}', '\u{0645}'],
+        '\u{FC17}' => &['\u{062D}', '\u{062C}'],
+        '\u{FC18}' => &['\u{062D}', '\u{0645}'],
+        '\u{FC19}' => &['\u{062E}', '\u{062C}'],
+        '\u{FC1A}' => &['\u{062E}', '\u{062D}'],
+        '\u{FC1B}' => &['\u{062E}', '\u{0645}'],
+        '\u{FC1C}' => &['\u{0633}', '\u{062C}'],
+        '\u{FC1D}' => &['\u{0633}', '\u{062D}'],
+        '\u{FC1E}' => &['\u{0633}', '\u{062E}'],
+        '\u{FC1F}' => &['\u{0633}', '\u{0645}'],
+        '\u{FC20}' => &['\u{0635}', '\u{062D}'],
+        '\u{FC21}' => &['\u{0635}', '\u{0645}'],
+        '\u{FC22}' => &['\u{0636}', '\u{062C}'],
+        '\u{FC23}' => &['\u{0636}', '\u{062D}'],
+        '\u{FC24}' => &['\u{0636}', '\u{062E}'],
+        '\u{FC25}' => &['\u{0636}', '\u{0645}'],
+        '\u{FC26}' => &['\u{0637}', '\u{062D}'],
+        '\u{FC27}' => &['\u{0637}', '\u{0645}'],
+        '\u{FC28}' => &['\u{0638}', '\u{0645}'],
+        '\u{FC29}' => &['\u{0639}', '\u{062C}'],
+        '\u{FC2A}' => &['\u{0639}', '\u{0645}'],
+        '\u{FC2B}' => &['\u{063A}', '\u{062C}'],
+        '\u{FC2C}' => &['\u{063A}', '\u{0645}'],
+        '\u{FC2D}' => &['\u{0641}', '\u{062C}'],
+        '\u{FC2E}' => &['\u{0641}', '\u{062D}'],
+        '\u{FC2F}' => &['\u{0641}', '\u{062E}'],
+        '\u{FC30}' => &['\u{0641}', '\u{0645}'],
+        '\u{FC31}' => &['\u{0641}', '\u{0649}'],
+        '\u{FC32}' => &['\u{0641}', '\u{064A}'],
+        '\u{FC33}' => &['\u{0642}', '\u{062D}'],
+        '\u{FC34}' => &['\u{0642}', '\u{0645}'],
+        '\u{FC35}' => &['\u{0642}', '\u{0649}'],
+        '\u{FC36}' => &['\u{0642}', '\u{064A}'],
+        '\u{FC37}' => &['\u{0643}', '\u{0627}'],
+        '\u{FC38}' => &['\u{0643}', '\u{062C}'],
+        '\u{FC39}' => &['\u{0643}', '\u{062D}'],
+        '\u{FC3A}' => &['\u{0643}', '\u{062E}'],
+        '\u{FC3B}' => &['\u{0643}', '\u{0644}'],
+        '\u{FC3C}' => &['\u{0643}', '\u{0645}'],
+        '\u{FC3D}' => &['\u{0643}', '\u{0649}'],
+        '\u{FC3E}' => &['\u{0643}', '\u{064A}'],
+        '\u{FC3F}' => &['\u{0644}', '\u{062C}'],
+        '\u{FC40}' => &['\u{0644}', '\u{062D}'],
+        '\u{FC41}' => &['\u{0644}', '\u{062E}'],
+        '\u{FC42}' => &['\u{0644}', '\u{0645}'],
+        '\u{FC43}' => &['\u{0644}', '\u{0649}'],
+        '\u{FC44}' => &['\u{0644}', '\u{064A}'],
+        '\u{FC45}' => &['\u{0645}', '\u{062C}'],
+        '\u{FC46}' => &['\u{0645}', '\u{062D}'],
+        '\u{FC47}' => &['\u{0645}', '\u{062E}'],
+        '\u{FC48}' => &['\u{0645}', '\u{0645}'],
+        '\u{FC49}' => &['\u{0645}', '\u{0649}'],
+        '\u{FC4A}' => &['\u{0645}', '\u{064A}'],
+        '\u{FC4B}' => &['\u{0646}', '\u{062C}'],
+        '\u{FC4C}' => &['\u{0646}', '\u{062D}'],
+        '\u{FC4D}' => &['\u{0646}', '\u{062E}'],
+        '\u{FC4E}' => &['\u{0646}', '\u{0645}'],
+        '\u{FC4F}' => &['\u{0646}', '\u{0649}'],
+        '\u{FC50}' => &['\u{0646}', '\u{064A}'],
+        '\u{FC51}' => &['\u{0647}', '\u{062C}'],
+        '\u{FC52}' => &['\u{0647}', '\u{0645}'],
+        '\u{FC53}' => &['\u{0647}', '\u{0649}'],
+        '\u{FC54}' => &['\u{0647}', '\u{064A}'],
+        '\u{FC55}' => &['\u{064A}', '\u{062C}'],
+        '\u{FC56}' => &['\u{064A}', '\u{062D}'],
+        '\u{FC57}' => &['\u{064A}', '\u{062E}'],
+        '\u{FC58}' => &['\u{064A}', '\u{0645}'],
+        '\u{FC59}' => &['\u{064A}', '\u{0649}'],
+        '\u{FC5A}' => &['\u{064A}', '\u{064A}'],
+        '\u{FC5B}' => &['\u{0630}', '\u{0670}'],
+        '\u{FC5C}' => &['\u{0631}', '\u{0670}'],
+        '\u{FC5D}' => &['\u{0649}', '\u{0670}'],
+        '\u{FC5E}' => &['\u{0020}', '\u{064C}', '\u{0651}'],
+        '\u{FC5F}' => &['\u{0020}', '\u{064D}', '\u{0651}'],
+        '\u{FC60}' => &['\u{0020}', '\u{064E}', '\u{0651}'],
+        '\u{FC61}' => &['\u{0020}', '\u{064F}', '\u{0651}'],
+        '\u{FC62}' => &['\u{0020}', '\u{0650}', '\u{0651}'],
+        '\u{FC63}' => &['\u{0020}', '\u{0651}', '\u{0670}'],
+        '\u{FC64}' => &['\u{064A}', '\u{0654}', '\u{0631}'],
+        '\u{FC65}' => &['\u{064A}', '\u{0654}', '\u{0632}'],
+        '\u{FC66}' => &['\u{064A}', '\u{0654}', '\u{0645}'],
+        '\u{FC67}' => &['\u{064A}', '\u{0654}', '\u{0646}'],
+        '\u{FC68}' => &['\u{064A}', '\u{0654}', '\u{0649}'],
+        '\u{FC69}' => &['\u{064A}', '\u{0654}', '\u{064A}'],
+        '\u{FC6A}' => &['\u{0628}', '\u{0631}'],
+        '\u{FC6B}' => &['\u{0628}', '\u{0632}'],
+        '\u{FC6C}' => &['\u{0628}', '\u{0645}'],
+        '\u{FC6D}' => &['\u{0628}', '\u{0646}'],
+        '\u{FC6E}' => &['\u{0628}', '\u{0649}'],
+        '\u{FC6F}' => &['\u{0628}', '\u{064A}'],
+        '\u{FC70}' => &['\u{062A}', '\u{0631}'],
+        '\u{FC71}' => &['\u{062A}', '\u{0632}'],
+        '\u{FC72}' => &['\u{062A}', '\u{0645}'],
+        '\u{FC73}' => &['\u{062A}', '\u{0646}'],
+        '\u{FC74}' => &['\u{062A}', '\u{0649}'],
+        '\u{FC75}' => &['\u{062A}', '\u{064A}'],
+        '\u{FC76}' => &['\u{062B}', '\u{0631}'],
+        '\u{FC77}' => &['\u{062B}', '\u{0632}'],
+        '\u{FC78}' => &['\u{062B}', '\u{0645}'],
+        '\u{FC79}' => &['\u{062B}', '\u{0646}'],
+        '\u{FC7A}' => &['\u{062B}', '\u{0649}'],
+        '\u{FC7B}' => &['\u{062B}', '\u{064A}'],
+        '\u{FC7C}' => &['\u{0641}', '\u{0649}'],
+        '\u{FC7D}' => &['\u{0641}', '\u{064A}'],
+        '\u{FC7E}' => &['\u{0642}', '\u{0649}'],
+        '\u{FC7F}' => &['\u{0642}', '\u{064A}'],
+        '\u{FC80}' => &['\u{0643}', '\u{0627}'],
+        '\u{FC81}' => &['\u{0643}', '\u{0644}'],
+        '\u{FC82}' => &['\u{0643}', '\u{0645}'],
+        '\u{FC83}' => &['\u{0643}', '\u{0649}'],
+        '\u{FC84}' => &['\u{0643}', '\u{064A}'],
+        '\u{FC85}' => &['\u{0644}', '\u{0645}'],
+        '\u{FC86}' => &['\u{0644}', '\u{0649}'],
+        '\u{FC87}' => &['\u{0644}', '\u{064A}'],
+        '\u{FC88}' => &['\u{0645}', '\u{0627}'],
+        '\u{FC89}' => &['\u{0645}', '\u{0645}'],
+        '\u{FC8A}' => &['\u{0646}', '\u{0631}'],
+        '\u{FC8B}' => &['\u{0646}', '\u{0632}'],
+        '\u{FC8C}' => &['\u{0646}', '\u{0645}'],
+        '\u{FC8D}' => &['\u{0646}', '\u{0646}'],
+        '\u{FC8E}' => &['\u{0646}', '\u{0649}'],
+        '\u{FC8F}' => &['\u{0646}', '\u{064A}'],
+        '\u{FC90}' => &['\u{0649}', '\u{0670}'],
+        '\u{FC91}' => &['\u{064A}', '\u{0631}'],
+        '\u{FC92}' => &['\u{064A}', '\u{0632}'],
+        '\u{FC93}' => &['\u{064A}', '\u{0645}'],
+        '\u{FC94}' => &['\u{064A}', '\u{0646}'],
+        '\u{FC95}' => &['\u{064A}', '\u{0649}'],
+        '\u{FC96}' => &['\u{064A}', '\u{064A}'],
+        '\u{FC97}' => &['\u{064A}', '\u{0654}', '\u{062C}'],
+        '\u{FC98}' => &['\u{064A}', '\u{0654}', '\u{062D}'],
+        '\u{FC99}' => &['\u{064A}', '\u{0654}', '\u{062E}'],
+        '\u{FC9A}' => &['\u{064A}', '\u{0654}', '\u{0645}'],
+        '\u{FC9B}' => &['\u{064A}', '\u{0654}', '\u{0647}'],
+        '\u{FC9C}' => &['\u{0628}', '\u{062C}'],
+        '\u{FC9D}' => &['\u{0628}', '\u{062D}'],
+        '\u{FC9E}' => &['\u{0628}', '\u{062E}'],
+        '\u{FC9F}' => &['\u{0628}', '\u{0645}'],
+        '\u{FCA0}' => &['\u{0628}', '\u{0647}'],
+        '\u{FCA1}' => &['\u{062A}', '\u{062C}'],
+        '\u{FCA2}' => &['\u{062A}', '\u{062D}'],
+        '\u{FCA3}' => &['\u{062A}', '\u{062E}'],
+        '\u{FCA4}' => &['\u{062A}', '\u{0645}'],
+        '\u{FCA5}' => &['\u{062A}', '\u{0647}'],
+        '\u{FCA6}' => &['\u{062B}', '\u{0645}'],
+        '\u{FCA7}' => &['\u{062C}', '\u{062D}'],
+        '\u{FCA8}' => &['\u{062C}', '\u{0645}'],
+        '\u{FCA9}' => &['\u{062D}', '\u{062C}'],
+        '\u{FCAA}' => &['\u{062D}', '\u{0645}'],
+        '\u{FCAB}' => &['\u{062E}', '\u{062C}'],
+        '\u{FCAC}' => &['\u{062E}', '\u{0645}'],
+        '\u{FCAD}' => &['\u{0633}', '\u{062C}'],
+        '\u{FCAE}' => &['\u{0633}', '\u{062D}'],
+        '\u{FCAF}' => &['\u{0633}', '\u{062E}'],
+        '\u{FCB0}' => &['\u{0633}', '\u{0645}'],
+        '\u{FCB1}' => &['\u{0635}', '\u{062D}'],
+        '\u{FCB2}' => &['\u{0635}', '\u{062E}'],
+        '\u{FCB3}' => &['\u{0635}', '\u{0645}'],
+        '\u{FCB4}' => &['\u{0636}', '\u{062C}'],
+        '\u{FCB5}' => &['\u{0636}', '\u{062D}'],
+        '\u{FCB6}' => &['\u{0636}', '\u{062E}'],
+        '\u{FCB7}' => &['\u{0636}', '\u{0645}'],
+        '\u{FCB8}' => &['\u{0637}', '\u{062D}'],
+        '\u{FCB9}' => &['\u{0638}', '\u{0645}'],
+        '\u{FCBA}' => &['\u{0639}', '\u{062C}'],
+        '\u{FCBB}' => &['\u{0639}', '\u{0645}'],
+        '\u{FCBC}' => &['\u{063A}', '\u{062C}'],
+        '\u{FCBD}' => &['\u{063A}', '\u{0645}'],
+        '\u{FCBE}' => &['\u{0641}', '\u{062C}'],
+        '\u{FCBF}' => &['\u{0641}', '\u{062D}'],
+        '\u{FCC0}' => &['\u{0641}', '\u{062E}'],
+        '\u{FCC1}' => &['\u{0641}', '\u{0645}'],
+        '\u{FCC2}' => &['\u{0642}', '\u{062D}'],
+        '\u{FCC3}' => &['\u{0642}', '\u{0645}'],
+        '\u{FCC4}' => &['\u{0643}', '\u{062C}'],
+        '\u{FCC5}' => &['\u{0643}', '\u{062D}'],
+        '\u{FCC6}' => &['\u{0643}', '\u{062E}'],
+        '\u{FCC7}' => &['\u{0643}', '\u{0644}'],
+        '\u{FCC8}' => &['\u{0643}', '\u{0645}'],
+        '\u{FCC9}' => &['\u{0644}', '\u{062C}'],
+        '\u{FCCA}' => &['\u{0644}', '\u{062D}'],
+        '\u{FCCB}' => &['\u{0644}', '\u{062E}'],
+        '\u{FCCC}' => &['\u{0644}', '\u{0645}'],
+        '\u{FCCD}' => &['\u{0644}', '\u{0647}'],
+        '\u{FCCE}' => &['\u{0645}', '\u{062C}'],
+        '\u{FCCF}' => &['\u{0645}', '\u{062D}'],
+        '\u{FCD0}' => &['\u{0645}', '\u{062E}'],
+        '\u{FCD1}' => &['\u{0645}', '\u{0645}'],
+        '\u{FCD2}' => &['\u{0646}', '\u{062C}'],
+        '\u{FCD3}' => &['\u{0646}', '\u{062D}'],
+        '\u{FCD4}' => &['\u{0646}', '\u{062E}'],
+        '\u{FCD5}' => &['\u{0646}', '\u{0645}'],
+        '\u{FCD6}' => &['\u{0646}', '\u{0647}'],
+        '\u{FCD7}' => &['\u{0647}', '\u{062C}'],
+        '\u{FCD8}' => &['\u{0647}', '\u{0645}'],
+        '\u{FCD9}' => &['\u{0647}', '\u{0670}'],
+        '\u{FCDA}' => &['\u{064A}', '\u{062C}'],
+        '\u{FCDB}' => &['\u{064A}', '\u{062D}'],
+        '\u{FCDC}' => &['\u{064A}', '\u{062E}'],
+        '\u{FCDD}' => &['\u{064A}', '\u{0645}'],
+        '\u{FCDE}' => &['\u{064A}', '\u{0647}'],
+        '\u{FCDF}' => &['\u{064A}', '\u{0654}', '\u{0645}'],
+        '\u{FCE0}' => &['\u{064A}', '\u{0654}', '\u{0647}'],
+        '\u{FCE1}' => &['\u{0628}', '\u{0645}'],
+        '\u{FCE2}' => &['\u{0628}', '\u{0647}'],
+        '\u{FCE3}' => &['\u{062A}', '\u{0645}'],
+        '\u{FCE4}' => &['\u{062A}', '\u{0647}'],
+        '\u{FCE5}' => &['\u{062B}', '\u{0645}'],
+        '\u{FCE6}' => &['\u{062B}', '\u{0647}'],
+        '\u{FCE7}' => &['\u{0633}', '\u{0645}'],
+        '\u{FCE8}' => &['\u{0633}', '\u{0647}'],
+        '\u{FCE9}' => &['\u{0634}', '\u{0645}'],
+        '\u{FCEA}' => &['\u{0634}', '\u{0647}'],
+        '\u{FCEB}' => &['\u{0643}', '\u{0644}'],
+        '\u{FCEC}' => &['\u{0643}', '\u{0645}'],
+        '\u{FCED}' => &['\u{0644}', '\u{0645}'],
+        '\u{FCEE}' => &['\u{0646}', '\u{0645}'],
+        '\u{FCEF}' => &['\u{0646}', '\u{0647}'],
+        '\u{FCF0}' => &['\u{064A}', '\u{0645}'],
+        '\u{FCF1}' => &['\u{064A}', '\u{0647}'],
+        '\u{FCF2}' => &['\u{0640}', '\u{064E}', '\u{0651}'],
+        '\u{FCF3}' => &['\u{0640}', '\u{064F}', '\u{0651}'],
+        '\u{FCF4}' => &['\u{0640}', '\u{0650}', '\u{0651}'],
+        '\u{FCF5}' => &['\u{0637}', '\u{0649}'],
+        '\u{FCF6}' => &['\u{0637}', '\u{064A}'],
+        '\u{FCF7}' => &['\u{0639}', '\u{0649}'],
+        '\u{FCF8}' => &['\u{0639}', '\u{064A}'],
+        '\u{FCF9}' => &['\u{063A}', '\u{0649}'],
+        '\u{FCFA}' => &['\u{063A}', '\u{064A}'],
+        '\u{FCFB}' => &['\u{0633}', '\u{0649}'],
+        '\u{FCFC}' => &['\u{0633}', '\u{064A}'],
+        '\u{FCFD}' => &['\u{0634}', '\u{0649}'],
+        '\u{FCFE}' => &['\u{0634}', '\u{064A}'],
+        '\u{FCFF}' => &['\u{062D}', '\u{0649}'],
+        '\u{FD00}' => &['\u{062D}', '\u{064A}'],
+        '\u{FD01}' => &['\u{062C}', '\u{0649}'],
+        '\u{FD02}' => &['\u{062C}', '\u{064A}'],
+        '\u{FD03}' => &['\u{062E}', '\u{0649}'],
+        '\u{FD04}' => &['\u{062E}', '\u{064A}'],
+        '\u{FD05}' => &['\u{0635}', '\u{0649}'],
+        '\u{FD06}' => &['\u{0635}', '\u{064A}'],
+        '\u{FD07}' => &['\u{0636}', '\u{0649}'],
+        '\u{FD08}' => &['\u{0636}', '\u{064A}'],
+        '\u{FD09}' => &['\u{0634}', '\u{062C}'],
+        '\u{FD0A}' => &['\u{0634}', '\u{062D}'],
+        '\u{FD0B}' => &['\u{0634}', '\u{062E}'],
+        '\u{FD0C}' => &['\u{0634}', '\u{0645}'],
+        '\u{FD0D}' => &['\u{0634}', '\u{0631}'],
+        '\u{FD0E}' => &['\u{0633}', '\u{0631}'],
+        '\u{FD0F}' => &['\u{0635}', '\u{0631}'],
+        '\u{FD10}' => &['\u{0636}', '\u{0631}'],
+        '\u{FD11}' => &['\u{0637}', '\u{0649}'],
+        '\u{FD12}' => &['\u{0637}', '\u{064A}'],
+        '\u{FD13}' => &['\u{0639}', '\u{0649}'],
+        '\u{FD14}' => &['\u{0639}', '\u{064A}'],
+        '\u{FD15}' => &['\u{063A}', '\u{0649}'],
+        '\u{FD16}' => &['\u{063A}', '\u{064A}'],
+        '\u{FD17}' => &['\u{0633}', '\u{0649}'],
+        '\u{FD18}' => &['\u{0633}', '\u{064A}'],
+        '\u{FD19}' => &['\u{0634}', '\u{0649}'],
+        '\u{FD1A}' => &['\u{0634}', '\u{064A}'],
+        '\u{FD1B}' => &['\u{062D}', '\u{0649}'],
+        '\u{FD1C}' => &['\u{062D}', '\u{064A}'],
+        '\u{FD1D}' => &['\u{062C}', '\u{0649}'],
+        '\u{FD1E}' => &['\u{062C}', '\u{064A}'],
+        '\u{FD1F}' => &['\u{062E}', '\u{0649}'],
+        '\u{FD20}' => &['\u{062E}', '\u{064A}'],
+        '\u{FD21}' => &['\u{0635}', '\u{0649}'],
+        '\u{FD22}' => &['\u{0635}', '\u{064A}'],
+        '\u{FD23}' => &['\u{0636}', '\u{0649}'],
+        '\u{FD24}' => &['\u{0636}', '\u{064A}'],
+        '\u{FD25}' => &['\u{0634}', '\u{062C}'],
+        '\u{FD26}' => &['\u{0634}', '\u{062D}'],
+        '\u{FD27}' => &['\u{0634}', '\u{062E}'],
+        '\u{FD28}' => &['\u{0634}', '\u{0645}'],
+        '\u{FD29}' => &['\u{0634}', '\u{0631}'],
+        '\u{FD2A}' => &['\u{0633}', '\u{0631}'],
+        '\u{FD2B}' => &['\u{0635}', '\u{0631}'],
+        '\u{FD2C}' => &['\u{0636}', '\u{0631}'],
+        '\u{FD2D}' => &['\u{0634}', '\u{062C}'],
+        '\u{FD2E}' => &['\u{0634}', '\u{062D}'],
+        '\u{FD2F}' => &['\u{0634}', '\u{062E}'],
+        '\u{FD30}' => &['\u{0634}', '\u{0645}'],
+        '\u{FD31}' => &['\u{0633}', '\u{0647}'],
+        '\u{FD32}' => &['\u{0634}', '\u{0647}'],
+        '\u{FD33}' => &['\u{0637}', '\u{0645}'],
+        '\u{FD34}' => &['\u{0633}', '\u{062C}'],
+        '\u{FD35}' => &['\u{0633}', '\u{062D}'],
+        '\u{FD36}' => &['\u{0633}', '\u{062E}'],
+        '\u{FD37}' => &['\u{0634}', '\u{062C}'],
+        '\u{FD38}' => &['\u{0634}', '\u{062D}'],
+        '\u{FD39}' => &['\u{0634}', '\u{062E}'],
+        '\u{FD3A}' => &['\u{0637}', '\u{0645}'],
+        '\u{FD3B}' => &['\u{0638}', '\u{0645}'],
+        '\u{FD3C}' => &['\u{0627}', '\u{064B}'],
+        '\u{FD3D}' => &['\u{0627}', '\u{064B}'],
+        '\u{FD50}' => &['\u{062A}', '\u{062C}', '\u{0645}'],
+        '\u{FD51}' => &['\u{062A}', '\u{062D}', '\u{062C}'],
+        '\u{FD52}' => &['\u{062A}', '\u{062D}', '\u{062C}'],
+        '\u{FD53}' => &['\u{062A}', '\u{062D}', '\u{0645}'],
+        '\u{FD54}' => &['\u{062A}', '\u{062E}', '\u{0645}'],
+        '\u{FD55}' => &['\u{062A}', '\u{0645}', '\u{062C}'],
+        '\u{FD56}' => &['\u{062A}', '\u{0645}', '\u{062D}'],
+        '\u{FD57}' => &['\u{062A}', '\u{0645}', '\u{062E}'],
+        '\u{FD58}' => &['\u{062C}', '\u{0645}', '\u{062D}'],
+        '\u{FD59}' => &['\u{062C}', '\u{0645}', '\u{062D}'],
+        '\u{FD5A}' => &['\u{062D}', '\u{0645}', '\u{064A}'],
+        '\u{FD5B}' => &['\u{062D}', '\u{0645}', '\u{0649}'],
+        '\u{FD5C}' => &['\u{0633}', '\u{062D}', '\u{062C}'],
+        '\u{FD5D}' => &['\u{0633}', '\u{062C}', '\u{062D}'],
+        '\u{FD5E}' => &['\u{0633}', '\u{062C}', '\u{0649}'],
+        '\u{FD5F}' => &['\u{0633}', '\u{0645}', '\u{062D}'],
+        '\u{FD60}' => &['\u{0633}', '\u{0645}', '\u{062D}'],
+        '\u{FD61}' => &['\u{0633}', '\u{0645}', '\u{062C}'],
+        '\u{FD62}' => &['\u{0633}', '\u{0645}', '\u{0645}'],
+        '\u{FD63}' => &['\u{0633}', '\u{0645}', '\u{0645}'],
+        '\u{FD64}' => &['\u{0635}', '\u{062D}', '\u{062D}'],
+        '\u{FD65}' => &['\u{0635}', '\u{062D}', '\u{062D}'],
+        '\u{FD66}' => &['\u{0635}', '\u{0645}', '\u{0645}'],
+        '\u{FD67}' => &['\u{0634}', '\u{062D}', '\u{0645}'],
+        '\u{FD68}' => &['\u{0634}', '\u{062D}', '\u{0645}'],
+        '\u{FD69}' => &['\u{0634}', '\u{062C}', '\u{064A}'],
+        '\u{FD6A}' => &['\u{0634}', '\u{0645}', '\u{062E}'],
+        '\u{FD6B}' => &['\u{0634}', '\u{0645}', '\u{062E}'],
+        '\u{FD6C}' => &['\u{0634}', '\u{0645}', '\u{0645}'],
+        '\u{FD6D}' => &['\u{0634}', '\u{0645}', '\u{0645}'],
+        '\u{FD6E}' => &['\u{0636}', '\u{062D}', '\u{0649}'],
+        '\u{FD6F}' => &['\u{0636}', '\u{062E}', '\u{0645}'],
+        '\u{FD70}' => &['\u{0636}', '\u{062E}', '\u{0645}'],
+        '\u{FD71}' => &['\u{0637}', '\u{0645}', '\u{062D}'],
+        '\u{FD72}' => &['\u{0637}', '\u{0645}', '\u{062D}'],
+        '\u{FD73}' => &['\u{0637}', '\u{0645}', '\u{0645}'],
+        '\u{FD74}' => &['\u{0637}', '\u{0645}', '\u{064A}'],
+        '\u{FD75}' => &['\u{0639}', '\u{062C}', '\u{0645}'],
+        '\u{FD76}' => &['\u{0639}', '\u{0645}', '\u{0645}'],
+        '\u{FD77}' => &['\u{0639}', '\u{0645}', '\u{0645}'],
+        '\u{FD78}' => &['\u{0639}', '\u{0645}', '\u{0649}'],
+        '\u{FD79}' => &['\u{063A}', '\u{0645}', '\u{0645}'],
+        '\u{FD7A}' => &['\u{063A}', '\u{0645}', '\u{064A}'],
+        '\u{FD7B}' => &['\u{063A}', '\u{0645}', '\u{0649}'],
+        '\u{FD7C}' => &['\u{0641}', '\u{062E}', '\u{0645}'],
+        '\u{FD7D}' => &['\u{0641}', '\u{062E}', '\u{0645}'],
+        '\u{FD7E}' => &['\u{0642}', '\u{0645}', '\u{062D}'],
+        '\u{FD7F}' => &['\u{0642}', '\u{0645}', '\u{0645}'],
+        '\u{FD80}' => &['\u{0644}', '\u{062D}', '\u{0645}'],
+        '\u{FD81}' => &['\u{0644}', '\u{062D}', '\u{064A}'],
+        '\u{FD82}' => &['\u{0644}', '\u{062D}', '\u{0649}'],
+        '\u{FD83}' => &['\u{0644}', '\u{062C}', '\u{062C}'],
+        '\u{FD84}' => &['\u{0644}', '\u{062C}', '\u{062C}'],
+        '\u{FD85}' => &['\u{0644}', '\u{062E}', '\u{0645}'],
+        '\u{FD86}' => &['\u{0644}', '\u{062E}', '\u{0645}'],
+        '\u{FD87}' => &['\u{0644}', '\u{0645}', '\u{062D}'],
+        '\u{FD88}' => &['\u{0644}', '\u{0645}', '\u{062D}'],
+        '\u{FD89}' => &['\u{0645}', '\u{062D}', '\u{062C}'],
+        '\u{FD8A}' => &['\u{0645}', '\u{062D}', '\u{0645}'],
+        '\u{FD8B}' => &['\u{0645}', '\u{062D}', '\u{064A}'],
+        '\u{FD8C}' => &['\u{0645}', '\u{062C}', '\u{062D}'],
+        '\u{FD8D}' => &['\u{0645}', '\u{062C}', '\u{0645}'],
+        '\u{FD8E}' => &['\u{0645}', '\u{062E}', '\u{062C}'],
+        '\u{FD8F}' => &['\u{0645}', '\u{062E}', '\u{0645}'],
+        '\u{FD92}' => &['\u{0645}', '\u{062C}', '\u{062E}'],
+        '\u{FD93}' => &['\u{0647}', '\u{0645}', '\u{062C}'],
+        '\u{FD94}' => &['\u{0647}', '\u{0645}', '\u{0645}'],
+        '\u{FD95}' => &['\u{0646}', '\u{062D}', '\u{0645}'],
+        '\u{FD96}' => &['\u{0646}', '\u{062D}', '\u{0649}'],
+        '\u{FD97}' => &['\u{0646}', '\u{062C}', '\u{0645}'],
+        '\u{FD98}' => &['\u{0646}', '\u{062C}', '\u{0645}'],
+        '\u{FD99}' => &['\u{0646}', '\u{062C}', '\u{0649}'],
+        '\u{FD9A}' => &['\u{0646}', '\u{0645}', '\u{064A}'],
+        '\u{FD9B}' => &['\u{0646}', '\u{0645}', '\u{0649}'],
+        '\u{FD9C}' => &['\u{064A}', '\u{0645}', '\u{0645}'],
+        '\u{FD9D}' => &['\u{064A}', '\u{0645}', '\u{0645}'],
+        '\u{FD9E}' => &['\u{0628}', '\u{062E}', '\u{064A}'],
+        '\u{FD9F}' => &['\u{062A}', '\u{062C}', '\u{064A}'],
+        '\u{FDA0}' => &['\u{062A}', '\u{062C}', '\u{0649}'],
+        '\u{FDA1}' => &['\u{062A}', '\u{062E}', '\u{064A}'],
+        '\u{FDA2}' => &['\u{062A}', '\u{062E}', '\u{0649}'],
+        '\u{FDA3}' => &['\u{062A}', '\u{0645}', '\u{064A}'],
+        '\u{FDA4}' => &['\u{062A}', '\u{0645}', '\u{0649}'],
+        '\u{FDA5}' => &['\u{062C}', '\u{0645}', '\u{064A}'],
+        '\u{FDA6}' => &['\u{062C}', '\u{062D}', '\u{0649}'],
+        '\u{FDA7}' => &['\u{062C}', '\u{0645}', '\u{0649}'],
+        '\u{FDA8}' => &['\u{0633}', '\u{062E}', '\u{0649}'],
+        '\u{FDA9}' => &['\u{0635}', '\u{062D}', '\u{064A}'],
+        '\u{FDAA}' => &['\u{0634}', '\u{062D}', '\u{064A}'],
+        '\u{FDAB}' => &['\u{0636}', '\u{062D}', '\u{064A}'],
+        '\u{FDAC}' => &['\u{0644}', '\u{062C}', '\u{064A}'],
+        '\u{FDAD}' => &['\u{0644}', '\u{0645}', '\u{064A}'],
+        '\u{FDAE}' => &['\u{064A}', '\u{062D}', '\u{064A}'],
+        '\u{FDAF}' => &['\u{064A}', '\u{062C}', '\u{064A}'],
+        '\u{FDB0}' => &['\u{064A}', '\u{0645}', '\u{064A}'],
+        '\u{FDB1}' => &['\u{0645}', '\u{0645}', '\u{064A}'],
+        '\u{FDB2}' => &['\u{0642}', '\u{0645}', '\u{064A}'],
+        '\u{FDB3}' => &['\u{0646}', '\u{062D}', '\u{064A}'],
+        '\u{FDB4}' => &['\u{0642}', '\u{0645}', '\u{062D}'],
+        '\u{FDB5}' => &['\u{0644}', '\u{062D}', '\u{0645}'],
+        '\u{FDB6}' => &['\u{0639}', '\u{0645}', '\u{064A}'],
+        '\u{FDB7}' => &['\u{0643}', '\u{0645}', '\u{064A}'],
+        '\u{FDB8}' => &['\u{0646}', '\u{062C}', '\u{062D}'],
+        '\u{FDB9}' => &['\u{0645}', '\u{062E}', '\u{064A}'],
+        '\u{FDBA}' => &['\u{0644}', '\u{062C}', '\u{0645}'],
+        '\u{FDBB}' => &['\u{0643}', '\u{0645}', '\u{0645}'],
+        '\u{FDBC}' => &['\u{0644}', '\u{062C}', '\u{0645}'],
+        '\u{FDBD}' => &['\u{0646}', '\u{062C}', '\u{062D}'],
+        '\u{FDBE}' => &['\u{062C}', '\u{062D}', '\u{064A}'],
+        '\u{FDBF}' => &['\u{062D}', '\u{062C}', '\u{064A}'],
+        '\u{FDC0}' => &['\u{0645}', '\u{062C}', '\u{064A}'],
+        '\u{FDC1}' => &['\u{0641}', '\u{0645}', '\u{064A}'],
+        '\u{FDC2}' => &['\u{0628}', '\u{062D}', '\u{064A}'],
+        '\u{FDC3}' => &['\u{0643}', '\u{0645}', '\u{0645}'],
+        '\u{FDC4}' => &['\u{0639}', '\u{062C}', '\u{0645}'],
+        '\u{FDC5}' => &['\u{0635}', '\u{0645}', '\u{0645}'],
+        '\u{FDC6}' => &['\u{0633}', '\u{062E}', '\u{064A}'],
+        '\u{FDC7}' => &['\u{0646}', '\u{062C}', '\u{064A}'],
+        '\u{FDF0}' => &['\u{0635}', '\u{0644}', '\u{06D2}'],
+        '\u{FDF1}' => &['\u{0642}', '\u{0644}', '\u{06D2}'],
+        '\u{FDF2}' => &['\u{0627}', '\u{0644}', '\u{0644}', '\u{0647}'],
+        '\u{FDF3}' => &['\u{0627}', '\u{0643}', '\u{0628}', '\u{0631}'],
+        '\u{FDF4}' => &['\u{0645}', '\u{062D}', '\u{0645}', '\u{062F}'],
+        '\u{FDF5}' => &['\u{0635}', '\u{0644}', '\u{0639}', '\u{0645}'],
+        '\u{FDF6}' => &['\u{0631}', '\u{0633}', '\u{0648}', '\u{0644}'],
+        '\u{FDF7}' => &['\u{0639}', '\u{0644}', '\u{064A}', '\u{0647}'],
+        '\u{FDF8}' => &['\u{0648}', '\u{0633}', '\u{0644}', '\u{0645}'],
+        '\u{FDF9}' => &['\u{0635}', '\u{0644}', '\u{0649}'],
+        '\u{FDFA}' => &['\u{0635}', '\u{0644}', '\u{0649}', '\u{0020}', '\u{0627}', '\u{0644}', '\u{0644}', '\u{0647}', '\u{0020}', '\u{0639}', '\u{0644}', '\u{064A}', '\u{0647}', '\u{0020}', '\u{0648}', '\u{0633}', '\u{0644}', '\u{0645}'],
+        '\u{FDFB}' => &['\u{062C}', '\u{0644}', '\u{0020}', '\u{062C}', '\u{0644}', '\u{0627}', '\u{0644}', '\u{0647}'],
+        '\u{FDFC}' => &['\u{0631}', '\u{06CC}', '\u{0627}', '\u{0644}'],
+        '\u{FE10}' => &['\u{002C}'],
+        '\u{FE11}' => &['\u{3001}'],
+        '\u{FE12}' => &['\u{3002}'],
+        '\u{FE13}' => &['\u{003A}'],
+        '\u{FE14}' => &['\u{003B}'],
+        '\u{FE15}' => &['\u{0021}'],
+        '\u{FE16}' => &['\u{003F}'],
+        '\u{FE17}' => &['\u{3016}'],
+        '\u{FE18}' => &['\u{3017}'],
+        '\u{FE19}' => &['\u{002E}', '\u{002E}', '\u{002E}'],
+        '\u{FE30}' => &['\u{002E}', '\u{002E}'],
+        '\u{FE31}' => &['\u{2014}'],
+        '\u{FE32}' => &['\u{2013}'],
+        '\u{FE33}' => &['\u{005F}'],
+        '\u{FE34}' => &['\u{005F}'],
+        '\u{FE35}' => &['\u{0028}'],
+        '\u{FE36}' => &['\u{0029}'],
+        '\u{FE37}' => &['\u{007B}'],
+        '\u{FE38}' => &['\u{007D}'],
+        '\u{FE39}' => &['\u{3014}'],
+        '\u{FE3A}' => &['\u{3015}'],
+        '\u{FE3B}' => &['\u{3010}'],
+        '\u{FE3C}' => &['\u{3011}'],
+        '\u{FE3D}' => &['\u{300A}'],
+        '\u{FE3E}' => &['\u{300B}'],
+        '\u{FE3F}' => &['\u{3008}'],
+        '\u{FE40}' => &['\u{3009}'],
+        '\u{FE41}' => &['\u{300C}'],
+        '\u{FE42}' => &['\u{300D}'],
+        '\u{FE43}' => &['\u{300E}'],
+        '\u{FE44}' => &['\u{300F}'],
+        '\u{FE47}' => &['\u{005B}'],
+        '\u{FE48}' => &['\u{005D}'],
+        '\u{FE49}' => &['\u{0020}', '\u{0305}'],
+        '\u{FE4A}' => &['\u{0020}', '\u{0305}'],
+        '\u{FE4B}' => &['\u{0020}', '\u{0305}'],
+        '\u{FE4C}' => &['\u{0020}', '\u{0305}'],
+        '\u{FE4D}' => &['\u{005F}'],
+        '\u{FE4E}' => &['\u{005F}'],
+        '\u{FE4F}' => &['\u{005F}'],
+        '\u{FE50}' => &['\u{002C}'],
+        '\u{FE51}' => &['\u{3001}'],
+        '\u{FE52}' => &['\u{002E}'],
+        '\u{FE54}' => &['\u{003B}'],
+        '\u{FE55}' => &['\u{003A}'],
+        '\u{FE56}' => &['\u{003F}'],
+        '\u{FE57}' => &['\u{0021}'],
+        '\u{FE58}' => &['\u{2014}'],
+        '\u{FE59}' => &['\u{0028}'],
+        '\u{FE5A}' => &['\u{0029}'],
+        '\u{FE5B}' => &['\u{007B}'],
+        '\u{FE5C}' => &['\u{007D}'],
+        '\u{FE5D}' => &['\u{3014}'],
+        '\u{FE5E}' => &['\u{3015}'],
+        '\u{FE5F}' => &['\u{0023}'],
+        '\u{FE60}' => &['\u{0026}'],
+        '\u{FE61}' => &['\u{002A}'],
+        '\u{FE62}' => &['\u{002B}'],
+        '\u{FE63}' => &['\u{002D}'],
+        '\u{FE64}' => &['\u{003C}'],
+        '\u{FE65}' => &['\u{003E}'],
+        '\u{FE66}' => &['\u{003D}'],
+        '\u{FE68}' => &['\u{005C}'],
+        '\u{FE69}' => &['\u{0024}'],
+        '\u{FE6A}' => &['\u{0025}'],
+        '\u{FE6B}' => &['\u{0040}'],
+        '\u{FE70}' => &['\u{0020}', '\u{064B}'],
+        '\u{FE71}' => &['\u{0640}', '\u{064B}'],
+        '\u{FE72}' => &['\u{0020}', '\u{064C}'],
+        '\u{FE74}' => &['\u{0020}', '\u{064D}'],
+        '\u{FE76}' => &['\u{0020}', '\u{064E}'],
+        '\u{FE77}' => &['\u{0640}', '\u{064E}'],
+        '\u{FE78}' => &['\u{0020}', '\u{064F}'],
+        '\u{FE79}' => &['\u{0640}', '\u{064F}'],
+        '\u{FE7A}' => &['\u{0020}', '\u{0650}'],
+        '\u{FE7B}' => &['\u{0640}', '\u{0650}'],
+        '\u{FE7C}' => &['\u{0020}', '\u{0651}'],
+        '\u{FE7D}' => &['\u{0640}', '\u{0651}'],
+        '\u{FE7E}' => &['\u{0020}', '\u{0652}'],
+        '\u{FE7F}' => &['\u{0640}', '\u{0652}'],
+        '\u{FE80}' => &['\u{0621}'],
+        '\u{FE81}' => &['\u{0627}', '\u{0653}'],
+        '\u{FE82}' => &['\u{0627}', '\u{0653}'],
+        '\u{FE83}' => &['\u{0627}', '\u{0654}'],
+        '\u{FE84}' => &['\u{0627}', '\u{0654}'],
+        '\u{FE85}' => &['\u{0648}', '\u{0654}'],
+        '\u{FE86}' => &['\u{0648}', '\u{0654}'],
+        '\u{FE87}' => &['\u{0627}', '\u{0655}'],
+        '\u{FE88}' => &['\u{0627}', '\u{0655}'],
+        '\u{FE89}' => &['\u{064A}', '\u{0654}'],
+        '\u{FE8A}' => &['\u{064A}', '\u{0654}'],
+        '\u{FE8B}' => &['\u{064A}', '\u{0654}'],
+        '\u{FE8C}' => &['\u{064A}', '\u{0654}'],
+        '\u{FE8D}' => &['\u{0627}'],
+        '\u{FE8E}' => &['\u{0627}'],
+        '\u{FE8F}' => &['\u{0628}'],
+        '\u{FE90}' => &['\u{0628}'],
+        '\u{FE91}' => &['\u{0628}'],
+        '\u{FE92}' => &['\u{0628}'],
+        '\u{FE93}' => &['\u{0629}'],
+        '\u{FE94}' => &['\u{0629}'],
+        '\u{FE95}' => &['\u{062A}'],
+        '\u{FE96}' => &['\u{062A}'],
+        '\u{FE97}' => &['\u{062A}'],
+        '\u{FE98}' => &['\u{062A}'],
+        '\u{FE99}' => &['\u{062B}'],
+        '\u{FE9A}' => &['\u{062B}'],
+        '\u{FE9B}' => &['\u{062B}'],
+        '\u{FE9C}' => &['\u{062B}'],
+        '\u{FE9D}' => &['\u{062C}'],
+        '\u{FE9E}' => &['\u{062C}'],
+        '\u{FE9F}' => &['\u{062C}'],
+        '\u{FEA0}' => &['\u{062C}'],
+        '\u{FEA1}' => &['\u{062D}'],
+        '\u{FEA2}' => &['\u{062D}'],
+        '\u{FEA3}' => &['\u{062D}'],
+        '\u{FEA4}' => &['\u{062D}'],
+        '\u{FEA5}' => &['\u{062E}'],
+        '\u{FEA6}' => &['\u{062E}'],
+        '\u{FEA7}' => &['\u{062E}'],
+        '\u{FEA8}' => &['\u{062E}'],
+        '\u{FEA9}' => &['\u{062F}'],
+        '\u{FEAA}' => &['\u{062F}'],
+        '\u{FEAB}' => &['\u{0630}'],
+        '\u{FEAC}' => &['\u{0630}'],
+        '\u{FEAD}' => &['\u{0631}'],
+        '\u{FEAE}' => &['\u{0631}'],
+        '\u{FEAF}' => &['\u{0632}'],
+        '\u{FEB0}' => &['\u{0632}'],
+        '\u{FEB1}' => &['\u{0633}'],
+        '\u{FEB2}' => &['\u{0633}'],
+        '\u{FEB3}' => &['\u{0633}'],
+        '\u{FEB4}' => &['\u{0633}'],
+        '\u{FEB5}' => &['\u{0634}'],
+        '\u{FEB6}' => &['\u{0634}'],
+        '\u{FEB7}' => &['\u{0634}'],
+        '\u{FEB8}' => &['\u{0634}'],
+        '\u{FEB9}' => &['\u{0635}'],
+        '\u{FEBA}' => &['\u{0635}'],
+        '\u{FEBB}' => &['\u{0635}'],
+        '\u{FEBC}' => &['\u{0635}'],
+        '\u{FEBD}' => &['\u{0636}'],
+        '\u{FEBE}' => &['\u{0636}'],
+        '\u{FEBF}' => &['\u{0636}'],
+        '\u{FEC0}' => &['\u{0636}'],
+        '\u{FEC1}' => &['\u{0637}'],
+        '\u{FEC2}' => &['\u{0637}'],
+        '\u{FEC3}' => &['\u{0637}'],
+        '\u{FEC4}' => &['\u{0637}'],
+        '\u{FEC5}' => &['\u{0638}'],
+        '\u{FEC6}' => &['\u{0638}'],
+        '\u{FEC7}' => &['\u{0638}'],
+        '\u{FEC8}' => &['\u{0638}'],
+        '\u{FEC9}' => &['\u{0639}'],
+        '\u{FECA}' => &['\u{0639}'],
+        '\u{FECB}' => &['\u{0639}'],
+        '\u{FECC}' => &['\u{0639}'],
+        '\u{FECD}' => &['\u{063A}'],
+        '\u{FECE}' => &['\u{063A}'],
+        '\u{FECF}' => &['\u{063A}'],
+        '\u{FED0}' => &['\u{063A}'],
+        '\u{FED1}' => &['\u{0641}'],
+        '\u{FED2}' => &['\u{0641}'],
+        '\u{FED3}' => &['\u{0641}'],
+        '\u{FED4}' => &['\u{0641}'],
+        '\u{FED5}' => &['\u{0642}'],
+        '\u{FED6}' => &['\u{0642}'],
+        '\u{FED7}' => &['\u{0642}'],
+        '\u{FED8}' => &['\u{0642}'],
+        '\u{FED9}' => &['\u{0643}'],
+        '\u{FEDA}' => &['\u{0643}'],
+        '\u{FEDB}' => &['\u{0643}'],
+        '\u{FEDC}' => &['\u{0643}'],
+        '\u{FEDD}' => &['\u{0644}'],
+        '\u{FEDE}' => &['\u{0644}'],
+        '\u{FEDF}' => &['\u{0644}'],
+        '\u{FEE0}' => &['\u{0644}'],
+        '\u{FEE1}' => &['\u{0645}'],
+        '\u{FEE2}' => &['\u{0645}'],
+        '\u{FEE3}' => &['\u{0645}'],
+        '\u{FEE4}' => &['\u{0645}'],
+        '\u{FEE5}' => &['\u{0646}'],
+        '\u{FEE6}' => &['\u{0646}'],
+        '\u{FEE7}' => &['\u{0646}'],
+        '\u{FEE8}' => &['\u{0646}'],
+        '\u{FEE9}' => &['\u{0647}'],
+        '\u{FEEA}' => &['\u{0647}'],
+        '\u{FEEB}' => &['\u{0647}'],
+        '\u{FEEC}' => &['\u{0647}'],
+        '\u{FEED}' => &['\u{0648}'],
+        '\u{FEEE}' => &['\u{0648}'],
+        '\u{FEEF}' => &['\u{0649}'],
+        '\u{FEF0}' => &['\u{0649}'],
+        '\u{FEF1}' => &['\u{064A}'],
+        '\u{FEF2}' => &['\u{064A}'],
+        '\u{FEF3}' => &['\u{064A}'],
+        '\u{FEF4}' => &['\u{064A}'],
+        '\u{FEF5}' => &['\u{0644}', '\u{0627}', '\u{0653}'],
+        '\u{FEF6}' => &['\u{0644}', '\u{0627}', '\u{0653}'],
+        '\u{FEF7}' => &['\u{0644}', '\u{0627}', '\u{0654}'],
+        '\u{FEF8}' => &['\u{0644}', '\u{0627}', '\u{0654}'],
+        '\u{FEF9}' => &['\u{0644}', '\u{0627}', '\u{0655}'],
+        '\u{FEFA}' => &['\u{0644}', '\u{0627}', '\u{0655}'],
+        '\u{FEFB}' => &['\u{0644}', '\u{0627}'],
+        '\u{FEFC}' => &['\u{0644}', '\u{0627}'],
+        '\u{FF01}' => &['\u{0021}'],
+        '\u{FF02}' => &['\u{0022}'],
+        '\u{FF03}' => &['\u{0023}'],
+        '\u{FF04}' => &['\u{0024}'],
+        '\u{FF05}' => &['\u{0025}'],
+        '\u{FF06}' => &['\u{0026}'],
+        '\u{FF07}' => &['\u{0027}'],
+        '\u{FF08}' => &['\u{0028}'],
+        '\u{FF09}' => &['\u{0029}'],
+        '\u{FF0A}' => &['\u{002A}'],
+        '\u{FF0B}' => &['\u{002B}'],
+        '\u{FF0C}' => &['\u{002C}'],
+        '\u{FF0D}' => &['\u{002D}'],
+        '\u{FF0E}' => &['\u{002E}'],
+        '\u{FF0F}' => &['\u{002F}'],
+        '\u{FF10}' => &['\u{0030}'],
+        '\u{FF11}' => &['\u{0031}'],
+        '\u{FF12}' => &['\u{0032}'],
+        '\u{FF13}' => &['\u{0033}'],
+        '\u{FF14}' => &['\u{0034}'],
+        '\u{FF15}' => &['\u{0035}'],
+        '\u{FF16}' => &['\u{0036}'],
+        '\u{FF17}' => &['\u{0037}'],
+        '\u{FF18}' => &['\u{0038}'],
+        '\u{FF19}' => &['\u{0039}'],
+        '\u{FF1A}' => &['\u{003A}'],
+        '\u{FF1B}' => &['\u{003B}'],
+        '\u{FF1C}' => &['\u{003C}'],
+        '\u{FF1D}' => &['\u{003D}'],
+        '\u{FF1E}' => &['\u{003E}'],
+        '\u{FF1F}' => &['\u{003F}'],
+        '\u{FF20}' => &['\u{0040}'],
+        '\u{FF21}' => &['\u{0041}'],
+        '\u{FF22}' => &['\u{0042}'],
+        '\u{FF23}' => &['\u{0043}'],
+        '\u{FF24}' => &['\u{0044}'],
+        '\u{FF25}' => &['\u{0045}'],
+        '\u{FF26}' => &['\u{0046}'],
+        '\u{FF27}' => &['\u{0047}'],
+        '\u{FF28}' => &['\u{0048}'],
+        '\u{FF29}' => &['\u{0049}'],
+        '\u{FF2A}' => &['\u{004A}'],
+        '\u{FF2B}' => &['\u{004B}'],
+        '\u{FF2C}' => &['\u{004C}'],
+        '\u{FF2D}' => &['\u{004D}'],
+        '\u{FF2E}' => &['\u{004E}'],
+        '\u{FF2F}' => &['\u{004F}'],
+        '\u{FF30}' => &['\u{0050}'],
+        '\u{FF31}' => &['\u{0051}'],
+        '\u{FF32}' => &['\u{0052}'],
+        '\u{FF33}' => &['\u{0053}'],
+        '\u{FF34}' => &['\u{0054}'],
+        '\u{FF35}' => &['\u{0055}'],
+        '\u{FF36}' => &['\u{0056}'],
+        '\u{FF37}' => &['\u{0057}'],
+        '\u{FF38}' => &['\u{0058}'],
+        '\u{FF39}' => &['\u{0059}'],
+        '\u{FF3A}' => &['\u{005A}'],
+        '\u{FF3B}' => &['\u{005B}'],
+        '\u{FF3C}' => &['\u{005C}'],
+        '\u{FF3D}' => &['\u{005D}'],
+        '\u{FF3E}' => &['\u{005E}'],
+        '\u{FF3F}' => &['\u{005F}'],
+        '\u{FF40}' => &['\u{0060}'],
+        '\u{FF41}' => &['\u{0061}'],
+        '\u{FF42}' => &['\u{0062}'],
+        '\u{FF43}' => &['\u{0063}'],
+        '\u{FF44}' => &['\u{0064}'],
+        '\u{FF45}' => &['\u{0065}'],
+        '\u{FF46}' => &['\u{0066}'],
+        '\u{FF47}' => &['\u{0067}'],
+        '\u{FF48}' => &['\u{0068}'],
+        '\u{FF49}' => &['\u{0069}'],
+        '\u{FF4A}' => &['\u{006A}'],
+        '\u{FF4B}' => &['\u{006B}'],
+        '\u{FF4C}' => &['\u{006C}'],
+        '\u{FF4D}' => &['\u{006D}'],
+        '\u{FF4E}' => &['\u{006E}'],
+        '\u{FF4F}' => &['\u{006F}'],
+        '\u{FF50}' => &['\u{0070}'],
+        '\u{FF51}' => &['\u{0071}'],
+        '\u{FF52}' => &['\u{0072}'],
+        '\u{FF53}' => &['\u{0073}'],
+        '\u{FF54}' => &['\u{0074}'],
+        '\u{FF55}' => &['\u{0075}'],
+        '\u{FF56}' => &['\u{0076}'],
+        '\u{FF57}' => &['\u{0077}'],
+        '\u{FF58}' => &['\u{0078}'],
+        '\u{FF59}' => &['\u{0079}'],
+        '\u{FF5A}' => &['\u{007A}'],
+        '\u{FF5B}' => &['\u{007B}'],
+        '\u{FF5C}' => &['\u{007C}'],
+        '\u{FF5D}' => &['\u{007D}'],
+        '\u{FF5E}' => &['\u{007E}'],
+        '\u{FF5F}' => &['\u{2985}'],
+        '\u{FF60}' => &['\u{2986}'],
+        '\u{FF61}' => &['\u{3002}'],
+        '\u{FF62}' => &['\u{300C}'],
+        '\u{FF63}' => &['\u{300D}'],
+        '\u{FF64}' => &['\u{3001}'],
+        '\u{FF65}' => &['\u{30FB}'],
+        '\u{FF66}' => &['\u{30F2}'],
+        '\u{FF67}' => &['\u{30A1}'],
+        '\u{FF68}' => &['\u{30A3}'],
+        '\u{FF69}' => &['\u{30A5}'],
+        '\u{FF6A}' => &['\u{30A7}'],
+        '\u{FF6B}' => &['\u{30A9}'],
+        '\u{FF6C}' => &['\u{30E3}'],
+        '\u{FF6D}' => &['\u{30E5}'],
+        '\u{FF6E}' => &['\u{30E7}'],
+        '\u{FF6F}' => &['\u{30C3}'],
+        '\u{FF70}' => &['\u{30FC}'],
+        '\u{FF71}' => &['\u{30A2}'],
+        '\u{FF72}' => &['\u{30A4}'],
+        '\u{FF73}' => &['\u{30A6}'],
+        '\u{FF74}' => &['\u{30A8}'],
+        '\u{FF75}' => &['\u{30AA}'],
+        '\u{FF76}' => &['\u{30AB}'],
+        '\u{FF77}' => &['\u{30AD}'],
+        '\u{FF78}' => &['\u{30AF}'],
+        '\u{FF79}' => &['\u{30B1}'],
+        '\u{FF7A}' => &['\u{30B3}'],
+        '\u{FF7B}' => &['\u{30B5}'],
+        '\u{FF7C}' => &['\u{30B7}'],
+        '\u{FF7D}' => &['\u{30B9}'],
+        '\u{FF7E}' => &['\u{30BB}'],
+        '\u{FF7F}' => &['\u{30BD}'],
+        '\u{FF80}' => &['\u{30BF}'],
+        '\u{FF81}' => &['\u{30C1}'],
+        '\u{FF82}' => &['\u{30C4}'],
+        '\u{FF83}' => &['\u{30C6}'],
+        '\u{FF84}' => &['\u{30C8}'],
+        '\u{FF85}' => &['\u{30CA}'],
+        '\u{FF86}' => &['\u{30CB}'],
+        '\u{FF87}' => &['\u{30CC}'],
+        '\u{FF88}' => &['\u{30CD}'],
+        '\u{FF89}' => &['\u{30CE}'],
+        '\u{FF8A}' => &['\u{30CF}'],
+        '\u{FF8B}' => &['\u{30D2}'],
+        '\u{FF8C}' => &['\u{30D5}'],
+        '\u{FF8D}' => &['\u{30D8}'],
+        '\u{FF8E}' => &['\u{30DB}'],
+        '\u{FF8F}' => &['\u{30DE}'],
+        '\u{FF90}' => &['\u{30DF}'],
+        '\u{FF91}' => &['\u{30E0}'],
+        '\u{FF92}' => &['\u{30E1}'],
+        '\u{FF93}' => &['\u{30E2}'],
+        '\u{FF94}' => &['\u{30E4}'],
+        '\u{FF95}' => &['\u{30E6}'],
+        '\u{FF96}' => &['\u{30E8}'],
+        '\u{FF97}' => &['\u{30E9}'],
+        '\u{FF98}' => &['\u{30EA}'],
+        '\u{FF99}' => &['\u{30EB}'],
+        '\u{FF9A}' => &['\u{30EC}'],
+        '\u{FF9B}' => &['\u{30ED}'],
+        '\u{FF9C}' => &['\u{30EF}'],
+        '\u{FF9D}' => &['\u{30F3}'],
+        '\u{FF9E}' => &['\u{3099}'],
+        '\u{FF9F}' => &['\u{309A}'],
+        '\u{FFA0}' => &['\u{1160}'],
+        '\u{FFA1}' => &['\u{1100}'],
+        '\u{FFA2}' => &['\u{1101}'],
+        '\u{FFA3}' => &['\u{11AA}'],
+        '\u{FFA4}' => &['\u{1102}'],
+        '\u{FFA5}' => &['\u{11AC}'],
+        '\u{FFA6}' => &['\u{11AD}'],
+        '\u{FFA7}' => &['\u{1103}'],
+        '\u{FFA8}' => &['\u{1104}'],
+        '\u{FFA9}' => &['\u{1105}'],
+        '\u{FFAA}' => &['\u{11B0}'],
+        '\u{FFAB}' => &['\u{11B1}'],
+        '\u{FFAC}' => &['\u{11B2}'],
+        '\u{FFAD}' => &['\u{11B3}'],
+        '\u{FFAE}' => &['\u{11B4}'],
+        '\u{FFAF}' => &['\u{11B5}'],
+        '\u{FFB0}' => &['\u{111A}'],
+        '\u{FFB1}' => &['\u{1106}'],
+        '\u{FFB2}' => &['\u{1107}'],
+        '\u{FFB3}' => &['\u{1108}'],
+        '\u{FFB4}' => &['\u{1121}'],
+        '\u{FFB5}' => &['\u{1109}'],
+        '\u{FFB6}' => &['\u{110A}'],
+        '\u{FFB7}' => &['\u{110B}'],
+        '\u{FFB8}' => &['\u{110C}'],
+        '\u{FFB9}' => &['\u{110D}'],
+        '\u{FFBA}' => &['\u{110E}'],
+        '\u{FFBB}' => &['\u{110F}'],
+        '\u{FFBC}' => &['\u{1110}'],
+        '\u{FFBD}' => &['\u{1111}'],
+        '\u{FFBE}' => &['\u{1112}'],
+        '\u{FFC2}' => &['\u{1161}'],
+        '\u{FFC3}' => &['\u{1162}'],
+        '\u{FFC4}' => &['\u{1163}'],
+        '\u{FFC5}' => &['\u{1164}'],
+        '\u{FFC6}' => &['\u{1165}'],
+        '\u{FFC7}' => &['\u{1166}'],
+        '\u{FFCA}' => &['\u{1167}'],
+        '\u{FFCB}' => &['\u{1168}'],
+        '\u{FFCC}' => &['\u{1169}'],
+        '\u{FFCD}' => &['\u{116A}'],
+        '\u{FFCE}' => &['\u{116B}'],
+        '\u{FFCF}' => &['\u{116C}'],
+        '\u{FFD2}' => &['\u{116D}'],
+        '\u{FFD3}' => &['\u{116E}'],
+        '\u{FFD4}' => &['\u{116F}'],
+        '\u{FFD5}' => &['\u{1170}'],
+        '\u{FFD6}' => &['\u{1171}'],
+        '\u{FFD7}' => &['\u{1172}'],
+        '\u{FFDA}' => &['\u{1173}'],
+        '\u{FFDB}' => &['\u{1174}'],
+        '\u{FFDC}' => &['\u{1175}'],
+        '\u{FFE0}' => &['\u{00A2}'],
+        '\u{FFE1}' => &['\u{00A3}'],
+        '\u{FFE2}' => &['\u{00AC}'],
+        '\u{FFE3}' => &['\u{0020}', '\u{0304}'],
+        '\u{FFE4}' => &['\u{00A6}'],
+        '\u{FFE5}' => &['\u{00A5}'],
+        '\u{FFE6}' => &['\u{20A9}'],
+        '\u{FFE8}' => &['\u{2502}'],
+        '\u{FFE9}' => &['\u{2190}'],
+        '\u{FFEA}' => &['\u{2191}'],
+        '\u{FFEB}' => &['\u{2192}'],
+        '\u{FFEC}' => &['\u{2193}'],
+        '\u{FFED}' => &['\u{25A0}'],
+        '\u{FFEE}' => &['\u{25CB}'],
+        '\u{1D400}' => &['\u{0041}'],
+        '\u{1D401}' => &['\u{0042}'],
+        '\u{1D402}' => &['\u{0043}'],
+        '\u{1D403}' => &['\u{0044}'],
+        '\u{1D404}' => &['\u{0045}'],
+        '\u{1D405}' => &['\u{0046}'],
+        '\u{1D406}' => &['\u{0047}'],
+        '\u{1D407}' => &['\u{0048}'],
+        '\u{1D408}' => &['\u{0049}'],
+        '\u{1D409}' => &['\u{004A}'],
+        '\u{1D40A}' => &['\u{004B}'],
+        '\u{1D40B}' => &['\u{004C}'],
+        '\u{1D40C}' => &['\u{004D}'],
+        '\u{1D40D}' => &['\u{004E}'],
+        '\u{1D40E}' => &['\u{004F}'],
+        '\u{1D40F}' => &['\u{0050}'],
+        '\u{1D410}' => &['\u{0051}'],
+        '\u{1D411}' => &['\u{0052}'],
+        '\u{1D412}' => &['\u{0053}'],
+        '\u{1D413}' => &['\u{0054}'],
+        '\u{1D414}' => &['\u{0055}'],
+        '\u{1D415}' => &['\u{0056}'],
+        '\u{1D416}' => &['\u{0057}'],
+        '\u{1D417}' => &['\u{0058}'],
+        '\u{1D418}' => &['\u{0059}'],
+        '\u{1D419}' => &['\u{005A}'],
+        '\u{1D41A}' => &['\u{0061}'],
+        '\u{1D41B}' => &['\u{0062}'],
+        '\u{1D41C}' => &['\u{0063}'],
+        '\u{1D41D}' => &['\u{0064}'],
+        '\u{1D41E}' => &['\u{0065}'],
+        '\u{1D41F}' => &['\u{0066}'],
+        '\u{1D420}' => &['\u{0067}'],
+        '\u{1D421}' => &['\u{0068}'],
+        '\u{1D422}' => &['\u{0069}'],
+        '\u{1D423}' => &['\u{006A}'],
+        '\u{1D424}' => &['\u{006B}'],
+        '\u{1D425}' => &['\u{006C}'],
+        '\u{1D426}' => &['\u{006D}'],
+        '\u{1D427}' => &['\u{006E}'],
+        '\u{1D428}' => &['\u{006F}'],
+        '\u{1D429}' => &['\u{0070}'],
+        '\u{1D42A}' => &['\u{0071}'],
+        '\u{1D42B}' => &['\u{0072}'],
+        '\u{1D42C}' => &['\u{0073}'],
+        '\u{1D42D}' => &['\u{0074}'],
+        '\u{1D42E}' => &['\u{0075}'],
+        '\u{1D42F}' => &['\u{0076}'],
+        '\u{1D430}' => &['\u{0077}'],
+        '\u{1D431}' => &['\u{0078}'],
+        '\u{1D432}' => &['\u{0079}'],
+        '\u{1D433}' => &['\u{007A}'],
+        '\u{1D434}' => &['\u{0041}'],
+        '\u{1D435}' => &['\u{0042}'],
+        '\u{1D436}' => &['\u{0043}'],
+        '\u{1D437}' => &['\u{0044}'],
+        '\u{1D438}' => &['\u{0045}'],
+        '\u{1D439}' => &['\u{0046}'],
+        '\u{1D43A}' => &['\u{0047}'],
+        '\u{1D43B}' => &['\u{0048}'],
+        '\u{1D43C}' => &['\u{0049}'],
+        '\u{1D43D}' => &['\u{004A}'],
+        '\u{1D43E}' => &['\u{004B}'],
+        '\u{1D43F}' => &['\u{004C}'],
+        '\u{1D440}' => &['\u{004D}'],
+        '\u{1D441}' => &['\u{004E}'],
+        '\u{1D442}' => &['\u{004F}'],
+        '\u{1D443}' => &['\u{0050}'],
+        '\u{1D444}' => &['\u{0051}'],
+        '\u{1D445}' => &['\u{0052}'],
+        '\u{1D446}' => &['\u{0053}'],
+        '\u{1D447}' => &['\u{0054}'],
+        '\u{1D448}' => &['\u{0055}'],
+        '\u{1D449}' => &['\u{0056}'],
+        '\u{1D44A}' => &['\u{0057}'],
+        '\u{1D44B}' => &['\u{0058}'],
+        '\u{1D44C}' => &['\u{0059}'],
+        '\u{1D44D}' => &['\u{005A}'],
+        '\u{1D44E}' => &['\u{0061}'],
+        '\u{1D44F}' => &['\u{0062}'],
+        '\u{1D450}' => &['\u{0063}'],
+        '\u{1D451}' => &['\u{0064}'],
+        '\u{1D452}' => &['\u{0065}'],
+        '\u{1D453}' => &['\u{0066}'],
+        '\u{1D454}' => &['\u{0067}'],
+        '\u{1D456}' => &['\u{0069}'],
+        '\u{1D457}' => &['\u{006A}'],
+        '\u{1D458}' => &['\u{006B}'],
+        '\u{1D459}' => &['\u{006C}'],
+        '\u{1D45A}' => &['\u{006D}'],
+        '\u{1D45B}' => &['\u{006E}'],
+        '\u{1D45C}' => &['\u{006F}'],
+        '\u{1D45D}' => &['\u{0070}'],
+        '\u{1D45E}' => &['\u{0071}'],
+        '\u{1D45F}' => &['\u{0072}'],
+        '\u{1D460}' => &['\u{0073}'],
+        '\u{1D461}' => &['\u{0074}'],
+        '\u{1D462}' => &['\u{0075}'],
+        '\u{1D463}' => &['\u{0076}'],
+        '\u{1D464}' => &['\u{0077}'],
+        '\u{1D465}' => &['\u{0078}'],
+        '\u{1D466}' => &['\u{0079}'],
+        '\u{1D467}' => &['\u{007A}'],
+        '\u{1D468}' => &['\u{0041}'],
+        '\u{1D469}' => &['\u{0042}'],
+        '\u{1D46A}' => &['\u{0043}'],
+        '\u{1D46B}' => &['\u{0044}'],
+        '\u{1D46C}' => &['\u{0045}'],
+        '\u{1D46D}' => &['\u{0046}'],
+        '\u{1D46E}' => &['\u{0047}'],
+        '\u{1D46F}' => &['\u{0048}'],
+        '\u{1D470}' => &['\u{0049}'],
+        '\u{1D471}' => &['\u{004A}'],
+        '\u{1D472}' => &['\u{004B}'],
+        '\u{1D473}' => &['\u{004C}'],
+        '\u{1D474}' => &['\u{004D}'],
+        '\u{1D475}' => &['\u{004E}'],
+        '\u{1D476}' => &['\u{004F}'],
+        '\u{1D477}' => &['\u{0050}'],
+        '\u{1D478}' => &['\u{0051}'],
+        '\u{1D479}' => &['\u{0052}'],
+        '\u{1D47A}' => &['\u{0053}'],
+        '\u{1D47B}' => &['\u{0054}'],
+        '\u{1D47C}' => &['\u{0055}'],
+        '\u{1D47D}' => &['\u{0056}'],
+        '\u{1D47E}' => &['\u{0057}'],
+        '\u{1D47F}' => &['\u{0058}'],
+        '\u{1D480}' => &['\u{0059}'],
+        '\u{1D481}' => &['\u{005A}'],
+        '\u{1D482}' => &['\u{0061}'],
+        '\u{1D483}' => &['\u{0062}'],
+        '\u{1D484}' => &['\u{0063}'],
+        '\u{1D485}' => &['\u{0064}'],
+        '\u{1D486}' => &['\u{0065}'],
+        '\u{1D487}' => &['\u{0066}'],
+        '\u{1D488}' => &['\u{0067}'],
+        '\u{1D489}' => &['\u{0068}'],
+        '\u{1D48A}' => &['\u{0069}'],
+        '\u{1D48B}' => &['\u{006A}'],
+        '\u{1D48C}' => &['\u{006B}'],
+        '\u{1D48D}' => &['\u{006C}'],
+        '\u{1D48E}' => &['\u{006D}'],
+        '\u{1D48F}' => &['\u{006E}'],
+        '\u{1D490}' => &['\u{006F}'],
+        '\u{1D491}' => &['\u{0070}'],
+        '\u{1D492}' => &['\u{0071}'],
+        '\u{1D493}' => &['\u{0072}'],
+        '\u{1D494}' => &['\u{0073}'],
+        '\u{1D495}' => &['\u{0074}'],
+        '\u{1D496}' => &['\u{0075}'],
+        '\u{1D497}' => &['\u{0076}'],
+        '\u{1D498}' => &['\u{0077}'],
+        '\u{1D499}' => &['\u{0078}'],
+        '\u{1D49A}' => &['\u{0079}'],
+        '\u{1D49B}' => &['\u{007A}'],
+        '\u{1D49C}' => &['\u{0041}'],
+        '\u{1D49E}' => &['\u{0043}'],
+        '\u{1D49F}' => &['\u{0044}'],
+        '\u{1D4A2}' => &['\u{0047}'],
+        '\u{1D4A5}' => &['\u{004A}'],
+        '\u{1D4A6}' => &['\u{004B}'],
+        '\u{1D4A9}' => &['\u{004E}'],
+        '\u{1D4AA}' => &['\u{004F}'],
+        '\u{1D4AB}' => &['\u{0050}'],
+        '\u{1D4AC}' => &['\u{0051}'],
+        '\u{1D4AE}' => &['\u{0053}'],
+        '\u{1D4AF}' => &['\u{0054}'],
+        '\u{1D4B0}' => &['\u{0055}'],
+        '\u{1D4B1}' => &['\u{0056}'],
+        '\u{1D4B2}' => &['\u{0057}'],
+        '\u{1D4B3}' => &['\u{0058}'],
+        '\u{1D4B4}' => &['\u{0059}'],
+        '\u{1D4B5}' => &['\u{005A}'],
+        '\u{1D4B6}' => &['\u{0061}'],
+        '\u{1D4B7}' => &['\u{0062}'],
+        '\u{1D4B8}' => &['\u{0063}'],
+        '\u{1D4B9}' => &['\u{0064}'],
+        '\u{1D4BB}' => &['\u{0066}'],
+        '\u{1D4BD}' => &['\u{0068}'],
+        '\u{1D4BE}' => &['\u{0069}'],
+        '\u{1D4BF}' => &['\u{006A}'],
+        '\u{1D4C0}' => &['\u{006B}'],
+        '\u{1D4C1}' => &['\u{006C}'],
+        '\u{1D4C2}' => &['\u{006D}'],
+        '\u{1D4C3}' => &['\u{006E}'],
+        '\u{1D4C5}' => &['\u{0070}'],
+        '\u{1D4C6}' => &['\u{0071}'],
+        '\u{1D4C7}' => &['\u{0072}'],
+        '\u{1D4C8}' => &['\u{0073}'],
+        '\u{1D4C9}' => &['\u{0074}'],
+        '\u{1D4CA}' => &['\u{0075}'],
+        '\u{1D4CB}' => &['\u{0076}'],
+        '\u{1D4CC}' => &['\u{0077}'],
+        '\u{1D4CD}' => &['\u{0078}'],
+        '\u{1D4CE}' => &['\u{0079}'],
+        '\u{1D4CF}' => &['\u{007A}'],
+        '\u{1D4D0}' => &['\u{0041}'],
+        '\u{1D4D1}' => &['\u{0042}'],
+        '\u{1D4D2}' => &['\u{0043}'],
+        '\u{1D4D3}' => &['\u{0044}'],
+        '\u{1D4D4}' => &['\u{0045}'],
+        '\u{1D4D5}' => &['\u{0046}'],
+        '\u{1D4D6}' => &['\u{0047}'],
+        '\u{1D4D7}' => &['\u{0048}'],
+        '\u{1D4D8}' => &['\u{0049}'],
+        '\u{1D4D9}' => &['\u{004A}'],
+        '\u{1D4DA}' => &['\u{004B}'],
+        '\u{1D4DB}' => &['\u{004C}'],
+        '\u{1D4DC}' => &['\u{004D}'],
+        '\u{1D4DD}' => &['\u{004E}'],
+        '\u{1D4DE}' => &['\u{004F}'],
+        '\u{1D4DF}' => &['\u{0050}'],
+        '\u{1D4E0}' => &['\u{0051}'],
+        '\u{1D4E1}' => &['\u{0052}'],
+        '\u{1D4E2}' => &['\u{0053}'],
+        '\u{1D4E3}' => &['\u{0054}'],
+        '\u{1D4E4}' => &['\u{0055}'],
+        '\u{1D4E5}' => &['\u{0056}'],
+        '\u{1D4E6}' => &['\u{0057}'],
+        '\u{1D4E7}' => &['\u{0058}'],
+        '\u{1D4E8}' => &['\u{0059}'],
+        '\u{1D4E9}' => &['\u{005A}'],
+        '\u{1D4EA}' => &['\u{0061}'],
+        '\u{1D4EB}' => &['\u{0062}'],
+        '\u{1D4EC}' => &['\u{0063}'],
+        '\u{1D4ED}' => &['\u{0064}'],
+        '\u{1D4EE}' => &['\u{0065}'],
+        '\u{1D4EF}' => &['\u{0066}'],
+        '\u{1D4F0}' => &['\u{0067}'],
+        '\u{1D4F1}' => &['\u{0068}'],
+        '\u{1D4F2}' => &['\u{0069}'],
+        '\u{1D4F3}' => &['\u{006A}'],
+        '\u{1D4F4}' => &['\u{006B}'],
+        '\u{1D4F5}' => &['\u{006C}'],
+        '\u{1D4F6}' => &['\u{006D}'],
+        '\u{1D4F7}' => &['\u{006E}'],
+        '\u{1D4F8}' => &['\u{006F}'],
+        '\u{1D4F9}' => &['\u{0070}'],
+        '\u{1D4FA}' => &['\u{0071}'],
+        '\u{1D4FB}' => &['\u{0072}'],
+        '\u{1D4FC}' => &['\u{0073}'],
+        '\u{1D4FD}' => &['\u{0074}'],
+        '\u{1D4FE}' => &['\u{0075}'],
+        '\u{1D4FF}' => &['\u{0076}'],
+        '\u{1D500}' => &['\u{0077}'],
+        '\u{1D501}' => &['\u{0078}'],
+        '\u{1D502}' => &['\u{0079}'],
+        '\u{1D503}' => &['\u{007A}'],
+        '\u{1D504}' => &['\u{0041}'],
+        '\u{1D505}' => &['\u{0042}'],
+        '\u{1D507}' => &['\u{0044}'],
+        '\u{1D508}' => &['\u{0045}'],
+        '\u{1D509}' => &['\u{0046}'],
+        '\u{1D50A}' => &['\u{0047}'],
+        '\u{1D50D}' => &['\u{004A}'],
+        '\u{1D50E}' => &['\u{004B}'],
+        '\u{1D50F}' => &['\u{004C}'],
+        '\u{1D510}' => &['\u{004D}'],
+        '\u{1D511}' => &['\u{004E}'],
+        '\u{1D512}' => &['\u{004F}'],
+        '\u{1D513}' => &['\u{0050}'],
+        '\u{1D514}' => &['\u{0051}'],
+        '\u{1D516}' => &['\u{0053}'],
+        '\u{1D517}' => &['\u{0054}'],
+        '\u{1D518}' => &['\u{0055}'],
+        '\u{1D519}' => &['\u{0056}'],
+        '\u{1D51A}' => &['\u{0057}'],
+        '\u{1D51B}' => &['\u{0058}'],
+        '\u{1D51C}' => &['\u{0059}'],
+        '\u{1D51E}' => &['\u{0061}'],
+        '\u{1D51F}' => &['\u{0062}'],
+        '\u{1D520}' => &['\u{0063}'],
+        '\u{1D521}' => &['\u{0064}'],
+        '\u{1D522}' => &['\u{0065}'],
+        '\u{1D523}' => &['\u{0066}'],
+        '\u{1D524}' => &['\u{0067}'],
+        '\u{1D525}' => &['\u{0068}'],
+        '\u{1D526}' => &['\u{0069}'],
+        '\u{1D527}' => &['\u{006A}'],
+        '\u{1D528}' => &['\u{006B}'],
+        '\u{1D529}' => &['\u{006C}'],
+        '\u{1D52A}' => &['\u{006D}'],
+        '\u{1D52B}' => &['\u{006E}'],
+        '\u{1D52C}' => &['\u{006F}'],
+        '\u{1D52D}' => &['\u{0070}'],
+        '\u{1D52E}' => &['\u{0071}'],
+        '\u{1D52F}' => &['\u{0072}'],
+        '\u{1D530}' => &['\u{0073}'],
+        '\u{1D531}' => &['\u{0074}'],
+        '\u{1D532}' => &['\u{0075}'],
+        '\u{1D533}' => &['\u{0076}'],
+        '\u{1D534}' => &['\u{0077}'],
+        '\u{1D535}' => &['\u{0078}'],
+        '\u{1D536}' => &['\u{0079}'],
+        '\u{1D537}' => &['\u{007A}'],
+        '\u{1D538}' => &['\u{0041}'],
+        '\u{1D539}' => &['\u{0042}'],
+        '\u{1D53B}' => &['\u{0044}'],
+        '\u{1D53C}' => &['\u{0045}'],
+        '\u{1D53D}' => &['\u{0046}'],
+        '\u{1D53E}' => &['\u{0047}'],
+        '\u{1D540}' => &['\u{0049}'],
+        '\u{1D541}' => &['\u{004A}'],
+        '\u{1D542}' => &['\u{004B}'],
+        '\u{1D543}' => &['\u{004C}'],
+        '\u{1D544}' => &['\u{004D}'],
+        '\u{1D546}' => &['\u{004F}'],
+        '\u{1D54A}' => &['\u{0053}'],
+        '\u{1D54B}' => &['\u{0054}'],
+        '\u{1D54C}' => &['\u{0055}'],
+        '\u{1D54D}' => &['\u{0056}'],
+        '\u{1D54E}' => &['\u{0057}'],
+        '\u{1D54F}' => &['\u{0058}'],
+        '\u{1D550}' => &['\u{0059}'],
+        '\u{1D552}' => &['\u{0061}'],
+        '\u{1D553}' => &['\u{0062}'],
+        '\u{1D554}' => &['\u{0063}'],
+        '\u{1D555}' => &['\u{0064}'],
+        '\u{1D556}' => &['\u{0065}'],
+        '\u{1D557}' => &['\u{0066}'],
+        '\u{1D558}' => &['\u{0067}'],
+        '\u{1D559}' => &['\u{0068}'],
+        '\u{1D55A}' => &['\u{0069}'],
+        '\u{1D55B}' => &['\u{006A}'],
+        '\u{1D55C}' => &['\u{006B}'],
+        '\u{1D55D}' => &['\u{006C}'],
+        '\u{1D55E}' => &['\u{006D}'],
+        '\u{1D55F}' => &['\u{006E}'],
+        '\u{1D560}' => &['\u{006F}'],
+        '\u{1D561}' => &['\u{0070}'],
+        '\u{1D562}' => &['\u{0071}'],
+        '\u{1D563}' => &['\u{0072}'],
+        '\u{1D564}' => &['\u{0073}'],
+        '\u{1D565}' => &['\u{0074}'],
+        '\u{1D566}' => &['\u{0075}'],
+        '\u{1D567}' => &['\u{0076}'],
+        '\u{1D568}' => &['\u{0077}'],
+        '\u{1D569}' => &['\u{0078}'],
+        '\u{1D56A}' => &['\u{0079}'],
+        '\u{1D56B}' => &['\u{007A}'],
+        '\u{1D56C}' => &['\u{0041}'],
+        '\u{1D56D}' => &['\u{0042}'],
+        '\u{1D56E}' => &['\u{0043}'],
+        '\u{1D56F}' => &['\u{0044}'],
+        '\u{1D570}' => &['\u{0045}'],
+        '\u{1D571}' => &['\u{0046}'],
+        '\u{1D572}' => &['\u{0047}'],
+        '\u{1D573}' => &['\u{0048}'],
+        '\u{1D574}' => &['\u{0049}'],
+        '\u{1D575}' => &['\u{004A}'],
+        '\u{1D576}' => &['\u{004B}'],
+        '\u{1D577}' => &['\u{004C}'],
+        '\u{1D578}' => &['\u{004D}'],
+        '\u{1D579}' => &['\u{004E}'],
+        '\u{1D57A}' => &['\u{004F}'],
+        '\u{1D57B}' => &['\u{0050}'],
+        '\u{1D57C}' => &['\u{0051}'],
+        '\u{1D57D}' => &['\u{0052}'],
+        '\u{1D57E}' => &['\u{0053}'],
+        '\u{1D57F}' => &['\u{0054}'],
+        '\u{1D580}' => &['\u{0055}'],
+        '\u{1D581}' => &['\u{0056}'],
+        '\u{1D582}' => &['\u{0057}'],
+        '\u{1D583}' => &['\u{0058}'],
+        '\u{1D584}' => &['\u{0059}'],
+        '\u{1D585}' => &['\u{005A}'],
+        '\u{1D586}' => &['\u{0061}'],
+        '\u{1D587}' => &['\u{0062}'],
+        '\u{1D588}' => &['\u{0063}'],
+        '\u{1D589}' => &['\u{0064}'],
+        '\u{1D58A}' => &['\u{0065}'],
+        '\u{1D58B}' => &['\u{0066}'],
+        '\u{1D58C}' => &['\u{0067}'],
+        '\u{1D58D}' => &['\u{0068}'],
+        '\u{1D58E}' => &['\u{0069}'],
+        '\u{1D58F}' => &['\u{006A}'],
+        '\u{1D590}' => &['\u{006B}'],
+        '\u{1D591}' => &['\u{006C}'],
+        '\u{1D592}' => &['\u{006D}'],
+        '\u{1D593}' => &['\u{006E}'],
+        '\u{1D594}' => &['\u{006F}'],
+        '\u{1D595}' => &['\u{0070}'],
+        '\u{1D596}' => &['\u{0071}'],
+        '\u{1D597}' => &['\u{0072}'],
+        '\u{1D598}' => &['\u{0073}'],
+        '\u{1D599}' => &['\u{0074}'],
+        '\u{1D59A}' => &['\u{0075}'],
+        '\u{1D59B}' => &['\u{0076}'],
+        '\u{1D59C}' => &['\u{0077}'],
+        '\u{1D59D}' => &['\u{0078}'],
+        '\u{1D59E}' => &['\u{0079}'],
+        '\u{1D59F}' => &['\u{007A}'],
+        '\u{1D5A0}' => &['\u{0041}'],
+        '\u{1D5A1}' => &['\u{0042}'],
+        '\u{1D5A2}' => &['\u{0043}'],
+        '\u{1D5A3}' => &['\u{0044}'],
+        '\u{1D5A4}' => &['\u{0045}'],
+        '\u{1D5A5}' => &['\u{0046}'],
+        '\u{1D5A6}' => &['\u{0047}'],
+        '\u{1D5A7}' => &['\u{0048}'],
+        '\u{1D5A8}' => &['\u{0049}'],
+        '\u{1D5A9}' => &['\u{004A}'],
+        '\u{1D5AA}' => &['\u{004B}'],
+        '\u{1D5AB}' => &['\u{004C}'],
+        '\u{1D5AC}' => &['\u{004D}'],
+        '\u{1D5AD}' => &['\u{004E}'],
+        '\u{1D5AE}' => &['\u{004F}'],
+        '\u{1D5AF}' => &['\u{0050}'],
+        '\u{1D5B0}' => &['\u{0051}'],
+        '\u{1D5B1}' => &['\u{0052}'],
+        '\u{1D5B2}' => &['\u{0053}'],
+        '\u{1D5B3}' => &['\u{0054}'],
+        '\u{1D5B4}' => &['\u{0055}'],
+        '\u{1D5B5}' => &['\u{0056}'],
+        '\u{1D5B6}' => &['\u{0057}'],
+        '\u{1D5B7}' => &['\u{0058}'],
+        '\u{1D5B8}' => &['\u{0059}'],
+        '\u{1D5B9}' => &['\u{005A}'],
+        '\u{1D5BA}' => &['\u{0061}'],
+        '\u{1D5BB}' => &['\u{0062}'],
+        '\u{1D5BC}' => &['\u{0063}'],
+        '\u{1D5BD}' => &['\u{0064}'],
+        '\u{1D5BE}' => &['\u{0065}'],
+        '\u{1D5BF}' => &['\u{0066}'],
+        '\u{1D5C0}' => &['\u{0067}'],
+        '\u{1D5C1}' => &['\u{0068}'],
+        '\u{1D5C2}' => &['\u{0069}'],
+        '\u{1D5C3}' => &['\u{006A}'],
+        '\u{1D5C4}' => &['\u{006B}'],
+        '\u{1D5C5}' => &['\u{006C}'],
+        '\u{1D5C6}' => &['\u{006D}'],
+        '\u{1D5C7}' => &['\u{006E}'],
+        '\u{1D5C8}' => &['\u{006F}'],
+        '\u{1D5C9}' => &['\u{0070}'],
+        '\u{1D5CA}' => &['\u{0071}'],
+        '\u{1D5CB}' => &['\u{0072}'],
+        '\u{1D5CC}' => &['\u{0073}'],
+        '\u{1D5CD}' => &['\u{0074}'],
+        '\u{1D5CE}' => &['\u{0075}'],
+        '\u{1D5CF}' => &['\u{0076}'],
+        '\u{1D5D0}' => &['\u{0077}'],
+        '\u{1D5D1}' => &['\u{0078}'],
+        '\u{1D5D2}' => &['\u{0079}'],
+        '\u{1D5D3}' => &['\u{007A}'],
+        '\u{1D5D4}' => &['\u{0041}'],
+        '\u{1D5D5}' => &['\u{0042}'],
+        '\u{1D5D6}' => &['\u{0043}'],
+        '\u{1D5D7}' => &['\u{0044}'],
+        '\u{1D5D8}' => &['\u{0045}'],
+        '\u{1D5D9}' => &['\u{0046}'],
+        '\u{1D5DA}' => &['\u{0047}'],
+        '\u{1D5DB}' => &['\u{0048}'],
+        '\u{1D5DC}' => &['\u{0049}'],
+        '\u{1D5DD}' => &['\u{004A}'],
+        '\u{1D5DE}' => &['\u{004B}'],
+        '\u{1D5DF}' => &['\u{004C}'],
+        '\u{1D5E0}' => &['\u{004D}'],
+        '\u{1D5E1}' => &['\u{004E}'],
+        '\u{1D5E2}' => &['\u{004F}'],
+        '\u{1D5E3}' => &['\u{0050}'],
+        '\u{1D5E4}' => &['\u{0051}'],
+        '\u{1D5E5}' => &['\u{0052}'],
+        '\u{1D5E6}' => &['\u{0053}'],
+        '\u{1D5E7}' => &['\u{0054}'],
+        '\u{1D5E8}' => &['\u{0055}'],
+        '\u{1D5E9}' => &['\u{0056}'],
+        '\u{1D5EA}' => &['\u{0057}'],
+        '\u{1D5EB}' => &['\u{0058}'],
+        '\u{1D5EC}' => &['\u{0059}'],
+        '\u{1D5ED}' => &['\u{005A}'],
+        '\u{1D5EE}' => &['\u{0061}'],
+        '\u{1D5EF}' => &['\u{0062}'],
+        '\u{1D5F0}' => &['\u{0063}'],
+        '\u{1D5F1}' => &['\u{0064}'],
+        '\u{1D5F2}' => &['\u{0065}'],
+        '\u{1D5F3}' => &['\u{0066}'],
+        '\u{1D5F4}' => &['\u{0067}'],
+        '\u{1D5F5}' => &['\u{0068}'],
+        '\u{1D5F6}' => &['\u{0069}'],
+        '\u{1D5F7}' => &['\u{006A}'],
+        '\u{1D5F8}' => &['\u{006B}'],
+        '\u{1D5F9}' => &['\u{006C}'],
+        '\u{1D5FA}' => &['\u{006D}'],
+        '\u{1D5FB}' => &['\u{006E}'],
+        '\u{1D5FC}' => &['\u{006F}'],
+        '\u{1D5FD}' => &['\u{0070}'],
+        '\u{1D5FE}' => &['\u{0071}'],
+        '\u{1D5FF}' => &['\u{0072}'],
+        '\u{1D600}' => &['\u{0073}'],
+        '\u{1D601}' => &['\u{0074}'],
+        '\u{1D602}' => &['\u{0075}'],
+        '\u{1D603}' => &['\u{0076}'],
+        '\u{1D604}' => &['\u{0077}'],
+        '\u{1D605}' => &['\u{0078}'],
+        '\u{1D606}' => &['\u{0079}'],
+        '\u{1D607}' => &['\u{007A}'],
+        '\u{1D608}' => &['\u{0041}'],
+        '\u{1D609}' => &['\u{0042}'],
+        '\u{1D60A}' => &['\u{0043}'],
+        '\u{1D60B}' => &['\u{0044}'],
+        '\u{1D60C}' => &['\u{0045}'],
+        '\u{1D60D}' => &['\u{0046}'],
+        '\u{1D60E}' => &['\u{0047}'],
+        '\u{1D60F}' => &['\u{0048}'],
+        '\u{1D610}' => &['\u{0049}'],
+        '\u{1D611}' => &['\u{004A}'],
+        '\u{1D612}' => &['\u{004B}'],
+        '\u{1D613}' => &['\u{004C}'],
+        '\u{1D614}' => &['\u{004D}'],
+        '\u{1D615}' => &['\u{004E}'],
+        '\u{1D616}' => &['\u{004F}'],
+        '\u{1D617}' => &['\u{0050}'],
+        '\u{1D618}' => &['\u{0051}'],
+        '\u{1D619}' => &['\u{0052}'],
+        '\u{1D61A}' => &['\u{0053}'],
+        '\u{1D61B}' => &['\u{0054}'],
+        '\u{1D61C}' => &['\u{0055}'],
+        '\u{1D61D}' => &['\u{0056}'],
+        '\u{1D61E}' => &['\u{0057}'],
+        '\u{1D61F}' => &['\u{0058}'],
+        '\u{1D620}' => &['\u{0059}'],
+        '\u{1D621}' => &['\u{005A}'],
+        '\u{1D622}' => &['\u{0061}'],
+        '\u{1D623}' => &['\u{0062}'],
+        '\u{1D624}' => &['\u{0063}'],
+        '\u{1D625}' => &['\u{0064}'],
+        '\u{1D626}' => &['\u{0065}'],
+        '\u{1D627}' => &['\u{0066}'],
+        '\u{1D628}' => &['\u{0067}'],
+        '\u{1D629}' => &['\u{0068}'],
+        '\u{1D62A}' => &['\u{0069}'],
+        '\u{1D62B}' => &['\u{006A}'],
+        '\u{1D62C}' => &['\u{006B}'],
+        '\u{1D62D}' => &['\u{006C}'],
+        '\u{1D62E}' => &['\u{006D}'],
+        '\u{1D62F}' => &['\u{006E}'],
+        '\u{1D630}' => &['\u{006F}'],
+        '\u{1D631}' => &['\u{0070}'],
+        '\u{1D632}' => &['\u{0071}'],
+        '\u{1D633}' => &['\u{0072}'],
+        '\u{1D634}' => &['\u{0073}'],
+        '\u{1D635}' => &['\u{0074}'],
+        '\u{1D636}' => &['\u{0075}'],
+        '\u{1D637}' => &['\u{0076}'],
+        '\u{1D638}' => &['\u{0077}'],
+        '\u{1D639}' => &['\u{0078}'],
+        '\u{1D63A}' => &['\u{0079}'],
+        '\u{1D63B}' => &['\u{007A}'],
+        '\u{1D63C}' => &['\u{0041}'],
+        '\u{1D63D}' => &['\u{0042}'],
+        '\u{1D63E}' => &['\u{0043}'],
+        '\u{1D63F}' => &['\u{0044}'],
+        '\u{1D640}' => &['\u{0045}'],
+        '\u{1D641}' => &['\u{0046}'],
+        '\u{1D642}' => &['\u{0047}'],
+        '\u{1D643}' => &['\u{0048}'],
+        '\u{1D644}' => &['\u{0049}'],
+        '\u{1D645}' => &['\u{004A}'],
+        '\u{1D646}' => &['\u{004B}'],
+        '\u{1D647}' => &['\u{004C}'],
+        '\u{1D648}' => &['\u{004D}'],
+        '\u{1D649}' => &['\u{004E}'],
+        '\u{1D64A}' => &['\u{004F}'],
+        '\u{1D64B}' => &['\u{0050}'],
+        '\u{1D64C}' => &['\u{0051}'],
+        '\u{1D64D}' => &['\u{0052}'],
+        '\u{1D64E}' => &['\u{0053}'],
+        '\u{1D64F}' => &['\u{0054}'],
+        '\u{1D650}' => &['\u{0055}'],
+        '\u{1D651}' => &['\u{0056}'],
+        '\u{1D652}' => &['\u{0057}'],
+        '\u{1D653}' => &['\u{0058}'],
+        '\u{1D654}' => &['\u{0059}'],
+        '\u{1D655}' => &['\u{005A}'],
+        '\u{1D656}' => &['\u{0061}'],
+        '\u{1D657}' => &['\u{0062}'],
+        '\u{1D658}' => &['\u{0063}'],
+        '\u{1D659}' => &['\u{0064}'],
+        '\u{1D65A}' => &['\u{0065}'],
+        '\u{1D65B}' => &['\u{0066}'],
+        '\u{1D65C}' => &['\u{0067}'],
+        '\u{1D65D}' => &['\u{0068}'],
+        '\u{1D65E}' => &['\u{0069}'],
+        '\u{1D65F}' => &['\u{006A}'],
+        '\u{1D660}' => &['\u{006B}'],
+        '\u{1D661}' => &['\u{006C}'],
+        '\u{1D662}' => &['\u{006D}'],
+        '\u{1D663}' => &['\u{006E}'],
+        '\u{1D664}' => &['\u{006F}'],
+        '\u{1D665}' => &['\u{0070}'],
+        '\u{1D666}' => &['\u{0071}'],
+        '\u{1D667}' => &['\u{0072}'],
+        '\u{1D668}' => &['\u{0073}'],
+        '\u{1D669}' => &['\u{0074}'],
+        '\u{1D66A}' => &['\u{0075}'],
+        '\u{1D66B}' => &['\u{0076}'],
+        '\u{1D66C}' => &['\u{0077}'],
+        '\u{1D66D}' => &['\u{0078}'],
+        '\u{1D66E}' => &['\u{0079}'],
+        '\u{1D66F}' => &['\u{007A}'],
+        '\u{1D670}' => &['\u{0041}'],
+        '\u{1D671}' => &['\u{0042}'],
+        '\u{1D672}' => &['\u{0043}'],
+        '\u{1D673}' => &['\u{0044}'],
+        '\u{1D674}' => &['\u{0045}'],
+        '\u{1D675}' => &['\u{0046}'],
+        '\u{1D676}' => &['\u{0047}'],
+        '\u{1D677}' => &['\u{0048}'],
+        '\u{1D678}' => &['\u{0049}'],
+        '\u{1D679}' => &['\u{004A}'],
+        '\u{1D67A}' => &['\u{004B}'],
+        '\u{1D67B}' => &['\u{004C}'],
+        '\u{1D67C}' => &['\u{004D}'],
+        '\u{1D67D}' => &['\u{004E}'],
+        '\u{1D67E}' => &['\u{004F}'],
+        '\u{1D67F}' => &['\u{0050}'],
+        '\u{1D680}' => &['\u{0051}'],
+        '\u{1D681}' => &['\u{0052}'],
+        '\u{1D682}' => &['\u{0053}'],
+        '\u{1D683}' => &['\u{0054}'],
+        '\u{1D684}' => &['\u{0055}'],
+        '\u{1D685}' => &['\u{0056}'],
+        '\u{1D686}' => &['\u{0057}'],
+        '\u{1D687}' => &['\u{0058}'],
+        '\u{1D688}' => &['\u{0059}'],
+        '\u{1D689}' => &['\u{005A}'],
+        '\u{1D68A}' => &['\u{0061}'],
+        '\u{1D68B}' => &['\u{0062}'],
+        '\u{1D68C}' => &['\u{0063}'],
+        '\u{1D68D}' => &['\u{0064}'],
+        '\u{1D68E}' => &['\u{0065}'],
+        '\u{1D68F}' => &['\u{0066}'],
+        '\u{1D690}' => &['\u{0067}'],
+        '\u{1D691}' => &['\u{0068}'],
+        '\u{1D692}' => &['\u{0069}'],
+        '\u{1D693}' => &['\u{006A}'],
+        '\u{1D694}' => &['\u{006B}'],
+        '\u{1D695}' => &['\u{006C}'],
+        '\u{1D696}' => &['\u{006D}'],
+        '\u{1D697}' => &['\u{006E}'],
+        '\u{1D698}' => &['\u{006F}'],
+        '\u{1D699}' => &['\u{0070}'],
+        '\u{1D69A}' => &['\u{0071}'],
+        '\u{1D69B}' => &['\u{0072}'],
+        '\u{1D69C}' => &['\u{0073}'],
+        '\u{1D69D}' => &['\u{0074}'],
+        '\u{1D69E}' => &['\u{0075}'],
+        '\u{1D69F}' => &['\u{0076}'],
+        '\u{1D6A0}' => &['\u{0077}'],
+        '\u{1D6A1}' => &['\u{0078}'],
+        '\u{1D6A2}' => &['\u{0079}'],
+        '\u{1D6A3}' => &['\u{007A}'],
+        '\u{1D6A4}' => &['\u{0131}'],
+        '\u{1D6A5}' => &['\u{0237}'],
+        '\u{1D6A8}' => &['\u{0391}'],
+        '\u{1D6A9}' => &['\u{0392}'],
+        '\u{1D6AA}' => &['\u{0393}'],
+        '\u{1D6AB}' => &['\u{0394}'],
+        '\u{1D6AC}' => &['\u{0395}'],
+        '\u{1D6AD}' => &['\u{0396}'],
+        '\u{1D6AE}' => &['\u{0397}'],
+        '\u{1D6AF}' => &['\u{0398}'],
+        '\u{1D6B0}' => &['\u{0399}'],
+        '\u{1D6B1}' => &['\u{039A}'],
+        '\u{1D6B2}' => &['\u{039B}'],
+        '\u{1D6B3}' => &['\u{039C}'],
+        '\u{1D6B4}' => &['\u{039D}'],
+        '\u{1D6B5}' => &['\u{039E}'],
+        '\u{1D6B6}' => &['\u{039F}'],
+        '\u{1D6B7}' => &['\u{03A0}'],
+        '\u{1D6B8}' => &['\u{03A1}'],
+        '\u{1D6B9}' => &['\u{0398}'],
+        '\u{1D6BA}' => &['\u{03A3}'],
+        '\u{1D6BB}' => &['\u{03A4}'],
+        '\u{1D6BC}' => &['\u{03A5}'],
+        '\u{1D6BD}' => &['\u{03A6}'],
+        '\u{1D6BE}' => &['\u{03A7}'],
+        '\u{1D6BF}' => &['\u{03A8}'],
+        '\u{1D6C0}' => &['\u{03A9}'],
+        '\u{1D6C1}' => &['\u{2207}'],
+        '\u{1D6C2}' => &['\u{03B1}'],
+        '\u{1D6C3}' => &['\u{03B2}'],
+        '\u{1D6C4}' => &['\u{03B3}'],
+        '\u{1D6C5}' => &['\u{03B4}'],
+        '\u{1D6C6}' => &['\u{03B5}'],
+        '\u{1D6C7}' => &['\u{03B6}'],
+        '\u{1D6C8}' => &['\u{03B7}'],
+        '\u{1D6C9}' => &['\u{03B8}'],
+        '\u{1D6CA}' => &['\u{03B9}'],
+        '\u{1D6CB}' => &['\u{03BA}'],
+        '\u{1D6CC}' => &['\u{03BB}'],
+        '\u{1D6CD}' => &['\u{03BC}'],
+        '\u{1D6CE}' => &['\u{03BD}'],
+        '\u{1D6CF}' => &['\u{03BE}'],
+        '\u{1D6D0}' => &['\u{03BF}'],
+        '\u{1D6D1}' => &['\u{03C0}'],
+        '\u{1D6D2}' => &['\u{03C1}'],
+        '\u{1D6D3}' => &['\u{03C2}'],
+        '\u{1D6D4}' => &['\u{03C3}'],
+        '\u{1D6D5}' => &['\u{03C4}'],
+        '\u{1D6D6}' => &['\u{03C5}'],
+        '\u{1D6D7}' => &['\u{03C6}'],
+        '\u{1D6D8}' => &['\u{03C7}'],
+        '\u{1D6D9}' => &['\u{03C8}'],
+        '\u{1D6DA}' => &['\u{03C9}'],
+        '\u{1D6DB}' => &['\u{2202}'],
+        '\u{1D6DC}' => &['\u{03B5}'],
+        '\u{1D6DD}' => &['\u{03B8}'],
+        '\u{1D6DE}' => &['\u{03BA}'],
+        '\u{1D6DF}' => &['\u{03C6}'],
+        '\u{1D6E0}' => &['\u{03C1}'],
+        '\u{1D6E1}' => &['\u{03C0}'],
+        '\u{1D6E2}' => &['\u{0391}'],
+        '\u{1D6E3}' => &['\u{0392}'],
+        '\u{1D6E4}' => &['\u{0393}'],
+        '\u{1D6E5}' => &['\u{0394}'],
+        '\u{1D6E6}' => &['\u{0395}'],
+        '\u{1D6E7}' => &['\u{0396}'],
+        '\u{1D6E8}' => &['\u{0397}'],
+        '\u{1D6E9}' => &['\u{0398}'],
+        '\u{1D6EA}' => &['\u{0399}'],
+        '\u{1D6EB}' => &['\u{039A}'],
+        '\u{1D6EC}' => &['\u{039B}'],
+        '\u{1D6ED}' => &['\u{039C}'],
+        '\u{1D6EE}' => &['\u{039D}'],
+        '\u{1D6EF}' => &['\u{039E}'],
+        '\u{1D6F0}' => &['\u{039F}'],
+        '\u{1D6F1}' => &['\u{03A0}'],
+        '\u{1D6F2}' => &['\u{03A1}'],
+        '\u{1D6F3}' => &['\u{0398}'],
+        '\u{1D6F4}' => &['\u{03A3}'],
+        '\u{1D6F5}' => &['\u{03A4}'],
+        '\u{1D6F6}' => &['\u{03A5}'],
+        '\u{1D6F7}' => &['\u{03A6}'],
+        '\u{1D6F8}' => &['\u{03A7}'],
+        '\u{1D6F9}' => &['\u{03A8}'],
+        '\u{1D6FA}' => &['\u{03A9}'],
+        '\u{1D6FB}' => &['\u{2207}'],
+        '\u{1D6FC}' => &['\u{03B1}'],
+        '\u{1D6FD}' => &['\u{03B2}'],
+        '\u{1D6FE}' => &['\u{03B3}'],
+        '\u{1D6FF}' => &['\u{03B4}'],
+        '\u{1D700}' => &['\u{03B5}'],
+        '\u{1D701}' => &['\u{03B6}'],
+        '\u{1D702}' => &['\u{03B7}'],
+        '\u{1D703}' => &['\u{03B8}'],
+        '\u{1D704}' => &['\u{03B9}'],
+        '\u{1D705}' => &['\u{03BA}'],
+        '\u{1D706}' => &['\u{03BB}'],
+        '\u{1D707}' => &['\u{03BC}'],
+        '\u{1D708}' => &['\u{03BD}'],
+        '\u{1D709}' => &['\u{03BE}'],
+        '\u{1D70A}' => &['\u{03BF}'],
+        '\u{1D70B}' => &['\u{03C0}'],
+        '\u{1D70C}' => &['\u{03C1}'],
+        '\u{1D70D}' => &['\u{03C2}'],
+        '\u{1D70E}' => &['\u{03C3}'],
+        '\u{1D70F}' => &['\u{03C4}'],
+        '\u{1D710}' => &['\u{03C5}'],
+        '\u{1D711}' => &['\u{03C6}'],
+        '\u{1D712}' => &['\u{03C7}'],
+        '\u{1D713}' => &['\u{03C8}'],
+        '\u{1D714}' => &['\u{03C9}'],
+        '\u{1D715}' => &['\u{2202}'],
+        '\u{1D716}' => &['\u{03B5}'],
+        '\u{1D717}' => &['\u{03B8}'],
+        '\u{1D718}' => &['\u{03BA}'],
+        '\u{1D719}' => &['\u{03C6}'],
+        '\u{1D71A}' => &['\u{03C1}'],
+        '\u{1D71B}' => &['\u{03C0}'],
+        '\u{1D71C}' => &['\u{0391}'],
+        '\u{1D71D}' => &['\u{0392}'],
+        '\u{1D71E}' => &['\u{0393}'],
+        '\u{1D71F}' => &['\u{0394}'],
+        '\u{1D720}' => &['\u{0395}'],
+        '\u{1D721}' => &['\u{0396}'],
+        '\u{1D722}' => &['\u{0397}'],
+        '\u{1D723}' => &['\u{0398}'],
+        '\u{1D724}' => &['\u{0399}'],
+        '\u{1D725}' => &['\u{039A}'],
+        '\u{1D726}' => &['\u{039B}'],
+        '\u{1D727}' => &['\u{039C}'],
+        '\u{1D728}' => &['\u{039D}'],
+        '\u{1D729}' => &['\u{039E}'],
+        '\u{1D72A}' => &['\u{039F}'],
+        '\u{1D72B}' => &['\u{03A0}'],
+        '\u{1D72C}' => &['\u{03A1}'],
+        '\u{1D72D}' => &['\u{0398}'],
+        '\u{1D72E}' => &['\u{03A3}'],
+        '\u{1D72F}' => &['\u{03A4}'],
+        '\u{1D730}' => &['\u{03A5}'],
+        '\u{1D731}' => &['\u{03A6}'],
+        '\u{1D732}' => &['\u{03A7}'],
+        '\u{1D733}' => &['\u{03A8}'],
+        '\u{1D734}' => &['\u{03A9}'],
+        '\u{1D735}' => &['\u{2207}'],
+        '\u{1D736}' => &['\u{03B1}'],
+        '\u{1D737}' => &['\u{03B2}'],
+        '\u{1D738}' => &['\u{03B3}'],
+        '\u{1D739}' => &['\u{03B4}'],
+        '\u{1D73A}' => &['\u{03B5}'],
+        '\u{1D73B}' => &['\u{03B6}'],
+        '\u{1D73C}' => &['\u{03B7}'],
+        '\u{1D73D}' => &['\u{03B8}'],
+        '\u{1D73E}' => &['\u{03B9}'],
+        '\u{1D73F}' => &['\u{03BA}'],
+        '\u{1D740}' => &['\u{03BB}'],
+        '\u{1D741}' => &['\u{03BC}'],
+        '\u{1D742}' => &['\u{03BD}'],
+        '\u{1D743}' => &['\u{03BE}'],
+        '\u{1D744}' => &['\u{03BF}'],
+        '\u{1D745}' => &['\u{03C0}'],
+        '\u{1D746}' => &['\u{03C1}'],
+        '\u{1D747}' => &['\u{03C2}'],
+        '\u{1D748}' => &['\u{03C3}'],
+        '\u{1D749}' => &['\u{03C4}'],
+        '\u{1D74A}' => &['\u{03C5}'],
+        '\u{1D74B}' => &['\u{03C6}'],
+        '\u{1D74C}' => &['\u{03C7}'],
+        '\u{1D74D}' => &['\u{03C8}'],
+        '\u{1D74E}' => &['\u{03C9}'],
+        '\u{1D74F}' => &['\u{2202}'],
+        '\u{1D750}' => &['\u{03B5}'],
+        '\u{1D751}' => &['\u{03B8}'],
+        '\u{1D752}' => &['\u{03BA}'],
+        '\u{1D753}' => &['\u{03C6}'],
+        '\u{1D754}' => &['\u{03C1}'],
+        '\u{1D755}' => &['\u{03C0}'],
+        '\u{1D756}' => &['\u{0391}'],
+        '\u{1D757}' => &['\u{0392}'],
+        '\u{1D758}' => &['\u{0393}'],
+        '\u{1D759}' => &['\u{0394}'],
+        '\u{1D75A}' => &['\u{0395}'],
+        '\u{1D75B}' => &['\u{0396}'],
+        '\u{1D75C}' => &['\u{0397}'],
+        '\u{1D75D}' => &['\u{0398}'],
+        '\u{1D75E}' => &['\u{0399}'],
+        '\u{1D75F}' => &['\u{039A}'],
+        '\u{1D760}' => &['\u{039B}'],
+        '\u{1D761}' => &['\u{039C}'],
+        '\u{1D762}' => &['\u{039D}'],
+        '\u{1D763}' => &['\u{039E}'],
+        '\u{1D764}' => &['\u{039F}'],
+        '\u{1D765}' => &['\u{03A0}'],
+        '\u{1D766}' => &['\u{03A1}'],
+        '\u{1D767}' => &['\u{0398}'],
+        '\u{1D768}' => &['\u{03A3}'],
+        '\u{1D769}' => &['\u{03A4}'],
+        '\u{1D76A}' => &['\u{03A5}'],
+        '\u{1D76B}' => &['\u{03A6}'],
+        '\u{1D76C}' => &['\u{03A7}'],
+        '\u{1D76D}' => &['\u{03A8}'],
+        '\u{1D76E}' => &['\u{03A9}'],
+        '\u{1D76F}' => &['\u{2207}'],
+        '\u{1D770}' => &['\u{03B1}'],
+        '\u{1D771}' => &['\u{03B2}'],
+        '\u{1D772}' => &['\u{03B3}'],
+        '\u{1D773}' => &['\u{03B4}'],
+        '\u{1D774}' => &['\u{03B5}'],
+        '\u{1D775}' => &['\u{03B6}'],
+        '\u{1D776}' => &['\u{03B7}'],
+        '\u{1D777}' => &['\u{03B8}'],
+        '\u{1D778}' => &['\u{03B9}'],
+        '\u{1D779}' => &['\u{03BA}'],
+        '\u{1D77A}' => &['\u{03BB}'],
+        '\u{1D77B}' => &['\u{03BC}'],
+        '\u{1D77C}' => &['\u{03BD}'],
+        '\u{1D77D}' => &['\u{03BE}'],
+        '\u{1D77E}' => &['\u{03BF}'],
+        '\u{1D77F}' => &['\u{03C0}'],
+        '\u{1D780}' => &['\u{03C1}'],
+        '\u{1D781}' => &['\u{03C2}'],
+        '\u{1D782}' => &['\u{03C3}'],
+        '\u{1D783}' => &['\u{03C4}'],
+        '\u{1D784}' => &['\u{03C5}'],
+        '\u{1D785}' => &['\u{03C6}'],
+        '\u{1D786}' => &['\u{03C7}'],
+        '\u{1D787}' => &['\u{03C8}'],
+        '\u{1D788}' => &['\u{03C9}'],
+        '\u{1D789}' => &['\u{2202}'],
+        '\u{1D78A}' => &['\u{03B5}'],
+        '\u{1D78B}' => &['\u{03B8}'],
+        '\u{1D78C}' => &['\u{03BA}'],
+        '\u{1D78D}' => &['\u{03C6}'],
+        '\u{1D78E}' => &['\u{03C1}'],
+        '\u{1D78F}' => &['\u{03C0}'],
+        '\u{1D790}' => &['\u{0391}'],
+        '\u{1D791}' => &['\u{0392}'],
+        '\u{1D792}' => &['\u{0393}'],
+        '\u{1D793}' => &['\u{0394}'],
+        '\u{1D794}' => &['\u{0395}'],
+        '\u{1D795}' => &['\u{0396}'],
+        '\u{1D796}' => &['\u{0397}'],
+        '\u{1D797}' => &['\u{0398}'],
+        '\u{1D798}' => &['\u{0399}'],
+        '\u{1D799}' => &['\u{039A}'],
+        '\u{1D79A}' => &['\u{039B}'],
+        '\u{1D79B}' => &['\u{039C}'],
+        '\u{1D79C}' => &['\u{039D}'],
+        '\u{1D79D}' => &['\u{039E}'],
+        '\u{1D79E}' => &['\u{039F}'],
+        '\u{1D79F}' => &['\u{03A0}'],
+        '\u{1D7A0}' => &['\u{03A1}'],
+        '\u{1D7A1}' => &['\u{0398}'],
+        '\u{1D7A2}' => &['\u{03A3}'],
+        '\u{1D7A3}' => &['\u{03A4}'],
+        '\u{1D7A4}' => &['\u{03A5}'],
+        '\u{1D7A5}' => &['\u{03A6}'],
+        '\u{1D7A6}' => &['\u{03A7}'],
+        '\u{1D7A7}' => &['\u{03A8}'],
+        '\u{1D7A8}' => &['\u{03A9}'],
+        '\u{1D7A9}' => &['\u{2207}'],
+        '\u{1D7AA}' => &['\u{03B1}'],
+        '\u{1D7AB}' => &['\u{03B2}'],
+        '\u{1D7AC}' => &['\u{03B3}'],
+        '\u{1D7AD}' => &['\u{03B4}'],
+        '\u{1D7AE}' => &['\u{03B5}'],
+        '\u{1D7AF}' => &['\u{03B6}'],
+        '\u{1D7B0}' => &['\u{03B7}'],
+        '\u{1D7B1}' => &['\u{03B8}'],
+        '\u{1D7B2}' => &['\u{03B9}'],
+        '\u{1D7B3}' => &['\u{03BA}'],
+        '\u{1D7B4}' => &['\u{03BB}'],
+        '\u{1D7B5}' => &['\u{03BC}'],
+        '\u{1D7B6}' => &['\u{03BD}'],
+        '\u{1D7B7}' => &['\u{03BE}'],
+        '\u{1D7B8}' => &['\u{03BF}'],
+        '\u{1D7B9}' => &['\u{03C0}'],
+        '\u{1D7BA}' => &['\u{03C1}'],
+        '\u{1D7BB}' => &['\u{03C2}'],
+        '\u{1D7BC}' => &['\u{03C3}'],
+        '\u{1D7BD}' => &['\u{03C4}'],
+        '\u{1D7BE}' => &['\u{03C5}'],
+        '\u{1D7BF}' => &['\u{03C6}'],
+        '\u{1D7C0}' => &['\u{03C7}'],
+        '\u{1D7C1}' => &['\u{03C8}'],
+        '\u{1D7C2}' => &['\u{03C9}'],
+        '\u{1D7C3}' => &['\u{2202}'],
+        '\u{1D7C4}' => &['\u{03B5}'],
+        '\u{1D7C5}' => &['\u{03B8}'],
+        '\u{1D7C6}' => &['\u{03BA}'],
+        '\u{1D7C7}' => &['\u{03C6}'],
+        '\u{1D7C8}' => &['\u{03C1}'],
+        '\u{1D7C9}' => &['\u{03C0}'],
+        '\u{1D7CA}' => &['\u{03DC}'],
+        '\u{1D7CB}' => &['\u{03DD}'],
+        '\u{1D7CE}' => &['\u{0030}'],
+        '\u{1D7CF}' => &['\u{0031}'],
+        '\u{1D7D0}' => &['\u{0032}'],
+        '\u{1D7D1}' => &['\u{0033}'],
+        '\u{1D7D2}' => &['\u{0034}'],
+        '\u{1D7D3}' => &['\u{0035}'],
+        '\u{1D7D4}' => &['\u{0036}'],
+        '\u{1D7D5}' => &['\u{0037}'],
+        '\u{1D7D6}' => &['\u{0038}'],
+        '\u{1D7D7}' => &['\u{0039}'],
+        '\u{1D7D8}' => &['\u{0030}'],
+        '\u{1D7D9}' => &['\u{0031}'],
+        '\u{1D7DA}' => &['\u{0032}'],
+        '\u{1D7DB}' => &['\u{0033}'],
+        '\u{1D7DC}' => &['\u{0034}'],
+        '\u{1D7DD}' => &['\u{0035}'],
+        '\u{1D7DE}' => &['\u{0036}'],
+        '\u{1D7DF}' => &['\u{0037}'],
+        '\u{1D7E0}' => &['\u{0038}'],
+        '\u{1D7E1}' => &['\u{0039}'],
+        '\u{1D7E2}' => &['\u{0030}'],
+        '\u{1D7E3}' => &['\u{0031}'],
+        '\u{1D7E4}' => &['\u{0032}'],
+        '\u{1D7E5}' => &['\u{0033}'],
+        '\u{1D7E6}' => &['\u{0034}'],
+        '\u{1D7E7}' => &['\u{0035}'],
+        '\u{1D7E8}' => &['\u{0036}'],
+        '\u{1D7E9}' => &['\u{0037}'],
+        '\u{1D7EA}' => &['\u{0038}'],
+        '\u{1D7EB}' => &['\u{0039}'],
+        '\u{1D7EC}' => &['\u{0030}'],
+        '\u{1D7ED}' => &['\u{0031}'],
+        '\u{1D7EE}' => &['\u{0032}'],
+        '\u{1D7EF}' => &['\u{0033}'],
+        '\u{1D7F0}' => &['\u{0034}'],
+        '\u{1D7F1}' => &['\u{0035}'],
+        '\u{1D7F2}' => &['\u{0036}'],
+        '\u{1D7F3}' => &['\u{0037}'],
+        '\u{1D7F4}' => &['\u{0038}'],
+        '\u{1D7F5}' => &['\u{0039}'],
+        '\u{1D7F6}' => &['\u{0030}'],
+        '\u{1D7F7}' => &['\u{0031}'],
+        '\u{1D7F8}' => &['\u{0032}'],
+        '\u{1D7F9}' => &['\u{0033}'],
+        '\u{1D7FA}' => &['\u{0034}'],
+        '\u{1D7FB}' => &['\u{0035}'],
+        '\u{1D7FC}' => &['\u{0036}'],
+        '\u{1D7FD}' => &['\u{0037}'],
+        '\u{1D7FE}' => &['\u{0038}'],
+        '\u{1D7FF}' => &['\u{0039}'],
+        '\u{1EE00}' => &['\u{0627}'],
+        '\u{1EE01}' => &['\u{0628}'],
+        '\u{1EE02}' => &['\u{062C}'],
+        '\u{1EE03}' => &['\u{062F}'],
+        '\u{1EE05}' => &['\u{0648}'],
+        '\u{1EE06}' => &['\u{0632}'],
+        '\u{1EE07}' => &['\u{062D}'],
+        '\u{1EE08}' => &['\u{0637}'],
+        '\u{1EE09}' => &['\u{064A}'],
+        '\u{1EE0A}' => &['\u{0643}'],
+        '\u{1EE0B}' => &['\u{0644}'],
+        '\u{1EE0C}' => &['\u{0645}'],
+        '\u{1EE0D}' => &['\u{0646}'],
+        '\u{1EE0E}' => &['\u{0633}'],
+        '\u{1EE0F}' => &['\u{0639}'],
+        '\u{1EE10}' => &['\u{0641}'],
+        '\u{1EE11}' => &['\u{0635}'],
+        '\u{1EE12}' => &['\u{0642}'],
+        '\u{1EE13}' => &['\u{0631}'],
+        '\u{1EE14}' => &['\u{0634}'],
+        '\u{1EE15}' => &['\u{062A}'],
+        '\u{1EE16}' => &['\u{062B}'],
+        '\u{1EE17}' => &['\u{062E}'],
+        '\u{1EE18}' => &['\u{0630}'],
+        '\u{1EE19}' => &['\u{0636}'],
+        '\u{1EE1A}' => &['\u{0638}'],
+        '\u{1EE1B}' => &['\u{063A}'],
+        '\u{1EE1C}' => &['\u{066E}'],
+        '\u{1EE1D}' => &['\u{06BA}'],
+        '\u{1EE1E}' => &['\u{06A1}'],
+        '\u{1EE1F}' => &['\u{066F}'],
+        '\u{1EE21}' => &['\u{0628}'],
+        '\u{1EE22}' => &['\u{062C}'],
+        '\u{1EE24}' => &['\u{0647}'],
+        '\u{1EE27}' => &['\u{062D}'],
+        '\u{1EE29}' => &['\u{064A}'],
+        '\u{1EE2A}' => &['\u{0643}'],
+        '\u{1EE2B}' => &['\u{0644}'],
+        '\u{1EE2C}' => &['\u{0645}'],
+        '\u{1EE2D}' => &['\u{0646}'],
+        '\u{1EE2E}' => &['\u{0633}'],
+        '\u{1EE2F}' => &['\u{0639}'],
+        '\u{1EE30}' => &['\u{0641}'],
+        '\u{1EE31}' => &['\u{0635}'],
+        '\u{1EE32}' => &['\u{0642}'],
+        '\u{1EE34}' => &['\u{0634}'],
+        '\u{1EE35}' => &['\u{062A}'],
+        '\u{1EE36}' => &['\u{062B}'],
+        '\u{1EE37}' => &['\u{062E}'],
+        '\u{1EE39}' => &['\u{0636}'],
+        '\u{1EE3B}' => &['\u{063A}'],
+        '\u{1EE42}' => &['\u{062C}'],
+        '\u{1EE47}' => &['\u{062D}'],
+        '\u{1EE49}' => &['\u{064A}'],
+        '\u{1EE4B}' => &['\u{0644}'],
+        '\u{1EE4D}' => &['\u{0646}'],
+        '\u{1EE4E}' => &['\u{0633}'],
+        '\u{1EE4F}' => &['\u{0639}'],
+        '\u{1EE51}' => &['\u{0635}'],
+        '\u{1EE52}' => &['\u{0642}'],
+        '\u{1EE54}' => &['\u{0634}'],
+        '\u{1EE57}' => &['\u{062E}'],
+        '\u{1EE59}' => &['\u{0636}'],
+        '\u{1EE5B}' => &['\u{063A}'],
+        '\u{1EE5D}' => &['\u{06BA}'],
+        '\u{1EE5F}' => &['\u{066F}'],
+        '\u{1EE61}' => &['\u{0628}'],
+        '\u{1EE62}' => &['\u{062C}'],
+        '\u{1EE64}' => &['\u{0647}'],
+        '\u{1EE67}' => &['\u{062D}'],
+        '\u{1EE68}' => &['\u{0637}'],
+        '\u{1EE69}' => &['\u{064A}'],
+        '\u{1EE6A}' => &['\u{0643}'],
+        '\u{1EE6C}' => &['\u{0645}'],
+        '\u{1EE6D}' => &['\u{0646}'],
+        '\u{1EE6E}' => &['\u{0633}'],
+        '\u{1EE6F}' => &['\u{0639}'],
+        '\u{1EE70}' => &['\u{0641}'],
+        '\u{1EE71}' => &['\u{0635}'],
+        '\u{1EE72}' => &['\u{0642}'],
+        '\u{1EE74}' => &['\u{0634}'],
+        '\u{1EE75}' => &['\u{062A}'],
+        '\u{1EE76}' => &['\u{062B}'],
+        '\u{1EE77}' => &['\u{062E}'],
+        '\u{1EE79}' => &['\u{0636}'],
+        '\u{1EE7A}' => &['\u{0638}'],
+        '\u{1EE7B}' => &['\u{063A}'],
+        '\u{1EE7C}' => &['\u{066E}'],
+        '\u{1EE7E}' => &['\u{06A1}'],
+        '\u{1EE80}' => &['\u{0627}'],
+        '\u{1EE81}' => &['\u{0628}'],
+        '\u{1EE82}' => &['\u{062C}'],
+        '\u{1EE83}' => &['\u{062F}'],
+        '\u{1EE84}' => &['\u{0647}'],
+        '\u{1EE85}' => &['\u{0648}'],
+        '\u{1EE86}' => &['\u{0632}'],
+        '\u{1EE87}' => &['\u{062D}'],
+        '\u{1EE88}' => &['\u{0637}'],
+        '\u{1EE89}' => &['\u{064A}'],
+        '\u{1EE8B}' => &['\u{0644}'],
+        '\u{1EE8C}' => &['\u{0645}'],
+        '\u{1EE8D}' => &['\u{0646}'],
+        '\u{1EE8E}' => &['\u{0633}'],
+        '\u{1EE8F}' => &['\u{0639}'],
+        '\u{1EE90}' => &['\u{0641}'],
+        '\u{1EE91}' => &['\u{0635}'],
+        '\u{1EE92}' => &['\u{0642}'],
+        '\u{1EE93}' => &['\u{0631}'],
+        '\u{1EE94}' => &['\u{0634}'],
+        '\u{1EE95}' => &['\u{062A}'],
+        '\u{1EE96}' => &['\u{062B}'],
+        '\u{1EE97}' => &['\u{062E}'],
+        '\u{1EE98}' => &['\u{0630}'],
+        '\u{1EE99}' => &['\u{0636}'],
+        '\u{1EE9A}' => &['\u{0638}'],
+        '\u{1EE9B}' => &['\u{063A}'],
+        '\u{1EEA1}' => &['\u{0628}'],
+        '\u{1EEA2}' => &['\u{062C}'],
+        '\u{1EEA3}' => &['\u{062F}'],
+        '\u{1EEA5}' => &['\u{0648}'],
+        '\u{1EEA6}' => &['\u{0632}'],
+        '\u{1EEA7}' => &['\u{062D}'],
+        '\u{1EEA8}' => &['\u{0637}'],
+        '\u{1EEA9}' => &['\u{064A}'],
+        '\u{1EEAB}' => &['\u{0644}'],
+        '\u{1EEAC}' => &['\u{0645}'],
+        '\u{1EEAD}' => &['\u{0646}'],
+        '\u{1EEAE}' => &['\u{0633}'],
+        '\u{1EEAF}' => &['\u{0639}'],
+        '\u{1EEB0}' => &['\u{0641}'],
+        '\u{1EEB1}' => &['\u{0635}'],
+        '\u{1EEB2}' => &['\u{0642}'],
+        '\u{1EEB3}' => &['\u{0631}'],
+        '\u{1EEB4}' => &['\u{0634}'],
+        '\u{1EEB5}' => &['\u{062A}'],
+        '\u{1EEB6}' => &['\u{062B}'],
+        '\u{1EEB7}' => &['\u{062E}'],
+        '\u{1EEB8}' => &['\u{0630}'],
+        '\u{1EEB9}' => &['\u{0636}'],
+        '\u{1EEBA}' => &['\u{0638}'],
+        '\u{1EEBB}' => &['\u{063A}'],
+        '\u{1F100}' => &['\u{0030}', '\u{002E}'],
+        '\u{1F101}' => &['\u{0030}', '\u{002C}'],
+        '\u{1F102}' => &['\u{0031}', '\u{002C}'],
+        '\u{1F103}' => &['\u{0032}', '\u{002C}'],
+        '\u{1F104}' => &['\u{0033}', '\u{002C}'],
+        '\u{1F105}' => &['\u{0034}', '\u{002C}'],
+        '\u{1F106}' => &['\u{0035}', '\u{002C}'],
+        '\u{1F107}' => &['\u{0036}', '\u{002C}'],
+        '\u{1F108}' => &['\u{0037}', '\u{002C}'],
+        '\u{1F109}' => &['\u{0038}', '\u{002C}'],
+        '\u{1F10A}' => &['\u{0039}', '\u{002C}'],
+        '\u{1F110}' => &['\u{0028}', '\u{0041}', '\u{0029}'],
+        '\u{1F111}' => &['\u{0028}', '\u{0042}', '\u{0029}'],
+        '\u{1F112}' => &['\u{0028}', '\u{0043}', '\u{0029}'],
+        '\u{1F113}' => &['\u{0028}', '\u{0044}', '\u{0029}'],
+        '\u{1F114}' => &['\u{0028}', '\u{0045}', '\u{0029}'],
+        '\u{1F115}' => &['\u{0028}', '\u{0046}', '\u{0029}'],
+        '\u{1F116}' => &['\u{0028}', '\u{0047}', '\u{0029}'],
+        '\u{1F117}' => &['\u{0028}', '\u{0048}', '\u{0029}'],
+        '\u{1F118}' => &['\u{0028}', '\u{0049}', '\u{0029}'],
+        '\u{1F119}' => &['\u{0028}', '\u{004A}', '\u{0029}'],
+        '\u{1F11A}' => &['\u{0028}', '\u{004B}', '\u{0029}'],
+        '\u{1F11B}' => &['\u{0028}', '\u{004C}', '\u{0029}'],
+        '\u{1F11C}' => &['\u{0028}', '\u{004D}', '\u{0029}'],
+        '\u{1F11D}' => &['\u{0028}', '\u{004E}', '\u{0029}'],
+        '\u{1F11E}' => &['\u{0028}', '\u{004F}', '\u{0029}'],
+        '\u{1F11F}' => &['\u{0028}', '\u{0050}', '\u{0029}'],
+        '\u{1F120}' => &['\u{0028}', '\u{0051}', '\u{0029}'],
+        '\u{1F121}' => &['\u{0028}', '\u{0052}', '\u{0029}'],
+        '\u{1F122}' => &['\u{0028}', '\u{0053}', '\u{0029}'],
+        '\u{1F123}' => &['\u{0028}', '\u{0054}', '\u{0029}'],
+        '\u{1F124}' => &['\u{0028}', '\u{0055}', '\u{0029}'],
+        '\u{1F125}' => &['\u{0028}', '\u{0056}', '\u{0029}'],
+        '\u{1F126}' => &['\u{0028}', '\u{0057}', '\u{0029}'],
+        '\u{1F127}' => &['\u{0028}', '\u{0058}', '\u{0029}'],
+        '\u{1F128}' => &['\u{0028}', '\u{0059}', '\u{0029}'],
+        '\u{1F129}' => &['\u{0028}', '\u{005A}', '\u{0029}'],
+        '\u{1F12A}' => &['\u{3014}', '\u{0053}', '\u{3015}'],
+        '\u{1F12B}' => &['\u{0043}'],
+        '\u{1F12C}' => &['\u{0052}'],
+        '\u{1F12D}' => &['\u{0043}', '\u{0044}'],
+        '\u{1F12E}' => &['\u{0057}', '\u{005A}'],
+        '\u{1F130}' => &['\u{0041}'],
+        '\u{1F131}' => &['\u{0042}'],
+        '\u{1F132}' => &['\u{0043}'],
+        '\u{1F133}' => &['\u{0044}'],
+        '\u{1F134}' => &['\u{0045}'],
+        '\u{1F135}' => &['\u{0046}'],
+        '\u{1F136}' => &['\u{0047}'],
+        '\u{1F137}' => &['\u{0048}'],
+        '\u{1F138}' => &['\u{0049}'],
+        '\u{1F139}' => &['\u{004A}'],
+        '\u{1F13A}' => &['\u{004B}'],
+        '\u{1F13B}' => &['\u{004C}'],
+        '\u{1F13C}' => &['\u{004D}'],
+        '\u{1F13D}' => &['\u{004E}'],
+        '\u{1F13E}' => &['\u{004F}'],
+        '\u{1F13F}' => &['\u{0050}'],
+        '\u{1F140}' => &['\u{0051}'],
+        '\u{1F141}' => &['\u{0052}'],
+        '\u{1F142}' => &['\u{0053}'],
+        '\u{1F143}' => &['\u{0054}'],
+        '\u{1F144}' => &['\u{0055}'],
+        '\u{1F145}' => &['\u{0056}'],
+        '\u{1F146}' => &['\u{0057}'],
+        '\u{1F147}' => &['\u{0058}'],
+        '\u{1F148}' => &['\u{0059}'],
+        '\u{1F149}' => &['\u{005A}'],
+        '\u{1F14A}' => &['\u{0048}', '\u{0056}'],
+        '\u{1F14B}' => &['\u{004D}', '\u{0056}'],
+        '\u{1F14C}' => &['\u{0053}', '\u{0044}'],
+        '\u{1F14D}' => &['\u{0053}', '\u{0053}'],
+        '\u{1F14E}' => &['\u{0050}', '\u{0050}', '\u{0056}'],
+        '\u{1F14F}' => &['\u{0057}', '\u{0043}'],
+        '\u{1F16A}' => &['\u{004D}', '\u{0043}'],
+        '\u{1F16B}' => &['\u{004D}', '\u{0044}'],
+        '\u{1F190}' => &['\u{0044}', '\u{004A}'],
+        '\u{1F200}' => &['\u{307B}', '\u{304B}'],
+        '\u{1F201}' => &['\u{30B3}', '\u{30B3}'],
+        '\u{1F202}' => &['\u{30B5}'],
+        '\u{1F210}' => &['\u{624B}'],
+        '\u{1F211}' => &['\u{5B57}'],
+        '\u{1F212}' => &['\u{53CC}'],
+        '\u{1F213}' => &['\u{30C6}', '\u{3099}'],
+        '\u{1F214}' => &['\u{4E8C}'],
+        '\u{1F215}' => &['\u{591A}'],
+        '\u{1F216}' => &['\u{89E3}'],
+        '\u{1F217}' => &['\u{5929}'],
+        '\u{1F218}' => &['\u{4EA4}'],
+        '\u{1F219}' => &['\u{6620}'],
+        '\u{1F21A}' => &['\u{7121}'],
+        '\u{1F21B}' => &['\u{6599}'],
+        '\u{1F21C}' => &['\u{524D}'],
+        '\u{1F21D}' => &['\u{5F8C}'],
+        '\u{1F21E}' => &['\u{518D}'],
+        '\u{1F21F}' => &['\u{65B0}'],
+        '\u{1F220}' => &['\u{521D}'],
+        '\u{1F221}' => &['\u{7D42}'],
+        '\u{1F222}' => &['\u{751F}'],
+        '\u{1F223}' => &['\u{8CA9}'],
+        '\u{1F224}' => &['\u{58F0}'],
+        '\u{1F225}' => &['\u{5439}'],
+        '\u{1F226}' => &['\u{6F14}'],
+        '\u{1F227}' => &['\u{6295}'],
+        '\u{1F228}' => &['\u{6355}'],
+        '\u{1F229}' => &['\u{4E00}'],
+        '\u{1F22A}' => &['\u{4E09}'],
+        '\u{1F22B}' => &['\u{904A}'],
+        '\u{1F22C}' => &['\u{5DE6}'],
+        '\u{1F22D}' => &['\u{4E2D}'],
+        '\u{1F22E}' => &['\u{53F3}'],
+        '\u{1F22F}' => &['\u{6307}'],
+        '\u{1F230}' => &['\u{8D70}'],
+        '\u{1F231}' => &['\u{6253}'],
+        '\u{1F232}' => &['\u{7981}'],
+        '\u{1F233}' => &['\u{7A7A}'],
+        '\u{1F234}' => &['\u{5408}'],
+        '\u{1F235}' => &['\u{6E80}'],
+        '\u{1F236}' => &['\u{6709}'],
+        '\u{1F237}' => &['\u{6708}'],
+        '\u{1F238}' => &['\u{7533}'],
+        '\u{1F239}' => &['\u{5272}'],
+        '\u{1F23A}' => &['\u{55B6}'],
+        '\u{1F23B}' => &['\u{914D}'],
+        '\u{1F240}' => &['\u{3014}', '\u{672C}', '\u{3015}'],
+        '\u{1F241}' => &['\u{3014}', '\u{4E09}', '\u{3015}'],
+        '\u{1F242}' => &['\u{3014}', '\u{4E8C}', '\u{3015}'],
+        '\u{1F243}' => &['\u{3014}', '\u{5B89}', '\u{3015}'],
+        '\u{1F244}' => &['\u{3014}', '\u{70B9}', '\u{3015}'],
+        '\u{1F245}' => &['\u{3014}', '\u{6253}', '\u{3015}'],
+        '\u{1F246}' => &['\u{3014}', '\u{76D7}', '\u{3015}'],
+        '\u{1F247}' => &['\u{3014}', '\u{52DD}', '\u{3015}'],
+        '\u{1F248}' => &['\u{3014}', '\u{6557}', '\u{3015}'],
+        '\u{1F250}' => &['\u{5F97}'],
+        '\u{1F251}' => &['\u{53EF}'],
+        _ => return None,
+    })
 }
 
 #[inline]
@@ -9765,6 +9765,442 @@
 }
 
 #[inline]
+pub fn qc_nfkc(c: char) -> IsNormalized {
+    match c {
+        '\u{00A0}' => No,
+        '\u{00A8}' => No,
+        '\u{00AA}' => No,
+        '\u{00AF}' => No,
+        '\u{00B2}'...'\u{00B3}' => No,
+        '\u{00B4}' => No,
+        '\u{00B5}' => No,
+        '\u{00B8}' => No,
+        '\u{00B9}' => No,
+        '\u{00BA}' => No,
+        '\u{00BC}'...'\u{00BE}' => No,
+        '\u{0132}'...'\u{0133}' => No,
+        '\u{013F}'...'\u{0140}' => No,
+        '\u{0149}' => No,
+        '\u{017F}' => No,
+        '\u{01C4}'...'\u{01CC}' => No,
+        '\u{01F1}'...'\u{01F3}' => No,
+        '\u{02B0}'...'\u{02B8}' => No,
+        '\u{02D8}'...'\u{02DD}' => No,
+        '\u{02E0}'...'\u{02E4}' => No,
+        '\u{0340}'...'\u{0341}' => No,
+        '\u{0343}'...'\u{0344}' => No,
+        '\u{0374}' => No,
+        '\u{037A}' => No,
+        '\u{037E}' => No,
+        '\u{0384}'...'\u{0385}' => No,
+        '\u{0387}' => No,
+        '\u{03D0}'...'\u{03D6}' => No,
+        '\u{03F0}'...'\u{03F2}' => No,
+        '\u{03F4}'...'\u{03F5}' => No,
+        '\u{03F9}' => No,
+        '\u{0587}' => No,
+        '\u{0675}'...'\u{0678}' => No,
+        '\u{0958}'...'\u{095F}' => No,
+        '\u{09DC}'...'\u{09DD}' => No,
+        '\u{09DF}' => No,
+        '\u{0A33}' => No,
+        '\u{0A36}' => No,
+        '\u{0A59}'...'\u{0A5B}' => No,
+        '\u{0A5E}' => No,
+        '\u{0B5C}'...'\u{0B5D}' => No,
+        '\u{0E33}' => No,
+        '\u{0EB3}' => No,
+        '\u{0EDC}'...'\u{0EDD}' => No,
+        '\u{0F0C}' => No,
+        '\u{0F43}' => No,
+        '\u{0F4D}' => No,
+        '\u{0F52}' => No,
+        '\u{0F57}' => No,
+        '\u{0F5C}' => No,
+        '\u{0F69}' => No,
+        '\u{0F73}' => No,
+        '\u{0F75}'...'\u{0F79}' => No,
+        '\u{0F81}' => No,
+        '\u{0F93}' => No,
+        '\u{0F9D}' => No,
+        '\u{0FA2}' => No,
+        '\u{0FA7}' => No,
+        '\u{0FAC}' => No,
+        '\u{0FB9}' => No,
+        '\u{10FC}' => No,
+        '\u{1D2C}'...'\u{1D2E}' => No,
+        '\u{1D30}'...'\u{1D3A}' => No,
+        '\u{1D3C}'...'\u{1D4D}' => No,
+        '\u{1D4F}'...'\u{1D6A}' => No,
+        '\u{1D78}' => No,
+        '\u{1D9B}'...'\u{1DBF}' => No,
+        '\u{1E9A}'...'\u{1E9B}' => No,
+        '\u{1F71}' => No,
+        '\u{1F73}' => No,
+        '\u{1F75}' => No,
+        '\u{1F77}' => No,
+        '\u{1F79}' => No,
+        '\u{1F7B}' => No,
+        '\u{1F7D}' => No,
+        '\u{1FBB}' => No,
+        '\u{1FBD}' => No,
+        '\u{1FBE}' => No,
+        '\u{1FBF}'...'\u{1FC1}' => No,
+        '\u{1FC9}' => No,
+        '\u{1FCB}' => No,
+        '\u{1FCD}'...'\u{1FCF}' => No,
+        '\u{1FD3}' => No,
+        '\u{1FDB}' => No,
+        '\u{1FDD}'...'\u{1FDF}' => No,
+        '\u{1FE3}' => No,
+        '\u{1FEB}' => No,
+        '\u{1FED}'...'\u{1FEF}' => No,
+        '\u{1FF9}' => No,
+        '\u{1FFB}' => No,
+        '\u{1FFD}'...'\u{1FFE}' => No,
+        '\u{2000}'...'\u{200A}' => No,
+        '\u{2011}' => No,
+        '\u{2017}' => No,
+        '\u{2024}'...'\u{2026}' => No,
+        '\u{202F}' => No,
+        '\u{2033}'...'\u{2034}' => No,
+        '\u{2036}'...'\u{2037}' => No,
+        '\u{203C}' => No,
+        '\u{203E}' => No,
+        '\u{2047}'...'\u{2049}' => No,
+        '\u{2057}' => No,
+        '\u{205F}' => No,
+        '\u{2070}' => No,
+        '\u{2071}' => No,
+        '\u{2074}'...'\u{2079}' => No,
+        '\u{207A}'...'\u{207C}' => No,
+        '\u{207D}' => No,
+        '\u{207E}' => No,
+        '\u{207F}' => No,
+        '\u{2080}'...'\u{2089}' => No,
+        '\u{208A}'...'\u{208C}' => No,
+        '\u{208D}' => No,
+        '\u{208E}' => No,
+        '\u{2090}'...'\u{209C}' => No,
+        '\u{20A8}' => No,
+        '\u{2100}'...'\u{2101}' => No,
+        '\u{2102}' => No,
+        '\u{2103}' => No,
+        '\u{2105}'...'\u{2106}' => No,
+        '\u{2107}' => No,
+        '\u{2109}' => No,
+        '\u{210A}'...'\u{2113}' => No,
+        '\u{2115}' => No,
+        '\u{2116}' => No,
+        '\u{2119}'...'\u{211D}' => No,
+        '\u{2120}'...'\u{2122}' => No,
+        '\u{2124}' => No,
+        '\u{2126}' => No,
+        '\u{2128}' => No,
+        '\u{212A}'...'\u{212D}' => No,
+        '\u{212F}'...'\u{2131}' => No,
+        '\u{2133}'...'\u{2134}' => No,
+        '\u{2135}'...'\u{2138}' => No,
+        '\u{2139}' => No,
+        '\u{213B}' => No,
+        '\u{213C}'...'\u{213F}' => No,
+        '\u{2140}' => No,
+        '\u{2145}'...'\u{2149}' => No,
+        '\u{2150}'...'\u{215F}' => No,
+        '\u{2160}'...'\u{217F}' => No,
+        '\u{2189}' => No,
+        '\u{222C}'...'\u{222D}' => No,
+        '\u{222F}'...'\u{2230}' => No,
+        '\u{2329}' => No,
+        '\u{232A}' => No,
+        '\u{2460}'...'\u{249B}' => No,
+        '\u{249C}'...'\u{24E9}' => No,
+        '\u{24EA}' => No,
+        '\u{2A0C}' => No,
+        '\u{2A74}'...'\u{2A76}' => No,
+        '\u{2ADC}' => No,
+        '\u{2C7C}'...'\u{2C7D}' => No,
+        '\u{2D6F}' => No,
+        '\u{2E9F}' => No,
+        '\u{2EF3}' => No,
+        '\u{2F00}'...'\u{2FD5}' => No,
+        '\u{3000}' => No,
+        '\u{3036}' => No,
+        '\u{3038}'...'\u{303A}' => No,
+        '\u{309B}'...'\u{309C}' => No,
+        '\u{309F}' => No,
+        '\u{30FF}' => No,
+        '\u{3131}'...'\u{318E}' => No,
+        '\u{3192}'...'\u{3195}' => No,
+        '\u{3196}'...'\u{319F}' => No,
+        '\u{3200}'...'\u{321E}' => No,
+        '\u{3220}'...'\u{3229}' => No,
+        '\u{322A}'...'\u{3247}' => No,
+        '\u{3250}' => No,
+        '\u{3251}'...'\u{325F}' => No,
+        '\u{3260}'...'\u{327E}' => No,
+        '\u{3280}'...'\u{3289}' => No,
+        '\u{328A}'...'\u{32B0}' => No,
+        '\u{32B1}'...'\u{32BF}' => No,
+        '\u{32C0}'...'\u{32FE}' => No,
+        '\u{3300}'...'\u{33FF}' => No,
+        '\u{A69C}'...'\u{A69D}' => No,
+        '\u{A770}' => No,
+        '\u{A7F8}'...'\u{A7F9}' => No,
+        '\u{AB5C}'...'\u{AB5F}' => No,
+        '\u{F900}'...'\u{FA0D}' => No,
+        '\u{FA10}' => No,
+        '\u{FA12}' => No,
+        '\u{FA15}'...'\u{FA1E}' => No,
+        '\u{FA20}' => No,
+        '\u{FA22}' => No,
+        '\u{FA25}'...'\u{FA26}' => No,
+        '\u{FA2A}'...'\u{FA6D}' => No,
+        '\u{FA70}'...'\u{FAD9}' => No,
+        '\u{FB00}'...'\u{FB06}' => No,
+        '\u{FB13}'...'\u{FB17}' => No,
+        '\u{FB1D}' => No,
+        '\u{FB1F}'...'\u{FB28}' => No,
+        '\u{FB29}' => No,
+        '\u{FB2A}'...'\u{FB36}' => No,
+        '\u{FB38}'...'\u{FB3C}' => No,
+        '\u{FB3E}' => No,
+        '\u{FB40}'...'\u{FB41}' => No,
+        '\u{FB43}'...'\u{FB44}' => No,
+        '\u{FB46}'...'\u{FBB1}' => No,
+        '\u{FBD3}'...'\u{FD3D}' => No,
+        '\u{FD50}'...'\u{FD8F}' => No,
+        '\u{FD92}'...'\u{FDC7}' => No,
+        '\u{FDF0}'...'\u{FDFB}' => No,
+        '\u{FDFC}' => No,
+        '\u{FE10}'...'\u{FE16}' => No,
+        '\u{FE17}' => No,
+        '\u{FE18}' => No,
+        '\u{FE19}' => No,
+        '\u{FE30}' => No,
+        '\u{FE31}'...'\u{FE32}' => No,
+        '\u{FE33}'...'\u{FE34}' => No,
+        '\u{FE35}' => No,
+        '\u{FE36}' => No,
+        '\u{FE37}' => No,
+        '\u{FE38}' => No,
+        '\u{FE39}' => No,
+        '\u{FE3A}' => No,
+        '\u{FE3B}' => No,
+        '\u{FE3C}' => No,
+        '\u{FE3D}' => No,
+        '\u{FE3E}' => No,
+        '\u{FE3F}' => No,
+        '\u{FE40}' => No,
+        '\u{FE41}' => No,
+        '\u{FE42}' => No,
+        '\u{FE43}' => No,
+        '\u{FE44}' => No,
+        '\u{FE47}' => No,
+        '\u{FE48}' => No,
+        '\u{FE49}'...'\u{FE4C}' => No,
+        '\u{FE4D}'...'\u{FE4F}' => No,
+        '\u{FE50}'...'\u{FE52}' => No,
+        '\u{FE54}'...'\u{FE57}' => No,
+        '\u{FE58}' => No,
+        '\u{FE59}' => No,
+        '\u{FE5A}' => No,
+        '\u{FE5B}' => No,
+        '\u{FE5C}' => No,
+        '\u{FE5D}' => No,
+        '\u{FE5E}' => No,
+        '\u{FE5F}'...'\u{FE61}' => No,
+        '\u{FE62}' => No,
+        '\u{FE63}' => No,
+        '\u{FE64}'...'\u{FE66}' => No,
+        '\u{FE68}' => No,
+        '\u{FE69}' => No,
+        '\u{FE6A}'...'\u{FE6B}' => No,
+        '\u{FE70}'...'\u{FE72}' => No,
+        '\u{FE74}' => No,
+        '\u{FE76}'...'\u{FEFC}' => No,
+        '\u{FF01}'...'\u{FF03}' => No,
+        '\u{FF04}' => No,
+        '\u{FF05}'...'\u{FF07}' => No,
+        '\u{FF08}' => No,
+        '\u{FF09}' => No,
+        '\u{FF0A}' => No,
+        '\u{FF0B}' => No,
+        '\u{FF0C}' => No,
+        '\u{FF0D}' => No,
+        '\u{FF0E}'...'\u{FF0F}' => No,
+        '\u{FF10}'...'\u{FF19}' => No,
+        '\u{FF1A}'...'\u{FF1B}' => No,
+        '\u{FF1C}'...'\u{FF1E}' => No,
+        '\u{FF1F}'...'\u{FF20}' => No,
+        '\u{FF21}'...'\u{FF3A}' => No,
+        '\u{FF3B}' => No,
+        '\u{FF3C}' => No,
+        '\u{FF3D}' => No,
+        '\u{FF3E}' => No,
+        '\u{FF3F}' => No,
+        '\u{FF40}' => No,
+        '\u{FF41}'...'\u{FF5A}' => No,
+        '\u{FF5B}' => No,
+        '\u{FF5C}' => No,
+        '\u{FF5D}' => No,
+        '\u{FF5E}' => No,
+        '\u{FF5F}' => No,
+        '\u{FF60}' => No,
+        '\u{FF61}' => No,
+        '\u{FF62}' => No,
+        '\u{FF63}' => No,
+        '\u{FF64}'...'\u{FF65}' => No,
+        '\u{FF66}'...'\u{FF6F}' => No,
+        '\u{FF70}' => No,
+        '\u{FF71}'...'\u{FF9D}' => No,
+        '\u{FF9E}'...'\u{FF9F}' => No,
+        '\u{FFA0}'...'\u{FFBE}' => No,
+        '\u{FFC2}'...'\u{FFC7}' => No,
+        '\u{FFCA}'...'\u{FFCF}' => No,
+        '\u{FFD2}'...'\u{FFD7}' => No,
+        '\u{FFDA}'...'\u{FFDC}' => No,
+        '\u{FFE0}'...'\u{FFE1}' => No,
+        '\u{FFE2}' => No,
+        '\u{FFE3}' => No,
+        '\u{FFE4}' => No,
+        '\u{FFE5}'...'\u{FFE6}' => No,
+        '\u{FFE8}' => No,
+        '\u{FFE9}'...'\u{FFEC}' => No,
+        '\u{FFED}'...'\u{FFEE}' => No,
+        '\u{1D15E}'...'\u{1D164}' => No,
+        '\u{1D1BB}'...'\u{1D1C0}' => No,
+        '\u{1D400}'...'\u{1D454}' => No,
+        '\u{1D456}'...'\u{1D49C}' => No,
+        '\u{1D49E}'...'\u{1D49F}' => No,
+        '\u{1D4A2}' => No,
+        '\u{1D4A5}'...'\u{1D4A6}' => No,
+        '\u{1D4A9}'...'\u{1D4AC}' => No,
+        '\u{1D4AE}'...'\u{1D4B9}' => No,
+        '\u{1D4BB}' => No,
+        '\u{1D4BD}'...'\u{1D4C3}' => No,
+        '\u{1D4C5}'...'\u{1D505}' => No,
+        '\u{1D507}'...'\u{1D50A}' => No,
+        '\u{1D50D}'...'\u{1D514}' => No,
+        '\u{1D516}'...'\u{1D51C}' => No,
+        '\u{1D51E}'...'\u{1D539}' => No,
+        '\u{1D53B}'...'\u{1D53E}' => No,
+        '\u{1D540}'...'\u{1D544}' => No,
+        '\u{1D546}' => No,
+        '\u{1D54A}'...'\u{1D550}' => No,
+        '\u{1D552}'...'\u{1D6A5}' => No,
+        '\u{1D6A8}'...'\u{1D6C0}' => No,
+        '\u{1D6C1}' => No,
+        '\u{1D6C2}'...'\u{1D6DA}' => No,
+        '\u{1D6DB}' => No,
+        '\u{1D6DC}'...'\u{1D6FA}' => No,
+        '\u{1D6FB}' => No,
+        '\u{1D6FC}'...'\u{1D714}' => No,
+        '\u{1D715}' => No,
+        '\u{1D716}'...'\u{1D734}' => No,
+        '\u{1D735}' => No,
+        '\u{1D736}'...'\u{1D74E}' => No,
+        '\u{1D74F}' => No,
+        '\u{1D750}'...'\u{1D76E}' => No,
+        '\u{1D76F}' => No,
+        '\u{1D770}'...'\u{1D788}' => No,
+        '\u{1D789}' => No,
+        '\u{1D78A}'...'\u{1D7A8}' => No,
+        '\u{1D7A9}' => No,
+        '\u{1D7AA}'...'\u{1D7C2}' => No,
+        '\u{1D7C3}' => No,
+        '\u{1D7C4}'...'\u{1D7CB}' => No,
+        '\u{1D7CE}'...'\u{1D7FF}' => No,
+        '\u{1EE00}'...'\u{1EE03}' => No,
+        '\u{1EE05}'...'\u{1EE1F}' => No,
+        '\u{1EE21}'...'\u{1EE22}' => No,
+        '\u{1EE24}' => No,
+        '\u{1EE27}' => No,
+        '\u{1EE29}'...'\u{1EE32}' => No,
+        '\u{1EE34}'...'\u{1EE37}' => No,
+        '\u{1EE39}' => No,
+        '\u{1EE3B}' => No,
+        '\u{1EE42}' => No,
+        '\u{1EE47}' => No,
+        '\u{1EE49}' => No,
+        '\u{1EE4B}' => No,
+        '\u{1EE4D}'...'\u{1EE4F}' => No,
+        '\u{1EE51}'...'\u{1EE52}' => No,
+        '\u{1EE54}' => No,
+        '\u{1EE57}' => No,
+        '\u{1EE59}' => No,
+        '\u{1EE5B}' => No,
+        '\u{1EE5D}' => No,
+        '\u{1EE5F}' => No,
+        '\u{1EE61}'...'\u{1EE62}' => No,
+        '\u{1EE64}' => No,
+        '\u{1EE67}'...'\u{1EE6A}' => No,
+        '\u{1EE6C}'...'\u{1EE72}' => No,
+        '\u{1EE74}'...'\u{1EE77}' => No,
+        '\u{1EE79}'...'\u{1EE7C}' => No,
+        '\u{1EE7E}' => No,
+        '\u{1EE80}'...'\u{1EE89}' => No,
+        '\u{1EE8B}'...'\u{1EE9B}' => No,
+        '\u{1EEA1}'...'\u{1EEA3}' => No,
+        '\u{1EEA5}'...'\u{1EEA9}' => No,
+        '\u{1EEAB}'...'\u{1EEBB}' => No,
+        '\u{1F100}'...'\u{1F10A}' => No,
+        '\u{1F110}'...'\u{1F12E}' => No,
+        '\u{1F130}'...'\u{1F14F}' => No,
+        '\u{1F16A}'...'\u{1F16B}' => No,
+        '\u{1F190}' => No,
+        '\u{1F200}'...'\u{1F202}' => No,
+        '\u{1F210}'...'\u{1F23B}' => No,
+        '\u{1F240}'...'\u{1F248}' => No,
+        '\u{1F250}'...'\u{1F251}' => No,
+        '\u{2F800}'...'\u{2FA1D}' => No,
+        '\u{0300}'...'\u{0304}' => Maybe,
+        '\u{0306}'...'\u{030C}' => Maybe,
+        '\u{030F}' => Maybe,
+        '\u{0311}' => Maybe,
+        '\u{0313}'...'\u{0314}' => Maybe,
+        '\u{031B}' => Maybe,
+        '\u{0323}'...'\u{0328}' => Maybe,
+        '\u{032D}'...'\u{032E}' => Maybe,
+        '\u{0330}'...'\u{0331}' => Maybe,
+        '\u{0338}' => Maybe,
+        '\u{0342}' => Maybe,
+        '\u{0345}' => Maybe,
+        '\u{0653}'...'\u{0655}' => Maybe,
+        '\u{093C}' => Maybe,
+        '\u{09BE}' => Maybe,
+        '\u{09D7}' => Maybe,
+        '\u{0B3E}' => Maybe,
+        '\u{0B56}' => Maybe,
+        '\u{0B57}' => Maybe,
+        '\u{0BBE}' => Maybe,
+        '\u{0BD7}' => Maybe,
+        '\u{0C56}' => Maybe,
+        '\u{0CC2}' => Maybe,
+        '\u{0CD5}'...'\u{0CD6}' => Maybe,
+        '\u{0D3E}' => Maybe,
+        '\u{0D57}' => Maybe,
+        '\u{0DCA}' => Maybe,
+        '\u{0DCF}' => Maybe,
+        '\u{0DDF}' => Maybe,
+        '\u{102E}' => Maybe,
+        '\u{1161}'...'\u{1175}' => Maybe,
+        '\u{11A8}'...'\u{11C2}' => Maybe,
+        '\u{1B35}' => Maybe,
+        '\u{3099}'...'\u{309A}' => Maybe,
+        '\u{110BA}' => Maybe,
+        '\u{11127}' => Maybe,
+        '\u{1133E}' => Maybe,
+        '\u{11357}' => Maybe,
+        '\u{114B0}' => Maybe,
+        '\u{114BA}' => Maybe,
+        '\u{114BD}' => Maybe,
+        '\u{115AF}' => Maybe,
+        _ => Yes,
+    }
+}
+
+#[inline]
 pub fn qc_nfd(c: char) -> IsNormalized {
     match c {
         '\u{00C0}'...'\u{00C5}' => No,
@@ -10011,6 +10447,554 @@
         '\u{2F800}'...'\u{2FA1D}' => No,
         _ => Yes,
     }
+}
+
+#[inline]
+pub fn qc_nfkd(c: char) -> IsNormalized {
+    match c {
+        '\u{00A0}' => No,
+        '\u{00A8}' => No,
+        '\u{00AA}' => No,
+        '\u{00AF}' => No,
+        '\u{00B2}'...'\u{00B3}' => No,
+        '\u{00B4}' => No,
+        '\u{00B5}' => No,
+        '\u{00B8}' => No,
+        '\u{00B9}' => No,
+        '\u{00BA}' => No,
+        '\u{00BC}'...'\u{00BE}' => No,
+        '\u{00C0}'...'\u{00C5}' => No,
+        '\u{00C7}'...'\u{00CF}' => No,
+        '\u{00D1}'...'\u{00D6}' => No,
+        '\u{00D9}'...'\u{00DD}' => No,
+        '\u{00E0}'...'\u{00E5}' => No,
+        '\u{00E7}'...'\u{00EF}' => No,
+        '\u{00F1}'...'\u{00F6}' => No,
+        '\u{00F9}'...'\u{00FD}' => No,
+        '\u{00FF}'...'\u{010F}' => No,
+        '\u{0112}'...'\u{0125}' => No,
+        '\u{0128}'...'\u{0130}' => No,
+        '\u{0132}'...'\u{0137}' => No,
+        '\u{0139}'...'\u{0140}' => No,
+        '\u{0143}'...'\u{0149}' => No,
+        '\u{014C}'...'\u{0151}' => No,
+        '\u{0154}'...'\u{0165}' => No,
+        '\u{0168}'...'\u{017F}' => No,
+        '\u{01A0}'...'\u{01A1}' => No,
+        '\u{01AF}'...'\u{01B0}' => No,
+        '\u{01C4}'...'\u{01DC}' => No,
+        '\u{01DE}'...'\u{01E3}' => No,
+        '\u{01E6}'...'\u{01F5}' => No,
+        '\u{01F8}'...'\u{021B}' => No,
+        '\u{021E}'...'\u{021F}' => No,
+        '\u{0226}'...'\u{0233}' => No,
+        '\u{02B0}'...'\u{02B8}' => No,
+        '\u{02D8}'...'\u{02DD}' => No,
+        '\u{02E0}'...'\u{02E4}' => No,
+        '\u{0340}'...'\u{0341}' => No,
+        '\u{0343}'...'\u{0344}' => No,
+        '\u{0374}' => No,
+        '\u{037A}' => No,
+        '\u{037E}' => No,
+        '\u{0384}'...'\u{0385}' => No,
+        '\u{0386}' => No,
+        '\u{0387}' => No,
+        '\u{0388}'...'\u{038A}' => No,
+        '\u{038C}' => No,
+        '\u{038E}'...'\u{0390}' => No,
+        '\u{03AA}'...'\u{03B0}' => No,
+        '\u{03CA}'...'\u{03CE}' => No,
+        '\u{03D0}'...'\u{03D6}' => No,
+        '\u{03F0}'...'\u{03F2}' => No,
+        '\u{03F4}'...'\u{03F5}' => No,
+        '\u{03F9}' => No,
+        '\u{0400}'...'\u{0401}' => No,
+        '\u{0403}' => No,
+        '\u{0407}' => No,
+        '\u{040C}'...'\u{040E}' => No,
+        '\u{0419}' => No,
+        '\u{0439}' => No,
+        '\u{0450}'...'\u{0451}' => No,
+        '\u{0453}' => No,
+        '\u{0457}' => No,
+        '\u{045C}'...'\u{045E}' => No,
+        '\u{0476}'...'\u{0477}' => No,
+        '\u{04C1}'...'\u{04C2}' => No,
+        '\u{04D0}'...'\u{04D3}' => No,
+        '\u{04D6}'...'\u{04D7}' => No,
+        '\u{04DA}'...'\u{04DF}' => No,
+        '\u{04E2}'...'\u{04E7}' => No,
+        '\u{04EA}'...'\u{04F5}' => No,
+        '\u{04F8}'...'\u{04F9}' => No,
+        '\u{0587}' => No,
+        '\u{0622}'...'\u{0626}' => No,
+        '\u{0675}'...'\u{0678}' => No,
+        '\u{06C0}' => No,
+        '\u{06C2}' => No,
+        '\u{06D3}' => No,
+        '\u{0929}' => No,
+        '\u{0931}' => No,
+        '\u{0934}' => No,
+        '\u{0958}'...'\u{095F}' => No,
+        '\u{09CB}'...'\u{09CC}' => No,
+        '\u{09DC}'...'\u{09DD}' => No,
+        '\u{09DF}' => No,
+        '\u{0A33}' => No,
+        '\u{0A36}' => No,
+        '\u{0A59}'...'\u{0A5B}' => No,
+        '\u{0A5E}' => No,
+        '\u{0B48}' => No,
+        '\u{0B4B}'...'\u{0B4C}' => No,
+        '\u{0B5C}'...'\u{0B5D}' => No,
+        '\u{0B94}' => No,
+        '\u{0BCA}'...'\u{0BCC}' => No,
+        '\u{0C48}' => No,
+        '\u{0CC0}' => No,
+        '\u{0CC7}'...'\u{0CC8}' => No,
+        '\u{0CCA}'...'\u{0CCB}' => No,
+        '\u{0D4A}'...'\u{0D4C}' => No,
+        '\u{0DDA}' => No,
+        '\u{0DDC}'...'\u{0DDE}' => No,
+        '\u{0E33}' => No,
+        '\u{0EB3}' => No,
+        '\u{0EDC}'...'\u{0EDD}' => No,
+        '\u{0F0C}' => No,
+        '\u{0F43}' => No,
+        '\u{0F4D}' => No,
+        '\u{0F52}' => No,
+        '\u{0F57}' => No,
+        '\u{0F5C}' => No,
+        '\u{0F69}' => No,
+        '\u{0F73}' => No,
+        '\u{0F75}'...'\u{0F79}' => No,
+        '\u{0F81}' => No,
+        '\u{0F93}' => No,
+        '\u{0F9D}' => No,
+        '\u{0FA2}' => No,
+        '\u{0FA7}' => No,
+        '\u{0FAC}' => No,
+        '\u{0FB9}' => No,
+        '\u{1026}' => No,
+        '\u{10FC}' => No,
+        '\u{1B06}' => No,
+        '\u{1B08}' => No,
+        '\u{1B0A}' => No,
+        '\u{1B0C}' => No,
+        '\u{1B0E}' => No,
+        '\u{1B12}' => No,
+        '\u{1B3B}' => No,
+        '\u{1B3D}' => No,
+        '\u{1B40}'...'\u{1B41}' => No,
+        '\u{1B43}' => No,
+        '\u{1D2C}'...'\u{1D2E}' => No,
+        '\u{1D30}'...'\u{1D3A}' => No,
+        '\u{1D3C}'...'\u{1D4D}' => No,
+        '\u{1D4F}'...'\u{1D6A}' => No,
+        '\u{1D78}' => No,
+        '\u{1D9B}'...'\u{1DBF}' => No,
+        '\u{1E00}'...'\u{1E9B}' => No,
+        '\u{1EA0}'...'\u{1EF9}' => No,
+        '\u{1F00}'...'\u{1F15}' => No,
+        '\u{1F18}'...'\u{1F1D}' => No,
+        '\u{1F20}'...'\u{1F45}' => No,
+        '\u{1F48}'...'\u{1F4D}' => No,
+        '\u{1F50}'...'\u{1F57}' => No,
+        '\u{1F59}' => No,
+        '\u{1F5B}' => No,
+        '\u{1F5D}' => No,
+        '\u{1F5F}'...'\u{1F7D}' => No,
+        '\u{1F80}'...'\u{1FB4}' => No,
+        '\u{1FB6}'...'\u{1FBC}' => No,
+        '\u{1FBD}' => No,
+        '\u{1FBE}' => No,
+        '\u{1FBF}'...'\u{1FC1}' => No,
+        '\u{1FC2}'...'\u{1FC4}' => No,
+        '\u{1FC6}'...'\u{1FCC}' => No,
+        '\u{1FCD}'...'\u{1FCF}' => No,
+        '\u{1FD0}'...'\u{1FD3}' => No,
+        '\u{1FD6}'...'\u{1FDB}' => No,
+        '\u{1FDD}'...'\u{1FDF}' => No,
+        '\u{1FE0}'...'\u{1FEC}' => No,
+        '\u{1FED}'...'\u{1FEF}' => No,
+        '\u{1FF2}'...'\u{1FF4}' => No,
+        '\u{1FF6}'...'\u{1FFC}' => No,
+        '\u{1FFD}'...'\u{1FFE}' => No,
+        '\u{2000}'...'\u{200A}' => No,
+        '\u{2011}' => No,
+        '\u{2017}' => No,
+        '\u{2024}'...'\u{2026}' => No,
+        '\u{202F}' => No,
+        '\u{2033}'...'\u{2034}' => No,
+        '\u{2036}'...'\u{2037}' => No,
+        '\u{203C}' => No,
+        '\u{203E}' => No,
+        '\u{2047}'...'\u{2049}' => No,
+        '\u{2057}' => No,
+        '\u{205F}' => No,
+        '\u{2070}' => No,
+        '\u{2071}' => No,
+        '\u{2074}'...'\u{2079}' => No,
+        '\u{207A}'...'\u{207C}' => No,
+        '\u{207D}' => No,
+        '\u{207E}' => No,
+        '\u{207F}' => No,
+        '\u{2080}'...'\u{2089}' => No,
+        '\u{208A}'...'\u{208C}' => No,
+        '\u{208D}' => No,
+        '\u{208E}' => No,
+        '\u{2090}'...'\u{209C}' => No,
+        '\u{20A8}' => No,
+        '\u{2100}'...'\u{2101}' => No,
+        '\u{2102}' => No,
+        '\u{2103}' => No,
+        '\u{2105}'...'\u{2106}' => No,
+        '\u{2107}' => No,
+        '\u{2109}' => No,
+        '\u{210A}'...'\u{2113}' => No,
+        '\u{2115}' => No,
+        '\u{2116}' => No,
+        '\u{2119}'...'\u{211D}' => No,
+        '\u{2120}'...'\u{2122}' => No,
+        '\u{2124}' => No,
+        '\u{2126}' => No,
+        '\u{2128}' => No,
+        '\u{212A}'...'\u{212D}' => No,
+        '\u{212F}'...'\u{2131}' => No,
+        '\u{2133}'...'\u{2134}' => No,
+        '\u{2135}'...'\u{2138}' => No,
+        '\u{2139}' => No,
+        '\u{213B}' => No,
+        '\u{213C}'...'\u{213F}' => No,
+        '\u{2140}' => No,
+        '\u{2145}'...'\u{2149}' => No,
+        '\u{2150}'...'\u{215F}' => No,
+        '\u{2160}'...'\u{217F}' => No,
+        '\u{2189}' => No,
+        '\u{219A}'...'\u{219B}' => No,
+        '\u{21AE}' => No,
+        '\u{21CD}' => No,
+        '\u{21CE}'...'\u{21CF}' => No,
+        '\u{2204}' => No,
+        '\u{2209}' => No,
+        '\u{220C}' => No,
+        '\u{2224}' => No,
+        '\u{2226}' => No,
+        '\u{222C}'...'\u{222D}' => No,
+        '\u{222F}'...'\u{2230}' => No,
+        '\u{2241}' => No,
+        '\u{2244}' => No,
+        '\u{2247}' => No,
+        '\u{2249}' => No,
+        '\u{2260}' => No,
+        '\u{2262}' => No,
+        '\u{226D}'...'\u{2271}' => No,
+        '\u{2274}'...'\u{2275}' => No,
+        '\u{2278}'...'\u{2279}' => No,
+        '\u{2280}'...'\u{2281}' => No,
+        '\u{2284}'...'\u{2285}' => No,
+        '\u{2288}'...'\u{2289}' => No,
+        '\u{22AC}'...'\u{22AF}' => No,
+        '\u{22E0}'...'\u{22E3}' => No,
+        '\u{22EA}'...'\u{22ED}' => No,
+        '\u{2329}' => No,
+        '\u{232A}' => No,
+        '\u{2460}'...'\u{249B}' => No,
+        '\u{249C}'...'\u{24E9}' => No,
+        '\u{24EA}' => No,
+        '\u{2A0C}' => No,
+        '\u{2A74}'...'\u{2A76}' => No,
+        '\u{2ADC}' => No,
+        '\u{2C7C}'...'\u{2C7D}' => No,
+        '\u{2D6F}' => No,
+        '\u{2E9F}' => No,
+        '\u{2EF3}' => No,
+        '\u{2F00}'...'\u{2FD5}' => No,
+        '\u{3000}' => No,
+        '\u{3036}' => No,
+        '\u{3038}'...'\u{303A}' => No,
+        '\u{304C}' => No,
+        '\u{304E}' => No,
+        '\u{3050}' => No,
+        '\u{3052}' => No,
+        '\u{3054}' => No,
+        '\u{3056}' => No,
+        '\u{3058}' => No,
+        '\u{305A}' => No,
+        '\u{305C}' => No,
+        '\u{305E}' => No,
+        '\u{3060}' => No,
+        '\u{3062}' => No,
+        '\u{3065}' => No,
+        '\u{3067}' => No,
+        '\u{3069}' => No,
+        '\u{3070}'...'\u{3071}' => No,
+        '\u{3073}'...'\u{3074}' => No,
+        '\u{3076}'...'\u{3077}' => No,
+        '\u{3079}'...'\u{307A}' => No,
+        '\u{307C}'...'\u{307D}' => No,
+        '\u{3094}' => No,
+        '\u{309B}'...'\u{309C}' => No,
+        '\u{309E}' => No,
+        '\u{309F}' => No,
+        '\u{30AC}' => No,
+        '\u{30AE}' => No,
+        '\u{30B0}' => No,
+        '\u{30B2}' => No,
+        '\u{30B4}' => No,
+        '\u{30B6}' => No,
+        '\u{30B8}' => No,
+        '\u{30BA}' => No,
+        '\u{30BC}' => No,
+        '\u{30BE}' => No,
+        '\u{30C0}' => No,
+        '\u{30C2}' => No,
+        '\u{30C5}' => No,
+        '\u{30C7}' => No,
+        '\u{30C9}' => No,
+        '\u{30D0}'...'\u{30D1}' => No,
+        '\u{30D3}'...'\u{30D4}' => No,
+        '\u{30D6}'...'\u{30D7}' => No,
+        '\u{30D9}'...'\u{30DA}' => No,
+        '\u{30DC}'...'\u{30DD}' => No,
+        '\u{30F4}' => No,
+        '\u{30F7}'...'\u{30FA}' => No,
+        '\u{30FE}' => No,
+        '\u{30FF}' => No,
+        '\u{3131}'...'\u{318E}' => No,
+        '\u{3192}'...'\u{3195}' => No,
+        '\u{3196}'...'\u{319F}' => No,
+        '\u{3200}'...'\u{321E}' => No,
+        '\u{3220}'...'\u{3229}' => No,
+        '\u{322A}'...'\u{3247}' => No,
+        '\u{3250}' => No,
+        '\u{3251}'...'\u{325F}' => No,
+        '\u{3260}'...'\u{327E}' => No,
+        '\u{3280}'...'\u{3289}' => No,
+        '\u{328A}'...'\u{32B0}' => No,
+        '\u{32B1}'...'\u{32BF}' => No,
+        '\u{32C0}'...'\u{32FE}' => No,
+        '\u{3300}'...'\u{33FF}' => No,
+        '\u{A69C}'...'\u{A69D}' => No,
+        '\u{A770}' => No,
+        '\u{A7F8}'...'\u{A7F9}' => No,
+        '\u{AB5C}'...'\u{AB5F}' => No,
+        '\u{AC00}'...'\u{D7A3}' => No,
+        '\u{F900}'...'\u{FA0D}' => No,
+        '\u{FA10}' => No,
+        '\u{FA12}' => No,
+        '\u{FA15}'...'\u{FA1E}' => No,
+        '\u{FA20}' => No,
+        '\u{FA22}' => No,
+        '\u{FA25}'...'\u{FA26}' => No,
+        '\u{FA2A}'...'\u{FA6D}' => No,
+        '\u{FA70}'...'\u{FAD9}' => No,
+        '\u{FB00}'...'\u{FB06}' => No,
+        '\u{FB13}'...'\u{FB17}' => No,
+        '\u{FB1D}' => No,
+        '\u{FB1F}'...'\u{FB28}' => No,
+        '\u{FB29}' => No,
+        '\u{FB2A}'...'\u{FB36}' => No,
+        '\u{FB38}'...'\u{FB3C}' => No,
+        '\u{FB3E}' => No,
+        '\u{FB40}'...'\u{FB41}' => No,
+        '\u{FB43}'...'\u{FB44}' => No,
+        '\u{FB46}'...'\u{FBB1}' => No,
+        '\u{FBD3}'...'\u{FD3D}' => No,
+        '\u{FD50}'...'\u{FD8F}' => No,
+        '\u{FD92}'...'\u{FDC7}' => No,
+        '\u{FDF0}'...'\u{FDFB}' => No,
+        '\u{FDFC}' => No,
+        '\u{FE10}'...'\u{FE16}' => No,
+        '\u{FE17}' => No,
+        '\u{FE18}' => No,
+        '\u{FE19}' => No,
+        '\u{FE30}' => No,
+        '\u{FE31}'...'\u{FE32}' => No,
+        '\u{FE33}'...'\u{FE34}' => No,
+        '\u{FE35}' => No,
+        '\u{FE36}' => No,
+        '\u{FE37}' => No,
+        '\u{FE38}' => No,
+        '\u{FE39}' => No,
+        '\u{FE3A}' => No,
+        '\u{FE3B}' => No,
+        '\u{FE3C}' => No,
+        '\u{FE3D}' => No,
+        '\u{FE3E}' => No,
+        '\u{FE3F}' => No,
+        '\u{FE40}' => No,
+        '\u{FE41}' => No,
+        '\u{FE42}' => No,
+        '\u{FE43}' => No,
+        '\u{FE44}' => No,
+        '\u{FE47}' => No,
+        '\u{FE48}' => No,
+        '\u{FE49}'...'\u{FE4C}' => No,
+        '\u{FE4D}'...'\u{FE4F}' => No,
+        '\u{FE50}'...'\u{FE52}' => No,
+        '\u{FE54}'...'\u{FE57}' => No,
+        '\u{FE58}' => No,
+        '\u{FE59}' => No,
+        '\u{FE5A}' => No,
+        '\u{FE5B}' => No,
+        '\u{FE5C}' => No,
+        '\u{FE5D}' => No,
+        '\u{FE5E}' => No,
+        '\u{FE5F}'...'\u{FE61}' => No,
+        '\u{FE62}' => No,
+        '\u{FE63}' => No,
+        '\u{FE64}'...'\u{FE66}' => No,
+        '\u{FE68}' => No,
+        '\u{FE69}' => No,
+        '\u{FE6A}'...'\u{FE6B}' => No,
+        '\u{FE70}'...'\u{FE72}' => No,
+        '\u{FE74}' => No,
+        '\u{FE76}'...'\u{FEFC}' => No,
+        '\u{FF01}'...'\u{FF03}' => No,
+        '\u{FF04}' => No,
+        '\u{FF05}'...'\u{FF07}' => No,
+        '\u{FF08}' => No,
+        '\u{FF09}' => No,
+        '\u{FF0A}' => No,
+        '\u{FF0B}' => No,
+        '\u{FF0C}' => No,
+        '\u{FF0D}' => No,
+        '\u{FF0E}'...'\u{FF0F}' => No,
+        '\u{FF10}'...'\u{FF19}' => No,
+        '\u{FF1A}'...'\u{FF1B}' => No,
+        '\u{FF1C}'...'\u{FF1E}' => No,
+        '\u{FF1F}'...'\u{FF20}' => No,
+        '\u{FF21}'...'\u{FF3A}' => No,
+        '\u{FF3B}' => No,
+        '\u{FF3C}' => No,
+        '\u{FF3D}' => No,
+        '\u{FF3E}' => No,
+        '\u{FF3F}' => No,
+        '\u{FF40}' => No,
+        '\u{FF41}'...'\u{FF5A}' => No,
+        '\u{FF5B}' => No,
+        '\u{FF5C}' => No,
+        '\u{FF5D}' => No,
+        '\u{FF5E}' => No,
+        '\u{FF5F}' => No,
+        '\u{FF60}' => No,
+        '\u{FF61}' => No,
+        '\u{FF62}' => No,
+        '\u{FF63}' => No,
+        '\u{FF64}'...'\u{FF65}' => No,
+        '\u{FF66}'...'\u{FF6F}' => No,
+        '\u{FF70}' => No,
+        '\u{FF71}'...'\u{FF9D}' => No,
+        '\u{FF9E}'...'\u{FF9F}' => No,
+        '\u{FFA0}'...'\u{FFBE}' => No,
+        '\u{FFC2}'...'\u{FFC7}' => No,
+        '\u{FFCA}'...'\u{FFCF}' => No,
+        '\u{FFD2}'...'\u{FFD7}' => No,
+        '\u{FFDA}'...'\u{FFDC}' => No,
+        '\u{FFE0}'...'\u{FFE1}' => No,
+        '\u{FFE2}' => No,
+        '\u{FFE3}' => No,
+        '\u{FFE4}' => No,
+        '\u{FFE5}'...'\u{FFE6}' => No,
+        '\u{FFE8}' => No,
+        '\u{FFE9}'...'\u{FFEC}' => No,
+        '\u{FFED}'...'\u{FFEE}' => No,
+        '\u{1109A}' => No,
+        '\u{1109C}' => No,
+        '\u{110AB}' => No,
+        '\u{1112E}'...'\u{1112F}' => No,
+        '\u{1134B}'...'\u{1134C}' => No,
+        '\u{114BB}'...'\u{114BC}' => No,
+        '\u{114BE}' => No,
+        '\u{115BA}'...'\u{115BB}' => No,
+        '\u{1D15E}'...'\u{1D164}' => No,
+        '\u{1D1BB}'...'\u{1D1C0}' => No,
+        '\u{1D400}'...'\u{1D454}' => No,
+        '\u{1D456}'...'\u{1D49C}' => No,
+        '\u{1D49E}'...'\u{1D49F}' => No,
+        '\u{1D4A2}' => No,
+        '\u{1D4A5}'...'\u{1D4A6}' => No,
+        '\u{1D4A9}'...'\u{1D4AC}' => No,
+        '\u{1D4AE}'...'\u{1D4B9}' => No,
+        '\u{1D4BB}' => No,
+        '\u{1D4BD}'...'\u{1D4C3}' => No,
+        '\u{1D4C5}'...'\u{1D505}' => No,
+        '\u{1D507}'...'\u{1D50A}' => No,
+        '\u{1D50D}'...'\u{1D514}' => No,
+        '\u{1D516}'...'\u{1D51C}' => No,
+        '\u{1D51E}'...'\u{1D539}' => No,
+        '\u{1D53B}'...'\u{1D53E}' => No,
+        '\u{1D540}'...'\u{1D544}' => No,
+        '\u{1D546}' => No,
+        '\u{1D54A}'...'\u{1D550}' => No,
+        '\u{1D552}'...'\u{1D6A5}' => No,
+        '\u{1D6A8}'...'\u{1D6C0}' => No,
+        '\u{1D6C1}' => No,
+        '\u{1D6C2}'...'\u{1D6DA}' => No,
+        '\u{1D6DB}' => No,
+        '\u{1D6DC}'...'\u{1D6FA}' => No,
+        '\u{1D6FB}' => No,
+        '\u{1D6FC}'...'\u{1D714}' => No,
+        '\u{1D715}' => No,
+        '\u{1D716}'...'\u{1D734}' => No,
+        '\u{1D735}' => No,
+        '\u{1D736}'...'\u{1D74E}' => No,
+        '\u{1D74F}' => No,
+        '\u{1D750}'...'\u{1D76E}' => No,
+        '\u{1D76F}' => No,
+        '\u{1D770}'...'\u{1D788}' => No,
+        '\u{1D789}' => No,
+        '\u{1D78A}'...'\u{1D7A8}' => No,
+        '\u{1D7A9}' => No,
+        '\u{1D7AA}'...'\u{1D7C2}' => No,
+        '\u{1D7C3}' => No,
+        '\u{1D7C4}'...'\u{1D7CB}' => No,
+        '\u{1D7CE}'...'\u{1D7FF}' => No,
+        '\u{1EE00}'...'\u{1EE03}' => No,
+        '\u{1EE05}'...'\u{1EE1F}' => No,
+        '\u{1EE21}'...'\u{1EE22}' => No,
+        '\u{1EE24}' => No,
+        '\u{1EE27}' => No,
+        '\u{1EE29}'...'\u{1EE32}' => No,
+        '\u{1EE34}'...'\u{1EE37}' => No,
+        '\u{1EE39}' => No,
+        '\u{1EE3B}' => No,
+        '\u{1EE42}' => No,
+        '\u{1EE47}' => No,
+        '\u{1EE49}' => No,
+        '\u{1EE4B}' => No,
+        '\u{1EE4D}'...'\u{1EE4F}' => No,
+        '\u{1EE51}'...'\u{1EE52}' => No,
+        '\u{1EE54}' => No,
+        '\u{1EE57}' => No,
+        '\u{1EE59}' => No,
+        '\u{1EE5B}' => No,
+        '\u{1EE5D}' => No,
+        '\u{1EE5F}' => No,
+        '\u{1EE61}'...'\u{1EE62}' => No,
+        '\u{1EE64}' => No,
+        '\u{1EE67}'...'\u{1EE6A}' => No,
+        '\u{1EE6C}'...'\u{1EE72}' => No,
+        '\u{1EE74}'...'\u{1EE77}' => No,
+        '\u{1EE79}'...'\u{1EE7C}' => No,
+        '\u{1EE7E}' => No,
+        '\u{1EE80}'...'\u{1EE89}' => No,
+        '\u{1EE8B}'...'\u{1EE9B}' => No,
+        '\u{1EEA1}'...'\u{1EEA3}' => No,
+        '\u{1EEA5}'...'\u{1EEA9}' => No,
+        '\u{1EEAB}'...'\u{1EEBB}' => No,
+        '\u{1F100}'...'\u{1F10A}' => No,
+        '\u{1F110}'...'\u{1F12E}' => No,
+        '\u{1F130}'...'\u{1F14F}' => No,
+        '\u{1F16A}'...'\u{1F16B}' => No,
+        '\u{1F190}' => No,
+        '\u{1F200}'...'\u{1F202}' => No,
+        '\u{1F210}'...'\u{1F23B}' => No,
+        '\u{1F240}'...'\u{1F248}' => No,
+        '\u{1F250}'...'\u{1F251}' => No,
+        '\u{2F800}'...'\u{2FA1D}' => No,
+        _ => Yes,
+    }
 }
 
 #[inline]
diff -Nru cargo-0.32.0/vendor/unicode-normalization/src/test.rs cargo-0.33.0/vendor/unicode-normalization/src/test.rs
--- cargo-0.32.0/vendor/unicode-normalization/src/test.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/src/test.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,193 +0,0 @@
-// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-use std::char;
-use super::UnicodeNormalization;
-use super::char::is_combining_mark;
-
-
-#[test]
-fn test_nfd() {
-    macro_rules! t {
-        ($input: expr, $expected: expr) => {
-            assert_eq!($input.nfd().to_string(), $expected);
-            // A dummy iterator that is not std::str::Chars directly;
-            // note that `id_func` is used to ensure `Clone` implementation
-            assert_eq!($input.chars().map(|c| c).nfd().collect::<String>(), $expected);
-        }
-    }
-    t!("abc", "abc");
-    t!("\u{1e0b}\u{1c4}", "d\u{307}\u{1c4}");
-    t!("\u{2026}", "\u{2026}");
-    t!("\u{2126}", "\u{3a9}");
-    t!("\u{1e0b}\u{323}", "d\u{323}\u{307}");
-    t!("\u{1e0d}\u{307}", "d\u{323}\u{307}");
-    t!("a\u{301}", "a\u{301}");
-    t!("\u{301}a", "\u{301}a");
-    t!("\u{d4db}", "\u{1111}\u{1171}\u{11b6}");
-    t!("\u{ac1c}", "\u{1100}\u{1162}");
-}
-
-#[test]
-fn test_nfkd() {
-    macro_rules! t {
-        ($input: expr, $expected: expr) => {
-            assert_eq!($input.nfkd().to_string(), $expected);
-        }
-    }
-    t!("abc", "abc");
-    t!("\u{1e0b}\u{1c4}", "d\u{307}DZ\u{30c}");
-    t!("\u{2026}", "...");
-    t!("\u{2126}", "\u{3a9}");
-    t!("\u{1e0b}\u{323}", "d\u{323}\u{307}");
-    t!("\u{1e0d}\u{307}", "d\u{323}\u{307}");
-    t!("a\u{301}", "a\u{301}");
-    t!("\u{301}a", "\u{301}a");
-    t!("\u{d4db}", "\u{1111}\u{1171}\u{11b6}");
-    t!("\u{ac1c}", "\u{1100}\u{1162}");
-}
-
-#[test]
-fn test_nfc() {
-    macro_rules! t {
-        ($input: expr, $expected: expr) => {
-            assert_eq!($input.nfc().to_string(), $expected);
-        }
-    }
-    t!("abc", "abc");
-    t!("\u{1e0b}\u{1c4}", "\u{1e0b}\u{1c4}");
-    t!("\u{2026}", "\u{2026}");
-    t!("\u{2126}", "\u{3a9}");
-    t!("\u{1e0b}\u{323}", "\u{1e0d}\u{307}");
-    t!("\u{1e0d}\u{307}", "\u{1e0d}\u{307}");
-    t!("a\u{301}", "\u{e1}");
-    t!("\u{301}a", "\u{301}a");
-    t!("\u{d4db}", "\u{d4db}");
-    t!("\u{ac1c}", "\u{ac1c}");
-    t!("a\u{300}\u{305}\u{315}\u{5ae}b", "\u{e0}\u{5ae}\u{305}\u{315}b");
-}
-
-#[test]
-fn test_nfkc() {
-    macro_rules! t {
-        ($input: expr, $expected: expr) => {
-            assert_eq!($input.nfkc().to_string(), $expected);
-        }
-    }
-    t!("abc", "abc");
-    t!("\u{1e0b}\u{1c4}", "\u{1e0b}D\u{17d}");
-    t!("\u{2026}", "...");
-    t!("\u{2126}", "\u{3a9}");
-    t!("\u{1e0b}\u{323}", "\u{1e0d}\u{307}");
-    t!("\u{1e0d}\u{307}", "\u{1e0d}\u{307}");
-    t!("a\u{301}", "\u{e1}");
-    t!("\u{301}a", "\u{301}a");
-    t!("\u{d4db}", "\u{d4db}");
-    t!("\u{ac1c}", "\u{ac1c}");
-    t!("a\u{300}\u{305}\u{315}\u{5ae}b", "\u{e0}\u{5ae}\u{305}\u{315}b");
-}
-
-#[test]
-fn test_official() {
-    use normalization_tests::NORMALIZATION_TESTS;
-    macro_rules! normString {
-        ($method: ident, $input: expr) => { $input.$method().collect::<String>() }
-    }
-
-    for test in NORMALIZATION_TESTS {
-        // these invariants come from the CONFORMANCE section of
-        // http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
-        {
-            let r1 = normString!(nfc, test.source);
-            let r2 = normString!(nfc, test.nfc);
-            let r3 = normString!(nfc, test.nfd);
-            let r4 = normString!(nfc, test.nfkc);
-            let r5 = normString!(nfc, test.nfkd);
-            assert_eq!(test.nfc, &r1[..]);
-            assert_eq!(test.nfc, &r2[..]);
-            assert_eq!(test.nfc, &r3[..]);
-            assert_eq!(test.nfkc, &r4[..]);
-            assert_eq!(test.nfkc, &r5[..]);
-        }
-
-        {
-            let r1 = normString!(nfd, test.source);
-            let r2 = normString!(nfd, test.nfc);
-            let r3 = normString!(nfd, test.nfd);
-            let r4 = normString!(nfd, test.nfkc);
-            let r5 = normString!(nfd, test.nfkd);
-            assert_eq!(test.nfd, &r1[..]);
-            assert_eq!(test.nfd, &r2[..]);
-            assert_eq!(test.nfd, &r3[..]);
-            assert_eq!(test.nfkd, &r4[..]);
-            assert_eq!(test.nfkd, &r5[..]);
-        }
-
-        {
-            let r1 = normString!(nfkc, test.source);
-            let r2 = normString!(nfkc, test.nfc);
-            let r3 = normString!(nfkc, test.nfd);
-            let r4 = normString!(nfkc, test.nfkc);
-            let r5 = normString!(nfkc, test.nfkd);
-            assert_eq!(test.nfkc, &r1[..]);
-            assert_eq!(test.nfkc, &r2[..]);
-            assert_eq!(test.nfkc, &r3[..]);
-            assert_eq!(test.nfkc, &r4[..]);
-            assert_eq!(test.nfkc, &r5[..]);
-        }
-
-        {
-            let r1 = normString!(nfkd, test.source);
-            let r2 = normString!(nfkd, test.nfc);
-            let r3 = normString!(nfkd, test.nfd);
-            let r4 = normString!(nfkd, test.nfkc);
-            let r5 = normString!(nfkd, test.nfkd);
-            assert_eq!(test.nfkd, &r1[..]);
-            assert_eq!(test.nfkd, &r2[..]);
-            assert_eq!(test.nfkd, &r3[..]);
-            assert_eq!(test.nfkd, &r4[..]);
-            assert_eq!(test.nfkd, &r5[..]);
-        }
-    }
-}
-
-#[test]
-fn test_quick_check() {
-    use normalization_tests::NORMALIZATION_TESTS;
-    use quick_check;
-    for test in NORMALIZATION_TESTS {
-        assert!(quick_check::is_nfc(test.nfc));
-        assert!(quick_check::is_nfd(test.nfd));
-        if test.nfc != test.nfd {
-            assert!(!quick_check::is_nfc(test.nfd));
-            assert!(!quick_check::is_nfd(test.nfc));
-        }
-    }
-}
-
-#[test]
-fn test_is_combining_mark_ascii() {
-    for cp in 0..0x7f {
-        assert!(!is_combining_mark(char::from_u32(cp).unwrap()));
-    }
-}
-
-#[test]
-fn test_is_combining_mark_misc() {
-    // https://github.com/unicode-rs/unicode-normalization/issues/16
-    // U+11C3A BHAIKSUKI VOWEL SIGN O
-    // Category: Mark, Nonspacing [Mn]
-    assert!(is_combining_mark('\u{11C3A}'));
-
-    // U+11C3F BHAIKSUKI SIGN VIRAMA
-    // Category: Mark, Nonspacing [Mn]
-    assert!(is_combining_mark('\u{11C3F}'));
-}
diff -Nru cargo-0.32.0/vendor/unicode-normalization/.travis.yml cargo-0.33.0/vendor/unicode-normalization/.travis.yml
--- cargo-0.32.0/vendor/unicode-normalization/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-normalization/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-language: rust
-sudo: false
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - rustdoc --test README.md -L target/debug -L target/debug/deps
-  - cargo doc
-after_success: |
-  [ $TRAVIS_BRANCH = master ] &&
-  [ $TRAVIS_PULL_REQUEST = false ] &&
-  echo '<meta http-equiv=refresh content=0;url=unicode_normalization/index.html>' > target/doc/index.html &&
-  pip install ghp-import --user $USER &&
-  $HOME/.local/bin/ghp-import -n target/doc &&
-  git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
-env:
-  global:
-    secure: Te91dtDN8uv5OBxVuMy+nvQ5GtnLU9r6amS9p6IbblVXyzXgXPQdFfAND+GXXfZNnsjAyS2LnZL4NcNOR4JF63H0KxTTDIGXLSUAmc0C98UhqWWvv5bjz4mY0YKs9MwuTBX9P0LdTZjvRTd+yJ2PYH7ORGen+ZuOmlPNE7lpzrg=
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/unicode-width/.travis.yml cargo-0.33.0/vendor/unicode-width/.travis.yml
--- cargo-0.32.0/vendor/unicode-width/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-width/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-language: rust
-rust: 'nightly'
-sudo: false
-script:
-  - cargo build --verbose --features bench
-  - cargo test --verbose --features bench
-  - cargo bench --verbose --features bench
-  - cargo clean
-  - cargo build --verbose
-  - cargo test --verbose
-  - rustdoc --test README.md -L target/debug -L target/debug/deps
-  - cargo doc
-after_success: |
-  [ $TRAVIS_BRANCH = master ] &&
-  [ $TRAVIS_PULL_REQUEST = false ] &&
-  echo '<meta http-equiv=refresh content=0;url=unicode_width/index.html>' > target/doc/index.html &&
-  pip install ghp-import --user $USER &&
-  $HOME/.local/bin/ghp-import -n target/doc &&
-  git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
-env:
-  global:
-    secure: sF21oZa17vX3iE16x7lt2VsdcSYUJ5PtEwJzQ9Ab/0zFaNc5LUXFUOBddMS9LxYnwO1WI9iOVOYC2NbXT4oRgjZ2cmkatoE6nGHmkqUe4paxVy1Fg6ncjYO1jZwoRSSn1mi0CcwoHq46r2l6FaD0InJExwa3dzk63B9SjIUiekw=
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/unicode-xid/.travis.yml cargo-0.33.0/vendor/unicode-xid/.travis.yml
--- cargo-0.32.0/vendor/unicode-xid/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unicode-xid/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-language: rust
-rust: 'nightly'
-sudo: false
-script:
-  - cargo build --verbose --features bench
-  - cargo test --verbose --features bench
-  - cargo bench --verbose --features bench
-  - cargo clean
-  - cargo build --verbose
-  - cargo test --verbose
-  - rustdoc --test README.md -L target/debug -L target/debug/deps
-  - cargo doc
-after_success: |
-  [ $TRAVIS_BRANCH = master ] &&
-  [ $TRAVIS_PULL_REQUEST = false ] &&
-  echo '<meta http-equiv=refresh content=0;url=unicode_xid/index.html>' > target/doc/index.html &&
-  pip install ghp-import --user $USER &&
-  $HOME/.local/bin/ghp-import -n target/doc &&
-  git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
-env:
-  global:
-    secure: gTlge+/OQlVkV0R+RThWXeN0aknmS7iUTPBMYKJyRdLz7T2vubw3w80a2CVE87JlpV87A5cVGD+LgR+AhYrhKtvqHb1brMDd99gylBBi2DfV7YapDSwSCuFgVR+FjZfJRcXBtI8po5urUZ84V0WLzRX8SyWqWgoD3oCkSL3Wp3w=
-notifications:
-  email:
-    on_success: never
diff -Nru cargo-0.32.0/vendor/unreachable/Cargo.lock cargo-0.33.0/vendor/unreachable/Cargo.lock
--- cargo-0.32.0/vendor/unreachable/Cargo.lock	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unreachable/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-[[package]]
-name = "unreachable"
-version = "1.0.0"
-dependencies = [
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
diff -Nru cargo-0.32.0/vendor/unreachable/.travis.yml cargo-0.33.0/vendor/unreachable/.travis.yml
--- cargo-0.32.0/vendor/unreachable/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/unreachable/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-language: rust
-sudo: false
-
-script:
-    - cargo build
-    - cargo test
-    - cargo bench --no-run
-    - cargo doc
-
-after_success:
-    - if [ "$TRAVIS_PULL_REQUEST" == false && test == "TRAVIS_BRANCH" == "master" ]; then
-    - curl https://raw.githubusercontent.com/reem/rust-gh-docs/master/make-docs.sh > docs.sh
-    - chmod u+x docs.sh
-    - ./docs.sh reem project-name
-
-env:
-  global:
-    secure: QPYL1XUr4CyK/2DXlsYC1eCpWRpyEiqQSd/FFVR+YdP/rOJ7AyAXQqPhfgjDBQwvc6E2fUiyYjoV/xe1a757DDeZKlgd8Lp20fSDwvNt/Ejx8ueh3h3kuOtgDpIGSKX/l+XC+ltDpzjhh7bowI2/fOEf+kE53jvu9i4PiLnKdlY=
-
diff -Nru cargo-0.32.0/vendor/url/.cargo_vcs_info.json cargo-0.33.0/vendor/url/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/url/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/url/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "1cc36c0f61065093a2666ad2c7bcaaa639fe3a2e"
-  }
-}
diff -Nru cargo-0.32.0/vendor/url/.travis.yml cargo-0.33.0/vendor/url/.travis.yml
--- cargo-0.32.0/vendor/url/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/url/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-language: rust
-
-jobs:
-  include:
-  - rust: 1.17.0
-    install:
-    # --precise requires Cargo.lock to already exist
-    - cargo update
-    # getopts is only used in tests. Its versions 0.2.16+ don’t build on 1.17.0
-    - cargo update -p getopts --precise 0.2.15
-
-    - cargo update -p unicode-normalization --precise 0.1.5
-
-    # data-url uses pub(crate) which is unstable in 1.17
-    script: cargo test --all-features -p url -p idna -p percent-encoding -p url_serde
-
-  - rust: stable
-    script: cargo test --all-features --all
-
-  - rust: beta
-    script: cargo test --all-features --all
-
-  - rust: nightly
-    script: cargo test --all-features --all
-
-  - rust: nightly
-    env: TARGET=WASM32  # For job list UI
-    install: rustup target add wasm32-unknown-unknown
-    script: cargo build --all --target=wasm32-unknown-unknown
-
-notifications:
-  webhooks: http://build.servo.org:54856/travis
diff -Nru cargo-0.32.0/vendor/utf8-ranges/.cargo_vcs_info.json cargo-0.33.0/vendor/utf8-ranges/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/utf8-ranges/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/utf8-ranges/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "74dc0260efd2c5e17c35643a2b47dc508ec823fd"
-  }
-}
diff -Nru cargo-0.32.0/vendor/vec_map/.travis.yml cargo-0.33.0/vendor/vec_map/.travis.yml
--- cargo-0.32.0/vendor/vec_map/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/vec_map/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-language: rust
-sudo: false
-matrix:
-  include:
-    - rust: stable
-    - rust: beta
-    - rust: nightly
-    - rust: nightly
-      env: FEATURES="--features eders"
-script:
-    - cargo build $FEATURES
-    - cargo test $FEATURES
-    - cargo doc --no-deps
-after_success: |
-    [ "$TRAVIS_RUST_VERSION" = nightly ] &&
-    [ "$FEATURES" = "" ] &&
-    [ "$TRAVIS_BRANCH" = master ] &&
-    [ "$TRAVIS_PULL_REQUEST" = false ] &&
-    bash deploy-docs.sh
-notifications:
-    webhooks: http://huon.me:54857/travis
diff -Nru cargo-0.32.0/vendor/version_check/.cargo-checksum.json cargo-0.33.0/vendor/version_check/.cargo-checksum.json
--- cargo-0.32.0/vendor/version_check/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{},"package":"914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/version_check/Cargo.toml cargo-0.33.0/vendor/version_check/Cargo.toml
--- cargo-0.32.0/vendor/version_check/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "version_check"
-version = "0.1.5"
-authors = ["Sergio Benitez <sb@sergio.bz>"]
-description = "Tiny crate to check the version of the installed/running rustc."
-documentation = "https://docs.rs/version_check/"
-readme = "README.md"
-keywords = ["version", "rustc", "minimum", "check"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/SergioBenitez/version_check"
-
-[dependencies]
diff -Nru cargo-0.32.0/vendor/version_check/.cargo_vcs_info.json cargo-0.33.0/vendor/version_check/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/version_check/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "f2d5df160f2c533852e45ddf6670906f3406a17b"
-  }
-}
diff -Nru cargo-0.32.0/vendor/version_check/LICENSE-APACHE cargo-0.33.0/vendor/version_check/LICENSE-APACHE
--- cargo-0.32.0/vendor/version_check/LICENSE-APACHE	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-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.
diff -Nru cargo-0.32.0/vendor/version_check/LICENSE-MIT cargo-0.33.0/vendor/version_check/LICENSE-MIT
--- cargo-0.32.0/vendor/version_check/LICENSE-MIT	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-The MIT License (MIT)
-Copyright (c) 2017-2018 Sergio Benitez
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -Nru cargo-0.32.0/vendor/version_check/README.md cargo-0.33.0/vendor/version_check/README.md
--- cargo-0.32.0/vendor/version_check/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-# version\_check
-
-This tiny crate checks that the running or installed `rustc` meets some version
-requirements. The version is queried by calling the Rust compiler with
-`--version`. The path to the compiler is determined first via the `RUSTC`
-environment variable. If it is not set, then `rustc` is used. If that fails, no
-determination is made, and calls return `None`.
-
-## Usage
-
-Add to your `Cargo.toml` file, typically as a build dependency:
-
-```toml
-[build-dependencies]
-version_check = "0.1"
-```
-
-## Examples
-
-Check that the running compiler is a nightly release:
-
-```rust
-extern crate version_check;
-
-match version_check::is_nightly() {
-    Some(true) => "running a nightly",
-    Some(false) => "not nightly",
-    None => "couldn't figure it out"
-};
-```
-
-Check that the running compiler is at least version `1.13.0`:
-
-```rust
-extern crate version_check;
-
-match version_check::is_min_version("1.13.0") {
-    Some((true, version)) => format!("Yes! It's: {}", version),
-    Some((false, version)) => format!("No! {} is too old!", version),
-    None => "couldn't figure it out".into()
-};
-```
-
-Check that the running compiler was released on or after `2016-12-18`:
-
-```rust
-extern crate version_check;
-
-match version_check::is_min_date("2016-12-18") {
-    Some((true, date)) => format!("Yes! It's: {}", date),
-    Some((false, date)) => format!("No! {} is too long ago!", date),
-    None => "couldn't figure it out".into()
-};
-```
-
-## Alternatives
-
-This crate is dead simple with no dependencies. If you need something more and
-don't care about panicking if the version cannot be obtained or adding
-dependencies, see [rustc_version](https://crates.io/crates/rustc_version).
-
-## License
-
-`version_check` is licensed under either of the following, at your option:
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT License ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
diff -Nru cargo-0.32.0/vendor/version_check/src/lib.rs cargo-0.33.0/vendor/version_check/src/lib.rs
--- cargo-0.32.0/vendor/version_check/src/lib.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/version_check/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,255 +0,0 @@
-//! This tiny crate checks that the running or installed `rustc` meets some
-//! version requirements. The version is queried by calling the Rust compiler
-//! with `--version`. The path to the compiler is determined first via the
-//! `RUSTC` environment variable. If it is not set, then `rustc` is used. If
-//! that fails, no determination is made, and calls return `None`.
-//!
-//! # Example
-//!
-//! Check that the running compiler is a nightly release:
-//!
-//! ```rust
-//! extern crate version_check;
-//!
-//! match version_check::is_nightly() {
-//!     Some(true) => "running a nightly",
-//!     Some(false) => "not nightly",
-//!     None => "couldn't figure it out"
-//! };
-//! ```
-//!
-//! Check that the running compiler is at least version `1.13.0`:
-//!
-//! ```rust
-//! extern crate version_check;
-//!
-//! match version_check::is_min_version("1.13.0") {
-//!     Some((true, version)) => format!("Yes! It's: {}", version),
-//!     Some((false, version)) => format!("No! {} is too old!", version),
-//!     None => "couldn't figure it out".into()
-//! };
-//! ```
-//!
-//! Check that the running compiler was released on or after `2016-12-18`:
-//!
-//! ```rust
-//! extern crate version_check;
-//!
-//! match version_check::is_min_date("2016-12-18") {
-//!     Some((true, date)) => format!("Yes! It's: {}", date),
-//!     Some((false, date)) => format!("No! {} is too long ago!", date),
-//!     None => "couldn't figure it out".into()
-//! };
-//! ```
-//!
-//! # Alternatives
-//!
-//! This crate is dead simple with no dependencies. If you need something more
-//! and don't care about panicking if the version cannot be obtained or adding
-//! dependencies, see [rustc_version](https://crates.io/crates/rustc_version).
-
-use std::env;
-use std::process::Command;
-
-// Convert a string of %Y-%m-%d to a single u32 maintaining ordering.
-fn str_to_ymd(ymd: &str) -> Option<u32> {
-    let ymd: Vec<u32> = ymd.split("-").filter_map(|s| s.parse::<u32>().ok()).collect();
-    if ymd.len() != 3 {
-        return None
-    }
-
-    let (y, m, d) = (ymd[0], ymd[1], ymd[2]);
-    Some((y << 9) | (m << 5) | d)
-}
-
-// Convert a string with prefix major-minor-patch to a single u64 maintaining
-// ordering. Assumes none of the components are > 1048576.
-fn str_to_mmp(mmp: &str) -> Option<u64> {
-    let mut mmp: Vec<u16> = mmp.split('-')
-        .nth(0)
-        .unwrap_or("")
-        .split('.')
-        .filter_map(|s| s.parse::<u16>().ok())
-        .collect();
-
-    if mmp.is_empty() {
-        return None
-    }
-
-    while mmp.len() < 3 {
-        mmp.push(0);
-    }
-
-    let (maj, min, patch) = (mmp[0] as u64, mmp[1] as u64, mmp[2] as u64);
-    Some((maj << 32) | (min << 16) | patch)
-}
-
-/// Returns (version, date) as available.
-fn version_and_date_from_rustc_version(s: &str) -> (Option<String>, Option<String>) {
-    let last_line = s.lines().last().unwrap_or(s);
-    let mut components = last_line.trim().split(" ");
-    let version = components.nth(1);
-    let date = components.nth(1).map(|s| s.trim_right().trim_right_matches(")"));
-    (version.map(|s| s.to_string()), date.map(|s| s.to_string()))
-}
-
-/// Returns (version, date) as available.
-fn get_version_and_date() -> Option<(Option<String>, Option<String>)> {
-    env::var("RUSTC").ok()
-        .and_then(|rustc| Command::new(rustc).arg("--version").output().ok())
-        .or_else(|| Command::new("rustc").arg("--version").output().ok())
-        .and_then(|output| String::from_utf8(output.stdout).ok())
-        .map(|s| version_and_date_from_rustc_version(&s))
-}
-
-/// Checks that the running or installed `rustc` was released no earlier than
-/// some date.
-///
-/// The format of `min_date` must be YYYY-MM-DD. For instance: `2016-12-20` or
-/// `2017-01-09`.
-///
-/// If the date cannot be retrieved or parsed, or if `min_date` could not be
-/// parsed, returns `None`. Otherwise returns a tuple where the first value is
-/// `true` if the installed `rustc` is at least from `min_data` and the second
-/// value is the date (in YYYY-MM-DD) of the installed `rustc`.
-pub fn is_min_date(min_date: &str) -> Option<(bool, String)> {
-    if let Some((_, Some(actual_date_str))) = get_version_and_date() {
-        str_to_ymd(&actual_date_str)
-            .and_then(|actual| str_to_ymd(min_date).map(|min| (min, actual)))
-            .map(|(min, actual)| (actual >= min, actual_date_str))
-    } else {
-        None
-    }
-}
-
-/// Checks that the running or installed `rustc` is at least some minimum
-/// version.
-///
-/// The format of `min_version` is a semantic version: `1.3.0`, `1.15.0-beta`,
-/// `1.14.0`, `1.16.0-nightly`, etc.
-///
-/// If the version cannot be retrieved or parsed, or if `min_version` could not
-/// be parsed, returns `None`. Otherwise returns a tuple where the first value
-/// is `true` if the installed `rustc` is at least `min_version` and the second
-/// value is the version (semantic) of the installed `rustc`.
-pub fn is_min_version(min_version: &str) -> Option<(bool, String)> {
-    if let Some((Some(actual_version_str), _)) = get_version_and_date() {
-        str_to_mmp(&actual_version_str)
-            .and_then(|actual| str_to_mmp(min_version).map(|min| (min, actual)))
-            .map(|(min, actual)| (actual >= min, actual_version_str))
-    } else {
-        None
-    }
-}
-
-fn version_channel_is(channel: &str) -> Option<bool> {
-    get_version_and_date()
-        .and_then(|(version_str_opt, _)|  version_str_opt)
-        .map(|version_str| version_str.contains(channel))
-}
-
-/// Determines whether the running or installed `rustc` is on the nightly
-/// channel.
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version is a nightly release, and `Some(false)`
-/// otherwise.
-pub fn is_nightly() -> Option<bool> {
-    version_channel_is("nightly")
-}
-
-/// Determines whether the running or installed `rustc` is on the beta channel.
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version is a beta release, and `Some(false)`
-/// otherwise.
-pub fn is_beta() -> Option<bool> {
-    version_channel_is("beta")
-}
-
-/// Determines whether the running or installed `rustc` is on the dev channel.
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version is a dev release, and `Some(false)`
-/// otherwise.
-pub fn is_dev() -> Option<bool> {
-    version_channel_is("dev")
-}
-
-/// Determines whether the running or installed `rustc` supports feature flags.
-/// In other words, if the channel is either "nightly" or "dev".
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version supports features, and `Some(false)`
-/// otherwise.
-pub fn supports_features() -> Option<bool> {
-    match is_nightly() {
-        b@Some(true) => b,
-        _ => is_dev()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::version_and_date_from_rustc_version;
-    use super::str_to_mmp;
-
-    macro_rules! check_mmp {
-        ($string:expr => ($x:expr, $y:expr, $z:expr)) => (
-            if let Some(mmp) = str_to_mmp($string) {
-                let expected = $x << 32 | $y << 16 | $z;
-                if mmp != expected {
-                    panic!("{:?} didn't parse as {}.{}.{}.", $string, $x, $y, $z);
-                }
-            } else {
-                panic!("{:?} didn't parse for mmp testing.", $string);
-            }
-        )
-    }
-
-    macro_rules! check_version {
-        ($s:expr => ($x:expr, $y:expr, $z:expr)) => (
-            if let (Some(version_str), _) = version_and_date_from_rustc_version($s) {
-                check_mmp!(&version_str => ($x, $y, $z));
-            } else {
-                panic!("{:?} didn't parse for version testing.", $s);
-            }
-        )
-    }
-
-    #[test]
-    fn test_str_to_mmp() {
-        check_mmp!("1.18.0" => (1, 18, 0));
-        check_mmp!("1.19.0" => (1, 19, 0));
-        check_mmp!("1.19.0-nightly" => (1, 19, 0));
-        check_mmp!("1.12.2349" => (1, 12, 2349));
-        check_mmp!("0.12" => (0, 12, 0));
-        check_mmp!("1.12.5" => (1, 12, 5));
-        check_mmp!("1.12" => (1, 12, 0));
-        check_mmp!("1" => (1, 0, 0));
-    }
-
-    #[test]
-    fn test_version_parse() {
-        check_version!("rustc 1.18.0" => (1, 18, 0));
-        check_version!("rustc 1.8.0" => (1, 8, 0));
-        check_version!("rustc 1.20.0-nightly" => (1, 20, 0));
-        check_version!("rustc 1.20" => (1, 20, 0));
-        check_version!("rustc 1.3" => (1, 3, 0));
-        check_version!("rustc 1" => (1, 0, 0));
-        check_version!("rustc 1.2.5.6" => (1, 2, 5));
-        check_version!("rustc 1.5.1-beta" => (1, 5, 1));
-        check_version!("rustc 1.20.0-nightly (d84693b93 2017-07-09)" => (1, 20, 0));
-        check_version!("rustc 1.20.0 (d84693b93 2017-07-09)" => (1, 20, 0));
-        check_version!("rustc 1.20.0 (2017-07-09)" => (1, 20, 0));
-        check_version!("rustc 1.20.0-dev (2017-07-09)" => (1, 20, 0));
-
-        check_version!("warning: invalid logging spec 'warning', ignoring it
-                        rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => (1, 30, 0));
-        check_version!("warning: invalid logging spec 'warning', ignoring it\n
-                        rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => (1, 30, 0));
-        check_version!("warning: invalid logging spec 'warning', ignoring it
-                        warning: something else went wrong
-                        rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => (1, 30, 0));
-    }
-}
diff -Nru cargo-0.32.0/vendor/void/Cargo.lock cargo-0.33.0/vendor/void/Cargo.lock
--- cargo-0.32.0/vendor/void/Cargo.lock	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/void/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[[package]]
-name = "void"
-version = "1.0.2"
-
diff -Nru cargo-0.32.0/vendor/void/.travis.yml cargo-0.33.0/vendor/void/.travis.yml
--- cargo-0.32.0/vendor/void/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/void/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-language: rust
-sudo: false
-
-rust:
-    - 1.0.0
-    - stable
-    - beta
-    - nightly
-
-script:
-    - cargo build
-    - cargo test
-    - if [ "$TRAVIS_RUST_VERSION" != "1.0.0" ]; then cargo test --no-default-features; fi
-    - cargo bench --no-run
-    - cargo doc
-
-after_success:
-    - if [ "$TRAVIS_PULL_REQUEST" == false && test == "TRAVIS_BRANCH" == "master" ]; then
-    - curl https://raw.githubusercontent.com/reem/rust-gh-docs/master/make-docs.sh > docs.sh
-    - chmod u+x docs.sh
-    - ./docs.sh reem project-name
-
-env:
-  global:
-    secure: QPYL1XUr4CyK/2DXlsYC1eCpWRpyEiqQSd/FFVR+YdP/rOJ7AyAXQqPhfgjDBQwvc6E2fUiyYjoV/xe1a757DDeZKlgd8Lp20fSDwvNt/Ejx8ueh3h3kuOtgDpIGSKX/l+XC+ltDpzjhh7bowI2/fOEf+kE53jvu9i4PiLnKdlY=
-
diff -Nru cargo-0.32.0/vendor/wait-timeout/.travis.yml cargo-0.33.0/vendor/wait-timeout/.travis.yml
--- cargo-0.32.0/vendor/wait-timeout/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/wait-timeout/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-sudo: false
-before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo doc --no-deps
-after_success:
-  - travis-cargo --only nightly doc-upload
-env:
-  global:
-    secure: "jzqfkE1zPzwe/ofghiKvN/3Vo/kLYN+pDzSIOGL3Xnum5eayUf87Uae1UuAbgXfKm2/meXWizMjcVrBeNrfxRi3qvaM+MLGAR4YK4G2Z91Uuf3edHF/uu7rhhaLWsPOkb4qDH/lBRIsKhDMpLXuc/5DSqZdPVQa8H+5ULtQFwWkets8BGfPu+vCgHeGb/lMgm56BnedUBqO7hAI1dYEn55R3L4rwgkMDWTyiAczL3RBuFJrHIAY5C+8JbkvvL+4+9v3oulJgXDQnQYkdNiZE0BjCvj+w0J2W1C1E8vgX3wB71RbQ+ijh1f98RoR6SqDqWE5eZDrl+L8V3sP2BIK/yhCrUCwpysQXW6Lo9/aVEDVPTB2KxvVjGb9jFwYyvZLuB0Q1t7UlOIo3MXIZLvMSZT99tfOZ5f1MdQt0C+ACZ6LKTAF0VUxmEGequ8kBBj+uDnHiIeWzkCJVTpqwTuJcprEPNCUx6T2pxyIZkyTS2DzviBbzLE/fLahm/+RJrkraH3lD4tLiTC7IckNrmnufx78oIsbYxdYp4Bo5cASLiRTVL9BS3yJ5So/Qr/C5pQ48PjKokyBDXX01U9SA6K3nxJ5tO+/q4d77utSaG9kb1UQpwNojpMBTBC1OFVbb/2nlOmf2BKLpciNCBmUHJnq/+By9l0f0eRS/0JanFBdIDkM="
-
-notifications:
-  email:
-    on_success: never
-os:
-  - linux
-  - osx
diff -Nru cargo-0.32.0/vendor/walkdir/.cargo_vcs_info.json cargo-0.33.0/vendor/walkdir/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/walkdir/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/walkdir/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "705d06c15d178785abec407be0e4a8d55df8c1a7"
-  }
-}
diff -Nru cargo-0.32.0/vendor/winapi/.cargo_vcs_info.json cargo-0.33.0/vendor/winapi/.cargo_vcs_info.json
--- cargo-0.32.0/vendor/winapi/.cargo_vcs_info.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/winapi/.cargo_vcs_info.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-{
-  "git": {
-    "sha1": "4ac6c90e4ab92850c78b6103137290fe4ab9d273"
-  }
-}
diff -Nru cargo-0.32.0/vendor/winapi-util/.cargo-checksum.json cargo-0.33.0/vendor/winapi-util/.cargo-checksum.json
--- cargo-0.32.0/vendor/winapi-util/.cargo-checksum.json	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/winapi-util/.cargo-checksum.json	2019-02-06 04:11:58.000000000 +0000
@@ -1 +1 @@
-{"files":{},"package":"afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab"}
\ No newline at end of file
+{"files":{},"package":"7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"}
\ No newline at end of file
diff -Nru cargo-0.32.0/vendor/winapi-util/Cargo.toml cargo-0.33.0/vendor/winapi-util/Cargo.toml
--- cargo-0.32.0/vendor/winapi-util/Cargo.toml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/winapi-util/Cargo.toml	2019-02-06 04:11:58.000000000 +0000
@@ -12,7 +12,7 @@
 
 [package]
 name = "winapi-util"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = "A dumping ground for high level safe wrappers over winapi."
 homepage = "https://github.com/BurntSushi/winapi-util"
@@ -24,4 +24,4 @@
 repository = "https://github.com/BurntSushi/winapi-util"
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3"
-features = ["std", "consoleapi", "errhandlingapi", "fileapi", "minwindef", "processenv", "winbase", "wincon", "winerror"]
+features = ["std", "consoleapi", "errhandlingapi", "fileapi", "minwindef", "processenv", "winbase", "wincon", "winerror", "winnt"]
diff -Nru cargo-0.32.0/vendor/winapi-util/README.md cargo-0.33.0/vendor/winapi-util/README.md
--- cargo-0.32.0/vendor/winapi-util/README.md	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/winapi-util/README.md	2019-02-06 04:11:58.000000000 +0000
@@ -38,7 +38,7 @@
 Eventually, I started needing to copy & paste a lot of those utility routines.
 Since they are utility routines, they often don't make sense to expose directly
 in the crate in which they are defined. Instead of continuing this process,
-I decide to make a crate instead.
+I decided to make a crate instead.
 
 Normally, I'm not a huge fan of "utility" crates like this that don't have a
 well defined scope, but this is primarily a practical endeavor to make it
diff -Nru cargo-0.32.0/vendor/winapi-util/src/file.rs cargo-0.33.0/vendor/winapi-util/src/file.rs
--- cargo-0.32.0/vendor/winapi-util/src/file.rs	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/winapi-util/src/file.rs	2019-02-06 04:11:58.000000000 +0000
@@ -8,6 +8,7 @@
     BY_HANDLE_FILE_INFORMATION,
     GetFileInformationByHandle, GetFileType,
 };
+use winapi::um::winnt;
 
 use AsHandleRef;
 
@@ -49,6 +50,12 @@
     }
 }
 
+/// Returns true if and only if the given file attributes contain the
+/// `FILE_ATTRIBUTE_HIDDEN` attribute.
+pub fn is_hidden(file_attributes: u64) -> bool {
+    file_attributes & (winnt::FILE_ATTRIBUTE_HIDDEN as u64) > 0
+}
+
 /// Represents file information such as creation time, file size, etc.
 ///
 /// This wraps a [`BY_HANDLE_FILE_INFORMATION`].
@@ -65,6 +72,12 @@
         self.0.dwFileAttributes as u64
     }
 
+    /// Returns true if and only if this file information has the
+    /// `FILE_ATTRIBUTE_HIDDEN` attribute.
+    pub fn is_hidden(&self) -> bool {
+        is_hidden(self.file_attributes())
+    }
+
     /// Return the creation time, if one exists.
     ///
     /// This corresponds to `ftCreationTime`.
diff -Nru cargo-0.32.0/vendor/winapi-util/.travis.yml cargo-0.33.0/vendor/winapi-util/.travis.yml
--- cargo-0.32.0/vendor/winapi-util/.travis.yml	2018-12-11 17:11:49.000000000 +0000
+++ cargo-0.33.0/vendor/winapi-util/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-dist: trusty
-language: rust
-rust:
-  - 1.28.0
-script: ci/script.sh
-branches:
-  only:
-    - master